Request 5154 (accepted)

Overview

Request 5154 (accepted)

update to version 1.0.0

Created by Aloysius over 4 years ago
In state accepted

Submit gpac

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

gpac.changes Changed

@@ -1,4 +1,105 @@
 -------------------------------------------------------------------
+Sat Jun 27 10:55:16 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 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,
+    + moving DASH/HLS segmenter to a filter
+    + moving MP4Client compositor and most of the GF_Terminal
+      internals to a filter
+    + addition of a new application gpac, whose only purpose is
+      to create and run filter chains
+    + removal of MP42TS and DashCast applications since these
+      functionalities are provided by gpac
+    + deprecation of some features (widget management, MSE draft
+      implementation for SVG media, UPnP, TEMI player support).
+  * Profile system allowing to override through a static file
+    default options of all filters and libgpac core
+  * Alias system for gpac app to simplify your command lines
+  * Enhanced DASHer:
+    + Support for HLS and dual HLS / DASH generation
+    + Support for any input
+    + True low-latency mode for DASH
+    + Support for multiple periods
+    + Support for other segment formats (raw, mkv, webm
+      currently tested)
+  * Input and outputs
+    + Generic pipe, TCP, UDP, and Unix Domain socket input and
+      output
+    + RTSP server output
+    + 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
+  * Compositor is a standalone filter (SVG/BIFS/VRML graphics in
+a filter chain)
+  * Image encoding support through libjpg and libpng
+  * Full FFMPEG support:
+    + Encoding/decoding through FFMPEG libavcodec
+    + Multiplexing/demultiplexing through FFMPEG libavformat
+    + Device grabbers through FFMPEG libavdevice
+    + Raw audio and video filters through FFMPEG libavfilter
+  * Support for QuickJS (ES2002) and bindings for:
+    + Complete filter API
+    + GPAC software rasterizer (EVG)
+    + WebGL 1.0 Core
+    + XmlHttpRequest and uDOM APIs
+    + Storage
+  * Inspect and analyze filter
+  * MPEG-2 TS splitter
+  * Video cropper filter with zero-copy mode
+  * Video flip filter
+  * Source concatenator filter
+  * Simple audio and video output filters
+  * Experimental audio and video rewinder filter
+  * Encryption
+    + On-the-fly encryption and decryption, now available as
+      filters
+    + Segment-based encryption and decryption
+  * ISOBMFF
+    + box customization
+    + Better QT support, prores parsing and dumping
+    + Support for raw media (QT style or ISOBMFF for audio)
+    + Simplify HEIF batch conversion through item to track
+      mapping
+    + Reading from pipes (fragmented or progressive files)
+    + Writing to packets rather than files
+    + Fast interleaved file creation mode with less storage
+      requirements
+  * FileIO wrapper for cases where files are not stored in a
+    file system known by GPAC
+  * Testing and Documentation
+    + Live doc generation (man and wiki)
+    + Improved coverage
+    + Split test suite as dedicated repo
+    + Moved all resource to https://wiki.gpac.io
+    + Started howto pages on wiki
+    + Many bug fixes
+
+- No longer build deprecated DashCast, MP42TS, udptsseg and Osmo4
+  applications. Also drop Osmo4 subpackage
+
+- Drop gpac-0.7.1-enable_V4Studio.patch,
+  gpac-0.6.1-libpng-version-detection.patch,
+  gpac-0.7.1-system-amr.patch,
+  gpac-0.5.1-u32-count-redeclaration.patch,
+  gpac.wx.patch and gpac-0.8.0-x264-export.patch
+
+- Refresh gpac-0.6.1-64bit-portability.patch as
+  gpac-1.0.0-64bit-portability.patch
+  and gpac-0.6.1-no-pc.patch as gpac-1.0.0-no-pc.patch,
+  gpac.ssl.patch and gpac-rpmlintrc
+
+- Spec cleanup
+
+-------------------------------------------------------------------
 Thu Jun 27 11:16:12 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
 
 - Update to version 0.8.0

gpac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package gpac
 #
-# Copyright (c) 2019 Packman Team <packman@links2linux.de>
+# Copyright (c) 2020 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   8
+%define sover   10
 Name:           gpac
-Version:        0.8.0
+Version:        1.0.0
 Release:        0
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
 License:        LGPL-2.1-or-later
@@ -27,67 +27,50 @@
 Url:            http://gpac.io
 Source:         https://github.com/gpac/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source90:       %{name}-rpmlintrc
-#PATCH-FIX-UPSTREAM i@marguerite.su - enable osmozilla and osmo4_wx
-Patch1:         gpac-0.7.1-enable_V4Studio.patch
 #PATCH-FIX-UPSTREAM i@marguerite.su - fix SVGGen ldflags
 Patch2:         gpac-0.7.1-SVGGen_abuild.patch
 #PATCH-FIX-UPSTREAM wengxuetian@gmail.com - fix E: 64bit-portability-issue
-Patch3:         gpac-0.6.1-64bit-portability.patch
-#PATCH-FIX-OPENSUSE marguerite@opensuse.org - libpng include dir fix
-Patch4:         gpac-0.6.1-libpng-version-detection.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - use system amrnb/amrwb
-Patch5:         gpac-0.7.1-system-amr.patch
+Patch3:         gpac-1.0.0-64bit-portability.patch
 #PATCH-FIX-UPSTREAM marguerite@opensuse.org - no gpac.pc in devel package
-Patch6:         gpac-0.6.1-no-pc.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix gf_isom_set_pixel_aspect_ratio
-# not available to the public
-Patch9:         gpac-0.8.0-x264-export.patch
-#PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix u32 count redelaration
-Patch10:        gpac-0.5.1-u32-count-redeclaration.patch
-Patch11:        gpac.wx.patch
+Patch6:         gpac-1.0.0-no-pc.patch
 Patch12:        gpac.ssl.patch
-BuildRequires:  ImageMagick
+# PATCH-FIX-UPSTREAM gpac-1.0.0-remove_debianism.patch
+Patch13:        gpac-1.0.0-remove_debianism.patch
 BuildRequires:  Mesa-devel
-BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  freeglut-devel
-BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
-BuildRequires:  liba52-devel
-BuildRequires:  libfaad-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(faad2)
+BuildRequires:  pkgconfig(freetype2)
+%if 0%{?sle_version} > 150100 || 0%{suse_version} > 1500
+BuildRequires:  pkgconfig(glut)
+%else
+BuildRequires:  freeglut-devel
+%endif
+BuildRequires:  pkgconfig(liba52)
 BuildRequires:  pkgconfig(libavcodec) = 57.107.100
 BuildRequires:  pkgconfig(libavformat) = 57.83.100
 BuildRequires:  pkgconfig(libswscale) = 4.8.100
 BuildRequires:  pkgconfig(libavdevice) = 57.10.100
 BuildRequires:  pkgconfig(libavutil) = 55.78.100
-BuildRequires:  libjpeg-devel
-BuildRequires:  libmad-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libopenssl-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  librsvg-devel >= 2.5.0
-BuildRequires:  libtheora-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  unzip
-BuildRequires:  update-desktop-files
-BuildRequires:  xz
-BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  libSDL-devel
-BuildRequires:  pkgconfig(mozjs185)
+BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(libopenjpeg)
-%if 1
-BuildRequires:  wxWidgets-wxcontainer-devel
-%define _use_internal_dependency_generator 0
-%define __find_requires %wx_requires
-%else
-BuildRequires:  wxWidgets-devel
-%endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(openssl)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
 
 %description
 GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL.
@@ -115,8 +98,6 @@
 most advanced and robust 2D MPEG-4 Player available worldwide, as
 well as a decent 3D MPEG-4/VRML player.
 
-Author:         Jean Le Feuvre <jeanlf at users.sourceforge.net>
-
 %package -n libgpac%{sover}
 Summary:        Shared libraries for gpac
 Group:          System/Libraries
@@ -135,80 +116,28 @@
 %description -n libgpac-devel
 Development files for gpac.
 
-Author:         Jean Le Feuvre <jeanlf@users.sourceforge.net>
-
-%package -n Osmo4
-Summary:        MPEG-4 Media player based on gpac
-Group:          Productivity/Multimedia/Video/Players
-Requires:       %{name} = %{version}
-
-%description -n Osmo4
-Osmo4 is an MPEG-4 player with the following features:
-* MPEG-4 Systems player:
-* Optimized 2D graphics renderer compliant with the Complete2D Scene
-  Graph and Graphics profiles.
-* Video and audio presentation achieved through plugins
-* Multimedia player features:
-* Timeline controls: play, pause, step.
-* Graphics features: antialising, zoom and pan, scalable resizing
-  of rendering area
-* Support for Advanced Text and Graphics extension of MPEG-4 Systems
-* Frame export to JPG, PNG, BMP.
-
-Osmo4 enables the use of MPEG-4 Systems in a vast aplication domain,
-among which:
-* downloaded or streamed cartoons
-* synchronized, interactive mixes of graphics, text, video and audio
-* applications benefiting from MPEG-7 and MPEG-21 advances: meta-data,
-  encryption, watermarking, rights management
-
 %prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
+%autosetup -p1
 
 %build
-# Fix encoding warnings
-cp -p Changelog Changelog.origine
-iconv -f ISO-8859-1 -t UTF8 Changelog.origine > Changelog
-touch -r Changelog.origine Changelog
-rm -rf Changelog.origine
-
-cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
-iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt
-touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
-rm -rf doc/ipmpx_syntax.bt.origine
-
-sed -i~ '1 {s@^.*$@/*@}' src/utils/xml_parser.c
-
-### corrects typo
-sed -e 's|nb_droped|nb_dropped|g' -i applications/osmo4_wx/fileprops.cpp
+# remove icon path
+sed -i '/^Icon/cIcon=gpac' share/gpac.desktop
 
 # configure the beast
 ./configure \
-    --prefix=%{_prefix} \
-    --libdir="%{_lib}" \
-    --mandir=%{_mandir} \
-    --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
-
-# make the beast (NO parallel build possible ...)
-# fix I: File is compiled without RPM_OPT_FLAGS gpac doesn't respect any flags at all
-cp config.h include/gpac/configuration.h
-make %{?_smp_mflags} all CFLAG="%{optflags}"
-make %{?_smp_mflags} sggen
-make %{?_smp_mflags} -C applications/generators/SVG
-make %{?_smp_mflags} -C applications/udptsseg
+   --prefix="%{_prefix}" \
+   --libdir="%{_lib}" \
+   --mandir="%{_mandir}" \
+   --use-a52=system \
+   --extra-cflags="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DXP_UNIX -fPIC"
+
+%make_build all
+%make_build -C applications/generators/MPEG4
+%make_build -C applications/generators/SVG
+%make_build -C applications/generators/X3D
 
 # create dev-docs
-pushd doc
+pushd share/doc
     doxygen -u
     doxygen
 popd
@@ -226,34 +155,12 @@
     	%{buildroot}%{_bindir}
 done
 
-# udptsseg
-install -m 755 bin/gcc/udptsseg \
-    %{buildroot}%{_bindir}
-
-# Osmo4
-install -m 755 bin/gcc/Osmo4 \
-    %{buildroot}%{_bindir}
-
-# icon
-install -dm 755 %{buildroot}%{_datadir}/pixmaps
-convert -size 48x48 applications/osmo4_wx/osmo4.xpm \
-    Osmo4.png
-install -m 644 Osmo4.png \
-    %{buildroot}%{_datadir}/pixmaps
-
-# menu-entry
-install -dm 755 %{buildroot}%{_datadir}/applications
-cat > Osmo4.desktop << EOF
-[Desktop Entry]
-Comment=MPEG-4 Media player based on gpac
-Name=Osmo4
-GenericName=MPEG-4 Media player based on gpac
-Type=Application
-Exec=Osmo4
-Icon=Osmo4
-Terminal=false
-EOF
-%suse_update_desktop_file -i Osmo4 AudioVideo Player
+# install manpages
+mkdir -pv %{buildroot}%{_mandir}/man1
+install -m0644 share/doc/man/* -t %{buildroot}%{_mandir}/man1
+
+# fix categories
+%suse_update_desktop_file -r %{name} 'AudioVideo;Player;'
 
 # static lib
 rm -rf %{buildroot}%{_libdir}/*.a
@@ -268,34 +175,32 @@
 %postun -n libgpac%{sover} -p /sbin/ldconfig
 
 %files
-%doc AUTHORS BUGS Changelog README.md TODO
-%doc doc/configuration.html
+%doc Changelog README.md
+%doc share/doc/configuration.html
 %license COPYING
-%{_bindir}/DashCast
-%{_bindir}/MP42TS
 %{_bindir}/MP4Box
 %{_bindir}/MP4Client
 %{_bindir}/MPEG4Gen
 %{_bindir}/X3DGen
 %{_bindir}/SVGGen
-%{_bindir}/udptsseg
-%{_libdir}/%{name}/
-%{_datadir}/%{name}/
-%{_mandir}/man1/*
+%{_bindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/pixmaps/%{name}.png
+%{_libdir}/%{name}
+%{_mandir}/man1/gpac.1%{?ext_man}
+%{_mandir}/man1/gpac-filters.1%{?ext_man}
+%{_mandir}/man1/mp4box.1%{?ext_man}
+%{_mandir}/man1/mp4client.1%{?ext_man}
 
 %files -n libgpac%{sover}
 %{_libdir}/libgpac.so.%{sover}
 %{_libdir}/libgpac.so.%{sover}.*
 
 %files -n libgpac-devel
-%doc doc/CODING_STYLE doc/ipmpx_syntax.bt
+%doc share/doc/CODING_STYLE share/doc/ipmpx_syntax.bt
 %{_includedir}/%{name}/
 %{_libdir}/libgpac.so
 %{_libdir}/pkgconfig/%{name}.pc
 
-%files -n Osmo4
-%{_bindir}/Osmo4
-%{_datadir}/pixmaps/Osmo4.png
-%{_datadir}/applications/Osmo4.desktop
-
 %changelog

gpac-0.5.1-u32-count-redeclaration.patch Deleted

gpac-0.6.1-64bit-portability.patch Deleted

@@ -1,107 +0,0 @@
---- a/applications/generators/MPEG4/main.c
-+++ b/applications/generators/MPEG4/main.c
-@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
---- a/applications/generators/SVG/svggen.h
-+++ b/applications/generators/SVG/svggen.h
-@@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
- 
- FILE *BeginFile(u32 type);
- void EndFile(FILE *f, u32 type);
--
-+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
-+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
-+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
-+void generate_laser_tables(GF_List *svg_elements);
-+void generate_table(GF_List *elements);
-+void generateSVGCode_V1(GF_List *svg_elements);
-+void generateSVGCode_V2(GF_List *svg_elements);
-+void generateSVGCode_V3(GF_List *svg_elements);
-+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
-+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
-+void generate_laser_tables_da(GF_List *atts);
- 
- #endif // _SVGGEN_H_
---- a/applications/generators/X3D/main.c
-+++ b/applications/generators/X3D/main.c
-@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 			}
- 			//SFString
- 			else if (!strcmp(bf->familly, "SFString")) {
--				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
-+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
- 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
- 			}
- 
-@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
- 					store = CurrentLine;
- 					CurrentLine = token;
- 					GetNextToken(tok, " \"");
--					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
-+					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
- 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
- 					j+=1;
- 					CurrentLine = store;
---- a/configure
-+++ b/configure
-@@ -1277,7 +1277,6 @@ cat > $TMPC << EOF
- #include <inttypes.h>
- #define uint32_t unsigned int
- #define uint8_t unsigned char
--#include <a52dec/mm_accel.h>
- #include <a52dec/a52.h>
- int main( void ) { return 0; }
- EOF
---- a/modules/ac3_in/liba52_dec.c
-+++ b/modules/ac3_in/liba52_dec.c
-@@ -42,7 +42,6 @@
- #define uint8_t u8
- #endif
- 
--#include <a52dec/mm_accel.h>
- #include <a52dec/a52.h>
- 
- 
-@@ -71,7 +70,7 @@ static GF_Err AC3_AttachStream(GF_BaseDe
- 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Attaching stream %d\n", esd->ESID));
- 
- 	if (ctx->codec) a52_free(ctx->codec);
--	ctx->codec = a52_init(MM_ACCEL_DJBFFT);
-+	ctx->codec = a52_init();
- 	if (!ctx->codec) {
- 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
- 		return GF_IO_ERR;
---- a/modules/vtt_in/vtt_dec.c
-+++ b/modules/vtt_in/vtt_dec.c
-@@ -127,6 +127,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- 		/* TODO: try to parse a cue from the given string */
- 		break;
- 
-+#ifdef GPAC_HAS_SPIDERMONKEY
- 	case GPAC_OTI_SCENE_VTT_MP4:
- 	{
- #ifndef GPAC_DISABLE_MEDIA_IMPORT
-@@ -147,6 +148,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
- #endif
- 	}
- 	break;
-+#endif
- 
- 	default:
- 		return GF_BAD_PARAM;

gpac-0.6.1-libpng-version-detection.patch Deleted

@@ -1,70 +0,0 @@
-Index: gpac-0.6.1/configure
-===================================================================
---- gpac-0.6.1.orig/configure
-+++ gpac-0.6.1/configure
-@@ -1222,11 +1222,26 @@ cat > $TMPC << EOF
- int main( void ) { return 0; }
- EOF
- 
--png_cflags="-I$prefix/include"
--png_lflags="-L$prefix/lib -lpng -lz"
-+png_flavor=""
-+if [ -d /usr/include/libpng16 ] ; then \
-+   png_flavor="png16"
-+elif [ -d /usr/include/libpng15 ] ; then \
-+   png_flavor="png15"
-+elif [ -d /usr/include/libpng14 ] ; then \
-+   png_flavor="png14"
-+elif [ -d /usr/include/libpng12 ] ; then \
-+   png_flavor="png12"
-+else
-+   png_flavor="png"
-+fi
-+
-+png_cflags="-I$prefix/include/lib$png_flavor"
-+png_lflags="-L$prefix/$libdir -l$png_flavor -lz"
-+
- if docc $png_cflags $png_lflags $LDFLAGS ; then
-     has_png="system"
--elif docc $LDFLAGS -lpng -lz ; then
-+elif docc $LDFLAGS -l$png_flavor -lz 2> /dev/null  ; then
-+
-     has_png="system"
- fi
- if test "$cross_prefix" = "" ; then
-@@ -1239,12 +1254,12 @@ if test "$cross_prefix" = "" ; then
-     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_flavor -L$local_lib -l$png_flavor 2> /dev/null  ; then
-         has_png="local"
-     fi
- fi
- 
--
-+sed -i "s/png.h/lib$png_flavor\/png.h/" src/media_tools/img.c
- 
- #look for MAD support
- cat > $TMPC << EOF
-@@ -3024,6 +3039,7 @@ if test "$has_jpeg" != "no" ; then
- fi
- 
- echo "CONFIG_PNG=$has_png" >> config.mak
-+echo "png_flavor=$png_flavor" >> config.mak
- if test "$has_png" != "no" ; then
-     echo "#define GPAC_HAS_PNG" >> $TMPH
- fi
-Index: gpac-0.6.1/static.mak
-===================================================================
---- gpac-0.6.1.orig/static.mak
-+++ gpac-0.6.1/static.mak
-@@ -45,7 +45,7 @@ endif
- #5 - PNG support
- ifeq ($(CONFIG_PNG), no)
- else
--LINKLIBS+= -lpng
-+LINKLIBS+= -l$(png_flavor)
- ifeq ($(CONFIG_PNG), local)
- NEED_LOCAL_LIB="yes"
- MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"

gpac-0.6.1-no-pc.patch Deleted

gpac-0.7.1-enable_V4Studio.patch Deleted

@@ -1,56 +0,0 @@
-Index: gpac-0.7.1/applications/Makefile
-===================================================================
---- gpac-0.7.1.orig/applications/Makefile
-+++ gpac-0.7.1/applications/Makefile
-@@ -33,15 +33,15 @@ V4STUDIODIR=
- INSTDIRS=mp4client
- ifeq ($(CONFIG_XUL),no)
- else
--#INSTDIRS+=osmozilla
--#APPDIRS+=osmozilla
-+INSTDIRS+=osmozilla
-+APPDIRS+=osmozilla
- endif
- 
- #disable due to version incompatibilities
- ifeq ($(USE_WXWIDGETS), yes)
--#APPDIRS+=osmo4_wx
--#V4STUDIODIR=V4Studio
--#INSTDIRS+=osmo4_wx
-+APPDIRS+=osmo4_wx
-+V4STUDIODIR=V4Studio
-+INSTDIRS+=osmo4_wx
- endif
- 
- #MP4BOX_STATIC
-Index: gpac-0.7.1/applications/osmo4_wx/Makefile
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/Makefile
-+++ gpac-0.7.1/applications/osmo4_wx/Makefile
-@@ -46,7 +46,7 @@ SRCS := $(OBJS:.o=.cpp)
- all: $(PROG)
- 
- Osmo4$(EXE): $(OBJS)
--	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lm $(WX_LFLAGS) $(LINKFLAGS) $(LDFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-Index: gpac-0.7.1/applications/osmozilla/osmo_npapi.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmozilla/osmo_npapi.cpp
-+++ gpac-0.7.1/applications/osmozilla/osmo_npapi.cpp
-@@ -372,11 +372,11 @@ NPError NS_PluginGetValue(NPPVariable aV
- 	/* explicit plugin call */ \
- 	"application/x-gpac::GPAC plugin;" \
-  
--char * NP_GetMIMEDescription(void)
-+/*char * NP_GetMIMEDescription(void)
- {
- 	return (char *) GPAC_PLUGIN_MIMETYPES;
- }
--
-+*/
- 
- NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
- {

gpac-0.7.1-system-amr.patch Deleted

@@ -1,56 +0,0 @@
-Index: gpac-0.7.1/modules/amr_float_dec/Makefile
-===================================================================
---- gpac-0.7.1.orig/modules/amr_float_dec/Makefile
-+++ gpac-0.7.1/modules/amr_float_dec/Makefile
-@@ -18,19 +18,19 @@ endif
- #common obj
- OBJS=amr_float_dec.o
- 
-+AMR_LIBS=
-+
- #AMR NB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT
- ifeq ($(CONFIG_AMR_NB_FT), yes)
--OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
-+AMR_LIBS+=-lamrnb
- endif
- 
- 
- #AMR WB obj
- CFLAGS+=-DGPAC_HAS_AMR_FT_WB
- ifeq ($(CONFIG_AMR_WB_FT), yes)
--OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
--	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
--	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
-+AMR_LIBS+=-lamrwb
- endif
- 
- 
-@@ -45,7 +45,7 @@ all: $(LIB)
- 
- 
- $(LIB): $(OBJS)
--	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(AMR_LIBS) $(LDFLAGS)
- 
- clean: 
- 	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-Index: gpac-0.7.1/modules/amr_float_dec/amr_float_dec.c
-===================================================================
---- gpac-0.7.1.orig/modules/amr_float_dec/amr_float_dec.c
-+++ gpac-0.7.1/modules/amr_float_dec/amr_float_dec.c
-@@ -46,12 +46,12 @@
- 
- #ifdef GPAC_HAS_AMR_FT
- /*AMR WB*/
--#include "amr_nb_ft/interf_dec.h"
-+#include <amrnb/interf_dec.h>
- #endif
- 
- #ifdef GPAC_HAS_AMR_FT_WB
- /*AMR WB*/
--#include "amr_wb_ft/dec_if.h"
-+#include <amrwb/dec_if.h>
- #endif
- 
- #endif

gpac-0.8.0-x264-export.patch Deleted

gpac-1.0.0-64bit-portability.patch Added

gpac-1.0.0-no-pc.patch Added

gpac-1.0.0-remove_debianism.patch Added

@@ -0,0 +1,39 @@
+From 45633fabccf331405f5c09aa44db86d6962dfd0f Mon Sep 17 00:00:00 2001
+From: Aurelien David <aurelien.david@telecom-paristech.fr>
+Date: Wed, 17 Jun 2020 20:03:59 +0200
+Subject: [PATCH] don't use sylinks for pixmap in make install (#1512)
+
+---
+ Makefile | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+Index: gpac-1.0.0/Makefile
+===================================================================
+--- gpac-1.0.0.orig/Makefile
++++ gpac-1.0.0/Makefile
+@@ -164,13 +164,8 @@ ifneq ($(CONFIG_DARWIN),yes)
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/pixmaps"
+ 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/applications"
+ 
+-ifeq ($(IS_DEB_MAKE),undefined)
+-	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
++	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/res/gpac.png "$(DESTDIR)$(prefix)/share/pixmaps/"
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+-else
+-	dh_link $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)$(prefix)/share/pixmaps/gpac.png
+-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)$(prefix)/share/applications/"
+-endif
+ 
+ endif
+ 	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
+@@ -240,8 +235,8 @@ endif
+ 	rm -rf $(DESTDIR)$(mandir)/man1/gpac.1
+ 	rm -rf $(DESTDIR)$(mandir)/man1/gpac-filters.1
+ 	rm -rf $(DESTDIR)$(prefix)/share/gpac
+-	rm -rf $(DESTDIR)/usr/share/pixmaps/gpac.png
+-	rm -rf $(DESTDIR)/usr/share/applications/gpac.desktop
++	rm -rf $(DESTDIR)/$(prefix)/share/pixmaps/gpac.png
++	rm -rf $(DESTDIR)/$(prefix)/share/applications/gpac.desktop
+ 	rm -rf $(DESTDIR)$(prefix)/include/gpac
+ 
+ installdylib:

gpac.ssl.patch Changed

@@ -1,8 +1,8 @@
-Index: gpac-0.8.0/src/utils/downloader.c
+Index: gpac-1.0.0/src/utils/downloader.c
 ===================================================================
---- gpac-0.8.0.orig/src/utils/downloader.c
-+++ gpac-0.8.0/src/utils/downloader.c
-@@ -394,8 +394,7 @@ static Bool init_ssl_lib() {
+--- gpac-1.0.0.orig/src/utils/downloader.c
++++ gpac-1.0.0/src/utils/downloader.c
+@@ -406,8 +406,7 @@ Bool gf_ssl_init_lib() {
  #if OPENSSL_VERSION_NUMBER < 0x10100000L
  	SSL_library_init();
  	SSL_load_error_strings();
@@ -12,7 +12,7 @@
  #endif
  
  	_ssl_is_initialized = GF_TRUE;
-@@ -432,13 +431,13 @@ static int ssl_init(GF_DownloadManager *
+@@ -444,13 +443,13 @@ static int ssl_init(GF_DownloadManager *
  	case 1:
  		meth = SSLv2_client_method();
  		break;
@@ -24,6 +24,6 @@
  		meth = TLSv1_client_method();
  		break;
 +#endif
- #else /* for openssl 1.1+ this is the prefered method */
+ #else /* for openssl 1.1+ this is the preferred method */
  	case 0:
  		meth = TLS_client_method();

gpac.wx.patch Deleted

@@ -1,250 +0,0 @@
-Index: gpac-0.7.1/applications/osmo4_wx/wxOsmo4.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/wxOsmo4.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/wxOsmo4.cpp
-@@ -235,10 +235,10 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 	break;
- 	case GF_EVENT_PROGRESS:
- 	{
--		const char *sTitle;
--		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
--		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
--		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
-+		const char *sTitle = "";
-+		if (evt->progress.progress_type==0) sTitle = "Buffer";
-+		else if (evt->progress.progress_type==1) sTitle = "Download";
-+		else if (evt->progress.progress_type==2) sTitle = "Import";
- 		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
- 	}
- 	break;
-@@ -289,7 +289,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 			{
- 				wxGPACEvent wxevt(app);
- 				wxevt.gpac_evt = *evt;
--				app->AddPendingEvent(wxevt);
-+				app->GetEventHandler()->AddPendingEvent(wxevt);
- 			}
- 			break;
- 			}
-@@ -302,7 +302,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
- 		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
- 		if (!evt->connect.is_connected) app->m_duration = 0;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	break;
- 	case GF_EVENT_NAVIGATE:
-@@ -310,7 +310,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxGPACEvent wxevt(app);
- 		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
- 		wxevt.gpac_evt.type = evt->type;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	return 1;
- 	case GF_EVENT_SET_CAPTION:
-@@ -318,7 +318,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 		wxGPACEvent wxevt(app);
- 		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
- 		wxevt.gpac_evt.type = evt->type;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	return 1;
- 
-@@ -330,7 +330,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
- 	{
- 		wxGPACEvent wxevt(app);
- 		wxevt.gpac_evt = *evt;
--		app->AddPendingEvent(wxevt);
-+		app->GetEventHandler()->AddPendingEvent(wxevt);
- 	}
- 	break;
- 	case GF_EVENT_DBLCLICK:
-@@ -539,7 +539,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 	wxString abs_gpac_path = wxT("");
- 	char *gpac_cfg, *sep;
- 
--	::wxLogMessage(wxT("Looking for GPAC configuration file"));
-+	wxLogMessage(wxT("Looking for GPAC configuration file"));
- 
- 	/*load config*/
- 	Bool first_launch = 0;
-@@ -568,7 +568,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 
- 	gf_sys_init(GF_MemTrackerNone);
- 
--	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
-+	wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
- 
- 	m_user.modules = gf_modules_new(str, m_user.config);
- 	/*initial launch*/
-@@ -594,12 +594,12 @@ Bool wxOsmo4Frame::LoadTerminal()
- 
- 
- 
--	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
-+	wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
- 	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
--		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
-+		wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
- 	}
- 
--	::wxLogMessage(wxT("Starting GPAC Terminal"));
-+	wxLogMessage(wxT("Starting GPAC Terminal"));
- 	/*now load terminal*/
- 	m_user.opaque = this;
- 	m_user.EventProc = GPAC_EventProc;
-@@ -611,7 +611,7 @@ Bool wxOsmo4Frame::LoadTerminal()
- 		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
- 		return 0;
- 	} else {
--		::wxLogMessage(wxT("GPAC Terminal started") );
-+		wxLogMessage(wxT("GPAC Terminal started") );
- 	}
- 	return 1;
- }
-@@ -877,7 +877,7 @@ wxOsmo4Frame::wxOsmo4Frame() :
- 	sOpt = gf_cfg_get_key(m_user.config, "Audio", "DriverName");
- 
- 	if (!strcmp(sOpt, "No Audio Output Available")) {
--		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
-+		wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
- 		SetStatus(wxT("No audio ouput available"));
- 
- 	} else {
-@@ -1140,7 +1140,7 @@ wxString wxOsmo4Frame::GetFileFilter()
- 
- void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxFD_OPEN | wxFD_MULTIPLE | wxFD_CHANGE_DIR /*| wxHIDE_READONLY*/);
- 
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
-@@ -1934,7 +1934,7 @@ void wxMyComboBox::OnKeyUp(wxKeyEvent &e
- 		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
- 		evt.SetEventObject(this);
- 		evt.SetId(GetId());
--		GetParent()->AddPendingEvent(evt);
-+		GetParent()->GetEventHandler()->AddPendingEvent(evt);
- 	}
- }
- 
-@@ -2169,7 +2169,7 @@ void wxOsmo4Frame::OnUpdateStreamMenu(wx
- 
- void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxFD_OPEN | wxFD_CHANGE_DIR /* | wxHIDE_READONLY*/);
- 
- 	if (dlg.ShowModal() == wxID_OK) {
- 		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
-Index: gpac-0.7.1/applications/osmo4_wx/menubtn.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/menubtn.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/menubtn.cpp
-@@ -86,7 +86,7 @@ bool wxCustomButton::Create(wxWindow* pa
- 
- 	wxSize bestSize = DoGetBestSize();
- 	SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	SetBestSize(GetSize());
- #else
- 	SetInitialSize(GetSize());
-@@ -161,7 +161,7 @@ void wxCustomButton::OnMouseEvents(wxMou
- 
- 		m_eventType = wxEVT_LEFT_UP;
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
- #else
- 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-@@ -200,7 +200,7 @@ void wxCustomButton::OnMouseEvents(wxMou
- 
- 		m_eventType = wxEVT_RIGHT_UP;
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
- #else
- 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
-@@ -319,7 +319,7 @@ void wxCustomButton::Redraw()
- 
- void wxCustomButton::Paint( wxDC &dc )
- {
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	dc.BeginDrawing();
- #endif
- 
-@@ -407,7 +407,7 @@ void wxCustomButton::Paint( wxDC &dc )
- 	dc.SetBackground(wxNullBrush);
- 	dc.SetBrush(wxNullBrush);
- 	dc.SetPen(wxNullPen);
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	dc.EndDrawing();
- #endif
- }
-@@ -580,7 +580,7 @@ public:
- 		{
- 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 			if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
- #else
- 			if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
-@@ -628,7 +628,7 @@ public:
- 		{
- 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 			if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
- #else
- 			if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
-@@ -706,7 +706,7 @@ bool wxMenuButton::Create( wxWindow* par
- 	SetSize( wxSize(size.x < 0 ? bestSize.x : size.x,
- 	                size.y < 0 ? bestSize.y : size.y) );
- 
--#if (wxMINOR_VERSION<8)
-+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
- 	SetBestSize(GetSize());
- #else
- 	SetInitialSize(GetSize());
-Index: gpac-0.7.1/applications/osmo4_wx/Playlist.cpp
-===================================================================
---- gpac-0.7.1.orig/applications/osmo4_wx/Playlist.cpp
-+++ gpac-0.7.1/applications/osmo4_wx/Playlist.cpp
-@@ -296,7 +296,7 @@ void wxPlaylist::RefreshList()
- 
- void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxOPEN | wxCHANGE_DIR | /*wxHIDE_READONLY |*/ wxMULTIPLE);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxFD_OPEN | wxFD_CHANGE_DIR | /*wxHIDE_READONLY |*/ wxFD_MULTIPLE);
- 
- 	if (dlg.ShowModal() == wxID_OK) {
- 		wxArrayString stra;
-@@ -452,7 +452,7 @@ void wxPlaylist::OnSave(wxCommandEvent &
- 	char szPath[GF_MAX_PATH];
- 	if (!gf_list_count(m_entries)) return;
- 
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxSAVE | wxCHANGE_DIR | wxOVERWRITE_PROMPT);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_SAVE | wxFD_CHANGE_DIR | wxFD_OVERWRITE_PROMPT);
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
- 	strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
-@@ -501,7 +501,7 @@ void wxPlaylist::Save(char *szPath, Bool
- 
- void wxPlaylist::OnOpen(wxCommandEvent & WXUNUSED(event))
- {
--	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxOPEN | wxCHANGE_DIR/* | wxHIDE_READONLY*/);
-+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_OPEN | wxFD_CHANGE_DIR/* | wxHIDE_READONLY*/);
- 	if (dlg.ShowModal() != wxID_OK) return;
- 
- 	Clear();

gpac-0.8.0.tar.gz/AUTHORS Deleted

gpac-0.8.0.tar.gz/BUGS Deleted

gpac-0.8.0.tar.gz/INSTALLME Deleted

@@ -1,67 +0,0 @@
-Installation instructions for latest GPAC GIT version - March 2015:
-
-For Windows, Linux and Mac OS X versions, follow the instructions on http://gpac.io/downloads/
-
-For Android, follow the instructions in gpac/build/android/README
-
-(WindowsMobile platform is no longer maintained)
-For WindowsMobile platform, get the latest package of gpac extra libs available here:
-
-https://sourceforge.net/p/gpac/code/HEAD/tree/trunk/gpac_extra_libs/
-
-and follow the instructions in gpac/doc/INSTALL.wCE
-
-
-
-Other Installation instructions for GPAC
-
-
-* Foreword
-	
-	GPAC may be compiled without any third party libraries, but in this case its functionalities are very
-limited (no still image, no audio, no video, no text, no scripting). It is therefore recommended to download the 
-extra lib package available at http://sourceforge.net/projects/gpac. Compilation instructions for these libraries 
-are provided per library in the package. 
-
-	The current extra_lib package to use with gpac is gpac_extra_libs available here: 
-http://download.tsi.telecom-paristech.fr/gpac/gpac_extra_libs.zip
-
-	In case you have some of these libs already installed on your system, the detailed list of dependencies is
-	* freetype2 from version 2.1.4 on.
-	* SpiderMonkey v1.7 (libjs from mozilla).
-	* libjpg version 6b
-	* Libpng version 1.2.33 (older versions should work)
-	* MAD version 0.15.1b (older versions should work)
-	* xvid version 1.0 (0.9.0 / .1 / .2 should also work)
-	* ffmpeg (latest stable API version checked was 17 February 2016 snapshot, you may need to change a few things with current versions)
-	* libogg 1.1, libvorbis 1.1 and libtheora 1.0 from Xiph.org (newer versions work)
-	* faad2, version 2.0 or above (2.6.1 working)
-	* liba52, version 0.7.4
-	* OpenJPEG, version 1.3
-	* OpenSVCDecoder, version 1.3
-
-* Installing GPAC
-
-/!\ GPAC won't compile if the 'git' command is not in your path /!\
-
-!! WARNING !!
-The following instructions may not be completely up to data
-You should use online instructions which may be more up-to-date:
-http://gpac.io/2011/04/18/command-line-gpac-compiling-on-windows-x86-using-free-microsoft-visual-c/
-
-Detailed instruction for Win32 MSVC Compilation are available in gpac/doc/INSTALL.w32
-
-Detailed instruction for WinCE eVC Compilation are available in gpac/doc/INSTALL.wCE
-
-Detailed instruction for GCC Compilation are available in gpac/doc/INSTALL.gcc
-
-Detailed instruction for GCC cross-compilation for familiar+GPE systems are available in gpac/doc/INSTALL.gpe
-	
-Detailed instruction for GCCE/Symbian cross-compilation for Symbian v9.1 systems are available in gpac/doc/INSTALL.symbian
-
-Detailed instruction for iOS Compilation are available in gpac/build/xcode/README_IOS.txt
-	
-* Configuring GPAC
-
-GPAC's client configuration is documented in gpac/doc/configuration.html
-MP4Box documentation is available online at http://gpac.sourceforge.net

gpac-0.8.0.tar.gz/TODO Deleted

gpac-0.8.0.tar.gz/applications/GPAX Deleted

gpac-0.8.0.tar.gz/applications/GPAX/GPAXPlugin.cpp Deleted

@@ -1,710 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / ActiveX control
- *
- *  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 "stdafx.h"
-#include "GPAX.h"
-#include "GPAXPlugin.h"
-#include <gpac/network.h>
-#include <gpac/utf.h>
-#include <shlobj.h>
-#include <math.h>
-
-#ifndef _WIN32_WCE
-#include <direct.h>
-#include <mshtml.h>
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CGPAXPlugin
-
-#if 0
-static print_err(char *msg, char *title)
-{
-	u16 w_msg[1024], w_title[1024];
-	CE_CharToWide(msg, w_msg);
-	CE_CharToWide(title, w_title);
-	::MessageBox(NULL, w_msg, w_title, MB_OK);
-}
-#endif
-
-
-void CGPAXPlugin::SetStatusText(char *msg)
-{
-#ifndef _WIN32_WCE
-	if (m_pBrowser) {
-		if (msg) {
-			u16 w_msg[1024];
-			gf_utf8_mbstowcs(w_msg, 1024, (const char **)&msg);
-			m_pBrowser->put_StatusText((BSTR) w_msg);
-		} else {
-			m_pBrowser->put_StatusText(L"");
-		}
-	}
-#endif
-}
-//GPAC player Event Handler. not yet implemented, just dummies here
-Bool CGPAXPlugin::EventProc(GF_Event *evt)
-{
-	char msg[1024];
-	if (!m_term) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (evt->message.error) {
-			sprintf(msg, "(GPAC) %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
-		} else {
-			sprintf(msg, "(GPAC) %s", evt->message.message);
-		}
-		SetStatusText(msg);
-		break;
-	case GF_EVENT_PROGRESS:
-		if (evt->progress.done == evt->progress.total) {
-			SetStatusText(NULL);
-			m_iDownload_progress = 100;
-		} else {
-			char *szTitle = "";
-			if (evt->progress.progress_type==0) szTitle = "Buffer ";
-			else if (evt->progress.progress_type==1)
-			{
-				szTitle = "Download ";
-				m_iDownload_progress = (int)floor((100.0*evt->progress.done) / evt->progress.total);
-			}
-			else if (evt->progress.progress_type==2) szTitle = "Import ";
-			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
-			SetStatusText(msg);
-		}
-		break;
-	case GF_EVENT_CONNECT:
-		m_bIsConnected = evt->connect.is_connected;
-		break;
-	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
-	case GF_EVENT_SCENE_SIZE:
-		gf_term_set_size(m_term, m_width, m_height);
-		break;
-	/*window has been resized (full-screen plugin), resize*/
-	case GF_EVENT_SIZE:
-		m_width = evt->size.width;
-		m_height = evt->size.height;
-		gf_term_set_size(m_term, m_width, m_height);
-		break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
-		break;
-	case GF_EVENT_KEYDOWN:
-		if ((evt->key.flags  & GF_KEY_MOD_ALT)) {
-		} else {
-			switch (evt->key.key_code) {
-			case GF_KEY_HOME:
-				gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 1);
-				break;
-			case GF_KEY_ESCAPE:
-				gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
-				break;
-			}
-		}
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		strcpy(msg, evt->navigate.to_url);
-		SetStatusText(msg);
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
-			gf_term_navigate_to(m_term, evt->navigate.to_url);
-			return GF_TRUE;
-		}
-#ifndef _WIN32_WCE
-		else if (m_pBrowser) {
-			u32 i;
-			const char **sz_ptr;
-			u16 w_szTar[1024], w_szURL[1024];
-			VARIANT target, flags;
-			flags.intVal = 0;
-			target.bstrVal = L"_SELF";
-
-			for (i=0; i<evt->navigate.param_count; i++) {
-				if (!strcmp(evt->navigate.parameters[i], "_parent")) target.bstrVal = L"_PARENT";
-				else if (!strcmp(evt->navigate.parameters[i], "_blank")) target.bstrVal = L"_BLANK";
-				else if (!strcmp(evt->navigate.parameters[i], "_top")) target.bstrVal = L"_TOP";
-				else if (!strcmp(evt->navigate.parameters[i], "_new")) flags.intVal |= navOpenInNewWindow;
-				else if (!strnicmp(evt->navigate.parameters[i], "_target=", 8)) {
-					sz_ptr = & evt->navigate.parameters[i]+8;
-					gf_utf8_mbstowcs(w_szTar, 1024, (const char **)sz_ptr);
-					target.bstrVal = (BSTR) w_szTar;
-				}
-			}
-			sz_ptr = & evt->navigate.to_url;
-			gf_utf8_mbstowcs(w_szURL, 1024, (const char **)sz_ptr);
-			m_pBrowser->Navigate((BSTR) w_szURL, &flags, &target, NULL, NULL);;
-			return GF_TRUE;
-		}
-#endif
-		break;
-	}
-	return GF_FALSE;
-}
-
-Bool GPAX_EventProc(void *ptr, GF_Event *evt)
-{
-	CGPAXPlugin *_this = (CGPAXPlugin *)ptr;
-	return _this->EventProc(evt);
-}
-
-//Read Parameters from pPropBag given by MSIE
-Bool CGPAXPlugin::ReadParamString(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog,
-                                  WCHAR *name, char *buf, int bufsize)
-{
-	VARIANT v;
-	HRESULT hr;
-	Bool retval = GF_FALSE;
-
-	v.vt = VT_EMPTY;
-	v.bstrVal = NULL;
-	hr = pPropBag->Read(name, &v, pErrorLog);
-	if(SUCCEEDED(hr))
-	{
-		if(v.vt==VT_BSTR && v.bstrVal)
-		{
-//            USES_CONVERSION;
-//            lstrcpyn(buf,OLE2T(v.bstrVal),bufsize);
-			const u16 *srcp = (const u16 *) v.bstrVal;
-			size_t len = gf_utf8_wcstombs(buf, bufsize, &srcp);
-			if (len>=0) {
-				buf[(u32) len] = 0;
-				retval = GF_TRUE;
-			}
-		}
-		VariantClear(&v);
-	}
-	return retval;
-}
-
-void CGPAXPlugin::LoadDATAUrl()
-{
-#ifndef _WIN32_WCE
-	HRESULT hr;
-
-	if (m_url[0]) return;
-	/*get parent doc*/
-	CComPtr<IOleContainer> spContainer;
-	if (m_spClientSite->GetContainer(&spContainer) != S_OK)
-		return;
-	CComPtr<IHTMLDocument2> spDoc = CComQIPtr<IHTMLDocument2>(spContainer);
-	CComPtr<IHTMLElementCollection> spColl;
-	if (spDoc->get_all(&spColl) != S_OK)
-		return;
-	/*get HTML <object> in the doc*/
-	CComPtr<IDispatch> spDisp;
-	CComPtr<IHTMLElementCollection> sphtmlObjects;
-
-	CComPtr<IDispatch> spDispObjects;
-	if (spColl->tags(CComVariant("OBJECT"), &spDispObjects) != S_OK)
-		return;
-	CComPtr<IHTMLElementCollection> spObjs = CComQIPtr<IHTMLElementCollection>(spDispObjects);
-
-	/*browse all objects and find us*/
-	long lCount = 0;
-	spObjs->get_length(&lCount);
-	for (long lCnt = 0; lCnt < lCount; lCnt++) {
-		IDispatch *an_obj= NULL;
-		CComVariant varEmpty;
-		CComVariant varName;
-		varName.vt = VT_I4;
-		varName.lVal = lCnt;
-		hr = spObjs->item(varName, varEmpty, &an_obj);
-		varName.Clear();
-		varEmpty.Clear();
-		if (hr != S_OK) continue;
-
-		/*get the IHTMLObject*/
-		IHTMLObjectElement* pObjectElem=NULL;
-		an_obj->QueryInterface(IID_IHTMLObjectElement, (void**)&pObjectElem);
-		if (!pObjectElem) continue;
-
-		/*get its parent owner - it MUST be us*/
-		IDispatch *disp= NULL;
-		pObjectElem->get_object(&disp);
-		if (disp != this) continue;
-
-		BSTR data = NULL;
-		if ((pObjectElem->get_data(&data) == S_OK) && data) {
-			const u16 *srcp = (const u16 *) data;
-			size_t len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
-			if (len>=0) m_url[(u32) len] = 0;
-		}
-		SysFreeString(data);
-		break;
-	}
-
-	if (m_url) {
-		UpdateURL();
-	}
-#endif
-
-}
-
-// trap keys and forward on to the control
-BOOL CGPAXPlugin::PreTranslateMessage(MSG* pMsg)
-{
-	switch (pMsg->message)
-	{
-	case WM_KEYDOWN:
-	case WM_KEYUP:
-		switch (pMsg->wParam)
-		{
-		case VK_UP:
-		case VK_DOWN:
-		case VK_LEFT:
-		case VK_RIGHT:
-		case VK_HOME:
-		case VK_END:
-			SendMessage (pMsg->message, pMsg->wParam, pMsg->lParam);
-			// Windowless controls won't be able to call SendMessage.
-			// Instead, just respond to the message here.
-			return TRUE;
-		}
-		break;
-	}
-	return FALSE;
-//  return COleControl::PreTranslateMessage(pMsg);
-}
-
-
-
-
-#define GPAC_REG_KEY	HKEY_CURRENT_USER
-
-static void gpax_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-//Create window message fuction. when the window is created, also initialize a instance of
-//GPAC player instance.
-LRESULT CGPAXPlugin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	if (m_term) return 0;
-	const char *str;
-
-	if (m_hWnd==NULL) return 0;
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	//Create a structure m_user for initialize the terminal. the parameters to set:
-	//1)config file path
-	//2)Modules file path
-	//3)window handler
-	//4)EventProc
-	memset(&m_user, 0, sizeof(m_user));
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-
-	m_user.config = gf_cfg_init(NULL, NULL);
-	if(!m_user.config) {
-#ifdef _WIN32_WCE
-		::MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
-#else
-		::MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
-#endif
-		goto err_exit;
-	}
-
-	/*check log file*/
-	str = gf_cfg_get_key(m_user.config, "General", "LogFile");
-	if (str) {
-		m_pLogs = gf_fopen(str, "wt");
-		if (m_pLogs) gf_log_set_callback(m_pLogs, gpax_do_log);
-	}
-
-	/*if logs are specified, use them*/
-	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
-
-
-	str = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-	m_user.modules = gf_modules_new(NULL, m_user.config);
-	if(!gf_modules_get_count(m_user.modules)) goto err_exit;
-
-	m_user.os_window_handler = m_hWnd;
-	m_user.opaque = this;
-	m_user.EventProc = GPAX_EventProc;
-
-	//create a terminal
-	m_term = gf_term_new(&m_user);
-
-	if (!m_term) goto err_exit;
-
-	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-
-	LoadDATAUrl();
-
-	RECT rc;
-	::GetWindowRect(m_hWnd, &rc);
-	m_width = rc.right-rc.left;
-	m_height = rc.bottom-rc.top;
-	if (m_bAutoStart && strlen(m_url)) Play();
-	return 0;
-
-	//Error Processing
-err_exit:
-	if(m_user.modules)
-		gf_modules_del(m_user.modules);
-	m_user.modules = NULL;
-	if(m_user.config)
-		gf_cfg_del(m_user.config);
-	m_user.config = NULL;
-	gf_sys_close();
-	return 1;
-}
-
-void CGPAXPlugin::UnloadTerm()
-{
-	if (m_term) {
-		GF_Terminal *a_term = m_term;
-		m_term = NULL;
-		gf_term_del(a_term);
-	}
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	if (m_user.config) gf_cfg_del(m_user.config);
-	if (m_pLogs)
-		gf_fclose(m_pLogs);
-	m_pLogs = NULL;
-	gf_log_set_callback(NULL, NULL);
-	memset(&m_user, 0, sizeof(m_user));
-	gf_sys_close();
-}
-CGPAXPlugin::~CGPAXPlugin()
-{
-	UnloadTerm();
-#ifndef _WIN32_WCE
-	if (m_pBrowser) m_pBrowser->Release();
-	m_pBrowser = NULL;
-#endif
-}
-LRESULT CGPAXPlugin::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
-	UnloadTerm();
-	return 0;
-}
-
-
-HRESULT CGPAXPlugin::OnDraw(ATL_DRAWINFO& di)
-{
-	if (m_term && m_bInitialDraw) {
-		m_bInitialDraw = GF_FALSE;
-		if (m_bAutoStart) Play();
-	}
-	return S_OK;
-}
-
-// Load is called before OnCreate, but it may not be called at
-// all if there are no parameters.
-STDMETHODIMP CGPAXPlugin::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog)
-{
-	char szOpt[1024];
-	// examine the <embed>/<param> tag arguments
-
-	m_url[0] = 0;
-	ReadParamString(pPropBag,pErrorLog,L"src", m_url, MAXLEN_URL);
-	if (!m_url[0])
-		ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
-
-	if (ReadParamString(pPropBag,pErrorLog,L"autostart", szOpt, 1024))
-		m_bAutoStart = (!stricmp(szOpt, "false") || !stricmp(szOpt, "no")) ? GF_FALSE : GF_TRUE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"use3d", szOpt, 1024))
-		m_bUse3D = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"aspectratio", szOpt, 1024)) {
-		if (!stricmp(szOpt, "keep")) m_AR = GF_ASPECT_RATIO_KEEP;
-		else if (!stricmp(szOpt, "16:9")) m_AR = GF_ASPECT_RATIO_16_9;
-		else if (!stricmp(szOpt, "4:3")) m_AR = GF_ASPECT_RATIO_4_3;
-		else if (!stricmp(szOpt, "fill")) m_AR = GF_ASPECT_RATIO_FILL_SCREEN;
-	}
-
-	if (ReadParamString(pPropBag,pErrorLog,L"loop", szOpt, 1024))
-		m_bLoop = !stricmp(szOpt, "true") ? GF_FALSE : GF_TRUE;
-
-	if (ReadParamString(pPropBag,pErrorLog,L"gui", szOpt, 1024))
-		m_bUseGUI = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	UpdateURL();
-
-#ifndef _WIN32_WCE
-	/*get the top-level container*/
-	if (!m_pBrowser) {
-		IServiceProvider *isp, *isp2 = NULL;
-		if ( SUCCEEDED(m_spClientSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&isp)) ) ) {
-
-			if (SUCCEEDED(isp->QueryService(SID_STopLevelBrowser, IID_IServiceProvider, reinterpret_cast<void **>(&isp2)) ) ) {
-				isp2->QueryService(SID_SWebBrowserApp, IID_IWebBrowser2, reinterpret_cast<void **>(&m_pBrowser));
-				isp2->Release();
-			}
-			isp->Release();
-		}
-	}
-	if (m_pBrowser) m_pBrowser->put_StatusText(L"GPAC Ready");
-#endif
-
-	return IPersistPropertyBagImpl<CGPAXPlugin>::Load(pPropBag, pErrorLog);
-}
-
-void CGPAXPlugin::UpdateURL()
-{
-	/*get absolute URL*/
-	if (!strlen(m_url)) return;
-	IMoniker* pMoniker	= NULL;
-	LPOLESTR sDisplayName;
-
-	if (SUCCEEDED(m_spClientSite->GetMoniker(OLEGETMONIKER_TEMPFORUSER,
-	              OLEWHICHMK_CONTAINER,
-	              &pMoniker) ) ) {
-		char parent_url[1024];
-		pMoniker->GetDisplayName(NULL, NULL, &sDisplayName);
-		wcstombs(parent_url, sDisplayName, 300);
-		pMoniker->Release();
-
-		char *abs_url = gf_url_concatenate(parent_url, m_url);
-		if (abs_url) {
-			strcpy(m_url, abs_url);
-			gf_free(abs_url);
-		}
-	}
-}
-
-STDMETHODIMP CGPAXPlugin::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties)
-{
-	u16 wurl[MAXLEN_URL];
-	const char *sptr;
-	u16 len;
-
-	VARIANT value;
-	if( pPropBag == NULL) return E_INVALIDARG;
-
-	VariantInit(&value);
-
-	V_VT(&value) = VT_BOOL;
-	V_BOOL(&value) = m_bAutoStart ? VARIANT_TRUE : VARIANT_FALSE;
-	pPropBag->Write(OLESTR("AutoStart"), &value);
-	VariantClear(&value);
-
-	V_VT(&value) = VT_BSTR;
-
-	sptr = (const char *)m_url;
-	len = (u16) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
-	V_BSTR(&value) = SysAllocStringLen(NULL, len+1);
-	memcpy(V_BSTR(&value) , wurl, len*sizeof(u16));
-	V_BSTR(&value) [len] = 0;
-
-	pPropBag->Write(OLESTR("src"), &value);
-	VariantClear(&value);
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Play()
-{
-	if (m_term) {
-		if (!m_bIsConnected) {
-			if (strlen(m_url)) {
-				/*connect from 0 and pause if not autoplay*/
-				const char *gui = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-				if (gui && m_bUseGUI) {
-					gf_cfg_set_key(m_user.config, "Temp", "BrowserMode", "yes");
-					gf_cfg_set_key(m_user.config, "Temp", "GUIStartupFile", m_url);
-					gf_term_connect(m_term, gui);
-				} else {
-					gf_term_connect(m_term, m_url);
-				}
-				gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, m_AR);
-			}
-		} else
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);   //if target is connected, set it playing
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Pause()
-{
-	if(m_term) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		} else {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Stop()
-{
-	if(m_term) gf_term_disconnect(m_term);     //set it stop
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::QualitySwitch(int switch_up)
-{
-	if (m_term) gf_term_switch_quality(m_term, switch_up ? GF_TRUE : GF_FALSE);
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::SetURL(BSTR _url)
-{
-	if (m_term) {
-		u16 *srcp;
-		u32 len;
-		char *url;
-
-		srcp = (u16 *)_url;
-		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
-		if (len) {
-			url = (char *) gf_malloc(sizeof(char) * (len+1));
-			srcp = (u16 *)_url;
-			len = (u32) gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
-			url[len] = 0;
-			strcpy(m_url, url);
-			gf_term_connect(m_term, url);
-			gf_free(url);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::Update(BSTR _mtype, BSTR _updates)
-{
-	if (m_term) {
-		u16 *srcp;
-		u32 len;
-		char mtype[1024], *updates;
-
-		srcp = (u16 *) _mtype;
-		len = (u32) gf_utf8_wcstombs(mtype, 1024, (const u16 **)&srcp);
-		mtype[len] = 0;
-
-		srcp = (u16 *)_updates;
-		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
-		if (len) {
-			updates = (char *) gf_malloc(sizeof(char) * (len+1));
-			srcp = (u16 *)_updates;
-			len = (u32) gf_utf8_wcstombs(updates, len, (const u16 **)&srcp);
-			updates[len] = 0;
-			gf_term_scene_update(m_term, mtype, updates);
-			gf_free(updates);
-		}
-	}
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_src(BSTR *url)
-{
-	u16 wurl[MAXLEN_URL];
-	const char *sptr;
-	u16 len;
-	if (url==NULL) return E_POINTER;
-
-	sptr = (const char *)m_url;
-	len = (u32) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
-	*url = SysAllocStringLen(NULL, len+1);
-	memcpy(*url, wurl, len*sizeof(u16));
-	*url[len] = 0;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_src(BSTR url)
-{
-	const u16 *srcp = (const u16 *)url;
-	u32 len = (u32) gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
-	m_url[len] = 0;
-	UpdateURL();
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_AutoStart(VARIANT_BOOL *as)
-{
-	if (as==NULL) return E_POINTER;
-	*as = m_bAutoStart ? VARIANT_TRUE: VARIANT_FALSE;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_AutoStart(VARIANT_BOOL as)
-{
-	m_bAutoStart = (as !=VARIANT_FALSE) ? GF_TRUE : GF_FALSE;
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::get_DownloadProgress(INT *dp)
-{
-	if (dp==NULL) return E_POINTER;
-	*dp = m_iDownload_progress;
-	return S_OK;
-}
-STDMETHODIMP CGPAXPlugin::put_DownloadProgress(INT dp)
-{
-	return S_OK;
-}
-
-STDMETHODIMP CGPAXPlugin::GetInterfaceSafetyOptions(
-    REFIID riid,
-    DWORD *pdwSupportedOptions,
-    DWORD *pdwEnabledOptions
-)
-{
-	if( (NULL == pdwSupportedOptions) || (NULL == pdwEnabledOptions) )
-		return E_POINTER;
-
-	*pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER;
-
-	if ((IID_IDispatch == riid) || (IID_IGPAX == riid)) {
-		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER;
-		return NOERROR;
-	}
-	else if (IID_IPersistPropertyBag == riid)  {
-		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA;
-		return NOERROR;
-	}
-	*pdwEnabledOptions = 0;
-	return E_NOINTERFACE;
-};
-
-STDMETHODIMP CGPAXPlugin::SetInterfaceSafetyOptions(
-    REFIID riid,
-    DWORD dwOptionSetMask,
-    DWORD dwEnabledOptions
-)
-{
-	if ((IID_IDispatch == riid) || (IID_IGPAX == riid) ) {
-		if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask)
-		        && (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) ) {
-			return NOERROR;
-		}
-		return E_FAIL;
-	}
-	else if (IID_IPersistPropertyBag == riid) {
-		if( (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwOptionSetMask)
-		        && (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwEnabledOptions) ) {
-			return NOERROR;
-		}
-		return E_FAIL;
-	}
-	return E_FAIL;
-};
-

gpac-0.8.0.tar.gz/applications/dashcast Deleted

gpac-0.8.0.tar.gz/applications/mp42avi Deleted

gpac-0.8.0.tar.gz/applications/mp42avi/main.c Deleted

@@ -1,785 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line mp4 toolbox
- *
- *  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/isomedia.h>
-#include <gpac/compositor.h>
-#include <gpac/scenegraph.h>
-#include <gpac/bifs.h>
-#include <gpac/options.h>
-
-#ifdef WIN32
-#include <windows.h>
-#define GPAC_CFG_FILE "GPAC.cfg"
-#else
-#include <pwd.h>
-typedef struct tagBITMAPFILEHEADER
-{
-	u16	bfType;
-	u32	bfSize;
-	u16	bfReserved1;
-	u16	bfReserved2;
-	u32 bfOffBits;
-} BITMAPFILEHEADER;
-
-typedef struct tagBITMAPINFOHEADER {
-	u32	biSize;
-	s32	biWidth;
-	s32	biHeight;
-	u16	biPlanes;
-	u16	biBitCount;
-	u32	biCompression;
-	u32	biSizeImage;
-	s32	biXPelsPerMeter;
-	s32	biYPelsPerMeter;
-	u32	biClrUsed;
-	u32	biClrImportant;
-} BITMAPINFOHEADER;
-
-#define BI_RGB        0L
-
-#define GPAC_CFG_FILE ".gpacrc"
-#endif
-
-#include <gpac/internal/avilib.h>
-#include <gpac/internal/compositor_dev.h>
-
-void PrintVersion()
-{
-	printf ("MP42AVI - GPAC version %s\n", GPAC_FULL_VERSION);
-}
-
-void PrintUsage()
-{
-	printf ("MP42AVI [option] input\n"
-	        "Dumps BIFS media frames as AVI, BMP or raw\n\n"
-	        "Options\n"
-	        "-fps Framerate: specifies extraction framerate - if not set computed from track length\n"
-	        "-size WxH: forces output BIFS to the given resolution\n"
-	        "-raw [frame]: uses raw format for output - only dumps one frame if specified\n"
-	        "-bmp [frame]: uses BMP format for output - only dumps one frame if specified\n"
-	        "-outpath path: specifies where to dump frames/movie\n"
-	        "\n"
-	        "Note: when dumping a frame, either the frame number can be specified or the frame time\n"
-	        "in the format hh:mm:ss:xFz where hh, mm, ss are hours, minutes, seconds, x the number\n"
-	        "of the frame in the seconds and z the frame rate used to express the time\n"
-	        "\n"
-	        "-cfg: specifies path to GPAC config file (GPAC.cfg)\n"
-	        "-v: prints version\n"
-	        "-h: prints this message\n"
-	        "\nWritten by Jean Le Feuvre - (c) 2000-2005\n");
-}
-
-
-typedef struct
-{
-	GF_Compositor *sr;
-	GF_SceneGraph *sg;
-	GF_BifsDecoder *bifs;
-	GF_ISOFile *file;
-
-	u32 track;
-	u64 duration, cts;
-} BIFSVID;
-
-void node_init(void *cbk, GF_Node *node)
-{
-	BIFSVID *b2v = cbk;
-	switch (gf_node_get_tag(node)) {
-	case TAG_MPEG4_Conditional:
-	case TAG_MPEG4_QuantizationParameter:
-		break;
-	default:
-		if (b2v->sr) gf_sc_on_node_init(b2v->sr, node);
-		break;
-	}
-}
-
-void node_modif(void *cbk, GF_Node *node)
-{
-	BIFSVID *b2v = cbk;
-	if (b2v->sr) gf_sc_invalidate(b2v->sr, node);
-}
-
-Double get_scene_time(void *cbk)
-{
-	Double res;
-	BIFSVID *b2v = cbk;
-	res = (Double) (s64) b2v->cts;
-	res /= (Double) (s64) b2v->duration;
-	return res;
-}
-
-void write_bmp(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	char str[GF_MAX_PATH];
-	BITMAPFILEHEADER fh;
-	BITMAPINFOHEADER fi;
-	FILE *fout;
-	u32 j, i;
-	char *ptr;
-
-	if (img_num<10) {
-		sprintf(str, "%s_00%d.bmp", rad_name, img_num);
-	} else if (img_num<100) {
-		sprintf(str, "%s_0%d.bmp", rad_name, img_num);
-	} else {
-		sprintf(str, "%s_%d.bmp", rad_name, img_num);
-	}
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-
-	memset(&fh, 0, sizeof(fh));
-	fh.bfType = 19778;
-	fh.bfOffBits = 14 + 40;
-
-	memset(&fi, 0, sizeof(char)*40);
-	fi.biSize = sizeof(char)*40;
-	fi.biWidth = fb->width;
-	fi.biHeight = fb->height;
-	fi.biPlanes = 1;
-	fi.biBitCount = 24;
-	fi.biCompression = BI_RGB;
-	fi.biSizeImage = fb->pitch * fb->height;
-
-	/*NOT ALIGNED!!*/
-	gf_fwrite(&fh.bfType, 2, 1, fout);
-	gf_fwrite(&fh.bfSize, 4, 1, fout);
-	gf_fwrite(&fh.bfReserved1, 2, 1, fout);
-	gf_fwrite(&fh.bfReserved2, 2, 1, fout);
-	gf_fwrite(&fh.bfOffBits, 4, 1, fout);
-
-	gf_fwrite(&fi, 1, 40, fout);
-
-	for (j=fb->height; j>0; j--) {
-		ptr = fb->video_buffer + (j-1)*fb->pitch;
-		//gf_fwrite(ptr, 1, fb->width  * 3, fout);
-		for (i=0; i<fb->width; i++) {
-			fputc(ptr[2], fout);
-			fputc(ptr[1], fout);
-			fputc(ptr[0], fout);
-			ptr+=3;
-		}
-	}
-
-	gf_fclose(fout);
-}
-
-
-void write_raw(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	char str[GF_MAX_PATH];
-	FILE *fout;
-	if (img_num<10) {
-		sprintf(str, "%s_00%d.raw", rad_name, img_num);
-	} else if (img_num<100) {
-		sprintf(str, "%s_0%d.raw", rad_name, img_num);
-	} else {
-		sprintf(str, "%s_%d.raw", rad_name, img_num);
-	}
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-	gf_fwrite(fb->video_buffer , fb->height*fb->pitch, 1, fout);
-	gf_fclose(fout);
-}
-
-void dump_frame(BIFSVID b2v, char *conv_buf, char *out_path, u32 dump_type, avi_t *avi_out, u32 frameNum)
-{
-	u32 k;
-	GF_VideoSurface fb;
-
-	/*lock it*/
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	/*export frame*/
-	switch (dump_type) {
-	case 0:
-		/*reverse frame*/
-		for (k=0; k<fb.height; k++) {
-			memcpy(conv_buf + k*fb.width*3, fb.video_buffer + (fb.height-k-1) * fb.pitch, sizeof(char) * fb.width  * 3);
-		}
-		if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
-			printf("Error writing frame\n");
-		break;
-	case 2:
-		write_raw(&fb, out_path, frameNum);
-		break;
-	case 1:
-		write_bmp(&fb, out_path, frameNum);
-		break;
-	}
-	/*unlock it*/
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-}
-
-/*generates an intertwined bmp from a scene file with 5 different viewpoints*/
-void bifs3d_viewpoints_merger(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
-{
-	GF_User user;
-	char out_path[GF_MAX_PATH];
-	char old_driv[1024];
-	BIFSVID b2v;
-	Bool needs_raw;
-	GF_Err e;
-	GF_VideoSurface fb;
-	unsigned char **rendered_frames;
-	u32 nb_viewpoints = 5;
-	u32 viewpoint_index;
-
-
-	/* Configuration of the Rendering Capabilities */
-	{
-		const char *test;
-		char config_path[GF_MAX_PATH];
-		memset(&user, 0, sizeof(GF_User));
-		user.config = gf_cfg_init(szConfigFile, NULL);
-
-		if (!user.config) {
-			fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
-			return;
-		}
-
-		test = gf_cfg_get_key(user.config, "General", "ModulesDirectory");
-		user.modules = gf_modules_new((const unsigned char *) test, user.config);
-		strcpy(old_driv, "raw_out");
-		if (!gf_modules_get_count(user.modules)) {
-			printf("Error: no modules found\n");
-			goto err_exit;
-		}
-
-		/*switch driver to raw_driver*/
-		test = gf_cfg_get_key(user.config, "Video", "DriverName");
-		if (test) strcpy(old_driv, test);
-
-		needs_raw = 0;
-		test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
-		/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
-		if (test && strstr(test, "2D")) {
-			gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
-			needs_raw = 1;
-		}
-		if (needs_raw) {
-			test = gf_cfg_get_key(user.config, "Video", "DriverName");
-			if (stricmp(test, "raw_out") && stricmp(test, "Raw Video Output")) {
-				printf("couldn't load raw output driver (%s used)\n", test);
-				goto err_exit;
-			}
-		}
-	}
-
-	memset(&b2v, 0, sizeof(BIFSVID));
-	user.init_flags = GF_TERM_NO_AUDIO;
-	/* Initialization of the compositor */
-	b2v.sr = gf_sc_new(&user, 0, NULL);
-	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
-
-	/* Initialization of the scene graph */
-	b2v.sg = gf_sg_new();
-	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
-	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
-	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
-
-	/*load config*/
-	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
-
-	{
-		u32 di;
-		u32 track_number;
-		GF_ESD *esd;
-		u16 es_id;
-		b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
-
-		for (track_number=0; track_number<gf_isom_get_track_count(file); track_number++) {
-			esd = gf_isom_get_esd(file, track_number+1, 1);
-			if (!esd) continue;
-			if (!esd->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
-			gf_odf_desc_del((GF_Descriptor *) esd);
-			esd = NULL;
-		}
-		if (!esd) {
-			printf("no bifs track found\n");
-			goto err_exit;
-		}
-
-		es_id = (u16) gf_isom_get_track_id(file, track_number+1);
-		e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
-		if (e) {
-			printf("BIFS init error %s\n", gf_error_to_string(e));
-			gf_odf_desc_del((GF_Descriptor *) esd);
-			esd = NULL;
-			goto err_exit;
-		}
-
-		{
-			GF_ISOSample *samp = gf_isom_get_sample(file, track_number+1, 1, &di);
-			b2v.cts = samp->DTS + samp->CTS_Offset;
-			/*apply command*/
-			gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
-			gf_isom_sample_del(&samp);
-		}
-
-		b2v.duration = gf_isom_get_media_duration(file, track_number+1);
-
-		gf_odf_desc_del((GF_Descriptor *) esd);
-
-	}
-	gf_sc_set_scene(b2v.sr, b2v.sg);
-
-	if (!width || !height) {
-		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
-	}
-	/*we work in RGB24, and we must make sure the pitch is %4*/
-	if ((width*3)%4) {
-		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
-		while ((width*3)%4) width--;
-	}
-	gf_sc_set_size(b2v.sr, width, height);
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	width = fb.width;
-	height = fb.height;
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-
-	GF_SAFEALLOC(rendered_frames, nb_viewpoints*sizeof(char *));
-	for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
-		GF_SAFEALLOC(rendered_frames[viewpoint_index-1], fb.width*fb.height*3);
-		gf_sc_set_viewpoint(b2v.sr, viewpoint_index, NULL);
-		gf_sc_draw_frame(b2v.sr, 0, NULL);
-		/*needed for background2D !!*/
-		gf_sc_draw_frame(b2v.sr, 0, NULL);
-		strcpy(out_path, "");
-		if (out_dir) {
-			strcat(out_path, out_dir);
-			if (out_path[strlen(out_path)-1] != '\\') strcat(out_path, "\\");
-		}
-		strcat(out_path, rad_name);
-		strcat(out_path, "_view");
-		gf_sc_get_screen_buffer(b2v.sr, &fb);
-		write_bmp(&fb, out_path, viewpoint_index);
-		memcpy(rendered_frames[viewpoint_index-1], fb.video_buffer, fb.width*fb.height*3);
-		gf_sc_release_screen_buffer(b2v.sr, &fb);
-	}
-
-	if (width != 800 || height != 480) {
-		printf("Wrong scene dimension, cannot produce output\n");
-		goto err_exit;
-	} else {
-		u32 x, y;
-		GF_VideoSurface out_fb;
-		u32 bpp = 3;
-		out_fb.width = 800;
-		out_fb.height = 480;
-		out_fb.pitch = 800*bpp;
-		out_fb.pixel_format = GF_PIXEL_RGB_24;
-		out_fb.is_hardware_memory = 0;
-		GF_SAFEALLOC(out_fb.video_buffer, out_fb.pitch*out_fb.height)
-#if 1
-		for (y=0; y<out_fb.height; y++) {
-			/*starting red pixel is R1, R5, R4, R3, R2, R1, R5, ... when increasing line num*/
-			u32 line_shift = (5-y) % 5;
-			for (x=0; x<out_fb.width; x++) {
-				u32 view_shift = (line_shift+bpp*x)%5;
-				u32 offset = out_fb.pitch*y + x*bpp;
-				/* red */
-				out_fb.video_buffer[offset] = rendered_frames[view_shift][offset];
-				/* green */
-				out_fb.video_buffer[offset+1] = rendered_frames[(view_shift+1)%5][offset+1];
-				/* blue */
-				out_fb.video_buffer[offset+2] = rendered_frames[(view_shift+2)%5][offset+2];
-			}
-		}
-#else
-		/*calibration*/
-		for (y=0; y<out_fb.height; y++) {
-			u32 line_shift = (5- y%5) % 5;
-			for (x=0; x<out_fb.width; x++) {
-				u32 view_shift = (line_shift+bpp*x)%5;
-				u32 offset = out_fb.pitch*y + x*bpp;
-				out_fb.video_buffer[offset] = ((view_shift)%5 == 2) ? 0xFF : 0;
-				out_fb.video_buffer[offset+1] = ((view_shift+1)%5 == 2) ? 0xFF : 0;
-				out_fb.video_buffer[offset+2] = ((view_shift+2)%5 == 2) ? 0xFF : 0;
-			}
-		}
-#endif
-		write_bmp(&out_fb, "output", 0);
-	}
-
-	/*destroy everything*/
-	gf_bifs_decoder_del(b2v.bifs);
-	gf_sg_del(b2v.sg);
-	gf_sc_set_scene(b2v.sr, NULL);
-	gf_sc_del(b2v.sr);
-
-
-
-err_exit:
-	/*	if (rendered_frames) {
-			for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
-				if (rendered_frames[viewpoint_index-1]) gf_free(rendered_frames[viewpoint_index-1]);
-			}
-			gf_free(rendered_frames);
-		}
-		if (output_merged_frame) gf_free(output_merged_frame);
-	*/
-	if (user.modules) gf_modules_del(user.modules);
-	if (needs_raw) gf_cfg_set_key(user.config, "Video", "DriverName", old_driv);
-	gf_cfg_del(user.config);
-}
-
-void bifs_to_vid(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
-{
-	GF_User user;
-	BIFSVID b2v;
-	u16 es_id;
-	Bool first_dump, needs_raw;
-	u32 i, j, di, count, timescale, frameNum;
-	u32 duration, cur_time;
-	GF_VideoSurface fb;
-	GF_Err e;
-	char old_driv[1024];
-	const char *test;
-	char config_path[GF_MAX_PATH];
-	avi_t *avi_out;
-	Bool reset_fps;
-	GF_ESD *esd;
-	char comp[5];
-	char *conv_buf;
-
-	memset(&user, 0, sizeof(GF_User));
-	if (szConfigFile && strlen(szConfigFile)) {
-		user.config = gf_cfg_init(config_path, NULL);
-	} else {
-		user.config = gf_cfg_init(NULL, NULL);
-	}
-
-	if (!user.config) {
-		fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
-		return;
-	}
-	avi_out = NULL;
-	conv_buf = NULL;
-	esd = NULL;
-	needs_raw = 0;
-	test = gf_cfg_get_key(user.config, "General", "ModulesDirectory");
-	user.modules = gf_modules_new((const unsigned char *) test, user.config);
-	strcpy(old_driv, "raw_out");
-	if (!gf_modules_get_count(user.modules)) {
-		printf("Error: no modules found\n");
-		goto err_exit;
-	}
-
-	/*switch driver to raw_driver*/
-	test = gf_cfg_get_key(user.config, "Video", "DriverName");
-	if (test) strcpy(old_driv, test);
-
-	test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
-	/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
-	if (test && strstr(test, "2D")) {
-		gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
-		needs_raw = 1;
-	}
-
-	needs_raw = 0;
-	user.init_flags = GF_TERM_NO_AUDIO | GF_TERM_FORCE_3D;
-	b2v.sr = gf_sc_new(&user, 0, NULL);
-	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
-
-	b2v.sg = gf_sg_new();
-	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
-	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
-	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
-
-	/*load config*/
-	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
-
-	b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
-
-	if (needs_raw) {
-		test = gf_cfg_get_key(user.config, "Video", "DriverName");
-		if (stricmp(test, "raw_out") && stricmp(test, "Raw Video Output")) {
-			printf("couldn't load raw output driver (%s used)\n", test);
-			goto err_exit;
-		}
-	}
-
-	strcpy(config_path, "");
-	if (out_dir) {
-		strcat(config_path, out_dir);
-		if (config_path[strlen(config_path)-1] != '\\') strcat(config_path, "\\");
-	}
-	strcat(config_path, rad_name);
-	strcat(config_path, "_bifs");
-	if (!dump_type) {
-		strcat(config_path, ".avi");
-		avi_out = AVI_open_output_file(config_path);
-		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
-		if (!avi_out) goto err_exit;
-	}
-
-
-	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->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		esd = NULL;
-	}
-	if (!esd) {
-		printf("no bifs track found\n");
-		goto err_exit;
-	}
-
-	b2v.duration = gf_isom_get_media_duration(file, i+1);
-	timescale = gf_isom_get_media_timescale(file, i+1);
-	es_id = (u16) gf_isom_get_track_id(file, i+1);
-	e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
-	if (e) {
-		printf("BIFS init error %s\n", gf_error_to_string(e));
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		esd = NULL;
-		goto err_exit;
-	}
-	if (dump_time>=0) dump_time = dump_time *1000 / timescale;
-
-	gf_sc_set_scene(b2v.sr, b2v.sg);
-	count = gf_isom_get_sample_count(file, i+1);
-
-	reset_fps = 0;
-	if (!fps) {
-		fps = (Float) (count * timescale);
-		fps /= (Double) (s64) b2v.duration;
-		printf("Estimated BIFS FrameRate %g\n", fps);
-		reset_fps = 1;
-	}
-
-	if (!width || !height) {
-		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
-	}
-	/*we work in RGB24, and we must make sure the pitch is %4*/
-	if ((width*3)%4) {
-		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
-		while ((width*3)%4) width--;
-	}
-
-	gf_sc_set_size(b2v.sr, width, height);
-	gf_sc_draw_frame(b2v.sr, 0, NULL);
-
-	gf_sc_get_screen_buffer(b2v.sr, &fb);
-	width = fb.width;
-	height = fb.height;
-	if (avi_out) {
-		AVI_set_video(avi_out, width, height, fps, comp);
-		conv_buf = gf_malloc(sizeof(char) * width * height * 3);
-	}
-	printf("Dumping at BIFS resolution %d x %d\n\n", width, height);
-	gf_sc_release_screen_buffer(b2v.sr, &fb);
-
-	cur_time = 0;
-
-	duration = (u32)(timescale / fps);
-	if (reset_fps) fps = 0;
-
-	frameNum = 1;
-	first_dump = 1;
-	for (j=0; j<count; j++) {
-		GF_ISOSample *samp = gf_isom_get_sample(file, i+1, j+1, &di);
-
-		b2v.cts = samp->DTS + samp->CTS_Offset;
-		/*apply command*/
-		gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
-		gf_isom_sample_del(&samp);
-
-		if ((frameID>=0) && (j<(u32)frameID)) continue;
-		if ((dump_time>=0) && ((u32) dump_time>b2v.cts)) continue;
-		/*render frame*/
-		gf_sc_draw_frame(b2v.sr, 0, NULL);
-		/*needed for background2D !!*/
-		if (first_dump) {
-			gf_sc_draw_frame(b2v.sr, 0, NULL);
-			first_dump = 0;
-		}
-
-		if (fps) {
-			if (cur_time > b2v.cts) continue;
-
-			while (1) {
-				printf("dumped frame time %f (frame %d - sample %d)\r", ((Float)cur_time)/timescale, frameNum, j+1);
-				dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, frameNum);
-				frameNum++;
-				cur_time += duration;
-				if (cur_time > b2v.cts) break;
-			}
-		} else {
-			dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, (frameID>=0) ? frameID : frameNum);
-			if (frameID>=0 || dump_time>=0) break;
-			frameNum++;
-			printf("dumped frame %d / %d\r", j+1, count);
-		}
-
-	}
-	gf_odf_desc_del((GF_Descriptor *) esd);
-
-	/*destroy everything*/
-	gf_bifs_decoder_del(b2v.bifs);
-	gf_sg_del(b2v.sg);
-	gf_sc_set_scene(b2v.sr, NULL);
-	gf_sc_del(b2v.sr);
-
-err_exit:
-	if (avi_out) AVI_close(avi_out);
-	if (conv_buf) gf_free(conv_buf);
-	if (user.modules) gf_modules_del(user.modules);
-	if (needs_raw) gf_cfg_set_key(user.config, "Video", "DriverName", old_driv);
-	gf_cfg_del(user.config);
-}
-
-int main (int argc, char **argv)
-{
-	Double fps_dump;
-	u32 i;
-	char rad[500];
-	s32 frameID, h, m, s, f;
-	Float fps;
-	u32 dump_type;
-	s32 dump_time;
-	u32 dump_w, dump_h;
-	Bool copy;
-	char szConfigFile[4096];
-	char *dump_out;
-	char *inName, *arg;
-	GF_ISOFile *file;
-
-	if (argc < 2) {
-		PrintUsage();
-		return 0;
-	}
-
-	dump_type = 0;
-	fps_dump = 0.0f;
-	dump_w = dump_h = 0;
-	dump_out = NULL;
-	inName = NULL;
-	frameID = -1;
-	dump_time = -1;
-	szConfigFile[0] = 0;
-
-	for (i = 1; i < (u32) argc ; i++) {
-		arg = argv[i];
-		if (arg[0] != '-') {
-			inName = arg;
-			break;
-		}
-		if (!stricmp(arg, "-h")) {
-			PrintUsage();
-			return 0;
-		} else if (!stricmp(arg, "-version")) {
-			PrintVersion();
-			return 0;
-		} else if (!stricmp(arg, "-size")) {
-			sscanf(argv[i+1], "%dx%d", &dump_w, &dump_h);
-			i++;
-		} else if (!stricmp(arg, "-raw")) {
-			dump_type = 2;
-			if ((i+1<(u32)argc) && (argv[i+1][0]!='-')) {
-				if (strstr(argv[i+1], "T")) {
-					if (strstr(argv[i+1], "F")) {
-						sscanf(argv[i+1], "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
-					} else {
-						sscanf(argv[i+1], "T%d:%d:%d", &h, &m, &s);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000);
-					}
-				} else {
-					frameID = atoi(argv[i+1]);
-				}
-				i++;
-			}
-		} else if (!stricmp(arg, "-bmp")) {
-			dump_type = 1;
-			if ((i+1<(u32)argc) && (argv[i+1][0]!='-')) {
-				if (strstr(argv[i+1], "T")) {
-					if (strstr(argv[i+1], "F")) {
-						sscanf(argv[i+1], "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
-					} else {
-						sscanf(argv[i+1], "T%d:%d:%d", &h, &m, &s);
-						dump_time = (s32) ((3600*h + 60*m + s)*1000);
-					}
-				} else {
-					frameID = atoi(argv[i+1]);
-				}
-				i++;
-			}
-		} else if (!stricmp(arg, "-3d")) {
-			dump_type = 3;
-		} else if (!stricmp(arg, "-outpath")) {
-			dump_out = argv[i+1];
-			i++;
-		} else if (!stricmp(arg, "-fps")) {
-			fps_dump = atof(argv[i+1]);
-			i++;
-		} else if (!stricmp(arg, "-copy")) {
-			copy = 1;
-		} else if (!stricmp(arg, "-cfg")) {
-			strcpy(szConfigFile, argv[i+1]);
-			i += 1;
-		} else {
-			PrintUsage();
-			return (0);
-		}
-	}
-	if (!inName) {
-		PrintUsage();
-		return 0;
-	}
-	gf_sys_init(GF_MemTrackerNone);
-
-	file = gf_isom_open(inName, GF_ISOM_OPEN_READ, NULL);
-	if (!file) {
-		printf("Error opening file: %s\n", gf_error_to_string(gf_isom_last_error(NULL)));
-		return 0;
-	}
-
-	if (dump_out) {
-		arg = strrchr(inName, GF_PATH_SEPARATOR);
-		if (arg) {
-			strcpy(rad, arg + 1);
-		} else {
-			strcpy(rad, inName);
-		}
-	} else {
-		strcpy(rad, inName);
-	}
-	while (rad[strlen(rad)-1] != '.') rad[strlen(rad)-1] = 0;
-	rad[strlen(rad)-1] = 0;
-	if (dump_type == 3) {
-		bifs3d_viewpoints_merger(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
-	}
-	else bifs_to_vid(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
-	printf("\ndone\n");
-	gf_isom_delete(file);
-	return 0;
-
-}
-

gpac-0.8.0.tar.gz/applications/mp42ts Deleted

gpac-0.8.0.tar.gz/applications/mp42ts/Makefile Deleted

@@ -1,64 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/applications/mp42ts
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKFLAGS=-L../../bin/gcc
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=MP42TS$(EXE)
-else
-EXT=
-PROG=MP42TS
-endif
-
-ifeq ($(STATICBUILD),yes)
-##include static modules and other deps for libgpac
-include ../../static.mak
-
-#FIXME we have to disable AAC+bifs support in mp42ts since it reuses things from aac_in already in libgpac ...
-ifeq ($(STATIC_MODULES), yes)
-CFLAGS+=-DGPAC_DISABLE_PLAYER
-endif
-
-LINKFLAGS+=-lgpac_static
-LINKFLAGS+= $(GPAC_SH_FLAGS)
-LINKFLAGS+=$(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac
-endif
-
-#common objs - insert after ../static if any to overwrite list of objects
-OBJS= main.o
-
-SRCS := $(OBJS:.o=.c) 
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(CC) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/applications/mp42ts/main.c Deleted

@@ -1,2943 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / mp4-to-ts (mp42ts) application
- *
- *  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/media_tools.h>
-#include <gpac/constants.h>
-#include <gpac/base_coding.h>
-#include <gpac/mpegts.h>
-
-#ifndef GPAC_DISABLE_STREAMING
-#include <gpac/internal/ietf_dev.h>
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-#include <gpac/scene_engine.h>
-#endif
-
-#ifndef GPAC_DISABLE_TTXT
-#include <gpac/webvtt.h>
-#endif
-
-
-#ifdef GPAC_DISABLE_MPEG2TS_MUX
-#error "Cannot compile MP42TS if GPAC is not built with MPEG2-TS Muxing support"
-#endif
-
-#define MP42TS_PRINT_TIME_MS 500 /*refresh printed info every CLOCK_REFRESH ms*/
-#define MP42TS_VIDEO_FREQ 1000 /*meant to send AVC IDR only every CLOCK_REFRESH ms*/
-
-
-s32 temi_id_1 = -1;
-s32 temi_id_2 = -1;
-
-u32 temi_url_insertion_delay = 1000;
-u32 temi_offset = 0;
-Bool temi_disable_loop = GF_FALSE;
-Double temi_period=0;
-Bool request_temi_toggle = GF_FALSE;
-Bool temi_on = GF_TRUE;
-Bool temi_single_toggle = GF_FALSE;
-u64 temi_period_last_dts = 0;
-FILE *logfile = NULL;
-
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE*)cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-static GFINLINE void usage()
-{
-	fprintf(stderr, "GPAC version " GPAC_FULL_VERSION "\n"
-	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
-	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
-	        "Features: %s\n\n", gpac_features());
-	fprintf(stderr, "mp42ts <inputs> <destinations> [options]\n"
-	        "\n"
-	        "Inputs:\n"
-	        "-src filename[:OPTS]   specifies an input file used for a TS service\n"
-	        "                        * currently only supports ISO files and SDP files\n"
-	        "                        * can be used several times, once for each program\n"
-	        "By default each source is a program in a TS. \n"
-	        "Source options are colon-separated list of options, as follows:\n"
-	        "ID=N                   specifies the program ID for this source.\n"
-	        "             All sources with the same ID will be added to the same program\n"
-	        "name=STR               program name, as used in DVB service description table\n"
-	        "provider=STR           provider name, as used in DVB service description table\n"
-	        "disc                   the first packet of each stream will have the discontinuity marker set\n"
-	        "pmt=N                  stes version number of the PMT\n"
-
-	        "\n"
-	        "-prog filename        same as -src filename\n"
-	        "\n"
-	        "Destinations:\n"
-	        "Several destinations may be specified as follows, at least one is mandatory\n"
-	        "-dst-udp UDP_address:port (multicast or unicast)\n"
-	        "-dst-rtp RTP_address:port\n"
-	        "-dst-file filename\n"
-	        "The following parameters may be specified when -dst-file is used\n"
-	        "-segment-dir dir       server local directory to store segments (ends with a '/')\n"
-	        "-segment-duration dur  segment duration in seconds\n"
-	        "-segment-manifest file m3u8 file basename\n"
-	        "-segment-http-prefix p client address for accessing server segments\n"
-	        "-segment-number n      number of segments to list in the manifest\n"
-	        "\n"
-	        "Basic options:\n"
-	        "-rate R                specifies target rate in kbps of the multiplex (optional)\n"
-	        "-real-time             specifies the muxer will work in real-time mode\n"
-	        "                        * if not specified, the muxer will generate the TS as quickly as possible\n"
-	        "                        * automatically set for SDP or BT input\n"
-	        "-pcr-init V            sets initial value V for PCR - if not set, random value is used\n"
-	        "-pcr-offset V          offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.\n"
-	        "-psi-rate V            sets PSI refresh rate V in ms (default 100ms).\n"
-	        "                        * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.\n"
-	        "                        * This should be set to 0 for DASH streams.\n"
-	        "-time n                request the muxer to stop after n ms\n"
-	        "-single-au             forces 1 PES = 1 AU (disabled by default)\n"
-	        "-multi-au              forces 1 PES = N AU for all streams (disabled by default).\n"
-	        "                        By default, audio streams pack N AUs in one PES but video and systems data use 1 AU per PES.\n"
-	        "-rap                   forces RAP/IDR to be aligned with PES start for video streams (disabled by default)\n"
-	        "                          in this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES\n"
-	        "-flush-rap             same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT\n"
-	        "-nb-pack N             specifies to pack up to N TS packets together before sending on network or writing to file\n"
-	        "-pcr-ms N              sets max interval in ms between 2 PCR. Default is 100 ms or at each PES header\n"
-	        "-force-pcr-only        allows sending PCR-only packets to enforce the requested PCR rate - STILL EXPERIMENTAL.\n"
-	        "-ttl N                 specifies Time-To-Live for multicast. Default is 1.\n"
-	        "-ifce IPIFCE           specifies default IP interface to use. Default is IF_ANY.\n"
-	        "-temi [URL]            Inserts TEMI time codes in adaptation field. URL is optional, and can be a number for external timeline IDs\n"
-	        "-temi-delay DelayMS    Specifies delay between two TEMI url descriptors (default is 1000)\n"
-	        "-temi-offset OffsetMS  Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)\n"
-	        "-temi-noloop           Do not restart the TEMI timeline at the end of the source\n"
-	        "-temi2 ID              Inserts a secondary TEMI time codes in adaptation field of the audio PID if any. ID shall be set to the desired external timeline IDs\n"
-	        "-insert-ntp            Inserts NTP timestamp in TEMI timeline descriptor\n"
-	        "-sdt-rate MS           Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent\n"
-	        "\n"
-	        "MPEG-4/T-DMB options:\n"
-	        "-bifs-src filename          update file: must be either an .sdp or a .bt file\n"
-	        "-audio url             may be mp3/udp or aac/http (shoutcast/icecast)\n"
-	        "-video url             shall be a raw h264 frame\n"
-	        "-mpeg4-carousel n      carousel period in ms\n"
-	        "-mpeg4 or -4on2        forces usage of MPEG-4 signaling (IOD and SL Config)\n"
-	        "-4over2                same as -4on2 and uses PMT to carry OD Updates\n"
-	        "-bifs-pes              carries BIFS over PES instead of sections\n"
-	        "-bifs-pes-ex           carries BIFS over PES without writing timestamps in SL\n"
-	        "\n"
-	        "Misc options\n"
-#ifdef GPAC_MEMORY_TRACKING
-            "-mem-track             enables memory tracker\n"
-            "-mem-track-stack       enables memory tracker stack dumping\n"
-#endif
-	        "-logs                  set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
-	        "-h or -help            print this screen\n"
-	        "\n"
-	       );
-}
-
-
-#define MAX_MUX_SRC_PROG	100
-typedef struct
-{
-
-#ifndef GPAC_DISABLE_ISOM
-	GF_ISOFile *mp4;
-#endif
-
-	u32 nb_streams, pcr_idx;
-	GF_ESInterface streams[40];
-	GF_Descriptor *iod;
-#ifndef GPAC_DISABLE_SENG
-	GF_SceneEngine *seng;
-#endif
-	GF_Thread *th;
-	char *bifs_src_name;
-	u32 rate;
-	Bool repeat;
-	u32 mpeg4_signaling;
-	Bool audio_configured;
-	u64 samples_done, samples_count;
-	u32 nb_real_streams;
-	Bool real_time;
-	GF_List *od_updates;
-
-	u32 max_sample_size;
-
-	char program_name[20];
-	char provider_name[20];
-	u32 ID;
-	Bool is_not_program_declaration;
-	Bool set_disc;
-	u32 pmt_version;
-
-	Double last_ntp;
-} M2TSSource;
-
-#ifndef GPAC_DISABLE_ISOM
-typedef struct
-{
-	GF_ISOFile *mp4;
-	u32 track, sample_number, sample_count;
-	u32 mstype, mtype;
-	GF_ISOSample *sample;
-	/*refresh rate for images*/
-	u32 image_repeat_ms, nb_repeat_last;
-	void *dsi;
-	u32 dsi_size;
-
-	void *dsi_and_rap;
-	Bool loop;
-	Bool is_repeat;
-	s64 ts_offset, cts_dts_shift;
-	M2TSSource *source;
-
-	const char *temi_url;
-	u32 last_temi_url, timeline_id;
-	Bool insert_ntp;
-
-} GF_ESIMP4;
-#endif
-
-typedef struct
-{
-	u32 carousel_period, ts_delta;
-	u16 aggregate_on_stream;
-	Bool adjust_carousel_time;
-	Bool discard;
-	Bool rap;
-	Bool critical;
-	Bool vers_inc;
-} GF_ESIStream;
-
-typedef struct
-{
-	u32 size;
-	char *data;
-} GF_SimpleDataDescriptor;
-
-//TODO: find a clean way to save this data
-#ifndef GPAC_DISABLE_PLAYER
-static u32 audio_OD_stream_id = (u32)-1;
-#endif
-
-#define AUDIO_OD_ESID	100
-#define AUDIO_DATA_ESID	101
-#define VIDEO_DATA_ESID	105
-
-/*output types*/
-enum
-{
-	GF_MP42TS_FILE, /*open mpeg2ts file*/
-	GF_MP42TS_UDP,  /*open udp socket*/
-	GF_MP42TS_RTP,  /*open rtp socket*/
-#ifndef GPAC_DISABLE_PLAYER
-	GF_MP42TS_HTTP,	/*open http downloader*/
-#endif
-};
-
-static u32 format_af_descriptor(char *af_data, u32 timeline_id, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
-{
-	u32 res;
-	u32 len;
-	u32 last_time=0;
-	GF_BitStream *bs = gf_bs_new(af_data, 188, GF_BITSTREAM_WRITE);
-
-	if (ntp) {
-		last_time = 1000*(ntp>>32);
-		last_time += 1000*(ntp&0xFFFFFFFF)/0xFFFFFFFF;
-	} else if (timescale) {
-		last_time = (u32) (1000*timecode/timescale);
-	}
-	if (temi_url && (!*last_url_time || (last_time - *last_url_time + 1 >= temi_url_insertion_delay)) ) {
-		*last_url_time = last_time + 1;
-		len = 0;
-		gf_bs_write_int(bs,	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR, 8);
-		gf_bs_write_int(bs,	len, 8);
-
-		gf_bs_write_int(bs,	0, 1); //force_reload
-		gf_bs_write_int(bs,	0, 1); //is_announcement
-		gf_bs_write_int(bs,	0, 1); //splicing_flag
-		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
-		gf_bs_write_int(bs,	0xFF, 5); //reserved
-		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
-
-		if (temi_url) {
-			char *url = (char *)temi_url;
-			if (!strnicmp(temi_url, "http://", 7)) {
-				gf_bs_write_int(bs,	1, 8); //url_scheme
-				url = (char *) temi_url + 7;
-			} else if (!strnicmp(temi_url, "https://", 8)) {
-				gf_bs_write_int(bs,	2, 8); //url_scheme
-				url = (char *) temi_url + 8;
-			} else {
-				gf_bs_write_int(bs,	0, 8); //url_scheme
-			}
-			gf_bs_write_u8(bs, (u32) strlen(url)); //url_path_len
-			gf_bs_write_data(bs, url, (u32) strlen(url) ); //url
-			gf_bs_write_u8(bs, 0); //nb_addons
-		}
-		//rewrite len
-		len = (u32) gf_bs_get_position(bs) - 2;
-		af_data[1] = len;
-	}
-
-	if (timescale || ntp) {
-		Bool use64 = (timecode > 0xFFFFFFFFUL) ? GF_TRUE : GF_FALSE;
-		len = 3; //3 bytes flags
-
-		if (timescale) len += 4 + (use64 ? 8 : 4);
-		if (ntp) len += 8;
-
-		//write timeline descriptor
-		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
-		gf_bs_write_int(bs,	len, 8);
-
-		gf_bs_write_int(bs,	timescale ? (use64 ? 2 : 1) : 0, 2); //has_timestamp
-		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
-		gf_bs_write_int(bs,	0, 1); //has_ptp
-		gf_bs_write_int(bs,	0, 2); //has_timecode
-		gf_bs_write_int(bs,	0, 1); //force_reload
-		gf_bs_write_int(bs,	0, 1); //paused
-		gf_bs_write_int(bs,	0, 1); //discontinuity
-		gf_bs_write_int(bs,	0xFF, 7); //reserved
-		gf_bs_write_int(bs,	timeline_id, 8); //timeline_id
-		if (timescale) {
-			gf_bs_write_u32(bs,	timescale); //timescale
-			if (use64)
-				gf_bs_write_u64(bs,	timecode); //timestamp
-			else
-				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
-		}
-		if (ntp) {
-			gf_bs_write_u64(bs,	ntp); //ntp
-		}
-	}
-	res = (u32) gf_bs_get_position(bs);
-	gf_bs_del(bs);
-	return res;
-}
-
-#ifndef GPAC_DISABLE_ISOM
-
-static GF_Err mp4_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	char af_data[188];
-	GF_ESIMP4 *priv = (GF_ESIMP4 *)ifce->input_udta;
-	if (!priv) return GF_BAD_PARAM;
-
-	switch (act_type) {
-	case GF_ESI_INPUT_DATA_FLUSH:
-	{
-		GF_ESIPacket pck;
-#ifndef GPAC_DISABLE_TTXT
-		GF_List *cues = NULL;
-#endif
-		if (!priv->sample)
-			priv->sample = gf_isom_get_sample(priv->mp4, priv->track, priv->sample_number+1, NULL);
-
-		if (!priv->sample) {
-			return GF_IO_ERR;
-		}
-
-		memset(&pck, 0, sizeof(GF_ESIPacket));
-
-		pck.flags = GF_ESI_DATA_AU_START | GF_ESI_DATA_HAS_CTS;
-		if (priv->sample->IsRAP) pck.flags |= GF_ESI_DATA_AU_RAP;
-		pck.cts = priv->sample->DTS + priv->ts_offset;
-		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
-
-		if (priv->timeline_id) {
-			Bool deactivate_temi=GF_FALSE;
-			u64 ntp=0;
-			u64 tc = priv->sample->DTS + priv->sample->CTS_Offset + priv->cts_dts_shift;
-			Bool insert_temi=GF_FALSE;
-			if (temi_disable_loop) {
-				tc += priv->ts_offset;
-			}
-
-			if (temi_offset) {
-				tc += ((u64) temi_offset) * ifce->timescale / 1000;
-			}
-
-			if (priv->insert_ntp) {
-				u32 sec, frac;
-				gf_net_get_ntp(&sec, &frac);
-				ntp = sec;
-				ntp <<= 32;
-				ntp |= frac;
-			}
-			if (!temi_period) {
-				//toggle temi at RAP POINTS ONLY
-				if (request_temi_toggle && priv->sample->IsRAP) {
-					temi_on = !temi_on;
-					if (!temi_on) {
-						deactivate_temi = GF_TRUE;
-					}
-					fprintf(stderr, "Turning TEMI %st at DTS "LLU" (%g sec)\n", temi_on ? "on" : "off" , priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-					request_temi_toggle = GF_FALSE;
-				}
-				insert_temi = temi_on;
-			} else {
-
-				if (!temi_on) {
-					if (priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
-						temi_on = GF_TRUE;
-						temi_period_last_dts = priv->sample->DTS;
-						fprintf(stderr, "Turning TEMI on at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-					}
-				} else {
-					if (!temi_single_toggle && priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
-						temi_on = GF_FALSE;
-						temi_period_last_dts = priv->sample->DTS;
-						fprintf(stderr, "Turning TEMI off at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
-						deactivate_temi = GF_TRUE;
-					}
-				}
-				insert_temi = temi_on;
-			}
-
-			if (insert_temi) {
-				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, tc, ifce->timescale, ntp, priv->temi_url, &priv->last_temi_url);
-				pck.mpeg2_af_descriptors = af_data;
-			} else if (deactivate_temi) {
-				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, 0, 0, 0, "", &priv->last_temi_url);
-				pck.mpeg2_af_descriptors = af_data;
-			}
-		}
-
-		if (priv->nb_repeat_last) {
-			pck.cts += priv->nb_repeat_last*ifce->timescale * priv->image_repeat_ms / 1000;
-		}
-
-		pck.dts = pck.cts;
-		if (priv->cts_dts_shift) {
-			pck.cts += + priv->cts_dts_shift;
-			pck.flags |= GF_ESI_DATA_HAS_DTS;
-		}
-		
-		if (priv->sample->CTS_Offset) {
-			pck.cts += priv->sample->CTS_Offset;
-			pck.flags |= GF_ESI_DATA_HAS_DTS;
-		}
-
-		if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
-			pck.data = (char*)priv->dsi;
-			pck.data_len = priv->dsi_size;
-			ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-			pck.flags &= ~GF_ESI_DATA_AU_START;
-		}
-
-		pck.flags |= GF_ESI_DATA_AU_END;
-		pck.data = priv->sample->data;
-		pck.data_len = priv->sample->dataLength;
-		pck.duration = gf_isom_get_sample_duration(priv->mp4, priv->track, priv->sample_number+1);
-#ifndef GPAC_DISABLE_TTXT
-		if (priv->mtype==GF_ISOM_MEDIA_TEXT && priv->mstype==GF_ISOM_SUBTYPE_WVTT) {
-			u64             start;
-			GF_WebVTTCue    *cue;
-			GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start);
-			start = (priv->sample->DTS * 1000) / ifce->timescale;
-			cues = gf_webvtt_parse_iso_cues(priv->sample, start);
-			if (gf_list_count(cues)>1) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] More than one cue in sample\n"));
-			}
-			cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
-			if (cue) {
-				pck.data = cue->text;
-				pck.data_len = (u32)strlen(cue->text)+1;
-			} else {
-				pck.data = NULL;
-				pck.data_len = 0;
-			}
-		}
-#endif
-		ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Track %d: sample %d CTS %d\n", priv->track, priv->sample_number+1, pck.cts));
-
-#ifndef GPAC_DISABLE_VTT
-		if (cues) {
-			while (gf_list_count(cues)) {
-				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
-				gf_list_rem(cues, 0);
-				gf_webvtt_cue_del(cue);
-			}
-			gf_list_del(cues);
-			cues = NULL;
-		}
-#endif
-		gf_isom_sample_del(&priv->sample);
-		priv->sample_number++;
-
-		if (!priv->source->real_time && !priv->is_repeat) {
-			priv->source->samples_done++;
-			gf_set_progress("MPEG-2 TS Muxing", priv->source->samples_done, priv->source->samples_count);
-		}
-
-		if (priv->sample_number==priv->sample_count) {
-			if (priv->loop) {
-				Double scale;
-				u64 duration;
-				/*increment ts offset*/
-				scale = gf_isom_get_media_timescale(priv->mp4, priv->track);
-				scale /= gf_isom_get_timescale(priv->mp4);
-				duration = (u64) (gf_isom_get_duration(priv->mp4) * scale);
-				priv->ts_offset += duration;
-				priv->sample_number = 0;
-				priv->is_repeat = (priv->sample_count==1) ? GF_TRUE : GF_FALSE;
-			}
-			else if (priv->image_repeat_ms && priv->source->nb_real_streams) {
-				priv->nb_repeat_last++;
-				priv->sample_number--;
-				priv->is_repeat = GF_TRUE;
-			} else {
-				if (!(ifce->caps & GF_ESI_STREAM_IS_OVER)) {
-					ifce->caps |= GF_ESI_STREAM_IS_OVER;
-					if (priv->sample_count>1) {
-						assert(priv->source->nb_real_streams);
-						priv->source->nb_real_streams--;
-					}
-				}
-			}
-		}
-	}
-	return GF_OK;
-
-	case GF_ESI_INPUT_DESTROY:
-		if (priv->dsi) gf_free(priv->dsi);
-		if (ifce->decoder_config) {
-			gf_free(ifce->decoder_config);
-			ifce->decoder_config = NULL;
-		}
-		gf_free(priv);
-		ifce->input_udta = NULL;
-		return GF_OK;
-	default:
-		return GF_BAD_PARAM;
-	}
-}
-
-static void fill_isom_es_ifce(M2TSSource *source, GF_ESInterface *ifce, GF_ISOFile *mp4, u32 track_num, u32 bifs_use_pes, Bool compute_max_size)
-{
-	GF_ESIMP4 *priv;
-	char *_lan;
-	GF_ESD *esd;
-	Bool is_hevc=GF_FALSE;
-	u64 avg_rate, duration;
-	s32 ref_count;
-	s64 mediaOffset;
-
-	GF_SAFEALLOC(priv, GF_ESIMP4);
-	if (!priv) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate MP4 input handler\n"));
-		return;
-	}
-
-	priv->mp4 = mp4;
-	priv->track = track_num;
-	priv->mtype = gf_isom_get_media_type(priv->mp4, priv->track);
-	priv->mstype = gf_isom_get_media_subtype(priv->mp4, priv->track, 1);
-	priv->loop = source->real_time ? GF_TRUE : GF_FALSE;
-	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
-	source->samples_count += priv->sample_count;
-	if (priv->sample_count>1)
-		source->nb_real_streams++;
-
-	priv->source = source;
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	ifce->stream_id = gf_isom_get_track_id(mp4, track_num);
-
-	esd = gf_media_map_esd(mp4, track_num);
-
-	if (esd) {
-		ifce->stream_type = esd->decoderConfig->streamType;
-		ifce->object_type_indication = esd->decoderConfig->objectTypeIndication;
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->dataLength) {
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_AUDIO_AAC_MPEG4:
-			case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-			case GPAC_OTI_VIDEO_MPEG4_PART2:
-				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) {
-					priv->dsi = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-					priv->dsi_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-					memcpy(priv->dsi, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				}
-				break;
-			case GPAC_OTI_VIDEO_HEVC:
-			case GPAC_OTI_VIDEO_LHVC:
-				is_hevc=GF_TRUE;
-			case GPAC_OTI_VIDEO_AVC:
-			case GPAC_OTI_VIDEO_SVC:
-			case GPAC_OTI_VIDEO_MVC:
-				gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
-				break;
-			case GPAC_OTI_SCENE_VTT_MP4:
-				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
-				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				break;
-			}
-		}
-		gf_odf_desc_del((GF_Descriptor *)esd);
-	}
-	gf_isom_get_media_language(mp4, track_num, &_lan);
-	if (!_lan || !strcmp(_lan, "und")) {
-		ifce->lang = 0;
-	} else {
-		ifce->lang = GF_4CC(_lan[0],_lan[1],_lan[2],' ');
-	}
-	if (_lan) {
-		gf_free(_lan);
-	}
-
-	ifce->timescale = gf_isom_get_media_timescale(mp4, track_num);
-	ifce->duration = gf_isom_get_media_timescale(mp4, track_num);
-	avg_rate = gf_isom_get_media_data_size(mp4, track_num);
-	avg_rate *= ifce->timescale * 8;
-	if (0!=(duration=gf_isom_get_media_duration(mp4, track_num)))
-		avg_rate /= duration;
-
-	if (gf_isom_has_time_offset(mp4, track_num)) ifce->caps |= GF_ESI_SIGNAL_DTS;
-
-	ifce->bit_rate = (u32) avg_rate;
-	ifce->duration = (Double) (s64) gf_isom_get_media_duration(mp4, track_num);
-	ifce->duration /= ifce->timescale;
-
-	GF_SAFEALLOC(ifce->sl_config, GF_SLConfig);
-	if (!ifce->sl_config) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate interface SLConfig\n"));
-		return;
-	}
-	
-	ifce->sl_config->tag = GF_ODF_SLC_TAG;
-	ifce->sl_config->useAccessUnitStartFlag = 1;
-	ifce->sl_config->useAccessUnitEndFlag = 1;
-	ifce->sl_config->useRandomAccessPointFlag = 1;
-	ifce->sl_config->useTimestampsFlag = 1;
-	ifce->sl_config->timestampLength = 33;
-	ifce->sl_config->timestampResolution = ifce->timescale;
-
-	/*test mode in which time stamps are 90khz and not coded but copied over from PES header*/
-	if (bifs_use_pes==2) {
-		ifce->sl_config->timestampLength = 0;
-		ifce->sl_config->timestampResolution = 90000;
-	}
-
-#ifdef GPAC_DISABLE_ISOM_WRITE
-	fprintf(stderr, "Warning: GPAC was compiled without ISOM Write support, can't set SL Config!\n");
-#else
-	gf_isom_set_extraction_slc(mp4, track_num, 1, ifce->sl_config);
-#endif
-
-	ifce->input_ctrl = mp4_input_ctrl;
-	if (priv != ifce->input_udta) {
-		if (ifce->input_udta)
-			gf_free(ifce->input_udta);
-		ifce->input_udta = priv;
-	}
-
-
-	if (! gf_isom_get_edit_list_type(mp4, track_num, &mediaOffset)) {
-		priv->ts_offset = mediaOffset;
-	}
-
-	if (gf_isom_has_time_offset(mp4, track_num)==2) {
-		priv->cts_dts_shift = gf_isom_get_cts_to_dts_shift(mp4, track_num);
-	}
-
-	ifce->depends_on_stream = 0;
-	ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_SCAL);
-	if (ref_count > 0) {
-		gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_SCAL, (u32) ref_count, &ifce->depends_on_stream);
-	} else if (is_hevc) {
-		ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_BASE);
-		if (ref_count > 0) {
-			gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_BASE, (u32) ref_count, &ifce->depends_on_stream);
-		}
-	}
-
-	if (compute_max_size) {
-		u32 i;
-		for (i=0; i < priv->sample_count; i++) {
-			u32 s = gf_isom_get_sample_size(mp4, track_num, i+1);
-			if (s>source->max_sample_size) source->max_sample_size = s;
-		}
-	}
-
-}
-
-#endif //GPAC_DISABLE_ISOM
-
-
-#ifndef GPAC_DISABLE_SENG
-static GF_Err seng_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	if (act_type==GF_ESI_INPUT_DESTROY) {
-		//TODO: free my data
-		if (ifce->input_udta)
-			gf_free(ifce->input_udta);
-		ifce->input_udta = NULL;
-		return GF_OK;
-	}
-
-	return GF_OK;
-}
-#endif
-
-
-#ifndef GPAC_DISABLE_STREAMING
-typedef struct
-{
-	/*RTP channel*/
-	GF_RTPChannel *rtp_ch;
-
-	/*depacketizer*/
-	GF_RTPDepacketizer *depacketizer;
-
-	GF_ESIPacket pck;
-
-	GF_ESInterface *ifce;
-
-	Bool cat_dsi, is_264;
-	void *dsi_and_rap;
-	u32 avc_dsi_size;
-
-	Bool use_carousel;
-	u32 au_sn;
-
-	s64 ts_offset;
-	Bool rtcp_init;
-	M2TSSource *source;
-
-	u32 min_dts_inc;
-	u64 prev_cts;
-	u64 prev_dts;
-} GF_ESIRTP;
-
-static GF_Err rtp_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	u32 size, PayloadStart;
-	GF_Err e;
-	GF_RTPHeader hdr;
-	char buffer[8000];
-	GF_ESIRTP *rtp = (GF_ESIRTP*)ifce->input_udta;
-
-	if (!ifce->input_udta) return GF_BAD_PARAM;
-
-	switch (act_type) {
-	case GF_ESI_INPUT_DATA_FLUSH:
-		/*flush rtcp channel*/
-		while (1) {
-			Bool has_sr = GF_FALSE;
-			size = gf_rtp_read_rtcp(rtp->rtp_ch, buffer, 8000);
-			if (!size) break;
-			e = gf_rtp_decode_rtcp(rtp->rtp_ch, buffer, size, &has_sr);
-
-			if (e == GF_EOS) ifce->caps |= GF_ESI_STREAM_IS_OVER;
-
-			if (has_sr && !rtp->rtcp_init) {
-				Double time = rtp->rtp_ch->last_SR_NTP_sec;
-				time += ((Double)rtp->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
-				if (!rtp->source->last_ntp) {
-					rtp->source->last_ntp = time;
-				}
-				if (time >= rtp->source->last_ntp) {
-					time -= rtp->source->last_ntp;
-				} else {
-					time = 0;
-				}
-				rtp->ts_offset = rtp->rtp_ch->last_SR_rtp_time;
-				rtp->ts_offset -= (s64) (time * rtp->rtp_ch->TimeScale);
-				rtp->rtcp_init = GF_TRUE;
-			}
-		}
-		/*flush rtp channel*/
-		while (1) {
-			size = gf_rtp_read_rtp(rtp->rtp_ch, buffer, 8000);
-			if (!size) break;
-			e = gf_rtp_decode_rtp(rtp->rtp_ch, buffer, size, &hdr, &PayloadStart);
-			if (e) return e;
-			gf_rtp_depacketizer_process(rtp->depacketizer, &hdr, buffer + PayloadStart, size - PayloadStart);
-		}
-		return GF_OK;
-	case GF_ESI_INPUT_DESTROY:
-		gf_rtp_depacketizer_del(rtp->depacketizer);
-		if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
-		gf_rtp_del(rtp->rtp_ch);
-		gf_free(rtp);
-
-		if (ifce->decoder_config) {
-			gf_free(ifce->decoder_config);
-			ifce->decoder_config = NULL;
-		}
-		ifce->input_udta = NULL;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-static void rtp_sl_packet_cbk(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
-{
-	GF_ESIRTP *rtp = (GF_ESIRTP*)udta;
-
-	/*sync not found yet, cannot start (since we don't support PCR discontinuities yet ...)*/
-	if (!rtp->rtcp_init) return;
-
-	/*try to compute a DTS*/
-	if (hdr->accessUnitStartFlag && !hdr->decodingTimeStampFlag) {
-		if (!rtp->prev_cts) {
-			rtp->prev_cts = rtp->prev_dts = hdr->compositionTimeStamp;
-		}
-
-		if (hdr->compositionTimeStamp > rtp->prev_cts) {
-			u32 diff = (u32) (hdr->compositionTimeStamp - rtp->prev_cts);
-			if (!rtp->min_dts_inc || (rtp->min_dts_inc > diff)) {
-				rtp->min_dts_inc = diff;
-				rtp->prev_dts = hdr->compositionTimeStamp - diff;
-			}
-		}
-		hdr->decodingTimeStampFlag = 1;
-		hdr->decodingTimeStamp = rtp->prev_dts + rtp->min_dts_inc;
-		rtp->prev_dts += rtp->min_dts_inc;
-		if (hdr->compositionTimeStamp < hdr->decodingTimeStamp) {
-			hdr->decodingTimeStamp = hdr->compositionTimeStamp;
-		}
-	}
-
-	rtp->pck.data = payload;
-	rtp->pck.data_len = size;
-	rtp->pck.dts = hdr->decodingTimeStamp + rtp->ts_offset;
-	rtp->pck.cts = hdr->compositionTimeStamp + rtp->ts_offset;
-	rtp->pck.flags = 0;
-	if (hdr->compositionTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_CTS;
-	if (hdr->decodingTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_DTS;
-	if (hdr->randomAccessPointFlag) rtp->pck.flags |= GF_ESI_DATA_AU_RAP;
-	if (hdr->accessUnitStartFlag) rtp->pck.flags |= GF_ESI_DATA_AU_START;
-	if (hdr->accessUnitEndFlag) rtp->pck.flags |= GF_ESI_DATA_AU_END;
-
-	if (rtp->use_carousel) {
-		if ((hdr->AU_sequenceNumber==rtp->au_sn) && hdr->randomAccessPointFlag) rtp->pck.flags |= GF_ESI_DATA_REPEAT;
-		rtp->au_sn = hdr->AU_sequenceNumber;
-	}
-
-	if (rtp->is_264) {
-		if (!payload) return;
-
-		/*send a NALU delim: copy over NAL ref idc*/
-		if (hdr->accessUnitStartFlag) {
-			char sc[6];
-			sc[0] = sc[1] = sc[2] = 0;
-			sc[3] = 1;
-			sc[4] = (payload[4] & 0x60) | GF_AVC_NALU_ACCESS_UNIT;
-			sc[5] = 0xF0 /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
-
-			rtp->pck.data = sc;
-			rtp->pck.data_len = 6;
-			rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-
-			rtp->pck.flags &= ~GF_ESI_DATA_AU_START;
-
-			/*since we don't inspect the RTP content, we can only concatenate SPS and PPS indicated in SDP*/
-			if (hdr->randomAccessPointFlag && rtp->dsi_and_rap) {
-				rtp->pck.data = (char*)rtp->dsi_and_rap;
-				rtp->pck.data_len = rtp->avc_dsi_size;
-
-				rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-			}
-
-			rtp->pck.data = payload;
-			rtp->pck.data_len = size;
-		}
-
-		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-	} else {
-		if (rtp->cat_dsi && hdr->randomAccessPointFlag && hdr->accessUnitStartFlag) {
-			if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
-			rtp->pck.data_len = size + rtp->depacketizer->sl_map.configSize;
-			rtp->dsi_and_rap = gf_malloc(sizeof(char)*(rtp->pck.data_len));
-			memcpy(rtp->dsi_and_rap, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-			memcpy((char *) rtp->dsi_and_rap + rtp->depacketizer->sl_map.configSize, payload, size);
-			rtp->pck.data = (char*)rtp->dsi_and_rap;
-		}
-		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
-	}
-}
-
-static void fill_rtp_es_ifce(GF_ESInterface *ifce, GF_SDPMedia *media, GF_SDPInfo *sdp, M2TSSource *source)
-{
-	u32 i;
-	GF_Err e;
-	GF_X_Attribute*att;
-	GF_ESIRTP *rtp;
-	GF_RTPMap*map;
-	GF_SDPConnection *conn;
-	GF_RTSPTransport trans;
-
-	/*check connection*/
-	conn = sdp->c_connection;
-	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
-
-	/*check payload type*/
-	map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
-	GF_SAFEALLOC(rtp, GF_ESIRTP);
-	if (!rtp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate RTP input handler\n"));
-		return;
-	}
-
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	rtp->rtp_ch = gf_rtp_new();
-	i=0;
-	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
-		if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ifce->stream_id = atoi(att->Value);
-	}
-
-	memset(&trans, 0, sizeof(GF_RTSPTransport));
-	trans.Profile = media->Profile;
-	trans.source = conn ? conn->host : sdp->o_address;
-	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
-	if (!trans.IsUnicast) {
-		trans.port_first = media->PortNumber;
-		trans.port_last = media->PortNumber + 1;
-		trans.TTL = conn ? conn->TTL : 0;
-	} else {
-		trans.client_port_first = media->PortNumber;
-		trans.client_port_last = media->PortNumber + 1;
-	}
-
-	if (gf_rtp_setup_transport(rtp->rtp_ch, &trans, NULL) != GF_OK) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot initialize RTP transport\n");
-		return;
-	}
-	/*setup depacketizer*/
-	rtp->depacketizer = gf_rtp_depacketizer_new(media, rtp_sl_packet_cbk, rtp);
-	if (!rtp->depacketizer) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot create RTP depacketizer\n");
-		return;
-	}
-	/*setup channel*/
-	gf_rtp_setup_payload(rtp->rtp_ch, map);
-	ifce->input_udta = rtp;
-	ifce->input_ctrl = rtp_input_ctrl;
-	rtp->ifce = ifce;
-	rtp->source = source;
-
-	ifce->object_type_indication = rtp->depacketizer->sl_map.ObjectTypeIndication;
-	ifce->stream_type = rtp->depacketizer->sl_map.StreamType;
-	ifce->timescale = gf_rtp_get_clockrate(rtp->rtp_ch);
-	if (rtp->depacketizer->sl_map.config) {
-		switch (ifce->object_type_indication) {
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			rtp->cat_dsi = GF_TRUE;
-			break;
-		case GPAC_OTI_VIDEO_AVC:
-		case GPAC_OTI_VIDEO_SVC:
-		case GPAC_OTI_VIDEO_MVC:
-			rtp->is_264 = GF_TRUE;
-			rtp->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
-			{
-#ifndef GPAC_DISABLE_AV_PARSERS
-				GF_AVCConfig *avccfg = gf_odf_avc_cfg_read(rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-				if (avccfg) {
-					GF_AVCConfigSlot *slc;
-					u32 i;
-					GF_BitStream *bs;
-
-					bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-					for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->sequenceParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, slc->data, slc->size);
-					}
-					for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
-						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, slc->data, slc->size);
-					}
-					gf_bs_get_content(bs, (char **) &rtp->dsi_and_rap, &rtp->avc_dsi_size);
-					gf_bs_del(bs);
-				}
-				gf_odf_avc_cfg_del(avccfg);
-#endif
-			}
-			break;
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-			ifce->decoder_config = (char*)gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
-			ifce->decoder_config_size = rtp->depacketizer->sl_map.configSize;
-			memcpy(ifce->decoder_config, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
-			break;
-		}
-	}
-	if (rtp->depacketizer->sl_map.StreamStateIndication) {
-		rtp->use_carousel = GF_TRUE;
-		rtp->au_sn=0;
-	}
-
-	/*DTS signaling is only supported for MPEG-4 visual*/
-	if (rtp->depacketizer->sl_map.DTSDeltaLength) ifce->caps |= GF_ESI_SIGNAL_DTS;
-
-	gf_rtp_depacketizer_reset(rtp->depacketizer, GF_TRUE);
-	e = gf_rtp_initialize(rtp->rtp_ch, 0x100000ul, GF_FALSE, 0, 10, 200, NULL);
-	if (e!=GF_OK) {
-		gf_rtp_del(rtp->rtp_ch);
-		fprintf(stderr, "Cannot initialize RTP channel: %s\n", gf_error_to_string(e));
-		return;
-	}
-	fprintf(stderr, "RTP interface initialized\n");
-}
-#endif /*GPAC_DISABLE_STREAMING*/
-
-#ifndef GPAC_DISABLE_SENG
-static GF_Err void_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	return GF_OK;
-}
-#endif
-
-/*AAC import features*/
-#ifndef GPAC_DISABLE_PLAYER
-
-void *audio_prog = NULL;
-static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts);
-#define DONT_USE_TERMINAL_MODULE_API
-#include "../../modules/aac_in/aac_in.c"
-AACReader *aac_reader = NULL;
-u64 audio_discontinuity_offset = 0;
-
-/*create an OD codec and encode the descriptor*/
-static GF_Err encode_audio_desc(GF_ESD *esd, GF_SimpleDataDescriptor *audio_desc)
-{
-	GF_Err e;
-	GF_ODCodec *odc = gf_odf_codec_new();
-	GF_ODUpdate *od_com = (GF_ODUpdate*)gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	assert( esd );
-	assert( audio_desc );
-	gf_list_add(od->ESDescriptors, esd);
-	od->objectDescriptorID = AUDIO_DATA_ESID;
-	gf_list_add(od_com->objectDescriptors, od);
-
-	e = gf_odf_codec_add_com(odc, (GF_ODCom*)od_com);
-	if (e) {
-		fprintf(stderr, "Audio input error add the command to be encoded\n");
-		return e;
-	}
-	e = gf_odf_codec_encode(odc, 0);
-	if (e) {
-		fprintf(stderr, "Audio input error encoding the descriptor\n");
-		return e;
-	}
-	e = gf_odf_codec_get_au(odc, &audio_desc->data, &audio_desc->size);
-	if (e) {
-		fprintf(stderr, "Audio input error getting the descriptor\n");
-		return e;
-	}
-	e = gf_odf_com_del((GF_ODCom**)&od_com);
-	if (e) {
-		fprintf(stderr, "Audio input error deleting the command\n");
-		return e;
-	}
-	gf_odf_codec_del(odc);
-
-	return GF_OK;
-}
-
-#endif
-
-
-static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts)
-{
-	u32 i;
-	//fprintf(stderr, "update: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-
-	if (calling_object) {
-		M2TSSource *source = (M2TSSource *)calling_object;
-
-#ifndef GPAC_DISABLE_PLAYER
-		if (ESID == AUDIO_DATA_ESID) {
-			if (audio_OD_stream_id != (u32)-1) {
-				/*this is the first time we get some audio data. Therefore we are sure we can retrieve the audio descriptor. Then we'll
-				  send it by calling this callback recursively so that a player gets the audio descriptor before audio data.
-				  Hack: the descriptor is carried thru the input_udta, you shall delete it*/
-				GF_SimpleDataDescriptor *audio_desc = source->streams[audio_OD_stream_id].input_udta;
-				if (audio_desc && !audio_desc->data) /*intended for HTTP/AAC: an empty descriptor was set (vs already filled for RTP/UDP MP3)*/
-				{
-					/*get the audio descriptor and encode it*/
-					GF_ESD *esd = AAC_GetESD(aac_reader);
-					assert(esd->slConfig->timestampResolution);
-					esd->slConfig->useAccessUnitStartFlag = 1;
-					esd->slConfig->useAccessUnitEndFlag = 1;
-					esd->slConfig->useTimestampsFlag = 1;
-					esd->slConfig->timestampLength = 33;
-					/*audio stream, all samples are RAPs*/
-					esd->slConfig->useRandomAccessPointFlag = 0;
-					esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
-							GF_Err e;
-							source->streams[i].timescale = esd->slConfig->timestampResolution;
-							e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
-							if (e != GF_OK) {
-								fprintf(stderr, "Failed updating TS program timescale\n");
-							}
-							else if (!source->streams[i].sl_config)
-								source->streams[i].sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-
-							memcpy(source->streams[i].sl_config, esd->slConfig, sizeof(GF_SLConfig));
-							break;
-						}
-					}
-					esd->ESID = AUDIO_DATA_ESID;
-					assert(audio_OD_stream_id != (u32)-1);
-					encode_audio_desc(esd, audio_desc);
-
-					/*build the ESI*/
-					{
-						/*audio OD descriptor: rap=1 and vers_inc=0*/
-						GF_SAFEALLOC(source->streams[audio_OD_stream_id].input_udta, GF_ESIStream);
-						if (!source->streams[audio_OD_stream_id].input_udta) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate aac input handler\n"));
-							return;
-						}
-						((GF_ESIStream*)source->streams[audio_OD_stream_id].input_udta)->rap = 1;
-
-						/*we have the descriptor; now call this callback recursively so that a player gets the audio descriptor before audio data.*/
-						source->repeat = 1;
-						SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-						source->repeat = 0;
-
-						/*clean*/
-						gf_free(audio_desc->data);
-						gf_free(audio_desc);
-						gf_free(source->streams[audio_OD_stream_id].input_udta);
-						source->streams[audio_OD_stream_id].input_udta = NULL;
-					}
-				}
-			}
-			/*update the timescale if needed*/
-			else if (!source->audio_configured) {
-				GF_ESD *esd = AAC_GetESD(aac_reader);
-				assert(esd->slConfig->timestampResolution);
-				for (i=0; i<source->nb_streams; i++) {
-					if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
-						GF_Err e;
-						source->streams[i].timescale = esd->slConfig->timestampResolution;
-						source->streams[i].decoder_config = esd->decoderConfig->decoderSpecificInfo->data;
-						source->streams[i].decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-						esd->decoderConfig->decoderSpecificInfo->data = NULL;
-						esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
-						e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
-						if (!e)
-							source->audio_configured = 1;
-						break;
-					}
-				}
-				gf_odf_desc_del((GF_Descriptor *)esd);
-			}
-
-			/*overwrite timing as it is flushed to 0 on discontinuities*/
-			ts += audio_discontinuity_offset;
-		}
-#endif
-		i=0;
-		while (i<source->nb_streams) {
-			if (source->streams[i].output_ctrl==NULL) {
-				fprintf(stderr, "MULTIPLEX NOT YET CREATED\n");
-				return;
-			}
-			if (source->streams[i].stream_id == ESID) {
-				GF_ESIStream *priv = (GF_ESIStream *)source->streams[i].input_udta;
-				GF_ESIPacket pck;
-				memset(&pck, 0, sizeof(GF_ESIPacket));
-				pck.data = data;
-				pck.data_len = size;
-				pck.flags |= GF_ESI_DATA_HAS_CTS;
-				pck.flags |= GF_ESI_DATA_HAS_DTS;
-				pck.flags |= GF_ESI_DATA_AU_START;
-				pck.flags |= GF_ESI_DATA_AU_END;
-				if (ts) pck.cts = pck.dts = ts;
-
-				if (priv->rap)
-					pck.flags |= GF_ESI_DATA_AU_RAP;
-				if (source->repeat || !priv->vers_inc) {
-					pck.flags |= GF_ESI_DATA_REPEAT;
-					fprintf(stderr, "RAP carousel from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-				} else {
-					if (ESID != AUDIO_DATA_ESID && ESID != VIDEO_DATA_ESID)	/*don't log A/V inputs*/
-						fprintf(stderr, "Update from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
-				}
-				source->streams[i].output_ctrl(&source->streams[i], GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-				return;
-			}
-			i++;
-		}
-	}
-	return;
-}
-
-//static gf_seng_callback * SampleCallBack = &mySampleCallBack;
-
-
-static volatile Bool run = 1;
-
-#ifndef GPAC_DISABLE_SENG
-static GF_ESIStream * set_broadcast_params(M2TSSource *source, u16 esid, u32 period, u32 ts_delta, u16 aggregate_on_stream, Bool adjust_carousel_time, Bool force_rap, Bool aggregate_au, Bool discard_pending, Bool signal_rap, Bool signal_critical, Bool version_inc)
-{
-	u32 i=0;
-	GF_ESIStream *priv=NULL;
-	GF_ESInterface *esi=NULL;
-
-	/*locate our stream*/
-	if (esid) {
-		while (i<source->nb_streams) {
-			if (source->streams[i].stream_id == esid) {
-				priv = (GF_ESIStream *)source->streams[i].input_udta;
-				esi = &source->streams[i];
-				break;
-			}
-			else {
-				i++;
-			}
-		}
-		/*TODO: stream not found*/
-	}
-
-	/*TODO - set/reset the ESID for the parsers*/
-	if (!priv) return NULL;
-
-	/*TODO - if discard is set, abort current carousel*/
-	if (discard_pending) {
-	}
-
-	/*remember RAP flag*/
-	priv->rap = signal_rap;
-	priv->critical = signal_critical;
-	priv->vers_inc = version_inc;
-
-	priv->ts_delta = ts_delta;
-	priv->adjust_carousel_time = adjust_carousel_time;
-
-	/*change stream aggregation mode*/
-	if ((aggregate_on_stream != (u16)-1) && (priv->aggregate_on_stream != aggregate_on_stream)) {
-		gf_seng_enable_aggregation(source->seng, esid, aggregate_on_stream);
-		priv->aggregate_on_stream = aggregate_on_stream;
-	}
-	/*change stream aggregation mode*/
-	if (priv->aggregate_on_stream==esi->stream_id) {
-		if (priv->aggregate_on_stream && (period!=(u32)-1) && (esi->repeat_rate != period)) {
-			esi->repeat_rate = period;
-		}
-	} else {
-		esi->repeat_rate = 0;
-	}
-	return priv;
-}
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-
-static u32 seng_output(void *param)
-{
-	GF_Err e;
-	u64 last_src_modif, mod_time;
-	M2TSSource *source = (M2TSSource *)param;
-	GF_SceneEngine *seng = source->seng;
-#ifndef GPAC_DISABLE_PLAYER
-	GF_SimpleDataDescriptor *audio_desc;
-#endif
-	Bool update_context=0;
-	Bool force_rap, adjust_carousel_time, discard_pending, signal_rap, signal_critical, version_inc, aggregate_au;
-	u32 period, ts_delta;
-	u16 es_id, aggregate_on_stream;
-	e = GF_OK;
-	gf_sleep(2000); /*TODO: events instead? What are we waiting for?*/
-	gf_seng_encode_context(seng, SampleCallBack);
-
-	last_src_modif = source->bifs_src_name ? gf_file_modification_time(source->bifs_src_name) : 0;
-
-	/*send the audio descriptor*/
-#ifndef GPAC_DISABLE_PLAYER
-	if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL && audio_OD_stream_id!=(u32)-1) {
-		audio_desc = source->streams[audio_OD_stream_id].input_udta;
-		if (audio_desc && audio_desc->data) /*RTP/UDP + MP3 case*/
-		{
-			assert(audio_OD_stream_id != (u32)-1);
-			assert(!aac_reader); /*incompatible with AAC*/
-			source->repeat = 1;
-			SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
-			source->repeat = 0;
-			gf_free(audio_desc->data);
-			gf_free(audio_desc);
-			source->streams[audio_OD_stream_id].input_udta = NULL;
-		}
-	}
-#endif
-
-	while (run) {
-		if (!gf_prompt_has_input()) {
-			if (source->bifs_src_name) {
-				mod_time = gf_file_modification_time(source->bifs_src_name);
-				if (mod_time != last_src_modif) {
-					FILE *srcf;
-					char flag_buf[201], *flag;
-					fprintf(stderr, "Update file modified - processing\n");
-					last_src_modif = mod_time;
-
-					srcf = gf_fopen(source->bifs_src_name, "rt");
-					if (!srcf) continue;
-
-					/*checks if we have a broadcast config*/
-					if (!fgets(flag_buf, 200, srcf))
-						flag_buf[0] = '\0';
-					gf_fclose(srcf);
-
-					aggregate_au = force_rap = adjust_carousel_time = discard_pending = signal_rap = signal_critical = 0;
-					version_inc = 1;
-					period = -1;
-					aggregate_on_stream = -1;
-					ts_delta = 0;
-					es_id = 0;
-
-					/*find our keyword*/
-					flag = strstr(flag_buf, "gpac_broadcast_config ");
-					if (flag) {
-						flag += strlen("gpac_broadcast_config ");
-						/*move to next word*/
-						while (flag && (flag[0]==' ')) flag++;
-
-						while (1) {
-							char *sep = strchr(flag, ' ');
-							if (sep) sep[0] = 0;
-							if (!strnicmp(flag, "esid=", 5)) {
-								/*ESID on which the update is applied*/
-								es_id = atoi(flag+5);
-							} else if (!strnicmp(flag, "period=", 7)) {
-								/*TODO: target period carousel for ESID ??? (ESID/carousel)*/
-								period = atoi(flag+7);
-							} else if (!strnicmp(flag, "ts=", 3)) {
-								/*TODO: */
-								ts_delta = atoi(flag+3);
-							} else if (!strnicmp(flag, "carousel=", 9)) {
-								/*TODO: why? => sends the update on carousel id specified by this argument*/
-								aggregate_on_stream = atoi(flag+9);
-							} else if (!strnicmp(flag, "restamp=", 8)) {
-								/*CTS is updated when carouselled*/
-								adjust_carousel_time = atoi(flag+8);
-							} else if (!strnicmp(flag, "discard=", 8)) {
-								/*when we receive several updates during a single carousel period, this attribute specifies whether the current update discard pending ones*/
-								discard_pending = atoi(flag+8);
-							} else if (!strnicmp(flag, "aggregate=", 10)) {
-								/*Boolean*/
-								aggregate_au = atoi(flag+10);
-							} else if (!strnicmp(flag, "force_rap=", 10)) {
-								/*TODO: */
-								force_rap = atoi(flag+10);
-							} else if (!strnicmp(flag, "rap=", 4)) {
-								/*TODO: */
-								signal_rap = atoi(flag+4);
-							} else if (!strnicmp(flag, "critical=", 9)) {
-								/*TODO: */
-								signal_critical = atoi(flag+9);
-							} else if (!strnicmp(flag, "vers_inc=", 9)) {
-								/*Boolean to increment m2ts section version number*/
-								version_inc = atoi(flag+9);
-							}
-							if (sep) {
-								sep[0] = ' ';
-								flag = sep+1;
-							} else {
-								break;
-							}
-						}
-
-						set_broadcast_params(source, es_id, period, ts_delta, aggregate_on_stream, adjust_carousel_time, force_rap, aggregate_au, discard_pending, signal_rap, signal_critical, version_inc);
-					}
-
-					e = gf_seng_encode_from_file(seng, es_id, aggregate_au ? 0 : 1, source->bifs_src_name, SampleCallBack);
-					if (e) {
-						fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-					} else
-						gf_seng_aggregate_context(seng, 0);
-
-					update_context=1;
-
-
-
-				}
-			}
-			if (update_context) {
-				source->repeat = 1;
-				e = gf_seng_encode_context(seng, SampleCallBack);
-				source->repeat = 0;
-				update_context = 0;
-			}
-
-			gf_sleep(10);
-		} else { /*gf_prompt_has_input()*/
-			char c = gf_prompt_get_char();
-			switch (c) {
-			case 'u':
-			{
-				GF_Err e;
-				char szCom[8192];
-				fprintf(stderr, "Enter command to send:\n");
-				fflush(stdin);
-				szCom[0] = 0;
-				if (1 > scanf("%[^\t\n]", szCom)) {
-					fprintf(stderr, "No command has been properly entered, aborting.\n");
-					break;
-				}
-				e = gf_seng_encode_from_string(seng, 0, 0, szCom, SampleCallBack);
-				if (e) {
-					fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-				}
-				update_context=1;
-			}
-			break;
-			case 'p':
-			{
-				char rad[GF_MAX_PATH];
-				fprintf(stderr, "Enter output file name - \"std\" for stderr: ");
-				if (1 > scanf("%s", rad)) {
-					fprintf(stderr, "No outfile name has been entered, aborting.\n");
-					break;
-				}
-				e = gf_seng_save_context(seng, !strcmp(rad, "std") ? NULL : rad);
-				fprintf(stderr, "Dump done (%s)\n", gf_error_to_string(e));
-			}
-			break;
-			case 'q':
-			{
-				run = 0;
-			}
-			}
-			e = GF_OK;
-		}
-	}
-
-
-	return e ? 1 : 0;
-}
-
-void fill_seng_es_ifce(GF_ESInterface *ifce, u32 i, GF_SceneEngine *seng, u32 period)
-{
-	GF_Err e = GF_OK;
-	u32 len;
-	GF_ESIStream *stream;
-	char *config_buffer = NULL;
-
-	memset(ifce, 0, sizeof(GF_ESInterface));
-	e = gf_seng_get_stream_config(seng, i, (u16*) &(ifce->stream_id), &config_buffer, &len, (u32*) &(ifce->stream_type), (u32*) &(ifce->object_type_indication), &(ifce->timescale));
-	if (e) {
-		fprintf(stderr, "Cannot set the stream config for stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
-	}
-
-	ifce->repeat_rate = period;
-	GF_SAFEALLOC(stream, GF_ESIStream);
-	if (!stream) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate SENG input handler\n"));
-		return;
-	}
-
-	stream->rap = 1;
-	if (ifce->input_udta)
-		gf_free(ifce->input_udta);
-	ifce->input_udta = stream;
-
-	//fprintf(stderr, "Caroussel period: %d\n", period);
-//	e = gf_seng_set_carousel_time(seng, ifce->stream_id, period);
-	if (e) {
-		fprintf(stderr, "Cannot set carousel time on stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
-	}
-	ifce->input_ctrl = seng_input_ctrl;
-
-}
-#endif
-
-static Bool open_source(M2TSSource *source, char *src, u32 carousel_rate, u32 mpeg4_signaling, char *update, char *audio_input_ip, u16 audio_input_port, char *video_buffer, Bool force_real_time, u32 bifs_use_pes, const char *temi_url, Bool compute_max_size, Bool insert_ntp)
-{
-#ifndef GPAC_DISABLE_STREAMING
-	GF_SDPInfo *sdp;
-#endif
-
-	memset(source, 0, sizeof(M2TSSource));
-	source->mpeg4_signaling = mpeg4_signaling;
-
-	/*open ISO file*/
-#ifndef GPAC_DISABLE_ISOM
-	if (gf_isom_probe_file(src)) {
-		u32 i;
-		u32 nb_tracks;
-		Bool has_bifs_od = 0;
-		Bool temi_assigned = 0;
-		u32 first_audio = 0;
-		u32 first_other = 0;
-		s64 min_offset = 0;
-		u32 min_offset_timescale = 0;
-		source->mp4 = gf_isom_open(src, GF_ISOM_OPEN_READ, 0);
-		source->nb_streams = 0;
-		source->real_time = force_real_time;
-		/*on MPEG-2 TS, carry 3GPP timed text as MPEG-4 Part17*/
-		gf_isom_text_set_streaming_mode(source->mp4, 1);
-		nb_tracks = gf_isom_get_track_count(source->mp4);
-
-		for (i=0; i<nb_tracks; i++) {
-			Bool check_deps = 0;
-			if (gf_isom_get_media_type(source->mp4, i+1) == GF_ISOM_MEDIA_HINT)
-				continue;
-
-			fill_isom_es_ifce(source, &source->streams[i], source->mp4, i+1, bifs_use_pes, compute_max_size);
-			if (min_offset > ((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset) {
-				min_offset = ((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset;
-				min_offset_timescale = source->streams[i].timescale;
-			}
-
-			switch(source->streams[i].stream_type) {
-			case GF_STREAM_OD:
-				has_bifs_od = 1;
-				source->streams[i].repeat_rate = carousel_rate;
-				break;
-			case GF_STREAM_SCENE:
-				has_bifs_od = 1;
-				source->streams[i].repeat_rate = carousel_rate;
-				break;
-			case GF_STREAM_VISUAL:
-				/*turn on image repeat*/
-				switch (source->streams[i].object_type_indication) {
-				case GPAC_OTI_IMAGE_JPEG:
-				case GPAC_OTI_IMAGE_PNG:
-					((GF_ESIMP4 *)source->streams[i].input_udta)->image_repeat_ms = carousel_rate;
-					break;
-				default:
-					check_deps = 1;
-					if (gf_isom_get_sample_count(source->mp4, i+1)>1) {
-						/*get first visual stream as PCR*/
-						if (!source->pcr_idx) {
-							source->pcr_idx = i+1;
-							if ((temi_id_1>=0) || (temi_id_2>=0)) {
-								temi_assigned = GF_TRUE;
-								((GF_ESIMP4 *)source->streams[i].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
-								((GF_ESIMP4 *)source->streams[i].input_udta)->insert_ntp = insert_ntp;
-
-								if (temi_url && (temi_id_1>=0))
-									((GF_ESIMP4 *)source->streams[i].input_udta)->temi_url = temi_url;
-
-								if (temi_id_1>=0) temi_id_1 = -1;
-								else temi_id_2 = -1;
-							}
-						}
-					}
-					break;
-				}
-				break;
-			case GF_STREAM_AUDIO:
-				if (!first_audio) first_audio = i+1;
-				check_deps = 1;
-				break;
-			default:
-				/*log not supported stream type: %s*/
-				break;
-			}
-			source->nb_streams++;
-			if (gf_isom_get_sample_count(source->mp4, i+1)>1) first_other = i+1;
-
-			if (check_deps) {
-				u32 k;
-				Bool found_dep = 0;
-				for (k=0; k<nb_tracks; k++) {
-					if (gf_isom_get_media_type(source->mp4, k+1) != GF_ISOM_MEDIA_OD)
-						continue;
-
-					/*this stream is not refered to by any OD, send as regular PES*/
-					if (gf_isom_has_track_reference(source->mp4, k+1, GF_ISOM_REF_OD, gf_isom_get_track_id(source->mp4, i+1) )==1) {
-						found_dep = 1;
-						break;
-					}
-				}
-				if (!found_dep) {
-					source->streams[i].caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
-				}
-			}
-		}
-		if (has_bifs_od && !source->mpeg4_signaling) source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-		if ( !temi_assigned && first_audio && ((temi_id_1>=0) || (temi_id_2>=0) ) ) {
-			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
-			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->insert_ntp = insert_ntp;
-
-			if (temi_url && (temi_id_1>=0) )
-				((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->temi_url = temi_url;
-
-			if (temi_id_1>=0) temi_id_1 = -1;
-			else temi_id_2 = -1;
-		}
-
-		/*if no visual PCR found, use first audio*/
-		if (!source->pcr_idx) source->pcr_idx = first_audio;
-		if (!source->pcr_idx) source->pcr_idx = first_other;
-		if (source->pcr_idx) {
-			GF_ESIMP4 *priv;
-			source->pcr_idx-=1;
-			priv = source->streams[source->pcr_idx].input_udta;
-			gf_isom_set_default_sync_track(source->mp4, priv->track);
-		}
-
-		if (min_offset < 0) {
-			for (i=0; i<source->nb_streams; i++) {
-				Double scale = source->streams[i].timescale;
-				scale /= min_offset_timescale;
-				((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset += (s64) (-min_offset * scale);
-			}
-		}
-
-		source->iod = gf_isom_get_root_od(source->mp4);
-		if (source->iod) {
-			GF_ObjectDescriptor*iod = (GF_ObjectDescriptor*)source->iod;
-			if (gf_list_count( ((GF_ObjectDescriptor*)source->iod)->ESDescriptors) == 0) {
-				gf_odf_desc_del(source->iod);
-				source->iod = NULL;
-			} else {
-				fprintf(stderr, "IOD found for program %s\n", src);
-
-				/*if using 4over2, get rid of OD tracks*/
-				if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_SCENE) {
-					for (i=0; i<gf_list_count(iod->ESDescriptors); i++) {
-						u32 track_num, k;
-						GF_M2TSDescriptor *oddesc;
-						GF_ISOSample *sample;
-						GF_ESD *esd = gf_list_get(iod->ESDescriptors, i);
-						if (esd->decoderConfig->streamType!=GF_STREAM_OD) continue;
-						track_num = gf_isom_get_track_by_id(source->mp4, esd->ESID);
-						if (gf_isom_get_sample_count(source->mp4, track_num)>1) continue;
-
-						sample = gf_isom_get_sample(source->mp4, track_num, 1, NULL);
-						if (sample->dataLength >= 255-2) {
-							gf_isom_sample_del(&sample);
-							continue;
-						}
-						/*rewrite ESD dependencies*/
-						for (k=0; k<gf_list_count(iod->ESDescriptors); k++) {
-							GF_ESD *dep_esd = gf_list_get(iod->ESDescriptors, k);
-							if (dep_esd->dependsOnESID==esd->ESID) dep_esd->dependsOnESID = esd->dependsOnESID;
-						}
-
-						for (k=0; k<source->nb_streams; k++) {
-							if (source->streams[k].stream_id==esd->ESID) {
-								source->streams[k].stream_type = 0;
-								break;
-							}
-						}
-
-						if (!source->od_updates) source->od_updates = gf_list_new();
-						GF_SAFEALLOC(oddesc, GF_M2TSDescriptor);
-						oddesc->data_len = sample->dataLength;
-						oddesc->data = sample->data;
-						oddesc->tag = GF_M2TS_MPEG4_ODUPDATE_DESCRIPTOR;
-						sample->data = NULL;
-						gf_isom_sample_del(&sample);
-						gf_list_add(source->od_updates, oddesc);
-
-						gf_list_rem(iod->ESDescriptors, i);
-						i--;
-						gf_odf_desc_del((GF_Descriptor *) esd);
-						source->samples_count--;
-					}
-				}
-
-			}
-		}
-		return 1;
-	}
-#endif
-
-
-#ifndef GPAC_DISABLE_STREAMING
-	/*open SDP file*/
-	if (strstr(src, ".sdp")) {
-		GF_X_Attribute *att;
-		char *sdp_buf;
-		u32 sdp_size, i;
-		GF_Err e;
-		FILE *_sdp = gf_fopen(src, "rt");
-		if (!_sdp) {
-			fprintf(stderr, "Error opening %s - no such file\n", src);
-			return 0;
-		}
-		gf_fseek(_sdp, 0, SEEK_END);
-		sdp_size = (u32)gf_ftell(_sdp);
-		gf_fseek(_sdp, 0, SEEK_SET);
-		sdp_buf = (char*)gf_malloc(sizeof(char)*sdp_size);
-		memset(sdp_buf, 0, sizeof(char)*sdp_size);
-		sdp_size = (u32) fread(sdp_buf, 1, sdp_size, _sdp);
-		gf_fclose(_sdp);
-
-		sdp = gf_sdp_info_new();
-		e = gf_sdp_info_parse(sdp, sdp_buf, sdp_size);
-		gf_free(sdp_buf);
-		if (e) {
-			fprintf(stderr, "Error opening %s : %s\n", src, gf_error_to_string(e));
-			gf_sdp_info_del(sdp);
-			return 0;
-		}
-
-		i=0;
-		while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
-			char buf[2000];
-			u32 size;
-			char *buf64;
-			u32 size64;
-			char *iod_str;
-			if (strcmp(att->Name, "mpeg4-iod") ) continue;
-			iod_str = att->Value + 1;
-			if (strnicmp(iod_str, "data:application/mpeg4-iod;base64", strlen("data:application/mpeg4-iod;base64"))) continue;
-
-			buf64 = strstr(iod_str, ",");
-			if (!buf64) break;
-			buf64 += 1;
-			size64 = (u32) strlen(buf64) - 1;
-			size = gf_base64_decode(buf64, size64, buf, 2000);
-
-			gf_odf_desc_read(buf, size, &source->iod);
-			break;
-		}
-
-		source->nb_streams = gf_list_count(sdp->media_desc);
-		for (i=0; i<source->nb_streams; i++) {
-			GF_SDPMedia *media = gf_list_get(sdp->media_desc, i);
-			fill_rtp_es_ifce(&source->streams[i], media, sdp, source);
-			switch(source->streams[i].stream_type) {
-			case GF_STREAM_OD:
-			case GF_STREAM_SCENE:
-				source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-				source->streams[i].repeat_rate = carousel_rate;
-				break;
-			}
-			if (!source->pcr_idx && (source->streams[i].stream_type == GF_STREAM_VISUAL)) {
-				source->pcr_idx = i+1;
-			}
-		}
-
-		if (source->pcr_idx) source->pcr_idx-=1;
-		gf_sdp_info_del(sdp);
-
-		return 2;
-	} else
-#endif /*GPAC_DISABLE_STREAMING*/
-
-#ifndef GPAC_DISABLE_SENG
-		if (strstr(src, ".bt")) //open .bt file
-		{
-			u32 i;
-			u32 load_type=0;
-			source->seng = gf_seng_init(source, src, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
-			if (!source->seng) {
-				fprintf(stderr, "Cannot create scene engine\n");
-				exit(1);
-			}
-			else {
-				fprintf(stderr, "Scene engine created.\n");
-			}
-			assert( source );
-			assert( source->seng);
-			source->iod = gf_seng_get_iod(source->seng);
-			if (! source->iod) {
-				fprintf(stderr, __FILE__": No IOD\n");
-			}
-
-			source->nb_streams = gf_seng_get_stream_count(source->seng);
-			source->rate = carousel_rate;
-			source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-
-			for (i=0; i<source->nb_streams; i++) {
-				fill_seng_es_ifce(&source->streams[i], i, source->seng, source->rate);
-				//fprintf(stderr, "Fill interface\n");
-				if (!source->pcr_idx && (source->streams[i].stream_type == GF_STREAM_AUDIO)) {
-					source->pcr_idx = i+1;
-				}
-			}
-
-#ifndef GPAC_DISABLE_PLAYER
-			/*when an audio input is present, declare it and store OD + ESD_U*/
-			if (audio_input_ip) {
-				/*add the audio program*/
-				source->pcr_idx = source->nb_streams;
-				source->streams[source->nb_streams].stream_type = GF_STREAM_AUDIO;
-				/*hack: http urls are not decomposed therefore audio_input_port remains null*/
-				if (audio_input_port) {	/*UDP/RTP*/
-					source->streams[source->nb_streams].object_type_indication = GPAC_OTI_AUDIO_MPEG1;
-				} else { /*HTTP*/
-					aac_reader->oti = source->streams[source->nb_streams].object_type_indication = GPAC_OTI_AUDIO_AAC_MPEG4;
-				}
-				source->streams[source->nb_streams].input_ctrl = void_input_ctrl;
-				source->streams[source->nb_streams].stream_id = AUDIO_DATA_ESID;
-				source->streams[source->nb_streams].timescale = 1000;
-
-				GF_SAFEALLOC(source->streams[source->nb_streams].input_udta, GF_ESIStream);
-				if (!source->streams[source->nb_streams].input_udta) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate audio input handler\n"));
-					return 0;
-				}
-				
-				((GF_ESIStream*)source->streams[source->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every audio update*/
-				assert( source );
-				//assert( source->iod);
-				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
-					/*create the descriptor*/
-					GF_ESD *esd;
-					GF_SimpleDataDescriptor *audio_desc;
-					GF_SAFEALLOC(audio_desc, GF_SimpleDataDescriptor);
-					if (audio_input_port) {	/*UDP/RTP*/
-						esd = gf_odf_desc_esd_new(0);
-						esd->decoderConfig->streamType = source->streams[source->nb_streams].stream_type;
-						esd->decoderConfig->objectTypeIndication = source->streams[source->nb_streams].object_type_indication;
-					} else {				/*HTTP*/
-						esd = AAC_GetESD(aac_reader);		/*in case of AAC, we have to wait the first ADTS chunk*/
-					}
-					assert( esd );
-					esd->ESID = source->streams[source->nb_streams].stream_id;
-					if (esd->slConfig->timestampResolution) /*in case of AAC, we have to wait the first ADTS chunk*/
-						encode_audio_desc(esd, audio_desc);
-					else
-						gf_odf_desc_del((GF_Descriptor *)esd);
-
-					/*find the audio OD stream and attach its descriptor*/
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streams[i].stream_id == AUDIO_OD_ESID) {
-							if (source->streams[i].input_udta)
-								gf_free(source->streams[i].input_udta);
-							source->streams[i].input_udta = (void*)audio_desc;	/*Hack: the real input_udta type (for our SampleCallBack function) is GF_ESIStream*/
-							audio_OD_stream_id = i;
-							break;
-						}
-					}
-					if (audio_OD_stream_id == (u32)-1) {
-						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
-						return 0;
-					}
-				} else {
-					source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
-				}
-				source->nb_streams++;
-			}
-#endif
-
-			/*when an audio input is present, declare it and store OD + ESD_U*/
-			if (video_buffer) {
-				/*add the video program*/
-				source->streams[source->nb_streams].stream_type = GF_STREAM_VISUAL;
-				source->streams[source->nb_streams].object_type_indication = GPAC_OTI_VIDEO_AVC;
-				source->streams[source->nb_streams].input_ctrl = void_input_ctrl;
-				source->streams[source->nb_streams].stream_id = VIDEO_DATA_ESID;
-				source->streams[source->nb_streams].timescale = 1000;
-
-				GF_SAFEALLOC(source->streams[source->nb_streams].input_udta, GF_ESIStream);
-				if (!source->streams[source->nb_streams].input_udta) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate video input handler\n"));
-					return 0;
-				}
-				((GF_ESIStream*)source->streams[source->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every video update*/
-				assert(source);
-
-				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
-					assert(0); /*TODO*/
-#if 0
-					/*create the descriptor*/
-					GF_ESD *esd;
-					GF_SimpleDataDescriptor *video_desc;
-					GF_SAFEALLOC(video_desc, GF_SimpleDataDescriptor);
-					esd = gf_odf_desc_esd_new(0);
-					esd->decoderConfig->streamType = source->streams[source->nb_streams].stream_type;
-					esd->decoderConfig->objectTypeIndication = source->streams[source->nb_streams].object_type_indication;
-					esd->ESID = source->streams[source->nb_streams].stream_id;
-
-					/*find the audio OD stream and attach its descriptor*/
-					for (i=0; i<source->nb_streams; i++) {
-						if (source->streams[i].stream_id == 103/*TODO: VIDEO_OD_ESID*/) {
-							if (source->streams[i].input_udta)
-								gf_free(source->streams[i].input_udta);
-							source->streams[i].input_udta = (void*)video_desc;
-							audio_OD_stream_id = i;
-							break;
-						}
-					}
-					if (audio_OD_stream_id == (u32)-1) {
-						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
-						return 0;
-					}
-#endif
-				} else {
-					assert (source->mpeg4_signaling == GF_M2TS_MPEG4_SIGNALING_SCENE);
-				}
-
-				source->nb_streams++;
-			}
-
-			if (!source->pcr_idx) source->pcr_idx=1;
-			source->th = gf_th_new("Carousel");
-			source->bifs_src_name = update;
-			gf_th_run(source->th, seng_output, source);
-			return 1;
-		} else
-#endif
-		{
-			FILE *f = gf_fopen(src, "rt");
-			if (f) {
-				gf_fclose(f);
-				fprintf(stderr, "Error opening %s - not a supported input media, skipping.\n", src);
-			} else {
-				fprintf(stderr, "Error opening %s - no such file.\n", src);
-			}
-			return 0;
-		}
-}
-
-#ifdef GPAC_MEMORY_TRACKING
-GF_MemTrackerType mem_track = GF_MemTrackerNone;
-#endif
-
-/*macro to keep retro compatibility with '=' and spaces in parse_args*/
-#define CHECK_PARAM(param) (!strnicmp(arg, param, strlen(param)) \
-        && (   ((arg[strlen(param)] == '=') && (next_arg = arg+strlen(param)+1)) \
-            || ((strlen(arg) == strlen(param)) && ++i && (i<argc) && (next_arg = argv[i]))))
-
-/*parse MP42TS arguments*/
-static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, s64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, GF_M2TS_PackMode *pes_packing_mode, u32 *bifs_use_pes,
-                                  M2TSSource *sources, u32 *nb_sources, char **bifs_src_name,
-                                  Bool *real_time, u32 *run_time, char **video_buffer, u32 *video_buffer_size,
-                                  u32 *audio_input_type, char **audio_input_ip, u16 *audio_input_port,
-                                  u32 *output_type, char **ts_out, char **udp_out, char **rtp_out, u16 *output_port,
-                                  char** segment_dir, u32 *segment_duration, char **segment_manifest, u32 *segment_number, char **segment_http_prefix, u32 *split_rap, u32 *nb_pck_pack, u32 *pcr_ms, u32 *ttl, const char **ip_ifce, const char **temi_url, u32 *sdt_refresh_rate, Bool *enable_forced_pcr)
-{
-	Bool rate_found=0, mpeg4_carousel_found=0, time_found=0, src_found=0, dst_found=0, audio_input_found=0, video_input_found=0,
-	     seg_dur_found=0, seg_dir_found=0, seg_manifest_found=0, seg_number_found=0, seg_http_found=0, real_time_found=0, insert_ntp=0;
-	char *arg = NULL, *next_arg = NULL, *error_msg = "no argument found";
-	u32 mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_NONE;
-	Bool force_real_time = 0;
-	s32 i;
-
-	/*first pass: find audio - NO GPAC INIT MODIFICATION MUST OCCUR IN THIS PASS*/
-	for (i=1; i<argc; i++) {
-		arg = argv[i];
-		if (!stricmp(arg, "-h") || strstr(arg, "-help")) {
-			usage();
-			return GF_EOS;
-		}
-		else if (CHECK_PARAM("-pcr-init")) {
-			sscanf(next_arg, LLD, pcr_init_val);
-		}
-		else if (CHECK_PARAM("-pcr-offset")) {
-			*pcr_offset = atoi(next_arg);
-		}
-		else if (CHECK_PARAM("-video")) {
-			FILE *f;
-			if (video_input_found) {
-				error_msg = "multiple '-video' found";
-				arg = NULL;
-				goto error;
-			}
-			video_input_found = 1;
-			f = gf_fopen(next_arg, "rb");
-			if (!f) {
-				error_msg = "video file not found: ";
-				goto error;
-			}
-			gf_fseek(f, 0, SEEK_END);
-			*video_buffer_size = (u32)gf_ftell(f);
-			gf_fseek(f, 0, SEEK_SET);
-			assert(*video_buffer_size);
-			*video_buffer = (char*) gf_malloc(*video_buffer_size);
-			{
-				s32 read = (u32) fread(*video_buffer, sizeof(char), *video_buffer_size, f);
-				if (read != *video_buffer_size)
-					fprintf(stderr, "Error while reading video file, has readen %u chars instead of %u.\n", read, *video_buffer_size);
-			}
-			gf_fclose(f);
-		} else if (CHECK_PARAM("-audio")) {
-			if (audio_input_found) {
-				error_msg = "multiple '-audio' found";
-				arg = NULL;
-				goto error;
-			}
-			audio_input_found = 1;
-			if (!strnicmp(next_arg, "udp://", 6) || !strnicmp(next_arg, "rtp://", 6) || !strnicmp(next_arg, "http://", 7)) {
-				char *sep;
-				/*set audio input type*/
-				if (!strnicmp(next_arg, "udp://", 6))
-					*audio_input_type = GF_MP42TS_UDP;
-				else if (!strnicmp(next_arg, "rtp://", 6))
-					*audio_input_type = GF_MP42TS_RTP;
-#ifndef GPAC_DISABLE_PLAYER
-				else if (!strnicmp(next_arg, "http://", 7))
-					*audio_input_type = GF_MP42TS_HTTP;
-#endif
-				/*http needs to get the complete URL*/
-				switch(*audio_input_type) {
-				case GF_MP42TS_UDP:
-				case GF_MP42TS_RTP:
-					sep = strchr(next_arg+6, ':');
-					*real_time=1;
-					if (sep) {
-						*audio_input_port = atoi(sep+1);
-						sep[0]=0;
-						*audio_input_ip = gf_strdup(next_arg+6);
-						sep[0]=':';
-					} else {
-						*audio_input_ip = gf_strdup(next_arg+6);
-					}
-					break;
-#ifndef GPAC_DISABLE_PLAYER
-				case GF_MP42TS_HTTP:
-					/* No need to dup since it may come from argv */
-					*audio_input_ip = next_arg;
-					assert(audio_input_port != 0);
-					break;
-#endif
-				default:
-					assert(0);
-				}
-			}
-		} else if (CHECK_PARAM("-psi-rate")) {
-			*psi_refresh_rate = atoi(next_arg);
-		} else if (!stricmp(arg, "-bifs-pes")) {
-			*bifs_use_pes = 1;
-		} else if (!stricmp(arg, "-bifs-pes-ex")) {
-			*bifs_use_pes = 2;
-		} else if (!stricmp(arg, "-mpeg4") || !stricmp(arg, "-4on2")) {
-			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
-		} else if (!stricmp(arg, "-4over2")) {
-			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
-		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
-#ifdef GPAC_MEMORY_TRACKING
-			gf_sys_close();
-            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
-			gf_sys_init(mem_track);
-			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
-#else
-			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
-#endif
-		} else if (CHECK_PARAM("-rate")) {
-			if (rate_found) {
-				error_msg = "multiple '-rate' found";
-				arg = NULL;
-				goto error;
-			}
-			rate_found = 1;
-			*mux_rate = 1000*atoi(next_arg);
-		} else if (CHECK_PARAM("-mpeg4-carousel")) {
-			if (mpeg4_carousel_found) {
-				error_msg = "multiple '-mpeg4-carousel' found";
-				arg = NULL;
-				goto error;
-			}
-			mpeg4_carousel_found = 1;
-			*carrousel_rate = atoi(next_arg);
-		} else if (!strnicmp(arg, "-real-time", 10)) {
-			if (real_time_found) {
-				goto error;
-			}
-			real_time_found = 1;
-			*real_time = 1;
-		} else if (CHECK_PARAM("-time")) {
-			if (time_found) {
-				error_msg = "multiple '-time' found";
-				arg = NULL;
-				goto error;
-			}
-			time_found = 1;
-			*run_time = atoi(next_arg);
-		} else if (!stricmp(arg, "-single-au")) {
-			*pes_packing_mode = GF_M2TS_PACK_NONE;
-		} else if (!stricmp(arg, "-multi-au")) {
-			*pes_packing_mode = GF_M2TS_PACK_ALL;
-		} else if (!stricmp(arg, "-rap")) {
-			*split_rap = 1;
-		} else if (!stricmp(arg, "-flush-rap")) {
-			*split_rap = 2;
-		} else if (!stricmp(arg, "-force-pcr-only")) {
-			*enable_forced_pcr = GF_TRUE;
-		} else if (CHECK_PARAM("-nb-pack")) {
-			*nb_pck_pack = atoi(next_arg);
-		} else if (CHECK_PARAM("-nb-pck")) {
-			*nb_pck_pack = atoi(next_arg);
-		} else if (CHECK_PARAM("-pcr-ms")) {
-			*pcr_ms = atoi(next_arg);
-		} else if (CHECK_PARAM("-ttl")) {
-			*ttl = atoi(next_arg);
-		} else if (CHECK_PARAM("-ifce")) {
-			*ip_ifce = next_arg;
-		} else if (CHECK_PARAM("-sdt-rate")) {
-			*sdt_refresh_rate = atoi(next_arg);
-		}
-		else if (CHECK_PARAM("-logs")) {
-			if (gf_log_set_tools_levels(next_arg) != GF_OK)
-				return GF_BAD_PARAM;
-		} else if (CHECK_PARAM("-lf")) {
-			logfile = gf_fopen(next_arg, "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
-		} else if (CHECK_PARAM("-segment-dir")) {
-			if (seg_dir_found) {
-				goto error;
-			}
-			seg_dir_found = 1;
-			*segment_dir = next_arg;
-			/* TODO: add the path separation char, if missing */
-		} else if (CHECK_PARAM("-segment-duration")) {
-			if (seg_dur_found) {
-				goto error;
-			}
-			seg_dur_found = 1;
-			*segment_duration = atoi(next_arg);
-		} else if (CHECK_PARAM("-segment-manifest")) {
-			if (seg_manifest_found) {
-				goto error;
-			}
-			seg_manifest_found = 1;
-			*segment_manifest = next_arg;
-		} else if (CHECK_PARAM("-segment-http-prefix")) {
-			if (seg_http_found) {
-				goto error;
-			}
-			seg_http_found = 1;
-			*segment_http_prefix = next_arg;
-		} else if (CHECK_PARAM("-segment-number")) {
-			if (seg_number_found) {
-				goto error;
-			}
-			seg_number_found = 1;
-			*segment_number = atoi(next_arg);
-		}
-		else if (CHECK_PARAM("-bifs-src")) {
-			if (src_found) {
-				error_msg = "multiple '-bifs-src' found";
-				arg = NULL;
-				goto error;
-			}
-			src_found = 1;
-			*bifs_src_name = next_arg;
-		} else if (CHECK_PARAM("-dst-file")) {
-			dst_found = 1;
-			*ts_out = gf_strdup(next_arg);
-		} else if (CHECK_PARAM("-temi")) {
-			if (next_arg[0]=='-') {
-				*temi_url = NULL;
-				i--;
-				temi_id_1 = 150;
-			} else {
-				u32 temi_id = 0;
-				if (sscanf(next_arg, "%d", &temi_id) == 1) {
-					if (temi_id < 0x80 || temi_id>0xFF) {
-						fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
-						return GF_BAD_PARAM;
-					}
-				}
-				if (!temi_id) {
-					*temi_url = next_arg;
-					if (strlen(next_arg) > 150) {
-						fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
-						return GF_NOT_SUPPORTED;
-					}
-					temi_id_1 = 0;
-				} else {
-					temi_id_1 = temi_id;
-					*temi_url = NULL;
-				}
-			}
-		} else if (CHECK_PARAM("-temi2")) {
-			u32 temi_id = 0;
-			if (next_arg[0]=='-') {
-				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
-				return GF_BAD_PARAM;
-			}
-			if (sscanf(next_arg, "%d", &temi_id) == 1) {
-				if (temi_id < 0x80 || temi_id>0xFF) {
-					fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
-					return GF_BAD_PARAM;
-				}
-				temi_id_2 = temi_id;
-			} else {
-				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
-				return GF_BAD_PARAM;
-			}
-		} else if (CHECK_PARAM("-temi-delay")) {
-			temi_url_insertion_delay = atoi(next_arg);
-		} else if (CHECK_PARAM("-temi-offset")) {
-			temi_offset = atoi(next_arg);
-		} else if (!stricmp(arg, "-temi-noloop")) {
-			temi_disable_loop = 1;
-		} else if (!stricmp(arg, "-temi-off")) {
-			temi_on = GF_FALSE;
-		} else if (CHECK_PARAM("-temi-period")) {
-			temi_period = atof(next_arg);
-			if (temi_period<0) {
-				temi_period *= -1;
-				temi_single_toggle = GF_TRUE;
-			}
-		} else if (!stricmp(arg, "-insert-ntp")) {
-			insert_ntp = GF_TRUE;
-		}
-		else if (CHECK_PARAM("-dst-udp")) {
-			char *sep = strchr(next_arg, ':');
-			dst_found = 1;
-			*real_time=1;
-			if (sep) {
-				*output_port = atoi(sep+1);
-				sep[0]=0;
-				*udp_out = gf_strdup(next_arg);
-				sep[0]=':';
-			} else {
-				*udp_out = gf_strdup(next_arg);
-			}
-		}
-		else if (CHECK_PARAM("-dst-rtp")) {
-			char *sep = strchr(next_arg, ':');
-			dst_found = 1;
-			*real_time=1;
-			if (sep) {
-				*output_port = atoi(sep+1);
-				sep[0]=0;
-				*rtp_out = gf_strdup(next_arg);
-				sep[0]=':';
-			} else {
-				*rtp_out = gf_strdup(next_arg);
-			}
-		} else if (CHECK_PARAM("-src")) { //second pass arguments
-		} else if (CHECK_PARAM("-prog")) { //second pass arguments
-		}
-		else {
-			error_msg = "unknown option";
-			goto error;
-		}
-	}
-	if (*real_time) force_real_time = 1;
-	rate_found = 1;
-
-	/*second pass: open sources*/
-	for (i=1; i<argc; i++) {
-		u32 res;
-		char *src_args;
-		arg = argv[i];
-		if (arg[0] !='-') continue;
-
-		if (! CHECK_PARAM("-src") && ! CHECK_PARAM("-prog") ) continue;
-
-		src_args = strchr(next_arg, ':');
-		if (src_args && (src_args[1]=='\\')) {
-			src_args = strchr(src_args+2, ':');
-		}
-		if (src_args) {
-			src_args[0] = 0;
-			src_args = src_args + 1;
-		}
-
-		res = open_source(&sources[*nb_sources], next_arg, *carrousel_rate, mpeg4_signaling, *bifs_src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url, (*pcr_offset == (u32) -1) ? 1 : 0, insert_ntp);
-
-
-		//we may have arguments
-		while (src_args) {
-			char *sep = strchr(src_args, ':');
-			if (sep) sep[0] = 0;
-
-			if (!strnicmp(src_args, "name=", 5)) {
-				strncpy(sources[*nb_sources].program_name, src_args+5, 20);
-			} else if (!strnicmp(src_args, "provider=", 9)) {
-				strncpy(sources[*nb_sources].provider_name, src_args+9, 20);
-			} else if (!strnicmp(src_args, "ID=", 3)) {
-				u32 k;
-				sources[*nb_sources].ID = atoi(src_args+3);
-
-				for (k=0; k<*nb_sources; k++) {
-					if (sources[k].ID == sources[*nb_sources].ID) {
-						sources[*nb_sources].is_not_program_declaration = 1;
-						if (sources[k].max_sample_size < sources[*nb_sources].max_sample_size)
-							sources[k].max_sample_size = sources[*nb_sources].max_sample_size;
-
-						break;
-					}
-				}
-			} else if (!strnicmp(src_args, "disc", 4)) {
-				sources[*nb_sources].set_disc = GF_TRUE;
-			} else if (!strnicmp(src_args, "PMT=", 4)) {
-				sources[*nb_sources].pmt_version = atoi(src_args+4);
-			}
-
-			if (sep) {
-				sep[0] = ':';
-				src_args = sep+1;
-			} else
-				break;
-		}
-
-		if (res) {
-			(*nb_sources)++;
-			if (res==2) *real_time=1;
-		}
-	}
-	/*syntax is correct; now testing the presence of mandatory arguments*/
-	if (dst_found && *nb_sources && rate_found) {
-		return GF_OK;
-	} else {
-		if (!dst_found)
-			fprintf(stderr, "Error: Destination argument not found\n");
-		if (! *nb_sources)
-			fprintf(stderr, "Error: No Programs are available\n");
-		usage();
-		return GF_BAD_PARAM;
-	}
-
-error:
-	if (!arg) {
-		fprintf(stderr, "Error: %s\n", error_msg);
-	} else {
-		fprintf(stderr, "Error: %s \"%s\"\n", error_msg, arg);
-	}
-	return GF_BAD_PARAM;
-}
-
-static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix, u32 first_segment, u32 last_segment, Bool end)
-{
-	FILE *manifest_fp;
-	u32 i;
-	char manifest_tmp_name[GF_MAX_PATH];
-	char manifest_name[GF_MAX_PATH];
-	char *tmp_manifest = manifest_tmp_name;
-
-	if (segment_dir) {
-		sprintf(manifest_tmp_name, "%stmp.m3u8", segment_dir);
-		sprintf(manifest_name, "%s%s", segment_dir, manifest);
-	} else {
-		sprintf(manifest_tmp_name, "tmp.m3u8");
-		sprintf(manifest_name, "%s", manifest);
-	}
-
-	manifest_fp = gf_fopen(tmp_manifest, "w");
-	if (!manifest_fp) {
-		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
-		return GF_BAD_PARAM;
-	}
-
-	fprintf(manifest_fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
-
-	for (i = first_segment; i <= last_segment; i++) {
-		fprintf(manifest_fp, "#EXTINF:%u,\n%s%s_%u.ts\n", segment_duration, http_prefix, segment_prefix, i);
-	}
-
-	if (end) {
-		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
-	}
-	gf_fclose(manifest_fp);
-
-	if (!rename(tmp_manifest, manifest_name)) {
-		return GF_OK;
-	} else {
-		if (remove(manifest_name)) {
-			fprintf(stderr, "Error removing file %s\n", manifest_name);
-			return GF_IO_ERR;
-		} else if (rename(tmp_manifest, manifest_name)) {
-			fprintf(stderr, "Could not rename temporary m3u8 manifest file (%s) into %s\n", tmp_manifest, manifest_name);
-			return GF_IO_ERR;
-		} else {
-			return GF_OK;
-		}
-	}
-}
-
-int main(int argc, char **argv)
-{
-	/********************/
-	/*   declarations   */
-	/********************/
-	const char *ts_pck;
-	char *ts_pack_buffer = NULL;
-	GF_Err e;
-	u32 run_time;
-	Bool real_time, is_stdout;
-	s64 pcr_init_val = -1;
-	u32 usec_till_next, ttl, split_rap, sdt_refresh_rate;
-	GF_M2TS_PackMode pes_packing_mode;
-	u32 i, j, mux_rate, nb_sources, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack, pcr_ms;
-	char *ts_out = NULL, *udp_out = NULL, *rtp_out = NULL, *audio_input_ip = NULL;
-	FILE *ts_output_file = NULL;
-	GF_Socket *ts_output_udp_sk = NULL, *audio_input_udp_sk = NULL;
-#ifndef GPAC_DISABLE_STREAMING
-	GF_RTPChannel *ts_output_rtp = NULL;
-	GF_RTSPTransport tr;
-	GF_RTPHeader hdr;
-#endif
-	char *video_buffer;
-	u32 video_buffer_size;
-	u16 output_port = 0, audio_input_port = 0;
-	u32 output_type, audio_input_type, pcr_offset;
-	char *audio_input_buffer = NULL;
-	u32 audio_input_buffer_length=65536;
-	char *bifs_src_name;
-	const char *insert_temi = 0;
-	M2TSSource sources[MAX_MUX_SRC_PROG];
-	u32 segment_duration, segment_index, segment_number;
-	char segment_manifest_default[GF_MAX_PATH];
-	char *segment_manifest, *segment_http_prefix, *segment_dir;
-	char segment_prefix[GF_MAX_PATH];
-	char segment_name[GF_MAX_PATH];
-	const char *ip_ifce = NULL;
-	GF_M2TS_Time prev_seg_time;
-	GF_M2TS_Mux *muxer;
-	Bool enable_forced_pcr = GF_FALSE;
-	/*****************/
-	/*   gpac init   */
-	/*****************/
-	gf_sys_init(GF_MemTrackerNone);
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-
-	/***********************/
-	/*   initialisations   */
-	/***********************/
-	real_time = 0;
-	is_stdout = 0;
-	ts_output_file = NULL;
-	video_buffer = NULL;
-	last_video_time = 0;
-	audio_input_type = 0;
-	sdt_refresh_rate = 0;
-	ts_output_udp_sk = NULL;
-	udp_out = NULL;
-#ifndef GPAC_DISABLE_STREAMING
-	ts_output_rtp = NULL;
-	rtp_out = NULL;
-#endif
-	ts_out = NULL;
-	bifs_src_name = NULL;
-	nb_sources = 0;
-	mux_rate = 0;
-	run_time = 0;
-	carrousel_rate = 500;
-	output_port = 1234;
-	segment_duration = 0;
-	segment_number = 10; /* by default, we keep the 10 previous segments */
-	segment_index = 0;
-	segment_manifest = NULL;
-	segment_http_prefix = NULL;
-	segment_dir = NULL;
-	prev_seg_time.sec = 0;
-	prev_seg_time.nanosec = 0;
-	video_buffer_size = 0;
-	nb_pck_pack = 1;
-	pcr_ms = 100;
-#ifndef GPAC_DISABLE_PLAYER
-	aac_reader = AAC_Reader_new();
-#endif
-	muxer = NULL;
-	pes_packing_mode = GF_M2TS_PACK_AUDIO_ONLY;
-	bifs_use_pes = 0;
-	split_rap = 0;
-	ttl = 1;
-	psi_refresh_rate = GF_M2TS_PSI_DEFAULT_REFRESH_RATE;
-	pcr_offset = (u32) -1;
-
-	/***********************/
-	/*   parse arguments   */
-	/***********************/
-	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &pes_packing_mode, &bifs_use_pes, sources, &nb_sources, &bifs_src_name,
-	                        &real_time, &run_time, &video_buffer, &video_buffer_size,
-	                        &audio_input_type, &audio_input_ip, &audio_input_port,
-	                        &output_type, &ts_out, &udp_out, &rtp_out, &output_port,
-	                        &segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &pcr_ms, &ttl, &ip_ifce, &insert_temi, &sdt_refresh_rate, &enable_forced_pcr)) {
-		goto exit;
-	}
-
-	if (run_time && !mux_rate) {
-		fprintf(stderr, "Cannot specify TS run time for VBR multiplex - disabling run time\n");
-		run_time = 0;
-	}
-
-	/***************************/
-	/*   create mp42ts muxer   */
-	/***************************/
-	muxer = gf_m2ts_mux_new(mux_rate, psi_refresh_rate, real_time);
-	if (!muxer) {
-		fprintf(stderr, "Could not create the muxer. Aborting.\n");
-		goto exit;
-	}
-	gf_m2ts_mux_use_single_au_pes_mode(muxer, pes_packing_mode);
-	if (pcr_init_val>=0) gf_m2ts_mux_set_initial_pcr(muxer, (u64) pcr_init_val);
-	gf_m2ts_mux_set_pcr_max_interval(muxer, pcr_ms);
-	gf_m2ts_mux_enable_pcr_only_packets(muxer, enable_forced_pcr);
-
-
-	if (ts_out != NULL) {
-		if (segment_duration) {
-			strcpy(segment_prefix, ts_out);
-			if (segment_dir) {
-				if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-					sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-				} else {
-					sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
-				}
-			} else {
-				sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-			}
-			ts_out = gf_strdup(segment_name);
-			if (!segment_manifest) {
-				sprintf(segment_manifest_default, "%s.m3u8", segment_prefix);
-				segment_manifest = segment_manifest_default;
-			}
-			//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
-		}
-		if (!strcmp(ts_out, "stdout") || !strcmp(ts_out, "-") ) {
-			ts_output_file = stdout;
-			is_stdout = GF_TRUE;
-		} else {
-			ts_output_file = gf_fopen(ts_out, "wb");
-			is_stdout = GF_FALSE;
-		}
-		if (!ts_output_file) {
-			fprintf(stderr, "Error opening %s\n", ts_out);
-			goto exit;
-		}
-	}
-	if (udp_out != NULL) {
-		ts_output_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
-		if (gf_sk_is_multicast_address((char *)udp_out)) {
-			e = gf_sk_setup_multicast(ts_output_udp_sk, (char *)udp_out, output_port, ttl, 0, (char *) ip_ifce);
-		} else {
-			e = gf_sk_bind(ts_output_udp_sk, ip_ifce, output_port, (char *)udp_out, output_port, GF_SOCK_REUSE_PORT);
-		}
-		if (e) {
-			fprintf(stderr, "Error initializing UDP socket: %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-	}
-#ifndef GPAC_DISABLE_STREAMING
-	if (rtp_out != NULL) {
-		ts_output_rtp = gf_rtp_new();
-		gf_rtp_set_ports(ts_output_rtp, output_port);
-		memset(&tr, 0, sizeof(GF_RTSPTransport));
-		tr.IsUnicast = gf_sk_is_multicast_address((char *)rtp_out) ? 0 : 1;
-		tr.Profile="RTP/AVP";
-		tr.destination = (char *)rtp_out;
-		tr.source = "0.0.0.0";
-		tr.IsRecord = 0;
-		tr.Append = 0;
-		tr.SSRC = rand();
-		tr.port_first = output_port;
-		tr.port_last = output_port+1;
-		if (tr.IsUnicast) {
-			tr.client_port_first = output_port;
-			tr.client_port_last = output_port+1;
-		} else {
-			tr.source = (char *)rtp_out;
-			tr.TTL = ttl;
-		}
-		e = gf_rtp_setup_transport(ts_output_rtp, &tr, (char *)ts_out);
-		if (e != GF_OK) {
-			fprintf(stderr, "Cannot setup RTP transport info : %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-		e = gf_rtp_initialize(ts_output_rtp, 0, 1, 1500, 0, 0, (char *) ip_ifce);
-		if (e != GF_OK) {
-			fprintf(stderr, "Cannot initialize RTP sockets : %s\n", gf_error_to_string(e));
-			goto exit;
-		}
-		memset(&hdr, 0, sizeof(GF_RTPHeader));
-		hdr.Version = 2;
-		hdr.PayloadType = 33;	/*MP2T*/
-		hdr.SSRC = tr.SSRC;
-		hdr.Marker = 0;
-	}
-#endif /*GPAC_DISABLE_STREAMING*/
-
-	/************************************/
-	/*   create streaming audio input   */
-	/************************************/
-	if (audio_input_ip)
-		switch(audio_input_type) {
-		case GF_MP42TS_UDP:
-			audio_input_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
-			if (gf_sk_is_multicast_address((char *)audio_input_ip)) {
-				e = gf_sk_setup_multicast(audio_input_udp_sk, (char *)audio_input_ip, audio_input_port, 32, 0, NULL);
-			} else {
-				e = gf_sk_bind(audio_input_udp_sk, NULL, audio_input_port, (char *)audio_input_ip, audio_input_port, GF_SOCK_REUSE_PORT);
-			}
-			if (e) {
-				fprintf(stderr, "Error initializing UDP socket for %s:%d : %s\n", audio_input_ip, audio_input_port, gf_error_to_string(e));
-				goto exit;
-			}
-			gf_sk_set_buffer_size(audio_input_udp_sk, 0, GF_M2TS_UDP_BUFFER_SIZE);
-			gf_sk_set_block_mode(audio_input_udp_sk, 0);
-
-			/*allocate data buffer*/
-			audio_input_buffer = (char*)gf_malloc(audio_input_buffer_length);
-			assert(audio_input_buffer);
-			break;
-		case GF_MP42TS_RTP:
-			/*TODO: not implemented*/
-			assert(0);
-			break;
-#ifndef GPAC_DISABLE_PLAYER
-		case GF_MP42TS_HTTP:
-			audio_prog = (void*)&sources[nb_sources-1];
-			aac_download_file(aac_reader, audio_input_ip);
-			break;
-#endif
-		case GF_MP42TS_FILE:
-			assert(0); /*audio live input is restricted to realtime/streaming*/
-			break;
-		default:
-			assert(0);
-		}
-
-	if (!nb_sources) {
-		fprintf(stderr, "No program to mux, quitting.\n");
-	}
-
-	for (i=0; i<nb_sources; i++) {
-		if (!sources[i].ID) {
-			for (j=i+1; j<nb_sources; j++) {
-				if (sources[i].ID < sources[j].ID) sources[i].ID = sources[i].ID+1;
-			}
-			if (!sources[i].ID) sources[i].ID = 1;
-		}
-	}
-
-	/****************************************/
-	/*   declare all streams to the muxer   */
-	/****************************************/
-	cur_pid = 100;	/*PIDs start from 100*/
-	for (i=0; i<nb_sources; i++) {
-		GF_M2TS_Mux_Program *program;
-
-		if (! sources[i].is_not_program_declaration) {
-			u32 prog_pcr_offset = 0;
-			if (pcr_offset==(u32)-1) {
-				if (sources[i].max_sample_size && mux_rate) {
-					Double r = sources[i].max_sample_size * 8;
-					r *= 90000;
-					r/= mux_rate;
-					//add 10% of safety to cover TS signaling and other potential table update while sending the largest PES
-					r *= 1.1;
-					prog_pcr_offset = (u32) r;
-				}
-			} else {
-				prog_pcr_offset = pcr_offset;
-			}
-			fprintf(stderr, "Setting up program ID %d - send rates: PSI %d ms PCR %d ms - PCR offset %d\n", sources[i].ID, psi_refresh_rate, pcr_ms, prog_pcr_offset);
-
-			program = gf_m2ts_mux_program_add(muxer, sources[i].ID, cur_pid, psi_refresh_rate, prog_pcr_offset, sources[i].mpeg4_signaling, sources[i].pmt_version, sources[i].set_disc);
-			if (sources[i].mpeg4_signaling) program->iod = sources[i].iod;
-			if (sources[i].od_updates) {
-				program->loop_descriptors = sources[i].od_updates;
-				sources[i].od_updates = NULL;
-			}
-		} else {
-			program = gf_m2ts_mux_program_find(muxer, sources[i].ID);
-		}
-		if (!program) continue;
-
-		for (j=0; j<sources[i].nb_streams; j++) {
-			GF_M2TS_Mux_Stream *stream;
-			Bool force_pes_mode = 0;
-			/*likely an OD stream disabled*/
-			if (!sources[i].streams[j].stream_type) continue;
-
-			if (sources[i].streams[j].stream_type==GF_STREAM_SCENE) force_pes_mode = bifs_use_pes ? 1 : 0;
-
-			stream = gf_m2ts_program_stream_add(program, &sources[i].streams[j], cur_pid+j+1, (sources[i].pcr_idx==j) ? 1 : 0, force_pes_mode);
-			if (split_rap && (sources[i].streams[j].stream_type==GF_STREAM_VISUAL)) stream->start_pes_at_rap = 1;
-		}
-
-		cur_pid += sources[i].nb_streams;
-		while (cur_pid % 10)
-			cur_pid ++;
-
-		if (sources[i].program_name[0] || sources[i].provider_name[0] ) gf_m2ts_mux_program_set_name(program, sources[i].program_name, sources[i].provider_name);
-	}
-	muxer->flush_pes_at_rap = (split_rap == 2) ? GF_TRUE : GF_FALSE;
-
-	if (sdt_refresh_rate) {
-		gf_m2ts_mux_enable_sdt(muxer, sdt_refresh_rate);
-	}
-	gf_m2ts_mux_update_config(muxer, 1);
-
-	if (nb_pck_pack>1) {
-		ts_pack_buffer = gf_malloc(sizeof(char) * 188 * nb_pck_pack);
-	}
-
-	/*****************/
-	/*   main loop   */
-	/*****************/
-	last_print_time = gf_sys_clock();
-	while (run) {
-		u32 status;
-
-		/*check for some audio input from the network*/
-		if (audio_input_ip) {
-			u32 read;
-			switch (audio_input_type) {
-			case GF_MP42TS_UDP:
-			case GF_MP42TS_RTP:
-				/*e =*/
-				gf_sk_receive(audio_input_udp_sk, audio_input_buffer, audio_input_buffer_length, 0, &read);
-				if (read) {
-					SampleCallBack((void*)&sources[nb_sources-1], AUDIO_DATA_ESID, audio_input_buffer, read, gf_m2ts_get_sys_clock(muxer));
-				}
-				break;
-#ifndef GPAC_DISABLE_PLAYER
-			case GF_MP42TS_HTTP:
-				/*nothing to do: AAC_OnLiveData is called automatically*/
-				/*check we're still alive*/
-				if (gf_dm_is_thread_dead(aac_reader->dnload)) {
-					GF_ESD *esd;
-					aac_download_file(aac_reader, audio_input_ip);
-					esd = AAC_GetESD(aac_reader);
-					if (!esd)
-						break;
-					assert(esd->slConfig->timestampResolution); /*if we don't have this value we won't be able to adjust the timestamps within the MPEG2-TS*/
-					if (esd->slConfig->timestampResolution)
-						audio_discontinuity_offset = gf_m2ts_get_sys_clock(muxer) * (u64)esd->slConfig->timestampResolution / 1000;
-					gf_odf_desc_del((GF_Descriptor *)esd);
-				}
-				break;
-#endif
-			default:
-				assert(0);
-			}
-		}
-
-		/*flush all packets*/
-		nb_pck_in_pack=0;
-		while ((ts_pck = gf_m2ts_mux_process(muxer, &status, &usec_till_next)) != NULL) {
-
-			if (ts_pack_buffer) {
-				memcpy(ts_pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
-				nb_pck_in_pack++;
-
-				if (nb_pck_in_pack < nb_pck_pack)
-					continue;
-
-				ts_pck = (const char *) ts_pack_buffer;
-			} else {
-				nb_pck_in_pack = 1;
-			}
-
-call_flush:
-			if (ts_output_file != NULL) {
-				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file);
-				if (segment_duration && (muxer->time.sec > prev_seg_time.sec + segment_duration)) {
-					prev_seg_time = muxer->time;
-					gf_fclose(ts_output_file);
-					segment_index++;
-					if (segment_dir) {
-						if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-							sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-						} else {
-							sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
-						}
-					} else {
-						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-					}
-					ts_output_file = gf_fopen(segment_name, "wb");
-					if (!ts_output_file) {
-						fprintf(stderr, "Error opening %s\n", segment_name);
-						goto exit;
-					}
-					/* delete the oldest segment */
-					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)) {
-						char old_segment_name[GF_MAX_PATH];
-						if (segment_dir) {
-							if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-								sprintf(old_segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							} else {
-								sprintf(old_segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							}
-						} else {
-							sprintf(old_segment_name, "%s_%d.ts", segment_prefix, segment_index - segment_number - 1);
-						}
-						gf_delete_file(old_segment_name);
-					}
-					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix,
-//								   (segment_index >= segment_number/2 ? segment_index - segment_number/2 : 0), segment_index >1 ? segment_index-1 : 0, 0);
-					               ( (segment_index > segment_number ) ? segment_index - segment_number : 0), segment_index >1 ? segment_index-1 : 0, 0);
-				}
-			}
-
-			if (ts_output_udp_sk != NULL) {
-				e = gf_sk_send(ts_output_udp_sk, (char*)ts_pck, 188 * nb_pck_in_pack);
-				if (e) {
-					fprintf(stderr, "Error %s sending UDP packet\n", gf_error_to_string(e));
-				}
-			}
-#ifndef GPAC_DISABLE_STREAMING
-			if (ts_output_rtp != NULL) {
-				u32 ts;
-				hdr.SequenceNumber++;
-				/*muxer clock at 90k*/
-				ts = muxer->time.sec*90000 + muxer->time.nanosec*9/100000;
-				/*FIXME - better discontinuity check*/
-				hdr.Marker = (ts < hdr.TimeStamp) ? 1 : 0;
-				hdr.TimeStamp = ts;
-				e = gf_rtp_send_packet(ts_output_rtp, &hdr, (char*)ts_pck, 188 * nb_pck_in_pack, 0);
-				if (e) {
-					fprintf(stderr, "Error %s sending RTP packet\n", gf_error_to_string(e));
-				}
-			}
-#endif
-
-			nb_pck_in_pack = 0;
-
-			if (status>=GF_M2TS_STATE_PADDING) {
-				break;
-			}
-		}
-		if (nb_pck_in_pack) {
-			ts_pck = (const char *) ts_pack_buffer;
-			goto call_flush;
-		}
-
-		/*push video*/
-		{
-			u32 now=gf_sys_clock();
-			if (now/MP42TS_VIDEO_FREQ != last_video_time/MP42TS_VIDEO_FREQ) {
-				/*should use carrousel behaviour instead of being pushed manually*/
-				if (video_buffer)
-					SampleCallBack((void*)&sources[nb_sources-1], VIDEO_DATA_ESID, video_buffer, video_buffer_size, gf_m2ts_get_sys_clock(muxer)+1000/*try buffering due to VLC msg*/);
-				last_video_time = now;
-			}
-		}
-
-		if (real_time) {
-			/*refresh every MP42TS_PRINT_TIME_MS ms*/
-			u32 now=gf_sys_clock();
-			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
-				last_print_time = now;
-				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - bitrate % 8d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
-
-				if (gf_prompt_has_input()) {
-					char c = gf_prompt_get_char();
-					if (c=='q') break;
-					else if (c=='t') request_temi_toggle = GF_TRUE;
-				}
-			}
-			if (status == GF_M2TS_STATE_IDLE) {
-#if 0
-				/*wait till next packet is ready to be sent*/
-				if (usec_till_next>1000) {
-					//fprintf(stderr, "%d usec till next packet\n", usec_till_next);
-					gf_sleep(usec_till_next / 1000);
-				}
-#else
-				//we don't have enough precision on usec counting and we end up eating one core on most machines, so let's just sleep
-				//one second whenever we are idle - it's maybe too much but the muxer will catchup afterwards
-				gf_sleep(1);
-#endif
-			}
-		}
-
-
-		if (run_time) {
-			if (gf_m2ts_get_ts_clock(muxer) > run_time) {
-				fprintf(stderr, "Stopping multiplex at %d ms (requested runtime %d ms)\n", gf_m2ts_get_ts_clock(muxer), run_time);
-				break;
-			}
-		}
-		if (status==GF_M2TS_STATE_EOS) {
-			break;
-		}
-	}
-
-	{
-		u64 bits = muxer->tot_pck_sent*8*188;
-		u64 dur_ms = gf_m2ts_get_ts_clock(muxer);
-		if (!dur_ms) dur_ms = 1;
-		fprintf(stderr, "Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\n", ((Double) dur_ms)/1000.0,mux_rate ? "" : "average ", (u32) (bits/dur_ms), muxer->tot_pck_sent);
-		fprintf(stderr, " Padding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, (Double) (muxer->tot_pad_sent*188*8.0/dur_ms) , muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_ms) );
-	}
-
-exit:
-	if (ts_pack_buffer) gf_free(ts_pack_buffer);
-	run = 0;
-	if (segment_duration) {
-		write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index - segment_number, segment_index, 1);
-	}
-	if (ts_output_file && !is_stdout) gf_fclose(ts_output_file);
-	if (ts_output_udp_sk) gf_sk_del(ts_output_udp_sk);
-#ifndef GPAC_DISABLE_STREAMING
-	if (ts_output_rtp) gf_rtp_del(ts_output_rtp);
-#endif
-	if (ts_out) gf_free(ts_out);
-	if (audio_input_udp_sk) gf_sk_del(audio_input_udp_sk);
-	if (audio_input_buffer) gf_free (audio_input_buffer);
-	if (video_buffer) gf_free(video_buffer);
-	if (udp_out) gf_free(udp_out);
-#ifndef GPAC_DISABLE_STREAMING
-	if (rtp_out) gf_free(rtp_out);
-#endif
-	if (muxer) gf_m2ts_mux_del(muxer);
-
-	for (i=0; i<nb_sources; i++) {
-		for (j=0; j<sources[i].nb_streams; j++) {
-			if (sources[i].streams[j].input_ctrl) sources[i].streams[j].input_ctrl(&sources[i].streams[j], GF_ESI_INPUT_DESTROY, NULL);
-			if (sources[i].streams[j].input_udta) {
-				gf_free(sources[i].streams[j].input_udta);
-			}
-			if (sources[i].streams[j].decoder_config) {
-				gf_free(sources[i].streams[j].decoder_config);
-			}
-			if (sources[i].streams[j].sl_config) {
-				gf_free(sources[i].streams[j].sl_config);
-			}
-		}
-		if (sources[i].iod) gf_odf_desc_del((GF_Descriptor*)sources[i].iod);
-#ifndef GPAC_DISABLE_ISOM
-		if (sources[i].mp4) gf_isom_close(sources[i].mp4);
-#endif
-
-#ifndef GPAC_DISABLE_SENG
-		if (sources[i].seng) {
-			gf_seng_terminate(sources[i].seng);
-			sources[i].seng = NULL;
-		}
-#endif
-		if (sources[i].th) gf_th_del(sources[i].th);
-	}
-
-#ifndef GPAC_DISABLE_PLAYER
-	if (aac_reader) AAC_Reader_del(aac_reader);
-#endif
-
-	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();
-		return 2;
-	}
-#endif
-	return 0;
-}
-

gpac-0.8.0.tar.gz/applications/mp4client/extract.c Deleted

@@ -1,984 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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/terminal.h>
-#include <gpac/options.h>
-#include <gpac/media_tools.h>
-
-#ifdef WIN32
-#include <windows.h>
-#else
-typedef struct tagBITMAPFILEHEADER
-{
-	u16	bfType;
-	u32	bfSize;
-	u16	bfReserved1;
-	u16	bfReserved2;
-	u32 bfOffBits;
-} BITMAPFILEHEADER;
-
-typedef struct tagBITMAPINFOHEADER {
-	u32	biSize;
-	s32	biWidth;
-	s32	biHeight;
-	u16	biPlanes;
-	u16	biBitCount;
-	u32	biCompression;
-	u32	biSizeImage;
-	s32	biXPelsPerMeter;
-	s32	biYPelsPerMeter;
-	u32	biClrUsed;
-	u32	biClrImportant;
-} BITMAPINFOHEADER;
-
-#define BI_RGB        0L
-
-#endif
-
-
-#include <gpac/internal/avilib.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-
-
-enum
-{
-	DUMP_NONE = 0,
-	DUMP_AVI = 1,
-	DUMP_BMP = 2,
-	DUMP_PNG = 3,
-	DUMP_RAW = 4,
-	DUMP_SHA1 = 5,
-
-	//DuMP flags
-	DUMP_DEPTH_ONLY = 1<<16,
-	DUMP_RGB_DEPTH = 1<<17,
-	DUMP_RGB_DEPTH_SHAPE = 1<<18
-};
-
-
-extern Bool is_connected;
-extern GF_Terminal *term;
-extern u64 Duration;
-extern GF_Err last_error;
-extern Bool no_prog;
-
-
-static GFINLINE u8 colmask(s32 a, s32 n)
-{
-	s32 mask = (1 << n) - 1;
-	return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
-}
-
-static u32 put_pixel(FILE *fout, u32 type, u32 pf, char *ptr)
-{
-	u16 col;
-	switch (pf) {
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_ARGB:
-		fputc(ptr[0], fout);
-		fputc(ptr[1], fout);
-		fputc(ptr[2], fout);
-		return 4;
-
-	case GF_PIXEL_BGR_32:
-	case GF_PIXEL_RGBA:
-		fputc(ptr[2], fout);
-		fputc(ptr[1], fout);
-		fputc(ptr[0], fout);
-		return 4;
-
-	case GF_PIXEL_RGB_24:
-		fputc(ptr[2], fout);
-		fputc(ptr[1], fout);
-		fputc(ptr[0], fout);
-		return 3;
-
-	case GF_PIXEL_BGR_24:
-		fputc(ptr[2], fout);
-		fputc(ptr[1], fout);
-		fputc(ptr[0], fout);
-		return 3;
-	case GF_PIXEL_RGB_565:
-		col = * (u16 *)ptr;
-		fputc(colmask(col << 3, 3), fout);
-		fputc(colmask(col >> (5 - 2), 2), fout);
-		fputc(colmask(col >> (11 - 3), 3), fout);
-		return 2;
-
-	case GF_PIXEL_RGB_555:
-		col = * (u16 *)ptr;
-		fputc(colmask(col << 3, 3), fout);
-		fputc(colmask(col >> (5 - 3), 3), fout);
-		fputc(colmask(col >> (10 - 3), 3), fout);
-		return 2;
-	/* this is used to write the byte depthbuffer in greyscale when dumping depth*/
-	case GF_PIXEL_GREYSCALE:
-		/* bmp always needs 3 pixels */
-		fputc(ptr[0], fout);
-		fputc(ptr[0], fout);
-		fputc(ptr[0], fout);
-		/* if printing the characters corresponding to the float depth buffer: */
-		/*
-		{
-		u32 i=0;
-		while (ptr[i]!='\0') {
-			fputc(ptr[i], fout);
-			i++;
-		}
-		fputc('\b', fout);
-		}
-		*/
-		return 1;
-
-
-	case 0:
-		fputc(ptr[0], fout);
-		return 1;
-	}
-	return 0;
-}
-
-void write_bmp(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	char str[GF_MAX_PATH];
-	BITMAPFILEHEADER fh;
-	BITMAPINFOHEADER fi;
-	FILE *fout;
-	u32 j, i;
-	char *ptr;
-
-	if (fb->pixel_format==GF_PIXEL_GREYSCALE) sprintf(str, "%s_%d_depth.bmp", rad_name, img_num);
-	else sprintf(str, "%s_%d.bmp", rad_name, img_num);
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-
-	memset(&fh, 0, sizeof(fh));
-	fh.bfType = 19778;
-	fh.bfOffBits = 14 + 40;
-
-	memset(&fi, 0, sizeof(char)*40);
-	fi.biSize = sizeof(char)*40;
-	fi.biWidth = fb->width;
-	fi.biHeight = fb->height;
-	fi.biPlanes = 1;
-	if (fb->pixel_format==GF_PIXEL_GREYSCALE) fi.biBitCount = 24;
-	else fi.biBitCount = 24;
-	fi.biCompression = BI_RGB;
-	fi.biSizeImage = fb->width * fb->height * 3;
-
-	/*NOT ALIGNED!!*/
-	gf_fwrite(&fh.bfType, 2, 1, fout);
-	gf_fwrite(&fh.bfSize, 4, 1, fout);
-	gf_fwrite(&fh.bfReserved1, 2, 1, fout);
-	gf_fwrite(&fh.bfReserved2, 2, 1, fout);
-	gf_fwrite(&fh.bfOffBits, 4, 1, fout);
-
-	gf_fwrite(&fi, 1, 40, fout);
-	for (j=fb->height; j>0; j--) {
-		ptr = fb->video_buffer + (j-1)*fb->pitch_y;
-		for (i=0; i<fb->width; i++) {
-			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
-			assert(res);
-			ptr += res;
-		}
-	}
-	gf_fclose(fout);
-}
-
-#include <gpac/avparse.h>
-
-void write_png(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	char str[GF_MAX_PATH];
-	FILE *fout;
-	u32 dst_size;
-	char *dst;
-	char *prev = strrchr(rad_name, '.');
-	if (prev) prev[0] = '\0';
-	sprintf(str, "%s_%d.png", rad_name, img_num);
-	if (prev) prev[0] = '.';
-
-	switch (fb->pixel_format) {
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGBA:
-		dst_size = fb->width*fb->height*4;
-		break;
-	default:
-		dst_size = fb->width*fb->height*3;
-		break;
-	}
-	dst = (char*)gf_malloc(sizeof(char)*dst_size);
-
-
-	fout = gf_fopen(str, "wb");
-	if (fout) {
-		GF_Err e = gf_img_png_enc(fb->video_buffer, fb->width, fb->height, fb->pitch_y, fb->pixel_format, dst, &dst_size);
-		if (!e) {
-			gf_fwrite(dst, dst_size, 1, fout);
-			gf_fclose(fout);
-		}
-	}
-
-	gf_free(dst);
-#endif //GPAC_DISABLE_AV_PARSERS
-}
-
-
-
-/*writes onto a file the content of the framebuffer in *fb interpreted as the byte depthbuffer */
-/*it's also possible to write a float depthbuffer by passing the floats to strings and writing chars in putpixel - see comments*/
-void write_depthfile(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	FILE *fout;
-	u32 i, j;
-	unsigned char *depth;
-
-	depth = (unsigned char *) fb->video_buffer;
-
-	fout = gf_fopen("dump_depth", "wb");
-	if (!fout) return;
-	for (j=0; j<fb->height;  j++) {
-		for (i=0; i<fb->width; i++) {
-
-#ifdef GPAC_USE_TINYGL
-			fputc(depth[2*i+j*fb->width*sizeof(unsigned short)], fout);
-			fputc(depth[2*i+j*fb->width*sizeof(unsigned short) + 1], fout);
-#else
-			fputc(depth[i+j*fb->width], fout);
-#endif
-		}
-	}
-	gf_fclose(fout);
-}
-
-void write_texture_file(GF_VideoSurface *fb, char *rad_name, u32 img_num, u32 dump_mode_flags)
-{
-
-	FILE *fout;
-	u32 i, j;
-	unsigned char *buf;
-
-	buf = (unsigned char *) fb->video_buffer;
-
-	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) fout = gf_fopen("dump_rgbds", "wb");
-	else if (dump_mode_flags & DUMP_RGB_DEPTH) fout = gf_fopen("dump_rgbd", "wb");
-	else return;
-
-	if (!fout) return;
-	for (j=0; j<fb->height;  j++) {
-		for (i=0; i<fb->width*4; i++) {
-			fputc(buf[i+j*fb->pitch_y], fout);
-		}
-	}
-	gf_fclose(fout);
-}
-
-
-void write_raw(GF_VideoSurface *fb, char *rad_name, u32 img_num)
-{
-	u32 j, i;
-	char *ptr, *prev;
-	char str[GF_MAX_PATH];
-	FILE *fout;
-	prev = strrchr(rad_name, '.');
-	if (prev) prev[0] = '\0';
-	if (img_num<10) {
-		sprintf(str, "%s_00%d.raw", rad_name, img_num);
-	} else if (img_num<100) {
-		sprintf(str, "%s_0%d.raw", rad_name, img_num);
-	} else {
-		sprintf(str, "%s_%d.raw", rad_name, img_num);
-	}
-
-	fout = gf_fopen(str, "wb");
-	if (!fout) return;
-
-
-	for (j=0; j<fb->height; j++) {
-		ptr = fb->video_buffer + j*fb->pitch_y;
-		for (i=0; i<fb->width; i++) {
-			u32 res = put_pixel(fout, 0, fb->pixel_format, ptr);
-			assert(res);
-			ptr += res;
-		}
-	}
-	gf_fclose(fout);
-}
-
-void write_hash(FILE *sha_out, char *buf, u32 size)
-{
-	u8 hash[20];
-	gf_sha1_csum((u8 *)buf, size, hash);
-	fwrite(hash, 1, 20, sha_out);
-}
-
-
-/* creates a .bmp format greyscale image of the byte depthbuffer and a binary with only the content of the depthbuffer */
-void dump_depth (GF_Terminal *term, char *rad_name, u32 dump_mode_flags, u32 frameNum, char *conv_buf, void *avi_out, FILE *sha_out)
-{
-	GF_Err e;
-	u32 i, k;
-
-	GF_VideoSurface fb;
-	u32 dump_mode = dump_mode_flags & 0x0000FFFF;
-
-	/*lock it*/
-	e = gf_sc_get_screen_buffer(term->compositor, &fb, 1);
-	if (e) fprintf(stderr, "Error grabbing depth buffer: %s\n", gf_error_to_string(e));
-	else  fprintf(stderr, "OK\n");
-	/*export frame*/
-	switch (dump_mode) {
-	case DUMP_AVI:
-		/*reverse frame*/
-		for (k=0; k<fb.height; k++) {
-			char *dst, *src;
-			u16 src_16;
-			dst = conv_buf + k*fb.width*3;
-			src = fb.video_buffer + (fb.height-k-1) * fb.pitch_y;
-
-			for (i=0; i<fb.width; i++) {
-				switch (fb.pixel_format) {
-				case GF_PIXEL_RGB_32:
-				case GF_PIXEL_ARGB:
-					dst[0] = src[0];
-					dst[1] = src[1];
-					dst[2] = src[2];
-					src+=4;
-					break;
-
-				case GF_PIXEL_BGR_32:
-				case GF_PIXEL_RGBA:
-					dst[0] = src[3];
-					dst[1] = src[2];
-					dst[2] = src[1];
-					src+=4;
-					break;
-				case GF_PIXEL_RGB_24:
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					src+=3;
-					break;
-				case GF_PIXEL_BGR_24:
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					src+=3;
-					break;
-				case GF_PIXEL_RGB_565:
-					src_16 = * ( (u16 *)src );
-					dst[2] = colmask(src_16 >> 8/*(11 - 3)*/, 3);
-					dst[1] = colmask(src_16 >> 3/*(5 - 2)*/, 2);
-					dst[0] = colmask(src_16 << 3, 3);
-					src+=2;
-					break;
-				case GF_PIXEL_RGB_555:
-					src_16 = * (u16 *)src;
-					dst[2] = colmask(src_16 >> 7/*(10 - 3)*/, 3);
-					dst[1] = colmask(src_16 >> 2/*(5 - 3)*/, 3);
-					dst[0] = colmask(src_16 << 3, 3);
-					src+=2;
-					break;
-				/*for depth .avi*/
-				case GF_PIXEL_GREYSCALE:
-					dst[0] = src[0];
-					dst[1] = src[0];
-					dst[2] = src[0];
-					src+=1;
-					break;
-				}
-				dst += 3;
-			}
-		}
-#ifndef GPAC_DISABLE_AVILIB
-		if (avi_out) {
-			if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
-				fprintf(stderr, "Error writing frame\n");
-		} else
-#endif
-			if (sha_out) {
-				write_hash(sha_out, conv_buf, fb.height*fb.width*3);
-			}
-
-		/*in -depth -avi mode, do not release it yet*/
-		if (dump_mode_flags & DUMP_DEPTH_ONLY) return;
-		break;
-	case DUMP_BMP:
-		write_bmp(&fb, rad_name, frameNum);
-		break;
-	case DUMP_PNG:
-		write_png(&fb, rad_name, frameNum);
-		break;
-	case DUMP_RAW:
-		write_raw(&fb, rad_name, frameNum);
-		break;
-	default:
-		write_depthfile(&fb, rad_name, frameNum);
-		break;
-	}
-	/*unlock it*/
-	gf_sc_release_screen_buffer(term->compositor, &fb);
-}
-
-void dump_frame(GF_Terminal *term, char *rad_name, u32 dump_mode_flags, u32 frameNum, char *conv_buf, void *avi_out, FILE *sha_out)
-{
-	GF_Err e = GF_OK;
-	u32 i, k, out_size;
-	GF_VideoSurface fb;
-
-	u32 dump_mode = dump_mode_flags & 0x0000FFFF;
-	u32 depth_dump_mode = 0;
-
-	if (dump_mode_flags & DUMP_RGB_DEPTH_SHAPE) depth_dump_mode = 3;
-	else if (dump_mode_flags & DUMP_RGB_DEPTH) depth_dump_mode = 2;
-	else if (dump_mode_flags & DUMP_DEPTH_ONLY) depth_dump_mode = 1;
-
-	/*lock it*/
-	e = gf_sc_get_screen_buffer(term->compositor, &fb, depth_dump_mode);
-	if (e) fprintf(stderr, "Error grabbing frame buffer: %s\n", gf_error_to_string(e));
-
-	/*export frame*/
-	switch (dump_mode) {
-	case DUMP_AVI:
-	case DUMP_SHA1:
-		/*reverse frame*/
-		for (k=0; k<fb.height; k++) {
-			char *dst, *src;
-			u16 src_16;
-			if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE)) dst = conv_buf + k*fb.width*4;
-			else dst = conv_buf + k*fb.width*3;
-
-			src = fb.video_buffer + (fb.height-k-1) * fb.pitch_y;
-
-			switch (fb.pixel_format) {
-			case GF_PIXEL_RGB_32:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[0];
-					dst[1] = src[1];
-					dst[2] = src[2];
-					src+=4;
-					dst += 3;
-				}
-				break;
-			case GF_PIXEL_RGBA:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					src+=4;
-					dst += 3;
-				}
-				break;
-			case GF_PIXEL_RGBDS:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					dst[3] = src[3];
-					dst +=4;
-					src+=4;
-				}
-				break;
-			case GF_PIXEL_RGBD:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					dst[3] = src[3];
-					dst += 4;
-					src+=4;
-				}
-				break;
-			case GF_PIXEL_BGR_32:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[3];
-					dst[1] = src[2];
-					dst[2] = src[1];
-					src+=4;
-					dst+=3;
-				}
-				break;
-			case GF_PIXEL_ARGB:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[1];
-					dst[1] = src[2];
-					dst[2] = src[3];
-					src+=4;
-					dst+=3;
-				}
-				break;
-			case GF_PIXEL_RGB_24:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					src+=3;
-					dst+=3;
-				}
-				break;
-			case GF_PIXEL_BGR_24:
-				for (i=0; i<fb.width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[0];
-					src+=3;
-					dst+=3;
-				}
-				break;
-			case GF_PIXEL_RGB_565:
-				for (i=0; i<fb.width; i++) {
-					src_16 = * ( (u16 *)src );
-					dst[2] = colmask(src_16 >> 8/*(11 - 3)*/, 3);
-					dst[1] = colmask(src_16 >> 3/*(5 - 2)*/, 2);
-					dst[0] = colmask(src_16 << 3, 3);
-					src+=2;
-					dst+=3;
-				}
-				break;
-			case GF_PIXEL_RGB_555:
-				for (i=0; i<fb.width; i++) {
-					src_16 = * (u16 *)src;
-					dst[2] = colmask(src_16 >> 7/*(10 - 3)*/, 3);
-					dst[1] = colmask(src_16 >> 2/*(5 - 3)*/, 3);
-					dst[0] = colmask(src_16 << 3, 3);
-					src+=2;
-					dst +=3;
-				}
-				break;
-			}
-		}
-		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE))  {
-			out_size = fb.height*fb.width*4;
-		} else {
-			out_size = fb.height*fb.width*3;
-		}
-#ifndef GPAC_DISABLE_AVILIB
-		if (avi_out) {
-			if (AVI_write_frame(avi_out, conv_buf, out_size, 1) <0)
-				fprintf(stderr, "Error writing frame\n");
-		} else
-#endif
-			if (sha_out) {
-				write_hash(sha_out, conv_buf, out_size);
-			}
-		break;
-	case DUMP_BMP:
-		write_bmp(&fb, rad_name, frameNum);
-		break;
-	case DUMP_PNG:
-		write_png(&fb, rad_name, frameNum);
-		break;
-	case DUMP_RAW:
-		write_raw(&fb, rad_name, frameNum);
-		break;
-
-	default:
-		write_texture_file(&fb, rad_name, frameNum, dump_mode_flags);
-		break;
-	}
-	/*unlock it*/
-	gf_sc_release_screen_buffer(term->compositor, &fb);
-}
-
-#ifndef GPAC_DISABLE_AVILIB
-
-typedef struct
-{
-	GF_AudioListener al;
-	GF_Mutex *mx;
-	avi_t *avi;
-	u32 time_scale;
-	u64 max_dur, nb_bytes, audio_time;
-	u32 next_video_time, audio_time_init, flush_retry, nb_write, audio_clock_at_video_init;
-	u32 samplerate, bits_per_sample, nb_channel;
-} AVI_AudioListener;
-
-void avi_audio_frame(void *udta, char *buffer, u32 buffer_size, u32 time, u32 delay)
-{
-	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
-
-	if (avil->audio_clock_at_video_init > time)
-		return;
-
-	if (avil->audio_time >= avil->audio_time_init + avil->max_dur)
-		return;
-
-	gf_mx_p(avil->mx);
-
-	if (!avil->time_scale) {
-		AVI_set_audio(avil->avi, avil->nb_channel, avil->samplerate, avil->bits_per_sample, WAVE_FORMAT_PCM, 0);
-		avil->time_scale = avil->nb_channel*avil->bits_per_sample*avil->samplerate/8;
-		gf_term_set_option(term, GF_OPT_FORCE_AUDIO_CONFIG, 1);
-	}
-
-	avil->nb_bytes+=buffer_size;
-	avil->flush_retry=0;
-
-	if (avil->audio_time >= avil->audio_time_init) {
-		avil->nb_write++;
-		AVI_write_audio(avil->avi, buffer, buffer_size);
-	}
-
-
-	avil->audio_time = 1000*avil->nb_bytes/avil->time_scale;
-
-	//we are behind video dump, force audio flush
-	if (avil->audio_time < avil->next_video_time)  {
-		gf_term_step_clocks(term, 0);
-	}
-	gf_mx_v(avil->mx);
-}
-
-void avi_audio_reconfig(void *udta, u32 samplerate, u32 bits_per_sample, u32 nb_channel, u32 channel_cfg)
-{
-	AVI_AudioListener *avil = (AVI_AudioListener *)udta;
-
-	avil->nb_channel = nb_channel;
-	avil->samplerate = samplerate;
-	avil->bits_per_sample = bits_per_sample;
-}
-#endif
-
-Bool dump_file(char *url, char *out_url, u32 dump_mode_flags, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times)
-{
-	GF_Err e;
-	Bool ret = 0;
-	u32 i = 0;
-	GF_VideoSurface fb;
-	char szPath[GF_MAX_PATH];
-	char szOutPath[GF_MAX_PATH];
-	char *prev=NULL;
-	u32 time, prev_time, nb_frames, init_time;
-	u64 dump_dur;
-	char *conv_buf = NULL;
-#ifndef GPAC_DISABLE_AVILIB
-	avi_t *avi_out = NULL;
-	avi_t *depth_avi_out = NULL;
-	AVI_AudioListener avi_al;
-	char comp[5];
-#else
-	void *avi_out = NULL;
-	void *depth_avi_out = NULL;
-#endif
-	GF_Mutex *avi_mx = NULL;
-
-	FILE *sha_out = NULL;
-	FILE *sha_depth_out = NULL;
-	char szPath_depth[GF_MAX_PATH];
-	u32 cur_time_idx;
-	u32 mode = dump_mode_flags & 0x0000FFFF;
-
-	if (!out_url) out_url = url;
-	prev = strstr(url, "://");
-	if (prev) {
-		prev = strrchr(url, '/');
-		if (prev) prev++;
-	}
-
-	if (!prev) prev = url;
-	strcpy(szPath, prev);
-	prev = gf_file_ext_start(szPath);
-	if (prev) *prev = 0;
-
-	if (out_url) {
-		strcpy(szOutPath, out_url);
-	} else {
-		strcpy(szOutPath, szPath);
-	}
-	prev = gf_file_ext_start(szOutPath);
-	if (prev) *prev = 0;
-
-	gf_term_set_simulation_frame_rate(term, (Double) fps);
-
-	fprintf(stderr, "Opening URL %s\n", url);
-	/*connect and pause */
-	gf_term_connect_from_time(term, url, 0, 2);
-
-	while (!term->compositor->scene
-	        || term->compositor->msg_type
-	        || (gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)
-	      ) {
-		if (last_error) return 1;
-		e = gf_term_process_flush(term);
-		if (e) {
-			fprintf(stderr, "Error initializing plalback: %s\n", gf_error_to_string(e));
-			return 1;
-		}
-	}
-
-	if (width && height) {
-		gf_term_set_size(term, width, height);
-		gf_term_process_flush(term);
-	}
-#ifndef GPAC_USE_TINYGL
-	e = gf_sc_get_screen_buffer(term->compositor, &fb, 0);
-#else
-	e = gf_sc_get_screen_buffer(term->compositor, &fb, 1);
-#endif
-	if (e != GF_OK) {
-		fprintf(stderr, "Error grabbing screen buffer: %s\n", gf_error_to_string(e));
-		return 1;
-	}
-	width = fb.width;
-	height = fb.height;
-	gf_sc_release_screen_buffer(term->compositor, &fb);
-
-	if (scale != 1) {
-		width = (u32)(width * scale);
-		height = (u32)(height * scale);
-		gf_term_set_size(term, width, height);
-		gf_term_process_flush(term);
-	}
-
-	/*we work in RGB24, and we must make sure the pitch is %4*/
-	if ((width*3)%4) {
-		fprintf(stderr, "Adjusting width (%d) to have a stride multiple of 4\n", width);
-		while ((width*3)%4) width--;
-
-		gf_term_set_size(term, width, height);
-		gf_term_process_flush(term);
-
-		gf_sc_get_screen_buffer(term->compositor, &fb, 0);
-		width = fb.width;
-		height = fb.height;
-		gf_sc_release_screen_buffer(term->compositor, &fb);
-	}
-
-
-	strcpy(szPath_depth, szOutPath);
-
-	if (mode==DUMP_AVI) {
-#ifdef GPAC_DISABLE_AVILIB
-		fprintf(stderr, "AVILib is disabled in this build of GPAC\n");
-		return 0;
-#else
-		strcat(szOutPath, ".avi");
-		avi_out = AVI_open_output_file(szOutPath);
-		if (!avi_out) {
-			fprintf(stderr, "Error creating AVI file %s\n", szOutPath);
-			return 1;
-		}
-#endif
-	}
-
-	if (mode==DUMP_SHA1) {
-		strcat(szOutPath, ".sha1");
-		sha_out = gf_fopen(szOutPath, "wb");
-		if (!sha_out) {
-			fprintf(stderr, "Error creating SHA file %s\n", szOutPath);
-			return 1;
-		}
-	}
-
-	if (dump_mode_flags & DUMP_DEPTH_ONLY) {
-		if (mode==DUMP_AVI) {
-#ifndef GPAC_DISABLE_AVILIB
-			strcat(szPath_depth, "_depth.avi");
-			depth_avi_out = AVI_open_output_file(szPath_depth);
-			if (!depth_avi_out) {
-				fprintf(stderr, "Error creating depth AVI file %s\n", szPath_depth);
-				return 1;
-			}
-#endif
-		}
-		if (mode==DUMP_SHA1) {
-			strcat(szPath_depth, "_depth.sha1");
-			sha_depth_out = gf_fopen(szPath_depth, "wb");
-			if (!sha_depth_out) {
-				fprintf(stderr, "Error creating depgth SHA file %s\n", szPath_depth);
-				return 1;
-			}
-		}
-	}
-
-
-	if (!fps) fps = GF_IMPORT_DEFAULT_FPS;
-	time = prev_time = 0;
-	nb_frames = 0;
-
-	if (nb_times==2) {
-		prev_time = times[0];
-		dump_dur = times[1] - times[0];
-	} else if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
-		dump_dur = times[0] ? times[0] : Duration;
-	} else {
-		dump_dur = times[nb_times-1];
-		dump_dur ++;
-	}
-	if (!dump_dur) {
-		fprintf(stderr, "Warning: file has no duration, defaulting to 1 sec\n");
-		dump_dur = 1000;
-	}
-
-	if (mode==DUMP_AVI) {
-		avi_mx = gf_mx_new("AVIMutex");
-
-#ifndef GPAC_DISABLE_AVILIB
-		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
-		AVI_set_video(avi_out, width, height, fps, comp);
-
-		if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
-			memset(&avi_al, 0, sizeof(avi_al));
-			avi_al.al.udta = &avi_al;
-			avi_al.al.on_audio_frame = avi_audio_frame;
-			avi_al.al.on_audio_reconfig = avi_audio_reconfig;
-			avi_al.mx = avi_mx;
-			avi_al.avi = avi_out;
-			avi_al.max_dur=dump_dur;
-
-			gf_sc_add_audio_listener(term->compositor, &avi_al.al);
-		}
-
-		if (dump_mode_flags & DUMP_DEPTH_ONLY)
-			AVI_set_video(depth_avi_out, width, height, fps, comp);
-#endif
-	}
-
-	if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
-
-		if (dump_mode_flags & (DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) )
-			conv_buf = gf_malloc(sizeof(char) * width * height * 4);
-		else
-			conv_buf = gf_malloc(sizeof(char) * width * height * 3);
-	}
-
-	cur_time_idx = 0;
-	init_time = 0;
-	/*step to first frame*/
-	if (prev_time) {
-		gf_term_step_clocks(term, prev_time);
-		init_time = prev_time;
-		prev_time=0;
-	}
-#ifndef GPAC_DISABLE_AVILIB
-	avi_al.audio_time_init = avi_al.next_video_time = init_time;
-	avi_al.audio_clock_at_video_init = gf_term_get_clock(term);
-#endif
-
-	ret = 0;
-	while (time < dump_dur) {
-		u32 frame_start_time = gf_sys_clock();
-		while ((gf_term_get_option(term, GF_OPT_PLAY_STATE) == GF_STATE_STEP_PAUSE)) {
-			e = gf_term_process_flush(term);
-			if (e) {
-				ret = 1;
-				break;
-			}
-			//if we can't flush a frame in 30 seconds consider this is an error
-			if (gf_sys_clock() - frame_start_time > 30000) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[MP4Client] Could not flush frame in 30 seconds for AVI dump, aborting dump\n"));
-				ret = 1;
-				break;
-			}
-		}
-		if (ret)
-			break;
-
-		if ((mode==DUMP_AVI) || (mode==DUMP_SHA1)) {
-
-			if (!no_prog)
-				fprintf(stderr, "Dumping %02d/100 %% - time %.02f sec\r", (u32) ((100.0*prev_time)/dump_dur), prev_time/1000.0 );
-
-			if (avi_mx) gf_mx_p(avi_mx);
-
-			if (dump_mode_flags & DUMP_DEPTH_ONLY) {
-
-				/*we'll dump both buffers at once*/
-				gf_mx_p(term->compositor->mx);
-				dump_depth(term, szPath_depth, dump_mode_flags, i+1, conv_buf, depth_avi_out, sha_depth_out);
-				dump_frame(term, szOutPath, mode, i+1, conv_buf, avi_out, sha_out);
-				gf_mx_v(term->compositor->mx);
-			} else {
-				dump_frame(term, szOutPath, dump_mode_flags, i+1, conv_buf, avi_out, sha_out);
-			}
-
-			if (avi_mx) gf_mx_v(avi_mx);
-
-		} else {
-			if ( times[cur_time_idx] <= time) {
-				if (dump_mode_flags & (DUMP_DEPTH_ONLY | DUMP_RGB_DEPTH | DUMP_RGB_DEPTH_SHAPE) ) {
-					dump_depth(term, szOutPath, dump_mode_flags, cur_time_idx+1, NULL, NULL, NULL);
-				} else {
-					dump_frame(term, out_url, dump_mode_flags, cur_time_idx+1, NULL, NULL, NULL);
-				}
-
-				cur_time_idx++;
-				if (cur_time_idx>=nb_times)
-					break;
-			}
-		}
-
-		nb_frames++;
-		time = (u32) (nb_frames*1000/fps);
-#ifndef GPAC_DISABLE_AVILIB
-		avi_al.next_video_time = init_time + time;
-#endif
-		gf_term_step_clocks(term, time - prev_time);
-		prev_time = time;
-
-		if (gf_prompt_has_input() && (gf_prompt_get_char()=='q')) {
-			fprintf(stderr, "Aborting dump\n");
-			break;
-		}
-	}
-
-#ifndef GPAC_DISABLE_AVILIB
-	//flush audio dump
-	if (!ret && (mode==DUMP_AVI) && ! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
-		avi_al.flush_retry=0;
-		while ((avi_al.flush_retry <1000) && (avi_al.audio_time < avi_al.audio_time_init + avi_al.max_dur)) {
-			gf_term_step_clocks(term, 0);
-			avi_al.flush_retry++;
-			gf_sleep(1);
-		}
-		if (avi_al.audio_time < avi_al.audio_time_init + avi_al.max_dur) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to flush audio frames: audio time "LLU" - expected "LLU" - retry %d\n", avi_al.audio_time, avi_al.audio_time_init + avi_al.max_dur, avi_al.flush_retry));
-			ret = 1;
-		}
-	}
-
-	if (! (term->user->init_flags & GF_TERM_NO_AUDIO)) {
-		gf_sc_remove_audio_listener(term->compositor, &avi_al.al);
-	}
-	if (avi_out) AVI_close(avi_out);
-	if (depth_avi_out) AVI_close(depth_avi_out);
-	if (avi_mx) gf_mx_del(avi_mx);
-#endif
-
-	if (sha_out) gf_fclose(sha_out);
-	if (sha_depth_out) gf_fclose(sha_depth_out);
-
-	if (conv_buf) {
-		gf_free(conv_buf);
-		fprintf(stderr, "Dumping done: %d frames at %g FPS\n", nb_frames, fps);
-	}
-
-	return ret;
-}
-

gpac-0.8.0.tar.gz/applications/osmo4_sym Deleted

gpac-0.8.0.tar.gz/applications/osmo4_sym/aif Deleted

gpac-0.8.0.tar.gz/applications/osmo4_sym/osmo4_view.cpp Deleted

@@ -1,587 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Symbian GUI player
- *
- *  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 FILES
-#include <coemain.h>
-#include <eikenv.h>
-
-#include "osmo4_view.h"
-#include "osmo4_ui.h"
-
-#include <gpac/options.h>
-/*for initial setup*/
-#include <gpac/modules/service.h>
-
-
-#if defined(__SERIES60_3X__)
-#define GPAC_CFG_DIR	"\\private\\F01F9075\\"
-#define GPAC_MODULES_DIR	"\\sys\\bin\\"
-#else
-#define GPAC_CFG_DIR	"\\system\\apps\\Osmo4\\"
-#define GPAC_MODULES_DIR	GPAC_CFG_DIR
-#endif
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Cosmo4AppView::NewL()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView* COsmo4AppView::NewL( const TRect& aRect )
-{
-	COsmo4AppView* self = COsmo4AppView::NewLC( aRect );
-	CleanupStack::Pop( self );
-	return self;
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::NewLC()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView* COsmo4AppView::NewLC( const TRect& aRect )
-{
-	COsmo4AppView* self = new ( ELeave ) COsmo4AppView;
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect );
-	return self;
-}
-
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::COsmo4AppView()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView::COsmo4AppView()
-{
-	// No implementation required
-	m_pTimer = NULL;
-#ifndef GPAC_GUI_ONLY
-	memset(&m_user, 0, sizeof(GF_User));
-	m_term = NULL;
-	m_mx = NULL;
-	memset(&m_rti, 0, sizeof(GF_SystemRTInfo));
-#endif
-	last_title_update = 0;
-	show_rti = 0;
-#if defined(__SERIES60_3X__)
-	selector = NULL;
-	target = NULL;
-#endif
-}
-
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::~COsmo4AppView()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-COsmo4AppView::~COsmo4AppView()
-{
-	Shutdown();
-#ifndef GPAC_GUI_ONLY
-	if (m_mx) gf_mx_del(m_mx);
-#endif
-
-#if defined(__SERIES60_3X__)
-	if (selector) delete selector;
-	//if (target) delete target;
-#endif
-}
-
-void COsmo4AppView::Shutdown()
-{
-//	MessageBox("Osmo4 shutdown request", "");
-	if (m_pTimer) {
-		m_pTimer->Cancel();
-		delete m_pTimer;
-		m_pTimer = NULL;
-	}
-#ifndef GPAC_GUI_ONLY
-	if (m_term) {
-		GF_Terminal *t = m_term;
-		m_term = NULL;
-		gf_term_del(t);
-	}
-	if (m_Logs) {
-		gf_fclose(m_Logs);
-		m_Logs = NULL;
-	}
-	if (m_user.config) {
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-	}
-	if (m_user.modules) {
-		gf_modules_del(m_user.modules);
-		m_user.modules = NULL;
-	}
-#endif
-//	MessageBox("Osmo4 shutdown OK", "");
-}
-
-void COsmo4AppView::MessageBox(const char *text, const char *title)
-{
-	HBufC *msg1, *msg2;
-	TInt length = User::StringLength( ( TUint8* ) text) + 1;
-	msg1 = HBufC::NewL( length );
-	msg1->Des().Copy( TPtrC8(( TText8* ) text) );
-
-	length = User::StringLength( ( TUint8* ) title) + 1;
-	msg2 = HBufC::NewL( length );
-	msg2->Des().Copy( TPtrC8(( TText8* ) title) );
-
-	CEikonEnv::Static()->InfoWinL(*msg2, *msg1);
-	delete msg1;
-	delete msg2;
-}
-
-TInt myTick(TAny* aObject)
-{
-	return ((COsmo4AppView*)aObject)->OnTick();
-}
-
-TInt COsmo4AppView::OnTick()
-{
-#ifndef GPAC_GUI_ONLY
-	if (m_term) gf_term_process_step(m_term);
-
-	/*check RTI display*/
-	if (show_rti && gf_sys_get_rti(500, &m_rti, 0)) DisplayRTI();
-#endif
-	/*never stop...*/
-	return 1;
-}
-
-void COsmo4AppView::DisplayRTI()
-{
-#ifndef GPAC_GUI_ONLY
-	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
-	char szInfo[20];
-	sprintf(szInfo, "CPU %02d FPS %02.2f", m_rti.process_cpu_usage, gf_term_get_framerate(m_term, 0));
-	app->SetInfo(szInfo);
-#endif
-}
-
-
-//GPAC log function
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	char szMsg[2048];
-	COsmo4AppView *app = (COsmo4AppView *)cbk;
-
-#ifndef GPAC_GUI_ONLY
-	gf_mx_p(app->m_mx);
-	if (app->m_Logs) {
-		vfprintf(app->m_Logs, fmt, list);
-	} else {
-		vsnprintf(szMsg, 2048, fmt, list);
-		app->MessageBox(szMsg, "Error:");
-	}
-	gf_mx_v(app->m_mx);
-#endif
-}
-
-static Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	COsmo4AppView *app = (COsmo4AppView *)ptr;
-	return app->EventProc(evt);
-}
-
-Bool COsmo4AppView::EventProc(GF_Event *evt)
-{
-	TRect r;
-
-#ifndef GPAC_GUI_ONLY
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.message) return 0;
-		if (evt->message.error) {
-			char err[1024];
-			sprintf(err, "Error: %s", gf_error_to_string(evt->message.error));
-			MessageBox(evt->message.message, err);
-		} else {
-			MessageBox(evt->message.message, "Info");
-		}
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		r = Rect();
-		gf_term_set_size(m_term, r.Width(), r.Height());
-		break;
-	}
-#endif
-	return 0;
-}
-
-void COsmo4AppView::SetupLogs()
-{
-	const char *opt;
-
-#ifndef GPAC_GUI_ONLY
-	gf_mx_p(m_mx);
-	if (do_log) {
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
-		do_log = 0;
-	}
-	/*setup GPAC logs: log all errors*/
-	opt = gf_cfg_get_key(m_user.config, "General", "Logs");
-	if (opt && !strstr(opt, "none")) {
-		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\data\\gpac_logs.txt");
-			filename = "\\data\\gpac_logs.txt";
-		}
-		m_Logs = gf_fopen(filename, "wt");
-		if (!m_Logs) {
-			MessageBox("Cannot open log file - disabling logs", "Warning !");
-		} else {
-			MessageBox("Debug logs enabled!", filename);
-			do_log = 1;
-			gf_log_set_tools_levels( opt );
-		}
-	}
-	if (!do_log) {
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-		if (m_Logs) gf_fclose(m_Logs);
-	}
-
-	gf_log_set_callback(this, on_gpac_log);
-	gf_mx_v(m_mx);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Osmo4 logs initialized\n"));
-#endif
-}
-
-
-static void Osmo4_progress_cbk(void *usr, char *title, u32 done, u32 total)
-{
-#ifndef GPAC_GUI_ONLY
-	COsmo4AppView *view = (COsmo4AppView *) usr;
-	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
-
-	if (done==total) {
-		app->SetInfo(NULL);
-	} else if (view->last_title_update + 500 < gf_sys_clock()) {
-		char szName[1024];
-		view->last_title_update = gf_sys_clock();
-		sprintf(szName, "%s %02d %%", title, (done*100 / total) );
-		app->SetInfo(szName);
-	}
-#endif
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::ConstructL( const TRect& aRect )
-{
-	const char *opt;
-	Bool first_launch = 0;
-
-#if defined(__SERIES60_3X__)
-	selector = CRemConInterfaceSelector::NewL();
-	target = CRemConCoreApiTarget::NewL(*selector, *this);
-	selector->OpenTargetL();
-#endif
-
-	// Create a window for this application view
-	CreateWindowL();
-	// Set the windows size
-	SetRect( aRect );
-	//draw
-	ActivateL();
-
-#ifndef GPAC_GUI_ONLY
-	m_window = Window();
-	m_session = CEikonEnv::Static()->WsSession();
-
-	m_mx = gf_mx_new("Osmo4");
-
-	//load config file
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-	if (!m_user.config) {
-		MessageBox("Cannot create GPAC Config file", "Fatal Error");
-		User::Leave(KErrGeneral);
-	}
-	if (first_launch) {
-		MessageBox("Osmo4", "Thank you for Installing");
-	}
-
-	/*load modules*/
-	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-	m_user.modules = gf_modules_new(opt, m_user.config);
-	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
-		MessageBox(m_user.modules ? "No modules available" : "Cannot create module manager", "Fatal Error");
-		if (m_user.modules) gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		User::Leave(KErrGeneral);
-	}
-
-	if (first_launch) {
-		/*first launch, register all files ext*/
-		for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-	}
-
-	/*we don't thread the terminal, ie appart from the audio renderer, media decoding and visual rendering is
-	handled by the app process*/
-	m_user.init_flags = GF_TERM_NO_VISUAL_THREAD | GF_TERM_NO_REGULATION;
-	m_user.EventProc = GPAC_EventProc;
-	m_user.opaque = this;
-	m_user.os_window_handler = (void *) &m_window;
-	m_user.os_display = (void *) &m_session;
-
-	m_term = gf_term_new(&m_user);
-	if (!m_term) {
-		MessageBox("Cannot load GPAC terminal", "Fatal Error");
-		gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		User::Leave(KErrGeneral);
-	}
-	//MessageBox("GPAC terminal loaded", "Success !");
-
-	/*ok set output size*/
-	TSize s = m_window.Size();
-	gf_term_set_size(m_term, s.iWidth, s.iHeight);
-
-
-	/*start our callback (every ms)*/
-	const TInt KTickInterval = 33000;
-	m_pTimer = CPeriodic::NewL(CActive::EPriorityStandard);
-	m_pTimer->Start(KTickInterval, KTickInterval, TCallBack(myTick, this));
-
-	opt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-	if (opt) gf_term_connect(m_term, opt);
-
-#endif
-
-}
-
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::Draw()
-// Draws the display.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::Draw( const TRect& /*aRect*/ ) const
-{
-#ifndef GPAC_GUI_ONLY
-	if (!m_term) {
-		CWindowGc& gc = SystemGc();
-		TRgb black(0,0,0);
-		gc.SetBrushColor(black);
-		gc.Clear();
-	} else {
-		/*FIXME - this is just to force a screen flush, needs rework*/
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
-	}
-#else
-	CWindowGc& gc = SystemGc();
-	TRgb black(0,0,0);
-	TRect rect = Rect();
-	gc.SetBrushColor(black);
-	gc.Clear(rect);
-#endif
-}
-
-void COsmo4AppView::ShowHide(Bool show)
-{
-#ifndef GPAC_GUI_ONLY
-	if (show) {
-		MakeVisible(ETrue);
-		if (m_term) {
-			gf_term_set_option(m_term, GF_OPT_VISIBLE, 1);
-			DrawDeferred();
-		}
-	} else {
-		MakeVisible(EFalse);
-		if (m_term) gf_term_set_option(m_term, GF_OPT_VISIBLE, 0);
-	}
-#else
-	MakeVisible(ETrue);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-// COsmo4AppView::SizeChanged()
-// Called by framework when the view size is changed.
-// -----------------------------------------------------------------------------
-//
-void COsmo4AppView::SizeChanged()
-{
-#ifndef GPAC_GUI_ONLY
-	if (m_term) {
-		TSize s = m_window.Size();
-		gf_term_set_size(m_term, s.iWidth, s.iHeight);
-	}
-#endif
-	DrawNow();
-}
-
-void COsmo4AppView::Connect(const char *url)
-{
-#ifndef GPAC_GUI_ONLY
-	char the_url[1024];
-	/*copy before removing from recent files*/
-	strcpy(the_url, url);
-	gf_cfg_set_key(m_user.config, "RecentFiles", the_url, NULL);
-	gf_cfg_insert_key(m_user.config, "RecentFiles", the_url, "", 0);
-	u32 count = gf_cfg_get_key_count(m_user.config, "RecentFiles");
-	if (count > 10) gf_cfg_set_key(m_user.config, "RecentFiles", gf_cfg_get_key_name(m_user.config, "RecentFiles", count-1), NULL);
-
-	if (m_term) gf_term_connect(m_term, the_url);
-#endif
-}
-
-
-TKeyResponse COsmo4AppView::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
-{
-	GF_Event evt;
-	u32 ret;
-
-	evt.key.hw_code = aKeyEvent.iScanCode;
-	evt.key.flags = 0;
-	switch (aType) {
-	case EEventKeyUp:
-		evt.type = GF_EVENT_KEYUP;
-		break;
-	case EEventKeyDown:
-	case EEventKey:
-		evt.type = GF_EVENT_KEYDOWN;
-		break;
-	default:
-		return EKeyWasNotConsumed;
-	}
-
-	switch (aKeyEvent.iCode) {
-	case EKeyLeftArrow:
-		evt.key.key_code = GF_KEY_LEFT;
-		break;
-	case EKeyRightArrow:
-		evt.key.key_code = GF_KEY_RIGHT;
-		break;
-	case EKeyUpArrow:
-		evt.key.key_code = GF_KEY_UP;
-		break;
-	case EKeyDownArrow:
-		evt.key.key_code = GF_KEY_DOWN;
-		break;
-	case EKeyIncVolume:
-		evt.key.key_code = GF_KEY_VOLUMEUP;
-		break;
-	case EKeyDecVolume:
-		evt.key.key_code = GF_KEY_VOLUMEDOWN;
-		break;
-	default:
-		switch (aKeyEvent.iScanCode) {
-		case EStdKeyIncVolume:
-			evt.key.key_code = GF_KEY_VOLUMEUP;
-			break;
-		case EStdKeyDecVolume:
-			evt.key.key_code = GF_KEY_VOLUMEDOWN;
-			break;
-		default:
-			return EKeyWasNotConsumed;
-		}
-	}
-#ifndef GPAC_GUI_ONLY
-	ret = gf_term_user_event(m_term, &evt);
-	/*generate a key up*/
-	if (aType==EEventKey) {
-		evt.type = GF_EVENT_KEYUP;
-		ret += gf_term_user_event(m_term, &evt);
-	}
-#else
-	ret = 0;
-#endif
-	return ret ? EKeyWasConsumed : EKeyWasNotConsumed;
-}
-
-#if defined(__SERIES60_3X__)
-void COsmo4AppView::MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct)
-{
-	GF_Event e;
-	switch (aOperationId) {
-	/*
-	    TRequestStatus status;
-		case ERemConCoreApiPausePlayFunction:
-		case ERemConCoreApiStop:
-		case ERemConCoreApiRewind:
-		case ERemConCoreApiForward:
-		case ERemConCoreApiFastForward:
-		case ERemConCoreApiBackward:
-			switch (aButtonAct) {
-			case ERemConCoreApiButtonPress:
-				break;
-			case ERemConCoreApiButtonRelease:
-				break;
-			case ERemConCoreApiButtonClick:
-				break;
-			default:
-				break;
-			}
-	*/
-	case ERemConCoreApiVolumeUp:
-	case ERemConCoreApiVolumeDown:
-#ifndef GPAC_GUI_ONLY
-		e.key.hw_code = 0;
-		e.key.flags = 0;
-		e.key.key_code = (aOperationId==ERemConCoreApiVolumeUp) ? GF_KEY_VOLUMEUP : GF_KEY_VOLUMEDOWN;
-		switch (aButtonAct) {
-		case ERemConCoreApiButtonPress:
-			e.type = GF_EVENT_KEYDOWN;
-			gf_term_user_event(m_term, &e);
-			break;
-		case ERemConCoreApiButtonRelease:
-			e.type = GF_EVENT_KEYUP;
-			gf_term_user_event(m_term, &e);
-			break;
-		default:
-			e.type = GF_EVENT_KEYDOWN;
-			gf_term_user_event(m_term, &e);
-			e.type = GF_EVENT_KEYUP;
-			gf_term_user_event(m_term, &e);
-			break;
-		}
-#endif
-		break;
-	default:
-		break;
-	}
-}
-
-#endif

gpac-0.8.0.tar.gz/applications/osmo4_sym/res Deleted

gpac-0.8.0.tar.gz/applications/osmo4_w32 Deleted

gpac-0.8.0.tar.gz/applications/osmo4_w32/Options.cpp Deleted

@@ -1,2081 +0,0 @@
-// Options.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include "MainFrm.h"
-
-#include <gpac/modules/codec.h>
-#include <gpac/modules/raster2d.h>
-#include <gpac/modules/font.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/video_out.h>
-
-#include <gpac/iso639.h>
-#include "Options.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-
-COptions::COptions(CWnd* pParent /*=NULL*/)
-	: CDialog(COptions::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptions)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptions::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptions)
-	DDX_Control(pDX, IDC_SELECT, m_Selector);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptions, CDialog)
-	//{{AFX_MSG_MAP(COptions)
-	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
-	ON_WM_CLOSE()
-	ON_WM_DESTROY()
-	ON_CBN_SELCHANGE(IDC_SELECT, OnSelchangeSelect)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL COptions::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_general.Create(IDD_OPT_GEN, this);
-	m_systems.Create(IDD_OPT_SYSTEMS, this);
-	m_render.Create(IDD_OPT_RENDER, this);
-	m_render2d.Create(IDD_OPT_RENDER2D, this);
-	m_render3d.Create(IDD_OPT_RENDER3D, this);
-	m_decoder.Create(IDD_OPT_DECODER, this);
-	m_audio.Create(IDD_OPT_AUDIO, this);
-	m_video.Create(IDD_OPT_VIDEO, this);
-	m_http.Create(IDD_OPT_HTTP, this);
-	m_font.Create(IDD_OPT_FONT, this);
-	m_stream.Create(IDD_OPT_STREAM, this);
-	m_cache.Create(IDD_OPT_MCACHE, this);
-	m_files.Create(IDD_OPT_FILETYPES, this);
-	m_logs.Create(IDD_OPT_LOGS, this);
-
-	m_Selector.AddString("General");
-	m_Selector.AddString("MPEG-4 Systems");
-	m_Selector.AddString("Media Decoders");
-	m_Selector.AddString("Compositor");
-	m_Selector.AddString("2D Drawing");
-	m_Selector.AddString("3D Drawing");
-	m_Selector.AddString("Video Output");
-	m_Selector.AddString("Audio Output");
-	m_Selector.AddString("Text Engine");
-	m_Selector.AddString("File Download");
-	m_Selector.AddString("Real-Time Streaming");
-	m_Selector.AddString("Streaming Cache");
-	m_Selector.AddString("File Types");
-	m_Selector.AddString("Log System");
-
-	HideAll();
-
-	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
-	u32 sel = sOpt ? atoi(sOpt) : 0;
-	if (sel>13) sel=13;
-	m_Selector.SetCurSel(sel);
-	m_general.ShowWindow(SW_SHOW);
-
-	OnSelchangeSelect();
-
-	return TRUE;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions message handlers
-
-void COptions::HideAll()
-{
-	m_general.ShowWindow(SW_HIDE);
-	m_systems.ShowWindow(SW_HIDE);
-	m_render.ShowWindow(SW_HIDE);
-	m_render2d.ShowWindow(SW_HIDE);
-	m_render3d.ShowWindow(SW_HIDE);
-	m_audio.ShowWindow(SW_HIDE);
-	m_video.ShowWindow(SW_HIDE);
-	m_http.ShowWindow(SW_HIDE);
-	m_font.ShowWindow(SW_HIDE);
-	m_stream.ShowWindow(SW_HIDE);
-	m_decoder.ShowWindow(SW_HIDE);
-	m_cache.ShowWindow(SW_HIDE);
-	m_files.ShowWindow(SW_HIDE);
-	m_files.ShowWindow(SW_HIDE);
-	m_logs.ShowWindow(SW_HIDE);
-}
-
-void COptions::OnSelchangeSelect()
-{
-	HideAll();
-	switch (m_Selector.GetCurSel()) {
-	case 0:
-		m_general.ShowWindow(SW_SHOW);
-		break;
-	case 1:
-		m_systems.ShowWindow(SW_SHOW);
-		break;
-	case 2:
-		m_decoder.ShowWindow(SW_SHOW);
-		break;
-	case 3:
-		m_render.ShowWindow(SW_SHOW);
-		break;
-	case 4:
-		m_render2d.ShowWindow(SW_SHOW);
-		break;
-	case 5:
-		m_render3d.ShowWindow(SW_SHOW);
-		break;
-	case 6:
-		m_video.ShowWindow(SW_SHOW);
-		break;
-	case 7:
-		m_audio.ShowWindow(SW_SHOW);
-		break;
-	case 8:
-		m_font.ShowWindow(SW_SHOW);
-		break;
-	case 9:
-		m_http.ShowWindow(SW_SHOW);
-		break;
-	case 10:
-		m_stream.ShowWindow(SW_SHOW);
-		break;
-	case 11:
-		m_cache.ShowWindow(SW_SHOW);
-		break;
-	case 12:
-		m_files.ShowWindow(SW_SHOW);
-		break;
-	case 13:
-		m_logs.ShowWindow(SW_SHOW);
-		break;
-	}
-}
-
-void COptions::OnSaveopt()
-{
-	m_general.SaveOptions();
-	m_systems.SaveOptions();
-	m_decoder.SaveOptions();
-	m_render.SaveOptions();
-	m_render2d.SaveOptions();
-	m_render3d.SaveOptions();
-	m_audio.SaveOptions();
-	m_video.SaveOptions();
-	m_http.SaveOptions();
-	m_font.SaveOptions();
-	m_stream.SaveOptions();
-	m_cache.SaveOptions();
-	m_logs.SaveOptions();
-
-	Osmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
-	m_render2d.SetYUV();
-}
-
-void COptions::OnClose()
-{
-	char str[20];
-	sprintf(str, "%d", m_Selector.GetCurSel());
-	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
-
-	DestroyWindow();
-}
-
-void COptions::OnDestroy()
-{
-	CDialog::OnDestroy();
-	delete this;
-	((CMainFrame *)GetApp()->m_pMainWnd)->m_pOpt = NULL;
-}
-
-
-COptGen::COptGen(CWnd* pParent /*=NULL*/)
-	: CDialog(COptGen::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptGen)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptGen::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptGen)
-	DDX_Control(pDX, IDC_LOOKFORSUB, m_LookForSubs);
-	DDX_Control(pDX, IDC_DUMP_XMT, m_ViewXMT);
-	DDX_Control(pDX, IDC_NO_CONSOLE, m_NoConsole);
-	DDX_Control(pDX, IDC_LOOP, m_Loop);
-	DDX_Control(pDX, IDC_SINGLE_INSTANCE, m_SingleInstance);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptGen, CDialog)
-	//{{AFX_MSG_MAP(COptGen)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptGen message handlers
-
-
-
-BOOL COptGen::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
-	m_Loop.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "LookForSubtitles");
-	m_LookForSubs.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ConsoleOff");
-	m_NoConsole.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ViewXMT");
-	m_ViewXMT.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "SingleInstance");
-	m_SingleInstance.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	return TRUE;
-}
-
-void COptGen::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gpac->m_Loop = (Bool) m_Loop.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
-	gpac->m_LookForSubtitles = (Bool) m_LookForSubs.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "LookForSubtitles",  gpac->m_LookForSubtitles ? "yes" : "no");
-	gpac->m_NoConsole = (Bool) m_NoConsole.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "ConsoleOff", gpac->m_NoConsole ? "yes" : "no");
-	gpac->m_ViewXMTA = (Bool) m_ViewXMT.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "ViewXMT", gpac->m_ViewXMTA ? "yes" : "no");
-	gpac->m_SingleInstance = (Bool) m_SingleInstance.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "SingleInstance", gpac->m_SingleInstance ? "yes" : "no");
-}
-
-COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
-	: CDialog(COptSystems::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptSystems)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptSystems::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptSystems)
-	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
-	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
-	DDX_Control(pDX, IDC_BIFSDROP, m_LateFramesAlwaysDrawn);
-	DDX_Control(pDX, IDC_LANG, m_Lang);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptSystems, CDialog)
-	//{{AFX_MSG_MAP(COptSystems)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptSystems message handlers
-
-
-
-
-
-BOOL COptSystems::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = 0;
-	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	u32 i, count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		const char *n2c = gf_lang_get_2cc(i);
-		const char *n3c = gf_lang_get_3cc(i);
-
-		m_Lang.AddString(gf_lang_get_name(i) );
-		if (sOpt && n3c && !stricmp(sOpt, n3c))
-			select = m_Lang.GetCount() - 1;
-	}
-	m_Lang.SetCurSel(select);
-
-
-	/*system config*/
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
-	select = 0;
-	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
-	m_Threading.AddString("Single Thread");
-	m_Threading.AddString("Mutli Thread");
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_Threading.AddString("Free");
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_Threading.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceDuration.SetCheck(1);
-	} else {
-		m_ForceDuration.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DrawLateFrames");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_LateFramesAlwaysDrawn.SetCheck(1);
-	} else {
-		m_LateFramesAlwaysDrawn.SetCheck(0);
-	}
-
-
-	return TRUE;
-}
-
-
-void COptSystems::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	s32 sel = m_Lang.GetCurSel();
-	u32 i=0;
-
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(i) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(i) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(i) );
-
-	sel = m_Threading.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DrawLateFrames", m_LateFramesAlwaysDrawn.GetCheck() ? "yes" : "no");
-}
-
-
-OptDecoder::OptDecoder(CWnd* pParent /*=NULL*/)
-	: CDialog(OptDecoder::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(OptDecoder)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void OptDecoder::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(OptDecoder)
-	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
-	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(OptDecoder, CDialog)
-	//{{AFX_MSG_MAP(OptDecoder)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// OptDecoder message handlers
-
-
-
-BOOL OptDecoder::OnInitDialog()
-{
-	u32 i;
-	const char *sOpt;
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-
-	/*audio dec enum*/
-	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseDecoder *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-
-		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-			m_Audio.AddString(ifce->module_name);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *)ifce);
-	}
-	m_Audio.SetCurSel(select);
-
-	/*video dec enum*/
-	while (m_Video.GetCount()) m_Video.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
-	count = gf_modules_get_count(gpac->m_user.modules);
-	select = 0;
-	to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-
-		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-			m_Video.AddString(ifce->module_name);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *)ifce);
-	}
-	m_Video.SetCurSel(select);
-	return TRUE;
-}
-
-void OptDecoder::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str[100];
-	m_Audio.GetWindowText(str, 100);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
-	m_Video.GetWindowText(str, 100);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
-
-}
-
-COptRender::COptRender(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_DRAW_BOUNDS, m_DrawBounds);
-	DDX_Control(pDX, IDC_GD_LIST, m_Graphics);
-	DDX_Control(pDX, IDC_USE_RENDER3D, m_Use3DRender);
-	DDX_Control(pDX, IDC_AA_LIST, m_AntiAlias);
-	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
-	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
-	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender, CDialog)
-	//{{AFX_MSG_MAP(COptRender)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender message handlers
-
-
-
-#define NUM_RATES 11
-static char *BIFSRates[11] =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0",
-};
-
-
-
-BOOL COptRender::OnInitDialog()
-{
-	s32 i;
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "OpenGLMode");
-	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "always")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
-	m_ForceSize.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	s32 select = 0;
-	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
-	for (i = 0; i<NUM_RATES; i++) {
-		m_BIFSRate.AddString(BIFSRates[i]);
-		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
-	}
-	m_BIFSRate.SetCurSel(select);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
-	m_HighSpeed.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
-	while (m_AntiAlias.GetCount()) m_AntiAlias.DeleteString(0);
-
-	m_AntiAlias.AddString("None");
-	m_AntiAlias.AddString("Text only");
-	m_AntiAlias.AddString("Complete");
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_AntiAlias.SetCurSel(select);
-
-	/*graphics driver enum*/
-	while (m_Graphics.GetCount()) m_Graphics.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Raster2D");
-	s32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	select = 0;
-	u32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_RASTER_2D_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Graphics.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Graphics.SetCurSel(select);
-
-
-	m_DrawBounds.AddString("None");
-	m_DrawBounds.AddString("Box/Rect");
-	m_DrawBounds.AddString("AABB Tree");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BoundingVolume");
-	if (sOpt && !stricmp(sOpt, "Box")) m_DrawBounds.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "AABB")) m_DrawBounds.SetCurSel(2);
-	else m_DrawBounds.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-Bool COptRender::SaveOptions()
-{
-	char str[50];
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
-
-	s32 sel = m_BIFSRate.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRates[sel]);
-
-	sel = m_AntiAlias.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-
-	sel = m_DrawBounds.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
-
-	m_Graphics.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Raster2D", str);
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "OpenGLMode", m_Use3DRender.GetCheck() ? "always" : "disable");
-	return GF_FALSE;
-}
-
-
-COptRender2D::COptRender2D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender2D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender2D)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender2D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender2D)
-	DDX_Control(pDX, IDC_FORMAT_YUV, m_YUVFormat);
-	DDX_Control(pDX, IDC_YUV, m_NoYUV);
-	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
-	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender2D, CDialog)
-	//{{AFX_MSG_MAP(COptRender2D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender2D message handlers
-
-BOOL COptRender2D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawMode");
-	if (sOpt && !stricmp(sOpt, "immediate")) {
-		m_DirectRender.SetCheck(1);
-	} else {
-		m_DirectRender.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
-	if (sOpt && !stricmp(sOpt, "no")) {
-		m_Scalable.SetCheck(0);
-	} else {
-		m_Scalable.SetCheck(1);
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableYUV");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_NoYUV.SetCheck(1);
-	} else {
-		m_NoYUV.SetCheck(0);
-	}
-
-	SetYUV();
-
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void COptRender2D::SetYUV()
-{
-	Osmo4 *gpac = GetApp();
-	u32 yuv_format = gf_term_get_option(gpac->m_term, GF_OPT_YUV_FORMAT);
-	if (!yuv_format) {
-		m_YUVFormat.SetWindowText("(No YUV used)");
-	} else {
-		char str[100];
-		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
-		m_YUVFormat.SetWindowText(str);
-	}
-}
-
-void COptRender2D::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawMode", m_DirectRender.GetCheck() ? "immediate" : "defer");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableYUV", m_NoYUV.GetCheck() ? "yes" : "no");
-}
-
-
-COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender3D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender3D)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender3D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender3D)
-	DDX_Control(pDX, IDC_BITMAP_USE_PIXEL, m_BitmapPixels);
-	DDX_Control(pDX, IDC_DISABLE_TX_RECT, m_DisableTXRect);
-	DDX_Control(pDX, IDC_RASTER_OUTLINE, m_RasterOutlines);
-	DDX_Control(pDX, IDC_EMUL_POW2, m_EmulPow2);
-	DDX_Control(pDX, IDC_DISABLE_POLY_AA, m_PolyAA);
-	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
-	DDX_Control(pDX, IDC_BACK_CULL, m_BackCull);
-	DDX_Control(pDX, IDC_DRAW_MODE, m_Wireframe);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
-	//{{AFX_MSG_MAP(COptRender3D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender3D message handlers
-
-
-BOOL COptRender3D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	m_DrawNormals.AddString("Never");
-	m_DrawNormals.AddString("Per Face");
-	m_DrawNormals.AddString("Per Vertex");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
-	else m_DrawNormals.SetCurSel(0);
-
-	m_BackCull.AddString("Off");
-	m_BackCull.AddString("On");
-	m_BackCull.AddString("Alpha");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
-	if (sOpt && !stricmp(sOpt, "Off")) m_BackCull.SetCurSel(0);
-	else if (sOpt && !stricmp(sOpt, "Alpha")) m_BackCull.SetCurSel(2);
-	else m_BackCull.SetCurSel(1);
-
-	m_Wireframe.AddString("Solid");
-	m_Wireframe.AddString("Wireframe");
-	m_Wireframe.AddString("Both");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_Wireframe.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_Wireframe.SetCurSel(2);
-	else m_Wireframe.SetCurSel(0);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "RasterOutlines");
-	m_RasterOutlines.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
-	m_EmulPow2.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "PolygonAA");
-	m_PolyAA.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels");
-	m_BitmapPixels.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableRectExt");
-	m_DisableTXRect.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// EXCEPTION: OCX Property Pages should return FALSE
-}
-
-void COptRender3D::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	u32 sel = m_DrawNormals.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
-	sel = m_BackCull.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", (sel==2) ? "Alpha" : (sel==1) ? "On" : "Off");
-	sel = m_Wireframe.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "RasterOutlines", m_RasterOutlines.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulPow2.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "PolygonAA", m_PolyAA.GetCheck() ? "yes" : "no");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableRectExt", m_DisableTXRect.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels", m_BitmapPixels.GetCheck() ? "yes" : "no");
-}
-
-COptVideo::COptVideo(CWnd* pParent /*=NULL*/)
-	: CDialog(COptVideo::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptVideo)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptVideo::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptVideo)
-	DDX_Control(pDX, IDC_SWITCH_RES, m_SwitchRes);
-	DDX_Control(pDX, IDC_VIDEO_LIST, m_Videos);
-	DDX_Control(pDX, IDC_HWMEMORY, m_UseHWMemory);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptVideo, CDialog)
-	//{{AFX_MSG_MAP(COptVideo)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptVideo message handlers
-
-BOOL COptVideo::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Video", "SwitchResolution");
-	m_SwitchRes.SetCheck(sOpt && !stricmp(sOpt, "yes") ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Video", "HardwareMemory");
-	m_UseHWMemory.SetCheck(sOpt && !stricmp(sOpt, "Always") ? 1 : 0);
-
-
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 to_sel = 0;
-	s32 select = 0;
-	/*video drivers enum*/
-	while (m_Videos.GetCount()) m_Videos.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Video", "DriverName");
-
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Videos.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Videos.SetCurSel(select);
-
-	return TRUE;
-
-}
-
-void COptVideo::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str[50];
-
-	gf_cfg_set_key(gpac->m_user.config, "Video", "SwitchResolution", m_SwitchRes.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Video", "HardwareMemory", m_UseHWMemory.GetCheck() ? "Always" : "Auto");
-	m_Videos.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Video", "DriverName", str);
-}
-
-
-COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
-	: CDialog(COptAudio::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptAudio)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptAudio::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptAudio)
-	DDX_Control(pDX, IDC_AUDIO_NOTIFS, m_Notifs);
-	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
-	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
-	DDX_Control(pDX, IDC_AUDIO_MULTICH, m_AudioMultiCH);
-	DDX_Control(pDX, IDC_AUDIO_FPS, m_AudioDur);
-	DDX_Control(pDX, IDC_SPIN_FPS, m_SpinFPS);
-	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
-	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
-	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptAudio, CDialog)
-	//{{AFX_MSG_MAP(COptAudio)
-	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
-	ON_CBN_SELCHANGE(IDC_DRIVER_LIST, OnSelchangeDriverList)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptAudio message handlers
-
-BOOL COptAudio::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_AudioSpin.SetBuddy(& m_AudioEdit);
-	m_SpinFPS.SetBuddy(& m_AudioDur);
-	m_SpinFPS.SetRange(0, 2000);
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceConfig.SetCheck(1);
-	} else {
-		m_ForceConfig.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
-	if (sOpt) {
-		m_AudioEdit.SetWindowText(sOpt);
-	} else {
-		m_AudioEdit.SetWindowText("2");
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
-	if (sOpt) {
-		m_AudioDur.SetWindowText(sOpt);
-	} else {
-		m_AudioDur.SetWindowText("120");
-	}
-
-	OnForceAudio();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
-	m_AudioResync.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableMultiChannel");
-	m_AudioMultiCH.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*driver enum*/
-	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DriverName");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_DriverList.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_DriverList.SetCurSel(select);
-
-	m_Notifs.ShowWindow(SW_HIDE);
-	if (sOpt && strstr(sOpt, "DirectSound")) m_Notifs.ShowWindow(SW_SHOW);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableNotification");
-	if (sOpt && !stricmp(sOpt, "yes"))
-		m_Notifs.SetCheck(1);
-	else
-		m_Notifs.SetCheck(0);
-
-	return TRUE;
-}
-
-
-void COptAudio::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str[50];
-
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableMultiChannel", m_AudioMultiCH.GetCheck() ? "yes" : "no");
-
-	m_AudioEdit.GetWindowText(str, 20);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
-	m_AudioDur.GetWindowText(str, 20);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
-
-	m_DriverList.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "DriverName", str);
-
-	if (strstr(str, "DirectSound")) {
-		gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableNotification", m_Notifs.GetCheck() ? "yes" : "no");
-	}
-
-}
-
-void COptAudio::OnForceAudio()
-{
-	BOOL en = m_ForceConfig.GetCheck();
-
-	m_AudioSpin.EnableWindow(en);
-	m_AudioEdit.EnableWindow(en);
-	m_SpinFPS.EnableWindow(en);
-	m_AudioDur.EnableWindow(en);
-}
-
-void COptAudio::OnSelchangeDriverList()
-{
-	char str[50];
-	m_DriverList.GetWindowText(str, 50);
-	if (strstr(str, "DirectSound")) {
-		m_Notifs.ShowWindow(SW_SHOW);
-	} else {
-		m_Notifs.ShowWindow(SW_HIDE);
-	}
-}
-
-
-
-
-COptFont::COptFont(CWnd* pParent /*=NULL*/)
-	: CDialog(COptFont::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptFont)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptFont::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptFont)
-	DDX_Control(pDX, IDC_TEXTURE_MODE, m_TextureModes);
-	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
-	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptFont, CDialog)
-	//{{AFX_MSG_MAP(COptFont)
-	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptFont message handlers
-
-BOOL COptFont::OnInitDialog()
-{
-	u32 i;
-	GF_BaseInterface *ifce;
-
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	/*video drivers enum*/
-	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "FontReader");
-	s32 to_sel = 0;
-	s32 select = 0;
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
-		m_Fonts.AddString(ifce->module_name);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Fonts.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "FontDirectory");
-	if (sOpt) m_BrowseFont.SetWindowText(sOpt);
-
-	/*text texturing modes*/
-	while (m_TextureModes.GetCount()) m_TextureModes.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
-	m_TextureModes.AddString("Default");
-	m_TextureModes.AddString("Never");
-	m_TextureModes.AddString("Always");
-	if (sOpt && !stricmp(sOpt, "3D")) m_TextureModes.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "Always")) m_TextureModes.SetCurSel(2);
-	else m_TextureModes.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-
-static char szCacheDir[MAX_PATH];
-
-static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
-{
-	char dir[MAX_PATH];
-	if (uMsg == BFFM_INITIALIZED) {
-		strcpy(dir, szCacheDir);
-		SendMessage(hwnd, BFFM_SETSELECTION, TRUE,(LPARAM) dir);
-	}
-	return 0;
-}
-
-void COptFont::OnBrowseFont()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dir[MAX_PATH];
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_BrowseFont.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select Font Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_BrowseFont.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-
-void COptFont::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	char str[MAX_PATH];
-
-	m_Fonts.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "FontEngine", "FontReader", str);
-	m_BrowseFont.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "FontEngine", "FontDirectory", str);
-	switch (m_TextureModes.GetCurSel()) {
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Always");
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Never");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Default");
-		break;
-	}
-}
-
-
-COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
-	: CDialog(COptHTTP::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptHTTP)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptHTTP::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptHTTP)
-	DDX_Control(pDX, IDC_HTTP_PROXY, m_ProxyName);
-	DDX_Control(pDX, IDC_HTTP_USE_PROXY, m_useProxy);
-	DDX_Control(pDX, IDC_SAX_DELAY, m_SAXDuration);
-	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
-	DDX_Control(pDX, IDC_RESTART_CACHE, m_DisableCache);
-	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
-	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
-	//{{AFX_MSG_MAP(COptHTTP)
-	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
-	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnSaxProgressive)
-	ON_BN_CLICKED(IDC_HTTP_USE_PROXY, OnUseProxy)
-	//}}AFX_MSG_MAP
-	ON_BN_CLICKED(IDC_RESTART_CACHE, &COptHTTP::OnBnClickedRestartCache)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptHTTP message handlers
-
-
-void COptHTTP::OnBrowseCache()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dir[MAX_PATH];
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select HTTP Cache Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_CacheDir.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-BOOL COptHTTP::OnInitDialog()
-{
-	char proxy[GF_MAX_PATH];
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "CacheDirectory");
-	if (sOpt) m_CacheDir.SetWindowText(sOpt);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Downloader", "CleanCache");
-	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Downloader", "DisableCache");
-	m_DisableCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
-	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	OnSaxProgressive();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
-	if (sOpt) {
-		m_SAXDuration.SetWindowText(sOpt);
-	} else {
-		m_SAXDuration.SetWindowText("0");
-	}
-	//if (m_Progressive.GetCheck()) m_SAXDuration.EnableWindow(1);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "HTTPProxy", "Enabled");
-	m_useProxy.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	OnUseProxy();
-	strcpy(proxy, "");
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "HTTPProxy", "Name");
-	if (sOpt) {
-		strcpy(proxy, sOpt);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "HTTPProxy", "Port");
-		if (sOpt) {
-			strcat(proxy, ":");
-			strcat(proxy, sOpt);
-		}
-	}
-	m_ProxyName.SetWindowText(proxy);
-	return TRUE;
-}
-
-void COptHTTP::OnSaxProgressive()
-{
-	if (m_Progressive.GetCheck()) {
-		m_SAXDuration.EnableWindow(1);
-	} else {
-		m_SAXDuration.EnableWindow(0);
-	}
-}
-
-
-void COptHTTP::OnUseProxy()
-{
-	if (m_useProxy.GetCheck()) {
-		m_ProxyName.EnableWindow(1);
-	} else {
-		m_ProxyName.EnableWindow(0);
-	}
-}
-
-void COptHTTP::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Downloader", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Downloader", "DisableCache", m_DisableCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
-
-	m_SAXDuration.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
-
-	gf_cfg_set_key(gpac->m_user.config, "HTTPProxy", "Enabled", m_useProxy.GetCheck() ? "yes" : "no");
-	m_ProxyName.GetWindowText(szCacheDir, MAX_PATH);
-	char *sep = strrchr(szCacheDir, ':');
-	if (sep) {
-		sep[0] = 0;
-		gf_cfg_set_key(gpac->m_user.config, "HTTPProxy", "Name", szCacheDir);
-		sep[0] = ':';
-		gf_cfg_set_key(gpac->m_user.config, "HTTPProxy", "Port", sep+1);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "HTTPProxy", "Name", szCacheDir);
-		gf_cfg_set_key(gpac->m_user.config, "HTTPProxy", "Port", NULL);
-	}
-	m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "General", "CacheDirectory", szCacheDir);
-}
-
-
-COptStream::COptStream(CWnd* pParent /*=NULL*/)
-	: CDialog(COptStream::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptStream::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptStream)
-	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
-	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
-	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
-	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
-	DDX_Control(pDX, IDC_REORDER, m_Reorder);
-	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
-	DDX_Control(pDX, IDC_PORT, m_Port);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptStream, CDialog)
-	//{{AFX_MSG_MAP(COptStream)
-	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
-	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
-	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
-	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
-	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptStream message handlers
-
-BOOL COptStream::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	while (m_Port.GetCount()) m_Port.DeleteString(0);
-	m_Port.AddString("554 (RTSP standard)");
-	m_Port.AddString("7070 (RTSP ext)");
-	m_Port.AddString("80 (RTSP / HTTP tunnel)");
-	m_Port.AddString("8080 (RTSP / HTTP tunnel)");
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = GF_FALSE;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_Port.SetCurSel(3);
-		force_rtsp = GF_TRUE;
-		break;
-	case 80:
-		m_Port.SetCurSel(2);
-		force_rtsp = GF_TRUE;
-		break;
-	case 7070:
-		m_Port.SetCurSel(1);
-		break;
-	default:
-		m_Port.SetCurSel(0);
-		break;
-	}
-
-	Bool use_rtsp = GF_FALSE;
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = GF_TRUE;
-
-	if (force_rtsp) {
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_UseRTSP.SetCheck(use_rtsp);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.EnableWindow(1);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
-		if (sOpt && !stricmp(sOpt, "0")) {
-			m_Reorder.SetCheck(0);
-		} else {
-			m_Reorder.SetCheck(1);
-		}
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
-	if (sOpt) {
-		m_Timeout.SetWindowText(sOpt);
-	} else {
-		m_Timeout.SetWindowText("30000");
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
-	if (sOpt) {
-		m_Buffer.SetWindowText(sOpt);
-	} else {
-		m_Buffer.SetWindowText("3000");
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		m_RebufferLen.SetWindowText(sOpt);
-		m_Rebuffer.SetCheck(1);
-		m_RebufferLen.EnableWindow(1);
-	} else {
-		m_RebufferLen.SetWindowText("0");
-		m_Rebuffer.SetCheck(0);
-		m_RebufferLen.EnableWindow(0);
-	}
-
-	return TRUE;
-}
-
-
-void COptStream::OnSelchangePort()
-{
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-	case 2:
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-		break;
-	case 1:
-	default:
-		m_UseRTSP.SetCheck(0);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-		break;
-	}
-}
-
-void COptStream::OnRtsp()
-{
-	if (m_UseRTSP.GetCheck()) {
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-	}
-
-}
-
-void COptStream::CheckRebuffer()
-{
-	char str[50];
-	s32 buf, rebuf;
-	m_Buffer.GetWindowText(str, 50);
-	buf = atoi(str);
-	m_RebufferLen.GetWindowText(str, 50);
-	rebuf = atoi(str);
-	if (rebuf*2 > buf) {
-		rebuf = buf/2;
-		sprintf(str, "%d", rebuf);
-		m_RebufferLen.SetWindowText(str);
-	}
-}
-
-void COptStream::OnRebuffer()
-{
-	if (!m_Rebuffer.GetCheck()) {
-		m_RebufferLen.EnableWindow(0);
-	} else {
-		m_RebufferLen.EnableWindow(1);
-		CheckRebuffer();
-	}
-}
-
-void COptStream::OnUpdateRebufferLen()
-{
-	CheckRebuffer();
-}
-
-void COptStream::OnUpdateBuffer()
-{
-	CheckRebuffer();
-}
-
-void COptStream::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	Bool force_rtsp = GF_FALSE;
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
-		force_rtsp = GF_TRUE;
-		break;
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
-		force_rtsp = GF_TRUE;
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
-		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
-	}
-
-	char str[50];
-
-	m_Timeout.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
-
-	m_Buffer.GetWindowText(str, 50);
-	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
-	if (m_Rebuffer.GetCheck()) {
-		m_RebufferLen.GetWindowText(str, 50);
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
-	}
-}
-
-
-
-
-COptMCache::COptMCache(CWnd* pParent /*=NULL*/)
-	: CDialog(COptMCache::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptMCache)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptMCache::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptMCache)
-	DDX_Control(pDX, IDC_BASEPRES, m_BaseName);
-	DDX_Control(pDX, IDC_MCACHE_USENAME, m_UseBase);
-	DDX_Control(pDX, IDC_MCACHE_OVERWRITE, m_Overwrite);
-	DDX_Control(pDX, IDC_BROWSE_MCACHE, m_RecDir);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptMCache, CDialog)
-	//{{AFX_MSG_MAP(COptMCache)
-	ON_BN_CLICKED(IDC_BROWSE_MCACHE, OnBrowseMcache)
-	ON_BN_CLICKED(IDC_MCACHE_USENAME, OnMcacheUsename)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptMCache message handlers
-
-void COptMCache::OnBrowseMcache()
-{
-	BROWSEINFO brw;
-	LPMALLOC pMalloc;
-	LPITEMIDLIST ret;
-	char dir[MAX_PATH];
-
-	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
-
-		m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
-
-		memset(&brw, 0, sizeof(BROWSEINFO));
-		brw.hwndOwner = this->GetSafeHwnd();
-		brw.pszDisplayName = dir;
-		brw.lpszTitle = "Select HTTP Cache Directory...";
-		brw.ulFlags = 0L;
-		brw.lpfn = LocCbck;
-
-		ret = SHBrowseForFolder(&brw);
-		if (ret != NULL) {
-			if (::SHGetPathFromIDList(ret, dir)) {
-				m_RecDir.SetWindowText(dir);
-			}
-			pMalloc->Free(ret);
-		}
-		pMalloc->Release();
-	}
-}
-
-BOOL COptMCache::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "RecordDirectory");
-	if (!sOpt) sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "CacheDirectory");
-	if (sOpt) m_RecDir.SetWindowText(sOpt);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles");
-	m_Overwrite.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "BaseFileName");
-	if (sOpt) {
-		m_UseBase.SetCheck(1);
-		m_BaseName.EnableWindow(TRUE);
-		m_BaseName.SetWindowText(sOpt);
-	} else {
-		m_UseBase.SetCheck(0);
-		m_BaseName.EnableWindow(FALSE);
-		m_BaseName.SetWindowText("uses service URL");
-	}
-	return TRUE;
-}
-
-void COptMCache::OnMcacheUsename()
-{
-	if (m_UseBase.GetCheck()) {
-		m_BaseName.EnableWindow(TRUE);
-		m_BaseName.SetWindowText("record");
-	} else {
-		m_BaseName.EnableWindow(FALSE);
-		m_BaseName.SetWindowText("uses service URL");
-	}
-}
-
-void COptMCache::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles", m_Overwrite.GetCheck() ? "no" : "yes");
-	if (m_UseBase.GetCheck()) {
-		m_BaseName.GetWindowText(szCacheDir, MAX_PATH);
-		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", szCacheDir);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", NULL);
-	}
-	m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
-	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "RecordDirectory", szCacheDir);
-}
-
-
-OptFiles::OptFiles(CWnd* pParent /*=NULL*/)
-	: CDialog(OptFiles::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(OptFiles)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void OptFiles::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(OptFiles)
-	DDX_Control(pDX, IDC_ASSOCIATE, m_DoAssociate);
-	DDX_Control(pDX, IDC_FILES_PLUG, m_PlugName);
-	DDX_Control(pDX, IDC_FILES_MIMES, m_mimes);
-	DDX_Control(pDX, IDC_FILES_EXT, m_extensions);
-	DDX_Control(pDX, IDC_FILELIST, m_FileDescs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(OptFiles, CDialog)
-	//{{AFX_MSG_MAP(OptFiles)
-	ON_CBN_SELCHANGE(IDC_FILELIST, OnSelchangeFilelist)
-	ON_BN_CLICKED(IDC_ASSOCIATE, OnAssociate)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// OptFiles message handlers
-
-BOOL OptFiles::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	Osmo4 *gpac = GetApp();
-	u32 count, i;
-
-	while (m_FileDescs.GetCount()) m_FileDescs.DeleteString(0);
-	count = gf_cfg_get_key_count(gpac->m_user.config, "MimeTypes");
-	for (i=0; i<count; i++) {
-		char *sMime, *sKey, sDesc[200];
-		const char *sOpt;
-		sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
-		if (!sOpt) continue;
-		sKey = (char *) strstr(sOpt, "\" \"");
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+3);
-		sKey = strchr(sDesc, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-		m_FileDescs.AddString(sDesc);
-	}
-	m_FileDescs.SetCurSel(0);
-	SetSelection(0);
-	return TRUE;
-}
-
-void OptFiles::OnSelchangeFilelist()
-{
-	SetSelection(m_FileDescs.GetCurSel());
-}
-
-void OptFiles::SetSelection(u32 sel)
-{
-	Osmo4 *gpac = GetApp();
-	char *sMime, *sKey, sDesc[200], sText[200];
-	sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", sel);
-	sprintf(sText, "Mime Type: %s", sMime);
-	m_mimes.SetWindowText(sText);
-	strcpy(cur_mime, sMime);
-	sMime = (char *) gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
-	strcpy(sDesc, sMime+1);
-	sKey = strchr(sDesc, '\"');
-	sKey[0] = 0;
-	sprintf(sText, "Extensions: %s", sDesc);
-	strcpy(cur_ext, sDesc);
-	m_extensions.SetWindowText(sText);
-	sKey = strrchr(sMime, '\"');
-	sprintf(sText, "Module: %s", sKey+2);
-	m_PlugName.SetWindowText(sText);
-
-	Bool has_asso, need_asso, go = GF_TRUE;
-	sKey = cur_ext;
-	need_asso = has_asso = GF_FALSE;
-
-	HKEY hKey;
-	DWORD dwSize;
-	while (go) {
-		Bool ok;
-		char szExt[50], szReg[60], c;
-		char *tmp = strchr(sKey, ' ');
-		if (!tmp) {
-			go = GF_FALSE;
-		}
-		else {
-			c = tmp[0];
-			tmp[0] = 0;
-		}
-		sprintf(szExt, ".%s", sKey);
-		sprintf(szReg, "GPAC\\%s", sKey);
-		if (tmp) {
-			tmp[0] = c;
-			tmp += 1;
-		}
-
-		if (RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey ) == ERROR_SUCCESS) {
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			if (ok && !stricmp((char *)sDesc, szReg)) has_asso = GF_TRUE;
-			else need_asso = GF_TRUE;
-		} else need_asso = GF_TRUE;
-		sKey = tmp;
-
-	}
-	m_DoAssociate.SetCheck(has_asso);
-	if (need_asso && has_asso)
-		OnAssociate();
-}
-
-
-void OptFiles::OnAssociate()
-{
-	char *sKey, sDesc[200];
-	unsigned char szApp[MAX_PATH];
-	unsigned char szIco[MAX_PATH];
-
-	strcpy((char *) szApp, GetApp()->szApplicationPath);
-	strcpy((char *) szIco, (const char *) szApp);
-	strcat((char *) szIco, "Osmo4.ico");
-	strcat((char *) szApp, "Osmo4.exe \"%L\"");
-
-	if (m_DoAssociate.GetCheck()) {
-		Bool go = GF_TRUE;
-		sKey = cur_ext;
-
-		HKEY hKey;
-		DWORD dwSize;
-		while (go) {
-			Bool ok;
-			char szExt[50], szReg[60], szOld[80], szPath[1024], c;
-			char *tmp = strchr(sKey, ' ');
-			if (!tmp) {
-				go = GF_FALSE;
-			}
-			else {
-				c = tmp[0];
-				tmp[0] = 0;
-			}
-			sprintf(szExt, ".%s", sKey);
-			sprintf(szReg, "GPAC\\%s", sKey);
-			if (tmp) {
-				tmp[0] = c;
-				tmp += 1;
-			}
-
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, 0, &hKey );
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			strcpy(szOld, "");
-			if (ok && stricmp((char *)sDesc, szReg)) strcpy(szOld, sDesc);
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\DefaultIcon");
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szIco, (DWORD) strlen((const char *) szIco)+1);
-			RegCloseKey(hKey);
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\Shell\\open\\command");
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, szApp, (DWORD) strlen((const char *) szApp)+1);
-			RegCloseKey(hKey);
-
-			if (strlen(szOld)) {
-				strcpy(szPath, szReg);
-				strcat(szPath, "\\Backup");
-				RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char *) szOld, (DWORD) strlen((const char *) szIco)+1);
-				RegCloseKey(hKey);
-			}
-
-			RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-			RegSetValueEx(hKey, "", 0, REG_SZ, (const unsigned char *) szReg, (DWORD) strlen(szReg)+1);
-			RegCloseKey(hKey);
-
-			sKey = tmp;
-		}
-	} else {
-		Bool go = GF_TRUE;
-		sKey = cur_ext;
-
-		HKEY hKey;
-		DWORD dwSize;
-		while (go) {
-			Bool ok;
-			char szExt[50], szReg[60], szPath[1024], c;
-			char *tmp = strchr(sKey, ' ');
-			if (!tmp) {
-				go = GF_FALSE;
-			}
-			else {
-				c = tmp[0];
-				tmp[0] = 0;
-			}
-			sprintf(szExt, ".%s", sKey);
-			sprintf(szReg, "GPAC\\%s", sKey);
-			if (tmp) {
-				tmp[0] = c;
-				tmp += 1;
-			}
-
-			strcpy(szPath, szReg);
-			strcat(szPath, "\\Backup");
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szPath, 0, 0, &hKey );
-			dwSize = 200;
-			ok = GF_TRUE;
-			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
-			RegCloseKey(hKey);
-			if (ok && strlen((char *)sDesc)) {
-				RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char*) sDesc, (DWORD) strlen((const char *) sDesc)+1);
-				RegCloseKey(hKey);
-			}
-
-			RegOpenKeyEx(HKEY_CLASSES_ROOT, szReg, 0, 0, &hKey );
-			RegDeleteKey(hKey, "Backup");
-			RegDeleteKey(hKey, "DefaultIcon");
-			RegDeleteKey(hKey, "Shell\\open\\command");
-			RegDeleteKey(hKey, "Shell\\open");
-			RegDeleteKey(hKey, "Shell");
-			RegCloseKey(hKey);
-			RegDeleteKey(HKEY_CLASSES_ROOT, szReg);
-
-			sKey = tmp;
-		}
-	}
-}
-
-COptLogs::COptLogs(CWnd* pParent /*=NULL*/)
-	: CDialog(COptLogs::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptLogs)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptLogs::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptLogs)
-	DDX_Control(pDX, IDC_TOOL_SYNC, m_sync);
-	DDX_Control(pDX, IDC_TOOL_SCRIPT, m_script);
-	DDX_Control(pDX, IDC_TOOL_SCENE, m_scene);
-	DDX_Control(pDX, IDC_TOOL_RTP, m_rtp);
-	DDX_Control(pDX, IDC_TOOL_RENDER, m_render);
-	DDX_Control(pDX, IDC_TOOL_PARSER, m_parser);
-	DDX_Control(pDX, IDC_TOOL_NET, m_net);
-	DDX_Control(pDX, IDC_TOOL_MMIO, m_mmio);
-	DDX_Control(pDX, IDC_TOOL_MEDIA, m_media);
-	DDX_Control(pDX, IDC_TOOL_CORE, m_core);
-	DDX_Control(pDX, IDC_TOOL_CONTAINER, m_container);
-	DDX_Control(pDX, IDC_TOOL_COMPOSE, m_compose);
-	DDX_Control(pDX, IDC_TOOL_CODING, m_coding);
-	DDX_Control(pDX, IDC_TOOL_CODEC, m_codec);
-	DDX_Control(pDX, IDC_TOOL_AUTHOR, m_author);
-	DDX_Control(pDX, IDC_LOG_LEVEL, m_Level);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptLogs, CDialog)
-	//{{AFX_MSG_MAP(COptLogs)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptLogs message handlers
-
-BOOL COptLogs::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-#if 0
-	Osmo4 *gpac = GetApp();
-	switch (gpac->m_log_level) {
-	case GF_LOG_ERROR:
-		m_Level.SetCurSel(1);
-		break;
-	case GF_LOG_WARNING:
-		m_Level.SetCurSel(2);
-		break;
-	case GF_LOG_INFO:
-		m_Level.SetCurSel(3);
-		break;
-	case GF_LOG_DEBUG:
-		m_Level.SetCurSel(4);
-		break;
-	default:
-		m_Level.SetCurSel(0);
-		break;
-	}
-
-	m_sync.SetCheck(gpac->m_log_tools & GF_LOG_SYNC);
-	m_script.SetCheck(gpac->m_log_tools & GF_LOG_SCRIPT);
-	m_scene.SetCheck(gpac->m_log_tools & GF_LOG_SCENE);
-	m_rtp.SetCheck(gpac->m_log_tools & GF_LOG_RTP);
-	m_render.SetCheck(gpac->m_log_tools & GF_LOG_COMPOSE);
-	m_parser.SetCheck(gpac->m_log_tools & GF_LOG_PARSER);
-	m_net.SetCheck(gpac->m_log_tools & GF_LOG_NETWORK);
-	m_mmio.SetCheck(gpac->m_log_tools & GF_LOG_MMIO);
-	m_media.SetCheck(gpac->m_log_tools & GF_LOG_MEDIA);
-	m_core.SetCheck(gpac->m_log_tools & GF_LOG_CORE);
-	m_container.SetCheck(gpac->m_log_tools & GF_LOG_CONTAINER);
-	m_compose.SetCheck(gpac->m_log_tools & GF_LOG_INTERACT);
-	m_coding.SetCheck(gpac->m_log_tools & GF_LOG_CODING);
-	m_codec.SetCheck(gpac->m_log_tools & GF_LOG_CODEC);
-	m_author.SetCheck(gpac->m_log_tools & GF_LOG_AUTHOR);
-#endif
-
-	return TRUE;
-}
-
-void COptLogs::SaveOptions()
-{
-	Osmo4 *gpac = GetApp();
-	CString str = "";
-	const char *level = "error";
-	u32 flags = 0;
-
-	switch (m_Level.GetCurSel()) {
-	case 1:
-		level = "error";
-		break;
-	case 2:
-		level = "warning";
-		break;
-	case 3:
-		level = "info";
-		break;
-	case 4:
-		level = "debug";
-		break;
-	default:
-		level = "none";
-		break;
-	}
-
-	if (m_sync.GetCheck()) {
-		str +="sync:";
-	}
-	if (m_script.GetCheck()) {
-		str +="script:";
-	}
-	if (m_scene.GetCheck()) {
-		str +="scene:";
-	}
-	if (m_rtp.GetCheck()) {
-		str +="rtp:";
-	}
-	if (m_render.GetCheck()) {
-		str +="compose:";
-	}
-	if (m_parser.GetCheck()) {
-		str +="parser:";
-	}
-	if (m_net.GetCheck()) {
-		str +="network:";
-	}
-	if (m_mmio.GetCheck()) {
-		str +="mmio:";
-	}
-	if (m_media.GetCheck()) {
-		str +="media:";
-	}
-	if (m_core.GetCheck()) {
-		str +="core:";
-	}
-	if (m_container.GetCheck()) {
-		str +="container:";
-	}
-	if (m_compose.GetCheck()) {
-		str +="interact:";
-	}
-	if (m_coding.GetCheck()) {
-		str +="coding:";
-	}
-	if (m_codec.GetCheck()) {
-		str +="codec:";
-	}
-	if (m_author.GetCheck()) {
-		str +="author:";
-	}
-
-	gf_cfg_set_key(gpac->m_user.config, "General", "Logs", str);
-	str += "@";
-	str += level;
-	gf_log_set_tools_levels(str);
-}
-
-void COptHTTP::OnBnClickedRestartCache()
-{
-	// TODO : ajoutez ici le code de votre gestionnaire de notification de contrôle
-}

gpac-0.8.0.tar.gz/applications/osmo4_w32/Osmo4.cpp Deleted

@@ -1,945 +0,0 @@
-// GPAC.cpp : Defines the class behaviors for the application.
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include <gpac/network.h>
-#include <direct.h>
-#include "MainFrm.h"
-#include "OpenUrl.h"
-#include "resource.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4
-
-BEGIN_MESSAGE_MAP(Osmo4, CWinApp)
-	//{{AFX_MSG_MAP(Osmo4)
-	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
-	ON_COMMAND(ID_FILE_STEP, OnFileStep)
-	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
-	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
-	ON_COMMAND(ID_CONFIG_RELOAD, OnConfigReload)
-	ON_COMMAND(ID_FILE_PLAY, OnFilePlay)
-	ON_UPDATE_COMMAND_UI(ID_FILE_PLAY, OnUpdateFilePlay)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STEP, OnUpdateFileStep)
-	ON_COMMAND(ID_FILE_STOP, OnFileStop)
-	ON_UPDATE_COMMAND_UI(ID_FILE_STOP, OnUpdateFileStop)
-	ON_COMMAND(ID_SWITCH_RENDER, OnSwitchRender)
-	ON_UPDATE_COMMAND_UI(ID_FILE_RELOAD, OnUpdateFileStop)
-	ON_COMMAND(ID_H_ABOUT, OnAbout)
-	ON_COMMAND(ID_FILE_MIGRATE, OnFileMigrate)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 construction
-
-Osmo4::Osmo4()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only Osmo4 object
-
-Osmo4 theApp;
-
-
-
-class UserPassDialog : public CDialog
-{
-// Construction
-public:
-	UserPassDialog(CWnd* pParent = NULL);   // standard constructor
-
-	Bool GetPassword(const char *site_url, char *user, char *password);
-
-// Dialog Data
-	//{{AFX_DATA(UserPassDialog)
-	enum { IDD = IDD_PASSWD };
-	CStatic	m_SiteURL;
-	CEdit m_User;
-	CEdit m_Pass;
-	//}}AFX_DATA
-
-	void SetSelection(u32 sel);
-	char cur_ext[200], cur_mime[200];
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(UserPassDialog)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	const char *m_site_url;
-	char *m_user, *m_password;
-
-	// Generated message map functions
-	//{{AFX_MSG(UserPassDialog)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnClose();
-	//}}AFX_MSG
-};
-
-UserPassDialog::UserPassDialog(CWnd* pParent /*=NULL*/)
-	: CDialog(UserPassDialog::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-void UserPassDialog::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(UserPassDialog)
-	DDX_Control(pDX, IDC_TXT_SITE, m_SiteURL);
-	DDX_Control(pDX, IDC_EDIT_USER, m_User);
-	DDX_Control(pDX, IDC_EDIT_PASSWORD, m_Pass);
-	//}}AFX_DATA_MAP
-}
-
-BOOL UserPassDialog::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	m_SiteURL.SetWindowText(m_site_url);
-	m_User.SetWindowText(m_user);
-	m_Pass.SetWindowText("");
-	return TRUE;
-}
-
-void UserPassDialog::OnClose()
-{
-	m_User.GetWindowText(m_user, 50);
-	m_Pass.GetWindowText(m_password, 50);
-}
-
-Bool UserPassDialog::GetPassword(const char *site_url, char *user, char *password)
-{
-	m_site_url = site_url;
-	m_user = user;
-	if (DoModal() != IDOK) return GF_FALSE;
-	return GF_TRUE;
-}
-
-
-static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
-{
-	if (!total) return;
-	CMainFrame *pFrame = (CMainFrame *) ((Osmo4 *) usr)->m_pMainWnd;
-	s32 prog = (s32) ( (100 * (u64)done) / total);
-	if (pFrame->m_last_prog < prog) {
-		pFrame->console_err = GF_OK;
-		pFrame->m_last_prog = prog;
-		pFrame->console_message.Format("%s %02d %%", title, prog);
-		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-		if (done==total) pFrame->m_last_prog = -1;
-	}
-}
-
-#define W32_MIN_WIDTH 120
-
-static void log_msg(char *msg)
-{
-	::MessageBox(NULL, msg, "GPAC", MB_OK);
-}
-Bool Osmo4_EventProc(void *priv, GF_Event *evt)
-{
-	u32 dur;
-	Osmo4 *gpac = (Osmo4 *) priv;
-	CMainFrame *pFrame = (CMainFrame *) gpac->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		dur = (u32) (1000 * evt->duration.duration);
-		//if (dur<1100) dur = 0;
-		pFrame->m_pPlayList->SetDuration((u32) evt->duration.duration );
-		gpac->max_duration = dur;
-		gpac->can_seek = evt->duration.can_seek;
-		if (!gpac->can_seek) {
-			pFrame->m_Sliders.m_PosSlider.EnableWindow(FALSE);
-		} else {
-			pFrame->m_Sliders.m_PosSlider.EnableWindow(TRUE);
-			pFrame->m_Sliders.m_PosSlider.SetRangeMin(0);
-			pFrame->m_Sliders.m_PosSlider.SetRangeMax(dur);
-		}
-		break;
-
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.service || !strcmp(evt->message.service, (LPCSTR) pFrame->m_pPlayList->GetURL() )) {
-			pFrame->console_service = "main service";
-		} else {
-			pFrame->console_service = evt->message.service;
-		}
-		if (evt->message.error!=GF_OK) {
-			if (evt->message.error<GF_OK || !gpac->m_NoConsole) {
-				pFrame->console_err = evt->message.error;
-				pFrame->console_message = evt->message.message;
-				gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
-
-				/*any error before connection confirm is a service connection error*/
-				if (!gpac->m_isopen) pFrame->m_pPlayList->SetDead();
-			}
-			return GF_FALSE;
-		}
-		if (gpac->m_NoConsole) return GF_FALSE;
-
-		/*process user message*/
-		pFrame->console_err = GF_OK;
-		pFrame->console_message = evt->message.message;
-		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
-		break;
-	case GF_EVENT_PROGRESS:
-		char *szType;
-		if (evt->progress.progress_type==0) szType = "Buffer ";
-		else if (evt->progress.progress_type==1) szType = "Download ";
-		else if (evt->progress.progress_type==2) szType = "Import ";
-		gf_set_progress(szType, evt->progress.done, evt->progress.total);
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		pFrame->console_message = evt->navigate.to_url;
-		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 1000, 0);
-		break;
-
-	case GF_EVENT_SCENE_SIZE:
-		if (evt->size.width && evt->size.height) {
-			gpac->orig_width = evt->size.width;
-			gpac->orig_height = evt->size.height;
-			if (gpac->m_term && !pFrame->m_bFullScreen)
-				pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
-		}
-		break;
-		/*don't resize on win32 msg notif*/
-#if 0
-	case GF_EVENT_SIZE:
-		if (/*gpac->m_term && !pFrame->m_bFullScreen && */gpac->orig_width && (evt->size.width < W32_MIN_WIDTH) )
-			pFrame->PostMessage(WM_SETSIZE, W32_MIN_WIDTH, (W32_MIN_WIDTH*gpac->orig_height) / gpac->orig_width);
-		else
-			pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
-		break;
-#endif
-
-	case GF_EVENT_CONNECT:
-//		if (pFrame->m_bStartupFile) return 0;
-
-		pFrame->BuildStreamList(GF_TRUE);
-		if (evt->connect.is_connected) {
-			pFrame->BuildChapterList(GF_FALSE);
-			gpac->m_isopen = GF_TRUE;
-			//resetting sliders when opening a new file creates a deadlock on the window thread which is disconnecting
-			pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, gpac->m_isopen ? 4 : 3);
-			pFrame->m_Sliders.m_PosSlider.SetPos(0);
-			pFrame->SetProgTimer(GF_TRUE);
-		} else {
-			gpac->max_duration = 0;
-			gpac->m_isopen = GF_FALSE;
-			pFrame->BuildChapterList(GF_TRUE);
-		}
-		if (!pFrame->m_bFullScreen) {
-			pFrame->SetFocus();
-			pFrame->SetForegroundWindow();
-		}
-		break;
-
-	case GF_EVENT_QUIT:
-		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
-		break;
-	case GF_EVENT_MIGRATE:
-	{
-	}
-	break;
-	case GF_EVENT_KEYDOWN:
-		gf_term_process_shortcut(gpac->m_term, evt);
-		/*update volume control*/
-		pFrame->m_Sliders.SetVolume();
-
-		switch (evt->key.key_code) {
-		case GF_KEY_HOME:
-			gf_term_set_option(gpac->m_term, GF_OPT_NAVIGATION_TYPE, 1);
-			break;
-		case GF_KEY_ESCAPE:
-			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-			break;
-		case GF_KEY_MEDIANEXTTRACK:
-			pFrame->m_pPlayList->PlayNext();
-			break;
-		case GF_KEY_MEDIAPREVIOUSTRACK:
-			pFrame->m_pPlayList->PlayPrev();
-			break;
-		case GF_KEY_H:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, GF_TRUE);
-			break;
-		case GF_KEY_L:
-			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
-				gf_term_switch_quality(gpac->m_term, GF_FALSE);
-			break;
-		case GF_KEY_LEFT:
-		case GF_KEY_RIGHT:
-			if (gpac->m_isopen && (gf_term_get_option(gpac->m_term, GF_OPT_NAVIGATION) == GF_NAVIGATE_NONE)) {
-				if (evt->key.flags & GF_KEY_MOD_CTRL) {
-					if (evt->key.key_code==GF_KEY_LEFT) pFrame->m_pPlayList->PlayPrev();
-					else if (evt->key.key_code==GF_KEY_RIGHT) pFrame->m_pPlayList->PlayNext();
-				}
-				else if (gpac->can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
-					u32 duration = gpac->max_duration;
-					s32 current_time = gf_term_get_time_in_ms(gpac->m_term);
-
-					if (evt->key.key_code==GF_KEY_LEFT) {
-						current_time -= 5*duration/100;
-						if (current_time<0) current_time=0;
-						gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
-					}
-					else if (evt->key.key_code==GF_KEY_RIGHT) {
-						current_time += 5*duration/100;
-						if ((u32) current_time < duration) {
-							gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
-						}
-					}
-				}
-			}
-			break;
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		/*fixme - a proper browser would require checking mime type & co*/
-		/*store URL since it may be destroyed, and post message*/
-		gpac->m_navigate_url = evt->navigate.to_url;
-		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
-		return GF_TRUE;
-	case GF_EVENT_VIEWPOINTS:
-		pFrame->BuildViewList();
-		return GF_FALSE;
-	case GF_EVENT_STREAMLIST:
-		pFrame->BuildStreamList(GF_FALSE);
-		return GF_FALSE;
-	case GF_EVENT_SET_CAPTION:
-		pFrame->SetWindowText(evt->caption.caption);
-		break;
-	case GF_EVENT_DBLCLICK:
-		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-		return GF_FALSE;
-	case GF_EVENT_AUTHORIZATION:
-	{
-		UserPassDialog passdlg;
-		return passdlg.GetPassword(evt->auth.site_url, evt->auth.user, evt->auth.password);
-	}
-	}
-	return GF_FALSE;
-}
-
-
-/*here's the trick: use a storage section shared among all processes for the wnd handle and for the command line
-NOTE: this has to be static memory of course, don't try to alloc anything there...*/
-#pragma comment(linker, "/SECTION:.shr,RWS")
-#pragma data_seg(".shr")
-HWND static_gpac_hwnd = NULL;
-char static_szCmdLine[MAX_PATH] = "";
-#pragma data_seg()
-
-const char *static_gpac_get_url()
-{
-	return (const char *) static_szCmdLine;
-}
-
-static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-BOOL Osmo4::InitInstance()
-{
-	CCommandLineInfo cmdInfo;
-
-	afxAmbientActCtx = FALSE;
-
-	m_logs = NULL;
-
-	m_term = NULL;
-
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*get Osmo4.exe path*/
-	strcpy((char *) szApplicationPath, AfxGetApp()->m_pszHelpFilePath);
-	while (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') szApplicationPath[strlen((char *) szApplicationPath)-1] = 0;
-	if (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') strcat(szApplicationPath, "\\");
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	/*setup user*/
-	memset(&m_user, 0, sizeof(GF_User));
-
-	Bool first_launch = GF_FALSE;
-	/*init config and modules*/
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-	if (!m_user.config) {
-		MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-
-	char *name = gf_cfg_get_filename(m_user.config);
-	char *sep = strrchr(name, '\\');
-	if (sep) sep[0] = 0;
-	strcpy(szUserPath, name);
-	if (sep) sep[0] = '\\';
-	gf_free(name);
-
-	const char *opt = gf_cfg_get_key(m_user.config, "General", "SingleInstance");
-	m_SingleInstance = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	m_hMutex = NULL;
-	if (m_SingleInstance) {
-		m_hMutex = CreateMutex(NULL, FALSE, "Osmo4_GPAC_INSTANCE");
-		if ( GetLastError() == ERROR_ALREADY_EXISTS ) {
-			char szDIR[1024];
-			if (m_hMutex) CloseHandle(m_hMutex);
-			m_hMutex = NULL;
-
-			if (!static_gpac_hwnd || !IsWindow(static_gpac_hwnd) ) {
-				::MessageBox(NULL, "Osmo4 ghost process detected", "Error at last shutdown" , MB_OK);
-			} else {
-				::SetForegroundWindow(static_gpac_hwnd);
-
-				if (m_lpCmdLine && strlen(m_lpCmdLine)) {
-					DWORD_PTR res;
-					size_t len;
-					char *the_url, *cmd;
-					GetCurrentDirectory(1024, szDIR);
-					if (szDIR[strlen(szDIR)-1] != '\\') strcat(szDIR, "\\");
-					cmd = (char *)(const char *) m_lpCmdLine;
-					strcpy(static_szCmdLine, "");
-					if (cmd[0]=='"') cmd+=1;
-
-					if (!strnicmp(cmd, "-queue ", 7)) {
-						strcat(static_szCmdLine, "-queue ");
-						cmd += 7;
-					}
-					the_url = gf_url_concatenate(szDIR, cmd);
-					if (!the_url) {
-						strcat(static_szCmdLine, cmd);
-					} else {
-						strcat(static_szCmdLine, the_url);
-						gf_free(the_url);
-					}
-					while ( (len = strlen(static_szCmdLine)) ) {
-						char s = static_szCmdLine[len-1];
-						if ((s==' ') || (s=='"')) static_szCmdLine[len-1]=0;
-						else break;
-					}
-					::SendMessageTimeout(static_gpac_hwnd, WM_NEWINSTANCE, 0, 0, 0, 1000, &res);
-				}
-			}
-
-			return FALSE;
-		}
-	}
-
-#if 0
-	// Standard initialization
-#ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
-#else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
-#endif
-
-#endif
-
-	SetRegistryKey(_T("GPAC"));
-	CMainFrame* pFrame = new CMainFrame;
-	m_pMainWnd = pFrame;
-	pFrame->LoadFrame(IDR_MAINFRAME, WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL, NULL);
-	pFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_MAINACCEL));
-
-	m_pMainWnd->DragAcceptFiles();
-
-	if (m_SingleInstance) static_gpac_hwnd = m_pMainWnd->m_hWnd;
-
-	m_user.modules = gf_modules_new(NULL, m_user.config);
-	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
-		MessageBox(NULL, "No modules available - system cannot work", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-	else if (first_launch) {
-		/*first launch, register all files ext*/
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		/*set some shortcuts*/
-		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeUp", "ctrl+Up");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeDown", "ctrl+Down");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "FastRewind", "ctrl+Left");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "FastForward", "ctrl+Right");
-		gf_cfg_set_key(m_user.config, "Shortcuts", "Play", "ctrl+ ");
-	}
-
-	/*check log file*/
-	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
-	if (str) {
-		m_logs = gf_fopen(str, "wt");
-		gf_log_set_callback(m_logs, osmo4_do_log);
-	}
-	else m_logs = NULL;
-
-	/*set log level*/
-	if (gf_log_set_tools_levels(gf_cfg_get_key(m_user.config, "General", "Logs")) != GF_OK)
-		fprintf(stdout, "osmo4: invalid log level specified\n");
-
-	m_user.opaque = this;
-	m_user.os_window_handler = pFrame->m_pWndView->m_hWnd;
-	m_user.EventProc = Osmo4_EventProc;
-
-	m_reset = GF_FALSE;
-	orig_width = 320;
-	orig_height = 240;
-
-	gf_set_progress_callback(this, Osmo4_progress_cbk);
-
-	m_term = gf_term_new(&m_user);
-	if (! m_term) {
-		MessageBox(NULL, "Cannot load GPAC Terminal", "Fatal Error", MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-		return TRUE;
-	}
-	SetOptions();
-	UpdateRenderSwitch();
-
-	pFrame->SendMessage(WM_SETSIZE, orig_width, orig_height);
-	pFrame->m_Address.ReloadURLs();
-
-	pFrame->m_Sliders.SetVolume();
-
-	m_reconnect_time = 0;
-
-
-	ParseCommandLine(cmdInfo);
-
-	start_mode = 0;
-
-	if (! cmdInfo.m_strFileName.IsEmpty()) {
-		pFrame->m_pPlayList->QueueURL(cmdInfo.m_strFileName);
-		pFrame->m_pPlayList->RefreshList();
-		pFrame->m_pPlayList->PlayNext();
-	} else {
-		char sPL[MAX_PATH];
-		strcpy((char *) sPL, szUserPath);
-		strcat(sPL, "gpac_pl.m3u");
-		pFrame->m_pPlayList->OpenPlayList(sPL);
-		const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "PLEntry");
-		if (sOpt) {
-			s32 count = (s32)gf_list_count(pFrame->m_pPlayList->m_entries);
-			pFrame->m_pPlayList->m_cur_entry = atoi(sOpt);
-			if (pFrame->m_pPlayList->m_cur_entry>=count)
-				pFrame->m_pPlayList->m_cur_entry = count-1;
-		} else {
-			pFrame->m_pPlayList->m_cur_entry = -1;
-		}
-#if 0
-		if (pFrame->m_pPlayList->m_cur_entry>=0) {
-			start_mode = 1;
-			pFrame->m_pPlayList->Play();
-		}
-#endif
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (sOpt && !strstr(sOpt, "gui") ) gf_term_connect(m_term, sOpt);
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "PlaylistLoop");
-		m_Loop = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	}
-	pFrame->SetFocus();
-	pFrame->SetForegroundWindow();
-	return TRUE;
-}
-
-int Osmo4::ExitInstance()
-{
-	if (m_term) gf_term_del(m_term);
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	if (m_user.config) gf_cfg_del(m_user.config);
-	gf_sys_close();
-	/*last instance*/
-	if (m_hMutex) {
-		CloseHandle(m_hMutex);
-		static_gpac_hwnd = NULL;
-	}
-	if (m_logs) gf_fclose(m_logs);
-	return CWinApp::ExitInstance();
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 message handlers
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CAboutDlg dialog used for App About
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-// Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	//{{AFX_MSG(CAboutDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnGogpac();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-	ON_BN_CLICKED(IDC_GOGPAC, OnGogpac)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-void Osmo4::OnAbout()
-{
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
-}
-
-BOOL CAboutDlg::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	CString str = "GPAC/Osmo4 - version " GPAC_FULL_VERSION;
-	SetWindowText(str);
-	return TRUE;
-}
-
-void CAboutDlg::OnGogpac()
-{
-	ShellExecute(NULL, "open", "http://gpac.sourceforge.net", NULL, NULL, SW_SHOWNORMAL);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Osmo4 message handlers
-
-
-void Osmo4::SetOptions()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
-	m_LookForSubtitles = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
-	m_NoConsole = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "ViewXMT");
-	m_ViewXMTA  = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
-	m_NoMimeFetch = (!sOpt || !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-}
-
-
-void Osmo4::OnOpenUrl()
-{
-	COpenUrl url;
-	if (url.DoModal() != IDOK) return;
-
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-	pFrame->m_pPlayList->Truncate();
-	pFrame->m_pPlayList->QueueURL(url.m_url);
-	pFrame->m_pPlayList->RefreshList();
-	pFrame->m_pPlayList->PlayNext();
-}
-
-
-CString Osmo4::GetFileFilter()
-{
-	u32 keyCount, i;
-	CString sFiles;
-	CString sExts;
-	CString supportedFiles;
-
-	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
-	supportedFiles = "All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2";
-
-	sExts = "";
-	sFiles = "";
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		const char *sMime;
-		Bool first;
-		char *sKey;
-		const char *opt;
-		char szKeyList[1000], sDesc[1000];
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		CString sOpt;
-		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove module name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey[0] = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find(sDesc)>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find(szKeyList)>=0) continue;
-
-		sExts += szKeyList;
-		sExts += " ";
-		sFiles += sDesc;
-		sFiles += "|";
-
-		first = GF_TRUE;
-
-		sOpt = CString(szKeyList);
-		while (1) {
-
-			int pos = sOpt.Find(' ');
-			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
-			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
-			if (ext.Find(".")<0) {
-				if (!first) {
-					sFiles += ";";
-				} else {
-					first = GF_FALSE;
-				}
-				sFiles += "*.";
-				sFiles += ext;
-
-				CString sext = ext;
-				sext += ";";
-				if (supportedFiles.Find(sext)<0) {
-					supportedFiles += ";*.";
-					supportedFiles += ext;
-				}
-			}
-
-			if (sOpt==ext) break;
-			CString rem;
-			rem.Format("%s ", (LPCTSTR) ext);
-			sOpt.Replace((LPCTSTR) rem, "");
-		}
-		sFiles += "|";
-	}
-	supportedFiles += "|";
-	supportedFiles += sFiles;
-	supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
-	return supportedFiles;
-}
-
-void Osmo4::OnOpenFile()
-{
-	CString sFiles = GetFileFilter();
-	u32 nb_items;
-
-	/*looks like there's a bug here, main filter isn't used correctly while the others are*/
-	CFileDialog fd(TRUE,NULL,NULL, OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST , sFiles);
-	fd.m_ofn.nMaxFile = 25000;
-	fd.m_ofn.lpstrFile = (char *) gf_malloc(sizeof(char) * fd.m_ofn.nMaxFile);
-	fd.m_ofn.lpstrFile[0] = 0;
-
-	if (fd.DoModal()!=IDOK) {
-		gf_free(fd.m_ofn.lpstrFile);
-		return;
-	}
-
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-
-	nb_items = 0;
-	POSITION pos = fd.GetStartPosition();
-	while (pos) {
-		CString file = fd.GetNextPathName(pos);
-		nb_items++;
-	}
-	/*if several items, act as playlist (replace playlist), otherwise as browser (lost all "next" context)*/
-	if (nb_items==1)
-		pFrame->m_pPlayList->Truncate();
-	else
-		pFrame->m_pPlayList->Clear();
-
-	pos = fd.GetStartPosition();
-	while (pos) {
-		CString file = fd.GetNextPathName(pos);
-		pFrame->m_pPlayList->QueueURL(file);
-	}
-	gf_free(fd.m_ofn.lpstrFile);
-	pFrame->m_pPlayList->RefreshList();
-	pFrame->m_pPlayList->PlayNext();
-}
-
-
-void Osmo4::Pause()
-{
-	if (!m_isopen) return;
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) ? GF_STATE_PAUSED : GF_STATE_PLAYING);
-}
-
-void Osmo4::OnMainPause()
-{
-	Pause();
-}
-
-void Osmo4::OnFileStep()
-{
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-}
-void Osmo4::OnUpdateFileStep(CCmdUI* pCmdUI)
-{
-	pCmdUI->Enable(m_isopen && !m_reset);
-}
-
-void Osmo4::PlayFromTime(u32 time)
-{
-	Bool do_pause;
-	if (start_mode==1) do_pause = GF_TRUE;
-	else if (start_mode==2) do_pause = GF_FALSE;
-	else do_pause = /*!m_AutoPlay*/GF_FALSE;
-	gf_term_play_from_time(m_term, time, do_pause);
-	m_reset = GF_FALSE;
-}
-
-
-void Osmo4::OnFileReload()
-{
-	gf_term_disconnect(m_term);
-	m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void Osmo4::OnFileMigrate()
-{
-}
-
-void Osmo4::OnConfigReload()
-{
-	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void Osmo4::UpdatePlayButton(Bool force_play)
-{
-	if (!force_play && gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 4);
-	} else {
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-	}
-}
-
-void Osmo4::OnFilePlay()
-{
-	if (m_isopen) {
-		if (m_reset) {
-			m_reset = GF_FALSE;
-			PlayFromTime(0);
-			((CMainFrame *)m_pMainWnd)->SetProgTimer(GF_TRUE);
-		} else {
-			Pause();
-		}
-		UpdatePlayButton();
-	} else {
-		((CMainFrame *) m_pMainWnd)->m_pPlayList->Play();
-	}
-}
-
-void Osmo4::OnUpdateFilePlay(CCmdUI* pCmdUI)
-{
-	if (m_isopen) {
-		pCmdUI->Enable(TRUE);
-		if (pCmdUI->m_nID==ID_FILE_PLAY) {
-			if (!m_isopen) {
-				pCmdUI->SetText("Play/Pause\tCtrl+P");
-			} else if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-				pCmdUI->SetText("Pause\tCtrl+P");
-			} else {
-				pCmdUI->SetText("Resume\tCtrl+P");
-			}
-		}
-	} else {
-		pCmdUI->Enable(((CMainFrame *)m_pMainWnd)->m_pPlayList->HasValidEntries() );
-		pCmdUI->SetText("Play\tCtrl+P");
-	}
-}
-
-void Osmo4::OnFileStop()
-{
-	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
-	if (m_reset) return;
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) Pause();
-	m_reset = GF_TRUE;
-	pFrame->m_Sliders.m_PosSlider.SetPos(0);
-	pFrame->SetProgTimer(GF_FALSE);
-	pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
-	start_mode = 2;
-}
-
-void Osmo4::OnUpdateFileStop(CCmdUI* pCmdUI)
-{
-//	pCmdUI->Enable(m_isopen);
-}
-
-void Osmo4::OnSwitchRender()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
-	Bool use_gl = (opt && !stricmp(opt, "always")) ? GF_TRUE : GF_FALSE;
-	gf_cfg_set_key(m_user.config, "Compositor", "OpenGLMode", use_gl ? "disable" : "always");
-
-	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
-
-	UpdateRenderSwitch();
-}
-
-void Osmo4::UpdateRenderSwitch()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
-	if (opt && !stricmp(opt, "disable"))
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 10);
-	else
-		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 9);
-}

gpac-0.8.0.tar.gz/applications/osmo4_w32/Osmo4.rc Deleted

@@ -1,885 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MAINFRAME MENU
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
-        MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
-        MENUITEM SEPARATOR
-        MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
-        POPUP "Streaming Cache"
-        BEGIN
-            MENUITEM "&Enable",                     ID_REC_ENABLE
-            MENUITEM "&Stop and Save",              ID_REC_STOP
-            MENUITEM "&Abort",                      ID_REC_ABORT
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Copy",                        ID_FILE_COPY
-        MENUITEM "Paste",                       ID_FILE_PASTE
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ID_FILE_EXIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Viewpoint"
-        BEGIN
-            MENUITEM "",                            ID_VIEWPORT_EMPTY
-        END
-        POPUP "&Navigation"
-        BEGIN
-            MENUITEM "Headlight",                   ID_HEADLIGHT
-            MENUITEM SEPARATOR
-            MENUITEM "&None",                       ID_NAVIGATE_NONE
-            MENUITEM "&Walk",                       ID_NAVIGATE_WALK
-            MENUITEM "&Fly",                        ID_NAVIGATE_FLY
-            MENUITEM "&Examine",                    ID_NAVIGATE_EXAM
-            MENUITEM "&Pan",                        ID_NAVIGATE_PAN
-            MENUITEM "&Slide",                      ID_NAVIGATE_SLIDE
-            MENUITEM "&Orbit",                      ID_NAVIGATE_ORBIT
-            MENUITEM "&VR",                         ID_NAVIGATE_VR
-            MENUITEM "&Game",                       ID_NAVIGATE_GAME
-            MENUITEM SEPARATOR
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Off",                         ID_COLLIDE_NONE
-                MENUITEM "Regular",                     ID_COLLIDE_REG
-                MENUITEM "Displacement",                ID_COLLIDE_DISP
-            END
-            MENUITEM "Gravity",                     ID_GRAVITY
-            MENUITEM SEPARATOR
-            MENUITEM "&Reset",                      ID_NAV_RESET
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&Fullscreen",                 ID_VIEW_FULLSCREEN
-        MENUITEM "Original &Aspect",            ID_VIEW_ORIGINAL
-        POPUP "Aspect &Ratio"
-        BEGIN
-            MENUITEM "&Keep Original",              ID_AR_KEEP
-            MENUITEM "&Fill Screen",                ID_AR_FILL
-            MENUITEM "Ratio 4/3",                   ID_AR_43
-            MENUITEM "Ratio 16/9",                  ID_AR_169
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Resource Usage",              ID_VIEW_CPU
-        MENUITEM SEPARATOR
-        MENUITEM "&Options",                    IDD_CONFIGURE
-    END
-    POPUP "Play"
-    BEGIN
-        POPUP "Stream &Selection"
-        BEGIN
-            POPUP "Audio"
-            BEGIN
-                MENUITEM "",                            ID_AUDIO_EMPTY
-            END
-            POPUP "Video"
-            BEGIN
-                MENUITEM "",                            ID_VIDEO_EMPTY
-            END
-            POPUP "Subtitle"
-            BEGIN
-                MENUITEM "",                            ID_SUBS_EMPTY
-            END
-            MENUITEM SEPARATOR
-            MENUITEM "Add Subtitle",                ID_ADD_SUBTITLE
-        END
-        POPUP "&Chapters"
-        BEGIN
-            MENUITEM "",                            ID_SETCHAP_FIRST
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
-        MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
-        MENUITEM SEPARATOR
-        MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
-        MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
-        MENUITEM "Stop",                        ID_FILE_STOP
-        MENUITEM SEPARATOR
-        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
-        MENUITEM SEPARATOR
-        MENUITEM "Clear History",               ID_CLEAR_NAV
-        MENUITEM "Reload Config",               ID_CONFIG_RELOAD
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Shortcut List",               ID_SHORTCUTS
-        MENUITEM "Navigation Keys",             ID_NAV_INFO
-        MENUITEM SEPARATOR
-        MENUITEM "&About ...",                  ID_H_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 209, 137
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CLIENTEDGE
-CAPTION "Osmo4 / GPAC version X.X.X"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
-    CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
-    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
-    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
-    PUSHBUTTON      "http://gpac.sourceforge.net",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
-    GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
-    CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
-END
-
-IDD_PASSWD DIALOG 0, 0, 134, 71
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter user name and password"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,4,56,50,12
-    PUSHBUTTON      "Cancel",IDCANCEL,80,56,50,12
-    LTEXT           "Static__________________________",IDC_TXT_SITE,25,4,105,8
-    LTEXT           "Login",IDC_STATIC,7,21,18,8
-    LTEXT           "Password",IDC_STATIC,7,37,32,8
-    EDITTEXT        IDC_EDIT_USER,47,18,55,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_PASSWORD,47,34,55,14,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Site",IDC_STATIC,7,4,13,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Osmo4-GPAC"
-		VALUE "FileVersion", "0.8.0"
-            VALUE "InternalName", "Osmo4"
-            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
-            VALUE "OriginalFilename", "Osmo4.EXE"
-            VALUE "ProductName", "Osmo4-GPAC"
-		VALUE "ProductVersion", "0.8.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 136
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINTOOLS TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_OPEN_FILE
-    BUTTON      ID_NAV_PREV
-    BUTTON      ID_NAV_NEXT
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_PLAY
-    BUTTON      ID_FILE_STEP
-    BUTTON      ID_FILE_STOP
-    BUTTON      ID_FILE_PROPS
-    BUTTON      IDD_CONFIGURE
-    BUTTON      ID_SWITCH_RENDER
-    BUTTON      ID_SWITCH_RENDER
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINTOOLS           BITMAP                  "res\\maintool.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE
-BEGIN
-    IDR_MAINFRAME           "Osmo4"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_APP_TITLE       "Osmo4"
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
-    ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
-    ID_PLAYLIST_LOOP        "Restarts playlist from beginning when playlist is over"
-    ID_OPEN_FILE             "Opens local file"
-    ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCSIZE          "Change the window size"
-    AFX_IDS_SCMOVE          "Change the window position"
-    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
-    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
-    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
-    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE
-BEGIN
-    AFX_IDS_SCRESTORE       "Restore the window to normal size"
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_STOP            "Stops current presentation"
-    ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
-    ID_COLLIDE_NONE         "Turns collision detection off"
-    ID_COLLIDE_REG          "Turns collision detection on"
-    ID_COLLIDE_DISP         "Collision with camera displacement"
-    ID_HEADLIGHT            "Turns headlight on/off"
-END
-
-STRINGTABLE
-BEGIN
-    ID_CLEAR_NAV            "Clears navigation history"
-    ID_TIMER                " "
-    ID_FPS                  " "
-    ID_VIEW_PL              "View navigation history as a playlist"
-END
-
-STRINGTABLE
-BEGIN
-    ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
-    ID_AR_KEEP              "Keep Aspect Ratio of presentation"
-    ID_SHORTCUTS            "List of available shortcuts"
-    ID_FILE_PROP            "Show presentation properties"
-    ID_FILE_STEP            "Step one frame into presentation"
-    IDD_CONFIGURE           "Configure Player"
-    ID_VIEW_SCALABLE        "Uses vectorial zooming when resizing the window"
-    ID_OPEN_URL             "Open remote presentation"
-    ID_FILE_RELOAD          "Reload current presentation"
-    ID_FILE_PLAY            "Play/Pause presentation"
-    ID_NAVIGATE_NONE        "Disable navigation"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_WALK        "Turn walk navigation on"
-    ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
-    ID_AR_43                "Forces Aspect Ratio of 4/3"
-    ID_AR_169               "Forces Aspect Ratio of 16/9"
-    ID_NAV_RESET            "Restore last viewpoint"
-END
-
-STRINGTABLE
-BEGIN
-    ID_NAVIGATE_VR          "QT-VR like navigation"
-    ID_REC_ENABLE           "Enable recording of streaming data"
-    ID_REC_STOP             "Stops recording and save to file"
-    ID_REC_ABORT            "Stops recording and discard data"
-END
-
-STRINGTABLE
-BEGIN
-    ID_FILE_COPY            "Copy selected text to clipboard"
-    ID_FILE_PASTE           "Paste clipboard"
-END
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// French (France) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_OPENFILE DIALOG 0, 0, 301, 23
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select Location"
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_COMBOURL,3,5,273,67,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
-END
-
-IDD_OPTIONS DIALOG 0, 0, 174, 106
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Osmo4 Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "Apply",IDC_SAVEOPT,147,2,26,12
-    COMBOBOX        IDC_SELECT,42,2,99,173,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Category",IDC_STATIC,7,4,29,8
-END
-
-IDD_OPT_GEN DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Loop At End",IDC_LOOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,4,55,10
-    CONTROL         "Look for subtitles",IDC_LOOKFORSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,69,10
-    CONTROL         "Disable console messages",IDC_NO_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,17,99,10
-    CONTROL         "View Graph in XMT-A format",IDC_DUMP_XMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,30,105,10
-    CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
-END
-
-IDD_OPT_RENDER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Rendering Frame Rate",IDC_STATIC,5,4,72,8
-    COMBOBOX        IDC_BIFS_RATE,81,2,84,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,49,64,10
-    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,49,72,10
-    LTEXT           "Anti-Aliasing Level",IDC_STATIC,7,20,58,8
-    COMBOBOX        IDC_AA_LIST,81,17,84,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Use 3D Renderer",IDC_USE_RENDER3D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,71,10
-    LTEXT           "2D Rasterizer",IDC_STATIC,7,35,44,8
-    COMBOBOX        IDC_GD_LIST,81,33,84,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_DRAW_BOUNDS,109,60,56,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Bounds",IDC_STATIC,82,64,25,8
-END
-
-IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,27,15,11,14
-    EDITTEXT        IDC_EDIT_AUDIO,5,15,19,14,ES_READONLY | ES_NUMBER
-    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,3,73,10
-    LTEXT           "buffers",IDC_STATIC,43,18,23,8
-    CONTROL         "Spin1",IDC_SPIN_FPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,104,15,11,14
-    EDITTEXT        IDC_AUDIO_FPS,77,15,24,14,ES_NUMBER
-    LTEXT           "Audio Driver",IDC_STATIC,7,63,40,8
-    CONTROL         "No Resynchronization",IDC_AUDIO_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,82,10
-    COMBOBOX        IDC_DRIVER_LIST,63,60,103,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Disable Notifications",IDC_AUDIO_NOTIFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,47,79,10
-    CONTROL         "Disable Multichannel",IDC_AUDIO_MULTICH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,34,81,10
-    LTEXT           "ms total length",IDC_STATIC,118,18,49,8
-END
-
-IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Video Driver",IDC_STATIC,6,7,40,8
-    COMBOBOX        IDC_VIDEO_LIST,55,5,111,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Change video resolution in fullscreen",IDC_SWITCH_RES,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,29,131,10
-    CONTROL         "Use Hardware Video Memory in 2D mode",IDC_HWMEMORY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,44,143,10
-END
-
-IDD_OPT_HTTP DIALOGEX 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_CACHE,57,4,109,12
-    CONTROL         "Clean cache at exit",IDC_CLEAN_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,23,77,10
-    CONTROL         "Disable Cache",IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,22,62,10
-    LTEXT           "Cache Directory",IDC_STATIC,5,5,52,8
-    CONTROL         "XML progressive load",IDC_SAX_PROGRESSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,42,84,10
-    EDITTEXT        IDC_SAX_DELAY,142,41,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "TimeSlice (ms)",IDC_STATIC,91,43,46,8
-    EDITTEXT        IDC_HTTP_PROXY,54,58,111,12,ES_AUTOHSCROLL
-    CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
-END
-
-IDD_OPT_FONT DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Font Engine",IDC_STATIC,6,11,39,8
-    COMBOBOX        IDC_FONT_LIST,60,8,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_BROWSE_FONT,2,40,164,12
-    LTEXT           "System Font Directory",IDC_STATIC,46,29,70,8
-    COMBOBOX        IDC_TEXTURE_MODE,101,58,64,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
-END
-
-IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_LANG,75,4,92,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,3,61,17
-    LTEXT           "Decoder Threading",IDC_STATIC,4,28,62,8
-    COMBOBOX        IDC_DEC_THREAD,75,25,92,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,109,10
-    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
-END
-
-IDD_OPT_STREAM DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Default Port",IDC_STATIC,6,6,40,8
-    COMBOBOX        IDC_PORT,52,3,113,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,68,10
-    CONTROL         "use RTP reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,19,76,10
-    LTEXT           "milliseconds before control timeout",IDC_STATIC,38,34,108,8
-    EDITTEXT        IDC_TIMEOUT,3,32,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "milliseconds of Media Buffering ",IDC_STATIC,38,48,100,8
-    EDITTEXT        IDC_BUFFER,3,47,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_REBUFFER_LEN,83,60,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,79,10
-    LTEXT           "milliseconds",IDC_STATIC,117,63,41,8
-END
-
-IDD_PROPERTIES DIALOGEX 0, 0, 338, 150
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Presentation Properties"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
-    EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
-    PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
-    PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
-    CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
-END
-
-IDD_OPT_DECODER DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Prefered Audio Module",-1,46,5,69,8
-    COMBOBOX        IDC_AUDEC_LIST,26,17,111,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Prefered Video Module",-1,48,40,69,8
-    COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Disable YUV Hardware",IDC_YUV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,89,10
-    LTEXT           "Static",IDC_FORMAT_YUV,97,57,67,8
-    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,32,72,10
-    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
-END
-
-IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Use OpenGL Outlines",IDC_RASTER_OUTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,2,84,10
-    CONTROL         "Emulate power-of-two textures for video",IDC_EMUL_POW2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,45,140,10
-    CONTROL         "Polygon Anti-Aliasing",IDC_DISABLE_POLY_AA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,2,78,10
-    CONTROL         "Disable rectangular texture extensions",IDC_DISABLE_TX_RECT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,55,135,10
-    CONTROL         "Bitmap node uses direct pixel copy",IDC_BITMAP_USE_PIXEL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,65,125,10
-    LTEXT           "Draw Normals",IDC_STATIC,4,17,45,8
-    COMBOBOX        IDC_DRAW_NORMALS,4,25,48,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Backface Cull",IDC_STATIC,57,17,55,8
-    COMBOBOX        IDC_BACK_CULL,57,25,47,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Draw Mode",IDC_STATIC,113,17,55,8
-    COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_SLIDERS DIALOGEX 0, 0, 218, 18
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
-    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
-    CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
-END
-
-IDD_NAVBAR DIALOGEX 0, 0, 279, 15
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    COMBOBOX        IDC_ADDRESS,29,1,130,196,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
-    LTEXT           "Address",IDC_DUMTXT,1,4,26,8
-END
-
-IDD_PLAYLIST DIALOGEX 0, 0, 186, 54
-STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Osmo4 Playlist"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
-END
-
-IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    PUSHBUTTON      "...",IDC_BROWSE_MCACHE,41,2,126,12
-    CONTROL         "Overwrite existing files",IDC_MCACHE_OVERWRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,18,85,10
-    CONTROL         "Use filename",IDC_MCACHE_USENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,31,57,10
-    LTEXT           "Record To",IDC_STATIC,4,4,35,8
-    EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
-END
-
-IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    COMBOBOX        IDC_FILELIST,59,6,108,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Supported Files",IDC_STATIC,6,8,50,8
-    LTEXT           "Extension",IDC_FILES_EXT,7,25,154,8
-    LTEXT           "Mime Type",IDC_FILES_MIMES,7,37,156,8
-    CONTROL         "Associate with Osmo4",IDC_ASSOCIATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,84,10
-    LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
-END
-
-IDD_OPT_LOGS DIALOG 0, 20, 169, 76
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "MS Sans Serif"
-BEGIN
-    LTEXT           "Level",IDC_STATIC,6,7,18,8
-    COMBOBOX        IDC_LOG_LEVEL,30,4,64,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "core",IDC_TOOL_CORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,23,30,10
-    CONTROL         "coding",IDC_TOOL_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,33,37,10
-    CONTROL         "container",IDC_TOOL_CONTAINER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,45,10
-    CONTROL         "network",IDC_TOOL_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,53,41,10
-    CONTROL         "rtp",IDC_TOOL_RTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,63,24,10
-    CONTROL         "author",IDC_TOOL_AUTHOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,24,36,10
-    CONTROL         "sync",IDC_TOOL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,34,31,10
-    CONTROL         "codec",IDC_TOOL_CODEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,44,36,10
-    CONTROL         "parser",IDC_TOOL_PARSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,54,35,10
-    CONTROL         "media",IDC_TOOL_MEDIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,64,35,10
-    CONTROL         "scene",IDC_TOOL_SCENE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,24,35,10
-    CONTROL         "script",IDC_TOOL_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,34,33,10
-    CONTROL         "compose",IDC_TOOL_COMPOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,44,45,10
-    CONTROL         "render",IDC_TOOL_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,54,36,10
-    CONTROL         "mmio",IDC_TOOL_MMIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,64,32,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_OPT_VIDEO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_FONT, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 168
-        BOTTOMMARGIN, 74
-    END
-
-    IDD_OPT_SYSTEMS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-        BOTTOMMARGIN, 75
-    END
-
-    IDD_OPT_STREAM, DIALOG
-    BEGIN
-        LEFTMARGIN, 1
-        RIGHTMARGIN, 167
-        TOPMARGIN, 1
-    END
-
-    IDD_PROPERTIES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 335
-        TOPMARGIN, 1
-    END
-
-    IDD_OPT_DECODER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_RENDER3D, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_NAVBAR, DIALOG
-    BEGIN
-        RIGHTMARGIN, 167
-    END
-
-    IDD_OPT_FILETYPES, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-
-    IDD_OPT_LOGS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 168
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_PLAYLIST TOOLBAR 16, 15
-BEGIN
-    BUTTON      ID_PL_OPEN
-    BUTTON      ID_PL_SAVE
-    BUTTON      ID_PL_ADD_FILE
-    BUTTON      ID_PL_REM_FILE
-    BUTTON      ID_PL_UP
-    BUTTON      ID_PL_DOWN
-    BUTTON      ID_PL_SORT_FILE
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_PLAYLIST            BITMAP                  "res\\playlist.bmp"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Osmo4.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "..\\..\\doc\\osmo4.ico"
-IDI_PLAY                ICON                    "res\\play.ico"
-IDI_STOP                ICON                    "res\\stop.ico"
-IDI_PAUSE               ICON                    "res\\pause.ico"
-IDI_MESSAGE             ICON                    "res\\message.ico"
-IDI_ERR                 ICON                    "res\\error.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_OPT_RENDER DLGINIT
-BEGIN
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e35, 0x0030, 
-    IDC_BIFS_RATE, 0x403, 4, 0
-0x2e37, 0x0035, 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3031, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3231, 0x352e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3531, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3432, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3532, 0x302e, "\000" 
-    IDC_BIFS_RATE, 0x403, 5, 0
-0x3033, 0x302e, "\000" 
-    0
-END
-
-IDD_OPT_SYSTEMS DLGINIT
-BEGIN
-    IDC_LANG, 0x403, 8, 0
-0x6e45, 0x6c67, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 7, 0
-0x7246, 0x6e65, 0x6863, "\000" 
-    IDC_LANG, 0x403, 7, 0
-0x6547, 0x6d72, 0x6e61, "\000" 
-    IDC_LANG, 0x403, 8, 0
-0x7449, 0x6c61, 0x6169, 0x006e, 
-    IDC_LANG, 0x403, 8, 0
-0x7053, 0x6e61, 0x7369, 0x0068, 
-    IDC_LANG, 0x403, 9, 0
-0x6843, 0x6e69, 0x6565, 0x6573, "\000" 
-    IDC_LANG, 0x403, 10, 0
-0x614a, 0x6170, 0x656e, 0x7365, 0x0065, 
-    IDC_DEC_THREAD, 0x403, 14, 0
-0x6953, 0x676e, 0x656c, 0x5420, 0x7268, 0x6165, 0x0064, 
-    IDC_DEC_THREAD, 0x403, 13, 0
-0x754d, 0x6c74, 0x2069, 0x6854, 0x6572, 0x6461, "\000" 
-    IDC_DEC_THREAD, 0x403, 5, 0
-0x7246, 0x6565, "\000" 
-    0
-END
-
-IDD_OPT_LOGS DLGINIT
-BEGIN
-    IDC_LOG_LEVEL, 0x403, 9, 0
-0x6944, 0x6173, 0x6c62, 0x6465, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x7245, 0x6f72, 0x0072, 
-    IDC_LOG_LEVEL, 0x403, 8, 0
-0x6157, 0x6e72, 0x6e69, 0x0067, 
-    IDC_LOG_LEVEL, 0x403, 5, 0
-0x6e49, 0x6f66, "\000" 
-    IDC_LOG_LEVEL, 0x403, 6, 0
-0x6544, 0x7562, 0x0067, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINACCEL ACCELERATORS
-BEGIN
-    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
-    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
-    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
-    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
-    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
-    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
-    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Osmo4.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-0.8.0.tar.gz/applications/osmo4_w32/res Deleted

gpac-0.8.0.tar.gz/applications/osmo4_w32/res/osmo4.ico Deleted

gpac-0.8.0.tar.gz/applications/osmo4_wce Deleted

gpac-0.8.0.tar.gz/applications/osmo4_wce/Options.cpp Deleted

@@ -1,1237 +0,0 @@
-// Options.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-#include <gpac/options.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/font.h>
-#include <gpac/constants.h>
-#include <gpac/iso639.h>
-
-#include "Options.h"
-#include <gx.h>
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-
-COptions::COptions(CWnd* pParent /*=NULL*/)
-	: CDialog(COptions::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptions)
-	//}}AFX_DATA_INIT
-
-}
-
-
-void COptions::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptions)
-	DDX_Control(pDX, IDC_COMBOSEL, m_Selection);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptions, CDialog)
-	//{{AFX_MSG_MAP(COptions)
-	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
-	ON_CBN_SELCHANGE(IDC_COMBOSEL, OnSelchangeCombosel)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions message handlers
-
-
-void COptions::OnSelchangeCombosel()
-{
-	HideAll();
-	switch (m_Selection.GetCurSel()) {
-	case 0:
-		m_general.ShowWindow(SW_SHOW);
-		break;
-	case 1:
-		m_systems.ShowWindow(SW_SHOW);
-		break;
-	case 2:
-		m_decoder.ShowWindow(SW_SHOW);
-		break;
-	case 3:
-		m_render.ShowWindow(SW_SHOW);
-		break;
-	case 4:
-		m_render3D.ShowWindow(SW_SHOW);
-		break;
-	case 5:
-		m_audio.ShowWindow(SW_SHOW);
-		break;
-	case 6:
-		m_font.ShowWindow(SW_SHOW);
-		break;
-	case 7:
-		m_http.ShowWindow(SW_SHOW);
-		break;
-	case 8:
-		m_stream.ShowWindow(SW_SHOW);
-		break;
-	}
-}
-
-void COptions::HideAll()
-{
-	m_general.ShowWindow(SW_HIDE);
-	m_systems.ShowWindow(SW_HIDE);
-	m_render.ShowWindow(SW_HIDE);
-	m_render3D.ShowWindow(SW_HIDE);
-	m_audio.ShowWindow(SW_HIDE);
-	m_http.ShowWindow(SW_HIDE);
-	m_font.ShowWindow(SW_HIDE);
-	m_stream.ShowWindow(SW_HIDE);
-	m_decoder.ShowWindow(SW_HIDE);
-}
-
-BOOL COptions::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_general.Create(IDD_OPT_GEN, this);
-	m_systems.Create(IDD_OPT_SYSTEMS, this);
-	m_decoder.Create(IDD_OPT_DECODER, this);
-	m_render.Create(IDD_OPT_RENDER, this);
-	m_render3D.Create(IDD_OPT_RENDER3D, this);
-	m_audio.Create(IDD_OPT_AUDIO, this);
-	m_http.Create(IDD_OPT_HTTP, this);
-	m_font.Create(IDD_OPT_FONT, this);
-	m_stream.Create(IDD_OPT_STREAM, this);
-
-	m_Selection.AddString(_T("General"));
-	m_Selection.AddString(_T("MPEG-4 Systems"));
-	m_Selection.AddString(_T("Decoders"));
-	m_Selection.AddString(_T("Compositor"));
-	m_Selection.AddString(_T("3D Rendering"));
-	m_Selection.AddString(_T("Audio"));
-	m_Selection.AddString(_T("Text"));
-	m_Selection.AddString(_T("Download"));
-	m_Selection.AddString(_T("Streaming"));
-	HideAll();
-
-	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
-	u32 sel = sOpt ? atoi(sOpt) : 0;
-	if (sel>8) sel=8;
-	m_Selection.SetCurSel(sel);
-	OnSelchangeCombosel();
-
-	SetFocus();
-	return TRUE;
-}
-
-void COptions::OnSaveopt()
-{
-	m_general.SaveOptions();
-	m_systems.SaveOptions();
-	m_render.SaveOptions();
-	m_render3D.SaveOptions();
-	m_audio.SaveOptions();
-	m_http.SaveOptions();
-	m_font.SaveOptions();
-	m_stream.SaveOptions();
-	m_decoder.SaveOptions();
-
-	COsmo4 *gpac = GetApp();
-	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void COptions::OnOK()
-{
-	char str[20];
-	sprintf(str, "%d", m_Selection.GetCurSel());
-	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
-
-	EndDialog(IDCANCEL);
-}
-
-
-
-COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
-	: CDialog(COptAudio::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptAudio)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptAudio::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptAudio)
-	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
-	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
-	DDX_Control(pDX, IDC_AUDIO_DUR, m_AudioDur);
-	DDX_Control(pDX, IDC_SPIN_DUR, m_SpinDur);
-	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
-	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
-	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptAudio, CDialog)
-	//{{AFX_MSG_MAP(COptAudio)
-	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptAudio message handlers
-
-BOOL COptAudio::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	m_AudioSpin.SetBuddy(& m_AudioEdit);
-	m_SpinDur.SetBuddy(& m_AudioDur);
-	m_SpinDur.SetRange(0, 1000);
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-	TCHAR wTmp[500];
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
-	m_ForceConfig.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
-	if (sOpt) {
-		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-		m_AudioEdit.SetWindowText(wTmp);
-	} else {
-		m_AudioEdit.SetWindowText(_T("2"));
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
-	if (sOpt) {
-		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-		m_AudioDur.SetWindowText(wTmp);
-	} else {
-		m_AudioDur.SetWindowText(_T("200"));
-	}
-
-	OnForceAudio();
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_AudioResync.SetCheck(1);
-	} else {
-		m_AudioResync.SetCheck(0);
-	}
-
-	/*driver enum*/
-	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DriverName");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseInterface *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (u32 i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		CE_CharToWide((char *) ((GF_BaseInterface *)ifce)->module_name, (u16 *)wTmp);
-		m_DriverList.AddString(wTmp);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_DriverList.SetCurSel(select);
-
-
-	return TRUE;
-}
-
-
-void COptAudio::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	TCHAR wstr[50];
-	char str[50];
-
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
-
-	m_AudioEdit.GetWindowText(wstr, 20);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
-	m_AudioDur.GetWindowText(wstr, 20);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
-
-	m_DriverList.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Audio", "DriverName", str);
-
-}
-
-void COptAudio::OnForceAudio()
-{
-	BOOL en = m_ForceConfig.GetCheck();
-
-	m_AudioSpin.EnableWindow(en);
-	m_AudioEdit.EnableWindow(en);
-	m_SpinDur.EnableWindow(en);
-	m_AudioDur.EnableWindow(en);
-}
-
-
-COptDecoder::COptDecoder(CWnd* pParent /*=NULL*/)
-	: CDialog(COptDecoder::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptDecoder)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptDecoder::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptDecoder)
-	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
-	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptDecoder, CDialog)
-	//{{AFX_MSG_MAP(COptDecoder)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptDecoder message handlers
-
-BOOL COptDecoder::OnInitDialog()
-{
-	u32 i;
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	/*audio dec enum*/
-	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	GF_BaseDecoder *ifce;
-	s32 select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-			TCHAR wzTmp[500];
-			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
-			m_Audio.AddString(wzTmp);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-	m_Audio.SetCurSel(select);
-
-	/*audio dec enum*/
-	while (m_Video.GetCount()) m_Video.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
-	count = gf_modules_get_count(gpac->m_user.modules);
-	select = 0;
-	to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce  = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifce) continue;
-		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-			TCHAR wzTmp[500];
-			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
-			m_Video.AddString(wzTmp);
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-	m_Video.SetCurSel(select);
-
-	return TRUE;
-}
-
-void COptDecoder::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	TCHAR wstr[100];
-	char str[100];
-
-	m_Audio.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
-	m_Video.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
-}
-
-
-
-COptFont::COptFont(CWnd* pParent /*=NULL*/)
-	: CDialog(COptFont::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptFont)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptFont::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptFont)
-	DDX_Control(pDX, IDC_USE_TEXTURE, m_UseTexture);
-	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
-	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptFont, CDialog)
-	//{{AFX_MSG_MAP(COptFont)
-	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptFont message handlers
-
-BOOL COptFont::OnInitDialog()
-{
-	u32 i;
-	GF_BaseInterface *ifce;
-
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp[500];
-	const char *sOpt;
-
-	/*video drivers enum*/
-	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "DriverName");
-	s32 to_sel = 0;
-	s32 select = 0;
-	u32 count = gf_modules_get_count(gpac->m_user.modules);
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		CE_CharToWide((char *) ifce->module_name, (u16 *)wTmp);
-		m_Fonts.AddString(wTmp);
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_Fonts.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontEngine", "FontDirectory");
-	CE_CharToWide((char *)sOpt, (u16 *)wTmp);
-	if (sOpt) m_BrowseFont.SetWindowText(wTmp);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
-	m_UseTexture.SetCheck( (!sOpt || stricmp(sOpt, "Never")) ? 1 : 0);
-
-	return TRUE;
-}
-
-void COptFont::OnBrowseFont()
-{
-
-}
-
-
-void COptFont::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	char str[MAX_PATH];
-	TCHAR wstr[MAX_PATH];
-
-	m_Fonts.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "FontEngine", "FontReader", str);
-	m_BrowseFont.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "FontEngine", "FontDirectory", str);
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", m_UseTexture.GetCheck() ? "Default" : "Never");
-}
-
-
-
-COptGen::COptGen(CWnd* pParent /*=NULL*/)
-	: CDialog(COptGen::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptGen)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptGen::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptGen)
-	DDX_Control(pDX, IDC_NO_BACKLIGHT, m_NoBacklight);
-	DDX_Control(pDX, IDC_FILL_SCREEN, m_Fill);
-	DDX_Control(pDX, IDC_LOOP, m_Loop);
-	DDX_Control(pDX, IDC_ENABLE_LOGS, m_Logs);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptGen, CDialog)
-	//{{AFX_MSG_MAP(COptGen)
-	ON_BN_CLICKED(IDC_FILEASSOC, OnFileassoc)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptGen message handlers
-
-
-
-BOOL COptGen::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_Loop.SetCheck(1);
-	} else {
-		m_Loop.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "FillScreen");
-	m_Fill.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "DisableBackLight");
-	m_NoBacklight.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Logs");
-	m_Logs.SetCheck((sOpt && !strstr(sOpt, "none")) ? 1 : 0);
-	return TRUE;
-}
-
-void COptGen::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	gpac->m_Loop = m_Loop.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
-	gpac->m_fit_screen = m_Fill.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "FillScreen", gpac->m_fit_screen ? "yes" : "no");
-	gpac->m_disable_backlight = m_NoBacklight.GetCheck();
-	gf_cfg_set_key(gpac->m_user.config, "General", "DisableBackLight", gpac->m_disable_backlight ? "yes" : "no");
-
-	gpac->EnableLogs(m_Logs.GetCheck() ? 1 : 0);
-}
-
-void COptGen::OnFileassoc()
-{
-	HKEY hSection;
-	TCHAR szDir[MAX_PATH];
-	char szTemp[MAX_PATH];
-	TCHAR cmd[MAX_PATH];
-	DWORD ioSize = MAX_PATH;
-	DWORD dwDisp;
-
-	RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, KEY_READ, &hSection);
-
-	GetModuleFileName(NULL, szDir, MAX_PATH);
-
-	while (szDir[strlen((char *) szDir)-1] != (TCHAR) '\\') szDir[strlen((char *) szDir)-1] = 0;
-	if (!hSection)
-		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-
-	CE_WideToChar((u16 *)szDir, szTemp);
-	/*overwrite install dir with current path*/
-	RegSetValueEx(hSection, _T("Install_Dir"), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
-	RegCloseKey(hSection);
-
-
-	/*overwrite .mp4 file associations */
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\DefaultIcon"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	wcscpy(cmd, szDir);
-	wcscat(cmd, _T("Osmo4.ico") );
-	CE_WideToChar((u16 *)cmd, szTemp);
-
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen((const char *) szTemp)+1);
-	RegCloseKey(hSection);
-
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\Shell\\open\\command"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	wcscpy(cmd, szDir);
-	wcscat(cmd, _T("Osmo4.exe \"%L\"") );
-	CE_WideToChar((u16 *)cmd, szTemp);
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
-	RegCloseKey(hSection);
-
-	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T(".mp4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
-	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) "mp4file", strlen("mp4file")+1);
-	RegCloseKey(hSection);
-}
-
-
-
-COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
-	: CDialog(COptHTTP::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptHTTP)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptHTTP::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptHTTP)
-	DDX_Control(pDX, IDC_RESTART_CACHE, m_RestartFile);
-	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
-	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
-	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
-	DDX_Control(pDX, IDC_SAX_DURATION, m_SaxDuration);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
-	//{{AFX_MSG_MAP(COptHTTP)
-	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
-	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnProgressive)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptHTTP message handlers
-
-
-void COptHTTP::OnBrowseCache()
-{
-
-}
-
-BOOL COptHTTP::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp[500];
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Downloader", "CleanCache");
-	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Downloader", "RestartFiles");
-	m_RestartFile.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
-	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_SaxDuration.SetWindowText(wTmp);
-	} else {
-		m_SaxDuration.SetWindowText( _T("30") );
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "CacheDirectory");
-	CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-	if (sOpt) m_CacheDir.SetWindowText(wTmp);
-
-	OnProgressive();
-	return TRUE;
-}
-
-void COptHTTP::OnProgressive()
-{
-	m_SaxDuration.EnableWindow( m_Progressive.GetCheck() ? TRUE : FALSE );
-}
-
-void COptHTTP::SaveOptions()
-{
-	TCHAR wTmp[500];
-	char szCacheDir[500];
-	COsmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Downloader", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Downloader", "RestartFiles", m_RestartFile.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
-
-	m_SaxDuration.GetWindowText(wTmp, MAX_PATH);
-	CE_WideToChar((u16 *)wTmp, szCacheDir);
-	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
-
-	m_CacheDir.GetWindowText(wTmp, MAX_PATH);
-	CE_WideToChar((u16 *)wTmp, szCacheDir);
-	gf_cfg_set_key(gpac->m_user.config, "General", "CacheDirectory", szCacheDir);
-}
-
-
-
-COptRender::COptRender(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_AA_LIST, m_Antialias);
-	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
-	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
-	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
-	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
-	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender, CDialog)
-	//{{AFX_MSG_MAP(COptRender)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptRender message handlers
-
-
-
-#define NUM_RATES 11
-static char *BIFSRates[11] =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0",
-};
-
-
-
-BOOL COptRender::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DirectDraw");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_DirectRender.SetCheck(1);
-	} else {
-		m_DirectRender.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
-	if (sOpt && !stricmp(sOpt, "no")) {
-		m_Scalable.SetCheck(0);
-	} else {
-		m_Scalable.SetCheck(1);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceSize.SetCheck(1);
-	} else {
-		m_ForceSize.SetCheck(0);
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	s32 select = 0;
-	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
-	for (s32 i = 0; i<NUM_RATES; i++) {
-		TCHAR szText[100];
-		CE_CharToWide(BIFSRates[i], (u16 *)szText);
-		m_BIFSRate.AddString(szText);
-		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
-	}
-	m_BIFSRate.SetCurSel(select);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
-	m_HighSpeed.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
-	while (m_Antialias.GetCount()) m_Antialias.DeleteString(0);
-
-	m_Antialias.AddString(_T("None"));
-	m_Antialias.AddString(_T("Text only"));
-	m_Antialias.AddString(_T("Complete"));
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_Antialias.SetCurSel(select);
-
-	return TRUE;
-}
-
-
-void COptRender::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DirectDraw", m_DirectRender.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
-
-	s32 sel = m_BIFSRate.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRates[sel]);
-
-	sel = m_Antialias.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-}
-
-
-
-
-COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
-	: CDialog(COptRender3D::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptRender)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptRender3D::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptRender)
-	DDX_Control(pDX, IDC_WIRE_MODE, m_WireMode);
-	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
-	DDX_Control(pDX, IDC_USE_3D_REN, m_Use3DRender);
-	DDX_Control(pDX, IDC_NO_BACKCULL, m_NoBackFace);
-	DDX_Control(pDX, IDC_EMULATE_POW2, m_EmulatePOW2);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
-	//{{AFX_MSG_MAP(COptRender3D)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-BOOL COptRender3D::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceOpenGL");
-	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
-	m_NoBackFace.SetCheck( (sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
-	m_EmulatePOW2.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	m_WireMode.ResetContent();
-	m_WireMode.AddString(_T("Solid Draw"));
-	m_WireMode.AddString(_T("Wireframe"));
-	m_WireMode.AddString(_T("Both"));
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_WireMode.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_WireMode.SetCurSel(2);
-	else m_WireMode.SetCurSel(0);
-
-
-	m_DrawNormals.ResetContent();
-	m_DrawNormals.AddString(_T("Never"));
-	m_DrawNormals.AddString(_T("Per Face"));
-	m_DrawNormals.AddString(_T("Per Vertex"));
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
-	else m_DrawNormals.SetCurSel(0);
-
-	return TRUE;
-}
-
-
-void COptRender3D::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	u32 sel = m_DrawNormals.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
-
-	sel = m_WireMode.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
-
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", m_NoBackFace.GetCheck() ? "Off" : "On");
-	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulatePOW2.GetCheck() ? "yes" : "no");
-}
-
-
-COptStream::COptStream(CWnd* pParent /*=NULL*/)
-	: CDialog(COptStream::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptStream)
-	//}}AFX_DATA_INIT
-}
-
-
-void COptStream::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptStream)
-	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
-	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
-	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
-	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
-	DDX_Control(pDX, IDC_REORDER, m_Reorder);
-	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
-	DDX_Control(pDX, IDC_PORT, m_Port);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptStream, CDialog)
-	//{{AFX_MSG_MAP(COptStream)
-	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
-	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
-	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
-	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
-	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptStream message handlers
-
-BOOL COptStream::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	TCHAR wTmp[500];
-	const char *sOpt;
-
-	while (m_Port.GetCount()) m_Port.DeleteString(0);
-	m_Port.AddString(_T("554 (RTSP standard)"));
-	m_Port.AddString(_T("7070 (RTSP ext)"));
-	m_Port.AddString(_T("80 (RTSP / HTTP tunnel)"));
-	m_Port.AddString(_T("8080 (RTSP / HTTP tunnel)"));
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = 0;;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_Port.SetCurSel(3);
-		force_rtsp = 1;
-		break;
-	case 80:
-		m_Port.SetCurSel(2);
-		force_rtsp = 1;
-		break;
-	case 7070:
-		m_Port.SetCurSel(1);
-		break;
-	default:
-		m_Port.SetCurSel(0);
-		break;
-	}
-
-	Bool use_rtsp = 0;
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
-
-	if (force_rtsp) {
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_UseRTSP.SetCheck(use_rtsp);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.EnableWindow(1);
-		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
-		if (sOpt && !stricmp(sOpt, "0")) {
-			m_Reorder.SetCheck(0);
-		} else {
-			m_Reorder.SetCheck(1);
-		}
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_Timeout.SetWindowText(wTmp);
-	} else {
-		m_Timeout.SetWindowText(_T("30000"));
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
-	if (sOpt) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_Buffer.SetWindowText(wTmp);
-	} else {
-		m_Buffer.SetWindowText(_T("3000"));
-	}
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
-		m_RebufferLen.SetWindowText(wTmp);
-		m_Rebuffer.SetCheck(1);
-		m_RebufferLen.EnableWindow(1);
-	} else {
-		m_RebufferLen.SetWindowText(_T("0"));
-		m_Rebuffer.SetCheck(0);
-		m_RebufferLen.EnableWindow(0);
-	}
-
-	return TRUE;
-}
-
-
-void COptStream::OnSelchangePort()
-{
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-	case 2:
-		m_UseRTSP.SetCheck(1);
-		m_UseRTSP.EnableWindow(0);
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-		break;
-	case 1:
-	default:
-		m_UseRTSP.SetCheck(0);
-		m_UseRTSP.EnableWindow(1);
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-		break;
-	}
-}
-
-void COptStream::OnRtsp()
-{
-	if (m_UseRTSP.GetCheck()) {
-		m_Reorder.SetCheck(0);
-		m_Reorder.EnableWindow(0);
-	} else {
-		m_Reorder.SetCheck(1);
-		m_Reorder.EnableWindow(1);
-	}
-
-}
-
-void COptStream::CheckRebuffer()
-{
-	TCHAR wstr[50];
-	char str[50];
-	s32 buf, rebuf;
-	m_Buffer.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	buf = atoi(str);
-	m_RebufferLen.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	rebuf = atoi(str);
-	if (rebuf*2 > buf) {
-		rebuf = buf/2;
-		wsprintf(wstr, _T("%d"), rebuf);
-		m_RebufferLen.SetWindowText(wstr);
-	}
-}
-
-void COptStream::OnRebuffer()
-{
-	if (!m_Rebuffer.GetCheck()) {
-		m_RebufferLen.EnableWindow(0);
-	} else {
-		m_RebufferLen.EnableWindow(1);
-		CheckRebuffer();
-	}
-}
-
-void COptStream::OnUpdateRebufferLen()
-{
-	CheckRebuffer();
-}
-
-void COptStream::OnUpdateBuffer()
-{
-	CheckRebuffer();
-}
-
-void COptStream::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-	Bool force_rtsp = 0;
-	s32 sel = m_Port.GetCurSel();
-	switch (sel) {
-	case 3:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
-		force_rtsp = 1;
-		break;
-	case 2:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
-		force_rtsp = 1;
-		break;
-	case 1:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
-		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
-	}
-
-	TCHAR wstr[50];
-	char str[50];
-
-	m_Timeout.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
-
-	m_Buffer.GetWindowText(wstr, 50);
-	CE_WideToChar((u16 *)wstr, str);
-	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
-	if (m_Rebuffer.GetCheck()) {
-		m_RebufferLen.GetWindowText(wstr, 50);
-		CE_WideToChar((u16 *)wstr, str);
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
-	} else {
-		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
-	}
-}
-
-
-
-COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
-	: CDialog(COptSystems::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptSystems)
-	// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-}
-
-
-void COptSystems::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptSystems)
-	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
-	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
-	DDX_Control(pDX, IDC_BIFSDROP, m_BifsAlwaysDrawn);
-	DDX_Control(pDX, IDC_LANG, m_Lang);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptSystems, CDialog)
-	//{{AFX_MSG_MAP(COptSystems)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COptSystems message handlers
-
-
-
-BOOL COptSystems::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	COsmo4 *gpac = GetApp();
-	const char *sOpt;
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = 0;
-	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
-	s32 idx = gf_lang_find(sOpt);
-	u32 i, count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		TCHAR szTmp[100];
-		CE_CharToWide( (char *)gf_lang_get_name(i), (u16 *)szTmp);
-		m_Lang.AddString(szTmp);
-		if (idx>=0 && (i==idx))
-			select = i;
-	}
-	m_Lang.SetCurSel(select);
-
-
-	/*system config*/
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
-	select = 0;
-	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
-	m_Threading.AddString(_T("Single Thread"));
-	m_Threading.AddString(_T("Mutli Thread"));
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_Threading.AddString(_T("Free"));
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_Threading.SetCurSel(select);
-
-
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_ForceDuration.SetCheck(1);
-	} else {
-		m_ForceDuration.SetCheck(0);
-	}
-	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		m_BifsAlwaysDrawn.SetCheck(1);
-	} else {
-		m_BifsAlwaysDrawn.SetCheck(0);
-	}
-
-
-	return TRUE;
-}
-
-
-void COptSystems::SaveOptions()
-{
-	COsmo4 *gpac = GetApp();
-
-	s32 sel = m_Lang.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(sel) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
-
-	sel = m_Threading.GetCurSel();
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-
-	/*reset duration flag*/
-	gpac->m_duration = (u32) -1;
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
-	gf_cfg_set_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS", m_BifsAlwaysDrawn.GetCheck() ? "yes" : "no");
-
-}
-

gpac-0.8.0.tar.gz/applications/osmo4_wce/Osmo4.cpp Deleted

@@ -1,638 +0,0 @@
-// Osmo4.cpp : Defines the class behaviors for the application.
-//
-
-#include "stdafx.h"
-#include "Osmo4.h"
-
-#include <gpac/options.h>
-#include <gpac/modules/service.h>
-#include "MainFrm.h"
-#include "OpenDlg.h"
-#include "Options.h"
-#include <gx.h>
-
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4
-
-BEGIN_MESSAGE_MAP(COsmo4, CWinApp)
-	//{{AFX_MSG_MAP(COsmo4)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-	ON_COMMAND(IDD_CONFIGURE, OnConfigure)
-	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
-	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
-	ON_COMMAND(ID_SHORTCUTS, OnShortcuts)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-
-
-
-
-Bool Osmo4CE_EventProc(void *priv, GF_Event *event)
-{
-	u32 dur;
-	COsmo4 *app = (COsmo4 *) priv;
-	CMainFrame *pFrame = (CMainFrame *) app->m_pMainWnd;
-	/*shutdown*/
-	if (!pFrame) return 0;
-
-	switch (event->type) {
-	case GF_EVENT_MESSAGE:
-		if (event->message.error!=GF_OK) {
-			if (event->message.error<GF_OK) {
-				pFrame->console_err = event->message.error;
-				pFrame->console_message = event->message.message;
-				pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-			}
-			return 0;
-		}
-		if (1) return 0;
-		/*process user message*/
-		pFrame->console_err = GF_OK;
-		pFrame->console_message = event->message.message;
-		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
-		break;
-	case GF_EVENT_SIZE:
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		app->m_scene_width = event->size.width;
-		app->m_scene_height = event->size.height;
-		if (!pFrame->m_full_screen)
-			pFrame->PostMessage(WM_SETSIZE, event->size.width, event->size.height);
-		break;
-	case GF_EVENT_CONNECT:
-		app->m_open = event->connect.is_connected;
-		break;
-	case GF_EVENT_DURATION:
-		dur = (u32) (1000 * event->duration.duration);
-		if (dur<2000) dur = 0;
-		app->m_duration = dur;
-		app->m_can_seek = event->duration.can_seek && dur;
-		pFrame->m_progBar.m_range_invalidated = 1;
-		/*by default, don't display timing if not seekable and vice-versa*/
-		if (app->m_can_seek != pFrame->m_view_timing) {
-			pFrame->m_view_timing = app->m_can_seek;
-			if (!pFrame->m_full_screen)
-				pFrame->PostMessage(WM_SETSIZE, 0, 0);
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		/*store URL since it may be destroyed, and post message*/
-		app->m_navigate_url = event->navigate.to_url;
-		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
-		return 1;
-	case GF_EVENT_QUIT:
-		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
-		break;
-	/*ipaq keys*/
-	case GF_EVENT_KEYDOWN:
-		switch (event->key.key_code) {
-		case GF_KEY_F1:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_OPEN);
-			break;
-		case GF_KEY_F2:
-			pFrame->PostMessage(WM_QUIT);
-			break;
-		case GF_KEY_F3:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_RESTART);
-			break;
-		case GF_KEY_F5:
-			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-			break;
-		case GF_KEY_ENTER:
-			pFrame->PostMessage(WM_COMMAND, ID_FILE_PAUSE);
-			break;
-		case GF_KEY_LEFT:
-			if (app->m_duration>=2000) {
-				s32 res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-			}
-			break;
-		case GF_KEY_RIGHT:
-			if (app->m_duration>=2000) {
-				u32 res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
-				if (res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-			}
-			break;
-		case GF_KEY_UP:
-			if (app->m_duration>=2000) pFrame->PostMessage(WM_COMMAND, ID_FILE_STEP);
-			break;
-		case GF_KEY_DOWN:
-			gf_term_set_option(app->m_term, GF_OPT_REFRESH, 0);
-			break;
-		}
-		break;
-	case GF_EVENT_DBLCLICK:
-		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
-		return 0;
-	}
-
-	return 0;
-}
-
-COsmo4::COsmo4()
-	: CWinApp()
-{
-	// TODO: add construction code here,
-	// Place all significant initialization in InitInstance
-	m_logs = NULL;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only COsmo4 object
-
-COsmo4 theApp;
-
-static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	if (logs) {
-		vfprintf(logs, fmt, list);
-		fflush(logs);
-	}
-}
-
-void COsmo4::EnableLogs(Bool turn_on)
-{
-	if (turn_on) {
-		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		m_logs = gf_fopen(filename, "wt");
-		if (!m_logs) {
-			MessageBox(NULL, _T("Couldn't open log file on file system"), _T("Disabling logs"), MB_OK);
-			turn_on = 0;
-		} else {
-			gf_log_set_tools_levels("network:rtp:sync:codec:media@debug");
-			gf_log_set_callback(m_logs, osmo4_do_log);
-			gf_cfg_set_key(m_user.config, "General", "Logs", "network:rtp:sync:codec:media@debug");
-		}
-	}
-	if (!turn_on) {
-		if (m_logs) {
-			gf_fclose(m_logs);
-			m_logs = 0;
-		}
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
-		gf_log_set_callback(NULL, NULL);
-		gf_cfg_set_key(m_user.config, "General", "Logs", "all@quiet");
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 initialization
-
-BOOL COsmo4::InitInstance()
-{
-	Bool first_load = 0;
-	if (!AfxSocketInit())
-	{
-		AfxMessageBox(IDP_SOCKETS_INIT_FAILED);
-		return FALSE;
-	}
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	SetRegistryKey(_T("GPAC"));
-
-	m_prev_batt_bl = m_prev_ac_bl = 0;
-
-	m_screen_width = GetSystemMetrics(SM_CXSCREEN);
-	m_screen_height = GetSystemMetrics(SM_CYSCREEN);
-	m_menu_height = GetSystemMetrics(SM_CYMENU);
-	m_scene_width = m_scene_height = 0;
-
-	CMainFrame* pFrame = new CMainFrame;
-	m_pMainWnd = pFrame;
-
-	pFrame->LoadFrame(IDR_MAINFRAME, WS_VISIBLE, NULL, NULL);
-
-	pFrame->ShowWindow(m_nCmdShow);
-	pFrame->UpdateWindow();
-
-	TCHAR w_config_path[MAX_PATH];
-	char config_path[MAX_PATH];
-	GetModuleFileName(NULL, w_config_path, MAX_PATH);
-	CE_WideToChar((u16 *) w_config_path, (char *) config_path);
-
-	while (config_path[strlen((char *) config_path)-1] != '\\') config_path[strlen((char *) config_path)-1] = 0;
-
-	/*setup user*/
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*init config and plugins*/
-	m_user.config = gf_cfg_init(NULL, &first_load);
-	if (!m_user.config) {
-		MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_CLOSE);
-	}
-
-	const char *str = gf_cfg_get_key(m_user.config, "General", "Logs");
-	EnableLogs((str && strcmp(str, "all@quiet") ) ? 1 : 0);
-
-	if (first_load) {
-		/*first launch, register all files ext*/
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		::MessageBox(NULL, _T("Osmo4/GPAC Setup complete"), _T("Initial launch"), MB_OK);
-	}
-
-
-	str = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
-	m_user.modules = gf_modules_new(str, m_user.config);
-	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
-		MessageBox(NULL, _T("No plugins available - system cannot work"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_QUIT);
-		return FALSE;
-	}
-
-	m_user.config = m_user.config;
-	m_user.modules = m_user.modules;
-	m_user.EventProc = Osmo4CE_EventProc;
-	m_user.opaque = this;
-	m_user.os_window_handler = pFrame->m_wndView.m_hWnd;
-
-
-	m_term = gf_term_new(&m_user);
-	if (! m_term) {
-		MessageBox(NULL, _T("Cannot load MPEG-4 Terminal"), _T("Fatal Error"), MB_OK);
-		m_pMainWnd->PostMessage(WM_QUIT);
-	}
-
-	m_stopped = 0;
-	m_open = 0;
-	m_can_seek = 0;
-	m_DoResume = 0;
-	SetOptions();
-	pFrame->SendMessage(WM_SETSIZE, 0, 0);
-	ShowTaskBar(0);
-
-	CCommandLineInfo cmdInfo;
-	ParseCommandLine(cmdInfo);
-
-	if (! cmdInfo.m_strFileName.IsEmpty()) {
-		m_filename = cmdInfo.m_strFileName;
-		m_pMainWnd->PostMessage(WM_OPENURL);
-	} else {
-		str = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (str) gf_term_connect(m_term, str);
-	}
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 message handlers
-
-
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CAboutDlg dialog used for App About
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-// Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	CStatic m_AbtTxt;
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CAboutDlg)
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	//{{AFX_MSG(CAboutDlg)
-	virtual BOOL OnInitDialog();		// Added for WCE apps
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	DDX_Control(pDX, IDC_ABT_TEXT, m_AbtTxt);
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-	// No message handlers
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// COsmo4 commands
-// Added for WCE apps
-
-BOOL CAboutDlg::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-	CString str = _T("Osmo4 Player\nGPAC V");
-	str += _T(GPAC_VERSION);
-	str += _T(" (build");
-	str += _T(GPAC_BUILD_NUMBER);
-	str += _T(")");
-	m_AbtTxt.SetWindowText(str);
-	return TRUE;
-}
-
-
-
-void COsmo4::OnAppAbout()
-{
-	CAboutDlg aboutDlg;
-	ShowTaskBar(1);
-	aboutDlg.DoModal();
-	ShowTaskBar(0);
-}
-
-
-int COsmo4::ExitInstance()
-{
-	gf_term_del(m_term);
-	gf_modules_del(m_user.modules);
-	gf_cfg_del(m_user.config);
-	ShowTaskBar(1);
-	gf_sys_close();
-	if (m_logs) gf_fclose(m_logs);
-	return CWinApp::ExitInstance();
-}
-
-void COsmo4::SetOptions()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "FillScreen");
-	m_fit_screen = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "DisableBackLight");
-	m_disable_backlight = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
-	m_no_mime_fetch = (!sOpt || !stricmp(sOpt, "yes")) ? 1 : 0;
-
-	//gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-}
-
-void COsmo4::Pause()
-{
-	if (!m_open) return;
-
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		SetBacklightState(0);
-	} else {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		SetBacklightState(1);
-	}
-	((CMainFrame*)m_pMainWnd)->SetPauseButton();
-}
-
-
-void COsmo4::OnConfigure()
-{
-	COptions dlg;
-
-	ShowTaskBar(1);
-	dlg.DoModal();
-	ShowTaskBar(0);
-}
-
-void COsmo4::ShowTaskBar(Bool showIt, Bool pause_only)
-{
-	if (showIt) {
-		m_DoResume = 0;
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-			m_DoResume = 1;
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 1);
-		if (!pause_only) {
-			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
-			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
-		}
-		SetBacklightState(0);
-	} else {
-		if (!pause_only) {
-			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
-			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
-		}
-		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
-		gf_term_set_option(m_term, GF_OPT_REFRESH, 0);
-		if (m_DoResume) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			SetBacklightState(1);
-			m_DoResume = 0;
-		}
-		m_pMainWnd->SetFocus();
-	}
-}
-
-
-CString COsmo4::GetFileFilter()
-{
-	u32 keyCount, i;
-	CString sFiles;
-	CString sExts;
-	CString supportedFiles;
-
-	return CString("All Files |*.*|");
-
-	supportedFiles = "All Known Files|*.m3u;*.pls";
-
-	sExts = "";
-	sFiles = "";
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		const char *sMime;
-		Bool first;
-		char *sKey;
-		char szKeyList[1000], sDesc[1000];
-		short swKeyList[1000], swDesc[1000];
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		CString sOpt;
-		const char *opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove #include <gpac/options.h>
-		name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey[0] = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-
-		CE_CharToWide(sDesc, (unsigned short *)swDesc);
-		CE_CharToWide(szKeyList, (unsigned short *)swKeyList);
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find((LPCTSTR) swDesc)>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find((LPCTSTR) swKeyList)>=0) continue;
-
-		sExts += (LPCTSTR) swKeyList;
-		sExts += " ";
-		sFiles += (LPCTSTR) swDesc;
-		sFiles += "|";
-
-		first = 1;
-
-		sOpt = CString(szKeyList);
-		while (1) {
-
-			int pos = sOpt.Find(' ');
-			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
-			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
-			if (ext.Find(_T("."))<0) {
-				if (!first) {
-					sFiles += ";";
-				} else {
-					first = 0;
-				}
-				sFiles += "*.";
-				sFiles += ext;
-
-				CString sext = ext;
-				sext += ";";
-				if (supportedFiles.Find(sext)<0) {
-					supportedFiles += ";*.";
-					supportedFiles += ext;
-				}
-			}
-
-			if (sOpt==ext) break;
-			CString rem;
-			rem.Format(_T("%s "), (LPCTSTR) ext);
-			sOpt.Replace((LPCTSTR) rem, _T(""));
-		}
-		sFiles += "|";
-	}
-	supportedFiles += "|";
-	supportedFiles += sFiles;
-	//supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
-	supportedFiles += "All Files |*.*|";
-	return supportedFiles;
-}
-
-void COsmo4::OnOpenFile()
-{
-	Bool res;
-	CFileDialog fd(TRUE,NULL,_T("\\"),OFN_HIDEREADONLY, GetFileFilter());
-
-	ShowTaskBar(1);
-	res = 0;
-	if (fd.DoModal()==IDOK) {
-		res = 1;
-		m_filename = fd.GetPathName();
-		m_DoResume = 0;/*done by term*/
-	}
-	ShowTaskBar(0);
-	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void COsmo4::OnOpenUrl()
-{
-	OpenDlg dlg;
-	Bool res;
-	ShowTaskBar(1, 1);
-	res = 0;
-	if (dlg.DoModal() == IDOK) {
-		res = 1;
-		m_DoResume = 0;/*done by term*/
-	}
-	ShowTaskBar(0, 1);
-	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
-}
-
-void COsmo4::SetBacklightState(Bool disable)
-{
-	HKEY hKey = 0;
-	DWORD dwSize;
-	DWORD dwValue;
-	HANDLE hBL;
-
-	if (!m_disable_backlight) return;
-
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
-
-	if (disable) {
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &m_prev_batt_bl, &dwSize);
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &m_prev_ac_bl,&dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-	} else {
-		if (m_prev_batt_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&m_prev_batt_bl, dwSize);
-		}
-		if (m_prev_ac_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&m_prev_ac_bl, dwSize);
-		}
-	}
-	RegCloseKey(hKey);
-	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
-	if (hBL) {
-		SetEvent(hBL);
-		CloseHandle(hBL);
-	}
-}
-
-void COsmo4::OnShortcuts()
-{
-	ShowTaskBar(1);
-
-	MessageBox(NULL,
-	           _T("Double Click: Fullscreen on/off\n"),
-
-	           _T("Osmo4 Shortcuts"),
-	           MB_OK);
-
-	ShowTaskBar(0);
-}
-

gpac-0.8.0.tar.gz/applications/osmo4_wce/Osmo4.rc Deleted

@@ -1,758 +0,0 @@
-//Microsoft eMbedded Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-#include "newres.h"
-
-#include <gpac/version.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\Osmo4.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Cmdbar.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Toolbar
-//
-
-IDR_MAINFRAME TOOLBAR DISCARDABLE  16, 16
-BEGIN
-    BUTTON      ID_OPEN_FILE
-    BUTTON      ID_FILE_PAUSE
-    BUTTON      ID_FILE_STEP
-    BUTTON      ID_FILE_STOP
-    BUTTON      ID_VIEW_FULLSCREEN
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
-BEGIN
-    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
-    "Q",            ID_APP_EXIT,            VIRTKEY, CONTROL, NOINVERT
-    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
-    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
-    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 140, 153
-STYLE WS_POPUP | WS_CAPTION
-EXSTYLE 0x80000000L
-CAPTION "About Osmo4"
-FONT 8, "System"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,15,3,21,20
-    CTEXT           "Osmo4 player\nGPAC MPEG-4 SDK",IDC_ABT_TEXT,44,4,64,17
-    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",
-                    IDC_STATIC,3,24,131,24
-    CTEXT           "GPAC Copyright (C) Telecom ParisTech 2000 - 2012 - All Rights Reserved http://gpac.sourceforge.net",
-                    IDC_STATIC,4,52,129,26
-					LTEXT           "Authors: Jean Le Feuvre, Cyril Concolato",IDC_STATIC,11,100,109,8
-    LTEXT           "Mozilla SpiderMonkey (JavaScript)",IDC_STATIC,11,110,
-                    109,8
-    LTEXT           "The FreeType Project",IDC_STATIC,11,120,70,8
-    LTEXT           "The PNG Group, The I.J.G.",IDC_STATIC,12,130,87,8
-    LTEXT           "XVID, FAAD, MAD, 3GPP",IDC_STATIC,13,139,80,8
-    LTEXT           "------------ With many thanks to: -------------",
-                    IDC_STATIC,0,91,139,8
-END
-
-IDD_OPENFILE DIALOG DISCARDABLE  0, 0, 133, 116
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Select file location"
-FONT 8, "System"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,92,33,27,14
-    COMBOBOX        IDC_FILELIST,4,17,127,52,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
-                    CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Cancel",IDCANCEL,14,34,27,14
-    LTEXT           "Enter path to remote file",IDC_STATIC,25,6,80,8
-END
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "Osmo4-GPAC\0"
-            VALUE "FileVersion", GPAC_VERSION"\0"
-            VALUE "InternalName", "Osmo4\0"
-            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "Osmo4.EXE\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Osmo4-GPAC\0"
-            VALUE "ProductVersion", GPAC_VERSION"\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ABOUTBOX, DIALOG
-    BEGIN
-        RIGHTMARGIN, 138
-        TOPMARGIN, 1
-    END
-
-    IDD_OPENFILE, DIALOG
-    BEGIN
-        LEFTMARGIN, 2
-        TOPMARGIN, 2
-        BOTTOMMARGIN, 113
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menubar
-//
-
-IDR_MENU MENU DISCARDABLE 
-BEGIN
-    POPUP "File"
-    BEGIN
-        MENUITEM "Open",                        ID_OPEN_FILE
-        MENUITEM "Open URL",                    ID_OPEN_URL
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ID_APP_EXIT
-    END
-    POPUP "View"
-    BEGIN
-        POPUP "Viewpoint"
-        BEGIN
-            MENUITEM "",                            ID_VIEWPORT_EMPTY
-        END
-        POPUP "Navigation"
-        BEGIN
-            MENUITEM "Reset",                       ID_NAV_RESET
-            MENUITEM SEPARATOR
-            MENUITEM "None",                        ID_NAV_NONE
-            MENUITEM "Walk",                        ID_NAV_WALK
-            MENUITEM "Fly",                         ID_NAV_FLY
-            MENUITEM "Examine",                     ID_NAV_EXAMINE
-            MENUITEM "Slide",                       ID_NAV_SLIDE
-            MENUITEM SEPARATOR
-            MENUITEM "Headlight",                   ID_NAV_HEADLIGHT
-            MENUITEM "Gravity",                     ID_NAV_GRAVITY
-            POPUP "Collision"
-            BEGIN
-                MENUITEM "Off",                         ID_COLLIDE_OFF
-                MENUITEM "Regular",                     ID_COLLIDE_REG
-                MENUITEM "Displacement",                ID_COLLIDE_DISP
-            END
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Fullscreen",                  ID_VIEW_FULLSCREEN
-        POPUP "Aspect Ratio"
-        BEGIN
-            MENUITEM "Keep Original",               ID_VIEW_AR_ORIG
-            MENUITEM "Fill Screen",                 ID_VIEW_AR_FILL
-            MENUITEM "Ratio 4/3",                   ID_VIEW_AR_43
-            MENUITEM "Ratio 16/9",                  ID_VIEW_AR_169
-            MENUITEM SEPARATOR
-            MENUITEM "Fit Screen",                  ID_VIEW_FIT
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "Time Control",                ID_VIEW_TIMING
-        MENUITEM SEPARATOR
-        MENUITEM "Settings",                    IDD_CONFIGURE
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Shortcuts",                   ID_SHORTCUTS
-        MENUITEM "About ...",                   ID_APP_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Data
-//
-
-IDR_MENU SHMENUBAR DISCARDABLE 
-BEGIN
-    IDR_MENU, 3,
-    I_IMAGENONE, ID_FILE, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_FILE, 0, 0,
-    I_IMAGENONE, ID_VIEW, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_VIEW, 0, 1,
-    I_IMAGENONE, ID_MENUITEM32789, TBSTATE_ENABLED, 
-    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM32790, 0, 2,
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_EDIT                "File"
-    IDS_TOOL                "Tools"
-    IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    IDR_MAINFRAME           "Osmo4\n\nOsmo4\n\n\nOsmo4.Document\nOsmo4 Document"
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    AFX_IDS_IDLEMESSAGE     "Ready"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
-    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
-    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_EDIT_CLEAR           "Erase the selection\nErase"
-    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
-    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"
-    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"
-    ID_EDIT_FIND            "Find the specified text\nFind"
-    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"
-    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"
-    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"
-    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"
-    ID_EDIT_UNDO            "Undo the last action\nUndo"
-    ID_EDIT_REDO            "Redo the previously undone action\nRedo"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_NEW                 "New"
-    IDS_FILE                "File"
-    IDS_MHELP               "Help"
-    IDS_SAVE                "Save"
-    IDS_CUT                 "Cut"
-    IDS_COPY                "Copy"
-    IDS_PASTE               "Paste"
-    IDS_ABOUT               "About"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_INDICATOR_CAPS       "CAP"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CAP_FILE            "File"
-    ID_FILE_RESTART         "Restart presentation"
-    IDS_CAP_MENUITEM32790   "?"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_CAP_VIEW            "View"
-END
-
-#endif    // English (U.S.) 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
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_CONTROL DIALOG DISCARDABLE  0, 0, 161, 15
-STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
-EXSTYLE WS_EX_STATICEDGE
-FONT 8, "System"
-BEGIN
-    CONTROL         "Slider1",IDC_SLIDER,"msctls_trackbar32",TBS_BOTH | 
-                    TBS_NOTICKS | WS_TABSTOP,0,1,101,12
-    LTEXT           "00:00 FPS 30.00",IDC_TIME,102,3,56,10
-END
-
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 134, 121
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Osmo4 Options"
-FONT 8, "System"
-BEGIN
-    PUSHBUTTON      "Apply",IDC_SAVEOPT,108,3,24,14
-    COMBOBOX        IDC_COMBOSEL,3,5,99,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "-------------------------------------------------------",
-                    IDC_STATIC,0,17,133,8
-END
-
-IDD_OPT_GEN DIALOG DISCARDABLE  0, 120, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Loop at end",IDC_LOOP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,6,28,54,10
-    PUSHBUTTON      "Make Default MPEG-4 Player",IDC_FILEASSOC,5,90,124,20,
-                    BS_MULTILINE
-    CONTROL         "Stretch display to fill screen",IDC_FILL_SCREEN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,6,45,104,10
-    CONTROL         "Disable Backlight while playing",IDC_NO_BACKLIGHT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,61,111,10
-    CONTROL         "Enable logs",IDC_ENABLE_LOGS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,6,74,52,10
-END
-
-IDD_OPT_RENDER DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Rendering Frame Rate",IDC_STATIC,27,27,73,8
-    COMBOBOX        IDC_BIFS_RATE,29,39,68,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,1,64,69,10
-    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,70,64,61,10
-    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,70,79,60,10
-    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,1,79,70,10
-    LTEXT           "Anti-Aliasing",IDC_STATIC,6,103,40,8
-    COMBOBOX        IDC_AA_LIST,56,99,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-IDD_OPT_SYSTEMS DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,46,
-                    64,19
-    COMBOBOX        IDC_LANG,69,48,60,72,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Decoder Threading",IDC_STATIC,4,75,62,8
-    COMBOBOX        IDC_DEC_THREAD,69,72,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,91,111,10
-    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,4,106,82,10
-END
-
-IDD_OPT_VIDEO DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Graphics Driver",IDC_STATIC,5,54,50,8
-    LTEXT           "Anti-Aliasing",IDC_STATIC,6,77,40,8
-    LTEXT           "Video Driver",IDC_STATIC,5,98,40,8
-    COMBOBOX        IDC_GD_LIST,56,53,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_AA_LIST,56,73,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
-    COMBOBOX        IDC_VIDEO_LIST,56,95,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_AUDIO DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,33,77,10
-    LTEXT           "Number of buffers",IDC_STATIC,5,51,60,8
-    LTEXT           "Total Duration in ms",IDC_STATIC,4,69,64,8
-    EDITTEXT        IDC_EDIT_AUDIO,68,48,34,14,ES_AUTOHSCROLL | ES_READONLY
-    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ARROWKEYS | UDS_HORZ,105,49,19,12
-    EDITTEXT        IDC_AUDIO_DUR,68,67,34,14,ES_AUTOHSCROLL
-    CONTROL         "Spin1",IDC_SPIN_DUR,"msctls_updown32",UDS_SETBUDDYINT | 
-                    UDS_ARROWKEYS | UDS_HORZ,105,68,19,12
-    CONTROL         "Disable Audio Resync",IDC_AUDIO_RESYNC,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,5,85,84,10
-    LTEXT           "Default Plugin",IDC_STATIC,5,103,45,8
-    COMBOBOX        IDC_DRIVER_LIST,52,100,73,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_FONT DIALOG DISCARDABLE  0, 20, 133, 119
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Font Engine",IDC_STATIC,35,33,39,8
-    COMBOBOX        IDC_FONT_LIST,12,45,98,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Systems Font Directory",IDC_STATIC,19,87,76,8
-    PUSHBUTTON      "...",IDC_BROWSE_FONT,6,98,115,12
-    CONTROL         "Draw text through texturing",IDC_USE_TEXTURE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,68,107,10
-END
-
-IDD_OPT_HTTP DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Cache Directory",IDC_STATIC,35,9,53,8
-    PUSHBUTTON      "...",IDC_BROWSE_CACHE,7,22,113,14
-    CONTROL         "Remove temp files",IDC_CLEAN_CACHE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,43,75,10
-    CONTROL         "Always redownload incomplete cached files",
-                    IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | 
-                    BS_MULTILINE | WS_TABSTOP,7,54,102,22
-    CONTROL         "XML Progressive Load",IDC_SAX_PROGRESSIVE,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,77,85,10
-    EDITTEXT        IDC_SAX_DURATION,27,89,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-END
-
-IDD_OPT_STREAM DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Default RTSP Port",IDC_STATIC,33,33,58,8
-    COMBOBOX        IDC_PORT,15,42,95,30,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,1,58,64,10
-    CONTROL         "RTP Reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,66,58,66,10
-    EDITTEXT        IDC_TIMEOUT,1,72,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms before control timeout",IDC_STATIC,44,75,83,8
-    EDITTEXT        IDC_BUFFER,1,87,35,14,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms of Media Buffering ",IDC_STATIC,44,90,72,8
-    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,2,106,78,10
-    EDITTEXT        IDC_REBUFFER_LEN,81,105,35,12,ES_CENTER | ES_AUTOHSCROLL | 
-                    ES_NUMBER
-    LTEXT           "ms",IDC_STATIC,121,108,10,8
-END
-
-IDD_OPT_DECODER DIALOG DISCARDABLE  0, 20, 133, 121
-STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
-FONT 8, "System"
-BEGIN
-    LTEXT           "Prefered Audio Output",-1,33,9,70,8
-    LTEXT           "Prefered Video Output",-1,33,44,80,8
-    COMBOBOX        IDC_AUDEC_LIST,11,22,109,54,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_VIDEC_LIST,12,57,109,47,CBS_DROPDOWNLIST | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_OPT_RENDER3D DIALOG DISCARDABLE  0, 0, 133, 121
-STYLE DS_MODALFRAME | WS_CHILD
-FONT 8, "System"
-BEGIN
-    CONTROL         "Use 3D Renderer",IDC_USE_3D_REN,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,3,29,121,10
-    CONTROL         "Disable Backface Culling",IDC_NO_BACKCULL,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,3,41,92,10
-    CONTROL         "Emulate pow2 textures for video",IDC_EMULATE_POW2,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,97,121,10
-    LTEXT           "Drawing Mode",IDC_STATIC,5,56,46,8
-    COMBOBOX        IDC_WIRE_MODE,61,54,61,35,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-    LTEXT           "Draw Normals",IDC_STATIC,5,73,45,8
-    COMBOBOX        IDC_DRAW_NORMALS,62,72,61,35,CBS_DROPDOWN | WS_VSCROLL | 
-                    WS_TABSTOP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_CONTROL, DIALOG
-    BEGIN
-        RIGHTMARGIN, 160
-        BOTTOMMARGIN, 14
-    END
-
-    IDD_OPTIONS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 133
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_GEN, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_RENDER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_SYSTEMS, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_VIDEO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_AUDIO, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_FONT, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 118
-    END
-
-    IDD_OPT_HTTP, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_STREAM, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-
-    IDD_OPT_DECODER, DIALOG
-    BEGIN
-        RIGHTMARGIN, 132
-        BOTTOMMARGIN, 120
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "#include ""newres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Osmo4.rc2""  // non-Microsoft eMbedded Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#include ""wceres.rc""         // WCE-specific components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_OPT_RENDER DLGINIT
-BEGIN
-    IDC_BIFS_RATE, 0x403, 8, 0
-0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 8, 0
-0x0037, 0x002e, 0x0035, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0030, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0032, 0x002e, 0x0035, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0031, 0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0032, 0x0034, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0032, 0x0035, 0x002e, 0x0030, 0x0000, 
-    IDC_BIFS_RATE, 0x403, 10, 0
-0x0033, 0x0030, 0x002e, 0x0030, 0x0000, 
-    0
-END
-
-IDD_OPT_SYSTEMS DLGINIT
-BEGIN
-    IDC_DEC_THREAD, 0x403, 28, 0
-0x0053, 0x0069, 0x006e, 0x0067, 0x006c, 0x0065, 0x0020, 0x0054, 0x0068, 
-0x0072, 0x0065, 0x0061, 0x0064, 0x0000, 
-    IDC_DEC_THREAD, 0x403, 26, 0
-0x004d, 0x0075, 0x0074, 0x006c, 0x0069, 0x0020, 0x0054, 0x0068, 0x0072, 
-0x0065, 0x0061, 0x0064, 0x0000, 
-    IDC_DEC_THREAD, 0x403, 10, 0
-0x0046, 0x0072, 0x0065, 0x0065, 0x0000, 
-    0
-END
-
-#endif    // French (France) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Osmo4.rc2"  // non-Microsoft eMbedded Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-//#include "wceres.rc"         // WCE-specific components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED

gpac-0.8.0.tar.gz/applications/osmo4_wce/res Deleted

gpac-0.8.0.tar.gz/applications/osmo4_wx Deleted

gpac-0.8.0.tar.gz/applications/osmo4_wx/fileprops.cpp Deleted

@@ -1,650 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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 "fileprops.h"
-#include "wxOsmo4.h"
-#include "Playlist.h"
-#include <wx/filename.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-/*ISO 639 languages*/
-#include <gpac/iso639.h>
-
-
-wxFileProps::wxFileProps(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(_T("File Properties")))
-{
-
-	m_pApp = (wxOsmo4Frame *)parent;
-	SetSize(540, 260);
-	assert(m_pApp->m_pPlayList);
-
-	m_pTreeView = new wxTreeCtrl(this, ID_TREE_VIEW, wxPoint(4, 2), wxSize(200, 180), wxTR_DEFAULT_STYLE | wxSUNKEN_BORDER);
-
-	new wxStaticText(this, 0, _T("Information"), wxPoint(210, 2), wxSize(60, 20));
-	m_pViewSel = new wxComboBox(this, ID_VIEW_SEL, _T(""), wxPoint(280, 2), wxSize(120, 24), 0, NULL, wxCB_READONLY);
-	m_pViewSel->Append(wxT("General"));
-	m_pViewSel->Append(wxT("Streams"));
-	m_pViewSel->Append(wxT("Playback"));
-	m_pViewSel->Append(wxT("Network"));
-	m_pViewSel->SetSelection(0);
-
-	m_pViewInfo = new wxTextCtrl(this, -1, wxT(""), wxPoint(210, 30), wxSize(320, 200), wxTE_MULTILINE | wxTE_READONLY | wxHSCROLL | wxSUNKEN_BORDER);
-
-#ifdef WIN32
-	m_pViewInfo->SetBackgroundColour(wxColour(wxT("LIGHT GREY")));
-#endif
-
-	m_pViewWI = new wxButton(this, ID_VIEW_WI, wxT("View World Info"), wxPoint(4, 174), wxSize(200, 40));
-	m_pViewSG = new wxButton(this, ID_VIEW_SG, wxT("View Scene Graph"), wxPoint(4, 220), wxSize(200, 40));
-
-
-	wxString str = m_pApp->m_pPlayList->GetDisplayName();
-	str += wxT(" Properties");
-	SetTitle(str);
-
-	m_pTimer = new wxTimer();
-	m_pTimer->SetOwner(this, ID_OD_TIMER);
-	m_pTimer->Start(500, 0);
-	RewriteODTree();
-
-}
-
-wxFileProps::~wxFileProps()
-{
-	m_pTimer->Stop();
-	delete m_pTimer;
-}
-
-
-BEGIN_EVENT_TABLE(wxFileProps, wxDialog)
-	EVT_TREE_ITEM_ACTIVATED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_SEL_CHANGED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_ITEM_EXPANDED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TREE_ITEM_COLLAPSED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
-	EVT_TIMER(ID_OD_TIMER, wxFileProps::OnTimer)
-	EVT_BUTTON(ID_VIEW_SG, wxFileProps::OnViewSG)
-	EVT_BUTTON(ID_VIEW_WI, wxFileProps::OnViewWorld)
-	EVT_COMBOBOX(ID_VIEW_SEL, wxFileProps::OnSelectInfo)
-END_EVENT_TABLE()
-
-void wxFileProps::RewriteODTree()
-{
-	GF_ObjectManager *root_odm = gf_term_get_root_object(m_pApp->m_term);
-	if (!root_odm) return;
-
-	m_pTreeView->DeleteAllItems();
-	ODTreeData *root = new ODTreeData(root_odm);
-	m_pTreeView->AddRoot(wxT("Root OD"), -1, -1, root);
-	wxTreeItemId rootId = m_pTreeView->GetRootItem();
-
-	WriteInlineTree(root);
-	SetInfo(root_odm);
-}
-
-void wxFileProps::WriteInlineTree(ODTreeData *root)
-{
-	/*browse all ODs*/
-	u32 count = gf_term_get_object_count(m_pApp->m_term, root->m_pODMan);
-
-	for (u32 i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_term_get_object(m_pApp->m_term, root->m_pODMan, i);
-		if (!odm) return;
-		ODTreeData *odd = new ODTreeData(odm);
-		m_pTreeView->AppendItem(root->GetId(), wxT("Object Descriptor"), -1, -1, odd);
-
-		/*if inline propagate*/
-		switch (gf_term_object_subscene_type(m_pApp->m_term, odm)) {
-		case 1:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Root Scene"));
-			WriteInlineTree(odd);
-			break;
-		case 2:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Inline Scene"));
-			WriteInlineTree(odd);
-			break;
-		case 3:
-			m_pTreeView->SetItemText(odd->GetId(), wxT("Extern Proto Lib"));
-			break;
-		default:
-			break;
-		}
-	}
-}
-
-void wxFileProps::OnSetSelection(wxTreeEvent& event)
-{
-	ODTreeData *odd = (ODTreeData *) m_pTreeView->GetItemData(event.GetItem());
-	SetInfo(odd->m_pODMan);
-}
-
-void wxFileProps::SetInfo(GF_ObjectManager *odm)
-{
-	m_current_odm = odm;
-
-	switch (m_pViewSel->GetSelection()) {
-	case 3:
-		SetNetworkInfo();
-		break;
-	case 2:
-		SetDecoderInfo();
-		break;
-	case 1:
-		SetStreamsInfo();
-		break;
-	default:
-		SetGeneralInfo();
-		break;
-	}
-}
-
-void wxFileProps::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-	switch (m_pViewSel->GetSelection()) {
-	case 2:
-		SetDecoderInfo();
-		break;
-	}
-}
-void wxFileProps::OnSelectInfo(wxCommandEvent & WXUNUSED(event) )
-{
-	SetInfo(m_current_odm);
-}
-
-void wxFileProps::SetGeneralInfo()
-{
-	wxString info;
-	GF_MediaInfo odi;
-	u32 h, m, s;
-	u32 i, j;
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.has_profiles) info += wxT("Initial ");
-	info += wxString::Format(wxT("Object Descriptor ID %d\n"), odi.od->objectDescriptorID);
-	if (odi.duration) {
-		h = (u32) (odi.duration / 3600);
-		m = (u32) (odi.duration / 60) - h*60;
-		s = (u32) (odi.duration) - h*3600 - m*60;
-		info += wxString::Format(wxT("Duration %02d:%02d:%02d\n"), h, m, s);
-	} else {
-		info += wxT("Unknown duration\n");
-	}
-
-	if (odi.owns_service) {
-		info += wxT("Service Handler: ") + wxString(odi.service_handler, wxConvUTF8) + wxT("\n");
-		info += wxT("Service URL: ") + wxString(odi.service_url, wxConvUTF8) + wxT("\n");
-	}
-
-	if (odi.od->URLString) {
-		info += wxT("Remote OD - URL: ") + wxString(odi.od->URLString, wxConvUTF8) + wxT("\n");
-	}
-
-	if (odi.codec_name) {
-		switch (odi.od_type) {
-		case GF_STREAM_VISUAL:
-			info += wxString::Format(wxT("Video Object: Width %d - Height %d\n"), odi.width, odi.height);
-			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_AUDIO:
-			info += wxString::Format(wxT("Audio Object: Sample Rate %d - %d channels\n"), odi.sample_rate, odi.num_channels);
-			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-		case GF_STREAM_SCENE:
-			if (odi.width && odi.height) {
-				info += wxString::Format(wxT("Scene Description: Width %d - Height %d\n"), odi.width, odi.height);
-			} else {
-				info += wxT("Scene Description: No size specified\n");
-			}
-			info += wxT("Scene Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		case GF_STREAM_TEXT:
-			if (odi.width && odi.height) {
-				info += wxString::Format(wxT("Text Object: Width %d - Height %d\n"), odi.width, odi.height);
-			} else {
-				info += wxString::Format(wxT("Text Object: No size specified\n"));
-			}
-			info += wxT("Text Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
-			break;
-		}
-	}
-	if (odi.protection==2) info += wxT("Encrypted Media NOT UNLOCKED");
-	else if (odi.protection==1) info += wxT("Encrypted Media");
-
-	if (!gf_list_count(odi.od->OCIDescriptors)) {
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-
-	info += wxT("\nObject Content Information:\n");
-
-	/*check OCI (not everything interests us) - FIXME: support for unicode*/
-	for (i=0; i<gf_list_count(odi.od->OCIDescriptors); i++) {
-		GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
-		switch (desc->tag) {
-		case GF_ODF_SEGMENT_TAG:
-		{
-			GF_Segment *sd = (GF_Segment *) desc;
-			info += wxT("\nSegment Descriptor:\nName: ") + wxString((char *) sd->SegmentName, wxConvUTF8);
-			info += wxString::Format(wxT(" - start time %g sec - duration %g sec\n"), sd->startTime, sd->Duration);
-		}
-		break;
-		case GF_ODF_CC_NAME_TAG:
-		{
-			GF_CC_Name *ccn = (GF_CC_Name *)desc;
-			info += wxT("\nContent Creators:\n");
-			for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
-				GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
-				if (!ci->isUTF8) continue;
-				info += wxT("\t") + wxString(ci->contentCreatorName, wxConvUTF8) + wxT("\n");
-			}
-		}
-		break;
-
-		case GF_ODF_SHORT_TEXT_TAG:
-		{
-			GF_ShortTextual *std = (GF_ShortTextual *)desc;
-			info += wxT("\n") + wxString(std->eventName, wxConvUTF8) + wxT(": ") + wxString(std->eventText, wxConvUTF8) + wxT("\n");
-		}
-		break;
-		/*todo*/
-		case GF_ODF_CC_DATE_TAG:
-			break;
-		default:
-			break;
-		}
-
-	}
-
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-void wxFileProps::SetStreamsInfo()
-{
-	u32 i, count;
-	wxString info;
-	GF_MediaInfo odi;
-	char code[5];
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.has_profiles) {
-		info += wxString::Format(wxT("\tOD Profile@Level %d\n"), odi.OD_pl);
-		info += wxString::Format(wxT("\tScene Profile@Level %d\n"), odi.scene_pl);
-		info += wxString::Format(wxT("\tGraphics Profile@Level %d\n"), odi.graphics_pl);
-		info += wxString::Format(wxT("\tAudio Profile@Level %d\n"), odi.audio_pl);
-		info += wxString::Format(wxT("\tVisual Profile@Level %d\n"), odi.scene_pl);
-		if (odi.inline_pl) info += wxT("\tInline Content use same profiles\n");
-		info += wxT("\n");
-	}
-
-	count = gf_list_count(odi.od->ESDescriptors);
-
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
-
-		info += wxString::Format(wxT("Stream ID %d - Clock ID %d\n"), esd->ESID, esd->OCRESID);
-		if (esd->dependsOnESID) {
-			info += wxString::Format(wxT("\tDepends on Stream ID %d for decoding\n"), esd->dependsOnESID);
-		}
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-			info += wxString::Format(wxT("\tOD Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCR:
-			info += wxT("\tObject Clock Reference Stream\n");
-			break;
-		case GF_STREAM_SCENE:
-			info += wxString::Format(wxT("\tScene Description Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-			info += wxString::Format(wxT("\tGPAC Private Scene Description Stream\n"));
-			break;
-		case GF_STREAM_VISUAL:
-			info += wxT("\tVisual Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_VIDEO_MPEG4_PART2:
-				info += wxT("MPEG-4\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-				info += wxT("MPEG-2 Simple Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_MAIN:
-				info += wxT("MPEG-2 Main Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SNR:
-				info += wxT("MPEG-2 SNR Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-				info += wxT("MPEG-2 Spatial Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_HIGH:
-				info += wxT("MPEG-2 High Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG2_422:
-				info += wxT("MPEG-2 422 Profile\n");
-				break;
-			case GPAC_OTI_VIDEO_MPEG1:
-				info += wxT("MPEG-1\n");
-				break;
-			case GPAC_OTI_IMAGE_JPEG:
-				info += wxT("JPEG\n");
-				break;
-			case GPAC_OTI_IMAGE_PNG:
-				info += wxT("PNG\n");
-				break;
-			case GPAC_OTI_IMAGE_JPEG_2000:
-				info += wxT("JPEG2000\n");
-				break;
-			case 0x80:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code[4] = 0;
-				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
-				break;
-			default:
-				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-
-		case GF_STREAM_AUDIO:
-			info += wxT("\tAudio Stream - media type: ");
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_AUDIO_AAC_MPEG4:
-				info += wxT("MPEG-4\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-				info += wxT("MPEG-2 AAC Main Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-				info += wxT("MPEG-2 AAC LowComplexity Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-				info += wxT("MPEG-2 AAC Scalable Sampling Rate Profile\n");
-				break;
-			case GPAC_OTI_AUDIO_MPEG2_PART3:
-				info += wxT("MPEG-2 Audio\n");
-				break;
-			case GPAC_OTI_AUDIO_MPEG1:
-				info += wxT("MPEG-1 Audio\n");
-				break;
-			case 0xA0:
-				info += wxT("EVRC Audio\n");
-				break;
-			case 0xA1:
-				info += wxT("SMV Audio\n");
-				break;
-			case 0xE1:
-				info += wxT("QCELP Audio\n");
-				break;
-			case 0x80:
-				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
-				code[4] = 0;
-				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
-				break;
-			default:
-				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
-				break;
-			}
-			break;
-		case GF_STREAM_MPEG7:
-			info += wxString::Format(wxT("\tMPEG-7 Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_IPMP:
-			info += wxString::Format(wxT("\tIPMP Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCI:
-			info += wxString::Format(wxT("\tOCI Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_MPEGJ:
-			info += wxString::Format(wxT("\tMPEGJ Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_INTERACT:
-			info += wxString::Format(wxT("\tUser Interaction Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
-			break;
-		default:
-			info += wxT("Private/Unknown\n");
-			break;
-		}
-
-		info += wxString::Format(wxT("\tBuffer Size %d\n\tAverage Bitrate %d bps\n\tMaximum Bitrate %d bps\n"), esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
-		if (esd->slConfig->predefined==SLPredef_SkipSL) {
-			info += wxString::Format(wxT("\tNot using MPEG-4 Synchronization Layer\n"));
-		} else {
-			info += wxString::Format(wxT("\tStream Clock Resolution %d\n"), esd->slConfig->timestampResolution);
-		}
-		if (esd->URLString)
-			info += wxT("\tStream Location: ") + wxString(esd->URLString, wxConvUTF8) + wxT("\n");
-
-		/*check language*/
-		if (esd->langDesc) {
-			s32 idx;
-			char lan[4];
-			lan[0] = esd->langDesc->langCode>>16;
-			lan[1] = (esd->langDesc->langCode>>8)&0xFF;
-			lan[2] = (esd->langDesc->langCode)&0xFF;
-			lan[3] = 0;
-			idx = gf_lang_find(lan);
-			if (idx>=0) {
-				info += wxString::Format(wxT("\tStream Language: %s\n"), gf_lang_get_name(idx) );
-			}
-		}
-
-	}
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-
-void wxFileProps::SetDecoderInfo()
-{
-	GF_MediaInfo odi;
-	wxString info;
-	u32 h, m, s;
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi)) {
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-
-	info = wxT("Status: ");
-	switch (odi.status) {
-	case 0:
-	case 1:
-	case 2:
-		h = (u32) (odi.current_time / 3600);
-		m = (u32) (odi.current_time / 60) - h*60;
-		s = (u32) (odi.current_time) - h*3600 - m*60;
-		if (odi.status==0) info += wxT("Stopped");
-		else if (odi.status==1) info += wxT("Playing");
-		else info += wxT("Paused");
-		info += wxString::Format(wxT("\nObject Time: %02d:%02d:%02d\n"), h, m, s);
-		break;
-	case 3:
-		info += wxT("Not Setup\n");
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	default:
-		info += wxT("Setup Failed\n");
-		m_pViewInfo->Clear();
-		m_pViewInfo->AppendText(info);
-		return;
-	}
-	/*get clock drift*/
-	info += wxString::Format(wxT("Clock drift: %d ms\n"), odi.clock_drift);
-	/*get buffering*/
-	if (odi.buffer>=0) info += wxString::Format(wxT("Buffering Time: %d ms\n"), odi.buffer);
-	else if (odi.buffer==-1) info += wxT("Not buffering\n");
-	else info += wxT("Not Playing\n");
-
-	/*get DB occupation*/
-	if (odi.buffer>=0) info += wxString::Format(wxT("Decoding Buffer: %d Access Units\n"), odi.db_unit_count);
-	/*get CB occupation*/
-	if (odi.cb_max_count)
-		info += wxString::Format(wxT("Composition Memory: %d/%d Units\n"), odi.cb_unit_count, odi.cb_max_count);
-
-	Float avg_dec_time = 0;
-	if (odi.nb_dec_frames) {
-		avg_dec_time = (Float) odi.total_dec_time;
-		avg_dec_time /= odi.nb_dec_frames;
-	}
-	info += wxString::Format(wxT("Average Bitrate %d kbps (%d max)\nAverage Decoding Time %.2f ms (%d max)\nTotal decoded frames %d - %d dropped\n"),
-	                         (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_dropped);
-
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-void wxFileProps::SetNetworkInfo()
-{
-	wxString info;
-	u32 id;
-	NetStatCommand com;
-	GF_MediaInfo odi;
-	u32 d_enum;
-	GF_Err e;
-
-	info = wxT("");
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(wxT(""));
-
-	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
-
-	if (odi.owns_service) {
-		const char *url, *path;
-		u32 done, total, bps;
-		info = wxT("Current Downloads in service:\n");
-		d_enum = 0;
-		while (gf_term_get_download_info(m_pApp->m_term, m_current_odm, &d_enum, &url, &path, &done, &total, &bps)) {
-			info += wxString(url, wxConvUTF8);
-			if (total) {
-				info += wxString::Format(wxT(": %d / %d bytes (%.2f %%) - %.2f kBps\n"), done, total, (100.0*done)/total, ((Double)bps)/1024);
-			} else {
-				info += wxString::Format(wxT(": %.2f kBps\n"), ((Double)bps)/1024);
-			}
-		}
-		if (!d_enum) info = wxT("No Downloads in service\n");
-		info += wxT("\n");
-	}
-
-	d_enum = 0;
-	while (gf_term_get_channel_net_info(m_pApp->m_term, m_current_odm, &d_enum, &id, &com, &e)) {
-		if (e) continue;
-		if (!com.bw_down && !com.bw_up) continue;
-
-		info += wxString::Format(wxT("Stream ID %d statistics:\n"), id);
-		if (com.multiplex_port) {
-			info += wxString::Format(wxT("\tMultiplex Port %d - multiplex ID %d\n"), com.multiplex_port, com.port);
-		} else {
-			info += wxString::Format(wxT("\tPort %d\n"), com.port);
-		}
-		info += wxString::Format(wxT("\tPacket Loss Percentage: %.4f\n"), com.pck_loss_percentage);
-		info += wxString::Format(wxT("\tDown Bandwidth: %.3f bps\n"), ((Float)com.bw_down)/1024);
-		if (com.bw_up) info += wxString::Format(wxT("\tUp Bandwidth: %d bps\n"), com.bw_up);
-		if (com.ctrl_port) {
-			if (com.multiplex_port) {
-				info += wxString::Format(wxT("\tControl Multiplex Port: %d - Control Multiplex ID %d\n"), com.multiplex_port, com.ctrl_port);
-			} else {
-				info += wxString::Format(wxT("\tControl Port: %d\n"), com.ctrl_port);
-			}
-			info += wxString::Format(wxT("\tControl Down Bandwidth: %d bps\n"), com.ctrl_bw_down);
-			info += wxString::Format(wxT("\tControl Up Bandwidth: %d bps\n"), com.ctrl_bw_up);
-		}
-		info += wxT("\n");
-	}
-	m_pViewInfo->Clear();
-	m_pViewInfo->AppendText(info);
-}
-
-
-void wxFileProps::OnViewWorld(wxCommandEvent &WXUNUSED(event))
-{
-	wxString wit;
-	const char *str;
-	GF_List *descs;
-	descs = gf_list_new();
-	str = gf_term_get_world_info(m_pApp->m_term, m_current_odm, descs);
-
-	if (!str) {
-		wxMessageDialog(this, wxT("No World Info available"), wxT("Sorry!"), wxOK).ShowModal();
-		return;
-	}
-
-	wit = wxT("");
-	for (u32 i=0; gf_list_count(descs); i++) {
-		const char *d = (const char *) gf_list_get(descs, i);
-		wit += wxString(d, wxConvUTF8);
-		wit += wxT("\n");
-	}
-	wxMessageDialog(this, wit, wxString(str, wxConvUTF8), wxOK).ShowModal();
-	gf_list_del(descs);
-}
-
-void wxFileProps::OnViewSG(wxCommandEvent &WXUNUSED(event))
-{
-	const char *sOpt;
-	Bool dump_xmt;
-	wxFileName out_file;
-	char szOutFile[GF_MAX_PATH];
-	wxString fname;
-
-	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "General", "CacheDirectory");
-	out_file.AssignDir(wxString(sOpt, wxConvUTF8) );
-
-	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "General", "ViewXMT");
-	out_file.SetFullName(wxT("scene_dump"));
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		dump_xmt = 1;
-	} else {
-		dump_xmt = 0;
-	}
-	strcpy(szOutFile, out_file.GetFullName().mb_str(wxConvUTF8));
-
-	GF_Err e = gf_term_dump_scene(m_pApp->m_term, szOutFile, NULL, dump_xmt, 0, m_current_odm);
-	if (e) {
-		wxMessageDialog dlg(this, wxString(gf_error_to_string(e), wxConvUTF8), wxT("Error while dumping"), wxOK);
-		dlg.ShowModal();
-	} else {
-		wxString cmd = get_pref_browser(m_pApp->m_user.config);
-		cmd += wxT(" ");
-		cmd += wxString(szOutFile, wxConvUTF8);
-		wxExecute(cmd);
-	}
-}

gpac-0.8.0.tar.gz/applications/osmo4_wx/wxGPACControl.cpp Deleted

@@ -1,1052 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  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 "wxOsmo4.h"
-#include <gpac/options.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/raster2d.h>
-#include <gpac/modules/font.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/video_out.h>
-
-#include <gpac/iso639.h>
-
-#include "wxGPACControl.h"
-
-
-#define NUM_RATES 11
-static const char *BIFSRates[11] =
-{
-	"5.0",
-	"7.5",
-	"10.0",
-	"12.5",
-	"15.0",
-	"24.0",
-	"25.0",
-	"30.0",
-	"50.0",
-	"60.0",
-	"100.0"
-};
-
-void wxGPACControl::SetYUVLabel()
-{
-	u32 yuv_format = gf_term_get_option(m_pApp->m_term, GF_OPT_YUV_FORMAT);
-	if (!yuv_format) {
-		m_yuvtxt->SetLabel(wxT("(No YUV used)"));
-	} else {
-		char str[100];
-		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
-		m_yuvtxt->SetLabel(wxString(str, wxConvUTF8) );
-	}
-}
-
-wxGPACControl::wxGPACControl(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(wxT("GPAC Control Panel")))
-{
-	const char *sOpt;
-	SetSize(320, 240);
-	u32 i;
-	wxBoxSizer *bs;
-	Centre();
-
-	m_pApp = (wxOsmo4Frame *)parent;
-
-	s_main = new wxBoxSizer(wxVERTICAL);
-
-	s_header = new wxBoxSizer(wxHORIZONTAL);
-	//s_header->Add(new wxStaticText(this, 0, wxT("Category"), wxDefaultPosition, wxSize(60, 20)), wxALIGN_CENTER);
-	m_select = new wxComboBox(this, ID_SELECT, wxT(""), wxDefaultPosition, wxSize(120, 30), 0, NULL, wxCB_READONLY);
-	s_header->Add(m_select, 2, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_header->Add( new wxButton(this, ID_APPLY, wxT("Apply"), wxDefaultPosition,
-#ifdef WIN32
-	                            wxSize(40, 20)
-#else
-	                            wxSize(40, 30)
-#endif
-	                           ),
-	               1, wxALIGN_TOP|wxALIGN_RIGHT|wxADJUST_MINSIZE);
-	s_main->Add(s_header, 0, wxEXPAND, 0);
-
-	/*general section*/
-	s_general = new wxBoxSizer(wxVERTICAL);
-	m_loop = new wxCheckBox(this, 0, wxT("Loop at End"), wxPoint(10, 40), wxSize(140, 20));
-	s_general->Add(m_loop);
-	m_lookforsubs = new wxCheckBox(this, 0, wxT("Look for Subtitles"), wxPoint(180, 40), wxSize(140, 20));
-	s_general->Add(m_lookforsubs);
-	m_noconsole = new wxCheckBox(this, 0, wxT("Disable console messages"), wxPoint(10, 80), wxSize(180, 20));
-	s_general->Add(m_noconsole);
-	m_viewxmt = new wxCheckBox(this, 0, wxT("View graph in XMT-A format"), wxPoint(10, 120), wxSize(180, 20));
-	s_general->Add(m_viewxmt);
-	s_main->Add(s_general, 0, wxEXPAND, 0);
-
-	/*MPEG-4 systems*/
-	s_mpeg4 = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Stream Language")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_lang = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_lang, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Decoder Threading Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_thread = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_thread, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_bifsalwaysdrawn = new wxCheckBox(this, 0, wxT("Always draw late BIFS frames"));
-	s_mpeg4->Add(m_bifsalwaysdrawn);
-	m_singletime = new wxCheckBox(this, 0, wxT("Force Single Timeline"));
-	s_mpeg4->Add(m_singletime);
-	s_main->Add(s_mpeg4, 0, wxEXPAND, 0);
-
-	/*media decoders*/
-	s_mdec = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Audio Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_decaudio = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_decaudio, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Prefered Video Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_decvideo = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_decvideo, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_mdec, 0, wxEXPAND, 0);
-
-	/*Rendering*/
-	s_rend = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Target Frame Rate")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_fps = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_fps, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Anti-Aliasing")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_aa = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_aa, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Graphics Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_graph = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_graph, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_draw_bounds = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(new wxStaticText(this, 0, wxT("Bounds")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_draw_bounds, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_fast = new wxCheckBox(this, 0, wxT("Fast Rendering"));
-	m_force_size = new wxCheckBox(this, 0, wxT("Force Scene Size"));
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(m_fast, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_force_size, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_use3D = new wxCheckBox(this, 0, wxT("Use 3D Renderer"));
-	s_rend->Add(m_use3D, 0, wxALL|wxEXPAND, 2);
-	m_bWas3D = m_use3D->GetValue();
-	s_main->Add(s_rend, 0, wxEXPAND, 0);
-
-	/*Render 2D*/
-	s_rend2d = new wxBoxSizer(wxVERTICAL);
-	m_direct = new wxCheckBox(this, 0, wxT("Direct Rendering"));
-	s_rend2d->Add(m_direct, 0, wxALL|wxEXPAND, 2);
-	m_scalable = new wxCheckBox(this, 0, wxT("Scalable Zoom"));
-	s_rend2d->Add(m_scalable, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_noyuv = new wxCheckBox(this, 0, wxT("Disable YUV hardware"));
-	bs->Add(m_noyuv, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_yuvtxt = new wxStaticText(this, 0, wxT("(No YUV used)"), wxDefaultPosition, wxSize(60, 20), wxALIGN_LEFT);
-	bs->Add(m_yuvtxt, wxALIGN_CENTER|wxADJUST_MINSIZE);
-	s_rend2d->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rend2d, 0, wxEXPAND, 0);
-
-	/*Render 3D*/
-	s_rend3d = new wxBoxSizer(wxVERTICAL);
-	m_raster_outlines = new wxCheckBox(this, 0, wxT("Use OpenGL Raster outlines"));
-	s_rend3d->Add(m_raster_outlines, 0, wxALL|wxEXPAND, 2);
-	m_polyaa = new wxCheckBox(this, 0, wxT("Enable polygon anti-aliasing"));
-	s_rend3d->Add(m_polyaa, 0, wxALL|wxEXPAND, 2);
-	m_nobackcull = new wxCheckBox(this, 0, wxT("Disable backface culling"));
-	s_rend3d->Add(m_nobackcull, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Wireframe mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_wire = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_wire, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Draw Normals")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_normals = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_normals, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	m_emulpow2 = new wxCheckBox(this, 0, wxT("Emulate power-of-two textures for video"));
-	s_rend3d->Add(m_emulpow2, 0, wxALL|wxEXPAND, 2);
-	m_norectext = new wxCheckBox(this, 0, wxT("Disable rectangular texture extensions"));
-	s_rend3d->Add(m_norectext, 0, wxALL|wxEXPAND, 2);
-	m_copypixels = new wxCheckBox(this, 0, wxT("Bitmap node uses direct pixel copy"));
-	s_rend3d->Add(m_copypixels, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rend3d, 0, wxEXPAND, 0);
-
-	/*video*/
-	s_video = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Video Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_video = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_video , wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_video->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_switchres = new wxCheckBox(this, 0, wxT("Change video resolution in fullscreen"));
-	s_video->Add(m_switchres, 0, wxALL|wxEXPAND, 2);
-	m_usehwmem = new wxCheckBox(this, 0, wxT("Use hardware memory in 2D mode"));
-	s_video->Add(m_usehwmem, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_video, 0, wxEXPAND, 0);
-
-
-	/*audio*/
-	s_audio = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Audio Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_audio = new wxComboBox(this, ID_AUDIO_DRIVER, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_audio, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_forcecfg = new wxCheckBox(this, ID_FORCE_AUDIO, wxT("Force Audio Config"));
-	m_forcecfg->SetValue(1);
-	s_audio->Add(m_forcecfg, 0, wxALL|wxEXPAND, 2);
-
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Number of buffers")), wxALIGN_CENTER|wxADJUST_MINSIZE);
-	m_nbbuf = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 30, 15);
-	m_nbbuf->SetValue(8);
-	bs->Add(m_nbbuf, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Total length in ms")), wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_buflen = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 1000);
-	m_buflen->SetValue(400);
-	bs->Add(m_buflen, wxALIGN_CENTER | wxADJUST_MINSIZE|wxLEFT,10);
-	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
-
-	m_noresync = new wxCheckBox(this, -1, wxT("Disable Resynchronization"));
-	s_audio->Add(m_noresync);
-	m_nomulitch = new wxCheckBox(this, -1, wxT("Disable Multichannel"));
-	s_audio->Add(m_nomulitch);
-#ifdef WIN32
-	m_notifs = new wxCheckBox(this, -1, wxT("Disable DirectSound Notifications"));
-	s_audio->Add(m_notifs);
-#endif
-	s_main->Add(s_audio, 0, wxEXPAND, 0);
-
-	/*font*/
-	s_font = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Font Engine")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_font = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_font, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("System Font Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_fontdir = new wxButton(this, ID_FONT_DIR, wxT("..."), wxDefaultPosition, wxDefaultSize);
-	bs->Add(m_fontdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Text Texturing Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_texturemode = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
-	bs->Add(m_texturemode, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_font, 0, wxEXPAND, 0);
-
-	/*download*/
-	s_dnld = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Cache Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_cachedir = new wxButton(this, ID_CACHE_DIR, wxT("..."));
-	bs->Add(m_cachedir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_cleancache = new wxCheckBox(this, -1, wxT("Remove temp files on exit"));
-	s_dnld->Add(m_cleancache);
-	m_restartcache = new wxCheckBox(this, -1, wxT("Always redownload incomplete cached files"));
-	s_dnld->Add(m_restartcache);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_progressive = new wxCheckBox(this, ID_PROGRESSIVE, wxT("XML progressive load"));
-	bs->Add(m_progressive, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_sax_duration = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(m_sax_duration, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(new wxStaticText(this, 0, wxT("max load slice (ms)")), wxADJUST_MINSIZE | wxALIGN_CENTER);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_use_proxy = new wxCheckBox(this, ID_USE_PROXY, wxT("Use proxy"));
-	bs->Add(m_use_proxy, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_proxy_name = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(m_proxy_name, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_dnld, 0, wxEXPAND, 0);
-
-	/*streaming*/
-	s_stream = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Default RTSP port")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_port = new wxComboBox(this, ID_RTSP_PORT, wxT(""), wxPoint(160, 40), wxSize(140, 30), 0, NULL, wxCB_READONLY);
-	bs->Add(m_port, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_rtsp = new wxCheckBox(this, ID_RTP_OVER_RTSP, wxT("RTP over RTSP"), wxPoint(10, 80), wxSize(140, 20));
-	m_reorder = new wxCheckBox(this, -1, wxT("use RTP reordering"), wxPoint(160, 80), wxSize(130, 20));
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(m_rtsp, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_reorder, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_timeout = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
-	bs->Add(new wxStaticText(this, 0, wxT("Control Timeout (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_timeout, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_buffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 150), wxSize(60, 20));
-	bs->Add(new wxStaticText(this, 0, wxT("Media Buffering (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	bs->Add(m_buffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_dorebuffer = new wxCheckBox(this, ID_RTSP_REBUFFER, wxT("Rebuffer if below"));
-	bs->Add(m_dorebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_rebuffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(200, 180), wxSize(60, 20));
-	bs->Add(m_rebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	m_rebuffer->Disable();
-	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_stream, 0, wxEXPAND, 0);
-
-	/*streaming cache*/
-	s_rec = new wxBoxSizer(wxVERTICAL);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	bs->Add(new wxStaticText(this, 0, wxT("Record To: ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
-	m_recdir = new wxButton(this, ID_RECORD_DIR, wxT("..."));
-	bs->Add(m_recdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	m_overwrite = new wxCheckBox(this, -1, wxT("Overwrite existing files"));
-	s_rec->Add(m_overwrite);
-	bs = new wxBoxSizer(wxHORIZONTAL);
-	m_usename = new wxCheckBox(this, ID_USE_FILENAME, wxT("Use filename"));
-	m_recfile = new wxTextCtrl(this, 0, wxT(""));
-	bs->Add(m_usename, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	bs->Add(m_recfile, wxALIGN_CENTER | wxADJUST_MINSIZE);
-	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
-	s_main->Add(s_rec, 0, wxEXPAND, 0);
-
-	/*load options*/
-	GF_Config *cfg = m_pApp->m_user.config;
-	/*general*/
-	sOpt = gf_cfg_get_key(cfg, "General", "Loop");
-	m_loop->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "LookForSubtitles");
-	m_lookforsubs->SetValue((sOpt && !stricmp(sOpt, "no")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "ConsoleOff");
-	m_noconsole->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "General", "ViewXMT");
-	m_viewxmt->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*lang config*/
-	u32 count = gf_lang_get_count();
-	for (i=0; i<count; i++) {
-		m_lang->Append(wxString(gf_lang_get_name(i), wxConvUTF8) );
-	}
-
-	sOpt = gf_cfg_get_key(cfg, "Systems", "Language3CC");
-	if (!sOpt) sOpt = "eng";
-	s32 select = gf_lang_find(sOpt);
-	if (select<0) select = 0;
-	m_lang->SetSelection(select);
-
-	/*systems config*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "ThreadingPolicy");
-	select = 0;
-	m_thread->Append(wxT("Single Thread"));
-	m_thread->Append(wxT("Mutli Thread"));
-	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
-	m_thread->Append(wxT("Free"));
-	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
-	m_thread->SetSelection(select);
-	sOpt = gf_cfg_get_key(cfg, "Systems", "ForceSingleClock");
-	m_singletime->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Systems", "AlwaysDrawBIFS");
-	m_bifsalwaysdrawn->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-
-	/*audio dec enum*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "DefAudioDec");
-	u32 count = gf_modules_get_count(m_pApp->m_user.modules);
-	GF_BaseDecoder *ifc_d;
-	select = 0;
-	s32 to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifc_d) continue;
-		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_AUDIO, NULL, 0)) {
-			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
-			m_decaudio->Append(wxString(ifc_d->module_name, wxConvUTF8) );
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
-	}
-	m_decaudio->SetSelection(select);
-
-	/*video dec enum*/
-	sOpt = gf_cfg_get_key(cfg, "Systems", "DefVideoDec");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
-		if (!ifc_d) continue;
-		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_VISUAL, NULL, 0)) {
-			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
-			m_decvideo->Append(wxString(ifc_d->module_name, wxConvUTF8) );
-			to_sel++;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
-	}
-	m_decvideo->SetSelection(select);
-
-	/*rendering FIXME*/
-	m_bWas3D = 0;
-	m_use3D->SetValue(m_bWas3D ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "ForceSceneSize");
-	m_force_size->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "FrameRate");
-	if (!sOpt) sOpt = "30.0";
-	select = 0;
-	for (i = 0; i<NUM_RATES; i++) {
-		m_fps->Append(wxString(BIFSRates[i], wxConvUTF8) );
-		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
-	}
-	m_fps->SetSelection(select);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "HighSpeed");
-	m_fast->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "AntiAlias");
-	m_aa->Append(wxT("None"));
-	m_aa->Append(wxT("Text only"));
-	m_aa->Append(wxT("Complete"));
-	select = 2;
-	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
-	m_aa->SetSelection(select);
-
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BoundingVolume");
-	m_draw_bounds->Append(wxT("None"));
-	m_draw_bounds->Append(wxT("Box/Rect"));
-	m_draw_bounds->Append(wxT("AABB Tree"));
-	select = 0;
-	if (sOpt && !stricmp(sOpt, "Box")) select = 1;
-	else if (sOpt && !stricmp(sOpt, "AABB")) select = 2;
-	m_draw_bounds->SetSelection(select);
-
-	/*render2d*/
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DirectDraw");
-	m_direct->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "ScalableZoom");
-	m_scalable->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableYUV");
-	m_noyuv->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	SetYUVLabel();
-
-	/*graphics driver enum*/
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "Raster2D");
-	GF_BaseInterface *ifce;
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_RASTER_2D_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_graph->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_graph->SetSelection(select);
-
-	/*render3d*/
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "RasterOutlines");
-	m_raster_outlines->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "EmulatePOW2");
-	m_emulpow2->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "PolygonAA");
-	m_polyaa->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BackFaceCulling");
-	m_nobackcull->SetValue((sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "BitmapCopyPixels");
-	m_copypixels->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableRectExt");
-	m_norectext->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	m_wire->Append(wxT("No Wireframe"));
-	m_wire->Append(wxT("Wireframe Only"));
-	m_wire->Append(wxT("Solid and Wireframe"));
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) m_wire->SetSelection(1);
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_wire->SetSelection(2);
-	else m_wire->SetSelection(0);
-	m_normals->Append(wxT("Never"));
-	m_normals->Append(wxT("Per Face"));
-	m_normals->Append(wxT("Per Vertex"));
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) m_normals->SetSelection(1);
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_normals->SetSelection(2);
-	else m_normals->SetSelection(0);
-
-	/*video*/
-	sOpt = gf_cfg_get_key(cfg, "Video", "SwitchResolution");
-	m_switchres->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Video", "UseHardwareMemory");
-	m_usehwmem->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Video", "DriverName");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_video->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_video->SetSelection(select);
-
-	/*audio*/
-	sOpt = gf_cfg_get_key(cfg, "Audio", "ForceConfig");
-	m_forcecfg->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "NumBuffers");
-	m_nbbuf->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("2"));
-	sOpt = gf_cfg_get_key(cfg, "Audio", "TotalDuration");
-	m_buflen->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("120"));
-	wxCommandEvent event;
-	ForceAudio(event);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "NoResync");
-	m_noresync->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableMultiChannel");
-	m_nomulitch->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	/*driver enum*/
-	sOpt = gf_cfg_get_key(cfg, "Audio", "DriverName");
-	select = to_sel = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_audio->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_audio->SetSelection(select);
-#ifdef WIN32
-	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableNotification");
-	m_notifs->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	wxCommandEvent audevt;
-	OnSetAudioDriver(audevt);
-#endif
-
-	/*font*/
-	sOpt = gf_cfg_get_key(cfg, "FontEngine", "FontReader");
-	to_sel = select = 0;
-	for (i=0; i<count; i++) {
-		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_FONT_READER_INTERFACE);
-		if (!ifce) continue;
-		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
-		m_font->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
-		gf_modules_close_interface(ifce);
-		to_sel++;
-	}
-	m_font->SetSelection(select);
-	sOpt = gf_cfg_get_key(cfg, "FontEngine", "FontDirectory");
-	if (sOpt) m_fontdir->SetLabel(wxString(sOpt, wxConvUTF8) );
-	sOpt = gf_cfg_get_key(cfg, "Compositor", "TextureTextMode");
-	m_texturemode->Append(wxT("Default"));
-	m_texturemode->Append(wxT("Never"));
-	m_texturemode->Append(wxT("Always"));
-	if (sOpt && !stricmp(sOpt, "Always")) m_texturemode->SetSelection(2);
-	else if (sOpt && !stricmp(sOpt, "3D")) m_texturemode->SetSelection(1);
-	else m_texturemode->SetSelection(0);
-
-	/*downloader*/
-	sOpt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
-	if (sOpt) m_cachedir->SetLabel(wxString(sOpt, wxConvUTF8) );
-	sOpt = gf_cfg_get_key(cfg, "Downloader", "CleanCache");
-	m_cleancache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "Downloader", "RestartFiles");
-	m_restartcache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "Progressive");
-	m_progressive->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "MaxDuration");
-	m_sax_duration->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30"));
-	if (! m_progressive->GetValue()) m_sax_duration->Enable(0);
-
-	sOpt = gf_cfg_get_key(cfg, "HTTPProxy", "Enabled");
-	m_use_proxy->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	char szProxy[GF_MAX_PATH];
-	strcpy(szProxy, "");
-	sOpt = gf_cfg_get_key(cfg, "HTTPProxy", "Name");
-	if (sOpt) {
-		strcat(szProxy, sOpt);
-		sOpt = gf_cfg_get_key(cfg, "HTTPProxy", "Port");
-		if (sOpt) {
-			strcat(szProxy, ":");
-			strcat(szProxy, sOpt);
-		}
-	} else {
-		m_use_proxy->SetValue(0);
-	}
-	m_proxy_name->SetValue( wxString((char *)szProxy, wxConvUTF8) );
-	if (! m_use_proxy->GetValue()) m_proxy_name->Enable(0);
-
-	/*streaming*/
-	m_port->Append(wxT("554 (RTSP standard)"));
-	m_port->Append(wxT("7070 (RTSP ext)"));
-	m_port->Append(wxT("80 (RTSP / HTTP tunnel)"));
-	m_port->Append(wxT("8080 (RTSP / HTTP tunnel)"));
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "DefaultPort");
-	u32 port = 554;
-	Bool force_rtsp = 0;
-	if (sOpt) port = atoi(sOpt);
-	switch (port) {
-	case 8080:
-		m_port->SetSelection(3);
-		force_rtsp = 1;
-		break;
-	case 80:
-		m_port->SetSelection(2);
-		force_rtsp = 1;
-		break;
-	case 7070:
-		m_port->SetSelection(1);
-		break;
-	default:
-		m_port->SetSelection(0);
-		break;
-	}
-
-	Bool use_rtsp = 0;
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
-
-	if (force_rtsp) {
-		m_rtsp->SetValue(1);
-		m_rtsp->Enable(0);
-		m_reorder->SetValue(0);
-		m_reorder->Enable(0);
-	} else {
-		m_rtsp->SetValue(use_rtsp ? 1 : 0);
-		m_rtsp->Enable(1);
-		m_reorder->Enable(1);
-		sOpt = gf_cfg_get_key(cfg, "Streaming", "ReorderSize");
-		m_reorder->SetValue( (sOpt && !stricmp(sOpt, "0")) ? 1 : 0);
-	}
-	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTSPTimeout");
-	m_timeout->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30000"));
-	sOpt = gf_cfg_get_key(cfg, "Network", "BufferLength");
-	m_buffer->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("3000"));
-	sOpt = gf_cfg_get_key(cfg, "Network", "RebufferLength");
-	u32 buf_len = 0;
-	if (sOpt) buf_len = atoi(sOpt);
-	if (buf_len) {
-		m_dorebuffer->SetValue(1);
-		m_rebuffer->SetValue(wxString(sOpt, wxConvUTF8));
-		m_rebuffer->Enable(1);
-	} else {
-		m_dorebuffer->SetValue(0);
-		m_rebuffer->SetValue(wxT("0"));
-		m_rebuffer->Enable(0);
-	}
-
-	RTPoverRTSP(event);
-
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "RecordDirectory");
-	if (!sOpt) sOpt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
-	if (sOpt) m_recdir->SetLabel(wxString(sOpt, wxConvUTF8));
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "KeepExistingFiles");
-	m_overwrite->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
-
-	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "BaseFileName");
-	if (sOpt) {
-		m_usename->SetValue(1);
-		m_recfile->Enable(1);
-		m_recfile->SetValue(wxString(sOpt, wxConvUTF8));
-	} else {
-		m_usename->SetValue(0);
-		m_recfile->Enable(0);
-		m_recfile->SetValue(wxT("uses service URL"));
-	}
-
-	m_select->Append(wxT("General"));
-	m_select->Append(wxT("MPEG-4 Systems"));
-	m_select->Append(wxT("Media Decoders"));
-	m_select->Append(wxT("Compositor"));
-	m_select->Append(wxT("Renderer 2D"));
-	m_select->Append(wxT("Renderer 3D"));
-	m_select->Append(wxT("Video Output"));
-	m_select->Append(wxT("Audio Output"));
-	m_select->Append(wxT("Text Engine"));
-	m_select->Append(wxT("File Download"));
-	m_select->Append(wxT("Real-Time Streaming"));
-	m_select->Append(wxT("Streaming Cache"));
-
-	sOpt = gf_cfg_get_key(cfg, "General", "ConfigPanel");
-	m_sel = sOpt ? atoi(sOpt) : 0;
-	if (m_sel>11) m_sel=11;
-	m_select->SetSelection(m_sel);
-
-	DoSelect();
-}
-
-BEGIN_EVENT_TABLE(wxGPACControl, wxDialog)
-	EVT_BUTTON(ID_APPLY, wxGPACControl::Apply)
-	EVT_COMBOBOX(ID_SELECT, wxGPACControl::OnSetSelection)
-	EVT_CHECKBOX(ID_FORCE_AUDIO, wxGPACControl::ForceAudio)
-	EVT_COMBOBOX(ID_AUDIO_DRIVER, wxGPACControl::OnSetAudioDriver)
-	EVT_BUTTON(ID_FONT_DIR, wxGPACControl::FontDir)
-	EVT_BUTTON(ID_CACHE_DIR, wxGPACControl::CacheDir)
-	EVT_CHECKBOX(ID_PROGRESSIVE, wxGPACControl::OnProgressive)
-	EVT_CHECKBOX(ID_USE_PROXY, wxGPACControl::OnUseProxy)
-	EVT_CHECKBOX(ID_RTP_OVER_RTSP, wxGPACControl::RTPoverRTSP)
-	EVT_CHECKBOX(ID_RTSP_REBUFFER, wxGPACControl::Rebuffer)
-	EVT_COMBOBOX(ID_RTSP_PORT, wxGPACControl::OnSetRTSPPort)
-	EVT_CHECKBOX(ID_USE_FILENAME, wxGPACControl::OnUseFileName)
-	EVT_BUTTON(ID_RECORD_DIR, wxGPACControl::OnRecDir)
-END_EVENT_TABLE()
-
-
-wxGPACControl::~wxGPACControl()
-{
-	char str[20];
-	sprintf(str, "%d", m_sel);
-	gf_cfg_set_key(m_pApp->m_user.config, "General", "ConfigPanel", str);
-}
-
-
-void wxGPACControl::DoSelect()
-{
-
-	/*hide everything*/
-	s_main->Show(s_general, false);
-	s_main->Show(s_mpeg4, false);
-	s_main->Show(s_mdec, false);
-	s_main->Show(s_rend, false);
-	s_main->Show(s_rend2d, false);
-	s_main->Show(s_rend3d, false);
-	s_main->Show(s_video, false);
-	s_main->Show(s_audio, false);
-	s_main->Show(s_font, false);
-	s_main->Show(s_dnld, false);
-	s_main->Show(s_stream, false);
-	s_main->Show(s_rec, false);
-	switch (m_sel) {
-	case 0:
-		s_main->Show(s_general, true);
-		break;
-	case 1:
-		s_main->Show(s_mpeg4, true);
-		break;
-	case 2:
-		s_main->Show(s_mdec, true);
-		break;
-	case 3:
-		s_main->Show(s_rend, true);
-		break;
-	case 4:
-		s_main->Show(s_rend2d, true);
-		break;
-	case 5:
-		s_main->Show(s_rend3d, true);
-		break;
-	case 6:
-		s_main->Show(s_video, true);
-		break;
-	case 7:
-		s_main->Show(s_audio, true);
-		break;
-	case 8:
-		s_main->Show(s_font, true);
-		break;
-	case 9:
-		s_main->Show(s_dnld, true);
-		break;
-	case 10:
-		s_main->Show(s_stream, true);
-		break;
-	case 11:
-		s_main->Show(s_rec, true);
-		break;
-	}
-	SetSizer(s_main);
-	s_main->Fit(this);
-	//s_main->Layout();
-	return;
-
-}
-
-void wxGPACControl::OnSetSelection(wxCommandEvent &WXUNUSED(event))
-{
-	m_sel = m_select->GetSelection();
-	DoSelect();
-}
-
-void wxGPACControl::FontDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_fontdir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_fontdir->SetLabel(dlg.GetPath());
-	}
-}
-void wxGPACControl::CacheDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_cachedir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_cachedir->SetLabel(dlg.GetPath());
-	}
-}
-
-void wxGPACControl::OnProgressive(wxCommandEvent &WXUNUSED(event))
-{
-	m_sax_duration->Enable(m_progressive->GetValue() ? 1 : 0);
-}
-
-void wxGPACControl::OnUseProxy(wxCommandEvent &WXUNUSED(event))
-{
-	m_proxy_name->Enable(m_use_proxy->GetValue() ? 1 : 0);
-}
-
-void wxGPACControl::RTPoverRTSP(wxCommandEvent &WXUNUSED(event))
-{
-	m_reorder->Enable(m_rtsp->GetValue() ? 0 : 1);
-}
-
-void wxGPACControl::Rebuffer(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_dorebuffer->GetValue()) {
-		m_rebuffer->Enable();
-	} else {
-		m_rebuffer->Disable();
-	}
-}
-
-void wxGPACControl::OnSetRTSPPort(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_port->GetSelection() > 1) {
-		m_rtsp->Enable(0);
-		m_reorder->Enable(0);
-	} else {
-		m_rtsp->Enable(1);
-		m_reorder->Enable(1);
-	}
-}
-
-void wxGPACControl::OnRecDir(wxCommandEvent &WXUNUSED(event))
-{
-	wxDirDialog dlg(this);
-	dlg.SetPath(m_recdir->GetLabel());
-	if (dlg.ShowModal() == wxID_OK) {
-		m_recdir->SetLabel(dlg.GetPath());
-	}
-}
-
-void wxGPACControl::OnUseFileName(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_usename->GetValue()) {
-		m_recfile->Enable();
-		m_recfile->SetValue(wxT("record"));
-	} else {
-		m_recfile->Disable();
-		m_recfile->SetValue(wxT("uses service URL"));
-	}
-}
-
-void wxGPACControl::ForceAudio(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_forcecfg->GetValue()) {
-		m_nbbuf->Enable();
-		m_buflen->Enable();
-	} else {
-		m_nbbuf->Disable();
-		m_buflen->Disable();
-	}
-}
-
-void wxGPACControl::OnSetAudioDriver(wxCommandEvent &WXUNUSED(event))
-{
-#ifdef WIN32
-	if (strstr(m_audio->GetStringSelection().mb_str(wxConvUTF8), "DirectSound")) {
-		m_notifs->Enable(1);
-	} else {
-		m_notifs->Enable(0);
-	}
-#endif
-}
-
-
-
-void wxGPACControl::Apply(wxCommandEvent &WXUNUSED(event))
-{
-	/*save options*/
-	GF_Config *cfg = m_pApp->m_user.config;
-
-	m_pApp->m_loop = m_loop->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "Loop", m_loop->GetValue() ? "yes" : "no");
-	m_pApp->m_lookforsubs = m_lookforsubs->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "LookForSubtitles",  m_lookforsubs->GetValue() ? "yes" : "no");
-	m_pApp->m_console_off = m_noconsole->GetValue() ? 1 : 0;
-	gf_cfg_set_key(cfg, "General", "ConsoleOff", m_noconsole->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "General", "ViewXMT", m_viewxmt->GetValue() ? "yes" : "no");
-
-	s32 sel = m_lang->GetSelection();
-	gf_cfg_set_key(cfg, "Systems", "LanguageName", gf_lang_get_name(sel) );
-	gf_cfg_set_key(cfg, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
-	gf_cfg_set_key(cfg, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
-
-
-	sel = m_thread->GetSelection();
-	gf_cfg_set_key(cfg, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
-	gf_cfg_set_key(cfg, "Systems", "ForceSingleClock", m_singletime->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Systems", "AlwaysDrawBIFS", m_bifsalwaysdrawn->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Systems", "DefAudioDec", m_decaudio->GetStringSelection().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "Systems", "DefVideoDec", m_decvideo->GetStringSelection().mb_str(wxConvUTF8));
-
-
-	gf_cfg_set_key(cfg, "Compositor", "HighSpeed", m_fast->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "ForceSceneSize", m_force_size->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Compositor", "FrameRate", BIFSRates[m_fps->GetSelection()]);
-	sel = m_aa->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
-	sel = m_draw_bounds->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
-
-	Bool is_3D = m_use3D->GetValue() ? 1 : 0;
-	if (m_bWas3D != is_3D) {
-		/*FIXME*/
-	}
-	gf_cfg_set_key(cfg, "Compositor", "Raster2D", m_graph->GetStringSelection().mb_str(wxConvUTF8));
-
-	gf_cfg_set_key(cfg, "Compositor", "DirectDraw", m_direct->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", m_scalable->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "DisableYUV", m_noyuv->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Compositor", "RasterOutlines", m_raster_outlines->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", m_emulpow2->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "PolygonAA", m_polyaa->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "DisableRectExt", m_norectext->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "BitmapCopyPixels", m_copypixels->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Compositor", "BackFaceCulling", m_nobackcull->GetValue() ? "Off" : "On");
-
-	sel = m_wire->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : ( (sel==1) ? "WireOnly" : "WireNone" ) );
-	sel = m_normals->GetSelection();
-	gf_cfg_set_key(cfg, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : ( (sel==1) ? "PerFace" : "Never" ) );
-
-	gf_cfg_set_key(cfg, "Video", "SwitchResolution", m_switchres->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Video", "UseHardwareMemory", m_usehwmem->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Video", "DriverName", m_video->GetStringSelection().mb_str(wxConvUTF8));
-
-
-	gf_cfg_set_key(cfg, "Audio", "ForceConfig", m_forcecfg->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Audio", "NoResync", m_noresync->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Audio", "DisableMultiChannel", m_nomulitch->GetValue() ? "yes" : "no");
-
-	gf_cfg_set_key(cfg, "Audio", "NumBuffers", wxString::Format(wxT("%d"), m_nbbuf->GetValue()).mb_str(wxConvUTF8) );
-	gf_cfg_set_key(cfg, "Audio", "TotalDuration", wxString::Format(wxT("%d"), m_buflen->GetValue()).mb_str(wxConvUTF8) );
-	gf_cfg_set_key(cfg, "Audio", "DriverName", m_audio->GetStringSelection().mb_str(wxConvUTF8));
-#ifdef WIN32
-	if (m_notifs->IsEnabled())
-		gf_cfg_set_key(cfg, "Audio", "DisableNotification", m_notifs->GetValue() ? "yes" : "no");
-#endif
-
-	gf_cfg_set_key(cfg, "FontEngine", "FontReader", m_font->GetStringSelection().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "FontEngine", "FontDirectory", m_fontdir->GetLabel().mb_str(wxConvUTF8));
-	switch (m_texturemode->GetSelection()) {
-	case 2:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Always");
-		break;
-	case 1:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Never");
-		break;
-	default:
-		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Default");
-		break;
-	}
-
-	gf_cfg_set_key(cfg, "Downloader", "CleanCache", m_cleancache->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "Downloader", "RestartFiles", m_restartcache->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "SAXLoader", "Progressive", m_progressive->GetValue() ? "yes" : "no");
-	gf_cfg_set_key(cfg, "SAXLoader", "MaxDuration", m_sax_duration->GetLabel().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "General", "CacheDirectory", m_cachedir->GetLabel().mb_str(wxConvUTF8));
-
-
-	Bool force_rtsp = 0;
-	switch (m_port->GetSelection()) {
-	case 3:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "8080");
-		force_rtsp = 1;
-		break;
-	case 2:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "80");
-		force_rtsp = 1;
-		break;
-	case 1:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "7070");
-		break;
-	default:
-		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "554");
-		break;
-	}
-
-	if (force_rtsp) {
-		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", "yes");
-	} else {
-		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", m_rtsp->GetValue() ? "yes" : "no");
-		if (!m_rtsp->GetValue()) gf_cfg_set_key(cfg, "Streaming", "ReorderSize", m_dorebuffer->GetValue() ? "30" : "0");
-	}
-
-	gf_cfg_set_key(cfg, "Streaming", "RTSPTimeout", m_timeout->GetValue().mb_str(wxConvUTF8));
-	gf_cfg_set_key(cfg, "Network", "BufferLength", m_buffer->GetValue().mb_str(wxConvUTF8));
-	if (m_dorebuffer->GetValue()) {
-		gf_cfg_set_key(cfg, "Network", "RebufferLength", m_rebuffer->GetValue().mb_str(wxConvUTF8));
-	} else {
-		gf_cfg_set_key(cfg, "Network", "RebufferLength", "0");
-	}
-
-	gf_cfg_set_key(cfg, "StreamingCache", "KeepExistingFiles", m_overwrite->GetValue() ? "no" : "yes");
-	if (m_usename->GetValue()) {
-		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", m_recfile->GetValue().mb_str(wxConvUTF8));
-	} else {
-		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", NULL);
-	}
-	gf_cfg_set_key(cfg, "StreamingCache", "RecordDirectory", m_recdir->GetLabel().mb_str(wxConvUTF8));
-
-
-	gf_term_set_option(m_pApp->m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-

gpac-0.8.0.tar.gz/applications/osmo4_wx/wxOsmo4.cpp Deleted

@@ -1,2393 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Osmo4 wxWidgets GUI
- *
- *  GPAC is gf_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 "wxOsmo4.h"
-#include "wxGPACControl.h"
-#include "fileprops.h"
-#include <wx/image.h>
-#include <gpac/modules/service.h>
-#include <gpac/network.h>
-#include <gpac/constants.h>
-#include <gpac/options.h>
-
-
-IMPLEMENT_APP(wxOsmo4App)
-
-#include "osmo4.xpm"
-
-#include <wx/dnd.h>
-
-
-
-
-
-#include <wx/filename.h>
-#include <wx/clipbrd.h>
-
-#include "toolbar.xpm"
-
-#include "Playlist.h"
-
-#ifdef WIN32
-#define	FRAME_H	140
-#else
-#define	FRAME_H	110
-#endif
-
-
-wxString get_pref_browser(GF_Config *cfg)
-{
-	const char *sOpt = gf_cfg_get_key(cfg, "General", "Browser");
-	if (sOpt) return wxString(sOpt, wxConvUTF8);
-	return wxEmptyString;
-	/*
-	#ifdef __WXMAC__
-		return wxT("safari");
-	#else
-	#ifdef WIN32
-		return wxT("explorer.exe");
-	#else
-		return wxT("mozilla");
-	#endif
-	#endif*/
-}
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxGPACEvent, wxEvent )
-
-wxGPACEvent::wxGPACEvent(wxWindow* win)
-{
-	SetEventType(GPAC_EVENT);
-	SetEventObject(win);
-	gpac_evt.type = 0;
-	to_url = wxT("");
-}
-wxEvent *wxGPACEvent::Clone() const
-{
-	wxGPACEvent *evt = new wxGPACEvent((wxWindow *) m_eventObject);
-	evt->to_url = to_url;
-	evt->gpac_evt = gpac_evt;
-	return evt;
-}
-
-#include <wx/wx.h>
-
-/*open file dlg*/
-BEGIN_EVENT_TABLE(OpenURLDlg, wxDialog)
-	EVT_BUTTON(ID_URL_GO, OpenURLDlg::OnGo)
-END_EVENT_TABLE()
-
-OpenURLDlg::OpenURLDlg(wxWindow *parent, GF_Config *cfg)
-	: wxDialog(parent, -1, wxString(wxT("Enter remote presentation location")))
-{
-#ifndef WIN32
-	SetSize(430, 35);
-#else
-	SetSize(430, 55);
-#endif
-	Centre();
-	m_url = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
-	m_url->SetSize(0, 2, 340, 18, wxSIZE_AUTO);
-	m_go = new wxButton(this, ID_URL_GO, wxT("Go !"));
-#ifndef WIN32
-	m_go->SetSize(344, 2, 20, 18, wxSIZE_AUTO);
-#else
-	m_go->SetSize(364, 2, 30, 18, wxSIZE_AUTO);
-#endif
-	m_urlVal = wxT("");
-
-	m_cfg = cfg;
-
-	const char *sOpt;
-	u32 i=0;
-
-	while (1) {
-		sOpt = gf_cfg_get_key_name(m_cfg, "RecentFiles", i);
-		if (!sOpt) break;
-		m_url->Append(wxString(sOpt, wxConvUTF8) );
-		i++;
-	}
-}
-
-#define MAX_LAST_FILES		20
-void UpdateLastFiles(GF_Config *cfg, const char *URL)
-{
-	u32 nb_entries;
-	gf_cfg_set_key(cfg, "RecentFiles", URL, NULL);
-	gf_cfg_insert_key(cfg, "RecentFiles", URL, "", 0);
-	/*remove last entry if needed*/
-	nb_entries = gf_cfg_get_key_count(cfg, "RecentFiles");
-	if (nb_entries>MAX_LAST_FILES) {
-		gf_cfg_set_key(cfg, "RecentFiles", gf_cfg_get_key_name(cfg, "RecentFiles", nb_entries-1), NULL);
-	}
-}
-
-void OpenURLDlg::OnGo(wxCommandEvent& event)
-{
-	m_urlVal = m_url->GetValue();
-	UpdateLastFiles(m_cfg, m_urlVal.mb_str(wxConvUTF8));
-	EndModal(wxID_OK);
-}
-/*end open file dlg*/
-
-#ifdef WIN32
-u32 get_sys_col(int idx)
-{
-	u32 res;
-	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF;
-	res<<=8;
-	res |= (val>>8)&0xFF;
-	res<<=8;
-	res |= (val>>16)&0xFF;
-	return res;
-}
-#endif
-
-static void wxOsmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
-{
-	if (!total) return;
-	wxOsmo4Frame *app = (wxOsmo4Frame *)usr;
-	s32 prog = (s32) ( (100 * (u64)done) / total);
-	if (app->m_last_prog < prog) {
-		app->m_last_prog = prog;
-
-		if (prog<100) {
-			/*appears to crash wxWidgets / X11 when refreshing the text too often*/
-			if (app->m_LastStatusTime + 200 > gf_sys_clock()) return;
-			char msg[1024];
-			sprintf(msg, "%s %02d %%)", title, prog);
-			//app->SetStatus(wxString(msg, wxConvUTF8));
-		} else {
-			app->SetStatus(wxT("Ready"));
-			app->m_last_prog = -1;
-		}
-	}
-}
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	wxCommandEvent event;
-	wxOsmo4Frame *app = (wxOsmo4Frame *)ptr;
-
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		app->m_duration = (u32) (evt->duration.duration*1000);
-		app->m_can_seek = evt->duration.can_seek;
-		if (app->m_duration<1100) app->m_can_seek = 0;
-		app->m_pProg->Enable(app->m_can_seek ? 1 : 0);
-		app->m_pPlayList->SetDuration((u32) evt->duration.duration);
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		const char *servName;
-		if (!evt->message.service || !strcmp(evt->message.service, app->m_pPlayList->GetURL().mb_str(wxConvUTF8))) {
-			servName = "main service";
-		} else {
-			servName = evt->message.service;
-		}
-		if (!evt->message.message) return 0;
-
-		if (evt->message.error) {
-			app->SetStatus(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")") );
-			if (!app->m_connected) app->m_pPlayList->SetDead();
-		}
-		else if (!app->m_console_off) {
-			if (strstr(evt->message.message, "100 %")) {
-				app->SetStatus(wxT(""));
-			} else {
-				app->SetStatus(wxString(evt->message.message, wxConvUTF8) );
-			}
-		}
-
-#if 0
-		/*log*/
-		if (evt->message.error)
-			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(") ") + wxString(gf_error_to_string(evt->message.error), wxConvUTF8) );
-		else
-			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")"));
-#endif
-	}
-	break;
-	case GF_EVENT_PROGRESS:
-	{
-		const char *sTitle;
-		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
-		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
-		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
-		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
-	}
-	break;
-	case GF_EVENT_KEYDOWN:
-		if (app->m_can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
-			s32 res;
-			switch (evt->key.key_code) {
-			case GF_KEY_LEFT:
-				res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_RIGHT:
-				res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
-				if ((u32) res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_DOWN:
-				res = gf_term_get_time_in_ms(app->m_term) - 60000;
-				if (res<0) res=0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			case GF_KEY_UP:
-				res = gf_term_get_time_in_ms(app->m_term) + 60000;
-				if ((u32) res>=app->m_duration) res = 0;
-				gf_term_play_from_time(app->m_term, res, 0);
-				break;
-			}
-		} else if (evt->key.flags & GF_KEY_MOD_CTRL) {
-			switch (evt->key.key_code) {
-			case GF_KEY_LEFT:
-				app->m_pPlayList->PlayPrev();
-				break;
-			case GF_KEY_RIGHT:
-				app->m_pPlayList->PlayNext();
-				break;
-			}
-		} else {
-			switch (evt->key.key_code) {
-			case GF_KEY_HOME:
-				gf_term_set_option(app->m_term, GF_OPT_NAVIGATION_TYPE, 1);
-				break;
-			case GF_KEY_ESCAPE:
-				if (gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN))
-					gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, 0);
-				break;
-			default:
-			{
-				wxGPACEvent wxevt(app);
-				wxevt.gpac_evt = *evt;
-				app->AddPendingEvent(wxevt);
-			}
-			break;
-			}
-		}
-		break;
-
-	case GF_EVENT_CONNECT:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
-		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
-		if (!evt->connect.is_connected) app->m_duration = 0;
-		app->AddPendingEvent(wxevt);
-	}
-	break;
-	case GF_EVENT_NAVIGATE:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
-		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
-	}
-	return 1;
-	case GF_EVENT_SET_CAPTION:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
-		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
-	}
-	return 1;
-
-	case GF_EVENT_QUIT:
-	case GF_EVENT_VIEWPOINTS:
-	case GF_EVENT_STREAMLIST:
-	case GF_EVENT_SCENE_SIZE:
-//	case GF_EVENT_SIZE:
-	{
-		wxGPACEvent wxevt(app);
-		wxevt.gpac_evt = *evt;
-		app->AddPendingEvent(wxevt);
-	}
-	break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN));
-		return 0;
-	case GF_EVENT_MOUSEDOWN:
-		if (!gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN)) {
-#ifdef __WXGTK__
-			app->m_pVisual->SetFocus();
-#else
-			app->m_pView->SetFocus();
-#endif
-		}
-		break;
-	case GF_EVENT_AUTHORIZATION:
-	{
-		wxGPACEvent wxevt(app);
-		wxTextEntryDialog user_d (0,
-		                          wxT("Please set the user name for connection"),
-		                          wxString(evt->auth.site_url, wxConvUTF8),
-		                          wxString(evt->auth.user, wxConvUTF8));
-		if (user_d.ShowModal() != wxID_OK)
-			return 0;
-		strncpy(evt->auth.user, user_d.GetValue().mb_str(wxConvUTF8), 50);
-		wxPasswordEntryDialog passwd_d(0,
-		                               wxT("Please enter password"),
-		                               wxString(evt->auth.site_url, wxConvUTF8),
-		                               wxString(evt->auth.password, wxConvUTF8));
-		if (passwd_d.ShowModal() != wxID_OK)
-			return 0;
-		strncpy(evt->auth.password, passwd_d.GetValue().mb_str(wxConvUTF8), 50);
-		return 1;
-	}
-	case GF_EVENT_SYS_COLORS:
-#ifdef WIN32
-		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
-		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);
-		evt->sys_cols.sys_colors[2] = get_sys_col(COLOR_APPWORKSPACE);
-		evt->sys_cols.sys_colors[3] = get_sys_col(COLOR_BACKGROUND);
-		evt->sys_cols.sys_colors[4] = get_sys_col(COLOR_BTNFACE);
-		evt->sys_cols.sys_colors[5] = get_sys_col(COLOR_BTNHIGHLIGHT);
-		evt->sys_cols.sys_colors[6] = get_sys_col(COLOR_BTNSHADOW);
-		evt->sys_cols.sys_colors[7] = get_sys_col(COLOR_BTNTEXT);
-		evt->sys_cols.sys_colors[8] = get_sys_col(COLOR_CAPTIONTEXT);
-		evt->sys_cols.sys_colors[9] = get_sys_col(COLOR_GRAYTEXT);
-		evt->sys_cols.sys_colors[10] = get_sys_col(COLOR_HIGHLIGHT);
-		evt->sys_cols.sys_colors[11] = get_sys_col(COLOR_HIGHLIGHTTEXT);
-		evt->sys_cols.sys_colors[12] = get_sys_col(COLOR_INACTIVEBORDER);
-		evt->sys_cols.sys_colors[13] = get_sys_col(COLOR_INACTIVECAPTION);
-		evt->sys_cols.sys_colors[14] = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
-		evt->sys_cols.sys_colors[15] = get_sys_col(COLOR_INFOBK);
-		evt->sys_cols.sys_colors[16] = get_sys_col(COLOR_INFOTEXT);
-		evt->sys_cols.sys_colors[17] = get_sys_col(COLOR_MENU);
-		evt->sys_cols.sys_colors[18] = get_sys_col(COLOR_MENUTEXT);
-		evt->sys_cols.sys_colors[19] = get_sys_col(COLOR_SCROLLBAR);
-		evt->sys_cols.sys_colors[20] = get_sys_col(COLOR_3DDKSHADOW);
-		evt->sys_cols.sys_colors[21] = get_sys_col(COLOR_3DFACE);
-		evt->sys_cols.sys_colors[22] = get_sys_col(COLOR_3DHIGHLIGHT);
-		evt->sys_cols.sys_colors[23] = get_sys_col(COLOR_3DLIGHT);
-		evt->sys_cols.sys_colors[24] = get_sys_col(COLOR_3DSHADOW);
-		evt->sys_cols.sys_colors[25] = get_sys_col(COLOR_WINDOW);
-		evt->sys_cols.sys_colors[26] = get_sys_col(COLOR_WINDOWFRAME);
-		evt->sys_cols.sys_colors[27] = get_sys_col(COLOR_WINDOWTEXT);
-		return 1;
-#else
-		memset(evt->sys_cols.sys_colors, 0, sizeof(u32)*28);
-		return 1;
-#endif
-	}
-	return 0;
-}
-
-
-
-bool wxOsmo4App::OnInit()
-{
-#ifdef __WXGTK__
-	XSynchronize((Display *) wxGetDisplay(), 1);
-#endif
-	wxFrame *frame = new wxOsmo4Frame();
-	frame->Show(TRUE);
-	SetTopWindow(frame);
-	return true;
-}
-
-
-class myDropfiles : public wxFileDropTarget
-{
-public:
-	myDropfiles() : wxFileDropTarget() {}
-	virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
-	wxOsmo4Frame *m_pMain;
-};
-
-bool myDropfiles::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
-{
-	u32 count = filenames.GetCount();
-
-	if (count==1) {
-		const char *ext = strrchr(filenames.Item(0).mb_str(wxConvUTF8) , '.');
-		/*if playing and sub d&d, open sub in current presentation*/
-		if (m_pMain->m_connected && ext && ( !stricmp(ext, ".srt") || !stricmp(ext, ".sub") || !stricmp(ext, ".ttxt") || !stricmp(ext, ".xml") ) ) {
-			m_pMain->AddSubtitle(filenames.Item(0).mb_str(wxConvUTF8) , 1);
-			return TRUE;
-		}
-	}
-
-	for (u32 i=0; i<count; i++)
-		m_pMain->m_pPlayList->QueueURL(filenames.Item(i));
-
-	m_pMain->m_pPlayList->RefreshList();
-	m_pMain->m_pPlayList->PlayNext();
-	return TRUE;
-}
-
-bool GPACLogs::OnFrameClose(wxFrame *frame)
-{
-	Show(FALSE);
-	return 0;
-}
-
-void wxOsmo4Frame::ShowViewWindow(Bool do_show)
-{
-	m_pView->Show(do_show ? 1 : 0);
-#ifdef __WXGTK__
-	//m_pView->Show(0);
-#endif
-}
-
-#ifdef __WXGTK__
-extern "C" {
-#ifdef __WXGTK20__
-	int gdk_x11_drawable_get_xid( void * );
-	void *gdk_x11_drawable_get_xdisplay( void * );
-#endif
-	void *gtk_widget_get_parent_window( void * );
-}
-#endif
-
-
-void wxOsmo4Frame::CheckVideoOut()
-{
-	const char *sOpt = gf_cfg_get_key(m_user.config, "Video", "DriverName");
-	void *os_handle = NULL;
-	void *os_display = NULL;
-	/*build a child window for embed display*/
-	if (sOpt && stricmp(sOpt, "SDL Video Output")) {
-		if (m_user.os_window_handler) return;
-		m_bExternalView = 0;
-
-#ifdef __WXGTK__
-		GtkWidget* widget = m_pVisual->GetHandle();
-
-#ifdef __WXGTK20__
-		os_handle = (void *) gdk_x11_drawable_get_xid(gtk_widget_get_parent_window(widget));
-#else
-		os_handle = (void *)*(int *)( (char *)gtk_widget_get_parent_window(widget) + 2 * sizeof(void *) );
-#endif
-
-#elif defined (WIN32)
-		os_handle = m_pView->GetHandle();
-#endif
-		if (os_handle) {
-			m_user.os_window_handler = os_handle;
-			m_user.os_display = os_display;
-			ShowViewWindow(1);
-			m_pView->SetSize(320, 240);
-			SetSize(wxSize(320, 240+FRAME_H));
-			SetWindowStyle(wxDEFAULT_FRAME_STYLE);
-			DoLayout(320, 240);
-			return;
-		}
-	}
-	/*we're using SDL, don't use SDL hack*/
-	m_bExternalView = 1;
-	m_user.os_window_handler = 0;
-	m_user.os_display = NULL;
-	SetSize(wxSize(320,FRAME_H));
-	m_pView->SetSize(0, 0);
-	ShowViewWindow(0);
-	DoLayout();
-	SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
-}
-
-static void wxOsmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	wxOsmo4Frame *osmo = (wxOsmo4Frame *)cbk;
-
-	if (osmo->m_logs) {
-		vfprintf(osmo->m_logs, fmt, list);
-		fflush(osmo->m_logs);
-	} else {
-		::wxVLogMessage(wxString(fmt, wxConvUTF8), list);
-	}
-}
-
-
-Bool wxOsmo4Frame::LoadTerminal()
-{
-	m_term = NULL;
-	memset(&m_user, 0, sizeof(GF_User));
-
-	/*locate exec dir for cfg file*/
-	wxPathList pathList;
-	wxString currentDir(wxGetCwd());
-	wxString abs_gpac_path = wxT("");
-	char *gpac_cfg, *sep;
-
-	::wxLogMessage(wxT("Looking for GPAC configuration file"));
-
-	/*load config*/
-	Bool first_launch = 0;
-	m_user.config = gf_cfg_init(NULL, &first_launch);
-
-	if (!m_user.config) {
-		wxMessageDialog(NULL, wxT("Cannot open GPAC configuration file"), wxT("Init error"), wxOK);
-		return 0;
-	}
-
-	gpac_cfg = gf_cfg_get_filename(m_user.config);
-	sep = strrchr(gpac_cfg, '/');
-	if (!sep) sep = strrchr(gpac_cfg, '\\');
-	if (sep) sep[0] = 0;
-	strcpy(szAppPath, gpac_cfg);
-	if (sep) sep[0] = '/';
-	gf_free(gpac_cfg);
-
-	/*check log file*/
-	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
-	if (str) m_logs = gf_fopen(str, "wt");
-	gf_log_set_callback(this, wxOsmo4_do_log);
-
-	/*set log level*/
-	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
-
-	gf_sys_init(GF_MemTrackerNone);
-
-	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
-
-	m_user.modules = gf_modules_new(str, m_user.config);
-	/*initial launch*/
-	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
-		wxMessageDialog(NULL, wxT("No modules available - system cannot work"), wxT("Fatal Error"), wxOK).ShowModal();
-		if (m_user.modules) gf_modules_del(m_user.modules);
-		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
-		return 0;
-	}
-
-	if (first_launch) {
-		u32 i;
-		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-			}
-		}
-	}
-
-
-
-	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
-	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
-		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
-	}
-
-	::wxLogMessage(wxT("Starting GPAC Terminal"));
-	/*now load terminal*/
-	m_user.opaque = this;
-	m_user.EventProc = GPAC_EventProc;
-
-	CheckVideoOut();
-
-	m_term = gf_term_new(&m_user);
-	if (!m_term) {
-		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
-		return 0;
-	} else {
-		::wxLogMessage(wxT("GPAC Terminal started") );
-	}
-	return 1;
-}
-
-
-
-wxOsmo4Frame::wxOsmo4Frame() :
-	wxFrame((wxFrame *) NULL, -1, wxT("Osmo4 - GPAC"), wxPoint(-1, -1), wxSize(320, FRAME_H), //wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER)
-	        wxDEFAULT_FRAME_STYLE
-	       )
-
-{
-	int ws[3];
-	m_Address = NULL;
-	m_pView = NULL;
-	m_term = NULL;
-	SetIcon(wxIcon(osmo4));
-	m_bExternalView = 0;
-	m_last_prog = -1;
-	m_num_chapters = 0;
-	m_chapters_start = NULL;
-	m_bViewRTI = 0;
-	m_logs = NULL;
-	m_bStartupFile = 0;
-	gf_set_progress_callback(this, wxOsmo4_progress_cbk);
-
-	myDropfiles *droptarget = new myDropfiles();
-	droptarget->m_pMain = this;
-	SetDropTarget(droptarget);
-	m_pLogs = new GPACLogs(this);
-	m_bGrabbed = 0;
-
-	/*new menu bar*/
-	wxMenuBar *b = new wxMenuBar();
-	/*file*/
-	wxMenu *menu = new wxMenu();
-	menu->Append(GWX_FILE_OPEN, wxT("&Open File\tCtrl+O"), wxT("Open local presentation"));
-	menu->Append(GWX_FILE_OPEN_URL, wxT("&Open URL\tCtrl+U"), wxT("Open remote presentation"));
-	menu->AppendSeparator();
-	menu->Append(FILE_PROPERTIES, wxT("&Properties\tCtrl+I"), wxT("Show presentation properties"));
-	menu->Enable(FILE_PROPERTIES, 0);
-	wxMenu *smenu = new wxMenu();
-	smenu->Append(ID_MCACHE_ENABLE, wxT("&Enable"), wxT("Turns Recorder On/Off"));
-	smenu->Append(ID_MCACHE_STOP, wxT("&Stop"), wxT("Stops recording and saves"));
-	smenu->Append(ID_MCACHE_ABORT, wxT("&Abort"), wxT("Stops recording and discards"));
-	menu->Append(0, wxT("&Streaming Cache"), smenu);
-	menu->AppendSeparator();
-	menu->Append(FILE_COPY, wxT("&Copy\tCtrl+C"), wxT("Copy selected text"));
-	menu->Append(FILE_PASTE, wxT("&Paste\tCtrl+V"), wxT("Copy selected text"));
-	menu->AppendSeparator();
-	menu->Append(FILE_QUIT, wxT("E&xit"), wxT("Quit the application"));
-	b->Append(menu, wxT("&File"));
-	/*view*/
-	menu = new wxMenu();
-	vp_list = new wxMenu();
-	menu->Append(0, wxT("&Viewpoint"), vp_list);
-	smenu = new wxMenu();
-	smenu->Append(ID_HEADLIGHT, wxT("Headlight"), wxT("Turns headlight on/off"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	smenu->Append(ID_NAVIGATE_NONE, wxT("None"), wxT("Disables Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_WALK, wxT("Walk"), wxT("Walk Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_FLY, wxT("Fly"), wxT("Fly Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_EXAMINE, wxT("Examine"), wxT("Examine Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_PAN, wxT("Pan"), wxT("Pan Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_SLIDE, wxT("Slide"), wxT("Slide Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_ORBIT, wxT("Orbit"), wxT("Orbit Navigation"), wxITEM_CHECK);
-	smenu->Append(ID_NAVIGATE_GAME, wxT("Game"), wxT("Game Navigation"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	wxMenu *ssmenu = new wxMenu();
-	ssmenu->Append(ID_COLLIDE_NONE, wxT("None"), wxT("No Collision detection"), wxITEM_CHECK);
-	ssmenu->Append(ID_COLLIDE_REG, wxT("Regular"), wxT("Regular Collision detection"), wxITEM_CHECK);
-	ssmenu->Append(ID_COLLIDE_DISP, wxT("Displacement"), wxT("Collision detecion with camera displacement"), wxITEM_CHECK);
-	smenu->Append(0, wxT("&Collision"), ssmenu);
-	smenu->Append(ID_GRAVITY, wxT("Gravity"), wxT("Turns gravity on/off"), wxITEM_CHECK);
-	smenu->AppendSeparator();
-	smenu->Append(ID_NAVIGATE_RESET, wxT("Reset"), wxT("Reset Navigation"));
-
-	menu->Append(0, wxT("&Navigation"), smenu);
-	menu->AppendSeparator();
-	menu->Append(VIEW_FULLSCREEN, wxT("&Fullscreen"), wxT("Toggles Fullscreen"), wxITEM_CHECK);
-	menu->Append(VIEW_ORIGINAL, wxT("&Original Size"), wxT("Restore original size"));
-	smenu = new wxMenu();
-	smenu->Append(VIEW_AR_KEEP, wxT("Keep Original\tCtrl+1"), wxT("Keep original aspect ratio"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_FILL, wxT("Fill Screen\tCtrl+2"), wxT("Stretch presentation to fill screen"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_43, wxT("Ratio 4/3\tCtrl+3"), wxT("Force aspect ratio to 4/3"), wxITEM_CHECK);
-	smenu->Append(VIEW_AR_169, wxT("Ratio 16/9\tCtrl+4"), wxT("Force aspect ratio to 16/9"), wxITEM_CHECK);
-	menu->Append(0, wxT("&Aspect Ratio"), smenu);
-	smenu->Check(VIEW_AR_KEEP, 1);
-	menu->AppendSeparator();
-	menu->Append(VIEW_OPTIONS, wxT("&Options"), wxT("View Options"));
-	menu->AppendSeparator();
-	menu->Append(VIEW_RTI, wxT("&Resource Usage"), wxT("View Resource Usage"), wxITEM_CHECK);
-	menu->Append(VIEW_LOGS, wxT("&Logs"), wxT("View GPAC logs"));
-	b->Append(menu, wxT("&View"));
-
-	/*play*/
-	menu = new wxMenu();
-	sel_menu = new wxMenu();
-	sel_menu->Append(0, wxT("&Audio"), new wxMenu());
-	sel_menu->Append(0, wxT("&Video"), new wxMenu());
-	sel_menu->Append(0, wxT("&Subtitles"), new wxMenu());
-	sel_menu->AppendSeparator();
-	sel_menu->Append(ID_ADD_SUB, wxT("&Add Subtitle"), wxT("Adds subtitle"));
-	menu->Append(ID_STREAM_MENU, wxT("&Streams Selection"), sel_menu);
-	chap_menu = new wxMenu();
-	menu->Append(ID_CHAPTER_MENU, wxT("&Chapters"), chap_menu);
-
-	menu->AppendSeparator();
-	menu->Append(VIEW_PLAYLIST, wxT("&Playlist\tCtrl+L"), wxT("Show navigation history as playlist"), wxITEM_CHECK);
-	menu->Append(ID_CLEAR_NAV, wxT("&Clear History"), wxT("Clear navigation history"));
-	menu->AppendSeparator();
-	menu->Append(FILE_PLAY, wxT("&Play/Pause\tCtrl+P"), wxT("Play/Pause/Resume Presentation"));
-	menu->Append(FILE_STEP, wxT("&Step-by-Step\tCtrl+S"), wxT("Play/Pause/Resume Presentation"));
-	menu->Append(FILE_STOP, wxT("&Stop"), wxT("Stop Presentation"));
-	menu->AppendSeparator();
-	menu->Append(FILE_RELOAD_CONFIG, wxT("&Reload Config\tCtrl+R"), wxT("Reload Configuration File"));
-	menu->Append(FILE_RELOAD, wxT("&Reload File\tCtrl+R"), wxT("Reload Presentation"));
-	b->Append(menu, wxT("&Play"));
-
-	menu = new wxMenu();
-	menu->Append(APP_SHORTCUTS, wxT("&Shortcuts"), wxT("Show keyboard shortcuts"));
-	menu->Append(APP_NAV_KEYS, wxT("&Navigation Keys"), wxT("Show navigation keys"));
-	menu->AppendSeparator();
-	menu->Append(APP_ABOUT, wxT("&About"), wxT("Display information and copyright"));
-	b->Append(menu, wxT("&?"));
-
-	SetMenuBar(b);
-
-	m_pStatusbar = CreateStatusBar(1, 0, -1, wxT("statusBar"));
-	ws[0] = 60;
-	ws[1] = 70;
-	ws[2] = -1;
-	m_pStatusbar->SetFieldsCount(3, ws);
-
-	SetStatusBarPane(2);
-	wxColour foreCol = m_pStatusbar->GetBackgroundColour();
-	SetBackgroundColour(foreCol);
-
-
-	m_pTimer = new wxTimer();
-	m_pTimer->SetOwner(this, ID_CTRL_TIMER);
-	m_bGrabbed = 0;
-
-	/*create toolbar*/
-	m_pToolBar = CreateToolBar(wxTB_FLAT|wxTB_HORIZONTAL);
-	m_pOpenFile = new wxBitmap(tool_open_file);
-	m_pPrev = new wxBitmap(tool_prev);
-	m_pNext = new wxBitmap(tool_next);
-	m_pPlay = new wxBitmap(tool_play);
-	m_pPause = new wxBitmap(tool_pause);
-	m_pStep = new wxBitmap(tool_step);
-	m_pStop = new wxBitmap(tool_stop);
-	m_pInfo = new wxBitmap(tool_info);
-	m_pConfig = new wxBitmap(tool_config);
-	m_pSW2D = new wxBitmap(tool_sw_2d);
-	m_pSW3D = new wxBitmap(tool_sw_3d);
-
-	m_pToolBar->AddTool(GWX_FILE_OPEN, wxT(""), *m_pOpenFile, wxT("Open File"));
-	m_pToolBar->AddSeparator();
-	m_pPrevBut = new wxMenuButton(m_pToolBar, FILE_PREV, *m_pPrev);
-	m_pPrevBut->SetToolTip(wxT("Previous Location"));
-	m_pToolBar->AddControl(m_pPrevBut);
-	m_pNextBut = new wxMenuButton(m_pToolBar, FILE_NEXT, *m_pNext);
-	m_pNextBut->SetToolTip(wxT("Next Location"));
-	m_pToolBar->AddControl(m_pNextBut);
-
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(FILE_PLAY, wxT(""), *m_pPlay, wxT("Play/Pause File"));
-	m_pToolBar->AddTool(FILE_STEP, wxT(""), *m_pStep, wxT("Step-by-Step Mode"));
-	m_pToolBar->AddTool(FILE_STOP, wxT(""), *m_pStop, wxT("Stop File"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(FILE_PROPERTIES, wxT(""), *m_pInfo, wxT("Show File Information"));
-	m_pToolBar->AddSeparator();
-	m_pToolBar->AddTool(VIEW_OPTIONS, wxT(""), *m_pConfig, wxT("GPAC Configuration"));
-	m_pToolBar->AddTool(SWITCH_RENDER, wxT(""), *m_pSW3D, wxT("Switch 2D/3D Renderers"));
-
-	m_pToolBar->Realize();
-
-	m_Address = new wxMyComboBox(this, ID_ADDRESS, wxT(""), wxPoint(50, 0), wxSize(80, 20));
-	wxStaticText *add_text = new wxStaticText(this, -1, wxT("URL"), wxPoint(0, 0), wxSize(40, 20));
-	add_text->SetBackgroundColour(foreCol);
-
-	m_pAddBar = new wxBoxSizer(wxHORIZONTAL);
-	m_pAddBar->Add(add_text, 0, wxALIGN_TOP);
-	m_pAddBar->Add(m_Address, 2, wxALIGN_CENTER|wxEXPAND|wxADJUST_MINSIZE);
-	m_pAddBar->SetMinSize(80, 32);
-	m_pAddBar->Layout();
-
-	m_pProg = new wxSlider(this, ID_SLIDER, 0, 0, 1000, wxPoint(0, 22), wxSize(80, 22), wxSL_HORIZONTAL|wxSUNKEN_BORDER);
-	m_pProg->Enable(0);
-	m_pProg->Show();
-	m_pProg->SetBackgroundColour(foreCol);
-
-	m_pView = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
-	m_pView->SetBackgroundColour(wxColour(wxT("BLACK")));
-#ifdef __WXGTK__
-	m_pVisual = new wxWindow(m_pView, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
-	m_pVisual->SetBackgroundColour(wxColour(wxT("BLACK")));
-#endif
-
-	m_pPlayList = new wxPlaylist(this);
-	m_pPlayList->SetIcon(wxIcon(osmo4));
-	m_pPlayList->Hide();
-	Raise();
-	Show();
-
-	m_connected = 0;
-	if (!LoadTerminal()) {
-		Close(TRUE);
-		return;
-	}
-
-
-
-	if (m_bExternalView) SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
-	DoLayout(320, 240);
-	UpdateRenderSwitch();
-
-	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
-	m_console_off = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
-	m_loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
-	m_lookforsubs = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
-
-	ReloadURLs();
-	Raise();
-	m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-	m_LastStatusTime = 0;
-
-	m_pPrevBut->Refresh();
-	m_pNextBut->Refresh();
-
-	wxOsmo4App &app = wxGetApp();
-	if (app.argc>1) {
-		m_pPlayList->QueueURL(wxString(app.argv[1]));
-		m_pPlayList->RefreshList();
-		m_pPlayList->PlayNext();
-	} else {
-		char sPL[GF_MAX_PATH];
-		strcpy((char *) sPL, szAppPath);
-#ifdef WIN32
-		strcat(sPL, "gpac_pl.m3u");
-#else
-		strcat(sPL, ".gpac_pl.m3u");
-#endif
-		m_pPlayList->OpenPlaylist(wxString(sPL, wxConvUTF8) );
-		const char *sOpt = gf_cfg_get_key(m_user.config, "General", "PLEntry");
-		if (sOpt) {
-			m_pPlayList->m_cur_entry = atoi(sOpt);
-			if (m_pPlayList->m_cur_entry>=(s32)gf_list_count(m_pPlayList->m_entries))
-				m_pPlayList->m_cur_entry = -1;
-		}
-
-		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
-		if (sOpt) {
-			gf_term_connect(m_term, sOpt);
-			m_bStartupFile = 1;
-		}
-	}
-
-	sOpt = gf_cfg_get_key(m_user.config, "Audio", "DriverName");
-
-	if (!strcmp(sOpt, "No Audio Output Available")) {
-		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
-		SetStatus(wxT("No audio ouput available"));
-
-	} else {
-		SetStatus(wxT("Ready"));
-	}
-}
-
-wxOsmo4Frame::~wxOsmo4Frame()
-{
-	vp_list = NULL;
-	sel_menu = NULL;
-
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	gf_sys_close();
-	if (m_user.config) gf_cfg_del(m_user.config);
-
-	if (m_chapters_start) gf_free(m_chapters_start);
-	if (m_pView) delete m_pView;
-
-	//m_pToolBar->RemoveTool(FILE_PREV);
-	//m_pToolBar->RemoveTool(FILE_NEXT);
-
-	delete m_pPrevBut;
-	delete m_pNextBut;
-	delete m_pPlayList;
-	delete m_pTimer;
-	delete m_pOpenFile;
-	delete m_pPrev;
-	delete m_pNext;
-	delete m_pPlay;
-	delete m_pPause;
-	delete m_pStep;
-	delete m_pStop;
-	delete m_pInfo;
-	delete m_pConfig;
-	delete m_pSW2D;
-	delete m_pSW3D;
-}
-
-
-BEGIN_EVENT_TABLE(wxOsmo4Frame, wxFrame)
-	EVT_CLOSE(wxOsmo4Frame::OnCloseApp)
-	EVT_MENU(GWX_FILE_OPEN, wxOsmo4Frame::OnFileOpen)
-	EVT_MENU(GWX_FILE_OPEN_URL, wxOsmo4Frame::OnFileOpenURL)
-	EVT_MENU(FILE_RELOAD_CONFIG, wxOsmo4Frame::OnFileReloadConfig)
-	EVT_MENU(FILE_RELOAD, wxOsmo4Frame::OnFileReload)
-	EVT_MENU(FILE_PROPERTIES, wxOsmo4Frame::OnFileProperties)
-	EVT_MENU(FILE_QUIT, wxOsmo4Frame::OnFileQuit)
-	EVT_MENU(VIEW_FULLSCREEN, wxOsmo4Frame::OnFullScreen)
-	EVT_MENU(VIEW_OPTIONS, wxOsmo4Frame::OnOptions)
-	EVT_MENU(VIEW_AR_KEEP, wxOsmo4Frame::OnViewARKeep)
-	EVT_MENU(VIEW_AR_FILL, wxOsmo4Frame::OnViewARFill)
-	EVT_MENU(VIEW_AR_169, wxOsmo4Frame::OnViewAR169)
-	EVT_MENU(VIEW_AR_43, wxOsmo4Frame::OnViewAR43)
-	EVT_MENU(VIEW_ORIGINAL, wxOsmo4Frame::OnViewOriginal)
-	EVT_MENU(VIEW_PLAYLIST, wxOsmo4Frame::OnPlaylist)
-	EVT_UPDATE_UI(VIEW_PLAYLIST, wxOsmo4Frame::OnUpdatePlayList)
-	EVT_MENU(FILE_COPY, wxOsmo4Frame::OnFileCopy)
-	EVT_UPDATE_UI(FILE_COPY, wxOsmo4Frame::OnUpdateFileCopy)
-	EVT_MENU(FILE_PASTE, wxOsmo4Frame::OnFilePaste)
-	EVT_UPDATE_UI(FILE_PASTE, wxOsmo4Frame::OnUpdateFilePaste)
-
-	EVT_MENU(ID_CLEAR_NAV, wxOsmo4Frame::OnClearNav)
-	EVT_UPDATE_UI(ID_STREAM_MENU, wxOsmo4Frame::OnUpdateStreamMenu)
-	EVT_UPDATE_UI(ID_CHAPTER_MENU, wxOsmo4Frame::OnUpdateChapterMenu)
-	EVT_MENU(ID_ADD_SUB, wxOsmo4Frame::OnAddSub)
-
-	EVT_MENU(ID_MCACHE_ENABLE, wxOsmo4Frame::OnCacheEnable)
-	EVT_UPDATE_UI(ID_MCACHE_ENABLE, wxOsmo4Frame::OnUpdateCacheEnable)
-	EVT_MENU(ID_MCACHE_STOP, wxOsmo4Frame::OnCacheStop)
-	EVT_MENU(ID_MCACHE_ABORT, wxOsmo4Frame::OnCacheAbort)
-	EVT_UPDATE_UI(ID_MCACHE_STOP, wxOsmo4Frame::OnUpdateCacheAbort)
-	EVT_UPDATE_UI(ID_MCACHE_ABORT, wxOsmo4Frame::OnUpdateCacheAbort)
-
-
-	EVT_MENU(APP_SHORTCUTS, wxOsmo4Frame::OnShortcuts)
-	EVT_MENU(APP_NAV_KEYS, wxOsmo4Frame::OnNavInfo)
-	EVT_MENU(APP_ABOUT, wxOsmo4Frame::OnAbout)
-	EVT_GPACEVENT(wxOsmo4Frame::OnGPACEvent)
-	EVT_TIMER(ID_CTRL_TIMER, wxOsmo4Frame::OnTimer)
-	EVT_COMMAND_SCROLL(ID_SLIDER, wxOsmo4Frame::OnSlide)
-	EVT_MENU(VIEW_LOGS, wxOsmo4Frame::OnLogs)
-	EVT_MENU(VIEW_RTI, wxOsmo4Frame::OnRTI)
-
-	EVT_MENUBUTTON_OPEN(FILE_PREV, wxOsmo4Frame::OnFilePrevOpen)
-	EVT_MENUBUTTON_OPEN(FILE_NEXT, wxOsmo4Frame::OnFileNextOpen)
-	EVT_MENU(FILE_PREV, wxOsmo4Frame::OnNavPrev)
-	EVT_UPDATE_UI(FILE_PREV, wxOsmo4Frame::OnUpdateNavPrev)
-	EVT_MENU_RANGE(ID_NAV_PREV_0, ID_NAV_PREV_9, wxOsmo4Frame::OnNavPrevMenu)
-	EVT_MENU(FILE_NEXT, wxOsmo4Frame::OnNavNext)
-	EVT_UPDATE_UI(FILE_NEXT, wxOsmo4Frame::OnUpdateNavNext)
-	EVT_MENU_RANGE(ID_NAV_NEXT_0, ID_NAV_NEXT_9, wxOsmo4Frame::OnNavNextMenu)
-
-	EVT_TOOL(FILE_PLAY, wxOsmo4Frame::OnFilePlay)
-	EVT_TOOL(FILE_STEP, wxOsmo4Frame::OnFileStep)
-	EVT_TOOL(FILE_STOP, wxOsmo4Frame::OnFileStop)
-	EVT_TOOL(SWITCH_RENDER, wxOsmo4Frame::OnRenderSwitch)
-
-	EVT_COMBOBOX(ID_ADDRESS, wxOsmo4Frame::OnURLSelect)
-
-	EVT_MENU_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnStreamSel)
-	EVT_UPDATE_UI_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnUpdateStreamSel)
-
-	EVT_MENU_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnChapterSel)
-	EVT_UPDATE_UI_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnUpdateChapterSel)
-
-	EVT_MENU_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnViewport)
-	EVT_UPDATE_UI_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnUpdateViewport)
-
-	EVT_MENU_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnNavigate)
-	EVT_UPDATE_UI_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnUpdateNavigation)
-	EVT_MENU(ID_NAVIGATE_RESET, wxOsmo4Frame::OnNavigateReset)
-
-	EVT_MENU_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnCollide)
-	EVT_UPDATE_UI_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnUpdateCollide)
-
-	EVT_MENU(ID_HEADLIGHT, wxOsmo4Frame::OnHeadlight)
-	EVT_UPDATE_UI(ID_HEADLIGHT, wxOsmo4Frame::OnUpdateHeadlight)
-	EVT_MENU(ID_GRAVITY, wxOsmo4Frame::OnGravity)
-	EVT_UPDATE_UI(ID_GRAVITY, wxOsmo4Frame::OnUpdateGravity)
-
-	EVT_UPDATE_UI(FILE_PROPERTIES, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_RELOAD, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_PLAY, wxOsmo4Frame::OnUpdatePlay)
-	EVT_UPDATE_UI(FILE_STOP, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(FILE_STEP, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(VIEW_ORIGINAL, wxOsmo4Frame::OnUpdateNeedsConnect)
-	EVT_UPDATE_UI(VIEW_FULLSCREEN, wxOsmo4Frame::OnUpdateFullScreen)
-	EVT_UPDATE_UI(VIEW_AR_KEEP, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_FILL, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_169, wxOsmo4Frame::OnUpdateAR)
-	EVT_UPDATE_UI(VIEW_AR_43, wxOsmo4Frame::OnUpdateAR)
-
-	EVT_SIZE(wxOsmo4Frame::OnSize)
-END_EVENT_TABLE()
-
-void wxOsmo4Frame::DoLayout(u32 v_width, u32 v_height)
-{
-	wxPoint pos;
-	if (!m_Address || !m_pProg) return;
-
-	int t_h = m_pToolBar->GetSize().y;
-	int a_h = m_pAddBar->GetSize().y;
-	int p_h = m_pProg->GetSize().y;
-
-	if (m_bExternalView) {
-		if (v_width && v_height) {
-			m_orig_width = v_width;
-			m_orig_height = v_height;
-		}
-		SetClientSize(320, a_h+p_h+t_h);
-		m_pAddBar->SetDimension(0,0, 320, a_h);
-		m_pProg->SetSize(0, t_h+a_h, 320, p_h, 0);
-		return;
-	}
-
-	if (v_width && v_height) {
-		m_orig_width = v_width;
-		m_orig_height = v_height;
-		v_height += a_h + p_h + t_h;
-		SetClientSize(v_width, v_height);
-		m_pView->SetSize(0, a_h+t_h, v_width, v_height, 0);
-		m_pAddBar->SetDimension(0, t_h, v_width, a_h);
-		m_pProg->SetSize(0, v_height - p_h, v_width, p_h, 0);
-	}
-	wxSize s = GetClientSize();
-	s.y -= a_h + p_h + t_h;
-	if (m_pView) {
-		m_pView->SetSize(0, a_h+t_h, s.x, s.y, 0);
-		m_pAddBar->SetDimension(0, 0, s.x, a_h);
-		m_pAddBar->SetDimension(0, 0, s.x, a_h);
-		m_pAddBar->Layout();
-		m_pProg->SetSize(0, s.y+t_h+a_h, s.x, p_h, 0);
-		if (m_term) gf_term_set_size(m_term, s.x, s.y);
-	}
-}
-
-void wxOsmo4Frame::OnSize(wxSizeEvent &event)
-{
-	DoLayout();
-}
-
-void wxOsmo4Frame::OnCloseApp(wxCloseEvent &WXUNUSED(event))
-{
-	if (m_term) gf_term_del(m_term);
-	m_term = NULL;
-	Destroy();
-}
-
-
-wxString wxOsmo4Frame::GetFileFilter()
-{
-	u32 keyCount, i;
-	wxString sFiles, sSupportedFiles, sExts;
-
-	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
-	sSupportedFiles = wxT("All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2");
-	sExts = wxT("");
-	sFiles = wxT("");
-	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
-	for (i=0; i<keyCount; i++) {
-		Bool first = 1;
-		const char *sMime;
-		char *sKey;
-		const char *opt;
-		char szKeyList[1000], sDesc[1000];
-		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
-		if (!sMime) continue;
-		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
-		/*remove module name*/
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-		/*get description*/
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		strcpy(sDesc, sKey+1);
-		sKey[0] = 0;
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-
-		/*if same description for # mime types skip (means an old mime syntax)*/
-		if (sFiles.Find(wxString(sDesc, wxConvUTF8) )>=0) continue;
-		/*if same extensions for # mime types skip (don't polluate the file list)*/
-		if (sExts.Find(wxString(szKeyList, wxConvUTF8) )>=0) continue;
-
-		sExts += wxString(szKeyList, wxConvUTF8);
-		sExts += wxT(" ");
-		sFiles += wxString(sDesc, wxConvUTF8);
-		sFiles += wxT("|");
-
-		wxString sOpt = wxString(szKeyList, wxConvUTF8);
-		while (1) {
-			wxString ext = sOpt.BeforeFirst(' ');
-			if (ext.Find('.')<0) {
-				if (first) first = 0;
-				else sFiles += wxT(";");
-				sFiles += wxT("*.");
-				sFiles += ext;
-				wxString sext = ext;
-				sext += wxT(";");
-				if (sSupportedFiles.Find(sext)<0) {
-					sSupportedFiles  += wxT(";*.");
-					sSupportedFiles += ext;
-				}
-			}
-			if (sOpt==ext) break;
-			wxString rem = ext + wxT(" ");
-			sOpt.Replace(rem, wxT(""), TRUE);
-		}
-		sFiles += wxT("|");
-	}
-	sSupportedFiles += wxT("|");
-	sSupportedFiles += sFiles;
-	sSupportedFiles += wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files|*.*||");
-	return sSupportedFiles;
-}
-
-void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
-
-	if (dlg.ShowModal() != wxID_OK) return;
-
-	wxArrayString stra;
-	dlg.GetPaths(stra);
-	if (stra.GetCount() == 1) {
-		m_pPlayList->Truncate();
-	} else {
-		m_pPlayList->Clear();
-	}
-	for (u32 i=0; i<stra.GetCount(); i++)
-		m_pPlayList->QueueURL(stra[i]);
-
-	m_pPlayList->RefreshList();
-	m_pPlayList->PlayNext();
-}
-
-void wxOsmo4Frame::OnFileOpenURL(wxCommandEvent & WXUNUSED(event))
-{
-	OpenURLDlg dlg(this, m_user.config);
-	if (dlg.ShowModal()==wxID_OK) {
-		m_pPlayList->Truncate();
-		m_pPlayList->QueueURL(dlg.m_urlVal);
-		m_pPlayList->RefreshList();
-		m_pPlayList->PlayNext();
-	}
-}
-
-void wxOsmo4Frame::OnFileProperties(wxCommandEvent & WXUNUSED(event))
-{
-	wxFileProps dlg(this);
-	dlg.SetIcon(wxIcon(osmo4));
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::OnFileReload(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_disconnect(m_term);
-	m_connected = 0;
-	DoConnect();
-}
-
-void wxOsmo4Frame::OnFileReloadConfig(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
-}
-
-void wxOsmo4Frame::OnFileQuit(wxCommandEvent & WXUNUSED(event))
-{
-	Close(FALSE);
-}
-
-void wxOsmo4Frame::OnViewOriginal(wxCommandEvent & WXUNUSED(event))
-{
-	if (!m_bExternalView) {
-		DoLayout(m_orig_width, m_orig_height);
-	} else {
-		gf_term_set_option(m_term, GF_OPT_ORIGINAL_VIEW, 1);
-	}
-}
-
-void wxOsmo4Frame::OnOptions(wxCommandEvent & WXUNUSED(event))
-{
-	wxGPACControl dlg(this);
-	dlg.SetIcon(wxIcon(osmo4));
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::DoConnect()
-{
-	//if (m_connected) { gf_term_disconnect(m_term); m_connected = 0; }
-
-	wxString url = m_pPlayList->GetURL();
-	m_Address->SetValue(url);
-#ifdef __WXGTK__
-	m_pVisual->SetFocus();
-#else
-	m_pView->SetFocus();
-#endif
-	wxString txt = wxT("Osmo4 - ");
-	txt += m_pPlayList->GetDisplayName();
-	SetTitle(txt);
-	m_bStartupFile = 0;
-	gf_term_connect(m_term, url.mb_str(wxConvUTF8));
-}
-
-void wxOsmo4Frame::OnLogs(wxCommandEvent & WXUNUSED(event))
-{
-	m_pLogs->Show();
-}
-
-void wxOsmo4Frame::OnUpdateNeedsConnect(wxUpdateUIEvent &event)
-{
-	event.Enable(m_connected ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdatePlay(wxUpdateUIEvent &event)
-{
-	event.Enable( (m_connected || m_pPlayList->HasValidEntries()) ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateFullScreen(wxUpdateUIEvent &event)
-{
-	if (m_connected) {
-		event.Enable(1);
-		event.Check(gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0);
-	} else {
-		event.Enable(0);
-	}
-}
-
-void wxOsmo4Frame::OnFullScreen(wxCommandEvent & WXUNUSED(event))
-{
-	Bool isFS = gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0;
-	gf_term_set_option(m_term, GF_OPT_FULLSCREEN, isFS ? 0 : 1);
-}
-
-void wxOsmo4Frame::OnViewARKeep(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-}
-void wxOsmo4Frame::OnViewARFill(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-}
-void wxOsmo4Frame::OnViewAR169(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-}
-void wxOsmo4Frame::OnViewAR43(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-}
-
-void wxOsmo4Frame::OnUpdateAR(wxUpdateUIEvent &event)
-{
-	if (!m_connected) {
-		event.Enable(0);
-		return;
-	}
-	event.Enable(1);
-	u32 val = gf_term_get_option(m_term, GF_OPT_ASPECT_RATIO);
-	if ((event.GetId() == VIEW_AR_FILL) && (val==GF_ASPECT_RATIO_FILL_SCREEN))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_KEEP) && (val==GF_ASPECT_RATIO_KEEP))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_169) && (val==GF_ASPECT_RATIO_16_9))
-		event.Check(1);
-	else if ((event.GetId() == VIEW_AR_43) && (val==GF_ASPECT_RATIO_4_3))
-		event.Check(1);
-	else event.Check(0);
-}
-
-void wxOsmo4Frame::OnShortcuts(wxCommandEvent & WXUNUSED(event))
-{
-	wxMessageDialog dlg(this,
-	                    wxT("Shortcuts with focus on main frame:\n")
-	                    wxT("Open File: Ctrl + O\n")
-	                    wxT("Show File Information: Ctrl + I\n")
-	                    wxT("Reload File: Ctrl + R\n")
-	                    wxT("Pause/Resume File: Ctrl + P\n")
-	                    wxT("Step by Step: Ctrl + S\n")
-	                    wxT("Fullscreen On/Off: Alt + Return\n")
-	                    wxT("View Playlist: Ctrl + L\n")
-	                    wxT("Aspect Ratio Normal: Ctrl + 1\n")
-	                    wxT("Aspect Ratio Fill: Ctrl + 2\n")
-	                    wxT("Aspect Ratio 4/3: Ctrl + 3\n")
-	                    wxT("Aspect Ratio 16/9: Ctrl + 4\n")
-	                    wxT("\n")
-	                    wxT("Shortcuts with focus on video frame:\n")
-	                    wxT("Seek +5% into presentation: Alt + right arrow\n")
-	                    wxT("Seek -5% into presentation: Alt + left arrow\n")
-	                    wxT("Seek +1min into presentation: Alt + up arrow\n")
-	                    wxT("Seek -1min into presentation: Alt + down arrow\n")
-	                    wxT("Next Playlist Entry: Ctrl + right arrow\n")
-	                    wxT("Prev Playlist Entry: Ctrl + left arrow\n")
-
-	                    , wxT("Shortcuts Available on Osmo4")
-	                    , wxOK);
-
-	dlg.ShowModal();
-}
-
-void wxOsmo4Frame::OnNavInfo(wxCommandEvent & WXUNUSED(event))
-{
-	wxMessageDialog dlg(this,
-	                    wxT("* Walk & Fly modes:\n")
-	                    wxT("\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n")
-	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n")
-	                    wxT("* Pan mode:\n")
-	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n")
-	                    wxT("* Slide mode:\n")
-	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n")
-	                    wxT("* Examine & Orbit mode:\n")
-	                    wxT("\tH move: Y-Axis rotate - H move+CTRL: No move - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n")
-	                    wxT("\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n")
-	                    wxT("* VR mode:\n")
-	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n")
-	                    wxT("\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n")
-	                    wxT("* Game mode (press END to escape):\n")
-	                    wxT("\tH move: H pan - V move: V pan\n")
-	                    wxT("\tleft/right: H translate - up/down: Z-translate\n")
-	                    wxT("\n")
-	                    wxT("* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n")
-	                    wxT("\n")
-	                    wxT("*Slide Mode in 2D:\n")
-	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL: zoom\n")
-	                    wxT("\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n")
-	                    wxT("*Examine Mode in 2D (3D renderer only):\n")
-	                    wxT("\tH move: Y-Axis rotate - V move: X-Axis rotate\n")
-	                    wxT("\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n")
-	                    wxT("\n")
-	                    wxT("HOME: reset navigation to last viewpoint (2D or 3D navigation)\n")
-	                    wxT("SHIFT key in all modes: fast movement\n")
-
-	                    , wxT("3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC")
-	                    , wxOK );
-	dlg.ShowModal();
-}
-
-
-/*open file dlg*/
-class AboutDlg : public wxDialog {
-public:
-	AboutDlg(wxWindow *parent);
-
-private:
-	wxStaticText *m_info;
-	wxButton *m_close;
-	void OnClose(wxCommandEvent& event);
-	DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(AboutDlg, wxDialog)
-	EVT_BUTTON(ID_ABOUT_CLOSE, AboutDlg::OnClose)
-END_EVENT_TABLE()
-
-AboutDlg::AboutDlg(wxWindow *parent)
-	: wxDialog(parent, -1, wxString(wxT("GPAC/Osmo4 V ")wxT(GPAC_FULL_VERSION)))
-{
-	SetSize(220, 320);
-	Centre();
-	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
-
-	m_info = new wxStaticText(this, -1, wxT("http://gpac.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
-	sizer->Add(m_info, 1, wxEXPAND|wxADJUST_MINSIZE, 0);
-	m_close = new wxButton(this, ID_ABOUT_CLOSE, wxT("Close"), wxDefaultPosition, wxSize(120, 20));
-	sizer->Add(m_close, 0, wxEXPAND, 0);
-
-	SetIcon(wxIcon(osmo4));
-	m_info->SetLabel(
-	    wxT("Osmo4 Player\n")
-	    wxT("GPAC Multimedia Framework\n")
-	    wxT("\n")
-	    wxT("This program is gf_free software and may\n")
-	    wxT("be distributed according to the terms\n")
-	    wxT("of the GNU Lesser General Public License\n")
-	    wxT("\n")
-	    wxT("Authors: Jean Le Feuvre\n")
-	    wxT("(c) Telecom ParisTech 2005-2012\n")
-	    wxT("All Rights Reserved\n")
-	    wxT("http://gpac.sourceforge.net\n")
-	    wxT("\n")
-	    wxT(" ** With Many Thanks To ** \n\n")
-	    wxT("Mozilla SpiderMonkey (JavaScript)\n")
-	    wxT("The FreeType Project\n")
-	    wxT("The PNG Group, The I.J.G.\n")
-	    wxT("FFMPEG, FAAD, XVID, MAD\n")
-	);
-
-	SetSizer(sizer);
-	sizer->Fit(this);
-}
-void AboutDlg::OnClose(wxCommandEvent& WXUNUSED(event))
-{
-	Close(FALSE);
-}
-
-void wxOsmo4Frame::OnAbout(wxCommandEvent & WXUNUSED(event))
-{
-	AboutDlg dlg(this);
-	dlg.ShowModal();
-}
-
-
-void wxOsmo4Frame::OnGPACEvent(wxGPACEvent &event)
-{
-	wxString cmd;
-	wxCommandEvent evt;
-	if (!m_term) return;
-
-	switch (event.gpac_evt.type) {
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(m_term, event.to_url.mb_str(wxConvUTF8), 1, 0)) {
-			char *str = gf_url_concatenate(m_pPlayList->GetURL().mb_str(wxConvUTF8), event.to_url.mb_str(wxConvUTF8));
-			if (str) {
-				m_pPlayList->Truncate();
-				m_pPlayList->QueueURL(wxString(str, wxConvUTF8));
-				m_pPlayList->RefreshList();
-				gf_free(str);
-				m_pPlayList->PlayNext();
-			}
-			return;
-		}
-		cmd = get_pref_browser(m_user.config);
-		if (cmd.IsEmpty()) {
-			cmd += wxT(" ");
-			cmd += event.to_url;
-			wxExecute(cmd);
-		} else {
-#ifdef wxLaunchDefaultBrowser
-			wxLaunchDefaultBrowser(event.to_url);
-#endif
-		}
-		break;
-	case GF_EVENT_QUIT:
-		Close(TRUE);
-		break;
-	case GF_EVENT_SET_CAPTION:
-		SetTitle(event.to_url);
-		break;
-	case GF_EVENT_CONNECT:
-		BuildStreamList(0);
-		ConnectAcknowledged(event.gpac_evt.connect.is_connected);
-		break;
-	case GF_EVENT_KEYDOWN:
-		if (!(event.gpac_evt.key.flags & GF_KEY_MOD_CTRL)) return;
-		switch (event.gpac_evt.key.key_code) {
-		case GF_KEY_R:
-			gf_term_set_option(m_term, GF_OPT_REFRESH, 1);
-			break;
-		case GF_KEY_P:
-			OnFilePlay(evt);
-			break;
-		case GF_KEY_S:
-			OnFileStep(evt);
-			break;
-		}
-		break;
-	case GF_EVENT_SCENE_SIZE:
-		m_orig_width = event.gpac_evt.size.width;
-		m_orig_height = event.gpac_evt.size.height;
-	case GF_EVENT_SIZE:
-		if (! gf_term_get_option(m_term, GF_OPT_FULLSCREEN)) {
-			DoLayout(event.gpac_evt.size.width, event.gpac_evt.size.height);
-		}
-		break;
-	case GF_EVENT_VIEWPOINTS:
-		BuildViewList();
-		break;
-	case GF_EVENT_STREAMLIST:
-		BuildStreamList(0);
-		break;
-	}
-}
-
-
-static wxString format_time(u32 duration, u32 timescale)
-{
-	u32 h, m, s;
-	Float time = duration;
-	time /= timescale;
-	time *= 1000;
-	h = (u32) (time / 1000 / 3600);
-	m = (u32) (time / 1000 / 60 - h*60);
-	s = (u32) (time / 1000 - h*3600 - m*60);
-	return wxString::Format(wxT("%02d:%02d:%02d"), h, m, s);
-}
-
-void wxOsmo4Frame::SetStatus(wxString str)
-{
-	//m_pStatusbar->SetStatusText(str, 2);
-	m_LastStatusTime = gf_sys_clock();
-}
-
-#define RTI_REFRESH_MS		500
-void wxOsmo4Frame::OnRTI(wxCommandEvent & event)
-{
-	m_bViewRTI = event.IsChecked();
-	if (m_bViewRTI) {
-		if (!m_pTimer->IsRunning()) m_pTimer->Start(RTI_REFRESH_MS, 0);
-	} else if (!m_connected && m_pTimer->IsRunning()) {
-		m_LastStatusTime = 0;
-		m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-		m_pTimer->Stop();
-	}
-}
-
-void wxOsmo4Frame::OnTimer(wxTimerEvent& WXUNUSED(event))
-{
-	wxString str;
-	u32 now;
-	if (m_LastStatusTime) {
-		now = gf_sys_clock();
-		if (now > 1000+m_LastStatusTime) {
-			m_LastStatusTime = 0;
-			m_pStatusbar->SetStatusText(wxT("Ready"), 2);
-		}
-	}
-
-	if (m_bViewRTI) {
-		GF_SystemRTInfo rti;
-		if (!gf_sys_get_rti(RTI_REFRESH_MS, &rti, 0)) return;
-		if (rti.gpac_memory) rti.process_memory = rti.gpac_memory;
-
-		str = wxString::Format(wxT("CPU %02d (%02d) - Mem %d kB" ),
-		                       rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
-
-		m_pStatusbar->SetStatusText(str, 2);
-	}
-	if (!m_connected) return;
-
-	now = gf_term_get_time_in_ms(m_term);
-	if (!now) return;
-
-	if (!m_duration) {
-		str = format_time(now, 1000);
-		m_pStatusbar->SetStatusText(str);
-		str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
-		m_pStatusbar->SetStatusText(str, 1);
-		return;
-	}
-#ifdef __WXGTK__
-	if (m_bGrabbed) {
-		u32 now = gf_sys_clock() - m_last_grab_time;
-		if (now>200) {
-			m_bGrabbed = 0;
-			Double res = (Double) m_last_grab_pos;
-			res /= 1000;
-			res *= m_duration;
-			if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-				gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-				m_bToReset = 0;
-			}
-			gf_term_play_from_time(m_term, (u32) res, 0);
-			return;
-		}
-	}
-#endif
-
-	if (!m_bGrabbed) {
-		if ((now >= m_duration + 500) && gf_term_get_option(m_term, GF_OPT_IS_FINISHED)) {
-			m_pPlayList->PlayNext();
-		} else {
-			Double val = now * 1000;
-			val /= m_duration;
-			m_pProg->SetValue((val<=1000) ? (u32) val : 1000);
-
-			if (0) {
-				str = format_time(m_duration-now, 1000);
-			} else {
-				str = format_time(now, 1000);
-			}
-			m_pStatusbar->SetStatusText(str);
-			str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
-			m_pStatusbar->SetStatusText(str, 1);
-		}
-	}
-}
-
-void wxOsmo4Frame::ConnectAcknowledged(Bool bOk)
-{
-	if (bOk) {
-		m_pTimer->Start(RTI_REFRESH_MS, 0);
-		m_connected = 1;
-		m_bToReset = 0;
-		UpdatePlay();
-		BuildChapterList(0);
-	} else {
-		BuildChapterList(1);
-		if (!m_connected) {
-			UpdatePlay();
-			m_pTimer->Stop();
-			//m_pProg->Enable(0);
-		}
-	}
-}
-
-void wxOsmo4Frame::OnFilePlay(wxCommandEvent & WXUNUSED(event))
-{
-	wxCommandEvent evt;
-	if (m_connected) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			if (m_bToReset) {
-				m_pTimer->Start(100, 0);
-				gf_term_play_from_time(m_term, 0, 0);
-			}
-			m_bToReset = 0;
-			UpdatePlay();
-		} else {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-			UpdatePlay();
-		}
-	} else {
-		m_pPlayList->Play();
-	}
-}
-
-void wxOsmo4Frame::OnFileStep(wxCommandEvent & WXUNUSED(event))
-{
-	wxCommandEvent evt;
-	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-	UpdatePlay();
-}
-
-void wxOsmo4Frame::OnFileStop(wxCommandEvent &WXUNUSED(event))
-{
-	Stop();
-}
-
-void wxOsmo4Frame::Stop()
-{
-	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-	}
-	m_bToReset = 1;
-	m_pTimer->Stop();
-	m_pProg->SetValue(0);
-	UpdatePlay();
-}
-
-void wxOsmo4Frame::OnSlide(wxScrollEvent &event)
-{
-	if (!m_duration) return;
-
-	/*wxSlider on GTK is buggy, so track a release timeout*/
-#ifdef __WXGTK__
-	m_last_grab_time = gf_sys_clock();
-	m_bGrabbed = 1;
-	m_last_grab_pos = event.GetPosition();
-	Double now = (Double) m_last_grab_pos;
-	now /= 1000;
-	now *= m_duration;
-	wxString str = format_time((u32) (now), 1000);
-	m_pStatusbar->SetStatusText(str);
-	if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
-#else
-	s32 type = event.GetEventType();
-	if (type == wxEVT_SCROLL_THUMBTRACK) {
-		m_bGrabbed = 1;
-		Double now = (Double) event.GetPosition();
-		now /= 1000;
-		now *= m_duration;
-		wxString str = format_time((u32) (now), 1000);
-		m_pStatusbar->SetStatusText(str);
-	}
-	else if (m_bGrabbed) {
-		m_bGrabbed = 0;
-		Double res = (Double) m_pProg->GetValue();
-		res /= 1000;
-		res *= m_duration;
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
-			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			m_bToReset = 0;
-			if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
-		}
-		gf_term_play_from_time(m_term, (u32) res, 0);
-	}
-#endif
-}
-
-
-void wxOsmo4Frame::BuildViewList()
-{
-	if (!vp_list || !m_connected) return;
-
-	while (vp_list->GetMenuItemCount()) {
-		wxMenuItem* it = vp_list->FindItemByPosition(0);
-		vp_list->Delete(it);
-	}
-
-	s32 id = ID_VIEWPOINT_FIRST;
-	nb_viewpoints = 0;
-	while (1) {
-		const char *szName;
-		Bool bound;
-		GF_Err e = gf_term_get_viewpoint(m_term, nb_viewpoints+1, &szName, &bound);
-		if (e) break;
-		if (szName) {
-			vp_list->AppendCheckItem(id+nb_viewpoints, wxString(szName, wxConvUTF8) );
-		} else {
-			vp_list->AppendCheckItem(id+nb_viewpoints, wxString::Format(wxT("Viewpoint #%d"), nb_viewpoints+1) );
-		}
-		nb_viewpoints++;
-	}
-}
-
-void wxOsmo4Frame::OnViewport(wxCommandEvent & event)
-{
-	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
-	gf_term_set_viewpoint(m_term, ID+1, NULL);
-}
-
-void wxOsmo4Frame::OnUpdateViewport(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
-	const char *szName;
-	Bool bound;
-	gf_term_get_viewpoint(m_term, ID+1, &szName, &bound);
-	event.Enable(1);
-	if (bound) event.Check(1);
-}
-
-void wxOsmo4Frame::OnNavigate(wxCommandEvent & event)
-{
-	switch (event.GetId()) {
-	case ID_NAVIGATE_NONE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		break;
-	case ID_NAVIGATE_WALK:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		break;
-	case ID_NAVIGATE_FLY:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		break;
-	case ID_NAVIGATE_EXAMINE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		break;
-	case ID_NAVIGATE_PAN:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_PAN);
-		break;
-	case ID_NAVIGATE_SLIDE:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		break;
-	case ID_NAVIGATE_ORBIT:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_ORBIT);
-		break;
-	case ID_NAVIGATE_GAME:
-		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_GAME);
-		break;
-	}
-}
-void wxOsmo4Frame::OnNavigateReset(wxCommandEvent & WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 0);
-}
-void wxOsmo4Frame::OnUpdateNavigation(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId();
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	bool enable = type ? 1 : 0;
-
-	u32 mode = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
-	/*common 2D/3D modes*/
-	if (ID==ID_NAVIGATE_NONE) {
-		event.Enable(enable);
-		event.Check(mode ? 0 : 1);
-	}
-	else if (ID==ID_NAVIGATE_EXAMINE) {
-		event.Enable(enable);
-		event.Check((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0);
-	}
-	else if (ID==ID_NAVIGATE_SLIDE) {
-		event.Enable(enable);
-		event.Check((mode==GF_NAVIGATE_SLIDE) ? 1 : 0);
-	}
-
-	if (type==GF_NAVIGATE_TYPE_2D) return;
-	event.Enable(enable);
-	if (ID==ID_NAVIGATE_WALK) event.Check((mode==GF_NAVIGATE_WALK) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_FLY) event.Check((mode==GF_NAVIGATE_FLY) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_PAN) event.Check((mode==GF_NAVIGATE_PAN) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_ORBIT) event.Check((mode==GF_NAVIGATE_ORBIT) ? 1 : 0);
-	else if (ID==ID_NAVIGATE_GAME) event.Check((mode==GF_NAVIGATE_GAME) ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnRenderSwitch(wxCommandEvent &WXUNUSED(event))
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	Bool use_gl = (opt && !stricmp(opt, "yes")) ? 1 : 0;
-	gf_cfg_set_key(m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
-
-	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
-
-	UpdateRenderSwitch();
-}
-
-void wxOsmo4Frame::UpdateRenderSwitch()
-{
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	m_pToolBar->RemoveTool(SWITCH_RENDER);
-	if (opt && !stricmp(opt, "yes"))
-		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW2D, wxNullBitmap, FALSE, NULL, wxT("2D Rasterizer"));
-	else
-		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW3D, wxNullBitmap, FALSE, NULL, wxT("OpenGL Rendering"));
-
-#ifdef WIN32
-	/*there's a display bug with the menubtn, remove and reinsert*/
-	m_pToolBar->RemoveTool(FILE_PREV);
-	m_pToolBar->RemoveTool(FILE_NEXT);
-	m_pToolBar->InsertControl(2, m_pPrevBut);
-	m_pToolBar->InsertControl(3, m_pNextBut);
-#endif
-	m_pToolBar->Realize();
-}
-
-void wxOsmo4Frame::UpdatePlay()
-{
-	m_pToolBar->RemoveTool(FILE_PLAY);
-	if (m_connected) {
-		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED)
-			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
-		else
-			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPause, wxNullBitmap, FALSE, NULL, wxT("Play File"));
-	} else {
-		m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
-	}
-
-#ifdef WIN32
-	/*there's a display bug with the menubtn, remove and reinsert*/
-	m_pToolBar->RemoveTool(FILE_PREV);
-	m_pToolBar->RemoveTool(FILE_NEXT);
-	m_pToolBar->InsertControl(2, m_pPrevBut);
-	m_pToolBar->InsertControl(3, m_pNextBut);
-#endif
-	m_pToolBar->Realize();
-}
-
-void wxOsmo4Frame::OnCollide(wxCommandEvent & event)
-{
-	u32 ID = event.GetId();
-	if (ID==ID_COLLIDE_NONE) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-	else if (ID==ID_COLLIDE_REG) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-	else if (ID==ID_COLLIDE_DISP) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-}
-void wxOsmo4Frame::OnUpdateCollide(wxUpdateUIEvent & event)
-{
-	u32 ID = event.GetId();
-	event.Enable(0);
-	if (!m_connected) return;
-	event.Enable(1);
-	u32 mode = gf_term_get_option(m_term, GF_OPT_COLLISION);
-	if (ID==ID_COLLIDE_NONE) {
-		event.Check((mode==GF_COLLISION_NONE) ? 1 : 0);
-	}
-	else if (ID==ID_COLLIDE_REG) {
-		event.Check((mode==GF_COLLISION_NORMAL) ? 1 : 0);
-	}
-	else if (ID==ID_COLLIDE_DISP) {
-		event.Check((mode==GF_COLLISION_DISPLACEMENT) ? 1 : 0);
-	}
-}
-
-void wxOsmo4Frame::OnHeadlight(wxCommandEvent &WXUNUSED(event))
-{
-	Bool val = !gf_term_get_option(m_term, GF_OPT_HEADLIGHT);
-	gf_term_set_option(m_term, GF_OPT_HEADLIGHT, val);
-}
-void wxOsmo4Frame::OnUpdateHeadlight(wxUpdateUIEvent & event)
-{
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-
-	event.Enable(1);
-	event.Check(gf_term_get_option(m_term, GF_OPT_HEADLIGHT) ? 1 : 0);
-}
-void wxOsmo4Frame::OnGravity(wxCommandEvent & WXUNUSED(event))
-{
-	Bool val = gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 0 : 1;
-	gf_term_set_option(m_term, GF_OPT_GRAVITY, val);
-}
-void wxOsmo4Frame::OnUpdateGravity(wxUpdateUIEvent & event)
-{
-	event.Enable(0);
-	if (!m_connected) return;
-	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
-	if (type!=GF_NAVIGATE_TYPE_3D) return;
-	type = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
-	if (type != GF_NAVIGATE_WALK) return;
-	event.Enable(1);
-	event.Check(gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 1 : 0);
-}
-
-
-BEGIN_EVENT_TABLE(wxMyComboBox, wxComboBox)
-	EVT_KEY_UP(wxMyComboBox::OnKeyUp)
-END_EVENT_TABLE()
-
-void wxMyComboBox::OnKeyUp(wxKeyEvent &event)
-{
-	if (event.GetKeyCode()==WXK_RETURN) {
-		event.Skip();
-		wxCommandEvent evt;
-		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
-		evt.SetEventObject(this);
-		evt.SetId(GetId());
-		GetParent()->AddPendingEvent(evt);
-	}
-}
-
-
-void wxOsmo4Frame::ReloadURLs()
-{
-	const char *sOpt;
-	u32 i=0;
-
-	m_Address->Clear();
-	while (1) {
-		sOpt = gf_cfg_get_key_name(m_user.config, "RecentFiles", i);
-		if (!sOpt) break;
-		m_Address->Append(wxString(sOpt, wxConvUTF8) );
-		i++;
-	}
-}
-
-void wxOsmo4Frame::SelectionReady()
-{
-	wxString urlVal = m_Address->GetValue();
-	if (urlVal.Find(wxT("://"))>0) {
-		UpdateLastFiles(m_user.config, urlVal.mb_str(wxConvUTF8));
-		ReloadURLs();
-	}
-	m_pPlayList->Truncate();
-	m_pPlayList->QueueURL(urlVal);
-	m_pPlayList->RefreshList();
-	m_pPlayList->PlayNext();
-}
-
-void wxOsmo4Frame::OnURLSelect(wxCommandEvent &WXUNUSED(event))
-{
-	SelectionReady();
-}
-
-void wxOsmo4Frame::OnPlaylist(wxCommandEvent &WXUNUSED(event))
-{
-	assert(m_pPlayList);
-	m_pPlayList->Show(m_pPlayList->IsShown() ? 0 : 1);
-}
-
-void wxOsmo4Frame::OnUpdatePlayList(wxUpdateUIEvent & event)
-{
-	event.Enable(1);
-	event.Check(m_pPlayList->IsShown() ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnFilePrevOpen(wxNotifyEvent & event)
-{
-	u32 count = gf_list_count(m_pPlayList->m_entries);
-	u32 start = m_pPlayList->m_cur_entry - 1;
-	wxMenu *popup = new wxMenu();
-
-	for (u32 i=0; i<10; i++) {
-		if (i > start) break;
-		if (start - i >= count) break;
-		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start - i);
-		popup->Append(ID_NAV_PREV_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
-	}
-	m_pPrevBut->AssignMenu(popup);
-}
-
-void wxOsmo4Frame::OnFileNextOpen(wxNotifyEvent & event)
-{
-	u32 count = gf_list_count(m_pPlayList->m_entries);
-	wxMenu *popup = new wxMenu();
-	u32 start = m_pPlayList->m_cur_entry + 1;
-	for (u32 i=0; i<10; i++) {
-		if (start + i >= count) break;
-		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start + i);
-		popup->Append(ID_NAV_NEXT_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
-	}
-	m_pNextBut->AssignMenu(popup);
-}
-
-void wxOsmo4Frame::OnNavPrev(wxCommandEvent &WXUNUSED(event))
-{
-	if (m_pPlayList->m_cur_entry<=0) return;
-	m_pPlayList->PlayPrev();
-}
-void wxOsmo4Frame::OnUpdateNavPrev(wxUpdateUIEvent & event)
-{
-	if (m_pPlayList->m_cur_entry<=0) event.Enable(0);
-	else event.Enable(TRUE);
-}
-void wxOsmo4Frame::OnNavPrevMenu(wxCommandEvent &event)
-{
-	u32 ID = event.GetId() - ID_NAV_PREV_0;
-	s32 prev = m_pPlayList->m_cur_entry - ID;
-	if (prev>=0) {
-		m_pPlayList->m_cur_entry = prev;
-		m_pPlayList->PlayPrev();
-	}
-}
-void wxOsmo4Frame::OnNavNext(wxCommandEvent &WXUNUSED(event))
-{
-	/*don't play if last could trigger playlist loop*/
-	if ((m_pPlayList->m_cur_entry<0) || (gf_list_count(m_pPlayList->m_entries) == 1 + (u32) m_pPlayList->m_cur_entry)) return;
-	m_pPlayList->PlayNext();
-}
-void wxOsmo4Frame::OnUpdateNavNext(wxUpdateUIEvent & event)
-{
-	if (m_pPlayList->m_cur_entry<0) event.Enable(0);
-	else if ((u32) m_pPlayList->m_cur_entry + 1 == gf_list_count(m_pPlayList->m_entries) ) event.Enable(0);
-	else event.Enable(1);
-}
-
-void wxOsmo4Frame::OnNavNextMenu(wxCommandEvent &event)
-{
-	u32 ID = event.GetId() - ID_NAV_NEXT_0;
-	s32 next = m_pPlayList->m_cur_entry + ID;
-	if (next < (s32) gf_list_count(m_pPlayList->m_entries) ) {
-		m_pPlayList->m_cur_entry = next;
-		m_pPlayList->PlayNext();
-	}
-}
-
-void wxOsmo4Frame::OnClearNav(wxCommandEvent &WXUNUSED(event))
-{
-	m_pPlayList->ClearButPlaying();
-}
-
-
-void wxOsmo4Frame::BuildStreamList(Bool reset_only)
-{
-	u32 nb_subs;
-	wxMenu *pMenu;
-
-	pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-	pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-	pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
-	while (pMenu->GetMenuItemCount()) {
-		wxMenuItem* it = pMenu->FindItemByPosition(0);
-		pMenu->Delete(it);
-	}
-
-	if (reset_only) {
-		m_bFirstStreamListBuild = 1;
-		return;
-	}
-
-	if (!gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) return;
-
-	nb_subs = 0;
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 count = gf_term_get_object_count(m_term, root_od);
-
-	for (u32 i=0; i<count; i++) {
-		char szLabel[1024];
-		GF_MediaInfo info;
-		GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, i);
-		if (!odm) return;
-
-		if (gf_term_get_object_info(m_term, odm, &info) != GF_OK) break;
-
-		if (info.owns_service) {
-			char *szName = (char *) strrchr(info.service_url, '\\');
-			if (!szName) szName = (char *) strrchr(info.service_url, '/');
-			if (!szName) szName = (char *) info.service_url;
-			else szName += 1;
-			strcpy(szLabel, szName);
-			szName = strrchr(szLabel, '.');
-			if (szName) szName[0] = '\0';
-		}
-		switch (info.od_type) {
-		case GF_STREAM_AUDIO:
-			pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Audio #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		case GF_STREAM_VISUAL:
-			pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Video #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		case GF_STREAM_TEXT:
-			nb_subs ++;
-			pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
-			if (!info.owns_service) sprintf(szLabel, "Subtitle #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
-			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
-			break;
-		}
-	}
-	if (m_bFirstStreamListBuild) {
-		m_bFirstStreamListBuild = 0;
-		if (!nb_subs && m_lookforsubs) LookForSubtitles();
-	}
-}
-
-void wxOsmo4Frame::OnStreamSel(wxCommandEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SELSTREAM_0;
-	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
-	gf_term_select_object(m_term, odm);
-}
-
-void wxOsmo4Frame::OnUpdateStreamSel(wxUpdateUIEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SELSTREAM_0;
-
-	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
-	if (!odm) return;
-
-	GF_MediaInfo info;
-	gf_term_get_object_info(m_term, odm, &info);
-	event.Enable(1);
-	event.Check(info.status ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateStreamMenu(wxUpdateUIEvent & event)
-{
-	if (!m_connected || !gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) {
-		event.Enable(0);
-	} else {
-		event.Enable(1);
-	}
-}
-
-void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
-{
-	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
-
-	if (dlg.ShowModal() == wxID_OK) {
-		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
-	}
-
-}
-
-void wxOsmo4Frame::AddSubtitle(const char *fileName, Bool auto_play)
-{
-	gf_term_add_object(m_term, fileName, auto_play);
-}
-
-static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	wxOsmo4Frame *_this = (wxOsmo4Frame*)cbck;
-	_this->AddSubtitle(item_path, 0);
-	return 0;
-}
-
-void wxOsmo4Frame::LookForSubtitles()
-{
-	char dir[GF_MAX_PATH];
-	const char *url = m_pPlayList->GetURL().mb_str(wxConvUTF8);
-	strcpy(dir, url);
-	char *sep = strrchr(dir, '\\');
-	if (!sep) strcpy(dir, ::wxGetCwd().mb_str(wxConvUTF8));
-	else sep[0] = 0;
-
-	gf_enum_directory(dir, 0, subs_enum_dir_item, this, "ttxt;srt");
-}
-
-void wxOsmo4Frame::OnCacheEnable(wxCommandEvent &WXUNUSED(event))
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED);
-	} else if (state==GF_MEDIA_CACHE_DISABLED) {
-		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-	}
-}
-
-void wxOsmo4Frame::OnCacheStop(wxCommandEvent &WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-}
-
-void wxOsmo4Frame::OnCacheAbort(wxCommandEvent &WXUNUSED(event))
-{
-	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISCARD);
-}
-
-void wxOsmo4Frame::OnUpdateCacheEnable(wxUpdateUIEvent & event)
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	switch (state) {
-	case GF_MEDIA_CACHE_ENABLED:
-		event.Enable(1);
-		event.SetText(wxT("Enabled"));
-		break;
-	case GF_MEDIA_CACHE_RUNNING:
-		event.SetText(wxT("Running"));
-		event.Enable(0);
-		break;
-	case GF_MEDIA_CACHE_DISABLED:
-		event.SetText(wxT("Disabled"));
-		break;
-	}
-}
-
-void wxOsmo4Frame::OnUpdateCacheAbort(wxUpdateUIEvent & event)
-{
-	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
-	event.Enable( (state==GF_MEDIA_CACHE_RUNNING) ? 1 : 0);
-}
-
-
-
-void wxOsmo4Frame::BuildChapterList(Bool reset_only)
-{
-	GF_MediaInfo odi;
-
-	while (chap_menu->GetMenuItemCount()) {
-		wxMenuItem* it = chap_menu->FindItemByPosition(0);
-		chap_menu->Delete(it);
-	}
-	if (m_chapters_start) gf_free(m_chapters_start);
-	m_chapters_start = NULL;
-	m_num_chapters = 0;
-	if (reset_only) return;
-
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	if (gf_term_get_object_info(m_term, root_od, &odi) != GF_OK) return;
-
-	u32 count = gf_list_count(odi.od->OCIDescriptors);
-	m_num_chapters = 0;
-	for (u32 i=0; i<count; i++) {
-		char szLabel[1024];
-		GF_Segment *seg = (GF_Segment *) gf_list_get(odi.od->OCIDescriptors, i);
-		if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
-
-		if (seg->SegmentName && strlen((const char *)seg->SegmentName)) {
-			strcpy(szLabel, (const char *) seg->SegmentName);
-		} else {
-			sprintf(szLabel, "Chapter %02d", m_num_chapters+1);
-		}
-		chap_menu->AppendCheckItem(ID_SETCHAP_FIRST + m_num_chapters, wxString(szLabel, wxConvUTF8));
-
-		m_chapters_start = (Double *) gf_realloc(m_chapters_start, sizeof(Double)*(m_num_chapters+1));
-		m_chapters_start[m_num_chapters] = seg->startTime;
-		m_num_chapters++;
-	}
-
-	/*get any service info*/
-	NetInfoCommand com;
-	if (!m_bStartupFile && gf_term_get_service_info(m_term, root_od, &com) == GF_OK) {
-		wxString title = wxT("");
-		if (com.track_info) {
-			title.Format(wxT("%02d "), (u32) (com.track_info>>16) );
-		}
-		if (com.artist) {
-			title.Append(wxString(com.artist, wxConvUTF8));
-			title += wxT(" ");
-		}
-		if (com.name) {
-			title.Append(wxString(com.name, wxConvUTF8));
-			title += wxT(" ");
-		}
-		if (com.album) {
-			title += wxT("(");
-			title.Append(wxString(com.album, wxConvUTF8));
-			title += wxT(")");
-		}
-
-		if (title.length()) SetTitle(title);
-	}
-
-}
-
-void wxOsmo4Frame::OnChapterSel(wxCommandEvent & event)
-{
-	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
-	if (!root_od) return;
-	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
-	gf_term_play_from_time(m_term, (u32) (1000*m_chapters_start[ID]), 0);
-}
-
-void wxOsmo4Frame::OnUpdateChapterSel(wxUpdateUIEvent & event)
-{
-	Double now;
-	Bool is_current;
-	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
-
-	now = gf_term_get_time_in_ms(m_term);
-	now /= 1000;
-
-	is_current = 0;
-	if (m_chapters_start[ID]<=now) {
-		if (ID+1<m_num_chapters) {
-			if (m_chapters_start[ID+1]>now) is_current = 1;
-		} else {
-			is_current = 1;
-		}
-	}
-	event.Enable(1);
-	event.Check(is_current ? 1 : 0);
-}
-
-void wxOsmo4Frame::OnUpdateChapterMenu(wxUpdateUIEvent & event)
-{
-	if (!m_connected || !m_num_chapters) {
-		event.Enable(0);
-	} else {
-		event.Enable(1);
-	}
-}
-
-void wxOsmo4Frame::OnFileCopy(wxCommandEvent &event)
-{
-	const char *text = gf_term_get_text_selection(m_term, 0);
-	if (!text) return;
-	if (!wxTheClipboard->Open()) return;
-
-	wxTheClipboard->SetData( new wxTextDataObject( wxString(text, wxConvUTF8)) );
-	wxTheClipboard->Close();
-}
-
-void wxOsmo4Frame::OnUpdateFileCopy(wxUpdateUIEvent &event)
-{
-	if (gf_term_get_text_selection(m_term, 1)!=NULL) {
-		event.Enable(1);
-	} else {
-		event.Enable(0);
-	}
-}
-
-void wxOsmo4Frame::OnFilePaste(wxCommandEvent &event)
-{
-	if (!wxTheClipboard->Open()) return;
-	if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
-		wxTextDataObject data;
-		wxTheClipboard->GetData(data);
-		gf_term_paste_text(m_term, data.GetText().mb_str(wxConvUTF8), 0);
-	}
-	wxTheClipboard->Close();
-}
-
-void wxOsmo4Frame::OnUpdateFilePaste(wxUpdateUIEvent &event)
-{
-	Bool ok = 0;
-	if (wxTheClipboard->Open()) {
-		if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
-			if (gf_term_paste_text(m_term, NULL, 1)==GF_OK) {
-				ok = 1;
-			}
-		}
-		wxTheClipboard->Close();
-	}
-	event.Enable(ok ? 1 : 0);
-}
-

gpac-0.8.0.tar.gz/applications/osmophone Deleted

gpac-0.8.0.tar.gz/applications/osmophone/main.cpp Deleted

@@ -1,1496 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / command-line client
- *
- *  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.
- *
- */
-
-/*includes both terminal and od browser*/
-#include <gpac/terminal.h>
-#include <gpac/options.h>
-/*for initial setup*/
-#include <gpac/modules/service.h>
-
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-
-#include <windows.h>
-#include <commdlg.h>
-#include <commctrl.h>
-
-#ifdef _WIN32_WCE
-#include <aygshell.h>
-#include <gx.h>
-
-#else
-
-#ifndef _T
-#define _T(__a) (LPCSTR) __a
-#endif
-
-#endif
-
-#include "resource.h"
-
-#define WM_LOADTERM	WM_USER + 1
-#define STATE_TIMER_ID		20
-#define STATE_TIMER_DUR		1000
-#define GPAC_TIMER_ID		21
-#define GPAC_TIMER_DUR		33
-
-
-Bool gf_file_dialog(HINSTANCE inst, HWND parent, char *url, const char *ext_list, GF_Config *cfg);
-void set_backlight_state(Bool disable);
-void refresh_recent_files();
-void do_layout(Bool notif_size);
-
-static HWND g_hwnd = NULL;
-static HWND g_hwnd_disp = NULL;
-static HWND g_hwnd_menu = NULL;
-static HWND g_hwnd_status = NULL;
-static HINSTANCE g_hinst = NULL;
-static Bool is_ppc = GF_FALSE;
-
-static Bool is_connected = GF_FALSE;
-static Bool navigation_on = GF_FALSE;
-static Bool playlist_navigation_on = GF_TRUE;
-
-static u32 log_level = GF_LOG_ERROR;
-
-static u32 Duration;
-static Bool CanSeek = GF_FALSE;
-static u32 Volume=100;
-static char the_url[GF_MAX_PATH] = "";
-static Bool NavigateTo = GF_FALSE;
-static char the_next_url[GF_MAX_PATH];
-static GF_Terminal *term;
-static GF_User user;
-static u32 disp_w = 0;
-static u32 disp_h = 0;
-static u32 screen_w = 0;
-static u32 screen_h = 0;
-static u32 menu_h = 0;
-static u32 caption_h = 0;
-static u32 ratio_h = 1;
-static Bool backlight_off = GF_FALSE;
-static u32 prev_batt_bl, prev_ac_bl;
-static Bool show_status = GF_TRUE;
-static Bool reset_status = GF_TRUE;
-static u32 last_state_time = 0;
-static Bool loop = GF_FALSE;
-static Bool full_screen = GF_FALSE;
-static Bool force_2d_gl = GF_FALSE;
-static Bool ctrl_mod_down = GF_FALSE;
-static Bool view_cpu = GF_TRUE;
-static Bool use_low_fps = GF_FALSE;
-static Bool use_svg_prog = GF_FALSE;
-
-static Bool log_rti = GF_FALSE;
-static FILE *log_file = NULL;
-static u32 rti_update_time_ms = 200;
-
-static u32 playlist_act = 0;
-
-
-void recompute_res(u32 sw, u32 sh )
-{
-	caption_h = GetSystemMetrics(SM_CYCAPTION);
-	menu_h = GetSystemMetrics(SM_CYMENU)+2;
-	screen_w = GetSystemMetrics(SM_CXSCREEN);
-	screen_h = GetSystemMetrics(SM_CYSCREEN);
-
-	ratio_h = sh / screen_h;
-	screen_w = sw;
-	screen_h = sh;
-	menu_h *= ratio_h;
-//	caption_h *= ratio_h;
-	disp_w = screen_w;
-	disp_h = screen_h - menu_h /*- caption_h*/;
-}
-
-
-void set_status(char *state)
-{
-	if (show_status && g_hwnd_status) {
-#ifdef _WIN32_WCE
-		TCHAR wstate[1024];
-		CE_CharToWide(state, (u16 *) wstate);
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
-#else
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) state);
-#endif
-		last_state_time = GetTickCount();
-	}
-}
-
-void update_state_info()
-{
-	TCHAR wstate[1024];
-	Double FPS;
-	u32 time, m, s;
-	if (!show_status) return;
-	if (last_state_time) {
-		if (GetTickCount() > last_state_time + 200) {
-			last_state_time = 0;
-			reset_status = GF_TRUE;
-		}
-		else return;
-	}
-	if (!term) return;
-	if (!is_connected && reset_status) {
-		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) TEXT("Ready") );
-		reset_status = GF_FALSE;
-		return;
-	}
-
-	FPS = gf_term_get_framerate(term, GF_FALSE);
-	time = gf_term_get_time_in_ms(term) / 1000;
-	m = time/60;
-	s = time - m*60;
-	if (view_cpu) {
-		GF_SystemRTInfo rti;
-		if (!gf_sys_get_rti(STATE_TIMER_DUR, &rti, 0)) return;
-		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f : CPU %02d"), m, s, FPS, rti.total_cpu_usage);
-	} else {
-		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f"), m, s, FPS);
-	}
-	SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
-}
-
-
-static u64 prev_pos = 0;
-void cbk_on_progress(void *_title, u64 done, u64 total)
-{
-#if 0
-	char szMsg[1024];
-	u32 pos = (u32) ((u64) done * 100)/total;
-	if (pos<prev_pos) prev_pos = 0;
-	if (pos!=prev_pos) {
-		prev_pos = pos;
-		sprintf(szMsg, "%s: (%02d/100)", _title ? (char *)_title : "", pos);
-		set_status(szMsg);
-	}
-#endif
-}
-
-void set_full_screen()
-{
-	full_screen = (Bool)!full_screen;
-	if (full_screen) {
-		show_status = GF_FALSE;
-		do_layout(GF_FALSE);
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
-	} else {
-		const char *str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-		show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
-		do_layout(GF_TRUE);
-	}
-}
-
-
-static void on_gpac_rti_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	if (!log_file) return;
-
-	if (lm & GF_LOG_RTI) {
-		GF_SystemRTInfo rti;
-		if (fmt) vfprintf(log_file, fmt, list);
-
-		gf_sys_get_rti(rti_update_time_ms, &rti, 0);
-
-		fprintf(log_file, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t\t",
-		        gf_sys_clock(),
-		        gf_term_get_time_in_ms(term),
-		        rti.total_cpu_usage,
-		        (u32) gf_term_get_framerate(term, GF_FALSE),
-		        (u32) ( rti.gpac_memory / 1024)
-		       );
-	} else if (fmt && (ll>=GF_LOG_INFO)) {
-		vfprintf(log_file, fmt, list);
-	}
-}
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	if (fmt && log_file) vfprintf(log_file, fmt, list);
-}
-
-
-static void setup_logs()
-{
-	if (log_file) gf_fclose(log_file);
-	log_file = NULL;
-
-	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-	gf_log_set_callback(NULL, NULL);
-
-	if (log_rti) {
-		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		log_file = gf_fopen(filename, "a+t");
-
-		fprintf(log_file, "!! GPAC RunTime Info for file %s !!\n", the_url);
-		fprintf(log_file, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
-
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-		gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
-		gf_log_set_callback(log_file, on_gpac_rti_log);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI] System state when enabling log\n"));
-	} else {
-		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-		if (!filename) {
-			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
-			filename = "\\gpac_logs.txt";
-		}
-		const char *logs = gf_cfg_get_key(user.config, "General", "Logs");
-		if (logs) {
-			if (gf_log_set_tools_levels( logs ) != GF_OK) {
-			} else {
-				if (log_file = gf_fopen(filename, "a+t")) {
-					gf_log_set_callback(log_file, on_gpac_log);
-				}
-			}
-		}
-	}
-}
-
-void do_open_file()
-{
-	gf_cfg_set_key(user.config, "RecentFiles", the_url, NULL);
-	gf_cfg_insert_key(user.config, "RecentFiles", the_url, "", 0);
-	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
-	if (count > 10) gf_cfg_set_key(user.config, "RecentFiles", gf_cfg_get_key_name(user.config, "RecentFiles", count-1), NULL);
-
-	setup_logs();
-
-	gf_term_connect(term, the_url);
-}
-
-void switch_playlist(Bool play_prev)
-{
-	char szPLE[20];
-	u32 idx = 0;
-	u32 count;
-	const char *ple = gf_cfg_get_key(user.config, "General", "PLEntry");
-	if (ple) idx = atoi(ple);
-
-	count = gf_cfg_get_key_count(user.config, "Playlist");
-	if (!count) return;
-	/*not the first launch*/
-	if (strlen(the_url)) {
-		if (!idx && play_prev) return;
-		if (play_prev) idx--;
-		else idx++;
-		if (idx>=count) return;
-	} else {
-		if (idx>=count) idx=0;
-	}
-
-	ple = gf_cfg_get_key_name(user.config, "Playlist", idx);
-	if (!ple) return;
-
-	sprintf(szPLE, "%d", idx);
-	gf_cfg_set_key(user.config, "General", "PLEntry", szPLE);
-
-	strcpy(the_url, ple);
-	do_open_file();
-}
-
-
-Bool GPAC_EventProc(void *ptr, GF_Event *evt)
-{
-	switch (evt->type) {
-	case GF_EVENT_DURATION:
-		Duration = (u32) (evt->duration.duration*1000);
-		CanSeek = evt->duration.can_seek;
-		break;
-	case GF_EVENT_MESSAGE:
-	{
-		if (!evt->message.message) return GF_FALSE;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s: %s\n", evt->message.message, gf_error_to_string(evt->message.error)));
-		//set_status((char *) evt->message.message);
-	}
-	break;
-	case GF_EVENT_PROGRESS:
-	{
-		char *szTitle = "";
-		if (evt->progress.progress_type==0) szTitle = "Buffer ";
-		else if (evt->progress.progress_type==1) szTitle = "Download ";
-		else if (evt->progress.progress_type==2) szTitle = "Import ";
-		cbk_on_progress(szTitle, evt->progress.done, evt->progress.total);
-	}
-	break;
-
-	case GF_EVENT_SIZE:
-		break;
-	case GF_EVENT_RESOLUTION:
-		recompute_res(evt->size.width, evt->size.height);
-		do_layout(GF_TRUE);
-		break;
-
-	case GF_EVENT_SCENE_SIZE:
-		do_layout(GF_TRUE);
-		break;
-	case GF_EVENT_DBLCLICK:
-		set_full_screen();
-		return GF_FALSE;
-	case GF_EVENT_CONNECT:
-		if (evt->connect.is_connected) {
-			is_connected = GF_TRUE;
-			if (!backlight_off) set_backlight_state(GF_TRUE);
-			refresh_recent_files();
-			navigation_on = (gf_term_get_option(term, GF_OPT_NAVIGATION)==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
-		} else {
-			navigation_on = GF_FALSE;
-			is_connected = GF_FALSE;
-			Duration = 0;
-		}
-		break;
-	case GF_EVENT_EOS:
-		if (Duration>2000)
-			gf_term_play_from_time(term, 0, 0);
-		break;
-	case GF_EVENT_QUIT:
-		PostMessage(g_hwnd, WM_DESTROY, 0, 0);
-		break;
-	case GF_EVENT_KEYDOWN:
-		switch (evt->key.key_code) {
-		case GF_KEY_ENTER:
-			if (full_screen) set_full_screen();
-			break;
-		case GF_KEY_1:
-			ctrl_mod_down = (Bool)!ctrl_mod_down;
-			evt->key.key_code = GF_KEY_CONTROL;
-			evt->type = ctrl_mod_down ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
-			gf_term_user_event(term, evt);
-			break;
-		case GF_KEY_MEDIAPREVIOUSTRACK:
-			playlist_act = 2;
-			break;
-		case GF_KEY_MEDIANEXTTRACK:
-			playlist_act = 1;
-			break;
-		}
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
-			gf_term_navigate_to(term, evt->navigate.to_url);
-			return GF_TRUE;
-		} else {
-#ifdef _WIN32_WCE
-			u16 dst[1024];
-#endif
-			SHELLEXECUTEINFO info;
-
-			/*
-						if (full_screen) gf_term_set_option(term, GF_OPT_FULLSCREEN, 0);
-						full_screen = 0;
-			*/
-			memset(&info, 0, sizeof(SHELLEXECUTEINFO));
-			info.cbSize = sizeof(SHELLEXECUTEINFO);
-			info.lpVerb = _T("open");
-			info.fMask = SEE_MASK_NOCLOSEPROCESS;
-			info.lpFile = _T("iexplore");
-#ifdef _WIN32_WCE
-			CE_CharToWide((char *) evt->navigate.to_url, dst);
-			info.lpParameters = (LPCTSTR) dst;
-#else
-			info.lpParameters = evt->navigate.to_url;
-#endif
-			info.nShow = SW_SHOWNORMAL;
-			ShellExecuteEx(&info);
-		}
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-//#define TERM_NOT_THREADED
-
-Bool LoadTerminal()
-{
-	/*by default use current dir*/
-	strcpy(the_url, ".");
-
-	setup_logs();
-
-	g_hwnd_disp = CreateWindow(TEXT("STATIC"), NULL, WS_CHILD | WS_VISIBLE , 0, 0, disp_w, disp_h, g_hwnd, NULL, g_hinst, NULL);
-
-	user.EventProc = GPAC_EventProc;
-	/*dummy in this case (global vars) but MUST be non-NULL*/
-	user.opaque = user.modules;
-	user.os_window_handler = g_hwnd_disp;
-#ifdef TERM_NOT_THREADED
-	user.init_flags = GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION;
-#endif
-
-	term = gf_term_new(&user);
-	if (!term) {
-		gf_modules_del(user.modules);
-		gf_cfg_del(user.config);
-		memset(&user, 0, sizeof(GF_User));
-		return GF_FALSE;
-	}
-
-#ifdef _WIN32_WCE
-	screen_w = term->compositor->video_out->max_screen_width;
-	screen_h = term->compositor->video_out->max_screen_height;
-	disp_w = screen_w;
-	disp_h = screen_h - menu_h /*- caption_h*/;
-#endif
-
-#ifdef TERM_NOT_THREADED
-	::SetTimer(g_hwnd, GPAC_TIMER_ID, GPAC_TIMER_DUR, NULL);
-#endif
-
-	const char *str = gf_cfg_get_key(user.config, "General", "StartupFile");
-	if (str) {
-		do_layout(GF_TRUE);
-		strcpy(the_url, str);
-		gf_term_connect(term, str);
-	}
-	return GF_TRUE;
-}
-
-void do_layout(Bool notif_size)
-{
-	u32 w, h;
-	if (full_screen) {
-		w = screen_w;
-		h = screen_h;
-		::ShowWindow(g_hwnd_status, SW_HIDE);
-#ifdef _WIN32_WCE
-		::ShowWindow(g_hwnd_menu, SW_HIDE);
-#endif
-
-#ifdef _WIN32_WCE
-		SHFullScreen(g_hwnd, SHFS_HIDESIPBUTTON);
-#endif
-		::MoveWindow(g_hwnd, 0, 0, screen_w, screen_h, 1);
-		::MoveWindow(g_hwnd_disp, 0, 0, screen_w, screen_h, 1);
-		SetForegroundWindow(g_hwnd_disp);
-	} else {
-#ifdef _WIN32_WCE
-		::ShowWindow(g_hwnd_menu, SW_SHOW);
-#endif
-		if (show_status) {
-			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
-			::ShowWindow(g_hwnd_status, SW_SHOW);
-			::MoveWindow(g_hwnd_status, 0, 0, disp_w, caption_h, 1);
-			::MoveWindow(g_hwnd_disp, 0, caption_h, disp_w, disp_h - caption_h, 1);
-			w = disp_w;
-			h = disp_h - caption_h*ratio_h;
-		} else {
-			::ShowWindow(g_hwnd_status, SW_HIDE);
-//			::MoveWindow(g_hwnd, 0, caption_h, disp_w, disp_h, 1);
-			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
-			::MoveWindow(g_hwnd_disp, 0, 0, disp_w, disp_h, 1);
-			w = disp_w;
-			h = disp_h;
-		}
-	}
-	if (notif_size && term) gf_term_set_size(term, w, h);
-}
-
-
-void set_backlight_state(Bool disable)
-{
-#ifdef _WIN32_WCE
-	HKEY hKey = 0;
-	DWORD dwSize;
-	DWORD dwValue;
-	HANDLE hBL;
-	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
-
-	if (disable) {
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &prev_batt_bl, &dwSize);
-		dwSize = 4;
-		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &prev_ac_bl,&dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		dwSize = 4;
-		dwValue = 0xefff ;
-		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		backlight_off = GF_TRUE;
-	} else {
-		if (prev_batt_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&prev_batt_bl, dwSize);
-		}
-		if (prev_ac_bl) {
-			dwSize = 4;
-			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&prev_ac_bl, dwSize);
-		}
-		backlight_off = GF_FALSE;
-	}
-	RegCloseKey(hKey);
-	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
-	if (hBL) {
-		SetEvent(hBL);
-		CloseHandle(hBL);
-	}
-#endif
-}
-
-static Bool do_resume = GF_FALSE;
-static Bool prev_backlight_state;
-void gf_freeze_display(Bool do_gf_freeze)
-{
-	if (do_gf_freeze) {
-		prev_backlight_state = backlight_off;
-		do_resume = GF_FALSE;
-		if (0 && is_connected && gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-			do_resume= GF_TRUE;
-			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-		/*gf_freeze display*/
-		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 1);
-
-		set_backlight_state(GF_FALSE);
-		gf_sleep(100);
-	} else {
-		if (prev_backlight_state) set_backlight_state(GF_TRUE);
-		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 0);
-
-		if (do_resume) {
-			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-			set_backlight_state(GF_TRUE);
-		}
-	}
-}
-
-static void show_taskbar(Bool show_it)
-{
-#ifdef _WIN32_WCE
-	HWND wnd;
-	if (!is_ppc) return;
-
-	wnd = GetForegroundWindow();
-	wnd = g_hwnd;
-	if (show_it) {
-		SHFullScreen(wnd, SHFS_SHOWSTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
-		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
-	} else {
-		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
-		SHFullScreen(wnd, SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
-	}
-#endif
-}
-
-void refresh_recent_files()
-{
-#ifdef _WIN32_WCE
-	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
-
-	HMENU hMenu = (HMENU)SendMessage(g_hwnd_menu, SHCMBM_GETSUBMENU, 0, ID_MENU_FILE);
-	/*pos is hardcoded*/
-	hMenu = GetSubMenu(hMenu, 2);
-
-	while (RemoveMenu(hMenu, 0, MF_BYPOSITION)) {}
-
-	for (u32 i=0; i<count; i++) {
-		TCHAR txt[100];
-		char *name;
-		const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", i);
-		name = strrchr(sOpt, '\\');
-		if (!name) name = strrchr(sOpt, '/');
-		if (!name) name = (char *) sOpt;
-		else name += 1;
-
-		CE_CharToWide(name, (u16 *) txt);
-		AppendMenu(hMenu, MF_STRING, IDM_OPEN_FILE1+i, txt);
-	}
-#endif
-}
-
-
-void open_file(HWND hwnd)
-{
-	Bool res;
-	char ext_list[4096];
-	strcpy(ext_list, "");
-
-	gf_freeze_display(GF_TRUE);
-
-	u32 count = gf_cfg_get_key_count(user.config, "MimeTypes");
-	for (u32 i=0; i<count; i++) {
-		char szKeyList[1000], *sKey;
-		const char *sMime = gf_cfg_get_key_name(user.config, "MimeTypes", i);
-		const char *opt = gf_cfg_get_key(user.config, "MimeTypes", sMime);
-		strcpy(szKeyList, opt+1);
-		sKey = strrchr(szKeyList, '\"');
-		if (!sKey) continue;
-		sKey[0] = 0;
-		strcat(ext_list, szKeyList);
-		strcat(ext_list, " ");
-	}
-#ifdef _WIN32_WCE
-	res = gf_file_dialog(g_hinst, hwnd, the_url, ext_list, user.config);
-#else
-	res = GF_FALSE;
-#endif
-	gf_freeze_display(GF_FALSE);
-
-	/*let's go*/
-	if (res) do_open_file();
-}
-
-void load_recent_file(u32 idx)
-{
-	const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", idx);
-	if (sOpt) {
-		strcpy(the_url, sOpt);
-		do_open_file();
-	}
-}
-
-BOOL CALLBACK AboutDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
-{
-	BOOL ret = TRUE;
-	switch (Msg) {
-	case WM_INITDIALOG:
-	{
-		char szText[4096];
-		HWND hctl = GetDlgItem(hWnd, IDC_NAMECTRL);
-		sprintf(szText, "GPAC/Osmo4\nversion %s", GPAC_FULL_VERSION);
-#ifdef _WIN32_WCE
-		TCHAR           psz[80];
-		ZeroMemory(psz, sizeof(psz));
-		SHINITDLGINFO sid;
-		ZeroMemory(&sid, sizeof(sid));
-		sid.dwMask  = SHIDIM_FLAGS;
-		sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
-		sid.hDlg    = hWnd;
-		SHInitDialog(&sid);
-
-		SHMENUBARINFO mbi;
-		memset(&mbi, 0, sizeof(SHMENUBARINFO));
-		mbi.cbSize = sizeof(SHMENUBARINFO);
-		mbi.hwndParent = hWnd;
-		mbi.nToolBarId = IDR_ABOUT_MENU;
-		mbi.hInstRes = g_hinst;
-		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;
-		SHCreateMenuBar(&mbi);
-
-		u16 swText[4096];
-		CE_CharToWide(szText, swText);
-
-		SetWindowText(hctl, (LPCWSTR) swText);
-#else
-		SetWindowText(hctl, szText);
-#endif
-		MoveWindow(hctl, 0, 0, screen_w, 40, 1);
-		MoveWindow(hWnd, 0, 0, screen_w, disp_w, 1);
-
-	}
-	break;
-	case WM_COMMAND:
-	case WM_CLOSE:
-		EndDialog(hWnd, 0);
-		break;
-	default:
-		ret = FALSE;
-	}
-	return ret;
-}
-void view_about(HWND hwnd)
-{
-	gf_freeze_display(GF_TRUE);
-//	::ShowWindow(g_hwnd_mb, SW_HIDE);
-	int iResult = DialogBox(g_hinst, MAKEINTRESOURCE(IDD_APPABOUT), hwnd,(DLGPROC)AboutDialogProc);
-//	::ShowWindow(g_hwnd_mb, SW_SHOW);
-	gf_freeze_display(GF_FALSE);
-}
-
-void pause_file()
-{
-	if (!is_connected) return;
-#ifdef _WIN32_WCE
-	TBBUTTONINFO tbbi;
-	tbbi.cbSize = sizeof(tbbi);
-	tbbi.dwMask = TBIF_TEXT;
-#endif
-
-	if (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-#ifdef _WIN32_WCE
-		tbbi.pszText = _T("Resume");
-#endif
-	} else {
-		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-#ifdef _WIN32_WCE
-		tbbi.pszText = _T("Pause");
-#endif
-	}
-#ifdef _WIN32_WCE
-	SendMessage(g_hwnd_menu, TB_SETBUTTONINFO, IDM_FILE_PAUSE, (LPARAM)&tbbi);
-#endif
-}
-
-void set_svg_progressive()
-{
-	use_svg_prog = (Bool)!use_svg_prog;
-	if (use_svg_prog) {
-		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "yes");
-		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "30");
-	} else {
-		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "0");
-		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "no");
-	}
-}
-
-void set_gx_mode(u32 mode)
-{
-	char *opt;
-	switch (mode) {
-	case 0:
-		opt = "raw";
-		break;
-	case 1:
-		opt = "gx";
-		break;
-	case 2:
-		opt = "gdi";
-		break;
-	}
-	gf_cfg_set_key(user.config, "GAPI", "FBAccess", opt);
-
-//	gf_term_del(term);
-//	term = gf_term_new(&user);
-//	gf_term_disconnect(term);
-//	gf_term_connect(term, the_url);
-	do_layout(GF_TRUE);
-}
-
-void do_copy_paste()
-{
-	if (!OpenClipboard(g_hwnd)) return;
-
-	/*or we are editing text and clipboard is not empty*/
-	if (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK)) {
-		HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
-		if (hglbCopy) {
-#ifdef _WIN32_WCE
-			char szString[1024];
-			LPCTSTR paste_string = (LPCTSTR) GlobalLock(hglbCopy);
-			CE_WideToChar((u16 *) paste_string, szString);
-			gf_term_paste_text(term, szString, GF_FALSE);
-#else
-			char *szString = (char *)GlobalLock(hglbCopy);
-			gf_term_paste_text(term, szString, GF_FALSE);
-#endif
-			GlobalUnlock(hglbCopy);
-		}
-	}
-	/*we have something to copy*/
-	else if (gf_term_get_text_selection(term, GF_TRUE)!=NULL) {
-		u32 len;
-		const char *text = gf_term_get_text_selection(term, GF_FALSE);
-		if (text && strlen(text)) {
-			EmptyClipboard();
-			len = strlen(text);
-
-#ifdef _WIN32_WCE
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u16));
-			LPCTSTR new_string = (LPCTSTR) GlobalLock(hglbCopy);
-			CE_CharToWide((char*)text, (u16*)new_string);
-#else
-			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u8));
-			char *new_string = (char*) GlobalLock(hglbCopy);
-			strcpy(new_string, text);
-#endif
-			GlobalUnlock(hglbCopy);
-			SetClipboardData(CF_TEXT, hglbCopy);
-		}
-	}
-	CloseClipboard();
-}
-
-static void rewrite_log_tools(u32 tool)
-{
-	char *logs;
-	if (tool == GF_LOG_ALL) {
-		gf_log_set_tool_level(GF_LOG_ALL, log_level);
-	} else {
-		if (gf_log_tool_level_on(tool, log_level)) {
-			gf_log_set_tool_level(tool, GF_LOG_QUIET);
-		} else {
-			gf_log_set_tool_level(tool, log_level);
-		}
-	}
-	logs = gf_log_get_tools_levels();
-	if (logs) {
-		gf_cfg_set_key(user.config, "General", "Logs", logs);
-		gf_free(logs);
-	}
-	setup_logs();
-}
-
-BOOL HandleCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-	switch (LOWORD(wParam)) {
-	case IDM_FILE_OPEN:
-		open_file(hwnd);
-		break;
-	case IDM_FILE_LOG_RTI:
-		log_rti = (Bool)!log_rti;
-		setup_logs();
-		break;
-	case IDM_FILE_PAUSE:
-		pause_file();
-		break;
-	case IDM_VIEW_ABOUT:
-		view_about(hwnd);
-		break;
-	case IDM_VIEW_FS:
-		set_full_screen();
-		break;
-	case IDM_VIEW_STATUS:
-		show_status = (Bool)!show_status;
-		gf_cfg_set_key(user.config, "General", "ShowStatusBar", show_status ? "yes" : "no");
-		do_layout(GF_TRUE);
-		break;
-	case IDM_VIEW_CPU:
-		view_cpu = (Bool)!view_cpu;
-		break;
-	case IDM_VIEW_FORCEGL:
-		force_2d_gl = (Bool)!force_2d_gl;
-		gf_cfg_set_key(user.config, "Compositor", "ForceOpenGL", force_2d_gl ? "yes" : "no");
-		gf_term_set_option(term, GF_OPT_USE_OPENGL, force_2d_gl);
-		break;
-	case IDM_NAV_RESET:
-		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-		break;
-	case IDM_NAV_NONE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
-		break;
-	case IDM_NAV_SLIDE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
-		break;
-	case IDM_NAV_WALK:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
-		break;
-	case IDM_NAV_FLY:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
-		break;
-	case IDM_NAV_EXAMINE:
-		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
-		break;
-	case IDM_NAV_HEADLIGHT:
-		gf_term_set_option(term, GF_OPT_HEADLIGHT, !gf_term_get_option(term, GF_OPT_HEADLIGHT) );
-		break;
-	case IDM_NAV_COL_NONE:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NONE);
-		break;
-	case IDM_NAV_COL_REG:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
-		break;
-	case IDM_NAV_COL_DISP:
-		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
-		break;
-	case IDM_NAV_GRAVITY:
-		gf_term_set_option(term, GF_OPT_GRAVITY, !gf_term_get_option(term, GF_OPT_GRAVITY));
-		break;
-
-	case IDM_VIEW_AR_NONE:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
-		break;
-	case IDM_VIEW_AR_FILL:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-		break;
-	case IDM_VIEW_AR_4_3:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
-		break;
-	case IDM_VIEW_AR_16_9:
-		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
-		break;
-
-	case IDM_VIEW_LOW_RATE:
-		use_low_fps = (Bool)!use_low_fps;
-		gf_term_set_simulation_frame_rate(term, use_low_fps ? 15.0 : 30.0);
-		break;
-	case ID_VIDEO_DIRECTDRAW:
-	{
-		u32 drend = (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_IMMEDIATE) ? GF_DRAW_MODE_DEFER : GF_DRAW_MODE_IMMEDIATE;
-		gf_term_set_option(term, GF_OPT_DRAW_MODE, drend);
-		gf_cfg_set_key(user.config, "Compositor", "DrawMode", drend ? "immediate" : "defer");
-	}
-	break;
-
-	case ID_FILE_CUT_PASTE:
-		do_copy_paste();
-		break;
-
-	case IDM_OPEN_FILE1:
-	case IDM_OPEN_FILE2:
-	case IDM_OPEN_FILE3:
-	case IDM_OPEN_FILE4:
-	case IDM_OPEN_FILE5:
-	case IDM_OPEN_FILE6:
-	case IDM_OPEN_FILE7:
-	case IDM_OPEN_FILE8:
-	case IDM_OPEN_FILE9:
-	case IDM_OPEN_FILE10:
-		load_recent_file(LOWORD(wParam) - IDM_OPEN_FILE1);
-		break;
-
-	case IDS_CAP_DISABLE_PLAYLIST:
-		playlist_navigation_on = (Bool)!playlist_navigation_on;
-		break;
-	case IDM_VIEW_SVG_LOAD:
-		set_svg_progressive();
-		break;
-	case ID_VIDEO_DIRECTFB:
-		set_gx_mode(0);
-		break;
-	case ID_VIDEO_GAPI:
-		set_gx_mode(1);
-		break;
-	case ID_VIDEO_GDI:
-		set_gx_mode(2);
-		break;
-
-	case ID_LOGLEVEL_NONE:
-		log_level = GF_LOG_QUIET;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_ERROR:
-		log_level = GF_LOG_ERROR;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_WARNING:
-		log_level = GF_LOG_WARNING;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_INFO:
-		log_level = GF_LOG_INFO;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGLEVEL_DEBUG:
-		log_level = GF_LOG_DEBUG;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_TOOLS_CORE:
-		rewrite_log_tools(GF_LOG_CORE);
-		break;
-	case ID_TOOLS_CODING:
-		rewrite_log_tools(GF_LOG_CODING);
-		break;
-	case ID_TOOLS_CONTAINER:
-		rewrite_log_tools(GF_LOG_CONTAINER);
-		break;
-	case ID_TOOLS_NETWORK:
-		rewrite_log_tools(GF_LOG_NETWORK);
-		break;
-	case ID_TOOLS_RTP:
-		rewrite_log_tools(GF_LOG_RTP);
-		break;
-	case ID_TOOLS_SCRIPT:
-		rewrite_log_tools(GF_LOG_SCRIPT);
-		break;
-	case ID_TOOLS_CODEC:
-		rewrite_log_tools(GF_LOG_CODEC);
-		break;
-	case ID_TOOLS_PARSER:
-		rewrite_log_tools(GF_LOG_PARSER);
-		break;
-	case ID_TOOLS_MEDIA:
-		rewrite_log_tools(GF_LOG_MEDIA);
-		break;
-	case ID_TOOLS_SCENE:
-		rewrite_log_tools(GF_LOG_SCENE);
-		break;
-	case ID_TOOLS_INTERACT:
-		rewrite_log_tools(GF_LOG_INTERACT);
-		break;
-	case ID_TOOLS_COMPOSE:
-		rewrite_log_tools(GF_LOG_COMPOSE);
-		break;
-	case ID_TOOLS_MMIO:
-		rewrite_log_tools(GF_LOG_MMIO);
-		break;
-	case ID_TOOLS_RTI:
-		rewrite_log_tools(GF_LOG_RTI);
-		break;
-	case ID_TOOLS_ALL:
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_TOOLS_NONE:
-		log_level = GF_LOG_QUIET;
-		rewrite_log_tools(GF_LOG_ALL);
-		break;
-	case ID_LOGS_RESET:
-		if (log_file) {
-			gf_fclose(log_file);
-			log_file = NULL;
-		}
-		{
-			const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
-			if (filename) gf_delete_file(filename);
-		}
-		setup_logs();
-		break;
-
-	case IDM_ITEM_QUIT:
-		DestroyWindow(hwnd);
-		return FALSE;
-	}
-	return TRUE;
-}
-
-static BOOL OnMenuPopup(const HWND hWnd, const WPARAM wParam)
-{
-	char *opt;
-	u32 type;
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_STATUS, MF_BYCOMMAND| (show_status ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_FORCEGL, MF_BYCOMMAND| (force_2d_gl ? MF_CHECKED : MF_UNCHECKED) );
-	EnableMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (show_status ? MF_ENABLED : MF_GRAYED) );
-	if (show_status) CheckMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (view_cpu ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_LOW_RATE, MF_BYCOMMAND| (use_low_fps ? MF_CHECKED : MF_UNCHECKED) );
-
-	EnableMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl ? MF_ENABLED : MF_GRAYED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl && gf_term_get_option(term, GF_OPT_DRAW_MODE) ? MF_CHECKED : MF_UNCHECKED) );
-
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_SVG_LOAD, MF_BYCOMMAND| (use_svg_prog ? MF_CHECKED : MF_UNCHECKED) );
-
-	opt = (char *)gf_cfg_get_key(user.config, "GAPI", "FBAccess");
-	if (!opt) opt = "raw";
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTFB, MF_BYCOMMAND| ( (!strcmp(opt,"raw")) ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_GAPI, MF_BYCOMMAND| ( (!strcmp(opt,"gx")) ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_VIDEO_GDI, MF_BYCOMMAND| ( (!strcmp(opt,"gdi")) ? MF_CHECKED : MF_UNCHECKED) );
-
-
-	type = gf_term_get_option(term, GF_OPT_ASPECT_RATIO);
-	CheckMenuItem((HMENU)wParam, IDS_CAP_DISABLE_PLAYLIST, MF_BYCOMMAND| (!playlist_navigation_on ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_NONE, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_KEEP) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_FILL, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_FILL_SCREEN) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_4_3, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_4_3) ? MF_CHECKED : MF_UNCHECKED);
-	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_16_9, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_16_9) ? MF_CHECKED : MF_UNCHECKED);
-
-	EnableMenuItem((HMENU)wParam, IDM_FILE_PAUSE, MF_BYCOMMAND| (is_connected ? MF_ENABLED : MF_GRAYED) );
-
-	if (/*we have something to copy*/
-	    (gf_term_get_text_selection(term, GF_TRUE)!=NULL)
-	    /*or we are editing text and clipboard is not empty*/
-	    || (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK))
-	) {
-		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_ENABLED);
-	} else {
-		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_GRAYED);
-	}
-
-	CheckMenuItem((HMENU)wParam, IDM_FILE_LOG_RTI, MF_BYCOMMAND| (log_rti) ? MF_CHECKED : MF_UNCHECKED);
-
-	if (!is_connected) type = 0;
-	else type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
-	navigation_on = type ? GF_TRUE : GF_FALSE;
-
-	EnableMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_RESET, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-	EnableMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
-
-	if (type) {
-		u32 mode = gf_term_get_option(term, GF_OPT_NAVIGATION);
-		navigation_on = (mode==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
-		CheckMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_NONE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_SLIDE) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_WALK) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((mode==GF_NAVIGATE_FLY) ? MF_CHECKED : MF_UNCHECKED) );
-		CheckMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((mode==GF_NAVIGATE_EXAMINE) ? MF_CHECKED : MF_UNCHECKED) );
-
-		if (type==GF_NAVIGATE_TYPE_3D) {
-			CheckMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_HEADLIGHT) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_GRAVITY) ? MF_CHECKED : MF_UNCHECKED) );
-			type = gf_term_get_option(term, GF_OPT_COLLISION);
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ( (type==GF_COLLISION_NONE) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ( (type==GF_COLLISION_NORMAL) ? MF_CHECKED : MF_UNCHECKED) );
-			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ( (type==GF_COLLISION_DISPLACEMENT) ? MF_CHECKED : MF_UNCHECKED) );
-		}
-	}
-
-	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_NONE, MF_BYCOMMAND | ( strstr(opt, "quiet") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_ERROR, MF_BYCOMMAND | ( strstr(opt, "error") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_WARNING, MF_BYCOMMAND | ( strstr(opt, "warning") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_INFO, MF_BYCOMMAND | ( strstr(opt, "info") ? MF_CHECKED : MF_UNCHECKED) );
-	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_DEBUG, MF_BYCOMMAND | ( strstr(opt, "debug") ? MF_CHECKED : MF_UNCHECKED) );
-
-#define CHECK_TOOL(_ID, _name) CheckMenuItem((HMENU)wParam, _ID, MF_BYCOMMAND | ( ((strstr(opt, _name) != NULL) || !strcmp(opt, "all")) ? MF_CHECKED : MF_UNCHECKED) );
-	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
-	CHECK_TOOL(ID_TOOLS_CORE, "core");
-	CHECK_TOOL(ID_TOOLS_CODING, "coding");
-	CHECK_TOOL(ID_TOOLS_CONTAINER, "container");
-	CHECK_TOOL(ID_TOOLS_NETWORK, "network");
-	CHECK_TOOL(ID_TOOLS_RTP, "rtp");
-	CHECK_TOOL(ID_TOOLS_SYNC, "sync");
-	CHECK_TOOL(ID_TOOLS_SCRIPT, "script");
-	CHECK_TOOL(ID_TOOLS_CODEC, "codec");
-	CHECK_TOOL(ID_TOOLS_PARSER, "parser");
-	CHECK_TOOL(ID_TOOLS_MEDIA, "media");
-	CHECK_TOOL(ID_TOOLS_SCENE, "scene");
-	CHECK_TOOL(ID_TOOLS_INTERACT, "interact");
-	CHECK_TOOL(ID_TOOLS_COMPOSE, "compose");
-	CHECK_TOOL(ID_TOOLS_MMIO, "mmio");
-	CHECK_TOOL(ID_TOOLS_RTI, "rti");
-
-
-	return TRUE;
-}
-
-
-BOOL CALLBACK MainWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch (msg) {
-	case WM_CREATE:
-	{
-#ifdef _WIN32_WCE
-		SHMENUBARINFO mbi;
-		memset(&mbi, 0, sizeof(SHMENUBARINFO));
-		mbi.cbSize = sizeof(SHMENUBARINFO);
-		mbi.hwndParent = hwnd;
-		mbi.hInstRes = g_hinst;
-		mbi.nBmpId = 0;
-		mbi.cBmpImages = 0;
-
-		mbi.nToolBarId = IDM_MAIN_MENU;
-		SHCreateMenuBar(&mbi);
-		g_hwnd_menu = mbi.hwndMB;
-#else
-		g_hwnd_menu = NULL;
-#endif
-
-		g_hwnd_status = CreateWindow(TEXT("STATIC"), TEXT("Status"), WS_CHILD|WS_VISIBLE|SS_LEFT, 0, 0, disp_w, caption_h, hwnd, NULL, g_hinst, NULL);
-
-		do_layout(GF_TRUE);
-	}
-	break;
-
-	case WM_COMMAND:
-		if (HandleCommand(hwnd, wParam, lParam))
-			return DefWindowProc(hwnd, msg, wParam, lParam);
-		break;
-	case WM_TIMER:
-		if (wParam==STATE_TIMER_ID) update_state_info();
-#ifdef TERM_NOT_THREADED
-		else gf_term_process_step(term);
-#endif
-		break;
-	case WM_HOTKEY:
-		break;
-	case WM_KEYDOWN:
-		if (playlist_navigation_on && !navigation_on) {
-			if (wParam==VK_LEFT) {
-				switch_playlist(GF_TRUE);
-				break;
-			}
-			else if (wParam==VK_RIGHT) {
-				switch_playlist(GF_FALSE);
-				break;
-			}
-		}
-	/*fall through*/
-	case WM_SYSKEYDOWN:
-	case WM_SYSKEYUP:
-	case WM_KEYUP:
-	case WM_CHAR:
-	case WM_MOUSEMOVE:
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONDBLCLK:
-	case WM_LBUTTONUP:
-		::SendMessage(g_hwnd_disp, msg, wParam, lParam);
-		return 0;
-	case WM_INITMENUPOPUP:
-		OnMenuPopup(hwnd, wParam);
-		break;
-	case WM_CLOSE:
-		DestroyWindow(hwnd);
-		break;
-	case WM_SETFOCUS:
-		gf_freeze_display(GF_FALSE);
-		break;
-	case WM_KILLFOCUS:
-		if ((HWND) wParam==g_hwnd) {
-			gf_freeze_display(GF_TRUE);
-		}
-		break;
-	case WM_ACTIVATE:
-		if (WA_INACTIVE != LOWORD(wParam)) {
-			if ((HWND) lParam == g_hwnd) {
-				gf_freeze_display(GF_FALSE);
-				SetFocus(hwnd);
-			}
-		} else {
-			if ((HWND) lParam == g_hwnd_disp) {
-				gf_freeze_display(GF_TRUE);
-			}
-		}
-		break;
-	case WM_LOADTERM:
-		if (!LoadTerminal()) {
-			MessageBox(hwnd, _T("Cannot load GPAC"), _T("Error"), MB_OK);
-			PostQuitMessage(0);
-		}
-		break;
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		break;
-	default:
-		return DefWindowProc(hwnd, msg, wParam, lParam);
-	}
-
-	return 0;
-}
-
-BOOL InitInstance (int CmdShow)
-{
-	WNDCLASS wc;
-
-	wc.style			= 0;
-	wc.lpfnWndProc		= (WNDPROC) MainWndProc;
-	wc.cbClsExtra		= 0;
-	wc.cbWndExtra		= 0;
-	wc.hInstance		= g_hinst;
-	wc.hIcon			= LoadIcon(g_hinst, MAKEINTRESOURCE(IDI_ICON));
-	wc.hCursor			= 0;
-	wc.hbrBackground	= (HBRUSH) GetStockObject(WHITE_BRUSH);
-	wc.lpszMenuName		= 0;
-	wc.lpszClassName	= _T("Osmophone");
-	RegisterClass(&wc);
-
-#ifdef _WIN32_WCE
-	int style = WS_VISIBLE;
-#else
-	int style = WS_POPUP;
-#endif
-
-	g_hwnd = CreateWindow(_T("Osmophone"), _T("Osmophone"),
-	                      style,
-	                      0, caption_h, disp_w, disp_h,
-	                      NULL, NULL, g_hinst, NULL);
-
-	if (!g_hwnd) return FALSE;
-
-	ShowWindow(g_hwnd, CmdShow);
-
-	refresh_recent_files();
-
-	::SetTimer(g_hwnd, STATE_TIMER_ID, STATE_TIMER_DUR, NULL);
-	do_layout(GF_TRUE);
-
-	set_status("Loading Terminal");
-	PostMessage(g_hwnd, WM_LOADTERM, 0, 0);
-	set_status("Ready");
-	return TRUE;
-}
-
-#ifndef GETRAWFRAMEBUFFER
-#define GETRAWFRAMEBUFFER   0x00020001
-typedef struct _RawFrameBufferInfo
-{
-	WORD wFormat;
-	WORD wBPP;
-	VOID *pFramePointer;
-	int	cxStride;
-	int	cyStride;
-	int cxPixels;
-	int cyPixels;
-} RawFrameBufferInfo;
-
-#define FORMAT_565 1
-#define FORMAT_555 2
-#define FORMAT_OTHER 3
-#endif
-
-int WINAPI WinMain(HINSTANCE hInstance,
-                   HINSTANCE hPrevInstance,
-#ifdef _WIN32_WCE
-                   LPWSTR lpCmdLine,
-#else
-                   LPSTR lpCmdLine,
-#endif
-                   int nShowCmd
-                  ) {
-	MSG 	msg;
-
-	HWND 	hwndOld = NULL;
-	const char *str;
-	Bool initial_launch = GF_FALSE;
-
-	if (hwndOld = FindWindow(_T("Osmophone"), NULL))
-	{
-		SetForegroundWindow(hwndOld);
-		return 0;
-	}
-
-	memset(&user, 0, sizeof(GF_User));
-	term = NULL;
-
-	g_hinst = hInstance;
-
-	screen_w = GetSystemMetrics(SM_CXSCREEN);
-	screen_h = GetSystemMetrics(SM_CYSCREEN);
-
-	/*are we in low res or high res*/
-	RawFrameBufferInfo Info;
-	HDC DC = GetDC(NULL);
-	ExtEscape(DC, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char*)&Info);
-	ReleaseDC(NULL,DC);
-	if (Info.pFramePointer) {
-		recompute_res(Info.cxPixels, Info.cyPixels);
-	} else {
-		recompute_res(screen_w, screen_h);
-	}
-
-
-
-#ifdef _WIN32_WCE
-	TCHAR      szBuf[MAX_PATH];
-	SystemParametersInfo(SPI_GETPLATFORMTYPE, MAX_PATH, szBuf, 0);
-	if (! lstrcmp(szBuf, __TEXT("PocketPC"))) is_ppc = GF_TRUE;
-	else if (! lstrcmp(szBuf, __TEXT("Palm PC2"))) is_ppc = GF_TRUE;
-#endif
-
-
-	user.config = gf_cfg_init(NULL, &initial_launch);
-	if (!user.config) {
-		MessageBox(NULL, _T("Couldn't locate GPAC config file"), _T("Fatal Error"), MB_OK);
-		return 0;
-	}
-
-	str = gf_cfg_get_key(user.config, "Compositor", "ScreenWidth");
-	if (str) screen_w = atoi(str);
-	str = gf_cfg_get_key(user.config, "Compositor", "ScreenHeight");
-	if (str) screen_h = atoi(str);
-	disp_w = screen_w;
-#ifdef _WIN32_WCE
-	disp_h = screen_h - menu_h /*- caption_h*/;
-#else
-	disp_h = screen_h;
-#endif
-
-	gf_sys_init(GF_MemTrackerNone);
-	user.modules = gf_modules_new(NULL, user.config);
-	if (!gf_modules_get_count(user.modules)) {
-		MessageBox(GetForegroundWindow(), _T("No modules found"), _T("GPAC Init Error"), MB_OK);
-		gf_modules_del(user.modules);
-		gf_cfg_del(user.config);
-		memset(&user, 0, sizeof(GF_User));
-		gf_sys_close();
-		return 0;
-	}
-
-	/*first launch, register all files ext*/
-	if (initial_launch) {
-		/*FFMPEG registration - FFMPEG DLLs compiled with CEGCC cannot be loaded directly under WM 6.1
-		cf http://cegcc.sourceforge.net/docs/faq.html#DllDoesNotWorkWithWindowsMobile6.1
-		*/
-		HKEY hKey = NULL;
-		DWORD dwSize;
-		DWORD dwValue;
-		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("System\\Loader\\LoadModuleLow"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
-		dwSize = 4;
-		dwValue = 1;
-		LONG res = RegSetValueEx(hKey, _T("avcodec-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("avformat-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("avutil-50.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		res = RegSetValueEx(hKey, _T("swscale-0.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
-		RegCloseKey(hKey);
-
-		u32 i;
-		for (i=0; i<gf_modules_get_count(user.modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(user.modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			if (ifce) {
-				ifce->CanHandleURL(ifce, "test.test");
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-			}
-		}
-		MessageBox(NULL, _T("Thank you for installing GPAC"), _T("Initial setup done"), MB_OK);
-	}
-
-	str = gf_cfg_get_key(user.config, "General", "Loop");
-	loop = (!str || !stricmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-	str = gf_cfg_get_key(user.config, "SAXLoader", "Progressive");
-	use_svg_prog = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-	str = gf_cfg_get_key(user.config, "General", "RTIRefreshPeriod");
-	if (str) {
-		rti_update_time_ms = atoi(str);
-	} else {
-		gf_cfg_set_key(user.config, "General", "RTIRefreshPeriod", "200");
-	}
-
-	str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
-	show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
-
-
-#ifdef _WIN32_WCE
-	if (is_ppc) GXOpenInput();
-#endif
-
-	if (InitInstance(nShowCmd)) {
-		SetForegroundWindow(g_hwnd);
-		show_taskbar(GF_FALSE);
-
-		force_2d_gl = (Bool)gf_term_get_option(term, GF_OPT_USE_OPENGL);
-
-		while (GetMessage(&msg, NULL, 0,0) == TRUE) {
-			TranslateMessage (&msg);
-			DispatchMessage (&msg);
-
-			if (playlist_act) {
-				switch_playlist((Bool)(playlist_act-1));
-				playlist_act = 0;
-			}
-		}
-		show_taskbar(GF_TRUE);
-	}
-#ifdef _WIN32_WCE
-	if (is_ppc) GXCloseInput();
-#endif
-
-	/*and destroy*/
-	if (term) gf_term_del(term);
-	if (user.modules) gf_modules_del(user.modules);
-	if (user.config) gf_cfg_del(user.config);
-
-	if (backlight_off) set_backlight_state(GF_FALSE);
-
-	gf_sys_close();
-	if (log_file) gf_fclose(log_file);
-	return 0;
-}

gpac-0.8.0.tar.gz/applications/osmozilla Deleted

gpac-0.8.0.tar.gz/applications/osmozilla/nsIOsmozilla.xpt_linux Deleted

gpac-0.8.0.tar.gz/applications/osmozilla/osmozilla.cpp Deleted

@@ -1,531 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  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 "osmozilla.h"
-
-#ifdef XP_WIN
-#include <windows.h>
-#endif
-
-#include <gpac/options.h>
-#include <gpac/terminal.h>
-#include <gpac/term_info.h>
-
-
-short Osmozilla_GetURL(NPP instance, const char *url, const char *target);
-void Osmozilla_SetStatus(NPP instance, const char *message);
-
-
-void Osmozilla_Shutdown(Osmozilla *osmo)
-{
-	if (osmo->url) gf_free(osmo->url);
-	osmo->url = NULL;
-	if (osmo->term) {
-		GF_Terminal *a_term = osmo->term;
-		osmo->term = NULL;
-		gf_term_del(a_term);
-	}
-	if (osmo->user) {
-		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
-		if (osmo->user->config) gf_cfg_del(osmo->user->config);
-		gf_free(osmo->user);
-		osmo->user = NULL;
-	}
-}
-
-static void osmozilla_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE *) cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-
-Bool Osmozilla_EventProc(void *opaque, GF_Event *evt)
-{
-	char msg[1024];
-	Osmozilla *osmo = (Osmozilla *)opaque;
-	if (!osmo->term) return GF_FALSE;
-
-	switch (evt->type) {
-	case GF_EVENT_MESSAGE:
-		if (!evt->message.message) return GF_FALSE;
-		if (evt->message.error)
-			sprintf((char *)msg, "GPAC: %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
-		else
-			sprintf((char *)msg, "GPAC: %s", evt->message.message);
-
-		Osmozilla_SetStatus(osmo->np_instance, msg);
-		break;
-	case GF_EVENT_PROGRESS:
-		if (evt->progress.done == evt->progress.total) {
-			Osmozilla_SetStatus(osmo->np_instance, "");
-			osmo->download_progress = 100;
-		} else {
-			char *szTitle = (char *)"";
-			if (evt->progress.progress_type==0) szTitle = (char *)"Buffer ";
-			else if (evt->progress.progress_type==1)
-			{
-				szTitle = (char *)"Download ";
-				osmo->download_progress = (int) (100.0*evt->progress.done) / evt->progress.total;
-			}
-			else if (evt->progress.progress_type==2) szTitle = (char *)"Import ";
-
-			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
-			Osmozilla_SetStatus(osmo->np_instance, msg);
-		}
-		break;
-
-	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
-	case GF_EVENT_SCENE_SIZE:
-		gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		break;
-	/*window has been resized (full-screen plugin), resize*/
-	case GF_EVENT_SIZE:
-		osmo->width = evt->size.width;
-		osmo->height = evt->size.height;
-		gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		break;
-	case GF_EVENT_CONNECT:
-		osmo->is_connected = evt->connect.is_connected;
-		break;
-	case GF_EVENT_DURATION:
-		osmo->can_seek = evt->duration.can_seek;
-		osmo->duration = evt->duration.duration;
-		break;
-	case GF_EVENT_DBLCLICK:
-		gf_term_set_option(osmo->term, GF_OPT_FULLSCREEN, !gf_term_get_option(osmo->term, GF_OPT_FULLSCREEN));
-		break;
-	case GF_EVENT_NAVIGATE_INFO:
-		strcpy(msg, evt->navigate.to_url);
-		Osmozilla_SetStatus(osmo->np_instance, msg);
-		break;
-	case GF_EVENT_NAVIGATE:
-		if (gf_term_is_supported_url(osmo->term, evt->navigate.to_url, GF_TRUE, osmo->disable_mime ? GF_TRUE : GF_FALSE)) {
-			gf_term_navigate_to(osmo->term, evt->navigate.to_url);
-			return GF_TRUE;
-		} else {
-			u32 i;
-			char *target = (char *)"_self";
-
-			for (i=0; i<evt->navigate.param_count; i++) {
-				if (!strcmp(evt->navigate.parameters[i], "_parent")) target = (char *)"_parent";
-				else if (!strcmp(evt->navigate.parameters[i], "_blank")) target = (char *)"_blank";
-				else if (!strcmp(evt->navigate.parameters[i], "_top")) target = (char *)"_top";
-				else if (!strcmp(evt->navigate.parameters[i], "_new")) target = (char *)"_new";
-				else if (!strnicmp(evt->navigate.parameters[i], "_target=", 8)) target = (char *) evt->navigate.parameters[i]+8;
-			}
-			Osmozilla_GetURL(osmo->np_instance, evt->navigate.to_url, target);
-			return GF_TRUE;
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn[], char* argv[])
-{
-	const char *str;
-	int i;
-	osmo->auto_start = 1;
-	osmo->use_gui = 0;
-
-	/*options sent from plugin*/
-	for(i=0; i<argc; i++) {
-		if (!argn[i] || !argv[i]) continue;
-		if (!stricmp(argn[i],"autostart") && (!stricmp(argv[i], "false") || !stricmp(argv[i], "no")) )
-			osmo->auto_start = 0;
-
-		else if (!stricmp(argn[i],"src") ) {
-			if (osmo->url) gf_free(osmo->url);
-			osmo->url = gf_strdup(argv[i]);
-		}
-		else if (!stricmp(argn[i],"use3d") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) ) {
-			osmo->use_3d = 1;
-		}
-		else if (!stricmp(argn[i],"loop") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) ) {
-			osmo->loop = 1;
-		}
-		else if (!stricmp(argn[i],"aspectratio")) {
-			osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
-			if (!stricmp(argv[i], "keep")) osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
-			else if (!stricmp(argv[i], "16:9")) osmo->aspect_ratio = GF_ASPECT_RATIO_16_9;
-			else if (!stricmp(argv[i], "4:3")) osmo->aspect_ratio = GF_ASPECT_RATIO_4_3;
-			else if (!stricmp(argv[i], "fill")) osmo->aspect_ratio = GF_ASPECT_RATIO_FILL_SCREEN;
-		}
-		else if (!stricmp(argn[i],"gui") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) )
-			osmo->use_gui = 1;
-	}
-
-	/*URL is not absolute, request new stream to mozilla - we don't pass absolute URLs since some may not be
-	handled by gecko */
-	if (osmo->url) {
-		Bool absolute_url = GF_FALSE;
-		if (strstr(osmo->url, "://")) absolute_url = GF_TRUE;
-		else if (osmo->url[0] == '/') {
-			FILE *test = gf_fopen(osmo->url, "rb");
-			if (test) {
-				absolute_url = GF_TRUE;
-				gf_fclose(test);
-			}
-		}
-		else if ((osmo->url[1] == ':') && ((osmo->url[2] == '\\') || (osmo->url[2] == '/'))) absolute_url = GF_TRUE;
-
-		if (!absolute_url) {
-			char *url = osmo->url;
-			osmo->url = NULL;
-			Osmozilla_GetURL(osmo->np_instance, url, NULL);
-			gf_free(url);
-		}
-	}
-
-	GF_SAFEALLOC(osmo->user, GF_User);
-	osmo->user->config = gf_cfg_init(NULL, NULL);
-	/*need to have a valid cfg file for now*/
-	if (!osmo->user->config) {
-		gf_free(osmo->user);
-		osmo->user = NULL;
-#ifdef WIN32
-		MessageBox(NULL, "GPAC CONFIGURATION FILE NOT FOUND OR INVALID", "OSMOZILLA FATAL ERROR", MB_OK);
-#else
-		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC CONFIGURATION FILE NOT FOUND OR INVALID\n");
-#endif
-		return 0;
-	}
-
-	osmo->user->modules = gf_modules_new(NULL, osmo->user->config);
-	if (!gf_modules_get_count(osmo->user->modules)) {
-		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
-		gf_free(osmo->user);
-		osmo->user = NULL;
-#ifdef WIN32
-		MessageBox(NULL, "GPAC MODULES NOT FOUND", "OSMOZILLA FATAL ERROR", MB_OK);
-#else
-		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC MODULES NOT FOUND\n");
-#endif
-		return 0;
-	}
-
-	osmo->user->opaque = osmo;
-	osmo->user->EventProc = Osmozilla_EventProc;
-
-	/*always fetch mime ? Check with anchor examples*/
-	osmo->disable_mime = 0;
-	str = gf_cfg_get_key(osmo->user->config, "General", "NoMIMETypeFetch");
-	if (str && !strcmp(str, "yes")) osmo->disable_mime = 0;
-	/*check log file*/
-	str = gf_cfg_get_key(osmo->user->config, "General", "LogFile");
-	if (str) {
-		osmo->logs = gf_fopen(str, "wt");
-		if (osmo->logs) gf_log_set_callback(osmo->logs, osmozilla_do_log);
-	}
-
-	/*setup logs*/
-	if (gf_log_set_tools_levels(gf_cfg_get_key(osmo->user->config, "General", "Logs")) != GF_OK)
-		fprintf(stdout, "Osmozilla: invalid log level specified\n");
-
-	fprintf(stdout, "Osmozilla initialized\n");
-	return 1;
-}
-
-int Osmozilla_SetWindow(Osmozilla *osmo, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height)
-{
-	const char *gui;
-
-	if (!osmo->user) return 0;
-
-	if (osmo->window_set) {
-		osmo->width = width;
-		osmo->height = height;
-		if (osmo->is_connected) gf_term_set_size(osmo->term, osmo->width, osmo->height);
-		return 1;
-	}
-	if (!os_wnd_handle) return 0;
-
-	osmo->width = width;
-	osmo->height = height;
-
-	osmo->user->os_window_handler = os_wnd_handle;
-	osmo->user->os_display = os_wnd_display;
-
-	/*Everything is now setup, create the terminal*/
-	fprintf(stdout, "Creating Osmozilla terminal\n");
-	osmo->term = gf_term_new(osmo->user);
-	if (!osmo->term) return 0;
-	fprintf(stdout, "Osmozilla terminal created\n");
-
-	gf_term_set_option(osmo->term, GF_OPT_ASPECT_RATIO, osmo->aspect_ratio);
-	osmo->window_set = 1;
-
-#ifdef XP_WIN
-	SetFocus((HWND)os_wnd_handle);
-#endif
-
-	/*stream not ready*/
-	if (!osmo->url || !osmo->auto_start) {
-		fprintf(stdout, "Osmozilla ready - not connecting to %s yet\n", osmo->url);
-		return 1;
-	}
-
-	/*connect from 0 and pause if not autoplay*/
-	gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
-	if (gui && osmo->use_gui) {
-		gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
-		gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", osmo->url);
-		gf_term_connect(osmo->term, gui);
-	} else {
-		gf_term_connect(osmo->term, osmo->url);
-	}
-	fprintf(stdout, "Osmozilla connected to %s\n", osmo->url);
-	return 1;
-}
-
-char *Osmozilla_GetVersion()
-{
-	return (char *) "GPAC Plugin " GPAC_FULL_VERSION " for NPAPI compatible Web Browsers. For more information go to <a href=\"http://gpac.sourceforge.net\">GPAC website</a>";
-}
-
-void Osmozilla_ConnectTo(Osmozilla *osmo, const char *url)
-{
-	if (!osmo->user) return;
-
-	if ( osmo->url && !strcmp(url, osmo->url))
-		return;
-
-	fprintf(stdout, "Osmozilla connecting to %s\n", url);
-
-	if (osmo->url) gf_free(osmo->url);
-	osmo->url = gf_strdup(url);
-
-	/*connect from 0 and pause if not autoplay*/
-	if (osmo->auto_start) {
-		const char *gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
-		if (gui && osmo->use_gui) {
-			gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
-			gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", url);
-			gf_term_connect(osmo->term, gui);
-		} else {
-			gf_term_connect(osmo->term, url);
-		}
-	}
-	fprintf(stdout, "Osmozilla connected to %s\n", url);
-}
-
-void Osmozilla_Pause(Osmozilla *osmo)
-{
-	if (osmo->term) {
-		if (gf_term_get_option(osmo->term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
-			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-		} else {
-			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-		}
-	}
-}
-
-void Osmozilla_Play(Osmozilla *osmo)
-{
-	if (!osmo->is_connected) {
-		if (osmo->url) gf_term_connect(osmo->term, (const char *) osmo->url);
-	} else {
-		gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-	}
-}
-
-void Osmozilla_Stop(Osmozilla *osmo)
-{
-	if (osmo->term) gf_term_disconnect(osmo->term);
-}
-
-#ifdef XP_WIN
-PBITMAPINFO CreateBitmapInfoStruct(GF_VideoSurface *pfb)
-{
-	PBITMAPINFO pbmi;
-	WORD    cClrBits;
-
-	cClrBits = 32;
-
-	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,
-	                                sizeof(BITMAPINFOHEADER));
-
-	pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-	pbmi->bmiHeader.biWidth = pfb->width;
-	pbmi->bmiHeader.biHeight = 1;
-	pbmi->bmiHeader.biPlanes = 1;
-	pbmi->bmiHeader.biBitCount = cClrBits;
-
-	pbmi->bmiHeader.biCompression = BI_RGB;
-	pbmi->bmiHeader.biSizeImage = ((pbmi->bmiHeader.biWidth * cClrBits +31) & ~31) /8
-	                              * pbmi->bmiHeader.biHeight;
-	pbmi->bmiHeader.biClrImportant = 0;
-	return pbmi;
-}
-#endif
-
-void Osmozilla_Print(Osmozilla *osmo, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height)
-{
-	if (is_embed) {
-#ifdef XP_MACOS
-		/*
-		os_print_dc contains a THPrint reference on MacOS
-		*/
-	}
-#endif  // XP_MACOS
-#ifdef XP_UNIX
-	/*
-	os_print_dc contains a NPPrintCallbackStruct on Unix and
-	the plug-in location and size in the NPWindow are in page coordinates (720/ inch), but the printer requires point coordinates (72/inch)
-	*/
-#endif  // XP_UNIX
-#ifdef XP_WIN
-	/*
-	The coordinates for the window rectangle are in TWIPS format.
-	This means that you need to convert the x-y coordinates using the Windows API call DPtoLP when you output text
-	*/
-	GF_VideoSurface fb;
-	u32 xsrc, ysrc;
-	u16 src_16;
-	char *src;
-	float deltay;
-	int	ysuiv = 0;
-	char *ligne;
-	BITMAPINFO	*infoSrc;
-	HDC pDC = (HDC)os_print_dc;
-	/*lock the source buffer */
-	gf_term_get_screen_buffer(osmo->term, &fb);
-	infoSrc = CreateBitmapInfoStruct(&fb);
-	deltay = (float)target_height/(float)fb.height;
-	ligne = (char *) LocalAlloc(GMEM_FIXED, fb.width*4);
-	for (ysrc=0; ysrc<fb.height; ysrc++) {
-		int ycrt, delta;
-		char *dst = (char*)ligne;
-		src = fb.video_buffer + ysrc * fb.pitch_y;
-		for (xsrc=0; xsrc<fb.width; xsrc++)
-		{
-			switch (fb.pixel_format) {
-			case GF_PIXEL_RGB_32:
-			case GF_PIXEL_ARGB:
-				dst[0] = src[0];
-				dst[1] = src[1];
-				dst[2] = src[2];
-				src+=4;
-				break;
-			case GF_PIXEL_BGR_32:
-			case GF_PIXEL_RGBA:
-				dst[0] = src[3];
-				dst[1] = src[2];
-				dst[2] = src[1];
-				src+=4;
-				break;
-			case GF_PIXEL_RGB_24:
-				dst[0] = src[2];
-				dst[1] = src[1];
-				dst[2] = src[0];
-				src+=3;
-				break;
-			case GF_PIXEL_BGR_24:
-				dst[0] = src[2];
-				dst[1] = src[1];
-				dst[2] = src[0];
-				src+=3;
-				break;
-			case GF_PIXEL_RGB_565:
-				src_16 = * ( (u16 *)src );
-				dst[2] = (src_16 >> 8) & 0xf8;
-				dst[2] += dst[2]>>5;
-				dst[1] = (src_16 >> 3) & 0xfc;
-				dst[1] += dst[1]>>6;
-				dst[0] = (src_16 << 3) & 0xf8;
-				dst[0] += dst[0]>>5;
-				src+=2;
-				break;
-			case GF_PIXEL_RGB_555:
-				src_16 = * (u16 *)src;
-				dst[2] = (src_16 >> 7) & 0xf8;
-				dst[2] += dst[2]>>5;
-				dst[1] = (src_16 >> 2) & 0xf8;
-				dst[1] += dst[1]>>5;
-				dst[0] = (src_16 << 3) & 0xf8;
-				dst[0] += dst[0]>>5;
-				src+=2;
-				break;
-			}
-			dst += 4;
-		}
-		ycrt = ysuiv;
-		ysuiv = (u32) ( ((float)ysrc+1.0)*deltay);
-		delta = ysuiv-ycrt;
-		StretchDIBits(
-		    pDC, target_x, target_y, target_width,
-		    delta,
-		    0, 0, fb.width, 1,
-		    ligne, infoSrc, DIB_RGB_COLORS, SRCCOPY);
-	}
-
-	/*unlock GPAC frame buffer */
-	gf_term_release_screen_buffer(osmo->term, &fb);
-	/* gf_free temporary  objects */
-	GlobalFree(ligne);
-	LocalFree(infoSrc);
-#endif   // XP_WIN
-
-	return;
-}
-
-/*TODO - this is full print, present the print dialog and manage the print*/
-}
-
-void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands)
-{
-	if (osmo->term) {
-		GF_Err e = gf_term_scene_update(osmo->term, (char *) type, (char *) commands);
-		if (e) {
-			char szMsg[1024];
-			sprintf((char *)szMsg, "GPAC: Error applying update (%s)", gf_error_to_string(e) );
-			Osmozilla_SetStatus(osmo->np_instance, szMsg);
-		}
-	}
-}
-
-void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up)
-{
-	if (osmo->term)
-		gf_term_switch_quality(osmo->term, switch_up ? GF_TRUE : GF_FALSE);
-}
-
-void Osmozilla_SetURL(Osmozilla *osmo, const char *url)
-{
-	if (osmo->term) {
-		if (osmo->url) gf_free(osmo->url);
-		osmo->url = gf_strdup(url);
-		gf_term_connect(osmo->term, osmo->url);
-	}
-}
-
-int Osmozilla_GetDownloadProgress(Osmozilla *osmo)
-{
-	if (osmo->term)
-		return osmo->download_progress;
-	return 0;
-}

gpac-0.8.0.tar.gz/applications/osmozilla/osmozilla.rc Deleted

@@ -1,128 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-
-/*do not include setup.h*/
-#define _GF_SETUP_H_
-#include <gpac/tools.h>
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Neutral resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,1,0
- PRODUCTVERSION 1,0,1,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904e4"
-        BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", " \0"
-            VALUE "FileDescription", "Osmozilla allows playback of many media and rich media files. For more information, visit <a href=""http://gpac.sourceforge.net"">gpac.sourceforge.net</a>\0"
-            VALUE "FileExtents", "*|aac|wrl,wrl.gz|x3dv,x3dv.gz,x3dvz|x3d,x3d.gz,x3dz|svg,svg.gz,svgz|mpg,mpeg,mp2,mpa,mpe,mpv2|asf,wma,wmv,asx,asr|avi|mp4,mpg4|mp4|m4a|3gp,3gpp|3gp,3gpp|3g2,3gp2|3g2,3gp2|mp2,mp3,mpga,mpega|ogg|sdp\0"
-            VALUE "FileOpenName", "GPAC Plugin|AAC Music|VRML World|X3D/VRML World|X3D/XML World|SVG Document|MPEG Video|WindowsMedia Movies|AVI Movies|MPEG-4 Videos|MPEG-4 Movies|MPEG-4 Music|3GPP Movies|3GPP Music|3GPP2 Movies|3GPP2 Music|MP3 Music|OGG Movies|SDP Session\0"
-            VALUE "FileVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
-            VALUE "InternalName", "nposmozilla\0"
-            VALUE "LegalCopyright", "Copyright © Telecom ParisTech 2005-2007\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "MIMEType", "application/x-gpac|audio/aac|model/vrml|model/x3d+vrml|model/x3d+xml|image/svg+xml|video/mpeg|video/x-ms-asf|video/avi|video/mp4|application/mp4|audio/mp4|video/3gpp|audio/3gpp|video/3gpp2|audio/3gpp2|audio/mpeg|application/ogg|application/sdp\0"
-            VALUE "OriginalFilename", "nposmozilla.dll\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Osmozilla - GPAC Plugin for Mozilla\0"
-            VALUE "ProductVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
-            VALUE "SpecialBuild", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1252
-    END
-END
-
-#endif    // !_MAC
-
-#endif    // Neutral resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winresrc.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

gpac-0.8.0.tar.gz/applications/ts2hds Deleted

gpac-0.8.0.tar.gz/applications/udptsseg Deleted

gpac-0.8.0.tar.gz/applications/udptsseg/main.c Deleted

@@ -1,314 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Cyril COncolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2008-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / udp TS segmenter (udptsseg) application
-*
-*  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/media_tools.h>
-#include <gpac/constants.h>
-#include <gpac/base_coding.h>
-#include <gpac/ietf.h>
-#include <gpac/mpegts.h>
-
-#define UDP_BUFFER_SIZE	64484
-
-/* adapted from http://svn.assembla.com/svn/legend/segmenter/segmenter.c */
-static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix,
-                             u32 first_segment, u32 last_segment, Bool end) {
-	FILE *manifest_fp;
-	u32 i;
-	char manifest_tmp_name[GF_MAX_PATH];
-	char manifest_name[GF_MAX_PATH];
-	char *tmp_manifest = manifest_tmp_name;
-
-	if (segment_dir) {
-		sprintf(manifest_tmp_name, "%stmp.m3u8", segment_dir);
-		sprintf(manifest_name, "%s%s", segment_dir, manifest);
-	} else {
-		sprintf(manifest_tmp_name, "tmp.m3u8");
-		sprintf(manifest_name, "%s", manifest);
-	}
-
-	manifest_fp = gf_fopen(tmp_manifest, "w");
-	if (!manifest_fp) {
-		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
-		return GF_BAD_PARAM;
-	}
-
-	fprintf(manifest_fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
-
-	for (i = first_segment; i <= last_segment; i++) {
-		fprintf(manifest_fp, "#EXTINF:%u,\n%s%s_%u.ts\n", segment_duration, http_prefix, segment_prefix, i);
-	}
-
-	if (end) {
-		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
-	}
-	gf_fclose(manifest_fp);
-
-	if (!rename(tmp_manifest, manifest_name)) {
-		return GF_OK;
-	} else {
-		if (remove(manifest_name)) {
-			fprintf(stdout, "Error removing file %s\n", manifest_name);
-			return GF_IO_ERR;
-		} else if (rename(tmp_manifest, manifest_name)) {
-			fprintf(stderr, "Could not rename temporary m3u8 manifest file (%s) into %s\n", tmp_manifest, manifest_name);
-			return GF_IO_ERR;
-		} else {
-			return GF_OK;
-		}
-	}
-}
-
-void usage()
-{
-	fprintf(stderr, "usage: udptsseg -src=UDP -dst-file=FILE -segment-duration=DUR -segment-dir=DIR -segment-manifest=M3U8 -segment-http-prefix=P -segment-number=N\n"
-	        "-src=UDP                udp://address:port providing the input transport stream\n"
-	        "-dst-file=FILE          e.g. out.ts, radical name of all segments\n"
-	        "-segment-dir=DIR        server local directory to store segments (with the trailing path separator)\n"
-	        "-segment-duration=DUR   segment duration in seconds\n"
-	        "-segment-manifest=M3U8  m3u8 file basename\n"
-	        "-segment-http-prefix=P  client address for accessing server segments\n"
-	        "-segment-number=N       only n segments are used using a cyclic pattern\n"
-	        "\n");
-}
-
-int main(int argc, char **argv)
-{
-	u32 i;
-	char *arg = NULL;
-	char *ts_in = NULL;
-	char *segment_dir = NULL;
-	char *segment_manifest = NULL;
-	char *segment_http_prefix = NULL;
-	u32 run_time = 0;
-	char *input_ip = NULL;
-	u32 input_port = 0;
-	GF_Socket *input_udp_sk = NULL;
-	char *input_buffer = NULL;
-	u32 input_buffer_size = UDP_BUFFER_SIZE;
-	GF_Err e = GF_OK;
-	FILE *ts_output_file = NULL;
-	char *ts_out = NULL;
-	char segment_prefix[GF_MAX_PATH];
-	char segment_name[GF_MAX_PATH];
-	u32 segment_duration = 0;
-	u32 segment_index = 0;
-	u32 segment_number = 0;
-	char segment_manifest_default[GF_MAX_PATH];
-	u32 run = 1;
-	u32 last_segment_time = 0;
-	u32 last_segment_size = 0;
-	u32 read = 0;
-	u32 towrite = 0;
-	u32 leftinbuffer = 0;
-
-	fprintf(stdout, "UDP Transport Stream Segmenter\n");
-
-	if (argc < 7) {
-		usage();
-		return 0;
-	}
-	/*****************/
-	/*   gpac init   */
-	/*****************/
-	gf_sys_init(GF_MemTrackerNone);
-
-	/*****************/
-	/*   parsing of the arguments */
-	/*****************/
-	for (i = 1; i < (u32) argc ; i++) {
-		arg = argv[i];
-		if (!strnicmp(arg, "-src=udp://",11)) {
-			char *sep;
-			arg+=11;
-			sep = strchr(arg+6, ':');
-			if (sep) {
-				input_port = atoi(sep+1);
-				sep[0]=0;
-				input_ip = gf_strdup(arg);
-				sep[0]=':';
-			} else {
-				input_ip = gf_strdup(arg);
-			}
-
-		} else if (!strnicmp(arg, "-time=", 6)) {
-			run_time = atoi(arg+6);
-		} else if (!strnicmp(arg, "-dst-file=", 10)) {
-			ts_out = gf_strdup(arg+10);
-		} else if (!strnicmp(arg, "-segment-dir=", 13)) {
-			segment_dir = gf_strdup(arg+13);
-		} else if (!strnicmp(arg, "-segment-duration=", 18)) {
-			segment_duration = atoi(arg+18);
-		} else if (!strnicmp(arg, "-segment-manifest=", 18)) {
-			segment_manifest = gf_strdup(arg+18);
-		} else if (!strnicmp(arg, "-segment-http-prefix=", 21)) {
-			segment_http_prefix = gf_strdup(arg+21);
-		} else if (!strnicmp(arg, "-segment-number=", 16)) {
-			segment_number = atoi(arg+16);
-		}
-	}
-	fprintf(stdout, "Listening to TS input on %s:%d\n", input_ip, input_port);
-	fprintf(stdout, "Creating %d sec. segments in directory %s\n", segment_duration, segment_dir);
-	fprintf(stdout, "Creating %s manifest with %d segments\n", segment_manifest, segment_number);
-
-	/*****************/
-	/*   creation of the input socket   */
-	/*****************/
-	input_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
-	if (gf_sk_is_multicast_address((char *)input_ip)) {
-		e = gf_sk_setup_multicast(input_udp_sk, (char *)input_ip, input_port, 32, 0, NULL);
-	} else {
-		e = gf_sk_bind(input_udp_sk, NULL, input_port, (char *)input_ip, input_port, GF_SOCK_REUSE_PORT);
-	}
-	if (e) {
-		fprintf(stdout, "Error initializing UDP socket for %s:%d : %s\n", input_ip, input_port, gf_error_to_string(e));
-		goto exit;
-	}
-	gf_sk_set_buffer_size(input_udp_sk, 0, UDP_BUFFER_SIZE);
-	gf_sk_set_block_mode(input_udp_sk, 1);
-
-	/*****************/
-	/*   Initialisation of the TS and Manifest files   */
-	/*****************/
-
-	if (segment_duration) {
-		char *dot;
-		strcpy(segment_prefix, ts_out);
-		dot = strrchr(segment_prefix, '.');
-		dot[0] = 0;
-		if (segment_dir) {
-			if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-				sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-			} else {
-				sprintf(segment_name, "%s%c%s_%d.ts", segment_dir, GF_PATH_SEPARATOR, segment_prefix, segment_index);
-			}
-		} else {
-			sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-		}
-		fprintf(stderr, "Processing %s segment\r", segment_name);
-		ts_out = gf_strdup(segment_name);
-		if (!segment_manifest) {
-			sprintf(segment_manifest_default, "%s.m3u8", segment_prefix);
-			segment_manifest = segment_manifest_default;
-		}
-		//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
-	}
-	ts_output_file = gf_fopen(ts_out, "wb");
-	if (!ts_output_file) {
-		fprintf(stderr, "Error opening %s\n", ts_out);
-		goto exit;
-	}
-
-	/*allocate data buffer*/
-	input_buffer = (char*)gf_malloc(input_buffer_size);
-	assert(input_buffer);
-
-	/*****************/
-	/*   main loop   */
-	/*****************/
-	last_segment_time = gf_sys_clock();
-	last_segment_size = 0;
-	while (run) {
-		/*check for some input from the network*/
-		if (input_ip) {
-			gf_sk_receive(input_udp_sk, input_buffer+leftinbuffer, input_buffer_size-leftinbuffer, 0, &read);
-			leftinbuffer += read;
-			if (leftinbuffer) {
-				fprintf(stderr, "Processing %s segment ... received %d bytes (buffer: %d, segment: %d)\n", segment_name, read, leftinbuffer, last_segment_size);
-				if (input_buffer[0] != 0x47) {
-					u32 i = 0;
-					while (input_buffer[i] != 0x47 && i < leftinbuffer) i++;
-					fprintf(stderr, "Warning: data in buffer not starting with the MPEG-2 TS sync byte, skipping %d bytes of %d\n", i, leftinbuffer);
-					if (i < leftinbuffer) memmove(input_buffer, input_buffer+i, leftinbuffer-i);
-					leftinbuffer -=i;
-				}
-				if ((leftinbuffer % 188) != 0) {
-					fprintf(stderr, "Warning: data in buffer with a size (%d bytes) not multiple of 188 bytes\n", leftinbuffer);
-					towrite = leftinbuffer - (leftinbuffer % 188);
-				} else {
-					towrite = leftinbuffer;
-				}
-			} else {
-				towrite = 0;
-			}
-			/*write to current file */
-			if (ts_output_file != NULL) {
-				u32 now = gf_sys_clock();
-				if (towrite) {
-					gf_fwrite(input_buffer, 1, towrite, ts_output_file);
-					if (towrite < leftinbuffer) {
-						fprintf(stderr, "Warning: wrote %d bytes, keeping %d bytes\n", towrite, (leftinbuffer-towrite));
-						memmove(input_buffer, input_buffer+towrite, leftinbuffer-towrite);
-					}
-					leftinbuffer -= towrite;
-					last_segment_size += towrite;
-				}
-				if ((now - last_segment_time) > segment_duration*1000) {
-					last_segment_time = now;
-					gf_fclose(ts_output_file);
-					fprintf(stderr, "Closing segment %s (%d bytes)\n", segment_name, last_segment_size);
-					last_segment_size = 0;
-					segment_index++;
-					if (segment_dir) {
-						if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-							sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
-						} else {
-							sprintf(segment_name, "%s%c%s_%d.ts", segment_dir, GF_PATH_SEPARATOR, segment_prefix, segment_index);
-						}
-					} else {
-						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
-					}
-					ts_output_file = gf_fopen(segment_name, "wb");
-					if (!ts_output_file) {
-						fprintf(stderr, "Error opening segment %s\n", segment_name);
-						goto exit;
-					}
-					/* delete the oldest segment */
-					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)) {
-						char old_segment_name[GF_MAX_PATH];
-						if (segment_dir) {
-							if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
-								sprintf(old_segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							} else {
-								sprintf(old_segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
-							}
-						} else {
-							sprintf(old_segment_name, "%s_%d.ts", segment_prefix, segment_index - segment_number - 1);
-						}
-						gf_delete_file(old_segment_name);
-						fprintf(stderr, "Deleting segment %s\n", old_segment_name);
-					}
-					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix,
-					               //								   (segment_index >= segment_number/2 ? segment_index - segment_number/2 : 0), segment_index >1 ? segment_index-1 : 0, 0);
-					               ( (segment_index > segment_number ) ? segment_index - segment_number : 0), segment_index >1 ? segment_index-1 : 0, 0);
-				}
-			}
-
-			//}
-		}
-		/*cpu load regulation*/
-		gf_sleep(1);
-	}
-exit:
-	return 0;
-}

gpac-0.8.0.tar.gz/bin Deleted

gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4) Deleted

gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4)/release Deleted

gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4)/release/install Deleted

gpac-0.8.0.tar.gz/bin/smartphone 2003 (armv4)/release/install/readme.txt Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_aac_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_bifs_dec.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_ctx_load.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_dummy_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_ffmpeg_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_gpac_js.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_img_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_ismacryp.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_isom_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_laser_dec.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_mediacodec_dec.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_mp3_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_mpd_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_mpegts_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_odf_dec.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_rawout.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_rtp_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_saf_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_soft_raster.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_svg_in.mk Deleted

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_timedtext.mk Deleted

gpac-0.8.0.tar.gz/build/msvc10 Deleted

gpac-0.8.0.tar.gz/build/msvc10/GPAX.vcxproj Deleted

@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{72486240-A124-496E-A67A-E76FEC7E99BE}</ProjectGuid>
-    <RootNamespace>GPAX</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <CustomBuildStep>
-      <Message>
-      </Message>
-      <Command>
-      </Command>
-      <Outputs>
-      </Outputs>
-    </CustomBuildStep>
-    <Midl>
-      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\applications\GPAX\gpax.bmp" />
-    <None Include="..\..\applications\GPAX\GPAX.def" />
-    <None Include="..\..\applications\GPAX\GPAX.rgs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\GPAX\GPAX.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\GPAX\GPAXPlugin.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\GPAX\StdAfx.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\GPAX\GPAX.h" />
-    <ClInclude Include="..\..\applications\GPAX\GPAXPlugin.h" />
-    <ClInclude Include="..\..\applications\GPAX\resource.h" />
-    <ClInclude Include="..\..\applications\GPAX\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="..\..\applications\GPAX\GPAX.idl">
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GPAX.tlb</TypeLibraryName>
-      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GPAX.tlb</TypeLibraryName>
-    </Midl>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\GPAX\GPAX.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/Osmo4.vcxproj Deleted

@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
-    <RootNamespace>Osmo4</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\applications\osmo4_w32\res\error.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\message.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\play.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
-    <None Include="..\..\doc\osmo4.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/aac_in.vcxproj Deleted

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
-    <RootNamespace>aac_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/aac_in_deb/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/aac_in_deb/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/aac_in_rel/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/aac_in_rel/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\aac_in\aac_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\aac_in\faad_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ac3_in.vcxproj Deleted

@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}</ProjectGuid>
-    <RootNamespace>ac3_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/ac3_in.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;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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>.\Debug/ac3_in.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;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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>.\Release/ac3_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ac3_in\ac3_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ac3_in\liba52_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/amr_dec.vcxproj Deleted

@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{5ED5A1C8-DB34-4089-8E53-EFB225754D02}</ProjectGuid>
-    <RootNamespace>amr_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <StackReserveSize>8388608</StackReserveSize>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <StackReserveSize>8388608</StackReserveSize>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\amr_dec\amr_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/amr_float_dec.vcxproj Deleted

@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{5D3983BF-143F-49C3-9284-89778282AEFE}</ProjectGuid>
-    <RootNamespace>amr_float_dec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\amr_float_dec\amr_float_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/atsc_in.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
-    <RootNamespace>atsc_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/atsc_in_deb/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/atsc_in_deb/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/atsc_in_rel/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/atsc_in_rel/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\atsc_in\atsc_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/audio_filter.vcxproj Deleted

@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{C993119B-29B1-49C8-8EA3-A9ABF633164E}</ProjectGuid>
-    <RootNamespace>audio_filter</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\audio_filter\audio_filter.c" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/avcap.vcxproj Deleted

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{109C4F31-781F-4C9E-B160-E788A83F9387}</ProjectGuid>
-    <RootNamespace>avcap</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/avcap.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>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/avcap.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>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/avcap.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/avcap.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\avcap\avcap.cpp" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/bifs_dec.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}</ProjectGuid>
-    <RootNamespace>bifs_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\bifs_dec\bifs_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ctx_load.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}</ProjectGuid>
-    <RootNamespace>ctx_load</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ctx_load\ctx_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/dashcast.vcxproj Deleted

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
-    <RootNamespace>dashcast</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
-    <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
-    <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\controler.c" />
-    <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
-    <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
-    <ClCompile Include="..\..\applications\dashcast\register.c" />
-    <ClCompile Include="..\..\applications\dashcast\task.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
-    <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
-    <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\controler.h" />
-    <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
-    <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
-    <ClInclude Include="..\..\applications\dashcast\register.h" />
-    <ClInclude Include="..\..\applications\dashcast\task.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc10/dektec_out.vcxproj Deleted

@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{CAC981C2-5665-4E90-80D3-604C1A785D91}</ProjectGuid>
-    <RootNamespace>dektec_out</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dektec_out_deb/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc10/dummy_in.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{073E2381-4FDE-4C4D-A117-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>dummy_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\dummy_in\dummy_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/dx_hw.vcxproj Deleted

@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{B64736BD-9245-4F40-961D-EB9822265764}</ProjectGuid>
-    <RootNamespace>dx_hw</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;C:\Imagination\PowerVR_Graphics\PowerVR_SDK\SDK_3.4\Builds\Include\</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;C:\Imagination\PowerVR_Graphics\PowerVR_SDK\SDK_3.4\Builds\Windows\x86_64\Lib</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(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>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(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>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)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>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_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>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\modules\dx_hw\collide.cur" />
-    <None Include="..\..\modules\dx_hw\hand.cur" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\dx_hw\dx_2d.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\dx_hw\dx_audio.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\dx_hw\dx_video.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\dx_hw\dx_window.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\dx_hw\dx_hw.h" />
-    <ClInclude Include="..\..\modules\dx_hw\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\modules\dx_hw\dx_hw.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ffmpeg_in.vcxproj Deleted

@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{9FECAB79-BC70-4EEA-A23B-B64159F904B3}</ProjectGuid>
-    <RootNamespace>ffmpeg_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ft_font.vcxproj Deleted

@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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-4B5C-8BC0-CD9AFA416974}</ProjectGuid>
-    <RootNamespace>ft_font</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/ft_font_deb/ft_font.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(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>freetype.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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/ft_font_deb/ft_font.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(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>freetype.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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/ft_font_rel/ft_font.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(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>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ft_font_rel/ft_font.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/freetype;%(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>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ft_font\ft_font.c" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\ft_font\ft_font.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/gdip_raster.vcxproj Deleted

@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{CAA5A551-006A-4119-8115-FB14692E719F}</ProjectGuid>
-    <RootNamespace>gdip_raster</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/gdip_deb/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;_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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_font.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_grad.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_rend.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_texture.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\gdip_raster\gdip_priv.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/gpac.sln Deleted

@@ -1,827 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcxproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atsc_in", "atsc_in.vcxproj", "{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcxproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcxproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcxproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcxproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcxproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcxproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcxproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcxproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcxproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcxproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcxproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcxproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcxproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcxproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcxproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcxproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcxproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcxproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcxproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcxproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcxproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcxproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcxproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcxproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcxproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcxproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcxproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcxproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcxproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcxproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcxproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcxproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcxproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_rec", "ui_rec.vcxproj", "{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcxproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_dec", "amr_dec.vcxproj", "{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_float_dec", "amr_float_dec.vcxproj", "{5D3983BF-143F-49C3-9284-89778282AEFE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPAX", "GPAX.vcxproj", "{72486240-A124-496E-A67A-E76FEC7E99BE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcxproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avcap", "avcap.vcxproj", "{109C4F31-781F-4C9E-B160-E788A83F9387}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcxproj", "{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{6274F5D2-A9CB-4DF9-BF9E-818416ACD347}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashcast", "dashcast.vcxproj", "{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdec", "nvdec.vcxproj", "{073E2381-4CDB-4C4D-B217-C489EF17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dektec_out", "dektec_out.vcxproj", "{CAC981C2-5665-4E90-80D3-604C1A785D91}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
-		Debug - MP4Box_only|x64 = Debug - MP4Box_only|x64
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release - MP4Box_only|Win32 = Release - MP4Box_only|Win32
-		Release - MP4Box_only|x64 = Release - MP4Box_only|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|Win32.Build.0 = Debug|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.ActiveCfg = Debug|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Debug|x64.Build.0 = Debug|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.ActiveCfg = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.ActiveCfg = Release|x64
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.Build.0 = Release|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.Build.0 = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.Build.0 = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.ActiveCfg = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.Build.0 = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.ActiveCfg = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.Build.0 = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.ActiveCfg = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.Build.0 = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.ActiveCfg = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.Build.0 = Release|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.Build.0 = Debug|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.ActiveCfg = Debug|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|x64.Build.0 = Debug|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.ActiveCfg = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.ActiveCfg = Release|x64
-		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.Build.0 = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.Build.0 = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.Build.0 = Release|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.ActiveCfg = Debug|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|x64.Build.0 = Debug|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.ActiveCfg = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.Build.0 = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.ActiveCfg = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.Build.0 = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.ActiveCfg = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.Build.0 = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.ActiveCfg = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.Build.0 = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.ActiveCfg = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.Build.0 = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.ActiveCfg = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.Build.0 = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.ActiveCfg = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.Build.0 = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.ActiveCfg = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.Build.0 = Release|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|Win32.Build.0 = Debug|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.ActiveCfg = Debug|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug|x64.Build.0 = Debug|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.ActiveCfg = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|Win32.Build.0 = Release|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.ActiveCfg = Release|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release|x64.Build.0 = Release|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|Win32.Build.0 = Debug|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.ActiveCfg = Debug|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Debug|x64.Build.0 = Debug|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.ActiveCfg = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.ActiveCfg = Release|x64
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.Build.0 = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.ActiveCfg = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.Build.0 = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.ActiveCfg = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.Build.0 = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|Win32.Build.0 = Debug|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.ActiveCfg = Debug|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug|x64.Build.0 = Debug|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.ActiveCfg = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.ActiveCfg = Release|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.Build.0 = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.ActiveCfg = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.Build.0 = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.ActiveCfg = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.Build.0 = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.ActiveCfg = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.Build.0 = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.ActiveCfg = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.Build.0 = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.Build.0 = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.Build.0 = Release|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|Win32.Build.0 = Debug|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Debug|x64.ActiveCfg = Debug|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.ActiveCfg = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|Win32.Build.0 = Release|Win32
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF}.Release|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.ActiveCfg = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.Build.0 = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.Build.0 = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.Build.0 = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.ActiveCfg = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.Build.0 = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.ActiveCfg = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.Build.0 = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.ActiveCfg = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.Build.0 = Release|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.Build.0 = Debug|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.ActiveCfg = Debug|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|x64.Build.0 = Debug|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.ActiveCfg = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.ActiveCfg = Release|x64
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.Build.0 = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.ActiveCfg = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.Build.0 = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.ActiveCfg = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.Build.0 = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.ActiveCfg = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.Build.0 = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.ActiveCfg = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.Build.0 = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.ActiveCfg = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.Build.0 = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.ActiveCfg = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.Build.0 = Release|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.Build.0 = Debug|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.ActiveCfg = Debug|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|x64.Build.0 = Debug|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.ActiveCfg = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.ActiveCfg = Release|x64
-		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.Build.0 = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.ActiveCfg = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.Build.0 = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.ActiveCfg = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.Build.0 = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.ActiveCfg = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.Build.0 = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.ActiveCfg = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.Build.0 = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.ActiveCfg = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.Build.0 = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.ActiveCfg = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.Build.0 = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.ActiveCfg = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.Build.0 = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.ActiveCfg = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.Build.0 = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.ActiveCfg = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.Build.0 = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.ActiveCfg = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.Build.0 = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.ActiveCfg = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.Build.0 = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.ActiveCfg = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.Build.0 = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.ActiveCfg = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.Build.0 = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.ActiveCfg = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.Build.0 = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.Build.0 = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.ActiveCfg = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.Build.0 = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.ActiveCfg = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.Build.0 = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.ActiveCfg = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.Build.0 = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.ActiveCfg = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.Build.0 = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.ActiveCfg = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.Build.0 = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.ActiveCfg = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.Build.0 = Release|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|Win32.Build.0 = Debug|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.ActiveCfg = Debug|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Debug|x64.Build.0 = Debug|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.ActiveCfg = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|Win32.Build.0 = Release|Win32
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.ActiveCfg = Release|x64
-		{72486240-A124-496E-A67A-E76FEC7E99BE}.Release|x64.Build.0 = Release|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.Build.0 = Debug|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.ActiveCfg = Debug|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|x64.Build.0 = Debug|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.ActiveCfg = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.ActiveCfg = Release|x64
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.Build.0 = Release|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|Win32.Build.0 = Debug|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Debug|x64.ActiveCfg = Debug|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.ActiveCfg = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|Win32.Build.0 = Release|Win32
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.ActiveCfg = Release|x64
-		{109C4F31-781F-4C9E-B160-E788A83F9387}.Release|x64.Build.0 = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.ActiveCfg = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.Build.0 = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.Build.0 = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.ActiveCfg = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.Build.0 = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.ActiveCfg = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.Build.0 = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.ActiveCfg = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.Build.0 = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.ActiveCfg = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.Build.0 = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.ActiveCfg = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.Build.0 = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.ActiveCfg = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C79C2D73-06E9-4622-92CE-F166B1B51792} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{A0288B75-0D95-4106-A3A7-779A891E8FEF} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{A35D99BF-D72D-4F56-99A1-97249B22BCE2} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{1F7DE37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B64736BD-9245-4F40-961D-EB9822265764} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{042D3628-67F3-4B5C-8BC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{CAA5A551-006A-4119-8115-FB14692E719F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{879E26B2-48DB-47B3-B82F-893696286E6F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{F346A9A7-CF8D-4409-8776-1D4244F96EF8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{71071F01-C813-4384-BE38-0F4020BCC0EE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{402A8794-B724-44A3-B608-84B600ECA387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{464697D2-BA44-446F-8223-1EB3969ED1A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{01183543-B182-4E32-9FD6-FC15C847316C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{4258687D-4905-46A6-9407-08F4F8A81CC0} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{694C765F-DFD6-467E-A813-B3F887E822D4} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5D3983BF-143F-49C3-9284-89778282AEFE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{109C4F31-781F-4C9E-B160-E788A83F9387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{CAC981C2-5665-4E90-80D3-604C1A785D91} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
-		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
-	EndGlobalSection
-EndGlobal

gpac-0.8.0.tar.gz/build/msvc10/gpac_js.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}</ProjectGuid>
-    <RootNamespace>gpac_js</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_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>odbc32.lib;odbccp32.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\gpac_js\gpac_js.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/gpac_mp4box_mini.sln Deleted

@@ -1,35 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - MP4Box_only|Win32 = Debug - MP4Box_only|Win32
-		Debug - MP4Box_only|x64 = Debug - MP4Box_only|x64
-		Release - MP4Box_only|Win32 = Release - MP4Box_only|Win32
-		Release - MP4Box_only|x64 = Release - MP4Box_only|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
-		{233014D5-F6E5-419D-8757-FA9CE7337088}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.Build.0 = Debug - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|Win32.Build.0 = Release - MP4Box_only|Win32
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.ActiveCfg = Release - MP4Box_only|x64
-		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release - MP4Box_only|x64.Build.0 = Release - MP4Box_only|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

gpac-0.8.0.tar.gz/build/msvc10/hyb_in.vcxproj Deleted

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{41B1DAF0-D7ED-4934-B915-05DBB0EE6B0E}</ProjectGuid>
-    <RootNamespace>hyb_in</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </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'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HYB_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/gm_$(ProjectName).dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\hyb_in\fm_fake_pull.c" />
-    <ClCompile Include="..\..\modules\hyb_in\fm_fake_push.c" />
-    <ClCompile Include="..\..\modules\hyb_in\fm_mmbtools.c" />
-    <ClCompile Include="..\..\modules\hyb_in\hyb_in.c" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\hyb_in\hyb_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/img_in.vcxproj Deleted

@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
-    <RootNamespace>img_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/img_in_deb/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/img_in_deb/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/img_in_rel/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\img_in\bmp_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\img_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\img_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\jp2_dec.c" />
-    <ClCompile Include="..\..\modules\img_in\jpeg_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\img_in\png_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\img_in\img_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ismacryp.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}</ProjectGuid>
-    <RootNamespace>ismacryp</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ismacryp\isma_ea.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/isom_in.vcxproj Deleted

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{FC8F1F56-078E-470D-B252-68EDDE88AA9D}</ProjectGuid>
-    <RootNamespace>isom_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/isom_in_deb/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/isom_in_deb/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/isom_in_rel/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\isom_in\isom_cache.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\isom_in\load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\isom_in\read.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\isom_in\read_ch.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\isom_in\isom_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/laser_dec.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{879E26B2-48DB-47B3-B82F-893696286E6F}</ProjectGuid>
-    <RootNamespace>laser_dec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\laser_dec\laser_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/libgpac.vcxproj Deleted

@@ -1,807 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
-      <Configuration>Debug - MP4Box_only</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug - MP4Box_only|x64">
-      <Configuration>Debug - MP4Box_only</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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 - MP4Box_only|Win32">
-      <Configuration>Release - MP4Box_only</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release - MP4Box_only|x64">
-      <Configuration>Release - MP4Box_only</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>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\gpac\ait.h" />
-    <ClInclude Include="..\..\include\gpac\atsc.h" />
-    <ClInclude Include="..\..\include\gpac\avparse.h" />
-    <ClInclude Include="..\..\include\gpac\base_coding.h" />
-    <ClInclude Include="..\..\include\gpac\bifs.h" />
-    <ClInclude Include="..\..\include\gpac\bitstream.h" />
-    <ClInclude Include="..\..\include\gpac\cache.h" />
-    <ClInclude Include="..\..\include\gpac\color.h" />
-    <ClInclude Include="..\..\include\gpac\compositor.h" />
-    <ClInclude Include="..\..\include\gpac\configuration.h" />
-    <ClInclude Include="..\..\include\gpac\config_file.h" />
-    <ClInclude Include="..\..\include\gpac\constants.h" />
-    <ClInclude Include="..\..\include\gpac\crypt.h" />
-    <ClInclude Include="..\..\include\gpac\dash.h" />
-    <ClInclude Include="..\..\include\gpac\download.h" />
-    <ClInclude Include="..\..\include\gpac\dsmcc.h" />
-    <ClInclude Include="..\..\include\gpac\dvb_mpe.h" />
-    <ClInclude Include="..\..\include\gpac\esi.h" />
-    <ClInclude Include="..\..\include\gpac\events.h" />
-    <ClInclude Include="..\..\include\gpac\events_constants.h" />
-    <ClInclude Include="..\..\include\gpac\filestreamer.h" />
-    <ClInclude Include="..\..\include\gpac\html5_media.h" />
-    <ClInclude Include="..\..\include\gpac\html5_mse.h" />
-    <ClInclude Include="..\..\include\gpac\ietf.h" />
-    <ClInclude Include="..\..\include\gpac\internal\avilib.h" />
-    <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h" />
-    <ClInclude Include="..\..\include\gpac\internal\camera.h" />
-    <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\laser_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\m3u8.h" />
-    <ClInclude Include="..\..\include\gpac\internal\media_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\mesh.h" />
-    <ClInclude Include="..\..\include\gpac\internal\mpd.h" />
-    <ClInclude Include="..\..\include\gpac\internal\odf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h" />
-    <ClInclude Include="..\..\include\gpac\internal\ogg.h" />
-    <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h" />
-    <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\smjs_api.h" />
-    <ClInclude Include="..\..\include\gpac\internal\swf_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h" />
-    <ClInclude Include="..\..\include\gpac\internal\vobsub.h" />
-    <ClInclude Include="..\..\include\gpac\ismacryp.h" />
-    <ClInclude Include="..\..\include\gpac\iso639.h" />
-    <ClInclude Include="..\..\include\gpac\isomedia.h" />
-    <ClInclude Include="..\..\include\gpac\laser.h" />
-    <ClInclude Include="..\..\include\gpac\list.h" />
-    <ClInclude Include="..\..\include\gpac\map.h" />
-    <ClInclude Include="..\..\include\gpac\math.h" />
-    <ClInclude Include="..\..\include\gpac\mediaobject.h" />
-    <ClInclude Include="..\..\include\gpac\media_tools.h" />
-    <ClInclude Include="..\..\include\gpac\module.h" />
-    <ClInclude Include="..\..\include\gpac\modules\audio_out.h" />
-    <ClInclude Include="..\..\include\gpac\modules\codec.h" />
-    <ClInclude Include="..\..\include\gpac\modules\font.h" />
-    <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h" />
-    <ClInclude Include="..\..\include\gpac\modules\ipmp.h" />
-    <ClInclude Include="..\..\include\gpac\modules\js_usr.h" />
-    <ClInclude Include="..\..\include\gpac\modules\raster2d.h" />
-    <ClInclude Include="..\..\include\gpac\modules\service.h" />
-    <ClInclude Include="..\..\include\gpac\modules\term_ext.h" />
-    <ClInclude Include="..\..\include\gpac\modules\video_out.h" />
-    <ClInclude Include="..\..\include\gpac\mpeg4_odf.h" />
-    <ClInclude Include="..\..\include\gpac\mpegts.h" />
-    <ClInclude Include="..\..\include\gpac\network.h" />
-    <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h" />
-    <ClInclude Include="..\..\include\gpac\nodes_svg.h" />
-    <ClInclude Include="..\..\include\gpac\nodes_x3d.h" />
-    <ClInclude Include="..\..\include\gpac\nodes_xbl.h" />
-    <ClInclude Include="..\..\include\gpac\options.h" />
-    <ClInclude Include="..\..\include\gpac\path2d.h" />
-    <ClInclude Include="..\..\include\gpac\revision.h" />
-    <ClInclude Include="..\..\include\gpac\ringbuffer.h" />
-    <ClInclude Include="..\..\include\gpac\rtp_streamer.h" />
-    <ClInclude Include="..\..\include\gpac\scenegraph.h" />
-    <ClInclude Include="..\..\include\gpac\scenegraph_svg.h" />
-    <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h" />
-    <ClInclude Include="..\..\include\gpac\scene_engine.h" />
-    <ClInclude Include="..\..\include\gpac\scene_manager.h" />
-    <ClInclude Include="..\..\include\gpac\setup.h" />
-    <ClInclude Include="..\..\include\gpac\svg_types.h" />
-    <ClInclude Include="..\..\include\gpac\sync_layer.h" />
-    <ClInclude Include="..\..\include\gpac\terminal.h" />
-    <ClInclude Include="..\..\include\gpac\term_info.h" />
-    <ClInclude Include="..\..\include\gpac\thread.h" />
-    <ClInclude Include="..\..\include\gpac\token.h" />
-    <ClInclude Include="..\..\include\gpac\tools.h" />
-    <ClInclude Include="..\..\include\gpac\unicode.h" />
-    <ClInclude Include="..\..\include\gpac\user.h" />
-    <ClInclude Include="..\..\include\gpac\utf.h" />
-    <ClInclude Include="..\..\include\gpac\version.h" />
-    <ClInclude Include="..\..\include\gpac\webvtt.h" />
-    <ClInclude Include="..\..\include\gpac\xml.h" />
-    <ClInclude Include="..\..\include\win32\inttypes.h" />
-    <ClInclude Include="..\..\include\win32\stdint.h" />
-    <ClInclude Include="..\..\src\bifs\quant.h" />
-    <ClInclude Include="..\..\src\bifs\script.h" />
-    <ClInclude Include="..\..\src\compositor\drawable.h" />
-    <ClInclude Include="..\..\src\compositor\gl_inc.h" />
-    <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h" />
-    <ClInclude Include="..\..\src\compositor\nodes_stacks.h" />
-    <ClInclude Include="..\..\src\compositor\offscreen_cache.h" />
-    <ClInclude Include="..\..\src\compositor\texturing.h" />
-    <ClInclude Include="..\..\src\compositor\visual_manager.h" />
-    <ClInclude Include="..\..\src\compositor\visual_manager_2d.h" />
-    <ClInclude Include="..\..\src\compositor\visual_manager_3d.h" />
-    <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h" />
-    <ClInclude Include="..\..\src\terminal\input_sensor.h" />
-    <ClInclude Include="..\..\src\terminal\media_control.h" />
-    <ClInclude Include="..\..\src\terminal\media_memory.h" />
-    <ClInclude Include="..\..\src\utils\module_wrap.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bifs\arith_decoder.c" />
-    <ClCompile Include="..\..\src\bifs\bifs_codec.c" />
-    <ClCompile Include="..\..\src\bifs\bifs_node_tables.c" />
-    <ClCompile Include="..\..\src\bifs\com_dec.c" />
-    <ClCompile Include="..\..\src\bifs\com_enc.c" />
-    <ClCompile Include="..\..\src\bifs\conditional.c" />
-    <ClCompile Include="..\..\src\bifs\field_decode.c" />
-    <ClCompile Include="..\..\src\bifs\field_encode.c" />
-    <ClCompile Include="..\..\src\bifs\memory_decoder.c" />
-    <ClCompile Include="..\..\src\bifs\predictive_mffield.c" />
-    <ClCompile Include="..\..\src\bifs\quantize.c" />
-    <ClCompile Include="..\..\src\bifs\script_dec.c" />
-    <ClCompile Include="..\..\src\bifs\script_enc.c" />
-    <ClCompile Include="..\..\src\bifs\unquantize.c" />
-    <ClCompile Include="..\..\src\compositor\audio_input.c" />
-    <ClCompile Include="..\..\src\compositor\audio_mixer.c" />
-    <ClCompile Include="..\..\src\compositor\audio_render.c" />
-    <ClCompile Include="..\..\src\compositor\bindable.c" />
-    <ClCompile Include="..\..\src\compositor\camera.c" />
-    <ClCompile Include="..\..\src\compositor\compositor.c" />
-    <ClCompile Include="..\..\src\compositor\compositor_2d.c" />
-    <ClCompile Include="..\..\src\compositor\compositor_3d.c" />
-    <ClCompile Include="..\..\src\compositor\compositor_node_init.c" />
-    <ClCompile Include="..\..\src\compositor\drawable.c" />
-    <ClCompile Include="..\..\src\compositor\events.c" />
-    <ClCompile Include="..\..\src\compositor\font_engine.c" />
-    <ClCompile Include="..\..\src\compositor\hardcoded_protos.c" />
-    <ClCompile Include="..\..\src\compositor\hc_flash_shape.c" />
-    <ClCompile Include="..\..\src\compositor\mesh.c" />
-    <ClCompile Include="..\..\src\compositor\mesh_collide.c" />
-    <ClCompile Include="..\..\src\compositor\mesh_tesselate.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_audio.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_background.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_composite.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_form.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_layout.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_sound.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_text.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_textures.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c" />
-    <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c" />
-    <ClCompile Include="..\..\src\compositor\navigate.c" />
-    <ClCompile Include="..\..\src\compositor\offscreen_cache.c" />
-    <ClCompile Include="..\..\src\compositor\svg_base.c" />
-    <ClCompile Include="..\..\src\compositor\svg_filters.c" />
-    <ClCompile Include="..\..\src\compositor\svg_font.c" />
-    <ClCompile Include="..\..\src\compositor\svg_geometry.c" />
-    <ClCompile Include="..\..\src\compositor\svg_grouping.c" />
-    <ClCompile Include="..\..\src\compositor\svg_media.c" />
-    <ClCompile Include="..\..\src\compositor\svg_paint_servers.c" />
-    <ClCompile Include="..\..\src\compositor\svg_text.c" />
-    <ClCompile Include="..\..\src\compositor\texturing.c" />
-    <ClCompile Include="..\..\src\compositor\texturing_gl.c" />
-    <ClCompile Include="..\..\src\compositor\visual_manager.c" />
-    <ClCompile Include="..\..\src\compositor\visual_manager_2d.c" />
-    <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c" />
-    <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\ietf\rtcp.c" />
-    <ClCompile Include="..\..\src\ietf\rtp.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_packetizer.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c" />
-    <ClCompile Include="..\..\src\ietf\rtp_streamer.c" />
-    <ClCompile Include="..\..\src\ietf\rtsp_command.c" />
-    <ClCompile Include="..\..\src\ietf\rtsp_common.c" />
-    <ClCompile Include="..\..\src\ietf\rtsp_response.c" />
-    <ClCompile Include="..\..\src\ietf\rtsp_session.c" />
-    <ClCompile Include="..\..\src\ietf\sdp.c" />
-    <ClCompile Include="..\..\src\isomedia\avc_ext.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_adobe.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_apple.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_base.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_drm.c" />
-    <ClCompile Include="..\..\src\isomedia\box_code_meta.c" />
-    <ClCompile Include="..\..\src\isomedia\box_dump.c" />
-    <ClCompile Include="..\..\src\isomedia\box_funcs.c" />
-    <ClCompile Include="..\..\src\isomedia\data_map.c" />
-    <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
-    <ClCompile Include="..\..\src\isomedia\iff.c" />
-    <ClCompile Include="..\..\src\isomedia\ttml.c" />
-    <ClCompile Include="..\..\src\isomedia\hinting.c" />
-    <ClCompile Include="..\..\src\isomedia\hint_track.c" />
-    <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
-    <ClCompile Include="..\..\src\isomedia\isom_read.c" />
-    <ClCompile Include="..\..\src\isomedia\isom_store.c" />
-    <ClCompile Include="..\..\src\isomedia\isom_write.c" />
-    <ClCompile Include="..\..\src\isomedia\media.c" />
-    <ClCompile Include="..\..\src\isomedia\media_odf.c" />
-    <ClCompile Include="..\..\src\isomedia\meta.c" />
-    <ClCompile Include="..\..\src\isomedia\movie_fragments.c" />
-    <ClCompile Include="..\..\src\isomedia\sample_descs.c" />
-    <ClCompile Include="..\..\src\isomedia\stbl_read.c" />
-    <ClCompile Include="..\..\src\isomedia\stbl_write.c" />
-    <ClCompile Include="..\..\src\isomedia\track.c" />
-    <ClCompile Include="..\..\src\isomedia\tx3g.c" />
-    <ClCompile Include="..\..\src\laser\lsr_dec.c" />
-    <ClCompile Include="..\..\src\laser\lsr_enc.c" />
-    <ClCompile Include="..\..\src\laser\lsr_tables.c" />
-    <ClCompile Include="..\..\src\crypto\g_crypt.c" />
-    <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c" />
-    <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c" />
-    <ClCompile Include="..\..\src\crypto\tiny_aes.c" />
-    <ClCompile Include="..\..\src\media_tools\ait.c" />
-    <ClCompile Include="..\..\src\media_tools\atsc_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" />
-    <ClCompile Include="..\..\src\media_tools\dash_segmenter.c" />
-    <ClCompile Include="..\..\src\media_tools\dsmcc.c" />
-    <ClCompile Include="..\..\src\media_tools\dvb_mpe.c" />
-    <ClCompile Include="..\..\src\media_tools\filestreamer.c" />
-    <ClCompile Include="..\..\src\media_tools\gpac_ogg.c" />
-    <ClCompile Include="..\..\src\media_tools\html5_media.c" />
-    <ClCompile Include="..\..\src\media_tools\html5_mse.c" />
-    <ClCompile Include="..\..\src\media_tools\img.c" />
-    <ClCompile Include="..\..\src\media_tools\ismacryp.c" />
-    <ClCompile Include="..\..\src\media_tools\isom_hinter.c" />
-    <ClCompile Include="..\..\src\media_tools\isom_tools.c" />
-    <ClCompile Include="..\..\src\media_tools\m2ts_mux.c" />
-    <ClCompile Include="..\..\src\media_tools\m3u8.c" />
-    <ClCompile Include="..\..\src\media_tools\media_export.c" />
-    <ClCompile Include="..\..\src\media_tools\media_import.c" />
-    <ClCompile Include="..\..\src\media_tools\mpd.c" />
-    <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c" />
-    <ClCompile Include="..\..\src\media_tools\mpegts.c" />
-    <ClCompile Include="..\..\src\media_tools\reedsolomon.c" />
-    <ClCompile Include="..\..\src\media_tools\saf.c" />
-    <ClCompile Include="..\..\src\media_tools\text_import.c" />
-    <ClCompile Include="..\..\src\media_tools\vobsub.c" />
-    <ClCompile Include="..\..\src\media_tools\webvtt.c" />
-    <ClCompile Include="..\..\src\odf\descriptors.c" />
-    <ClCompile Include="..\..\src\odf\desc_private.c" />
-    <ClCompile Include="..\..\src\odf\ipmpx_code.c" />
-    <ClCompile Include="..\..\src\odf\ipmpx_dump.c" />
-    <ClCompile Include="..\..\src\odf\ipmpx_parse.c" />
-    <ClCompile Include="..\..\src\odf\oci_codec.c" />
-    <ClCompile Include="..\..\src\odf\odf_code.c" />
-    <ClCompile Include="..\..\src\odf\odf_codec.c" />
-    <ClCompile Include="..\..\src\odf\odf_command.c" />
-    <ClCompile Include="..\..\src\odf\odf_dump.c" />
-    <ClCompile Include="..\..\src\odf\odf_parse.c" />
-    <ClCompile Include="..\..\src\odf\qos.c" />
-    <ClCompile Include="..\..\src\odf\slc.c" />
-    <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c" />
-    <ClCompile Include="..\..\src\scenegraph\commands.c" />
-    <ClCompile Include="..\..\src\scenegraph\dom_events.c" />
-    <ClCompile Include="..\..\src\scenegraph\dom_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c" />
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c" />
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c" />
-    <ClCompile Include="..\..\src\scenegraph\smil_anim.c" />
-    <ClCompile Include="..\..\src\scenegraph\smil_timing.c" />
-    <ClCompile Include="..\..\src\scenegraph\svg_attributes.c" />
-    <ClCompile Include="..\..\src\scenegraph\svg_properties.c" />
-    <ClCompile Include="..\..\src\scenegraph\svg_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\svg_types.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_proto.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_route.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_script.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_tools.c" />
-    <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c" />
-    <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
-    <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
-    <ClCompile Include="..\..\src\scene_manager\encode_isom.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_bt.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_isom.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_qt.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_svg.c" />
-    <ClCompile Include="..\..\src\scene_manager\loader_xmt.c" />
-    <ClCompile Include="..\..\src\scene_manager\scene_dump.c" />
-    <ClCompile Include="..\..\src\scene_manager\scene_engine.c" />
-    <ClCompile Include="..\..\src\scene_manager\scene_manager.c" />
-    <ClCompile Include="..\..\src\scene_manager\scene_stats.c" />
-    <ClCompile Include="..\..\src\scene_manager\swf_bifs.c" />
-    <ClCompile Include="..\..\src\scene_manager\swf_parse.c" />
-    <ClCompile Include="..\..\src\scene_manager\swf_svg.c" />
-    <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c" />
-    <ClCompile Include="..\..\src\terminal\channel.c" />
-    <ClCompile Include="..\..\src\terminal\clock.c" />
-    <ClCompile Include="..\..\src\terminal\decoder.c" />
-    <ClCompile Include="..\..\src\terminal\input_sensor.c" />
-    <ClCompile Include="..\..\src\terminal\media_control.c" />
-    <ClCompile Include="..\..\src\terminal\media_manager.c" />
-    <ClCompile Include="..\..\src\terminal\media_memory.c" />
-    <ClCompile Include="..\..\src\terminal\media_object.c" />
-    <ClCompile Include="..\..\src\terminal\media_sensor.c" />
-    <ClCompile Include="..\..\src\terminal\mpeg4_inline.c" />
-    <ClCompile Include="..\..\src\terminal\network_service.c" />
-    <ClCompile Include="..\..\src\terminal\object_browser.c" />
-    <ClCompile Include="..\..\src\terminal\object_manager.c" />
-    <ClCompile Include="..\..\src\terminal\scene.c" />
-    <ClCompile Include="..\..\src\terminal\svg_external.c" />
-    <ClCompile Include="..\..\src\terminal\terminal.c" />
-    <ClCompile Include="..\..\src\terminal\term_node_init.c" />
-    <ClCompile Include="..\..\src\utils\alloc.c" />
-    <ClCompile Include="..\..\src\utils\base_encoding.c" />
-    <ClCompile Include="..\..\src\utils\bitstream.c" />
-    <ClCompile Include="..\..\src\utils\cache.c" />
-    <ClCompile Include="..\..\src\utils\color.c" />
-    <ClCompile Include="..\..\src\utils\configfile.c" />
-    <ClCompile Include="..\..\src\utils\dlmalloc.c" />
-    <ClCompile Include="..\..\src\utils\downloader.c" />
-    <ClCompile Include="..\..\src\utils\error.c" />
-    <ClCompile Include="..\..\src\utils\list.c" />
-    <ClCompile Include="..\..\src\utils\map.c" />
-    <ClCompile Include="..\..\src\utils\math.c" />
-    <ClCompile Include="..\..\src\utils\module.c" />
-    <ClCompile Include="..\..\src\utils\os_config_init.c" />
-    <ClCompile Include="..\..\src\utils\os_divers.c" />
-    <ClCompile Include="..\..\src\utils\os_file.c" />
-    <ClCompile Include="..\..\src\utils\os_module.c" />
-    <ClCompile Include="..\..\src\utils\os_net.c" />
-    <ClCompile Include="..\..\src\utils\os_thread.c" />
-    <ClCompile Include="..\..\src\utils\path2d.c" />
-    <ClCompile Include="..\..\src\utils\path2d_stroker.c" />
-    <ClCompile Include="..\..\src\utils\ringbuffer.c" />
-    <ClCompile Include="..\..\src\utils\sha1.c" />
-    <ClCompile Include="..\..\src\utils\token.c" />
-    <ClCompile Include="..\..\src\utils\unicode.c" />
-    <ClCompile Include="..\..\src\utils\uni_bidi.c" />
-    <ClCompile Include="..\..\src\utils\url.c" />
-    <ClCompile Include="..\..\src\utils\utf.c" />
-    <ClCompile Include="..\..\src\utils\xml_parser.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{233014D5-F6E5-419D-8757-FA9CE7337088}</ProjectGuid>
-    <RootNamespace>libgpac</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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 - MP4Box_only|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)'=='Release - MP4Box_only|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 - MP4Box_only|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>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|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 - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">libgpac_static</TargetName>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/libgpac_static.lib</OutputFile>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj\$(Platform)\$(Configuration)\libgpac/libgpac.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_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>false</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
-    <PreBuildEvent>
-      <Command>"$(ProjectDir)..\..\version.bat"</Command>
-    </PreBuildEvent>
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <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>false</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetMachine>MachineX64</TargetMachine>
-      <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/libgpac.vcxproj.filters Deleted

@@ -1,1150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{9c50150f-31ba-4b6f-bba4-b2f2f1e972aa}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include\win32">
-      <UniqueIdentifier>{d20c79df-20bb-445b-91b7-6de78ef3b82c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="odf">
-      <UniqueIdentifier>{7c7bc9e6-374b-45c9-934a-f1841d1c4d2e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="bifs">
-      <UniqueIdentifier>{506a5423-55ca-4581-b831-b6adb2edc535}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="compositor">
-      <UniqueIdentifier>{a4e561b7-d3a9-4c50-a2a6-f9d889760097}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ietf">
-      <UniqueIdentifier>{c746f384-2eed-462e-b157-5fc20e961290}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="isomedia">
-      <UniqueIdentifier>{596013ef-0275-41af-94e6-7f641b353d79}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="laser">
-      <UniqueIdentifier>{3073cf49-9ebb-48cf-aea8-35a44d810e10}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="crypto">
-      <UniqueIdentifier>{34d7c2c7-ecca-42a1-b891-dab22082820c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="media_tools">
-      <UniqueIdentifier>{744a30ee-387a-43c8-a9a5-83f5fc6f646f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="utils">
-      <UniqueIdentifier>{8bbc563e-abf0-404a-9661-85d8795b63e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="terminal">
-      <UniqueIdentifier>{a7234dfd-5749-46dc-8ee2-586084f8d11d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scenegraph">
-      <UniqueIdentifier>{ceeb1cac-c751-485b-b5f3-abec90144298}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="scene_manager">
-      <UniqueIdentifier>{3a82bed0-adaa-40e6-8e51-9753fc7018d2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include\internal">
-      <UniqueIdentifier>{3e56cf00-c2cb-44f6-b1dc-17c64b2bb822}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="include\modules">
-      <UniqueIdentifier>{d451e478-a766-4a33-a371-db9e1292017f}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\win32\inttypes.h">
-      <Filter>include\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\win32\stdint.h">
-      <Filter>include\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\audio_out.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\codec.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\font.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\hardcoded_proto.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\ipmp.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\js_usr.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\raster2d.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\service.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\term_ext.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\modules\video_out.h">
-      <Filter>include\modules</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\avilib.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\bifs_tables.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\camera.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\compositor_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\crypt_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\dvb_mpe_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\ietf_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\isomedia_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\laser_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\m3u8.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\media_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\mesh.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\mpd.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\odf_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\odf_parse_common.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\ogg.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\reedsolomon.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\scenegraph_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\smjs_api.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\swf_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\internal\vobsub.h">
-      <Filter>include\internal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bifs\quant.h">
-      <Filter>bifs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\bifs\script.h">
-      <Filter>bifs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\drawable.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\gl_inc.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\mpeg4_grouping.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\nodes_stacks.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\offscreen_cache.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\texturing.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\visual_manager.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\visual_manager_2d.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\compositor\visual_manager_3d.h">
-      <Filter>compositor</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h">
-      <Filter>media_tools</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\terminal\input_sensor.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\terminal\media_control.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\terminal\media_memory.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\utils\module_wrap.h">
-      <Filter>utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\xml.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ait.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\avparse.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\base_coding.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\bifs.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\bitstream.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\cache.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\color.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\compositor.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\config_file.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\configuration.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\constants.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\crypt.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\dash.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\download.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\dsmcc.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\dvb_mpe.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\esi.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\events.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\events_constants.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\filestreamer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\html5_media.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\html5_mse.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ietf.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ismacryp.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\iso639.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\isomedia.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\laser.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\list.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\map.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\math.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\media_tools.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\mediaobject.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\module.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\mpeg4_odf.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\mpegts.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\network.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\nodes_svg.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\nodes_x3d.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\nodes_xbl.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\options.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\path2d.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\revision.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ringbuffer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\rtp_streamer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\scene_engine.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\scene_manager.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\scenegraph.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\scenegraph_svg.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\scenegraph_vrml.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\setup.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\svg_types.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\sync_layer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\term_info.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\terminal.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\thread.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\token.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\tools.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\unicode.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\user.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\utf.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\version.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\webvtt.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\atsc.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bifs\arith_decoder.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\bifs_codec.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\bifs_node_tables.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\com_dec.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\com_enc.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\conditional.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\field_decode.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\field_encode.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\memory_decoder.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\predictive_mffield.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\quantize.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\script_dec.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\script_enc.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bifs\unquantize.c">
-      <Filter>bifs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\audio_input.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\audio_mixer.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\audio_render.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\bindable.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\camera.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\compositor.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\compositor_2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\compositor_3d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\compositor_node_init.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\drawable.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\events.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\font_engine.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\hardcoded_protos.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\hc_flash_shape.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mesh.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mesh_collide.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mesh_tesselate.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_animstream.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_audio.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_background.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_background2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_bitmap.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_composite.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_form.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_3d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ifs2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_geometry_ils2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_gradients.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_layout.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_sound.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_text.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_textures.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\navigate.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\offscreen_cache.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_base.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_filters.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_font.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_geometry.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_grouping.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_media.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_paint_servers.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\svg_text.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\texturing.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\texturing_gl.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\visual_manager.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\visual_manager_2d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\visual_manager_2d_draw.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\visual_manager_3d.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\visual_manager_3d_gl.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\compositor\x3d_geometry.c">
-      <Filter>compositor</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtcp.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_packetizer.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_3gpp.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg4.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_pck_mpeg12.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtp_streamer.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_command.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_common.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_response.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\rtsp_session.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\ietf\sdp.c">
-      <Filter>ietf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\avc_ext.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_3gpp.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_adobe.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_apple.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_base.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_drm.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_code_meta.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_dump.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\box_funcs.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\data_map.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\drm_sample.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\hint_track.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\hinting.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_intern.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_read.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_store.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\isom_write.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\media.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\media_odf.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\meta.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\movie_fragments.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\sample_descs.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\stbl_read.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\stbl_write.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\track.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\tx3g.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\laser\lsr_dec.c">
-      <Filter>laser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\laser\lsr_enc.c">
-      <Filter>laser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\laser\lsr_tables.c">
-      <Filter>laser</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypto\g_crypt.c">
-      <Filter>crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c">
-      <Filter>crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c">
-      <Filter>crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypto\tiny_aes.c">
-      <Filter>crypto</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\ait.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\av_parsers.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\avilib.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\dash_client.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\dash_segmenter.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\dsmcc.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\dvb_mpe.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\filestreamer.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\gpac_ogg.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\html5_media.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\html5_mse.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\img.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\ismacryp.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\isom_hinter.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\isom_tools.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\m2ts_mux.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\m3u8.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\media_export.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\media_import.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpd.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpeg2_ps.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\mpegts.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\reedsolomon.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\saf.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\text_import.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\vobsub.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\webvtt.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\desc_private.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\descriptors.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_code.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_dump.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\ipmpx_parse.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\oci_codec.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_code.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_codec.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_command.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_dump.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\odf_parse.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\qos.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\odf\slc.c">
-      <Filter>odf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\encode_isom.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_bt.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_isom.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_qt.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_svg.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\loader_xmt.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_dump.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_engine.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_manager.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\scene_stats.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\swf_bifs.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\swf_parse.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\swf_svg.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c">
-      <Filter>scene_manager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\base_scenegraph.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\commands.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\dom_events.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\dom_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\smil_anim.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\smil_timing.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\svg_attributes.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\svg_properties.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\svg_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\svg_types.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_proto.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_route.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_script.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_tools.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\xbl_process.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\xml_ns.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\channel.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\clock.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\decoder.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\input_sensor.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_control.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_manager.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_memory.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_object.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_sensor.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\mpeg4_inline.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\network_service.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_browser.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_manager.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\scene.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\svg_external.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\term_node_init.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\terminal.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\alloc.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\base_encoding.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\bitstream.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\cache.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\color.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\configfile.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\dlmalloc.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\downloader.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\error.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\list.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\map.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\math.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\module.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_config_init.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_divers.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_module.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_net.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_thread.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\path2d.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\path2d_stroker.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\ringbuffer.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\sha1.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\token.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\uni_bidi.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\unicode.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\url.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\utf.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\xml_parser.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\ttml.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\utils\os_file.c">
-      <Filter>utils</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\iff.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\atsc_dmx.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/libgpac_dll.vcxproj Deleted

@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{D3540754-E0CF-4604-AC11-82DE9BD4D814}</ProjectGuid>
-    <RootNamespace>libgpac_dll</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac</TargetName>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;C:\Imagination\PowerVR_Graphics\PowerVR_SDK\SDK_3.4\Builds\Windows\x86_64\Lib</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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)$(ProjectName)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\w32_deb;../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
-      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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)$(ProjectName)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <ProjectReference>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Link>
-      <AdditionalDependencies>zlib.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
-      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>zlib.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac.vcxproj">
-      <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mp3_in.vcxproj Deleted

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}</ProjectGuid>
-    <RootNamespace>mp3_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/mp3_in_deb/mp3_in.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;GPAC_HAS_MAD;%(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>libmad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/mp3_in_deb/mp3_in.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;_WIN64;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(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>libmad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/mp3_in_rel/mp3_in.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;GPAC_HAS_MAD;%(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>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.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;_WIN64;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\mp3_in\mad_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mp3_in\mp3_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mp42ts.vcxproj Deleted

@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\mp42ts\main.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mp4box.vcxproj Deleted

@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
-      <Configuration>Debug - MP4Box_only</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug - MP4Box_only|x64">
-      <Configuration>Debug - MP4Box_only</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <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 - MP4Box_only|Win32">
-      <Configuration>Release - MP4Box_only</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release - MP4Box_only|x64">
-      <Configuration>Release - MP4Box_only</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>{48E2C7C6-52EB-46FB-8722-00A62F46F497}</ProjectGuid>
-    <RootNamespace>mp4box</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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 - MP4Box_only|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)'=='Release - MP4Box_only|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 - MP4Box_only|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>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|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 - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</GenerateManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">true</EmbedManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
-    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">true</EmbedManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>zlib.lib;winmm.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</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>
-      <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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>zlib.lib;winmm.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <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>
-      <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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\mp4box\filedump.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\mp4box\fileimport.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\mp4box\live.c" />
-    <ClCompile Include="..\..\applications\mp4box\main.c">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Disabled</Optimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Disabled</Optimization>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac.vcxproj">
-      <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mp4client.vcxproj Deleted

@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{A35D99BF-D72D-4F56-99A1-97249B22BCE2}</ProjectGuid>
-    <RootNamespace>mp4client</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
-    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>User32.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4client_deb/mp4client.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj/mp4client_rel/mp4client.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\mp4client\extract.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\mp4client\main.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\mp4client\mp4client.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\mp4client\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mpd_in.vcxproj Deleted

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}</ProjectGuid>
-    <RootNamespace>dash</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mpd_in\mpd_in.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mpegts_in.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{B38E812D-9823-48E7-BE5F-BF09B0AD4165}</ProjectGuid>
-    <RootNamespace>mpegts_in</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mpegts_in\mpegts_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/mse_in.vcxproj Deleted

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
-    <RootNamespace>dash</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mse_in\mse_in.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/nvdec.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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">
-    <ProjectName>nvdec</ProjectName>
-    <ProjectGuid>{073E2381-4CDB-4C4D-B217-C489EF17C48B}</ProjectGuid>
-    <RootNamespace>nvdec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/nvdec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>INIT_CUDA_GL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/nvdec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\nvdec\cuda_sdk.c" />
-    <ClCompile Include="..\..\modules\nvdec\nvdec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\nvdec\cuda_sdk.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/odf_dec.vcxproj Deleted

@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{A86E6EF8-3683-4AD0-8878-7A0D51326088}</ProjectGuid>
-    <RootNamespace>odf_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\odf_dec\odf_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ogg.vcxproj Deleted

@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}</ProjectGuid>
-    <RootNamespace>ogg</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ogg_rel/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ogg_rel/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ogg_deb/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ogg_deb/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\ogg\ogg_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\ogg_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\theora_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\vorbis_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\ogg\ogg_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/openhevc.vcxproj Deleted

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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">
-    <ProjectName>openhevc_dec</ProjectName>
-    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
-    <RootNamespace>openhevc_dec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/openhevc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/openhevc_dec.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;_WIN64;_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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/openhevc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.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;_WIN64;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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\openhevc_dec\openhevc_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/opensvc.vcxproj Deleted

@@ -1,280 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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">
-    <ProjectName>opensvc_dec</ProjectName>
-    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>opensvc_dec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\opensvc_dec\opensvc_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/osmophone.vcxproj Deleted

@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{CAA7EF3E-C7F4-4F8A-9E17-9A06DEF9E717}</ProjectGuid>
-    <RootNamespace>osmophone</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <BaseAddress>0x00010000</BaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\$(Platform)\$(Configuration)\osmophone/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\$(Platform)\$(Configuration)\osmophone/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);DEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)\$(Configuration)/osmophone.exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <BaseAddress>0x00010000</BaseAddress>
-    </Link>
-    <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>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>$(Platform)\$(Configuration)/osmophone.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalOptions>/r  %(AdditionalOptions)</AdditionalOptions>
-      <PreprocessorDefinitions>UNDER_CE=$(CEVER);_WIN32_WCE=$(CEVER);NDEBUG;UNICODE;_UNICODE;$(CePlatform);ARM;_ARM_;ARMV4;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../../bin/$(Platform)/$(Configuration)/$(ProjectName).exe</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>
-      </IgnoreSpecificDefaultLibraries>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\osmophone/osmophone.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>65536</StackReserveSize>
-      <StackCommitSize>4096</StackCommitSize>
-      <EntryPointSymbol>WinMainCRTStartup</EntryPointSymbol>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmophone\main.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmophone\openfile.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-      </PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmophone\osmophone.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">0x0809</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">0x0809</Culture>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DEBUG;_AFXDLL</PreprocessorDefinitions>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">0x0809</Culture>
-      <Culture Condition="'$(Configuration)|$(Platform)'=='Release|x64'">0x0809</Culture>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../doc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmophone\newres.h" />
-    <ClInclude Include="..\..\applications\osmophone\resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\doc\osmo4.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/osmozilla.vcxproj Deleted

@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{A0288B75-0D95-4106-A3A7-779A891E8FEF}</ProjectGuid>
-    <RootNamespace>osmozilla</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nposmozilla</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nposmozilla</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CallingConvention>Cdecl</CallingConvention>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
-      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_WIN64;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
-      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
-      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
-      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmozilla\osmo_npapi.cpp" />
-    <ClCompile Include="..\..\applications\osmozilla\osmozilla.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmozilla\osmozilla.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmozilla\nsIOsmozilla.h" />
-    <ClInclude Include="..\..\applications\osmozilla\osmo_npapi.h" />
-    <ClInclude Include="..\..\applications\osmozilla\osmozilla.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/platinum.vcxproj Deleted

@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{694C765F-DFD6-467E-A813-B3F887E822D4}</ProjectGuid>
-    <RootNamespace>platinum</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(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>platinum.lib;neptune.lib;winmm.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(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>platinum.lib;neptune.lib;winmm.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\platinum\GenericDevice.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACFileMediaServer.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACMediaController.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACMediaRenderer.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACPlatinum.cpp" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\platinum\GenericDevice.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACFileMediaServer.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACMediaController.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACMediaRenderer.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACPlatinum.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/player_api.vcxproj Deleted

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{0ABBC240-2951-43A9-9831-307C71CFEF1C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>player_api</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <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>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IntDir>.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir>../../bin/$(Platform)\$(Configuration)/</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>../../include;</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\testapps\player_api\main.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc10/raw_out.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}</ProjectGuid>
-    <RootNamespace>raw_out</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/raw_out_deb/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\raw_out\raw_video.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/redirect_av.vcxproj Deleted

@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{073E2281-4FDE-4C4D-A217-C489DB17C48C}</ProjectGuid>
-    <RootNamespace>redirect_av</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\redirect_av\redirect_av.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc10/rtp_in.vcxproj Deleted

@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{E2DBD151-9523-4E1A-9478-F3F825668F6E}</ProjectGuid>
-    <RootNamespace>rtp_in</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\rtp_in\rtp_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_session.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_signaling.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\sdp_fetch.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\sdp_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\rtp_in\rtp_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/rvc_dec.vcxproj Deleted

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|x64">
-      <Configuration>Template</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{073E2381-4FDE-4D4D-B227-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>rvc_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|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.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\rvc_dec\rvc_dec.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/saf_in.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}</ProjectGuid>
-    <RootNamespace>saf_in</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\saf_in\saf_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/sdl_out.vcxproj Deleted

@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{F346A9A7-CF8D-4409-8776-1D4244F96EF8}</ProjectGuid>
-    <RootNamespace>sdl_out</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\include;$(IncludePath)</IncludePath>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\lib\x64;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\DEVTOOLS\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib;C:\devtools\lib\x86</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\sdl_out\audio.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\sdl_out\cursors.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\sdl_out\sdl_out.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\sdl_out\video.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\sdl_out\sdl_out.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/soft_raster.vcxproj Deleted

@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{71071F01-C813-4384-BE38-0F4020BCC0EE}</ProjectGuid>
-    <RootNamespace>soft_raster</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\soft_raster\ftgrays.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\soft_raster\raster_565.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_argb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_rgb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\stencil.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\surface.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\soft_raster\rast_soft.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/svg_in.vcxproj Deleted

@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{402A8794-B724-44A3-B608-84B600ECA387}</ProjectGuid>
-    <RootNamespace>svg_in</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/svg_in_deb/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\svg_in\svg_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/timedtext.vcxproj Deleted

@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{464697D2-BA44-446F-8223-1EB3969ED1A8}</ProjectGuid>
-    <RootNamespace>timedtext</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ttxt_deb/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\timedtext\timedtext_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\timedtext\timedtext_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/ui_rec.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{073E2381-4FDE-4C4D-A117-C489DB17C48C}</ProjectGuid>
-    <RootNamespace>ui_rec</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\ui_rec\ui_rec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/validator.vcxproj Deleted

@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}</ProjectGuid>
-    <RootNamespace>validator</RootNamespace>
-  </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>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/validator_deb/validator.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/validator_deb/validator.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/validator_rel/validator.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\validator\validator.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/vtt_in.vcxproj Deleted

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{E578716F-6663-4D83-AC79-57EA00D2F406}</ProjectGuid>
-    <RootNamespace>vtt_in</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\vtt_in\vtt_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\vtt_in\vtt_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/wav_out.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{01183543-B182-4E32-9FD6-FC15C847316C}</ProjectGuid>
-    <RootNamespace>wav_out</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/wav_out_deb/wav_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\wav_out\wav_out.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/widgetman.vcxproj Deleted

@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}</ProjectGuid>
-    <RootNamespace>widgetman</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;_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>odbc32.lib;odbccp32.lib;zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\widgetman\unzip.c" />
-    <ClCompile Include="..\..\modules\widgetman\wgt_load.c" />
-    <ClCompile Include="..\..\modules\widgetman\widget.c" />
-    <ClCompile Include="..\..\modules\widgetman\widgetman.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\widgetman\unzip.h" />
-    <ClInclude Include="..\..\modules\widgetman\widgetman.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc10/xvid_dec.vcxproj Deleted

@@ -1,518 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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>{4258687D-4905-46A6-9407-08F4F8A81CC0}</ProjectGuid>
-    <RootNamespace>xvid_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.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>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.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>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.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>libxvidcore.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <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/xvid_dec_deb/xvid_dec.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>libxvidcore.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\decoder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\font.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\gmc.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\idct.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\image.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\reduced.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\xvid.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec_wce.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\bitstream.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\decoder.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\global.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\gmc.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\image.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_align.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\portab.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\reduced.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\Rules.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\xvid.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\qpel.inl">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/GPAX.vcxproj Deleted

gpac-0.8.0.tar.gz/build/msvc14/Osmo4.vcxproj Deleted

@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
-    <RootNamespace>Osmo4</RootNamespace>
-    <Keyword>MFCProj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <StackReserveSize>8388608</StackReserveSize>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
-    <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\applications\osmo4_w32\res\error.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\message.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\play.ico" />
-    <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
-    <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
-    <None Include="..\..\doc\osmo4.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/aac_in.vcxproj Deleted

@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
-    <RootNamespace>aac_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/aac_in_deb/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/aac_in_deb/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/aac_in_rel/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/aac_in_rel/aac_in.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;GPAC_HAS_FAAD;%(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>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\aac_in\aac_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\aac_in\faad_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ac3_in.vcxproj Deleted

@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}</ProjectGuid>
-    <RootNamespace>ac3_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/ac3_in.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;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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>.\Debug/ac3_in.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;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>.\obj\$(Platform)\$(Configuration)\ac3_in/gm_ac3_in.pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Manifest>
-      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
-    </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>.\Release/ac3_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/ac3_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;GPAC_HAS_LIBA52;%(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>liba52.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ac3_in\ac3_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ac3_in\liba52_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/amr_dec.vcxproj Deleted

@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{5ED5A1C8-DB34-4089-8E53-EFB225754D02}</ProjectGuid>
-    <RootNamespace>amr_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <StackReserveSize>8388608</StackReserveSize>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <StackReserveSize>8388608</StackReserveSize>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\amr_dec\amr_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/amr_float_dec.vcxproj Deleted

@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{5D3983BF-143F-49C3-9284-89778282AEFE}</ProjectGuid>
-    <RootNamespace>amr_float_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\amr_float_dec\amr_float_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/atsc_in.vcxproj Deleted

@@ -1,289 +0,0 @@
-<?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>{48071212-239F-4F24-B4FA-E21250CCB087}</ProjectGuid>
-    <RootNamespace>atsc_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/atsc_in_deb/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/atsc_in_deb/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/atsc_in_rel/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/atsc_in_rel/atsc_in.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>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\atsc_in\atsc_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/audio_filter.vcxproj Deleted

@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{C993119B-29B1-49C8-8EA3-A9ABF633164E}</ProjectGuid>
-    <RootNamespace>audio_filter</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\audio_filter\audio_filter.c" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/avcap.vcxproj Deleted

gpac-0.8.0.tar.gz/build/msvc14/bifs_dec.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}</ProjectGuid>
-    <RootNamespace>bifs_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\bifs_dec\bifs_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ctx_load.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}</ProjectGuid>
-    <RootNamespace>ctx_load</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ctx_load\ctx_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/dashcast.vcxproj Deleted

@@ -1,286 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
-    <RootNamespace>dashcast</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <ProjectReference>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DC_AUDIO_RESAMPLER;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avformat.lib;swresample.lib;avutil.lib;swscale.lib;ws2_32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
-    <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
-    <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\controler.c" />
-    <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
-    <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
-    <ClCompile Include="..\..\applications\dashcast\register.c" />
-    <ClCompile Include="..\..\applications\dashcast\task.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_data.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
-    <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
-    <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
-    <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\controler.h" />
-    <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
-    <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
-    <ClInclude Include="..\..\applications\dashcast\register.h" />
-    <ClInclude Include="..\..\applications\dashcast\task.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_data.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
-    <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc14/dektec_out.vcxproj Deleted

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{CAC981C2-5665-4E90-80D3-604C1A785D91}</ProjectGuid>
-    <RootNamespace>dektec_out</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dektec_out_rel/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dektec_out_deb/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dektec_out_deb/dektec_out.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalLibraryDirectories>..\..\extra_lib\lib\$(Platform)\$(Configuration)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc14/dummy_in.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{073E2381-4FDE-4C4D-A117-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>dummy_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\dummy_in\dummy_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ffmpeg_in.vcxproj Deleted

@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{9FECAB79-BC70-4EEA-A23B-B64159F904B3}</ProjectGuid>
-    <RootNamespace>ffmpeg_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/gdip_raster.vcxproj Deleted

@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{CAA5A551-006A-4119-8115-FB14692E719F}</ProjectGuid>
-    <RootNamespace>gdip_raster</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/gdip_deb/gdip_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;_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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_font.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_grad.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_rend.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\gdip_raster\gdip_texture.cpp">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\gdip_raster\gdip_priv.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/gpac.suo Deleted

gpac-0.8.0.tar.gz/build/msvc14/gpac_js.vcxproj Deleted

@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}</ProjectGuid>
-    <RootNamespace>gpac_js</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_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>odbc32.lib;odbccp32.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\gpac_js\gpac_js.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/hyb_in.vcxproj Deleted

gpac-0.8.0.tar.gz/build/msvc14/img_in.vcxproj Deleted

@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
-    <RootNamespace>img_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/img_in_deb/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/img_in_deb/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/img_in_rel/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(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>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\img_in\bmp_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\img_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\img_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\img_in\jp2_dec.c" />
-    <ClCompile Include="..\..\modules\img_in\jpeg_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\img_in\png_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\img_in\img_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ismacryp.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}</ProjectGuid>
-    <RootNamespace>ismacryp</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\ismacryp\isma_ea.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/isom_in.vcxproj Deleted

@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{FC8F1F56-078E-470D-B252-68EDDE88AA9D}</ProjectGuid>
-    <RootNamespace>isom_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/isom_in_deb/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/isom_in_deb/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/isom_in_rel/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\isom_in\isom_cache.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\isom_in\load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\isom_in\read.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\isom_in\read_ch.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\isom_in\isom_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/laser_dec.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{879E26B2-48DB-47B3-B82F-893696286E6F}</ProjectGuid>
-    <RootNamespace>laser_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\laser_dec\laser_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/mp3_in.vcxproj Deleted

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}</ProjectGuid>
-    <RootNamespace>mp3_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/mp3_in_deb/mp3_in.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;GPAC_HAS_MAD;%(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>libmad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/mp3_in_deb/mp3_in.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;_WIN64;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(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>libmad.lib;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/mp3_in_rel/mp3_in.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;GPAC_HAS_MAD;%(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>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.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;_WIN64;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\mp3_in\mad_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mp3_in\mp3_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/mp42ts.vcxproj Deleted

@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>
-      </PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <MinimalRebuild>false</MinimalRebuild>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <SubSystem>Console</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\applications\mp42ts\main.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <Private>true</Private>
-      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/mpd_in.vcxproj Deleted

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}</ProjectGuid>
-    <RootNamespace>dash</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mpd_in\mpd_in.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/mpegts_in.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{B38E812D-9823-48E7-BE5F-BF09B0AD4165}</ProjectGuid>
-    <RootNamespace>mpegts_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mpegts_in\mpegts_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/mse_in.vcxproj Deleted

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
-    <RootNamespace>dash</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</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>
-    <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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(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>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\mse_in\mse_in.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/nvdec.vcxproj Deleted

@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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">
-    <ProjectName>nvdec</ProjectName>
-    <ProjectGuid>{073E2381-4CDB-4C4D-B217-C489EF17C48B}</ProjectGuid>
-    <RootNamespace>nvdec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/nvdec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/nvdec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>INIT_CUDA_GL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/nvdec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/nvdec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../modules/nvdec/nvcuda/inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\nvdec\cuda_sdk.c" />
-    <ClCompile Include="..\..\modules\nvdec\nvdec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\nvdec\cuda_sdk.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/odf_dec.vcxproj Deleted

@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{A86E6EF8-3683-4AD0-8878-7A0D51326088}</ProjectGuid>
-    <RootNamespace>odf_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\odf_dec\odf_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ogg.vcxproj Deleted

@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}</ProjectGuid>
-    <RootNamespace>ogg</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ogg_rel/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ogg_rel/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ogg_deb/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ogg_deb/ogg.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;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\ogg\ogg_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\ogg_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\theora_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ogg\vorbis_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\ogg\ogg_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/openhevc.vcxproj Deleted

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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">
-    <ProjectName>openhevc_dec</ProjectName>
-    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
-    <RootNamespace>openhevc_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/openhevc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/openhevc_dec.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;_WIN64;_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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/openhevc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.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;_WIN64;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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\openhevc_dec\openhevc_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/opensvc.vcxproj Deleted

@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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">
-    <ProjectName>opensvc_dec</ProjectName>
-    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>opensvc_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\opensvc_dec\opensvc_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/osmozilla.vcxproj Deleted

gpac-0.8.0.tar.gz/build/msvc14/platinum.vcxproj Deleted

@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{694C765F-DFD6-467E-A813-B3F887E822D4}</ProjectGuid>
-    <RootNamespace>platinum</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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'">false</GenerateManifest>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName>$(IntDir)</ObjectFileName>
-      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>platinum.lib;neptune.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(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>platinum.lib;neptune.lib;winmm.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/platinum_deb/platinum.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/platinum;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(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>platinum.lib;neptune.lib;winmm.lib;ws2_32.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/platinum_deb/platinum.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\platinum\GenericDevice.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACFileMediaServer.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACMediaController.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACMediaRenderer.cpp" />
-    <ClCompile Include="..\..\modules\platinum\GPACPlatinum.cpp" />
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\platinum\GenericDevice.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACFileMediaServer.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACMediaController.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACMediaRenderer.h" />
-    <ClInclude Include="..\..\modules\platinum\GPACPlatinum.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/player_api.vcxproj Deleted

gpac-0.8.0.tar.gz/build/msvc14/raw_out.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}</ProjectGuid>
-    <RootNamespace>raw_out</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/raw_out_deb/raw_out.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\raw_out\raw_video.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/redirect_av.vcxproj Deleted

@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{073E2281-4FDE-4C4D-A217-C489DB17C48C}</ProjectGuid>
-    <RootNamespace>redirect_av</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <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/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(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>Level2</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x040c</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <AdditionalDependencies>avformat.lib;avutil.lib;avcodec.lib;swscale.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\redirect_av\redirect_av.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc14/rtp_in.vcxproj Deleted

@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{E2DBD151-9523-4E1A-9478-F3F825668F6E}</ProjectGuid>
-    <RootNamespace>rtp_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\rtp_in\rtp_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_session.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_signaling.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\rtp_stream.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\sdp_fetch.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\rtp_in\sdp_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\rtp_in\rtp_in.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/rvc_dec.vcxproj Deleted

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.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="Template|Win32">
-      <Configuration>Template</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Template|x64">
-      <Configuration>Template</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{073E2381-4FDE-4D4D-B227-C489EB17C48B}</ProjectGuid>
-    <RootNamespace>rvc_dec</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Template|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.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/rvc_dec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'">
-    <Link>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\rvc_dec\rvc_dec.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/saf_in.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}</ProjectGuid>
-    <RootNamespace>saf_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\saf_in\saf_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/soft_raster.vcxproj Deleted

@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{71071F01-C813-4384-BE38-0F4020BCC0EE}</ProjectGuid>
-    <RootNamespace>soft_raster</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\soft_raster\ftgrays.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\soft_raster\raster_565.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_argb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_load.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\raster_rgb.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\stencil.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\soft_raster\surface.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\soft_raster\rast_soft.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/svg_in.vcxproj Deleted

@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{402A8794-B724-44A3-B608-84B600ECA387}</ProjectGuid>
-    <RootNamespace>svg_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/svg_in_deb/svg_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\svg_in\svg_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/timedtext.vcxproj Deleted

@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{464697D2-BA44-446F-8223-1EB3969ED1A8}</ProjectGuid>
-    <RootNamespace>timedtext</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/ttxt_deb/timedtext.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\timedtext\timedtext_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\timedtext\timedtext_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/ui_rec.vcxproj Deleted

@@ -1,279 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{073E2381-4FDE-4C4D-A117-C489DB17C48C}</ProjectGuid>
-    <RootNamespace>ui_rec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </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>v141</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>v141</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'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(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/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <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/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../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>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\ui_rec\ui_rec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/vtt_in.vcxproj Deleted

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{E578716F-6663-4D83-AC79-57EA00D2F406}</ProjectGuid>
-    <RootNamespace>vtt_in</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <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/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(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>zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\vtt_in\vtt_in.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\vtt_in\vtt_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/widgetman.vcxproj Deleted

@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}</ProjectGuid>
-    <RootNamespace>widgetman</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </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" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(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>odbc32.lib;odbccp32.lib;zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WIN64;_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>odbc32.lib;odbccp32.lib;zlib.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\widgetman\unzip.c" />
-    <ClCompile Include="..\..\modules\widgetman\wgt_load.c" />
-    <ClCompile Include="..\..\modules\widgetman\widget.c" />
-    <ClCompile Include="..\..\modules\widgetman\widgetman.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\modules\widgetman\unzip.h" />
-    <ClInclude Include="..\..\modules\widgetman\widgetman.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/xvid_dec.vcxproj Deleted

@@ -1,523 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.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>{4258687D-4905-46A6-9407-08F4F8A81CC0}</ProjectGuid>
-    <RootNamespace>xvid_dec</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10240.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </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>
-  <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>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <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>
-    <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>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.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>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.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>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>
-      </ModuleDefinitionFile>
-      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.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>libxvidcore.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <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/xvid_dec_deb/xvid_dec.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>libxvidcore.lib;%(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)$(ProjectName).pdb</ProgramDatabaseFile>
-      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
-      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\decoder.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\font.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\gmc.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\idct.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\image.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\reduced.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\xvid.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\modules_export.cpp" />
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec_wce.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\bitstream.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\decoder.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\global.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\gmc.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\image.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_align.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\portab.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\reduced.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\Rules.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\xvid.h">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\qpel.inl">
-      <FileType>Document</FileType>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </CustomBuildStep>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libgpac_dll.vcxproj">
-      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/doc Deleted

gpac-0.8.0.tar.gz/doc/CODING_STYLE Deleted

@@ -1,133 +0,0 @@
-GPAC coding style
-
-Introduction
-  coding styles only concern the GPAC library (M4Systems in GPAC<=0.3.0, libgpac now), and, although recommended, are not mandatory for plugins 
-  or applications development.
-  
-  AStyle is a code beautifier tool. Code should be compliant with the following pattern provided by AStyle :
-  AStyle -r --indent=tab '*.c' '*.h' '*.cpp' '*.hpp'
-    
-1 Exported symbols 
-
-  1.0 Informative note
-  The GF_ or gf_ stands for "gpac framework"
-
-  1.1 typedef of structures - typedef of base types - typedef of functions
-
-All symbols defined within libgpac library and exported for application development purposes shall begin be named GF_* 
-with the first character of "*" being in capital, regardless of their functionality.
-For example, GF_Thread (structure), GF_Err (redefined type), GF_LineCap (enum typedef)
-    
-All structure typedefs, whether defined (declaration exported through ehaders) or not (declaration intern to the GPAC core lib), must follow
-this principle.
-Furthermore, typedef of non exported structure shall only apply to the structure itself, not a pointer to it. 
-    typedef struct _my_gpac_thingy *GF_LPMYGPACSTUFF;    /*this is FORBIDDEN*/
-    typedef struct _my_gpac_thingy GF_MyGPACStuff;    /*this is OK*/
-This will allow easy exporting of structure declaration if needed at some point in the development.
-
-
-  1.2 constants
-
-All constants (whether #defines or enums) shall be in capital letters and begin with "GF_" and use "_" for word separation
-For example, error code GF_BAD_PARAM.
-
-Enums names shall refer to the main module they are used in through a keyword right after the GF_ .
-For example, 
-  * enums refering to file format (isomedia) will be prefixed by GF_ISOM_
-  * enums refering to MPEG-4 OD tools (odf) will be prefixed by GF_ODF_
-  
-  1.3 functions
-
-All exported functions and pointer to functions shall begin with "gf_". The name shall refer to the main module they are sued in 
-through a keyword right after the gf_ when reasonable (gf_isom_, gf_odf_, gf_term_), or to the tool they refer to (gf_bs_, gf_url, ...)
-  
-2 Miscalleanous
-
-All exported functions' names shall be in lower case exclusively.
-All exported functions' parameters should be in lower case exclusively.
-Exported structures may use case in any fashion as long as they respect the rules expressed in section 1 above.
-Exported structures member should preferably all be lower case - this may not be feasible for scene graph nodes & like...
-
-All exported header files shall be in lower case
-All source files within the gpac core shall be in lower case
-
-All comments should be C-like ones (/**/) not C++ ones (//)
-All exported headers documentation should be written with dowygen syntax
-All constructor-like functions should be of style gf_zzz_new
-All destructor like functions should be of style gf_zzz_del
-
-3 Rearchitecture of the GPAC repository
-  
-  This recaps the changes between gpac 0.3.0 and gpac 0.4.0 as far as the core architecture is concerned.
-  
-  
-  The former M4Systems library is now simply libGPAC (eg libgpac.lib, libgpac.dll, libgpac.so, libgpac.a)
-  Currently no decision has been taken regarding splitting of this library in smaller packages, this still needs discussion.
-  
-  directory architecture:
-  /gpac
-  /gpac/applications/
-     former Applications/, misc renames
-  /gpac/applications/generators: former SceneGenerators
-  /gpac/applications/testapps:   added for apps testing some features of gpac (currently only BIFSEngine tester)
-  /gpac/bin
-    rename of directories:
-      arm_debug -> arm_ppc02_deb
-      arm_release -> arm_ppc02_rel
-      Debug -> w32_deb
-      Release -> w32_rel
-  /gpac/build: former IDEs directory, with project files for MS eVC*/VC*
-  /gpac/doc
-  /gpac/doc/libgpac: future place for doc of all exported functions from libgpac
-  /gpac/extra_lib
-  /gpac/extra_lib/include
-    unchanged
-  /gpac/extra_lib/lib
-    rename of directories:
-      arm_debug -> arm_ppc02_deb
-      arm_release -> arm_ppc02_rel
-      w32_debug -> w32_deb
-      w32_release -> w32_rel
-    
-
-  /gpac/src: former M4Systems directory, source for the gpac core lib
-  /gpac/src/utils: 
-    former Tools - function names: gf_* 
-  /gpac/src/isomedia: 
-    former MP4 - code for isomedia - function names: gf_isom_*
-  /gpac/src/odf: 
-    former OD - code for MPEG-4 OD Framework - function names: gf_odf_* 
-  /gpac/src/ietf: 
-    former IETF - code for IETF SDP/RTP/RTCP/RTSP protocols - function names: (or gf_sdp_*, gf_rtp_*, gf_rtsp_*)  
-    moved packetizers in this place since payloads are quite related to IETF...
-  /gpac/src/bifs: 
-    former BIFS - code for BIFS encoding and decoding - exported function names: gf_bifs_*
-  /gpac/src/terminal: 
-    former ESM - code for terminal module - exported function names: gf_term_*
-  /gpac/src/crypto: 
-    unchanged - function names: gf_crypt_*
-  /gpac/src/renderer: 
-    former renderer - function names: gf_sr_*
-  /gpac/src/scenegraph:
-    former SceneGraph - function names: gf_sg_* for all common code (base nodes and graph handling),
-                                        gf_sg_vrml_*: MPEG4, VRML, X3D related
-                                        gf_sg_svg_*: SVG related (maybe laser-related)
-    
-  /gpac/src/media_tools: 
-    former authoring on media import/export and IsoMedia file stuff. function names: gf_media_*, gf_hinter_
-
-  /gpac/src/scene_manager: 
-    former authoring on scene manager. function names: gf_sm_*
-
-    
-  /gpac/include
-  /gpac/include/gpac: 
-    splitting of former m4_tools.h into dedicated headers, and for some other modules too (media parsers, ...)
-    
-  /gpac/include/gpac/internal:
-    former intern , no big changes 
-  
-  /gpac/modules:
-    former Plugins directory.
-    
-

gpac-0.8.0.tar.gz/doc/INSTALL.gcc Deleted

@@ -1,116 +0,0 @@
-Installation instructions for GPAC on GCC-powered platforms
-last modified: December 2008
-
-0 Foreword
-	The output directory for all plugins and applications is gpac/bin/gcc 
-
-	As of 0.2.2, GPAC cannot be compiled without ZLIB. You'd better make sure it is installed on your system (zlib is provided in gpac_extra_libs package)
-	
-I Extra lib installation
-	It is recommended to install (source or package) all extra libs needed by gpac not installed on your system.
-	Libraries found on the system are indicated as an output of the configure script
-
-
-II GPAC compilation
-	
-	II.1 SDL Support
-		GPAC can use SDL for audio/video output. If SDL is not installed on your system, you may indicate configure to build with a local copy:
-		    --sdl-cfg=path/to/local/sdlcfg/
-    (make sure to update the local sdl-cfg according to your needs)
-		
-  	If you can't get SDL and don't have OSS or WAV audio nor DirectX or X11 video support on your system, you won't be able to play any presentation with GPAC, 
-  	but you can still use MP4Box.
-
-	II.2 wxWidgets Support
-		GPAC comes with a GUI player called Osmo4. To compile this player you will need wxWidgets 2.6.0 (2.5.2 should work) installed on your system. 
-		Both unicode and ANSI versions of wxWidgets should be supported.
-		If you don't use wxWidgets, you can always use GPAC command-line player MP4Client.
-
-	II.3 MinGW DirectX support
-		When building GPAC under MinGW, it is also possible to compile the DirectX plugin. You will need the MinGW versions of DX libs
-		(available at http://alleg.sourceforge.net/files/). Get dx70_mgw or dx80_mgw (dx8 is provided in gpac_extra_libs package)
-		copy the archive content in your MSys tree (for ex, /usr/local/DirectX) and configure gpac with the option --dxsdk-path=/usr/local/DirectX
-		** you must keep include and lib folders under the same directory for the configure script to detect DirectX **
-	
-	II.4 Building GPAC
-		go to root of gpac distribution
-		./configure (--help for options) - you may need to "chmod +x" this file...
-		make
-
-		any fixes to configure are welcome :)
-
-	II.5 Installing GPAC
-		get root
-		type "make install" in gpac/
-		
-		This will install MP4Client, Osmo4 if configured, MP4Box and all plugins as well as GPAC documentation man: MP4Box(1), MP4Client(1) and GPAC(1).
-		type "make uninstall" to remove gpac from your system
-
-	II.6 Installing GPAC SDK
-		get root
-		type "make install-lib" in gpac/
-
-		This will install gpac base headers (<gpac/*.h>), gpac development headers (<gpac/internal/*.h> and libgpac_static - the static version of libgpac shared library.
-		type "make uninstall-lib" to remove gpac from your system
-		There is no documentation regarding headers/SDK for now, you will have to rely on function descriptions in each header.
-				
-III Running GPAC
-	
-	III.1 MP4Client
-		MP4Client is a command-line interface to GPAC. Note that the player cannot work without video support
-		
-	 You need a GPAC configuration file to run MP4Client, and you will need it each time.
-		
-		First launch of MP4Client
-			go to gpac/bin/gcc if not using the install.
-			type MP4Client
-			the prompt will ask for 
-			1- GPAC plugin dir: enter the path from / to gpac/bin/gcc. This is skipped when using the install version of MP4Client (the plugin path is hardcoded to 
-			the plugins install location on the system)
-			2- Font directory: enter the path to a truetype font directory on your system (note that if you don't have compiled with freetype any directory will do)
-			3- cache directory: any directory with write access
-		You now have a valid config file for GPAC, more info on this try "man GPAC" or check gpac/doc/configuration.html.
-
-		The config file is called ".gpacrc" and is located in the user home directory. You may run the client with a different config file by using the "-c" option.
-		
-		*If you don't see any output window, check the config file doesn't use gm_raw_out.so as a video renderer (or simply remove gm_raw_out.so).
-		
-		MINGW USERS: there are known and terrible bugs with MSys rxvt stdio buffering, do NOT use it to run MP4Client unless you want to understand
-		these bugs. Use w32 CMD.exe instead. Other GPAC apps are no pb for MSys rxvt.
-
-	III.2 Osmo4
-		Osmo4 is the GUI frontend to GPAC. If you have installed Osmo4 on your system, the first launch of the player should ask you to locate a 
-		directory with TrueType fonts and a cache directory for internet downloads if no configuration file is found.
-
-	III.3 MP4Box
-		MP4Box is a tool to encode, decode and manipulate MPEG-4 systems data. It does not need a configuration file.
-		Help for MP4Box is available on GPAC web site, with man MP4Box (except on MinGW) and with 'MP4Box -h'
-		
-	III.4 Osmozilla
-		Osmozilla is GPAC plugin for Mozilla-based browsers. It is by default installed to the user mozilla directory ~/.mozilla 
-		To install the plugin on the system
-		* get root
-		* ./configure --mozdir=/path/to/mozilla
-		    for example --mozdir=/usr/lib/mozilla-firefox
-		* make -C applications/osmozilla install
-		
-		* OR you may copy by hand bin/gcc/nposmozilla.so to /usr/lib/moz**/plugins and bin/gcc/nposmozilla.xpt to /usr/lib/moz**/components
-
-IV Configuration
-	
-	IV.0 Foreword
-		All configuration information is described in gpac/doc/configuration.html, or man gpac.
-	
-	IV.1 OpenGL
-		OpenGL is badly known for performing quite poorly as far as high data rate texturing is involved. This is a big issue when displaying a typical movie and you will likely find the GPAC 3D Rendering very slow on your system. If your GPU supports non power of 2 texturing or rectangular texturing (most Win32 drivers do)
-		you shouldn't have any problem with video. Otherwise here are some tips to configure GPAC on your system:
-		1- set the "BitmapCopyPixels" option on: some cards perform rather well at direct pixel transfer. If no improvement, set it off.
-		2- set the "BitmapCopyPixels" option off and the "EmulatePOW2" option on. This will trick the GL texturing by using only Power Of 2 textures when converting from YUV to RGB. 
-		3- If this does not improve video playback, you're only chance is through discussion forums & co to gather info about your system, your GL implementation and how to fine-tune it.
-		
-V Misc
-
-		There is a demo 2D authoring tool called V4Studio. No makefiles available yet but should compile without pbs (only needs libgpac
-		and wxWidgets ). It is not usable to design content but is a funny toy.
-		
-

gpac-0.8.0.tar.gz/doc/INSTALL.gpe Deleted

@@ -1,100 +0,0 @@
-Installation instructions for GPAC on Familiar+GPE platforms
-last modified: December 2008
-
-0 Foreword
-  This file is about installing the GPAC framework on an arm device running Linux familiar (cf http://www.handhelds.org)
-
-	Compilation has only been tested for familiar+GPE platforms ( http://gpe.handhelds.org). 
-	The GPE version enables GPAC to use X11 video output directly, including shared memory extensions.
-
-	The output directory for all plugins and applications is gpac/bin/gcc 
-
-	As of 0.2.2, GPAC cannot be compiled without ZLIB. You'd better make sure it is installed on your system (zlib is provided in gpac_extra_libs package)
-
-  To install the arm cross-compilation environement on your linux system, refer to:
-    * http://www.handhelds.org
-    * we're currently using the following tool-chain for Familiar+GPE compil http://www.roebling.de/embedded.html, with X11 and GTK+ support, 
-    already compiled.
-    
-  Do not forget to update your environment variables according to your toolchain.
-	
-I Extra lib installation
-	It is recommended to install all extra libs needed by gpac not installed on your system.
-
-II GPAC compilation
-	
-	II.1 SDL Support
-		GPAC can use SDL for audio/video output. If SDL is not installed on your system, you may indicate configure to build with a local copy:
-		    --sdl-cfg=path/to/local/sdlcfg/
-    (make sure to update the local sdl-cfg according to your needs)
-		
-  	If you can't get SDL and don't have OSS audio nor X11 video support on your system, you won't be able to play any presentation with GPAC, 
-  	but you can still use MP4Box.
-
-	II.2 wxWidgets Support
-		GPAC comes with a GUI player called Osmo4. To compile this player you will need wxWidgets 2.6.0 (2.5.2 should work) installed on your system. 
-		NOTE: Osmo4+wxWidgets is quite slow on familiar+GPE, and is therefore not recommended at the time being.
-		You can always use GPAC command-line player MP4Client.
-
-	II.3 OpenGL ES support
-	  OpenGL ES is not yet supported on Familiar-GPE. However, GPAC renderer supports OpenGL ES API. Porting the 3D module only requires modifying the X11 output (modules/x11_out) for
-	  OpenGL ES.
-
-	II.4 Building GPAC
-		go to root of gpac distribution. Note: you may need to "chmod +x" the configure file.
-		(./configure --help for options)
-		./configure --prefix=/usr/local/arm/3.3.2 --cpu=armv4l --enable-fixed-point
-		  Note: this assume the cross-compilation tool-chain is located in /usr/local/arm/3.3.2
-		  Note: you may also specify any other option supported by configure. It is not recommended to use the floating-point version of GPAC for ARM-based architectures.
-		make
-
-	II.5 Installing GPAC
-	  copy all files to your device, possibly creating a dedicated directory for modules
-	  edit or create ~/.gpacrc to have at least the following lines:
-	    [General]
-	    ModulesDirectory=AbsolutePathToTheModules
-	    
-	  For more information on GPAC configuration file, cf man GPAC of gpac/doc/configuration.html
-  	  				
-III Running GPAC
-	
-	III.1 MP4Client
-		MP4Client is a command-line interface to GPAC. Note that the player cannot work without video support (so you'd better get SDL)
-		
-		 You need a GPAC configuration file to run MP4Client, and you will need it each time.
-		
-		First launch of MP4Client
-			go to gpac/bin/gcc if not using the install.
-			type MP4Client
-			the prompt will ask for 
-			1- GPAC plugin dir: enter the path from / to gpac/bin/gcc. This is skipped when using the install version of MP4Client (the plugin path is hardcoded to 
-			the plugins install location on the system)
-			2- Font directory: enter the path to a truetype font directory on your system (note that if you don't have compiled with freetype any directory will do)
-			3- cache directory: any directory with write access
-		You now have a valid config file for GPAC, more info on this try "man GPAC" or check gpac/doc/configuration.html.
-
-		The config file is called ".gpacrc" and is located in the user home directory. You may run the client with a different config file by using the "-c" option.
-		
-		*If you don't see any output window, check the config file doesn't use raw_out.so as a video renderer (or simply remove raw_out.so).
-		
-	III.2 Osmo4
-		Osmo4 is the GUI frontend to GPAC. If you have installed Osmo4 on your system, the first launch of the player should ask you to locate a 
-		directory with TrueType fonts and a cache directory for internet downloads if no configuration file is found.
-
-	III.3 MP4Box
-		MP4Box is a tool to encode, decode and manipulate MPEG-4 systems data. It does not need a configuration file.
-		Help for MP4Box is available on GPAC web site, with man MP4Box and with 'MP4Box -h'
-		
-IV Configuration
-	
-	IV.0 Foreword
-		All configuration information is described in gpac/doc/configuration.html, or man gpac.
-	
-	IV.1 OpenGL
-		OpenGL is badly known for performing quite poorly as far as high data rate texturing is involved. This is a big issue when displaying a typical movie and you will likely find the GPAC 3D Renderer very slow on your system. If your GPU supports non power of 2 texturing or rectangular texturing (most Win32 drivers do)
-		you shouldn't have any problem with video. Otherwise here are some tips to configure GPAC on your system:
-		1- set the "BitmapCopyPixels" option on: some cards perform rather well at direct pixel transfer. If no improvement, set it off.
-		2- set the "BitmapCopyPixels" option off and the "EmulatePOW2" option on. This will trick the GL texturing by using only Power Of 2 textures when converting from YUV to RGB. 
-		3- If this does not improve video playback, you're only chance is through discussion forums & co to gather info about your system, your GL implementation and how to fine-tune it.
-		
-

gpac-0.8.0.tar.gz/doc/INSTALL.symbian Deleted

@@ -1,84 +0,0 @@
-Installation instructions for GPAC 0.4.5 on Symbian 9.1 (S60 3rd Edition) platform
-last modified: December 2008
-
-0 Foreword
-    ! GPAC versions later than 0.4.5 are no longer supported on Symbian ! 
-    
-	Compilation has only been tested with GCCE & Nokia S60 SDK
-	In order to fully compile, you must get:
-  - the complete S60 3rd edition SDK (maintainance release) 
-  - the MMF SDK update
-	
-	IMPORTANT NOTE:
-	 You must install the SDK and the code you will compile with it (be it GPAC or anything else) 
-        !! ON THE SAME LOGICAL DRIVE !!
-   If you do not do so, compilation will simply fail due to some misbehavior of the SDK's environment variables.
-           
-	
-	What is currently supported on symbian:
-    * all GPAC core, with audio and video output
-    * MP4 demux, AAC demux, MP3 demux, AMR demux
-    * native audio media codec from the phone through MMF: AAC and AMR
-    * MPEG-4 ASP video decoding through xvid
-    * JPEG and PNG decoding through libjpeg and libpng    
-    * MP3 decoding through MAD
-    * TrueType fonts through FreeType
-    * Scripting with JS32 (not fully tested yet)
-    * FFMPEG (not really stable, random crashes)    
-
-	What is currently NOT supported on symbian:
-    * networking 
-
-  TIP:
-    Global compiler options are located in SDKRoot\Epoc32\tools\compilation_config\ - you may edit the default C++ rules to remove some 
-    warnings during C compil. 
-
-  Side notes:
-    several SDKs may coexist on the drive. 
-      * To see the list of SDKs, at DOS prompt, c:\devices
-      * To change the default SDK, at DOS prompt, c:\devices -setdefault @sdk_name
-          you may need to exit prompt and start a new one in order to refresh environment variables.      
-    GPAC should compile on EKA2 (Symbian OS v8.0b, v8.1b).
-    GPAC CANNOT COMPILE ON EKA1 (Symbian OS v6.1, v7.0, v7.0s, v8.0a v8.1a) because EKA1 does not support writable static data in DLLs
-  
-I Extra lib installation
-	Please follow the instructions in gpac_extra_lib/00_README_FIRST
-
-II GPAC compilation
-
-  Go to gpac/build/symbian
-  
-  II.1 Configuring extra libs
-    * If you don't have libjs, libpng or libjpeg for symbian, comment indicated lines in libgpac.mmp (change #if 1 into #if 0)
-    * If you don't have OpenGL ES for symbian, comment indicated lines in libgpac.mmp (change #if 1 into #if 0)
-    * If you don't have freetype for symbian, comment ft_font.mmp in file bld.inf
-    * If you don't have ffmpeg for symbian, comment ffmpeg_in.mmp in file bld.inf
-    * If you don't have libmad for symbian, comment indicated lines in mp3_in.mmp
-    * If you don't have libopenjpeg (JPEG 2000) for symbian, comment indicated lines in img_in.mmp (change #if 1 into #if 0)
-
-  II.2 Compiling GPAC
-   	cd gpac/build/symbian
-  	bldmake bldfiles
-      * for GCCE
-    abld build gcce urel
-      * for thumb
-    abld build thumb urel
-    cd sis
-    set EPOCROOT=\path\to\epoc\root\
-      * for GCCE
-    makesis -d%EPOCROOT% osmo4_gcce.pkg
-    signsis osmo4_gcce.SIS osmo4_gcce.SIS gpac.cer gpac.key password
-      * for THUMB
-    makesis -d%EPOCROOT% osmo4_thumb.pkg
-    
-    Note: If you need to sign the SIS with your own certificate, you may generate one with openssl:
-    openssl req -new -x509 -nodes -sha1 -days 3650 -key gpac.key > gpac.cer
-  
-You will get a .SIS package that installs properly on a symbian device.
-NOTES:
-* The app and plugins are all installed in \sys\bin on the device. DO NOT change this path, since it won't work otherwise (due to symbian 9.1 caged data stuff) 
-* If you create/succeed to compile a new plugin for GPAC, you must:
-    - edit build/symbian/sis/osmo4_gcce.pkg to add your plugin in the installer
-    - edit build/symbian/sis/GPAC.cfg to instruct the player of this new plugin (enumeration of DLLs on Symbian 9.1 is just not possible without a good amount of $$)
-    
-

gpac-0.8.0.tar.gz/doc/INSTALL.w32 Deleted

@@ -1,217 +0,0 @@
-Installation instructions for GPAC on windows platform
-last modified: May 2012
-
-0 Foreword
-	For any question on the installation procedure, please refer to http://gpac.sourceforge.net/home_download.php
-
-	The output directory for all plugins and applications is
-		gpac/bin/win32/debug in debug mode
-		gpac/bin/win32/release in release mode
-	
-	As of 0.2.2, GPAC cannot be compiled without ZLIB. You'd better make sure it is installed locally or on your system (zlib is provided in gpac_extra_libs package)
-	
-I Extra lib installation
-
-	It is recommended to download and compile all extra libs needed by gpac on windows. Please read carefull the ReadMe file included in the gpac_extra_libs package
-
-	
-II GPAC compilation
-
-	open the GPAC workspace: 
-    gpac/build/msvc6/GPAC.dsw with MSVC6
-    gpac/build/msvc8/gpac.sln with VS2005 
-    gpac/build/msvc9/gpac.sln with VS2008
-	
-	NEVER ATTEMPT TO LOAD A PROJECT OUTSIDE THIS WORKSPACE, AS DEPENDENCY RULES WILL BE BROKEN
-	
-	II.1 Recompiling GPAC
-		libgpac is the core library of the GPAC framework used by all GPAC applications. It is available as a static library and as a dynamic one
-		Set the "libgpac_dll" project as the active one
-		If you have not installed the SpiderMonkey (JavaScript, libjs), JPEG or PNG libraries, remove the indicated macros in the file gpac/include/gpac/internal/config_static.h
-		recompile (libgpac_dll compilation will fail if zlib is not found)
-
-		Note: If you wish to build the fixed-point version of GPAC (not recommended), you will have to modify by hand the file gpac/include/gpac/maths.h
-		and replace the line
-      #define GPAC_NO_FIXED_POINT
-    by the line
-      #define GPAC_FIXED_POINT
-	  
-	  !!Do not attempts to enable fixed-point compilation in any other way!!
-	
-	II.2 Recompiling MP4Box
-		MP4Box is GPAC command-line tool for content authoring.
-		Set the "MP4Box" project as the active one
-		Recompile
-		
-	II.3 Plugins check
-		Before compiling other applications in GPAC you must make sure the projects are configured with the right libraries
-
-		* aac_in
-			If you have not installed faad2 library, remove the GPAC_HAS_FAAD preprocessor variable from the aac_in project settings.
-			Note that if no aac decoder is installed for gpac you may as well remove the "aac_in" project from the workspace (DEL).
-
-		* ac3_in
-			If you have not installed liba52 library, remove the GPAC_HAS_LIBA52 preprocessor variable from the ac3_in project settings.
-			Note that if no ac3 decoder is installed for gpac you may as well remove the "ac3_in" project from the workspace (DEL).
-
-		* mp3_in
-			If you have not installed mad library, remove the GPAC_HAS_MAD preprocessor variable from the mp3_in project settings.
-			Note that if no mp3 decoder is installed for gpac you may as well remove the "mp3_in" project from the workspace (DEL).
-
-		* xvid_dec
-			if you have not installed xvid library, remove the "xvid_dec" project from the workspace (DEL).
-		
-		* img_in:
-			If you have not installed libopenjpeg, remove the GPAC_HAS_JP2 preprocessor variable from the img_in project settings
-        and the relevant library from the link settings
-			If you have not installed any of the above libraries, you may remove the "img_in" project from the workspace (DEL).
-
-		* amr_float_dec	
-			This plugin handles speech coded data using AMR Narrow Band and Wide Band formats. It uses two decoders from the 3GPP consortium available at: 
-				AMR Narrowband decoder: http://www.3gpp.org/ftp/Specs/archive/26_series/26.104/26104-700.zip
-				AMR Wideband decoder: http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-710.zip
-
-			(The same versions are included in gpac_extra_libs/AMR_NB_FT and  gpac_extra_libs/AMR_WB_FT )
-
- 			To compile this plugin, copy the source code to modules/amr_float_dec/amr_nb_ft and modules/amr_float_dec/amr_wb_ft respectively, WITHOUT OVERWRITING typedefs.h files.
- 			You may as well compile with only one of these libraries installed:
-			If you have not installed AMR NB, remove the GPAC_HAS_AMR_FT preprocessor variable from the amr_float_dec project settings
-			If you have not installed AMR WB, remove the GPAC_HAS_AMR_FT_WB preprocessor variable from the amr_float_dec project settings
- 			Otherwise, remove the "amr_float_dec" project from the workspace (DEL).
-
-		* amr_dec		
-			This plugin handles speech coded data using AMR Narrow Band format with a fixed-point decoder (suited for embedded platforms). 
-			It uses the decoder of the 3GPP consortium (TS26.073) available from http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-700.zip. 
-			It is the same version included in gpac_extra_libs/AMR_NB with a slight header modifcation.
- 			To compile this plugin, copy the source code to modules/amr_dec/amr_nb WITHOUT OVERWRITING typedefs.h file.
- 			Otherwise, remove the "amr_dec" project from the workspace (DEL). Note you usually won't need this plugin, the float version of the decoders being much faster.
-		
-		* ffmpeg_in		
-			To install ffmpeg libraries, cf gpac_extra_libs/ReadMe
-			if you have not installed ffmpeg libraries (avcodec.lib/dll, avformat.lib/dll, avutil.lib/dll), remove the "ffmpeg_in" project from the workspace (DEL).
-
-		* ft_font
-			if you have not installed freetype, simply remove the "ft_font" project from the workspace (DEL).
-
-		* gdip_rend
-			To install GDIPLus, either get Microsft PlatformSDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/) or read gpac_extra_libs/GDIPlus/install.txt
-			if you have not installed GDIPlus or WindowsSDK, remove the "gdip_rend" project from the workspace (DEL).
-
-		* ogg
-			if you have not installed libogg library, remove the "ogg" project from the workspace (DEL).
-			if you have not installed libvorbis library, remove the GPAC_HAS_VORBIS preprocessor variable from the ogg project settings
-			if you have not installed libtheora library, remove the GPAC_HAS_THEORA preprocessor variable from the ogg project settings
-			Note that if you have only installed libogg you can also remove the "ogg" project from the workspace, it won't be any usefull.
-
-		* sdl_out:
-			GPAC can use SDL library for audio (all clients) and video (MP4Client and wxOsmo4) output. 
-			You will need to get SDL 1.2 for windows. Get it at http://www.libsdl.org/download-1.2.php. You need the DEVELOPMENT LIBRARY SDL-devel-1.2.7-VC6.zip 
-			Unpack and setup your path or VisualC++ for SDL include and lib directories (you may need to restart VisualC++)
-			You will need to modify your VC settings to look for libxml headers and library directories.
-			If you don't want to install libSDL or don't plan to use MP4Client or wxOsmo4, simply remove the "sdl_out" project from the workspace (DEL).
-			NOTE: SDL is not needed at all on windows, you will still have audio and video support without SDL. The SDL plugin is much slower than the directX plugin 
-			when dealing with video since it uses software YUV to RGB conversion.
-
-		NOTE: if you have not installed GDIPlus nor freetype, you won't have text support at all in GPAC.
-	
-	
-	II.4 Recompiling Osmo4
-		Osmo4 is the GUI MPEG-4 player of GPAC for the windows platform.
-		Set Osmo4 as the active project
-		recompile (enabled plugins will be recompiled in the process)
-		
-	II.5 Recompiling MP4Client
-		MP4Client is the command MPEG-4 player of GPAC. 
-		Set MP4Client as the active project
-		recompile (enabled plugins will be recompiled in the process)
-
-	II.6 Recompiling Osmo4/wxWidgets
-		Osmo4 / wxWidgets is the cross-platform GUI MPEG-4 player of GPAC. You must have wxWidgets 2.6.0 installed and configured on your system (this may be tricky. Please 
-		make sure you can recompile some sample wxWidgets applications from wxWidgets distribution first).
-		Set wxOsmo4 as the active project
-		recompile (some plugins may be recompiled in the process). You may need to change the linker settings, depending on your wxWidgets version and config
-
-	II.7 Recompiling Osmozilla
-		Osmozilla is GPAC plugin for Mozilla-based browsers, enabling embedding all GPAC supported contents in a web page. Recompile it only if you think it may 
-		be helpful. 
-    * Get the gecko sdk (http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.13/gecko-sdk-i586-pc-msvc-1.7.13.zip or in the gpac_extra_libs package)
-    * Extract it to gpac/extra_lib/include/gecko-sdk
-    * Set Osmozilla as the active project and recompile
-
-	II.7 Recompiling GPAX
-		GPAX is GPAC ActiveX control, only usable as an Internet Explorer plugin for now, enabling to embed all GPAC supported contents in a web page. Recompile it only if you think it may 
-		be helpful (Set as the active project and recompile)
-
-III Launching the applications
-
-	If you have compiled libgpac with SpiderMonkey (JavaScript) enabled, copy the JS32.dll file in the output directory.
-		
-	Some applications need to locate the GPAC configuration file called GPAC.cfg. This file is automatically generated by Osmo4 in its directory. It is recommended
-to first launch Osmo4 to get a working config file.
-	For more information regarding the config file, cf gpac/doc/configuration.html
-
-	You can launch Osmo4 as is, the application should start and be operational right away.
-	
-	You can use MP4Box as is.
-	
-	MP4Client needs GPAC configuration file to run. It will by default search for the file in the current directory, and some hardcoded directories that will likely not work.
-	If the config file is not found, a new one is created in the current directory. You can pass a given config file as a parameter (MP4Client -c config_path).
-	You can also modify the hardcoded path in MP4Client (gpac/Applications/MP4Client/main.c) to point to gpac output directory and recompile.
-	
-		
-	Osmozilla cannot be launched without a mozilla-based web browser. You should not try to install it in any other way than with the GPAC installer 
-	(cf below). Once installed, you may try any test in an html page viewed with your browser, for example:
-      	<object type="application/mp4" width="120" height="100">
-        <param name="src" value="myfile.mp4" /> 
-      	</object>
-   To make sure your browser has loaded the osmozilla plugin and to check the mime types supported, try typing "about:plugins" in your browser address bar.
-		
-	GPAX cannot be launched without Internet Explorer. You should not try to install it in any other way than with the GPAC installer 
-	(cf below). Once installed, you may try any test in an html page viewed with your browser, for instance:
-      	<object type="application/mp4" width="120" height="100">
-        <param name="src" value="myfile.mp4" /> 
-      	</object>
-      	
-      	
-IV Configuration
-	
-	IV.0 Foreword
-		All configuration information is described in gpac/doc/configuration.html, or man gpac.
-	
-	IV.1 OpenGL
-		OpenGL is badly known for performing quite poorly as far as high data rate texturing is involved. This is a big issue when displaying a typical movie and you
-		will likely find the GPAC 3D Renderer very slow on your system. If your GPU supports non power of 2 texturing or rectangular texturing (most Win32 drivers do) 
-		you shouldn't have any problem with video. Otherwise here are some tips to configure GPAC on your system:
-		1- set the "BitmapCopyPixels" option on: some cards perform rather well at direct pixel transfer. If no improvement, set it off.
-		2- set the "BitmapCopyPixels" option off and the "EmulatePOW2" option on. This will trick the GL texturing by using only Power Of 2 textures when converting 
-		from YUV to RGB. 
-		3- If this does not improve video playback, you're only chance is through discussion forums & co to gather info about your system, your GL implementation 
-		and how to fine-tune it.
-
-V Misc
-
-	V.1 Scene Generators
-		In gpac/applications/generators you will find the code generators for MPEG-4, X3D and SVG scene graphs used in gpac.
-		If you want to modify the set of nodes understood by GPAC in encoding/decoding/rendering, you will need those.
-		The Scene generators can be recompiled without dependencies to extra libraries nor libgpac library.
-		To recompile them, open the related project files (.dsp) and recompile.
-		To use them, cf gpac/doc/SceneGenerators
-		
-	VI.2 V4Studio
-		V4Studio is a very simple authoring tool for 2D content. It is not usable but may interest developers. 
-		For Installation instructions cf gpac/Applications/V4Studio/install
-		
-	VI.3 GPAC Installer
-		The GPAC installer uses the NSIS installing system. The installation script is gpac/bin/w32_rel/install/GPAC_Install.nsi
-		- Before building the installer
-			* get NullSoft installer (nsis.sourceforge.net), at least version 2.0
-			* make sure the js32.dll is copied in the gpac/bin/w32_rel dir if you have compiled GPAC with SpiderMonkey support, otherwise comment 
-			out "..\js32.dll" line from the install script
-			* copy gdiplus.dll to gpac/bin/w32_rel/install 
-			* make sure avcodec.dll and avformat.dll are copied in gpac/bin/w32_rel if you have built ffmpeg plugin
-			* make sure iconv.dll, libxml2.dll, zlib1.dll in gpac/bin/w32_rel if you have compiled libxml2
-			
-		- Building GPAC installer
-			The installer includes Osmo4, MP4Box, Osmozilla and all modules except SDL_out and raw_out. To install, right click on "GPAC_Install.nsi" and compile
-			For other configurations, modify the script "GPAC_Install.nsi" to comment out unwanted features
-

gpac-0.8.0.tar.gz/doc/INSTALL.wCE Deleted

@@ -1,134 +0,0 @@
-Installation instructions for GPAC on windows CE platform
-last modified: Mai 2012
-
-0 Foreword
-  
-  ** GPAC IS NO LONGER MAINTAINED ON PocketPC 2002/eVC3 PLATFORMS **
-  
-	Compilation has only been tested with evc4 and ARM platforms
-	
-	GPAC should be stable on most devices running PocketPC/SmartPhone 2003. It has know bugs with higher versions
-	of the Windows Mobile OS, but should still be stable.
-
-	The output directory for all plugins and applications for Windows PocketPC 2003 is
-		gpac/bin/Smartphone 2003/Debug in debug mode
-		gpac/bin/Smartphone 2003/Release in release mode
-	
-	As of 0.2.2, GPAC cannot be compiled without ZLIB. You'd better make sure it is installed locally or on your system (zlib is provided in gpac_extra_libs package)
-	
-I Extra lib installation
-	It is recommended to download and compile all extra libs needed by gpac on winCE.
-	In case you don't do so, you will need to to modify project settings.
-
-
-II GPAC compilation
-	open /build/msvc8/gpac.sln (GPAC workspace) with MSVC 2005
-	open /build/msvc9/gpac.sln (GPAC workspace) with MSVC 2008
-	
-	NEVER ATTEMPT TO LOAD A PROJECT OUTSIDE THIS WORKSPACE
-	
-	II.1 Setting up libgpac
-		libgpac is the core library of the GPAC framework used by all GPAC applications 
-
-		If you have not installed the SpiderMonkey (JavaScript, libjs), JPEG or PNG libraries, remove the indicated macros in the file gpac/include/gpac/internal/config_static.h
-		
-		If you are compiling for PocketPC 2003 OS, and wish to use the Intel GPP library, uncomment the desired macro in 
-		the file gpac/include/gpac/internal/config_static.h
-
-    3D Rendering	
-      GPAC can use OpenGL ES for 3D rendering on embedded devices, but you will need development files of OpenGL ES. 
-      GPAC has been tested with 2 implementations of OpenGL ES:
-      * HybridGraphics one (cf http://www.hybrid.fi/), by far the most efficient one tested, available for evc4/PockePC 2003 only
-      * Vincent3D (aka ogl-es, cf http://ogl-es.sourceforge.net/), slower but with good visual results
-      
-      To setup OpenGL ES, get one of these libraries, configure the IDE to locate the include and lib files (or copy them in gpac/extra_lib/ which is setup by default)
-      The GL ES lib shall be named "libGLES_CM.lib" or "libGLES_CL.lib" for the OpenGL-ES Light profile, and the GL ES include files shall be located in a "GLES" directory, the include path pointing to its parent directory.
-      
-      NOTE 1: The Klimt library (cf http://studierstube.org/klimt/), which is not 100% OpenGL_ES compliant, may be used but needs some code rewrite here and there,
-      mainly in gapi video output.
-
-      NOTE 2: If you do not plan to support 3D rendering, uncomment the related macro in the file gpac/include/gpac/internal/config_static.h
-
-	
-	II.2 Checking Plugins
-		
-		Before compiling GPAC plugins, you must make sure the projects are configured with the right libraries
-		* aac_in
-			If you have not installed faad2 library, remove the GPAC_HAS_FAAD preprocessor variable from the aac_in project settings.
-			Note that if no aac decoder	is installed for gpac you may as well remove the "aac_in" project from the workspace (DEL).
-
-		* ac3_in
-			If you have not installed liba52 library, remove the GPAC_HAS_LIBA52 preprocessor variable from the ac3_in project settings.
-			Note that if no ac3 decoder	is installed for gpac you may as well remove the "ac3_in" project from the workspace (DEL).
-
-		* mp3_in
-			If you have not installed mad library, remove the GPAC_HAS_MAD preprocessor variable from the mp3_in project settings.
-			Note that if no mp3 decoder is installed for gpac you may as well remove the "mp3_in" project from the workspace (DEL).
-
-		* amr_nb		
-			This plugin handles speech coded data using AMR Narrow Band format. It uses the decoder of the 3GPP consortium (TS26.073) available 
-			from http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-700.zip. 
-			It is the same version included in gpac_extra_libs/AMR_NB with a slight header modifcation.
- 			To compile this plugin, copy the source code to modules/amr_dec/amr_nb WITHOUT OVERWRITING typedefs.h file.
- 			Otherwise, remove the "amr_dec" project from the workspace (DEL).
-
-		* img_in:
-			If you have not installed libopenjpeg, remove the GPAC_HAS_JP2 preprocessor variable from the img_in project settings
-        and the relevant library from the link settings
-			If none of the above lib is installed, you can simply remove the img_in project from the workspace (DEL).
-		
-		* ft_font
-			if you have not installed freetype, remove the project dependecies to freetype in project Osmo4 and MP4Client
-			NOTE: if you have not installed freetype, you won't have text support at all in GPAC.
-
-		* ogg
-			if you have not installed libogg library, remove the "ogg" project from the workspace (DEL).
-			if you have not installed libvorbis library, remove the GPAC_HAS_VORBIS preprocessor variable from the ogg project settings
-			if you have not installed libtheora library, remove the GPAC_HAS_THEORA preprocessor variable from the ogg project settings
-			Note that if you have only installed libogg you can also remove the "ogg" project from the workspace, it won't be any usefull.
-				
-		* gapi:
-			you must make sure you have installed the GAPI SDK for windows (also known as GX) before compiling - cf gpac_extra_libs/ReadMe
-      			
-  II.3 Recompiling
-	  select the target platform (PocketPC or Smartphone)
-	  Rebuild all (Build->Batch Build->Rebuild All)
-	  
-	  Note:
-  	  Osmo4 build will fail for smartphone devices, the GPAC GUI available on this platform is Osmophone		
-						
-	II.4 Launching Osmo4 or Osmophone
-		Osmo4/Osmophone will automatically create a config file in the Osmo4/Osmophone executable directory if needed. You must copy all plugins to this 
-		directory (recommended), or edit by hand the config file "ModulesDirectory" key to point to the modules directory, otherwise Osmo4/Osmophone will not 
-		launch. You can then launch Osmo4/Osmophone (cf Misc section below)
-		
-III GPAC Installer for WinCE
-
-		The GPAC installer uses MS installer and EZSetup to get an Osmo4/Osmophone installer on PocketPC 2003 Systems
-		Install scripts are located in gpac/bin/arm_ppc02_rel/install and gpac/bin/arm_ppc03_rel/install
-				THIS INSTALLER IS ONLY INTENDED FOR STRONGARM BASED DEVICES
-		
-		* compile GPAC for PocketPC 2003
-		* make sure the js.dll is copied in the release build directory if you have compiled GPAC with SpiderMonkey support, otherwise comment lines "js.dll" in gpac.inf
-		* make sure the libGLES_CM.dll (or libGLES_CL.dll ) is copied in the release build directory if you have compiled with OpenGL ES support, otherwise comment lines "libGLES_CM.dll" and "gm_render3d.dll" in gpac.inf
-		* make sure the libxml2.dll is copied in the release build directory if you have compiled the svg loader, otherwise comment lines "libxml2.dll" in gpac.inf
-		* remove any lines in gpac.inf that refer to plugins you have not built.
-		* if you have built the smartphone version, change AppName and ExeName accordingly in gpac.inf
-		* get MS PocketPC Cabwizard (search for Cabwiz.exe in your ActiveSync distribution)
-		* copy cabwiz.exe, cabwiz.ddf and MAKECAB.exe in the install directory
-		* if needed copy gx.dll in the install directory (download from microsoft, or use gpac extra libs version)
-		* get Ezsetup from http://www.eskimo.com/~scottlu/win/, and copy it in this directory
-		* run do.bat file
-		
-IV Misc
-
-	IV.1 Note on Video
-		As of 0.2.3, the OpenDivx plugin is no longer included in GPAC. A new, modified version of XviD 1.0 for ARM is included (cf gpac/modules/xvid_dec/xvid_wce/ReadMe.txt)
-	
-	IV.2 Note on Network
-		Ipaq devices under WindowsCE below Windows CE .NET 4.1 (and maybe other devices) have a small default UDP buffer size, and this buffer size cannot 
-		be changed through WinSock (software) calls. To increase it, you must manually edit the registry and set (add a DWORD key if not present):
-					HKEY_LOCAL_MACHINE\Comm\Afd\DgramBuffer 16
-		16 is the maximum value possible, DON'T TRY TO SPECIFY MORE.
-		The device MUST be reseted (soft reset, cf your manual)	for the parameter to be taken into account.
-

gpac-0.8.0.tar.gz/doc/configuration.html Deleted

@@ -1,1078 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-<html>
-
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>GPAC Configuration documentation </title>
-</head>
-
-<p style="text-align: center;">
-<br/>
-<b><span style="Font-Size: 24pt">GPAC Configuration file documentation
-<br/>
-GPAC Version 0.8.0
-</span></b>
-<br/>
-</p>
-
-<br/><br/>
-
-<a name="Overview"></a><span style="text-decoration: underline;"><b>Overview</b></span>
-<p style="text-indent: 5%">
-Some applications in the GPAC framework use a configuration file shared among modules and reloadable at run time. Modules may use the configuration file as well (to avoid multiple config files). This doc attempts to provide explanations for the different options.
-<br/><br/>
-The config file is ordered by sections and keys.
-<br/>A section is declared as <b><i>SectionName</i></b>. Defined sections are:
-<br/>
-<b><a href="#General" style="text-decoration: underline;">General</a></b>
-<b><a href="#RecentFiles" style="text-decoration: underline;">RecentFiles</a></b>
-<b><a href="#Systems" style="text-decoration: underline;">Systems</a></b>
-<b><a href="#Compositor" style="text-decoration: underline;">Compositor</a></b>
-<b><a href="#Audio" style="text-decoration: underline;">Audio</a></b>
-<b><a href="#Video" style="text-decoration: underline;">Video</a></b>
-<b><a href="#Network" style="text-decoration: underline;">Network</a></b>
-<b><a href="#FontEngine" style="text-decoration: underline;">FontEngine</a></b>
-<b><a href="#Downloader" style="text-decoration: underline;">Downloader</a></b>
-<b><a href="#HTTPProxy" style="text-decoration: underline;">HTTPProxy</a></b>
-<b><a href="#Streaming" style="text-decoration: underline;">Streaming</a></b>
-<b><a href="#MimeTypes" style="text-decoration: underline;">MimeTypes</a></b>
-<b><a href="#StreamingCache" style="text-decoration: underline;">StreamingCache</a></b>
-<b><a href="#SAXLoader" style="text-decoration: underline;">SAXLoader</a></b>
-<b><a href="#XviD" style="text-decoration: underline;">XviD</a></b>
-<b><a href="#FFMPEG" style="text-decoration: underline;">FFMPEG</a></b>
-<b><a href="#ISOReader" style="text-decoration: underline;">ISOReader</a></b>
-<b><a href="#DVB" style="text-decoration: underline;">DVB</a></b>
-<b><a href="#DASH" style="text-decoration: underline;">DASH</a></b>
-<b><a href="#ALSA" style="text-decoration: underline;">ALSA</a></b>
-<b><a href="#SHORTCUTS" style="text-decoration: underline;">Shortcuts</a></b>
-<b><a href="#DSMCC" style="text-decoration: underline;">DSMCC</a></b>
-<b><a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a></b>
-<b><a href="#DirectFB" style="text-decoration: underline;">DirectFB</a></b>
-<b><a href="#DektecVideo" style="text-decoration: underline;">DektecVideo</a></b>
-<b><a href="#M2TS" style="text-decoration: underline;">M2TS</a></b>
-<b><a href="#RAW" style="text-decoration: underline;">RAWVideo</a></b>
-<b><a href="#NVDec" style="text-decoration: underline;">NVDec</a></b>
-
-</p>
-<br/><br/>
-A key is declared as <b><i>keyName</i></b>=<i>value</i>. The key value is not interpreted and always handled as ASCII text.
-<br/><br/>
-<ul>
-<li>
-<span style="text-decoration: underline;">On Windows plateforms</span>, this config file is called "GPAC.cfg" and is <i>usually</i> located in C:\\Program Files\\GPAC. Note that Osmo4 will always create a config file in its own directory when none is found.
-<br/><br/>
-</li>
-<li>
-<span style="text-decoration: underline;">On Windows CE plateform</span>, this config file is called "GPAC.cfg" and is <i>usually</i> located in \\Program Files\\GPAC. Note that Osmo4 / CE will always create a config file in its own directory when none is found.
-<br/><br/>
-</li>
-<li>
-<span style="text-decoration: underline;">On GNU/Linux plateforms</span>, this config file is called ".gpacrc" and is <i>always</i> located at the root of the user home directory (for ex, /home/jean/.gpacrc).
-<br/><br/>
-</li>
-</ul>
-<br/>
-
-<br/><br/><i>Note on module names:</i>
-<br/>Module names as given in the config file are names exported by each interface and not name of the physical library file (<i>.dll, .so, ...</i>). The physical file name can however be used to identify a module - it will then be replaced by the module name.
-
-<br/><br/>
-<br/><br/>
-
-<a name="General"></a>
-<span style="text-decoration: underline;"><b>Section "General"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The <b>General</b> section of the config file holds player specific options.
-</p>
-<b>ModulesDirectory</b> [value: <i>path to directory</i>]
-<p style="text-indent: 5%">
-Specifies the path to modules directory. The MPEG-4 Systems engine cannot be loaded without modules. This option is used by GPAC clients on all platforms.
-</p>
-<b>CacheDirectory</b> [value: <i>path to storage directory</i>]
-<p style="text-indent: 5%">
-Specifies location of temp files. The user must have write access to this location. Although not used by applications, this is used by several modules.
-</p>
-<b>StartupFile</b> [value: <i>filename</i>]
-<p style="text-indent: 5%">
-Specifies file to load upon startup of most clients (Osmo4/MP4Client). If not specified, no file is loaded.
-</p>
-
-<b>LogFile</b> [value: <i>filename</i>]
-<p style="text-indent: 5%">
-Specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client.
-</p>
-<b>Logs</b> [value: <i>tool[:tool]@level:tool[:tool]@level</i>]
-<p style="text-indent: 5%">
-Specifies log level for each tool. By default, only errors are logged. Available levels are:
-<ul>
-<li><i>quiet</i> : no logging is performed on the tool</li>
-<li><i>error</i> : only errors are logged</li>
-<li><i>warning</i> : warnings are also logged.</li>
-<li><i>info</i> : information messages are also logged</li>
-<li><i>debug</i> : debug messages are also logged</li>
-</ul>
-<br/>
-Available tools are:
-<ul>
-<li><i>core</i> : libgpac core</li>
-<li><i>coding</i> : bitstream formats (audio, video, scene)</li>
-<li><i>container</i> : container formats (ISO File, MPEG-2 TS, AVI, ...)</li>
-<li><i>network</i> : network data exept RTP trafic</li>
-<li><i>rtp</i> : rtp, rtcp and rtsp trafic</li>
-<li><i>author</i> : authoring tools (hint, import, export)</li>
-<li><i>sync</i> : terminal sync layer</li>
-<li><i>codec</i> : terminal codec messages</li>
-<li><i>parser</i> : scene parsers (svg, xmt, bt) and other</li>
-<li><i>media</i> : terminal media object management</li>
-<li><i>scene</i> : scene graph and scene manager</li>
-<li><i>script</i> : scripting engine messages</li>
-<li><i>interact</i> : user interaction messages</li>
-<li><i>compose</i> : composition engine (events, etc)</li>
-<li><i>cache</i> : HTTP cache</li>
-<li><i>mmio</i> : Audio/Video HW I/O management</li>
-<li><i>rti</i> : Run-time info (CPU, mem, ...)</li>
-<li><i>smil</i> : SMIL timing and animation</li>
-<li><i>memory</i> : GPAC memory tracker</li>
-<li><i>audio</i> : Audio renderer and mixers</li>
-<li><i>module</i> : used by some modules</li>
-<li><i>mutex</i> : mutex information</li>
-<li><i>console</i> : console messages, such as script alert() and error notifications</li>
-</ul>
-</p>
-
-<p>
-<br/><br/>
-</p>
-
-<span style="text-decoration: underline;">Options defined for Osmo4 (Windows version and wxWidgets version):</span><br/><br/>
-<b>Loop</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether the presentation has to be restarted when done playing.
-</p>
-<b>ConsoleOff</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether application messages (script, buffering, download progress) are displayed in the console or not.
-</p>
-<b>SingleInstance</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the player should be a single instance application or not (Osmo4-Win32 only).
-</p>
-<b>LookForSubtitles</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if Osmo4 shall look for subtitle files when opening a presentation.
-</p>
-<b>ViewXMT</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if scene dumping shall be done in XML (XMT, X3D) or in VRML-like syntax (BT, WRL).
-</p>
-<b>ConfigPanel</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the latest config panel selected by user.
-</p>
-<b>NoMIMETypeFetch</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the player has to check for mime type when following hyperlinks, or only follow links of known extensions.
-</p>
-<b>Loop</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the playlist shall be restarted when playback is over.
-</p>
-<b>PLEntry</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Indicates active playlist entry when player was last closed. Playlist backup is:
-</p>
-<ul>
-<li>"gpac_pl.m3u" on win32 platforms, stored in same directory as application</li>
-<li>".gpac_pl.m3u" on other platforms, stored in user home directory</li>
-</ul>
-<b>FillScreen</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the display area shall fill all available space on screen. WindowsMobile/Symbian only
-</p>
-<b>DisableBackLight</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the screen backlighting shall be disabled while playing. WindowsMobile/Symbian only
-</p>
-<b>LastWorkingDir</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies the directory of the last local file opened. Smartphone Windows only
-</p>
-<b>Browser</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies prefered browser for WWW anchors and scene graph viewing - Only used by Osmo4/wxWidgets.
-</p>
-
-<a name="RecentFiles"></a>
-<span style="text-decoration: underline;"><b>Section "RecentFiles"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "RecentFiles" section of the config file holds last accessed files (hardcoded to no more than 20) in the last access order. The keys are
-the file names and no value is used. This section is only used by GUI clients (osmo4/wxOsmo4)
-</p>
-
-<a name="Systems"></a>
-<span style="text-decoration: underline;"><b>Section "Systems"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "Systems" section of the config file holds all configuration options for the MPEG-4 Systems engine.
-</p>
-<b>LanguageName</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the user prefered language in readable english. This is used to select streams in case of alternate content in an audio object.
-</p>
-<b>Language3CC</b> [value: <i>3-char code from ISO 639-2</i>]
-<p style="text-indent: 5%">
-Specifies the user prefered language as expressed in ISO 639-2. This is used to select streams in case of alternate content in an audio object.
-</p>
-<b>Language2CC</b> [value: <i>2-char code from ISO 639-1</i>]
-<p style="text-indent: 5%">
-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.
-</p>
-<b>DrawLateFrames</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-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.
-</p>
-<b>ForceSingleClock</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-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.
-</p>
-<b>ThreadingPolicy</b> [value: <i>"Free" "Single" "Multi"</i>]
-<p style="text-indent: 5%">
-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.
-</p>
-<b>Priority</b> [value: <i>"low" "normal" "high" "real-time"</i>]
-<p style="text-indent: 5%">
-Specifies the priority of the decoders (priority is applied to decoder thread(s) regardless of threading mode).
-</p>
-<b>TimeSlice</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Specifies the target maximum time (in ms) of one cycle of the media manager (the media manager will attempts to call all the active decoders within this time. Depending on the threading mode this option can be ignored;
-</p>
-<b>ModuleUnload</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether modules should be unloaded if not used or not. Default: "yes".
-</p>
-<b>ResyncLateClock</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Specifies the threshold after which late clocks are resynchronized to timestamps for OCR streams. By default, no threashold (0) is used and clocks are never resynchronized. This allows to 
-resync clocks to the media owning the clock when the decoding is really too slow, and should only be used for debugging purposes.
-</p>
-<b>NoVisualThread</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether the visual rendering is done in the main codec manager or in a dedicated thread.
-</p>
-<b>DefAudioDec</b> , <b>DefVideoDec</b> and <b>DefImageDec</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies which module to use by default for audio/video/image decoding. The string is the name of the module to be used (same considerations as other modules, cf introduction).
-</p>
-<b>codec_<i>XX</i>_<i>XX</i></b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Allows to specify default media module (audio/video) per stream type and object type. This is usefull if you have more than one decoder for a given type (ex, XviD and FFMPEG for MPEG-4 visual SP). The syntax is:
-<br/>codec_<i>AA</i>_<i>BB</i>=<i>modulename</i><br/>
-where <i>AA</i> is the hexadecimal MPEG-4 streamType value for the codec (04=visual, 05=audio) and <i>BB</i> is the hexadecimal MPEG-4 objectTypeIndication of the media (0x20 = MPEG-4 video, 0x40=MPEG-4 Audio, ...).
-The string is the name of the module to be used (same considerations as other modules, cf introduction).
-</p>
-
-<a name="Compositor"></a>
-<span style="text-decoration: underline;"><b>Section "Compositor"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "Compositor" section of the config file holds all configuration options for the compositor (logical rendering engine).
-</p>
-<b>Raster2D</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the 2D rasterizer to use for vectorial drawing. Same as above, this module cannot be reloaded during a presentation.</p>
-<b>FrameRate</b> [value: <i>float</i>]
-<p style="text-indent: 5%">
-Specifies the simulation frame-rate of the presentation - this value is also used by the MPEG-4 Systems engine to determine when a BIFS frame is mature for decoding.</p>
-<b>AntiAlias</b> [value: <i>"None" "All" "Text"</i>]
-<p style="text-indent: 5%">
-Specifies antialiasing settings - whether the setting is applied or not depends on the graphics module / graphic card.
-</p>
-<ul>
-<li><i>"None"</i>: no anti-aliasing</li>
-<li><i>"Text"</i>: anti-aliasing for text only</li>
-<li><i>"All"</i>: complete anti-aliasing</li>
-</ul>
-<b>HighSpeed</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether rendering should target speed or quality - whether the setting is applied or not depends on the renderer, graphics module / graphic card.</p>
-<b>ForceSceneSize</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Forces the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration.</p>
-<b>StressMode</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies that the renderer runs in worst case scenario, recomputing display lists and reloading textures (sending them to graphics card) at each frame even when no change has occured.</p>
-<b>BoundingVolume</b> [value: <i>"None" "Box" "AABB"</i>]
-<p style="text-indent: 5%">
-Specifies whether the bounding volume of an object shall be drawn or not. Note that the 2D renderer only uses rectangles as bounding volumes. The "AABB" value is used by the 
-3D renderer only, and specifies the object bounding-box tree shall be drawn.</p>
-<b>ColorKey</b> [value: <i>unsigned hexadecimal integer, formated as AARRGGBB</i>]
-<p style="text-indent: 5%">
-Specifies the color key to use for windowless rendering. GPAC currently doesn't 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 GPAC's output, if supported.
-</p>
-<b>BackColor</b> [value: <i>unsigned hexadecimal integer, formated as AARRGGBB</i>]
-<p style="text-indent: 5%">
-Specifies the background color to use when displaying transparent images or video with no scene compoistion instructions.
-</p>
-<b>DrawMode</b> [value: <i>"immediate" "defer" "defer-debug"</i>]
-<p style="text-indent: 5%">
-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). Defer Debug mode only renders changed areas.</p>
-<b>ScalableZoom</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether scalable zoom should be used or not. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched.</p>
-<b>DisableYUV</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Disables YUV hardware support (YUV hardware support may not be available for the current video output module).</p>
-<b>TextureFromDecoderMemory</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Allows video textures to be build directly from video decoder internal buffers. This may increase performances on some systems. Default is no.</p>
-<b>ForceOpenGL</b> [value: <i>"always", "disable", "hybrid", "raster"</i>]
-<p style="text-indent: 5%">
-Specifies that 2D rendering will be performed by OpenGL rather than raster 2D. This will involve polygon tesselation which may not be supported on all platforms, and 2D graphics will not loo as nice as 2D mode. The hybrid mode performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all textures. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation) (slow, mainly for test purposes).</p>
-<b>EnablePBO</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Uses PixelBufferObjects to push YUV textures to GPU in OpenGL Mode.. This may slightly increase the performances of the playback.</p>
-<b>DefaultNavigationMode</b> [value: <i>"Walk", "Fly", "Examine"</i>]
-<p style="text-indent: 5%">
-Overrides the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine).</p>
-<b>RasterOutlines</b> [value: <i>"yes"  "no"</i>]
-<p style="text-indent: 5%">
-Specifies that outlining shall be done through OpenGL pen width rather than vectorial outlining.</p>
-<b>PolygonAA</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used.</p>
-<b>DisableBackFaceCulling</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether backface culling shall be disable or not. If not set, backface culling is performed.</p>
-<b>Wireframe</b> [value: <i>"WireNone" "WireOnly" "WireOnSolid"</i>]
-<p style="text-indent: 5%">
-Specifies wireframe drawing options:</p>
-<ul>
-<li><i>"WireNone"</i>: objects are drawn as solid</li>
-<li><i>"WireOnly"</i>: objects are drawn as wireframe only</li>
-<li><i>"WireOnSolid"</i>: objects are drawn as solid and wireframe is then drawn</li>
-</ul>
-<b>DisableRectExt</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether OpenGL rectangular texture extension (GL_EXT_texture_rectangle or GL_NV_texture_rectangle) shall be used or not.</p>
-<ul>
-<li>"yes": textures whose dimensions are not power of two are rescaled except if hardware support non-power-of-two textures (GL_ARB_texture_non_power_of_two) natively.</li>
-<li>"no": if extension is available, textures are used without rescaling. Note that in this case texture transformations are disabled.</li>
-</ul>
-<b>EmulatePOW2</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Enables power of 2 emulation. Ignored if openGL rectangular texture extension is enabled.</p>
-<ul>
-<li>"yes": video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations.</li>
-<li>"no": video is resized to a power of 2 texture when mapping to a shape.</li>
-</ul>
-<b>DisableGLUScale</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Disables usage of gluScaleImage, which may be slower but nicer than GPAC's software stretch routines.</p>
-<b>TextureTextMode</b> (value: <i>"Default", "Never", "Always"</i>]
-<p style="text-indent: 5%">
-Specifies 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. Default value will use texturing for OpenGL rendering. </p>
-<b>OpenGLExtensions</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Read-only option listing the OpenGL extensions supported by the GL driver. Only valid after the 3D renderer has been used.
-</p>
-<b>StereoType</b> [value: <i>"None", "SideBySide", "StereoHeadset", "TopToBottom", "Anaglyph", "Columns", "Rows", "SPV19", "Custom"</i>]
-<p style="text-indent: 5%">
-Specifies the stereo output type (default "None"). If your graphic card does not support OpenGL shaders, only <i>SideBySide</i> and <i>TopToBottom</i> modes will be available.</p>
-<ul>
-<li>"SideBySide": images are displayed side by side from left to right.</li>
-<li>"TopToBottom": images are displayed from top (laft view) to bottom (right view).</li>
-<li>"StereoHeadset": same as SideBySide except that view aspect ratio is not changed.</li>
-<li>"Anaglyph": Standard color anaglyph (red for left view, green and blue for right view) is used.</li>
-<li>"Columns": images are interleaved by columns, left view on even columns and left view on odd columns.</li>
-<li>"Rows": images are interleaved by columns, left view on even rows and left view on odd rows.</li>
-<li>"SPV19": images are interleaved by for SpatialView 19'' 5 views display, fullscreen mode.</li>
-<li>"Custom": images are interleaved according to the shader specified by <i>InterleaverShader</i>
-</ul>
-
-<b>NumViews</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Specifies the number of views to use in stereo mode. If mode is "Anaglyph", "Columns" or "Rows", the number of views is forced to 2.</p>
-
-<b>InterleaverShader</b> [value: <i>path to fragment shader file</i>]
-<p style="text-indent: 5%">
-Specifies the fragment shader file to use for view interleaving. Each view is rendered in its own texture. The shader is exposed each view as <i>uniform sampler2D gfViewX</i>, where X is the view number starting from the left (<i>gfView1</i>).</p>
-
-<b>ReverseViews</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies if the view order should be reversed (from right to left) or not.</p>
-<b>EyeSeparation</b> [value: <i>float</i>]
-<p style="text-indent: 5%">
-Specifies the eye separation in cm (distance between the cameras). Default: 6.3 cm.</p>
-<b>CameraLayout</b> [value: <i>"OffAxis", Linear", "Circular"</i>]
-<p style="text-indent: 5%">
-Specifies the camera layout. The default value is OffAxis in (auto-)stereo modes, ignored in mono mode.</p>
-<b>ViewDistance</b> [value: <i>integer</i>]
-<p style="text-indent: 5%">
-Specifies the distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC.</p>
-
-<b>Output8bit</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether 10 bit textures should be converted to 8 bit before GPU upload or use as is. Default is no if screen supports 10 bpp, yes otherwise.</p>
-
-<b>VRDefaultFOV</b> [value: <i>float</i>]
-<p style="text-indent: 5%">
-Default field of view for VR 360. Default is PI/2.</p>
-
-<b>TileVisibilityTest</b> [value: <i>int1-int2</i>]
-<p style="text-indent: 5%">
-Sets the number of points to test for tile visibility to int1, and consider the tile visible if more than int2 points are visible. Default is 30-0.</p>
-
-<b>SimulateGaze</b> [value: <i>yes,no</i>]
-<p style="text-indent: 5%">
-Uses the mouse to simulate gazing direction on the display for quality adaptation. Default is no.</p>
-
-<b>TileVisibilityDebug</b> [value: <i>yes,no</i>]
-<p style="text-indent: 5%">
-Enables tiles visibility debugging. This disables the tile having full coverage of the SRD, only displaying sub tiles. Default is no.</p>
-
-<b>TileVisibilityForced</b> [value: <i>yes,no</i>]
-<p style="text-indent: 5%">
-Forces tiles visibility. All tiles will be considered as visible, regardless the current viewpoint. Default is no.</p>
-
-<br/><br/>
-
-<a name="Audio"></a>
-<span style="text-decoration: underline;"><b>Section "Audio"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Audio" section of the config file holds all configuration options for the audio rendering engine and hardware.</p>
-<b>DriverName</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the driver to use for audio rendering. This driver cannot be reloaded at run-time, the complete system must be restarted.</p>
-<b>ForceConfig</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Forces a given sound card configuration to be used. If not set the sound card will be setup to use 2 audio buffers of 1024 samples each. 
-This may not work properly on some audio cards due to hardware latency, therefore forcing the config may be very usefull.</p>
-<b>NumBuffers</b> [value: <i>positive integer, 0 forbidden</i>]
-<p style="text-indent: 5%">
-When config is forced, specifies the number of audio buffers to allocate (audio buffers are played in ring).</p>
-<b>TotalDuration</b> [value: <i>positive integer, 0 forbidden</i>]
-<p style="text-indent: 5%">
-When config is forced, specifies the total audio buffer size in milliseconds. Be aware that the longer the audio buffer is, the longer the audio latency will be when pausing an 
-audio object. The quality of fast forward audio playback will also be degradated when using large audio buffers.</p>
-<b>NoResync</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Disables audio resynchronization: audio data is never dropped but may get out of sync.</p>
-<b>DisableMultiChannel</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Disables audio multichannel output and always downmix to stereo. This may be usefull if the multichannel output behaves weirdly.</p>
-<b>DisableNotification</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Disables usage of audio buffer notifications when supported (currently only DirectSound supports it). If DirectSound audio sounds weird try without notifications.</p>
-<b>Volume</b> [value: integer (0-100)]
-<p style="text-indent: 5%">
-Default audio volume used when launching GPAC.</p>
-<b>Pan</b> [value: integer (0-100)]
-<p style="text-indent: 5%">
-Default audio stereo balance used when launching GPAC - 0 for full left, 100 for full right, 50 for balanced.</p>
-<b>Filter</b> [value: string]
-<p style="text-indent: 5%">
-Defines a set of audio filters. Audio filters are declared as a list of strings separated with ";;". The exact syntax of the string is filter specific.</p>
-
-<b>ForceFrequency</b> [value: integer]
-<p style="text-indent: 5%">
-Force audio output frequency. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).</p>
-<b>ForceChannels</b> [value: integer]
-<p style="text-indent: 5%">
-Force audio output channels. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).</p>
-<b>ForceLayout</b> [value: hexa integer]
-<p style="text-indent: 5%">
-Force audio output frequency. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).</p>
-<b>ForceBPS</b> [value: integer]
-<p style="text-indent: 5%">
-Force audio output bits per sample. Set to 0 (default) for dynamic reconfiguration of all params (freq, ch, layout and bps).</p>
-
-<br/><br/>
-
-<a name="Video"></a>
-<span style="text-decoration: underline;"><b>Section "Video"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Video" section of the config file holds all configuration options for the video renderer and hardware.</p>
-<b>DriverName</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the driver to use for video memory access. This driver cannot be reloaded at run-time, the complete system must be restarted.</p>
-<b>SwitchResolution</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies fullscreen resolution mode. If enabled, selects smallest video resolution larger than scene size, otherwise use current video resolution.</p>
-<b>HardwareMemory</b> [value: <i>"Auto" "Always" "Never"</i>]
-<p style="text-indent: 5%">
-Only valid for 2D renderer. Specifies if main video backbuffer is always on hardware, always on system memory or selected by GPAC (default mode). Depending on the scene type, this may drastically change the playback speed.</p>
-<b>DisableColorKeying</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Only valid for 2D renderer. Specifies if partial overlays should be disabled. If not disabled, hardware color keying for overlays is tested and used if present. Otherwise, only the top-most video with no overlapping objects will be drawn using overlays. Default value is "no".</p>
-<b>UseGLDoubleBuffering</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if OpenGL double buffering shall be used. Default is "no".</p>
-<b>GLNbBitsPerComponent</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the number of bits per color component. Default is 5.</p>
-<b>GLNbBitsDepth</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the number of bits for the depth buffer. Default is 16.</p>
-<b>X113DOffscreenMode</b> [value: <i>"Window" "VisibleWindow" "Pixmap"</i>]
-<p style="text-indent: 5%">
-Specifies the type of OpenGL offscreen rendering in X11. Default mode is "Pixmap".</p>
-<ul>
-<li><i>"Window"</i>: A hidden window is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work.</li>
-<li><i>"VisibleWindow"</i>: A visible window is used to perform offscreen rendering. This can be usefull while debugging.</li>
-<li><i>"Pixmap"</i>: An X11 Pixmap is used to perform offscreen rendering. Depending on your video driver and X11 configuration, this may not work and can even crash the player.</li>
-</ul>
-
-
-<br/><br/>
-<a name="Network"></a>
-<span style="text-decoration: underline;"><b>Section "Network"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Network" section of the config file holds all configuration options for the network used by modules and systems engine.</p>
-<b>AutoReconfigUDP</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if network manager shall reconnect a scene if UDP is not present.</p>
-<b>DataTimeout</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies timeout in ms befor initial media buffering aborts. Default terminal value is 20000 (20 seconds).</p>
-<b>UDPNotAvailable</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if UDP traffic is not available. This is automatically set by GPAC if <i>AutoReconfigUDP</i> is set.</p>
-<b>UDPTimeout</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies timeout in ms for initial UDP detection. Once a UDP packet is recieved the timeout is ignored.</p>
-<b>BufferLength</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the length of the decoding buffer in milliseconds. The client will wait for the buffer to be filled before starting decoding. A module may decide to use a different value based on protocol and network jitters. </p>
-<b>RebufferLength</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies rebuffering length of the decoding buffer in milliseconds. Whenever the decoding buffer fullness is less than this value, the object clock is paused and 
-the stream rebuffered till BufferLength. Therefore a value of 0 means no rebuffering. A module may decide to use a different value based on protocol and network jitters.
-</p>
-<b>BufferMaxOccupancy</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies maximum buffer occupancy for buffer regulation. Corresponds to the max amount of data to be prefetch. Any value less than BufferLength will be forced to BufferLength.
-</p>
-
-<b>LowLatencyBufferMax</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the maximum buffer level for low latency mode, in ms. If media buffer max is above this value, full buffering will be done (clock resume at first frame displayed). Default value is 500 ms.</p>
-</p>
-<b>MobileIP</b> [value: <i>IP Address</i>]
-<p style="text-indent: 5%">
-Specifies a Mobile IP interface overriding the default IP. If set, all sockets will be locally bound to this IP address.</p>
-</p>
-<b>DefaultMCastInterface</b> [value: <i>IP Address</i>]
-<p style="text-indent: 5%">
-Specifies a default IP interface for Multicast overriding the default IP.If not set, the multicast will be setup using the default IP. </p>
-</p>
-<b>HTTPRebuffer</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the default HTTP rebuffer time in ms. When playback position reaches download position, playback will be paused if this integer is not zero. Playback will resume once the HTTPRebuffer ms of playback are available. Default value is 5000 ms.</p>
-</p>
-<b>HTTPAutoRebuffer</b> [value: <i>"yes", "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether auto rebuffering is used. When auto-rebuffering is used, playback only resumes when estimated time to download the rest of the movie is less than remaining time of the playback. Default value is no.</p>
-</p>
-
-
-
-<br/><br/>
-<a name="FontEngine"></a>
-<span style="text-decoration: underline;"><b>Section "FontEngine"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "FontEngine" section of the config file holds all configuration options for the font handling. The GPAC rendering module handles text through vectorial outline, allowing graphics module development without having to 
-integrate text rendering which is always heavy work.</p>
-<b>FontReader</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the module to use for font handling. This module cannot be reloaded at run-time, GPAC must be restarted.</p>
-<b>WaitForFontLoad</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Forces to wait for SVG fonts to be loaded before displaying frames - default is "no".</p>
-<b>FontDirectory</b> (value: <i>path to TrueType (*.ttf, *.ttc) font directory</i>]
-<p style="text-indent: 5%">
-Specifies the directory where fonts are located - currently only one directory can be specified (however nothing stops a font module from using a private directory).
-<br/><i>Note:</i>
-The freetype module will scan the entire sub-directories for fonts.
-</p>
-<b>FontSerif</b> [value: <i>string</i>]}: specifies default SERIF font.<br/>
-<b>FontSans</b> [value: <i>string</i>]}: specifies default SANS font.<br/>
-<b>FontFixed</b> [value: <i>string</i>]}: specifies default fixed font.<br/>
-<br/>
-<i>Note:</i><br/>
-The FreeType module uses this section to cache familly names to font file name associations.
-
-
-<br/><br/>
-<a name="Downloader"></a>
-<span style="text-decoration: underline;"><b>Section "Downloader"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Downloader" section of the config file holds all configuration options for file downloading and caching.</p>
-<b>CleanCache</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether downloaded files shall be removed once used.</p>
-<b>DisableCache</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether HTTP caching instructions are disabled or not.</p>
-<b>AllowOfflineCache</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-When enabled, allows HTTP request to use cached file if any when network is not available.</p>
-<b>MaxRate</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies a maximum data rate in kilo bits per seconds for file downloading. This is used for simulation purposes. A value of 0 means no rate restriction.</p>
-<b>UserAgent</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies an alternate user agent (default one is "GPAC $VERSION").</p>
-<b>HTTPHeadTimeout</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies timeout in milliseconds before considering HEAD request failed. 0 means no HEAD request is issued, only GET.</p>
-<b>AllowBrokenCertificate</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-If set to yes, ignores invalid certificates and process anyway. Default is no.</p>
-
-<br/><br/>
-<a name="HTTPProxy"></a>
-<span style="text-decoration: underline;"><b>Section "HTTPProxy"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "HTTPProxy" section of the config file holds configuration option for HTTP proxy adressing. Currently only one proxy can be enabled, and no URI selection is done.</p>
-<b>Enabled</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether the proxy should be used or not when downloading files.</p>
-<b>Name</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the proxy name (IP address or resolved name) without protocol identifier (eg, no "http://"). If not present, the proxy is disabled.</p>
-<b>Port</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the port to use with the proxy. If no port is specified, the default HTTP port (80) is used.</p>
-
-<br/><br/>
-<a name="Streaming"></a>
-<span style="text-decoration: underline;"><b>Section "Streaming"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Streaming" section of the config file holds all configuration options for real-time streaming using IETF SDP/RTSP/RTP/RTCP protocols.</p>
-<b>DefaultPort</b> [value: <i>unsigned short</i>]
-<p style="text-indent: 5%">
-Specifies the default port to use when connecting to a server (ignored if a port is specified in the url) if the port is 80 or 8080 (HTTP), the client will connect to the 
-RTSP server through an HTTP tunnel, and transport will take place on the RTSP connection.</p>
-<b>ReorderSize</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Size of the RTP reordering buffer - 0 means no reordering. Ignored when transport takes place on the RTSP connection. The bigger this value, the longer the reordering delay will be.</p>
-<b>RTPoverRTSP</b> [value: <i>"yes" "no" "OnlyCritical"</i>]
-<p style="text-indent: 5%">
-Specifies whether RTP packets should be carried on the RTSP connection (TCP or UDP), or carried on UDP. If the connection port is an HTTP port, this value is assumed to be true. If set to <i>OnlyCritical</i>, transport will take place on TCP only if a critical media (eg, neither audio nor video) is found in the session.</p>
-<b>RTSPTimeout</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies connection timeout with the server: an RTSP request is considered as failed when the timeout expires.</p>
-<b>ForceFirstPort</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies first port for RTP channels. If not set, the default first port used by GPAC is 7040.</p>
-<b>NATKeepAlive</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the maximum inactivity period in milliseconds for RTP sockets. If no data is received after this period, an empty RTP packet will be sent in order to keep any NAT alive. If 0 (default), disables NAT keep-alive packets.</p>
-<b>ForceMulticastIP</b> [value: <i>IP4 or IP6 address</i>]
-<p style="text-indent: 5%">
-Forces the specified multicast address to be used instead of the regular unicast. Note that some servers may not support multicast initiation by the client.</p>
-<b>ForceMulticastTTL</b> [value: <i>Positive integer</i>]
-<p style="text-indent: 5%">
-Indicates the TTL to use when the client initiates the multicast. Default value is 127.</p>
-<b>FirstPacketDrop</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the sequence number of the first RTP packet to be droped - 0 means no packet drop. Used for packet drop simulation tests.</p>
-<b>PacketDropFrequency</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the frequency at which SL packets are droped. If value is 20, one packet every 20 recieved packets will be droped. Used for packet drop simulation tests.</p>
-
-<br/><br/>
-
-<a name="MimeTypes"></a>
-<span style="text-decoration: underline;"><b>Section "MimeTypes"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>This section is used to keep MIME types and file associations for GPAC modules.
-<br/>The format of the key is:
-<br/><span style="text-align: center"><i>mimeType</i>=<b>"</b>fileExt1 filexExt2 .. filexExtN<b>"</b> <b>"</b>MimeType description<b>"</b> ModuleName </span>
-<br/>
-The description is used for GUI purposes (open file dialogs). You may modify the file extension list to support your own extensions. 
-MIME Type is always checked when processing a remote ressource (eg http file) in order to load the appropriated modules. 
-If MIME type is not available, provided extensions are first checked, then all input modules are queried.
-</p>
-
-<br/><br/>
-
-<a name="StreamingCache"></a>
-<span style="text-decoration: underline;"><b>Section "StreamingCache"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "StreamingCache" section of the config file holds all configuration options for the streaming cache. Streaming cache allows for recording of 
-live sources such as RTP/RTSP sessions and internet radios. This is currently just an experimental feature in GPAC.</p>
-<b>RecordDirectory</b> [value: <i>path</i>]
-<p style="text-indent: 5%">
-Specifies path for recorded files. Cached data is written directly to disk (no re-interleaving or similar processes).
-If not specified, the default cache directory (cf <a href="#General">General</a>) is used.</p>
-<b>BaseFileName</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the base name for recorded files. If not present in configuration file, the service name (URL) is used.</p>
-<b>KeepExistingFiles</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies if cached files with same name should be kept or not. If not, an integer number is added to the cached file name, the higest number for the latest file.</p>
-	
-<br/><br/>
-
-<a name="SAXLoader"></a>
-<span style="text-decoration: underline;"><b>Section "SAXLoader"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "SAXLoader" section of the config file holds all configuration options for XML SAX parsing of SVG, XMT and X3D files.</p>
-<b>Progressive</b> [value: <i>"yes" "no" "DOM"</i>]
-<p style="text-indent: 5%">Specifies XML parsing mode used by different file loaders using the SAX parser.</p>
-<ul>
-<li><i>"yes"</i>: SAX parsing is used with progressive loading of the document.</li>
-<li><i>"no"</i>: SAX parsing is used, document will first be completely downloaded.</li>
-<li><i>"DOM"</i>: DOM parsing is used, document will first be completely downloaded. Only supported by libXML2 plugin, otherwise handled as "no".</li>
-</ul>
-<b>MaxDuration</b> [value <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the maximum amount of time the SAX parser should spent loading a portion of the document. Only used with SAX Progressive mode</p>
-	
-<br/><br/>
-
-<a name="XviD"></a>
-<span style="text-decoration: underline;"><b>Section "XviD"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "XviD" section of the config file holds all configuration options for the XviD codec.</p>
-<b>PostProc</b> [value: <i>"FilmEffect" "Deblock_Y" "Deblock_UV"</i>]
-<p style="text-indent: 5%">
-Specifies filters to apply when decoding video. The string is a list of filters separated with a space character.</p>
-<ul>
-<li><i>"FilmEffect"</i>: xvid 1.0.0 filmEffect.</li>
-<li><i>"Deblock_Y"</i>: Y plane deblocking filter.</li>
-<li><i>"Deblock_UV"</i>: UV plane deblocking filter.</li>
-</ul>
-<b>Threaded</b> [value <i>"yes" "no"</i>]
-<p style="text-indent: 5%">Specifies whether the decoder should run in its own thread or not.</p>
-	
-<br/><br/>
-
-<a name="FFMPEG"></a>
-<span style="text-decoration: underline;"><b>Section "FFMPEG"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "FFMPEG" section of the config file holds all configuration options for the FFMPEG demuxer and decoder.</p>
-<b>DataBufferMS</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the amount of video/audio data (in milliseconds) to be bufferer before starting decoding. For developpers only.</p>
-<b>IOBufferSize</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-Specifies the size (in bytes) of the buffer used to fecth data from network (http playback only). Default size is 8192 bytes.</p>
-
-<br/><br/>
-
-<a name="ISOReader"></a>
-<span style="text-decoration: underline;"><b>Section "ISOReader"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "ISOReader" section of the config file holds all configuration options for the ISO Media File demuxer.</p>
-<b>IgnoreMPEG-4ForBrands</b> [value: <i>Full 4CC or 4CC pattern (abc* ab*)</i>]
-<p style="text-indent: 5%">
-Ignores all MPEG-4 systems tracks and IOD for files showing the listed brands in their compatible brand list.</p>
-
-<br/><br/>
-
-<a name="DVB"></a>
-<span style="text-decoration: underline;"><b>Section "DVB"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "DVB" section of the config file holds all configuration options for DVB playback on GNU/Linux systems.</p>
-<b>ChannelsFile</b> [value: <i>Absolute file path</i>]
-<p style="text-indent: 5%">
-Specifies the DVB channels configuration file as produced by dvbtools' scan util.</p>
-
-<br/><br/>
-
-<a name="DASH"></a>
-<span style="text-decoration: underline;"><b>Section "DASH"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "DASH" section of the config file holds all configuration options for DASH or HLS/M3U8 playback.</p>
-<b>KeepFiles</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Specifies whether downloaded files should not be deleted.</p>
-<b>AutoSwitchCount</b> [value: <i>positive integer</i>]
-<p style="text-indent: 5%">
-For debug purposes, instructs the player to switch representation every N segments. If 0 (default), switching is disabled.</p>
-<b>BufferingMode</b> [value: <i>segments, minBuffer, none</i>]
-<p style="text-indent: 5%">
-Selects buffer mode:
-<ul> 
-<li>segments: buffers complete segments as indicated in MPD before handing them to the player.</li>
-<li>minBuffer: asks the player to buffer media for the time indicated in the MPD, but segments are not pre-buffered. Default mode.</li> 
-<li>none: uses the  player settings for buffering.</li> 
-</ul>
-</p>
-<b>NetworkAdaptation</b> [value: <i>disabled, bandwidth, buffer, BBA-0, BOLA_FINITE, BOLA_BASIC, BOLA_U, BOLA_O</i>]
-<p style="text-indent: 5%">
-Sets automatic adaptation logic mode:
-<ul>
-<li>disabled: no adaptation to network condition is used.</li>
-<li>bandwidth: network adaptation is based only on available download rate.</li> 
-<li>buffer: network adaptation is based on available download rate for quality increase and buffer levels for quality drops. Default mode.</li> 
-<li>Other values: use algorithms as defined in their respective papers.</li> 
-</ul>
-
-</p>
-<b>MemoryStorage</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Files are only stored in memory and destroyed after playback, no disk IO is used. Default is yes</p>
-<b>UseMaxResolution</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Forces the player to set the output video resolution to the max resolution available instead of resizing the window. Default is yes</p>
-<b>UseScreenResolution</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Disables all resolutions that are higher than the screen resolution. Default is yes</p>
-<b>StartRepresentation</b> [value: <i>minBandwidth, maxBandwidth, maxBandwidthTiles, minQuality, maxQuality</i>]
-<p style="text-indent: 5%">
-Instructs the DASH client to start playing the indicated representation before doing any switching. Default is minBandwidth.
-<i>maxBandwidthTiles</i> selects the highest bandwidth for tiles with high priority and lowest for other tiles, whereas <i>maxBandwidth</i> selects the highest bandwidth for tiles with high priority and closest lower bandwidth for other tiles.
-</p>
-<b>InitialTimeshift</b> [value: <i>positive integer </i> ]
-<p style="text-indent: 5%">
-If between 0 and 100, indicates the percentage of the timeshift buffer when starting playback.<br/> 
-If more than 100, indicates the number of milliseconds to rewind in the timeshift buffer when starting playback. <br/>
-Default is 0 to tune to the live point.</p>
-<b>LowLatency</b> [value: <i>always, chunk, no</i>]
-<p style="text-indent: 5%">
-Sets low-latency mode enabled. In low-latency mode, media data is parsed as soon as possible while segment is being downloaded. Default is no.
-If chunk is selected, media data is re-parsed at each HTTP 1.1 chunk end. If always is selected, media data is re-parsed as soon as HTTP data is received.</p> 
-<b>AllowAbort</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Enables aborts of HTTP transfer when rate gets too low. This imply data loss and may also result in a connection loss. Default is no.</p>
-<b>UseServerUTC</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Enables using <i>Server-UTC</i> HTTP header to compensate any drift between client and server. Default is yes.</p>
-<b>DebugAdaptationSet</b> [value: <i>integer</i>]
-<p style="text-indent: 5%">
-Plays only the adaptation set indicated by its index in the MPD. If index is negative, all sets are used (default mode).
-</p>
-<b>TimeBetween404</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Sets how many millisconds to wait between two 404 on the same segment. Default is 500. 
-</p>
-<b>SegmentExpirationThreshold</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Sets how many millisconds to wait after the segment AvailabilityEndDate before considering the segment lost. Default is 100. 
-</p>
-<b>ThreadedDownload</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-Enables threade download of media segments. When low latency mode is used, this option is forced to yes. Default is no. 
-</p>
-<b>SpeedAdaptation</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-Enables adaptation based on playback speed. Default is no. 
-</p>
-<b>SwitchProbeCount</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Sets 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. 
-Default value is 1.
-</p>
-<b>AgressiveSwitching</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-If yes, switching targets to the closest bandwidth fitting the available download rate. If no, switching targets the lowest bitrate representation that is above the currently played (eg does not try to switch to max bandwidth). Default value is no.
-</p>
-<b>TileAdaptation</b> [value: <i>none, rows, reverseRows, middleRows, columns, reverseColumns, middleColumns, center</i>]
-<p style="text-indent: 5%">
-Selects how bitrate is shared across tiles of a video:
-<ul> 
-<li>none: bitrate is shared equaly accross all tiles (default).</li>
-<li>rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row.</li> 
-<li>reverseRows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row.</li> 
-<li>middleRows: bitrate decreased for top and bottom rows only, same rate for each tile on the row.</li> 
-<li>columns: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns.</li> 
-<li>reverseColumns: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns.</li> 
-<li>middleColumns: bitrate decreased for left and right columns only, same rate for each tile on the columns.</li> 
-<li>center: bitrate decreased for all tiles on the edge of the picture.</li> 
-<li>edges: bitrate decreased for all tiles on the center of the picture.</li> 
-</ul>
-</p>
-<b>TileRateDecrease</b> [value: <i>percentage</i>]
-<p style="text-indent: 5%">
-Indicates 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.
-Default is 100.</p>
-
-<b>UTCShiftATSC</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Indicates the amount of ms to delay requests for ATSC broadcast. Default value is 1000.</p>
-
-<b>IgnoreXLink</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-Indicates if periods with both xlink and adaptation sets specified should resolve the xlink. Default value is yes.</p>
-
-<b>NoContinuity</b> [value: <i>yes no</i>]
-<p style="text-indent: 5%">
-Disabled period continuity playback (forces flushing all content before next period). Period continutity is only implemented for unmultiplexed files. Default value is no.</p>
-
-<b>XLinkQuery</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies a query parameter (without initial '?') to append to xlink on periods. Default value is no value.</p>
-
-<br/><br/>
-
-<a name="ALSA"></a>
-<span style="text-decoration: underline;"><b>Section "ALSA"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "ALSA" section of the config file holds all configuration options of the ALSA audio output module on GNU/Linux systems.</p>
-<b>DeviceName</b> [value: <i>string</i>]
-<p style="text-indent: 5%">
-Specifies the ALSA device to use. Default device is "hw:0,0".</p>
-
-<br/><br/>
-
-<a name="StreamingText"></a>
-<span style="text-decoration: underline;"><b>Section "StreamingText"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "StreamingText" section of the config file holds all configuration options for the 3GPP/MPEG-4 Streaming Text decoder.</p>
-<b>UseTexturing</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether the text shall be drawn using an intermediate texture or not.<<b>OutlineText</b> [value: <i>"yes" "no"</i>]
-<p style="text-indent: 5%">
-Specifies whether the text shall be drawn with a black thin outline or not.</p>
-
-
-<br/><br/>
-
-<a name="SHORTCUTS"></a>
-<span style="text-decoration: underline;"><b>Section "Shortcuts"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>The "Shortcuts" section of the config file holds all shortcuts in GPAC. You can define a shorcut for an action as:<br> 
-'action'='keyname' or 'action'='ctrl+keyname' or 'action'='alt+keyname' or "='action'='ctrl+alt+keyname'<br> 
-Shift is not supported as a key modifier, and case is insensitive. 
-Currently defined actions are as follows:</p>
-<b>Play</b> or <b>Pause</b> <br/>
-<b>Stop</b> <br/>
-<b>Step</b> <br/>
-<b>Exit</b> <br/>
-<b>Mute</b> <br/>
-<b>VolumeUp</b> <br/>
-<b>VolumeDown</b> <br/>
-<b>JumpForward</b> <br/>
-<b>JumpBackward</b> <br/>
-<b>JumpStart</b> <br/>
-<b>JumpEnd</b> <br/>
-<b>FastForward</b> <br/>
-<b>FineForward</b> <br/>
-<b>SlowForward</b> <br/>
-<b>FastRewind</b> <br/>
-<b>FineRewind</b> <br/>
-<b>SlowRewind</b> <br/>
-<b>Next</b> <br/>
-<b>Previous</b> <br/>
-
-<br/><br/>
-
-<a name="DSMCC"></a>
-<span style="text-decoration: underline;"><b>Section "DSMCC"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "DSMCC" section of the config file holds the configuration option for the processing of DSMCC data.
-</p>
-<b>Activated</b> [value: <i>"true"</i> <i>"false"</i>]
-<p style="text-indent: 5%">
-Specifies if the DSMCC data will be processed (true). It implies creations of directories and files in the temp directory.</p>
-
-
-<br/><br/>
-
-<a name="OpenHEVC"></a>
-<span style="text-decoration: underline;"><b>Section "OpenHEVC"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The openHEVC section of the config file holds the configuration option for the OpenHEVC decoder.
-</p>
-<b>NumThreads</b> [value: unsigned integer]
-<p style="text-indent: 5%">
-Specifies the number of threads to allocate to the OpenHEVC decoder. Default is the number of detected cores minus one, or one if core detection fails.</p>
-<b>ThreadingType</b> [value: <i>frame</i> , <i>wpp</i> , <i>frame+wpp</i> ]
-<p style="text-indent: 5%">
-Specifies the threading type for the openHEVC decoder. Default is frame (wpp disabled).</p>
-<b>CBUnits</b> [value: <i>unsigned integer</i> ]
-<p style="text-indent: 5%">
-Specifies the number of decoded frames in memory before display. Default value is 4.</p>
-<b>PackHFR</b> [value: <i>yes</i>, <i>no</i> ]
-<p style="text-indent: 5%">
-Packs 4 consecutive frames in a single 4x frame.</p>
-
-<b>ResetAtReinit</b> [value: <i>yes</i>, <i>no</i> ]
-<p style="text-indent: 5%">
-Destroys and recreates the decoder whenever a layer is restarted (base or enhancement). Default is no, but openHevc may need this depending on version/branch/platform.</p>
-
-
-<br/><br/>
-
-<a name="DirectFB"></a>
-<span style="text-decoration: underline;"><b>Section "DirectFB"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "DirectFB" section of the config file holds the configuration options for the DirectFB output module. You may also  want to check the <a href="http://directfb.org/wiki/index.php/Configuring_DirectFB">official documentation</a>.
-</p>
-<b>DisableAcceleration</b> [value: <i>"yes"</i> <i>"no"</i>]
-<p style="text-indent: 5%">
-Forces to disable hardware acceleration.</p>
-<b>DisableDisplay</b> [value: <i>"yes"</i> <i>"no"</i>]
-<p style="text-indent: 5%">
-Specifies the DisableDisplay parameter value.</p>
-<b>FlipSyncMode</b> [value: <i>"waitsync"</i> <i>"wait"</i> <i>"sync"</i> <i>"swap"</i>]
-<p style="text-indent: 5%">
-Specifies the flip sync mode.</p>
-<b>DisableBlit</b> [value: <i>"yes"</i> <i>"no"</i>]
-<p style="text-indent: 5%">
-Forces to disable hardware blitting.</p>
-<b>WindowMode</b> [value: <i>"X11"</i> <i>"SDL"</i>]
-<p style="text-indent: 5%">
-Specifies the underlying windowing library.</p>
-
-
-<br/><br/>
-
-<a name="DektecVideo"></a>
-<span style="text-decoration: underline;"><b>Section "DektecVideo"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "DektecVideo" section of the config file holds the configuration options for the Dektec SDI video output module.</a>
-</p>
-<b>CardSlot</b> [value: <i>int:int</i>]
-<p style="text-indent: 5%">
-Specifies the bus bus number (first int) and slot id (second int) of the card. If not present, the module will look for DTA-2174 and DTA-2154.</p>
-<b>SDIOutput</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-Specifies the output port of the card. Default value is 1.</p>
-<b>FrameRate</b> [value: <i>float</i>]
-<p style="text-indent: 5%">
-Specifies the output frame rate for the card. If not present (default), the compositor output frame rate will be used.</p>
-<b>ClipSDI</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Indicates if YUV data shall be clipped to valid SDI range or left untouched. Default is yes.</p>
-
-<br/><br/>
-
-<a name="M2TS"></a>
-<span style="text-decoration: underline;"><b>Section "M2TS"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "M2TS" section of the config file holds configuration options for MPEG-2 TS demultiplexer module.</a>
-</p>
-<b>ForceTEMILocation</b> [value: <i>URL string</i>]
-<p style="text-indent: 5%">
-Overrides the URL in TEMI location descriptor with the specified value.</p>
-<b>RecordTo</b> [value: <i>file path</i>]
-<p style="text-indent: 5%">
-Records the TS content to the specified file.</p>
-<b>UDPBufferSize</b> [value: <i>unsigned integer</i>]
-<p style="text-indent: 5%">
-UDP buffer size for the socket. Default value is a few hundred kilobytes depending on the platform.</p>
-
-<a name="RAW"></a>
-<span style="text-decoration: underline;"><b>Section "RAWVideo"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "RAWVideo" section of the config file holds configuration options for Raw video and audio output module.</a>
-</p>
-<b>RawOutput</b> [value: <i>"null" or any string</i>]
-<p style="text-indent: 5%">
-If set to <i>null</i> string, the raw output does nothing (no bliting calls, no backbuffer) - used for bench mode only.</p>
-<b>PixelFormat</b> [value: <i>555, 565, rgb, bgr, rgb32, bgr32, rgba, argb</i>]
-<p style="text-indent: 5%">
-Sets the output video format of the raw module, mostly used for testing. The default format is rgb.</p>
-
-<a name="NVDec"></a>
-<span style="text-decoration: underline;"><b>Section "NVDec"</b></span> <i><a href="#Overview">Back to top</a></i>
-<p>
-The "NVDec" section of the config file holds configuration options for NVidia hardware decoding module.</a>
-</p>
-<b>NumSurfaces</b> [value: <i>integer</i>]
-<p style="text-indent: 5%">
-Sets the number of decoded surface for the decoder. Default is 20.</p>
-<b>DisableGL</b> [value: <i>yes, no</i>]
-<p style="text-indent: 5%">
-Disables hardware decoder to opengl transfer on GPU (and forces GPU->CPU->GPU memory). Default is no.</p>
-<b>UnloadInactive</b> [value: <i>no, destroy, reuse</i>]
-<p style="text-indent: 5%">
-Enables unloading inactive decoders to free GPU resources (usefull for tiling VR). <i>no</i> disables unloading, <i>destroy</i> kills the decoder, <i>reuse</i> reassigns the HW decoder to another object (still buggy). Default is no.</p>
-<b>PreferMode</b> [value: <i>cuvid, dxva, cuda</i>]
-<p style="text-indent: 5%">
-Sets prefered mode for harware decoder. cuda should only be used for MPEG-1 and MPEG-2 video. Default is cuvid.</p>
-
-</body>
-</html>

gpac-0.8.0.tar.gz/doc/doxyfile Deleted

@@ -1,2433 +0,0 @@
-# Doxyfile 1.8.10
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = libgpac
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         =
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Documentation of the core library of GPAC. For more information, check out http://gpac.wp.mines-telecom.fr"
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           = ../tests/media/auxiliary_files/logo.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = NO
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
-# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
-# Fortran. In the later case the parser tries to guess whether the code is fixed
-# or free formatted code, this is the default for Fortran type files), VHDL. For
-# instance to make doxygen treat .inc files as Fortran files (default is PHP),
-# and .f files as C (default is Fortran), use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = YES
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = YES
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = NO
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = doxygen_warnings.txt
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ../include/gpac/
-
-# 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
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
-# *.vhdl, *.ucf, *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.mm \
-                         *.dox
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = ../include/gpac/nodes_mpeg4.h \
-				../include/gpac/nodes_svg.h \
-				../include/gpac/nodes_x3d.h \
-				../include/gpac/nodes_xbl.h \
-				../include/gpac/configuration.h \
-				../include/gpac/revision.h \
-				../include/gpac/ringbuffer.h \
-				../include/gpac/ait.h \
-				../include/gpac/dsmcc.h \
-				../include/gpac/dvb_mpe.h 
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = */doc/* \
-                         */tests/* \
-                         */build/* \
-                         */bin/* \
-                         */applications/* \
-                         */modules/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html-libgpac
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = ../include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = svg
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = YES
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 100
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES

gpac-0.8.0.tar.gz/doc/doxyfile-full Deleted

@@ -1,2321 +0,0 @@
-# Doxyfile 1.8.5
-# Doxyfile 1.8.5
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = GPAC
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "Open Source Multimedia Framework. For more information, check out http://gpac.wp.mines-telecom.fr"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
-# the documentation. The maximum height of the logo should not exceed 55 pixels
-# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
-# to the output directory.
-
-PROJECT_LOGO           = ..\regression_tests\auxiliary_files\logo.jpg
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = .
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
-# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
-# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
-# Turkish, Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = NO
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = 
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    = 
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = NO
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
-# new page for each member. If set to NO, the documentation of a member will be
-# part of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 8
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines.
-
-ALIASES                =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding "class=itcl::class"
-# will allow you to use the command class in the itcl::class meaning.
-
-TCL_SUBST              =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C.
-#
-# Note For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by by putting a % sign in front of the word
-# or globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = YES
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = YES
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. When set to YES local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO these classes will be included in the various overviews. This option has
-# no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = NO
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO the members will appear in declaration order. Note the this
-# will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
-# todo list. This list is created by putting \todo commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
-# test list. This list is created by putting \test commands in the
-# documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES the list
-# will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. Do not use file names with spaces, bibtex cannot handle them. See
-# also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO doxygen will only warn about wrong or incomplete parameter
-# documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           = doxygen_warnings.txt
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ../applications/mp4box \
-						 ../applications/mp4client \
-						 ../include  \
-						 ../src \
-						 ../modules
-
-# 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
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.mm \
-                         *.dox
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER ) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = NO
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html-gpac
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
-# defined cascading style sheet that is included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefor more robust against future updates.
-# Doxygen will copy the style sheet file to the output directory. For an example
-# see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the stylesheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler ( hhc.exe). If non-empty
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated (
-# YES) or that it should be included in the master .chm file ( NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated (
-# YES) or a normal table of contents ( NO) in the .chm file.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using prerendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavours of web server based searching depending on the
-# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-# searching and an index file used by the script. When EXTERNAL_SEARCH is
-# enabled the indexing and searching needs to be provided by external tools. See
-# the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer ( doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
-# replace them by respectively the title of the page, the current date and time,
-# only the current date, the version number of doxygen, the project name (see
-# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
-# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
-# Definitions (see http://autogen.sf.net) file that captures the structure of
-# the code including all documentation. Note that this feature is still
-# experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
-# in the source code. If set to NO only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES the includes files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = ../include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all refrences to function-like macros that are alone on a line, have an
-# all uppercase name, and do not end with a semicolon. Such function macros are
-# typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have an unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
-# class index. If set to NO only the inherited external classes will be listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
-# the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# If set to YES, the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font n the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = YES
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif and svg.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = svg
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = YES
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 3
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES

gpac-0.8.0.tar.gz/doc/gpac.mp4 Deleted

gpac-0.8.0.tar.gz/doc/ipmpx_syntax.bt Deleted

@@ -1,237 +0,0 @@
-#this is an example BT file for most supported IPMPX descriptors and data in MP4Box. 
-#Some of the IPMPX_Data used will likely never be sent on the wire (only sent through tools) but 
-#their coding is still supported
-#for XMT syntax, do as usual in gpac: MP4Box -xmt file.bt
-#As a general note, it is almost useless to try to use IPMPX without the spec :)
-#Please be aware that the IPMPX data described in this file is useless in terms of protection & IPMPX usage in MPEG-4 content, it is
-#just here for IPMPX encoding/decoding testing...
-
-InitialObjectDescriptor {
- esDescr [
-  ES_Descriptor {
-  	ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-   }
-  }
-  ES_Descriptor {
-  	ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
- ipmpDescr [
-	IPMP_Descriptor {
-		IPMP_DescriptorID	0xff
-		IPMPS_Type		0xffff
-		IPMP_DescriptorIDEx	69
-		IPMP_ToolID		123
-		controlPointCode	0x01 
-		sequenceCode		0x00
-	}
- ]
- toolListDescr IPMP_ToolListDescriptor {
-	ipmpTool [
-	 #GPAC DOES NOT support alternativeTools and ParametricDescription in IPMP_Tool yet !!
-	 IPMP_Tool {
-		IPMP_ToolID	128
-		ToolURL "http://gpac.sourceforge.net/ipmp/tools/gpac_decrypt"
-	 }
-  ]
- }
-}
-
-OrderedGroup {
-    children [
-		Sound2D {
-			source AudioSource {
-				url "myfile.avi#audio"
-			} 
-		}
-		Shape {
-			geometry Bitmap {}
-			appearance Appearance {
-				texture MovieTexture {
-					url "myfile.avi#video"
-				}
-			}
-		}
-	 ]
-}
-
-UPDATE IPMPDX [
-	IPMP_Descriptor {
-		IPMP_DescriptorID	0xff
-		IPMPS_Type		0xffff
-		IPMP_DescriptorIDEx	79
-		IPMP_ToolID		123
-		controlPointCode	0x01
-		sequenceCode		0x00
-		IPMPX_Data [
-			IPMP_KeyData {
-				#GPAC also accepts the syntax: keyBody "snclsdjlvksjdls" for IPMPX ByteArray in BT format. This is what will be used later on
-				keyBody {
-				  array  "keybody_bytearray"
-				}
-		    hasStartDTS		FALSE
-		    hasStartPacketID  	FALSE
-		    hasExpireDTS      	FALSE
-		    hasExpirePacketID	FALSE
-		    opaqueData "IPMPkey-opaquedata byte array"
-      }
-			IPMP_SecureContainer {
-				encryptedData "the encrypted data"
-				MAC "the mac data"
-			}
-			IPMP_InitAuthentication {
-				Context 32
-				AuthType 5
-			}
-			IPMP_MutualAuthentication {
-				candidateAlgorithms [
-					IPMP_AlgorithmDescriptor { regAlgoID 102 }
-					IPMP_AlgorithmDescriptor { regAlgoID 103 }
-				]
-				AuthenticationData "dbs,qbdjsqbxkjqsl"
-				
-				trustData IPMP_TrustSecurityMetadata {
-					trustedTools [
-						IPMP_TrustedTool {
-							toolID 1245
-							trustSpecifications [
-								IPMP_TrustSpecification {
-									attackerProfile 98
-									trustedDuration 123258
-								}
-							]
-						}
-					]
-				}
-				#the syntax here is a bit weird, the list of IPMPX_ByteArray is just the list of each array content. XMT syntax is cleaner
-				certificates [
-					"khdhskncksdnfk",
-					"vghjxdbjzhfkjerunxinqms"
-				]
-				publicKey IPMP_KeyDescriptor {
-					keyBody "key descriptor body data"
-			  }
-			  opaque "mutual authentication opaque data"
-			  authCodes "mutual authentication codes"
-			}
-			IPMP_ToolParamCapabilitiesQuery {
-				description IPMP_ParametricDescription {
-					majorVersion 2
-					minorVersion 1
-					descriptionComment "This is a parametric description"
-					descriptions [
-						IPMP_ParametricDescriptionItem {
-							class "encryption"
-							subClass "DES"
-							typeData "char"
-							type "algo"
-							addedData "fgsdjkjé"
-						}
-					]
-				}
-			}
-			IPMP_ToolParamCapabilitiesResponse {
-				capabilitiesSupported FALSE
-			}
-			IPMP_ConnectTool {
-				toolDescriptor IPMP_Descriptor {
-					IPMP_DescriptorID	0xff
-					IPMPS_Type		0xffff
-					IPMP_DescriptorIDEx	71
-					IPMP_ToolID		122
-					controlPointCode	0x01
-					sequenceCode		0x00
-				}
-			}
-			IPMP_DisconnectTool {
-				IPMP_ToolContextID 325
-			}
-			IPMP_GetToolContext {
-				scope 2
-				IPMP_DescriptorIDEx 127
-			}
-			IPMP_GetToolContextResponse {
-				OD_ID 10
-				ESD_ID 5
-				IPMP_ToolContextID 325
-			}
-			#eventType is a comma-separated list - this should not be needed for authoring, this msg is typically sent by loaded tools (runtime only)
-			IPMP_AddToolNotificationListener {
-				eventType "0,1,2"
-				scope 2
-			}
-			#eventType is a comma-separated list - this should not be needed for authoring, this msg is typically sent by loaded tools (runtime only)
-			IPMP_RemoveToolNotificationListener {
-				eventType "0,1,2"
-			}
-			IPMP_NotifyToolEvent {
-				OD_ID 10
-				ESD_ID 5
-				IPMP_ToolContextID 325
-				eventType 2
-			}
-			IPMP_CanProcess {
-			 canProcess TRUE
-			}
-			IPMP_RightsData {
-				rightsInfo "rightsdataarray"
-			}
-			IPMP_OpaqueData {
-				opaqueData "opaquedataarray"
-			}
-			IPMP_ToolAPI_Config {
-				Instantiation_API_ID 10
-				Messaging_API_ID 20
-				opaqueData "APIopaquedata"
-			}
-			IPMP_AudioWatermarkingInit {
-				inputFormat 0x01
-				requiredOp	2
-				nChannels 2
-				bitPerSample 16
-				frequency 44100
-				wmPayload "gduhxwksjkeochxb"
-			}
-			IPMP_SendAudioWatermark {
-				wm_status 0x01
-				compression_status	2
-				payload "gduhxwksjkeochxb"
-				opaqueData "op_wm"
-			}
-       IPMP_SelectiveDecryptionInit {
-				mediaTypeExtension 0
-				mediaTypeIndication 0x40
-				profileLevelIndication 0xF
-				compliance 1
-				SelectiveBuffers [
-					IPMP_SelectiveBuffer {
-						cipher_id 1233546
-						mode 123
-						blockSize 32
-						keySize 32
-					}
-					IPMP_SelectiveBuffer {
-						cipher_id 1233555
-						StreamCipher "jqsyjnxsq,hdkq"
-					}
-				]
-				SelectiveFields[
-					IPMP_SelectiveField {
-						field_id 12
-						field_scope 3
-						buf 1
-						#mappingTable is a comma-separated list of u16 integers
-						mappingTable "1,2,1,3,4,5"
-						shuffleSpecificInfo "shuffle_BA"
-					}
-				]
-       }
-		]
-	}
-]
-

gpac-0.8.0.tar.gz/doc/man Deleted

gpac-0.8.0.tar.gz/doc/man/dashcast.1 Deleted

@@ -1,161 +0,0 @@
-.TH DASHCAST "1" "July 2015" "DashCast" "GPAC"
-
-.SH NAME
-DashCast - MPEG-4 Systems Framework and Software Development Kit
-
-.SH SYNOPSIS
-.B DashCast
-.RI [options]
-
-.SH OPTIONS
-.SS "General options"
-.TP
-\fB\-log-file \fRfilename
-set output log file. Also works with -lf
-.TP
-\fB\-logs \fRLOGS
-set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX
-.TP
-\fB\-conf \fRfilename
-set the configuration file name (default: dashcast.conf)
-.TP
-\fB\-switch-source \fRfilename
-set the configuration file name for source switching
-
-.SS "Live options"
-.TP
-\fB\-live
-system is live and input is a camera
-.TP
-\fB\-live-media
-system is live and input is a media file
-.TP
-\fB\-no-loop
-system does not loop on the input media file when live
-.TP
-\fB\-dynamic-ast
-changes segment availability start time at each MPD generation (old behaviour but not allowed in most profiles)
-.TP
-\fB\-insert-utc
-inserts UTC clock at the start of each segment
-
-.SS "Source options"
-.TP
-\fB\-npts
-use frame counting for timestamps (not error-free) instead of source timing (default)
-.TP
-\fB\-av \fRstring
-set the source name for a multiplexed audio and video input.
-If this option is present, neither '-a' nor '-v' shall be present.
-.TP
-\fB\-v \fRstring
-set the source name for a video input.
-If input is from a webcam, use "/dev/video[x]" where x is the video device number.
-If input is the screen video, use ":0.0+[x],[y]" which captures from upper-left at x,y.
-If input is from stdin, use "pipe:".
-.TP
-\fB\-vf \fRstring
-set the input video format.
-To capture from a webcam, set video4linux2.
-To capture the screen, set x11grab.
-.TP
-\fB\-v4l2f \fRinv4l2f
-inv4l2f is the input format for webcam acquisition.
-It can be mjpeg, yuyv422, etc.
-.TP
-\fB\-pixf \fRFMT
-set the input pixel format
-.TP
-\fB\-vfr \fRN
-force the input video framerate
-.TP
-\fB\-vres \fRWxH
-force the video resolution (e.g. 640x480)
-.TP
-\fB\-vcrop \fRXxY
-crop the source video from X pixels left and Y pixels top. Must be used with -vres.
-.TP
-\fB\-a \fRstring
-set the source name for an audio input.
-If input is from microphone, use "plughw:[x],[y]" where x is the card number and y is the device number
-.TP
-\fB\-af \fRstring
-set the input audio format
-
-.SS "Output options"
-.TP
-\fB\-vcodec \fRstring
-set the output video codec (default: h264)
-.TP
-\fB\-vcustom \fRstring
-send custom parameters directly to the video encoder
-.TP
-\fB\-gdr
-use Gradual Decoder Refresh feature for video encoding (h264 codec only)
-.TP
-\fB\-gop
-specify GOP size in frames - default is framerate (1 sec gop)
-.TP
-\fB\-low-delay
-specify that low delay settings should be used (no B-frames, fast encoding)
-.TP
-\fB\-acodec \fRstring
-set the output audio codec (default: aac)
-.TP
-\fB\-acustom \fRstring
-send custom parameters directly to the audio encoder
-
-.SS "DASH options"
-.TP
-\fB\-seg-dur \fRdur:int
-set the segment duration in millisecond (default value: 1000)
-.TP
-\fB\-frag \fRdur:int
-set the fragment duration in millisecond (default value: 1000) (same as -frag-dur)
-.TP
-\fB\-seg-marker \fRmarker:4cc
-add a marker box named marker at the end of DASH segment
-.TP
-\fB\-out \fRoutdir:str
-outdir is the output data directory (default: output)
-.TP
-\fB\-mpd \fRmpdname:str
-mpdname is the MPD file name (default: dashcast.mpd)
-.TP
-\fB\-ast-offset \fRdur:int
-dur is the MPD availabilityStartTime shift in milliseconds (default value: 0)
-.TP
-\fB\-mpd-refresh \fRdur:int
-dur is the MPD minimumUpdatePeriod in seconds
-.TP
-\fB\-time-shift \fRdur:int
-dur is the MPD TimeShiftBufferDepth in seconds.
-The default value is 10. Specify -1 to keep all files.
-.TP
-\fB\-min-buffer \fRdur:float
-dur is the MPD minBufferTime in seconds (default value: 1.0)
-.TP
-\fB\-base-url \fRbaseurl:str
-baseurl is the MPD BaseURL
-
-.SH EXAMPLES
-DashCast -av test.avi -live-media
-.PP
-DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media
-.PP
-DashCast -vf video4linux2 -vres 1280x720 -vfr 24 -v4l2f mjpeg -v /dev/video0 -af alsa -a plughw:1,0 -live
-.PP
-DashCast -vf x11grab -vres 800x600 -vfr 25 -v :0.0 -live
-
-.SH BUGS and OTHER HELP
-For bug reports, more information on BT or XMT-A formats or GPAC TTXT files or ISMACryp,
-MPEG-4 Systems usage and more help on DashCast please visit the GPAC web site http://www.gpac.io
-
-.SH "AUTHORS"
-Arash Shafiei.
-Copyright \(co Telecom ParisTech 2000-2013.
-
-.SH "SEE ALSO"
-.BR GPAC (1),
-.BR MP4Box (1),
-.BR MP4Client (1)

gpac-0.8.0.tar.gz/doc/man/gpac.1 Deleted

@@ -1,447 +0,0 @@
-.TH "GPAC" 1 "May 2012" "GPAC Configuration" "GPAC Configuration"
-.
-.SH NAME
-.LP
-GPAC	\- MPEG-4 Systems Framework and Software Development Kit
-.SH "DESCRIPTION"
-.LP
-GPAC stands (does it ?) for GPAC Project on Advanced Content. It is an implementation of the MPEG-4 Systems standard written in ANSI C. GPAC provides tools for media playback, vector graphics and 3D rendering, MPEG-4 authoring and distribution.
-This man page is about configuration of the GPAC framework version 0.8.0.
-.
-.SH INTRODUCTION
-Some applications in the GPAC framework use a configuration file shared among modules and reloadable at run time. This file is located in the user home directory and called ".gpacrc".
-.LP
-The configuration file is based on the win32 .ini file model, ordered by sections and keys.
-.LP 
-A section is declared as 
-.B [SectionName]
-, a key is declared as
-.B keyName=value
-, the key value is not interpreted and always handled as ASCII text. Plugins may use the configuration file as well (to avoid multiple files).
-.LP
-.B Note on plugin names: 
-Plugin names as given in the configuration file are names exported by each interface and not name of the physical library file (.dll/.so ...).
-The physical file name can however be used to identify a plugin, it will be replaced by the interface name if the plugin was successfully loaded.
-.
-.
-.SH SECTION "General"
-.LP
-The "General" section holds generic, OS and player specific options. This section is not used by the GPAC Framework.
-.
-.TP
-.B ModulesDirectory (value: path)
-path to modules (plugins) location. The client cannot be loaded without modules. This option is used by all GPAC clients on all platforms
-.TP
-.B CacheDirectory (value: path)
-specifies location of temp files. This must be the absolute path to a directory with write access. Although not used by applications, this is used by several plugins.
-.LP
-The following options are defined for Osmo4/wxWidgets player.
-.TP
-.B Loop (value: yes, no)
-specifies whether the presentation has to be restarted when done playing.
-.TP
-.B ConsoleOff (value: yes, no)
-specifies whether application messages (script, buffering, download progress) are displayed in the console or not.
-.TP
-.B Browser (value: string)
-specifies prefered browser for WWW anchors and scene graph viewing - Only used by Osmo4/wxWidgets.
-.TP
-.B LookForSubtitles (value: yes, no)
-specifies if Osmo4 shall look for subtitle files when opening a presentation.
-.TP
-.B PLEntry (value: unsigned int)
-indicates active playlist entry when player was last closed. Playlist backup is ".gpac_pl.m3u", stored in user home directory.
-.TP
-.B StartupFile value: filename)
-specifies file to load upon startup of osmo4/MP4Client. If not specified, no file is loaded.
-.TP
-.B NoMIMETypeFetch (value: yes, no)
-specifies if the player has to check for mime type when following hyperlinks, or only follow links of known extensions.
-.TP
-.B LogFile (value: filename)
-specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client.
-.TP
-.B LogLevel (value: none, error, warning, info, debug)
-specifies the level of the log. By default, no log is performed.
-.TP
-.B LogTools (value: a ':'-separated list of the following values)
-specifies which set of tools from GPAC should be logged. Available tools are:
-.br
-core: libgpac core events.
-.br
-coding: bitstream formats (audio, video, scene).
-.br
-container: container formats (ISO File, MPEG-2 TS, AVI, ...).
-.br
-network: network data exept RTP trafic.
-.br
-rtp: rtp, rtcp and rtsp trafic.
-.br
-author : authoring tools (hint, import, export).
-.br
-sync: terminal sync layer.
-.br
-codec: terminal codec messages.
-.br
-parser: scene parsers (svg, xmt, bt) and other.
-.br
-media: terminal media object management.
-.br
-scene: scene graph and scene manager.
-.br
-script: scripting engine messages.
-.br
-compose: composition engine (events, etc).
-.br
-render: renderng engine (2D, 3D, etc).
-.br
-service: network service management.
-.br
-mmio: Audio/Video HW I/O management.
-.
-.SH SECTION "RecentFiles"
-.LP
-The "RecentFiles" section of the config file holds last accessed files (hardcoded to no more than 20) in the last access order. The keys are the file names and no value is used. This section is only used by GUI clients.
-.
-.SH SECTION "Systems"
-.LP
-The "Systems" section holds all configuration options for the MPEG-4 Systems engine. The following options are defined:
-.TP
-.B Language (value: 3-char code from ISO 639-2)
-specifies the user prefered language. This is used to select streams in case of alternate content in an audio object.
-.TP
-.B AlwaysDrawBIFS (value: yes, no)
-if set, late BIFS frame will still be drawn. If not set, the scene won't be redrawn until BIFS streams are back in sync. This is by default off to keep better sync, but may be changed when testing heavy content or slow renderers.
-.TP
-.B ForceSingleClock (value: yes, no)
-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/seek into.
-.br
-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. 
-.br
-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.
-.TP
-.B ThreadingPolicy (value: Free, Single, Multi)
-specifies how media decoders are to be threaded. 
-.br
-Free: lets decoders decide of their threading.
-.br
-Single: means that all decoders are managed in a single thread performing scheduling and priority handling.
-.br
-Multi: means that each decoder runs in its own thread.
-.TP
-.B Priority (value: low, normal, high, real-time)
-specifies the priority of the decoders (priority is applied to decoder thread(s) regardless of threading mode).
-.TP
-.B hardcoded_protos (value: list of strings separated by space)
-holds a list list of EXTERNPROTO URLs (NO OD_ID !!!) implemented in hard in the renderer - for development only.
-.TP
-.B NoVisualThread (value: yes, no)
-specifies whether the visual rendering is done in the main codec manager or in a dedicated thread.
-.TP
-.B DefAudioDec, DefVideoDec (value: string)
-Specifies which plugin to use by default for audio/video decoding. Example, "DefVideoDec=name".
-The name given is the name of the plugin to be used (same considerations as other plugins, cf above).
-.TP
-.B codec_XX_XX (value: string)
-Allows to specify default media plugin (audio/video) per stream type and object type. This is usefull if you have more than one decoder for a given type. The syntax is 
-.B codec_AA_BB=pluginname
-where AA is the hexadecimal MPEG-4 streamType value for the codec (0x04=visual, 0x05=audio) and BB is the hexadecimal MPEG-4 objectTypeIndication of the media (0x20 = MPEG-4 video, 0x40=MPEG-4 Audio, ...). The name given is the name of the plugin to be used (same considerations as other plugins, cf above).
-.
-.SH SECTION "Rendering"
-The "Rendering" section holds all configuration options for the logical rendering engines, whether 2D or 3D. The following options are defined:
-.TP
-.B RendererName (value: string)
-specifies which renderer should be used. There are currently 2 renderers available in GPAC, "GPAC 2D Renderer" and "GPAC 3D Renderer". Renderers cannot be reloaded at run-time, the complete system must be restarted.
-.TP
-.B Raster2D (value: string)
-specifies the 2D rasterizer to use for vectorial drawing. Used by 2D renderer (for everything) and 3D renderer (for textured text and gradients).
-.TP
-.B FrameRate (value: float)
-specifies the simulation frame-rate of the presentation - this value is also used by the MPEG-4 Systems engine to determine when a BIFS frame is mature for decoding.
-.TP
-.B AntiAlias (value: None, All, Text)
-specifies antialiasing settings - whether the setting is applied or not depends on the graphics plugin/graphic card.
-.br
-None: no anti-aliasing
-.br
-Text: anti-aliasing for text only
-.br
-All: complete anti-aliasing
-.TP
-.B FastRender (value: yes, no)
-specifies whether rendering should target speed or quality - whether the setting is applied or not depends on the graphics plugin/graphic card.
-.TP
-.B ForceSceneSize (value: yes, no)
-forces the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration.
-.TP
-.B StressMode (value: yes, no)
-specifies that the renderer runs in worst case scenario, recomputing all vectorial paths, meshes, outlines and reloading textures (sending them to graphics card) at each frame.
-.TP
-.B BoundingVolume (value: None, Box, AABB)
-specifies whether the bounding volume of an object shall be drawn or not. Note that the 2D renderer only uses rectangles as bounding volumes. The "AABB" value is used by the 3D renderer only, and specifies the object bounding-box tree shall be drawn.
-.
-.SH SECTION "Render2D"
-The "Render2D" section holds all configuration options for the 2D tile rendering engine. The following options are defined:
-.TP
-.B DirectRender (value: yes, no)
-specifies whether direct rendering should be used or not. In direct rendering mode, the screen is completely redrawn at each frame. In indirect rendering 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 plugin (currently all plugins handle both mode).
-.TP
-.B ScalableZoom (value: yes, no)
-specifies whether scalable zoom should be used or not. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched.
-.
-.SH SECTION "Render3D"
-The "Render3D" section holds all configuration options for the 3D openGL rendering engine. The following options are defined:
-.TP
-.B RasterOutlines (value: yes, no)
-specifies that outlining shall be done through openGL pen width rather than vectorial outlining. 
-.TP
-.B PolygonAA (value: yes, no)
-specifies whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used.
-.TP
-.B Wireframe (value: WireNone, WireOnly, WireOnSolid)
-specifies wireframe drawing options:
-.br
-WireNone: objects are drawn as solid
-.br
-WireOnly: objects are drawn as wireframe only
-.br
-WireOnSolid: objects are drawn as solid and wireframe is then drawn
-.TP
-.B DisableRectExt (value: yes, no)
-specifies whether openGL rectangular texture extension (GL_EXT_texture_rectangle or GL_NV_texture_rectangle) shall be used or not. 
-.br
-If "yes", textures whose dimensions are not power of two are rescaled except if hardware support non-power-of-two textures (GL_ARB_texture_non_power_of_two) natively
-.br
-If "no" and extension is available, textures are used without rescaling. Note that in this case texture transformation are disabled.
-.TP
-.B EmulatePOW2 (value: yes, no)
-enables power of 2 emulation. Ignored if openGL rectangular texture extension is enabled.
-.br
-if set, video texture is not resized but emulated with padding. This usually speeds up video mapping on shapes but disables texture transformations.
-.br
-if not set, video is resized to a power of 2 texture when mapping to a shape.
-.TP
-.B BitmapCopyPixels (value: yes, no)
-specifies whether the bitmap node should be drawn with regular openGL texturing ("no") or through pixel copy routines ("yes"). This greatly impacts video rendering through bitmap depending on the graphics card. Some cards will have faster pixel copy routines that texture transfer ones, some won't.
-.
-.SH SECTION "Audio"
-The "Audio" section holds all configuration options for the audio rendering engine
-and hardware. Note that most options depend on the driver used and may be ignored by the driver. The following options are defined:
-.TP
-.B ForceConfig (value: yes, no)
-Forces a given sound card configuration to be used. If not set the sound card will be setup to use 2 audio buffers of 1024 samples each. This may not work properly on some audio cards due to hardware latency, therefore forcing the config may be very usefull.
-.TP
-.B NumBuffers (value: integer, 0 forbidden)
-When config is forced, specifies the number of audio buffers to allocate (audio buffers are played in ring if possible, otherwise a single audio
-buffer is allocated).
-.TP
-.B TotalDuration (value: integer, 0 forbidden)
-When config is forced, specifies the total audio buffer size in milliseconds. Be aware that the longer the audio buffer is, the longer the audio latency will be when pausing an audio object. The quality of fast forward audio playback will also be degradated when using large audio buffers.
-.br
-.B Note:
-The SDL audio plugin does not use the TotalDuration and num buffers in the same way, it just computes the desired audio buffer size with this settings and picks the next power of 2 size for audio buffer size. It does not use ring buffers either.
-.TP
-.B NoResync (value: yes, no)
-Disables audio resynchronization: audio clock is never adjusted and A/V sync may get broken
-.TP
-.B DisableMultiChannel (value: yes, no)
-Disables audio multichannel output and always downmix to stereo. This may be usefull if the multichannel output behaves weirdly.
-.TP
-.B DisableNotification (value: yes, no)
-Disables usage of audio buffer notifications when supported (currently only DirectSound supports it). If DirectSound audio sounds weird try without notifications. Ignored on other platforms than Win32/DX.
-.TP
-.B DriverName (value: string)
-specifies the driver to use for audio rendering.
-.TP
-.B Volume (value: integer, range 0-100)
-specifies the default audio volume used when launching GPAC.
-.TP
-.B Pan (value: integer, range 0-100)
-specifies the default audio stereo balance used when launching GPAC - 0 for full left, 100 for full right, 50 for balanced.
-.
-.SH SECTION "Video"
-The "Video" section holds all configuration options for the video renderer and hardware. The following options are defined:
-.TP
-.B DisableYUV (value: yes, no) - used by 2D renderer only
-disables YUV hardware support (YUV hardware support may not be available for the current plugin).
-.TP
-.B SwitchResolution (value: yes, no)
-if enabled, selects smallest video resolution larger than scene size, otherwise use current video resolution.
-.TP
-.B DriverName (value: string)
-specifies the driver to use for video memory access.
-.
-.SH SECTION "Network"
-The "Network" section holds all configuration options for the network used by plugins and systems engine. The following options are defined:
-.TP
-.B AutoReconfigUDP (value: yes, no)
-specifies if network manager shall reconnect a scene if UDP traffic is blocked.
-.TP
-.B DataTimeout (value: unsigned int)
-specifies timeout in milliseconds befor initial buffering aborts. Default terminal value is 20000 (20 seconds).
-.TP
-.B UDPNotAvailable (value: yes, no)
-specifies that UDP traffic is not available (usually set by GPAC)
-.TP
-.B UDPTimeout (value: unsigned int)
-specifies timeout in milliseconds for initial UDP detection. Once a UDP packet is recieved the timeout is ignored.
-.TP
-.B BufferLength (value: unsigned int)
-specifies the default length of the decoding buffer in milliseconds. The client will wait for the buffer to be filled before starting decoding. A plugin may decide to use a different value based on protocol and network jitters.
-.TP
-.B RebufferLength (value: unsigned int)
-specifies rebuffering length of the decoding buffer in milliseconds. Whenever the decoding buffer fullness is less than this value, the object clock is paused and the stream rebuffered till BufferLength. Therefore a value of 0 means no rebuffering. A plugin may decide to use a different value based on protocol and network jitters.
-.
-.SH SECTION "FontEngine"
-The "FontEngine" section holds all configuration options for the font handling. The GPAC rendering module handles text through vectorial outline, allowing graphics plugin development without having to integrate text rendering which is always heavy work. The following options are defined:
-.TP
-.B DriverName (value: string)
-specifies the driver to use for font handling.
-.TP
-.B FontDirectory (value: path)
-specifies the directory where fonts are located - currently only one directory can be specified (however nothing stops a font plugin from using a private directory). If the directory is invalid or does not contain fonts, text may be unavailable in GPAC.
-.TP
-.B TextureTextMode (value: Never, 3D, Always)
-specifies whether text shall be drawn to a texture and then rendered or directly rendered. Using textured text can improve text look in the 3D renderer and also improve text-on-video like content.
-.TP
-.B FontSerif (value: string)
-specifies default SERIF font.
-.TP
-.B FontSans (value: string)
-specifies default SANS font.
-.TP
-.B FontFixed (value: string)
-specifies default FIXED font.
-.LP
-.B Note:
-The freetype plugin uses this section to maintain associations between font names and truetype font file names. This greatly speeds up font selection at run-time.
-.
-.SH SECTION "Downloader"
-The "Downloader" section holds all configuration options for file downloading and caching.
-.TP
-.B CleanCache (value: yes, no)
-specifies whether downloaded files shall be removed once used.
-.TP
-.B RestartFiles (value: yes, no)
-specifies whether incompletely downloaded files shall be removed before redownloading.
-.TP
-.B MaxRate (value: positive integer)
-specifies a maximum data rate in kilo bits per seconds for file downloading. This is used for simulation purposes. A value of 0 means no rate restriction.
-.TP
-.B UserAgent (value: string)
-specifies an alternate user agent (default one is "GPAC $VERSION").
-.
-.SH SECTION "HTTPProxy"
-The "HTTPProxy" section of the config file holds configuration option for HTTP proxy adressing. Currently only one proxy can be enabled, and no URI selection is done
-.TP
-.B Enabled (value: yes, no)
-specifies whether the proxy should be used or not when downloading files.
-.TP
-.B Name (value: string)
-specifies the proxy name (IP address or resolved name) without protocol identifier (eg, no "http://"). If not present, the proxy is disabled.
-.TP
-.B Port (value: positive integer)
-Specifies the port to use with the proxy. If no port is specified, the default HTTP port (80) is used.
-.
-.SH SECTION "Streaming"
-The "Streaming" section holds all configuration options for real-time streaming using IETF SDP/RTSP/RTP/RTCP protocols. 
-.TP
-.B DefaultPort (value: unsigned short)
-specifies the default port to use when connecting to a server (ignored if a port is specified in the url). If the port is 80 or 8080 (HTTP), the client will connect to the RTSP server through an HTTP tunnel, and transport will take place on the RTSP connection.
-.TP
-.B ReorderSize (value: integer)
-size of the RTP reordering buffer - 0 means no reordering. Ignored when transport takes place on the RTSP connection
-.TP
-.B RTPoverRTSP (value: yes, no)
-specifies whether RTP packets should be carried on the RTSP connection (TCP or UDP) when possible, or carried on UDP. If the connection port is an HTTP port, this value is assumed to be true
-.TP
-.B RTSPTimeout (value: unsigned int)
-specifies connection timeout with the server: an RTSP request is considered as failed when the timeout expires.
-.TP
-.B FirstPacketDrop (value: unsigned int)
-specifies the first SL packet to be droped - 0 means no packet drop. Used for packet drop simulation tests.
-.TP
-.B PacketDropFrequency (value: unsigned int)
-specifies the frequency at which SL packets are droped. If value is 20, one packet every 20 recieved packets will be droped. Used for packet drop simulation tests.
-.
-.SH SECTION "MimeTypes"
-This section is used to keep MIME types and file associations for GPAC plugins. The format of the key is:
-.B	mimeType="fileExt1 filexExt2 .. filexExtN" "MimeType description" PluginName
-.br
-The description is used for GUI purposes (open file dialogs). You may modify the file extension list to support your own extensions. 
-MIME Type is always checked when processing a remote ressource (eg http file) in order to load the appropriated plugins. 
-If MIME type is not available, provided extensions are first checked, then all input plugins are queried.
-.
-.SH SECTION "MimeTypes"
-The "StreamingCache" section of the config file holds all configuration options for the streaming cache. Streaming cache allows for recording of live sources such as RTP/RTSP sessions and internet radios. This is currently just an experimental feature in GPAC.
-.br
-.B RecordDirectory (value: path)
-specifies path for recorded files. Cached data is written directly to disk (no re-interleaving or similar processes). If not specified, the default cache directory is used.
-.TP
-.B BaseFileName (value: string)
-specifies the base name for recorded files. If not present in configuration file, the service name (URL) is used.
-.TP
-.B KeepExistingFiles (value: yes no)
-specifies if cached files with same name should be kept or not. If not, an integer number is added to the cached file name, the higest number for the latest file.
-.TP
-.
-.SH SECTION "SAXLoader"
-The "SAXLoader" section holds all configuration options for XML SAX parsing of SVG, XMT and X3D files.
-.TP
-.SH Progressive (value: string)
-specifies XML parsing mode used by the loader. Supported modes are:
-.br
-yes: SAX parsing is used with progressive loading of the document.
-.br
-no: SAX parsing is used, document will first be completely downloaded.
-.br
-DOM: DOM parsing is used, document will first be completely downloaded. Only supported by libXML2 plugin, otherwise handled as "no".
-.TP
-.B MaxDuration (value positive integer)
-specifies the maximum amount of time the SAX parser should spent loading a portion of the document. Only used in SAX Progressive mode.
-.
-.SH SECTION "XviD"
-The "XviD" section holds all configuration options for the XviD codec. 
-.TP
-.SH PostProc (value: string)
-specifies filters to apply when decoding video. The string is a list of filters separated with a space character. Filters supported are:
-.br
-FilmEffect: xvid 1.0.0 filmEffect.
-.br
-Deblock_Y: Y plane deblocking filter.
-.br
-Deblock_UV: UV plane deblocking filter.
-.TP
-.B Threaded (value yes, no)
-specifies whether the decoder should run in its own thread or not.
-.
-.SH Section "FFMPEG"
-The "FFMPEG" section holds all configuration options for the FFMPEG demuxer and codec. 
-.TP
-.SH DataBufferMS (value: unsigned int)
-specifies the amount of video/audio data (in milliseconds) to be bufferer before starting decoding. For developpers only.
-.
-.SH Section "ISOReader"
-The "ISOReader" section holds all configuration options for the ISO Media file demuxer.
-.TP
-.SH IgnoreMPEG-4ForBrands (value: Full 4CC or 4CC pattern (abc* ab*))
-ignores all MPEG-4 systems tracks and IOD for files showing the listed brands in their compatible brand list.
-.
-.SH CREATING THE CONFIGURATION FILE
-.TP
-If not found, a default configuration file is created when launching MP4Client or Osmo4. In this process the font directory and the cache directory must be entered at prompt. The file is located in the user home directory and called ".gpacrc"
-.
-.SH "FILES"
-.LP 
-.B GPAC Configuration File:
-~/.gpacrc
-.
-.SH "AUTHORS"
-.LP 
-Jean Le Feuvre <jeanlf@users.sourceforge.net> - GPAC (c) 2000-2005
-.
-.SH "SEE ALSO"
-.LP 
-MP4Client(1), MP4Box(1)

gpac-0.8.0.tar.gz/doc/man/mp42avi.1 Deleted

@@ -1,69 +0,0 @@
-.TH "MP42AVI" 1 "March 2005" "MP42AVI" "GPAC"
-.
-.SH NAME
-.LP 
-MP42AVI \- MPEG-4 BIFS to Video converter
-.SH "SYNOPSIS"
-.LP 
-.B MP42AVI
-.RI [options] \ file\ 
-.br
-.
-.SH "DESCRIPTION"
-.LP 
-MP42AVI is a tool to convert a pure MPEG-4 BIFS presentation (no audio, no image, no video) to an uncompressed sequence of images or an uncompressed RGB avi file.
-.
-.
-.SH OPTIONS
-.P
-.TP
-.B \-fps Framerate
-specifies extraction framerate. If not set the framerate is computed from the BIFS track duration.
-.TP
-.B \-size WxH
-forces BIFS scene size to the given resolution
-.TP
-.B \-raw [frame]
-uses raw format for output. If frame is specified, only the given frame is dumped. Otherwise, all samples are dumped into raw files.
-.TP
-.B \-bmp [frame]
-uses BMP format for output. If frame is specified, only the given frame is dumped. Otherwise, all samples are dumped into BMP files.
-.TP
-.B \-outpath path
-specifies output directory to dump frames/movie.
-.TP
-.B \-cfg
-specifies path to GPAC config file.
-.TP
-.B \-v
-prints build version.
-.TP
-.B \-h
-prints this message
-.
-.SH SPECIAL CONSIDERATIONS
-.TP
-.B Frame Dumping 
-When dumping a frame, either the frame number (sample number) can be specified or the frame time
-in the format hh:mm:ss:xFz where hh, mm, ss are hours, minutes, seconds, x the number
-of the frame in the seconds and z the frame rate used to express the time
-.TP
-.br
-.B Input Files
-The current version of MP42AVI is only designed to handle pure BIFS presentation. If the input BIFS scene uses audio or visual media, these are ignored during the dump. It may even crash MP42AVI.
-.TP
-.B GPAC Config File
-MP42AVI needs the GPAC configuration file in order to locate the different plugins used for rasterization. You must therefore have launched successfully MP4Client before trying to use MP42AVI
-.
-.SH "FILES"
-.LP 
-.B GPAC Configuration File:
-~/.gpacrc
-.
-.SH "AUTHORS"
-.LP 
-Jean Le Feuvre <jeanlf@users.sourceforge.net> - GPAC (c) 2000-2005
-.
-.SH "SEE ALSO"
-.LP 
-MP4Client(1), MP4Box(1), GPAC(1)

gpac-0.8.0.tar.gz/doc/man/mp42ts.1 Deleted

@@ -1,172 +0,0 @@
-.TH MP42TS "1" "July 2015" "MP42TS" "GPAC"
-
-.SH NAME
-MP42TS - MPEG-4 Systems Framework and Software Development Kit
-
-.SH SYNOPSIS
-.B MP42TS
-.RI <inputs> <destinations> [options]
-
-.SH OPTIONS
-.SS "Inputs"
-.TP
-\fB\-src \fRfilename[:OPTS]
-specifies an input file used for a TS service:
-.br
- * currently only supports ISO files and SDP files
-.br
- * can be used several times, once for each program
-.br
-By default each source is a program in a TS. 
-Source options are colon-separated list of options, as follows:
-.br
- 
-.br
-\fBID\fR=\fBN  \fRspecifies the program ID for this source.
-All sources with the same ID will be added to the same program
-.br
-\fBname\fR=\fBSTR  \fRprogram name, as used in DVB service description table
-.br
-\fBprovider\fR=\fBSTR  \fRprovider name, as used in DVB service description table
-
-.TP
-\fB\-prog filename
-same as "-src filename"
-
-.SS "Destinations"
-Several destinations may be specified as follows, at least one is mandatory:
-.TP
-\fB\-dst-udp \fRUDP_address:port (multicast or unicast)
-.TP
-\fB\-dst-rtp \fRRTP_address:port
-.TP
-\fB\-dst-file \fRfilename
-
-The following parameters may be specified when -dst-file is used:
-.TP
-\fB\-segment-dir \fRdir
-server local directory to store segments (ends with a '/')
-.TP
-\fB\-segment-duration \fRdur
-segment duration in seconds
-.TP
-\fB\-segment-manifest \fRfile
-m3u8 file basename
-.TP
-\fB\-segment-http-prefix \fRp
-client address for accessing server segments
-.TP
-\fB\-segment-number \fRn
-number of segments to list in the manifest
-
-.SS "Basic options"
-.TP
-\fB\-rate \fRR
-specifies target rate in kbps of the multiplex (optional)
-.TP
-\fB\-real-time
-specifies the muxer will work in real-time mode
-.br
- * if not specified, the muxer will generate the TS as quickly as possible
-.br
- * automatically set for SDP or BT input
-.TP
-\fB\-pcr-init \fRV
-sets initial value V for PCR - if not set, random value is used
-.TP
-\fB\-pcr-offset \fRV
-offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.
-.TP
-\fB\-psi-rate \fRV
-sets PSI refresh rate V in ms (default 100ms).
-.br
- * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.
-.br
- * This should be set to 0 for DASH streams.
-.TP
-\fB\-time \fRn
-request the muxer to stop after n ms
-.TP
-\fB\-single-au
-forces 1 PES = 1 AU (disabled by default)
-.TP
-\fB\-rap
-forces RAP/IDR to be aligned with PES start for video streams (disabled by default).
-In this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES.
-.TP
-\fB\-flush-rap
-same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT
-.TP
-\fB\-nb-pack \fRN
-specifies to pack up to N TS packets together before sending on network or writing to file
-.TP
-\fB\-pcr-ms \fRN
-sets max interval in ms between 2 PCR. Default is 100 ms
-.TP
-\fB\-ttl \fRN
-specifies Time-To-Live for multicast. Default is 1.
-.TP
-\fB\-ifce \fRIPIFCE
-specifies default IP interface to use. Default is IF_ANY.
-.TP
-\fB\-temi \fR[URL]
-Inserts TEMI time codes in adaptation field. URL is optional
-.TP
-\fB\-temi-delay \fRDelayMS
-Specifies delay between two TEMI url descriptors (default is 1000)
-.TP
-\fB\-temi-offset \fROffsetMS
-Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)
-.TP
-\fB\-temi-noloop
-Do not restart the TEMI timeline at the end of the source
-.TP
-\fB\-sdt-rate \fRMS
-Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent
-
-.SS "MPEG-4/T-DMB options"
-.TP
-\fB\-bifs-src \fRfilename
-update file: must be either an .sdp or a .bt file
-.TP
-\fB\-audio \fRurl
-may be mp3/udp or aac/http (shoutcast/icecast)
-.TP
-\fB\-video \fRurl
-shall be a raw h264 frame
-.TP
-\fB\-mpeg4-carousel \fRn
-carousel period in ms
-.TP
-\fB\-mpeg4\fR,\fB \-4on2
-forces usage of MPEG-4 signaling (IOD and SL Config)
-.TP
-\fB\-4over2
-same as -4on2 and uses PMT to carry OD Updates
-.TP
-\fB\-bifs-pes
-carries BIFS over PES instead of sections
-.TP
-\fB\-bifs-pes-ex
-carries BIFS over PES without writing timestamps in SL
-
-.SS "Misc options"
-.TP
-\fB\-logs
-set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX
-.TP
-\fB\-h\fR,\fB \-help
-print this screen
-
-.SH BUGS and OTHER HELP
-For bug reports, more information on BT or XMT-A formats or GPAC TTXT files or ISMACryp,
-MPEG-4 Systems usage and more help on MP42TS please visit the GPAC web site http://www.gpac.io
-
-.SH "AUTHORS"
-Jean Le Feuvre, Cyril Concolato, Romain Bouqueau.
-Copyright \(co Telecom ParisTech 2005-2012.
-
-.SH "SEE ALSO"
-.BR GPAC (1),
-.BR MP4Box (1),
-.BR MP4Client (1)

gpac-0.8.0.tar.gz/doc/man/mp4box.1 Deleted

@@ -1,808 +0,0 @@
-.TH "MP4Box" 1 "June 2005" "MP4Box" "GPAC"
-.
-.SH NAME
-.LP 
-MP4Box \- MPEG-4 Systems Toolbox
-.SH "SYNOPSIS"
-.LP 
-.B MP4Box
-.RI [options] \ file \ [options]
-.br
-.
-.SH "DESCRIPTION"
-.LP 
-MP4Box is a multi-purpose command line tool to create and edit MPEG-4 Systems presentations and manipulate ISO-media files (MP4, 3GP, MOV).
-.LP
-MP4Box supports file conversion from various raw formats and IsoMedia/AVI/MPEG-PS/OGG containers, file hinting for RTP streaming for QuickTime compatible streaming servers, file interleaving, file fragmentation and track extraction.
-.LP
-MP4Box also provides dump tools used to inspect file layout, RTP hint tracks, SDP information, scene composition. It may also be used to convert to and from BT/XMT-A/VRML/X3D.
-.LP
-MP4Box also features MPEG-4 Systems encoders and decoders for BIFS and OD tools.
-.LP
-MP4Box doesn't expect any particular order in options at prompt.
-.
-.SH GETTING HELP WITH MP4Box
-.TP
-.B \-h [type]
-prints help screen. "type" can be one of "general", "hint", "import", "encode", "extract", "dump", "swf", "meta", "crypt", "format", "rtp", "live" for specific help.
-.TP
-.B \-version
-prints version of MP4Box.
-.TP
-.B \-noprog
-disable progress reports.
-.TP
-.B \-quiet
-quiet mode (no log info).
-.TP
-.B \-v
-verbose mode (more log info).
-.TP
-.B \-strict-error
-exits after the first error is reported.
-.TP
-.B \-nodes
-lists supported MPEG-4 Systems nodes in MP4Box current build.
-.TP
-.B \-node NodeName
-prints the node syntax. Each field is listed as
-.br
-.I eventType fieldType fieldName defaultValue
-.br
-and field quantization information and quantization bounds if any.
-.
-.TP
-.B \-xnodes
-lists supported X3D nodes in MP4Box current build.
-.TP
-.B \-xnode NodeName
-prints the X3D node syntax. Each field is listed as
-.
-.TP
-.B \-snodes
-lists supported SVG/LASeR nodes in MP4Box current build.
-.
-.SH GENERAL OPTIONS
-.P
-.TP
-.B \-inter duration
-interleaves media data in chunks of the maximum specified duration (expressed in milliseconds) and prepare file for HTTP/FTP streaming. By default MP4Box always stores with 0.5 second interleaving. An interleaving value of '0' stores without interleaving (meta-data then track after track). 
-.br
-.B \-old-inter duration
-same as -inter but without drift adjustment
-.br
-.B NOTE: Track Edit Lists are ignored when performing interleaving.
-.TP
-.B \-flat
-stores file with all media data first, non interleaved. If used when creating a new file, no temporary file is created (faster storage).
-.TP
-.B \-frag duration
-fragments file using ISO-Media movie fragments. Tracks will be fragmented so that no track run exceeds the specified duration (expressed in milliseconds). Disables interleaving.
-.TP
-.B -out\ \<filename>
-specifies output file name. 
-.TP
-.B -tmp\ \<dirname>
-specifies driectory for temporary storage. If not set, temporary storage is OS-dependent.
-.TP
-.B -ffspace size
-inserts free space before moof in fragmented files.
-.TP
-.B \-nosys
-removes all MPEG-4 Systems information from the file but keeps an empty IOD for MPEG-4 Profile@Level indications. alias: -no-sys
-.TP
-.B \-no-iod
-removes InitialObjectDescriptor from file.
-.TP
-.B \-isma
-rewrites the file as an ISMA 1.0 Audio/Video file (all systems info rewritten) with proper clock references.
-.TP
-.B \-ismax
-rewrites the file as an ISMA 1.0 Audio/Video file (all systems info rewritten) with ISMA clock references (streams not explicetly synchronized).
-.br 
-.B NOTE: Seeking may be broken with some players (in ISMA, audio and video streams do not depend on main scene clock).
-.TP
-.B \-3gp
-rewrites the file as a 3GP file (no more MPEG-4 Systems specific info). This option is turned on by default when input file extension is .3gp or .3g2.
-.TP
-.B \-ipod
-rewrites the file for iPod.
-.TP
-.B \-brand ABCD[:v]
-sets major brand of file, with optional version.
-.TP
-.B \-ab ABCD
-adds given brand to file's alternate brand list.
-.TP
-.B \-rb ABCD
-removes given brand to file's alternate brand list.
-.TP
-.B -cprt string
-adds string copyright notice to file.
-.TP
-.B \-chap chap_file
-adds chapter information contained in chap_file to movie. For more details on chapter file syntax, cf http://gpac.sourceforge.net/auth_mp4box.php.
-.TP
-.B -rem trackID
-removes given track from file - can be specified multiple times.
-.TP
-.B -enable trackID
-enables given track.
-.TP
-.B -disable trackID
-disables given track.
-.TP
-.B -new
-forces creation of a new destination file.
-.TP
-.B -lang [tkID=]LAN
-sets the language of all tracks or the given track. LAN is the ISO 639-2 3 character code.
-.TP
-.B -delay [tkID=]delay_ms
-sets the delay in milliseconds of all tracks or the given track.
-.TP
-.B -par tkID=PAR
-sets visual track pixel aspect ratio (PAR=Num:Den or "none").
-.TP
-.B -name tkID=name
-sets track handler name.
-.TP
-.B -itags tag1[:tag2]
-sets iTunes tags to file - more info: MP4Box -tag-list.
-.TP
-.B \-split time_in_seconds
-splits in files of desired maximum duration. This will remove all MPEG-4 Systems media.
-.TP
-.B \-split-size size_in_kilobytes
-splits in files of desired maximum size. This will remove all MPEG-4 Systems media. Alias: -splits
-.TP
-.B \-split-chunk start:end
-extracts a new file from specified start to end times (in seconds). This will remove all MPEG-4 Systems media. Alias: -splitx
-.TP
-.B \-splitz start:end
-same as -split-chunk option, but adjust end time to be juste before the last rap found in the chunk.
-.TP
-.B \-split-rap start:end
-splits in files begining at each RAP. This will remove all MPEG-4 Systems media. Alias: -splitr
-.TP
-.B \-group-add fmt
-creates a new grouping information in the file. Format is a colon-separated list of following options:
-.br
-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.
-.br
-switchID=ID: ID of the switch group to create. If 0, a new ID will be computed for you. If <0, disables SwitchGroup.
-.br
-criteria=string: list of space-separated 4CCs.
-.br
-trackID=ID: ID of the track to add to this group.
-.br
-*WARNING* Options modify state as they are parsed: trackID=1:criteria=lang:trackID=2 is different from: criteria=lang:trackID=1:trackID=2. 
-.B \-group-rem-track ID
-removes track from its group.
-.TP
-.B \-group-rem ID
-removes the track's group.
-.TP
-.B \-group-clean
-removes all group information from all tracks.
-.TP
-.B \-ref id:XXXX:refID
-adds a reference of type 4CC from track ID to track refID.
-.TP
-.B \-dash DUR
-enables DASH-ing of the file with a segment duration of DUR.
-.TP
-.B \-rap
-segments begin with random access points.
-.TP
-.B \-frags-per-sidx N
-sets the number of segments to be written in each SIDX box.
-.TP
-.B \-segment-name name
-sets the segment name for generated segments.
-.TP
-.B \-segment-ext name
-sets the segment extension name. Default is m4s.
-.TP
-.B \-url-template
-uses UrlTemplate instead of explicit sources in segments.
-.TP
-.B \-daisy-chain
-Uses daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0.
-.TP
-.B \-dash-ctx FILE
-Stores/restore DASH timing from FILE.
-.TP
-.B \-dash-ts-prog N
-Program_number to be considered in case of an MPTS input file.
-
-.B When input file is an ISO-Media file (QT, MP4, 3GP), if no output is specified THE INPUT FILE IS OVERWRITTEN.
-.
-.
-.SH HINTING OPTIONS
-.TP
-.B \-hint
-hint the file for RTP\/RTSP sessions. Payload type is automatically detected and configured unless forced through one of MPEG-4 Generic RTP payload.
-.TP
-.B \-mtu size
-specifies Maximum Transmission Unit size in bytes (eg maximum RTP packet size). Default size is 1500 bytes (Ethernet MTU). This must be choosen carefully: specifying too large packets will result in undesired packet fragmentation at UDP layer while specifying too small packets will result in RTP header overhead.
-.TP
-.B \-copy
-forces hinted data to be copied to the hint track instead of simply referenced. This speeds up RTP packet construction at the server side but results in much bigger files.
-.TP
-.B \-tight
-performs sample-based interleaving of media tracks and hint tracks. This should reduce disk seeks at server side (depending on server implementation) but results in a bigger file.
-.TP
-.B \-multi [maxptime]
-enables Access Units concatenation in RTP packets if possible. maxptime is optional and specifies the maximum packet duration in milliseconds (default 100).
-.TP
-.B \-rate ck_rate
-specifies the rtp rate in Hz when no default rate for payload. Default value is 90000 (MPEG rtp rates).
-.TP
-.B \-mpeg4
-forces usage of the MPEG-4 generic payload whenever possible. Media tracks without a mapping to MPEG-4 Systems cannot use this.
-.TP
-.B \-latm
-forces usage of the LATM payload for AAC audio.
-.TP
-.B \-static
-enables usage of static RTP payload IDs for streams with official payload IDs. By default MP4Box always uses dynamic payload IDs for maximum interoperability, some players having troubles with static ones.
-.
-.P
-.B MPEG-4 Generic Payload Options (Experts only)
-.IP
-.B \-ocr
-forces all media tracks in the file to be served synchronized. This is needed because most streaming servers don't support desynchronized tracks in a single file. Be extremelly carefull when designing MPEG-4 interactive presentations for streaming since you will have to take care of the streaming server capabilities... MP4Box generates warnings when the file timeline can be ambiguously interpreted by the server.
-.IP
-.B \-rap
-signals Access Units random access flag in RTP packets. This is usually only needed for streaming of MPEG-4 Systems streams.
-.IP
-.B \-ts
-signals Access Units Time Stamps (CTS and DTS) in RTP packets.
-.IP
-.B \-size
-signals Access Units size in RTP packets.
-.IP
-.B \-idx
-signals Access Units indexes (sequence numbers) in RTP packets.
-.IP
-.B \-multi
-enables Access Units concatenation in RTP packets (-ts, -size and -idx are selected if needed).
-.IP
-.B \-iod
-prevents system tracks embedding in IOD (ISMA-like IOD) when generating in SDP. MP4Box automatically detects ambiguous (ISMA/non-ISMA) files but nobody's perfect. This shouldn't be used with -isma option.
-.
-.TP
-.B \-add-sdp string
-adds string to movie SDP or track SDP (tkID:string, where tkID is the OD of the hint track or its media track). This takes care of SDP line reordering, but not of SDP content validity.
-.TP
-.B \-unhint
-removes all hint tracks and other hinting info from the file.
-.
-.SH IMPORT OPTIONS
-.TP
-.B \-add <src_file>
-adds all src_file tracks to input file, creating it if not exisiting. Up to 20 cumulated -add operations can be used. Supported syntaxes are:
-.br
-file#video: imports first video track from src_file.
-.br
-file#audio: imports first audio track from src_file.
-.br
-file#trackID=ID or file#ID: imports given trackfrom src_file. To get a listing of tracks in input file, use -info [ID]
-.br
-[;lang=LAN]: specifies language of imported media.
-.br
-[;delay=delay_ms]: specifies initial delay in milliseconds of imported media.
-.TP
-.B \-cat <src_file>
-concatenates all src_file tracks to input file, creating it if not exisiting. Media samples are added at the end of existing compatible tracks. If no compatible track is found for a media it is created. Up to 20 cumulated -cat operations can be used. Syntax is the same as -add.
-.TP
-.B \-force-cat
-skips media configuration check when concatenating file.
-.TP
-.B \-keepsys
-by default all MPEG-4 systems media are removed with -add and -cat. This option will avoid removing them from final file.
-.TP
-.B \-keep-all
-keeps all existing tracks when add file.
-.TP
-.B \-dref
-keeps media data in original file an only imports meta-data (frame timing, size and random access). 
-.br
-.TP
-.B NOTE
-Data referencing may fail with some AVI because it requires the framed data (eg an MP4 sample) to be continuous in the original file, which is not always the case depending on the original interleaving.
-.TP
-.B \-no-drop
-forces constant FPS when importing AVI video. By default non coded frames (n-vop) are removed at import time, resulting in a variable frame-rate media.
-.TP
-.B \-packed
-for CMP/M4V (raw MPEG-4 Visual), forces packed-bitstream mode (removes all n-vops and import at constant frame rate).
-.TP
-.B \-sbr
-imports AAC as AAC-SBR, with backward compatible signaling (non AAC-SBR decoders should be able to play it).
-.TP
-.B \-sbrx
-imports AAC as AAC-SBR, with non-backward compatible signaling (non AAC-SBR decoders will not be able to play it).
-.TP
-.B \-ovsbr
-imports AAC as AAC-SBR with oversample SBR.
-.TP
-.B \-ps
-imports AAC as AAC-PS, with backward compatible signaling of AAC-PS.
-.TP
-.B \-psx
-imports AAC as AAC-PS, with non-backward compatible signaling (non AAC-PS decoders will not be able to play it).
-.TP 
-.B \-fps FrameRate
-overrides the input video frame rate or specifies it for SUB subtitles.
-.TP 
-.B \-mpeg4
-forces using MPEG-4 sample descriptions rather than 3GP ones (3GP2 QCELP/EVRC/SMV audio only).
-.TP 
-.B \-agg N
-aggregates N audio frames in 1 sample (3GP media only). Maximum possible value is 15, and default value is 1 (no aggregation).
-.
-.SH ENCODING OPTIONS
-.TP
-.B \-mp4
-specifies input file is for encoding. Supported inputs are BT/XMT-A/WRL/SWF files. Output file name is by default the input file name without extensions plus ".mp4" extension. 
-.TP
-.B \-def
-encodes DEF'ed nodes and routes with their textual names.
-.TP
-.B \-log
-generates BIFS encoder log file.
-.TP
-.B \-ms file
-specifies file for track importing - by default FILE.mp4 is used when encoding FILE.bt (in-place rewrite). This option is only needed if you don't provide
-a proper muxInfo per stream in the BT/XMT file.
-.TP
-.B \-sync time
-forces BIFS random access point generation every time milliseconds. Cannot be used with -shadow. WARNING: this may result in weird behavior of your presentation since a BIFS random access point restarts all media currently running in the scene (EXPERTS ONLY - DANGEROUS). Cannot be used with -shadow.
-.TP
-.B \-shadow time
-forces BIFS shadow random access points generation every time milliseconds. Shadow samples are random access points that can be used instead of non random access points when seeking. WARNING: this may be not supported by some players (EXPERTS ONLY - DANGEROUS). Cannot be used with -sync.
-.TP
-.B \-ctx-in file
-specifies initial context (MP4/BT/XMTA) for chunk processing. Input file must then be a command-only file: no IOD, and no implicit commands (commands without 'AT').
-.TP
-.B \-ctx-out file
-specifies output file of updated context (MP4/BT/XMTA) in chunk processing mode. This is optional, chunk processing doesn't need to store the final context.
-.TP
-.B \-resolution res
-LASeR resolution factor (-8 to 7, default 0). All coords are multiplied by 2^res before truncation.
-.TP
-.B \-coord-bits bits
-bits used for encoding truncated coordinates in LASeR. (0 to 31, default 12)
-.TP
-.B \-scale-bits bits
-bits used for encoding truncated scales in LASeR. (0 to 4, default 0)
-.TP
-.B \-auto-quant res
-Use automatic LASeR quantification. resolution is given as if using -resolution but coord-bits and scale-bits are infered.
-.
-.SH ISMACRYPT OPTIONS
-.TP
-.B \-crypt drm_file
-crypts a specific track using ISMA AES CTR 128. 
-.TP
-.B \-decrypt [drm_file]
-decrypts a specific track using ISMA AES CTR 128. drm_file can be omitted if keys are in file.
-.TP
-.B \-set-kms [tkID=]kms_uri
-changes KMS location for all tracks or a given one if tkID is specified.
-.TP
-.B DRM file syntax for GPAC ISMACryp
-File is XML and shall start with xml header. File root is an "ISMACryp" element. File is a list of "ISMACrypTrack" elements. 
-.br
-ISMACrypTrack attributes:
-.br
-TrackID: ID of track to en/decrypt.
-.br
-key:  AES-128 key formatted (hex string 0x +32 chars.
-.br
-salt: CTR IV salt key (64 bits) (hex string 0x +16 chars.
-.br
-Encryption only attributes
-.br
-Scheme_URI: URI of scheme used.
-.br
-KMS_URI: URI of key management system - \'self\' writes key and salt in the file.
-.br
-selectiveType selective encryption type - understood values are "None":              all samples encrypted (default), "RAP":  only encrypts random access units, "Non-RAP":  only encrypts non-random access units, "Rand": random selection is performed", "X": Encrypts every first sample out of X, "RandX": Encrypts one random sample out of X.
-.br
-ipmpType: IPMP Signaling Type: None, IPMP, IPMPX.
-.br 
-ipmpDescriptorID: IPMP_Descriptor ID to use if IPMP(X) is used. If not set MP4Box will generate one for you.
-.
-
-.SH EXTRACTING OPTIONS
-.TP
-.B \-raw TrackID
-extracts given track in native format when supported.
-.TP
-.B \-raws TrackID
-extract each track sample to a file. Note: 'TrackID:N' extracts Nth sample of the track.
-.TP
-.B \-nhnt TrackID
-extracts given track in NHNT format. All track types except ObjectDescriptors tracks can be exported.
-.TP
-.B \-nhml TrackID
-extracts track in nhml format (XML nhnt). All track types except ObjectDescriptors tracks can be exported.
-.TP
-.B \-single TrackID
-extracts given track to a new mp4 file with a single track.
-.TP
-.B \-avi TrackID
-extracts visual track to an avi file.
-.TP
-.B \-qcp TrackID
-same as '-raw' but defaults to QCP file format for AVRC and SMV audio codecs.
-.TP
-.B \-aviraw TK
-extracts AVI track to its raw format. TK can be one of "video", "audio" or "audioN" for multi-track avi files (cf '-info'). 
-.TP
-.B \-saf
-remux file to SAF multiplex. 
-.TP
-.B \-dvbhdemux
-demux DVB-H file into IP Datagrams. 
-.TP
-.B \-diod
-extracts file IOD in raw format when supported. 
-.
-.SH DUMP OPTIONS
-.TP
-.B \-info [TrackID]
-prints movie and tracks information. If TrackID specified, dumps only extended track info. If input file is not an IsoMedia file, lists known tracks for import.
-.TP
-.B \-bt
-dumps complete scene in a BT file. This will remove unknown MPEG4 nodes.
-.TP
-.B \-xmt
-dumps complete scene in an XMT-A file. This will remove unknown MPEG4 nodes.
-.TP
-.B \-wrl
-dumps complete scene in an VRML97 WRL file. This will remove unknown VRML97 nodes.
-.TP
-.B \-x3d
-dumps complete scene in an X3D XML file. This will remove unknown X3D nodes.
-.TP
-.B \-x3dv
-dumps complete scene in an X3D Text (VRML) file. This will remove unknown X3D nodes.
-.TP
-.B \-lsr
-dumps complete scene in a LASeR+XML file. 
-.TP
-.B \-diso
-creates XML image of the file atoms.
-.TP
-.B \-drtp
-creates XML image of all hint tracks samples of a hinted mp4 file.
-.TP
-.B \-dts
-prints sample timing to text output.
-.TP
-.B \-dcr
-creates XML image of all ISMACryp tracks samples of an mp4 file.
-.TP
-.B \-sdp
-creates SDP file associated with a hinted mp4 file.
-.TP
-.B \-dump-cover
-Extracts cover art if any.
-.TP
-.B \-dump-chap
-Extracts chapter list to file if any.
-.TP
-.B \-ttxt
-converts input subtitle to GPAC TTXT format.
-.TP
-.B \-ttxt trackID
-exports given text track to GPAC TTXT format.
-.TP
-.B \-srt
-converts input subtitle to SRT format.
-.TP
-.B \-srt trackID
-exports given text track to SRT subtitle format.
-.TP
-.B \-std
-dumps to stdout rather than file.
-.TP
-.B \-stat
-generates statitistic report on node/field usage for the whole presentation.
-.TP
-.B \-stats
-generates statistic report on node/field usage per BIFS Access Unit.
-.TP
-.B \-statx
-generates statistic report on node/field usage in the scene graph after each BIFS Access Unit.
-.TP
-.B \-hash
-generates SHA-1 Hash of the input file.
-.
-.SH Meta OPTIONS
-.
-.LP
-MP4Box supports the Meta addition to IsoMedia file format, used to make the file a generic data container (timed or untimed).
-.TP
-.B \-set-meta args
-sets meta object type. Syntax is "ABCD[;tk=N] where:
-.br
-ABCD is the four character code of the type, or O/NULL to remove the meta object
-.br
-tk indicates whether the meta is at the root level (no "tk"), at the moov level (tk=0) or at the track level (tk=trackID).
-.TP 
-.B \-add-item args
-adds resource to the given meta. args is the item file path followed by ';' separated options:
-.br
-tk=N: same as above
-.br
-name=item_name: specifies the item name, otherwise file name is used
-.br
-mime=mimeType: specifies the item mime type, otherwise application/octet-stream is used
-.br
-encoding=enctype: specifies the content encoding type
-Note that file path set to "this" or "self" will identify the item added as the whole IsoMedia file
-.TP
-.B \-rem-item args
-removes item from given meta. Syntax is itemID[;tk=ID].
-.TP
-.B \-set-primary args
-sets given item as the primary one of the given meta. Syntax is itemID[;tk=ID].
-.TP
-.B \-set-xml args
-sets XML to the given meta. Syntax is xml_file_path[;tk=ID][;binary].
-.TP
-.B \-rem-xml [tk=ID]
-removes XML data from the given meta.
-.TP
-.B \-dump-xml xml_out_file_name[;tk=ID]
-dumps the XML data of the given meta to a file.
-.TP
-.B \-dump-item itemID[;tk=ID][;path=fileName]
-dumps the given item of the the given meta to a file. By default the item name is used as the output file name.
-.TP
-.B \-package
-packages input XML file into an ISO container. all media referenced except hyperlinks are added to file.
-.TP
-.B \-mgt
-packages input XML file into an MPEG-U widget in ISO container. All files contained in the current folder are added to the widget package.
-.
-.SH RTP STREAMER OPTIONS
-.
-.LP
-MP4Box can stream ISO files to RTP. The streamer currently doesn't support data carrouselling and will therefore not handle BIFS and OD streams properly.      
-.TP
-.B \-rtp
-enables rtp file streamer.
-.TP
-.B \-noloop
-disables looping when streaming.
-.TP
-.B \-mpeg4
-forces MPEG-4 ES Generic for all RTP streams.
-.TP
-.B \-dst=IP
-IP destination (uni/multi-cast). Default: 127.0.0.1.
-.TP
-.B \-port=PORT
-output port of the first stream. Default: 7000.
-.TP
-.B \-mtu=MTU
-path MTU for RTP packets. Default is 1450 bytes.
-.TP
-.B \-ifce=IP
-IP address of the physical interface to use. Default: NULL (ANY).
-.TP
-.B \-ttl=N
-time to live for multicast packets. Default: 1.
-.TP
-.B \-sdp=FILE
-file name of the generated SDP. Default is session.sdp.
-.
-.SH LIVE SCENE STREAMER OPTIONS
-.
-.LP
-MP4Box can stream BIFS or DIMS content to RTP with carousel generation and updates. The streamer currently doesn't support audio/video/image streaming at the same time. All options supported by the file streamer are supported.
-.TP
-.B \-live
-enables rtp live streamer.
-.TP
-.B \-dims
-turns on DIMS mode for SVG input - default: off.
-.TP
-.B \-src=FILE
-source of updates - default: null.
-.TP
-.B \-rap=TIME
-duration in ms of base carousel - default: 0 (off). you can specify the RAP period of a single ESID (not in DIMS) with -rap=ESID=X:time.
-.TP
-.B Runtime Options
-The following options can be used at prompt:
-.br
-q: quits
-.br
-u: inputs some commands to be sent
-.br
-U: same as u but signals the updates as critical
-.br
-e: inputs some commands to be sent without being aggregated
-.br
-E: same as e but signals the updates as critical
-.br
-f: forces RAP sending
-.br
-F: forces RAP regeneration and sending
-.br
-p: dumps current scene
-.
-.
-.SH SWF OPTIONS
-.
-.LP
-MP4Box can import very simple Macromedia Flash files (".SWF"). You can specify a SWF input file with -bt, xmt and -mp4 switches.
-.TP
-.B \-global
-all SWF defines are placed in first scene replace. By default SWF defines are sent when needed.
-.TP
-.B \-no-ctrl
-uses a dedicated stream for movie control. This will disable ActionScript.
-.TP
-.B \-no-text
-removes all SWF text.
-.TP
-.B \-no-font
-removes all embedded SWF Fonts, forcing usage of MPEG-4 Text and terminal fonts.
-.TP
-.B \-no-line
-removes all lines from SWF shapes.
-.TP
-.B \-no-grad
-removes all gradients from swf shapes.
-.TP
-.B \-quad
-uses quadratic bezier curves instead of cubic ones.
-.TP
-.B \-xlp
-support for lines transparency and scalability.
-.TP
-.B \-flatten Value
-replaces 2 consecutive lines by a single one when angle between lines is less than Value (expressed in radians). Value 0 disables flattening.
-.
-.
-.SH SUPPORTED INPUT FORMATS
-.TP
-.B RAW Formats and extensions
-.IP
-NHNT (.media .nhnt .info)
-.br
-MPEG Audio (.mp3)
-.br
-ADTS-AAC (.aac)
-.br
-MPEG-4 Visual (.cmp .m4v)
-.br
-H263 Video (.263 .h263)
-.br
-AVC/H264 Video (.h264 .h26L .264 .26L)
-.br
-JPEG Images (.jpg .jpeg)
-.br
-PNG Images (.png)
-.br
-AMR(WB) Audio (.amr .awb)
-.br
-EVRC Audio (.evc)
-.br
-SMV Audio (.smv)
-.
-.TP
-.B Container Formats and extensions
-.IP
-AVI (.avi)
-.br
-MPEG-PS (.mpg .mpeg .vob .vcd .svcd)
-.br
-QCP (.qcp)
-.br
-OGG (.ogg)
-.br
-ISO-Media files (no extension checking)
-.
-.TP
-.B Text Formats and extensions
-.IP
-.br
-SRT Subtitles (.srt)
-.br
-SUB Subtitles (.sub)
-.br
-GPAC Timed Text (.ttxt)
-.br
-QuickTime TeXML Text (.xml)  (cf QT documentation)
-.
-.TP
-.B Scene Formats and extensions
-.IP
-MPEG-4 XMT-A (.xmt .xmta .xmt.gz .xmta.gz)
-.br
-.br
-MPEG-4 BT (.bt .bt.gz)
-.br
-VRML (.wrl .wrl.gz)
-.br
-X3D-XML (.x3d .x3d.gz)
-.br
-X3D-VRML (.x3dv .x3dv.gz)
-.br
-MacroMedia Flash (.swf) - very limitted import support only
-.
-.
-.SH COMMON USAGE
-.TP
-.B Importing a file
-.IP
-Import an AVI: MP4Box -add myfile.avi mymp4.mp4
-.br
-Import audio from an AVI: MP4Box -add myfile.avi#audio mymp4.mp4
-.br
-Import video from an AVI: MP4Box -add myfile.avi#video mymp4.mp4
-.br
-Import an MP3 and leave data outside: MP4Box -dref -add myfile.mp3 mymp4.mp4
-.br
-Import a JPEG or PNG: MP4Box -add myfile.jpg mymp4.mp4
-.br
-Create a movie with subtitle: MP4Box -add video.avi -add audio.mp3 -add Subtitle.srt mymp4.mp4
-.br
-.TP
-.B Base File operations
-.IP
-Convert file for HTTP/FTP streaming: MP4Box -inter 1000 myfile.mp4
-.br
-Convert unknown file to ISMA for HTTP/FTP streaming: MP4Box -isma -inter 1000 myfile.mp4
-.br
-Convert unknown file to ISMA and respect ISMA broken sync: MP4Box -ismax myfile.mp4
-.br
-Convert unknown file to 3GP : MP4Box -3gp myfile.mp4
-.br
-.TP
-.B Hinting a File
-.IP
-Prepare any mp4 for ISMA streaming: MP4Box -isma -hint myfile.mp4
-.br
-Prepare any 3GP for streaming: MP4Box -hint myfile.3gp
-.br
-Prepare any 3GP for streaming with RTP aggregation : MP4Box -hint -multi myfile.3gp
-.br
-Prepare a simple audio/video mp4 optimized for server: MP4Box -hint -copy -tight myfile.mp4
-.br
-Prepare a complex mp4 with BIFS for streaming: MP4Box -ocr -iod -hint myfile.mp4
-.br
-.TP
-.B Encoding/Decoding a file
-.IP
-Encode a BT file and keep node names for later inspection: MP4Box -mp4 -def pres.bt
-.br
-Encode a XMT-A file: MP4Box -mp4 pres.xmt
-.br
-Translate BT to XMT-A file: MP4Box -xmt pres.bt
-.br
-Translate XMT-A to BT file: MP4Box -bt pres.xmt
-.br
-Decode MP4 to BT: MP4Box -bt pres.mp4
-.br
-.
-.SH BUGS and OTHER HELP
-.TP
-For bug reports, more information on BT or XMT-A formats or GPAC TTXT files or ISMACryp, MPEG-4 Systems usage and more help on MP4Box please visit the GPAC web site http://gpac.sourceforge.net
-.
-.SH "AUTHORS"
-.LP 
-Jean Le Feuvre <jeanlf@users.sourceforge.net> - GPAC (c) 2000-2005 - (c) Telecom ParisTech 2005-2011
-.
-.SH "SEE ALSO"
-.LP 
-GPAC(1), MP4Client(1)

gpac-0.8.0.tar.gz/doc/man/mp4client.1 Deleted

@@ -1,301 +0,0 @@
-.TH "MP4Client" 1 "March 2005" "MP4Client" "GPAC"
-.
-.SH NAME
-.LP 
-MP4Client \- GPAC MPEG-4 command-line Player
-.SH "SYNOPSIS"
-.LP 
-.B MP4Client
-.RI [options] \ [file]
-.br
-.
-.SH "DESCRIPTION"
-.LP 
-MP4Client is GPAC command-line player. It supports all GPAC playback features (2D and 3D support, local playback, RTP streaming, HTTP faststart, many audio and video codecs ...). MP4Client also supports visual extraction to BMP, RAW or AVI (no compression, no audio).
-.
-.
-.SH STARTUP OPTIONS
-.P
-.TP
-.B \-c file
-specifies config file to use. Default config file is located in user home directory and created if not found.
-.TP
-.B \-rti file
-logs run-time information to file. Information logged is: FPS, CPU, Memory usage.
-.TP
-.B \-quiet
-removes script message, buffering and downloading status.
-.TP
-.B \-strict-error
-exits after the first error is reported.
-.TP
-.B \-log-file FILE
-specifies where to write logs. Default is stdout. Same as -lf.
-.TP
-.B \-logs TOOLS
-sets log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@level. By default all errors are logged. level can be one of quiet, error, warning, info or debug. tool can be:
-.br
-core: libgpac core
-.br
-coding: bitstream formats (audio, video, scene)
-.br
-container: container formats (ISO File, MPEG-2 TS, AVI, ...)
-.br
-network: network data exept RTP trafic
-.br
-rtp: rtp trafic
-.br
-author: authoring tools (hint, import, export)
-.br
-sync: terminal sync layer
-.br
-codec: terminal codec messages
-.br
-parser: scene parsers (svg, xmt, bt) and other
-.br
-media: terminal media object management
-.br
-scene: scene graph and scene manager
-.br
-script: scripting engine messages
-.br
-interact: interaction engine (events, scripts, etc)
-.br
-smil: SMIL timing engine
-.br
-compose: composition engine (2D, 3D, etc)
-.br
-mmio: Audio/Video HW I/O management
-.br
-rti: various run-time stats
-.br
-cache: HTTP cache subsystem
-.br
-audio: Audio renderer and mixers
-.br
-mem: GPAC memory tracker
-.br
-module: GPAC modules debugging
-.br
-mutex: mutex
-.br
-none: no tool logged
-.br
-all: all tools logged - other tools can be specified afterwards.
-.br
-.
-.SH PLAYBACK OPTIONS
-A file can be controled during playback by typing one of the following key at prompt.
-.TP
-.B o
-connects to a new URL entered at prompt by user.
-.TP
-.B r
-restarts the current presentation
-.TP
-.B p
-plays/pauses the current presentation
-.TP
-.B s
-step one frame ahead in the current presentation
-.TP
-.B z
-seek into presentation. Seek percentage is entered at prompt
-.TP
-.B t
-prints current timing of the main timeline of the presentation
-.TP
-.B w
-prints world info of the current presentation
-.TP
-.B v
-prints list of all GF_ObjectDescriptor used in current presentation.
-.TP
-.B i
-prints information of a given OD. Object ID is entered at prompt.
-.TP
-.B b
-prints all objects timing and buffering info.
-.TP
-.B m
-prints all objects buffering and memory info.
-.TP
-.B d
-dumps current presentation scene graph to file or stdout.
-.TP
-.B k
-Turns stress mode on/off.
-.TP
-.B n
-Changes current navigation mode if possible/allowed. When a Layer3D is selected, sets layer3D navigation if allowed.
-.TP
-.B x
-Reset to last active viewpoint. When a layer3D is selected, resets layer3D viewpoint.
-.TP
-.B 2
-Reload MPEG-4 Client with GPAC 2D Renderer.
-.TP
-.B 3
-Reload MPEG-4 Client with GPAC 3D Renderer.
-.TP
-.B 4
-forces 4/3 Aspect Ratio.
-.TP
-.B 5
-forces 16/9 Aspect Ratio.
-.TP
-.B 6
-forces no aspect ratio (always fill screen).
-.TP
-.B 7
-forces original Aspect Ratio (default mode).
-.TP
-.B l
-prints the list of available plugins.
-.TP
-.B c
-prints some GPAC configuration info.
-.TP
-.B q
-quits the application.
-.TP
-.B C
-enables streaming cache.
-.TP
-.B S
-stops streaming cache and record it.
-.TP
-.B A
-stops streaming cache and discard it.
-.TP
-.B h
-prints list of available commands.
-.
-.SH WINDOW SHORTCUTS
-When MP4Client window has the focus, the following shortcuts are available
-.TP
-.B Alt + right
-Seeks 5% ahead from current time.
-.TP
-.B Alt + left
-Seeks 5% before the current time
-.TP
-.B Alt + up
-Increases volume by 5%
-.TP
-.B Alt + down
-Decreases volume by 5%
-.TP
-.B HOME
-Resets navigation to last bound viewpoint/viewport
-.TP
-.B 4, 5, 6, 7
-Same as non-window values
-.TP
-.B ESCAPE , alt+return, doubleclick
-Toggles fullscreen on/off.
-.TP
-.B ctrl + 'f'
-Prints current rendering framerate.
-.TP
-.B ctrl + 'R'
-Sends a redraw message (complete scene state recompute).
-.TP
-.B ctrl + 'P'
-Play/Pause.
-.TP
-.B ctrl + 'S'
-Step one frame ahead.
-.
-.SH CONFIGURATION FILE
-When launched for the first time, MP4Client will ask for a font directory and a cache directory.
-.TP
-.B Font Directory
-Indicates the absolute path to a directory containing a TrueType font repository. In case this directory is not specified or does not contain valid TrueType fonts, text will be disabled.
-.TP
-.B Cache Directory
-Indicates the absolute path to a directory with write access to store files retrieved through HTTP downloads. In case this directory is not specified or has no write access HTTP downloads won't work.
-.
-.SH NAVIGATION
-Navigation with MP4Client depends on the renderer type (2D or 3D) and also on content - some content may disable user selectable navigation.
-.TP
-.B Walk & Fly modes
-Mouse: Horizontal move: Horizontal pan - Vertical move: Z-translate - Vertical move+CTRL or Wheel: Vertical pan - Right Click (Walk mode only): Jump
-Keys: left/right: Horizontal pan - left/right+CTRL: Horizontal translate - up/down: Z-translate - up/down+CTRL: Vertical pan
-.TP
-.B Pan mode
-Mouse: Horizontal move: Horizontal pan - Vertical move: Vertical pan - Vertical move+CTRL or Wheel: Z-translate
-Keys: left/right: Horizontal pan - left/right+CTRL: Horizontal  translate - up/down: Vertical pan - up/down+CTRL: Z-translate
-.TP
-.B Slide mode
-Mouse: Horizontal move: Horizontal translate - Vertical move: Vertical translate - Vertical move+CTRL or Wheel: Z-translate
-Keys: left/right: Horizontal translate - left/right+CTRL: Horizontal pan - up/down: Vertical translate - up/down+CTRL: Z-translate
-.TP
-.B Examine & Orbit mode
-Mouse: Horizontal move: Y-Axis rotate - Horizontal move+CTRL: No move - Vertical move: X-Axis rotate - Vertical move+CTRL or Wheel: Z-translate
-Keys: left/right: Y-Axis rotate - left/right+CTRL: Horizontal translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate
-.TP
-.B Game mode (press END to escape)
-Mouse: Horizontal move: H pan - Vertical move: Vertical pan
-Keys: left/right: Horizontal translate - up/down: Z-translate
-.TP
-.B All 3D modes
-CTRL+PGUP/PGDOWN will zoom in/out camera (field of view)
-.TP
-.B Slide Mode in 2D
-Mouse: Horizontal move: Horizontal translate - Vertical move: Vertical translate - V move+CTRL: zoom
-Keys: left/right: Horizontal translate - up/down: Vertical translate - up/down+CTRL: zoom
-.TP
-.B Examine Mode in 2D (3D renderer only)
-Mouse: Horizontal move: Y-Axis rotate - Vertical move: X-Axis rotate
-Keys: left/right: Y-Axis rotate - up/down: X-Axis rotate
-.TP
-.B SHIFT
-Speeds up movement
-.
-.SH VISUAL EXTRACTION OPTIONS
-When used to dump a visual presentation, the client is no longer interactive. All GPAC features are supported during capture, except audio-related ones. The following options can be passed at prompt:
-.P
-.TP
-.B \-bmp [times]
-dumps the specified frames to BMP format. If no time is specified, capture is made at t=0s. time is given in millisecond, as an SMPTE time code or as HH:MM:SS:MS time code. You may specify several frame times by using a dash-separated list of times (eg, '0-10-15').
-.TP
-.B \-raw [times]
-dumps the specified frames to RAW format. If no time is specified, cpature is made at t=0s.
-.TP
-.B \-avi start:end
-dumps the specified segment to uncompressed AVI format.
-.TP
-.B \-fps rate
-specifies frame rate for AVI dumping. Default frame rate is 25.0.
-.TP
-.B \-size WxH
-specifies frame size for dumping. Default frame size is the scene size.
-.TP
-.B \-fill
-uses fill aspect ratio. By default, the scene aspect ratio is preserved when dumping.
-.TP
-.B \-show
-show window while dumping the content. By default, the window is hidden during capture.
-.TP
-.B \-2d
-forces usage of 2D renderer. By default, MP4Client uses the renderer indicated in GPAC configuration file.
-.TP
-.B \-3d
-forces usage of 3D renderer. By default, MP4Client uses the renderer indicated in GPAC configuration file.
-.TP
-.B \-quiet
-removes script message, buffering and downloading status.
-.
-.SH "FILES"
-.LP 
-.B GPAC Configuration File:
-~/.gpacrc
-.
-.SH "AUTHORS"
-.LP 
-Jean Le Feuvre <jeanlf@users.sourceforge.net> - GPAC (c) 2000-2005 - ENST 2005-200X
-.
-.SH "SEE ALSO"
-.LP 
-GPAC(1), MP4Box(1)

gpac-0.8.0.tar.gz/extra_lib/include/js Deleted

gpac-0.8.0.tar.gz/extra_lib/include/js/jsapi.h Deleted

@@ -1,2220 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsapi_h___
-#define jsapi_h___
-/*
- * JavaScript API.
- */
-#include <stddef.h>
-#include <stdio.h>
-#include "jspubtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/*
- * Type tags stored in the low bits of a jsval.
- */
-#define JSVAL_OBJECT            0x0     /* untagged reference to object */
-#define JSVAL_INT               0x1     /* tagged 31-bit integer value */
-#define JSVAL_DOUBLE            0x2     /* tagged reference to double */
-#define JSVAL_STRING            0x4     /* tagged reference to string */
-#define JSVAL_BOOLEAN           0x6     /* tagged boolean value */
-
-/* Type tag bitfield length and derived macros. */
-#define JSVAL_TAGBITS           3
-#define JSVAL_TAGMASK           JS_BITMASK(JSVAL_TAGBITS)
-#define JSVAL_TAG(v)            ((v) & JSVAL_TAGMASK)
-#define JSVAL_SETTAG(v,t)       ((v) | (t))
-#define JSVAL_CLRTAG(v)         ((v) & ~(jsval)JSVAL_TAGMASK)
-#define JSVAL_ALIGN             JS_BIT(JSVAL_TAGBITS)
-
-/* Predicates for type testing. */
-#define JSVAL_IS_OBJECT(v)      (JSVAL_TAG(v) == JSVAL_OBJECT)
-#define JSVAL_IS_NUMBER(v)      (JSVAL_IS_INT(v) || JSVAL_IS_DOUBLE(v))
-#define JSVAL_IS_INT(v)         (((v) & JSVAL_INT) && (v) != JSVAL_VOID)
-#define JSVAL_IS_DOUBLE(v)      (JSVAL_TAG(v) == JSVAL_DOUBLE)
-#define JSVAL_IS_STRING(v)      (JSVAL_TAG(v) == JSVAL_STRING)
-#define JSVAL_IS_BOOLEAN(v)     (JSVAL_TAG(v) == JSVAL_BOOLEAN)
-#define JSVAL_IS_NULL(v)        ((v) == JSVAL_NULL)
-#define JSVAL_IS_VOID(v)        ((v) == JSVAL_VOID)
-#define JSVAL_IS_PRIMITIVE(v)   (!JSVAL_IS_OBJECT(v) || JSVAL_IS_NULL(v))
-
-/* Objects, strings, and doubles are GC'ed. */
-#define JSVAL_IS_GCTHING(v)     (!((v) & JSVAL_INT) && !JSVAL_IS_BOOLEAN(v))
-#define JSVAL_TO_GCTHING(v)     ((void *)JSVAL_CLRTAG(v))
-#define JSVAL_TO_OBJECT(v)      ((JSObject *)JSVAL_TO_GCTHING(v))
-#define JSVAL_TO_DOUBLE(v)      ((jsdouble *)JSVAL_TO_GCTHING(v))
-#define JSVAL_TO_STRING(v)      ((JSString *)JSVAL_TO_GCTHING(v))
-#define OBJECT_TO_JSVAL(obj)    ((jsval)(obj))
-#define DOUBLE_TO_JSVAL(dp)     JSVAL_SETTAG((jsval)(dp), JSVAL_DOUBLE)
-#define STRING_TO_JSVAL(str)    JSVAL_SETTAG((jsval)(str), JSVAL_STRING)
-
-/* Lock and unlock the GC thing held by a jsval. */
-#define JSVAL_LOCK(cx,v)        (JSVAL_IS_GCTHING(v)                          \
-                                 ? JS_LockGCThing(cx, JSVAL_TO_GCTHING(v))    \
-                                 : JS_TRUE)
-#define JSVAL_UNLOCK(cx,v)      (JSVAL_IS_GCTHING(v)                          \
-                                 ? JS_UnlockGCThing(cx, JSVAL_TO_GCTHING(v))  \
-                                 : JS_TRUE)
-
-/* Domain limits for the jsval int type. */
-#define JSVAL_INT_BITS          31
-#define JSVAL_INT_POW2(n)       ((jsval)1 << (n))
-#define JSVAL_INT_MIN           ((jsval)1 - JSVAL_INT_POW2(30))
-#define JSVAL_INT_MAX           (JSVAL_INT_POW2(30) - 1)
-#define INT_FITS_IN_JSVAL(i)    ((jsuint)((i)+JSVAL_INT_MAX) <= 2*JSVAL_INT_MAX)
-#define JSVAL_TO_INT(v)         ((jsint)(v) >> 1)
-#define INT_TO_JSVAL(i)         (((jsval)(i) << 1) | JSVAL_INT)
-
-/* Convert between boolean and jsval. */
-#define JSVAL_TO_BOOLEAN(v)     ((JSBool)((v) >> JSVAL_TAGBITS))
-#define BOOLEAN_TO_JSVAL(b)     JSVAL_SETTAG((jsval)(b) << JSVAL_TAGBITS,     \
-                                             JSVAL_BOOLEAN)
-
-/* A private data pointer (2-byte-aligned) can be stored as an int jsval. */
-#define JSVAL_TO_PRIVATE(v)     ((void *)((v) & ~JSVAL_INT))
-#define PRIVATE_TO_JSVAL(p)     ((jsval)(p) | JSVAL_INT)
-
-/* Property attributes, set in JSPropertySpec and passed to API functions. */
-#define JSPROP_ENUMERATE        0x01    /* property is visible to for/in loop */
-#define JSPROP_READONLY         0x02    /* not settable: assignment is no-op */
-#define JSPROP_PERMANENT        0x04    /* property cannot be deleted */
-#define JSPROP_EXPORTED         0x08    /* property is exported from object */
-#define JSPROP_GETTER           0x10    /* property holds getter function */
-#define JSPROP_SETTER           0x20    /* property holds setter function */
-#define JSPROP_SHARED           0x40    /* don't allocate a value slot for this
-                                           property; don't copy the property on
-                                           set of the same-named property in an
-                                           object that delegates to a prototype
-                                           containing this property */
-#define JSPROP_INDEX            0x80    /* name is actually (jsint) index */
-
-/* Function flags, set in JSFunctionSpec and passed to JS_NewFunction etc. */
-#define JSFUN_LAMBDA            0x08    /* expressed, not declared, function */
-#define JSFUN_GETTER            JSPROP_GETTER
-#define JSFUN_SETTER            JSPROP_SETTER
-#define JSFUN_BOUND_METHOD      0x40    /* bind this to fun->object's parent */
-#define JSFUN_HEAVYWEIGHT       0x80    /* activation requires a Call object */
-
-#define JSFUN_DISJOINT_FLAGS(f) ((f) & 0x0f)
-#define JSFUN_GSFLAGS(f)        ((f) & (JSFUN_GETTER | JSFUN_SETTER))
-
-#ifdef MOZILLA_1_8_BRANCH
-
-/*
- * Squeeze three more bits into existing 8-bit flags by taking advantage of
- * the invalid combination (JSFUN_GETTER | JSFUN_SETTER).
- */
-#define JSFUN_GETTER_TEST(f)       (JSFUN_GSFLAGS(f) == JSFUN_GETTER)
-#define JSFUN_SETTER_TEST(f)       (JSFUN_GSFLAGS(f) == JSFUN_SETTER)
-#define JSFUN_FLAGS_TEST(f,t)      (JSFUN_GSFLAGS(~(f)) ? (f) & (t) : 0)
-#define JSFUN_BOUND_METHOD_TEST(f) JSFUN_FLAGS_TEST(f, JSFUN_BOUND_METHOD)
-#define JSFUN_HEAVYWEIGHT_TEST(f)  JSFUN_FLAGS_TEST(f, JSFUN_HEAVYWEIGHT)
-
-#define JSFUN_GSFLAG2ATTR(f)       (JSFUN_GETTER_TEST(f) ? JSPROP_GETTER :    \
-                                    JSFUN_SETTER_TEST(f) ? JSPROP_SETTER : 0)
-
-#define JSFUN_THISP_FLAGS(f)    (JSFUN_GSFLAGS(~(f)) ? 0 :                    \
-                                 (f) & JSFUN_THISP_PRIMITIVE)
-#define JSFUN_THISP_TEST(f,t)   ((f) == (t) || (f) == JSFUN_THISP_PRIMITIVE)
-
-#define JSFUN_THISP_STRING      0x30    /* |this| may be a primitive string */
-#define JSFUN_THISP_NUMBER      0x70    /* |this| may be a primitive number */
-#define JSFUN_THISP_BOOLEAN     0xb0    /* |this| may be a primitive boolean */
-#define JSFUN_THISP_PRIMITIVE   0xf0    /* |this| may be any primitive value */
-
-#define JSFUN_FLAGS_MASK        0xf8    /* overlay JSFUN_* attributes */
-
-#else
-
-#define JSFUN_GETTER_TEST(f)       ((f) & JSFUN_GETTER)
-#define JSFUN_SETTER_TEST(f)       ((f) & JSFUN_SETTER)
-#define JSFUN_BOUND_METHOD_TEST(f) ((f) & JSFUN_BOUND_METHOD)
-#define JSFUN_HEAVYWEIGHT_TEST(f)  ((f) & JSFUN_HEAVYWEIGHT)
-
-#define JSFUN_GSFLAG2ATTR(f)       JSFUN_GSFLAGS(f)
-
-#define JSFUN_THISP_FLAGS(f)  (f)
-#define JSFUN_THISP_TEST(f,t) ((f) & t)
-
-#define JSFUN_THISP_STRING    0x0100    /* |this| may be a primitive string */
-#define JSFUN_THISP_NUMBER    0x0200    /* |this| may be a primitive number */
-#define JSFUN_THISP_BOOLEAN   0x0400    /* |this| may be a primitive boolean */
-#define JSFUN_THISP_PRIMITIVE 0x0700    /* |this| may be any primitive value */
-
-#define JSFUN_FLAGS_MASK      0x07f8    /* overlay JSFUN_* attributes --
-                                           note that bit #15 is used internally
-                                           to flag interpreted functions */
-
-#endif
-
-/*
- * Re-use JSFUN_LAMBDA, which applies only to scripted functions, for use in
- * JSFunctionSpec arrays that specify generic native prototype methods, i.e.,
- * methods of a class prototype that are exposed as static methods taking an
- * extra leading argument: the generic |this| parameter.
- *
- * If you set this flag in a JSFunctionSpec struct's flags initializer, then
- * that struct must live at least as long as the native static method object
- * created due to this flag by JS_DefineFunctions or JS_InitClass.  Typically
- * JSFunctionSpec structs are allocated in static arrays.
- */
-#define JSFUN_GENERIC_NATIVE    JSFUN_LAMBDA
-
-/*
- * Well-known JS values.  The extern'd variables are initialized when the
- * first JSContext is created by JS_NewContext (see below).
- */
-#define JSVAL_VOID              INT_TO_JSVAL(0 - JSVAL_INT_POW2(30))
-#define JSVAL_NULL              OBJECT_TO_JSVAL(0)
-#define JSVAL_ZERO              INT_TO_JSVAL(0)
-#define JSVAL_ONE               INT_TO_JSVAL(1)
-#define JSVAL_FALSE             BOOLEAN_TO_JSVAL(JS_FALSE)
-#define JSVAL_TRUE              BOOLEAN_TO_JSVAL(JS_TRUE)
-
-/*
- * Microseconds since the epoch, midnight, January 1, 1970 UTC.  See the
- * comment in jstypes.h regarding safe int64 usage.
- */
-extern JS_PUBLIC_API(int64)
-JS_Now();
-
-/* Don't want to export data, so provide accessors for non-inline jsvals. */
-extern JS_PUBLIC_API(jsval)
-JS_GetNaNValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetNegativeInfinityValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetPositiveInfinityValue(JSContext *cx);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetEmptyStringValue(JSContext *cx);
-
-/*
- * Format is a string of the following characters (spaces are insignificant),
- * specifying the tabulated type conversions:
- *
- *   b      JSBool          Boolean
- *   c      uint16/jschar   ECMA uint16, Unicode char
- *   i      int32           ECMA int32
- *   u      uint32          ECMA uint32
- *   j      int32           Rounded int32 (coordinate)
- *   d      jsdouble        IEEE double
- *   I      jsdouble        Integral IEEE double
- *   s      char *          C string
- *   S      JSString *      Unicode string, accessed by a JSString pointer
- *   W      jschar *        Unicode character vector, 0-terminated (W for wide)
- *   o      JSObject *      Object reference
- *   f      JSFunction *    Function private
- *   v      jsval           Argument value (no conversion)
- *   *      N/A             Skip this argument (no vararg)
- *   /      N/A             End of required arguments
- *
- * The variable argument list after format must consist of &b, &c, &s, e.g.,
- * where those variables have the types given above.  For the pointer types
- * char *, JSString *, and JSObject *, the pointed-at memory returned belongs
- * to the JS runtime, not to the calling native code.  The runtime promises
- * to keep this memory valid so long as argv refers to allocated stack space
- * (so long as the native function is active).
- *
- * Fewer arguments than format specifies may be passed only if there is a /
- * in format after the last required argument specifier and argc is at least
- * the number of required arguments.  More arguments than format specifies
- * may be passed without error; it is up to the caller to deal with trailing
- * unconverted arguments.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertArguments(JSContext *cx, uintN argc, jsval *argv, const char *format,
-                    ...);
-
-#ifdef va_start
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertArgumentsVA(JSContext *cx, uintN argc, jsval *argv,
-                      const char *format, va_list ap);
-#endif
-
-/*
- * Inverse of JS_ConvertArguments: scan format and convert trailing arguments
- * into jsvals, GC-rooted if necessary by the JS stack.  Return null on error,
- * and a pointer to the new argument vector on success.  Also return a stack
- * mark on success via *markp, in which case the caller must eventually clean
- * up by calling JS_PopArguments.
- *
- * Note that the number of actual arguments supplied is specified exclusively
- * by format, so there is no argc parameter.
- */
-extern JS_PUBLIC_API(jsval *)
-JS_PushArguments(JSContext *cx, void **markp, const char *format, ...);
-
-#ifdef va_start
-extern JS_PUBLIC_API(jsval *)
-JS_PushArgumentsVA(JSContext *cx, void **markp, const char *format, va_list ap);
-#endif
-
-extern JS_PUBLIC_API(void)
-JS_PopArguments(JSContext *cx, void *mark);
-
-#ifdef JS_ARGUMENT_FORMATTER_DEFINED
-
-/*
- * Add and remove a format string handler for JS_{Convert,Push}Arguments{,VA}.
- * The handler function has this signature (see jspubtd.h):
- *
- *   JSBool MyArgumentFormatter(JSContext *cx, const char *format,
- *                              JSBool fromJS, jsval **vpp, va_list *app);
- *
- * It should return true on success, and return false after reporting an error
- * or detecting an already-reported error.
- *
- * For a given format string, for example "AA", the formatter is called from
- * JS_ConvertArgumentsVA like so:
- *
- *   formatter(cx, "AA...", JS_TRUE, &sp, &ap);
- *
- * sp points into the arguments array on the JS stack, while ap points into
- * the stdarg.h va_list on the C stack.  The JS_TRUE passed for fromJS tells
- * the formatter to convert zero or more jsvals at sp to zero or more C values
- * accessed via pointers-to-values at ap, updating both sp (via *vpp) and ap
- * (via *app) to point past the converted arguments and their result pointers
- * on the C stack.
- *
- * When called from JS_PushArgumentsVA, the formatter is invoked thus:
- *
- *   formatter(cx, "AA...", JS_FALSE, &sp, &ap);
- *
- * where JS_FALSE for fromJS means to wrap the C values at ap according to the
- * format specifier and store them at sp, updating ap and sp appropriately.
- *
- * The "..." after "AA" is the rest of the format string that was passed into
- * JS_{Convert,Push}Arguments{,VA}.  The actual format trailing substring used
- * in each Convert or PushArguments call is passed to the formatter, so that
- * one such function may implement several formats, in order to share code.
- *
- * Remove just forgets about any handler associated with format.  Add does not
- * copy format, it points at the string storage allocated by the caller, which
- * is typically a string constant.  If format is in dynamic storage, it is up
- * to the caller to keep the string alive until Remove is called.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_AddArgumentFormatter(JSContext *cx, const char *format,
-                        JSArgumentFormatter formatter);
-
-extern JS_PUBLIC_API(void)
-JS_RemoveArgumentFormatter(JSContext *cx, const char *format);
-
-#endif /* JS_ARGUMENT_FORMATTER_DEFINED */
-
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertValue(JSContext *cx, jsval v, JSType type, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToObject(JSContext *cx, jsval v, JSObject **objp);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_ValueToFunction(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_ValueToConstructor(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSString *)
-JS_ValueToString(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToNumber(JSContext *cx, jsval v, jsdouble *dp);
-
-/*
- * Convert a value to a number, then to an int32, according to the ECMA rules
- * for ToInt32.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToECMAInt32(JSContext *cx, jsval v, int32 *ip);
-
-/*
- * Convert a value to a number, then to a uint32, according to the ECMA rules
- * for ToUint32.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToECMAUint32(JSContext *cx, jsval v, uint32 *ip);
-
-/*
- * Convert a value to a number, then to an int32 if it fits by rounding to
- * nearest; but failing with an error report if the double is out of range
- * or unordered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToInt32(JSContext *cx, jsval v, int32 *ip);
-
-/*
- * ECMA ToUint16, for mapping a jsval to a Unicode point.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToUint16(JSContext *cx, jsval v, uint16 *ip);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToBoolean(JSContext *cx, jsval v, JSBool *bp);
-
-extern JS_PUBLIC_API(JSType)
-JS_TypeOfValue(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(const char *)
-JS_GetTypeName(JSContext *cx, JSType type);
-
-/************************************************************************/
-
-/*
- * Initialization, locking, contexts, and memory allocation.
- */
-#define JS_NewRuntime       JS_Init
-#define JS_DestroyRuntime   JS_Finish
-#define JS_LockRuntime      JS_Lock
-#define JS_UnlockRuntime    JS_Unlock
-
-extern JS_PUBLIC_API(JSRuntime *)
-JS_NewRuntime(uint32 maxbytes);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyRuntime(JSRuntime *rt);
-
-extern JS_PUBLIC_API(void)
-JS_ShutDown(void);
-
-JS_PUBLIC_API(void *)
-JS_GetRuntimePrivate(JSRuntime *rt);
-
-JS_PUBLIC_API(void)
-JS_SetRuntimePrivate(JSRuntime *rt, void *data);
-
-#ifdef JS_THREADSAFE
-
-extern JS_PUBLIC_API(void)
-JS_BeginRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_EndRequest(JSContext *cx);
-
-/* Yield to pending GC operations, regardless of request depth */
-extern JS_PUBLIC_API(void)
-JS_YieldRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_SuspendRequest(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_ResumeRequest(JSContext *cx, jsrefcount saveDepth);
-
-#ifdef __cplusplus
-JS_END_EXTERN_C
-
-class JSAutoRequest {
-  public:
-    JSAutoRequest(JSContext *cx) : mContext(cx), mSaveDepth(0) {
-        JS_BeginRequest(mContext);
-    }
-    ~JSAutoRequest() {
-        JS_EndRequest(mContext);
-    }
-
-    void suspend() {
-        mSaveDepth = JS_SuspendRequest(mContext);
-    }
-    void resume() {
-        JS_ResumeRequest(mContext, mSaveDepth);
-    }
-
-  protected:
-    JSContext *mContext;
-    jsrefcount mSaveDepth;
-
-#if 0
-  private:
-    static void *operator new(size_t) CPP_THROW_NEW { return 0; };
-    static void operator delete(void *, size_t) { };
-#endif
-};
-
-JS_BEGIN_EXTERN_C
-#endif
-
-#endif /* JS_THREADSAFE */
-
-extern JS_PUBLIC_API(void)
-JS_Lock(JSRuntime *rt);
-
-extern JS_PUBLIC_API(void)
-JS_Unlock(JSRuntime *rt);
-
-extern JS_PUBLIC_API(JSContextCallback)
-JS_SetContextCallback(JSRuntime *rt, JSContextCallback cxCallback);
-
-extern JS_PUBLIC_API(JSContext *)
-JS_NewContext(JSRuntime *rt, size_t stackChunkSize);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContext(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContextNoGC(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyContextMaybeGC(JSContext *cx);
-
-extern JS_PUBLIC_API(void *)
-JS_GetContextPrivate(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_SetContextPrivate(JSContext *cx, void *data);
-
-extern JS_PUBLIC_API(JSRuntime *)
-JS_GetRuntime(JSContext *cx);
-
-extern JS_PUBLIC_API(JSContext *)
-JS_ContextIterator(JSRuntime *rt, JSContext **iterp);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_GetVersion(JSContext *cx);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_SetVersion(JSContext *cx, JSVersion version);
-
-extern JS_PUBLIC_API(const char *)
-JS_VersionToString(JSVersion version);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_StringToVersion(const char *string);
-
-/*
- * JS options are orthogonal to version, and may be freely composed with one
- * another as well as with version.
- *
- * JSOPTION_VAROBJFIX is recommended -- see the comments associated with the
- * prototypes for JS_ExecuteScript, JS_EvaluateScript, etc.
- */
-#define JSOPTION_STRICT         JS_BIT(0)       /* warn on dubious practice */
-#define JSOPTION_WERROR         JS_BIT(1)       /* convert warning to error */
-#define JSOPTION_VAROBJFIX      JS_BIT(2)       /* make JS_EvaluateScript use
-                                                   the last object on its 'obj'
-                                                   param's scope chain as the
-                                                   ECMA 'variables object' */
-#define JSOPTION_PRIVATE_IS_NSISUPPORTS \
-                                JS_BIT(3)       /* context private data points
-                                                   to an nsISupports subclass */
-#define JSOPTION_COMPILE_N_GO   JS_BIT(4)       /* caller of JS_Compile*Script
-                                                   promises to execute compiled
-                                                   script once only; enables
-                                                   compile-time scope chain
-                                                   resolution of consts. */
-#define JSOPTION_ATLINE         JS_BIT(5)       /* //@line number ["filename"]
-                                                   option supported for the
-                                                   XUL preprocessor and kindred
-                                                   beasts. */
-#define JSOPTION_XML            JS_BIT(6)       /* EMCAScript for XML support:
-                                                   parse  as a token,
-                                                   not backward compatible with
-                                                   the comment-hiding hack used
-                                                   in HTML script tags. */
-#define JSOPTION_NATIVE_BRANCH_CALLBACK \
-                                JS_BIT(7)       /* the branch callback set by
-                                                   JS_SetBranchCallback may be
-                                                   called with a null script
-                                                   parameter, by native code
-                                                   that loops intensively */
-#define JSOPTION_DONT_REPORT_UNCAUGHT \
-                                JS_BIT(8)       /* When returning from the
-                                                   outermost API call, prevent
-                                                   uncaught exceptions from
-                                                   being converted to error
-                                                   reports */
-
-extern JS_PUBLIC_API(uint32)
-JS_GetOptions(JSContext *cx);
-
-extern JS_PUBLIC_API(uint32)
-JS_SetOptions(JSContext *cx, uint32 options);
-
-extern JS_PUBLIC_API(uint32)
-JS_ToggleOptions(JSContext *cx, uint32 options);
-
-extern JS_PUBLIC_API(const char *)
-JS_GetImplementationVersion(void);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetGlobalObject(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_SetGlobalObject(JSContext *cx, JSObject *obj);
-
-/*
- * Initialize standard JS class constructors, prototypes, and any top-level
- * functions and constants associated with the standard classes (e.g. isNaN
- * for Number).
- *
- * NB: This sets cx's global object to obj if it was null.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_InitStandardClasses(JSContext *cx, JSObject *obj);
-
-/*
- * Resolve id, which must contain either a string or an int, to a standard
- * class name in obj if possible, defining the class's constructor and/or
- * prototype and storing true in *resolved.  If id does not name a standard
- * class or a top-level property induced by initializing a standard class,
- * store false in *resolved and just return true.  Return false on error,
- * as usual for JSBool result-typed API entry points.
- *
- * This API can be called directly from a global object class's resolve op,
- * to define standard classes lazily.  The class's enumerate op should call
- * JS_EnumerateStandardClasses(cx, obj), to define eagerly during for..in
- * loops any classes not yet resolved lazily.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id,
-                        JSBool *resolved);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EnumerateStandardClasses(JSContext *cx, JSObject *obj);
-
-/*
- * Enumerate any already-resolved standard class ids into ida, or into a new
- * JSIdArray if ida is null.  Return the augmented array on success, null on
- * failure with ida (if it was non-null on entry) destroyed.
- */
-extern JS_PUBLIC_API(JSIdArray *)
-JS_EnumerateResolvedStandardClasses(JSContext *cx, JSObject *obj,
-                                    JSIdArray *ida);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetClassObject(JSContext *cx, JSObject *obj, JSProtoKey key,
-                  JSObject **objp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetScopeChain(JSContext *cx);
-
-extern JS_PUBLIC_API(void *)
-JS_malloc(JSContext *cx, size_t nbytes);
-
-extern JS_PUBLIC_API(void *)
-JS_realloc(JSContext *cx, void *p, size_t nbytes);
-
-extern JS_PUBLIC_API(void)
-JS_free(JSContext *cx, void *p);
-
-extern JS_PUBLIC_API(char *)
-JS_strdup(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(jsdouble *)
-JS_NewDouble(JSContext *cx, jsdouble d);
-
-extern JS_PUBLIC_API(JSBool)
-JS_NewDoubleValue(JSContext *cx, jsdouble d, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_NewNumberValue(JSContext *cx, jsdouble d, jsval *rval);
-
-/*
- * A JS GC root is a pointer to a JSObject *, JSString *, or jsdouble * that
- * itself points into the GC heap (more recently, we support this extension:
- * a root may be a pointer to a jsval v for which JSVAL_IS_GCTHING(v) is true).
- *
- * Therefore, you never pass JSObject *obj to JS_AddRoot(cx, obj).  You always
- * call JS_AddRoot(cx, &obj), passing obj by reference.  And later, before obj
- * or the structure it is embedded within goes out of scope or is freed, you
- * must call JS_RemoveRoot(cx, &obj).
- *
- * Also, use JS_AddNamedRoot(cx, &structPtr->memberObj, "structPtr->memberObj")
- * in preference to JS_AddRoot(cx, &structPtr->memberObj), in order to identify
- * roots by their source callsites.  This way, you can find the callsite while
- * debugging if you should fail to do JS_RemoveRoot(cx, &structPtr->memberObj)
- * before freeing structPtr's memory.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_AddRoot(JSContext *cx, void *rp);
-
-#ifdef NAME_ALL_GC_ROOTS
-#define JS_DEFINE_TO_TOKEN(def) #def
-#define JS_DEFINE_TO_STRING(def) JS_DEFINE_TO_TOKEN(def)
-#define JS_AddRoot(cx,rp) JS_AddNamedRoot((cx), (rp), (__FILE__ ":" JS_TOKEN_TO_STRING(__LINE__))
-#endif
-
-extern JS_PUBLIC_API(JSBool)
-JS_AddNamedRoot(JSContext *cx, void *rp, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AddNamedRootRT(JSRuntime *rt, void *rp, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_RemoveRoot(JSContext *cx, void *rp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_RemoveRootRT(JSRuntime *rt, void *rp);
-
-/*
- * The last GC thing of each type (object, string, double, external string
- * types) created on a given context is kept alive until another thing of the
- * same type is created, using a newborn root in the context.  These newborn
- * roots help native code protect newly-created GC-things from GC invocations
- * activated before those things can be rooted using local or global roots.
- *
- * However, the newborn roots can also entrain great gobs of garbage, so the
- * JS_GC entry point clears them for the context on which GC is being forced.
- * Embeddings may need to do likewise for all contexts.
- *
- * See the scoped local root API immediately below for a better way to manage
- * newborns in cases where native hooks (functions, getters, setters, etc.)
- * create many GC-things, potentially without connecting them to predefined
- * local roots such as *rval or argv[i] in an active native function.  Using
- * JS_EnterLocalRootScope disables updating of the context's per-gc-thing-type
- * newborn roots, until control flow unwinds and leaves the outermost nesting
- * local root scope.
- */
-extern JS_PUBLIC_API(void)
-JS_ClearNewbornRoots(JSContext *cx);
-
-/*
- * Scoped local root management allows native functions, getter/setters, etc.
- * to avoid worrying about the newborn root pigeon-holes, overloading local
- * roots allocated in argv and *rval, or ending up having to call JS_Add*Root
- * and JS_RemoveRoot to manage global roots temporarily.
- *
- * Instead, calling JS_EnterLocalRootScope and JS_LeaveLocalRootScope around
- * the body of the native hook causes the engine to allocate a local root for
- * each newborn created in between the two API calls, using a local root stack
- * associated with cx.  For example:
- *
- *    JSBool
- *    my_GetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
- *    {
- *        JSBool ok;
- *
- *        if (!JS_EnterLocalRootScope(cx))
- *            return JS_FALSE;
- *        ok = my_GetPropertyBody(cx, obj, id, vp);
- *        JS_LeaveLocalRootScope(cx);
- *        return ok;
- *    }
- *
- * NB: JS_LeaveLocalRootScope must be called once for every prior successful
- * call to JS_EnterLocalRootScope.  If JS_EnterLocalRootScope fails, you must
- * not make the matching JS_LeaveLocalRootScope call.
- *
- * JS_LeaveLocalRootScopeWithResult(cx, rval) is an alternative way to leave
- * a local root scope that protects a result or return value, by effectively
- * pushing it in the caller's local root scope.
- *
- * In case a native hook allocates many objects or other GC-things, but the
- * native protects some of those GC-things by storing them as property values
- * in an object that is itself protected, the hook can call JS_ForgetLocalRoot
- * to free the local root automatically pushed for the now-protected GC-thing.
- *
- * JS_ForgetLocalRoot works on any GC-thing allocated in the current local
- * root scope, but it's more time-efficient when called on references to more
- * recently created GC-things.  Calling it successively on other than the most
- * recently allocated GC-thing will tend to average the time inefficiency, and
- * may risk O(n^2) growth rate, but in any event, you shouldn't allocate too
- * many local roots if you can root as you go (build a tree of objects from
- * the top down, forgetting each latest-allocated GC-thing immediately upon
- * linking it to its parent).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_EnterLocalRootScope(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_LeaveLocalRootScope(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_LeaveLocalRootScopeWithResult(JSContext *cx, jsval rval);
-
-extern JS_PUBLIC_API(void)
-JS_ForgetLocalRoot(JSContext *cx, void *thing);
-
-#ifdef __cplusplus
-JS_END_EXTERN_C
-
-class JSAutoLocalRootScope {
-  public:
-    JSAutoLocalRootScope(JSContext *cx) : mContext(cx) {
-        JS_EnterLocalRootScope(mContext);
-    }
-    ~JSAutoLocalRootScope() {
-        JS_LeaveLocalRootScope(mContext);
-    }
-
-    void forget(void *thing) {
-        JS_ForgetLocalRoot(mContext, thing);
-    }
-
-  protected:
-    JSContext *mContext;
-
-#if 0
-  private:
-    static void *operator new(size_t) CPP_THROW_NEW { return 0; };
-    static void operator delete(void *, size_t) { };
-#endif
-};
-
-JS_BEGIN_EXTERN_C
-#endif
-
-#ifdef DEBUG
-extern JS_PUBLIC_API(void)
-JS_DumpNamedRoots(JSRuntime *rt,
-                  void (*dump)(const char *name, void *rp, void *data),
-                  void *data);
-#endif
-
-/*
- * Call JS_MapGCRoots to map the GC's roots table using map(rp, name, data).
- * The root is pointed at by rp; if the root is unnamed, name is null; data is
- * supplied from the third parameter to JS_MapGCRoots.
- *
- * The map function should return JS_MAP_GCROOT_REMOVE to cause the currently
- * enumerated root to be removed.  To stop enumeration, set JS_MAP_GCROOT_STOP
- * in the return value.  To keep on mapping, return JS_MAP_GCROOT_NEXT.  These
- * constants are flags; you can OR them together.
- *
- * This function acquires and releases rt's GC lock around the mapping of the
- * roots table, so the map function should run to completion in as few cycles
- * as possible.  Of course, map cannot call JS_GC, JS_MaybeGC, JS_BeginRequest,
- * or any JS API entry point that acquires locks, without double-tripping or
- * deadlocking on the GC lock.
- *
- * JS_MapGCRoots returns the count of roots that were successfully mapped.
- */
-#define JS_MAP_GCROOT_NEXT      0       /* continue mapping entries */
-#define JS_MAP_GCROOT_STOP      1       /* stop mapping entries */
-#define JS_MAP_GCROOT_REMOVE    2       /* remove and free the current entry */
-
-typedef intN
-(* JS_DLL_CALLBACK JSGCRootMapFun)(void *rp, const char *name, void *data);
-
-extern JS_PUBLIC_API(uint32)
-JS_MapGCRoots(JSRuntime *rt, JSGCRootMapFun map, void *data);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LockGCThing(JSContext *cx, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LockGCThingRT(JSRuntime *rt, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_UnlockGCThing(JSContext *cx, void *thing);
-
-extern JS_PUBLIC_API(JSBool)
-JS_UnlockGCThingRT(JSRuntime *rt, void *thing);
-
-/*
- * For implementors of JSObjectOps.mark, to mark a GC-thing reachable via a
- * property or other strong ref identified for debugging purposes by name.
- * The name argument's storage needs to live only as long as the call to
- * this routine.
- *
- * The final arg is used by GC_MARK_DEBUG code to build a ref path through
- * the GC's live thing graph.  Implementors of JSObjectOps.mark should pass
- * its final arg through to this function when marking all GC-things that are
- * directly reachable from the object being marked.
- *
- * See the JSMarkOp typedef in jspubtd.h, and the JSObjectOps struct below.
- */
-extern JS_PUBLIC_API(void)
-JS_MarkGCThing(JSContext *cx, void *thing, const char *name, void *arg);
-
-extern JS_PUBLIC_API(void)
-JS_GC(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_MaybeGC(JSContext *cx);
-
-extern JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallback(JSContext *cx, JSGCCallback cb);
-
-extern JS_PUBLIC_API(JSGCCallback)
-JS_SetGCCallbackRT(JSRuntime *rt, JSGCCallback cb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsAboutToBeFinalized(JSContext *cx, void *thing);
-
-typedef enum JSGCParamKey {
-    JSGC_MAX_BYTES        = 0,  /* maximum nominal heap before last ditch GC */
-    JSGC_MAX_MALLOC_BYTES = 1   /* # of JS_malloc bytes before last ditch GC */
-} JSGCParamKey;
-
-extern JS_PUBLIC_API(void)
-JS_SetGCParameter(JSRuntime *rt, JSGCParamKey key, uint32 value);
-
-/*
- * Add a finalizer for external strings created by JS_NewExternalString (see
- * below) using a type-code returned from this function, and that understands
- * how to free or release the memory pointed at by JS_GetStringChars(str).
- *
- * Return a nonnegative type index if there is room for finalizer in the
- * global GC finalizers table, else return -1.  If the engine is compiled
- * JS_THREADSAFE and used in a multi-threaded environment, this function must
- * be invoked on the primordial thread only, at startup -- or else the entire
- * program must single-thread itself while loading a module that calls this
- * function.
- */
-extern JS_PUBLIC_API(intN)
-JS_AddExternalStringFinalizer(JSStringFinalizeOp finalizer);
-
-/*
- * Remove finalizer from the global GC finalizers table, returning its type
- * code if found, -1 if not found.
- *
- * As with JS_AddExternalStringFinalizer, there is a threading restriction
- * if you compile the engine JS_THREADSAFE: this function may be called for a
- * given finalizer pointer on only one thread; different threads may call to
- * remove distinct finalizers safely.
- *
- * You must ensure that all strings with finalizer's type have been collected
- * before calling this function.  Otherwise, string data will be leaked by the
- * GC, for want of a finalizer to call.
- */
-extern JS_PUBLIC_API(intN)
-JS_RemoveExternalStringFinalizer(JSStringFinalizeOp finalizer);
-
-/*
- * Create a new JSString whose chars member refers to external memory, i.e.,
- * memory requiring special, type-specific finalization.  The type code must
- * be a nonnegative return value from JS_AddExternalStringFinalizer.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewExternalString(JSContext *cx, jschar *chars, size_t length, intN type);
-
-/*
- * Returns the external-string finalizer index for this string, or -1 if it is
- * an "internal" (native to JS engine) string.
- */
-extern JS_PUBLIC_API(intN)
-JS_GetExternalStringGCType(JSRuntime *rt, JSString *str);
-
-/*
- * Sets maximum (if stack grows upward) or minimum (downward) legal stack byte
- * address in limitAddr for the thread or process stack used by cx.  To disable
- * stack size checking, pass 0 for limitAddr.
- */
-extern JS_PUBLIC_API(void)
-JS_SetThreadStackLimit(JSContext *cx, jsuword limitAddr);
-
-/************************************************************************/
-
-/*
- * Classes, objects, and properties.
- */
-
-/* For detailed comments on the function pointer types, see jspubtd.h. */
-struct JSClass {
-    const char          *name;
-    uint32              flags;
-
-    /* Mandatory non-null function pointer members. */
-    JSPropertyOp        addProperty;
-    JSPropertyOp        delProperty;
-    JSPropertyOp        getProperty;
-    JSPropertyOp        setProperty;
-    JSEnumerateOp       enumerate;
-    JSResolveOp         resolve;
-    JSConvertOp         convert;
-    JSFinalizeOp        finalize;
-
-    /* Optionally non-null members start here. */
-    JSGetObjectOps      getObjectOps;
-    JSCheckAccessOp     checkAccess;
-    JSNative            call;
-    JSNative            construct;
-    JSXDRObjectOp       xdrObject;
-    JSHasInstanceOp     hasInstance;
-    JSMarkOp            mark;
-    JSReserveSlotsOp    reserveSlots;
-};
-
-struct JSExtendedClass {
-    JSClass             base;
-    JSEqualityOp        equality;
-    JSObjectOp          outerObject;
-    JSObjectOp          innerObject;
-    void                (*reserved0)();
-    void                (*reserved1)();
-    void                (*reserved2)();
-    void                (*reserved3)();
-    void                (*reserved4)();
-};
-
-#define JSCLASS_HAS_PRIVATE             (1<<0)  /* objects have private slot */
-#define JSCLASS_NEW_ENUMERATE           (1<<1)  /* has JSNewEnumerateOp hook */
-#define JSCLASS_NEW_RESOLVE             (1<<2)  /* has JSNewResolveOp hook */
-#define JSCLASS_PRIVATE_IS_NSISUPPORTS  (1<<3)  /* private is (nsISupports *) */
-#define JSCLASS_SHARE_ALL_PROPERTIES    (1<<4)  /* all properties are SHARED */
-#define JSCLASS_NEW_RESOLVE_GETS_START  (1<<5)  /* JSNewResolveOp gets starting
-                                                   object in prototype chain
-                                                   passed in via *objp in/out
-                                                   parameter */
-#define JSCLASS_CONSTRUCT_PROTOTYPE     (1<<6)  /* call constructor on class
-                                                   prototype */
-#define JSCLASS_DOCUMENT_OBSERVER       (1<<7)  /* DOM document observer */
-
-/*
- * To reserve slots fetched and stored via JS_Get/SetReservedSlot, bitwise-or
- * JSCLASS_HAS_RESERVED_SLOTS(n) into the initializer for JSClass.flags, where
- * n is a constant in [1, 255].  Reserved slots are indexed from 0 to n-1.
- */
-#define JSCLASS_RESERVED_SLOTS_SHIFT    8       /* room for 8 flags below */
-#define JSCLASS_RESERVED_SLOTS_WIDTH    8       /* and 16 above this field */
-#define JSCLASS_RESERVED_SLOTS_MASK     JS_BITMASK(JSCLASS_RESERVED_SLOTS_WIDTH)
-#define JSCLASS_HAS_RESERVED_SLOTS(n)   (((n) & JSCLASS_RESERVED_SLOTS_MASK)  \
-                                         << JSCLASS_RESERVED_SLOTS_SHIFT)
-#define JSCLASS_RESERVED_SLOTS(clasp)   (((clasp)->flags                      \
-                                          >> JSCLASS_RESERVED_SLOTS_SHIFT)    \
-                                         & JSCLASS_RESERVED_SLOTS_MASK)
-
-#define JSCLASS_HIGH_FLAGS_SHIFT        (JSCLASS_RESERVED_SLOTS_SHIFT +       \
-                                         JSCLASS_RESERVED_SLOTS_WIDTH)
-
-/* True if JSClass is really a JSExtendedClass. */
-#define JSCLASS_IS_EXTENDED             (1<<(JSCLASS_HIGH_FLAGS_SHIFT+0))
-#define JSCLASS_IS_ANONYMOUS            (1<<(JSCLASS_HIGH_FLAGS_SHIFT+1))
-#define JSCLASS_IS_GLOBAL               (1<<(JSCLASS_HIGH_FLAGS_SHIFT+2))
-
-/*
- * ECMA-262 requires that most constructors used internally create objects
- * with "the original Foo.prototype value" as their [[Prototype]] (__proto__)
- * member initial value.  The "original ... value" verbiage is there because
- * in ECMA-262, global properties naming class objects are read/write and
- * deleteable, for the most part.
- *
- * Implementing this efficiently requires that global objects have classes
- * with the following flags.  Failure to use JSCLASS_GLOBAL_FLAGS won't break
- * anything except the ECMA-262 "original prototype value" behavior, which was
- * broken for years in SpiderMonkey.  In other words, without these flags you
- * get backward compatibility.
- */
-#define JSCLASS_GLOBAL_FLAGS \
-    (JSCLASS_IS_GLOBAL | JSCLASS_HAS_RESERVED_SLOTS(JSProto_LIMIT))
-
-/* Fast access to the original value of each standard class's prototype. */
-#define JSCLASS_CACHED_PROTO_SHIFT      (JSCLASS_HIGH_FLAGS_SHIFT + 8)
-#define JSCLASS_CACHED_PROTO_WIDTH      8
-#define JSCLASS_CACHED_PROTO_MASK       JS_BITMASK(JSCLASS_CACHED_PROTO_WIDTH)
-#define JSCLASS_HAS_CACHED_PROTO(key)   ((key) << JSCLASS_CACHED_PROTO_SHIFT)
-#define JSCLASS_CACHED_PROTO_KEY(clasp) (((clasp)->flags                      \
-                                          >> JSCLASS_CACHED_PROTO_SHIFT)      \
-                                         & JSCLASS_CACHED_PROTO_MASK)
-
-/* Initializer for unused members of statically initialized JSClass structs. */
-#define JSCLASS_NO_OPTIONAL_MEMBERS     0,0,0,0,0,0,0,0
-#define JSCLASS_NO_RESERVED_MEMBERS     0,0,0,0,0
-
-/* For detailed comments on these function pointer types, see jspubtd.h. */
-struct JSObjectOps {
-    /* Mandatory non-null function pointer members. */
-    JSNewObjectMapOp    newObjectMap;
-    JSObjectMapOp       destroyObjectMap;
-    JSLookupPropOp      lookupProperty;
-    JSDefinePropOp      defineProperty;
-    JSPropertyIdOp      getProperty;
-    JSPropertyIdOp      setProperty;
-    JSAttributesOp      getAttributes;
-    JSAttributesOp      setAttributes;
-    JSPropertyIdOp      deleteProperty;
-    JSConvertOp         defaultValue;
-    JSNewEnumerateOp    enumerate;
-    JSCheckAccessIdOp   checkAccess;
-
-    /* Optionally non-null members start here. */
-    JSObjectOp          thisObject;
-    JSPropertyRefOp     dropProperty;
-    JSNative            call;
-    JSNative            construct;
-    JSXDRObjectOp       xdrObject;
-    JSHasInstanceOp     hasInstance;
-    JSSetObjectSlotOp   setProto;
-    JSSetObjectSlotOp   setParent;
-    JSMarkOp            mark;
-    JSFinalizeOp        clear;
-    JSGetRequiredSlotOp getRequiredSlot;
-    JSSetRequiredSlotOp setRequiredSlot;
-};
-
-struct JSXMLObjectOps {
-    JSObjectOps         base;
-    JSGetMethodOp       getMethod;
-    JSSetMethodOp       setMethod;
-    JSEnumerateValuesOp enumerateValues;
-    JSEqualityOp        equality;
-    JSConcatenateOp     concatenate;
-};
-
-/*
- * Classes that expose JSObjectOps via a non-null getObjectOps class hook may
- * derive a property structure from this struct, return a pointer to it from
- * lookupProperty and defineProperty, and use the pointer to avoid rehashing
- * in getAttributes and setAttributes.
- *
- * The jsid type contains either an int jsval (see JSVAL_IS_INT above), or an
- * internal pointer that is opaque to users of this API, but which users may
- * convert from and to a jsval using JS_ValueToId and JS_IdToValue.
- */
-struct JSProperty {
-    jsid id;
-};
-
-struct JSIdArray {
-    jsint length;
-    jsid  vector[1];    /* actually, length jsid words */
-};
-
-extern JS_PUBLIC_API(void)
-JS_DestroyIdArray(JSContext *cx, JSIdArray *ida);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ValueToId(JSContext *cx, jsval v, jsid *idp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IdToValue(JSContext *cx, jsid id, jsval *vp);
-
-/*
- * The magic XML namespace id is int-tagged, but not a valid integer jsval.
- * Global object classes in embeddings that enable JS_HAS_XML_SUPPORT (E4X)
- * should handle this id specially before converting id via JSVAL_TO_INT.
- */
-#define JS_DEFAULT_XML_NAMESPACE_ID ((jsid) JSVAL_VOID)
-
-/*
- * JSNewResolveOp flag bits.
- */
-#define JSRESOLVE_QUALIFIED     0x01    /* resolve a qualified property id */
-#define JSRESOLVE_ASSIGNING     0x02    /* resolve on the left of assignment */
-#define JSRESOLVE_DETECTING     0x04    /* 'if (o.p)...' or '(o.p) ?...:...' */
-#define JSRESOLVE_DECLARING     0x08    /* var, const, or function prolog op */
-#define JSRESOLVE_CLASSNAME     0x10    /* class name used when constructing */
-
-extern JS_PUBLIC_API(JSBool)
-JS_PropertyStub(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EnumerateStub(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ResolveStub(JSContext *cx, JSObject *obj, jsval id);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ConvertStub(JSContext *cx, JSObject *obj, JSType type, jsval *vp);
-
-extern JS_PUBLIC_API(void)
-JS_FinalizeStub(JSContext *cx, JSObject *obj);
-
-struct JSConstDoubleSpec {
-    jsdouble        dval;
-    const char      *name;
-    uint8           flags;
-    uint8           spare[3];
-};
-
-/*
- * To define an array element rather than a named property member, cast the
- * element's index to (const char *) and initialize name with it, and set the
- * JSPROP_INDEX bit in flags.
- */
-struct JSPropertySpec {
-    const char      *name;
-    int8            tinyid;
-    uint8           flags;
-    JSPropertyOp    getter;
-    JSPropertyOp    setter;
-};
-
-struct JSFunctionSpec {
-    const char      *name;
-    JSNative        call;
-#ifdef MOZILLA_1_8_BRANCH
-    uint8           nargs;
-    uint8           flags;
-    uint16          extra;
-#else
-    uint16          nargs;
-    uint16          flags;
-    uint32          extra;      /* extra & 0xFFFF:
-                                   number of arg slots for local GC roots
-                                   extra >> 16:
-                                   reserved, must be zero */
-#endif
-};
-
-extern JS_PUBLIC_API(JSObject *)
-JS_InitClass(JSContext *cx, JSObject *obj, JSObject *parent_proto,
-             JSClass *clasp, JSNative constructor, uintN nargs,
-             JSPropertySpec *ps, JSFunctionSpec *fs,
-             JSPropertySpec *static_ps, JSFunctionSpec *static_fs);
-
-#ifdef JS_THREADSAFE
-extern JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSContext *cx, JSObject *obj);
-
-#define JS_GET_CLASS(cx,obj) JS_GetClass(cx, obj)
-#else
-extern JS_PUBLIC_API(JSClass *)
-JS_GetClass(JSObject *obj);
-
-#define JS_GET_CLASS(cx,obj) JS_GetClass(obj)
-#endif
-
-extern JS_PUBLIC_API(JSBool)
-JS_InstanceOf(JSContext *cx, JSObject *obj, JSClass *clasp, jsval *argv);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp);
-
-extern JS_PUBLIC_API(void *)
-JS_GetPrivate(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetPrivate(JSContext *cx, JSObject *obj, void *data);
-
-extern JS_PUBLIC_API(void *)
-JS_GetInstancePrivate(JSContext *cx, JSObject *obj, JSClass *clasp,
-                      jsval *argv);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetPrototype(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetPrototype(JSContext *cx, JSObject *obj, JSObject *proto);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetParent(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetConstructor(JSContext *cx, JSObject *proto);
-
-/*
- * Get a unique identifier for obj, good for the lifetime of obj (even if it
- * is moved by a copying GC).  Return false on failure (likely out of memory),
- * and true with *idp containing the unique id on success.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SealObject(JSContext *cx, JSObject *obj, JSBool deep);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_ConstructObject(JSContext *cx, JSClass *clasp, JSObject *proto,
-                   JSObject *parent);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_ConstructObjectWithArguments(JSContext *cx, JSClass *clasp, JSObject *proto,
-                                JSObject *parent, uintN argc, jsval *argv);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_DefineObject(JSContext *cx, JSObject *obj, const char *name, JSClass *clasp,
-                JSObject *proto, uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineConstDoubles(JSContext *cx, JSObject *obj, JSConstDoubleSpec *cds);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineProperties(JSContext *cx, JSObject *obj, JSPropertySpec *ps);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
-                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
-
-/*
- * Determine the attributes (JSPROP_* flags) of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and the value of *attrsp is undefined.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN *attrsp, JSBool *foundp);
-
-/*
- * The same, but if the property is native, return its getter and setter via
- * *getterp and *setterp, respectively (and only if the out parameter pointer
- * is not null).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                   const char *name,
-                                   uintN *attrsp, JSBool *foundp,
-                                   JSPropertyOp *getterp,
-                                   JSPropertyOp *setterp);
-
-/*
- * Set the attributes of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and nothing will be altered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_SetPropertyAttributes(JSContext *cx, JSObject *obj, const char *name,
-                         uintN attrs, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,
-                            int8 tinyid, jsval value,
-                            JSPropertyOp getter, JSPropertyOp setter,
-                            uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AliasProperty(JSContext *cx, JSObject *obj, const char *name,
-                 const char *alias);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasProperty(JSContext *cx, JSObject *obj, const char *name, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, const char *name,
-                           uintN flags, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetMethodById(JSContext *cx, JSObject *obj, jsid id, JSObject **objp,
-                 jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetMethod(JSContext *cx, JSObject *obj, const char *name, JSObject **objp,
-             jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetProperty(JSContext *cx, JSObject *obj, const char *name, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteProperty(JSContext *cx, JSObject *obj, const char *name);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteProperty2(JSContext *cx, JSObject *obj, const char *name,
-                   jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, jsval value,
-                    JSPropertyOp getter, JSPropertyOp setter,
-                    uintN attrs);
-
-/*
- * Determine the attributes (JSPROP_* flags) of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and the value of *attrsp is undefined.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN *attrsp, JSBool *foundp);
-
-/*
- * The same, but if the property is native, return its getter and setter via
- * *getterp and *setterp, respectively (and only if the out parameter pointer
- * is not null).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
-                                     const jschar *name, size_t namelen,
-                                     uintN *attrsp, JSBool *foundp,
-                                     JSPropertyOp *getterp,
-                                     JSPropertyOp *setterp);
-
-/*
- * Set the attributes of a property on a given object.
- *
- * If the object does not have a property by that name, *foundp will be
- * JS_FALSE and nothing will be altered.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_SetUCPropertyAttributes(JSContext *cx, JSObject *obj,
-                           const jschar *name, size_t namelen,
-                           uintN attrs, JSBool *foundp);
-
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,
-                              const jschar *name, size_t namelen,
-                              int8 tinyid, jsval value,
-                              JSPropertyOp getter, JSPropertyOp setter,
-                              uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 JSBool *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupUCProperty(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen,
-                    jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetUCProperty(JSContext *cx, JSObject *obj,
-                 const jschar *name, size_t namelen,
-                 jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteUCProperty2(JSContext *cx, JSObject *obj,
-                     const jschar *name, size_t namelen,
-                     jsval *rval);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewArrayObject(JSContext *cx, jsint length, jsval *vector);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsArrayObject(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetArrayLength(JSContext *cx, JSObject *obj, jsuint length);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasArrayLength(JSContext *cx, JSObject *obj, jsuint *lengthp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,
-                 JSPropertyOp getter, JSPropertyOp setter, uintN attrs);
-
-extern JS_PUBLIC_API(JSBool)
-JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias);
-
-extern JS_PUBLIC_API(JSBool)
-JS_HasElement(JSContext *cx, JSObject *obj, jsint index, JSBool *foundp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_LookupElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetElement(JSContext *cx, JSObject *obj, jsint index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteElement(JSContext *cx, JSObject *obj, jsint index);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DeleteElement2(JSContext *cx, JSObject *obj, jsint index, jsval *rval);
-
-extern JS_PUBLIC_API(void)
-JS_ClearScope(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSIdArray *)
-JS_Enumerate(JSContext *cx, JSObject *obj);
-
-/*
- * Create an object to iterate over enumerable properties of obj, in arbitrary
- * property definition order.  NB: This differs from longstanding for..in loop
- * order, which uses order of property definition in obj.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_NewPropertyIterator(JSContext *cx, JSObject *obj);
-
-/*
- * Return true on success with *idp containing the id of the next enumerable
- * property to visit using iterobj, or JSVAL_VOID if there is no such property
- * left to visit.  Return false on error.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_NextProperty(JSContext *cx, JSObject *iterobj, jsid *idp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode,
-               jsval *vp, uintN *attrsp);
-
-extern JS_PUBLIC_API(JSCheckAccessOp)
-JS_SetCheckObjectAccessCallback(JSRuntime *rt, JSCheckAccessOp acb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetReservedSlot(JSContext *cx, JSObject *obj, uint32 index, jsval v);
-
-/************************************************************************/
-
-/*
- * Security protocol.
- */
-struct JSPrincipals {
-    char *codebase;
-
-    /* XXX unspecified and unused by Mozilla code -- can we remove these? */
-    void * (* JS_DLL_CALLBACK getPrincipalArray)(JSContext *cx, JSPrincipals *);
-    JSBool (* JS_DLL_CALLBACK globalPrivilegesEnabled)(JSContext *cx, JSPrincipals *);
-
-    /* Don't call "destroy"; use reference counting macros below. */
-    jsrefcount refcount;
-
-    void   (* JS_DLL_CALLBACK destroy)(JSContext *cx, JSPrincipals *);
-    JSBool (* JS_DLL_CALLBACK subsume)(JSPrincipals *, JSPrincipals *);
-};
-
-#ifdef JS_THREADSAFE
-#define JSPRINCIPALS_HOLD(cx, principals)   JS_HoldPrincipals(cx,principals)
-#define JSPRINCIPALS_DROP(cx, principals)   JS_DropPrincipals(cx,principals)
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_HoldPrincipals(JSContext *cx, JSPrincipals *principals);
-
-extern JS_PUBLIC_API(jsrefcount)
-JS_DropPrincipals(JSContext *cx, JSPrincipals *principals);
-
-#else
-#define JSPRINCIPALS_HOLD(cx, principals)   (++(principals)->refcount)
-#define JSPRINCIPALS_DROP(cx, principals)                                     \
-    ((--(principals)->refcount == 0)                                          \
-     ? ((*(principals)->destroy)((cx), (principals)), 0)                      \
-     : (principals)->refcount)
-#endif
-
-extern JS_PUBLIC_API(JSPrincipalsTranscoder)
-JS_SetPrincipalsTranscoder(JSRuntime *rt, JSPrincipalsTranscoder px);
-
-extern JS_PUBLIC_API(JSObjectPrincipalsFinder)
-JS_SetObjectPrincipalsFinder(JSRuntime *rt, JSObjectPrincipalsFinder fop);
-
-/************************************************************************/
-
-/*
- * Functions and scripts.
- */
-extern JS_PUBLIC_API(JSFunction *)
-JS_NewFunction(JSContext *cx, JSNative call, uintN nargs, uintN flags,
-               JSObject *parent, const char *name);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFunctionObject(JSFunction *fun);
-
-/*
- * Deprecated, useful only for diagnostics.  Use JS_GetFunctionId instead for
- * anonymous vs. "anonymous" disambiguation and Unicode fidelity.
- */
-extern JS_PUBLIC_API(const char *)
-JS_GetFunctionName(JSFunction *fun);
-
-/*
- * Return the function's identifier as a JSString, or null if fun is unnamed.
- * The returned string lives as long as fun, so you don't need to root a saved
- * reference to it if fun is well-connected or rooted, and provided you bound
- * the use of the saved reference by fun's lifetime.
- *
- * Prefer JS_GetFunctionId over JS_GetFunctionName because it returns null for
- * truly anonymous functions, and because it doesn't chop to ISO-Latin-1 chars
- * from UTF-16-ish jschars.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_GetFunctionId(JSFunction *fun);
-
-/*
- * Return JSFUN_* flags for fun.
- */
-extern JS_PUBLIC_API(uintN)
-JS_GetFunctionFlags(JSFunction *fun);
-
-/*
- * Return the arity (length) of fun.
- */
-extern JS_PUBLIC_API(uint16)
-JS_GetFunctionArity(JSFunction *fun);
-
-/*
- * Infallible predicate to test whether obj is a function object (faster than
- * comparing obj's class name to "Function", but equivalent unless someone has
- * overwritten the "Function" identifier with a different constructor and then
- * created instances using that constructor that might be passed in as obj).
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ObjectIsFunction(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_DefineFunctions(JSContext *cx, JSObject *obj, JSFunctionSpec *fs);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_DefineFunction(JSContext *cx, JSObject *obj, const char *name, JSNative call,
-                  uintN nargs, uintN attrs);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_DefineUCFunction(JSContext *cx, JSObject *obj,
-                    const jschar *name, size_t namelen, JSNative call,
-                    uintN nargs, uintN attrs);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_CloneFunctionObject(JSContext *cx, JSObject *funobj, JSObject *parent);
-
-/*
- * Given a buffer, return JS_FALSE if the buffer might become a valid
- * javascript statement with the addition of more lines.  Otherwise return
- * JS_TRUE.  The intent is to support interactive compilation - accumulate
- * lines in a buffer until JS_BufferIsCompilableUnit is true, then pass it to
- * the compiler.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_BufferIsCompilableUnit(JSContext *cx, JSObject *obj,
-                          const char *bytes, size_t length);
-
-/*
- * The JSScript objects returned by the following functions refer to string and
- * other kinds of literals, including doubles and RegExp objects.  These
- * literals are vulnerable to garbage collection; to root script objects and
- * prevent literals from being collected, create a rootable object using
- * JS_NewScriptObject, and root the resulting object using JS_Add[Named]Root.
- */
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileScript(JSContext *cx, JSObject *obj,
-                 const char *bytes, size_t length,
-                 const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileScriptForPrincipals(JSContext *cx, JSObject *obj,
-                              JSPrincipals *principals,
-                              const char *bytes, size_t length,
-                              const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileUCScript(JSContext *cx, JSObject *obj,
-                   const jschar *chars, size_t length,
-                   const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals,
-                                const jschar *chars, size_t length,
-                                const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFile(JSContext *cx, JSObject *obj, const char *filename);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandle(JSContext *cx, JSObject *obj, const char *filename,
-                     FILE *fh);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_CompileFileHandleForPrincipals(JSContext *cx, JSObject *obj,
-                                  const char *filename, FILE *fh,
-                                  JSPrincipals *principals);
-
-/*
- * NB: you must use JS_NewScriptObject and root a pointer to its return value
- * in order to keep a JSScript and its atoms safe from garbage collection after
- * creating the script via JS_Compile* and before a JS_ExecuteScript* call.
- * E.g., and without error checks:
- *
- *    JSScript *script = JS_CompileFile(cx, global, filename);
- *    JSObject *scrobj = JS_NewScriptObject(cx, script);
- *    JS_AddNamedRoot(cx, &scrobj, "scrobj");
- *    do {
- *        jsval result;
- *        JS_ExecuteScript(cx, global, script, &result);
- *        JS_GC();
- *    } while (!JSVAL_IS_BOOLEAN(result) || JSVAL_TO_BOOLEAN(result));
- *    JS_RemoveRoot(cx, &scrobj);
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_NewScriptObject(JSContext *cx, JSScript *script);
-
-/*
- * Infallible getter for a script's object.  If JS_NewScriptObject has not been
- * called on script yet, the return value will be null.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetScriptObject(JSScript *script);
-
-extern JS_PUBLIC_API(void)
-JS_DestroyScript(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileFunction(JSContext *cx, JSObject *obj, const char *name,
-                   uintN nargs, const char **argnames,
-                   const char *bytes, size_t length,
-                   const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                JSPrincipals *principals, const char *name,
-                                uintN nargs, const char **argnames,
-                                const char *bytes, size_t length,
-                                const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunction(JSContext *cx, JSObject *obj, const char *name,
-                     uintN nargs, const char **argnames,
-                     const jschar *chars, size_t length,
-                     const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_CompileUCFunctionForPrincipals(JSContext *cx, JSObject *obj,
-                                  JSPrincipals *principals, const char *name,
-                                  uintN nargs, const char **argnames,
-                                  const jschar *chars, size_t length,
-                                  const char *filename, uintN lineno);
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileScript(JSContext *cx, JSScript *script, const char *name,
-                   uintN indent);
-
-/*
- * API extension: OR this into indent to avoid pretty-printing the decompiled
- * source resulting from JS_DecompileFunction{,Body}.
- */
-#define JS_DONT_PRETTY_PRINT    ((uintN)0x8000)
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileFunction(JSContext *cx, JSFunction *fun, uintN indent);
-
-extern JS_PUBLIC_API(JSString *)
-JS_DecompileFunctionBody(JSContext *cx, JSFunction *fun, uintN indent);
-
-/*
- * NB: JS_ExecuteScript, JS_ExecuteScriptPart, and the JS_Evaluate*Script*
- * quadruplets all use the obj parameter as the initial scope chain header,
- * the 'this' keyword value, and the variables object (ECMA parlance for where
- * 'var' and 'function' bind names) of the execution context for script.
- *
- * Using obj as the variables object is problematic if obj's parent (which is
- * the scope chain link; see JS_SetParent and JS_NewObject) is not null: in
- * this case, variables created by 'var x = 0', e.g., go in obj, but variables
- * created by assignment to an unbound id, 'x = 0', go in the last object on
- * the scope chain linked by parent.
- *
- * ECMA calls that last scoping object the "global object", but note that many
- * embeddings have several such objects.  ECMA requires that "global code" be
- * executed with the variables object equal to this global object.  But these
- * JS API entry points provide freedom to execute code against a "sub-global",
- * i.e., a parented or scoped object, in which case the variables object will
- * differ from the last object on the scope chain, resulting in confusing and
- * non-ECMA explicit vs. implicit variable creation.
- *
- * Caveat embedders: unless you already depend on this buggy variables object
- * binding behavior, you should call JS_SetOptions(cx, JSOPTION_VAROBJFIX) or
- * JS_SetOptions(cx, JS_GetOptions(cx) | JSOPTION_VAROBJFIX) -- the latter if
- * someone may have set other options on cx already -- for each context in the
- * application, if you pass parented objects as the obj parameter, or may ever
- * pass such objects in the future.
- *
- * Why a runtime option?  The alternative is to add six or so new API entry
- * points with signatures matching the following six, and that doesn't seem
- * worth the code bloat cost.  Such new entry points would probably have less
- * obvious names, too, so would not tend to be used.  The JS_SetOption call,
- * OTOH, can be more easily hacked into existing code that does not depend on
- * the bug; such code can continue to use the familiar JS_EvaluateScript,
- * etc., entry points.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ExecuteScript(JSContext *cx, JSObject *obj, JSScript *script, jsval *rval);
-
-/*
- * Execute either the function-defining prolog of a script, or the script's
- * main body, but not both.
- */
-typedef enum JSExecPart { JSEXEC_PROLOG, JSEXEC_MAIN } JSExecPart;
-
-extern JS_PUBLIC_API(JSBool)
-JS_ExecuteScriptPart(JSContext *cx, JSObject *obj, JSScript *script,
-                     JSExecPart part, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateScript(JSContext *cx, JSObject *obj,
-                  const char *bytes, uintN length,
-                  const char *filename, uintN lineno,
-                  jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateScriptForPrincipals(JSContext *cx, JSObject *obj,
-                               JSPrincipals *principals,
-                               const char *bytes, uintN length,
-                               const char *filename, uintN lineno,
-                               jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScript(JSContext *cx, JSObject *obj,
-                    const jschar *chars, uintN length,
-                    const char *filename, uintN lineno,
-                    jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCScriptForPrincipals(JSContext *cx, JSObject *obj,
-                                 JSPrincipals *principals,
-                                 const jschar *chars, uintN length,
-                                 const char *filename, uintN lineno,
-                                 jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunction(JSContext *cx, JSObject *obj, JSFunction *fun, uintN argc,
-                jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunctionName(JSContext *cx, JSObject *obj, const char *name, uintN argc,
-                    jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_CallFunctionValue(JSContext *cx, JSObject *obj, jsval fval, uintN argc,
-                     jsval *argv, jsval *rval);
-
-extern JS_PUBLIC_API(JSBranchCallback)
-JS_SetBranchCallback(JSContext *cx, JSBranchCallback cb);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsRunning(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsConstructing(JSContext *cx);
-
-/*
- * Returns true if a script is executing and its current bytecode is a set
- * (assignment) operation, even if there are native (no script) stack frames
- * between the script and the caller to JS_IsAssigning.
- */
-extern JS_FRIEND_API(JSBool)
-JS_IsAssigning(JSContext *cx);
-
-/*
- * Set the second return value, which should be a string or int jsval that
- * identifies a property in the returned object, to form an ECMA reference
- * type value (obj, id).  Only native methods can return reference types,
- * and if the returned value is used on the left-hand side of an assignment
- * op, the identified property will be set.  If the return value is in an
- * r-value, the interpreter just gets obj[id]'s value.
- */
-extern JS_PUBLIC_API(void)
-JS_SetCallReturnValue2(JSContext *cx, jsval v);
-
-/*
- * Saving and restoring frame chains.
- *
- * These two functions are used to set aside cx->fp while that frame is
- * inactive. After a call to JS_SaveFrameChain, it looks as if there is no
- * code running on cx. Before calling JS_RestoreFrameChain, cx's call stack
- * must be balanced and all nested calls to JS_SaveFrameChain must have had
- * matching JS_RestoreFrameChain calls.
- *
- * JS_SaveFrameChain deals with cx not having any code running on it. A null
- * return does not signify an error and JS_RestoreFrameChain handles null
- * frames.
- */
-extern JS_PUBLIC_API(JSStackFrame *)
-JS_SaveFrameChain(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_RestoreFrameChain(JSContext *cx, JSStackFrame *fp);
-
-/************************************************************************/
-
-/*
- * Strings.
- *
- * NB: JS_NewString takes ownership of bytes on success, avoiding a copy; but
- * on error (signified by null return), it leaves bytes owned by the caller.
- * So the caller must free bytes in the error case, if it has no use for them.
- * In contrast, all the JS_New*StringCopy* functions do not take ownership of
- * the character memory passed to them -- they copy it.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewString(JSContext *cx, char *bytes, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewStringCopyN(JSContext *cx, const char *s, size_t n);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewStringCopyZ(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternString(JSContext *cx, const char *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCString(JSContext *cx, jschar *chars, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyN(JSContext *cx, const jschar *s, size_t n);
-
-extern JS_PUBLIC_API(JSString *)
-JS_NewUCStringCopyZ(JSContext *cx, const jschar *s);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternUCStringN(JSContext *cx, const jschar *s, size_t length);
-
-extern JS_PUBLIC_API(JSString *)
-JS_InternUCString(JSContext *cx, const jschar *s);
-
-extern JS_PUBLIC_API(char *)
-JS_GetStringBytes(JSString *str);
-
-extern JS_PUBLIC_API(jschar *)
-JS_GetStringChars(JSString *str);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetStringLength(JSString *str);
-
-extern JS_PUBLIC_API(intN)
-JS_CompareStrings(JSString *str1, JSString *str2);
-
-/*
- * Mutable string support.  A string's characters are never mutable in this JS
- * implementation, but a growable string has a buffer that can be reallocated,
- * and a dependent string is a substring of another (growable, dependent, or
- * immutable) string.  The direct data members of the (opaque to API clients)
- * JSString struct may be changed in a single-threaded way for growable and
- * dependent strings.
- *
- * Therefore mutable strings cannot be used by more than one thread at a time.
- * You may call JS_MakeStringImmutable to convert the string from a mutable
- * (growable or dependent) string to an immutable (and therefore thread-safe)
- * string.  The engine takes care of converting growable and dependent strings
- * to immutable for you if you store strings in multi-threaded objects using
- * JS_SetProperty or kindred API entry points.
- *
- * If you store a JSString pointer in a native data structure that is (safely)
- * accessible to multiple threads, you must call JS_MakeStringImmutable before
- * retiring the store.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewGrowableString(JSContext *cx, jschar *chars, size_t length);
-
-/*
- * Create a dependent string, i.e., a string that owns no character storage,
- * but that refers to a slice of another string's chars.  Dependent strings
- * are mutable by definition, so the thread safety comments above apply.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_NewDependentString(JSContext *cx, JSString *str, size_t start,
-                      size_t length);
-
-/*
- * Concatenate two strings, resulting in a new growable string.  If you create
- * the left string and pass it to JS_ConcatStrings on a single thread, try to
- * use JS_NewGrowableString to create the left string -- doing so helps Concat
- * avoid allocating a new buffer for the result and copying left's chars into
- * the new buffer.  See above for thread safety comments.
- */
-extern JS_PUBLIC_API(JSString *)
-JS_ConcatStrings(JSContext *cx, JSString *left, JSString *right);
-
-/*
- * Convert a dependent string into an independent one.  This function does not
- * change the string's mutability, so the thread safety comments above apply.
- */
-extern JS_PUBLIC_API(const jschar *)
-JS_UndependString(JSContext *cx, JSString *str);
-
-/*
- * Convert a mutable string (either growable or dependent) into an immutable,
- * thread-safe one.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_MakeStringImmutable(JSContext *cx, JSString *str);
-
-/*
- * Return JS_TRUE if C (char []) strings passed via the API and internally
- * are UTF-8. The source must be compiled with JS_C_STRINGS_ARE_UTF8 defined
- * to get UTF-8 support.
- */
-JS_PUBLIC_API(JSBool)
-JS_CStringsAreUTF8();
-
-/*
- * Character encoding support.
- *
- * For both JS_EncodeCharacters and JS_DecodeBytes, set *dstlenp to the size
- * of the destination buffer before the call; on return, *dstlenp contains the
- * number of bytes (JS_EncodeCharacters) or jschars (JS_DecodeBytes) actually
- * stored.  To determine the necessary destination buffer size, make a sizing
- * call that passes NULL for dst.
- *
- * On errors, the functions report the error. In that case, *dstlenp contains
- * the number of characters or bytes transferred so far.  If cx is NULL, no
- * error is reported on failure, and the functions simply return JS_FALSE.
- *
- * NB: Neither function stores an additional zero byte or jschar after the
- * transcoded string.
- *
- * If the source has been compiled with the #define JS_C_STRINGS_ARE_UTF8 to
- * enable UTF-8 interpretation of C char[] strings, then JS_EncodeCharacters
- * encodes to UTF-8, and JS_DecodeBytes decodes from UTF-8, which may create
- * addititional errors if the character sequence is malformed.  If UTF-8
- * support is disabled, the functions deflate and inflate, respectively.
- */
-JS_PUBLIC_API(JSBool)
-JS_EncodeCharacters(JSContext *cx, const jschar *src, size_t srclen, char *dst,
-                    size_t *dstlenp);
-
-JS_PUBLIC_API(JSBool)
-JS_DecodeBytes(JSContext *cx, const char *src, size_t srclen, jschar *dst,
-               size_t *dstlenp);
-
-/************************************************************************/
-
-/*
- * Locale specific string conversion and error message callbacks.
- */
-struct JSLocaleCallbacks {
-    JSLocaleToUpperCase     localeToUpperCase;
-    JSLocaleToLowerCase     localeToLowerCase;
-    JSLocaleCompare         localeCompare;
-    JSLocaleToUnicode       localeToUnicode;
-    JSErrorCallback         localeGetErrorMessage;
-};
-
-/*
- * Establish locale callbacks. The pointer must persist as long as the
- * JSContext.  Passing NULL restores the default behaviour.
- */
-extern JS_PUBLIC_API(void)
-JS_SetLocaleCallbacks(JSContext *cx, JSLocaleCallbacks *callbacks);
-
-/*
- * Return the address of the current locale callbacks struct, which may
- * be NULL.
- */
-extern JS_PUBLIC_API(JSLocaleCallbacks *)
-JS_GetLocaleCallbacks(JSContext *cx);
-
-/************************************************************************/
-
-/*
- * Error reporting.
- */
-
-/*
- * Report an exception represented by the sprintf-like conversion of format
- * and its arguments.  This exception message string is passed to a pre-set
- * JSErrorReporter function (set by JS_SetErrorReporter; see jspubtd.h for
- * the JSErrorReporter typedef).
- */
-extern JS_PUBLIC_API(void)
-JS_ReportError(JSContext *cx, const char *format, ...);
-
-/*
- * Use an errorNumber to retrieve the format string, args are char *
- */
-extern JS_PUBLIC_API(void)
-JS_ReportErrorNumber(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...);
-
-/*
- * Use an errorNumber to retrieve the format string, args are jschar *
- */
-extern JS_PUBLIC_API(void)
-JS_ReportErrorNumberUC(JSContext *cx, JSErrorCallback errorCallback,
-                     void *userRef, const uintN errorNumber, ...);
-
-/*
- * As above, but report a warning instead (JSREPORT_IS_WARNING(report.flags)).
- * Return true if there was no error trying to issue the warning, and if the
- * warning was not converted into an error due to the JSOPTION_WERROR option
- * being set, false otherwise.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ReportWarning(JSContext *cx, const char *format, ...);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumber(JSContext *cx, uintN flags,
-                             JSErrorCallback errorCallback, void *userRef,
-                             const uintN errorNumber, ...);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportErrorFlagsAndNumberUC(JSContext *cx, uintN flags,
-                               JSErrorCallback errorCallback, void *userRef,
-                               const uintN errorNumber, ...);
-
-/*
- * Complain when out of memory.
- */
-extern JS_PUBLIC_API(void)
-JS_ReportOutOfMemory(JSContext *cx);
-
-struct JSErrorReport {
-    const char      *filename;      /* source file name, URL, etc., or null */
-    uintN           lineno;         /* source line number */
-    const char      *linebuf;       /* offending source line without final \n */
-    const char      *tokenptr;      /* pointer to error token in linebuf */
-    const jschar    *uclinebuf;     /* unicode (original) line buffer */
-    const jschar    *uctokenptr;    /* unicode (original) token pointer */
-    uintN           flags;          /* error/warning, etc. */
-    uintN           errorNumber;    /* the error number, e.g. see js.msg */
-    const jschar    *ucmessage;     /* the (default) error message */
-    const jschar    **messageArgs;  /* arguments for the error message */
-};
-
-/*
- * JSErrorReport flag values.  These may be freely composed.
- */
-#define JSREPORT_ERROR      0x0     /* pseudo-flag for default case */
-#define JSREPORT_WARNING    0x1     /* reported via JS_ReportWarning */
-#define JSREPORT_EXCEPTION  0x2     /* exception was thrown */
-#define JSREPORT_STRICT     0x4     /* error or warning due to strict option */
-
-/*
- * If JSREPORT_EXCEPTION is set, then a JavaScript-catchable exception
- * has been thrown for this runtime error, and the host should ignore it.
- * Exception-aware hosts should also check for JS_IsExceptionPending if
- * JS_ExecuteScript returns failure, and signal or propagate the exception, as
- * appropriate.
- */
-#define JSREPORT_IS_WARNING(flags)      (((flags) & JSREPORT_WARNING) != 0)
-#define JSREPORT_IS_EXCEPTION(flags)    (((flags) & JSREPORT_EXCEPTION) != 0)
-#define JSREPORT_IS_STRICT(flags)       (((flags) & JSREPORT_STRICT) != 0)
-
-extern JS_PUBLIC_API(JSErrorReporter)
-JS_SetErrorReporter(JSContext *cx, JSErrorReporter er);
-
-/************************************************************************/
-
-/*
- * Regular Expressions.
- */
-#define JSREG_FOLD      0x01    /* fold uppercase to lowercase */
-#define JSREG_GLOB      0x02    /* global exec, creates array of matches */
-#define JSREG_MULTILINE 0x04    /* treat ^ and $ as begin and end of line */
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewRegExpObject(JSContext *cx, char *bytes, size_t length, uintN flags);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_NewUCRegExpObject(JSContext *cx, jschar *chars, size_t length, uintN flags);
-
-extern JS_PUBLIC_API(void)
-JS_SetRegExpInput(JSContext *cx, JSString *input, JSBool multiline);
-
-extern JS_PUBLIC_API(void)
-JS_ClearRegExpStatics(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_ClearRegExpRoots(JSContext *cx);
-
-/* TODO: compile, exec, get/set other statics... */
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsExceptionPending(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPendingException(JSContext *cx, jsval *vp);
-
-extern JS_PUBLIC_API(void)
-JS_SetPendingException(JSContext *cx, jsval v);
-
-extern JS_PUBLIC_API(void)
-JS_ClearPendingException(JSContext *cx);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ReportPendingException(JSContext *cx);
-
-/*
- * Save the current exception state.  This takes a snapshot of cx's current
- * exception state without making any change to that state.
- *
- * The returned state pointer MUST be passed later to JS_RestoreExceptionState
- * (to restore that saved state, overriding any more recent state) or else to
- * JS_DropExceptionState (to free the state struct in case it is not correct
- * or desirable to restore it).  Both Restore and Drop free the state struct,
- * so callers must stop using the pointer returned from Save after calling the
- * Release or Drop API.
- */
-extern JS_PUBLIC_API(JSExceptionState *)
-JS_SaveExceptionState(JSContext *cx);
-
-extern JS_PUBLIC_API(void)
-JS_RestoreExceptionState(JSContext *cx, JSExceptionState *state);
-
-extern JS_PUBLIC_API(void)
-JS_DropExceptionState(JSContext *cx, JSExceptionState *state);
-
-/*
- * If the given value is an exception object that originated from an error,
- * the exception will contain an error report struct, and this API will return
- * the address of that struct.  Otherwise, it returns NULL.  The lifetime of
- * the error report struct that might be returned is the same as the lifetime
- * of the exception object.
- */
-extern JS_PUBLIC_API(JSErrorReport *)
-JS_ErrorFromException(JSContext *cx, jsval v);
-
-/*
- * Given a reported error's message and JSErrorReport struct pointer, throw
- * the corresponding exception on cx.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_ThrowReportedError(JSContext *cx, const char *message,
-                      JSErrorReport *reportp);
-
-#ifdef JS_THREADSAFE
-
-/*
- * Associate the current thread with the given context.  This is done
- * implicitly by JS_NewContext.
- *
- * Returns the old thread id for this context, which should be treated as
- * an opaque value.  This value is provided for comparison to 0, which
- * indicates that ClearContextThread has been called on this context
- * since the last SetContextThread, or non-0, which indicates the opposite.
- */
-extern JS_PUBLIC_API(jsword)
-JS_GetContextThread(JSContext *cx);
-
-extern JS_PUBLIC_API(jsword)
-JS_SetContextThread(JSContext *cx);
-
-extern JS_PUBLIC_API(jsword)
-JS_ClearContextThread(JSContext *cx);
-
-#endif /* JS_THREADSAFE */
-
-/************************************************************************/
-
-JS_END_EXTERN_C
-
-#endif /* jsapi_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jsautocfg.h Deleted

@@ -1,52 +0,0 @@
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-/* AUTOMATICALLY GENERATED - DO NOT EDIT */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  1L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif /* js_cpucfg___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jscompat.h Deleted

@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-1999
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* -*- Mode: C; tab-width: 8 -*-
- * Copyright (C) 1996-1999 Netscape Communications Corporation, All Rights Reserved.
- */
-#ifndef jscompat_h___
-#define jscompat_h___
-/*
- * Compatibility glue for various NSPR versions.  We must always define int8,
- * int16, jsword, and so on to minimize differences with js/ref, no matter what
- * the NSPR typedef names may be.
- */
-#include "jstypes.h"
-#include "jslong.h"
-
-typedef JSIntn intN;
-typedef JSUintn uintN;
-typedef JSUword jsuword;
-typedef JSWord jsword;
-typedef float float32;
-#define allocPriv allocPool
-#endif /* jscompat_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jscpucfg.h Deleted

@@ -1,366 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef js_cpucfg___
-#define js_cpucfg___
-
-#include "jsosdep.h"
-
-#if defined(XP_WIN) || defined(XP_OS2) || defined(WINCE) || defined(IPHONE_OS)
-
-#if defined(_WIN64)
-
-#if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   8L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    64L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   6L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  8L
-#define JS_ALIGN_OF_POINTER 8L
-#define JS_ALIGN_OF_WORD    8L
-
-#define JS_BYTES_PER_WORD_LOG2   3L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  0L
-#else  /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
-#error "CPU type is unknown"
-#endif /* !(defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)) */
-
-#elif defined(_WIN32) || defined(XP_OS2) || defined(WINCE) 
-
-#ifdef __WATCOMC__
-#define HAVE_VA_LIST_AS_ARRAY
-#endif
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#endif /* _WIN32 || XP_OS2 || WINCE*/
-
-#if defined(IPHONE_OS)
-
-//ios64
-#if defined(__LP64__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   8L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    64L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   6L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  8L
-#define JS_ALIGN_OF_POINTER 8L
-#define JS_ALIGN_OF_WORD    8L
-
-#define JS_BYTES_PER_WORD_LOG2   3L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  0L
-
-#else //ios64
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   4L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define JS_WORDS_PER_DWORD_LOG2  1L
-
-#define JS_STACK_GROWTH_DIRECTION (-1)
-
-#endif //ios32
-
-
-#endif
-
-
-#if defined(_WINDOWS) && !defined(_WIN32) /* WIN16 */
-
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    2L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     16L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    4L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     2L
-#define JS_ALIGN_OF_LONG    2L
-#define JS_ALIGN_OF_INT64   2L
-#define JS_ALIGN_OF_FLOAT   2L
-#define JS_ALIGN_OF_DOUBLE  2L
-#define JS_ALIGN_OF_POINTER 2L
-#define JS_ALIGN_OF_WORD    2L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#endif /* defined(_WINDOWS) && !defined(_WIN32) */
-
-#if defined(__SYMBIAN32__)
-#define IS_LITTLE_ENDIAN 1
-#undef  IS_BIG_ENDIAN
-//no float support
-#define Bad_float_h
-
-#define JS_BYTES_PER_BYTE   1L
-#define JS_BYTES_PER_SHORT  2L
-#define JS_BYTES_PER_INT    4L
-#define JS_BYTES_PER_INT64  8L
-#define JS_BYTES_PER_LONG   4L
-#define JS_BYTES_PER_FLOAT  4L
-#define JS_BYTES_PER_DOUBLE 8L
-#define JS_BYTES_PER_WORD   4L
-#define JS_BYTES_PER_DWORD  8L
-
-#define JS_BITS_PER_BYTE    8L
-#define JS_BITS_PER_SHORT   16L
-#define JS_BITS_PER_INT     32L
-#define JS_BITS_PER_INT64   64L
-#define JS_BITS_PER_LONG    32L
-#define JS_BITS_PER_FLOAT   32L
-#define JS_BITS_PER_DOUBLE  64L
-#define JS_BITS_PER_WORD    32L
-
-#define JS_BITS_PER_BYTE_LOG2   3L
-#define JS_BITS_PER_SHORT_LOG2  4L
-#define JS_BITS_PER_INT_LOG2    5L
-#define JS_BITS_PER_INT64_LOG2  6L
-#define JS_BITS_PER_LONG_LOG2   5L
-#define JS_BITS_PER_FLOAT_LOG2  5L
-#define JS_BITS_PER_DOUBLE_LOG2 6L
-#define JS_BITS_PER_WORD_LOG2   5L
-
-#define JS_ALIGN_OF_SHORT   2L
-#define JS_ALIGN_OF_INT     4L
-#define JS_ALIGN_OF_LONG    4L
-#define JS_ALIGN_OF_INT64   8L
-#define JS_ALIGN_OF_FLOAT   4L
-#define JS_ALIGN_OF_DOUBLE  4L
-#define JS_ALIGN_OF_POINTER 4L
-#define JS_ALIGN_OF_WORD    4L
-
-#define JS_BYTES_PER_WORD_LOG2   2L
-#define JS_BYTES_PER_DWORD_LOG2  3L
-#define PR_WORDS_PER_DWORD_LOG2  1L
-
-#endif /* __SYMBIAN32__*/
-
-
-#elif defined(XP_UNIX) || defined(XP_BEOS)
-
-#error "This file is supposed to be auto-generated on UNIX platforms, but the"
-#error "static version for Mac and Windows platforms is being used."
-#error "Something's probably wrong with paths/headers/dependencies/Makefiles."
-
-#else
-
-#error "Must define one of XP_BEOS, XP_OS2, XP_WIN, or XP_UNIX"
-
-#endif
-
-#ifndef JS_STACK_GROWTH_DIRECTION
-#define JS_STACK_GROWTH_DIRECTION (-1)
-#endif
-
-#endif /* js_cpucfg___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jsdbgapi.h Deleted

@@ -1,406 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsdbgapi_h___
-#define jsdbgapi_h___
-/*
- * JS debugger API.
- */
-#include "jsapi.h"
-#include "jsopcode.h"
-#include "jsprvtd.h"
-
-JS_BEGIN_EXTERN_C
-
-extern void
-js_PatchOpcode(JSContext *cx, JSScript *script, jsbytecode *pc, JSOp op);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-           JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSOp)
-JS_GetTrapOpcode(JSContext *cx, JSScript *script, jsbytecode *pc);
-
-extern JS_PUBLIC_API(void)
-JS_ClearTrap(JSContext *cx, JSScript *script, jsbytecode *pc,
-             JSTrapHandler *handlerp, void **closurep);
-
-extern JS_PUBLIC_API(void)
-JS_ClearScriptTraps(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(void)
-JS_ClearAllTraps(JSContext *cx);
-
-extern JS_PUBLIC_API(JSTrapStatus)
-JS_HandleTrap(JSContext *cx, JSScript *script, jsbytecode *pc, jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetInterrupt(JSRuntime *rt, JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearInterrupt(JSRuntime *rt, JSTrapHandler *handlerp, void **closurep);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                 JSWatchPointHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearWatchPoint(JSContext *cx, JSObject *obj, jsval id,
-                   JSWatchPointHandler *handlerp, void **closurep);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearWatchPointsForObject(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(JSBool)
-JS_ClearAllWatchPoints(JSContext *cx);
-
-#ifdef JS_HAS_OBJ_WATCHPOINT
-/*
- * Hide these non-API function prototypes by testing whether the internal
- * header file "jsconfig.h" has been included.
- */
-extern void
-js_MarkWatchPoints(JSContext *cx);
-
-extern JSScopeProperty *
-js_FindWatchPoint(JSRuntime *rt, JSScope *scope, jsid id);
-
-extern JSPropertyOp
-js_GetWatchedSetter(JSRuntime *rt, JSScope *scope,
-                    const JSScopeProperty *sprop);
-
-extern JSBool JS_DLL_CALLBACK
-js_watch_set(JSContext *cx, JSObject *obj, jsval id, jsval *vp);
-
-extern JSBool JS_DLL_CALLBACK
-js_watch_set_wrapper(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
-                     jsval *rval);
-
-extern JSPropertyOp
-js_WrapWatchedSetter(JSContext *cx, jsid id, uintN attrs, JSPropertyOp setter);
-
-#endif /* JS_HAS_OBJ_WATCHPOINT */
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(uintN)
-JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
-
-extern JS_PUBLIC_API(jsbytecode *)
-JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_GetFunctionScript(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(JSNative)
-JS_GetFunctionNative(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_GetScriptPrincipals(JSContext *cx, JSScript *script);
-
-/*
- * Stack Frame Iterator
- *
- * Used to iterate through the JS stack frames to extract
- * information from the frames.
- */
-
-extern JS_PUBLIC_API(JSStackFrame *)
-JS_FrameIterator(JSContext *cx, JSStackFrame **iteratorp);
-
-extern JS_PUBLIC_API(JSScript *)
-JS_GetFrameScript(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(jsbytecode *)
-JS_GetFramePC(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Get the closest scripted frame below fp.  If fp is null, start from cx->fp.
- */
-extern JS_PUBLIC_API(JSStackFrame *)
-JS_GetScriptedCaller(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Return a weak reference to fp's principals.  A null return does not denote
- * an error, it means there are no principals.
- */
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_StackFramePrincipals(JSContext *cx, JSStackFrame *fp);
-
-/*
- * This API is like JS_StackFramePrincipals(cx, caller), except that if
- * cx->runtime->findObjectPrincipals is non-null, it returns the weaker of
- * the caller's principals and the object principals of fp's callee function
- * object (fp->argv[-2]), which is eval, Function, or a similar eval-like
- * method.  The caller parameter should be JS_GetScriptedCaller(cx, fp).
- *
- * All eval-like methods must use JS_EvalFramePrincipals to acquire a weak
- * reference to the correct principals for the eval call to be secure, given
- * an embedding that calls JS_SetObjectPrincipalsFinder (see jsapi.h).
- */
-extern JS_PUBLIC_API(JSPrincipals *)
-JS_EvalFramePrincipals(JSContext *cx, JSStackFrame *fp, JSStackFrame *caller);
-
-extern JS_PUBLIC_API(void *)
-JS_GetFrameAnnotation(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(void)
-JS_SetFrameAnnotation(JSContext *cx, JSStackFrame *fp, void *annotation);
-
-extern JS_PUBLIC_API(void *)
-JS_GetFramePrincipalArray(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsNativeFrame(JSContext *cx, JSStackFrame *fp);
-
-/* this is deprecated, use JS_GetFrameScopeChain instead */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameObject(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameScopeChain(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameCallObject(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameThis(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSFunction *)
-JS_GetFrameFunction(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameFunctionObject(JSContext *cx, JSStackFrame *fp);
-
-/* XXXrginda Initially published with typo */
-#define JS_IsContructorFrame JS_IsConstructorFrame
-extern JS_PUBLIC_API(JSBool)
-JS_IsConstructorFrame(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_IsDebuggerFrame(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(jsval)
-JS_GetFrameReturnValue(JSContext *cx, JSStackFrame *fp);
-
-extern JS_PUBLIC_API(void)
-JS_SetFrameReturnValue(JSContext *cx, JSStackFrame *fp, jsval rval);
-
-/**
- * Return fp's callee function object (fp->argv[-2]) if it has one.
- */
-extern JS_PUBLIC_API(JSObject *)
-JS_GetFrameCalleeObject(JSContext *cx, JSStackFrame *fp);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(const char *)
-JS_GetScriptFilename(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(uintN)
-JS_GetScriptBaseLineNumber(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(uintN)
-JS_GetScriptLineExtent(JSContext *cx, JSScript *script);
-
-extern JS_PUBLIC_API(JSVersion)
-JS_GetScriptVersion(JSContext *cx, JSScript *script);
-
-/************************************************************************/
-
-/*
- * Hook setters for script creation and destruction, see jsprvtd.h for the
- * typedefs.  These macros provide binary compatibility and newer, shorter
- * synonyms.
- */
-#define JS_SetNewScriptHook     JS_SetNewScriptHookProc
-#define JS_SetDestroyScriptHook JS_SetDestroyScriptHookProc
-
-extern JS_PUBLIC_API(void)
-JS_SetNewScriptHook(JSRuntime *rt, JSNewScriptHook hook, void *callerdata);
-
-extern JS_PUBLIC_API(void)
-JS_SetDestroyScriptHook(JSRuntime *rt, JSDestroyScriptHook hook,
-                        void *callerdata);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateUCInStackFrame(JSContext *cx, JSStackFrame *fp,
-                          const jschar *chars, uintN length,
-                          const char *filename, uintN lineno,
-                          jsval *rval);
-
-extern JS_PUBLIC_API(JSBool)
-JS_EvaluateInStackFrame(JSContext *cx, JSStackFrame *fp,
-                        const char *bytes, uintN length,
-                        const char *filename, uintN lineno,
-                        jsval *rval);
-
-/************************************************************************/
-
-typedef struct JSPropertyDesc {
-    jsval           id;         /* primary id, a string or int */
-    jsval           value;      /* property value */
-    uint8           flags;      /* flags, see below */
-    uint8           spare;      /* unused */
-    uint16          slot;       /* argument/variable slot */
-    jsval           alias;      /* alias id if JSPD_ALIAS flag */
-} JSPropertyDesc;
-
-#define JSPD_ENUMERATE  0x01    /* visible to for/in loop */
-#define JSPD_READONLY   0x02    /* assignment is error */
-#define JSPD_PERMANENT  0x04    /* property cannot be deleted */
-#define JSPD_ALIAS      0x08    /* property has an alias id */
-#define JSPD_ARGUMENT   0x10    /* argument to function */
-#define JSPD_VARIABLE   0x20    /* local variable in function */
-#define JSPD_EXCEPTION  0x40    /* exception occurred fetching the property, */
-                                /* value is exception */
-#define JSPD_ERROR      0x80    /* native getter returned JS_FALSE without */
-                                /* throwing an exception */
-
-typedef struct JSPropertyDescArray {
-    uint32          length;     /* number of elements in array */
-    JSPropertyDesc  *array;     /* alloc'd by Get, freed by Put */
-} JSPropertyDescArray;
-
-extern JS_PUBLIC_API(JSScopeProperty *)
-JS_PropertyIterator(JSObject *obj, JSScopeProperty **iteratorp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
-                   JSPropertyDesc *pd);
-
-extern JS_PUBLIC_API(JSBool)
-JS_GetPropertyDescArray(JSContext *cx, JSObject *obj, JSPropertyDescArray *pda);
-
-extern JS_PUBLIC_API(void)
-JS_PutPropertyDescArray(JSContext *cx, JSPropertyDescArray *pda);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetDebuggerHandler(JSRuntime *rt, JSTrapHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetSourceHandler(JSRuntime *rt, JSSourceHandler handler, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetExecuteHook(JSRuntime *rt, JSInterpreterHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetCallHook(JSRuntime *rt, JSInterpreterHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetObjectHook(JSRuntime *rt, JSObjectHook hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetThrowHook(JSRuntime *rt, JSTrapHandler hook, void *closure);
-
-extern JS_PUBLIC_API(JSBool)
-JS_SetDebugErrorHook(JSRuntime *rt, JSDebugErrorHook hook, void *closure);
-
-/************************************************************************/
-
-extern JS_PUBLIC_API(size_t)
-JS_GetObjectTotalSize(JSContext *cx, JSObject *obj);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetFunctionTotalSize(JSContext *cx, JSFunction *fun);
-
-extern JS_PUBLIC_API(size_t)
-JS_GetScriptTotalSize(JSContext *cx, JSScript *script);
-
-/*
- * Get the top-most running script on cx starting from fp, or from the top of
- * cx's frame stack if fp is null, and return its script filename flags.  If
- * the script has a null filename member, return JSFILENAME_NULL.
- */
-extern JS_PUBLIC_API(uint32)
-JS_GetTopScriptFilenameFlags(JSContext *cx, JSStackFrame *fp);
-
-/*
- * Get the script filename flags for the script.  If the script doesn't have a
- * filename, return JSFILENAME_NULL.
- */
-extern JS_PUBLIC_API(uint32)
-JS_GetScriptFilenameFlags(JSScript *script);
-
-/*
- * Associate flags with a script filename prefix in rt, so that any subsequent
- * script compilation will inherit those flags if the script's filename is the
- * same as prefix, or if prefix is a substring of the script's filename.
- *
- * The API defines only one flag bit, JSFILENAME_SYSTEM, leaving the remaining
- * 31 bits up to the API client to define.  The union of all 32 bits must not
- * be a legal combination, however, in order to preserve JSFILENAME_NULL as a
- * unique value.  API clients may depend on JSFILENAME_SYSTEM being a set bit
- * in JSFILENAME_NULL -- a script with a null filename member is presumed to
- * be a "system" script.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_FlagScriptFilenamePrefix(JSRuntime *rt, const char *prefix, uint32 flags);
-
-#define JSFILENAME_NULL         0xffffffff      /* null script filename */
-#define JSFILENAME_SYSTEM       0x00000001      /* "system" script, see below */
-
-/*
- * Return true if obj is a "system" object, that is, one flagged by a prior
- * call to JS_FlagSystemObject(cx, obj).  What "system" means is up to the API
- * client, but it can be used to coordinate access control policies based on
- * script filenames and their prefixes, using JS_FlagScriptFilenamePrefix and
- * JS_GetTopScriptFilenameFlags.
- */
-extern JS_PUBLIC_API(JSBool)
-JS_IsSystemObject(JSContext *cx, JSObject *obj);
-
-/*
- * Flag obj as a "system" object.  The API client can flag system objects to
- * optimize access control checks.  The engine stores but does not interpret
- * the per-object flag set by this call.
- */
-extern JS_PUBLIC_API(void)
-JS_FlagSystemObject(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jsdbgapi_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jslong.h Deleted

@@ -1,437 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                jslong.h
-** Description: Portable access to 64 bit numerics
-**
-** Long-long (64-bit signed integer type) support. Some C compilers
-** don't support 64 bit integers yet, so we use these macros to
-** support both machines that do and don't.
-**/
-#ifndef jslong_h___
-#define jslong_h___
-
-#include "jstypes.h"
-
-JS_BEGIN_EXTERN_C
-
-/***********************************************************************
-** DEFINES:     JSLL_MaxInt
-**              JSLL_MinInt
-**              JSLL_Zero
-** DESCRIPTION:
-**      Various interesting constants and static variable
-**      initializer
-***********************************************************************/
-#ifdef HAVE_WATCOM_BUG_2
-JSInt64 __pascal __loadds __export
-    JSLL_MaxInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_MinInt(void);
-JSInt64 __pascal __loadds __export
-    JSLL_Zero(void);
-#else
-extern JS_PUBLIC_API(JSInt64) JSLL_MaxInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_MinInt(void);
-extern JS_PUBLIC_API(JSInt64) JSLL_Zero(void);
-#endif
-
-#define JSLL_MAXINT   JSLL_MaxInt()
-#define JSLL_MININT   JSLL_MinInt()
-#define JSLL_ZERO     JSLL_Zero()
-
-#ifdef JS_HAVE_LONG_LONG
-
-#if JS_BYTES_PER_LONG == 8
-#define JSLL_INIT(hi, lo)  ((hi ## L << 32) + lo ## L)
-#elif (defined(WIN32) || defined(WIN16)) && !defined(__GNUC__)
-#define JSLL_INIT(hi, lo)  ((hi ## i64 << 32) + lo ## i64)
-#else
-#define JSLL_INIT(hi, lo)  ((hi ## LL << 32) + lo ## LL)
-#endif
-
-/***********************************************************************
-** MACROS:      JSLL_*
-** DESCRIPTION:
-**      The following macros define portable access to the 64 bit
-**      math facilities.
-**
-***********************************************************************/
-
-/***********************************************************************
-** MACROS:      JSLL_<relational operators>
-**
-**  JSLL_IS_ZERO        Test for zero
-**  JSLL_EQ             Test for equality
-**  JSLL_NE             Test for inequality
-**  JSLL_GE_ZERO        Test for zero or positive
-**  JSLL_CMP            Compare two values
-***********************************************************************/
-#define JSLL_IS_ZERO(a)       ((a) == 0)
-#define JSLL_EQ(a, b)         ((a) == (b))
-#define JSLL_NE(a, b)         ((a) != (b))
-#define JSLL_GE_ZERO(a)       ((a) >= 0)
-#define JSLL_CMP(a, op, b)    ((JSInt64)(a) op (JSInt64)(b))
-#define JSLL_UCMP(a, op, b)   ((JSUint64)(a) op (JSUint64)(b))
-
-/***********************************************************************
-** MACROS:      JSLL_<logical operators>
-**
-**  JSLL_AND            Logical and
-**  JSLL_OR             Logical or
-**  JSLL_XOR            Logical exclusion
-**  JSLL_OR2            A disgusting deviation
-**  JSLL_NOT            Negation (one's compliment)
-***********************************************************************/
-#define JSLL_AND(r, a, b)        ((r) = (a) & (b))
-#define JSLL_OR(r, a, b)        ((r) = (a) | (b))
-#define JSLL_XOR(r, a, b)        ((r) = (a) ^ (b))
-#define JSLL_OR2(r, a)        ((r) = (r) | (a))
-#define JSLL_NOT(r, a)        ((r) = ~(a))
-
-/***********************************************************************
-** MACROS:      JSLL_<mathematical operators>
-**
-**  JSLL_NEG            Negation (two's compliment)
-**  JSLL_ADD            Summation (two's compliment)
-**  JSLL_SUB            Difference (two's compliment)
-***********************************************************************/
-#define JSLL_NEG(r, a)        ((r) = -(a))
-#define JSLL_ADD(r, a, b)     ((r) = (a) + (b))
-#define JSLL_SUB(r, a, b)     ((r) = (a) - (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<mathematical operators>
-**
-**  JSLL_MUL            Product (two's compliment)
-**  JSLL_DIV            Quotient (two's compliment)
-**  JSLL_MOD            Modulus (two's compliment)
-***********************************************************************/
-#define JSLL_MUL(r, a, b)        ((r) = (a) * (b))
-#define JSLL_DIV(r, a, b)        ((r) = (a) / (b))
-#define JSLL_MOD(r, a, b)        ((r) = (a) % (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<shifting operators>
-**
-**  JSLL_SHL            Shift left [0..64] bits
-**  JSLL_SHR            Shift right [0..64] bits with sign extension
-**  JSLL_USHR           Unsigned shift right [0..64] bits
-**  JSLL_ISHL           Signed shift left [0..64] bits
-***********************************************************************/
-#define JSLL_SHL(r, a, b)     ((r) = (JSInt64)(a) << (b))
-#define JSLL_SHR(r, a, b)     ((r) = (JSInt64)(a) >> (b))
-#define JSLL_USHR(r, a, b)    ((r) = (JSUint64)(a) >> (b))
-#define JSLL_ISHL(r, a, b)    ((r) = (JSInt64)(a) << (b))
-
-/***********************************************************************
-** MACROS:      JSLL_<conversion operators>
-**
-**  JSLL_L2I            Convert to signed 32 bit
-**  JSLL_L2UI           Convert to unsigned 32 bit
-**  JSLL_L2F            Convert to floating point
-**  JSLL_L2D            Convert to floating point
-**  JSLL_I2L            Convert signed to 64 bit
-**  JSLL_UI2L           Convert unsigned to 64 bit
-**  JSLL_F2L            Convert float to 64 bit
-**  JSLL_D2L            Convert float to 64 bit
-***********************************************************************/
-#define JSLL_L2I(i, l)        ((i) = (JSInt32)(l))
-#define JSLL_L2UI(ui, l)        ((ui) = (JSUint32)(l))
-#define JSLL_L2F(f, l)        ((f) = (JSFloat64)(l))
-#define JSLL_L2D(d, l)        ((d) = (JSFloat64)(l))
-
-#define JSLL_I2L(l, i)        ((l) = (JSInt64)(i))
-#define JSLL_UI2L(l, ui)        ((l) = (JSInt64)(ui))
-#define JSLL_F2L(l, f)        ((l) = (JSInt64)(f))
-#define JSLL_D2L(l, d)        ((l) = (JSInt64)(d))
-
-/***********************************************************************
-** MACROS:      JSLL_UDIVMOD
-** DESCRIPTION:
-**  Produce both a quotient and a remainder given an unsigned
-** INPUTS:      JSUint64 a: The dividend of the operation
-**              JSUint64 b: The quotient of the operation
-** OUTPUTS:     JSUint64 *qp: pointer to quotient
-**              JSUint64 *rp: pointer to remainder
-***********************************************************************/
-#define JSLL_UDIVMOD(qp, rp, a, b) \
-    (*(qp) = ((JSUint64)(a) / (b)), \
-     *(rp) = ((JSUint64)(a) % (b)))
-
-#else  /* !JS_HAVE_LONG_LONG */
-
-#ifdef IS_LITTLE_ENDIAN
-#define JSLL_INIT(hi, lo) {JS_INT32(lo), JS_INT32(hi)}
-#else
-#define JSLL_INIT(hi, lo) {JS_INT32(hi), JS_INT32(lo)}
-#endif
-
-#define JSLL_IS_ZERO(a)         (((a).hi == 0) && ((a).lo == 0))
-#define JSLL_EQ(a, b)           (((a).hi == (b).hi) && ((a).lo == (b).lo))
-#define JSLL_NE(a, b)           (((a).hi != (b).hi) || ((a).lo != (b).lo))
-#define JSLL_GE_ZERO(a)         (((a).hi >> 31) == 0)
-
-#ifdef DEBUG
-#define JSLL_CMP(a, op, b)      (JS_ASSERT((#op)[1] != '='), JSLL_REAL_CMP(a, op, b))
-#define JSLL_UCMP(a, op, b)     (JS_ASSERT((#op)[1] != '='), JSLL_REAL_UCMP(a, op, b))
-#else
-#define JSLL_CMP(a, op, b)      JSLL_REAL_CMP(a, op, b)
-#define JSLL_UCMP(a, op, b)     JSLL_REAL_UCMP(a, op, b)
-#endif
-
-#define JSLL_REAL_CMP(a,op,b)   (((JSInt32)(a).hi op (JSInt32)(b).hi) || \
-                                 (((a).hi == (b).hi) && ((a).lo op (b).lo)))
-#define JSLL_REAL_UCMP(a,op,b)  (((a).hi op (b).hi) || \
-                                 (((a).hi == (b).hi) && ((a).lo op (b).lo)))
-
-#define JSLL_AND(r, a, b)       ((r).lo = (a).lo & (b).lo, \
-                                 (r).hi = (a).hi & (b).hi)
-#define JSLL_OR(r, a, b)        ((r).lo = (a).lo | (b).lo, \
-                                 (r).hi = (a).hi | (b).hi)
-#define JSLL_XOR(r, a, b)       ((r).lo = (a).lo ^ (b).lo, \
-                                 (r).hi = (a).hi ^ (b).hi)
-#define JSLL_OR2(r, a)          ((r).lo = (r).lo | (a).lo, \
-                                 (r).hi = (r).hi | (a).hi)
-#define JSLL_NOT(r, a)          ((r).lo = ~(a).lo, \
-                                 (r).hi = ~(a).hi)
-
-#define JSLL_NEG(r, a)          ((r).lo = -(JSInt32)(a).lo, \
-                                 (r).hi = -(JSInt32)(a).hi - ((r).lo != 0))
-#define JSLL_ADD(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo + _b.lo; \
-    (r).hi = _a.hi + _b.hi + ((r).lo < _b.lo); \
-}
-
-#define JSLL_SUB(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    (r).lo = _a.lo - _b.lo; \
-    (r).hi = _a.hi - _b.hi - (_a.lo < _b.lo); \
-}
-
-#define JSLL_MUL(r, a, b) { \
-    JSInt64 _a, _b; \
-    _a = a; _b = b; \
-    JSLL_MUL32(r, _a.lo, _b.lo); \
-    (r).hi += _a.hi * _b.lo + _a.lo * _b.hi; \
-}
-
-#define jslo16(a)        ((a) & JS_BITMASK(16))
-#define jshi16(a)        ((a) >> 16)
-
-#define JSLL_MUL32(r, a, b) { \
-     JSUint32 _a1, _a0, _b1, _b0, _y0, _y1, _y2, _y3; \
-     _a1 = jshi16(a), _a0 = jslo16(a); \
-     _b1 = jshi16(b), _b0 = jslo16(b); \
-     _y0 = _a0 * _b0; \
-     _y1 = _a0 * _b1; \
-     _y2 = _a1 * _b0; \
-     _y3 = _a1 * _b1; \
-     _y1 += jshi16(_y0);                         /* can't carry */ \
-     _y1 += _y2;                                /* might carry */ \
-     if (_y1 < _y2)    \
-        _y3 += (JSUint32)(JS_BIT(16));  /* propagate */ \
-     (r).lo = (jslo16(_y1) << 16) + jslo16(_y0); \
-     (r).hi = _y3 + jshi16(_y1); \
-}
-
-#define JSLL_UDIVMOD(qp, rp, a, b)    jsll_udivmod(qp, rp, a, b)
-
-extern JS_PUBLIC_API(void) jsll_udivmod(JSUint64 *qp, JSUint64 *rp, JSUint64 a, JSUint64 b);
-
-#define JSLL_DIV(r, a, b) { \
-    JSInt64 _a, _b; \
-    JSUint32 _negative = (JSInt32)(a).hi < 0; \
-    if (_negative) { \
-    JSLL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((JSInt32)(b).hi < 0) { \
-    _negative ^= 1; \
-    JSLL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    JSLL_UDIVMOD(&(r), 0, _a, _b); \
-    if (_negative) \
-    JSLL_NEG(r, r); \
-}
-
-#define JSLL_MOD(r, a, b) { \
-    JSInt64 _a, _b; \
-    JSUint32 _negative = (JSInt32)(a).hi < 0; \
-    if (_negative) { \
-    JSLL_NEG(_a, a); \
-    } else { \
-    _a = a; \
-    } \
-    if ((JSInt32)(b).hi < 0) { \
-    JSLL_NEG(_b, b); \
-    } else { \
-    _b = b; \
-    } \
-    JSLL_UDIVMOD(0, &(r), _a, _b); \
-    if (_negative) \
-    JSLL_NEG(r, r); \
-}
-
-#define JSLL_SHL(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-        if ((b) < 32) { \
-        (r).lo = _a.lo << ((b) & 31); \
-        (r).hi = (_a.hi << ((b) & 31)) | (_a.lo >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = _a.lo << ((b) & 31); \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-/* a is an JSInt32, b is JSInt32, r is JSInt64 */
-#define JSLL_ISHL(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-    _a.lo = (a); \
-    _a.hi = 0; \
-        if ((b) < 32) { \
-        (r).lo = (a) << ((b) & 31); \
-        (r).hi = ((a) >> (32 - (b))); \
-    } else { \
-        (r).lo = 0; \
-        (r).hi = (a) << ((b) & 31); \
-    } \
-    } else { \
-    (r).lo = (a); \
-    (r).hi = 0; \
-    } \
-}
-
-#define JSLL_SHR(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = (JSInt32)_a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = (JSInt32)_a.hi >> ((b) & 31); \
-        (r).hi = (JSInt32)_a.hi >> 31; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define JSLL_USHR(r, a, b) { \
-    if (b) { \
-    JSInt64 _a; \
-        _a = a; \
-    if ((b) < 32) { \
-        (r).lo = (_a.hi << (32 - (b))) | (_a.lo >> ((b) & 31)); \
-        (r).hi = _a.hi >> ((b) & 31); \
-    } else { \
-        (r).lo = _a.hi >> ((b) & 31); \
-        (r).hi = 0; \
-    } \
-    } else { \
-    (r) = (a); \
-    } \
-}
-
-#define JSLL_L2I(i, l)        ((i) = (l).lo)
-#define JSLL_L2UI(ui, l)        ((ui) = (l).lo)
-#define JSLL_L2F(f, l)        { double _d; JSLL_L2D(_d, l); (f) = (JSFloat64)_d; }
-
-#define JSLL_L2D(d, l) { \
-    int _negative; \
-    JSInt64 _absval; \
- \
-    _negative = (l).hi >> 31; \
-    if (_negative) { \
-    JSLL_NEG(_absval, l); \
-    } else { \
-    _absval = l; \
-    } \
-    (d) = (double)_absval.hi * 4.294967296e9 + _absval.lo; \
-    if (_negative) \
-    (d) = -(d); \
-}
-
-#define JSLL_I2L(l, i)        { JSInt32 _i = (i) >> 31; (l).lo = (i); (l).hi = _i; }
-#define JSLL_UI2L(l, ui)      ((l).lo = (ui), (l).hi = 0)
-#define JSLL_F2L(l, f)        { double _d = (double)f; JSLL_D2L(l, _d); }
-
-#define JSLL_D2L(l, d) { \
-    int _negative; \
-    double _absval, _d_hi; \
-    JSInt64 _lo_d; \
- \
-    _negative = ((d) < 0); \
-    _absval = _negative ? -(d) : (d); \
- \
-    (l).hi = _absval / 4.294967296e9; \
-    (l).lo = 0; \
-    JSLL_L2D(_d_hi, l); \
-    _absval -= _d_hi; \
-    _lo_d.hi = 0; \
-    if (_absval < 0) { \
-    _lo_d.lo = -_absval; \
-    JSLL_SUB(l, l, _lo_d); \
-    } else { \
-    _lo_d.lo = _absval; \
-    JSLL_ADD(l, l, _lo_d); \
-    } \
- \
-    if (_negative) \
-    JSLL_NEG(l, l); \
-}
-
-#endif /* !JS_HAVE_LONG_LONG */
-
-JS_END_EXTERN_C
-
-#endif /* jslong_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jsosdep.h Deleted

@@ -1,115 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsosdep_h___
-#define jsosdep_h___
-/*
- * OS (and machine, and compiler XXX) dependent information.
- */
-
-#if defined(XP_WIN) || defined(XP_OS2)
-
-#if defined(_WIN32) || defined (XP_OS2) || defined (__SYMBIAN32__)
-#define JS_HAVE_LONG_LONG
-#else
-#undef JS_HAVE_LONG_LONG
-#endif
-#endif /* XP_WIN || XP_OS2 */
-
-#ifdef XP_BEOS
-#define JS_HAVE_LONG_LONG
-#endif
-
-
-#ifdef XP_UNIX
-
-/*
- * Get OS specific header information.
- */
-#if defined(XP_MACOSX) || defined(DARWIN)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(AIXV3) || defined(AIX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(BSDI)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(HPUX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(IRIX)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(linux)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(OSF1)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(_SCO_DS)
-#undef JS_HAVE_LONG_LONG
-
-#elif defined(SOLARIS)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(FREEBSD)
-#define JS_HAVE_LONG_LONG
-
-#elif defined(SUNOS4)
-#undef JS_HAVE_LONG_LONG
-
-/*
-** Missing function prototypes
-*/
-
-extern void *sbrk(int);
-
-#elif defined(UNIXWARE)
-#undef JS_HAVE_LONG_LONG
-
-#elif defined(VMS) && defined(__ALPHA)
-#define JS_HAVE_LONG_LONG
-
-#endif
-
-#endif /* XP_UNIX */
-
-#endif /* jsosdep_h___ */
-

gpac-0.8.0.tar.gz/extra_lib/include/js/jsotypes.h Deleted

@@ -1,202 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * This section typedefs the old 'native' types to the new PR<type>s.
- * These definitions are scheduled to be eliminated at the earliest
- * possible time. The NSPR API is implemented and documented using
- * the new definitions.
- */
-
-/*
- * Note that we test for PROTYPES_H, not JSOTYPES_H.  This is to avoid
- * double-definitions of scalar types such as uint32, if NSPR's
- * protypes.h is also included.
- */
-#ifndef PROTYPES_H
-#define PROTYPES_H
-
-#ifdef XP_BEOS
-/* BeOS defines most int types in SupportDefs.h (int8, uint8, int16,
- * uint16, int32, uint32, int64, uint64), so in the interest of
- * not conflicting with other definitions elsewhere we have to skip the
- * #ifdef jungle below, duplicate some definitions, and do our stuff.
- */
-#include <SupportDefs.h>
-
-typedef JSUintn uintn;
-#ifndef _XP_Core_
-typedef JSIntn intn;
-#endif
-
-#else
-
-/* SVR4 typedef of uint is commonly found on UNIX machines. */
-#if defined(XP_UNIX) && !defined(__QNXNTO__)
-#include <sys/types.h>
-#else
-typedef JSUintn uint;
-#endif
-
-typedef JSUintn uintn;
-typedef JSUint64 uint64;
-#if !defined(_WIN32) && !defined(XP_OS2)
-typedef JSUint32 uint32;
-#else
-typedef unsigned long uint32;
-#endif
-typedef JSUint16 uint16;
-typedef JSUint8 uint8;
-
-#ifndef _XP_Core_
-typedef JSIntn intn;
-#endif
-
-/*
- * On AIX 4.3, sys/inttypes.h (which is included by sys/types.h, a very
- * common header file) defines the types int8, int16, int32, and int64.
- * So we don't define these four types here to avoid conflicts in case
- * the code also includes sys/types.h.
- */
-#if defined(AIX) && defined(HAVE_SYS_INTTYPES_H)
-#include <sys/inttypes.h>
-#else
-typedef JSInt64 int64;
-
-/* /usr/include/model.h on HP-UX defines int8, int16, and int32 */
-#ifdef HPUX
-#include <model.h>
-#else
-#if !defined(_WIN32) && !defined(XP_OS2)
-typedef JSInt32 int32;
-#else
-typedef long int32;
-#endif
-typedef JSInt16 int16;
-typedef JSInt8 int8;
-#endif /* HPUX */
-#endif /* AIX && HAVE_SYS_INTTYPES_H */
-
-#endif  /* XP_BEOS */
-
-typedef JSFloat64 float64;
-
-/* Re: jsbit.h */
-#define TEST_BIT        JS_TEST_BIT
-#define SET_BIT         JS_SET_BIT
-#define CLEAR_BIT       JS_CLEAR_BIT
-
-/* Re: prarena.h->plarena.h */
-#define PRArena PLArena
-#define PRArenaPool PLArenaPool
-#define PRArenaStats PLArenaStats
-#define PR_ARENA_ALIGN PL_ARENA_ALIGN
-#define PR_INIT_ARENA_POOL PL_INIT_ARENA_POOL
-#define PR_ARENA_ALLOCATE PL_ARENA_ALLOCATE
-#define PR_ARENA_GROW PL_ARENA_GROW
-#define PR_ARENA_MARK PL_ARENA_MARK
-#define PR_CLEAR_UNUSED PL_CLEAR_UNUSED
-#define PR_CLEAR_ARENA PL_CLEAR_ARENA
-#define PR_ARENA_RELEASE PL_ARENA_RELEASE
-#define PR_COUNT_ARENA PL_COUNT_ARENA
-#define PR_ARENA_DESTROY PL_ARENA_DESTROY
-#define PR_InitArenaPool PL_InitArenaPool
-#define PR_FreeArenaPool PL_FreeArenaPool
-#define PR_FinishArenaPool PL_FinishArenaPool
-#define PR_CompactArenaPool PL_CompactArenaPool
-#define PR_ArenaFinish PL_ArenaFinish
-#define PR_ArenaAllocate PL_ArenaAllocate
-#define PR_ArenaGrow PL_ArenaGrow
-#define PR_ArenaRelease PL_ArenaRelease
-#define PR_ArenaCountAllocation PL_ArenaCountAllocation
-#define PR_ArenaCountInplaceGrowth PL_ArenaCountInplaceGrowth
-#define PR_ArenaCountGrowth PL_ArenaCountGrowth
-#define PR_ArenaCountRelease PL_ArenaCountRelease
-#define PR_ArenaCountRetract PL_ArenaCountRetract
-
-/* Re: prevent.h->plevent.h */
-#define PREvent PLEvent
-#define PREventQueue PLEventQueue
-#define PR_CreateEventQueue PL_CreateEventQueue
-#define PR_DestroyEventQueue PL_DestroyEventQueue
-#define PR_GetEventQueueMonitor PL_GetEventQueueMonitor
-#define PR_ENTER_EVENT_QUEUE_MONITOR PL_ENTER_EVENT_QUEUE_MONITOR
-#define PR_EXIT_EVENT_QUEUE_MONITOR PL_EXIT_EVENT_QUEUE_MONITOR
-#define PR_PostEvent PL_PostEvent
-#define PR_PostSynchronousEvent PL_PostSynchronousEvent
-#define PR_GetEvent PL_GetEvent
-#define PR_EventAvailable PL_EventAvailable
-#define PREventFunProc PLEventFunProc
-#define PR_MapEvents PL_MapEvents
-#define PR_RevokeEvents PL_RevokeEvents
-#define PR_ProcessPendingEvents PL_ProcessPendingEvents
-#define PR_WaitForEvent PL_WaitForEvent
-#define PR_EventLoop PL_EventLoop
-#define PR_GetEventQueueSelectFD PL_GetEventQueueSelectFD
-#define PRHandleEventProc PLHandleEventProc
-#define PRDestroyEventProc PLDestroyEventProc
-#define PR_InitEvent PL_InitEvent
-#define PR_GetEventOwner PL_GetEventOwner
-#define PR_HandleEvent PL_HandleEvent
-#define PR_DestroyEvent PL_DestroyEvent
-#define PR_DequeueEvent PL_DequeueEvent
-#define PR_GetMainEventQueue PL_GetMainEventQueue
-
-/* Re: prhash.h->plhash.h */
-#define PRHashEntry PLHashEntry
-#define PRHashTable PLHashTable
-#define PRHashNumber PLHashNumber
-#define PRHashFunction PLHashFunction
-#define PRHashComparator PLHashComparator
-#define PRHashEnumerator PLHashEnumerator
-#define PRHashAllocOps PLHashAllocOps
-#define PR_NewHashTable PL_NewHashTable
-#define PR_HashTableDestroy PL_HashTableDestroy
-#define PR_HashTableRawLookup PL_HashTableRawLookup
-#define PR_HashTableRawAdd PL_HashTableRawAdd
-#define PR_HashTableRawRemove PL_HashTableRawRemove
-#define PR_HashTableAdd PL_HashTableAdd
-#define PR_HashTableRemove PL_HashTableRemove
-#define PR_HashTableEnumerateEntries PL_HashTableEnumerateEntries
-#define PR_HashTableLookup PL_HashTableLookup
-#define PR_HashTableDump PL_HashTableDump
-#define PR_HashString PL_HashString
-#define PR_CompareStrings PL_CompareStrings
-#define PR_CompareValues PL_CompareValues
-
-#endif /* !defined(PROTYPES_H) */

gpac-0.8.0.tar.gz/extra_lib/include/js/jsproto.tbl Deleted

@@ -1,116 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set sw=4 ts=8 et tw=80 ft=c:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SpiderMonkey 1.7 work in progress, released
- * February 14, 2006.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-//#include "jsconfig.h"
-
-#if JS_HAS_SCRIPT_OBJECT
-# define SCRIPT_INIT                    js_InitScriptClass
-#else
-# define SCRIPT_INIT                    js_InitNullClass
-#endif
-
-#if JS_HAS_XML_SUPPORT
-# define XML_INIT                       js_InitXMLClass
-# define NAMESPACE_INIT                 js_InitNamespaceClass
-# define QNAME_INIT                     js_InitQNameClass
-# define ANYNAME_INIT                   js_InitAnyNameClass
-# define ATTRIBUTE_INIT                 js_InitAttributeNameClass
-#else
-# define XML_INIT                       js_InitNullClass
-# define NAMESPACE_INIT                 js_InitNullClass
-# define QNAME_INIT                     js_InitNullClass
-# define ANYNAME_INIT                   js_InitNullClass
-# define ATTRIBUTE_INIT                 js_InitNullClass
-#endif
-
-#if JS_HAS_GENERATORS
-# define GENERATOR_INIT                 js_InitIteratorClasses
-#else
-# define GENERATOR_INIT                 js_InitNullClass
-#endif
-
-#if JS_HAS_FILE_OBJECT
-# define FILE_INIT                      js_InitFileClass
-#else
-# define FILE_INIT                      js_InitNullClass
-#endif
-
-/*
- * Enumerator codes in the second column must not change -- they are part of
- * the JS XDR API.
- */
-JS_PROTO(Null,                   0,     js_InitNullClass)
-JS_PROTO(Object,                 1,     js_InitFunctionAndObjectClasses)
-JS_PROTO(Function,               2,     js_InitFunctionAndObjectClasses)
-JS_PROTO(Array,                  3,     js_InitArrayClass)
-JS_PROTO(Boolean,                4,     js_InitBooleanClass)
-JS_PROTO(Call,                   5,     js_InitCallClass)
-JS_PROTO(Date,                   6,     js_InitDateClass)
-JS_PROTO(Math,                   7,     js_InitMathClass)
-JS_PROTO(Number,                 8,     js_InitNumberClass)
-JS_PROTO(String,                 9,     js_InitStringClass)
-JS_PROTO(RegExp,                10,     js_InitRegExpClass)
-JS_PROTO(Script,                11,     SCRIPT_INIT)
-JS_PROTO(XML,                   12,     XML_INIT)
-JS_PROTO(Namespace,             13,     NAMESPACE_INIT)
-JS_PROTO(QName,                 14,     QNAME_INIT)
-JS_PROTO(AnyName,               15,     ANYNAME_INIT)
-JS_PROTO(AttributeName,         16,     ATTRIBUTE_INIT)
-JS_PROTO(Error,                 17,     js_InitExceptionClasses)
-JS_PROTO(InternalError,         18,     js_InitExceptionClasses)
-JS_PROTO(EvalError,             19,     js_InitExceptionClasses)
-JS_PROTO(RangeError,            20,     js_InitExceptionClasses)
-JS_PROTO(ReferenceError,        21,     js_InitExceptionClasses)
-JS_PROTO(SyntaxError,           22,     js_InitExceptionClasses)
-JS_PROTO(TypeError,             23,     js_InitExceptionClasses)
-JS_PROTO(URIError,              24,     js_InitExceptionClasses)
-JS_PROTO(Generator,             25,     GENERATOR_INIT)
-JS_PROTO(Iterator,              26,     js_InitIteratorClasses)
-JS_PROTO(StopIteration,         27,     js_InitIteratorClasses)
-JS_PROTO(UnusedProto28,         28,     js_InitNullClass)
-JS_PROTO(File,                  29,     FILE_INIT)
-JS_PROTO(Block,                 30,     js_InitBlockClass)
-
-#undef SCRIPT_INIT
-#undef XML_INIT
-#undef NAMESPACE_INIT
-#undef QNAME_INIT
-#undef ANYNAME_INIT
-#undef ATTRIBUTE_INIT
-#undef GENERATOR_INIT
-#undef FILE_INIT

gpac-0.8.0.tar.gz/extra_lib/include/js/jspubtd.h Deleted

@@ -1,667 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jspubtd_h___
-#define jspubtd_h___
-/*
- * JS public API typedefs.
- */
-#include "jstypes.h"
-#include "jscompat.h"
-
-JS_BEGIN_EXTERN_C
-
-/* Scalar typedefs. */
-typedef uint16    jschar;
-typedef int32     jsint;
-typedef uint32    jsuint;
-typedef float64   jsdouble;
-typedef jsword    jsval;
-typedef jsword    jsid;
-typedef int32     jsrefcount;   /* PRInt32 if JS_THREADSAFE, see jslock.h */
-
-/*
- * Run-time version enumeration.  See jsconfig.h for compile-time counterparts
- * to these values that may be selected by the JS_VERSION macro, and tested by
- * #if expressions.
- */
-typedef enum JSVersion {
-    JSVERSION_1_0     = 100,
-    JSVERSION_1_1     = 110,
-    JSVERSION_1_2     = 120,
-    JSVERSION_1_3     = 130,
-    JSVERSION_1_4     = 140,
-    JSVERSION_ECMA_3  = 148,
-    JSVERSION_1_5     = 150,
-    JSVERSION_1_6     = 160,
-    JSVERSION_1_7     = 170,
-    JSVERSION_DEFAULT = 0,
-    JSVERSION_UNKNOWN = -1
-} JSVersion;
-
-#define JSVERSION_IS_ECMA(version) \
-    ((version) == JSVERSION_DEFAULT || (version) >= JSVERSION_1_3)
-
-/* Result of typeof operator enumeration. */
-typedef enum JSType {
-    JSTYPE_VOID,                /* undefined */
-    JSTYPE_OBJECT,              /* object */
-    JSTYPE_FUNCTION,            /* function */
-    JSTYPE_STRING,              /* string */
-    JSTYPE_NUMBER,              /* number */
-    JSTYPE_BOOLEAN,             /* boolean */
-    JSTYPE_NULL,                /* null */
-    JSTYPE_XML,                 /* xml object */
-    JSTYPE_LIMIT
-} JSType;
-
-/* Dense index into cached prototypes and class atoms for standard objects. */
-typedef enum JSProtoKey {
-#define JS_PROTO(name,code,init) JSProto_##name = code,
-#include "jsproto.tbl"
-#undef JS_PROTO
-    JSProto_LIMIT
-} JSProtoKey;
-
-/* JSObjectOps.checkAccess mode enumeration. */
-typedef enum JSAccessMode {
-    JSACC_PROTO  = 0,           /* XXXbe redundant w.r.t. id */
-    JSACC_PARENT = 1,           /* XXXbe redundant w.r.t. id */
-    JSACC_IMPORT = 2,           /* import foo.bar */
-    JSACC_WATCH  = 3,           /* a watchpoint on object foo for id 'bar' */
-    JSACC_READ   = 4,           /* a "get" of foo.bar */
-    JSACC_WRITE  = 8,           /* a "set" of foo.bar = baz */
-    JSACC_LIMIT
-} JSAccessMode;
-
-#define JSACC_TYPEMASK          (JSACC_WRITE - 1)
-
-/*
- * This enum type is used to control the behavior of a JSObject property
- * iterator function that has type JSNewEnumerate.
- */
-typedef enum JSIterateOp {
-    JSENUMERATE_INIT,       /* Create new iterator state */
-    JSENUMERATE_NEXT,       /* Iterate once */
-    JSENUMERATE_DESTROY     /* Destroy iterator state */
-} JSIterateOp;
-
-/* Struct typedefs. */
-typedef struct JSClass           JSClass;
-typedef struct JSExtendedClass   JSExtendedClass;
-typedef struct JSConstDoubleSpec JSConstDoubleSpec;
-typedef struct JSContext         JSContext;
-typedef struct JSErrorReport     JSErrorReport;
-typedef struct JSFunction        JSFunction;
-typedef struct JSFunctionSpec    JSFunctionSpec;
-typedef struct JSIdArray         JSIdArray;
-typedef struct JSProperty        JSProperty;
-typedef struct JSPropertySpec    JSPropertySpec;
-typedef struct JSObject          JSObject;
-typedef struct JSObjectMap       JSObjectMap;
-typedef struct JSObjectOps       JSObjectOps;
-typedef struct JSXMLObjectOps    JSXMLObjectOps;
-typedef struct JSRuntime         JSRuntime;
-typedef struct JSRuntime         JSTaskState;   /* XXX deprecated name */
-typedef struct JSScript          JSScript;
-typedef struct JSStackFrame      JSStackFrame;
-typedef struct JSString          JSString;
-typedef struct JSXDRState        JSXDRState;
-typedef struct JSExceptionState  JSExceptionState;
-typedef struct JSLocaleCallbacks JSLocaleCallbacks;
-
-/* JSClass (and JSObjectOps where appropriate) function pointer typedefs. */
-
-/*
- * Add, delete, get or set a property named by id in obj.  Note the jsval id
- * type -- id may be a string (Unicode property identifier) or an int (element
- * index).  The *vp out parameter, on success, is the new property value after
- * an add, get, or set.  After a successful delete, *vp is JSVAL_FALSE iff
- * obj[id] can't be deleted (because it's permanent).
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPropertyOp)(JSContext *cx, JSObject *obj, jsval id,
-                                 jsval *vp);
-
-/*
- * This function type is used for callbacks that enumerate the properties of
- * a JSObject.  The behavior depends on the value of enum_op:
- *
- *  JSENUMERATE_INIT
- *    A new, opaque iterator state should be allocated and stored in *statep.
- *    (You can use PRIVATE_TO_JSVAL() to tag the pointer to be stored).
- *
- *    The number of properties that will be enumerated should be returned as
- *    an integer jsval in *idp, if idp is non-null, and provided the number of
- *    enumerable properties is known.  If idp is non-null and the number of
- *    enumerable properties can't be computed in advance, *idp should be set
- *    to JSVAL_ZERO.
- *
- *  JSENUMERATE_NEXT
- *    A previously allocated opaque iterator state is passed in via statep.
- *    Return the next jsid in the iteration using *idp.  The opaque iterator
- *    state pointed at by statep is destroyed and *statep is set to JSVAL_NULL
- *    if there are no properties left to enumerate.
- *
- *  JSENUMERATE_DESTROY
- *    Destroy the opaque iterator state previously allocated in *statep by a
- *    call to this function when enum_op was JSENUMERATE_INIT.
- *
- * The return value is used to indicate success, with a value of JS_FALSE
- * indicating failure.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSNewEnumerateOp)(JSContext *cx, JSObject *obj,
-                                     JSIterateOp enum_op,
-                                     jsval *statep, jsid *idp);
-
-/*
- * The old-style JSClass.enumerate op should define all lazy properties not
- * yet reflected in obj.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSEnumerateOp)(JSContext *cx, JSObject *obj);
-
-/*
- * Resolve a lazy property named by id in obj by defining it directly in obj.
- * Lazy properties are those reflected from some peer native property space
- * (e.g., the DOM attributes for a given node reflected as obj) on demand.
- *
- * JS looks for a property in an object, and if not found, tries to resolve
- * the given id.  If resolve succeeds, the engine looks again in case resolve
- * defined obj[id].  If no such property exists directly in obj, the process
- * is repeated with obj's prototype, etc.
- *
- * NB: JSNewResolveOp provides a cheaper way to resolve lazy properties.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSResolveOp)(JSContext *cx, JSObject *obj, jsval id);
-
-/*
- * Like JSResolveOp, but flags provide contextual information as follows:
- *
- *  JSRESOLVE_QUALIFIED   a qualified property id: obj.id or obj[id], not id
- *  JSRESOLVE_ASSIGNING   obj[id] is on the left-hand side of an assignment
- *  JSRESOLVE_DETECTING   'if (o.p)...' or similar detection opcode sequence
- *  JSRESOLVE_DECLARING   var, const, or function prolog declaration opcode
- *  JSRESOLVE_CLASSNAME   class name used when constructing
- *
- * The *objp out parameter, on success, should be null to indicate that id
- * was not resolved; and non-null, referring to obj or one of its prototypes,
- * if id was resolved.
- *
- * This hook instead of JSResolveOp is called via the JSClass.resolve member
- * if JSCLASS_NEW_RESOLVE is set in JSClass.flags.
- *
- * Setting JSCLASS_NEW_RESOLVE and JSCLASS_NEW_RESOLVE_GETS_START further
- * extends this hook by passing in the starting object on the prototype chain
- * via *objp.  Thus a resolve hook implementation may define the property id
- * being resolved in the object in which the id was first sought, rather than
- * in a prototype object whose class led to the resolve hook being called.
- *
- * When using JSCLASS_NEW_RESOLVE_GETS_START, the resolve hook must therefore
- * null *objp to signify "not resolved".  With only JSCLASS_NEW_RESOLVE and no
- * JSCLASS_NEW_RESOLVE_GETS_START, the hook can assume *objp is null on entry.
- * This is not good practice, but enough existing hook implementations count
- * on it that we can't break compatibility by passing the starting object in
- * *objp without a new JSClass flag.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSNewResolveOp)(JSContext *cx, JSObject *obj, jsval id,
-                                   uintN flags, JSObject **objp);
-
-/*
- * Convert obj to the given type, returning true with the resulting value in
- * *vp on success, and returning false on error or exception.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSConvertOp)(JSContext *cx, JSObject *obj, JSType type,
-                                jsval *vp);
-
-/*
- * Finalize obj, which the garbage collector has determined to be unreachable
- * from other live objects or from GC roots.  Obviously, finalizers must never
- * store a reference to obj.
- */
-typedef void
-(* JS_DLL_CALLBACK JSFinalizeOp)(JSContext *cx, JSObject *obj);
-
-/*
- * Used by JS_AddExternalStringFinalizer and JS_RemoveExternalStringFinalizer
- * to extend and reduce the set of string types finalized by the GC.
- */
-typedef void
-(* JS_DLL_CALLBACK JSStringFinalizeOp)(JSContext *cx, JSString *str);
-
-/*
- * The signature for JSClass.getObjectOps, used by JS_NewObject's internals
- * to discover the set of high-level object operations to use for new objects
- * of the given class.  All native objects have a JSClass, which is stored as
- * a private (int-tagged) pointer in obj->slots[JSSLOT_CLASS].  In contrast,
- * all native and host objects have a JSObjectMap at obj->map, which may be
- * shared among a number of objects, and which contains the JSObjectOps *ops
- * pointer used to dispatch object operations from API calls.
- *
- * Thus JSClass (which pre-dates JSObjectOps in the API) provides a low-level
- * interface to class-specific code and data, while JSObjectOps allows for a
- * higher level of operation, which does not use the object's class except to
- * find the class's JSObjectOps struct, by calling clasp->getObjectOps, and to
- * finalize the object.
- *
- * If this seems backwards, that's because it is!  API compatibility requires
- * a JSClass *clasp parameter to JS_NewObject, etc.  Most host objects do not
- * need to implement the larger JSObjectOps, and can share the common JSScope
- * code and data used by the native (js_ObjectOps, see jsobj.c) ops.
- *
- * Further extension to preserve API compatibility: if this function returns
- * a pointer to JSXMLObjectOps.base, not to JSObjectOps, then the engine calls
- * extended hooks needed for E4X.
- */
-typedef JSObjectOps *
-(* JS_DLL_CALLBACK JSGetObjectOps)(JSContext *cx, JSClass *clasp);
-
-/*
- * JSClass.checkAccess type: check whether obj[id] may be accessed per mode,
- * returning false on error/exception, true on success with obj[id]'s last-got
- * value in *vp, and its attributes in *attrsp.  As for JSPropertyOp above, id
- * is either a string or an int jsval.
- *
- * See JSCheckAccessIdOp, below, for the JSObjectOps counterpart, which takes
- * a jsid (a tagged int or aligned, unique identifier pointer) rather than a
- * jsval.  The native js_ObjectOps.checkAccess simply forwards to the object's
- * clasp->checkAccess, so that both JSClass and JSObjectOps implementors may
- * specialize access checks.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSCheckAccessOp)(JSContext *cx, JSObject *obj, jsval id,
-                                    JSAccessMode mode, jsval *vp);
-
-/*
- * Encode or decode an object, given an XDR state record representing external
- * data.  See jsxdrapi.h.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSXDRObjectOp)(JSXDRState *xdr, JSObject **objp);
-
-/*
- * Check whether v is an instance of obj.  Return false on error or exception,
- * true on success with JS_TRUE in *bp if v is an instance of obj, JS_FALSE in
- * *bp otherwise.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSHasInstanceOp)(JSContext *cx, JSObject *obj, jsval v,
-                                    JSBool *bp);
-
-/*
- * Function type for JSClass.mark and JSObjectOps.mark, called from the GC to
- * scan live GC-things reachable from obj's private data structure.  For each
- * such thing, a mark implementation must call
- *
- *    JS_MarkGCThing(cx, thing, name, arg);
- *
- * The trailing name and arg parameters are used for GC_MARK_DEBUG-mode heap
- * dumping and ref-path tracing.  The mark function should pass a (typically
- * literal) string naming the private data member for name, and it must pass
- * the opaque arg parameter through from its caller.
- *
- * For the JSObjectOps.mark hook, the return value is the number of slots at
- * obj->slots to scan.  For JSClass.mark, the return value is ignored.
- *
- * NB: JSMarkOp implementations cannot allocate new GC-things (JS_NewObject
- * called from a mark function will fail silently, e.g.).
- */
-typedef uint32
-(* JS_DLL_CALLBACK JSMarkOp)(JSContext *cx, JSObject *obj, void *arg);
-
-/*
- * The optional JSClass.reserveSlots hook allows a class to make computed
- * per-instance object slots reservations, in addition to or instead of using
- * JSCLASS_HAS_RESERVED_SLOTS(n) in the JSClass.flags initializer to reserve
- * a constant-per-class number of slots.  Implementations of this hook should
- * return the number of slots to reserve, not including any reserved by using
- * JSCLASS_HAS_RESERVED_SLOTS(n) in JSClass.flags.
- *
- * NB: called with obj locked by the JSObjectOps-specific mutual exclusion
- * mechanism appropriate for obj, so don't nest other operations that might
- * also lock obj.
- */
-typedef uint32
-(* JS_DLL_CALLBACK JSReserveSlotsOp)(JSContext *cx, JSObject *obj);
-
-/* JSObjectOps function pointer typedefs. */
-
-/*
- * Create a new subclass of JSObjectMap (see jsobj.h), with the nrefs and ops
- * members initialized from the same-named parameters, and with the nslots and
- * freeslot members initialized according to ops and clasp.  Return null on
- * error, non-null on success.
- *
- * JSObjectMaps are reference-counted by generic code in the engine.  Usually,
- * the nrefs parameter to JSObjectOps.newObjectMap will be 1, to count the ref
- * returned to the caller on success.  After a successful construction, some
- * number of js_HoldObjectMap and js_DropObjectMap calls ensue.  When nrefs
- * reaches 0 due to a js_DropObjectMap call, JSObjectOps.destroyObjectMap will
- * be called to dispose of the map.
- */
-typedef JSObjectMap *
-(* JS_DLL_CALLBACK JSNewObjectMapOp)(JSContext *cx, jsrefcount nrefs,
-                                     JSObjectOps *ops, JSClass *clasp,
-                                     JSObject *obj);
-
-/*
- * Generic type for an infallible JSObjectMap operation, used currently by
- * JSObjectOps.destroyObjectMap.
- */
-typedef void
-(* JS_DLL_CALLBACK JSObjectMapOp)(JSContext *cx, JSObjectMap *map);
-
-/*
- * Look for id in obj and its prototype chain, returning false on error or
- * exception, true on success.  On success, return null in *propp if id was
- * not found.  If id was found, return the first object searching from obj
- * along its prototype chain in which id names a direct property in *objp, and
- * return a non-null, opaque property pointer in *propp.
- *
- * If JSLookupPropOp succeeds and returns with *propp non-null, that pointer
- * may be passed as the prop parameter to a JSAttributesOp, as a short-cut
- * that bypasses id re-lookup.  In any case, a non-null *propp result after a
- * successful lookup must be dropped via JSObjectOps.dropProperty.
- *
- * NB: successful return with non-null *propp means the implementation may
- * have locked *objp and added a reference count associated with *propp, so
- * callers should not risk deadlock by nesting or interleaving other lookups
- * or any obj-bearing ops before dropping *propp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSLookupPropOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   JSObject **objp, JSProperty **propp);
-
-/*
- * Define obj[id], a direct property of obj named id, having the given initial
- * value, with the specified getter, setter, and attributes.  If the propp out
- * param is non-null, *propp on successful return contains an opaque property
- * pointer usable as a speedup hint with JSAttributesOp.  But note that propp
- * may be null, indicating that the caller is not interested in recovering an
- * opaque pointer to the newly-defined property.
- *
- * If propp is non-null and JSDefinePropOp succeeds, its caller must be sure
- * to drop *propp using JSObjectOps.dropProperty in short order, just as with
- * JSLookupPropOp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSDefinePropOp)(JSContext *cx, JSObject *obj,
-                                   jsid id, jsval value,
-                                   JSPropertyOp getter, JSPropertyOp setter,
-                                   uintN attrs, JSProperty **propp);
-
-/*
- * Get, set, or delete obj[id], returning false on error or exception, true
- * on success.  If getting or setting, the new value is returned in *vp on
- * success.  If deleting without error, *vp will be JSVAL_FALSE if obj[id] is
- * permanent, and JSVAL_TRUE if id named a direct property of obj that was in
- * fact deleted, or if id names no direct property of obj (id could name a
- * prototype property, or no property in obj or its prototype chain).
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPropertyIdOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   jsval *vp);
-
-/*
- * Get or set attributes of the property obj[id].  Return false on error or
- * exception, true with current attributes in *attrsp.  If prop is non-null,
- * it must come from the *propp out parameter of a prior JSDefinePropOp or
- * JSLookupPropOp call.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSAttributesOp)(JSContext *cx, JSObject *obj, jsid id,
-                                   JSProperty *prop, uintN *attrsp);
-
-/*
- * JSObjectOps.checkAccess type: check whether obj[id] may be accessed per
- * mode, returning false on error/exception, true on success with obj[id]'s
- * last-got value in *vp, and its attributes in *attrsp.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSCheckAccessIdOp)(JSContext *cx, JSObject *obj, jsid id,
-                                      JSAccessMode mode, jsval *vp,
-                                      uintN *attrsp);
-
-/*
- * A generic type for functions mapping an object to another object, or null
- * if an error or exception was thrown on cx.  Used by JSObjectOps.thisObject
- * at present.
- */
-typedef JSObject *
-(* JS_DLL_CALLBACK JSObjectOp)(JSContext *cx, JSObject *obj);
-
-/*
- * A generic type for functions taking a context, object, and property, with
- * no return value.  Used by JSObjectOps.dropProperty currently (see above,
- * JSDefinePropOp and JSLookupPropOp, for the object-locking protocol in which
- * dropProperty participates).
- */
-typedef void
-(* JS_DLL_CALLBACK JSPropertyRefOp)(JSContext *cx, JSObject *obj,
-                                    JSProperty *prop);
-
-/*
- * Function type for JSObjectOps.setProto and JSObjectOps.setParent.  These
- * hooks must check for cycles without deadlocking, and otherwise take special
- * steps.  See jsobj.c, js_SetProtoOrParent, for an example.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetObjectSlotOp)(JSContext *cx, JSObject *obj,
-                                      uint32 slot, JSObject *pobj);
-
-/*
- * Get and set a required slot, one that should already have been allocated.
- * These operations are infallible, so required slots must be pre-allocated,
- * or implementations must suppress out-of-memory errors.  The native ops
- * (js_ObjectOps, see jsobj.c) access slots reserved by including a call to
- * the JSCLASS_HAS_RESERVED_SLOTS(n) macro in the JSClass.flags initializer.
- *
- * NB: the slot parameter is a zero-based index into obj->slots[], unlike the
- * index parameter to the JS_GetReservedSlot and JS_SetReservedSlot API entry
- * points, which is a zero-based index into the JSCLASS_RESERVED_SLOTS(clasp)
- * reserved slots that come after the initial well-known slots: proto, parent,
- * class, and optionally, the private data slot.
- */
-typedef jsval
-(* JS_DLL_CALLBACK JSGetRequiredSlotOp)(JSContext *cx, JSObject *obj,
-                                        uint32 slot);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetRequiredSlotOp)(JSContext *cx, JSObject *obj,
-                                        uint32 slot, jsval v);
-
-typedef JSObject *
-(* JS_DLL_CALLBACK JSGetMethodOp)(JSContext *cx, JSObject *obj, jsid id,
-                                  jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSSetMethodOp)(JSContext *cx, JSObject *obj, jsid id,
-                                  jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSEnumerateValuesOp)(JSContext *cx, JSObject *obj,
-                                        JSIterateOp enum_op,
-                                        jsval *statep, jsid *idp, jsval *vp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSEqualityOp)(JSContext *cx, JSObject *obj, jsval v,
-                                 JSBool *bp);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSConcatenateOp)(JSContext *cx, JSObject *obj, jsval v,
-                                    jsval *vp);
-
-/* Typedef for native functions called by the JS VM. */
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSNative)(JSContext *cx, JSObject *obj, uintN argc,
-                             jsval *argv, jsval *rval);
-
-/* Callbacks and their arguments. */
-
-typedef enum JSContextOp {
-    JSCONTEXT_NEW,
-    JSCONTEXT_DESTROY
-} JSContextOp;
-
-/*
- * The possible values for contextOp when the runtime calls the callback are:
- *   JSCONTEXT_NEW      JS_NewContext succesfully created a new JSContext
- *                      instance. The callback can initialize the instance as
- *                      required. If the callback returns false, the instance
- *                      will be destroyed and JS_NewContext returns null. In
- *                      this case the callback is not called again.
- *   JSCONTEXT_DESTROY  One of JS_DestroyContext* methods is called. The
- *                      callback may perform its own cleanup and must always
- *                      return true.
- *   Any other value    For future compatibility the callback must do nothing
- *                      and return true in this case.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSContextCallback)(JSContext *cx, uintN contextOp);
-
-typedef enum JSGCStatus {
-    JSGC_BEGIN,
-    JSGC_END,
-    JSGC_MARK_END,
-    JSGC_FINALIZE_END
-} JSGCStatus;
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSGCCallback)(JSContext *cx, JSGCStatus status);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSBranchCallback)(JSContext *cx, JSScript *script);
-
-typedef void
-(* JS_DLL_CALLBACK JSErrorReporter)(JSContext *cx, const char *message,
-                                    JSErrorReport *report);
-
-/*
- * Possible exception types. These types are part of a JSErrorFormatString
- * structure. They define which error to throw in case of a runtime error.
- * JSEXN_NONE marks an unthrowable error.
- */
-typedef enum JSExnType {
-    JSEXN_NONE = -1,
-      JSEXN_ERR,
-        JSEXN_INTERNALERR,
-        JSEXN_EVALERR,
-        JSEXN_RANGEERR,
-        JSEXN_REFERENCEERR,
-        JSEXN_SYNTAXERR,
-        JSEXN_TYPEERR,
-        JSEXN_URIERR,
-        JSEXN_LIMIT
-} JSExnType;
-
-typedef struct JSErrorFormatString {
-    /* The error format string (UTF-8 if JS_C_STRINGS_ARE_UTF8 is defined). */
-    const char *format;
-
-    /* The number of arguments to expand in the formatted error message. */
-    uint16 argCount;
-
-    /* One of the JSExnType constants above. */
-    int16 exnType;
-} JSErrorFormatString;
-
-typedef const JSErrorFormatString *
-(* JS_DLL_CALLBACK JSErrorCallback)(void *userRef, const char *locale,
-                                    const uintN errorNumber);
-
-#ifdef va_start
-#define JS_ARGUMENT_FORMATTER_DEFINED 1
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSArgumentFormatter)(JSContext *cx, const char *format,
-                                        JSBool fromJS, jsval **vpp,
-                                        va_list *app);
-#endif
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToUpperCase)(JSContext *cx, JSString *src,
-                                        jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToLowerCase)(JSContext *cx, JSString *src,
-                                        jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleCompare)(JSContext *cx,
-                                    JSString *src1, JSString *src2,
-                                    jsval *rval);
-
-typedef JSBool
-(* JS_DLL_CALLBACK JSLocaleToUnicode)(JSContext *cx, char *src, jsval *rval);
-
-/*
- * Security protocol types.
- */
-typedef struct JSPrincipals JSPrincipals;
-
-/*
- * XDR-encode or -decode a principals instance, based on whether xdr->mode is
- * JSXDR_ENCODE, in which case *principalsp should be encoded; or JSXDR_DECODE,
- * in which case implementations must return a held (via JSPRINCIPALS_HOLD),
- * non-null *principalsp out parameter.  Return true on success, false on any
- * error, which the implementation must have reported.
- */
-typedef JSBool
-(* JS_DLL_CALLBACK JSPrincipalsTranscoder)(JSXDRState *xdr,
-                                           JSPrincipals **principalsp);
-
-/*
- * Return a weak reference to the principals associated with obj, possibly via
- * the immutable parent chain leading from obj to a top-level container (e.g.,
- * a window object in the DOM level 0).  If there are no principals associated
- * with obj, return null.  Therefore null does not mean an error was reported;
- * in no event should an error be reported or an exception be thrown by this
- * callback's implementation.
- */
-typedef JSPrincipals *
-(* JS_DLL_CALLBACK JSObjectPrincipalsFinder)(JSContext *cx, JSObject *obj);
-
-JS_END_EXTERN_C
-
-#endif /* jspubtd_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jstypes.h Deleted

@@ -1,464 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   IBM Corp.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
-** File:                jstypes.h
-** Description: Definitions of NSPR's basic types
-**
-** Prototypes and macros used to make up for deficiencies in ANSI environments
-** that we have found.
-**
-** Since we do not wrap <stdlib.h> and all the other standard headers, authors
-** of portable code will not know in general that they need these definitions.
-** Instead of requiring these authors to find the dependent uses in their code
-** and take the following steps only in those C files, we take steps once here
-** for all C files.
-**/
-
-#ifndef jstypes_h___
-#define jstypes_h___
-
-#include <stddef.h>
-
-/***********************************************************************
-** MACROS:      JS_EXTERN_API
-**              JS_EXPORT_API
-** DESCRIPTION:
-**      These are only for externally visible routines and globals.  For
-**      internal routines, just use "extern" for type checking and that
-**      will not export internal cross-file or forward-declared symbols.
-**      Define a macro for declaring procedures return types. We use this to
-**      deal with windoze specific type hackery for DLL definitions. Use
-**      JS_EXTERN_API when the prototype for the method is declared. Use
-**      JS_EXPORT_API for the implementation of the method.
-**
-** Example:
-**   in dowhim.h
-**     JS_EXTERN_API( void ) DoWhatIMean( void );
-**   in dowhim.c
-**     JS_EXPORT_API( void ) DoWhatIMean( void ) { return; }
-**
-**
-***********************************************************************/
-#ifdef WIN32
-/* These also work for __MWERKS__ */
-#define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_API(__type) __declspec(dllexport) __type
-#define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
-
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) static __x
-
-#elif defined(XP_OS2) && defined(__declspec)
-
-#define JS_EXTERN_API(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_API(__type) __declspec(dllexport) __type
-#define JS_EXTERN_DATA(__type) extern __declspec(dllexport) __type
-#define JS_EXPORT_DATA(__type) __declspec(dllexport) __type
-
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) static __x
-
-#elif defined(WIN16)
-
-#ifdef _WINDLL
-#define JS_EXTERN_API(__type) extern __type _cdecl _export _loadds
-#define JS_EXPORT_API(__type) __type _cdecl _export _loadds
-#define JS_EXTERN_DATA(__type) extern __type _export
-#define JS_EXPORT_DATA(__type) __type _export
-
-#define JS_DLL_CALLBACK             __cdecl __loadds
-#define JS_STATIC_DLL_CALLBACK(__x) static __x CALLBACK
-
-#else /* this must be .EXE */
-#define JS_EXTERN_API(__type) extern __type _cdecl _export
-#define JS_EXPORT_API(__type) __type _cdecl _export
-#define JS_EXTERN_DATA(__type) extern __type _export
-#define JS_EXPORT_DATA(__type) __type _export
-
-#define JS_DLL_CALLBACK             __cdecl __loadds
-#define JS_STATIC_DLL_CALLBACK(__x) __x JS_DLL_CALLBACK
-#endif /* _WINDLL */
-
-#else /* Unix */
-
-#ifdef HAVE_VISIBILITY_ATTRIBUTE
-#define JS_EXTERNAL_VIS __attribute__((visibility ("default")))
-#else
-#define JS_EXTERNAL_VIS
-#endif
-
-#define JS_EXTERN_API(__type) extern JS_EXTERNAL_VIS __type
-#define JS_EXPORT_API(__type) JS_EXTERNAL_VIS __type
-#define JS_EXTERN_DATA(__type) extern JS_EXTERNAL_VIS __type
-#define JS_EXPORT_DATA(__type) JS_EXTERNAL_VIS __type
-
-#define JS_DLL_CALLBACK
-#define JS_STATIC_DLL_CALLBACK(__x) static __x
-
-#endif
-
-#ifdef _WIN32
-#  if defined(__MWERKS__) || defined(__GNUC__)
-#    define JS_IMPORT_API(__x)      __x
-#  else
-#    define JS_IMPORT_API(__x)      __declspec(dllimport) __x
-#  endif
-#elif defined(XP_OS2) && defined(__declspec)
-#    define JS_IMPORT_API(__x)      __declspec(dllimport) __x
-#else
-#    define JS_IMPORT_API(__x)      JS_EXPORT_API (__x)
-#endif
-
-#if defined(_WIN32) && !defined(__MWERKS__)
-#    define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
-#elif defined(XP_OS2) && defined(__declspec)
-#    define JS_IMPORT_DATA(__x)      __declspec(dllimport) __x
-#else
-#    define JS_IMPORT_DATA(__x)     JS_EXPORT_DATA (__x)
-#endif
-
-/*
- * The linkage of JS API functions differs depending on whether the file is
- * used within the JS library or not.  Any source file within the JS
- * interpreter should define EXPORT_JS_API whereas any client of the library
- * should not.
- */
-#ifdef EXPORT_JS_API
-#define JS_PUBLIC_API(t)    JS_EXPORT_API(t)
-#define JS_PUBLIC_DATA(t)   JS_EXPORT_DATA(t)
-#else
-#define JS_PUBLIC_API(t)    JS_IMPORT_API(t)
-#define JS_PUBLIC_DATA(t)   JS_IMPORT_DATA(t)
-#endif
-
-#define JS_FRIEND_API(t)    JS_PUBLIC_API(t)
-#define JS_FRIEND_DATA(t)   JS_PUBLIC_DATA(t)
-
-#ifdef _WIN32
-#   define JS_INLINE __inline
-#elif defined(__GNUC__)
-#   define JS_INLINE
-#else
-#   define JS_INLINE
-#endif
-
-/***********************************************************************
-** MACROS:      JS_BEGIN_MACRO
-**              JS_END_MACRO
-** DESCRIPTION:
-**      Macro body brackets so that macros with compound statement definitions
-**      behave syntactically more like functions when called.
-***********************************************************************/
-#define JS_BEGIN_MACRO  do {
-#define JS_END_MACRO    } while (0)
-
-/***********************************************************************
-** MACROS:      JS_BEGIN_EXTERN_C
-**              JS_END_EXTERN_C
-** DESCRIPTION:
-**      Macro shorthands for conditional C++ extern block delimiters.
-***********************************************************************/
-#ifdef __cplusplus
-#define JS_BEGIN_EXTERN_C       extern "C" {
-#define JS_END_EXTERN_C         }
-#else
-#define JS_BEGIN_EXTERN_C
-#define JS_END_EXTERN_C
-#endif
-
-/***********************************************************************
-** MACROS:      JS_BIT
-**              JS_BITMASK
-** DESCRIPTION:
-** Bit masking macros.  XXX n must be <= 31 to be portable
-***********************************************************************/
-#define JS_BIT(n)       ((JSUint32)1 << (n))
-#define JS_BITMASK(n)   (JS_BIT(n) - 1)
-
-/***********************************************************************
-** MACROS:      JS_PTR_TO_INT32
-**              JS_PTR_TO_UINT32
-**              JS_INT32_TO_PTR
-**              JS_UINT32_TO_PTR
-** DESCRIPTION:
-** Integer to pointer and pointer to integer conversion macros.
-***********************************************************************/
-#define JS_PTR_TO_INT32(x)  ((jsint)((char *)(x) - (char *)0))
-#define JS_PTR_TO_UINT32(x) ((jsuint)((char *)(x) - (char *)0))
-#define JS_INT32_TO_PTR(x)  ((void *)((char *)0 + (jsint)(x)))
-#define JS_UINT32_TO_PTR(x) ((void *)((char *)0 + (jsuint)(x)))
-
-/***********************************************************************
-** MACROS:      JS_HOWMANY
-**              JS_ROUNDUP
-**              JS_MIN
-**              JS_MAX
-** DESCRIPTION:
-**      Commonly used macros for operations on compatible types.
-***********************************************************************/
-#define JS_HOWMANY(x,y) (((x)+(y)-1)/(y))
-#define JS_ROUNDUP(x,y) (JS_HOWMANY(x,y)*(y))
-#define JS_MIN(x,y)     ((x)<(y)?(x):(y))
-#define JS_MAX(x,y)     ((x)>(y)?(x):(y))
-
-#if (defined(XP_WIN) && !defined(CROSS_COMPILE)) || defined (WINCE) || defined (IPHONE_OS)
-#    include "jscpucfg.h"        /* Use standard Mac or Windows configuration */
-#elif defined(XP_UNIX) || defined(XP_BEOS) || defined(XP_OS2) || defined(CROSS_COMPILE)
-#    include "jsautocfg.h"       /* Use auto-detected configuration */
-#    include "jsosdep.h"         /* ...and platform-specific flags */
-#else
-#    error "Must define one of XP_BEOS, XP_OS2, XP_WIN or XP_UNIX"
-#endif
-
-JS_BEGIN_EXTERN_C
-
-/************************************************************************
-** TYPES:       JSUint8
-**              JSInt8
-** DESCRIPTION:
-**  The int8 types are known to be 8 bits each. There is no type that
-**      is equivalent to a plain "char".
-************************************************************************/
-#if JS_BYTES_PER_BYTE == 1
-typedef unsigned char JSUint8;
-typedef signed char JSInt8;
-#else
-#error No suitable type for JSInt8/JSUint8
-#endif
-
-/************************************************************************
-** TYPES:       JSUint16
-**              JSInt16
-** DESCRIPTION:
-**  The int16 types are known to be 16 bits each.
-************************************************************************/
-#if JS_BYTES_PER_SHORT == 2
-typedef unsigned short JSUint16;
-typedef short JSInt16;
-#else
-#error No suitable type for JSInt16/JSUint16
-#endif
-
-/************************************************************************
-** TYPES:       JSUint32
-**              JSInt32
-** DESCRIPTION:
-**  The int32 types are known to be 32 bits each.
-************************************************************************/
-#if JS_BYTES_PER_INT == 4
-typedef unsigned int JSUint32;
-typedef int JSInt32;
-#define JS_INT32(x)  x
-#define JS_UINT32(x) x ## U
-#elif JS_BYTES_PER_LONG == 4
-typedef unsigned long JSUint32;
-typedef long JSInt32;
-#define JS_INT32(x)  x ## L
-#define JS_UINT32(x) x ## UL
-#else
-#error No suitable type for JSInt32/JSUint32
-#endif
-
-/************************************************************************
-** TYPES:       JSUint64
-**              JSInt64
-** DESCRIPTION:
-**  The int64 types are known to be 64 bits each. Care must be used when
-**      declaring variables of type JSUint64 or JSInt64. Different hardware
-**      architectures and even different compilers have varying support for
-**      64 bit values. The only guaranteed portability requires the use of
-**      the JSLL_ macros (see jslong.h).
-************************************************************************/
-#ifdef JS_HAVE_LONG_LONG
-#if JS_BYTES_PER_LONG == 8
-typedef long JSInt64;
-typedef unsigned long JSUint64;
-#elif defined(WIN16)
-typedef __int64 JSInt64;
-typedef unsigned __int64 JSUint64;
-#elif defined(WIN32) && !defined(__GNUC__)
-typedef __int64  JSInt64;
-typedef unsigned __int64 JSUint64;
-#else
-typedef long long JSInt64;
-typedef unsigned long long JSUint64;
-#endif /* JS_BYTES_PER_LONG == 8 */
-#else  /* !JS_HAVE_LONG_LONG */
-typedef struct {
-#ifdef IS_LITTLE_ENDIAN
-    JSUint32 lo, hi;
-#else
-    JSUint32 hi, lo;
-#endif
-} JSInt64;
-typedef JSInt64 JSUint64;
-#endif /* !JS_HAVE_LONG_LONG */
-
-/************************************************************************
-** TYPES:       JSUintn
-**              JSIntn
-** DESCRIPTION:
-**  The JSIntn types are most appropriate for automatic variables. They are
-**      guaranteed to be at least 16 bits, though various architectures may
-**      define them to be wider (e.g., 32 or even 64 bits). These types are
-**      never valid for fields of a structure.
-************************************************************************/
-#if JS_BYTES_PER_INT >= 2
-typedef int JSIntn;
-typedef unsigned int JSUintn;
-#else
-#error 'sizeof(int)' not sufficient for platform use
-#endif
-
-/************************************************************************
-** TYPES:       JSFloat64
-** DESCRIPTION:
-**  NSPR's floating point type is always 64 bits.
-************************************************************************/
-typedef double          JSFloat64;
-
-/************************************************************************
-** TYPES:       JSSize
-** DESCRIPTION:
-**  A type for representing the size of objects.
-************************************************************************/
-typedef size_t JSSize;
-
-/************************************************************************
-** TYPES:       JSPtrDiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
-************************************************************************/
-typedef ptrdiff_t JSPtrdiff;
-
-/************************************************************************
-** TYPES:       JSUptrdiff
-** DESCRIPTION:
-**  A type for pointer difference. Variables of this type are suitable
-**      for storing a pointer or pointer sutraction.
-************************************************************************/
-#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
-typedef JSUint64 JSUptrdiff;
-#else
-typedef unsigned long JSUptrdiff;
-#endif
-
-/************************************************************************
-** TYPES:       JSBool
-** DESCRIPTION:
-**  Use JSBool for variables and parameter types. Use JS_FALSE and JS_TRUE
-**      for clarity of target type in assignments and actual arguments. Use
-**      'if (bool)', 'while (!bool)', '(bool) ? x : y' etc., to test booleans
-**      just as you would C int-valued conditions.
-************************************************************************/
-typedef JSIntn JSBool;
-#define JS_TRUE (JSIntn)1
-#define JS_FALSE (JSIntn)0
-
-/************************************************************************
-** TYPES:       JSPackedBool
-** DESCRIPTION:
-**  Use JSPackedBool within structs where bitfields are not desireable
-**      but minimum and consistent overhead matters.
-************************************************************************/
-typedef JSUint8 JSPackedBool;
-
-/*
-** A JSWord is an integer that is the same size as a void*
-*/
-#if JS_BYTES_PER_WORD == 8 && JS_BYTES_PER_LONG != 8
-typedef JSInt64 JSWord;
-typedef JSUint64 JSUword;
-#else
-typedef long JSWord;
-typedef unsigned long JSUword;
-#endif
-
-#include "jsotypes.h"
-
-/***********************************************************************
-** MACROS:      JS_LIKELY
-**              JS_UNLIKELY
-** DESCRIPTION:
-**      These macros allow you to give a hint to the compiler about branch
-**      probability so that it can better optimize.  Use them like this:
-**
-**      if (JS_LIKELY(v == 1)) {
-**          ... expected code path ...
-**      }
-**
-**      if (JS_UNLIKELY(v == 0)) {
-**          ... non-expected code path ...
-**      }
-**
-***********************************************************************/
-#if defined(__GNUC__) && (__GNUC__ > 2)
-#define JS_LIKELY(x)    (__builtin_expect((x), 1))
-#define JS_UNLIKELY(x)  (__builtin_expect((x), 0))
-#else
-#define JS_LIKELY(x)    (x)
-#define JS_UNLIKELY(x)  (x)
-#endif
-
-/***********************************************************************
-** MACROS:      JS_ARRAY_LENGTH
-**              JS_ARRAY_END
-** DESCRIPTION:
-**      Macros to get the number of elements and the pointer to one past the
-**      last element of a C array. Use them like this:
-**
-**      jschar buf[10], *s;
-**      JSString *str;
-**      ...
-**      for (s = buf; s != JS_ARRAY_END(buf); ++s) *s = ...;
-**      ...
-**      str = JS_NewStringCopyN(cx, buf, JS_ARRAY_LENGTH(buf));
-**      ...
-**
-***********************************************************************/
-
-#define JS_ARRAY_LENGTH(array) (sizeof (array) / sizeof (array)[0])
-#define JS_ARRAY_END(array)    ((array) + JS_ARRAY_LENGTH(array))
-
-JS_END_EXTERN_C
-
-#endif /* jstypes_h___ */

gpac-0.8.0.tar.gz/extra_lib/include/js/jsxdrapi.h Deleted

@@ -1,223 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: set ts=8 sw=4 et tw=78:
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef jsxdrapi_h___
-#define jsxdrapi_h___
-
-/*
- * JS external data representation interface API.
- *
- * The XDR system is comprised of three major parts:
- *
- * - the state serialization/deserialization APIs, which allow consumers
- *   of the API to serialize JS runtime state (script bytecodes, atom maps,
- *   object graphs, etc.) for later restoration.  These portions
- *   are implemented in various appropriate files, such as jsscript.c
- *   for the script portions and jsobj.c for object state.
- * - the callback APIs through which the runtime requests an opaque
- *   representation of a native object, and through which the runtime
- *   constructs a live native object from an opaque representation. These
- *   portions are the responsibility of the native object implementor.
- * - utility functions for en/decoding of primitive types, such as
- *   JSStrings.  This portion is implemented in jsxdrapi.c.
- *
- * Spiritually guided by Sun's XDR, where appropriate.
- */
-
-#include "jspubtd.h"
-#include "jsprvtd.h"
-
-JS_BEGIN_EXTERN_C
-
-/* We use little-endian byteorder for all encoded data */
-
-#if defined IS_LITTLE_ENDIAN
-#define JSXDR_SWAB32(x) x
-#define JSXDR_SWAB16(x) x
-#elif defined IS_BIG_ENDIAN
-#define JSXDR_SWAB32(x) (((uint32)(x) >> 24) |                                \
-                         (((uint32)(x) >> 8) & 0xff00) |                      \
-                         (((uint32)(x) << 8) & 0xff0000) |                    \
-                         ((uint32)(x) << 24))
-#define JSXDR_SWAB16(x) (((uint16)(x) >> 8) | ((uint16)(x) << 8))
-#else
-#error "unknown byte order"
-#endif
-
-#define JSXDR_ALIGN     4
-
-typedef enum JSXDRMode {
-    JSXDR_ENCODE,
-    JSXDR_DECODE,
-    JSXDR_FREE
-} JSXDRMode;
-
-typedef enum JSXDRWhence {
-    JSXDR_SEEK_SET,
-    JSXDR_SEEK_CUR,
-    JSXDR_SEEK_END
-} JSXDRWhence;
-
-typedef struct JSXDROps {
-    JSBool      (*get32)(JSXDRState *, uint32 *);
-    JSBool      (*set32)(JSXDRState *, uint32 *);
-    JSBool      (*getbytes)(JSXDRState *, char *, uint32);
-    JSBool      (*setbytes)(JSXDRState *, char *, uint32);
-    void *      (*raw)(JSXDRState *, uint32);
-    JSBool      (*seek)(JSXDRState *, int32, JSXDRWhence);
-    uint32      (*tell)(JSXDRState *);
-    void        (*finalize)(JSXDRState *);
-} JSXDROps;
-
-struct JSXDRState {
-    JSXDRMode   mode;
-    JSXDROps    *ops;
-    JSContext   *cx;
-    JSClass     **registry;
-    uintN       numclasses;
-    uintN       maxclasses;
-    void        *reghash;
-    void        *userdata;
-    JSScript    *script;
-};
-
-extern JS_PUBLIC_API(void)
-JS_XDRInitBase(JSXDRState *xdr, JSXDRMode mode, JSContext *cx);
-
-extern JS_PUBLIC_API(JSXDRState *)
-JS_XDRNewMem(JSContext *cx, JSXDRMode mode);
-
-extern JS_PUBLIC_API(void *)
-JS_XDRMemGetData(JSXDRState *xdr, uint32 *lp);
-
-extern JS_PUBLIC_API(void)
-JS_XDRMemSetData(JSXDRState *xdr, void *data, uint32 len);
-
-extern JS_PUBLIC_API(uint32)
-JS_XDRMemDataLeft(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(void)
-JS_XDRMemResetData(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(void)
-JS_XDRDestroy(JSXDRState *xdr);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint8(JSXDRState *xdr, uint8 *b);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint16(JSXDRState *xdr, uint16 *s);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRUint32(JSXDRState *xdr, uint32 *lp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRBytes(JSXDRState *xdr, char *bytes, uint32 len);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRCString(JSXDRState *xdr, char **sp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRCStringOrNull(JSXDRState *xdr, char **sp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRString(JSXDRState *xdr, JSString **strp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRStringOrNull(JSXDRState *xdr, JSString **strp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRDouble(JSXDRState *xdr, jsdouble **dp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRValue(JSXDRState *xdr, jsval *vp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRScript(JSXDRState *xdr, JSScript **scriptp);
-
-extern JS_PUBLIC_API(JSBool)
-JS_XDRRegisterClass(JSXDRState *xdr, JSClass *clasp, uint32 *lp);
-
-extern JS_PUBLIC_API(uint32)
-JS_XDRFindClassIdByName(JSXDRState *xdr, const char *name);
-
-extern JS_PUBLIC_API(JSClass *)
-JS_XDRFindClassById(JSXDRState *xdr, uint32 id);
-
-/*
- * Magic numbers.
- */
-#define JSXDR_MAGIC_SCRIPT_1        0xdead0001
-#define JSXDR_MAGIC_SCRIPT_2        0xdead0002
-#define JSXDR_MAGIC_SCRIPT_3        0xdead0003
-#define JSXDR_MAGIC_SCRIPT_4        0xdead0004
-#define JSXDR_MAGIC_SCRIPT_5        0xdead0005
-#define JSXDR_MAGIC_SCRIPT_CURRENT  JSXDR_MAGIC_SCRIPT_5
-
-/*
- * Bytecode version number.  Decrement the second term whenever JS bytecode
- * changes incompatibly.
- *
- * This version number should be XDR'ed once near the front of any file or
- * larger storage unit containing XDR'ed bytecode and other data, and checked
- * before deserialization of bytecode.  If the saved version does not match
- * the current version, abort deserialization and invalidate the file.
- */
-#define JSXDR_BYTECODE_VERSION      (0xb973c0de - 16)
-
-/*
- * Library-private functions.
- */
-extern JSBool
-js_XDRAtom(JSXDRState *xdr, JSAtom **atomp);
-
-extern JSBool
-js_XDRStringAtom(JSXDRState *xdr, JSAtom **atomp);
-
-/*
- * FIXME: This is non-unicode version of js_XDRStringAtom that performs lossy
- * conversion. Do not use it in the new code! See bug 325202.
- */
-extern JSBool
-js_XDRCStringAtom(JSXDRState *xdr, JSAtom **atomp);
-
-JS_END_EXTERN_C
-
-#endif /* ! jsxdrapi_h___ */

gpac-0.8.0.tar.gz/gui Deleted

gpac-0.8.0.tar.gz/gui/extensions Deleted

gpac-0.8.0.tar.gz/gui/extensions/H2B2VS Deleted

gpac-0.8.0.tar.gz/gui/extensions/H2B2VS/h2b2vs.js Deleted

@@ -1,462 +0,0 @@
-extension = {
-    setup: false,
-    dialog: null,
-    uhd_demo_enabled: false,
-    uhd_demo_on: false,
-    uhd_state_on: true,
-    addon_url: null,
-    scene_url: null,
-    overlay_position: 0,
-    icon_width: 0,
-    icon_height: 0,
-    movie_width: 0,
-    movie_height: 0,
-    disable_save_session: false,
-    disable_addons: false,
-
-    toggle_uhd_demo: function (val) {
-        this.uhd_demo_on = val;
-        var notif = null;
-        if (this.uhd_demo_on) {
-            notif = gw_new_message(null, 'UHD Demo Enbaled', 'Click to toggle quality');
-        } else {
-            notif = gw_new_message(null, 'UHD Demo Disabled', 'Double-click to re-enable');
-            this.logo.children[0].url[0] = '';
-        }
-        this.do_layout();
-        notif.set_size(20 * gwskin.default_text_font_size, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
-        notif.show();
-    },
-
-    ext_filter_event: function (evt) {
-        switch (evt.type) {
-            case GF_EVENT_ADDON_DETECTED:
-                this.confirm_addon(evt);
-                return true;
-            case GF_EVENT_QUIT:
-                this.save_session();
-                return false;
-            case GF_EVENT_DBLCLICK:
-                if (this.uhd_demo_enabled) {
-                    this.toggle_uhd_demo(!this.uhd_demo_on);
-                }
-                return false;
-            case GF_EVENT_MOUSEUP:
-                if (this.uhd_demo_on) {
-                    this.uhd_state_on = !this.uhd_state_on;
-                    gpac.switch_quality(this.uhd_state_on);
-                    return true;
-                }
-                return false;
-
-            case GF_EVENT_MOUSEDOWN:
-                if (this.uhd_demo_on) {
-                    return true;
-                }
-                return false;
-
-            case GF_EVENT_SCENE_SIZE:
-                if (typeof evt.width != 'undefined') {
-                    this.movie_width = evt.width;
-                    this.movie_height = evt.height;
-                    if (this.movie_height > 1080) this.uhd_state_on = true;
-
-                    if (this.uhd_demo_on) {
-                        this.do_layout();
-                    }
-                }
-                return false;
-            case GF_EVENT_KEYDOWN:
-                //alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
-
-                var odm = gpac.get_object_manager(this.scene_url);
-                if (!odm || odm.main_addon_url) return false;
-
-                if (evt.keycode == 'F7') {
-                    this.uhd_state_on = !this.uhd_state_on;
-                    gpac.switch_quality(this.uhd_state_on);
-                    return true;
-                }
-
-                if (evt.keycode == 'F6') {
-                    this.overlay_position++;
-                    if (this.overlay_position == 4) {
-                        this.do_deactivate_addon();
-
-                    } else {
-                        if (this.overlay_position == 5) {
-                            this.do_activate_addon();
-                            this.overlay_position = 0;
-                        }
-                        this.set_option('OverlayPosition', '' + this.overlay_position);
-                        this.refresh_addon();
-                    }
-                    return true;
-                }
-/*
-                if (evt.keycode == 'F12') {
-                    gpac.exit();
-                    return true;
-                }
-*/
-                return false;
-			case GF_JS_EVENT_PLAYBACK:
-				//whenever paused, store pause time
-				if (! evt.is_playing) {
-					this.save_session();
-				}
-				return false;
-				
-            default:
-                return false;
-        }
-    },
-
-    create_event_filter: function (__anobj) {
-        return function (evt) {
-            return __anobj.ext_filter_event(evt);
-        }
-    },
-
-    do_layout: function () {
-        if (this.uhd_demo_enabled && this.uhd_demo_on) {
-            var url = this.get_option('path');
-            if (this.movie_height > 1080) {
-                url += 'logo_uhd.png';
-                this.logo.scale.x = 1;
-                this.logo.scale.y = 1;
-            } else {
-                url += 'logo_hd.png';
-                this.logo.scale.x = 2;
-                this.logo.scale.y = 2;
-            }
-            this.logo.children[0].url[0] = url;
-        } else {
-            this.logo.children[0].url[0] = '';
-        }
-    },
-
-    start: function () {
-        //first launch - register event filter and exit
-        if (!this.setup) {
-            gwlib_add_event_filter(this.create_event_filter(this), true);
-            this.setup = true;
-
-            this.overlay_position = parseInt(this.get_option('OverlayPosition', '0'));
-
-            /*create media nodes element for playback*/
-            this.logo = gw_new_container();
-            this.logo.children[0] = new SFNode('Inline');
-            this.logo.children[0].extension = this;
-            this.logo.children[0].url[0] = '';
-            this.logo.children[0].on_scene_size = function (evt) {
-                this.extension.icon_width = evt.width;
-                this.extension.icon_height = evt.height;
-                this.extension.do_layout();
-            };
-
-            gw_add_child(null, this.logo);
-
-            this.logo.children[0].addEventListener('gpac_scene_attached', this.logo.children[0].on_scene_size, 0);
-
-            this.restore_session();
-
-            //check our args
-            var i, argc = gpac.argc;
-            for (i = 1; i < argc; i++) {
-                var arg = gpac.get_arg(i);
-                if (arg == '-demo-uhd') {
-                    this.uhd_demo_enabled = true;
-                    this.toggle_uhd_demo(true);
-                    gwlog(l_war, 'UHD Demo enabled');
-                }
-                else if (arg == '-no-addon') {
-                    this.disable_addons = true;
-                }
-            }
-            return;
-        }
-
-        gw_hide_dock();
-        var wnd = gw_new_window_full(null, true, 'H2B2VS Preferences');
-
-        this.dialog = wnd;
-        this.dialog.extension = this;
-
-        wnd.area = gw_new_grid_container(wnd);
-        wnd.area.spread_h = true;
-        wnd.area.break_at_hidden = true;
-
-        wnd.txt1 = gw_new_text(wnd.area, 'Overlay Position');
-        gw_new_separator(wnd.area);
-
-
-        wnd.check_pos = function (value) {
-            this.chk_pos1.set_checked((value == 0) ? true : false);
-            this.chk_pos2.set_checked((value == 1) ? true : false);
-            this.chk_pos3.set_checked((value == 2) ? true : false);
-            this.chk_pos4.set_checked((value == 3) ? true : false);
-
-            this.extension.set_option('OverlayPosition', '' + value);
-            this.extension.refresh_addon();
-        }
-        wnd.chk_pos4 = gw_new_checkbox(wnd.area, 'Top-Left');
-        wnd.chk_pos4.on_check = function (value) {
-            this.parent.parent.check_pos(3);
-        }
-        wnd.chk_pos2 = gw_new_checkbox(wnd.area, 'Top-Right');
-        wnd.chk_pos2.on_check = function (value) {
-            this.parent.parent.check_pos(1);
-        }
-        wnd.chk_pos3 = gw_new_checkbox(wnd.area, 'Bottom-Left');
-        wnd.chk_pos3.on_check = function (value) {
-            this.parent.parent.check_pos(2);
-        }
-        wnd.chk_pos1 = gw_new_checkbox(wnd.area, 'Bottom-Right');
-        wnd.chk_pos1.on_check = function (value) {
-            this.parent.parent.check_pos(0);
-        }
-
-        wnd.txt2 = gw_new_text(wnd.area, 'Overlay Size');
-        gw_new_separator(wnd.area);
-
-
-        wnd.check_size = function (value) {
-            this.chk_size1.set_checked((value == 0) ? true : false);
-            this.chk_size2.set_checked((value == 1) ? true : false);
-            this.chk_size3.set_checked((value == 2) ? true : false);
-            this.extension.set_option('OverlaySize', '' + value);
-            this.extension.refresh_addon();
-        }
-        wnd.chk_size1 = gw_new_checkbox(wnd.area, '1/2 Height');
-        wnd.chk_size1.on_check = function (value) {
-            this.parent.parent.check_size(0);
-        }
-        wnd.chk_size2 = gw_new_checkbox(wnd.area, '1/3 Height');
-        wnd.chk_size2.on_check = function (value) {
-            this.parent.parent.check_size(1);
-        }
-        wnd.chk_size3 = gw_new_checkbox(wnd.area, '1/4 Height');
-        wnd.chk_size3.on_check = function (value) {
-            this.parent.parent.check_size(2);
-        }
-
-        wnd.txt3 = gw_new_text(wnd.area, 'User Identifier');
-        gw_new_separator(wnd.area);
-        wnd.edit = gw_new_text_edit(wnd.area, this.get_option('UserID', 'H2B2VSUser'));
-        gpac.set_focus(wnd.edit);
-        wnd.edit.on_text = function (val) {
-            if (val != '') {
-                this.parent.parent.extension.set_option('UserID', val);
-            }
-        }
-
-        gw_new_separator(wnd.area);
-        wnd.chk_addon = gw_new_checkbox(wnd.area, 'Auto-select addon');
-        wnd.chk_addon.on_check = function (value) {
-            this.parent.parent.extension.set_option('AutoSelect', value ? 'yes' : 'no');
-        }
-        var do_sel = this.get_option('AutoSelect', 'no');
-        wnd.chk_addon.set_checked((do_sel == 'yes') ? true : false);
-
-        wnd.dbg_addon = gw_new_checkbox(wnd.area, 'Debug PVR addon');
-        wnd.dbg_addon.on_check = function (value) {
-            gpac.set_option('Systems', 'DebugPVRScene', value ? 'yes' : 'no');
-        }
-        do_sel = gpac.get_option('Systems', 'DebugPVRScene');
-        wnd.dbg_addon.set_checked((do_sel == 'yes') ? true : false);
-
-        gw_new_separator(wnd.area);
-        wnd.uhd_demo = gw_new_checkbox(wnd.area, 'UHD Demo');
-        wnd.uhd_demo.on_check = function (value) {
-            this.parent.parent.extension.uhd_demo_enabled = value;
-            this.parent.parent.extension.set_option('UHDDemo', value ? 'yes' : 'no');
-        }
-        do_sel = this.get_option('UHDDemo', 'no');
-        this.uhd_demo_enabled = (do_sel == 'yes') ? true : false;
-        wnd.uhd_demo.set_checked(this.uhd_demo_enabled);
-        if (this.uhd_demo_enabled) this.uhd_demo_on = true;
-
-        wnd.on_display_size = function (width, height) {
-            w = 0.9 * width;
-            if (w > 500) w = 500;
-            this.txt1.set_size(w / 3, gwskin.default_icon_height);
-
-            this.chk_pos1.set_size(w / 2, gwskin.default_control_height);
-            this.chk_pos2.set_size(w / 2, gwskin.default_control_height);
-            this.chk_pos3.set_size(w / 2, gwskin.default_control_height);
-            this.chk_pos4.set_size(w / 2, gwskin.default_control_height);
-
-            this.txt2.set_size(w / 3, gwskin.default_icon_height);
-
-            this.chk_size1.set_size(w / 3, gwskin.default_control_height);
-            this.chk_size2.set_size(w / 3, gwskin.default_control_height);
-            this.chk_size3.set_size(w / 3, gwskin.default_control_height);
-
-            this.txt3.set_size(w / 3, gwskin.default_icon_height);
-            this.edit.set_size(w / 2, gwskin.default_icon_height);
-            this.chk_addon.set_size(w / 2, gwskin.default_icon_height);
-            this.dbg_addon.set_size(w / 2, gwskin.default_icon_height);
-            this.uhd_demo.set_size(w / 2, gwskin.default_icon_height);
-
-            this.set_size(w, 13 * gwskin.default_icon_height);
-        }
-
-        wnd.check_pos(this.overlay_position);
-        wnd.check_size(parseInt(this.get_option('OverlaySize', '0')));
-
-
-        wnd.on_display_size(gw_display_width, gw_display_height);
-        wnd.set_alpha(0.9);
-        wnd.show();
-
-
-        wnd.on_close = function () {
-            gw_show_dock();
-            wnd.extension.dialog = null;
-        };
-    },
-
-    refresh_addon: function () {
-        if (this.scene_url) {
-            var odm = gpac.get_object_manager(this.scene_url);
-            if (odm) {
-                odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
-            }
-        }
-    },
-
-    do_activate_addon: function () {
-        var odm = gpac.get_object_manager(this.scene_url);
-        if (odm) {
-            odm.enable_addon(this.addon_url);
-            odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
-        }
-    },
-
-    do_deactivate_addon: function () {
-        var odm = gpac.get_object_manager(this.scene_url);
-        if (odm) {
-            odm.enable_addon(this.addon_url, true);
-        }
-    },
-
-
-    confirm_addon: function (evt) {
-
-        if (this.disable_addons) return;
-
-        if (this.get_option('AutoSelect', 'no') == 'yes') {
-            this.scene_url = evt.scene_url;
-            this.addon_url = evt.addon_url;
-            this.do_activate_addon();
-            return;
-        }
-
-        var names = ext = evt.addon_url.split('/');
-        if (names.length == 0) names = f.url.split('\\');
-
-        var dlg = gw_new_confirm_wnd(null, 'Addon detected (' + names.pop() + '), enable it ?');
-        dlg.set_alpha(0.95);
-        dlg.show();
-        dlg.extension = this;
-        dlg.scene_url = evt.scene_url;
-        dlg.addon_url = evt.addon_url;
-
-        dlg.on_confirm = function (value) {
-            if (!value) return;
-            this.extension.scene_url = evt.scene_url;
-            this.extension.addon_url = evt.addon_url;
-            this.extension.do_activate_addon();
-        }
-    },
-
-    do_xhr: function (url, cmd) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('POST', url, false);
-
-        xhr.setRequestHeader('Content-Type', 'application/json');
-        xhr.setRequestHeader('Content-Length', cmd.length);
-        xhr.send(cmd);
-
-        if ((xhr.status != 200) || (xhr.readyState != 4)) {
-            if (xhr.status) {
-                gwlog(l_err, '[H2B2VS] Failed to query server: ' + xhr.responseText);
-            } else {
-                gwlog(l_err, '[H2B2VS] Failed to send request');
-            }
-            return null;
-        }
-        gwlog(l_deb, 'Command sent is ' + cmd + ' - response is ' + xhr.responseText);
-
-        var obj = gwskin.parse(xhr.responseText);
-        if (typeof obj.result == 'undefined') {
-            gwlog(l_err, '[H2B2VS] Non conformant response object ' + xhr.responseText);
-            return null;
-        }
-        if (obj.result != 0) {
-            gwlog(l_inf, '[H2B2VS] No session found for user - ' + xhr.responseText);
-            return null;
-        }
-        return obj;
-    },
-
-    restore_session: function () {
-
-        if (gwskin.media_url) {
-            gwlog(l_inf, 'URL was given when opening, skipping session restore');
-            return;
-        }
-        //this.disable_save_session = true;
-
-        var server = this.get_option('SessionServer', null);
-        var user = this.get_option('UserID', null);
-        if (!server || !user) return;
-
-        var url = server + 'getData';
-        var cmd = 'ID=' + user;
-
-        var obj = this.do_xhr(url, cmd);
-        if (!obj || !obj.data || !obj.data.url || (obj.data.url== '') ) return;
-
-        var dlg = gw_new_confirm_wnd(null, 'Restore last session ?');
-        dlg.set_alpha(0.95);
-        dlg.show();
-        dlg.sess = obj.data;
-
-        gwlog(l_deb, 'H2B2VS state to restore: ' + gwskin.stringify(obj.data));
-
-        dlg.on_confirm = function (value) {
-            if (!value) return;
-            gwskin.restore_session(this.sess.url, this.sess.media_time, this.sess.media_clock);
-        }
-    },
-
-    save_session: function () {
-
-        if (this.disable_save_session) return;
-
-        var obj = {};
-        var url = gwskin.pvr_url;
-        if (url === '') url = gwskin.media_url;
-
-        obj.url = url.replace(/\\/g, "/");
-        obj.media_time = 0;
-        obj.media_clock = 0;
-        if (typeof gwskin.media_time != 'undefined') obj.media_time = gwskin.media_time;
-        if (typeof gwskin.media_clock != 'undefined') obj.media_clock = gwskin.media_clock;
-
-        var str = gwskin.stringify(obj);
-        gwlog(l_deb, 'H2B2VS storing state: ' + str);
-
-		var server = this.get_option('SessionServer', null);
-		var user = this.get_option('UserID', null);
-		if (!server || !user) return;
-
-		var url = server + 'setData';
-        var cmd = 'ID=' + user + '&Data=' + str;
-        this.do_xhr(url, cmd);
-
-    }
-};
-

gpac-0.8.0.tar.gz/gui/extensions/about Deleted

gpac-0.8.0.tar.gz/gui/extensions/about/info.js Deleted

gpac-0.8.0.tar.gz/gui/extensions/bifs_tests Deleted

gpac-0.8.0.tar.gz/gui/extensions/player Deleted

gpac-0.8.0.tar.gz/gui/extensions/player/init.js Deleted

gpac-0.8.0.tar.gz/gui/extensions/player/player.js Deleted

@@ -1,1828 +0,0 @@
-
-extension = {
-    GF_STATE_PLAY: 0,
-    GF_STATE_PAUSE: 1,
-    GF_STATE_STOP: 2,
-    GF_STATE_TRICK: 3,
-
-    GF_VIEW_MONO: 0,
-    GF_VIEW_STEREO: 1,
-    GF_VIEW_STEREO_SIDE: 2,
-    GF_VIEW_STEREO_TOP: 3,
-
-    movie: null,
-    movie_control: null,
-    movie_sensor: null,
-    UPnP_Enabled: false,
-    dynamic_scene: false,
-    movie_connected: false,
-    controlled_renderer: null,
-    current_url: null,
-    local_url: false,
-    initial_play_done: false,
-    dictionary: null,
-    icon_pause: 1,
-    icon_play: 0,
-    controler: null,
-    buffer_wnd: null,
-    current_time: 0,
-    duration: 0,
-    timeshift_depth: 0,
-    time_in_tsb: 0,
-    muted: 0,
-    file_open_dlg: false,
-    stoped_url: null,
-    initial_service_id: 0,
-    default_addon: null,
-    history: [],
-    bookmarks: [],
-    root_odm: null,
-    navigation_wnd: null,
-    initial_loop: false,
-    initial_speed: 1,
-    initial_start: 0,
-    show_stats_init: 0,
-	def_width: 600,
-	def_height: 600,
-	disabled: false,
-    services: [],
-    channels_wnd: null,
-	medialist_wnd: null,
-    reverse_playback_supported: false,
-	view_stereo: 0,
-
-    stats_wnd: null,
-    stats_data: [],
-    stats_window: 100,
-    stats_resources: [],
-    nb_objs_at_last_scan: 0,
-    stats_timer: null,
-
-    do_show_controler: function () {
-		if (this.file_open_dlg) {
-            alert('Cannot show - File dialog is open');
-            return false;
-        }
-        gw_hide_dock();
-        if (this.controler.visible) {
-            this.controler.hide();
-        } else {
-            this.controler.show();
-        }
-    },
-
-    ext_filter_event: function (evt) {
-		if (this.disabled) return false;
-		
-        switch (evt.type) {
-		case GF_EVENT_MOUSEUP:
-			if ((gwskin.last_hit_x == evt.mouse_x) && (gwskin.last_hit_y == evt.mouse_y)) {
-				this.do_show_controler();
-			}
-			//we always return false so that the event is handled by the navigation logic of the player, otherwise
-			//the mouse would never be released and navigation would stay always on
-			return false;
-		case GF_EVENT_KEYUP:
-			if (evt.keycode == gwskin.keys.close) {
-				this.do_show_controler();
-				return true;
-			}
-			return false;
-		case GF_EVENT_QUALITY_SWITCHED:
-			if (this.stats_wnd) {
-				this.stats_wnd.quality_changed();
-			}
-			return true;
-		case GF_EVENT_TIMESHIFT_UPDATE:
-			if (this.timeshift_depth) {
-				this.set_time(0);
-			}
-			return true;
-		case GF_EVENT_TIMESHIFT_OVERFLOW:
-			var msg = '';
-			if ((this.state == this.GF_STATE_PAUSE) || (this.movie_control.mediaSpeed != 1)) {
-				this.set_state(this.GF_STATE_PLAY);
-				this.set_speed(1);
-
-				msg = gw_new_message(null, 'Timeshift Overflow', 'Falling outside of timeshift buffer: resuming playback');
-				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
-				msg.show();
-			}
-			return true;
-		case GF_EVENT_TIMESHIFT_UNDERRUN:
-			if (this.movie_control.mediaSpeed > 1) {
-				this.set_speed(1);
-				var msg = gw_new_message(null, 'Timeshift Underrun', 'Resuming to normal speed');
-				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
-				msg.show();
-			}
-			return true;
-		case GF_EVENT_NAVIGATE:
-			this.set_movie_url(evt.target_url);
-			return true;
-		case GF_EVENT_KEYDOWN:
-			//alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
-			if (evt.keycode == 'F1') {
-				this.controler.rewind.on_click();
-				return true;
-			}
-			if (evt.keycode == 'F2') {
-				this.controler.play.on_click();
-				return true;
-			}
-			if (evt.keycode == 'F3') {
-				this.controler.forward.on_click();
-				return true;
-			}
-			if (evt.keycode == 'F4') {
-				this.controler.back_live.on_click();
-				return true;
-			}
-			/*
-			if (evt.keycode == 'F7') {
-			 this.controler.fullscreen.on_click();
-			 return true;
-			}
-			if (evt.keycode == 'F8') {
-			 gpac.reload();
-			 return true;
-			}
-			*/
-			return false;
-
-		default:
-			return false;
-        }
-    },
-
-    init_extension: function () {
-
-        /*create media nodes element for playback*/
-        var a_movie = new SFNode('OrderedGroup');
-        this.movie = new SFNode('Transform2D');
-        a_movie.children[0] = this.movie;
-        a_movie.children[0].children[0] = new SFNode('Inline');
-        a_movie.children[0].children[0].url[0] = '';
-        this.movie_control = new SFNode('MediaControl')
-        a_movie.children[0].children[1] = this.movie_control;
-        this.movie_sensor = new SFNode('MediaSensor')
-        a_movie.children[0].children[2] = this.movie_sensor;
-
-        gw_insert_media_node(a_movie);
-        //dictionary of resources to load 
-        this.dictionary = gw_new_container(null);
-        this.dictionary.hide();
-
-        this.movie.children[0].extension = this;
-
-        this.movie.children[0].on_scene_size = function (evt) {
-            var ext = this.extension;
-
-            if (!this.callback_done) {
-                this.callback_done = true;
-
-                //process the error or connect service
-                if (evt.error) {
-                    var notif = gw_new_message(null, 'Error opening file!', 'Failed to open ' + this.url[0] + '\n\nReason: ' + gpac.error_string(evt.error));
-                    notif.show();
-
-                    var url = ext.movie.children[0].url.length ? ext.movie.children[0].url[0] : '';
-                    //reassign old inline URL
-                    this.url[0] = url;
-                    if (url == '') {
-                        ext.controler.show();
-						ext.set_state(ext.GF_STATE_STOP);
-                    } else {
-                        ext.movie_connected = true;
-						ext.set_state(ext.GF_STATE_PLAY);
-                    }
-                }
-				//reset stats objects and data
-				ext.root_odm=null;
-				ext.nb_objs_at_last_scan = 0;
-				ext.stats_resources = [];
-				ext.stats_data = [];
-
-                //switch back inline nodes and remove from dictionary
-                gw_detach_child(this);
-                //force detach, we don't know when GC will be done
-                ext.movie.children[0].url[0] = '';
-                ext.movie.children[0] = this;
-                if (evt.error) return;
-
-
-                //success !
-                ext.current_url = this.url[0];
-                ext.set_speed(ext.initial_speed);
-                if (ext.initial_start >= 0) {
-                    ext.movie_control.mediaStartTime = ext.initial_start;
-                } else {
-                    ext.movie_control.mediaStartTime = 0;
-                    ext.movie_control.mediaStopTime = ext.initial_start;
-                }
-                ext.movie_control.loop = ext.initial_loop;
-                alert('mc.mST is ' + ext.movie_control.mediaStopTime);
-
-                ext.movie_control.url[0] = ext.current_url;
-                ext.movie_sensor.url[0] = ext.current_url;
-
-                ext.timeshift_depth = 0;
-                ext.time_in_tsb = 0;
-                ext.initial_loop = false;
-                ext.initial_speed = 1;
-                ext.initial_start = 0;
-
-
-                if ((ext.current_url.indexOf('gpac://') == 0) && ((ext.current_url.indexOf('://') < 0) || (ext.current_url.indexOf('file://') == 0))) {
-                    ext.local_url = true;
-                } else {
-                    ext.local_url = false;
-                }
-
-                ext.root_odm = gpac.get_object_manager(ext.current_url);
-                ext.reverse_playback_supported = ext.root_odm.reverse_playback_supported;
-
-                ext.controler.hide();
-
-				var names = ext.current_url.split('/');
-				if (names.length == 0) names = ext.current_url.split('\\');
-				gpac.caption = names.pop();
-				
-                ext.add_bookmark(ext.current_url, true);
-
-				gwskin.enable_background(false);
-                ext.declare_addons();
-
-                if (ext.initial_service_id) {
-                    var odm = gpac.get_object_manager(ext.current_url);
-                    if (odm) odm.select_service(ext.initial_service_id);
-                    ext.initial_service_id = 0;
-                }
-
-                /* Start collecting statistics on media resources */
-                ext.gather_stats_resources(ext.root_odm, ext.root_odm.selected_service);
-                ext.stats_timer = gw_new_timer(false);
-                ext.stats_timer.ext = ext;
-                ext.stats_timer.set_timeout(1, true);
-                ext.stats_timer.on_event = ext.stats_timer_on_event;
-                if (ext.show_stats_init) {
-                    ext.view_stats();
-                }
-            }
-
-            if (!ext.movie_connected) {
-                ext.movie_connected = true;
-                gpac.set_3d(evt.type3d ? 1 : 0);
-                ext.controler.play.switch_icon(ext.icon_pause);
-                ext.dynamic_scene = evt.dynamic_scene;
-                //force display size notif on controler to trigger resize of the window
-                ext.controler.on_display_size(ext.controler.width, ext.controler.height);
-            }
-
-            ext.root_odm = gpac.get_object_manager(ext.current_url);
-            ext.set_state(ext.GF_STATE_PLAY);
-
-            if (!gpac.fullscreen && evt.width && evt.height) {
-                var w, h, r_w, r_h;
-                w = evt.width;
-                h = evt.height;
-
-				gpac.set_size(w, h, true);
-
-                if (w > gpac.screen_width) w = gpac.screen_width;
-                if (h > gpac.screen_height) h = gpac.screen_height;
-
-				var min_width = this.extension.def_width;
-				var min_height = this.extension.def_height;
-                r_w = r_h = 1;
-                if (w < min_width) r_w = Math.ceil(min_width / w);
-                if (h < min_height) r_h = Math.ceil(min_height / h);
-                if (r_w < r_h) r_w = r_h;
-                w = r_w * w;
-                h = r_w * h;
-                gpac.set_size(w, h);
-            } else {
-                gpac.set_size(evt.width, evt.height, true);
-            }
-            ext.streamlist_changed();
-
-            if (evt.width) {
-                var e = {};
-                e.type = GF_EVENT_SCENE_SIZE;
-                e.width = evt.width;
-                e.height = evt.height;
-                gwlib_filter_event(e);
-            }
-        }
-        this.movie.children[0].on_addon_found = function (evt) {
-            var e = {};
-            e.type = GF_EVENT_ADDON_DETECTED;
-            e.addon_url = evt.url;
-            e.scene_url = this.url[0];
-            e.discarded = false;
-            gwlib_filter_event(e);
-        }
-
-        this.movie.children[0].on_streamlist_changed = function (evt) {
-            this.extension.streamlist_changed();
-        }
-        this.movie.children[0].on_scene_size_modify = function (evt) {
-            var e = {};
-            e.type = GF_EVENT_SCENE_SIZE;
-            e.width = evt.width;
-            e.height = evt.height;
-            gwlib_filter_event(e);
-        }
-
-        this.movie.children[0].addEventListener('gpac_scene_attached', this.movie.children[0].on_scene_size, 0);
-        this.movie.children[0].addEventListener('gpac_addon_found', this.movie.children[0].on_addon_found, 0);
-        this.movie.children[0].addEventListener('gpac_streamlist_changed', this.movie.children[0].on_streamlist_changed, 0);
-        this.movie.children[0].addEventListener('gpac_scene_size', this.movie.children[0].on_scene_size_modify, 0);
-
-
-        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;
-                if (percent_dload >= 100) percent_dload = 0;
-                this.extension.controler.media_line.set_progress(percent_dload);
-            }
-        }
-
-        this.movie.children[0].on_media_playing = function (evt) {
-            this.extension.show_buffer(-1);
-
-            if (!this.extension.initial_play_done) {
-                this.extension.initial_play_done = true;
-
-                this.extension.controler.play.switch_icon(this.extension.icon_pause);
-
-                if (!this.extension.root_odm) {
-                    this.extension.root_odm = gpac.get_object_manager(this.extension.current_url);
-                }
-                if (this.extension.root_odm) {
-                    this.extension.declare_addons();
-                }
-            }
-
-            if (this.extension.root_odm) {
-                this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
-            }
-        }
-
-        this.movie.children[0].on_media_end = function (evt) {
-            if (this.extension.duration>1) {
-                if (this.extension.movie_control.loop) {
-                    this.extension.movie_control.mediaStartTime = 0;
-                    this.extension.current_time = 0;
-                } else if (this.extension.playlist_mode && (this.extension.playlist_idx + 1 < this.extension.playlist.length)) {
-                    this.extension.playlist_next();
-                } else {
-                    this.extension.set_state(this.extension.GF_STATE_STOP);
-                }
-            }
-        }
-
-        this.movie.children[0].on_media_waiting = function (evt) {
-            //            alert('URL is now buffering');
-        }
-        this.movie.children[0].on_tsb_change = function (evt) {
-            if (this.extension.root_odm) {
-                this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
-
-                var main_addon_url = this.extension.root_odm.main_addon_url;
-                if (main_addon_url != null) gwskin.pvr_url = main_addon_url;
-
-            }
-        }
-        this.movie.children[0].on_main_addon = function (evt) {
-            this.extension.reload_stats();
-            this.extension.controler.layout();
-        }
-
-
-        this.movie.children[0].addEventListener('progress', this.movie.children[0].on_media_progress, 0);
-        this.movie.children[0].addEventListener('playing', this.movie.children[0].on_media_playing, 0);
-        this.movie.children[0].addEventListener('canplay', this.movie.children[0].on_media_playing, 0);
-        this.movie.children[0].addEventListener('waiting', this.movie.children[0].on_media_waiting, 0);
-        this.movie.children[0].addEventListener('ended', this.movie.children[0].on_media_end, 0);
-        this.movie.children[0].addEventListener('gpac_timeshift_depth_changed', this.movie.children[0].on_tsb_change, 0);
-        this.movie.children[0].addEventListener('gpac_main_addon_state', this.movie.children[0].on_main_addon, 0);
-
-
-        this.on_movie_duration = function (value) {
-            if (value < 0) value = 0;
-            this.current_duration = value;
-            this.set_duration(value);
-            if (this.UPnP_Enabled) UPnP.MovieDuration = value;
-        }
-
-        this.on_movie_active = function (value) {
-            if (!value) {
-                this.movie_control.mediaStartTime = -1;
-            }
-        }
-
-        this.on_movie_time = function (value) {
-            var diff = this.current_time - value;
-            if (diff < 0) diff = -diff;
-            /*filter out every 1/2 seconds*/
-            if (diff < 0.5) return;
-            this.current_time = value;
-            this.set_time(value);
-            if (this.UPnP_Enabled) UPnP.MovieTime = value;
-        }
-
-        Browser.addRoute(this.movie_sensor, 'mediaDuration', this, this.on_movie_duration);
-        Browser.addRoute(this.movie_sensor, 'mediaCurrentTime', this, this.on_movie_time);
-        Browser.addRoute(this.movie_sensor, 'isActive', this, this.on_movie_active);
-
-        var hist = this.get_option('PlaybackHistory');
-        if ((hist != null) && (hist != '')) {
-            this.history = gwskin.parse(hist);
-        }
-
-        var bmarks = this.get_option('Bookmarks');
-        if ((bmarks != null) && (bmarks != '')) {
-            this.bookmarks = gwskin.parse(bmarks);
-        }
-		
-        /*create player control UI*/
-        var wnd = gw_new_window(null, true, true);
-        //remember it !
-        this.controler = wnd;
-        wnd.extension = this;
-
-        wnd.set_corners(true, true, false, false);
-        wnd.set_alpha(0.9);
-
-		/*create default interactive zone in case the content grabs all mouse events*/
-		this.safe_interact = gw_new_rectangle('button', 'invisible');
-		gw_add_child(null, this.safe_interact);
-		this.safe_interact.show();
-		
-		
-        /*first set of controls*/
-        wnd.infobar = gw_new_grid_container(wnd);
-        wnd.infobar.spread_h = true;
-
-        /*add our controls in order*/
-
-        wnd.media_line = gw_new_progress_bar(wnd.infobar, false, true);
-        wnd.media_line.extension = this;
-        wnd.media_line.on_slide = function (value, type) {
-            if (!this.extension.movie_connected && !this.extension.controlled_renderer) {
-                this.set_value(0);
-                return;
-            }
-
-            var duration = this.extension.duration;
-            var time;
-            if (duration) {
-                time = value * duration / 100;
-            } else if (this.extension.timeshift_depth) {
-                time = (100 - value) * this.extension.timeshift_depth / 100;
-
-                if (this.extension.controlled_renderer) {
-                    return;
-                }
-                if (type != 2) return;
-
-                this.extension.movie_control.mediaStopTime = -time;
-                this.extension.controler.layout();
-                return;
-            }
-
-            if (this.extension.controlled_renderer) {
-                this.extension.controlled_renderer.Seek(time);
-                return;
-            }
-            switch (type) {
-                //start sliding                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-                case 1:
-                    this.extension.set_state(this.extension.GF_STATE_PAUSE);
-                    this.extension.set_speed(0);
-                    break;
-                //done sliding                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-                case 2:
-                    this.extension.set_state(this.extension.GF_STATE_PLAY);
-                    this.extension.movie_control.mediaStartTime = time;
-                    this.extension.set_speed(1);
-                    break;
-                //init slide, go in play mode                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
-                default:
-                    if (this.extension.state == this.extension.GF_STATE_STOP)
-                        this.extension.set_state(this.extension.GF_STATE_PLAY);
-
-                    this.extension.set_state(this.extension.GF_STATE_PAUSE);
-                    break;
-            }
-        }
-
-        wnd.time = gw_new_text(wnd.infobar, '00:00:00');
-        gw_object_set_hitable(wnd.time);
-        wnd.time.extension = this;
-        wnd.time.reversed = false;
-        wnd.time.on_down = function (val) {
-            if (!val) return;
-
-            if (this.extension.timeshift_depth) {
-                return;
-                //                if (this.extension.movie_control.mediaStopTime < 0)
-                //                    this.extension.movie_control.mediaStopTime = 0;
-            } else {
-                this.reversed = !this.reversed;
-                this.extension.set_time(this.extension.current_time);
-            }
-        }
-
-        wnd.back_live = gw_new_icon(wnd.infobar, 'live');
-        wnd.back_live.extension = this;
-        wnd.back_live.on_click = function () {
-            if (this.extension.movie_control.mediaStopTime < 0) {
-                this.extension.set_time(0);
-                this.extension.movie_control.mediaStopTime = 0;
-                this.extension.set_state(this.extension.GF_STATE_PLAY);
-                //this.extension.controler.layout();
-            }
-        }
-
-        gw_new_separator(wnd.infobar);
-
-
-        wnd.stop = gw_new_icon(wnd.infobar, 'stop');
-        wnd.stop.extension = this;
-        wnd.stop.on_click = function () {
-            this.extension.set_state(this.extension.GF_STATE_STOP);
-        }
-
-        wnd.rewind = gw_new_icon(wnd.infobar, 'rewind');
-        wnd.rewind.extension = this;
-        wnd.rewind.on_click = function () {
-            if (!this.extension.movie_control.mediaSpeed) {
-                this.extension.set_state(this.extension.GF_STATE_PLAY);
-            }
-            this.extension.set_state(this.extension.GF_STATE_TRICK);
-            if (this.extension.movie_control.mediaSpeed > 0) {
-                this.extension.set_speed(-1.0);
-                this.extension.controler.layout();
-            } else {
-                this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
-            }
-        }
-
-        wnd.play = gw_new_icon(wnd.infobar, 'play');
-        wnd.play.extension = this;
-        this.state = this.GF_STATE_PLAY;
-        wnd.play.add_icon(gwskin.images.pause);
-        wnd.play.on_click = function () {
-            this.extension.set_state((this.extension.state == this.extension.GF_STATE_PLAY) ? this.extension.GF_STATE_PAUSE : this.extension.GF_STATE_PLAY);
-        }
-
-
-        wnd.forward = gw_new_icon_button(wnd.infobar, 'seek_forward', '', true, 'icon_label');
-        wnd.forward.extension = this;
-        wnd.forward.on_click = function () {
-            if (!this.extension.movie_control.mediaSpeed) {
-                this.extension.set_state(this.extension.GF_STATE_PLAY);
-            }
-            this.extension.set_state(this.extension.GF_STATE_TRICK);
-            if (this.extension.movie_control.mediaSpeed < 0) {
-                this.extension.set_speed(1.0);
-            } else {
-                this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
-            }
-        }
-        wnd.forward.on_long_click = function () {
-            if (this.extension.movie_control.mediaSpeed > 0) {
-                this.extension.set_state(this.extension.GF_STATE_TRICK);
-                this.extension.set_speed(this.extension.movie_control.mediaSpeed / 2);
-            }
-        }
-
-        wnd.loop = gw_new_icon(wnd.infobar, 'play_once');
-        wnd.loop.extension = this;
-        wnd.loop.add_icon(gwskin.images.play_loop);
-        //            wnd.loop.add_icon(gwskin.images.play_shuffle);
-        wnd.loop.on_click = function () {
-            this.extension.movie_control.loop = this.extension.movie_control.loop ? FALSE : TRUE;
-            this.switch_icon(this.extension.movie_control.loop ? 1 : 0);
-        }
-
-        wnd.media_list = gw_new_icon(wnd.infobar, 'media');
-        wnd.media_list.extension = this;
-        wnd.media_list.hide();
-
-        wnd.channels = gw_new_icon(wnd.infobar, 'channels');
-        wnd.channels.extension = this;
-        wnd.channels.hide();
-
-
-        wnd.navigate = gw_new_icon(wnd.infobar, 'navigation');
-        wnd.navigate.add_icon('sensors');
-        wnd.navigate.extension = this;
-        wnd.navigate.on_click = function () {
-            this.extension.select_navigation_type();
-        }
-
-        wnd.stats = gw_new_icon(wnd.infobar, 'statistics');
-        wnd.stats.extension = this;
-        wnd.stats.on_click = function () {
-            this.extension.view_stats();
-        }
-
-        gw_new_separator(wnd.infobar);
-
-        wnd.snd_low = gw_new_icon(wnd.infobar, 'audio');
-        wnd.snd_low.extension = this;
-        wnd.snd_ctrl = gw_new_slider(wnd.infobar);
-        wnd.snd_ctrl.extension = this;
-        wnd.snd_ctrl.stick_to_previous = true;
-        wnd.snd_low.add_icon('audio_mute');
-        wnd.snd_low.on_click = function () {
-            if (this.extension.muted) {
-                gpac.volume = this.extension.muted;
-                this.extension.muted = 0;
-                this.switch_icon(0);
-            } else {
-                this.extension.muted = gpac.volume ? gpac.volume : 1;
-                gpac.volume = 0;
-                this.switch_icon(1);
-            }
-        }
-        wnd.snd_ctrl.on_slide = function (value, type) {
-            if (this.extension.muted) this.extension.controler.snd_low.on_click();
-            gpac.volume = value;
-        }
-        wnd.snd_ctrl.set_value(gpac.volume);
-
-        wnd.open = null;
-        if (!gwskin.browser_mode) {
-            wnd.open = gw_new_icon(wnd.infobar, 'file_open');
-            wnd.open.extension = this;
-            wnd.open.on_click = function () {
-                this.extension.open_local_file();
-            }
-        }
-
-        wnd.playlist = gw_new_icon(wnd.infobar, 'playlist');
-        wnd.playlist.extension = this;
-        wnd.playlist.on_click = function () {
-            this.extension.view_playlist();
-        }
-
-        wnd.playlist_prev = gw_new_icon(wnd.infobar, 'playlist_prev');
-        wnd.playlist_prev.extension = this;
-        wnd.playlist_prev.on_click = function () {
-            this.extension.playlist_prev();
-        }
-
-        wnd.playlist_next = gw_new_icon(wnd.infobar, 'playlist_next');
-        wnd.playlist_next.extension = this;
-        wnd.playlist_next.on_click = function () {
-            this.extension.playlist_next();
-        }
-
-
-        wnd.home = null;
-        if (!gwskin.browser_mode) {
-            wnd.home = gw_new_icon(wnd.infobar, 'osmo');
-            wnd.home.extension = this;
-            wnd.home.on_click = function () {
-                this.extension.controler.hide();
-                if (this.extension._evt_filter != null) {
-                    gwlib_remove_event_filter(this.extension._evt_filter);
-                    this.extension._evt_filter = null;
-                }
-				gwskin.enable_background(true);
-				gw_show_dock();
-				this.extension.disabled = true;
-            }
-        }
-
-
-        if (this.UPnP_Enabled) {
-            wnd.remote = gw_new_icon(wnd.infobar, 'remote_display');
-            wnd.remote.on_click = function () { select_remote_display('push'); }
-        } else {
-            wnd.remote = null;
-        }
-
-        if (gwskin.mobile_device) {
-            wnd.fullscreen = null;
-            wnd.exit = null;
-        } else {
-            wnd.fullscreen = gw_new_icon(wnd.infobar, 'fullscreen');
-            wnd.fullscreen.add_icon(gwskin.images.fullscreen_back);
-            wnd.fullscreen.on_click = function () {
-                gpac.fullscreen = !gpac.fullscreen;
-            }
-            wnd.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
-
-            if (!gwskin.browser_mode) {
-                wnd.exit = gw_new_icon(wnd.infobar, 'exit');
-                wnd.exit.on_click = function () { gpac.exit(); }
-            } else {
-                wnd.exit = null;
-            }
-        }
-
-
-        wnd.on_size = function (width, height) {
-            var control_icon_size = gwskin.default_icon_height;
-            var children = this.infobar.get_children();
-            for (i = 0; i < children.length; i++) {
-                children[i].set_size(control_icon_size, control_icon_size);
-            }
-            if (this.time) this.time.set_size(4 * wnd.time.font_size(), control_icon_size);
-            if (this.snd_ctrl) {
-                this.snd_ctrl.set_size(2 * control_icon_size, control_icon_size / 2, control_icon_size / 3, control_icon_size / 2);
-                this.snd_ctrl.set_value(gpac.volume);
-            }
-
-            var speed = this.extension.movie_control.mediaSpeed;
-            if (speed < 0) speed = -speed;
-            if (speed && (speed != 1)) {
-                if ((speed > 100) || (speed < 1))
-                    this.forward.set_size(3 * control_icon_size, control_icon_size);
-                else
-                    this.forward.set_size(2 * control_icon_size, control_icon_size);
-            } else {
-                this.forward.set_size(control_icon_size, control_icon_size);
-            }
-        }
-
-        wnd.layout = function (width, height) {
-            var min_w, full_w, time_w;
-            var control_icon_size = gwskin.default_icon_height;
-            var is_over = true;
-            var show_navigate = false;
-
-            if (arguments.length == 0) {
-                width = this.width;
-                height = this.height;
-            }
-            this.move(0, Math.floor((height - gw_display_height) / 2));
-
-            this.on_size(width, height);
-
-            if (this.fullscreen)
-                this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
-
-            width -= control_icon_size / 2;
-            min_w = control_icon_size;
-            if (this.time.visible) min_w += this.time.width;
-            if (this.open) min_w += control_icon_size;
-            if (this.home) min_w += control_icon_size;
-            if (this.exit && gpac.fullscreen) min_w += control_icon_size;
-            full_w = 0;
-            if (this.snd_low) full_w += control_icon_size;
-            if (this.snd_ctrl) full_w += this.snd_ctrl.width;
-            if (this.fullscreen) full_w += control_icon_size;
-
-
-            if (this.navigate) {
-                this.navigate.hide();
-
-				if (this.extension.root_odm && this.extension.root_odm.vr_scene) {
-                    show_navigate = true;
-                    full_w += control_icon_size;
-				
-					wnd.navigate.on_click = function () {
-//						var sensors_active = gpac.sensors_active;
-//						gpac.sensors_active = !sensors_active;
-//						this.switch_icon(sensors_active ? 1 : 0);
-                        this.extension.select_navigation_vr();
-					}
-				} else if ( (this.extension.dynamic_scene != 1) && this.extension.movie_connected && (gpac.navigation_type != GF_NAVIGATE_TYPE_NONE)) {
-                    show_navigate = true;
-                    full_w += control_icon_size;
-
-					wnd.navigate.on_click = function () {
-						this.extension.select_navigation_type();
-					}
-                }
- 
-            }
-
-            if (this.extension.movie_connected) {
-                if (this.extension.state == this.extension.GF_STATE_STOP) {
-                    this.stats.hide();
-                } else {
-                    full_w += control_icon_size;
-                    this.stats.show();
-                }
-                if (this.extension.duration || this.extension.timeshift_depth) {
-                    full_w += control_icon_size;
-                    this.stop.show();
-                    full_w += control_icon_size;
-                    this.play.show();
-                } else {
-                    full_w += control_icon_size;
-                    //this.play.show();
-                    if (this.extension.state == this.extension.GF_STATE_STOP) {
-                        this.stop.hide();
-                        this.play.show();
-                    } else {
-                        this.play.hide();
-                        this.stop.show();
-                    }
-                }
-
-                if (this.extension.root_odm && !this.extension.dynamic_scene && !this.extension.root_odm.is_over)
-                    is_over = false;
-
-            } else {
-                this.stats.hide();
-                this.stop.hide();
-                this.play.hide();
-            }
-
-            if (this.extension.duration) {
-				if (this.forward) full_w += control_icon_size;
-				if (this.extension.duration>1) {
-					if (this.extension.reverse_playback_supported && this.rewind) full_w += control_icon_size;
-					if (this.loop) full_w += control_icon_size;
-				}
-            }
-            else if (this.extension.movie_control.mediaStopTime < 0) {
-                if (this.forward) full_w += control_icon_size;
-            } else if (!is_over) {
-                if (this.forward) full_w += control_icon_size;
-            }
-
-            if ((this.extension.root_odm && this.extension.root_odm.main_addon_on) || this.extension.movie_control.mediaStopTime < 0) {
-                full_w += control_icon_size;
-                this.back_live.show();
-            } else {
-                this.back_live.hide();
-            }
-
-
-            if (this.remote && UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
-                full_w += control_icon_size;
-            }
-            time_w = this.media_line.visible ? 2 * control_icon_size : 0;
-
-            if (this.exit) {
-                if (gpac.fullscreen) {
-                    this.exit.show();
-                } else {
-                    this.exit.hide();
-                }
-            }
-
-            if (this.media_line.visible)
-                this.media_line.set_size(width - min_w - full_w, control_icon_size / 3);
-
-            if (this.snd_low) this.snd_low.show();
-            if (this.snd_ctrl) this.snd_ctrl.show();
-
-            if (this.extension.duration) {
-                if (this.forward) this.forward.show();
-				if (this.extension.duration>1) {
-					if (this.loop) this.loop.show();
-				}
-                if (this.stop) this.stop.show();
-            }
-            else if ((this.extension.movie_control.mediaStopTime < 0) || (this.extension.movie_control.mediaSpeed < 0)) {
-                if (this.extension.time_in_tsb > 2) {
-                    if (this.forward) this.forward.show();
-                } else {
-                    if (this.forward) this.forward.hide();
-                }
-            } else if (!is_over) {
-                if (this.forward) this.forward.show();
-            } else {
-                if (this.forward) this.forward.hide();
-            }
-            if (wnd.fullscreen) wnd.fullscreen.show();
-
-            if (this.remote) {
-                if (UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
-                    this.remote.show();
-                } else {
-                    this.remote.hide();
-                }
-            }
-
-            if (show_navigate) {
-                this.navigate.show();
-            }
-
-            if ((this.extension.duration>1.0) || this.extension.timeshift_depth) {
-                this.media_line.show();
-                this.time.show();
-            } else {
-                this.media_line.hide();
-                this.time.hide();
-            }
-            //this.time.set_size(width - 6*control_icon_size, control_icon_size / 3);
-            this.media_line.set_size(width - this.time.width - 2 * control_icon_size, control_icon_size / 3);
-
-            //            this.infobar.set_size(width, control_icon_size);
-            this.infobar.set_size(width, height);
-            this.infobar.move(0, -0.1 * control_icon_size);
-        }
-
-        wnd.on_display_size = function (width, height) {
-			var h;
-
-			if (!gpac.fullscreen) {
-                if (width < this.extension.def_width) {
-                    gpac.set_size(this.extension.def_width, height);
-                    return;
-                }
-            } else {
-                if (width < this.extension.def_width) {
-                    this.extension.def_width = width;
-                }
-            }
-
-            //            this.set_size(w, 1.2 * gwskin.default_icon_height);
-
-            if (this.extension.movie_connected) {
-                h = 3.3 * gwskin.default_icon_height;
-                if (!this.media_line.visible) {
-                    h -= gwskin.default_icon_height;
-                }
-            }
-            else h = 1.1 * gwskin.default_icon_height;
-
-
-            this.set_size(this.extension.def_width, h);
-
-			this.extension.safe_interact.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
-			this.extension.safe_interact.show();
-			this.extension.safe_interact.move((-gwskin.default_icon_height+width)/2, (gwskin.default_icon_height-height)/2);
-			
-            this.layout();
-        }
-
-        wnd.on_event = function (evt) {
-            if (this.infobar.on_event(evt)) return true;
-            return false;
-        }
-        //make the bar hitable so that clicking on it does not make it disappear
-        gw_object_set_hitable(wnd);
-        wnd.set_size(gw_display_width, 2.2 * gwskin.default_icon_height);
-        this.set_duration(0);
-        this.set_time(0);
-
-
-        this._evt_filter = null;
-    },
-
-    start: function () {
-        if (!this._evt_filter) {
-            this._evt_filter = this.create_event_filter(this);
-            gwlib_add_event_filter(this._evt_filter);
-        }
-
-		this.disabled = false;
-		
-        if (!this.movie) {
-            this.init_extension();
-
-            //check our args
-            var i, argc = gpac.argc;
-            var url_arg = null;
-
-            for (i = 1; i < argc; i++) {
-                var arg = gpac.get_arg(i);
-                if (!arg) break;
-
-                //that's our file
-                if (arg.charAt(0) != '-') {
-                    //do not reopen ourselves !
-                    if (arg.indexOf('gui.bt') >= 0) continue;
-
-                    url_arg
-                    if (arg.indexOf('://') < 0) url_arg = 'gpac://' + arg;
-                    else url_arg = arg;
-                }
-
-                //MP4Client options taking 2 args
-                else if ((arg == '-rti') || (arg == '-rtix') || (arg == '-c') || (arg == '-cfg') || (arg == '-size') || (arg == '-lf') || (arg == '-log-file') || (arg == '-logs')
-                    || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-mosaic') || (arg == '-avi') || (arg == '-out') || (arg == '-ntp-shift') || (arg == '-fps') || (arg == '-scale') || (arg == '-run-for')
-                ) {
-			i++;
-                } else if (arg == '-service') {
-                    this.initial_service_id = parseInt(gpac.get_arg(i + 1));
-                    i++;
-                } else if (arg == '-com') {
-                    arg = gpac.get_arg(i + 1);
-                    var idx = arg.indexOf('gpac add ');
-
-                    if (idx == 0) {
-                        this.default_addon = arg.substring(9);
-                    }
-
-                    i++;
-                } else if (arg == '-addon') {
-                    this.default_addon = gpac.get_arg(i + 1);
-                    i++;
-                } else if (arg == '-loop') {
-                    this.initial_loop = true;
-                } else if (arg == '-stats') {
-                    this.show_stats_init = true;
-                } else if (arg == '-speed') {
-                    this.initial_speed = Number(gpac.get_arg(i + 1));
-                    i++;
-                } else if (arg == '-play-from') {
-                    this.initial_start = Number(gpac.get_arg(i + 1));
-                    i++;
-                }
-            }
-
-            gwskin.media_url = '';
-            gwskin.pvr_url = '';
-            gwskin.media_time = 0;
-            gwskin.media_clock = 0;
-            gwskin.restore_session = this.create_restore_session(this);
-
-            if (url_arg != null) {
-                this.set_playlist_mode(false);
-                var def_addon = this.default_addon;
-                this.set_movie_url(url_arg);
-                gw_hide_dock();
-                this.default_addon = def_addon;
-                return;
-            }
-            this.set_playlist_mode(true);
-
-            /*
-            var label = '';
-            for (i = 1; i < argc; i++) {
-            label += '#'+i + ': ' + gpac.get_arg(i) + '\n';
-            }
-            var notif = gw_new_message(null, 'GPAC Arguments', label);
-            notif.show();
-            */
-
-        }
-
-        this.controler.show();
-        gw_hide_dock();
-
-    },
-
-    create_event_filter: function (__anobj) {
-        return function (evt) {
-            return __anobj.ext_filter_event(evt);
-        }
-    },
-
-    create_restore_session: function (__anobj) {
-        return function (url, media_time, media_clock) {
-			__anobj.movie_connected = false;
-			__anobj.disabled = false;
-            __anobj.set_movie_url(url);
-            if (media_clock) {
-                var time_in_tsb = (new Date()).getTime() - media_clock;
-                if (time_in_tsb >= 0) {
-                    __anobj.initial_start = -time_in_tsb / 1000;
-                }
-
-            } else {
-                __anobj.initial_start = media_time;
-            }
-			if (!__anobj.movie_connected) {
-				__anobj.reverse_playback_supported = false;
-				__anobj.duration = 0;
-				__anobj.root_odm = null;
-			}
-			__anobj.controler.on_display_size(gw_display_width, gw_display_height);
-        }
-    },
-
-    declare_addons: function () {
-        if (this.default_addon && (this.default_addon != '')) {
-            var addon_url = this.default_addon;
-            if (addon_url.indexOf('://') < 0) addon_url = 'gpac://' + addon_url;
-            this.root_odm.declare_addon(addon_url);
-        }
-    },
-
-    set_time: function (value) {
-        var h, m, s, str;
-        str = '';
-        if (this.timeshift_depth) {
-            var pos = 100;
-            this.time_in_tsb = 0;
-
-            if ((this.movie_control.mediaStopTime < 0) || (this.movie_control.mediaSpeed <= 0)) {
-                this.time_in_tsb = this.root_odm.timeshift_time;
-                if (this.timeshift_depth > this.time_in_tsb) {
-                    pos = 100 * (this.timeshift_depth - this.time_in_tsb) / this.timeshift_depth;
-                } else if (this.time_in_tsb) {
-                    pos = 0;
-                }
-            }
-            this.controler.media_line.set_value(pos);
-
-            //we need to figure out if the main addon is on-demand content, in which case we have to store media time for session restore
-            var addon_media_time = this.root_odm.main_addon_media_time;
-            if (addon_media_time >= 0) {
-                gwskin.media_clock = 0;
-                gwskin.media_time = addon_media_time;
-            }
-            //if not, we will restore the session based on wallclock 
-            else {
-                gwskin.media_clock = (new Date()).getTime() - this.time_in_tsb * 1000;
-            }
-
-            if (!this.time_in_tsb) {
-                this.controler.time.set_label('');
-                this.controler.time.hide();
-                this.controler.layout();
-                return;
-            }
-
-            if (!this.controler.time.visible) {
-                this.controler.time.show();
-                this.controler.layout();
-            }
-            if (!this.controler.forward.visible) {
-                this.controler.forward.show();
-                this.controler.layout();
-            }
-            str = '-';
-            value = this.time_in_tsb;
-
-        } else {
-            if (!this.duration) {
-                if (this.controler.time.visible) {
-                    this.controler.time.hide();
-                    this.controler.layout();
-                }
-                return;
-            }
-
-            this.current_time = value;
-            gwskin.media_time = value;
-
-            if (this.duration) {
-                this.controler.media_line.set_value(100 * value / this.duration);
-            }
-            if (this.controler.time.reversed) {
-                value = this.duration - value;
-                str = '-';
-            }
-        }
-
-        h = Math.floor(value / 3600);
-        value -= h * 3600;
-        m = Math.floor(value / 60);
-        value -= m * 60;
-        s = Math.floor(value);
-        if (h) {
-            if (h < 10) str += '0';
-            str += h + ':';
-        }
-        if (m < 10) str += '0';
-        str += m + ':';
-        if (s < 10) str += '0';
-        str += s;
-        this.controler.time.set_label(str);
-    },
-
-    set_duration: function (value) {
-        this.duration = value;
-        var dlg = this.controler;
-        if (!value) {
-            if (this.timeshift_depth > 0) {
-                return;
-            }
-            dlg.time.hide();
-            dlg.media_line.hide();
-            dlg.rewind.hide();
-            dlg.play.hide();
-            dlg.forward.hide();
-            dlg.loop.hide();
-            dlg.time.set_size(0, gwskin.default_icon_height);
-            dlg.time.set_width(0);
-        } else {
-			if (value>1) {
-				dlg.time.show();
-				dlg.media_line.show();
-				if (this.reverse_playback_supported) dlg.rewind.show();
-				dlg.loop.show();
-				if (value < 3600) {
-					dlg.time.set_size(gwskin.default_icon_height / 2, gwskin.default_icon_height);
-					dlg.time.set_width(3 * dlg.time.font_size());
-				} else {
-					dlg.time.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
-					dlg.time.set_width(4 * dlg.time.font_size());
-				}
-			} else {
-				dlg.time.hide();
-				dlg.media_line.hide();
-				dlg.rewind.hide();
-				dlg.loop.hide();
-			}
-			dlg.stop.show();
-            dlg.forward.show();
-        }
-        dlg.on_display_size(gw_display_width, gw_display_height);
-    },
-    set_timeshift_depth: function (value) {
-        if (this.timeshift_depth == value) return;
-
-        this.timeshift_depth = value;
-        var dlg = this.controler;
-
-        this.reverse_playback_supported = this.root_odm.reverse_playback_supported;
-
-        if (!value) {
-            dlg.time.hide();
-            dlg.media_line.hide();
-            if (dlg.rewind) dlg.rewind.hide();
-            if (dlg.forward) dlg.forward.hide();
-            dlg.time.set_size(0, gwskin.default_icon_height);
-            dlg.time.set_width(0);
-        } else {
-            dlg.time.show();
-            dlg.media_line.show();
-
-            var w = 3 * dlg.time.font_size();
-            if (value > 3600) w += dlg.time.font_size();
-
-            dlg.time.set_size(w, gwskin.default_icon_height);
-            dlg.time.set_width(w);
-        }
-        dlg.on_display_size(gw_display_width, gw_display_height);
-    },
-
-    set_state: function (state) {
-        if (!this.movie_connected && !this.controlled_renderer) return;
-
-        if (state == this.state) return;
-
-        if (state == this.GF_STATE_STOP) {
-            if (this.stats_wnd) this.stats_wnd.close_all();
-            this.stoped_url = '' + this.current_url;
-            if (this.controlled_renderer) this.controlled_renderer.Stop();
-            else {
-                this.set_movie_url('');
-                /*override movie_connected to avoid auto-resizing*/
-                this.movie_connected = true;
-            }
-            this.movie_control.mediaStartTime = 0;
-            this.controler.media_line.set_value(0);
-            this.controler.play.switch_icon(this.icon_play);
-            this.state = this.GF_STATE_STOP;
-            this.set_speed(1);
-            this.root_odm = null;
-            this.stats_resources = [];
-            this.nb_objs_at_last_scan = 0;
-
-			var e = {};
-			e.type = GF_JS_EVENT_PLAYBACK;
-			e.is_playing = false;
-			e.index = this.playlist_idx;
-			gwlib_filter_event(e);
-			return;
-        }
-        if (state == this.GF_STATE_PAUSE) {
-            if (this.state == this.GF_STATE_STOP) return;
-            if (this.controlled_renderer) this.controlled_renderer.Pause();
-            this.state = this.GF_STATE_PAUSE;
-            this.controler.play.switch_icon(this.icon_play);
-            this.set_speed(0);
-
-			var e = {};
-			e.type = GF_JS_EVENT_PLAYBACK;
-			e.is_playing = false;
-			e.index = this.playlist_idx;
-			gwlib_filter_event(e);
-			return;
-        }
-        //we are playing, resume from stop if needed
-        if (this.stoped_url) {
-            if (this.controlled_renderer) {
-                this.controlled_renderer.Play();
-            } else {
-                this.set_movie_url(this.stoped_url, true);
-            }
-            this.stoped_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;
-        }
-
-
-        if (state == this.GF_STATE_PLAY) {
-            if (this.controlled_renderer) this.controlled_renderer.Play();
-            this.state = state;
-            this.controler.play.switch_icon(this.icon_pause);
-            if (this.movie_control.mediaSpeed != 1)
-                this.movie_control.mediaStartTime = -1;
-
-            if (this.timeshift_depth && (this.movie_control.mediaSpeed < 0)) {
-                this.movie_control.mediaStopTime = -this.root_odm.timeshift_time;
-            }
-
-            this.set_speed(1);
-			var e = {};
-			e.type = GF_JS_EVENT_PLAYBACK;
-			e.is_playing = true;
-			e.index = this.playlist_idx;
-			gwlib_filter_event(e);
-            return;
-        }
-        if (state == this.GF_STATE_TRICK) {
-            this.state = state;
-            this.controler.play.switch_icon(this.icon_play);
-            this.movie_control.mediaStartTime = -1;
-            return;
-        }
-    },
-
-
-    set_speed: function (value) {
-        this.movie_control.mediaSpeed = value;
-
-        if (!this.duration && this.timeshift_depth && !value) {
-            this.movie_control.mediaStopTime = -0.1;
-            //
-            this.movie_control.mediaStartTime = -1;
-        }
-        if (value && value != 1) {
-            if (value > 1)
-                this.controler.forward.set_label('x' + value);
-            else
-                this.controler.forward.set_label('x' + Math.round(100 * value) / 100);
-        } else {
-            this.controler.forward.set_label('');
-        }
-        this.controler.layout();
-    },
-
-    set_movie_url: function (url) {
-        this.initial_play_done = false;
-
-        gwskin.media_url = url;
-        gwskin.pvr_url = '';
-
-        if ((url == '') || (url == this.current_url)) {
-            this.movie.children[0].url[0] = url;
-            this.movie_control.url[0] = url;
-            this.movie_sensor.url[0] = url;
-            if (this.UPnP_Enabled) UPnP.MovieURL = url;
-            this.movie_connected = (url == '') ? false : true;
-            gpac.caption = url;
-			this.controler.layout();
-
-        } else if (this.controlled_renderer == null) {
-            //resume from stop  
-            if ((arguments.length == 2) && (arguments[1] == true)) {
-                this.current_url = url;
-                this.set_speed(1);
-                this.movie_control.mediaStartTime = 0;
-                this.movie_control.url[0] = url;
-                this.movie_sensor.url[0] = url;
-                this.movie.children[0].url[0] = url;
-                return;
-            }
-
-            this.default_addon = null;
-            this.root_odm = 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*/
-            var movie_inline = this.movie.children[0];
-            var temp_inline = new SFNode('Inline');
-            if (typeof movie_inline.url[0] != 'undefined')
-                temp_inline.url[0] = movie_inline.url[0];
-
-            this.movie.children[0] = temp_inline;
-
-            movie_inline.callback_done = false;
-            this.movie_connected = false;
-
-            /*handle navigation between local files*/
-            if ((this.current_url && this.current_url.indexOf('gpac://') >= 0) && (url.indexOf('://') < 0)) {
-                movie_inline.url[0] = "gpac://" + url;
-            } else {
-                movie_inline.url[0] = url;
-            }
-
-            if (!movie_inline.callback_done) {
-                gw_add_child(this.dictionary, movie_inline);
-            }
-
-            return;
-
-        } else {
-            var uri = UPnP.ShareResource(url);
-            this.controlled_renderer.Open(uri);
-        }
-        this.current_url = url;
-
-		if (this.disabled) return;
-        if (url == '') this.controler.show();
-        else this.controler.hide();
-
-    },
-
-
-    show_buffer: function (level) {
-        if (level < 0) return;
-        if (level >= 98) {
-            if (this.buffer_wnd) {
-                this.buffer_wnd.close();
-                this.buffer_wnd = null;
-            }
-            return;
-        }
-
-        if (!this.buffer_wnd) {
-            this.buffer_wnd = gw_new_window(null, true, true);
-            this.buffer_wnd.show_effect = 'notif';
-            this.buffer_wnd.txt = gw_new_text(this.buffer_wnd, '');
-            this.buffer_wnd.on_display_size = function (w, h) {
-                this.set_size(20 * gwskin.default_text_font_size, 2 * gwskin.default_text_font_size);
-                this.txt.set_width(20 * gwskin.default_text_font_size);
-                this.move(0, h / 2 - gwskin.default_text_font_size);
-            }
-            this.buffer_wnd.on_display_size(gw_display_width, gw_display_height);
-            this.buffer_wnd.set_alpha(0.9);
-            this.buffer_wnd.show();
-
-            this.buffer_wnd.timer = gw_new_timer(false);
-            this.buffer_wnd.timer.wnd = this.buffer_wnd;
-            this.buffer_wnd.timer.set_timeout(gwskin.default_message_timeout, false);
-            this.buffer_wnd.timer.start(0);
-            this.buffer_wnd.ext = this;
-            this.buffer_wnd.timer.on_active = function (val) {
-                if (!val) {
-                    this.wnd.ext.buffer_wnd = null;
-                    this.wnd.close();
-                }
-            }
-        }
-        this.buffer_wnd.timer.stop(gwskin.default_message_timeout);
-        this.buffer_wnd.txt.set_label('Buffering ' + level + ' %');
-    },
-
-    select_navigation_vr: function () {
-        var sensors_active = gpac.sensors_active;
-        var extension = this;
-//                      gpac.sensors_active = !sensors_active;
-//                      this.switch_icon(sensors_active ? 1 : 0);
-  
-        var nb_items = 0;
-        if (this.navigation_wnd) {
-            this.navigation_wnd.close();
-            return;
-        }
-        var wnd = gw_new_popup(this.controler.navigate, 'up');
-        this.navigation_wnd = wnd;
-        wnd.extension = this;
-
-        wnd.on_close = function () {
-            this.extension.navigation_wnd = null;
-        }
-        wnd.add_menu_item(sensors_active ? "Keyboard+mouse" : "Sensors", function () { gpac.sensors_active = !sensors_active; } );
-
-        if (this.view_stereo==extension.GF_VIEW_MONO) {
-            wnd.add_menu_item("Stereo", function () {
-                extension.view_stereo = extension.GF_VIEW_STEREO; 
-                gpac.set_option("Compositor", "FramePacking", "None"); 
-                gpac.set_option("Compositor", "StereoType", "StereoHeadset"); 
-              }
-             );
-        } else if (this.view_stereo==extension.GF_VIEW_STEREO) {
-            wnd.add_menu_item("Stereo Side", function () {
-               extension.view_stereo = extension.GF_VIEW_STEREO_SIDE;
-               gpac.set_option("Compositor", "Framepacking", "Side");
-               gpac.set_option("Compositor", "StereoType", "StereoHeadset");
-              }
-             );
-        } else if (this.view_stereo==extension.GF_VIEW_STEREO_SIDE) {
-            wnd.add_menu_item("Stereo Top", function () {
-                 extension.view_stereo = extension.GF_VIEW_STEREO_TOP;
-                 gpac.set_option("Compositor", "FramePacking", "Top");  
-                 gpac.set_option("Compositor", "StereoType", "StereoHeadset");  
-                }
-            );
-        } else {
-            wnd.add_menu_item("Mono", function () {
-                extension.view_stereo = extension.GF_VIEW_MONO;
-                gpac.set_option("Compositor", "FramePacking", "None");  
-                gpac.set_option("Compositor", "StereoType", "None");  
-            }
-            );
-        }
-        
-        wnd.on_display_size(gw_display_width, gw_display_height);
-        wnd.show();
-
-    },
-
-    select_navigation_type: function () {
-        var nb_items = 0;
-        var type = gpac.navigation;
-        if (this.navigation_wnd) {
-            this.navigation_wnd.close();
-            return;
-        }
-        var wnd = gw_new_popup(this.controler.navigate, 'up');
-        this.navigation_wnd = wnd;
-        wnd.extension = this;
-
-        wnd.on_close = function () {
-            this.extension.navigation_wnd = null;
-        }
-
-        wnd.select = function (type) {
-            this.extension.navigation_wnd = null;
-            if (type == 'reset') {
-                gpac.navigation_type = 0;
-            } else {
-                gpac.navigation = type;
-            }
-        }
-        wnd.make_select_item = function (text, type, current_type) {
-            if (current_type == type) text = '* ' + text;
-            if (gpac.navigation_supported(type)) {
-                wnd.add_menu_item(text, function () { this.select(type); });
-            }
-        }
-        wnd.add_menu_item('Reset', function () { this.select('reset'); });
-
-        wnd.make_select_item('None', GF_NAVIGATE_NONE, type);
-        wnd.make_select_item('Slide', GF_NAVIGATE_SLIDE, type);
-        wnd.make_select_item('Examine', GF_NAVIGATE_EXAMINE, type);
-
-        if (gpac.navigation_type == GF_NAVIGATE_TYPE_3D) {
-            wnd.make_select_item('Walk', GF_NAVIGATE_WALK, type);
-            wnd.make_select_item('Fly', GF_NAVIGATE_FLY, type);
-            wnd.make_select_item('Pan', GF_NAVIGATE_PAN, type);
-            wnd.make_select_item('Game', GF_NAVIGATE_GAME, type);
-            wnd.make_select_item('Orbit', GF_NAVIGATE_ORBIT, type);
-            wnd.make_select_item('VR', GF_NAVIGATE_VR, type);
-        }
-        wnd.on_display_size(gw_display_width, gw_display_height);
-        wnd.show();
-    },
-
-    streamlist_changed: function () {
-        this.services = [];
-
-        var root_odm = this.root_odm;
-
-        if (root_odm) {
-            for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
-                var m = root_odm.get_resource(res_i);
-                if (!m || !m.service_id) continue;
-                var res = null;
-                for (var k = 0; k < this.services.length; k++) {
-                    if (this.services[k].service_id == m.service_id) {
-                        res = this.services[k];
-                        break;
-                    }
-                }
-                if (res == null) {
-                    this.services.push(m);
-                }
-            }
-        }
-
-        if (this.services.length <= 1) {
-            this.controler.channels.hide();
-            this.controler.channels.on_click = function () { }
-            this.controler.layout();
-		} else {
-			if (!this.controler.channels.visible) {
-				this.controler.channels.show();
-				this.controler.layout();
-			}
-
-			this.controler.channels.on_click = function () {
-
-				if (this.extension.channels_wnd) {
-					this.extension.channels_wnd.close();
-					return;
-				}
-				var wnd = gw_new_popup(this.extension.controler.channels, 'up');
-				this.extension.channels_wnd = wnd;
-				wnd.extension = this.extension;
-
-				wnd.on_close = function () {
-					this.extension.channels_wnd = null;
-				}
-
-				wnd.make_item = function (text, i) {
-					wnd.add_menu_item(text, function () {
-        			    this.extension.stats_resources = [];
-        			    this.extension.nb_objs_at_last_scan = 0;
-						this.extension.root_odm.select_service(this.extension.services[i].service_id);
-					});
-				}
-				for (var i = 0; i < this.extension.services.length; i++) {
-					var text = '';
-					var n = this.extension.services[i].service_name;
-					if (this.extension.root_odm.selected_service == this.extension.services[i].service_id) text += '* ';
-					if (n == null) n = 'Service ' + this.extension.services[i].service_id;
-					text += n;
-					wnd.make_item(text, i);
-				}
-				wnd.on_display_size(gw_display_width, gw_display_height);
-				wnd.show();
-			}
-		}
-		this.update_media_list();
-    },
-	
-	update_media_list: function() {
-		var root_odm = this.root_odm;
-		var nb_video = 0, nb_audio = 0, nb_subs = 0;
-		if (root_odm && this.dynamic_scene) {
-			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
-				var m = root_odm.get_resource(res_i);
-				if (!m) continue;
-				if (root_odm.selected_service != m.service_id) continue;
-				if (m.get_srd() != null) continue;
-				
-				if (m.type == 'Video') nb_video++;
-				else if (m.type == 'Audio') nb_audio++;
-				else if (m.type == 'Text') nb_subs++;
-			}
-		}
-		if ((nb_video > 1) || (nb_audio > 1) || (nb_subs > 1)) {
-			this.controler.media_list.show();
-		} else {
-			this.controler.media_list.hide();
-			this.controler.layout();
-			return;
-		}
-
-		this.controler.media_list.on_click = function () {
-			
-			if (this.extension.medialist_wnd) {
-				this.extension.medialist_wnd.close();
-				return;
-			}
-			var wnd = gw_new_popup(this.extension.controler.media_list, 'up');
-			this.extension.medialist_wnd = wnd;
-			wnd.extension = this.extension;
-			
-            //todo - cleanup the rest of the code to use closures to pass the extension object
-			wnd.on_close = ( function (e) {
-                return function () { e.medialist_wnd = null; }
-			} ) (extension);
-
-			wnd.make_item = function (text, obj) {
-				wnd.add_menu_item(text, function () {
-								  obj.select()
-								  });
-			}
-			
-			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
-				var m = root_odm.get_resource(res_i);
-				if (root_odm.selected_service != m.service_id) continue;
-
-				if ((m.type == 'Video') && (nb_video>1)) {
-					var text = 'Video #'+m.id;
-					wnd.make_item(text, m);
-				} else if (m.type=='Audio' && (nb_audio>1)) {
-					var text = 'Audio '+m.lang;
-					wnd.make_item(text, m);
-				} else if (m.type=='Text' && (nb_subs>1)) {
-					var text = 'Subtitle '+m.lang;
-					wnd.make_item(text, m);
-				}
-			}
-			wnd.on_display_size(gw_display_width, gw_display_height);
-			wnd.show();
-		}
-	
-	},
-
-    gather_stats_resources: function (root, selected_service) {
-        //if not dynamic scene, add main OD to stats
-        if (!root.dynamic_scene) {
-            this.stats_resources.push(root);
-		}
-
-	
-        for (var res_i = 0; res_i < root.nb_resources; res_i++) {
-            var m = root.get_resource(res_i);
-            if (!m) continue;
-            if (m.disabled) continue;
-            if (m.service_id && (m.service_id != selected_service)) continue;
-
-			m.dependent_group_id=0;
-			this.stats_resources.push(m);
-			
-			var nb_deps = m.dependent_groups;
-			for (var dep_j=0; dep_j < nb_deps; dep_j++) {
-				var copy_m = root.get_resource(res_i);
-				copy_m.dependent_group_id = dep_j + 1;
-				this.stats_resources.push(copy_m);
-			}
-
-            if (m.type == 'Scene' || m.type == 'Subscene') {
-                this.gather_stats_resources(m);
-			}
-        }
-        this.nb_objs_at_last_scan = root.nb_resources;
-    },
-
-    stats_timer_on_event: function (val) {
-        var ext = this.ext;
-        var wnd = ext.stats_wnd;
-        var nb_buff = 0;
-
-        if (!ext.root_odm) return;
-        
-        if (ext.nb_objs_at_last_scan != ext.root_odm.nb_resources) {
-          ext.stats_resources = [];
-          ext.gather_stats_resources(ext.root_odm, ext.root_odm.selected_service);
-          ext.reload_stats();
-        }
-                
-        if (ext.stats_data.length >= ext.stats_window) {
-            ext.stats_data.splice(0, 1);
-        }
-
-        var stat_obj = {};
-        ext.stats_data.push(stat_obj);
-
-        var t = new Date()
-        stat_obj.time = Math.round(t.getTime() / 1000);
-        stat_obj.fps = Math.round(100 * gpac.fps) / 100;
-        stat_obj.cpu = gpac.cpu;
-        stat_obj.memory = Math.round(100 * gpac.memory / 1000 / 1000) / 100;
-        stat_obj.http_bandwidth = Math.round(gpac.http_bitrate);
-        stat_obj.bitrate = 0;
-        stat_obj.buffer = 0;
-        stat_obj.ntp_diff = 0;
-        stat_obj.quality = 0;
-
-        for (var i = 0; i < ext.stats_resources.length; i++) {
-            var m = ext.stats_resources[i];
-
-            var bl;
-            if (m.max_buffer) {
-                var speed = ext.movie_control.mediaSpeed;
-                if (speed < 0) speed = 1;
-                else if (speed == 0) speed = 1;
-                var buf = m.buffer / speed;
-                bl = 100 * buf / m.max_buffer;
-
-                if (stat_obj) {
-                    if (!stat_obj.buffer || (buf && buf < stat_obj.buffer)) {
-                        stat_obj.buffer = buf;
-                    }
-                }
-            }
-            else bl = 100;
-			
-			if (m.dependent_group_id) {
-				var dq_idx=0;
-				while (1) {
-					var q = m.get_quality(dq_idx, m.dependent_group_id);
-					if (!q) break;
-					if (q.is_selected) {
-						stat_obj.quality += Math.round(q.bandwidth / 1000);
-					}
-					dq_idx++;
-				}
-			} else {
-				var nb_qual = m.nb_qualities;
-				for (var j = 0; j < nb_qual; j++) {
-					var q = m.get_quality(j);
-					if (q && q.is_selected) {
-						stat_obj.quality += Math.round(q.bandwidth / 1000);
-					}
-				}
-			}
-
-            if (stat_obj) {
-                stat_obj.ntp_diff = m.ntp_diff >= 0 ? m.ntp_diff : m.ntp_diff/1000;
-            }        
-
-            if (wnd) {
-                wnd.update_resource_gui(m, bl);
-            }
-
-            if (stat_obj) {
-                if (m.status != 'Stopped')
-                    stat_obj.bitrate += Math.round(m.avg_bitrate/1000);
-            }
-        }
-
-        if (wnd && stat_obj && ext.stats_data.length) {
-            wnd.update_series();
-        }
-    }
-	
-};
-

gpac-0.8.0.tar.gz/gui/extensions/player/stats.js Deleted

@@ -1,608 +0,0 @@
-
-extension.reload_stats = function () {
-    if (this.stats_wnd) {
-        this.stats_wnd.reload_request = true;
-        this.stats_wnd.close();
-    }
-}
-
-extension.view_stats = function () {
-
-    if (this.stats_wnd) {
-        this.stats_wnd.close();
-        this.stats_wnd = null;
-        return;
-    }
-
-    var wnd = gw_new_window_full(null, true, 'Stats');
-    gw_object_set_dragable(wnd);
-    this.stats_wnd = wnd;
-    wnd.extension = this;
-    wnd.reload_request = false;
-
-    wnd.area = gw_new_grid_container(wnd);
-    wnd.area.break_at_hidden = true;
-    wnd.area.spread_h = false;
-    wnd.area.spread_v = true;
-
-    var root_odm = this.root_odm;
-    var nb_http = root_odm.nb_http;
-    var nb_buffering = 0;
-    var nb_ntp_diff = 0;
-    var srd_obj = null;
-
-    wnd.has_select = false;
-
-    for (var res_i = 0; res_i < wnd.extension.stats_resources.length; res_i++) {
-        var m = wnd.extension.stats_resources[res_i];
-		var num_qualities;
-		var odm_srd = m.get_srd();
-        m.gui = {};
-		if (!srd_obj && odm_srd) srd_obj = m;
-		if (m.dependent_group_id) {
-			srd_obj = m;
-			odm_srd = m.get_srd(m.dependent_group_id);
-		}
-
-        var label = '' + m.type;
-		if (m.dependent_group_id) label += '(Dep. Group)';
-        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)';
-		
-		if (odm_srd) {
-		 label += ' (SRD ' + odm_srd.x + ',' + odm_srd.y + ',' + odm_srd.w + ',' + odm_srd.h + ')';
-		}
-
-        m.gui.txt = gw_new_text(wnd.area, label, 'lefttext');
-
-		num_qualities = m.nb_qualities;
-		if (m.dependent_group_id) {
-			var q = m.get_quality(1, m.dependent_group_id);
-			if (q) num_qualities=2;
-		}
-
-        if (num_qualities > 1) {
-            wnd.has_select = true;
-            m.gui.select_label = gw_new_button(wnd.area, 'Quality');
-            m.gui.select_label.odm = m;
-            m.gui.select_label.on_click = function () {
-                var idx = this.odm.gui.select.value;
-                if (this.odm.gui.selected_idx == idx) {
-                    this.on_long_click();
-                    return;
-                }
-
-                if (idx) {
-                    if (this.odm.gui.qualities[idx - 1].disabled) {
-                        var notif = gw_new_message(null, 'Cannot select representation', 'Representation has been disabled');
-                        notif.set_size(20 * gwskin.default_text_font_size, (2 * gwskin.default_icon_height + gwskin.default_text_font_size));
-                        notif.show();
-                        return;
-                    }
-                    this.odm.select_quality(this.odm.gui.qualities[idx - 1].ID, this.odm.dependent_group_id);
-                } else {
-                    this.odm.select_quality('auto', this.odm.dependent_group_id);
-
-                    this.odm.update_qualities();
-                }
-            }
-            m.gui.select_label.on_long_click = function () {
-                var idx = this.odm.gui.select.value;
-                if (!idx) return;
-                var q = this.odm.gui.qualities[idx - 1];
-
-                var iw = gw_new_window_full(null, true, 'Representation ' + q.ID + ' info');
-                gw_object_set_dragable(iw);
-                iw.area = gw_new_text_area(iw, '');
-
-                var label = 'Mime ' + q.mime + ' - codecs ' + q.codec;
-                label += '\n';
-                label += 'Bandwidth: ' + q.bandwidth;
-                label += '\n';
-                label += 'Enabled: ' + !q.disabled;
-                label += '\n';
-                if (q.width) {
-                    label += 'Size ' + q.width + 'x' + q.height + (q.interlaced ? ' interlaced @' : ' progressive @') + q.fps + ' FPS - SAR ' + q.par_num + '/' + q.par_den;
-                } else if (q.samplerate) {
-                    label += 'Samplerate ' + q.samplerate + ' Hz - ' + q.channels + ' channels';
-                }
-
-                iw.area.set_content(label);
-
-                iw.on_display_size = function (width, height) {
-                    var w = 25 * gwskin.default_text_font_size;
-                    var h = 2 * gwskin.default_icon_height + 5 * gwskin.default_text_font_size;
-                    this.set_size(w, h);
-                }
-
-                iw.on_display_size(gw_display_width, gw_display_height);
-                iw.set_alpha(0.9);
-                iw.show();
-            }
-
-            m.gui.select = gw_new_spincontrol(wnd.area, true);
-            m.gui.select.odm = m;
-            m.gui.select.on_click = function (val) {
-                this.odm.show_select(val);
-            }
-
-
-            m.update_qualities = function () {
-                var sel_idx = 0;
-                this.gui.qualities = [];
-				if (this.dependent_group_id) {
-					var dqidx=0;
-					while (1) {
-						var q = this.get_quality(dqidx, this.dependent_group_id);
-						if (!q) break;
-						this.gui.qualities.push(q);
-						dqidx++;
-					}
-				} else {
-					for (i = 0; i < this.nb_qualities; i++) {
-						var q = this.get_quality(i);
-						if (q) {
-							this.gui.qualities.push(q);
-						}
-					}
-				}
-                this.gui.qualities.sort(function (a, b) { return a.bandwidth - b.bandwidth });
-
-                for (i = 0; i < this.gui.qualities.length; i++) {
-                    if (this.gui.qualities[i].is_selected)
-                        sel_idx = i + 1;
-                }
-
-                this.gui.select.min = 0;
-                this.gui.select.max = this.gui.qualities.length;
-                if (this.gui.selected_idx != sel_idx) {
-                    this.show_select(sel_idx);
-                    this.gui.selected_idx = sel_idx;
-                    this.gui.select.value = sel_idx;
-                }
-            }
-
-            m.show_select = function (idx) {
-                if (!idx) {
-                    this.gui.select_label.set_label('Auto');
-                } else {
-                    var label = '';
-                    var q = this.gui.qualities[idx - 1];
-                    if (!q) return;
-
-                    if (q.is_selected) label += '*';
-
-                    if (q.width) {
-                        label += q.height + (q.interlaced ? 'i' : 'p');
-                    } else if (q.samplerate) {
-                        label += q.samplerate;
-                        if (q.channels) label += '/' + q.channels;
-                    }
-                    label += '@' + Math.round(q.bandwidth / 1000) + 'Kbps';
-
-                    this.gui.select_label.set_label(label);
-                }
-            }
-            m.update_qualities();
-        } else {
-            m.gui.select = null;
-            m.gui.select_label = null;
-            m.update_qualities = function () { }
-        }
-
-		m.gui.info = null;
-		if (!m.dependent_group_id) {
-		
-        m.gui.info = gw_new_icon(wnd.area, 'information');
-        m.gui.info.odm = m;
-        m.gui.info.on_click = function () {
-            if (this.odm.gui.info_wnd) {
-                this.odm.gui.info_wnd.close();
-                return;
-            }
-            var odm = this.odm;
-            var iw = gw_new_window_full(null, true, '' + odm.type + ' ' + odm.ID + ' statistics:');
-            odm.gui.info_wnd = iw;
-            gw_object_set_dragable(iw);
-            iw.odm = odm;
-
-            iw.on_close = function (width, height) {
-                this.timer.stop();
-                this.odm.gui.info_wnd = null;
-            }
-
-            iw.area = gw_new_text_area(iw, '');
-
-            iw.on_display_size = function (width, height) {
-                var w = 30 * gwskin.default_text_font_size;
-                var h = 2 * gwskin.default_icon_height + 11 * gwskin.default_text_font_size;
-                this.set_size(w, h);
-            }
-
-            iw.timer = gw_new_timer(false);
-            iw.timer.wnd = iw;
-            iw.timer.set_timeout(0.1, true);
-            iw.timer.on_event = function (val) {
-                var bw;
-                var m = this.wnd.odm;
-                if (!m) return;
-                var label = '';
-
-                this.wnd.children[0].spacing = 1.2;
-
-                if (m.width) {
-                    var fps = m.frame_duration;
-                    label += 'Size:' + m.width + 'x' + m.height;
-                    if (m.pixelformat) label += ' (' + m.par + ' ' + m.pixelformat + ')';
-                } else if (m.samplerate) {
-                    label += '' + m.samplerate + 'Hz ' + m.channels + ' channels';
-                }
-                label += '\n'
-                label += 'Status: ' + m.status + ' - clock time: ' + m.clock_time + ' (drift ' + m.clock_drift + ')';
-
-                label += '\n'
-                label += 'Composition Memory: ' + m.cb_unit_count + '/' + m.cb_capacity;
-
-                label += '\n'
-                label += 'Buffer: ' + m.buffer + ' ms (min ' + m.min_buffer + ' - max ' + m.max_buffer + ') ' + m.db_unit_count + ' AUs in DB';
-
-                label += '\n'
-                var dec_time = m.total_dec_time / m.dec_frames / 1000;
-                var max_time = m.max_dec_time / 1000;
-                label += '' + m.dec_frames + ' frames (' + m.drop_frames + ' dropped) - ' + Math.round(100 * dec_time) / 100 + ' ms/frame (max ' + Math.round(m.max_dec_time / 10) / 100 + ') ';
-
-                if (m.irap_frames && (m.dec_frames != m.irap_frames)) {
-                    label += '\n'
-                    dec_time = m.irap_dec_time / m.irap_frames / 1000;
-                    label += 'Average GOP size: ' + Math.round(m.dec_frames / m.irap_frames) + ' - ' + Math.round(100 * dec_time) / 100 + ' ms/irap (max ' + Math.round(m.irap_max_time / 10) / 100 + ') ';
-                }
-                label += '\n'
-                label += 'Average bitrate: ';
-                bw = m.avg_bitrate;
-                if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' Kbps';
-                else label += '' + Math.round(bw / 1000 / 1000) + ' Mbps';
-
-                label += ' - Maximum ';
-                bw = m.max_bitrate;
-                if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' Kbps';
-                else label += '' + Math.round(bw / 1000 / 1000) + ' Mbps';
-
-                label += '\n'
-                label += 'Download bandwidth: ';
-                var bw = m.bandwidth_down;
-                if (bw < 8000) label += '' + bw + ' Kbps';
-                else label += '' + Math.round(bw / 1000) + ' Mbps';
-
-                label += '\n'
-                label += 'Codec: ' + m.codec;
-
-                label += '\n'
-
-                var myurl;
-                if (m.service_url.indexOf('\\') >= 0) {
-                    myurl = m.service_url.split('\\');
-                } else {
-                    myurl = m.service_url.split('/');
-                }
-
-                label += 'Service: ' + myurl.pop();
-                if (m.service_id)
-                    label += ' - ID ' + m.service_id;
-
-                this.wnd.area.set_content(label);
-            }
-
-            odm.gui.info_wnd.on_display_size(gw_display_width, gw_display_height);
-            odm.gui.info_wnd.set_alpha(0.9);
-            odm.gui.info_wnd.show();
-        }
-		}
-		
-        m.gui.buffer = null;
-        m.gui.play = null;
-
-        if (m.selected_service == m.service_id) {
-            if (m.max_buffer && !m.dependent_group_id) {
-                nb_buffering++;
-                m.gui.buffer = gw_new_gauge(wnd.area, 'Buffer');
-            }
-            if (m.ntp_diff) nb_ntp_diff++;
-        } else if (!m.is_addon) {
-            m.gui.play = gw_new_icon(wnd.area, 'play');
-            m.gui.play.odm = m;
-            m.gui.play.wnd = wnd;
-            m.gui.play.on_click = function () {
-                this.odm.select_service(this.odm.service_id);
-                this.wnd.close_all();
-            }
-        }
-
-        nb_http += m.nb_http;
-
-        gw_new_separator(wnd.area);
-    }
-
-    wnd.http_control = null;
-    if (nb_http || wnd.has_select) {
-        wnd.http_text = gw_new_text(wnd.area, 'HTTP rate', 'lefttext');
-
-        wnd.http_control = gw_new_slider(wnd.area);
-
-        if (gpac.http_max_bitrate) {
-            var br = Math.round(100 * gpac.http_max_bitrate / 1000 / 1000) / 100;
-            if (br > 200) br = 200;
-            if (br <= 1) {
-                v = 30 * br;
-            } else if (br <= 10) {
-                v = 30 + 30 * br / 10;
-            } else if (br < 50) {
-                v = 60 + 20 * (br - 10) / 40;
-            } else {
-                v = 80 + 20 * (br - 50) / 150;
-            }
-            wnd.http_control.set_value(v);
-
-            wnd.http_text.set_label('HTTP cap ' + Math.round(gpac.http_max_bitrate / 10000)/100 + ' Mbps');
-        } else {
-            wnd.http_control.set_value(100);
-            wnd.http_text.set_label('HTTP cap off');
-        }
-
-        wnd.http_control.text = wnd.http_text;
-        wnd.http_control.on_slide = function (val) {
-            var br = 0;
-            if (val <= 30) {
-                br = val / 30;
-            } else if (val <= 60) {
-                br = 1 + 10 * (val - 30) / 30;
-            } else if (val < 80) {
-                br = 10 + 40 * (val - 60) / 20;
-            } else {
-                br = 50 + 150 * (val - 80) / 20;
-            }
-            if (br == 200) {
-                this.text.set_label('HTTP cap off');
-                gpac.http_max_bitrate = Math.round(0);
-            } else if (br == 0) {
-                this.text.set_label('HTTP disable');
-                gpac.http_max_bitrate = -1;
-            } else {
-                this.text.set_label('HTTP cap ' + Math.round(100 * br) / 100 + ' Mbps');
-                gpac.http_max_bitrate = Math.round(br * 1000000);
-            }
-        }
-
-        gw_new_separator(wnd.area);
-    }
-
-    wnd.srd_modes = null;
-	if (srd_obj) {
-        wnd.srd_text = gw_new_text(wnd.area, 'SRD Control', 'lefttext');
-        wnd.srd_modes = gw_new_button(wnd.area, 'Modes');
-		wnd.srd_modes.wnd = wnd;
-		wnd.srd_modes.srd_obj = srd_obj;
-		wnd.srd_modes.on_click = function() {
-			this.wnd.srd_selected_mode = this.wnd.srd_current_mode;
-			this.wnd.srd_set_mode(this.wnd.srd_current_mode);
-			this.srd_obj.select_quality(this.wnd.srd_selected_mode);
-		}
-		wnd.srd_select = gw_new_spincontrol(wnd.area, true);
-		wnd.srd_select.wnd = wnd;
-		wnd.srd_select.on_click = function (val) {
-			this.wnd.srd_set_mode(val);
-		}
-        wnd.srd_select.min = 0;
-        wnd.srd_select.max = 8;
-        wnd.srd_selected_mode = 0;
-		if (srd_obj.gui.qualities != null)
-			srd_obj.gui.qualities[0].tile_mode;
-        wnd.srd_current_mode = 0;
-		
-		wnd.srd_set_mode = function(mode) {
-		 var label = '';
-		 this.srd_current_mode = mode;
-		 if (this.srd_current_mode == this.srd_selected_mode) label='* ';
-
-		 switch (mode) {
-		 case 0: label+='Equal'; break;
-		 case 1: label+='Top Rows'; break;
-		 case 2: label+='Bottom Rows'; break;
-		 case 3: label+='Middle Rows'; break;
-		 case 4: label+='Left Column'; break;
-		 case 5: label+='Right Column'; break;
-		 case 6: label+='Middle Column'; break;
-		 case 7: label+='Center'; break;
-		 case 8: label+='Edges'; break;
-		 }
-		 this.srd_modes.set_label(label);
-		}
-		wnd.srd_set_mode(wnd.srd_selected_mode);
-	}
-
-    wnd.plot = gw_new_plotter(wnd.area);
-
-
-    wnd.on_display_size = function (width, height) {
-        var w;
-        var h = 2 * gwskin.default_icon_height;
-
-        w = 20 * gwskin.default_text_font_size;
-        w += 4 * gwskin.default_icon_height;
-        if (this.has_select)
-            w += 6 * gwskin.default_icon_height;
-
-        for (var i = 0; i < this.extension.stats_resources.length; i++) {
-            var res = this.extension.stats_resources[i];
-            var aw = w;
-
-            if (res.gui.info) {
-				res.gui.info.set_size(1.5 * gwskin.default_icon_height, gwskin.default_icon_height);
-				aw -= res.gui.info.width;
-			}
-            if (res.gui.buffer) {
-                res.gui.buffer.set_size(2 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
-            }
-            if (res.gui.play) {
-                res.gui.play.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
-            }
-            aw -= 4 * gwskin.default_icon_height;
-
-            if (res.gui.select) {
-                res.gui.select.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
-                aw -= gwskin.default_icon_height;
-                res.gui.select_label.set_size(6 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
-                aw -= 4 * gwskin.default_icon_height;
-            }
-
-
-            res.gui.txt.set_size(aw, gwskin.default_icon_height);
-            res.gui.txt.set_width(aw);
-            h += gwskin.default_icon_height;
-        }
-
-        if (this.plot) {
-            this.plot.set_size(w, 8 * gwskin.default_icon_height);
-            h += 8 * gwskin.default_icon_height;
-        }
-
-        if (this.http_control) {
-            this.http_text.set_size(11 * gwskin.default_text_font_size, gwskin.default_icon_height);
-            var ch = 0.5 * gwskin.default_icon_height;
-            this.http_control.set_size(w - 11 * gwskin.default_text_font_size, ch, ch, ch);
-            h += gwskin.default_icon_height;
-        }
-		
-		if (this.srd_modes) {
-			var cw = 0.75 * gwskin.default_icon_height;
-			this.srd_text.set_size(12 * gwskin.default_text_font_size, gwskin.default_icon_height);
-			this.srd_modes.set_size(w - 12 * gwskin.default_text_font_size - gwskin.default_icon_height, cw);
-			this.srd_select.set_size(gwskin.default_icon_height, cw);
-		}
-
-        this.set_size(w, h);
-        this.move((w - width) / 2, (height - h) / 2);
-    }
-    wnd.on_close = function () {
-        //this.timer.stop();
-        //this.objs = [];
-        if (this.reload_request) {
-            var translation = this.extension.stats_wnd.translation;
-            this.extension.stats_wnd = null;
-            this.extension.view_stats();
-            this.extension.stats_wnd.translation = translation;
-        } else {
-            this.extension.stats_wnd = null;
-        }
-    }
-
-    var label = 'Statistics (' + gpac.nb_cores + ' cores - ';
-    if (gpac.system_memory > 1000000000) label += '' + Math.round(gpac.system_memory / 1000 / 1000 / 1000) + ' GB RAM)';
-    else label += '' + Math.round(gpac.system_memory / 1000 / 1000) + ' MB RAM)';
-
-    wnd.set_label(label);
-
-    if (wnd.plot) {
-        wnd.s_fps = wnd.plot.add_serie('FPS', 'Hz', 0.8, 0, 0);
-        if (nb_http) {
-            wnd.s_bw = wnd.plot.add_serie('BW', 'Kbps', 0.8, 0, 0.8);
-        } else {
-            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_buffering)
-            wnd.s_buf = wnd.plot.add_serie('Buffer', 'ms', 0, 0, 0.8);
-        else
-            wnd.s_buf = null;
-
-        if (nb_ntp_diff)
-            wnd.s_ntp = wnd.plot.add_serie('E2E delay', 's', 0, 0.3, 0.8);
-        else
-            wnd.s_ntp = null;
-
-        wnd.s_cpu = wnd.plot.add_serie('CPU', '%', 0, 0.5, 0.5);
-        wnd.s_mem = wnd.plot.add_serie('MEM', 'MB', 0.5, 0.5, 0);
-
-    }
-
-    wnd.update_series = function() {
-        var ext = this.extension;
-        var length = (ext.stats_data.length > ext.stats_window ? stats_window : ext.stats_data.length);
-
-        this.s_fps.refresh_serie(ext.stats_data, 'time', 'fps', length, 4);
-        if (this.s_bw) {
-            this.s_bw.refresh_serie(ext.stats_data, 'time', 'http_bandwidth', length, 1);
-        }
-        if (this.s_buf) {
-            this.s_buf.refresh_serie(ext.stats_data, 'time', 'buffer', length, 1.5);
-        }
-        var stat_obj = ext.stats_data[ext.stats_data.length-1];
-        if (stat_obj.bitrate) {
-            this.s_bitrate.refresh_serie(ext.stats_data, 'time', 'bitrate', length, 2);
-        }
-        if (this.s_ntp) {
-            this.s_ntp.refresh_serie(ext.stats_data, 'time', 'ntp_diff', length, 3);
-        }
-        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);
-    }
-
-    wnd.quality_changed = function () {
-        for (var i = 0; i < this.extension.stats_resources.length; i++) {
-            var m = this.extension.stats_resources[i];
-            m.update_qualities();
-        }
-    }
-    wnd.close_all = function () {
-        for (var i = 0; i < this.extension.stats_resources.length; i++) {
-            if (this.extension.stats_resources[i].gui.info_wnd) {
-                this.extension.stats_resources[i].gui.info_wnd.odm = null;
-                this.extension.stats_resources[i].gui.info_wnd.close();
-            }
-        }
-        this.extension.stats_resources.length = 0;
-        this.close();
-    }
-
-    wnd.update_resource_gui = function(m, bl) {
-        if (m.gui && m.gui.buffer) {
-			var odm_srd = m.get_srd();
-
-			if (m.dependent_group_id) {
-				odm_srd = m.get_srd(m.dependent_group_id);
-			}
-
-            var label = ' ' + m.type;
-
-			if (m.dependent_group_id) label += '(Dep. Group)';
-			else if (m.scalable_enhancement) label += ' (Enh. Layer)';
-            else if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
-            else if (m.samplerate) label += ' (' + Math.round(m.samplerate / 10) / 100 + ' kHz ' + m.channels + ' ch)';
-            else if (m.scalable_enhancement) label += ' (Enh. Layer)';
-
-			if (odm_srd) {
-				label += ' (SRD ' + odm_srd.x + ',' + odm_srd.y + ',' + odm_srd.w + ',' + odm_srd.h + ')';
-			}
-
-            var url = m.service_url;
-/*
-            if ((url.indexOf('udp://') >= 0) || (url.indexOf('rtp://') >= 0) || (url.indexOf('dvb://') >= 0))
-                label += ' Broadcast';
-            else if ((url.indexOf('file://') >= 0) || (url.indexOf('://') < 0))
-                label += ' File';
-            else
-                label += ' Broadband';
-*/
-            m.gui.txt.set_label(label);
-            m.gui.buffer.set_value(bl);
-            m.gui.buffer.set_label('' + Math.round(m.buffer / 10) / 100 + ' s');
-        }
-    }
-
-    wnd.on_display_size(gw_display_width, gw_display_height);
-    wnd.set_alpha(0.9);
-    wnd.show();
-};
-

gpac-0.8.0.tar.gz/gui/extensions/showroom Deleted

gpac-0.8.0.tar.gz/gui/extensions/widget_manager Deleted

gpac-0.8.0.tar.gz/gui/extensions/widget_manager/init.js Deleted

@@ -1,927 +0,0 @@
-/*container for widgets*/
-widget_display = gw_new_container();
-widget_display.on_event = function(evt) 
-{
- if(!widget_display.children.length) return false;
- return widget_display.children[widget_display.children.length-1].on_event(evt);
-}
-
-widget_tool_size = 18;
-widget_min_size = 5*widget_tool_size;
-widget_default_size = 100;
-
-
-function check_widget_display(width, height) 
-{
-	var count = WidgetManager.num_widgets;
-	for (var i=0; i<count; i++) {
-	  var x, y;
-		var wid = WidgetManager.get(i);
-		if (wid == null) continue;
-		if (!wid.visible) continue;
-		
-	  x = wid.x;
-    y = wid.y;
-		if (x-wid.width/2 <= -width/2) x = wid.width/2-width/2;
-		else if (x+wid.width/2 >= width/2) x = width/2 - wid.width/2;
-		
-		if (y + wid.height/2 >= height/2) y = height/2 - wid.height/2;
-		else if (y  - wid.height/2 <= - height/2) y = -height/2 + wid.height/2;
-
-		if (wid.widget_control) wid.widget_control.move(x, y);
-	}
-}
-
-function scan_directory(dir)
-{
-	var i, j, count, list, new_wid, uri;
-	list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
-	for (i=0; i<list.length; i++) {
-		uri = list[i].path + list[i].name;
-		if (list[i].directory) {
-			scan_directory(uri);
-		} else {
-			count = WidgetManager.num_widgets;
-			for (j=0; j<count; j++) {
-				var wid = WidgetManager.get(j);
-				if (wid.url==uri) break;
-			}
-			if (j==count) {
-				new_wid = WidgetManager.open(uri, null);
-				if (new_wid!=null) {
-					widget_insert_icon(new_wid);
-				}
-			}
-		}
-	}
-}
-
-widman_cfg_dlg = null; 
-
-function open_widget_manager(extension)
-{
-  if (widman_cfg_dlg) return;
-
-  widman_cfg_dlg = gw_new_window_full(null, true, 'Widget Manager');
-  widman_cfg_dlg.area = gw_new_grid_container(widman_cfg_dlg);
-
-  var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.add, 'Add widget', 'icon_label');
-  icon.on_click = function() {
-    widman_cfg_dlg.close();
-    widman_cfg_dlg = null;
-    
-    var filebrowse = gw_new_file_open();
-    filebrowse.show_directory = true;
-    filebrowse.filter = '*.xml;*.wgt;*.mgt';
-    filebrowse.browse(WidgetManager.last_widget_dir);  
-  
-    filebrowse.on_browse = function(value, directory) {
-  		var new_wid = WidgetManager.open(value, null);
-	  	if (new_wid==null) return;
-		  WidgetManager.last_widget_dir = directory;
-		  widget_insert_icon(new_wid);
-		  dock.layout(dock.width, dock.height);
-		  show_dock(true);
-    }
-    filebrowse.on_directory = function(directory) {
-  		WidgetManager.last_widget_dir = directory;
-   		scan_directory(directory);
-		  show_dock(true);
-    }
-    filebrowse.set_size(320 , 240);
-    gpacui_show_window(filebrowse);
-  }
-var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.trash, 'Remove all widgets', 'icon_label');
-  icon.on_click = function() {
-		while (1) {
-			var wid = WidgetManager.get(0);
-			if (wid==null) break;
-			widget_remove(wid);
-		}
-    widman_cfg_dlg.close();
-    widman_cfg_dlg = null;
-	  dock.layout(dock.width, dock.height);
-	  show_dock(true);
-  }
-  widman_cfg_dlg.on_close = function() {
-   widman_cfg_dlg = null;
-  }
-  widman_cfg_dlg.set_size(320 , 240);
-  gpacui_show_window(widman_cfg_dlg);
-}
-
-function widget_insert_icon(new_wid) {
-	var icon = gpacui_insert_dock_icon(new_wid.name, widget_get_icon(new_wid) );
-	new_wid.in_panel = true;
-	new_wid.visible = false;
-	new_wid.icon_dock = icon;
-	icon.on_click = on_widget_launch;
-	icon.widget = new_wid;
-}
-
-function collapsable_list(info_dlg, title)
-{
-	var info = gw_new_button(info_dlg.area, title, 'button');
-	var children = info_dlg.area.get_children();
-	
-	info.first_idx = children.length;
-	info.dlg = info_dlg;
-	info.displayed = true;
-  info.on_click = function() {
-   var children = this.dlg.area.get_children();
-   this.displayed = !this.displayed;
-	 for (var i=this.first_idx; i<this.last_idx; i++) {
-    if (this.displayed) children[i].show();
-    else children[i].hide();
-  	
-    if (typeof children[i].last_idx != 'undefined') {
-      if (!children[i].displayed) children[i].on_click();
-     }
-   }
-   this.dlg.area.layout_changed();
-  }
-  return info;
-}
-
-//widget information dialog
-function display_widget_info(wid)
-{
-	var i, j, k, info;
-	var y, txt, pref;
-
-	var info_dlg = gw_new_window_full(null, true, 'Widget ' + wid.name + ' Information', 'window', null);
-//  info_dlg.area = gw_new_grid_container(info_dlg);
-  info_dlg.area = gw_new_listbox(info_dlg);
- 
-	var info = collapsable_list(info_dlg, 'Widget Metadata');
-	
-  gw_new_text(info_dlg.area, 'id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'text');
-  gw_new_text(info_dlg.area, 'version: '+wid.version, 'text');
-  gw_new_text(info_dlg.area, 'content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'text');
-  gw_new_text(info_dlg.area, 'default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'text');
-  gw_new_text(info_dlg.area, 'license: '+wid.license, 'text');
-  gw_new_text(info_dlg.area, 'license ref: '+wid.licenseHref, 'text');
-  gw_new_text(info_dlg.area, 'description: '+wid.description, 'text');
-  gw_new_text(info_dlg.area, 'author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'text');
-  gw_new_text(info_dlg.area, 'author href: '+wid.authorHref, 'text');
-  gw_new_text(info_dlg.area, 'view modes: '+wid.viewmodes, 'text');
-  gw_new_text(info_dlg.area, 'UUID: '+wid.uuid, 'text');
-  gw_new_text(info_dlg.area, 'Discardable: '+wid.discardable, 'text');
-  gw_new_text(info_dlg.area, 'Muliple Instances: '+wid.discardable, 'text');
-	var icons = wid.icons;
-	for (j=0; j<icons.length; j++) {
-    gw_new_text(info_dlg.area, 'Icon #'+(j+1)+': ' + icons[j].src, 'text');
-	}
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
-	info = collapsable_list(info_dlg, 'Widget Manager Info');
-
-	gw_new_text(info_dlg.area, 'nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'text' );
-	gw_new_text(info_dlg.area, 'Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'text' );
-	if (wid.is_component) {
-		gw_new_text(info_dlg.area, 'parent widget name' + wid.parent.name, 'text');
-	}
-	if (wid.originating_device_ip) {
-		gw_new_text(info_dlg.area, 'Widget was pushed from device IP '+wid.originating_device_ip, 'text' );
-	}
-	gw_new_text(info_dlg.area, 'Section name in GPAC config file: '+wid.section, 'text' );
-	gw_new_text(info_dlg.area, 'UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'text');
-	gw_new_text(info_dlg.area, 'widget src: ' + wid.url , 'text');
-	gw_new_text(info_dlg.area, 'config src: ' + wid.manifest , 'text');
-	gw_new_text(info_dlg.area, 'content src : '+wid.localizedSrc, 'text' );
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
-	pref = wid.features;
-	if (pref.length) {
-  	info = collapsable_list(info_dlg, 'Features');
-  	for (j=0; j<pref.length; j++) {
-  		gw_new_text(info_dlg.area, 'Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'text');
-  	}
-  	info.last_idx = info_dlg.area.get_children().length;
-  	info.on_click();
-  }
-
-	pref = wid.preferences;
-	if (pref.length) {
-  	info = collapsable_list(info_dlg, 'Preferences');
-  	for (j=0; j<pref.length; j++) {
-  		var val = pref[j].value;
-  		if (val == '') val = gpac.get_option(wid.section, pref[j].name);
-  		gw_new_text(info_dlg.area, 'Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'text');
-  	}
-  	info.last_idx = info_dlg.area.get_children().length;
-  	info.on_click();
-  }
-
-	info = collapsable_list(info_dlg, 'MPEG-U Migration Context');
-	txt=wid.get_context();
-	if (!txt) txt='';
-
-	while (1) {
-		var idx = txt.indexOf('\n', 0);
-		if (idx>0) {
-			gw_new_text(info_dlg.area, txt.substring(0, idx), 'text');
-			txt = txt.substring(idx+1, txt.length);
-		} else {
-			gw_new_text(info_dlg.area, txt, 'text');
-			break;
-		}
-	}
-	info.last_idx = info_dlg.area.get_children().length;
-	info.on_click();
-
-  if (wid.num_interfaces) {
-  	info = collapsable_list(info_dlg, 'MPEG-U Interfaces', 'button');
- 		var spacer = gw_new_text(info_dlg.area, '', 'text');
-  	spacer.hide();
-  	info.first_idx = info_dlg.area.get_children().length;
-    for (j=0; j<wid.num_interfaces; j++) {
-  		var idx;
-  		var ifce = wid.get_interface(j);
-    	var item = collapsable_list(info_dlg, 'Interface #' + (j+1) + ' type: '+ifce.type);
-      item.sublist = true;
-  		gw_new_text(info_dlg.area, 'Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'text');
-  		for (k=0; k<ifce.num_messages; k++) {
-  			var string, l;
-  			var msg = ifce.get_message(k);
-  			string = '  Message #'+ (k+1) + ':   ' + msg.name + '(';
-  			for (l=0; l<msg.num_params; l++) {
-  				par = msg.get_param(l);
-  				string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
-  			}
-  			string += ')';
-  			gw_new_text(info_dlg.area, string, 'text');
-  		}
-  	  item.last_idx = info_dlg.area.get_children().length;
-    	item.on_click();
-    	item.hide();
-  	}
-  	info.last_idx = info_dlg.area.get_children().length;
-  	info.on_click();
-  }
-
-  info_dlg.area.spread_h = true;
-  info_dlg.area.break_at_hidden = true;
-  
-  info_dlg.on_size = function(width, height) {
-   var i;
-   var children = this.area.get_children();
-   for (i=0; i<children.length; i++) {
-    if ((typeof children[i].first_idx != 'undefined') && (typeof children[i].sublist== 'undefined')) {
-      children[i].set_size( (width>200) ? 200 : width, 20);
-    } else {
-      children[i].set_size(width, 16);
-    }
-   }
-  }
-  
-  info_dlg.on_event = function(evt) {
-   if (this.area && this.area.on_event(evt)) return true;
-   return false;
-  }
-
-  info_dlg.set_size(320, 240);
-  gpacui_show_window(info_dlg);
-}
-
-
-//widget close function
-function widget_close(widget, force_remove)
-{
-	var is_comp = widget.is_component;
-
-	if (widget.visible) {
-		widget.visible = false;
-		WidgetManager.corein_message(widget, 'hide');
-		WidgetManager.corein_message(widget, 'deactivate');
-		widget.deactivate();
-		/*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
-		if (widget.widget_control) {
-			widget.widget_control.set_url('');
-			widget.widget_control.close();
-		}
-	}
-	if (!is_comp && (!widget.permanent || force_remove)) {
-		WidgetManager.unload(widget, force_remove ? true : false);
-	}
-}
-
-//widget remove function (close and unregister)
-function widget_remove(wid) {
-	if (typeof(wid.icon_dock) != 'undefined') {
-		wid.icon_dock.close();
-    wid.icon_dock = null;
-	}		
-	widget_close(wid, 1);
-}
-
-function new_migrate_callback(widget) {
- return function(renderer) {
-  WidgetManager.migrate_widget(renderer, widget);
-	widget_close(widget, 0);
- }
-}
-
-function on_widget_load() 
-{
-	WidgetManager.corein_message(this, 'activate');
-	WidgetManager.corein_message(this, 'show');
-	WidgetManager.corein_message(this, 'setSize', 'width', this.width, 'height', this.height, 'dpi', screen_dpi);
-}
-
-
-mpegu_targets = null;
-
-function select_mpegu_target(callback)
-{ 
-  if (mpegu_targets) return;
-  mpegu_targets = gw_new_file_open();
-  mpegu_targets.set_label('Select Remote Display');
-  mpegu_targets.callback = callback;
-
-  mpegu_targets.on_close = function() {
-   mpegu_targets = null;
-  }
-  /*override browse function*/
-  mpegu_targets._on_mpegu_click = function() {
-   	var target = (this.render_idx<0) ? null : WidgetManager.get_mpegu_service_providers(this.render_idx);
-
-		mpegu_targets.callback(target);
-		mpegu_targets.callback = null;
-    mpegu_targets.close();
-    mpegu_targets = null;
-  }
-  mpegu_targets._browse = function(dir, up) {
-   var w, h, i, y;
-   this.area.reset_children();
- 
-   for (i=0; ; i++) {
-		var target = WidgetManager.get_mpegu_service_providers(i);
-		if (!target) break;
-		var	icon = 'icons/applications-internet.svg';
-    var item = gw_new_icon_button(this.area, icon, target.Name);
-    item.set_size(item.width, item.height);
-    item.render_idx = i;
-    item.on_click = this._on_mpegu_click;
-   }  
-   this.layout(this.width, this.height);
- }
- mpegu_targets.browse('');  
- mpegu_targets.go_up.hide();
- mpegu_targets.set_size(display_width, display_height);
- gpacui_show_window(mpegu_targets);
-}
-
-
-function new_widget_control(widget)
-{
-  var ctrl;
-  
-
-  var inline = gw_new_subscene(null);
-  ctrl = gw_new_window_full(widget_display, true, null, 'offscreen', inline);
-	ctrl.set_size(widget.width, widget.height);
-
-  ctrl.inline = inline;
-  ctrl.tools.spread_h = true;
-  
-	ctrl.component_bound = false;
-	ctrl.widget = widget;
-	widget.widget_control = ctrl;  
-	widget.visible = true;
-  
-  ctrl.on_close = function() {
-  	this.inline.url[0] = '';
-  	this.widget.widget_control = null;  
-		if (this.widget.discardable) widget_remove(this.widget);
-		else widget_close(this.widget, 0);
-		this.widget = null;
-  }
-
-  ctrl.tools.hide();
-  gw_object_set_dragable(ctrl);
-
-  gw_object_set_hitable(ctrl);
-  ctrl.controls_visible = false;
-
-	this.maximized = false;
-  ctrl.on_double_click = function() {
-   if (this.maximized) {
-		this.maximized = false;
-		this.move(this.widget.x, this.widget.y);
-		this.set_size(this.prev_width, this.prev_height);
-   } else {
-		this.maximized = true;
-		this.prev_width = this.widget.width;
-		this.prev_height = this.widget.height;
-		this.move(0, 0);
-		this.set_size(display_width, display_height);
-   }   
-   this.controls_visible = false;
-   this.tools.hide();
-  }
-
-  ctrl.on_click = function() {
-    this.controls_visible = ! this.controls_visible;
-    if (this.controls_visible) this.tools.show();
-    else this.tools.hide();
-  }
-  /*push on top*/
-  ctrl.on_down = function(value) {
-		if (value) return;
-		if (this.widget==null) return;
-
-		//widget is a component, do not push on top but hide some controls
-		if (this.widget.is_component) {
-			if (this.component_bound) {
-			  var chldren = this.tools.get_children();
-				children[0].hide(); //close
-				children[1].hide(); //remove
-				children[4].hide(); //resize
-			}
-			return;
-		}
-		//otherwise push widget on top
-		widget_display.push_to_top(this);
-		//and push components
-		comps = this.widget.components;
-		for (i=0; i<comps.length; i++) {
-			if (comps[i].widget_control && comps[i].widget_control.component_bound) {
-				widget_display.push_to_top(comps[i].widget_control);
-			}
-		}
-  }
-
-  ctrl._orig_move = ctrl.move;
-  ctrl.move = function(x, y) {
-    this.widget.x = x;
-		this.widget.y = y;
-		this._orig_move(x, y);
-	}
-
-  ctrl.on_drag = function(x, y) {
-		if (this.maximized) return;
-    this.move(x, y);
-  }
-  ctrl.on_event = function(evt) {
-   var x, y;
-   if (evt.type != GF_EVENT_KEYDOWN) return false;
-   if (!this.controls_visible) return false;
-
-   x = this.widget.x;
-   y = this.widget.y;
-   if (evt.keycode=='Up') y += 10;
-   else if (evt.keycode=='Down') y -= 10;
-   else if (evt.keycode=='Left') x -= 10;
-   else if (evt.keycode=='Right') x += 10;
-   else return false;
-   this.move(x, y);
-   return true;
-  }
- 
-  /*widget is not temporary*/
-	if (!widget.discardable && widget.icon_dock) {
-    var icon = ctrl.add_tool(gwskin.images.trash, gwskin.labels.trash);
-    icon.on_click = function() { widget_remove(this.dlg.widget); };  
-  }
-  
-  if (UPnP_Enabled) {
-    ctrl.remote = ctrl.add_tool(gwskin.images.remote_display, gwskin.labels.remote_display);
-    ctrl.remote.on_click = function() { 
-      var dlg = select_mpegu_target(new_migrate_callback(this.dlg.widget) );    
-    };  
-  	
-    ctrl.show_remote = function(show) {
-     if (show) this.remote.show();
-     else this.remote.hide();
-    }
-  }  
-
-  var icon = ctrl.add_tool(gwskin.images.information, gwskin.labels.information);
-  icon.on_click = function() { 
-    display_widget_info(this.dlg.widget); 
-  };  
-
-  var icon = ctrl.add_tool(gwskin.images.resize, gwskin.labels.resize);
-  gw_object_set_dragable(icon);
-	ctrl.prev_x=0;
-	ctrl.prev_y=0;
-  icon.begin_drag = function() {
-  	this.dlg.prev_x=this.startx;
-	  this.dlg.prev_y=this.starty;
-  }
-  icon.on_drag = function(valx, valy) {
-    var _dlg = this.dlg;
-		if (_dlg.widget.width + 2*(valx - _dlg.prev_x) < widget_min_size) return;
-		if (_dlg.widget.height + 2*(valy-_dlg.prev_y) < widget_min_size) return;
-
-		_dlg.widget.width += 2*(valx - _dlg.prev_x);
-		_dlg.prev_x = valx;
-		_dlg.widget.height += 2*(valy - _dlg.prev_y);
-		_dlg.prev_y = valy;
-		_dlg.set_size(_dlg.widget.width, _dlg.widget.height);
-  }
-  
-  ctrl.set_url = function(url) {
- 	 ctrl.inline.url[0] = url;
-  }
-  ctrl.predestroy = function() {
-   this.inline = null;
-   this.remote = null;
-   this.widget = null;
-  }
-		
-	ctrl.sub_w = 0;
-	ctrl.sub_h = 0;
-	ctrl.sub_x = 0;
-	ctrl.sub_y = 0;
-	ctrl.sub_vp_w = 0;
-	ctrl.sub_vp_h = 0;
-
-  ctrl.on_widget_vp_changed = function(evt) {
-		this.sub_vp_w = evt.width;
-		this.sub_vp_h = evt.height;
-		this.sub_vp_x = evt.offset_x;
-		this.sub_vp_y = evt.offset_y;
-		this.sub_w = evt.vp_width;
-		this.sub_h = evt.vp_height;
-  }
-	ctrl.inline.addEventListener('gpac_vp_changed', ctrl.on_widget_vp_changed, 0);
-		
-//  ctrl.set_tool_size(widget_tool_size);  
-	ctrl.set_size(widget.width, widget.height);
-	if (widget.x < -display_width/2) widget.x = 0;
-	else if (widget.x > display_width/2) widget.x = 0;
-	if (widget.y < -display_height/2) widget.y = 0;
-	else if (widget.y > display_height/2) widget.y = 0;
-	ctrl.move(widget.x, widget.y);
-
-	/*this will setup the scene graph for the widget in order to filter input and output communication pins*/
-	widget.activate(ctrl.inline);
-
-	ctrl.set_url(widget.main);
-
-	/*send notifications once the widget scene is loaded*/
-	widget.on_load = on_widget_load;
-
-  ctrl.show();
-  return ctrl;
-}
-
-function flash_window(wnd) {
-	wnd.time = gw_new_timer(true);
-	wnd.time.set_timeout(0.25, true);
-	wnd.time.ctrl = wnd;
-	wnd.time.on_fraction = function(val) {
-		var scale = (val<0.5) ? 1+val/2 : 1.5-val/2;
-		this.ctrl.scale.x = this.ctrl.scale.y = scale;
-	}
-	wnd.time.on_active = function (val) {
-		 if (!val) {
-      this.ctrl.time = null;
-      this.ctrl = null;
-     }
-  }
-	wnd.time.stop(1);
-	wnd.time.start(0);
-}
-
-//widget launcher function
-function widget_launch(wid) {
-	var widg_ctrl;
-
-	//assign default size to the widget
-	if (wid.width == undefined) {
-		wid.width = wid.defaultWidth;
-		if (wid.width == 0) wid.width = widget_default_size;
-	}
-	if (wid.height == undefined) {
-		wid.height = wid.defaultHeight;
-		if (wid.height == 0) wid.height = widget_default_size;
-	}
-	if (wid.x== undefined) wid.x = 0;
-	if (wid.y== undefined) wid.y = 0;
-
-	widg_ctrl = new_widget_control(wid);
-}
-
-
-//starts a widget
-function on_widget_launch() {
-	if (this.widget.visible) {
-		var awid;
-		if (!this.widget.multipleInstances) return;
-		awid = WidgetManager.open(this.widget.manifest, null);
-		widget_launch(awid);
-	} else {
-		widget_launch(this.widget);
-	}
-  show_dock(false);
-}
-
-
-function widget_get_icon(widget)
-{
-	var icon = 'icons/image-missing.svg';
-	var preferredIconType = '.svg';
-
-	for (var i = 0; i < widget.icons.length; i++) {
-		icon = widget.icons[i].relocated_src;
-		if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
-			break;
-		}
-	}
-	return icon;
-}
-
-function widget_insert(widget)
-{
-	/*insert the widget icon*/
-	if (widget.permanent && !widget.is_component)
-		widget_insert_icon(widget);
-
-	/*and load the widget - comment this line to disable auto load of widget*/
-	widget_launch(widget);
-}
-
-function __get_int(arg)
-{
-		return (typeof arg == 'string') ? parseInt(arg) : arg;
-}
-
-function widget_request_size(widget, args)
-{
-	if (args.length==2) {
-		w = __get_int(args[0]);
-		h = __get_int(args[1]);
-		widget.widget_control.set_size(w, h);
-	}
-}
-
-function widget_request_show(widget, args)
-{
-	widget.widget_control.show();
-}
-function widget_request_hide(widget, args)
-{
-	widget.widget_control.hide();
-}
-function widget_request_activate(widget, args)
-{
-	if (!widget.visible)
-		widget_launch(widget);
-}
-function widget_request_deactivate(widget, args)
-{
-	if (widget.visible)
-		widget_close(widget, 0);
-}
-
-function widget_request_attention(widget, args)
-{
-	if (widget.visible) {
-		widget_display.push_to_top(widget.widget_control);
-		flash_window(widget.widget_control);
-	}
-}
-
-function widget_request_notification(widget, args)
-{
-  var notif = gw_new_message(null, ''+widget.name+' Alert!', args[0]);
-//	widget_display.push_to_top(notif);
-  gpacui_show_window(notif);
-	notif.set_size(240, 120);
-}
-
-function widget_refresh_components_layout(ctrl, send_resize, comp_target)
-{
-	var i;
-	var x, y, w, h, scale_x, scale_y;
-	var comps;
-
-	/*local to subscene transformation not known*/
-	if (!ctrl.sub_w) return;
-	if (!ctrl.sub_h) return;
-
-	comps = ctrl.widget.components;
-	for (i=0; i<comps.length; i++) {
-		var comp = comps[i];
-		if (!comp.widget_control || !comp.widget_control.component_bound) continue;
-
-		//compute scale from Widget Manager coord system to widget internal coordinate system
-		scale_x = ctrl.sub_vp_w / ctrl.sub_w;
-		scale_y = ctrl.sub_vp_h / ctrl.sub_h;
-
-		w = comp.widget_control.place_w * scale_x;
-		h = comp.widget_control.place_h * scale_y;
-
-		x = ctrl.translation.x - ctrl.widget.width/2 + ctrl.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
-		comp.widget_control.translation.x = x;
-
-		y = ctrl.widget.height/2 + ctrl.translation.y - h/2 - ctrl.sub_vp_y - comp.widget_control.place_y * scale_y;
-		comp.widget_control.translation.y = y;
-
-		if (send_resize || (comp_target==comp))
-			comp.widget_control.set_size(w, h);
-	}
-}
-
-function widget_place_component(widget, args)
-{
-	var comp = widget.get_component(args[0]);
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
-		return;
-	}
-	comp.widget_control.place_x = __get_int(args[1]);
-	comp.widget_control.place_y = __get_int(args[2]);
-	comp.widget_control.place_w = __get_int(args[3]);
-	comp.widget_control.place_h = __get_int(args[4]);
-	comp.widget_control.place_z = __get_int(args[5]);
-	comp.widget_control.component_bound = true;
-	widget_refresh_components_layout(widget.widget_control, false, comp);
-}
-
-
-
-//
-// implementation of core:out install widget
-//
-function widget_request_install(wid, args)
-{
-	var wid_url = args[0];
-	/*locate widget with same URL*/
-	var j, count = WidgetManager.num_widgets;
-	for (j = 0; j < count; j++) {
-		var wid = WidgetManager.get(j);
-		if (wid.url == wid_url) {
-			if (!wid.in_panel) {
-				widget_insert_icon(wid);
-			}
-			break;
-		}
-	}
-	alert('opening widget '+wid_url);
-	/*not found, install new widget*/
-	if (j == count) {
-		var new_wid = WidgetManager.open(wid_url, null, wid);
-		if (new_wid==null) return;
-		widget_insert_icon(new_wid);
-	}
-
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"), wid, 1); // send return code 1 = success
-	}
-}
-function widget_migrate_component(wid, args)
-{
-	var comp = wid.get_component(args[0], true);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+wid.name);
-		if (ifce != null) {
-			wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
-		}
-		return;
-	}
-	comp.widget_control = null;
-	if (args.length > 1 && args[1] != null) {
-		alert('Migrating component to ' + UPnP.GetMediaRenderer(parseInt(args[1])).Name);
-		WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
-		widget_close(comp);
-	} else {
-    var dlg = select_mpegu_target(new_migrate_callback(comp) );    
-	}
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
-	}
-}
-
-function widget_migration_targets(wid, args)
-{
-	var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i, i;
-
-	for (i = 0; i < count; i++) {
-		var render = UPnP.GetMediaRenderer(i);
-		codes.push(""+i);
-		names.push(render.Name);
-		descriptions.push(render.HostName +" "+ render.UUID);
-	}
-	i = null;
-	var ifce_count = wid.num_interfaces, j;
-	for (j = 0; j < ifce_count; j++) {
-		var ifce = wid.get_interface(j);
-		if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-			i = ifce;
-			break;
-		}
-	}
-	if (i != null) {
-		wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
-			wid, codes, names, descriptions);
-	}
-}
-
-
-//
-// implementation of core:out activate temporary widget
-//
-function widget_activate_temporary_widget(wid, args) {
-	var w = WidgetManager.open(args[0], null);
-	if (w != null) widget_launch(w);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
-			wid, (w != null ? 1 : 0)); // send return code 1 = success
-	}
-}
-
-function setup_extension(extension)
-{ 
-  var count, i;
-
-  /*WidgetManager module not present*/ 
-  if (typeof(WidgetManager) == 'undefined') return 0;
-  
-  /*load MPEG-U*/ 
-  Browser.loadScript('mpegu-core.js', true); 
-  widget_manager_init();
-   
-  extension.icon = 'applications-system.svg';
-  extension.label = 'Widget Manager';
-  extension.desc = 'Configure Widgets';
-  extension.launch = open_widget_manager;
-  
-  extension.initialize = function(extension) {
-		WidgetManager.on_widget_remove = widget_remove;
-		WidgetManager.on_widget_add = widget_insert;
-		WidgetManager.coreOutSetSize = widget_request_size;
-		WidgetManager.coreOutShow = widget_request_show;
-		WidgetManager.coreOutHide = widget_request_hide;
-		WidgetManager.coreOutRequestActivate = widget_request_activate;
-		WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
-		WidgetManager.coreOutShowNotification = widget_request_notification;
-		WidgetManager.coreOutPlaceComponent = widget_place_component;
-		WidgetManager.coreOutGetAttention = widget_request_attention;
-		WidgetManager.coreOutInstallWidget = widget_request_install;
-		WidgetManager.coreOutMigrateComponent = widget_migrate_component;
-		WidgetManager.coreOutRequestMigrationTargets = widget_migration_targets;
-		WidgetManager.coreOutActivateTemporaryWidget = widget_activate_temporary_widget;
-
-
-   	gpacui_show_window(widget_display);
-   	
-  	/*restore our widgets*/
-  	count = WidgetManager.num_widgets;
-  	for (i=0; i<count; i++) {
-  		var wid = WidgetManager.get(i);
-  		if (wid == null) continue;
-  		wid.device = null;
-  		wid.device_ip = null;
-
-  		if (wid.in_panel == true) {
-        var icon = gpacui_insert_dock_icon(wid.name, widget_get_icon(wid));
-  			icon.widget = wid;
-  			icon.on_click = on_widget_launch;
-  			wid.icon_dock = icon;
-  		}
-
-  		if (wid.visible) {
-  			widget_launch(wid);
-  		}
-  	}
-  	check_widget_display(display_width, display_height);
-  }	
-
-  if (UPnP_Enabled) {  
-    extension.on_upnp_add = function(name, uuid, is_add) {
-    	var i, count;
-    	var show = UPnP.MediaRenderersCount ? 1 : 0;
-    	count = WidgetManager.num_widgets;
-    	for (i=0; i<count; i++) {
-    		wid = WidgetManager.get(i);
-    		if (wid == null) continue;
-    		if (!wid.widget_control) continue;
-    		wid.widget_control.show_remote(show);
-    	}
-    }
-    extension.on_media_open = function(url, src_ip) {
-    	if (! WidgetManager.probe(url)) return 0;
-   		var new_wid = WidgetManager.open(url, src_ip);
-  		if (new_wid!=null) {
-  	     widget_insert(new_wid);
-  		}
-  		return 1;
-    }
-  }
-  extension.on_resize = check_widget_display;
-  
-  /*setup all widgets*/
-  return 1;
-}
-

gpac-0.8.0.tar.gz/gui/gui.js Deleted

@@ -1,253 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-
-all_extensions = [];
-
-function gw_insert_media_node(node)
-{
-    media_root.children[media_root.children.length] = node;
-}
-
-function gw_hide_dock() {
-    dock.hide();
-}
-
-function gw_show_dock() {
-    dock.show();
-}
-
-//insert an offscreen image + text
-function insert_dock_icon(label, icon)
-{
-    var wnd = gw_new_window(dock, true, false);
-    var icon = gw_new_icon_button(wnd, icon, (label=='') ? null : label, 'root_icon');
-    wnd.set_size(icon.width, icon.height);
-    wnd.show();
-    return icon;
-}
-
-function extension_option_setter(_ext) {
-    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
-        return function (key_name, value) {
-        }
-    } else {
-        return function (key_name, value) {
-            this.__gpac_storage.set_option('Config', key_name, value);
-            this.__gpac_storage.save();
-        }
-    }
-}
-
-function extension_option_getter(_ext) {
-    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
-        return function (key_name, default_val) {
-        }
-    } else {
-        return function (key_name, default_val) {
-			if (key_name=='path') return _ext.path;
-            var value = this.__gpac_storage.get_option('Config', key_name);
-            if (value == null) {
-                this.set_option(key_name, default_val);
-                value = default_val;
-            }
-            return value;
-        }
-    }
-}
-
-function setup_extension_storage(extension) {
-    var storage_name = 'config:' + extension.path + '' + extension.name;
-    gwlog(l_inf, 'loading storage for extension ' + storage_name);
-
-    extension.jsobj.__gpac_storage = gpac.new_storage(storage_name);
-
-    extension.jsobj.get_option = extension_option_getter(extension);
-    extension.jsobj.set_option = extension_option_setter(extension);
-}
-
-//Initialize our GUI
-function initialize() {
-    //var icon;
-    var i, count, wid;
-
-    gpac.caption = 'Osmo4';
-
-    min_width = 160;
-    min_height = 80;
-    gw_display_width = parseInt(gpac.get_option('General', 'LastWidth'));
-    gw_display_height = parseInt(gpac.get_option('General', 'LastHeight'));
-    if (!gpac.fullscreen && (!gw_display_width || !gw_display_height)) {
-        gw_display_width = 320;
-        gw_display_height = 240;
-    }
-    if (!gpac.fullscreen && gw_display_width && gw_display_height) {
-        gpac.set_size(gw_display_width, gw_display_height);
-    } else {
-        gw_display_width = gpac.screen_width;
-        gw_display_height = gpac.screen_height;
-    }
-    //request event listeners on the window - GPAC specific BIFS extensions !!! We don't allow using the event proc for size events
-    root.addEventListener('resize', on_resize, 0);
-
-    
-    /*load the UI lib*/
-    Browser.loadScript('gwlib.js', false);
-    gwlib_init(ui_root);
-
-	gwskin.enable_background(true);
-
-    //what do we do with tooltips ?
-//    gwskin.tooltip_callback = function(over, label) { alert('' + over ? label : ''); };
-
-
-    //create the dock containing all launchers            
-    dock = gw_new_grid_container(null);
-
-    dock.on_display_size = function (w, h) {
-        this.on_size(w, h);
-        this.set_size(w, h);
-    }
-    dock.on_size = function (w, h) {
-        var children = dock.get_children();
-        for (var i = 0; i < children.length; i++) {
-            children[i].set_size(2 * gwskin.default_control_height, gwskin.default_control_height);
-        }
-    }
-
-
-    /*init all extensions*/
-    var list = gpac.enum_directory('extensions', '*', 0);
-
-    for (i=0; i<list.length; i++) {
-        if (!list[i].directory) continue;
-
-      if (list[i].name.indexOf('.')==0) continue;
-      
-      var extension = Browser.loadScript('extensions/'+list[i].name+'/init.js', true);
-      if (extension == null) {
-          gwlog(l_deb, 'Loading UI extension ' + list[i].name + ' failed' );
-          continue;
-      }
-
-      if (typeof extension.whoami != 'string') continue;
-      if (extension.whoami != 'GPAC-GUI-Extension') continue;
-      if ( (typeof extension.requires_gl == 'boolean') && extension.requires_gl && !gwskin.has_opengl) continue;
-
-      extension.path = 'extensions/' + list[i].name + '/';
-      extension.jsobj = null;
-
-      gwlog(l_deb, 'Loading UI extension ' + extension.name + ' ' + ' icon ' + extension.path + extension.icon + ' Author ' + extension.author);
-
-      if (extension.name == 'Player') {
-          all_extensions.unshift(extension);
-      } else {
-          all_extensions.push(extension);
-      }
-    }
-
-    for (i = 0; i < all_extensions.length; i++) {
-      var extension = all_extensions[i];
-
-      extension.icon = insert_dock_icon(extension.name, extension.path + extension.icon);
-      extension.icon.ext_description = extension;
-      extension.icon.on_close = function () {
-        this.ext_description.icon = null;
-        this.ext_description = null;
-      }
-      extension.icon.on_click = function () {
-          var extension = this.ext_description;
-          if (!extension.jsobj) {
-              for (var i = 0; i < extension.execjs.length; i++) {
-                  gwlog(l_deb, 'Loading UI extension ' + extension.name + ' - Executing JS ' + extension.path + extension.execjs[i]);
-                  if (!i) {
-                      extension.jsobj = Browser.loadScript(extension.path + extension.execjs[i]);
-                      extension.compatible = (extension.jsobj != null) ? true : false;
-                      if (!extension.compatible) break;
-
-                      setup_extension_storage(extension);
-                  } else {
-                      Browser.loadScript(extension.path + extension.execjs[i]);
-                  }
-              }
-
-          }
-          if (!extension.compatible) {
-              var w = gw_new_message(null, 'Error', 'Extension ' + extension.name + ' is not compatible');
-              w.show();
-              alert('Error');
-              this.parent.disable();
-              return;
-          }
-
-          if (extension.jsobj && (typeof extension.jsobj.start != 'undefined')) extension.jsobj.start();
-      } 
-    }
-    
-    dock.set_size(gw_display_width, gw_display_height);
-    dock.show();
-
-    //launch all default ext
-    for (i=0; i<all_extensions.length; i++) {
-      if ((typeof all_extensions[i].icon.ext_description.autostart != 'undefined')
-            && (all_extensions[i].icon.ext_description.autostart)) {
-         
-        gwlog(l_deb, 'Auto start extension ' + all_extensions[i].icon.ext_description.name);
-        all_extensions[i].icon.on_click();
-      }
-    }
-
-  //let's do the layout   
-    layout();
-}
-
-//performs layout on all contents
-function layout() 
-{
-    gwlib_notify_display_size(gw_display_width, gw_display_height);
-}
-
-//resize event callback
-function on_resize(evt) {
-    if ((gw_display_width == evt.width) && (gw_display_height == evt.height)) return;
-    if (evt.width <=100) {
-        gpac.set_size(100, gw_display_height);
-        return;
-    }
-    if (evt.height <=80) {
-        gpac.set_size(gw_display_width, 40);
-        return;
-    }
-
-    gw_display_width = evt.width;
-    gw_display_height = evt.height;
-    if (!gpac.fullscreen) {
-        gpac.set_option('General', 'LastWidth', '' + gw_display_width);
-        gpac.set_option('General', 'LastHeight', '' + gw_display_height);
-    }
-/*
-    var v = 12;
-    if (gw_display_height<160) {
-    }
-    else if (gw_display_height<576) {
-        v = 24;
-    }
-    else if (gw_display_height<720) {
-        v = 32;
-    }
-    else {
-        v = 48;
-    }
-    gwskin_set_default_control_height(v*2);
-    gwskin_set_default_icon_height(v);
-    gwlib_refresh_layout();
-    
-*/
-
-    layout();
-}
-

gpac-0.8.0.tar.gz/gui/gui_old.bt Deleted

@@ -1,42 +0,0 @@
-#######################################################################################
-# Hardcoded PROTO node which displays object without taking into account user transforms
-#######################################################################################
-EXTERNPROTO Untransform [
-    exposedField MFNode children []
-]
-[ "urn:inet:gpac:builtin:Untransform"]
-
-
-
-#######################################################################################
-# Main Scene
-#######################################################################################
-
-DEF GPAC_UI OrderedGroup {
- children [
-  Background2D { backColor 1 1 1}
-
-  DEF MovieControl MediaControl {}
-  DEF MovieSensor MediaSensor {}
-  DEF Movie Transform2D {
-   children [
-      Inline { url ""}
-   ] 
-  }
-
-  DEF UI_ROOT Untransform {
-   children [
-   ]
-  }
-    
-  DEF GUIScript Script {
-   field SFNode root USE GPAC_UI
-   field SFNode ui_root USE UI_ROOT
-   field SFNode movie USE Movie
-   field SFNode movie_ctrl USE MovieControl
-   field SFNode movie_sensor USE MovieSensor
-   
-   url "gui_old.js"
-  }
- ]
-}

gpac-0.8.0.tar.gz/gui/gui_old.js Deleted

@@ -1,2104 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:
-//					Jean Le Feuvre, Telecom ParisTech
-//                  Jean-Claude Dufourd, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-UPnP_Enabled = false;
-
-
-function new_extension()
-{
-	var obj = new Object();
-	obj.type = 'extension';
-	return obj;
-}
-
-function on_movie_duration(value)
-{
-	UPnP.MovieDuration = value;
-}
-
-function on_movie_time(value)
-{
-	UPnP.MovieTime = value;
-	current_time = value;
-}
-
-//function filter_event(evt)
-//{
-// alert('event');
-//}
-
-//Initialize the main UI script
-function initialize() {
-	//var icon;
-	var i, count, wid;
-
-	gpac.caption = 'Osmo4';
-	current_time = 0;
-
-	display_width = parseInt(gpac.get_option('General', 'LastWidth'));
-	display_height = parseInt(gpac.get_option('General', 'LastHeight'));
-
-	if (!gpac.fullscreen && display_width && display_height) {
-		gpac.set_size(display_width, display_height);
-	} else {
-		display_width = gpac.get_screen_width();
-		display_height = gpac.get_screen_height();
-	}
-
-	//request event listeners on the window - GPAC specific BIFS extensions !!!
-	root.addEventListener('resize', on_resize, 0);
-	root.addEventListener('zoom', on_zoom, 0);
-	root.addEventListener('scroll', on_scroll, 0);
-
-	Browser.addRoute(movie_sensor, 'mediaDuration', movie_sensor, on_movie_duration);
-	Browser.addRoute(movie_sensor, 'mediaCurrentTime', movie_sensor, on_movie_time);
-	//    gpac.set_event_filter(filter_event);
-
-	widget_default_size = 200;
-	scene_width = 0;
-
-	icon_size = 48;
-	dock_height = 48;
-	info_height = 32;
-	toggle_bar_height = 16;
-	screen_dpi = gpac.get_horizontal_dpi();
-
-	widget_remote_candidate = null;
-	controlled_renderer = null;
-	UPnP_Enabled = eval("(typeof(UPnP) != 'undefined');");
-	if (UPnP_Enabled) {
-		UPnP.onMediaRendererAdd = onMediaRendererAdd;
-		UPnP.onMediaConnect = onMediaConnect;
-		UPnP.onMediaStop = onMediaStop;
-		UPnP.onMediaPause = onMediaPause;
-		UPnP.onMediaPlay = onMediaPlay;
-		UPnP.onMediaSeek = OnMediaSeek;
-		UPnP.onMigrate = OnMediaMigrate;
-		UPnP.BindRenderer();
-		upnp_renders = null;
-		UPnP.MovieURL = '';
-		UPnP.MovieDuration = 0.0;
-		UPnP.MovieTime = 0.0;
-	}
-
-	/*setup dock*/
-	widget_ui_visible = false;
-
-	/*widget subtree*/
-	widget_display = new SFNode('Transform2D');
-	ui_root.children[0] = widget_display;
-
-	/*widget manager page*/
-	widget_ui = new SFNode('Layer2D');
-	ui_root.children[1] = widget_ui;
-
-	/*all other UI elements subtree*/
-	dlg_display = new SFNode('Transform2D');
-	ui_root.children[2] = dlg_display;
-
-	infobar = text_label('', 'MIDDLE');
-	ui_root.children[3] = infobar;
-
-	/*our dock*/
-	dock = new SFNode('Transform2D');
-	ui_root.children[4] = dock;
-
-
-	nb_widgets_on_screen = 0;
-	first_visible_widget = 0;
-	setup_icons();
-
-	/*init the widget manager*/
-	Browser.loadScript('mpegu-core.js', true);
-	log_level = l_inf;
-	widget_manager_init();
-
-	if (typeof(WidgetManager) != 'undefined') {
-		WidgetManager.on_widget_remove = widget_remove;
-		WidgetManager.on_widget_add = widget_insert;
-		WidgetManager.coreOutSetSize = widget_request_size;
-		WidgetManager.coreOutShow = widget_request_show;
-		WidgetManager.coreOutHide = widget_request_hide;
-		WidgetManager.coreOutRequestActivate = widget_request_activate;
-		WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
-		WidgetManager.coreOutShowNotification = widget_request_notification;
-		WidgetManager.coreOutPlaceComponent = widget_place_component;
-		WidgetManager.coreOutGetAttention = widget_request_attention;
-
-		WidgetManager.coreOutInstallWidget = widget_request_install;
-		WidgetManager.coreOutMigrateComponent = widget_migrate_component;
-		WidgetManager.coreOutRequestMigrationTargets = widget_migration_targets;
-		WidgetManager.coreOutActivateTemporaryWidget = widget_activate_temporary_widget;
-
-		/*restore our widgets*/
-		widgets_init();
-	}
-
- /*extensions are no longer usable with old GUI as we changed the gwlib interfaces*/
-	/*init all extensions*/
-/*
-	var list = gpac.enum_directory('extensions', '*', 0);
-	for (i=0; i<list.length; i++) {
-		if (list[i].directory) {
-			var extension = new_extension();
-			extension.path = gpac.current_path + 'extensions/' + list[i].name+'/';
-			log(l_inf, 'Loading UI extension '+list[i].name);
-			Browser.loadScript('extensions/'+list[i].name+'/init.js', true);
-			setup_extension(extension);
-
-			if (extension.icon && extension.launch) {
-				var icon = icon_button(extension.path+extension.icon, extension.label, 0);
-				icon.extension = extension;
-				icon.button_click = function () { this.extension.launch(this.extension); }
-				dock.children[dock.children.length] = icon;
-			}
-		}
-	}
-*/
-	current_url = '';
-	//let's do the layout
-	layout();
-
-	//    set_movie_url("rtsp://localhost/video.mp4", 1, 0);
-}
-
-
-function gpacui_add_icon(icon_url, label, callback)
-{
-	var icon = icon_button(icon_url, label, 0);
-	icon.button_click = callback;
-	dock.children[dock.children.length] = icon;
-}
-
-function gpacui_show_window(obj)
-{
-	dlg_display.addChildren[0] = obj;
-	layout();
-}
-function gpacui_hide_window(obj)
-{
-	dlg_display.removeChildren[0] = obj;
-	layout();
-}
-
-
-
-function set_movie_url(url, set_local, set_remote)
-{
-	if (set_remote && (controlled_renderer==null) ) set_local = true;
-	if (set_local) {
-		movie.children[0].url[0] = url;
-		movie_ctrl.url[0] = url;
-		movie_sensor.url[0] = url;
-		if (UPnP_Enabled) UPnP.MovieURL = url;
-	}
-	if (set_remote && (controlled_renderer!=null) ) {
-		var uri = UPnP.ShareResource(url);
-		controlled_renderer.Open(uri);
-	}
-	current_url = url;
-}
-
-
-function new_timeout(time)
-{
-	var obj = new SFNode('TimeSensor');
-
-	obj.cycleInterval = time;
-	obj.start = function(when) {
-		var t = this.getTime();
-		this.startTime = when + this.getTime();
-	}
-	obj.stop = function(when) {
-		this.stopTime = when + this.getTime();
-	}
-	obj.on_event = null;
-	obj.event = function(val) {
-		if (this.on_event) this.on_event(val);
-	}
-	Browser.addRoute(obj, 'fraction_changed', obj, obj.event);
-	return obj;
-}
-
-function rectangle()
-{
-	var obj = new SFNode('Shape');
-
-	obj.appearance = new SFNode('Appearance');
-	obj.appearance.material = new SFNode('Material2D');
-	obj.appearance.material.filled = TRUE;
-	obj.appearance.material.emissiveColor = new SFColor(0.7, 0.7, 0.8);
-	obj.appearance.material.lineProps = new SFNode('LineProperties');
-	obj.appearance.material.lineProps.width = 2;
-	obj.appearance.material.lineProps.lineColor = new SFColor(0, 0, 0);
-
-	obj.geometry = new SFNode('Curve2D');
-	obj.geometry.point = new SFNode('Coordinate2D');
-	temp = obj.geometry.type;
-	temp[0] = 7;
-	temp[1] = 1;
-	temp[2] = 7;
-	temp[3] = 1;
-	temp[4] = 7;
-	temp[5] = 1;
-	temp[6] = 7;
-	temp[7] = 6;/*close*/
-
-	obj.set_size = function(w, h) {
-		var hw, hh, rx, ry;
-		var temp;
-		hw = w/2;
-		hh = h/2;
-
-		/*compute default rx/ry*/
-		ry = rx = 10;
-		if ( (2*rx>=hw) || (2*ry>=hh)) rx = ry = 6;
-
-		temp = this.geometry.point.point;
-		temp[0] = new SFVec2f(hw-rx, hh);
-		temp[1] = new SFVec2f(hw, hh);/*bezier ctrl point*/
-		temp[2] = new SFVec2f(hw, hh-ry);
-		temp[3] = new SFVec2f(hw, -hh+ry);
-		temp[4] = new SFVec2f(hw, -hh);/*bezier control point*/
-		temp[5] = new SFVec2f(hw-rx, -hh);
-		temp[6] = new SFVec2f(-hw+rx, -hh);
-		temp[7] = new SFVec2f(-hw, -hh);/*bezier control point*/
-		temp[8] = new SFVec2f(-hw, -hh+ry);
-		temp[9] = new SFVec2f(-hw, hh-ry);
-		temp[10] = new SFVec2f(-hw, hh);/*bezier control point*/
-		temp[11] = new SFVec2f(-hw+rx, hh);
-	}
-	obj.set_color = function(r, g, b) {
-		this.appearance.material.emissiveColor.r = r;
-		this.appearance.material.emissiveColor.g = g;
-		this.appearance.material.emissiveColor.b = b;
-	}
-	return obj;
-}
-
-function icon_button(url, label, no_back)
-{
-	var obj = new SFNode('Transform2D');
-	obj.visible = true;
-	obj.children[0] = new SFNode('Transform2D');
-	obj.children[0].scale.x = 0;
-	obj.children[0].children[0] = rectangle();
-
-	obj.children[1] = new SFNode('Layer2D');
-	obj.children[1].size.x = icon_size;
-	obj.children[1].size.y = icon_size;
-	obj.children[1].children[0] = new SFNode('Inline');
-	obj.children[1].children[0].url[0] = url;
-
-	obj.touch = new SFNode('TouchSensor');
-	obj.children[1].children[1] = obj.touch;
-	obj.button_click = NULL;
-	obj.down = false;
-	obj.over = false;
-	obj.on_active = function(value) {
-		if (value) {
-			this.down = true;
-		} else {
-			if (this.down && this.over && this.button_click) this.button_click();
-			this.down = false;
-		}
-	};
-	obj.button_over = on_icon_over;
-	obj.on_over = function(value) {
-		this.over = value;
-		if (!no_back)
-			this.children[0].scale.x = value ? 1 : 0;
-		if (this.button_over) this.button_over(value);
-	};
-	Browser.addRoute(obj.touch, 'isOver', obj, obj.on_over);
-	Browser.addRoute(obj.touch, 'isActive', obj, obj.on_active);
-	obj.label = label;
-	obj.hide = function() { this.scale.x = this.scale.y = 0; this.visible = false; };
-	obj.show = function() { this.scale.x = this.scale.y = 1; this.visible = true; };
-	obj.set_size = function(x, y) {
-		this.children[0].children[0].set_size(x, y);
-		this.children[1].size.x = x;
-		this.children[1].size.y = y;
-	};
-	return obj;
-}
-
-function text_label(label, justify)
-{
-	var obj = new SFNode('Transform2D');
-	obj.children[0] = new SFNode('Shape');
-	obj.children[0].appearance = new SFNode('Appearance');
-	obj.children[0].appearance.material = new SFNode('Material2D');
-	obj.children[0].appearance.material.filled = TRUE;
-	obj.children[0].appearance.material.emissiveColor = new SFColor(0, 0, 0);
-	obj.children[0].geometry = new SFNode('Text');
-	obj.children[0].geometry.string[0] = label;
-	obj.children[0].geometry.fontStyle = new SFNode('FontStyle');
-	obj.children[0].geometry.fontStyle.justify[0] = justify;
-	obj.children[0].geometry.fontStyle.justify[1] = 'MIDDLE';
-	obj.children[0].geometry.fontStyle.size = 20;
-	obj.set_label = function(value) {
-		this.children[0].geometry.string[0] = value;
-	}
-	return obj;
-}
-
-
-function text_rect(label)
-{
-	var obj = new SFNode('Transform2D');
-	obj.children[0] = rectangle();
-	obj.children[0].set_color(0.7, 0.7, 0.8);
-
-	obj.children[1] = new SFNode('Shape');
-	obj.children[1].appearance = new SFNode('Appearance');
-	obj.children[1].appearance.material = new SFNode('Material2D');
-	obj.children[1].appearance.material.filled = TRUE;
-	obj.children[1].appearance.material.emissiveColor = new SFColor(0, 0, 0);
-	obj.children[1].geometry = new SFNode('Text');
-	obj.children[1].geometry.string[0] = label;
-	obj.children[1].geometry.fontStyle = new SFNode('FontStyle');
-	obj.children[1].geometry.fontStyle.justify[0] = 'MIDDLE';
-	obj.children[1].geometry.fontStyle.justify[1] = 'MIDDLE';
-	obj.children[1].geometry.fontStyle.size = 20;
-	obj.children[2] = new SFNode('TouchSensor');
-
-	obj.set_size = function(w, h) {
-		this.children[0].set_size(w, h);
-	};
-
-
-	obj.over = false;
-	obj.on_over = function(value) {
-		this.children[0].set_color(0.7, value ? 0.5 : 0.7, 0.8);
-		this.over = value;
-	};
-	Browser.addRoute(obj.children[2], 'isOver', obj, obj.on_over);
-
-	obj.down = false;
-	obj.button_click = null;
-	obj.on_active = function(value) {
-		if (value) {
-			this.down = true;
-		} else {
-			if (this.down && this.over && this.button_click) this.button_click();
-			this.down = false;
-		}
-	};
-	Browser.addRoute(obj.children[2], 'isActive', obj, obj.on_active);
-
-	return obj;
-}
-
-function new_slider(vertical)
-{
-	var obj = new SFNode('Transform2D');
-	obj.children[0] = new SFNode('Shape');
-	obj.children[0].appearance = new SFNode('Appearance');
-	obj.children[0].appearance.material = new SFNode('Material2D');
-	obj.children[0].appearance.material.filled = TRUE;
-	obj.children[0].appearance.texture = new SFNode('LinearGradient');
-	obj.children[0].appearance.texture.endPoint.x = vertical ? 1 : 0;
-	obj.children[0].appearance.texture.endPoint.y = vertical ? 0 : 1;
-	obj.children[0].appearance.texture.key[0] = 0;
-	obj.children[0].appearance.texture.key[1] = 0.5;
-	obj.children[0].appearance.texture.key[2] = 1;
-	obj.children[0].appearance.texture.keyValue[0] = new SFColor(0.4, 0.4, 0.6);
-	obj.children[0].appearance.texture.keyValue[1] = new SFColor(0.4, 0.4, 1);
-	obj.children[0].appearance.texture.keyValue[2] = new SFColor(0.4, 0.4, 0.6);
-	obj.children[0].geometry = new SFNode('Rectangle');
-
-	obj.children[1] = new SFNode('Transform2D');
-	obj.children[1].children[0] = new SFNode('Shape');
-	obj.children[1].children[0].appearance = new SFNode('Appearance');
-	obj.children[1].children[0].appearance.material = new SFNode('Material2D');
-	obj.children[1].children[0].appearance.material.filled = TRUE;
-	obj.children[1].children[0].appearance.material.emissiveColor = new SFColor(0, 0, 1);
-	obj.children[1].children[0].geometry = new SFNode('Circle');
-
-	obj.on_slide = function(value) { }
-	obj.children[2] = new SFNode('PlaneSensor2D');
-	obj.set_translation = function(value) {
-		this.frac = 0.5 + (vertical ? value.y/this.height : value.x/this.width);
-		this.children[1].translation = value;
-		this.on_slide(this.min + (this.max-this.min) * this.frac);
-	}
-	Browser.addRoute(obj.children[2], 'translation_changed', obj, obj.set_translation);
-
-
-	obj.set_value = function(value) {
-		value -= this.min;
-		if (value<0) value = 0;
-		else if (value>this.max-this.min) value = this.max-this.min;
-		if (this.max==this.min) value = 0;
-		else value /= (this.max-this.min);
-
-		value -= 0.5;
-		value *= (vertical ? this.height : this.width);
-
-		if (vertical) {
-			this.children[1].translation.y = value;
-			this.children[2].offset.y = value;
-		} else {
-			this.children[1].translation.x = value;
-			this.children[2].offset.x = value;
-		}
-	}
-
-	obj.radius = 10;
-	obj.vertical = vertical;
-	obj.set_size = function(w, h) {
-		var rad;
-		this.children[0].geometry.size.x = w;
-		this.children[0].geometry.size.y = h;
-		rad = vertical ? w : h;
-		rad/=1.33;
-		this.children[1].children[0].geometry.radius = rad;
-		this.children[2].maxPosition.x = this.vertical ? 0 : w/2;
-		this.children[2].maxPosition.y = this.vertical ? h/2 : 0;
-		this.children[2].minPosition.x = this.vertical ? 0 : -w/2;
-		this.children[2].minPosition.y = this.vertical ? -h/2 : 0;
-		this.width = w;
-		this.height = h;
-	}
-	obj.min = 0;
-	obj.max = 100;
-
-	obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
-	return obj;
-}
-
-function new_radio_button(label)
-{
-	var obj = new SFNode('Transform2D');
-	obj.children[0] = new SFNode('Shape');
-	obj.children[0].appearance = new SFNode('Appearance');
-	obj.children[0].appearance.material = new SFNode('Material2D');
-	obj.children[0].appearance.material.filled = TRUE;
-	obj.children[0].appearance.material.emissiveColor = new SFColor(1, 1, 1);
-	obj.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-	obj.children[0].appearance.material.lineProps.lineColor = new SFColor(0, 0, 0);
-	obj.children[0].appearance.material.lineProps.width = 1;
-	obj.children[0].geometry = new SFNode('Circle');
-
-	obj.children[1] = new SFNode('Shape');
-	obj.children[1].appearance = new SFNode('Appearance');
-	obj.children[1].appearance.material = new SFNode('Material2D');
-	obj.children[1].appearance.material.filled = TRUE;
-	obj.children[1].appearance.material.emissiveColor = new SFColor(0, 0, 0);
-	obj.children[1].appearance.material.transparency = 1;
-	obj.children[1].geometry = new SFNode('Circle');
-
-	obj.children[2] = text_label(label, 'BEGIN');
-
-	obj.children[3] = new SFNode ('TouchSensor');
-
-	obj.on = false;
-	obj.on_select = function(value) {}
-	obj.on_active = function(value) {
-		if (!value) return;
-		this.on = !this.on;
-		this.children[1].appearance.material.transparency = this.on ? 0 : 1;
-		this.on_select(this.on);
-	}
-	Browser.addRoute(obj.children[3], 'isActive', obj, obj.on_active);
-
-	obj.enable = function(value) {
-		this.on = value;
-		this.children[1].appearance.material.transparency = this.on ? 0 : 1;
-	}
-
-	obj.set_width = function(w, h) {
-		var rad = w<h ? w : h;
-		rad /= 2;
-		this.children[0].geometry.radius = rad;
-		this.children[1].geometry.radius = rad/2;
-		this.children[2].translation.x = 2*rad;
-	}
-	obj.set_width(100, 10);
-	return obj;
-}
-
-function new_widget_control(widget)
-{
-	var obj = new SFNode('Transform2D');
-
-	obj.children[0] = new SFNode('Transform2D');
-
-	obj.children[0].children[0] = rectangle();
-
-	obj.children[0].children[1] = new SFNode('TouchSensor');
-
-	obj.widget = widget;
-	obj.component_bound=false;
-	obj.show_ctrl = true;
-	obj.onClick = function(value) {
-		if (!value) return;
-		this.show_ctrl = !this.show_ctrl;
-		if (this.show_ctrl) {
-			var i, comps, idx;
-			this.children[0].children[0].appearance.material.transparency = 0;
-			this.children[1].scale.x = 1;
-			this.children[3].scale.x = 1;
-
-			for (i=0; i<widget_display.children.length; i++) {
-				if (widget_display.children[i]==this) continue;
-				if (widget_display.children[i].show_ctrl) {
-					widget_display.children[i].onClick(true);
-				}
-			}
-			//widget is a component, do not push on top but hide some controls
-			if (this.widget.is_component) {
-				if (this.component_bound) {
-					this.children[1].children[0].hide(); //close
-					this.children[1].children[1].hide(); //remove
-					this.children[1].children[4].hide(); //resize
-				}
-				return;
-			}
-			//otherwise push widget on top
-			idx=0;
-			widget_display.removeChildren[idx++] = this;
-			widget_display.addChildren[idx++] = this;
-			//and push components
-			comps = this.widget.components;
-			for (i=0; i<comps.length; i++) {
-				if (comps[i].widget_control && comps[i].widget_control.component_bound) {
-					widget_display.removeChildren[idx++] = comps[i].widget_control;
-					widget_display.addChildren[idx++] = comps[i].widget_control;
-				}
-			}
-
-		} else {
-			this.children[0].children[0].appearance.material.transparency = 1;
-			this.children[1].scale.x = 0;
-			this.children[3].scale.x = 0;
-		}
-	}
-	Browser.addRoute(obj.children[0].children[1], 'isActive', obj, obj.onClick);
-
-	obj.children[1] = new SFNode('Transform2D');
-	obj.children[1].children[0] = icon_button('icons/process-stop.svg', 'Close', 0);
-	obj.children[1].children[0].widget = widget;
-	obj.children[1].children[0].button_click = function() {
-		if (this.widget.discardable) widget_remove(this.widget);
-		else widget_close(this.widget, 0);
-	}
-
-	obj.children[1].children[1] = icon_button('icons/user-trash.svg', 'Uninstall', 0);
-	obj.children[1].children[1].widget = widget;
-	obj.children[1].children[1].button_click = function() { widget_remove(this.widget);  }
-
-	obj.children[1].children[2] = icon_button('icons/applications-internet.svg', 'Push to remote display', 0);
-	obj.children[1].children[2].widget = widget;
-	obj.children[1].children[2].button_click = function() {
-		if (UPnP_Enabled && UPnP.MediaRenderersCount) {
-			widget_remote_candidate = this.widget;
-			on_upnpopen(true, true);
-		}
-	}
-
-	obj.children[1].children[3] = icon_button('icons/dialog-information.svg', 'Widget Information', 0);
-	obj.children[1].children[3].widget = widget;
-	obj.children[1].children[3].button_click = function() {
-		display_widget_info(this.widget);
-	}
-
-	obj.children[1].children[4] = icon_button('icons/media-record.svg', 'Resize', 1);
-	obj.children[1].children[4].children[1].children[2] = new SFNode('PlaneSensor2D');
-	obj.children[1].children[4].children[1].children[2].maxPosition = new SFVec2f(-1, -1);
-
-	obj.prev_x=0;
-	obj.prev_y=0;
-	obj.onSize = function(value) {
-		if (this.widget.width + 2*(value.x - this.prev_x)<0) return;
-		if (this.widget.height + 2*(this.prev_y-value.y)<0) return;
-
-		this.widget.width += 2*(value.x - this.prev_x);
-		this.prev_x = value.x;
-		this.widget.height += 2*(this.prev_y - value.y);
-		this.prev_y = value.y;
-		this.set_size(this.widget.width, this.widget.height);
-	}
-	Browser.addRoute(obj.children[1].children[4].children[1].children[2], 'translation_changed', obj, obj.onSize);
-
-	obj.children[2] = new SFNode('Layer2D');
-	obj.inline = new SFNode('Inline');
-	obj.children[2].children[0] = obj.inline;
-
-
-	obj.children[3] = new SFNode('Transform2D');
-	obj.children[3].children[0] = new SFNode('Shape');
-	obj.children[3].children[0].appearance = new SFNode('Appearance');
-	obj.children[3].children[0].appearance.material = new SFNode('Material2D');
-	obj.children[3].children[0].appearance.material.filled = TRUE;
-	obj.children[3].children[0].appearance.material.transparency = 0.5;
-	obj.children[3].children[0].appearance.material.emissiveColor = new SFColor(0.6, 0.6, 0.6);
-	obj.children[3].children[0].geometry = new SFNode('Rectangle');
-	obj.children[3].children[0].geometry.size = new SFVec2f(50, 50);
-	obj.children[3].children[1] = new SFNode('PlaneSensor2D');
-	obj.children[3].children[1].maxPosition = new SFVec2f(-1, -1);
-	obj.children[3].children[1].offset = new SFVec2f(widget.x, widget.y);
-	obj.onMove = function(value) {
-		if (this.maximized) return;
-		this.translation = value;
-		this.widget.x = value.x;
-		this.widget.y = value.y;
-		this.refresh_layout(false, null);
-	}
-	Browser.addRoute(obj.children[3].children[1], 'translation_changed', obj, obj.onMove);
-
-	obj.children[3].children[2] = new SFNode('TouchSensor');
-	obj.last_ts = 0;
-	obj.onMaximize = function(value, timestamp) {
-		if (!value) return;
-		if (timestamp - this.last_ts < 0.5) {
-			if (this.maximized) {
-				this.maximized = false;
-				this.translation.x = this.widget.x;
-				this.translation.y = this.widget.y;
-				this.set_size(this.prev_width, this.prev_height);
-			} else {
-				this.maximized = true;
-				this.prev_width = this.widget.width;
-				this.prev_height = this.widget.height;
-				this.translation.x = 0;
-				this.translation.y = -info_height;
-				this.set_size(display_width, display_height - 2*info_height);
-			}
-		}
-		this.last_ts = timestamp;
-	}
-	Browser.addRoute(obj.children[3].children[2], 'isActive', obj, obj.onMaximize);
-
-	obj.set_size = function(w, h) {
-		var i, x, s;
-		s = 24;
-		this.children[2].size.x = w;
-		this.children[2].size.y = h;
-
-		this.children[1].children[0].translation.y = this.children[1].children[1].translation.y = this.children[1].children[2].translation.y = this.children[1].children[3].translation.y = this.children[1].children[4].translation.y = h/2 + s/2;
-
-		this.children[0].children[0].set_size(w+s, h+s);
-		this.children[3].children[0].geometry.size.x = w;
-		this.children[3].children[0].geometry.size.y = h;
-
-		this.children[1].children[0].set_size(s, s);
-		this.children[1].children[1].set_size(s, s);
-		this.children[1].children[2].set_size(s, s);
-		this.children[1].children[3].set_size(s, s);
-		this.children[1].children[4].set_size(s, s);
-		this.children[1].children[0].translation.x = -w/2;
-		this.children[1].children[1].translation.x = -w/4;
-		this.children[1].children[2].translation.x = 0;
-		this.children[1].children[3].translation.x = w/4;
-		this.children[1].children[4].translation.x = w/2;
-
-		//set widget input params
-		widget.width = w;
-		widget.height = h;
-		widget.set_input('width', w);
-		widget.set_input('height', h);
-		this.refresh_layout(true, null);
-		//call core:in
-		WidgetManager.corein_message(widget, 'setSize', 'width', w, 'height', w, 'dpi', screen_dpi);
-	}
-	obj.refresh_layout = function(send_resize, comp_target) {
-		var i;
-		var x, y, w, h, scale_x, scale_y;
-		var comps;
-
-		/*local to subscene transformation not known*/
-		if (!this.sub_w) return;
-		if (!this.sub_h) return;
-
-		comps = this.widget.components;
-		for (i=0; i<comps.length; i++) {
-			var comp = comps[i];
-			if (!comp.widget_control || !comp.widget_control.component_bound) continue;
-
-			//compute scale from Widget Manager coord system to widget internal coordinate system
-			scale_x = this.sub_vp_w / this.sub_w;
-			scale_y = this.sub_vp_h / this.sub_h;
-
-			w = comp.widget_control.place_w * scale_x;
-			h = comp.widget_control.place_h * scale_y;
-
-			x = this.translation.x - this.widget.width/2 + this.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
-			comp.widget_control.translation.x = x;
-
-			y = this.widget.height/2 + this.translation.y - h/2 - this.sub_vp_y - comp.widget_control.place_y * scale_y;
-			comp.widget_control.translation.y = y;
-
-			if (send_resize || (comp_target==comp))
-				comp.widget_control.set_size(w, h);
-		}
-	}
-
-	obj.hide = function() {
-		this.scale.x = 0;
-		WidgetManager.corein_message(this.widget, 'hide');
-	}
-	obj.show = function() {
-		this.scale.x = 1;
-		WidgetManager.corein_message(this.widget, 'show');
-	}
-
-	obj.show_remote = function () {
-		if (WidgetManager.upnp && UPnP.MediaRenderersCount) {
-			this.children[1].children[2].show();
-		} else {
-			this.children[1].children[2].hide();
-		}
-	}
-	obj.show_remove = function(show) {
-		if (show) this.children[1].children[1].show();
-		else this.children[1].children[1].hide();
-	}
-
-	obj.flash = function() {
-		var time = new_timeout(0.25);
-		time.loop = true;
-		time.ctrl = this;
-		time.on_event = function(val) {
-			var scale = (val<0.5) ? 1+val : 2-val;
-			this.ctrl.scale.x = this.ctrl.scale.y = scale;
-		}
-		time.stop(1);
-		time.start(0);
-	}
-	obj.maximized = false;
-	obj.show_remote();
-	obj.onClick(true);
-	return obj;
-}
-
-
-
-function on_icon_over(value)
-{
-	infobar.set_label(value ? this.label : '');
-}
-
-function display_widget_info(wid)
-{
-	var info_dlg = new SFNode('Transform2D');
-	var i, j, k, info;
-	var y, txt, pref;
-
-	infobar.set_label('Widget ' + wid.name + ' Information');
-
-	info = text_rect('Close');
-	info_dlg.children[0] = info;
-	info.button_click = function() {
-		dlg_display.children.length = 0;
-		widget_display.scale.x = 1;
-		infobar.set_label('');
-		layout();
-	}
-
-	info = text_rect('Widget Metadata');
-	info_dlg.children[info_dlg.children.length] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	info.children[i++] = text_label('id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'BEGIN');
-	info.children[i++] = text_label('version: '+wid.version, 'BEGIN');
-	info.children[i++] = text_label('content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'BEGIN');
-	info.children[i++] = text_label('default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'BEGIN');
-	info.children[i++] = text_label('license: '+wid.license, 'BEGIN');
-	info.children[i++] = text_label('license ref: '+wid.licenseHref, 'BEGIN');
-	info.children[i++] = text_label('description: '+wid.description, 'BEGIN');
-	info.children[i++] = text_label('author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'BEGIN');
-	info.children[i++] = text_label('author href: '+wid.authorHref, 'BEGIN');
-	info.children[i++] = text_label('view modes: '+wid.viewmodes, 'BEGIN');
-	info.children[i++] = text_label('UUID: '+wid.uuid, 'BEGIN');
-	info.children[i++] = text_label('Discardable: '+wid.discardable, 'BEGIN');
-	info.children[i++] = text_label('Muliple Instances: '+wid.discardable, 'BEGIN');
-	var icons = wid.icons;
-	for (j=0; j<icons.length; j++) {
-		info.children[i++] = text_label('icon #'+(j+1)+': ' + icons[j].src, 'BEGIN');
-	}
-
-	info = text_rect('Widget Manager Info');
-	info_dlg.children[info_dlg.children.length] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	info.children[i++] = text_label('nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'BEGIN' );
-	info.children[i++] = text_label('Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'BEGIN' );
-	if (wid.is_component) {
-		info.children[i++] = text_label('parent widget name' + wid.parent.name, 'BEGIN');
-	}
-	if (wid.originating_device_ip) {
-		info.children[i++] = text_label('Widget was pushed from device IP '+wid.originating_device_ip, 'BEGIN' );
-	}
-	info.children[i++] = text_label('Section name in GPAC config file: '+wid.section, 'BEGIN' );
-	info.children[i++] = text_label('UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'BEGIN');
-	info.children[i++] = text_label('widget src: ' + wid.url , 'BEGIN');
-	info.children[i++] = text_label('config src: ' + wid.manifest , 'BEGIN');
-	info.children[i++] = text_label('content src : '+wid.localizedSrc, 'BEGIN' );
-
-	pref = wid.features;
-	info = text_rect('Features (' + pref.length + ')' );
-	info_dlg.children[info_dlg.children.length] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	for (j=0; j<pref.length; j++) {
-		info.children[i++] = text_label('Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'BEGIN');
-	}
-
-
-	pref = wid.preferences;
-	info = text_rect('Preferences ('+pref.length+')');
-	info_dlg.children[info_dlg.children.length] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	for (j=0; j<pref.length; j++) {
-		var val = pref[j].value;
-		if (val == '') val = gpac.get_option(wid.section, pref[j].name);
-		info.children[i++] = text_label('Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'BEGIN');
-	}
-
-	info = text_rect('Migration Context', 'BEGIN');
-	info_dlg.children[info_dlg.children.length] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	txt=wid.get_context();
-	while (1) {
-		var idx = txt.indexOf('\n', 0);
-		if (idx>0) {
-			info.children[i++] = text_label(txt.substring(0, idx), 'BEGIN');
-			txt = txt.substring(idx+1, txt.length);
-		} else {
-			info.children[i++] = text_label(txt, 'BEGIN');
-			break;
-		}
-	}
-
-	info_dlg.ifce_idx = info_dlg.children.length;
-	info = text_rect('Interfaces (count: ' + wid.num_interfaces + ' - bound: ' + wid.num_bound_interfaces+')', 'BEGIN');
-	info_dlg.children[info_dlg.ifce_idx] = info;
-	info.visible = false;
-	info.button_click = function() {
-		this.visible = !this.visible;
-		layout();
-	}
-	i=3;
-	for (j=0; j<wid.num_interfaces; j++) {
-		var idx;
-		var ifce = wid.get_interface(j);
-		var item = text_rect('Interface #' + (j+1) + ' type: '+ifce.type);
-		info.children[i++] = item;
-		item.visible = false;
-		item.button_click = function() {
-			this.visible = !this.visible;
-			layout();
-		}
-		idx=3;
-		item.children[idx++] = text_label('Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'BEGIN');
-		for (k=0; k<ifce.num_messages; k++) {
-			var string, l;
-			var msg = ifce.get_message(k);
-			string = '  Message #'+ (k+1) + ':   ' + msg.name + '(';
-			for (l=0; l<msg.num_params; l++) {
-				par = msg.get_param(l);
-				string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
-			}
-			string += ')';
-			item.children[idx++] = text_label(string, 'BEGIN');
-		}
-	}
-
-	info_dlg.set_size = function(w, h) {
-		var i, j, y, dy;
-		y = h/2 - 20;
-
-		for (i=0; i<this.children.length; i++) {
-			var item = this.children[i];
-			item.translation.x = 0;
-			item.translation.y = y;
-			item.set_size(w, 20);
-			y -= 20;
-			if (!i) continue;
-
-			dy = 0;
-			for (j=3; j<item.children.length; j++) {
-				if (item.visible) {
-					item.children[j].scale.x = 1;
-					dy -= 20;
-					item.children[j].translation.y = dy;
-					if (i<this.ifce_idx) {
-						item.children[j].translation.x = -w/2+10;
-					} else {
-						item.children[j].set_size(w-20, 20);
-						var ddy=0;
-						var k, sitem;
-						sitem = item.children[j];
-						for (k=3; k<sitem.children.length; k++) {
-							if (item.children[j].visible) {
-								sitem.children[k].scale.x = 1;
-								sitem.children[k].translation.x = -w/2+10;
-								ddy -= 20;
-								sitem.children[k].translation.y = ddy;
-							} else {
-								sitem.children[k].scale.x = 0;
-							}
-						}
-						dy+=ddy;
-					}
-				} else {
-					item.children[j].scale.x = 0;
-				}
-			}
-			y += dy;
-		}
-	}
-
-	dlg_display.children[0] = info_dlg;
-	widget_display.scale.x = 0;
-	layout();
-}
-
-
-function widget_insert(widget)
-{
-	/*insert the widget icon*/
-	if (widget.permanent && !widget.is_component)
-		insert_widget_icon(widget, 0);
-
-	/*and load the widget - comment this line to disable auto load of widget*/
-	widget_launch(widget);
-}
-
-function setup_icons()
-{
-	var icon;
-
-	//File open
-	icon = icon_button('icons/applications-multimedia.svg', 'Open', 0);
-	icon.button_click = on_fileopen;
-	dock.children[dock.children.length] = icon;
-
-	//Widget Manager Icon
-	icon = icon_button('icons/applications-system.svg', 'Widgets', 0);
-	icon.button_click = function () {
-		widget_ui_visible = !widget_ui_visible;
-		layout();
-	}
-	dock.children[dock.children.length] = icon;
-
-	//Widgets add Icon
-	icon = icon_button('icons/list-add.svg', 'Add Widgets', 0);
-	icon.button_click = function () {
-		widget_browse();
-	}
-	widget_ui.children[widget_ui.children.length] = icon;
-
-	icon = icon_button('icons/user-trash.svg', 'Remove all widgets', 0);
-	icon.button_click = function () {
-		while (1) {
-			var wid = WidgetManager.get(0);
-			if (wid==null) break;
-			widget_close(wid, 1);
-		}
-		widget_ui.children.length = widget_ui.nb_tools;
-		layout();
-	}
-	widget_ui.children[widget_ui.children.length] = icon;
-
-	widget_ui.prev = icon_button('icons/go-previous.svg', 'Previous Widgets', 0);
-	widget_ui.prev.button_click = function () { widget_ui_layout(-1); };
-	widget_ui.children[widget_ui.children.length] = widget_ui.prev;
-
-	widget_ui.next = icon_button('icons/go-next.svg', 'Next Widgets', 0);
-	widget_ui.next.button_click = function () { widget_ui_layout(1); };
-	widget_ui.children[widget_ui.children.length] = widget_ui.next;
-
-	widget_ui.nb_tools = widget_ui.children.length;
-
-	//push to display
-	upnp_icon = null;
-	if (UPnP_Enabled) {
-		icon = icon_button('icons/video-display.svg', 'Select Display', 0);
-		icon.button_click = function () {
-			widget_remote_candidate = null;
-			on_upnpopen(false, false);
-		}
-		upnp_icon = icon;
-		upnp_icon.hide();
-		dock.children[dock.children.length] = icon;
-	}
-
-	//exit Icon
-	icon = icon_button('icons/emblem-unreadable.svg', 'Exit', 0);
-	icon.button_click = function() { gpac.exit(); };
-	dock.children[dock.children.length] = icon;
-}
-
-
-
-/*dock layout*/
-function dock_layout() {
-	var i;
-
-	dock.translation.y = (dock_height - display_height)/2;
-	infobar.translation.y = display_height/2 - info_height/2;
-
-	num_in_dock = dock.children.length;
-	tot_len = num_in_dock*icon_size;
-
-	if (tot_len>display_width) {
-		start_x = (icon_size-display_width)/2;
-	} else {
-		start_x = (icon_size-tot_len)/2;
-	}
-	/*translate / size all items in the dock*/
-	for (i=0;i<num_in_dock; i++) {
-		if (dock.children[i].visible) {
-			dock.children[i].set_size(icon_size, icon_size);
-			dock.children[i].translation.x = start_x;
-			start_x += icon_size;
-		}
-	}
-}
-
-function widget_ui_layout(dir)
-{
-	var count, i, height, start_x, start_y, spread_x, nb_wid_h, nb_wid_v, nb_wid;
-
-	if (!widget_ui_visible) {
-		widget_ui.size.x = 0;
-		widget_ui.size.y = 0;
-		return;
-	}
-
-	widget_ui.size.x = display_width;
-	widget_ui.size.y = display_height;
-
-	start_x = (icon_size-display_width)/2;
-	start_y = (display_height-icon_size/2)/2 - info_height;
-
-	for (i=0; i<widget_ui.nb_tools; i++) {
-		wid = widget_ui.children[i];
-		wid.set_size(icon_size/2, icon_size/2);
-		wid.translation.x = start_x;
-		wid.translation.y = start_y;
-		start_x += icon_size/2;
-	}
-	start_x = (icon_size-display_width)/2;
-	start_y -= icon_size;
-
-
-	count = widget_ui.children.length - widget_ui.nb_tools;
-	if (first_visible_widget<0) first_visible_widget=0;
-
-	for (i=0; i<count; i++) {
-		var wid = widget_ui.children[widget_ui.nb_tools+i];
-		wid.hide();
-	}
-
-	nb_wid_h = Math.floor(display_width / icon_size);
-	if (!nb_wid_h) nb_wid_h=1;
-
-	height = display_height-dock_height-icon_size-icon_size/2;
-	nb_wid_v = Math.floor(height / icon_size);
-	if (!nb_wid_v) nb_wid_v=1;
-
-	spread_x = (display_width / nb_wid_h) - icon_size;
-	start_x += spread_x/2;
-
-	nb_wid = (nb_wid_h*nb_wid_v);
-	if (dir<0) {
-		first_visible_widget -= nb_wid;
-		if (first_visible_widget < 0) {
-			first_visible_widget = 0;
-		}
-	}
-	else if (dir>0) {
-		first_visible_widget += nb_wid;
-	}
-
-	if (first_visible_widget) widget_ui.prev.show();
-	else widget_ui.prev.hide();
-
-	if (first_visible_widget+nb_wid < count) widget_ui.next.show();
-	else widget_ui.next.hide();
-
-	for (i=0; i<count; i++) {
-		var wid;
-		if (i+first_visible_widget >= count) {
-			break;
-		}
-		wid = widget_ui.children[i +first_visible_widget+widget_ui.nb_tools];
-		wid.show();
-		wid.set_size(icon_size, icon_size);
-		wid.translation.x = start_x;
-		wid.translation.y = start_y;
-		start_x += icon_size + spread_x;
-		if (start_x + icon_size / 2 >= display_width/2) {
-			start_x = (icon_size-display_width)/2 + spread_x/2;
-			start_y -= icon_size;
-		}
-		nb_widgets_on_screen = i+1;
-		if (start_y - icon_size < (dock_height-display_height)/2) {
-			i++;
-			break;
-		}
-	}
-}
-
-//performs layout on all contents
-function layout() {
-	var i, list, start_x;
-
-	gpac.set_option('General', 'LastWidth', ''+display_width);
-	gpac.set_option('General', 'LastHeight', '' + display_height);
-
-	if (dlg_display.children.length) {
-		widget_display.scale.x = 0;
-		widget_ui_visible = false;
-	}
-	//layout all icons in the dock
-	dock_layout();
-	widget_ui_layout(0);
-
-	if (dlg_display.children.length) {
-		list = dlg_display.children;
-		for (i=0; i<list.length; i++) {
-			var dlg = list[i];
-			if (typeof (dlg.set_size) != 'undefined') dlg.set_size(display_width, display_height-icon_size-info_height);
-			dlg.translation.y = (icon_size-info_height)/2;
-		}
-	}
-	else if (widget_ui_visible) {
-		widget_display.scale.x = 0;
-	} else {
-		widget_display.scale.x = 1;
-		list = widget_display.children;
-		for (i=0; i<list.length; i++) {
-			var widctrl = list[i];
-			if (widctrl.maximized) {
-				widctrl.translation.y = - info_height;
-				widctrl.set_size(display_width, display_height - 2*info_height);
-			}
-		}
-	}
-}
-
-//resize event callback
-function on_resize(evt) {
-	display_width = evt.width;
-	display_height = evt.height;
-	layout();
-}
-//zoom event callback
-function on_zoom(evt) {
-	display_width = evt.width;
-	display_height = evt.height;
-	layout();
-}
-//scroll event callback
-function on_scroll(evt) {
-	layout();
-}
-
-//starts a widget
-function on_widget_launch() {
-	if (this.widget.visible) {
-		var awid;
-		if (!this.widget.multipleInstances) return;
-		awid = WidgetManager.open(this.widget.manifest, null);
-		widget_launch(awid);
-	} else {
-		widget_launch(this.widget);
-	}
-}
-
-function widget_get_icon(widget)
-{
-	var icon = 'icons/image-missing.svg';
-	var preferredIconType = '.svg';
-
-	for (var i = 0; i < widget.icons.length; i++) {
-		icon = widget.icons[i].relocated_src;
-		if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
-			break;
-		}
-	}
-	return icon;
-}
-
-//initialize GPAC widget manager and load all widgets
-function widgets_init() {
-
-	count = WidgetManager.num_widgets;
-	for (i=0; i<count; i++) {
-		wid = WidgetManager.get(i);
-		if (wid == null) continue;
-		wid.device = null;
-		wid.device_ip = null;
-		if (wid.in_panel == true) {
-			icon = icon_button(widget_get_icon(wid), wid.name, 0);
-			icon.tooltip = wid.name;
-			icon.widget = wid;
-			icon.button_click = on_widget_launch;
-
-			wid.icon_dock = icon;
-			widget_ui.children[widget_ui.children.length] = wid.icon_dock;
-		}
-		if (wid.visible) {
-			widget_launch(wid);
-		}
-	}
-}
-
-function on_widget_size(value) {
-	//remember variables
-	this.width = value.x;
-	this.height = value.y;
-	//and set widget input params
-	this.set_input('width', value.x);
-	this.set_input('height', value.y);
-}
-
-function on_widget_move(value) {
-	this.x = value.x;
-	this.y = value.y;
-}
-
-//widget close function
-function widget_close(widget, force_remove)
-{
-	var is_comp = widget.is_component;
-	alert('closing widget '+widget.name + ' visible '+widget.visible);
-	if (widget.visible) {
-		widget.visible = false;
-		WidgetManager.corein_message(widget, 'hide');
-		WidgetManager.corein_message(widget, 'deactivate');
-		widget.deactivate();
-		/*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
-		if (widget.widget_control) {
-			widget.widget_control.inline.url[0] = "";
-			widget.widget_control.inline.url.length = 0;
-			widget.scene_container.removeChildren[0] = widget.widget_control;
-			alert('new url '+widget.widget_control.inline.url);
-		}
-	}
-	if (!is_comp && (!widget.permanent || force_remove)) {
-		WidgetManager.unload(widget, force_remove ? true : false);
-	}
-	alert('widget closed');
-}
-
-function on_widget_close(value) {
-	widget_close(this, 0);
-}
-
-//widget remove function (close and unregister)
-function widget_remove(wid) {
-	if (typeof(wid.icon_dock) != 'undefined')
-		widget_ui.removeChildren[0] = wid.icon_dock;
-	widget_close(wid, 0);
-	layout();
-}
-
-function on_widget_control(value)
-{
-	var i, count;
-	if (!value) return;
-	count = this.scene_container.children.length;
-	for (i=0; i<count; i++) {
-		if (this.scene_container.children[i] == this.widget_control) {
-			this.scene_container.removeChildren[0] = this.widget_control;
-			this.scene_container.children[this.scene_container.children.length] = this.widget_control;
-			return;
-		}
-	}
-}
-
-//widget launcher function
-function widget_launch(wid) {
-	var widg_ctrl;
-
-	//assign default size to the widget
-	if (wid.width == undefined) {
-		wid.width = wid.defaultWidth;
-		if (wid.width == 0) wid.width = widget_default_size;
-	}
-	if (wid.height == undefined) {
-		wid.height = wid.defaultHeight;
-		if (wid.height == 0) wid.height = widget_default_size;
-	}
-	if (wid.x== undefined) wid.x = 0;
-	if (wid.y== undefined) wid.y = 0;
-
-	widg_ctrl = new_widget_control(wid);
-	widg_ctrl.component_bound = false;
-
-	wid.visible = true;
-
-	widg_ctrl.set_size(wid.width, wid.height);
-	widg_ctrl.translation.x = wid.x;
-	widg_ctrl.translation.y = wid.y;
-
-	wid.widget_control = widg_ctrl;
-	wid.scene_container = widget_display;
-
-	widg_ctrl.show_remove( (!wid.discardable && wid.icon_dock) ? 1 : 0);
-
-	widg_ctrl.sub_width = 0;
-	widg_ctrl.sub_height = 0;
-	widg_ctrl.sub_x = 0;
-	widg_ctrl.sub_y = 0;
-	widg_ctrl.sub_vp_w = 0;
-	widg_ctrl.sub_vp_h = 0;
-
-	widg_ctrl.inline.addEventListener('gpac_vp_changed',
-		function(evt) {
-			widg_ctrl.sub_vp_w = evt.width;
-			widg_ctrl.sub_vp_h = evt.height;
-			widg_ctrl.sub_vp_x = evt.offset_x;
-			widg_ctrl.sub_vp_y = evt.offset_y;
-			widg_ctrl.sub_w = evt.vp_width;
-			widg_ctrl.sub_h = evt.vp_height;
-			widg_ctrl.refresh_layout(true, null);
-	},
-		0);
-
-	/*this will setup the scene graph for the widget in order to filter input and output communication pins*/
-	wid.activate(widg_ctrl.inline);
-
-	widg_ctrl.inline.url[0] = wid.main;
-	widget_display.addChildren[0] = widg_ctrl;
-
-	/*send notifications once the widget scene is loaded*/
-	wid.on_load = function () {
-		WidgetManager.corein_message(this, 'activate');
-		WidgetManager.corein_message(this, 'show');
-		WidgetManager.corein_message(this, 'setSize', 'width', 50, 'height', 50, 'dpi', 96);
-	};
-
-	if (widget_ui_visible) {
-		widget_ui_visible = 0;
-		layout();
-	}
-}
-
-
-function widget_request_size(widget, args)
-{
-	if (args.length==2) {
-		w = (typeof args[0] == 'string') ? parseInt(args[0]) : args[0];
-		h = (typeof args[1] == 'string') ? parseInt(args[1]) : args[1];
-		widget.widget_control.set_size(w, h);
-	}
-}
-function widget_request_show(widget, args)
-{
-	widget.widget_control.show();
-}
-function widget_request_hide(widget, args)
-{
-	widget.widget_control.hide();
-}
-function widget_request_activate(widget, args)
-{
-	if (!widget.visible)
-		widget_launch(widget);
-}
-function widget_request_deactivate(widget, args)
-{
-	if (widget.visible)
-		widget_close(widget, 0);
-}
-
-function widget_request_attention(widget, args)
-{
-	if (widget.visible) {
-		widget_display.removeChildren[0] = widget.widget_control;
-		widget_display.addChildren[0] = widget.widget_control;
-		widget.widget_control.flash();
-	}
-}
-
-function widget_request_notification(widget, args)
-{
-	var notif = text_rect('');
-	notif.children[1].geometry.string[0] = 'Notification from widget';
-	notif.children[1].geometry.string[1] = ' '+widget.name;
-	notif.children[1].geometry.string[2] = ' ';
-	notif.children[1].geometry.string[3] = args[0];
-	dlg_display.children[0] = notif;
-	notif.set_size(320, 240);
-	notif.button_click = function() {
-		dlg_display.removeChildren[0] = this;
-	}
-}
-
-function widget_place_component(widget, args)
-{
-	var comp = widget.get_component(args[0]);
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
-		return;
-	}
-	comp.widget_control.place_x = args[1];
-	comp.widget_control.place_y = args[2];
-	comp.widget_control.place_w = args[3];
-	comp.widget_control.place_h = args[4];
-	comp.widget_control.place_z = args[5];
-	comp.widget_control.component_bound = true;
-	widget.widget_control.refresh_layout(false, comp);
-}
-
-//
-// implementation of core:out install widget
-//
-function widget_request_install(wid, args)
-{
-	var wid_url = args[0];
-	/*locate widget with same URL*/
-	var j, count = WidgetManager.num_widgets;
-	for (j = 0; j < count; j++) {
-		var wid = WidgetManager.get(j);
-		if (wid.url == wid_url) {
-			if (!wid.in_panel) {
-				insert_widget_icon(wid, 0);
-			}
-			break;
-		}
-	}
-	/*not found, install new widget*/
-	if (j == count) {
-		var new_wid = WidgetManager.open(wid_url, null);
-		if (new_wid==null) return;
-		insert_widget_icon(new_wid, 0);
-	}
-
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"), wid, 1); // send return code 1 = success
-	}
-}
-function widget_migrate_component(wid, args)
-{
-	alert('Fetching for migration component '+args[0]);
-	var comp = wid.get_component(args[0], true);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-
-	if (comp==null) {
-		log(l_err, 'Component '+args[0]+' cannot be found in widget '+wid.name);
-		if (ifce != null) {
-			wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
-		}
-		return;
-	}
-	comp.widget_control = null;
-	if (args.length > 1 && args[1] != null) {
-		alert('Migrating component to ' + UPnP.GetMediaRenderer(parseInt(args[1])).Name);
-		WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
-		widget_close(comp);
-	} else {
-		widget_remote_candidate = comp;
-		on_upnpopen(false, false);
-	}
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
-	}
-}
-
-function widget_migration_targets(wid, args)
-{
-	var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i;
-
-	for (i = 0; i < count; i++) {
-		var render = UPnP.GetMediaRenderer(i);
-		codes.push(""+i);
-		names.push(render.Name);
-		descriptions.push(render.HostName +" "+ render.UUID);
-	}
-	i = null;
-	var ifce_count = wid.num_interfaces, j;
-	for (j = 0; j < ifce_count; j++) {
-		var ifce = wid.get_interface(j);
-		if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-			i = ifce;
-			break;
-		}
-	}
-	if (i != null) {
-		wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
-			wid, codes, names, descriptions);
-	}
-}
-
-
-//
-// implementation of core:out activate temporary widget
-//
-function widget_activate_temporary_widget(wid, args) {
-	var w = WidgetManager.open(args[0], null);
-	if (w != null) widget_launch(w);
-	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-	if (ifce != null) {
-		wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
-			wid, (w != null ? 1 : 0)); // send return code 1 = success
-	}
-}
-
-
-
-function insert_widget_icon(new_wid, no_layout) {
-	var icon;
-	icon = icon_button(widget_get_icon(new_wid), new_wid.name, 0);
-	icon.tooltip = new_wid.name;
-	new_wid.in_panel = true;
-	new_wid.visible = false;
-	new_wid.icon_dock = icon;
-	icon.button_click = on_widget_launch;
-	icon.widget = new_wid;
-	widget_ui.addChildren[0] = new_wid.icon_dock;
-	if (!no_layout) layout();
-}
-
-function scan_directory(dir)
-{
-	var i, j, count, list, new_wid, uri;
-	list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
-	for (i=0; i<list.length; i++) {
-		uri = list[i].path + list[i].name;
-		if (list[i].directory) {
-			scan_directory(uri);
-		} else {
-			count = WidgetManager.num_widgets;
-			for (j=0; j<count; j++) {
-				var wid = WidgetManager.get(j);
-				if (wid.url==uri) break;
-			}
-			if (j==count) {
-				new_wid = WidgetManager.open(uri, null);
-				if (new_wid!=null) {
-					insert_widget_icon(new_wid, 1);
-				}
-			}
-		}
-	}
-}
-
-function new_file_browse(init_directory, label, filter, show_scan, show_upnp)
-{
-	var filebrowse = new SFNode('Transform2D');
-	filebrowse.list = new Array();
-	infobar.set_label(label);
-	dlg_display.children[0] = filebrowse;
-
-	filebrowse.upnp = null;
-	filebrowse.upnp_mode = false;
-
-	filebrowse.children[0] = icon_button('icons/emblem-unreadable.svg', 'Close', 0);
-	filebrowse.children[0].button_click = function() {
-		dlg_display.children.length = 0;
-		widget_display.scale.x = 1;
-		layout();
-	}
-
-	filebrowse.children[1] = icon_button('icons/go-previous.svg', 'Previous', 0);
-	filebrowse.children[1].filebrowse = filebrowse;
-	filebrowse.children[1].button_click = function () { this.filebrowse.layout(0) };
-
-	filebrowse.children[2] = icon_button('icons/go-next.svg', 'Next', 0);
-	filebrowse.children[2].filebrowse = filebrowse;
-	filebrowse.children[2].button_click = function () { this.filebrowse.layout(1) };
-
-	filebrowse.icon_up = icon_button('icons/go-up.svg', 'Up', 0);
-	filebrowse.icon_up.filebrowse = filebrowse;
-	filebrowse.icon_up.button_click = function () { this.filebrowse.browse(true) };
-	filebrowse.children[3] = filebrowse.icon_up;
-
-	if (show_scan) {
-		filebrowse.on_dir_scan = null;
-		filebrowse.children[4] = icon_button('icons/folder.svg', 'Scan Directory', 0);
-		filebrowse.children[4].filebrowse = filebrowse;
-		filebrowse.children[4].button_click = function () {
-			if (this.filebrowse.on_dir_scan) this.filebrowse.on_dir_scan(this.filebrowse.directory);
-
-			dlg_display.children.length = 0;
-			widget_display.scale.x = 0;
-			widget_ui_visible = true;
-			layout();
-		}
-	}
-
-	if (show_upnp && UPnP_Enabled) {
-		filebrowse.upnp = icon_button('icons/applications-internet.svg', 'Network Servers', 0);
-		filebrowse.upnp.filebrowse = filebrowse;
-		filebrowse.children[filebrowse.children.length] = filebrowse.upnp;
-		filebrowse.server_uuid = null;
-		filebrowse.upnp.button_click = function() {
-			if (this.filebrowse.upnp_mode) {
-				this.label = 'Network Servers';
-				this.filebrowse.upnp_mode = false;
-				this.filebrowse.directory = init_directory;
-				this.filebrowse.browse(false);
-			} else {
-				this.label = 'Local Drive';
-				this.filebrowse.upnp_mode = true;
-				this.filebrowse.browse(true);
-			}
-		}
-
-		filebrowse.upnp_get_server_list = function() {
-			var count, server, item;
-			this.directory = null;
-			this.children[3].hide();
-			this.server_uuid = null;
-			count = UPnP.MediaServersCount;
-			this.list.length = 0;
-			for (i=0; i<count; i++) {
-				server = UPnP.GetMediaServer(i);
-				item = new Object();
-				item.name = server.Name;
-				item.directory = true;
-				item.is_server = true;
-				item.path = server.UUID;
-				this.list[i] = item;
-			}
-		};
-		filebrowse.server_uuid = null;
-	}
-
-	filebrowse.label = text_label('', 'BEGIN');
-	filebrowse.set_label = function(label) {
-		this.label.set_label(label);
-	}
-	filebrowse.children[filebrowse.children.length] = filebrowse.label;
-	filebrowse.nb_tools = filebrowse.children.length;
-
-	filebrowse.browse = function(go_up) {
-		if (this.upnp_mode) {
-			var item;
-			var server = null;
-			if (this.server_uuid) server = UPnP.GetMediaServer(this.server_uuid);
-			if (!server || (go_up && !server.HasParentDirectory())) {
-				this.upnp_get_server_list();
-				this.icon_up.hide();
-				this.set_label('Media Servers');
-				this.first = 0;
-				this.layout(0);
-				return;
-			}
-			if (go_up) this.directory = '..';
-
-			this.icon_up.show();
-			server.Browse(this.directory, filter);
-			this.list.length = 0;
-			for (i=0; i<server.FilesCount; i++) {
-				var file = server.GetFile(i);
-				if (file.Directory) {
-					item = new Object();
-					item.directory = true;
-					item.name = file.Name;
-					item.path = file.ObjectID;
-					item.is_server = false;
-					this.list[this.list.length] = item;
-				} else {
-					var j;
-					for (j=0; j<file.ResourceCount; j++) {
-						item = new Object();
-						item.directory = false;
-						item.resource_uri = file.GetResourceURI(j);
-						item.name = file.Name;
-						var protoInfo = item.resource_uri.split(":");
-						item.name += ' ('+protoInfo[0]+')';
-						item.path = file.ObjectID;
-						item.is_server = false;
-						this.list[this.list.length] = item;
-					}
-				}
-			}
-			if (this.directory) this.set_label(this.directory);
-			else this.set_label(server.Name);
-			this.first = 0;
-			this.layout(0);
-			return;
-		}
-
-		if (this.directory == '')
-			this.icon_up.hide();
-		else
-			this.icon_up.show();
-
-		this.list = gpac.enum_directory(this.directory, filter, go_up);
-		if (this.list.length) {
-			this.directory = this.list[0].path;
-			this.set_label(this.directory);
-		} else {
-			this.set_label('');
-		}
-		this.first = 0;
-		this.layout(0);
-	}
-	filebrowse.on_browse = null;
-
-	filebrowse.layout = function(type) {
-		var w, h, i, y;
-		this.children.length = this.nb_tools;
-
-		if (this.upnp != null) {
-			if (UPnP.MediaServersCount) {
-				this.upnp.show();
-			} else {
-				this.upnp.hide();
-			}
-		}
-
-		this.children[1].hide();
-		this.children[2].hide();
-
-		if (type==0) {
-			this.first -= this.nb_items;
-			if (this.first<0) this.first = 0;
-		}
-		else if (type) {
-			this.first += this.nb_items;
-			if (this.first + this.nb_items > this.list.length) this.first = this.list.length - this.nb_items;
-		}
-		if (this.first) this.children[1].show();
-		if (this.first+this.nb_items < this.list.length) this.children[2].show();
-
-		for (i=0; i<this.nb_items; i++) {
-			var item;
-			if (i+this.first>=this.list.length) break;
-			item = text_rect(this.list[i+this.first].name);
-			item.path = this.list[i+this.first].path;
-			item.name = this.list[i+this.first].name;
-			item.directory = this.list[i+this.first].directory;
-			item.filebrowse = this;
-			if (this.upnp_mode) {
-				item.is_server = this.list[i+this.first].is_server;
-				item.resource_uri = this.list[i+this.first].resource_uri;
-				item.button_click = function() {
-					if (this.directory) {
-						if (this.is_server) {
-							this.filebrowse.server_uuid = this.path;
-						} else {
-							this.filebrowse.directory = this.path;
-						}
-						this.filebrowse.browse(false);
-					} else {
-						dlg_display.children.length = 0;
-						if (this.filebrowse.on_browse) {
-							this.filebrowse.on_browse(this.resource_uri, null);
-						}
-					}
-				};
-			} else {
-				item.button_click = function() {
-					if (this.directory) {
-						this.filebrowse.directory = this.path + this.name;
-						this.filebrowse.browse(false);
-					} else {
-						dlg_display.children.length = 0;
-						if (this.filebrowse.on_browse) {
-							this.filebrowse.on_browse(this.path + this.name, this.filebrowse.directory);
-						}
-					}
-				};
-			}
-			this.children[this.nb_tools+i] = item;
-		}
-		this.set_size(this.width, this.height);
-	}
-
-
-	filebrowse.set_size = function(w, h) {
-		var i, x, y, isize, nbi;
-		isize = 24;
-		if (w>display_width - isize) w = display_width - isize;
-
-		this.width = w;
-		this.height = h;
-
-		i = 1;
-		while ((i+1)*isize <= h - isize) i++;
-
-		if (i != this.nb_items) {
-			this.nb_items = i;
-			this.layout(0);
-			return;
-		}
-		x = -w/2 + isize/2;
-		y = h/2 - isize/2;
-
-		for (i=0;i<this.nb_tools;i++) {
-			if (this.nb_tools>i+1) {
-				this.children[i].set_size(isize, isize);
-			}
-			this.children[i].translation.x = x;
-			this.children[i].translation.y = y;
-			x += isize;
-		}
-		y-=isize;
-		while (i<this.children.length) {
-			this.children[i].set_size(w, isize);
-			this.children[i].translation.x = 0;
-			this.children[i].translation.y = y;
-			y-=isize;
-			i++;
-		}
-	}
-	filebrowse.nb_items = 0;
-	filebrowse.directory = init_directory;
-
-	gpac.set_focus(filebrowse);
-	return filebrowse;
-}
-
-function widget_browse()
-{
-	filebrowse = new_file_browse(WidgetManager.last_widget_dir, 'Select widget', '*.xml;*.wgt;*.mgt', true, false);
-	filebrowse.on_dir_scan = function(directory) {
-		scan_directory(directory);
-		WidgetManager.last_widget_dir = directory;
-	}
-	filebrowse.on_browse = function(value, directory) {
-		widget_display.scale.x = 1;
-		widget_ui_visible = true;
-		layout();
-		var new_wid = WidgetManager.open(value, null);
-		if (new_wid==null) return;
-
-		WidgetManager.last_widget_dir = directory;
-		insert_widget_icon(new_wid, 0);
-	}
-
-	filebrowse.browse(0);
-	widget_display.scale.x = 0;
-	layout();
-
-}
-
-//fileOpen function
-function on_fileopen()
-{
-	filebrowse = new_file_browse(gpac.last_working_directory, 'Select file', '*', false, true);
-	filebrowse.on_browse = function(value, directory) {
-		if (directory) gpac.last_working_directory = directory;
-		set_movie_url(value, false, true);
-	}
-
-	filebrowse.browse(0);
-	widget_display.scale.x = 0;
-	layout();
-}
-
-function onMediaRendererAdd(name, uuid, is_add)
-{
-	var i, count;
-
-	count = WidgetManager.num_widgets;
-	for (i=0; i<count; i++) {
-		wid = WidgetManager.get(i);
-		if (wid == null) continue;
-		if (!wid.widget_control) continue;
-		wid.widget_control.show_remote();
-	}
-
-	if (UPnP.MediaRenderersCount) upnp_icon.show();
-	else upnp_icon.hide();
-	dock_layout();
-
-	if (upnp_renders) upnp_renders.refresh();
-	if (!is_add && controlled_renderer && (name==controlled_renderer.Name) ) controlled_renderer = null;
-}
-
-function is_local_url(url)
-{
-	if (url.indexOf('://') < 0) return true;
-	if (url.indexOf('file://') >= 0) return true;
-	return false;
-}
-
-function on_upnpopen(push_mode, remote_only)
-{
-	upnp_renders = new SFNode('Transform2D');
-	upnp_renders.nb_items = 0;
-	upnp_renders.refresh = function () {
-		var i, count, render, item, start_y, w, str;
-		this.children.length = 0;
-		count = UPnP.MediaRenderersCount;
-		if (count+1>this.nb_items) count = this.nb_items-1;
-
-		item = text_rect('Close');
-		item.button_click = function() {
-			dlg_display.children.length = 0;
-			upnp_renders=null;
-			widget_display.scale.x = 1;
-			infobar.set_label('');
-		}
-		this.children[this.children.length] = item;
-
-		if (!remote_only) {
-			str = (controlled_renderer==null) ? '+ ' : '';
-			str += 'Local Renderer';
-			item = text_rect(str);
-			item.button_click = function() {
-				dlg_display.children.length = 0;
-				upnp_renders=null;
-				widget_display.scale.x = 1;
-				infobar.set_label('');
-				controlled_renderer = null;
-			}
-			this.children[this.children.length] = item;
-		}
-
-		for (i=0; i<count; i++) {
-			render = UPnP.GetMediaRenderer(i);
-			str = (controlled_renderer && controlled_renderer.Name==render.Name) ? '+ ' : '';
-			str +=render.Name;
-			item = text_rect(str);
-			item.render = render;
-
-			item.button_click = function() {
-				var uri;
-				dlg_display.children.length = 0;
-				upnp_renders=null;
-				widget_display.scale.x = 1;
-				infobar.set_label('');
-
-				if (widget_remote_candidate) {
-					WidgetManager.migrate_widget(this.render, widget_remote_candidate);
-					widget_close(widget_remote_candidate, 0);
-					widget_remote_candidate = null;
-				} else {
-					controlled_renderer = this.render;
-					if (current_url != "") {
-						if (is_local_url(current_url) ) {
-							if (UPnP.MediaServerEnabled) {
-								uri = UPnP.ShareResource(current_url);
-								log(l_inf, 'Sharing '+current_url+' to renderer '+item.render.Name + ' as resource '+uri);
-								item.render.Open(uri);
-								item.render.Seek(current_time);
-								set_movie_url('', true, false);
-							} else {
-								log(l_err, 'GPAC Media Server is disabled - Cannot share '+current_url);
-							}
-						} else if (gpac.get_option('Network', 'MobileIPEnabled')=='yes') {
-							uri = gpac.migrate_url(movie.children[0].url[0]);
-							log(l_inf, 'Migrating '+current_url+' to renderer '+item.render.Name + ' as Mobile IP resource '+uri);
-							set_movie_url('', true, false);
-							item.render.Open(uri);
-						} else {
-							log(l_inf, 'Migrating '+current_url+' to renderer '+item.render.Name);
-							item.render.Open(current_url);
-							item.render.Seek(current_time);
-							set_movie_url('', true, false);
-						}
-					}
-				}
-			}
-			this.children[this.children.length] = item;
-		}
-		this.set_size(this.width, this.height);
-	}
-
-	upnp_renders.set_size = function (w, h) {
-		var i, count, start_y, w;
-
-		this.width = w<300 ? w : 300;
-		this.height = h;
-
-		i = 1;
-		while ((i+1)*icon_size <= h - icon_size) i++;
-		if (i != this.nb_items) {
-			this.nb_items = i;
-			this.refresh();
-			return;
-		}
-		count = this.children.length;
-		start_y = this.height/2 - icon_size - 4;
-		for (i=0; i<count; i++) {
-			this.children[i].set_size(this.width, icon_size);
-			this.children[i].translation.y = start_y;
-			start_y-=icon_size+2;
-		}
-	}
-
-	infobar.set_label('Select remote display');
-	dlg_display.children[0] = upnp_renders;
-	widget_display.scale.x = 0;
-	layout();
-}
-
-
-function onMediaConnect(url, src_ip)
-{
-	if (WidgetManager.probe(url)) {
-		alert('OnMediaConnect receive widget '+url+' - ip '+src_ip);
-		var new_wid = WidgetManager.open(url, src_ip);
-		if (new_wid==null) {
-			return;
-		}
-		widget_insert(new_wid);
-	} else {
-		log(l_inf, 'DLNA URL connect ' + url);
-		movie_ctrl.mediaStartTime = -1;
-		set_movie_url(url, true, false);
-	}
-}
-
-function onMediaStop()
-{
-	log(l_inf, 'DLNA Media Stop');
-	movie_ctrl.mediaStartTime = 0;
-	movie_ctrl.mediaSpeed = 0;
-}
-function onMediaPause()
-{
-	log(l_inf, 'DLNA Media pause');
-	movie_ctrl.mediaSpeed = 0;
-	movie_ctrl.mediaStartTime = -1;
-}
-function onMediaPlay()
-{
-	log(l_inf, 'DLNA Media Play');
-	movie_ctrl.mediaSpeed = 1;
-}
-
-function OnMediaSeek(time)
-{
-	log(l_inf, 'DLNA Media Seek to '+time);
-	movie_ctrl.mediaStartTime = time;
-}
-
-function OnMediaMigrate() {
-	log(l_inf, 'InterMedia Migration Request received');
-	var str = gpac.migrate_url(movie.children[0].url[0]);
-	set_movie_url('', true, false);
-	return str;
-}

gpac-0.8.0.tar.gz/gui/gwlib.js Deleted

@@ -1,3634 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-/*log function*/
-function gwlog(lev, str) {
-    alert(lev, str);
-}
-
-/*log levels*/
-l_err = 1;
-l_war = 2;
-l_inf = 3;
-l_deb = 4;
-
-/*default log level*/
-gw_log_level = l_inf;
-
-GF_JS_EVENT_BASE = 20000;
-
-//playback event
-//@param is_playing boolean giving the playback status;
-GF_JS_EVENT_PLAYBACK = GF_JS_EVENT_BASE;
-
-//playlist insert event
-//@param url string giving URL to append
-GF_JS_EVENT_PLAYLIST_ADD = GF_JS_EVENT_BASE + 1;
-
-//playlist reset event
-//@param none
-GF_JS_EVENT_PLAYLIST_RESET = GF_JS_EVENT_BASE + 2;
-
-
-//playlist reset event
-//@param index item index in playlist
-GF_JS_EVENT_PLAYLIST_PLAY = GF_JS_EVENT_BASE + 3;
-
-function gw_new_timer(progressive) {
-    var obj = new SFNode('TimeSensor');
-
-    obj.set_timeout = function (time, loop) {
-        this.cycleInterval = time ? time : 1;
-        this.loop = loop;
-    }
-    this.startTime = -1;
-    obj.start = function (when) {
-        if (arguments.length==0) this.startTime = this.getTime();
-        else this.startTime = when + this.getTime();
-    }
-    obj.stop = function (when) {
-        if (arguments.length==0) this.stopTime = this.getTime();
-        else this.stopTime = when + this.getTime();
-    }
-    obj.on_event = function (val) { };
-    obj._event = function (val) {
-        this.on_event(Math.floor(val / this.cycleInterval));
-    }
-    Browser.addRoute(obj, 'cycleTime', obj, obj._event);
-
-    if (progressive) {
-        obj.on_fraction = function (val) { }
-        obj._fraction = function (frac) {
-            this.on_fraction(frac);
-        }
-        Browser.addRoute(obj, 'fraction_changed', obj, obj._fraction);
-    }
-    obj.on_active = function (val) { }
-    obj._active = function (val) {
-        this.on_active(val);
-    }
-    Browser.addRoute(obj, 'isActive', obj, obj._active);
-    return obj;
-}
-
-//static
-function setup_gw_object(obj, name) {
-    obj._name = name;
-    obj.set_color = function () { }
-    obj.set_size = function (width, height) {
-        this.width = width;
-        this.height = height;
-    }
-    obj.hide = function () {
-        this.scale.x = this.scale.y = 0;
-        this.visible = false;
-        if (arguments.length == 1) {
-            arguments[0].apply(this);
-        }
-    }
-    obj.show = function () { this.scale.x = this.scale.y = 1; this.visible = true; }
-    obj.visible = true;
-    obj.set_size = function (width, height) {
-        this.width = width;
-        this.height = height;
-    }
-    obj.move = function (x, y) {
-        this.translation.x = x;
-        this.translation.y = y;
-    }
-    obj.width = obj.height = 0;
-
-    obj.close = function () {
-        if (typeof this._pre_destroy != 'undefined') this._pre_destroy();
-        gw_detach_child(this);
-    };
-}
-
-function gw_object_set_dragable(obj) {
-    if (typeof (obj.on_drag) != 'undefined') return;
-
-    var ps2d = new SFNode('PlaneSensor2D');
-    obj._ps2d_idx = obj.children.length;
-    obj.children[obj.children.length] = ps2d;
-    ps2d.maxPosition.x = ps2d.maxPosition.y = -1;
-    ps2d.autoOffset = FALSE;
-    obj._drag = false;
-    obj.begin_drag = null;
-    obj.end_drag = null;
-    obj._drag_active = function (val) {
-        if (val) {
-            this.startx = this.translation.x;
-            this.starty = this.translation.y;
-            if (this.begin_drag) this.begin_drag();
-        } else {
-            if (this.end_drag) this.end_drag();
-        }
-    }
-    obj.on_drag = null;
-    obj._on_drag = function (val) {
-        if (this.on_drag) {
-            this.on_drag(this.startx + val.x, this.starty + val.y);
-        } else {
-            this.translation.x = this.startx + val.x;
-            this.translation.y = this.starty + val.y;
-        }
-        if (!this._drag && (val.x || val.y)) this._drag = true;
-    }
-    Browser.addRoute(ps2d, 'isActive', obj, obj._drag_active);
-    Browser.addRoute(ps2d, 'translation_changed', obj, obj._on_drag);
-}
-
-//static
-function gw_object_set_hitable(obj) {
-    if (typeof (obj._active) != 'undefined') return;
-
-    var ts = new SFNode('TouchSensor');
-    obj._ts_idx = obj.children.length;
-    obj.children[obj.children.length] = ts;
-    obj._drag = false;
-    obj._over = false;
-    obj.on_over = null;
-    obj._on_over = function (val) {
-        this._over = val;
-        gw_reset_hit(this, val);
-        if (this.on_over) this.on_over(val);
-    }
-    obj.last_click = 0;
-    obj._nb_click = 0;
-    obj.on_long_click = null;
-    obj.on_click = null;
-    obj.on_down = null;
-    obj._on_active = function (val, timestamp) {
-        if (!this._over) return;
-
-        if (this.on_down) this.on_down(val);
-
-        if (!val) {
-            if (this._drag) {
-                this._drag = false;
-                return;
-            }
-            if (this.on_long_click && (timestamp - this.last_click > gwskin.long_click_delay)) this.on_long_click();
-            else if (this.on_click && this._over) this.on_click();
-        } else {
-            this.last_click = timestamp;
-        }
-    }
-    Browser.addRoute(ts, 'isOver', obj, obj._on_over);
-    Browser.addRoute(ts, 'isActive', obj, obj._on_active);
-
-    obj._disable_touch = function () {
-        this.children[this._ts_idx].enabled = false;
-    }
-    obj._enable_touch = function () {
-        this.children[this._ts_idx].enabled = true;
-    }
-    obj.new_over_handler = function(callback) {
-        Browser.addRoute(this.children[this._ts_idx], 'isOver', this, callback);
-    }
-}
-
-//static
-function gw_new_appearance(r, g, b) {
-    var appearance = new SFNode('Appearance');
-    appearance.material = new SFNode('Material2D');
-    appearance.material.filled = TRUE;
-    appearance.material.emissiveColor = new SFColor(r, g, b);
-    return appearance;
-}
-//static
-function gw_new_lineprops(red, green, blue) {
-    var lineProps = new SFNode('LineProperties');
-    lineProps.lineColor.r = red;
-    lineProps.lineColor.g = green;
-    lineProps.lineColor.b = blue;
-    return lineProps;
-}
-
-//static
-function gw_make_gradient(type, keys, colors, opacities) {
-    var i;
-    var obj = new SFNode(type == 'radial' ? 'RadialGradient' : 'LinearGradient');
-    for (i = 0; i < keys.length; i++) {
-        obj.key[i] = keys[i];
-    }
-    for (i = 0; i < colors.length / 3; i++) {
-        obj.keyValue[i] = new SFColor(colors[3 * i], colors[3 * i + 1], colors[3 * i + 2]);
-        if (arguments.length == 4) {
-            obj.opacity[i] = opacities[i];
-        }
-    }
-    if (type == 'vertical') {
-        obj.endPoint.x = 0;
-        obj.endPoint.y = 1;
-    }
-    return obj;
-}
-
-//static
-function gw_new_fontstyle(size, align) {
-    var fs = new SFNode('FontStyle');
-    fs.size = size;
-    fs.family[0] = gwskin.default_font_family;
-    switch (align) {
-        case 0:
-            fs.justify[0] = 'BEGIN';
-            break;
-        case 1:
-            fs.justify[0] = 'MIDDLE';
-            break;
-        case 2:
-            fs.justify[0] = 'END';
-            break;
-        default:
-            fs.justify[0] = 'MIDDLE';
-            break;
-    }
-    fs.justify[1] = 'MIDDLE';
-    return fs;
-}
-
-gw_resources_bank = [];
-
-//static
-function gw_load_resource(url, is_icon) {
-    var new_res;
-
-    if (gwskin.use_resource_bank) {
-        for (var i in gw_resources_bank) {
-            if (gw_resources_bank[i].res_url == url) {
-                gw_resources_bank[i].nb_instances++;
-                return gw_resources_bank[i];
-            }
-        }
-    }
-
-    if (is_icon) {
-        new_res = new SFNode('StyleGroup');
-        new_res.children[0] = new SFNode('Inline');
-        new_res.children[0].url[0] = url;
-        new_res.set_style = function (app) {
-            this.appearance = app;
-        };
-        new_res.set_style(gwskin.styles[0].normal);
-    } else {
-//        new_res = new SFNode('OffscreenGroup');
-//        new_res.offscreen_mode = 2;
-//        new_res.children[0] = new SFNode('Inline');
-//        new_res.children[0].url[0] = url;
-           new_res = new SFNode('Inline');
-           new_res.url[0] = url;
-
-        new_res.set_style = function () { };
-    }
-
-    new_res.nb_instances = 1;
-    if (gwskin.use_resource_bank) {
-        new_res.res_url = url;
-        gw_resources_bank.push(new_res);
-    }
-    return new_res;
-}
-
-//static
-function gw_unload_resource(res) {
-    if (!gwskin.use_resource_bank) return;
-
-    if (!res.nb_instances) return;
-    res.nb_instances--;
-    if (res.nb_instances) return;
-
-    for (var i in gw_resources_bank) {
-        if (gw_resources_bank[i] == res) {
-            gw_resources_bank.splice(i, 1);
-            return;
-        }
-    }
-    gwlog(l_err, 'Unloading resource for url ' + res.children[0].url[0] + ' not found in resource bank');
-}
-
-//static
-function gw_appy_effect_scale(timer, val) {
-    if (!timer.wnd.visible) {
-        timer.wnd.scale.x = 1 - val;
-        timer.wnd.scale.y = 1 - val;
-          timer.wnd.set_alpha((1 - val) * timer.target_alpha);
-    } else {
-        timer.wnd.scale.x = val;
-        timer.wnd.scale.y = val;
-          timer.wnd.set_alpha(val * timer.target_alpha);
-    }
-}
-
-//static
-function gw_appy_effect_notif(timer, val) {
-    var final_x = gw_display_width / 2 - timer.wnd.width / 2;
-    var final_y = gw_display_height / 2 - timer.wnd.height/2;
-    if (!timer.wnd.visible) {
-        timer.wnd.translation.x = final_x;
-        timer.wnd.translation.y = final_y + val * timer.wnd.height;
-        timer.wnd.set_alpha((1 - val) * timer.target_alpha);
-    } else {
-        timer.wnd.translation.x = final_x;
-        timer.wnd.translation.y = final_y + (1-val) * timer.wnd.height;
-        timer.wnd.set_alpha(val * timer.target_alpha);
-    }
-}
-
-//static
-function gw_window_show_hide() {
-
-	if (typeof this.show_effect == 'string') {
-		if (this.show_effect == 'none') {
-			this.visible = !this.visible;
-			this.scale.x = this.visible ? 1 : 0;
-			this.scale.y = this.visible ? 1 : 0;
-			return;
-		}
-	}
-
-    if (typeof this._wnd_timer == 'undefined') {
-        this._wnd_timer = gw_new_timer(1);
-        this._wnd_timer.wnd = null;
-
-        this._wnd_timer.effect = 0;
-        this._wnd_timer.set_timeout(0.25, false);
-        this._wnd_timer.on_fraction = function (val) {
-            if (!this.wnd) return;
-
-            switch (this.effect) {
-            case 0:
-                gw_appy_effect_scale(this, val);
-                break;
-            case 1:
-                gw_appy_effect_notif(this, val);
-                break;
-            }
-        }
-        this._wnd_timer.on_active = function (val) {
-            var fun;
-            if (val || !this.wnd) return;
-            var wnd = this.wnd;
-            this.wnd = null;
-            wnd.scale.x = wnd.visible ? 1 : 0;
-            wnd.scale.y = wnd.visible ? 1 : 0;
-            wnd.set_alpha(this.target_alpha);
-            if (wnd.visible) {
-                gw_ui_root.set_focus(wnd);
-            } else {
-                gw_ui_root.remove_focus(wnd);
-            }
-            fun = this.call_on_end;
-            this.call_on_end = null;
-            if (fun) {
-                fun.apply(wnd);
-            }
-        }
-    }
-    /*not done yet! This can happen when the function is called faster than the animation duration*/
-    if (this._wnd_timer.wnd) return;
-
-    this.visible = !this.visible;
-    if (this.visible) {
-        this._wnd_timer.target_alpha = this.get_alpha();
-        this._wnd_timer.target_x = this.translation.x;
-        this._wnd_timer.target_y = this.translation.y;
-        this._wnd_timer.target_w = this.width;
-        this._wnd_timer.target_h = this.height;
-    }
-
-    if (typeof this.show_effect == 'string') {
-        if (this.show_effect == 'notif') this._wnd_timer.effect = 1;
-    }
-    this._wnd_timer.wnd = this;
-    this._wnd_timer.start(0);
-    this._wnd_timer.call_on_end = null;
-    if (arguments.length) {
-        this._wnd_timer.call_on_end = arguments[0];
-    }
-}
-
-//static
-function gw_window_show() {
-    if (this.visible) return;
-    gw_window_show_hide.call(this);
-}
-
-//static
-function gw_window_hide() {
-    if (!this.visible) return;
-    gw_window_show_hide.apply(this, arguments);
-}
-
-//Skin definition
-var gwskin = new Object();
-gwskin.back_color = new SFColor(0.2, 0.2, 0.2);
-gwskin.pointing_device = true;
-gwskin.long_click_delay = 0.5;
-gwskin.use_resource_bank = false;
-gwskin.default_window_alpha = 0.5;
-gwskin.default_message_timeout = 3.0;
-gwskin.default_tooltip_timeout = 0.75;
-gwskin.default_tooltip_delay = 1;
-
-gwskin.appearance_transparent = gw_new_appearance(0, 0, 0);
-gwskin.appearance_transparent.material.transparency = 1;
-gwskin.appearance_transparent.skin = true;
-
-gwskin.no_gl_window_back = new SFNode('Background2D')
-gwskin.no_gl_window_back.backColor = new SFColor(0, 0, 0);
-
-gwskin.last_hit_x = 0;
-gwskin.last_hit_y = 0;
-
-gwskin.enable_background = function(do_enable) {
- if (do_enable) {
-  gpac.set_back_color(gwskin.back_color.r, gwskin.back_color.g, gwskin.back_color.b, 1.0);
- } else {
-  gpac.set_back_color(0, 0, 0, 1.0);
- }
-}
-
-//static
-function gw_get_abs_pos(child) {
-    var pos = new SFVec2f(0, 0);
-    while (child != null) {
-        if (typeof (child.translation) != 'undefined') {
-            pos.x += child.translation.x;
-            pos.y += child.translation.y;
-        }
-        if (typeof (child.parent) == 'undefined') break;
-        if (typeof (child._is_window) == 'boolean') break;
-        child = child.parent;
-    }
-    return pos;
-}
-
-function gw_get_adjusted_abs_pos(child, width, height, type)
-{
-    var pos = gw_get_abs_pos(child);
-    
-    if (type == 0) {
-        pos.y += child.height/2 + height/2; 
-    } else if (type==1) {
-        pos.y -= child.height/2 + height/2; 
-    }
-    
-    
-    if (pos.x - width / 2 < - gw_display_width / 2)
-        pos.x = - gw_display_width / 2 + width / 2;
-    else if (pos.x + width / 2 > gw_display_width / 2)
-        pos.x = gw_display_width / 2 - width / 2;
-    
-    if (pos.y + height/2 > gw_display_height / 2) {
-        if (type == 0) {
-            pos.y -= child.height + height;
-        } else {
-            pos.y = gw_display_height / 2 - height/2;
-        }
-    }
-    else if (pos.y - height/2 < -gw_display_height / 2) {
-        if (type==1) {
-            pos.y += child.height + height;
-        } else {
-            pos.y = height/2 - gw_display_height / 2;
-        }
-    }
-
-    return pos;
-}
-
-
-gwskin.tooltip_wnd = null;
-gwskin.tooltip_timeout = gw_new_timer(false);
-
-gwskin.tooltip_exec = function (obj, show) {
-
-    if (!show) return;
-
-    if (!gwskin.tooltip_wnd) {
-        wnd = gw_new_window(null, true, true, 'tooltip', true);
-        wnd.label = '';
-        gwskin.tooltip_wnd = wnd;
-        wnd.txt = gw_new_text(gwskin.tooltip_wnd, '');
-        wnd.on_display_size = function (w, h) {
-            if (! this.label) return;
-
-            width = this.label.length * gwskin.default_text_font_size;
-            this.set_size(width, 2 * gwskin.default_text_font_size);
-            this.txt.set_width(width);
-            this.move(-w / 2 + width / 2, h / 2 - gwskin.default_text_font_size);
-        }
-        wnd.on_close = function () {
-            this.timer = null;
-            gwskin.tooltip_wnd = null;
-        }
-        wnd.on_display_size(gw_display_width, gw_display_height);
-        wnd.set_alpha(0.9);
-        wnd.show();
-
-        wnd.timer = gw_new_timer(false);
-        wnd.timer.set_timeout(gwskin.default_tooltip_timeout, false);
-        wnd.timer.start(0);
-        wnd.timer.on_active = function (val) {
-            if (!val) gwskin.tooltip_wnd.close();
-        }
-    }
-
-    gwskin.tooltip_wnd.label = obj.get_label();
-    gwskin.tooltip_wnd.txt.set_label(gwskin.tooltip_wnd.label);
-    gwskin.tooltip_wnd.on_display_size(gw_display_width, gw_display_height);
-
-
-    var tt = gwskin.tooltip_wnd;
-    var dy = 1.2 * tt.height;
-    var pos = gw_get_adjusted_abs_pos(obj, tt.width, 1.2 * tt.height, 0);
-    tt.move(pos.x, pos.y);
-}
-
-gwskin.tooltip_callback = function (obj, show) {
-
-    if (! obj._tooltip) return;
-    if (!show) {
-        gwskin.tooltip_timeout.obj = null;
-        gwskin.tooltip_timeout.stop(0);
-        return;
-    }
-    gwskin.tooltip_timeout.set_timeout(gwskin.default_tooltip_delay, false);
-    gwskin.tooltip_timeout.obj = obj;
-    gwskin.tooltip_timeout.on_active = function (val) {
-        if (!val && gwskin.tooltip_timeout.obj) {
-            //deactivate tooltip after first run
-            obj._tooltip = false;
-            gwskin.tooltip_exec(gwskin.tooltip_timeout.obj, true);
-        }
-    }
-    gwskin.tooltip_timeout.start(0);
-}
-
-gwskin.default_label_font_size = 18;
-gwskin.default_text_font_size = 18;
-gwskin.default_font_family = 'SANS';
-gwskin.default_icon_text_spacing = 8;
-gwskin.default_control_height = 48;
-gwskin.default_icon_height = 32;
-
-
-//create styles
-gwskin.styles = [];
-var s = { name: 'default' };
-gwskin.styles.push(s);
-
-s.normal = gw_new_appearance(0.4, 0.6, 1);
-s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.4, 0.6]);
-s.normal.skin = true;
-if (gwskin.pointing_device) {
-    s.over = gw_new_appearance(0.0, 1.0, 1);
-    s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-    s.over.skin = true;
-} else {
-    s.over = null;
-}
-s.down = gw_new_appearance(0, 0, 1);
-s.down.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 1, 1]);
-s.down.skin = true;
-s.disable = gw_new_appearance(0.4, 0.4, 0.4);
-s.disable.skin = true;
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
-s.font.skin = true;
-
-
-//overrite style for button to have its own text color
-var s = { name: 'button' };
-gwskin.styles.push(s);
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-
-//override style for checkbox to have text alignment to 'begin'
-s = { name: 'checkbox' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-s.over = gw_new_appearance(0.0, 1.0, 1);
-s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
-s.over.skin = true;
-
-//override style for icon to have no text not fonts
-s = { name: 'icon' };
-gwskin.styles.push(s);
-s.text = null;
-s.font = null;
-
-s = { name: 'root_icon' };
-gwskin.styles.push(s);
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-
-
-//override listitems to have text alignment to 'begin'
-s = { name: 'listitem' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-
-s = { name: 'edit' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(1, 1, 1);
-s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over = gw_new_appearance(1, 1, 1);
-s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
-s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
-s.text = gw_new_appearance(0, 0, 0);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.style += ' SIMPLE_EDIT';
-s.font.skin = true;
-
-s = { name: 'window' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.6, 0.6, 0.6);
-s.normal.texture = gw_make_gradient('vertical', [0, 0.1, 0.9, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6]);
-s.normal.skin = true;
-//override font to have middle alignment
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
-s.font.skin = true;
-s.hide = gw_window_hide;
-s.show = gw_window_show;
-
-tt_s = { name: 'tooltip' };
-gwskin.styles.push(tt_s);
-tt_s.normal = gw_new_appearance(0.6, 0.6, 0.6);
-tt_s.normal.texture = s.normal.texture;
-//tt_s.normal.material.lineProps = gw_new_lineprops(0, 0, 0);
-//tt_s.normal.material.lineProps.width = 0.5;
-tt_s.font = s.font;
-//tt_s.hide = gw_window_hide;
-//tt_s.show = gw_window_show;
-
-s = { name: 'progress' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.6, 0.6, 0.6);
-s.normal.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6]);
-s.normal.skin = true;
-s.over = gw_new_appearance(0.7, 0.7, 0.8);
-s.over.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1]);
-s.over.skin = true;
-s.down = gw_new_appearance(0.7, 0.7, 0.8);
-s.down.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.8, 1, 1, 0, 0.4, 0.6, 0.8, 1, 1]);
-s.down.skin = true;
-//for gauge
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
-s.font.skin = true;
-
-
-s = { name: 'plot' };
-gwskin.styles.push(s);
-s.normal = gw_new_appearance(0.9, 0.9, 0.9);
-s.normal.skin = true;
-s.text = gw_new_appearance(0, 0, 0);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-
-s = { name: 'text' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.justify[1] = 'END';
-s.font.skin = true;
-
-s = { name: 'lefttext' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-s = { name: 'righttext' };
-gwskin.styles.push(s);
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.skin = true;
-
-s = { name: 'float_text' };
-gwskin.styles.push(s);
-s.text = gw_new_appearance(1, 1, 1);
-s.text.skin = true;
-s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
-s.font.justify[1] = 'END';
-s.font.skin = true;
-
-gwskin.images = new Object();
-gwskin.labels = new Object();
-
-gwskin.images.trash = 'icons/trash.svg';
-gwskin.labels.trash = 'Delete';
-gwskin.images.add = 'icons/add.svg';
-gwskin.labels.add = 'Add';
-gwskin.images.remove = 'icons/remove.svg';
-gwskin.labels.remove = 'Remove';
-gwskin.images.remote_display = 'icons/monitor.svg';
-gwskin.labels.remote_display = 'Push to remote device';
-gwskin.images.information = 'icons/info.svg';
-gwskin.labels.information = 'Information';
-gwskin.images.resize = 'icons/resize.svg';
-gwskin.labels.resize = 'Resize';
-gwskin.images.cancel = 'icons/cross.svg';
-gwskin.labels.cancel = 'Cancel';
-gwskin.images.close = 'icons/cross.svg';
-gwskin.labels.close = 'Close';
-gwskin.images.previous = 'icons/previous.svg';
-gwskin.labels.previous = 'Previous';
-gwskin.images.next = 'icons/next.svg';
-gwskin.labels.next = 'Next';
-gwskin.images.left = 'icons/left.svg';
-gwskin.labels.left = 'Left';
-gwskin.images.right = 'icons/right.svg';
-gwskin.labels.right = 'Right';
-gwskin.images.up = 'icons/up.svg';
-gwskin.labels.up = 'Up';
-gwskin.images.down = 'icons/down.svg';
-gwskin.labels.down = 'Down';
-gwskin.images.scan_directory = 'icons/overflowing.svg';
-gwskin.labels.scan_directory = 'Select directory';
-gwskin.images.history = 'icons/overflowing.svg';
-gwskin.labels.history = 'History';
-gwskin.images.media_next = 'icons/media_next.svg';
-gwskin.labels.media_next = 'Next Item';
-gwskin.images.media_prev = 'icons/media_prev.svg';
-gwskin.labels.media_prev = 'Previous Clip';
-gwskin.images.seek_forward = 'icons/seek_forward.svg';
-gwskin.labels.seek_forward = 'Fast Forward';
-gwskin.images.rewind = 'icons/rewind.svg';
-gwskin.labels.rewind = 'Rewind';
-gwskin.images.folder = 'icons/folder.svg';
-gwskin.labels.folder = 'Directory';
-gwskin.images.check = 'icons/check.svg';
-gwskin.labels.check = 'Check';
-gwskin.images.drive = 'icons/harddrive.svg';
-gwskin.labels.drive = 'Storage Drive';
-gwskin.images.device = 'icons/laptop.svg';
-gwskin.labels.device = 'Device';
-gwskin.images.home = 'icons/home.svg';
-gwskin.labels.home = 'Home';
-gwskin.images.osmo = 'icons/osmo.svg';
-gwskin.labels.osmo = 'Home';
-gwskin.images.media = 'icons/more.svg';
-gwskin.labels.media = 'Media';
-gwskin.images.favorite = 'icons/heart.svg';
-gwskin.labels.favorite = 'Favorites';
-gwskin.images.audio = 'icons/audio.svg';
-gwskin.labels.audio = 'Audio On';
-gwskin.images.audio_mute = 'icons/audio_mute.svg';
-gwskin.labels.audio_mute = 'Audio Mute';
-gwskin.images.play = 'icons/play.svg';
-gwskin.labels.play = 'Play';
-gwskin.images.pause = 'icons/pause.svg';
-gwskin.labels.pause = 'Pause';
-gwskin.images.stop = 'icons/stop2.svg';
-gwskin.labels.stop = 'Stop';
-gwskin.images.fullscreen = 'icons/expand.svg';
-gwskin.labels.fullscreen = 'Fullscreen';
-gwskin.images.fullscreen_back = 'icons/shrink.svg';
-gwskin.labels.fullscreen_back = 'Exit Fullscreen';
-gwskin.images.play_once = 'icons/play_single.svg';
-gwskin.labels.play_once = 'Play once';
-gwskin.images.play_loop = 'icons/play_loop.svg';
-gwskin.labels.play_loop = 'Loop';
-gwskin.images.play_shuffle = 'icons/play_shuffle.svg';
-gwskin.labels.play_shuffle = 'Shuffle';
-gwskin.images.navigation = 'icons/navigation.svg';
-gwskin.labels.navigation = 'Navigation';
-gwskin.images.network = 'icons/network.svg';
-gwskin.labels.network = 'Network';
-gwskin.images.file_open = 'icons/tray.svg';
-gwskin.labels.file_open = 'Open';
-gwskin.images.exit = 'icons/power.svg';
-gwskin.labels.exit = 'Exit';
-gwskin.images.remote_location = 'icons/world.svg';
-gwskin.labels.remote_location = 'Enter URL';
-gwskin.images.statistics = 'icons/speed.svg';
-gwskin.labels.statistics = 'Statistics';
-gwskin.images.live = 'icons/live.svg';
-gwskin.labels.live = 'Back to live';
-gwskin.images.sort = 'icons/sort.svg';
-gwskin.labels.sort = 'Sort';
-gwskin.images.playlist = 'icons/list.svg';
-gwskin.labels.playlist = 'Playlist';
-gwskin.images.playlist_next = 'icons/pl_next.svg';
-gwskin.labels.playlist_next = 'Next';
-gwskin.images.playlist_prev = 'icons/pl_prev.svg';
-gwskin.labels.playlist_prev = 'Previous';
-gwskin.images.channels = 'icons/tv.svg';
-gwskin.labels.channels = 'TV Channels';
-gwskin.images.view360 = 'icons/image.svg';
-gwskin.labels.view360 = '360°';
-gwskin.images.sensors = 'icons/compass.svg';
-gwskin.labels.sensors = 'Orientation';
-
-
-gwskin.mime_video_default_ext = " mp4 mp4s m4s 3gp 3gpp m2ts ts trp m3u8 mpd avi mov ";
-gwskin.mime_audio_default_ext = " m4a mp3 aac wav ";
-gwskin.mime_image_default_ext = " jpg jpeg png ";
-gwskin.mime_model_default_ext = " bt xmt svg ";
-
-gwskin.images.mime_video = 'icons/film.svg';
-gwskin.images.mime_audio = 'icons/musical.svg';
-gwskin.images.mime_model = 'icons/app.svg';
-gwskin.images.mime_generic = 'icons/file.svg';
-gwskin.images.mime_image = 'icons/image.svg';
-
-
-
-gwskin.keys = new Object();
-gwskin.keys.close = 'U+0008';
-gwskin.keys.validate = 'Enter';
-
-gwskin.last_hitable_obj = null;
-
-//static
-function gwskin_set_white_blue()
-{
-	var s = gwskin.get_class('default');
-
- 	//s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.4, 0.6];
-	//if (s.over && s.over.texture) s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-	//s.down.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 1, 1];
-
-	s.text.material.emissiveColor = new SFColor(0, 0, 0);
-
-	//override style for checkbox to have text alignment to 'begin'
-	s = gwskin.get_class('checkbox');
-//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-
-	s = gwskin.get_class('edit');
-//	s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
-	s.over.material.lineProps.lineColor = new SFColor(0.0, 0.8, 1);
-	s.text.material.emissiveColor = new SFColor(0, 0, 0);
-
-	s = gwskin.get_class('window');
-	s.normal.material.emissiveColor = new SFColor(1, 1, 1);
-	gwskin.no_gl_window_back.backColor = new SFColor(1, 1, 1);
-//	s.normal.texture.keyValue = [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6];
-	if (s.normal.texture) {
-		s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
-		s.normal.texture.keyValue[2] = new SFColor(1, 1, 1);
-	}
-
-	s = gwskin.get_class('progress');
-//	s.normal.texture.keyValue = [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6];
-//	s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
-//	s.over.texture.keyValue = [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1];
-//	s.over.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
-//	s.down.texture.keyValue = [0.0, 0.4, 0.6, 0, 0.2, 0.4, 0.0, 0.4, 0.6];
-//	s.down.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
-	s.text.material.emissiveColor = new SFColor(1, 1, 1);
-
-	s = gwskin.get_class('root_icon');
-	s.text.material.emissiveColor = new SFColor(1, 1, 1);
-
-}
-
-
-function gwskin_set_default_control_height(value) {
-    gwskin.default_control_height = value;
-}
-
-function gwskin_set_default_icon_height(value) {
-    gwskin.default_icon_height = value;
-    
-    var fsize = 1;
-    if (value>50) fsize = 32;
-    else if (value>30) fsize = 22;
-    else if (value > 10) fsize = value - 10;
-             
-    gwskin.default_label_font_size = fsize;
-    gwskin.default_text_font_size = fsize;
-    
-    for (var i = 0; i < gwskin.styles.length; i++) {
-        if ((typeof gwskin.styles[i].font != 'undefined') && gwskin.styles[i].font) {
-            gwskin.styles[i].font.size = fsize;
-        }
-    }
-}
-
-
-//static
-function gwlib_filter_event(evt) {
-
-	if (evt.type == GF_EVENT_MOUSEDOWN) {
-		if (gw_ui_root.has_popup) {
-			//close all open popups
-			var count = gw_ui_root.children.length;
-			for (var i = count; i > 0; i--) {
-				var c = gw_ui_root.children[i - 1];
-				if (typeof c._popup != 'undefined') {
-					c.close();
-					if (count>gw_ui_root.children.length) i--;
-				}
-			}
-			gw_ui_root.has_popup = false;
-		}
-		gwskin.last_hit_x = evt.mouse_x;
-		gwskin.last_hit_y = evt.mouse_y;
-	}
-
-    if (gw_ui_top_wnd && gw_ui_top_wnd.on_event(evt)) return true;
-
-/*
- if ((evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')))
-        return false;
-*/
-	
-    for (var i = 0; i < gw_event_filters.length; i++) {
-        if (gw_event_filters[i](evt) == true) return true;
-    }
-    return false;
-}
-
-function gwlib_init(root_node) {
-    gw_ui_root = gw_new_container();
-    gw_ui_root._name = 'Root Display';
-    gw_ui_root.has_popup = false;
-    gw_add_child(root_node, gw_ui_root);
-
-    gw_ui_root.set_focus = function(wnd) {
-        gw_ui_top_wnd = null;
-        if (typeof wnd.on_event != 'undefined') {
-            gw_ui_top_wnd = wnd;
-        }
-        if (typeof (wnd._no_focus) == 'boolean') return;
-        gpac.set_focus(gw_ui_top_wnd);
-    }
-    
-    gw_ui_root.remove_focus = function(wnd) {
-        gw_ui_top_wnd = null;
-        for (var i = this.children.length; i > 0; i--) {
-            var c = this.children[i - 1];
-            if (c == wnd) continue;
-            if (!c.visible) continue;
-            
-            if (typeof c.on_event != 'undefined') {
-                gw_ui_top_wnd = c;
-                break;
-            }
-        }
-        if (typeof (wnd._no_focus) == 'boolean') return;
-        gpac.set_focus(gw_ui_top_wnd);
-    }
-    
-    gw_ui_root.add_child = function (child) {
-        this.children[this.children.length] = child;
-        this.set_focus(child);
-    }
-
-    gw_ui_root.remove_child = function (child) {
-        this.remove_focus(child);
-        this.removeChildren[0] = child;
-    }
-    gw_ui_top_wnd = null;
-    gw_event_filters = [];
-
-    gpac.set_event_filter(gwlib_filter_event);
-    gwskin.has_opengl = (gpac.get_option('Compositor', 'OpenGLMode') != 'disable') ? true : false;
-
-    gwskin.browser_mode = (gpac.get_option('Temp', 'BrowserMode') == 'yes') ? true : false;
-
-    gpac.focus_highlight = false;
-
-    gwskin.disable_transparency = false;
-    //remove window gradients 
-    if (!gwskin.has_opengl && !gpac.hardware_rgba) {
-        s = gwskin.get_style('window', 'normal');
-        s.texture = null;
-        gwskin.disable_transparency = true;
-        gwskin.default_window_alpha = 1;
-    }
-
-    var device = gpac.get_option('General', 'DeviceType');
-
-    if ((device == 'iOS') || (device == 'Android')) gwskin.mobile_device = true;
-    else gwskin.mobile_device = false;
-    
-    if (gwskin.mobile_device) {
-        var size = gw_display_width;
-        if (size> gw_display_height) size = gw_display_height;
-        gwskin_set_default_control_height(size/3);
-        gwskin_set_default_icon_height(size/3);
-    }
-    
-	gwskin_set_white_blue();
-
-    gwskin._to_string = function (obj) {
-            var res = '';
-            if (obj instanceof Array) {
-                res = '[';
-                for (var i = 0; i < obj.length; i++) {
-                    if (i) res += ', ';
-                    res += gwskin._to_string(obj[i]);
-                }
-                res += ']';
-            } else {
-                var first = true;
-                res = '{';
-                for (var prop in obj) {
-                    if (!first) res += ', ';
-                    res += '' + prop;
-                    res += ': ';
-                    if (typeof obj[prop] == 'string') {
-                        res += '"';
-                        res += obj[prop];
-                        res += '"';
-                    } else if (typeof obj[prop] == 'function') {
-                    } else if (typeof obj[prop] == 'object') {
-                        res += gwskin._to_string(obj[prop]);
-                    } else {
-                        res += obj[prop];
-                    }
-                    first = false;
-                }
-                res += '}';
-            }
-            return res;
-        }
-
-        gwskin.stringify = function (obj) {
-            return this._to_string(obj);
-        }
-        gwskin.parse = function (serial_obj) {
-            if (serial_obj.charAt(0) != '(') {
-                return eval('(' + serial_obj + ')' );
-            }
-            return eval(serial_obj);
-        }
-    
-}
-
-function gwlib_add_event_filter(evt_filter) {
-	if ((arguments.length==2) && (arguments[1]==true)) {
-		gw_event_filters.unshift(evt_filter);
-	} else {
-		gw_event_filters.push(evt_filter);
-	}
-}
-
-function gwlib_remove_event_filter(evt_filter) {
-    var idx = gw_event_filters.indexOf(evt_filter);
-    if (idx > -1) gw_event_filters.splice(idx, 1);
-}
-
-function gwlib_notify_display_size(width, height) {
-    for (var i = 0; i < gw_ui_root.children.length; i++) {
-        if (typeof gw_ui_root.children[i].on_display_size != 'undefined') {
-            gw_ui_root.children[i].on_display_size(width, height);
-        }
-    }
-}
-
-function gwlib_refresh_layout() {
-    for (var i = 0; i < gw_ui_root.children.length; i++) {
-        if (typeof gw_ui_root.children[i].layout != 'undefined') {
-            gw_ui_root.children[i].layout(gw_ui_root.children[i].width, gw_ui_root.children[i].height);
-        }
-    }
-}
-
-
-//static
-function gw_reset_hit(obj, is_over) {
-    if (is_over) {
-        if (gwskin.last_hitable_obj && (gwskin.last_hitable_obj != obj)) {
-            //reset isOver value of previous touch sensor
-            if (typeof (gwskin.last_hitable_obj._ts_idx) != 'undefined') {
-                gwskin.last_hitable_obj.children[gwskin.last_hitable_obj._ts_idx].isOver = false;
-            }
-            gwskin.last_hitable_obj._on_over(false);
-        }
-        gwskin.last_hitable_obj = obj;
-    } else if (gwskin.last_hitable_obj == obj) {
-        gwskin.last_hitable_obj = null;
-    }
-}
-
-//static
-function gw_add_child(container, child) {
-    if (container == null) container = gw_ui_root;
-
-    if (typeof (container.add_child) != 'undefined') {
-        container.add_child(child);
-    } else {
-        container.children[container.children.length] = child;
-    }
-    child.parent = container;
-}
-
-//static
-function gw_detach_child(child) {
-    /*detach all default routes*/
-    Browser.deleteRoute(child, 'ALL', null, null);
-    if (typeof (child._ps2d_idx) != 'undefined') {
-        Browser.deleteRoute(child.children[child._ps2d_idx], 'ALL', null, null);
-    }
-    if (typeof (child._ts_idx) != 'undefined') {
-        Browser.deleteRoute(child.children[child._ts_idx], 'ALL', null, null);
-    }
-    if (typeof (child.dlg) != 'undefined') child.dlg = null;
-    if (typeof (child.parent) == 'undefined') return;
-
-    var p = child.parent;
-    child.parent = null;
-    if (typeof (p.remove_child) != 'undefined') {
-        p.remove_child(child);
-    } else {
-        p.removeChildren[0] = child;
-    }
-    if (gwskin.last_hitable_obj == child) gwskin.last_hitable_obj = null;
-}
-
-//static
-function gw_close_child_list(list) {
-    var count = list.length;
-    if (!count) return;
-    for (var i = 0; i < count; i++) {
-        var child = list[i];
-        if (typeof child.close != 'undefined') child.close();
-        else gw_detach_child(child);
-
-        if (list.length < count) {
-            i -= (count - list.length);
-            count = list.length;
-        }
-    }
-    //trigger GC whenever we have closed a child list
-    gpac.trigger_gc();
-}
-
-
-//static
-gwskin.get_class = function (class_name) {
-    if (arguments.length < 1) class_name = 'default';
-
-    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
-    if (styles.length > 0) {
-        return styles[0];
-	}
-	return null;
-}
-
-//static
-gwskin.get_style = function (class_name, style_name) {
-    if (arguments.length < 1) class_name = 'default';
-    if (arguments.length < 2) style_name = 'normal';
-    if (style_name == 'invisible') return gwskin.appearance_transparent;
-
-    var style = null;
-    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
-    if (styles.length > 0) {
-        if (typeof styles[0][style_name] != 'undefined')
-            return styles[0][style_name];
-    } else {
-        gwlog(l_err, 'Non-existing class ' + class_name);
-    }
-
-    style = gwskin.styles[0];
-    if (typeof style[style_name] != 'undefined')
-        return style[style_name];
-
-    gwlog(l_err, 'Non-existing style ' + style_name + ' in default class');
-    return null;
-}
-
-//static
-gwskin.get_font = function (class_name) {
-    if (arguments.length < 1) class_name = 'default';
-
-    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
-    if (styles.length > 0) {
-        if (typeof styles[0].font != 'undefined') {
-            return styles[0].font;
-        }
-    } else {
-        gwlog(l_err, 'Non-existing class ' + class_name);
-    }
-    return gwskin.styles[0].font;
-}
-
-function gw_new_container() {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Container');
-    obj.push_to_top = function (wnd) {
-        this.removeChildren[0] = wnd;
-        this.addChildren[0] = wnd;
-    }
-    return obj;
-}
-
-function gw_new_curve2d(class_name) 
-{
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Curve2D');
-    var shape = new SFNode('Shape');
-    obj.children[0] = shape;
-    shape.appearance = gw_new_appearance(0, 0, 0);
-    obj.children[0].appearance.material.filled = false;
-    obj.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-
-    obj.set_color = function (r, g, b) {
-        this.children[0].appearance.material.lineProps.lineColor.r = r;
-        this.children[0].appearance.material.lineProps.lineColor.g = g;
-        this.children[0].appearance.material.lineProps.lineColor.b = b;
-    }
-    obj.set_line_width = function (width) {
-        if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-        this.children[0].appearance.material.lineProps.width = width;
-    }
-    shape.geometry = new SFNode('Curve2D');
-    shape.geometry.point = new SFNode('Coordinate2D');
-
-    obj.reset = function () {
-        this.children[0].geometry.point.point.length = 0;
-        this.children[0].geometry.type.length = 0;
-    }
-    obj._add_coord = function (x, y) {
-        var pts = this.children[0].geometry.point.point;
-        pts[pts.length] = new SFVec2f(x, y);
-    }
-    obj.add_move_to = function (x, y) {
-        this._add_coord(x, y);
-        //first moveto is implicit
-        if (this.children[0].geometry.type.length)
-            this.children[0].geometry.type[this.children[0].geometry.type.length] = 0;
-    }
-    obj.add_line_to = function (x, y) {
-        this._add_coord(x, y);
-        this.children[0].geometry.type[this.children[0].geometry.type.length] = 1;
-    }
-    obj.remove_first = function () {
-        var pts = this.children[0].geometry.point.point;
-        if (pts.length < 2) pts.length = 0;
-        else {
-            for (var i = 0; i < pts.length - 1; i++) {
-                pts[i] = pts[i + 1];
-            }
-            pts.length = i;
-            
-            pts = this.children[0].geometry.type;
-
-            for (var i = 0; i < pts.length - 1; i++) {
-                pts[i] = pts[i + 1];
-            }
-            pts.length = i;
-        }
-    }
-    obj.get_num_points = function() {
-        return this.children[0].geometry.point.point.length;
-    }
-    return obj;
-}
-
-
-function gw_new_rectangle(class_name, style) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Rectangle');
-    var shape = new SFNode('Shape');
-    obj.children[0] = shape;
-    if (arguments.length == 1) style = 'normal';
-
-    shape.appearance = gwskin.get_style(class_name, style);
-
-    if (shape.appearance && (typeof (shape.appearance.skin) == 'undefined')) {
-        obj.set_alpha = function (alpha) {
-            this.children[0].appearance.material.transparency = 1 - alpha;
-        }
-        obj.get_alpha = function () {
-            return 1 - this.children[0].appearance.material.transparency;
-        }
-        obj.set_fill_color = function (r, g, b) {
-            this.children[0].appearance.material.emissiveColor.r = r;
-            this.children[0].appearance.material.emissiveColor.g = g;
-            this.children[0].appearance.material.emissiveColor.b = b;
-        }
-        obj.set_strike_color = function (r, g, b) {
-            if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-            this.children[0].appearance.material.lineProps.lineColor.r = r;
-            this.children[0].appearance.material.lineProps.lineColor.g = g;
-            this.children[0].appearance.material.lineProps.lineColor.b = b;
-        }
-        obj.set_line_width = function (width) {
-            if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
-            this.children[0].appearance.material.lineProps.width = width;
-        }
-    } else {
-        obj.set_alpha = function (alpha) { }
-        obj.set_fill_color = function (r, g, b) { }
-        obj.set_strike_color = function (r, g, b) { }
-        obj.set_line_width = function (width) { }
-        obj.get_alpha = function () { return 1; }
-    }
-
-    obj.set_style = function (classname, style) {
-        var app = gwskin.get_style(classname, style);
-        if (app) this.children[0].appearance = app;
-    }
-
-
-    shape.geometry = new SFNode('Curve2D');
-    shape.geometry.point = new SFNode('Coordinate2D');
-
-    obj.corner_tl = true;
-    obj.corner_tr = true;
-    obj.corner_bl = true;
-    obj.corner_br = true;
-    obj.set_corners = function (tl, tr, br, bl) {
-        this.corner_tl = tl;
-        this.corner_tr = tr;
-        this.corner_bl = bl;
-        this.corner_br = br;
-    }
-    obj.sfv = new SFVec2f(0, 0);
-
-    obj.set_size = function (w, h) {
-        var hw, hh, rx_bl, ry_bl, rx_br, ry_br, rx_tl, ry_tl, rx_tr, ry_tr, rx, ry;
-        var temp;
-        hw = w / 2;
-        hh = h / 2;
-        this.width = w;
-        this.height = h;
-        temp = this.children[0].geometry.type;
-        temp[0] = 7;
-        temp[1] = 1;
-        temp[2] = 7;
-        temp[3] = 1;
-        temp[4] = 7;
-        temp[5] = 1;
-        temp[6] = 7;
-        temp[7] = 6; /*close*/
-
-        /*compute default rx/ry*/
-        ry = rx = 10;
-        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;
-        if (!this.corner_tl) rx_tl = ry_tl = 0;
-        if (!this.corner_tr) rx_tr = ry_tr = 0;
-        if (!this.corner_bl) rx_bl = ry_bl = 0;
-        if (!this.corner_br) rx_br = ry_br = 0;
-
-        if (shape.geometry.point.point.length < 12) {
-            shape.geometry.point.point.length = 12;
-            for (var i = 0; i < 12; i++) {
-                shape.geometry.point.point[i].x = 0;
-            }
-        }
-        temp = this.children[0].geometry.point.point;
-
-        this.sfv.x = hw - rx_tr;
-        this.sfv.y = hh;
-        temp[0] = this.sfv;
-        this.sfv.x = hw; 
-        this.sfv.y = hh; /*bezier ctrl point or line-to*/
-        temp[1] = this.sfv;
-        this.sfv.x = hw;
-        this.sfv.y = hh - ry_tr;
-        temp[2] = this.sfv;
-        this.sfv.x = hw; 
-        this.sfv.y = -hh + ry_br;
-        temp[3] = this.sfv;
-        this.sfv.x = hw;
-        this.sfv.y = -hh; /*bezier control point*/
-        temp[4] = this.sfv;
-        this.sfv.x = hw - rx_br;
-        this.sfv.y = -hh;
-        temp[5] = this.sfv;
-        this.sfv.x = -hw + rx_bl;
-        this.sfv.y = -hh;
-        temp[6] = this.sfv;
-        this.sfv.x = -hw;
-        this.sfv.y = -hh; /*bezier control point*/
-        temp[7] = this.sfv;
-        this.sfv.x = -hw;
-        this.sfv.y = -hh + ry_bl;
-        temp[8] = this.sfv;
-        this.sfv.x = -hw;
-        this.sfv.y = hh - ry_tl;
-        temp[9] = this.sfv;
-        this.sfv.x = -hw;
-        this.sfv.y = hh; /*bezier control point*/
-        temp[10] = this.sfv;
-        this.sfv.x = -hw + rx_tl;
-        this.sfv.y = hh;
-        temp[11] = this.sfv;
-    }
-    return obj;
-}
-
-function gw_new_text(parent, label, class_name) {
-    var obj = new SFNode('Transform2D');
-    if (arguments.length < 3) class_name = 'default';
-
-    setup_gw_object(obj, 'Text');
-    gw_add_child(parent, obj);
-    obj.children[0] = new SFNode('Transform2D');
-    obj.children[0].children[0] = new SFNode('Shape');
-    obj.children[0].children[0].geometry = new SFNode('Text');
-
-    if (class_name == 'custom') {
-        class_name = 'default';
-        obj.children[0].children[0].appearance = gw_new_appearance(0, 0, 0);
-        obj.children[0].children[0].geometry.fontStyle = gw_new_fontstyle(gwskin.default_label_font_size, 1);
-    } else {
-        obj.children[0].children[0].appearance = gwskin.get_style(class_name, 'text');
-        obj.children[0].children[0].geometry.fontStyle = gwskin.get_font(class_name);
-    }
-
-
-
-    obj.set_label = function (value) {
-        this.children[0].children[0].geometry.string.length = 0;
-        this.children[0].children[0].geometry.string[0] = value;
-    }
-
-    obj.set_labels = function () {
-        this.children[0].children[0].geometry.string.length = 0;
-        for (var i = 0; i < arguments.length; i++) {
-            this.children[0].children[0].geometry.string[i] = '' + arguments[i];
-        }
-    }
-    obj.get_label = function () {
-        var mfs = this.children[0].children[0].geometry.string;
-        return mfs.length ? this.children[0].children[0].geometry.string[0] : '';
-    }
-    obj.set_width = function (value) {
-        this.children[0].children[0].geometry.maxExtent = -value;
-        this.width = value;
-    }
-    obj.font_size = function (value) {
-        return this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.size : 1;
-    }
-
-    if (obj.children[0].children[0].appearance && (typeof (obj.children[0].children[0].appearance.skin) == 'undefined')) {
-        obj.set_color = function (r, g, b) {
-            this.children[0].children[0].appearance.material.emissiveColor = new SFColor(r, g, b);
-        }
-        obj.children[0].set_alpha = function (a) {
-            this.children[0].children[0].appearance.material.transparency = 1 - a;
-        }
-        obj.set_align = function (val) {
-            this.children[0].children[0].geometry.fontStyle.justify[0] = val;
-        }
-        obj.set_font_size = function (val) {
-            this.children[0].children[0].geometry.fontStyle.size = val;
-        }
-    } else {
-        obj.set_color = function (r, g, b) { }
-        obj.set_alpha = function (a) { }
-        obj.set_align = function (a) { }
-        obj.set_font_size = function (a) { }
-    }
-    obj.set_size = function (width, height) {
-        var justify = this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.justify[0] : '';
-        if (justify == 'BEGIN') {
-            this.children[0].translation.x = -width / 2;
-        } else if (justify == 'END') {
-            this.children[0].translation.x = width / 2;
-        } else {
-            this.children[0].translation.x = 0;
-        }
-        this.children[0].children[0].geometry.maxExtent = -width;
-        this.width = width;
-        this.height = height;
-    }
-    if (label) obj.set_label(label);
-    return obj;
-}
-
-
-function gw_new_window(parent, offscreen, background, class_name, no_focus) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Window');
-    obj.background = null;
-    obj._is_window = true;
-
-    if (arguments.length < 4) class_name = 'window';
-    else if ((arguments.length == 4) && typeof (arguments[3]) == 'boolean') {
-        obj._no_focus = true;
-        class_name = 'window';
-    }
-    else if (arguments.length == 5) obj._no_focus = true;
-
-    if (class_name == 'popup') {
-        class_name = 'window';
-        obj._popup = true;
-    }
-
-    if (background)
-        obj.background = gw_new_rectangle(class_name);
-    obj.visible = false;
-    obj.scale.x = obj.scale.y = 0;
-    obj._disable_rect = gw_new_rectangle(class_name, 'invisible');
-
-    obj.on_event = function (evt) { return 0; }
-
-    obj.set_style = function (classname, style) {
-        if (this.background)
-            this.background.set_style(classname, style);
-    }
-    if (!offscreen) {
-        if (obj.background) gw_add_child(obj, obj.background);
-        var item = new SFNode('Layer2D');
-        setup_gw_object(item, 'Layer');
-        gw_add_child(obj, item);
-        obj.set_size = function (width, height) {
-            this.width = width;
-            this.height = height;
-            var idx = 0;
-            if (this.background) {
-                this.children[0].set_size(width, height);
-                idx++;
-            }
-            this.children[idx].size.x = width;
-            this.children[idx].size.y = height;
-            this.layout(width, height);
-        }
-        obj.set_alpha = function (alpha) {
-            if (this.background) {
-                this.children[0].set_alpha(alpha);
-            }
-        }
-        obj.get_alpha = function () {
-            if (this.background) {
-                return this.children[0].get_alpha();
-            }
-            return 0.0;
-        }
-        obj.add_child = function (child) {
-            var idx = this.background ? 1 : 0;
-            this.children[idx].children[this.children[idx].children.length] = child;
-        }
-        obj.remove_child = function (child) {
-            var idx = this.background ? 1 : 0;
-            this.children[idx].removeChildren[0] = child;
-        }
-        obj._wnd_close = function () {
-            obj.background = null;
-            obj._disable_rect = null;
-            gw_close_child_list(this.children);
-        }
-    } else {
-        var shape = new SFNode('Shape');
-        shape.appearance = new SFNode('Appearance');
-        shape.appearance.material = new SFNode('Material2D');
-        shape.appearance.material.filled = TRUE;
-        shape.appearance.texture = new SFNode('CompositeTexture2D');
-
-        if (obj.background) {
-            //use background to make sure the underlying texture is RGB, not RGBA
-            if (!gwskin.disable_transparency) {
-                shape.appearance.texture.children[0] = obj.background;
-            } else {
-                shape.appearance.texture.background = gwskin.no_gl_window_back;
-
-            }
-        }
-        shape.geometry = new SFNode('Bitmap');
-        obj.children[0] = shape;
-
-        obj.set_size = function (width, height) {
-            this.width = width;
-            this.height = height;
-            this.children[0].appearance.texture.pixelWidth = width;
-            this.children[0].appearance.texture.pixelHeight = height;
-            this.children[0].appearance.texture.children[0].set_size(width, height);
-            this.layout(width, height);
-        }
-
-        obj.set_alpha = function (alpha) {
-            //disable image blending for offscreens with backgrounds
-            if (this.background && gwskin.disable_transparency) alpha = 1;
-
-            this.children[0].appearance.material.transparency = 1 - alpha;
-        }
-        obj.get_alpha = function () {
-            return 1 - this.children[0].appearance.material.transparency;
-        }
-
-        obj.add_child = function (child) {
-            this.children[0].appearance.texture.children[this.children[0].appearance.texture.children.length] = child;
-        }
-        obj.remove_child = function (child) {
-            this.children[0].appearance.texture.removeChildren[0] = child;
-        }
-        obj._wnd_close = function () {
-            obj.background = null;
-            obj._disable_rect = null;
-            gw_close_child_list(this.children[0].appearance.texture.children);
-        }
-    }
-    obj._pre_destroy = obj._wnd_close;
-    obj.set_corners = function (tl, tr, br, bl) {
-        if (this.background)
-            this.background.set_corners(tl, tr, br, bl);
-    }
-
-    obj._is_disable = false;
-    obj.disable = function () {
-        if (this._is_disable) return;
-        this._is_disable = true;
-        this._disable_rect.set_size(this.width, this.height);
-        this.add_child(this._disable_rect);
-    }
-    obj.enable = function () {
-        if (!this._is_disable) return;
-        this._is_disable = false;
-        this.remove_child(this._disable_rect);
-    }
-
-    if (typeof obj._popup != 'boolean') {
-        var s = gwskin.get_class(class_name);
-
-        if (s) {
-            if (typeof s.show != 'undefined') obj.show = s.show;
-            if (typeof s.hide != 'undefined') obj.hide = s.hide;
-        }
-    }
-
-    obj.on_close = null;
-    obj._orig_close = obj.close;
-    obj._on_wnd_close = function () {
-        if (this.on_close != null) this.on_close();
-        this._orig_close();
-    }
-    obj.close = function () {
-        this.hide(this._on_wnd_close);
-    }
-    obj.layout = function (w, h) { }
-
-    obj.set_alpha(gwskin.default_window_alpha);
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_image(parent, src_url) {
-	var obj = new SFNode('Transform2D');
-	setup_gw_object(obj, 'Image');
-	obj.children[0] = new SFNode('Layer2D');
-	obj.children[0].children[0] = new SFNode('Inline');
-	obj.children[1] = gw_new_rectangle('default', 'invisible');
-	gw_object_set_hitable(obj.children[1]);
-
-	obj.on_click = null;
-	obj.children[1]._par = obj;
-	obj.children[1].on_click = function() {
-		if (this._par.on_click) this._par.on_click();
-	}
-	obj.set_image = function(src_url) {
-		var inl = gw_load_resource(src_url, false);
-		this.children[0].children[0] = inl;
-	}
-	obj.set_size = function(width, height) {
-		this.children[0].size.x = width;
-		this.children[0].size.y = height;
-		this.width = width;
-		this.height = height;
-		this.children[1].set_size(width, height);
-	}
-	obj._pre_destroy = function () {
-		this.children[0].children.length = 0;
-	}
-	obj.on_event = function () { return false; }
-
-	obj.set_image(src_url);
-	
-	gw_add_child(parent, obj);
-	return obj;
-}
-
-
-function gw_new_icon_button(parent, icon_url, label, horizontal, class_name) {
-    var touch;
-    
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'IconButton');
-
-    if (arguments.length == 3) {
-        horizontal = false;
-        class_name = 'default';
-    }
-    else if (arguments.length == 4) {
-        if (typeof arguments[3] == 'string') {
-            class_name = arguments[3];
-            horizontal = false;
-        } else {
-            class_name = 'default';
-        }
-    }
-
-    obj._icon_root = new SFNode('Transform2D');
-    obj._icon_root.children[0] = new SFNode('Layer2D');
-    obj._touch = new SFNode('TouchSensor');
-
-    obj._show_highlight = false;
-    obj._is_icon = false;
-    obj._tooltip = true;
-    if (class_name == 'image') {
-		obj._is_icon = false;
-		obj._tooltip = false;
-		class_name = 'default';
-    }
-	else if (class_name == 'icon') {
-		obj._is_icon = true;
-		obj._highlight = gw_new_rectangle(class_name, 'invisible');
-	}
-    else if (class_name == 'icon_label') {
-        obj._is_icon = true;
-        obj._show_highlight = false;
-        class_name = 'checkbox';
-    }
-    else if (class_name == 'listitem') {
-        obj._is_icon = true;
-        obj._show_highlight = true;
-		obj._highlight = gw_new_rectangle(class_name, 'invisible');
-        obj._tooltip = false;
-    } else {
-        obj._highlight = gw_new_rectangle(class_name, 'invisible');
-        obj._show_highlight = true;
-    }
-
-    if (obj._highlight)
-        obj.children[0] = obj._highlight;
-
-    obj.children[obj.children.length] = obj._icon_root;
-    obj.children[obj.children.length] = obj._touch;
-    obj._label = null;
-
-    var skip_label = (label == null) ? true : false;
-
-    if (!skip_label && gwskin.get_font(class_name) != null) {
-        obj._label = gw_new_text(obj, label, class_name);
-        if (horizontal) {
-            obj.set_size = function (width, height) {
-                this._icon_root.children[0].size.x = height;
-                this._icon_root.children[0].size.y = height;
-                this._icon_root.translation.x = (height - width) / 2;
-                if (this._highlight)
-                    this._highlight.set_size(width, height);
-                this._label.set_width(width - height);
-                this._label.translation.x = height - width / 2;
-                this.width = width;
-                this.height = height;
-            };
-        } else {
-            obj.set_size = function (width, height) {
-                var fsize = this._label.font_size();
-
-                var h = height - fsize - gwskin.default_icon_text_spacing;
-                this._icon_root.children[0].size.x = h;
-                this._icon_root.children[0].size.y = h;
-                this._icon_root.translation.y = (height - h) / 2;
-                var w = width;
-                if (this._highlight)
-                    this._highlight.set_size(w, height);
-                this._label.set_width(w);
-                this._label.translation.y = -height / 2 + fsize / 2;
-                this.width = w;
-                this.height = height;
-            };
-        }
-        obj.set_label = function (label) {
-            this._label.set_label(label);
-        }
-        obj.get_label = function () {
-			return this._label ? this._label.get_label() : null;
-        }
-    } else {
-        obj.set_size = function (width, height) {
-            this._icon_root.children[0].size.x = width;
-            this._icon_root.children[0].size.y = height;
-            if (this._highlight)
-                this._highlight.set_size(width, height);
-            this.width = width;
-            this.height = height;
-        };
-        obj.set_label = function (label) {
-            this.label = label;
-        }
-        obj.get_label = function () {
-            return this.label;
-        }
-    }
-
-    obj._last_ts = 0;
-    obj.on_long_click = NULL;
-    obj.on_click = NULL;
-    obj.on_over = null;
-    obj.down = false;
-    obj.over = false;
-    obj._on_active = function (value, timestamp) {
-        if (value) {
-            this.down = true;
-            if (this._is_icon) {
-                var app = gwskin.get_style(class_name, 'down');
-                this._icon_root.children[0].children[0].set_style(app);
-            }
-
-            if (this._show_highlight) {
-                this._highlight.set_style(class_name, 'down');
-            }
-
-            this._last_ts = timestamp;
-        } else {
-            if (this._is_icon) {
-                var app = gwskin.get_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'normal');
-                this._icon_root.children[0].children[0].set_style(app);
-            }
-
-            if (this._show_highlight) {
-                this._highlight.set_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'invisible');
-            }
-
-            if (this.down) {
-                if (this.on_long_click && (timestamp - this._last_ts > gwskin.long_click_delay)) this.on_long_click();
-                else if (this.on_click) this.on_click();
-            }
-            this.down = false;
-        }
-    };
-    obj._on_over = function (value) {
-        this.over = value;
-        gw_reset_hit(this, value);
-
-        if (gwskin.pointing_device) {
-            if (this._is_icon) {
-                var app = gwskin.get_style(class_name, value ? 'over' : 'normal');
-                if (app) {
-                    this._icon_root.children[0].children[0].set_style(app);
-                }
-            }
-
-            if (this._show_highlight) {
-                this._highlight.set_style(class_name, value ? 'over' : 'invisible');
-            }
-
-            if (this.on_over) this.on_over(value);
-            if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
-        }
-    };
-    Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
-    Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
-
-    obj.icons = [];
-    obj.add_icon = function (url) {
-
-        if (typeof url == 'string') {
-            var inl;
-            if (typeof gwskin.images[url] != 'undefined') {
-                inl = gw_load_resource(gwskin.images[url], this._is_icon);
-            } else {
-                inl = gw_load_resource(url, this._is_icon);
-            }
-        } else {
-            var inl = url;
-        }
-        this.icons[this.icons.length] = inl;
-
-        if (this._icon_root.children[0].children.length == 0) {
-            this._icon_root.children[0].children[0] = this.icons[0];
-        }
-    }
-    obj.switch_icon = function (idx) {
-        while (idx > this.icons.length) idx -= this.icons.length;
-        this._icon_root.children[0].children[0] = this.icons[idx];
-    }
-		
-    obj._pre_destroy = function () {
-        for (var i in this.icons) {
-            gw_unload_resource(this.icons[i]);
-        }
-        this.icons.length = 0;
-        this._highlight = null;
-        this._icons = null;
-        this._label = null;
-        Browser.deleteRoute(this._touch, 'ALL', null, null);
-        this._touch = null;
-    }
-
-    if (icon_url) obj.add_icon(icon_url);
-    obj.set_label(label);
-
-    obj.enable = function() {
-		this._touch.enabled = true;
-		this._on_over(false);
-	}
-    obj.disable = function() {
-		this._touch.enabled = false;
-		var app = gwskin.get_style(class_name, 'disable');
-		if (app) {
-			this._icon_root.children[0].children[0].set_style(app);
-		}
-	}
-
-
-    obj.on_event = function () { return false; }
-
-    if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
-        obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
-    } else {
-        obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
-    }
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_icon(parent, icon_name) {
-    return gw_new_icon_button(parent, gwskin.images[icon_name], gwskin.labels[icon_name], false, 'icon');
-}
-
-function gw_new_checkbox(parent, label) {
-    var touch;
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'CheckBox');
-
-    obj._icon_root = new SFNode('Transform2D');
-    obj._icon_root.children[0] = new SFNode('Layer2D');
-    obj._touch = new SFNode('TouchSensor');
-
-    var class_name = 'checkbox';
-
-    obj.children[0] = gw_new_rectangle(class_name, 'invisible');
-    obj.children[1] = obj._icon_root;
-    gw_new_text(obj, label, class_name);
-    obj.children[3] = obj._touch;
-
-    obj.set_size = function (width, height) {
-        this._icon_root.children[0].size.x = height;
-        this._icon_root.children[0].size.y = height;
-        this._icon_root.translation.x = (height - width) / 2;
-        this.children[0].set_size(width, height);
-        this.children[2].set_width(width - height);
-        this.children[2].translation.x = (height - width) / 2 + height;
-        this.width = width;
-        this.height = height;
-    };
-
-    obj.set_label = function (label) {
-        this.children[2].set_label(label);
-    }
-    obj.get_label = function () {
-        return this.children[2].get_label();
-    }
-    obj.on_check = NULL;
-    obj.down = false;
-    obj.over = false;
-    obj._checked = false;
-    obj._on_active = function (value, timestamp) {
-        if (value) {
-            this.down = true;
-        } else {
-            if (this.down && this.over) {
-                this._set_checked(!this._checked);
-                if (this.on_check) this.on_check(this._checked);
-            }
-            this.down = false;
-        }
-    };
-    obj._on_over = function (value) {
-        this.over = value;
-        gw_reset_hit(this, value);
-
-        if (gwskin.pointing_device) {
-                        var app = gwskin.get_style(class_name, value ? 'over' : (this._checked ? 'down' : 'normal') );
-                        if (app) {
-                            this._icon_root.children[0].children[0].set_style(app);
-                        }
-            if (this.on_over) this.on_over(value);
-            if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
-        }
-    };
-    Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
-    Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
-
-
-    obj._set_checked = function (value) {
-        this._checked = value;
-        var app = gwskin.get_style(class_name, value ? 'down' : 'normal');
-        this._icon_root.children[0].children[0].set_style(app);
-    }
-    obj.set_checked = function (value) {
-        this._set_checked(value);
-    }
-    obj._icon_root.children[0].children[0] = gw_load_resource(gwskin.images.check, true);
-
-    obj._pre_destroy = function () {
-        for (var i in this.icons) {
-            gw_unload_resource(this.icons[i]);
-        }
-        Browser.deleteRoute(this._touch, 'ALL', null, null);
-        this._touch = null;
-        this._icon_root = null;
-    }
-    obj.set_label(label);
-
-    obj.on_event = function () { return false; }
-
-    if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
-        obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
-    } else {
-        obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
-    }
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-
-function gw_new_spincontrol(parent, horizontal) {
-    var touch;
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'SpinControl');
-
-    obj.value = 0;
-    if (arguments.length < 2) horizontal = false;
-    obj._horizontal = horizontal;
-    obj.on_click = function () { }
-    var tool = gw_new_icon(obj, horizontal ? 'right' : 'up');
-
-    obj.min = 0;
-    obj.max = -1;
-    tool.on_click = function () {
-        if (this.parent.min < this.parent.max) {
-            if (this.parent.value >= this.parent.max) {
-                return;
-            }
-        }
-        this.parent.value++;
-        this.parent.on_click(this.parent.value);
-    }
-    tool = gw_new_icon(obj, horizontal ? 'left' : 'down');
-    tool.on_click = function () {
-        if (this.parent.min < this.parent.max) {
-            if (this.parent.value <= this.parent.min) {
-                return;
-            }
-        }
-        this.parent.value--;
-        this.parent.on_click(this.parent.value);
-    }
-
-    obj.set_size = function (width, height) {
-        if (this._horizontal) {
-            this.children[0].set_size(width / 2, height);
-            this.children[1].set_size(width / 2, height);
-            this.children[0].translation.x = width / 4;
-            this.children[1].translation.x = -width / 4;
-        } else {
-            this.children[0].set_size(width, height / 2);
-            this.children[1].set_size(width, height / 2);
-            this.children[0].translation.y = height / 4;
-            this.children[1].translation.y = -height / 4;
-        }
-        this.width = width;
-        this.height = height;
-    };
-    obj._idx = 0;
-    obj.on_event = function (evt) {
-        if (evt.type == GF_EVENT_KEYDOWN) {
-            var idx = this._idx;
-            if (this._horizontal) {
-                if (evt.keycode == 'Left') idx--;
-                else if (evt.keycode == 'Right') idx++;
-                else return false;
-            } else {
-                if (evt.keycode == 'Up') idx--;
-                else if (evt.keycode == 'Down') idx++;
-                else return false;
-            }
-            if (idx < 0) {
-                return false;
-            }
-            if (idx > 1) {
-                return false;
-            }
-            this._idx = idx;
-            gpac.set_focus(this.children[idx]);
-            return true;
-        }
-        return false;
-    }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-
-
-function gw_new_subscene(parent) {
-    var inline = new SFNode('Inline');
-    inline._name = 'Subscene';
-    inline._pre_destroy = function () {
-        this.url[0] = '';
-        this.url.length = 0;
-    }
-    inline.connect = function (url) {
-        this.url.length = 0;
-        this.url[0] = url;
-    }
-    gw_add_child(parent, inline);
-    return inline;
-}
-
-function gw_new_button(parent, text, class_name) {
-    var label;
-    if (arguments.length < 3) class_name = 'button';
-    obj = gw_new_rectangle(class_name, 'normal');
-    label = gw_new_text(obj, text, class_name);
-    gw_object_set_hitable(obj);
-    obj.on_over = function (value) {
-        if (gwskin.pointing_device) {
-            this.set_style(class_name, value ? 'over' : 'normal');
-        }
-        //if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
-    }
-    obj.on_down = function (val) {
-        this.set_style(class_name, val ? 'down' : (this._over ? 'over' : 'normal'));
-    }
-
-    obj._set_size = obj.set_size;
-    obj.set_size = function (width, height) {
-        this._set_size(width, height);
-        this.children[1].set_size(width, height);
-        this.children[1].set_width(width);
-    };
-    obj.set_label = function (label) {
-        this.children[1].set_label(label);
-    }
-    obj.get_label = function () {
-        return this.children[1].get_label();
-    }
-    obj.set_labels = function () {
-        this.children[1].set_labels.apply(this.children[1], arguments);
-    }
-    obj.on_event = function (x, y) { return false; }
-
-    obj.disable = function () {
-        this._disable_touch();
-    }
-    obj.enable = function () {
-        this._enable_touch();
-    }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-function gw_new_gauge(parent, text) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'ProgressBar');
-
-    if (arguments.length <= 3) class_name = 'progress';
-
-    obj.children[0] = gw_new_rectangle(class_name, 'normal');
-    obj.children[1] = gw_new_rectangle(class_name, 'over');
-    gw_new_text(obj, text, class_name);
-
-
-    obj._value = 75;
-    obj._set_size = obj.set_size;
-    obj.set_size = function (width, height) {
-        this._set_size(width, height);
-        this.children[0].set_size(width, height);
-
-        this.children[1].set_size(this._value * width / 100, height);
-        this.children[1].move((this._value - 100) * width / 200, 0);
-
-        this.children[2].set_size(width, height);
-        this.children[2].set_width(width);
-    };
-    obj.set_label = function (label) {
-        this.children[2].set_label(label);
-    }
-    obj.get_label = function () {
-        return this.children[2].get_label();
-    }
-
-    obj.set_value = function (val) {
-        this._value = (val > 100) ? 100 : ((val < 0) ? 0 : val);
-        this.set_size(this.width, this.height);
-    }
-
-    obj.on_event = function (x, y) { return false; }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-
-function grid_event_navigate(dlg, children, type) {
-    var i;
-    if (dlg.current_focus == -1) {
-        if (type == 'Left') return false;
-        dlg.current_focus = 0;
-        gpac.set_focus(children[0]);
-        return true;
-    }
-
-    if (type == 'Right') {
-        var orig_focus = dlg.current_focus;
-        var switch_page = 0;
-        var tr = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
-        if (dlg.current_focus + 1 == children.length) {
-            dlg.current_focus = orig_focus;
-            gpac.set_focus(children[dlg.current_focus]);
-            return false;
-        }
-        /*goto right item*/
-        dlg.current_focus++;
-        /*check we are not going down*/
-        while (1) {
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > tr))
-                break;
-            if (dlg.current_focus + 1 == children.length) {
-                dlg.current_focus = orig_focus;
-                gpac.set_focus(children[dlg.current_focus]);
-                return false;
-            }
-            dlg.current_focus++;
-            switch_page = 1;
-        }
-        /*check we haven't move to a new page*/
-        if (children[orig_focus].translation.y + children[orig_focus].height / 2 <= children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2) {
-            switch_page = 1;
-        }
-
-    }
-    else if (type == 'Left') {
-        var orig_focus = dlg.current_focus;
-        var switch_page = 0;
-        var tr = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
-        if (!dlg.current_focus) {
-            dlg.current_focus = -1;
-            gpac.set_focus(null);
-            return false;
-        }
-        /*goto left item*/
-        dlg.current_focus--;
-        /*check we are not going up*/
-        while (1) {
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < tr))
-                break;
-            if (!dlg.current_focus) {
-                dlg.current_focus = orig_focus;
-                return false;
-            }
-            dlg.current_focus--;
-            switch_page = -1;
-        }
-        /*check we haven't move to a new page*/
-        if (children[orig_focus].translation.y - children[orig_focus].height / 2 >= children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2) {
-            switch_page = -1;
-        }
-    }
-    else if (type == 'Down') {
-        var orig_focus = dlg.current_focus;
-        var switch_page = 0;
-        var bottom_y = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
-        var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
-        if (dlg.current_focus + 1 == children.length) return false;
-        dlg.current_focus++;
-        /*goto next line*/
-        while (1) {
-            //next child below current
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < bottom_y))
-                break;
-            //next child above current - we need a page swicth
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y)) {
-                switch_page = 1;
-                break;
-            }
-            //not found
-            if (dlg.current_focus + 1 == children.length) {
-                dlg.current_focus = orig_focus;
-                return false;
-            }
-            dlg.current_focus++;
-        }
-        /*find closest item on the left*/
-        var tx = children[orig_focus].translation.x - children[orig_focus].width / 2;
-        while (1) {
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x + children[dlg.current_focus].width / 2 > tx))
-                break;
-            if (dlg.current_focus + 1 == children.length) break;
-            dlg.current_focus++;
-        }
-    }
-    else if (type == 'Up') {
-        var orig_focus = dlg.current_focus;
-        var switch_page = 0;
-        var bottom_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
-        var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
-        if (!dlg.current_focus) return false;
-        dlg.current_focus--;
-        /*goto previous line*/
-        while (1) {
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y))
-                break;
-            //next child below current - we need a page swicth
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 < bottom_y)) {
-                switch_page = -1;
-                break;
-            }
-            if (!dlg.current_focus) {
-                dlg.current_focus = orig_focus;
-                return false;
-            }
-            dlg.current_focus--;
-        }
-        /*goto above child*/
-        var tx = children[orig_focus].translation.x + children[orig_focus].width / 2;
-        while (1) {
-            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x - children[dlg.current_focus].width / 2 < tx))
-                break;
-            if (!dlg.current_focus) {
-                dlg.current_focus = orig_focus;
-                return false;
-            }
-            dlg.current_focus--;
-        }
-    } else {
-        return false;
-    }
-    if (switch_page == 1) return dlg.on_next_page();
-    else if (switch_page == -1) return dlg.on_prev_page();
-    if (typeof children[dlg.current_focus].on_event == 'undefined') {
-        return grid_event_navigate(dlg, children, type);
-    }
-
-    gpac.set_focus(children[dlg.current_focus]);
-    return true;
-}
-
-
-
-function gw_new_grid_container(parent) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Layout');
-
-    obj.children[0] = new SFNode('Layer2D');
-    obj._container = new SFNode('Transform2D');
-    obj.children[0].children[0] = obj._container;
-    obj._all_children = [];
-    obj._pages = [];
-
-    obj.on_page_changed = null;
-
-    obj.on_prev_page = function () {
-        this._move_page(-1);
-        return true;
-    };
-    obj.on_next_page = function () {
-        this._move_page(1);
-        return true;
-    };
-
-    obj.is_first_page = function () {
-        return this._page_idx == 0 ? true : false;
-    }
-    obj.is_last_page = function () {
-        return this._page_idx == (this._pages.length - 1) ? true : false;
-    }
-    obj._page_idx = 0;
-    obj._max_page_idx = 0;
-    obj._move_page = function (value) {
-        this._page_idx += value;
-        var i, child, last_child = 0;
-
-        if (this._page_idx <= 0) {
-            this._page_idx = 0;
-        }
-
-        if (this._page_idx * this.width >= this.max_width) {
-            this._page_idx = this.max_width / this.width;
-        }
-
-        this._container.translation.x = -this._page_idx * this.width;
-        this._container.children.length = 0;
-        if (this._page_idx + 1 >= this._pages.length) {
-            last_child = this._all_children.length;
-        } else {
-            last_child = this._pages[this._page_idx + 1];
-        }
-
-        i = 0;
-        child = this._pages[this._page_idx];
-        if (this.current_focus >= 0) {
-            if (this.current_focus < child) this.current_focus = child;
-            else if (this.current_focus >= last_child) this.current_focus = last_child - 1;
-            gpac.set_focus(this._all_children[this.current_focus]);
-        }
-
-
-        while (child < last_child) {
-            this._container.children[i] = this._all_children[child];
-            child++;
-            i++;
-        }
-        if (this.on_page_changed) this.on_page_changed();
-
-    }
-
-    obj.spread_h = false;
-    obj.spread_v = false;
-    obj.break_at_hidden = false;
-    obj.break_at_line = 0;
-
-    obj.set_focus_last = function () {
-        this._page_idx = this._pages.length ? this._pages.length - 1 : 0;
-        this.current_focus = this._all_children.length;
-        this._move_page(0);
-    }
-    obj.set_focus_first = function () {
-        this._page_idx = 0;
-        this.current_focus = 0;
-        this._move_page(0);
-    }
-
-    obj.set_size = function (width, height) {
-        this.width = width;
-        this.height = height;
-        this.children[0].size.x = width;
-        this.children[0].size.y = height;
-        this.nb_visible = 0;
-        this.current_focus = -1;
-        this.layout();
-    }
-    obj.max_width = 0;
-    obj.layout = function () {
-        var spread_x, nb_wid_h, start_x, start_y, maxh, width, height, page_x, nb_on_line;
-        var children = this._all_children;
-        var width = this.width;
-        var height = this.height;
-
-        if (width <= 0) return;
-        if (height <= 0) return;
-
-        if (typeof this.on_size != 'undefined')
-            this.on_size(width, height);
-
-        var page_x = 0;
-        var maxh = 0;
-        var spread_x = -1;
-        var start_x = -width / 2;
-        var init_y = this.height / 2;
-        var start_y = init_y;
-        var nb_on_line = 0;
-
-        this._pages = [0];
-
-        for (var i = 0; i < children.length; i++) {
-            
-            //start of line: compute H spread and max V size
-            if (spread_x == -1) {
-                var j = 0, len = 0, maxh = 0, nb_child = 0, nb_spread_child = 0;
-                start_x = -width / 2 + page_x;
-                while (1) {
-                    if (!children[i + j].visible) {
-                        j++;
-                        if (i + j == children.length) break;
-                        if (this.break_at_hidden) break;
-                        if (typeof (children[i+j-1].__separator) == 'boolean') break;
-                        continue;
-                    }
-                    if (len + children[i + j].width > width) break;
-                    len += children[i + j].width;
-                    if (maxh < children[i + j].height) maxh = children[i + j].height;
-                    j++;
-                    nb_child++;
-                    if ((i + j < children.length) && (typeof children[i+j].stick_to_previous == 'boolean') && children[i+j].stick_to_previous) {
-                    } else {
-                        nb_spread_child++;
-                    }
-
-                    if (this.break_at_line) break;
-                    if (i + j == children.length) break;
-                }
-                if (nb_child <= 1) {
-                    maxh = children[i].height;
-                    if (this.spread_h && !this.break_at_line) start_x = -len / 2;
-                }
-                else if (this.spread_h && nb_spread_child) {
-                    spread_x = (width - len) / (nb_spread_child);
-                    start_x += spread_x / 2;
-                } else {
-                    spread_x = 0;
-                }
-            }
-
-            if (!children[i].visible) {
-                if (nb_on_line && ( this.break_at_hidden || (typeof (children[i].__separator) == 'boolean')) ) {
-
-                    nb_on_line = 0;
-                    spread_x = -1;
-                    start_y -= maxh / 2;
-                    start_x = -width / 2;
-                }
-                continue;
-            }
-            if (start_y - maxh < -height / 2) {
-                //push new page only if not empty! (otherwise we've been asked to layout in a too small grid ...)
-                if (!this._pages.length || this._pages[this._pages.length - 1] < i) {
-                    nb_on_line = 0;
-                    page_x += width;
-                    spread_x = -1;
-                    start_y = init_y;
-                    this._pages.push(i);
-                    i--;
-                    continue;
-                }
-            }
-            children[i].translation.x = start_x + children[i].width / 2;
-            children[i].translation.y = start_y - maxh / 2;
-
-            if ((i + 1 < children.length) && (typeof children[i + 1].stick_to_previous == 'boolean') && children[i+1].stick_to_previous) {
-                start_x += children[i].width;
-            } else {
-                start_x += children[i].width + spread_x;
-            }
-
-            nb_on_line++;
-
-            if (i + 1 == children.length) {
-                break;
-            }
-            if ((nb_on_line == nb_child) || (start_x - page_x + children[i + 1].width > width / 2)) {
-                nb_on_line = 0;
-                spread_x = -1;
-                start_y -= maxh;
-                start_x = -width / 2;
-            }
-        }
-        this.max_width = page_x;
-        this._move_page(0);
-    }
-
-    obj.add_child = function (child) {
-        this._all_children.push(child);
-    }
-    obj.remove_child = function (child) {
-        var index = this._all_children.indexOf(child);
-        if (index > -1) this._all_children.splice(index, 1);
-    }
-
-    obj.get_children = function () {
-        return this._all_children;
-    }
-    obj.reset_children = function () {
-        gw_close_child_list(this._all_children);
-        this._all_children.length = 0;
-        this._container.children.length = 0;
-        this._page_idx = 0;
-        this._max_page_idx = 0;
-    }
-
-
-    obj.on_event = function (evt) {
-        switch (evt.type) {
-            case GF_EVENT_MOUSEWHEEL:
-		var inc = -evt.wheel;
-                if (this._pages.length <= 1) return 0;
-                if ((inc < 0) && (this._page_idx == 0)) return 0;
-                if ((inc > 0) && (this._page_idx >= this._pages.length - 1)) return 0;
-                this._move_page((inc < 0) ? -1 : 1);
-                return 1;
-            case GF_EVENT_KEYDOWN:
-                if ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')) {
-
-                    if ((this.current_focus >= 0) && typeof this._all_children[this.current_focus].on_event != 'undefined') {
-                        var res = this._all_children[this.current_focus].on_event(evt);
-                        if (res) return res;
-                    }
-
-                    return grid_event_navigate(this, this._all_children, evt.keycode);
-                }
-                if ((evt.keycode == 'PageUp') && (this._page_idx > 0)) {
-                    if (this._pages.length <= 1) return 0;
-                    return this.on_prev_page();
-                }
-                if ((evt.keycode == 'PageDown') && (this._page_idx < this._pages.length)) {
-                    if (this._pages.length <= 1) return 0;
-                    return this.on_next_page();
-                }
-                return 0;
-        }
-        return 0;
-    }
-
-    obj._pre_destroy = function () {
-        this.reset_children();
-        this._container = null;
-        this._all_children.length = 0;
-    }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_separator(parent) {
-    var obj = gw_new_container();
-    obj.hide();
-    obj.show = function() {};
-    obj.__separator = true;
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_progress_bar(parent, vertical, with_progress, class_name) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'ProgressBar');
-    var ps2d;
-
-    if (arguments.length <= 3) class_name = 'progress';
-    if (arguments.length <= 2) with_progress = false;
-    if (arguments.length <= 1) vertical = false;
-
-    obj.children[0] = gw_new_rectangle(class_name, 'normal');
-
-    if (with_progress) {
-        obj.children[1] = gw_new_rectangle(class_name, 'down');
-        if (vertical) {
-            obj.children[1].set_corners(true, false, false, true);
-        } else {
-            obj.children[1].set_corners(true, false, false, true);
-        }
-        obj.set_progress = function (prog) {
-            if (prog < 0) prog = 0;
-            else if (prog > 100) prog = 100;
-            this.prog = prog;
-            prog /= 100;
-            if (this.vertical) {
-                var pheight = prog * this.height;
-                this.children[1].set_size(this.width, pheight);
-                this.children[1].move(0, (this.height - pheight) / 2, 0);
-            } else {
-                var pwidth = prog * this.width;
-                this.children[1].set_size(pwidth, this.height);
-                this.children[1].move((pwidth - this.width) / 2, 0);
-            }
-        }
-    } else {
-        obj.set_progress = function (prog) { }
-    }
-    obj.slide_idx = obj.children.length;
-    obj.children[obj.slide_idx] = gw_new_rectangle(class_name, 'over');
-    if (vertical) {
-        obj.children[obj.slide_idx].set_corners(true, false, false, true);
-    } else {
-        obj.children[obj.slide_idx].set_corners(true, false, false, true);
-    }
-    obj.children[obj.slide_idx + 1] = gw_new_rectangle(class_name, 'invisible');
-    ps2d = new SFNode('PlaneSensor2D');
-    obj.children[obj.slide_idx + 1].children[1] = ps2d;
-    ps2d.maxPosition.x = -1;
-    ps2d.maxPosition.y = -1;
-
-    obj.on_slide = function (value, type) { }
-
-    obj._with_progress = with_progress;
-    obj._sliding = false;
-    obj._slide_active = function (val) {
-        obj._sliding = val;
-        this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
-    }
-    Browser.addRoute(ps2d, 'isActive', obj, obj._slide_active);
-
-    obj._set_trackpoint = function (value) {
-        if (this.vertical) {
-            this.frac = value.y / this.height;
-        } else {
-            this.frac = value.x / this.width;
-        }
-        this.frac += 0.5;
-        if (this.frac > 1) this.frac = 1;
-        else if (this.frac < 0) this.frac = 0;
-
-        this._set_frac();
-        this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
-    }
-    Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj._set_trackpoint);
-
-    obj._set_frac = function () {
-        if (this.vertical) {
-            var pheight = this.frac * this.height;
-            if (pheight < this.width) pheight = this.width;
-            this.children[this.slide_idx].set_size(this.width, pheight);
-            this.children[this.slide_idx].move(0, (this.height - pheight) / 2, 0);
-        } else {
-            var pwidth = this.frac * this.width;
-            if (pwidth < this.height) pwidth = this.height;
-            this.children[this.slide_idx].set_size(pwidth, this.height);
-            this.children[this.slide_idx].move((pwidth - this.width) / 2, 0);
-        }
-    }
-
-    obj.set_value = function (value) {
-        if (this._sliding) return;
-
-        value -= this.min;
-        if (value < 0) value = 0;
-        else if (value > this.max - this.min) value = this.max - this.min;
-        if (this.max == this.min) value = 0;
-        else value /= (this.max - this.min);
-
-        this.frac = value;
-        this._set_frac();
-    }
-
-
-    obj.vertical = vertical;
-    obj.set_size = function (w, h) {
-        this.width = w;
-        this.height = h;
-        this.children[0].set_size(w, h);
-        if (this._with_progress) {
-            this.children[3].set_size(w, h);
-        } else {
-            this.children[2].set_size(w, h);
-        }
-        this._set_frac();
-        this.set_progress(this.prog);
-    }
-    obj.min = 0;
-    obj.max = 100;
-
-    obj.move = function (x, y) {
-        this.translation.x = x;
-        this.translation.y = y;
-    }
-    obj.on_event = function (x, y) { return false; }
-
-    obj.prog = 0;
-    obj.frac = 0;
-    obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_slider(parent, vertical, class_name) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Slider');
-
-    if (arguments.length <= 2) class_name = 'progress';
-    if (arguments.length <= 1) vertical = false;
-
-    obj.children[0] = gw_new_rectangle(class_name, 'normal');
-    obj.children[1] = gw_new_rectangle(class_name, 'over');
-    obj.children[2] = gw_new_rectangle(class_name, 'invisible');
-
-    var ps2d = new SFNode('PlaneSensor2D');
-    obj.children[2].children[1] = ps2d;
-    ps2d.maxPosition.x = -1;
-    ps2d.maxPosition.y = -1;
-    obj.on_slide = function (value, type) { }
-    
-    obj.slide_active = function (val) {
-        this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
-    }
-    Browser.addRoute(ps2d, 'isActive', obj, obj.slide_active);
-    obj.set_trackpoint = function (value) {
-        if (vertical) {
-            if (this.height == this.children[1].height) return;
-            this.frac = value.y / (this.height - this.children[1].height);
-        } else {
-            if (this.width == this.children[1].width) return;
-
-            this.frac = value.x / (this.width - this.children[1].width);
-        }
-        this.frac += 0.5;
-        if (this.frac > 1) this.frac = 1;
-        else if (this.frac < 0) this.frac = 0;
-        if (vertical) {
-            value.y = (this.frac - 0.5) * (this.height - this.children[1].height);
-            value.x = 0;
-        } else {
-            value.x = (this.frac - 0.5) * (this.width - this.children[1].width);
-            value.y = 0;
-        }
-        this.children[1].translation = value;
-        this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
-    }
-    Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj.set_trackpoint);
-
-    obj.set_value = function (value) {
-        if (this.children[2].isActive) return;
-
-        value -= this.min;
-        if (value < 0) value = 0;
-        else if (value > this.max - this.min) value = this.max - this.min;
-        if (this.max == this.min) value = 0;
-        else value /= (this.max - this.min);
-
-        this.frac = value;
-
-        value -= 0.5;
-        value *= (vertical ? this.height : this.width);
-
-        if (vertical) {
-            this.children[1].translation.y = value;
-        } else {
-            this.children[1].translation.x = value;
-        }
-    }
-    obj.vertical = vertical;
-    obj.set_size = function (w, h, cursor_w, cursor_h) {
-        if (this.height && this.width) {
-            if (this.vertical) {
-                this.children[1].translation.y *= h;
-                this.children[1].translation.y /= this.height;
-            } else {
-                this.children[1].translation.x *= w;
-                this.children[1].translation.x /= this.width;
-            }
-        }
-
-        this.width = w;
-        this.height = h;
-        this.children[0].set_size(w, h);
-
-        if (typeof (cursor_w) == 'undefined') cursor_w = this.children[1].width;
-        if (typeof (cursor_h) == 'undefined') cursor_h = this.children[1].height;
-        this.children[1].set_size(cursor_w, cursor_h);
-
-        if (this.vertical) {
-            this.children[2].set_size(this.children[1].width, h);
-        } else {
-            this.children[2].set_size(w, this.children[1].height);
-        }
-    }
-    obj.set_cursor_size = function (w, h) {
-        this.children[1].set_size(w, h);
-    }
-    obj.min = 0;
-    obj.max = 100;
-    obj.frac = 0.0;
-    obj.height = 0;
-    obj.width = 0;
-    obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10, 10, 10);
-
-    obj.set_trackpoint(0);
-
-    obj.move = function (x, y) {
-        this.translation.x = x;
-        this.translation.y = y;
-    }
-    obj.on_event = function (x, y) { return false; }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-function gw_new_text_edit(parent, text_data) {
-    var obj = new SFNode('Transform2D');
-    var rect, edit;
-    setup_gw_object(obj, 'TextEdit');
-    rect = gw_new_rectangle('edit');
-    gw_add_child(obj, rect);
-    gw_object_set_hitable(rect);
-    rect.on_down = function (val) {
-        if (val) gpac.set_focus(this.parent.children[1]);
-    }
-
-    edit = gw_new_text(obj, text_data, 'edit')
-    //    gw_add_child(obj, edit);
-    obj.on_text = null;
-    obj._text_edited = function (val) {
-        if (this.on_text) this.on_text(val[0]);
-    };
-    Browser.addRoute(obj.children[1].children[0].children[0].geometry, 'string', obj, obj._text_edited);
-
-    obj.set_size = function (w, h) {
-        this.width = w;
-        this.height = h;
-        this.children[0].set_size(w, h);
-        this.children[1].move(5 - w / 2, 0);
-    };
-    obj.on_event = function (x, y) { return false; }
-
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_text_area(parent, text_data, class_name) {
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'TextArea');
-
-    obj.children[0] = new SFNode('Layout');
-    obj.children[0].parent = obj;
-    obj.children[0].wrap = true;
-    obj.children[0].spacing = 1.1;
-    obj.children[0].justify[0] = "JUSTIFY";
-    obj.children[0].justify[1] = "FIRST";
-
-	if (arguments.length==2) class_name = 'text';
-    gw_new_text(obj.children[0], text_data, class_name);
-    obj.set_size = function (width, height) {
-        this.children[0].size.x = width;
-        this.children[0].size.y = height;
-        this.width = width;
-        this.height = height;
-    }
-    obj.set_content = function (text) {
-        this.children[0].children[0].set_label(text);
-    }
-
-    obj.on_event = function (x, y) { return false; }
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-
-
-function gw_new_scrolltext_area(parent, text_data) {
-    var obj = gw_new_text_area(parent, text_data);
-    /*erase the resize routine*/
-    obj._orig_set_size = obj.set_size;
-    obj.set_size = function (width, height) {
-        var bounds = this._bounds;
-        this.width = width;
-        this.height = Math.ceil(bounds.height);
-        this._orig_set_size(width, height);
-    }
-
-    obj.set_content = function (text) {
-        this.set_label(text);
-    }
-    return obj;
-}
-
-function gw_new_window_full(parent, offscreen, the_label, child_to_insert) {
-    var wnd = gw_new_window(parent, offscreen, true);
-
-    if (arguments.length <= 3) child_to_insert = null;
-    if (child_to_insert) {
-        gw_add_child(wnd, child_to_insert);
-    }
-
-    wnd.area = null;
-
-    wnd.tools = gw_new_grid_container(wnd);
-    wnd.tools._name = 'ToolBar';
-    wnd._has_extra_tools = false;
-
-    wnd.label = null;
-    if (the_label) {
-        wnd.label = gw_new_text(wnd.tools, the_label, 'window');
-        wnd.label._name = 'Label';
-    }
-
-    wnd.set_label = function (label) {
-        if (wnd.label) wnd.label.set_label(label);
-    }
-
-
-    wnd.add_tool = function (icon, name) {
-        var tool;
-        if (typeof gwskin.images[icon] != 'undefined') {
-            tool = gw_new_icon(this.tools, icon);
-        } else {
-            tool = gw_new_icon_button(this.tools, icon, name, false, 'icon');
-        }
-        if (this.label) {
-            this.tools.remove_child(this.label);
-            this.tools.add_child(this.label);
-        }
-        tool.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
-        tool._name = name;
-        tool.dlg = this;
-        this._has_extra_tools = true;
-        return tool;
-    }
-
-
-    var icon = wnd.add_tool('close');
-    icon.on_click = function () {
-        this.dlg.close();
-    }
-    wnd._has_extra_tools = false;
-
-    wnd._pre_destroy = function () {
-        if (typeof this.predestroy != 'undefined') this.predestroy();
-        this.tools = null;
-        this.label = null;
-        this.area = null;
-        this._wnd_close();
-    }
-
-    wnd.on_size = null;
-    wnd.layout = function (width, height) {
-        var i;
-        var tools = this.tools.get_children();
-        var tool_size = gwskin.default_icon_height;
-
-        if (this.on_size) this.on_size(width, height - tool_size);
-
-        if (this.area) {
-            this.area.set_size(width, height - tool_size);
-            this.area.move(0, (this.area.height - height) / 2);
-        }
-        for (i = 0; i < tools.length; i++) {
-            tools[i].set_size(tool_size, tool_size);
-        }
-
-        if (this.label) {
-            var textw = width;
-            for (i = 0; i < tools.length; i++) {
-                if ((tools[i] != this.label) && tools[i].visible)
-                    textw -= tools[i].width;
-            }
-            textw -= tool_size;
-            if (textw < 0) textw = 0;
-            this.label.set_size(textw, tool_size);
-            this.label.set_width(textw);
-        }
-
-        this.tools.move(0, (height - tool_size) / 2);
-        this.tools.set_size(width, tool_size);
-    }
-
-    wnd.on_event = function (evt) {
-        if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.close)) {
-            this.close();
-            return 1;
-        }
-        if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.validate)) {
-			if (typeof this.on_validate == 'function') {
-				this.on_validate();
-				return 1;
-			}
-			return 0;
-        }
-        if (!this._has_extra_tools) {
-            if (this.area) return this.area.on_event(evt);
-            return false;
-        }
-
-        if (!this.area) {
-            return this.tools.on_event(evt);
-        }
-
-        var is_left_or_right = (evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Left') || (evt.keycode == 'Right')) ? 1 : 0;
-        if (this._focus_is_tools) {
-            if (this.tools.on_event(evt)) return 1;
-            if (this.area.on_event(evt)) {
-                //focus no longer on toolbar but on main content (means this is 'right'), switch order 
-                if (is_left_or_right) {
-                    this._focus_is_tools = false;
-                }
-                return 1;
-            }
-        } else {
-            if (this.area.on_event(evt)) return 1;
-            if (this.tools.on_event(evt)) {
-                //focus no longer on main but on toolbar content (means this is 'left'), switch order 
-                if (is_left_or_right) {
-                    this._focus_is_tools = true;
-                }
-                return 1;
-            }
-        }
-        return 0;
-    }
-    wnd._focus_is_tools = true;
-    return wnd;
-}
-
-function gw_new_message(container, label, content) {
-    var notif = gw_new_window_full(container, true, label);
-    notif.area = gw_new_text_area(notif, content);
-    notif.on_size = function (width, height) {
-        this.area.set_size(width - 10, height);
-    }
-    notif.set_size(0.8 * gw_display_width, 120);
-
-    if (arguments.length < 4) {
-        notif.timer = gw_new_timer(false);
-        notif.timer.wnd = notif;
-        notif.timer.set_timeout(gwskin.default_message_timeout, false);
-        notif.timer.start(0);
-        notif.timer.on_active = function (val) {
-            if (!val) this.wnd.close();
-        }
-        notif.show_effect = 'notif';
-        notif._no_focus = true;
-    }
-    return notif;
-}
-
-function gw_new_confirm_wnd(container, label, confirm_yes, confirm_no) {
-    if (arguments.length < 4) confirm_no = 'no';
-    if (arguments.length < 3) confirm_yes = 'yes';
-
-    var notif = gw_new_window_full(container, true, label);
-    notif.area = gw_new_grid_container(notif);
-    notif.area.spread_h = true;
-    
-    notif.on_confirm = null;
-    notif.btn_yes = gw_new_button(notif.area, confirm_yes);
-    notif.btn_yes.dlg = notif;
-    notif.btn_yes.on_click = function () {
-        if (this.dlg.on_confirm) this.dlg.on_confirm(true);
-        this.dlg.close();
-    }
-
-    notif.btn_no = gw_new_button(notif.area, confirm_no);
-    notif.btn_no.dlg = notif;
-    notif.btn_no.on_click = function () {
-        if (this.dlg.on_confirm) this.dlg.on_confirm(false);
-        this.dlg.close();
-    }
-    notif.on_close = function () {
-        if (this.on_confirm) this.on_confirm(false);
-    }
-
-    notif.on_display_size = function (width, height) {
-        var w = 0.9*width;
-        if (w>500) w=500;
-        this.btn_yes.set_size(w / 3, gwskin.default_control_height);
-        this.btn_no.set_size(w / 3, gwskin.default_control_height);
-        this.set_size(w, 2 * gwskin.default_control_height);
-    }
-    notif.on_display_size(gw_display_width, gw_display_height);
-    return notif;
-}
-
-
-function gw_guess_mime_icon(name)
-{
-
-    var ext = name.split('.').pop();
-    var reg = new RegExp(' ' + ext + ' ', "gi");
-    //check default extensions
-    if (gwskin.mime_video_default_ext.match(reg)) return gwskin.images.mime_video;
-    else if (gwskin.mime_audio_default_ext.match(reg)) return gwskin.images.mime_audio;
-    else if (gwskin.mime_image_default_ext.match(reg)) return gwskin.images.mime_image;
-    else if (gwskin.mime_model_default_ext.match(reg)) return gwskin.images.mime_model;
-
-    var idx = 0;
-    while (1) {
-        var mime = gpac.get_option('MimeTypes', idx);
-        if (mime == null) break;
-        idx++;
-        var mime_ext = gpac.get_option('MimeTypes', mime).split('"')[1];
-        if (!mime_ext.match(reg)) continue;
-                
-        if (mime.indexOf('video') != -1) return gwskin.images.mime_video;
-        else if (mime.indexOf('audio') != -1) return gwskin.images.mime_audio;
-        else if (mime.indexOf('model') != -1) return gwskin.images.mime_model;
-        else if (mime.indexOf('image') != -1) return gwskin.images.mime_image;
-        else if (mime.indexOf('application') != -1) return gwskin.images.mime_model;
-
-        break;
-    }
-    return gwskin.images.mime_generic;
-}
-
-
-function gw_new_file_dialog(container, label) {
-    var dlg = gw_new_window_full(container, true, label);
-
-    dlg.area = gw_new_grid_container(dlg);
-    dlg.area.break_at_line = true;
-	dlg.area.dlg = dlg;
-
-    dlg.on_close = function () {
-        if (this.do_sort_wnd) {
-            this.do_sort_wnd.close();
-        }
-        if (this.on_browse) {
-            this.on_browse(null, false);
-        }
-    }
-
-
-	dlg._name_sort_only = false;
-    dlg._sort_type = 0;
-    dlg.do_sort = function (value) {
-        this._page_idx = 0;
-        this._max_page_idx = 0;
-
-        switch (value) {
-            case 0:
-                this.area._all_children.sort(function (a, b) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
-                break;
-            case 1:
-                this.area._all_children.sort(function (b, a) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
-                break;
-            case 2:
-                this.area._all_children.sort(function (a, b) { return a.size - b.size });
-                break;
-            case 3:
-                this.area._all_children.sort(function (a, b) { return b.size - a.size });
-                break;
-            case 4:
-                this.area._all_children.sort(function (a, b) { return a.date - b.date });
-                break;
-            case 5:
-                this.area._all_children.sort(function (a, b) { return b.date - a.date });
-                break;
-        }
-        this.area.layout();
-    }
-
-    dlg.go_up = dlg.add_tool('up');
-    dlg.go_up.on_click = function () {
-        this.dlg._browse(null, true);
-    }
-
-    dlg.go_prev = dlg.add_tool('previous');
-    dlg.go_prev.on_click = function () {
-        this.dlg.area._move_page(-1);
-    }
-
-    dlg.go_next = dlg.add_tool('next');
-    dlg.go_next.on_click = function () {
-        this.dlg.area._move_page(1);
-    }
-
-    dlg.go_root = dlg.add_tool('device');
-    dlg.go_root.on_click = function () {
-        this.dlg._browse('/');
-    }
-
-    dlg.sort = dlg.add_tool('sort');
-    dlg.sort_wnd = null;
-    dlg.sort.on_click = function() {
-		
-		if (this.dlg._name_sort_only) {
-			var wnd = this.dlg;
-			if (wnd._sort_type==0) wnd._sort_type = 1;
-			else wnd._sort_type = 0;
-			wnd.do_sort(wnd._sort_type);
-			return;
-		}
-		
-        if (this.dlg.sort_wnd) {
-            this.dlg.sort_wnd.close();
-            this.dlg.sort_wnd = null;
-            return;
-        }
-        var wnd = gw_new_popup(this.dlg.sort, 'down');
-        this.dlg.sort_wnd = wnd;
-            
-        wnd.dlg = this.dlg;
-        wnd.on_close = function() {
-            this.dlg.sort_wnd = null;
-        }
-        wnd.add_menu_item('by Name',  function () { 
-            var wnd = this.dlg;
-            if (wnd._sort_type==0) wnd._sort_type = 1;
-            else wnd._sort_type = 0;
-            wnd.do_sort(wnd._sort_type);
-        } );
-
-        wnd.add_menu_item('by Size',  function () { 
-            var wnd = this.dlg;
-            if (wnd._sort_type==2) wnd._sort_type = 3;
-            else wnd._sort_type = 2;
-            wnd.do_sort(wnd._sort_type);
-        } );
-
-        wnd.add_menu_item('by Date',  function () { 
-            var wnd = this.dlg;
-            if (wnd._sort_type==4) wnd._sort_type = 5;
-            else wnd._sort_type = 4;
-            wnd.do_sort(wnd._sort_type);
-        } );
-
-        wnd.on_display_size(gw_display_width, gw_display_height);
-        wnd.show();
-    }
-
-    dlg.predestroy = function () {
-        this.go_up = null;
-        this.go_next = null;
-        this.go_prev = null;
-        this.go_root = null;
-        this.area.dlg = null;
-    }
-
-    dlg.directory = '';
-    dlg.show_directory = false;
-    dlg.filter = '*';
-
-    dlg._on_dir_browse = function () {
-		if (this.path) {
-			this.dlg._browse(this.path, false);
-		} else {
-			this.dlg._browse(this.dlg.path + this.filename, false);
-		}
-    }
-    dlg._on_file_select = function () {
-        if (this.dlg.on_browse) {
-			if (this.path) {
-				this.dlg.on_browse(this.path, null);
-			} else {
-				this.dlg.on_browse(this.dlg.path + this.filename, this.dlg.directory);
-			}
-        }
-        this.dlg.close();
-    }
-
-    dlg.area.on_page_changed = function () {
-        if (this.is_first_page()) this.dlg.go_prev.disable();
-        else this.dlg.go_prev.enable();
-
-        if (this.is_last_page()) this.dlg.go_next.disable();
-        else this.dlg.go_next.enable();
-
-        this.dlg.tools.layout(this.dlg.tools.width, this.dlg.tools.height);
-    }
-
-    dlg.on_long_click = null;
-
-    dlg.browse = function (dir) {
-		if (typeof dir == 'string') this.directory = dir;
-		
-        this._browse(dir, false);
-    }
-    dlg._browse = function (dir, up) {
-        var w, h, i, y;
-        var filelist;
-        var is_listing = ((dir==null) || (typeof dir == 'string')) ? false : true;
-
-        if (is_listing) {
-            filelist = dir;
-            this.path = null;
-        } else {
-            if (dir) this.directory = dir;
-            if (up && !this.path) up = false;
-            filelist = gpac.enum_directory(this.directory, this.filter, up);
-
-            if (filelist.length) {
-                this.directory = filelist[0].path;
-                this.set_label(this.directory);
-            } else {
-                this.set_label('');
-            }
-            this.path = filelist.length ? filelist[0].path : '';
-        }
-
-        this.area.reset_children();
-
-        for (i = 0; i < filelist.length; i++) {
-			var f_path, f_name;
-            if (!is_listing && (filelist[i].hidden || filelist[i].system)) continue;
-
-			var icon_name = gwskin.images.mime_generic;
-			if (is_listing && typeof filelist[i].icon == 'string') {
-				if (filelist[i].icon != '') {
-					icon_name = filelist[i].icon;
-				}
-			}
-
-			if (is_listing && typeof filelist[i] == 'string') {
-				f_path = f_name = filelist[i];
-				this._name_sort_only = true;
-			} else {
-				f_path = filelist[i].path;
-				f_name = filelist[i].name;
-			}
-			
-            if ( (!is_listing || (typeof filelist[i].directory == 'boolean'))  && (filelist[i].directory || (filelist[i].name.indexOf('.') < 0))) {
-                if (filelist[i].drive) icon_name = gwskin.images.drive;
-                else icon_name = gwskin.images.folder;
-            } else {
-                icon_name = gw_guess_mime_icon(is_listing ? f_path : f_name);
-            }
-
-            var item = gw_new_icon_button(this.area, icon_name, f_name, true, 'listitem');
-            item.dlg = this;
-            item.filename = f_name;
-			item.directory = typeof filelist[i].directory != 'undefined' ? filelist[i].directory : false;
-            item.set_size(this.width, gwskin.default_control_height);
-            item.path = is_listing ? f_path : null;
-            item.size = typeof filelist[i].size != 'undefined' ? filelist[i].size : 0;
-            item.date = typeof filelist[i].last_modified != 'undefined' ? filelist[i].last_modified : 0;
-
-            if (item.directory) {
-                item.on_click = this._on_dir_browse;
-            } else {
-                item.on_click = this._on_file_select;
-            }
-            item.on_long_click = function () {
-                if (this.dlg.on_long_click) {
-					var path = this.path ? this.path : (this.dlg.directory + this.filename);
-					this.dlg.on_long_click(this.filename, path, this.dlg.directory);
-				}
-            }
-
-        }
-        this.do_sort(this._sort_type);
-
-        if (this.directory == '/') this.go_up.disable();
-        else this.go_up.enable();
-
-        this.tools.layout(this.tools.width, this.tools.height);
-    }
-
-    dlg.on_size = function (width, height) {
-        var __children = this.area.get_children();
-        for (var i = 0; i < __children.length; i++) {
-            __children[i].set_size(width, gwskin.default_control_height);
-        }
-        this.area.set_size(width, height);
-    }
-
-    return dlg;
-}
-
-
-
-function gw_new_plotter(parent) {
-    var touch;
-    var obj = new SFNode('Transform2D');
-    setup_gw_object(obj, 'Plotter');
-
-    obj.children[0] = new SFNode('Layer2D');
-
-    var class_name = 'plot';
-
-    obj.children[0].children[0] = gw_new_rectangle(class_name, 'normal');
-
-    obj.set_size = function (width, height) {
-        this.children[0].size.x = width;
-        this.children[0].size.y = height;
-        this.children[0].children[0].set_size(width, height);
-
-        var w = 1;
-        var h = 1;
-
-        for (var i = 0; i < this.series.length; i++) {
-            var s = this.series[i];
-            s.scale = new SFVec2f(width - this.label_width, height);
-            s.but.set_size(2*this.label_width, 0.9*gwskin.default_text_font_size);
-            s.but.set_font_size(0.9 * gwskin.default_text_font_size);
-            s.translation.x = -this.label_width / 2;
-        }
-        this.width = width;
-        this.height = height;
-    }
-
-    obj.label_width = 120;
-
-    obj.series = [];
-    obj.add_serie = function (legend, units, r, g, b) {
-        var s = gw_new_curve2d('plot');
-        s.set_color(r, g, b);
-
-        s.dlg = this;
-        s.legend = legend;
-        s.units = units;
-        s.max_y = 0;
-        s.nb_refresh = 0;
-
-        s.refresh_serie = function (serie, name_x, name_y, nb_x, factor) {
-            var s = serie[0];
-            var count = serie.length;
-
-            var first_x = s[name_x];
- 
-            this.nb_refresh += 1;
-            if (this.nb_refresh == 50) {
-                this.max_y = 0;
-                this.nb_refresh += 1;
-            }
-            var max_y = this.max_y;
- 
-
-            if (!factor) factor = 1;
-            for (var i = 0; i < serie.length; i++) {
-                var s = serie[i];
-                if (max_y < s[name_y]) max_y = s[name_y];
-            }
-            s = serie[0];
-
-            this.reset();
-            for (var i = 0; i < count; i++) {
-                s = serie[i];
-                //get x and y between -0.5 and 0.5, and scale to width
-                var x = s[name_x] - first_x;
-                x /= nb_x;
-                x -= 0.5;
-                //x *= 0.9;
-
-                var y = s[name_y];
-                if (max_y) y /= max_y;
-                y = -0.9 / 2 + 0.9 * y / factor;
-
-                if (i) {
-                    this.add_line_to(x, y);
-                } else {
-                    this.add_move_to(x, y);
-                }
-
-                if (i + 1 == count) {
-                    this.but.move(0.5 * this.dlg.width - this.but.width / 2, (-0.9 / 2 + 0.9 / factor) * this.dlg.height);
-                    this.but.set_label('' + this.legend + ':' + s[name_y] + ' ' + units);
-                    this.but.show();
-                }
-            }
-        }
-        this.children[0].children[this.children[0].children.length] = s;
-        this.series.push(s);
-
-        s.scale.x = this.width;
-        s.scale.y = this.height;
-
-
-        s.but = gw_new_text(this, '' + legend, 'custom');
-        s.but.set_align('END');
-        s.but.set_color(r, g, b);
-        s.but.set_size(2*this.label_width, gwskin.default_text_font_size);
-        s.but.hide();
-        return s;
-
-    }
-
-
-    gw_add_child(parent, obj);
-    return obj;
-}
-
-function gw_new_popup(anchor, type)
-{
-    var popup = gw_new_window(null, true, false, 'popup');
-    popup.area = gw_new_grid_container(popup);
-    popup.anchor = anchor;
-    popup.type = (type=='up') ? 0 : 1;
-    
-    popup._nb_over = 0;
-    popup.add_menu_item = function (label, callback) {
-        var item = gw_new_button(this.area, label, 'window');
-        item.wnd = this;
-        item.on_click = function () {
-            callback.call(this.wnd);
-            this.wnd.close();
-        }
-        item.on_over_ex = function (value) {
-            this.wnd.update_visibility();
-        }
-        item.new_over_handler(item.on_over_ex);
-
-        item.set_corners(false, false, false, false);
-        return item;
-    }
-    popup.reposition = function() {
-        var pos = gw_get_adjusted_abs_pos(this.anchor, this.width, this.height, this.type);
-        this.move(pos.x, pos.y);
-    }
-
-    popup.update_visibility = function() {
-        var nb_over = 0;
-        var children = this.area.get_children();
-        for (var i=0; i<children.length; i++) {
-            if (children[i]._over) nb_over++;
-        }
-        if (!nb_over) this.close();
-    }
-
-    
-    popup.on_display_size = function (w, h) {
-        var children = this.area.get_children();
-        var max_s = 0;
-        for (var i=0; i<children.length; i++) {
-          var s = children[i].get_label().length;
-          if (s>max_s) max_s = s;
-        }
-
-        for (var i=0; i<children.length; i++) {
-            children[i].set_size(max_s * gwskin.default_text_font_size, gwskin.default_icon_height);
-        }
-        this.area.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
-        this.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
-        this.reposition();
-    }
-    gw_ui_root.has_popup = true;
-          
-     
-    popup.set_alpha(0.9);
-    return popup;
-}
-
-

gpac-0.8.0.tar.gz/gui/icons Deleted

gpac-0.8.0.tar.gz/gui/iphone_wm_gui.js Deleted

@@ -1,1651 +0,0 @@
-// 01122011 AMD1 startWidget listWidgets getWidget implemented
-/* wrapper as a module
- var iphone_wm_gui = (function () {
- */
-// to make sure the initialization is done only once
-var init = true;
-
-// constant
-var xlinkns = 'http://www.w3.org/1999/xlink';
-//var evns = 'http://www.w3.org/2001/xml-events';
-
-// state of the widget manager: displays homepage (value=home) or executes widget (value="exec")
-var state = 'home';
-
-// convenience variables for SVG elements
-var homepage = null, arrows = null, icons = null, widgetContainer = null, homebar = null, execbar = null;
-
-// where is the index into pages of icons on the home page
-var where = 0,maxwhere = 0,whereW = 0;
-
-// array of activated widgets
-var activatedWidgets = new Array();
-var numActivatedWidgets = 0;
-
-// variables for flexible layout
-// variables for flexible layout
-var totalWidth = 0,totalHeight = 0,iconNbHoriz = 0,iconNbVert = 0,iconsPerPage = 0;
-
-//previous size
-var previousWidth = 0,previousHeight = 0;
-
-// to differentiate between install icon and scan dir for icons
-var isThisAScan = null;
-
-// preferred icon type
-var preferredIconType = '.svg';
-
-// adapt layout to the size of the screen
-function adaptLayoutToSize() {
-    if (l_deb < log_level) {
-        alert("[UI] adaptLayoutToSize");
-    }
-    display_width = parseInt(gpac.get_option('General', 'LastWidth'));
-    display_height = parseInt(gpac.get_option('General', 'LastHeight'));
-    alert("display "+display_width+" "+display_height);
-    if (!gpac.fullscreen && display_width && display_height) {
-     gpac.set_size(display_width, display_height);
-    }
-    var tmpObject, tmpObj2;
-    // get size to adapt to
-    totalWidth = document.documentElement.viewport.width;
-    totalHeight = document.documentElement.viewport.height;
-    if (totalWidth == 0) {
-        totalWidth = 160;
-    }
-    if (totalHeight == 0) {
-        totalHeight = 280;
-    }
-    while (totalWidth < 160 || totalHeight < 280) {
-        totalWidth *= 4;
-        totalHeight *= 4;
-    }
-    // min size is 160 by 280
-    if (totalWidth < 160) {
-        totalWidth = 160;
-    }
-    if (totalHeight < 280) {
-        totalHeight = 280;
-    }
-    // round to lower multiple of 80
-    totalWidth -= totalWidth % 80;
-    var iconHeight = totalHeight - 120;
-    iconHeight -= iconHeight % 80;
-    // how many lines and columns of icons
-    iconNbHoriz = totalWidth / 80;
-    iconNbVert = iconHeight / 80;
-    totalHeight = iconHeight + 120;
-    // 120 is upper bar (60) + lower bar (60)
-    iconsPerPage = iconNbHoriz * iconNbVert;
-    // fix svg viewbox
-    document.getElementById("svg").setAttribute("viewBox", "0 0 " + totalWidth + " " + totalHeight);
-    // fix odd line
-    tmpObj2 = document.getElementById("odd");
-    var i, already = tmpObj2.getElementsByTagName("use").length;
-    //alert("odd line "+already+" "+iconNbHoriz);
-    for (i = already; i < iconNbHoriz; i++) {
-        tmpObject = document.createElement("use");
-        tmpObject.setAttribute("x", i * 80);
-        tmpObject.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#lightRect" : "#darkRect" ));
-        tmpObj2.appendChild(tmpObject);
-    }
-    // fix even line
-    tmpObj2 = document.getElementById("even");
-    already = tmpObj2.getElementsByTagName("use").length;
-    //alert("even line "+already+" "+iconNbHoriz);
-    for (i = already; i < iconNbHoriz; i++) {
-        tmpObject = document.createElement("use");
-        tmpObject.setAttribute("x", i * 80);
-        tmpObject.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#darkRect" : "#lightRect" ));
-        tmpObj2.appendChild(tmpObject);
-    }
-    // fix frame (black with rounded corners)
-    tmpObject = document.getElementById("frame");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight);
-    tmpObject = document.getElementById("frame2");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight);
-    // fix screen (white)
-    tmpObject = document.getElementById("screen");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight - 120);
-    // fix grid back (gray)
-    tmpObject = document.getElementById("gridback");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight - 120);
-    // fix icon background grid
-    tmpObject = document.getElementById("grid");
-    already = tmpObject.getElementsByTagName("use").length;
-    for (i = already; i < iconNbVert; i++) {
-        tmpObj2 = document.createElement("use");
-        tmpObj2.setAttribute("y", i * 80);
-        tmpObj2.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#odd" : "#even" ));
-        tmpObject.appendChild(tmpObj2);
-    }
-    // if there are already too many lines, remove the extra ones otherwise they are rendered on top of the lower
-    // part of the decoration
-    if (already > iconNbVert) {
-        while (already-- > iconNbVert) {
-            tmpObject.removeChild(tmpObject.lastChild);
-        }
-    }
-    // fix commands (lower bar)
-    document.getElementById("commands").setAttribute("transform", "translate(0, " + (totalHeight - 60) + ")");
-    document.getElementById("homeButton").setAttribute("transform", "translate(" + (totalWidth / 2) + ", 30)");
-    document.getElementById("right").setAttribute("transform", "translate(" + (totalWidth - 50) + ", 10)");
-    document.getElementById("rightW").setAttribute("transform", "translate(" + (totalWidth - 50) + ", 10)");
-    // fix the cuts (white rects left and right because we have no clipping)
-    tmpObject = document.getElementById("leftCut");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight);
-    tmpObject.setAttribute("x", -1 - totalWidth);
-    tmpObject = document.getElementById("rightCut");
-    tmpObject.setAttribute("width", totalWidth);
-    tmpObject.setAttribute("height", totalHeight);
-    tmpObject.setAttribute("x", 1 + totalWidth);
-    // respace executing widgets if any
-    tmpObject = widgetContainer.getElementsByTagName("g");
-    for (i = 0; i < tmpObject.length; i++) {
-        var gg = tmpObject.item(i);
-        gg.setAttribute("transform", "translate(" + (totalWidth * (i - 1)) + ", 0)");
-        if (gg.firstElementChild != null) {
-            gg.firstElementChild.setAttribute("width", totalWidth);
-            gg.firstElementChild.setAttribute("height", totalHeight - 120);
-        }
-    }
-}
-
-//
-// widget close on click at "Kill" button
-//
-function on_kill_widget() {
-    if (state == 'exec') {
-        widget_close(activatedWidgets[whereW]);
-    }
-}
-
-//
-// widget get on click at "GetW" button
-//
-function on_get_widget() {
-    alert("on_get_widget " + WidgetManager.MPEGUStandardServiceProviders.length);
-    if (WidgetManager.MPEGUStandardServiceProviders.length != 0) {
-        upnp_renders = selector_window1();
-        upnp_renders.on_select = function(item) {
-            upnp_renders.unregister(root);
-            upnp_renders = null;
-            if (item == -1) {
-                return;
-            }
-            alert("upnp_renders.on_select(" + item + ")");
-            var device = WidgetManager.MPEGUStandardServiceProviders[item];
-            device.standardService.SetActionListener("listWidgets", get_widget_callback(device), true);
-            device.standardService.CallAction("listWidgets", new Array());
-        }
-        upnp_renders.register(root);
-    }
-}
-
-function get_widget_callback(device) {
-    return function() {
-        //alert("get_widget_callback");
-        // msgHandler is the first argument, the next arguments are from the reply to listWidgets
-        var act = arguments[0];
-        var act1 = act.GetArgumentValue("widgetCodes");
-        var act2 = act.GetArgumentValue("widgetNames");
-        //alert(act1+" "+act2);
-        target_widgets = selector_window2(act1.split(" "), act2.split(" "));
-        target_widgets.on_select = function(item) {
-            alert("target_widgets.on_select");
-            target_widgets.unregister(root);
-            target_widgets = null;
-            if (item == -1) {
-                return;
-            }
-            alert("target_widgets.on_select(" + item + ")");
-            var args = new Array();
-            args[0] = "widgetCode";
-            args[1] = item;
-            device.standardService.SetActionListener("getWidget", get_widget_callback2, true);
-            device.standardService.CallAction("getWidget", args);
-        }
-        target_widgets.register(root);
-    }
-}
-
-function get_widget_callback2() {
-    // msgHandler is the first argument, the next arguments are from the reply to listWidgets
-    alert("callback2-1");
-    var act = arguments[0];
-    var act1 = act.GetArgumentValue("widgetUrl");
-    var act2 = act.GetArgumentValue("widgetContext");
-    alert("callback2-2 " + act1 + " " + act2);
-    var wid = WidgetManager.load(act1, null, act2);
-    WidgetManager.on_widget_add(wid);
-}
-
-//
-// creates the menu of available targets for pushing a widget elsewhere
-//
-function selector_window1() {
-    var i, count, render;
-    var selector = document.createElement('g'), obj, child;
-    selector.setAttribute('transform', 'translate(10,10)');
-    count = WidgetManager.MPEGUStandardServiceProviders.length;
-    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black', null));
-    for (i = 0; i < count; i++) {
-        render = WidgetManager.MPEGUStandardServiceProviders[i];
-        obj = createtext(render.Name, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
-        obj.setAttribute('id', "select" + i);
-        selector.appendChild(obj);
-        obj.addEventListener('mouseover', sw1("select" + i), false);
-        obj.addEventListener('mouseout', sw2("select" + i), false);
-        obj.addEventListener('click', sw4(i), false);
-    }
-    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
-    obj.setAttribute('id', "canc");
-    selector.appendChild(obj);
-    obj.addEventListener('mouseover', function() { document.getElementById("canc").setAttribute("fill", "red"); }, false);
-    obj.addEventListener('mouseout', function() { document.getElementById("canc").setAttribute("fill", "black"); }, false);
-    obj.addEventListener('click', function() { upnp_renders.on_select(-1); }, false);
-    selector.register = function(disp) {
-        disp.appendChild(this);
-    };
-    selector.unregister = function(disp) {
-        disp.removeChild(this);
-    };
-    return selector;
-}
-
-//
-// creates the menu of available targets for pushing a widget elsewhere
-//
-function selector_window2(codes, names) {
-    alert("selector_window2");
-    var i, count, render;
-    var selector = document.createElement('g'), obj, child;
-    selector.setAttribute('transform', 'translate(10,10)');
-    count = codes.length;
-    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black', null));
-    for (i = 0; i < count; i++) {
-        render = names[i];
-        obj = createtext(render, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
-        obj.setAttribute('id', "selecto" + i);
-        selector.appendChild(obj);
-        obj.addEventListener('mouseover', sw1("selecto" + i), false);
-        obj.addEventListener('mouseout', sw2("selecto" + i), false);
-        obj.addEventListener('click', sw5(i), false);
-    }
-    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
-    obj.setAttribute('id', "cance");
-    selector.appendChild(obj);
-    obj.addEventListener('mouseover', function() { document.getElementById("cance").setAttribute("fill", "red"); }, false);
-    obj.addEventListener('mouseout', function() { document.getElementById("cance").setAttribute("fill", "black"); }, false);
-    obj.addEventListener('click', function() { target_widgets.on_select(-1); }, false);
-    selector.register = function(disp) {
-        disp.appendChild(this);
-    };
-    selector.unregister = function(disp) {
-        disp.removeChild(this);
-    };
-    return selector;
-}
-
-function sw4(si) {
-    return function() { upnp_renders.on_select(si); };
-}
-
-function sw5(si) {
-    return function() { target_widgets.on_select(si); };
-}
-
-//
-// when deleting an executing widgets, all executing widgets to its right are moved to the left
-//
-function recurseMoveAfterDelete(target) {
-    if (target != null && target.nextElementSibling != null) {
-        var v = target.nextElementSibling;
-        recurseMoveAfterDelete(v);
-        v.setAttribute("transform", target.getAttribute("transform"));
-    }
-}
-
-//
-// click on home button to switch from icons to executing widgets
-//
-function home_button(evt) {
-    if (l_deb < log_level) {
-        alert("[UI] home_button");
-    }
-    if (state != 'home') {
-        state = 'home';
-        widgetContainer.setAttribute('display', 'none');
-        homepage.setAttribute('display', 'inline');
-        homebar.setAttribute('display', 'inline');
-        execbar.setAttribute('display', 'none');
-        arrows.setAttribute('display', 'inline');
-        arrowsW.setAttribute('display', 'none');
-        widgetAddList.setAttribute('display', 'none');
-    } else {
-        state = 'exec';
-        widgetContainer.setAttribute('display', 'inline');
-        homepage.setAttribute('display', 'none');
-        homebar.setAttribute('display', 'none');
-        execbar.setAttribute('display', 'inline');
-        arrows.setAttribute('display', 'none');
-        arrowsW.setAttribute('display', 'inline');
-        widgetAddList.setAttribute('display', 'none');
-    }
-}
-
-// constants
-var adjustFrom = "0,0";
-var animDue = true;
-
-//
-// after each change of icon page, this function adjusts the visibility of arrows in the lower bar
-//
-function adjustwhere(animDue) {
-    if (l_deb < log_level) {
-        alert("[UI] adjust " + where + " 0 " + maxwhere);
-    }
-    document.getElementById("left").setAttribute("display", ((where > 0) ? "inline" : "none"));
-    document.getElementById("right").setAttribute("display", ((where < maxwhere) ? "inline" : "none"));
-    if (!animDue) {
-        icons.setAttribute("transform", 'translate(' + (-80 * iconNbHoriz * where) + ',0)');
-    } else {
-        var aw = document.createElement("animateTransform");
-        aw.setAttribute("attributeName", "transform");
-        aw.setAttribute("type", "translate");
-        //alert('time '+document.documentElement.getCurrentTime());
-        aw.setAttribute("begin", document.documentElement.getCurrentTime());
-        aw.setAttribute("dur", "1s");
-        aw.setAttribute("fill", "freeze");
-        aw.setAttributeNS(xlinkns, "href", "#icons");
-        aw.setAttribute("from", adjustFrom);
-        aw.setAttribute("to", (-80 * iconNbHoriz * where) + ",0");
-        document.documentElement.appendChild(aw);
-    }
-    adjustFrom = (-80 * iconNbHoriz * where) + ",0";
-}
-
-//
-// action of the left button on the lower bar
-//
-function left_button() {
-    if (l_deb < log_level) {
-        alert("[UI] left button " + where + " 0");
-    }
-    if (where > 0) {
-        where--;
-        adjustwhere(true);
-    }
-}
-
-//
-// action of the right button of the lower bar
-//
-function right_button() {
-    if (l_deb < log_level) {
-        alert("[UI] right button " + where + " " + maxwhere);
-    }
-    if (where < maxwhere) {
-        where++;
-        adjustwhere(true);
-    }
-}
-
-var adjustFromW = "0,0";
-var oldwhereW = -1;
-
-//
-// after each change of icon page, this function adjusts the visibility of arrows in the lower bar
-//
-function adjustWhereWidgets(animDue) {
-    if (oldwhereW != whereW) {
-        // hide oldwhereW
-        if (oldwhereW >= 0 && activatedWidgets[oldwhereW] != null) {
-            WidgetManager.corein_message(activatedWidgets[oldwhereW], "hide");
-        }
-    }
-    if (l_deb < log_level) {
-        alert("[UI] adjustW " + whereW + " 0 " + (numActivatedWidgets - 1));
-    }
-    document.getElementById("leftW").setAttribute("display", ((whereW > 0) ? "inline" : "none"));
-    document.getElementById("rightW").setAttribute("display", ((whereW < (numActivatedWidgets - 1)) ? "inline" : "none"));
-    if (!animDue) {
-        widgetContainer.setAttribute("transform", "translate(" + (-totalWidth * whereW) + ",0)");
-    } else {
-        var aw = document.createElement("animateTransform");
-        aw.setAttribute("attributeName", "transform");
-        aw.setAttribute("type", "translate");
-        aw.setAttribute("begin", document.documentElement.getCurrentTime());
-        aw.setAttribute("dur", "1s");
-        aw.setAttribute("fill", "freeze");
-        aw.setAttributeNS(xlinkns, "href", "#widget");
-        aw.setAttribute("from", adjustFromW);
-        aw.setAttribute("to", (-totalWidth * whereW) + ",0");
-        document.documentElement.appendChild(aw);
-    }
-    adjustFromW = (-totalWidth * whereW) + ",0";
-    document.getElementById("widgetName").textContent =
-            (whereW >= 0 && activatedWidgets[whereW] != null ? activatedWidgets[whereW].shortName : '-');
-    if (oldwhereW != whereW) {
-        // show whereW
-        if (whereW >= 0 && activatedWidgets[whereW] != null) {
-            WidgetManager.corein_message(activatedWidgets[whereW], "show");
-        }
-        oldwhereW = whereW;
-    }
-}
-
-//
-// action of the left button on the lower bar
-//
-function left_buttonW() {
-    if (l_deb < log_level) {
-        alert("[UI] left button " + whereW);
-    }
-    if (whereW > 0) {
-        whereW--;
-        adjustWhereWidgets(animDue);
-    }
-}
-
-//
-// action of the right button of the lower bar
-//
-function right_buttonW() {
-    if (l_deb < log_level) {
-        alert("[UI] right button " + whereW + " " + (numActivatedWidgets - 1));
-    }
-    if (whereW < (numActivatedWidgets - 1)) {
-        whereW++;
-        adjustWhereWidgets(animDue);
-    }
-}
-
-//
-// action of each icon, starting the matching widget
-//
-function activating_widget(w) {
-    if (l_deb < log_level) {
-        alert("[UI] activating widget: " + w.name);
-    }
-    widget_add(w);
-}
-
-//
-// main initialization function
-// init variables, then init the widget manager C code, then inits UPnP
-//
-function initialize() {
-    if (l_deb < log_level) {
-        alert("[UI] initialize");
-    }
-    init = false;
-    var display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
-    var display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
-    if (display_width && display_height) {
-        gpac.set_size(display_width, display_height);
-    }
-    root = document.documentElement;
-    homepage = document.getElementById('homepage');
-    homebar = document.getElementById('homebar');
-    execbar = document.getElementById('execbar');
-    arrows = document.getElementById('arrows');
-    arrowsW = document.getElementById('arrowsW');
-    icons = document.getElementById('icons');
-    widgetContainer = document.getElementById('widget');
-    widgetAddList = document.getElementById('widgetAddList');
-    /* Setup the GPAC Widget Manager - this will also scan the available widgets */
-    log_level = l_inf;
-    widget_manager_init();
-    WidgetManager.on_widget_remove = widget_remove;
-    WidgetManager.on_widget_add = widget_add;
-    /* register the callback to be notified of incoming widgets */
-    has_upnp = (typeof UPnP != 'undefined');
-    if (has_upnp) {
-        /* setting the callback to allow other devices to push their widgets */
-        UPnP.onMediaConnect = onMediaConnect;
-        /* Tell GPAC that the calls to the main Renderer (like open, ...) must be forwared to this scene */
-        UPnP.BindRenderer();
-    }
-    WidgetManager.coreOutShow = coreOutShowImplementation;
-    WidgetManager.coreOutGetAttention = coreOutGetAttentionImplementation;
-    WidgetManager.coreOutHide = coreOutHideImplementation;
-    WidgetManager.coreOutRequestDeactivate = coreOutRequestDeactivateImplementation;
-    WidgetManager.coreOutInstallWidget = coreOutInstallWidgetImplementation;
-    WidgetManager.coreOutActivateTemporaryWidget = coreOutActivateTemporaryWidgetImplementation;
-    WidgetManager.coreOutMigrateComponent = coreOutMigrateComponentImplementation;
-    WidgetManager.coreOutRequestMigrationTargets = coreOutRequestMigrationTargetsImplementation;
-}
-
-//
-// implementation of core:out install widget
-//
-function coreOutInstallWidgetImplementation(wid, args) {
-    var w = widgetInstall(args[0], true, false, wid);
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"),
-                wid, (w != null ? 1 : 0)); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out activate temporary widget
-//
-function coreOutActivateTemporaryWidgetImplementation(wid, args) {
-    var w = widgetInstall(args[0], true, true, null);
-    if (w != null) {
-        activating_widget(w);
-    }
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
-                wid, (w != null ? 1 : 0)); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out migrate component
-//
-function coreOutMigrateComponentImplementation(wid, args) {
-    //alert("coreOutMigrateComponent "+wid.name+" "+args.length);
-    var comp = wid.get_component(args[0], true);
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (comp == null) {
-        log(l_err, 'Component ' + args[0] + ' cannot be found in widget ' + wid.name);
-        if (ifce != null) {
-            wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
-        }
-        return;
-    }
-    if (args.length > 1 && args[1] != null) {
-        //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
-        WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(parseInt(args[1])), comp);
-        widget_close(comp);
-    } else {
-        upnp_renders = selector_window(comp);
-        upnp_renders.on_select = function(item, wid) {
-            upnp_renders.unregister(root);
-            upnp_renders = null;
-            if (item == -1) {
-                return;
-            }
-            if (comp != null) {
-                alert("upnp_renders.on_select(" + item + "," + comp.name + ")");
-                //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(item), comp);
-                WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(item), comp);
-                widget_close(comp);
-            }
-        };
-        upnp_renders.register(root);
-    }
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out request migration targets
-//
-function coreOutRequestMigrationTargetsImplementation(wid, args) {
-    var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i;
-    for (i = 0; i < count; i++) {
-        var render = UPnP.GetMediaRenderer(i);
-        codes.push("" + i);
-        names.push(render.Name);
-        descriptions.push(render.HostName + " " + render.UUID);
-    }
-    i = null;
-    var ifce_count = wid.num_interfaces, j;
-    for (j = 0; j < ifce_count; j++) {
-        var ifce = wid.get_interface(j);
-        if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-            i = ifce;
-            break;
-        }
-    }
-    if (i != null) {
-        wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
-                wid, codes, names, descriptions);
-    }
-}
-
-//
-// implementation of core:out Show message
-// this is a request by the widget to be shown
-//
-function coreOutShowImplementation(wid, args) {
-    //alert("core:out show "+wid.name);
-    var target = widgetContainer.firstElementChild;
-    var i;
-    for (i = 0; i < numActivatedWidgets; i++) {
-        //alert("is it "+activatedWidgets[i].name);
-        if (activatedWidgets[i] == wid) {
-            break;
-        }
-        target = target.nextElementSibling;
-    }
-    // here, i is the index of the current widget
-    //alert(" "+i+" "+numActivatedWidgets);
-    if (i < numActivatedWidgets) {
-        whereW = i;
-        adjustWhereWidgets(false);
-    }
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.showMessage, ifce.get_message("show"), wid, 1); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out GetAttention message
-// this is a request by the widget to be shown and some special signal is given
-//
-function coreOutGetAttentionImplementation(wid, args) {
-    //alert("core:out getAttention "+wid.name);
-    var target = widgetContainer.firstElementChild;
-    var i;
-    for (i = 0; i < numActivatedWidgets; i++) {
-        //alert("is it "+activatedWidgets[i].name);
-        if (activatedWidgets[i] == wid) {
-            break;
-        }
-        target = target.nextElementSibling;
-    }
-    // here, i is the index of the current widget
-    //alert(" "+i+" "+numActivatedWidgets);
-    if (i < numActivatedWidgets) {
-        whereW = i;
-        adjustWhereWidgets(false);
-    }
-    document.getElementById("getAttention").beginElement();
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.getAttentionMessage, ifce.get_message("getAttention"), wid, 1); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out hide message
-// this is a request by the widget to be hidden (some other widget (if any) is shown)
-//
-function coreOutHideImplementation(wid, args) {
-    //alert("core:out hide "+wid.name);
-    var target = widgetContainer.firstElementChild;
-    var i;
-    for (i = 0; i < numActivatedWidgets; i++) {
-        //alert("is it "+activatedWidgets[i].name);
-        if (activatedWidgets[i] == wid) {
-            break;
-        }
-        target = target.nextElementSibling;
-    }
-    // here, i is the index of the current widget
-    //alert("hide "+i+" "+numActivatedWidgets);
-    if (i < numActivatedWidgets) {
-        if (whereW > 0) {
-            whereW--;
-        }
-        else if (whereW < numActivatedWidgets - 1) {
-            whereW++;
-        }
-        else {
-            return;
-        }
-        adjustWhereWidgets(false);
-    }
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.hideMessage, ifce.get_message("hide"), wid, 1); // send return code 1 = success
-    }
-}
-
-//
-// implementation of core:out requestDeactivate message
-// this is a request by the widget to be stopped
-//
-function coreOutRequestDeactivateImplementation(wid, args) {
-    //alert("core:out hide "+wid.name);
-    var target = widgetContainer.firstElementChild;
-    var i;
-    for (i = 0; i < numActivatedWidgets; i++) {
-        //alert("is it "+activatedWidgets[i].name);
-        if (activatedWidgets[i] == wid) {
-            break;
-        }
-        target = target.nextElementSibling;
-    }
-    // here, i is the index of the current widget
-    //alert("hide "+i+" "+numActivatedWidgets);
-    if (i < numActivatedWidgets) {
-        widget_close(activatedWidgets[i]);
-    }
-    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
-    if (ifce != null) {
-        wmjs_core_out_invoke_reply(coreOut.requestDeactivateMessage, ifce.get_message("requestDeactivate"), wid, 1); // send return code 1 = success
-    }
-}
-
-//
-// WM callback for when a component is activated by its parent
-//
-function widget_add(w) {
-    log(l_inf, "widget add " + w.name);
-    if (!w.activated) {
-        if (sameFileIgnoringSVGView(w.icon, w.main)) {
-            // same file in icon and main
-        } else {
-            widget_launch(w, document.createElement("animation"));
-        }
-    } else if (w.multipleInstances) {
-        var newwid = WidgetManager.open(w.manifest, null);
-        widget_launch(newwid, document.createElement("animation"));
-    } else {
-        return false;
-    }
-    state = 'exec';
-    widgetContainer.setAttribute('display', 'inline');
-    homepage.setAttribute('display', 'none');
-    homebar.setAttribute('display', 'none');
-    execbar.setAttribute('display', 'inline');
-    arrows.setAttribute('display', 'none');
-    arrowsW.setAttribute('display', 'inline');
-    widgetAddList.setAttribute('display', 'none');
-    return true;
-}
-
-function sameFileIgnoringSVGView(name1, name2) {
-    if (name1 == name2) {
-        return true;
-    }
-    if (name1 == null) {
-        return false;
-    }
-    var i1 = name1.indexOf("#");
-    var i2 = name2.indexOf("#");
-    if (i1 < 0) {
-        i1 = name1.length;
-    }
-    else {
-        i1--;
-    }
-    if (i2 < 0) {
-        i2 = name2.length;
-    }
-    else {
-        i2--;
-    }
-    return name1.substring(0, i1) == name2.substring(0, i2);
-}
-
-//
-// recompute the number of widgets loaded currently
-//
-function getNbWidgets() {
-    var i, nbWidgets = 0;
-    for (i = 0; i < WidgetManager.num_widgets; i++) {
-        var w = WidgetManager.get(i);
-        if (w != null && w.loaded) {
-            nbWidgets++;
-        }
-    }
-    return nbWidgets;
-}
-
-//
-// just resize the window and viewport, and initialize the first time this is called
-//
-function resize() {
-    if (init) {
-        initialize();
-    }
-    if (document.documentElement.viewport.width == previousWidth && document.documentElement.viewport.height == previousHeight) {
-        return;
-    }
-    if (l_deb < log_level) {
-        alert("[UI] start initialize() w:" + document.documentElement.viewport.width + " h:" + document.documentElement.viewport.height);
-    }
-    adaptLayoutToSize();
-    // start by filling the "home page" with known icons
-    where = 0;
-    var nbWidgets = getNbWidgets();
-    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
-    var wid;
-    var iconIterator = document.getElementById("icons").firstElementChild;
-    var position = 0;
-    for (i = 1; i <= WidgetManager.num_widgets; i++) {
-        wid = WidgetManager.get(i - 1);
-        // alert("build:"+wid.main+" "+wid.loaded);
-        if (wid.loaded) {
-            insert_icon(wid, position, i - 1, iconIterator);
-            WidgetManager.corein_message(wid, 'setSize', 'width', totalWidth, 'height', totalHeight - 120, 'dpi', 96);
-            position++;
-            if (iconIterator != null) {
-                iconIterator = iconIterator.nextElementSibling;
-            }
-        }
-    }
-    adjustwhere(false);
-    adjustWhereWidgets(false);
-    previousWidth = document.documentElement.viewport.width;
-    previousHeight = document.documentElement.viewport.height;
-    gpac.set_option("Widgets", "LastWMWidth", '' + previousWidth);
-    gpac.set_option("Widgets", "LastWMHeight", '' + previousHeight);
-}
-
-//
-// function inserting an icon on the home page
-//
-function insert_icon(widget, position, widgetIndex, previousIcon) {
-    if (l_deb < log_level) {
-        alert("[UI] insert_icon: " + widget.shortName + " " + position + " " + widgetIndex + " WMnw:" + WidgetManager.num_widgets);
-    }
-    widget.loaded = true;
-    if (l_deb < log_level) {
-        alert("[UI] widget name: " + widget.name);
-    }
-    var icon = null, original = null;
-    for (var i = 0; i < widget.icons.length; i++) {
-        // default to the first icon even if not of the preferred type
-        if (i == 0) {
-            icon = widget.icons[0].relocated_src;
-            //original = widget.icons[0].original;
-            // alert("choosing default icon " + icon);
-        }
-        // check for preferred type
-        if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
-            icon = widget.icons[i].relocated_src;
-            //original = widget.icons[i].original;
-            break;
-        }
-    }
-    var shortName = widget.shortName;
-    if (typeof shortName == 'undefined') {
-        shortName = widget.name.substring(0, 9);
-    }
-    createIconSVGdecoration(previousIcon, widget, (((position % iconNbHoriz) * 80) + ((80 * (position - (position % iconsPerPage))) / iconNbVert)),
-            ((((position % iconsPerPage) - (position % iconNbHoriz)) / iconNbHoriz) * 80), "icons", icon,
-            shortName, widgetIndex);
-}
-
-// constant
-// const corein = "urn:mpeg:mpegu:schema:widgets:core:in:2010";
-
-//
-// commodity method to empty a list of children
-//
-function removeAllChildren(o) {
-    if (o != null && o.hasChildNodes()) {
-        while (o.childNodes.length >= 1) {
-            o.removeChild(o.firstChild);
-        }
-    }
-}
-
-//
-// create the home page icon with all its behaviours
-//
-function createIconSVGdecoration(previousIcon, widget, x, y, fatherId, iconUrl, name, widIndex) {
-    var g, g2;
-    if (l_inf < log_level) {
-        alert("[UI] createIconSVGdecoration " + iconUrl + " " + x + " " + y);
-    }
-    if (previousIcon != null) {
-        g = previousIcon;
-    } else {
-        g = document.createElement("g");
-        document.getElementById(fatherId).appendChild(g);
-    }
-    g.setAttribute("transform", 'translate(' + x + ',' + y + ')');
-    if (previousIcon != null) {
-        g2 = g.firstElementChild;
-    } else {
-        g2 = document.createElement("g");
-        g2.setAttribute("transform", 'translate(15,10)');
-        g.appendChild(g2);
-    }
-    if (iconUrl == null || iconUrl == "") {
-        iconUrl = "icons/face-surprise.svg";
-    }
-    //
-    // process differently cases where widget.icon == widget.main
-    //
-    var container;
-    if (sameFileIgnoringSVGView(iconUrl, widget.main) && widget.main.indexOf('.svg') >= 0) {
-        // see if the animation already exists
-        container = document.getElementById(name);
-        if (container == null) {
-            // if the animation does not exist yet, create it
-            container = media('animation', iconUrl, 50, 50);
-            // store the animation in the main defs
-            document.getElementById("mainDefs").appendChild(container);
-            container.setAttribute('id', name);
-        }
-        if (previousIcon == null) {
-            // put the container in a use
-            var use = document.createElement("use");
-            use.setAttribute('id', 'iconContainer' + name);
-            use.setAttributeNS(xlinkns, 'href', '#' + name);
-            g2.appendChild(use);
-        }
-    } else {
-        if (previousIcon == null) {
-            container = appropriateElementForMedia(iconUrl, 50, 50);
-            container.setAttribute('id', name);
-            g2.appendChild(container);
-        }
-    }
-    if (previousIcon == null) {
-        g2 = document.createElement("g");
-        g2.setAttribute("transform", 'translate(40,70)');
-        g.appendChild(g2);
-        var anim = createtext(name, 'white', 0, 0, 14, 'Arial Unicode MS');
-        anim.setAttribute("text-anchor", "middle");
-        anim.setAttribute("display-align", "center");
-        g2.appendChild(anim);
-        var rect = invisible_rect(80, 80);
-        g.appendChild(rect);
-        rect.addEventListener("click", csi(widget), false);
-    }
-}
-
-function csi(widget) {
-    return function(evt) { activating_widget(widget);};
-}
-
-//
-// widget closing action (WM callback)
-//
-function widget_close(wid) {
-    if (wid == null) {
-        return;
-    }
-    if (l_inf <= log_level) {
-        alert('[UI] widget_close:' + wid.name);
-    }
-    // maybe inform the widget that it is going to be deactivated
-    WidgetManager.corein_message(wid, "deactivate");
-    var target = widgetContainer.firstElementChild;
-    var i;
-    for (i = 0; i < numActivatedWidgets; i++) {
-        if (activatedWidgets[i] == wid) {
-            break;
-        }
-        target = target.nextElementSibling;
-    }
-    if (target != null) {
-        // move next widgets back one slot
-        recurseMoveAfterDelete(target);
-        // stop the subscene
-        if (target.firstElementChild != null) {
-            target.firstElementChild.setAttributeNS(xlinkns, "href", "");
-        }
-        // end trying
-        widgetContainer.removeChild(target);
-    }
-    wid.deactivate();
-    wid.activated = false;
-    activatedWidgets.splice(i, 1);
-    numActivatedWidgets--;
-    whereW = (whereW >= i ? (whereW > 0 ? whereW - 1 : 0) : whereW);
-    adjustWhereWidgets(false);
-    // if no more widgets, go back to the icons
-    if (numActivatedWidgets == 0) {
-        state = 'home';
-        widgetContainer.setAttribute('display', 'none');
-        homepage.setAttribute('display', 'inline');
-        homebar.setAttribute('display', 'inline');
-        execbar.setAttribute('display', 'none');
-        arrows.setAttribute('display', 'inline');
-        arrowsW.setAttribute('display', 'none');
-        widgetAddList.setAttribute('display', 'none');
-    }
-    if (!wid.permanent) {
-        WidgetManager.unload(wid, false);
-    }
-}
-
-//
-// widget unloading action (WM callback)
-//
-function widget_remove(wid) {
-    if (l_deb <= log_level) {
-        alert('[UI] widget_remove:' + wid.name);
-    }
-    widget_close(wid);
-    WidgetManager.unload(wid, false);
-}
-
-//
-// widget launcher action
-//
-function widget_launch(wid, scene_container) {
-    if (l_inf <= log_level) {
-        alert('[UI] widget_launch:' + wid.name);
-    }
-    var tmp = document.createElement("g");
-    tmp.setAttribute("transform", "translate(" + (totalWidth * numActivatedWidgets) + ", 0)");
-    widgetContainer.appendChild(tmp);
-    var icon = null;
-    alert("wid: " + wid.name + "|" + wid.shortName);
-    if (typeof wid.shortName != 'undefined') {
-        var container = document.getElementById(wid.shortName);
-        if (container != null) {
-            icon = container.getAttributeNS(xlinkns, 'href');
-        }
-    }
-    if (icon != null &&
-            sameFileIgnoringSVGView(icon, wid.main) &&
-            endsWith(wid.main, '.svg')) {
-        // get the animation with id=shortName stored in mainDefs
-        scene_container = document.getElementById(wid.shortName);
-        // get the original use on it, used in the icon
-        var iconContainer = document.getElementById('iconContainer' + wid.shortName);
-        // create a new use
-        var use = document.createElement('use');
-        // point to the animation
-        use.setAttributeNS(xlinkns, 'href', '#' + wid.shortName);
-        // resize the animation
-        scene_container.setAttribute("width", totalWidth);
-        scene_container.setAttribute("height", totalHeight - 120);
-        // resize the original use
-        //should do: fix the aspect ratio conservation
-        var m, t = Math.abs(totalHeight - 120 - totalWidth) / 2;
-        if (totalWidth > totalHeight - 120) {
-            m = 50 / (totalHeight - 120);
-            iconContainer.setAttribute('transform', 'scale(' + m + ',' + m + ') translate(' + (-t) + ',0)');
-        } else {
-            m = 50 / totalWidth;
-            iconContainer.setAttribute('transform', 'scale(' + m + ',' + m + ') translate(0,' + (-t) + ') ');
-        }
-        // add the new use as widget execution container
-        tmp.appendChild(use);
-        wid.activate(scene_container);
-    } else {
-        scene_container.setAttribute("width", totalWidth);
-        scene_container.setAttribute("height", totalHeight - 120);
-        tmp.appendChild(scene_container);
-        scene_container.setAttributeNS(xlinkns, 'href', wid.main);
-        wid.activate(scene_container);
-    }
-    wid.activated = true;
-    activatedWidgets.splice(numActivatedWidgets, 0, wid);
-    whereW = numActivatedWidgets;
-    numActivatedWidgets++;
-    adjustWhereWidgets(false);
-    wid.load_component = widget_load_component;
-    wid.permanent = true;
-    wid.on_load = function () {
-        WidgetManager.corein_message(this, 'setSize', 'width', totalWidth, 'height', totalHeight - 120, 'dpi', 96);
-    };
-    //
-    if (log_level > l_inf) {
-        var i = 0;
-        alert(">>>>>>>>>>>>> " + wid.name + " interfaces:");
-        for (; i < wid.num_interfaces; i++) {
-            alert("" + wid.get_interface(i).type);
-        }
-    }
-    //
-}
-
-//
-// widget load component (WM callback)
-//
-function widget_load_component(comp, is_unload) {
-    if (l_deb <= log_level) {
-        alert('[UI] widget_load_component:' + comp.name);
-    }
-    if (is_unload) {
-        widget_close(comp);
-        comp.parent = null;
-    } else {
-        widget_add(comp);
-        comp.permanent = false;
-        comp.parent = this;
-    }
-}
-
-var upnp_renders = null, target_widgets = null;
-
-//
-// widget remoting function
-//
-function on_widget_remote() {
-    if (WidgetManager.MPEGUStandardServiceProviders.length != 0 && numActivatedWidgets > 0) {
-        upnp_renders = selector_window(activatedWidgets[whereW]);
-        upnp_renders.on_select = function(item, wid) {
-            upnp_renders.unregister(root);
-            upnp_renders = null;
-            if (item == -1) {
-                return;
-            }
-            if (wid != null) {
-                alert("upnp_renders.on_select(" + item + "," + wid.name + ")");
-                //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(item), wid);
-                WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(item), wid);
-                widget_close(wid);
-            }
-        };
-        upnp_renders.register(root);
-    }
-}
-
-//
-// creates the menu of available targets for pushing a widget elsewhere
-//
-function selector_window(widget) {
-    var i, count, render;
-    var selector = document.createElement('g'), obj, child;
-    selector.setAttribute('transform', 'translate(10,10)');
-    count = WidgetManager.MPEGUStandardServiceProviders.length;
-    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black'));
-    for (i = 0; i < count; i++) {
-        render = WidgetManager.MPEGUStandardServiceProviders[i];
-        obj = createtext(render.Name, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
-        obj.setAttribute('id', "selector" + i);
-        selector.appendChild(obj);
-        obj.addEventListener('mouseover', sw1("selector" + i), false);
-        obj.addEventListener('mouseout', sw2("selector" + i), false);
-        obj.addEventListener('click', sw3(i, widget), false);
-    }
-    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
-    obj.setAttribute('id', "cancel");
-    selector.appendChild(obj);
-    obj.addEventListener('mouseover', function(evt) { document.getElementById("cancel").setAttribute("fill", "red"); }, false);
-    obj.addEventListener('mouseout', function(evt) { document.getElementById("cancel").setAttribute("fill", "black"); }, false);
-    obj.addEventListener('click', function(evt) { upnp_renders.on_select(-1, null); }, false);
-    selector.register = function(disp) {
-        disp.appendChild(this);
-    };
-    selector.unregister = function(disp) {
-        disp.removeChild(this);
-    };
-    return selector;
-}
-
-function sw1(s) {
-    return function(evt) { document.getElementById(s).setAttribute("fill", "blue"); };
-}
-
-function sw2(s) {
-    return function(evt) { document.getElementById(s).setAttribute("fill", "black"); };
-}
-
-function sw3(si, widget) {
-    return function(evt) { upnp_renders.on_select(si, widget); };
-}
-
-//
-// when a widget is pushed to here, install the widget and execute it
-//
-function onMediaConnect(url, src_ip) {
-    if (l_inf <= log_level) {
-        alert('[UI] onMediaConnect :\"' + url + '\"');
-    }
-    if (WidgetManager.probe(url)) {
-        var w = WidgetManager.open(url, src_ip);
-        if (w == null) {
-            return;
-        }
-        widget_add(w);
-        adjustWhereWidgets(false);
-        w.permanent = false;
-    }
-}
-
-//
-// file list vars
-//
-var flstart = 0,fllist = null,maxFileNames = 14;
-
-//
-// create a file menu in the main screen, allowing to navigate directories and choose widget config files
-//
-function on_widget_add_menu() {
-    state = 'list';
-    widgetContainer.setAttribute('display', 'none');
-    homepage.setAttribute('display', 'none');
-    homebar.setAttribute('display', 'none');
-    execbar.setAttribute('display', 'inline');
-    arrows.setAttribute('display', 'none');
-    arrowsW.setAttribute('display', 'none');
-    widgetAddList.setAttribute('display', 'inline');
-    maxFileNames = Math.round(((iconNbVert * 80) / 25) - 1.4);
-    isThisAScan = false;
-    refillWidgetAddList(false);
-}
-
-//
-// create a file menu in the main screen, allowing to navigate directories and choose a directory to scan for widgets
-// and load all their icons
-//
-function on_dir_scan() {
-    state = 'list';
-    widgetContainer.setAttribute('display', 'none');
-    homepage.setAttribute('display', 'none');
-    homebar.setAttribute('display', 'none');
-    execbar.setAttribute('display', 'inline');
-    arrows.setAttribute('display', 'none');
-    arrowsW.setAttribute('display', 'none');
-    widgetAddList.setAttribute('display', 'inline');
-    maxFileNames = Math.round(((iconNbVert * 80) / 25) - 1.4);
-    isThisAScan = true;
-    refillWidgetAddList(true);
-}
-
-//
-// remove all installed icons
-//
-function on_clean_up() {
-    var i;
-    //if (l_inf <= log_level) alert('[UI] unloading ' + WidgetManager.num_widgets + ' widgets');
-    for (i = WidgetManager.num_widgets - 1; i >= 0; i--) {
-        var w = WidgetManager.get(i);
-        if (w.loaded) {
-            alert("unloading " + w.name);
-            w.loaded = false;
-            WidgetManager.unload(w, false);
-        }
-    }
-    where = 0;
-    maxwhere = 0;
-    removeAllChildren(document.getElementById("icons"));
-    adjustwhere(false);
-}
-
-//
-// install, but do not launch, the widget whose config.xml has been chosen, and return to the home page
-//
-function widgetInstall(uri, manual, temporary, parent_wid) {
-    var wid, j, count = WidgetManager.num_widgets, nbWidgets = getNbWidgets();
-    for (j = 0; j < count; j++) {
-        wid = WidgetManager.get(j);
-        if (wid.url == uri) {
-            if (wid.loaded) {
-                break;
-            }
-            if (temporary) {
-                wid.permanent = false;
-            }
-            else {
-                insert_icon(wid, nbWidgets, nbWidgets);
-            }
-        }
-    }
-    if (j == count) {
-        wid = WidgetManager.open(uri, null, parent_wid);
-        if (wid != null) {
-            if (temporary) {
-                wid.permanent = false;
-            }
-            else {
-                insert_icon(wid, nbWidgets, nbWidgets);
-            }
-        }
-    }
-    if (manual) {
-        return wid;
-    }
-    state = 'home';
-    widgetContainer.setAttribute('display', 'none');
-    homepage.setAttribute('display', 'inline');
-    homebar.setAttribute('display', 'inline');
-    execbar.setAttribute('display', 'none');
-    arrows.setAttribute('display', 'inline');
-    arrowsW.setAttribute('display', 'none');
-    removeAllChildren(widgetAddList);
-    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
-    where = maxwhere;
-    adjustwhere(false);
-    return wid;
-}
-
-//
-// clean up file list space and refill it
-//
-function refillWidgetAddList(flag) {
-    removeAllChildren(widgetAddList);
-    fllist = null;
-    flstart = 0;
-    fllist = gpac.enum_directory(gpac.last_working_directory, "", false);
-    fillWidgetAddList(flag);
-}
-
-//
-// go to parent directory
-//
-function flUpDir(evt) {
-    var s = gpac.last_working_directory;
-    if (l_inf <= log_level) {
-        alert("[UI] lwd:" + gpac.last_working_directory);
-    }
-    var index = s.lastIndexOf("\\");
-    if (index != -1) {
-        gpac.last_working_directory = s.substring(0, index);
-        refillWidgetAddList(isThisAScan);
-    } else {
-        index = s.lastIndexOf("/");
-        if (index != -1) {
-            gpac.last_working_directory = s.substring(0, index);
-            refillWidgetAddList(isThisAScan);
-        } else {
-            gpac.last_working_directory = "/";
-            refillWidgetAddList(isThisAScan);
-        }
-    }
-}
-
-//
-// go to a named directory
-//
-function flGoTo(newDir) {
-    //alert("goto "+newDir);
-    var s = gpac.last_working_directory;
-    if (s == "/") {
-        gpac.last_working_directory = newDir;
-    } else {
-        var c = s.charAt(s.length - 1);
-        if (c != '\\' && c != '/') {
-            s += "/";
-        }
-        gpac.last_working_directory = s + newDir;
-    }
-    //alert(gpac.last_working_directory);
-    refillWidgetAddList(isThisAScan);
-}
-
-//
-// if the directory contains more files that can be shown, show previous page of file names
-//
-function flPrevFiles(evt) {
-    if (flstart == 0) {
-        return;
-    }
-    flstart -= maxFileNames;
-    if (flstart < 0) {
-        flstart = 0;
-    }
-    removeAllChildren(widgetAddList);
-    fillWidgetAddList(isThisAScan);
-}
-
-//
-// if the directory contains more files that can be shown, show next page of file names
-//
-function flNextFiles(evt) {
-    if (flstart + maxFileNames < fllist.length) {
-        flstart += maxFileNames;
-        removeAllChildren(widgetAddList);
-        fillWidgetAddList(isThisAScan);
-    }
-}
-
-//
-// scan the current directory recursively for widgets, clean up and return to home page
-//
-function flScanDir(evt) {
-    scan_directory(gpac.last_working_directory);
-    state = 'home';
-    var nbWidgets = getNbWidgets();
-    widgetContainer.setAttribute('display', 'none');
-    homepage.setAttribute('display', 'inline');
-    homebar.setAttribute('display', 'inline');
-    execbar.setAttribute('display', 'none');
-    arrows.setAttribute('display', 'inline');
-    arrowsW.setAttribute('display', 'none');
-    removeAllChildren(widgetAddList);
-    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
-    where = maxwhere;
-    adjustwhere(false);
-}
-
-//
-// scanning
-//
-function scan_directory(dir) {
-    var ii, j, count, list, w, uri, loadedWidgets = 0;
-    list = gpac.enum_directory(dir, '.xml;.wgt', 0);
-    for (ii = 0; ii < list.length; ii++) {
-        uri = list[ii].path + list[ii].name;
-        if (list[ii].directory) {
-            scan_directory(uri);
-        } else {
-            count = WidgetManager.num_widgets;
-            for (j = 0; j < count; j++) {
-                var wid = WidgetManager.get(j);
-                if (wid.loaded) {
-                    loadedWidgets++;
-                }
-                if (wid.url == uri) {
-                    if (wid.loaded) {
-                        break;
-                    }
-                    insert_icon(wid, getNbWidgets(), j);
-                    break;
-                }
-            }
-            if (j == count) {
-                w = WidgetManager.open(uri, null);
-                if (w != null) {
-                    insert_icon(w, loadedWidgets, WidgetManager.num_widgets - 1);
-                }
-            }
-        }
-    }
-}
-
-//
-// create the up, prev, next button, show current directory and as many file names as possible
-// the file names are active: clicking on a directory name goes to that directory
-// clicking on a file tries to load that file as a widget
-//
-function fillWidgetAddList(flag) {
-    if (flag) {
-        widgetAddList.appendChild(use("cartoucheflag"));
-        document.getElementById("dirflag").textContent = gpac.last_working_directory;
-    } else {
-        widgetAddList.appendChild(use("cartouche"));
-        document.getElementById("dir").textContent = gpac.last_working_directory;
-    }
-    // next lines are file names
-    var obj;
-    for (i = 0; i < (fllist.length - flstart) && i < maxFileNames; i++) {
-        obj = use("fileMenuElement" + i);
-        obj.setAttribute('transform', 'translate(0,' + (25 * (i + 1)) + ')');
-        widgetAddList.appendChild(obj);
-        document.getElementById("fileMenuElement" + i + "u").setAttributeNS(xlinkns, 'href', "#" + (fllist[i + flstart].directory ? 'folder' : 'new'));
-        document.getElementById("fileMenuElement" + i + "t").textContent = fllist[i + flstart].name;
-        if (obj.listener != null) {
-            obj.removeEventListener("click", obj.listener);
-        }
-        if (fllist[i + flstart].directory) {
-            obj.listener = createGoto(escaping(fllist[i + flstart].name));
-            obj.addEventListener("click", obj.listener, false);
-        } else if (isWidgetFileName(fllist[i + flstart].name)) {
-            obj.listener = createWidgetInstall(escaping(gpac.last_working_directory + '/' + fllist[i + flstart].name));
-            obj.addEventListener("click", obj.listener, false);
-        }
-    }
-}
-
-function createGoto(s) {
-    return function () {
-        flGoTo(s);
-    };
-}
-
-function createWidgetInstall(s) {
-    return function () {
-        widgetInstall(s, false, false, null);
-    };
-}
-
-// // // // // // // // // // // // // // //
-// function library
-// // // // // // // // // // // // // // //
-
-function isWidgetFileName(s) {
-    if (endsWith(s, 'config.xml')) {
-        return true;
-    }
-    if (endsWith(s, '.wgt')) {
-        return true;
-    }
-    return false;
-}
-
-//
-// replace globally \ with / in a string
-//
-function escaping(s) {
-    s = s.replace(/\\/g, '/');
-    return s;
-}
-
-//
-// create rect
-//
-function rect(x, y, w, h, fill, stroke, id) {
-    var child = document.createElement('rect');
-    if (id != null) {
-        child.setAttribute('id', id);
-    }
-    child.setAttribute('x', x);
-    child.setAttribute('y', y);
-    child.setAttribute('width', w);
-    child.setAttribute('height', h);
-    child.setAttribute('fill', fill);
-    child.setAttribute('stroke', stroke);
-    return child;
-}
-
-//
-// create text
-//
-function createtext(content, fill, x, y, size, family) {
-    var child = document.createElement('text');
-    child.setAttribute('fill', fill);
-    child.textContent = content;
-    child.setAttribute('x', x);
-    child.setAttribute('y', y);
-    child.setAttribute('font-size', size);
-    child.setAttribute('font-family', family);
-    return child;
-}
-
-//
-// create invisible rect getting all events
-//
-function invisible_rect(w, h) {
-    var child = document.createElement('rect');
-    child.setAttribute('width', w);
-    child.setAttribute('height', h);
-    child.setAttribute('fill', 'none');
-    child.setAttribute('stroke', 'none');
-    child.setAttribute('pointer-events', 'all');
-    return child;
-}
-
-//
-// create animation
-//
-function media(etype, uri, w, h) {
-    var child = document.createElement(etype);
-    child.setAttributeNS(xlinkns, 'href', uri);
-    child.setAttribute('width', w);
-    child.setAttribute('height', h);
-    if (etype == 'animation') {
-        child.setAttributeNS('http://gpac.sourceforge.net/svg-extensions', 'use-as-primary', 'false');
-    }
-    return child;
-}
-
-//
-// create use
-//
-function use(uri) {
-    var child = document.createElement('use');
-    child.setAttributeNS(xlinkns, 'href', '#' + uri);
-    return child;
-}
-
-//
-// create appropriate element for media reference by the given uri
-//
-function appropriateElementForMedia(uri, w, h) {
-    if (uri.indexOf('#') != -1) {
-        return media('animation', uri, w, h);
-    }
-    if (endsWith(uri, '.svg')) {
-        return media('animation', uri, w, h);
-    }
-    if (endsWith(uri, '.bt')) {
-        return media('animation', uri, w, h);
-    }
-    if (endsWith(uri, '.png')) {
-        return media('image', uri, w, h);
-    }
-    if (endsWith(uri, '.jpg')) {
-        return media('image', uri, w, h);
-    }
-    if (endsWith(uri, '.gif')) {
-        return media('image', uri, w, h);
-    }
-    if (l_war <= log_level) {
-        alert("[UI] WARNING: bad suffix for an icon URI: " + uri);
-    }
-    return media('image', uri, w, h);
-}
-
-//
-// substitute for the useful predefined function endsWith
-//
-function endsWith(s1, s2) {
-    return s1.toLowerCase().substring(s1.length - s2.length) == s2;
-}
-
-/* wrapper as a module
- // export the resize function as the resize member of iphone_wm_gui, as well as other functions
- return {
- resize: resize,
- left_button: left_button,
- right_button: right_button,
- left_buttonW: left_buttonW,
- right_buttonW: right_buttonW,
- home_button: home_button,
- on_dir_scan: on_dir_scan,
- on_clean_up: on_clean_up,
- on_widget_add_menu: on_widget_add_menu,
- on_kill_widget: on_kill_widget,
- on_get_widget: on_get_widget,
- on_widget_remote: on_widget_remote,
- flUpDir: flUpDir,
- flPrevFiles: flPrevFiles,
- flNextFiles: flNextFiles,
- flScanDir: flScanDir,
- get_widget_callback2: get_widget_callback2
- }
-
- }());*/
-
-function widget_activated_and_bound(wid) {
-    WidgetManager.corein_message(wid, "activate");
-}
-
-function printAllFieldsOf(obj, printableName) {
-    var details = "fields of " + printableName + ":\n";
-    for (var field in obj) {
-        fieldContents = obj[field];
-        if (typeof(fieldContents) == "function") {
-            fieldContents = "(function)";
-        }
-        details += "  " + field + ": " + fieldContents + "\n";
-    }
-    alert(details);
-}

gpac-0.8.0.tar.gz/gui/mpegu-core.js Deleted

@@ -1,1794 +0,0 @@
-//This software module was originally developed by TelecomParisTech in the
-//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
-//
-//This software module is an implementation of a part of one or 
-//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
-//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
-//(ISO/IEC 23007-1) free license to this software module or modifications
-//thereof for use in hardware or software products claiming conformance to
-//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
-//module in hardware or software products are advised that its use may
-//infringe existing patents.
-//The original developer of this software module and his/her company, the
-//subsequent editors and their companies, and ISO/IEC have no liability 
-//for use of this software module or modifications thereof in an implementation. 
-//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming 
-//products. 
-//Telecom ParisTech retains full right to use the code for his/her own purpose, 
-//assign or donate the code to a third party and to inhibit third parties from 
-//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products. 
-//
-//This copyright notice must be included in all copies or derivative works.
-//
-//Copyright (c) 2009.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//					Jean-Claude Dufourd, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-// 01122011 AMD1 startWidget listWidgets getWidget implemented
-
-/*
- The widget manager in MPEG-U reference software is implemented in 2 parts:
- - a native GPAC module called gm_widgetman implementing
-   * W3C widget loading (download, unzip, manifest parsing)
-   * W3C Widget APIs
-   * MPEG Widgets interfaces, messages and parameters listing
-
- - a script module (this file) implementing
-  * MPEG Widget interface binding with UPnP services (UPnP is implemented in another module)
-  * MPEG Widget interface binding with other local widgets
-  * MPEG Widget discovery through UPnP devices announcement. The discovery is done by setting the device presentationURL to the widget URL
-
-
- A typical user of the widget manager will therefore see the following interfaces:
-
-interface WidgetManager {
- readonly unsigned integer num_widgets;
- string last_widget_dir;
-
- Widget open(string url, string source_ip);
- void bind(Widget wid);
- Widget get(unsigned int idx);
- void unload(Widget wid);
- void migrate_widget(upnp_renderer, widget);
- void corein_message(widget, msg_name, arg1name, arg1val, ....);
- 
- //callback functions for the GUI to be notifed of widgets added / removed when UPnP devices are appearing/disappearing
- void on_widget_add(widget);
- void on_widget_remove(widget);
-
- //callback functions for core:out
- void coreOutSetSize(wid, args);
- void coreOutShow(wid, args);
- void coreOutHide(wid, args);
- void coreOutRequestActivate(wid, args);
- void coreOutRequestDeactivate(wid, args);
- void coreOutShowNotification(wid, args);
- void coreOutPlaceComponent(wid, args);
- void coreOutGetAttention(wid, args);
-
- }
-
-
-interface Widget {
- //exported meta-data from MPEG-U Manifest
- readonly string mainEncoding;
- readonly string mainMimeType;
- readonly integer defaultWidth;
- readonly integer defaultHeight;
- 
- readonly Array icons;
- readonly Array features;
- readonly Array preferences;
-
-
- readonly string identifier;
- readonly string name;
- readonly string shortName;
- readonly string authorName;
- readonly string authorEmail;
- readonly string authorHref;
- readonly string description;
- readonly string viewmodes;
- readonly string licence;
- readonly string licenceHref;
- readonly string version;
- readonly string uuid;
- readonly boolean discardable;
- readonly boolean multipleInstances;
-
- //widget-manager specific data
- readonly string manifest;
- readonly string main;
- readonly string localizedSrc;
- readonly Array components; //array of widget objects used as component
- boolean permanent;
- readonly boolean is_component;
- readonly Widget parent;
- readonly boolean activated;
- readonly string section;
- readonly integer num_section;
- readonly integer num_interfaces;
- readonly integer num_bound_interfaces;
- readonly integer num_components;
- 
-
- device = local UPnP device created in order to publish interfaces of this widget as upnp services
- originating_device = the device who sent the widget, either through migration or device discovery (presentationURL)
- originating_device_ip = the IP of the device who sent the widget
-
-
-
- void activate(Element node_with_ref_to_main);
- void deactivate();
- }
-
-interface Icon {
- readonly string src;
- readonly string relocated_src;
- readonly integer width;
- readonly integer height;
-}
-
-interface Preference {
- readonly string name;
- readonly string value;
- readonly boolean readonly;
-}
-
-interface Features {
- readonly string name;
- readonly boolean required;
- readonly Array params
-}
-
-interface FeatureParam {
- readonly string name;
- readonly string value;
-}
- */
-
-/*log function*/
-function log(lev, str) {
-    if (lev <= log_level) alert('[WM] ' + str);
-}
-
-/*log levels*/
-l_err = 0;
-l_war = 1;
-l_inf = 2;
-l_deb = 3;
-
-/*default log level*/
-log_level = l_deb;
-
-whiteSpaceRegExp = new RegExp(' ', 'g');
-
-/*initializes the widget manager*/
-function widget_manager_init() {
-    log(l_inf, 'Initializing MPEG-U Widgets');
-    /*if UPnP is enabled, override the deviceAdd callback*/
-    WidgetManager.upnp = false;
-    WidgetManager.migrate_widget = wmjs_migrate_widget;
-    WidgetManager.probe = wmjs_probe_widget;
-    WidgetManager.open = wmjs_open_widget;
-    WidgetManager.bind = wmjs_bind_widget;
-
-    WidgetManager.on_widget_add = wmjs_on_widget_add;
-    WidgetManager.on_widget_remove = wmjs_on_widget_remove;
-
-    WidgetManager.check_bindings = wmjs_bind_widgets;
-    WidgetManager.unbind_widget = wmjs_unbind_widget;
-    WidgetManager.corein_message = wmjs_corein_message;
-
-    WidgetManager.get_mpegu_service_providers = wmjs_get_mpegu_service_providers;
-    WidgetManager.initialize();
-
-    if (typeof(UPnP) != 'undefined') {
-        WidgetManager.upnp = true;
-        log(l_inf, 'Enabling Widget UPnP Discovery')
-        UPnP.onDeviceAdd = wmjs_on_device_add;
-        log(l_inf, 'Creating the standard MPEG-U Service')
-        wmjs_create_standard_service();
-    }
-    log(l_inf, 'MPEG-U Widgets successfully initialized');
-    initCore();
-}
-
-function wmjs_on_widget_add(widget) {}
-
-function wmjs_on_widget_remove(widget) {}
-
-function wmjs_probe_widget(url) {
-    if ((url.lastIndexOf('.wgt') >= 0) || (url.lastIndexOf('.mgt') >= 0) || (url.lastIndexOf('.xml') >= 0)) return 1;
-    return 0;
-}
-
-function wmjs_bind_output_trigger(widget, msg, callback, udta)
-{
-  var res = widget.bind_output_trigger(msg, callback, udta);
-  if (!res) {
-   log(l_err, 'Cannot bind output trigger of message '+msg.name+' in widget '+widget.name);
-  }
-}
-
-function wmjs_open_widget(url, src_ip, parent_widget) {
-    log(l_deb, "wmjs_open_widget");
-    var wid;
-    if (arguments.length>=3) {
-      wid = WidgetManager.load(url, parent_widget);
-    } else {
-      wid = WidgetManager.load(url);
-    }
-    if (wid == null) {
-        log(l_err, 'File ' + url + ' is not a valid widget');
-        return null;
-    }
-    wid.device = null;
-    wid.originating_device = null;
-    wid.originating_device_ip = null;
-    if (src_ip) {
-        wid.permanent = false;
-        wid.originating_device_ip = src_ip;
-        log(l_inf, 'Widget received - ip ' + wid.originating_device_ip);
-    } else {
-        wid.permanent = true;
-        wid.originating_device_ip = null;
-    }
-    return wid;
-}
-
-/*performs an unbind check on all widgets*/
-function wmjs_unbind_widget(widget) {
-    var i, count, wid, ifce_count, j;
-    log(l_inf, 'wmjs_unbind_widget ' + widget.name);
-
-    if (WidgetManager.upnp && widget.device) {
-        UPnP.DeleteDevice(widget.device);
-        widget.device = null;
-    }
-
-    count = WidgetManager.num_widgets;
-    ifce_count = widget.num_interfaces;
-    for (i = 0; i < count; i++) {
-        wid = WidgetManager.get(i);
-        if (!wid) continue;
-        if (wid == widget) continue;
-        if (!wid.activated) continue;
-
-        for (j = 0; j < ifce_count; j++) {
-            var an_ifce = widget.get_interface(j);
-            wid.unbind_interface(an_ifce, widget);
-        }
-    }
-    wmjs_bind_widgets();
-}
-
-
-/*performs a bind check on all widgets*/
-function wmjs_bind_widgets() {
-    log(l_deb, 'wmjs_bind_widgets');
-    var i, wid, count;
-    count = WidgetManager.num_widgets;
-    for (i = 0; i < count; i++) {
-        wid = WidgetManager.get(i);
-        if (!wid) continue;
-        if (!wid.activated) continue;
-        WidgetManager.bind(wid);
-    }
-}
-
-
-/*performs a bind on the given widget*/
-function wmjs_bind_widget(wid) {
-    var i, j, ifce_count, device, service, msg, do_bind;
-
-    if (!wid.activated) {
-        log(l_inf, 'widget not activated - cannot bind');
-        return;
-    }
-    ifce_count = wid.num_interfaces;
-
-    log(l_inf, 'Binding widget ' + wid.name + ' - Nb Interfaces ' + ifce_count);
-
-    /*browse all interfaces and locate services*/
-    for (i = 0; i < ifce_count; i++) {
-        var ifce = wid.get_interface(i);
-        log(l_inf, 'Binding interface ' + ifce.type);
-
-        /*look for a core:* service for this interface and setup*/
-        if (wmjs_bind_interface_to_core_service(wid, ifce)) {
-            continue;
-        }
-        /*if our widget is already bound to this widget, skip it*/
-        if (!ifce.multipleBinding && wid.is_interface_bound(ifce)) {
-            log(l_deb, 'Widget ' + wid.name + ' interface ' + ifce.type + ' already bound');
-            continue;
-        }
-        /*if the widget is the provider of the service, create the service*/
-        if (ifce.serviceProvider) {
-            log(l_inf, 'widget is a service provider');
-            if (WidgetManager.upnp) wmjs_create_upnp_service(wid, ifce);
-            continue;
-        }
-        /*look for a UPnP service for this interface and setup*/
-        if (WidgetManager.upnp && wmjs_bind_interface_to_upnp(wid, ifce)) {
-            continue;
-        }
-        /*look for a local service for this interface*/
-        if (wmjs_bind_interface_to_local(wid, ifce)) {
-            continue;
-        }
-        /*no service found*/
-        log(l_inf, 'Cannot find service for widget ' + wid.name + ' interface ' + ifce.type);
-    }
-}
-
-/*called when a new UPnP device has been added or removed in the network*/
-function wmjs_on_device_add(device, is_add) {
-    log(l_deb, 'wmjs_on_device_add');
-    if (!is_add) {
-        //TODO JCD: this is wrong, sometimes a device is not "is_add" but is not to be removed either
-        /*log(l_inf, 'Device Removed ' + device.Name);
-        wmjs_standard_service_remove(device);
-        wmjs_unbind_upnp_device(device);
-        if (device.widget != null) {
-            log(l_inf, 'Widget Removed ' + device.widget.name);
-            WidgetManager.on_widget_remove(device.widget);
-            device.widget.originating_device = null;
-            device.widget = null;
-        }
-        WidgetManager.check_bindings();*/
-        return;
-    }
-    log(l_inf, 'Device Added ' + device.Name + ' URL ' + device.PresentationURL);
-    wmjs_standard_service_add(device);
-    WidgetManager.check_bindings();
-    /*look for a presentation url - if not given or not identifying a widget, don't do anything*/
-    var url = device.PresentationURL;
-    if (!url || (url == '')) return;
-    if (! WidgetManager.probe(url)) return;
-    /*OK load the widget*/
-    var widget = WidgetManager.load(url);
-    widget.newBorn = true;
-    if (widget == null) {
-        log(l_err, 'File ' + url + ' is not a valid widget');
-        return;
-    }
-    widget.originating_device = device;
-    device.widget = widget;
-    /*indicate our widget is not to be stored*/
-    widget.permanent = false;
-    WidgetManager.on_widget_add(widget);
-}
-
-
-/*
- LOCAL INTERFACE BINDING ROUTINES
-
- In this implementation, widgets-to-widget communication in the same widget manager are called "local" communications.
- The implementation do not rely on any service description for that and directly matches the widgets interfaces
- */
-
-function wmjs_output_trigger_callback_local(msg_out, wid_src, msg_in, wid_dst) {
-    log(l_deb, "wmjs_output_trigger_callback_local");
-    return function(value) {
-        log(l_deb, "wmjs_output_trigger_callback_local/function " + value + " '" + wid_src.name + "'" + wid_dst.name + "'");
-        var param_count = msg_out.num_params;
-        var args = new Array();
-        var is_script = 0;
-        var ai = 0, i;
-        if (msg_in.has_script_input) is_script = 1;
-        log(l_inf, 'Invoking Widget(' + wid_src.name + ').' + msg_out.name);
-        for (i = 0; i < param_count; i++) {
-            var param = msg_out.get_param(i);
-            if (param.is_input) continue;
-
-            if (is_script) {
-                args[ai] = wid_src.get_param_value(param);
-                ai++;
-            } else {
-                wid_dst.set_input(msg_in.get_param(param.name), wid_src.get_param_value(param));
-            }
-        }
-        log(l_inf, 'Calling Widget(' + wid_dst.name + ').' + msg_in.name);
-
-        if (msg_in.has_input_action) {
-            wid_dst.call_input_action(msg_in);
-        } else if (is_script) {
-            wid_dst.call_input_script(msg_in, args);
-        }
-    };
-}
-
-
-function wmjs_interface_invoke_callback_local(wid_dst, ifce_dst, is_reply) {
-    log(l_deb, "wmjs_interface_invoke_callback_local '" + wid_dst.name + "' '" + ifce_dst.type + "' - reply " + is_reply);
-    return function() {
-        log(l_deb, "wmjs_interface_invoke_callback_local/function '" + wid_dst.name + "' '" + ifce_dst.type + "' - reply " + is_reply);
-        var j, i, ai, param_count, msgHandler, msg_src, msg_dst, is_script;
-        var args = new Array();
-        is_script = 0;
-        msgHandler = arguments[0];
-        /*get msg from source interface (this object)*/
-        msg_src = this.get_message(msgHandler.msgName);
-        // JCD: take into account message repetition, if any
-        for (j = 0; j < ifce_dst.num_messages; j++) {
-            msg_dst = ifce_dst.get_message(j);
-            if (msg_dst.name == msgHandler.msgName) {
-                log(l_deb, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on ' + wid_dst.name + '.' + msg_dst.name);
-                if (msg_dst.has_script_input) is_script = 1;
-                param_count = msg_src.num_params;
-                ai = 1;
-                for (i = 0; i < param_count; i++) {
-                    var param = msg_dst.get_param(i);
-                    if (! param.is_input) continue;
-                    if (is_script) {
-                        args[ai - 1] = arguments[ai];
-                    } else {
-                        wid_dst.set_input(param, arguments[ai]);
-                    }
-                    ai++;
-                }
-                if (msg_dst.has_input_action) {
-                    wid_dst.call_input_action(msg_dst);
-                } else if (is_script) {
-                    wid_dst.call_input_script(msg_dst, args);
-                }
-            }
-        }
-    };
-}
-
-/*
- END OF LOCAL INTERFACE BINDING ROUTINES
- */
-
-
-function wmjs_bind_interface_to_local(wid, ifce) {
-    log(l_deb, "wmjs_bind_interface_to_local '" + wid.name + "' " + ifce.type);
-    var i, count, count2, j, a_ifce, a_msg, par, a_par, k, nb_ok, ret, set_bind, a_wid;
-    count = WidgetManager.num_widgets;
-    ret = false;
-    // this is the main loop to try to bind a widget to any other
-    for (i = 0; i < count; i++) {
-        a_wid = WidgetManager.get(i);
-        if (!a_wid) continue;
-        if (a_wid == wid) continue;
-        if (!a_wid.activated) continue;
-        count2 = a_wid.num_interfaces;
-        // now that we know this is a valid widget and not the same as wid
-        // loop on all its interfaces to find one of the right type
-        for (j = 0; j < count2; j++) {
-            a_ifce = a_wid.get_interface(j);
-            if (a_ifce.type == ifce.type) break;
-        }
-        if (j == count2) continue;
-
-        /*if our widget is already bound to this widget (multiple binding==true) or to any widget (multiple binding==false), skip it*/
-        if (wid.is_interface_bound(ifce, ifce.multipleBinding ? a_wid : null)) {
-            log(l_inf, 'Widget ' + wid.name + ' interface ' + ifce.type + ' is already bound');
-            continue;
-        }
-        /*if our widget is already bound to this widget (multiple binding==true) or to any widget (multiple binding==false), skip it*/
-        if (a_wid.is_interface_bound(a_ifce, a_ifce.multipleBinding ? wid : null)) {
-            log(l_inf, 'Widget ' + a_wid.name + ' interface ' + a_ifce.type + ' is already bound');
-            continue;
-        }
-
-        set_bind = 0;
-        // we have found an interface of the right type in the other widget
-        log(l_inf, 'Checking local widget ' + a_wid.name + ' for interface ' + ifce.type);
-        // loop on the messages to check if they match
-        for (j = 0; j < ifce.num_messages; j++) {
-            var msg = ifce.get_message(j), l;
-            //if (msg.is_input) continue;  // JCD: remove test
-            // does the other interface have this message
-            // JCD: remove next line and take repetition of messages into account
-            // a_msg = a_ifce.get_message(msg.name);
-            for (l = 0; l < a_ifce.num_messages; l++) {
-                a_msg = a_ifce.get_message(l);
-                //alert(msg.name+" "+a_msg.name);
-                if (a_msg.name == msg.name) {
-                    // the messages have matching names, check direction
-                    if (msg.is_input == a_msg.is_input) {
-                        log(l_inf, 'Local widget message for ' + msg.name + ' is not in direction ' + (msg.is_input ? 'output' : 'input'));
-                        continue;
-                    }
-                    // the messages have matching names and directions, check params
-                    if (msg.num_params != a_msg.num_params) {
-                        log(l_war, 'Local widget message ' + msg.name + ' does not have the same number of parameters');
-                        continue;
-                    }
-                    /*check all params*/
-                    nb_ok = 0;
-                    for (k = 0; k < msg.num_params; k++) {
-                        par = msg.get_param(k);
-                        a_par = a_msg.get_param(par.name);
-                        if (a_par != null && par.is_input != a_par.is_input) nb_ok ++;
-                    }
-                    if (nb_ok != msg.num_params) {
-                        log(l_war, 'Local widget message ' + msg.name + ' does not have the same input/output parameters');
-                        continue;
-                    }
-                    set_bind ++;
-                    // the messages match
-                    log(l_inf, 'Binding ' + wid.name + '.' + msg.name + ' to ' + a_wid.name + '.' + a_msg.name);
-                    /*OK let's bind this action: we only need to assign the output trigger, the input action will be called from the other widget*/
-                    if (msg.has_output_trigger) {
-                        wmjs_bind_output_trigger(wid, msg, wmjs_output_trigger_callback_local(msg, wid, a_msg, a_wid), a_wid);
-                    }
-                    /*OK let's bind this action: we only need to assign the output trigger, the input action will be called from the other widget*/
-                    if (a_msg.has_output_trigger) {
-                        wmjs_bind_output_trigger(a_wid, a_msg, wmjs_output_trigger_callback_local(a_msg, a_wid, msg, wid), wid);
-                    }
-                }
-            }
-        }
-        if (!set_bind) continue;
-
-        /*create callback for programmatic action triggers*/
-        ifce.invoke = wmjs_interface_invoke_callback_local(a_wid, a_ifce, 0);
-        ifce.invokeReply = wmjs_interface_invoke_callback_local(a_wid, a_ifce, 1);
-        /*create callback for programmatic action triggers*/
-        a_ifce.invoke = wmjs_interface_invoke_callback_local(wid, ifce, 0);
-        a_ifce.invokeReply = wmjs_interface_invoke_callback_local(wid, ifce, 1);
-        a_wid.bind_interface(a_ifce, wid, 'localhost');
-        wid.bind_interface(ifce, a_wid, 'localhost');
-        ret = true;
-    }
-    return ret;
-}
-
-
-/*
- INTERFACE BINDING TO UPNP SERVICES ROUTINES
-
- This implemntation supports binding interfaces to existing UPnP services
- */
-
-/*create a listener function for input parameters*/
-function wmjs_upnp_action_listener(widget, par, msg) {
-    log(l_deb, "wmjs_upnp_action_listener '" + widget.name + "' " + (par != null ? par.name : 'noPar') + " " + (msg != null ? msg.name : 'noMsg'));
-    return function(value) {
-        log(l_deb, "wmjs_upnp_action_listener/function '" + widget.name + "' " + (par != null ? par.name : 'noPar') + " " +
-                   (msg != null ? msg.name : 'noMsg') + " " + value);
-        if (par != null) widget.set_input(par, value);
-        if (msg != null) widget.call_input_action(msg);
-    }
-}
-
-/*create a listener function for input parameters*/
-function wmjs_upnp_action_listener_script(widget, msg) {
-    log(l_deb, 'wmjs_upnp_action_listener_script');
-    return function() {
-        var i, count, act, par, rval, msgHandler, args;
-        act = arguments[0];
-        log(l_deb, 'wmjs_upnp_action_listener_script/function:nb args ' + arguments.length);
-        msgHandler = arguments[1];
-        log(l_deb, 'wmjs_upnp_action_listener_script/function:msgh ' + msgHandler);
-        args = new Array();
-        count = msg.num_params;
-        for (i = 0; i < count; i++) {
-            par = msg.get_param(i);
-            if (!par.is_input) continue;
-            rval = act.GetArgumentValue(par.name);
-            if (par.script_type == 'number') {
-                args.push(parseInt(rval));
-            } else if (par.script_type == 'boolean') {
-                args.push(rval == 'true');
-            } else {
-                args.push(rval);
-            }
-        }
-        msgHandler.onInvokeReply(args);
-    }
-}
-
-
-/**/
-function wmjs_output_trigger_callback_upnp(service, widget, msg) {
-    log(l_deb, 'wmjs_output_trigger_callback_upnp');
-    return function(value) {
-        log(l_deb, 'wmjs_output_trigger_callback_upnp/function ' + value);
-        var i, pi, param_count = msg.num_params;
-        var args = new Array();
-        pi = 0;
-        for (i = 0; i < param_count; i++) {
-            var param = msg.get_param(i);
-            if (param.is_input) continue;
-            args[pi] = param.name;
-            args[pi + 1] = widget.get_param_value(param);
-            pi += 2;
-        }
-        log(l_inf, 'Calling UPnP Action ' + msg.name + " " + param_count);
-        service.CallAction(msg.name, args);
-    };
-}
-
-
-/*create the action callback*/
-function wmjs_message_setup_upnp(widget, service, msg) {
-    log(l_deb, 'wmjs_message_setup_upnp ' + msg.name);
-    /*first let's browse all the message params*/
-    var rad, i, param_count, has_script_input;
-    has_script_input = false;
-    param_count = msg.num_params;
-    for (i = 0; i < param_count; i++) {
-        var param = msg.get_param(i);
-        /*interface not valid for this service*/
-        if (!service.HasAction(msg.name, param.name)) {
-            if (!param.is_input) {
-                log(l_war, 'Output param ' + param.name + ' not found in action - cannot bind action');
-                return false;
-            }
-            continue;
-        }
-        /*this is a service -> widget param */
-        if (param.is_input) {
-            if (msg.has_input_action) {
-                service.SetActionListener(msg.name, wmjs_upnp_action_listener(widget, param, null), param.name);
-            } else {
-                has_script_input = true;
-                // todo: pas vrai d'apres JCD
-            }
-        }
-        /*this is a widget -> service param , used in callback function*/
-    }
-    /*assign the output trigger*/
-    if (msg.has_output_trigger) {
-        var fun_name = 'call_' + msg.name;
-        widget[fun_name] = wmjs_output_trigger_callback_upnp(service, widget, msg);
-        wmjs_bind_output_trigger(widget, msg, widget[fun_name], service);
-    }
-    /*assign the input action*/
-    if (msg.has_input_action) {
-        service.SetActionListener(msg.name, wmjs_upnp_action_listener(widget, null, msg));
-    } else if (has_script_input) {
-        service.SetActionListener(msg.name, wmjs_upnp_action_listener_script(widget, msg), true);
-    }
-    return true;
-}
-
-
-function wmjs_interface_invoke_callback_upnp(service) {
-    log(l_deb, 'wmjs_interface_invoke_callback_upnp');
-    return function() {
-        log(l_deb, 'wmjs_interface_invoke_callback_upnp/function');
-        var args = new Array();
-        var i, pi, ai, param_count, msg, ifce_msg;
-
-        msg = arguments[0];
-        ifce_msg = this.get_message(msg.msgName);
-        param_count = ifce_msg.num_params;
-        log(l_inf, 'UPnP invoke action ' + ifce_msg.name + ' - ' + msg.msgName);
-
-        pi = 0;
-        ai = 1;
-        for (i = 0; i < param_count; i++) {
-            var param = ifce_msg.get_param(i);
-            if (param.is_input) continue;
-
-            args[pi] = param.name;
-            args[pi + 1] = arguments[ai];
-            pi += 2;
-            ai++;
-        }
-        service.CallAction(msg.msgName, args, msg);
-    };
-}
-
-
-function wmjs_bind_interface_to_upnp(wid, ifce) {
-    log(l_deb, "wmjs_bind_interface_to_upnp");
-    var do_bind, is_upnp = false;
-    var service = null;
-
-    if (wid.originating_device) {
-        service = wid.originating_device.FindService(ifce.type);
-    } else if (wid.originating_device_ip) {
-        service = UPnP.FindService(wid.originating_device_ip, ifce.type);
-    } else {
-        var j, dev_count = UPnP.DevicesCount;
-        log(l_deb, 'wmjs_bind_interface_to_upnp nb ' + dev_count);
-        for (j = 0; j < dev_count; j++) {
-            device = UPnP.GetDevice(j);
-            log(l_deb, "wmjs_bind_interface_to_upnp " + device.Name + ' - type: ' + ifce.type);
-            /*do we have a UPnP service with the same interface type ?*/
-            service = device.FindService(ifce.type);
-
-            /*our widget is not bound to this service*/
-            if (service) {
-                if (!wid.is_interface_bound(ifce, service)) break;
-                service = null;
-                is_upnp = true;
-            }
-        }
-    }
-    if (!service) return is_upnp;
-
-    /*our widget is already bound to this service*/
-    if (wid.is_interface_bound(ifce, service)) {
-        log(l_inf, 'Found UPnP Service for interface ' + ifce.type);
-        return true;
-    }
-
-    log(l_inf, 'Found UPnP Service for interface ' + ifce.type);
-    do_bind = 0;
-    for (j = 0; j < ifce.num_messages; j++) {
-        var msg = ifce.get_message(j);
-        /*if we have a state variable in the service with the same name as the pin, bind it*/
-        if (service.HasStateVariable(msg.name)) {
-            var param = msg.get_param(0);
-            if (param && (param.name == msg.name)) {
-                /*set listeners for declarative action triggers*/
-                log(l_deb, 'Found UPnP state variable for message ' + msg.name);
-                service.SetStateVariableListener(wmjs_upnp_action_listener(wid, param, msg), param.name);
-                do_bind = 1;
-            }
-        }
-        /*if we have an action in the service with the same name as the pin, bind it*/
-        else if (service.HasAction(msg.name)) {
-            /*set listeners for declarative action triggers*/
-            log(l_deb, 'Found UPnP action for message ' + msg.name);
-            wmjs_message_setup_upnp(wid, service, msg);
-            do_bind = 1;
-        }
-        /*NOTE: UPnP actions are only messageOut, messageIn are UPnP events and don't have output paramaters. We therefore never need to setup
-         the invokeReply callback for interfaces matching UPnP services. !! This is not true for UPnP services created to publish an interface, eg serviceProvider="true".*/
-    }
-    if (do_bind) {
-        /*create callback for programmatic action triggers*/
-        log(l_inf, 'Binding widget ' + wid.name + ' interface ' + ifce.type + ' to host ' + service.Hostname);
-        ifce.invoke = wmjs_interface_invoke_callback_upnp(service);
-        /*bind interface*/
-        wid.bind_interface(ifce, service, service.Hostname);
-    }
-    return true;
-}
-
-function wmjs_unbind_upnp_device(device)
-{
-    var i, count, j, ifce_count;
-    count = WidgetManager.num_widgets;
-
-    for (i = 0; i < count; i++) {
-        wid = WidgetManager.get(i);
-        if (!wid) continue;
-        if (!wid.activated) continue;
-
-        ifce_count = wid.num_interfaces;
-        for (j = 0; j < ifce_count; j++) {
-            var ifce = wid.get_interface(j);
-            /*do we have a UPnP service with the same interface type ?*/
-            var service = device.FindService(ifce.type);
-            if (!service) continue;
-
-            /*unbind this interface*/
-            if (wid.is_interface_bound(ifce, service)) {
-                wid.unbind_interface(ifce, service);
-            }
-        }
-    }
-}
-
-/*
- END OF INTERFACE BINDING TO UPNP SERVICES ROUTINES
- */
-
-//
-// section on widget migration
-//
-
-header = '<scpd xmlns="urn:schemas-upnp-org:service-1-0"><specVersion><major>1</major><minor>0</minor></specVersion><actionList>';
-middler = '</actionList><serviceStateTable>';
-footer = '</serviceStateTable></scpd>';
-standard_service_scpd = header+'<action><name>startWidget</name><argumentList><argument><name>widgetUrl</name><direction>in</direction><relatedStateVariable>s1</relatedStateVariable></argument><argument><name>widgetUUID</name><direction>in</direction><relatedStateVariable>s2</relatedStateVariable></argument><argument><name>widgetContext</name><direction>in</direction><relatedStateVariable>s3</relatedStateVariable></argument><argument><name>errorCode</name><direction>out</direction><relatedStateVariable>s4</relatedStateVariable></argument></argumentList></action>';
-{
-    standard_service_scpd += '<action><name>requestCapabilitiesList</name><argumentList><argument><name>capabilitiesType</name><direction>out</direction><relatedStateVariable>s5</relatedStateVariable></argument><argument><name>capabilities</name><direction>out</direction><relatedStateVariable>s6</relatedStateVariable></argument></argumentList></action>';
-    standard_service_scpd += '<action><name>listWidgets</name><argumentList><argument><name>widgetCodes</name><direction>out</direction><relatedStateVariable>s7</relatedStateVariable></argument><argument><name>widgetNames</name><direction>out</direction><relatedStateVariable>s8</relatedStateVariable></argument><argument><name>widgetIdentifiers</name><direction>out</direction><relatedStateVariable>s9</relatedStateVariable></argument></argumentList></action>';
-    standard_service_scpd += '<action><name>getWidget</name><argumentList><argument><name>widgetCode</name><direction>in</direction><relatedStateVariable>s10</relatedStateVariable></argument><argument><name>errorCode</name><direction>out</direction><relatedStateVariable>s11</relatedStateVariable></argument>';
-    standard_service_scpd += '<argument><name>widgetUrl</name><direction>out</direction><relatedStateVariable>s41</relatedStateVariable></argument><argument><name>widgetUUID</name><direction>out</direction><relatedStateVariable>s42</relatedStateVariable></argument><argument><name>widgetContext</name><direction>out</direction><relatedStateVariable>s43</relatedStateVariable></argument></argumentList></action>';
-    standard_service_scpd += middler+'<stateVariable><name>s1</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s2</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s3</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s4</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s5</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s6</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s7</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s8</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s9</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s10</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s11</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s41</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s42</name><dataType>string</dataType></stateVariable>';
-    standard_service_scpd += '<stateVariable><name>s43</name><dataType>string</dataType></stateVariable>'+footer;
-}
-
-//
-// migrate a widget by calling the appropriate startWidget message of the target
-// migration service
-//
-function wmjs_migrate_widget(render, widget) {
-    if (WidgetManager.upnp) {
-        var url, ctx, uri;
-
-        url = widget.url;
-        /*share the widget*/
-        uri = UPnP.ShareResource(url, render.HostName);
-
-        ctx = widget.get_context();
-
-        if (ctx == null) ctx = "";
-        log(l_inf, 'Migrating widget ' + url + ' to renderer ' + render.Name + ' as resource ' + uri);
-        log(l_inf, 'Migration Context ' + ctx);
-
-        // envoyer la methode startWidget sur render
-        var args = new Array();
-        args.push("widgetUrl");
-        args.push(uri);
-        args.push("widgetUUID");
-        args.push(null);
-        args.push("widgetContext");
-        args.push(ctx);
-        log(l_inf, "startWidget "+uri);
-        log(l_inf, "startWidgetCtx "+ctx);
-        alert("call StdServ "+render.Name+" "+render.standardService);
-        var code = render.standardService.CallAction("startWidget", args);
-        log(l_inf, "return code from standardService.CallAction is "+code);
-    }
-}
-
-//
-// check whether the removed device was a publisher of MPEGUStandardService
-// if yes, remove it from the list
-//
-function wmjs_standard_service_remove(device) {
-    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
-    if (service != null) {
-        var i = WidgetManager.MPEGUStandardServiceProviders.indexOf(device);
-        if (i >= 0) {
-            log(l_err, "migration service remove "+device.Name);
-            WidgetManager.MPEGUStandardServiceProviders.splice(i, 1);
-        } else log(l_err, "Trying to remove a standard service device which was not added first: "+device);
-    }
-}
-
-//
-// add a migration service provider to the list and remember the service in the device
-//
-function wmjs_standard_service_add(device) {
-    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
-    if (service != null) {
-        log(l_err, "migration service add "+device.Name);
-        WidgetManager.MPEGUStandardServiceProviders.push(device);
-        device.standardService = service;
-        alert("add StdServ "+device.Name+" "+device.standardService);
-    }
-}
-
-//
-// get the nth standard service provider (migration service)
-//
-function wmjs_get_mpegu_service_providers(index) {
-    if (!WidgetManager.MPEGUStandardServiceProviders) {
-        log(l_err, "uninitialized MPEGUStandardServiceProviders");
-        return null;
-    }
-    if (index < 0 || index > WidgetManager.MPEGUStandardServiceProviders.length) {
-        log(l_err, "index of MPEGUStandardServiceProviders out of bounds:"+index);
-        return null;
-    }
-    return WidgetManager.MPEGUStandardServiceProviders[index];
-}
-
-function wmjs_create_standard_service() {
-    //alert("create_standard_service");
-    var name = "MPEG-U";
-    var option = gpac.get_option('General', 'DeviceName');
-    if (option) name = option;
-    WidgetManager.device = UPnP.CreateDevice("urn:mpeg-u:device:widget-manager:1", name+"@"+gpac.hostname);
-    WidgetManager.device.enabled = 1;
-    /* implement the response to a external call (messageOut of another widget) */
-    WidgetManager.device.OnAction = wmjs_widget_standard_service_process_action;
-    log(l_err, 'wmjs_create_standard_service');
-    //log(l_inf, 'Service scpd ' + standard_service_scpd);
-    /* WidgetManager.standardService = */
-    var service = WidgetManager.device.SetupService("MPEG-U_Standard_Service", "urn:mpeg-u:service:widget-manager:1",
-            "urn:mpeg-u:serviceId:widget-manager:1.001", standard_service_scpd);
-    WidgetManager.device.Start();
-    WidgetManager.MPEGUStandardServiceProviders = new Array();
-    //alert("create_standard_service end");
-}
-
-/* generic processing of any action from outside for the standard MPEG-U service */
-function wmjs_widget_standard_service_process_action(action) {
-    log(l_err, 'wmjs_widget_standard_service_process_action Action ' + action.Name);
-    /* find the message matching the action in the interface */
-    if (action.Name == "startWidget") {
-        process_startWidget_action(action);
-    } else if (action.Name == "requestCapabilitiesList"){
-        process_requestCapabilitiesList_action(action);
-    } else if (action.Name == "listWidgets") {
-        process_listWidgets_action(action);
-    } else if (action.Name == "getWidget") {
-        process_getWidget_action(action);
-    } else {
-        log(l_inf, 'wmjs_widget_standard_service_process_action Action not found: ' + action.Name);
-    }
-}
-
-//
-// processing of a request to start a widget (push migration or predefined "activateWidgetByUrl")
-//
-function process_startWidget_action(action) {
-    log(l_err,"process start widget");
-    // get action arguments
-    var widgetUrl = action.GetArgument("widgetUrl");
-    var widgetUUID = action.GetArgument("widgetUUID");
-    var widgetContext = action.GetArgument("widgetContext");
-    log(l_err,"start:"+widgetUrl+" "+widgetUUID+" "+widgetContext);
-    // get widget
-    if (widgetUrl == null && widgetUUID != null) {
-        log(l_err, "unable to load a widget by UUID: unimplemented");
-        action.SendReply(["errorCode", 1]);
-        return;
-    }
-    var wid = WidgetManager.load(widgetUrl, null, widgetContext);
-    WidgetManager.on_widget_add(wid);
-    action.SendReply(["errorCode", 0]);
-}
-
-//
-// processing of a request for the list of capabilities
-//
-function process_requestCapabilitiesList_action(action) {
-    //TODO
-    alert("UNIMPLEMENTED in mpegu-core.js: request capabilities list");
-}
-
-//
-// processing of a request for the list of widgets (prelude to a pull migration)
-//
-function process_listWidgets_action(action) {
-    log(l_err,"process list widgets");
-    // list widget
-    var count = WidgetManager.num_widgets, i, r1 = "", r2 = "", includeSpace = false;
-    for (i = 0; i < count; i++) {
-        var wid = WidgetManager.get(i);
-        if (wid.activated) {
-            if (includeSpace) {
-                r1 += " ";
-            } else {
-                includeSpace = true;
-            }
-            r1 += i+1;
-            r2 += wid.name.replace(whiteSpaceRegExp, '_')+" ";
-        }
-    }
-    alert("sendReply widgetCodes=|"+r1+"| widgetNames=|"+r2+"|");
-    action.SendReply(["widgetCodes", r1, "widgetNames", r2]);
-}
-
-//
-// processing of a pull migration request
-//
-function process_getWidget_action(action) {
-    log(l_deb, "process get widget "+action+" "+action.Name);
-    // get action arguments
-    var widgetCode = action.GetArgument("widgetCode");
-    log(l_deb, "get:"+widgetCode);
-    // get widget
-    var wid = WidgetManager.get(parseInt(widgetCode) - 1);
-    var url, ctx, uri;
-    url = wid.url;
-    /*share the widget*/
-    uri = UPnP.ShareResource(url);
-    ctx = wid.get_context();
-    if (ctx == null) ctx = "";
-    log(l_inf, 'sendReply widget ' + url + ' as resource ' + uri);
-    log(l_inf, 'with context ' + ctx);
-    var args = new Array();
-    args.push("errorCode");
-    args.push(0);
-    args.push("widgetUrl");
-    args.push(uri);
-    args.push("widgetUUID");
-    args.push(null);
-    args.push("widgetContext");
-    args.push(ctx);
-    action.SendReply(args);
-    WidgetManager.on_widget_remove(wid);
-}
-
-//
-// end of migration service
-//
-
-/*
- INTERFACE PUBLISHING AS UPNP SERVICES ROUTINES
-
- This implementation supports publishing a widget interface in the network as a UPnP service. This is done
- by generating on the fly a new device associated with a widget, and one UPnP service per widget interface.
- The UPnP service description (SCPD) is generated on the fly from the interface description
- */
-
-function wmjs_make_interface_scpd(widget, ifce) {
-    log(l_deb, "wmjs_make_interface_scpd");
-    var variables = '', actions = '', vars, j, msg, k, param, numstatevar = 0;
-    /*do actions*/
-    for (j = 0; j < ifce.num_messages; j++) {
-        msg = ifce.get_message(j);
-        actions += '<action><name>' + msg.name + '</name><argumentList>';
-        for (k = 0; k < msg.num_params; k++) {
-            param = msg.get_param(k);
-            actions += '<argument><name>' + param.name + '</name><direction>' + (param.is_input ? 'in' : 'out');
-            actions += '</direction><relatedStateVariable>v' + numstatevar + '</relatedStateVariable></argument>';
-            numstatevar++;
-        }
-        actions += '</argumentList></action>';
-    }
-    /*do variables*/
-    for (k = 0; k < numstatevar; k++) {
-        variables += '<stateVariable><name>v' + k + '</name><dataType>string</dataType></stateVariable>';
-    }
-    return header + actions + middler + variables + footer;
-}
-
-/* generic processing of any action from outside */
-function wmjs_widget_upnp_process_action(action) {
-    log(l_err, 'wmjs_widget_upnp_process_action Action ' + action.Name + ' invoked on ' + action.Service.ifce.type);
-    var i, ai, args, msg, has_output = false;
-    /* find the message matching the action in the interface */
-    msg = null;
-    for (i = 0; i < action.Service.ifce.num_messages; i++) {
-        msg = action.Service.ifce.get_message(i);
-        if (msg.name == action.Name) break;
-        msg = null;
-    }
-    if (msg == null) {
-        log(l_inf, 'wmjs_widget_upnp_process_action Action not found: ' + action.Name + ' invoked on ' + action.Service.name);
-        return;
-    }
-    args = new Array();
-    ai = 0;
-    /*assign action for any async callback from the scene (cf wmjs_upnp_action_response)*/
-    action.Service.action = action;
-    /* for each param in the found message */
-    for (i = 0; i < msg.num_params; i++) {
-        var param = msg.get_param(i);
-        /* only process input params */
-        if (!param.is_input) {
-            has_output = true;
-            continue;
-        }
-        if (msg.has_script_input) {
-            /* input param is scripted, store argument value in args array */
-            args[ai] = action.GetArgument(param.name);
-        } else {
-            /* input param is not scripted but declarative, store argument value directly in scene tree */
-            this.widget.set_input(param, action.GetArgument(param.name));
-        }
-        ai++;
-    }
-    if (msg.has_input_action) {
-        /* message is not scripted, call input action */
-        this.widget.call_input_action(msg);
-    } else if (msg.has_script_input) {
-        /* message is scripted, call the script function specified in inputAction */
-        this.widget.call_input_script(msg, args);
-    }
-    if (!has_output) {
-        log(l_inf, 'wmjs_widget_upnp_process_action sending empty reply');
-        action.SendReply();
-        action.Service.action = null;
-    }
-}
-
-function wmjs_upnp_event_sender(service, widget, msg) {
-    return function(value) {
-        log(l_deb, 'wmjs_upnp_event_sender/function ' + service.ifce.type + " " + widget.name + " " + msg.name);
-        var i, pi, param_count = msg.num_params;
-        var args = new Array();
-        pi = 0;
-        for (i = 0; i < param_count; i++) {
-            var param = msg.get_param(i);
-            if (param.is_input) continue;
-            args[pi] = param.name;
-            args[pi + 1] = widget.get_param_value(param);
-            pi += 2;
-        }
-        log(l_inf, 'sending UPnP event ' + msg.name);
-        service.CallAction(msg.name, args);
-    };
-}
-
-function wmjs_upnp_action_response(service, widget, msg) {
-    return function(value) {
-        if (service.action == null) {
-            // TODO this code avoids the bug that this function is called twice: find out why it is called twice!
-            log(l_inf, 'wmjs_upnp_action_response/function DUPL(return) ' + service.ifce.type + " '" + widget.name + "' " + msg.name);
-            return;
-        }
-        var i, pi, param_count = msg.num_params;
-        var args = new Array();
-        pi = 0;
-        for (i = 0; i < param_count; i++) {
-            var param = msg.get_param(i);
-            if (param.is_input) continue;
-            args[pi] = param.name;
-            args[pi + 1] = widget.get_param_value(param);
-            pi += 2;
-        }
-        log(l_inf, 'UPnP sending reply on action ' + service.action + ': ' + service.ifce.type + " '" + widget.name + "' " + msg.name);
-        service.action.SendReply(args);
-        service.action = null;
-    };
-}
-
-
-function wmjs_upnp_action_response_script(service) {
-    return function() {
-        if (service.action == null) {
-            // this code avoids the bug that this function is called twice: find out why it is called twice!
-            return;
-        }
-        var i, pi, ai, param_count;
-        var args = new Array();
-        var msgHandler = arguments[0];
-        var msg = service.ifce.get_message(msgHandler.msgName);
-
-        pi = 0;
-        ai = 1;
-        for (i = 0; i < param_count; i++) {
-            var param = msg.get_param(i);
-            if (param.is_input) continue;
-            args[pi] = param.name;
-            args[pi + 1] = arguments[ai];
-            pi += 2;
-            ai++;
-        }
-        log(l_inf, 'UPnP sending reply on action ' + service.action);
-        service.action.SendReply(args);
-        service.action = null;
-    };
-}
-
-
-function wmjs_create_upnp_service(widget, ifce) {
-    var i, service, scpd, start_device = 0;
-    var name;
-
-    log(l_deb, 'widget device : ' + widget.device);
-
-    /* at least one interface is a provider, so create a device - service or device names SHALL NOT CONTAIN SPACES*/
-    name = widget.name.replace(whiteSpaceRegExp, '_');
-    if (!widget.device) {
-        //log(l_inf,'creating device');
-        widget.device = UPnP.CreateDevice("urn:mpeg-u:device:provider-" + name + ":1", name);
-        /* remember the widget in the device */
-        widget.device.widget = widget;
-        widget.device.enabled = 1;
-        start_device = 1;
-        /* implement the response to a external call (messageOut of another widget) */
-        widget.device.OnAction = wmjs_widget_upnp_process_action;
-    }
-
-    /*service has already been created*/
-    if (typeof(ifce.started) != 'undefined') return;
-
-    log(l_inf, 'wmjs_create_upnp_service');
-    scpd = wmjs_make_interface_scpd(widget, ifce);
-    //log(l_inf, 'Service scpd ' + scpd);
-    service = widget.device.SetupService(name, ifce.type, ifce.type + ".001", scpd);
-    service.ifce = ifce;
-
-    /* for each message in a provider interface */
-    for (i = 0; i < ifce.num_messages; i++) {
-        msg = ifce.get_message(i);
-        /* if there is an output_trigger, a reply may be triggered after a call */
-        if (msg.has_output_trigger) {
-            if (msg.is_input) {
-                /* output in an input message => this is a reply */
-                var fun_name1 = 'respond_' + msg.name;
-                widget[fun_name1] = wmjs_upnp_action_response(service, widget, msg);
-                wmjs_bind_output_trigger(widget, msg, widget[fun_name1], service);
-            } else {
-                /* output in an output message => this is an event */
-                var fun_name2 = 'send_event_' + msg.name;
-                widget[fun_name2] = wmjs_upnp_event_sender(service, widget, msg);
-                wmjs_bind_output_trigger(widget, msg, widget[fun_name2], service);
-            }
-        }
-        /*if message is input, a reply may be sent*/
-        else if (msg.is_input) {
-            var j, has_out;
-            has_out = 0;
-            for (j = 0; j < msg.num_params; j++) {
-                var param = msg.get_param(j);
-                if (param.is_input) continue;
-                has_out = 1;
-                break;
-            }
-            if (has_out) {
-                ifce.invokeReply = wmjs_upnp_action_response_script(service);
-            }
-        }
-    }
-    ifce.started = true;
-
-    if (start_device) {
-        //log(l_inf,"device start");
-        widget.device.Start();
-    }
-}
-
-
-/*
- END OF INTERFACE PUBLISHING AS UPNP SERVICES ROUTINES
- */
-
-/*********************************************************
- Start of implementation of core:in and core:out interfaces
- *********************************************************/
-
-coreIn = null, coreOut = null;
-
-//
-// function defining messages for the core:* interfaces implemented by the WM
-//
-function defineMessage(name, direction, executeFunction, params1, params2) {
-    var msg = new Object();
-    msg.name = name;
-    msg.is_input = !direction; // the standard defines the point of view of the widget, not that of the WM
-    msg.num_params = 0;
-    // the executeFunction is the function implemented by widman.js and
-    // which passes the buck to a function of the widget manager, if there is one
-    if (executeFunction != null) msg.execute = executeFunction;
-    // in a messageOut, params1 contains outputs and params2 contains inputs
-    // in a messageIn, params1 contains inputs and params2 contains outputs
-    if (direction) {
-        if (params1 != null) {
-            msg.paramsOut = params1;
-            msg.num_params += params1.length;
-        }
-        if (params2 != null) {
-            msg.paramsIn = params2;
-            msg.num_params += params2.length;
-        }
-    } else {
-        if (params1 != null) {
-            msg.paramsIn = params1;
-            msg.num_params += params1.length;
-        }
-        if (params2 != null) {
-            msg.paramsOut = params2;
-            msg.num_params += params2.length;
-        }
-    }
-    //alert("Message defined: "+msg.name+' '+msg.num_params+' '+msg.is_input+' '+
-    //      (msg.paramsIn != null ? msg.paramsIn.length : 0)+' '+
-    //      (msg.paramsOut != null ? msg.paramsOut.length : 0));
-    return msg;
-}
-
-//
-// function defining the parameter lists for messages
-// the direction of a parameter is implicit in its position in the paramsIn or paramsOut of a message
-//
-function defineParams() {
-    var params = new Array();
-    var i = 0;
-    for (; i < arguments.length; i++) {
-        params[i] = arguments[i];
-    }
-    return params;
-}
-
-//
-// get message by name in a core interface (core:in or core:out
-//
-function getMessage(core, s) {
-    var i = 0;
-    for (; i < core.length; i++) {
-        if (core[i].name == s) return core[i];
-    }
-    return null;
-}
-
-//
-// get a parameter from a message by name
-//
-function hasParam(msg, name) {
-    var i = 0;
-    if (msg.paramsIn) {
-        for (i = 0; i < msg.paramsIn.length; i++) {
-            if (msg.paramsIn[i] == name) return true;
-        }
-    }
-    if (msg.paramsOut) {
-        for (i = 0; i < msg.paramsOut.length; i++) {
-            if (msg.paramsOut[i] == name) return true;
-        }
-    }
-    return false;
-}
-
-//
-// get a parameter from a message by index
-//
-/*function getParam(msg, i) {
-    if (!msg.is_input) {
-        if (msg.paramsIn) {
-            if (i < msg.paramsIn.length) {
-                return msg.paramsIn[i];
-            } else {
-                i -= msg.paramsIn.length;
-            }
-        }
-        if (msg.paramsOut) {
-            if (i < msg.paramsOut.length) {
-                return msg.paramsOut[i];
-            }
-        }
-    } else {
-        if (msg.paramsOut) {
-            if (i < msg.paramsOut.length) {
-                return msg.paramsOut[i];
-            } else {
-                i -= msg.paramsOut.length;
-            }
-        }
-        if (msg.paramsIn) {
-            if (i < msg.paramsIn.length) {
-                return msg.paramsIn[i];
-            }
-        }
-    }
-    return null;
-}*/
-
-//
-// get a parameter from a message by index
-//
-function getInputParam(msg, i) {
-    if (!msg.is_input) {
-        if (msg.paramsIn) {
-            if (i < msg.paramsIn.length) {
-                return msg.paramsIn[i];
-            } else {
-                return null;
-            }
-        }
-    } else {
-        if (msg.paramsOut) {
-            if (i < msg.paramsOut.length) {
-                return null;
-            } else {
-                i -= msg.paramsOut.length;
-            }
-        }
-        if (msg.paramsIn) {
-            if (i < msg.paramsIn.length) {
-                return msg.paramsIn[i];
-            }
-        }
-    }
-    return null;
-}
-
-//
-// reconstruct the direction of a parameter of a message by its position
-//
-function paramDirection(msg, name) {
-    var i = 0;
-    if (msg.paramsIn) {
-        for (i = 0; i < msg.paramsIn.length; i++) {
-            if (msg.paramsIn[i] == name) return true;
-        }
-    }
-    if (msg.paramsOut) {
-        for (i = 0; i < msg.paramsOut.length; i++) {
-            if (msg.paramsOut[i] == name) return false;
-        }
-    }
-    return false;
-}
-
-function initCore() {
-    /*
-     Methods implementing messageIn of the core interfaces
-     In these methods, this is the message and args is the list of arguments of the message
-     widman.js, as the common part of all widget managers, does not implement these methods directly
-     but passes the buck to specific WM implementations.
-     In specific WM implementation, an initializer function should contain
-     WidgetManager.coreOutSetSize = function (...) {...};
-     or similar.
-     */
-    WidgetManager.coreOutSetSize = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.setSize" + argsString);
-    };
-
-    WidgetManager.coreOutShow = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.show" + argsString);
-    };
-
-    WidgetManager.coreOutHide = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.hide" + argsString);
-    };
-
-    WidgetManager.coreOutRequestActivate = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.requestActivate" + argsString);
-    };
-
-    WidgetManager.coreOutRequestDeactivate = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.requestDeactivate" + argsString);
-    };
-
-    WidgetManager.coreOutShowNotification = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.showNotification" + argsString);
-    };
-
-    WidgetManager.coreOutPlaceComponent = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.placeComponent" + argsString);
-    };
-
-    WidgetManager.coreOutGetAttention = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.getAttention" + argsString);
-    };
-    WidgetManager.coreOutInstallWidget = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.installWidget" + argsString);
-    };
-    WidgetManager.coreOutMigrateComponent = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.migrateComponent" + argsString);
-    };
-    WidgetManager.coreOutRequestMigrationTargets = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.requestMigrationTargets" + argsString);
-    };
-    WidgetManager.coreOutActivateTemporaryWidget = function(wid, args) {
-        var i = 0, argsString = "";
-        for (; i < args.length; i++) argsString += " " + args[i];
-        log(l_deb, "*** defCoreOutImpl.activateTemporaryWidget" + argsString);
-    };
-    /*
-     Define the core:* interfaces that the widget manager implements and provides to widgets
-     The structure of messages is simplified.
-     messageIn have first an array of paramsIn, then an array of paramsOut for a reply
-     messageOut have first an array of paramsOut, then an array of paramsIn for reply
-     Because of this simplification, getParam and defineMessage are dependent on the direction of the message
-     The direction of a parameter is implicit in the fact that it is stored in paramsIn or paramsOut of the message
-     */
-    coreIn = new Array();
-    coreOut = new Array();
-    coreIn[0] = defineMessage("setSize", true, null, defineParams("width", "height", "dpi"));
-    coreIn.setSizeMessage = coreIn[0];
-    coreIn[1] = defineMessage("show", true, null);
-    coreIn.showMessage = coreIn[1];
-    coreIn[2] = defineMessage("hide", true, null);
-    coreIn.hideMessage = coreIn[2];
-    coreIn[3] = defineMessage("activate", true, null);
-    coreIn.activateMessage = coreIn[3];
-    coreIn[4] = defineMessage("deactivate", true, null);
-    coreIn.deactivateMessage = coreIn[4];
-    coreIn.type = "urn:mpeg:mpegu:schema:widgets:core:in:2010";
-    coreOut[0] = defineMessage("setSize", false, coreOutSetSize, defineParams("width", "height"));
-    coreOut.setSizeMessage = coreOut[0];
-    coreOut[1] = defineMessage("show", false, coreOutShow);
-    coreOut.showMessage = coreOut[1];
-    coreOut[2] = defineMessage("hide", false, coreOutHide);
-    coreOut.hideMessage = coreOut[2];
-    coreOut[3] = defineMessage("requestActivate", false, coreOutRequestActivate, null,
-            defineParams("returnCode"));
-    coreOut.requestActivateMessage = coreOut[3];
-    coreOut[4] = defineMessage("requestDeactivate", false, coreOutRequestDeactivate, null,
-            defineParams("returnCode"));
-    coreOut.requestDeactivateMessage = coreOut[4];
-    coreOut[5] = defineMessage("showNotification", false, coreOutShowNotification,
-            defineParams("message"), defineParams("returnCode"));
-    coreOut.showNotificationMessage = coreOut[5];
-    coreOut[6] = defineMessage("placeComponent", false, coreOutPlaceComponent,
-            defineParams("componentID", "x", "y", "w", "h", "z-index", "transparency"),
-            defineParams("returnCode"));
-    coreOut.placeComponentMessage = coreOut[6];
-    coreOut[7] = defineMessage("getAttention", false, coreOutGetAttention,
-            null, defineParams("returnCode"));
-    coreOut.getAttentionMessage = coreOut[7];
-    coreOut[8] = defineMessage("installWidget", false, coreOutInstallWidget,
-            defineParams("url"), defineParams("returnCode"));
-    coreOut.installWidgetMessage = coreOut[8];
-    coreOut[9] = defineMessage("migrateComponent", false, coreOutMigrateComponent,
-            defineParams("componentId", "targetCode"), defineParams("returnCode"));
-    coreOut.migrateComponentMessage = coreOut[9];
-    coreOut[10] = defineMessage("requestMigrationTargets", false, coreOutRequestMigrationTargets,
-            null, defineParams("targetCodes", "targetNames", "targetDescriptions"));
-    coreOut.requestMigrationTargetsMessage = coreOut[10];
-    coreOut[11] = defineMessage("activateTemporaryWidget", false, coreOutActivateTemporaryWidget,
-            defineParams("url"), defineParams("returnCode"));
-    coreOut.activateTemporaryWidget = coreOut[11];
-    coreOut.type = "urn:mpeg:mpegu:schema:widgets:core:out:2010";
-}
-
-function coreOutRequestMigrationTargets(wid, args) {
-    WidgetManager.coreOutRequestMigrationTargets(wid, args);
-}
-
-function coreOutSetSize(wid, args) {
-    WidgetManager.coreOutSetSize(wid, args);
-}
-
-function coreOutShow(wid, args) {
-    WidgetManager.coreOutShow(wid, args);
-}
-
-function coreOutHide(wid, args) {
-    WidgetManager.coreOutHide(wid, args);
-}
-
-function coreOutRequestActivate(wid, args) {
-    WidgetManager.coreOutRequestActivate(wid, args);
-}
-
-function coreOutRequestDeactivate(wid, args) {
-    WidgetManager.coreOutRequestDeactivate(wid, args);
-}
-
-function coreOutShowNotification(wid, args) {
-    WidgetManager.coreOutShowNotification(wid, args);
-}
-
-function coreOutPlaceComponent(wid, args) {
-    WidgetManager.coreOutPlaceComponent(wid, args);
-}
-
-function coreOutGetAttention(wid, args) {
-    WidgetManager.coreOutGetAttention(wid, args);
-}
-
-function coreOutInstallWidget(wid, args) {
-    WidgetManager.coreOutInstallWidget(wid, args);
-}
-
-function coreOutActivateTemporaryWidget(wid, args) {
-    WidgetManager.coreOutActivateTemporaryWidget(wid, args);
-}
-
-function coreOutMigrateComponent(wid, args) {
-    WidgetManager.coreOutMigrateComponent(wid, args);
-}
-
-/*
- Methods of binding and callback of core:* interfaces
- */
-function wmjs_interface_invoke_callback_core(wid_src, ifce_dst, is_reply) {
-    log(l_inf, "wmjs_interface_invoke_callback_core '" + ifce_dst.type + "' - reply " + is_reply);
-    return function() {
-        var i, ai = 0, param_count, msgHandler, msg_src, msg_dst;
-        var args = new Array();
-        msgHandler = arguments[0];
-        /*get msg from source interface (this object)*/
-        msg_src = this.get_message(msgHandler.msgName);
-        msg_dst = getMessage(ifce_dst, msgHandler.msgName);
-        //var argstring = "";
-        //for (i = 0; i < msg_dst.num_params; i++) argstring += " "+getParam(msg_dst, i);
-        //log(l_inf, argstring);
-        //log(l_inf, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on core.' + msg_dst.name + " nbpar:"+msg_src.num_params);
-        param_count = msg_src.num_params;
-        for (i = 0; i < param_count; i++) {
-            var param = getInputParam(msg_dst, i);
-            if (param == null) continue;
-            args[ai] = arguments[ai+1];
-            ai++;
-        }
-        log(l_inf, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on core.' + msg_dst.name + " nb:"+ai);
-        // call the method that implements the core:* message
-        msg_dst.execute(wid_src, args);
-    };
-}
-
-// function invokeReply for a reply from within a coreOut message
-function wmjs_core_out_invoke_reply() {
-    var i, ai, param_count, is_script, msg_src, msg_dst, wid_dst;
-    var args = new Array();
-    is_script = 0;
-    msg_src = arguments[0];
-    msg_dst = arguments[1];
-    wid_dst = arguments[2];
-    log(l_inf, 'coreOut/invokeReply ' + msg_src.name + ' on core.' + msg_dst.name + ' to ' +wid_dst.name+ " nb:"+ai);
-    if (msg_dst.has_script_input) is_script = 1;
-    param_count = msg_src.num_params;
-    ai = 3;
-    for (i = 0; i < param_count; i++) {
-        var param = msg_dst.get_param(i);
-        if (! param.is_input) continue;
-        if (is_script) {
-            args[ai - 3] = arguments[ai];
-        } else {
-            wid_dst.set_input(param, arguments[ai]);
-        }
-        ai++;
-    }
-    if (msg_dst.has_input_action) {
-        wid_dst.call_input_action(msg_dst);
-    } else if (is_script) {
-        wid_dst.call_input_script(msg_dst, args);
-    }
-}
-
-// get an interface by type in WidgetManager, since getInterfaceHandlersByType is not accessible
-function getInterfaceByType(widget, type) {
-    for (var i = 0; i < widget.num_interfaces; i++) {
-      var ifce = widget.get_interface(i);
-      if (ifce.type == type) return ifce;
-    }
-    return null;
-}
-
-function wmjs_bind_interface_to_core_service(wid, ifce) {
-    if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:in:2010") {
-        // core:in
-        return wmjs_bind_interface_to_core_service1(wid, ifce, coreIn);
-    } else if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-        // core:out
-        return wmjs_bind_interface_to_core_service1(wid, ifce, coreOut);
-    }
-    // not an interface to core services
-    return false;
-}
-
-function wmjs_bind_interface_to_core_service1(wid, ifce, core) {
-    // loop on the messages to check if they match
-    log(l_inf, 'Bind interface to core service ' + wid.name + " " + ifce.type);
-    var set_bind = 0, nb_ok, j, k, a_msg;
-    for (j = 0; j < ifce.num_messages; j++) {
-        var msg = ifce.get_message(j);
-        // does the other interface have this message
-        a_msg = getMessage(core, msg.name);
-        if (!a_msg) {
-            // no, it does not have this message, so leave
-            log(l_inf, 'No core message for ' + msg.name);
-            continue;
-        }
-        // the messages have matching names, check direction
-        if (msg.is_input == a_msg.is_input) {
-            log(l_inf, 'core message for ' + msg.name + ' is not in direction ' + (msg.is_input ? 'output' : 'input'));
-            continue;
-        }
-        // the messages have matching names and directions, check params
-        if (msg.num_params != a_msg.num_params) {
-            log(l_war, 'core message ' + msg.name + ' does not have the same number of parameters '
-                    + msg.num_params + ' ' + a_msg.num_params);
-            var paramstring = "";
-            for (k = 0; k < msg.num_params; k++) {
-                par = msg.get_param(k);
-                paramstring += " " + par.name;
-            }
-            log(l_deb, paramstring);
-            continue;
-        }
-        /*check all params*/
-        nb_ok = 0;
-        for (k = 0; k < msg.num_params; k++) {
-            par = msg.get_param(k);
-            //log(l_inf, " "+par.name+" "+hasParam(a_msg, par.name)+" "+par.is_input+" "+paramDirection(a_msg, par.name));
-            if (hasParam(a_msg, par.name) != null && par.is_input != paramDirection(a_msg, par.name)) nb_ok ++;
-        }
-        if (nb_ok != msg.num_params) {
-            log(l_war, 'core message ' + msg.name + ' does not have the same input/output parameters '+nb_ok+" "+msg.num_params);
-            continue;
-        }
-        set_bind ++;
-        // the messages match
-        log(l_inf, 'Binding ' + wid.name + '.' + msg.name + ' to core.' + a_msg.name);
-        /*OK let's bind this action: we only need to assign the output trigger, the input
-         action will be called from the other widget*/
-        if (msg.has_output_trigger) {
-            wmjs_bind_output_trigger(wid, msg, wmjs_output_trigger_callback_core(msg, wid, a_msg), WidgetManager);
-        }
-    }
-    if (!set_bind) return false;
-    /*create callback for programmatic action triggers*/
-    ifce.invoke = wmjs_interface_invoke_callback_core(wid, core, 0);
-    // ifce.invokeReply = wmjs_interface_invoke_callback_core(wid, core, 1);
-    wid.bind_interface(ifce, null, 'localhost');
-    return true;
-}
-
-function wmjs_output_trigger_callback_core(msg_out, wid_src, msg_in) {
-    log(l_deb, "wmjs_output_trigger_callback_core");
-    return function() {
-        log(l_deb, "wmjs_output_trigger_callback_core/function '" + wid_src.name + "'");
-        var param_count = msg_out.num_params;
-        var args = new Array();
-        var ai = 0, i;
-        log(l_inf, 'Invoking Widget(' + wid_src.name + ').' + msg_out.name);
-        for (i = 0; i < param_count; i++) {
-            var param = msg_out.get_param(i);
-            if (param.is_input) continue;
-            args[ai] = wid_src.get_param_value(param);
-            ai++;
-        }
-        msg_in.execute(wid_src, args);
-    };
-}
-
-
-//
-// send a core:in message with no parameter
-//
-function wmjs_corein_message() {
-  if (arguments.length < 2) return;
-  var widget = arguments[0];
-  var message = arguments[1];
-  
-  for (var i=0; i<widget.num_interfaces; i++) {
-    var ifce = widget.get_interface(i);
-    if (ifce.type != 'urn:mpeg:mpegu:schema:widgets:core:in:2010') continue;
-    
-    for (var j=0; j<ifce.num_messages; j++) {
-      var msg = ifce.get_message(j);
-      if (msg.name == message) {
-        if (msg.has_script_input) {
-          var jsargs = new Array();
-          /*for each input descibed in the manifest, get the input script value and stack it in the argument list*/
-          for (var k=0; k<msg.num_params; k++) {
-            par = msg.get_param(k);
-            if (!par.is_input) continue;
-            for (var l=2; l<arguments.length; l+=2) {
-             if (arguments[l]==par.name) {
-               jsargs.push(arguments[l+1]);
-               break;
-             }
-            }
-          }
-          widget.call_input_script(msg, jsargs);
-        } else if (msg.has_input_action) {
-          /*for each input descibed in the manifest, set the widget input value*/
-          for (var k=0; k<msg.num_params; k++) {
-            par = msg.get_param(k);
-            if (!par.is_input) continue;
-            for (var l=2; l<arguments.length; l+=2) {
-             if (arguments[l]==par.name) {
-               widget.set_input(par, arguments[l+1]);
-               break;
-             }
-            }
-          }
-          widget.call_input_action(msg);
-        }
-      }
-    }
-  }
-}
-
-/*
- End of implementation of core:in and core:out interfaces
- */

gpac-0.8.0.tar.gz/gui/mpegu-wm.js Deleted

@@ -1,1723 +0,0 @@
-//This software module was originally developed by TelecomParisTech in the
-//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
-//
-//This software module is an implementation of a part of one or 
-//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
-//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
-//(ISO/IEC 23007-1) free license to this software module or modifications
-//thereof for use in hardware or software products claiming conformance to
-//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
-//module in hardware or software products are advised that its use may
-//infringe existing patents.
-//The original developer of this software module and his/her company, the
-//subsequent editors and their companies, and ISO/IEC have no liability 
-//for use of this software module or modifications thereof in an implementation. 
-//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming 
-//products. 
-//Telecom ParisTech retains full right to use the code for his/her own purpose, 
-//assign or donate the code to a third party and to inhibit third parties from 
-//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products. 
-//
-//This copyright notice must be included in all copies or derivative works.
-//
-//Copyright (c) 2009.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:	
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-// 01122011 AMD1 startWidget implemented
-// TODO AMD1 listWidgets getWidget requestCapabilitiesList
-
-//Initialize the main UI script
-function initialize() {
-    //var icon;
-    var i, count, wid;
-
-    gpac.caption = 'MPEG-U @ Osmo4';
-
-    display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
-    display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
-    
-    if (display_width && display_height) {
-     gpac.set_size(display_width, display_height);
-    } else {
-     display_width = gpac.get_screen_width();
-     display_height = gpac.get_screen_height();
-    }
-
-    //request event listeners on the window - GPAC specific extensions !!!     
-    root.addEventListener('resize', on_resize, 0);
-    root.addEventListener('zoom', on_zoom, 0);
-    root.addEventListener('scroll', on_scroll, 0);
-
-    widget_default_size = 200;
-    scene_width = 0;
-    
-    wctl_iconsize = new SFVec2f(24, 24);
-    icon_size = 48;
-    dock_height = 48;
-    info_height = 32;
-    toggle_bar_height = 16;
-    screen_dpi = gpac.get_horizontal_dpi();
-     
-    widget_remote_candidate = null;
-    has_upnp = eval("(typeof(UPnP) != 'undefined');");
-    if (has_upnp) {
-     UPnP.onMediaRendererAdd = onMediaRendererAdd;
-     UPnP.onMediaConnect = onMediaConnect;
-     UPnP.BindRenderer();
-     upnp_renders = null;
-    }
-     
-    /*setup dock*/
-    widget_screen_visible = false;
-        
-    /*widget subtree*/
-    widget_display = new SFNode('Transform2D');
-    ui_root.children[0] = widget_display;  
-
-    /*widget manager page*/
-    widget_screen = new SFNode('Layer2D');
-    ui_root.children[1] = widget_screen;  
-    
-    /*all other UI elements subtree*/
-    dlg_display = new SFNode('Transform2D');
-    ui_root.children[2] = dlg_display;  
-
-    infobar = text_label('', 'MIDDLE');
-    ui_root.children[3] = infobar;
-
-    /*our dock*/
-    dock = new SFNode('Transform2D');
-    ui_root.children[4] = dock;  
-        
-    /*init the widget manager*/
-    Browser.loadScript('mpegu-core.js', true);
-    log_level = l_inf;
-    widget_manager_init();
-
-    WidgetManager.on_widget_remove = widget_remove;
-    WidgetManager.on_widget_add = widget_insert;
-    WidgetManager.coreOutSetSize = widget_request_size;
-    WidgetManager.coreOutShow = widget_request_show;
-    WidgetManager.coreOutHide = widget_request_hide;
-    WidgetManager.coreOutRequestActivate = widget_request_activate;
-    WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
-    WidgetManager.coreOutShowNotification = widget_request_notification;
-    WidgetManager.coreOutPlaceComponent = widget_place_component;
-    WidgetManager.coreOutGetAttention = widget_request_attention;
-    WidgetManager.coreOutInstallWidget = widget_install_widget;
-    WidgetManager.coreOutMigrateComponent = widget_migrate_component;
-    WidgetManager.coreOutRequestMigrationTargets = widget_request_migration_targets;
-
-    nb_widgets_on_screen = 0;
-    first_visible_widget = 0;
-    setup_icons();
-    
-    /*restore our widgets*/    
-    widgets_init();
-
-    //let's do the layout   
-    layout();
-}
-
-function new_timeout(time)
-{
- var obj = new SFNode('TimeSensor');
- 
- obj.cycleInterval = time;
- obj.start = function(when) {
-  var t = this.getTime();
-  this.startTime = when + this.getTime();
- };
- obj.stop = function(when) {
-  this.stopTime = when + this.getTime();
- };
- obj.on_event = null;
- obj.event = function(val) {
-  if (this.on_event) this.on_event(val);
- };
- Browser.addRoute(obj, 'fraction_changed', obj, obj.event); 
- return obj;
-}
-
-function rectangle()
-{
-  var obj = new SFNode('Shape');
-
-  obj.appearance = new SFNode('Appearance');
-  obj.appearance.material = new SFNode('Material2D');
-  obj.appearance.material.filled = TRUE;
-  obj.appearance.material.emissiveColor = new SFColor(0.7, 0.7, 0.8);
-  obj.appearance.material.lineProps = new SFNode('LineProperties');
-  obj.appearance.material.lineProps.width = 2;
-  obj.appearance.material.lineProps.lineColor = new SFColor(0, 0, 0);
-
-  obj.geometry = new SFNode('Curve2D');
-  obj.geometry.point = new SFNode('Coordinate2D');
-  temp = obj.geometry.type;
-  temp[0] = 7;
-  temp[1] = 1;
-  temp[2] = 7;
-  temp[3] = 1;
-  temp[4] = 7;
-  temp[5] = 1;
-  temp[6] = 7;
-  temp[7] = 6;/*close*/
-
-  obj.set_size = function(w, h) {
-   var hw, hh, rx, ry;
-   var temp;
-   hw = w/2;
-   hh = h/2;
-
-   /*compute default rx/ry*/   
-   ry = rx = 10;
-   if ( (2*rx>=hw) || (2*ry>=hh)) rx = ry = 6;
-
-   temp = this.geometry.point.point;
-   temp[0] = new SFVec2f(hw-rx, hh);
-   temp[1] = new SFVec2f(hw, hh);/*bezier ctrl point*/
-   temp[2] = new SFVec2f(hw, hh-ry);
-   temp[3] = new SFVec2f(hw, -hh+ry);
-   temp[4] = new SFVec2f(hw, -hh);/*bezier control point*/
-   temp[5] = new SFVec2f(hw-rx, -hh);
-   temp[6] = new SFVec2f(-hw+rx, -hh);
-   temp[7] = new SFVec2f(-hw, -hh);/*bezier control point*/
-   temp[8] = new SFVec2f(-hw, -hh+ry);
-   temp[9] = new SFVec2f(-hw, hh-ry);
-   temp[10] = new SFVec2f(-hw, hh);/*bezier control point*/
-   temp[11] = new SFVec2f(-hw+rx, hh);
-  };
-  obj.set_color = function(r, g, b) {
-   this.appearance.material.emissiveColor.r = r;
-   this.appearance.material.emissiveColor.g = g;
-   this.appearance.material.emissiveColor.b = b;
-  };
-  return obj;
-}
-
-function icon_button(url, label, no_back)
-{
-    var obj = new SFNode('Transform2D');
-    obj.children[0] = new SFNode('Transform2D');
-    obj.children[0].scale.x = 0;
-    obj.children[0].children[0] = rectangle();
-    
-    obj.children[1] = new SFNode('Layer2D');
-    obj.children[1].size.x = icon_size;
-    obj.children[1].size.y = icon_size;
-    obj.children[1].children[0] = new SFNode('Inline');
-    obj.children[1].children[0].url[0] = url;
-    
-    obj.touch = new SFNode('TouchSensor');
-    obj.children[1].children[1] = obj.touch;
-    obj.button_click = NULL;
-    obj.down = false;
-    obj.over = false;
-    obj.on_active = function(value) { 
-     if (value) {
-      this.down = true;
-     } else {
-      if (this.down && this.over && this.button_click) this.button_click(); 
-      this.down = false;
-     }
-    };
-    obj.button_over = on_icon_over;
-    obj.on_over = function(value) { 
-     this.over = value; 
-     if (!no_back)
-      this.children[0].scale.x = value ? 1 : 0;
-     if (this.button_over) this.button_over(value); 
-    };
-    Browser.addRoute(obj.touch, 'isOver', obj, obj.on_over); 
-    Browser.addRoute(obj.touch, 'isActive', obj, obj.on_active); 
-    obj.label = label;
-    obj.hide = function() { this.scale.x = this.scale.y = 0;};
-    obj.show = function() { this.scale.x = this.scale.y = 1;};
-    obj.set_size = function(x, y) { 
-     this.children[0].children[0].set_size(x, y);
-     this.children[1].size.x = x; 
-     this.children[1].size.y = y;
-    };
-    return obj;
-}
-
-function text_label(label, justify)
-{
-    var obj = new SFNode('Transform2D');
-    obj.children[0] = new SFNode('Shape');
-    obj.children[0].appearance = new SFNode('Appearance');
-    obj.children[0].appearance.material = new SFNode('Material2D');
-    obj.children[0].appearance.material.filled = TRUE;
-    obj.children[0].appearance.material.emissiveColor = new SFColor(0, 0, 0);
-    obj.children[0].geometry = new SFNode('Text');
-    obj.children[0].geometry.string[0] = label;
-    obj.children[0].geometry.fontStyle = new SFNode('FontStyle');
-    obj.children[0].geometry.fontStyle.justify[0] = justify;
-    obj.children[0].geometry.fontStyle.justify[1] = 'MIDDLE';
-    obj.children[0].geometry.fontStyle.size = 20;
-    obj.set_label = function(value) {
-     this.children[0].geometry.string[0] = value;
-    };
-    return obj;
-}
-
-
-function text_rect(label)
-{
-  var obj = new SFNode('Transform2D');
-  obj.children[0] = rectangle();
-  obj.children[0].set_color(0.7, 0.7, 0.8);
-
-  obj.children[1] = new SFNode('Shape');
-  obj.children[1].appearance = new SFNode('Appearance');
-  obj.children[1].appearance.material = new SFNode('Material2D');
-  obj.children[1].appearance.material.filled = TRUE;
-  obj.children[1].appearance.material.emissiveColor = new SFColor(0, 0, 0);
-  obj.children[1].geometry = new SFNode('Text');
-  obj.children[1].geometry.string[0] = label;
-  obj.children[1].geometry.fontStyle = new SFNode('FontStyle');
-  obj.children[1].geometry.fontStyle.justify[0] = 'MIDDLE';
-  obj.children[1].geometry.fontStyle.justify[1] = 'MIDDLE';
-  obj.children[1].geometry.fontStyle.size = 20;
-  obj.children[2] = new SFNode('TouchSensor');
-
-  obj.set_size = function(w, h) { 
-   this.children[0].set_size(w, h);
-  };
-
-
-  obj.over = false;
-  obj.on_over = function(value) { 
-    this.children[0].set_color(0.7, value ? 0.5 : 0.7, 0.8);
-    this.over = value;
-  };
-  Browser.addRoute(obj.children[2], 'isOver', obj, obj.on_over); 
-
-  obj.down = false;
-  obj.button_click = null;
-  obj.on_active = function(value) { 
-   if (value) {
-    this.down = true;
-   } else {
-    if (this.down && this.over && this.button_click) this.button_click(); 
-    this.down = false;
-   }
-  };
-  Browser.addRoute(obj.children[2], 'isActive', obj, obj.on_active); 
-
-  return obj;  
-}
-
-function new_widget_control(widget)
-{
-  var obj = new SFNode('Transform2D');
-  
-  obj.children[0] = new SFNode('Transform2D');
-  
-  obj.children[0].children[0] = rectangle();
-
-  obj.children[0].children[1] = new SFNode('TouchSensor');
-
-
-  obj.component_bound=false;
-  obj.show_ctrl = true;
-  obj.onClick = function(value) {
-   if (!value) return;
-   this.show_ctrl = !this.show_ctrl;
-   if (this.show_ctrl) {
-    var i, comps, idx;
-    this.children[0].children[0].appearance.material.transparency = 0;
-    this.children[1].scale.x = 1;
-    this.children[3].scale.x = 1;
-
-    for (i=0; i<widget_display.children.length; i++) {
-     if (widget_display.children[i]==this) continue;
-     if (widget_display.children[i].show_ctrl) {
-       widget_display.children[i].onClick(true);
-      }
-    }
-    //widget is a component, do not push on top but hide some controls
-    if (widget.is_component) {
-     if (this.component_bound) {
-      this.children[1].children[0].hide(); //close
-      this.children[1].children[1].hide(); //remove
-      this.children[1].children[4].hide(); //resize
-     }
-     return;
-    }
-    //otherwise push widget on top
-    idx=0;
-    widget_display.removeChildren[idx++] = this;
-    widget_display.addChildren[idx++] = this;
-    //and push components    
-    comps = widget.components;
-    for (i=0; i<comps.length; i++) {
-     if (comps[i].widget_control.component_bound) {
-      widget_display.removeChildren[idx++] = comps[i].widget_control;
-      widget_display.addChildren[idx++] = comps[i].widget_control;
-     }
-    }
-    
-   } else {
-    this.children[0].children[0].appearance.material.transparency = 1;
-    this.children[1].scale.x = 0;
-    this.children[3].scale.x = 0;
-   }
-  };
-  Browser.addRoute(obj.children[0].children[1], 'isActive', obj, obj.onClick);
-  
-  obj.children[1] = new SFNode('Transform2D');
-  obj.children[1].children[0] = icon_button('icons/process-stop.svg', 'Close', 0);
-  obj.children[1].children[0].button_click = function() {
-    if (widget.discardable) widget_remove(widget);
-    else widget_close(widget, 0);
-  };
-  
-  obj.children[1].children[1] = icon_button('icons/user-trash.svg', 'Uninstall', 0);
-  obj.children[1].children[1].button_click = function() { widget_remove(widget);  }
-  
-  obj.children[1].children[2] = icon_button('icons/applications-internet.svg', 'Push to remote display', 0);
-  obj.children[1].children[2].button_click = function() { 
-    if (has_upnp && UPnP.MediaRenderersCount) {
-     widget_remote_candidate = widget;
-     on_upnpopen();
-    }
-  };
-
-  obj.children[1].children[3] = icon_button('icons/dialog-information.svg', 'Widget Information', 0);
-  obj.children[1].children[3].button_click = function() { 
-   display_widget_info(widget);
-  };
-
-  obj.children[1].children[4] = icon_button('icons/media-record.svg', 'Resize', 1);
-  obj.children[1].children[4].children[1].children[2] = new SFNode('PlaneSensor2D');  
-  obj.children[1].children[4].children[1].children[2].maxPosition = new SFVec2f(-1, -1);
-
-  obj.prev_x=0;
-  obj.prev_y=0;
-  obj.onSize = function(value) {
-   if (widget.width + 2*(value.x - this.prev_x)<0) return;
-   if (widget.height + 2*(this.prev_y-value.y)<0) return;
-   
-   widget.width += 2*(value.x - this.prev_x);
-   this.prev_x = value.x;
-   widget.height += 2*(this.prev_y - value.y);
-   this.prev_y = value.y;
-   this.set_size(widget.width, widget.height);
-  };
-  Browser.addRoute(obj.children[1].children[4].children[1].children[2], 'translation_changed', obj, obj.onSize);
-  
-  obj.children[2] = new SFNode('Layer2D');
-  obj.inline = new SFNode('Inline');
-  obj.children[2].children[0] = obj.inline;
-
-
-  obj.children[3] = new SFNode('Transform2D');
-  obj.children[3].children[0] = new SFNode('Shape');
-  obj.children[3].children[0].appearance = new SFNode('Appearance');
-  obj.children[3].children[0].appearance.material = new SFNode('Material2D');
-  obj.children[3].children[0].appearance.material.filled = TRUE;
-  obj.children[3].children[0].appearance.material.transparency = 0.5;
-  obj.children[3].children[0].appearance.material.emissiveColor = new SFColor(0.6, 0.6, 0.6);
-  obj.children[3].children[0].geometry = new SFNode('Rectangle');
-  obj.children[3].children[0].geometry.size = new SFVec2f(50, 50);
-  obj.children[3].children[1] = new SFNode('PlaneSensor2D');
-  obj.children[3].children[1].maxPosition = new SFVec2f(-1, -1);
-  obj.children[3].children[1].offset = new SFVec2f(widget.x, widget.y);  
-  obj.onMove = function(value) {
-   if (this.maximized) return;
-   this.translation = value;
-   widget.x = value.x;
-   widget.y = value.y;
-   this.refresh_layout(false, null);
-  };
-  Browser.addRoute(obj.children[3].children[1], 'translation_changed', obj, obj.onMove);
-
-  obj.children[3].children[2] = new SFNode('TouchSensor');
-  obj.last_ts = 0;
-  obj.onMaximize = function(value, timestamp) {
-   if (!value) return;
-   if (timestamp - this.last_ts < 0.5) {
-    if (this.maximized) {
-     this.maximized = false; 
-     this.translation.x = widget.x;
-     this.translation.y = widget.y;
-     this.set_size(this.prev_width, this.prev_height);
-    } else {
-     this.maximized = true;
-     this.prev_width = widget.width;
-     this.prev_height = widget.height;
-     this.translation.x = 0;
-     this.translation.y = -info_height;
-     this.set_size(display_width, display_height - 2*info_height);
-    }   
-   }
-   this.last_ts = timestamp;
-  };
-  Browser.addRoute(obj.children[3].children[2], 'isActive', obj, obj.onMaximize);
-
-  obj.set_size = function(w, h) {
-   var i, x, s;
-   s = 24;
-   this.children[2].size.x = w;
-   this.children[2].size.y = h;
-   
-   this.children[1].children[0].translation.y = this.children[1].children[1].translation.y = this.children[1].children[2].translation.y = this.children[1].children[3].translation.y = this.children[1].children[4].translation.y = h/2 + s/2;
-
-   this.children[0].children[0].set_size(w+s, h+s);
-   this.children[3].children[0].geometry.size.x = w;
-   this.children[3].children[0].geometry.size.y = h;
-
-   this.children[1].children[0].set_size(s, s);
-   this.children[1].children[1].set_size(s, s);
-   this.children[1].children[2].set_size(s, s);
-   this.children[1].children[3].set_size(s, s);
-   this.children[1].children[4].set_size(s, s);
-   this.children[1].children[0].translation.x = -w/2;
-   this.children[1].children[1].translation.x = -w/4;
-   this.children[1].children[2].translation.x = 0;
-   this.children[1].children[3].translation.x = w/4;
-   this.children[1].children[4].translation.x = w/2;
-
-   //set widget input params
-   widget.width = w;
-   widget.height = h;
-   widget.set_input('width', w);
-   widget.set_input('height', h);
-   this.refresh_layout(true, null);
-   //call core:in
-   WidgetManager.corein_message(widget, 'setSize', 'width', w, 'height', w, 'dpi', screen_dpi);
-  };
-  obj.refresh_layout = function(send_resize, comp_target) {
-   var i;
-   var x, y, w, h, scale_x, scale_y;
-   var comps;
-
-   /*local to subscene transformation not known*/
-   if (!this.sub_w) return;
-   if (!this.sub_h) return;
-
-   comps = widget.components;
-   for (i=0; i<comps.length; i++) {
-    var comp = comps[i];
-    if (!comp.widget_control.component_bound) continue;
-
-    //compute scale from Widget Manager coord system to widget internal coordinate system
-    scale_x = this.sub_vp_w / this.sub_w;
-    scale_y = this.sub_vp_h / this.sub_h;
-
-    w = comp.widget_control.place_w * scale_x;
-    h = comp.widget_control.place_h * scale_y;
- 
-    x = this.translation.x - widget.width/2 + this.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
-    comp.widget_control.translation.x = x;
-
-    y = widget.height/2 + this.translation.y - h/2 - this.sub_vp_y - comp.widget_control.place_y * scale_y;
-    comp.widget_control.translation.y = y;
-
-    if (send_resize || (comp_target==comp)) 
-     comp.widget_control.set_size(w, h);
-   }
-  };
-  
-  obj.hide = function() { 
-   this.scale.x = 0;
-   WidgetManager.corein_message(widget, 'hide');
-  };
-  obj.show = function() { 
-    this.scale.x = 1; 
-    WidgetManager.corein_message(widget, 'show');
-  };
-
-  obj.show_remote = function () {
-   if (WidgetManager.upnp && UPnP.MediaRenderersCount) {
-    this.children[1].children[2].show();
-   } else {
-    this.children[1].children[2].hide();
-   }
-  };
-  obj.show_remove = function(show) {
-    if (show) this.children[1].children[1].show();
-    else this.children[1].children[1].hide();
-  };
-
-  obj.flash = function() {
-    var time = new_timeout(0.25);
-    time.loop = true;
-    time.ctrl = this;
-    time.on_event = function(val) {
-     var scale = (val<0.5) ? 1+val : 2-val;
-     this.ctrl.scale.x = this.ctrl.scale.y = scale;
-    };
-    time.stop(1);
-    time.start(0);
-  };
-  obj.maximized = false;
-  obj.show_remote();
-  obj.onClick(true);
-  return obj;
-}
-
-
-
-function on_icon_over(value)
-{
- infobar.set_label(value ? this.label : '');
-}
-
-function display_widget_info(wid)
-{
- var info_dlg = new SFNode('Transform2D');
- var i, j, k, info;
- var y, txt, pref;
-
- infobar.set_label('Widget ' + wid.name + ' Information');
-
- info = text_rect('Close');
- info_dlg.children[0] = info;
- info.button_click = function() {
-  dlg_display.children.length = 0;
-  widget_display.scale.x = 1;
-  infobar.set_label('');
-  layout();
- };
- 
- info = text_rect('Widget Metadata');
- info_dlg.children[info_dlg.children.length] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- info.children[i++] = text_label('id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'BEGIN');
- info.children[i++] = text_label('version: '+wid.version, 'BEGIN');
- info.children[i++] = text_label('content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'BEGIN');
- info.children[i++] = text_label('default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'BEGIN');
- info.children[i++] = text_label('license: '+wid.license, 'BEGIN');
- info.children[i++] = text_label('license ref: '+wid.licenseHref, 'BEGIN');
- info.children[i++] = text_label('description: '+wid.description, 'BEGIN');
- info.children[i++] = text_label('author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'BEGIN');
- info.children[i++] = text_label('author href: '+wid.authorHref, 'BEGIN');
- info.children[i++] = text_label('view modes: '+wid.viewmodes, 'BEGIN');
- info.children[i++] = text_label('UUID: '+wid.uuid, 'BEGIN');
- info.children[i++] = text_label('Discardable: '+wid.discardable, 'BEGIN');
- info.children[i++] = text_label('Muliple Instances: '+wid.discardable, 'BEGIN');
- var icons = wid.icons;
- for (j=0; j<icons.length; j++) {
-  info.children[i++] = text_label('icon #'+(j+1)+': ' + icons[j].src, 'BEGIN');
- }
-
- info = text_rect('Widget Manager Info');
- info_dlg.children[info_dlg.children.length] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- info.children[i++] = text_label('nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'BEGIN' );
- info.children[i++] = text_label('Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'BEGIN' );
- if (wid.is_component) {
-   info.children[i++] = text_label('parent widget name' + wid.parent.name, 'BEGIN');
- }
- if (wid.originating_device_ip) {
-  info.children[i++] = text_label('Widget was pushed from device IP '+wid.originating_device_ip, 'BEGIN' );
- }
- info.children[i++] = text_label('Section name in GPAC config file: '+wid.section, 'BEGIN' );
- info.children[i++] = text_label('UA Locale: ' + gpac.get_option('Systems', 'LanguageName') + ' (' + gpac.get_option('Systems', 'Language2CC') + ')', 'BEGIN');
- info.children[i++] = text_label('widget src: ' + wid.url , 'BEGIN');
- info.children[i++] = text_label('config src: ' + wid.manifest , 'BEGIN');
- info.children[i++] = text_label('content src : '+wid.localizedSrc, 'BEGIN' );
-
- pref = wid.features;
- info = text_rect('Features (' + pref.length + ')' ); 
- info_dlg.children[info_dlg.children.length] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- for (j=0; j<pref.length; j++) {
-  info.children[i++] = text_label('Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'BEGIN');
- }
-
-
- pref = wid.preferences;
- info = text_rect('Preferences ('+pref.length+')'); 
- info_dlg.children[info_dlg.children.length] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- for (j=0; j<pref.length; j++) {
-  var val = pref[j].value;
-  if (val == '') val = gpac.get_option(wid.section, pref[j].name);
-  info.children[i++] = text_label('Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'BEGIN');
- }
-
- info = text_rect('Migration Context', 'BEGIN'); 
- info_dlg.children[info_dlg.children.length] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- txt=wid.get_context();
- while (1) {
-  var idx = txt.indexOf('\n', 0);
-  if (idx>0) {
-   info.children[i++] = text_label(txt.substring(0, idx), 'BEGIN'); 
-   txt = txt.substring(idx+1, txt.length); 
-  } else {
-   info.children[i++] = text_label(txt, 'BEGIN'); 
-   break;
-  }
- }
-
- info_dlg.ifce_idx = info_dlg.children.length;
- info = text_rect('Interfaces (count: ' + wid.num_interfaces + ' - bound: ' + wid.num_bound_interfaces+')', 'BEGIN'); 
- info_dlg.children[info_dlg.ifce_idx] = info;
- info.visible = false;
- info.button_click = function() { 
-   this.visible = !this.visible;
-   layout();
- };
- i=3;
- for (j=0; j<wid.num_interfaces; j++) {
-  var idx;
-  var ifce = wid.get_interface(j);
-  var item = text_rect('Interface #' + (j+1) + ' type: '+ifce.type);
-  info.children[i++] = item;
-  item.visible = false;
-  item.button_click = function() { 
-    this.visible = !this.visible;
-    layout();
-  };
-  idx=3;
-  item.children[idx++] = text_label('Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'BEGIN');
-  for (k=0; k<ifce.num_messages; k++) {
-    var string, l;
-    var msg = ifce.get_message(k);
-    string = '  Message #'+ (k+1) + ':   ' + msg.name + '(';
-    for (l=0; l<msg.num_params; l++) {
-        par = msg.get_param(l);
-        string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
-    }
-    string += ')';
-    item.children[idx++] = text_label(string, 'BEGIN'); 
-  }
- }
- 
- info_dlg.set_size = function(w, h) {
-  var i, j, y, dy;
-  y = h/2 - 20;
-
-  for (i=0; i<this.children.length; i++) {
-   var item = this.children[i];
-   item.translation.x = 0;
-   item.translation.y = y;
-   item.set_size(w, 20);
-   y -= 20;
-   if (!i) continue;
-   
-   dy = 0;
-   for (j=3; j<item.children.length; j++) {
-    if (item.visible) {
-     item.children[j].scale.x = 1;
-     dy -= 20;
-     item.children[j].translation.y = dy;
-     if (i<this.ifce_idx) {
-      item.children[j].translation.x = -w/2+10;
-     } else {
-      item.children[j].set_size(w-20, 20);
-      var ddy=0;
-      var k, sitem;
-      sitem = item.children[j];
-      for (k=3; k<sitem.children.length; k++) {
-       if (item.children[j].visible) {
-        sitem.children[k].scale.x = 1;
-        sitem.children[k].translation.x = -w/2+10;
-        ddy -= 20;
-        sitem.children[k].translation.y = ddy;
-       } else {
-        sitem.children[k].scale.x = 0;
-       } 
-      }
-      dy+=ddy;
-     }
-    } else {
-     item.children[j].scale.x = 0;
-    }
-   }
-   y += dy;
-  }
- };
-
- dlg_display.children[0] = info_dlg;
- widget_display.scale.x = 0;
- layout();
-}
-
-
-function widget_insert(widget)
-{
-  /*insert the widget icon*/
-  if (widget.permanent && !widget.is_component)
-    insert_widget_icon(widget, 0);
-    
-  /*and load the widget - comment this line to disable auto load of widget*/
-  widget_launch(widget);
-}
-
-function setup_icons()
-{
-    var icon;
-      
-    //Widgets Icon
-    icon = icon_button('icons/applications-system.svg', 'Available Widgets', 0);
-    icon.button_click = function () {
-     widget_screen_visible = !widget_screen_visible;
-     layout();
-    };
-    dock.children[0] = icon;
-
-    //Get Widget Icon
-    icon = icon_button('icons/document-save.svg', 'Get Widget', 0);
-    icon.button_click = function () {
-     widget_get();
-    };
-    dock.children[1] = icon;
-
-    //Widgets add Icon
-    icon = icon_button('icons/list-add.svg', 'Add Widgets', 0);
-    icon.button_click = function () {
-     widget_browse();
-    };
-    dock.children[2] = icon;
-
-
-    icon = icon_button('icons/user-trash.svg', 'Remove all widgets', 0);
-    icon.button_click = function () {
-      while (1) {
-        var wid = WidgetManager.get(0);
-        if (wid==null) break;
-        widget_close(wid, 1);
-      }
-      widget_screen.children.length = 0;
-      layout();
-    };
-    dock.children[3] = icon;
-
-    //exit Icon
-    icon = icon_button('icons/emblem-unreadable.svg', 'Exit', 0);
-    icon.button_click = function() { gpac.exit(); };
-    dock.children[4] = icon;
-}
-
-
-
-/*dock layout*/
-function dock_layout() {
-  var i;
-      
-  dock.translation.y = (dock_height - display_height)/2;
-  infobar.translation.y = display_height/2 - info_height/2;
-  
-  num_in_dock = dock.children.length;
-  tot_len = num_in_dock*icon_size;
-  
-  if (tot_len>display_width) {
-   start_x = (icon_size-display_width)/2;
-  } else {
-   start_x = (icon_size-tot_len)/2;
-  }
-  /*translate / size all items in the dock*/
-  for (i=0;i<num_in_dock; i++) {
-   dock.children[i].set_size(icon_size, icon_size);
-   dock.children[i].translation.x = start_x + i*icon_size;
-  }
-}
-
-function widget_screen_layout(dir)
-{
-  var count, i, start_x, start_y, spread_x, nb_wid_h, nb_wid_v, nb_wid;
-  
-  if (!widget_screen_visible) {
-    widget_screen.size.x = 0;
-    widget_screen.size.y = 0;
-    return;
-  }
-
-  widget_screen.size.x = display_width;
-  widget_screen.size.y = display_height;
-
-  start_x = (icon_size/2-display_width)/2;
-  start_y = (display_height-icon_size/2)/2 - info_height;
-  start_x = (icon_size-display_width)/2;
-  start_y = (display_height-icon_size)/2 - icon_size/2 - info_height;
-    
-  count = widget_screen.children.length;
-  if (first_visible_widget<0) first_visible_widget=0;
-    
-  for (i=0; i<count; i++) {
-   var wid = widget_screen.children[i];
-   wid.hide();
-  }
-
-  nb_wid_h = Math.floor(display_width / icon_size);
-  if (!nb_wid_h) nb_wid_h=1;
-
-  nb_wid_v = Math.floor((display_height-dock_height-icon_size) / icon_size);
-  if (!nb_wid_v) nb_wid_v=1;
-  
-  spread_x = (display_width / nb_wid_h) - icon_size;
-  start_x += spread_x/2;
-  
-  nb_wid = (nb_wid_h*nb_wid_v);
-  if (dir<0) {
-   first_visible_widget -= nb_wid;
-   if (first_visible_widget < 0) first_visible_widget = 0;
-  }
-  else if (dir>0) {
-   first_visible_widget += nb_wid;
-  }
-  
-  for (i=0; i<count; i++) {
-   var wid;
-   if (i +first_visible_widget >= count) {
-    break;
-   }
-   wid = widget_screen.children[i +first_visible_widget];
-   wid.show();
-   wid.set_size(icon_size, icon_size);
-   wid.translation.x = start_x;
-   wid.translation.y = start_y;
-   start_x += icon_size + spread_x;
-   if (start_x + icon_size / 2 >= display_width/2) {
-    start_x = (icon_size-display_width)/2 + spread_x/2;
-    start_y -= icon_size;
-   }
-   nb_widgets_on_screen = i+1;
-   if (start_y - icon_size < (dock_height-display_height)/2) {
-    i++;
-    break;
-   }
-  }
-}
-
-//performs layout on all contents
-function layout() {
-  var i, list, start_x;
-
-  gpac.set_option('Widgets', 'LastWMWidth', '' + display_width);
-  gpac.set_option('Widgets', 'LastWMHeight', '' + display_height);
-
-
-  if (WidgetManager.num_widgets) {
-    dock.children[0].show();
-  } else {
-    dock.children[0].hide();
-  }
-  if (dlg_display.children.length) {
-    widget_display.scale.x = 0;
-    widget_screen_visible = false;
-  }
-  //layout all icons in the dock
-  dock_layout();
-  widget_screen_layout(0);
-
-  if (dlg_display.children.length) {
-    list = dlg_display.children;
-    for (i=0; i<list.length; i++) {
-     var dlg = list[i];
-     if (typeof (dlg.set_size) != 'undefined') dlg.set_size(display_width, display_height-icon_size-info_height);
-     dlg.translation.y = (icon_size-info_height)/2;
-    }
-  }
-  else if (widget_screen_visible) {
-    widget_display.scale.x = 0;
-  } else {
-    widget_display.scale.x = 1;
-    list = widget_display.children;
-    for (i=0; i<list.length; i++) {
-     var widctrl = list[i];
-     if (widctrl.maximized) {
-      widctrl.translation.y = - info_height;
-      widctrl.set_size(display_width, display_height - 2*info_height);
-     }
-    }
-  }
-}
-
-//resize event callback
-function on_resize(evt) {
-    display_width = evt.width;
-    display_height = evt.height;
-    layout();
-}
-//zoom event callback
-function on_zoom(evt) {
-    display_width = evt.width;
-    display_height = evt.height;
-    layout();
-}
-//scroll event callback
-function on_scroll(evt) {
-  layout();
-}
-
-//starts a widget
-function on_widget_launch() {
- if (this.widget.visible) {
-  var awid;
-  if (!this.widget.multipleInstances) return;
-  awid = WidgetManager.open(this.widget.manifest, null);
-  widget_launch(awid);
- } else {
-   widget_launch(this.widget);
- }
-}
-      
-function widget_get_icon(widget) 
-{
-  var icon = 'icons/process-stop.svg';
-  var preferredIconType = '.svg';
-  for (var i = 0; i < widget.icons.length; i++) {
-      icon = widget.icons[i].relocated_src;
-      if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
-          break;
-      }
-  }
- return icon;
-}
-
-//initialize GPAC widget manager and load all widgets
-function widgets_init() {
-    
-    count = WidgetManager.num_widgets;      
-    for (i=0; i<count; i++) {
-     wid = WidgetManager.get(i);
-     if (wid == null) continue;
-     wid.device = null;
-     wid.device_ip = null;
-     if (wid.in_panel == true) {
-       icon = icon_button(widget_get_icon(wid), wid.name, 0);
-       icon.tooltip = wid.name;
-       icon.widget = wid;
-       icon.button_click = on_widget_launch;
-  
-       wid.icon_dock = icon;
-       widget_screen.children[widget_screen.children.length] = wid.icon_dock;
-     }
-     if (wid.visible) {
-      widget_launch(wid);
-     }        
-    }
-}
-
-function on_widget_size(value) {
-  //remember variables
-  this.width = value.x;
-  this.height = value.y;
-  //and set widget input params
-  this.set_input('width', value.x);
-  this.set_input('height', value.y);
-}
-
-function on_widget_move(value) {
-  this.x = value.x;
-  this.y = value.y;
-}
-
-//widget close function
-function widget_close(widget, force_remove) 
-{
-    var is_comp = widget.is_component;
-    if (widget.visible) {
-      widget.visible = false;
-      WidgetManager.corein_message(widget, 'hide');
-      WidgetManager.corein_message(widget, 'deactivate');
-      widget.deactivate();
-      widget.scene_container.removeChildren[0] = widget.widget_control;
-      /*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
-      widget.widget_control.inline.url.length = 0;
-    }
-    if (!is_comp && (!widget.permanent || force_remove)) {
-      WidgetManager.unload(widget, false);
-    }
-}
-   
-function on_widget_close(value) {
-    widget_close(this, 0);
-}
-   
-//widget remove function (close and unregister)
-function widget_remove(wid) {
-  if (typeof(wid.icon_dock) != 'undefined')
-    widget_screen.removeChildren[0] = wid.icon_dock;
-  widget_close(wid, 0);
-  layout();
-}
-
-function on_widget_control(value)
-{
- var i, count;
- if (!value) return;
- count = this.scene_container.children.length;
- for (i=0; i<count; i++) {
-  if (this.scene_container.children[i] == this.widget_control) {
-   this.scene_container.removeChildren[0] = this.widget_control;
-   this.scene_container.children[this.scene_container.children.length] = this.widget_control;
-   return;
-  }
- }
-}
-
-//widget launcher function
-function widget_launch(wid) {
-    var widg_ctrl;
-
-   //assign default size to the widget
-   if (wid.width == undefined) {
-    wid.width = wid.defaultWidth;
-    if (wid.width == 0) wid.width = widget_default_size;
-   }
-   if (wid.height == undefined) {
-    wid.height = wid.defaultHeight;
-    if (wid.height == 0) wid.height = widget_default_size;
-   }
-   if (wid.x== undefined) wid.x = 0;
-   if (wid.y== undefined) wid.y = 0;
-
-   widg_ctrl = new_widget_control(wid);
-   widg_ctrl.component_bound = false;
-
-   wid.visible = true;
-
-   widg_ctrl.set_size(wid.width, wid.height);
-   widg_ctrl.translation.x = wid.x;
-   widg_ctrl.translation.y = wid.y;
-    
-   wid.widget_control = widg_ctrl;
-   wid.scene_container = widget_display;
-
-   widg_ctrl.show_remove( (!wid.discardable && wid.icon_dock) ? 1 : 0);
-
-   widg_ctrl.sub_width = 0;
-   widg_ctrl.sub_height = 0;
-   widg_ctrl.sub_x = 0;
-   widg_ctrl.sub_y = 0;
-   widg_ctrl.sub_vp_w = 0;
-   widg_ctrl.sub_vp_h = 0;
-
-   widg_ctrl.inline.addEventListener('gpac_vp_changed', 
-                                  function(evt) { 
-                                   widg_ctrl.sub_vp_w = evt.width;
-                                   widg_ctrl.sub_vp_h = evt.height;
-                                   widg_ctrl.sub_vp_x = evt.offset_x;
-                                   widg_ctrl.sub_vp_y = evt.offset_y;
-                                   widg_ctrl.sub_w = evt.vp_width;
-                                   widg_ctrl.sub_h = evt.vp_height;
-                                   widg_ctrl.refresh_layout(true, null);
-                                  }, 
-                                0);
-    
-   /*this will setup the scene graph for the widget in order to filter input and output communication pins*/
-   wid.activate(widg_ctrl.inline);
-
-   widg_ctrl.inline.url[0] = wid.main;
-   widget_display.addChildren[0] = widg_ctrl;
-
-    /*send notifications once the widget scene is loaded*/
-    wid.on_load = function () {
-      WidgetManager.corein_message(this, 'activate');
-      WidgetManager.corein_message(this, 'show');
-      WidgetManager.corein_message(this, 'setSize', 'width', 50, 'height', 50, 'dpi', 96);
-    };
-
-  if (widget_screen_visible) {
-   widget_screen_visible = 0;
-   layout();
-  }
-    //
-    if (log_level > l_inf) {
-        var i = 0;
-        alert(">>>>>>>>>>>>> "+wid.name+" interfaces:");
-        for (;i < wid.num_interfaces; i++) {
-            alert(""+wid.get_interface(i).type);
-        }
-    }
-    //
-}
-
-
-//core out install widget implementation JCD
-function widget_install_widget(widget, args)
-{
-    var uri = args[0], j;
-    var count = WidgetManager.num_widgets;
-    for (j=0; j<count; j++) {
-        var wid = WidgetManager.get(j);
-        if (wid.url==uri) break;
-    }
-    if (j==count) {
-        new_wid = WidgetManager.open(uri, null);
-        if (new_wid!=null) {
-            insert_widget_icon(new_wid, 1);
-        }
-    }
-}
-
-//core out migrate component implementation JCD
-function widget_migrate_component(widget, args)
-{
-    if (has_upnp && UPnP.MediaRenderersCount) {
-        widget_remote_candidate = widget.get_component(args[0]);
-        if (widget_remote_candidate==null) {
-         log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
-         return;
-        }
-        if (args.length > 1 && args[1] != null) {
-            var render = WidgetManager.MPEGUStandardServiceProviders[parseInt(args[1])];
-            WidgetManager.migrate_widget(render, widget_remote_candidate);
-            widget_close(widget_remote_candidate, 0);
-            widget_remote_candidate = null;
-        } else {
-            on_upnpopen();
-        }
-    }
-}
-
-// core out request migration targets JCD
-function widget_request_migration_targets(wid, args)
-{
-    var count = WidgetManager.MPEGUStandardServiceProviders.length,
-        codes = new Array(), names = new Array(), descriptions = new Array(), i;
-    for (i = 0; i < count; i++) {
-        var render = WidgetManager.MPEGUStandardServiceProviders[i];
-        codes.push(""+i);
-        names.push(render.Name);
-        descriptions.push(render.HostName +" "+ render.UUID);
-    }
-    i = null;
-    var ifce_count = wid.num_interfaces, j;
-    for (j = 0; j < ifce_count; j++) {
-        var ifce = wid.get_interface(j);
-        if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
-            i = ifce;
-            break;
-        }
-    }
-    if (i != null) {
-        wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
-                wid, codes, names, descriptions);
-    }
-
-}
-
-function widget_request_size(widget, args)
-{
-  if (args.length==2) {
-   w = (typeof args[0] == 'string') ? parseInt(args[0]) : args[0];
-   h = (typeof args[1] == 'string') ? parseInt(args[1]) : args[1];
-   widget.widget_control.set_size(w, h);
-  }
-}
-
-function widget_request_show(widget, args)
-{
- widget.widget_control.show();
-}
-
-function widget_request_hide(widget, args)
-{
- widget.widget_control.hide();
-}
-
-function widget_request_activate(widget, args)
-{
- if (!widget.visible)
-  widget_launch(widget);
-}
-
-function widget_request_deactivate(widget, args)
-{
- if (widget.visible)
-  widget_close(widget, 0);
-}
-
-function widget_request_attention(widget, args)
-{
- if (widget.visible) {
-  widget_display.removeChildren[0] = widget.widget_control;
-  widget_display.addChildren[0] = widget.widget_control;
-  widget.widget_control.flash();
- }
-}
-
-function widget_request_notification(widget, args)
-{
- var notif = text_rect('');
- notif.children[1].geometry.string[0] = 'Notification from widget';
- notif.children[1].geometry.string[1] = ' '+widget.name;
- notif.children[1].geometry.string[2] = ' ';
- notif.children[1].geometry.string[3] = args[0];
- dlg_display.children[0] = notif;
- notif.set_size(320, 240);
- notif.button_click = function() {
-  dlg_display.removeChildren[0] = this;
- } 
-}
-
-function widget_place_component(widget, args)
-{
- var comp = widget.get_component(args[0]);
- 
- if (comp==null) {
-  log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
-  return;
- }
- comp.widget_control.place_x = args[1];
- comp.widget_control.place_y = args[2];
- comp.widget_control.place_w = args[3];
- comp.widget_control.place_h = args[4];
- comp.widget_control.place_z = args[5];
- comp.widget_control.component_bound = true;
- widget.widget_control.refresh_layout(false, comp);
-}
-
- 
-     
-function insert_widget_icon(new_wid, no_layout) {
- var icon;
- icon = icon_button(widget_get_icon(new_wid), new_wid.name, 0);
- icon.tooltip = new_wid.name;
- new_wid.in_panel = true;
- new_wid.visible = false;
- new_wid.icon_dock = icon;
- icon.button_click = on_widget_launch;
- icon.widget = new_wid;
- widget_screen.addChildren[0] = new_wid.icon_dock; 
- if (!no_layout) layout();    
-}
-
-function scan_directory(dir)
-{
-  var i, j, count, list, new_wid, uri;
-  list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
-  for (i=0; i<list.length; i++) {
-   uri = list[i].path + list[i].name;
-   if (list[i].directory) {
-    scan_directory(uri);
-   } else {
-    count = WidgetManager.num_widgets;
-    for (j=0; j<count; j++) {
-     var wid = WidgetManager.get(j);
-     if (wid.url==uri) break;
-    }
-    if (j==count) {
-     new_wid = WidgetManager.open(uri, null);
-     if (new_wid!=null) {
-      insert_widget_icon(new_wid, 1);
-     }
-    }
-   }
-  }
-}
-
-function widget_browse()
-{
-  filebrowse = new SFNode('Transform2D');
-  infobar.set_label('Select widget');
-  dlg_display.children[0] = filebrowse;
-  
-  filebrowse.children[0] = icon_button('icons/emblem-unreadable.svg', 'Close', 0);
-  filebrowse.children[0].button_click = function() {
-   dlg_display.children.length = 0;
-   widget_display.scale.x = 1;
-   layout();
-  }
-  
-  filebrowse.children[1] = icon_button('icons/go-previous.svg', 'Previous', 0);
-  filebrowse.children[1].filebrowse = filebrowse;
-  filebrowse.children[1].button_click = function () { this.filebrowse.layout(0) };
-  
-  filebrowse.children[2] = icon_button('icons/go-next.svg', 'Next', 0);
-  filebrowse.children[2].filebrowse = filebrowse;
-  filebrowse.children[2].button_click = function () { this.filebrowse.layout(1) };
-  
-  filebrowse.children[3] = icon_button('icons/go-up.svg', 'Up', 0);
-  filebrowse.children[3].filebrowse = filebrowse;
-  filebrowse.children[3].button_click = function () { this.filebrowse.browse(true) };
-  
-  filebrowse.children[4] = icon_button('icons/Folder.svg', 'Scan Directory', 0);
-  filebrowse.children[4].filebrowse = filebrowse;
-  filebrowse.children[4].button_click = function () {
-   scan_directory(this.filebrowse.directory);
-   WidgetManager.last_widget_dir = this.filebrowse.directory;
-   dlg_display.children.length = 0;
-   widget_display.scale.x = 0;
-   widget_screen_visible = true;
-   layout();
-  }
-  filebrowse.children[5] = text_label('', 'BEGIN');
-  filebrowse.set_label = function(label) {
-    filebrowse.children[5].set_label(label);
-  }
-  filebrowse.nb_tools = filebrowse.children.length;
-
-  filebrowse.browse = function(go_up) {
-   this.list = gpac.enum_directory(this.directory, '*.xml;*.wgt;*.mgt', go_up);
-   if (this.list.length) {
-    this.directory = this.list[0].path;
-    this.set_label(this.directory);
-   } else {
-    this.set_label('');
-   }
-   this.first = 0;
-   this.layout(0);
-  }
-  filebrowse.layout = function(type) {
-   var w, h, i, y;
-   this.children.length = this.nb_tools;
-
-   this.children[1].hide();
-   this.children[2].hide();
-   if (this.directory == '') 
-    this.children[3].hide();
-   else
-    this.children[3].show();
-
-   if (type==0) {
-    this.first -= this.nb_items;
-    if (this.first<0) this.first = 0;
-   }
-   else if (type) {
-    this.first += this.nb_items;
-    if (this.first + this.nb_items > this.list.length) this.first = this.list.length - this.nb_items;
-   }
-   if (this.first) this.children[1].show();
-   if (this.first+this.nb_items < this.list.length) this.children[2].show();
-
-   for (i=0; i<this.nb_items; i++) {
-    var item;
-    if (i+this.first>=this.list.length) break;
-    item = text_rect(this.list[i+this.first].name);
-    item.path = this.list[i+this.first].path;
-    item.name = this.list[i+this.first].name;
-    item.directory = this.list[i+this.first].directory;
-    item.filebrowse = this;
-    item.button_click = function() {
-     if (this.directory) {
-      this.filebrowse.directory = this.path + this.name;
-      this.filebrowse.browse(false);
-     } else {
-      var value = this.path + this.name;
-      dlg_display.children.length = 0;
-      widget_display.scale.x = 1;
-      widget_screen_visible = true;
-      layout();
-
-      var new_wid = WidgetManager.open(value, null);
-      if (new_wid==null) return;
-
-      WidgetManager.last_widget_dir = this.filebrowse.directory;
-      insert_widget_icon(new_wid, 0);
-     }
-    }
-    this.children[this.nb_tools+i] = item;
-   }   
-   this.set_size(this.width, this.height);
-  }
-  
-  
-  filebrowse.set_size = function(w, h) {
-   var i, x, y, isize, nbi;
-   isize = 24;
-   if (w>display_width - isize) w = display_width - isize;
-
-   this.width = w;
-   this.height = h;
-
-   i = 1;
-   while ((i+1)*isize <= h - isize) i++;
-   
-   if (i != this.nb_items) {
-    this.nb_items = i;
-    this.layout(0);
-    return;
-   }
-   x = -w/2 + isize/2;
-   y = h/2 - isize/2;
-
-   for (i=0;i<this.nb_tools;i++) {
-     if (this.nb_tools>i+1) {
-       this.children[i].set_size(isize, isize);
-     }
-     this.children[i].translation.x = x;
-     this.children[i].translation.y = y;
-     x += isize;
-   }
-   y-=isize;
-   while (i<this.children.length) {
-     this.children[i].set_size(w, isize);
-     this.children[i].translation.x = 0;
-     this.children[i].translation.y = y;
-     y-=isize;
-     i++;
-   }
-  }  
-  filebrowse.nb_items = 0;
-  filebrowse.directory = WidgetManager.last_widget_dir;
-  filebrowse.browse(0);
-
-  widget_display.scale.x = 0;
-  layout();
-}
-
-function onMediaRendererAdd(name, uuid, is_add)
-{
- var i, count;
-
- count = WidgetManager.num_widgets;
- for (i=0; i<count; i++) {
-  wid = WidgetManager.get(i);
-  if (wid == null) continue;
-  if (!wid.widget_control) continue;
-  wid.widget_control.show_remote();
- }
-
- if (upnp_renders) upnp_renders.refresh();
-}
-
-function on_upnpopen()
-{
-  upnp_renders = new SFNode('Transform2D');
-  upnp_renders.nb_items = 0;
-  upnp_renders.refresh = function () {
-    var i, count, render, item, start_y, w;
-    this.children.length = 0;
-    count = WidgetManager.MPEGUStandardServiceProviders.length;
-    if (count+1>this.nb_items) count = this.nb_items-1;
-
-    item = text_rect('Close');
-    item.button_click = function() {
-     dlg_display.children.length = 0;
-     upnp_renders=null;
-     widget_display.scale.x = 1;
-     infobar.set_label('');
-    }
-    this.children[this.children.length] = item;
-
-    for (i=0; i<count; i++) {
-      render = WidgetManager.MPEGUStandardServiceProviders[i];
-      item = text_rect(render.Name);
-      item.render = render;
-  
-      item.button_click = function() {
-       dlg_display.children.length = 0;
-       upnp_renders=null;
-       widget_display.scale.x = 1;
-       infobar.set_label('');
-  
-       WidgetManager.migrate_widget(this.render, widget_remote_candidate);
-       widget_close(widget_remote_candidate, 0);
-       widget_remote_candidate = null;   
-      }  
-      this.children[this.children.length] = item;
-    }
-    this.set_size(this.width, this.height);
-  }
-
-  upnp_renders.set_size = function (w, h) {
-    var i, count, start_y, w;   
-
-    this.width = w<300 ? w : 300;
-    this.height = h;
-    
-    i = 1;
-    while ((i+1)*icon_size <= h - icon_size) i++;
-    if (i != this.nb_items) {
-      this.nb_items = i;
-      this.refresh();
-      return;
-    }
-    count = this.children.length;
-    start_y = this.height/2 - icon_size - 4;
-    for (i=0; i<count; i++) {
-      this.children[i].set_size(this.width, icon_size);
-      this.children[i].translation.y = start_y;
-      start_y-=icon_size+2;
-    }
-  }
-
-  infobar.set_label('Select remote display');
-  dlg_display.children[0] = upnp_renders;
-  widget_display.scale.x = 0;
-  layout();
-}
-
-
-function onMediaConnect(url, src_ip)
-{
- if (WidgetManager.probe(url)) {
-  var new_wid = WidgetManager.open(url, src_ip);
-  if (new_wid==null) {
-   return;
-  }
-  widget_insert(new_wid); 
- }
-}
-
-// widget get: UI for listWidgets and getWidget
-// added by Jean-Claude Dufourd, modeled on filebrowse
-function widget_get() {
-    alert("widget_get");
-    widgetbrowse = new SFNode('Transform2D');
-    infobar.set_label('Select widget manager');
-    dlg_display.children[0] = widgetbrowse;
-
-    widgetbrowse.children[0] = icon_button('icons/emblem-unreadable.svg', 'Close', 0);
-    widgetbrowse.children[0].button_click = function() {
-        dlg_display.children.length = 0;
-        widget_display.scale.x = 1;
-        layout();
-    };
-
-    widgetbrowse.children[1] = text_label('', 'BEGIN');
-    widgetbrowse.set_label = function(label) {
-        widgetbrowse.children[1].set_label(label);
-    };
-
-    widgetbrowse.nb_tools = widgetbrowse.children.length;
-
-    // this function builds the whole UI the first time
-    widgetbrowse.layout = function() {
-        alert("widgetbrowse.layout");
-        var w, h, i, y;
-        this.children.length = this.nb_tools;
-        for (i = 0; i < this.nb_items; i++) {
-            var item;
-            if (i >= this.list.length) {
-                break;
-            }
-            item = text_rect(this.list[i].Name);
-            item.wm = this.list[i];
-            item.widgetbrowse = this;
-            item.button_click = function() {
-                alert("click to select wm: "+this.wm.Name);
-                this.widgetbrowse.wm = this.wm;
-                this.wm.standardService.SetActionListener("listWidgets", get_widget_callback(this.wm, this.widgetbrowse), true);
-                this.wm.standardService.CallAction("listWidgets", new Array());
-            };
-            this.children[this.nb_tools + i] = item;
-        }
-        this.set_size(this.width, this.height);
-    };
-
-    widgetbrowse.set_size = function(w, h) {
-        alert("widgetbrowse.set_size "+w+" "+h);
-        var i, x, y, isize, nbi;
-        isize = 24;
-        if (w > display_width - isize) {
-            w = display_width - isize;
-        }
-        this.width = w;
-        this.height = h;
-        i = 1;
-        while ((i + 1) * isize <= h - isize) {
-            i++;
-        }
-        if (i != this.nb_items) {
-            this.nb_items = i;
-            this.layout(0);
-            return;
-        }
-        x = -w / 2 + isize / 2;
-        y = h / 2 - isize / 2;
-        for (i = 0; i < this.nb_tools; i++) {
-            if (this.nb_tools > i + 1) {
-                this.children[i].set_size(isize, isize);
-            }
-            this.children[i].translation.x = x;
-            this.children[i].translation.y = y;
-            x += isize;
-        }
-        y -= isize;
-        while (i < this.children.length) {
-            this.children[i].set_size(w, isize);
-            this.children[i].translation.x = 0;
-            this.children[i].translation.y = y;
-            y -= isize;
-            i++;
-        }
-    };
-
-    widgetbrowse.nb_items = WidgetManager.MPEGUStandardServiceProviders.length;
-    widgetbrowse.list = WidgetManager.MPEGUStandardServiceProviders;
-    widgetbrowse.set_label('Select Widget Manager');
-    widgetbrowse.layout(0);
-    widget_display.scale.x = 0;
-    layout();
-}
-
-function get_widget_callback(device, widgetbrowse) {
-    alert("get_widget_callback "+device.Name+" "+widgetbrowse);
-    return function() {
-        // msgHandler is the first argument, the next arguments are from the reply to listWidgets
-        var act = arguments[0];
-        var act1 = act.GetArgumentValue("widgetCodes");
-        var act2 = act.GetArgumentValue("widgetNames");
-        alert("callback |"+act1+"| |"+act2+"|");
-        widgetbrowse.set_label("Select Widget");
-        var w, h, i, y;
-        act1 = act1.split(" ");
-        act2 = act2.split(" ");
-        widgetbrowse.children.length = widgetbrowse.nb_tools;
-        for (i = 0; i < act2.length; i++) {
-            if (act1[i]=="" || act2[i]=="") continue;
-            var item = text_rect(act2[i]);
-            item.widgetCode = act1[i];
-            item.widgetName = act2[i];
-            item.widgetbrowse = widgetbrowse;
-            item.button_click = function() {
-                alert("selected widget: "+this.widgetName);
-                dlg_display.children.length = 0;
-                widget_display.scale.x = 1;
-                widget_screen_visible = true;
-                layout();
-                var arr = new Array();
-                arr[0] = "widgetCode";
-                arr[1] = this.widgetCode;
-                this.widgetbrowse.wm.standardService.SetActionListener("getWidget", get_widget_callback2, true);
-                this.widgetbrowse.wm.standardService.CallAction("getWidget", arr);
-            };
-            widgetbrowse.children[this.nb_tools + i] = item;
-        }
-        widgetbrowse.set_size(widgetbrowse.width, widgetbrowse.height);
-    }
-}
-
-function get_widget_callback2() {
-    // msgHandler is the first argument, the next arguments are from the reply to listWidgets
-    alert("callback2-1");
-    var act = arguments[0];
-    var act1 = act.GetArgumentValue("widgetUrl");
-    var act2 = act.GetArgumentValue("widgetContext");
-    alert("callback2-2 " + act1 + " " + act2);
-    var wid = WidgetManager.load(act1, null, act2);
-    WidgetManager.on_widget_add(wid);
-}

gpac-0.8.0.tar.gz/gui/mpegu-wm.xmt Deleted

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<XMT-A xmlns="urn:mpeg:mpeg4:xmta:schema:2002" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:mpeg4:xmta:schema:2002 xmt-a.xsd">
- <Header>
- </Header>
- <Body>
-  <Replace>
-   <Scene>
-       
-    <ProtoDeclare name="Untransform" protoID="1" locations="&quot;urn:inet:gpac:builtin:Untransform&quot;">
-     <field name="children" type="Nodes" vrml97Hint="exposedField">
-      <nodes/>
-     </field>
-    </ProtoDeclare>
-   
-    
-    <OrderedGroup DEF="GPAC_UI">
-     <children>
-      <Background2D backColor="1 1 1"/>
-      <ProtoInstance name="Untransform" DEF="UI_ROOT"/>
-      <Script DEF="GUIScript" url="mpegu-wm.js">
-       <field name="root" type="Node" vrml97Hint="field">
-        <node>
-         <OrderedGroup USE="GPAC_UI"/>
-        </node>
-       </field>
-       <field name="ui_root" type="Node" vrml97Hint="field">
-        <node>
-         <ProtoInstance name="Untransform" USE="UI_ROOT"/>
-        </node>
-       </field>
-      </Script>
-     </children>
-    </OrderedGroup>
-   </Scene>
-  </Replace>
- </Body>
-</XMT-A>

gpac-0.8.0.tar.gz/gui/webvtt-renderer.js Deleted

@@ -1,285 +0,0 @@
-/* JavaScript Renderer for WebVTT tracks
-   Generates GPAC Scene Graph (SVG, BIFS) to display WebVTT cues */
-alert("WebVTT Rendered Loaded");
-
-var DEBUG = false;
-
-var rect = document.documentElement.getRectPresentationTrait("viewBox");
-var width = rect.width;
-var height = rect.height;
-var xOffset = 5;
-var yOffset = 5;
-var fontSize = 20;
-var textColor = "white";
-var fontFamily = "SANS";
-var lineIncrement = fontSize;
-var nbCues = 0;
-
-var cueArea = document.createElement("g");
-document.documentElement.appendChild(cueArea);
-
-function reportMessage(msg) {
-	if (DEBUG) {
-		alert(msg);
-	}
-}
-
-function createTextArea(settingsObj) {
-	var t = document.createElement("textArea");
-	t.setAttribute("x", xOffset+settingsObj.xPosition);
-	t.setAttribute("y", yOffset);
-	var w, h;
-	if (settingsObj.fromTop) {
-		t.setAttribute("display-align", "before");
-		h=height-2*yOffset;
-	} else {
-		t.setAttribute("display-align", "after");
-		h = height-2*yOffset-settingsObj.linePosition;
-	}
-	w = settingsObj.size-2*xOffset;
-	t.setAttribute("height", h);
-	t.setAttribute("width", w);
-	reportMessage("Creating textArea size " + w + " x " + h);
-	
-	t.setAttribute("fill", textColor);
-	t.setAttribute("font-size", fontSize);
-	t.setAttribute("font-family", fontFamily);
-	t.setAttribute("text-align", settingsObj.align);
-	t.setAttribute("line-increment", lineIncrement);
-	cueArea.appendChild(t);
-	reportMessage("textArea created: "+t);
-	return t;
-}
-
-function printObj(o) {
-  for (var p in o) {
-	if (o.hasOwnProperty(p)) {
-	  alert(""+p+": "+o[p]);
-    }
-  }
-}
-
-function addSpan(parent, cuePart) {
-	reportMessage("adding tspan to "+parent+" with cuePart: "+ cuePart);
-	var i;
-	var span = document.createElement('tspan');
-	//alert('adding span for '+parent+': '+cuePart+' token:'+cuePart.token);
-	if (cuePart.token === undefined) {
-		span.textContent = cuePart;
-	} else {
-		if (cuePart.token === 'i') {
-			span.setAttribute("font-style", "italic");
-		} else if (cuePart.token === 'u') {
-			span.setAttribute("text-decoration", "underline");
-		} else if (cuePart.token === 'b') {
-			span.setAttribute("font-weight", "bold");
-		}
-		for (i in cuePart.children) {
-			addSpan(span, cuePart.children[i]);
-		}
-	}
-	parent.appendChild(span);
-	reportMessage("tspan created "+span);
-	return span;
-}
-
-function parseCueSettings(cueSettings){
-	reportMessage("Parsing cue settings: "+cueSettings);
-	var obj = {};
-	var settingsArray = cueSettings.split(/\s/g);
-	//.filter(function(set) { return set && !!set.length; });
-
-	// Convert the Array into an object 
-	var compositeCueSettings = {};
-	for (var settingsIndex in settingsArray) {
-		var nvArray = settingsArray[settingsIndex].split(":");
-		compositeCueSettings[nvArray[0]] = nvArray[1];
-	}
-
-	// Compute real values
-	if (compositeCueSettings.line !== undefined) {
-		if (compositeCueSettings.line.match(/\%/)) {
-			obj.linePosition = parseFloat(compositeCueSettings.line.replace(/\%/ig,""));
-			if (isNaN(obj.linePosition)) {
-				obj.linePosition = nbCues*lineIncrement;
-			} else {
-				obj.linePosition *= height/100;
-			}
-		} else {
-			obj.linePosition = parseFloat(compositeCueSettings.line)*lineIncrement;
-			if (isNaN(obj.linePosition)) {
-				obj.linePosition = nbCues*lineIncrement;
-			} else {
-				if (obj.linePosition > 0) {
-					obj.fromTop = true;
-				} else {
-					obj.fromTop = false;
-					obj.linePosition = -obj.linePosition;
-				}
-			}
-		}
-	} else {
-		obj.linePosition = nbCues*lineIncrement;
-	}
-	reportMessage("linePosition: "+obj.linePosition);
-	if (compositeCueSettings.position !== undefined) {
-		obj.xPosition = parseFloat(compositeCueSettings.position.replace(/\%/ig,""));
-		if (isNaN(obj.xPosition)) {
-			obj.xPosition = 50;
-		} else {
-			obj.xPosition *= width/100;
-		}
-	} else {
-		obj.xPosition = 50;
-	}
-	reportMessage("xPosition: "+obj.xPosition);
-	if (compositeCueSettings.size !== undefined) {
-		obj.size = parseFloat(compositeCueSettings.size.replace(/\%/ig,""));
-		if (isNaN(obj.size)) {
-			obj.size = 100;
-		}
-	} else {
-		obj.size = 100;
-	}
-	obj.size *= width/100;
-	
-	reportMessage("size: "+obj.size);
-	if (compositeCueSettings.align !== undefined) {
-		if (compositeCueSettings.align === "middle") {
-			obj.align = "center";
-		} else if (compositeCueSettings.align === "left") {
-			obj.align = "start";
-		} else if (compositeCueSettings.align === "right") {
-			obj.align = "end";
-		} else if (compositeCueSettings.align === "start") {
-			obj.align = "start";
-		} else if (compositeCueSettings.align === "end") {
-			obj.align = "end";
-		} else {
-			obj.align = "center";
-		}
-	} else {
-		obj.align = "center";
-	}
-	reportMessage("align: "+obj.align);
-	reportMessage("cue settings parsed: "+obj);
-	return obj;
-}
-
-function removeCues() {
-	cueArea.textContent = '';
-	nbCues = 0;
-}
-
-function addCue(id, start, end, settings, payload) {
-	reportMessage("adding cue: "+id+","+start+","+end+","+settings+","+payload);
-	var lines = payload.split('\n');
-	var settingObj = parseCueSettings(settings);
-	var tA = createTextArea(settingObj);
-	for (var lineIndex in lines) {
-		var parsedCue = parseCue(lines[lineIndex]);
-		for (var cuePartIndex in parsedCue) {
-			addSpan(tA, parsedCue[cuePartIndex]);
-		}
-		tA.appendChild(document.createElement('tbreak'));
-	}
-	nbCues++;
-	reportMessage("cue added: "+tA);
-}
-
-/* Code adapted from https://raw.github.com/cgiffard/Captionator/master/js/captionator.js */
-var SRTChunkTimestampParser		= /(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)/; 
-function parseCue(cueText) {
-	reportMessage("Parsing cue text: "+cueText);
-
-	var cueStructure = new Array,
-		cueSplit = [],
-		splitIndex,
-		currentToken,
-		currentContext,
-		stack = [],
-		stackIndex = 0,
-		chunkTimestamp,
-		timeData,
-		lastCueTime;
-					
-	cueSplit = cueText.split(/(<\/?[^>]+>)/ig);
-				
-	currentContext = cueStructure;
-	for (splitIndex in cueSplit) {
-		if (cueSplit.hasOwnProperty(splitIndex)) {
-			currentToken = cueSplit[splitIndex];
-			
-			if (currentToken.substr(0,1) === "<") {
-				if (currentToken.substr(1,1) === "/") {
-					// Closing tag
-					var TagName = currentToken.substr(2).split(/[\s>]+/g)[0];
-					if (stack.length > 0) {
-						// Scan backwards through the stack to determine whether we've got an open tag somewhere to close.
-						var stackScanDepth = 0;
-						for (stackIndex = stack.length-1; stackIndex >= 0; stackIndex --) {
-							var parentContext = stack[stackIndex][stack[stackIndex].length-1];
-							stackScanDepth = stackIndex;
-							if (parentContext.token === TagName) { break; }
-						}
-					
-						currentContext = stack[stackScanDepth];
-						stack = stack.slice(0,stackScanDepth);
-					} else {
-						// Tag mismatch!
-						alert("Tag mismatch when parsing WebVTT cue: "+cueText);
-					}
-				} else {
-					// Opening Tag
-					// Check whether the tag is valid according to the WebVTT specification
-					// If not, don't allow it (unless the sanitiseCueHTML option is explicitly set to false)
-				
-					if ((	currentToken.substr(1).match(SRTChunkTimestampParser)	||
-							currentToken.match(/^<v\s+[^>]+>/i)						||
-							currentToken.match(/^<c[a-z0-9\-\_\.]+>/)				||
-							currentToken.match(/^<(b|i|u|ruby|rt)>/))				) {
-						
-						var tmpObject = {
-							"token":	currentToken.replace(/[<\/>]+/ig,"").split(/[\s\.]+/)[0],
-							"rawToken":	currentToken,
-							"children":	[]
-						};
-						
-						if (tmpObject.token === "v") {
-							tmpObject.voice = currentToken.match(/^<v\s*([^>]+)>/i)[1];
-						} else if (tmpObject.token === "c") {
-							tmpObject.classes = currentToken
-													.replace(/[<\/>\s]+/ig,"")
-													.split(/[\.]+/ig)
-													.slice(1)
-													.filter(hasRealTextContent);
-						} else if (!!(chunkTimestamp = tmpObject.rawToken.match(SRTChunkTimestampParser))) {
-							cueStructure.isTimeDependent = true;
-							timeData = chunkTimestamp.slice(1);
-							tmpObject.timeIn =	parseInt((timeData[0]||0) * 60 * 60,10) +	// Hours
-												parseInt((timeData[1]||0) * 60,10) +		// Minutes
-												parseInt((timeData[2]||0),10) +				// Seconds
-												parseFloat("0." + (timeData[3]||0));		// MS
-						}
-					
-						currentContext.push(tmpObject);
-						stack.push(currentContext);
-						currentContext = tmpObject.children;
-					}
-				}
-			} else {
-				// Text string
-				currentToken = currentToken
-								.replace(/</g,"&lt;")
-								.replace(/>/g,"&gt;")
-								.replace(/\&/g,"&amp;");
-					
-				currentToken = currentToken.replace(/\n+/g,"<br />");
-			
-				currentContext.push(currentToken);
-			}
-		}
-	}
-	reportMessage("cue text parsed: "+cueStructure);
-	return cueStructure;
-}

gpac-0.8.0.tar.gz/include/gpac/esi.h Deleted

@@ -1,184 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Elementary Stream Interface 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.
- *
- */
-
-#ifndef _GF_ESI_H_
-#define _GF_ESI_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <gpac/esi.h>
- *	\brief Draft elementary stream interface API used by MP42TS.
- */
-	
-/*!
- *	\addtogroup esi_grp ES Interface
- *	\ingroup media_grp
- *	\brief Draft elementary stream interface API used by MP42TS.
- *
- *This section documents the draft ES interface used by MP42TS to abstract input sources.
- *	@{
- */
-
-#include <gpac/tools.h>
-
-/* ESI input control commands*/
-enum
-{
-	/*forces a data flush from interface to dest (caller) - used for non-threaded interfaces
-		corresponding parameter: unused
-	*/
-	GF_ESI_INPUT_DATA_FLUSH,
-	/*pulls a COMPLETE AU from the stream
-		corresponding parameter: pointer to a GF_ESIPacket to fill. The input data_len in the packet is used to indicate any padding in bytes
-	*/
-	GF_ESI_INPUT_DATA_PULL,
-	/*releases the currently pulled AU from the stream - AU cannot be pulled after that, unless seek happens
-		corresponding parameter: unused
-	*/
-	GF_ESI_INPUT_DATA_RELEASE,
-
-	/*destroys any allocated resource by the stream interface*/
-	GF_ESI_INPUT_DESTROY,
-};
-
-/* ESI output control commands*/
-enum
-{
-	/*forces a data flush from interface to dest (caller) - used for non-threaded interfaces
-		corresponding parameter: GF_ESIPacket
-	*/
-	GF_ESI_OUTPUT_DATA_DISPATCH
-};
-
-/*
-	data packet flags
-*/
-enum
-{
-	GF_ESI_DATA_AU_START	=	1,
-	GF_ESI_DATA_AU_END		=	1<<1,
-	GF_ESI_DATA_AU_RAP		=	1<<2,
-	GF_ESI_DATA_HAS_CTS		=	1<<3,
-	GF_ESI_DATA_HAS_DTS		=	1<<4,
-	GF_ESI_DATA_REPEAT		=	1<<5,
-	GF_ESI_DATA_CRITICAL	=	1<<6,
-	GF_ESI_DATA_ENCRYPTED	=	1<<7,
-};
-
-typedef struct __data_packet_ifce
-{
-	u32 flags;
-	char *data;
-	u32 data_len;
-	/*DTS, CTS/PTS and duration expressed in media timescale*/
-	u64 dts, cts;
-	u32 duration;
-	u32 pck_sn;
-	/*MPEG-4 stuff*/
-	u32 au_sn;
-	/*for packets using ISMACrypt/OMA/3GPP based crypto*/
-	u32 isma_bso;
-
-	char *mpeg2_af_descriptors;
-	u32 mpeg2_af_descriptors_size;
-} GF_ESIPacket;
-
-struct __esi_video_info
-{
-	u32 width, height, par;
-	Double FPS;
-};
-struct __esi_audio_info
-{
-	u32 sample_rate, nb_channels;
-};
-
-enum
-{
-	/*data can be pulled from this stream*/
-	GF_ESI_AU_PULL_CAP	=	1,
-	/*DTS is signaled for this stream*/
-	GF_ESI_SIGNAL_DTS =	1<<1,
-	/*no more data to expect from this stream*/
-	GF_ESI_STREAM_IS_OVER	=	1<<2,
-	/*stream is not signaled through MPEG-4 Systems (OD stream) */
-	GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS =	1<<3,
-};
-
-typedef struct __elementary_stream_ifce
-{
-	/*misc caps of the stream*/
-	u32 caps;
-	/*matches PID for MPEG2, ES_ID for MPEG-4*/
-	u32 stream_id;
-	/*MPEG-TS program number if any*/
-	u16 program_number;
-	/*MPEG-4 ST/OTIs*/
-	u8 stream_type;
-	u8 object_type_indication;
-	/*stream 4CC for non-mpeg codecs, 0 otherwise (stream is identified through StreamType/ObjectType)*/
-	u32 fourcc;
-	/*packed 3-char language code (4CC with last byte ' ')*/
-	u32 lang;
-	/*media timescale*/
-	u32 timescale;
-	/*duration in ms - 0 if unknown*/
-	Double duration;
-	/*average bit rate in bit/sec - 0 if unknown*/
-	u32 bit_rate;
-	/*repeat rate in ms for carrouseling - 0 if no repeat*/
-	u32 repeat_rate;
-
-	char *decoder_config;
-	u32 decoder_config_size;
-
-	/* MPEG-4 SL Config if any*/
-	GF_SLConfig *sl_config;
-
-	/*input ES control from caller*/
-	GF_Err (*input_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
-	/*input user data of interface - usually set by interface owner*/
-	void *input_udta;
-
-	/*output ES control of destination*/
-	GF_Err (*output_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
-	/*output user data of interface - usually set during interface setup*/
-	void *output_udta;
-
-	u32 depends_on_stream;
-
-} GF_ESInterface;
-
-/*! @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	//_GF_ESI_H_
-

gpac-0.8.0.tar.gz/include/gpac/filestreamer.h Deleted

@@ -1,131 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2008-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / media tools 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.
- *
- */
-
-#ifndef _GF_ISOMRTPStreamer_H_
-#define _GF_ISOMRTPStreamer_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <gpac/filestreamer.h>
- *	\brief RTP file streamer.
- */
-
-/*!
- *	\ingroup media_grp
- *	\brief FileStreamer object
- *
- *	This section documents the list object of the GPAC framework.
- *	@{
- */
-
-#include <gpac/tools.h>
-
-
-typedef struct __isom_rtp_streamer GF_ISOMRTPStreamer;
-
-/*!
- *	\brief ISO File RTP Streamer list constructor
- *
- *	Constructs a new ISO file RTP streamer
- *\param file_name source file name to stream. Hint tracks will be ignored, all media tracks will be streamed
- *\param ip_dest destination IP address (V4 or V6, unicast or multicast)
- *\param port destination port
- *\param loop whether streaming stops at the end of all tracks or not. If not, RTP TS will continuously be incremented
- *\param force_mpeg4 forces usage of MPEG-4 generic (RFC3640) for all streams
- *\param path_mtu maximum RTP packet payload size allowed
- *\param ttl multicast time to live
- *\param ifce_addr IP of the local interface to use (may be NULL)
- *\return new list object
- */
-GF_ISOMRTPStreamer *gf_isom_streamer_new(const char *file_name, const char *ip_dest, u16 port, Bool loop, Bool force_mpeg4, u32 path_mtu, u32 ttl, char *ifce_addr);
-
-/*!
- *	\brief RTP file streamer destructor
- *
- *	Destructs an RTP file streamer
- *	\param streamer object to destruct
- */
-void gf_isom_streamer_del(GF_ISOMRTPStreamer *streamer);
-
-/*!
- *	\brief writes the SDP file
- *
- *	Writes the SDP file asscoiated with the streaming session
- *	\param streamer RTP streamer object
- *	\param sdpfilename SDP file name to create
- */
-GF_Err gf_isom_streamer_write_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename);
-
-/*!
- *	\brief gets the SDP file
- *
- *	Gets the SDP asscoiated with all media in the streaming session (only media parts are returned)
- *	\param streamer RTP streamer object
- *	\param out_sdp_buffer location to the SDP buffer to allocate and fill
- */
-GF_Err gf_isom_streamer_get_sdp(GF_ISOMRTPStreamer *streamer, char **out_sdp_buffer);
-
-
-/*!
- *	\brief sends RTP packet
- *
- *	Sends the next RTP packet in the current file, potentially waiting for the TS to be mature. If the last packet is sent and looping is disabled, this will return GF_EOS.
- *	\param streamer RTP streamer object
- *	\param send_ahead_delay delay in milliseconds for packet sending. A packet is sent if (packet.timestamp + send_ahead_delay) is greate than the current time.
- *	\param max_sleep_time indicates that if the streamer has to wait more than max_sleep_time before sending the packet, it should return and send it later.
- */
-GF_Err gf_isom_streamer_send_next_packet(GF_ISOMRTPStreamer *streamer, s32 send_ahead_delay, s32 max_sleep_time);
-
-/*!
- *	\brief resets RTP sender
- *
- *	Reset the RTP streams to the beginning of the media file
- *	\param streamer RTP streamer object
- *	\param is_loop indicates whether the RTP timelines shall continue from the end of the file or shall restart from 0
- */
-void gf_isom_streamer_reset(GF_ISOMRTPStreamer *streamer, Bool is_loop);
-
-    
-/*!
- *	\brief gets current media time
- *
- *	Get the media time (DTS) of the last RTP packet sent in this session
- *	\param streamer RTP streamer object
- *	\return media time (DTS) in seconds
- */
-Double gf_isom_streamer_get_current_time(GF_ISOMRTPStreamer *streamer);
-    
-/*! @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif		/*_GF_ISOMRTPStreamer_H_*/
-

gpac-0.8.0.tar.gz/include/gpac/internal/mpd.h Deleted

@@ -1,501 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre - Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
- *
- *  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 _MPD_H_
-#define _MPD_H_
-
-#include <gpac/constants.h>
-#include <gpac/xml.h>
-#include <gpac/media_tools.h>
-
-#ifndef GPAC_DISABLE_CORE_TOOLS
-
-/*TODO*/
-typedef struct
-{
-	u32 dummy;
-} GF_MPD_Metrics;
-
-/*TODO*/
-typedef struct
-{
-	u32 dummy;
-} GF_MPD_ContentComponent;
-
-
-//some elments are typically overloaded in XML, we keep the attributes / childrne nodes here. The attributes list is NULL if no extensions were found, otherwise it is a list of @GF_XMLAttribute.
-//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;	\
-
-typedef struct
-{
-	MPD_EXTENSIBLE
-} GF_MPD_ExtensibleVirtual;
-
-typedef struct
-{
-	MPD_EXTENSIBLE
-
-	char *scheme_id_uri; /*MANDATORY*/
-	char *value;
-	char *id;
-
-} GF_MPD_Descriptor;
-
-/*TODO*/
-typedef struct
-{
-	u32 dummy;
-} GF_MPD_Subset;
-
-typedef struct
-{
-	u64 start_time;
-	u32 duration; /*MANDATORY*/
-	//may be -1 (FIXME this needs further testing)
-	u32 repeat_count;
-} GF_MPD_SegmentTimelineEntry;
-
-typedef struct
-{
-	GF_List *entries;
-} GF_MPD_SegmentTimeline;
-
-typedef struct
-{
-	u64 start_range, end_range;
-} GF_MPD_ByteRange;
-
-
-typedef struct
-{
-	char *URL;
-	char *service_location;
-	GF_MPD_ByteRange *byte_range;
-
-	//GPAC internal: redirection for that URL
-	char *redirection;
-} GF_MPD_BaseURL;
-
-typedef struct
-{
-	char *sourceURL;
-	GF_MPD_ByteRange *byte_range;
-
-	//GPAC internal - indicates the URL has already been solved
-	Bool is_resolved;
-} GF_MPD_URL;
-
-typedef struct
-{
-	u32 num, den;
-} GF_MPD_Fractional;
-
-typedef struct
-{
-	u32 trackID;
-	char *stsd;
-	s64 mediaOffset;
-} GF_MPD_ISOBMFInfo;
-
-#define GF_MPD_SEGMENT_BASE	\
-	u32 timescale;	\
-	u64 presentation_time_offset;	\
-	u32 time_shift_buffer_depth; /* expressed in milliseconds */	\
-	GF_MPD_ByteRange *index_range;	\
-	Bool index_range_exact;	\
-	Double availability_time_offset;	\
-	GF_MPD_URL *initialization_segment;	\
-	GF_MPD_URL *representation_index;	\
-
-
-typedef struct
-{
-	GF_MPD_SEGMENT_BASE
-} GF_MPD_SegmentBase;
-
-/*WARNING: duration is expressed in GF_MPD_SEGMENT_BASE@timescale unit*/
-#define GF_MPD_MULTIPLE_SEGMENT_BASE	\
-	GF_MPD_SEGMENT_BASE	\
-	u64 duration;	\
-	u32 start_number;	\
-	GF_MPD_SegmentTimeline *segment_timeline;	\
-	GF_MPD_URL *bitstream_switching_url;	\
-
-typedef struct
-{
-	GF_MPD_MULTIPLE_SEGMENT_BASE
-} GF_MPD_MultipleSegmentBase;
-
-typedef struct
-{
-	char *media;
-	GF_MPD_ByteRange *media_range;
-	char *index;
-	GF_MPD_ByteRange *index_range;
-	u64 duration;
-	/*HLS only*/
-	char *key_url;
-	bin128 key_iv;
-	u64 hls_utc_start_time;
-} GF_MPD_SegmentURL;
-
-typedef struct
-{
-	GF_MPD_MULTIPLE_SEGMENT_BASE
-	/*list of segments - can be NULL if no segment*/
-	GF_List *segment_URLs;
-
-	char *xlink_href;
-	Bool xlink_actuate_on_load;
-
-	u32 consecutive_xlink_count;
-} GF_MPD_SegmentList;
-
-typedef struct
-{
-	GF_MPD_MULTIPLE_SEGMENT_BASE
-	char *media;
-	char *index;
-	char *initialization;
-	char *bitstream_switching;
-} GF_MPD_SegmentTemplate;
-
-typedef enum
-{
-	GF_MPD_SCANTYPE_UNKNWON,
-	GF_MPD_SCANTYPE_PROGRESSIVE,
-	GF_MPD_SCANTYPE_INTERLACED
-} GF_MPD_ScanType;
-
-/*MANDATORY:
-	mime_type
-	codecs
-*/
-#define GF_MPD_COMMON_ATTRIBUTES_ELEMENTS	\
-	char *profiles;	\
-	u32 width;	\
-	u32 height;	\
-	GF_MPD_Fractional *sar;	\
-	GF_MPD_Fractional *framerate;	\
-	u32 samplerate;	\
-	char *mime_type;	\
-	char *segmentProfiles;	\
-	char *codecs;	\
-	u32 maximum_sap_period;	\
-	u32 starts_with_sap;	\
-	Double max_playout_rate;	\
-	Bool coding_dependency;	\
-	GF_MPD_ScanType scan_type;	\
-	GF_List *frame_packing;	\
-	GF_List *audio_channels;	\
-	GF_List *content_protection;	\
-	GF_List *essential_properties;	\
-	GF_List *supplemental_properties;	\
-	GF_List *isobmf_tracks;	\
-
-typedef struct {
-	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
-} GF_MPD_CommonAttributes;
-
-typedef struct {
-	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
-
-	u32 level;
-	char *dependecy_level;
-	u32 bandwidth; /*MANDATORY if level set*/
-	char *content_components;
-} GF_MPD_SubRepresentation;
-
-typedef struct
-{
-	Bool disabled;
-	char *cached_init_segment_url;
-	Bool owned_gmem;
-	u64 init_start_range, init_end_range;
-	u32 probe_switch_count;
-	char *init_segment_data;
-	u32 init_segment_size;
-	char *key_url;
-	bin128 key_IV;
-	/*previous maximum speed that this representation can be played, or 0 if it has never been played*/
-	Double prev_max_available_speed;
-	/*after switch we may have some buffered segments of the previous representation; so codec stats at this moment is unreliable. we should wait after the codec reset*/
-	Bool waiting_codec_reset;
-	// BOLA Utility
-	Double bola_v;
-
-	/*index of the next enhancement representation plus 1, 0 is reserved in case of the highest representation*/
-	u32 enhancement_rep_index_plus_one;
-
-	Bool broadcast_flag;
-} GF_DASH_RepresentationPlayback;
-
-typedef struct {
-	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
-
-	char *id; /*MANDATORY*/
-	u32 bandwidth; /*MANDATORY*/
-	u32 quality_ranking;
-	char *dependency_id;
-	char *media_stream_structure_id;
-
-	GF_List *base_URLs;
-	GF_MPD_SegmentBase *segment_base;
-	GF_MPD_SegmentList *segment_list;
-	GF_MPD_SegmentTemplate *segment_template;
-
-	GF_List *sub_representations;
-
-	/*GPAC playback implementation*/
-	GF_DASH_RepresentationPlayback playback;
-	u32 m3u8_media_seq_min, m3u8_media_seq_max;
-} GF_MPD_Representation;
-
-
-typedef struct
-{
-	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
-
-	u32 id;
-	/*default value is -1: not set in MPD*/
-	s32 group;
-
-	char *lang;
-	char *content_type;
-	GF_MPD_Fractional *par;
-	u32 min_bandwidth;
-	u32 max_bandwidth;
-	u32 min_width;
-	u32 max_width;
-	u32 min_height;
-	u32 max_height;
-	u32 min_framerate;
-	u32 max_framerate;
-	Bool segment_alignment;
-	Bool bitstream_switching;
-	Bool subsegment_alignment;
-	Bool subsegment_starts_with_sap;
-
-	GF_List *accessibility;
-	GF_List *role;
-	GF_List *rating;
-	GF_List *viewpoint;
-	GF_List *content_component;
-
-	GF_List *base_URLs;
-	GF_MPD_SegmentBase *segment_base;
-	GF_MPD_SegmentList *segment_list;
-	GF_MPD_SegmentTemplate *segment_template;
-
-	GF_List *representations;
-
-	char *xlink_href;
-	Bool xlink_actuate_on_load;
-} GF_MPD_AdaptationSet;
-
-typedef enum {
-	GF_MPD_TYPE_STATIC,
-	GF_MPD_TYPE_DYNAMIC,
-} GF_MPD_Type;
-
-typedef struct
-{
-	char *ID;
-	u64 start; /* expressed in ms, relative to the start of the MPD */
-	u64 duration; /* expressed in ms*/
-	Bool bitstream_switching;
-
-	GF_List *base_URLs;
-	GF_MPD_SegmentBase *segment_base;
-	GF_MPD_SegmentList *segment_list;
-	GF_MPD_SegmentTemplate *segment_template;
-
-	GF_List *adaptation_sets;
-	GF_List *subsets;
-	char *xlink_href;
-	Bool xlink_actuate_on_load;
-	char *origin_base_url;
-	GF_MPD_Type type;
-} GF_MPD_Period;
-
-typedef struct
-{
-	char *lang;
-	char *title;
-	char *source;
-	char *copyright;
-	char *more_info_url;
-} GF_MPD_ProgramInfo;
-
-
-typedef struct {
-	MPD_EXTENSIBLE
-
-	char *ID;
-	char *profiles;	/*MANDATORY*/
-	GF_MPD_Type type;
-	u64 availabilityStartTime; /* expressed in milliseconds */	/*MANDATORY if type=dynamic*/
-	u64 availabilityEndTime;/* expressed in milliseconds */
-	u64 publishTime;/* expressed in milliseconds */
-	u64 media_presentation_duration; /* expressed in milliseconds */	/*MANDATORY if type=static*/
-	u32 minimum_update_period; /* expressed in milliseconds */
-	u32 min_buffer_time; /* expressed in milliseconds */	/*MANDATORY*/
-
-	u32 time_shift_buffer_depth; /* expressed in milliseconds */
-	u32 suggested_presentation_delay; /* expressed in milliseconds */
-
-	u32 max_segment_duration; /* expressed in milliseconds */
-	u32 max_subsegment_duration; /* expressed in milliseconds */
-
-	/*list of GF_MPD_ProgramInfo */
-	GF_List *program_infos;
-	/*list of GF_MPD_BaseURL */
-	GF_List *base_URLs;
-	/*list of strings */
-	GF_List *locations;
-	/*list of Metrics */
-	GF_List *metrics;
-	/*list of GF_MPD_Period */
-	GF_List *periods;
-
-	/*set during parsing*/
-	const char *xml_namespace; /*won't be freed by GPAC*/
-} GF_MPD;
-
-GF_Err gf_mpd_init_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *base_url);
-GF_Err gf_mpd_complete_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *base_url);
-
-GF_MPD *gf_mpd_new();
-void gf_mpd_del(GF_MPD *mpd);
-/*frees a GF_MPD_SegmentURL structure (type-casted to void *)*/
-void gf_mpd_segment_url_free(void *ptr);
-void gf_mpd_segment_base_free(void *ptr);
-
-void gf_mpd_period_free(void *_item);
-
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out);
-GF_Err gf_mpd_write_file(GF_MPD const * const mpd, const char *file_name);
-
-
-typedef struct _gf_file_get GF_FileDownload;
-struct _gf_file_get
-{
-	GF_Err (*new_session)(GF_FileDownload *getter, char *url);
-	void (*del_session)(GF_FileDownload *getter);
-	const char *(*get_cache_name)(GF_FileDownload *getter);
-
-	void *udta;
-	/*created by udta after new_session*/
-	void *session;
-};
-
-/*converts M3U8 to MPD - getter is optional (download will still be processed if NULL)*/
-GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates,
-                      GF_FileDownload *getter, GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files, Bool test_mode);
-
-GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u64 *duration);
-
-GF_MPD_SegmentList *gf_mpd_solve_segment_list_xlink(GF_MPD *mpd, GF_XMLNode *root);
-
-GF_Err gf_mpd_init_smooth_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url);
-
-void gf_mpd_delete_segment_list(GF_MPD_SegmentList *segment_list);
-
-void gf_mpd_getter_del_session(GF_FileDownload *getter);
-
-
-/*get the number of base URLs for the given representation. This cumuluates all base URLs at MPD, period, AdaptationSet and Representation levels*/
-u32 gf_mpd_get_base_url_count(GF_MPD *mpd, GF_MPD_Period *period, GF_MPD_AdaptationSet *set, GF_MPD_Representation *rep);
-
-typedef enum
-{
-	GF_MPD_RESOLVE_URL_MEDIA,
-	GF_MPD_RESOLVE_URL_INIT,
-	GF_MPD_RESOLVE_URL_INDEX,
-	//same as GF_MPD_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$
-	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
-	//same as GF_MPD_RESOLVE_URL_MEDIA but does not use startNumber
-	GF_MPD_RESOLVE_URL_MEDIA_NOSTART,
-} GF_MPD_URLResolveType;
-
-/*resolves a URL based for a given segment, based on the MPD url, the type of resolution
-	base_url_index: 0-based index of the baseURL to use
-	item_index: current downloading index of the segment
-	nb_segments_removed: number of segments removed when purging the MPD after updates (can be 0). The start number will be offset by this value
-*/
-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);
-
-/*get duration of the presentation*/
-Double gf_mpd_get_duration(GF_MPD *mpd);
-
-/*get the duration of media segments*/
-void gf_mpd_resolve_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline);
-
-/*get the start_time from the segment index of a period/set/rep*/
-GF_Err gf_mpd_get_segment_start_time_with_timescale(s32 in_segment_index,
-	GF_MPD_Period const * const in_period, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
-	u64 *out_segment_start_time, u64 *out_opt_segment_duration, u32 *out_opt_scale);
-
-typedef enum {
-	MPD_SEEK_PREV,    /*will return the segment containing the requested time*/
-	MPD_SEEK_NEAREST, /*the nearest segment start time, may be the previous or the next one*/
-} MPDSeekMode;
-
-
-/*returns the segment index in the given period for the given time*/
-GF_Err gf_mpd_seek_in_period(Double seek_time, MPDSeekMode seek_mode,
-	GF_MPD_Period const * const in_period, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
-	u32 *out_segment_index, Double *out_opt_seek_time);
-
-/*get the index and the period for a given time in the MPD*/
-GF_EXPORT
-GF_Err gf_mpd_seek_to_time(Double seek_time, MPDSeekMode seek_mode,
-	GF_MPD const * const in_mpd, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
-	GF_MPD_Period **out_period, u32 *out_segment_index, Double *out_opt_seek_time);
-
-/*get duration of the presentation*/
-Double gf_mpd_get_duration(GF_MPD *mpd);
-
-/*get the duration of media segments in seconds*/
-void gf_mpd_resolve_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline);
-
-
-typedef struct
-{
-	u32 sample_num;
-	u64 dts;
-	s64 cts;
-	Bool is_processed;
-} GF_DASHCueInfo;
-
-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);
-
-
-#endif /*GPAC_DISABLE_CORE_TOOLS*/
-
-#endif // _MPD_H_

gpac-0.8.0.tar.gz/include/gpac/internal/smjs_api.h Deleted

@@ -1,358 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *				Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010
- *					All rights reserved
- *
- *  This file is part of GPAC / Scene Management 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.
- *
- */
-
-#ifndef GPAC_JSAPI
-#define GPAC_JSAPI
-
-#include <gpac/setup.h>
-
-/*WIN32 and WinCE config (no configure script)*/
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(__SYMBIAN32__)
-# ifndef XP_PC
-#  define XP_PC
-# endif
-# ifndef XP_WIN
-#  define XP_WIN
-# endif
-/*WINCE specific config*/
-# if defined(_WIN32_WCE)
-#  include <windows.h>
-# define XP_WINCE
-# endif
-#endif
-
-//Android config
-#ifdef GPAC_ANDROID
-# ifndef XP_UNIX
-#  define XP_UNIX
-# endif
-#endif
-
-//iOS config
-#ifdef GPAC_IPHONE
-# ifndef XP_UNIX
-#  define XP_UNIX
-# endif
-# ifndef IPHONE_OS
-#  define IPHONE_OS
-# endif
-# ifndef DARWIN
-#  define DARWIN
-# endif
-#endif
-
-/*OSX config*/
-#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
-# define MOZILLA_1_8_BRANCH
-# ifndef XP_UNIX
-#  define XP_UNIX
-# endif
-#endif
-
-
-/*other platforms should be setup through ./configure and have appropriated defines in config.h*/
-
-#if defined(DEBUG) && defined(GPAC_CONFIG_DARWIN)
-#undef DEBUG
-#endif
-
-#include <jsapi.h>
-
-#ifndef JS_VERSION
-#define JS_VERSION 170
-#endif
-
-
-typedef struct
-{
-	JSClass _class;
-	JSObject *_proto;
-} GF_JSClass;
-
-
-
-/*new APIs*/
-#if (JS_VERSION>=185)
-
-#ifdef USE_FFDEV_18
-#define USE_FFDEV_17
-#endif
-
-#ifdef USE_FFDEV_17
-#define USE_FFDEV_16
-#endif
-
-#ifdef USE_FFDEV_16
-#define USE_FFDEV_15
-#endif
-
-#ifdef USE_FFDEV_15
-#define JSVAL_IS_OBJECT(__v) JSVAL_IS_OBJECT_OR_NULL_IMPL(JSVAL_TO_IMPL(__v))
-#define USE_FFDEV_14
-#endif
-
-#ifdef USE_FFDEV_14
-#define USE_FFDEV_12
-
-#define JS_FinalizeStub	NULL
-#ifdef USE_FFDEV_16
-#define JS_NEW_OBJ_FOR_CONS(__c, __classp, __args)	JS_NewObjectForConstructor(__c, &(__classp)->_class, __args)
-#else
-#define JS_NEW_OBJ_FOR_CONS(__c, __classp, __args)	JS_NewObjectForConstructor(__c, __classp, __args)
-#endif
-
-#else
-#define JS_NEW_OBJ_FOR_CONS(__c, __classp, __args)	JS_NewObjectForConstructor(__c, __args)
-#endif
-
-#ifdef USE_FFDEV_12
-typedef unsigned uintN;
-typedef uint32_t jsuint;
-typedef int jsint;
-typedef double jsdouble;
-#endif
-
-#define JS_NewDouble(c, v)	v
-#define JS_PropertyStub_forSetter JS_StrictPropertyStub
-
-#if defined(USE_FFDEV_17)
-
-#define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSBool strict, JSMutableHandleValue __vp)
-#define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) { JSObject *obj = *(__hobj._); jsid id = *(__hid._); jsval *vp = __vp._;
-#define SMJS_FUNC_PROP_SET_NOVP(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) { JSObject *obj = *(__hobj._); jsid id = *(__hid._);
-
-#define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSMutableHandleValue __vp)
-#define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET( func_name ) { JSObject *obj = *(__hobj._); jsid id = *(__hid._); jsval *vp = __vp._;
-#define SMJS_CALL_PROP_STUB() JS_PropertyStub(c, __hobj, __hid, __vp)
-#define DECL_FINALIZE(func_name) void func_name(JSFreeOp *fop, JSObject *obj) { void *c = NULL;
-
-#define SMJS_FUNCTION_SPEC(__name, __fun, __argc) JS_FS(__name, __fun, __argc, 0)
-#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) \
-    {__name, __tinyid, __flags, JSOP_WRAPPER(__getter), JSOP_WRAPPER(__setter)}
-
-
-#else
-
-#ifdef USE_FFDEV_15
-
-#define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, JSBool strict, jsval *vp)
-#define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) { JSObject *obj = *(__hobj._); jsid id = *(__hid._);
-#define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSHandleObject __hobj, JSHandleId __hid, jsval *vp)
-#define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET( func_name ) { JSObject *obj = *(__hobj._); jsid id = *(__hid._);
-#define SMJS_CALL_PROP_STUB() JS_PropertyStub(c, __hobj, __hid, vp)
-#define DECL_FINALIZE(func_name) void func_name(JSFreeOp *fop, JSObject *obj) { void *c = NULL;
-
-#else
-
-#define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsid id, JSBool strict, jsval *vp)
-#define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET( func_name) {
-#define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsid id, jsval *vp)
-#define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET(func_name) {
-#define SMJS_CALL_PROP_STUB() JS_PropertyStub(c, obj, id, vp)
-#define DECL_FINALIZE(func_name) void func_name(JSContext *c, JSObject *obj) {
-
-#endif
-
-#define SMJS_FUNC_PROP_SET_NOVP	SMJS_FUNC_PROP_SET
-
-#define SMJS_FUNCTION_SPEC(__name, __fun, __argc) {__name, __fun, __argc, 0}
-#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) \
-    {__name, __tinyid, __flags, __getter, __setter}
-
-#endif
-
-#define SMJS_FUNCTION(__name) __name(JSContext *c, uintN argc, jsval *argsvp)
-#define SMJS_FUNCTION_EXT(__name, __ext) __name(JSContext *c, uintN argc, jsval *argsvp, __ext)
-#define SMJS_ARGS	jsval *argv = JS_ARGV(c, argsvp);
-#define SMJS_OBJ	JSObject *obj = JS_THIS_OBJECT(c, argsvp);
-#define SMJS_SET_RVAL(__rval) JS_SET_RVAL(c, argsvp, __rval)
-#define SMJS_GET_RVAL & JS_RVAL(c, argsvp)
-#define SMJS_CALL_ARGS	c, argc, argsvp
-#define SMJS_DECL_RVAL jsval *rval = & JS_RVAL(c, argsvp);
-
-#define SMJS_CHARS_FROM_STRING(__c, __jsstr)	(char *) JS_EncodeString(__c, __jsstr)
-#define SMJS_CHARS(__c, __val)	SMJS_CHARS_FROM_STRING(__c, JSVAL_TO_STRING(__val))
-#define SMJS_FREE(__c, __str)	if (__str) JS_free(__c, __str)
-
-
-#define SMJS_OBJ_CONSTRUCTOR(__classp)	\
-	JSObject *obj = JS_NEW_OBJ_FOR_CONS(c, __classp, argsvp);	\
-	SMJS_SET_RVAL(OBJECT_TO_JSVAL(obj));\
- 
-#define JS_GetFunctionName(_v) (JS_GetFunctionId(_v)!=NULL) ? SMJS_CHARS_FROM_STRING(c, JS_GetFunctionId(_v)) : NULL
-
-#define SMJS_ID_IS_STRING	JSID_IS_STRING
-#define SMJS_ID_TO_STRING		JSID_TO_STRING
-#define SMJS_ID_IS_INT	JSID_IS_INT
-#define SMJS_ID_TO_INT		JSID_TO_INT
-
-#ifndef JS_THREADSAFE
-#define JS_THREADSAFE
-#endif
-
-
-#ifdef USE_FFDEV_12
-#define JS_ClearContextThread(__ctx)
-#define JS_SetContextThread(__ctx)
-#define SMJS_GET_PRIVATE(__ctx, __obj)	JS_GetPrivate(__obj)
-#define SMJS_SET_PRIVATE(__ctx, __obj, __val)	JS_SetPrivate(__obj, __val)
-#define SMJS_GET_PARENT(__ctx, __obj)	JS_GetParent(__obj)
-#define SMJS_GET_CLASS(__ctx, __obj)	JS_GetClass(__obj)
-
-
-#ifdef USE_FFDEV_15
-#define JS_GET_CLASS(__ctx, __obj) JS_GetClass(* __obj._)
-#else
-#define JS_GET_CLASS(__ctx, __obj) JS_GetClass(__obj)
-#endif
-
-#ifdef USE_FFDEV_16
-#define SMJS_CONSTRUCT_OBJECT(__ctx, __class, __parent)	JS_New(__ctx, JS_GetConstructor(__ctx, (__class)->_proto), 0, NULL)
-#else
-#define SMJS_CONSTRUCT_OBJECT(__ctx, __class, __parent)	JS_ConstructObject(__ctx, &(__class)->_class, __parent)
-#endif
-
-#else
-
-#define SMJS_GET_PRIVATE(__ctx, __obj)	JS_GetPrivate(__ctx, __obj)
-#define SMJS_SET_PRIVATE(__ctx, __obj, __val)	JS_SetPrivate(__ctx, __obj, __val)
-#define SMJS_GET_PARENT(__ctx, __obj)	JS_GetParent(__ctx, __obj)
-#define SMJS_GET_CLASS(__ctx, __obj)	JS_GetClass(__ctx, __obj)
-
-#ifdef USE_FFDEV_11
-#define JS_ClearContextThread(__ctx)
-#define JS_SetContextThread(__ctx)
-#define SMJS_CONSTRUCT_OBJECT(__ctx, __class, __parent)	JS_ConstructObject(__ctx, &(__class)->_class, __parent)
-#else
-#define SMJS_CONSTRUCT_OBJECT(__ctx, __class, __parent)	JS_ConstructObject(__ctx, &(__class)->_class, 0, __parent)
-#endif
-
-#endif
-
-
-#else
-
-/* Windows with extra-libs */
-
-#define SMJS_DECL_FUNC_PROP_SET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsval id, jsval *vp)
-#define SMJS_FUNC_PROP_SET(func_name) SMJS_DECL_FUNC_PROP_SET(func_name) {
-#define SMJS_FUNC_PROP_SET_NOVP	SMJS_FUNC_PROP_SET
-#define SMJS_DECL_FUNC_PROP_GET(func_name) JSBool func_name(JSContext *c, JSObject *obj, jsval id, jsval *vp)
-#define SMJS_FUNC_PROP_GET(func_name) SMJS_DECL_FUNC_PROP_GET( func_name) {
-#define DECL_FINALIZE(func_name) void func_name(JSContext *c, JSObject *obj) {
-
-#define SMJS_CALL_PROP_STUB() JS_PropertyStub(c, obj, id, vp)
-#define SMJS_PROP_SETTER jsval id
-#define SMJS_PROP_GETTER jsval id
-#define JS_PropertyStub_forSetter JS_PropertyStub
-#define SMJS_FUNCTION_SPEC(__name, __fun, __argc) {__name, __fun, __argc, 0, 0}
-#define SMJS_PROPERTY_SPEC(__name, __tinyid, __flags, __getter, __setter) {__name, __tinyid, __flags, __getter, __setter}
-#define SMJS_FUNCTION(__name) __name(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-#define SMJS_FUNCTION_EXT(__name, __ext) __name(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, __ext)
-#define SMJS_ARGS
-#define SMJS_OBJ
-#define SMJS_OBJ_CONSTRUCTOR(__classp)
-#define SMJS_GET_RVAL rval
-#define SMJS_SET_RVAL(__rval) *rval = __rval
-#define SMJS_CALL_ARGS	c, obj, argc, argv, rval
-#define SMJS_DECL_RVAL
-
-#define SMJS_CHARS_FROM_STRING(__c, __str)	JS_GetStringBytes(__str)
-#define SMJS_CHARS(__c, __val)	JS_GetStringBytes(JSVAL_TO_STRING(__val))
-#define SMJS_FREE(__c, __str)
-
-#define SMJS_ID_IS_STRING	JSVAL_IS_STRING
-#define SMJS_ID_TO_STRING		JSVAL_TO_STRING
-#define SMJS_ID_IS_INT	JSVAL_IS_INT
-#define SMJS_ID_TO_INT		JSVAL_TO_INT
-
-#define SMJS_CONSTRUCT_OBJECT(__ctx, __class, __parent)	JS_ConstructObject(__ctx, &(__class)->_class, 0, __parent)
-#define SMJS_GET_PRIVATE(__ctx, __obj)	JS_GetPrivate(__ctx, __obj)
-#define SMJS_SET_PRIVATE(__ctx, __obj, __val)	JS_SetPrivate(__ctx, __obj, __val)
-#define SMJS_GET_PARENT(__ctx, __obj)	JS_GetParent(__ctx, __obj)
-#define SMJS_GET_CLASS(__obj)	JS_GetClass(__obj)
-
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if (JS_VERSION>=185)
-#if defined(USE_FFDEV_18)
-JSBool gf_sg_js_has_instance(JSContext *cx, JSHandleObject obj, JSMutableHandleValue vp, JSBool *bp);
-#elif defined(USE_FFDEV_15)
-JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj,const jsval *val, JSBool *vp);
-#else
-JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj,const jsval *val, JSBool *vp);
-#endif
-#else
-JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj, jsval val, JSBool *vp);
-#endif
-
-#define JS_SETUP_CLASS(the_class, cname, flag, getp, setp, fin)	\
-	memset(&the_class, 0, sizeof(the_class));	\
-	the_class._class.name = cname;	\
-	the_class._class.flags = flag;	\
-	the_class._class.addProperty = JS_PropertyStub;	\
-	the_class._class.delProperty = JS_PropertyStub;	\
-	the_class._class.getProperty = getp;	\
-	the_class._class.setProperty = setp;	\
-	the_class._class.enumerate = JS_EnumerateStub;	\
-	the_class._class.resolve = JS_ResolveStub;		\
-	the_class._class.convert = JS_ConvertStub;		\
-	the_class._class.finalize = (JSFinalizeOp) fin;	\
-	the_class._class.hasInstance = gf_sg_js_has_instance;
-
-
-#define JS_MAKE_DOUBLE(__c, __double)	DOUBLE_TO_JSVAL(JS_NewDouble(__c, __double) )
-
-
-#define GF_JS_InstanceOf(_a, _b, __class, _d) JS_InstanceOf(_a, _b, & (__class)->_class, NULL)
-
-#define GF_JS_InitClass(cx, obj, parent_proto, clasp, constructor, nargs, ps, fs, static_ps, static_fs) \
-		(clasp)->_proto = JS_InitClass(cx, obj, parent_proto, &(clasp)->_class, constructor, nargs, ps, fs, static_ps, static_fs);
-
-
-#define SMJS_GET_NUMBER(val, _d)  {	\
-		if (!JSVAL_IS_NUMBER(val) || (val == JS_GetNaNValue(c)) ) { \
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JS] Value is not a number while assigning @ file %s line %d \n", __FILE__, __LINE__));	\
-			return JS_FALSE; \
-		}	\
-		JS_ValueToNumber(c, val, &_d);	\
-		if (_d != _d) { \
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JS] Value is not a number while assigning @ file %s line %d \n", __FILE__, __LINE__));	\
-			return JS_FALSE; \
-		} \
-	}	\
- 
-JSObject *gf_sg_js_global_object(JSContext *cx, GF_JSClass *__class);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //GPAC_JSAPI

gpac-0.8.0.tar.gz/include/gpac/internal/terminal_dev.h Deleted

@@ -1,1342 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Stream Management 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.
- *
- */
-
-#ifndef _GF_TERMINAL_DEV_H_
-#define _GF_TERMINAL_DEV_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <gpac/terminal.h>
-#include <gpac/mpeg4_odf.h>
-
-#include <gpac/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/modules/ipmp.h>
-#include <gpac/mediaobject.h>
-#include <gpac/thread.h>
-#include <gpac/modules/term_ext.h>
-
-typedef struct _scene GF_Scene;
-typedef struct _media_manager GF_MediaManager;
-typedef struct _object_clock GF_Clock;
-typedef struct _es_channel GF_Channel;
-typedef struct _generic_codec GF_Codec;
-typedef struct _composition_memory GF_CompositionMemory;
-typedef struct _gf_addon_media GF_AddonMedia;
-
-
-struct _net_service
-{
-	/*the module handling this service - must be declared first to typecast with GF_DownloadSession upon deletion*/
-	GF_InputService *ifce;
-
-	//function table of service
-	void (*fn_connect_ack) (GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
-	void (*fn_disconnect_ack) (GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
-	void (*fn_command) (GF_ClientService *service, GF_NetworkCommand *com, GF_Err response);
-	void (*fn_data_packet) (GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status);
-	void (*fn_add_media) (GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check);
-
-
-
-	/*the terminal*/
-	struct _tag_terminal *term;
-	/*service url*/
-	char *url;
-	/*service mime type*/
-	char *mime;
-	/*od_manager owning service, NULL for services created for remote channels*/
-	struct _od_manager *owner;
-	/*number of attached remote channels ODM (ESD URLs)*/
-	u32 nb_ch_users;
-	/*number of attached remote ODM (OD URLs)*/
-	u32 nb_odm_users;
-	//original serviceID in case remote OD created the service
-	u32 serviceID;
-
-	/*clock objects. Kept at service level since ESID namespace is the service one*/
-	GF_List *Clocks;
-	/*all downloaders objects used in this service*/
-	GF_List *dnloads;
-	/*cache asscoiated with service, if any*/
-	GF_StreamingCache *cache;
-
-	/*quick hack for avoiding double session creation*/
-	GF_DownloadSession *pending_service_session;
-
-	Bool is_paused;
-	//used when term_set_speed is called before
-	Fixed set_speed;
-
-	/*used by DASH until we rewrite the input module API:
-	if set to 1 during a disconnect() call, the root scene of the service and all sub-objects will be disconnected
-	if set to 2 during a disconnect() call, the call will be skiped
-	*/
-	u32 subservice_disconnect;
-};
-
-
-/*opens service - performs URL concatenation if parent service specified*/
-GF_ClientService *gf_term_service_new(GF_Terminal *term, GF_ObjectManager *owner, const char *url, const char *parent_url, GF_Err *ret_code);
-/*destroy service*/
-void gf_term_service_del(GF_ClientService *nets);
-
-/*access to the module interfaces - cf net_api.h GF_InputService for details*/
-GF_Err gf_term_service_command(GF_ClientService *ns, GF_NetworkCommand *com);
-Bool gf_term_service_can_handle_url(GF_ClientService *ns, char *url);
-
-GF_Err gf_term_channel_get_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *is_compressed, GF_Err *out_reception_status, Bool *is_new_data);
-GF_Err gf_term_channel_release_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel);
-
-/*cache open/close*/
-GF_Err gf_term_service_cache_load(GF_ClientService *ns);
-GF_Err gf_term_service_cache_close(GF_ClientService *ns, Bool no_save);
-
-/*forwards all clocks of the given amount of time. Can only be used when terminal is in paused mode
-this is mainly designed for movie dumping in MP4Client*/
-GF_Err gf_term_step_clocks(GF_Terminal * term, u32 ms_diff);
-
-u32 gf_term_sample_clocks(GF_Terminal *term);
-
-u32 gf_term_check_end_of_scene(GF_Terminal *term, Bool skip_interactions);
-
-/*
-		GF_Scene object. This is the structure handling all scene management, mainly:
-			- list of resources (media objects) used
-			- scene time management
-			- reload/seek
-			- Dynamic scene (without a scene description)*
-		Each scene registers itself as the private data of its associated scene graph.
-
-		The scene object is also used by Inline nodes and all media resources of type "scene", eg <foreignObject>, <animation>
-*/
-struct _scene
-{
-	/*root OD of the subscene, ALWAYS namespace of the parent scene*/
-	struct _od_manager *root_od;
-	/*scene codec: top level decoder decoding/generating the scene - can be BIFS, VRML parser, etc*/
-	struct _generic_codec *scene_codec;
-	/*OD codec - specific to MPEG-4*/
-	struct _generic_codec *od_codec;
-
-	GF_Mutex *mx_resources;
-	/*all sub resources of this scene (eg, list of GF_ObjectManager), namespace of this scene. This includes
-	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.
-	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;
-
-	/*list of extra scene graphs (text streams, generic OSDs, ...)*/
-	GF_List *extra_scenes;
-	/*scene graph*/
-	GF_SceneGraph *graph;
-	/*graph state - if not attached, no traversing of inline
-	0: not attached
-	1: attached
-	2: temp graph attached. The temp graph is generated when waiting for the first scene AU to be processed
-	*/
-	u32 graph_attached;
-
-	//indicates a valid object is attached to the scene
-	Bool object_attached;
-	
-	/*set to 1 when single time-line presentation with only static resources (ONE OD AU is detected or no media removal/adding possible)
-	This allows preventing OD/BIFS streams shutdown/startup when seeking.*/
-	Bool static_media_ressources;
-
-	/*set to 1 to force all sub-resources to share the timeline of this scene*/
-	Bool force_single_timeline;
-
-	/*set to 1 once the forced size has been sez*/
-	Bool force_size_set;
-
-	/*callback to call to dispatch SVG MediaEvent - this is a pointer to function only because of linking issues
-	with static libgpac (avoids depending on SpiderMonkey and OpenGL32 if not needed)*/
-	void (*on_media_event)(GF_Scene *scene, u32 type);
-
-	/*duration of inline scene*/
-	u64 duration;
-
-	/*max timeshift of all objects*/
-	u32 timeshift_depth;
-
-	/*WorldInfo node or <title> node*/
-	void *world_info;
-
-	/*current IRI fragment if any*/
-	char *fragment_uri;
-
-	/*secondary resource scene - this is specific to SVG: a secondary resource scene is <use> or <fonturi>, and all resources
-	identified in a secondary resource must be checked for existence and created in the primary resource*/
-	Bool secondary_resource;
-
-	/*needed by some apps in GPAC which manipulate the scene tree in different locations as the resources*/
-	char *redirect_xml_base;
-
-
-	/*FIXME - Dynamic scenes are only supported through VRML/BIFS nodes, we should add support for SVG scene graph
-	generation if needed*/
-	Bool is_dynamic_scene;
-	/*for MPEG-2 TS, indicates the current serviceID played from mux*/
-	u32 selected_service_id;
-	/*clock for dynamic scene - current assumption is that all selected streams are synchronized in the dyn scene*/
-	GF_Clock *dyn_ck;
-	/*URLs of current video, audio and subs (we can't store objects since they may be destroyed when seeking)*/
-	SFURL visual_url, audio_url, text_url, dims_url;
-
-	Bool is_tiled_srd;
-	u32 srd_type;
-	s32 srd_min_x, srd_max_x, srd_min_y, srd_max_y;
-	//ambisonic type of the scene
-	u32 ambisonic_type;
-
-
-	Bool end_of_scene;
-#ifndef GPAC_DISABLE_VRML
-	/*list of externproto libraries*/
-	GF_List *extern_protos;
-
-	/*togles inline restart - needed because the restart may be triggered from inside the scene or from
-	parent scene, hence 2 render passes must be used
-	special value 2 means scene URL changes (for anchor navigation*/
-	u32 needs_restart;
-
-	/*URL of the current parent Inline node, only set during traversal*/
-	MFURL *current_url;
-
-
-	/*list of M_Storage nodes active*/
-	GF_List *storages;
-
-	/*list of M_KeyNavigator nodes*/
-	GF_List *keynavigators;
-#endif
-
-	Bool disable_hitcoord_notif;
-
-	u32 addon_position, addon_size_factor;
-
-	GF_List *declared_addons;
-	//set when content is replaced by an addon (DASH PVR mode)
-	Bool main_addon_selected;
-	u32 sys_clock_at_main_activation, obj_clock_at_main_activation;
-
-	//0: no pause - 1: paused and trigger pause command to net, 2: only clocks are paused but commands not sent
-	u32 first_frame_pause_type;
-	u32 vr_type;
-
-	Bool has_splicing_addons;
-};
-
-GF_Scene *gf_scene_new(GF_Scene *parentScene);
-void gf_scene_del(GF_Scene *scene);
-struct _od_manager *gf_scene_find_odm(GF_Scene *scene, u16 OD_ID);
-void gf_scene_disconnect(GF_Scene *scene, Bool for_shutdown);
-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_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);
-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);
-/*updates scene timeshift based on sub objects*/
-void gf_scene_set_timeshift_depth(GF_Scene *scene);
-/*locate media object by ODID (non dynamic ODs) or URL (dynamic ODs)*/
-struct _mediaobj *gf_scene_find_object(GF_Scene *scene, u16 ODID, char *url);
-/*returns scene time in sec - exact meaning of time depends on standard used*/
-Double gf_scene_get_time(void *_is);
-/*register extra scene graph for on-screen display*/
-void gf_scene_register_extra_graph(GF_Scene *scene, GF_SceneGraph *extra_scene, Bool do_remove);
-/*forces scene size info (without changing pixel metrics) - this may be needed by modules using extra graphs (like timedtext)*/
-void gf_scene_force_size(GF_Scene *scene, u32 width, u32 height);
-/*regenerate a scene graph based on available objects - can only be called for dynamic OD streams*/
-void gf_scene_regenerate(GF_Scene *scene);
-/*selects given ODM for dynamic scenes*/
-void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm);
-/*restarts dynamic scene from given time: scene graph is not reseted, objects are just restarted
-instead of closed and reopened. If a media control is present on inline, from_time is overriden by MC range*/
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check);
-
-/*exported for compositor: handles filtering of "self" parameter indicating anchor only acts on container inline scene
-not root one. Returns 1 if handled (cf user.h, navigate event)*/
-Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt);
-void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo);
-
-//check clock status.
-//If @check_buffering is 0, returns 1 if all clocks have seen eos, 0 otherwise
-//If @check_buffering is 1, returns 1 if no clock is buffering, 0 otheriwse
-Bool gf_scene_check_clocks(GF_ClientService *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_mpeg4_inline_restart(GF_Scene *scene);
-void gf_scene_mpeg4_inline_check_restart(GF_Scene *scene);
-
-
-GF_Node *gf_scene_get_subscene_root(GF_Node *inline_node);
-
-void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time);
-void gf_scene_reset_addons(GF_Scene *scene);
-void gf_scene_reset_addon(GF_AddonMedia *addon, Bool disconnect);
-
-#ifndef GPAC_DISABLE_VRML
-
-/*extern proto fetcher*/
-typedef struct
-{
-	MFURL *url;
-	GF_MediaObject *mo;
-} GF_ProtoLink;
-
-/*returns true if the given node DEF name is the url target view (eg blabla#myview)*/
-Bool gf_inline_is_default_viewpoint(GF_Node *node);
-
-GF_SceneGraph *gf_inline_get_proto_lib(void *_is, MFURL *lib_url);
-Bool gf_inline_is_protolib_object(GF_Scene *scene, GF_ObjectManager *odm);
-
-/*restarts inline scene - care has to be taken not to remove the scene while it is traversed*/
-void gf_inline_restart(GF_Scene *scene);
-
-#endif
-
-/*compares object URL with another URL - ONLY USE THIS WITH DYNAMIC ODs*/
-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);
-
-
-const char *gf_scene_get_fragment_uri(GF_Node *node);
-void gf_scene_set_fragment_uri(GF_Node *node, const char *uri);
-
-enum
-{
-	/*threading up to decoder*/
-	GF_TERM_THREAD_FREE,
-	/*single thread for all decoders*/
-	GF_TERM_THREAD_SINGLE,
-	/*all media (image, video, audio) decoders are threaded*/
-	GF_TERM_THREAD_MULTI,
-};
-
-enum
-{
-	GF_TERM_RUNNING = 1<<20,
-	GF_TERM_DEAD = 1<<21,
-	GF_TERM_SINGLE_THREAD = 1<<22,
-	GF_TERM_MULTI_THREAD = 1<<23,
-	GF_TERM_DROP_LATE_FRAMES = 1<<24,
-	GF_TERM_SINGLE_CLOCK = 1<<25
-};
-
-/*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
-};
-
-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;
-
-
-struct _tag_terminal
-{
-	u32 flags;
-
-	/*callback to user application*/
-	GF_User *user;
-	/*scene compositor*/
-	struct __tag_compositor *compositor;
-	/*file downloader*/
-	GF_DownloadManager *downloader;
-	/*top level scene*/
-	GF_Scene *root_scene;
-
-	/*Media manager*/
-	GF_List *codecs;
-	/*mutex for decoder access*/
-	GF_Mutex *mm_mx;
-	/*decoding thread*/
-	GF_Thread *mm_thread;
-	/*last codec used in mm loop*/
-	u32 last_codec;
-	/*thread priority*/
-	s32 priority;
-	u32 cumulated_priority;
-	/*frame duration*/
-	u32 frame_duration;
-
-	/*net services*/
-	GF_List *net_services;
-	/*net services to be destroyed*/
-	GF_List *net_services_to_remove;
-	/*connection tasks pending*/
-	GF_List *connection_tasks;
-	/*channels waiting for service CONNECT ack to be setup*/
-	GF_List *channels_pending;
-	/*media objects pending for stop/play*/
-	GF_List *media_queue;
-	/*media_queue lock*/
-	GF_Mutex *media_queue_mx;
-	/*network lock*/
-	GF_Mutex *net_mx;
-	/*all X3D key/mouse/string sensors*/
-	GF_List *x3d_sensors;
-	/*all input stream decoders*/
-	GF_List *input_streams;
-
-	/*options (cf config doc)*/
-	Bool enable_cache;
-	/*data timeout for network buffering in ms - if no data is received within this timeout
-	the initial buffering aborts. */
-	u32 net_data_timeout;
-
-	u32 play_state;
-
-	u32 reload_state;
-	char *reload_url;
-
-	/*special list used by nodes needing a call to RenderNode but not in the traverese scene graph (VRML/MPEG-4 protos only).
-	For these nodes, the traverse effect passed will be NULL. This is only used by InputSensor node at the moment*/
-	GF_List *nodes_pending;
-
-	/*root node of the user prefs*/
-	GF_SceneGraph *dcci_doc;
-
-	GF_List *extensions;	/*list of all extensions*/
-	GF_List *unthreaded_extensions;	/*list of extensions to call at each frame*/
-	GF_List *event_filters;	/*list of extensions filtering events*/
-	GF_Mutex *evt_mx;
-	u32 in_event_filter;
-
-	/*ID of the thread currently in handle_services routine, 0 if none*/
-	u32 thread_id_handling_services;
-
-	/*static URI relocator for locales*/
-	GF_TermLocales locales;
-
-	GF_List *uri_relocators;	/*list of GF_URIRelocator*/
-
-	GF_Shortcut shortcuts[MAX_SHORTCUTS];
-	Fixed speed_ratio;
-
-	/*bench mode type: 0-none 1: regular 2- systems layers only: all decoders inputs are discarded*/
-	u32 bench_mode;
-
-	u32 prefered_audio_codec_oti;
-
-	u32 low_latency_buffer_max;
-
-	u32 nb_calls_in_event_proc;
-	u32 disconnect_request_status;
-	
-	Bool orientation_sensors_active;
-	//set when compositor uses step mode, in order to drop frames even when the clock is paused
-	Bool use_step_mode;
-};
-
-
-
-GF_Err gf_term_init_scheduler(GF_Terminal *term, u32 threading_mode);
-void gf_term_stop_scheduler(GF_Terminal *term);
-void gf_term_add_codec(GF_Terminal *term, GF_Codec *codec);
-void gf_term_remove_codec(GF_Terminal *term, GF_Codec *codec);
-void gf_term_start_codec(GF_Codec *codec, Bool is_resume);
-/*stops codec, reason if
- -0: regular stop
- -1: pause
- -2: stop codec because end of stream : doesn't reset composition memory
- */
-void gf_term_stop_codec(GF_Codec *codec, u32 reason);
-void gf_term_set_threading(GF_Terminal *term, u32 mode);
-void gf_term_set_priority(GF_Terminal *term, s32 Priority);
-
-
-Bool gf_term_forward_event(GF_Terminal *term, GF_Event *evt, Bool consumed, Bool forward_only);
-
-/*error report function*/
-void gf_term_message(GF_Terminal *app, const char *service, const char *message, GF_Err error);
-/*posts a request to connect a given object*/
-void gf_term_post_connect_object(GF_Terminal *term, GF_ObjectManager *odm, char *serviceURL, char *parent_url);
-/*creates service for given channel / URL*/
-GF_Err gf_term_connect_remote_channel(GF_Terminal *app, GF_Channel *ch, char *URL);
-
-/*called by media manager to perform service maintenance:
-servive shutdown: this is needed because service handler may be asynchronous
-object Play: this is needed to properly handle multiplexed sources (all channels must be connected before play)
-service restart
-*/
-void gf_term_handle_services(GF_Terminal *app);
-/*close service and queue for delete*/
-void gf_term_close_service(GF_Terminal *app, GF_ClientService *service);
-
-/*locks media quaue*/
-void gf_term_lock_media_queue(GF_Terminal *app, Bool LockIt);
-/*locks net manager*/
-void gf_term_lock_net(GF_Terminal *app, Bool LockIt);
-
-/*checks no connection on the ODM are pending - of so, remove them*/
-void gf_term_check_connections_for_delete(GF_Terminal *term, GF_ObjectManager *odm);
-
-/*locks scene compositor*/
-void gf_term_lock_compositor(GF_Terminal *app, Bool LockIt);
-/*get scene compositor time - FIXME this is not flexible enough for SMIL/Multiple time containers*/
-u32 gf_term_get_time(GF_Terminal *term);
-/*forces scene composition*/
-void gf_term_invalidate_compositor(GF_Terminal *term);
-
-/*callbacks for scene graph library so that all related ESM nodes are properly instantiated*/
-void gf_term_node_callback(void *_is, u32 type, GF_Node *node, void *param);
-
-/*add/rem node requiring a call to render without being present in traversed graph (VRML/MPEG-4 protos).
-For these nodes, the traverse effect passed will be NULL.*/
-void gf_term_queue_node_traverse(GF_Terminal *term, GF_Node *node);
-void gf_term_unqueue_node_traverse(GF_Terminal *term, GF_Node *node);
-
-Bool gf_term_lock_codec(GF_Codec *codec, Bool lock, Bool try_lock);
-
-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);
-
-
-/*clock*/
-struct _object_clock
-{
-	u16 clockID;
-	GF_Terminal *term;
-	GF_Mutex *mx;
-	/*no_time_ctrl : set if ANY stream running on this clock has no time control capabilities - this avoids applying
-	mediaControl and others that would break stream dependencies*/
-	Bool use_ocr, clock_init, has_seen_eos, no_time_ctrl;
-	u32 init_time, StartTime, PauseTime, Paused;
-	/*the number of streams buffering on this clock*/
-	u32 Buffering;
-	/*associated media control if any*/
-	struct _media_control *mc;
-	/*for MC only (no FlexTime)*/
-	Fixed speed;
-	u32 discontinuity_time;
-	s32 drift;
-	u32 data_timeout;
-	Bool probe_ocr;
-	Bool broken_pcr;
-	u32 last_TS_rendered;
-	u32 service_id;
-
-	//media time in ms corresponding to the init tmiestamp of the clock
-	u32 media_time_at_init;
-	Bool has_media_time_shift;
-
-	u16 ocr_on_esid;
-
-	u64 ts_shift;
-};
-
-/*destroys clock*/
-void gf_clock_del(GF_Clock *ck);
-/*finds a clock by ID or by ES_ID*/
-GF_Clock *gf_clock_find(GF_List *Clocks, u16 clockID, u16 ES_ID);
-/*attach clock returns a new clock or the clock this stream (ES_ID) depends on (OCR_ES_ID)
-hasOCR indicates whether the stream being attached carries object clock references
-@clocks: list of clocks in ES namespace (service)
-@is: inline scene to solve clock dependencies
-*/
-GF_Clock *gf_clock_attach(GF_List *clocks, GF_Scene *scene, u16 OCR_ES_ID, u16 ES_ID, s32 hasOCR);
-/*reset clock (only called by channel owning clock)*/
-void gf_clock_reset(GF_Clock *ck);
-/*stops clock (only called for scene clock)*/
-void gf_clock_stop(GF_Clock *ck);
-/*return clock time in ms*/
-u32 gf_clock_time(GF_Clock *ck);
-/*return media time in ms*/
-u32 gf_clock_media_time(GF_Clock *ck);
-
-/*return time in ms since clock started - may be different from clock time when seeking or live*/
-u32 gf_clock_elapsed_time(GF_Clock *ck);
-
-/*sets clock time - FIXME: drift updates for OCRs*/
-void gf_clock_set_time(GF_Clock *ck, u32 TS);
-/*return clock time in ms without drift adjustment - used by audio objects only*/
-u32 gf_clock_real_time(GF_Clock *ck);
-/*pause the clock*/
-void gf_clock_pause(GF_Clock *ck);
-/*resume the clock*/
-void gf_clock_resume(GF_Clock *ck);
-/*returns true if clock started*/
-Bool gf_clock_is_started(GF_Clock *ck);
-/*toggles buffering on (clock is paused at the first stream buffering) */
-void gf_clock_buffer_on(GF_Clock *ck);
-/*toggles buffering off (clock is paused at the last stream restarting) */
-void gf_clock_buffer_off(GF_Clock *ck);
-/*set clock speed scaling factor*/
-void gf_clock_set_speed(GF_Clock *ck, Fixed speed);
-/*set clock drift - used to resync audio*/
-void gf_clock_adjust_drift(GF_Clock *ck, s32 ms_drift);
-
-enum
-{
-	/*channel is setup and waits for connection request*/
-	GF_ESM_ES_SETUP = 0,
-	/*waiting for server reply*/
-	GF_ESM_ES_WAIT_FOR_ACK,
-	/*connection OK*/
-	GF_ESM_ES_CONNECTED,
-	/*data exchange on this service/channel*/
-	GF_ESM_ES_RUNNING,
-	/*deconnection OK - a download channel can automatically disconnect when download is done*/
-	GF_ESM_ES_DISCONNECTED,
-	/*service/channel is not (no longer) available/found and should be removed*/
-	GF_ESM_ES_UNAVAILABLE
-};
-
-enum
-{
-	GF_ESM_CAROUSEL_NONE = 0,
-	GF_ESM_CAROUSEL_MPEG4,
-	GF_ESM_CAROUSEL_MPEG2,
-};
-
-/*data channel (elementary stream)*/
-struct _es_channel
-{
-	/*service this channel belongs to*/
-	GF_ClientService *service;
-	/*stream descriptor*/
-	GF_ESD *esd;
-	/*parent OD for this stream*/
-	struct _od_manager *odm;
-	u32 es_state;
-	Bool is_pulling;
-	u32 media_padding_bytes;
-	/*IO mutex*/
-	GF_Mutex *mx;
-	u32 AU_Count;
-	/*decoding buffers for push mode*/
-	struct _decoding_buffer * AU_buffer_first, * AU_buffer_last;
-	/*static decoding buffer for pull mode*/
-	struct _decoding_buffer * AU_buffer_pull;
-	char *pull_reaggregated_buffer;
-	/*channel buffer flag*/
-	Bool BufferOn;
-	/*min level to trigger buffering on, max to trigger it off for playback resume, and max amount of prefetch buffer*/
-	u32 MinBuffer, MaxBuffer, MaxBufferOccupancy;
-	/*amount of buffered media - this is the DTS of the last received AU minus the onject clock time, to make sure
-	we always have MaxBuffer ms ready for composition when resuming the clock*/
-	s32 BufferTime;
-	/*last received AU time - if exceeding a certain time and buffering is on, buffering is turned off.
-	This is needed for streams with very short duration (less than buffer time) and stream with only one AU (BIFS/OD)*/
-	u32 last_au_time;
-	/*Current reassembling buffer - currently packets are NOT reordered, only AUs are*/
-	char *buffer;
-	u32 len, allocSize;
-	/*only for last packet of an AU*/
-	u8 padingBits;
-	Bool IsEndOfStream;
-	/*	SL reassembler	*/
-	/*current AU TSs*/
-	u32 DTS, CTS;
-	/*special case for carousels in the past*/
-	u32 CTS_past_offset;
-	/*AU and Packet seq num info*/
-	u32 au_sn, pck_sn;
-	u32 max_au_sn, max_pck_sn;
-	/*the AU length indicated in the SL Header. */
-	u32 AULength;
-	/*state indicator: 0 OK, 1: not tuned in, 2: has error and needs RAP*/
-	u32 stream_state;
-	/*the AU in reception is RAP*/
-	Bool IsRap;
-	/*the AU in reception is only need for seeking*/
-	Bool SeekFlag;
-	/*signal that next AU is an AU start*/
-	Bool NextIsAUStart;
-	/*if codec resilient, packet drops are not considered as fatal for AU reconstruction (eg no wait for RAP)*/
-	u32 codec_resilient;
-	/*when starting a channel, the first AU is ALWAYS fetched when buffering - this forces
-	BIFS and OD to be decoded and first frame render, in order to detect media objects that would also need
-	buffering - note this doesn't affect the clock, it is still paused if buffering*/
-	Bool first_au_fetched;
-
-	/* used in Carousel, to skip packets until the end of AU */
-	u8 carousel_type;
-	Bool skip_carousel_au;
-
-	/*discard clock initialization when dispatching pending AU - this is used when TS discontinuities / MPA_TIME happen*/
-	Bool skip_time_check_for_pending;
-
-	/* TimeStamp to Media Time mapping*/
-	/*TS (in TSResolution) corresponding to the SeedTime of the decoder. Delivered by net, otherwise 0*/
-	u64 seed_ts;
-	/*media time offset corresponding to SeedTS. This is needed when the channel doesn't own the clock*/
-	u32 ts_offset;
-	/*scaling factors to remap to timestamps in milliseconds*/
-	u64 ts_res;
-	Double ocr_scale;
-	/*clock driving this stream - currently only CTS is supported (no OCR)*/
-	struct _object_clock *clock;
-	/*flag for clock init*/
-	Bool IsClockInit;
-	/*flag for clock init*/
-	Bool clock_inherited;
-	/*indicates that no DTS is signaled and that they should be recomputed if needed (video only)*/
-	Bool recompute_dts;
-	u32 min_ts_inc, min_computed_cts;
-
-	/*duration of last received AU if any, 0 if not known (most of the time)*/
-	u32 au_duration;
-	/*A channel with this flag set considers each incoming packet as a complete AU and assigns timestamps
-	upon reception matching the reception time, then dispatching it into the decoding buffer (only tested
-	with audi video). This flag is turned on by setting esd->slconfig->predefined to 'SLPredef_SkipSL' */
-	Bool skip_sl;
-
-	/*indicates that decoding can be called directly when receiving a complete AU on this channel
-	This is used by systems streams in non-seekable (eg broadcast/multicast, MPEG-2 TS multiplexes) to
-	make sure resources are setup as fast as possible. If the AU is too early, it will be kept in the
-	decoding buffer*/
-	Bool dispatch_after_db;
-
-	/*indicates that decoding is called directly when receiving a packet on this channel
-	This is used to bypass SL defragmenting and decoding buffer for EIT internal streams*/
-	Bool bypass_sl_and_db;
-
-	GF_IPMPTool *ipmp_tool;
-	Bool is_protected;
-
-	/*indicates that AU received will be copied to the composition memory*/
-	u32 is_raw_channel;
-
-	u32 resync_drift;
-	s32 prev_pcr_diff;
-	u64 last_pcr;
-
-	/*TSs as received from network - these are used for cache storage*/
-	u64 net_dts, net_cts, sender_ntp;
-
-	Bool last_au_was_seek;
-	Bool no_timestamps;
-
-	Bool pull_forced_buffer;
-
-	u64 ts_shift;
-};
-
-/*creates a new channel for this stream*/
-GF_Channel *gf_es_new(GF_ESD *esd);
-/*destroys channel*/
-void gf_es_del(GF_Channel *ch);
-/*(un)locks channel*/
-void gf_es_lock(GF_Channel *ch, u32 LockIt);
-/*setup channel for reception of data*/
-GF_Err gf_es_start(GF_Channel *ch);
-/*stop channel from receiving data*/
-GF_Err gf_es_stop(GF_Channel *ch);
-/*handles reception of an SL PDU*/
-void gf_es_receive_sl_packet(GF_ClientService *serv, GF_Channel *ch, char *StreamBuf, u32 StreamLength, GF_SLHeader *header, GF_Err reception_status);
-/*signals end of stream on the channel*/
-void gf_es_on_eos(GF_Channel *ch);
-/*fetches first AU available for decoding on this channel*/
-struct _decoding_buffer *gf_es_get_au(GF_Channel *ch);
-/*drops first AU on this channel*/
-void gf_es_drop_au(GF_Channel *ch);
-/*performs final setup upon connection confirm*/
-void gf_es_on_connect(GF_Channel *ch);
-/*reconfigure SL for this channel*/
-void gf_es_reconfig_sl(GF_Channel *ch, GF_SLConfig *slc, Bool use_m2ts_sections);
-/*hack for streaming: whenever a time map (media time <-> TS time) event is received on the channel reset decoding buffer
-this is needed because all server tested resend packets on already running channel*/
-void gf_es_reset_buffers(GF_Channel *ch);
-/*dummy channels are used by scene decoders which don't use ESM but load directly the scene graph themselves
-these channels are ALWAYS pulling ones, and this function will init the channel clock if needed*/
-void gf_es_init_dummy(GF_Channel *ch);
-/*setup DRM info*/
-void gf_es_config_drm(GF_Channel *ch, GF_NetComDRMConfig *isma_cryp);
-/*dispatch raw media AU to the composition buffer and BLOCKS until the AU is consumed by the decoder*/
-void gf_es_dispatch_raw_media_au(GF_Channel *ch, char *payload, u32 payload_size, u32 cts);
-/*returns true if this stream owns its clock, false if it simply refers to it*/
-Bool gf_es_owns_clock(GF_Channel *ch);
-/*reset all timestamps in decoder buffer to 0*/
-void gf_es_reset_timing(GF_Channel *ch, Bool reset_buffer);
-/*reset all timestamps in CB to 0*/
-void gf_cm_reset_timing(GF_CompositionMemory *cb);
-/*reset timing of all objects associated with this clock*/
-void gf_clock_discontinuity(GF_Clock *ck, GF_Scene *scene, Bool is_pcr_discontinuity);
-//turns on buffering on the stream
-void gf_es_buffer_on(GF_Channel *ch);
-//turns off buffering on the stream
-void gf_es_buffer_off(GF_Channel *ch);
-//updates buffer info on the stream
-void gf_es_update_buffering(GF_Channel *ch, Bool update_info);
-
-/*
-		decoder stuff
-*/
-enum
-{
-	/*stop: the decoder is not playing*/
-	GF_ESM_CODEC_STOP	=	0,
-	/*stop: the decoder is playing*/
-	GF_ESM_CODEC_PLAY	=	1,
-	/*End Of Stream: when the base layer signals it's done, this triggers media-specific
-	handling of the CB.
-	For video, the output is kept alive, For audio, the output is reseted (don't want audio loop ;)*/
-	GF_ESM_CODEC_EOS	=	2,
-	/*pause: the decoder is stopped but the CB is kept intact
-	The decoder will be in PAUSE mode until its CB is full, and it will then move to STOP mode.
-	If no CB, this is equivalent to STOP mode*/
-	GF_ESM_CODEC_PAUSE	=	3,
-	/*Buffer: transition state: the decoder runs (fetch data/decode) but the clock
-	is not running (no composition). This is used for rebuffering channels (rtp...)*/
-	GF_ESM_CODEC_BUFFER =	4
-};
-
-enum
-{
-	GF_ESM_CODEC_HAS_UPSTREAM = 1,
-	/*the codec uses the interface from another codec (only used by private scene streams to handle
-	any intern sprite/animation streams)*/
-	GF_ESM_CODEC_IS_USE = 1<<1,
-	/*set for OD codec when static (ressources are declared in OD stream esd a la ISMA*/
-	GF_ESM_CODEC_IS_STATIC_OD = 1<<2,
-	/*set when codec is identified as RAW, meaning all AU comming from the network are directly
-	dispatched to the composition memory*/
-	GF_ESM_CODEC_IS_RAW_MEDIA = 1<<3,
-
-	/*set when input channels have very low buffering requirement, in which case the codec has to discard all possible late data*/
-	GF_ESM_CODEC_IS_LOW_LATENCY = 1<<4,
-};
-
-struct _generic_codec
-{
-	/*codec type (streamType and OTI from base layer)*/
-	u32 type, oti;
-	u32 flags;
-	/*decoder module interface */
-	GF_BaseDecoder *decio;
-
-	/*base process routine*/
-	GF_Err (*process)(GF_Codec *codec, u32 TimeAvailable);
-
-	GF_List *blacklisted;
-
-	/*composition memory for media streams*/
-	struct _composition_memory *CB;
-	/*input media channles*/
-	GF_List *inChannels;
-	/*a pointer to the OD that owns the decoder.*/
-	struct _od_manager *odm;
-	u32 Status;
-	Bool Muted;
-	struct _object_clock *ck;
-	/*priority of this media object. This is ALWAYS the base layer priority
-	PriorityBoost is set when the CB is under critical limit (for now only audio uses the feature)
-	and results in a bigger time slice for the codec. Only on/off value for now*/
-	u32 Priority, PriorityBoost;
-	/*last processed DTS - sanity check for scalability*/
-	u32 last_unit_dts;
-	/*last processed CTS on base layer - seeking detection*/
-	u32 last_unit_cts;
-	/*minimum non-0 CTS(k) - CTS(j) used to reconstruct CTS timing when codec handles reordering internally...*/
-	u32 min_au_duration;
-	/*recomputed CTS for next dispatch*/
-	u32 recomputed_cts;
-	Bool first_frame_dispatched, first_frame_processed;
-	/*SHA signature for the last processed unit. Only for images (Capacity==1)*/
-	u8 last_unit_signature[20];
-	/*in case the codec performs temporal re-ordering itself*/
-	Bool is_reordering;
-	/*codec will properly handle CTS adjustments*/
-	Bool trusted_cts;
-	u32 prev_au_size;
-	u32 bytes_per_sec;
-	Double fps;
-	u32 nb_dispatch_skipped;
-	Bool direct_vout, direct_frame_output;
-
-	/*statistics*/
-	u32 last_stat_start, cur_bit_size, stat_start;
-	u32 avg_bit_rate, max_bit_rate;
-	u32 nb_dec_frames, nb_iframes;
-	//decode times in us
-	u64 total_dec_time, total_iframes_time;
-	u32 max_dec_time, max_iframes_time;
-	u32 first_frame_time, last_frame_time;
-	Bool codec_reset;
-	/*number of frames dropped at the presentation*/
-	u32 nb_dropped;
-	/*we detect if the same image is sent again and again to the decoder (using last_unit_signature)*/
-	u32 nb_repeted_frames;
-	/*min frame duration based on DTS diff*/
-	u32 min_frame_dur;
-	/*speed at which the avg_dec_time was computed*/
-	Fixed check_speed;
-	//when set, only I-frames are decoded, one out of drop_modulo if not 0.
-	//If set to 2, all frames are discarded
-	u32 decode_only_rap;
-	u32 drop_modulo, drop_count;
-	u32 consecutive_late_frames, consecutive_ontime_frames;
-
-	/*for CTS reconstruction (channels not using SL): we cannot just update timing at each frame, not precise enough
-	since we use ms and not microsec TSs*/
-	u32 cur_audio_bytes, cur_video_frames;
-
-	/*signals that CB should be resized to this value once all units in CB has been consumed (codec config change)*/
-	u32 force_cb_resize;
-	u32 profile_level;
-	Bool hybrid_layered_coded;
-	Bool in_splice, coding_config_changed;
-};
-
-GF_Codec *gf_codec_new(GF_ObjectManager *odm, GF_ESD *base_layer, s32 PL, GF_Err *e);
-void gf_codec_del(GF_Codec *codec);
-GF_Err gf_codec_add_channel(GF_Codec *codec, GF_Channel *ch);
-/*returns TRUE if stream was present, false otherwise*/
-Bool gf_codec_remove_channel(GF_Codec *codec, GF_Channel *ch);
-GF_Err gf_codec_process(GF_Codec *codec, u32 TimeAvailable);
-GF_Err gf_codec_get_capability(GF_Codec *codec, GF_CodecCapability *cap);
-GF_Err gf_codec_set_capability(GF_Codec *codec, GF_CodecCapability cap);
-void gf_codec_set_status(GF_Codec *codec, u32 Status);
-/*returns a new codec using an existing loaded decoder - only used by private scene to handle != timelines, for
-instance when loading a BT with an animation stream*/
-GF_Codec *gf_codec_use_codec(GF_Codec *codec, GF_ObjectManager *odm);
-
-GF_Err gf_codec_resize_composition_buffer(GF_Codec *dec, u32 NewSize);
-GF_Err gf_codec_change_decoder(GF_Codec *codec, GF_ESD *for_esd, Bool do_blacklist);
-
-/*OD manager*/
-
-enum
-{
-	/*flag set if object cannot be time-controloed*/
-	GF_ODM_NO_TIME_CTRL = (1<<1),
-	/*flag set if subscene uses parent scene timeline*/
-	GF_ODM_INHERIT_TIMELINE = (1<<2),
-	/*flag set if object has been redirected*/
-	GF_ODM_REMOTE_OD = (1<<3),
-	/*flag set if object has profile indications*/
-	GF_ODM_HAS_PROFILES = (1<<4),
-	/*flag set if object governs profile of inline subscenes*/
-	GF_ODM_INLINE_PROFILES = (1<<5),
-	/*flag set if object declared by network service, not from OD stream*/
-	GF_ODM_NOT_IN_OD_STREAM = (1<<6),
-	/*flag set if object is an entry point of the network service*/
-	GF_ODM_SERVICE_ENTRY = (1<<7),
-
-	/*flag set if object has been started before any start request from the scene*/
-	GF_ODM_PREFETCH = (1<<8),
-
-	/*flag set if object has been deleted*/
-	GF_ODM_DESTROYED = (1<<9),
-	/*dynamic flags*/
-
-	/*flag set if associated subscene must be regenerated*/
-	GF_ODM_REGENERATE_SCENE = (1<<10),
-
-	/*flag set for first play request*/
-	GF_ODM_INITIAL_BROADCAST_PLAY = (1<<11),
-
-	/*flag set until ODM is setup*/
-	GF_ODM_NOT_SETUP = (1<<12),
-
-	/*flag set when ODM is setup*/
-	GF_ODM_PAUSED = (1<<13),
-
-	/*flag set when ODM is setup*/
-	GF_ODM_PAUSE_QUEUED = (1<<14),
-};
-
-enum
-{
-	GF_ODM_STATE_STOP,
-	GF_ODM_STATE_PLAY,
-	GF_ODM_STATE_IN_SETUP,
-	GF_ODM_STATE_BLOCKED,
-	GF_ODM_STATE_STOP_NO_NET,
-};
-
-enum
-{
-	GF_ODM_ACTION_PLAY,
-	GF_ODM_ACTION_STOP,
-	GF_ODM_ACTION_DELETE,
-	GF_ODM_ACTION_SCENE_DISCONNECT,
-	GF_ODM_ACTION_SCENE_RECONNECT,
-	GF_ODM_ACTION_SCENE_INLINE_RESTART,
-	GF_ODM_ACTION_SETUP
-};
-
-struct _od_manager
-{
-	/*pointer to terminal*/
-	struct _tag_terminal *term;
-	/*the service used by this ODM. If the service private data is this ODM, then the service was created for this ODM*/
-	GF_ClientService *net_service;
-	/*parent scene or NULL for root scene*/
-	GF_Scene *parentscene;
-	/*channels associated with this object (media channels, OCR, IPMP, OCI, etc)*/
-	GF_List *channels;
-	/*sub scene for inline or NULL */
-	GF_Scene *subscene;
-	/*object codec (media or BIFS for AnimationStream) attached if any*/
-	struct _generic_codec *codec;
-#ifndef GPAC_MINIMAL_ODF
-	/*OCI codec attached if any*/
-	struct _generic_codec *oci_codec;
-#endif
-	/*OCR codec attached if any*/
-	struct _generic_codec *ocr_codec;
-
-	/*MPEG-4 object descriptor*/
-	GF_ObjectDescriptor *OD;
-
-	/*exclusive access is required since rendering and media management don't always take place in the same thread*/
-	GF_Mutex *mx;
-
-	u32 flags;
-
-	/*PLs*/
-	u8 Audio_PL, Graphics_PL, OD_PL, Scene_PL, Visual_PL;
-
-	/*interface with scene rendering*/
-	struct _mediaobj *mo;
-
-	/*number of channels with connection not yet acknowledge*/
-	u32 pending_channels;
-	u32 state;
-	/* during playback: timing as evaluated by the composition memory or the scene codec - this is the timestamp + media time at clock init*/
-	u32 media_current_time;
-	/*full object duration 0 if unknown*/
-	u64 duration;
-	/*
-	upon start: media start time as requested by scene compositor (eg not media control)
-	set to -1 upon stop to postpone stop request
-	*/
-	u64 media_start_time;
-	s64 media_stop_time;
-
-	/*full object timeshift depth in ms, 0 if no timeshift, (u32) -1  is infinity */
-	u32 timeshift_depth;
-
-	u32 action_type;
-
-	Fixed set_speed;
-	Bool disable_buffer_at_next_play;
-
-//	u32 raw_media_frame_pending;
-	GF_Semaphore *raw_frame_sema;
-
-#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*/
-	GF_List *mc_stack;
-	/*the media sensor(s) attached to this object*/
-	GF_List *ms_stack;
-#endif
-
-	//only set on root OD of addon subscene, which gather all the hybrid resources
-	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;
-	//for a scalable ODM, this indicates the lower layer odm associated
-	struct _od_manager *lower_layer_odm;
-
-	//indicates channel order (1->N) if the object is a ambisonic channel
-	u32 ambi_ch_id;
-};
-
-GF_ObjectManager *gf_odm_new();
-void gf_odm_del(GF_ObjectManager *ODMan);
-void gf_odm_lock(GF_ObjectManager *odm, u32 LockIt);
-
-/*setup service entry point*/
-void gf_odm_setup_entry_point(GF_ObjectManager *odm, const char *sub_url);
-/*setup OD*/
-void gf_odm_setup_object(GF_ObjectManager *odm, GF_ClientService *parent_serv);
-/*disctonnect OD and removes it if desired (otherwise only STOP is propagated)*/
-void gf_odm_disconnect(GF_ObjectManager *odman, u32 do_remove);
-/*setup an ESD*/
-GF_Err gf_odm_setup_es(GF_ObjectManager *odm, GF_ESD *esd, GF_ClientService *service, GF_MediaObject *sync_ref);
-/*removes an ESD (this destroys associated channel if any)*/
-void gf_odm_remove_es(GF_ObjectManager *odm, u16 ES_ID);
-/*set stream duration - updates object duration accordingly*/
-void gf_odm_set_duration(GF_ObjectManager *odm, GF_Channel *, u64 stream_duration);
-
-/*set time shift buffer duration */
-void gf_odm_set_timeshift_depth(GF_ObjectManager *odm, GF_Channel *, u32 time_shift_ms);
-
-/*signals end of stream on channels*/
-void gf_odm_on_eos(GF_ObjectManager *odm, GF_Channel *);
-/*start Object streams and queue object for network PLAY
-media_queue_state: 0: object was not in media queue and must be queued
-                   1: object is already in media queue
-                   2: object shall not be queued bu started directly
-*/
-void gf_odm_start(GF_ObjectManager *odm, u32 media_queue_state);
-/*stop OD streams*/
-void gf_odm_stop(GF_ObjectManager *odm, Bool force_close);
-/*send PLAY request to network - needed to properly handle multiplexed inputs
-ONLY called by service handler (media manager thread)*/
-void gf_odm_play(GF_ObjectManager *odm);
-
-/*pause object (mediaControl use only)*/
-void gf_odm_pause(GF_ObjectManager *odm);
-/*resume object (mediaControl use only)*/
-void gf_odm_resume(GF_ObjectManager *odm);
-/*set object speed*/
-void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed, Bool adjust_clock_speed);
-/*returns the clock of the media stream (video, audio or bifs), NULL otherwise */
-struct _object_clock *gf_odm_get_media_clock(GF_ObjectManager *odm);
-/*adds segment descriptors targeted by the URL to the list and sort them - the input list must be empty*/
-void gf_odm_init_segments(GF_ObjectManager *odm, GF_List *list, MFURL *url);
-/*returns true if this OD depends on the given clock*/
-Bool gf_odm_shares_clock(GF_ObjectManager *odm, struct _object_clock *ock);
-
-GF_Segment *gf_odm_find_segment(GF_ObjectManager *odm, char *descName);
-/*locks ODM with destruction check - returns 0 if object manager is not attached to object*/
-Bool gf_odm_lock_mo(struct _mediaobj *mo);
-
-void gf_odm_signal_eos(GF_ObjectManager *odm);
-
-void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset);
-
-void gf_odm_setup_task(GF_ObjectManager *odm);
-
-/*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
-ObjectManagers. */
-struct _mediaobj
-{
-	/*type is as defined in constants.h # GF_MEDIA_OBJECT_* */
-	u32 type;
-	/*one of the above flags*/
-	u32 flags;
-
-
-	/* private to ESM*/
-
-	/*media object manager - private to the sync engine*/
-	struct _od_manager *odm;
-	/*OD ID of the object*/
-	u32 OD_ID;
-	/*OD URL for object not using MPEG4 OD urls*/
-	MFURL URLs;
-	/*session join*/
-	u32 num_open;
-	/*shared object restart handling*/
-	u32 num_to_restart, num_restart;
-	Fixed speed;
-
-	/*shared object info: if 0 a new frame will be checked, otherwise current is returned*/
-	u32 nb_fetch;
-	/*frame presentation time*/
-	u32 timestamp;
-	/*time in ms until next frame shall be presented*/
-	s32 ms_until_next;
-	s32 ms_until_pres;
-	/*data frame size*/
-	u32 framesize;
-	/*pointer to data frame */
-	char *frame;
-	/* Objects implementing the DOM Event Target interface
-	   used to dispatch HTML5 Media and Media Source Events */
-	GF_List *evt_targets;
-	/*pointer to the node responsible for the creation of this media object
-	ONLY used for scene media type (animationStreams)
-	Reset upon creation of the decoder.
-	*/
-	void *node_ptr;
-
-
-	/*currently valid properties of the object*/
-	u32 width, height, stride, pixel_ar, pixelformat;
-	Bool is_flipped;
-	u32 sample_rate, num_channels, bits_per_sample, channel_config;
-	u32 srd_x, srd_y, srd_w, srd_h, srd_full_w, srd_full_h;
-	
-	u32 quality_degradation_hint;
-	u32 nb_views;
-	u32 nb_layers;
-	u32 view_min_x, view_max_x, view_min_y, view_max_y;
-	GF_MediaDecoderFrame *media_frame;
-};
-
-GF_MediaObject *gf_mo_new();
-
-
-/*used for delayed channel setup*/
-typedef struct
-{
-	struct _generic_codec *dec;
-	struct _es_channel *ch;
-} GF_ChannelSetup;
-
-/*post-poned channel connect*/
-GF_Err gf_odm_post_es_setup(struct _es_channel *ch, struct _generic_codec *dec, GF_Err err);
-
-/*
-	special entry point: specify directly a service interface for service input
-*/
-void gf_term_attach_service(GF_Terminal *term, GF_InputService *service_hdl);
-
-
-/*media access events */
-void gf_term_service_media_event(GF_ObjectManager *odm, GF_EventType event_type);
-void gf_term_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec);
-
-/*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);
-
-void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_url);
-void gf_scene_generate_mosaic(GF_Scene *scene, char *url, char *parent_path);
-//sets pos and size of addon
-//	size is 1/2 height (0), 1/3 (1) or 1/4 (2)
-//	pos is bottom-left(0), top-left (1) bottom-right (2) or top-right (3)
-void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor);
-
-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);
-//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, u32 *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);
-/*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);
-
-
-//exported for gpac.js, resumes to main content
-void gf_scene_resume_live(GF_Scene *subscene);
-
-enum
-{
-	//addon to overlay
-	GF_ADDON_TYPE_ADDITIONAL = 0,
-	//main content duplicated for PVR purposes
-	GF_ADDON_TYPE_MAIN,
-	//scalable decoding - reassembly before the decoder(s)
-	GF_ADDON_TYPE_SCALABLE,
-	//multiview reconstruction - reassembly after the decoder(s)
-	GF_ADDON_TYPE_MULTIVIEW,
-	//addon used for temporary splicing
-	GF_ADDON_TYPE_SPLICED,
-};
-
-struct _gf_addon_media
-{
-	char *url;
-	GF_ObjectManager *root_od;
-	s32 timeline_id;
-	u32 is_splicing;
-	//in scene time
-	Double activation_time;
-
-	Bool enabled;
-	//object(s) have been started (PLAY command sent) - used to filter out AUs in scalabmle addons
-	Bool started;
-	Bool timeline_ready;
-
-	u32 media_timescale;
-	u64 media_timestamp;
-	u64 media_pts;
-
-	//in case we detect a loop, we store the value of the mediatime in the loop until we actually loop the content
-	u32 past_media_timescale;
-	u64 past_media_timestamp;
-	u64 past_media_pts, past_media_pts_scaled;
-	Bool loop_detected;
-
-	u32 addon_type;
-
-	Double splice_start, splice_end;
-	u32 is_over;
-	Bool splice_in_pts;
-	u32 nb_splicing;
-	Bool min_dts_set;
-	u64 splice_min_dts;
-};
-
-void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons);
-
-
-
-GF_Err gf_codec_process_private_media(GF_Codec *codec, u32 TimeAvailable);
-
-
-Bool gf_codec_is_scene_or_image(GF_Codec *codec);
-
-void gf_scene_set_service_id(GF_Scene *scene, u32 service_id);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*_GF_TERMINAL_DEV_H_*/
-
-

gpac-0.8.0.tar.gz/include/gpac/map.h Deleted

@@ -1,213 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jerome Gorin
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast-Debug@dashcast_build
- *
- *  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_MAP_H_
-#define _GF_MAP_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <map.h>
- *	\brief Hash Map.
- */
-
-/*!
- *	\addtogroup  map_grp Hash map
- *	\ingroup utils_grp
- *	\brief Hash Map
- *
- *	This section documents the map object of the GPAC framework
- *	\note The map use a random function for hashing. Collisions are resolved by using a GF_List on each slot.
- *	@{
- */
-
-#include <gpac/tools.h>
-
-
-/**
- * \struct GF_Map
- * \brief Map Object.
- *
- * A GF_Map associate key to values.
- */
-typedef struct _tag_map GF_Map;
-
-
-/* Pair structure */
-
-/**
- * \struct GF_Pair
- * \brief Pair structure.
- *
- * Define the association Key/value.
- */
-typedef struct {
-	char *key;
-	void *value;
-} GF_Pair;
-
-
-/**
- * \struct GF_Iterator
- * \brief Map iterator Object.
- *
- * Allows to go through each pair key/value in the map.
- */
-typedef struct _it_map {
-	/* The current map*/
-	GF_Map* map;
-
-	/* The current pair */
-	GF_Pair* pair;
-
-	/* The current list */
-	u32 ilist;
-
-	/* The current index in the hasmap*/
-	u32 hash;
-
-} GF_It_Map;
-
-/*!
- *	\brief map constructor
- *
- *	Constructs a new map object
- *
- *	\param hash_capacity the number of slot in the hash table
- *	\note a zero hash_capacity is not allowed, a hash_capacity of 1 is
- *	equivalent to a gf_list_find from GF_List with a complexity search in o(n)
- *	\return new map object
- */
-GF_Map *gf_map_new(u32 hash_capacity);
-
-/*!
- *	\brief map destructor
- *
- *	Destructs a map object
- *	\param ptr map object to destruct
- *	\note The caller is only responsible to destroy the content of the map, not the key
- */
-void gf_map_del(GF_Map *ptr);
-
-/*!
- *	\brief Set a new map iterator
- *
- *	Associate a map iterator to a map
- *
- *	\param map the map associated to the iterator
- *	\param it the resulting iterator
- *	\return GF_OK if iterator has been set properly, otherwise a GF_Err
- */
-GF_Err gf_map_iter_set(GF_Map* map, GF_It_Map* it);
-
-/*!
- *	\brief return the next value in the map
- *
- *	Return the next value of a GF_Pair in the map
- *	\param it  the map iterator object
- *  \return the next value of the map if exists, otherwise NULL
- */
-void* gf_map_iter_has_next(GF_It_Map* it);
-
-/*!
- *	\brief Reset the iterator in the map
- *
- *	Reinitalize the iterator to the beginning of the map
- *	\param it  the map iterator object
- *  \return GF_OK if the iterator has been correctly reinitialize, otherwise a GF_Err
- */
-GF_Err gf_map_iter_reset(GF_It_Map* it);
-
-/*!
- *	\brief get count
- *
- *	Returns number of items in the map
- *	\param ptr target map object
- *	\return number of items in the map
- */
-u32 gf_map_count(const GF_Map *ptr);
-
-/*!
- *	\brief add item
- *
- *	Adds an item in the map with an associated key
- *
- *	\param ptr target map object
- *	\param key the identified key
- *	\param item item to add
- *	\return GF_OF if insertion occurs properly, GF_NOT_SUPPORTED if the key already exists, a GF_Err in other cases
- *	\note the caller is responsible for the deallocation of the key as it is copyied in the map
- */
-GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item);
-
-/*!
- *	\brief removes the couple key/item from the map
- *
- *	Removes an item from the map given to its key if exists
- *	\param ptr target map object
- *	\param key the key of the item.
- *	\return GF_TRUE if the key has been delete, otherwise GF_FALSE
- *	\note It is the caller responsability to destroy the content of the list if needed
- */
-Bool gf_map_rem(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief finds item
- *
- *	Finds a key in the map
- *
- *	\param ptr target map object.
- *	\param key the key to find.
- *	\return a pointer to the corresponding value if found, otherwise NULL.
- */
-void* gf_map_find(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief Check if map contains key
- *
- *	\param ptr target map object.
- *	\param key the key to check.
- *	\return GF_TRUE if map contains keys, otherwise GF_FALSE
- */
-Bool gf_map_has_key(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief resets map
- *
- *	Resets the content of the map
- *	\param ptr target map object.
- *	\note It is the caller responsability to destroy the content of the list if needed
- */
-void gf_map_reset(GF_Map *ptr);
-
-
-/*! @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GF_MAP_H_ */

gpac-0.8.0.tar.gz/include/gpac/modules/js_usr.h Deleted

@@ -1,70 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / modules interfaces
- *
- *  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_MODULE_JS_USR_H_
-#define _GF_MODULE_JS_USR_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/module.h>
-#include <gpac/scenegraph.h>
-
-/*interface name and version for JavaScript User Extensions*/
-#define GF_JS_USER_EXT_INTERFACE		GF_4CC('G','J','S', '1')
-
-typedef struct _js_usr_ext GF_JSUserExtension;
-
-typedef struct JSContext GF_JSContext;
-typedef struct JSObject GF_JSObject;
-
-struct _js_usr_ext
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*load JS extension
-	 doc: scene graph in which the extension is loaded
-	 jsctx: JavaScript context in which the extension is loaded.
-		For BIFS/VRML/X3D, one context is created per script node
-		For other graphs, one context is created per scene/document
-	 global: JavaScript global object for the context
-	 unload: if true, the extension should be unloaded from the JavaScript context (called upon destroy). Otherwise it should be loaded
-	*/
-	void (*load)(GF_JSUserExtension *jsext, GF_SceneGraph *doc, GF_JSContext *jsctx, GF_JSObject *global, Bool unload);
-	/*module private*/
-	void *udta;
-};
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*#define _GF_MODULE_JS_USR_H_*/
-

gpac-0.8.0.tar.gz/include/gpac/modules/raster2d.h Deleted

@@ -1,262 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / modules interfaces
- *
- *  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_MODULE_RASTER2D_H_
-#define _GF_MODULE_RASTER2D_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/path2d.h>
-#include <gpac/module.h>
-#include <gpac/color.h>
-
-
-/*stencil types*/
-typedef enum
-{
-	/*solid color stencil*/
-	GF_STENCIL_SOLID = 0,
-	/*linear color gradient stencil*/
-	GF_STENCIL_LINEAR_GRADIENT,
-	/*radial color gradient stencil*/
-	GF_STENCIL_RADIAL_GRADIENT,
-	/*texture stencil*/
-	GF_STENCIL_VERTEX_GRADIENT,
-	/*texture stencil*/
-	GF_STENCIL_TEXTURE,
-} GF_StencilType;
-
-
-/*gradient filling modes*/
-typedef enum
-{
-	/*edge colors are repeated until path is filled*/
-	GF_GRADIENT_MODE_PAD,
-	/*pattern is inversed each time it's repeated*/
-	GF_GRADIENT_MODE_SPREAD,
-	/*pattern is repeated to fill path*/
-	GF_GRADIENT_MODE_REPEAT
-} GF_GradientMode;
-
-
-/*texture tiling flags*/
-typedef enum
-{
-	/*texture is repeated in its horizontal direction*/
-	GF_TEXTURE_REPEAT_S = (1<<1),
-	/*texture is repeated in its horizontal direction*/
-	GF_TEXTURE_REPEAT_T = (1<<2),
-	/*texture is fliped vertically*/
-	GF_TEXTURE_FLIP = (1<<3),
-} GF_TextureTiling;
-
-/*filter levels for texturing - up to the graphics engine but the following levels are used by
-the client*/
-typedef enum
-{
-	/*high speed mapping (ex, no filtering applied)*/
-	GF_TEXTURE_FILTER_HIGH_SPEED,
-	/*compromise between speed and quality (ex, filter to nearest pixel)*/
-	GF_TEXTURE_FILTER_MID,
-	/*high quality mapping (ex, bi-linear/bi-cubic interpolation)*/
-	GF_TEXTURE_FILTER_HIGH_QUALITY
-} GF_TextureFilter;
-
-/* rasterizer antialiasing depending on the graphics engine*/
-typedef enum
-{
-	/*raster shall use no antialiasing */
-	GF_RASTER_HIGH_SPEED,
-	/*raster should use fast mode and good quality if possible*/
-	GF_RASTER_MID,
-	/*raster should use full antialiasing*/
-	GF_RASTER_HIGH_QUALITY
-} GF_RasterLevel;
-
-
-/*user routines for raserizer. common syntaxes:
-	@cbk: user defined callback
-	@x, y: first pixel position of the run, in device memory (top-left) coordinates
-	@run_h_len: number of pixels to fill on line
-	@color: color to fill pixel with. USER MUST IGNORE THE ALPHA COMPONENT OF THIS COLOR, the final
-		alpha is computed by the lib
-	@alpha: blending amount (0->0xFF) for the pixels
-*/
-
-typedef void (*raster_cbk_fill_run_alpha) (void *, u32, u32, u32, GF_Color, u8);
-typedef void (*raster_cbk_fill_run_no_alpha) (void *, u32, u32, u32, GF_Color);
-typedef void (*raster_cbk_fill_rect)(void *cbk, u32 x, u32 y, u32 width, u32 height, GF_Color color);
-
-typedef struct
-{
-	void *cbk;
-	/*fills line pixels without any blending operation*/
-	raster_cbk_fill_run_no_alpha fill_run_no_alpha;
-	/* fills line pixels with blending operation - alpha combines both fill color and anti-aliasing blending */
-	raster_cbk_fill_run_alpha fill_run_alpha;
-	/*fills rectangle*/
-	raster_cbk_fill_rect fill_rect;
-} GF_RasterCallback;
-
-
-
-/*opaque handler for all stencils*/
-typedef void *GF_STENCIL;
-
-/*visual surface handler*/
-typedef void *GF_SURFACE;
-
-/*interface name and version for raster2D*/
-#define GF_RASTER_2D_INTERFACE		GF_4CC('G','R','2', '3')
-
-/*graphics driver*/
-typedef struct _raster2d_interface
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	GF_STENCIL (*stencil_new) (struct _raster2d_interface *, GF_StencilType type);
-	/*common destructor for all stencils*/
-	void (*stencil_delete) (GF_STENCIL _this);
-	/*set stencil transformation matrix*/
-	GF_Err (*stencil_set_matrix) (GF_STENCIL _this, GF_Matrix2D *mat);
-	/*solid brush - set brush color*/
-	GF_Err (*stencil_set_brush_color) (GF_STENCIL _this, GF_Color c);
-	/*gradient brushes*/
-	/*sets gradient repeat mode - return GF_NOT_SUPPORTED if driver doesn't support this to let the app compute repeat patterns
-	this may be called before the gradient is setup*/
-	GF_Err (*stencil_set_gradient_mode) (GF_STENCIL _this, GF_GradientMode mode);
-	/*set linear gradient.  line is defined by start and end, and you can give interpolation colors at specified positions*/
-	GF_Err (*stencil_set_linear_gradient) (GF_STENCIL _this, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y);
-	/*radial gradient brush center point, focal point and radius - colors can only be set through set_interpolation */
-	GF_Err (*stencil_set_radial_gradient) (GF_STENCIL _this, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius);
-	/*radial and linear gradient (not used with vertex) - set color interpolation at given points,
-		@pos[i]: distance from (center for radial, start for linear) expressed between 0 and 1 (1 being the gradient bounds)
-		@col[i]: associated color
-	NOTE 1: the colors at 0 and 1.0 MUST be provided
-	NOTE 2: colors shall be fed in order from 0 to 1
-	NOTE 3: this overrides the colors provided for linear gradient
-	*/
-	GF_Err (*stencil_set_gradient_interpolation) (GF_STENCIL _this, Fixed *pos, GF_Color *col, u32 count);
-
-	/*vertex gradient : set limit path */
-	GF_Err (*stencil_set_vertex_path) (GF_STENCIL _this, GF_Path *path);
-	/*set the center of the gradient*/
-	GF_Err (*stencil_set_vertex_center) (GF_STENCIL _this, Fixed cx, Fixed cy, u32 color);
-	/*set the center of the gradient*/
-	GF_Err (*stencil_set_vertex_colors) (GF_STENCIL _this, u32 *colors, u32 nbCol);
-
-	/*sets global alpha blending level for stencil (texture and gradients)
-	the alpha channel shall be combined with the color matrix if any*/
-	GF_Err (*stencil_set_alpha) (GF_STENCIL _this, u8 alpha);
-
-	/*set stencil texture
-		@pixels: texture data, from top to bottom
-		@width, @height: texture size
-		@stride: texture horizontal pitch (bytes to skip to get to next row)
-		@pixelFormat: texture pixel format as defined in file constants.h
-		@destination_format_hint: this is the current pixel format of the destination surface, and is given
-		as a hint in case the texture needs to be converted by the stencil
-		@no_copy: if set, specifies the texture data shall not be cached by the module (eg it must be able
-		to directly modify the given memory
-	NOTE: this stencil acts as a data wrapper, the pixel data is not required to be locally copied
-	data is not required to be available for texturing until the stencil is used in a draw operation
-	*/
-	GF_Err (*stencil_set_texture) (GF_STENCIL _this, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy);
-	/*signals the texture has been modified (internal texture only)*/
-	void (*stencil_texture_modified) (GF_STENCIL _this);
-
-	/*sets texture tile mode*/
-	GF_Err (*stencil_set_tiling) (GF_STENCIL _this, GF_TextureTiling mode);
-	/*sets texture filtering mode*/
-	GF_Err (*stencil_set_filter) (GF_STENCIL _this, GF_TextureFilter filter_mode);
-	/*set stencil color matrix - texture stencils only. If matrix is NULL, resets current color matrix*/
-	GF_Err (*stencil_set_color_matrix) (GF_STENCIL _this, GF_ColorMatrix *cmat);
-
-	/*creates surface object*/
-	/* @center_coords: true indicates mathematical-like coord system,
-					   false indicates computer-like coord system */
-	GF_SURFACE (*surface_new) (struct _raster2d_interface *, Bool center_coords);
-	/* delete surface object */
-	void (*surface_delete) (GF_SURFACE _this);
-
-	/* attach surface object to device object (Win32: HDC) width and height are target surface size*/
-	GF_Err (*surface_attach_to_device) (GF_SURFACE _this, void *os_handle, u32 width, u32 height);
-	/* attach surface object to stencil object*/
-	GF_Err (*surface_attach_to_texture) (GF_SURFACE _this, GF_STENCIL sten);
-	/* attach surface object to memory buffer if supported
-		@pixels: texture data
-		@width, @height: texture size
-		@pitch_x: texture horizontal pitch (bytes to skip to get to next pixel). O means linear frame buffer (eg pitch_x==bytes per pixel)
-		@pitch_y: texture vertical pitch (bytes to skip to get to next line)
-		@pixelFormat: texture pixel format
-	*/
-	GF_Err (*surface_attach_to_buffer) (GF_SURFACE _this, char *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat);
-
-	GF_Err (*surface_attach_to_callbacks) (GF_SURFACE _this, GF_RasterCallback *callbacks, u32 width, u32 height);
-
-	/* detach surface object */
-	void (*surface_detach) (GF_SURFACE _this);
-
-	/*sets rasterizer precision */
-	GF_Err (*surface_set_raster_level) (GF_SURFACE _this, GF_RasterLevel RasterSetting);
-	/* set the given matrix as the current transformations for all drawn paths
-	if NULL reset the current transformation */
-	GF_Err (*surface_set_matrix) (GF_SURFACE _this, GF_Matrix2D *mat);
-	/* set the given rectangle as a clipper - nothing will be drawn outside this clipper
-	if the clipper is NULL then no clipper is set
-	NB: the clipper is not affected by the surface matrix and is given in pixels
-	CF ABOVE NOTE ON CLIPPERS*/
-	GF_Err (*surface_set_clipper) (GF_SURFACE _this, GF_IRect *rc);
-
-	/*sets the given path as the current one for drawing - the surface transform is NEVER changed between
-	setting the path and filling, only the clipper may change*/
-	GF_Err (*surface_set_path) (GF_SURFACE _this, GF_Path *path);
-	/*fills the current path using the given stencil - can be called several times with the same current path*/
-	GF_Err (*surface_fill) (GF_SURFACE _this, GF_STENCIL stencil);
-
-	/*flushes to surface*/
-	GF_Err (*surface_flush) (GF_SURFACE _this);
-
-	/*clears given pixel rect on the surface with the given color - REQUIRED
-	the given rect is formatted as a clipper - CF ABOVE NOTE ON CLIPPERS*/
-	GF_Err (*surface_clear)(GF_SURFACE _this, GF_IRect *rc, GF_Color col);
-
-	/*private:*/
-	void *internal;
-} GF_Raster2D;
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*_GF_MODULE_RASTER2D_H_*/
-

gpac-0.8.0.tar.gz/include/gpac/modules/service.h Deleted

@@ -1,849 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / modules interfaces
- *
- *  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_SERVICE_H_
-#define _GF_SERVICE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*for SL, ESD and OD*/
-#include <gpac/mpeg4_odf.h>
-#include <gpac/events.h>
-#include <gpac/download.h>
-#include <gpac/module.h>
-
-/*handle to service*/
-typedef struct _net_service GF_ClientService;
-
-/*handle to channel*/
-typedef void *LPNETCHANNEL;
-
-typedef enum
-{
-	/*channel control, app->module. Note that most modules don't need to handle pause/resume/set_speed*/
-	GF_NET_CHAN_PLAY,
-	GF_NET_CHAN_STOP,
-
-	/* pause channel (can be sent from service to terminal send from a pull-mode module to indicate buffer on/off) */
-	GF_NET_CHAN_PAUSE,
-	GF_NET_CHAN_RESUME,
-	GF_NET_CHAN_SET_SPEED,
-	/*channel configuration, app->module*/
-	GF_NET_CHAN_CONFIG,
-	/*channel duration, app<->module (in case duration is not known at setup)*/
-	GF_NET_CHAN_DURATION,
-	/*queries channel buffer min/max, app->module. Default values are passed and can be overriden by the module.
-	PULL channels will get this command but buffering has to be handled by the service*/
-	GF_NET_CHAN_BUFFER,
-	/*channel buffer query, app<-module*/
-	GF_NET_CHAN_BUFFER_QUERY,
-	/*retrieves DSI from channel (DSI may be caried by net with a != value than OD), app->module*/
-	GF_NET_CHAN_GET_DSI,
-	/*set media padding for all AUs fetched (pull mode only).
-	If not supported the channel will have to run in push mode. app->module*/
-	GF_NET_CHAN_SET_PADDING,
-	/*sets input channel to pull mode if possible, app->module*/
-	GF_NET_CHAN_SET_PULL,
-	/*query channel capability to pause/resume and seek(play from an arbitrary range)
-	a non-interactive channel doesn't have to handle SET_SPEED, PAUSE and RESUME commands but can
-	still work in pull mode*/
-	GF_NET_CHAN_INTERACTIVE,
-	/*map net time (OTB) to media time (up only) - this is needed by some signaling protocols when the
-	real play range is not the requested one */
-	GF_NET_CHAN_MAP_TIME,
-	/*same as map time, but does not trigger realignment of timestamps in the terminal - only used to solve TS->OTB for display purposes*/
-	GF_NET_CHAN_SET_MEDIA_TIME,
-	/*reconfiguration of channel comming from network (up only) - this is used to override the SL config
-	if it differs from the one specified at config*/
-	GF_NET_CHAN_RECONFIG,
-	/*signal channel is ISMACryp'ted (net->term only)*/
-	GF_NET_CHAN_DRM_CFG,
-
-	/*reset channel - this is need when we turn off this channel in rtp/mpeg2ts*/
-	GF_NET_CHAN_RESET,
-
-	/*retrieves ESD for channel - net->term only, for cache configuration*/
-	GF_NET_CHAN_GET_ESD,
-	/*retrieves visual PAR as indicated in container if any*/
-	GF_NET_CHAN_GET_PIXEL_AR,
-	/*retrieves visual SRD as indicated in container if any*/
-	GF_NET_CHAN_GET_SRD,
-
-	/*service buffer query (for all channels running in service), app<-module*/
-	GF_NET_BUFFER_QUERY,
-	/*retrieves network stats for service/channel; app->module*/
-	GF_NET_GET_STATS,
-	/*retrieves whether service can be cached (rtp, http streaming radios, etc) or not. No associated struct*/
-	GF_NET_IS_CACHABLE,
-
-	/*sets info for service - net->term only*/
-	GF_NET_SERVICE_INFO,
-	/*checks if there is an audio stream in the service - term->net only*/
-	GF_NET_SERVICE_HAS_AUDIO,
-	/*checks if the service can support reverse playback (speed<0) - term->service only*/
-	GF_NET_SERVICE_CAN_REVERSE_PLAYBACK,
-
-	/*checks if there is a forced video size  - if yes, info is stored in GF_NetComPixelAR - term->net only*/
-	GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE,
-	/*instructs the service to get the migration info - term->net only*/
-	GF_NET_SERVICE_MIGRATION_INFO,
-
-	/*switches quality up or down or a given ID*/
-	GF_NET_SERVICE_QUALITY_SWITCH,
-
-	/*queries quality in the service*/
-	GF_NET_SERVICE_QUALITY_QUERY,
-
-	/*When using DASH or playlists, query the next file to concatenate to thecurrent one net->proxy only*/
-	GF_NET_SERVICE_QUERY_NEXT,
-	/*When using DASH, query the media range of the url passed in ConnectService - this is only used for local
-	playback/validation of DASH sequences*/
-	GF_NET_SERVICE_QUERY_INIT_RANGE,
-	/* When using proxy between an input module and the terminal, exchange status using this command: input -> proxy */
-	GF_NET_SERVICE_STATUS_PROXY,
-
-	/*When using DASH or playlists, indicates that DATA (chunk or complete file ) has been received by the playlist proxy*/
-	GF_NET_SERVICE_PROXY_DATA_RECEIVE,
-
-	/*query screen capabilities*/
-	GF_NET_SERVICE_MEDIA_CAP_QUERY,
-
-	/*signal an associated content is announced (from service to term). This does not have to be filtered by the service
-	the terminal will handle this.*/
-	GF_NET_ASSOCIATED_CONTENT_LOCATION,
-	/*signal associated content timeline (from service to term)*/
-	GF_NET_ASSOCIATED_CONTENT_TIMING,
-
-	/*event send from service*/
-	GF_NET_SERVICE_EVENT,
-	//sets nalu mode
-	GF_NET_CHAN_NALU_MODE,
-
-	/*indicates visible part of the visual object associated with the channel*/
-	GF_NET_CHAN_VISIBILITY_HINT,
-	/*request current position in TSB - 0 means 'at the live point'*/
-	GF_NET_GET_TIMESHIFT,
-
-	/*seek request from service on all channels*/
-	GF_NET_SERVICE_SEEK,
-
-	/*query codec statistic on all channels*/
-	GF_NET_SERVICE_CODEC_STAT_QUERY,
-	/* Used in DASH: submodules can query the DASH module for the computed UTC delay between client and server */
-	GF_NET_SERVICE_QUERY_UTC_DELAY,
-} GF_NET_CHAN_CMD;
-
-/*channel command for all commands that don't need params:
-GF_NET_CHAN_SET_PULL: module shall return GF_OK or GF_NOT_SUPPORTED
-GF_NET_CHAN_INTERACTIVE: module shall return GF_OK or GF_NOT_SUPPORTED
-*/
-typedef struct
-{
-	/*command type*/
-	u32 command_type;
-	/*channel*/
-	LPNETCHANNEL on_channel;
-} GF_NetComBase;
-
-/*GF_NET_CHAN_PLAY, GF_NET_CHAN_SET_SPEED*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	/*params for GF_NET_CHAN_PLAY, ranges in sec - if range is <0, then it is ignored (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*/
-	Double speed;
-	Bool dash_segment_switch;
-	/*indicates this is the first PLAY on an elemnt inserted from bcast*/
-	Bool initial_broadcast_play;
-	/*
-		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)
-	*/
-	u32 timestamp_based;
-} GF_NetComPlay;
-
-
-/*GF_NET_CHAN_CONFIG, GF_NET_CHAN_RECONFIG
-channel config may happen as soon as the channel is open, even if the module hasn't acknowledge creation
-channel config can also be used from network to app, with GF_NET_CHAN_RECONFIG type - only the SL config is then used
-*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-
-	/*SL config of the stream as delivered in OD (app->channel) or by network (channel->app)*/
-	GF_SLConfig sl_config;
-	/*stream priority packet drops are more tolerable if low priority - app->channel only*/
-	u32 priority;
-	/*sync ID: all channels with the same sync ID run on the same timeline, thus the module should
-	try to match this - note this may not be possible (typically RTP/RTSP)*/
-	u32 sync_id;
-	/*audio frame duration and sample rate if any - this is needed by some RTP payload*/
-	u32 frame_duration, sample_rate;
-	/*do we use MPEG-2 section for SL packets ? this field is not coded*/
-	Bool use_m2ts_sections;
-} GF_NetComConfig;
-
-/*GF_NET_CHAN_BUFFER, GF_NET_CHAN_BUFFER_QUERY*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	/*the recommended buffering limits in ms - this depends on the modules preferences and on the service
-	type (multicast, vod, ...) - below buffer_min the stream will pause if possible until buffer_max is reached
-	note the app will fill in default values before querying*/
-	u32 min, max;
-	/*only used with GF_NET_CHAN_BUFFER_QUERY and GF_NET_BUFFER_QUERY- amount of media in decoding buffer, in ms. This value is adjusted by the current playback speed, eg if playing at 2x the occupancy is (media time in buffers) / 2 */
-	u32 occupancy;
-	/*set to GF_TRUE if a channel is buffering for the required service*/
-	Bool buffering;
-} GF_NetComBuffer;
-
-/*GF_NET_CHAN_DURATION*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	/*duration in sec*/
-	Double duration;
-	/*time shift buffer depth in ms, (u32) -1 is infinity*/
-	u32 time_shift_buffer;
-} GF_NetComDuration;
-
-/*GF_NET_CHAN_GET_DSI*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	/*carries specific info for codec - data shall be allocated by service and is freed by user*/
-	char *dsi;
-	u32 dsi_len;
-} GF_NetComGetDSI;
-
-/*GF_NET_CHAN_SET_PADDING*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	u32 padding_bytes;
-} GF_NetComPadding;
-
-/*GF_NET_GET_TIMESHIFT*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	//time in sec in the timeshift buffer - 0 means live point
-	Double time;
-} GF_NetComTimeShift;
-
-
-
-/*GF_NET_SERVICE_PROXY_DATA_RECEIVE*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	Bool is_chunk;
-	Bool is_live;
-} GF_NetComProxyData;
-
-/*GF_NET_CHAN_MAP_TIME*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	/*MediaTime at this timestamp*/
-	Double media_time;
-	/*TS where mapping is done (in SL TS resolution)*/
-	u64 timestamp;
-	/*specifies whether decoder input data shall be discarded or only have its timing updated*/
-	Bool reset_buffers;
-} GF_NetComMapTime;
-
-
-typedef struct
-{
-	bin128 SystemID;
-	u32 KID_count;
-	bin128 *KIDs;
-	u32 private_data_size;
-	u8 *private_data;
-} GF_NetComDRMConfigPSSH;
-
-/*GF_NET_CHAN_ISMACRYP_CFG*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-
-
-	/*per channel, regardless of DRM schemes (ISMA, OMA, )*/
-	u32 scheme_version;
-	u32 scheme_type;
-	const char *scheme_uri;
-	const char *kms_uri;
-	/*OMA DRM info*/
-	const char *contentID;
-	u32 oma_drm_crypt_type;
-	Bool oma_drm_use_pad, oma_drm_use_hdr;
-	const char *oma_drm_textual_headers;
-	u32 oma_drm_textual_headers_len;
-
-	/*SHA-1 file hash*/
-	u8 hash[20];
-
-	/*CENC PSSH data*/
-	u32 PSSH_count;
-	GF_NetComDRMConfigPSSH *PSSHs;
-} GF_NetComDRMConfig;
-
-/*GF_NET_CHAN_GET_ESD*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	const GF_ESD *esd;
-	Bool is_iod_stream;
-} GF_NetComGetESD;
-
-/*GF_NET_GET_STATS
-Notes
-1: only channels using network must reply. All channels fetching data through a
-file downloader (cf below) shall NOT answer, the app manages downloader bandwidth internally.
-2: BANDWIDTH USED BY SIGNALING PROTOCOL IS IGNORED IN GPAC
-*/
-typedef struct __netstatcom
-{
-	u32 command_type;
-	/*MAY BE NULL, in which case the module must fill in ONLY the control channel part. This
-	is not used yet, but could be with a protocol using a single control socket for N media channels.*/
-	LPNETCHANNEL on_channel;
-	/*percentage of packet loss from network. This cannot be figured out by the app since there is no
-	one-to-one mapping between the protocol packets and the final SL packet (cf RTP payloads)*/
-	Float pck_loss_percentage;
-	/*channel port, control channel port if any (eg RTCP)*/
-	u16 port, ctrl_port;
-	/*bandwidth used by channel & its control channel if any (both up and down) - expressed in bits per second
-	for HTTP connections, typically only bw_down is used*/
-	u32 bw_up, bw_down, ctrl_bw_down, ctrl_bw_up;
-	/*set to 0 if channel is not part of a multiplex. Otherwise set to the multiplex port, and
-	above port info shall be identifiers in the multiplex - note that multiplexing overhead is ignored
-	in GPAC for the current time*/
-	u16 multiplex_port;
-} GF_NetComStats;
-
-/*GF_NET_CHAN_GET_PIXEL_AR and GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	u32 hSpacing, vSpacing;
-	u32 width, height, pixel_format;
-	Bool is_srd;
-} GF_NetComPixelAR;
-
-/*GF_NET_CHAN_GET_SRD*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	u32 w,h,x,y, width, height;
-	u32 dependent_group_index;
-} GF_NetComSRDInfo;
-
-/*GF_NET_CHAN_VISIBILITY_HINT*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL on_channel;
-	//gives min_max coords of the visible rectangle associated with channels.
-	//min_x may be greater than max_x in case of 360 videos
-	u32 min_x, max_x, min_y, max_y;
-} GF_NetComVisibililityHint;
-
-
-/*GF_NET_SERVICE_INFO*/
-typedef struct __netinfocom
-{
-	u32 command_type;
-	/*currently NULL only*/
-	LPNETCHANNEL on_channel;
-	u32 service_id;
-	/*packed trackNumber(16 bits)/totaltrack(16 bits)*/
-	u32 track_info;
-	u32 genre;
-	const char *album;
-	const char *artist;
-	const char *comment;
-	const char *composer;
-	const char *name;
-	const char *writer;
-	const char *provider;
-	//as in MPEG_DASH role
-	const char *role;
-	const char *accessibility;
-	const char *rating;
-} GF_NetComInfo;
-
-/*GF_NET_SERVICE_HAS_AUDIO*/
-typedef struct
-{
-	u32 command_type;
-	char *base_url;
-} GF_NetComHasAudio;
-
-/*GF_NET_SERVICE_MIGRATION_INFO*/
-typedef struct
-{
-	u32 command_type;
-
-	/*out: migration data, allocated and freed by the plugin*/
-	char *data;
-	u32 data_len;
-} GF_NetComMigration;
-
-/*GF_NET_SERVICE_EVENT*/
-typedef struct
-{
-	u32 command_type;
-
-	/*type of the event being sent*/
-	GF_Event evt;
-	Bool res;
-} GF_NetComSendEvent;
-
-/*GF_NET_SERVICE_QUERY_NEXT*/
-typedef struct
-{
-	u32 command_type;
-	//input
-
-	/*drops first segment */
-	Bool drop_first_segment;
-	/*in : cache index we want to query; by defaut is 0*/
-	u32 dependent_representation_index;
-
-	//output
-
-	/*out: next url to play after current one*/
-	const char *next_url;
-	/*out: range in given URL to be played - usually 0-0 as segments are downloaded to cache
-	but can be non-zero when playing local files*/
-	u64 start_range, end_range;
-	/*indicates discontinuity type at segment switch:
-		0: no discontinuity (eg, follow-up of previous segment
-		1: segment switch discontinuity (eg, bitrate/codec change)
-		2: time discontinuity - seeking has occured and some segments were skipped
-	*/
-	u32 discontinuity_type;
-	/*out: initialization/switching segment of next URL to play, if different from previous init segment*/
-	const char *next_url_init_or_switch_segment;
-	u64 switch_start_range, switch_end_range;
-
-	/*set to key URL for current segment, or NULL if none*/
-	const char *key_url;
-	/*set to key IV for current segment, or NULL if none*/
-	bin128 *key_IV;
-
-	Bool has_next;
-	/*module->proxy: indicates that currently downloaded segment should be checked.
-	  proxy->module: indicates that the return URL is the currently downloaded one, not yet completed (progressive mode only).
-	*/
-	Bool current_download;
-	/*indicates that there is new data in the cache for the current URL (progressive mode only) - only valid if is_current_download is set.*/
-	Bool has_new_data;
-	/*indicates that end of period is being reached (no new segements returned until period activates)*/
-	Bool in_end_of_period;
-
-} GF_NetURLQuery;
-
-/*GF_NET_SERVICE_QUALITY_SWITCH*/
-typedef struct
-{
-	u32 command_type;
-	/*NULL only when request, or channel for witch quality has been changed for notif*/
-	LPNETCHANNEL on_channel;
-	//switch quality up or down - request only
-	Bool up;
-
-	Bool set_auto;
-	//0: current group, otherwise index of the depending_on group
-	u32 dependent_group_index;
-	//or ID of the quality to switch, as indicated in query quality
-	const char *ID;
-	//1+tile mode adaptation (doesn't change other selections)
-	u32 set_tile_mode_plus_one;
-	
-	u32 quality_degradation;
-} GF_NetQualitySwitch;
-
-
-/*GF_NET_SERVICE_QUALITY_QUERY*/
-typedef struct
-{
-	u32 command_type;
-	/*media object for which qualities are checked*/
-	LPNETCHANNEL on_channel;
-
-	//1-based index of quality to query
-	//if 0, the command is used to query the number of quality for the object and the number of objects depending on this one in dependent_group_index
-	u32 index;
-	//if not 0, the parameters are queried for the depending on grup with the given index
-	u32 dependent_group_index;
-	
-	//all out params
-	u32 bandwidth;
-	const char *ID;
-	const char *mime;
-	const char *codec;
-	u32 width;
-	u32 height;
-	Bool interlaced;
-	Double fps;
-	u32 par_num;
-	u32 par_den;
-	u32 sample_rate;
-	u32 nb_channels;
-	Bool disabled;
-	Bool is_selected;
-	Bool automatic;
-	u32 tile_adaptation_mode;
-} GF_NetQualityQuery;
-
-/*GF_NET_SERVICE_STATUS_PROXY*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL channel;
-	GF_Err e;
-	Bool is_disconnect;
-	Bool is_add_media;
-	GF_Descriptor *desc;
-} GF_NetServiceStatus;
-
-/*GF_NET_SERVICE_STATUS_PROXY*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL channel;
-	u32 width;
-	u32 height;
-	//max bits per color channel
-	u32 display_bit_depth;
-	u32 audio_bpp;
-	u32 channels;
-	u32 sample_rate;
-	const char *mime_query;
-	const char *mime_params;
-	//set upon reply
-	Bool mime_supported;
-} GF_MediaCapQuery;
-
-
-/*GF_NET_ASSOCIATED_CONTENT_LOCATION*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL channel;
-	//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;
-	Double activation_countdown;
-	//start and end times of splicing if any
-	Double splice_start_time, splice_end_time;
-	Bool splice_time_pts;
-} GF_AssociatedContentLocation;
-
-/*GF_NET_ASSOCIATED_CONTENT_TIMING*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL channel;
-
-	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;
-
-/*GF_NET_CHAN_NALU_MODE*/
-typedef struct
-{
-	u32 command_type;
-	LPNETCHANNEL channel;
-
-	//mode 0: extract in ISOBMF format (nalu size field + nalu)
-	//mode 1: extract in Annex B format (start code + nalu)
-	//mode 2: extract in Annex B format (start code + nalu) and disable sync sample seek mode (only used for scalable hybrid)
-	u32 extract_mode;
-} GF_NALUExtractMode;
-
-/*GF_NET_SERVICE_CODEC_STAT_QUERY*/
-typedef struct
-{
-	/*avg_dec_time is the maximum average decoding time of all channels;
-	  max_dec_time, irap_avg_dec_time and irap_max_dec_time is the maximum decoding time of a frame and a I frame in this channel*/
-	u32 avg_dec_time, max_dec_time, irap_avg_dec_time, irap_max_dec_time;
-	/*flag codec has been reset*/
-	Bool codec_reset;
-	Bool decode_only_rap;
-} GF_CodecStat;
-
-/*GF_NET_SERVICE_QUERY_UTC_DELAY*/
-typedef struct
-{
-	s32 delay;
-} GF_UTCDelay;
-
-typedef union __netcommand
-{
-	GF_NET_CHAN_CMD command_type;
-	GF_NetComBase base;
-	GF_NetComPlay play;
-	GF_NetComConfig cfg;
-	GF_NetComBuffer buffer;
-	GF_NetComDuration duration;
-	GF_NetComGetDSI get_dsi;
-	GF_NetComPadding pad;
-	GF_NetComTimeShift timeshift;
-	GF_NetComMapTime map_time;
-	GF_NetComStats net_stats;
-	GF_NetComDRMConfig drm_cfg;
-	GF_NetComGetESD cache_esd;
-	GF_NetComInfo info;
-	GF_NetComPixelAR par;
-	GF_NetComHasAudio audio;
-	GF_NetComMigration migrate;
-	GF_NetURLQuery url_query;
-	GF_NetQualitySwitch switch_quality;
-	GF_NetServiceStatus status;
-	GF_MediaCapQuery mcaps;
-	GF_NetComProxyData proxy_data;
-	GF_AssociatedContentLocation addon_info;
-	GF_AssociatedContentTiming addon_time;
-	GF_NALUExtractMode nalu_mode;
-	GF_NetComSendEvent send_event;
-	GF_NetQualityQuery quality_query;
-	GF_CodecStat codec_stat;
-	GF_NetComSRDInfo srd;
-	GF_NetComVisibililityHint visibility_hint;
-	GF_UTCDelay utc_delay;
-} GF_NetworkCommand;
-
-/*
-	network modules
-*/
-
-/*interface name and version for input service*/
-#define GF_NET_CLIENT_INTERFACE			GF_4CC('G', 'I', 'S', '1')
-
-typedef struct _netinterface
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*returns 1 if module can process this URL, 0 otherwise. This is only called when the file extension/mimeType cannot be
-	retrieved in the cfg file, otherwise the mime type/file ext is used to load service. Typically a module would
-	register its mime types in this function (cf gf_service_register_mime below)
-	*/
-	Bool (*CanHandleURL)(struct _netinterface *, const char *url);
-
-	/*connects the service to the desired URL - the service handle is used for callbacks.
-	Only one service can be connected to a loaded interface.
-	*/
-	GF_Err (*ConnectService) (struct _netinterface *, GF_ClientService *serv, const char *url);
-
-	/*disconnects service - the module is no longer used after this call - if immediate_shutdown is set the module
-	shall not attempt to get confirmation from remote side, it will be deleted right away
-
-	NOTE: depending on how the client/server exchange is happening, it may happen that the CloseService is called
-	in the same context as a reply from your module. This can result into deadlocks if you're using threads.
-	You should therefore only try to destroy threads used in the interface shutdown process, which is guarantee
-	to be in a different context call.
-	*/
-	GF_Err (*CloseService) (struct _netinterface *);
-
-	/*retrieves service decsriptor (expressed as an MPEG4 OD/IOD) for accessing this service
-	descriptor is allocated by plugin and destroyed by user
-	the IOD shall refer to the service attached to the module
-	@expect_type is a hint in case the service regenerates an IOD. It indicates whether the entry point expected is
-	INLINE, BIFS animation stream, video, audio or input sensor.
-	@sub_url: indicates fetching of an IOD for a given object in the service.
-	Only used for services handling the optional CanHandleURLInService below
-		NULL for main service
-		service extension for sub-service (cf CanHandleURLInService below). For ex,
-		"rtsp://myserver/file.mp4/ES_ID=3" and "rtsp://myserver/file.mp4/ES_ID=4"
-		or "file.avi#audio" and "file.avi#video".In this case a partial IOD for the desired object is expected
-	Note: once a service is acknowledged as connected, this function must be executed synchronously
-	The service can return NULL for a descriptor:
-		* if the expected media type is a single media, this means the media couldn't be found
-		* if the expected media type is a scene, this means the terminalk shall create and manage the scene
-	*/
-	GF_Descriptor *(*GetServiceDescriptor) (struct _netinterface *, u32 expect_type, const char *sub_url);
-
-
-	/*sends command to the service / channel - cf command structure*/
-	GF_Err (*ServiceCommand) (struct _netinterface *, GF_NetworkCommand *com);
-
-	/*data channel setup - url is either
-	"ES_ID=ID" where ID is the stream ID in this service
-	or a control string depending on the service/stream. The URL is first used to load a module able to handle it,
-	so the module has no redirection to handle
-	*/
-	GF_Err (*ConnectChannel) (struct _netinterface *, LPNETCHANNEL channel, const char *url, Bool upstream);
-	/*teardown of data channel*/
-	GF_Err (*DisconnectChannel) (struct _netinterface *, LPNETCHANNEL channel);
-
-	/*optional - fetch MPEG4 data from channel - data shall not be duplicated and must be released at ReleaseData
-	SL info shall be written to provided header - if the data is a real SL packet the flag sl_compressed shall be
-	set to signal the app this is a full SL pdu (@out_sl_hdr is then ignored)
-	set to NULL if not supported
-	*/
-	GF_Err (*ChannelGetSLP) (struct _netinterface *, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data);
-
-	/*optional - release SLP data allocated on channel by the previous call, if any
-	set to NULL if not supported*/
-	GF_Err (*ChannelReleaseSLP) (struct _netinterface *, LPNETCHANNEL channel);
-
-	/*this is needed for modules to query other modules, the typical case being 2 ESD URLs pointing to the
-	same media (audio and video streams in an RTSP session). This is always used on loaded modules but
-	doesn't have to be declared*/
-	Bool (*CanHandleURLInService)(struct _netinterface *, const char *url);
-
-	/*private*/
-	void *priv;
-
-	/*proxy stuff*/
-	GF_Err (*query_proxy)(struct _netinterface *, GF_NetworkCommand *param);
-	void *proxy_udta;
-	Bool proxy_type; /* 0 corresponds to a proxy without full command support */
-	/*!
-	 * This is needed for modules supporting mime types, when this method is called,
-	 * the module has to call gf_service_register_mime() for all the mime-types
-	 * its supports.
-	 * \return The number of declared mime types
-	 * \see gf_service_register_mime(GF_InputService *, const char *, const char *, const char *)
-	 */
-	u32 (*RegisterMimeTypes) (const struct _netinterface *);
-} GF_InputService;
-
-/*callback functions - these can be linked with non-LGPL modules*/
-
-/*to call on service (if channel is NULL) or channel connect completed*/
-void gf_service_connect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
-/*to call on service (if channel is NULL) or channel disconnect completed*/
-void gf_service_disconnect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
-/* acknowledgement of service command - service commands handle both services and channels
-Most of the time commands are NOT acknowledged, typical acknowledgement are needed for setup and control
-with remote servers.
-command can also be triggered from the service (QoS, broadcast announcements)
-cf above for command usage
-*/
-void gf_service_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response);
-/*to call when data packet is received.
-@data, data_size: data received
-@hdr: uncompressed SL header passed with data for stream sync - if not present then data shall be a valid SL packet
-	(header + PDU). Note that using an SLConfig resulting in an empty GF_SLHeader allows sending raw data directly
-@reception_status: data reception status. To signal end of stream, set this to GF_EOS
-*/
-void gf_service_send_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status);
-/*returns URL associated with service (so that you don't need to store it)*/
-const char *gf_service_get_url(GF_ClientService *service);
-
-/*adds a new media from network. !! The media descriptor is then owned/destroyed by the term!!
-media_desc: object descriptor for the new media. May be NULL to force scene rebuilt.
-no_scene_check: specifies if the scene description shall be rebuilt or not.
-*/
-void gf_service_declare_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_update);
-//returns module interface of the service
-GF_InputService *gf_service_get_interface(GF_ClientService *service);
-
-
-/*check if @fileExt extension is supported for given mimeType, and if associated with module. If mimeType not registered, register it for given module*/
-Bool gf_service_check_mime_register(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description, const char *fileExt);
-/*register mime types & file extensions - most modules should only need the check version above*/
-void gf_service_register_mime(const GF_InputService *ifce, const char *mimeType, const char *extList, const char *description);
-
-/*file downloading - can and MUST be used by any module (regardless of license) in order not to interfere
-with net management*/
-/*creates a new downloading session in the given service - if url is relative, it will be interpreted through
-the service URL*/
-GF_DownloadSession * gf_service_download_new(GF_ClientService *service, const char *url, u32 flags, gf_dm_user_io user_io, void *cbk);
-/*closes the downloading session*/
-void gf_service_download_del(GF_DownloadSession * dnload);
-/*send progress and connection messages to user...*/
-void gf_service_download_update_stats(GF_DownloadSession * sess);
-
-
-/*MPEG-4 media cache interface name*/
-#define GF_STREAMING_MEDIA_CACHE		GF_4CC('G', 'M', 'C', 0x01)
-
-typedef struct _cacheinterface
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*opens media cache at given place - extension is handled by cache module
-	@serv: service owning cache (eg, where to send data when requested)
-	@keep_existing_files: don't overwrite previously recorded sessions*/
-	GF_Err (*Open)(struct _cacheinterface *, GF_ClientService *serv, const char *location_and_name, Bool keep_existing_files);
-	/*closes media cache, delete file(s) if desired*/
-	GF_Err (*Close)(struct _cacheinterface *, Bool delete_cache);
-	/*writes data to cache. data is always a complete AU as reconstructed by gpac core
-	If first time data is written, user should query channel desc through service commands*/
-	GF_Err (*Write)(struct _cacheinterface *, LPNETCHANNEL ch, char *data, u32 data_size, GF_SLHeader *sl_hdr);
-
-	/*same as reader, except they MUST be provided - in other words, only PULL mode is supported for cache
-	at the current time*/
-	GF_Err (*ServiceCommand) (struct _cacheinterface *, GF_NetworkCommand *com);
-	GF_Err (*ChannelGetSLP) (struct _cacheinterface *, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data);
-	GF_Err (*ChannelReleaseSLP) (struct _cacheinterface *, LPNETCHANNEL channel);
-
-	/*module private*/
-	void *priv;
-} GF_StreamingCache;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/*_GF_SERVICE_H_*/

gpac-0.8.0.tar.gz/include/gpac/modules/term_ext.h Deleted

@@ -1,112 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / modules interfaces
- *
- *  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_MODULE_TERM_EXT_H_
-#define _GF_MODULE_TERM_EXT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/terminal.h>
-
-/*interface name and version for Terminal Extensions services*/
-#define GF_TERM_EXT_INTERFACE		GF_4CC('G','T','E', '1')
-
-typedef struct _term_ext GF_TermExt;
-
-
-typedef struct {
-	void *scenegraph;
-	void *ctx;
-	void *global;
-	Bool unload;
-} GF_TermExtJS;
-
-enum
-{
-	/*start terminal extension. If 0 is returned, the module will be unloaded
-		associated param: GF_Terminal *term
-		@return: 1 if OK, 0 otherwise (in which case the extensions will be removed without calling stop)
-	*/
-	GF_TERM_EXT_START = 1,
-	/*stop terminal extension
-		associated param: NULL
-		@return: ignored
-	*/
-	GF_TERM_EXT_STOP,
-
-	/*process extension - only called GF_TERM_EXTENSION_NOT_THREADED capability is set
-		associated param: NULL
-		@return: ignored
-	*/
-	GF_TERM_EXT_PROCESS,
-
-	/*load/unload js bindings of this extension
-		associated param: GF_TermExtJS *jsext
-		@return: ignored
-	*/
-	GF_TERM_EXT_JSBIND,
-};
-
-enum
-{
-	/*signal the extension is to be called on regular basis (once per simulation tick). This MUST be set during
-	the GF_TERM_EXT_START command and cannot be changed at run-time*/
-	GF_TERM_EXTENSION_NOT_THREADED = 1<<1,
-
-	GF_TERM_EXTENSION_JS = 1<<2,
-};
-
-
-struct _term_ext
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*caps of the module*/
-	u32 caps;
-
-	/*terminal extension proc
-	 termext: pointer to the module
-	 action: action type of this call
-	 param: associated param of the call
-	*/
-	Bool (*process)(GF_TermExt *termext, u32 action, void *param);
-
-	/*module private*/
-	void *udta;
-};
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*#define _GF_MODULE_TERM_EXT_H_*/
-

gpac-0.8.0.tar.gz/include/gpac/nodes_xbl.h Deleted

@@ -1,70 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *    Copyright (c)2004-2012 Telecom ParisTech - All rights reserved
- *
- *  This file is part of GPAC / XBL Elements
- *
- *  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_XBL_NODES_H
-#define _GF_XBL_NODES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/svg_types.h>
-
-#define XBL_String_datatype SVG_String_datatype
-
-struct _all_atts {
-	DOM_String *id;
-	DOM_String *extends;
-	DOM_String *display;
-	DOM_String *inheritstyle;
-	DOM_String *includes;
-	DOM_String *name;
-	DOM_String *implements;
-	DOM_String *type;
-	DOM_String *readonly;
-	DOM_String *onget;
-	DOM_String *onset;
-	DOM_String *event;
-	DOM_String *action;
-	DOM_String *phase;
-	DOM_String *button;
-	DOM_String *modifiers;
-	DOM_String *keycode;
-	DOM_String *key;
-	DOM_String *charcode;
-	DOM_String *clickcount;
-	DOM_String *command;
-	DOM_String *preventdefault;
-	DOM_String *src;
-};
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif		/*_GF_SVG_NODES_H*/
-

gpac-0.8.0.tar.gz/include/gpac/ringbuffer.h Deleted

@@ -1,94 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Pierre Souchay
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / common tools 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.
- *
- */
-
-#ifndef _GF_RINGBUFFER_H
-#define _GF_RINGBUFFER_H
-
-#include <gpac/tools.h>
-#include <gpac/thread.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-	u8           *buf;
-	volatile u32 write_ptr;
-	volatile u32 read_ptr;
-	u32          size;
-	u32          size_mask;
-	GF_Mutex *   mx;
-}
-GF_Ringbuffer ;
-
-
-/*!
- * Creates a new ringbuffer with specified size. The caller has the
- * reponsability to free the ringbuffer using gf_ringbuffer_del()
- *
- * \param sz the ringbuffer size in bytes
- *
- * \return a pointer to a new ringbuffer if successful, NULL otherwise.
- */
-GF_Ringbuffer * gf_ringbuffer_new(u32 sz);
-
-/*!
- * Frees a previously allocated ringbuffer
- * \param ringbuffer The ringbuffer to free
- */
-void gf_ringbuffer_del(GF_Ringbuffer * ringbuffer);
-
-/*!
- * Reads bytes from ringbuffer
- * \param rb The ringbuffer to read from
- * \param dest The destination
- * \param szDest Size of destination
- * \return the number of bytes readen
- */
-u32 gf_ringbuffer_read(GF_Ringbuffer *rb, u8 *dest, u32 szDest);
-
-/*!
- * Return the number of bytes available for reading.  This is the
- * number of bytes in front of the read pointer and behind the write
- * pointer.
- * \param rb The ringbuffer
- * \return the number of bytes available for reading
- */
-u32 gf_ringbuffer_available_for_read (GF_Ringbuffer * rb);
-
-/*!
- * Copy at most sz bytes to rb from src.
- * \param rb The ringbuffer to write to
- * \param src The source buffer
- * \param sz the size of source
- * \return Returns the actual number of bytes copied, may be lower than sz if ringbuffer is already full
- */
-u32 gf_ringbuffer_write (GF_Ringbuffer * rb, const u8 * src, u32 sz);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* _GF_RINGBUFFER_H */

gpac-0.8.0.tar.gz/include/gpac/unicode.h Deleted

@@ -1,63 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / common tools 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.
- *
- */
-
-#ifndef _GF_UNICODE_H_
-#define _GF_UNICODE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <gpac/unicode.h>
- *	\brief Unicode conversion.
- */
- 
-/*!
- *\addtogroup uni_grp Unicode and UTF
- *\ingroup utils_grp
- *\brief Unicode and UTF string management
- 	@{
-*/
-
-#include <gpac/setup.h>
-
-/*!
- * \brief Unicode conversion from UTF-8 to UCS-4
- * \param ucs4_buf The UCS-4 buffer to fill
- * \param utf8_len The length of the UTF-8 buffer
- * \param utf8_buf The buffer containing the UTF-8 data
- * \return the length of the ucs4_buf. Note that the ucs4_buf should be allocated by parent and should be at least utf8_len * 4
- */
-u32 utf8_to_ucs4 (u32 *ucs4_buf, u32 utf8_len, unsigned char *utf8_buf);
-
-/* @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif		/*_GF_UNICODE_H_*/
-

gpac-0.8.0.tar.gz/modules/aac_in Deleted

gpac-0.8.0.tar.gz/modules/aac_in/Makefile Deleted

@@ -1,62 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/aac_in
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS= aac_in.o
-
-SRCS := $(OBJS:.o=.c) 
-
-#faad config
-ifeq ($(CONFIG_FAAD), no)
-else
-OBJS+=faad_dec.o
-CFLAGS+=-DGPAC_HAS_FAAD
-#local faad lib
-ifeq ($(CONFIG_FAAD), local)
-EXTRALIBS+=-L../../extra_lib/lib/gcc
-CFLAGS+= -I"$(LOCAL_INC_PATH)/faad"
-endif
-EXTRALIBS+= -lfaad
-endif
-
-LIB=gm_aac_in$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols aac_in.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_aac_in-static$(DYN_LIB_SUFFIX) $(OBJS) -L../../bin/gcc -lgpac_static $(EXTRALIBS) $(LDFLAGS)
-endif
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/aac_in/aac_in.c Deleted

@@ -1,999 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AAC reader module
- *
- *  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 DONT_USE_TERMINAL_MODULE_API
-#include <gpac/modules/service.h>
-#endif
-
-#include <gpac/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/download.h>
-
-#include <time.h>
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	GF_ClientService *service;
-	GF_InputService *input;
-	LPNETCHANNEL ch;
-#endif
-
-	Bool is_remote;
-
-	FILE *stream;
-	u32 duration;
-
-	Bool needs_connection;
-	u32 pad_bytes;
-	Bool done;
-	u32 is_inline;
-
-	char *data;
-	u32 data_size;
-	GF_SLHeader sl_hdr;
-
-	u32 sample_rate, oti, sr_idx, nb_ch, prof;
-	Double start_range, end_range;
-	u32 current_time, nb_samp;
-	/*file downloader*/
-	GF_DownloadSession *dnload;
-#ifdef DONT_USE_TERMINAL_MODULE_API
-	GF_DownloadManager *dm;
-#endif
-
-	Bool is_live;
-	char prev_data[1000];
-	u32 prev_size;
-
-	char *icy_name;
-	char *icy_genre;
-	char *icy_track_name;
-
-	Bool hybrid_on;
-	u64 prev_map_time;
-} AACReader;
-
-typedef struct
-{
-	Bool is_mp2, no_crc;
-	u32 profile, sr_idx, nb_ch, frame_size, hdr_size;
-} ADTSHeader;
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-
-static const char * AAC_MIMES[] = {  "audio/x-m4a", "audio/aac", "audio/aacp", "audio/x-aac", 0 };
-
-static const char * AAC_EXTENSIONS = "aac mp4a";
-
-static const char * AAC_DESC = "MPEG-4 AAC Music";
-
-static u32 AAC_RegisterMimeTypes(const GF_InputService *plug) {
-	int i;
-	if (!plug)
-		return 0;
-	for (i = 0 ; AAC_MIMES[i] ; i++)
-		gf_service_register_mime( plug, AAC_MIMES[i], AAC_EXTENSIONS, AAC_DESC);
-	return i;
-}
-
-
-static Bool AAC_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
-	{
-		int i;
-		for (i = 0 ; AAC_MIMES[i] ; i++)
-			if (gf_service_check_mime_register(plug, AAC_MIMES[i], AAC_EXTENSIONS, AAC_DESC, sExt))
-				return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-#endif
-
-static GF_ESD *AAC_GetESD(AACReader *read)
-{
-	GF_BitStream *dsi;
-	GF_ESD *esd;
-	u32 i, sbr_sr_idx, sbr_oti;
-
-	esd = gf_odf_desc_esd_new(0);
-	if (!esd)
-		return NULL;
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = read->oti;
-	esd->ESID = 1;
-	esd->OCRESID = 1;
-	esd->slConfig->timestampResolution = read->sample_rate;
-	if (read->is_live) esd->slConfig->useAccessUnitEndFlag = esd->slConfig->useAccessUnitStartFlag = 1;
-	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	/*write as regular AAC*/
-	gf_bs_write_int(dsi, read->prof, 5);
-	gf_bs_write_int(dsi, read->sr_idx, 4);
-	gf_bs_write_int(dsi, read->nb_ch, 4);
-	gf_bs_align(dsi);
-
-	sbr_sr_idx = 0;
-	sbr_oti = 0;
-	/*always signal implicit SBR for <=24000,  in case it's used*/
-	if (read->sample_rate<=24000) {
-		sbr_sr_idx = read->sr_idx;
-		for (i=0; i<16; i++) {
-			if (GF_M4ASampleRates[i] == (u32) 2*read->sample_rate) {
-				sbr_sr_idx = i;
-				break;
-			}
-		}
-	}
-	gf_bs_write_int(dsi, 0x2b7, 11);
-	gf_bs_write_int(dsi, sbr_oti, 5);
-	gf_bs_write_int(dsi, 1, 1);
-	gf_bs_write_int(dsi, sbr_sr_idx, 4);
-
-	/* always signal implicit PS in case it's used ??? */
-	gf_bs_write_int(dsi, 0x548, 11);
-	gf_bs_write_int(dsi, 1, 1);
-
-	gf_bs_align(dsi);
-	gf_bs_get_content(dsi, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(dsi);
-	return esd;
-}
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-static void AAC_SetupObject(AACReader *read)
-{
-	GF_ESD *esd;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	od->objectDescriptorID = 0;
-	od->service_ifce = read->input;
-	esd = AAC_GetESD(read);
-	esd->OCRESID = 0;
-	gf_list_add(od->ESDescriptors, esd);
-
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
-}
-#endif
-
-static Bool ADTS_SyncFrame(GF_BitStream *bs, Bool is_complete, ADTSHeader *hdr)
-{
-	u32 val;
-	u64 start_pos, pos;
-
-	start_pos = gf_bs_get_position(bs);
-	while (gf_bs_available(bs)) {
-		val = gf_bs_read_u8(bs);
-		if (val!=0xFF) continue;
-		val = gf_bs_read_int(bs, 4);
-		if (val != 0x0F) {
-			gf_bs_read_int(bs, 4);
-			continue;
-		}
-		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 2);
-		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
-		pos = gf_bs_get_position(bs) - 2;
-
-		hdr->profile = 1 + gf_bs_read_int(bs, 2);
-		hdr->sr_idx = gf_bs_read_int(bs, 4);
-		gf_bs_read_int(bs, 1);
-		hdr->nb_ch = gf_bs_read_int(bs, 3);
-		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);
-		hdr->hdr_size = 7;
-		if (!hdr->no_crc) {
-			gf_bs_read_u16(bs);
-			hdr->hdr_size = 9;
-		}
-		if (hdr->frame_size < hdr->hdr_size) {
-			gf_bs_seek(bs, pos+1);
-			continue;
-		}
-		hdr->frame_size -= hdr->hdr_size;
-		if (is_complete && (gf_bs_available(bs) == hdr->frame_size)) return GF_TRUE;
-		else if (gf_bs_available(bs) <= hdr->frame_size) break;
-
-		gf_bs_skip_bytes(bs, hdr->frame_size);
-		val = gf_bs_read_u8(bs);
-		if (val!=0xFF) {
-			gf_bs_seek(bs, pos+1);
-			continue;
-		}
-		val = gf_bs_read_int(bs, 4);
-		if (val!=0x0F) {
-			gf_bs_read_int(bs, 4);
-			gf_bs_seek(bs, pos+1);
-			continue;
-		}
-		gf_bs_seek(bs, pos+hdr->hdr_size);
-		return GF_TRUE;
-	}
-	gf_bs_seek(bs, start_pos);
-	return GF_FALSE;
-}
-
-static Bool AAC_ConfigureFromFile(AACReader *read)
-{
-	Bool sync;
-	GF_BitStream *bs;
-	ADTSHeader hdr;
-	if (!read || !read->stream) return GF_FALSE;
-	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-
-	sync = ADTS_SyncFrame(bs, !read->is_remote, &hdr);
-	if (!sync) {
-		gf_bs_del(bs);
-		return GF_FALSE;
-	}
-	read->nb_ch = hdr.nb_ch;
-	read->prof = hdr.profile;
-	read->sr_idx = hdr.sr_idx;
-	read->oti = hdr.is_mp2 ? read->prof+GPAC_OTI_AUDIO_AAC_MPEG2_MP : GPAC_OTI_AUDIO_AAC_MPEG4;
-	read->sample_rate = GF_M4ASampleRates[read->sr_idx];
-
-	read->duration = 0;
-
-	if (!read->is_remote) {
-		read->duration = 1024;
-		gf_bs_skip_bytes(bs, hdr.frame_size);
-		while (ADTS_SyncFrame(bs, !read->is_remote, &hdr)) {
-			read->duration += 1024;
-			gf_bs_skip_bytes(bs, hdr.frame_size);
-		}
-	}
-	gf_bs_del(bs);
-	gf_fseek(read->stream, 0, SEEK_SET);
-	return 1;
-}
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-static void AAC_RegulateDataRate(AACReader *read)
-{
-	GF_NetworkCommand com;
-	if (!read)
-		return;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-	com.base.on_channel = read->ch;
-	while (read->ch) {
-		gf_service_command(read->service, &com, GF_OK);
-		if (com.buffer.occupancy < com.buffer.max) break;
-		gf_sleep(2);
-	}
-}
-#endif
-
-static void AAC_OnLiveData(AACReader *read, const char *data, u32 data_size)
-{
-	u32 pos;
-	Bool sync;
-	GF_BitStream *bs;
-	ADTSHeader hdr;
-	assert( read->data || (!read->data && !read->data_size));
-	read->data = gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
-	memcpy(read->data + read->data_size, data, sizeof(char)*data_size);
-	read->data_size += data_size;
-
-	if (read->needs_connection) {
-		read->needs_connection = 0;
-		bs = gf_bs_new((const char *)read->data, read->data_size, GF_BITSTREAM_READ);
-		sync = ADTS_SyncFrame(bs, 0, &hdr);
-		gf_bs_del(bs);
-		if (!sync) return;
-		read->nb_ch = hdr.nb_ch;
-		read->prof = hdr.profile;
-		read->sr_idx = hdr.sr_idx;
-		read->oti = hdr.is_mp2 ? read->prof+GPAC_OTI_AUDIO_AAC_MPEG2_MP-1 : GPAC_OTI_AUDIO_AAC_MPEG4;
-		read->sample_rate = GF_M4ASampleRates[read->sr_idx];
-		read->is_live = 1;
-		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-#ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_service_connect_ack(read->service, NULL, GF_OK);
-		AAC_SetupObject(read);
-#endif
-	}
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	if (!read->ch) return;
-#endif
-
-	/*need a full adts header*/
-	if (read->data_size<=7) return;
-
-	bs = gf_bs_new((const char *)read->data, read->data_size, GF_BITSTREAM_READ);
-	hdr.frame_size = pos = 0;
-	while (ADTS_SyncFrame(bs, 0, &hdr)) {
-		pos = (u32) gf_bs_get_position(bs);
-		read->sl_hdr.accessUnitStartFlag = 1;
-		read->sl_hdr.accessUnitEndFlag = 1;
-		read->sl_hdr.AU_sequenceNumber++;
-		read->sl_hdr.compositionTimeStampFlag = 1;
-		read->sl_hdr.compositionTimeStamp += 1024;
-#ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_service_send_packet(read->service, read->ch, read->data + pos, hdr.frame_size, &read->sl_hdr, GF_OK);
-#else
-		SampleCallBack(audio_prog, AUDIO_DATA_ESID, read->data + pos, hdr.frame_size, read->sl_hdr.compositionTimeStamp);
-#endif
-		gf_bs_skip_bytes(bs, hdr.frame_size);
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-#ifndef _WIN32_WCE
-		/* For Hybrid scenarios*/
-		if (read->hybrid_on && (!read->prev_map_time || (read->sl_hdr.compositionTimeStamp - read->prev_map_time) > read->sample_rate*5)) {
-			Double hybrid_delay = 0.0;
-			time_t now;
-			struct tm *now_tm;
-			const char *opt;
-
-			opt = gf_modules_get_option((GF_BaseInterface *)read->input, "HybRadio", "AudioDelay");
-			if (opt) {
-				hybrid_delay = atof(opt);
-			}
-			time(&now);
-			now += (s32)hybrid_delay;
-			now_tm = gmtime(&now);
-			{
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(com));
-				com.command_type = GF_NET_CHAN_MAP_TIME;
-				com.map_time.media_time = now_tm->tm_hour*3600+now_tm->tm_min*60+now_tm->tm_sec + hybrid_delay;
-				com.map_time.timestamp = read->sl_hdr.compositionTimeStamp;
-				com.map_time.reset_buffers = 0;
-				com.base.on_channel = read->ch;
-				gf_service_command(read->service, &com, GF_OK);
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AAC  In] Mapping WC  Time %04d/%02d/%02d %02d:%02d:%02d and AAC time "LLD" (audio delay %f)\n",
-				                                   (now_tm->tm_year + 1900), (now_tm->tm_mon + 1), now_tm->tm_mday, now_tm->tm_hour, now_tm->tm_min, now_tm->tm_sec,
-				                                   com.map_time.timestamp, hybrid_delay));
-
-			}
-			read->prev_map_time = read->sl_hdr.compositionTimeStamp;
-		}
-#endif
-#endif
-	}
-
-	pos = (u32) gf_bs_get_position(bs);
-	gf_bs_del(bs);
-
-	if (pos) {
-		char *d;
-		assert( read->data);
-		assert( read->data_size >= pos);
-		read->data_size -= pos;
-		d = gf_malloc(sizeof(char) * read->data_size);
-		assert( d );
-		memcpy(d, read->data + pos, sizeof(char) * read->data_size);
-		gf_free(read->data);
-		read->data = d;
-	}
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	AAC_RegulateDataRate(read);
-#endif
-}
-
-static void AAC_disconnect_from_http_and_free(AACReader * read)
-{
-	if (!read)
-		return;
-	if (read->dnload) {
-		gf_dm_sess_abort(read->dnload);
-#ifdef DONT_USE_TERMINAL_MODULE_API
-		gf_dm_sess_del( read->dnload);
-#else
-		gf_service_download_del(read->dnload);
-#endif /* DONT_USE_TERMINAL_MODULE_API */
-	}
-	read->dnload = NULL;
-}
-
-void AAC_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	u32 total_size, bytes_done;
-	AACReader *read = (AACReader *) cbk;
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		if (read->stream) {
-			read->is_remote = 0;
-			e = GF_EOS;
-		} else if (!read->needs_connection) {
-			return;
-		}
-	} else if (param->msg_type==GF_NETIO_PARSE_HEADER) {
-		if (!strcmp(param->name, "icy-name")) {
-			if (read->icy_name) gf_free(read->icy_name);
-			read->icy_name = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-genre")) {
-			if (read->icy_genre) gf_free(read->icy_genre);
-			read->icy_genre = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-meta")) {
-#ifndef DONT_USE_TERMINAL_MODULE_API
-			GF_NetworkCommand com;
-#endif
-			char *meta;
-			if (read->icy_track_name) gf_free(read->icy_track_name);
-			read->icy_track_name = NULL;
-			meta = param->value;
-			while (meta && meta[0]) {
-				char *sep = strchr(meta, ';');
-				if (sep) sep[0] = 0;
-
-				if (!strnicmp(meta, "StreamTitle=", 12)) {
-					read->icy_track_name = gf_strdup(meta+12);
-					if (!strcmp(read->icy_track_name, "''")) {
-						/* On some servers, '' means not track name */
-						gf_free(read->icy_track_name);
-						read->icy_track_name = NULL;
-					}
-				}
-				if (!sep) break;
-				sep[0] = ';';
-				meta = sep+1;
-			}
-#ifndef DONT_USE_TERMINAL_MODULE_API
-			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_service_command(read->service, &com, GF_OK);
-#endif
-		}
-		return;
-	} else {
-		/*handle service message*/
-#ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_service_download_update_stats(read->dnload);
-#endif
-		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
-	}
-
-	/*data fetching or EOS*/
-	if (e >= GF_OK) {
-		if (read->needs_connection) {
-			gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-			if (!total_size) read->is_live = 1;
-		}
-		if (read->is_live) {
-			if (!e) AAC_OnLiveData(read, param->data, param->size);
-			return;
-		}
-		if (read->stream) return;
-
-		/*open service*/
-		szCache = gf_dm_sess_get_cache_name(read->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			read->stream = gf_fopen((char *) szCache, "rb");
-			if (!read->stream) e = GF_SERVICE_ERROR;
-			else {
-				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = 0;
-				e = GF_OK;
-				/*not enough data*/
-				if (!AAC_ConfigureFromFile(read)) {
-					/*get amount downloaded and check*/
-					gf_dm_sess_get_stats(read->dnload, NULL, NULL, NULL, &bytes_done, NULL, NULL);
-					if (bytes_done>10*1024) {
-						e = GF_CORRUPTED_DATA;
-					} else {
-						gf_fclose(read->stream);
-						read->stream = NULL;
-						return;
-					}
-				}
-			}
-		}
-	}
-	/*OK confirm*/
-	if (read->needs_connection) {
-		read->needs_connection = 0;
-#ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_service_connect_ack(read->service, NULL, e);
-		if (!e) AAC_SetupObject(read);
-#else
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to initialize AAC reader\n"));
-		}
-#endif
-	}
-}
-
-void aac_download_file(AACReader *read, char *url)
-{
-	read->needs_connection = 1;
-	AAC_disconnect_from_http_and_free(read);
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	read->dnload = gf_service_download_new(read->service, url, 0, AAC_NetIO, read);
-#else
-	{
-		GF_Err e;
-		if (!read->dm)
-			read->dm = gf_dm_new(NULL);
-		assert( read->dm );
-		read->dnload = gf_dm_sess_new_simple(read->dm, url, 0, AAC_NetIO, read, &e);
-	}
-#endif
-
-	if (!read->dnload ) {
-		read->needs_connection = 0;
-#ifndef DONT_USE_TERMINAL_MODULE_API
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-#endif
-	}
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	/*start our download (threaded)*/
-	gf_dm_sess_process(read->dnload);
-#endif
-
-	/*service confirm is done once fetched*/
-}
-
-static void AAC_Reader_del(AACReader * read)
-{
-	if (!read)
-		return;
-	AAC_disconnect_from_http_and_free(read);
-#ifdef DONT_USE_TERMINAL_MODULE_API
-	if (read->dm)
-		gf_dm_del(read->dm);
-	read->dm = NULL;
-#endif
-	if (read->icy_name)
-		gf_free(read->icy_name);
-	if (read->icy_genre)
-		gf_free(read->icy_genre);
-	if (read->icy_track_name)
-		gf_free(read->icy_track_name);
-	read->icy_name = read->icy_genre = read->icy_track_name = NULL;
-	if (read->stream)
-		gf_fclose(read->stream);
-	if (read->data)
-		gf_free(read->data);
-	read->data = NULL;
-	read->stream = NULL;
-#ifndef DONT_USE_TERMINAL_MODULE_API
-	gf_free( read );
-#endif
-}
-
-static AACReader * AAC_Reader_new() {
-	AACReader *reader = gf_malloc(sizeof(AACReader));
-	memset(reader, 0, sizeof(AACReader));
-	return reader;
-}
-
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-static Bool aac_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return 1;
-	if (strstr(url, "://")) return 0;
-	return 1;
-}
-
-static GF_Err AAC_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *ext;
-	const char *opt;
-	GF_Err reply;
-	AACReader *read = plug->priv;
-	read->service = serv;
-	read->input = plug;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)read->input, "HybRadio", "Activated");
-	if (opt && !strcmp(opt, "true")) {
-		read->hybrid_on = 1;
-	}
-
-	AAC_disconnect_from_http_and_free(read);
-
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) ext[0] = 0;
-
-	/*remote fetch*/
-	read->is_remote = !aac_is_local(szURL);
-	if (read->is_remote) {
-		aac_download_file(read, (char *) szURL);
-		return GF_OK;
-	}
-
-	reply = GF_OK;
-	read->stream = gf_fopen(szURL, "rb");
-	if (!read->stream) {
-		reply = GF_URL_ERROR;
-	} else if (!AAC_ConfigureFromFile(read)) {
-		gf_fclose(read->stream);
-		read->stream = NULL;
-		reply = GF_NOT_SUPPORTED;
-	}
-	gf_service_connect_ack(serv, NULL, reply);
-	if (!reply && read->is_inline ) AAC_SetupObject(read);
-	return GF_OK;
-}
-
-static GF_Err AAC_CloseService(GF_InputService *plug)
-{
-	AACReader *read;
-	if (!plug)
-		return GF_BAD_PARAM;
-	read = plug->priv;
-	if (!read)
-		return GF_BAD_PARAM;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	AAC_Reader_del( read );
-	plug->priv = NULL;
-	return GF_OK;
-}
-
-static GF_Descriptor *AAC_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	AACReader *read = plug->priv;
-	/*since we don't handle multitrack in aac, we don't need to check sub_url, only use expected type*/
-
-	/*override default*/
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_AUDIO;
-
-	/*audio object*/
-	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
-		GF_ESD *esd;
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = AAC_GetESD(read);
-		esd->OCRESID = 0;
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-	read->is_inline = 1;
-	/*inline scene: no specific service*/
-	return NULL;
-}
-
-static GF_Err AAC_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID=0;
-	GF_Err e;
-	AACReader *read = plug->priv;
-
-	e = GF_SERVICE_ERROR;
-	if (read->ch==channel) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AAC_IN] read->ch==channel = %p, GF_SERVICE_ERROR\n", channel));
-		goto exit;
-	}
-
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%ud", &ES_ID);
-	}
-	/*URL setup*/
-	else if (!read->ch && AAC_CanHandleURL(plug, url)) ES_ID = 1;
-
-	if (ES_ID==1) {
-		read->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err AAC_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AACReader *read = plug->priv;
-
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	if (read->ch == channel) {
-		AAC_disconnect_from_http_and_free(read);
-		read->ch = NULL;
-		if (read->data)
-			gf_free(read->data);
-		read->data = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err AAC_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	AACReader *read = plug->priv;
-
-
-	if (com->base.command_type==GF_NET_SERVICE_INFO) {
-		com->info.name = read->icy_track_name ? read->icy_track_name : read->icy_name;
-		com->info.comment = read->icy_genre;
-		return GF_OK;
-	}
-
-	if (!com->base.on_channel) {
-		/*if live session we may cache*/
-		if (read->is_live && (com->command_type==GF_NET_IS_CACHABLE)) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		if ((read->ch == com->base.on_channel) && read->is_live) {
-			if (com->buffer.max<1000) com->buffer.max = 1000;
-			com->buffer.min = com->buffer.max/2;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_SET_PADDING:
-		read->pad_bytes = com->pad.padding_bytes;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->duration;
-		com->duration.duration /= read->sample_rate;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		read->start_range = com->play.start_range;
-		read->end_range = com->play.end_range;
-		read->current_time = 0;
-		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
-
-		if (read->ch == com->base.on_channel) {
-			read->done = 0;
-			/*PLAY after complete download, estimate duration*/
-			if (!read->is_remote && !read->duration) {
-				AAC_ConfigureFromFile(read);
-				if (read->duration) {
-					GF_NetworkCommand rcfg;
-					rcfg.base.on_channel = read->ch;
-					rcfg.base.command_type = GF_NET_CHAN_DURATION;
-					rcfg.duration.duration = read->duration;
-					rcfg.duration.duration /= read->sample_rate;
-					gf_service_command(read->service, &rcfg, GF_OK);
-				}
-			}
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err AAC_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	u64 pos;
-	u32 start_from;
-	Bool sync;
-	GF_BitStream *bs;
-	ADTSHeader hdr;
-	AACReader *read = plug->priv;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = 0;
-	*is_new_data = 0;
-
-	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-	read->sl_hdr.randomAccessPointFlag = 1;
-	read->sl_hdr.compositionTimeStampFlag = 1;
-
-	if (read->ch != channel) return GF_STREAM_NOT_FOUND;
-
-	/*fetching es data*/
-	if (read->done) {
-		*out_reception_status = GF_EOS;
-		return GF_OK;
-	}
-
-	if (!read->data) {
-		if (!read->stream) {
-			*out_data_ptr = NULL;
-			*out_data_size = 0;
-			return GF_OK;
-		}
-		bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-		*is_new_data = 1;
-
-fetch_next:
-		pos = gf_ftell(read->stream);
-		sync = ADTS_SyncFrame(bs, !read->is_remote, &hdr);
-		if (!sync) {
-			gf_bs_del(bs);
-			if (!read->dnload) {
-				if (read->input->query_proxy) {
-					GF_NetworkCommand param;
-					param.command_type = GF_NET_SERVICE_QUERY_NEXT;
-					if ((read->input->query_proxy(read->input, &param)==GF_OK)
-					        && param.url_query.next_url
-					   ) {
-						gf_fclose(read->stream);
-						read->stream = gf_fopen(param.url_query.next_url, "rb");
-						*out_reception_status = GF_OK;
-						return GF_OK;
-					}
-				}
-
-				*out_reception_status = GF_EOS;
-				read->done = 1;
-			} else {
-				gf_fseek(read->stream, pos, SEEK_SET);
-				*out_reception_status = GF_OK;
-			}
-			return GF_OK;
-		}
-
-		if (!hdr.frame_size) {
-			gf_bs_del(bs);
-			*out_reception_status = GF_EOS;
-			read->done = 1;
-			return GF_OK;
-		}
-		read->data_size = hdr.frame_size;
-		read->nb_samp = 1024;
-		/*we're seeking*/
-		if (read->start_range && read->duration) {
-			start_from = (u32) (read->start_range * read->sample_rate);
-			if (read->current_time + read->nb_samp < start_from) {
-				read->current_time += read->nb_samp;
-				goto fetch_next;
-			} else {
-				read->start_range = 0;
-			}
-		}
-
-		read->sl_hdr.compositionTimeStamp = read->current_time;
-		assert( !read->data);
-		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
-		gf_bs_read_data(bs, read->data, read->data_size);
-		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
-		gf_bs_del(bs);
-	}
-	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr = read->data;
-	*out_data_size = read->data_size;
-	return GF_OK;
-}
-
-static GF_Err AAC_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AACReader *read = plug->priv;
-
-	if (read->ch == channel) {
-		if (!read->data) return GF_BAD_PARAM;
-		gf_free(read->data);
-		read->data = NULL;
-		read->current_time += read->nb_samp;
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-GF_InputService *AAC_Load()
-{
-
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC AAC Reader", "gpac distribution")
-
-	plug->CanHandleURL = AAC_CanHandleURL;
-	plug->ConnectService = AAC_ConnectService;
-	plug->CloseService = AAC_CloseService;
-	plug->GetServiceDescriptor = AAC_GetServiceDesc;
-	plug->ConnectChannel = AAC_ConnectChannel;
-	plug->DisconnectChannel = AAC_DisconnectChannel;
-	plug->ServiceCommand = AAC_ServiceCommand;
-	/*we do support pull mode*/
-	plug->ChannelGetSLP = AAC_ChannelGetSLP;
-	plug->ChannelReleaseSLP = AAC_ChannelReleaseSLP;
-	plug->RegisterMimeTypes = AAC_RegisterMimeTypes;
-	plug->priv = AAC_Reader_new();
-	return plug;
-}
-
-void AAC_Delete(void *ifce)
-{
-	AACReader *read;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!plug)
-		return;
-	read = plug->priv;
-	if (read) {
-		AAC_Reader_del(read);
-		plug->priv = NULL;
-	}
-	gf_free(plug);
-}
-
-#endif
-#endif
-
-#ifndef DONT_USE_TERMINAL_MODULE_API
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_NET_CLIENT_INTERFACE,
-#endif
-#ifdef GPAC_HAS_FAAD
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-
-	return si;
-}
-
-#ifdef GPAC_HAS_FAAD
-GF_BaseDecoder *NewFAADDec();
-void DeleteFAADDec(GF_BaseDecoder *ifcg);
-#endif
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)AAC_Load();
-#endif
-#ifdef GPAC_HAS_FAAD
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewFAADDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_FAAD
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteFAADDec((GF_BaseDecoder *)ifce);
-		break;
-#endif
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_NET_CLIENT_INTERFACE:
-		AAC_Delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( aac_in )
-
-#endif

gpac-0.8.0.tar.gz/modules/aac_in/faad_dec.c Deleted

@@ -1,496 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AAC reader module
- *
- *  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/setup.h>
-
-#ifdef GPAC_HAS_FAAD
-
-#ifdef __GNUC__
-#pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#endif
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE) || defined (WIN32)
-#  pragma comment(lib, "libfaad")
-# endif
-#endif
-
-#include <neaacdec.h>
-
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-#include <gpac/avparse.h>
-
-
-typedef struct
-{
-	NeAACDecHandle codec;
-	NeAACDecFrameInfo info;
-	u32 sample_rate, out_size, num_samples;
-	u8 num_channels;
-	/*no support for scalability in FAAD yet*/
-	u16 ES_ID;
-	Bool signal_mc;
-	Bool is_sbr;
-
-	char ch_reorder[16];
-	GF_ESD *esd;
-} FAADDec;
-
-
-#define FAADCTX() FAADDec *ctx = (FAADDec *) ifcg->privateStack
-
-static GF_Err FAAD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_Err e;
-	GF_M4ADecSpecInfo a_cfg;
-#endif
-	FAADCTX();
-
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->dataLength) return GF_NON_COMPLIANT_BITSTREAM;
-
-	if (!ctx->esd) {
-		ctx->esd = esd;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Attaching stream %d\n", esd->ESID));
-	}
-
-	if (ctx->codec) NeAACDecClose(ctx->codec);
-	ctx->codec = NeAACDecOpen();
-	if (!ctx->codec) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error initializing decoder\n"));
-		return GF_IO_ERR;
-	}
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
-	if (e) return e;
-#endif
-	if (NeAACDecInit2(ctx->codec, (unsigned char *)esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0)
-	{
-#ifndef GPAC_DISABLE_AV_PARSERS
-		s8 res;
-		char *dsi, *s_base_object_type;
-		u32 dsi_len;
-		switch (a_cfg.base_object_type) {
-		case GF_M4A_AAC_MAIN:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_MAIN);
-			goto base_object_type_error;
-		case GF_M4A_AAC_LC:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_LC);
-			goto base_object_type_error;
-		case GF_M4A_AAC_SSR:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_SSR);
-			goto base_object_type_error;
-		case GF_M4A_AAC_LTP:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_LTP);
-			goto base_object_type_error;
-		case GF_M4A_AAC_SBR:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_SBR);
-			goto base_object_type_error;
-		case GF_M4A_AAC_PS:
-			s_base_object_type = gf_stringizer(GF_M4A_AAC_PS);
-base_object_type_error: /*error case*/
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error: unsupported %s format for stream %d - defaulting to AAC LC\n", s_base_object_type, esd->ESID));
-		default:
-			break;
-		}
-		a_cfg.base_object_type = GF_M4A_AAC_LC;
-		a_cfg.has_sbr = GF_FALSE;
-		a_cfg.nb_chan = a_cfg.nb_chan > 2 ? 1 : a_cfg.nb_chan;
-
-		gf_m4a_write_config(&a_cfg, &dsi, &dsi_len);
-		res = NeAACDecInit2(ctx->codec, (unsigned char *) dsi, dsi_len, (unsigned long *) &ctx->sample_rate, (u8 *) &ctx->num_channels);
-		gf_free(dsi);
-		if (res < 0)
-#endif
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error when initializing AAC decoder for stream %d\n", esd->ESID));
-			return GF_NOT_SUPPORTED;
-		}
-	}
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-	ctx->is_sbr = a_cfg.has_sbr;
-#endif
-	ctx->num_samples = 1024;
-	ctx->out_size = 2 * ctx->num_samples * ctx->num_channels;
-	ctx->ES_ID = esd->ESID;
-	ctx->signal_mc = ctx->num_channels>2 ? GF_TRUE : GF_FALSE;
-	return GF_OK;
-}
-
-static GF_Err FAAD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	FAADCTX();
-	if (ES_ID != ctx->ES_ID) return GF_BAD_PARAM;
-	if (ctx->codec) NeAACDecClose(ctx->codec);
-	ctx->codec = NULL;
-	ctx->ES_ID = 0;
-	ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-	ctx->num_channels = 0;
-	return GF_OK;
-}
-static GF_Err FAAD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	u32 i;
-	FAADCTX();
-	switch (capability->CapCode) {
-	/*not tested yet*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ctx->sample_rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ctx->num_channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 12;
-		break;
-	/*by default AAC access unit lasts num_samples (timescale being sampleRate)*/
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt = ctx->num_samples;
-		break;
-	/*to refine, it seems that 4 bytes padding is not enough on all streams ?*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 8;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		capability->cap.valueInt = 0;
-		for (i=0; i<ctx->num_channels; i++) {
-			switch (ctx->info.channel_position[i]) {
-			case FRONT_CHANNEL_CENTER:
-				capability->cap.valueInt |= GF_AUDIO_CH_FRONT_CENTER;
-				break;
-			case FRONT_CHANNEL_LEFT:
-				capability->cap.valueInt |= GF_AUDIO_CH_FRONT_LEFT;
-				break;
-			case FRONT_CHANNEL_RIGHT:
-				capability->cap.valueInt |= GF_AUDIO_CH_FRONT_RIGHT;
-				break;
-			case SIDE_CHANNEL_LEFT:
-				capability->cap.valueInt |= GF_AUDIO_CH_SIDE_LEFT;
-				break;
-			case SIDE_CHANNEL_RIGHT:
-				capability->cap.valueInt |= GF_AUDIO_CH_SIDE_RIGHT;
-				break;
-			case BACK_CHANNEL_LEFT:
-				capability->cap.valueInt |= GF_AUDIO_CH_BACK_LEFT;
-				break;
-			case BACK_CHANNEL_RIGHT:
-				capability->cap.valueInt |= GF_AUDIO_CH_BACK_RIGHT;
-				break;
-			case BACK_CHANNEL_CENTER:
-				capability->cap.valueInt |= GF_AUDIO_CH_BACK_CENTER;
-				break;
-			case LFE_CHANNEL:
-				capability->cap.valueInt |= GF_AUDIO_CH_LFE;
-				break;
-			default:
-				break;
-			}
-		}
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err FAAD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-static s8 FAAD_GetChannelPos(FAADDec *ffd, u32 ch_cfg)
-{
-	u32 i;
-	for (i=0; i<ffd->info.channels; i++) {
-		switch (ffd->info.channel_position[i]) {
-		case FRONT_CHANNEL_CENTER:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_CENTER) return i;
-			break;
-		case FRONT_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_LEFT) return i;
-			break;
-		case FRONT_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_RIGHT) return i;
-			break;
-		case SIDE_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_SIDE_LEFT) return i;
-			break;
-		case SIDE_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_SIDE_RIGHT) return i;
-			break;
-		case BACK_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_BACK_LEFT) return i;
-			break;
-		case BACK_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_BACK_RIGHT) return i;
-			break;
-		case BACK_CHANNEL_CENTER:
-			if (ch_cfg==GF_AUDIO_CH_BACK_CENTER) return i;
-			break;
-		case LFE_CHANNEL:
-			if (ch_cfg==GF_AUDIO_CH_LFE) return i;
-			break;
-		}
-	}
-	return -1;
-}
-
-static GF_Err FAAD_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	void *buffer;
-	unsigned short *conv_in, *conv_out;
-	u32 i, j;
-	FAADCTX();
-
-	/*if late or seeking don't decode*/
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-//	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-
-	if (ctx->out_size > *outBufferLength) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Decoding AU\n"));
-	buffer = NeAACDecDecode(ctx->codec, &ctx->info, (unsigned char *) inBuffer, inBufferLength);
-	if (ctx->info.error>0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", NeAACDecGetErrorMessage(ctx->info.error) ));
-		*outBufferLength = 0;
-		//reinit if error
-		FAAD_AttachStream((GF_BaseDecoder *)ifcg, ctx->esd);
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	if (!ctx->info.samples || !buffer || !ctx->info.bytesconsumed) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] empty/non complete AU\n"));
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] AU decoded\n"));
-
-	/*FAAD froces us to decode a frame to get channel cfg*/
-	if (ctx->signal_mc) {
-		s32 ch, idx;
-		ctx->signal_mc = GF_FALSE;
-		idx = 0;
-		/*NOW WATCH OUT!! FAAD may very well decide to output more channels than indicated!!!*/
-		ctx->num_channels = ctx->info.channels;
-
-		/*get cfg*/
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_FRONT_LEFT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_FRONT_RIGHT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_FRONT_CENTER);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_LFE);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_BACK_LEFT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_BACK_RIGHT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_BACK_CENTER);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_SIDE_LEFT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-		ch = FAAD_GetChannelPos(ctx, GF_AUDIO_CH_SIDE_RIGHT);
-		if (ch>=0) {
-			ctx->ch_reorder[idx] = ch;
-			idx++;
-		}
-
-		*outBufferLength = ctx->out_size;
-		if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-			*outBufferLength = ctx->out_size = (u32) (sizeof(short)*ctx->info.samples);
-		}
-		return GF_BUFFER_TOO_SMALL;
-	}
-	if (sizeof(short) * ctx->info.samples > *outBufferLength) {
-		*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	/*we assume left/right order*/
-	if (ctx->num_channels<=2) {
-		memcpy(outBuffer, buffer, sizeof(short)* ctx->info.samples);
-		*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
-		return GF_OK;
-	}
-	conv_in = (unsigned short *) buffer;
-	conv_out = (unsigned short *) outBuffer;
-	for (i=0; i<ctx->info.samples; i+=ctx->info.channels) {
-		for (j=0; j<ctx->info.channels; j++) {
-			conv_out[i + j] = conv_in[i + ctx->ch_reorder[j]];
-		}
-	}
-	*outBufferLength = (u32) (sizeof(short)*ctx->info.samples);
-	return GF_OK;
-}
-
-static const char *FAAD_GetCodecName(GF_BaseDecoder *ifcg)
-{
-	FAADCTX();
-	if (ctx->is_sbr) return "FAAD2 " FAAD2_VERSION " SBR mode";
-	return "FAAD2 " FAAD2_VERSION;
-}
-
-static u32 FAAD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_M4ADecSpecInfo a_cfg;
-#endif
-
-	/*audio decs*/
-	if (StreamType != GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	/*MPEG2 aac*/
-	case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-	/*MPEG4 aac*/
-	case GPAC_OTI_AUDIO_AAC_MPEG4:
-		break;
-	default:
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-	/*this codec currently requires AAC config in ESD*/
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] DecoderSpecificInfo missing - cannot initialize\n"));
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg) != GF_OK) return GF_CODEC_NOT_SUPPORTED;
-
-	switch (a_cfg.base_object_type) {
-	case GF_M4A_AAC_MAIN:
-	case GF_M4A_AAC_LC:
-	case GF_M4A_AAC_SSR:
-	case GF_M4A_AAC_LTP:
-	case GF_M4A_AAC_SBR:
-		return GF_CODEC_SUPPORTED;
-	case GF_M4A_ER_AAC_LC:
-	case GF_M4A_ER_AAC_LTP:
-	case GF_M4A_ER_AAC_SCALABLE:
-	case GF_M4A_ER_AAC_LD:
-	case GF_M4A_AAC_PS:
-		return GF_CODEC_MAYBE_SUPPORTED;
-	default:
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-#endif
-
-	return GF_CODEC_SUPPORTED;
-}
-
-GF_BaseDecoder *NewFAADDec()
-{
-	GF_MediaDecoder *ifce;
-	FAADDec *dec;
-
-	GF_SAFEALLOC(ifce, GF_MediaDecoder);
-	if (!ifce) return NULL;
-	GF_SAFEALLOC(dec, FAADDec);
-	if (!dec) {
-		gf_free(dec);
-		return NULL;
-	}
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "FAAD2 Decoder", "gpac distribution")
-
-	ifce->privateStack = dec;
-
-	/*setup our own interface*/
-	ifce->AttachStream = FAAD_AttachStream;
-	ifce->DetachStream = FAAD_DetachStream;
-	ifce->GetCapabilities = FAAD_GetCapabilities;
-	ifce->SetCapabilities = FAAD_SetCapabilities;
-	ifce->ProcessData = FAAD_ProcessData;
-	ifce->CanHandleStream = FAAD_CanHandleStream;
-	ifce->GetName = FAAD_GetCodecName;
-	return (GF_BaseDecoder *) ifce;
-}
-
-void DeleteFAADDec(GF_BaseDecoder *ifcg)
-{
-	FAADCTX();
-	if (ctx->codec) NeAACDecClose(ctx->codec);
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-
-#endif

gpac-0.8.0.tar.gz/modules/ac3_in Deleted

gpac-0.8.0.tar.gz/modules/ac3_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/ac3_in/ac3_in.c Deleted

@@ -1,704 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AC3 reader module
- *
- *  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/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-	GF_ClientService *service;
-
-	Bool is_remote;
-
-	FILE *stream;
-	u32 duration;
-
-	Bool needs_connection;
-	u32 pad_bytes;
-	Bool done;
-	u32 is_inline;
-	LPNETCHANNEL ch;
-
-	unsigned char *data;
-	u32 data_size;
-	GF_SLHeader sl_hdr;
-
-	u32 sample_rate, nb_ch;
-	Double start_range, end_range;
-	u32 current_time, nb_samp;
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-
-	Bool is_live;
-	char prev_data[1000];
-	u32 prev_size;
-
-	char *icy_name;
-	char *icy_genre;
-	char *icy_track_name;
-} AC3Reader;
-
-static const char * AC3_MIMES[] = { "audio/ac3", "audio/x-ac3", NULL };
-
-static const char * AC3_EXTS = "ac3";
-
-static const char * AC3_DESC = "AC3 Music";
-
-static u32 AC3_RegisterMimeTypes(const GF_InputService *plug)
-{
-	u32 i;
-	for (i = 0 ; AC3_MIMES[i]; i++)
-		gf_service_register_mime(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC);
-	return i;
-}
-
-static Bool AC3_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	u32 i;
-	sExt = strrchr(url, '.');
-	for (i = 0 ; AC3_MIMES[i]; i++) {
-		if (gf_service_check_mime_register(plug, AC3_MIMES[i], AC3_EXTS, AC3_DESC, sExt)) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool ac3_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-static GF_ESD *AC3_GetESD(AC3Reader *read)
-{
-	GF_ESD *esd;
-	esd = gf_odf_desc_esd_new(0);
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AC3;
-	esd->ESID = 1;
-	esd->OCRESID = 1;
-	esd->slConfig->timestampResolution = read->sample_rate;
-	if (read->is_live) esd->slConfig->useAccessUnitEndFlag = esd->slConfig->useAccessUnitStartFlag = 1;
-	return esd;
-}
-
-static void AC3_SetupObject(AC3Reader *read)
-{
-	GF_ESD *esd;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	od->objectDescriptorID = 1;
-	esd = AC3_GetESD(read);
-	esd->OCRESID = 0;
-	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
-}
-
-
-static Bool AC3_ConfigureFromFile(AC3Reader *read)
-{
-	Bool sync;
-	GF_BitStream *bs;
-	GF_AC3Header hdr;
-	memset(&hdr, 0, sizeof(GF_AC3Header));
-	if (!read->stream) return GF_FALSE;
-	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-
-
-	sync = gf_ac3_parser_bs(bs, &hdr, GF_TRUE);
-	if (!sync) {
-		gf_bs_del(bs);
-		return GF_FALSE;
-	}
-	read->nb_ch = hdr.channels;
-	read->sample_rate = hdr.sample_rate;
-	read->duration = 0;
-
-	if (!read->is_remote) {
-		read->duration = 1536;
-		gf_bs_skip_bytes(bs, hdr.framesize);
-		while (gf_ac3_parser_bs(bs, &hdr, GF_FALSE)) {
-			read->duration += 1536;
-			gf_bs_skip_bytes(bs, hdr.framesize);
-		}
-	}
-	gf_bs_del(bs);
-	gf_fseek(read->stream, 0, SEEK_SET);
-	return GF_TRUE;
-}
-
-static void AC3_RegulateDataRate(AC3Reader *read)
-{
-	GF_NetworkCommand com;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-	com.base.on_channel = read->ch;
-	while (read->ch) {
-		gf_service_command(read->service, &com, GF_OK);
-		if (com.buffer.occupancy < com.buffer.max) break;
-		gf_sleep(2);
-	}
-}
-
-static void AC3_OnLiveData(AC3Reader *read, const char *data, u32 data_size)
-{
-	u64 pos;
-	Bool sync;
-	GF_BitStream *bs;
-	GF_AC3Header hdr;
-
-	memset(&hdr, 0, sizeof(GF_AC3Header));
-
-	read->data = (unsigned char*)gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
-	memcpy(read->data + read->data_size, data, sizeof(char)*data_size);
-	read->data_size += data_size;
-
-	if (read->needs_connection) {
-		read->needs_connection = GF_FALSE;
-		bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
-		sync = gf_ac3_parser_bs(bs, &hdr, GF_TRUE);
-		gf_bs_del(bs);
-		if (!sync) return;
-		read->nb_ch = hdr.channels;
-		read->sample_rate = hdr.sample_rate;
-		read->is_live = GF_TRUE;
-		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-		gf_service_connect_ack(read->service, NULL, GF_OK);
-		AC3_SetupObject(read);
-	}
-	if (!read->ch) return;
-
-	/*need a full ac3 header*/
-	if (read->data_size<=7) return;
-
-	bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
-	hdr.framesize = 0;
-
-	while (gf_ac3_parser_bs(bs, &hdr, GF_FALSE)) {
-		pos = gf_bs_get_position(bs);
-		read->sl_hdr.accessUnitStartFlag = 1;
-		read->sl_hdr.accessUnitEndFlag = 1;
-		read->sl_hdr.AU_sequenceNumber++;
-		read->sl_hdr.compositionTimeStampFlag = 1;
-		read->sl_hdr.compositionTimeStamp += 1536;
-		gf_service_send_packet(read->service, read->ch, (char *) read->data + pos, hdr.framesize, &read->sl_hdr, GF_OK);
-		gf_bs_skip_bytes(bs, hdr.framesize);
-	}
-
-	pos = gf_bs_get_position(bs);
-	gf_bs_del(bs);
-
-	if (pos) {
-		u8 *d;
-		read->data_size -= (u32) pos;
-		d = (u8*)gf_malloc(sizeof(char) * read->data_size);
-		memcpy(d, read->data + pos, sizeof(char) * read->data_size);
-		gf_free(read->data);
-		read->data = d;
-	}
-	AC3_RegulateDataRate(read);
-}
-
-void AC3_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	u32 total_size, bytes_done;
-	AC3Reader *read = (AC3Reader *) cbk;
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		if (read->stream) {
-			read->is_remote = GF_FALSE;
-			e = GF_EOS;
-		} else if (!read->needs_connection) {
-			return;
-		}
-	} else if (param->msg_type==GF_NETIO_PARSE_HEADER) {
-		if (!strcmp(param->name, "icy-name")) {
-			if (read->icy_name) gf_free(read->icy_name);
-			read->icy_name = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-genre")) {
-			if (read->icy_genre) gf_free(read->icy_genre);
-			read->icy_genre = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-meta")) {
-			GF_NetworkCommand com;
-			char *meta;
-			if (read->icy_track_name) gf_free(read->icy_track_name);
-			read->icy_track_name = NULL;
-			meta = param->value;
-			while (meta && meta[0]) {
-				char *sep = strchr(meta, ';');
-				if (sep) sep[0] = 0;
-
-				if (!strnicmp(meta, "StreamTitle=", 12)) {
-					read->icy_track_name = gf_strdup(meta+12);
-				}
-				if (!sep) break;
-				sep[0] = ';';
-				meta = sep+1;
-			}
-
-			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_service_command(read->service, &com, GF_OK);
-		}
-		return;
-	} else {
-		/*handle service message*/
-		gf_service_download_update_stats(read->dnload);
-		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
-	}
-
-	/*data fetching or EOS*/
-	if (e >= GF_OK) {
-		if (read->needs_connection) {
-			gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-			if (!total_size) read->is_live = GF_TRUE;
-		}
-		if (read->is_live) {
-			if (!e) AC3_OnLiveData(read, param->data, param->size);
-			return;
-		}
-		if (read->stream) return;
-
-		/*open service*/
-		szCache = gf_dm_sess_get_cache_name(read->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			read->stream = gf_fopen((char *) szCache, "rb");
-			if (!read->stream) e = GF_SERVICE_ERROR;
-			else {
-				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = GF_FALSE;
-				e = GF_OK;
-				/*not enough data*/
-				if (!AC3_ConfigureFromFile(read)) {
-					/*get amount downloaded and check*/
-					gf_dm_sess_get_stats(read->dnload, NULL, NULL, NULL, &bytes_done, NULL, NULL);
-					if (bytes_done>10*1024) {
-						e = GF_CORRUPTED_DATA;
-					} else {
-						gf_fclose(read->stream);
-						read->stream = NULL;
-						return;
-					}
-				}
-			}
-		}
-	}
-	/*OK confirm*/
-	if (read->needs_connection) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, e);
-		if (!e) AC3_SetupObject(read);
-	}
-}
-
-void ac3_download_file(GF_InputService *plug, char *url)
-{
-	AC3Reader *read = (AC3Reader*) plug->priv;
-
-	read->needs_connection = GF_TRUE;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, AC3_NetIO, read);
-	if (!read->dnload ) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-
-static GF_Err AC3_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *ext;
-	GF_Err reply;
-	AC3Reader *read = (AC3Reader*)plug->priv;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) ext[0] = 0;
-
-	/*remote fetch*/
-	read->is_remote = !ac3_is_local(szURL);
-	if (read->is_remote) {
-		ac3_download_file(plug, (char *) szURL);
-		return GF_OK;
-	}
-
-	reply = GF_OK;
-	read->stream = gf_fopen(szURL, "rb");
-	if (!read->stream) {
-		reply = GF_URL_ERROR;
-	} else if (!AC3_ConfigureFromFile(read)) {
-		gf_fclose(read->stream);
-		read->stream = NULL;
-		reply = GF_NOT_SUPPORTED;
-	}
-	gf_service_connect_ack(serv, NULL, reply);
-	if (!reply && read->is_inline ) AC3_SetupObject(read);
-	return GF_OK;
-}
-
-static GF_Err AC3_CloseService(GF_InputService *plug)
-{
-	AC3Reader *read = (AC3Reader*)plug->priv;
-	if (read->stream) gf_fclose(read->stream);
-	read->stream = NULL;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	if (read->data) gf_free(read->data);
-	read->data = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *AC3_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	AC3Reader *read = (AC3Reader*)plug->priv;
-	/*since we don't handle multitrack in ac3, we don't need to check sub_url, only use expected type*/
-
-	/*override default*/
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_AUDIO;
-
-	/*audio object*/
-	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
-		GF_ESD *esd;
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = AC3_GetESD(read);
-		esd->OCRESID = 0;
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-	read->is_inline = 1;
-	/*inline scene: no specific service*/
-	return NULL;
-}
-
-static GF_Err AC3_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID=0;
-	GF_Err e;
-	AC3Reader *read = (AC3Reader*)plug->priv;
-
-	e = GF_SERVICE_ERROR;
-	if (read->ch==channel) goto exit;
-
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%ud", &ES_ID);
-	}
-	/*URL setup*/
-	else if (!read->ch && AC3_CanHandleURL(plug, url)) ES_ID = 1;
-
-	if (ES_ID==1) {
-		read->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err AC3_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AC3Reader *read = (AC3Reader*)plug->priv;
-
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	if (read->ch == channel) {
-		read->ch = NULL;
-		if (read->data) gf_free(read->data);
-		read->data = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err AC3_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	AC3Reader *read = (AC3Reader*)plug->priv;
-
-	if (com->base.command_type==GF_NET_SERVICE_INFO) {
-		com->info.name = read->icy_track_name ? read->icy_track_name : read->icy_name;
-		com->info.comment = read->icy_genre;
-		return GF_OK;
-	}
-
-	if (!com->base.on_channel) {
-		/*if live session we may cache*/
-		if (read->is_live && (com->command_type==GF_NET_IS_CACHABLE)) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		if ((read->ch == com->base.on_channel) && read->is_live) {
-			if (com->buffer.max<1000) com->buffer.max = 1000;
-			com->buffer.min = com->buffer.max/2;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_SET_PADDING:
-		read->pad_bytes = com->pad.padding_bytes;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->duration;
-		com->duration.duration /= read->sample_rate;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		read->start_range = com->play.start_range;
-		read->end_range = com->play.end_range;
-		read->current_time = 0;
-		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
-
-		if (read->ch == com->base.on_channel) {
-			read->done = GF_FALSE;
-			/*PLAY after complete download, estimate duration*/
-			if (!read->is_remote && !read->duration) {
-				AC3_ConfigureFromFile(read);
-				if (read->duration) {
-					GF_NetworkCommand rcfg;
-					rcfg.base.on_channel = read->ch;
-					rcfg.base.command_type = GF_NET_CHAN_DURATION;
-					rcfg.duration.duration = read->duration;
-					rcfg.duration.duration /= read->sample_rate;
-					gf_service_command(read->service, &rcfg, GF_OK);
-				}
-			}
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err AC3_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	u64 pos, start_from;
-	Bool sync;
-	GF_BitStream *bs;
-	GF_AC3Header hdr;
-	AC3Reader *read = (AC3Reader*)plug->priv;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = GF_FALSE;
-	*is_new_data = GF_FALSE;
-	memset(&hdr, 0, sizeof(GF_AC3Header));
-
-	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-	read->sl_hdr.randomAccessPointFlag = 1;
-	read->sl_hdr.compositionTimeStampFlag = 1;
-
-	if (read->ch != channel) return GF_STREAM_NOT_FOUND;
-
-	/*fetching es data*/
-	if (read->done) {
-		*out_reception_status = GF_EOS;
-		return GF_OK;
-	}
-
-	if (!read->data) {
-		if (!read->stream) {
-			*out_data_ptr = NULL;
-			*out_data_size = 0;
-			return GF_OK;
-		}
-		bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-		*is_new_data = GF_TRUE;
-
-fetch_next:
-		pos = gf_ftell(read->stream);
-		sync = gf_ac3_parser_bs(bs, &hdr, GF_FALSE);
-		if (!sync) {
-			gf_bs_del(bs);
-			if (!read->dnload) {
-				*out_reception_status = GF_EOS;
-				read->done = GF_TRUE;
-			} else {
-				gf_fseek(read->stream, pos, SEEK_SET);
-				*out_reception_status = GF_OK;
-			}
-			return GF_OK;
-		}
-
-		if (!hdr.framesize) {
-			gf_bs_del(bs);
-			*out_reception_status = GF_EOS;
-			read->done = GF_TRUE;
-			return GF_OK;
-		}
-		read->data_size = hdr.framesize;
-		read->nb_samp = 1536;
-		/*we're seeking*/
-		if (read->start_range && read->duration) {
-			start_from = (u32) (read->start_range * read->sample_rate);
-			if (read->current_time + read->nb_samp < start_from) {
-				read->current_time += read->nb_samp;
-				goto fetch_next;
-			} else {
-				read->start_range = 0;
-			}
-		}
-
-		read->sl_hdr.compositionTimeStamp = read->current_time;
-
-		read->data = (unsigned char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
-		gf_bs_read_data(bs, (char *) read->data, read->data_size);
-		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
-		gf_bs_del(bs);
-	}
-	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr =(char *) read->data;
-	*out_data_size = read->data_size;
-	return GF_OK;
-}
-
-static GF_Err AC3_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AC3Reader *read = (AC3Reader*)plug->priv;
-
-	if (read->ch == channel) {
-		if (!read->data) return GF_BAD_PARAM;
-		gf_free(read->data);
-		read->data = NULL;
-		read->current_time += read->nb_samp;
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-GF_InputService *AC3_Load()
-{
-	AC3Reader *reader;
-	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC AC3 Reader", "gpac distribution")
-
-	plug->RegisterMimeTypes = AC3_RegisterMimeTypes;
-	plug->CanHandleURL = AC3_CanHandleURL;
-	plug->ConnectService = AC3_ConnectService;
-	plug->CloseService = AC3_CloseService;
-	plug->GetServiceDescriptor = AC3_GetServiceDesc;
-	plug->ConnectChannel = AC3_ConnectChannel;
-	plug->DisconnectChannel = AC3_DisconnectChannel;
-	plug->ServiceCommand = AC3_ServiceCommand;
-	/*we do support pull mode*/
-	plug->ChannelGetSLP = AC3_ChannelGetSLP;
-	plug->ChannelReleaseSLP = AC3_ChannelReleaseSLP;
-
-	reader = (AC3Reader*)gf_malloc(sizeof(AC3Reader));
-	memset(reader, 0, sizeof(AC3Reader));
-	plug->priv = reader;
-	return plug;
-}
-
-void AC3_Delete(void *ifce)
-{
-	GF_InputService *plug = (GF_InputService *) ifce;
-	AC3Reader *read = (AC3Reader*)plug->priv;
-	gf_free(read);
-	gf_free(plug);
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-#ifdef GPAC_HAS_LIBA52
-GF_BaseDecoder *NewAC3Dec();
-void DeleteAC3Dec(GF_BaseDecoder *ifcg);
-#endif
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_NET_CLIENT_INTERFACE,
-#endif
-#ifdef GPAC_HAS_LIBA52
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)AC3_Load();
-#endif
-#ifdef GPAC_HAS_LIBA52
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewAC3Dec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_LIBA52
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteAC3Dec((GF_BaseDecoder *)ifce);
-		break;
-#endif
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_NET_CLIENT_INTERFACE:
-		AC3_Delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( ac3 )

gpac-0.8.0.tar.gz/modules/ac3_in/liba52_dec.c Deleted

@@ -1,374 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AAC reader module
- *
- *  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.
- *
- */
-
-#ifdef GPAC_HAS_LIBA52
-
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE) || defined (WIN32)
-#  pragma comment(lib, "liba52")
-# endif
-#endif
-
-
-#ifndef uint32_t
-#define uint32_t u32
-#endif
-#ifndef uint8_t
-#define uint8_t u8
-#endif
-
-#include <a52dec/mm_accel.h>
-#include <a52dec/a52.h>
-
-
-typedef struct
-{
-	a52_state_t *codec;
-	sample_t* samples;
-
-	u32 sample_rate, num_samples, out_size, flags;
-	u8 num_channels;
-	/*no support for scalability in FAAD yet*/
-	u16 ES_ID;
-
-	char ch_reorder[16];
-} AC3Dec;
-
-
-#define A52CTX() AC3Dec *ctx = (AC3Dec *) ifcg->privateStack
-
-static GF_Err AC3_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	A52CTX();
-
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Attaching stream %d\n", esd->ESID));
-
-	if (ctx->codec) a52_free(ctx->codec);
-	ctx->codec = a52_init(MM_ACCEL_DJBFFT);
-	if (!ctx->codec) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
-		return GF_IO_ERR;
-	}
-	ctx->samples = a52_samples(ctx->codec);
-	if (!ctx->samples) {
-		a52_free(ctx->codec);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
-		return GF_IO_ERR;
-	}
-
-	ctx->num_channels = 0;
-	ctx->sample_rate = 0;
-	ctx->out_size = 0;
-	ctx->num_samples = 1536;
-	ctx->ES_ID = esd->ESID;
-	return GF_OK;
-}
-
-static GF_Err AC3_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	A52CTX();
-	if (ES_ID != ctx->ES_ID) return GF_BAD_PARAM;
-	if (ctx->codec) a52_free(ctx->codec);
-	ctx->codec = NULL;
-	ctx->ES_ID = 0;
-	ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-	ctx->num_channels = 0;
-	return GF_OK;
-}
-static GF_Err AC3_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	A52CTX();
-	switch (capability->CapCode) {
-	/*not tested yet*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ctx->sample_rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ctx->num_channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 12;
-		break;
-	/*by default AAC access unit lasts num_samples (timescale being sampleRate)*/
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt = ctx->num_samples;
-		break;
-	/*to refine, it seems that 4 bytes padding is not enough on all streams ?*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 8;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		capability->cap.valueInt = 0;
-		switch (ctx->flags & A52_CHANNEL_MASK) {
-		case A52_CHANNEL1:
-		case A52_CHANNEL2:
-		case A52_MONO:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-			break;
-		case A52_CHANNEL:
-		case A52_STEREO:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-			break;
-		case A52_DOLBY:
-			break;
-		case A52_3F:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-			break;
-		case A52_2F1R:
-			capability->cap.valueInt = GF_AUDIO_CH_BACK_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-			break;
-		case A52_3F1R:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_BACK_CENTER;
-			break;
-		case A52_2F2R:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_BACK_LEFT | GF_AUDIO_CH_BACK_RIGHT;
-			break;
-		case A52_3F2R:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_BACK_LEFT | GF_AUDIO_CH_BACK_RIGHT;
-			break;
-		}
-		if (ctx->flags & A52_LFE)
-			capability->cap.valueInt |= GF_AUDIO_CH_LFE;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err AC3_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-#if 0
-static s8 AC3_GetChannelPos(AC3Dec *ffd, u32 ch_cfg)
-{
-	u32 i;
-	for (i=0; i<ffd->info.channels; i++) {
-		switch (ffd->info.channel_position[i]) {
-		case FRONT_CHANNEL_CENTER:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_CENTER) return i;
-			break;
-		case FRONT_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_LEFT) return i;
-			break;
-		case FRONT_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_FRONT_RIGHT) return i;
-			break;
-		case SIDE_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_SIDE_LEFT) return i;
-			break;
-		case SIDE_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_SIDE_RIGHT) return i;
-			break;
-		case BACK_CHANNEL_LEFT:
-			if (ch_cfg==GF_AUDIO_CH_BACK_LEFT) return i;
-			break;
-		case BACK_CHANNEL_RIGHT:
-			if (ch_cfg==GF_AUDIO_CH_BACK_RIGHT) return i;
-			break;
-		case BACK_CHANNEL_CENTER:
-			if (ch_cfg==GF_AUDIO_CH_BACK_CENTER) return i;
-			break;
-		case LFE_CHANNEL:
-			if (ch_cfg==GF_AUDIO_CH_LFE) return i;
-			break;
-		}
-	}
-	return -1;
-}
-#endif
-
-/**** the following two functions comes from a52dec */
-static GFINLINE s32 blah (s32 i)
-{
-	if (i > 0x43c07fff)
-		return 32767;
-	else if (i < 0x43bf8000)
-		return -32768;
-	return i - 0x43c00000;
-}
-
-static GFINLINE void float_to_int (float * _f, s16 *samps, int nchannels)
-{
-	int i, j, c;
-	s32 * f = (s32 *) _f;       // XXX assumes IEEE float format
-
-	j = 0;
-	nchannels *= 256;
-	for (i = 0; i < 256; i++) {
-		for (c = 0; c < nchannels; c += 256)
-			samps[j++] = blah (f[i + c]);
-	}
-}
-
-/**** end */
-
-static const int ac3_channels[8] = {
-	2, 1, 2, 3, 3, 4, 4, 5
-};
-
-static GF_Err AC3_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	short *out_samples;
-	int i, len, bit_rate;
-	sample_t level;
-	A52CTX();
-
-	/*check not using scalabilty*/
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-
-	/*if late or seeking don't decode*/
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-
-	if (ctx->out_size > *outBufferLength) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Decoding AU\n"));
-
-	len = a52_syncinfo(inBuffer, &ctx->flags, &ctx->sample_rate, &bit_rate);
-	if (!len) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*init decoder*/
-	if (!ctx->out_size) {
-		ctx->num_channels = ac3_channels[ctx->flags & 7];
-		if (ctx->flags & A52_LFE) ctx->num_channels++;
-		ctx->flags |= A52_ADJUST_LEVEL;
-
-		ctx->out_size = ctx->num_channels * sizeof(short) * 1536;
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	level = 1;
-	if ( a52_frame(ctx->codec, inBuffer, &ctx->flags, &level, 384)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Error decoding AU\n" ));
-		*outBufferLength = 0;
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	out_samples = (short*)outBuffer;
-	for (i=0; i<6; i++) {
-		if (a52_block(ctx->codec))
-			return GF_NON_COMPLIANT_BITSTREAM;
-
-		float_to_int(ctx->samples, out_samples + i * 256 * ctx->num_channels, ctx->num_channels);
-	}
-
-	*outBufferLength = 6 * ctx->num_channels * 256 * sizeof(short);
-
-	return GF_OK;
-}
-
-static const char *AC3_GetCodecName(GF_BaseDecoder *ifcg)
-{
-	return "LIBA52 AC3 Decoder";
-}
-
-static u32 AC3_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	/*audio decs*/
-	if (StreamType != GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_AUDIO_AC3:
-		return GF_CODEC_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-GF_BaseDecoder *NewAC3Dec()
-{
-	GF_MediaDecoder *ifce;
-	AC3Dec *dec;
-
-	GF_SAFEALLOC(ifce, GF_MediaDecoder);
-	GF_SAFEALLOC(dec, AC3Dec);
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "LIBA52 AC3 Decoder", "gpac distribution")
-
-	ifce->privateStack = dec;
-
-	/*setup our own interface*/
-	ifce->AttachStream = AC3_AttachStream;
-	ifce->DetachStream = AC3_DetachStream;
-	ifce->GetCapabilities = AC3_GetCapabilities;
-	ifce->SetCapabilities = AC3_SetCapabilities;
-	ifce->ProcessData = AC3_ProcessData;
-	ifce->CanHandleStream = AC3_CanHandleStream;
-	ifce->GetName = AC3_GetCodecName;
-	return (GF_BaseDecoder *) ifce;
-}
-
-void DeleteAC3Dec(GF_BaseDecoder *ifcg)
-{
-	AC3Dec *ctx;
-	if (!ifcg)
-		return;
-	ctx = (AC3Dec *) ifcg->privateStack;
-	if (ctx) {
-		if (ctx->codec)
-			a52_free(ctx->codec);
-		ctx->codec = NULL;
-		gf_free(ctx);
-		ifcg->privateStack = NULL;
-	}
-	gf_free(ifcg);
-}
-
-
-#endif

gpac-0.8.0.tar.gz/modules/amr_dec Deleted

gpac-0.8.0.tar.gz/modules/amr_dec/Makefile Deleted

@@ -1,80 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/amr_dec
-
-#note: __MSDOS__ defined is the same cfg as linux. There may be some pbs on other platforms, to check...
-CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" -D__MSDOS__ -DMMS_IO -DWMOPS=0 -DVAD1
-
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g -DDEBUG
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS=amr_in.o
-NAME=amr_in
-
-ifeq ($(CONFIG_AMR_NB), yes)
-NAME=amr_dec
-OBJS+= amr_dec.o \
-	./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
-	./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
-	./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
-	./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
-	./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
-	./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
-	./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
-	./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
-	./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
-	./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
-	./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
-	./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
-	./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
-	./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
-	./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
-	./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
-	./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
-	./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
-	./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
-	./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
-	./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
-	./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
-	./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
-
-else
-
-CFLAGS+=-DGPAC_AMR_IN_STANDALONE
-
-endif
-
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_$(NAME)$(DYN_LIB_SUFFIX)
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) $(CFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/amr_dec/amr_dec.c Deleted

@@ -1,342 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AMR decoder module
- *
- *  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 AMR stuff*/
-//#include "amr_nb/sp_dec.h"
-//#include "amr_nb/d_homing.h"
-/*remove AMR types to avoid any typedef warning/error*/
-#undef Float
-#undef Bool
-
-/*decoder Interface*/
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-
-#ifdef GPAC_HAS_AMR_NB_3GPP
-
-/*default size in CU of composition memory for audio*/
-#define DEFAULT_AUDIO_CM_SIZE			12
-/*default critical size in CU of composition memory for audio*/
-#define DEFAULT_AUDIO_CM_TRIGGER		4
-
-/*our own headers for AMR NB*/
-#if (defined(WIN32) || defined(_WIN32_WCE))
-#include "amr_nb_api.h"
-#if !defined(__GNUC__)
-#pragma comment(lib, "libamrnb")
-#endif
-#else
-#include "amr_nb/sp_dec.h"
-#include "amr_nb/d_homing.h"
-#endif
-
-typedef struct
-{
-	u32 out_size;
-	/*AMR NB state vars*/
-	__Speech_Decode_FrameState * speech_decoder_state;
-	enum RXFrameType rx_type;
-	enum Mode mode;
-
-	s16 reset_flag, reset_flag_old;
-
-} AMRDec;
-
-#define AMRCTX() AMRDec *ctx = (AMRDec *) ifcg->privateStack
-
-
-static GF_Err AMR_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	u32 packed_size;
-	AMRCTX();
-	if (esd->dependsOnESID || !esd->decoderConfig->decoderSpecificInfo) return GF_NOT_SUPPORTED;
-
-	if (strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "samr", 4)
-	        && strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "amr ", 4)) return GF_NOT_SUPPORTED;
-
-	ctx->reset_flag = 0;
-	ctx->reset_flag_old = 1;
-	ctx->mode = 0;
-	ctx->rx_type = 0;
-	ctx->speech_decoder_state = NULL;
-	if (Speech_Decode_Frame_init(&ctx->speech_decoder_state, "Decoder")) return GF_IO_ERR;
-
-	packed_size = (u32) (esd->decoderConfig->decoderSpecificInfo->dataLength>14) ? esd->decoderConfig->decoderSpecificInfo->data[13] : 0;
-	/*max possible frames in a sample are seen in MP4, that's 15*/
-	if (!packed_size) packed_size = 15;
-
-	ctx->out_size = packed_size * 2 * 160;
-	return GF_OK;
-}
-
-static GF_Err AMR_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	AMRCTX();
-	Speech_Decode_Frame_exit(&ctx->speech_decoder_state);
-	ctx->speech_decoder_state = NULL;
-	return GF_OK;
-}
-static GF_Err AMR_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	AMRCTX();
-	switch (capability->CapCode) {
-	/*not tested yet*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = 8000;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = DEFAULT_AUDIO_CM_TRIGGER;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = DEFAULT_AUDIO_CM_SIZE;
-		break;
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt = 160;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err AMR_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-/* frame size in serial bitstream file (frame type + serial stream + flags) */
-#define SERIAL_FRAMESIZE (270)
-
-static GF_Err AMR_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	u32 offset = 0;
-	u8 toc, q, ft;
-	s16 *synth;
-	u8 *packed_bits;
-	s16 serial[SERIAL_FRAMESIZE];
-	s32 i;
-	AMRCTX();
-
-	/*if late or seeking don't decode (each frame is a RAP)*/
-	/*	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-	*/
-	if (ctx->out_size > *outBufferLength) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	synth = (s16 *) outBuffer;
-	*outBufferLength = 0;
-
-	while (inBufferLength) {
-		toc = inBuffer[0];
-		/* read rest of the frame based on ToC byte */
-		q = (toc >> 2) & 0x01;
-		ft = (toc >> 3) & 0x0F;
-
-		packed_bits = inBuffer + 1;
-		offset = 1 + GF_AMR_FRAME_SIZE[ft];
-
-		/*Unsort and unpack bits*/
-		ctx->rx_type = UnpackBits(q, ft, packed_bits, &ctx->mode, &serial[1]);
-
-		if (ctx->rx_type == RX_NO_DATA) {
-			ctx->mode = ctx->speech_decoder_state->prev_mode;
-		} else {
-			ctx->speech_decoder_state->prev_mode = ctx->mode;
-		}
-
-		/* if homed: check if this frame is another homing frame */
-		if (ctx->reset_flag_old == 1) {
-			/* only check until end of first subframe */
-			ctx->reset_flag = decoder_homing_frame_test_first(&serial[1], ctx->mode);
-		}
-		/* produce encoder homing frame if homed & input=decoder homing frame */
-		if ((ctx->reset_flag != 0) && (ctx->reset_flag_old != 0)) {
-			for (i = 0; i < L_FRAME; i++) {
-				synth[i] = EHF_MASK;
-			}
-		} else {
-			/* decode frame */
-			Speech_Decode_Frame(ctx->speech_decoder_state, ctx->mode, &serial[1], ctx->rx_type, synth);
-		}
-
-		*outBufferLength += 160*2;
-		synth += 160;
-
-		/* if not homed: check whether current frame is a homing frame */
-		if (ctx->reset_flag_old == 0) {
-			ctx->reset_flag = decoder_homing_frame_test(&serial[1], ctx->mode);
-		}
-		/* reset decoder if current frame is a homing frame */
-		if (ctx->reset_flag != 0) {
-			Speech_Decode_Frame_reset(&ctx->speech_decoder_state);
-		}
-		ctx->reset_flag_old = ctx->reset_flag;
-
-		if (inBufferLength < offset) return GF_OK;
-		inBufferLength -= offset;
-		inBuffer += offset;
-
-		if (*outBufferLength > ctx->out_size) return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	return GF_OK;
-}
-
-
-static u32 AMR_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	char *dsi;
-	/*we handle audio only*/
-	if (StreamType!=GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	if (esd->decoderConfig->objectTypeIndication != GPAC_OTI_MEDIA_GENERIC) return GF_CODEC_NOT_SUPPORTED;
-	dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-	if (!dsi) return GF_CODEC_NOT_SUPPORTED;
-	if (esd->decoderConfig->decoderSpecificInfo->dataLength < 4) return GF_CODEC_NOT_SUPPORTED;
-
-	if (!strnicmp(dsi, "samr", 4) || !strnicmp(dsi, "amr ", 4)) return GF_CODEC_SUPPORTED;
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-static const char *AMR_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "3GPP Fixed-Point AMR NB";
-}
-
-GF_MediaDecoder *NewAMRDecoder()
-{
-	AMRDec *dec;
-	GF_MediaDecoder *ifce;
-	GF_SAFEALLOC(ifce , GF_MediaDecoder);
-	dec = (AMRDec*)gf_malloc(sizeof(AMRDec));
-	memset(dec, 0, sizeof(AMRDec));
-	ifce->privateStack = dec;
-	ifce->CanHandleStream = AMR_CanHandleStream;
-
-	/*setup our own interface*/
-	ifce->AttachStream = AMR_AttachStream;
-	ifce->DetachStream = AMR_DetachStream;
-	ifce->GetCapabilities = AMR_GetCapabilities;
-	ifce->SetCapabilities = AMR_SetCapabilities;
-	ifce->ProcessData = AMR_ProcessData;
-	ifce->GetName = AMR_GetCodecName;
-
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "AMR-NB 3GPP decoder", "gpac distribution");
-
-	return ifce;
-}
-
-void DeleteAMRDecoder(GF_BaseDecoder *ifcg)
-{
-	AMRCTX();
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-#endif // GPAC_HAS_AMR_NB_3GPP
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		GF_MEDIA_DECODER_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GF_InputService *NewAESReader();
-void DeleteAESReader(void *ifce);
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifdef GPAC_HAS_AMR_NB_3GPP
-	case GF_MEDIA_DECODER_INTERFACE:
-		return (GF_BaseInterface *) NewAMRDecoder();
-#endif
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *) NewAESReader();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_AMR_NB_3GPP
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteAMRDecoder((GF_BaseDecoder *)ifce);
-		break;
-#endif
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteAESReader(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( amr_dec )

gpac-0.8.0.tar.gz/modules/amr_dec/amr_in.c Deleted

@@ -1,620 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AMR&EVRC&SMV reader module
- *
- *  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/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-#include <gpac/isomedia.h>
-
-
-enum
-{
-	TYPE_AMR = GF_4CC('s','a','m','r'),
-	TYPE_AMR_WB = GF_4CC('s','a','w','b'),
-	TYPE_EVRC = GF_4CC('e','v','r','c'),
-	TYPE_SMV = GF_4CC('s','m','v',' ')
-};
-
-typedef struct
-{
-	GF_ClientService *service;
-
-	Bool is_remote;
-	u32 start_offset;
-	u32 mtype, sample_rate, block_size;
-
-	FILE *stream;
-	u32 duration;
-
-	Bool needs_connection;
-	u32 pad_bytes;
-	Bool done;
-	u32 is_inline;
-	LPNETCHANNEL ch;
-
-	unsigned char *data;
-	u32 data_size;
-	GF_SLHeader sl_hdr;
-
-	Double start_range, end_range;
-	u32 current_time;
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-
-	//Bool is_live;
-} AMR_Reader;
-
-static u32 AMR_RegisterMimeTypes(const GF_InputService *plug)
-{
-	gf_service_register_mime(plug, "audio/amr", "amr awb", "AMR Speech Data");
-	gf_service_register_mime(plug, "audio/evrc", "evc", "EVRC Speech Data");
-	gf_service_register_mime(plug, "audio/smv", "smv", "SMV Speech Data");
-	return 3;
-}
-
-static GF_ESD *AMR_GetESD(AMR_Reader *read)
-{
-	GF_BitStream *dsi;
-	GF_ESD *esd;
-	esd = gf_odf_desc_esd_new(0);
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->ESID = 1;
-	esd->OCRESID = 0;
-	esd->slConfig->timestampResolution = read->sample_rate;
-	/*all packets are complete AUs*/
-	esd->slConfig->useAccessUnitEndFlag = esd->slConfig->useAccessUnitStartFlag = 0;
-	esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-
-	if ((read->mtype==TYPE_AMR) || (read->mtype==TYPE_AMR_WB)) {
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-		dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(dsi, read->mtype);
-		gf_bs_write_u32(dsi, (read->mtype==TYPE_AMR) ? 8000 : 16000);
-		gf_bs_write_u16(dsi, 1);
-		gf_bs_write_u16(dsi, (read->mtype==TYPE_AMR) ? 160 : 320);
-		gf_bs_write_u8(dsi, 16);
-		gf_bs_write_u8(dsi, 1);
-		gf_bs_get_content(dsi, & esd->decoderConfig->decoderSpecificInfo->data, & esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_bs_del(dsi);
-	}
-	else if (read->mtype==TYPE_EVRC) esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_EVRC_VOICE;
-	else if (read->mtype==TYPE_SMV) esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_SMV_VOICE;
-	return esd;
-}
-
-static void AMR_SetupObject(AMR_Reader *read)
-{
-	GF_ESD *esd;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	od->objectDescriptorID = 1;
-	esd = AMR_GetESD(read);
-	esd->OCRESID = 0;
-	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
-}
-
-static Bool AMR_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	sExt = strrchr(url, '.');
-	if (!sExt) return GF_FALSE;
-	if (gf_service_check_mime_register(plug, "audio/amr", "amr awb", "AMR Speech Data", sExt)) return GF_TRUE;
-	if (gf_service_check_mime_register(plug, "audio/evrc", "evc", "EVRC Speech Data", sExt)) return GF_TRUE;
-	if (gf_service_check_mime_register(plug, "audio/smv", "smv", "SMV Speech Data", sExt)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-static Bool file_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-
-static Bool AMR_ConfigureFromFile(AMR_Reader *read)
-{
-	u32 i;
-	char magic[20];
-
-	if (!read->stream) return GF_FALSE;
-	read->mtype = 0;
-	read->start_offset = 6;
-	read->sample_rate = 8000;
-	read->block_size = 160;
-	i = (u32) fread(magic, 1, 20, read->stream);
-	if (i != 20) return GF_FALSE;
-
-	if (!strnicmp(magic, "#!AMR\n", 6)) {
-		fseek(read->stream, 6, SEEK_SET);
-		read->mtype = TYPE_AMR;
-	}
-	else if (!strnicmp(magic, "#!EVRC\n", 7)) {
-		fseek(read->stream, 7, SEEK_SET);
-		read->start_offset = 7;
-		read->mtype = TYPE_EVRC;
-	}
-	else if (!strnicmp(magic, "#!SMV\n", 6)) {
-		fseek(read->stream, 6, SEEK_SET);
-		read->mtype = TYPE_SMV;
-	}
-	else if (!strnicmp(magic, "#!AMR-WB\n", 9)) {
-		read->mtype = TYPE_AMR_WB;
-		read->start_offset = 9;
-		read->sample_rate = 16000;
-		read->block_size = 320;
-		fseek(read->stream, 9, SEEK_SET);
-	}
-	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) return GF_FALSE;
-	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) return GF_FALSE;
-	else return GF_FALSE;
-
-
-	read->duration = 0;
-
-	if (!read->is_remote) {
-		u32 size=0;
-		while (!feof(read->stream)) {
-			u8 ft = fgetc(read->stream);
-			switch (read->mtype) {
-			case TYPE_AMR:
-			case TYPE_AMR_WB:
-				ft = (ft >> 3) & 0x0F;
-				size = (read->mtype==TYPE_AMR_WB) ? GF_AMR_WB_FRAME_SIZE[ft] : GF_AMR_FRAME_SIZE[ft];
-				break;
-			default:
-				for (i=0; i<GF_SMV_EVRC_RATE_TO_SIZE_NB; i++) {
-					if (GF_SMV_EVRC_RATE_TO_SIZE[2*i]==ft) {
-						/*remove rate_type byte*/
-						size = GF_SMV_EVRC_RATE_TO_SIZE[2*i+1] - 1;
-						break;
-					}
-				}
-				break;
-			}
-
-			if (size) fseek(read->stream, size, SEEK_CUR);
-			read->duration += read->block_size;
-		}
-	}
-	fseek(read->stream, read->start_offset, SEEK_SET);
-	return GF_TRUE;
-}
-
-static void AMR_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	u32 bytes_done;
-	AMR_Reader *read = (AMR_Reader *) cbk;
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		if (read->stream) {
-			read->is_remote = GF_FALSE;
-			e = GF_EOS;
-		} else {
-			return;
-		}
-	} else {
-		/*handle service message*/
-		gf_service_download_update_stats(read->dnload);
-		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
-	}
-
-	/*data fetching*/
-	if (e >= GF_OK) {
-		if (read->stream) return;
-
-		/*open service*/
-		szCache = gf_dm_sess_get_cache_name(read->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			read->stream = gf_fopen((char *) szCache, "rb");
-			if (!read->stream) e = GF_SERVICE_ERROR;
-			else {
-				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = GF_FALSE;
-				e = GF_OK;
-				/*not enough data*/
-				if (!AMR_ConfigureFromFile(read)) {
-					/*bad data...*/
-					gf_dm_sess_get_stats(read->dnload, NULL, NULL, NULL, &bytes_done, NULL, NULL);
-					if (bytes_done>10*1024) {
-						e = GF_CORRUPTED_DATA;
-					} else {
-						gf_fclose(read->stream);
-						read->stream = NULL;
-						return;
-					}
-				}
-			}
-		}
-	}
-	/*OK confirm*/
-	if (read->needs_connection) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, e);
-		if (!e) AMR_SetupObject(read);
-	}
-}
-
-static void AMR_DownloadFile(GF_InputService *plug, char *url)
-{
-	AMR_Reader *read = (AMR_Reader*) plug->priv;
-
-	read->needs_connection = GF_TRUE;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, AMR_NetIO, read);
-	if (!read->dnload) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-
-static GF_Err AMR_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *ext;
-	GF_Err reply;
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) ext[0] = 0;
-
-	/*remote fetch*/
-	read->is_remote = !file_is_local(szURL);
-	if (read->is_remote) {
-		AMR_DownloadFile(plug, (char *) szURL);
-		return GF_OK;
-	}
-
-	reply = GF_OK;
-	read->stream = gf_fopen(szURL, "rb");
-	if (!read->stream) {
-		reply = GF_URL_ERROR;
-	} else if (!AMR_ConfigureFromFile(read)) {
-		gf_fclose(read->stream);
-		read->stream = NULL;
-		reply = GF_NOT_SUPPORTED;
-	}
-	gf_service_connect_ack(serv, NULL, reply);
-	if (!reply && read->is_inline) AMR_SetupObject(read);
-	return GF_OK;
-}
-
-static GF_Err AMR_CloseService(GF_InputService *plug)
-{
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-	if (read->stream) gf_fclose(read->stream);
-	read->stream = NULL;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	if (read->data) gf_free(read->data);
-	read->data = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *AMR_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-	/*since we don't handle multitrack in aac, we don't need to check sub_url, only use expected type*/
-
-	/*override default*/
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_AUDIO;
-
-	/*audio object*/
-	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		GF_ESD *esd = AMR_GetESD(read);
-		od->objectDescriptorID = 1;
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-	/*let player handle scene description*/
-	read->is_inline = 1;
-	return NULL;
-}
-
-static GF_Err AMR_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID;
-	GF_Err e;
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-
-	e = GF_SERVICE_ERROR;
-	if (read->ch==channel) goto exit;
-
-	e = GF_STREAM_NOT_FOUND;
-	ES_ID=0;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%d", &ES_ID);
-	}
-	/*URL setup*/
-	else if (!read->ch && AMR_CanHandleURL(plug, url)) ES_ID = 1;
-
-	if (ES_ID==1) {
-		read->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err AMR_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	if (read->ch == channel) {
-		read->ch = NULL;
-		if (read->data) gf_free(read->data);
-		read->data = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err AMR_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		return GF_OK;
-	case GF_NET_CHAN_SET_PADDING:
-		read->pad_bytes = com->pad.padding_bytes;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->duration;
-		com->duration.duration /= read->sample_rate;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		read->start_range = com->play.start_range;
-		read->end_range = com->play.end_range;
-		read->current_time = 0;
-		if (read->stream) fseek(read->stream, read->start_offset, SEEK_SET);
-
-		if (read->ch == com->base.on_channel) {
-			read->done = GF_FALSE;
-			/*PLAY after complete download, estimate duration*/
-			if (!read->is_remote && !read->duration) {
-				AMR_ConfigureFromFile(read);
-				if (read->duration) {
-					GF_NetworkCommand rcfg;
-					rcfg.base.on_channel = read->ch;
-					rcfg.base.command_type = GF_NET_CHAN_DURATION;
-					rcfg.duration.duration = read->duration;
-					rcfg.duration.duration /= read->sample_rate;
-					gf_service_command(read->service, &rcfg, GF_OK);
-				}
-			}
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err AMR_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	u32 start_from, i;
-	u8 toc, ft;
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = GF_FALSE;
-	*is_new_data = GF_FALSE;
-
-	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-	read->sl_hdr.randomAccessPointFlag = 1;
-	read->sl_hdr.compositionTimeStampFlag = 1;
-	if (read->ch != channel) return GF_STREAM_NOT_FOUND;
-
-	/*fetching es data*/
-	if (read->done) {
-		*out_reception_status = GF_EOS;
-		return GF_OK;
-	}
-
-	if (!read->data) {
-		if (!read->stream) {
-			*out_data_ptr = NULL;
-			*out_data_size = 0;
-			return GF_OK;
-		}
-		*is_new_data = GF_TRUE;
-
-fetch_next:
-		//pos = (u32) ftell(read->stream);
-		if (feof(read->stream)) {
-			read->done = GF_TRUE;
-			*out_reception_status = GF_EOS;
-			return GF_OK;
-		}
-
-		toc = fgetc(read->stream);
-		if (feof(read->stream)) {
-			read->done = GF_TRUE;
-			*out_reception_status = GF_EOS;
-			return GF_OK;
-		}
-		
-		switch (read->mtype) {
-		case TYPE_AMR:
-			ft = (toc >> 3) & 0x0F;
-			read->data_size = (u32)GF_AMR_FRAME_SIZE[ft];
-			break;
-		case TYPE_AMR_WB:
-			ft = (toc >> 3) & 0x0F;
-			read->data_size = (u32)GF_AMR_WB_FRAME_SIZE[ft];
-			break;
-		default:
-			for (i=0; i<GF_SMV_EVRC_RATE_TO_SIZE_NB; i++) {
-				if (GF_SMV_EVRC_RATE_TO_SIZE[2*i]==toc) {
-					/*remove rate_type byte*/
-					read->data_size = (u32)GF_SMV_EVRC_RATE_TO_SIZE[2*i+1] - 1;
-					break;
-				}
-			}
-			break;
-		}
-		/*we're seeking*/
-		if (read->start_range && read->duration) {
-			start_from = (u32) (read->start_range * read->sample_rate);
-			if (read->current_time + read->block_size < start_from) {
-				read->current_time += read->block_size;
-				fseek(read->stream, read->data_size, SEEK_CUR);
-				goto fetch_next;
-			} else {
-				read->start_range = 0;
-			}
-		}
-		assert(read->data_size);
-		read->data_size++;
-		read->sl_hdr.compositionTimeStamp = read->current_time;
-		read->data = (unsigned char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
-		read->data[0] = toc;
-		if (read->data_size>1) {
-			u32 bytes_read = (u32) fread(read->data + 1, read->data_size-1, 1, read->stream);
-			if (bytes_read != read->data_size - 1) read->data_size = bytes_read+1; 
-		}
-		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
-	}
-	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr = (char*)read->data;
-	*out_data_size = read->data_size;
-	return GF_OK;
-}
-
-static GF_Err AMR_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-
-	if (read->ch == channel) {
-		if (!read->data) return GF_BAD_PARAM;
-		gf_free(read->data);
-		read->data = NULL;
-		read->current_time += read->block_size;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-GF_InputService *NewAESReader()
-{
-	AMR_Reader *reader;
-	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC AMR/EVRC/SMV Reader", "gpac distribution")
-
-	plug->RegisterMimeTypes = AMR_RegisterMimeTypes;
-	plug->CanHandleURL = AMR_CanHandleURL;
-	plug->ConnectService = AMR_ConnectService;
-	plug->CloseService = AMR_CloseService;
-	plug->GetServiceDescriptor = AMR_GetServiceDesc;
-	plug->ConnectChannel = AMR_ConnectChannel;
-	plug->DisconnectChannel = AMR_DisconnectChannel;
-	plug->ServiceCommand = AMR_ServiceCommand;
-	/*we do support pull mode*/
-	plug->ChannelGetSLP = AMR_ChannelGetSLP;
-	plug->ChannelReleaseSLP = AMR_ChannelReleaseSLP;
-
-	reader = (AMR_Reader*)gf_malloc(sizeof(AMR_Reader));
-	memset(reader, 0, sizeof(AMR_Reader));
-	plug->priv = reader;
-	return plug;
-}
-
-void DeleteAESReader(void *ifce)
-{
-	GF_InputService *plug = (GF_InputService *) ifce;
-	AMR_Reader *read = (AMR_Reader*)plug->priv;
-	gf_free(read);
-	gf_free(plug);
-}
-
-
-#ifdef GPAC_AMR_IN_STANDALONE
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *) NewAESReader();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteAESReader(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION(amr_in)
-
-#endif
-

gpac-0.8.0.tar.gz/modules/amr_dec/amr_nb Deleted

gpac-0.8.0.tar.gz/modules/amr_dec/amr_nb/typedefs.h Deleted

@@ -1,195 +0,0 @@
-/*
-********************************************************************************
-*
-*      GSM AMR-NB speech codec   R98   Version 7.6.0   December 12, 2001
-*                                R99   Version 3.3.0
-*                                REL-4 Version 4.1.0
-*
-********************************************************************************
-*
-*      File             : typedefs.h
-*      Description      : Definition of platform independent data
-*                         types and constants
-*
-*
-*      The following platform independent data types and corresponding
-*      preprocessor (#define) constants are defined:
-*
-*        defined type  meaning           corresponding constants
-*        ----------------------------------------------------------
-*        Char          character         (none)
-*        Bool          boolean           true, false
-*        Word8         8-bit signed      minWord8,   maxWord8
-*        UWord8        8-bit unsigned    minUWord8,  maxUWord8
-*        Word16        16-bit signed     minWord16,  maxWord16
-*        UWord16       16-bit unsigned   minUWord16, maxUWord16
-*        Word32        32-bit signed     minWord32,  maxWord32
-*        UWord32       32-bit unsigned   minUWord32, maxUWord32
-*        Float         floating point    minFloat,   maxFloat
-*
-*
-*      The following compile switches are #defined:
-*
-*        PLATFORM      string indicating platform progam is compiled on
-*                      possible values: "OSF", "PC", "SUN"
-*
-*        OSF           only defined if the current platform is an Alpha
-*        PC            only defined if the current platform is a PC
-*        SUN           only defined if the current platform is a Sun
-*
-*        LSBFIRST      is defined if the byte order on this platform is
-*                      "least significant byte first" -> defined on DEC Alpha
-*                      and PC, undefined on Sun
-*
-********************************************************************************
-*/
-#ifndef typedefs_h
-#define typedefs_h "$Id $"
-
-/*
-********************************************************************************
-*                         INCLUDE FILES
-********************************************************************************
-*/
-#include <float.h>
-#include <limits.h>
-
-
-
-/*
-********************************************************************************
-*                         DEFINITION OF CONSTANTS
-********************************************************************************
-*/
-/*
- ********* define char type
- */
-typedef char Char;
-
-/*
- ********* define 8 bit signed/unsigned types & constants
- */
-#if SCHAR_MAX == 127
-typedef signed char Word8;
-#define minWord8  SCHAR_MIN
-#define maxWord8  SCHAR_MAX
-
-typedef unsigned char UWord8;
-#define minUWord8 0
-#define maxUWord8 UCHAR_MAX
-#else
-#error cannot find 8-bit type
-#endif
-
-
-/*
- ********* define 16 bit signed/unsigned types & constants
- */
-#if INT_MAX == 32767
-typedef int Word16;
-#define minWord16     INT_MIN
-#define maxWord16     INT_MAX
-typedef unsigned int UWord16;
-#define minUWord16    0
-#define maxUWord16    UINT_MAX
-#elif SHRT_MAX == 32767
-typedef short Word16;
-#define minWord16     SHRT_MIN
-#define maxWord16     SHRT_MAX
-typedef unsigned short UWord16;
-#define minUWord16    0
-#define maxUWord16    USHRT_MAX
-#else
-#error cannot find 16-bit type
-#endif
-
-
-/*
- ********* define 32 bit signed/unsigned types & constants
- */
-#if INT_MAX == 2147483647
-typedef int Word32;
-#define minWord32     INT_MIN
-#define maxWord32     INT_MAX
-typedef unsigned int UWord32;
-#define minUWord32    0
-#define maxUWord32    UINT_MAX
-#elif LONG_MAX == 2147483647
-typedef long Word32;
-#define minWord32     LONG_MIN
-#define maxWord32     LONG_MAX
-typedef unsigned long UWord32;
-#define minUWord32    0
-#define maxUWord32    ULONG_MAX
-#else
-#error cannot find 32-bit type
-#endif
-
-/*
- ********* define floating point type & constants
- */
-/* use "#if 0" below if Float should be double;
-   use "#if 1" below if Float should be float
- */
-#if 0
-//typedef float Float;
-#define Float float
-#define maxFloat      FLT_MAX
-#define minFloat      FLT_MIN
-#else
-//typedef double Float;
-#define Float double
-#define maxFloat      DBL_MAX
-#define minFloat      DBL_MIN
-#endif
-
-/*
- ********* define complex type
- */
-typedef struct {
-	Float r;  /* real      part */
-	Float i;  /* imaginary part */
-} CPX;
-
-/*
- ********* define boolean type
- */
-#define Bool int
-#define false 0
-#define true 1
-
-/*
- ********* Check current platform
- */
-#if defined(__MSDOS__)
-#define PC
-#define PLATFORM "PC"
-#define LSBFIRST
-#elif defined(__osf__)
-#define OSF
-#define PLATFORM "OSF"
-#define LSBFIRST
-#elif defined(__sun__) || defined(__sun)
-#define SUN
-#define PLATFORM "SUN"
-#undef LSBFIRST
-#elif defined(linux) && defined(i386)
-#define PC
-#define PLATFORM "PC"
-#define LSBFIRST
-#elif defined(WIN32) || defined(_WIN32_WCE)
-#define PC
-#define PLATFORM "PC"
-#define LSBFIRST
-#else
-#error "can't determine architecture; adapt typedefs.h to your platform"
-#endif
-
-#if defined(_WIN32_WCE)
-# ifndef abort
-#  define abort()
-# endif
-#endif
-
-
-#endif

gpac-0.8.0.tar.gz/modules/amr_dec/amr_nb_api.h Deleted

@@ -1,61 +0,0 @@
-#ifndef _AMR_NB_API_H
-#define _AMR_NB_API_H
-
-enum Mode { MR475 = 0,
-            MR515,
-            MR59,
-            MR67,
-            MR74,
-            MR795,
-            MR102,
-            MR122,
-
-            MRDTX,
-
-            N_MODES     /* number of (SPC) modes */
-
-          };
-
-enum RXFrameType { RX_SPEECH_GOOD = 0,
-                   RX_SPEECH_DEGRADED,
-                   RX_ONSET,
-                   RX_SPEECH_BAD,
-                   RX_SID_FIRST,
-                   RX_SID_UPDATE,
-                   RX_SID_BAD,
-                   RX_NO_DATA,
-                   RX_N_FRAMETYPES     /* number of frame types */
-                 };
-
-typedef struct {
-	void* decoder_amrState;
-	void*  post_state;
-	void* postHP_state;
-	enum Mode prev_mode;
-
-	int complexityCounter;   /* Only for complexity computation            */
-} __Speech_Decode_FrameState;
-
-int Speech_Decode_Frame_init (__Speech_Decode_FrameState **st, char *id);
-void Speech_Decode_Frame_exit (__Speech_Decode_FrameState **st);
-void Speech_Decode_Frame (__Speech_Decode_FrameState *st, enum Mode mode, short *serial, enum RXFrameType frame_type, short *synth);
-int Speech_Decode_Frame_reset (__Speech_Decode_FrameState **st);
-
-s16 decoder_homing_frame_test_first (s16 input_frame[], enum Mode mode);
-s16 decoder_homing_frame_test (s16 input_frame[], enum Mode mode);
-
-#ifdef MMS_IO
-
-enum RXFrameType UnpackBits (
-    s8  q,              /* i : Q-bit (i.e. BFI)        */
-    s16 ft,             /* i : frame type (i.e. mode)  */
-    u8 packed_bits[],  /* i : sorted & packed bits    */
-    enum Mode *mode,       /* o : mode information        */
-    s16 bits[]          /* o : serial bits             */
-);
-#endif
-
-#define EHF_MASK 0x0008        /* encoder homing frame pattern             */
-#define L_FRAME      160       /* Frame size                               */
-
-#endif //_AMR_NB_API_H
\ No newline at end of file

gpac-0.8.0.tar.gz/modules/amr_float_dec Deleted

gpac-0.8.0.tar.gz/modules/amr_float_dec/Makefile Deleted

@@ -1,62 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/amr_float_dec
-
-#note: __MSDOS__ defined is the same cfg as linux. There may be some pbs on other platforms, to check...
-CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" -D__MSDOS__
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g -DDEBUG
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS=amr_float_dec.o
-
-#AMR NB obj
-CFLAGS+=-DGPAC_HAS_AMR_FT
-ifeq ($(CONFIG_AMR_NB_FT), yes)
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
-endif
-
-
-#AMR WB obj
-CFLAGS+=-DGPAC_HAS_AMR_FT_WB
-ifeq ($(CONFIG_AMR_WB_FT), yes)
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
-	./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
-	./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o 
-endif
-
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_amr_float_dec$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols amr_float_dec.def 
-endif
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/amr_float_dec/amr_api.h Deleted

gpac-0.8.0.tar.gz/modules/amr_float_dec/amr_float_dec.c Deleted

@@ -1,343 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / AMR decoder module
- *
- *  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.
- *
- */
-
-
-
-/*decoder Interface*/
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-
-#if (defined(WIN32) || defined (_WIN32_WCE)) && defined(GPAC_HAS_AMR_FT)
-/*AMR NB*/
-#include "amr_api.h"
-
-#ifndef GPAC_HAS_AMR_FT_WB
-#define GPAC_HAS_AMR_FT_WB
-#endif
-
-#if !defined(__GNUC__)
-#pragma comment(lib, "libamrfloat")
-#endif
-
-#else
-
-#ifdef GPAC_HAS_AMR_FT
-/*AMR WB*/
-#include "amr_nb_ft/interf_dec.h"
-#endif
-
-#ifdef GPAC_HAS_AMR_FT_WB
-/*AMR WB*/
-#include "amr_wb_ft/dec_if.h"
-#endif
-
-#endif
-
-/*default size in CU of composition memory for audio*/
-#define DEFAULT_AUDIO_CM_SIZE			12
-/*default critical size in CU of composition memory for audio*/
-#define DEFAULT_AUDIO_CM_TRIGGER		4
-
-typedef struct
-{
-	Bool is_amr_wb;
-	u32 sample_rate, out_size, num_samples;
-	u8 num_channels;
-
-	/*AMR NB state vars*/
-	int *nb_destate;
-	void *wb_destate;
-} AMRFTDec;
-
-#define AMRFTCTX() AMRFTDec *ctx = (AMRFTDec *) ifcg->privateStack
-
-
-static GF_Err AMR_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_BitStream *bs;
-	u32 packed;
-	AMRFTCTX();
-	if (esd->dependsOnESID || !esd->decoderConfig->decoderSpecificInfo) return GF_NOT_SUPPORTED;
-
-	/*AMRWB dec is another module*/
-	if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "sawb", 4)) ctx->is_amr_wb = GF_TRUE;
-	else if (!strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "samr", 4) || !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "amr ", 4)) ctx->is_amr_wb = GF_FALSE;
-	else return GF_NOT_SUPPORTED;
-
-
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	gf_bs_read_u32(bs);
-	gf_bs_read_u32(bs);
-	ctx->num_channels = gf_bs_read_u16(bs);
-	gf_bs_read_u16(bs);
-	gf_bs_read_u8(bs);
-	packed = gf_bs_read_u8(bs);
-	gf_bs_del(bs);
-	/*max possible frames in a sample are seen in MP4, that's 15*/
-	if (!packed) packed = 15;
-
-	if (ctx->is_amr_wb) {
-#ifdef GPAC_HAS_AMR_FT_WB
-		ctx->wb_destate = D_IF_init();
-		if (!ctx->wb_destate) return GF_IO_ERR;
-#else
-		return GF_NOT_SUPPORTED;
-#endif
-		ctx->num_samples = 320;
-		ctx->sample_rate = 16000;
-	} else {
-#ifdef GPAC_HAS_AMR_FT
-		ctx->nb_destate = Decoder_Interface_init();
-		if (!ctx->nb_destate) return GF_IO_ERR;
-#else
-		return GF_NOT_SUPPORTED;
-#endif
-		ctx->num_samples = 160;
-		ctx->sample_rate = 8000;
-	}
-
-	ctx->out_size = packed * 2 * ctx->num_samples * ctx->num_channels;
-	return GF_OK;
-}
-
-static GF_Err AMR_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	AMRFTCTX();
-
-#ifdef GPAC_HAS_AMR_FT
-	if (ctx->nb_destate) Decoder_Interface_exit(ctx->nb_destate);
-#endif
-	ctx->nb_destate = NULL;
-#ifdef GPAC_HAS_AMR_FT_WB
-	if (ctx->wb_destate) D_IF_exit(ctx->wb_destate);
-#endif
-	ctx->wb_destate = NULL;
-	ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-	ctx->num_channels = 0;
-	return GF_OK;
-}
-static GF_Err AMR_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	AMRFTCTX();
-	switch (capability->CapCode) {
-	/*not tested yet*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ctx->sample_rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ctx->num_channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = DEFAULT_AUDIO_CM_TRIGGER;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = DEFAULT_AUDIO_CM_SIZE;
-		break;
-	/*FIXME: get exact sampling window*/
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt = ctx->num_samples;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		if (ctx->num_channels==1) {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-		} else {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-		}
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err AMR_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GF_Err AMR_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	u32 offset;
-	u8 toc, ft;
-	AMRFTCTX();
-
-	/*if late or seeking don't decode (each frame is a RAP)*/
-	/*	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-	*/
-	if (ctx->out_size > *outBufferLength) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	*outBufferLength = 0;
-
-	while (inBufferLength) {
-		toc = inBuffer[0];
-		ft = (toc >> 3) & 0x0F;
-
-		offset = 0;
-		if (ctx->is_amr_wb) {
-#ifdef GPAC_HAS_AMR_FT_WB
-			D_IF_decode(ctx->wb_destate, inBuffer, (s16 *) outBuffer, 0);
-			*outBufferLength += 320*2;
-			outBuffer += 320*2;
-			offset = (u32)GF_AMR_WB_FRAME_SIZE[ft] + 1;
-#endif
-		} else {
-#ifdef GPAC_HAS_AMR_FT
-			Decoder_Interface_Decode(ctx->nb_destate, inBuffer, (s16 *) outBuffer, 0);
-			*outBufferLength += 160*2;
-			outBuffer += 160*2;
-			offset = (u32)GF_AMR_FRAME_SIZE[ft] + 1;
-#endif
-		}
-		/*don't complain but...*/
-		if (inBufferLength<offset) return GF_OK;
-		inBuffer += offset;
-		inBufferLength -= offset;
-	}
-	return GF_OK;
-}
-
-
-static u32 AMR_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	char *dsi;
-	/*we handle audio only*/
-	if (StreamType!=GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	if (esd->decoderConfig->objectTypeIndication != GPAC_OTI_MEDIA_GENERIC) return GF_CODEC_NOT_SUPPORTED;
-	dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-	if (!dsi) return GF_CODEC_NOT_SUPPORTED;
-	if (esd->decoderConfig->decoderSpecificInfo->dataLength < 4) return GF_CODEC_NOT_SUPPORTED;
-
-#ifdef GPAC_HAS_AMR_FT
-	if (!strnicmp(dsi, "samr", 4) || !strnicmp(dsi, "amr ", 4)) return GF_CODEC_SUPPORTED;
-#endif
-#ifdef GPAC_HAS_AMR_FT_WB
-	if (!strnicmp(dsi, "sawb", 4)) return GF_CODEC_SUPPORTED;
-#endif
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-static const char *AMR_GetCodecName(GF_BaseDecoder *ifcg)
-{
-	AMRFTCTX();
-	if (ctx->is_amr_wb) return "3GPP Floating-point AMR Wideband";
-	return "3GPP Floating-point AMR";
-}
-
-GF_MediaDecoder *NewAMRFTDecoder()
-{
-	AMRFTDec *dec;
-	GF_MediaDecoder *ifce;
-	GF_SAFEALLOC(ifce , GF_MediaDecoder);
-	dec = (AMRFTDec*)gf_malloc(sizeof(AMRFTDec));
-	memset(dec, 0, sizeof(AMRFTDec));
-	ifce->privateStack = dec;
-	ifce->CanHandleStream = AMR_CanHandleStream;
-
-	/*setup our own interface*/
-	ifce->AttachStream = AMR_AttachStream;
-	ifce->DetachStream = AMR_DetachStream;
-	ifce->GetCapabilities = AMR_GetCapabilities;
-	ifce->SetCapabilities = AMR_SetCapabilities;
-	ifce->ProcessData = AMR_ProcessData;
-	ifce->GetName = AMR_GetCodecName;
-
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "AMR-FT 3GPP decoder", "gpac distribution");
-
-	return ifce;
-}
-
-void DeleteAMRFTDecoder(GF_BaseDecoder *ifcg)
-{
-	AMRFTCTX();
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_MEDIA_DECODER_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewAMRFTDecoder();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteAMRFTDecoder((GF_BaseDecoder *)ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( amr_float )

gpac-0.8.0.tar.gz/modules/atsc_in Deleted

gpac-0.8.0.tar.gz/modules/atsc_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/atsc_in/atsc_in.c Deleted

@@ -1,362 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2018
- *					All rights reserved
- *
- *  This file is part of GPAC / ATSC input module
- *
- *  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>
-
-#include <gpac/thread.h>
-#include <gpac/modules/service.h>
-
-#include <time.h>
-
-#ifndef GPAC_DISABLE_ATSC
-
-typedef struct
-{
-	GF_ClientService *service;
-	GF_InputService *input;
-
-	GF_DownloadManager *dm;
-
-	GF_Thread *th;
-	u32 state;
-	char *clock_init_seg;
-	GF_ATSCDmx *atsc_dmx;
-	u32 tune_service_id;
-
-	u32 sync_tsi, last_toi;
-} ATSCIn;
-
-
-static Bool ATSCIn_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	if (!strnicmp(url, "atsc://", 7)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-
-static void ATSCIn_del(ATSCIn *atscd)
-{
-	if (atscd->th) gf_th_del(atscd->th);
-	if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
-	if (atscd->atsc_dmx) gf_atsc3_dmx_del(atscd->atsc_dmx);
-
-	gf_free(atscd);
-}
-
-static ATSCIn * ATSCIn_new()
-{
-	ATSCIn *atscd;
-	GF_SAFEALLOC(atscd, ATSCIn);
-	atscd->th = gf_th_new("ATSCDmx");
-	return atscd;
-}
-
-const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, char *data, u64 size, u64 start_range, u64 end_range,  const char *mime, Bool clone_memory, u32 download_time_ms);
-
-GF_Err gf_dm_force_headers(GF_DownloadManager *dm, const DownloadedCacheEntry entry, const char *headers);
-
-void ATSCIn_on_event(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *finfo)
-{
-	char szPath[GF_MAX_PATH];
-	ATSCIn *atscd = (ATSCIn *)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:
-		break;
-	case GF_ATSC_EVT_SERVICE_SCAN:
-		if (atscd->tune_service_id && !gf_atsc3_dmx_find_service(atscd->atsc_dmx, atscd->tune_service_id)) {
-
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSCDmx] Asked to tune to service %d but no such service, tuning to first one\n", atscd->tune_service_id));
-
-			atscd->tune_service_id = 0;
-			gf_atsc3_tune_in(atscd->atsc_dmx, (u32) -2, GF_TRUE);
-		}
-		break;
-	case GF_ATSC_EVT_MPD:
-	{
-		sprintf(szPath, "http://gpatsc/service%d/%s", evt_param, finfo->filename);
-
-		if (gf_atsc3_dmx_get_service_udta(atscd->atsc_dmx, evt_param)==NULL) {
-			GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-			od->ServiceID = evt_param;
-			od->RedirectOnly = 1;
-			od->URLString = gf_strdup(szPath);
-			gf_service_declare_media(atscd->service, (GF_Descriptor *) od, GF_TRUE);
-		}
-		cache_entry = gf_dm_add_cache_entry(atscd->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(atscd->dm, cache_entry, szPath);
-		gf_atsc3_dmx_set_service_udta(atscd->atsc_dmx, evt_param, cache_entry);
-
-		atscd->sync_tsi = 0;
-		atscd->last_toi = 0;
-		if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
-		atscd->clock_init_seg = NULL;
-	}
-		break;
-	case GF_ATSC_EVT_SEG:
-		if (finfo->corrupted) return;
-		cache_entry = gf_atsc3_dmx_get_service_udta(atscd->atsc_dmx, evt_param);
-		if (cache_entry) {
-			if (!atscd->clock_init_seg) atscd->clock_init_seg = gf_strdup(finfo->filename);
-			sprintf(szPath, "x-dash-atsc: %d\r\nx-dash-first-seg: %s\r\n", evt_param, atscd->clock_init_seg);
-			gf_dm_force_headers(atscd->dm, cache_entry, szPath);
-		}
-		is_init = GF_FALSE;
-		if (!atscd->sync_tsi) {
-			atscd->sync_tsi = finfo->tsi;
-			atscd->last_toi = finfo->toi;
-		} else if (atscd->sync_tsi == finfo->tsi) {
-			if (atscd->last_toi > finfo->toi) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSCDmx] Loop detected on service %d for TSI %u: prev TOI %u this toi %u\n", atscd->tune_service_id, finfo->tsi, atscd->last_toi, finfo->toi));
-
-				gf_atsc3_dmx_purge_objects(atscd->atsc_dmx, evt_param);
-				is_loop = GF_TRUE;
-				if (cache_entry) {
-					if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
-					atscd->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, atscd->clock_init_seg);
-					gf_dm_force_headers(atscd->dm, cache_entry, szPath);
-				}
-			}
-			atscd->last_toi = finfo->toi;
-		}
-		//fallthrough
-
-	case GF_ATSC_EVT_INIT_SEG:
-		if (finfo->corrupted) 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(atscd->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(atscd->dm, cache_entry, "x-atsc: yes\r\n");
-
-		if (is_loop) break;
-
-		nb_obj = gf_atsc3_dmx_get_object_count(atscd->atsc_dmx, evt_param);
-		if (nb_obj>10) {
-			while (nb_obj>10) {
-				gf_atsc3_dmx_remove_first_object(atscd->atsc_dmx, evt_param);
-				nb_obj = gf_atsc3_dmx_get_object_count(atscd->atsc_dmx, evt_param);
-			}
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static Bool ATSCIn_LocalCacheCbk(void *par, char *url, Bool is_destroy)
-{
-	ATSCIn *atscd = (ATSCIn *)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(atscd->atsc_dmx, sid, subr+1, GF_TRUE);
-	} else if (sid && (sid != atscd->tune_service_id)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSCDmx] Request on service %d but tuned on service %d, retuning\n", sid, atscd->tune_service_id));
-		atscd->tune_service_id = sid;
-		atscd->sync_tsi = 0;
-		atscd->last_toi = 0;
-		if (atscd->clock_init_seg) gf_free(atscd->clock_init_seg);
-		atscd->clock_init_seg = NULL;
-		gf_atsc3_tune_in(atscd->atsc_dmx, sid, GF_TRUE);
-	}
-	return GF_TRUE;
-}
-
-static u32 ATSCIn_Run(void *par)
-{
-	ATSCIn *atscd = (ATSCIn *)par;
-
-	gf_service_connect_ack(atscd->service, NULL, GF_OK);
-	gf_atsc3_set_callback(atscd->atsc_dmx, ATSCIn_on_event, atscd);
-	if (atscd->tune_service_id)
-		gf_atsc3_tune_in(atscd->atsc_dmx, atscd->tune_service_id, GF_FALSE);
-	else
-		gf_atsc3_tune_in(atscd->atsc_dmx, 0, GF_TRUE);
-
-	while (atscd->state==1) {
-		GF_Err e = gf_atsc3_dmx_process(atscd->atsc_dmx);
-		if (e == GF_IP_NETWORK_EMPTY) gf_sleep(1);
-	}
-	atscd->state = 3;
-	return 0;
-}
-
-GF_DownloadManager *gf_term_service_get_dm(GF_ClientService *ns);
-
-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);
-
-
-static GF_Err ATSCIn_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char *opts;
-	ATSCIn *atscd = plug->priv;
-	u32 buffer_size=0;
-	const char *ifce = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "DefaultMCastInterface");
-	atscd->service = serv;
-
-
-	opts = (char *)url + 7;
-	if (opts[0]==0) opts = NULL;
-	while (opts) {
-		char *sep = strchr(opts, ':');
-		if (sep) sep[0] = 0;
-		if (!strncmp(opts, "service=", 8)) atscd->tune_service_id = atoi(opts+8);
-		else if (!strncmp(opts, "buffer=", 7)) buffer_size = atoi(opts+7);
-		else if (!strncmp(opts, "ifce=", 5)) ifce = opts+5;
-		if (!sep) break;
-		sep[0] = ':';
-		opts = sep+1;
-	}
-
-	if (!atscd->atsc_dmx) {
-		atscd->atsc_dmx = gf_atsc3_dmx_new(ifce, NULL, buffer_size);
-
-		atscd->dm = gf_term_service_get_dm(serv);
-		if (!atscd->dm) return GF_SERVICE_ERROR;
-		gf_dm_set_localcache_provider(atscd->dm, ATSCIn_LocalCacheCbk, atscd);
-	}
-
-	atscd->state = 1;
-	gf_th_run(atscd->th, ATSCIn_Run, atscd);
-	return GF_OK;
-}
-
-static GF_Err ATSCIn_CloseService(GF_InputService *plug)
-{
-	ATSCIn *atscd = plug->priv;
-	if (atscd->state<2) atscd->state = 2;
-	while (atscd->state==2) gf_sleep(1);
-	gf_service_disconnect_ack(atscd->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *ATSCIn_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	return NULL;
-}
-
-static GF_Err ATSCIn_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	return GF_SERVICE_ERROR;
-}
-
-static GF_Err ATSCIn_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	return GF_SERVICE_ERROR;
-}
-
-static GF_Err ATSCIn_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	return GF_SERVICE_ERROR;
-}
-
-
-GF_InputService *ATSCIn_Load()
-{
-
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC ATSC3 Input", "gpac distribution")
-
-	plug->CanHandleURL = ATSCIn_CanHandleURL;
-	plug->ConnectService = ATSCIn_ConnectService;
-	plug->CloseService = ATSCIn_CloseService;
-	plug->GetServiceDescriptor = ATSCIn_GetServiceDesc;
-	plug->ConnectChannel = ATSCIn_ConnectChannel;
-	plug->DisconnectChannel = ATSCIn_DisconnectChannel;
-	plug->ServiceCommand = ATSCIn_ServiceCommand;
-
-	plug->priv = ATSCIn_new();
-	return plug;
-}
-
-void ATSCIn_Delete(void *ifce)
-{
-	ATSCIn *read;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!plug)
-		return;
-	read = plug->priv;
-	if (read) {
-		ATSCIn_del(read);
-		plug->priv = NULL;
-	}
-	gf_free(plug);
-}
-
-#endif /* GPAC_DISABLE_ATSC */
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		0
-	};
-
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)ATSCIn_Load();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_ATSC)
-	case GF_NET_CLIENT_INTERFACE:
-		ATSCIn_Delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( atsc_in )
-

gpac-0.8.0.tar.gz/modules/audio_filter Deleted

gpac-0.8.0.tar.gz/modules/avcap Deleted

gpac-0.8.0.tar.gz/modules/avcap/avcap.cpp Deleted

@@ -1,508 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2011-20XX
- *					All rights reserved
- *
- *  This file is part of GPAC / AVCAP video input module
- *
- *  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 <avcap/avcap.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/modules/service.h>
-#include <gpac/modules/codec.h>
-/*for GF_STREAM_PRIVATE_SCENE definition*/
-#include <gpac/constants.h>
-#include <gpac/download.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#if !defined(__GNUC__)&& (defined(_WIN32_WCE) || defined (WIN32))
-#  pragma comment(lib, "strmiids")
-#ifdef _DEBUG
-#  pragma comment(lib, "avcapd")
-#  pragma comment(lib, "strmbasd")
-#else
-#  pragma comment(lib, "avcap")
-#  pragma comment(lib, "strmbase")
-#endif
-#  pragma comment(lib, "winmm")
-#endif
-
-
-using namespace avcap;
-
-class GPACCaptureHandler : public CaptureHandler
-{
-public:
-	GPACCaptureHandler(GF_ClientService *service, LPNETCHANNEL channel)
-		: m_pService(service), m_pChannel(channel), m_data(NULL)
-	{
-		memset(&m_pSLHeader, 0, sizeof(GF_SLHeader));
-		m_pSLHeader.compositionTimeStampFlag = 1;
-	}
-	virtual ~GPACCaptureHandler() {
-		if (m_data != NULL) {
-			gf_free(m_data);
-			m_data=NULL;
-		}
-	}
-
-	GF_ClientService *m_pService;
-	LPNETCHANNEL m_pChannel;
-	GF_SLHeader m_pSLHeader;
-
-	u32 m_height;
-	u32 m_stride;
-
-	char* m_data;
-
-public:
-	void AllocData(u32 height, u32 stride) {
-		m_height = height;
-		m_stride = stride;
-		m_data = (char*)gf_malloc(m_height * m_stride);
-	}
-	/* This method is called by the CaptureManager, when new data was captured.
-	 * \param io_buf The buffer, that contains the captured data. */
-	void handleCaptureEvent(IOBuffer* io_buf);
-};
-
-
-void GPACCaptureHandler::handleCaptureEvent(IOBuffer* io_buf)
-{
-	m_pSLHeader.compositionTimeStamp = io_buf->getTimestamp();
-
-	if (m_data) {
-		char* data = (char*)io_buf->getPtr();
-		for (u32 i=0; i<m_height; i++) {
-			memcpy(m_data + (m_height - 1 - i) * m_stride, data + i*m_stride, m_stride);
-		}
-		gf_service_send_packet(m_pService, m_pChannel, m_data, (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
-	} else {
-		gf_service_send_packet(m_pService, m_pChannel, (char *) io_buf->getPtr(), (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
-	}
-	io_buf->release();
-}
-
-DeviceDescriptor* get_device_descriptor(char *name)
-{
-	// find the descriptor of the device in the device-list by index
-	const DeviceCollector::DeviceList& dl = DEVICE_COLLECTOR::instance().getDeviceList();
-	DeviceDescriptor* dd = 0;
-	int index = 0;
-
-	for(DeviceCollector::DeviceList::const_iterator i = dl.begin(); i != dl.end(); i++, index++) {
-		dd = *i;
-
-		if (!name || !stricmp(name, "default") )
-			return dd;
-		if (strstr((char *) dd->getName().c_str(), name) != NULL)
-			return dd;
-	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Cannot find capture driver %s\n", name));
-	return NULL;
-}
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-	/*the service we're responsible for*/
-	GF_ClientService *service;
-	u32 state;
-
-	DeviceDescriptor *device_desc;
-	CaptureDevice* device;
-
-	GPACCaptureHandler *video_handler;
-	GPACCaptureHandler *audio_handler;
-
-	u32 width, height, pixel_format, stride, out_size, fps;
-	u32 default_4cc;
-	Bool flip_video;
-} AVCapIn;
-
-
-Bool AVCap_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	if (!strnicmp(url, "camera://", 9)) return GF_TRUE;
-	if (!strnicmp(url, "video://", 8)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-
-GF_Err AVCap_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_ESD *esd;
-	GF_BitStream *bs;
-	GF_ObjectDescriptor *od;
-	const char *opt;
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-
-	if (!vcap || !serv || !url) return GF_BAD_PARAM;
-
-	vcap->state = 0;
-	vcap->service = serv;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "AVCap", "FlipVideo");
-	if (opt && !strcmp(opt, "yes"))	vcap->flip_video = GF_TRUE;
-
-	if (!vcap->device_desc) {
-		Format *format;
-		u32 default_4cc;
-		char *name;
-		char *params = (char *) strchr(url, '?');
-		if (params) params[0] = 0;
-		name = (char *) strstr(url, "://");
-		if (name) name += 3;
-		/* get device by name  */
-		vcap->device_desc = get_device_descriptor(name);
-		if (params) {
-			params[0] = '?';
-			params ++;
-		}
-
-		if (!vcap->device_desc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Failed to instanciate AVCap\n"));
-			gf_service_connect_ack(serv, NULL, GF_REMOTE_SERVICE_ERROR);
-			return GF_OK;
-		}
-
-		vcap->device_desc->open();
-		if ( (!strnicmp(url, "camera://", 9) || !strnicmp(url, "video://", 8)) && !vcap->device_desc->isVideoCaptureDev()) {
-			vcap->device_desc->close();
-			gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
-			return GF_OK;
-		}
-		else if (!strnicmp(url, "audio://", 8) && !vcap->device_desc->isAudioDev()) {
-			vcap->device_desc->close();
-			gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
-			return GF_OK;
-		}
-		vcap->device = vcap->device_desc->getDevice();
-		if (!vcap->device) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Failed to initialize capture device\n"));
-			vcap->device_desc->close();
-			gf_service_connect_ack(serv, NULL, GF_SERVICE_ERROR);
-			return GF_OK;
-		}
-		vcap->device->getFormatMgr()->setFramerate(30);
-
-		default_4cc = 0;
-		opt = gf_modules_get_option((GF_BaseInterface *)plug, "AVCap", "Default4CC");
-		if (opt) {
-			default_4cc = GF_4CC(opt[0], opt[1], opt[2], opt[3]);
-			vcap->device->getFormatMgr()->setFormat(default_4cc);
-		}
-
-
-		while (params) {
-			char *sep = (char *) strchr(params, '&');
-			if (sep) sep[0] = 0;
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set camera option %s\n", params));
-
-			if (!strnicmp(params, "resolution=", 11)) {
-				u32 w, h;
-				if (sscanf(params+11, "%dx%d", &w, &h)==2) {
-					vcap->device->getFormatMgr()->setResolution(w, h);
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set resolution to %dx%d\n", w, h));
-				}
-			}
-			else if (!strnicmp(params, "fps=", 4)) {
-				u32 fps;
-				if (sscanf(params+4, "%d", &fps)==1) {
-					vcap->device->getFormatMgr()->setFramerate(fps);
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set framerate to %d\n", fps));
-				}
-			}
-			else if (!strnicmp(params, "stereo=", 7)) {
-			}
-			else if (!strnicmp(params, "mode=", 5)) {
-			}
-			else if (!strnicmp(params, "fmt=", 4)) {
-				if (!strnicmp(params+4, "rgb", 3)) {
-					default_4cc = GF_4CC('3', 'B', 'G', 'R');
-				}
-				else if (!strnicmp(params+4, "yuv", 3)) {
-					default_4cc = GF_4CC('V', 'Y', 'U', 'Y');
-				}
-				else if (strlen(params+4)>=4) {
-					default_4cc = GF_4CC(params[4], params[5], params[6], params[7]);
-				}
-			}
-
-			if (!sep) break;
-			sep[0] = '&';
-			params = sep+1;
-		}
-
-		vcap->width = vcap->device->getFormatMgr()->getWidth();
-		vcap->height = vcap->device->getFormatMgr()->getHeight();
-		vcap->fps = vcap->device->getFormatMgr()->getFramerate();
-
-		if (default_4cc )
-			vcap->device->getFormatMgr()->setFormat(default_4cc );
-
-		format = vcap->device->getFormatMgr()->getFormat();
-		switch (format->getFourcc()) {
-		case GF_4CC('V', 'Y', 'U', 'Y'):
-		case GF_4CC('2', 'Y', 'U', 'Y'):
-			vcap->pixel_format = GF_PIXEL_YUY2;
-			vcap->stride = 2*vcap->width;
-			vcap->out_size = 2*vcap->width*vcap->height;
-			break;
-		case GF_4CC('2', '1', 'U', 'Y'):
-			vcap->pixel_format = GF_PIXEL_I420;
-			vcap->stride = (u32)vcap->device->getFormatMgr()->getBytesPerLine();//1.5*vcap->width;//
-			vcap->out_size = (u32)vcap->device->getFormatMgr()->getImageSize();//1.5*vcap->width*vcap->height;//
-			break;
-		case GF_4CC('3', 'B', 'G', 'R'):
-			vcap->pixel_format = GF_PIXEL_BGR_24;
-			vcap->stride = vcap->device->getFormatMgr()->getBytesPerLine();//1.5*vcap->width;//
-			vcap->out_size = (u32)vcap->device->getFormatMgr()->getImageSize();//1.5*vcap->width*vcap->height;//
-			break;
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Unsupported 4CC %s (%08x) from capture device\n", gf_4cc_to_str(format->getFourcc()), format->getFourcc()));
-			vcap->device_desc->close();
-			gf_service_connect_ack(serv, NULL, GF_NOT_SUPPORTED);
-			return GF_OK;
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Device configured - resolution %dx%d - Frame Rate %d - Pixel Format %s (Device 4CC %08x) \n", vcap->width, vcap->height, vcap->fps, gf_4cc_to_str(vcap->pixel_format), format->getFourcc()));
-	}
-
-	/*ACK connection is OK*/
-	gf_service_connect_ack(serv, NULL, GF_OK);
-
-
-	/*setup object descriptor*/
-	od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = 1000;
-	if (!strnicmp(url, "camera://", 9) || !strnicmp(url, "video://", 8)) {
-		od->objectDescriptorID = 1;
-		esd->ESID = 1;
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-	} else {
-		od->objectDescriptorID = 2;
-		esd->ESID = 2;
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	}
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_u32(bs, vcap->pixel_format);
-	gf_bs_write_u16(bs, vcap->width);
-	gf_bs_write_u16(bs, vcap->height);
-	gf_bs_write_u32(bs, vcap->out_size);
-	gf_bs_write_u32(bs, vcap->stride);
-	gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(bs);
-
-	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(vcap->service, (GF_Descriptor*)od, GF_FALSE);
-
-	return GF_OK;
-}
-
-GF_Err AVCap_CloseService(GF_InputService *plug)
-{
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-	if (vcap->device_desc) {
-		vcap->device_desc->close();
-		vcap->device_desc = NULL;
-	}
-
-	vcap->state = 0;
-	gf_service_disconnect_ack(vcap->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-/*Dummy input just send a file name, no multitrack to handle so we don't need to check sub_url nor expected type*/
-static GF_Descriptor *AVCap_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	return NULL;
-}
-
-
-GF_Err AVCap_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	/*since data is file-based, no padding is needed (decoder plugin will handle it itself)*/
-	case GF_NET_CHAN_SET_PADDING:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 500;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		/*this module is not made for updates, use undefined duration*/
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		if (vcap->state==0) {
-			/*start capture*/
-			if (vcap->video_handler)
-				vcap->device->getVidCapMgr()->registerCaptureHandler(vcap->video_handler);
-
-			if (vcap->device->getVidCapMgr()->startCapture() != -1)
-				vcap->state = 1;
-			else
-				vcap->device->getVidCapMgr()->removeCaptureHandler();
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		if (vcap->state==1) {
-			/*stop capture*/
-			vcap->device->getVidCapMgr()->removeCaptureHandler();
-			vcap->device->getVidCapMgr()->stopCapture();
-			vcap->state = 0;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_CONFIG:
-		return GF_OK;
-	case GF_NET_CHAN_GET_DSI:
-		com->get_dsi.dsi = NULL;
-		com->get_dsi.dsi_len = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-	return GF_OK;
-}
-
-GF_Err AVCap_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID;
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-
-	sscanf(url, "ES_ID=%u", &ESID);
-	if (ESID == 1) {
-		/*video connect*/
-		vcap->video_handler = new GPACCaptureHandler(vcap->service, channel);
-
-		if (vcap->flip_video)
-			vcap->video_handler->AllocData(vcap->height, vcap->stride);
-
-		gf_service_connect_ack(vcap->service, channel, GF_OK);
-	} else if (ESID == 2) {
-		/*audio connect*/
-		vcap->audio_handler = new GPACCaptureHandler(vcap->service, channel);
-		gf_service_connect_ack(vcap->service, channel, GF_OK);
-	} else {
-		gf_service_connect_ack(vcap->service, channel, GF_STREAM_NOT_FOUND);
-	}
-	return GF_OK;
-}
-
-GF_Err AVCap_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	AVCapIn *vcap = (AVCapIn *) plug->priv;
-	if (vcap->video_handler && vcap->video_handler->m_pChannel==channel) {
-		delete vcap->video_handler;
-		vcap->video_handler = NULL;
-	}
-	else if (vcap->audio_handler && vcap->audio_handler->m_pChannel==channel) {
-		delete vcap->audio_handler;
-		vcap->audio_handler = NULL;
-	}
-	gf_service_disconnect_ack(vcap->service, channel, GF_OK);
-	return GF_OK;
-}
-
-Bool AVCap_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	return GF_FALSE;
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) {
-		AVCapIn *vcap;
-		GF_InputService *plug;
-		GF_SAFEALLOC(plug, GF_InputService);
-		memset(plug, 0, sizeof(GF_InputService));
-		GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "Video Capture using libavcap", "gpac distribution")
-
-		plug->RegisterMimeTypes = NULL;
-		plug->CanHandleURL = AVCap_CanHandleURL;
-		plug->ConnectService = AVCap_ConnectService;
-		plug->CloseService = AVCap_CloseService;
-		plug->GetServiceDescriptor = AVCap_GetServiceDesc;
-		plug->ConnectChannel = AVCap_ConnectChannel;
-		plug->DisconnectChannel = AVCap_DisconnectChannel;
-		plug->ServiceCommand = AVCap_ServiceCommand;
-		plug->CanHandleURLInService = AVCap_CanHandleURLInService;
-
-		GF_SAFEALLOC(vcap, AVCapIn);
-		plug->priv = vcap;
-		return (GF_BaseInterface *)plug;
-	}
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *bi)
-{
-	if (bi->InterfaceType==GF_NET_CLIENT_INTERFACE) {
-		GF_InputService *ifcn = (GF_InputService*)bi;
-		AVCapIn *vcap = (AVCapIn*)ifcn->priv;
-		gf_free(vcap);
-		gf_free(bi);
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( avcap )
-
-#ifdef __cplusplus
-}
-#endif

gpac-0.8.0.tar.gz/modules/bifs_dec Deleted

gpac-0.8.0.tar.gz/modules/bifs_dec/Makefile Deleted

gpac-0.8.0.tar.gz/modules/bifs_dec/bifs_dec.c Deleted

@@ -1,220 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / BIFS decoder module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/bifs.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_BIFS
-
-typedef struct
-{
-	GF_Scene *pScene;
-	GF_Terminal *app;
-	GF_BifsDecoder *codec;
-	u32 PL, nb_streams;
-} BIFSPriv;
-
-
-
-static GF_Err BIFS_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err BIFS_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-GF_Err BIFS_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	BIFSPriv *priv = (BIFSPriv *)plug->privateStack;
-	if (priv->codec) return GF_BAD_PARAM;
-	priv->pScene = scene;
-	priv->app = scene->root_od->term;
-
-	priv->codec = gf_bifs_decoder_new(scene->graph, GF_FALSE);
-	gf_bifs_decoder_set_extraction_path(priv->codec, (char *) gf_modules_get_option((GF_BaseInterface *)plug, "General", "CacheDirectory"), scene->root_od->net_service->url);
-	/*ignore all size info on anim streams*/
-	if (!is_scene_decoder) gf_bifs_decoder_ignore_size_info(priv->codec);
-	return GF_OK;
-}
-
-GF_Err BIFS_ReleaseScene(GF_SceneDecoder *plug)
-{
-	BIFSPriv *priv = (BIFSPriv *)plug->privateStack;
-	if (!priv->codec || priv->nb_streams) return GF_BAD_PARAM;
-	gf_bifs_decoder_del(priv->codec);
-	priv->codec = NULL;
-	return GF_OK;
-}
-
-static GF_Err BIFS_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	BIFSPriv *priv = (BIFSPriv *)plug->privateStack;
-	GF_Err e;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	if (!esd->decoderConfig->decoderSpecificInfo) return GF_BAD_PARAM;
-	e = gf_bifs_decoder_configure_stream(priv->codec, esd->ESID, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
-	if (!e) priv->nb_streams++;
-	return e;
-}
-
-static GF_Err BIFS_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	GF_Err e;
-	BIFSPriv *priv = (BIFSPriv *)plug->privateStack;
-	e = gf_bifs_decoder_remove_stream(priv->codec, ES_ID);
-	if (e) return e;
-	priv->nb_streams--;
-	return GF_OK;
-}
-
-static GF_Err BIFS_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 AU_time, u32 mmlevel)
-{
-	Double ts_offset;
-	s32 time;
-	GF_Err e = GF_OK;
-	BIFSPriv *priv = (BIFSPriv *)plug->privateStack;
-
-	time = (s32) AU_time;
-	ts_offset = ((Double)time)/1000.0;
-	e = gf_bifs_decode_au(priv->codec, ES_ID, inBuffer, inBufferLength, ts_offset);
-
-	/*if scene not attached do it*/
-	if (e == GF_OK) {
-		gf_scene_attach_to_compositor(priv->pScene);
-	}
-	return e;
-}
-
-static u32 BIFS_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	BIFSPriv *priv = (BIFSPriv *)ifce->privateStack;
-	if (StreamType!=GF_STREAM_SCENE) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_SCENE_BIFS:
-	case GPAC_OTI_SCENE_BIFS_V2:
-	/*Streams with this value with a StreamType indicating a systems stream (values 1,2,3, 6, 7, 8, 9)
-		shall be treated as if the ObjectTypeIndication had been set to 0x01*/
-	case 0xFF:
-		priv->PL = PL;
-		return GF_CODEC_SUPPORTED;
-	default:
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-}
-
-
-void DeleteBIFSDec(GF_BaseDecoder *plug)
-{
-	BIFSPriv *priv;
-	if (!plug)
-		return;
-	priv = (BIFSPriv *)plug->privateStack;
-	if (priv) {
-		/*in case something went wrong*/
-		if (priv->codec) gf_bifs_decoder_del(priv->codec);
-		priv->codec = NULL;
-		gf_free(priv);
-		plug->privateStack = NULL;
-	}
-	gf_free(plug);
-}
-
-GF_BaseDecoder *NewBIFSDec()
-{
-	BIFSPriv *priv;
-	GF_SceneDecoder *tmp;
-
-	GF_SAFEALLOC(tmp, GF_SceneDecoder);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, BIFSPriv);
-	if (!priv) {
-		gf_free(tmp);
-		return NULL;
-	}
-	priv->codec = NULL;
-	tmp->privateStack = priv;
-	tmp->AttachStream = BIFS_AttachStream;
-	tmp->DetachStream = BIFS_DetachStream;
-	tmp->GetCapabilities = BIFS_GetCapabilities;
-	tmp->SetCapabilities = BIFS_SetCapabilities;
-	tmp->ProcessData = BIFS_ProcessData;
-	tmp->AttachScene = BIFS_AttachScene;
-	tmp->CanHandleStream = BIFS_CanHandleStream;
-	tmp->ReleaseScene = BIFS_ReleaseScene;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC BIFS Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) tmp;
-}
-
-
-#endif /*GPAC_DISABLE_BIFS*/
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_BIFS
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_BIFS
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewBIFSDec();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_BIFS
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteBIFSDec((GF_BaseDecoder *)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( bifs )

gpac-0.8.0.tar.gz/modules/ctx_load Deleted

gpac-0.8.0.tar.gz/modules/ctx_load/Makefile Deleted

gpac-0.8.0.tar.gz/modules/ctx_load/ctx_load.c Deleted

@@ -1,850 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / GPAC Scene Context loader module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/scene_manager.h>
-#include <gpac/constants.h>
-#include <gpac/network.h>
-#include <gpac/nodes_mpeg4.h>
-
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
-
-typedef struct
-{
-	GF_Scene *scene;
-	GF_Terminal *app;
-	GF_SceneManager *ctx;
-	GF_SceneLoader load;
-	char *file_name;
-	u64 file_size;
-	u32 load_flags;
-	u32 nb_streams;
-	u32 base_stream_id;
-	u32 last_check_time;
-	u64 last_check_size;
-	/*mp3 import from flash*/
-	GF_List *files_to_delete;
-	/*progressive loading support for XMT X3D*/
-	FILE *src;
-	u32 file_pos, sax_max_duration;
-	Bool progressive_support;
-
-	const char *service_url;
-} CTXLoadPriv;
-
-
-static GF_Err CTXLoad_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err CTXLoad_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-static void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od)
-{
-	GF_ObjectManager *odm;
-	odm = gf_scene_find_odm(scene, od->objectDescriptorID);
-	/*remove the old OD*/
-	if (odm) gf_odm_disconnect(odm, 1);
-	odm = gf_odm_new();
-	odm->OD = od;
-	odm->term = scene->root_od->term;
-	odm->parentscene = scene;
-	gf_mx_p(scene->mx_resources);
-	gf_list_add(scene->resources, odm);
-	gf_mx_v(scene->mx_resources);
-
-	/*locate service owner*/
-	gf_odm_setup_object(odm, scene->root_od->net_service);
-}
-
-
-static void CTXLoad_Reset(CTXLoadPriv *priv)
-{
-	if (priv->ctx) gf_sm_del(priv->ctx);
-	priv->ctx = NULL;
-	gf_sg_reset(priv->scene->graph);
-	if (priv->load_flags != 3) priv->load_flags = 0;
-	while (gf_list_count(priv->files_to_delete)) {
-		char *fileName = (char*)gf_list_get(priv->files_to_delete, 0);
-		gf_list_rem(priv->files_to_delete, 0);
-		gf_delete_file(fileName);
-		gf_free(fileName);
-	}
-}
-
-static void CTXLoad_ExecuteConditional(M_Conditional *c, GF_Scene *scene)
-{
-	GF_List *clist = c->buffer.commandList;
-	c->buffer.commandList = NULL;
-
-	gf_sg_command_apply_list(gf_node_get_graph((GF_Node*)c), clist, gf_scene_get_time(scene));
-
-	if (c->buffer.commandList != NULL) {
-		while (gf_list_count(clist)) {
-			GF_Command *sub_com = (GF_Command *)gf_list_get(clist, 0);
-			gf_sg_command_del(sub_com);
-			gf_list_rem(clist, 0);
-		}
-		gf_list_del(clist);
-	} else {
-		c->buffer.commandList = clist;
-	}
-}
-
-static void CTXLoad_OnActivate(GF_Node *node, GF_Route *route)
-{
-	GF_Scene *scene = (GF_Scene *) gf_node_get_private(node);
-	M_Conditional*c = (M_Conditional*)node;
-	/*always apply in parent graph to handle protos correctly*/
-	if (c->activate) CTXLoad_ExecuteConditional(c, scene);
-}
-
-static void CTXLoad_OnReverseActivate(GF_Node *node, GF_Route *route)
-{
-	GF_Scene *scene = (GF_Scene *) gf_node_get_private(node);
-	M_Conditional*c = (M_Conditional*)node;
-	/*always apply in parent graph to handle protos correctly*/
-	if (!c->reverseActivate)
-		CTXLoad_ExecuteConditional(c, scene);
-}
-
-void CTXLoad_NodeCallback(void *cbk, u32 type, GF_Node *node, void *param)
-{
-	if ((type==GF_SG_CALLBACK_INIT) && (gf_node_get_tag(node) == TAG_MPEG4_Conditional) ) {
-		M_Conditional*c = (M_Conditional*)node;
-		c->on_activate = CTXLoad_OnActivate;
-		c->on_reverseActivate = CTXLoad_OnReverseActivate;
-		gf_node_set_private(node, cbk);
-	} else {
-		gf_term_node_callback(cbk, type, node, param);
-	}
-}
-
-static Bool CTXLoad_CheckDownload(CTXLoadPriv *priv)
-{
-	u64 size;
-	FILE *f;
-	u32 now = gf_sys_clock();
-
-	if (!priv->file_size && (now - priv->last_check_time < 1000) ) return GF_FALSE;
-
-	f = gf_fopen(priv->file_name, "rt");
-	if (!f) return GF_FALSE;
-	gf_fseek(f, 0, SEEK_END);
-	size = gf_ftell(f);
-	gf_fclose(f);
-
-	/*we MUST have a complete file for now ...*/
-	if (!priv->file_size) {
-		if (priv->last_check_size == size) return GF_TRUE;
-		priv->last_check_size = size;
-		priv->last_check_time = now;
-	} else {
-		if (size==priv->file_size) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-
-static GF_Err CTXLoad_Setup(GF_BaseDecoder *plug)
-{
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-	if (!priv->file_name) return GF_BAD_PARAM;
-
-	priv->ctx = gf_sm_new(priv->scene->graph);
-	memset(&priv->load, 0, sizeof(GF_SceneLoader));
-	priv->load.ctx = priv->ctx;
-	priv->load.is = priv->scene;
-	priv->load.scene_graph = priv->scene->graph;
-	priv->load.fileName = priv->file_name;
-	priv->load.src_url = priv->service_url;
-	priv->load.flags = GF_SM_LOAD_FOR_PLAYBACK;
-	priv->load.localPath = gf_modules_get_option((GF_BaseInterface *)plug, "General", "CacheDirectory");
-	priv->load.swf_import_flags = GF_SM_SWF_STATIC_DICT | GF_SM_SWF_QUAD_CURVE | GF_SM_SWF_SCALABLE_LINE | GF_SM_SWF_SPLIT_TIMELINE;
-	return GF_OK;
-}
-
-static GF_Err CTXLoad_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	const char *ext;
-	GF_BitStream *bs;
-	u32 size;
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-
-	/*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;
-	}
-	/*main dummy stream we need a dsi*/
-	if (!esd->decoderConfig->decoderSpecificInfo)
-		return GF_NON_COMPLIANT_BITSTREAM;
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	priv->file_size = gf_bs_read_u32(bs);
-	gf_bs_del(bs);
-	size = esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32);
-	priv->file_name = (char *) gf_malloc(sizeof(char)*(1 + size) );
-	memcpy(priv->file_name, esd->decoderConfig->decoderSpecificInfo->data + sizeof(u32),  sizeof(char)*(esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32)) );
-	priv->file_name[size] = 0;
-	priv->nb_streams = 1;
-	priv->load_flags = 0;
-	priv->base_stream_id = esd->ESID;
-	priv->service_url = esd->service_url;
-
-
-	CTXLoad_Setup(plug);
-
-	priv->progressive_support = GF_FALSE;
-	priv->sax_max_duration = 0;
-
-	ext = strrchr(priv->file_name, '.');
-	if (!ext) return GF_OK;
-
-	ext++;
-	if (!stricmp(ext, "xmt") || !stricmp(ext, "xmtz") || !stricmp(ext, "xmta")
-	        || !stricmp(ext, "x3d") || !stricmp(ext, "x3dz")
-	   ) {
-		ext = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "Progressive");
-		priv->progressive_support = (ext && !stricmp(ext, "yes")) ? GF_TRUE : GF_FALSE;
-	}
-	if (priv->progressive_support) {
-		ext = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "MaxDuration");
-		if (ext) priv->sax_max_duration = atoi(ext);
-	}
-	return GF_OK;
-}
-
-static GF_Err CTXLoad_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-	priv->nb_streams --;
-	return GF_OK;
-}
-
-static GF_Err CTXLoad_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-	if (priv->ctx) return GF_BAD_PARAM;
-
-	priv->scene = scene;
-	priv->app = scene->root_od->term;
-	gf_sg_set_node_callback(scene->graph, CTXLoad_NodeCallback);
-
-	return GF_OK;
-}
-
-static GF_Err CTXLoad_ReleaseScene(GF_SceneDecoder *plug)
-{
-	CTXLoad_Reset((CTXLoadPriv *) plug->privateStack);
-	return GF_OK;
-}
-
-static Bool CTXLoad_StreamInRootOD(GF_ObjectDescriptor *od, u32 ESID)
-{
-	u32 i, count;
-	/*no root, only one stream possible*/
-	if (!od) return GF_TRUE;
-	count = gf_list_count(od->ESDescriptors);
-	/*idem*/
-	if (!count) return GF_TRUE;
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *)gf_list_get(od->ESDescriptors, i);
-		if (esd->ESID==ESID) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-
-Double CTXLoad_GetVRMLTime(void *cbk)
-{
-	u32 secs, msecs;
-	Double res;
-	gf_utc_time_since_1970(&secs, &msecs);
-	res = msecs;
-	res /= 1000;
-	res += secs;
-	return res;
-}
-
-static void CTXLoad_CheckStreams(CTXLoadPriv *priv )
-{
-	u32 i, j, max_dur;
-	GF_AUContext *au;
-	GF_StreamContext *sc;
-	max_dur = 0;
-	i=0;
-	while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
-		/*all streams in root OD are handled with ESID 0 to differentiate with any animation streams*/
-		if (CTXLoad_StreamInRootOD(priv->ctx->root_od, sc->ESID)) sc->in_root_od = GF_TRUE;
-		if (!sc->timeScale) sc->timeScale = 1000;
-
-		j=0;
-		while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
-			if (!au->timing) au->timing = (u64) (sc->timeScale*au->timing_sec);
-		}
-		if (au && sc->in_root_od && (au->timing>max_dur)) max_dur = (u32) (au->timing * 1000 / sc->timeScale);
-	}
-	if (max_dur) {
-		priv->scene->root_od->duration = max_dur;
-		gf_scene_set_duration(priv->scene);
-	}
-}
-
-static GF_Err CTXLoad_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                                  u16 ES_ID, u32 stream_time, u32 mmlevel)
-{
-	GF_Err e = GF_OK;
-	u32 i, j, k, nb_updates, last_rap=0;
-	GF_AUContext *au;
-	Bool can_delete_com;
-	GF_StreamContext *sc;
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-
-	/*something failed*/
-	if (priv->load_flags==3) return GF_EOS;
-
-	/*this signals main scene deconnection, destroy the context if needed*/
-	assert(ES_ID);
-	if (!priv->ctx) {
-		e = CTXLoad_Setup((GF_BaseDecoder *)plug);
-		if (e) return e;
-	}
-
-
-	if (stream_time==(u32)-1) {
-		/*seek on root stream: destroy the context manager and reload it. We cannot seek on the main stream
-		because commands may have changed node attributes/children and we d'ont track the initial value*/
-		if (priv->load_flags && (priv->base_stream_id == ES_ID)) {
-			if (priv->src) gf_fclose(priv->src);
-			priv->src = NULL;
-			gf_sm_load_done(&priv->load);
-			priv->file_pos = 0;
-			/*queue scene for detach*/
-			gf_term_lock_media_queue(priv->scene->root_od->term, GF_TRUE);
-			priv->scene->root_od->action_type = GF_ODM_ACTION_SCENE_RECONNECT;
-			gf_list_add(priv->scene->root_od->term->media_queue, priv->scene->root_od);
-			gf_term_lock_media_queue(priv->scene->root_od->term, GF_FALSE);
-
-			return CTXLoad_Setup((GF_BaseDecoder *)plug);
-		}
-		i=0;
-		while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
-			/*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;
-			/*handle SWF media extraction*/
-			if ((sc->streamType == GF_STREAM_OD) && (priv->load_flags==1)) continue;
-			sc->last_au_time = 0;
-		}
-		return GF_OK;
-	}
-
-	if (priv->load_flags != 2) {
-
-		if (priv->progressive_support) {
-			u32 entry_time;
-			char file_buf[4096+1];
-			if (!priv->src) {
-				priv->src = gf_fopen(priv->file_name, "rb");
-				if (!priv->src) return GF_URL_ERROR;
-				priv->file_pos = 0;
-			}
-			priv->load.type = GF_SM_LOAD_XMTA;
-			e = GF_OK;
-			entry_time = gf_sys_clock();
-			gf_fseek(priv->src, priv->file_pos, SEEK_SET);
-			while (1) {
-				u32 diff;
-				s32 nb_read = (s32) fread(file_buf, 1, 4096, priv->src);
-				if (nb_read<0) {
-					return GF_IO_ERR;
-				}
-				file_buf[nb_read] = 0;
-				if (!nb_read) {
-					if (priv->file_pos==priv->file_size) {
-						gf_fclose(priv->src);
-						priv->src = NULL;
-						priv->load_flags = 2;
-						gf_sm_load_done(&priv->load);
-						break;
-					}
-					break;
-				}
-
-				e = gf_sm_load_string(&priv->load, file_buf, GF_FALSE);
-				priv->file_pos += nb_read;
-				if (e) break;
-				diff = gf_sys_clock() - entry_time;
-				if (diff > priv->sax_max_duration) break;
-			}
-			if (!priv->scene->graph_attached) {
-				gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
-				gf_scene_attach_to_compositor(priv->scene);
-
-				CTXLoad_CheckStreams(priv);
-			}
-		}
-		/*load first frame only*/
-		else if (!priv->load_flags) {
-			/*we need the whole file*/
-			if (!CTXLoad_CheckDownload(priv)) return GF_OK;
-
-			priv->load_flags = 1;
-			e = gf_sm_load_init(&priv->load);
-			if (!e) {
-				CTXLoad_CheckStreams(priv);
-				gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
-				/*VRML, override base clock*/
-				if ((priv->load.type==GF_SM_LOAD_VRML) || (priv->load.type==GF_SM_LOAD_X3DV) || (priv->load.type==GF_SM_LOAD_X3D)) {
-					/*override clock callback*/
-					gf_sg_set_scene_time_callback(priv->scene->graph, CTXLoad_GetVRMLTime);
-				}
-			}
-		}
-		/*load the rest*/
-		else {
-			priv->load_flags = 2;
-			e = gf_sm_load_run(&priv->load);
-			gf_sm_load_done(&priv->load);
-			/*in case this was not set in the first pass (XMT)*/
-			gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
-		}
-
-		if (e<0) {
-			gf_sm_load_done(&priv->load);
-			gf_sm_del(priv->ctx);
-			priv->ctx = NULL;
-			priv->load_flags = 3;
-			return e;
-		}
-
-		/*and figure out duration of root scene, and take care of XMT timing*/
-		if (priv->load_flags==2) {
-			CTXLoad_CheckStreams(priv);
-			if (!gf_list_count(priv->ctx->streams)) {
-				gf_scene_attach_to_compositor(priv->scene);
-			}
-		}
-	}
-
-	nb_updates = 0;
-
-	i=0;
-	while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
-		/*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;
-		/*handle SWF media extraction*/
-		if ((sc->streamType == GF_STREAM_OD) && (priv->load_flags==1)) continue;
-
-		/*check for seek*/
-		if (sc->last_au_time > 1 + stream_time) {
-			sc->last_au_time = 0;
-		}
-
-		can_delete_com = GF_FALSE;
-		if (sc->in_root_od && (priv->load_flags==2)) can_delete_com = GF_TRUE;
-
-		/*we're in the right stream, apply update*/
-		j=0;
-
-		/*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);
-
-				if (au_time > stream_time)
-					break;
-				if (au->flags & GF_SM_AU_RAP) last_rap = j-1;
-			}
-			j = last_rap;
-		}
-
-		while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
-			u32 au_time = (u32) (au->timing*1000/sc->timeScale);
-
-			if (au_time + 1 <= sc->last_au_time) {
-				/*remove first replace command*/
-				if (can_delete_com && (sc->streamType==GF_STREAM_SCENE)) {
-					while (gf_list_count(au->commands)) {
-						GF_Command *com = (GF_Command *)gf_list_get(au->commands, 0);
-						gf_list_rem(au->commands, 0);
-						gf_sg_command_del(com);
-					}
-					j--;
-					gf_list_rem(sc->AUs, j);
-					gf_list_del(au->commands);
-					gf_free(au);
-				}
-				continue;
-			}
-
-			if (au_time > stream_time) {
-				nb_updates++;
-				break;
-			}
-
-			if (sc->streamType == GF_STREAM_SCENE) {
-				GF_Command *com;
-				/*apply the commands*/
-				k=0;
-				while ((com = (GF_Command *)gf_list_enum(au->commands, &k))) {
-					e = gf_sg_command_apply(priv->scene->graph, com, 0);
-					if (e) break;
-					/*remove commands on base layer*/
-					if (can_delete_com) {
-						k--;
-						gf_list_rem(au->commands, k);
-						gf_sg_command_del(com);
-					}
-				}
-			}
-			else if (sc->streamType == GF_STREAM_OD) {
-				/*apply the commands*/
-				while (gf_list_count(au->commands)) {
-					Bool keep_com = GF_FALSE;
-					GF_ODCom *com = (GF_ODCom *)gf_list_get(au->commands, 0);
-					gf_list_rem(au->commands, 0);
-					switch (com->tag) {
-					case GF_ODF_OD_UPDATE_TAG:
-					{
-						GF_ODUpdate *odU = (GF_ODUpdate *)com;
-						while (gf_list_count(odU->objectDescriptors)) {
-							GF_ESD *esd;
-							char *remote;
-							GF_MuxInfo *mux = NULL;
-							GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, 0);
-							gf_list_rem(odU->objectDescriptors, 0);
-							/*we can only work with single-stream ods*/
-							esd = (GF_ESD*)gf_list_get(od->ESDescriptors, 0);
-							if (!esd) {
-								if (od->URLString) {
-									ODS_SetupOD(priv->scene, od);
-								} else {
-									gf_odf_desc_del((GF_Descriptor *) od);
-								}
-								continue;
-							}
-							/*fix OCR dependencies*/
-							if (CTXLoad_StreamInRootOD(priv->ctx->root_od, esd->OCRESID)) esd->OCRESID = priv->base_stream_id;
-
-							/*forbidden if ESD*/
-							if (od->URLString) {
-								gf_odf_desc_del((GF_Descriptor *) od);
-								continue;
-							}
-							/*look for MUX info*/
-							k=0;
-							while ((mux = (GF_MuxInfo*)gf_list_enum(esd->extensionDescriptors, &k))) {
-								if (mux->tag == GF_ODF_MUXINFO_TAG) break;
-								mux = NULL;
-							}
-							/*we need a mux if not animation stream*/
-							if (!mux || !mux->file_name) {
-								/*only animation streams are handled*/
-								if (!esd->decoderConfig) {
-									gf_odf_desc_del((GF_Descriptor *) od);
-								} else if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
-									/*set ST to private scene to get sure the stream will be redirected to us*/
-									esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
-									esd->dependsOnESID = priv->base_stream_id;
-									ODS_SetupOD(priv->scene, od);
-								} else if (esd->decoderConfig->streamType==GF_STREAM_INTERACT) {
-									GF_UIConfig *cfg = (GF_UIConfig *) esd->decoderConfig->decoderSpecificInfo;
-									gf_odf_encode_ui_config(cfg, &esd->decoderConfig->decoderSpecificInfo);
-									gf_odf_desc_del((GF_Descriptor *) cfg);
-									ODS_SetupOD(priv->scene, od);
-								} else if (esd->decoderConfig->streamType==GF_STREAM_OCR) {
-									ODS_SetupOD(priv->scene, od);
-								} else {
-									gf_odf_desc_del((GF_Descriptor *) od);
-								}
-								continue;
-							}
-							//solve url before import
-							if (mux->src_url) {
-								char *res_url = gf_url_concatenate(mux->src_url, mux->file_name);
-								if (res_url) {
-									gf_free(mux->file_name);
-									mux->file_name = res_url;
-								}
-								gf_free(mux->src_url);
-								mux->src_url = NULL;
-							}
-							/*text import*/
-							if (mux->textNode) {
-#ifdef GPAC_DISABLE_MEDIA_IMPORT
-								gf_odf_desc_del((GF_Descriptor *) od);
-								continue;
-#else
-								e = gf_sm_import_bifs_subtitle(priv->ctx, esd, mux);
-								if (e) {
-									e = GF_OK;
-									gf_odf_desc_del((GF_Descriptor *) od);
-									continue;
-								}
-								/*set ST to private scene and dependency to base to get sure the stream will be redirected to us*/
-								esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
-								esd->dependsOnESID = priv->base_stream_id;
-								ODS_SetupOD(priv->scene, od);
-								continue;
-#endif
-							}
-
-							/*soundstreams are a bit of a pain, they may be declared before any data gets written*/
-							if (mux->delete_file) {
-								FILE *t = gf_fopen(mux->file_name, "rb");
-								if (!t) {
-									keep_com = GF_TRUE;
-									gf_list_insert(odU->objectDescriptors, od, 0);
-									break;
-								}
-								gf_fclose(t);
-							}
-							/*remap to remote URL - warning, the URL has already been resolved according to the parent path*/
-							remote = (char*)gf_malloc(sizeof(char) * (strlen("gpac://")+strlen(mux->file_name)+1) );
-							strcpy(remote, "gpac://");
-							strcat(remote, mux->file_name);
-							k = od->objectDescriptorID;
-							/*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_odf_desc_del((GF_Descriptor *) od);
-							od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-							od->URLString = remote;
-							od->objectDescriptorID = k;
-							ODS_SetupOD(priv->scene, od);
-						}
-						if (keep_com) break;
-					}
-					break;
-					case GF_ODF_OD_REMOVE_TAG:
-					{
-						GF_ODRemove *odR = (GF_ODRemove*)com;
-						for (k=0; k<odR->NbODs; k++) {
-							GF_ObjectManager *odm = gf_scene_find_odm(priv->scene, odR->OD_ID[k]);
-							if (odm) gf_odm_disconnect(odm, 1);
-						}
-					}
-					break;
-					default:
-						break;
-					}
-					if (keep_com) {
-						gf_list_insert(au->commands, com, 0);
-						break;
-					} else {
-						gf_odf_com_del(&com);
-					}
-					if (e) break;
-				}
-
-			}
-			sc->last_au_time = au_time + 1;
-			/*attach graph to renderer*/
-			if (!priv->scene->graph_attached)
-				gf_scene_attach_to_compositor(priv->scene);
-			if (e) return e;
-
-			/*for root streams remove completed AUs (no longer needed)*/
-			if (sc->in_root_od && !gf_list_count(au->commands) ) {
-				j--;
-				gf_list_rem(sc->AUs, j);
-				gf_list_del(au->commands);
-				gf_free(au);
-			}
-		}
-	}
-	if (e) return e;
-	if ((priv->load_flags==2) && !nb_updates) return GF_EOS;
-	return GF_OK;
-}
-
-const char *CTXLoad_GetName(struct _basedecoder *plug)
-{
-	CTXLoadPriv *priv = (CTXLoadPriv *)plug->privateStack;
-
-	switch (priv->load.type) {
-	case GF_SM_LOAD_BT:
-		return "MPEG-4 BT Parser";
-	case GF_SM_LOAD_VRML:
-		return "VRML 97 Parser";
-	case GF_SM_LOAD_X3DV:
-		return "X3D (VRML Syntax) Parser";
-	case GF_SM_LOAD_XMTA:
-		return "XMT-A Parser";
-	case GF_SM_LOAD_X3D:
-		return "X3D (XML Syntax) Parser";
-	case GF_SM_LOAD_SWF:
-		return "Flash (SWF) Emulator";
-	case GF_SM_LOAD_XSR:
-		return "LASeRML Loader";
-	case GF_SM_LOAD_MP4:
-		return "MP4 Memory Loader";
-	case GF_SM_LOAD_XBL:
-		return "XBL Parser";
-
-	default:
-		return "Undetermined";
-	}
-}
-
-static u32 CTXLoad_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType==GF_STREAM_PRIVATE_SCENE) {
-		/*media type query*/
-		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_PRIVATE_SCENE_GENERIC:
-			return GF_CODEC_SUPPORTED;
-		/*LASeR ML: we use this plugin since it has command handling*/
-		case GPAC_OTI_PRIVATE_SCENE_LASER:
-			return GF_CODEC_SUPPORTED;
-		/* XBL */
-		case GPAC_OTI_PRIVATE_SCENE_XBL:
-			return GF_CODEC_SUPPORTED;
-		/*SVG*/
-		case GPAC_OTI_PRIVATE_SCENE_SVG:
-			return GF_CODEC_MAYBE_SUPPORTED;
-		}
-	} else if (StreamType==GF_STREAM_SCENE) {
-		/*media type query*/
-		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_SCENE_SVG:
-		case GPAC_OTI_SCENE_SVG_GZ:
-		case GPAC_OTI_SCENE_DIMS:
-			return GF_CODEC_MAYBE_SUPPORTED;
-		default:
-			break;
-		}
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-void DeleteContextLoader(GF_BaseDecoder *plug)
-{
-	CTXLoadPriv *priv;
-	if (!plug)
-		return;
-	priv = (CTXLoadPriv *)plug->privateStack;
-	if (priv) {
-		if (priv->file_name)
-			gf_free(priv->file_name);
-		priv->file_name = NULL;
-		assert(!priv->ctx);
-		if (priv->files_to_delete)
-			gf_list_del(priv->files_to_delete);
-		priv->files_to_delete = NULL;
-		gf_free(priv);
-		plug->privateStack = NULL;
-	}
-	gf_free(plug);
-}
-
-GF_BaseDecoder *NewContextLoader()
-{
-	CTXLoadPriv *priv;
-	GF_SceneDecoder *tmp;
-
-	GF_SAFEALLOC(tmp, GF_SceneDecoder);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, CTXLoadPriv);
-	if (!priv) {
-		gf_free(tmp);
-		return NULL;
-	}
-	priv->files_to_delete = gf_list_new();
-
-	tmp->privateStack = priv;
-	tmp->AttachStream = CTXLoad_AttachStream;
-	tmp->DetachStream = CTXLoad_DetachStream;
-	tmp->GetCapabilities = CTXLoad_GetCapabilities;
-	tmp->SetCapabilities = CTXLoad_SetCapabilities;
-	tmp->ProcessData = CTXLoad_ProcessData;
-	tmp->AttachScene = CTXLoad_AttachScene;
-	tmp->ReleaseScene = CTXLoad_ReleaseScene;
-	tmp->GetName = CTXLoad_GetName;
-	tmp->CanHandleStream = CTXLoad_CanHandleStream;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC Context Loader", "gpac distribution")
-	return (GF_BaseDecoder*)tmp;
-}
-
-#endif //defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewContextLoader();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteContextLoader((GF_BaseDecoder *)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( ctx_load )

gpac-0.8.0.tar.gz/modules/dummy_in Deleted

gpac-0.8.0.tar.gz/modules/dummy_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/dummy_in/dummy_in.c Deleted

@@ -1,531 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Dummy input module
- *
- *  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/modules/service.h>
-/*for GF_STREAM_PRIVATE_SCENE definition*/
-#include <gpac/constants.h>
-#include <gpac/download.h>
-#include <gpac/xml.h>
-
-typedef struct
-{
-	u32 ESID;
-	LPNETCHANNEL ch;
-	u32 start, end;
-} DummyChannel;
-
-typedef struct
-{
-	/*the service we're responsible for*/
-	GF_ClientService *service;
-	char *url;
-	u32 oti;
-	Bool is_views_url;
-	GF_List *channels;
-
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-	Bool is_service_connected;
-} DCReader;
-
-DummyChannel *DC_GetChannel(DCReader *read, LPNETCHANNEL ch)
-{
-	DummyChannel *dc;
-	u32 i=0;
-	while ((dc = (DummyChannel *)gf_list_enum(read->channels, &i))) {
-		if (dc->ch && dc->ch==ch) return dc;
-	}
-	return NULL;
-}
-
-Bool DC_RemoveChannel(DCReader *read, LPNETCHANNEL ch)
-{
-	DummyChannel *dc;
-	u32 i=0;
-	while ((dc = (DummyChannel *)gf_list_enum(read->channels, &i))) {
-		if (dc->ch && dc->ch==ch) {
-			gf_list_rem(read->channels, i-1);
-			gf_free(dc);
-			return GF_TRUE;
-		}
-	}
-	return GF_FALSE;
-}
-
-static const char * DC_MIME_TYPES[] = {
-	/*  "application/x-xmta", "xmta xmta.gz xmtaz", "MPEG-4 Text (XMT)" */
-	"application/x-bt", "bt bt.gz btz", "MPEG-4 Text (BT)",
-	"application/x-xmt", "xmt xmt.gz xmtz", "MPEG-4 Text (XMT)",
-	"model/vrml", "wrl wrl.gz", "VRML World",
-	"x-model/x-vrml", "wrl wrl.gz", "VRML World",
-	"model/x3d+vrml", "x3dv x3dv.gz x3dvz", "X3D/VRML World",
-	"model/x3d+xml", "x3d x3d.gz x3dz", "X3D/XML World",
-	"application/x-shockwave-flash", "swf", "Macromedia Flash Movie",
-	"image/svg+xml", "svg svg.gz svgz", "SVG Document",
-	"image/x-svgm", "svgm", "SVGM Document",
-	"application/x-LASeR+xml", "xsr", "LASeR Document",
-	"application/widget", "wgt", "W3C Widget Package",
-	"application/x-mpegu-widget", "mgt", "MPEG-U Widget Package",
-	NULL
-};
-
-
-static u32 DC_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	if (!plug)
-		return 0;
-	for (i = 0 ; DC_MIME_TYPES[i] ; i+=3)
-		gf_service_register_mime(plug, DC_MIME_TYPES[i], DC_MIME_TYPES[i+1], DC_MIME_TYPES[i+2]);
-	return i / 3;
-}
-
-Bool DC_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (sExt) {
-		Bool ok = GF_FALSE;
-		char *cgi_par;
-		if (!strnicmp(sExt, ".gz", 3)) sExt = strrchr(sExt, '.');
-		if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
-
-		cgi_par = strchr(sExt, '?');
-		if (cgi_par) cgi_par[0] = 0;
-		{
-			u32 i;
-			for (i = 0 ; DC_MIME_TYPES[i] ; i+=3)
-				if (0 != (ok = gf_service_check_mime_register(plug, DC_MIME_TYPES[i], DC_MIME_TYPES[i+1], DC_MIME_TYPES[i+2], sExt)))
-					break;
-		}
-		if (cgi_par) cgi_par[0] = '?';
-		if (ok) return GF_TRUE;
-	}
-	/*views:// internal URI*/
-	if (!strnicmp(url, "views://", 8))
-		return GF_TRUE;
-	/*mosaic:// internal URI*/
-	if (!strnicmp(url, "mosaic://", 9))
-		return GF_TRUE;
-
-
-	if (!strncmp(url, "\\\\", 2)) return GF_FALSE;
-
-	if (!strnicmp(url, "file://", 7) || !strstr(url, "://")) {
-		char *rtype = gf_xml_get_root_type(url, NULL);
-		if (rtype) {
-			Bool handled = GF_FALSE;
-			if (!strcmp(rtype, "SAFSession")) handled = GF_TRUE;
-			else if (!strcmp(rtype, "XMT-A")) handled = GF_TRUE;
-			else if (!strcmp(rtype, "X3D")) handled = GF_TRUE;
-			else if (!strcmp(rtype, "svg")) handled = GF_TRUE;
-			else if (!strcmp(rtype, "bindings")) handled = GF_TRUE;
-			else if (!strcmp(rtype, "widget")) handled = GF_TRUE;
-			gf_free(rtype);
-			return handled;
-		}
-	}
-	return GF_FALSE;
-}
-
-void DC_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	DCReader *read = (DCReader *) cbk;
-
-	/*handle service message*/
-	gf_service_download_update_stats(read->dnload);
-
-	e = param->error;
-
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-	} else if (param->msg_type==GF_NETIO_PARSE_HEADER) {
-		if (!strcmp(param->name, "Content-Type")) {
-			if (strstr(param->value, "application/x-bt")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "application/x-xmt")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "model/vrml")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "model/x3d+vrml")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "application/x-shockwave-flash")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "image/svg+xml")) read->oti = GPAC_OTI_PRIVATE_SCENE_SVG;
-			if (strstr(param->value, "image/x-svgm")) read->oti = GPAC_OTI_PRIVATE_SCENE_SVG;
-			if (strstr(param->value, "application/x-LASeR+xml")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			if (strstr(param->value, "application/widget")) read->oti = GPAC_OTI_PRIVATE_SCENE_WGT;
-			if (strstr(param->value, "application/x-mpegu-widget")) read->oti = GPAC_OTI_PRIVATE_SCENE_WGT;
-		}
-		return;
-	} else if (!e && (param->msg_type!=GF_NETIO_DATA_EXCHANGE)) return;
-
-	if (!e && !read->oti)
-		return;
-
-	/*OK confirm*/
-	if (!read->is_service_connected) {
-		if (!gf_dm_sess_get_cache_name(read->dnload)) e = GF_IO_ERR;
-		if (e>0) e = GF_OK;
-		gf_service_connect_ack(read->service, NULL, e);
-		read->is_service_connected = GF_TRUE;
-	}
-}
-
-void DC_DownloadFile(GF_InputService *plug, char *url)
-{
-	DCReader *read = (DCReader *) plug->priv;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, DC_NetIO, read);
-	if (!read->dnload) {
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-}
-
-
-GF_Err DC_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	DCReader *read = (DCReader *) plug->priv;
-	FILE *test;
-	char *tmp, *ext;
-
-	if (!read || !serv || !url) return GF_BAD_PARAM;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	read->url = gf_strdup(url);
-	ext = strchr(read->url, '#');
-	if (ext) {
-		char *anext;
-		ext[0] = 0;
-		anext = strrchr(read->url, '.');
-		ext[0] = '#';
-		ext = anext;
-	} else {
-		ext = strrchr(read->url, '.');
-	}
-	if (ext && !stricmp(ext, ".gz")) {
-		char *anext;
-		ext[0] = 0;
-		anext = strrchr(read->url, '.');
-		ext[0] = '.';
-		ext = anext;
-	}
-	read->service = serv;
-
-	if (!strnicmp(url, "views://", 8) || !strnicmp(url, "mosaic://", 9)) {
-		read->is_views_url = GF_TRUE;
-		gf_service_connect_ack(serv, NULL, GF_OK);
-		read->is_service_connected = GF_TRUE;
-		return GF_OK;
-	}
-
-	if (ext) {
-		char *cgi_par = NULL;
-		ext += 1;
-		if (ext) {
-			tmp = strchr(ext, '#');
-			if (tmp) tmp[0] = 0;
-			/* Warning the '?' sign should not be present in local files but it is convenient to have it
-			   to test web content locally */
-			cgi_par = strchr(ext, '?');
-			if (cgi_par) cgi_par[0] = 0;
-		}
-		if (!stricmp(ext, "bt") || !stricmp(ext, "btz") || !stricmp(ext, "bt.gz")
-		        || !stricmp(ext, "xmta")
-		        || !stricmp(ext, "xmt") || !stricmp(ext, "xmt.gz") || !stricmp(ext, "xmtz")
-		        || !stricmp(ext, "wrl") || !stricmp(ext, "wrl.gz")
-		        || !stricmp(ext, "x3d") || !stricmp(ext, "x3d.gz") || !stricmp(ext, "x3dz")
-		        || !stricmp(ext, "x3dv") || !stricmp(ext, "x3dv.gz") || !stricmp(ext, "x3dvz")
-		        || !stricmp(ext, "swf")
-		   )
-			read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-
-		else if (!stricmp(ext, "svg") || !stricmp(ext, "svgz") || !stricmp(ext, "svg.gz")) {
-			read->oti = GPAC_OTI_PRIVATE_SCENE_SVG;
-		}
-		/*XML LASeR*/
-		else if (!stricmp(ext, "xsr"))
-			read->oti = GPAC_OTI_PRIVATE_SCENE_LASER;
-		else if (!stricmp(ext, "xbl"))
-			read->oti = GPAC_OTI_PRIVATE_SCENE_XBL;
-		else if (!stricmp(ext, "wgt") || !stricmp(ext, "mgt"))
-			read->oti = GPAC_OTI_PRIVATE_SCENE_WGT;
-
-		if (cgi_par) cgi_par[0] = '?';
-	}
-
-	if (!read->oti && (!strnicmp(url, "file://", 7) || !strstr(url, "://"))) {
-		char *rtype = gf_xml_get_root_type(url, NULL);
-		if (rtype) {
-			if (!strcmp(rtype, "SAFSession")) read->oti = GPAC_OTI_PRIVATE_SCENE_LASER;
-			else if (!strcmp(rtype, "svg")) read->oti = GPAC_OTI_PRIVATE_SCENE_SVG;
-			else if (!strcmp(rtype, "XMT-A")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			else if (!strcmp(rtype, "X3D")) read->oti = GPAC_OTI_PRIVATE_SCENE_GENERIC;
-			else if (!strcmp(rtype, "bindings")) read->oti = GPAC_OTI_PRIVATE_SCENE_XBL;
-			else if (!strcmp(rtype, "widget")) read->oti = GPAC_OTI_PRIVATE_SCENE_WGT;
-			gf_free(rtype);
-		}
-	}
-
-	/*remote fetch*/
-	if (!strnicmp(url, "file://", 7)) {
-	}
-	else if (strstr(url, "://")) {
-		DC_DownloadFile(plug, read->url);
-		return GF_OK;
-	}
-
-	test = gf_fopen(read->url, "rt");
-	if (!test) {
-		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
-		return GF_OK;
-	}
-	gf_fclose(test);
-	if (!read->is_service_connected) {
-		gf_service_connect_ack(serv, NULL, GF_OK);
-		read->is_service_connected = GF_TRUE;
-	}
-	return GF_OK;
-}
-
-GF_Err DC_CloseService(GF_InputService *plug)
-{
-	DCReader *read = (DCReader *) plug->priv;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-/*Dummy input just send a file name, no multitrack to handle so we don't need to check sub_url nor expected type*/
-static GF_Descriptor *DC_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 size = 0;
-	char *uri;
-	GF_ESD *esd;
-	GF_BitStream *bs;
-	DCReader *read = (DCReader *) plug->priv;
-	GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
-	iod->scene_profileAndLevel = 1;
-	iod->graphics_profileAndLevel = 1;
-	iod->OD_profileAndLevel = 1;
-	iod->audio_profileAndLevel = 0xFE;
-	iod->visual_profileAndLevel = 0xFE;
-	iod->objectDescriptorID = 1;
-
-	if (read->is_views_url) {
-		iod->URLString = gf_strdup(read->url);
-		return (GF_Descriptor *)iod;
-	}
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = 1000;
-	esd->slConfig->useTimestampsFlag = 1;
-	esd->ESID = 0xFFFE;
-	esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
-	esd->decoderConfig->objectTypeIndication = read->oti;
-	if (read->dnload) {
-		uri = (char *) gf_dm_sess_get_cache_name(read->dnload);
-		gf_dm_sess_get_stats(read->dnload, NULL, NULL, &size, NULL, NULL, NULL);
-	} else {
-		FILE *f = gf_fopen(read->url, "rt");
-		gf_fseek(f, 0, SEEK_END);
-		size = (u32) gf_ftell(f);
-		gf_fclose(f);
-		uri = read->url;
-	}
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_u32(bs, size);
-	gf_bs_write_data(bs, uri, (u32) strlen(uri));
-	gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(bs);
-
-	gf_list_add(iod->ESDescriptors, esd);
-	return (GF_Descriptor *)iod;
-}
-
-
-GF_Err DC_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	DCReader *read = (DCReader *) plug->priv;
-	DummyChannel *dc;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	dc = DC_GetChannel(read, com->base.on_channel);
-	if (!dc) return GF_STREAM_NOT_FOUND;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	/*since data is file-based, no padding is needed (decoder plugin will handle it itself)*/
-	case GF_NET_CHAN_SET_PADDING:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		/*this module is not made for updates, use undefined duration*/
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		dc->start = (u32) (1000 * com->play.start_range);
-		dc->end = (u32) (1000 * com->play.end_range);
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	case GF_NET_CHAN_CONFIG:
-		return GF_OK;
-	case GF_NET_CHAN_GET_DSI:
-		com->get_dsi.dsi = NULL;
-		com->get_dsi.dsi_len = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-	return GF_OK;
-}
-
-GF_Err DC_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID;
-	DCReader *read = (DCReader *) plug->priv;
-
-	sscanf(url, "ES_ID=%ud", &ESID);
-	if (!ESID) {
-		gf_service_connect_ack(read->service, channel, GF_STREAM_NOT_FOUND);
-	} else {
-		DummyChannel *dc;
-		GF_SAFEALLOC(dc, DummyChannel);
-		if (!dc) return GF_OUT_OF_MEM;
-		dc->ch = channel;
-		dc->ESID = ESID;
-		gf_list_add(read->channels, dc);
-		gf_service_connect_ack(read->service, channel, GF_OK);
-	}
-	return GF_OK;
-}
-
-GF_Err DC_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	Bool had_ch;
-	DCReader *read = (DCReader *) plug->priv;
-
-	had_ch = DC_RemoveChannel(read, channel);
-	gf_service_disconnect_ack(read->service, channel, had_ch ? GF_OK : GF_STREAM_NOT_FOUND);
-	return GF_OK;
-}
-
-GF_Err DC_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	DummyChannel *dc;
-	DCReader *read = (DCReader *) plug->priv;
-	dc = DC_GetChannel(read, channel);
-	if (!dc) return GF_STREAM_NOT_FOUND;
-
-	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
-	out_sl_hdr->compositionTimeStampFlag = 1;
-	out_sl_hdr->compositionTimeStamp = dc->start;
-	out_sl_hdr->accessUnitStartFlag = 1;
-	*sl_compressed = GF_FALSE;
-	*out_reception_status = GF_OK;
-	*is_new_data = GF_TRUE;
-	return GF_OK;
-}
-
-GF_Err DC_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	return GF_OK;
-}
-
-Bool DC_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	return GF_FALSE;
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	DCReader *read;
-	GF_InputService *plug;
-	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_SAFEALLOC(read, DCReader);
-	if (!read) {
-		gf_free(plug);
-		return NULL;
-	}
-	read->channels = gf_list_new();
-	plug->priv = read;
-
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC Dummy Loader", "gpac distribution")
-
-
-	plug->RegisterMimeTypes = DC_RegisterMimeTypes;
-	plug->CanHandleURL = DC_CanHandleURL;
-	plug->ConnectService = DC_ConnectService;
-	plug->CloseService = DC_CloseService;
-	plug->GetServiceDescriptor = DC_GetServiceDesc;
-	plug->ConnectChannel = DC_ConnectChannel;
-	plug->DisconnectChannel = DC_DisconnectChannel;
-	plug->ServiceCommand = DC_ServiceCommand;
-	plug->CanHandleURLInService = DC_CanHandleURLInService;
-	plug->ChannelGetSLP = DC_ChannelGetSLP;
-	plug->ChannelReleaseSLP = DC_ChannelReleaseSLP;
-
-	return (GF_BaseInterface *)plug;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *bi)
-{
-	GF_InputService *ifcn = (GF_InputService*)bi;
-	if (ifcn->InterfaceType==GF_NET_CLIENT_INTERFACE) {
-		DCReader *read = (DCReader*)ifcn->priv;
-		assert(!gf_list_count(read->channels));
-		gf_list_del(read->channels);
-		if( read->url) gf_free(read->url);
-		gf_free(read);
-		gf_free(bi);
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( dummy_in )

gpac-0.8.0.tar.gz/modules/dx_hw/copy_pixels.c Deleted

@@ -1,736 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / 2D rendering module
- *
- *  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/setup.h>
-#include <gpac/constants.h>
-#include <gpac/color.h>
-
-
-static u32 get_yuv_base(u32 in_pf)
-{
-	switch (in_pf) {
-	case GF_PIXEL_I420:
-	case GF_PIXEL_IYUV:
-	case GF_PIXEL_YV12:
-		return GF_PIXEL_YV12;
-	case GF_PIXEL_Y422:
-	case GF_PIXEL_UYNV:
-	case GF_PIXEL_UYVY:
-		return GF_PIXEL_UYVY;
-	case GF_PIXEL_YUNV:
-	case GF_PIXEL_V422:
-	case GF_PIXEL_YUY2:
-		return GF_PIXEL_YUY2;
-	case GF_PIXEL_YVYU:
-		return GF_PIXEL_YVYU;
-	case GF_PIXEL_YV12_10:
-		return GF_PIXEL_YV12_10;
-	case GF_PIXEL_YUV444:
-		return GF_PIXEL_YUV444;
-	case GF_PIXEL_YUV444_10:
-		return GF_PIXEL_YUV444_10;
-	case GF_PIXEL_YUV422_10:
-		return GF_PIXEL_YUV422_10;
-	case GF_PIXEL_YUV422:
-		return GF_PIXEL_YUV422;
-	default:
-		return 0;
-	}
-}
-
-static Bool format_is_yuv(u32 in_pf)
-{
-	switch (in_pf) {
-	case GF_PIXEL_YUY2:
-	case GF_PIXEL_YVYU:
-	case GF_PIXEL_UYVY:
-	case GF_PIXEL_VYUY:
-	case GF_PIXEL_Y422:
-	case GF_PIXEL_UYNV:
-	case GF_PIXEL_YUNV:
-	case GF_PIXEL_V422:
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_IYUV:
-	case GF_PIXEL_I420:
-		return GF_TRUE;
-	/*not supported yet*/
-	case GF_PIXEL_YUVA:
-	default:
-		return GF_FALSE;
-	}
-}
-
-static Bool is_planar_yuv(u32 pf)
-{
-	switch (pf) {
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_I420:
-	case GF_PIXEL_IYUV:
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-
-static void write_yv12_to_yuv(GF_VideoSurface *vs,  unsigned char *pY, u32 src_stride, u32 src_pf,
-                              u32 src_width, u32 src_height, const GF_Window *src_wnd, u8 *pU, u8 *pV)
-{
-
-	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 5*src_stride * src_height/4;
-	}
-
-
-	pY = pY + src_stride * src_wnd->y + src_wnd->x;
-	/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
-	therefore force an even Y offset for U and V planes.*/
-	pU = pU + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
-	pV = pV + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
-
-
-	if (is_planar_yuv(vs->pixel_format)) {
-		/*complete source copy*/
-		if ( (vs->pitch_y == (s32) src_stride) && (src_wnd->w == src_width) && (src_wnd->h == src_height)) {
-			assert(!src_wnd->x);
-			assert(!src_wnd->y);
-			memcpy(vs->video_buffer, pY, sizeof(unsigned char)*src_width*src_height);
-			if (vs->pixel_format == GF_PIXEL_YV12) {
-				memcpy(vs->video_buffer + vs->pitch_y * vs->height, pV, sizeof(unsigned char)*src_width*src_height/4);
-				memcpy(vs->video_buffer + 5 * vs->pitch_y * vs->height/4, pU, sizeof(unsigned char)*src_width*src_height/4);
-			} else {
-				memcpy(vs->video_buffer + vs->pitch_y * vs->height, pU, sizeof(unsigned char)*src_width*src_height/4);
-				memcpy(vs->video_buffer + 5 * vs->pitch_y * vs->height/4, pV, sizeof(unsigned char)*src_width*src_height/4);
-			}
-		} else {
-			u32 i;
-			unsigned char *dst, *src, *dst2, *src2, *dst3, *src3;
-
-			src = pY;
-			dst = (unsigned char*)vs->video_buffer;
-
-			src2 = (vs->pixel_format != GF_PIXEL_YV12) ? pU : pV;
-			dst2 = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
-			src3 = (vs->pixel_format != GF_PIXEL_YV12) ? pV : pU;
-			dst3 = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
-			for (i=0; i<src_wnd->h; i++) {
-				memcpy(dst, src, src_wnd->w);
-				src += src_stride;
-				dst += vs->pitch_y;
-				if (i<src_wnd->h/2) {
-					memcpy(dst2, src2, src_wnd->w/2);
-					src2 += src_stride/2;
-					dst2 += vs->pitch_y/2;
-					memcpy(dst3, src3, src_wnd->w/2);
-					src3 += src_stride/2;
-					dst3 += vs->pitch_y/2;
-				}
-			}
-		}
-	} else if (get_yuv_base(vs->pixel_format)==GF_PIXEL_UYVY) {
-		u32 i, j;
-		unsigned char *dst, *y, *u, *v;
-		for (i=0; i<src_wnd->h; i++) {
-			y = pY + i*src_stride;
-			u = pU + (i/2) * src_stride/2;
-			v = pV + (i/2) * src_stride/2;
-			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-
-			for (j=0; j<src_wnd->w/2; j++) {
-				*dst = *u;
-				dst++;
-				u++;
-				*dst = *y;
-				dst++;
-				y++;
-				*dst = *v;
-				dst++;
-				v++;
-				*dst = *y;
-				dst++;
-				y++;
-			}
-		}
-	} else if (get_yuv_base(vs->pixel_format)==GF_PIXEL_YUY2) {
-		u32 i, j;
-		unsigned char *dst, *y, *u, *v;
-		for (i=0; i<src_wnd->h; i++) {
-			y = pY + i*src_stride;
-			u = pU + (i/2) * src_stride/2;
-			v = pV + (i/2) * src_stride/2;
-			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-
-			for (j=0; j<src_wnd->w/2; j++) {
-				*dst = *y;
-				dst++;
-				y++;
-				*dst = *u;
-				dst++;
-				u++;
-				*dst = *y;
-				dst++;
-				y++;
-				*dst = *v;
-				dst++;
-				v++;
-			}
-		}
-	} else if (vs->pixel_format==GF_PIXEL_YVYU) {
-		u32 i, j;
-		unsigned char *dst, *y, *u, *v;
-		for (i=0; i<src_wnd->h; i++) {
-			y = pY + i*src_stride;
-			u = pU + (i/2) * src_stride/2;
-			v = pV + (i/2) * src_stride/2;
-			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-
-			for (j=0; j<src_wnd->w/2; j++) {
-				*dst = *y;
-				dst++;
-				y++;
-				*dst = *v;
-				dst++;
-				v++;
-				*dst = *y;
-				dst++;
-				y++;
-				*dst = *u;
-				dst++;
-				u++;
-			}
-		}
-	}
-}
-static void write_yuv422_to_yuv(GF_VideoSurface *vs, unsigned char *pY, u32 src_stride, u32 src_pf,
-	u32 src_width, u32 src_height, const GF_Window *src_wnd, u8 *pU, u8 *pV)
-{
-
-	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 3 * src_stride * src_height/2;
-	}
-
-
-	pY = pY + src_stride * src_wnd->y + src_wnd->x;
-	pU = pU + (src_stride * src_wnd->y + src_wnd->x)/2;
-	pV = pV + (src_stride *src_wnd->y + src_wnd->x)/2;
-
-
-	if (is_planar_yuv(vs->pixel_format)) {
-		/*complete source copy*/
-		u32 i;
-		unsigned char *dst, *src, *dst2, *src2, *dst3, *src3, *_src2, *_src3;
-
-		src = pY;
-		_src2 = (vs->pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		_src3 = (vs->pixel_format != GF_PIXEL_YV12) ? pV : pU;
-		dst = (unsigned char*)vs->video_buffer;
-		dst2 = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
-		dst3 = (unsigned char*)vs->video_buffer + 5 * vs->pitch_y * vs->height / 4 ;
-		for (i = 0; i<src_wnd->h; i++) {
-			memcpy(dst, src, src_wnd->w);
-			src += src_stride;
-			dst += vs->pitch_y;
-			if (i < src_wnd->h / 2)
-			{
-				src2 = _src2 + i*src_stride;
-				src3 = _src3 + i*src_stride;
-				memcpy(dst2, src2, src_wnd->w / 2);
-				memcpy(dst3, src3, src_wnd->w / 2);
-				dst2 += vs->pitch_y / 2;
-				dst3 += vs->pitch_y / 2;
-
-			}
-
-		}
-		
-
-	}
-
-}
-static void write_yuv444_to_yuv(GF_VideoSurface *vs, unsigned char *pY, u32 src_stride, u32 src_pf,
-	u32 src_width, u32 src_height, const GF_Window *src_wnd, u8 *pU, u8 *pV)
-{
-
-	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 2 * src_stride * src_height ;
-	}
-
-
-	pY = pY + src_stride * src_wnd->y + src_wnd->x;
-	pU = pU + src_stride * src_wnd->y + src_wnd->x;
-	pV = pV + src_stride *src_wnd->y + src_wnd->x;
-
-
-	if (is_planar_yuv(vs->pixel_format)) {
-		/*complete source copy*/
-		u32 i,j;
-			unsigned char *dst, *src, *dst2, *src2, *dst3, *src3,*_src2,*_src3;
-
-			 src = pY;
-			_src2 = (vs->pixel_format != GF_PIXEL_YV12) ? pU : pV;
-			_src3 = (vs->pixel_format != GF_PIXEL_YV12) ? pV : pU;
-			 dst = (unsigned char*)vs->video_buffer;
-			
-			for (i = 0; i<src_wnd->h; i++) {
-				memcpy(dst, src, src_wnd->w);
-				src += src_stride;
-				dst += vs->pitch_y;
-			
-			}
-			for (i = 0; i < src_wnd->h / 2; i++) {
-				src2 = _src2 + 2*i*src_stride ;
-				dst2 = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height + i* vs->pitch_y / 2;
-				src3 = _src3 + 2*i*src_stride;
-				dst3 = (unsigned char*)vs->video_buffer + 5 * vs->pitch_y * vs->height / 4 + i* vs->pitch_y / 2;
-				for (j = 0; j<src_wnd->w/2; j++) {
-					*dst2 = *src2;
-					dst2++;
-					src2 += 2;
-
-					*dst3 = *src3;
-					dst3++;
-					src3 += 2;
-				}
-
-			}
-			
-		
-	}
-	
-}
-
-static void write_yvyu_to_yuv(GF_VideoSurface *vs,  unsigned char *src, u32 src_stride, u32 src_pf,
-                              u32 src_width, u32 src_height, const GF_Window *src_wnd)
-{
-	u32 i, j, base_pf;
-	unsigned char *pY, *pU, *pV;
-
-	switch (get_yuv_base(src_pf) ) {
-	case GF_PIXEL_UYVY:
-		pU = src + src_stride * src_wnd->y + src_wnd->x;
-		pY = src + src_stride * src_wnd->y + src_wnd->x + 1;
-		pV = src + src_stride * src_wnd->y + src_wnd->x + 3;
-		break;
-	case GF_PIXEL_YUY2:
-		pY = src + src_stride * src_wnd->y + src_wnd->x;
-		pU = src + src_stride * src_wnd->y + src_wnd->x + 1;
-		pV = src + src_stride * src_wnd->y + src_wnd->x + 3;
-		break;
-	case GF_PIXEL_YVYU:
-		pY = src + src_stride * src_wnd->y + src_wnd->x;
-		pV = src + src_stride * src_wnd->y + src_wnd->x + 1;
-		pU = src + src_stride * src_wnd->y + src_wnd->x + 3;
-		break;
-	default:
-		return;
-	}
-
-	if (is_planar_yuv(vs->pixel_format)) {
-		u32 i, j;
-		unsigned char *dst_y, *dst_u, *dst_v;
-
-		dst_y = (unsigned char*)vs->video_buffer;
-		if (vs->pixel_format == GF_PIXEL_YV12) {
-			dst_v = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
-			dst_u = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
-		} else {
-			dst_u = (unsigned char*)vs->video_buffer + vs->pitch_y * vs->height;
-			dst_v = (unsigned char*)vs->video_buffer + 5*vs->pitch_y * vs->height/4;
-		}
-		for (i=0; i<src_wnd->h; i++) {
-			for (j=0; j<src_wnd->w; j+=2) {
-				*dst_y = * pY;
-				*(dst_y+1) = * (pY+2);
-				dst_y += 2;
-				pY += 4;
-				if (i%2) continue;
-
-				*dst_u = (*pU + *(pU + src_stride)) / 2;
-				*dst_v = (*pV + *(pV + src_stride)) / 2;
-				dst_u++;
-				dst_v++;
-				pU += 4;
-				pV += 4;
-			}
-			if (i%2) {
-				pU += src_stride;
-				pV += src_stride;
-			}
-		}
-		return;
-	}
-
-	if (get_yuv_base(src_pf) == get_yuv_base(vs->pixel_format)) {
-		u32 i;
-		for (i=0; i<src_wnd->h; i++) {
-			char *dst = vs->video_buffer + i*vs->pitch_y;
-			pY = src + src_stride * (i+src_wnd->y) + src_wnd->x;
-			memcpy(dst, pY, sizeof(char)*2*src_wnd->w);
-		}
-		return;
-	}
-
-	base_pf = get_yuv_base(vs->pixel_format);
-	for (i=0; i<src_wnd->h; i++) {
-		char *dst = vs->video_buffer + i*vs->pitch_y;
-		char *y = (char*)pY + src_stride * i;
-		char *u = (char*)pU + src_stride * i;
-		char *v = (char*)pV + src_stride * i;
-		switch (base_pf) {
-		case GF_PIXEL_UYVY:
-			for (j=0; j<src_wnd->w; j+=2) {
-				dst[0] = *u;
-				dst[1] = *y;
-				dst[2] = *v;
-				dst[3] = *(y+2);
-				dst += 4;
-				y+=4;
-				u+=4;
-				v+=4;
-			}
-			break;
-		case GF_PIXEL_YVYU:
-			for (j=0; j<src_wnd->w; j+=2) {
-				dst[0] = *y;
-				dst[1] = *v;
-				dst[2] = *(y+2);
-				dst[3] = *u;
-				dst += 4;
-				y+=4;
-				u+=4;
-				v+=4;
-			}
-			break;
-		case GF_PIXEL_YUY2:
-			for (j=0; j<src_wnd->w; j+=2) {
-				dst[0] = *y;
-				dst[1] = *u;
-				dst[2] = *(y+2);
-				dst[3] = *v;
-				dst += 4;
-				y+=4;
-				u+=4;
-				v+=4;
-			}
-			break;
-		}
-	}
-}
-
-u32 get_bpp(u32 pf)
-{
-	switch (pf) {
-	case GF_PIXEL_RGB_555:
-	case GF_PIXEL_RGB_565:
-		return 2;
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_RGBS:
-	case GF_PIXEL_BGR_24:
-		return 3;
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_BGR_32:
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGBAS:
-	case GF_PIXEL_RGBD:
-	case GF_PIXEL_RGBDS:
-		return 4;
-	}
-	return 0;
-}
-
-void rgb_to_24(GF_VideoSurface *vs, unsigned char *src, u32 src_stride, u32 src_w, u32 src_h, u32 src_pf, const GF_Window *src_wnd)
-{
-	u32 i;
-	u32 BPP = get_bpp(src_pf);
-	if (!BPP) return;
-
-	/*go to start of src*/
-	src += src_stride*src_wnd->y + BPP * src_wnd->x;
-
-	if (src_pf==vs->pixel_format) {
-		for (i=0; i<src_wnd->h; i++) {
-			memcpy(vs->video_buffer + i*vs->pitch_y, src, sizeof(unsigned char) * BPP * src_wnd->w);
-			src += src_stride;
-		}
-		return;
-	}
-}
-
-
-void rgb_to_555(GF_VideoSurface *vs, unsigned char *src, u32 src_stride, u32 src_w, u32 src_h, u32 src_pf, const GF_Window *src_wnd)
-{
-	u32 i, j, r, g, b;
-	u32 BPP = get_bpp(src_pf);
-	unsigned char *dst, *cur;
-	if (!BPP) return;
-
-	/*go to start of src*/
-	src += src_stride*src_wnd->y + BPP * src_wnd->x;
-
-	if (src_pf==vs->pixel_format) {
-		for (i=0; i<src_wnd->h; i++) {
-			memcpy(vs->video_buffer + i*vs->pitch_y, src, sizeof(unsigned char) * BPP * src_wnd->w);
-		}
-		return;
-	}
-	switch (src_pf) {
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_RGBS:
-		/*nope get all pixels*/
-		for (i=0; i<src_wnd->h; i++) {
-			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-			cur = src + i*src_stride;
-			for (j=0; j<src_wnd->w; j++) {
-				r = *cur++;
-				g = *cur++;
-				b = *cur++;
-				* ((unsigned short *)dst) = GF_COL_555(r, g, b);
-				dst += 2;
-			}
-		}
-		break;
-	}
-}
-
-void rgb_to_565(GF_VideoSurface *vs, unsigned char *src, u32 src_stride, u32 src_w, u32 src_h, u32 src_pf, const GF_Window *src_wnd)
-{
-	u32 i, j, r, g, b;
-	u32 BPP = get_bpp(src_pf);
-	unsigned char *dst, *cur;
-	if (!BPP) return;
-
-	/*go to start of src*/
-	src += src_stride*src_wnd->y + BPP * src_wnd->x;
-
-	if (src_pf==vs->pixel_format) {
-		for (i=0; i<src_wnd->h; i++) {
-			memcpy(vs->video_buffer + i*vs->pitch_y, src, sizeof(unsigned char) * BPP * src_wnd->w);
-		}
-		return;
-	}
-	/*nope get all pixels*/
-	switch (src_pf) {
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_RGBS:
-		for (i=0; i<src_wnd->h; i++) {
-			dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-			cur = src + i*src_stride;
-			for (j=0; j<src_wnd->w; j++) {
-				r = *cur++;
-				g = *cur++;
-				b = *cur++;
-				* ((unsigned short *)dst) = GF_COL_565(r, g, b);
-				dst += 2;
-			}
-		}
-		break;
-	}
-}
-
-void rgb_to_32(GF_VideoSurface *vs, unsigned char *src, u32 src_stride, u32 src_w, u32 src_h, u32 src_pf, const GF_Window *src_wnd)
-{
-	u32 i, j;
-	Bool isBGR;
-	u32 BPP = get_bpp(src_pf);
-	unsigned char *dst, *cur;
-	if (!BPP) return;
-
-	/*go to start of src*/
-	src += src_stride*src_wnd->y + BPP * src_wnd->x;
-
-	if (src_pf==vs->pixel_format) {
-		for (i=0; i<src_wnd->h; i++) {
-			memcpy(vs->video_buffer + i*vs->pitch_y, src, sizeof(unsigned char) * BPP * src_wnd->w);
-		}
-		return;
-	}
-	/*get all pixels*/
-	isBGR = (vs->pixel_format==GF_PIXEL_BGR_32) ? GF_TRUE : GF_FALSE;
-	if (isBGR) {
-		switch (src_pf) {
-		case GF_PIXEL_RGB_24:
-		case GF_PIXEL_RGBS:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[0] = *cur++;
-					dst[1] = *cur++;
-					dst[2] = *cur++;
-					dst += 4;
-				}
-			}
-			break;
-		case GF_PIXEL_RGBDS:
-		case GF_PIXEL_RGBD:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[0] = *cur++;
-					dst[1] = *cur++;
-					dst[2] = *cur++;
-					cur++;
-					dst += 4;
-				}
-			}
-			break;
-		case GF_PIXEL_BGR_24:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[2] = *cur++;
-					dst[1] = *cur++;
-					dst[0] = *cur++;
-					dst += 4;
-				}
-			}
-			break;
-		}
-	} else {
-		switch (src_pf) {
-		case GF_PIXEL_RGB_24:
-		case GF_PIXEL_RGBS:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[2] = *cur++;
-					dst[1] = *cur++;
-					dst[0] = *cur++;
-					dst += 4;
-				}
-			}
-			break;
-		case GF_PIXEL_RGBD:
-		case GF_PIXEL_RGBDS:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[2] = *cur++;
-					dst[1] = *cur++;
-					dst[0] = *cur++;
-					cur++;
-					dst += 4;
-				}
-			}
-			break;
-		case GF_PIXEL_BGR_24:
-			for (i=0; i<src_wnd->h; i++) {
-				dst = (unsigned char*)vs->video_buffer + i*vs->pitch_y;
-				cur = src + i*src_stride;
-				for (j=0; j<src_wnd->w; j++) {
-					dst[0] = *cur++;
-					dst[1] = *cur++;
-					dst[2] = *cur++;
-					dst += 4;
-				}
-			}
-			break;
-		}
-	}
-}
-
-void dx_copy_pixels(GF_VideoSurface *dst_s, const GF_VideoSurface *src_s, const GF_Window *src_wnd)
-{
-	/*handle YUV input*/
-	if (get_yuv_base(src_s->pixel_format)==GF_PIXEL_YV12) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			write_yv12_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd, src_s->u_ptr, src_s->v_ptr);
-			return;
-		}
-	} else if (get_yuv_base(src_s->pixel_format)==GF_PIXEL_YV12_10) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			gf_color_write_yv12_10_to_yuv(dst_s, src_s->video_buffer, src_s->u_ptr, src_s->v_ptr, src_s->pitch_y, src_s->width, src_s->height, src_wnd, 1);
-			return;
-		}
-	}
-	else if (get_yuv_base(src_s->pixel_format) == GF_PIXEL_YUV444) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			write_yuv444_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd, src_s->u_ptr, src_s->v_ptr);
-			return;
-		}
-	}
-	else if (get_yuv_base(src_s->pixel_format) == GF_PIXEL_YUV422) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			write_yuv422_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd, src_s->u_ptr, src_s->v_ptr);
-			return;
-		}
-	}
-	else if (get_yuv_base(src_s->pixel_format) == GF_PIXEL_YUV422_10) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			gf_color_write_yuv422_10_to_yuv(dst_s, src_s->video_buffer, src_s->u_ptr, src_s->v_ptr, src_s->pitch_y, src_s->width, src_s->height, src_wnd, 1);
-
-			return;
-		}
-	}
-	else if (get_yuv_base(src_s->pixel_format) == GF_PIXEL_YUV444_10) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			/*generic YV planar to YUV (planar or not) */
-			gf_color_write_yuv444_10_to_yuv(dst_s, src_s->video_buffer, src_s->u_ptr, src_s->v_ptr, src_s->pitch_y, src_s->width, src_s->height, src_wnd, 1);
-
-			return;
-		}
-	}
-	else if (format_is_yuv(src_s->pixel_format)) {
-		if (format_is_yuv(dst_s->pixel_format)) {
-			write_yvyu_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd);
-			return;
-		}
-	} else {
-		switch (dst_s->pixel_format) {
-		case GF_PIXEL_RGB_555:
-			rgb_to_555(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->width, src_s->height, src_s->pixel_format, src_wnd);
-			return;
-		case GF_PIXEL_RGB_565:
-			rgb_to_565(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->width, src_s->height, src_s->pixel_format, src_wnd);
-			return;
-		case GF_PIXEL_RGB_24:
-		case GF_PIXEL_RGBS:
-		case GF_PIXEL_BGR_24:
-			rgb_to_24(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->width, src_s->height, src_s->pixel_format, src_wnd);
-			return;
-		case GF_PIXEL_RGB_32:
-		case GF_PIXEL_RGBD:
-		case GF_PIXEL_RGBDS:
-		case GF_PIXEL_BGR_32:
-			rgb_to_32(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->width, src_s->height, src_s->pixel_format, src_wnd);
-			return;
-		}
-	}
-
-	gf_stretch_bits(dst_s, (GF_VideoSurface*) src_s, NULL, (GF_Window *)src_wnd, 0xFF, GF_FALSE, NULL, NULL);
-}
-
-

gpac-0.8.0.tar.gz/modules/epoc_hw Deleted

gpac-0.8.0.tar.gz/modules/epoc_hw/epoc_vout.cpp Deleted

@@ -1,555 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / EPOC video output module
- *
- *  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.
- *
- */
-
-/*driver interface*/
-#include <gpac/modules/video_out.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/modules/codec.h>
-
-#include <w32std.h>
-
-#ifdef GPAC_USE_GLES1X
-#include <GLES/egl.h>
-#endif
-
-typedef struct
-{
-	RWindow *window;
-	RWsSession *session;
-
-	u32 pixel_format, bpp, width, height;
-	CWsScreenDevice *screen;
-	CFbsBitmap *surface;
-	CWindowGc *gc;
-
-	char *locked_data;
-	u32 output_3d_type;
-
-#ifdef GPAC_USE_GLES1X
-	EGLDisplay egl_display;
-	EGLSurface egl_surface;
-	EGLContext egl_context;
-#endif
-
-} EPOCVideo;
-
-
-static void EVID_ResetSurface(GF_VideoOutput *dr, Bool gl_only)
-{
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-
-#ifdef GPAC_USE_GLES1X
-	if (ctx->egl_display) {
-		eglMakeCurrent(ctx->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-		if (ctx->egl_context) eglDestroyContext(ctx->egl_display, ctx->egl_context);
-		ctx->egl_context = NULL;
-		if (ctx->egl_surface) eglDestroySurface(ctx->egl_display, ctx->egl_surface);
-		ctx->egl_surface = NULL;
-		eglTerminate(ctx->egl_display);
-		ctx->egl_display = NULL;
-	}
-#endif
-	if (gl_only) return;
-
-	if (ctx->locked_data) ctx->surface->UnlockHeap();
-	ctx->locked_data = NULL;
-	if (ctx->surface) delete ctx->surface;
-	ctx->surface = NULL;
-	if (ctx->gc) delete ctx->gc;
-	ctx->gc = NULL;
-	if (ctx->screen) delete ctx->screen;
-	ctx->screen = NULL;
-}
-
-static GF_Err EVID_InitSurface(GF_VideoOutput *dr)
-{
-	TInt gl_buffer_size;
-	TInt e;
-	TDisplayMode disp_mode;
-	TSize s;
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Reseting video\n"));
-	EVID_ResetSurface(dr, 0);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video reset OK\n"));
-
-	ctx->screen = new CWsScreenDevice(*ctx->session);
-	if (!ctx->screen) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create screen device for session\n"));
-		return GF_IO_ERR;
-	}
-	e = ctx->screen->Construct();
-	if (e != KErrNone) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot construct screen device for session - error %d\n", e));
-		return GF_IO_ERR;
-	}
-	e = ctx->screen->CreateContext(ctx->gc);
-	if (e != KErrNone) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create graphical context - error %d\n", e));
-		return GF_IO_ERR;
-	}
-
-	ctx->surface = new CFbsBitmap();
-	if (!ctx->surface) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot allocate backbuffer surface\n"));
-		return GF_IO_ERR;
-	}
-
-	s = ctx->window->Size();
-	disp_mode = ctx->screen->DisplayMode();
-	e = ctx->surface->Create(s, disp_mode);
-	if (e != KErrNone) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create backbuffer surface - error %d\n", e));
-		return GF_IO_ERR;
-	}
-
-	gl_buffer_size = 0;
-	switch (disp_mode) {
-	case EGray256:
-		ctx->pixel_format = GF_PIXEL_GREYSCALE;
-		ctx->bpp = 1;
-		break;
-	case EColor64K:
-		ctx->pixel_format = GF_PIXEL_RGB_565;
-		ctx->bpp = 2;
-		gl_buffer_size = 16;
-		break;
-	case EColor16M:
-		ctx->pixel_format = GF_PIXEL_RGB_24;
-		ctx->bpp = 3;
-		gl_buffer_size = 24;
-		break;
-	/** 4096 colour display (12 bpp). */
-	case EColor4K:
-		ctx->pixel_format = GF_PIXEL_RGB_444;
-		ctx->bpp = 2;
-		gl_buffer_size = 12;
-		break;
-	/** True colour display mode (32 bpp, but top byte is unused and unspecified) */
-	case EColor16MU:
-		ctx->pixel_format = GF_PIXEL_RGB_32;
-		ctx->bpp = 4;
-		gl_buffer_size = 32;
-		break;
-#if defined(__SERIES60_3X__)
-	/** Display mode with alpha (24bpp colour plus 8bpp alpha) */
-	case EColor16MA:
-		ctx->pixel_format = GF_PIXEL_ARGB;
-		ctx->bpp = 4;
-		gl_buffer_size = 32;
-		break;
-#endif
-	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Unsupported display type %d\n", disp_mode));
-		return GF_NOT_SUPPORTED;
-	}
-	ctx->width = s.iWidth;
-	ctx->height = s.iHeight;
-
-#ifdef GPAC_USE_GLES1X
-	if (ctx->output_3d_type==1) {
-		if (!gl_buffer_size) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Display mode not supported by OpenGL\n"));
-			return GF_IO_ERR;
-		}
-		ctx->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-		if (ctx->egl_display == NULL) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot open OpenGL display\n"));
-			return GF_IO_ERR;
-		}
-
-		if (eglInitialize(ctx->egl_display, NULL, NULL) == EGL_FALSE) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot initialize OpenGL display\n"));
-			return GF_IO_ERR;
-		}
-		EGLConfig *configList = NULL;
-		EGLint numOfConfigs = 0;
-		EGLint configSize   = 0;
-		if (eglGetConfigs(ctx->egl_display, configList, configSize, &numOfConfigs) == EGL_FALSE) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot retrieve OpenGL configurations\n"));
-			return GF_IO_ERR;
-		}
-		configSize = numOfConfigs;
-		configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
-
-		// Define properties for the wanted EGLSurface
-		EGLint atts[7];
-		const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
-
-		atts[0] = EGL_BUFFER_SIZE;
-		atts[1] = gl_buffer_size;
-		atts[2] = EGL_DEPTH_SIZE;
-		atts[3] = opt ? atoi(opt) : 16;
-		atts[4] = EGL_SURFACE_TYPE;
-		atts[5] = EGL_PIXMAP_BIT;
-		atts[6] = EGL_NONE;
-
-		if (eglChooseConfig(ctx->egl_display, atts, configList, configSize, &numOfConfigs) == EGL_FALSE) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot choose OpenGL configuration\n"));
-			return GF_IO_ERR;
-		}
-		EGLConfig gl_cfg = configList[0];
-		gf_free(configList);
-
-		ctx->egl_surface = eglCreatePixmapSurface(ctx->egl_display, gl_cfg, ctx->surface, NULL);
-		if (ctx->egl_surface == NULL) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL surface\n"));
-			return GF_IO_ERR;
-		}
-		ctx->egl_context = eglCreateContext(ctx->egl_display, gl_cfg, EGL_NO_CONTEXT, NULL);
-		if (ctx->egl_context == NULL) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL context\n"));
-			return GF_IO_ERR;
-		}
-		if (eglMakeCurrent(ctx->egl_display, ctx->egl_surface, ctx->egl_surface, ctx->egl_context) == EGL_FALSE) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot bind OpenGL context to current thread\n"));
-			return GF_IO_ERR;
-		}
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video OpenGL setup\n"));
-	}
-
-#endif
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video setup OK - %d x %d @ PixelFormat %s\n", ctx->width, ctx->height, gf_4cc_to_str(ctx->pixel_format) ));
-	return GF_OK;
-}
-
-#ifdef GPAC_USE_GLES1X
-
-static GF_Err EVID_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
-{
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-	EVID_ResetSurface(dr, 1);
-	if (!ctx->screen) return GF_NOT_SUPPORTED;
-
-	TDisplayMode disp_mode = ctx->screen->DisplayMode();
-	TInt gl_buffer_size = 0;
-	switch (disp_mode) {
-	case EColor64K:
-		gl_buffer_size = 16;
-		break;
-	case EColor16M:
-		gl_buffer_size = 24;
-		break;
-	/** 4096 colour display (12 bpp). */
-	case EColor4K:
-		gl_buffer_size = 12;
-		break;
-	/** True colour display mode (32 bpp, but top byte is unused and unspecified) */
-	case EColor16MU:
-		gl_buffer_size = 32;
-		break;
-#if defined(__SERIES60_3X__)
-	/** Display mode with alpha (24bpp colour plus 8bpp alpha) */
-	case EColor16MA:
-		gl_buffer_size = 32;
-		break;
-#endif
-	case EGray256:
-	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Unsupported display type %d for OpenGL\n", disp_mode));
-		return GF_NOT_SUPPORTED;
-	}
-
-	ctx->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-	if (ctx->egl_display == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot open OpenGL display\n"));
-		return GF_IO_ERR;
-	}
-
-	if (eglInitialize(ctx->egl_display, NULL, NULL) == EGL_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot initialize OpenGL display\n"));
-		return GF_IO_ERR;
-	}
-
-	EGLConfig *configList = NULL;
-	EGLint numOfConfigs = 0;
-	EGLint configSize   = 0;
-	if (eglGetConfigs(ctx->egl_display, configList, configSize, &numOfConfigs) == EGL_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot retrieve OpenGL configurations\n"));
-		return GF_IO_ERR;
-	}
-	configSize = numOfConfigs;
-	configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
-
-	// Define properties for the wanted EGLSurface
-	EGLint atts[13];
-	const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
-	atts[0] = EGL_RED_SIZE;
-	atts[1] = 8;
-	atts[2] = EGL_GREEN_SIZE;
-	atts[3] = 8;
-	atts[4] = EGL_BLUE_SIZE;
-	atts[5] = 8;
-	atts[6] = EGL_ALPHA_SIZE;
-	atts[7] = (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? 8 : EGL_DONT_CARE;
-	atts[8] = EGL_SURFACE_TYPE;
-	atts[9] = EGL_PBUFFER_BIT;
-	atts[10] = EGL_DEPTH_SIZE;
-	atts[11] = opt ? atoi(opt) : 16;
-	atts[12] = EGL_NONE;
-
-	if (eglChooseConfig(ctx->egl_display, atts, configList, configSize, &numOfConfigs) == EGL_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot choose Offscreen OpenGL configuration\n"));
-		return GF_IO_ERR;
-	}
-	EGLConfig gl_cfg = configList[0];
-	gf_free(configList);
-
-	atts[0] = EGL_WIDTH;
-	atts[1] = width;
-	atts[2] = EGL_HEIGHT;
-	atts[3] = height;
-	atts[4] = EGL_NONE;
-
-	ctx->egl_surface = eglCreatePbufferSurface(ctx->egl_display, gl_cfg, atts);
-	if (ctx->egl_surface == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL Pbuffer\n"));
-		return GF_IO_ERR;
-	}
-	ctx->egl_context = eglCreateContext(ctx->egl_display, gl_cfg, EGL_NO_CONTEXT, NULL);
-	if (ctx->egl_context == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create Offscreen OpenGL context\n"));
-		return GF_IO_ERR;
-	}
-	if (eglMakeCurrent(ctx->egl_display, ctx->egl_surface, ctx->egl_surface, ctx->egl_context) == EGL_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot bind Offscreen OpenGL context to current thread\n"));
-		return GF_IO_ERR;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL setup - size %d x %d\n", width, height));
-	return GF_OK;
-}
-#endif
-
-
-static GF_Err EVID_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
-{
-	GF_Err res;
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-
-	ctx->window = (RWindow *)os_handle;
-	ctx->session = (RWsSession *)os_display;
-
-	res = EVID_InitSurface(dr);
-
-	/*setup opengl offscreen*/
-#ifdef GPAC_USE_GLES1X
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Querying Offscreen OpenGL Capabilities\n"));
-	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-	GF_Err e = EVID_SetupOGL_ES_Offscreen(dr, 20, 20);
-	if (e!=GF_OK) {
-		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-		e = EVID_SetupOGL_ES_Offscreen(dr, 20, 20);
-	}
-	if (!e) {
-		dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL available - alpha support: %s\n", (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? "yes" : "no"));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL not available\n"));
-	}
-#endif
-
-	return res;
-}
-
-static void EVID_Shutdown(GF_VideoOutput *dr)
-{
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-	EVID_ResetSurface(dr, 0);
-	ctx->session = NULL;
-	ctx->window = NULL;
-}
-
-static GF_Err EVID_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
-{
-	//EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err EVID_Flush(GF_VideoOutput *dr, GF_Window *dest)
-{
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-
-	if (ctx->gc && ctx->surface) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Activating window\n"));
-		ctx->gc->Activate(*ctx->window);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Bliting backbuffer\n"));
-		ctx->gc->BitBlt(TPoint(0,0), ctx->surface);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Deactivating window\n"));
-		ctx->gc->Deactivate();
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Flush success\n"));
-	}
-	return GF_OK;
-}
-
-static GF_Err EVID_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
-{
-	//EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-	if (!evt) return GF_OK;
-
-	switch (evt->type) {
-	case GF_EVENT_SHOWHIDE:
-		break;
-	case GF_EVENT_SIZE:
-		/*nothing to do since we don't own the window*/
-		break;
-	case GF_EVENT_VIDEO_SETUP:
-		((EPOCVideo *)dr->opaque)->output_3d_type = evt->setup.opengl_mode;
-		if (evt->setup.opengl_mode==2) {
-#ifdef GPAC_USE_GLES1X
-			return EVID_SetupOGL_ES_Offscreen(dr, evt->setup.width, evt->setup.height);
-#else
-			return GF_NOT_SUPPORTED;
-#endif
-		}
-		return EVID_InitSurface(dr/*, evt->size.width, evt->size.height*/);
-	}
-	return GF_OK;
-}
-
-static GF_Err EVID_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-{
-	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
-	if (!ctx->surface) return GF_BAD_PARAM;
-
-	if (do_lock) {
-		if (!ctx->locked_data) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Locking backbuffer memory\n"));
-			ctx->surface->LockHeap();
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Retrieving backbuffer memory address\n"));
-			ctx->locked_data = (char *)ctx->surface->DataAddress();
-		}
-		memset(vi, 0, sizeof(GF_VideoSurface));
-		vi->height = ctx->height;
-		vi->width = ctx->width;
-		vi->is_hardware_memory = 0;
-		vi->pitch = ctx->width * ctx->bpp;
-		vi->pixel_format = ctx->pixel_format;
-		vi->video_buffer = ctx->locked_data;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Backbuffer locked OK - address 0x%08x\n", ctx->locked_data));
-	} else {
-		if (ctx->locked_data) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Unlocking backbuffer memory\n"));
-			ctx->surface->UnlockHeap();
-			ctx->locked_data = NULL;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Backbuffer unlocked OK\n"));
-		}
-	}
-	return GF_OK;
-}
-
-static void *EPOC_vout_new()
-{
-	EPOCVideo *priv;
-	GF_VideoOutput *driv;
-	GF_SAFEALLOC(driv, GF_VideoOutput);
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "EPOC Video Output", "gpac distribution")
-
-	GF_SAFEALLOC(priv, EPOCVideo);
-	driv->opaque = priv;
-
-	/*alpha and keying to do*/
-	driv->hw_caps = 0;
-#ifdef GPAC_USE_GLES1X
-	/*no offscreen opengl with epoc at the moment*/
-	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
-#endif
-
-	driv->Setup = EVID_Setup;
-	driv->Shutdown = EVID_Shutdown;
-	driv->Flush = EVID_Flush;
-	driv->ProcessEvent = EVID_ProcessEvent;
-	driv->Blit = NULL;
-	driv->LockBackBuffer = EVID_LockBackBuffer;
-	driv->SetFullScreen = EVID_SetFullScreen;
-	return (void *)driv;
-}
-static void EPOC_vout_del(void *ifce)
-{
-	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-	EPOCVideo *priv = (EPOCVideo *)driv->opaque;
-	gf_free(priv);
-	gf_free(driv);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-void *EPOC_aout_new();
-void EPOC_aout_del(void *ifce);
-
-void EPOC_codec_del(void *ifcg);
-void *EPOC_codec_new();
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_VIDEO_OUTPUT_INTERFACE,
-		GF_AUDIO_OUTPUT_INTERFACE,
-		GF_MEDIA_DECODER_INTERFACE,
-		0
-	};
-	return si;
-}
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) EPOC_vout_new();
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return (GF_BaseInterface *) EPOC_aout_new();
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *) EPOC_codec_new();
-	return NULL;
-}
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	GF_VideoOutput *dd = (GF_VideoOutput *)ifce;
-	switch (dd->InterfaceType) {
-	case GF_VIDEO_OUTPUT_INTERFACE:
-		EPOC_vout_del(dd);
-		break;
-	case GF_AUDIO_OUTPUT_INTERFACE:
-		EPOC_aout_del(ifce);
-		break;
-	case GF_MEDIA_DECODER_INTERFACE:
-		EPOC_codec_del(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( epoc_vout )
-
-#ifdef __cplusplus
-}
-#endif
-

gpac-0.8.0.tar.gz/modules/ffmpeg_in Deleted

gpac-0.8.0.tar.gz/modules/ffmpeg_in/Makefile Deleted

@@ -1,88 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/ffmpeg_in
-
-CFLAGS=-fPIC $(OPTFLAGS) -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LOCAL_LIB=
-
-LINKFLAGS=$(ffmpeg_lflags)
-
-ifeq ($(STATICBUILD),yes)
-##include static modules and other deps for libgpac
-include ../../static.mak
-LINKFLAGS+=-lgpac_static
-LINKFLAGS+=$(EXTRALIBS)
-else
-LINKFLAGS+=-lgpac
-endif
-
-#common obj
-OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o
-
-
-#darwin needs bz2
-ifeq ($(CONFIG_DARWIN),yes)
-LINKFLAGS+=-lbz2
-endif
-
-#old ffmpeg lib
-ifeq ($(CONFIG_FFMPEG_OLD), yes)
-CFLAGS+=-DFFMPEG_OLD_HEADERS -I/usr/include
-else
-LINKFLAGS+=-lswscale
-endif
-
-#local ffmpeg lib
-ifeq ($(CONFIG_FFMPEG), local)
-LOCAL_LIB=-L../../extra_lib/lib/gcc
-CFLAGS+= -I"$(LOCAL_INC_PATH)"
-endif
-
-ifeq ($(CONFIG_ZLIB), local)
-LOCAL_LIB=-L../../extra_lib/lib/gcc
-endif
-
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_ffmpeg_in$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols ffmpeg_in.def 
-endif
-
-#need to add cross-libraries if not local
-ifeq ($(CROSS_COMPILING),yes)
-LINKFLAGS+=-L$(prefix)/lib
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LDFLAGS) $(LINKFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/ffmpeg_in/ffmpeg_decode.c Deleted

@@ -1,1811 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / FFMPEG module
- *
- *  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 "ffmpeg_in.h"
-#include <gpac/avparse.h>
-#include <libavcodec/avcodec.h>
-
-
-#if ((LIBAVCODEC_VERSION_MAJOR == 55) && (LIBAVCODEC_VERSION_MINOR >= 38)) || (LIBAVCODEC_VERSION_MAJOR > 55)
-#define HAS_HEVC
-
-#include <libavutil/opt.h>
-#endif
-
-#if defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
-#define NO_10bit
-#endif
-
-//#define FFMPEG_DIRECT_DISPATCH
-
-#ifndef AV_INPUT_BUFFER_PADDING_SIZE
-#define AV_INPUT_BUFFER_PADDING_SIZE 0
-#endif
-
-/**
- * Allocates data for FFMPEG decoding
- * \param oldBuffer The oldBuffer (freed if not NULL)
- * \param size Size to allocate (will use extra padding for real size)
- * \return The newly allocated buffer
- */
-static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
-	uint8_t * buffer;
-	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
-	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
-	if (oldBuffer)
-		gf_free(oldBuffer);
-	buffer = (uint8_t*)gf_malloc( allocatedSz );
-	if (buffer)
-		memset( buffer, 0, allocatedSz);
-	return buffer;
-}
-
-
-static AVCodec *ffmpeg_get_codec(u32 codec_4cc)
-{
-	char name[5];
-	AVCodec *codec;
-	strcpy(name, gf_4cc_to_str(codec_4cc));
-
-    codec = avcodec_find_decoder(codec_4cc);
-    if (codec) return codec;
-
-	codec = avcodec_find_decoder_by_name(name);
-    if (codec) return codec;
-    strupr(name);
-    codec = avcodec_find_decoder_by_name(name);
-    if (codec) return codec;
-    strlwr(name);
-    codec = avcodec_find_decoder_by_name(name);
-    if (codec) return codec;
-	/*custom mapings*/
-    if (!stricmp(name, "s263")) codec = avcodec_find_decoder(CODEC_ID_H263);
-	else if (!stricmp(name, "mjp2")) {
-		codec = avcodec_find_decoder_by_name("jpeg2000");
-		if (!codec) codec = avcodec_find_decoder_by_name("libopenjpeg");
-	}
-    else if (!stricmp(name, "samr") || !stricmp(name, "amr ")) codec = avcodec_find_decoder(CODEC_ID_AMR_NB);
-    else if (!stricmp(name, "sawb")) codec = avcodec_find_decoder(CODEC_ID_AMR_WB);
-
-
-	return codec;
-}
-
-
-static void FFDEC_LoadDSI(FFDec *ffd, GF_BitStream *bs, AVCodec *codec, AVCodecContext *ctx, Bool from_ff_demux)
-{
-	u32 dsi_size;
-	if (!codec) return;
-
-	dsi_size = (u32) gf_bs_available(bs);
-	if (!dsi_size) return;
-
-	/*demuxer is ffmpeg, extra data can be copied directly*/
-	if (from_ff_demux) {
-		if (ctx->extradata)
-			gf_free(ctx->extradata);
-		ctx->extradata_size = dsi_size;
-		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-		gf_bs_read_data(bs, (char *) ctx->extradata, ctx->extradata_size);
-		return;
-	}
-
-	switch (codec->id) {
-	case CODEC_ID_SVQ3:
-	{
-		u32 at_type, size;
-		size = gf_bs_read_u32(bs);
-		/*there should be an 'SMI' entry*/
-		at_type = gf_bs_read_u32(bs);
-		if (at_type == GF_4CC('S', 'M', 'I', ' ')) {
-			if (ctx->extradata)
-				gf_free(ctx->extradata);
-			ctx->extradata_size = 0x5a + size;
-			ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-			strcpy((char *) ctx->extradata, "SVQ3");
-			gf_bs_read_data(bs, (char *)ctx->extradata + 0x5a, size);
-		}
-	}
-	break;
-	default:
-		if (ctx->extradata)
-			gf_free(ctx->extradata);
-		ctx->extradata_size = dsi_size;
-		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-		gf_bs_read_data(bs, (char *)ctx->extradata, ctx->extradata_size);
-		break;
-	}
-}
-
-static GF_Err FFDEC_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	u32 codec_id = 0;
-	int gotpic;
-	GF_BitStream *bs;
-	AVCodecContext **ctx;
-	AVCodec **codec;
-	AVFrame **frame;
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_M4VDecSpecInfo dsi;
-	GF_Err e;
-#endif
-	FFDec *ffd = (FFDec *)plug->privateStack;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	if (!ffd->oti) return GF_NOT_SUPPORTED;
-
-
-
-	/*locate any auxiliary video data descriptor on this stream*/
-	if (esd->dependsOnESID) {
-		u32 i = 0;
-		GF_Descriptor *d = NULL;
-		if (esd->dependsOnESID != ffd->base_ES_ID) return GF_NOT_SUPPORTED;
-		while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
-			if (d->tag == GF_ODF_AUX_VIDEO_DATA) break;
-		}
-		if (!d) return GF_NOT_SUPPORTED;
-
-		ffd->depth_ES_ID = esd->ESID;
-		ctx = &ffd->depth_ctx;
-		codec = &ffd->depth_codec;
-		frame = &ffd->depth_frame;
-	} else {
-		if (ffd->base_ES_ID) return GF_NOT_SUPPORTED;
-		ffd->base_ES_ID = esd->ESID;
-		ctx = &ffd->base_ctx;
-		codec = &ffd->base_codec;
-		frame = &ffd->base_frame;
-	}
-	if (!(*ctx)) {
-
-#ifdef USE_AVCTX3
-		*ctx = avcodec_alloc_context3(NULL);
-#else
-		*ctx = avcodec_alloc_context();
-#endif
-	}
-
-	/*private FFMPEG DSI*/
-	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		codec_id = gf_bs_read_u32(bs);
-		if (ffd->st==GF_STREAM_AUDIO) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
-			(*ctx)->sample_rate = gf_bs_read_u32(bs);
-			(*ctx)->channels = gf_bs_read_u16(bs);
-			(*ctx)->frame_size = gf_bs_read_u16(bs);
-			/*bits_per_sample */gf_bs_read_u8(bs);
-			/*num_frames_per_au*/ gf_bs_read_u8(bs);
-
-			/*ffmpeg specific*/
-			(*ctx)->block_align = gf_bs_read_u16(bs);
-			(*ctx)->bit_rate = gf_bs_read_u32(bs);
-			(*ctx)->codec_tag = gf_bs_read_u32(bs);
-		} else if (ffd->st==GF_STREAM_VISUAL) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
-			(*ctx)->width = gf_bs_read_u16(bs);
-			(*ctx)->height = gf_bs_read_u16(bs);
-			(*ctx)->bit_rate = gf_bs_read_u32(bs);
-			(*ctx)->codec_tag = gf_bs_read_u32(bs);
-			ffd->raw_pix_fmt = gf_bs_read_u32(bs);
-		}
-
-		*codec = avcodec_find_decoder(codec_id);
-		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_TRUE);
-		gf_bs_del(bs);
-	}
-	/*private QT DSI*/
-	else if (ffd->oti == GPAC_OTI_MEDIA_GENERIC) {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		codec_id = gf_bs_read_u32(bs);
-		if (ffd->st==GF_STREAM_AUDIO) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
-			(*ctx)->sample_rate = gf_bs_read_u32(bs);
-			(*ctx)->channels = gf_bs_read_u16(bs);
-			(*ctx)->frame_size = gf_bs_read_u16(bs);
-			/*bits_per_sample */ gf_bs_read_u8(bs);
-			/*num_frames_per_au*/ gf_bs_read_u8(bs);
-			/*just in case...*/
-			if (codec_id == GF_4CC('a', 'm', 'r', ' ')) {
-				(*ctx)->sample_rate = 8000;
-				(*ctx)->channels = 1;
-				(*ctx)->frame_size = 160;
-			}
-		} else if (ffd->st==GF_STREAM_VISUAL) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
-			(*ctx)->width = gf_bs_read_u16(bs);
-			(*ctx)->height = gf_bs_read_u16(bs);
-		}
-		(*codec) = ffmpeg_get_codec(codec_id);
-        codec_id = (*codec)->id;
-		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
-		gf_bs_del(bs);
-	}
-	/*use std MPEG-4 st/oti*/
-	else {
-		u32 codec_id = 0;
-		if (ffd->st==GF_STREAM_VISUAL) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
-			switch (ffd->oti) {
-			case GPAC_OTI_VIDEO_MPEG4_PART2:
-				codec_id = CODEC_ID_MPEG4;
-				break;
-			case GPAC_OTI_VIDEO_AVC:
-				codec_id = CODEC_ID_H264;
-				break;
-#ifdef HAS_HEVC
-			case GPAC_OTI_VIDEO_HEVC:
-				codec_id = AV_CODEC_ID_HEVC;
-				break;
-#endif
-			case GPAC_OTI_VIDEO_MPEG1:
-			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-			case GPAC_OTI_VIDEO_MPEG2_MAIN:
-			case GPAC_OTI_VIDEO_MPEG2_SNR:
-			case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-			case GPAC_OTI_VIDEO_MPEG2_HIGH:
-			case GPAC_OTI_VIDEO_MPEG2_422:
-				codec_id = CODEC_ID_MPEG2VIDEO;
-				break;
-			case GPAC_OTI_IMAGE_JPEG:
-				codec_id = CODEC_ID_MJPEG;
-				ffd->is_image = GF_TRUE;
-				break;
-			case GPAC_OTI_IMAGE_PNG:
-				codec_id = CODEC_ID_PNG;
-				ffd->is_image = GF_TRUE;
-				break;
-#ifdef CODEC_ID_VP9
-			case GPAC_OTI_VIDEO_VP9:
-				codec_id = CODEC_ID_VP9;
-				break;
-#endif
-#ifdef CODEC_ID_AV1
-			case GPAC_OTI_VIDEO_AV1:
-				codec_id = CODEC_ID_AV1;
-				break;
-#endif
-			case 0xFF:
-				codec_id = CODEC_ID_SVQ3;
-				break;
-			}
-		} else if (ffd->st==GF_STREAM_AUDIO) {
-			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
-			switch (ffd->oti) {
-			case GPAC_OTI_AUDIO_MPEG2_PART3:
-			case GPAC_OTI_AUDIO_MPEG1:
-				(*ctx)->frame_size = 1152;
-				codec_id = CODEC_ID_MP2;
-				break;
-			case GPAC_OTI_AUDIO_AC3:
-				codec_id = CODEC_ID_AC3;
-				break;
-			case GPAC_OTI_AUDIO_EAC3:
-				codec_id = CODEC_ID_EAC3;
-				break;
-            case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-            case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-            case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-            case GPAC_OTI_AUDIO_AAC_MPEG4:
-                codec_id = CODEC_ID_AAC;
-                break;
-#ifdef CODEC_ID_OPUS
-			case GPAC_OTI_MEDIA_OPUS:
-				codec_id = CODEC_ID_OPUS;
-				(*ctx)->frame_size = 2880;//use max frame size
-				break;
-#endif
-			}
-		}
-		else if ((ffd->st==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0)) {
-			codec_id = CODEC_ID_DVD_SUBTITLE;
-		}
-		*codec = avcodec_find_decoder(codec_id);
-
-        if (*codec) {
-        	switch (codec_id) {
-        	case CODEC_ID_AAC:
-#ifdef CODEC_ID_OPUS
-        	case CODEC_ID_OPUS:
-				bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-				FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
-				gf_bs_del(bs);
-#endif
-				break;
-
-			}
-		}
-
-	}
-	/*should never happen*/
-	if (! (*codec)) return GF_OUT_OF_MEM;
-
-	/*not sure this is the right way to do so, no doc in ffmpeg on this topic */
-#if 0
-	/*check HW accel*/
-	avcodec_get_context_defaults3(*ctx, *codec);
-	if (*codec) {
-		AVHWAccel *hwaccel=NULL;
-		while ((hwaccel = av_hwaccel_next(hwaccel))){
-			if (hwaccel->id == (*codec)->id) {
-				(*ctx)->hwaccel_context = hwaccel;
-				(*ctx)->pix_fmt = hwaccel->pix_fmt;
-				break;
-			}
-		}
-	}
-#endif
-
-	/*setup MPEG-4 video streams*/
-	if (ffd->st==GF_STREAM_VISUAL) {
-		/*for all MPEG-4 variants get size*/
-		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2)
-		 	|| (ffd->oti == GPAC_OTI_VIDEO_AVC)
-		 	|| (ffd->oti == GPAC_OTI_VIDEO_HEVC)
-		 	|| (ffd->oti == GPAC_OTI_VIDEO_AV1)
-		) {
-			/*if not set this may be a remap of non-mpeg4 transport (eg, transport on MPEG-TS) where
-			the DSI is carried in-band*/
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-
-				/*for regular MPEG-4, try to decode and if this fails try H263 decoder at first frame*/
-				if (ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-					e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-					if (e) return e;
-					if (dsi.width%2) dsi.width++;
-					if (dsi.height%2) dsi.height++;
-					(*ctx)->width = dsi.width;
-					(*ctx)->height = dsi.height;
-					if (!dsi.width && !dsi.height) ffd->check_short_header = GF_TRUE;
-					ffd->previous_par = (dsi.par_num<<16) | dsi.par_den;
-					ffd->no_par_update = GF_TRUE;
-#endif
-				} else if (ffd->oti==GPAC_OTI_VIDEO_AVC) {
-					ffd->check_h264_isma = GF_TRUE;
-				}
-
-				/*setup dsi for FFMPEG context BEFORE attaching decoder (otherwise not proper init)*/
-				(*ctx)->extradata = ffmpeg_realloc_buffer((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->dataLength + 8);
-				if ((*ctx)->extradata) {
-					memcpy((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-					(*ctx)->extradata_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				} else {
-					/* out of mem ? */
-					(*ctx)->extradata_size = 0;
-				}
-			}
-		}
-#if !defined(FF_API_AVFRAME_LAVC)
-		*frame = avcodec_alloc_frame();
-#else
-		*frame = av_frame_alloc();
-#endif
-
-	}
-#ifdef HAS_HEVC
-	if (ffd->oti == GPAC_OTI_VIDEO_HEVC) {
-		GF_SystemRTInfo rti;
-		u32 nb_threads, detected_nb_threads = 1;
-		const char *sOpt;
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "ThreadingType");
-		if (sOpt && !strcmp(sOpt, "wpp")) av_opt_set(*ctx, "thread_type", "slice", 0);
-		else if (sOpt && !strcmp(sOpt, "frame+wpp")) av_opt_set(*ctx, "thread_type", "frameslice", 0);
-		else {
-			av_opt_set(*ctx, "thread_type", "frame", 0);
-			if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "ThreadingType", "frame");
-		}
-		if (gf_sys_get_rti(0, &rti, 0) ) {
-			detected_nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
-		}
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "NumThreads");
-		if (!sOpt) {
-			char szO[100];
-			sprintf(szO, "%d", detected_nb_threads);
-			gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "NumThreads", szO);
-			nb_threads = detected_nb_threads;
-		} else {
-			nb_threads = atoi(sOpt);
-		}
-		if (nb_threads > detected_nb_threads) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVC@ffmpeg] Initializing with %d threads but only %d available cores detected on the system\n", nb_threads, rti.nb_cores));
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVC@ffmpeg] Initializing with %d threads\n", nb_threads));
-		}
-		fprintf(stderr, "[HEVC@ffmpeg] Initializing with %d threads\n", nb_threads);
-		av_opt_set_int(*ctx, "threads", nb_threads, 0);
-
-		/* Set the decoder id */
-		//av_opt_set_int(openHevcContext->c->priv_data, "decoder-id", i, 0);
-
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "CBUnits");
-		if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "CBUnits", "4");
-		if (sOpt) ffd->output_cb_size = atoi(sOpt);
-	}
-#endif //HAS_HEVC
-	if (!ffd->output_cb_size) ffd->output_cb_size = 4;
-
-	if (codec_id == CODEC_ID_RAWVIDEO) {
-		(*ctx)->codec_id = CODEC_ID_RAWVIDEO;
-		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
-		if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = GF_TRUE;
-	} else {
-#ifdef USE_AVCTX3
-		if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM;
-#else
-		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
-#endif
-	}
-
-	/*setup audio streams*/
-	if (ffd->st==GF_STREAM_AUDIO) {
-		if ((*codec)->id == CODEC_ID_MP2) {
-			(*ctx)->frame_size = ((*ctx)->sample_rate > 24000) ? 1152 : 576;
-		}
-		/*may be 0 (cfg not known yet)*/
-		ffd->out_size = (*ctx)->channels * (*ctx)->frame_size * 2 /*16 / 8*/;
-		if (!(*ctx)->sample_rate) (*ctx)->sample_rate = 44100;
-		if (!(*ctx)->channels) (*ctx)->channels = 2;
-
-#if defined(USE_AVCTX3)
-
-#if !defined(FF_API_AVFRAME_LAVC)
-		ffd->audio_frame = avcodec_alloc_frame();
-#else
-		ffd->audio_frame = av_frame_alloc();
-#endif
-
-#endif
-
-	} else {
-		switch ((*codec)->id) {
-		case CODEC_ID_MJPEG:
-		case CODEC_ID_MJPEGB:
-		case CODEC_ID_LJPEG:
-#if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(51, 20, 0))
-		case CODEC_ID_GIF:
-#endif
-		case CODEC_ID_PNG:
-		case CODEC_ID_RAWVIDEO:
-			if ((*ctx)->pix_fmt==PIX_FMT_YUV420P) {
-				ffd->pix_fmt = GF_PIXEL_YV12;
-			} else {
-				ffd->pix_fmt = GF_PIXEL_RGB_24;
-			}
-			break;
-
-		case CODEC_ID_DVD_SUBTITLE:
-#if !defined(FF_API_AVFRAME_LAVC)
-			*frame = avcodec_alloc_frame();
-#else
-			*frame = av_frame_alloc();
-#endif
-
-#ifdef USE_AVCODEC2
-			{
-				AVPacket pkt;
-				av_init_packet(&pkt);
-				pkt.data = (uint8_t *) esd->decoderConfig->decoderSpecificInfo->data;
-				pkt.size = esd->decoderConfig->decoderSpecificInfo->dataLength;
-				avcodec_decode_video2((*ctx), *frame, &gotpic, &pkt);
-			}
-#else
-			avcodec_decode_video((*ctx), *frame, &gotpic, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-#endif
-			ffd->pix_fmt = GF_PIXEL_YV12;
-			break;
-		default:
-			ffd->pix_fmt = GF_PIXEL_YV12;
-			break;
-		}
-
-		ffd->out_pix_fmt = ffd->pix_fmt;
-
-		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
-			ffd->stride = (*ctx)->width;
-			if (ffd->depth_codec) {
-				ffd->out_size = (*ctx)->width * (*ctx)->height * 5 / 2;
-				ffd->out_pix_fmt = GF_PIXEL_YUVD;
-				ffd->yuv_size = (*ctx)->width * (*ctx)->height * 3 / 2;
-			} else {
-				ffd->out_size = (*ctx)->width * (*ctx)->height * 3 / 2;
-			}
-		} else {
-			ffd->out_size = (*ctx)->width * (*ctx)->height * 3;
-		}
-	}
-
-	return GF_OK;
-}
-
-static GF_Err FFDEC_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	AVCodecContext **ctx;
-	AVCodec **codec;
-#ifdef FFMPEG_SWSCALE
-	struct SwsContext **sws;
-#endif
-	FFDec *ffd = (FFDec *)plug->privateStack;
-
-	if (ffd->base_ES_ID==ES_ID) {
-		ffd->base_ES_ID = 0;
-		codec = &ffd->base_codec;
-		ctx = &ffd->base_ctx;
-#ifdef FFMPEG_SWSCALE
-		sws = &ffd->base_sws;
-#endif
-	} else if (ffd->depth_ES_ID==ES_ID) {
-		ffd->depth_ES_ID = 0;
-		codec = &ffd->depth_codec;
-		ctx = &ffd->depth_ctx;
-#ifdef FFMPEG_SWSCALE
-		sws = &ffd->depth_sws;
-#endif
-	} else {
-		return GF_OK;
-	}
-
-	if (*ctx) {
-		if ((*ctx)->extradata) gf_free((*ctx)->extradata);
-		(*ctx)->extradata = NULL;
-		if ((*ctx)->codec) avcodec_close((*ctx));
-		*ctx = NULL;
-	}
-	*codec = NULL;
-
-#if defined(USE_AVCTX3)
-	if (ffd->audio_frame) {
-		av_free(ffd->audio_frame);
-	}
-	if (ffd->base_frame) {
-		av_free(ffd->base_frame);
-	}
-	if (ffd->depth_frame) {
-		av_free(ffd->depth_frame);
-	}
-#endif
-
-#ifdef FFMPEG_SWSCALE
-	if (*sws) {
-		sws_freeContext(*sws);
-		*sws = NULL;
-	}
-#endif
-
-	return GF_OK;
-}
-
-static GF_Err FFDEC_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *capability)
-{
-	FFDec *ffd = (FFDec *)plug->privateStack;
-
-	/*base caps*/
-	switch (capability->CapCode) {
-	/*ffmpeg seems quite reliable*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		return GF_OK;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
-		return GF_OK;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		return GF_OK;
-	case GF_CODEC_RAW_MEMORY:
-		capability->cap.valueBool = GF_TRUE;
-		return GF_OK;
-	case GF_CODEC_FRAME_OUTPUT:
-#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
-		//deactivated by default until we have more tests (stride, color formats)
-		capability->cap.valueBool = GF_FALSE;
-#endif
-		return GF_OK;
-	case GF_CODEC_WANTS_THREAD:
-		capability->cap.valueBool= GF_TRUE;
-		break;
-	}
-
-	if (!ffd->base_ctx) {
-		capability->cap.valueInt = 0;
-		return GF_OK;
-	}
-
-	/*caps valid only if stream attached*/
-	switch (capability->CapCode) {
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ffd->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ffd->base_ctx->sample_rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ffd->base_ctx->channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 4 : 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		/*for audio let the systems engine decide since we may have very large block size (1 sec with some QT movies)*/
-		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 0 : (ffd->is_image ? 1 : ffd->output_cb_size);
-		break;
-	/*by default AAC access unit lasts num_samples (timescale being sampleRate)*/
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt =  (ffd->st==GF_STREAM_AUDIO) ? ffd->base_ctx->frame_size : 0;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ffd->base_ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ffd->base_ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24)
-			capability->cap.valueInt = ffd->stride*3;
-		else if (ffd->out_pix_fmt==GF_PIXEL_RGBA)
-			capability->cap.valueInt = ffd->stride*4;
-		else
-			capability->cap.valueInt = ffd->stride;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 30.0f;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ffd->previous_par;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		if (ffd->base_ctx->width) capability->cap.valueInt = ffd->out_pix_fmt;
-		break;
-	/*ffmpeg performs frame reordering internally*/
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_TRUSTED_CTS:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WAIT_RAP:
-		//ffd->ctx->hurry_up = 5;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		/*currently unused in ffmpeg*/
-		if (ffd->base_ctx->channels==1) {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-		} else {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-		}
-		break;
-
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err FFDEC_SetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability capability)
-{
-	FFDec *ffd = (FFDec *)plug->privateStack;
-	assert(plug);
-	assert( ffd );
-	switch (capability.CapCode) {
-	case GF_CODEC_WAIT_RAP:
-		ffd->frame_start = 0;
-		if (ffd->st==GF_STREAM_VISUAL) {
-			if (ffd->base_ctx && ffd->base_ctx->codec) avcodec_flush_buffers(ffd->base_ctx);
-			if (ffd->depth_ctx && ffd->depth_ctx->codec) avcodec_flush_buffers(ffd->depth_ctx);
-		}
-		return GF_OK;
-	case GF_CODEC_RAW_MEMORY:
-		ffd->direct_output_mode = capability.cap.valueBool ? 1 : 0;
-		return GF_OK;
-	case GF_CODEC_FRAME_OUTPUT:
-		ffd->direct_output_mode = capability.cap.valueInt ? 2 : 0;
-		return GF_OK;
-	default:
-		/*return unsupported to avoid confusion by the player (like color space changing ...) */
-		return GF_NOT_SUPPORTED;
-	}
-}
-static GF_Err FFDEC_GetOutputPixelFromat (u32 pix_fmt, u32 * out_pix_fmt, FFDec *ffd)
-{
-
-	if (!out_pix_fmt || !ffd) return GF_BAD_PARAM;
-
-	switch (pix_fmt) {
-		case PIX_FMT_YUV420P:
-			*out_pix_fmt = GF_PIXEL_YV12;
-			break;
-		case PIX_FMT_YUV420P10LE:
-			*out_pix_fmt = GF_PIXEL_YV12_10;
-			break;
-		case PIX_FMT_YUV422P:
-			*out_pix_fmt = GF_PIXEL_YUV422;
-			break;
-		case PIX_FMT_YUV422P10LE:
-			*out_pix_fmt = GF_PIXEL_YUV422_10;
-			break;
-		case PIX_FMT_YUV444P:
-			*out_pix_fmt = GF_PIXEL_YUV444;
-			break;
-		case PIX_FMT_YUV444P10LE:
-			*out_pix_fmt = GF_PIXEL_YUV444_10;
-			break;
-		case PIX_FMT_RGBA:
-			*out_pix_fmt = GF_PIXEL_RGBA;
-			break;
-		case PIX_FMT_RGB24:
-			*out_pix_fmt = GF_PIXEL_RGB_24;
-			break;
-		case PIX_FMT_BGR24:
-			*out_pix_fmt = GF_PIXEL_BGR_24;
-			break;
-
-		default:
-			return GF_NOT_SUPPORTED;
-
-		}
-		return GF_OK;
-
-}
-
-
-static GF_Err FFDEC_ProcessAudio(FFDec *ffd,
-                                char *inBuffer, u32 inBufferLength,
-                                u16 ES_ID, u32 *CTS,
-                                char *outBuffer, u32 *outBufferLength,
-                                u8 PaddingBits, u32 mmlevel)
-{
-
-#ifdef USE_AVCODEC2
-	AVPacket pkt;
-#endif
-	s32 gotpic;
-	AVCodecContext *ctx = ffd->base_ctx;
-	s32 len;
-	u32 buf_size = (*outBufferLength);
-
-#ifdef USE_AVCODEC2
-	av_init_packet(&pkt);
-	pkt.data = (uint8_t *)inBuffer;
-	pkt.size = inBufferLength;
-#endif
-
-	(*outBufferLength) = 0;
-
-	/*seeking don't decode*/
-	if (!inBuffer || (mmlevel == GF_CODEC_LEVEL_SEEK)) {
-		*outBufferLength = 0;
-		ffd->frame_start = 0;
-		return GF_OK;
-	}
-	if (ffd->frame_start>inBufferLength) ffd->frame_start = 0;
-	//seek to last byte consumed by the previous decode4()
-	else if (ffd->frame_start) {
-		pkt.data += ffd->frame_start;
-		pkt.size -= ffd->frame_start;
-	}
-redecode:
-
-#if defined(USE_AVCTX3)
-	len = avcodec_decode_audio4(ctx, ffd->audio_frame, &gotpic, &pkt);
-	if (gotpic) {
-		//int inputDataSize = av_samples_get_buffer_size(NULL, ctx->channels, ffd->audio_frame->nb_samples, ctx->sample_fmt, 1);
-		gotpic = ffd->audio_frame->nb_samples * 2 * ctx->channels;
-	}
-#elif defined(USE_AVCODEC2)
-	gotpic = 192000;
-	len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt);
-#else
-	gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-	len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start);
-#endif
-	if (len<0) {
-		ffd->frame_start = 0;
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	if (gotpic<0) {
-		ffd->frame_start = 0;
-		return GF_OK;
-	}
-
-	/*first config*/
-	if (!ffd->out_size) {
-		u32 bpp = 2;
-
-		if (ctx->channels * ctx->frame_size * bpp < gotpic) ctx->frame_size = gotpic / (bpp * ctx->channels);
-		ffd->out_size = ctx->channels * ctx->frame_size * bpp;
-	}
-	if (ffd->out_size < (u32) gotpic) {
-		/*looks like relying on frame_size is not a good idea for all codecs, so we use gotpic*/
-		(*outBufferLength) = ffd->out_size = gotpic;
-		return GF_BUFFER_TOO_SMALL;
-	}
-	if (ffd->out_size > buf_size) {
-		/*don't use too small output chunks otherwise we'll never have enough when mixing - we could
-			also request more slots in the composition memory but let's not waste mem*/
-		if (ffd->out_size < (u32) 576*ctx->channels) ffd->out_size=ctx->channels*576;
-		(*outBufferLength) = ffd->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-#if defined(USE_AVCTX3)
-	if (ffd->audio_frame->format==AV_SAMPLE_FMT_FLTP) {
-		s32 i, j;
-		s16 *output = (s16 *) outBuffer;
-		for (j=0; j<ctx->channels; j++) {
-			Float* inputChannel = (Float*)ffd->audio_frame->extended_data[j];
-			for (i=0 ; i<ffd->audio_frame->nb_samples ; i++) {
-				Float sample = inputChannel[i];
-				if (sample<-1.0f) sample=-1.0f;
-				else if (sample>1.0f) sample=1.0f;
-
-				output[i*ctx->channels + j] = (int16_t) (sample * GF_SHORT_MAX );
-			}
-		}
-	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16P) {
-		s32 i, j;
-		s16 *output = (s16 *) outBuffer;
-		for (j=0; j<ctx->channels; j++) {
-			s16* inputChannel = (s16*)ffd->audio_frame->extended_data[j];
-			for (i=0 ; i<ffd->audio_frame->nb_samples ; i++) {
-				Float sample = inputChannel[i];
-				output[i*ctx->channels + j] = (int16_t) (sample );
-			}
-		}
-	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_U8) {
-		u32 i, size = ffd->audio_frame->nb_samples * ctx->channels;
-		s16 *output = (s16 *) outBuffer;
-		s8 *input = (s8 *) ffd->audio_frame->data[0];
-		for (i=0; i<size; i++) {
-			output [i] = input[i] * 128;
-		}
-	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S32) {
-		u32 i, shift, size = ffd->audio_frame->nb_samples * ctx->channels;
-		s16 *output = (s16 *) outBuffer;
-		s32 *input = (s32*) ffd->audio_frame->data[0];
-		shift = 1<<31;
-		for (i=0; i<size; i++) {
-			output [i] = input[i] * shift;
-		}
-	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_FLT) {
-		u32 i, size = ffd->audio_frame->nb_samples * ctx->channels;
-		s16 *output = (s16 *) outBuffer;
-		Float *input = (Float *) ffd->audio_frame->data[0];
-		for (i=0; i<size; i++) {
-			Float sample = input[i];
-			if (sample<-1.0f) sample=-1.0f;
-			else if (sample>1.0f) sample=1.0f;
-			output [i] = (int16_t) (sample * GF_SHORT_MAX);
-		}
-	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16) {
-		memcpy(outBuffer, ffd->audio_frame->data[0], sizeof(char) * ffd->audio_frame->nb_samples * ctx->channels*2);
-	} else if (ffd->audio_frame->nb_samples) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFMPEG Decoder] Raw Audio format %d not supported\n", ffd->audio_frame->format ));
-	}
-#else
-	/*we're sure to have at least gotpic bytes available in output*/
-	memcpy(outBuffer, ffd->audio_buf, sizeof(char) * gotpic);
-#endif
-
-	(*outBufferLength) += gotpic;
-	outBuffer += gotpic;
-
-#if defined(USE_AVCTX3)
-	ffd->audio_frame->nb_samples = 0;
-#endif
-
-	ffd->frame_start += len;
-	if (inBufferLength <= ffd->frame_start) {
-		ffd->frame_start = 0;
-		return GF_OK;
-	}
-	/*still space go on*/
-	if ((*outBufferLength)+ctx->frame_size<ffd->out_size) goto redecode;
-
-	/*more frames in the current sample*/
-	return GF_PACKED_FRAMES;
-}
-
-//TODO check why we need this one ...
-static GF_Err FFDEC_ProcessRawVideo(FFDec *ffd,
-                                char *inBuffer, u32 inBufferLength,
-                                u16 ES_ID, u32 *CTS,
-                                char *outBuffer, u32 *outBufferLength,
-                                u8 PaddingBits, u32 mmlevel)
-{
-	AVCodecContext *ctx = ffd->base_ctx;
-
-	if (*outBufferLength != ffd->out_size) {
-		*outBufferLength = ffd->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-	if (inBufferLength) {
-		*outBufferLength = ffd->out_size;
-//		assert(inBufferLength==ffd->out_size);
-
-		if (ffd->raw_pix_fmt==PIX_FMT_BGR24) {
-			s32 i, j;
-			for (j=0; j<ctx->height; j++) {
-				u8 *src = (u8 *) inBuffer + j*3*ctx->width;
-				u8 *dst = (u8 *)outBuffer + j*3*ctx->width;
-				if (ffd->flipped) {
-					dst = (u8 *)outBuffer + (ctx->height-j-1) * 3*ctx->width;
-				}
-				for (i=0; i<ctx->width; i++) {
-					dst[0] = src[2];
-					dst[1] = src[1];
-					dst[2] = src[2];
-					src += 3;
-					dst += 3;
-				}
-			}
-		} else {
-			memcpy(outBuffer, inBuffer, ffd->out_size);
-		}
-	} else {
-		*outBufferLength = 0;
-	}
-	return GF_OK;
-}
-
-
-
-static GF_Err FFDEC_ProcessVideo(FFDec *ffd,
-                                char *inBuffer, u32 inBufferLength,
-                                u16 ES_ID, u32 *CTS,
-                                char *outBuffer, u32 *outBufferLength,
-                                u8 PaddingBits, u32 mmlevel)
-{
-#ifdef USE_AVCODEC2
-	AVPacket pkt;
-#endif
-	AVPicture pict;
-	u32 pix_out=0;
-	s32 w, h, gotpic, stride, ret;
-	u32 outsize=0, out_pix_fmt;
-	AVCodecContext *ctx;
-	AVCodec **codec;
-	AVFrame *frame;
-#ifdef FFMPEG_SWSCALE
-	struct SwsContext **cached_sws = &(ffd->base_sws);
-#endif
-
-	if (!ES_ID || (ffd->base_ES_ID==ES_ID)) {
-		ctx = ffd->base_ctx;
-		codec = &ffd->base_codec;
-		frame = ffd->base_frame;
-	} else if (ffd->depth_ES_ID==ES_ID) {
-		ctx = ffd->depth_ctx;
-		codec = &ffd->depth_codec;
-		frame = ffd->depth_frame;
-	} else {
-		return GF_BAD_PARAM;
-	}
-
-	/*WARNING: this breaks H264 (and maybe others) decoding, disabled for now*/
-#if 0
-	if (!ctx->hurry_up) {
-		switch (mmlevel) {
-		case GF_CODEC_LEVEL_SEEK:
-		case GF_CODEC_LEVEL_DROP:
-			/*skip as much as possible*/
-			ctx->hurry_up = 5;
-			break;
-		case GF_CODEC_LEVEL_VERY_LATE:
-		case GF_CODEC_LEVEL_LATE:
-			/*skip B-frames*/
-			ctx->hurry_up = 1;
-			break;
-		default:
-			ctx->hurry_up = 0;
-			break;
-		}
-	}
-#endif
-
-#ifdef USE_AVCODEC2
-	av_init_packet(&pkt);
-	pkt.data = (uint8_t *)inBuffer;
-	pkt.size = inBufferLength;
-	pkt.dts=0;
-	pkt.pts = *CTS;
-#endif
-
-	*outBufferLength = 0;
-	/*visual stream*/
-	w = ctx->width;
-	h = ctx->height;
-
-	/*we have a valid frame not yet dispatched*/
-	if (ffd->had_pic) {
-		ffd->had_pic = GF_FALSE;
-		gotpic = ffd->needs_output_resize ? 0 : 1;
-		ffd->needs_output_resize = 0;
-	} else {
-		if (ffd->check_h264_isma) {
-			/*for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
-			doesn't put back nalu size, do it ourselves...*/
-			if (inBuffer && !inBuffer[0] && !inBuffer[1] && !inBuffer[2] && (inBuffer[3]==0x01)) {
-				u32 nalu_size;
-				char *start, *end, *bufferEnd;
-
-				start = inBuffer;
-				end = inBuffer + 4;
-				bufferEnd = inBuffer + inBufferLength;
-				/* FIXME : SOUCHAY : not sure of exact behaviour, but old one was reading non-allocated memory */
-				while ((end+3) < bufferEnd) {
-					if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
-						nalu_size = (u32) (end - start - 4);
-						start[0] = (nalu_size>>24)&0xFF;
-						start[1] = (nalu_size>>16)&0xFF;
-						start[2] = (nalu_size>>8)&0xFF;
-						start[3] = (nalu_size)&0xFF;
-						start = end;
-						end = start+4;
-						continue;
-					}
-					end++;
-				}
-				nalu_size = (u32) ((inBuffer+inBufferLength) - start - 4);
-				start[0] = (nalu_size>>24)&0xFF;
-				start[1] = (nalu_size>>16)&0xFF;
-				start[2] = (nalu_size>>8)&0xFF;
-				start[3] = (nalu_size)&0xFF;
-				ffd->check_h264_isma = 2;
-			}
-			/*if we had ISMA E&A and lost it this is likely due to a pck loss - do NOT switch back to regular*/
-			else if (ffd->check_h264_isma == 1) {
-				ffd->check_h264_isma = GF_FALSE;
-			}
-		}
-
-#ifdef USE_AVCODEC2
-		if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
-#else
-		if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
-#endif
-			if (!ffd->check_short_header) {
-				return GF_NON_COMPLIANT_BITSTREAM;
-			}
-
-			/*switch to H263 (ffmpeg MPEG-4 codec doesn't understand short headers)*/
-			{
-				u32 old_codec = (*codec)->id;
-				ffd->check_short_header = GF_FALSE;
-				/*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
-				here this means the DSI was broken, so no big deal*/
-				avcodec_close(ctx);
-				*codec = avcodec_find_decoder(CODEC_ID_H263);
-
-#ifdef USE_AVCTX3
-				if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM;
-#else
-				if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
-#endif
-
-#if USE_AVCODEC2
-				if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
-#else
-				if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
-#endif
-					/*nope, stay in MPEG-4*/
-					avcodec_close(ctx);
-					*codec = avcodec_find_decoder(old_codec);
-					assert(*codec);
-#ifdef USE_AVCTX3
-					avcodec_open2(ctx, *codec, NULL);
-#else
-					avcodec_open(ctx, *codec);
-#endif
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
-			}
-		}
-
-		/*
-			if (!gotpic && (!ctx->width || !ctx->height) ) {
-				ctx->width = w;
-				ctx->height = h;
-				return GF_OK;
-			}
-		*/
-		/*some streams use odd width/height frame values*/
-		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
-			if (ctx->width%2) ctx->width++;
-			if (ctx->height%2) ctx->height++;
-		}
-	}
-
-	/*we have a picture and need resize, do it*/
-	if (gotpic && ffd->needs_output_resize) {
-		ffd->needs_output_resize = GF_FALSE;
-		ffd->had_pic = GF_TRUE;
-		*outBufferLength = ffd->out_size;
-		if (ffd->direct_output_mode) {
-			ffd->frame_size_changed = GF_TRUE;
-		} else {
-			return GF_BUFFER_TOO_SMALL;
-		}
-	}
-
-	stride = frame->linesize[0];
-
-	ret = FFDEC_GetOutputPixelFromat(ctx->pix_fmt, &out_pix_fmt, ffd);
-	if ( ret < 0)
-	{
-		return ret;
-	}
-
-	/*recompute outsize in case on-the-fly change*/
-	if ((w != ctx->width) || (h != ctx->height)
-		|| (ffd->direct_output_mode && (stride != ffd->stride))
-		|| (ffd->out_pix_fmt != out_pix_fmt)
-		//need to realloc the conversion buffer
-
-	   ) {
-
-		ffd->stride = (ffd->direct_output_mode) ? frame->linesize[0] : ctx->width;
-		if (ctx->pix_fmt  == PIX_FMT_RGBA) {
-			ffd->out_pix_fmt = ffd->pix_fmt = GF_PIXEL_RGBA;
-			outsize = ctx->width * ctx->height * 4;
-		}
-		else if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
-			outsize = ctx->width * ctx->height * 3;
-		}
-		else if (ctx->pix_fmt == PIX_FMT_YUV420P)
-		{
-			outsize = ffd->stride * ctx->height * 3 /2 ;
-			ffd->out_pix_fmt = GF_PIXEL_YV12;
-
-		}
-
-		else if (ctx->pix_fmt == PIX_FMT_YUV422P)
-		{
-			outsize = ffd->stride * ctx->height * 2 ;
-			ffd->out_pix_fmt = GF_PIXEL_YUV422;
-
-		}
-		else if (ctx->pix_fmt == PIX_FMT_YUV444P)
-		{
-			outsize = ffd->stride * ctx->height * 3 ;
-			ffd->out_pix_fmt = GF_PIXEL_YUV444;
-		}
-#ifndef NO_10bit
-		//this YUV format is handled natively in GPAC
-		else if (ctx->pix_fmt == PIX_FMT_YUV420P10LE) {
-			ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
-			ffd->out_pix_fmt = GF_PIXEL_YV12_10;
-			outsize = 3*ffd->stride * ctx->height / 2;
-		}
-		else if (ctx->pix_fmt == PIX_FMT_YUV422P10LE) {
-			ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
-			ffd->out_pix_fmt = GF_PIXEL_YUV422_10;
-			outsize = ffd->stride * ctx->height * 2;
-		}
-		else if (ctx->pix_fmt == PIX_FMT_YUV444P10LE) {
-				ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
-				ffd->out_pix_fmt = GF_PIXEL_YUV444_10;
-				 outsize = ffd->stride * ctx->height * 3;
-		}
-#endif
-
-
-
-		if (ffd->depth_codec) {
-			outsize = 5 * ctx->width * ctx->height / 2;
-			ffd->yuv_size = 3 * ctx->width * ctx->height / 2;
-		}
-		ffd->out_size = outsize;
-
-		if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
-			ffd->previous_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
-		}
-
-		/*we didn't get any picture: wait for a picture before resizing output buffer, otherwise we will have no
-		video in the output buffer*/
-		if (!gotpic) {
-			ffd->needs_output_resize = GF_TRUE;
-//			return GF_OK;
-		}
-		*outBufferLength = ffd->out_size;
-		if (ffd->check_h264_isma) {
-			inBuffer[0] = inBuffer[1] = inBuffer[2] = 0;
-			inBuffer[3] = 1;
-		}
-#ifdef FFMPEG_SWSCALE
-		if (*cached_sws) {
-			sws_freeContext(*cached_sws);
-			*cached_sws = NULL;
-		}
-#endif
-		ffd->had_pic = GF_TRUE;
-
-		if (ffd->direct_output_mode) {
-			ffd->frame_size_changed = GF_TRUE;
-
-		} else {
-			return GF_BUFFER_TOO_SMALL;
-		}
-	}
-	/*check PAR in case on-the-fly change*/
-	if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
-		u32 new_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
-		if (ffd->previous_par && (new_par != ffd->previous_par)) {
-			ffd->previous_par = new_par;
-
-			if (!gotpic) {
-				ffd->needs_output_resize = GF_TRUE;
-				return GF_OK;
-			}
-			*outBufferLength = ffd->out_size;
-			ffd->had_pic = GF_TRUE;
-			if (ffd->direct_output_mode) {
-				ffd->frame_size_changed = GF_TRUE;
-			} else {
-				return GF_BUFFER_TOO_SMALL;
-			}
-		}
-	}
-
-//	if (mmlevel	== GF_CODEC_LEVEL_SEEK) return GF_OK;
-
-	if (!gotpic) return GF_OK;
-
-#if (LIBAVCODEC_VERSION_MAJOR>52)
-	//fixme - investigate this, happens in some dash cases
-	if ((frame->width!=ctx->width) || (frame->height!=ctx->height))  {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-#endif
-
-	//copy over CTS of packet passed in decode()
-	*CTS = (u32) frame->pkt_pts;
-
-	if (ffd->direct_output_mode) {
-		*outBufferLength = ffd->out_size;
-		return GF_OK;
-	}
-
-	if (ES_ID && (ES_ID == ffd->depth_ES_ID)) {
-		s32 i;
-		u8 *pYO, *pYD;
-
-		pYO = frame->data[0];
-		pYD = (u8 *) outBuffer+ffd->yuv_size;
-		for (i=0; i<ctx->height; i++) {
-			memcpy(pYD, pYO, sizeof(char) * ctx->width);
-			pYD += ctx->width;
-			pYO += frame->linesize[0];
-		}
-		*outBufferLength = ffd->out_size;
-		return GF_OK;
-	}
-
-#if defined(_WIN32_WCE) || defined(__SYMBIAN32__)
-	if (ffd->pix_fmt==GF_PIXEL_RGB_24) {
-		memcpy(outBuffer, frame->data[0], sizeof(char)*3*ctx->width);
-	} else if (ffd->pix_fmt==GF_PIXEL_RGBA) {
-		memcpy(outBuffer, frame->data[0], sizeof(char)*4*ctx->width);
-	} else {
-		s32 i;
-		char *pYO, *pUO, *pVO;
-		unsigned char *pYD, *pUD, *pVD;
-		pYO = frame->data[0];
-		pUO = frame->data[1];
-		pVO = frame->data[2];
-		pYD = outBuffer;
-		pUD = outBuffer + ctx->width * ctx->height;
-		pVD = outBuffer + 5 * ctx->width * ctx->height / 4;
-
-
-		for (i=0; i<ctx->height; i++) {
-			memcpy(pYD, pYO, sizeof(char) * ctx->width);
-			pYD += ctx->width;
-			pYO += frame->linesize[0];
-			if (i%2) continue;
-
-			memcpy(pUD, pUO, sizeof(char) * ctx->width/2);
-			memcpy(pVD, pVO, sizeof(char) * ctx->width/2);
-			pUD += ctx->width/2;
-			pVD += ctx->width/2;
-			pUO += frame->linesize[1];
-			pVO += frame->linesize[2];
-		}
-		*outBufferLength = ffd->out_size;
-	}
-#else
-
-	memset(&pict, 0, sizeof(pict));
-	if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) {
-		pict.data[0] =  (uint8_t *)outBuffer;
-		pict.linesize[0] = 3*ctx->width;
-		pix_out = PIX_FMT_RGB24;
-	} else if (ffd->out_pix_fmt==GF_PIXEL_RGBA) {
-		pict.data[0] =  (uint8_t *)outBuffer;
-		pict.linesize[0] = 4*ctx->width;
-		pix_out = PIX_FMT_RGBA;
-	} else {
-		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
-		pict.data[0] =  (uint8_t *)outBuffer;
-		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-		pict.data[2] =  (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4;
-		pict.linesize[0] = ffd->stride;
-		pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
-		pix_out = PIX_FMT_YUV420P;
-		} else if (ffd->out_pix_fmt == GF_PIXEL_YUV422) {
-		pict.data[0] =  (uint8_t *)outBuffer;
-		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-		pict.data[2] =  (uint8_t *)outBuffer + 3*ffd->stride * ctx->height/2;
-		pict.linesize[0] = ffd->stride;
-		pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
-		pix_out = PIX_FMT_YUV422P;
-	    } else if (ffd->out_pix_fmt == GF_PIXEL_YUV444) {
-		pict.data[0] =  (uint8_t *)outBuffer;
-		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-		pict.data[2] =  (uint8_t *)outBuffer + 2*ffd->stride * ctx->height;
-		pict.linesize[0] = pict.linesize[1] = pict.linesize[2] = ffd->stride;
-		pix_out = PIX_FMT_YUV444P;
-	    }
-#ifndef NO_10bit
-		//this YUV format is handled natively in GPAC
-		if (ctx->pix_fmt==PIX_FMT_YUV420P10LE) {
-			pict.data[0] =  (uint8_t *)outBuffer;
-			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-			pict.data[2] =  (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4;
-			pict.linesize[0] = ffd->stride;
-			pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
-			pix_out = PIX_FMT_YUV420P10LE;
-		} else if (ctx->pix_fmt==PIX_FMT_YUV422P10LE) {
-			pict.data[0] =  (uint8_t *)outBuffer;
-			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-			pict.data[2] =  (uint8_t *)outBuffer + 3*ffd->stride * ctx->height/2;
-			pict.linesize[0] = ffd->stride;
-			pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
-			pix_out = PIX_FMT_YUV422P10LE;
-		} else if (ctx->pix_fmt==PIX_FMT_YUV444P10LE) {
-			pict.data[0] =  (uint8_t *)outBuffer;
-			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
-			pict.data[2] =  (uint8_t *)outBuffer + 2*ffd->stride * ctx->height;
-			pict.linesize[0] = pict.linesize[1] = pict.linesize[2] = ffd->stride;
-			pix_out = PIX_FMT_YUV444P10LE;
-		}
-#endif
-
-#if (LIBAVCODEC_VERSION_MAJOR<56)
-		if (!mmlevel && frame->interlaced_frame) {
-			avpicture_deinterlace((AVPicture *) frame, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
-		}
-#endif
-
-	}
-	pict.data[3] = 0;
-	pict.linesize[3] = 0;
-	*CTS = (u32) frame->pkt_pts;
-
-#ifndef FFMPEG_SWSCALE
-	img_convert(&pict, pix_out, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
-#else
-	*cached_sws = sws_getCachedContext(*cached_sws,
-	                                   ctx->width, ctx->height, ctx->pix_fmt,
-	                                   ctx->width, ctx->height, pix_out,
-	                                   SWS_BICUBIC, NULL, NULL, NULL);
-	if ((*cached_sws)) {
-#if LIBSWSCALE_VERSION_INT < AV_VERSION_INT(0, 9, 0)
-		sws_scale((*cached_sws), frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
-#else
-		sws_scale((*cached_sws), (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
-#endif
-
-	}
-#endif
-
-	*outBufferLength = ffd->out_size;
-#endif
-
-	return GF_OK;
-}
-
-
-
-static GF_Err FFDEC_ProcessData(GF_MediaDecoder *plug,
-                                char *inBuffer, u32 inBufferLength,
-                                u16 ES_ID, u32 *CTS,
-                                char *outBuffer, u32 *outBufferLength,
-                                u8 PaddingBits, u32 mmlevel)
-{
-	FFDec *ffd = (FFDec*)plug->privateStack;
-
-	if (ffd->st==GF_STREAM_AUDIO) {
-		return FFDEC_ProcessAudio(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
-	} else if ( ffd->base_ctx->codec_id == CODEC_ID_RAWVIDEO) {
-		return FFDEC_ProcessRawVideo(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
-	} else {
-		return FFDEC_ProcessVideo(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
-	}
-}
-
-
-static GF_Err FFDEC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
-{
-	FFDec *ffd = (FFDec*)ifcg->privateStack;
-	AVFrame *frame;
-
-	if (ffd->direct_output_mode != 1) return GF_BAD_PARAM;
-
-	if (ES_ID && (ffd->depth_ES_ID==ES_ID)) {
-		frame = ffd->depth_frame;
-		*pY_or_RGB = frame->data[0];
-	} else {
-		frame = ffd->base_frame;
-		*pY_or_RGB = frame->data[0];
-		*pU = frame->data[1];
-		*pV = frame->data[2];
-	}
-	return GF_OK;
-}
-
-#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
-
-typedef struct
-{
-	FFDec *ctx;
-	AVFrame *frame;
-} FF_Frame;
-
-void FFFrame_Release(GF_MediaDecoderFrame *frame)
-{
-	FF_Frame *ff_frame = (FF_Frame *)frame->user_data;
-
-	av_frame_free(&ff_frame->frame);
-}
-
-GF_Err FFFrame_GetPlane(GF_MediaDecoderFrame *frame, u32 plane_idx, const char **outPlane, u32 *outStride)
-{
-	FF_Frame *ff_frame = (FF_Frame *)frame->user_data;
-	switch (ff_frame->ctx->out_pix_fmt) {
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_YV12_10:
-	case GF_PIXEL_YUV422:
-	case GF_PIXEL_YUV422_10:
-	case GF_PIXEL_YUV444:
-	case GF_PIXEL_YUV444_10:
-		if (plane_idx>2) return GF_BAD_PARAM;
-		*outPlane = (const char *) ff_frame->frame->data[plane_idx];
-		*outStride = ff_frame->frame->linesize[plane_idx];
-		break;
-	case GF_PIXEL_RGBA:
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_BGR_24:
-		if (plane_idx>0) return GF_BAD_PARAM;
-		*outPlane = (const char *) ff_frame->frame->data[plane_idx];
-		*outStride = ff_frame->frame->linesize[plane_idx];
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-
-static GF_Err FFDEC_GetOutputFrame(GF_MediaDecoder *ifcg, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
-{
-	GF_MediaDecoderFrame *a_frame;
-	FF_Frame *ff_frame;
-	FFDec *ffd = (FFDec*)ifcg->privateStack;
-
-	*needs_resize = GF_FALSE;
-
-	if (!ffd->base_frame) return GF_BAD_PARAM;
-
-	GF_SAFEALLOC(a_frame, GF_MediaDecoderFrame);
-	if (!a_frame) return GF_OUT_OF_MEM;
-	GF_SAFEALLOC(ff_frame, FF_Frame);
-	if (!ff_frame) {
-		gf_free(a_frame);
-		return GF_OUT_OF_MEM;
-	}
-	a_frame->user_data = ff_frame;
-	ff_frame->ctx = ffd;
-	ff_frame->frame = av_frame_clone(ffd->base_frame);
-
-	a_frame->Release = FFFrame_Release;
-	a_frame->GetPlane = FFFrame_GetPlane;
-
-	*frame = a_frame;
-	if (ffd->frame_size_changed) {
-		ffd->frame_size_changed = GF_FALSE;
-		*needs_resize = GF_TRUE;
-	}
-
-	return GF_OK;
-}
-#endif //USE_AVCTX3
-
-static u32 FFDEC_CanHandleStream(GF_BaseDecoder *plug, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	GF_BitStream *bs;
-	u32 codec_id;
-	Bool check_4cc;
-	FFDec *ffd = (FFDec*)plug->privateStack;
-
-	/*media type query*/
-	if (!esd) {
-		if ((StreamType==GF_STREAM_VISUAL) || (StreamType==GF_STREAM_AUDIO)) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-
-	/*store types*/
-	ffd->oti = esd->decoderConfig->objectTypeIndication;
-	ffd->st = StreamType;
-
-	codec_id = 0;
-	check_4cc = GF_FALSE;
-
-	/*private from FFMPEG input*/
-	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		codec_id = gf_bs_read_u32(bs);
-		gf_bs_del(bs);
-	}
-	/*private from IsoMedia input*/
-	else if (ffd->oti == GPAC_OTI_MEDIA_GENERIC) {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		codec_id = gf_bs_read_u32(bs);
-		check_4cc = GF_TRUE;
-		gf_bs_del(bs);
-
-        if (codec_id == GF_4CC('s','a','m','r')) {
-            codec_id = CODEC_ID_AMR_NB;
-        }
-        else if (codec_id == GF_4CC('s','a','w','b')) {
-            codec_id = CODEC_ID_AMR_WB;
-        }
-	}
-	else if (StreamType==GF_STREAM_AUDIO) {
-		/*std MPEG-2 audio*/
-		switch (ffd->oti) {
-		case GPAC_OTI_AUDIO_MPEG2_PART3:
-		case GPAC_OTI_AUDIO_MPEG1:
-			codec_id = CODEC_ID_MP2;
-			break;
-		case GPAC_OTI_AUDIO_AC3:
-			codec_id = CODEC_ID_AC3;
-			break;
-		case GPAC_OTI_AUDIO_EAC3:
-			codec_id = CODEC_ID_EAC3;
-			break;
-        case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-        case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-        case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-        case GPAC_OTI_AUDIO_AAC_MPEG4:
-            codec_id = CODEC_ID_AAC;
-            if (avcodec_find_decoder(codec_id) != NULL)
-                return GF_CODEC_MAYBE_SUPPORTED;
-            break;
-#ifdef CODEC_ID_OPUS
-		case GPAC_OTI_MEDIA_OPUS:
-			if (avcodec_find_decoder(CODEC_ID_OPUS) != NULL)
-				return GF_CODEC_MAYBE_SUPPORTED;
-#endif
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-
-	/*std MPEG-4 visual*/
-	else if (StreamType==GF_STREAM_VISUAL) {
-
-		/*fixme - we should use some priority rather than declare ffmpeg can't handle svc*/
-		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				Bool is_svc = GF_FALSE;
-				u32 i, count;
-				GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-				if (!cfg) return GF_CODEC_SUPPORTED;
-
-				if (esd->has_scalable_layers)
-					is_svc = GF_TRUE;
-
-				/*decode all NALUs*/
-				count = gf_list_count(cfg->sequenceParameterSets);
-				for (i=0; i<count; i++) {
-					GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
-					u8 nal_type = slc->data[0] & 0x1F;
-
-					if (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
-						is_svc = GF_TRUE;
-						break;
-					}
-				}
-				gf_odf_avc_cfg_del(cfg);
-				return (is_svc || esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) ? GF_CODEC_MAYBE_SUPPORTED : GF_CODEC_SUPPORTED;
-			}
-			if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config || esd->has_scalable_layers) return GF_CODEC_MAYBE_SUPPORTED;
-			return GF_CODEC_SUPPORTED;
-		}
-
-		switch (ffd->oti) {
-		/*MPEG-4 v1 simple profile*/
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			codec_id = CODEC_ID_MPEG4;
-			break;
-		/*H264 (not std OTI, just the way we use it internally)*/
-		case GPAC_OTI_VIDEO_AVC:
-			codec_id = CODEC_ID_H264;
-			break;
-#ifdef HAS_HEVC
-		case GPAC_OTI_VIDEO_HEVC:
-			codec_id = AV_CODEC_ID_HEVC;
-			break;
-#endif
-		/*MPEG1 video*/
-		case GPAC_OTI_VIDEO_MPEG1:
-		/*MPEG2 video*/
-		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-		case GPAC_OTI_VIDEO_MPEG2_MAIN:
-		case GPAC_OTI_VIDEO_MPEG2_SNR:
-		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-		case GPAC_OTI_VIDEO_MPEG2_HIGH:
-		case GPAC_OTI_VIDEO_MPEG2_422:
-			codec_id = CODEC_ID_MPEG2VIDEO;
-			break;
-		/*JPEG*/
-		case GPAC_OTI_IMAGE_JPEG:
-			codec_id = CODEC_ID_MJPEG;
-			/*return maybe supported as FFMPEG JPEG decoder has some issues with many files, so let's use it only if no
-			other dec is available*/
-			if (avcodec_find_decoder(codec_id) != NULL)
-				return GF_CODEC_MAYBE_SUPPORTED;
-
-			return GF_CODEC_NOT_SUPPORTED;
-		case GPAC_OTI_IMAGE_PNG:
-			if (avcodec_find_decoder(CODEC_ID_PNG) != NULL)
-				return GF_CODEC_MAYBE_SUPPORTED;
-			return GF_CODEC_NOT_SUPPORTED;
-
-#ifdef CODEC_ID_VP9
-		case GPAC_OTI_VIDEO_VP9:
-			if (avcodec_find_decoder(AV_CODEC_ID_VP9) != NULL)
-				return GF_CODEC_MAYBE_SUPPORTED;
-			return GF_CODEC_NOT_SUPPORTED;
-#endif
-
-#ifdef CODEC_ID_AV1
-		case GPAC_OTI_VIDEO_AV1:
-			if (avcodec_find_decoder(CODEC_ID_AV1) != NULL)
-				return GF_CODEC_MAYBE_SUPPORTED;
-#endif
-			return GF_CODEC_NOT_SUPPORTED;
-
-		default:
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-	/*NeroDigital DVD subtitles*/
-	else if ((StreamType==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0))
-		return GF_CODEC_SUPPORTED;
-
-	if (!codec_id) return GF_CODEC_NOT_SUPPORTED;
-
-	if (check_4cc && (ffmpeg_get_codec(codec_id) != NULL)) {
-		if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
-		return GF_CODEC_SUPPORTED;
-	}
-
-	if (avcodec_find_decoder(codec_id) != NULL) {
-		if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
-
-		//for HEVC return MAYBE supported to fallback to openHEVC if present (more optimized for now)
-#ifdef HAS_HEVC
-		if (codec_id == AV_CODEC_ID_HEVC)
-			return GF_CODEC_MAYBE_SUPPORTED;
-#endif
-
-		return GF_CODEC_SUPPORTED;
-	}
-
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *FFDEC_GetCodecName(GF_BaseDecoder *dec)
-{
-	FFDec *ffd;
-	if (!dec)
-		return NULL;
-	ffd = (FFDec*)dec->privateStack;
-	if (ffd && ffd->base_codec) {
-		sprintf(ffd->szCodec, "FFMPEG %s - version %s", ffd->base_codec->name ? ffd->base_codec->name : "unknown", LIBAVCODEC_IDENT);
-		return ffd->szCodec;
-	}
-	return NULL;
-}
-
-
-void *FFDEC_Load()
-{
-	GF_MediaDecoder *ptr;
-	FFDec *priv;
-
-	GF_SAFEALLOC(ptr , GF_MediaDecoder);
-	if (!ptr) return NULL;
-	GF_SAFEALLOC(priv , FFDec);
-	if (!priv) {
-		gf_free(ptr);
-		return NULL;
-	}
-	ptr->privateStack = priv;
-
-	/* Note for valgrind : those two functions cause a leak in valgrind */
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Decoder] Registering all ffmpeg codecs...\n") );
-#ifdef FF_API_AVCODE_INIT /*commit ffmpeg 3211932c513338566b31d990d06957e15a644d13*/
-	avcodec_init();
-#endif
-	avcodec_register_all();
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG Decoder] Done registering all ffmpeg codecs.\n") );
-
-	ptr->AttachStream = FFDEC_AttachStream;
-	ptr->DetachStream = FFDEC_DetachStream;
-	ptr->GetCapabilities = FFDEC_GetCapabilities;
-	ptr->SetCapabilities = FFDEC_SetCapabilities;
-	ptr->CanHandleStream = FFDEC_CanHandleStream;
-	ptr->GetName = FFDEC_GetCodecName;
-	ptr->ProcessData = FFDEC_ProcessData;
-	ptr->GetOutputBuffer = FFDEC_GetOutputBuffer;
-#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
-	ptr->GetOutputFrame = FFDEC_GetOutputFrame;
-#endif
-
-	GF_REGISTER_MODULE_INTERFACE(ptr, GF_MEDIA_DECODER_INTERFACE, "FFMPEG decoder", "gpac distribution");
-	return (GF_BaseInterface *) ptr;
-}
-
-void FFDEC_Delete(void *ifce)
-{
-	GF_BaseDecoder *dec = (GF_BaseDecoder*)ifce;
-	FFDec *ffd;
-	if (!ifce)
-		return;
-	ffd = (FFDec*)dec->privateStack;
-	dec->privateStack = NULL;
-	if (ffd) {
-		if (ffd->base_ctx && ffd->base_ctx->codec) avcodec_close(ffd->base_ctx);
-		ffd->base_ctx = NULL;
-		if (ffd->depth_ctx && ffd->depth_ctx->codec) avcodec_close(ffd->depth_ctx);
-		ffd->depth_ctx = NULL;
-#ifdef FFMPEG_SWSCALE
-		if (ffd->base_sws) sws_freeContext(ffd->base_sws);
-		ffd->base_sws = NULL;
-		if (ffd->depth_sws) sws_freeContext(ffd->base_sws);
-		ffd->depth_sws = NULL;
-#endif
-		gf_free(ffd);
-	}
-	gf_free(dec);
-}

gpac-0.8.0.tar.gz/modules/ffmpeg_in/ffmpeg_demux.c Deleted

@@ -1,1060 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / FFMPEG module
- *
- *  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 "ffmpeg_in.h"
-
-#ifndef DISABLE_FFMPEG_DEMUX
-
-/*default buffer is 200 ms per channel*/
-#define FFD_DATA_BUFFER		800
-
-//#define FFMPEG_DEMUX_ENABLE_MPEG2TS
-
-//#if defined(__DARWIN__) || defined(__APPLE__)
-#if !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
-#include <errno.h>
-#endif
-
-/**
- * New versions of ffmpeg do not declare AVERROR_NOMEM, AVERROR_IO, AVERROR_NOFMT
- */
-
-#ifndef AVERROR_NOMEM
-#define AVERROR_NOMEM AVERROR(ENOMEM)
-#endif /* AVERROR_NOMEM */
-
-#ifndef AVERROR_IO
-#define AVERROR_IO AVERROR(EIO)
-#endif /* AVERROR_IO */
-
-#ifndef AVERROR_NOFMT
-#define AVERROR_NOFMT AVERROR(EINVAL)
-#endif /* AVERROR_NOFMT */
-
-
-#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
-
-#define av_find_stream_info(__c)	avformat_find_stream_info(__c, NULL)
-#define USE_AVFORMAT_OPEN_INPUT	1
-#endif
-
-
-#if defined(GPAC_ANDROID) && (LIBAVFORMAT_VERSION_MAJOR <= 52)
-
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE	1
-#endif
-
-#endif
-
-
-
-static u32 FFDemux_Run(void *par)
-{
-	AVPacket pkt;
-	s64 seek_to;
-	GF_NetworkCommand com;
-	GF_NetworkCommand map;
-	GF_SLHeader slh;
-	FFDemux *ffd = (FFDemux *) par;
-
-	memset(&map, 0, sizeof(GF_NetworkCommand));
-	map.command_type = GF_NET_CHAN_MAP_TIME;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_BUFFER_QUERY;
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-
-	slh.compositionTimeStampFlag = slh.decodingTimeStampFlag = 1;
-
-	while (ffd->is_running) {
-		//nothing connected, wait
-		if (!ffd->video_ch && !ffd->audio_ch) {
-			gf_sleep(100);
-			continue;
-		}
-
-		if ((ffd->seek_time>=0) && ffd->seekable) {
-			seek_to = (s64) (AV_TIME_BASE*ffd->seek_time);
-			av_seek_frame(ffd->ctx, -1, seek_to, AVSEEK_FLAG_BACKWARD);
-			ffd->seek_time = -1;
-		}
-		pkt.stream_index = -1;
-		/*EOF*/
-		if (av_read_frame(ffd->ctx, &pkt) <0) break;
-		if (pkt.pts == AV_NOPTS_VALUE) pkt.pts = pkt.dts;
-		if (!pkt.dts) pkt.dts = pkt.pts;
-
-		slh.compositionTimeStamp = pkt.pts;
-		slh.decodingTimeStamp = pkt.dts;
-
-		gf_mx_p(ffd->mx);
-		/*blindly send audio as soon as video is init*/
-		if (ffd->audio_ch && (pkt.stream_index == ffd->audio_st) ) {
-			slh.compositionTimeStamp *= ffd->audio_tscale.num;
-			slh.decodingTimeStamp *= ffd->audio_tscale.num;
-
-			gf_service_send_packet(ffd->service, ffd->audio_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
-		}
-		else if (ffd->video_ch && (pkt.stream_index == ffd->video_st)) {
-			slh.compositionTimeStamp *= ffd->video_tscale.num;
-			slh.decodingTimeStamp *= ffd->video_tscale.num;
-			slh.randomAccessPointFlag = pkt.flags&AV_PKT_FLAG_KEY ? 1 : 0;
-			gf_service_send_packet(ffd->service, ffd->video_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
-		}
-		gf_mx_v(ffd->mx);
-		av_free_packet(&pkt);
-
-		/*sleep untill the buffer occupancy is too low - note that this work because all streams in this
-		demuxer are synchronized*/
-		while (ffd->audio_run || ffd->video_run) {
-			gf_service_command(ffd->service, &com, GF_OK);
-			if (com.buffer.occupancy < com.buffer.max)
-				break;
-
-			gf_sleep(1);
-		}
-
-		if (!ffd->audio_run && !ffd->video_run) break;
-	}
-	/*signal EOS*/
-	if (ffd->audio_ch) gf_service_send_packet(ffd->service, ffd->audio_ch, NULL, 0, NULL, GF_EOS);
-	if (ffd->video_ch) gf_service_send_packet(ffd->service, ffd->video_ch, NULL, 0, NULL, GF_EOS);
-	ffd->is_running = 2;
-
-	return 0;
-}
-
-static const char * FFD_MIME_TYPES[] = {
-	"video/x-mpeg", "mpg mpeg mp2 mpa mpe mpv2", "MPEG 1/2 Movies",
-	"video/x-mpeg-systems", "mpg mpeg mp2 mpa mpe mpv2", "MPEG 1/2 Movies",
-	"audio/basic", "snd au", "Basic Audio",
-	"audio/x-wav", "wav", "WAV Audio",
-	"audio/vnd.wave", "wav", "WAV Audio",
-	"video/x-ms-asf", "asf wma wmv asx asr", "WindowsMedia Movies",
-	"video/x-ms-wmv", "asf wma wmv asx asr", "WindowsMedia Movies",
-	"video/x-msvideo", "avi", "AVI Movies",
-	"video/x-ms-video", "avi", "AVI Movies",
-	"video/avi", "avi", "AVI Movies",
-	"video/vnd.avi", "avi", "AVI Movies",
-	"video/H263", "h263 263", "H263 Video",
-	"video/H264", "h264 264", "H264 Video",
-	"video/MPEG4", "cmp", "MPEG-4 Video",
-	/* We let ffmpeg handle mov because some QT files with uncompressed or adpcm audio use 1 audio sample
-	   per MP4 sample which is a killer for our MP4 lib, whereas ffmpeg handles these as complete audio chunks
-	   moreover ffmpeg handles cmov, we don't */
-	"video/quicktime", "mov qt", "QuickTime Movies",
-	/* Supported by latest versions of FFMPEG */
-	"video/webm", "webm", "Google WebM Movies",
-	"audio/webm", "webm", "Google WebM Music",
-#ifdef FFMPEG_DEMUX_ENABLE_MPEG2TS
-	"video/mp2t", "ts", "MPEG 2 TS",
-#endif
-	NULL
-};
-
-static u32 FFD_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	for (i = 0 ; FFD_MIME_TYPES[i]; i+=3)
-		gf_service_register_mime(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2]);
-	return i/3;
-}
-
-static int open_file(AVFormatContext **	ic_ptr, const char * 	filename, AVInputFormat * 	fmt, void *ops) {
-#ifdef USE_PRE_0_7
-	return av_open_input_file(ic_ptr, filename, fmt, 0, NULL);
-#else
-	return avformat_open_input(ic_ptr, filename, fmt, (AVDictionary**)ops);
-#endif
-}
-
-void ffd_parse_options(FFDemux *ffd, const char *url)
-{
-#ifdef USE_AVFORMAT_OPEN_INPUT
-	int res;
-	char *frag = (char*) strchr(url, '#');
-	if (frag) frag = frag+1;
-
-	if (ffd->options) return;
-
-	while (frag) {
-		char *mid, *sep = strchr(frag, ':');
-		if (sep) sep[0] = 0;
-		mid = strchr(frag, '=');
-		if (mid) {
-			mid[0] = 0;
-			res = av_dict_set(&ffd->options, frag, mid+1, 0);
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Failed to set option %s:%s\n", frag, mid+1) );
-			}
-			mid[0] = '=';
-		}
-		if (!sep) break;
-		sep[0] = ':';
-		frag = sep+1;
-	}
-#endif
-}
-
-
-static Bool FFD_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	Bool has_audio, has_video;
-	s32 i;
-	AVFormatContext *ctx;
-	AVOutputFormat *fmt_out;
-	Bool ret = GF_FALSE;
-	char *ext, szName[1024], szExt[20];
-	const char *szExtList;
-	FFDemux *ffd;
-	if (!plug || !url)
-		return GF_FALSE;
-	/*disable RTP/RTSP from ffmpeg*/
-	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
-	if (!strnicmp(url, "rtspu://", 8)) return GF_FALSE;
-	if (!strnicmp(url, "rtp://", 6)) return GF_FALSE;
-	if (!strnicmp(url, "plato://", 8)) return GF_FALSE;
-	if (!strnicmp(url, "udp://", 6)) return GF_FALSE;
-	if (!strnicmp(url, "tcp://", 6)) return GF_FALSE;
-	if (!strnicmp(url, "data:", 5)) return GF_FALSE;
-
-	ffd = (FFDemux*)plug->priv;
-
-	if (strlen(url) >= sizeof(szName))
-		return GF_FALSE;
-
-	strcpy(szName, url);
-	ext = strrchr(szName, '#');
-	if (ext) ext[0] = 0;
-	ext = strrchr(szName, '?');
-	if (ext) ext[0] = 0;
-
-	ext = strrchr(szName, '.');
-	if (ext && strlen(ext) > 19) ext = NULL;
-
-	if (ext && strlen(ext) > 1 && strlen(ext) <= sizeof(szExt)) {
-		strcpy(szExt, &ext[1]);
-		strlwr(szExt);
-#ifndef FFMPEG_DEMUX_ENABLE_MPEG2TS
-		if (strstr("ts m2t mts dmb trp", szExt) ) return GF_FALSE;
-#endif
-
-		/*note we forbid ffmpeg to handle files we support*/
-		if (!strcmp(szExt, "mp4") || !strcmp(szExt, "mpg4") || !strcmp(szExt, "m4a") || !strcmp(szExt, "m21")
-		        || !strcmp(szExt, "m4v") || !strcmp(szExt, "m4a")
-		        || !strcmp(szExt, "m4s") || !strcmp(szExt, "3gs")
-		        || !strcmp(szExt, "3gp") || !strcmp(szExt, "3gpp") || !strcmp(szExt, "3gp2") || !strcmp(szExt, "3g2")
-		        || !strcmp(szExt, "mp3")
-		        || !strcmp(szExt, "ac3")
-		        || !strcmp(szExt, "amr")
-		        || !strcmp(szExt, "bt") || !strcmp(szExt, "wrl") || !strcmp(szExt, "x3dv")
-		        || !strcmp(szExt, "xmt") || !strcmp(szExt, "xmta") || !strcmp(szExt, "x3d")
-
-		        || !strcmp(szExt, "jpg") || !strcmp(szExt, "jpeg") || !strcmp(szExt, "png")
-		   ) return GF_FALSE;
-
-		/*check any default stuff that should work with ffmpeg*/
-		{
-			u32 i;
-			for (i = 0 ; FFD_MIME_TYPES[i]; i+=3) {
-				if (gf_service_check_mime_register(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2], ext))
-					return GF_TRUE;
-			}
-		}
-	}
-
-	ffd_parse_options(ffd, url);
-
-	ctx = NULL;
-	if (open_file(&ctx, szName, NULL, ffd->options ? &ffd->options : NULL)<0) {
-		AVInputFormat *av_in = NULL;
-		/*some extensions not supported by ffmpeg*/
-		if (ext && !strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
-
-		if (open_file(&ctx, szName, av_in, ffd->options ? &ffd->options : NULL)<0) {
-			return GF_FALSE;
-		}
-	}
-
-	if (!ctx) goto exit;
-	if (av_find_stream_info(ctx) <0) goto exit;
-
-	/*figure out if we can use codecs or not*/
-	has_video = has_audio = GF_FALSE;
-	for(i = 0; i < (s32)ctx->nb_streams; i++) {
-		AVCodecContext *enc = ctx->streams[i]->codec;
-		switch(enc->codec_type) {
-		case AVMEDIA_TYPE_AUDIO:
-			if (!has_audio) has_audio = GF_TRUE;
-			break;
-		case AVMEDIA_TYPE_VIDEO:
-			if (!has_video) has_video= GF_TRUE;
-			break;
-		default:
-			break;
-		}
-	}
-	if (!has_audio && !has_video) goto exit;
-	ret = GF_TRUE;
-#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
-	fmt_out = guess_stream_format(NULL, url, NULL);
-#else
-	fmt_out = av_guess_format(NULL, url, NULL);
-#endif
-	if (fmt_out) gf_service_register_mime(plug, fmt_out->mime_type, fmt_out->extensions, fmt_out->name);
-	else {
-		ext = strrchr(szName, '.');
-		if (ext) {
-			strcpy(szExt, &ext[1]);
-			strlwr(szExt);
-
-			szExtList = gf_modules_get_option((GF_BaseInterface *)plug, "MimeTypes", "application/x-ffmpeg");
-			if (!szExtList) {
-				gf_service_register_mime(plug, "application/x-ffmpeg", szExt, "Other Movies (FFMPEG)");
-			} else if (!strstr(szExtList, szExt)) {
-				u32 len;
-				char *buf;
-				len = (u32) (strlen(szExtList) + strlen(szExt) + 10);
-				buf = (char*)gf_malloc(sizeof(char)*len);
-				sprintf(buf, "\"%s ", szExt);
-				strcat(buf, &szExtList[1]);
-				gf_modules_set_option((GF_BaseInterface *)plug, "MimeTypes", "application/x-ffmpeg", buf);
-				gf_free(buf);
-			}
-		}
-	}
-
-exit:
-#if FF_API_CLOSE_INPUT_FILE
-	if (ctx) av_close_input_file(ctx);
-#else
-	if (ctx) avformat_close_input(&ctx);
-#endif
-	return ret;
-}
-
-static GF_ESD *FFD_GetESDescriptor(FFDemux *ffd, Bool for_audio)
-{
-	GF_BitStream *bs;
-	Bool dont_use_sl;
-	GF_ESD *esd = (GF_ESD *) gf_odf_desc_esd_new(0);
-	esd->ESID = 1 + (for_audio ? ffd->audio_st : ffd->video_st);
-	esd->decoderConfig->streamType = for_audio ? GF_STREAM_AUDIO : GF_STREAM_VISUAL;
-	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
-
-	/*remap std object types - depending on input formats, FFMPEG may not have separate DSI from initial frame.
-	In this case we have no choice but using FFMPEG decoders*/
-	if (for_audio) {
-		AVCodecContext *dec = ffd->ctx->streams[ffd->audio_st]->codec;
-		esd->slConfig->timestampResolution = ffd->audio_tscale.den;
-		switch (dec->codec_id) {
-		case CODEC_ID_MP2:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-			break;
-		case CODEC_ID_MP3:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
-			break;
-		case CODEC_ID_AAC:
-			if (!dec->extradata_size) goto opaque_audio;
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
-			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
-			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
-			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
-			       dec->extradata,
-			       sizeof(char)*dec->extradata_size);
-			break;
-		default:
-opaque_audio:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_FFMPEG;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, dec->codec_id);
-			gf_bs_write_u32(bs, dec->sample_rate);
-			gf_bs_write_u16(bs, dec->channels);
-			gf_bs_write_u16(bs, dec->frame_size);
-			gf_bs_write_u8(bs, 16);
-			gf_bs_write_u8(bs, 0);
-			/*ffmpeg specific*/
-			gf_bs_write_u16(bs, dec->block_align);
-			gf_bs_write_u32(bs, dec->bit_rate);
-			gf_bs_write_u32(bs, dec->codec_tag);
-			if (dec->extradata_size) {
-				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
-			}
-			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(bs);
-			break;
-		}
-		dont_use_sl = ffd->unreliable_audio_timing;
-	} else {
-		AVCodecContext *dec = ffd->ctx->streams[ffd->video_st]->codec;
-		esd->slConfig->timestampResolution = ffd->video_tscale.den;
-		switch (dec->codec_id) {
-		case CODEC_ID_MPEG4:
-			/*there is a bug in fragmentation of raw H264 in ffmpeg, the NALU startcode (0x00000001) is split across
-			two frames - we therefore force internal ffmpeg codec ID to avoid NALU size recompute
-			at the decoder level*/
-//		case CODEC_ID_H264:
-			/*if dsi not detected force use ffmpeg*/
-			if (!dec->extradata_size) goto opaque_video;
-			/*otherwise use any MPEG-4 Visual*/
-			esd->decoderConfig->objectTypeIndication = (dec->codec_id==CODEC_ID_H264) ? GPAC_OTI_VIDEO_AVC : GPAC_OTI_VIDEO_MPEG4_PART2;
-			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
-			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
-			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
-			       dec->extradata,
-			       sizeof(char)*dec->extradata_size);
-			break;
-		case CODEC_ID_MPEG1VIDEO:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
-			break;
-		case CODEC_ID_MPEG2VIDEO:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_MAIN;
-			break;
-
-		case CODEC_ID_H263:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, GF_4CC('s', '2', '6', '3') );
-			gf_bs_write_u16(bs, dec->width);
-			gf_bs_write_u16(bs, dec->height);
-			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(bs);
-			break;
-		default:
-opaque_video:
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_FFMPEG;
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, dec->codec_id);
-			gf_bs_write_u16(bs, dec->width);
-			gf_bs_write_u16(bs, dec->height);
-			/*ffmpeg specific*/
-			gf_bs_write_u32(bs, dec->bit_rate);
-			gf_bs_write_u32(bs, dec->codec_tag);
-			gf_bs_write_u32(bs, dec->pix_fmt);
-
-			if (dec->extradata_size) {
-				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
-			}
-			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(bs);
-			break;
-		}
-		dont_use_sl = GF_FALSE;
-	}
-
-	if (dont_use_sl) {
-		esd->slConfig->predefined = SLPredef_SkipSL;
-	} else {
-		/*only send full AUs*/
-		esd->slConfig->useAccessUnitStartFlag = esd->slConfig->useAccessUnitEndFlag = 0;
-		if (for_audio) {
-			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-		} else {
-			esd->slConfig->useRandomAccessPointFlag = 1;
-		}
-		esd->slConfig->useTimestampsFlag = 1;
-	}
-
-	return esd;
-}
-
-
-static void FFD_SetupObjects(FFDemux *ffd)
-{
-	GF_ESD *esd;
-	GF_ObjectDescriptor *od;
-	u32 audio_esid = 0;
-
-	if ((ffd->audio_st>=0) && (ffd->service_type != 1)) {
-		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
-		od->objectDescriptorID = esd->ESID;
-		audio_esid = esd->ESID;
-		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? GF_TRUE : GF_FALSE);
-	}
-	if ((ffd->video_st>=0) && (ffd->service_type != 2)) {
-		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
-		od->objectDescriptorID = esd->ESID;
-		esd->OCRESID = audio_esid;
-		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, GF_FALSE);
-	}
-}
-
-#ifdef USE_PRE_0_7
-static int ff_url_read(void *h, unsigned char *buf, int size)
-{
-	u32 retry = 10;
-	u32 read;
-	int full_size;
-	FFDemux *ffd = (FFDemux *)h;
-
-	full_size = 0;
-	if (ffd->buffer_used) {
-		if (ffd->buffer_used >= (u32) size) {
-			ffd->buffer_used-=size;
-			memcpy(ffd->buffer, ffd->buffer+size, sizeof(char)*ffd->buffer_used);
-#ifdef FFMPEG_DUMP_REMOTE
-			if (ffd->outdbg) gf_fwrite(buf, size, 1, ffd->outdbg);
-#endif
-			return size;
-		}
-		full_size += ffd->buffer_used;
-		buf += ffd->buffer_used;
-		size -= ffd->buffer_used;
-		ffd->buffer_used = 0;
-	}
-
-	while (size) {
-		GF_Err e = gf_dm_sess_fetch_data(ffd->dnload, buf, size, &read);
-		if (e==GF_EOS) break;
-		/*we're sync!!*/
-		if (e==GF_IP_NETWORK_EMPTY) {
-			if (!retry) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] timeout fetching bytes from network\n") );
-				return -1;
-			}
-			retry --;
-			gf_sleep(100);
-			continue;
-		}
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] error fetching bytes from network: %s\n", gf_error_to_string(e) ) );
-			return -1;
-		}
-		full_size += read;
-		if (read==size) break;
-		size -= read;
-		buf += read;
-	}
-#ifdef FFMPEG_DUMP_REMOTE
-	if (ffd->outdbg) gf_fwrite(ffd->buffer, full_size, 1, ffd->outdbg);
-#endif
-	return full_size ? (int) full_size : -1;
-}
-#endif /*USE_PRE_0_7*/
-
-
-static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_Err e;
-	s64 last_aud_pts;
-	u32 i;
-	s32 res;
-	Bool is_local;
-	const char *sOpt;
-	char *ext, szName[1024];
-	FFDemux *ffd = (FFDemux*)plug->priv;
-	AVInputFormat *av_in = NULL;
-	char szExt[20];
-
-	if (ffd->ctx) return GF_SERVICE_ERROR;
-
-	assert( url && strlen(url) < 1024);
-	strcpy(szName, url);
-	ext = strrchr(szName, '#');
-	ffd->service_type = 0;
-	ffd->service = serv;
-
-	if (ext) {
-		if (!stricmp(&ext[1], "video")) ffd->service_type = 1;
-		else if (!stricmp(&ext[1], "audio")) ffd->service_type = 2;
-		ext[0] = 0;
-	}
-
-	ffd_parse_options(ffd, url);
-
-	/*some extensions not supported by ffmpeg, overload input format*/
-	ext = strrchr(szName, '.');
-	strcpy(szExt, ext ? ext+1 : "");
-	strlwr(szExt);
-	if (!strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
-
-	is_local = (strnicmp(url, "file://", 7) && strstr(url, "://")) ? GF_FALSE : GF_TRUE;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] opening file %s - local %d - av_in %08x\n", url, is_local, av_in));
-
-	if (!is_local) {
-		AVProbeData   pd;
-
-		/*setup wraper for FFMPEG I/O*/
-		ffd->buffer_size = 8192;
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "FFMPEG", "IOBufferSize");
-		if (sOpt) ffd->buffer_size = atoi(sOpt);
-		ffd->buffer = (char*)gf_malloc(sizeof(char)*ffd->buffer_size);
-#ifdef FFMPEG_DUMP_REMOTE
-		ffd->outdbg = gf_fopen("ffdeb.raw", "wb");
-#endif
-#ifdef USE_PRE_0_7
-		init_put_byte(&ffd->io, ffd->buffer, ffd->buffer_size, 0, ffd, ff_url_read, NULL, NULL);
-		ffd->io.is_streamed = 1;
-#else
-		ffd->io.seekable = 1;
-#endif
-
-		ffd->dnload = gf_service_download_new(ffd->service, url, GF_NETIO_SESSION_NOT_THREADED  | GF_NETIO_SESSION_NOT_CACHED, NULL, ffd);
-		if (!ffd->dnload) return GF_URL_ERROR;
-		while (1) {
-			u32 read;
-			e = gf_dm_sess_fetch_data(ffd->dnload, ffd->buffer + ffd->buffer_used, ffd->buffer_size - ffd->buffer_used, &read);
-			if (e==GF_EOS) break;
-			/*we're sync!!*/
-			if (e==GF_IP_NETWORK_EMPTY) continue;
-			if (e) goto err_exit;
-			ffd->buffer_used += read;
-			if (ffd->buffer_used == ffd->buffer_size) break;
-		}
-		if (e==GF_EOS) {
-			const char *cache_file = gf_dm_sess_get_cache_name(ffd->dnload);
-			res = open_file(&ffd->ctx, cache_file, av_in, ffd->options ? &ffd->options : NULL);
-		} else {
-			pd.filename = szName;
-			pd.buf_size = ffd->buffer_used;
-			pd.buf = (u8 *) ffd->buffer;
-			av_in = av_probe_input_format(&pd, 1);
-			if (!av_in) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] error probing file %s - probe start with %c %c %c %c\n", url, ffd->buffer[0], ffd->buffer[1], ffd->buffer[2], ffd->buffer[3]));
-				return GF_NOT_SUPPORTED;
-			}
-			/*setup downloader*/
-			av_in->flags |= AVFMT_NOFILE;
-#ifdef USE_AVFORMAT_OPEN_INPUT /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
-			res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
-#else
-			res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
-#endif
-		}
-	} else {
-		res = open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
-	}
-
-	switch (res) {
-#ifndef _WIN32_WCE
-	case 0:
-		e = GF_OK;
-		break;
-	case AVERROR_IO:
-		e = GF_URL_ERROR;
-		goto err_exit;
-	case AVERROR_INVALIDDATA:
-		e = GF_NON_COMPLIANT_BITSTREAM;
-		goto err_exit;
-	case AVERROR_NOMEM:
-		e = GF_OUT_OF_MEM;
-		goto err_exit;
-	case AVERROR_NOFMT:
-		e = GF_NOT_SUPPORTED;
-		goto err_exit;
-#endif
-	default:
-		e = GF_SERVICE_ERROR;
-		goto err_exit;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] looking for streams in %s - %d streams - type %s\n", ffd->ctx->filename, ffd->ctx->nb_streams, ffd->ctx->iformat->name));
-
-#ifdef USE_AVFORMAT_OPEN_INPUT
-	res = avformat_find_stream_info(ffd->ctx, ffd->options ? &ffd->options : NULL);
-#else
-	res = av_find_stream_info(ffd->ctx);
-#endif
-
-	if (res <0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] cannot locate streams - error %d\n", res));
-		e = GF_NOT_SUPPORTED;
-		goto err_exit;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] file %s opened - %d streams\n", url, ffd->ctx->nb_streams));
-
-	/*figure out if we can use codecs or not*/
-	ffd->audio_st = ffd->video_st = -1;
-	for (i = 0; i < ffd->ctx->nb_streams; i++) {
-		AVCodecContext *enc = ffd->ctx->streams[i]->codec;
-		switch(enc->codec_type) {
-		case AVMEDIA_TYPE_AUDIO:
-			if ((ffd->audio_st<0) && (ffd->service_type!=1)) {
-				ffd->audio_st = i;
-				ffd->audio_tscale = ffd->ctx->streams[i]->time_base;
-			}
-			break;
-		case AVMEDIA_TYPE_VIDEO:
-			if ((ffd->video_st<0) && (ffd->service_type!=2)) {
-				ffd->video_st = i;
-				ffd->video_tscale = ffd->ctx->streams[i]->time_base;
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	if ((ffd->service_type==1) && (ffd->video_st<0)) goto err_exit;
-	if ((ffd->service_type==2) && (ffd->audio_st<0)) goto err_exit;
-	if ((ffd->video_st<0) && (ffd->audio_st<0)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] No supported streams in file\n"));
-		goto err_exit;
-	}
-
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "FFMPEG", "DataBufferMS");
-	ffd->data_buffer_ms = 0;
-	if (sOpt) ffd->data_buffer_ms = atoi(sOpt);
-	if (!ffd->data_buffer_ms) ffd->data_buffer_ms = FFD_DATA_BUFFER;
-
-	/*build seek*/
-	if (is_local) {
-		/*check we do have increasing pts. If not we can't rely on pts, we must skip SL
-		we assume video pts is always present*/
-		if (ffd->audio_st>=0) {
-			last_aud_pts = 0;
-			for (i=0; i<20; i++) {
-				AVPacket pkt;
-				pkt.stream_index = -1;
-				if (av_read_frame(ffd->ctx, &pkt) <0) break;
-				if (pkt.pts == AV_NOPTS_VALUE) pkt.pts = pkt.dts;
-				if (pkt.stream_index==ffd->audio_st) last_aud_pts = pkt.pts;
-			}
-			if (last_aud_pts*ffd->audio_tscale.den<10*ffd->audio_tscale.num) ffd->unreliable_audio_timing = GF_TRUE;
-		}
-
-		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? GF_FALSE : GF_TRUE;
-		if (!ffd->seekable) {
-#if FF_API_CLOSE_INPUT_FILE
-			av_close_input_file(ffd->ctx);
-#else
-			avformat_close_input(&ffd->ctx);
-#endif
-			ffd->ctx = NULL;
-			open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
-			av_find_stream_info(ffd->ctx);
-		}
-	}
-
-	/*let's go*/
-	gf_service_connect_ack(serv, NULL, GF_OK);
-	/*if (!ffd->service_type)*/ FFD_SetupObjects(ffd);
-	ffd->service_type = 0;
-	return GF_OK;
-
-err_exit:
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
-#if FF_API_CLOSE_INPUT_FILE
-	if (ffd->ctx) av_close_input_file(ffd->ctx);
-#else
-	if (ffd->ctx) avformat_close_input(&ffd->ctx);
-#endif
-	ffd->ctx = NULL;
-	gf_service_connect_ack(serv, NULL, e);
-	return e;
-}
-
-
-static GF_Descriptor *FFD_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
-	FFDemux *ffd = (FFDemux*)plug->priv;
-
-	if (!ffd->ctx) return NULL;
-
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) {
-		if (ffd->video_st>=0) expect_type=GF_MEDIA_OBJECT_VIDEO;
-		else if (ffd->audio_st>=0) expect_type=GF_MEDIA_OBJECT_AUDIO;
-	}
-
-
-	/*since we don't handle multitrack in ffmpeg, we don't need to check sub_url, only use expected type*/
-	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
-		if (ffd->audio_st<0) return NULL;
-		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
-		/*if session join, setup sync*/
-		if (ffd->video_ch) esd->OCRESID = ffd->video_st+1;
-		gf_list_add(od->ESDescriptors, esd);
-		ffd->service_type = 2;
-		return (GF_Descriptor *) od;
-	}
-	if (expect_type==GF_MEDIA_OBJECT_VIDEO) {
-		if (ffd->video_st<0) return NULL;
-		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
-		/*if session join, setup sync*/
-		if (ffd->audio_ch) esd->OCRESID = ffd->audio_st+1;
-		gf_list_add(od->ESDescriptors, esd);
-		ffd->service_type = 1;
-		return (GF_Descriptor *) od;
-	}
-	return NULL;
-}
-
-
-static GF_Err FFD_CloseService(GF_InputService *plug)
-{
-	FFDemux *ffd = (FFDemux*)plug->priv;
-
-	ffd->is_running = 0;
-
-#if FF_API_CLOSE_INPUT_FILE
-	if (ffd->ctx) av_close_input_file(ffd->ctx);
-#else
-	if (ffd->ctx) avformat_close_input(&ffd->ctx);
-#endif
-
-	ffd->ctx = NULL;
-	ffd->audio_ch = ffd->video_ch = NULL;
-	ffd->audio_run = ffd->video_run = GF_FALSE;
-
-	if (ffd->dnload) {
-		if (ffd->is_running) {
-			while (!ffd->is_running) gf_sleep(1);
-			ffd->is_running = 0;
-		}
-		gf_service_download_del(ffd->dnload);
-		ffd->dnload = NULL;
-	}
-	if (ffd->buffer) gf_free(ffd->buffer);
-	ffd->buffer = NULL;
-
-	gf_service_disconnect_ack(ffd->service, NULL, GF_OK);
-#ifdef FFMPEG_DUMP_REMOTE
-	if (ffd->outdbg) gf_fclose(ffd->outdbg);
-#endif
-	return GF_OK;
-}
-
-static GF_Err FFD_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	GF_Err e;
-	u32 ESID;
-	FFDemux *ffd = (FFDemux*)plug->priv;
-
-	e = GF_STREAM_NOT_FOUND;
-	if (upstream) {
-		e = GF_ISOM_INVALID_FILE;
-		goto exit;
-	}
-	if (!strstr(url, "ES_ID=")) {
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	}
-	sscanf(url, "ES_ID=%u", &ESID);
-
-	if ((s32) ESID == 1 + ffd->audio_st) {
-		if (ffd->audio_ch) {
-			e = GF_SERVICE_ERROR;
-			goto exit;
-		}
-		ffd->audio_ch = channel;
-		e = GF_OK;
-	}
-	else if ((s32) ESID == 1 + ffd->video_st) {
-		if (ffd->video_ch) {
-			e = GF_SERVICE_ERROR;
-			goto exit;
-		}
-		ffd->video_ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(ffd->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err FFD_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_Err e;
-	FFDemux *ffd = (FFDemux*)plug->priv;
-
-	e = GF_STREAM_NOT_FOUND;
-	if (ffd->audio_ch == channel) {
-		e = GF_OK;
-		ffd->audio_ch = NULL;
-		ffd->audio_run = GF_FALSE;
-	}
-	else if (ffd->video_ch == channel) {
-		e = GF_OK;
-		ffd->video_ch = NULL;
-		ffd->video_run = GF_FALSE;
-	}
-	gf_service_disconnect_ack(ffd->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err FFD_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	FFDemux *ffd = (FFDemux*)plug->priv;
-
-
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
-		if (ffd->audio_st>=0) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	switch (com->command_type) {
-	/*only BIFS/OD work in pull mode (cf ffmpeg_in.h)*/
-	case GF_NET_CHAN_SET_PULL:
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_INTERACTIVE:
-		return ffd->seekable ? GF_OK : GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		if (ffd->ctx->duration == AV_NOPTS_VALUE)
-			com->duration.duration = -1;
-		else
-			com->duration.duration = (Double) ffd->ctx->duration / AV_TIME_BASE;
-		return GF_OK;
-	/*fetch start time*/
-	case GF_NET_CHAN_PLAY:
-		if (com->play.speed<0) return GF_NOT_SUPPORTED;
-
-		gf_mx_p(ffd->mx);
-		ffd->seek_time = (com->play.start_range>=0) ? com->play.start_range : 0;
-
-		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_TRUE;
-		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_TRUE;
-
-		/*play on media stream, start thread*/
-		if ((ffd->audio_ch==com->base.on_channel) || (ffd->video_ch==com->base.on_channel)) {
-			if (ffd->is_running!=1) {
-				ffd->is_running = 1;
-				gf_th_run(ffd->thread, FFDemux_Run, ffd);
-			}
-		}
-		gf_mx_v(ffd->mx);
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_FALSE;
-		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_FALSE;
-		return GF_OK;
-	/*note we don't handle PAUSE/RESUME/SET_SPEED, this is automatically handled by the demuxing thread
-	through buffer occupancy queries*/
-
-	default:
-		return GF_OK;
-	}
-
-	return GF_OK;
-}
-
-
-static Bool FFD_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	char szURL[2048], *sep;
-	FFDemux *ffd;
-	const char *this_url;
-	if (!plug || !url)
-		return GF_FALSE;
-	ffd = (FFDemux *)plug->priv;
-	this_url = gf_service_get_url(ffd->service);
-	if (!this_url)
-		return GF_FALSE;
-
-	strcpy(szURL, this_url);
-	sep = strrchr(szURL, '#');
-	if (sep) sep[0] = 0;
-
-	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
-	sep = strrchr(url, '#');
-	if (sep && !stricmp(sep, "#video") && (ffd->video_st>=0)) return GF_TRUE;
-	if (sep && !stricmp(sep, "#audio") && (ffd->audio_st>=0)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-void *New_FFMPEG_Demux()
-{
-	GF_InputService *ffd;
-	FFDemux *priv;
-	GF_SAFEALLOC(ffd, GF_InputService);
-	if (!ffd) return NULL;
-	GF_SAFEALLOC(priv, FFDemux);
-	if (!priv) {
-		gf_free(ffd);
-		return NULL;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins...\n") );
-	/* register all codecs, demux and protocols */
-	av_register_all();
-	avformat_network_init();
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins DONE.\n") );
-
-	ffd->RegisterMimeTypes = FFD_RegisterMimeTypes;
-	ffd->CanHandleURL = FFD_CanHandleURL;
-	ffd->CloseService = FFD_CloseService;
-	ffd->ConnectChannel = FFD_ConnectChannel;
-	ffd->ConnectService = FFD_ConnectService;
-	ffd->DisconnectChannel = FFD_DisconnectChannel;
-	ffd->GetServiceDescriptor = FFD_GetServiceDesc;
-	ffd->ServiceCommand = FFD_ServiceCommand;
-
-	ffd->CanHandleURLInService = FFD_CanHandleURLInService;
-
-	priv->thread = gf_th_new("FFMPEG Demux");
-	priv->mx = gf_mx_new("FFMPEG Demux");
-	if (!priv->thread || !priv->mx) {
-		if (priv->thread) gf_th_del(priv->thread);
-		if (priv->mx) gf_mx_del(priv->mx);
-		gf_free(priv);
-		return NULL;
-	}
-
-	GF_REGISTER_MODULE_INTERFACE(ffd, GF_NET_CLIENT_INTERFACE, "FFMPEG Demuxer", "gpac distribution");
-	ffd->priv = priv;
-	return ffd;
-}
-
-void Delete_FFMPEG_Demux(void *ifce)
-{
-	FFDemux *ffd;
-	GF_InputService *ptr = (GF_InputService *)ifce;
-	if (!ptr)
-		return;
-	ffd = (FFDemux*)ptr->priv;
-	if (ffd) {
-		if (ffd->thread)
-			gf_th_del(ffd->thread);
-		ffd->thread = NULL;
-		if (ffd->mx)
-			gf_mx_del(ffd->mx);
-
-#ifndef USE_PRE_0_7
-		if (ffd->options) av_dict_free(&ffd->options);
-#endif
-		ffd->mx = NULL;
-		gf_free(ffd);
-		ptr->priv = NULL;
-	}
-	gf_free(ptr);
-}
-
-
-#endif

gpac-0.8.0.tar.gz/modules/freenect Deleted

gpac-0.8.0.tar.gz/modules/freenect/Makefile Deleted

gpac-0.8.0.tar.gz/modules/gapi Deleted

gpac-0.8.0.tar.gz/modules/gapi/gapi.cpp Deleted

@@ -1,1675 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / GAPI WinCE-iPaq video render module
- *
- *  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 <windows.h>
-#include <aygshell.h>
-#include <wingdi.h>
-#include <gx.h>
-
-#include "gapi.h"
-
-#ifdef GPAC_USE_GLES1X
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-
-#if 0
-# pragma message("Using OpenGL-ES Common Lite Profile")
-# pragma comment(lib, "libGLES_CL")
-
-#define GLES_NO_PBUFFER
-#define GLES_NO_PIXMAP
-
-#else
-# pragma message("Using OpenGL-ES Common Profile")
-# pragma comment(lib, "libGLES_CM")
-
-//#define GLES_NO_PIXMAP
-
-#endif
-
-#pragma comment(lib, "gx.lib")
-#endif
-
-#endif
-
-static Bool landscape = GF_FALSE;
-
-
-#define PRINT(__str) OutputDebugString(_T(__str))
-
-#define GAPICTX(dr)	GAPIPriv *gctx = (GAPIPriv *) dr->opaque;
-
-static GF_Err GAPI_InitBackBuffer(GF_VideoOutput *dr, u32 VideoWidth, u32 VideoHeight);
-
-static GF_VideoOutput *the_video_driver = NULL;
-
-static void GAPI_GetCoordinates(DWORD lParam, GF_Event *evt)
-{
-	GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
-	evt->mouse.x = LOWORD(lParam);
-	evt->mouse.y = HIWORD(lParam);
-
-	if (ctx->scale_coords) {
-		evt->mouse.x = evt->mouse.x * the_video_driver->max_screen_width / ctx->sys_w;
-		evt->mouse.y = evt->mouse.y * the_video_driver->max_screen_height / ctx->sys_h;
-	}
-
-
-	if (ctx->fullscreen) {
-		POINT pt;
-		pt.x = evt->mouse.x;
-		pt.y = evt->mouse.y;
-		ClientToScreen(ctx->hWnd, &pt);
-		if (landscape) {
-			evt->mouse.x = ctx->fs_w - pt.y;
-			evt->mouse.y = pt.x;
-		} else {
-			evt->mouse.x = pt.x;
-			evt->mouse.y = pt.y;
-		}
-	}
-}
-
-static void w32_translate_key(u32 wParam, u32 lParam, GF_EventKey *evt)
-{
-	evt->flags = 0;
-	evt->hw_code = wParam;
-	switch (wParam) {
-	case VK_BACK:
-		evt->key_code = GF_KEY_BACKSPACE;
-		break;
-	case VK_TAB:
-		evt->key_code = GF_KEY_TAB;
-		break;
-	case VK_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
-	case VK_RETURN:
-		evt->key_code = GF_KEY_ENTER;
-		break;
-	case VK_SHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		break;
-	case VK_CONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		break;
-	case VK_MENU:
-		evt->key_code = GF_KEY_ALT;
-		break;
-	case VK_PAUSE:
-		evt->key_code = GF_KEY_PAUSE;
-		break;
-	case VK_CAPITAL:
-		evt->key_code = GF_KEY_CAPSLOCK;
-		break;
-	case VK_KANA:
-		evt->key_code = GF_KEY_KANAMODE;
-		break;
-	case VK_JUNJA:
-		evt->key_code = GF_KEY_JUNJAMODE;
-		break;
-	case VK_FINAL:
-		evt->key_code = GF_KEY_FINALMODE;
-		break;
-	case VK_KANJI:
-		evt->key_code = GF_KEY_KANJIMODE;
-		break;
-	case VK_ESCAPE:
-		evt->key_code = GF_KEY_ESCAPE;
-		break;
-	case VK_CONVERT:
-		evt->key_code = GF_KEY_CONVERT;
-		break;
-	case VK_SPACE:
-		evt->key_code = GF_KEY_SPACE;
-		break;
-	case VK_PRIOR:
-		evt->key_code = GF_KEY_PAGEUP;
-		break;
-	case VK_NEXT:
-		evt->key_code = GF_KEY_PAGEDOWN;
-		break;
-	case VK_END:
-		evt->key_code = GF_KEY_END;
-		break;
-	case VK_HOME:
-		evt->key_code = GF_KEY_HOME;
-		break;
-	case VK_LEFT:
-		evt->key_code = GF_KEY_LEFT;
-		break;
-	case VK_UP:
-		evt->key_code = GF_KEY_UP;
-		break;
-	case VK_RIGHT:
-		evt->key_code = GF_KEY_RIGHT;
-		break;
-	case VK_DOWN:
-		evt->key_code = GF_KEY_DOWN;
-		break;
-	case VK_SELECT:
-		evt->key_code = GF_KEY_SELECT;
-		break;
-	case VK_PRINT:
-	case VK_SNAPSHOT:
-		evt->key_code = GF_KEY_PRINTSCREEN;
-		break;
-	case VK_EXECUTE:
-		evt->key_code = GF_KEY_EXECUTE;
-		break;
-	case VK_INSERT:
-		evt->key_code = GF_KEY_INSERT;
-		break;
-	case VK_DELETE:
-		evt->key_code = GF_KEY_DEL;
-		break;
-	case VK_HELP:
-		evt->key_code = GF_KEY_HELP;
-		break;
-
-	/*	case VK_LWIN: return ;
-		case VK_RWIN: return ;
-		case VK_APPS: return ;
-	*/
-	case VK_NUMPAD0:
-		evt->key_code = GF_KEY_0;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD1:
-		evt->key_code = GF_KEY_1;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD2:
-		evt->key_code = GF_KEY_2;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD3:
-		evt->key_code = GF_KEY_3;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD4:
-		evt->key_code = GF_KEY_4;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD5:
-		evt->key_code = GF_KEY_5;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD6:
-		evt->key_code = GF_KEY_6;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD7:
-		evt->key_code = GF_KEY_7;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD8:
-		evt->key_code = GF_KEY_8;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD9:
-		evt->key_code = GF_KEY_9;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_MULTIPLY:
-		evt->key_code = GF_KEY_STAR;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_ADD:
-		evt->key_code = GF_KEY_PLUS;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_SEPARATOR:
-		evt->key_code = GF_KEY_FULLSTOP;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_SUBTRACT:
-		evt->key_code = GF_KEY_HYPHEN;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_DECIMAL:
-		evt->key_code = GF_KEY_COMMA;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_DIVIDE:
-		evt->key_code = GF_KEY_SLASH;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_F1:
-		evt->key_code = GF_KEY_F1;
-		break;
-	case VK_F2:
-		evt->key_code = GF_KEY_F2;
-		break;
-	case VK_F3:
-		evt->key_code = GF_KEY_F3;
-		break;
-	case VK_F4:
-		evt->key_code = GF_KEY_F4;
-		break;
-	case VK_F5:
-		evt->key_code = GF_KEY_F5;
-		break;
-//	case VK_F6: evt->key_code = GF_KEY_F6; break;
-//	case VK_F7: evt->key_code = GF_KEY_F7; break;
-	case VK_F6:
-		evt->key_code = GF_KEY_VOLUMEUP;
-		break;
-	case VK_F7:
-		evt->key_code = GF_KEY_VOLUMEDOWN;
-		break;
-	case VK_F8:
-		evt->key_code = GF_KEY_F8;
-		break;
-
-	case VK_F9:
-		evt->key_code = GF_KEY_F9;
-		break;
-	case VK_F10:
-		evt->key_code = GF_KEY_F10;
-		break;
-	case VK_F11:
-		evt->key_code = GF_KEY_F11;
-		break;
-	case VK_F12:
-		evt->key_code = GF_KEY_F12;
-		break;
-	case VK_F13:
-		evt->key_code = GF_KEY_F13;
-		break;
-	case VK_F14:
-		evt->key_code = GF_KEY_F14;
-		break;
-	case VK_F15:
-		evt->key_code = GF_KEY_F15;
-		break;
-	case VK_F16:
-		evt->key_code = GF_KEY_F16;
-		break;
-	case VK_F17:
-		evt->key_code = GF_KEY_F17;
-		break;
-	case VK_F18:
-		evt->key_code = GF_KEY_F18;
-		break;
-	case VK_F19:
-		evt->key_code = GF_KEY_F19;
-		break;
-	case VK_F20:
-		evt->key_code = GF_KEY_F20;
-		break;
-	case VK_F21:
-		evt->key_code = GF_KEY_F21;
-		break;
-	case VK_F22:
-		evt->key_code = GF_KEY_F22;
-		break;
-	case VK_F23:
-		evt->key_code = GF_KEY_F23;
-		break;
-	case VK_F24:
-		evt->key_code = GF_KEY_F24;
-		break;
-
-	case VK_NUMLOCK:
-		evt->key_code = GF_KEY_NUMLOCK;
-		break;
-	case VK_SCROLL:
-		evt->key_code = GF_KEY_SCROLL;
-		break;
-
-	/*
-	 * VK_L* & VK_R* - left and right Alt, Ctrl and Shift virtual keys.
-	 * Used only as parameters to GetAsyncKeyState() and GetKeyState().
-	 * No other API or message will distinguish left and right keys in this way.
-	 */
-	case VK_LSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case VK_LCONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RCONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case VK_LMENU:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RMENU:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-
-#if(WINVER >= 0x0400)
-	case VK_PROCESSKEY:
-		evt->key_code = GF_KEY_PROCESS;
-		break;
-#endif /* WINVER >= 0x0400 */
-
-	case VK_ATTN:
-		evt->key_code = GF_KEY_ATTN;
-		break;
-	case VK_CRSEL:
-		evt->key_code = GF_KEY_CRSEL;
-		break;
-	case VK_EXSEL:
-		evt->key_code = GF_KEY_EXSEL;
-		break;
-	case VK_EREOF:
-		evt->key_code = GF_KEY_ERASEEOF;
-		break;
-	case VK_PLAY:
-		evt->key_code = GF_KEY_PLAY;
-		break;
-	case VK_ZOOM:
-		evt->key_code = GF_KEY_ZOOM;
-		break;
-	//case VK_NONAME: evt->key_code = GF_KEY_NONAME; break;
-	//case VK_PA1: evt->key_code = GF_KEY_PA1; break;
-	case VK_OEM_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
-
-	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
-	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-	default:
-		if ((wParam>=0x30) && (wParam<=0x39))  evt->key_code = GF_KEY_0 + wParam-0x30;
-		else if ((wParam>=0x41) && (wParam<=0x5A))  evt->key_code = GF_KEY_A + wParam-0x41;
-		else {
-			GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
-			short res = (LOWORD(wParam) != 0x5b) ? LOWORD(wParam) : wParam;
-
-			if (res==ctx->keys.vkLeft) evt->key_code = landscape ? GF_KEY_UP : GF_KEY_LEFT;
-			else if (res==ctx->keys.vkRight) evt->key_code = landscape ? GF_KEY_DOWN : GF_KEY_RIGHT;
-			else if (res==ctx->keys.vkDown) evt->key_code = landscape ? GF_KEY_LEFT : GF_KEY_DOWN;
-			else if (res==ctx->keys.vkUp) evt->key_code = landscape ? GF_KEY_RIGHT : GF_KEY_UP;
-			else if (res==ctx->keys.vkStart) evt->key_code = GF_KEY_ENTER;
-			else if (res==ctx->keys.vkA)
-				evt->key_code = GF_KEY_MEDIAPREVIOUSTRACK;
-			else if (res==ctx->keys.vkB)
-				evt->key_code = GF_KEY_MEDIANEXTTRACK;
-			else if (res==ctx->keys.vkC)
-				evt->key_code = GF_KEY_SHIFT;
-			else if (res==0xc1)
-				evt->key_code = GF_KEY_ALT;
-			else if (res==0xc2)
-				evt->key_code = GF_KEY_CONTROL;
-			else if (res==0xc5)
-				evt->key_code = GF_KEY_VOLUMEDOWN;
-			else {
-				evt->key_code = GF_KEY_UNIDENTIFIED;
-			}
-		}
-		break;
-	}
-}
-
-//#define DIRECT_BITBLT
-
-LRESULT APIENTRY GAPI_WindowProc(HWND hWnd, UINT msg, UINT wParam, LONG lParam)
-{
-	GF_Event evt;
-	switch (msg) {
-	case WM_SIZE:
-	{
-		GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
-		evt.type = GF_EVENT_SIZE;
-		evt.size.width = LOWORD(lParam);
-		evt.size.height = HIWORD(lParam);
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-	}
-	break;
-	case WM_CLOSE:
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = GF_EVENT_QUIT;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		return 1;
-	case WM_DESTROY:
-	{
-		GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
-		if (ctx->owns_hwnd ) {
-			PostQuitMessage (0);
-		} else if (ctx->orig_wnd_proc) {
-			/*restore window proc*/
-			SetWindowLong(ctx->hWnd, GWL_WNDPROC, ctx->orig_wnd_proc);
-			ctx->orig_wnd_proc = 0L;
-		}
-	}
-	break;
-
-	case WM_ERASEBKGND:
-		evt.type = GF_EVENT_REFRESH;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		break;
-	case WM_PAINT:
-#ifndef DIRECT_BITBLT
-	{
-		GAPIPriv *gctx = (GAPIPriv *)the_video_driver->opaque;
-		if (gctx->gx_mode || !gctx->bitmap) break;
-		HDC dc = GetDC(gctx->hWnd);
-		BitBlt(dc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
-		ReleaseDC(gctx->hWnd, dc);
-	}
-#endif
-	break;
-
-	case WM_MOUSEMOVE:
-		GAPI_GetCoordinates(lParam, &evt);
-		evt.type = GF_EVENT_MOUSEMOVE;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		break;
-	case WM_LBUTTONDOWN:
-	case WM_LBUTTONDBLCLK:
-		GAPI_GetCoordinates(lParam, &evt);
-		evt.type = GF_EVENT_MOUSEDOWN;
-		evt.mouse.button = GF_MOUSE_LEFT;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		break;
-	case WM_LBUTTONUP:
-		GAPI_GetCoordinates(lParam, &evt);
-		evt.type = GF_EVENT_MOUSEUP;
-		evt.mouse.button = GF_MOUSE_LEFT;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		break;
-
-	/*FIXME - there's a bug on alt state (we miss one event)*/
-	case WM_SYSKEYDOWN:
-	case WM_SYSKEYUP:
-	case WM_KEYDOWN:
-	case WM_KEYUP:
-		w32_translate_key(wParam, lParam, &evt.key);
-		evt.type = ((msg==WM_SYSKEYDOWN) || (msg==WM_KEYDOWN))  ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
-		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
-		break;
-	case WM_CHAR:
-		evt.type = GF_EVENT_TEXTINPUT;
-		evt.character.unicode_char = wParam;
-		break;
-	}
-	return DefWindowProc (hWnd, msg, wParam, lParam);
-}
-
-void GAPI_WindowThread(void *par)
-{
-	MSG msg;
-	WNDCLASS wc;
-	GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
-
-	memset(&wc, 0, sizeof(WNDCLASS));
-	wc.hInstance = GetModuleHandle(_T("gm_gapi.dll"));
-	wc.lpfnWndProc = GAPI_WindowProc;
-	wc.hCursor = LoadCursor (NULL, IDC_ARROW);
-	wc.hbrBackground = (HBRUSH)GetStockObject (BLACK_BRUSH);
-	wc.lpszClassName = _T("GPAC GAPI Output");
-	RegisterClass (&wc);
-
-	ctx->hWnd = CreateWindow(_T("GPAC GAPI Output"), NULL, WS_POPUP, 0, 0, 120, 100, NULL, NULL, wc.hInstance, NULL);
-	if (ctx->hWnd == NULL) {
-		ctx->ThreadID = 0;
-		ExitThread(1);
-	}
-	ShowWindow(ctx->hWnd, SW_SHOWNORMAL);
-
-	while (GetMessage (&(msg), NULL, 0, 0)) {
-		TranslateMessage (&(msg));
-		DispatchMessage (&(msg));
-	}
-	ctx->ThreadID = 0;
-	ExitThread (0);
-}
-
-
-void GAPI_SetupWindow(GF_VideoOutput *dr)
-{
-#ifdef GPAC_USE_GLES1X
-	GF_Err e;
-#endif
-	GAPIPriv *ctx = (GAPIPriv *)dr->opaque;
-	if (the_video_driver) return;
-	the_video_driver = dr;
-
-	if (!ctx->hWnd) {
-		ctx->hThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) GAPI_WindowThread, (LPVOID) dr, 0, &(ctx->ThreadID) );
-		while (!ctx->hWnd && ctx->hThread) gf_sleep(10);
-		if (!ctx->hThread) return;
-		ctx->owns_hwnd = GF_TRUE;
-	} else {
-		ctx->orig_wnd_proc = GetWindowLong(ctx->hWnd, GWL_WNDPROC);
-		/*override window proc*/
-		SetWindowLong(ctx->hWnd, GWL_WNDPROC, (DWORD) GAPI_WindowProc);
-	}
-
-	{
-		HDC hdc;
-		hdc = GetDC(ctx->hWnd);
-		dr->dpi_x = GetDeviceCaps(hdc, LOGPIXELSX);
-		dr->dpi_y = GetDeviceCaps(hdc, LOGPIXELSY);
-		ReleaseDC(ctx->hWnd, hdc);
-	}
-
-
-#ifdef GPAC_USE_GLES1X
-	ctx->use_pbuffer = GF_TRUE;
-	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
-	if (e!=GF_OK) {
-		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-#ifndef GLES_NO_PIXMAP
-		e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
-#endif
-	}
-	if (!e) {
-		dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
-		return;
-	}
-	ctx->use_pbuffer = GF_FALSE;
-
-	WNDCLASS wc;
-	HINSTANCE hInst;
-	hInst = GetModuleHandle(_T("gm_gapi.dll") );
-	memset(&wc, 0, sizeof(WNDCLASS));
-	wc.hInstance = hInst;
-	wc.lpfnWndProc = GAPI_WindowProc;
-	wc.lpszClassName = _T("GPAC GAPI Offscreen");
-	RegisterClass (&wc);
-
-	ctx->gl_hwnd = CreateWindow(_T("GPAC GAPI Offscreen"), _T("GPAC GAPI Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
-	if (!ctx->gl_hwnd) return;
-	ShowWindow(ctx->gl_hwnd, SW_HIDE);
-
-	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
-
-	if (e!=GF_OK) {
-		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-		e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
-	}
-	if (e==GF_OK) dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
-#endif
-
-}
-
-void GAPI_ShutdownWindow(GF_VideoOutput *dr)
-{
-	GAPIPriv *ctx = (GAPIPriv *)dr->opaque;
-
-	if (ctx->owns_hwnd) {
-		PostMessage(ctx->hWnd, WM_DESTROY, 0, 0);
-		while (ctx->ThreadID) gf_sleep(10);
-		UnregisterClass(_T("GPAC GAPI Output"), GetModuleHandle(_T("gapi.dll")));
-		CloseHandle(ctx->hThread);
-		ctx->hThread = NULL;
-	} else if (ctx->orig_wnd_proc) {
-		/*restore window proc*/
-		SetWindowLong(ctx->hWnd, GWL_WNDPROC, ctx->orig_wnd_proc);
-		ctx->orig_wnd_proc = 0L;
-	}
-	ctx->hWnd = NULL;
-#ifdef GPAC_USE_GLES1X
-	PostMessage(ctx->gl_hwnd, WM_DESTROY, 0, 0);
-	ctx->gl_hwnd = NULL;
-	UnregisterClass(_T("GPAC GAPI Offscreen"), GetModuleHandle(_T("gm_gapi.dll") ));
-#endif
-
-	the_video_driver = NULL;
-}
-
-
-GF_Err GAPI_Clear(GF_VideoOutput *dr, u32 color)
-{
-	GAPICTX(dr);
-	gctx->erase_dest = GF_TRUE;
-	return GF_OK;
-}
-
-
-static void createPixmap(GAPIPriv *ctx, u32 pix_type)
-{
-	const size_t    bmiSize = sizeof(BITMAPINFO) + 256U*sizeof(RGBQUAD);
-	BITMAPINFO*     bmi;
-	DWORD*          p;
-	u32 bpel = 0;
-
-	if (ctx->bmi) gf_free(ctx->bmi);
-
-	bmi = (BITMAPINFO*)gf_malloc(bmiSize);
-	memset(bmi, 0, bmiSize);
-
-	bmi->bmiHeader.biSize           = sizeof(BITMAPINFOHEADER);
-	bmi->bmiHeader.biWidth          = ctx->bb_width;
-	bmi->bmiHeader.biHeight         = -1 *  (s32) ctx->bb_height;	/*top-down image*/
-	bmi->bmiHeader.biPlanes         = (short)1;
-	bmi->bmiHeader.biBitCount       = (unsigned int) ctx->bits_per_pixel;
-	bmi->bmiHeader.biCompression    = BI_BITFIELDS;
-	bmi->bmiHeader.biClrUsed        = 3;
-
-	p = (DWORD*)bmi->bmiColors;
-	switch (ctx->pixel_format) {
-	case GF_PIXEL_RGB_555:
-		p[0] = 0x00007c00;
-		p[1] = 0x000003e0;
-		p[2] = 0x0000001f;
-		bpel = 16;
-		break;
-	case GF_PIXEL_RGB_565:
-		p[0] = 0x0000f800;
-		p[1] = 0x000007e0;
-		p[2] = 0x0000001f;
-		bpel = 16;
-		break;
-	case GF_PIXEL_RGB_24:
-		p[0] = 0x00ff0000;
-		p[1] = 0x0000ff00;
-		p[2] = 0x000000ff;
-		bpel = 24;
-		break;
-	}
-	ctx->hdc = GetDC(NULL/*ctx->hWnd*/);
-
-	if (pix_type==2) {
-#ifdef GPAC_USE_GLES1X
-		ctx->gl_bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->gl_bits, NULL, 0);
-#endif
-	} else if (pix_type==1) {
-		ctx->hdcBitmap = CreateCompatibleDC(ctx->hdc);
-		ctx->bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->bits, NULL, 0);
-		ctx->old_bitmap = (HBITMAP) SelectObject(ctx->hdcBitmap, ctx->bitmap);
-	} else {
-		ctx->hdcBitmap = CreateCompatibleDC(ctx->hdc);
-		ctx->bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->backbuffer, NULL, 0);
-		ctx->old_bitmap = (HBITMAP) SelectObject(ctx->hdcBitmap, ctx->bitmap);
-
-		/*watchout - win32 always create DWORD align memory, so align our pitch*/
-		while ((ctx->bb_pitch % 4) != 0) ctx->bb_pitch ++;
-	}
-	ReleaseDC(NULL/*ctx->hWnd*/, ctx->hdc);
-
-	ctx->bmi = bmi;
-//	gf_free(bmi);
-}
-
-
-#ifdef GPAC_USE_GLES1X
-
-void GAPI_ReleaseOGL_ES(GAPIPriv *ctx, Bool offscreen_only)
-{
-	if (ctx->egldpy) {
-		eglMakeCurrent(ctx->egldpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-
-		if (ctx->eglctx) eglDestroyContext(ctx->egldpy, ctx->eglctx);
-		ctx->eglctx = 0;
-		if (ctx->surface) eglDestroySurface(ctx->egldpy, ctx->surface);
-		ctx->surface = 0;
-		if (ctx->egldpy) eglTerminate(ctx->egldpy);
-		ctx->egldpy = 0;
-	}
-	if (ctx->gl_bitmap) DeleteObject(ctx->gl_bitmap);
-	ctx->gl_bitmap = NULL;
-
-	if (offscreen_only) return;
-
-	if (ctx->bitmap) DeleteObject(ctx->bitmap);
-	ctx->bitmap = NULL;
-}
-
-GF_Err GAPI_SetupOGL_ES(GF_VideoOutput *dr)
-{
-	EGLint n, maj, min;
-	u32 i;
-	GF_Event evt;
-	GAPICTX(dr)
-	static int atts[32];
-	const char *opt;
-
-	i=0;
-	atts[i++] = EGL_RED_SIZE;
-	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : 5;
-	atts[i++] = EGL_GREEN_SIZE;
-	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : (gctx->pixel_format==GF_PIXEL_RGB_565) ? 6 : 5;
-	atts[i++] = EGL_BLUE_SIZE;
-	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : 5;
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
-	atts[i++] = EGL_DEPTH_SIZE;
-	atts[i++] = opt ? atoi(opt) : 16;
-	atts[i++] = EGL_SURFACE_TYPE;
-
-#ifdef GLES_NO_PIXMAP
-	atts[i++] = EGL_WINDOW_BIT;
-#else
-	atts[i++] = EGL_PIXMAP_BIT;
-//	atts[i++] = gctx->fullscreen ? EGL_WINDOW_BIT : EGL_PIXMAP_BIT;
-#endif
-	atts[i++] = EGL_ALPHA_SIZE;
-	atts[i++] = EGL_DONT_CARE;
-	atts[i++] = EGL_STENCIL_SIZE;
-	atts[i++] = EGL_DONT_CARE;
-	atts[i++] = EGL_NONE;
-
-	/*whenever window is resized we must reinit OGL-ES*/
-	GAPI_ReleaseOGL_ES(gctx, GF_FALSE);
-
-	if (!gctx->fullscreen) {
-		RECT rc;
-		::GetClientRect(gctx->hWnd, &rc);
-		gctx->bb_width = rc.right-rc.left;
-		gctx->bb_height = rc.bottom-rc.top;
-
-#ifndef GLES_NO_PIXMAP
-		createPixmap(gctx, 1);
-#endif
-	}
-
-	gctx->egldpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-	if (!gctx->egldpy) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot get OpenGL display\n"));
-		return GF_IO_ERR;
-	}
-	if (!eglInitialize(gctx->egldpy, &maj, &min)) {
-		gctx->egldpy = NULL;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot initialize OpenGL layer\n"));
-		return GF_IO_ERR;
-	}
-
-	if (!eglChooseConfig(gctx->egldpy, atts, &gctx->eglconfig, 1, &n) || (eglGetError() != EGL_SUCCESS)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot choose OpenGL config\n"));
-		return GF_IO_ERR;
-	}
-
-	if (gctx->fullscreen
-#ifdef GLES_NO_PIXMAP
-	        || 1
-#endif
-	   ) {
-		gctx->surface = eglCreateWindowSurface(gctx->egldpy, gctx->eglconfig, gctx->hWnd, 0);
-	} else {
-		gctx->surface = eglCreatePixmapSurface(gctx->egldpy, gctx->eglconfig, gctx->bitmap, 0);
-	}
-
-	if (!gctx->surface) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot create OpenGL surface - error %d\n", eglGetError()));
-		return GF_IO_ERR;
-	}
-	gctx->eglctx = eglCreateContext(gctx->egldpy, gctx->eglconfig, NULL, NULL);
-	if (!gctx->eglctx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot create OpenGL context\n"));
-		eglDestroySurface(gctx->egldpy, gctx->surface);
-		gctx->surface = 0L;
-		return GF_IO_ERR;
-	}
-	if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot bind OpenGL context\n"));
-		eglDestroyContext(gctx->egldpy, gctx->eglctx);
-		gctx->eglctx = 0L;
-		eglDestroySurface(gctx->egldpy, gctx->surface);
-		gctx->surface = 0L;
-		return GF_IO_ERR;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[GAPI] OpenGL initialize - %d x %d \n", gctx->bb_width, gctx->bb_height));
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_VIDEO_SETUP;
-	evt.hw_reset = 1;
-	dr->on_event(dr->evt_cbk_hdl, &evt);
-	return GF_OK;
-}
-
-
-
-GF_Err GAPI_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
-{
-	int atts[15];
-	const char *opt;
-	EGLint n, maj, min;
-
-	GAPICTX(dr)
-
-	GAPI_ReleaseOGL_ES(gctx, GF_TRUE);
-
-	if (!gctx->use_pbuffer) {
-		SetWindowPos(gctx->gl_hwnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE);
-		createPixmap(gctx, 2);
-	}
-
-	gctx->egldpy = eglGetDisplay(/*gctx->dpy*/EGL_DEFAULT_DISPLAY);
-	if (!eglInitialize(gctx->egldpy, &maj, &min)) {
-		gctx->egldpy = NULL;
-		return GF_IO_ERR;
-	}
-	atts[0] = EGL_RED_SIZE;
-	atts[1] = 8;
-	atts[2] = EGL_GREEN_SIZE;
-	atts[3] = 8;
-	atts[4] = EGL_BLUE_SIZE;
-	atts[5] = 8;
-	atts[6] = EGL_ALPHA_SIZE;
-	atts[7] = (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? 8 : EGL_DONT_CARE;
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
-	atts[8] = EGL_DEPTH_SIZE;
-	atts[9] = opt ? atoi(opt) : 16;
-
-	atts[10] = EGL_STENCIL_SIZE;
-	atts[11] = EGL_DONT_CARE;
-	atts[12] = EGL_SURFACE_TYPE;
-	atts[13] = gctx->use_pbuffer ? EGL_PBUFFER_BIT : EGL_PIXMAP_BIT;
-	atts[14] = EGL_NONE;
-
-	eglGetConfigs(gctx->egldpy, NULL, 0, &n);
-	if (!eglChooseConfig(gctx->egldpy, atts, &gctx->eglconfig, 1, &n)) {
-		return GF_IO_ERR;
-	}
-
-	if (!gctx->use_pbuffer) {
-		gctx->surface = eglCreatePixmapSurface(gctx->egldpy, gctx->eglconfig, gctx->gl_bitmap, 0);
-	} else {
-		atts[0] = EGL_WIDTH;
-		atts[1] = width;
-		atts[2] = EGL_HEIGHT;
-		atts[3] = height;
-		atts[4] = EGL_NONE;
-
-		gctx->surface = eglCreatePbufferSurface(gctx->egldpy, gctx->eglconfig, atts);
-	}
-
-	if (!gctx->surface) {
-		return GF_IO_ERR;
-	}
-	gctx->eglctx = eglCreateContext(gctx->egldpy, gctx->eglconfig, NULL, NULL);
-	if (!gctx->eglctx) {
-		eglDestroySurface(gctx->egldpy, gctx->surface);
-		gctx->surface = 0L;
-		return GF_IO_ERR;
-	}
-	if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
-		eglDestroyContext(gctx->egldpy, gctx->eglctx);
-		gctx->eglctx = 0L;
-		eglDestroySurface(gctx->egldpy, gctx->surface);
-		gctx->surface = 0L;
-		return GF_IO_ERR;
-	}
-	return GF_OK;
-}
-
-#endif
-
-
-void GAPI_ReleaseObjects(GAPIPriv *ctx)
-{
-	ctx->raw_ptr = NULL;
-
-#ifdef GPAC_USE_GLES1X
-	if (ctx->output_3d_type) GAPI_ReleaseOGL_ES(ctx, GF_FALSE);
-	else
-#endif
-		if (ctx->bitmap) DeleteObject(ctx->bitmap);
-		else if (ctx->backbuffer) gf_free(ctx->backbuffer);
-	ctx->backbuffer = NULL;
-	ctx->bitmap = NULL;
-
-	if (ctx->hdcBitmap) {
-		if (ctx->old_bitmap) SelectObject(ctx->hdcBitmap, ctx->old_bitmap);
-		ctx->old_bitmap = NULL;
-		DeleteDC(ctx->hdcBitmap);
-		ctx->hdcBitmap = NULL;
-	}
-	if (ctx->hdc) ReleaseDC(NULL/*ctx->hWnd*/, ctx->hdc);
-	ctx->hdc = NULL;
-}
-
-GF_Err GAPI_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 noover)
-{
-	struct GXDisplayProperties gx = GXGetDisplayProperties();
-	RECT rc;
-	GAPICTX(dr);
-	gctx->hWnd = (HWND) os_handle;
-
-	/*get keys in both 2D and 3D modes*/
-	gctx->keys = GXGetDefaultKeys(GX_NORMALKEYS);
-
-#if 0
-	/*FIXME - not supported in rasterizer*/
-	if (gx.ffFormat & kfDirect444) {
-		gctx->pixel_format = GF_PIXEL_RGB_444;
-		gctx->BPP = 2;
-		gctx->bitsPP = 12;
-	}
-	else
-#endif
-		if (gx.ffFormat & kfDirect555) {
-			gctx->pixel_format = GF_PIXEL_RGB_555;
-			gctx->BPP = 2;
-			gctx->bits_per_pixel = 15;
-		}
-		else if (gx.ffFormat & kfDirect565) {
-			gctx->pixel_format = GF_PIXEL_RGB_565;
-			gctx->BPP = 2;
-			gctx->bits_per_pixel = 16;
-		}
-		else if (gx.ffFormat & kfDirect888) {
-			gctx->pixel_format = GF_PIXEL_RGB_24;
-			gctx->BPP = 3;
-			gctx->bits_per_pixel = 24;
-		} else {
-			return GF_NOT_SUPPORTED;
-		}
-
-	GAPI_SetupWindow(dr);
-	if (!gctx->hWnd) return GF_IO_ERR;
-
-	/*setup GX*/
-	if (!GXOpenDisplay(gctx->hWnd, 0L)) {
-		MessageBox(NULL, _T("Cannot open display"), _T("GAPI Error"), MB_OK);
-		return GF_IO_ERR;
-	}
-	GetClientRect(gctx->hWnd, &rc);
-	gctx->backup_w = rc.right - rc.left;
-	gctx->backup_h = rc.bottom - rc.top;
-
-	return GAPI_InitBackBuffer(dr, gctx->backup_w, gctx->backup_h);
-}
-
-static void GAPI_Shutdown(GF_VideoOutput *dr)
-{
-	GAPICTX(dr);
-
-	gf_mx_p(gctx->mx);
-	GAPI_ReleaseObjects(gctx);
-
-	GXCloseDisplay();
-	GAPI_ShutdownWindow(dr);
-	gf_mx_v(gctx->mx);
-}
-
-static GF_Err GAPI_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
-{
-	Bool is_wide_scene = (bOn==2) ? GF_TRUE : GF_FALSE;
-	GF_Err e;
-	GAPICTX(dr);
-
-	if (!gctx) return GF_BAD_PARAM;
-	if (is_wide_scene) bOn = GF_TRUE;
-	if (bOn == gctx->fullscreen) return GF_OK;
-
-#ifdef GPAC_USE_GLES1X
-	if (gctx->output_3d_type==1) {
-		gctx->fullscreen = bOn;
-		return GAPI_SetupOGL_ES(dr);
-	}
-#endif
-
-	gf_mx_p(gctx->mx);
-	GAPI_ReleaseObjects(gctx);
-	GXCloseDisplay();
-	e = GF_OK;
-	if (bOn) {
-		if (!GXOpenDisplay(GetParent(gctx->hWnd), 0L/*GX_FULLSCREEN*/)) {
-			GXOpenDisplay(gctx->hWnd, 0L);
-			gctx->fullscreen = GF_FALSE;
-			e = GF_IO_ERR;
-		} else {
-			gctx->fullscreen = GF_TRUE;
-		}
-	} else {
-		GXOpenDisplay(gctx->hWnd, 0L);
-		gctx->fullscreen = GF_FALSE;
-	}
-
-	landscape = GF_FALSE;
-	if (!e) {
-		if (gctx->fullscreen) {
-			gctx->backup_w = *outWidth;
-			gctx->backup_h = *outHeight;
-
-			if (is_wide_scene && (gctx->screen_w < gctx->screen_h)) landscape = GF_TRUE;
-			else if (!is_wide_scene && (gctx->screen_w > gctx->screen_h)) landscape = GF_TRUE;
-			else landscape = GF_FALSE;
-
-			if (landscape) {
-				gctx->fs_w = gctx->screen_h;
-				gctx->fs_h = gctx->screen_w;
-			} else {
-				gctx->fs_w = gctx->screen_w;
-				gctx->fs_h = gctx->screen_h;
-			}
-
-			*outWidth = gctx->fs_w;
-			*outHeight = gctx->fs_h;
-		} else {
-			*outWidth = gctx->backup_w;
-			*outHeight = gctx->backup_h;
-		}
-	}
-	gf_mx_v(gctx->mx);
-
-	return e;
-}
-
-GF_Err GAPI_ClearFS(GAPIPriv *gctx, unsigned char *ptr)
-{
-	gf_mx_p(gctx->mx);
-	memset(ptr, 0, sizeof(char) * gctx->screen_w*gctx->screen_h*gctx->BPP);
-	gf_mx_v(gctx->mx);
-	return GF_OK;
-}
-
-
-static GF_Err GAPI_FlipBackBuffer(GF_VideoOutput *dr)
-{
-	GF_VideoSurface src, dst;
-	unsigned char *ptr;
-	GAPICTX(dr);
-	if (!gctx || !gctx->gx_mode) return GF_BAD_PARAM;
-
-	/*get a pointer to video memory*/
-	if (gctx->gx_mode==1) {
-		ptr = (unsigned char *) GXBeginDraw();
-	} else {
-		ptr = (unsigned char *) gctx->raw_ptr;
-	}
-	if (!ptr) return GF_IO_ERR;
-
-	src.video_buffer = gctx->backbuffer;
-	src.width = gctx->bb_width;
-	src.height = gctx->bb_height;
-	src.pitch_x = gctx->BPP;
-	src.pitch_y = gctx->y_pitch;
-	src.pixel_format = gctx->pixel_format;
-	src.is_hardware_memory = GF_FALSE;
-
-
-	dst.width = gctx->dst_blt.w;
-	dst.height = gctx->dst_blt.h;
-	dst.pixel_format = gctx->pixel_format;
-	dst.is_hardware_memory = GF_TRUE;
-	dst.video_buffer = (char*)ptr;
-	dst.pitch_x = gctx->x_pitch;
-	dst.pitch_y = gctx->y_pitch;
-
-	if (gctx->fullscreen) {
-		if (gctx->erase_dest) {
-			gctx->erase_dest = GF_FALSE;
-			GAPI_ClearFS(gctx, ptr);
-		}
-	} else {
-		gctx->dst_blt.x += gctx->off_x;
-		gctx->dst_blt.y += gctx->off_y;
-	}
-
-	/*apply x/y offset*/
-	if (!gctx->fullscreen)
-		dst.video_buffer += gctx->dst_blt.x * gctx->x_pitch + gctx->y_pitch * gctx->dst_blt.y;
-
-	if (gctx->contiguous_mem) {
-		memcpy(dst.video_buffer, src.video_buffer, src.width*gctx->BPP*src.height );
-	} else if (landscape) {
-		u32 y, lsize = dst.height*gctx->x_pitch;
-		for (y=0; y<dst.width; y++) {
-			char *s = src.video_buffer + y*gctx->y_pitch;
-			char *d = dst.video_buffer + y*gctx->y_pitch;
-			memcpy(d, s, lsize);
-		}
-	} else {
-		u32 y, lsize = dst.width*gctx->x_pitch;
-		for (y=0; y<dst.height; y++) {
-			char *s = src.video_buffer + y*gctx->y_pitch;
-			char *d = dst.video_buffer + y*gctx->y_pitch;
-			memcpy(d, s, lsize);
-		}
-	}
-
-	if (gctx->gx_mode==1) GXEndDraw();
-	return GF_OK;
-}
-
-
-
-static GF_Err GAPI_Flush(GF_VideoOutput *dr, GF_Window *dest)
-{
-	GF_Err e;
-	GAPICTX(dr);
-
-	if (!gctx) return GF_BAD_PARAM;
-
-	gf_mx_p(gctx->mx);
-
-#ifdef GPAC_USE_GLES1X
-	if (gctx->output_3d_type==1) {
-#ifndef GLES_NO_PIXMAP
-		if (gctx->fullscreen && gctx->surface && gctx->egldpy) {
-#endif
-			if (gctx->erase_dest) {
-				InvalidateRect(gctx->hWnd, NULL, TRUE);
-				gctx->erase_dest = GF_FALSE;
-			}
-			eglSwapBuffers(gctx->egldpy, gctx->surface);
-#ifndef GLES_NO_PIXMAP
-		} else {
-			InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
-			gctx->erase_dest = GF_FALSE;
-		}
-#endif
-		gf_mx_v(gctx->mx);
-		return GF_OK;
-	}
-#endif
-	e = GF_OK;
-	if (gctx->backbuffer) {
-		if (dest) {
-			gctx->dst_blt = *dest;
-		} else {
-			assert(0);
-			gctx->dst_blt.x = gctx->dst_blt.y = 0;
-			gctx->dst_blt.w = gctx->bb_width;
-			gctx->dst_blt.h = gctx->bb_height;
-		}
-		if (gctx->gx_mode) {
-			if (!gctx->fullscreen && gctx->erase_dest) {
-				InvalidateRect(gctx->hWnd, NULL, TRUE);
-				gctx->erase_dest = GF_FALSE;
-			}
-			e = GAPI_FlipBackBuffer(dr);
-		} else {
-#ifndef DIRECT_BITBLT
-			InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
-#else
-//			BitBlt(gctx->hdc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
-			HDC dc = GetDC(NULL);
-			BitBlt(dc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
-			ReleaseDC(NULL, dc);
-#endif
-			gctx->erase_dest = GF_FALSE;
-		}
-	}
-	gf_mx_v(gctx->mx);
-	return e;
-}
-
-u32 get_sys_col(int idx)
-{
-	u32 res;
-	DWORD val = GetSysColor(idx);
-	res = (val)&0xFF;
-	res<<=8;
-	res |= (val>>8)&0xFF;
-	res<<=8;
-	res |= (val>>16)&0xFF;
-	return res;
-}
-
-static GF_Err GAPI_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
-{
-	GAPICTX(dr);
-	if (!evt) return GF_OK;
-	switch (evt->type) {
-	case GF_EVENT_SHOWHIDE:
-		if (gctx->hWnd) ShowWindow(gctx->hWnd, evt->show.show_type ? SW_SHOW : SW_HIDE);
-		break;
-	case GF_EVENT_SIZE:
-		/*nothing to do since we don't own the window*/
-		break;
-	case GF_EVENT_VIDEO_SETUP:
-		switch (evt->setup.opengl_mode) {
-		case 0:
-#ifdef GPAC_USE_GLES1X
-			gctx->output_3d_type = 0;
-#endif
-			return GAPI_InitBackBuffer(dr, evt->setup.width, evt->setup.height);
-#ifdef GPAC_USE_GLES1X
-		case 1:
-			gctx->output_3d_type = 1;
-			return GAPI_SetupOGL_ES(the_video_driver);
-		case 2:
-			gctx->output_3d_type = 2;
-			return GAPI_SetupOGL_ES_Offscreen(the_video_driver, evt->setup.width, evt->setup.height);
-#else
-		default:
-			return GF_NOT_SUPPORTED;
-#endif
-		}
-	case GF_EVENT_SYS_COLORS:
-		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
-		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);
-		evt->sys_cols.sys_colors[2] = get_sys_col(COLOR_APPWORKSPACE);
-		evt->sys_cols.sys_colors[3] = get_sys_col(COLOR_BACKGROUND);
-		evt->sys_cols.sys_colors[4] = get_sys_col(COLOR_BTNFACE);
-		evt->sys_cols.sys_colors[5] = get_sys_col(COLOR_BTNHIGHLIGHT);
-		evt->sys_cols.sys_colors[6] = get_sys_col(COLOR_BTNSHADOW);
-		evt->sys_cols.sys_colors[7] = get_sys_col(COLOR_BTNTEXT);
-		evt->sys_cols.sys_colors[8] = get_sys_col(COLOR_CAPTIONTEXT);
-		evt->sys_cols.sys_colors[9] = get_sys_col(COLOR_GRAYTEXT);
-		evt->sys_cols.sys_colors[10] = get_sys_col(COLOR_HIGHLIGHT);
-		evt->sys_cols.sys_colors[11] = get_sys_col(COLOR_HIGHLIGHTTEXT);
-		evt->sys_cols.sys_colors[12] = get_sys_col(COLOR_INACTIVEBORDER);
-		evt->sys_cols.sys_colors[13] = get_sys_col(COLOR_INACTIVECAPTION);
-		evt->sys_cols.sys_colors[14] = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
-		evt->sys_cols.sys_colors[15] = get_sys_col(COLOR_INFOBK);
-		evt->sys_cols.sys_colors[16] = get_sys_col(COLOR_INFOTEXT);
-		evt->sys_cols.sys_colors[17] = get_sys_col(COLOR_MENU);
-		evt->sys_cols.sys_colors[18] = get_sys_col(COLOR_MENUTEXT);
-		evt->sys_cols.sys_colors[19] = get_sys_col(COLOR_SCROLLBAR);
-		evt->sys_cols.sys_colors[20] = get_sys_col(COLOR_3DDKSHADOW);
-		evt->sys_cols.sys_colors[21] = get_sys_col(COLOR_3DFACE);
-		evt->sys_cols.sys_colors[22] = get_sys_col(COLOR_3DHIGHLIGHT);
-		evt->sys_cols.sys_colors[23] = get_sys_col(COLOR_3DLIGHT);
-		evt->sys_cols.sys_colors[24] = get_sys_col(COLOR_3DSHADOW);
-		evt->sys_cols.sys_colors[25] = get_sys_col(COLOR_WINDOW);
-		evt->sys_cols.sys_colors[26] = get_sys_col(COLOR_WINDOWFRAME);
-		evt->sys_cols.sys_colors[27] = get_sys_col(COLOR_WINDOWTEXT);
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-#if 1
-
-
-
-#define ESC_QUERYESCSUPPORT 8
-#define GETGXINFO			0x00020000
-
-typedef struct GXDeviceInfo
-{
-	long Version;           //00
-	void * pvFrameBuffer;   //04
-	unsigned long cbStride; //08
-	unsigned long cxWidth;  //0c
-	unsigned long cyHeight; //10
-	unsigned long cBPP;     //14
-	unsigned long ffFormat; //18
-	char Unused[0x84-7*4];
-} GXDeviceInfo;
-
-
-static Bool check_resolution_switch(GF_VideoOutput *dr, u32 width, u32 height)
-{
-	GAPICTX(dr);
-
-	gctx->sys_w = GetSystemMetrics(SM_CXSCREEN);
-	gctx->sys_h = GetSystemMetrics(SM_CYSCREEN);
-	gctx->scale_coords = GF_FALSE;
-	if (gctx->sys_w != width) gctx->scale_coords = GF_TRUE;
-	else if (gctx->sys_h != height) gctx->scale_coords = GF_TRUE;
-
-	if (gctx->scale_coords) {
-		gctx->off_x = gctx->off_x * width / gctx->sys_w;
-		gctx->off_y = gctx->off_y * height / gctx->sys_h;
-	}
-
-	HDC hdc = GetDC(gctx->hWnd);
-	dr->dpi_x = (u32) (width * 25.4 / GetDeviceCaps(hdc, HORZSIZE) );
-	dr->dpi_y = (u32) (height * 25.4 / GetDeviceCaps(hdc, VERTSIZE) );
-	ReleaseDC(gctx->hWnd, hdc);
-
-	if ((gctx->screen_w==width) && (gctx->screen_h==height)) return GF_FALSE;
-
-	GF_Event evt;
-	dr->max_screen_width = gctx->screen_w = width;
-	dr->max_screen_height = gctx->screen_h = height;
-	dr->max_screen_bpp = 8;//we don't filter for bpp less than 8
-
-	evt.type = GF_EVENT_RESOLUTION;
-	evt.size.width = dr->max_screen_width;
-	evt.size.height = dr->max_screen_height;
-	dr->on_event(the_video_driver->evt_cbk_hdl, &evt);
-
-	return GF_TRUE;
-}
-
-#ifndef GETRAWFRAMEBUFFER
-#define GETRAWFRAMEBUFFER   0x00020001
-typedef struct _RawFrameBufferInfo
-{
-	WORD wFormat;
-	WORD wBPP;
-	VOID *pFramePointer;
-	int	cxStride;
-	int	cyStride;
-	int cxPixels;
-	int cyPixels;
-} RawFrameBufferInfo;
-
-#define FORMAT_565 1
-#define FORMAT_555 2
-#define FORMAT_OTHER 3
-#endif
-
-static GF_Err gapi_get_raw_fb(GF_VideoOutput *dr)
-{
-	long tmp;
-	RawFrameBufferInfo Info;
-	GAPICTX(dr);
-	HDC DC = GetDC(NULL);
-	memset(&Info,0,sizeof(RawFrameBufferInfo));
-
-	ExtEscape(DC, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char*)&Info);
-	if (!Info.pFramePointer /* && QueryPlatform(PLATFORM_VER) >= 421*/ )
-	{
-		//try gxinfo
-		DWORD Code = GETGXINFO;
-		if (ExtEscape(DC, ESC_QUERYESCSUPPORT, sizeof(DWORD), (char*)&Code, 0, NULL) > 0)
-		{
-			DWORD DCWidth = GetDeviceCaps(DC,HORZRES);
-			DWORD DCHeight = GetDeviceCaps(DC,VERTRES);
-			GXDeviceInfo GXInfo;
-			memset(&GXInfo,0,sizeof(GXInfo));
-			GXInfo.Version = 100;
-			ExtEscape(DC, GETGXINFO, 0, NULL, sizeof(GXInfo), (char*)&GXInfo);
-
-			// avoid VGA devices (or QVGA smartphones emulating 176x220)
-			if (GXInfo.cbStride>0 && !(GXInfo.ffFormat & kfLandscape) &&
-			        ((DCWidth == GXInfo.cxWidth && DCHeight == GXInfo.cyHeight) ||
-			         (DCWidth == GXInfo.cyHeight && DCHeight == GXInfo.cxWidth)))
-			{
-				Bool Detect = GF_FALSE;
-				int* p = (int*)GXInfo.pvFrameBuffer;
-				COLORREF Old = GetPixel(DC,0,0);
-				*p ^= -1;
-				Detect = (Bool) ( GetPixel(DC,0,0) != Old );
-				*p ^= -1;
-
-				if (Detect)
-				{
-					Info.pFramePointer = GXInfo.pvFrameBuffer;
-					Info.cxPixels = GXInfo.cxWidth;
-					Info.cyPixels = GXInfo.cyHeight;
-					Info.cxStride = GXInfo.cBPP/8;
-					Info.cyStride = GXInfo.cbStride;
-					Info.wBPP = (WORD)GXInfo.cBPP;
-					Info.wFormat = (WORD)GXInfo.ffFormat;
-				}
-			}
-		}
-	}
-
-	ReleaseDC(NULL,DC);
-
-	if (!Info.pFramePointer) return GF_NOT_SUPPORTED;
-
-	gctx->x_pitch = Info.cxStride;
-	gctx->y_pitch = Info.cyStride;
-
-	if (abs(Info.cyStride) < abs(Info.cxStride))
-	{
-		if (abs(Info.cxStride)*8 < Info.cyPixels*Info.wBPP &&
-		        abs(Info.cxStride)*8 >= Info.cxPixels*Info.wBPP) { //swapped resolution
-			tmp = Info.cxPixels;
-			Info.cxPixels = Info.cyPixels;
-			Info.cyPixels = tmp;
-		}
-	}
-	else
-	{
-		if (abs(Info.cyStride)*8 < Info.cxPixels*Info.wBPP &&
-		        abs(Info.cyStride)*8 >= Info.cyPixels*Info.wBPP) {//swapped resolution
-			tmp = Info.cxPixels;
-			Info.cxPixels = Info.cyPixels;
-			Info.cyPixels = tmp;
-		}
-	}
-
-	gctx->raw_ptr = (unsigned char *)Info.pFramePointer;
-
-	if (Info.cxStride<0)
-		gctx->raw_ptr += (Info.cxStride * (Info.cxPixels-1));
-	if (Info.cyStride<0)
-		gctx->raw_ptr += (Info.cyStride * (Info.cyPixels-1));
-
-	if (check_resolution_switch(dr, Info.cxPixels, Info.cyPixels))
-		return GF_EOS;
-
-	return GF_OK;
-}
-
-#endif
-
-
-static GF_Err GAPI_InitBackBuffer(GF_VideoOutput *dr, u32 VideoWidth, u32 VideoHeight)
-{
-	u32 gx_mode;
-	GAPICTX(dr);
-
-	if (!gctx || !VideoWidth || !VideoHeight) return GF_BAD_PARAM;
-
-	gf_mx_p(gctx->mx);
-
-	GAPI_ReleaseObjects(gctx);
-
-	/*flip W&H in landscape mode*/
-	if (landscape) {
-		u32 t = VideoWidth;
-		VideoWidth = VideoHeight;
-		VideoHeight = t;
-	}
-
-	RECT rc;
-	GetWindowRect(gctx->hWnd, &rc);
-	gctx->off_x = rc.left;
-	gctx->off_y = rc.top;
-	gctx->erase_dest = GF_TRUE;
-
-	const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "GAPI", "FBAccess");
-	if (!opt || !strcmp(opt, "raw")) gx_mode = 2;
-	else if (opt && !strcmp(opt, "gx")) gx_mode = 1;
-	else gx_mode = 0;
-
-	if ((gx_mode != gctx->gx_mode) || !gctx->screen_w) {
-		struct GXDisplayProperties gx = GXGetDisplayProperties();
-
-		gctx->x_pitch = gx.cbxPitch;
-		gctx->y_pitch = gx.cbyPitch;
-
-		gctx->gx_mode = gx_mode;
-		if (gctx->gx_mode==2) {
-			if (gapi_get_raw_fb(dr) == GF_EOS) {
-				gf_mx_v(gctx->mx);
-				return GF_OK;
-			}
-		} else if (check_resolution_switch(dr, gx.cxWidth, gx.cyHeight)) {
-			gf_mx_v(gctx->mx);
-			return GF_OK;
-		}
-	}
-	if (gctx->gx_mode==2) {
-		GF_Err e = gapi_get_raw_fb(dr);
-		if (e) {
-			gf_mx_v(gctx->mx);
-			if (e==GF_EOS) return GF_OK;
-			else return e;
-		}
-	}
-
-
-	gctx->bb_size = VideoWidth * VideoHeight * gctx->BPP;
-	gctx->bb_width = VideoWidth;
-	gctx->bb_height = VideoHeight;
-	gctx->bb_pitch = VideoWidth * gctx->BPP;
-
-
-	if (gctx->gx_mode) {
-		gctx->backbuffer = (char *) gf_malloc(sizeof(unsigned char) * gctx->bb_size);
-
-		gctx->contiguous_mem = ((gctx->x_pitch==gctx->BPP) && (gctx->y_pitch==gctx->screen_w*gctx->BPP)) ? GF_TRUE : GF_FALSE;
-	} else {
-		createPixmap(gctx, 0);
-	}
-
-	gf_mx_v(gctx->mx);
-	return GF_OK;
-}
-
-
-static void GAPI_AdjustLandscape(GAPIPriv *gctx, GF_VideoSurface *dst, s32 x_pitch, s32 y_pitch)
-{
-	if (y_pitch>0) {
-#if 1
-		dst->pitch_x = -y_pitch;
-		/*start of frame-buffer is top-left corner*/
-		if (x_pitch>0) {
-			dst->video_buffer += dst->height * y_pitch;
-			dst->pitch_y = x_pitch;
-		}
-		/*start of frame-buffer is top-right corner*/
-		else {
-			dst->video_buffer += dst->height * y_pitch + dst->width * x_pitch;
-			dst->pitch_y = -x_pitch;
-		}
-#else
-		dst->pitch_x = y_pitch;
-		/*start of frame-buffer is top-left corner*/
-		if (x_pitch>0) {
-			dst->video_buffer += y_pitch - x_pitch;
-			dst->pitch_y = -x_pitch;
-		}
-		/*start of frame-buffer is top-right corner*/
-		else {
-			dst->video_buffer += dst->height * y_pitch + dst->width * x_pitch;
-			dst->pitch_y = -x_pitch;
-		}
-#endif
-	} else {
-		dst->pitch_x = y_pitch;
-		/*start of frame-buffer is bottom-left corner*/
-		if (x_pitch>0) {
-			dst->pitch_y = x_pitch;
-		}
-		/*start of frame-buffer is bottom-right corner*/
-		else {
-			dst->video_buffer += dst->width * x_pitch;
-			dst->pitch_y = x_pitch;
-		}
-	}
-	u32 t = dst->width;
-	dst->width = dst->height;
-	dst->height = t;
-}
-
-static GF_Err GAPI_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-{
-	GAPICTX(dr);
-
-	if (do_lock) {
-		if (!vi) return GF_BAD_PARAM;
-		memset(vi, 0, sizeof(GF_VideoSurface));
-		vi->width = gctx->bb_width;
-		vi->height = gctx->bb_height;
-		vi->video_buffer = gctx->backbuffer;
-		vi->pixel_format = gctx->pixel_format;
-		vi->is_hardware_memory = GF_FALSE;
-		vi->pitch_x = gctx->x_pitch;
-		vi->pitch_y = gctx->y_pitch;
-
-		if (landscape)
-			GAPI_AdjustLandscape(gctx, vi, gctx->x_pitch, gctx->y_pitch);
-	}
-	return GF_OK;
-}
-
-
-static void *NewGAPIVideoOutput()
-{
-	GAPIPriv *priv;
-	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-	memset(driv, 0, sizeof(GF_VideoOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "GAPI Video Output", "gpac distribution")
-
-	priv = (GAPIPriv *) gf_malloc(sizeof(GAPIPriv));
-	memset(priv, 0, sizeof(GAPIPriv));
-	priv->mx = gf_mx_new("GAPI");
-	driv->opaque = priv;
-
-#ifdef GPAC_USE_GLES1X
-	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-#endif
-	/*rgb, yuv to do*/
-
-	driv->Setup = GAPI_Setup;
-	driv->Shutdown = GAPI_Shutdown;
-	driv->Flush = GAPI_Flush;
-	driv->ProcessEvent = GAPI_ProcessEvent;
-	driv->Blit = NULL;
-	driv->LockBackBuffer = GAPI_LockBackBuffer;
-	driv->SetFullScreen = GAPI_SetFullScreen;
-	return (void *)driv;
-}
-
-static void DeleteVideoOutput(void *ifce)
-{
-	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-	GAPICTX(driv);
-	GAPI_Shutdown(driv);
-	gf_mx_del(gctx->mx);
-	gf_free(gctx);
-	gf_free(driv);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_VIDEO_OUTPUT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewGAPIVideoOutput();
-	return NULL;
-}
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	GF_VideoOutput *dd = (GF_VideoOutput *)ifce;
-	switch (dd->InterfaceType) {
-	case GF_VIDEO_OUTPUT_INTERFACE:
-		DeleteVideoOutput(dd);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( gapi )
-
-#ifdef __cplusplus
-}
-#endif
-

gpac-0.8.0.tar.gz/modules/gdip_raster Deleted

gpac-0.8.0.tar.gz/modules/gdip_raster/gdip_font.cpp Deleted

@@ -1,407 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / GDIplus rasterizer module
- *
- *  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 "gdip_priv.h"
-#include <gpac/utf.h>
-
-
-
-#ifndef GDIP_MAX_STRING_SIZE
-#define GDIP_MAX_STRING_SIZE	5000
-#endif
-
-
-GF_Err gdip_init_font_engine(GF_FontReader *dr)
-{
-	const char *sOpt;
-	FontPriv *ctx = (FontPriv *)dr->udta;
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
-	strcpy(ctx->font_serif, sOpt ? sOpt : "Times New Roman");
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
-	strcpy(ctx->font_sans, sOpt ? sOpt : "Arial");
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
-	strcpy(ctx->font_fixed, sOpt ? sOpt : "Courier New");
-
-	return GF_OK;
-}
-GF_Err gdip_shutdown_font_engine(GF_FontReader *dr)
-{
-	FontPriv *ctx = (FontPriv *)dr->udta;
-
-	if (ctx->font) GdipDeleteFontFamily(ctx->font);
-	ctx->font = NULL;
-
-	/*nothing to do*/
-	return GF_OK;
-}
-
-
-
-static GF_Err gdip_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;
-	char *utf8 = (char*) utf_string;
-	FontPriv *priv = (FontPriv*)dr->udta;
-
-	len = utf_string ? (u32) strlen(utf_string) : 0;
-	if (!len) {
-		*io_glyph_buffer_size = 0;
-		return GF_OK;
-	}
-	if (*io_glyph_buffer_size < len+1) {
-		*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;
-	if (utf8) return GF_IO_ERR;
-
-	/*perform bidi relayout*/
-	conv = (u16*) glyph_buffer;
-	*is_rtl = gf_utf8_reorder_bidi(conv, len);
-	/*move 16bit buffer to 32bit*/
-	for (i=len; i>0; i--) {
-		glyph_buffer[i-1] = (u32) conv[i-1];
-	}
-	*io_glyph_buffer_size = (u32) len;
-	return GF_OK;
-}
-
-
-static void adjust_white_space(const unsigned short *string, Float *width, Float whiteSpaceWidth)
-{
-	u32 len , i=0;
-	while (string[i] == (unsigned short) ' ') {
-		*width += whiteSpaceWidth;
-		i++;
-	}
-	if (whiteSpaceWidth<0) return;
-	len = (u32) gf_utf8_wcslen(string);
-	if (i != len) {
-		i = len - 1;
-		while (string[i] == (unsigned short) ' ') {
-			*width += whiteSpaceWidth;
-			i--;
-		}
-	}
-}
-
-static GF_Err gdip_get_text_size(GF_FontReader *dr, const unsigned short *string, Fixed *width, Fixed *height)
-{
-	GpPath *path_tmp;
-	GpStringFormat *fmt;
-	FontPriv *ctx = (FontPriv *)dr->udta;
-	*width = *height = 0;
-	if (!ctx->font) return GF_BAD_PARAM;
-
-	GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &fmt);
-	GdipCreatePath(FillModeAlternate, &path_tmp);
-	RectF rc;
-	rc.X = rc.Y = 0;
-	rc.Width = rc.Height = 0;
-	GdipAddPathString(path_tmp, (const WCHAR *)string, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
-
-	GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
-
-	adjust_white_space(string, &rc.Width, ctx->whitespace_width);
-	*width = FLT2FIX(rc.Width);
-	*height = FLT2FIX(rc.Height);
-
-	GdipDeleteStringFormat(fmt);
-	GdipDeletePath(path_tmp);
-
-	return GF_OK;
-}
-
-static GF_Err gdip_set_font(GF_FontReader *dr, const char *fontName, u32 styles)
-{
-	WCHAR wcFontName[GDIP_MAX_STRING_SIZE];
-	FontPriv *ctx = (FontPriv *)dr->udta;
-
-	if (ctx->font) GdipDeleteFontFamily(ctx->font);
-	ctx->font = NULL;
-
-	if (fontName && strlen(fontName) >= GDIP_MAX_STRING_SIZE) fontName = NULL;
-
-	if (!fontName || !strlen(fontName) ) fontName = ctx->font_serif;
-	else if (!stricmp(fontName, "SANS") || !stricmp(fontName, "sans-serif")) fontName = ctx->font_sans;
-	else if (!stricmp(fontName, "SERIF")) fontName = ctx->font_serif;
-	else if (!stricmp(fontName, "TYPEWRITER") || !stricmp(fontName, "monospace")) fontName = ctx->font_fixed;
-
-	MultiByteToWideChar(CP_ACP, 0, fontName, (u32)strlen(fontName)+1,
-	                    wcFontName, sizeof(wcFontName)/sizeof(wcFontName[0]) );
-
-
-	GdipCreateFontFamilyFromName(wcFontName, NULL, &ctx->font);
-	if (!ctx->font) return GF_NOT_SUPPORTED;
-
-	//setup styles
-	ctx->font_style = 0;
-	if (styles & GF_FONT_WEIGHT_BOLD ) ctx->font_style |= FontStyleBold;
-	if (styles & GF_FONT_ITALIC) ctx->font_style |= FontStyleItalic;
-
-	if (styles & GF_FONT_UNDERLINED) ctx->font_style |= FontStyleUnderline;
-	if (styles & GF_FONT_STRIKEOUT) ctx->font_style |= FontStyleStrikeout;
-	return GF_OK;
-}
-
-static GF_Err gdip_get_font_info(GF_FontReader *dr, char **font_name, u32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
-{
-	UINT16 val, em;
-	FontPriv *ctx = (FontPriv *)dr->udta;
-
-	*font_name = NULL;
-	*em_size = *ascent = *descent = *line_spacing = *max_advance_h = *max_advance_v = 0;
-	if (!ctx->font) return GF_BAD_PARAM;
-
-	GdipGetEmHeight(ctx->font, ctx->font_style, &em);
-	*em_size = (s32) em;
-	GdipGetCellAscent(ctx->font, ctx->font_style, &val);
-	ctx->ascent = (Float) val;
-	*ascent = (s32) val;
-	GdipGetCellDescent(ctx->font, ctx->font_style, &val);
-	*descent = (s32) val;
-	*descent *= -1;
-	ctx->descent = -1 * (Float) val;
-	*underline = *descent / 2;
-	GdipGetLineSpacing(ctx->font, ctx->font_style, &val);
-	*line_spacing = (s32) val;
-	*max_advance_v = *ascent - *descent;
-
-
-	unsigned short test_str[4];
-	Fixed w, h, w2;
-	ctx->em_size = (Float) *em_size;
-	test_str[0] = (unsigned short) '_';
-	test_str[1] = (unsigned short) '\0';
-	gdip_get_text_size(dr, test_str, &w, &h);
-	ctx->underscore_width = FIX2FLT(w);
-
-	test_str[0] = (unsigned short) '_';
-	test_str[1] = (unsigned short) ' ';
-	test_str[2] = (unsigned short) '_';
-	test_str[3] = (unsigned short) '\0';
-	gdip_get_text_size(dr, test_str, &w2, &h);
-	ctx->whitespace_width = FIX2FLT(w2 - 2*w);
-
-	*max_advance_h = (s32) MAX(ctx->underscore_width, ctx->whitespace_width);
-	return GF_OK;
-}
-
-
-
-static GF_Glyph *gdip_load_glyph(GF_FontReader *dr, u32 glyph_name)
-{
-	GF_Rect bounds;
-	GF_Glyph *glyph;
-	GpPath *path_tmp;
-	GpStringFormat *fmt;
-	GpMatrix *mat;
-	Float est_advance_h;
-	unsigned short str[4];
-	int i;
-	FontPriv *ctx = (FontPriv *)dr->udta;
-
-	if (!ctx->font) return NULL;
-
-	RectF rc;
-	rc.X = rc.Y = 0;
-	rc.Width = rc.Height = 0;
-
-	GdipCreateStringFormat(StringFormatFlagsNoWrap | StringFormatFlagsNoFitBlackBox | StringFormatFlagsMeasureTrailingSpaces, LANG_NEUTRAL, &fmt);
-	GdipSetStringFormatAlign(fmt, StringAlignmentNear);
-	GdipCreatePath(FillModeAlternate, &path_tmp);
-
-	if (glyph_name==0x20) {
-		est_advance_h = ctx->whitespace_width;
-	} else {
-		/*to compute first glyph alignment (say 'x', we figure out its bounding full box by using the '_' char as wrapper (eg, "_x_")
-		then the bounding box starting from xMin of the glyph ('x_'). The difference between both will give us a good approx
-		of the glyph alignment*/
-		str[0] = glyph_name;
-		str[1] = (unsigned short) '_';
-		str[2] = (unsigned short) 0;
-		GdipAddPathString(path_tmp, (const WCHAR *)str, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
-		GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
-		est_advance_h = rc.Width - ctx->underscore_width;
-	}
-
-	GdipResetPath(path_tmp);
-
-	str[0] = glyph_name;
-	str[1] = (unsigned short) 0;
-	rc.X = rc.Y = 0;
-	rc.Width = rc.Height = 0;
-	GdipAddPathString(path_tmp, (const WCHAR *)str, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
-
-	GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
-
-	/*flip so that we are in a font coordinate system - also move back the glyph to x=0 and y=baseline, GdiPlus doesn't do so*/
-	GdipCreateMatrix(&mat);
-	GdipTranslateMatrix(mat, - rc.X, -ctx->ascent, MatrixOrderAppend);
-	GdipScaleMatrix(mat, 1, -1, MatrixOrderAppend);
-	GdipTransformPath(path_tmp, mat);
-	GdipDeleteMatrix(mat);
-
-
-	/*start enum*/
-	s32 count;
-	GdipGetPointCount(path_tmp, &count);
-	GpPointF *pts = new GpPointF[count];
-	BYTE *types = new BYTE[count];
-	GdipGetPathTypes(path_tmp, types, count);
-	GdipGetPathPoints(path_tmp, pts, count);
-
-	GF_SAFEALLOC(glyph, GF_Glyph);
-	GF_SAFEALLOC(glyph->path, GF_Path);
-
-	for (i=0; i<count; ) {
-		BOOL closed = 0;
-		s32 sub_type;
-
-		sub_type = types[i] & PathPointTypePathTypeMask;
-
-		if (sub_type == PathPointTypeStart) {
-			gf_path_add_move_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y));
-			i++;
-		}
-		else if (sub_type == PathPointTypeLine) {
-			gf_path_add_line_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y));
-
-			if (types[i] & PathPointTypeCloseSubpath) gf_path_close(glyph->path);
-
-			i++;
-		}
-		else if (sub_type == PathPointTypeBezier) {
-			assert(i+2<=count);
-			gf_path_add_cubic_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y), FLT2FIX(pts[i+1].X), FLT2FIX(pts[i+1].Y), FLT2FIX(pts[i+2].X), FLT2FIX(pts[i+2].Y));
-
-			if (types[i+2] & PathPointTypeCloseSubpath) gf_path_close(glyph->path);
-
-			i += 3;
-		} else {
-			assert(0);
-			break;
-		}
-	}
-
-	delete [] pts;
-	delete [] types;
-	GdipDeleteStringFormat(fmt);
-	GdipDeletePath(path_tmp);
-
-	glyph->ID = glyph_name;
-	glyph->utf_name = glyph_name;
-	glyph->vert_advance = (s32) (ctx->ascent-ctx->descent);
-	glyph->horiz_advance = (s32) est_advance_h;
-	gf_path_get_bounds(glyph->path, &bounds);
-	glyph->width = FIX2INT(bounds.width);
-	glyph->height = FIX2INT(bounds.height);
-	return glyph;
-}
-
-
-
-
-GF_FontReader *gdip_new_font_driver()
-{
-	GdiplusStartupInput startupInput;
-	GF_FontReader *dr;
-	FontPriv *ctx;
-
-	SAFEALLOC(ctx, FontPriv);
-	SAFEALLOC(dr, GF_FontReader);
-	GdiplusStartup(&ctx->gdiToken, &startupInput, NULL);
-
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_FONT_READER_INTERFACE, "GDIplus Font Reader", "gpac distribution")
-	dr->init_font_engine = gdip_init_font_engine;
-	dr->shutdown_font_engine = gdip_shutdown_font_engine;
-	dr->set_font = gdip_set_font;
-	dr->get_font_info = gdip_get_font_info;
-	dr->get_glyphs = gdip_get_glyphs;
-	dr->load_glyph = gdip_load_glyph;
-
-	dr->udta = ctx;
-	return dr;
-}
-
-void gdip_delete_font_driver(GF_FontReader *dr)
-{
-	FontPriv *ctx = (FontPriv *)dr->udta;
-	GdiplusShutdown(ctx->gdiToken);
-
-	if (ctx->font) GdipDeleteFontFamily(ctx->font);
-	ctx->font = NULL;
-
-	gf_free(dr->udta);
-	gf_free(dr);
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_FONT_READER_INTERFACE,
-		GF_RASTER_2D_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType==GF_FONT_READER_INTERFACE) return (GF_BaseInterface *)gdip_new_font_driver();
-	if (InterfaceType==GF_RASTER_2D_INTERFACE) return (GF_BaseInterface *)gdip_LoadRenderer();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_FONT_READER_INTERFACE:
-		gdip_delete_font_driver((GF_FontReader *)ifce);
-		break;
-	case GF_RASTER_2D_INTERFACE:
-		gdip_ShutdownRenderer((GF_Raster2D *)ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( gdiplus )
-
-#ifdef __cplusplus
-}
-#endif

gpac-0.8.0.tar.gz/modules/gdip_raster/gdip_rend.cpp Deleted

@@ -1,499 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / GDIplus rasterizer module
- *
- *  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 <windows.h>
-#include "gdip_priv.h"
-
-/*all GDIPLUS includes for C api*/
-
-struct IDirectDrawSurface7;
-
-#include "GdiplusMem.h"
-#include "GdiplusEnums.h"
-#include "GdiplusTypes.h"
-#include "GdiplusInit.h"
-#include "GdiplusPixelFormats.h"
-#include "GdiplusColor.h"
-#include "GdiplusMetaHeader.h"
-#include "GdiplusImaging.h"
-#include "GdiplusColorMatrix.h"
-#include "GdiplusGpStubs.h"
-#include "GdiplusColor.h"
-#include "GdiplusFlat.h"
-
-struct _graphics
-{
-	GpGraphics *graph;
-	GpMatrix *mat;
-	GpPath *clip;
-	GpPath *current;
-	u32 w, h;
-	Bool center_coords;
-
-	/*offscreen buffer handling*/
-	GpBitmap *pBitmap;
-};
-
-GpPath *gdip_create_path(GF_Path *_this)
-{
-	GpPath *p;
-	u32 j, i, nb_pts, cur;
-	if (!_this || !_this->n_points) return NULL;
-	GdipCreatePath(FillModeAlternate, &p);
-
-	GdipSetPathFillMode(p, (_this->flags & GF_PATH_FILL_ZERO_NONZERO) ? FillModeWinding : FillModeAlternate);
-
-	cur = 0;
-	for (i=0; i<_this->n_contours; i++) {
-		nb_pts = 1+_this->contours[i] - cur;
-		GdipStartPathFigure(p);
-		for (j=cur+1; j<cur+nb_pts; ) {
-			switch (_this->tags[j]) {
-			case GF_PATH_CURVE_ON:
-				GdipAddPathLine(p, FIX2FLT(_this->points[j-1].x), FIX2FLT(_this->points[j-1].y), FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y));
-				j++;
-				break;
-			case GF_PATH_CLOSE:
-				GdipAddPathLine(p, FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y), FIX2FLT(_this->points[cur].x), FIX2FLT(_this->points[cur].y));
-				j++;
-				break;
-			case GF_PATH_CURVE_CUBIC:
-				GdipAddPathBezier(p,
-				                  FIX2FLT(_this->points[j-1].x), FIX2FLT(_this->points[j-1].y),
-				                  FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y),
-				                  FIX2FLT(_this->points[j+1].x), FIX2FLT(_this->points[j+1].y),
-				                  FIX2FLT(_this->points[j+2].x), FIX2FLT(_this->points[j+2].y)
-				                 );
-				j+=3;
-				break;
-			case GF_PATH_CURVE_CONIC:
-			{
-				GF_Point2D ctl, end, c1, c2, start;
-				start = _this->points[j-1];
-				ctl = _this->points[j];
-				end = _this->points[j+1];
-				c1.x = start.x + 2*(ctl.x - start.x) / 3;
-				c1.y = start.y + 2*(ctl.y - start.y) / 3;
-				c2.x = c1.x + (end.x - start.x) / 3;
-				c2.y = c1.y + (end.y - start.y) / 3;
-				GdipAddPathBezier(p,
-				                  FIX2FLT(start.x), FIX2FLT(start.y),
-				                  FIX2FLT(c1.x), FIX2FLT(c1.y),
-				                  FIX2FLT(c2.x), FIX2FLT(c2.y),
-				                  FIX2FLT(end.x), FIX2FLT(end.y)
-				                 );
-				j+=2;
-			}
-			break;
-			}
-		}
-		GdipClosePathFigure(p);
-		cur += nb_pts;
-	}
-	return p;
-}
-
-#define GPGRAPH() struct _graphics *_graph = (struct _graphics *)_this;
-
-static
-GF_SURFACE gdip_new_surface(GF_Raster2D *, Bool center_coords)
-{
-	struct _graphics *graph;
-	SAFEALLOC(graph, struct _graphics);
-	graph->center_coords = center_coords;
-	return graph;
-}
-
-static
-void gdip_delete_surface(GF_SURFACE _this)
-{
-	GPGRAPH();
-	gf_free(_graph);
-}
-
-/*should give the best results with the clippers*/
-#define GDIP_PIXEL_MODE PixelOffsetModeHighQuality
-
-static
-GF_Err gdip_attach_surface_to_device(GF_SURFACE _this, void *os_handle, u32 width, u32 height)
-{
-	GpMatrix *mat;
-	HDC handle = (HDC) os_handle;
-	GPGRAPH();
-	if (!_graph || !handle) return GF_BAD_PARAM;
-	if (_graph->graph) return GF_BAD_PARAM;
-	GdipCreateFromHDC(handle, &_graph->graph);
-
-	GdipCreateMatrix(&mat);
-	if (	_graph->center_coords) {
-		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
-		GdipTranslateMatrix(mat, (Float) width/2, (Float) height/2, MatrixOrderAppend);
-	}
-	GdipSetWorldTransform(_graph->graph, mat);
-	GdipDeleteMatrix(mat);
-	_graph->w = width;
-	_graph->h = height;
-	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
-	return GF_OK;
-}
-static
-GF_Err gdip_attach_surface_to_texture(GF_SURFACE _this, GF_STENCIL sten)
-{
-	GpMatrix *mat;
-	struct _stencil *_sten = (struct _stencil *)sten;
-	GPGRAPH();
-	if (!_graph || !_sten || !_sten->pBitmap) return GF_BAD_PARAM;
-
-	GdipGetImageGraphicsContext(_sten->pBitmap, &_graph->graph);
-
-	if (_graph->center_coords) {
-		GdipCreateMatrix(&mat);
-		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
-		GdipTranslateMatrix(mat, (Float) _sten->width/2, (Float) _sten->height/2, MatrixOrderAppend);
-		GdipSetWorldTransform(_graph->graph, mat);
-		GdipDeleteMatrix(mat);
-	}
-	_graph->w = _sten->width;
-	_graph->h = _sten->height;
-	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
-	return GF_OK;
-}
-static
-GF_Err gdip_attach_surface_to_buffer(GF_SURFACE _this, char *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
-{
-	GpMatrix *mat;
-	u32 pFormat;
-	GPGRAPH();
-
-	if (pitch_y%4) return GF_NOT_SUPPORTED;
-
-	switch (pixelFormat) {
-	case GF_PIXEL_ALPHAGREY:
-		pFormat = PixelFormat16bppGrayScale;
-		if (pitch_x != 2) return GF_NOT_SUPPORTED;
-		break;
-	case GF_PIXEL_RGB_555:
-		pFormat = PixelFormat16bppRGB555;
-		if (pitch_x != 2) return GF_NOT_SUPPORTED;
-		break;
-	case GF_PIXEL_RGB_565:
-		pFormat = PixelFormat16bppRGB565;
-		if (pitch_x != 2) return GF_NOT_SUPPORTED;
-		break;
-	case GF_PIXEL_RGB_24:
-		pFormat = PixelFormat24bppRGB;
-		if (pitch_x != 3) return GF_NOT_SUPPORTED;
-		break;
-	case GF_PIXEL_RGB_32:
-		pFormat = PixelFormat32bppRGB;
-		if (pitch_x != 4) return GF_NOT_SUPPORTED;
-		break;
-	case GF_PIXEL_ARGB:
-		pFormat = PixelFormat32bppARGB;
-		if (pitch_x != 4) return GF_NOT_SUPPORTED;
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-	GdipCreateBitmapFromScan0(width, height, pitch_y, pFormat, (unsigned char*)pixels, &_graph->pBitmap);
-	GdipGetImageGraphicsContext(_graph->pBitmap, &_graph->graph);
-
-	_graph->w = width;
-	_graph->h = height;
-	if (_graph->center_coords) {
-		GdipCreateMatrix(&mat);
-		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
-		GdipTranslateMatrix(mat, (Float) width/2, (Float) height/2, MatrixOrderAppend);
-		GdipSetWorldTransform(_graph->graph, mat);
-		GdipDeleteMatrix(mat);
-	}
-	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
-	return GF_OK;
-}
-
-static
-void gdip_detach_surface(GF_SURFACE _this)
-{
-	GPGRAPH();
-	if (_graph->graph) GdipDeleteGraphics(_graph->graph);
-	_graph->graph = NULL;
-	if (_graph->clip) GdipDeletePath(_graph->clip);
-	_graph->clip = NULL;
-	if (_graph->pBitmap) GdipDisposeImage(_graph->pBitmap);
-	_graph->pBitmap = NULL;
-	if (_graph->current) GdipDeletePath(_graph->current);
-	_graph->current = NULL;
-}
-
-
-static
-GF_Err gdip_surface_set_raster_level(GF_SURFACE _this, GF_RasterLevel RasterSetting)
-{
-	GPGRAPH();
-	switch (RasterSetting) {
-	case GF_RASTER_HIGH_SPEED:
-		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighSpeed);
-		GdipSetCompositingQuality(_graph->graph, CompositingQualityHighSpeed);
-		break;
-	case GF_RASTER_MID:
-		GdipSetSmoothingMode(_graph->graph, SmoothingModeDefault);
-		GdipSetCompositingQuality(_graph->graph, CompositingQualityDefault);
-		break;
-	case GF_RASTER_HIGH_QUALITY:
-		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighQuality);
-		GdipSetCompositingQuality(_graph->graph, CompositingQualityDefault);
-		/*THIS IS HORRIBLY SLOW DON'T EVEN THINK ABOUT IT*/
-		/*GdipSetCompositingQuality(_graph->graph, CompositingQualityHighQuality);*/
-		break;
-	}
-	return GF_OK;
-}
-static
-GF_Err gdip_surface_set_matrix(GF_SURFACE _this, GF_Matrix2D * mat)
-{
-	GPGRAPH();
-	if (_graph->mat) GdipDeleteMatrix(_graph->mat);
-
-	_graph->mat = mat_gpac_to_gdip(mat);
-	return GF_OK;
-}
-static
-GF_Err gdip_surface_set_clipper(GF_SURFACE _this, GF_IRect *rc)
-{
-	GPGRAPH();
-	if (_graph->clip) GdipDeletePath(_graph->clip);
-	_graph->clip = 0L;
-	if (!rc) return GF_OK;
-
-	GdipCreatePath(FillModeAlternate, &_graph->clip);
-	GdipAddPathRectangleI(_graph->clip, rc->x, rc->y - rc->height, rc->width, rc->height);
-	return GF_OK;
-}
-
-static
-GpBrush *gdip_get_brush(struct _stencil *_sten)
-{
-	if (_sten->pSolid) return _sten->pSolid;
-	if (_sten->pLinear) return _sten->pLinear;
-	if (_sten->pRadial) return _sten->pRadial;
-	if (_sten->pTexture) return _sten->pTexture;
-	return NULL;
-}
-
-static GpPath *gdip_setup_path(struct _graphics *_this, GF_Path *path)
-{
-	GpPath *tr = gdip_create_path(path);
-	/*append current matrix*/
-	if (_this->mat) GdipTransformPath(tr, _this->mat);
-	return tr;
-}
-
-static
-GF_Err gdip_surface_set_path(GF_SURFACE _this, GF_Path *path)
-{
-	struct _storepath *_path;
-	GPGRAPH();
-	if (!_graph) return GF_BAD_PARAM;
-	if (_graph->current) GdipDeletePath(_graph->current);
-	_graph->current = NULL;
-	if (!path) return GF_OK;
-
-	_path = (struct _storepath *)path;
-	_graph->current = gdip_setup_path(_graph, path);
-	return GF_OK;
-}
-
-//#define NODRAW
-
-static
-GF_Err gdip_surface_fill(GF_SURFACE _this, GF_STENCIL stencil)
-{
-	GpStatus ret;
-	GpMatrix *newmat;
-	struct _stencil *_sten;
-	GPGRAPH();
-	if (!_this) return GF_BAD_PARAM;
-	if (!_graph->current) return GF_OK;
-	_sten = (struct _stencil *)stencil;
-	assert(_sten);
-
-#ifdef NODRAW
-	return GF_OK;
-#endif
-
-
-	if (_graph->clip) GdipSetClipPath(_graph->graph, _graph->clip, CombineModeReplace);
-
-	switch (_sten->type) {
-	case GF_STENCIL_SOLID:
-		assert(_sten->pSolid);
-		GdipFillPath(_graph->graph, _sten->pSolid, _graph->current);
-		break;
-	case GF_STENCIL_LINEAR_GRADIENT:
-		if (_sten->pMat) {
-			/*rebuild gradient*/
-			gdip_recompute_line_gradient(_sten);
-
-			GdipResetTextureTransform((GpTexture*)_sten->pLinear);
-			if (_sten->pMat) {
-				GdipCloneMatrix(_sten->pMat, &newmat);
-			} else {
-				GdipCreateMatrix(&newmat);
-			}
-			GdipMultiplyMatrix(newmat, _sten->pLinearMat, MatrixOrderPrepend);
-			GdipSetTextureTransform((GpTexture*)_sten->pLinear, newmat);
-			GdipDeleteMatrix(newmat);
-		}
-		GdipFillPath(_graph->graph, _sten->pLinear, _graph->current);
-		break;
-	case GF_STENCIL_RADIAL_GRADIENT:
-		/*build gradient*/
-		gdip_recompute_radial_gradient(_sten);
-
-		GdipSetCompositingQuality(_graph->graph, CompositingQualityHighSpeed);
-		GdipSetInterpolationMode(_graph->graph, InterpolationModeLowQuality);
-		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighSpeed);
-
-		/*check if we need to draw solid background (GDIplus doesn't implement padded mode on path gradients)*/
-		if (_sten->pSolid) {
-			GpPath *tr;
-			GdipClonePath(_sten->circle, &tr);
-			GdipTransformPath(tr, _sten->pMat);
-			GdipSetClipPath(_graph->graph, tr, CombineModeExclude);
-			GdipFillPath(_graph->graph, _sten->pSolid, _graph->current);
-			GdipDeletePath(tr);
-			GdipResetClip(_graph->graph);
-			if (_graph->clip) GdipSetClipPath(_graph->graph, _graph->clip, CombineModeReplace);
-		}
-		GdipFillPath(_graph->graph, _sten->pRadial, _graph->current);
-		break;
-	case GF_STENCIL_VERTEX_GRADIENT:
-		assert(_sten->pRadial);
-		if (_sten->pMat) GdipSetTextureTransform((GpTexture*)_sten->pRadial, _sten->pMat);
-		ret = GdipFillPath(_graph->graph, _sten->pRadial, _graph->current);
-		break;
-	case GF_STENCIL_TEXTURE:
-		gdip_load_texture(_sten);
-		if (_sten->pTexture) {
-			GpMatrix *newmat;
-			GdipResetTextureTransform((GpTexture*)_sten->pTexture);
-			if (_sten->pMat) {
-				GdipCloneMatrix(_sten->pMat, &newmat);
-			} else {
-				GdipCreateMatrix(&newmat);
-			}
-			/*gdip flip*/
-			if (_graph->center_coords && !(_sten->tiling&GF_TEXTURE_FLIP) )
-				GdipScaleMatrix(newmat, 1, -1, MatrixOrderPrepend);
-			else if (!_graph->center_coords && (_sten->tiling&GF_TEXTURE_FLIP) )
-				GdipScaleMatrix(newmat, 1, -1, MatrixOrderPrepend);
-
-			GdipSetTextureTransform((GpTexture*)_sten->pTexture, newmat);
-			GdipDeleteMatrix(newmat);
-
-			GdipSetInterpolationMode(_graph->graph, (_sten->tFilter==GF_TEXTURE_FILTER_HIGH_QUALITY) ? InterpolationModeHighQuality : InterpolationModeLowQuality);
-			GdipFillPath(_graph->graph, _sten->pTexture, _graph->current);
-		}
-		break;
-	}
-	return GF_OK;
-}
-
-
-static
-GF_Err gdip_surface_flush(GF_SURFACE _this)
-{
-	GPGRAPH();
-	GdipFlush(_graph->graph, FlushIntentionSync);
-	return GF_OK;
-}
-
-static
-GF_Err gdip_surface_clear(GF_SURFACE _this, GF_IRect *rc, u32 color)
-{
-	GpPath *path;
-	GPGRAPH();
-
-	GdipCreatePath(FillModeAlternate, &path);
-	if (rc) {
-		/*luckily enough this maps well for both flipped and unflipped coords*/
-		GdipAddPathRectangleI(path, rc->x, rc->y - rc->height, rc->width, rc->height);
-	} else {
-		/*		if (_graph->center_coords) {
-					GdipAddPathRectangleI(path, -1 * (s32)_graph->w / 2, -1 * (s32)_graph->h / 2, _graph->w, _graph->h);
-				} else {
-		*/			GdipAddPathRectangleI(path, 0, 0, _graph->w, _graph->h);
-//		}
-	}
-	/*we MUST use clear otherwise ARGB surfaces are not cleared correctly*/
-	GdipSetClipPath(_graph->graph, path, CombineModeReplace);
-	GdipGraphicsClear(_graph->graph, color);
-	GdipDeletePath(path);
-	return GF_OK;
-}
-
-void gdip_init_driver_surface(GF_Raster2D *driver)
-{
-	driver->surface_new = gdip_new_surface;
-	driver->surface_delete = gdip_delete_surface;
-	driver->surface_attach_to_device = gdip_attach_surface_to_device;
-	driver->surface_attach_to_texture = gdip_attach_surface_to_texture;
-	driver->surface_attach_to_buffer = gdip_attach_surface_to_buffer;
-	driver->surface_detach = gdip_detach_surface;
-	driver->surface_set_raster_level = gdip_surface_set_raster_level;
-	driver->surface_set_matrix = gdip_surface_set_matrix;
-	driver->surface_set_clipper = gdip_surface_set_clipper;
-	driver->surface_set_path = gdip_surface_set_path;
-	driver->surface_fill = gdip_surface_fill;
-	driver->surface_flush = gdip_surface_flush;
-	driver->surface_clear = gdip_surface_clear;
-}
-
-
-GF_Raster2D *gdip_LoadRenderer()
-{
-	GdiplusStartupInput startupInput;
-	GF_Raster2D *driver;
-	struct _gdip_context *ctx;
-	SAFEALLOC(ctx, struct _gdip_context);
-	SAFEALLOC(driver, GF_Raster2D);
-	GdiplusStartup(&ctx->gdiToken, &startupInput, NULL);
-	driver->internal = ctx;
-	GF_REGISTER_MODULE_INTERFACE(driver, GF_RASTER_2D_INTERFACE, "GDIplus 2D Raster", "gpac distribution")
-	gdip_init_driver_texture(driver);
-	gdip_init_driver_surface(driver);
-	gdip_init_driver_grad(driver);
-	return driver;
-}
-
-void gdip_ShutdownRenderer(GF_Raster2D *driver)
-{
-	struct _gdip_context *ctx = (struct _gdip_context *)driver->internal;
-
-	GdiplusShutdown(ctx->gdiToken);
-	gf_free(ctx);
-	gf_free(driver);
-}

gpac-0.8.0.tar.gz/modules/gdip_raster/gdip_texture.cpp Deleted

@@ -1,442 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / GDIplus rasterizer module
- *
- *  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 "gdip_priv.h"
-
-#define COL_565(c) GF_COL_ARGB(0xFF, (u8) ( (val >> 7) & 0xf8), (u8) ( (val >> 2) & 0xf8), (u8) ( (val << 3) & 0xf8) )
-#define COL_555(c) GF_COL_ARGB(0xFF,  (u8) ( (val >> 8) & 0xf8), (u8) ( (val >> 3) & 0xfc),  (u8) ( (val << 3) & 0xf8)	)
-
-static
-GF_Err gdip_set_texture(GF_STENCIL _this, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy)
-{
-	char *ptr;
-	Bool is_yuv;
-	u32 pFormat, isBGR, BPP, i, j, col;
-	unsigned char a, r, g, b;
-	unsigned short val;
-	Bool copy;
-	GPSTEN();
-	CHECK_RET(GF_STENCIL_TEXTURE);
-
-	gdip_cmat_reset(&_sten->cmat);
-	isBGR = 0;
-	BPP = 4;
-	copy = GF_FALSE;
-	is_yuv = GF_FALSE;
-	/*is pixel format supported ?*/
-	switch (pixelFormat) {
-	case GF_PIXEL_GREYSCALE:
-		pFormat = PixelFormat24bppRGB;
-		BPP = 1;
-		/*no support for 8bit greyscale not indexed in GDIPlus ...*/
-		copy = GF_TRUE;
-		break;
-	case GF_PIXEL_ALPHAGREY:
-		pFormat = PixelFormat32bppARGB;
-		BPP = 2;
-		/*cannot get it to work without using 32bpp argb*/
-		copy = GF_TRUE;
-		break;
-	case GF_PIXEL_RGB_555:
-		pFormat = PixelFormat16bppRGB555;
-		BPP = 2;
-		break;
-	case GF_PIXEL_RGB_565:
-		pFormat = PixelFormat16bppRGB565;
-		BPP = 2;
-		break;
-	case GF_PIXEL_RGB_24:
-		pFormat = PixelFormat24bppRGB;
-		BPP = 3;
-		/*one day I'll hope to understand how color management works with GDIplus bitmaps...*/
-		isBGR = 1;
-//		copy = 1;
-		break;
-	case GF_PIXEL_BGR_24:
-		pFormat = PixelFormat24bppRGB;
-		BPP = 3;
-		break;
-	case GF_PIXEL_RGB_32:
-		pFormat = PixelFormat32bppRGB;
-		BPP = 4;
-		break;
-	case GF_PIXEL_ARGB:
-		pFormat = PixelFormat32bppARGB;
-		BPP = 4;
-		break;
-	case GF_PIXEL_RGBA:
-		pFormat = PixelFormat32bppARGB;
-		BPP = 4;
-		copy = GF_TRUE;
-		_sten->orig_buf = (unsigned char *) pixels;
-		break;
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_IYUV:
-	case GF_PIXEL_I420:
-		if ( (width*3)%4) return GF_NOT_SUPPORTED;
-		_sten->orig_format = GF_PIXEL_YV12;
-		is_yuv = GF_TRUE;
-		break;
-	case GF_PIXEL_YUVA:
-		_sten->orig_format = GF_PIXEL_YUVA;
-		is_yuv = GF_TRUE;
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-
-	if (_sten->pBitmap) GdipDisposeImage(_sten->pBitmap);
-	_sten->pBitmap = NULL;
-	_sten->width = width;
-	_sten->height = height;
-	_sten->destination_format = destination_format_hint;
-	if (is_yuv) {
-		_sten->orig_buf = (unsigned char*)pixels;
-		_sten->orig_stride = stride;
-		_sten->is_converted = GF_FALSE;
-		return GF_OK;
-	}
-
-	_sten->is_converted = GF_TRUE;
-	_sten->format = pFormat;
-
-	/*GDIplus limitation : horiz_stride shall be multiple of 4 and no support for pure grayscale without palette*/
-	if (!copy && pixels && !(stride%4)) {
-		if (no_copy && isBGR) return GF_NOT_SUPPORTED;
-		GdipCreateBitmapFromScan0(_sten->width, _sten->height, stride, pFormat, (unsigned char*)pixels, &_sten->pBitmap);
-		_sten->invert_br = isBGR ? GF_TRUE : GF_FALSE;
-	}
-	/*all other cases: create a local bitmap in desired format*/
-	else {
-		if (no_copy) return GF_NOT_SUPPORTED;
-		GdipCreateBitmapFromScan0(_sten->width, _sten->height, 0, pFormat, NULL, &_sten->pBitmap);
-		ptr = pixels;
-		for (j=0; j<_sten->height; j++) {
-			for (i=0; i<_sten->width; i++) {
-				switch (pixelFormat) {
-				case GF_PIXEL_GREYSCALE:
-					r = *ptr++;
-					col = GF_COL_ARGB(255, r, r, r);
-					break;
-				case GF_PIXEL_ALPHAGREY:
-					r = *ptr++;
-					a = *ptr++;
-					col = GF_COL_ARGB(a, r, r, r);
-					break;
-				case GF_PIXEL_RGB_555:
-					val = * (unsigned short *) (ptr);
-					ptr+= 2;
-					col = COL_555(val);
-					break;
-				case GF_PIXEL_RGB_565:
-					val = * (unsigned short *) (ptr);
-					ptr+= 2;
-					col = COL_565(val);
-					break;
-				/*scan0 uses bgr...*/
-				case GF_PIXEL_BGR_24:
-				case GF_PIXEL_RGB_24:
-					r = *ptr++;
-					g = *ptr++;
-					b = *ptr++;
-					if (!isBGR) {
-						col = GF_COL_ARGB(255, b, g, r);
-					} else {
-						col = GF_COL_ARGB(255, r, g, b);
-					}
-					break;
-				/*NOTE: we assume little-endian only for GDIplus platforms, so BGRA/BGRX*/
-				case GF_PIXEL_RGB_32:
-				case GF_PIXEL_ARGB:
-					b = *ptr++;
-					g = *ptr++;
-					r = *ptr++;
-					a = *ptr++;
-					if (pixelFormat==GF_PIXEL_RGB_32) a = 0xFF;
-					col = GF_COL_ARGB(a, r, g, b);
-					break;
-				case GF_PIXEL_RGBA:
-					r = *ptr++;
-					g = *ptr++;
-					b = *ptr++;
-					a = *ptr++;
-					col = GF_COL_ARGB(a, r, g, b);
-					break;
-				default:
-					col = GF_COL_ARGB(255, 255, 255, 255);
-					break;
-				}
-				GdipBitmapSetPixel(_sten->pBitmap, i, j, col);
-			}
-		}
-	}
-
-	return GF_OK;
-}
-
-static
-GF_Err gdip_set_texture_repeat_mode(GF_STENCIL _this, GF_TextureTiling mode)
-{
-	GPSTEN();
-	_sten->tiling = mode;
-	return GF_OK;
-}
-
-static
-GF_Err gdip_set_sr_texture_filter(GF_STENCIL _this, GF_TextureFilter filter_mode)
-{
-	GPSTEN();
-	CHECK_RET(GF_STENCIL_TEXTURE);
-	_sten->tFilter = filter_mode;
-	return GF_OK;
-}
-
-
-static
-GF_Err gdip_set_color_matrix(GF_STENCIL _this, GF_ColorMatrix *cmat)
-{
-	GPSTEN();
-	if (!cmat || cmat->identity) {
-		_sten->texture_invalid = _sten->has_cmat;
-		_sten->has_cmat = GF_FALSE;
-	} else {
-		if (_sten->invert_br) {
-			GF_ColorMatrix fin, rev;
-			memcpy(&fin, cmat, sizeof(GF_ColorMatrix));
-			memset(&rev, 0, sizeof(GF_ColorMatrix));
-			rev.m[0] = 0;
-			rev.m[2] = 1;
-			rev.m[10] = 1;
-			rev.m[12] = 0;
-			rev.m[6] = rev.m[18] = 1;
-			gf_cmx_multiply(&fin, &rev);
-			cmat_gpac_to_gdip(&fin, &_sten->cmat);
-		} else {
-			cmat_gpac_to_gdip(cmat, &_sten->cmat);
-		}
-		_sten->has_cmat = GF_TRUE;
-	}
-	_sten->texture_invalid = GF_TRUE;
-	return GF_OK;
-}
-
-static
-GF_Err gdip_set_alpha(GF_STENCIL _this, u8 alpha)
-{
-	GPSTEN();
-	if (_sten->alpha != alpha) {
-		_sten->alpha = alpha;
-		_sten->texture_invalid = GF_TRUE;
-	}
-	return GF_OK;
-}
-
-void gdip_convert_texture(struct _stencil *sten);
-
-static
-GF_Err gdip_get_pixel(GF_STENCIL _this, u32 x, u32 y, u32 *col)
-{
-	ARGB v;
-	GpStatus st;
-
-	GPSTEN();
-	if (!_sten->is_converted) gdip_convert_texture(_sten);
-	if (!_sten->pBitmap) return GF_BAD_PARAM;
-
-	st = GdipBitmapGetPixel(_sten->pBitmap, x, y, &v);
-
-	if (_sten->invert_br) {
-		*col = GF_COL_ARGB( ((v>>24)&0xFF), ((v)&0xFF), ((v>>8)&0xFF), ((v>>16)&0xFF) );
-	} else {
-		*col = v;
-	}
-	return GF_OK;
-}
-
-
-static
-GF_Err gdip_set_pixel(GF_STENCIL _this, u32 x, u32 y, u32 col)
-{
-	GpStatus st;
-	ARGB v;
-	GPSTEN();
-	if (!_sten->pBitmap) return GF_BAD_PARAM;
-	if (!_sten->is_converted) gdip_convert_texture(_sten);
-
-	if (_sten->invert_br) {
-		v = GF_COL_ARGB( ((col>>24)&0xFF), ((col)&0xFF), ((col>>8)&0xFF), ((col>>16)&0xFF) );
-	} else {
-		v = col;
-	}
-	st = GdipBitmapSetPixel(_sten->pBitmap, x, y, v);
-	return GF_OK;
-}
-
-#if 0
-static
-GF_Err gdip_get_texture(GF_STENCIL _this, unsigned char **pixels, u32 *width, u32 *height, u32 *stride, GF_PixelFormat *pixelFormat)
-{
-	GpRect rc;
-	BitmapData data;
-	GPSTEN();
-	if (!_sten->pBitmap) return GF_BAD_PARAM;
-
-	rc.X = rc.Y = 0;
-	rc.Width = _sten->width;
-	rc.Height = _sten->height;
-
-	GdipBitmapLockBits(_sten->pBitmap, &rc, ImageLockModeRead, _sten->format, &data);
-	*pixels = (unsigned char *) data.Scan0;
-	*width = data.Width;
-	*height = data.Height;
-	*stride = data.Stride;
-	switch (data.PixelFormat) {
-	case PixelFormat16bppRGB555:
-		*pixelFormat = GF_PIXEL_RGB_555;
-		break;
-	case PixelFormat16bppRGB565:
-		*pixelFormat = GF_PIXEL_RGB_565;
-		break;
-	case PixelFormat32bppRGB:
-		*pixelFormat = GF_PIXEL_RGB_32;
-		break;
-	case PixelFormat32bppARGB:
-		*pixelFormat = GF_PIXEL_ARGB;
-		break;
-	case PixelFormat24bppRGB:
-	default:
-		*pixelFormat = GF_PIXEL_RGB_24;
-		break;
-	}
-	return GF_OK;
-}
-#endif
-
-
-void gdip_texture_modified(GF_STENCIL _this)
-{
-	GPSTEN();
-	if (_sten->orig_buf && (_sten->format == PixelFormat32bppARGB)) {
-		gdip_set_texture(_this, (char *) _sten->orig_buf, _sten->width, _sten->height, _sten->width * 4, GF_PIXEL_RGBA, GF_PIXEL_RGBA, GF_FALSE);
-	}
-	_sten->texture_invalid = GF_TRUE;
-}
-
-void gdip_init_driver_texture(GF_Raster2D *driver)
-{
-	driver->stencil_set_texture = gdip_set_texture;
-	driver->stencil_set_tiling = gdip_set_texture_repeat_mode;
-	driver->stencil_set_filter = gdip_set_sr_texture_filter;
-	driver->stencil_set_color_matrix = gdip_set_color_matrix;
-	driver->stencil_set_alpha = gdip_set_alpha;
-	driver->stencil_texture_modified = gdip_texture_modified;
-}
-
-
-void gdip_convert_texture(struct _stencil *sten)
-{
-	u32 BPP, format;
-	GF_VideoSurface src, dst;
-
-	if (sten->orig_format == GF_PIXEL_YV12) {
-		BPP = 3;
-		dst.pixel_format = GF_PIXEL_BGR_24;
-		format = PixelFormat24bppRGB;
-	} else {
-		BPP = 4;
-		dst.pixel_format = GF_PIXEL_ARGB;
-		format = PixelFormat32bppARGB;
-	}
-	if (BPP*sten->width*sten->height > sten->conv_size) {
-		if (sten->conv_buf) gf_free(sten->conv_buf);
-		sten->conv_size = BPP*sten->width*sten->height;
-		sten->conv_buf = (unsigned char *) gf_malloc(sizeof(unsigned char)*sten->conv_size);
-	}
-
-	memset(&src, 0, sizeof(GF_VideoSurface));
-	src.height = sten->height;
-	src.width = sten->width;
-	src.pitch_x  =0;
-	src.pitch_y = sten->orig_stride;
-	src.pixel_format = sten->orig_format;
-	src.video_buffer = (char*)sten->orig_buf;
-
-	memset(&dst, 0, sizeof(GF_VideoSurface));
-	dst.width = sten->width;
-	dst.height = sten->height;
-	dst.pitch_x = 0;
-	dst.pitch_y = BPP*sten->width;
-	dst.video_buffer = (char*)sten->conv_buf;
-
-	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, GF_FALSE, NULL, NULL);
-
-	if (sten->pBitmap) GdipDisposeImage(sten->pBitmap);
-	GdipCreateBitmapFromScan0(sten->width, sten->height, BPP*sten->width, format, sten->conv_buf, &sten->pBitmap);
-	sten->is_converted = GF_TRUE;
-}
-
-void gdip_load_texture(struct _stencil *sten)
-{
-	GpImageAttributes *attr;
-	ColorMatrix _cmat;
-
-	if (sten->texture_invalid && sten->pTexture) {
-		GdipDeleteBrush(sten->pTexture);
-		sten->pTexture = NULL;
-	}
-	/*nothing to do*/
-	if (sten->is_converted && sten->pTexture) return;
-	sten->texture_invalid = GF_FALSE;
-
-	/*convert*/
-	if (!sten->is_converted) gdip_convert_texture(sten);
-
-	GdipCreateImageAttributes(&attr);
-	if (sten->has_cmat) {
-		memcpy(_cmat.m, sten->cmat.m, sizeof(REAL)*5*5);
-	} else {
-		memset(_cmat.m, 0, sizeof(REAL)*5*5);
-		_cmat.m[0][0] = _cmat.m[1][1] = _cmat.m[2][2] = _cmat.m[3][3] = _cmat.m[4][4] = 1.0;
-		if (sten->invert_br) {
-			_cmat.m[0][0] = 0;
-			_cmat.m[0][2] = 1;
-			_cmat.m[2][2] = 0;
-			_cmat.m[2][0] = 1;
-		}
-	}
-
-	_cmat.m[3][3] *= ((REAL) sten->alpha) /255.0f;
-	GdipSetImageAttributesColorMatrix(attr, ColorAdjustTypeDefault, TRUE, &_cmat, NULL, ColorMatrixFlagsDefault);
-	if (sten->pTexture) GdipDeleteBrush(sten->pTexture);
-	GdipCreateTextureIAI(sten->pBitmap, attr, 0, 0, sten->width, sten->height, &sten->pTexture);
-
-	/*1- wrap mode is actually ignored in constructor*/
-	/*2- GDIPlus does not support S / T clamping */
-	GdipSetTextureWrapMode(sten->pTexture, WrapModeTile);
-
-	GdipDisposeImageAttributes(attr);
-}
-

gpac-0.8.0.tar.gz/modules/gpac_js Deleted

gpac-0.8.0.tar.gz/modules/gpac_js/Makefile Deleted

@@ -1,63 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/gpac_js
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKLIBS= -lgpac
-LOCAL_LIB=../../bin/gcc
-
-#common objects
-OBJS=gpac_js.o
-
-ifeq ($(CONFIG_JS),no)
-else
-CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+=-L../../extra_lib/lib/gcc
-endif
-ifeq ($(CONFIG_JS),prefix)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+=-L$(prefix)/lib
-endif
-LINKLIBS+= $(JS_LIBS)
-endif
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_gpac_js$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols gpac_js.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/gpac_js/gpac_js.c Deleted

@@ -1,2524 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/setup.h>
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-/*base SVG type*/
-#include <gpac/nodes_svg.h>
-#include <gpac/nodes_mpeg4.h>
-#include <gpac/nodes_x3d.h>
-/*dom events*/
-#include <gpac/events.h>
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/options.h>
-#include <gpac/xml.h>
-
-
-#if defined(GPAC_ANDROID) && !defined(XP_UNIX)
-#define XP_UNIX
-#endif
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE)
-#  pragma comment(lib, "js32")
-# elif defined (_WIN64)
-#  pragma comment(lib, "js")
-# elif defined (WIN32)
-#  pragma comment(lib, "js")
-# endif
-#endif
-
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/internal/smjs_api.h>
-
-#include <gpac/modules/js_usr.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/term_info.h>
-
-#define GPAC_JS_RTI_REFRESH_RATE	200
-
-typedef struct
-{
-	u32 nb_loaded;
-	GF_Terminal *term;
-
-	GF_JSClass gpacClass;
-	GF_JSClass gpacEvtClass;
-	GF_JSClass odmClass;
-	GF_JSClass anyClass;
-
-	GF_JSClass storageClass;
-
-	jsval evt_fun;
-	GF_TermEventFilter evt_filter;
-	GF_Event *evt;
-
-	JSContext *c;
-	JSObject *evt_filter_obj, *evt_obj;
-	JSObject *gpac_obj;
-
-	u32 rti_refresh_rate;
-	GF_SystemRTInfo rti;
-
-	//list of config files for storage
-	GF_List *storages;
-
-	GF_List *event_queue;
-	GF_Mutex *event_mx;
-
-} GF_GPACJSExt;
-
-enum {
-	GJS_OM_PROP_ID = -1,
-	GJS_OM_PROP_NB_RES = -2,
-	GJS_OM_PROP_URL = -3,
-	GJS_OM_PROP_DUR = -4,
-	GJS_OM_PROP_CLOCK = -5,
-	GJS_OM_PROP_DRIFT = -6,
-	GJS_OM_PROP_STATUS = -7,
-	GJS_OM_PROP_BUFFER = -8,
-	GJS_OM_PROP_DB_COUNT = -9,
-	GJS_OM_PROP_CB_COUNT = -10,
-	GJS_OM_PROP_CB_CAP = -11,
-	GJS_OM_PROP_TYPE = -12,
-	GJS_OM_PROP_SAMPLERATE = -13,
-	GJS_OM_PROP_CHANNELS = -14,
-	GJS_OM_PROP_LANG = -15,
-	GJS_OM_PROP_WIDTH = -16,
-	GJS_OM_PROP_HEIGHT = -17,
-	GJS_OM_PROP_PIXELFORMAT = -18,
-	GJS_OM_PROP_PAR = -19,
-	GJS_OM_PROP_DEC_FRAMES = -20,
-	GJS_OM_PROP_DROP_FRAMES = -21,
-	GJS_OM_PROP_DEC_TIME_MAX = -22,
-	GJS_OM_PROP_DEC_TIME_TOTAL = -23,
-	GJS_OM_PROP_AVG_RATE = -24,
-	GJS_OM_PROP_MAX_RATE = -25,
-	GJS_OM_PROP_SERVICE_HANDLER = -26,
-	GJS_OM_PROP_CODEC = -27,
-	GJS_OM_PROP_NB_QUALITIES = -28,
-	GJS_OM_PROP_MAX_BUFFER = -29,
-	GJS_OM_PROP_MIN_BUFFER = -30,
-	GJS_OM_PROP_FRAME_DUR = -31,
-	GJS_OM_PROP_NB_IRAP = -32,
-	GJS_OM_PROP_IRAP_DEC_TIME = -33,
-	GJS_OM_PROP_IRAP_MAX_TIME = -34,
-	GJS_OM_PROP_SERVICE_ID = -35,
-	GJS_OM_PROP_SELECTED_SERVICE = -36,
-	GJS_OM_PROP_BANDWIDTH_DOWN = -37,
-	GJS_OM_PROP_NB_HTTP = -38,
-	GJS_OM_PROP_TIMESHIFT_DEPTH = -39,
-	GJS_OM_PROP_TIMESHIFT_TIME = -40,
-	GJS_OM_PROP_IS_ADDON = -41,
-	GJS_OM_PROP_MAIN_ADDON_ON = -42,
-	GJS_OM_PROP_IS_OVER = -43,
-	GJS_OM_PROP_IS_PULLING = -44,
-	GJS_OM_PROP_DYNAMIC_SCENE = -45,
-	GJS_OM_PROP_SERVICE_NAME = -46,
-	GJS_OM_PROP_NTP_DIFF = -47,
-	GJS_OM_PROP_MAIN_ADDON_URL = -48,
-	GJS_OM_PROP_REVERSE_PLAYBACK = -49,
-	GJS_OM_PROP_SCALABLE_ENHANCEMENT = -50,
-	GJS_OM_PROP_MAIN_ADDON_MEDIATIME = -51,
-	GJS_OM_PROP_DEPENDENT_GROUPS = -52,
-	GJS_OM_PROP_IS_VR_SCENE = -53,
-	GJS_OM_PROP_DISABLED = -54
-};
-
-enum {
-	GJS_GPAC_PROP_LAST_WORK_DIR = -1,
-	GJS_GPAC_PROP_SCALE_X = -2,
-	GJS_GPAC_PROP_SCALE_Y = -3,
-	GJS_GPAC_PROP_TRANSLATION_X = -4,
-	GJS_GPAC_PROP_TRANSLATION_Y = -5,
-	GJS_GPAC_PROP_RECT_TEXTURES = -6,
-	GJS_GPAC_PROP_BATTERY_ON = -7,
-	GJS_GPAC_PROP_BATTERY_CHARGE = -8,
-	GJS_GPAC_PROP_BATTERY_PERCENT = -9,
-	GJS_GPAC_PROP_BATTERY_LIFETIME = -10,
-	GJS_GPAC_PROP_BATTERY_LIFETIME_FULL = -11,
-	GJS_GPAC_PROP_HOSTNAME = -12,
-	GJS_GPAC_PROP_FULLSCREEN = -13,
-	GJS_GPAC_PROP_CURRENT_PATH = -14,
-	GJS_GPAC_PROP_VOLUME = -15,
-	GJS_GPAC_PROP_NAVIGATION = -16,
-	GJS_GPAC_PROP_NAVIGATION_TYPE = -17,
-	GJS_GPAC_PROP_HARDWARE_YUV = -18,
-	GJS_GPAC_PROP_HARDWARE_RGB = -19,
-	GJS_GPAC_PROP_HARDWARE_RGBA = -20,
-	GJS_GPAC_PROP_HARDWARE_STRETCH = -21,
-	GJS_GPAC_PROP_SCREEN_WIDTH = -22,
-	GJS_GPAC_PROP_SCREEN_HEIGHT = -23,
-	GJS_GPAC_PROP_HTTP_MAX_RATE = -24,
-	GJS_GPAC_PROP_HTTP_RATE = -25,
-	GJS_GPAC_PROP_FPS = -26,
-	GJS_GPAC_PROP_CPU = -27,
-	GJS_GPAC_PROP_NB_CORES = -28,
-	GJS_GPAC_PROP_MEMORY_SYSTEM = -29,
-	GJS_GPAC_PROP_MEMORY = -30,
-	GJS_GPAC_PROP_ARGC = -31,
-	GJS_GPAC_PROP_CAPTION = -32,
-	GJS_GPAC_PROP_FOCUS_HIGHLIGHT = -33,
-	GJS_GPAC_PROP_DPI_X = -34,
-	GJS_GPAC_PROP_DPI_Y = -35,
-	GJS_GPAC_PROP_SENSORS_ACTIVE = -36,
-	GJS_GPAC_PROP_SIM_FPS = -37,
-
-};
-
-enum {
-	GJS_EVT_PROP_KEYCODE = -1,
-	GJS_EVT_PROP_MOUSE_X = -2,
-	GJS_EVT_PROP_MOUSE_Y = -3,
-	GJS_EVT_PROP_PICKED = -4,
-	GJS_EVT_PROP_WHEEL = -5,
-	GJS_EVT_PROP_BUTTON = -6,
-	GJS_EVT_PROP_TYPE = -7,
-	GJS_EVT_PROP_NAME = -8,
-	GJS_EVT_PROP_HWKEY = -9,
-};
-
-
-static GF_Terminal *gpac_get_term(JSContext *c, JSObject *obj)
-{
-	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	return ext ? ext->term : NULL;
-}
-
-static SMJS_FUNC_PROP_GET( gpac_getProperty)
-
-const char *res;
-s32 prop_id;
-GF_Terminal *term = gpac_get_term(c, obj);
-if (!term) return JS_FALSE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case GJS_GPAC_PROP_LAST_WORK_DIR:
-	res = gf_cfg_get_key(term->user->config, "General", "LastWorkingDir");
-	if (!res) res = gf_cfg_get_key(term->user->config, "General", "ModulesDirectory");
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, res));
-	break;
-
-case GJS_GPAC_PROP_SCALE_X:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_x)) );
-	break;
-
-case GJS_GPAC_PROP_SCALE_Y:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->scale_y)) );
-	break;
-
-case GJS_GPAC_PROP_TRANSLATION_X:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_x)) );
-	break;
-
-case GJS_GPAC_PROP_TRANSLATION_Y:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_y)) );
-	break;
-
-case GJS_GPAC_PROP_RECT_TEXTURES:
-{
-	Bool any_size = GF_FALSE;
-#ifndef GPAC_DISABLE_3D
-	if (term->compositor->gl_caps.npot_texture || term->compositor->gl_caps.rect_texture)
-		any_size = GF_TRUE;
-#endif
-	*vp = BOOLEAN_TO_JSVAL( any_size ? JS_TRUE : JS_FALSE );
-}
-break;
-
-case GJS_GPAC_PROP_BATTERY_ON:
-{
-	Bool on_battery = GF_FALSE;
-	gf_sys_get_battery_state(&on_battery, NULL, NULL, NULL, NULL);
-	*vp = BOOLEAN_TO_JSVAL( on_battery ? JS_TRUE : JS_FALSE );
-}
-break;
-
-case GJS_GPAC_PROP_BATTERY_CHARGE:
-{
-	u32 on_charge = 0;
-	gf_sys_get_battery_state(NULL, &on_charge, NULL, NULL, NULL);
-	*vp = BOOLEAN_TO_JSVAL( on_charge ? JS_TRUE : JS_FALSE );
-}
-break;
-
-case GJS_GPAC_PROP_BATTERY_PERCENT:
-{
-	u32 level = 0;
-	gf_sys_get_battery_state(NULL, NULL, &level, NULL, NULL);
-	*vp = INT_TO_JSVAL( level );
-}
-break;
-
-case GJS_GPAC_PROP_BATTERY_LIFETIME:
-{
-	u32 level = 0;
-	gf_sys_get_battery_state(NULL, NULL, NULL, &level, NULL);
-	*vp = INT_TO_JSVAL( level );
-}
-break;
-
-case GJS_GPAC_PROP_BATTERY_LIFETIME_FULL:
-{
-	u32 level = 0;
-	gf_sys_get_battery_state(NULL, NULL, NULL, NULL, &level);
-	*vp = INT_TO_JSVAL( level );
-}
-break;
-
-case GJS_GPAC_PROP_HOSTNAME:
-{
-	char hostname[100];
-	gf_sk_get_host_name((char*)hostname);
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, hostname));
-}
-break;
-
-case GJS_GPAC_PROP_FULLSCREEN:
-	*vp = BOOLEAN_TO_JSVAL( term->compositor->fullscreen ? JS_TRUE : JS_FALSE);
-	break;
-
-case GJS_GPAC_PROP_CURRENT_PATH:
-{
-	char *url = gf_url_concatenate(term->root_scene->root_od->net_service->url, "");
-	if (!url) url = gf_strdup("");
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, url));
-	gf_free(url);
-}
-break;
-
-case GJS_GPAC_PROP_VOLUME:
-	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_AUDIO_VOLUME));
-	break;
-
-case GJS_GPAC_PROP_NAVIGATION:
-	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION));
-	break;
-
-case GJS_GPAC_PROP_NAVIGATION_TYPE:
-	*vp = INT_TO_JSVAL( gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE) );
-	break;
-
-case GJS_GPAC_PROP_HARDWARE_YUV:
-	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_YUV) ? 1 : 0 );
-	break;
-
-case GJS_GPAC_PROP_HARDWARE_RGB:
-	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
-	break;
-
-case GJS_GPAC_PROP_HARDWARE_RGBA:
-{
-	u32 has_rgba = (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
-#ifndef GPAC_DISABLE_3D
-	if (term->compositor->hybrid_opengl || term->compositor->is_opengl) has_rgba = 1;
-#endif
-	*vp = INT_TO_JSVAL( has_rgba  );
-}
-break;
-
-case GJS_GPAC_PROP_HARDWARE_STRETCH:
-	*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_STRETCH) ? 1 : 0 );
-	break;
-
-case GJS_GPAC_PROP_SCREEN_WIDTH:
-	*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_width);
-	break;
-
-case GJS_GPAC_PROP_SCREEN_HEIGHT:
-	*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_height);
-	break;
-
-case GJS_GPAC_PROP_HTTP_MAX_RATE:
-	*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader));
-	break;
-
-case GJS_GPAC_PROP_HTTP_RATE:
-	*vp = INT_TO_JSVAL( gf_dm_get_global_rate(term->downloader) / 1000);
-	break;
-
-case GJS_GPAC_PROP_FPS:
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, gf_term_get_framerate(term, 0) ) );
-	break;
-
-case GJS_GPAC_PROP_SIM_FPS:
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, term->compositor->frame_rate) );
-	break;
-
-case GJS_GPAC_PROP_CPU:
-{
-	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-	*vp = INT_TO_JSVAL(ext->rti.process_cpu_usage);
-}
-break;
-
-case GJS_GPAC_PROP_NB_CORES:
-{
-	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-	*vp = INT_TO_JSVAL(ext->rti.nb_cores);
-}
-break;
-
-case GJS_GPAC_PROP_MEMORY_SYSTEM:
-{
-	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, (Double) ext->rti.physical_memory ) );
-}
-break;
-
-case GJS_GPAC_PROP_MEMORY:
-{
-	GF_GPACJSExt *ext = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
-	*vp = INT_TO_JSVAL(ext->rti.process_memory);
-}
-break;
-
-case GJS_GPAC_PROP_ARGC:
-	*vp = INT_TO_JSVAL(gf_sys_get_argc() );
-	break;
-
-case GJS_GPAC_PROP_DPI_X:
-	*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_x);
-	break;
-
-case GJS_GPAC_PROP_DPI_Y:
-	*vp = INT_TO_JSVAL(term->compositor->video_out->dpi_y);
-	break;
-	
-case GJS_GPAC_PROP_SENSORS_ACTIVE:
-	*vp = BOOLEAN_TO_JSVAL(term->orientation_sensors_active);
-	break;
-}
-
-return JS_TRUE;
-}
-
-
-static SMJS_FUNC_PROP_SET( gpac_setProperty)
-
-s32 prop_id;
-char *prop_val;
-GF_Terminal *term = gpac_get_term(c, obj);
-if (!term) return JS_FALSE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case GJS_GPAC_PROP_LAST_WORK_DIR:
-	if (!JSVAL_IS_STRING(*vp)) {
-		return JS_FALSE;
-	}
-	prop_val = SMJS_CHARS(c, *vp);
-	gf_cfg_set_key(term->user->config, "General", "LastWorkingDir", prop_val);
-	SMJS_FREE(c, prop_val);
-	break;
-case GJS_GPAC_PROP_CAPTION:
-{
-	GF_Event evt;
-	char *caption;
-	if (!JSVAL_IS_STRING(*vp)) {
-		return JS_FALSE;
-	}
-	evt.type = GF_EVENT_SET_CAPTION;
-	caption = SMJS_CHARS(c, *vp);
-	if (!strnicmp(caption, "gpac://", 7)) {
-		evt.caption.caption = caption + 7;
-	} else {
-		evt.caption.caption = caption;
-	}
-
-	gf_term_user_event(term, &evt);
-	SMJS_FREE(c, (char*)caption);
-}
-break;
-case GJS_GPAC_PROP_FULLSCREEN:
-{
-	/*no fullscreen for iOS (always on)*/
-#ifndef GPAC_IPHONE
-	Bool res = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? 1 : 0;
-	if (term->compositor->fullscreen != res) {
-		gf_term_set_option(term, GF_OPT_FULLSCREEN, res);
-	}
-#endif
-}
-break;
-case GJS_GPAC_PROP_VOLUME:
-	if (JSVAL_IS_NUMBER(*vp)) {
-		jsdouble d;
-		SMJS_GET_NUMBER(*vp, d);
-		gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, (u32) d);
-	} else if (JSVAL_IS_INT(*vp)) {
-		gf_term_set_option(term, GF_OPT_AUDIO_VOLUME, JSVAL_TO_INT(*vp));
-	}
-	break;
-
-case GJS_GPAC_PROP_NAVIGATION:
-	gf_term_set_option(term, GF_OPT_NAVIGATION, JSVAL_TO_INT(*vp) );
-	break;
-case GJS_GPAC_PROP_NAVIGATION_TYPE:
-	gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
-	break;
-case GJS_GPAC_PROP_HTTP_MAX_RATE:
-{
-	u32 new_rate = JSVAL_TO_INT(*vp);
-	gf_dm_set_data_rate(term->downloader, new_rate);
-}
-break;
-case GJS_GPAC_PROP_FOCUS_HIGHLIGHT:
-	term->compositor->disable_focus_highlight = JSVAL_TO_BOOLEAN(*vp) ? 0 : 1;
-	break;
-case GJS_GPAC_PROP_SENSORS_ACTIVE:
-{
-	GF_Event evt;
-	term->orientation_sensors_active = JSVAL_TO_BOOLEAN(*vp);
-	//send activation for sensors
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_SENSOR_REQUEST;
-	evt.activate_sensor.activate = term->orientation_sensors_active;
-	evt.activate_sensor.sensor_type = GF_EVENT_SENSOR_ORIENTATION;
-	if (gf_term_send_event(term, &evt) == GF_FALSE) {
-		term->orientation_sensors_active = GF_FALSE;
-	}
-}
-	break;
-}
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_option)
-{
-	const char *opt = NULL;
-	char *sec_name, *key_name;
-	s32 idx = -1;
-	JSString *s;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (argc < 2) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1]) && !JSVAL_IS_INT(argv[1])) return JS_FALSE;
-
-	sec_name = SMJS_CHARS(c, argv[0]);
-	key_name = NULL;
-	if (JSVAL_IS_INT(argv[1])) {
-		idx = JSVAL_TO_INT(argv[1]);
-	} else if (JSVAL_IS_STRING(argv[1]) ) {
-		key_name = SMJS_CHARS(c, argv[1]);
-	}
-
-	if (!stricmp(sec_name, "audiofilters")) {
-		if (!term->compositor->audio_renderer->filter_chain.enable_filters
-		        || !term->compositor->audio_renderer->filter_chain.filters->filter->GetOption) {
-			SMJS_FREE(c, key_name);
-			SMJS_FREE(c, sec_name);
-			return JS_TRUE;
-		}
-		opt = term->compositor->audio_renderer->filter_chain.filters->filter->GetOption(term->compositor->audio_renderer->filter_chain.filters->filter, key_name);
-	} else if (sec_name && !stricmp(sec_name, "General") && key_name && !strcmp(key_name, "Version")) {
-		opt = GPAC_FULL_VERSION;
-	} else if (key_name) {
-		opt = gf_cfg_get_key(term->user->config, sec_name, key_name);
-	} else if (idx>=0) {
-		opt = gf_cfg_get_key_name(term->user->config, sec_name, idx);
-	} else {
-		opt = NULL;
-	}
-	if (key_name) {
-		SMJS_FREE(c, key_name);
-	}
-	SMJS_FREE(c, sec_name);
-
-	if (opt) {
-		s = JS_NewStringCopyZ(c, opt);
-		SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	} else {
-		SMJS_SET_RVAL( JSVAL_NULL );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_set_option)
-{
-	char *sec_name, *key_name, *key_val;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-	if (argc < 3) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
-
-	sec_name = SMJS_CHARS(c, argv[0]);
-	key_name = SMJS_CHARS(c, argv[1]);
-	key_val = NULL;
-	if (JSVAL_IS_STRING(argv[2]))
-		key_val = SMJS_CHARS(c, argv[2]);
-
-	if (!stricmp(sec_name, "audiofilters")) {
-		if (term->compositor->audio_renderer->filter_chain.enable_filters
-		        && term->compositor->audio_renderer->filter_chain.filters->filter->SetOption) {
-			term->compositor->audio_renderer->filter_chain.filters->filter->SetOption(term->compositor->audio_renderer->filter_chain.filters->filter, key_name, key_val);
-		}
-	} else {
-		gf_cfg_set_key(term->user->config, sec_name, key_name, key_val);
-		if (!strcmp(sec_name, "Audio") && !strcmp(key_name, "Filter")) {
-			gf_sc_reload_audio_filters(term->compositor);
-		}
-		if (!strcmp(sec_name, "Compositor") && !strcmp(key_name, "StereoType")) {
-			gf_sc_reload_config(term->compositor);
-		}
-	}
-	SMJS_FREE(c, sec_name);
-	SMJS_FREE(c, key_name);
-	if (key_val) {
-		SMJS_FREE(c, key_val);
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_get_arg)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (argc < 1) return JS_FALSE;
-
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 idx = JSVAL_TO_INT(argv[0]);
-		const char *arg = gf_sys_get_arg(idx);
-		if (arg) {
-			SMJS_SET_RVAL( STRING_TO_JSVAL(JS_NewStringCopyZ(c, arg)) );
-		} else {
-			SMJS_SET_RVAL( JSVAL_NULL );
-		}
-		return JS_TRUE;
-	} else {
-		return JS_FALSE;
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_set_back_color)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	u32 r, g, b, a, i;
-	jsdouble d;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (argc < 3) return JS_FALSE;
-	r = g = b = 0;
-	a = 255;
-	for (i=0; i<argc; i++) {
-		u32 v=0;
-		if (JSVAL_IS_DOUBLE(argv[i])) {
-			SMJS_GET_NUMBER(argv[i], d);
-			v = (u32) (255 * d);
-		} else if (JSVAL_IS_INT(argv[i])) {
-			v = 255 * JSVAL_TO_INT(argv[i]);
-		}
-		if (i==0) r = v;
-		else if (i==1) g = v;
-		else if (i==2) b = v;
-		else if (i==3) a = v;
-	}
-	term->compositor->back_color = term->compositor->default_back_color = GF_COL_ARGB(a, r, g, b);
-	gf_sc_invalidate(term->compositor, NULL);
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_switch_quality)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (argc < 1) return JS_FALSE;
-
-	if (JSVAL_IS_BOOLEAN(argv[0])) {
-		Bool up = (JSVAL_TO_BOOLEAN(argv[0])==JS_TRUE) ? GF_TRUE : GF_FALSE;
-		gf_term_switch_quality(term, up);
-		return JS_TRUE;
-	} else {
-		return JS_FALSE;
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_reload)
-{
-	SMJS_OBJ
-	GF_Event evt;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_RELOAD;
-	term->user->EventProc(term->user->opaque, &evt);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_navigation_supported)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	u32 type;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	if (argc < 1) return JS_FALSE;
-
-	if (! JSVAL_IS_INT(argv[0]) ) {
-		SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
-		return JS_TRUE;
-	}
-	type = JSVAL_TO_INT(argv[0]);
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( gf_sc_navigation_supported(term->compositor, type) ? JS_TRUE : JS_FALSE ) );
-	return JS_TRUE;
-}
-
-typedef struct
-{
-	JSContext *c;
-	JSObject *array;
-	Bool is_dir;
-} enum_dir_cbk;
-
-static Bool enum_dir_fct(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
-{
-	u32 i, len;
-	char *sep;
-	JSString *s;
-	jsuint idx;
-	jsval v;
-	JSObject *obj;
-	enum_dir_cbk *cbk = (enum_dir_cbk*)cbck;
-
-	if (file_name && (file_name[0]=='.')) return 0;
-
-	obj = JS_NewObject(cbk->c, 0, 0, 0);
-	s = JS_NewStringCopyZ(cbk->c, file_name);
-	JS_DefineProperty(cbk->c, obj, "name", STRING_TO_JSVAL(s), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	sep=NULL;
-	len = (u32) strlen(file_path);
-	for (i=0; i<len; i++) {
-		sep = strchr("/\\", file_path[len-i-1]);
-		if (sep) {
-			sep = file_path+len-i-1;
-			break;
-		}
-	}
-	if (sep) {
-		sep[0] = '/';
-		sep[1] = 0;
-		s = JS_NewStringCopyZ(cbk->c, file_path);
-	} else {
-		s = JS_NewStringCopyZ(cbk->c, file_path);
-	}
-	JS_DefineProperty(cbk->c, obj, "path", STRING_TO_JSVAL(s), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "directory", BOOLEAN_TO_JSVAL(cbk->is_dir ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "drive", BOOLEAN_TO_JSVAL(file_info->drive ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "hidden", BOOLEAN_TO_JSVAL(file_info->hidden ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "system", BOOLEAN_TO_JSVAL(file_info->system ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "size", INT_TO_JSVAL(file_info->size), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(cbk->c, obj, "last_modified", INT_TO_JSVAL(file_info->last_modified), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-
-	JS_GetArrayLength(cbk->c, cbk->array, &idx);
-	v = OBJECT_TO_JSVAL(obj);
-	JS_SetElement(cbk->c, cbk->array, idx, &v);
-	return 0;
-}
-
-static JSBool SMJS_FUNCTION(gpac_enum_directory)
-{
-	GF_Err err;
-	enum_dir_cbk cbk;
-	char *url = NULL;
-	char *dir = NULL;
-	char *filter = NULL;
-	char *an_url;
-	Bool dir_only = 0;
-	Bool browse_root = 0;
-	GF_Terminal *term;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if ((argc >= 1) && JSVAL_IS_STRING(argv[0])) {
-		dir = SMJS_CHARS(c, argv[0]);
-		if (!strcmp(dir, "/")) browse_root = 1;
-	}
-	if ((argc >= 2) && JSVAL_IS_STRING(argv[1])) {
-		filter = SMJS_CHARS(c, argv[1]);
-		if (!strcmp(filter, "dir")) {
-			dir_only = 1;
-			filter = NULL;
-		} else if (!strlen(filter)) {
-			SMJS_FREE(c, filter);
-			filter=NULL;
-		}
-	}
-	if ((argc >= 3) && JSVAL_IS_BOOLEAN(argv[2])) {
-		if (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) {
-			url = gf_url_concatenate(dir, "..");
-			if (dir && ( !strcmp(url, "..") || (url[0]==0) )) {
-				if ((dir[1]==':') && ((dir[2]=='/') || (dir[2]=='\\')) ) browse_root = 1;
-				else if (!strcmp(dir, "/")) browse_root = 1;
-			}
-			if (!strcmp(url, "/")) browse_root = 1;
-		}
-	}
-
-	if ( (!dir || !strlen(dir) ) && (!url || !strlen(url))) browse_root = 1;
-
-	if (browse_root) {
-		cbk.c = c;
-		cbk.array = JS_NewArrayObject(c, 0, 0);
-		cbk.is_dir = 1;
-		gf_enum_directory("/", 1, enum_dir_fct, &cbk, NULL);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(cbk.array) );
-		if (url) gf_free(url);
-		SMJS_FREE(c, dir);
-		SMJS_FREE(c, filter);
-		return JS_TRUE;
-	}
-
-	cbk.c = c;
-	cbk.array = JS_NewArrayObject(c, 0, 0);
-
-	cbk.is_dir = 1;
-
-	term = gpac_get_term(c, obj);
-	/*concatenate with service url*/
-	an_url = gf_url_concatenate(term->root_scene->root_od->net_service->url, url ? url : dir);
-	if (an_url) {
-		gf_free(url);
-		url = an_url;
-	}
-	err = gf_enum_directory(url ? url : dir, 1, enum_dir_fct, &cbk, NULL);
-	if (err) return JS_FALSE;
-
-	if (!dir_only) {
-		cbk.is_dir = 0;
-		err = gf_enum_directory(url ? url : dir, 0, enum_dir_fct, &cbk, filter);
-		if (dir_only && (err==GF_IO_ERR)) {
-			GF_Terminal *term = gpac_get_term(c, obj);
-			/*try to concatenate with service url*/
-			char *an_url = gf_url_concatenate(term->root_scene->root_od->net_service->url, url ? url : dir);
-			gf_free(url);
-			url = an_url;
-			gf_enum_directory(url ? url : dir, 0, enum_dir_fct, &cbk, filter);
-		}
-	}
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(cbk.array) );
-	if (url) gf_free(url);
-	SMJS_FREE(c, dir);
-	SMJS_FREE(c, filter);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_set_size)
-{
-	Bool override_size_info = 0;
-	u32 w, h;
-	jsdouble d;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!term) return JS_FALSE;
-
-	w = h = 0;
-	if ((argc >= 1) && JSVAL_IS_NUMBER(argv[0])) {
-		SMJS_GET_NUMBER(argv[0], d);
-		w = (u32) d;
-	}
-	if ((argc >= 2) && JSVAL_IS_NUMBER(argv[1])) {
-		SMJS_GET_NUMBER(argv[1], d);
-		h = (u32) d;
-	}
-	if ((argc >= 3) && JSVAL_IS_BOOLEAN(argv[2]) && (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) )
-		override_size_info = 1;
-
-	if (w && h) {
-		GF_Event evt;
-		if (override_size_info) {
-			term->compositor->scene_width = w;
-			term->compositor->scene_height = h;
-			term->compositor->has_size_info = 1;
-			return JS_TRUE;
-		}
-		if (term->user->os_window_handler) {
-			evt.type = GF_EVENT_SCENE_SIZE;
-			evt.size.width = w;
-			evt.size.height = h;
-			gf_term_send_event(term, &evt);
-		} else {
-			gf_sc_set_size(term->compositor, w, h);
-		}
-	} else if (override_size_info) {
-		term->compositor->has_size_info = 0;
-		term->compositor->recompute_ar = 1;
-	}
-
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_exit)
-{
-	GF_Event evt;
-	SMJS_OBJ
-	GF_Terminal *term = gpac_get_term(c, obj);
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_QUIT;
-	gf_term_send_event(term, &evt);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_set_3d)
-{
-	u32 type_3d = 0;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (argc && JSVAL_IS_INT(argv[0])) type_3d = JSVAL_TO_INT(argv[0]);
-	if (term->compositor->inherit_type_3d != type_3d) {
-		term->compositor->inherit_type_3d = type_3d;
-		term->compositor->root_visual_setup = 0;
-		gf_sc_reset_graphics(term->compositor);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_move_window)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Event evt;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (argc < 2) return JS_TRUE;
-	if (!JSVAL_IS_INT(argv[0]) || !JSVAL_IS_INT(argv[1])) return JS_TRUE;
-
-	evt.type = GF_EVENT_MOVE;
-	evt.move.relative = 1;
-	evt.move.x = JSVAL_TO_INT(argv[0]);
-	evt.move.y = JSVAL_TO_INT(argv[1]);
-	term->compositor->video_out->ProcessEvent(term->compositor->video_out, &evt);
-
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_error_string)
-{
-	const char *str;
-	SMJS_ARGS
-
-	if (argc < 1) return JS_TRUE;
-	if (!JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
-	str = gf_error_to_string(JSVAL_TO_INT(argv[0]));
-
-	SMJS_SET_RVAL( STRING_TO_JSVAL(JS_NewStringCopyZ(c, str)) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_scene_time)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_SceneGraph *sg = NULL;
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) {
-		sg = term->root_scene->graph;
-	} else {
-		GF_Node *n = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-		sg = n ? n->sgprivate->scenegraph : term->root_scene->graph;
-	}
-	SMJS_SET_RVAL( DOUBLE_TO_JSVAL( JS_NewDouble(c, sg->GetSceneTime(sg->userpriv) ) ) );
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_trigger_gc)
-{
-	SMJS_OBJ
-	GF_SceneGraph *sg = NULL;
-	GF_Terminal *term = gpac_get_term(c, obj);
-
-	sg = term->root_scene->graph;
-	sg->trigger_gc = GF_TRUE;
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_migrate_url)
-{
-	char *url;
-	u32 i, count;
-	GF_NetworkCommand com;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-
-	url = SMJS_CHARS(c, argv[0]);
-	if (!url) return JS_FALSE;
-
-	count = gf_list_count(term->root_scene->resources);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_list_get(term->root_scene->resources, i);
-		if (!odm->net_service) continue;
-		if (!strstr(url, odm->net_service->url)) continue;
-
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_MIGRATION_INFO;
-		odm->net_service->ifce->ServiceCommand(odm->net_service->ifce, &com);
-		if (com.migrate.data) {
-			SMJS_SET_RVAL( STRING_TO_JSVAL(JS_NewStringCopyZ(c, com.migrate.data)) );
-		} else {
-			SMJS_SET_RVAL( STRING_TO_JSVAL(JS_NewStringCopyZ(c, odm->net_service->url)) );
-		}
-		break;
-	}
-	SMJS_FREE(c, url);
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( odm_getProperty)
-
-GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-GF_MediaInfo odi;
-s32 prop_id;
-char *str;
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-prop_id = SMJS_ID_TO_INT(id);
-gf_term_get_object_info(odm->term, odm, &odi);
-
-switch (prop_id) {
-case GJS_OM_PROP_ID:
-	*vp = INT_TO_JSVAL(odi.od->objectDescriptorID);
-	break;
-case GJS_OM_PROP_NB_RES:
-	*vp = INT_TO_JSVAL(odm->subscene ? gf_list_count(odm->subscene->resources) : 0);
-	break;
-case GJS_OM_PROP_URL:
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_url));
-	break;
-case GJS_OM_PROP_DUR:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.duration) );
-	break;
-case GJS_OM_PROP_CLOCK:
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, odi.current_time) );
-	break;
-case GJS_OM_PROP_DRIFT:
-	*vp = INT_TO_JSVAL( odi.clock_drift);
-	break;
-case GJS_OM_PROP_STATUS:
-	if (odi.status==0) str = "Stopped";
-	else if (odi.status==1) str = "Playing";
-	else if (odi.status==2) str = "Paused";
-	else if (odi.status==3) str = "Not Setup";
-	else str = "Setup Failed";
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
-	break;
-case GJS_OM_PROP_BUFFER:
-	*vp = INT_TO_JSVAL( odi.buffer);
-	break;
-case GJS_OM_PROP_DB_COUNT:
-	*vp = INT_TO_JSVAL( odi.db_unit_count);
-	break;
-case GJS_OM_PROP_CB_COUNT:
-	*vp = INT_TO_JSVAL( odi.cb_unit_count);
-	break;
-case GJS_OM_PROP_CB_CAP:
-	*vp = INT_TO_JSVAL( odi.cb_max_count);
-	break;
-case GJS_OM_PROP_TYPE:
-	if (odi.od_type==GF_STREAM_SCENE) str = "Scene";
-	else if (odi.od_type==GF_STREAM_OD) str = "Object Descriptor";
-	else if (odi.od_type==GF_STREAM_VISUAL) str = "Video";
-	else if (odi.od_type==GF_STREAM_AUDIO) str = "Audio";
-	else if (odi.od_type==GF_STREAM_TEXT) str = "Text";
-	else if (odm->subscene) str = "Subscene";
-	else str = "Unknown";
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, str));
-	break;
-case GJS_OM_PROP_SAMPLERATE:
-	*vp = INT_TO_JSVAL( odi.sample_rate);
-	break;
-case GJS_OM_PROP_CHANNELS:
-	*vp = INT_TO_JSVAL( odi.num_channels);
-	break;
-case GJS_OM_PROP_LANG:
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, odi.lang_code ? odi.lang_code : gf_4cc_to_str(odi.lang) ) );
-	break;
-case GJS_OM_PROP_WIDTH:
-	*vp = INT_TO_JSVAL( odi.width);
-	break;
-case GJS_OM_PROP_HEIGHT:
-	*vp = INT_TO_JSVAL( odi.height);
-	break;
-case GJS_OM_PROP_PIXELFORMAT:
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_4cc_to_str(odi.pixelFormat) ) );
-	break;
-case GJS_OM_PROP_PAR:
-	if (odi.par) {
-		char szPar[50];
-		sprintf(szPar, "%d:%d", (odi.par>>16)&0xFF, (odi.par)&0xFF );
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szPar ) );
-	} else {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "1:1" ) );
-	}
-	break;
-case GJS_OM_PROP_DEC_FRAMES:
-	*vp = INT_TO_JSVAL(odi.nb_dec_frames);
-	break;
-case GJS_OM_PROP_DROP_FRAMES:
-	*vp = INT_TO_JSVAL(odi.nb_dropped);
-	break;
-case GJS_OM_PROP_DEC_TIME_MAX:
-	*vp = INT_TO_JSVAL(odi.max_dec_time);
-	break;
-case GJS_OM_PROP_DEC_TIME_TOTAL:
-	*vp = INT_TO_JSVAL(odi.total_dec_time);
-	break;
-case GJS_OM_PROP_AVG_RATE:
-	*vp = INT_TO_JSVAL(odi.avg_bitrate);
-	break;
-case GJS_OM_PROP_MAX_RATE:
-	*vp = INT_TO_JSVAL(odi.max_bitrate);
-	break;
-case GJS_OM_PROP_SERVICE_HANDLER:
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.service_handler));
-	break;
-case GJS_OM_PROP_CODEC:
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, odi.codec_name));
-	break;
-case GJS_OM_PROP_NB_QUALITIES:
-{
-	//first check network
-	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) {
-		*vp = INT_TO_JSVAL(com.quality_query.index);
-		break;
-	}
-#if 0
-	//use input channels
-	if (odm->codec->type==GF_STREAM_VISUAL) {
-		u32 count = gf_list_count(odm->codec->inChannels);
-		if (count>1) {
-			*vp = INT_TO_JSVAL(count);
-			break;
-		}
-	}
-	//use number of scalable addons
-	if (odm->upper_layer_odm) {
-		u32 count = 0;
-		while (odm) {
-			odm = odm->upper_layer_odm;
-			count++;
-		}
-		*vp = INT_TO_JSVAL(count);
-		break;
-	}
-#endif
-	*vp = INT_TO_JSVAL(1);
-	break;
-}
-case GJS_OM_PROP_MAX_BUFFER:
-	*vp = INT_TO_JSVAL(odi.max_buffer);
-	break;
-case GJS_OM_PROP_MIN_BUFFER:
-	*vp = INT_TO_JSVAL(odi.min_buffer);
-	break;
-case GJS_OM_PROP_FRAME_DUR:
-	*vp = INT_TO_JSVAL(odi.au_duration);
-	break;
-case GJS_OM_PROP_NB_IRAP:
-	*vp = INT_TO_JSVAL(odi.nb_iraps);
-	break;
-case GJS_OM_PROP_IRAP_DEC_TIME:
-	*vp = INT_TO_JSVAL(odi.irap_total_dec_time);
-	break;
-case GJS_OM_PROP_IRAP_MAX_TIME:
-	*vp = INT_TO_JSVAL(odi.irap_max_dec_time);
-	break;
-case GJS_OM_PROP_SERVICE_ID:
-	*vp = INT_TO_JSVAL(odi.od ? odi.od->ServiceID : 0);
-	break;
-case GJS_OM_PROP_SELECTED_SERVICE:
-	*vp = INT_TO_JSVAL( (!odm->addon && odm->subscene) ? odm->subscene->selected_service_id : odm->parentscene->selected_service_id);
-	break;
-case GJS_OM_PROP_BANDWIDTH_DOWN:
-{
-	GF_NetworkCommand com;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_GET_STATS;
-	com.base.on_channel = gf_list_get(odm->channels, 0);
-	gf_term_service_command(odm->net_service, &com);
-	*vp = INT_TO_JSVAL(com.net_stats.bw_down/1000);
-}
-break;
-case GJS_OM_PROP_NB_HTTP:
-	*vp = INT_TO_JSVAL(gf_list_count(odm->net_service->dnloads) );
-	break;
-case GJS_OM_PROP_TIMESHIFT_DEPTH:
-	if ((s32) odm->timeshift_depth > 0) {
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, ((Double) odm->timeshift_depth) / 1000.0 ) );
-	} else {
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, 0.0) );
-	}
-	break;
-case GJS_OM_PROP_TIMESHIFT_TIME:
-{
-	GF_NetworkCommand com;
-	GF_Scene *scene;
-	Double res = 0.0;
-
-	if (!odm->timeshift_depth) {
-		*vp = INT_TO_JSVAL(0);
-		break;
-	}
-
-	scene = odm->subscene ? odm->subscene : odm->parentscene;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_GET_TIMESHIFT;
-
-	//we may need to check the main addon for timeshifting
-	if (scene->main_addon_selected) {
-		u32 i, count = gf_list_count(scene->resources);
-		for (i=0; i < count; i++) {
-			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-				odm = an_odm;
-			}
-		}
-	}
-
-	if (odm->timeshift_depth) {
-		//can be NULL
-		com.base.on_channel = gf_list_get(odm->channels, 0);
-		gf_term_service_command(odm->net_service, &com);
-		res = com.timeshift.time;
-	} else if (scene->main_addon_selected) {
-		GF_Clock *ck;
-		ck = scene->dyn_ck;
-		if (scene->scene_codec) ck = scene->scene_codec->ck;
-		if (ck) {
-			u32 now = gf_clock_time(scene->dyn_ck) ;
-			u32 live = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
-			res = ((Double) live) / 1000.0;
-			res -= ((Double) now) / 1000.0;
-
-			if (res<0) {
-				GF_Event evt;
-				memset(&evt, 0, sizeof(evt));
-				evt.type = GF_EVENT_TIMESHIFT_UNDERRUN;
-				gf_term_send_event(odm->term, &evt);
-				res=0;
-			} else if (res && res*1000 > scene->timeshift_depth) {
-				GF_Event evt;
-				memset(&evt, 0, sizeof(evt));
-				evt.type = GF_EVENT_TIMESHIFT_OVERFLOW;
-				gf_term_send_event(odm->term, &evt);
-				res=scene->timeshift_depth;
-				res/=1000;
-			}
-		}
-	}
-	*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, res) );
-}
-break;
-case GJS_OM_PROP_IS_ADDON:
-	*vp = BOOLEAN_TO_JSVAL( (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) ? JS_TRUE : JS_FALSE);
-	break;
-case GJS_OM_PROP_MAIN_ADDON_ON:
-{
-	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-	*vp = BOOLEAN_TO_JSVAL( scene->main_addon_selected ? JS_TRUE : JS_FALSE);
-}
-break;
-case GJS_OM_PROP_IS_OVER:
-{
-	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-	*vp = BOOLEAN_TO_JSVAL( gf_sc_is_over(odm->term->compositor, scene->graph) ? JS_TRUE : JS_FALSE);
-}
-break;
-case GJS_OM_PROP_IS_PULLING:
-{
-	GF_Channel *ch = gf_list_get(odm->channels, 0);
-	*vp = BOOLEAN_TO_JSVAL((ch && ch->is_pulling) ? JS_TRUE : JS_FALSE);
-}
-break;
-case GJS_OM_PROP_DYNAMIC_SCENE:
-	*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->is_dynamic_scene ? JS_TRUE : JS_FALSE);
-	break;
-case GJS_OM_PROP_SERVICE_NAME:
-{
-	GF_NetworkCommand com;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_SERVICE_INFO;
-	com.info.service_id = odi.od->ServiceID;
-	gf_term_service_command(odm->net_service, &com);
-	if (com.info.name) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, com.info.name ) );
-	} else {
-		*vp = JSVAL_NULL;
-	}
-}
-break;
-case GJS_OM_PROP_NTP_DIFF:
-	*vp = INT_TO_JSVAL( odi.ntp_diff);
-	break;
-
-case GJS_OM_PROP_MAIN_ADDON_URL:
-{
-	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-	u32 i, count = gf_list_count(scene->resources);
-	*vp = JSVAL_NULL;
-	for (i=0; i < count; i++) {
-		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			if (!strstr(an_odm->addon->url, "://")) {
-				char szURL[GF_MAX_PATH];
-				sprintf(szURL, "gpac://%s", an_odm->addon->url);
-				*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szURL) );
-			} else {
-				*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, an_odm->addon->url) );
-			}
-		}
-	}
-}
-break;
-case GJS_OM_PROP_REVERSE_PLAYBACK:
-{
-	u32 i, count;
-	GF_Err e;
-	GF_NetworkCommand com;
-	GF_Scene *scene;
-
-	scene = odm->subscene ? odm->subscene : odm->parentscene;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
-
-	//we may need to check the main addon for timeshifting
-	count = gf_list_count(scene->resources);
-	for (i=0; i < count; i++) {
-		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			odm = an_odm;
-		}
-	}
-
-	//can be NULL
-	com.base.on_channel = gf_list_get(odm->channels, 0);
-	e = gf_term_service_command(odm->net_service, &com);
-	*vp = BOOLEAN_TO_JSVAL((e==GF_OK) ? GF_TRUE : GF_FALSE );
-}
-break;
-case GJS_OM_PROP_SCALABLE_ENHANCEMENT:
-	*vp = BOOLEAN_TO_JSVAL(odm && (odm->lower_layer_odm || odm->scalable_addon) ? JS_TRUE : JS_FALSE);
-	break;
-case GJS_OM_PROP_MAIN_ADDON_MEDIATIME:
-{
-	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
-	u32 i, count = gf_list_count(scene->resources);
-
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, -1) );
-	if (! scene->main_addon_selected) break;
-
-	for (i=0; i < count; i++) {
-		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-		if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			if (an_odm->duration) {
-				Double now = gf_clock_time(scene->dyn_ck) / 1000.0;
-				now -= ((Double) an_odm->addon->media_pts) / 90000.0;
-				now += ((Double) an_odm->addon->media_timestamp) / an_odm->addon->media_timescale;
-				*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, now) );
-			}
-		}
-	}
-}
-break;
-
-case GJS_OM_PROP_DEPENDENT_GROUPS:
-{
-	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) {
-		*vp = INT_TO_JSVAL(com.quality_query.dependent_group_index);
-	} else {
-		*vp = INT_TO_JSVAL(0);
-	}
-	break;
-}
-
-case GJS_OM_PROP_IS_VR_SCENE:
-	*vp = BOOLEAN_TO_JSVAL(odm->subscene && odm->subscene->vr_type ? JS_TRUE : JS_FALSE);
-	break;
-case GJS_OM_PROP_DISABLED:
-	*vp = BOOLEAN_TO_JSVAL(odm->OD->RedirectOnly ? JS_TRUE : JS_FALSE);
-	break;
-}
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_get_quality)
-{
-	GF_NetworkCommand com;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-	s32 idx, dep_idx=0;
-
-	if (!odm) return JS_TRUE;
-	if (argc<1) return JS_TRUE;
-	if (! JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
-	idx = JSVAL_TO_INT(argv[0]);
-	if (argc>=2) dep_idx = JSVAL_TO_INT(argv[1]);
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_SERVICE_QUALITY_QUERY;
-	com.quality_query.index = 1 + idx;
-	com.quality_query.dependent_group_index = dep_idx;
-	
-	com.base.on_channel = gf_list_get(odm->channels, 0);
-
-	if (gf_term_service_command(odm->net_service, &com) == GF_OK) {
-		JSObject *a = JS_NewObject(c, NULL, NULL, NULL);
-
-		JS_DefineProperty(c, a, "ID", STRING_TO_JSVAL(JS_NewStringCopyZ(c, com.quality_query.ID ? com.quality_query.ID : "")) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "mime", STRING_TO_JSVAL(JS_NewStringCopyZ(c, com.quality_query.mime ? com.quality_query.mime : "")) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "codec", STRING_TO_JSVAL(JS_NewStringCopyZ(c, com.quality_query.codec ? com.quality_query.codec : "")) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "width", INT_TO_JSVAL(com.quality_query.width), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "height", INT_TO_JSVAL(com.quality_query.height), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "bandwidth", INT_TO_JSVAL(com.quality_query.bandwidth), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "interlaced", BOOLEAN_TO_JSVAL(com.quality_query.interlaced), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "fps", DOUBLE_TO_JSVAL( JS_NewDouble(c, com.quality_query.fps) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "samplerate", INT_TO_JSVAL(com.quality_query.sample_rate), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "channels", INT_TO_JSVAL(com.quality_query.nb_channels), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "par_num", INT_TO_JSVAL(com.quality_query.par_num), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "par_den", INT_TO_JSVAL(com.quality_query.par_den), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "disabled", BOOLEAN_TO_JSVAL(com.quality_query.disabled), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "is_selected", BOOLEAN_TO_JSVAL(com.quality_query.is_selected), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "automatic", BOOLEAN_TO_JSVAL(com.quality_query.automatic), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "tile_mode", INT_TO_JSVAL(com.quality_query.tile_adaptation_mode), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "dependent_groups", INT_TO_JSVAL(com.quality_query.dependent_group_index), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(a) );
-	} else {
-		SMJS_SET_RVAL(JSVAL_NULL);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_get_srd)
-{
-	GF_NetworkCommand com;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-	s32 dep_idx=0;
-	s32 x, y, w, h;
-
-	if (!odm) return JS_TRUE;
-	
-	x = y = w = h = 0;
-	if (argc && JSVAL_IS_INT(argv[0]) ) {
-		dep_idx = JSVAL_TO_INT(argv[0]);
-
-		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;
-		}
-	} else if (odm && odm->mo && odm->mo->srd_w && odm->mo->srd_h) {
-		x = odm->mo->srd_x;
-		y = odm->mo->srd_y;
-		w = odm->mo->srd_w;
-		h = odm->mo->srd_h;
-	}
-	
-	if (w && h) {
-		JSObject *a = JS_NewObject(c, NULL, NULL, NULL);
-
-		JS_DefineProperty(c, a, "x", INT_TO_JSVAL(x), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "y", INT_TO_JSVAL(y), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "w", INT_TO_JSVAL(w), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, a, "h", INT_TO_JSVAL(h), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(a) );
-	} else {
-		SMJS_SET_RVAL(JSVAL_NULL);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_select_quality)
-{
-	GF_NetworkCommand com;
-	char *ID = NULL;
-	s32 tile_mode = -1;
-	u32 dep_idx = 0;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (!odm) return JS_TRUE;
-
-	if ((argc>=1) && JSVAL_IS_STRING(argv[0])) {
-		ID = SMJS_CHARS(c, argv[0]);
-		if ((argc>=2) && JSVAL_IS_INT(argv[1])) {
-			dep_idx = JSVAL_TO_INT( argv[1]);
-		}
-	}
-	if ((argc==1) && JSVAL_IS_INT(argv[0])) {
-		tile_mode = JSVAL_TO_INT( argv[0]);
-	}
-	if (!ID && (tile_mode<0) ) {
-		return JS_TRUE;
-	}
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.command_type = GF_NET_SERVICE_QUALITY_SWITCH;
-	com.base.on_channel = gf_list_get(odm->channels, 0);
-	
-	if (tile_mode>=0) {
-		com.switch_quality.set_tile_mode_plus_one = 1 + tile_mode;
-	} else {
-		com.switch_quality.dependent_group_index = dep_idx;
-		if (!strcmp(ID, "auto")) {
-			com.switch_quality.set_auto = 1;
-		} else {
-			com.switch_quality.ID = ID;
-		}
-	}
-
-	gf_term_service_command(odm->net_service, &com);
-
-	SMJS_FREE(c, ID);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_disable_main_addon)
-{
-	SMJS_OBJ
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (!odm || !odm->subscene || !odm->subscene->main_addon_selected) return JS_TRUE;
-
-	gf_scene_resume_live(odm->subscene);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_select_service)
-{
-	u32 sid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (!odm) return JS_TRUE;
-	if (argc<1) return JS_TRUE;
-	if (! JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
-	sid = JSVAL_TO_INT(argv[0]);
-
-	gf_term_select_service(odm->term, odm->subscene ? odm : odm->parentscene->root_od, sid);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_select)
-{
-	SMJS_OBJ
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (!odm) return JS_TRUE;
-
-#ifndef GPAC_DISABLE_PLAYER
-	gf_scene_select_object(odm->parentscene, odm);
-#endif
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gjs_odm_get_resource)
-{
-	GF_ObjectManager *an_odm = NULL;
-	u32 idx;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (!odm) return JS_TRUE;
-	if (argc<1) return JS_TRUE;
-	if (! JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
-	idx = JSVAL_TO_INT(argv[0]);
-
-	if (odm->subscene) {
-		an_odm = gf_list_get(odm->subscene->resources, idx);
-	}
-	if (an_odm && an_odm->net_service) {
-		JSObject *anobj;
-		JSClass *_class = JS_GET_CLASS(c, obj);
-		anobj = JS_NewObject(c, _class, 0, 0);
-		SMJS_SET_PRIVATE(c, anobj, an_odm);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(anobj) );
-	} else {
-		SMJS_SET_RVAL(JSVAL_NULL);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_addon_layout)
-{
-	u32 pos, size;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (argc<2) return JS_TRUE;
-	if (! JSVAL_IS_INT(argv[0]) ) return JS_TRUE;
-	if (! JSVAL_IS_INT(argv[1]) ) return JS_TRUE;
-	pos = JSVAL_TO_INT(argv[0]);
-	size = JSVAL_TO_INT(argv[1]);
-
-	gf_scene_set_addon_layout_info(odm->subscene, pos, size);
-	return JS_TRUE;
-}
-
-static void do_enable_addon(GF_ObjectManager *odm, char *addon_url, Bool enable_if_defined, Bool disable_if_defined )
-{
-	GF_AssociatedContentLocation addon_info;
-	memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
-	addon_info.external_URL = addon_url;
-	addon_info.timeline_id = -100;
-	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);
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_enable_addon)
-{
-	Bool do_disable = GF_FALSE;
-	char *addon_url = NULL;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (! JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
-	if ((argc==2) && JSVAL_IS_BOOLEAN(argv[1])) {
-		do_disable = (Bool) JSVAL_TO_BOOLEAN(argv[1]);
-	}
-
-
-	addon_url = SMJS_CHARS(c, argv[0]);
-	if (addon_url) {
-		do_enable_addon(odm, addon_url, GF_TRUE, do_disable);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_odm_declare_addon)
-{
-	char *addon_url = NULL;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_ObjectManager *odm = (GF_ObjectManager *)SMJS_GET_PRIVATE(c, obj);
-
-	if (! JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
-
-	addon_url = SMJS_CHARS(c, argv[0]);
-	if (addon_url) {
-		do_enable_addon(odm, addon_url, GF_FALSE, GF_FALSE);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_object_manager)
-{
-	JSObject *anobj;
-	u32 i, count;
-	GF_ObjectManager *odm = NULL;
-	char *service_url = NULL;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	GF_Terminal *term = gpac_get_term(c, obj);
-	GF_Scene *scene = term->root_scene;
-
-	if (JSVAL_IS_STRING(argv[0]) ) {
-		char *url, *an_url;
-		u32 url_len;
-		url = service_url = SMJS_CHARS(c, argv[0]);
-		if (!service_url) {
-			SMJS_SET_RVAL(JSVAL_NULL);
-			return JS_TRUE;
-		}
-		if (!strncmp(service_url, "gpac://", 7)) url = service_url + 7;
-		if (!strncmp(service_url, "file://", 7)) url = service_url + 7;
-		url_len = (u32) strlen(url);
-		an_url = strchr(url, '#');
-		if (an_url) url_len -= (u32) strlen(an_url);
-		
-		count = gf_list_count(scene->resources);
-		for (i=0; i<count; i++) {
-			odm = gf_list_get(scene->resources, i);
-			if (odm->net_service) {
-				an_url = odm->net_service->url;
-				if (!strncmp(an_url, "gpac://", 7)) an_url = an_url + 7;
-				if (!strncmp(an_url, "file://", 7)) an_url = an_url + 7;
-				if (!strncmp(an_url, url, url_len))
-					break;
-			}
-			odm = NULL;
-		}
-	}
-
-	SMJS_FREE(c, service_url);
-
-	if (!odm) {
-		SMJS_SET_RVAL(JSVAL_NULL);
-		return JS_TRUE;
-	}
-
-	anobj = JS_NewObject(c, &gjs->odmClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, anobj, odm);
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(anobj) );
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gpac_new_storage)
-{
-	char szFile[GF_MAX_PATH];
-	JSObject *anobj;
-	GF_Config *storage = NULL;
-	char *storage_url = NULL;
-	u8 hash[20];
-	char temp[3];
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-
-	if (JSVAL_IS_STRING(argv[0]) ) {
-		u32 i, count;
-		storage_url = SMJS_CHARS(c, argv[0]);
-		if (!storage_url) {
-			SMJS_SET_RVAL(JSVAL_NULL);
-			return JS_TRUE;
-		}
-
-		szFile[0]=0;
-		gf_sha1_csum((u8 *)storage_url, (u32) strlen(storage_url), hash);
-		for (i=0; i<20; i++) {
-			sprintf(temp, "%02X", hash[i]);
-			strcat(szFile, temp);
-		}
-		strcat(szFile, ".cfg");
-
-		count = gf_list_count(gjs->storages);
-		for (i=0; i<count; i++) {
-			GF_Config *a_cfg = gf_list_get(gjs->storages, i);
-			char *cfg_name = gf_cfg_get_filename(a_cfg);
-
-			if (strstr(cfg_name, szFile)) {
-				storage = a_cfg;
-				gf_free(cfg_name);
-				break;
-			}
-			gf_free(cfg_name);
-		}
-
-		if (!storage) {
-			const char *storage_dir = gf_cfg_get_key(gjs->term->user->config, "General", "StorageDirectory");
-
-			storage = gf_cfg_force_new(storage_dir, szFile);
-			if (storage) {
-				gf_cfg_set_key(storage, "GPAC", "StorageURL", storage_url);
-				gf_list_add(gjs->storages, storage);
-			}
-		}
-
-		SMJS_FREE(c, storage_url);
-	}
-
-	if (!storage) {
-		SMJS_SET_RVAL(JSVAL_NULL);
-		return JS_TRUE;
-	}
-	anobj = JS_NewObject(c, &gjs->storageClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, anobj, storage);
-
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(anobj) );
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( gpacevt_getProperty)
-
-GF_GPACJSExt *gjs = SMJS_GET_PRIVATE(c, obj);
-GF_Event *evt = gjs->evt;
-if (!evt) return 0;
-
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case GJS_EVT_PROP_KEYCODE:
-#ifndef GPAC_DISABLE_SVG
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_get_key_name(evt->key.key_code) ));
-#endif
-		break;
-	case GJS_EVT_PROP_MOUSE_X:
-		*vp = INT_TO_JSVAL(evt->mouse.x);
-		break;
-	case GJS_EVT_PROP_MOUSE_Y:
-		*vp = INT_TO_JSVAL(evt->mouse.y);
-		break;
-	case GJS_EVT_PROP_PICKED:
-		if (gjs->term->compositor->hit_appear) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		else if (gf_list_count(gjs->term->compositor->previous_sensors) ) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		else if (gjs->term->compositor->text_selection) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		else *vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		break;
-	case GJS_EVT_PROP_WHEEL:
-		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(evt->mouse.wheel_pos)) );
-		break;
-	case GJS_EVT_PROP_BUTTON:
-		*vp = INT_TO_JSVAL( evt->mouse.button);
-		break;
-	case GJS_EVT_PROP_TYPE:
-		*vp = INT_TO_JSVAL(evt->type);
-		break;
-	case GJS_EVT_PROP_NAME:
-#ifndef GPAC_DISABLE_SVG
-		*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, gf_dom_event_get_name(evt->type) ));
-#endif
-		break;
-	case GJS_EVT_PROP_HWKEY:
-		*vp = INT_TO_JSVAL(evt->key.hw_code);
-		break;
-	}
-} else if (SMJS_ID_IS_STRING(id)) {
-	char *name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-	if (!strcmp(name, "target_url")) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, evt->navigate.to_url) );
-	}
-	else if (!strcmp(name, "files")) {
-		u32 i, idx;
-		jsval v;
-		JSObject *files_array = JS_NewArrayObject(c, 0, NULL);
-		for (i=0; i<evt->open_file.nb_files; i++) {
-			if (evt->open_file.files[i]) {
-				JS_GetArrayLength(c, files_array, &idx);
-				v = STRING_TO_JSVAL( JS_NewStringCopyZ(c, evt->open_file.files[i]) );
-				JS_SetElement(c, files_array, idx, &v);
-			}
-		}
-		*vp = OBJECT_TO_JSVAL(files_array);
-	}
-	SMJS_FREE(c, name);
-}
-
-return JS_TRUE;
-}
-
-static Bool gjs_event_filter_process(GF_GPACJSExt *gjs, GF_Event *evt)
-{
-	Bool res;
-	jsval argv[1], rval;
-	rval = JSVAL_VOID;
-
-	gjs->evt = evt;
-	SMJS_SET_PRIVATE(gjs->c, gjs->evt_obj, gjs);
-	argv[0] = OBJECT_TO_JSVAL(gjs->evt_obj);
-	rval = BOOLEAN_TO_JSVAL(JS_TRUE);
-	JS_CallFunctionValue(gjs->c, gjs->evt_filter_obj, gjs->evt_fun, 1, argv, &rval);
-	SMJS_SET_PRIVATE(gjs->c, gjs->evt_obj, NULL);
-	gjs->evt = NULL;
-
-	res = 0;
-	if (JSVAL_IS_BOOLEAN(rval) ) {
-		res = (JSVAL_TO_BOOLEAN(rval)==JS_TRUE) ? GF_TRUE : GF_FALSE;
-	} else if (JSVAL_IS_INT(rval) ) {
-		res = (JSVAL_TO_INT(rval)) ? 1 : 0;
-	}
-	return res;
-}
-
-static Bool gjs_event_filter(void *udta, GF_Event *evt, Bool consumed_by_compositor)
-{
-	u32 lock_fail;
-	Bool res;
-	GF_GPACJSExt *gjs = (GF_GPACJSExt *)udta;
-	if (consumed_by_compositor) return 0;
-
-	if (gjs->evt != NULL) return 0;
-
-	lock_fail=0;
-	res = gf_mx_try_lock(gjs->term->compositor->mx);
-	if (!res) {
-		lock_fail=1;
-	} else {
-		res = gf_sg_try_lock_javascript(gjs->c);
-		if (!res) lock_fail=2;
-	}
-	if (lock_fail) {
-		GF_Event *evt_clone;
-		gf_mx_p(gjs->event_mx);
-		evt_clone = gf_malloc(sizeof(GF_Event));
-		memcpy(evt_clone, evt, sizeof(GF_Event));
-		gf_list_add(gjs->event_queue, evt_clone);
-		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[GPACJS] Couldn't lock % mutex, queing event\n", (lock_fail==2) ? "JavaScript" : "Compositor"));
-		gf_mx_v(gjs->event_mx);
-
-		if (lock_fail==2){
-			gf_mx_v(gjs->term->compositor->mx);
-		}
-		return 0;
-	}
-	
-	gf_mx_p(gjs->event_mx);
-	while (gf_list_count(gjs->event_queue)) {
-		GF_Event *an_evt = (GF_Event *) gf_list_pop_front(gjs->event_queue);
-		gjs_event_filter_process(gjs, an_evt);
-		gf_free(an_evt);
-	}
-	gf_mx_v(gjs->event_mx);
-	
-	res = gjs_event_filter_process(gjs, evt);
-
-	gf_mx_v(gjs->term->compositor->mx);
-	gf_sg_lock_javascript(gjs->c, 0);
-	return res;
-}
-
-static JSBool SMJS_FUNCTION(gpac_set_event_filter)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-
-	if (! JSVAL_IS_NULL(gjs->evt_fun) ) return JS_TRUE;
-
-	gjs->evt_fun = argv[0];
-	gjs->evt_filter_obj = obj;
-	gjs->c = c;
-	gjs->evt_filter.udta = gjs;
-	gjs->evt_filter.on_event = gjs_event_filter;
-	gf_term_add_event_filter(gjs->term, &gjs->evt_filter);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_set_focus)
-{
-	GF_Node *elt;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!argc) return JS_FALSE;
-
-	if (JSVAL_IS_NULL(argv[0])) {
-		gf_sc_focus_switch_ring(term->compositor, 0, NULL, 0);
-		return JS_TRUE;
-	}
-
-	if (JSVAL_IS_STRING(argv[0])) {
-		char *focus_type = SMJS_CHARS(c, argv[0]);
-		if (!stricmp(focus_type, "previous")) {
-			gf_sc_focus_switch_ring(term->compositor, 1, NULL, 0);
-		}
-		else if (!stricmp(focus_type, "next")) {
-			gf_sc_focus_switch_ring(term->compositor, 0, NULL, 0);
-		}
-		SMJS_FREE(c, focus_type);
-	} else if (JSVAL_IS_OBJECT(argv[0])) {
-		elt = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-		if (!elt) return JS_TRUE;
-
-		gf_sc_focus_switch_ring(term->compositor, 0, elt, 2);
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_get_scene)
-{
-	GF_Node *elt;
-	u32 w, h;
-	JSObject *scene_obj;
-#ifndef GPAC_DISABLE_SCENEGRAPH
-	GF_SceneGraph *sg;
-#endif
-	GF_Scene *scene=NULL;
-
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_GPACJSExt *gjs = (GF_GPACJSExt *)SMJS_GET_PRIVATE(c, obj);
-	if (!gjs || !argc || !JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-
-	elt = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!elt) return JS_TRUE;
-	switch (elt->sgprivate->tag) {
-#ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_Inline:
-		scene = (GF_Scene *)gf_node_get_private(elt);
-		break;
-#endif
-
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline:
-		scene = (GF_Scene *)gf_node_get_private(elt);
-		break;
-#endif
-
-#ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_animation:
-		sg = gf_sc_animation_get_scenegraph(elt);
-		scene = (GF_Scene *)gf_sg_get_private(sg);
-		break;
-#endif
-	default:
-		return JS_TRUE;
-	}
-	if (!scene) return JS_TRUE;
-
-
-	scene_obj = JS_NewObject(c, &gjs->anyClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, scene_obj, scene);
-	gf_sg_get_scene_size_info(scene->graph, &w, &h);
-	JS_DefineProperty(c, scene_obj, "width", INT_TO_JSVAL(w), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, scene_obj, "height", INT_TO_JSVAL(h), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, scene_obj, "connected", BOOLEAN_TO_JSVAL(scene->graph ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(scene_obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gpac_show_keyboard)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Terminal *term = gpac_get_term(c, obj);
-	if (!argc) return JS_FALSE;
-
-	if (JSVAL_IS_BOOLEAN(argv[0])) {
-		Bool show = JSVAL_TO_BOOLEAN(argv[0])==JS_TRUE;
-		GF_Event evt;
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = show ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END;
-		gf_term_user_event(term, &evt);
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(gjs_storage_get_option)
-{
-	const char *opt = NULL;
-	char *sec_name, *key_name;
-	s32 idx = -1;
-	JSString *s;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
-	if (!config) return JS_FALSE;
-
-	if (argc < 2) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1]) && !JSVAL_IS_INT(argv[1])) return JS_FALSE;
-
-	sec_name = SMJS_CHARS(c, argv[0]);
-	key_name = NULL;
-	if (JSVAL_IS_INT(argv[1])) {
-		idx = JSVAL_TO_INT(argv[1]);
-	} else if (JSVAL_IS_STRING(argv[1]) ) {
-		key_name = SMJS_CHARS(c, argv[1]);
-	}
-
-	if (key_name) {
-		opt = gf_cfg_get_key(config, sec_name, key_name);
-	} else if (idx>=0) {
-		opt = gf_cfg_get_key_name(config, sec_name, idx);
-	} else {
-		opt = NULL;
-	}
-	if (key_name) {
-		SMJS_FREE(c, key_name);
-	}
-	SMJS_FREE(c, sec_name);
-
-	if (opt) {
-		s = JS_NewStringCopyZ(c, opt);
-		SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	} else {
-		SMJS_SET_RVAL( JSVAL_NULL );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_storage_set_option)
-{
-	char *sec_name, *key_name, *key_val;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
-	if (!config) return JS_FALSE;
-
-	if (argc < 3) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
-
-	sec_name = SMJS_CHARS(c, argv[0]);
-	key_name = SMJS_CHARS(c, argv[1]);
-	key_val = NULL;
-	if (JSVAL_IS_STRING(argv[2]))
-		key_val = SMJS_CHARS(c, argv[2]);
-
-	gf_cfg_set_key(config, sec_name, key_name, key_val);
-
-	SMJS_FREE(c, sec_name);
-	SMJS_FREE(c, key_name);
-	if (key_val) {
-		SMJS_FREE(c, key_val);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(gjs_storage_save)
-{
-	SMJS_OBJ
-	GF_Config *config = (GF_Config *)SMJS_GET_PRIVATE(c, obj);
-	if (!config) return JS_FALSE;
-
-	gf_cfg_save(config);
-	return JS_TRUE;
-}
-
-static void gjs_load(GF_JSUserExtension *jsext, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
-{
-	GF_GPACJSExt *gjs;
-	GF_JSAPIParam par;
-
-	JSPropertySpec gpacEvtClassProps[] = {
-		SMJS_PROPERTY_SPEC("keycode",			GJS_EVT_PROP_KEYCODE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_x",			GJS_EVT_PROP_MOUSE_X, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_y",			GJS_EVT_PROP_MOUSE_Y, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("picked",			GJS_EVT_PROP_PICKED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("wheel",				GJS_EVT_PROP_WHEEL, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("button",			GJS_EVT_PROP_BUTTON, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("type",				GJS_EVT_PROP_TYPE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("name",				GJS_EVT_PROP_NAME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("hwkey",				GJS_EVT_PROP_HWKEY, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec gpacEvtClassFuncs[] = {
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-
-	JSPropertySpec gpacClassProps[] = {
-
-		SMJS_PROPERTY_SPEC("last_working_directory",	GJS_GPAC_PROP_LAST_WORK_DIR, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-		SMJS_PROPERTY_SPEC("scale_x",					GJS_GPAC_PROP_SCALE_X, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("scale_y",					GJS_GPAC_PROP_SCALE_Y, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("translation_x",				GJS_GPAC_PROP_TRANSLATION_X, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("translation_y",				GJS_GPAC_PROP_TRANSLATION_Y, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("rectangular_textures",		GJS_GPAC_PROP_RECT_TEXTURES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("batteryOn",					GJS_GPAC_PROP_BATTERY_ON, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("batteryCharging",			GJS_GPAC_PROP_BATTERY_CHARGE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("batteryPercent",			GJS_GPAC_PROP_BATTERY_PERCENT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("batteryLifeTime",			GJS_GPAC_PROP_BATTERY_LIFETIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("batteryFullLifeTime",		GJS_GPAC_PROP_BATTERY_LIFETIME_FULL, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("hostname",					GJS_GPAC_PROP_HOSTNAME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("fullscreen",				GJS_GPAC_PROP_FULLSCREEN, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-		SMJS_PROPERTY_SPEC("current_path",				GJS_GPAC_PROP_CURRENT_PATH, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("volume",					GJS_GPAC_PROP_VOLUME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-		SMJS_PROPERTY_SPEC("navigation",				GJS_GPAC_PROP_NAVIGATION, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-		SMJS_PROPERTY_SPEC("navigation_type",			GJS_GPAC_PROP_NAVIGATION_TYPE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-		SMJS_PROPERTY_SPEC("hardware_yuv",				GJS_GPAC_PROP_HARDWARE_YUV, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("hardware_rgb",				GJS_GPAC_PROP_HARDWARE_RGB, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("hardware_rgba",				GJS_GPAC_PROP_HARDWARE_RGBA, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("hardware_stretch",			GJS_GPAC_PROP_HARDWARE_STRETCH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("screen_width",				GJS_GPAC_PROP_SCREEN_WIDTH, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("screen_height",				GJS_GPAC_PROP_SCREEN_HEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("http_max_bitrate",			GJS_GPAC_PROP_HTTP_MAX_RATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-		SMJS_PROPERTY_SPEC("http_bitrate",				GJS_GPAC_PROP_HTTP_RATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("fps",						GJS_GPAC_PROP_FPS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("sim_fps",					GJS_GPAC_PROP_SIM_FPS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("cpu_load",					GJS_GPAC_PROP_CPU, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("cpu",						GJS_GPAC_PROP_CPU, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("nb_cores",					GJS_GPAC_PROP_NB_CORES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("system_memory",				GJS_GPAC_PROP_MEMORY_SYSTEM, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("memory",					GJS_GPAC_PROP_MEMORY, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("argc",						GJS_GPAC_PROP_ARGC, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("caption",					GJS_GPAC_PROP_CAPTION, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-		SMJS_PROPERTY_SPEC("focus_highlight",			GJS_GPAC_PROP_FOCUS_HIGHLIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-		SMJS_PROPERTY_SPEC("dpi_x",						GJS_GPAC_PROP_DPI_X, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("dpi_y",						GJS_GPAC_PROP_DPI_Y, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("sensors_active",			GJS_GPAC_PROP_SENSORS_ACTIVE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec gpacClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("get_option",		gpac_get_option, 3),
-		SMJS_FUNCTION_SPEC("set_option",		gpac_set_option, 4),
-		SMJS_FUNCTION_SPEC("get_arg",		gpac_get_arg, 1),
-		SMJS_FUNCTION_SPEC("enum_directory",	gpac_enum_directory, 1),
-		SMJS_FUNCTION_SPEC("set_size",		gpac_set_size, 1),
-		SMJS_FUNCTION_SPEC("exit",				gpac_exit, 0),
-		SMJS_FUNCTION_SPEC("set_3d",				gpac_set_3d, 1),
-		SMJS_FUNCTION_SPEC("move_window",			gpac_move_window, 2),
-		SMJS_FUNCTION_SPEC("get_scene_time",		gpac_get_scene_time, 1),
-		SMJS_FUNCTION_SPEC("migrate_url",			gpac_migrate_url, 1),
-		SMJS_FUNCTION_SPEC("set_event_filter",	gpac_set_event_filter, 1),
-		SMJS_FUNCTION_SPEC("set_focus",			gpac_set_focus, 1),
-		SMJS_FUNCTION_SPEC("get_scene",			gpac_get_scene, 1),
-		SMJS_FUNCTION_SPEC("error_string",		gpac_error_string, 1),
-		SMJS_FUNCTION_SPEC("show_keyboard",		gpac_show_keyboard, 1),
-		SMJS_FUNCTION_SPEC("trigger_gc",		gpac_trigger_gc, 1),
-		SMJS_FUNCTION_SPEC("get_object_manager",		gpac_get_object_manager, 1),
-		SMJS_FUNCTION_SPEC("new_storage",		gpac_new_storage, 1),
-		SMJS_FUNCTION_SPEC("switch_quality",		gpac_switch_quality, 1),
-		SMJS_FUNCTION_SPEC("reload",		gpac_reload, 1),
-		SMJS_FUNCTION_SPEC("navigation_supported",		gpac_navigation_supported, 1),
-		SMJS_FUNCTION_SPEC("set_back_color",		gpac_set_back_color, 3),
-
-
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-	
-	JSPropertySpec odmClassProps[] = {
-		SMJS_PROPERTY_SPEC("ID",				GJS_OM_PROP_ID, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("nb_resources",		GJS_OM_PROP_NB_RES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("service_url",		GJS_OM_PROP_URL, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("duration",			GJS_OM_PROP_DUR, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("clock_time",		GJS_OM_PROP_CLOCK, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("clock_drift",		GJS_OM_PROP_DRIFT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("status",			GJS_OM_PROP_STATUS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("buffer",			GJS_OM_PROP_BUFFER, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("db_unit_count",		GJS_OM_PROP_DB_COUNT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("cb_unit_count",		GJS_OM_PROP_CB_COUNT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("cb_capacity",		GJS_OM_PROP_CB_CAP, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("type",				GJS_OM_PROP_TYPE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("samplerate",		GJS_OM_PROP_SAMPLERATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("channels",			GJS_OM_PROP_CHANNELS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("lang",				GJS_OM_PROP_LANG, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("width",				GJS_OM_PROP_WIDTH, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("height",			GJS_OM_PROP_HEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("pixelformt",		GJS_OM_PROP_PIXELFORMAT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("par",				GJS_OM_PROP_PAR, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("dec_frames",		GJS_OM_PROP_DEC_FRAMES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("drop_frames",		GJS_OM_PROP_DROP_FRAMES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("max_dec_time",		GJS_OM_PROP_DEC_TIME_MAX, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("total_dec_time",	GJS_OM_PROP_DEC_TIME_TOTAL, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("avg_bitrate",		GJS_OM_PROP_AVG_RATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("max_bitrate",		GJS_OM_PROP_MAX_RATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("service_handler",	GJS_OM_PROP_SERVICE_HANDLER, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("codec",				GJS_OM_PROP_CODEC, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("nb_qualities",		GJS_OM_PROP_NB_QUALITIES, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("max_buffer",		GJS_OM_PROP_MAX_BUFFER, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("min_buffer",		GJS_OM_PROP_MIN_BUFFER, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("frame_duration",	GJS_OM_PROP_FRAME_DUR, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("irap_frames",		GJS_OM_PROP_NB_IRAP, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("irap_dec_time",		GJS_OM_PROP_IRAP_DEC_TIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("irap_max_time",		GJS_OM_PROP_IRAP_MAX_TIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("service_id",		GJS_OM_PROP_SERVICE_ID, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("selected_service",	GJS_OM_PROP_SELECTED_SERVICE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("bandwidth_down",	GJS_OM_PROP_BANDWIDTH_DOWN, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("nb_http",			GJS_OM_PROP_NB_HTTP, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("timeshift_depth",	GJS_OM_PROP_TIMESHIFT_DEPTH, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("timeshift_time",	GJS_OM_PROP_TIMESHIFT_TIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("is_addon",			GJS_OM_PROP_IS_ADDON, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("main_addon_on",		GJS_OM_PROP_MAIN_ADDON_ON, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("is_over",			GJS_OM_PROP_IS_OVER, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("is_pulling",		GJS_OM_PROP_IS_PULLING, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("dynamic_scene",		GJS_OM_PROP_DYNAMIC_SCENE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("service_name",		GJS_OM_PROP_SERVICE_NAME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("ntp_diff",			GJS_OM_PROP_NTP_DIFF, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("main_addon_url",	GJS_OM_PROP_MAIN_ADDON_URL, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("reverse_playback_supported", GJS_OM_PROP_REVERSE_PLAYBACK, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("scalable_enhancement",		GJS_OM_PROP_SCALABLE_ENHANCEMENT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("main_addon_media_time",		GJS_OM_PROP_MAIN_ADDON_MEDIATIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("dependent_groups",		GJS_OM_PROP_DEPENDENT_GROUPS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("vr_scene",		GJS_OM_PROP_IS_VR_SCENE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("disabled",		GJS_OM_PROP_DISABLED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-
-	JSFunctionSpec odmClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("declare_addon", gjs_odm_declare_addon, 1),
-		SMJS_FUNCTION_SPEC("enable_addon", gjs_odm_enable_addon, 1),
-		SMJS_FUNCTION_SPEC("addon_layout", gjs_odm_addon_layout, 1),
-		SMJS_FUNCTION_SPEC("get_resource", gjs_odm_get_resource, 1),
-		SMJS_FUNCTION_SPEC("get_quality", gjs_odm_get_quality, 1),
-		SMJS_FUNCTION_SPEC("select_service", gjs_odm_select_service, 1),
-		SMJS_FUNCTION_SPEC("select_quality", gjs_odm_select_quality, 1),
-		SMJS_FUNCTION_SPEC("disable_main_addon", gjs_odm_disable_main_addon, 1),
-		SMJS_FUNCTION_SPEC("select", gjs_odm_select, 1),
-		SMJS_FUNCTION_SPEC("get_srd", gjs_odm_get_srd, 1),
-
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-
-
-	JSPropertySpec storageClassProps[] = {
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec storageClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("get_option",		gjs_storage_get_option, 2),
-		SMJS_FUNCTION_SPEC("set_option",		gjs_storage_set_option, 3),
-		SMJS_FUNCTION_SPEC("save",				gjs_storage_save, 0),
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-
-
-	gjs = jsext->udta;
-	/*nothing to do on unload*/
-	if (unload) {
-		gjs->nb_loaded--;
-		/*if we destroy the script context holding the gpac event filter (only one for the time being), remove the filter*/
-		if ((gjs->c==c) && gjs->evt_filter.udta) {
-			gf_term_remove_event_filter(gjs->term, &gjs->evt_filter);
-			gjs->evt_filter.udta = NULL;
-		}
-		return;
-	}
-
-	gjs->nb_loaded++;
-
-	if (!scene) return;
-
-	JS_SETUP_CLASS(gjs->gpacClass, "GPAC", JSCLASS_HAS_PRIVATE, gpac_getProperty, gpac_setProperty, JS_FinalizeStub);
-
-	if (!gjs->gpac_obj) {
-		GF_JS_InitClass(c, global, 0, &gjs->gpacClass, 0, 0, gpacClassProps, gpacClassFuncs, 0, 0);
-		gjs->gpac_obj = JS_DefineObject(c, global, "gpac", &gjs->gpacClass._class, 0, 0);
-
-		if (scene->script_action) {
-			if (scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_TERM, scene->RootNode, &par)) {
-				gjs->term = par.term;
-			}
-		}
-		SMJS_SET_PRIVATE(c, gjs->gpac_obj, gjs);
-
-		JS_SETUP_CLASS(gjs->odmClass, "ODM", JSCLASS_HAS_PRIVATE, odm_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &gjs->odmClass, 0, 0, odmClassProps, odmClassFuncs, 0, 0);
-
-
-		JS_SETUP_CLASS(gjs->storageClass, "Storage", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &gjs->storageClass, 0, 0, storageClassProps, storageClassFuncs, 0, 0);
-	} else {
-		JS_DefineProperty(c, global, "gpac", OBJECT_TO_JSVAL(gjs->gpac_obj), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	}
-
-	if (!gjs->evt_obj) {
-		JS_SETUP_CLASS(gjs->gpacEvtClass, "GPACEVT", JSCLASS_HAS_PRIVATE, gpacevt_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &gjs->gpacEvtClass, 0, 0, gpacEvtClassProps, gpacEvtClassFuncs, 0, 0);
-		gjs->evt_obj = JS_DefineObject(c, global, "gpacevt", &gjs->gpacEvtClass._class, 0, 0);
-
-#define DECLARE_GPAC_CONST(name) \
-		JS_DefineProperty(c, global, #name, INT_TO_JSVAL(name), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-		DECLARE_GPAC_CONST(GF_EVENT_CLICK);
-		DECLARE_GPAC_CONST(GF_EVENT_MOUSEUP);
-		DECLARE_GPAC_CONST(GF_EVENT_MOUSEDOWN);
-		DECLARE_GPAC_CONST(GF_EVENT_MOUSEMOVE);
-		DECLARE_GPAC_CONST(GF_EVENT_MOUSEWHEEL);
-		DECLARE_GPAC_CONST(GF_EVENT_DBLCLICK);
-		DECLARE_GPAC_CONST(GF_EVENT_KEYUP);
-		DECLARE_GPAC_CONST(GF_EVENT_KEYDOWN);
-		DECLARE_GPAC_CONST(GF_EVENT_TEXTINPUT);
-		DECLARE_GPAC_CONST(GF_EVENT_CONNECT);
-		DECLARE_GPAC_CONST(GF_EVENT_NAVIGATE_INFO);
-		DECLARE_GPAC_CONST(GF_EVENT_NAVIGATE);
-		DECLARE_GPAC_CONST(GF_EVENT_DROPFILE);
-		DECLARE_GPAC_CONST(GF_EVENT_ADDON_DETECTED);
-		DECLARE_GPAC_CONST(GF_EVENT_QUALITY_SWITCHED);
-		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_DEPTH);
-		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_UPDATE);
-		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_OVERFLOW);
-		DECLARE_GPAC_CONST(GF_EVENT_TIMESHIFT_UNDERRUN);
-		DECLARE_GPAC_CONST(GF_EVENT_QUIT);
-		DECLARE_GPAC_CONST(GF_EVENT_MAIN_ADDON_STATE);
-		DECLARE_GPAC_CONST(GF_EVENT_SCENE_SIZE);
-
-		DECLARE_GPAC_CONST(GF_NAVIGATE_NONE);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_WALK);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_FLY);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_PAN);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_GAME);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_SLIDE);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_EXAMINE);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_ORBIT);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_VR);
-
-		DECLARE_GPAC_CONST(GF_NAVIGATE_TYPE_NONE);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_TYPE_2D);
-		DECLARE_GPAC_CONST(GF_NAVIGATE_TYPE_3D);
-
-		JS_SETUP_CLASS(gjs->anyClass, "GPACOBJECT", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &gjs->anyClass, 0, 0, 0, 0, 0, 0);
-
-		gjs->evt_fun = JSVAL_NULL;
-	}
-}
-
-
-
-
-
-GF_JSUserExtension *gjs_new()
-{
-	GF_JSUserExtension *dr;
-	GF_GPACJSExt *gjs;
-	GF_SAFEALLOC(dr, GF_JSUserExtension);
-	if (!dr) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_JS_USER_EXT_INTERFACE, "GPAC JavaScript Bindings", "gpac distribution");
-
-	GF_SAFEALLOC(gjs, GF_GPACJSExt);
-	if (!gjs) {
-		gf_free(dr);
-		return NULL;
-	}
-	gjs->rti_refresh_rate = GPAC_JS_RTI_REFRESH_RATE;
-	gjs->evt_fun = JSVAL_NULL;
-	gjs->storages = gf_list_new();
-	gjs->event_queue = gf_list_new();
-	gjs->event_mx = gf_mx_new("GPACJSEvt");
-	dr->load = gjs_load;
-	dr->udta = gjs;
-	return dr;
-}
-
-
-void gjs_delete(GF_BaseInterface *ifce)
-{
-	GF_JSUserExtension *dr = (GF_JSUserExtension *) ifce;
-	GF_GPACJSExt *gjs = dr->udta;
-
-	while (gf_list_count(gjs->storages)) {
-		GF_Config *cfg = (GF_Config *) gf_list_pop_back(gjs->storages);
-		gf_cfg_discard_changes(cfg);
-		gf_cfg_del(cfg);
-	}
-	gf_list_del(gjs->storages);
-
-	while (gf_list_count(gjs->event_queue)) {
-		GF_Event *evt = (GF_Event *) gf_list_pop_back(gjs->event_queue);
-		gf_free(evt);
-	}
-	gf_list_del(gjs->event_queue);
-	gf_mx_del(gjs->event_mx);
-
-	gf_free(gjs);
-	gf_free(dr);
-}
-
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		GF_JS_USER_EXT_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifdef GPAC_HAS_SPIDERMONKEY
-	if (InterfaceType == GF_JS_USER_EXT_INTERFACE) return (GF_BaseInterface *)gjs_new();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-	case GF_JS_USER_EXT_INTERFACE:
-		gjs_delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( gpac_js )

gpac-0.8.0.tar.gz/modules/hyb_in Deleted

gpac-0.8.0.tar.gz/modules/hyb_in/hyb_in.c Deleted

@@ -1,312 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  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 "hyb_in.h"
-
-/*register by hand existing masters*/
-extern GF_HYBMEDIA master_fm_mmbtools;
-extern GF_HYBMEDIA master_fm_fake_pull;
-extern GF_HYBMEDIA master_fm_fake_push;
-
-GF_HYBMEDIA* hyb_masters[] = {
-	&master_fm_fake_pull,
-	&master_fm_fake_push,
-#ifdef GPAC_ANDROID
-	&master_fm_mmbtools,
-#endif
-};
-
-typedef struct {
-	/*GPAC Service object (i.e. how this module is seen by the terminal)*/
-	GF_ClientService *service;
-
-	/*This Hybrid media architecture assumes there is a master media*/
-	GF_HYBMEDIA* master;
-
-} GF_HYB_In;
-
-
-static u32 HYB_RegisterMimeTypes(const GF_InputService *plug)
-{
-	if (!plug)
-		return 0;
-
-	return 1;
-}
-
-static Bool HYB_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	u32 i;
-	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
-
-	for (i=0; i<nb_masters; i++) {
-		if (hyb_masters[i]->CanHandleURL(url))
-			return 1;
-	}
-
-	return 0;
-}
-
-static GF_Err hybmedia_sanity_check(GF_HYBMEDIA *master)
-{
-	/*these checks need to be upgraded when the interface changes*/
-	if (master->data_mode != HYB_PUSH && master->data_mode != HYB_PULL)
-		return GF_BAD_PARAM;
-
-	if (!master->name) goto error_exit;
-	if (!master->CanHandleURL) goto error_exit;
-	if (!master->GetOD) goto error_exit;
-	if (!master->Connect) goto error_exit;
-	if (!master->Disconnect) goto error_exit;
-
-	if (master->data_mode == HYB_PUSH) {
-		if (!master->SetState) goto error_exit;
-	}
-
-	if (master->data_mode == HYB_PULL) {
-		if (!master->GetData) goto error_exit;
-		if (!master->ReleaseData) goto error_exit;
-	}
-
-	return GF_OK;
-
-error_exit:
-	return GF_SERVICE_ERROR;
-}
-
-static GF_Err HYB_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	u32 i;
-	GF_Err e = GF_OK;
-	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
-
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Connection request from service %p for %s\n", serv, url));
-
-	if (!hyb_in || !serv || !url) return GF_BAD_PARAM;
-	hyb_in->service = serv;
-
-	/*choose the master service*/
-	for (i=0; i<nb_masters; i++) {
-		if (hyb_masters[i]->CanHandleURL(url)) {
-			hyb_in->master = hyb_masters[i];
-			break;
-		}
-	}
-	assert(hyb_in->master);
-
-	/*sanity check about the master*/
-	e = hybmedia_sanity_check(hyb_in->master);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - object \"%s\" failed the sanity checks\n", hyb_in->master->name));
-		gf_service_connect_ack(hyb_in->service, NULL, e);
-		return e;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Selected master object \"%s\" for URL: %s\n", hyb_in->master->name, url));
-
-	/*connect the master*/
-	e = hyb_in->master->Connect(hyb_in->master, hyb_in->service, url);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot connect service, wrong URL %s\n", url));
-		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
-		return e;
-	}
-	gf_service_connect_ack(hyb_in->service, NULL, GF_OK);
-	gf_service_declare_media(hyb_in->service, (GF_Descriptor*)hyb_in->master->GetOD(), 0);
-
-	return GF_OK;
-}
-
-static GF_Err HYB_CloseService(GF_InputService *plug)
-{
-	GF_Err e;
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Close Service (%p) request from terminal\n", ((GF_HYB_In*)plug->priv)->service));
-
-	/*force to stop and disconnect the master*/
-	hyb_in->master->SetState(hyb_in->master, GF_NET_CHAN_STOP);
-	e = hyb_in->master->Disconnect(hyb_in->master);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot disconnect service %p\n", hyb_in->service));
-		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
-		return e;
-	}
-
-	gf_service_disconnect_ack(hyb_in->service, NULL, GF_OK);
-
-	return GF_OK;
-}
-
-static GF_Descriptor *HYB_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Service Description request from terminal for %s\n", sub_url));
-
-	return NULL;
-}
-
-static GF_Err HYB_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	GF_HYB_In *hyb_in;
-	GF_HYBMEDIA *master;
-
-	if (!plug || !plug->priv)
-		return GF_SERVICE_ERROR;
-
-	hyb_in = (GF_HYB_In*)plug->priv;
-	master = (GF_HYBMEDIA*)hyb_in->master;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Connection request from service %p for %s\n", channel, url));
-
-	master->channel = channel;
-	gf_service_connect_ack(hyb_in->service, channel, GF_OK);
-
-	return GF_OK;
-}
-
-static GF_Err HYB_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Disconnect Service (%p) request from terminal\n", hyb_in->service));
-
-	gf_service_disconnect_ack(hyb_in->service, channel, GF_OK);
-	hyb_in->master->channel = NULL;
-
-	return GF_OK;
-}
-
-static GF_Err HYB_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_SPEED:
-		/*not implemented for push mode*/
-		assert(hyb_in->master->data_mode == HYB_PULL);
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-	case GF_NET_CHAN_STOP:
-	case GF_NET_CHAN_PAUSE:
-	case GF_NET_CHAN_RESUME:
-		if (hyb_in->master->data_mode == HYB_PUSH)
-			return hyb_in->master->SetState(hyb_in->master, com->command_type);
-		return GF_OK;
-	case GF_NET_CHAN_SET_PULL:
-		if (hyb_in->master->data_mode == HYB_PULL)
-			return GF_OK;
-		else
-			return GF_NOT_SUPPORTED; /*we're in push mode*/
-	}
-
-	return GF_OK;
-}
-
-static Bool HYB_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	return 0;
-}
-
-static GF_Err HYB_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-	assert(hyb_in->master->data_mode == HYB_PULL && hyb_in->master->GetData && hyb_in->master->ReleaseData);
-
-	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
-	hyb_in->master->GetData(hyb_in->master, out_data_ptr, out_data_size, out_sl_hdr);
-	*sl_compressed = 0;
-	*out_reception_status = GF_OK;
-	*is_new_data = 1;
-	return GF_OK;
-}
-
-static GF_Err HYB_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
-	return GF_OK;
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	GF_HYB_In *hyb_in;
-	GF_InputService *plug;
-	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC HYBRID MEDIA Loader", "gpac distribution")
-	plug->RegisterMimeTypes=	HYB_RegisterMimeTypes;
-	plug->CanHandleURL=			HYB_CanHandleURL;
-	plug->ConnectService=		HYB_ConnectService;
-	plug->CloseService=			HYB_CloseService;
-	plug->GetServiceDescriptor=	HYB_GetServiceDesc;
-	plug->ConnectChannel=		HYB_ConnectChannel;
-	plug->DisconnectChannel=	HYB_DisconnectChannel;
-	plug->ServiceCommand=		HYB_ServiceCommand;
-	plug->CanHandleURLInService=HYB_CanHandleURLInService;
-	plug->ChannelGetSLP=		HYB_ChannelGetSLP;
-	plug->ChannelReleaseSLP=	HYB_ChannelReleaseSLP;
-
-	GF_SAFEALLOC(hyb_in, GF_HYB_In);
-	plug->priv = hyb_in;
-
-	return (GF_BaseInterface *)plug;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 1\n", ifce));
-	if (ifce->InterfaceType == GF_NET_CLIENT_INTERFACE) {
-		GF_InputService *plug = (GF_InputService*)ifce;
-		GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-		gf_free(hyb_in);
-		plug->priv = NULL;
-		gf_free(plug);
-		GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 2\n", ifce));
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( hyb_in )

gpac-0.8.0.tar.gz/modules/img_in Deleted

gpac-0.8.0.tar.gz/modules/img_in/Makefile Deleted

@@ -1,78 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/img_in
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-NEED_LOCAL_LIB="no"
-LOCAL_LIB=../../bin/gcc
-ifneq ($(STATICBUILD),yes)
-LINKLIBS= -lgpac
-else
-LINKLIBS= -lgpac_static
-endif
-
-#common objects
-OBJS=img_dec.o img_in.o bmp_dec.o png_dec.o jpeg_dec.o
-
-#openjpeg config
-ifeq ($(CONFIG_JP2), no)
-else
-OBJS+=jp2_dec.o
-LINKLIBS+= -lopenjpeg -lm
-CFLAGS+=-DGPAC_HAS_JP2
-#local openjpeg lib
-ifeq ($(CONFIG_JP2), local)
-NEED_LOCAL_LIB="yes"
-CFLAGS+= -I"$(LOCAL_INC_PATH)/openjpeg"
-endif
-endif
-
-
-#add local lib path
-ifeq ($(NEED_LOCAL_LIB), "yes")
-LOCAL_LIB+=-L../../extra_lib/lib/gcc
-endif
-
-
-
-SRCS := $(OBJS:.o=.c)
-
-LIB=gm_img_in$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-LINKLIBS+=-lwinmm
-#LDFLAGS+=-export-symbols img_in.def
-endif
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_img_in-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-endif
-
-clean:
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/img_in/bmp_dec.c Deleted

@@ -1,210 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 "img_in.h"
-
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(__SYMBIAN32__)
-#else
-#include <netinet/in.h>
-#endif
-
-typedef struct
-{
-	u16 ES_ID;
-	u32 width, height, out_size, pixel_format;
-} BMPDec;
-
-#define BMPCTX()	BMPDec *ctx = (BMPDec *) ((IMGDec *)ifcg->privateStack)->opaque
-
-
-static GF_Err BMP_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	BMPCTX();
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	ctx->ES_ID = esd->ESID;
-	return GF_OK;
-}
-static GF_Err BMP_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	BMPCTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-	ctx->ES_ID = ES_ID;
-	return GF_OK;
-}
-static GF_Err BMP_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	BMPCTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = (ctx->pixel_format == GF_PIXEL_RGB_24) ? 3 : 4;
-		capability->cap.valueInt *= ctx->width;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 0;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pixel_format;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = 	ctx->out_size;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = IMG_CM_SIZE;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-static GF_Err BMP_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err BMP_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	char *pix;
-	u32 i, j, irow, in_stride, out_stride, BPP;
-	GF_BitStream *bs;
-	BITMAPFILEHEADER fh;
-	BITMAPINFOHEADER fi;
-
-	BMPCTX();
-	if (inBufferLength<54) return GF_NON_COMPLIANT_BITSTREAM;
-	bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
-
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(__SYMBIAN32__)
-	gf_bs_read_data(bs, (char *) &fh, 14);
-#else
-	fh.bfType = gf_bs_read_u16(bs);
-	fh.bfSize = gf_bs_read_u32(bs);
-	fh.bfReserved1 = gf_bs_read_u16(bs);
-	fh.bfReserved2 = gf_bs_read_u16(bs);
-	fh.bfOffBits = gf_bs_read_u32(bs);
-	fh.bfOffBits = ntohl(fh.bfOffBits);
-#endif
-	gf_bs_read_data(bs, (char *) &fi, 40);
-	gf_bs_del(bs);
-
-	if ((fi.biCompression != BI_RGB) || (fi.biPlanes!=1)) return GF_NOT_SUPPORTED;
-	if ((fi.biBitCount!=24) && (fi.biBitCount!=32)) return GF_NOT_SUPPORTED;
-
-	BPP = (fi.biBitCount==24) ? 3 : 4;
-	ctx->width = fi.biWidth;
-	ctx->height = fi.biHeight;
-	ctx->pixel_format = (fi.biBitCount==24) ? GF_PIXEL_RGB_24 : GF_PIXEL_RGBA;
-
-	/*new cfg, reset*/
-	if (ctx->out_size != ctx->width * ctx->height * BPP) {
-		ctx->out_size = ctx->width * ctx->height * BPP;
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-	out_stride = ctx->width*BPP;
-	in_stride = out_stride;
-	while (in_stride % 4) in_stride++;
-
-	/*read*/
-	if (fi.biBitCount==24) {
-		for (i=0; i<ctx->height; i++) {
-			irow = (ctx->height-1-i)*out_stride;
-			pix = inBuffer + fh.bfOffBits + i*in_stride;
-			for (j=0; j<out_stride; j+=3) {
-				outBuffer[j + irow] = pix[2];
-				outBuffer[j+1 + irow] = pix[1];
-				outBuffer[j+2 + irow] = pix[0];
-				pix += 3;
-			}
-		}
-	} else {
-		for (i=0; i<ctx->height; i++) {
-			irow = (ctx->height-1-i)*out_stride;
-			pix = inBuffer + fh.bfOffBits + i*in_stride;
-			for (j=0; j<out_stride; j+=4) {
-				outBuffer[j + irow] = pix[2];
-				outBuffer[j+1 + irow] = pix[1];
-				outBuffer[j+2 + irow] = pix[0];
-				outBuffer[j+3 + irow] = pix[3];
-				pix += 4;
-			}
-		}
-	}
-	*outBufferLength = ctx->out_size;
-	return GF_OK;
-}
-
-static const char *BMP_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "BMP Decoder";
-}
-
-Bool NewBMPDec(GF_BaseDecoder *ifcd)
-{
-	IMGDec *wrap = (IMGDec *) ifcd->privateStack;
-	BMPDec *dec = (BMPDec *) gf_malloc(sizeof(BMPDec));
-	memset(dec, 0, sizeof(BMPDec));
-	wrap->opaque = dec;
-	wrap->type = DEC_BMP;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = BMP_AttachStream;
-	ifcd->DetachStream = BMP_DetachStream;
-	ifcd->GetCapabilities = BMP_GetCapabilities;
-	ifcd->SetCapabilities = BMP_SetCapabilities;
-	ifcd->GetName = BMP_GetCodecName;
-	((GF_MediaDecoder *)ifcd)->ProcessData = BMP_ProcessData;
-	return GF_TRUE;
-}
-
-void DeleteBMPDec(GF_BaseDecoder *ifcg)
-{
-	BMPCTX();
-	gf_free(ctx);
-}

gpac-0.8.0.tar.gz/modules/img_in/img_dec.c Deleted

@@ -1,159 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 "img_in.h"
-
-
-static u32 DEC_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-#ifdef GPAC_HAS_PNG
-	case GPAC_OTI_IMAGE_PNG:
-		if (NewPNGDec(dec)) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-#endif
-#ifdef GPAC_HAS_JPEG
-	case GPAC_OTI_IMAGE_JPEG:
-		if (NewJPEGDec(dec)) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-#endif
-#ifdef GPAC_HAS_JP2
-	case GPAC_OTI_IMAGE_JPEG_2000:
-		if (NewJP2Dec(dec)) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-#endif
-	case GPAC_BMP_OTI:
-		if (NewBMPDec(dec)) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-
-	default:
-#ifdef GPAC_HAS_JP2
-	{
-		char *dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-		if (dsi && (dsi[0]=='m') && (dsi[1]=='j') && (dsi[2]=='p') && (dsi[3]=='2'))
-			if (NewJP2Dec(dec)) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-#endif
-	return GF_CODEC_NOT_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-GF_BaseDecoder *NewBaseDecoder()
-{
-	GF_MediaDecoder *ifce;
-	IMGDec *wrap;
-	GF_SAFEALLOC(ifce, GF_MediaDecoder);
-	if (!ifce) return NULL;
-	GF_SAFEALLOC(wrap, IMGDec);
-	if (!wrap) {
-		gf_free(ifce);
-		return NULL;
-	}
-	ifce->privateStack = wrap;
-	ifce->CanHandleStream = DEC_CanHandleStream;
-
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "GPAC Image Decoder", "gpac distribution")
-
-	/*other interfaces will be setup at run time*/
-	return (GF_BaseDecoder *)ifce;
-}
-
-void DeleteBaseDecoder(GF_BaseDecoder *ifcd)
-{
-	IMGDec *wrap;
-	if (!ifcd)
-		return;
-	wrap = (IMGDec *)ifcd->privateStack;
-	if (!wrap)
-		return;
-	switch (wrap->type) {
-	case DEC_PNG:
-		DeletePNGDec(ifcd);
-		break;
-	case DEC_JPEG:
-		DeleteJPEGDec(ifcd);
-		break;
-#ifdef GPAC_HAS_JP2
-	case DEC_JP2:
-		DeleteJP2Dec(ifcd);
-		break;
-#endif
-	case DEC_BMP:
-		DeleteBMPDec(ifcd);
-		break;
-	default:
-		break;
-	}
-	gf_free(wrap);
-	ifcd->privateStack = NULL;
-	gf_free(ifcd);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_MEDIA_DECODER_INTERFACE,
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewBaseDecoder();
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *)NewLoaderInterface();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteBaseDecoder((GF_BaseDecoder *)ifce);
-		break;
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteLoaderInterface(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( img_in )

gpac-0.8.0.tar.gz/modules/img_in/img_in.c Deleted

@@ -1,461 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 "img_in.h"
-#include <gpac/avparse.h>
-
-enum
-{
-	IMG_JPEG = 1,
-	IMG_PNG,
-	IMG_BMP,
-	IMG_PNGD,
-	IMG_PNGDS,
-	IMG_PNGS,
-};
-
-typedef struct
-{
-	GF_ClientService *service;
-	/*service*/
-	u32 srv_type;
-
-	FILE *stream;
-	u32 img_type;
-
-	u32 pad_bytes;
-	Bool done;
-	LPNETCHANNEL ch;
-
-	Bool is_inline;
-	char *data;
-	u32 data_size;
-
-	GF_SLHeader sl_hdr;
-
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-} IMGLoader;
-
-
-GF_ESD *IMG_GetESD(IMGLoader *read)
-{
-	GF_ESD *esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = 1000;
-	esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-	esd->ESID = 1;
-
-	if (read->img_type == IMG_BMP)
-		esd->decoderConfig->objectTypeIndication = GPAC_BMP_OTI;
-	else {
-		u8 OTI=0;
-		GF_BitStream *bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-#ifndef GPAC_DISABLE_AV_PARSERS
-		u32 mtype, w, h;
-		gf_img_parse(bs, &OTI, &mtype, &w, &h, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-#endif
-		gf_bs_del(bs);
-
-		if (!OTI) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[IMG_IN] Unable to guess format image - assigning from extension\n"));
-			if (read->img_type==IMG_JPEG) OTI = GPAC_OTI_IMAGE_JPEG;
-			else if (read->img_type==IMG_PNG) OTI = GPAC_OTI_IMAGE_PNG;
-		}
-		esd->decoderConfig->objectTypeIndication = OTI;
-
-		if (read->img_type == IMG_PNGD) {
-			GF_Descriptor *d = gf_odf_desc_new(GF_ODF_AUX_VIDEO_DATA);
-			((GF_AuxVideoDescriptor*)d)->aux_video_type = 1;
-			gf_list_add(esd->extensionDescriptors, d);
-		}
-		else if (read->img_type == IMG_PNGDS) {
-			GF_Descriptor *d = gf_odf_desc_new(GF_ODF_AUX_VIDEO_DATA);
-			((GF_AuxVideoDescriptor*)d)->aux_video_type = 2;
-			gf_list_add(esd->extensionDescriptors, d);
-		}
-		else if (read->img_type == IMG_PNGS) {
-			GF_Descriptor *d = gf_odf_desc_new(GF_ODF_AUX_VIDEO_DATA);
-			((GF_AuxVideoDescriptor*)d)->aux_video_type = 3;
-			gf_list_add(esd->extensionDescriptors, d);
-		}
-	}
-	return esd;
-}
-
-const char * IMG_MIME_TYPES[] = {
-	"image/jpeg", "jpeg jpg", "JPEG Images",
-	"image/jp2", "jp2", "JPEG2000 Images",
-	"image/png", "png", "PNG Images",
-	"image/bmp", "bmp", "MS Bitmap Images",
-	"image/x-png+depth", "pngd", "PNG+Depth Images",
-	"image/x-png+depth+mask", "pngds", "PNG+Depth+Mask Images",
-	"image/x-png+stereo", "pngs", "Stereo PNG Images",
-	NULL
-};
-
-static u32 IMG_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	if (!plug) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("IMG_RegisterMimeTypes : plug is NULL !!\n"));
-	}
-	for (i = 0 ; IMG_MIME_TYPES[i]; i+=3)
-		gf_service_register_mime(plug, IMG_MIME_TYPES[i], IMG_MIME_TYPES[i+1], IMG_MIME_TYPES[i+2]);
-	return i/3;
-}
-
-
-static Bool IMG_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	u32 i;
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("IMG_CanHandleURL(%s)\n", url));
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	for (i = 0 ; IMG_MIME_TYPES[i]; i+=3) {
-		if (gf_service_check_mime_register(plug, IMG_MIME_TYPES[i], IMG_MIME_TYPES[i+1], IMG_MIME_TYPES[i+2], sExt))
-			return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool jp_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-
-static void IMG_SetupObject(IMGLoader *read)
-{
-	if (!read->ch) {
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		GF_ESD *esd = IMG_GetESD(read);
-		od->objectDescriptorID = 1;
-		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(read->service, (GF_Descriptor *)od, GF_FALSE);
-	}
-}
-
-
-void IMG_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	IMGLoader *read = (IMGLoader *) cbk;
-	if (!read->dnload) return;
-
-	/*handle service message*/
-	gf_service_download_update_stats(read->dnload);
-
-	e = param->error;
-	/*wait to get the whole file*/
-	if (!e && (param->msg_type!=GF_NETIO_DATA_TRANSFERED)) return;
-	if ((e==GF_EOS) && (param->msg_type==GF_NETIO_DATA_EXCHANGE)) return;
-
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		szCache = gf_dm_sess_get_cache_name(read->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			if (read->stream) gf_fclose(read->stream);
-			read->stream = gf_fopen((char *) szCache, "rb");
-			if (!read->stream) e = GF_SERVICE_ERROR;
-			else {
-				e = GF_OK;
-				gf_fseek(read->stream, 0, SEEK_END);
-				read->data_size = (u32) gf_ftell(read->stream);
-				gf_fseek(read->stream, 0, SEEK_SET);
-			}
-		}
-	}
-	/*OK confirm*/
-	gf_service_connect_ack(read->service, NULL, e);
-	if (!e) IMG_SetupObject(read);
-}
-
-void jp_download_file(GF_InputService *plug, const char *url)
-{
-	IMGLoader *read = (IMGLoader *) plug->priv;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, IMG_NetIO, read);
-	if (!read->dnload) {
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-static GF_Err IMG_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char *sExt, *frag;
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	read->service = serv;
-	if (!url)
-		return GF_BAD_PARAM;
-
-	frag = strrchr(url, '#');
-	if (frag) frag[0] = 0;
-
-	sExt = strrchr(url, '.');
-	if (!stricmp(sExt, ".jpeg") || !stricmp(sExt, ".jpg")) read->img_type = IMG_JPEG;
-	else if (!stricmp(sExt, ".png")) read->img_type = IMG_PNG;
-	else if (!stricmp(sExt, ".pngd")) read->img_type = IMG_PNGD;
-	else if (!stricmp(sExt, ".pngds")) read->img_type = IMG_PNGDS;
-	else if (!stricmp(sExt, ".pngs")) read->img_type = IMG_PNGS;
-	else if (!stricmp(sExt, ".bmp")) read->img_type = IMG_BMP;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	/*remote fetch*/
-	if (!jp_is_local(url)) {
-		jp_download_file(plug, url);
-		if (frag) frag[0] = '#';
-		return GF_OK;
-	}
-
-	read->stream = gf_fopen(url, "rb");
-	if (read->stream) {
-		gf_fseek(read->stream, 0, SEEK_END);
-		read->data_size = (u32) gf_ftell(read->stream);
-		gf_fseek(read->stream, 0, SEEK_SET);
-	}
-	if (frag) frag[0] = '#';
-	gf_service_connect_ack(serv, NULL, read->stream ? GF_OK : GF_URL_ERROR);
-	if (read->stream && read->is_inline) IMG_SetupObject(read);
-	return GF_OK;
-}
-
-static GF_Err IMG_CloseService(GF_InputService *plug)
-{
-	IMGLoader *read;
-	if (!plug)
-		return GF_BAD_PARAM;
-	read = (IMGLoader *)plug->priv;
-	if (!read)
-		return GF_BAD_PARAM;
-	if (read->stream) gf_fclose(read->stream);
-	read->stream = NULL;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-	if (read->service)
-		gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *IMG_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_ESD *esd;
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	/*override default*/
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_VIDEO;
-	read->srv_type = expect_type;
-
-	/*visual object*/
-	if (expect_type==GF_MEDIA_OBJECT_VIDEO) {
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = IMG_GetESD(read);
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-	read->is_inline = GF_TRUE;
-	return NULL;
-}
-
-static GF_Err IMG_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID=0;
-	GF_Err e;
-	IMGLoader *read;
-	if (!plug)
-		return GF_OK;
-	read = (IMGLoader *)plug->priv;
-
-	e = GF_SERVICE_ERROR;
-	if (read->ch==channel) goto exit;
-	if (!url)
-		goto exit;
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%ud", &ES_ID);
-	}
-	/*URL setup*/
-	else if (!read->ch && IMG_CanHandleURL(plug, url)) ES_ID = 1;
-
-	if (ES_ID==1) {
-		read->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err IMG_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	if (read->ch == channel) {
-		read->ch = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err IMG_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) return GF_NOT_SUPPORTED;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PADDING:
-		read->pad_bytes = com->pad.padding_bytes;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		/*note we don't handle range since we're only dealing with images*/
-		if (read->ch == com->base.on_channel) {
-			read->done = GF_FALSE;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err IMG_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = GF_FALSE;
-	*is_new_data = GF_FALSE;
-
-	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-	read->sl_hdr.randomAccessPointFlag = 1;
-	read->sl_hdr.compositionTimeStampFlag = 1;
-	*out_sl_hdr = read->sl_hdr;
-
-	/*fetching es data*/
-	if (read->ch == channel) {
-		if (read->done) {
-			*out_reception_status = GF_EOS;
-			return GF_OK;
-		}
-		if (!read->data) {
-			if (!read->stream) {
-				*out_data_ptr = NULL;
-				*out_data_size = 0;
-				return GF_OK;
-			}
-			*is_new_data = GF_TRUE;
-			gf_fseek(read->stream, 0, SEEK_SET);
-			read->data = (char*) gf_malloc(sizeof(char) * (read->data_size + read->pad_bytes));
-			read->data_size = (u32) fread(read->data, sizeof(char), read->data_size, read->stream);
-			if ((s32) read->data_size<0) return GF_IO_ERR;
-			gf_fseek(read->stream, 0, SEEK_SET);
-			if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
-
-		}
-		*out_data_ptr = read->data;
-		*out_data_size = read->data_size;
-		return GF_OK;
-	}
-	return GF_STREAM_NOT_FOUND;
-}
-
-static GF_Err IMG_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	IMGLoader *read = (IMGLoader *)plug->priv;
-
-	if (read->ch == channel) {
-		if (!read->data) return GF_BAD_PARAM;
-		gf_free(read->data);
-		read->data = NULL;
-		read->done = GF_TRUE;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-
-void *NewLoaderInterface()
-{
-	IMGLoader *priv;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC Image Reader", "gpac distribution")
-
-	GF_SAFEALLOC(priv, IMGLoader);
-	if (!priv) {
-		gf_free(plug);
-		return NULL;
-	}
-	plug->priv = priv;
-
-	plug->RegisterMimeTypes = IMG_RegisterMimeTypes;
-	plug->CanHandleURL = IMG_CanHandleURL;
-	plug->CanHandleURLInService = NULL;
-	plug->ConnectService = IMG_ConnectService;
-	plug->CloseService = IMG_CloseService;
-	plug->GetServiceDescriptor = IMG_GetServiceDesc;
-	plug->ConnectChannel = IMG_ConnectChannel;
-	plug->DisconnectChannel = IMG_DisconnectChannel;
-	plug->ChannelGetSLP = IMG_ChannelGetSLP;
-	plug->ChannelReleaseSLP = IMG_ChannelReleaseSLP;
-	plug->ServiceCommand = IMG_ServiceCommand;
-
-	return plug;
-}
-
-void DeleteLoaderInterface(void *ifce)
-{
-	IMGLoader *read;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!plug)
-		return;
-	read = (IMGLoader *)plug->priv;
-	if (read)
-		gf_free(read);
-	plug->priv = NULL;
-	gf_free(plug);
-}

gpac-0.8.0.tar.gz/modules/img_in/img_in.h Deleted

@@ -1,107 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 _IMG_IN_H
-#define _IMG_IN_H
-
-/*all codecs are regular */
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-
-enum
-{
-	DEC_RESERVED = 0,
-	DEC_PNG,
-	DEC_JPEG,
-	DEC_JP2,
-	DEC_BMP,
-};
-
-typedef struct
-{
-	u32 type;
-	void *opaque;
-} IMGDec;
-
-/*all constructors shall setup the wraper type and handle
-	return 1 for success, 0 otherwise
-all destructors only destroy their private stacks (eg not the interface nor the wraper)
-*/
-Bool NewPNGDec(GF_BaseDecoder *dec);
-void DeletePNGDec(GF_BaseDecoder *dec);
-
-Bool NewJPEGDec(GF_BaseDecoder *dec);
-void DeleteJPEGDec(GF_BaseDecoder *dec);
-
-#ifdef GPAC_HAS_JP2
-Bool NewJP2Dec(GF_BaseDecoder *dec);
-void DeleteJP2Dec(GF_BaseDecoder *dec);
-#endif
-
-
-#if defined(WIN32) || defined(_WIN32_WCE)
-#include <windows.h>
-#else
-typedef struct tagBITMAPFILEHEADER
-{
-	u16	bfType;
-	u32	bfSize;
-	u16	bfReserved1;
-	u16	bfReserved2;
-	u32 bfOffBits;
-} BITMAPFILEHEADER;
-
-typedef struct tagBITMAPINFOHEADER {
-	u32	biSize;
-	s32	biWidth;
-	s32	biHeight;
-	u16	biPlanes;
-	u16	biBitCount;
-	u32	biCompression;
-	u32	biSizeImage;
-	s32	biXPelsPerMeter;
-	s32	biYPelsPerMeter;
-	u32	biClrUsed;
-	u32	biClrImportant;
-} BITMAPINFOHEADER;
-
-#define BI_RGB        0L
-
-#endif
-
-#define GPAC_BMP_OTI	0x82
-
-Bool NewBMPDec(GF_BaseDecoder *dec);
-void DeleteBMPDec(GF_BaseDecoder *dec);
-
-#define IMG_CM_SIZE		1
-
-
-void *NewLoaderInterface();
-void DeleteLoaderInterface(void *ifce);
-
-#endif

gpac-0.8.0.tar.gz/modules/img_in/jp2_dec.c Deleted

@@ -1,468 +0,0 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / image format module
-*
-*  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 "img_in.h"
-
-#ifdef GPAC_HAS_JP2
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE) || defined (WIN32)
-#  if defined(_DEBUG)
-#   pragma comment(lib, "LibOpenJPEGd")
-#  else
-#   pragma comment(lib, "LibOpenJPEG")
-#  endif
-# endif
-#endif
-
-
-#include <openjpeg.h>
-#include <gpac/isomedia.h>
-
-typedef struct
-{
-	/*no support for scalability with JPEG (progressive JPEG to test)*/
-	u32 bpp, nb_comp, width, height, out_size, pixel_format, dsi_size;
-	char *dsi;
-	opj_image_t *image;
-} JP2Dec;
-
-#define JP2CTX()	JP2Dec *ctx = (JP2Dec *) ((IMGDec *)ifcg->privateStack)->opaque
-
-
-static GF_Err JP2_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_BitStream *bs;
-	JP2CTX();
-	if (esd->dependsOnESID || esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-
-	if (!esd->decoderConfig->decoderSpecificInfo) return GF_OK;
-
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_JPEG_2000) {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		ctx->height = gf_bs_read_u32(bs);
-		ctx->width = gf_bs_read_u32(bs);
-		ctx->nb_comp = gf_bs_read_u16(bs);
-		ctx->bpp = 1 + gf_bs_read_u8(bs);
-		ctx->out_size = ctx->width * ctx->height * ctx->nb_comp /* * ctx->bpp / 8 */;
-		gf_bs_del(bs);
-
-		switch (ctx->nb_comp) {
-		case 1:
-			ctx->pixel_format = GF_PIXEL_GREYSCALE;
-			break;
-		case 2:
-			ctx->pixel_format = GF_PIXEL_ALPHAGREY;
-			break;
-		case 3:
-			ctx->pixel_format = GF_PIXEL_RGB_24;
-			break;
-		case 4:
-			ctx->pixel_format = GF_PIXEL_RGBA;
-			break;
-		default:
-			return GF_NOT_SUPPORTED;
-		}
-	} else {
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		gf_bs_read_u32(bs);
-		ctx->width = gf_bs_read_u16(bs);
-		ctx->height = gf_bs_read_u16(bs);
-		gf_bs_del(bs);
-
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(bs, 12);
-		gf_bs_write_u32(bs, GF_4CC('j','P',' ',' ') );
-		gf_bs_write_u32(bs, 0x0D0A870A);
-		gf_bs_write_u32(bs, 20);
-		gf_bs_write_u32(bs, GF_4CC('f','t','y','p') );
-		gf_bs_write_u32(bs, GF_ISOM_BRAND_JP2 );
-		gf_bs_write_u32(bs, 0);
-		gf_bs_write_u32(bs, GF_ISOM_BRAND_JP2 );
-
-		gf_bs_write_data(bs, esd->decoderConfig->decoderSpecificInfo->data+8, esd->decoderConfig->decoderSpecificInfo->dataLength-8);
-		gf_bs_get_content(bs, &ctx->dsi, &ctx->dsi_size);
-		gf_bs_del(bs);
-
-		ctx->nb_comp = 3;
-		ctx->out_size = 3*ctx->width*ctx->height/2;
-		ctx->pixel_format = GF_PIXEL_YV12;
-	}
-
-	return GF_OK;
-}
-static GF_Err JP2_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	JP2CTX();
-	if (ctx->image) {
-		opj_image_destroy(ctx->image);
-		ctx->image = NULL;
-	}
-	return GF_OK;
-}
-static GF_Err JP2_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	JP2CTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		if (ctx->pixel_format == GF_PIXEL_YV12) {
-			capability->cap.valueInt = ctx->width;
-		} else {
-			capability->cap.valueInt = ctx->width * ctx->nb_comp;
-		}
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 0;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pixel_format;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = 	ctx->out_size;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = (ctx->pixel_format == GF_PIXEL_YV12) ? 4 : 1;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = 0;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-static GF_Err JP2_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-/**
-sample error callback expecting a FILE* client object
-*/
-void error_callback(const char *msg, void *client_data)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[OpenJPEG] Error %s", msg));
-}
-/**
-sample warning callback expecting a FILE* client object
-*/
-void warning_callback(const char *msg, void *client_data)
-{
-	GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[OpenJPEG] Warning %s", msg));
-}
-/**
-sample debug callback expecting no client object
-*/
-void info_callback(const char *msg, void *client_data)
-{
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenJPEG] Info %s", msg));
-}
-
-/*
-* Divide an integer by a power of 2 and round upwards.
-*
-* a divided by 2^b
-*/
-static int int_ceildivpow2(int a, int b) {
-	return (a + (1 << b) - 1) >> b;
-}
-
-static GF_Err JP2_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	u32 i, w, wr, h, hr, wh;
-	opj_dparameters_t parameters;	/* decompression parameters */
-	opj_event_mgr_t event_mgr;		/* event manager */
-	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
-	opj_cio_t *cio = NULL;
-	opj_codestream_info_t cinfo;
-
-	JP2CTX();
-
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-
-	if (!ctx->image) {
-		/* configure the event callbacks (not required) */
-		memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
-		event_mgr.error_handler = error_callback;
-		event_mgr.warning_handler = warning_callback;
-		event_mgr.info_handler = info_callback;
-
-		/* set decoding parameters to default values */
-		opj_set_default_decoder_parameters(&parameters);
-
-		/* get a decoder handle */
-		dinfo = opj_create_decompress(CODEC_JP2);
-
-		/* catch events using our callbacks and give a local context */
-		opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
-
-		/* setup the decoder decoding parameters using the current image and user parameters */
-		opj_setup_decoder(dinfo, &parameters);
-
-
-		/* open a byte stream */
-		if (ctx->dsi) {
-			char *data;
-
-			data = (char*)gf_malloc(sizeof(char) * (ctx->dsi_size+inBufferLength));
-			memcpy(data, ctx->dsi, ctx->dsi_size);
-			memcpy(data+ctx->dsi_size, inBuffer, inBufferLength);
-			cio = opj_cio_open((opj_common_ptr)dinfo, data, ctx->dsi_size+inBufferLength);
-			/* decode the stream and fill the image structure */
-			ctx->image = opj_decode(dinfo, cio);
-			gf_free(data);
-		} else {
-			cio = opj_cio_open((opj_common_ptr)dinfo, inBuffer, inBufferLength);
-			/* decode the stream and fill the image structure */
-			ctx->image = opj_decode_with_info(dinfo, cio, &cinfo);
-		}
-
-		//Fill the ctx info because dsi was not present
-		if (ctx->image) {
-			ctx->nb_comp = cinfo.numcomps;
-			ctx->width = cinfo.image_w;
-			ctx->height = cinfo.image_h;
-			ctx->bpp = ctx->nb_comp * 8;
-			ctx->out_size = ctx->width * ctx->height * ctx->nb_comp /* * ctx->bpp / 8 */;
-
-			switch (ctx->nb_comp) {
-			case 1:
-				ctx->pixel_format = GF_PIXEL_GREYSCALE;
-				break;
-			case 2:
-				ctx->pixel_format = GF_PIXEL_ALPHAGREY;
-				break;
-			case 3:
-				ctx->pixel_format = GF_PIXEL_RGB_24;
-				break;
-			case 4:
-				ctx->pixel_format = GF_PIXEL_RGBA;
-				break;
-			default:
-				return GF_NOT_SUPPORTED;
-			}
-
-			if ( *outBufferLength < ctx->out_size ) {
-				*outBufferLength = ctx->out_size;
-				opj_destroy_decompress(dinfo);
-				opj_cio_close(cio);
-				return GF_BUFFER_TOO_SMALL;
-			}
-		}
-
-		if(!ctx->image) {
-			opj_destroy_decompress(dinfo);
-			opj_cio_close(cio);
-			return GF_IO_ERR;
-		}
-
-		/* close the byte stream */
-		opj_cio_close(cio);
-		cio = NULL;
-
-		/* gf_free( remaining structures */
-		if(dinfo) {
-			opj_destroy_decompress(dinfo);
-			dinfo = NULL;
-		}
-	}
-
-	w = ctx->image->comps[0].w;
-	wr = int_ceildivpow2(ctx->image->comps[0].w, ctx->image->comps[0].factor);
-	h = ctx->image->comps[0].h;
-	hr = int_ceildivpow2(ctx->image->comps[0].h, ctx->image->comps[0].factor);
-	wh = wr*hr;
-
-	if (ctx->nb_comp==1) {
-		if ((w==wr) && (h==hr)) {
-			for (i=0; i<wh; i++) {
-				outBuffer[i] = ctx->image->comps[0].data[i];
-			}
-		} else {
-			for (i=0; i<wh; i++) {
-				outBuffer[i] = ctx->image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-			}
-		}
-	}
-	else if (ctx->nb_comp==3) {
-
-		if ((ctx->image->comps[0].w==2*ctx->image->comps[1].w) && (ctx->image->comps[1].w==ctx->image->comps[2].w)
-		        && (ctx->image->comps[0].h==2*ctx->image->comps[1].h) && (ctx->image->comps[1].h==ctx->image->comps[2].h)) {
-
-			if (ctx->pixel_format != GF_PIXEL_YV12) {
-				ctx->pixel_format = GF_PIXEL_YV12;
-				ctx->out_size = 3*ctx->width*ctx->height/2;
-				*outBufferLength = ctx->out_size;
-				return GF_BUFFER_TOO_SMALL;
-			}
-
-			if ((w==wr) && (h==hr)) {
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[0].data[i];
-					outBuffer++;
-				}
-				w = ctx->image->comps[1].w;
-				wr = int_ceildivpow2(ctx->image->comps[1].w, ctx->image->comps[1].factor);
-				h = ctx->image->comps[1].h;
-				hr = int_ceildivpow2(ctx->image->comps[1].h, ctx->image->comps[1].factor);
-				wh = wr*hr;
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[1].data[i];
-					outBuffer++;
-				}
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[2].data[i];
-					outBuffer++;
-				}
-			} else {
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-				}
-				w = ctx->image->comps[1].w;
-				wr = int_ceildivpow2(ctx->image->comps[1].w, ctx->image->comps[1].factor);
-				h = ctx->image->comps[1].h;
-				hr = int_ceildivpow2(ctx->image->comps[1].h, ctx->image->comps[1].factor);
-				wh = wr*hr;
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-				}
-				for (i=0; i<wh; i++) {
-					*outBuffer = ctx->image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-				}
-			}
-
-
-		} else if ((ctx->image->comps[0].w==ctx->image->comps[1].w) && (ctx->image->comps[1].w==ctx->image->comps[2].w)
-		           && (ctx->image->comps[0].h==ctx->image->comps[1].h) && (ctx->image->comps[1].h==ctx->image->comps[2].h)) {
-
-			if ((w==wr) && (h==hr)) {
-				for (i=0; i<wh; i++) {
-					u32 idx = 3*i;
-					outBuffer[idx] = ctx->image->comps[0].data[i];
-					outBuffer[idx+1] = ctx->image->comps[1].data[i];
-					outBuffer[idx+2] = ctx->image->comps[2].data[i];
-				}
-			} else {
-				for (i=0; i<wh; i++) {
-					u32 idx = 3*i;
-					outBuffer[idx] = ctx->image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-					outBuffer[idx+1] = ctx->image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-					outBuffer[idx+2] = ctx->image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-				}
-			}
-		}
-	}
-	else if (ctx->nb_comp==4) {
-		if ((ctx->image->comps[0].w==ctx->image->comps[1].w) && (ctx->image->comps[1].w==ctx->image->comps[2].w) && (ctx->image->comps[2].w==ctx->image->comps[3].w)
-		        && (ctx->image->comps[0].h==ctx->image->comps[1].h) && (ctx->image->comps[1].h==ctx->image->comps[2].h) && (ctx->image->comps[2].h==ctx->image->comps[3].h)) {
-
-			if ((w==wr) && (h==hr)) {
-				for (i=0; i<wh; i++) {
-					u32 idx = 4*i;
-					outBuffer[idx] = ctx->image->comps[0].data[i];
-					outBuffer[idx+1] = ctx->image->comps[1].data[i];
-					outBuffer[idx+2] = ctx->image->comps[2].data[i];
-					outBuffer[idx+3] = ctx->image->comps[3].data[i];
-				}
-			} else {
-				for (i=0; i<wh; i++) {
-					u32 idx = 4*i;
-					outBuffer[idx] = ctx->image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-					outBuffer[idx+1] = ctx->image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-					outBuffer[idx+2] = ctx->image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-					outBuffer[idx+3] = ctx->image->comps[3].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
-				}
-			}
-		}
-	}
-
-	/* gf_free( image data structure */
-	if (ctx->image) {
-		opj_image_destroy(ctx->image);
-		ctx->image = NULL;
-	}
-
-	*outBufferLength = ctx->out_size;
-	return GF_OK;
-}
-
-static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
-{
-#ifdef OPENJPEG_VERSION
-	return "OpenJPEG "OPENJPEG_VERSION ;
-#else
-	return "OpenJPEG" ;
-#endif
-}
-
-
-Bool NewJP2Dec(GF_BaseDecoder *ifcd)
-{
-	IMGDec *wrap = (IMGDec *) ifcd->privateStack;
-	JP2Dec *dec = (JP2Dec *) gf_malloc(sizeof(JP2Dec));
-	memset(dec, 0, sizeof(JP2Dec));
-	wrap->opaque = dec;
-	wrap->type = DEC_JPEG;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = JP2_AttachStream;
-	ifcd->DetachStream = JP2_DetachStream;
-	ifcd->GetCapabilities = JP2_GetCapabilities;
-	ifcd->SetCapabilities = JP2_SetCapabilities;
-	ifcd->GetName = JP2_GetCodecName;
-	((GF_MediaDecoder *)ifcd)->ProcessData = JP2_ProcessData;
-	return GF_TRUE;
-}
-
-void DeleteJP2Dec(GF_BaseDecoder *ifcg)
-{
-	JP2CTX();
-	gf_free(ctx);
-}
-
-#endif

gpac-0.8.0.tar.gz/modules/img_in/jpeg_dec.c Deleted

@@ -1,156 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 "img_in.h"
-#include <gpac/avparse.h>
-
-typedef struct
-{
-	/*no support for scalability with JPEG (progressive JPEG to test)*/
-	u16 ES_ID;
-	u32 BPP, width, height, out_size, pixel_format;
-} JPEGDec;
-
-#define JPEGCTX()	JPEGDec *ctx = (JPEGDec *) ((IMGDec *)ifcg->privateStack)->opaque
-
-static GF_Err JPEG_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	JPEGCTX();
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-	ctx->ES_ID = esd->ESID;
-	ctx->BPP = 3;
-	return GF_OK;
-}
-static GF_Err JPEG_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	JPEGCTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-	ctx->ES_ID = ES_ID;
-	return GF_OK;
-}
-static GF_Err JPEG_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	JPEGCTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->width * ctx->BPP;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 0;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pixel_format;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = 	ctx->out_size;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = IMG_CM_SIZE;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-static GF_Err JPEG_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err JPEG_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_Err e;
-	JPEGCTX();
-
-	e = gf_img_jpeg_dec(inBuffer, inBufferLength, &ctx->width, &ctx->height, &ctx->pixel_format, outBuffer, outBufferLength, ctx->BPP);
-	switch (ctx->pixel_format) {
-	case GF_PIXEL_GREYSCALE:
-		ctx->BPP = 1;
-		break;
-	case GF_PIXEL_RGB_24:
-		ctx->BPP = 3;
-		break;
-	}
-	ctx->out_size = *outBufferLength;
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif //GPAC_DISABLE_AV_PARSERS
-}
-
-static const char *JPEG_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "JPEG 6b IJG";
-}
-
-
-Bool NewJPEGDec(GF_BaseDecoder *ifcd)
-{
-	IMGDec *wrap = (IMGDec *) ifcd->privateStack;
-	JPEGDec *dec = (JPEGDec *) gf_malloc(sizeof(JPEGDec));
-	memset(dec, 0, sizeof(JPEGDec));
-	wrap->opaque = dec;
-	wrap->type = DEC_JPEG;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = JPEG_AttachStream;
-	ifcd->DetachStream = JPEG_DetachStream;
-	ifcd->GetCapabilities = JPEG_GetCapabilities;
-	ifcd->SetCapabilities = JPEG_SetCapabilities;
-	ifcd->GetName = JPEG_GetCodecName;
-	((GF_MediaDecoder *)ifcd)->ProcessData = JPEG_ProcessData;
-	return GF_TRUE;
-}
-
-void DeleteJPEGDec(GF_BaseDecoder *ifcg)
-{
-	JPEGCTX();
-	gf_free(ctx);
-}

gpac-0.8.0.tar.gz/modules/img_in/png_dec.c Deleted

@@ -1,181 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / image format module
- *
- *  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 "img_in.h"
-#include <gpac/avparse.h>
-
-typedef struct
-{
-	u16 ES_ID;
-	u32 BPP, width, height, out_size, pixel_format;
-	u32 aux_type;
-} PNGDec;
-
-#define PNGCTX()	PNGDec *ctx = (PNGDec *) ((IMGDec *)ifcg->privateStack)->opaque
-
-
-static GF_Err PNG_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	u32 i = 0;
-	GF_Descriptor *d = NULL;
-	PNGCTX();
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-	ctx->ES_ID = esd->ESID;
-
-	while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
-		if (d->tag == GF_ODF_AUX_VIDEO_DATA) {
-			ctx->aux_type = ((GF_AuxVideoDescriptor*)d)->aux_video_type;
-			break;
-		}
-	}
-	return GF_OK;
-}
-static GF_Err PNG_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	PNGCTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-	ctx->ES_ID = ES_ID;
-	return GF_OK;
-}
-static GF_Err PNG_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	PNGCTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		if (ctx->aux_type==3) {
-			capability->cap.valueInt = ctx->width/2;
-		} else {
-			capability->cap.valueInt = ctx->width;
-		}
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->width * ctx->BPP;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 0;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pixel_format;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = 	ctx->out_size;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = IMG_CM_SIZE;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
-}
-static GF_Err PNG_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GF_Err PNG_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_Err e;
-	PNGCTX();
-
-	e = gf_img_png_dec(inBuffer, inBufferLength, &ctx->width, &ctx->height, &ctx->pixel_format, outBuffer, outBufferLength);
-
-	switch (ctx->pixel_format) {
-	case GF_PIXEL_GREYSCALE:
-		ctx->BPP = 1;
-		break;
-	case GF_PIXEL_ALPHAGREY:
-		ctx->BPP = 2;
-		break;
-	case GF_PIXEL_RGB_24:
-		ctx->BPP = 3;
-		if (ctx->aux_type==3) ctx->pixel_format = GF_PIXEL_RGBS;
-		break;
-	case GF_PIXEL_RGBA:
-	case GF_PIXEL_RGBD:
-		ctx->BPP = 4;
-		if (ctx->aux_type==1) ctx->pixel_format = GF_PIXEL_RGBD;
-		else if (ctx->aux_type==2) ctx->pixel_format = GF_PIXEL_RGBDS;
-		else if (ctx->aux_type==3) ctx->pixel_format = GF_PIXEL_RGBAS;
-		break;
-	}
-	ctx->out_size = *outBufferLength;
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif //GPAC_DISABLE_AV_PARSERS
-}
-
-static const char *PNG_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "LibPNG";
-}
-
-Bool NewPNGDec(GF_BaseDecoder *ifcd)
-{
-	IMGDec *wrap = (IMGDec *) ifcd->privateStack;
-	PNGDec *dec = (PNGDec *) gf_malloc(sizeof(PNGDec));
-	memset(dec, 0, sizeof(PNGDec));
-	wrap->opaque = dec;
-	wrap->type = DEC_PNG;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = PNG_AttachStream;
-	ifcd->DetachStream = PNG_DetachStream;
-	ifcd->GetCapabilities = PNG_GetCapabilities;
-	ifcd->SetCapabilities = PNG_SetCapabilities;
-	ifcd->GetName = PNG_GetCodecName;
-	((GF_MediaDecoder *)ifcd)->ProcessData = PNG_ProcessData;
-	return GF_TRUE;
-}
-
-void DeletePNGDec(GF_BaseDecoder *ifcg)
-{
-	PNGCTX();
-	gf_free(ctx);
-}

gpac-0.8.0.tar.gz/modules/ismacryp Deleted

gpac-0.8.0.tar.gz/modules/ismacryp/Makefile Deleted

gpac-0.8.0.tar.gz/modules/ismacryp/isma_ea.c Deleted

@@ -1,659 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / LASeR decoder module
- *
- *  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/ismacryp.h>
-#include <gpac/crypt.h>
-#include <gpac/base_coding.h>
-#include <gpac/download.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/modules/ipmp.h>
-
-#ifndef GPAC_DISABLE_MCRYPT
-
-#define OMA_DRM_MP4MC
-
-
-enum
-{
-	ISMAEA_STATE_ERROR,
-	ISMAEA_STATE_SETUP,
-	ISMAEA_STATE_PLAY,
-};
-
-typedef struct
-{
-	GF_Crypt *crypt;
-	char key[16], salt[8];
-	u64 last_IV;
-	u32 state;
-	u32 nb_allow_play;
-	Bool is_oma;
-	u32 preview_range;
-	/*for Common Encryption*/
-	Bool is_cenc;
-	Bool is_cbc;
-	Bool first_crypted_samp;
-	u32 KID_count;
-	bin128 *KIDs;
-	bin128 *keys;
-} ISMAEAPriv;
-
-
-static void ISMA_KMS_NetIO(void *cbck, GF_NETIO_Parameter *par)
-{
-}
-
-static GF_Err ISMA_GetGPAC_KMS(ISMAEAPriv *priv, GF_Channel *ch, const char *kms_url)
-{
-	GF_Err e;
-	FILE *t;
-	GF_DownloadSession * sess;
-	if (!strnicmp(kms_url, "(ipmp)", 6)) return GF_NOT_SUPPORTED;
-	else if (!strnicmp(kms_url, "(uri)", 5)) kms_url += 5;
-	else if (!strnicmp(kms_url, "file://", 7)) kms_url += 7;
-
-	/*try local*/
-	t = (strstr(kms_url, "://") == NULL) ? gf_fopen(kms_url, "r") : NULL;
-	if (t) {
-		gf_fclose(t);
-		return gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *)kms_url, priv->key, priv->salt);
-	}
-	/*note that gpac doesn't have TLS support -> not really usefull. As a general remark, ISMACryp
-	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", ch->esd->ESID) );
-
-	sess = gf_service_download_new(ch->service, kms_url, 0, ISMA_KMS_NetIO, ch);
-	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);
-		if (e) break;
-	}
-	if (e==GF_EOS) {
-		e = gf_ismacryp_gpac_get_info(ch->esd->ESID, (char *) gf_dm_sess_get_cache_name(sess), priv->key, priv->salt);
-	}
-	gf_service_download_del(sess);
-	return e;
-}
-
-
-static GF_Err ISMA_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_Err e;
-	GF_ISMACrypConfig *cfg = (GF_ISMACrypConfig*)evt->config_data;
-
-	priv->state = ISMAEA_STATE_ERROR;
-
-	if (cfg->scheme_type != GF_ISOM_ISMACRYP_SCHEME) return GF_NOT_SUPPORTED;
-	if (cfg->scheme_version != 1) return GF_NOT_SUPPORTED;
-
-	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*try to fetch the keys*/
-	/*base64 inband encoding*/
-	if (!strnicmp(cfg->kms_uri, "(key)", 5)) {
-		char data[100];
-		gf_base64_decode((char*)cfg->kms_uri+5, (u32)strlen(cfg->kms_uri)-5, data, 100);
-		memcpy(priv->key, data, sizeof(char)*16);
-		memcpy(priv->salt, data+16, sizeof(char)*8);
-	}
-	/*hexadecimal inband encoding*/
-	else if (!strnicmp(cfg->kms_uri, "(key-hexa)", 10)) {
-		u32 v;
-		char szT[3], *k;
-		u32 i;
-		szT[2] = 0;
-		if (strlen(cfg->kms_uri) < 10+32+16) return GF_NON_COMPLIANT_BITSTREAM;
-
-		k = (char *)cfg->kms_uri + 10;
-		for (i=0; i<16; i++) {
-			szT[0] = k[2*i];
-			szT[1] = k[2*i + 1];
-			sscanf(szT, "%X", &v);
-			priv->key[i] = v;
-		}
-
-		k = (char *)cfg->kms_uri + 10 + 32;
-		for (i=0; i<8; i++) {
-			szT[0] = k[2*i];
-			szT[1] = k[2*i + 1];
-			sscanf(szT, "%X", &v);
-			priv->salt[i] = v;
-		}
-	}
-	/*MPEG4-IP KMS*/
-	else if (!stricmp(cfg->kms_uri, "AudioKey") || !stricmp(cfg->kms_uri, "VideoKey")) {
-		if (!gf_ismacryp_mpeg4ip_get_info((char *) cfg->kms_uri, priv->key, priv->salt)) {
-			return GF_BAD_PARAM;
-		}
-	}
-	/*gpac default scheme is used, fetch file from KMS and load keys*/
-	else if (cfg->scheme_uri && !stricmp(cfg->scheme_uri, "urn:gpac:isma:encryption_scheme")) {
-		e = ISMA_GetGPAC_KMS(priv, evt->channel, cfg->kms_uri);
-		if (e) return e;
-	}
-	/*hardcoded keys*/
-	else {
-		static u8 mysalt[] = { 8,7,6,5,4,3,2,1, 0,0,0,0,0,0,0,0 };
-		static u8 mykey[][16]  = {
-			{	0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-				0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
-			}
-		};
-		memcpy(priv->salt, mysalt, sizeof(char)*8);
-		memcpy(priv->key, mykey, sizeof(char)*16);
-	}
-	priv->state = ISMAEA_STATE_SETUP;
-	//priv->nb_allow_play = 1;
-	return GF_OK;
-}
-
-static GF_Err ISMA_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_Err e;
-	char IV[GF_AES_128_KEYSIZE];
-
-	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
-		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
-		assert(!priv->crypt);
-
-		//if (!priv->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
-		//priv->nb_allow_play--;
-
-		/*init decrypter*/
-		priv->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-		if (!priv->crypt) return GF_IO_ERR;
-
-		memset(IV, 0, sizeof(char)*16);
-		memcpy(IV, priv->salt, sizeof(char)*8);
-		e = gf_crypt_init(priv->crypt, priv->key, IV);
-		if (e) return e;
-
-		priv->state = ISMAEA_STATE_PLAY;
-		return GF_OK;
-	}
-	if (evt->event_type==GF_IPMP_TOOL_RELEASE_ACCESS) {
-		if (priv->state != ISMAEA_STATE_PLAY) return GF_SERVICE_ERROR;
-		if (priv->crypt) gf_crypt_close(priv->crypt);
-		priv->crypt = NULL;
-		priv->state = ISMAEA_STATE_SETUP;
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-static GF_Err ISMA_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	if (!priv->crypt) return GF_SERVICE_ERROR;
-
-	if (!evt->is_encrypted) return GF_OK;
-
-	/*resync IV*/
-	if (!priv->last_IV || (priv->last_IV != evt->isma_BSO)) {
-		char IV[GF_AES_128_KEYSIZE + 1];
-		u64 count;
-		u32 remain;
-		GF_BitStream *bs;
-		count = evt->isma_BSO / 16;
-		remain = (u32) (evt->isma_BSO % 16);
-
-		/*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, priv->salt, 8);
-		gf_bs_write_u64(bs, (s64) count);
-		gf_bs_del(bs);
-		gf_crypt_set_IV(priv->crypt, IV, 17);
-
-		/*decrypt remain bytes*/
-		if (remain) {
-			char dummy[20];
-			gf_crypt_decrypt(priv->crypt, dummy, remain);
-		}
-		priv->last_IV = evt->isma_BSO;
-	}
-	/*decrypt*/
-	gf_crypt_decrypt(priv->crypt, evt->data, evt->data_size);
-	priv->last_IV += evt->data_size;
-	return GF_OK;
-}
-
-
-#ifdef OMA_DRM_MP4MC
-static GF_Err OMA_DRM_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	u32 hdr_pos;
-	GF_OMADRM2Config *cfg = (GF_OMADRM2Config*)evt->config_data;
-
-	priv->state = ISMAEA_STATE_ERROR;
-
-	if (cfg->scheme_type != GF_ISOM_OMADRM_SCHEME) return GF_NOT_SUPPORTED;
-	if (cfg->scheme_version != 0x00000200) return GF_NOT_SUPPORTED;
-
-	hdr_pos = 0;
-	while (hdr_pos<cfg->oma_drm_textual_headers_len) {
-		u32 len;
-		char *sep;
-		if (!strncmp(cfg->oma_drm_textual_headers + hdr_pos, "PreviewRange", 12)) {
-			sep = strchr(cfg->oma_drm_textual_headers + hdr_pos, ':');
-			if (sep) priv->preview_range = atoi(sep+1);
-		}
-		len = (u32) strlen(cfg->oma_drm_textual_headers + hdr_pos);
-		hdr_pos += len+1;
-	}
-	priv->is_oma = GF_TRUE;
-
-	/*TODO: call DRM agent, fetch keys*/
-	if (!cfg->kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
-	priv->state = ISMAEA_STATE_SETUP;
-	//priv->nb_allow_play = 1;
-
-	/*we have preview*/
-	if (priv->preview_range) return GF_OK;
-	return GF_NOT_SUPPORTED;
-}
-#endif
-
-static GF_Err CENC_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_CENCConfig *cfg = (GF_CENCConfig*)evt->config_data;
-	u32 i;
-	Bool is_playing = (priv->state == ISMAEA_STATE_PLAY) ? GF_TRUE : GF_FALSE;
-
-	priv->state = ISMAEA_STATE_ERROR;
-
-	if ((cfg->scheme_type != GF_ISOM_CENC_SCHEME) && (cfg->scheme_type != GF_ISOM_CBC_SCHEME) && (cfg->scheme_type != GF_ISOM_CENS_SCHEME) && (cfg->scheme_type != GF_ISOM_CBCS_SCHEME))
-		return GF_NOT_SUPPORTED;
-	if (cfg->scheme_version != 0x00010000) return GF_NOT_SUPPORTED;
-
-	for (i = 0; i < cfg->PSSH_count; i++) {
-		GF_NetComDRMConfigPSSH *pssh = &cfg->PSSHs[i];
-		char szSystemID[33];
-		u32 j;
-
-		memset(szSystemID, 0, 33);
-		for (j=0; j<16; j++) {
-			sprintf(szSystemID+j*2, "%02X", (unsigned char) pssh->SystemID[j]);
-		}
-
-		/*SystemID for GPAC Player: 67706163-6365-6E63-6472-6D746F6F6C31*/
-		if (strcmp(szSystemID, "6770616363656E6364726D746F6F6C31")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] System ID %s not supported\n", szSystemID));
-			continue;
-		}
-		else {
-			u8 cypherOffset;
-			bin128 cypherKey, cypherIV;
-			GF_Crypt *mc;
-
-			/*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->private_data[0] + 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;
-			}
-			gf_crypt_init(mc, cypherKey, cypherIV);
-			gf_crypt_decrypt(mc, pssh->private_data+cypherOffset, pssh->private_data_size-cypherOffset);
-			gf_crypt_close(mc);
-
-			/*now we search a key*/
-			priv->KID_count = pssh->KID_count;
-			if (priv->KIDs) {
-				gf_free(priv->KIDs);
-				priv->KIDs = NULL;
-			}
-			priv->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-			if (priv->keys) {
-				gf_free(priv->keys);
-				priv->keys = NULL;
-			}
-			priv->keys = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-
-			memmove(priv->KIDs, pssh->KIDs, pssh->KID_count*sizeof(bin128));
-			memmove(priv->keys, pssh->private_data + cypherOffset, pssh->KID_count*sizeof(bin128));
-		}
-	}
-
-	if ((cfg->scheme_type == GF_ISOM_CENC_SCHEME) || (cfg->scheme_type == GF_ISOM_CENS_SCHEME))
-		priv->is_cenc = GF_TRUE;
-	else
-		priv->is_cbc = GF_TRUE;
-
-	priv->state = is_playing ? ISMAEA_STATE_PLAY : ISMAEA_STATE_SETUP;
-	//priv->nb_allow_play = 1;
-	return GF_OK;
-}
-
-static GF_Err CENC_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
-		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
-		assert(!priv->crypt);
-
-		//if (!priv->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
-		//priv->nb_allow_play--;
-
-		/*open decrypter - we do NOT initialize decrypter; it wil be done when we decrypt the first crypted sample*/
-		if (priv->is_cenc)
-			priv->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
-		else
-			priv->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
-		if (!priv->crypt) return GF_IO_ERR;
-
-		priv->first_crypted_samp = GF_TRUE;
-
-		priv->state = ISMAEA_STATE_PLAY;
-		return GF_OK;
-	}
-	if (evt->event_type==GF_IPMP_TOOL_RELEASE_ACCESS) {
-		if (priv->state != ISMAEA_STATE_PLAY) return GF_SERVICE_ERROR;
-		if (priv->crypt) gf_crypt_close(priv->crypt);
-		priv->crypt = NULL;
-		priv->state = ISMAEA_STATE_SETUP;
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-static GF_Err CENC_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
-{
-	GF_Err e;
-	GF_BitStream *plaintext_bs, *cyphertext_bs, *sai_bs;
-	char IV[GF_AES_128_KEYSIZE + 1];
-
-	bin128 KID;
-	char *buffer;
-	u32 max_size, i, subsample_count;
-	GF_CENCSampleAuxInfo *sai;
-
-	plaintext_bs = cyphertext_bs = sai_bs = NULL;
-	buffer = NULL;
-	max_size = 4096;
-
-	if (!priv->crypt) return GF_SERVICE_ERROR;
-
-	if (!evt->is_encrypted) return GF_OK;
-
-	cyphertext_bs = gf_bs_new(evt->data, evt->data_size, GF_BITSTREAM_READ);
-	sai_bs = gf_bs_new(evt->sai, evt->saiz, GF_BITSTREAM_READ);
-	plaintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-
-	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-	if (!sai) {
-		e = GF_IO_ERR;
-		goto exit;
-	}
-	memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
-	sai->IV_size = evt->IV_size;
-	/*read sample auxiliary information from bitstream*/
-	gf_bs_read_data(sai_bs,  (char *)KID, 16);
-	gf_bs_read_data(sai_bs, (char *)sai->IV, sai->IV_size);
-	sai->subsample_count = gf_bs_read_u16(sai_bs);
-	if (sai->subsample_count) {
-		sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
-		for (i = 0; i < sai->subsample_count; i++) {
-			sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(sai_bs);
-			sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(sai_bs);
-		}
-	}
-
-
-	for (i = 0; i < priv->KID_count; i++) {
-		if (!strncmp((const char *)KID, (const char *)priv->KIDs[i], 16)) {
-			memmove(priv->key, priv->keys[i], 16);
-			break;
-		}
-	}
-
-	if (priv->first_crypted_samp) {
-		if (evt->IV_size) {
-			memmove(IV, sai->IV, sai->IV_size);
-			if (sai->IV_size == 8)
-				memset(IV+8, 0, sizeof(char)*8);
-		} else {
-			memmove(IV, evt->constant_IV, evt->constant_IV_size);
-			if (evt->constant_IV_size == 8)
-				memset(IV+8, 0, sizeof(char)*8);
-		}
-		e = gf_crypt_init(priv->crypt, priv->key, IV);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		priv->first_crypted_samp = GF_FALSE;
-	} else {
-		if (priv->is_cenc) {
-			GF_BitStream *bs;
-			bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
-			gf_bs_write_u8(bs, 0);	/*begin of counter*/
-			gf_bs_write_data(bs,(char *)sai->IV, sai->IV_size);
-			if (sai->IV_size == 8)
-				gf_bs_write_u64(bs, 0); /*0-padded if IV_size == 8*/
-			gf_bs_del(bs);
-			gf_crypt_set_IV(priv->crypt, IV, 17);
-		}
-		e = gf_crypt_set_key(priv->crypt, priv->key);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
-			e = GF_IO_ERR;
-			goto exit;
-		}
-	}
-
-	//sub-sample encryption
-	if (sai->subsample_count) {
-		subsample_count = 0;
-		while (gf_bs_available(cyphertext_bs)) {
-			if (subsample_count >= sai->subsample_count)
-				break;
-			if (!evt->IV_size) {
-				memmove(IV, evt->constant_IV, evt->constant_IV_size);
-				if (evt->constant_IV_size == 8)
-					memset(IV+8, 0, sizeof(char)*8);
-				gf_crypt_set_IV(priv->crypt, IV, 16);
-			}
-
-			/*read clear data and write it to plaintext_bs bitstream*/
-			if (max_size < sai->subsamples[subsample_count].bytes_clear_data) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_clear_data);
-				max_size = sai->subsamples[subsample_count].bytes_clear_data;
-			}
-			gf_bs_read_data(cyphertext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
-			gf_bs_write_data(plaintext_bs, buffer, sai->subsamples[subsample_count].bytes_clear_data);
-
-			/*now read encrypted data, decrypted it and write to plaintext_bs bitstream*/
-			if (max_size < sai->subsamples[subsample_count].bytes_encrypted_data) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*sai->subsamples[subsample_count].bytes_encrypted_data);
-				max_size = sai->subsamples[subsample_count].bytes_encrypted_data;
-			}
-			gf_bs_read_data(cyphertext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
-			//pattern decryption
-			if (evt->crypt_byte_block && evt->skip_byte_block) {
-				u32 pos = 0;
-				u32 res = sai->subsamples[subsample_count].bytes_encrypted_data;
-				while (res) {
-					gf_crypt_decrypt(priv->crypt, buffer+pos, res >= (u32) (16*evt->crypt_byte_block) ? 16*evt->crypt_byte_block : res);
-					if (res >= (u32) (16 * (evt->crypt_byte_block + evt->skip_byte_block))) {
-						pos += 16 * (evt->crypt_byte_block + evt->skip_byte_block);
-						res -= 16 * (evt->crypt_byte_block + evt->skip_byte_block);
-					} else {
-						res = 0;
-					}
-			}
-			} else {
-				gf_crypt_decrypt(priv->crypt, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
-			}
-			gf_bs_write_data(plaintext_bs, buffer, sai->subsamples[subsample_count].bytes_encrypted_data);
-
-			subsample_count++;
-		}
-		if (buffer) gf_free(buffer);
-		gf_bs_get_content(plaintext_bs, &buffer, &evt->data_size);
-	}
-	//full sample encryption
-	else {
-		if (max_size < evt->data_size) {
-			buffer = (char*)gf_realloc(buffer, sizeof(char)*evt->data_size);
-		}
-		gf_bs_read_data(cyphertext_bs, buffer, evt->data_size);
-		if (priv->is_cenc) {
-			gf_crypt_decrypt(priv->crypt, buffer, evt->data_size);
-		} else {
-			u32 ret = evt->data_size % 16;
-			if (evt->data_size >= 16) {
-				gf_crypt_decrypt(priv->crypt, buffer, evt->data_size-ret);
-			}
-		}
-	}
-	memmove(evt->data, buffer, evt->data_size);
-
-exit:
-	if (plaintext_bs) gf_bs_del(plaintext_bs);
-	if (sai_bs) gf_bs_del(sai_bs);
-	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
-	if (buffer) gf_free(buffer);
-	if (sai && sai->subsamples) gf_free(sai->subsamples);
-	if (sai) gf_free(sai);
-	return e;
-}
-
-
-static GF_Err IPMP_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
-{
-	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
-
-	switch (evt->event_type) {
-	case GF_IPMP_TOOL_SETUP:
-		if (evt->config_data_code == GF_ISOM_ISMA_SCHEME) return ISMA_Setup(priv, evt);
-#ifdef OMA_DRM_MP4MC
-		if (evt->config_data_code == GF_ISOM_ODRM_SCHEME) return OMA_DRM_Setup(priv, evt);
-#endif
-		if((evt->config_data_code == GF_ISOM_CENC_SCHEME) || (evt->config_data_code == GF_ISOM_CBC_SCHEME) || (evt->config_data_code == GF_ISOM_CENS_SCHEME) || (evt->config_data_code == GF_ISOM_CBCS_SCHEME))
-			return CENC_Setup(priv, evt);
-		return GF_NOT_SUPPORTED;
-
-	case GF_IPMP_TOOL_GRANT_ACCESS:
-	case GF_IPMP_TOOL_RELEASE_ACCESS:
-		if (priv->is_cenc || priv->is_cbc) {
-			return CENC_Access(priv, evt);
-		} else if (priv->is_oma) {
-		} else {
-			return ISMA_Access(priv, evt);
-		}
-		break;
-	case GF_IPMP_TOOL_PROCESS_DATA:
-		if (priv->is_cenc || priv->is_cbc) {
-			return CENC_ProcessData(priv, evt);
-		} else if (priv->is_oma) {
-			if (evt->is_encrypted) {
-				evt->restart_requested = GF_TRUE;
-				return GF_EOS;
-			}
-			return GF_OK;
-		}
-		return ISMA_ProcessData(priv, evt);
-	}
-	return GF_OK;
-}
-
-void DeleteIPMPTool(GF_IPMPTool *plug)
-{
-	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
-	/*in case something went wrong*/
-	if (priv->crypt) gf_crypt_close(priv->crypt);
-	if (priv->KIDs) gf_free(priv->KIDs);
-	if (priv->keys) gf_free(priv->keys);
-	gf_free(priv);
-	gf_free(plug);
-}
-
-GF_IPMPTool *NewIPMPTool()
-{
-	ISMAEAPriv *priv;
-	GF_IPMPTool *tmp;
-
-	GF_SAFEALLOC(tmp, GF_IPMPTool);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, ISMAEAPriv);
-	tmp->udta = priv;
-	tmp->process = IPMP_Process;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_IPMP_TOOL_INTERFACE, "GPAC ISMACryp tool", "gpac distribution")
-	return (GF_IPMPTool *) tmp;
-}
-
-#endif /*GPAC_DISABLE_MCRYPT*/
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_MCRYPT
-		GF_IPMP_TOOL_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_MCRYPT
-	case GF_IPMP_TOOL_INTERFACE:
-		return (GF_BaseInterface *)NewIPMPTool();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_MCRYPT
-	case GF_IPMP_TOOL_INTERFACE:
-		DeleteIPMPTool((GF_IPMPTool *)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( isma_ea )
-

gpac-0.8.0.tar.gz/modules/isom_in Deleted

gpac-0.8.0.tar.gz/modules/isom_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/isom_in/isom_cache.c Deleted

@@ -1,295 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP4 cache module
- *
- *  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 "isom_in.h"
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-static GF_Err ISOW_Open(GF_StreamingCache *mc, GF_ClientService *serv, const char *location_and_name, Bool keep_existing_files)
-{
-	char szRoot[GF_MAX_PATH], szPath[GF_MAX_PATH], *ext;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (cache->mov || cache->service) return GF_BAD_PARAM;
-
-	strcpy(szRoot, location_and_name);
-	ext = strrchr(szRoot, '.');
-	if (ext) ext[0] = 0;
-	strcpy(szPath, szRoot);
-	strcat(szPath, ".mp4");
-	if (keep_existing_files) {
-		FILE *f = gf_fopen(szPath, "rb");
-		if (f) {
-			u32 i=0;
-			gf_fclose(f);
-			while (1) {
-				sprintf(szPath, "%s_%04d.mp4", szRoot, i);
-				f = gf_fopen(szPath, "rb");
-				if (!f) break;
-				gf_fclose(f);
-				i++;
-			}
-		}
-	}
-
-	/*create a new movie in write mode (eg no editing)*/
-	cache->mov = gf_isom_open(szPath, GF_ISOM_OPEN_WRITE, NULL);
-	if (!cache->mov) return gf_isom_last_error(NULL);
-	cache->service = serv;
-	return GF_OK;
-}
-
-static GF_Err ISOW_Close(GF_StreamingCache *mc, Bool delete_cache)
-{
-	GF_Err e;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	while (gf_list_count(cache->channels)) {
-		ISOMChannel *ch = (ISOMChannel *)gf_list_get(cache->channels, 0);
-		gf_list_rem(cache->channels, 0);
-		if (ch->cache_sample) {
-			gf_isom_add_sample(cache->mov, ch->track, 1, ch->cache_sample);
-			gf_isom_sample_del(&ch->cache_sample);
-		}
-		gf_free(ch);
-	}
-	if (delete_cache) {
-		gf_isom_delete(cache->mov);
-		e = GF_OK;
-	} else {
-		e = gf_isom_close(cache->mov);
-	}
-	cache->mov = NULL;
-	cache->service = NULL;
-	return e;
-}
-static GF_Err ISOW_Write(GF_StreamingCache *mc, LPNETCHANNEL ch, char *data, u32 data_size, GF_SLHeader *sl_hdr)
-{
-	ISOMChannel *mch;
-	GF_ESD *esd;
-	u32 di, mtype;
-	u64 DTS, CTS;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	mch = isor_get_channel(cache, ch);
-	if (!mch) {
-		Bool mapped;
-		GF_NetworkCommand com;
-		com.base.on_channel = ch;
-		com.base.command_type = GF_NET_CHAN_GET_ESD;
-		gf_service_command(cache->service, &com, GF_OK);
-		if (!com.cache_esd.esd) return GF_SERVICE_ERROR;
-
-		esd = (GF_ESD *)com.cache_esd.esd;
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-			mtype = GF_ISOM_MEDIA_OD;
-			break;
-		case GF_STREAM_SCENE:
-			mtype = GF_ISOM_MEDIA_SCENE;
-			break;
-		case GF_STREAM_VISUAL:
-			mtype = GF_ISOM_MEDIA_VISUAL;
-			break;
-		case GF_STREAM_AUDIO:
-			mtype = GF_ISOM_MEDIA_AUDIO;
-			break;
-		case GF_STREAM_MPEG7:
-			mtype = GF_ISOM_MEDIA_MPEG7;
-			break;
-		case GF_STREAM_OCI:
-			mtype = GF_ISOM_MEDIA_OCI;
-			break;
-		case GF_STREAM_IPMP:
-			mtype = GF_ISOM_MEDIA_IPMP;
-			break;
-		case GF_STREAM_MPEGJ:
-			mtype = GF_ISOM_MEDIA_MPEGJ;
-			break;
-		case GF_STREAM_TEXT:
-			mtype = GF_ISOM_MEDIA_TEXT;
-			break;
-		default:
-			return GF_NOT_SUPPORTED;
-		}
-		GF_SAFEALLOC(mch, ISOMChannel);
-		if (!mch) {
-			return GF_OUT_OF_MEM;
-		}
-		mch->time_scale = esd->slConfig->timestampResolution;
-		mch->streamType = esd->decoderConfig->streamType;
-		mch->track = gf_isom_new_track(cache->mov, com.cache_esd.esd->ESID, mtype, mch->time_scale);
-		mch->is_playing = GF_TRUE;
-		mch->channel = ch;
-		mch->owner = cache;
-		gf_isom_set_track_enabled(cache->mov, mch->track, 1);
-		/*translate 3GP streams to MP4*/
-		mapped = GF_FALSE;
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_GENERIC) {
-			char szCode[5];
-			strncpy(szCode, esd->decoderConfig->decoderSpecificInfo->data, 4);
-			szCode[4]=0;
-			if (!stricmp(szCode, "samr") || !stricmp(szCode, "amr ") || !stricmp(szCode, "sawb")) {
-				GF_3GPConfig amrc;
-				mapped = GF_TRUE;
-				memset(&amrc, 0, sizeof(GF_3GPConfig));
-
-				amrc.frames_per_sample = (u32) esd->decoderConfig->decoderSpecificInfo->data[13];
-				amrc.type = (!stricmp(szCode, "sawb")) ? GF_ISOM_SUBTYPE_3GP_AMR_WB : GF_ISOM_SUBTYPE_3GP_AMR;
-				amrc.vendor = GF_VENDOR_GPAC;
-				gf_isom_3gp_config_new(cache->mov, mch->track, &amrc, NULL, NULL, &di);
-			} else if (!stricmp(szCode, "h263")) {
-				GF_3GPConfig h263c;
-				memset(&h263c, 0, sizeof(GF_3GPConfig));
-				h263c.type = GF_ISOM_SUBTYPE_3GP_H263;
-				h263c.vendor = GF_VENDOR_GPAC;
-				gf_isom_3gp_config_new(cache->mov, mch->track, &h263c, NULL, NULL, &di);
-				mapped = GF_TRUE;
-			}
-		}
-		if (!mapped) gf_isom_new_mpeg4_description(cache->mov, mch->track, esd, NULL, NULL, &di);
-		if (com.cache_esd.is_iod_stream) gf_isom_add_track_to_root_od(cache->mov, mch->track);
-		gf_list_add(cache->channels, mch);
-	}
-
-	/*first sample, cache it*/
-	if (!mch->cache_sample) {
-		mch->cache_seed_ts = sl_hdr->decodingTimeStamp;
-		mch->cache_sample = gf_isom_sample_new();
-		mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
-		mch->cache_sample->dataLength = data_size;
-		mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
-		memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
-		return GF_OK;
-	}
-
-	/*adjust DTS/CTS*/
-	DTS = sl_hdr->decodingTimeStamp - mch->cache_seed_ts;
-
-	if ((mch->streamType==GF_STREAM_VISUAL) && (DTS<=mch->cache_sample->DTS)) {
-		assert(DTS>mch->prev_dts);
-		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
-		mch->cache_sample->CTS_Offset = 0;
-
-		/*first time, shift all CTS*/
-		if (!mch->frame_cts_offset) {
-			u32 i, count = gf_isom_get_sample_count(cache->mov, mch->track);
-			mch->frame_cts_offset = (u32) (DTS-mch->prev_dts);
-			for (i=0; i<count; i++) {
-				gf_isom_modify_cts_offset(cache->mov, mch->track, i+1, mch->frame_cts_offset);
-			}
-			mch->cache_sample->CTS_Offset += mch->frame_cts_offset;
-		}
-		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
-		mch->cache_sample->CTS_Offset += (u32) (CTS-mch->cache_sample->DTS);
-	}
-	/*deal with reference picture insertion: if no CTS offset and biggest CTS until now, this is
-	a reference insertion - we must check that in order to make sure we have strictly increasing DTSs*/
-	if (mch->max_cts && !mch->cache_sample->CTS_Offset && (mch->cache_sample->DTS+mch->cache_sample->CTS_Offset > mch->max_cts)) {
-		assert(mch->cache_sample->DTS > mch->prev_dts + mch->frame_cts_offset);
-		CTS = mch->cache_sample->DTS + mch->cache_sample->CTS_Offset;
-		mch->cache_sample->DTS = mch->prev_dts + mch->frame_cts_offset;
-		mch->cache_sample->CTS_Offset = (u32) (CTS-mch->cache_sample->DTS);
-	}
-	if (mch->cache_sample->CTS_Offset)
-		mch->max_cts = mch->cache_sample->DTS+mch->cache_sample->CTS_Offset;
-
-	/*add cache*/
-	gf_isom_add_sample(cache->mov, mch->track, 1, mch->cache_sample);
-	assert(!mch->prev_dts || (mch->prev_dts < mch->cache_sample->DTS));
-	mch->prev_dts = mch->cache_sample->DTS;
-	mch->duration = MAX(mch->max_cts, mch->prev_dts);
-	gf_isom_sample_del(&mch->cache_sample);
-
-	/*store sample*/
-	mch->cache_sample = gf_isom_sample_new();
-	mch->cache_sample->IsRAP = sl_hdr->randomAccessPointFlag;
-	mch->cache_sample->DTS = DTS + mch->frame_cts_offset;
-	mch->cache_sample->CTS_Offset = (u32) (sl_hdr->compositionTimeStamp - mch->cache_seed_ts - DTS);
-	mch->cache_sample->dataLength = data_size;
-	mch->cache_sample->data = (char*)gf_malloc(sizeof(char)*data_size);
-	memcpy(mch->cache_sample->data, data, sizeof(char)*data_size);
-	return GF_OK;
-}
-static GF_Err ISOW_ServiceCommand(GF_StreamingCache *mc, GF_NetworkCommand *com)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-static GF_Err ISOW_ChannelGetSLP(GF_StreamingCache *mc, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-static GF_Err ISOW_ChannelReleaseSLP(GF_StreamingCache *mc, LPNETCHANNEL channel)
-{
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	if (!cache->mov || !cache->service) return GF_BAD_PARAM;
-
-	return GF_OK;
-}
-
-GF_BaseInterface *isow_load_cache()
-{
-	ISOMReader *cache;
-	GF_StreamingCache *plug;
-	GF_SAFEALLOC(plug, GF_StreamingCache);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_STREAMING_MEDIA_CACHE, "GPAC IsoMedia Cache", "gpac distribution")
-
-	GF_SAFEALLOC(cache, ISOMReader);
-	if (!cache) {
-		gf_free(plug);
-		return NULL;
-	}
-	cache->channels = gf_list_new();
-	plug->priv = cache;
-
-	plug->Open = ISOW_Open;
-	plug->Close = ISOW_Close;
-	plug->Write = ISOW_Write;
-	plug->ChannelGetSLP = ISOW_ChannelGetSLP;
-	plug->ChannelReleaseSLP = ISOW_ChannelReleaseSLP;
-	plug->ServiceCommand = ISOW_ServiceCommand;
-
-	return (GF_BaseInterface *) plug;
-}
-
-void isow_delete_cache(GF_BaseInterface *bi)
-{
-	GF_StreamingCache *mc = (GF_StreamingCache*) bi;
-	ISOMReader *cache = (ISOMReader *)mc->priv;
-	gf_list_del(cache->channels);
-	gf_free(cache);
-	gf_free(bi);
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-

gpac-0.8.0.tar.gz/modules/isom_in/isom_in.h Deleted

@@ -1,169 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP4 reader module
- *
- *  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 _ISMO_IN_H_
-#define _ISMO_IN_H_
-
-#include <gpac/constants.h>
-#include <gpac/modules/service.h>
-#include <gpac/thread.h>
-
-#ifndef GPAC_DISABLE_ISOM
-
-#include <gpac/media_tools.h>
-/*
-			reader module
-
-*/
-
-//#define DASH_USE_PULL
-
-typedef struct
-{
-	GF_InputService *input;
-	/*the service we're responsible for*/
-	GF_ClientService *service;
-
-	/*current channels*/
-	GF_List *channels;
-
-	/*input file*/
-	GF_ISOFile *mov;
-	u32 time_scale;
-	u32 nb_playing;
-
-	/*remote file handling*/
-	GF_DownloadSession * dnload;
-	u64 missing_bytes, last_size;
-	Bool no_service_desc;
-	u32 play_only_track_id;
-
-	/*0: not fragmented - 1 fragmented - 2 fragmented and last fragment received*/
-	u32 frag_type;
-	Bool waiting_for_data, reset_frag_state;
-	GF_Mutex *segment_mutex;
-
-	u32 pending_scalable_enhancement_segment_index;
-
-	Bool use_memory;
-	/*0: segment is not opened - 1: segment is opened but can be refreshed incomplete file) - 2: segment is fully parsed, no need for refresh*/
-	u32 seg_opened;
-	Bool drop_next_segment;
-	Bool in_data_flush;
-	u32 has_pending_segments, nb_force_flush;
-
-	Bool clock_discontinuity;
-	Bool disconnected;
-	Bool no_order_check;
-
-	u64 last_sender_ntp, cts_for_last_sender_ntp;
-	Double remain_at_buffering_start;
-	Bool buffering;
-} ISOMReader;
-
-
-typedef struct
-{
-	Bool use_item;
-	u32 track, track_id;
-	u32 item_id, item_idx;
-	/*base track if scalable media, 0 otherwise*/
-	u32 base_track;
-	u32 next_track;
-	LPNETCHANNEL channel;
-	ISOMReader *owner;
-	u64 duration;
-
-	Bool wait_for_segment_switch;
-	/*current sample*/
-	GF_ISOSample *sample;
-	GF_SLHeader current_slh;
-	GF_Err last_state;
-
-	Bool is_pulling;
-
-	Bool has_edit_list;
-	u32 sample_num;
-	s64 dts_offset;
-	Bool do_dts_shift_test;
-	/*for edit lists*/
-	u32 edit_sync_frame;
-	u64 sample_time, start, end;
-	Double speed;
-
-	u32 time_scale;
-	Bool to_init, is_playing, has_rap;
-	u8 streamType;
-
-	Bool is_encrypted, is_cenc;
-
-	/*cache stuff*/
-	u64 cache_seed_ts;
-	u32 frame_cts_offset;
-	u64 prev_dts, max_cts;
-	GF_ISOSample *cache_sample;
-
-	Bool buffering;
-	u32 buffer_min, buffer_max;
-
-	Bool disable_seek;
-	u32 nalu_extract_mode;
-
-	u32 last_sample_desc_index;
-} ISOMChannel;
-
-void isor_reset_reader(ISOMChannel *ch);
-void isor_reader_get_sample(ISOMChannel *ch);
-void isor_reader_release_sample(ISOMChannel *ch);
-
-ISOMChannel *isor_get_channel(ISOMReader *reader, LPNETCHANNEL channel);
-
-GF_InputService *isor_client_load();
-void isor_client_del(GF_BaseInterface *bi);
-
-GF_Descriptor *isor_emulate_iod(ISOMReader *read);
-/*uses nero chapter info and remaps to MPEG-4 OCI if no OCI present in descriptor*/
-void isor_emulate_chapters(GF_ISOFile *file, GF_InitialObjectDescriptor *iod);
-
-void isor_declare_objects(ISOMReader *read);
-
-void isor_reader_get_sample_from_item(ISOMChannel *ch);
-
-void send_proxy_command(ISOMReader *read, Bool is_disconnect, Bool is_add_media, GF_Err e, GF_Descriptor *desc, LPNETCHANNEL channel);
-
-void isor_send_cenc_config(ISOMChannel *ch);
-
-void isor_flush_data(ISOMReader *read, Bool check_buffer_level, Bool is_chunk_flush);
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-GF_BaseInterface *isow_load_cache();
-void isow_delete_cache(GF_BaseInterface *bi);
-#endif
-
-#endif /*GPAC_DISABLE_ISOM*/
-
-#endif /*_ISMO_IN_H_*/
-

gpac-0.8.0.tar.gz/modules/isom_in/load.c Deleted

@@ -1,356 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP4 reader module
- *
- *  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 "isom_in.h"
-#include <gpac/iso639.h>
-
-#ifndef GPAC_DISABLE_ISOM
-
-void isor_emulate_chapters(GF_ISOFile *file, GF_InitialObjectDescriptor *iod)
-{
-	GF_Segment *prev_seg;
-	u64 prev_start;
-	u64 start;
-	u32 i, count;
-	if (!iod || gf_list_count(iod->OCIDescriptors)) return;
-	count = gf_isom_get_chapter_count(file, 0);
-	if (!count) return;
-
-	prev_seg = NULL;
-	start = prev_start = 0;
-	for (i=0; i<count; i++) {
-		const char *name;
-		GF_Segment *seg;
-		gf_isom_get_chapter(file, 0, i+1, &start, &name);
-		seg = (GF_Segment *) gf_odf_desc_new(GF_ODF_SEGMENT_TAG);
-		seg->startTime = (Double) (s64) start;
-		seg->startTime /= 1000;
-		seg->SegmentName = gf_strdup(name);
-		gf_list_add(iod->OCIDescriptors, seg);
-		if (prev_seg) {
-			prev_seg->Duration = (Double) (s64) (start - prev_start);
-			prev_seg->Duration /= 1000;
-		} else if (start) {
-			prev_seg = (GF_Segment *) gf_odf_desc_new(GF_ODF_SEGMENT_TAG);
-			prev_seg->startTime = 0;
-			prev_seg->Duration = (Double) (s64) (start);
-			prev_seg->Duration /= 1000;
-			gf_list_insert(iod->OCIDescriptors, prev_seg, 0);
-		}
-		prev_seg = seg;
-		prev_start = start;
-	}
-	if (prev_seg) {
-		start = 1000*gf_isom_get_duration(file);
-		start /= gf_isom_get_timescale(file);
-		if (start>prev_start) {
-			prev_seg->Duration = (Double) (s64) (start - prev_start);
-			prev_seg->Duration /= 1000;
-		}
-	}
-}
-
-/*emulate a default IOD for all other files (3GP, weird MP4, QT )*/
-GF_Descriptor *isor_emulate_iod(ISOMReader *read)
-{
-	/*generate an IOD with our private dynamic OD stream*/
-	GF_InitialObjectDescriptor *fake_iod = (GF_InitialObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
-	isor_emulate_chapters(read->mov, fake_iod);
-	read->no_service_desc = GF_TRUE;
-	return (GF_Descriptor *)fake_iod;
-}
-
-void isor_declare_objects(ISOMReader *read)
-{
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
-	const char *tag;
-	u32 i, count, ocr_es_id, tlen, base_track, j, track_id;
-	Bool highest_stream;
-
-	ocr_es_id = 0;
-
-	/*TODO check for alternate tracks*/
-	count = gf_isom_get_track_count(read->mov);
-	for (i=0; i<count; i++) {
-		u32 m_subtype;
-        u32 mtype;
-		if (!gf_isom_is_track_enabled(read->mov, i+1))
-			continue;
-
-        mtype = gf_isom_get_media_type(read->mov, i+1);
-		switch (mtype) {
-		case GF_ISOM_MEDIA_AUDIO:
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-		case GF_ISOM_MEDIA_TEXT:
-		case GF_ISOM_MEDIA_SUBT:
-		case GF_ISOM_MEDIA_SUBPIC:
-			break;
-		case GF_ISOM_MEDIA_SCENE:
-		case GF_ISOM_MEDIA_OD:
-			if (read->no_service_desc) continue;
-			break;
-		default:
-			continue;
-		}
-		//some subtypes are not declared as readable objects
-		m_subtype = gf_isom_get_media_subtype(read->mov, i+1, 1);
-		switch (m_subtype) {
-		case GF_ISOM_SUBTYPE_HVT1:
-			continue;
-		default:
-			break;
-		}
-
-		/*we declare only the highest video track (i.e the track we play)*/
-		highest_stream = GF_TRUE;
-		track_id = gf_isom_get_track_id(read->mov, i+1);
-		if (read->play_only_track_id && (read->play_only_track_id != track_id)) continue;
-
-		for (j = 0; j < count; j++) {
-			if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_SCAL, track_id) > 0) {
-				highest_stream = GF_FALSE;
-				break;
-			}
-		}
-		//no SCAL found, check for sbas (lhvc with avc base)
-		for (j = 0; j < count; j++) {
-			if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_BASE, track_id) > 0) {
-				highest_stream = GF_FALSE;
-				break;
-			}
-		}
-
-		if (gf_isom_is_video_subtype(mtype) && !highest_stream)
-			continue;
-		esd = gf_media_map_esd(read->mov, i+1);
-		if (esd) {
-			GF_ESD *base_esd=NULL;
-			Bool external_base=GF_FALSE;
-			gf_isom_get_reference(read->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
-			
-			if (base_track) {
-				u32 base_subtype=0;
-				switch (m_subtype) {
-				case GF_ISOM_SUBTYPE_LHV1:
-				case GF_ISOM_SUBTYPE_LHE1:
-					base_subtype = gf_isom_get_media_subtype(read->mov, base_track, 1);
-					switch (base_subtype) {
-					case GF_ISOM_SUBTYPE_HVC1:
-					case GF_ISOM_SUBTYPE_HEV1:
-					case GF_ISOM_SUBTYPE_HVC2:
-					case GF_ISOM_SUBTYPE_HEV2:
-						break;
-					default:
-						external_base=GF_TRUE;
-						break;
-					}
-				}
-				if (external_base) {
-					base_esd = gf_media_map_esd(read->mov, base_track);
-					if (base_esd) esd->dependsOnESID = base_esd->ESID;
-					esd->has_scalable_layers = GF_TRUE;
-				} else {
-					esd->dependsOnESID=0;
-					switch (gf_isom_get_hevc_lhvc_type(read->mov, i+1, 1)) {
-					case GF_ISOM_HEVCTYPE_HEVC_LHVC:
-					case GF_ISOM_HEVCTYPE_LHVC_ONLY:
-						esd->has_scalable_layers = GF_TRUE;
-						break;
-					//this is likely temporal sublayer of base
-					case GF_ISOM_HEVCTYPE_HEVC_ONLY:
-						esd->has_scalable_layers = GF_FALSE;
-						if (gf_isom_get_reference_count(read->mov, i+1, GF_ISOM_REF_SCAL)<=0) {
-							base_esd = gf_media_map_esd(read->mov, base_track);
-							if (base_esd) esd->dependsOnESID = base_esd->ESID;
-						}
-						break;
-					}
-				}
-			} else {
-				switch (gf_isom_get_hevc_lhvc_type(read->mov, i+1, 1)) {
-				case GF_ISOM_HEVCTYPE_HEVC_LHVC:
-				case GF_ISOM_HEVCTYPE_LHVC_ONLY:
-					esd->has_scalable_layers = GF_TRUE;
-					break;
-				}
-			}
-			
-			if (!esd->langDesc) {
-				esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
-				gf_isom_get_media_language(read->mov, i+1, &esd->langDesc->full_lang_code);
-			}
-
-			od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-			od->service_ifce = read->input;
-			od->objectDescriptorID = 0;
-			
-			if (base_esd) {
-				if (!ocr_es_id) ocr_es_id = base_esd->ESID;
-				base_esd->OCRESID = ocr_es_id;
-				gf_list_add(od->ESDescriptors, base_esd);
-			}
-			if (!ocr_es_id) ocr_es_id = esd->ESID;
-			esd->OCRESID = ocr_es_id;
-			gf_list_add(od->ESDescriptors, esd);
-			
-			if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-				send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
-			} else {
-				gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_TRUE);
-			}
-		}
-	}
-	/*if cover art, extract it in cache*/
-	if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COVER_ART, &tag, &tlen)==GF_OK) {
-		const char *cdir = gf_modules_get_option((GF_BaseInterface *)gf_service_get_interface(read->service), "General", "CacheDirectory");
-		if (cdir) {
-			char szName[GF_MAX_PATH];
-			const char *sep;
-			FILE *t;
-			sep = strrchr(gf_isom_get_filename(read->mov), '\\');
-			if (!sep) sep = strrchr(gf_isom_get_filename(read->mov), '/');
-			if (!sep) sep = gf_isom_get_filename(read->mov);
-
-			if ((cdir[strlen(cdir)-1] != '\\') && (cdir[strlen(cdir)-1] != '/')) {
-				sprintf(szName, "%s/%s_cover.%s", cdir, sep, (tlen & 0x80000000) ? "png" : "jpg");
-			} else {
-				sprintf(szName, "%s%s_cover.%s", cdir, sep, (tlen & 0x80000000) ? "png" : "jpg");
-			}
-
-			t = gf_fopen(szName, "wb");
-
-			if (t) {
-				Bool isom_contains_video = GF_FALSE;
-
-				/*write cover data*/
-				assert(!(tlen & 0x80000000));
-				gf_fwrite(tag, tlen & 0x7FFFFFFF, 1, t);
-				gf_fclose(t);
-
-				/*don't display cover art when video is present*/
-				for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
-                    u32 mtype = gf_isom_get_media_type(read->mov, i+1);
-					if (!gf_isom_is_track_enabled(read->mov, i+1))
-						continue;
-					if (gf_isom_is_video_subtype(mtype) ) {
-						isom_contains_video = GF_TRUE;
-						break;
-					}
-				}
-
-				if (!isom_contains_video) {
-					od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-					od->service_ifce = read->input;
-					od->objectDescriptorID = GF_MEDIA_EXTERNAL_ID;
-					od->URLString = gf_strdup(szName);
-					if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-						send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
-					} else {
-						gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_TRUE);
-					}
-				}
-			}
-		}
-	}
-	count = gf_isom_get_meta_item_count(read->mov, GF_TRUE, 0);
-	if (count) {
-		u32 item_id = gf_isom_get_meta_primary_item_id(read->mov, GF_TRUE, 0);
-		if (item_id) {
-			esd = gf_media_map_item_esd(read->mov, item_id);
-			if (esd) {
-				od = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
-				od->service_ifce = read->input;
-				od->objectDescriptorID = 0;
-				gf_list_add(od->ESDescriptors, esd);
-
-				if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-					send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, (GF_Descriptor*)od, NULL);
-				}
-				else {
-					gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_TRUE);
-				}
-			}
-		}
-	}
-	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-		send_proxy_command(read, GF_FALSE, GF_TRUE, GF_OK, NULL, NULL);
-	} else {
-		gf_service_declare_media(read->service, NULL, GF_FALSE);
-	}
-}
-
-#endif /*GPAC_DISABLE_ISOM*/
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_ISOM
-		GF_NET_CLIENT_INTERFACE,
-#endif
-#ifndef GPAC_DISABLE_ISOM_WRITE
-		GF_STREAMING_MEDIA_CACHE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_ISOM
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE)
-		return (GF_BaseInterface *)isor_client_load();
-#endif
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	if (InterfaceType == GF_STREAMING_MEDIA_CACHE)
-		return (GF_BaseInterface *)isow_load_cache();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_ISOM
-	case GF_NET_CLIENT_INTERFACE:
-		isor_client_del(ifce);
-		break;
-#endif
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	case GF_STREAMING_MEDIA_CACHE:
-		isow_delete_cache(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( isom )

gpac-0.8.0.tar.gz/modules/isom_in/read.c Deleted

@@ -1,1310 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / IsoMedia reader module
- *
- *  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 "isom_in.h"
-
-#ifndef GPAC_DISABLE_ISOM
-
-#include <gpac/ismacryp.h>
-
-ISOMChannel *isor_get_channel(ISOMReader *reader, LPNETCHANNEL channel)
-{
-	u32 i=0;
-	ISOMChannel *ch;
-	while ((ch = (ISOMChannel *)gf_list_enum(reader->channels, &i))) {
-		if (ch->channel == channel) return ch;
-	}
-	return NULL;
-}
-
-static void isor_delete_channel(ISOMReader *reader, ISOMChannel *ch)
-{
-	u32 i=0;
-	ISOMChannel *ch2;
-	while ((ch2 = (ISOMChannel *)gf_list_enum(reader->channels, &i))) {
-		if (ch2 == ch) {
-			isor_reset_reader(ch);
-			gf_free(ch);
-			gf_list_rem(reader->channels, i-1);
-			return;
-		}
-	}
-}
-
-static GFINLINE Bool isor_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (!strnicmp(url, "gmem://", 7)) return GF_TRUE;
-	if (!strnicmp(url, "isobmff://", 10)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	/*the rest is local (mounted on FS)*/
-	return GF_TRUE;
-}
-
-static const char * ISOR_MIME_TYPES[] = {
-	/* First one is specific because we probe */
-	"application/x-isomedia", "*", "IsoMedia Files",
-	"video/mp4", "mp4 mpg4", "MPEG-4 Movies",
-	"audio/mp4", "m4a mp4 mpg4", "MPEG-4 Music",
-	"application/mp4", "m4i mp4 mpg4", "MPEG-4 Applications",
-	"video/3gpp", "3gp 3gpp", "3GPP/MMS Movies",
-	"audio/3gpp", "3gp 3gpp", "3GPP/MMS Music",
-	"video/3gpp2", "3g2 3gp2", "3GPP2/MMS Movies",
-	"audio/3gpp2", "3g2 3gp2", "3GPP2/MMS Music",
-	"video/iso.segment", "iso", "ISOBMF Fragments",
-	"audio/iso.segment", "iso", "ISOBMF Fragments",
-	"image/heif", "heif", "HEIF Images",
-	"image/heic", "heic", "HEIF Images",
-	NULL
-};
-
-u32 ISOR_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	for (i = 0 ; ISOR_MIME_TYPES[i]; i+=3)
-		gf_service_register_mime(plug, ISOR_MIME_TYPES[i], ISOR_MIME_TYPES[i+1], ISOR_MIME_TYPES[i+2]);
-	return i/3;
-}
-
-Bool ISOR_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *ext;
-	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
-	ext = (char *)strrchr(url, '.');
-	{
-		u32 i;
-		/* We don't start at 0 since first one is specific */
-		for (i = 3 ; ISOR_MIME_TYPES[i]; i+=3)
-			if (gf_service_check_mime_register(plug, ISOR_MIME_TYPES[i], ISOR_MIME_TYPES[i+1], ISOR_MIME_TYPES[i+2], ext))
-				return GF_TRUE;
-	}
-
-	if (ext && gf_isom_probe_file(url)) {
-		gf_service_check_mime_register(plug, ISOR_MIME_TYPES[0], ext+1, ISOR_MIME_TYPES[2], ext);
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-void send_proxy_command(ISOMReader *read, Bool is_disconnect, Bool is_add_media, GF_Err e, GF_Descriptor *desc, LPNETCHANNEL channel)
-{
-	GF_NetworkCommand command;
-	command.command_type = GF_NET_SERVICE_STATUS_PROXY;
-	command.status.e = e;
-	command.status.channel = channel;
-	command.status.is_disconnect = is_disconnect;
-	command.status.is_add_media = is_add_media;
-	command.status.desc = desc;
-	read->input->query_proxy(read->input, &command);
-}
-
-void isor_check_buffer_level(ISOMReader *read)
-{
-	Double dld_time_remaining, mov_rate;
-	GF_NetworkCommand com;
-	u32 i, total, done, Bps;
-	u64 dur;
-	GF_NetIOStatus status;
-	Bool do_buffer = GF_FALSE;
-	if (!read->dnload) return;
-	if (!read->mov) return;
-
-	gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total, &done, &Bps, &status);
-	if (!Bps) return;
-
-
-	gf_mx_p(read->segment_mutex);
-
-	dld_time_remaining = total-done;
-	dld_time_remaining /= Bps;
-
-	mov_rate = total;
-	if (read->frag_type) {
-		u64 bytesMissing=0;
-		gf_isom_refresh_fragmented(read->mov, &bytesMissing, NULL);
-		mov_rate = (Double) (done + bytesMissing);
-	}
-	dur = gf_isom_get_duration(read->mov);
-	if (dur) {
-		mov_rate /= dur;
-		mov_rate *= gf_isom_get_timescale(read->mov);
-	}
-
-	for (i=0; i<gf_list_count(read->channels); i++) {
-		ISOMChannel *ch = gf_list_get(read->channels, i);
-		Double time_remain_ch = (Double) gf_isom_get_media_duration(read->mov, ch->track);
-		u32 buffer_level=0;
-		if (total==done) {
-			time_remain_ch = 0;
-			do_buffer = GF_FALSE;
-		} else if (ch->last_state == GF_EOS) {
-			time_remain_ch = 0;
-			do_buffer = GF_TRUE;
-		} else {
-			u64 data_offset;
-			u32 di, sn = ch->sample_num ? ch->sample_num : 1;
-			GF_ISOSample *samp = gf_isom_get_sample_info(read->mov, ch->track, sn, &di, &data_offset);
-			if (!samp) {
-				continue;
-			}
-
-			data_offset += samp->dataLength;
-
-#if 1
-			//we don't have enough data
-			if (((data_offset + ch->buffer_min * mov_rate/1000 > done))) {
-				do_buffer = GF_TRUE;
-			}
-			//we have enough buffer
-			else if ((data_offset + ch->buffer_max * mov_rate/1000 <= done)) {
-				do_buffer = GF_FALSE;
-			} else {
-				do_buffer = ch->buffering;
-			}
-			buffer_level = 0;
-			if (done > data_offset)
-				buffer_level = (u32) ( (done - data_offset) / mov_rate * 1000);
-#else
-			//we only send buffer on/off based on remainging playback time in channel
-			time_remain_ch -= (samp->DTS + samp->CTS_Offset);
-			if (time_remain_ch<0) time_remain_ch=0;
-
-			time_remain_ch /= ch->time_scale;
-			if (time_remain_ch && (time_remain_ch < dld_time_remaining)) {
-				do_buffer = GF_TRUE;
-				if (!read->remain_at_buffering_start || (read->remain_at_buffering_start < dld_time_remaining)) {
-					buffer_level = 0;
-					read->remain_at_buffering_start = dld_time_remaining;
-				} else {
-					buffer_level = (u32) (100 * (read->remain_at_buffering_start - dld_time_remaining) / (read->remain_at_buffering_start - time_remain_ch) );
-				}
-			} else {
-				do_buffer = GF_FALSE;
-			}
-#endif
-
-			gf_isom_sample_del(&samp);
-		}
-
-		if (do_buffer != ch->buffering) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[IsoMedia] Buffering %s at %d: %g sec still to download and %g sec still to play on track %d (movie rate %g - download rate %g kbps)\n", do_buffer ? "on" : "off", gf_sys_clock(), dld_time_remaining , time_remain_ch, ch->track_id, mov_rate*8/1000, Bps*8.0/1000));
-
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = do_buffer ? GF_NET_CHAN_PAUSE : GF_NET_CHAN_RESUME;
-			com.buffer.on_channel = ch->channel;
-			com.buffer.min = ch->buffer_min;
-			com.buffer.max = ch->buffer_max;
-			gf_service_command(read->service, &com, GF_OK);
-			ch->buffering = do_buffer;
-			read->buffering = do_buffer;
-		} else if (ch->buffering) {
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_CHAN_BUFFER;
-			com.buffer.on_channel = ch->channel;
-			com.buffer.min = ch->buffer_min;
-			com.buffer.max = ch->buffer_max;
-			com.buffer.occupancy = buffer_level;
-			gf_service_command(read->service, &com, GF_OK);
-		}
-	}
-	gf_mx_v(read->segment_mutex);
-}
-
-void isor_net_io(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	u32 size = 0;
-	char *local_name;
-	ISOMReader *read = (ISOMReader *) cbk;
-
-	/*handle service message*/
-	if (!read->buffering)
-		gf_service_download_update_stats(read->dnload);
-
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		e = GF_EOS;
-	} else if (param->msg_type==GF_NETIO_DATA_EXCHANGE) {
-		e = GF_OK;
-		size = param->size;
-	} else {
-		e = param->error;
-	}
-
-	if (e<GF_OK) {
-		/*error opening service*/
-		if (!read->mov) {
-			/* if there is an intermediate between this module and the terminal, report to it */
-			if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-				send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, NULL);
-			} else {
-				gf_service_connect_ack(read->service, NULL, e);
-			}
-		}
-		return;
-	}
-
-	/*open file if not done yet (bad interleaving)*/
-	if (e==GF_EOS) {
-		const char *local_name;
-		if (read->mov) return;
-		local_name = gf_dm_sess_get_cache_name(read->dnload);
-		if (!local_name) {
-			if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-				send_proxy_command(read, GF_FALSE, GF_FALSE, GF_SERVICE_ERROR, NULL, NULL);
-			} else {
-				gf_service_connect_ack(read->service, NULL, GF_SERVICE_ERROR);
-			}
-			return;
-		}
-		read->mov = gf_isom_open(local_name, GF_ISOM_OPEN_READ, NULL);
-		if (!read->mov) gf_isom_last_error(NULL);
-		else read->time_scale = gf_isom_get_timescale(read->mov);
-		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-			send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
-		} else {
-			gf_service_connect_ack(read->service, NULL, GF_OK);
-		}
-		if (read->no_service_desc) isor_declare_objects(read);
-	}
-
-	if (!size) return;
-
-	/*service is opened, nothing to do*/
-	if (read->mov) {
-		isor_check_buffer_level(read);
-
-		/*end of chunk*/
-		if (read->frag_type && (param->reply==1) ) {
-			u64 bytesMissing = 0;
-			gf_mx_p(read->segment_mutex);
-			gf_isom_refresh_fragmented(read->mov, &bytesMissing, NULL);
-			gf_mx_v(read->segment_mutex);
-		}
-		return;
-	}
-
-	/*try to open the service*/
-	local_name = (char *)gf_dm_sess_get_cache_name(read->dnload);
-	if (!local_name) {
-		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-			send_proxy_command(read, GF_FALSE, GF_FALSE, GF_SERVICE_ERROR, NULL, NULL);
-		} else {
-			gf_service_connect_ack(read->service, NULL, GF_SERVICE_ERROR);
-		}
-		return;
-	}
-
-	/*not enogh data yet*/
-	if (read->missing_bytes && (read->missing_bytes > size) ) {
-		read->missing_bytes -= size;
-		return;
-	}
-
-	e = gf_isom_open_progressive(local_name, 0, 0, &read->mov, &read->missing_bytes);
-	switch (e) {
-	case GF_ISOM_INCOMPLETE_FILE:
-		return;
-	case GF_OK:
-		break;
-	default:
-		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-			send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, NULL);
-		} else {
-			gf_service_connect_ack(read->service, NULL, e);
-		}
-		return;
-	}
-	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-
-	/*ok let's go, we can setup the decoders */
-	read->time_scale = gf_isom_get_timescale(read->mov);
-	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-		send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
-	} else {
-		gf_service_connect_ack(read->service, NULL, GF_OK);
-	}
-
-	if (read->no_service_desc) isor_declare_objects(read);
-}
-
-
-void isor_setup_download(GF_InputService *plug, const char *url)
-{
-	ISOMReader *read = (ISOMReader *) plug->priv;
-	read->dnload = gf_service_download_new(read->service, url, 0, isor_net_io, read);
-	if (!read->dnload) {
-		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-			send_proxy_command(read, GF_FALSE, GF_FALSE, GF_NOT_SUPPORTED, NULL, NULL);
-		} else {
-			gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-		}
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once IOD can be fetched*/
-}
-
-GF_Err ISOR_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *tmp;
-	ISOMReader *read;
-	if (!plug || !plug->priv || !serv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	read->input = plug;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	if (!url) return GF_URL_ERROR;
-
-	strcpy(szURL, url);
-	tmp = strrchr(szURL, '.');
-	if (tmp) {
-		tmp = strchr(tmp, '#');
-		if (tmp) {
-			if (!strnicmp(tmp, "#trackID=", 9)) {
-				read->play_only_track_id = atoi(tmp+9);
-			} else {
-				read->play_only_track_id = atoi(tmp+1);
-			}
-			tmp[0] = 0;
-		}
-	}
-
-	if (isor_is_local(szURL)) {
-		GF_Err e;
-		u64 start_range, end_range;
-		start_range = end_range = 0;
-		if (plug->query_proxy) {
-			GF_NetworkCommand param;
-			param.command_type = GF_NET_SERVICE_QUERY_INIT_RANGE;
-			if (read->input->query_proxy(read->input, &param)==GF_OK) {
-				start_range = param.url_query.start_range;
-				end_range = param.url_query.end_range;
-			}
-		}
-		e = gf_isom_open_progressive(szURL, start_range, end_range, &read->mov, &read->missing_bytes);
-		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[IsoMedia] error while opening %s, error=%s\n", szURL, gf_error_to_string(e)));
-			if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-				send_proxy_command(read, 0, 0, e, NULL, NULL);
-			} else {
-				gf_service_connect_ack(read->service, NULL, e);
-			}
-			return GF_OK;
-		}
-		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
-		read->seg_opened = 2;
-
-		read->time_scale = gf_isom_get_timescale(read->mov);
-		/*reply to user*/
-		if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-			send_proxy_command(read, GF_FALSE, GF_FALSE, GF_OK, NULL, NULL);
-		} else {
-			gf_service_connect_ack(read->service, NULL, GF_OK);
-		}
-
-		if (read->no_service_desc)	isor_declare_objects(read);
-
-	} else {
-		/*setup downloader*/
-		isor_setup_download(plug, szURL);
-	}
-	return GF_OK;
-}
-
-GF_Err ISOR_CloseService(GF_InputService *plug)
-{
-	GF_Err reply;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-	reply = GF_OK;
-
-	read->disconnected = GF_TRUE;
-
-	while (gf_list_count(read->channels)) {
-		ISOMChannel *ch = (ISOMChannel *)gf_list_get(read->channels, 0);
-		gf_list_rem(read->channels, 0);
-		isor_delete_channel(read, ch);
-	}
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	if (read->mov) gf_isom_close(read->mov);
-	read->mov = NULL;
-
-	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-		send_proxy_command(read, GF_TRUE, GF_FALSE, reply, NULL, NULL);
-	} else {
-		gf_service_disconnect_ack(read->service, NULL, reply);
-	}
-	return GF_OK;
-}
-
-static Bool check_mpeg4_systems(GF_InputService *plug, GF_ISOFile *mov)
-{
-	char *opt, *bname, *br, *next;
-	u32 i, count, brand;
-	Bool has_mpeg4;
-	GF_Err e;
-	e = gf_isom_get_brand_info(mov, &brand, &i, &count);
-	/*no brand == MP4 v1*/
-	if (e || !brand) return GF_TRUE;
-
-	has_mpeg4 = GF_FALSE;
-	if ((brand==GF_ISOM_BRAND_MP41) || (brand==GF_ISOM_BRAND_MP42)) has_mpeg4 = GF_TRUE;
-
-	opt = (char*) gf_modules_get_option((GF_BaseInterface *)plug, "ISOReader", "IgnoreMPEG-4ForBrands");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)plug, "ISOReader", "IgnoreMPEG-4ForBrands", "nd*");
-		opt = (char*) gf_modules_get_option((GF_BaseInterface *)plug, "ISOReader", "IgnoreMPEG-4ForBrands");
-	}
-
-	for (i=0; i<count; i++) {
-		e = gf_isom_get_alternate_brand(mov, i+1, &brand);
-		if (e) return GF_FALSE;
-		if ((brand==GF_ISOM_BRAND_MP41) || (brand==GF_ISOM_BRAND_MP42)) {
-			has_mpeg4 = GF_TRUE;
-			continue;
-		}
-		bname = (char*)gf_4cc_to_str(brand);
-		br = opt;
-		while (br) {
-			Bool ignore = GF_FALSE;
-			u32 orig_len, len;
-			next = strchr(br, ' ');
-			if (next) next[0] = 0;
-			len = orig_len = (u32) strlen(br);
-
-			while (len) {
-				if (br[len-1]=='*') {
-					br[len-1]=0;
-					len--;
-				} else {
-					break;
-				}
-			}
-			/*ignor all brands*/
-			if (!len) ignore = GF_TRUE;
-			else if (!strncmp(bname, br, len)) ignore = GF_TRUE;
-
-			while (len<orig_len) {
-				br[len] = '*';
-				len++;
-			}
-			if (next) {
-				next[0] = ' ';
-				br = next + 1;
-			} else {
-				br = NULL;
-			}
-			if (ignore) return GF_FALSE;
-		}
-	}
-	return has_mpeg4;
-}
-
-static u32 get_track_id(GF_ISOFile *mov, u32 media_type, u32 idx)
-{
-	u32 i, count, cur;
-	cur=0;
-	count = gf_isom_get_track_count(mov);
-	for (i=0; i<count; i++) {
-		if (gf_isom_get_media_type(mov, i+1) != media_type) continue;
-		if (!idx) return gf_isom_get_track_id(mov, i+1);
-		cur++;
-		if (cur==idx) return gf_isom_get_track_id(mov, i+1);
-	}
-	return GF_FALSE;
-}
-
-/*fixme, this doesn't work properly with respect to @expect_type*/
-static GF_Descriptor *ISOR_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 count, nb_st, i, trackID;
-	GF_ESD *esd;
-	ISOMReader *read;
-	GF_InitialObjectDescriptor *iod;
-	if (!plug || !plug->priv) return NULL;
-	read = (ISOMReader *) plug->priv;
-	if (!read->mov) return NULL;
-
-	/*no matter what always read text as TTUs*/
-	gf_isom_text_set_streaming_mode(read->mov, 1);
-
-	if (!sub_url) {
-		trackID = read->play_only_track_id;
-		read->play_only_track_id = 0;
-	} else {
-		char *ext = (char *)strrchr(sub_url, '#');
-		if (!ext) {
-			trackID = 0;
-		} else {
-			if (!strnicmp(ext, "#trackID=", 9)) trackID = atoi(ext+9);
-			else if (!stricmp(ext, "#video")) trackID = get_track_id(read->mov, GF_ISOM_MEDIA_VISUAL, 0);
-			else if (!strnicmp(ext, "#video", 6)) {
-				trackID = atoi(ext+6);
-				trackID = get_track_id(read->mov, GF_ISOM_MEDIA_VISUAL, trackID);
-			}
-			else if (!stricmp(ext, "#audio")) trackID = get_track_id(read->mov, GF_ISOM_MEDIA_AUDIO, 0);
-			else if (!strnicmp(ext, "#audio", 6)) {
-				trackID = atoi(ext+6);
-				trackID = get_track_id(read->mov, GF_ISOM_MEDIA_AUDIO, trackID);
-			}
-			else trackID = atoi(ext+1);
-
-			/*if trackID is 0, assume this is a fragment identifier*/
-		}
-	}
-
-	if (!trackID && (expect_type!=GF_MEDIA_OBJECT_SCENE) && (expect_type!=GF_MEDIA_OBJECT_UNDEF)) {
-		for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
-			u32 type = gf_isom_get_media_type(read->mov, i+1);
-			if (
-			    (gf_isom_is_video_subtype(type) && (expect_type==GF_MEDIA_OBJECT_VIDEO))
-			    || ((type==GF_ISOM_MEDIA_AUDIO) && (expect_type==GF_MEDIA_OBJECT_AUDIO)) ) {
-				trackID = gf_isom_get_track_id(read->mov, i+1);
-				break;
-			}
-
-		}
-	}
-	if (trackID && (expect_type!=GF_MEDIA_OBJECT_SCENE) ) {
-		u32 track = gf_isom_get_track_by_id(read->mov, trackID);
-		if (!track) return NULL;
-		esd = gf_media_map_esd(read->mov, track);
-		esd->OCRESID = 0;
-		iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(read->mov);
-		if (!iod) {
-			iod = (GF_InitialObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
-			iod->OD_profileAndLevel = iod->audio_profileAndLevel = iod->graphics_profileAndLevel = iod->scene_profileAndLevel = iod->visual_profileAndLevel = 0xFE;
-		} else {
-			while (gf_list_count(iod->ESDescriptors)) {
-				GF_ESD *old = (GF_ESD *)gf_list_get(iod->ESDescriptors, 0);
-				gf_odf_desc_del((GF_Descriptor *) old);
-				gf_list_rem(iod->ESDescriptors, 0);
-			}
-		}
-		gf_list_add(iod->ESDescriptors, esd);
-		isor_emulate_chapters(read->mov, iod);
-		return (GF_Descriptor *) iod;
-	}
-
-	iod = NULL;
-	if (check_mpeg4_systems(plug, read->mov)) {
-		iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(read->mov);
-		if (!iod) {
-#ifndef GPAC_DISABLE_LOG
-			GF_Err e = gf_isom_last_error(read->mov);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[IsoMedia] Cannot fetch MPEG-4 IOD (error %s) - generating one\n", gf_error_to_string(e) ));
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[IsoMedia] No MPEG-4 IOD found in file - generating one\n"));
-			}
-#endif
-		}
-	}
-	if (!iod) return isor_emulate_iod(read);
-
-	count = gf_list_count(iod->ESDescriptors);
-	if (!count) {
-		gf_odf_desc_del((GF_Descriptor*) iod);
-		return isor_emulate_iod(read);
-	}
-	if (count==1) {
-		esd = (GF_ESD *)gf_list_get(iod->ESDescriptors, 0);
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_SCENE:
-		case GF_STREAM_PRIVATE_SCENE:
-			break;
-		case GF_STREAM_VISUAL:
-			if (expect_type!=GF_MEDIA_OBJECT_VIDEO) {
-				gf_odf_desc_del((GF_Descriptor*) iod);
-				return isor_emulate_iod(read);
-			}
-			break;
-		case GF_STREAM_AUDIO:
-			/*we need a fake scene graph*/
-			if (expect_type!=GF_MEDIA_OBJECT_AUDIO) {
-				gf_odf_desc_del((GF_Descriptor*) iod);
-				return isor_emulate_iod(read);
-			}
-			break;
-		default:
-			gf_odf_desc_del((GF_Descriptor*) iod);
-			return NULL;
-		}
-	}
-	/*check IOD is not badly formed (eg mixing audio, video or text streams)*/
-	nb_st = 0;
-	for (i=0; i<count; i++) {
-		esd = (GF_ESD *)gf_list_get(iod->ESDescriptors, i);
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_VISUAL:
-			nb_st |= 1;
-			break;
-		case GF_STREAM_AUDIO:
-			nb_st |= 2;
-			break;
-		case GF_STREAM_TEXT:
-			nb_st |= 4;
-			break;
-		}
-	}
-	if ( (nb_st & 1) + (nb_st & 2) + (nb_st & 4) > 1) {
-		gf_odf_desc_del((GF_Descriptor*) iod);
-		return isor_emulate_iod(read);
-	}
-
-	isor_emulate_chapters(read->mov, iod);
-	return (GF_Descriptor *) iod;
-}
-
-
-void isor_send_cenc_config(ISOMChannel *ch)
-{
-	GF_NetworkCommand com;
-	u32 i;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.on_channel = ch->channel;
-	com.command_type = GF_NET_CHAN_DRM_CFG;
-	ch->is_encrypted = GF_TRUE;
-
-	gf_isom_get_cenc_info(ch->owner->mov, ch->track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, NULL);
-
-	com.drm_cfg.PSSH_count = gf_isom_get_pssh_count(ch->owner->mov);
-	//no pssh, skip event
-	if (!com.drm_cfg.PSSH_count) return;
-
-	com.drm_cfg.PSSHs = gf_malloc(sizeof(GF_NetComDRMConfigPSSH)*(com.drm_cfg.PSSH_count) );
-
-	/*fill PSSH in the structure. We will free it in CENC_Setup*/
-	for (i=0; i<com.drm_cfg.PSSH_count; i++) {
-		GF_NetComDRMConfigPSSH *pssh = &com.drm_cfg.PSSHs[i];
-		gf_isom_get_pssh_info(ch->owner->mov, i+1, pssh->SystemID, &pssh->KID_count, (const bin128 **) & pssh->KIDs, (const u8 **) &pssh->private_data, &pssh->private_data_size);
-	}
-	//fixme - check MSE and EME
-#if 0
-	if (read->input->query_proxy && read->input->proxy_udta) {
-		read->input->query_proxy(read->input, &com);
-	} else
-#endif
-		gf_service_command(ch->owner->service, &com, GF_OK);
-	//free our PSSH
-	if (com.drm_cfg.PSSHs) gf_free(com.drm_cfg.PSSHs);
-}
-
-
-
-GF_Err ISOR_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID;
-	ISOMChannel *ch;
-	GF_NetworkCommand com;
-	u32 track;
-	u32 item_idx;
-	Bool is_esd_url;
-	GF_Err e;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-
-	item_idx = 0;
-	track = 0;
-	ch = NULL;
-	is_esd_url = GF_FALSE;
-	e = GF_OK;
-	if (upstream) {
-		e = GF_ISOM_INVALID_FILE;
-		goto exit;
-	}
-	if (!read->mov) return GF_SERVICE_ERROR;
-
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%ud", &ESID);
-	} else {
-		/*handle url like mypath/myfile.mp4#trackID*/
-		char *track_id = (char *)strrchr(url, '.');
-		if (track_id) {
-			track_id = (char *)strchr(url, '#');
-			if (track_id) track_id ++;
-		}
-		is_esd_url = GF_TRUE;
-
-		ESID = 0;
-		/*if only one track ok*/
-		if (gf_isom_get_track_count(read->mov)==1) ESID = gf_isom_get_track_id(read->mov, 1);
-		else if (track_id) {
-			ESID = atoi(track_id);
-			track = gf_isom_get_track_by_id(read->mov, (u32) ESID);
-			if (!track) ESID = 0;
-		}
-
-	}
-	if (!ESID) {
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	}
-
-	/*a channel cannot be open twice, it has to be closed before - NOTE a track is NOT a channel and the user can open
-	several times the same track as long as a dedicated channel is used*/
-	ch = isor_get_channel(read, channel);
-	if (ch) {
-		e = GF_SERVICE_ERROR;
-		goto exit;
-	}
-	track = gf_isom_get_track_by_id(read->mov, (u32) ESID);
-	if (!track) {
-		item_idx = gf_isom_get_meta_item_by_id(read->mov, GF_TRUE, 0, ESID);
-		if (!item_idx) {
-			e = GF_STREAM_NOT_FOUND;
-			goto exit;
-		}
-	}
-
-	GF_SAFEALLOC(ch, ISOMChannel);
-	if (!ch) {
-		e = GF_OUT_OF_MEM;
-		goto exit;
-	}
-	ch->owner = read;
-	ch->channel = channel;
-	gf_list_add(read->channels, ch);
-	if (!item_idx) {
-		ch->track = track;
-		ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
-		switch (gf_isom_get_media_type(ch->owner->mov, ch->track)) {
-		case GF_ISOM_MEDIA_OCR:
-			ch->streamType = GF_STREAM_OCR;
-			break;
-		case GF_ISOM_MEDIA_SCENE:
-			ch->streamType = GF_STREAM_SCENE;
-			break;
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-			gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
-			//use base track only if avc/svc or hevc/lhvc. If avc+lhvc we need different rules
-			if (gf_isom_get_avc_svc_type(ch->owner->mov, ch->base_track, 1) == GF_ISOM_AVCTYPE_AVC_ONLY) {
-				if (gf_isom_get_hevc_lhvc_type(ch->owner->mov, ch->track, 1) >= GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-					ch->base_track = 0;
-				}
-			}
-
-			ch->next_track = 0;
-			break;
-		}
-		ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
-		ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track) == 1) ? GF_TRUE : GF_FALSE;
-		ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
-	}
-	else {
-		ch->item_id = ESID;
-		ch->item_idx = item_idx;
-		ch->use_item = GF_TRUE;
-		ch->has_edit_list = GF_FALSE;
-		ch->has_rap = GF_TRUE;
-		ch->time_scale = 1000;
-	}
-
-exit:
-	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-		send_proxy_command(read, GF_FALSE, GF_FALSE, e, NULL, channel);
-	} else {
-		gf_service_connect_ack(read->service, channel, e);
-	}
-	/*if esd url reconfig SL layer*/
-	if (!e && is_esd_url) {
-		GF_ESD *esd;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.on_channel = channel;
-		com.command_type = GF_NET_CHAN_RECONFIG;
-		esd = gf_isom_get_esd(read->mov, ch->track, 1);
-		if (esd) {
-			memcpy(&com.cfg.sl_config, esd->slConfig, sizeof(GF_SLConfig));
-			gf_odf_desc_del((GF_Descriptor *)esd);
-		} else {
-			com.cfg.sl_config.tag = GF_ODF_SLC_TAG;
-			com.cfg.sl_config.timestampLength = 32;
-			com.cfg.sl_config.timestampResolution = ch->time_scale;
-			com.cfg.sl_config.useRandomAccessPointFlag = 1;
-		}
-		if (read->input->query_proxy && read->input->proxy_udta) {
-			read->input->query_proxy(read->input, &com);
-		} else {
-			gf_service_command(read->service, &com, GF_OK);
-		}
-	}
-	if (!e && track && gf_isom_is_track_encrypted(read->mov, track)) {
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.on_channel = channel;
-		com.command_type = GF_NET_CHAN_DRM_CFG;
-		ch->is_encrypted = GF_TRUE;
-		if (gf_isom_is_ismacryp_media(read->mov, track, 1)) {
-			gf_isom_get_ismacryp_info(read->mov, track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, &com.drm_cfg.scheme_uri, &com.drm_cfg.kms_uri, NULL, NULL, NULL);
-			if (read->input->query_proxy && read->input->proxy_udta) {
-				read->input->query_proxy(read->input, &com);
-			} else {
-				gf_service_command(read->service, &com, GF_OK);
-			}
-		} else if (gf_isom_is_omadrm_media(read->mov, track, 1)) {
-			gf_isom_get_omadrm_info(read->mov, track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, &com.drm_cfg.contentID, &com.drm_cfg.kms_uri, &com.drm_cfg.oma_drm_textual_headers, &com.drm_cfg.oma_drm_textual_headers_len, NULL, &com.drm_cfg.oma_drm_crypt_type, NULL, NULL, NULL);
-
-			gf_media_get_file_hash(gf_isom_get_filename(read->mov), com.drm_cfg.hash);
-			if (read->input->query_proxy && read->input->proxy_udta) {
-				read->input->query_proxy(read->input, &com);
-			} else {
-				gf_service_command(read->service, &com, GF_OK);
-			}
-		} else if (gf_isom_is_cenc_media(read->mov, track, 1)) {
-			ch->is_cenc = GF_TRUE;
-			isor_send_cenc_config(ch);
-		}
-	}
-	if (!ch->is_encrypted) {
-		/*in scalable mode add SPS/PPS in-band*/
-		ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG /*| GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG*/;
-		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
-	}
-	return e;
-}
-
-GF_Err ISOR_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	ISOMChannel *ch;
-	GF_Err e;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-	if (!read->mov) return GF_SERVICE_ERROR;
-
-	gf_mx_p(read->segment_mutex);
-	e = GF_OK;
-	ch = isor_get_channel(read, channel);
-	assert(ch);
-	if (!ch) {
-		e = GF_STREAM_NOT_FOUND;
-		goto exit;
-	}
-	/*signal the service is broken but still process the delete*/
-	isor_delete_channel(read, ch);
-	assert(!isor_get_channel(read, channel));
-
-exit:
-	if (read->input->query_proxy && read->input->proxy_udta && read->input->proxy_type) {
-		send_proxy_command(read, 1, 0, e, NULL, channel);
-	} else {
-		gf_service_disconnect_ack(read->service, channel, e);
-	}
-	gf_mx_v(read->segment_mutex);
-	return e;
-}
-
-GF_Err ISOR_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	ISOMChannel *ch;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	/*cannot read native SL-PDUs*/
-	if (!out_sl_hdr) return GF_NOT_SUPPORTED;
-	read = (ISOMReader *) plug->priv;
-	if (!read->mov) return GF_SERVICE_ERROR;
-
-	*out_data_ptr = NULL;
-	*out_data_size = 0;
-	*sl_compressed = GF_FALSE;
-	*out_reception_status = GF_OK;
-	*is_new_data = GF_FALSE;
-	ch = isor_get_channel(read, channel);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-	if (!ch->is_playing) return GF_OK;
-
-	*is_new_data = GF_FALSE;
-	if (!ch->sample) {
-		/*get sample*/
-		gf_mx_p(read->segment_mutex);
-		if (!ch->use_item) {
-			isor_reader_get_sample(ch);
-		}
-		else {
-			isor_reader_get_sample_from_item(ch);
-		}
-		gf_mx_v(read->segment_mutex);
-		*is_new_data = ch->sample ? GF_TRUE : GF_FALSE;
-	}
-
-	if (ch->sample) {
-		*out_data_ptr = ch->sample->data;
-		*out_data_size = ch->sample->dataLength;
-		*out_sl_hdr = ch->current_slh;
-	}
-	*out_reception_status = ch->last_state;
-	if (read->waiting_for_data)
-		*out_reception_status = GF_BUFFER_TOO_SMALL;
-
-	return GF_OK;
-}
-
-GF_Err ISOR_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	ISOMChannel *ch;
-	ISOMReader *read;
-	if (!plug || !plug->priv) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-	if (!read->mov) return GF_SERVICE_ERROR;
-	ch = isor_get_channel(read, channel);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-	if (!ch->is_playing) return GF_SERVICE_ERROR;
-
-	if (ch->sample) {
-		isor_reader_release_sample(ch);
-		/*release sample*/
-	}
-	return GF_OK;
-}
-
-/*switch channel quality. Return next channel or current channel if error*/
-static
-u32 gf_channel_switch_quality(ISOMChannel *ch, GF_ISOFile *the_file, Bool switch_up)
-{
-	u32 i, count, next_track, trackID, cur_track;
-	s32 ref_count;
-
-	cur_track = ch->next_track ? ch->next_track : ch->track;
-	count = gf_isom_get_track_count(the_file);
-	trackID = gf_isom_get_track_id(the_file, cur_track);
-	next_track = 0;
-
-	if (switch_up)
-	{
-		for (i = 0; i < count; i++)
-		{
-			ref_count = gf_isom_get_reference_count(the_file, i+1, GF_ISOM_REF_SCAL);
-			if (ref_count < 0)
-				return cur_track; //error
-			else if (ref_count == 0)
-				continue;
-			/*next track is the one that has the last reference of type GF_ISOM_REF_SCAL refers to this current track*/
-			else if ((u32)ref_count == gf_isom_has_track_reference(the_file, i+1, GF_ISOM_REF_SCAL, trackID))
-			{
-				next_track = i+1;
-				break;
-			}
-		}
-		/*this is the highest quality*/
-		if (!next_track)
-			return cur_track;
-	}
-	else
-	{
-		if (cur_track == ch->base_track)
-			return cur_track;
-		ref_count = gf_isom_get_reference_count(the_file, cur_track, GF_ISOM_REF_SCAL);
-		if (ref_count <= 0)
-			return cur_track;
-		gf_isom_get_reference(the_file, cur_track, GF_ISOM_REF_SCAL, ref_count, &next_track);
-		if (!next_track)
-			return cur_track;
-	}
-
-	/*in scalable mode add SPS/PPS in-band*/
-	gf_isom_set_nalu_extract_mode(the_file, next_track, ch->nalu_extract_mode);
-
-	return next_track;
-}
-
-
-GF_Err ISOR_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	Double track_dur, media_dur;
-	ISOMChannel *ch;
-	ISOMReader *read;
-	u32 count, i;
-
-	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
-	read = (ISOMReader *) plug->priv;
-	if (read->disconnected) return GF_OK;
-
-	if (com->command_type==GF_NET_SERVICE_INFO) {
-		u32 tag_len;
-		const char *tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_NAME, &tag, &tag_len)==GF_OK) com->info.name = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_ARTIST, &tag, &tag_len)==GF_OK) com->info.artist = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_ALBUM, &tag, &tag_len)==GF_OK) com->info.album = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COMMENT, &tag, &tag_len)==GF_OK) com->info.comment = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_TRACK, &tag, &tag_len)==GF_OK) {
-			com->info.track_info = (((tag[2]<<8)|tag[3]) << 16) | ((tag[4]<<8)|tag[5]);
-		}
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COMPOSER, &tag, &tag_len)==GF_OK) com->info.composer = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_WRITER, &tag, &tag_len)==GF_OK) com->info.writer = tag;
-		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_GENRE, &tag, &tag_len)==GF_OK) {
-			if (tag[0]) {
-				com->info.genre = 0;
-			} else {
-				com->info.genre = (tag[0]<<8) | tag[1];
-			}
-		}
-		return GF_OK;
-	}
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
-		u32 i, count;
-		count = gf_isom_get_track_count(read->mov);
-		for (i=0; i<count; i++) {
-			if (gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_AUDIO) return GF_OK;
-		}
-		return GF_NOT_SUPPORTED;
-	}
-
-	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH)
-	{
-		count = gf_list_count(read->channels);
-		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 = gf_channel_switch_quality(ch, read->mov, com->switch_quality.up);
-			}
-		}
-		return GF_OK;
-	}
-	if (com->command_type == GF_NET_SERVICE_PROXY_DATA_RECEIVE) {
-		isor_flush_data(read, 1, com->proxy_data.is_chunk);
-		return GF_OK;
-	}
-	if (com->command_type == GF_NET_SERVICE_CAN_REVERSE_PLAYBACK)
-		return GF_OK;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	ch = isor_get_channel(read, com->base.on_channel);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PADDING:
-		if (!ch->track) return GF_OK;
-		gf_isom_set_sample_padding(read->mov, ch->track, com->pad.padding_bytes);
-		return GF_OK;
-	case GF_NET_CHAN_SET_PULL:
-		//we don't pull in DASH base services, we flush as soon as we have a complete segment
-#ifndef DASH_USE_PULL
-		if (read->input->proxy_udta && !read->input->proxy_type)
-			return GF_NOT_SUPPORTED;
-#endif
-
-		ch->is_pulling = 1;
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		//dash or HTTP, do rebuffer if not disabled
-		if (plug->query_proxy) {
-		} else if (read->dnload) {
-			ch->buffer_min = com->buffer.min;
-			ch->buffer_max = com->buffer.max;
-		} else {
-			com->buffer.max = com->buffer.min = 0;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		if (!ch->track) {
-			com->duration.duration = 0;
-			return GF_OK;
-		}
-		ch->duration = gf_isom_get_track_duration(read->mov, ch->track);
-		track_dur = (Double) (s64) ch->duration;
-		track_dur /= read->time_scale;
-		if (gf_isom_get_edit_segment_count(read->mov, ch->track)) {
-			com->duration.duration = (Double) track_dur;
-			ch->duration = (u32) (track_dur * ch->time_scale);
-		} else {
-			/*some file indicate a wrong TrackDuration, get the longest*/
-			ch->duration = gf_isom_get_media_duration(read->mov, ch->track);
-			media_dur = (Double) (s64) ch->duration;
-			media_dur /= ch->time_scale;
-			com->duration.duration = MAX(track_dur, media_dur);
-		}
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-
-		gf_mx_p(read->segment_mutex);
-		isor_reset_reader(ch);
-		ch->speed = com->play.speed;
-		read->reset_frag_state = 1;
-		if (read->frag_type)
-			read->frag_type = 1;
-		gf_mx_v(read->segment_mutex);
-
-		ch->start = ch->end = 0;
-		if (com->play.speed>0) {
-			Double t;
-			if (com->play.start_range>=0) {
-				t = com->play.start_range;
-				t *= ch->time_scale;
-				ch->start = (u64) t;
-			}
-			if (com->play.end_range >= com->play.start_range) {
-				t = com->play.end_range;
-				t *= ch->time_scale;
-				ch->end = (u64) t;
-			}
-		} else if (com->play.speed<0) {
-			Double end = com->play.end_range;
-			if (end==-1) end = 0;
-			ch->start = (u64) (s64) (com->play.start_range * ch->time_scale);
-			if (end <= com->play.start_range)
-				ch->end = (u64) (s64) (end  * ch->time_scale);
-		}
-		ch->is_playing = 1;
-		if (com->play.dash_segment_switch) ch->wait_for_segment_switch = 1;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[IsoMedia] Starting channel playback "LLD" to "LLD" (%g to %g)\n", ch->start, ch->end, com->play.start_range, com->play.end_range));
-
-		//and check buffer level on play request
-		isor_check_buffer_level(read);
-		if (!read->nb_playing)
-			gf_isom_reset_seq_num(read->mov);
-
-		read->nb_playing++;
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		if (read->nb_playing) read->nb_playing--;
-		isor_reset_reader(ch);
-		return GF_OK;
-
-	case GF_NET_CHAN_SET_SPEED:
-		gf_mx_p(read->segment_mutex);
-		ch->speed = com->play.speed;
-		gf_mx_v(read->segment_mutex);
-		return GF_OK;
-	/*nothing to do on MP4 for channel config*/
-	case GF_NET_CHAN_CONFIG:
-		return GF_OK;
-	case GF_NET_CHAN_GET_PIXEL_AR:
-		return gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
-	case GF_NET_CHAN_GET_DSI:
-	{
-		/*it may happen that there are conflicting config when using ESD URLs...*/
-		GF_DecoderConfig *dcd = gf_isom_get_decoder_config(read->mov, ch->track, 1);
-		com->get_dsi.dsi = NULL;
-		com->get_dsi.dsi_len = 0;
-		if (dcd) {
-			if (dcd->decoderSpecificInfo) {
-				com->get_dsi.dsi = dcd->decoderSpecificInfo->data;
-				com->get_dsi.dsi_len = dcd->decoderSpecificInfo->dataLength;
-				dcd->decoderSpecificInfo->data = NULL;
-			}
-			gf_odf_desc_del((GF_Descriptor *) dcd);
-		}
-		return GF_OK;
-	}
-	case GF_NET_CHAN_NALU_MODE:
-		ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
-
-		//when this is set, we work in real scalable (eg N streams reassembled by the player) so only extract the layer. This wll need refinements if we plan to support
-		//several scalable layers ...
-		if (com->nalu_mode.extract_mode>=1) {
-			if (com->nalu_mode.extract_mode==2) {
-				ch->disable_seek = 1;
-			}
-			ch->nalu_extract_mode |= GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG | GF_ISOM_NALU_EXTRACT_LAYER_ONLY;
-		}
-		gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
-		break;
-	default:
-		break;
-	}
-	return GF_NOT_SUPPORTED;
-}
-
-static Bool ISOR_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	char szURL[2048], *sep;
-	ISOMReader *read = (ISOMReader *)plug->priv;
-	const char *this_url = gf_service_get_url(read->service);
-	if (!this_url || !url) return GF_FALSE;
-
-	if (!strcmp(this_url, url)) return GF_TRUE;
-
-	strcpy(szURL, this_url);
-	sep = strrchr(szURL, '#');
-	if (sep) sep[0] = 0;
-
-	/*direct addressing in service*/
-	if (url[0] == '#') return GF_TRUE;
-	if (strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
-	return GF_TRUE;
-}
-
-GF_InputService *isor_client_load()
-{
-	ISOMReader *reader;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC IsoMedia Reader", "gpac distribution")
-
-	GF_SAFEALLOC(reader, ISOMReader);
-	if (!reader) {
-		gf_free(plug);
-		return NULL;
-	}
-	reader->channels = gf_list_new();
-	reader->segment_mutex = gf_mx_new("ISO Segment");
-
-	plug->priv = reader;
-	
-	plug->RegisterMimeTypes = ISOR_RegisterMimeTypes;
-	plug->CanHandleURL = ISOR_CanHandleURL;
-	plug->ConnectService = ISOR_ConnectService;
-	plug->CloseService = ISOR_CloseService;
-	plug->GetServiceDescriptor = ISOR_GetServiceDesc;
-	plug->ConnectChannel = ISOR_ConnectChannel;
-	plug->DisconnectChannel = ISOR_DisconnectChannel;
-	plug->ServiceCommand = ISOR_ServiceCommand;
-	plug->CanHandleURLInService = ISOR_CanHandleURLInService;
-	/*we do support pull mode*/
-	plug->ChannelGetSLP = ISOR_ChannelGetSLP;
-	plug->ChannelReleaseSLP = ISOR_ChannelReleaseSLP;
-	return plug;
-}
-
-void isor_client_del(GF_BaseInterface *bi)
-{
-	GF_InputService *plug = (GF_InputService *) bi;
-	ISOMReader *read = (ISOMReader *)plug->priv;
-
-	if (read->segment_mutex) gf_mx_del(read->segment_mutex);
-	gf_list_del(read->channels);
-	gf_free(read);
-	gf_free(bi);
-}
-
-#endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/modules/isom_in/read_ch.c Deleted

@@ -1,1003 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP4 reader module
- *
- *  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 "isom_in.h"
-#include <gpac/network.h>
-#include <time.h>
-
-#ifndef GPAC_DISABLE_ISOM
-
-
-void isor_reset_reader(ISOMChannel *ch)
-{
-	ch->last_state = GF_OK;
-	isor_reader_release_sample(ch);
-
-	ch->sample = NULL;
-	ch->sample_num = 0;
-	ch->speed = 1.0;
-	ch->start = ch->end = 0;
-	ch->to_init = 1;
-	ch->is_playing = 0;
-	memset(&ch->current_slh, 0, sizeof(GF_SLHeader));
-}
-
-void isor_check_producer_ref_time(ISOMReader *read)
-{
-	u32 trackID;
-	u64 ntp;
-	u64 timestamp;
-
-	if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, GF_TRUE)) {
-#if !defined(_WIN32_WCE) && !defined(GPAC_DISABLE_LOG)
-
-		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
-			time_t secs;
-			struct tm t;
-
-			s32 diff = gf_net_get_ntp_diff_ms(ntp);
-
-			if (read->input->query_proxy) {
-				GF_NetworkCommand param;
-				GF_Err e;
-				memset(&param, 0, sizeof(GF_NetworkCommand));
-				param.command_type = GF_NET_SERVICE_QUERY_UTC_DELAY;
-				e = read->input->query_proxy(read->input, &param);
-				if (e == GF_OK) {
-					diff -= param.utc_delay.delay;
-				}
-			}
-
-			secs = (ntp>>32) - GF_NTP_SEC_1900_TO_1970;
-			t = *gmtime(&secs);
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp "LLU" matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff));
-		}
-#endif
-
-		read->last_sender_ntp = ntp;
-		read->cts_for_last_sender_ntp = timestamp;
-	}
-}
-
-/*
-	refresh type:
-		0: not progressive
-		1: progressive
-		2: not progressive and don't check current download
-*/
-void isor_segment_switch_or_refresh(ISOMReader *read, Bool do_refresh)
-{
-	GF_NetworkCommand param;
-	u32 i, count;
-	Bool scalable_segment = GF_FALSE;
-	GF_Err e;
-
-	/*access to the segment switching must be protected in case several decoders are threaded on the file using GetSLPacket */
-	gf_mx_p(read->segment_mutex);
-
-	if (!read->frag_type || !read->input->query_proxy ) {
-		gf_mx_v(read->segment_mutex);
-		return;
-	}
-
-	memset(&param, 0, sizeof(GF_NetworkCommand));
-	param.command_type = GF_NET_SERVICE_QUERY_NEXT;
-	//always check current download - this might be ignored by the dash client depending on lowLatency settings
-	param.url_query.current_download = 1;
-
-	count = gf_list_count(read->channels);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refresh seg: do_refresh %d - seg opened %d\n", do_refresh, read->seg_opened));
-
-	if (do_refresh && !read->seg_opened)
-		do_refresh = 0;
-
-	if ((read->seg_opened==1) && !do_refresh) {
-		gf_mx_v(read->segment_mutex);
-		return;
-	}
-
-	if (read->drop_next_segment) {
-		read->drop_next_segment = 0;
-		param.url_query.drop_first_segment = 1;
-	}
-
-	//if first time trying to fetch next segment, check if we have to discard it
-	if (!do_refresh && (read->seg_opened==2) && !read->pending_scalable_enhancement_segment_index) {
-#ifdef DASH_USE_PULL
-		for (i=0; i<count; i++) {
-			ISOMChannel *ch = gf_list_get(read->channels, i);
-			/*check all playing channels are waiting for next segment*/
-			if (ch->is_playing && !ch->wait_for_segment_switch) {
-				gf_mx_v(read->segment_mutex);
-				return;
-			}
-		}
-#endif
-
-		/*close current segment*/
-		gf_isom_release_segment(read->mov, 1);
-		read->seg_opened = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment - querying new one\n"));
-
-		/*drop this segment*/
-		param.url_query.drop_first_segment = 1;
-	}
-
-	if (read->pending_scalable_enhancement_segment_index) {
-		do_refresh = 0;
-		param.url_query.drop_first_segment = 0;
-		param.url_query.dependent_representation_index = read->pending_scalable_enhancement_segment_index;
-		scalable_segment = 1;
-		read->pending_scalable_enhancement_segment_index = 0;
-	}
-
-
-next_segment:
-	/*update current fragment if any*/
-	e = read->input->query_proxy(read->input, &param);
-	if (e == GF_OK) {
-		u32 trackID = 0;
-		if (param.url_query.next_url) {
-			u32 flags;
-
-			//previously loaded file has been aborted, reload segment !
-			if (do_refresh && param.url_query.discontinuity_type) {
-				gf_isom_release_segment(read->mov, 1);
-				gf_isom_reset_fragment_info(read->mov, 1);
-				do_refresh = 0;
-			}
-
-			if (read->reset_frag_state) {
-				read->reset_frag_state = 0;
-				gf_isom_reset_fragment_info(read->mov, 0);
-			}
-
-			//refresh file
-			if (do_refresh) {
-				//the url is the current download or we just finished downloaded it, refresh the parsing.
-				if ((param.url_query.current_download || (read->seg_opened==1)) && param.url_query.has_new_data) {
-					u64 bytesMissing=0;
-					e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, read->use_memory ? param.url_query.next_url : NULL);
-
-					if (e && (e!= GF_ISOM_INCOMPLETE_FILE)) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Failed to reparse segment %s: %s\n", param.url_query.next_url, gf_error_to_string(e) ));
-					} else {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU" - "LLU" bytes still missing\n", param.url_query.next_url, gf_net_get_utc(), bytesMissing ));
-					}
-#ifndef GPAC_DISABLE_LOG
-					if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
-						for (i=0; i<count; i++) {
-							ISOMChannel *ch = gf_list_get(read->channels, i);
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
-						}
-					}
-#endif
-					isor_check_producer_ref_time(read);
-				}
-				//we did the last refresh and the segment is downloaded, move to fully parsed mode
-				if (! param.url_query.current_download) {
-					read->seg_opened = 2;
-					read->waiting_for_data = GF_FALSE;
-				}
-				gf_mx_v(read->segment_mutex);
-				return;
-			}
-
-			//we have to open the file
-
-			if (param.url_query.discontinuity_type==2) {
-				gf_isom_reset_fragment_info(read->mov, 0);
-				read->clock_discontinuity = 1;
-			}
-			e = GF_OK;
-			if (param.url_query.next_url_init_or_switch_segment) {
-				u64 tfdt = gf_isom_get_current_tfdt(read->mov, 1);
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Switching between files - opening new init segment %s (time offset="LLU")\n", param.url_query.next_url_init_or_switch_segment, tfdt));
-
-				if (gf_isom_is_smooth_streaming_moov(read->mov)) {
-					char *tfdt_val = strstr(param.url_query.next_url_init_or_switch_segment, "tfdt=");
-
-					//smooth adressing, replace tfdt=0000000000000000000 with proper value
-					if (tfdt_val) {
-						sprintf(tfdt_val+5, LLU, tfdt);
-					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[IsoMedia] Error finding init time for init segment %s at UTC "LLU"\n", param.url_query.next_url_init_or_switch_segment, gf_net_get_utc() ));
-					}
-				}
-
-				if (read->mov) gf_isom_close(read->mov);
-				e = gf_isom_open_progressive(param.url_query.next_url_init_or_switch_segment, param.url_query.switch_start_range, param.url_query.switch_end_range, &read->mov, &read->missing_bytes);
-				if (e < 0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening init segment %s at UTC "LLU": %s\n", param.url_query.next_url_init_or_switch_segment, gf_net_get_utc(), gf_error_to_string(e) ));
-				} else {
-					for (i=0; i<count; i++) {
-						ISOMChannel *ch = gf_list_get(read->channels, i);
-						ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
-						ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->dts_offset) ? GF_TRUE : GF_FALSE;
-						ch->has_rap = (gf_isom_has_sync_points(ch->owner->mov, ch->track) == 1) ? GF_TRUE : GF_FALSE;
-						ch->time_scale = gf_isom_get_media_timescale(ch->owner->mov, ch->track);
-						ch->start = 0;
-					}
-				}
-			}
-			if (!e) {
-				flags = 0;
-				if (read->no_order_check) flags |= GF_ISOM_SEGMENT_NO_ORDER_FLAG;
-				if (scalable_segment) flags |= GF_ISOM_SEGMENT_SCALABLE_FLAG;
-				else {
-					//whenever we load a base segment, reset all sample count info
-					gf_isom_reset_sample_count(read->mov);
-					for (i=0; i<count; i++) {
-						ISOMChannel *ch = gf_list_get(read->channels, i);
-						if (ch) ch->sample_num = 0;
-					}
-				}
-
-
-				e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range, flags);
-
-				if (param.url_query.current_download  && (e==GF_ISOM_INCOMPLETE_FILE)) {
-					e = GF_OK;
-				}
-
-#ifndef GPAC_DISABLE_LOG
-				if (e<0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening new segment %s at UTC "LLU": %s\n", param.url_query.next_url, gf_net_get_utc(), gf_error_to_string(e) ));
-				} else if (param.url_query.end_range) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Playing new range in %s: "LLU"-"LLU"\n", param.url_query.next_url, param.url_query.start_range, param.url_query.end_range ));
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] playing new segment %s (has next dep %d)\n", param.url_query.next_url, param.url_query.has_next));
-				}
-#endif
-			}
-
-			if (e<0) {
-				gf_isom_release_segment(read->mov, 1);
-				//gf_isom_reset_fragment_info(read->mov, 1);
-				read->drop_next_segment = 1;
-				//error opening the segment, reset everything ...
-				gf_isom_reset_fragment_info(read->mov, 0);
-				for (i=0; i<count; i++) {
-					ISOMChannel *ch = gf_list_get(read->channels, i);
-					if (ch)
-						ch->sample_num = 0;
-				}
-
-				//cannot open file, don't change our state
-				gf_mx_v(read->segment_mutex);
-				return;
-			}
-
-			//segment is the first in our cache, we may need a refresh
-			if (param.url_query.current_download ) {
-				read->seg_opened = 1;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in progressive mode (download in progress)\n"));
-			} else {
-				read->seg_opened = 2;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in non-progressive mode (completely downloaded)\n"));
-			}
-
-			isor_check_producer_ref_time(read);
-
-			for (i=0; i<count; i++) {
-				ISOMChannel *ch = gf_list_get(read->channels, i);
-				ch->wait_for_segment_switch = 0;
-
-				if (ch->base_track) {
-					if (scalable_segment) {
-						trackID = gf_isom_get_highest_track_in_scalable_segment(read->mov, ch->base_track);
-						if (trackID) {
-							ch->track_id = trackID;
-							ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
-						}
-					} else {
-						ch->track = ch->base_track;
-						ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
-					}
-				}
-
-				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) ));
-				if (param.url_query.next_url_init_or_switch_segment) {
-					ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
-					if (!ch->track) {
-						if (gf_isom_get_track_count(read->mov)==1) {
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
-							ch->track = 1;
-						} else {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
-						}
-					}
-
-					/*we changed our moov structure, sample_num now starts from 0*/
-					ch->sample_num = 0;
-				}
-				//a loop was detected, our timing is no longer reliable if we use edit lists - just reset the sample time to tfdt ...
-				else if (param.url_query.discontinuity_type==2) {
-					ch->sample_num = 0;
-					if (ch->has_edit_list) {
-						ch->sample_time = gf_isom_get_current_tfdt(read->mov, ch->track);
-						//next read will query sample for ch->sample_time + 1
-						if (ch->sample_time) ch->sample_time--;
-					}
-				}
-				/*rewrite all upcoming SPS/PPS into the samples*/
-				gf_isom_set_nalu_extract_mode(read->mov, ch->track, ch->nalu_extract_mode);
-				ch->last_state = GF_OK;
-
-
-				if (ch->is_cenc) {
-					isor_send_cenc_config(ch);
-				}
-
-			}
-
-			read->use_memory = !strncmp(param.url_query.next_url, "gmem://", 7) ? GF_TRUE : GF_FALSE;
-		}
-		if (param.url_query.has_next) {
-			param.url_query.drop_first_segment = GF_FALSE;
-			param.url_query.dependent_representation_index++;
-			scalable_segment = 1;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Enhancement layer available in cache - refreshing it\n"));
-			goto next_segment;
-		}
-		read->waiting_for_data = GF_FALSE;
-	} else if (e==GF_EOS) {
-		/*consider we are done*/
-		read->frag_type = 2;
-		read->waiting_for_data = GF_FALSE;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] No more segments - done playing file\n"));
-	} else if (e==GF_BUFFER_TOO_SMALL) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
-		read->waiting_for_data = GF_TRUE;
-		read->pending_scalable_enhancement_segment_index = param.url_query.dependent_representation_index;
-	} else {
-		/*consider we are done*/
-		read->frag_type = 2;
-		read->waiting_for_data = GF_FALSE;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error fetching next DASH segment: no more segments\n"));
-	}
-	gf_mx_v(read->segment_mutex);
-}
-
-static void init_reader(ISOMChannel *ch)
-{
-	u32 sample_desc_index=0;
-	if (ch->is_pulling && ch->wait_for_segment_switch) {
-		isor_segment_switch_or_refresh(ch->owner, 0);
-		if (ch->wait_for_segment_switch)
-			return;
-	}
-
-	ch->current_slh.accessUnitEndFlag = 1;
-	ch->current_slh.accessUnitStartFlag = 1;
-	ch->current_slh.AU_sequenceNumber = 1;
-	ch->current_slh.compositionTimeStampFlag = 1;
-	ch->current_slh.decodingTimeStampFlag = 1;
-	ch->current_slh.packetSequenceNumber = 1;
-	ch->current_slh.randomAccessPointFlag = 0;
-
-	assert(ch->sample==NULL);
-
-	if (ch->streamType==GF_STREAM_OCR) {
-		assert(!ch->sample);
-		ch->sample = gf_isom_sample_new();
-		ch->sample->IsRAP = RAP;
-		ch->sample->DTS = ch->start;
-		ch->last_state=GF_OK;
-	} else {
-		//if seek is disabled, get the next closest sample for this time; otherwose, 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*/
-		if (!ch->owner->frag_type && (ch->duration<ch->start)) {
-			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->duration, &sample_desc_index, mode, &ch->sample, &ch->sample_num);
-		} else {
-			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->start, &sample_desc_index, mode, &ch->sample, &ch->sample_num);
-		}
-		ch->last_state = GF_OK;
-
-		if (ch->has_rap && ch->has_edit_list) {
-			ch->edit_sync_frame = ch->sample_num;
-		}
-
-		if (ch->sample && !ch->sample->data && ch->owner->frag_type && !ch->has_edit_list) {
-			gf_isom_sample_del(&ch->sample);
-			ch->sample_num = 1;
-			ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index);
-		}
-	}
-
-	/*no sample means we're not in the track range - stop*/
-	if (!ch->sample) {
-		/*incomplete file - check if we're still downloading or not*/
-		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
-			GF_NetIOStatus net_status;
-			gf_dm_sess_get_stats(ch->owner->dnload, NULL, NULL, NULL, NULL, NULL, &net_status);
-			if (net_status == GF_NETIO_DATA_EXCHANGE) {
-				ch->last_state = GF_OK;
-				return;
-			}
-			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
-		} else if (ch->sample_num) {
-			ch->last_state = (ch->owner->frag_type==1) ? GF_OK : GF_EOS;
-			ch->to_init = 0;
-			ch->last_sample_desc_index = 1;
-		}
-		return;
-	}
-
-	if (ch->has_edit_list) {
-		ch->sample_time = ch->sample->DTS;
-	} else {
-		//store movie time in media timescale in the sample time, eg no edit list is used but we may have a shift (dts_offset) between
-		//movie and media timelines
-
-		if ((ch->dts_offset<0) && (ch->sample->DTS  < (u64) -ch->dts_offset)) {
-			ch->sample_time = 0;
-			ch->do_dts_shift_test = GF_TRUE;
-		} else {
-			ch->sample_time = ch->sample->DTS + ch->dts_offset;
-		}
-	}
-	ch->to_init = GF_FALSE;
-
-	ch->current_slh.seekFlag = 0;
-	if (ch->disable_seek) {
-		ch->current_slh.decodingTimeStamp = ch->sample->DTS;
-		ch->current_slh.compositionTimeStamp = ch->sample->DTS + ch->sample->CTS_Offset;
-		ch->start = 0;
-	} else {
-		ch->current_slh.decodingTimeStamp = ch->start;
-		ch->current_slh.compositionTimeStamp = ch->start;
-
-		//TODO - we need to notify scene decoder how many secs elapsed between RAP and seek point
-		if (ch->current_slh.compositionTimeStamp != ch->sample->DTS + ch->sample->CTS_Offset) {
-			ch->current_slh.seekFlag = 1;
-		}
-	}
-	ch->current_slh.randomAccessPointFlag = ch->sample ? ch->sample->IsRAP : 0;
-	if (!sample_desc_index) sample_desc_index = 1;
-	ch->last_sample_desc_index = sample_desc_index;
-	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
-}
-
-void isor_reader_get_sample_from_item(ISOMChannel *ch)
-{
-	if (ch->current_slh.AU_sequenceNumber) {
-		ch->last_state = GF_EOS;
-		return;
-	}
-	ch->sample_time = 0;
-	ch->last_state = GF_OK;
-	ch->sample = gf_isom_sample_new();
-	ch->sample->IsRAP = RAP;
-	ch->current_slh.accessUnitEndFlag = ch->current_slh.accessUnitStartFlag = 1;
-	ch->current_slh.au_duration = 1000;
-	ch->current_slh.randomAccessPointFlag = ch->sample->IsRAP;
-	ch->current_slh.compositionTimeStampFlag = 1;
-	ch->current_slh.decodingTimeStampFlag = 1;
-	gf_isom_extract_meta_item_mem(ch->owner->mov, GF_TRUE, 0, ch->item_id, &ch->sample->data, &ch->sample->dataLength, NULL, GF_FALSE);
-	ch->current_slh.accessUnitLength = ch->sample->dataLength;
-}
-
-void isor_reader_get_sample(ISOMChannel *ch)
-{
-	GF_Err e;
-	u32 sample_desc_index;
-	if (ch->sample) return;
-
-	if (ch->next_track) {
-		ch->track = ch->next_track;
-		ch->next_track = 0;
-	}
-
-	if ((ch->owner->seg_opened==1) && ch->is_pulling) {
-		isor_segment_switch_or_refresh(ch->owner, GF_TRUE);
-	}
-
-	if (ch->to_init) {
-		init_reader(ch);
-		sample_desc_index = ch->last_sample_desc_index;
-	} else if (ch->speed < 0) {
-		if (!ch->sample_time) {
-			ch->last_state = GF_EOS;
-			return;
-		} else {
-			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->sample, &ch->sample_num);
-			if (e) {
-				if ((e==GF_EOS) && !ch->owner->frag_type) {
-					ch->last_state = GF_EOS;
-				}
-				return;
-			}
-		}
-		if (ch->sample->DTS + ch->dts_offset == ch->sample_time) {
-			if (!ch->owner->frag_type) {
-				ch->last_state = GF_EOS;
-			} else {
-				if (ch->sample)
-					gf_isom_sample_del(&ch->sample);
-			}
-		}
-		if (ch->sample) {
-			if ((ch->dts_offset<0) && (ch->sample->DTS < (u64) -ch->dts_offset))	//should not happen
-				ch->sample_time = 0;
-			else
-				ch->sample_time = ch->sample->DTS + ch->dts_offset;
-		}
-
-	} else if (ch->has_edit_list) {
-		u32 prev_sample = ch->sample_num;
-		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->sample, &ch->sample_num);
-
-		if (e == GF_OK) {
-
-			/*we are in forced seek mode: fetch all samples before the one matching the sample time*/
-			if (ch->edit_sync_frame) {
-				ch->edit_sync_frame++;
-				if (ch->edit_sync_frame < ch->sample_num) {
-					gf_isom_sample_del(&ch->sample);
-					ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->edit_sync_frame, &sample_desc_index);
-					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;
-				}
-			} else {
-				/*if we get the same sample, figure out next interesting time (current sample + DTS gap to next sample should be a good bet)*/
-				if (prev_sample == ch->sample_num) {
-					if (ch->owner->frag_type && (ch->sample_num==gf_isom_get_sample_count(ch->owner->mov, ch->track))) {
-						if (ch->sample)
-							gf_isom_sample_del(&ch->sample);
-					} else {
-						u32 time_diff = 2;
-						u32 sample_num = ch->sample_num ? ch->sample_num : 1;
-						GF_ISOSample *s1 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num, NULL);
-						GF_ISOSample *s2 = gf_isom_get_sample(ch->owner->mov, ch->track, sample_num+1, NULL);
-
-						gf_isom_sample_del(&ch->sample);
-
-						if (s2 && s1) {
-							assert(s2->DTS >= s1->DTS);
-							time_diff = (u32) (s2->DTS - s1->DTS);
-							/*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->sample, &ch->sample_num);
-						} else if (s1 && !s2) {
-							/*e = GF_EOS;*/
-						}
-						gf_isom_sample_del(&s1);
-						gf_isom_sample_del(&s2);
-
-					}
-				}
-
-				/*we jumped to another segment - if RAP is needed look for closest rap in decoding order and
-				force seek mode*/
-				if (ch->sample && !ch->sample->IsRAP && ch->has_rap && (ch->sample_num != prev_sample+1)) {
-					GF_ISOSample *found = ch->sample;
-					u32 samp_num = ch->sample_num;
-					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->sample, &ch->sample_num);
-					assert (e == GF_OK);
-					/*if no sync point in the past, use the first non-sync for the given time*/
-					if (!ch->sample || !ch->sample->data) {
-						gf_isom_sample_del(&ch->sample);
-						ch->sample = found;
-						ch->sample_time = ch->sample->DTS;
-						ch->sample_num = samp_num;
-					} else {
-						gf_isom_sample_del(&found);
-						ch->edit_sync_frame = ch->sample_num;
-						ch->sample->DTS = ch->sample_time;
-						ch->sample->CTS_Offset = 0;
-					}
-				} else {
-					if (ch->sample) ch->sample_time = ch->sample->DTS;
-				}
-			}
-		}
-	} else {
-		ch->sample_num++;
-
-		ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &sample_desc_index);
-		/*if sync shadow / carousel RAP skip*/
-		if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
-			gf_isom_sample_del(&ch->sample);
-			ch->sample_num++;
-			isor_reader_get_sample(ch);
-			return;
-		}
-	}
-
-	//check scalable track change
-	if (ch->sample && ch->sample->IsRAP && ch->next_track) {
-		ch->track = ch->next_track;
-		ch->next_track = 0;
-		gf_isom_sample_del(&ch->sample);
-		isor_reader_get_sample(ch);
-		return;
-	}
-
-	if (!ch->sample) {
-		/*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->dnload) {
-				GF_NetIOStatus net_status;
-				gf_dm_sess_get_stats(ch->owner->dnload, NULL, NULL, NULL, NULL, NULL, &net_status);
-				if (net_status == GF_NETIO_DATA_EXCHANGE) {
-					ch->last_state = GF_OK;
-					if (!ch->has_edit_list)
-						ch->sample_num--;
-				}
-			}
-			else if (ch->owner->input->query_proxy) {
-				ch->last_state = GF_OK;
-				if (!ch->has_edit_list && ch->sample_num)
-					ch->sample_num--;
-			}
-		}
-		else if (!ch->sample_num
-		         || ((ch->speed >= 0) && (ch->sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track)))
-		         || ((ch->speed < 0) && (ch->sample_time == gf_isom_get_current_tfdt(ch->owner->mov, ch->track) + ch->dts_offset))
-		        ) {
-
-			if (ch->owner->frag_type==1) {
-				//if segment is fully opened and no more data, this track is done, wait for next segment
-				if (!ch->wait_for_segment_switch && ch->owner->input->query_proxy && (ch->owner->seg_opened==2) ) {
-					ch->wait_for_segment_switch = GF_TRUE;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d end of segment reached - waiting for sample %d - current count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
-				}
-				/*if sample cannot be found and file is fragmented, rewind sample*/
-				if (ch->sample_num) ch->sample_num--;
-				ch->last_state = GF_OK;
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d end of stream reached\n", ch->track));
-				ch->last_state = GF_EOS;
-			}
-		} 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)) ));
-		}
-		if (ch->wait_for_segment_switch && ch->is_pulling) {
-			isor_segment_switch_or_refresh(ch->owner, 0);
-			if (ch->owner->seg_opened) {
-				isor_reader_get_sample(ch);
-				return;
-			}
-		}
-		return;
-	}
-
-	if (sample_desc_index != ch->last_sample_desc_index) {
-		u32 mtype = gf_isom_get_media_type(ch->owner->mov, ch->track);
-		switch (mtype) {
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-			//code is here as a reminder, but by default we use inband param set extraction so no need for it
-#if 0
-			if ( ! (ch->nalu_extract_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ) {
-				u32 extract_mode = ch->nalu_extract_mode | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
-
-				gf_isom_sample_del(&ch->sample);
-				ch->sample = NULL;
-				gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, extract_mode);
-				ch->sample = gf_isom_get_sample(ch->owner->mov, ch->track, ch->sample_num, &ch->last_sample_desc_index);
-
-				gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
-			}
-#endif
-			break;
-		case GF_ISOM_MEDIA_TEXT:
-		case GF_ISOM_MEDIA_SUBPIC:
-		case GF_ISOM_MEDIA_MPEG_SUBT:
-			break;
-		default:
-			//TODO: do we want to support codec changes ?
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Change of sample description (%d->%d) for media type %s not supported\n", ch->last_sample_desc_index, sample_desc_index, gf_4cc_to_str(mtype) ));
-			gf_isom_sample_del(&ch->sample);
-			ch->sample = NULL;
-			ch->last_state = GF_NOT_SUPPORTED;
-			return;
-		}
-	}
-
-	ch->last_state = GF_OK;
-	ch->current_slh.accessUnitEndFlag = ch->current_slh.accessUnitStartFlag = 1;
-	ch->current_slh.accessUnitLength = ch->sample->dataLength;
-	ch->current_slh.au_duration = gf_isom_get_sample_duration(ch->owner->mov, ch->track, ch->sample_num);
-
-	//update timestamp when single edit
-	if (ch->sample && ch->dts_offset) {
-		if (ch->do_dts_shift_test) {
-			s64 DTS, CTS;
-			DTS = (s64) ch->sample->DTS + ch->dts_offset;
-			CTS = (s64) ch->sample->DTS + ch->dts_offset + (s32) ch->sample->CTS_Offset;
-			if (DTS<0)
-				DTS=0;
-			else
-				ch->do_dts_shift_test = GF_FALSE;
-
-			if (CTS<0) CTS=0;
-			ch->sample->DTS = (u64) DTS;
-			ch->sample->CTS_Offset = (s32) (CTS - DTS);
-		} else {
-			ch->sample->DTS = ch->sample->DTS + ch->dts_offset;
-		}
-	}
-
-	/*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->current_slh.decodingTimeStamp = ch->sample->DTS;
-		ch->current_slh.compositionTimeStamp = ch->sample->DTS + ch->sample->CTS_Offset;
-		ch->current_slh.seekFlag = 0;
-	} else {
-		ch->current_slh.compositionTimeStamp = ch->start;
-		ch->current_slh.seekFlag = 1;
-		ch->current_slh.decodingTimeStamp = ch->start;
-	}
-	ch->current_slh.randomAccessPointFlag = ch->sample->IsRAP;
-	ch->current_slh.OCRflag = ch->owner->clock_discontinuity ? 2 : 0;
-	ch->current_slh.ts_res = ch->time_scale;
-	ch->owner->clock_discontinuity = 0;
-
-	//handle negative ctts
-	if (ch->current_slh.decodingTimeStamp > ch->current_slh.compositionTimeStamp)
-		ch->current_slh.decodingTimeStamp = ch->current_slh.compositionTimeStamp;
-
-	if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset)) {
-		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;
-	}
-	if (ch->owner->last_sender_ntp && ch->current_slh.compositionTimeStamp==ch->owner->cts_for_last_sender_ntp) {
-		ch->current_slh.sender_ntp = ch->owner->last_sender_ntp;
-	} else {
-		ch->current_slh.sender_ntp = 0;
-	}
-
-
-	if (ch->is_encrypted) {
-		GF_ISMASample *ismasamp = gf_isom_get_ismacryp_sample(ch->owner->mov, ch->track, ch->sample, 1);
-		if (ismasamp) {
-			gf_free(ch->sample->data);
-			ch->sample->data = ismasamp->data;
-			ch->sample->dataLength = ismasamp->dataLength;
-			ismasamp->data = NULL;
-			ismasamp->dataLength = 0;
-			ch->current_slh.isma_encrypted = (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? 1 : 0;
-			ch->current_slh.isma_BSO = ismasamp->IV;
-			gf_isom_ismacryp_delete_sample(ismasamp);
-		} else {
-			ch->current_slh.isma_encrypted = 0;
-			/*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, 1)) {
-				GF_CENCSampleAuxInfo *sai;
-				u32 Is_Encrypted;
-				u8 IV_size;
-				bin128 KID;
-				u8 crypt_bytr_block, skip_byte_block;
-				u8 constant_IV_size;
-				bin128 constant_IV;
-
-				gf_isom_get_sample_cenc_info(ch->owner->mov, ch->track, ch->sample_num, &Is_Encrypted, &IV_size, &KID, &crypt_bytr_block, &skip_byte_block, &constant_IV_size, &constant_IV);
-				ch->current_slh.IV_size = IV_size;
-				ch->current_slh.crypt_byte_block = crypt_bytr_block;
-				ch->current_slh.skip_byte_block = skip_byte_block;
-				if (Is_Encrypted && !ch->current_slh.IV_size) {
-					ch->current_slh.constant_IV_size = constant_IV_size;
-					memmove(ch->current_slh.constant_IV, constant_IV, ch->current_slh.constant_IV_size);
-				}
-				if (Is_Encrypted) {
-					ch->current_slh.cenc_encrypted = 1;
-					sai = NULL;
-					gf_isom_cenc_get_sample_aux_info(ch->owner->mov, ch->track, ch->sample_num, &sai, NULL);
-					if (sai) {
-						u32 i;
-						GF_BitStream *bs;
-						bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-						/*write sample auxiliary information*/
-						gf_bs_write_data(bs, (char *)KID, 16);
-						gf_bs_write_data(bs, (char *)sai->IV, IV_size);
-						gf_bs_write_u16(bs, sai->subsample_count);
-						for (i = 0; i < sai->subsample_count; i++) {
-							gf_bs_write_u16(bs, sai->subsamples[i].bytes_clear_data);
-							gf_bs_write_u32(bs, sai->subsamples[i].bytes_encrypted_data);
-						}
-						gf_bs_get_content(bs, &ch->current_slh.sai, &ch->current_slh.saiz);
-						gf_bs_del(bs);
-						gf_isom_cenc_samp_aux_info_del(sai);
-						sai = NULL;
-					}
-				}
-				else
-					ch->current_slh.cenc_encrypted = 0;
-			}
-		}
-	}
-}
-
-void isor_reader_release_sample(ISOMChannel *ch)
-{
-	if (ch->current_slh.sai) {
-		gf_free(ch->current_slh.sai);
-		ch->current_slh.sai = NULL;
-	}
-	if (ch->sample) gf_isom_sample_del(&ch->sample);
-	ch->sample = NULL;
-	ch->current_slh.AU_sequenceNumber++;
-	ch->current_slh.packetSequenceNumber++;
-}
-
-
-void isor_flush_data(ISOMReader *read, Bool check_buffer_level, Bool is_chunk_flush)
-{
-	u32 i, count;
-	GF_Err e = GF_OK;
-	Bool do_refresh;
-	GF_NetworkCommand com;
-	ISOMChannel *ch;
-
-	if (read->in_data_flush) {
-		if (check_buffer_level && !is_chunk_flush) read->has_pending_segments++;
-		return;
-	}
-
-	//if another thread grabs the mutex at the same time, just return
-	if (!gf_mx_try_lock(read->segment_mutex)) {
-		if (check_buffer_level && !is_chunk_flush) read->has_pending_segments++;
-		return;
-	}
-	read->in_data_flush = 1;
-	count = gf_list_count(read->channels);
-
-	do_refresh = (read->seg_opened==1) ? 1 : 0;
-
-	if (do_refresh) {
-		//query from terminal - do nothing if we are not done downloading the segment - otherwise we could access media data while it is reallocated by the downloader
-		if (!check_buffer_level) {
-			read->in_data_flush = 0;
-			gf_mx_v(read->segment_mutex);
-			return;
-		}
-		//otherwise this is new chunk or end of chunk, process
-	}
-	//this is a new file, check buffer level
-	else if (/*!is_chunk_flush && */ check_buffer_level) {
-		Bool buffer_full = 1;
-		for (i=0; i<count; i++) {
-			ch = (ISOMChannel *)gf_list_get(read->channels, i);
-			/*query buffer level on each channel, don't sleep if too low*/
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_BUFFER_QUERY;
-			com.base.on_channel = ch->channel;
-			gf_service_command(read->service, &com, GF_OK);
-			if ((com.buffer.occupancy < MAX(com.buffer.max, 1000) )) {
-				buffer_full = 0;
-				break;
-			}
-		}
-		if (buffer_full) {
-			read->has_pending_segments++;
-			read->in_data_flush = 0;
-			gf_mx_v(read->segment_mutex);
-			if (count) {
-//				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Buffer level %d ms higher than max allowed %d ms - skipping dispatch\n", com.buffer.occupancy,  com.buffer.max));
-			}
-			return;
-		}
-	}
-	//flush request from terminal: only process if nothing is opened and we have pending segments
-	//we have to keep the polling event when no segments are pending, in order to detect period switch - we therefore tolerate a couble of requests even though no segments are pending
-	if (!check_buffer_level && read->seg_opened && (!read->has_pending_segments || (read->nb_force_flush > 2)) && !read->drop_next_segment) {
-		read->in_data_flush = 0;
-		gf_mx_v(read->segment_mutex);
-		return;
-	}
-
-	//if this is a request from terminal to flush pending segments, try to refresh
-	if (!check_buffer_level && !do_refresh)
-		do_refresh = 1;
-
-	//update data
-	isor_segment_switch_or_refresh(read, do_refresh);
-
-	//segment not ready
-	if ( read->pending_scalable_enhancement_segment_index) {
-		read->in_data_flush = 0;
-		gf_mx_v(read->segment_mutex);
-		return;
-	}
-
-
-	//for all channels, fetch and send ...
-	count = gf_list_count(read->channels);
-	for (i=0; i<count; i++) {
-		ch = (ISOMChannel *)gf_list_get(read->channels, i);
-
-		while (!ch->sample) {
-			isor_reader_get_sample(ch);
-			if (!ch->sample) break;
-			if (ch->is_playing)
-				gf_service_send_packet(read->service, ch->channel, ch->sample->data, ch->sample->dataLength, &ch->current_slh, GF_OK);
-			isor_reader_release_sample(ch);
-		}
-		if (!ch->sample && (ch->last_state==GF_EOS)) {
-			gf_service_send_packet(read->service, ch->channel, NULL, 0, NULL, GF_EOS);
-		}
-	}
-
-	//done playing the file after notification from DASH client:
-	if (read->seg_opened==2) {
-		GF_NetworkCommand param;
-		//drop this segment
-		memset(&param, 0, sizeof(GF_NetworkCommand));
-		param.command_type = GF_NET_SERVICE_QUERY_NEXT;
-		param.url_query.dependent_representation_index = 0;
-		param.url_query.drop_first_segment = 1;
-		e = read->input->query_proxy(read->input, &param);
-
-		read->nb_force_flush = 0;
-		if (read->has_pending_segments) {
-			read->has_pending_segments--;
-		}
-		if (param.url_query.discontinuity_type==2) {
-			gf_isom_reset_fragment_info(read->mov, 0);
-			read->clock_discontinuity = 1;
-		}
-
-		if (e==GF_EOS) {
-			for (i=0; i<count; i++) {
-				ch = (ISOMChannel *)gf_list_get(read->channels, i);
-				gf_service_send_packet(read->service, ch->channel, NULL, 0, NULL, GF_EOS);
-			}
-		}
-		//not enough data
-		else if (param.url_query.in_end_of_period) {
-			//act as if we have a pending segment to process at next call until we get to the next period
-			if (!read->has_pending_segments)
-				read->has_pending_segments++;
-		}
-
-		/*close current segment*/
-		gf_isom_release_segment(read->mov, 1);
-		read->seg_opened = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment - closing it\n"));
-	}
-	read->in_data_flush = 0;
-
-	if (!read->has_pending_segments) {
-		read->nb_force_flush ++;
-	}
-	gf_mx_v(read->segment_mutex);
-}
-
-#endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/modules/laser_dec Deleted

gpac-0.8.0.tar.gz/modules/laser_dec/Makefile Deleted

gpac-0.8.0.tar.gz/modules/laser_dec/laser_dec.c Deleted

@@ -1,202 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / LASeR decoder module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/laser.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_LASER
-
-typedef struct
-{
-	GF_Scene *pScene;
-	GF_Terminal *app;
-	GF_LASeRCodec *codec;
-	u32 PL, nb_streams;
-} LSRPriv;
-
-
-
-static GF_Err LSR_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err LSR_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-GF_Err LSR_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	LSRPriv *priv = (LSRPriv *)plug->privateStack;
-	if (priv->codec) return GF_BAD_PARAM;
-	priv->pScene = scene;
-	priv->app = scene->root_od->term;
-
-	priv->codec = gf_laser_decoder_new(scene->graph);
-	/*attach the clock*/
-	gf_laser_decoder_set_clock(priv->codec, gf_scene_get_time, scene);
-	return GF_OK;
-}
-
-GF_Err LSR_ReleaseScene(GF_SceneDecoder *plug)
-{
-	LSRPriv *priv = (LSRPriv *)plug->privateStack;
-	if (!priv->codec || priv->nb_streams) return GF_BAD_PARAM;
-	gf_laser_decoder_del(priv->codec);
-	priv->codec = NULL;
-	return GF_OK;
-}
-
-static GF_Err LSR_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	LSRPriv *priv = (LSRPriv *)plug->privateStack;
-	GF_Err e;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	e = gf_laser_decoder_configure_stream(priv->codec, esd->ESID, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-	if (!e) priv->nb_streams++;
-	return e;
-}
-
-static GF_Err LSR_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	GF_Err e;
-	LSRPriv *priv = (LSRPriv *)plug->privateStack;
-	e = gf_laser_decoder_remove_stream(priv->codec, ES_ID);
-	if (e) return e;
-	priv->nb_streams--;
-	return GF_OK;
-}
-
-static GF_Err LSR_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 AU_time, u32 mmlevel)
-{
-	GF_Err e = GF_OK;
-	LSRPriv *priv = (LSRPriv *)plug->privateStack;
-
-	e = gf_laser_decode_au(priv->codec, ES_ID, inBuffer, inBufferLength);
-
-	/*if scene not attached do it*/
-	gf_scene_attach_to_compositor(priv->pScene);
-	return e;
-}
-
-static u32 LSR_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType!=GF_STREAM_SCENE) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_LASER) return GF_CODEC_SUPPORTED;
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-void DeleteLSRDec(GF_BaseDecoder *plug)
-{
-	LSRPriv *priv;
-	if (!plug)
-		return;
-	priv = (LSRPriv *)plug->privateStack;
-	if (priv) {
-		/*in case something went wrong*/
-		if (priv->codec)
-			gf_laser_decoder_del(priv->codec);
-		priv->codec = NULL;
-		gf_free(priv);
-		plug->privateStack = NULL;
-	}
-	gf_free(plug);
-}
-
-GF_BaseDecoder *NewLSRDec()
-{
-	LSRPriv *priv;
-	GF_SceneDecoder *tmp;
-
-	GF_SAFEALLOC(tmp, GF_SceneDecoder);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, LSRPriv);
-	if (!priv) {
-		gf_free(tmp);
-		return NULL;
-	}
-	priv->codec = NULL;
-	tmp->privateStack = priv;
-	tmp->AttachStream = LSR_AttachStream;
-	tmp->DetachStream = LSR_DetachStream;
-	tmp->GetCapabilities = LSR_GetCapabilities;
-	tmp->SetCapabilities = LSR_SetCapabilities;
-	tmp->ProcessData = LSR_ProcessData;
-	tmp->AttachScene = LSR_AttachScene;
-	tmp->CanHandleStream = LSR_CanHandleStream;
-	tmp->ReleaseScene = LSR_ReleaseScene;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC LASeR Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) tmp;
-}
-
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_LASER
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_LASER
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewLSRDec();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_LASER
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteLSRDec((GF_BaseDecoder *)ifce);
-		break;
-#endif
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( laser )

gpac-0.8.0.tar.gz/modules/libplayer Deleted

gpac-0.8.0.tar.gz/modules/mediacodec_dec Deleted

gpac-0.8.0.tar.gz/modules/mediacodec_dec/Makefile Deleted

@@ -1,58 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/mediacodec_dec
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -DGPAC_HAVE_CONFIG_H -I../../
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(ENABLE_JOYSTICK), yes)
-CFLAGS+=-DENABLE_JOYSTICK
-endif
-
-ifeq ($(ENABLE_JOYSTICK_NO_CURSOR), yes)
-CFLAGS+=-DENABLE_JOYSTICK_NO_CURSOR
-endif
-
-#common obj
-OBJS= mediacodec_dec.o mediacodec_dec_jni.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_mediacodec_dec$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols raw_out.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_mediacodec_dec-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
-endif
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec.c Deleted

@@ -1,1253 +0,0 @@
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-
-#include <media/NdkMediaCodec.h>
-#include <media/NdkMediaExtractor.h>
-#include <media/NdkMediaFormat.h>
-#include "mediacodec_dec.h"
-
-typedef struct 
-{
-	AMediaCodec *codec;
-	AMediaFormat *format;
-	ANativeWindow *window;
-	char *frame, *decoder_name;
-	Bool use_gl_textures;
-	u32 dequeue_timeout;
-	u32 width, height, stride, out_size;
-	u32 pixel_ar, pix_fmt;
-	u32 crop_left, crop_right, crop_top, crop_bottom;
-	int crop_unitX, crop_unitY;
-	const char *mime;
-	u8 chroma_format, luma_bit_depth, chroma_bit_depth;
-	GF_ESD *esd;
-	Float frame_rate;
-	Bool is_adaptive;
-	Bool surface_rendering;
-	Bool frame_size_changed;
-	Bool inputEOS, outputEOS;
-	Bool raw_frame_dispatch;
-	Bool can_init_decoder;
-	MC_SurfaceTexture surfaceTex;
-	//NAL-based specific
-	GF_List *SPSs, *PPSs, *VPSs;
-	s32 active_sps, active_pps, active_vps;
-	AVCState avc;
-	HEVCState hevc;
-	u32 decoded_frames_pending;
-	Bool reconfig_needed;
-	Bool before_exit_registered;
-	u32 nalu_size_length;
-	//hevc
-	char *vps;
-	u32 luma_bpp, chroma_bpp, dec_frames;
-	u8 chroma_format_idc;
-	u16 ES_ID;
-	AMediaCodecBufferInfo info;
-	ssize_t outIndex;
-	GLuint tex_id;
-} MCDec;
-
-typedef struct {
-	char * frame;
-	MCDec * ctx;
-	ssize_t outIndex;
-	Bool flushed;
-} MC_Frame;
-
-enum {
-	PPS = 0,
-	SPS,
-	VPS,
-};
-
-#if 0
-u8 sdkInt()
-{
-    char sdk_str[3] = "0";
-    __system_property_get("ro.build.version.sdk", sdk_str, "0");
-    return atoi(sdk_str);
-}
-#endif
-
-
-//prepend the inBuffer with the start code i.e. 0x00 0x00 0x00 0x01
-void prependStartCode(char *inBuffer, char *outBuffer, u32 *size) 
-{
-    *size += 4;
-    u32 i;
-
-    for(i = 0; i < *size; i++) {
-        if(i < 3)
-            outBuffer[i] = 0x00;   
-
-        else if (i == 3) 
-            outBuffer[i] = 0x01;
-
-        else  outBuffer[i] = inBuffer[i-4];
-    }
-}
-
-
-void initMediaFormat(MCDec *ctx, AMediaFormat *format) 
-{
-    AMediaFormat_setString(ctx->format, AMEDIAFORMAT_KEY_MIME, ctx->mime);
-    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_WIDTH, ctx->width);
-    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_HEIGHT, ctx->height);
-    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_STRIDE, ctx->stride);  
-    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, ctx->width * ctx->height);
-}
-
-
-GF_Err MCDec_InitAvcDecoder(MCDec *ctx) 
-{
-	s32 idx;
-	char *dsi_data = NULL;
-	u32 dsi_data_size = 0;
-	 
-		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-			u32 i;
-			GF_AVCConfig *cfg;
-			GF_AVCConfigSlot *sps = NULL;
-			GF_AVCConfigSlot *pps = NULL;
-
-			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
-				sps = gf_list_get(ctx->SPSs, i);
-				if (ctx->active_sps<0) ctx->active_sps = sps->id;
-
-				if (sps->id==ctx->active_sps) break;
-				sps = NULL;
-			}
-			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
-			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
-				pps = gf_list_get(ctx->PPSs, i);
-				if (ctx->active_pps<0) ctx->active_pps = pps->id;
-
-				if (pps->id==ctx->active_pps) break;
-				pps = NULL;
-			}
-			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
-			ctx->reconfig_needed = GF_FALSE;
-			
-		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;
-		ctx->crop_right = ctx->avc.sps[idx].crop.right;
-		ctx->crop_top = ctx->avc.sps[idx].crop.top;
-		ctx->crop_bottom = ctx->avc.sps[idx].crop.bottom;
-		ctx->crop_left = ctx->avc.sps[idx].crop.left;
-		ctx->width +=  ctx->crop_left  + ctx->crop_right;
-		ctx->height += ctx->crop_top + ctx->crop_bottom;
-		ctx->out_size = ctx->height * ctx->width * 3/2 ;
-
-        if (ctx->avc.sps[idx].vui.par_num && ctx->avc.sps[idx].vui.par_den) {
-            ctx->pixel_ar = ctx->avc.sps[idx].vui.par_num;
-            ctx->pixel_ar <<= 16;
-            ctx->pixel_ar |= ctx->avc.sps[idx].vui.par_den;
-        }
-        ctx->chroma_format = ctx->avc.sps[idx].chroma_format;
-        ctx->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
-        ctx->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
-       switch (ctx->chroma_format) {
-        case 2:
-            if (ctx->luma_bit_depth>8) {
-                ctx->pix_fmt = GF_PIXEL_YUV422_10;
-            } else {
-                ctx->pix_fmt = GF_PIXEL_YUV422;
-            }
-            break;
-        case 3:
-            if (ctx->luma_bit_depth>8) {
-                ctx->pix_fmt = GF_PIXEL_YUV444_10;
-            } else {
-                ctx->pix_fmt = GF_PIXEL_YUV444;
-            }
-            break;
-        default:
-            if (ctx->luma_bit_depth>8) {
-                ctx->pix_fmt = GF_PIXEL_YV12_10;
-            }
-            break;
-        }
-	} 
-	ctx->frame_size_changed = GF_TRUE;
-    return GF_OK;
-}
-
-
-GF_Err MCDec_InitMpeg4Decoder(MCDec *ctx) 
-{
-    char *dsi_data = NULL;
-    u32 dsi_data_size = 0;
-
-    if (!ctx->esd->decoderConfig->decoderSpecificInfo) {
-        ctx->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-    }
-    
-    if (ctx->esd->decoderConfig->decoderSpecificInfo->data) {
-        GF_M4VDecSpecInfo vcfg;
-        GF_BitStream *bs;
-        
-        gf_m4v_get_config(ctx->esd->decoderConfig->decoderSpecificInfo->data, ctx->esd->decoderConfig->decoderSpecificInfo->dataLength, &vcfg);
-        ctx->width = vcfg.width;
-        ctx->height = vcfg.height;
-
-        if (ctx->esd->slConfig) {
-            ctx->esd->slConfig->predefined  = 2;
-        }
-
-        bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-        gf_bs_write_u32(bs, 0);
-        gf_odf_desc_write_bs((GF_Descriptor *) ctx->esd, bs);
-        gf_bs_get_content(bs, &dsi_data, &dsi_data_size);
-        gf_bs_del(bs);
-
-        ctx->mime = "video/mp4v-es";
-
-        char *esds = (char *)malloc(dsi_data_size);
-        memcpy(esds, dsi_data, dsi_data_size);
-
-        esds[0] = 0x00;
-        esds[1] = 0x00;
-        esds[2] = 0x00;
-        esds[3] = 0x01;
-       
-        AMediaFormat_setBuffer(ctx->format, "csd-0", esds, dsi_data_size);
-
-        gf_free(dsi_data);
-        return GF_OK;
-    } 
-    return GF_NOT_SUPPORTED;
-}
-
-
-GF_Err MCDec_InitHevcDecoder(MCDec *ctx) 
-{
-	s32 idx;
-	char *dsi_data = NULL;
-	u32 dsi_data_size = 0;
-	
-	if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
-		u32 i;
-		GF_HEVCConfig *cfg ;
-		GF_AVCConfigSlot *sps = NULL;
-		GF_AVCConfigSlot *pps = NULL;
-		GF_AVCConfigSlot *vps = NULL;
-		
-		for (i=0; i<gf_list_count(ctx->SPSs); i++) {
-			sps = gf_list_get(ctx->SPSs, i);
-			if (ctx->active_sps<0) ctx->active_sps = sps->id;
-
-			if (sps->id==ctx->active_sps) break;
-			sps = NULL;
-		}
-		if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
-		for (i=0; i<gf_list_count(ctx->PPSs); i++) {
-			pps = gf_list_get(ctx->PPSs, i);
-			if (ctx->active_pps<0) ctx->active_pps = pps->id;
-
-			if (pps->id==ctx->active_pps) break;
-			pps = NULL;
-		}
-		for (i=0; i<gf_list_count(ctx->VPSs); i++) {
-			vps = gf_list_get(ctx->VPSs, i);
-			if (ctx->active_vps<0) ctx->active_vps = vps->id;
-
-			if (vps->id==ctx->active_vps) break;
-			vps = NULL;
-		}
-		if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->reconfig_needed = GF_FALSE;
-		idx = ctx->active_sps;
-		ctx->width = ctx->hevc.sps[idx].width;
-		ctx->height = ctx->hevc.sps[idx].height;
-		ctx->luma_bpp = ctx->hevc.sps[idx].bit_depth_luma;
-		ctx->chroma_bpp = ctx->hevc.sps[idx].bit_depth_chroma;
-		ctx->chroma_format_idc  = ctx->hevc.sps[idx].chroma_format_idc;
-
-		ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
-		if ( ctx->chroma_format_idc  == 1) { // 4:2:0
-			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		}
-		else if ( ctx->chroma_format_idc  == 2) { // 4:2:2
-			ctx->out_size = ctx->stride * ctx->height * 2 ;
-		}
-		else if ( ctx->chroma_format_idc  == 3) { // 4:4:4
-			ctx->out_size = ctx->stride * ctx->height * 3;
-		}
-		else {
-			return GF_NOT_SUPPORTED;
-		}
-    }
-	ctx->frame_size_changed = GF_TRUE;
-    return GF_OK;
-}
-
-
-static GF_Err MCDec_InitDecoder(MCDec *ctx) {
-
-    GF_Err err;
-    ctx->format = AMediaFormat_new();
-
-    if(!ctx->format) {
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaFormat_new failed"));
-        return GF_CODEC_NOT_FOUND;
-    }
-
-    ctx->pix_fmt = GF_PIXEL_NV12;
-
-    switch (ctx->esd->decoderConfig->objectTypeIndication) {
-
-        case GPAC_OTI_VIDEO_AVC :
-            err = MCDec_InitAvcDecoder(ctx);
-            break;
-
-        case GPAC_OTI_VIDEO_MPEG4_PART2 :
-            err = MCDec_InitMpeg4Decoder(ctx);            
-            break;
-            
-        case GPAC_OTI_VIDEO_HEVC:
-            err = MCDec_InitHevcDecoder(ctx);
-            break;
-     
-        default:
-            return GF_NOT_SUPPORTED;
-    }
-
-    if(err != GF_OK){
-        return err;
-    }
-
-    ctx->frame_rate = 50.0f;
-    ctx->dequeue_timeout = 5000;
-    ctx->stride = ctx->width;
-    initMediaFormat(ctx, ctx->format);
-
-    if(!ctx->codec) {
-		ctx->decoder_name = MCDec_FindDecoder(ctx->mime, ctx->width, ctx->height, &ctx->is_adaptive);
-		if(!ctx->decoder_name) return GF_PROFILE_NOT_SUPPORTED;
-
-		ctx->codec = AMediaCodec_createCodecByName(ctx->decoder_name);
-		gf_free(ctx->decoder_name);
-		ctx->decoder_name = NULL;
-	}
-
-    if(!ctx->codec) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_createDecoderByType failed"));
-        return GF_CODEC_NOT_FOUND;
-    }
-    
-    if(!ctx->window){
-		if(MCDec_CreateSurface(ctx->tex_id, &ctx->window, &ctx->surface_rendering, &ctx->surfaceTex) != GF_OK)
-			return GF_BAD_PARAM;
-	}
-	
-	if( AMediaCodec_configure(
-        ctx->codec, // codec   
-        ctx->format, // format
-        (ctx->surface_rendering) ? ctx->window : NULL,  //surface 
-        NULL, // crypto 
-        0 // flags 
-        )     != AMEDIA_OK) 
-    {
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_configure failed"));
-        return GF_BAD_PARAM;
-    }
-
-    if( AMediaCodec_start(ctx->codec) != AMEDIA_OK){
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_start failed"));
-        return GF_BAD_PARAM;
-    } 
-	
-	ctx->inputEOS = GF_FALSE;
-    ctx->outputEOS = GF_FALSE;
-	 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("Video size: %d x %d", ctx->width, ctx->height));
-    return GF_OK;
-}
-static void MCDec_RegisterParameterSet(MCDec *ctx, char *data, u32 size, u8 xps)
-{
-	Bool add = GF_TRUE;
-	u32 i, count;
-	s32 ps_id;
-	GF_List *dest = (xps == SPS) ? ctx->SPSs : ctx->PPSs;
-
-	if (xps == SPS) {
-		ps_id = gf_media_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);
-		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);
-		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)) {
-			gf_free(a_slc->data);
-			gf_free(a_slc);
-			gf_list_rem(dest, i);
-			break;
-		}
-		else {
-			add = GF_FALSE;
-		}
-		break;
-	}
-	if (add) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
-		slc->data = gf_malloc(size);
-		memcpy(slc->data, data, size);
-		slc->size = size;
-		slc->id = ps_id;
-		gf_list_add(dest, slc);
-	
-		//force re-activation of sps/pps
-		if (xps == SPS) ctx->active_sps = -1;
-		else ctx->active_pps = -1;
-	}
-}
-
-static void MCDec_RegisterHEVCParameterSet(MCDec *ctx, char *data, u32 size, u8 xps)
-{
-	Bool add = GF_TRUE;
-	u32 i, count;
-	s32 ps_id;
-	GF_List *dest = NULL; 
-	
-	switch(xps) {
-		case SPS:
-			dest = ctx->SPSs;
-			ps_id = gf_media_hevc_read_sps(data, size, &ctx->hevc);
-			if (ps_id<0) return;
-			break;
-		case PPS:
-			dest = ctx->PPSs;
-			ps_id = gf_media_hevc_read_pps(data, size, &ctx->hevc);
-			if (ps_id<0) return;
-			break;
-		case VPS:
-			dest = ctx->VPSs;
-			ps_id = gf_media_hevc_read_vps(data, size, &ctx->hevc);
-			if (ps_id<0) return;
-			break;
-		default:
-			break;
-	}
-	
-	count = gf_list_count(dest);
-	for (i = 0; i<count; i++) {
-		GF_AVCConfigSlot *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)) {
-			gf_free(a_slc->data);
-			gf_free(a_slc);
-			gf_list_rem(dest, i);
-			break;
-		}
-		else {
-			add = GF_FALSE;
-		}
-		break;
-	}
-	if (add && dest) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
-		slc->data = gf_malloc(size);
-		memcpy(slc->data, data, size);
-		slc->size = size;
-		slc->id = ps_id;
-		gf_list_add(dest, slc);
-		
-		//force re-activation of sps/pps/vps
-		if (xps == SPS) ctx->active_sps = -1;
-		else if (xps == PPS) ctx->active_pps = -1;
-		else  ctx->active_vps = -1;
-	}
-}
-
-static GF_Err MCDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-    ctx->esd = esd;
-    GF_Err e;
-
-    if(!ctx->tex_id)
-       glGenTextures(1, &ctx->tex_id);
-
-	//check AVC config
-    if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
-	ctx->SPSs = gf_list_new();
-	ctx->PPSs = gf_list_new();
-	ctx->mime = "video/avc";
-	ctx->avc.sps_active_idx = -1;
-	ctx->active_sps = ctx->active_pps = -1;
-        if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-            ctx->width=ctx->height=128;
-            ctx->out_size = ctx->width*ctx->height*3/2;
-            ctx->pix_fmt = GF_PIXEL_NV12;
-            return GF_OK;
-        } else {
-            u32 i;
-            GF_AVCConfigSlot *slc;
-            GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-            for (i = 0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
-		     slc = gf_list_get(cfg->sequenceParameterSets, i);
-		     slc->id = -1;
-		     MCDec_RegisterParameterSet(ctx, slc->data, slc->size, SPS);
-	    }
-
-	    for (i = 0; i<gf_list_count(cfg->pictureParameterSets); i++) {
-		     slc = gf_list_get(cfg->pictureParameterSets, i);
-		     slc->id = -1;
-		     MCDec_RegisterParameterSet(ctx, slc->data, slc->size, PPS);
-	    }
-
-	    slc = gf_list_get(ctx->SPSs, 0);
-	    if (slc) ctx->active_sps = slc->id;
-
-	    slc = gf_list_get(ctx->PPSs, 0);
-	    if (slc) ctx->active_pps = slc->id;
-			
-	    ctx->nalu_size_length = cfg->nal_unit_size;
-		
-			
-	   if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-	       e = MCDec_InitDecoder(ctx);
-	       if (e) return e;
-            } else {
-		e = GF_OK;
-	    }
-	    gf_odf_avc_cfg_del(cfg);
-	    return e;
-	}
-    }
-
-    if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) {
-        if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-            ctx->width=ctx->height=128;
-            ctx->out_size = ctx->width*ctx->height*3/2;
-            ctx->pix_fmt = GF_PIXEL_NV12;
-        } else {
-            GF_M4VDecSpecInfo vcfg;            
-            gf_m4v_get_config(ctx->esd->decoderConfig->decoderSpecificInfo->data, ctx->esd->decoderConfig->decoderSpecificInfo->dataLength, &vcfg);
-            ctx->width = vcfg.width;
-            ctx->height = vcfg.height;
-            ctx->out_size = ctx->width*ctx->height*3/2;
-            ctx->pix_fmt = GF_PIXEL_NV12;
-	    return MCDec_InitDecoder(ctx);
-        }
-    }
-  
-    if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_HEVC) {
-        ctx->esd= esd;
-	ctx->SPSs = gf_list_new();
-	ctx->PPSs = gf_list_new();
-	ctx->VPSs = gf_list_new();
-	ctx->mime = "video/hevc";
-        if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-            ctx->width=ctx->height=128;
-            ctx->out_size = ctx->width*ctx->height*3/2;
-            ctx->pix_fmt = GF_PIXEL_NV12;
-	    return GF_OK;
-        } else {
-	    GF_HEVCConfig *hvcc = NULL;
-	    GF_AVCConfigSlot *sl;
-	    HEVCState hevc;
-	    u32 i,j;
-	    memset(&hevc, 0, sizeof(HEVCState));
-
-	    hvcc = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-	    if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
-	    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);
-		  for (j=0; j< gf_list_count(ar->nalus); j++) {
-			 GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)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) {
-			     sl->id = -1;
-			     MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, SPS);
-			 }
-			 else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-				  sl->id = -1;
-				  MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, VPS);
-			 }
-			 else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-				  sl->id = -1;
-				  MCDec_RegisterHEVCParameterSet(ctx, sl->data, sl->size, PPS);
-			 }
-		  }
-	    }
-	    sl = gf_list_get(ctx->SPSs, 0);
-	    if (sl) ctx->active_sps = sl->id;
-
-	    sl = gf_list_get(ctx->PPSs, 0);
-	    if (sl) ctx->active_pps = sl->id;
-			
-	    sl = gf_list_get(ctx->VPSs, 0);
-	    if (sl) ctx->active_vps = sl->id;
-			
-	    if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs) ) {
-		e = MCDec_InitDecoder(ctx);
-	    } else {
-		e = GF_OK;
-	    }
-	    gf_odf_hevc_cfg_del(hvcc);
-            return e;
-        }
-    }
-	return MCDec_InitDecoder(ctx);
-}
-
-static GF_Err MCDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-    
-    if(ctx->codec && AMediaCodec_stop(ctx->codec) != AMEDIA_OK) {
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_stop failed"));
-    }
-    
-    return GF_OK;
-}
-
-static GF_Err MCDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-    
-    switch (capability->CapCode) {
-    case GF_CODEC_RESILIENT:
-        capability->cap.valueInt = 1;                   
-        break;
-    case GF_CODEC_WIDTH:
-	capability->cap.valueInt = ctx->width;
-	break;
-    case GF_CODEC_HEIGHT:
-	capability->cap.valueInt = ctx->height;
-	break;
-    case GF_CODEC_STRIDE:
-        capability->cap.valueInt = ctx->stride;
-	break;
-    case GF_CODEC_FPS:
-        capability->cap.valueFloat = ctx->frame_rate;
-        break;
-    case GF_CODEC_PAR:
-        capability->cap.valueInt = ctx->pixel_ar;
-        break;
-    case GF_CODEC_OUTPUT_SIZE:
-	capability->cap.valueInt = ctx->out_size;
-        break;
-    case GF_CODEC_PIXEL_FORMAT:
-        capability->cap.valueInt = ctx->pix_fmt;    
-	break;
-    case GF_CODEC_BUFFER_MIN:
-        capability->cap.valueInt = 1;                   
-        break;
-    case GF_CODEC_BUFFER_MAX:
-        capability->cap.valueInt = 4;
-        break;
-    /*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
-    case GF_CODEC_PADDING_BYTES:
-        capability->cap.valueInt = 0;                   
-        break;
-    /*reorder is up to mediacodec*/
-    case GF_CODEC_REORDER:
-        capability->cap.valueInt = 1;                   
-        break;
-    case GF_CODEC_WANTS_THREAD:
-        capability->cap.valueInt = 1;
-	break;
-    case GF_CODEC_FRAME_OUTPUT:
-        capability->cap.valueInt = 1;                   
-        break;
-    case GF_CODEC_FORCE_ANNEXB:
-	capability->cap.valueInt = 1;
-	break;
-    case GF_CODEC_TRUSTED_CTS:
-	capability->cap.valueInt = 1;
-	break;
-	/*not known at our level...*/
-    case GF_CODEC_CU_DURATION:                             
-    default:
-        capability->cap.valueInt = 0;
-        break;
-    }
-    return GF_OK;
-}
-
-static GF_Err MCDec_ParseNALs(MCDec *ctx, char *inBuffer, u32 inBufferLength, char **out_buffer, u32 *out_size)
-{
-	u32 i, sc_size;
-	char *ptr = inBuffer;
-	u32 nal_size;
-	GF_Err e = GF_OK;
-	GF_BitStream *bs = NULL;
-
-	if (out_buffer) {
-		*out_buffer = NULL;
-		*out_size = 0;
-	}
-	if (!ctx->nalu_size_length) {
-		sc_size = 0;
-		nal_size = gf_media_nalu_next_start_code((u8 *)inBuffer, inBufferLength, &sc_size);
-		if (!sc_size) return GF_NON_COMPLIANT_BITSTREAM;
-		ptr += nal_size + sc_size;
-		assert(inBufferLength >= nal_size + sc_size);
-		inBufferLength -= nal_size + sc_size;
-	}
-	
-	while (inBufferLength) {
-		Bool add_nal = GF_TRUE;
-		u8 nal_type, nal_hdr;
-		GF_BitStream *nal_bs = NULL;
-		if (ctx->nalu_size_length) {
-			nal_size = 0;
-			for (i = 0; i<ctx->nalu_size_length; i++) {
-				nal_size = (nal_size << 8) + ((u8)ptr[i]);
-			}
-			ptr += ctx->nalu_size_length;
-		}
-		else {
-			nal_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
-		}
-		nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
-		nal_hdr = gf_bs_read_u8(nal_bs);
-		nal_type = nal_hdr & 0x1F;
-		switch (nal_type) {
-			case GF_AVC_NALU_SEQ_PARAM:
-				MCDec_RegisterParameterSet(ctx, ptr, nal_size, SPS);
-				add_nal = GF_FALSE;
-				break;
-			case GF_AVC_NALU_PIC_PARAM:
-				MCDec_RegisterParameterSet(ctx, ptr, nal_size, PPS);
-				add_nal = GF_FALSE;
-				break;
-			case GF_AVC_NALU_ACCESS_UNIT:
-			case GF_AVC_NALU_END_OF_SEQ:
-			case GF_AVC_NALU_END_OF_STREAM:
-			case GF_AVC_NALU_FILLER_DATA:
-				add_nal = GF_FALSE;
-				break;
-			default:
-				break;
-		}
-		gf_media_avc_parse_nalu(nal_bs, nal_hdr, &ctx->avc);
-		gf_bs_del(nal_bs);
-		if ((nal_type <= GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
-			if (ctx->avc.sps_active_idx != ctx->active_sps) {
-				ctx->reconfig_needed = 1;
-				ctx->active_sps = ctx->avc.sps_active_idx;
-				ctx->active_pps = ctx->avc.s_info.pps->id;
-				return GF_OK;
-			}
-		}
-
-		//if sps and pps are ready, init decoder
-		if (!ctx->codec && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-			ctx->reconfig_needed = 1;
-			return GF_OK;
-		}
-		if (!out_buffer) add_nal = GF_FALSE;
-		else if (add_nal && !ctx->codec) add_nal = GF_FALSE;
-		if (add_nal) {
-			if (!bs) bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, nal_size);
-			gf_bs_write_data(bs, ptr, nal_size);
-		}
-
-		ptr += nal_size;
-		if (ctx->nalu_size_length) {
-			if (inBufferLength < nal_size + ctx->nalu_size_length) break;
-			inBufferLength -= nal_size + ctx->nalu_size_length;
-		}
-		else {
-			
-			if (!sc_size || (inBufferLength < nal_size + sc_size)) break;
-			inBufferLength -= nal_size + sc_size;
-			ptr += sc_size;
-		}
-	}
-	
-	if (bs) {
-		gf_bs_get_content(bs, out_buffer, out_size);
-		gf_bs_del(bs);
-	}
-	return e;
-}
-static GF_Err MCDec_ParseHEVCNALs(MCDec *ctx, char *inBuffer, u32 inBufferLength)
-{
-	u32 i, sc_size;
-	char *ptr = inBuffer;
-	u32 nal_size;
-	GF_Err e = GF_OK;
-	GF_BitStream *bs = NULL;
-	
-	sc_size = 0;
-	nal_size = gf_media_nalu_next_start_code((u8 *)inBuffer, inBufferLength, &sc_size);
-	if (!sc_size) return GF_NON_COMPLIANT_BITSTREAM;
-	ptr += nal_size + sc_size;
-	assert(inBufferLength >= nal_size + sc_size);
-	inBufferLength -= nal_size + sc_size;
-	
-	while (inBufferLength) {
-		Bool add_nal = GF_TRUE;
-		u8 nal_type;
-		u16 nal_hdr ;
-		u8 type, quality_id, temporal_id;
-		
-		nal_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
-		gf_media_hevc_parse_nalu(ptr, nal_size, &ctx->hevc, &type, &temporal_id, &quality_id);
-		switch(type) {
-			case GF_HEVC_NALU_SEQ_PARAM:
-				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, SPS);
-				break;
-			case GF_HEVC_NALU_PIC_PARAM:
-				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, PPS);
-				break;
-			case GF_HEVC_NALU_VID_PARAM:
-				MCDec_RegisterHEVCParameterSet(ctx, ptr, nal_size, VPS);
-				break;
-			default:
-				break;
-		}
-		
-		if ((nal_type <= GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
-			if ((ctx->hevc.sps_active_idx != ctx->active_sps) || (ctx->hevc.sps[ctx->active_sps].vps_id != ctx->active_vps)) {
-				ctx->reconfig_needed = 1;
-				ctx->active_sps = ctx->hevc.sps_active_idx;
-				ctx->active_pps = ctx->hevc.s_info.pps->id;
-				ctx->active_vps = ctx->hevc.sps[ctx->active_sps].vps_id;
-				return GF_OK;
-			}
-		}
-
-		//if sps, pps and vps are ready, init decoder
-		if (!ctx->codec && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs) ) {
-			e = MCDec_InitDecoder(ctx);
-			if (e) return e;
-		}
-		
-		ptr += nal_size;
-		if (!sc_size || (inBufferLength < nal_size + sc_size)) break;
-			inBufferLength -= nal_size + sc_size;
-			ptr += sc_size;
-	}
-	
-	return e;
-}
-
-
-static GF_Err MCDec_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-	
-	switch (capability.CapCode) {
-		case GF_CODEC_FRAME_OUTPUT:
-			ctx->raw_frame_dispatch = capability.cap.valueInt ? GF_TRUE : GF_FALSE;
-			if (ctx->raw_frame_dispatch && (capability.cap.valueInt==2))
-				ctx->use_gl_textures = GF_TRUE;
-
-			return GF_OK;
-	}
-
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-
-}
-
-
-static GF_Err MCDec_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-	ctx->nalu_size_length = 0;
-	Bool mcdec_buffer_available = GF_FALSE;
-	
-	if(!ctx->before_exit_registered) {
-		ctx->before_exit_registered = GF_TRUE;
-		if (gf_register_before_exit_function(gf_th_current(), &MCDec_BeforeExit) != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Failed to register exit function for the decoder thread %p, try to continue anyway...\n", gf_th_current()));
-		}
-	}
-	if (!ctx->reconfig_needed && (!(ctx->codec && ctx->is_adaptive))) {
-		if(ctx->esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC)
-			MCDec_ParseNALs(ctx, inBuffer, inBufferLength, NULL, NULL);
-		else if(ctx->esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_HEVC)
-			MCDec_ParseHEVCNALs(ctx, inBuffer, inBufferLength);
-	}		
-	
-	if (ctx->reconfig_needed) {
-		if (ctx->raw_frame_dispatch && ctx->decoded_frames_pending) {
-			*outBufferLength = 1;
-			return GF_BUFFER_TOO_SMALL;
-		}
-		
-		if (ctx->codec) {
-			AMediaCodec_flush(ctx->codec);
-			AMediaCodec_stop(ctx->codec);
-		}
-		MCDec_InitDecoder(ctx);
-		if (ctx->out_size != *outBufferLength) {
-			*outBufferLength = ctx->out_size;
-			return GF_BUFFER_TOO_SMALL;
-		}
-	}
-	
-	if(!ctx->inputEOS) {
-		ssize_t inIndex = AMediaCodec_dequeueInputBuffer(ctx->codec,ctx->dequeue_timeout);
-		
-		if (inIndex >= 0) {
-
-            size_t inSize;
-            char *buffer = (char *)AMediaCodec_getInputBuffer(ctx->codec, inIndex, &inSize);
-
-            if (inBufferLength > inSize)  {
-                 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("The returned buffer is too small"));
-                 return GF_BUFFER_TOO_SMALL;
-            }
-			memcpy(buffer, inBuffer, inBufferLength);
-			
-            if(!inBuffer || inBufferLength == 0){
-                 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM input"));
-				 ctx->inputEOS = GF_TRUE;
-            }
-			if(AMediaCodec_queueInputBuffer(ctx->codec,
-                                    inIndex,
-                                    0, 
-                                    inBufferLength,
-                                    *CTS,
-                                    inBuffer ? 0 : AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM
-                ) != AMEDIA_OK)
-                {
-                 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_queueInputBuffer failed"));
-                return GF_BAD_PARAM;
-            }
-            mcdec_buffer_available = GF_TRUE;
-        }
-    }
-
-    if(!ctx->outputEOS) {
-		
-       
-        ctx->outIndex = AMediaCodec_dequeueOutputBuffer(ctx->codec, &ctx->info, ctx->dequeue_timeout);
-        *outBufferLength=0;
-        
-        switch(ctx->outIndex) {
-            case AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED:
-			{
-				u32 width, height, stride;
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED"));
-				ctx->format = AMediaCodec_getOutputFormat(ctx->codec);
-				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_WIDTH, &width);
-				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_HEIGHT, &height);
-				AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_STRIDE, &stride);
-				if((ctx->width != width) || (ctx->height != height) || (ctx->stride != stride)){
-					ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-					*outBufferLength = ctx->out_size;
-					ctx->frame_size_changed = GF_TRUE;
-				}
-                break;
-			}
-            case AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED:
-                GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED"));
-                break;
-
-            case AMEDIACODEC_INFO_TRY_AGAIN_LATER:
-                GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_INFO_TRY_AGAIN_LATER"));
-                break;
-
-            default:
-				if (ctx->outIndex >= 0) {
-					*CTS = ctx->info.presentationTimeUs;
-					if(ctx->info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) {
-						 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,("AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM output"));
-						ctx->outputEOS = true;
-					}
-					 
-					if(!ctx->surface_rendering) {
-						size_t outSize;
-						uint8_t * buffer = AMediaCodec_getOutputBuffer(ctx->codec, ctx->outIndex, &outSize);
-						ctx->frame = buffer + ctx->info.offset;
-						
-						if(!ctx->frame) {
-							 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_getOutputBuffer failed"));
-							*outBufferLength = 0;
-						}
-					}
-					
-					if(ctx->surface_rendering || ctx->frame) {
-						if(ctx->info.size < ctx->out_size)
-						*outBufferLength = ctx->info.size;
-						else *outBufferLength = ctx->out_size;
-					}
-				}
-			break;
-			
-			}
-
-    }
-	
-	return (mcdec_buffer_available) ? GF_OK : GF_CODEC_BUFFER_UNAVAILABLE;      
-}
-
-
-static u32 MCDec_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-    if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-
-    /*media type query*/
-    if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-    switch (esd->decoderConfig->objectTypeIndication) {
-        case GPAC_OTI_VIDEO_AVC:
-			return GF_CODEC_SUPPORTED;
-        case GPAC_OTI_VIDEO_HEVC:
-//			if(sdkInt() >= 21) {
-				return GF_CODEC_SUPPORTED;
-//			}
-			break;
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-            return GF_CODEC_SUPPORTED;
-    }
-
-    return GF_CODEC_NOT_SUPPORTED;
-}
-void MCFrame_Release(GF_MediaDecoderFrame *frame)
-{	
-	MC_Frame *f = (MC_Frame *)frame->user_data;
-	if(f->ctx->codec && !f->flushed)  {
-		if ( AMediaCodec_releaseOutputBuffer(f->ctx->codec, f->outIndex, GF_FALSE) != AMEDIA_OK) {
-			 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("NOT Release Output Buffer Index: %d", f->outIndex));
-		}
-	}
-	f->ctx->decoded_frames_pending--;
-	gf_free(f);
-	gf_free(frame);
-}
-GF_Err MCFrame_GetPlane(GF_MediaDecoderFrame *frame, u32 plane_idx, const char **outPlane, u32 *outStride)
-{
-	
-	GF_Err e;
-	MC_Frame *f = (MC_Frame *)frame->user_data;
-	int color;
-	if (! outPlane || !outStride) return GF_BAD_PARAM;
-	*outPlane = NULL;
-	*outStride = 0;
-	f->ctx->format = AMediaCodec_getOutputFormat(f->ctx->codec);
-	AMediaFormat_getInt32(f->ctx->format, AMEDIAFORMAT_KEY_STRIDE, outStride);
-	
-	switch(plane_idx) {
-		case 0 :
-			*outPlane = f->frame ;
-			break;
-		case 1 :
-			*outPlane = f->frame + *outStride * f->ctx->height ;
-			*outStride/=2;
-			break;
-		case 2: 
-			*outPlane = f->frame + 5 * *outStride * f->ctx->height/4 ;
-			*outStride/=2;
-			break;
-		default :
-			return GF_BAD_PARAM;
-			
-	}
-	
-	return GF_OK;
-}
-
-GF_Err MCFrame_GetGLTexture(GF_MediaDecoderFrame *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
-{		
-	MC_Frame *f = (MC_Frame *)frame->user_data;
-   	if (!gl_tex_format || !gl_tex_id) return GF_BAD_PARAM;
-	*gl_tex_format = GL_TEXTURE_EXTERNAL_OES;
-	*gl_tex_id = f->ctx->tex_id;
-	
-	if(!f->flushed && f->ctx->codec) {
-		if (AMediaCodec_releaseOutputBuffer(f->ctx->codec, f->outIndex, GF_TRUE) != AMEDIA_OK) {
-			 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("NOT Release Output Buffer Index: %d to surface", f->outIndex));
-			 return GF_OK;
-		}
-		if(MCFrame_UpdateTexImage(f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
-		if(MCFrame_GetTransformMatrix(texcoordmatrix, f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
-		
-		f->flushed = GF_TRUE;
-	}
-	return GF_OK;
-}
-
-GF_Err MCDec_GetOutputFrame(GF_MediaDecoder *dec, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
-{
-	GF_MediaDecoderFrame *a_frame;
-	MC_Frame *mc_frame;
-	ssize_t outSize;
-	MCDec *ctx = (MCDec *)dec->privateStack;
-
-	*needs_resize = GF_FALSE;
-	
-	if(ctx->outIndex < 0 || (!ctx->frame && !ctx->surface_rendering))  return GF_BAD_PARAM;
-	GF_SAFEALLOC(a_frame, GF_MediaDecoderFrame);
-	if (!a_frame) return GF_OUT_OF_MEM;
-	GF_SAFEALLOC(mc_frame, MC_Frame);
-	if (!mc_frame) {
-		gf_free(a_frame);
-		return GF_OUT_OF_MEM;
-	}
-	a_frame->user_data = mc_frame;
-	mc_frame->ctx = ctx;
-	mc_frame->frame = ctx->frame;
-	mc_frame->outIndex = ctx->outIndex;
-	mc_frame->flushed = GF_FALSE;
-	ctx->frame = NULL;
-	a_frame->Release = MCFrame_Release;
-	a_frame->GetPlane = MCFrame_GetPlane;
-	if (ctx->use_gl_textures)
-		a_frame->GetGLTexture = MCFrame_GetGLTexture;
-	
-	*frame = a_frame;
-	if (ctx->frame_size_changed) {
-		ctx->frame_size_changed = GF_FALSE;
-		*needs_resize = GF_TRUE;
-	}
-	ctx->decoded_frames_pending++;
-	return GF_OK;
-}
-
-static const char *MCDec_GetCodecName(GF_BaseDecoder *dec)
-{   
-    MCDec *ctx = (MCDec *) dec->privateStack;
-
-    if(!strcmp(ctx->mime, "video/avc"))
-        return "MediaCodec hardware AVC|H264";
-
-    else if(!strcmp(ctx->mime, "video/hevc"))
-        return "MediaCodec hardware HEVC|H265";
-
-    else if(!strcmp(ctx->mime, "video/mp4v-es"))
-        return "MediaCodec hardware MPEG-4 Part2";
-
-    else return "MediaCodec not supported";
-}
-
-
-GF_BaseDecoder *NewMCDec()
-{
-    GF_MediaDecoder *ifcd;
-    MCDec *dec;
-
-    GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-    if (!ifcd) return NULL;
-    GF_SAFEALLOC(dec, MCDec);
-    if (!dec) {
-        gf_free(ifcd);
-        return NULL;
-    }
-    GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "Android MediaCodec Decoder", "gpac distribution")
-
-    ifcd->privateStack = dec;
-
-    /*setup our own interface*/
-    ifcd->AttachStream = MCDec_AttachStream;
-    ifcd->DetachStream = MCDec_DetachStream;
-    ifcd->GetCapabilities = MCDec_GetCapabilities;
-    ifcd->SetCapabilities = MCDec_SetCapabilities;
-    ifcd->GetName = MCDec_GetCodecName;
-    ifcd->CanHandleStream = MCDec_CanHandleStream;
-    ifcd->ProcessData = MCDec_ProcessData;
-	ifcd->GetOutputFrame = MCDec_GetOutputFrame;
-    return (GF_BaseDecoder *) ifcd;
-}
-static void MCDec_DelParamList(GF_List *list)
-{
-	while (gf_list_count(list)) {
-		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
-		gf_free(slc->data);
-		gf_free(slc);
-		gf_list_rem(list, 0);
-	}
-	
-	gf_list_del(list);
-	
-}
-
-void DeleteMCDec(GF_BaseDecoder *ifcg)
-{
-    MCDec *ctx = (MCDec *)ifcg->privateStack;
-
-    if(ctx->format && AMediaFormat_delete(ctx->format) != AMEDIA_OK){
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaFormat_delete failed"));
-    }
-   
-    if(ctx->codec && AMediaCodec_delete(ctx->codec) != AMEDIA_OK) {
-         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC,("AMediaCodec_delete failed"));
-    }
-    
-    if(ctx->window) {
-	ANativeWindow_release(ctx->window);
-	ctx->window = NULL;
-    }
-
-    if(ctx->codec)
-	MCDec_DeleteSurface(ctx->surfaceTex);
-	
-    if(ctx->tex_id) glDeleteTextures (1, &ctx->tex_id);
-
-    MCDec_DelParamList(ctx->SPSs);
-    ctx->SPSs = NULL;
-    MCDec_DelParamList(ctx->PPSs);
-    ctx->PPSs = NULL;
-    MCDec_DelParamList(ctx->VPSs);
-    ctx->VPSs = NULL;
-
-    gf_free(ctx);
-    gf_free(ifcg);
-	
-}
-
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-    static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-        GF_MEDIA_DECODER_INTERFACE,
-#endif
-        0
-    };
-    return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-    if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewMCDec();
-#endif
-    return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-    switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-    case GF_MEDIA_DECODER_INTERFACE:
-        DeleteMCDec((GF_BaseDecoder*)ifce);
-        break;
-#endif
-    }
-}
-
-GPAC_MODULE_STATIC_DECLARATION( mc )

gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec.h Deleted

@@ -1,46 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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 _MEDIACODEC_DEC_H_
-#define _MEDIACODEC_DEC_H_
-#include <gpac/modules/codec.h>
-#include <gpac/thread.h>
-#include <jni.h>
-#include "../../src/compositor/gl_inc.h"
-
-typedef struct {
-	jobject oSurfaceTex;
-	int texture_id;
-} MC_SurfaceTexture;
-	
-GF_Err MCDec_CreateSurface (GLuint tex_id, ANativeWindow ** window, Bool * surface_rendering, MC_SurfaceTexture * surfaceTex);
-GF_Err MCFrame_UpdateTexImage(MC_SurfaceTexture surfaceTex);
-GF_Err MCFrame_GetTransformMatrix(GF_CodecMatrix * mx, MC_SurfaceTexture surfaceTex);
-GF_Err MCDec_DeleteSurface(MC_SurfaceTexture surfaceTex);
-char * MCDec_FindDecoder(const char * mime, u32 width, u32 height,  Bool * is_adaptive);
-u32 MCDec_BeforeExit(void * param);
-
-#endif //_MEDIACODEC_DEC_H_
-

gpac-0.8.0.tar.gz/modules/mediacodec_dec/mediacodec_dec_jni.c Deleted

@@ -1,407 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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/tools.h>
-#include <gpac/constants.h>
-// for native window JNI
-#include <android/native_window_jni.h>
-#include <android/asset_manager.h>
-#include <android/asset_manager_jni.h>
-#include "mediacodec_dec.h"
-#define RANDOM_JAVA_APP_CLASS "com/gpac/Osmo4/GPACInstance"
-#define ALL_CODECS 1
-
-static jclass cSurfaceTexture = NULL;
-static jclass cSurface = NULL;
-static jclass cMediaCodecList = NULL;
-static jclass cMediaFormat = NULL;
-static jmethodID mUpdateTexImage;
-static jmethodID mSurfaceTexConstructor;
-static jmethodID mSurfaceConstructor;
-static jmethodID mSurfaceRelease;
-static jmethodID mGetTransformMatrix;
-static jmethodID mFindClassMethod;
-static jmethodID mMediaCodecListConstructor;
-static jmethodID mFindDecoderForFormat;
-static jmethodID mCreateVideoFormat;
-static jmethodID mSetFeatureEnabled;
-static jobject oClassLoader = NULL;
-static JavaVM* javaVM = 0;
-
-static void HandleJNIError(JNIEnv *env)
-{
-	(*env)->ExceptionDescribe(env);
-	(*env)->ExceptionClear(env);
-}
-static jclass FindAppClass(JNIEnv* env, const char* name)
-{
-
-	return (jclass)((*env)->CallObjectMethod(env, oClassLoader, mFindClassMethod, (*env)->NewStringUTF(env, name)));
-}
-
-static GF_Err CacheAppClassLoader(JNIEnv* env, const char* name)
-{
-	GF_Err ret = GF_BAD_PARAM;
-	jclass randomClass = (*env)->FindClass(env, name);
-	if (!randomClass) goto cache_calassloader_failed;
-	jclass classClass = (*env)->GetObjectClass(env, randomClass);
-	if (!classClass) goto cache_calassloader_failed;
-    	jclass classLoaderClass = (*env)->FindClass(env, "java/lang/ClassLoader");
-	if (!classLoaderClass) goto cache_calassloader_failed;
-    	jmethodID getClassLoaderMethod = (*env)->GetMethodID(env, classClass, "getClassLoader", "()Ljava/lang/ClassLoader;");
-	if (!getClassLoaderMethod) goto cache_calassloader_failed;
-	oClassLoader = (jobject) (*env)->NewGlobalRef(env,(*env)->CallObjectMethod(env,randomClass, getClassLoaderMethod));
-	if(!oClassLoader) goto cache_calassloader_failed;
-    	mFindClassMethod = (*env)->GetMethodID(env, classLoaderClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
-	if(!mFindClassMethod) goto cache_calassloader_failed;
-	ret = GF_OK;
-
-cache_calassloader_failed:
-	if(randomClass)
-		 (*env)->DeleteLocalRef(env, randomClass);
-	 if(classClass)
-		 (*env)->DeleteLocalRef(env, classClass);
-	 if(classLoaderClass)
-		 (*env)->DeleteLocalRef(env, classLoaderClass);
-	return ret;
-}
-
-jint JNI_OnLoad(JavaVM* vm, void* reserved)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-	javaVM = vm;
-	
-	if ((*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("GetEnv failed"));
-		return GF_BAD_PARAM;
-	}
-	return JNI_VERSION_1_2;
-}
-
-JNIEnv* GetEnv()
-{
-	JNIEnv* env = 0;
-	if (javaVM) (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
-	return env;
-}
-
-JavaVM* GetJavaVM()
-{
-	return javaVM;
-}
-
-u32 MCDec_BeforeExit(void * param) {
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC,(" [Android Mediacodec decoder] Detach decoder thread %p...\n", gf_th_current()));
-	(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
-	
-	return GF_OK;
-}
-
-GF_Err MCDec_CreateSurface (GLuint tex_id, ANativeWindow ** window, Bool * surface_rendering, MC_SurfaceTexture * surfaceTex)
-{
-	JNIEnv* env = NULL;
-	jobject otmp= NULL;
-	jclass ctmp = NULL;
-	jint res = 0;
-	jobject oSurface = NULL;
-	GF_Err ret = GF_BAD_PARAM;
-	u32 gl_tex_id;
-	
-	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
-	}
-	if (!env) goto create_surface_failed;
-	
-	// cache classes
-	if (!cSurfaceTexture) {
-		ctmp = (*env)->FindClass(env, "android/graphics/SurfaceTexture");
-		cSurfaceTexture = (*env)->NewGlobalRef(env, ctmp);
-		if(!cSurfaceTexture) goto create_surface_failed;
-	}
-	if (!cSurface) {
-		ctmp = (*env)->FindClass(env, "android/view/Surface");
-		cSurface = (*env)->NewGlobalRef(env, ctmp);
-		if (!cSurface) goto create_surface_failed;
-	}
-	
-	// cache methods
-	if(!mSurfaceTexConstructor) {
-		mSurfaceTexConstructor = (*env)->GetMethodID(env, cSurfaceTexture, "<init>", "(I)V");
-		if(!mSurfaceTexConstructor) goto create_surface_failed;
-	}
-	if(!mSurfaceConstructor) {
-		mSurfaceConstructor = (*env)->GetMethodID(env, cSurface, "<init>", "(Landroid/graphics/SurfaceTexture;)V");
-		if(!mSurfaceConstructor) goto create_surface_failed;
-	}
-	if(!mSurfaceRelease) {
-		mSurfaceRelease = (*env)->GetMethodID(env, cSurface, "release", "()V");
-		if(!mSurfaceRelease) goto create_surface_failed;
-	}
-	if(!mUpdateTexImage) {
-		mUpdateTexImage = (*env)->GetMethodID(env, cSurfaceTexture, "updateTexImage", "()V");
-		if(!mUpdateTexImage) goto create_surface_failed;
-	}
-	if(!mGetTransformMatrix) {
-		mGetTransformMatrix = (*env)->GetMethodID(env, cSurfaceTexture, "getTransformMatrix", "([F)V");
-		if(!mGetTransformMatrix) goto create_surface_failed;
-	}
-	
-	surfaceTex->texture_id = tex_id;
-	// create objects
-	otmp = (*env)->NewObject(env, cSurfaceTexture, mSurfaceTexConstructor, surfaceTex->texture_id);
-	surfaceTex->oSurfaceTex = (jobject) (*env)->NewGlobalRef(env,otmp);
-	if(!surfaceTex->oSurfaceTex) goto create_surface_failed;
-	
-	oSurface = (*env)->NewObject(env, cSurface, mSurfaceConstructor, surfaceTex->oSurfaceTex);
-	if(!oSurface) goto create_surface_failed;
-	
-	*window = ANativeWindow_fromSurface(env, oSurface);
-	*surface_rendering = (*window) ? GF_TRUE : GF_FALSE;
-	(*env)->CallVoidMethod(env, oSurface, mSurfaceRelease);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-	}
-	ret = GF_OK;
-	
-create_surface_failed:
-	if(otmp)
-		 (*env)->DeleteLocalRef(env, otmp);
-	 if(ctmp)
-		 (*env)->DeleteLocalRef(env, ctmp);
-	 if(oSurface)
-		 (*env)->DeleteLocalRef(env, oSurface);
-	 
-	 return ret;
-}
-
-static char * MCDec_GetDecoderName(JNIEnv * env, jobject mediaCodecList, jmethodID findId, jobject mediaFomat)
-{
-	jint res = 0;
-	jstring jdecoder_name;
-	char * decoder_name = NULL;
-
-	jdecoder_name = (*env)->CallObjectMethod(env, mediaCodecList, findId, mediaFomat);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto get_decoder_exit;
-	}
-	if(jdecoder_name) {
-		const char *decoder_name_tmp;
-		decoder_name_tmp = (*env)->GetStringUTFChars(env, jdecoder_name, 0);
-		decoder_name = gf_strdup(decoder_name_tmp);
-		(*env)->ReleaseStringUTFChars(env, jdecoder_name, decoder_name_tmp);
-	}
-
-get_decoder_exit:
-	if(jdecoder_name)
-		(*env)->DeleteLocalRef(env, jdecoder_name);
-
-	return decoder_name;
-}
-
-char * MCDec_FindDecoder(const char * mime, u32 width, u32 height,  Bool * is_adaptive)
-{
-	JNIEnv* env = NULL;
-	jobject oMediaCodecList = NULL, oMediaFormat = NULL;
-	jclass ctmp = NULL;
-	jint res = 0;
-	jstring jmime, jfeature;
-	char *decoder_name = NULL, *decoder_name_tmp;
-
-
-	if(!mime || !is_adaptive) goto find_decoder_exit;
-
-	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
-	}
-	if (!env) goto find_decoder_exit;
-
-	// cache classes
-	if (!cMediaCodecList) {
-		ctmp = (*env)->FindClass(env, "android/media/MediaCodecList");
-		cMediaCodecList = (*env)->NewGlobalRef(env, ctmp);
-		if(!cMediaCodecList) goto find_decoder_exit;
-	}
-	if (!cMediaFormat) {
-		ctmp = (*env)->FindClass(env, "android/media/MediaFormat");
-		cMediaFormat = (*env)->NewGlobalRef(env, ctmp);
-		if(!cMediaFormat) goto find_decoder_exit;
-	}
-
-	//methods
-	if(!mMediaCodecListConstructor) {
-		mMediaCodecListConstructor = (*env)->GetMethodID(env, cMediaCodecList, "<init>", "(I)V");
-		if(!mMediaCodecListConstructor) goto find_decoder_exit;
-	}
-	if(!mFindDecoderForFormat) {
-		mFindDecoderForFormat = (*env)->GetMethodID(env, cMediaCodecList, "findDecoderForFormat", "(Landroid/media/MediaFormat;)Ljava/lang/String;");
-		if(!mFindDecoderForFormat) goto find_decoder_exit;
-	}
-	if(!mCreateVideoFormat) {
-		mCreateVideoFormat = (*env)->GetStaticMethodID(env, cMediaFormat, "createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;");
-		if(!mCreateVideoFormat) goto find_decoder_exit;
-	}
-	if(!mSetFeatureEnabled ) {
-		mSetFeatureEnabled = (*env)->GetMethodID(env, cMediaFormat, "setFeatureEnabled", "(Ljava/lang/String;Z)V");
-		if(!mSetFeatureEnabled) goto find_decoder_exit;
-	}
-	oMediaCodecList = (*env)->NewObject(env, cMediaCodecList, mMediaCodecListConstructor, ALL_CODECS);
-	if(!oMediaCodecList) goto find_decoder_exit;
-
-	jmime = (*env)->NewStringUTF(env, mime);
-	oMediaFormat = (*env)->CallStaticObjectMethod(env, cMediaFormat, mCreateVideoFormat, jmime, width, height);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto find_decoder_exit;
-	}
-	decoder_name_tmp = MCDec_GetDecoderName(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
-	if(!decoder_name_tmp) goto find_decoder_exit;
-
-	jfeature = (*env)->NewStringUTF(env, "adaptive-playback");
-	(*env)->CallVoidMethod(env, oMediaFormat, mSetFeatureEnabled, jfeature, JNI_TRUE);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto find_decoder_exit;
-	}
-	decoder_name = MCDec_GetDecoderName(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
-	if(decoder_name){
-		*is_adaptive = GF_TRUE;
-		gf_free(decoder_name_tmp);
-		decoder_name_tmp = NULL;
-	} else {
-		*is_adaptive = GF_FALSE;
-		decoder_name = decoder_name_tmp;
-	}
-
-find_decoder_exit:
-	if(ctmp)
-		(*env)->DeleteLocalRef(env, ctmp);
-	if(oMediaCodecList)
-		(*env)->DeleteLocalRef(env, oMediaCodecList);
-	if(oMediaFormat)
-		(*env)->DeleteLocalRef(env, oMediaFormat);
-	if(jmime)
-		(*env)->DeleteLocalRef(env, jmime);
-	if(jfeature)
-		(*env)->DeleteLocalRef(env, jfeature);
-
-	return decoder_name;
-
-}
-
-GF_Err MCFrame_UpdateTexImage(MC_SurfaceTexture surfaceTex)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
-	}
-	if (!env) return GF_BAD_PARAM;
-	
-	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mUpdateTexImage);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		return GF_BAD_PARAM;
-	}
-	return GF_OK;
-}
-
-GF_Err MCFrame_GetTransformMatrix(GF_CodecMatrix * mx, MC_SurfaceTexture surfaceTex)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-	int i =0;
-	jfloatArray texMx;
-	jsize len = 0;
-	jfloat *body;
-	GF_Err ret = GF_BAD_PARAM;
-	
-	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
-	}
-	if (!env) goto get_matrix_failed;
-	
-	texMx = (*env)->NewFloatArray(env, 16);
-	if (texMx == NULL) goto get_matrix_failed;
-	
-	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mGetTransformMatrix,texMx);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto get_matrix_failed;
-	}
-	len = (*env)->GetArrayLength(env, texMx);
-	body = (*env)->GetFloatArrayElements(env, texMx, 0);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto get_matrix_failed;
-	}
-	for (i=0; i<len; i++) {
-		mx->m[i] = FLT2FIX(body[i]);
-	}
-	
-	(*env)->ReleaseFloatArrayElements(env, texMx, body, 0);
-	if ((*env)->ExceptionCheck(env)) {
-		HandleJNIError(env);
-		goto get_matrix_failed;
-	}
-	ret = GF_OK;
-	
-get_matrix_failed:
-	if(texMx)
-		(*env)->DeleteLocalRef(env, texMx);
-	return ret;
-}
-
-GF_Err MCDec_DeleteSurface(MC_SurfaceTexture  surfaceTex)
-{
-	JNIEnv* env = NULL;
-	jint res = 0;
-	
-	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
-	if ( res == JNI_EDETACHED ) {
-		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
-	} 
-	if (!env) return GF_BAD_PARAM;
-	
-	(*env)->DeleteGlobalRef(env, cSurface);
-	cSurface = NULL;
-	(*env)->DeleteGlobalRef(env, cSurfaceTexture);
-	cSurfaceTexture = NULL;
-	(*env)->DeleteGlobalRef(env, cMediaCodecList);
-	cMediaCodecList = NULL;
-	(*env)->DeleteGlobalRef(env, cMediaFormat);
-	cMediaFormat = NULL;
-	(*env)->DeleteGlobalRef(env, surfaceTex.oSurfaceTex);
-	surfaceTex.oSurfaceTex = NULL;
-	
-	return GF_OK;
-}
-

gpac-0.8.0.tar.gz/modules/mp3_in Deleted

gpac-0.8.0.tar.gz/modules/mp3_in/Makefile Deleted

@@ -1,65 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/mp3_in
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS= mp3_in.o
-
-
-
-#mad config
-ifeq ($(CONFIG_MAD), no)
-else
-OBJS+=mad_dec.o
-CFLAGS+=-DGPAC_HAS_MAD
-#local mad lib
-ifeq ($(CONFIG_MAD), local)
-EXTRALIBS+=-L../../extra_lib/lib/gcc
-CFLAGS+= -I"$(LOCAL_INC_PATH)/mad"
-endif
-EXTRALIBS+= -lmad
-endif
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_mp3_in$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols mp3_in.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_mp3_in-static$(DYN_LIB_SUFFIX) $(OBJS) -L../../bin/gcc -lgpac_static $(EXTRALIBS)  $(LDFLAGS)
-endif
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/mp3_in/mad_dec.c Deleted

@@ -1,374 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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/setup.h>
-
-#ifdef GPAC_HAS_MAD
-
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-
-#if defined(_WIN32_WCE) || defined(_WIN64) || defined(__SYMBIAN32__)
-#ifndef FPM_DEFAULT
-#define FPM_DEFAULT
-#endif
-#endif
-
-#include <mad.h>
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE) || defined (WIN32)
-#  pragma comment(lib, "libmad")
-# endif
-#endif
-
-
-typedef struct
-{
-	Bool configured;
-
-	u32 sample_rate, out_size, num_samples;
-	u8 num_channels;
-	/*no support for scalability in FAAD yet*/
-	u16 ES_ID;
-	u32 cb_size, cb_trig;
-
-	unsigned char *buffer;
-	u32 len;
-	Bool first;
-
-
-	struct mad_frame frame;
-	struct mad_stream stream;
-	struct mad_synth synth;
-
-} MADDec;
-
-#define MADCTX() MADDec *ctx = NULL; if (ifcg) { ctx = (MADDec *) ifcg->privateStack; }
-
-static GF_Err MAD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	MADCTX();
-	assert( ctx );
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-
-	if (ctx->configured) {
-		mad_stream_finish(&ctx->stream);
-		mad_frame_finish(&ctx->frame);
-		mad_synth_finish(&ctx->synth);
-	}
-	mad_stream_init(&ctx->stream);
-	mad_frame_init(&ctx->frame);
-	mad_synth_init(&ctx->synth);
-	ctx->configured = GF_TRUE;
-
-	ctx->buffer = (unsigned char*)gf_malloc(sizeof(char) * 2*MAD_BUFFER_MDLEN);
-
-	/*we need a frame to init, so use default values*/
-	ctx->num_samples = 1152;
-	ctx->num_channels = 0;
-	ctx->sample_rate = 0;
-	ctx->out_size = 2 * ctx->num_samples * ctx->num_channels;
-	ctx->ES_ID = esd->ESID;
-	ctx->first = GF_TRUE;
-	return GF_OK;
-}
-
-static GF_Err MAD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	MADCTX();
-	assert( ctx );
-	if (ES_ID != ctx->ES_ID) return GF_BAD_PARAM;
-	assert( ifcg );
-	assert( ctx );
-	ctx->ES_ID = 0;
-	if (ctx->buffer) gf_free(ctx->buffer);
-	ctx->buffer = NULL;
-	ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-	ctx->num_channels = 0;
-	if (ctx->configured) {
-		mad_stream_finish(&ctx->stream);
-		mad_frame_finish(&ctx->frame);
-		mad_synth_finish(&ctx->synth);
-	}
-	ctx->configured = GF_FALSE;
-	return GF_OK;
-}
-static GF_Err MAD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	MADCTX();
-	assert( ctx );
-	switch (capability->CapCode) {
-	/*not tested yet*/
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ctx->sample_rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ctx->num_channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = ctx->cb_trig;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = ctx->cb_size;
-		break;
-	/*FIXME: get exact sampling window*/
-	case GF_CODEC_CU_DURATION:
-		capability->cap.valueInt = ctx->num_samples;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		if (ctx->num_channels==1) {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-		} else {
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-		}
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err MAD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	MADCTX();
-	assert( ctx );
-	switch (capability.CapCode) {
-	/*reset storage buffer*/
-	case GF_CODEC_WAIT_RAP:
-		ctx->first = GF_TRUE;
-		ctx->len = 0;
-		if (ctx->configured) {
-			mad_stream_finish(&ctx->stream);
-			mad_frame_finish(&ctx->frame);
-			mad_synth_finish(&ctx->synth);
-
-			mad_stream_finish(&ctx->stream);
-			mad_frame_finish(&ctx->frame);
-			mad_synth_finish(&ctx->synth);
-		}
-		return GF_OK;
-	default:
-		/*return unsupported to avoid confusion by the player (like SR changing ...) */
-		return GF_NOT_SUPPORTED;
-	}
-}
-
-/*from miniMad.c*/
-#define MAD_SCALE(ret, s_chan)	\
-	chan = s_chan;				\
-	chan += (1L << (MAD_F_FRACBITS - 16));		\
-	if (chan >= MAD_F_ONE)					\
-		chan = MAD_F_ONE - 1;					\
-	else if (chan < -MAD_F_ONE)				\
-		chan = -MAD_F_ONE;				\
-	ret = chan >> (MAD_F_FRACBITS + 1 - 16);		\
- 
-static GF_Err MAD_ProcessData(GF_MediaDecoder *ifcg,
-                              char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 *CTS,
-                              char *outBuffer, u32 *outBufferLength,
-                              u8 PaddingBits, u32 mmlevel)
-{
-	mad_fixed_t *left_ch, *right_ch, chan;
-	char *ptr;
-	u32 num, outSize;
-	MADCTX();
-	assert( ctx );
-
-	/*check not using scalabilty*/
-	assert(ctx->ES_ID == ES_ID);
-
-	/*if late or seeking don't decode*/
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-
-	if (ctx->out_size > *outBufferLength) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	if (ctx->first) {
-		ctx->first = GF_FALSE;
-		memcpy(ctx->buffer, inBuffer, inBufferLength);
-		ctx->len = inBufferLength;
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	memcpy(ctx->buffer + ctx->len, inBuffer, inBufferLength);
-	ctx->len += inBufferLength;
-	mad_stream_buffer(&ctx->stream, ctx->buffer, ctx->len);
-
-	if (mad_frame_decode(&ctx->frame, &ctx->stream) == -1) {
-		memcpy(ctx->buffer, inBuffer, inBufferLength);
-		ctx->len = inBufferLength;
-		*outBufferLength = 0;
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-
-	/*first cfg, reconfig composition buffer*/
-	if (!ctx->sample_rate) {
-		mad_synth_frame(&ctx->synth, &ctx->frame);
-		ctx->len -= inBufferLength;
-		ctx->sample_rate = ctx->synth.pcm.samplerate;
-		ctx->num_channels = (u8) ctx->synth.pcm.channels;
-		ctx->num_samples = ctx->synth.pcm.length;
-		ctx->out_size = 2 * ctx->num_samples * ctx->num_channels;
-		*outBufferLength = ctx->out_size;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[MAD] decoder initialized - MP3 sample rate %d - %d channel(s)", ctx->sample_rate, ctx->num_channels));
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	if (ctx->stream.next_frame) {
-		ctx->len = (u32) (&ctx->buffer[ctx->len] - ctx->stream.next_frame);
-		memmove(ctx->buffer, ctx->stream.next_frame, ctx->len);
-	}
-
-
-	mad_synth_frame(&ctx->synth, &ctx->frame);
-	num = ctx->synth.pcm.length;
-	ptr = (char *) outBuffer;
-	left_ch = ctx->synth.pcm.samples[0];
-	right_ch = ctx->synth.pcm.samples[1];
-	outSize = 0;
-
-	while (num--) {
-		s32 rs;
-		MAD_SCALE(rs, (*left_ch++) );
-
-		*ptr = (rs >> 0) & 0xff;
-		ptr++;
-		*ptr = (rs >> 8) & 0xff;
-		ptr++;
-		outSize += 2;
-
-		if (ctx->num_channels == 2) {
-			MAD_SCALE(rs, (*right_ch++) );
-			*ptr = (rs >> 0) & 0xff;
-			ptr++;
-			*ptr = (rs >> 8) & 0xff;
-			ptr++;
-			outSize += 2;
-		}
-	}
-	*outBufferLength = outSize;
-	return GF_OK;
-}
-
-static const char *MAD_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "MAD " \
-	       MAD_VERSION;
-}
-
-static u32 MAD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	/*audio decs*/
-	if (StreamType != GF_STREAM_AUDIO) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	/*MPEG1 audio*/
-	case GPAC_OTI_AUDIO_MPEG2_PART3:
-	/*MPEG2 audio*/
-	case GPAC_OTI_AUDIO_MPEG1:
-		return GF_CODEC_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-GF_BaseDecoder *NewMADDec()
-{
-	GF_MediaDecoder *ifce;
-	MADDec *dec;
-
-	GF_SAFEALLOC(ifce, GF_MediaDecoder);
-	if (!ifce) return NULL;
-	GF_SAFEALLOC(dec, MADDec);
-	if (!dec) {
-		gf_free(ifce);
-		return NULL;
-	}
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "MAD Decoder", "gpac distribution")
-	ifce->privateStack = dec;
-
-	dec->cb_size = 12;
-	dec->cb_trig = 4;
-
-	/*setup our own interface*/
-	ifce->AttachStream = MAD_AttachStream;
-	ifce->DetachStream = MAD_DetachStream;
-	ifce->GetCapabilities = MAD_GetCapabilities;
-	ifce->SetCapabilities = MAD_SetCapabilities;
-	ifce->GetName = MAD_GetCodecName;
-	ifce->ProcessData = MAD_ProcessData;
-	ifce->CanHandleStream = MAD_CanHandleStream;
-	return (GF_BaseDecoder *)ifce;
-}
-
-void DeleteMADDec(GF_MediaDecoder *ifcg)
-{
-	MADDec *ctx;
-	if (!ifcg)
-		return;
-	ctx = (MADDec *) ifcg->privateStack;
-	ifcg->privateStack = NULL;
-	if (ctx) {
-		if (ctx->configured) {
-			mad_stream_finish(&ctx->stream);
-			mad_frame_finish(&ctx->frame);
-			mad_synth_finish(&ctx->synth);
-		}
-		ctx->configured = GF_FALSE;
-		ctx->sample_rate = ctx->out_size = ctx->num_samples = 0;
-		ctx->num_channels = 0;
-		gf_free(ctx);
-	}
-	gf_free(ifcg);
-}
-
-#endif
-

gpac-0.8.0.tar.gz/modules/mp3_in/mp3_in.c Deleted

@@ -1,781 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / MP3 reader module
- *
- *  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/modules/service.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/modules/codec.h>
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-	GF_ClientService *service;
-
-	u32 needs_connection;
-	Bool is_remote;
-
-	FILE *stream;
-	u32 duration;
-
-	u32 pad_bytes;
-	Bool done;
-	LPNETCHANNEL ch;
-
-	char *data;
-	u32 data_size;
-
-	GF_SLHeader sl_hdr;
-
-	Bool is_inline;
-
-	u32 sample_rate, oti;
-	Double start_range, end_range;
-	u32 current_time, nb_samp;
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-
-	Bool is_live;
-	char * liveDataCopy;
-	u32 liveDataCopySize;
-	char prev_data[1000];
-	u32 prev_size;
-
-
-	char *icy_name;
-	char *icy_genre;
-	char *icy_track_name;
-} MP3Reader;
-
-
-static const char * MP3_MIME_TYPES[] = { "audio/mpeg", "audio/x-mpeg", "audio/mp3", NULL};
-
-static const char * MP3_EXTENSIONS = "mp2 mp3 mpga mpega";
-
-static const char * MP3_DESC = "MP3 Music";
-
-
-static u32 MP3_RegisterMimeTypes(const GF_InputService *plug)
-{
-	u32 i;
-	for (i =0 ; MP3_MIME_TYPES[i] ; i++)
-		gf_service_register_mime(plug, MP3_MIME_TYPES[i], MP3_EXTENSIONS, MP3_DESC);
-	return i;
-}
-
-static Bool MP3_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
-	{
-		u32 i;
-		for (i =0 ; MP3_MIME_TYPES[i] ; i++)
-			if (gf_service_check_mime_register(plug, MP3_MIME_TYPES[i], MP3_EXTENSIONS, MP3_DESC, sExt))
-				return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool mp3_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-
-static GF_ESD *MP3_GetESD(MP3Reader *read)
-{
-	GF_ESD *esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = read->sample_rate;
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = read->oti;
-	esd->ESID = 1;
-	return esd;
-}
-
-static void mp3_setup_object(MP3Reader *read)
-{
-	if (read->is_inline) {
-		GF_ESD *esd;
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		od->objectDescriptorID = 1;
-		esd = MP3_GetESD(read);
-		gf_list_add(od->ESDescriptors, esd);
-		gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
-	}
-}
-
-/**
- * Returns TRUE if file is ready to be read, FALSE otherwise
- * @param read Reader
- * @param minSizeToRead How much bytes do we need to start reading at minimum
- */
-static Bool MP3_ConfigureFromFile(MP3Reader *read, u32 *minSizeToRead)
-{
-	unsigned char id3v2[10];
-	u32 hdr, size;
-	u64 pos;
-	if (!read->stream) return GF_FALSE;
-	/* ID3VVFFFFSIZE = 13bytes
-	     * ID3 string
-	 * VV = Version
-	     * F = Flags
-	     * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
-	 * Size starts AFTER this header, meaning we have to add 10 bytes
-	 */
-	pos = fread(id3v2, sizeof(unsigned char), 10, read->stream);
-	*minSizeToRead = 0;
-	if (pos == 10) {
-		/* Did we read an ID3v2 ? */
-		if (id3v2[0] == 'I' && id3v2[1] == 'D' && id3v2[2] == '3') {
-			int sz = 10 + ((id3v2[9] & 0x7f) + ((id3v2[8] & 0x7f) << 7) + ((id3v2[7] & 0x7f) << 14) + ((id3v2[6] & 0x7f) << 21));
-			//printf("Size of id3v2 header = %d\n", sz);
-			*minSizeToRead = sz;
-		}
-	}
-	gf_fseek(read->stream, 0, SEEK_SET);
-	hdr = gf_mp3_get_next_header(read->stream);
-	if (!hdr) return GF_FALSE;
-	read->sample_rate = gf_mp3_sampling_rate(hdr);
-	read->oti = gf_mp3_object_type_indication(hdr);
-	gf_fseek(read->stream, 0, SEEK_SET);
-	if (!read->oti) return GF_FALSE;
-
-	/*we don't have the full file...*/
-	if (read->is_remote) return	GF_TRUE;
-
-//	return 1;
-
-	gf_fseek(read->stream, 0, SEEK_SET);
-	read->duration = 0;
-	while (1) {
-		hdr = gf_mp3_get_next_header(read->stream);
-		if (!hdr) break;
-		read->duration += gf_mp3_window_size(hdr);
-		size = gf_mp3_frame_size(hdr);
-		pos = gf_ftell(read->stream);
-		gf_fseek(read->stream, pos + size - 4, SEEK_SET);
-	}
-	gf_fseek(read->stream, 0, SEEK_SET);
-	return GF_TRUE;
-}
-
-static void MP3_RegulateDataRate(MP3Reader *read)
-{
-	GF_NetworkCommand com;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-	com.base.on_channel = read->ch;
-	while (read->ch) {
-		gf_service_command(read->service, &com, GF_OK);
-		if (com.buffer.occupancy < com.buffer.max) break;
-		gf_sleep(2);
-	}
-}
-
-static void MP3_OnLiveData(MP3Reader *read, char *data, u32 data_size)
-{
-	u32 hdr, size, pos;
-
-	if (read->needs_connection) {
-		hdr = gf_mp3_get_next_header_mem(data, data_size, &pos);
-		if (!hdr) return;
-
-		read->sample_rate = gf_mp3_sampling_rate(hdr);
-		read->oti = gf_mp3_object_type_indication(hdr);
-		read->is_live = GF_TRUE;
-		memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-
-		read->needs_connection = 0;
-		gf_service_connect_ack(read->service, NULL, GF_OK);
-		mp3_setup_object(read);
-	}
-	if (!data_size) return;
-
-	read->data = (char*)gf_realloc(read->data, sizeof(char)*(read->data_size+data_size) );
-	memcpy(read->data + read->data_size, data, sizeof(char)*data_size);
-	read->data_size += data_size;
-	if (!read->ch) return;
-
-
-	data = read->data;
-	data_size = read->data_size;
-
-	while (1) {
-		hdr = gf_mp3_get_next_header_mem(data, data_size, &pos);
-
-		if (hdr) size = gf_mp3_frame_size(hdr);
-
-		/*not enough data, copy over*/
-		if (!hdr || (pos+size>data_size)) {
-			char *d = (char*)gf_malloc(sizeof(char) * data_size);
-			memcpy(d, data, sizeof(char) * data_size);
-			gf_free(read->data);
-			read->data = d;
-			read->data_size = data_size;
-
-			MP3_RegulateDataRate(read);
-			return;
-		}
-
-		read->sl_hdr.accessUnitStartFlag = 1;
-		read->sl_hdr.accessUnitEndFlag = 1;
-		read->sl_hdr.AU_sequenceNumber++;
-		read->sl_hdr.compositionTimeStampFlag = 1;
-		read->sl_hdr.compositionTimeStamp += gf_mp3_window_size(hdr);
-		gf_service_send_packet(read->service, read->ch, data + pos, size, &read->sl_hdr, GF_OK);
-		data += pos + size;
-		assert(data_size>=pos+size);
-		data_size -= pos+size;
-	}
-}
-
-void MP3_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	u32 total_size, bytes_done;
-	MP3Reader *read = (MP3Reader *) cbk;
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		if (read->stream) {
-			read->is_remote = GF_FALSE;
-			e = GF_EOS;
-		} else {
-			return;
-		}
-	}
-	else if (param->msg_type==GF_NETIO_PARSE_HEADER) {
-		if (!strcmp(param->name, "icy-name")) {
-			if (read->icy_name) gf_free(read->icy_name);
-			read->icy_name = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-genre")) {
-			if (read->icy_genre) gf_free(read->icy_genre);
-			read->icy_genre = gf_strdup(param->value);
-		}
-		if (!strcmp(param->name, "icy-meta")) {
-			GF_NetworkCommand com;
-			char *meta;
-			meta = param->value;
-			while (meta && meta[0]) {
-				char *sep = strchr(meta, ';');
-				if (sep) sep[0] = 0;
-
-				if (!strnicmp(meta, "StreamTitle=", 12)) {
-					if (read->icy_track_name) gf_free(read->icy_track_name);
-					read->icy_track_name = NULL;
-					read->icy_track_name = gf_strdup(meta+12);
-					if (!strcmp(read->icy_track_name, "''")) {
-						/* On some servers, '' means not track name */
-						gf_free(read->icy_track_name);
-						read->icy_track_name = NULL;
-					}
-				}
-				if (!sep) break;
-				sep[0] = ';';
-				meta = sep+1;
-			}
-
-			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_service_command(read->service, &com, GF_OK);
-		}
-		return;
-	} else {
-		/*handle service message*/
-		gf_service_download_update_stats(read->dnload);
-		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) return;
-	}
-
-	if (e >= GF_OK) {
-		if (read->needs_connection) {
-			gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-			if (!total_size) read->is_live = GF_TRUE;
-		}
-		/*looks like a live stream*/
-		if (read->is_live) {
-			if (read->liveDataCopySize < param->size) {
-				read->liveDataCopy = (char*)gf_realloc(read->liveDataCopy, param->size);
-			}
-			memcpy(read->liveDataCopy, param->data, param->size);
-			if (!e) MP3_OnLiveData(read, read->liveDataCopy, param->size);
-			return;
-		}
-
-		if (read->stream) return;
-
-		/*open service*/
-		szCache = gf_dm_sess_get_cache_name(read->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			read->stream = gf_fopen((char *) szCache, "rb");
-			if (!read->stream) e = GF_SERVICE_ERROR;
-			else {
-				u32 minSizeToRead = 0;
-				/*if full file at once (in cache) parse duration*/
-				if (e==GF_EOS) read->is_remote = GF_FALSE;
-				e = GF_OK;
-				/*not enough data*/
-				if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
-					gf_dm_sess_get_stats(read->dnload, NULL, NULL, NULL, &bytes_done, NULL, NULL);
-					/*bad data - there's likely some ID3 around...*/
-					if (bytes_done>(100*1024 + minSizeToRead)) {
-						e = GF_CORRUPTED_DATA;
-					} else {
-						gf_fclose(read->stream);
-						read->stream = NULL;
-						return;
-					}
-				}
-			}
-		}
-	}
-
-	/*OK confirm*/
-	if (read->needs_connection) {
-		read->needs_connection = 0;
-		gf_service_connect_ack(read->service, NULL, e);
-		if (!e) mp3_setup_object(read);
-	}
-}
-
-void mp3_download_file(GF_InputService *plug, char *url)
-{
-	MP3Reader *read = (MP3Reader*) plug->priv;
-
-	read->needs_connection = 1;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, MP3_NetIO, read);
-	if (!read->dnload) {
-		read->needs_connection = 0;
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-
-static GF_Err MP3_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	u32 minSizeToRead = 0;
-	char *ext;
-	GF_Err reply;
-	MP3Reader *read = (MP3Reader*)plug->priv;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) ext[0] = 0;
-
-	/*remote fetch*/
-	read->is_remote = !mp3_is_local(szURL);
-	if (read->is_remote) {
-		mp3_download_file(plug, (char *) szURL);
-		return GF_OK;
-	}
-
-	reply = GF_OK;
-	read->stream = gf_fopen(szURL, "rb");
-	if (!read->stream) {
-		reply = GF_URL_ERROR;
-	} else if (!MP3_ConfigureFromFile(read, &minSizeToRead)) {
-		gf_fclose(read->stream);
-		read->stream = NULL;
-		reply = GF_NOT_SUPPORTED;
-	}
-	gf_service_connect_ack(serv, NULL, reply);
-	if (!reply) mp3_setup_object(read);
-	return GF_OK;
-}
-
-static GF_Err MP3_CloseService(GF_InputService *plug)
-{
-	MP3Reader *read = (MP3Reader*)plug->priv;
-	if (read->stream) gf_fclose(read->stream);
-	read->stream = NULL;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	if (read->data) gf_free(read->data);
-	read->data = NULL;
-	if (read->liveDataCopy) {
-		gf_free(read->liveDataCopy);
-		read->liveDataCopy = NULL;
-		read->liveDataCopySize = 0;
-	}
-	if (read->icy_name)
-		gf_free(read->icy_name);
-	read->icy_name = NULL;
-	if (read->icy_genre)
-		gf_free(read->icy_genre);
-	read->icy_genre = NULL;
-	if (read->icy_track_name)
-		gf_free(read->icy_track_name);
-	read->icy_track_name = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *MP3_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	MP3Reader *read = (MP3Reader*)plug->priv;
-
-	/*override default*/
-	if (expect_type==GF_MEDIA_OBJECT_UNDEF) expect_type=GF_MEDIA_OBJECT_AUDIO;
-
-	/*audio object*/
-	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		GF_ESD *esd = MP3_GetESD(read);
-		od->objectDescriptorID = 1;
-		gf_list_add(od->ESDescriptors, esd);
-		return (GF_Descriptor *) od;
-	}
-	read->is_inline = GF_TRUE;
-	return NULL;
-}
-
-static GF_Err MP3_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID=0;
-	GF_Err e;
-	MP3Reader *read = (MP3Reader*)plug->priv;
-
-	e = GF_SERVICE_ERROR;
-	if (read->ch==channel) goto exit;
-
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%ud", &ES_ID);
-	}
-	/*URL setup*/
-	else if (!read->ch && MP3_CanHandleURL(plug, url)) ES_ID = 1;
-
-	if (ES_ID==1) {
-		read->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err MP3_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	MP3Reader *read = (MP3Reader*)plug->priv;
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	if (read->ch == channel) {
-		read->ch = NULL;
-		if (read->data) gf_free(read->data);
-		read->data = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err MP3_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	MP3Reader *read = (MP3Reader*)plug->priv;
-
-	if (com->base.command_type==GF_NET_SERVICE_INFO) {
-		com->info.name = read->icy_track_name ? read->icy_track_name : read->icy_name;
-		com->info.comment = read->icy_genre;
-		return GF_OK;
-	}
-
-	if (!com->base.on_channel) {
-		/*if live session we may cache*/
-		if (read->is_live && (com->command_type==GF_NET_IS_CACHABLE)) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		if ((read->ch == com->base.on_channel) && read->is_live) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		if ((read->ch == com->base.on_channel) && read->is_live) {
-			if (com->buffer.max<2000) com->buffer.max = 2000;
-			com->buffer.min = com->buffer.max/2;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_SET_PADDING:
-		read->pad_bytes = com->pad.padding_bytes;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->duration;
-		com->duration.duration /= read->sample_rate;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		read->start_range = com->play.start_range;
-		read->end_range = com->play.end_range;
-		read->current_time = 0;
-		if (read->stream) gf_fseek(read->stream, 0, SEEK_SET);
-
-		if (read->ch == com->base.on_channel) {
-			read->done = GF_FALSE;
-			/*PLAY after complete download, estimate duration*/
-			if (!read->is_remote && !read->duration) {
-				u32 minSizeToRead = 0;
-				MP3_ConfigureFromFile(read, &minSizeToRead);
-				if (read->duration) {
-					GF_NetworkCommand rcfg;
-					rcfg.base.on_channel = read->ch;
-					rcfg.base.command_type = GF_NET_CHAN_DURATION;
-					rcfg.duration.duration = read->duration;
-					rcfg.duration.duration /= read->sample_rate;
-					gf_service_command(read->service, &rcfg, GF_OK);
-				}
-			}
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err MP3_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	u64 pos;
-	u32 hdr, start_from;
-	MP3Reader *read = (MP3Reader*)plug->priv;
-
-	if (read->ch != channel)
-		return GF_STREAM_NOT_FOUND;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = GF_FALSE;
-	*is_new_data = GF_FALSE;
-
-	memset(&read->sl_hdr, 0, sizeof(GF_SLHeader));
-	read->sl_hdr.randomAccessPointFlag = 1;
-	read->sl_hdr.compositionTimeStampFlag = 1;
-
-	/*fetching es data*/
-	if (read->done) {
-		*out_reception_status = GF_EOS;
-		return GF_OK;
-	}
-	if (!read->data) {
-		if (!read->stream) {
-			*out_data_ptr = NULL;
-			*out_data_size = 0;
-			return GF_OK;
-		}
-		*is_new_data = GF_TRUE;
-
-		pos = gf_ftell(read->stream);
-		hdr = gf_mp3_get_next_header(read->stream);
-		if (!hdr) {
-			if (!read->dnload) {
-				*out_reception_status = GF_EOS;
-				read->done = GF_TRUE;
-			} else {
-				gf_fseek(read->stream, pos, SEEK_SET);
-				*out_reception_status = GF_OK;
-			}
-			return GF_OK;
-		}
-		read->data_size = gf_mp3_frame_size(hdr);
-		if (!read->data_size) {
-			*out_reception_status = GF_EOS;
-			read->done = GF_TRUE;
-			return GF_OK;
-		}
-
-
-		/*we're seeking*/
-		if (read->start_range && read->duration) {
-			read->current_time = 0;
-			start_from = (u32) (read->start_range * read->sample_rate);
-			gf_fseek(read->stream, 0, SEEK_SET);
-			while (read->current_time<start_from) {
-				hdr = gf_mp3_get_next_header(read->stream);
-				if (!hdr) {
-					read->start_range = 0;
-					*out_reception_status = GF_EOS;
-					return GF_OK;
-				}
-				read->current_time += gf_mp3_window_size(hdr);
-				read->data_size = gf_mp3_frame_size(hdr);
-				gf_fseek(read->stream, read->data_size-4, SEEK_CUR);
-			}
-			read->start_range = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Seeking to frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_ftell(read->stream)));
-		}
-
-		read->sl_hdr.compositionTimeStamp = read->current_time;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[MP3Demux] Found new frame size %d - TS %d - file pos %d\n", read->data_size, read->current_time, gf_ftell(read->stream)));
-
-		read->current_time += gf_mp3_window_size(hdr);
-
-		read->data = (char*)gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
-		read->data[0] = (hdr >> 24) & 0xFF;
-		read->data[1] = (hdr >> 16) & 0xFF;
-		read->data[2] = (hdr >> 8) & 0xFF;
-		read->data[3] = (hdr ) & 0xFF;
-		/*end of file*/
-		if (fread(&read->data[4], 1, read->data_size - 4, read->stream) != read->data_size-4) {
-			gf_free(read->data);
-			read->data = NULL;
-			if (read->is_remote) {
-				gf_fseek(read->stream, pos, SEEK_SET);
-				*out_reception_status = GF_OK;
-			} else {
-				*out_reception_status = GF_EOS;
-			}
-			return GF_OK;
-		}
-		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
-	}
-	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr = read->data;
-	*out_data_size = read->data_size;
-	return GF_OK;
-}
-
-static GF_Err MP3_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	MP3Reader *read = (MP3Reader*)plug->priv;
-
-	if (read->ch == channel) {
-		if (!read->data) return GF_BAD_PARAM;
-		gf_free(read->data);
-		read->data = NULL;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-GF_InputService *MP3_Load()
-{
-	MP3Reader *reader;
-	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MP3 Reader", "gpac distribution")
-	plug->CanHandleURL = MP3_CanHandleURL;
-	plug->ConnectService = MP3_ConnectService;
-	plug->CloseService = MP3_CloseService;
-	plug->GetServiceDescriptor = MP3_GetServiceDesc;
-	plug->ConnectChannel = MP3_ConnectChannel;
-	plug->DisconnectChannel = MP3_DisconnectChannel;
-	plug->ServiceCommand = MP3_ServiceCommand;
-	plug->RegisterMimeTypes = MP3_RegisterMimeTypes;
-	/*we do support pull mode*/
-	plug->ChannelGetSLP = MP3_ChannelGetSLP;
-	plug->ChannelReleaseSLP = MP3_ChannelReleaseSLP;
-
-	reader = (MP3Reader*)gf_malloc(sizeof(MP3Reader));
-	memset(reader, 0, sizeof(MP3Reader));
-	plug->priv = reader;
-	return plug;
-}
-
-void MP3_Delete(void *ifce)
-{
-	MP3Reader *read;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!plug)
-		return;
-	read = (MP3Reader*)plug->priv;
-	if (read)
-		gf_free(read);
-	plug->priv = NULL;
-	gf_free(plug);
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-#ifdef GPAC_HAS_MAD
-GF_BaseDecoder *NewMADDec();
-void DeleteMADDec(GF_BaseDecoder *ifcg);
-#endif
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_NET_CLIENT_INTERFACE,
-#endif
-#ifdef GPAC_HAS_MAD
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)MP3_Load();
-#endif
-#ifdef GPAC_HAS_MAD
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewMADDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_MAD
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteMADDec((GF_BaseDecoder *) ifce);
-		break;
-#endif
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_NET_CLIENT_INTERFACE:
-		MP3_Delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( mp3_in )

gpac-0.8.0.tar.gz/modules/mpd_in Deleted

gpac-0.8.0.tar.gz/modules/mpd_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/mpd_in/mpd_in.c Deleted

@@ -1,1814 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-
- *					All rights reserved
- *
- *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
- *
- *  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/modules/service.h>
-
-#ifndef GPAC_DISABLE_DASH_CLIENT
-
-#include <gpac/dash.h>
-#include <gpac/internal/terminal_dev.h>
-
-typedef enum
-{
-	MPDIN_BUFFER_NONE=0,
-	MPDIN_BUFFER_MIN=1,
-	MPDIN_BUFFER_SEGMENTS=2
-} MpdInBuffer;
-
-typedef enum
-{
-	MPDIN_LOW_LATENCY_NONE=0,
-	MPDIN_LOW_LATENCY_CHUNK=1,
-	MPDIN_LOW_LATENCY_ALWAYS=2
-} MpdInLowLatency;
-
-typedef struct __mpd_module
-{
-	/* GPAC Service object (i.e. how this module is seen by the terminal)*/
-	GF_ClientService *service;
-	GF_InputService *plug;
-
-	GF_DashClient *dash;
-	Bool closed;
-	Bool at_period_switch;
-	/*interface to mpd parser*/
-	GF_DASHFileIO dash_io;
-
-	Bool connection_ack_sent;
-	Bool memory_storage;
-	Bool use_max_res, immediate_switch, allow_http_abort;
-	Bool disable_continuity;
-	MpdInLowLatency low_latency_mode;
-	MpdInBuffer buffer_mode;
-	u32 nb_playing;
-	Bool has_muxed_groups;
-
-	GF_DASHAdaptationAlgorithm adaptation_algorithm;
-	GF_List *groups;
-
-	/*max width & height in all active representations*/
-	u32 width, height;
-
-	Double seek_request;
-	Double media_start_range;
-	//we store here all callbacks to the parent services we need to intercept, and we will override our own ones
-	void (*fn_connect_ack) (GF_ClientService *service, LPNETCHANNEL ns, GF_Err response);
-	void (*fn_data_packet) (GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status);
-} GF_MPD_In;
-
-typedef struct
-{
-	GF_MPD_In *mpdin;
-	GF_InputService *segment_ifce;
-	Bool service_connected;
-	Bool service_descriptor_fetched;
-	Bool netio_assigned;
-	Bool has_new_data;
-	u32 idx;
-	GF_DownloadSession *sess;
-	Bool is_timestamp_based, pto_setup;
-	u32 force_init_next;
-	u32 timescale;
-	s64 pto;
-	s64 max_cts_in_period;
-	bin128 key_IV;
-	u32 nb_comp;
-	char *mime;
-	u64 last_dts;
-} GF_MPDGroup;
-
-const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
-const char * MPD_MPD_EXT = "3gm mpd";
-const char * MPD_M3U8_DESC = "Apple HLS Streaming";
-const char * MPD_M3U8_EXT = "m3u8 m3u";
-
-const char * MPD_SMOOTH_DESC = "Microsoft Smooth Streaming";
-const char * MPD_SMOOTH_EXT = "ism";
-const char * MPD_SMOOTH_URL_EXT = ".ism/Manifest";
-
-static u32 MPD_RegisterMimeTypes(const GF_InputService *plug)
-{
-	u32 i, c=0;
-	for (i=0; GF_DASH_MPD_MIME_TYPES[i]; i++)
-		gf_service_register_mime (plug, GF_DASH_MPD_MIME_TYPES[i], MPD_MPD_EXT, MPD_MPD_DESC);
-	c += i;
-
-	for (i=0; GF_DASH_M3U8_MIME_TYPES[i]; i++)
-		gf_service_register_mime(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC);
-	c += i;
-
-	for (i=0; GF_DASH_SMOOTH_MIME_TYPES[i]; i++)
-		gf_service_register_mime(plug, GF_DASH_SMOOTH_MIME_TYPES[i], MPD_SMOOTH_EXT, MPD_SMOOTH_DESC);
-	c += i;
-	return c;
-}
-
-Bool MPD_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	u32 i;
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Can Handle URL request from terminal for %s\n", url));
-	for (i=0; GF_DASH_MPD_MIME_TYPES[i]; i++) {
-		if (gf_service_check_mime_register(plug, GF_DASH_MPD_MIME_TYPES[i], MPD_MPD_EXT, MPD_MPD_DESC, sExt))
-			return GF_TRUE;
-	}
-	for (i=0; GF_DASH_M3U8_MIME_TYPES[i]; i++) {
-		if (gf_service_check_mime_register(plug, GF_DASH_M3U8_MIME_TYPES[i], MPD_M3U8_EXT, MPD_M3U8_DESC, sExt))
-			return GF_TRUE;
-	}
-
-	for (i=0; GF_DASH_SMOOTH_MIME_TYPES[i]; i++) {
-		if (gf_service_check_mime_register(plug, GF_DASH_SMOOTH_MIME_TYPES[i], MPD_SMOOTH_EXT, MPD_SMOOTH_DESC, sExt))
-			return GF_TRUE;
-	}
-
-	return gf_dash_check_mpd_root_type(url) || strstr(url, MPD_SMOOTH_URL_EXT);
-}
-
-
-static s32 gf_dash_get_group_idx_from_service(GF_MPD_In *mpdin, GF_InputService *ifce)
-{
-	s32 i;
-
-	for (i=0; (u32) i < gf_dash_get_group_count(mpdin->dash); i++) {
-		GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
-		if (!group) continue;
-		if (group->segment_ifce == ifce) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-
-static void mpdin_connect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) service->ifce->priv;
-	//do not send connect error, we may have other running services - this has to be clean up
-	if (response==GF_OK)
-		mpdin->fn_connect_ack(mpdin->service, ns, response);
-}
-
-void mpdin_data_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
-{
-	s32 i;
-	u32 timescale = 0;
-	GF_MPD_In *mpdin = (GF_MPD_In*) service->ifce->priv;
-	GF_Channel *ch;
-	GF_MPDGroup *group;
-	GF_SLHeader s_hdr;
-	Bool do_map_time = GF_FALSE;
-	if (!ns || !hdr) {
-		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
-		return;
-	}
-
-	ch = (GF_Channel *) ns;
-	assert(ch->odm && ch->odm->OD);
-	timescale = ch->esd->slConfig->timestampResolution;
-	if (hdr->ts_res)
-		timescale = hdr->ts_res;
-	if (!timescale) timescale=90000;
-
-
-	i = gf_dash_get_group_idx_from_service(mpdin,  (GF_InputService *) ch->odm->OD->service_ifce);
-	if (i<0) {
-		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
-		return;
-	}
-
-	group = gf_dash_get_group_udta(mpdin->dash, i);
-
-	s_hdr = *hdr;
-	hdr = &s_hdr;
-
-	if (gf_dash_is_m3u8(mpdin->dash)) {
-		mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
-		if (!group->pto_setup) {
-			GF_NetworkCommand com;
-			memset(&com, 0, sizeof(com));
-			com.command_type = GF_NET_CHAN_SET_MEDIA_TIME;
-			com.map_time.media_time = mpdin->media_start_range;
-			com.map_time.timestamp = hdr->compositionTimeStamp;
-			com.base.on_channel =  ns;
-			gf_service_command(service, &com, GF_OK);
-			group->pto_setup = GF_TRUE;
-		}
-		return;
-	}
-
-	//if sync is based on timestamps do not adjust the timestamps back
-	if (! group->is_timestamp_based) {
-		if (!group->pto_setup) {
-			s64 start, dur;
-			u64 pto;
-			gf_dash_group_get_presentation_time_offset(mpdin->dash, i, &pto, &group->timescale);
-			group->pto = (s64) pto;
-			group->pto_setup = 1;
-
-			if (group->timescale && (group->timescale != timescale)) {
-				group->pto *= timescale;
-				group->pto /= group->timescale;
-			}
-
-			dur = (u64) (timescale * gf_dash_get_period_duration(mpdin->dash) / 1000);
-			if (dur) {
-				group->max_cts_in_period = group->pto + dur;
-			} else {
-				group->max_cts_in_period = 0;
-			}
-
-			start = (u64) (timescale * gf_dash_get_period_start(mpdin->dash) / 1000);
-			group->pto -= start;
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] PTO setup for group %d : PTO "LLD" - period start "LLD" - last dts "LLU")\n", i, group->pto, start, group->last_dts));
-
-		}
-
-		//filter any packet outside the current period
-		if (group->max_cts_in_period && (s64) hdr->compositionTimeStamp > group->max_cts_in_period) {
-//			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet timestamp "LLU" larger than max CTS in period "LLU" - skipping\n", hdr->compositionTimeStamp, group->max_cts_in_period));
-//			return;
-		}
-
-		//remap timestamps to our timeline
-		if (hdr->decodingTimeStampFlag) {
-			if ((s64) hdr->decodingTimeStamp >= group->pto)
-				hdr->decodingTimeStamp -= group->pto;
-			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet DTS "LLU" less than PTO "LLU" - forcing DTS to 0\n", hdr->decodingTimeStamp, group->pto));
-				hdr->decodingTimeStamp = 0;
-				hdr->seekFlag = 1;
-			}
-			if (timescale != ch->esd->slConfig->timestampResolution) {
-				hdr->decodingTimeStamp *= ch->esd->slConfig->timestampResolution;
-				hdr->decodingTimeStamp /= timescale;
-			}
-		}
-		if (hdr->compositionTimeStampFlag) {
-			if ((s64) hdr->compositionTimeStamp >= group->pto)
-				hdr->compositionTimeStamp -= group->pto;
-			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet CTS "LLU" less than PTO "LLU" - forcing CTS to 0\n", hdr->compositionTimeStamp, group->pto));
-				hdr->compositionTimeStamp = 0;
-				hdr->seekFlag = 1;
-			}
-			if (timescale != ch->esd->slConfig->timestampResolution) {
-				hdr->compositionTimeStamp *= ch->esd->slConfig->timestampResolution;
-				hdr->compositionTimeStamp /= timescale;
-			}
-		}
-
-		if (hdr->OCRflag) {
-			u32 scale = hdr->m2ts_pcr ? 300 : 1;
-			u64 pto = scale*group->pto;
-			if (hdr->objectClockReference >= pto) {
-				hdr->objectClockReference -= pto;
-			}
-			//keep 4 sec between the first received PCR and the first allowed PTS to be used in the period.
-			else if (pto - hdr->objectClockReference < 108000000) {
-				hdr->objectClockReference = 0;
-			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Packet OCR/PCR "LLU" less than PTO "LLU" - discarding PCR\n", hdr->objectClockReference/scale, group->pto));
-				return;
-			}
-		}
-
-	} else if (!group->pto_setup) {
-		do_map_time = 1;
-		group->pto_setup = 1;
-	}
-
-	if (group->last_dts>hdr->decodingTimeStamp) {
-		u32 diff = (u32) (group->last_dts - hdr->decodingTimeStamp);
-		if (diff*100 < timescale) {
-			return;
-		}
-	}
-	group->last_dts = hdr->decodingTimeStamp;
-
-	mpdin->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
-
-	if (do_map_time) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.command_type = GF_NET_CHAN_SET_MEDIA_TIME;
-		com.map_time.media_time = mpdin->media_start_range;
-		com.map_time.timestamp = hdr->compositionTimeStamp;
-		com.base.on_channel =  ns;
-		gf_service_command(service, &com, GF_OK);
-	}
-}
-
-
-static void MPD_NotifyData(GF_MPDGroup *group, Bool chunk_flush)
-{
-	GF_NetworkCommand com;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.proxy_data.command_type = GF_NET_SERVICE_PROXY_DATA_RECEIVE;
-	com.proxy_data.is_chunk = chunk_flush;
-	com.proxy_data.is_live = gf_dash_is_dynamic_mpd(group->mpdin->dash);
-	group->segment_ifce->ServiceCommand(group->segment_ifce, &com);
-}
-
-static GF_Err MPD_ClientQuery(GF_InputService *ifce, GF_NetworkCommand *param)
-{
-	u32 i;
-	GF_Err e;
-	GF_MPD_In *mpdin = (GF_MPD_In *) ifce->proxy_udta;
-	if (!param || !ifce || !ifce->proxy_udta) return GF_BAD_PARAM;
-
-	/*gets byte range of init segment (for local validation)*/
-	if (param->command_type==GF_NET_SERVICE_QUERY_INIT_RANGE) {
-		param->url_query.next_url = NULL;
-		param->url_query.start_range = 0;
-		param->url_query.end_range = 0;
-
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			GF_MPDGroup *group;
-			if (!gf_dash_is_group_selectable(mpdin->dash, i)) continue;
-			group = gf_dash_get_group_udta(mpdin->dash, i);
-			if (!group) continue;
-
-			if (group->segment_ifce == ifce) {
-				gf_dash_group_get_segment_init_url(mpdin->dash, i, &param->url_query.start_range, &param->url_query.end_range);
-				param->url_query.current_download = 0;
-
-				param->url_query.key_url = gf_dash_group_get_segment_init_keys(mpdin->dash, i, &group->key_IV);
-				if (param->url_query.key_url) {
-					param->url_query.key_IV = &group->key_IV;
-				}
-				return GF_OK;
-			}
-		}
-		return GF_SERVICE_ERROR;
-	}
-
-	/*gets URL and byte range of next segment - if needed, adds bitstream switching segment info*/
-	if (param->command_type==GF_NET_SERVICE_QUERY_NEXT) {
-		Bool group_done;
-		u32 nb_segments_cached;
-		u32 group_idx=0;
-		GF_MPDGroup *group=NULL;
-		const char *src_url;
-		Bool discard_first_cache_entry = param->url_query.drop_first_segment;
-		Bool check_current_download = param->url_query.current_download;
-		u32 timer = gf_sys_clock();
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Query Next request from input service %s (drop first seg %d)\n", ifce->module_name, discard_first_cache_entry));
-
-
-		param->url_query.current_download = 0;
-		param->url_query.discontinuity_type = 0;
-
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			if (!gf_dash_is_group_selected(mpdin->dash, i)) continue;
-			group = gf_dash_get_group_udta(mpdin->dash, i);
-			if (group->segment_ifce == ifce) {
-				group_idx = i;
-				break;
-			}
-			group=NULL;
-		}
-
-		if (!group) {
-			return GF_SERVICE_ERROR;
-		}
-
-		//update group idx
-		if (group->idx != group_idx) {
-			group->idx = group_idx;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] New AdaptationSet detected after MPD update ?\n"));
-		}
-
-		if (discard_first_cache_entry || (group->force_init_next==1)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Discarding first segment in cache\n"));
-			gf_dash_group_discard_segment(mpdin->dash, group_idx);
-		}
-		if (group->force_init_next==1)
-			group->force_init_next = 2;
-
-		while (gf_dash_is_running(mpdin->dash)) {
-			group_done=0;
-			nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
-			if (nb_segments_cached>=1)
-				break;
-
-			if (group_done) {
-				if (gf_dash_is_group_selected(mpdin->dash, group_idx)
-				&& !gf_dash_get_period_switch_status(mpdin->dash)
-				&& !gf_dash_in_last_period(mpdin->dash, GF_TRUE)
-				&& gf_dash_all_groups_done(mpdin->dash)
-				) {
-					GF_NetworkCommand com;
-					param->url_query.in_end_of_period = 1;
-					memset(&com, 0, sizeof(GF_NetworkCommand));
-					com.command_type = GF_NET_BUFFER_QUERY;
-					if (gf_dash_get_period_switch_status(mpdin->dash) != 1) {
-						//if muxed groups, flush all otherwise we will try not to destroy the service
-						if (mpdin->has_muxed_groups)
-							gf_service_command(mpdin->service, &com, GF_OK);
-
-						//we only switch period once no more data is in our buffers
-						if (!com.buffer.occupancy) {
-							param->url_query.in_end_of_period = 0;
-							mpdin->at_period_switch = GF_TRUE;
-							gf_dash_request_period_switch(mpdin->dash);
-						}
-					}
-					if (param->url_query.in_end_of_period)
-						return GF_BUFFER_TOO_SMALL;
-				} else {
-					return GF_EOS;
-				}
-			}
-
-			if (check_current_download && mpdin->low_latency_mode) {
-				Bool is_switched=GF_FALSE;
-				gf_dash_group_probe_current_download_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, NULL, &param->url_query.next_url_init_or_switch_segment, &src_url, &is_switched);
-
-				if (param->url_query.next_url) {
-					param->url_query.current_download = 1;
-					param->url_query.has_new_data = group->has_new_data;
-					param->url_query.discontinuity_type = is_switched ? 1 : 0;
-					if (gf_dash_group_loop_detected(mpdin->dash, group_idx))
-						param->url_query.discontinuity_type = 2;
-					group->has_new_data = 0;
-					return GF_OK;
-				}
-				return GF_BUFFER_TOO_SMALL;
-			}
-			return GF_BUFFER_TOO_SMALL;
-		}
-
-		mpdin->at_period_switch = GF_FALSE;
-
-		param->url_query.current_download = 0;
-		nb_segments_cached = gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done);
-		if (nb_segments_cached < 1) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD_IN] No more file in cache, EOS\n"));
-			return GF_EOS;
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Had to wait for %u ms for the only cache file to be downloaded\n", (gf_sys_clock() - timer)));
-		}
-
-		e = gf_dash_group_get_next_segment_location(mpdin->dash, group_idx, param->url_query.dependent_representation_index, &param->url_query.next_url, &param->url_query.start_range, &param->url_query.end_range,
-		        NULL, &param->url_query.next_url_init_or_switch_segment, &param->url_query.switch_start_range , &param->url_query.switch_end_range,
-		        &src_url, &param->url_query.has_next, &param->url_query.key_url, &group->key_IV);
-		if (e)
-			return e;
-
-		param->url_query.key_IV = &group->key_IV;
-		if (group->force_init_next==2) {
-			group->force_init_next = 0;
-			param->url_query.next_url_init_or_switch_segment = gf_dash_group_get_segment_init_url(mpdin->dash, group_idx, &param->url_query.switch_start_range, &param->url_query.switch_end_range);
-		}
-
-		if (gf_dash_group_loop_detected(mpdin->dash, group_idx)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Clock discontinuity found\n"));
-			param->url_query.discontinuity_type = 2;
-		}
-
-
-#ifndef GPAC_DISABLE_LOG
-		{
-			u32 timer2 = gf_sys_clock() - timer;
-			if (timer2 > 1000) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waiting for download to end took a long time : %u ms\n", timer2));
-			}
-			if (param->url_query.end_range) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Next Segment is %s bytes "LLD"-"LLD"\n", src_url, param->url_query.start_range, param->url_query.end_range));
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Next Segment is %s\n", src_url));
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waited %d ms - Elements in cache: %u/%u\n\tCache file name %s\n\tsegment start time %g sec\n", timer2, gf_dash_group_get_num_segments_ready(mpdin->dash, group_idx, &group_done), gf_dash_group_get_max_segments_in_cache(mpdin->dash, group_idx), param->url_query.next_url, gf_dash_group_current_segment_start_time(mpdin->dash, group_idx)));
-		}
-#endif
-	}
-
-	if (param->command_type == GF_NET_SERVICE_QUERY_UTC_DELAY) {
-		param->utc_delay.delay = gf_dash_get_utc_drift_estimate(mpdin->dash);
-		return GF_OK;
-	}
-
-	return GF_OK;
-}
-
-/*locates input service (demuxer) based on mime type or segment name*/
-static GF_Err MPD_LoadMediaService(GF_MPD_In *mpdin, u32 group_index, const char *mime, const char *init_segment_name)
-{
-	GF_InputService *segment_ifce;
-	u32 i;
-	const char *sPlug;
-	if (mime) {
-		for (i=0; i<gf_list_count(mpdin->groups); i++) {
-			GF_MPDGroup *group = gf_list_get(mpdin->groups, i);
-			if (group->mime && !strcmp(group->mime, mime)) {
-				group->pto_setup=GF_FALSE;
-				group->idx = group_index;
-				group->force_init_next = strstr(mime, "mp4") ? GF_TRUE : GF_FALSE;
-				gf_dash_set_group_udta(mpdin->dash, group_index, group);
-				return GF_OK;
-			}
-
-		}
-		/* Check MIME type to start the right InputService */
-		sPlug = gf_cfg_get_key(mpdin->service->term->user->config, "MimeTypes", mime);
-		if (sPlug) sPlug = strrchr(sPlug, '"');
-		if (sPlug) {
-			sPlug += 2;
-			segment_ifce = (GF_InputService *) gf_modules_load_interface_by_name(mpdin->service->term->user->modules, sPlug, GF_NET_CLIENT_INTERFACE);
-			if (segment_ifce) {
-				GF_MPDGroup *group;
-				GF_SAFEALLOC(group, GF_MPDGroup);
-				if (!group) return GF_OUT_OF_MEM;
-				
-				group->segment_ifce = segment_ifce;
-				group->segment_ifce->proxy_udta = mpdin;
-				group->segment_ifce->query_proxy = MPD_ClientQuery;
-				group->mpdin = mpdin;
-				group->idx = group_index;
-				group->mime = gf_strdup(mime);
-				if ( gf_dash_group_get_num_components(mpdin->dash, group_index)>1) {
-					mpdin->has_muxed_groups = GF_TRUE;
-				}
-				gf_dash_set_group_udta(mpdin->dash, group_index, group);
-				gf_list_add(mpdin->groups, group);
-				return GF_OK;
-			}
-		}
-	}
-	if (init_segment_name) {
-		for (i=0; i< gf_modules_get_count(mpdin->service->term->user->modules); i++) {
-			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(mpdin->service->term->user->modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-
-			if (ifce->CanHandleURL && ifce->CanHandleURL(ifce, init_segment_name)) {
-				GF_MPDGroup *group;
-				GF_SAFEALLOC(group, GF_MPDGroup);
-				if (!group) return GF_OUT_OF_MEM;
-				group->segment_ifce = ifce;
-				group->segment_ifce->proxy_udta = mpdin;
-				group->segment_ifce->query_proxy = MPD_ClientQuery;
-				group->mpdin = mpdin;
-				group->idx = group_index;
-				gf_dash_set_group_udta(mpdin->dash, group_index, group);
-				return GF_OK;
-			}
-			gf_modules_close_interface((GF_BaseInterface *) ifce);
-		}
-	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error locating plugin for segment - mime type %s - name %s\n", mime, init_segment_name));
-	return GF_CODEC_NOT_FOUND;
-}
-
-
-
-GF_InputService *MPD_GetInputServiceForChannel(GF_MPD_In *mpdin, LPNETCHANNEL channel)
-{
-	GF_Channel *ch;
-	if (!channel) {
-		u32 i;
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			if (gf_dash_is_group_selectable(mpdin->dash, i)) {
-				GF_MPDGroup *mudta = gf_dash_get_group_udta(mpdin->dash, i);
-				if (mudta && mudta->segment_ifce) return mudta->segment_ifce;
-			}
-		}
-		return NULL;
-	}
-
-	ch = (GF_Channel *) channel;
-	assert(ch->odm && ch->odm->OD);
-	return (GF_InputService *) ch->odm->OD->service_ifce;
-}
-
-s32 MPD_GetGroupIndexForChannel(GF_MPD_In *mpdin, LPNETCHANNEL channel)
-{
-	u32 i;
-	GF_InputService *ifce = MPD_GetInputServiceForChannel(mpdin, channel);
-	if (!ifce) return -1;
-
-	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-		GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
-		if (!group) continue;
-		if (group->segment_ifce == ifce) return i;
-	}
-	return -1;
-}
-
-GF_Err MPD_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_InputService *segment_ifce = MPD_GetInputServiceForChannel(mpdin, channel);
-	if (!plug || !plug->priv || !segment_ifce) return GF_SERVICE_ERROR;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Channel Connection (%p) request from terminal for %s\n", channel, url));
-	return segment_ifce->ConnectChannel(segment_ifce, channel, url, upstream);
-}
-
-GF_Err MPD_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_InputService *segment_ifce = MPD_GetInputServiceForChannel(mpdin, channel);
-	if (!plug || !plug->priv || !segment_ifce) return GF_SERVICE_ERROR;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Disconnect channel (%p) request from terminal \n", channel));
-
-	return segment_ifce->DisconnectChannel(segment_ifce, channel);
-}
-
-
-static void mpdin_dash_segment_netio(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_MPDGroup *group = (GF_MPDGroup *)cbk;
-	u32 bytes_per_sec;
-
-	if (param->msg_type == GF_NETIO_PARSE_HEADER) {
-		if (!strcmp(param->name, "Dash-Newest-Segment")) {
-			gf_dash_resync_to_segment(group->mpdin->dash, param->value, gf_dm_sess_get_header(param->sess, "Dash-Oldest-Segment"));
-		}
-	}
-
-	if (param->msg_type == GF_NETIO_DATA_EXCHANGE) {
-		group->has_new_data = 1;
-
-		if (param->reply) {
-			//u32 bytes_per_sec;
-			const char *url;
-			gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of chunk received for %s at UTC "LLU" ms - estimated bandwidth %d kbps - chunk start at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. redowload at max  %d \n", 8*bytes_per_sec/1000));
-
-			if (group->mpdin->low_latency_mode)
-				MPD_NotifyData(group, 1);
-		} else if (group->mpdin->low_latency_mode==MPDIN_LOW_LATENCY_ALWAYS) {
-			MPD_NotifyData(group, 1);
-		}
-
-		if (group->mpdin->allow_http_abort)
-			gf_dash_group_check_bandwidth(group->mpdin->dash, group->idx);
-	}
-	if (param->msg_type == GF_NETIO_DATA_TRANSFERED) {
-		u32 bytes_per_sec;
-		const char *url;
-		gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of file %s download at UTC "LLU" ms - estimated bandwidth %d kbps - started file or last chunk at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG1. %d \n", 8*bytes_per_sec/1000));
-	}
-}
-
-void mpdin_dash_io_delete_cache_file(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url)
-{
-	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url);
-}
-
-GF_DASHFileIOSession mpdin_dash_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx)
-{
-	GF_MPDGroup *group = NULL;
-	GF_DownloadSession *sess;
-	u32 flags = GF_NETIO_SESSION_NOT_THREADED;
-	GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
-	if (mpdin->memory_storage)
-		flags |= GF_NETIO_SESSION_MEMORY_CACHE;
-
-	if (persistent) flags |= GF_NETIO_SESSION_PERSISTENT;
-
-	if (group_idx>=0) {
-		group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-	}
-	if (group) {
-		group->netio_assigned = GF_TRUE;
-		group->sess = sess = gf_service_download_new(mpdin->service, url, flags, mpdin_dash_segment_netio, group);
-	} else {
-		sess = gf_service_download_new(mpdin->service, url, flags, NULL, NULL);
-	}
-	return (GF_DASHFileIOSession) sess;
-}
-void mpdin_dash_io_del(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	gf_service_download_del((GF_DownloadSession *)session);
-}
-void mpdin_dash_io_abort(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	gf_dm_sess_abort((GF_DownloadSession *)session);
-}
-GF_Err mpdin_dash_io_setup_from_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx)
-{
-	if (group_idx>=0) {
-		GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
-		GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-		if (group && !group->netio_assigned) {
-			group->netio_assigned = GF_TRUE;
-			group->sess = (GF_DownloadSession *)session;
-			gf_dm_sess_reassign((GF_DownloadSession *)session, 0xFFFFFFFF, mpdin_dash_segment_netio, group);
-		}
-	}
-	return gf_dm_sess_setup_from_url((GF_DownloadSession *)session, url);
-}
-GF_Err mpdin_dash_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache)
-{
-	return gf_dm_sess_set_range((GF_DownloadSession *)session, start_range, end_range, discontinue_cache);
-}
-GF_Err mpdin_dash_io_init(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_process_headers((GF_DownloadSession *)session);
-}
-GF_Err mpdin_dash_io_run(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_process((GF_DownloadSession *)session);
-}
-const char *mpdin_dash_io_get_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_get_resource_name((GF_DownloadSession *)session);
-}
-const char *mpdin_dash_io_get_cache_name(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_get_cache_name((GF_DownloadSession *)session);
-}
-const char *mpdin_dash_io_get_mime(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_mime_type((GF_DownloadSession *)session);
-}
-
-const char *mpdin_dash_io_get_header_value(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name)
-{
-	return gf_dm_sess_get_header((GF_DownloadSession *)session, header_name);
-}
-
-u64 mpdin_dash_io_get_utc_start_time(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	return gf_dm_sess_get_utc_start((GF_DownloadSession *)session);
-}
-
-
-
-u32 mpdin_dash_io_get_bytes_per_sec(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	u32 bps=0;
-//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
-	if (session) {
-		gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
-	} else {
-		GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
-		bps = gf_dm_get_data_rate(mpdin->service->term->downloader);
-		bps/=8;
-	}
-	//GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("DEBUG. 2. max max max  %d \n", bps*8));
-	return bps;
-}
-u32 mpdin_dash_io_get_total_size(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	u32 size=0;
-//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
-	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, &size, NULL, NULL, NULL);
-	return size;
-}
-u32 mpdin_dash_io_get_bytes_done(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
-{
-	u32 size=0;
-//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
-	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, &size, NULL, NULL);
-	return size;
-}
-
-
-GF_Err mpdin_dash_io_on_dash_event(GF_DASHFileIO *dashio, GF_DASHEventType dash_evt, s32 group_idx, GF_Err error_code)
-{
-	GF_Err e;
-	u32 i;
-	GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
-
-	if (dash_evt==GF_DASH_EVENT_PERIOD_SETUP_ERROR) {
-		if (!mpdin->connection_ack_sent) {
-			mpdin->fn_connect_ack(mpdin->service, NULL, error_code);
-			mpdin->connection_ack_sent= GF_TRUE;
-		}
-		return GF_OK;
-	}
-
-	if (dash_evt==GF_DASH_EVENT_SELECT_GROUPS) {
-		//configure buffer in dynamic mode without low latency: we indicate how much the player will buffer
-		if (gf_dash_is_dynamic_mpd(mpdin->dash) && (mpdin->low_latency_mode==MPDIN_LOW_LATENCY_NONE) ) {
-			u32 buffer_ms = 0;
-			const char *opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Network", "BufferLength");
-			if (opt) buffer_ms = atoi(opt);
-
-			//use min buffer from MPD
-			if (mpdin->buffer_mode>=MPDIN_BUFFER_MIN) {
-				u32 mpd_buffer_ms = gf_dash_get_min_buffer_time(mpdin->dash);
-				if (mpd_buffer_ms > buffer_ms)
-					buffer_ms = mpd_buffer_ms;
-			}
-
-			if (buffer_ms) {
-				gf_dash_set_user_buffer(mpdin->dash, buffer_ms);
-			}
-		}
-		//let the player decide which group to play: we declare everything
-		return GF_OK;
-	}
-
-	/*for all selected groups, create input service and connect to init/first segment*/
-	if (dash_evt==GF_DASH_EVENT_CREATE_PLAYBACK) {
-		mpdin->has_muxed_groups = mpdin->disable_continuity ? GF_TRUE : GF_FALSE;
-
-		/*select input services if possible*/
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			const char *mime, *init_segment;
-			u32 j;
-			Bool playable = GF_TRUE;
-			//let the player decide which group to play
-			if (!gf_dash_is_group_selectable(mpdin->dash, i))
-				continue;
-
-			j=0;
-			while (1) {
-				const char *desc_id, *desc_scheme, *desc_value;
-				if (! gf_dash_group_enum_descriptor(mpdin->dash, i, GF_MPD_DESC_ESSENTIAL_PROPERTIES, j, &desc_id, &desc_scheme, &desc_value))
-					break;
-				j++;
-				if (!strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
-				} else {
-					playable = GF_FALSE;
-					break;
-				}
-			}
-			if (!playable) {
-				gf_dash_group_select(mpdin->dash, i, GF_FALSE);
-				continue;
-			}
-
-			if (gf_dash_group_has_dependent_group(mpdin->dash, i) >=0 ) {
-				gf_dash_group_select(mpdin->dash, i, GF_TRUE);
-				continue;
-			}
-
-			mime = gf_dash_group_get_segment_mime(mpdin->dash, i);
-			init_segment = gf_dash_group_get_segment_init_url(mpdin->dash, i, NULL, NULL);
-			e = MPD_LoadMediaService(mpdin, i, mime, init_segment);
-			if (e != GF_OK) {
-				gf_dash_group_select(mpdin->dash, i, GF_FALSE);
-			} else {
-				u32 w, h;
-				/*connect our media service*/
-				GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
-				gf_dash_group_get_video_info(mpdin->dash, i, &w, &h);
-				if (w && h && w>mpdin->width && h>mpdin->height) {
-					mpdin->width = w;
-					mpdin->height = h;
-				}
-				if (gf_dash_group_get_srd_max_size_info(mpdin->dash, i, &w, &h)) {
-					mpdin->width = w;
-					mpdin->height = h;
-				}
-				if (!group->service_connected) {
-					e = group->segment_ifce->ConnectService(group->segment_ifce, mpdin->service, init_segment);
-					if (e) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Unable to connect input service to %s\n", init_segment));
-						gf_dash_group_select(mpdin->dash, i, GF_FALSE);
-					} else {
-						group->service_connected = 1;
-					}
-				} else {
-					gf_dash_group_select(mpdin->dash, i, GF_TRUE);
-				}
-				if (mpdin->closed) return GF_OK;
-			}
-		}
-
-		if (!mpdin->connection_ack_sent) {
-			mpdin->fn_connect_ack(mpdin->service, NULL, GF_OK);
-			mpdin->connection_ack_sent=1;
-		}
-		mpdin->at_period_switch = GF_FALSE;
-
-		//we had a seek outside of the period we were setting up, during period setup !
-		//request the seek again from the player
-		if (mpdin->seek_request>=0) {
-			GF_NetworkCommand com;
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_SERVICE_SEEK;
-			com.play.start_range = mpdin->seek_request;
-			mpdin->seek_request = 0;
-			gf_service_command(mpdin->service, &com, GF_OK);
-		}
-		return GF_OK;
-	}
-
-	/*for all running services, stop service*/
-	if (dash_evt==GF_DASH_EVENT_DESTROY_PLAYBACK) {
-		//all groups are single-media, and we are at period switch: try to use period continuity
-		if (mpdin->at_period_switch && !mpdin->has_muxed_groups)
-			return GF_OK;
-
-		mpdin->service->subservice_disconnect = 1;
-		gf_service_disconnect_ack(mpdin->service, NULL, GF_OK);
-		mpdin->service->subservice_disconnect = 2;
-
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
-			if (!group) continue;
-			if (group->segment_ifce) {
-				if (group->service_connected) {
-					group->segment_ifce->CloseService(group->segment_ifce);
-					group->service_connected = 0;
-				}
-				gf_modules_close_interface((GF_BaseInterface *) group->segment_ifce);
-			}
-			gf_list_del_item(mpdin->groups, group);
-			if (group->mime) gf_free(group->mime);
-			gf_free(group);
-			gf_dash_set_group_udta(mpdin->dash, i, NULL);
-		}
-		mpdin->service->subservice_disconnect = 0;
-		return GF_OK;
-	}
-
-	if (dash_evt==GF_DASH_EVENT_BUFFERING) {
-		u32 tot, done;
-		gf_dash_get_buffer_info(mpdin->dash, &tot, &done);
-		return GF_OK;
-	}
-	if (dash_evt==GF_DASH_EVENT_SEGMENT_AVAILABLE) {
-		if (group_idx>=0) {
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-			if (group) MPD_NotifyData(group, 0);
-		}
-		return GF_OK;
-	}
-	if (dash_evt==GF_DASH_EVENT_QUALITY_SWITCH) {
-		if (group_idx>=0) {
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-			if (!group) {
-				group_idx = gf_dash_group_has_dependent_group(mpdin->dash, group_idx);
-				group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-			}
-			if (group) {
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(GF_NetworkCommand));
-
-				com.command_type = GF_NET_SERVICE_EVENT;
-				com.send_event.evt.type = GF_EVENT_QUALITY_SWITCHED;
-				gf_service_command(mpdin->service, &com, GF_OK);
-			}
-		}
-		return GF_OK;
-	}
-	if (dash_evt==GF_DASH_EVENT_TIMESHIFT_OVERFLOW) {
-		GF_NetworkCommand com;
-		com.command_type = GF_NET_SERVICE_EVENT;
-		com.send_event.evt.type = (group_idx>=0) ? GF_EVENT_TIMESHIFT_OVERFLOW : GF_EVENT_TIMESHIFT_UNDERRUN;
-		gf_service_command(mpdin->service, &com, GF_OK);
-	}
-	if (dash_evt==GF_DASH_EVENT_TIMESHIFT_UPDATE) {
-		GF_NetworkCommand com;
-		com.command_type = GF_NET_SERVICE_EVENT;
-		com.send_event.evt.type = GF_EVENT_TIMESHIFT_UPDATE;
-		gf_service_command(mpdin->service, &com, GF_OK);
-	}
-
-	if (dash_evt==GF_DASH_EVENT_CODEC_STAT_QUERY) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.command_type = GF_NET_SERVICE_CODEC_STAT_QUERY;
-		gf_service_command(mpdin->service, &com, GF_OK);
-		gf_dash_group_set_codec_stat(mpdin->dash, group_idx, com.codec_stat.avg_dec_time, com.codec_stat.max_dec_time, com.codec_stat.irap_avg_dec_time, com.codec_stat.irap_max_dec_time, com.codec_stat.codec_reset, com.codec_stat.decode_only_rap);
-
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.command_type = GF_NET_BUFFER_QUERY;
-		gf_service_command(mpdin->service, &com, GF_OK);
-		gf_dash_group_set_buffer_levels(mpdin->dash, group_idx, com.buffer.min, com.buffer.max, com.buffer.occupancy);
-	}
-	if ((dash_evt==GF_DASH_EVENT_CACHE_FULL) ||  (dash_evt==GF_DASH_EVENT_END_OF_PERIOD) ) {
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
-			if (group && gf_dash_is_group_selected(mpdin->dash, i))
-				MPD_NotifyData(group, 0);
-		}
-	}
-	return GF_OK;
-}
-
-/*check in all groups if the service can support reverse playback (speed<0); return GF_OK only if service is supported in all groups*/
-static GF_Err mpdin_dash_can_reverse_playback(GF_MPD_In *mpdin)
-{
-	u32 i;
-	GF_Err e = GF_NOT_SUPPORTED;
-	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-		if (gf_dash_is_group_selectable(mpdin->dash, i)) {
-			GF_MPDGroup *mudta = gf_dash_get_group_udta(mpdin->dash, i);
-			if (mudta && mudta->segment_ifce) {
-				GF_NetworkCommand com;
-				com.command_type = GF_NET_SERVICE_CAN_REVERSE_PLAYBACK;
-				e = mudta->segment_ifce->ServiceCommand(mudta->segment_ifce, &com);
-				if (GF_OK != e)
-					return e;
-			}
-		}
-	}
-
-	return e;
-}
-
-GF_Err MPD_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	const char *opt;
-	GF_Err e;
-	s32 shift_utc_ms, debug_adaptation_set;
-	u32 max_cache_duration, auto_switch_count, init_timeshift, tiles_rate_decrease;
-	Bool use_server_utc, ignore_xlink;
-	GF_DASHInitialSelectionMode first_select_mode;
-	GF_DASHTileAdaptationMode tile_adapt_mode;
-	Bool keep_files, disable_switching, use_threads;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Connection request (%p) from terminal for %s\n", serv, url));
-
-	if (!mpdin || !serv || !url)
-		return GF_BAD_PARAM;
-
-	mpdin->service = serv;
-	mpdin->seek_request = -1;
-
-	mpdin->dash_io.udta = mpdin;
-	mpdin->dash_io.delete_cache_file = mpdin_dash_io_delete_cache_file;
-	mpdin->dash_io.create = mpdin_dash_io_create;
-	mpdin->dash_io.del = mpdin_dash_io_del;
-	mpdin->dash_io.abort = mpdin_dash_io_abort;
-	mpdin->dash_io.setup_from_url = mpdin_dash_io_setup_from_url;
-	mpdin->dash_io.set_range = mpdin_dash_io_set_range;
-	mpdin->dash_io.init = mpdin_dash_io_init;
-	mpdin->dash_io.run = mpdin_dash_io_run;
-	mpdin->dash_io.get_url = mpdin_dash_io_get_url;
-	mpdin->dash_io.get_cache_name = mpdin_dash_io_get_cache_name;
-	mpdin->dash_io.get_mime = mpdin_dash_io_get_mime;
-	mpdin->dash_io.get_header_value = mpdin_dash_io_get_header_value;
-	mpdin->dash_io.get_utc_start_time = mpdin_dash_io_get_utc_start_time;
-	mpdin->dash_io.get_bytes_per_sec = mpdin_dash_io_get_bytes_per_sec;
-	mpdin->dash_io.get_total_size = mpdin_dash_io_get_total_size;
-	mpdin->dash_io.get_bytes_done = mpdin_dash_io_get_bytes_done;
-	mpdin->dash_io.on_dash_event = mpdin_dash_io_on_dash_event;
-
-	max_cache_duration = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "Network", "BufferLength");
-	if (opt) max_cache_duration = atoi(opt);
-
-	auto_switch_count = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "AutoSwitchCount");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "AutoSwitchCount", "0");
-	if (opt) auto_switch_count = atoi(opt);
-
-	keep_files = GF_FALSE;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "KeepFiles");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "KeepFiles", "no");
-	if (opt && !strcmp(opt, "yes")) keep_files = GF_TRUE;
-
-	disable_switching = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "NetworkAdaptation");
-	if (!opt) {
-		opt = "buffer";
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "NetworkAdaptation", opt);
-	}
-	if (!strcmp(opt, "disabled")) {
-		disable_switching = 2;
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_NONE;
-	}
-	else if (!strcmp(opt, "bandwidth")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_GPAC_LEGACY_RATE;
-	}
-	else if (!strcmp(opt, "buffer")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_GPAC_LEGACY_BUFFER;
-	}
-	else if (!strcmp(opt, "BBA-0")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_BBA0;
-	}
-	else if (!strcmp(opt, "BOLA_FINITE")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_FINITE;
-	}
-	else if (!strcmp(opt, "BOLA_BASIC")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_BASIC;
-	}
-	else if (!strcmp(opt, "BOLA_U")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_U;
-	}
-	else if (!strcmp(opt, "BOLA_O")) {
-		mpdin->adaptation_algorithm = GF_DASH_ALGO_BOLA_O;
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "StartRepresentation");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "StartRepresentation", "minBandwidth");
-		opt = "minBandwidth";
-	}
-	if (opt && !strcmp(opt, "maxBandwidth")) first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST;
-	else if (opt && !strcmp(opt, "maxBandwidthTiles")) first_select_mode = GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES;
-	else if (opt && !strcmp(opt, "minQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_LOWEST;
-	else if (opt && !strcmp(opt, "maxQuality")) first_select_mode = GF_DASH_SELECT_QUALITY_HIGHEST;
-	else first_select_mode = GF_DASH_SELECT_BANDWIDTH_LOWEST;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "MemoryStorage", "yes");
-	mpdin->memory_storage = (!opt || !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
-	if (!opt) {
-		opt = "yes";
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution", opt);
-	}
-	mpdin->use_max_res = !strcmp(opt, "yes") ? GF_TRUE : GF_FALSE;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "ImmediateSwitching");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "ImmediateSwitching", "no");
-	mpdin->immediate_switch = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "BufferingMode");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "BufferingMode", "minBuffer");
-
-	if (opt && !strcmp(opt, "segments")) mpdin->buffer_mode = MPDIN_BUFFER_SEGMENTS;
-	else if (opt && !strcmp(opt, "none")) mpdin->buffer_mode = MPDIN_BUFFER_NONE;
-	else mpdin->buffer_mode = MPDIN_BUFFER_MIN;
-	
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "LowLatency");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "LowLatency", "no");
-
-	if (opt && !strcmp(opt, "chunk")) mpdin->low_latency_mode = MPDIN_LOW_LATENCY_CHUNK;
-	else if (opt && !strcmp(opt, "always")) mpdin->low_latency_mode = MPDIN_LOW_LATENCY_CHUNK;
-	else mpdin->low_latency_mode = MPDIN_LOW_LATENCY_NONE;
-
-	
-	use_threads = GF_FALSE;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "ThreadedDownload");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "ThreadedDownload", "no");
-	if (opt && !strcmp(opt, "yes")) use_threads = GF_TRUE;
-
-	if (mpdin->low_latency_mode) use_threads = GF_TRUE;
-	
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "AllowAbort");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "AllowAbort", "no");
-	mpdin->allow_http_abort = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "ShiftClock");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "ShiftClock", "0");
-	shift_utc_ms = opt ? atoi(opt) : 0;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseServerUTC");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseServerUTC", "yes");
-	use_server_utc = (!opt || !strcmp(opt, "yes")) ? 1 : 0;
-
-	mpdin->nb_playing = 0;
-
-	init_timeshift = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "InitialTimeshift", "0");
-	if (opt) init_timeshift = atoi(opt);
-
-	ignore_xlink = GF_FALSE;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "IgnoreXLink");
-	if (opt && !strcmp(opt, "yes")) ignore_xlink = GF_TRUE;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "TileAdaptation", "none");
-		opt = "none";
-	}
-	if (!strcmp(opt, "none")) tile_adapt_mode = GF_DASH_ADAPT_TILE_NONE;
-	else if (!strcmp(opt, "rows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS;
-	else if (!strcmp(opt, "reverseRows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS_REVERSE;
-	else if (!strcmp(opt, "middleRows")) tile_adapt_mode = GF_DASH_ADAPT_TILE_ROWS_MIDDLE;
-	else if (!strcmp(opt, "columns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS;
-	else if (!strcmp(opt, "reverseColumns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS_REVERSE;
-	else if (!strcmp(opt, "middleColumns")) tile_adapt_mode = GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE;
-	else if (!strcmp(opt, "center")) tile_adapt_mode = GF_DASH_ADAPT_TILE_CENTER;
-	else if (!strcmp(opt, "edges")) tile_adapt_mode = GF_DASH_ADAPT_TILE_EDGES;
-	else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPDIn] Unrecognized tile adaptation mode %s - defaulting to none\n", opt));
-		tile_adapt_mode = GF_DASH_ADAPT_TILE_NONE;
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TileRateDecrease");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "TileRateDecrease", "100");
-		opt = "100";
-	}
-	tiles_rate_decrease = atoi(opt);
-
-	//override all service callbacks
-	mpdin->fn_connect_ack = serv->fn_connect_ack;
-	serv->fn_connect_ack = mpdin_connect_ack;
-	mpdin->fn_data_packet = serv->fn_data_packet;
-	serv->fn_data_packet = mpdin_data_packet;
-
-	mpdin->dash = gf_dash_new(&mpdin->dash_io, max_cache_duration, auto_switch_count, keep_files, disable_switching, first_select_mode, (mpdin->buffer_mode == MPDIN_BUFFER_SEGMENTS) ? 1 : 0, init_timeshift);
-	gf_dash_set_algo(mpdin->dash, mpdin->adaptation_algorithm);
-
-	if (!mpdin->dash) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot create DASH Client for %s\n", url));
-		mpdin->fn_connect_ack(mpdin->service, NULL, GF_IO_ERR);
-		return GF_OK;
-	}
-
-	gf_dash_set_utc_shift(mpdin->dash, shift_utc_ms);
-	gf_dash_enable_utc_drift_compensation(mpdin->dash, use_server_utc);
-	gf_dash_set_tile_adaptation_mode(mpdin->dash, tile_adapt_mode, tiles_rate_decrease);
-	gf_dash_set_threaded_download(mpdin->dash, use_threads);
-	gf_dash_ignore_xlink(mpdin->dash, ignore_xlink);
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution");
-	//default mode is no for the time being
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution", "no");
-	if (!opt || !strcmp(opt, "yes")) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_MEDIA_CAP_QUERY;
-		gf_service_command(serv, &com, GF_OK);
-
-		if (com.mcaps.width && com.mcaps.height) {
-			gf_dash_set_max_resolution(mpdin->dash, com.mcaps.width, com.mcaps.height, com.mcaps.display_bit_depth);
-		}
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TimeBetween404");
-	if (opt) {
-		gf_dash_set_min_timeout_between_404(mpdin->dash, atoi(opt));
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "SegmentExpirationThreshold");
-	if (opt) {
-		gf_dash_set_segment_expiration_threshold(mpdin->dash, atoi(opt));
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "SwitchProbeCount");
-	if (opt) {
-		gf_dash_set_switching_probe_count(mpdin->dash, atoi(opt));
-	} else {
-		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "SwitchProbeCount", "1");
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "AgressiveSwitching");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "AgressiveSwitching", "no");
-	gf_dash_set_agressive_adaptation(mpdin->dash,  (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE);
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "DebugAdaptationSet");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "DebugAdaptationSet", "-1");
-	debug_adaptation_set = opt ? atoi(opt) : -1;
-
-	gf_dash_debug_group(mpdin->dash, debug_adaptation_set);
-
-	/*by default, speed adaptation and display adaptation are enable*/
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "SpeedAdaptation");
-	if (opt && !strcmp(opt, "yes"))
-		gf_dash_disable_speed_adaptation(mpdin->dash, GF_FALSE);
-	else
-		gf_dash_disable_speed_adaptation(mpdin->dash, GF_TRUE);
-
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UTCShiftATSC");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UTCShiftATSC", "1000");
-	else gf_dash_set_atsc_ast_shift(mpdin->dash, atoi(opt) );
-
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "NoContinuity");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "NoContinuity", "no");
-	else if (!strcmp(opt, "yes")) mpdin->disable_continuity = GF_TRUE;
-
-	gf_dash_set_period_xlink_query_string(mpdin->dash, gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "XLinkQuery") );
-
-	/*dash thread starts at the end of gf_dash_open */
-	e = gf_dash_open(mpdin->dash, url);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot initialize DASH Client for %s: %s\n", url, gf_error_to_string(e)));
-		mpdin->fn_connect_ack(mpdin->service, NULL, e);
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-static GF_Descriptor *MPD_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 i;
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Description request from terminal for %s\n", sub_url));
-	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-		GF_Descriptor *desc;
-		GF_MPDGroup *mudta;
-#if 0
-		if (!gf_dash_is_group_selected(mpdin->dash, i))
-			continue;
-#endif
-		mudta = gf_dash_get_group_udta(mpdin->dash, i);
-		if (!mudta) continue;
-		if (mudta->service_descriptor_fetched) continue;
-
-		desc = mudta->segment_ifce->GetServiceDescriptor(mudta->segment_ifce, expect_type, sub_url);
-		if (desc) mudta->service_descriptor_fetched = 1;
-		gf_odf_desc_del(desc);
-	}
-	return NULL;
-}
-
-
-GF_Err MPD_CloseService(GF_InputService *plug)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	assert(mpdin);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Close Service (%p) request from terminal\n", mpdin->service));
-
-	if (mpdin->service && mpdin->service->subservice_disconnect) return GF_OK;
-
-	mpdin->closed = 1;
-
-	if (mpdin->dash)
-		gf_dash_close(mpdin->dash);
-
-	while (gf_list_count(mpdin->groups)) {
-		GF_MPDGroup *group = gf_list_pop_back(mpdin->groups);
-		if (group->segment_ifce) {
-			if (group->service_connected) {
-				group->segment_ifce->CloseService(group->segment_ifce);
-				group->service_connected = 0;
-			}
-			gf_modules_close_interface((GF_BaseInterface *) group->segment_ifce);
-		}
-		if (group->mime) gf_free(group->mime);
-		gf_free(group);
-	}
-
-	gf_service_disconnect_ack(mpdin->service, NULL, GF_OK);
-
-	return GF_OK;
-}
-
-GF_Err MPD_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	s32 idx;
-	GF_Err e;
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_InputService *segment_ifce = NULL;
-
-	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
-
-	segment_ifce = MPD_GetInputServiceForChannel(mpdin, com->base.on_channel);
-
-	switch (com->command_type) {
-	case GF_NET_SERVICE_INFO:
-	{
-		s32 idx;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Info command from terminal on Service (%p)\n", mpdin->service));
-
-		e = GF_OK;
-		if (segment_ifce) {
-			/* defer to the real input service */
-			e = segment_ifce->ServiceCommand(segment_ifce, com);
-		}
-
-		if (e!= GF_OK || !com->info.name || 2 > strlen(com->info.name)) {
-			gf_dash_get_info(mpdin->dash, &com->info.name, &com->info.comment);
-		}
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-		if (idx>=0) {
-			//gather role and co
-			if (!com->info.role) {
-				gf_dash_group_enum_descriptor(mpdin->dash, idx, GF_MPD_DESC_ROLE, 0, NULL, NULL, &com->info.role);
-			}
-			if (!com->info.accessibility) {
-				gf_dash_group_enum_descriptor(mpdin->dash, idx, GF_MPD_DESC_ACCESSIBILITY, 0, NULL, NULL, &com->info.accessibility);
-			}
-			if (!com->info.rating) {
-				gf_dash_group_enum_descriptor(mpdin->dash, idx, GF_MPD_DESC_RATING, 0, NULL, NULL, &com->info.rating);
-			}
-		}
-		return GF_OK;
-	}
-	/*we could get it from MPD*/
-	case GF_NET_SERVICE_HAS_AUDIO:
-		if (segment_ifce) {
-			/* defer to the real input service */
-			return segment_ifce->ServiceCommand(segment_ifce, com);
-		}
-		return GF_NOT_SUPPORTED;
-
-	case GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE:
-		com->par.width = mpdin->use_max_res ? mpdin->width : 0;
-		com->par.height = mpdin->use_max_res ? mpdin->height : 0;
-		return GF_OK;
-
-	case GF_NET_SERVICE_QUALITY_SWITCH:
-		if (com->switch_quality.set_tile_mode_plus_one) {
-			GF_BaseInterface *pl = (GF_BaseInterface *)plug;
-			GF_DASHTileAdaptationMode tile_mode = com->switch_quality.set_tile_mode_plus_one - 1;
-			gf_dash_set_tile_adaptation_mode(mpdin->dash, tile_mode, 100);
-			
-			switch (tile_mode) {
-			case GF_DASH_ADAPT_TILE_ROWS: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "rows"); break;
-			case GF_DASH_ADAPT_TILE_ROWS_REVERSE: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "reverseRows"); break;
-			case GF_DASH_ADAPT_TILE_ROWS_MIDDLE: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "middleRows"); break;
-			case GF_DASH_ADAPT_TILE_COLUMNS: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "columns"); break;
-			case GF_DASH_ADAPT_TILE_COLUMNS_REVERSE: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "reverseColumns"); break;
-			case GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "middleColumns"); break;
-			case GF_DASH_ADAPT_TILE_CENTER: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "center"); break;
-			case GF_DASH_ADAPT_TILE_EDGES: gf_modules_set_option(pl,  "DASH", "TileAdaptation", "edges"); break;
-			case GF_DASH_ADAPT_TILE_NONE:
-			default:
-				gf_modules_set_option(pl,  "DASH", "TileAdaptation", "none");
-				break;
-			}
-		} else if (com->switch_quality.set_auto) {
-			gf_dash_set_automatic_switching(mpdin->dash, 1);
-		} else if (com->base.on_channel) {
-				segment_ifce = MPD_GetInputServiceForChannel(mpdin, com->base.on_channel);
-				if (!segment_ifce) return GF_NOT_SUPPORTED;
-				idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-				if (idx < 0) return GF_BAD_PARAM;
-			
-				gf_dash_group_set_quality_degradation_hint(mpdin->dash, idx, com->switch_quality.quality_degradation);
-				if (! com->switch_quality.ID) return GF_OK;
-			
-				if (com->switch_quality.dependent_group_index) {
-					if (com->switch_quality.dependent_group_index > gf_dash_group_get_num_groups_depending_on(mpdin->dash, idx))
-						return GF_BAD_PARAM;
-			
-					idx = gf_dash_get_dependent_group_index(mpdin->dash, idx, com->switch_quality.dependent_group_index-1);
-					if (idx==-1) return GF_BAD_PARAM;
-				}
-
-				gf_dash_set_automatic_switching(mpdin->dash, 0);
-				gf_dash_group_select_quality(mpdin->dash, idx, com->switch_quality.ID);
-		} else {
-			gf_dash_switch_quality(mpdin->dash, com->switch_quality.up, mpdin->immediate_switch);
-		}
-		return GF_OK;
-
-	case GF_NET_GET_TIMESHIFT:
-		com->timeshift.time = gf_dash_get_timeshift_buffer_pos(mpdin->dash);
-		return GF_OK;
-	case GF_NET_SERVICE_CAN_REVERSE_PLAYBACK:
-		return mpdin_dash_can_reverse_playback(mpdin);
-
-	case GF_NET_ASSOCIATED_CONTENT_TIMING:
-		gf_dash_override_ntp(mpdin->dash, com->addon_time.ntp);
-		return GF_OK;
-	default:
-		break;
-	}
-	/*not supported*/
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-
-	segment_ifce = MPD_GetInputServiceForChannel(mpdin, com->base.on_channel);
-	if (!segment_ifce) return GF_NOT_SUPPORTED;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_INTERACTIVE:
-		/* TODO - we are interactive if not live without timeshift */
-		return GF_OK;
-
-	case GF_NET_CHAN_GET_SRD:
-	{
-		Bool res;
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->base.on_channel);
-		if (idx < 0) return GF_BAD_PARAM;
-		if (com->srd.dependent_group_index) {
-			if (com->srd.dependent_group_index > gf_dash_group_get_num_groups_depending_on(mpdin->dash, idx))
-				return GF_BAD_PARAM;
-			
-			idx = gf_dash_get_dependent_group_index(mpdin->dash, idx, com->srd.dependent_group_index-1);
-		}		
-		res = gf_dash_group_get_srd_info(mpdin->dash, idx, NULL, &com->srd.x, &com->srd.y, &com->srd.w, &com->srd.h, &com->srd.width, &com->srd.height);
-		return res ? GF_OK : GF_NOT_SUPPORTED;
-	}
-
-	case GF_NET_GET_STATS:
-	{
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->base.on_channel);
-		if (idx < 0) return GF_BAD_PARAM;
-		com->net_stats.bw_down = 8 * gf_dash_group_get_download_rate(mpdin->dash, idx);
-	}
-		return GF_OK;
-
-	case GF_NET_SERVICE_QUALITY_QUERY:
-	{
-		GF_DASHQualityInfo qinfo;
-		GF_Err e;
-		u32 count, g_idx;
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->quality_query.on_channel);
-		if (idx < 0) return GF_BAD_PARAM;
-		count = gf_dash_group_get_num_qualities(mpdin->dash, idx);
-		if (!com->quality_query.index && !com->quality_query.dependent_group_index) {
-			com->quality_query.index = count;
-			com->quality_query.dependent_group_index = gf_dash_group_get_num_groups_depending_on(mpdin->dash, idx);
-			return GF_OK;
-		}
-		if (com->quality_query.dependent_group_index) {
-			if (com->quality_query.dependent_group_index > gf_dash_group_get_num_groups_depending_on(mpdin->dash, idx))
-				return GF_BAD_PARAM;
-			
-			g_idx = gf_dash_get_dependent_group_index(mpdin->dash, idx, com->quality_query.dependent_group_index-1);
-			if (g_idx==(u32)-1) return GF_BAD_PARAM;
-			count = gf_dash_group_get_num_qualities(mpdin->dash, g_idx);
-			if (com->quality_query.index>count) return GF_BAD_PARAM;
-		} else {
-			if (com->quality_query.index>count) return GF_BAD_PARAM;
-			g_idx = idx;
-		}
-
-		e = gf_dash_group_get_quality_info(mpdin->dash, g_idx, com->quality_query.index-1, &qinfo);
-		if (e) return e;
-		//group->bandwidth = qinfo.bandwidth;
-		com->quality_query.bandwidth = qinfo.bandwidth;
-		com->quality_query.ID = qinfo.ID;
-		com->quality_query.mime = qinfo.mime;
-		com->quality_query.codec = qinfo.codec;
-		com->quality_query.width = qinfo.width;
-		com->quality_query.height = qinfo.height;
-		com->quality_query.interlaced = qinfo.interlaced;
-		if (qinfo.fps_den) {
-			com->quality_query.fps = qinfo.fps_num;
-			com->quality_query.fps /= qinfo.fps_den;
-		} else {
-			com->quality_query.fps = qinfo.fps_num;
-		}
-		com->quality_query.par_num = qinfo.par_num;
-		com->quality_query.par_den = qinfo.par_den;
-		com->quality_query.sample_rate = qinfo.sample_rate;
-		com->quality_query.nb_channels = qinfo.nb_channels;
-		com->quality_query.disabled = qinfo.disabled;
-		com->quality_query.is_selected = qinfo.is_selected;
-		com->quality_query.automatic = gf_dash_get_automatic_switching(mpdin->dash);
-		com->quality_query.tile_adaptation_mode = (u32) gf_dash_get_tile_adaptation_mode(mpdin->dash);
-		return GF_OK;
-	}
-	case GF_NET_CHAN_VISIBILITY_HINT:
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->base.on_channel);
-		if (idx < 0) return GF_BAD_PARAM;
-
-		return gf_dash_group_set_visible_rect(mpdin->dash, idx, com->visibility_hint.min_x, com->visibility_hint.max_x, com->visibility_hint.min_y, com->visibility_hint.max_y);
-
-	case GF_NET_CHAN_BUFFER:
-		/*get it from MPD minBufferTime - if not in low latency mode, indicate the value given in MPD (not possible to fetch segments earlier) - to be more precise we should get the min segment duration for this group*/
-		if (/* !mpdin->use_low_latency && */ (mpdin->buffer_mode>=MPDIN_BUFFER_MIN)) {
-			u32 max = gf_dash_get_min_buffer_time(mpdin->dash);
-			if (max>com->buffer.max)
-				com->buffer.max = max;
-
-			if (!com->buffer.min && ! gf_dash_is_dynamic_mpd(mpdin->dash)) {
-				com->buffer.min = 1;
-			}
-		}
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-		if (idx >= 0) {
-			gf_dash_group_set_max_buffer_playout(mpdin->dash, idx, com->buffer.max);
-		}
-		return GF_OK;
-
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = gf_dash_get_duration(mpdin->dash);
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-		if (idx >= 0) {
-			com->duration.time_shift_buffer = gf_dash_group_get_time_shift_buffer_depth(mpdin->dash, idx);
-		}
-		return GF_OK;
-
-	case GF_NET_CHAN_PLAY:
-
-		idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-		if (idx < 0) return GF_BAD_PARAM;
-
-		//adjust play range from media timestamps to MPD time
-		if (com->play.timestamp_based) {
-			u32 timescale;
-			u64 pto;
-			Double offset;
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, idx);
-
-			if (com->play.timestamp_based==1) {
-				gf_dash_group_get_presentation_time_offset(mpdin->dash, idx, &pto, &timescale);
-				offset = (Double) pto;
-				offset /= timescale;
-				com->play.start_range -= offset;
-				if (com->play.start_range < 0) com->play.start_range = 0;
-			}
-
-			group->is_timestamp_based = 1;
-			group->pto_setup = 0;
-			mpdin->media_start_range = com->play.start_range;
-		} else {
-			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, idx);
-			group->is_timestamp_based = 0;
-			group->pto_setup = 0;
-			if (com->play.start_range<0) com->play.start_range = 0;
-			//in m3u8, we need also media start time for mapping time
-			if (gf_dash_is_m3u8(mpdin->dash))
-				mpdin->media_start_range = com->play.start_range;
-		}
-
-		//we cannot handle seek request outside of a period being setup, this messes up our internal service setup
-		//we postpone the seek and will request it later on ...
-		if (gf_dash_in_period_setup(mpdin->dash)) {
-			u64 p_end = gf_dash_get_period_duration(mpdin->dash);
-			if (p_end) {
-				p_end += gf_dash_get_period_start(mpdin->dash);
-				if (p_end<1000*com->play.start_range) {
-					mpdin->seek_request = com->play.start_range;
-					return GF_OK;
-				}
-			}
-		}
-
-
-		gf_dash_set_speed(mpdin->dash, com->play.speed);
-
-		/*don't seek if this command is the first PLAY request of objects declared by the subservice, unless start range is not default one (0) */
-		if (!mpdin->nb_playing && (!com->play.initial_broadcast_play || (com->play.start_range>1.0) )) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Play command from terminal on channel %p on Service (%p)\n", com->base.on_channel, mpdin->service));
-
-			if (com->play.end_range<=0) {
-				u32 ms = (u32) ( 1000 * (-com->play.end_range) );
-				if (ms<1000) ms = 0;
-				gf_dash_set_timeshift(mpdin->dash, ms);
-			}
-			if (!com->play.initial_broadcast_play || !mpdin->at_period_switch)
-				gf_dash_seek(mpdin->dash, com->play.start_range);
-
-			//to remove once we manage to keep the service alive
-			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
-			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
-		} else if (!com->play.initial_broadcast_play) {
-			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
-			if (gf_dash_get_period_switch_status(mpdin->dash)) return GF_OK;
-
-			//seek on a single group
-			gf_dash_group_seek(mpdin->dash, idx, com->play.start_range);
-		}
-
-		//check if current segment playback should be aborted
-		com->play.dash_segment_switch = gf_dash_group_segment_switch_forced(mpdin->dash, idx);
-
-		gf_dash_group_select(mpdin->dash, idx, GF_TRUE);
-		gf_dash_set_group_done(mpdin->dash, (u32) idx, 0);
-
-		//adjust start range from MPD time to media time
-		{
-			u64 pto;
-			u32 timescale;
-			com->play.start_range = gf_dash_group_get_start_range(mpdin->dash, idx);
-			gf_dash_group_get_presentation_time_offset(mpdin->dash, idx, &pto, &timescale);
-			com->play.start_range += ((Double)pto) / timescale;
-		}
-
-		mpdin->nb_playing++;
-		return segment_ifce->ServiceCommand(segment_ifce, com);
-
-	case GF_NET_CHAN_STOP:
-	{
-		s32 idx = MPD_GetGroupIndexForChannel(mpdin, com->play.on_channel);
-		if (idx>=0) {
-			gf_dash_set_group_done(mpdin->dash, (u32) idx, 1);
-		}
-		if (mpdin->nb_playing)
-			mpdin->nb_playing--;
-	}
-	return segment_ifce->ServiceCommand(segment_ifce, com);
-
-	/*we could get it from MPD*/
-	case GF_NET_CHAN_GET_PIXEL_AR:
-		/* defer to the real input service */
-		return segment_ifce->ServiceCommand(segment_ifce, com);
-
-	case GF_NET_CHAN_SET_SPEED:
-		gf_dash_set_speed(mpdin->dash, com->play.speed);
-		return segment_ifce->ServiceCommand(segment_ifce, com);
-
-	default:
-		return segment_ifce->ServiceCommand(segment_ifce, com);
-	}
-}
-
-GF_Err MPD_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_InputService *segment_ifce = MPD_GetInputServiceForChannel(mpdin, channel);
-	if (!plug || !plug->priv || !segment_ifce) return GF_SERVICE_ERROR;
-	return segment_ifce->ChannelGetSLP(segment_ifce, channel, out_data_ptr, out_data_size, out_sl_hdr, sl_compressed, out_reception_status, is_new_data);
-}
-
-GF_Err MPD_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_InputService *segment_ifce = MPD_GetInputServiceForChannel(mpdin, channel);
-	if (!plug || !plug->priv || !segment_ifce) return GF_SERVICE_ERROR;
-	return segment_ifce->ChannelReleaseSLP(segment_ifce, channel);
-}
-
-Bool MPD_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	/**
-	* May arrive when using pid:// URLs into a TS stream
-	*/
-	GF_MPD_In *mpdin = (GF_MPD_In*) plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Can Handle URL In Service (%p) request from terminal for %s\n", mpdin->service, url));
-	if (!plug || !plug->priv || !mpdin->dash) return GF_FALSE;
-	if (gf_dash_get_url(mpdin->dash) && !strcmp(gf_dash_get_url(mpdin->dash) , url)) {
-		return 1;
-	} else {
-		GF_MPDGroup *mudta;
-		u32 i;
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			if (!gf_dash_is_group_selected(mpdin->dash, i)) continue;
-
-			mudta = gf_dash_get_group_udta(mpdin->dash, i);
-			if (mudta && mudta->segment_ifce && mudta->segment_ifce->CanHandleURLInService) {
-				return mudta->segment_ifce->CanHandleURLInService(plug, url);
-			}
-		}
-		return 0;
-	}
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	GF_MPD_In *mpdin;
-	GF_InputService *plug;
-	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MPD Loader", "gpac distribution")
-	
-	GF_SAFEALLOC(mpdin, GF_MPD_In);
-	if (!mpdin) {
-		gf_free(plug);
-		return NULL;
-	}
-	mpdin->groups = gf_list_new();
-	plug->priv = mpdin;
-	mpdin->plug = plug;
-	
-	plug->RegisterMimeTypes = MPD_RegisterMimeTypes;
-	plug->CanHandleURL = MPD_CanHandleURL;
-	plug->ConnectService = MPD_ConnectService;
-	plug->CloseService = MPD_CloseService;
-	plug->GetServiceDescriptor = MPD_GetServiceDesc;
-	plug->ConnectChannel = MPD_ConnectChannel;
-	plug->DisconnectChannel = MPD_DisconnectChannel;
-	plug->ServiceCommand = MPD_ServiceCommand;
-	plug->CanHandleURLInService = MPD_CanHandleURLInService;
-	plug->ChannelGetSLP = MPD_ChannelGetSLP;
-	plug->ChannelReleaseSLP = MPD_ChannelReleaseSLP;
-
-	return (GF_BaseInterface *)plug;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *bi)
-{
-	GF_MPD_In *mpdin;
-
-	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
-
-	mpdin = (GF_MPD_In*) ((GF_InputService*)bi)->priv;
-	assert(mpdin);
-
-	if (mpdin->dash)
-		gf_dash_del(mpdin->dash);
-
-	gf_list_del(mpdin->groups);
-	gf_free(mpdin);
-	gf_free(bi);
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( mpd_in )
-
-#endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.8.0.tar.gz/modules/mpegts_in Deleted

gpac-0.8.0.tar.gz/modules/mpegts_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/mpegts_in/mpegts_in.c Deleted

@@ -1,1751 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / M2TS reader module
- *
- *  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/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/mpegts.h>
-#include <gpac/thread.h>
-#include <gpac/network.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-static const char * MIMES[] = { "video/mpeg-2", "video/mp2t", "video/mpeg", NULL};
-static const char * M2TS_EXTENSIONS = "ts m2t mts dmb trp";
-
-//when regulating data rate from file using PCR, this is the maximum sleep we tolerate
-#define M2TS_MAX_SLEEP 200
-
-typedef struct {
-	char *fragment;
-	u32 id;
-	/*if only pid is requested*/
-	u32 pid;
-} M2TSIn_Prog;
-
-typedef struct
-{
-	GF_M2TS_Demuxer *ts;
-
-	GF_InputService *owner;
-
-	GF_ClientService *service;
-
-	Bool ts_setup;
-	Bool request_all_pids;
-	Bool is_connected;
-	Bool low_latency_mode;
-	Bool in_segment_download, first_chunk_in_seg_parsed;
-	Bool first_segment_fetched;
-
-	Bool epg_requested;
-	Bool has_eit;
-	LPNETCHANNEL eit_channel;
-
-	GF_Mutex *mx;
-
-	Bool mpeg4on2_scene_only;
-	char * network_buffer;
-	u32 network_buffer_size;
-
-	/*pick first pcr pid for regulation*/
-	u32 regulation_pcr_pid;
-
-	Bool skip_regulation;
-	Bool has_pending_segments;
-
-	Bool in_data_flush;
-
-	Bool hybrid_on;
-
-	Bool flush_sdt;
-
-	u64 pcr_last;
-	u32 stb_at_last_pcr;
-
-	u32 nb_paused;
-	Bool file_regulate;
-	u32 nb_playing;
-	u32 nb_prog_to_setup;
-
-	u32 map_media_time_on_prog_id;
-	Double media_start_range;
-
-	const char *force_temi_url;
-} M2TSIn;
-
-
-static void M2TS_GetNetworkType(GF_InputService *plug,M2TSIn *reader);
-
-static Bool M2TS_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return 0;
-	if (!strnicmp(url, "udp://", 6)
-	        || !strnicmp(url, "mpegts-udp://", 13)
-	        || !strnicmp(url, "mpegts-tcp://", 13)
-#ifdef GPAC_HAS_LINUX_DVB
-	        || !strnicmp(url, "dvb://", 6)
-#endif
-	   ) {
-		return 1;
-	}
-
-	sExt = strrchr(url, '.');
-	{
-		int i=0;
-		for (i = 0 ; NULL != MIMES[i]; i++)
-			if (gf_service_check_mime_register(plug, MIMES[i], M2TS_EXTENSIONS, "MPEG-2 TS", sExt))
-				return 1;
-	}
-	return 0;
-}
-
-static Bool M2TS_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	Bool ret = 0;
-	M2TSIn *m2ts;
-
-	if (!plug || !url)
-		return 0;
-	m2ts = (M2TSIn *)plug->priv;
-	if (!m2ts)
-		return 0;
-
-	if (!strnicmp(url, "pid://", 6)) {
-		u32 pid = atoi(url+6);
-		if (pid>=GF_M2TS_MAX_STREAMS) return 0;
-		if (m2ts->ts->ess[pid]) return 1;
-		return 0;
-	}
-
-#ifdef GPAC_HAS_LINUX_DVB
-	if (!stricmp(url, "dvb://EPG")) return 1;
-	if (!strnicmp(url, "dvb://", 6)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[DVBIn] Checking reuse of the same tuner for %s\n", url));
-		const char *chan_conf = gf_modules_get_option((GF_BaseInterface *)plug, "DVB", "ChannelsFile");
-		if (!chan_conf) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[DVBIn] Cannot locate channel configuration file\n"));
-			ret = 0;
-		}
-
-		/* if the tuner is already tuned to the same frequence, nothing needs to be done */
-		else if (m2ts->ts->tuner->freq != 0) {
-			char *frag = strchr(url, '#');
-			if (frag) frag[0] = 0;
-			if (m2ts->ts->tuner->freq == gf_dvb_get_freq_from_url(chan_conf, url)) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[DVBIn] Reusing the same tuner for %s\n", url));
-				ret = 1;
-			}
-			if (frag) frag[0] = '#';
-		}
-	} else
-#endif
-		if (!strnicmp(url, "udp://", 6)
-		        || !strnicmp(url, "mpegts-udp://", 13)
-		        || !strnicmp(url, "mpegts-tcp://", 13))
-		{
-			/* TODO: check IP address ...*/
-			ret = 0;
-		} else {
-			char *frag = strchr(url, '#');
-			if (frag) frag[0] = 0;
-			if (!strlen(url) || !strcmp(url, m2ts->ts->filename)) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[DVBIn] Reusing the same input file for %s\n", url));
-				ret = 1;
-			}
-			if (frag) frag[0] = '#';
-		}
-	return ret;
-}
-
-static GF_ESD *MP2TS_GetESD(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size)
-{
-	GF_ESD *esd;
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->ESID = stream->mpeg4_es_id ? stream->mpeg4_es_id : stream->pid;
-
-	switch (stream->stream_type) {
-	case GF_M2TS_VIDEO_MPEG1:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
-		break;
-	case GF_M2TS_VIDEO_MPEG2:
-	case GF_M2TS_VIDEO_DCII:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422;
-		break;
-	case GF_M2TS_VIDEO_MPEG4:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
-		break;
-	case GF_M2TS_VIDEO_H264:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
-		break;
-	case GF_M2TS_VIDEO_SVC:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SVC;
-		break;
-	case GF_M2TS_VIDEO_HEVC:
-	case GF_M2TS_VIDEO_HEVC_TEMPORAL:
-	case GF_M2TS_VIDEO_HEVC_MCTS:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
-		break;
-	case GF_M2TS_VIDEO_SHVC:
-	case GF_M2TS_VIDEO_SHVC_TEMPORAL:
-	case GF_M2TS_VIDEO_MHVC:
-	case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_LHVC;
-		break;
-	case GF_M2TS_AUDIO_MPEG1:
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-		break;
-	case GF_M2TS_AUDIO_MPEG2:
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
-		break;
-	case GF_M2TS_AUDIO_LATM_AAC:
-	case GF_M2TS_AUDIO_AAC:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-		if (!dsi) {
-			/*turn on parsing to get AAC config
-				NB: we removed "no file regulation" since we may get broken files where PMT declares an AAC stream but no AAC PID is in the MUX
-				(filtered out). In this case, "no regulation" will make the entire TS to be read as fast as possible
-			*/
-			if (m2ts->ts->file) {
-				m2ts->file_regulate = 2;
-				gf_m2ts_pause_demux(m2ts->ts, 0);
-			}
-			gf_m2ts_set_pes_framing(stream, GF_M2TS_PES_FRAMING_DEFAULT);
-			gf_odf_desc_del((GF_Descriptor *)esd);
-			return NULL;
-		}
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
-		break;
-	case GF_M2TS_AUDIO_AC3:
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AC3;
-		break;
-	case GF_M2TS_AUDIO_EC3:
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_EAC3;
-		break;
-	case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
-	default:
-		gf_odf_desc_del((GF_Descriptor *)esd);
-		return NULL;
-	}
-	esd->decoderConfig->bufferSizeDB = 0;
-
-	/*we only use AUstart indicator*/
-	esd->slConfig->useAccessUnitStartFlag = 1;
-	esd->slConfig->useAccessUnitEndFlag = 0;
-	esd->slConfig->useRandomAccessPointFlag = 1;
-	esd->slConfig->AUSeqNumLength = 0;
-	esd->slConfig->timestampResolution = 90000;
-
-	/*ASSIGN PCR here*/
-	esd->OCRESID = stream->program->pcr_pid;
-	if (stream->pid == stream->program->pcr_pid) {
-		esd->slConfig->OCRResolution = 27000000;
-	}
-
-	/*decoder config*/
-	if (dsi) {
-		esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*dsi_size);
-		memcpy(esd->decoderConfig->decoderSpecificInfo->data, dsi, sizeof(char)*dsi_size);
-		esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_size;
-	}
-	return esd;
-}
-
-static GF_ObjectDescriptor *MP2TS_GetOD(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size, u32 *streamType)
-{
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
-	u32 cur_ES, i, count;
-
-	/*create a stream description for this channel*/
-	esd = MP2TS_GetESD(m2ts, stream, dsi, dsi_size);
-	if (!esd) return NULL;
-
-	if (stream->program->is_scalable)
-		esd->has_scalable_layers = GF_TRUE;
-
-	/*declare object to terminal*/
-	od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	gf_list_add(od->ESDescriptors, esd);
-	od->objectDescriptorID = 0;
-	if (streamType) *streamType = esd->decoderConfig->streamType;
-	/*remember program number for service/program selection*/
-	od->ServiceID = stream->program->number;
-	od->service_ifce = m2ts->owner;
-
-	/*create a stream description for the channels depending on this channel, set esd->dependsOnESID and add to od*/
-	cur_ES = esd->ESID;
-	count = gf_list_count(stream->program->streams);
-	for (i = 0; i < count; i++) {
-		GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(stream->program->streams, i);
-		if ((es->flags & GF_M2TS_ES_IS_PES) && ( ((GF_M2TS_PES *)es)->depends_on_pid == cur_ES)) {
-			GF_ESD *the_esd;
-			the_esd = MP2TS_GetESD(m2ts, (GF_M2TS_PES *)es, dsi, dsi_size);
-			if (the_esd) {
-				if (/*(esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) &&*/ the_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC) {
-					esd->has_scalable_layers = GF_FALSE;
-				}
-				the_esd->has_scalable_layers = GF_TRUE;
-
-				the_esd->dependsOnESID = cur_ES;
-				gf_list_add(od->ESDescriptors, the_esd);
-
-				cur_ES = the_esd->ESID;
-			}
-		}
-	}
-
-	return od;
-}
-
-static void MP2TS_DeclareStream(M2TSIn *m2ts, GF_M2TS_PES *stream, char *dsi, u32 dsi_size)
-{
-	GF_ObjectDescriptor *od = MP2TS_GetOD(m2ts, stream, dsi, dsi_size, NULL);
-	if (!od) return;
-	/*declare but don't regenerate scene*/
-	gf_service_declare_media(m2ts->service, (GF_Descriptor*)od, 1);
-}
-
-static void MP2TS_SetupProgram(M2TSIn *m2ts, GF_M2TS_Program *prog, Bool regenerate_scene, Bool no_declare)
-{
-	u32 i, count;
-
-	count = gf_list_count(prog->streams);
-#ifdef GPAC_HAS_LINUX_DVB
-	if (m2ts->ts->tuner) {
-		Bool found = 0;
-		for (i=0; i<count; i++) {
-			GF_M2TS_PES *pes = gf_list_get(prog->streams, i);
-			if (pes->pid==m2ts->ts->tuner->vpid) found = 1;
-			else if (pes->pid==m2ts->ts->tuner->apid) found = 1;
-		}
-		if (!found) return;
-	}
-#endif
-
-	/*TS is a file, start regulation regardless of how the TS is access (with or without fragment URI)*/
-	if (m2ts->ts->file || m2ts->ts->dnload) {
-		m2ts->file_regulate = 1;
-		if (!m2ts->nb_playing) gf_m2ts_pause_demux(m2ts->ts, 1);
-	}
-
-	for (i=0; i<count; i++) {
-		GF_M2TS_ES *es = gf_list_get(prog->streams, i);
-		if (es->pid==prog->pmt_pid) continue;
-		if (((GF_M2TS_PES *)es)->depends_on_pid ) {
-			prog->is_scalable = GF_TRUE;
-			break;
-		}
-	}
-
-	for (i=0; i<count; i++) {
-		GF_M2TS_ES *es = gf_list_get(prog->streams, i);
-		if (es->pid==prog->pmt_pid) continue;
-		if ((es->flags & GF_M2TS_ES_IS_PES) && ((GF_M2TS_PES *)es)->depends_on_pid )
-			continue;
-
-		/*move to skip mode for all ES until asked for playback*/
-		if (!es->user)
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_SKIP);
-
-		if (!prog->pmt_iod && !no_declare) {
-			if (! (es->flags & GF_M2TS_ES_ALREADY_DECLARED)) {
-				MP2TS_DeclareStream(m2ts, (GF_M2TS_PES *)es, NULL, 0);
-				es->flags |= GF_M2TS_ES_ALREADY_DECLARED;
-			}
-		}
-		/*if IOD, streams not declared through OD framework are refered to by pid:// scheme, and will be declared upon
-		request by the terminal through GetServiceDesc*/
-	}
-
-	/*force scene regeneration*/
-	if (!prog->pmt_iod && regenerate_scene)
-		gf_service_declare_media(m2ts->service, NULL, 0);
-
-
-	if (m2ts->nb_prog_to_setup) {
-		m2ts->nb_prog_to_setup--;
-	}
-}
-
-static void MP2TS_SendPacket(M2TSIn *m2ts, GF_M2TS_PES_PCK *pck)
-{
-	GF_SLHeader slh;
-
-	/*pcr not initialized, don't send any data*/
-	if (! pck->stream->program->first_dts) return;
-	if (!pck->stream->user) return;
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	slh.accessUnitStartFlag = (pck->flags & GF_M2TS_PES_PCK_AU_START) ? 1 : 0;
-	if (slh.accessUnitStartFlag) {
-		slh.compositionTimeStampFlag = 1;
-		slh.compositionTimeStamp = pck->PTS;
-		if (pck->DTS != pck->PTS) {
-			slh.decodingTimeStampFlag = 1;
-			slh.decodingTimeStamp = pck->DTS;
-		}
-		slh.randomAccessPointFlag = (pck->flags & GF_M2TS_PES_PCK_RAP) ? 1 : 0;
-	}
-	gf_service_send_packet(m2ts->service, pck->stream->user, pck->data, pck->data_len, &slh, GF_OK);
-
-}
-
-static GFINLINE void MP2TS_SendSLPacket(M2TSIn *m2ts, GF_M2TS_SL_PCK *pck)
-{
-	GF_SLHeader SLHeader, *slh = NULL;
-	u32 SLHdrLen = 0;
-
-	/*build a SL Header*/
-	if (((GF_M2TS_ES*)pck->stream)->slcfg) {
-		gf_sl_depacketize(((GF_M2TS_ES*)pck->stream)->slcfg, &SLHeader, pck->data, pck->data_len, &SLHdrLen);
-		SLHeader.m2ts_version_number_plus_one = pck->version_number + 1;
-		slh = &SLHeader;
-	}
-	gf_service_send_packet(m2ts->service, pck->stream->user, pck->data+SLHdrLen, pck->data_len-SLHdrLen, slh, GF_OK);
-}
-
-static GF_ObjectDescriptor *M2TS_GenerateEPG_OD(M2TSIn *m2ts)
-{
-	/* declaring a special stream for displaying eit */
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
-
-	/*create a stream description for this channel*/
-	esd = gf_odf_desc_esd_new(0);
-	esd->ESID = GF_M2TS_PID_EIT_ST_CIT;
-	esd->OCRESID = GF_M2TS_PID_EIT_ST_CIT;
-	esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_PRIVATE_SCENE_EPG;
-	esd->decoderConfig->bufferSizeDB = 0;
-
-	/*we only use AUstart indicator*/
-	esd->slConfig->useAccessUnitStartFlag = 1;
-	esd->slConfig->useRandomAccessPointFlag = 1;
-	esd->slConfig->timestampResolution = 90000;
-
-	/*declare object to terminal*/
-	od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	gf_list_add(od->ESDescriptors, esd);
-	od->objectDescriptorID = 0;
-	od->service_ifce = m2ts->owner;
-	return od;
-}
-
-static void M2TS_FlushRequested(M2TSIn *m2ts)
-{
-	u32 i, j, req_prog_count, count, prog_id, found;
-
-	gf_mx_p(m2ts->mx);
-
-	count = gf_list_count(m2ts->ts->programs);
-	for (j=0; j<count; j++) {
-		GF_M2TS_Program *ts_prog = gf_list_get(m2ts->ts->programs, j);
-		//PMT not yet received, do not allow playback regulation
-		if (!ts_prog->pcr_pid) {
-			m2ts->file_regulate = 0;
-			gf_m2ts_pause_demux(m2ts->ts, 0);
-			gf_mx_v(m2ts->mx);
-			return;
-		}
-	}
-
-
-	found = 0;
-	count = gf_list_count(m2ts->ts->requested_pids);
-	for (i=0; i<count; i++) {
-		M2TSIn_Prog *req_pid = gf_list_get(m2ts->ts->requested_pids, i);
-		GF_M2TS_ES *es = m2ts->ts->ess[req_pid->pid];
-		if (es==NULL) continue;
-
-		/*move to skip mode for all PES until asked for playback*/
-		if (!(es->flags & GF_M2TS_ES_IS_SECTION) && !es->user)
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_SKIP);
-		MP2TS_DeclareStream(m2ts, (GF_M2TS_PES *)es, NULL, 0);
-		gf_list_rem(m2ts->ts->requested_pids, i);
-		gf_free(req_pid);
-		i--;
-		count--;
-		found++;
-	}
-	req_prog_count = gf_list_count(m2ts->ts->requested_progs);
-	for (i = 0; i < req_prog_count; i++) {
-		M2TSIn_Prog *req_prog = gf_list_get(m2ts->ts->requested_progs, i);
-
-		prog_id = atoi(req_prog->fragment);
-		count = gf_list_count(m2ts->ts->SDTs);
-		for (j=0; j<count; j++) {
-			GF_M2TS_SDT *sdt = gf_list_get(m2ts->ts->SDTs, j);
-			if (!stricmp((const char *) sdt->service, req_prog->fragment)) req_prog->id = sdt->service_id;
-			else if (sdt->service_id==prog_id)  req_prog->id = sdt->service_id;
-		}
-		if (!req_prog->id) {
-			count = gf_list_count(m2ts->ts->programs);
-			for (j=0; j<count; j++) {
-				GF_M2TS_Program *ts_prog = gf_list_get(m2ts->ts->programs, j);
-				if (prog_id==ts_prog->number) {
-					req_prog->id = prog_id;
-					break;
-				}
-			}
-		}
-		if (req_prog->id) {
-			GF_M2TS_Program *ts_prog;
-			count = gf_list_count(m2ts->ts->programs);
-			for (j=0; j<count; j++) {
-				ts_prog = gf_list_get(m2ts->ts->programs, j);
-				if (ts_prog->number==req_prog->id) {
-					MP2TS_SetupProgram(m2ts, ts_prog, 0, 0);
-					found++;
-					gf_free(req_prog->fragment);
-					gf_free(req_prog);
-					gf_list_rem(m2ts->ts->requested_progs, i);
-					req_prog_count--;
-					i--;
-					break;
-				}
-			}
-		}
-	}
-
-	if (m2ts->epg_requested) {
-		if (!m2ts->has_eit) {
-			GF_ObjectDescriptor *od = M2TS_GenerateEPG_OD(m2ts);
-			/*declare but don't regenerate scene*/
-			gf_service_declare_media(m2ts->service, (GF_Descriptor*)od, 0);
-			m2ts->has_eit = 1;
-		}
-	} else {
-		/*force scene regeneration only when EPG is not requested*/
-		if (found)
-			gf_service_declare_media(m2ts->service, NULL, 0);
-	}
-
-	gf_mx_v(m2ts->mx);
-}
-
-static void forward_m2ts_event(M2TSIn *m2ts, u32 evt_type, void *param)
-{
-	GF_NetworkCommand com;
-	memset(&com, 0, sizeof(com));
-
-	com.command_type = GF_NET_SERVICE_EVENT;
-	com.send_event.evt.type = GF_EVENT_FROM_SERVICE;
-	com.send_event.evt.from_service.forward_type = GF_EVT_MPEG2;
-	com.send_event.evt.from_service.service_event_type = evt_type;
-	com.send_event.evt.from_service.param = param;
-	gf_service_command(m2ts->service, &com, GF_OK);
-}
-
-static void M2TS_OnEvent(GF_M2TS_Demuxer *ts, u32 evt_type, void *param)
-{
-	M2TSIn *m2ts = (M2TSIn *) ts->user;
-
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_UPDATE:
-		/*	example code showing how to forward an event from MPEG-2 TS input service to GPAC user*/
-#if 0
-		send_m2ts_event(m2ts, evt_type, param);
-#endif
-		break;
-	case GF_M2TS_EVT_AIT_FOUND:
-		forward_m2ts_event(m2ts, evt_type, param);
-		break;
-	case GF_M2TS_EVT_PAT_FOUND:
-		/* In case the TS has one program, wait for the PMT to send connect, in case of IOD in PMT */
-		if (gf_list_count(m2ts->ts->programs) != 1) {
-			gf_service_connect_ack(m2ts->service, NULL, GF_OK);
-			m2ts->is_connected = 1;
-		}
-		/* Send the TS to the a user if needed. Useful to check the number of received programs*/
-		forward_m2ts_event(m2ts, evt_type, param);
-
-		m2ts->nb_prog_to_setup = gf_list_count(m2ts->ts->programs) ;
-
-		break;
-	case GF_M2TS_EVT_DSMCC_FOUND:
-		forward_m2ts_event(m2ts, evt_type, param);
-		break;
-	case GF_M2TS_EVT_PMT_FOUND:
-		if (gf_list_count(m2ts->ts->programs) == 1) {
-			gf_service_connect_ack(m2ts->service, NULL, GF_OK);
-			m2ts->is_connected = 1;
-		}
-		/*do not declare if  single program was requested for playback*/
-		MP2TS_SetupProgram(m2ts, param, m2ts->request_all_pids, m2ts->request_all_pids ? 0 : 1);
-		M2TS_FlushRequested(m2ts);
-		/* Send the TS to the a user if needed. Useful to check the number of received programs*/
-		forward_m2ts_event(m2ts, evt_type, param);
-		break;
-	case GF_M2TS_EVT_PMT_REPEAT:
-		M2TS_FlushRequested(m2ts);
-		break;
-	case GF_M2TS_EVT_PMT_UPDATE:
-		MP2TS_SetupProgram(m2ts, param, GF_TRUE, GF_FALSE);
-		break;
-
-	case GF_M2TS_EVT_SDT_FOUND:
-	case GF_M2TS_EVT_SDT_UPDATE:
-		m2ts->flush_sdt = 1;
-	case GF_M2TS_EVT_SDT_REPEAT:
-		M2TS_FlushRequested(m2ts);
-		if (m2ts->flush_sdt) {
-			GF_NetworkCommand com;
-			m2ts->flush_sdt = 0;
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.base.command_type = GF_NET_SERVICE_INFO;
-			gf_service_command(m2ts->service, &com, GF_OK);
-		}
-		break;
-	case GF_M2TS_EVT_DVB_GENERAL:
-		if (m2ts->eit_channel) {
-			GF_M2TS_SL_PCK *pck = (GF_M2TS_SL_PCK *)param;
-			gf_service_send_packet(m2ts->service, m2ts->eit_channel, pck->data, pck->data_len, NULL, GF_OK);
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-		MP2TS_SendPacket(m2ts, param);
-		break;
-	case GF_M2TS_EVT_SL_PCK: /* DMB specific */
-		MP2TS_SendSLPacket(m2ts, param);
-		break;
-	case GF_M2TS_EVT_EOS:
-		gf_service_send_packet(m2ts->service, ((GF_M2TS_PES *)param)->user, NULL, 0, NULL, GF_EOS);
-		break;
-	case GF_M2TS_EVT_AAC_CFG:
-	{
-		GF_M2TS_PES_PCK *pck = (GF_M2TS_PES_PCK*)param;
-		if (!pck->stream->first_dts) {
-			gf_m2ts_set_pes_framing(pck->stream, GF_M2TS_PES_FRAMING_SKIP_NO_RESET);
-			MP2TS_DeclareStream(m2ts, pck->stream, pck->data, pck->data_len);
-			if (ts->file || ts->dnload) {
-				m2ts->file_regulate = 1;
-				if (!m2ts->nb_playing) gf_m2ts_pause_demux(m2ts->ts, 1);
-
-			}
-			pck->stream->first_dts=1;
-			/*force scene regeneration*/
-			gf_service_declare_media(m2ts->service, NULL, 0);
-		}
-	}
-	break;
-	case GF_M2TS_EVT_PES_PCR:
-	{
-		Bool discontinuity = ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0;
-		GF_M2TS_PES_PCK *pck;
-		/*send pcr*/
-		if (((GF_M2TS_PES_PCK *) param)->stream && ((GF_M2TS_PES_PCK *) param)->stream->user) {
-			GF_SLHeader slh;
-			memset(&slh, 0, sizeof(GF_SLHeader) );
-			slh.OCRflag = 1;
-			slh.m2ts_pcr = discontinuity ? 2 : 1;
-			slh.objectClockReference = ((GF_M2TS_PES_PCK *) param)->PTS;
-
-			//check if our buffer level is low enough otherwise we would send the OCR_disc way too early
-			//we have to do this because the terminal doesn't "queue" clock discontinuities
-			if (m2ts->file_regulate && discontinuity) {
-				/*query buffer level, don't sleep if too low*/
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(GF_NetworkCommand));
-				com.command_type = GF_NET_BUFFER_QUERY;
-				com.base.on_channel = NULL;
-				while (ts->run_state) {
-					gf_service_command(m2ts->service, &com, GF_OK);
-					if (!com.buffer.occupancy || com.buffer.buffering) {
-						break;
-					}
-					gf_sleep(1);
-				}
-			}
-
-			gf_service_send_packet(m2ts->service, ((GF_M2TS_PES_PCK *) param)->stream->user, NULL, 0, &slh, GF_OK);
-
-			if ( m2ts->map_media_time_on_prog_id && !ts->start_range && (m2ts->map_media_time_on_prog_id==((GF_M2TS_PES_PCK *) param)->stream->program->number)) {
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(com));
-				com.command_type = GF_NET_CHAN_SET_MEDIA_TIME;
-				com.map_time.media_time = m2ts->media_start_range;
-				com.map_time.timestamp = slh.objectClockReference / 300;
-				com.base.on_channel = ((GF_M2TS_PES_PCK *) param)->stream->user;
-				gf_service_command(m2ts->service, &com, GF_OK);
-				m2ts->map_media_time_on_prog_id = 0;
-				m2ts->pcr_last = 0;
-			}
-		}
-		pck = (GF_M2TS_PES_PCK *) param;
-		if (pck->stream && pck->stream->program) pck->stream->program->first_dts = 1;
-
-		if (discontinuity) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] PCR discontinuity - switching from old STB "LLD" to new one "LLD"\n", m2ts->pcr_last, ((GF_M2TS_PES_PCK *) param)->PTS));
-			if (m2ts->pcr_last) {
-				m2ts->pcr_last = pck->PTS;
-				m2ts->stb_at_last_pcr = gf_sys_clock();
-			}
-			/*FIXME - we need to find a way to treat PCR discontinuities correctly while ignoring broken PCR discontinuities
-			seen in many HLS solutions*/
-			return;
-		}
-
-		if (m2ts->file_regulate) {
-			u64 pcr = pck->PTS;
-			u32 stb = gf_sys_clock();
-
-			if (pck->stream) {
-				if (m2ts->regulation_pcr_pid==0) {
-					/*we pick the first PCR PID for file regulation - we don't need to make sure this is the PCR of a program being played as we
-					only check buffer levels, not DTS/PTS of the streams in the regulation step*/
-					m2ts->regulation_pcr_pid = pck->stream->pid;
-				} else if (m2ts->regulation_pcr_pid != pck->stream->pid) {
-					return;
-				}
-			}
-
-
-			if (m2ts->pcr_last) {
-				s32 diff;
-				if (pcr < m2ts->pcr_last) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] PCR "LLU" less than previous PCR "LLU"\n", ((GF_M2TS_PES_PCK *) param)->PTS, m2ts->pcr_last));
-					m2ts->pcr_last = pcr;
-					m2ts->stb_at_last_pcr = gf_sys_clock();
-					diff = 0;
-				} else {
-					u64 pcr_diff = (pcr - m2ts->pcr_last);
-					pcr_diff /= 27000;
-					if (pcr_diff>1000) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] PCR diff too big: "LLU" ms - PCR "LLU" - previous PCR "LLU" - error in TS ?\n", pcr_diff, ((GF_M2TS_PES_PCK *) param)->PTS, m2ts->pcr_last));
-						diff = 100;
-					} else {
-						diff = (u32) pcr_diff - (stb - m2ts->stb_at_last_pcr);
-					}
-				}
-				if (diff<-400) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] Demux not going fast enough according to PCR (drift %d, pcr: "LLU", last pcr: "LLU")\n", diff, pcr, m2ts->pcr_last));
-				} else if (diff>0) {
-					u32 sleep_for=1;
-#ifndef GPAC_DISABLE_LOG
-					u32 nb_sleep=0;
-#endif
-					/*query buffer level, don't sleep if too low*/
-					GF_NetworkCommand com;
-					com.command_type = GF_NET_BUFFER_QUERY;
-					com.base.on_channel = NULL;
-					while (ts->run_state) {
-						gf_service_command(m2ts->service, &com, GF_OK);
-						if (!com.buffer.occupancy || (com.buffer.occupancy < com.buffer.max)) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux not going to sleep: buffer occupancy %d ms\n", com.buffer.occupancy));
-							break;
-						}
-						/*We don't sleep for the entire buffer occupancy, because we would take
-						the risk of starving the audio chains. We try to keep buffers half full*/
-						sleep_for = MIN(com.buffer.occupancy/2, M2TS_MAX_SLEEP);
-
-#ifndef GPAC_DISABLE_LOG
-						if (!nb_sleep) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux going to sleep for %d ms (buffer occupancy %d ms)\n", sleep_for, com.buffer.occupancy));
-						}
-						nb_sleep++;
-#endif
-						gf_sleep(sleep_for);
-					}
-#ifndef GPAC_DISABLE_LOG
-					if (nb_sleep) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux resume after %d ms - current buffer occupancy %d ms\n", sleep_for*nb_sleep, com.buffer.occupancy));
-					}
-#endif
-					m2ts->pcr_last = pcr;
-					m2ts->stb_at_last_pcr = gf_sys_clock();
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux drift according to PCR (drift %d, pcr: "LLD", last pcr: "LLD")\n", diff, pcr, m2ts->pcr_last));
-				}
-			} else {
-				m2ts->pcr_last = pcr;
-				m2ts->stb_at_last_pcr = gf_sys_clock();
-			}
-		}
-	}
-	break;
-	case GF_M2TS_EVT_TDT:
-		if (m2ts->hybrid_on) {
-			u32 i, count;
-			GF_M2TS_TDT_TOT *tdt = (GF_M2TS_TDT_TOT *)param;
-			GF_NetworkCommand com;
-			memset(&com, 0, sizeof(com));
-			com.command_type = GF_NET_CHAN_MAP_TIME;
-			com.map_time.media_time = tdt->hour*3600+tdt->minute*60+tdt->second;
-			com.map_time.reset_buffers = 0;
-			count = gf_list_count(ts->programs);
-			for (i=0; i<count; i++) {
-				GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
-				u32 j, count2;
-				if (prog->tdt_found || !prog->last_pcr_value) /*map TDT one time, after we received a PCR*/
-					continue;
-				prog->tdt_found = 1;
-				count2 = gf_list_count(prog->streams);
-				com.map_time.timestamp = prog->last_pcr_value/300;
-				for (j=0; j<count2; j++) {
-					GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
-					if (stream->user) {
-						com.base.on_channel = stream->user;
-						gf_service_command(m2ts->service, &com, GF_OK);
-					}
-				}
-				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",
-				                                       tdt->year, tdt->month, tdt->day, tdt->hour, tdt->minute, tdt->second, com.map_time.timestamp, prog->number));
-			}
-		}
-		break;
-	case GF_M2TS_EVT_TOT:
-		break;
-
-	case GF_M2TS_EVT_DURATION_ESTIMATED:
-	{
-		u32 i, count;
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.command_type = GF_NET_CHAN_DURATION;
-		com.duration.duration = (Double) ((GF_M2TS_PES_PCK *) param)->PTS;
-		com.duration.duration /= 1000;
-		count = gf_list_count(ts->programs);
-		for (i=0; i<count; i++) {
-			GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
-			u32 j, count2;
-			count2 = gf_list_count(prog->streams);
-			for (j=0; j<count2; j++) {
-				GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
-				if (stream->user) {
-					com.base.on_channel = stream->user;
-					gf_service_command(m2ts->service, &com, GF_OK);
-				}
-			}
-		}
-	}
-	break;
-
-	case GF_M2TS_EVT_TEMI_LOCATION:
-	{
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.addon_info.command_type = GF_NET_ASSOCIATED_CONTENT_LOCATION;
-		com.addon_info.external_URL = ((GF_M2TS_TemiLocationDescriptor*)param)->external_URL;
-		if (m2ts->force_temi_url)
-			com.addon_info.external_URL = m2ts->force_temi_url;
-		com.addon_info.is_announce = ((GF_M2TS_TemiLocationDescriptor*)param)->is_announce;
-		com.addon_info.is_splicing = ((GF_M2TS_TemiLocationDescriptor*)param)->is_splicing;
-		com.addon_info.activation_countdown = ((GF_M2TS_TemiLocationDescriptor*)param)->activation_countdown;
-//		com.addon_info.reload_external = ((GF_M2TS_TemiLocationDescriptor*)param)->reload_external;
-		com.addon_info.timeline_id = ((GF_M2TS_TemiLocationDescriptor*)param)->timeline_id;
-		gf_service_command(m2ts->service, &com, GF_OK);
-	}
-	break;
-	case GF_M2TS_EVT_TEMI_TIMECODE:
-	{
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(com));
-		com.addon_time.command_type = GF_NET_ASSOCIATED_CONTENT_TIMING;
-		com.addon_time.timeline_id = ((GF_M2TS_TemiTimecodeDescriptor*)param)->timeline_id;
-		com.addon_time.media_pts = ((GF_M2TS_TemiTimecodeDescriptor*)param)->pes_pts;
-		com.addon_time.media_timescale = ((GF_M2TS_TemiTimecodeDescriptor*)param)->media_timescale;
-		com.addon_time.media_timestamp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->media_timestamp;
-		com.addon_time.force_reload = ((GF_M2TS_TemiTimecodeDescriptor*)param)->force_reload;
-		com.addon_time.is_paused = ((GF_M2TS_TemiTimecodeDescriptor*)param)->is_paused;
-		com.addon_time.ntp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->ntp;
-		gf_service_command(m2ts->service, &com, GF_OK);
-	}
-	break;
-	}
-}
-
-void m2ts_net_io(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	M2TSIn *m2ts = (M2TSIn *) cbk;
-	assert( m2ts );
-	/*handle service message*/
-	gf_service_download_update_stats(m2ts->ts->dnload);
-
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		e = GF_EOS;
-	} else if (param->msg_type==GF_NETIO_DATA_EXCHANGE) {
-		e = GF_OK;
-		assert( m2ts->ts);
-		if (param->size > 0) {
-			/*process chunk*/
-			assert(param->data);
-			if (m2ts->network_buffer_size < param->size) {
-				m2ts->network_buffer = gf_realloc(m2ts->network_buffer, sizeof(char) * param->size);
-				m2ts->network_buffer_size = param->size;
-			}
-			assert( m2ts->network_buffer );
-			memcpy(m2ts->network_buffer, param->data, param->size);
-			gf_m2ts_process_data(m2ts->ts, m2ts->network_buffer, param->size);
-		}
-
-		/*if asked to regulate, wait until we get a play request*/
-		if (m2ts->ts->paused) {
-			while (m2ts->ts->run_state && m2ts->ts->paused ) {
-				gf_sleep(50);
-				continue;
-			}
-		} else {
-			gf_sleep(1);
-		}
-#if 1 //see commit 3642: crashes when reload quickly with http
-		if (!m2ts->ts->run_state) {
-			if (m2ts->ts->dnload)
-				gf_service_download_del( m2ts->ts->dnload );
-			m2ts->ts->dnload = NULL;
-		}
-#endif
-
-	} else {
-		e = param->error;
-	}
-
-	switch (e) {
-	case GF_EOS:
-		if (!m2ts->is_connected) {
-			gf_service_connect_ack(m2ts->service, NULL, GF_OK);
-		}
-		return;
-	case GF_OK:
-		return;
-	default:
-		if (!m2ts->ts_setup) {
-			m2ts->ts_setup = 1;
-		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER,("[MPEGTSIn] : Error while getting data : %s\n", gf_error_to_string(e)));
-		gf_service_connect_ack(m2ts->service, NULL, e);
-	}
-}
-
-/*for DASH - query_type is:
-	0: query init range
-	1: query next segment
-	2: query next segment except currently downloading one
-	3: drop next segment
-*/
-typedef enum {
-	INIT_RANGE = 0,
-	NEXT_SEGMENT,
-	NEXT_SEGMENT_EXCEPT_DL,
-	DROP_NEXT_SEGMENT,
-} DASHQueryType;
-static GF_Err M2TS_QueryNextFile(void *udta, DASHQueryType query_type, const char **out_url, u64 *out_start_range, u64 *out_end_range, u32 *refresh_type)
-{
-	GF_NetworkCommand param;
-	GF_Err query_ret;
-	M2TSIn *m2ts = (M2TSIn *) udta;
-	assert(m2ts->owner);
-	assert( m2ts->owner->query_proxy);
-
-	if (out_url) *out_url = NULL;
-	if (out_start_range) *out_start_range = 0;
-	if (out_end_range) *out_end_range = 0;
-
-	memset(&param, 0, sizeof(GF_NetworkCommand));
-	param.command_type = (query_type == INIT_RANGE) ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
-	param.url_query.drop_first_segment = (query_type == DROP_NEXT_SEGMENT) ? 1 : 0;
-	param.url_query.current_download = (query_type == NEXT_SEGMENT_EXCEPT_DL) ? 0 : 1;
-
-	//we are downloading the segment we play, don't delete it
-	if (m2ts->in_segment_download)
-		param.url_query.drop_first_segment = 0;
-
-	query_ret = m2ts->owner->query_proxy(m2ts->owner, &param);
-
-	if ((query_ret==GF_BUFFER_TOO_SMALL) && query_type && !param.url_query.next_url) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M2TS In] Cannot query next file: not yet downloaded\n"));
-	} else if ((query_ret==GF_OK) && query_type && !param.url_query.next_url) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: no file provided but no error raised\n"));
-	} else if (query_ret && query_type!=INIT_RANGE && query_type!=DROP_NEXT_SEGMENT) {
-		GF_LOG((query_ret<0) ? GF_LOG_ERROR : GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: error: %s\n", gf_error_to_string(query_ret)));
-	} else {
-		if (out_url) *out_url = param.url_query.next_url;
-		if (out_start_range) *out_start_range = param.url_query.start_range;
-		if (out_end_range) *out_end_range = param.url_query.end_range;
-
-		/*the segment is being downloaded now, start monitoring refresh*/
-		if (param.url_query.current_download) {
-			m2ts->low_latency_mode = 1;
-			if (refresh_type) *refresh_type = 1;
-			if (!m2ts->in_segment_download || param.url_query.has_new_data) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] progressive loading of TS segments\n"));
-			}
-			//state "in progress"
-			m2ts->in_segment_download = 1;
-			if (!m2ts->first_chunk_in_seg_parsed) {
-				m2ts->first_chunk_in_seg_parsed=1;
-				m2ts->ts->pos_in_stream = 0;
-			}
-		} else {
-			if (refresh_type) {
-				//segment done downloading but was in progress mode: do a final refresh
-				if (m2ts->in_segment_download) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] End of progressive loading of TS segments\n"));
-					*refresh_type = 2;
-				} else {
-					*refresh_type = 0;
-				}
-			}
-			m2ts->first_chunk_in_seg_parsed=0;
-			m2ts->in_segment_download = 0;
-		}
-	}
-	return query_ret;
-}
-
-enum
-{
-	GF_M2TS_PUSH_SEGMENT,
-	GF_M2TS_PUSH_CHUNK,
-	GF_M2TS_FLUSH_DATA
-};
-
-void m2ts_flush_data(M2TSIn *m2ts, u32 flush_type)
-{
-	u64 start_byterange, end_byterange;
-	GF_Err e = GF_OK;
-	u32 refresh_type = 0;
-	const char *url;
-
-	if (m2ts->in_data_flush) {
-		if (flush_type==GF_M2TS_PUSH_SEGMENT)
-			m2ts->has_pending_segments++;
-		return;
-	}
-	if (! gf_mx_try_lock(m2ts->mx)) {
-		if (flush_type==GF_M2TS_PUSH_SEGMENT)
-			m2ts->has_pending_segments++;
-		return;
-	}
-	m2ts->in_data_flush = 1;
-
-	//check buffer level when start of new segment
-	if (flush_type<=GF_M2TS_PUSH_CHUNK) {
-		GF_NetworkCommand com;
-		/*query buffer level on each channel, don't sleep if too low*/
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.command_type = GF_NET_BUFFER_QUERY;
-		gf_service_command(m2ts->service, &com, GF_OK);
-		if (com.buffer.occupancy && (com.buffer.occupancy >= com.buffer.max)) {
-			//count completed segment that were not dispatched
-			if (flush_type==GF_M2TS_PUSH_SEGMENT)
-				m2ts->has_pending_segments++;
-
-			m2ts->in_data_flush = 0;
-			gf_mx_v(m2ts->mx);
-			return;
-		}
-	}
-	else if (0 && flush_type==GF_M2TS_FLUSH_DATA) {
-		if (! m2ts->has_pending_segments) {
-			m2ts->in_data_flush = 0;
-			gf_mx_v(m2ts->mx);
-			return;
-		}
-	}
-
-	e = M2TS_QueryNextFile(m2ts, (flush_type==GF_M2TS_FLUSH_DATA) ? NEXT_SEGMENT_EXCEPT_DL : NEXT_SEGMENT, &url, &start_byterange, &end_byterange, &refresh_type);
-	if (e) {
-		m2ts->in_data_flush = 0;
-		if (e==GF_EOS) {
-			gf_m2ts_demux_file(m2ts->ts, NULL, 0, 0, 0, 1);
-		}
-		gf_mx_v(m2ts->mx);
-		return;
-	}
-	gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, refresh_type, 0);
-
-	//done, drop segment
-	if (!m2ts->in_segment_download) {
-		e = M2TS_QueryNextFile(m2ts, DROP_NEXT_SEGMENT, &url, &start_byterange, &end_byterange, &refresh_type);
-
-		if (m2ts->has_pending_segments)
-			m2ts->has_pending_segments--;
-
-		if (e==GF_EOS) {
-			gf_m2ts_demux_file(m2ts->ts, NULL, 0, 0, 0, 1);
-		}
-		//we are currently downloading this segment, parse it ONLY IF WE ARE CALLED FROM THE PROXY THREAD
-		//TODO: we should fix this to allow concurrent access to gmem://
-		else if (m2ts->in_segment_download && (flush_type != GF_M2TS_FLUSH_DATA) ) {
-			gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, refresh_type, 0);
-		}
-
-	}
-	m2ts->in_data_flush = 0;
-	gf_mx_v(m2ts->mx);
-}
-
-static GF_Err M2TS_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_Err e;
-	const char *opt;
-	M2TSIn *m2ts = plug->priv;
-
-	M2TS_GetNetworkType(plug,m2ts);
-
-	m2ts->owner = plug;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "HybRadio", "Activated");
-	if (opt && !strcmp(opt, "true")) {
-		m2ts->hybrid_on = 1;
-	}
-
-	m2ts->ts->record_to = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "RecordTo");
-
-	m2ts->service = serv;
-
-	m2ts->force_temi_url = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "ForceTEMILocation");
-	if (m2ts->force_temi_url && !strlen(m2ts->force_temi_url)) m2ts->force_temi_url = NULL;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "UDPBufferSize");
-	if (opt) m2ts->ts->udp_buffer_size = (u32)atoi(opt);
-
-	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "DSMCC", "Activated");
-	if (opt && !strcmp(opt, "yes")) {
-		gf_m2ts_demux_dmscc_init(m2ts->ts);
-	}
-
-	if (url && !strnicmp(url, "http://", 7)) {
-		m2ts->ts->dnload = gf_service_download_new(m2ts->service, url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED | GF_NETIO_SESSION_NOTIFY_DATA, m2ts_net_io, m2ts);
-		if (!m2ts->ts->dnload) {
-			gf_service_connect_ack(m2ts->service, NULL, GF_NOT_SUPPORTED);
-			return GF_OK;
-		} else {
-			e = gf_m2ts_demuxer_play(m2ts->ts);
-		}
-	} else {
-		//dash & HLS - run in non-threaded mode
-		if (plug->query_proxy) {
-			//get byte range if any (local playback)
-			if (url) {
-				u64 start_byterange, end_byterange;
-				gf_mx_p(m2ts->mx);
-				m2ts->in_data_flush = 1;
-				M2TS_QueryNextFile(m2ts, INIT_RANGE, NULL, &start_byterange, &end_byterange, NULL);
-				e = gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, 0, 0);
-				M2TS_QueryNextFile(m2ts, DROP_NEXT_SEGMENT, NULL, NULL, NULL, NULL);
-				m2ts->in_data_flush = 0;
-				gf_mx_v(m2ts->mx);
-			} else {
-				e = GF_OK;
-			}
-			m2ts->ts->run_state = 1;
-		} else {
-			e = gf_m2ts_demuxer_setup(m2ts->ts,url,0);
-		}
-	}
-
-	if (e) {
-		gf_service_connect_ack(m2ts->service, NULL, e);
-	}
-	return e;
-}
-
-static GF_Err M2TS_CloseService(GF_InputService *plug)
-{
-	M2TSIn *m2ts = plug->priv;
-	GF_M2TS_Demuxer* ts = m2ts->ts;
-
-	if (!plug->query_proxy)
-		gf_m2ts_demuxer_close(ts);
-
-	m2ts->ts->run_state = 0;
-
-	if (ts->dnload) gf_service_download_del(ts->dnload);
-	ts->dnload = NULL;
-
-	gf_service_disconnect_ack(m2ts->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *M2TS_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	M2TSIn *m2ts = plug->priv;
-	GF_Descriptor *desc = NULL;
-	char *frag;
-	M2TSIn_Prog *prog;
-
-	if (sub_url && !strnicmp(sub_url, "pid://", 6)) {
-		GF_ObjectDescriptor *od;
-		u32 pid = atoi(sub_url+6);
-		if (pid>=GF_M2TS_MAX_STREAMS) return NULL;
-		od = MP2TS_GetOD(m2ts, (GF_M2TS_PES*) m2ts->ts->ess[pid], NULL, 0, NULL);
-		return (GF_Descriptor *) od;
-	}
-
-	frag = sub_url ? strrchr(sub_url, '#') : NULL;
-	if (frag) frag++;
-
-	/* consider the channel name in DVB URL as a fragment */
-	if (!frag && sub_url && !strncmp(sub_url, "dvb://", 6)) {
-		frag = (char*)sub_url + 6;
-	}
-
-	if (!frag) {
-		m2ts->request_all_pids = 1;
-	} else {
-		/*we need exclusive access*/
-		gf_mx_p(m2ts->mx);
-		if (!strnicmp(frag, "pid=", 4)) {
-			GF_SAFEALLOC(prog, M2TSIn_Prog);
-			if (!prog) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSIn] Fail to allocate pid playback request"));
-				return NULL;
-			}
-			prog->pid = atoi(frag+4);
-			gf_list_add(m2ts->ts->requested_pids, prog);
-		} else if (!strnicmp(frag, "EPG", 3)) {
-			m2ts->epg_requested = 1;
-		} else {
-			u32 i, count;
-			count = gf_list_count(m2ts->ts->requested_progs);
-			prog = NULL;
-			for (i=0; i<count; i++) {
-				prog = gf_list_get(m2ts->ts->requested_progs, i);
-				if (!strcmp(prog->fragment, frag))
-					break;
-				prog = NULL;
-			}
-			if (!prog) {
-				GF_SAFEALLOC(prog, M2TSIn_Prog);
-				if (!prog) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSIn] Fail to allocate URI fragment playback request"));
-					return NULL;
-				}
-				gf_list_add(m2ts->ts->requested_progs, prog);
-				prog->fragment = gf_strdup(frag);
-			}
-		}
-		gf_mx_v(m2ts->mx);
-	}
-
-	/*if type is undefined, check the PMT for an IOD*/
-	if (expect_type<=GF_MEDIA_OBJECT_SCENE) {
-		if (gf_list_count(m2ts->ts->programs) == 1) {
-			GF_M2TS_Program *prog = gf_list_get(m2ts->ts->programs, 0);
-			if (prog->pmt_iod) {
-				m2ts->request_all_pids = 0;
-				gf_odf_desc_copy((GF_Descriptor *)prog->pmt_iod, &desc);
-				((GF_InitialObjectDescriptor *)desc)->service_ifce = m2ts->owner;
-				return desc;
-			}
-		}
-		/*if we expect scene, return NULL and repost a connection ack when we get the PMT*/
-		if (expect_type==GF_MEDIA_OBJECT_SCENE)
-			return NULL;
-		if (m2ts->epg_requested) {
-			GF_ObjectDescriptor *od = M2TS_GenerateEPG_OD(m2ts);
-			m2ts->epg_requested = 0;
-			return (GF_Descriptor *)od;
-		} else {
-			/*returning an empty IOD means "no scene description", let the terminal handle all media objects*/
-			desc = gf_odf_desc_new(GF_ODF_IOD_TAG);
-			((GF_ObjectDescriptor *) desc)->objectDescriptorID = 1;
-			return desc;
-		}
-	}
-
-	/* restart the thread if the same service is reused and if the previous thread terminated */
-	if (!plug->query_proxy) {
-		if (m2ts->ts->run_state == 2) {
-			m2ts->file_regulate = 0;
-			gf_m2ts_demuxer_play(m2ts->ts);
-		}
-	}
-	return NULL;
-}
-
-static GF_Err M2TS_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID;
-	GF_Err e;
-	M2TSIn *m2ts = plug->priv;
-
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%d", &ES_ID);
-
-		/* In case there is a real IOD, we need to translate PID into ESID */
-		if (gf_list_count(m2ts->ts->programs) == 1) {
-			GF_M2TS_Program *prog = gf_list_get(m2ts->ts->programs, 0);
-			if (prog->pmt_iod) {
-				/* IOD is present */
-				u32 i;
-				for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-					GF_M2TS_PES *pes = (GF_M2TS_PES *)m2ts->ts->ess[i];
-					if (!pes || (pes->pid==pes->program->pmt_pid)) continue;
-					if ((pes->mpeg4_es_id == ES_ID)
-					        /*for pid:// url*/
-					        || (!pes->mpeg4_es_id && (pes->pid == ES_ID))
-					   ) {
-						if (pes->user) {
-							e = GF_SERVICE_ERROR;
-							gf_service_connect_ack(m2ts->service, channel, e);
-							return e;
-						} else {
-							pes->user = channel;
-							e = GF_OK;
-							gf_service_connect_ack(m2ts->service, channel, e);
-							return e;
-						}
-					}
-				}
-				/* Stream not found */
-				return e;
-			}
-		}
-
-		/* No IOD */
-		if ((ES_ID == 18) && (!m2ts->ts->ess[18] || !(m2ts->ts->ess[18]->flags & GF_M2TS_ES_IS_PES)) ) {
-			e = GF_OK; /* 18 is the PID of EIT packets */
-			m2ts->eit_channel = channel;
-		} else if (ES_ID<GF_M2TS_MAX_STREAMS) {
-			u32 i, j, count, count2;
-			e = GF_SERVICE_ERROR;
-			count = gf_list_count(m2ts->ts->programs);
-			for (i=0; i<count; i++) {
-				GF_M2TS_Program *prog = gf_list_get(m2ts->ts->programs, i);
-				count2 = gf_list_count(prog->streams);
-				for (j=0; j<count2; j++) {
-					GF_M2TS_PES *pes = (GF_M2TS_PES *)gf_list_get(prog->streams, j);
-					if ((pes->pid == ES_ID) && !pes->user) {
-						pes->user = channel;
-						/*we try to play the highest layer*/
-						if (pes->program->pid_playing < pes->pid)
-							pes->program->pid_playing = pes->pid;
-						e = GF_OK;
-						break;
-					}
-				}
-			}
-		}
-	}
-	gf_service_connect_ack(m2ts->service, channel, e);
-	return e;
-}
-
-static GF_M2TS_PES *M2TS_GetChannel(M2TSIn *m2ts, LPNETCHANNEL channel)
-{
-	u32 i, j, count, count2;
-	count = gf_list_count(m2ts->ts->programs);
-	for (i=0; i<count; i++) {
-		GF_M2TS_Program *prog = gf_list_get(m2ts->ts->programs, i);
-		count2 = gf_list_count(prog->streams);
-		for (j=0; j<count2; j++) {
-			GF_M2TS_PES *pes = (GF_M2TS_PES *)gf_list_get(prog->streams, j);
-			if (pes->user == channel) return pes;
-		}
-	}
-	return NULL;
-}
-
-static GF_M2TS_PES *M2TS_GetFirstRunningChannel(M2TSIn *m2ts)
-{
-	u32 i;
-	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-		GF_M2TS_PES *pes = (GF_M2TS_PES *)m2ts->ts->ess[i];
-		if (!pes || (pes->pid==pes->program->pmt_pid)) continue;
-		if (!pes->user) continue;
-
-		if (gf_m2ts_pes_get_framing_mode(pes) >= GF_M2TS_PES_FRAMING_DEFAULT)
-			return pes;
-	}
-	return NULL;
-}
-
-static GF_Err M2TS_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	M2TSIn *m2ts = plug->priv;
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	GF_M2TS_PES *pes = M2TS_GetChannel(m2ts, channel);
-	if (pes) {
-		pes->user = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(m2ts->service, channel, e);
-	return GF_OK;
-}
-
-static void gf_m2ts_switch_quality(GF_M2TS_Program *prog, GF_M2TS_Demuxer *ts, Bool switch_up)
-{
-	GF_M2TS_ES *es;
-	u32 i, count;
-	GF_NetworkCommand com;
-
-	if (!prog->is_scalable)
-		return;
-
-	if (switch_up) {
-		for (i = 0; i < GF_M2TS_MAX_STREAMS; i++) {
-			es = ts->ess[i];
-			if (es && (es->flags & GF_M2TS_ES_IS_PES) && (((GF_M2TS_PES *)es)->depends_on_pid == prog->pid_playing)) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn on ES%d\n", es->pid));
-				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_DEFAULT);
-				prog->pid_playing = es->pid;
-				return;
-			}
-		}
-	}
-	else {
-		count = gf_list_count(prog->streams);
-		for (i = 0; i < count; i++) {
-			es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-			if (es && (es->pid == prog->pid_playing) && ((GF_M2TS_PES *)es)->depends_on_pid) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn off ES%d - playing ES%d\n", es->pid, ((GF_M2TS_PES *)es)->depends_on_pid));
-				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_SKIP);
-				memset(&com, 0, sizeof(com));
-				com.command_type = GF_NET_CHAN_RESET;
-				com.base.on_channel = ((GF_M2TS_PES *)es)->user;
-				gf_service_command(((M2TSIn *)ts->user)->service, &com, GF_OK);
-				prog->pid_playing = ((GF_M2TS_PES *)es)->depends_on_pid;
-				return;
-			}
-		}
-	}
-}
-
-static GF_Err M2TS_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	GF_M2TS_PES *pes;
-	M2TSIn *m2ts = plug->priv;
-	GF_M2TS_Demuxer *ts = m2ts->ts;
-
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
-		char *frag = strchr(com->audio.base_url, '#');
-		if (frag && !strnicmp(frag, "#pid=", 5)) return GF_NOT_SUPPORTED;
-		return GF_OK;
-	}
-	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH) {
-		u32 i, count;
-		count = gf_list_count(ts->programs);
-		for (i = 0; i < count; i++) {
-			GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs, i);
-			gf_m2ts_switch_quality(prog, ts, com->switch_quality.up);
-		}
-		return GF_OK;
-	}
-	if (com->command_type == GF_NET_SERVICE_PROXY_DATA_RECEIVE) {
-		m2ts_flush_data(m2ts, com->proxy_data.is_chunk ? GF_M2TS_PUSH_CHUNK : GF_M2TS_PUSH_SEGMENT);
-		return GF_OK;
-	}
-	//get info on the first running program
-	if (com->command_type==GF_NET_SERVICE_INFO) {
-		u32 id = com->info.service_id;
-		if (!id) {
-			pes = M2TS_GetFirstRunningChannel(m2ts);
-			if (pes) id = pes->program->number;
-		}
-		if (id) {
-			GF_M2TS_SDT *sdt = gf_m2ts_get_sdt_info(ts, id);
-			if (sdt) {
-				com->info.name = sdt->service;
-				com->info.provider = sdt->provider;
-			}
-		} else {
-			m2ts->flush_sdt = 1;
-		}
-		return GF_OK;
-	}
-
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	switch (com->command_type) {
-	/*we cannot pull complete AUs from the stream*/
-	case GF_NET_CHAN_SET_PULL:
-		return GF_NOT_SUPPORTED;
-	/*we cannot seek stream by stream*/
-	case GF_NET_CHAN_INTERACTIVE:
-		if (m2ts->ts->file) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		//do not override config
-		if (ts->dnload || plug->query_proxy) {
-			if (!com->buffer.max) com->buffer.max = 1000;
-		} else if (ts->file) {
-			//use default small buffer for PCR regulation when from file
-			com->buffer.max = com->buffer.occupancy = M2TS_MAX_SLEEP;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = ts->duration;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		pes = M2TS_GetChannel(m2ts, com->base.on_channel);
-		if (!pes) {
-			if (com->base.on_channel == m2ts->eit_channel) {
-				return GF_OK;
-			}
-			return GF_STREAM_NOT_FOUND;
-		}
-		/*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_INFO, GF_LOG_CONTAINER, ("[M2TSIn] Setting default reframing for PID %d\n", pes->pid));
-		/*this is a multplex, only trigger the play command for the first stream activated*/
-		if (!m2ts->nb_playing) {
-			if (ts->file) {
-				ts->start_range = (u32) (com->play.start_range*1000);
-				ts->end_range = (com->play.end_range>0) ? (u32) (com->play.end_range*1000) : 0;
-				m2ts->media_start_range = com->play.start_range;
-			}
-			if (!m2ts->map_media_time_on_prog_id)
-				m2ts->map_media_time_on_prog_id = pes->program->number;
-
-			if (com->play.dash_segment_switch) {
-				/*this is used in case of HLS stream while we need update media start time for mapping*/
-				m2ts->media_start_range = com->play.start_range;
-				gf_m2ts_abort_parsing(ts, GF_TRUE);
-			}
-
-			/*start demuxer*/
-			if (!plug->query_proxy) {
-				if (ts->run_state!=1) {
-					gf_m2ts_demuxer_play(ts);
-				}
-			}
-		}
-		//remap media time for this program
-		else if (!m2ts->map_media_time_on_prog_id) {
-			m2ts->media_start_range = com->play.start_range;
-			m2ts->map_media_time_on_prog_id = pes->program->number;
-		}
-		if (!m2ts->nb_playing) {
-			gf_m2ts_pause_demux(ts, 0);
-		}
-		m2ts->nb_playing++;
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		pes = M2TS_GetChannel(m2ts, com->base.on_channel);
-		if (!pes) {
-			if (com->base.on_channel == m2ts->eit_channel) {
-				return GF_OK;
-			}
-			return GF_STREAM_NOT_FOUND;
-		}
-		/* In case of EOS, we may receive a stop command after no one is playing */
-		if (m2ts->nb_playing)
-			m2ts->nb_playing--;
-		/*stop demuxer*/
-		if (!plug->query_proxy) {
-			if (!m2ts->nb_playing && (ts->run_state==1) && !m2ts->nb_prog_to_setup) {
-				ts->run_state=0;
-				while (ts->run_state!=2) gf_sleep(2);
-				if (gf_list_count(m2ts->ts->requested_progs)) {
-					m2ts->file_regulate = 0;
-					gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
-					return gf_m2ts_demuxer_play(ts);
-				}
-			}
-		}
-		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
-		return GF_OK;
-	case GF_NET_CHAN_CONFIG:
-		pes = M2TS_GetChannel(m2ts, com->base.on_channel);
-		/*filter all sections carrying SL data for the app to signal the version number of the section*/
-		if (pes && pes->flags & GF_M2TS_ES_IS_SECTION) {
-			if (pes->slcfg) gf_free(pes->slcfg);
-			pes->slcfg = gf_malloc(sizeof(GF_SLConfig));
-			memcpy(pes->slcfg, &com->cfg.sl_config, sizeof(GF_SLConfig));
-			com->cfg.use_m2ts_sections = 1;
-			pes->flags |= GF_M2TS_ES_SEND_REPEATED_SECTIONS;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_PAUSE:
-		if (!m2ts->nb_paused) {
-			gf_m2ts_pause_demux(m2ts->ts, 1);
-		}
-		m2ts->nb_paused++;
-		return GF_OK;
-	case GF_NET_CHAN_RESUME:
-		if (m2ts->nb_paused) {
-			m2ts->nb_paused--;
-			if (!m2ts->nb_paused) {
-				m2ts->pcr_last = 0;
-				gf_m2ts_pause_demux(m2ts->ts, 0);
-
-			}
-		}
-		return GF_OK;
-
-	default:
-		return GF_OK;
-	}
-}
-
-static u32 M2TS_RegisterMimeTypes(const GF_InputService * service) {
-	int i;
-	if (service == NULL)
-		return 0;
-	for (i = 0 ; MIMES[i]; i++)
-		gf_service_register_mime( service, MIMES[i], M2TS_EXTENSIONS, "MPEG-2 TS");
-	return i;
-}
-
-static void M2TS_GetNetworkType(GF_InputService *plug,M2TSIn *reader)
-{
-	const char *mob_on;
-	const char *mcast_ifce;
-
-	mob_on = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "MobileIPEnabled");
-	if(mob_on && !strcmp(mob_on, "yes")) {
-		reader->ts->MobileIPEnabled = 1;
-		reader->ts->network_type = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "MobileIP");
-	}
-
-	mcast_ifce = gf_modules_get_option((GF_BaseInterface*)plug, "Network", "DefaultMCastInterface");
-	if(mcast_ifce) reader->ts->network_type = mcast_ifce;
-}
-
-GF_InputService *NewM2TSReader()
-{
-	M2TSIn *reader;
-	GF_InputService *plug = gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MPEG-2 TS Reader", "gpac distribution")
-
-	plug->CanHandleURL = M2TS_CanHandleURL;
-	plug->CanHandleURLInService = M2TS_CanHandleURLInService;
-	plug->ConnectService = M2TS_ConnectService;
-	plug->CloseService = M2TS_CloseService;
-	plug->GetServiceDescriptor = M2TS_GetServiceDesc;
-	plug->ConnectChannel = M2TS_ConnectChannel;
-	plug->DisconnectChannel = M2TS_DisconnectChannel;
-	plug->ServiceCommand = M2TS_ServiceCommand;
-	plug->RegisterMimeTypes = M2TS_RegisterMimeTypes;
-
-	reader = gf_malloc(sizeof(M2TSIn));
-	memset(reader, 0, sizeof(M2TSIn));
-	plug->priv = reader;
-	reader->ts = gf_m2ts_demux_new();
-	reader->ts->on_event = M2TS_OnEvent;
-	reader->ts->user = reader;
-	reader->ts->demux_and_play = 1;
-	reader->ts->th = gf_th_new("MPEG-2 TS Demux");
-
-	reader->mx = gf_mx_new("MPEG2 Demux");
-
-	return plug;
-}
-
-void DeleteM2TSReader(void *ifce)
-{
-	u32 i, count;
-	M2TSIn *m2ts;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!ifce)
-		return;
-	m2ts = plug->priv;
-	if (!m2ts)
-		return;
-	if( m2ts->ts->requested_progs ) {
-		count = gf_list_count(m2ts->ts->requested_progs);
-		for (i = 0; i < count; i++) {
-			M2TSIn_Prog *prog = gf_list_get(m2ts->ts->requested_progs, i);
-			gf_free(prog->fragment);
-			gf_free(prog);
-		}
-		gf_list_del(m2ts->ts->requested_progs);
-		m2ts->ts->requested_progs = NULL;
-	}
-	if( m2ts->ts->requested_pids ) {
-		count = gf_list_count(m2ts->ts->requested_pids);
-		for (i = 0; i < count; i++) {
-			M2TSIn_Prog *prog = gf_list_get(m2ts->ts->requested_pids, i);
-			gf_free(prog);
-		}
-		gf_list_del(m2ts->ts->requested_pids);
-		m2ts->ts->requested_pids = NULL;
-	}
-	if (m2ts->network_buffer)
-		gf_free(m2ts->network_buffer);
-
-	m2ts->network_buffer = NULL;
-	gf_m2ts_demux_del(m2ts->ts);
-	gf_mx_del(m2ts->mx);
-	gf_free(m2ts);
-
-	gf_free(plug);
-}
-
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_MPEG2TS
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#ifndef GPAC_DISABLE_MPEG2TS
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *) NewM2TSReader();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_MPEG2TS
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteM2TSReader(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( mpegts_in )

gpac-0.8.0.tar.gz/modules/mse_in Deleted

gpac-0.8.0.tar.gz/modules/mse_in/Makefile Deleted

@@ -1,59 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/mse_in
-
-CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" -Wall
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g -DDEBUG
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#libsj specific flags
-ifeq ($(CONFIG_JS),no)
-else
-CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+=-L../../extra_lib/lib/gcc
-endif
-ifeq ($(CONFIG_JS),prefix)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+=-L$(prefix)/lib
-endif
-LINKLIBS+= $(JS_LIBS)
-endif
-
-#common obj
-OBJS=mse_in.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_mse_in$(DYN_LIB_SUFFIX)
-
-all: $(LIB)
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_mse_in-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
-endif
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/mse_in/mse_in.c Deleted

@@ -1,385 +0,0 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato, Jean Le Feuvre
- *          Copyright (c) Telecom ParisTech 2013-
- *                  All rights reserved
- *
- *  This file is part of GPAC / Media Source input module
- *
- *  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/modules/service.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/html5_mse.h>
-
-#ifndef GPAC_DISABLE_MSE
-
-typedef struct __mse_module
-{
-	GF_HTML_MediaSource *mediasource;
-	GF_InputService *plug;
-} GF_MSE_In;
-
-/* The MSE plugin has no MIME type associated, it cannot handle basic media resources (it needs a blob)*/
-static u32 MSE_RegisterMimeTypes(const GF_InputService *plug)
-{
-	return 0;
-}
-
-/* Only Blob URL are supported */
-static Bool MSE_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	if (!plug || !url)
-		return GF_FALSE;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURL request from terminal for URL '%s'\n", url));
-	if (!strncmp(url, "blob:", 5)) {
-		return GF_TRUE;
-	} else {
-		return GF_FALSE;
-	}
-}
-
-/* Returns the source buffer associated with the terminal channel */
-static GF_HTML_SourceBuffer *MSE_GetSourceBufferForChannel(GF_HTML_MediaSource *mediasource, LPNETCHANNEL channel)
-{
-	GF_Channel *ch;
-	if (!channel || !mediasource) {
-		return NULL;
-	} else {
-		u32 i;
-		GF_InputService *parser;
-		ch = (GF_Channel *) channel;
-		assert(ch->odm && ch->odm->OD);
-		parser = (GF_InputService *) ch->odm->OD->service_ifce;
-		if (!parser) return NULL;
-		for (i = 0; i < gf_list_count(mediasource->sourceBuffers.list); i++) {
-			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(mediasource->sourceBuffers.list, i);
-			if (sb && sb->parser && sb->parser == parser) return sb;
-		}
-		return NULL;
-	}
-}
-
-/* For a given source buffer, returns the media track associated with the terminal channel object
-   Association is saved during the ConnectChannel operation */
-static GF_HTML_Track *MSE_GetTrackForChannel(GF_HTML_SourceBuffer *sb, LPNETCHANNEL channel)
-{
-	u32 i;
-	u32 count;
-	count = gf_list_count(sb->tracks);
-	for (i = 0; i < count; i++)
-	{
-		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-		if (track->channel == channel)
-		{
-			return track;
-		}
-	}
-	return NULL;
-}
-
-/* For a given source buffer, returns the media track associated with the given ESID
-   Association is saved when the initialisation segment has been parsed */
-static GF_HTML_Track *gf_mse_get_track_by_esid(GF_HTML_SourceBuffer *sb, u32 ESID)
-{
-	GF_HTML_Track *track;
-	u32 i;
-	u32 count;
-	count = gf_list_count(sb->tracks);
-	for (i=0; i<count; i++)
-	{
-		track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-		if (track->bin_id == ESID)
-		{
-			return track;
-		}
-	}
-	return NULL;
-}
-
-/* We connect the channel only if the sourcebuffer has been created,
-   and a track with the right ESID has been found in the init segment */
-static GF_Err MSE_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID;
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
-	if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
-	if (strstr(url, "ES_ID")) {
-		GF_HTML_Track *track;
-		sscanf(url, "ES_ID=%u", &ESID);
-		track = gf_mse_get_track_by_esid(sb, ESID);
-		if (!track) {
-			return GF_BAD_PARAM;
-		} else {
-			track->channel = channel;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Channel Connection request on Service %p from terminal for URL '%s#%s'\n", channel, msein->mediasource->blobURI, url));
-			return sb->parser->ConnectChannel(sb->parser, channel, url, upstream);
-		}
-	} else {
-		return GF_BAD_PARAM;
-	}
-}
-
-static GF_Err MSE_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_HTML_Track *track;
-	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
-	if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
-	track = MSE_GetTrackForChannel(sb, channel);
-	if (track) {
-		track->channel = NULL;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Disconnect channel request on Service %p from terminal for channel %p\n", msein->mediasource->service, channel));
-	return sb->parser->DisconnectChannel(sb->parser, channel);
-}
-
-/* Upon service connection, if the URL is a blobURL, we do the following:
-   - get the associated MediaSource object, mark it as used
-   - trigger a source event to the media node associated with the service */
-static GF_Err MSE_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Connection request on Service %p from terminal for URL '%s'\n", serv, url));
-	if (!msein|| !serv || !url) {
-		return GF_BAD_PARAM;
-	} else {
-		GF_HTML_MediaSource     *ms = NULL;
-
-		sscanf(url, "blob:%p", &ms);
-		msein->mediasource = ms;
-		ms->reference_count++;
-		ms->service = serv;
-		gf_mse_mediasource_open(ms, serv->owner->mo);
-		return GF_OK;
-	}
-}
-
-/* There is no service description (no MPEG-4 IOD) for this module, the associated scene will be generated dynamically */
-static GF_Descriptor *MSE_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Description request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, sub_url));
-	return NULL;
-}
-
-/* Indicate that the media source object is unused anymore */
-static GF_Err MSE_CloseService(GF_InputService *plug)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	assert( msein );
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Close Service request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
-	if (msein->mediasource) {
-		gf_service_disconnect_ack(msein->mediasource->service, NULL, GF_OK);
-		gf_mse_mediasource_del(msein->mediasource, GF_FALSE);
-		msein->mediasource = NULL;
-	}
-	return GF_OK;
-}
-
-/* Forward all the commands received from the the terminal
-   to the parser associated with the channel on which the command is received */
-static GF_Err MSE_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_HTML_SourceBuffer *sb = NULL;
-
-	if (!plug || !plug->priv || !com ) return GF_SERVICE_ERROR;
-
-	/* channel independant commands */
-	switch (com->command_type) {
-	case GF_NET_SERVICE_INFO:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Info command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
-		return GF_NOT_SUPPORTED;
-	case GF_NET_SERVICE_HAS_AUDIO:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received HasAudio command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
-		return GF_OK;
-	case GF_NET_SERVICE_QUALITY_SWITCH:
-		return GF_NOT_SUPPORTED;
-	default:
-		break;
-	}
-
-	if (!com->base.on_channel) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received unknown command %d from terminal on Service %p for URL '%s'\n", com->command_type, msein->mediasource->service, msein->mediasource->blobURI));
-		return GF_NOT_SUPPORTED;
-	}
-	sb = MSE_GetSourceBufferForChannel(msein->mediasource, com->base.on_channel);
-	if (!sb || !sb->parser) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] SourceBuffer not ready on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
-		return GF_NOT_SUPPORTED;
-	}
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_PLAY:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_STOP:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_PAUSE:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_RESUME:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_SET_SPEED:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_CONFIG:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_DURATION:
-		/* Ignore the duration given by the input service and
-		   Note: the duration of the initial segment will be 0 anyway (in MP4).*/
-		com->duration.duration = 0;
-		return GF_OK;
-
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-
-	case GF_NET_CHAN_BUFFER_QUERY:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_GET_DSI:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_SET_PADDING:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_SET_PULL:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	case GF_NET_CHAN_INTERACTIVE:
-		/* we are interactive */
-		return GF_OK;
-
-	case GF_NET_CHAN_GET_PIXEL_AR:
-		return sb->parser->ServiceCommand(sb->parser, com);
-
-	default:
-		return sb->parser->ServiceCommand(sb->parser, com);
-	}
-}
-
-/* Forward the request for a new packet to the track (ask the parser to parse a new buffer or use already parsed AU) */
-static GF_Err MSE_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size,
-                                GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
-	GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
-	if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
-	gf_mse_track_buffer_get_next_packet(track, out_data_ptr, out_data_size, out_sl_hdr, sl_compressed, out_reception_status, is_new_data);
-	return GF_OK;
-}
-
-/* Indicate to the track that a packet can be released (and potentially deleted) */
-static GF_Err MSE_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
-	GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
-	if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
-	gf_mse_track_buffer_release_packet(track);
-	return GF_OK;
-}
-
-/* This module can only handle one blobURL at a time */
-static Bool MSE_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURLInService request on service %p from terminal for URL '%s'\n", msein->mediasource->service, url));
-	if (!plug || !plug->priv) return GF_FALSE;
-	if (!strcmp(url, msein->mediasource->blobURI)) {
-		return GF_TRUE;
-	} else {
-		return GF_FALSE;
-	}
-}
-
-#endif //GPAC_DISABLE_MSE
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_MSE
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifdef GPAC_DISABLE_MSE
-	return NULL;
-#else
-	GF_MSE_In *msein;
-	GF_InputService *plug;
-	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MSE Loader", "gpac distribution")
-
-	GF_SAFEALLOC(msein, GF_MSE_In);
-	if (!msein) {
-		gf_free(plug);
-		return NULL;
-	}
-
-	plug->RegisterMimeTypes = MSE_RegisterMimeTypes;
-	plug->CanHandleURL = MSE_CanHandleURL;
-	plug->ConnectService = MSE_ConnectService;
-	plug->CloseService = MSE_CloseService;
-	plug->GetServiceDescriptor = MSE_GetServiceDesc;
-	plug->ConnectChannel = MSE_ConnectChannel;
-	plug->DisconnectChannel = MSE_DisconnectChannel;
-	plug->ServiceCommand = MSE_ServiceCommand;
-	plug->CanHandleURLInService = MSE_CanHandleURLInService;
-	plug->ChannelGetSLP = MSE_ChannelGetSLP;
-	plug->ChannelReleaseSLP = MSE_ChannelReleaseSLP;
-
-	plug->priv = msein;
-	msein->plug = plug;
-	return (GF_BaseInterface *)plug;
-#endif
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *bi)
-{
-#ifndef GPAC_DISABLE_MSE
-	GF_MSE_In *msein;
-
-	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
-
-	msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
-	assert(msein);
-	gf_free(msein);
-	gf_free(bi);
-#endif
-}
-
-GPAC_MODULE_STATIC_DECLARATION( mse_in )

gpac-0.8.0.tar.gz/modules/netctrl Deleted

gpac-0.8.0.tar.gz/modules/netctrl/netctrl.c Deleted

@@ -1,212 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2011-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Sampe On-Scvreen Display 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/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/nodes_mpeg4.h>
-#include <gpac/network.h>
-
-#define XMIN 160
-#define XMAX 480
-
-#define YMAX 360
-#define YMIN 120
-
-typedef struct
-{
-	GF_Terminal *term;
-	GF_Socket *sock;
-	Bool mouse_down;
-	u32 cnt;
-	Float last_min_x, last_max_x, last_min_y, last_max_y;
-} GF_NetControl;
-
-static Bool netctrl_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *sOpt, *server_ip;
-	int port;
-	Float face_min_x, face_max_x, face_min_y, face_max_y, gaze_x, gaze_y;
-	GF_Event event;
-	GF_NetControl *netctrl = termext->udta;
-	char message[1024];
-	GF_Err e;
-	u32 bytes;
-	u32 face = 0;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		netctrl->term = (GF_Terminal *) param;
-
-		sOpt = gf_modules_get_option((GF_BaseInterface*)termext, "NetControler", "Enabled");
-		if (!sOpt || strcmp(sOpt, "yes")) return 0;
-		sOpt = gf_cfg_get_key(netctrl->term->compositor->user->config, "NetControler", "ServerIP");
-		if (sOpt) server_ip = sOpt;
-		else server_ip = "127.0.0.1";
-		sOpt = gf_cfg_get_key(netctrl->term->compositor->user->config, "NetControler", "Port");
-		if (sOpt) port = atoi(sOpt);
-		else port = 20320;
-
-		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
-		netctrl->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
-
-		if (netctrl->sock < 0)   {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to open socket for %s:%d\n", server_ip, port));
-			return 0;
-		}
-
-		e = gf_sk_bind(netctrl->sock, server_ip, port, NULL, 0, 0);
-		if (e != GF_OK) {
-			if (netctrl->sock) gf_sk_del(netctrl->sock);
-			netctrl->sock = NULL;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to bind to socket %s:%d\n", server_ip, port));
-			return 0;
-		}
-
-		return 1;
-
-	case GF_TERM_EXT_STOP:
-		if (netctrl->sock) gf_sk_del(netctrl->sock);
-		break;
-
-	case GF_TERM_EXT_PROCESS:
-		gf_sk_receive(netctrl->sock, message, 1024, 0, &bytes);
-		if (!bytes) break;
-		message[bytes] = '\0';
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[NetControl] received message %s\n", message));
-
-		if (!strncmp(message, "gpac splice ", 12) || !strncmp(message, "gpac add ", 9)
-			|| !strncmp(message, "gpac select ", 12)
-		) {
-			gf_term_scene_update(netctrl->term, NULL, message);
-			break;
-		}
-
-		if (strncmp(message, "gpac:face=", 10)) break;
-
-		sscanf(message, "gpac:face=%d,%f,%f,%f,%f", &face, &face_min_x, &face_max_x, &face_min_y, &face_max_y);
-
-
-		memset(&event, 0, sizeof(GF_Event));
-		event.mouse.button = GF_MOUSE_LEFT;
-		if (face == 0) {
-			if (netctrl->last_min_x < 0.01) {
-				netctrl->term->compositor->auto_rotate = 2;
-			} else if (netctrl->last_max_x > 0.90) {
-				netctrl->term->compositor->auto_rotate = 1;
-			} else if (netctrl->last_min_y < 0.01) {
-				netctrl->term->compositor->auto_rotate = 4;
-			} else if (netctrl->last_max_y > 0.90) {
-				netctrl->term->compositor->auto_rotate = 3;
-			} else {
-				netctrl->cnt++;
-				if ((netctrl->cnt>=50) && (netctrl->mouse_down)) {
-					netctrl->term->compositor->auto_rotate = 0;
-					netctrl->mouse_down = GF_FALSE;
-					event.type = GF_EVENT_MOUSEUP;
-					netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
-				}
-			}
-			break;
-		}
-
-		netctrl->last_min_x = face_min_x;
-		netctrl->last_max_x = face_max_x;
-		netctrl->last_min_y = face_min_y;
-		netctrl->last_max_y = face_max_y;
-
-		gaze_x = (face_min_x+face_max_x)/2;
-		gaze_y = (face_min_y+face_max_y)/2;
-
-		event.mouse.x = (1-gaze_x) * netctrl->term->compositor->display_width;
-		event.mouse.y = (1-gaze_y) * netctrl->term->compositor->display_height;
-
-		if (!netctrl->mouse_down) {
-			//don't grab if mouse is down
-			if (netctrl->term->compositor->navigation_state) break;
-			netctrl->mouse_down = GF_TRUE;
-			event.type = GF_EVENT_MOUSEDOWN;
-			netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
-			netctrl->cnt = 0;
-		}
-		event.type = GF_EVENT_MOUSEMOVE;
-		netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
-		break;
-	}
-	return 0;
-}
-
-
-GF_TermExt *netctrl_new()
-{
-	GF_TermExt *dr;
-	GF_NetControl *netctrl;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC NetControl", "gpac distribution");
-
-	GF_SAFEALLOC(netctrl, GF_NetControl);
-	dr->process = netctrl_process;
-	dr->udta = netctrl;
-	return dr;
-}
-
-
-void netctrl_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_NetControl *netctrl = dr->udta;
-	gf_free(netctrl);
-	gf_free(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)netctrl_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		netctrl_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( netctrl )

gpac-0.8.0.tar.gz/modules/nvdec Deleted

gpac-0.8.0.tar.gz/modules/nvdec/Makefile Deleted

@@ -1,62 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/nvdec
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS=nvdec.o cuda_sdk.o
-
-SRCS := $(OBJS:.o=.c) 
-
-
-ifeq ($(CONFIG_WIN32), yes)
-else
-EXTRALIBS+=-ldl
-endif
-
-ifeq ($(HAS_OPENGL), yes)
-CFLAGS+=$(OGL_INCLS)
-EXTRALIBS+=$(OGL_LIBS)
-
-ifeq ($(CONFIG_DARWIN),yes)
-EXTRALIBS+=-lGL -lGLU
-endif
-
-endif
-
-
-LIB=gm_nvdec$(DYN_LIB_SUFFIX)
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_nvdec-static$(DYN_LIB_SUFFIX) $(OBJS) -L../../bin/gcc -lgpac_static $(EXTRALIBS) $(LDFLAGS)
-endif
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/nvdec/cuda_sdk.c Deleted

@@ -1,701 +0,0 @@
-/*
- * Copyright 1993-2015 NVIDIA Corporation.  All rights reserved.
- *
- * Please refer to the NVIDIA end user license agreement (EULA) associated
- * with this source code for terms and conditions that govern your use of
- * this software. Any use, reproduction, disclosure, or distribution of
- * this software and related documentation outside the terms of the EULA
- * is strictly prohibited.
- *
- */
-
-
-// With these flags defined, this source file will dynamically
-// load the corresponding functions.  Disabled by default.
-#define __CUDA_API_VERSION 4000
-
-#include <stdio.h>
-#include <string.h>
-#include "cuda_sdk.h"
-
-tcuInit                               *_cuInit;
-tcuDriverGetVersion                   *cuDriverGetVersion;
-tcuDeviceGet                          *cuDeviceGet;
-tcuDeviceGetCount                     *cuDeviceGetCount;
-tcuDeviceGetName                      *cuDeviceGetName;
-tcuDeviceComputeCapability            *cuDeviceComputeCapability;
-tcuDeviceTotalMem                     *cuDeviceTotalMem;
-tcuDeviceGetProperties                *cuDeviceGetProperties;
-tcuDeviceGetAttribute                 *cuDeviceGetAttribute;
-tcuCtxCreate                          *cuCtxCreate;
-tcuCtxDestroy                         *cuCtxDestroy;
-tcuCtxAttach                          *cuCtxAttach;
-tcuCtxDetach                          *cuCtxDetach;
-tcuCtxPushCurrent                     *cuCtxPushCurrent;
-tcuCtxPopCurrent                      *cuCtxPopCurrent;
-tcuCtxGetCurrent                      *cuCtxGetCurrent;
-tcuCtxSetCurrent                      *cuCtxSetCurrent;
-tcuCtxGetDevice                       *cuCtxGetDevice;
-tcuCtxSynchronize                     *cuCtxSynchronize;
-tcuModuleLoad                         *cuModuleLoad;
-tcuModuleLoadData                     *cuModuleLoadData;
-tcuModuleLoadDataEx                   *cuModuleLoadDataEx;
-tcuModuleLoadFatBinary                *cuModuleLoadFatBinary;
-tcuModuleUnload                       *cuModuleUnload;
-tcuModuleGetFunction                  *cuModuleGetFunction;
-tcuModuleGetGlobal                    *cuModuleGetGlobal;
-tcuModuleGetTexRef                    *cuModuleGetTexRef;
-tcuModuleGetSurfRef                   *cuModuleGetSurfRef;
-tcuMemGetInfo                         *cuMemGetInfo;
-tcuMemAlloc                           *cuMemAlloc;
-tcuMemAllocPitch                      *cuMemAllocPitch;
-tcuMemFree                            *cuMemFree;
-tcuMemGetAddressRange                 *cuMemGetAddressRange;
-tcuMemAllocHost                       *cuMemAllocHost;
-tcuMemFreeHost                        *cuMemFreeHost;
-tcuMemHostAlloc                       *cuMemHostAlloc;
-tcuMemHostGetDevicePointer            *cuMemHostGetDevicePointer;
-tcuMemHostRegister                    *cuMemHostRegister;
-tcuMemHostUnregister                  *cuMemHostUnregister;
-tcuMemcpyHtoD                         *cuMemcpyHtoD;
-tcuMemcpyDtoH                         *cuMemcpyDtoH;
-tcuMemcpyDtoD                         *cuMemcpyDtoD;
-tcuMemcpyDtoA                         *cuMemcpyDtoA;
-tcuMemcpyAtoD                         *cuMemcpyAtoD;
-tcuMemcpyHtoA                         *cuMemcpyHtoA;
-tcuMemcpyAtoH                         *cuMemcpyAtoH;
-tcuMemcpyAtoA                         *cuMemcpyAtoA;
-tcuMemcpy2D                           *cuMemcpy2D;
-tcuMemcpy2DUnaligned                  *cuMemcpy2DUnaligned;
-tcuMemcpy3D                           *cuMemcpy3D;
-tcuMemcpyHtoDAsync                    *cuMemcpyHtoDAsync;
-tcuMemcpyDtoHAsync                    *cuMemcpyDtoHAsync;
-tcuMemcpyDtoDAsync                    *cuMemcpyDtoDAsync;
-tcuMemcpyHtoAAsync                    *cuMemcpyHtoAAsync;
-tcuMemcpyAtoHAsync                    *cuMemcpyAtoHAsync;
-tcuMemcpy2DAsync                      *cuMemcpy2DAsync;
-tcuMemcpy3DAsync                      *cuMemcpy3DAsync;
-tcuMemcpy                             *cuMemcpy;
-tcuMemcpyPeer                         *cuMemcpyPeer;
-tcuMemsetD8                           *cuMemsetD8;
-tcuMemsetD16                          *cuMemsetD16;
-tcuMemsetD32                          *cuMemsetD32;
-tcuMemsetD2D8                         *cuMemsetD2D8;
-tcuMemsetD2D16                        *cuMemsetD2D16;
-tcuMemsetD2D32                        *cuMemsetD2D32;
-tcuFuncSetBlockShape                  *cuFuncSetBlockShape;
-tcuFuncSetSharedSize                  *cuFuncSetSharedSize;
-tcuFuncGetAttribute                   *cuFuncGetAttribute;
-tcuFuncSetCacheConfig                 *cuFuncSetCacheConfig;
-tcuLaunchKernel                       *cuLaunchKernel;
-tcuArrayCreate                        *cuArrayCreate;
-tcuArrayGetDescriptor                 *cuArrayGetDescriptor;
-tcuArrayDestroy                       *cuArrayDestroy;
-tcuArray3DCreate                      *cuArray3DCreate;
-tcuArray3DGetDescriptor               *cuArray3DGetDescriptor;
-tcuTexRefCreate                       *cuTexRefCreate;
-tcuTexRefDestroy                      *cuTexRefDestroy;
-tcuTexRefSetArray                     *cuTexRefSetArray;
-tcuTexRefSetAddress                   *cuTexRefSetAddress;
-tcuTexRefSetAddress2D                 *cuTexRefSetAddress2D;
-tcuTexRefSetFormat                    *cuTexRefSetFormat;
-tcuTexRefSetAddressMode               *cuTexRefSetAddressMode;
-tcuTexRefSetFilterMode                *cuTexRefSetFilterMode;
-tcuTexRefSetFlags                     *cuTexRefSetFlags;
-tcuTexRefGetAddress                   *cuTexRefGetAddress;
-tcuTexRefGetArray                     *cuTexRefGetArray;
-tcuTexRefGetAddressMode               *cuTexRefGetAddressMode;
-tcuTexRefGetFilterMode                *cuTexRefGetFilterMode;
-tcuTexRefGetFormat                    *cuTexRefGetFormat;
-tcuTexRefGetFlags                     *cuTexRefGetFlags;
-tcuSurfRefSetArray                    *cuSurfRefSetArray;
-tcuSurfRefGetArray                    *cuSurfRefGetArray;
-tcuParamSetSize                       *cuParamSetSize;
-tcuParamSeti                          *cuParamSeti;
-tcuParamSetf                          *cuParamSetf;
-tcuParamSetv                          *cuParamSetv;
-tcuParamSetTexRef                     *cuParamSetTexRef;
-tcuLaunch                             *cuLaunch;
-tcuLaunchGrid                         *cuLaunchGrid;
-tcuLaunchGridAsync                    *cuLaunchGridAsync;
-tcuEventCreate                        *cuEventCreate;
-tcuEventRecord                        *cuEventRecord;
-tcuEventQuery                         *cuEventQuery;
-tcuEventSynchronize                   *cuEventSynchronize;
-tcuEventDestroy                       *cuEventDestroy;
-tcuEventElapsedTime                   *cuEventElapsedTime;
-tcuStreamCreate                       *cuStreamCreate;
-tcuStreamQuery                        *cuStreamQuery;
-tcuStreamSynchronize                  *cuStreamSynchronize;
-tcuStreamDestroy                      *cuStreamDestroy;
-tcuGraphicsUnregisterResource         *cuGraphicsUnregisterResource;
-tcuGraphicsSubResourceGetMappedArray  *cuGraphicsSubResourceGetMappedArray;
-tcuGraphicsResourceGetMappedPointer   *cuGraphicsResourceGetMappedPointer;
-tcuGraphicsResourceSetMapFlags        *cuGraphicsResourceSetMapFlags;
-tcuGraphicsMapResources               *cuGraphicsMapResources;
-tcuGraphicsUnmapResources             *cuGraphicsUnmapResources;
-tcuGetExportTable                     *cuGetExportTable;
-tcuCtxSetLimit                        *cuCtxSetLimit;
-tcuCtxGetLimit                        *cuCtxGetLimit;
-tcuMemHostGetFlags                    *cuMemHostGetFlags;
-
-    // GL/CUDA interop
-    #if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-    tcuWGLGetDevice                       *cuWGLGetDevice;
-    #endif
-
-    //#if __CUDA_API_VERSION >= 3020
-    tcuGLCtxCreate                        *cuGLCtxCreate;
-    tcuGLCtxCreate                        *cuGLCtxCreate_v2;
-    tcuGLMapBufferObject                  *cuGLMapBufferObject;
-    tcuGLMapBufferObject                  *cuGLMapBufferObject_v2;
-    tcuGLMapBufferObjectAsync             *cuGLMapBufferObjectAsync;
-    //#endif
-
-#if __CUDA_API_VERSION >= 6050
-    tcuGLGetDevices                       *cuGLGetDevices;
-#endif
-
-    tcuGLInit                             *cuGLInit; // deprecated in CUDA 3.0
-    tcuGraphicsGLRegisterBuffer           *cuGraphicsGLRegisterBuffer;
-    tcuGraphicsGLRegisterImage            *cuGraphicsGLRegisterImage;
-    tcuGLSetBufferObjectMapFlags          *cuGLSetBufferObjectMapFlags;
-    tcuGLRegisterBufferObject             *cuGLRegisterBufferObject;
-
-    tcuGLUnmapBufferObject                *cuGLUnmapBufferObject;
-    tcuGLUnmapBufferObjectAsync           *cuGLUnmapBufferObjectAsync;
-
-    tcuGLUnregisterBufferObject           *cuGLUnregisterBufferObject;
-    tcuGLGetDevices                       *cuGLGetDevices; // CUDA 6.5 only
-
-
-
-tcuvidCreateVideoSource               *cuvidCreateVideoSource;
-tcuvidCreateVideoSourceW              *cuvidCreateVideoSourceW;
-tcuvidDestroyVideoSource              *cuvidDestroyVideoSource;
-tcuvidSetVideoSourceState             *cuvidSetVideoSourceState;
-tcuvidGetVideoSourceState             *cuvidGetVideoSourceState;
-tcuvidGetSourceVideoFormat            *cuvidGetSourceVideoFormat;
-tcuvidGetSourceAudioFormat            *cuvidGetSourceAudioFormat;
-
-tcuvidCreateVideoParser               *cuvidCreateVideoParser;
-tcuvidParseVideoData                  *cuvidParseVideoData;
-tcuvidDestroyVideoParser              *cuvidDestroyVideoParser;
-
-tcuvidCreateDecoder                   *cuvidCreateDecoder;
-tcuvidDestroyDecoder                  *cuvidDestroyDecoder;
-tcuvidDecodePicture                   *cuvidDecodePicture;
-
-tcuvidMapVideoFrame                   *cuvidMapVideoFrame;
-tcuvidUnmapVideoFrame                 *cuvidUnmapVideoFrame;
-
-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
-tcuvidMapVideoFrame64                 *cuvidMapVideoFrame64;
-tcuvidUnmapVideoFrame64               *cuvidUnmapVideoFrame64;
-#endif
-
-//tcuvidGetVideoFrameSurface            *cuvidGetVideoFrameSurface;
-tcuvidCtxLockCreate                   *cuvidCtxLockCreate;
-tcuvidCtxLockDestroy                  *cuvidCtxLockDestroy;
-tcuvidCtxLock                         *cuvidCtxLock;
-tcuvidCtxUnlock                       *cuvidCtxUnlock;
-
-
-
-#define STRINGIFY(X) #X
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-#include <Windows.h>
-
-#ifdef UNICODE
-static LPCWSTR __CudaLibName = L"nvcuda.dll";
-static LPCWSTR __CuvidLibName = L"nvcuvid.dll";
-#else
-static LPCSTR __CudaLibName = "nvcuda.dll";
-static LPCSTR __CuvidLibName = "nvcuvid.dll";
-#endif
-
-typedef HMODULE CUDADRIVER;
-typedef HMODULE CUVIDDRIVER;
-
-static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
-{
-    *pInstance = LoadLibrary(__CudaLibName);
-    if (*pInstance == NULL) {
-        printf("LoadLibrary \"%s\" failed!\n", __CudaLibName);
-        return CUDA_ERROR_UNKNOWN;
-    }
-    return CUDA_SUCCESS;
-}
-
-static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
-{
-    *pInstance = LoadLibrary(__CuvidLibName);
-    if (*pInstance == NULL) {
-        printf("LoadLibrary \"%s\" failed!\n", __CuvidLibName);
-        return CUDA_ERROR_UNKNOWN;
-    }
-    return CUDA_SUCCESS;
-}
-
-#define GET_PROC_EX(name, alias, required)                     \
-    alias = (t##name *)GetProcAddress(curr_lib, #name);               \
-    if (alias == NULL && required) {                                    \
-        printf("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) {                                    \
-        printf("Failed to find required function \"%s\" \n",       \
-               STRINGIFY(name##_v2));                       \
-        }
-
-#elif defined(__unix__) || defined(__APPLE__) || defined(__MACOSX)
-
-#include <dlfcn.h>
-
-#if defined(__APPLE__) || defined(__MACOSX)
-static char __CudaLibName[] = "/usr/local/cuda/lib/libcuda.dylib";
-#else
-static char __CudaLibName[] = "libcuda.so";
-#endif
-
-static char __CuvidLibName[] = "libnvcuvid.so";
-
-typedef void *CUDADRIVER;
-typedef void *CUVIDDRIVER;
-
-static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
-{
-    *pInstance = dlopen(__CudaLibName, RTLD_NOW);
-    if (*pInstance == NULL) {
-        printf("dlopen \"%s\" failed!\n", __CudaLibName);
-        return CUDA_ERROR_UNKNOWN;
-    }
-    return CUDA_SUCCESS;
-}
-
-static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
-{
-    *pInstance = dlopen(__CuvidLibName, RTLD_NOW);
-    if (*pInstance == NULL) {
-        printf("dlopen \"%s\" failed!\n", __CuvidLibName);
-        return CUDA_ERROR_UNKNOWN;
-    }
-    return CUDA_SUCCESS;
-}
-
-#define GET_PROC_EX(name, alias, required)                              \
-    alias = (t##name *)dlsym(curr_lib, #name);                        \
-    if (alias == NULL && required) {                                    \
-        printf("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) {                                    \
-        printf("Failed to find required function \"%s\"\n",       \
-               STRINGIFY(name##_v2));                    \
-        }
-
-#else
-#error unsupported platform
-#endif
-
-#define CHECKED_CALL(call)              \
-    do {                                \
-        CUresult result = (call);       \
-        if (CUDA_SUCCESS != result) {   \
-            return result;              \
-        }                               \
-    } while(0)
-
-#define GET_PROC_REQUIRED(name) GET_PROC_EX(name,name,1)
-#define GET_PROC_OPTIONAL(name) GET_PROC_EX(name,name,0)
-#define GET_PROC(name)          GET_PROC_REQUIRED(name)
-#define GET_PROC_V2(name)       GET_PROC_EX_V2(name,name,1)
-
-CUresult CUDAAPI cuInitGL(unsigned int Flags, int cudaVersion, CUDADRIVER curr_lib)
-{
-
-    return CUDA_SUCCESS;
-}
-
-CUDADRIVER CudaDrvLib=0;
-CUVIDDRIVER CuvidDrvLib = 0;
-
-void CUDAAPI cuUninit()
-{
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-	if (CudaDrvLib) FreeLibrary((HMODULE)CudaDrvLib);
-	if (CuvidDrvLib) FreeLibrary((HMODULE)CuvidDrvLib);
-#else
-	if (CudaDrvLib) dlclose(CudaDrvLib);
-	if (CuvidDrvLib) dlclose(CuvidDrvLib);
-#endif
-	CudaDrvLib = 0;
-	CuvidDrvLib = 0;
-}
-
-CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
-{
-    int driverVer = 1000;
-	CUDADRIVER curr_lib ;
-
-	if (CudaDrvLib) return CUDA_SUCCESS;
-	
-	assert(CudaDrvLib == 0);
-	
-	CHECKED_CALL(LOAD_LIBRARY_CUDA(&CudaDrvLib));
-	curr_lib = CudaDrvLib;
-
-	// cuInit is required; alias it to _cuInit
-    GET_PROC_EX(cuInit, _cuInit, 1);
-    CHECKED_CALL(_cuInit(Flags));
-
-    // available since 2.2. if not present, version 1.0 is assumed
-    GET_PROC_OPTIONAL(cuDriverGetVersion);
-
-    if (cuDriverGetVersion)
-    {
-        CHECKED_CALL(cuDriverGetVersion(&driverVer));
-    }
-
-    // fetch all function pointers
-    GET_PROC(cuDeviceGet);
-    GET_PROC(cuDeviceGetCount);
-    GET_PROC(cuDeviceGetName);
-    GET_PROC(cuDeviceComputeCapability);
-    GET_PROC(cuDeviceGetProperties);
-    GET_PROC(cuDeviceGetAttribute);
-    GET_PROC(cuCtxDestroy);
-    GET_PROC(cuCtxAttach);
-    GET_PROC(cuCtxDetach);
-    GET_PROC(cuCtxPushCurrent);
-    GET_PROC(cuCtxPopCurrent);
-    GET_PROC(cuCtxGetDevice);
-    GET_PROC(cuCtxSynchronize);
-    GET_PROC(cuModuleLoad);
-    GET_PROC(cuModuleLoadData);
-    GET_PROC(cuModuleUnload);
-    GET_PROC(cuModuleGetFunction);
-    GET_PROC(cuModuleGetTexRef);
-    GET_PROC(cuMemFreeHost);
-    GET_PROC(cuMemHostAlloc);
-    GET_PROC(cuFuncSetBlockShape);
-    GET_PROC(cuFuncSetSharedSize);
-    GET_PROC(cuFuncGetAttribute);
-    GET_PROC(cuArrayDestroy);
-    GET_PROC(cuTexRefCreate);
-    GET_PROC(cuTexRefDestroy);
-    GET_PROC(cuTexRefSetArray);
-    GET_PROC(cuTexRefSetFormat);
-    GET_PROC(cuTexRefSetAddressMode);
-    GET_PROC(cuTexRefSetFilterMode);
-    GET_PROC(cuTexRefSetFlags);
-    GET_PROC(cuTexRefGetArray);
-    GET_PROC(cuTexRefGetAddressMode);
-    GET_PROC(cuTexRefGetFilterMode);
-    GET_PROC(cuTexRefGetFormat);
-    GET_PROC(cuTexRefGetFlags);
-    GET_PROC(cuParamSetSize);
-    GET_PROC(cuParamSeti);
-    GET_PROC(cuParamSetf);
-    GET_PROC(cuParamSetv);
-    GET_PROC(cuParamSetTexRef);
-    GET_PROC(cuLaunch);
-    GET_PROC(cuLaunchGrid);
-    GET_PROC(cuLaunchGridAsync);
-    GET_PROC(cuEventCreate);
-    GET_PROC(cuEventRecord);
-    GET_PROC(cuEventQuery);
-    GET_PROC(cuEventSynchronize);
-    GET_PROC(cuEventDestroy);
-    GET_PROC(cuEventElapsedTime);
-    GET_PROC(cuStreamCreate);
-    GET_PROC(cuStreamQuery);
-    GET_PROC(cuStreamSynchronize);
-    GET_PROC(cuStreamDestroy);
-
-    // These could be _v2 interfaces
-    if (cudaVersion >= 4000)
-    {
-        GET_PROC_V2(cuCtxDestroy);
-        GET_PROC_V2(cuCtxPopCurrent);
-        GET_PROC_V2(cuCtxPushCurrent);
-        GET_PROC_V2(cuStreamDestroy);
-        GET_PROC_V2(cuEventDestroy);
-    }
-
-    if (cudaVersion >= 3020)
-    {
-        GET_PROC_V2(cuDeviceTotalMem);
-        GET_PROC_V2(cuCtxCreate);
-        GET_PROC_V2(cuModuleGetGlobal);
-        GET_PROC_V2(cuMemGetInfo);
-        GET_PROC_V2(cuMemAlloc);
-        GET_PROC_V2(cuMemAllocPitch);
-        GET_PROC_V2(cuMemFree);
-        GET_PROC_V2(cuMemGetAddressRange);
-        GET_PROC_V2(cuMemAllocHost);
-        GET_PROC_V2(cuMemHostGetDevicePointer);
-        GET_PROC_V2(cuMemcpyHtoD);
-        GET_PROC_V2(cuMemcpyDtoH);
-        GET_PROC_V2(cuMemcpyDtoD);
-        GET_PROC_V2(cuMemcpyDtoA);
-        GET_PROC_V2(cuMemcpyAtoD);
-        GET_PROC_V2(cuMemcpyHtoA);
-        GET_PROC_V2(cuMemcpyAtoH);
-        GET_PROC_V2(cuMemcpyAtoA);
-        GET_PROC_V2(cuMemcpy2D);
-        GET_PROC_V2(cuMemcpy2DUnaligned);
-        GET_PROC_V2(cuMemcpy3D);
-        GET_PROC_V2(cuMemcpyHtoDAsync);
-        GET_PROC_V2(cuMemcpyDtoHAsync);
-        GET_PROC_V2(cuMemcpyHtoAAsync);
-        GET_PROC_V2(cuMemcpyAtoHAsync);
-        GET_PROC_V2(cuMemcpy2DAsync);
-        GET_PROC_V2(cuMemcpy3DAsync);
-        GET_PROC_V2(cuMemsetD8);
-        GET_PROC_V2(cuMemsetD16);
-        GET_PROC_V2(cuMemsetD32);
-        GET_PROC_V2(cuMemsetD2D8);
-        GET_PROC_V2(cuMemsetD2D16);
-        GET_PROC_V2(cuMemsetD2D32);
-        GET_PROC_V2(cuArrayCreate);
-        GET_PROC_V2(cuArrayGetDescriptor);
-        GET_PROC_V2(cuArray3DCreate);
-        GET_PROC_V2(cuArray3DGetDescriptor);
-        GET_PROC_V2(cuTexRefSetAddress);
-        GET_PROC_V2(cuTexRefSetAddress2D);
-        GET_PROC_V2(cuTexRefGetAddress);
-    }
-    else
-    {
-        GET_PROC(cuDeviceTotalMem);
-        GET_PROC(cuCtxCreate);
-        GET_PROC(cuModuleGetGlobal);
-        GET_PROC(cuMemGetInfo);
-        GET_PROC(cuMemAlloc);
-        GET_PROC(cuMemAllocPitch);
-        GET_PROC(cuMemFree);
-        GET_PROC(cuMemGetAddressRange);
-        GET_PROC(cuMemAllocHost);
-        GET_PROC(cuMemHostGetDevicePointer);
-        GET_PROC(cuMemcpyHtoD);
-        GET_PROC(cuMemcpyDtoH);
-        GET_PROC(cuMemcpyDtoD);
-        GET_PROC(cuMemcpyDtoA);
-        GET_PROC(cuMemcpyAtoD);
-        GET_PROC(cuMemcpyHtoA);
-        GET_PROC(cuMemcpyAtoH);
-        GET_PROC(cuMemcpyAtoA);
-        GET_PROC(cuMemcpy2D);
-        GET_PROC(cuMemcpy2DUnaligned);
-        GET_PROC(cuMemcpy3D);
-        GET_PROC(cuMemcpyHtoDAsync);
-        GET_PROC(cuMemcpyDtoHAsync);
-        GET_PROC(cuMemcpyHtoAAsync);
-        GET_PROC(cuMemcpyAtoHAsync);
-        GET_PROC(cuMemcpy2DAsync);
-        GET_PROC(cuMemcpy3DAsync);
-        GET_PROC(cuMemsetD8);
-        GET_PROC(cuMemsetD16);
-        GET_PROC(cuMemsetD32);
-        GET_PROC(cuMemsetD2D8);
-        GET_PROC(cuMemsetD2D16);
-        GET_PROC(cuMemsetD2D32);
-        GET_PROC(cuArrayCreate);
-        GET_PROC(cuArrayGetDescriptor);
-        GET_PROC(cuArray3DCreate);
-        GET_PROC(cuArray3DGetDescriptor);
-        GET_PROC(cuTexRefSetAddress);
-        GET_PROC(cuTexRefSetAddress2D);
-        GET_PROC(cuTexRefGetAddress);
-    }
-
-    // The following functions are specific to CUDA versions
-    if (driverVer >= 2010)
-    {
-        GET_PROC(cuModuleLoadDataEx);
-        GET_PROC(cuModuleLoadFatBinary);
-    }
-
-    if (driverVer >= 2030)
-    {
-        GET_PROC(cuMemHostGetFlags);
-    }
-
-    if (driverVer >= 3000)
-    {
-        GET_PROC(cuMemcpyDtoDAsync);
-        GET_PROC(cuFuncSetCacheConfig);
-
-        GET_PROC(cuGraphicsUnregisterResource);
-        GET_PROC(cuGraphicsSubResourceGetMappedArray);
-
-#if (__CUDA_API_VERSION >= 3020)
-        if (cudaVersion >= 3020)
-        {
-            GET_PROC_V2(cuGraphicsResourceGetMappedPointer);
-        }
-        else
-        {
-            GET_PROC(cuGraphicsResourceGetMappedPointer);
-        }
-#endif
-        GET_PROC(cuGraphicsResourceSetMapFlags);
-        GET_PROC(cuGraphicsMapResources);
-        GET_PROC(cuGraphicsUnmapResources);
-        GET_PROC(cuGetExportTable);
-    }
-
-    if (driverVer >= 3010)
-    {
-        GET_PROC(cuModuleGetSurfRef);
-        GET_PROC(cuSurfRefSetArray);
-        GET_PROC(cuSurfRefGetArray);
-        GET_PROC(cuCtxSetLimit);
-        GET_PROC(cuCtxGetLimit);
-    }
-
-    if (driverVer >= 4000)
-    {
-        GET_PROC(cuCtxSetCurrent);
-        GET_PROC(cuCtxGetCurrent);
-        GET_PROC(cuMemHostRegister);
-        GET_PROC(cuMemHostUnregister);
-        GET_PROC(cuMemcpy);
-        GET_PROC(cuMemcpyPeer);
-        GET_PROC(cuLaunchKernel);
-    }
-
-	/*load openGL*/
-    if (cudaVersion >= 2010)
-    {
-        GET_PROC(cuGLCtxCreate);
-        GET_PROC(cuGraphicsGLRegisterBuffer);
-        GET_PROC(cuGraphicsGLRegisterImage);
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-        GET_PROC(cuWGLGetDevice);
-#endif
-    }
-    if (cudaVersion >= 2030)
-    {
-        GET_PROC(cuGraphicsGLRegisterBuffer);
-        GET_PROC(cuGraphicsGLRegisterImage);
-    }
-    if (cudaVersion >= 3000)
-    {
-        GET_PROC(cuGLGetDevices);
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-        GET_PROC(cuWGLGetDevice);
-#endif
-        GET_PROC_V2(cuGLCtxCreate);
-
-        GET_PROC_V2(cuGLMapBufferObject);
-        GET_PROC(cuGLUnmapBufferObject);
-        GET_PROC(cuGLMapBufferObjectAsync);
-        GET_PROC(cuGLUnmapBufferObjectAsync);
-        GET_PROC(cuGLRegisterBufferObject);
-        GET_PROC(cuGLUnregisterBufferObject);
-        GET_PROC(cuGLSetBufferObjectMapFlags);
-    }
-
-	//init cuvid
-    CHECKED_CALL(LOAD_LIBRARY_CUVID(&CuvidDrvLib));
-
-	curr_lib = CuvidDrvLib;
-    // fetch all function pointers
-    GET_PROC(cuvidCreateVideoSource);
-    GET_PROC(cuvidCreateVideoSourceW);
-    GET_PROC(cuvidDestroyVideoSource);
-    GET_PROC(cuvidSetVideoSourceState);
-    GET_PROC(cuvidGetVideoSourceState);
-    GET_PROC(cuvidGetSourceVideoFormat);
-    GET_PROC(cuvidGetSourceAudioFormat);
-
-    GET_PROC(cuvidCreateVideoParser);
-    GET_PROC(cuvidParseVideoData);
-    GET_PROC(cuvidDestroyVideoParser);
-
-    GET_PROC(cuvidCreateDecoder);
-    GET_PROC(cuvidDestroyDecoder);
-    GET_PROC(cuvidDecodePicture);
-
-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
-    GET_PROC(cuvidMapVideoFrame64);
-    GET_PROC(cuvidUnmapVideoFrame64);
-    cuvidMapVideoFrame   = cuvidMapVideoFrame64;
-    cuvidUnmapVideoFrame = cuvidUnmapVideoFrame64;
-#else
-    GET_PROC(cuvidMapVideoFrame);
-    GET_PROC(cuvidUnmapVideoFrame);
-#endif
-
-//    GET_PROC(cuvidGetVideoFrameSurface);
-    GET_PROC(cuvidCtxLockCreate);
-    GET_PROC(cuvidCtxLockDestroy);
-    GET_PROC(cuvidCtxLock);
-    GET_PROC(cuvidCtxUnlock);
-
-
-	return CUDA_SUCCESS;
-}
-
-
-// CUDA Driver API errors
-const char *cudaGetErrorEnum(CUresult error)
-{
-	switch (error) {
-	case CUDA_SUCCESS: return "CUDA_SUCCESS";
-	case CUDA_ERROR_INVALID_VALUE: return "CUDA_ERROR_INVALID_VALUE";
-	case CUDA_ERROR_OUT_OF_MEMORY:	return "CUDA_ERROR_OUT_OF_MEMORY";
-	case CUDA_ERROR_NOT_INITIALIZED: return "CUDA_ERROR_NOT_INITIALIZED";
-	case CUDA_ERROR_DEINITIALIZED:	return "CUDA_ERROR_DEINITIALIZED";
-	case CUDA_ERROR_PROFILER_DISABLED:	return "CUDA_ERROR_PROFILER_DISABLED";
-	case CUDA_ERROR_PROFILER_NOT_INITIALIZED:	return "CUDA_ERROR_PROFILER_NOT_INITIALIZED";
-	case CUDA_ERROR_PROFILER_ALREADY_STARTED:	return "CUDA_ERROR_PROFILER_ALREADY_STARTED";
-	case CUDA_ERROR_PROFILER_ALREADY_STOPPED:	return "CUDA_ERROR_PROFILER_ALREADY_STOPPED";
-	case CUDA_ERROR_NO_DEVICE:	return "CUDA_ERROR_NO_DEVICE";
-	case CUDA_ERROR_INVALID_DEVICE:	return "CUDA_ERROR_INVALID_DEVICE";
-	case CUDA_ERROR_INVALID_IMAGE:	return "CUDA_ERROR_INVALID_IMAGE";
-	case CUDA_ERROR_INVALID_CONTEXT:	return "CUDA_ERROR_INVALID_CONTEXT";
-	case CUDA_ERROR_CONTEXT_ALREADY_CURRENT:	return "CUDA_ERROR_CONTEXT_ALREADY_CURRENT";
-	case CUDA_ERROR_MAP_FAILED:	return "CUDA_ERROR_MAP_FAILED";
-	case CUDA_ERROR_UNMAP_FAILED:	return "CUDA_ERROR_UNMAP_FAILED";
-	case CUDA_ERROR_ARRAY_IS_MAPPED:	return "CUDA_ERROR_ARRAY_IS_MAPPED";
-	case CUDA_ERROR_ALREADY_MAPPED:	return "CUDA_ERROR_ALREADY_MAPPED";
-	case CUDA_ERROR_NO_BINARY_FOR_GPU:	return "CUDA_ERROR_NO_BINARY_FOR_GPU";
-	case CUDA_ERROR_ALREADY_ACQUIRED:	return "CUDA_ERROR_ALREADY_ACQUIRED";
-	case CUDA_ERROR_NOT_MAPPED:	return "CUDA_ERROR_NOT_MAPPED";
-	case CUDA_ERROR_NOT_MAPPED_AS_ARRAY:	return "CUDA_ERROR_NOT_MAPPED_AS_ARRAY";
-	case CUDA_ERROR_NOT_MAPPED_AS_POINTER:	return "CUDA_ERROR_NOT_MAPPED_AS_POINTER";
-	case CUDA_ERROR_ECC_UNCORRECTABLE:	return "CUDA_ERROR_ECC_UNCORRECTABLE";
-	case CUDA_ERROR_UNSUPPORTED_LIMIT:	return "CUDA_ERROR_UNSUPPORTED_LIMIT";
-	case CUDA_ERROR_CONTEXT_ALREADY_IN_USE:	return "CUDA_ERROR_CONTEXT_ALREADY_IN_USE";
-	case CUDA_ERROR_INVALID_SOURCE:	return "CUDA_ERROR_INVALID_SOURCE";
-	case CUDA_ERROR_FILE_NOT_FOUND:	return "CUDA_ERROR_FILE_NOT_FOUND";
-	case CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND:	return "CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND";
-	case CUDA_ERROR_SHARED_OBJECT_INIT_FAILED:	return "CUDA_ERROR_SHARED_OBJECT_INIT_FAILED";
-	case CUDA_ERROR_OPERATING_SYSTEM:	return "CUDA_ERROR_OPERATING_SYSTEM";
-	case CUDA_ERROR_INVALID_HANDLE:	return "CUDA_ERROR_INVALID_HANDLE";
-	case CUDA_ERROR_NOT_FOUND:	return "CUDA_ERROR_NOT_FOUND";
-	case CUDA_ERROR_NOT_READY:	return "CUDA_ERROR_NOT_READY";
-	case CUDA_ERROR_LAUNCH_FAILED:	return "CUDA_ERROR_LAUNCH_FAILED";
-	case CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES:	return "CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES";
-	case CUDA_ERROR_LAUNCH_TIMEOUT:	return "CUDA_ERROR_LAUNCH_TIMEOUT";
-	case CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING:	return "CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING";
-	case CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED";
-	case CUDA_ERROR_PEER_ACCESS_NOT_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_NOT_ENABLED";
-	case CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE:	return "CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE";
-	case CUDA_ERROR_CONTEXT_IS_DESTROYED:	return "CUDA_ERROR_CONTEXT_IS_DESTROYED";
-	case CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED";
-	case CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED";
-	case CUDA_ERROR_UNKNOWN: return "CUDA_ERROR_UNKNOWN";
-	}
-	return "<unknown>";
-}

gpac-0.8.0.tar.gz/modules/nvdec/cuda_sdk.h Deleted

@@ -1,2883 +0,0 @@
-/*
- * Copyright 1993-2015 NVIDIA Corporation.  All rights reserved.
- *
- * Please refer to the NVIDIA end user license agreement (EULA) associated
- * with this source code for terms and conditions that govern your use of
- * this software. Any use, reproduction, disclosure, or distribution of
- * this software and related documentation outside the terms of the EULA
- * is strictly prohibited.
- *
- */
-
-#ifndef __cuda_tools_h__
-#define __cuda_tools_h__
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef __CUDA_API_VERSION
-#define __CUDA_API_VERSION 4000
-#endif
-
-/**
- * \defgroup CUDA_DRIVER CUDA Driver API
- *
- * This section describes the low-level CUDA driver application programming
- * interface.
- *
- * @{
- */
-
-/**
- * \defgroup CUDA_TYPES Data types used by CUDA driver
- * @{
- */
-
-/**
- * CUDA API version number
- */
-#define CUDA_VERSION 4000 /* 4.0 */
-
-/**
- * CUDA device pointer
- */
-#if __CUDA_API_VERSION >= 3020
-
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
-    typedef unsigned long long CUdeviceptr;
-#else
-    typedef unsigned int CUdeviceptr;
-#endif
-
-#endif /* __CUDA_API_VERSION >= 3020 */
-
-typedef int CUdevice;                                     /**< CUDA device */
-typedef struct CUctx_st *CUcontext;                       /**< CUDA context */
-typedef struct CUmod_st *CUmodule;                        /**< CUDA module */
-typedef struct CUfunc_st *CUfunction;                     /**< CUDA function */
-typedef struct CUarray_st *CUarray;                       /**< CUDA array */
-typedef struct CUtexref_st *CUtexref;                     /**< CUDA texture reference */
-typedef struct CUsurfref_st *CUsurfref;                   /**< CUDA surface reference */
-typedef struct CUevent_st *CUevent;                       /**< CUDA event */
-typedef struct CUstream_st *CUstream;                     /**< CUDA stream */
-typedef struct CUgraphicsResource_st *CUgraphicsResource; /**< CUDA graphics interop resource */
-
-typedef struct CUuuid_st                                  /**< CUDA definition of UUID */
-{
-    char bytes[16];
-} CUuuid;
-
-/**
- * Context creation flags
- */
-typedef enum CUctx_flags_enum
-{
-    CU_CTX_SCHED_AUTO          = 0x00, /**< Automatic scheduling */
-    CU_CTX_SCHED_SPIN          = 0x01, /**< Set spin as default scheduling */
-    CU_CTX_SCHED_YIELD         = 0x02, /**< Set yield as default scheduling */
-    CU_CTX_SCHED_BLOCKING_SYNC = 0x04, /**< Set blocking synchronization as default scheduling */
-    CU_CTX_BLOCKING_SYNC       = 0x04, /**< Set blocking synchronization as default scheduling \deprecated */
-    CU_CTX_MAP_HOST            = 0x08, /**< Support mapped pinned allocations */
-    CU_CTX_LMEM_RESIZE_TO_MAX  = 0x10, /**< Keep local memory allocation after launch */
-#if __CUDA_API_VERSION < 4000
-    CU_CTX_SCHED_MASK          = 0x03,
-    CU_CTX_FLAGS_MASK          = 0x1f
-#else
-    CU_CTX_SCHED_MASK          = 0x07,
-    CU_CTX_PRIMARY             = 0x20, /**< Initialize and return the primary context */
-    CU_CTX_FLAGS_MASK          = 0x3f
-#endif
-} CUctx_flags;
-
-/**
- * Event creation flags
- */
-typedef enum CUevent_flags_enum
-{
-    CU_EVENT_DEFAULT        = 0, /**< Default event flag */
-    CU_EVENT_BLOCKING_SYNC  = 1, /**< Event uses blocking synchronization */
-    CU_EVENT_DISABLE_TIMING = 2  /**< Event will not record timing data */
-} CUevent_flags;
-
-/**
- * Array formats
- */
-typedef enum CUarray_format_enum
-{
-    CU_AD_FORMAT_UNSIGNED_INT8  = 0x01, /**< Unsigned 8-bit integers */
-    CU_AD_FORMAT_UNSIGNED_INT16 = 0x02, /**< Unsigned 16-bit integers */
-    CU_AD_FORMAT_UNSIGNED_INT32 = 0x03, /**< Unsigned 32-bit integers */
-    CU_AD_FORMAT_SIGNED_INT8    = 0x08, /**< Signed 8-bit integers */
-    CU_AD_FORMAT_SIGNED_INT16   = 0x09, /**< Signed 16-bit integers */
-    CU_AD_FORMAT_SIGNED_INT32   = 0x0a, /**< Signed 32-bit integers */
-    CU_AD_FORMAT_HALF           = 0x10, /**< 16-bit floating point */
-    CU_AD_FORMAT_FLOAT          = 0x20  /**< 32-bit floating point */
-} CUarray_format;
-
-/**
- * Texture reference addressing modes
- */
-typedef enum CUaddress_mode_enum
-{
-    CU_TR_ADDRESS_MODE_WRAP   = 0, /**< Wrapping address mode */
-    CU_TR_ADDRESS_MODE_CLAMP  = 1, /**< Clamp to edge address mode */
-    CU_TR_ADDRESS_MODE_MIRROR = 2, /**< Mirror address mode */
-    CU_TR_ADDRESS_MODE_BORDER = 3  /**< Border address mode */
-} CUaddress_mode;
-
-/**
- * Texture reference filtering modes
- */
-typedef enum CUfilter_mode_enum
-{
-    CU_TR_FILTER_MODE_POINT  = 0, /**< Point filter mode */
-    CU_TR_FILTER_MODE_LINEAR = 1  /**< Linear filter mode */
-} CUfilter_mode;
-
-/**
- * Device properties
- */
-typedef enum CUdevice_attribute_enum
-{
-    CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 1,              /**< Maximum number of threads per block */
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_X = 2,                    /**< Maximum block dimension X */
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Y = 3,                    /**< Maximum block dimension Y */
-    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Z = 4,                    /**< Maximum block dimension Z */
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_X = 5,                     /**< Maximum grid dimension X */
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Y = 6,                     /**< Maximum grid dimension Y */
-    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Z = 7,                     /**< Maximum grid dimension Z */
-    CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK = 8,        /**< Maximum shared memory available per block in bytes */
-    CU_DEVICE_ATTRIBUTE_SHARED_MEMORY_PER_BLOCK = 8,            /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK */
-    CU_DEVICE_ATTRIBUTE_TOTAL_CONSTANT_MEMORY = 9,              /**< Memory available on device for __constant__ variables in a CUDA C kernel in bytes */
-    CU_DEVICE_ATTRIBUTE_WARP_SIZE = 10,                         /**< Warp size in threads */
-    CU_DEVICE_ATTRIBUTE_MAX_PITCH = 11,                         /**< Maximum pitch in bytes allowed by memory copies */
-    CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK = 12,           /**< Maximum number of 32-bit registers available per block */
-    CU_DEVICE_ATTRIBUTE_REGISTERS_PER_BLOCK = 12,               /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK */
-    CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,                        /**< Peak clock frequency in kilohertz */
-    CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,                 /**< Alignment requirement for textures */
-    CU_DEVICE_ATTRIBUTE_GPU_OVERLAP = 15,                       /**< Device can possibly copy memory and execute a kernel concurrently */
-    CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,              /**< Number of multiprocessors on device */
-    CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT = 17,               /**< Specifies whether there is a run time limit on kernels */
-    CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,                        /**< Device is integrated with host memory */
-    CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,               /**< Device can map host memory into CUDA address space */
-    CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,                      /**< Compute mode (See ::CUcomputemode for details) */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_WIDTH = 21,           /**< Maximum 1D texture width */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_WIDTH = 22,           /**< Maximum 2D texture width */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_HEIGHT = 23,          /**< Maximum 2D texture height */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_WIDTH = 24,           /**< Maximum 3D texture width */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_HEIGHT = 25,          /**< Maximum 3D texture height */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_DEPTH = 26,           /**< Maximum 3D texture depth */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_WIDTH = 27,     /**< Maximum texture array width */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_HEIGHT = 28,    /**< Maximum texture array height */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_NUMSLICES = 29, /**< Maximum slices in a texture array */
-    CU_DEVICE_ATTRIBUTE_SURFACE_ALIGNMENT = 30,                 /**< Alignment requirement for surfaces */
-    CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,                /**< Device can possibly execute multiple kernels concurrently */
-    CU_DEVICE_ATTRIBUTE_ECC_ENABLED = 32,                       /**< Device has ECC support enabled */
-    CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,                        /**< PCI bus ID of the device */
-    CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,                     /**< PCI device ID of the device */
-    CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35                         /**< Device is using TCC driver model */
-#if __CUDA_API_VERSION >= 4000
-  , CU_DEVICE_ATTRIBUTE_MEMORY_CLOCK_RATE = 36,                 /**< Peak memory clock frequency in kilohertz */
-    CU_DEVICE_ATTRIBUTE_GLOBAL_MEMORY_BUS_WIDTH = 37,           /**< Global memory bus width in bits */
-    CU_DEVICE_ATTRIBUTE_L2_CACHE_SIZE = 38,                     /**< Size of L2 cache in bytes */
-    CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_MULTIPROCESSOR = 39,    /**< Maximum resident threads per multiprocessor */
-    CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40,                /**< Number of asynchronous engines */
-    CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41,                /**< Device uses shares a unified address space with the host */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_WIDTH = 42,   /**< Maximum 1D layered texture width */
-    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_LAYERS = 43   /**< Maximum layers in a 1D layered texture */
-#endif
-} CUdevice_attribute;
-
-/**
- * Legacy device properties
- */
-typedef struct CUdevprop_st
-{
-    int maxThreadsPerBlock;     /**< Maximum number of threads per block */
-    int maxThreadsDim[3];       /**< Maximum size of each dimension of a block */
-    int maxGridSize[3];         /**< Maximum size of each dimension of a grid */
-    int sharedMemPerBlock;      /**< Shared memory available per block in bytes */
-    int totalConstantMemory;    /**< Constant memory available on device in bytes */
-    int SIMDWidth;              /**< Warp size in threads */
-    int memPitch;               /**< Maximum pitch in bytes allowed by memory copies */
-    int regsPerBlock;           /**< 32-bit registers available per block */
-    int clockRate;              /**< Clock frequency in kilohertz */
-    int textureAlign;           /**< Alignment requirement for textures */
-} CUdevprop;
-
-/**
- * Function properties
- */
-typedef enum CUfunction_attribute_enum
-{
-    /**
-     * The maximum number of threads per block, beyond which a launch of the
-     * function would fail. This number depends on both the function and the
-     * device on which the function is currently loaded.
-     */
-    CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 0,
-
-    /**
-     * The size in bytes of statically-allocated shared memory required by
-     * this function. This does not include dynamically-allocated shared
-     * memory requested by the user at runtime.
-     */
-    CU_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES = 1,
-
-    /**
-     * The size in bytes of user-allocated constant memory required by this
-     * function.
-     */
-    CU_FUNC_ATTRIBUTE_CONST_SIZE_BYTES = 2,
-
-    /**
-     * The size in bytes of local memory used by each thread of this function.
-     */
-    CU_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES = 3,
-
-    /**
-     * The number of registers used by each thread of this function.
-     */
-    CU_FUNC_ATTRIBUTE_NUM_REGS = 4,
-
-    /**
-     * The PTX virtual architecture version for which the function was
-     * compiled. This value is the major PTX version * 10 + the minor PTX
-     * version, so a PTX version 1.3 function would return the value 13.
-     * Note that this may return the undefined value of 0 for cubins
-     * compiled prior to CUDA 3.0.
-     */
-    CU_FUNC_ATTRIBUTE_PTX_VERSION = 5,
-
-    /**
-     * The binary architecture version for which the function was compiled.
-     * This value is the major binary version * 10 + the minor binary version,
-     * so a binary version 1.3 function would return the value 13. Note that
-     * this will return a value of 10 for legacy cubins that do not have a
-     * properly-encoded binary architecture version.
-     */
-    CU_FUNC_ATTRIBUTE_BINARY_VERSION = 6,
-
-    CU_FUNC_ATTRIBUTE_MAX
-} CUfunction_attribute;
-
-/**
- * Function cache configurations
- */
-typedef enum CUfunc_cache_enum
-{
-    CU_FUNC_CACHE_PREFER_NONE    = 0x00, /**< no preference for shared memory or L1 (default) */
-    CU_FUNC_CACHE_PREFER_SHARED  = 0x01, /**< prefer larger shared memory and smaller L1 cache */
-    CU_FUNC_CACHE_PREFER_L1      = 0x02  /**< prefer larger L1 cache and smaller shared memory */
-} CUfunc_cache;
-
-/**
- * Memory types
- */
-typedef enum CUmemorytype_enum
-{
-    CU_MEMORYTYPE_HOST    = 0x01,    /**< Host memory */
-    CU_MEMORYTYPE_DEVICE  = 0x02,    /**< Device memory */
-    CU_MEMORYTYPE_ARRAY   = 0x03     /**< Array memory */
-#if __CUDA_API_VERSION >= 4000
-  , CU_MEMORYTYPE_UNIFIED = 0x04     /**< Unified device or host memory */
-#endif
-} CUmemorytype;
-
-/**
- * Compute Modes
- */
-typedef enum CUcomputemode_enum
-{
-    CU_COMPUTEMODE_DEFAULT           = 0,  /**< Default compute mode (Multiple contexts allowed per device) */
-    CU_COMPUTEMODE_EXCLUSIVE         = 1, /**< Compute-exclusive-thread mode (Only one context used by a single thread can be present on this device at a time) */
-    CU_COMPUTEMODE_PROHIBITED        = 2  /**< Compute-prohibited mode (No contexts can be created on this device at this time) */
-#if __CUDA_API_VERSION >= 4000
-  , CU_COMPUTEMODE_EXCLUSIVE_PROCESS = 3  /**< Compute-exclusive-process mode (Only one context used by a single process can be present on this device at a time) */
-#endif
-} CUcomputemode;
-
-/**
- * Online compiler options
- */
-typedef enum CUjit_option_enum
-{
-    /**
-     * Max number of registers that a thread may use.\n
-     * Option type: unsigned int
-     */
-    CU_JIT_MAX_REGISTERS = 0,
-
-    /**
-     * IN: Specifies minimum number of threads per block to target compilation
-     * for\n
-     * OUT: Returns the number of threads the compiler actually targeted.
-     * This restricts the resource utilization fo the compiler (e.g. max
-     * registers) such that a block with the given number of threads should be
-     * able to launch based on register limitations. Note, this option does not
-     * currently take into account any other resource limitations, such as
-     * shared memory utilization.\n
-     * Option type: unsigned int
-     */
-    CU_JIT_THREADS_PER_BLOCK,
-
-    /**
-     * Returns a float value in the option of the wall clock time, in
-     * milliseconds, spent creating the cubin\n
-     * Option type: float
-     */
-    CU_JIT_WALL_TIME,
-
-    /**
-     * Pointer to a buffer in which to print any log messsages from PTXAS
-     * that are informational in nature (the buffer size is specified via
-     * option ::CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES) \n
-     * Option type: char*
-     */
-    CU_JIT_INFO_LOG_BUFFER,
-
-    /**
-     * IN: Log buffer size in bytes.  Log messages will be capped at this size
-     * (including null terminator)\n
-     * OUT: Amount of log buffer filled with messages\n
-     * Option type: unsigned int
-     */
-    CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES,
-
-    /**
-     * Pointer to a buffer in which to print any log messages from PTXAS that
-     * reflect errors (the buffer size is specified via option
-     * ::CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES)\n
-     * Option type: char*
-     */
-    CU_JIT_ERROR_LOG_BUFFER,
-
-    /**
-     * IN: Log buffer size in bytes.  Log messages will be capped at this size
-     * (including null terminator)\n
-     * OUT: Amount of log buffer filled with messages\n
-     * Option type: unsigned int
-     */
-    CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES,
-
-    /**
-     * Level of optimizations to apply to generated code (0 - 4), with 4
-     * being the default and highest level of optimizations.\n
-     * Option type: unsigned int
-     */
-    CU_JIT_OPTIMIZATION_LEVEL,
-
-    /**
-     * No option value required. Determines the target based on the current
-     * attached context (default)\n
-     * Option type: No option value needed
-     */
-    CU_JIT_TARGET_FROM_CUCONTEXT,
-
-    /**
-     * Target is chosen based on supplied ::CUjit_target_enum.\n
-     * Option type: unsigned int for enumerated type ::CUjit_target_enum
-     */
-    CU_JIT_TARGET,
-
-    /**
-     * Specifies choice of fallback strategy if matching cubin is not found.
-     * Choice is based on supplied ::CUjit_fallback_enum.\n
-     * Option type: unsigned int for enumerated type ::CUjit_fallback_enum
-     */
-    CU_JIT_FALLBACK_STRATEGY
-
-} CUjit_option;
-
-/**
- * Online compilation targets
- */
-typedef enum CUjit_target_enum
-{
-    CU_TARGET_COMPUTE_10 = 0,   /**< Compute device class 1.0 */
-    CU_TARGET_COMPUTE_11,       /**< Compute device class 1.1 */
-    CU_TARGET_COMPUTE_12,       /**< Compute device class 1.2 */
-    CU_TARGET_COMPUTE_13,       /**< Compute device class 1.3 */
-    CU_TARGET_COMPUTE_20,       /**< Compute device class 2.0 */
-    CU_TARGET_COMPUTE_21        /**< Compute device class 2.1 */
-} CUjit_target;
-
-/**
- * Cubin matching fallback strategies
- */
-typedef enum CUjit_fallback_enum
-{
-    CU_PREFER_PTX = 0,  /**< Prefer to compile ptx */
-
-    CU_PREFER_BINARY    /**< Prefer to fall back to compatible binary code */
-
-} CUjit_fallback;
-
-/**
- * Flags to register a graphics resource
- */
-typedef enum CUgraphicsRegisterFlags_enum
-{
-    CU_GRAPHICS_REGISTER_FLAGS_NONE          = 0x00,
-    CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY     = 0x01,
-    CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 0x02,
-    CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST  = 0x04
-} CUgraphicsRegisterFlags;
-
-/**
- * Flags for mapping and unmapping interop resources
- */
-typedef enum CUgraphicsMapResourceFlags_enum
-{
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE          = 0x00,
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
-    CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
-} CUgraphicsMapResourceFlags;
-
-/**
- * Array indices for cube faces
- */
-typedef enum CUarray_cubemap_face_enum
-{
-    CU_CUBEMAP_FACE_POSITIVE_X  = 0x00, /**< Positive X face of cubemap */
-    CU_CUBEMAP_FACE_NEGATIVE_X  = 0x01, /**< Negative X face of cubemap */
-    CU_CUBEMAP_FACE_POSITIVE_Y  = 0x02, /**< Positive Y face of cubemap */
-    CU_CUBEMAP_FACE_NEGATIVE_Y  = 0x03, /**< Negative Y face of cubemap */
-    CU_CUBEMAP_FACE_POSITIVE_Z  = 0x04, /**< Positive Z face of cubemap */
-    CU_CUBEMAP_FACE_NEGATIVE_Z  = 0x05  /**< Negative Z face of cubemap */
-} CUarray_cubemap_face;
-
-/**
- * Limits
- */
-typedef enum CUlimit_enum
-{
-    CU_LIMIT_STACK_SIZE        = 0x00, /**< GPU thread stack size */
-    CU_LIMIT_PRINTF_FIFO_SIZE  = 0x01, /**< GPU printf FIFO size */
-    CU_LIMIT_MALLOC_HEAP_SIZE  = 0x02  /**< GPU malloc heap size */
-} CUlimit;
-
-/**
- * Error codes
- */
-typedef enum cudaError_enum
-{
-    /**
-     * The API call returned with no errors. In the case of query calls, this
-     * can also mean that the operation being queried is complete (see
-     * ::cuEventQuery() and ::cuStreamQuery()).
-     */
-    CUDA_SUCCESS                              = 0,
-
-    /**
-     * This indicates that one or more of the parameters passed to the API call
-     * is not within an acceptable range of values.
-     */
-    CUDA_ERROR_INVALID_VALUE                  = 1,
-
-    /**
-     * The API call failed because it was unable to allocate enough memory to
-     * perform the requested operation.
-     */
-    CUDA_ERROR_OUT_OF_MEMORY                  = 2,
-
-    /**
-     * This indicates that the CUDA driver has not been initialized with
-     * ::cuInit() or that initialization has failed.
-     */
-    CUDA_ERROR_NOT_INITIALIZED                = 3,
-
-    /**
-     * This indicates that the CUDA driver is in the process of shutting down.
-     */
-    CUDA_ERROR_DEINITIALIZED                  = 4,
-
-    /**
-     * This indicates profiling APIs are called while application is running
-     * in visual profiler mode.
-    */
-    CUDA_ERROR_PROFILER_DISABLED           = 5,
-    /**
-     * This indicates profiling has not been initialized for this context.
-     * Call cuProfilerInitialize() to resolve this.
-    */
-    CUDA_ERROR_PROFILER_NOT_INITIALIZED       = 6,
-    /**
-     * This indicates profiler has already been started and probably
-     * cuProfilerStart() is incorrectly called.
-    */
-    CUDA_ERROR_PROFILER_ALREADY_STARTED       = 7,
-    /**
-     * This indicates profiler has already been stopped and probably
-     * cuProfilerStop() is incorrectly called.
-    */
-    CUDA_ERROR_PROFILER_ALREADY_STOPPED       = 8,
-    /**
-     * This indicates that no CUDA-capable devices were detected by the installed
-     * CUDA driver.
-     */
-    CUDA_ERROR_NO_DEVICE                      = 100,
-
-    /**
-     * This indicates that the device ordinal supplied by the user does not
-     * correspond to a valid CUDA device.
-     */
-    CUDA_ERROR_INVALID_DEVICE                 = 101,
-
-
-    /**
-     * This indicates that the device kernel image is invalid. This can also
-     * indicate an invalid CUDA module.
-     */
-    CUDA_ERROR_INVALID_IMAGE                  = 200,
-
-    /**
-     * This most frequently indicates that there is no context bound to the
-     * current thread. This can also be returned if the context passed to an
-     * API call is not a valid handle (such as a context that has had
-     * ::cuCtxDestroy() invoked on it). This can also be returned if a user
-     * mixes different API versions (i.e. 3010 context with 3020 API calls).
-     * See ::cuCtxGetApiVersion() for more details.
-     */
-    CUDA_ERROR_INVALID_CONTEXT                = 201,
-
-    /**
-     * This indicated that the context being supplied as a parameter to the
-     * API call was already the active context.
-     * \deprecated
-     * This error return is deprecated as of CUDA 3.2. It is no longer an
-     * error to attempt to push the active context via ::cuCtxPushCurrent().
-     */
-    CUDA_ERROR_CONTEXT_ALREADY_CURRENT        = 202,
-
-    /**
-     * This indicates that a map or register operation has failed.
-     */
-    CUDA_ERROR_MAP_FAILED                     = 205,
-
-    /**
-     * This indicates that an unmap or unregister operation has failed.
-     */
-    CUDA_ERROR_UNMAP_FAILED                   = 206,
-
-    /**
-     * This indicates that the specified array is currently mapped and thus
-     * cannot be destroyed.
-     */
-    CUDA_ERROR_ARRAY_IS_MAPPED                = 207,
-
-    /**
-     * This indicates that the resource is already mapped.
-     */
-    CUDA_ERROR_ALREADY_MAPPED                 = 208,
-
-    /**
-     * This indicates that there is no kernel image available that is suitable
-     * for the device. This can occur when a user specifies code generation
-     * options for a particular CUDA source file that do not include the
-     * corresponding device configuration.
-     */
-    CUDA_ERROR_NO_BINARY_FOR_GPU              = 209,
-
-    /**
-     * This indicates that a resource has already been acquired.
-     */
-    CUDA_ERROR_ALREADY_ACQUIRED               = 210,
-
-    /**
-     * This indicates that a resource is not mapped.
-     */
-    CUDA_ERROR_NOT_MAPPED                     = 211,
-
-    /**
-     * This indicates that a mapped resource is not available for access as an
-     * array.
-     */
-    CUDA_ERROR_NOT_MAPPED_AS_ARRAY            = 212,
-
-    /**
-     * This indicates that a mapped resource is not available for access as a
-     * pointer.
-     */
-    CUDA_ERROR_NOT_MAPPED_AS_POINTER          = 213,
-
-    /**
-     * This indicates that an uncorrectable ECC error was detected during
-     * execution.
-     */
-    CUDA_ERROR_ECC_UNCORRECTABLE              = 214,
-
-    /**
-     * This indicates that the ::CUlimit passed to the API call is not
-     * supported by the active device.
-     */
-    CUDA_ERROR_UNSUPPORTED_LIMIT              = 215,
-
-    /**
-     * This indicates that the ::CUcontext passed to the API call can
-     * only be bound to a single CPU thread at a time but is already
-     * bound to a CPU thread.
-     */
-    CUDA_ERROR_CONTEXT_ALREADY_IN_USE         = 216,
-
-    /**
-     * This indicates that the device kernel source is invalid.
-     */
-    CUDA_ERROR_INVALID_SOURCE                 = 300,
-
-    /**
-     * This indicates that the file specified was not found.
-     */
-    CUDA_ERROR_FILE_NOT_FOUND                 = 301,
-
-    /**
-     * This indicates that a link to a shared object failed to resolve.
-     */
-    CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND = 302,
-
-    /**
-     * This indicates that initialization of a shared object failed.
-     */
-    CUDA_ERROR_SHARED_OBJECT_INIT_FAILED      = 303,
-
-    /**
-     * This indicates that an OS call failed.
-     */
-    CUDA_ERROR_OPERATING_SYSTEM               = 304,
-
-
-    /**
-     * This indicates that a resource handle passed to the API call was not
-     * valid. Resource handles are opaque types like ::CUstream and ::CUevent.
-     */
-    CUDA_ERROR_INVALID_HANDLE                 = 400,
-
-
-    /**
-     * This indicates that a named symbol was not found. Examples of symbols
-     * are global/constant variable names, texture names, and surface names.
-     */
-    CUDA_ERROR_NOT_FOUND                      = 500,
-
-
-    /**
-     * This indicates that asynchronous operations issued previously have not
-     * completed yet. This result is not actually an error, but must be indicated
-     * differently than ::CUDA_SUCCESS (which indicates completion). Calls that
-     * may return this value include ::cuEventQuery() and ::cuStreamQuery().
-     */
-    CUDA_ERROR_NOT_READY                      = 600,
-
-
-    /**
-     * An exception occurred on the device while executing a kernel. Common
-     * causes include dereferencing an invalid device pointer and accessing
-     * out of bounds shared memory. The context cannot be used, so it must
-     * be destroyed (and a new one should be created). All existing device
-     * memory allocations from this context are invalid and must be
-     * reconstructed if the program is to continue using CUDA.
-     */
-    CUDA_ERROR_LAUNCH_FAILED                  = 700,
-
-    /**
-     * This indicates that a launch did not occur because it did not have
-     * appropriate resources. This error usually indicates that the user has
-     * attempted to pass too many arguments to the device kernel, or the
-     * kernel launch specifies too many threads for the kernel's register
-     * count. Passing arguments of the wrong size (i.e. a 64-bit pointer
-     * when a 32-bit int is expected) is equivalent to passing too many
-     * arguments and can also result in this error.
-     */
-    CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES        = 701,
-
-    /**
-     * This indicates that the device kernel took too long to execute. This can
-     * only occur if timeouts are enabled - see the device attribute
-     * ::CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT for more information. The
-     * context cannot be used (and must be destroyed similar to
-     * ::CUDA_ERROR_LAUNCH_FAILED). All existing device memory allocations from
-     * this context are invalid and must be reconstructed if the program is to
-     * continue using CUDA.
-     */
-    CUDA_ERROR_LAUNCH_TIMEOUT                 = 702,
-
-    /**
-     * This error indicates a kernel launch that uses an incompatible texturing
-     * mode.
-     */
-    CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING  = 703,
-
-    /**
-     * This error indicates that a call to ::cuCtxEnablePeerAccess() is
-     * trying to re-enable peer access to a context which has already
-     * had peer access to it enabled.
-     */
-    CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED = 704,
-
-    /**
-     * This error indicates that a call to ::cuMemPeerRegister is trying to
-     * register memory from a context which has not had peer access
-     * enabled yet via ::cuCtxEnablePeerAccess(), or that
-     * ::cuCtxDisablePeerAccess() is trying to disable peer access
-     * which has not been enabled yet.
-     */
-    CUDA_ERROR_PEER_ACCESS_NOT_ENABLED    = 705,
-
-    /**
-     * This error indicates that a call to ::cuMemPeerRegister is trying to
-     * register already-registered memory.
-     */
-    CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED = 706,
-
-    /**
-     * This error indicates that a call to ::cuMemPeerUnregister is trying to
-     * unregister memory that has not been registered.
-     */
-    CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED     = 707,
-
-    /**
-     * This error indicates that ::cuCtxCreate was called with the flag
-     * ::CU_CTX_PRIMARY on a device which already has initialized its
-     * primary context.
-     */
-    CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE         = 708,
-
-    /**
-     * This error indicates that the context current to the calling thread
-     * has been destroyed using ::cuCtxDestroy, or is a primary context which
-     * has not yet been initialized.
-     */
-    CUDA_ERROR_CONTEXT_IS_DESTROYED           = 709,
-
-    /**
-     * This indicates that an unknown internal error has occurred.
-     */
-    CUDA_ERROR_UNKNOWN                        = 999
-} CUresult;
-
-#if __CUDA_API_VERSION >= 4000
-/**
- * If set, host memory is portable between CUDA contexts.
- * Flag for ::cuMemHostAlloc()
- */
-#define CU_MEMHOSTALLOC_PORTABLE        0x01
-
-/**
- * If set, host memory is mapped into CUDA address space and
- * ::cuMemHostGetDevicePointer() may be called on the host pointer.
- * Flag for ::cuMemHostAlloc()
- */
-#define CU_MEMHOSTALLOC_DEVICEMAP       0x02
-
-/**
- * If set, host memory is allocated as write-combined - fast to write,
- * faster to DMA, slow to read except via SSE4 streaming load instruction
- * (MOVNTDQA).
- * Flag for ::cuMemHostAlloc()
- */
-#define CU_MEMHOSTALLOC_WRITECOMBINED   0x04
-
-/**
- * If set, host memory is portable between CUDA contexts.
- * Flag for ::cuMemHostRegister()
- */
-#define CU_MEMHOSTREGISTER_PORTABLE     0x01
-
-/**
- * If set, host memory is mapped into CUDA address space and
- * ::cuMemHostGetDevicePointer() may be called on the host pointer.
- * Flag for ::cuMemHostRegister()
- */
-#define CU_MEMHOSTREGISTER_DEVICEMAP    0x02
-
-/**
- * If set, peer memory is mapped into CUDA address space and
- * ::cuMemPeerGetDevicePointer() may be called on the host pointer.
- * Flag for ::cuMemPeerRegister()
- */
-#define CU_MEMPEERREGISTER_DEVICEMAP    0x02
-#endif
-
-#if __CUDA_API_VERSION >= 3020
-/**
- * 2D memory copy parameters
- */
-typedef struct CUDA_MEMCPY2D_st
-{
-    size_t srcXInBytes;         /**< Source X in bytes */
-    size_t srcY;                /**< Source Y */
-
-    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
-    const void *srcHost;        /**< Source host pointer */
-    CUdeviceptr srcDevice;      /**< Source device pointer */
-    CUarray srcArray;           /**< Source array reference */
-    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
-
-    size_t dstXInBytes;         /**< Destination X in bytes */
-    size_t dstY;                /**< Destination Y */
-
-    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
-    void *dstHost;              /**< Destination host pointer */
-    CUdeviceptr dstDevice;      /**< Destination device pointer */
-    CUarray dstArray;           /**< Destination array reference */
-    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
-
-    size_t WidthInBytes;        /**< Width of 2D memory copy in bytes */
-    size_t Height;              /**< Height of 2D memory copy */
-} CUDA_MEMCPY2D;
-
-/**
- * 3D memory copy parameters
- */
-typedef struct CUDA_MEMCPY3D_st
-{
-    size_t srcXInBytes;         /**< Source X in bytes */
-    size_t srcY;                /**< Source Y */
-    size_t srcZ;                /**< Source Z */
-    size_t srcLOD;              /**< Source LOD */
-    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
-    const void *srcHost;        /**< Source host pointer */
-    CUdeviceptr srcDevice;      /**< Source device pointer */
-    CUarray srcArray;           /**< Source array reference */
-    void *reserved0;            /**< Must be NULL */
-    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
-    size_t srcHeight;           /**< Source height (ignored when src is array; may be 0 if Depth==1) */
-
-    size_t dstXInBytes;         /**< Destination X in bytes */
-    size_t dstY;                /**< Destination Y */
-    size_t dstZ;                /**< Destination Z */
-    size_t dstLOD;              /**< Destination LOD */
-    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
-    void *dstHost;              /**< Destination host pointer */
-    CUdeviceptr dstDevice;      /**< Destination device pointer */
-    CUarray dstArray;           /**< Destination array reference */
-    void *reserved1;            /**< Must be NULL */
-    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
-    size_t dstHeight;           /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
-
-    size_t WidthInBytes;        /**< Width of 3D memory copy in bytes */
-    size_t Height;              /**< Height of 3D memory copy */
-    size_t Depth;               /**< Depth of 3D memory copy */
-} CUDA_MEMCPY3D;
-
-/**
- * 3D memory cross-context copy parameters
- */
-typedef struct CUDA_MEMCPY3D_PEER_st
-{
-    size_t srcXInBytes;         /**< Source X in bytes */
-    size_t srcY;                /**< Source Y */
-    size_t srcZ;                /**< Source Z */
-    size_t srcLOD;              /**< Source LOD */
-    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
-    const void *srcHost;        /**< Source host pointer */
-    CUdeviceptr srcDevice;      /**< Source device pointer */
-    CUarray srcArray;           /**< Source array reference */
-    CUcontext srcContext;       /**< Source context (ignored with srcMemoryType is ::CU_MEMORYTYPE_ARRAY) */
-    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
-    size_t srcHeight;           /**< Source height (ignored when src is array; may be 0 if Depth==1) */
-
-    size_t dstXInBytes;         /**< Destination X in bytes */
-    size_t dstY;                /**< Destination Y */
-    size_t dstZ;                /**< Destination Z */
-    size_t dstLOD;              /**< Destination LOD */
-    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
-    void *dstHost;              /**< Destination host pointer */
-    CUdeviceptr dstDevice;      /**< Destination device pointer */
-    CUarray dstArray;           /**< Destination array reference */
-    CUcontext dstContext;       /**< Destination context (ignored with dstMemoryType is ::CU_MEMORYTYPE_ARRAY) */
-    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
-    size_t dstHeight;           /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
-
-    size_t WidthInBytes;        /**< Width of 3D memory copy in bytes */
-    size_t Height;              /**< Height of 3D memory copy */
-    size_t Depth;               /**< Depth of 3D memory copy */
-} CUDA_MEMCPY3D_PEER;
-
-/**
- * Array descriptor
- */
-typedef struct CUDA_ARRAY_DESCRIPTOR_st
-{
-    size_t Width;             /**< Width of array */
-    size_t Height;            /**< Height of array */
-
-    CUarray_format Format;    /**< Array format */
-    unsigned int NumChannels; /**< Channels per array element */
-} CUDA_ARRAY_DESCRIPTOR;
-
-/**
- * 3D array descriptor
- */
-typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
-{
-    size_t Width;             /**< Width of 3D array */
-    size_t Height;            /**< Height of 3D array */
-    size_t Depth;             /**< Depth of 3D array */
-
-    CUarray_format Format;    /**< Array format */
-    unsigned int NumChannels; /**< Channels per array element */
-    unsigned int Flags;       /**< Flags */
-} CUDA_ARRAY3D_DESCRIPTOR;
-
-#endif /* __CUDA_API_VERSION >= 3020 */
-
-/**
- * If set, the CUDA array is a collection of layers, where each layer is either a 1D
- * or a 2D array and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies the number
- * of layers, not the depth of a 3D array.
- */
-#define CUDA_ARRAY3D_LAYERED        0x01
-
-/**
- * Deprecated, use CUDA_ARRAY3D_LAYERED
- */
-#define CUDA_ARRAY3D_2DARRAY        0x01
-
-/**
- * This flag must be set in order to bind a surface reference
- * to the CUDA array
- */
-#define CUDA_ARRAY3D_SURFACE_LDST   0x02
-
-/**
- * Override the texref format with a format inferred from the array.
- * Flag for ::cuTexRefSetArray()
- */
-#define CU_TRSA_OVERRIDE_FORMAT 0x01
-
-/**
- * Read the texture as integers rather than promoting the values to floats
- * in the range [0,1].
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_READ_AS_INTEGER         0x01
-
-/**
- * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_NORMALIZED_COORDINATES  0x02
-
-/**
- * Perform sRGB->linear conversion during texture read.
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_SRGB  0x10
-
-/**
- * End of array terminator for the \p extra parameter to
- * ::cuLaunchKernel
- */
-#define CU_LAUNCH_PARAM_END            ((void*)0x00)
-
-/**
- * Indicator that the next value in the \p extra parameter to
- * ::cuLaunchKernel will be a pointer to a buffer containing all kernel
- * parameters used for launching kernel \p f.  This buffer needs to
- * honor all alignment/padding requirements of the individual parameters.
- * If ::CU_LAUNCH_PARAM_BUFFER_SIZE is not also specified in the
- * \p extra array, then ::CU_LAUNCH_PARAM_BUFFER_POINTER will have no
- * effect.
- */
-#define CU_LAUNCH_PARAM_BUFFER_POINTER ((void*)0x01)
-
-/**
- * Indicator that the next value in the \p extra parameter to
- * ::cuLaunchKernel will be a pointer to a size_t which contains the
- * size of the buffer specified with ::CU_LAUNCH_PARAM_BUFFER_POINTER.
- * It is required that ::CU_LAUNCH_PARAM_BUFFER_POINTER also be specified
- * in the \p extra array if the value associated with
- * ::CU_LAUNCH_PARAM_BUFFER_SIZE is not zero.
- */
-#define CU_LAUNCH_PARAM_BUFFER_SIZE    ((void*)0x02)
-
-/**
- * For texture references loaded into the module, use default texunit from
- * texture reference.
- */
-#define CU_PARAM_TR_DEFAULT -1
-
-/**
- * CUDA API made obselete at API version 3020
- */
-#if defined(__CUDA_API_VERSION_INTERNAL)
-    #define CUdeviceptr                  CUdeviceptr_v1
-    #define CUDA_MEMCPY2D_st             CUDA_MEMCPY2D_v1_st
-    #define CUDA_MEMCPY2D                CUDA_MEMCPY2D_v1
-    #define CUDA_MEMCPY3D_st             CUDA_MEMCPY3D_v1_st
-    #define CUDA_MEMCPY3D                CUDA_MEMCPY3D_v1
-    #define CUDA_ARRAY_DESCRIPTOR_st     CUDA_ARRAY_DESCRIPTOR_v1_st
-    #define CUDA_ARRAY_DESCRIPTOR        CUDA_ARRAY_DESCRIPTOR_v1
-    #define CUDA_ARRAY3D_DESCRIPTOR_st   CUDA_ARRAY3D_DESCRIPTOR_v1_st
-    #define CUDA_ARRAY3D_DESCRIPTOR      CUDA_ARRAY3D_DESCRIPTOR_v1
-#endif /* CUDA_FORCE_LEGACY32_INTERNAL */
-
-#if defined(__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020
-typedef unsigned int CUdeviceptr;
-
-typedef struct CUDA_MEMCPY2D_st
-{
-    unsigned int srcXInBytes;   /**< Source X in bytes */
-    unsigned int srcY;          /**< Source Y */
-    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
-    const void *srcHost;        /**< Source host pointer */
-    CUdeviceptr srcDevice;      /**< Source device pointer */
-    CUarray srcArray;           /**< Source array reference */
-    unsigned int srcPitch;      /**< Source pitch (ignored when src is array) */
-
-    unsigned int dstXInBytes;   /**< Destination X in bytes */
-    unsigned int dstY;          /**< Destination Y */
-    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
-    void *dstHost;              /**< Destination host pointer */
-    CUdeviceptr dstDevice;      /**< Destination device pointer */
-    CUarray dstArray;           /**< Destination array reference */
-    unsigned int dstPitch;      /**< Destination pitch (ignored when dst is array) */
-
-    unsigned int WidthInBytes;  /**< Width of 2D memory copy in bytes */
-    unsigned int Height;        /**< Height of 2D memory copy */
-} CUDA_MEMCPY2D;
-
-typedef struct CUDA_MEMCPY3D_st
-{
-    unsigned int srcXInBytes;   /**< Source X in bytes */
-    unsigned int srcY;          /**< Source Y */
-    unsigned int srcZ;          /**< Source Z */
-    unsigned int srcLOD;        /**< Source LOD */
-    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
-    const void *srcHost;        /**< Source host pointer */
-    CUdeviceptr srcDevice;      /**< Source device pointer */
-    CUarray srcArray;           /**< Source array reference */
-    void *reserved0;            /**< Must be NULL */
-    unsigned int srcPitch;      /**< Source pitch (ignored when src is array) */
-    unsigned int srcHeight;     /**< Source height (ignored when src is array; may be 0 if Depth==1) */
-
-    unsigned int dstXInBytes;   /**< Destination X in bytes */
-    unsigned int dstY;          /**< Destination Y */
-    unsigned int dstZ;          /**< Destination Z */
-    unsigned int dstLOD;        /**< Destination LOD */
-    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
-    void *dstHost;              /**< Destination host pointer */
-    CUdeviceptr dstDevice;      /**< Destination device pointer */
-    CUarray dstArray;           /**< Destination array reference */
-    void *reserved1;            /**< Must be NULL */
-    unsigned int dstPitch;      /**< Destination pitch (ignored when dst is array) */
-    unsigned int dstHeight;     /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
-
-    unsigned int WidthInBytes;  /**< Width of 3D memory copy in bytes */
-    unsigned int Height;        /**< Height of 3D memory copy */
-    unsigned int Depth;         /**< Depth of 3D memory copy */
-} CUDA_MEMCPY3D;
-
-typedef struct CUDA_ARRAY_DESCRIPTOR_st
-{
-    unsigned int Width;         /**< Width of array */
-    unsigned int Height;        /**< Height of array */
-
-    CUarray_format Format;      /**< Array format */
-    unsigned int NumChannels;   /**< Channels per array element */
-} CUDA_ARRAY_DESCRIPTOR;
-
-typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
-{
-    unsigned int Width;         /**< Width of 3D array */
-    unsigned int Height;        /**< Height of 3D array */
-    unsigned int Depth;         /**< Depth of 3D array */
-
-    CUarray_format Format;      /**< Array format */
-    unsigned int NumChannels;   /**< Channels per array element */
-    unsigned int Flags;         /**< Flags */
-} CUDA_ARRAY3D_DESCRIPTOR;
-
-#endif /* (__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020 */
-
-/*
- * If set, the CUDA array contains an array of 2D slices
- * and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies
- * the number of slices, not the depth of a 3D array.
- */
-#define CUDA_ARRAY3D_2DARRAY        0x01
-
-/**
- * This flag must be set in order to bind a surface reference
- * to the CUDA array
- */
-#define CUDA_ARRAY3D_SURFACE_LDST   0x02
-
-/**
- * Override the texref format with a format inferred from the array.
- * Flag for ::cuTexRefSetArray()
- */
-#define CU_TRSA_OVERRIDE_FORMAT 0x01
-
-/**
- * Read the texture as integers rather than promoting the values to floats
- * in the range [0,1].
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_READ_AS_INTEGER         0x01
-
-/**
- * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_NORMALIZED_COORDINATES  0x02
-
-/**
- * Perform sRGB->linear conversion during texture read.
- * Flag for ::cuTexRefSetFlags()
- */
-#define CU_TRSF_SRGB  0x10
-
-/**
- * For texture references loaded into the module, use default texunit from
- * texture reference.
- */
-#define CU_PARAM_TR_DEFAULT -1
-
-/** @} */ /* END CUDA_TYPES */
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-    #define CUDAAPI __stdcall
-#else
-    #define CUDAAPI
-#endif
-
-/**
- * \defgroup CUDA_INITIALIZE Initialization
- *
- * This section describes the initialization functions of the low-level CUDA
- * driver application programming interface.
- *
- * @{
- */
-
-/*********************************
- ** Initialization
- *********************************/
-typedef CUresult  CUDAAPI tcuInit(unsigned int Flags);
-
-/*********************************
- ** Driver Version Query
- *********************************/
-typedef CUresult  CUDAAPI tcuDriverGetVersion(int *driverVersion);
-
-/************************************
- **
- **    Device management
- **
- ***********************************/
-
-typedef CUresult  CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
-typedef CUresult  CUDAAPI tcuDeviceGetCount(int *count);
-typedef CUresult  CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
-typedef CUresult  CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult  CUDAAPI tcuDeviceTotalMem(size_t *bytes, CUdevice dev);
-#else
-    typedef CUresult  CUDAAPI tcuDeviceTotalMem(unsigned int *bytes, CUdevice dev);
-#endif
-
-typedef CUresult  CUDAAPI tcuDeviceGetProperties(CUdevprop *prop, CUdevice dev);
-typedef CUresult  CUDAAPI tcuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev);
-
-/************************************
- **
- **    Context management
- **
- ***********************************/
-typedef CUresult  CUDAAPI tcuCtxCreate(CUcontext *pctx, unsigned int flags, CUdevice dev);
-typedef CUresult  CUDAAPI tcuCtxDestroy(CUcontext ctx);
-typedef CUresult  CUDAAPI tcuCtxAttach(CUcontext *pctx, unsigned int flags);
-typedef CUresult  CUDAAPI tcuCtxDetach(CUcontext ctx);
-typedef CUresult  CUDAAPI tcuCtxPushCurrent(CUcontext ctx);
-typedef CUresult  CUDAAPI tcuCtxPopCurrent(CUcontext *pctx);
-
-typedef CUresult  CUDAAPI tcuCtxSetCurrent(CUcontext ctx);
-typedef CUresult  CUDAAPI tcuCtxGetCurrent(CUcontext *pctx);
-
-typedef CUresult  CUDAAPI tcuCtxGetDevice(CUdevice *device);
-typedef CUresult  CUDAAPI tcuCtxSynchronize(void);
-
-
-/************************************
- **
- **    Module management
- **
- ***********************************/
-typedef CUresult  CUDAAPI tcuModuleLoad(CUmodule *module, const char *fname);
-typedef CUresult  CUDAAPI tcuModuleLoadData(CUmodule *module, const void *image);
-typedef CUresult  CUDAAPI tcuModuleLoadDataEx(CUmodule *module, const void *image, unsigned int numOptions, CUjit_option *options, void **optionValues);
-typedef CUresult  CUDAAPI tcuModuleLoadFatBinary(CUmodule *module, const void *fatCubin);
-typedef CUresult  CUDAAPI tcuModuleUnload(CUmodule hmod);
-typedef CUresult  CUDAAPI tcuModuleGetFunction(CUfunction *hfunc, CUmodule hmod, const char *name);
-
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult  CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char *name);
-#else
-    typedef CUresult  CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, unsigned int *bytes, CUmodule hmod, const char *name);
-#endif
-
-typedef CUresult  CUDAAPI tcuModuleGetTexRef(CUtexref *pTexRef, CUmodule hmod, const char *name);
-typedef CUresult  CUDAAPI tcuModuleGetSurfRef(CUsurfref *pSurfRef, CUmodule hmod, const char *name);
-
-/************************************
- **
- **    Memory management
- **
- ***********************************/
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult CUDAAPI tcuMemGetInfo(size_t *free, size_t *total);
-    typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, size_t bytesize);
-    typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, size_t *psize, CUdeviceptr dptr);
-    typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
-                                              size_t *pPitch,
-                                              size_t WidthInBytes,
-                                              size_t Height,
-                                              // size of biggest r/w to be performed by kernels on this memory
-                                              // 4, 8 or 16 bytes
-                                              unsigned int ElementSizeBytes
-                                             );
-#else
-    typedef CUresult CUDAAPI tcuMemGetInfo(unsigned int *free, unsigned int *total);
-    typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, unsigned int bytesize);
-    typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, unsigned int *psize, CUdeviceptr dptr);
-    typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
-                                              unsigned int *pPitch,
-                                              unsigned int WidthInBytes,
-                                              unsigned int Height,
-                                              // size of biggest r/w to be performed by kernels on this memory
-                                              // 4, 8 or 16 bytes
-                                              unsigned int ElementSizeBytes
-                                             );
-#endif
-
-typedef CUresult CUDAAPI tcuMemFree(CUdeviceptr dptr);
-
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, size_t bytesize);
-#else
-    typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, unsigned int bytesize);
-#endif
-
-typedef CUresult CUDAAPI tcuMemFreeHost(void *p);
-typedef CUresult CUDAAPI tcuMemHostAlloc(void **pp, size_t bytesize, unsigned int Flags);
-
-typedef CUresult CUDAAPI tcuMemHostGetDevicePointer(CUdeviceptr *pdptr, void *p, unsigned int Flags);
-typedef CUresult CUDAAPI tcuMemHostGetFlags(unsigned int *pFlags, void *p);
-
-typedef CUresult CUDAAPI tcuMemHostRegister(void *p, size_t bytesize, unsigned int Flags);
-typedef CUresult CUDAAPI tcuMemHostUnregister(void *p);;
-typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t ByteCount);
-typedef CUresult CUDAAPI tcuMemcpyPeer(CUdeviceptr dstDevice, CUcontext dstContext, CUdeviceptr srcDevice, CUcontext srcContext, size_t ByteCount);
-
-/************************************
- **
- **    Synchronous Memcpy
- **
- ** Intra-device memcpy's done with these functions may execute in parallel with the CPU,
- ** but if host memory is involved, they wait until the copy is done before returning.
- **
- ***********************************/
-// 1D functions
-#if __CUDA_API_VERSION >= 3020
-    // system <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount);
-
-    // device <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount);
-
-    // device <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoA(CUarray dstArray, size_t dstOffset, CUdeviceptr srcDevice, size_t ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, size_t srcOffset, size_t ByteCount);
-
-    // system <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoA(CUarray dstArray, size_t dstOffset, const void *srcHost, size_t ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, size_t srcOffset, size_t ByteCount);
-
-    // array <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyAtoA(CUarray dstArray, size_t dstOffset, CUarray srcArray, size_t srcOffset, size_t ByteCount);
-#else
-    // system <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, unsigned int ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, unsigned int ByteCount);
-
-    // device <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, unsigned int ByteCount);
-
-    // device <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoA(CUarray dstArray, unsigned int dstOffset, CUdeviceptr srcDevice, unsigned int ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
-
-    // system <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoA(CUarray dstArray, unsigned int dstOffset, const void *srcHost, unsigned int ByteCount);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
-
-    // array <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyAtoA(CUarray dstArray, unsigned int dstOffset, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
-#endif
-
-// 2D memcpy
-typedef CUresult  CUDAAPI tcuMemcpy2D(const CUDA_MEMCPY2D *pCopy);
-typedef CUresult  CUDAAPI tcuMemcpy2DUnaligned(const CUDA_MEMCPY2D *pCopy);
-
-// 3D memcpy
-typedef CUresult  CUDAAPI tcuMemcpy3D(const CUDA_MEMCPY3D *pCopy);
-
-/************************************
- **
- **    Asynchronous Memcpy
- **
- ** Any host memory involved must be DMA'able (e.g., allocated with cuMemAllocHost).
- ** memcpy's done with these functions execute in parallel with the CPU and, if
- ** the hardware is available, may execute in parallel with the GPU.
- ** Asynchronous memcpy must be accompanied by appropriate stream synchronization.
- **
- ***********************************/
-
-// 1D functions
-#if __CUDA_API_VERSION >= 3020
-    // system <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
-                                                 const void *srcHost, size_t ByteCount, CUstream hStream);
-    typedef CUresult  CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
-                                                 CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
-
-    // device <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
-                                                 CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
-
-    // system <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, size_t dstOffset,
-                                                 const void *srcHost, size_t ByteCount, CUstream hStream);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, size_t srcOffset,
-                                                 size_t ByteCount, CUstream hStream);
-#else
-    // system <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
-                                                 const void *srcHost, unsigned int ByteCount, CUstream hStream);
-    typedef CUresult  CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
-                                                 CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
-
-    // device <-> device memory
-    typedef CUresult  CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
-                                                 CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
-
-    // system <-> array memory
-    typedef CUresult  CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, unsigned int dstOffset,
-                                                 const void *srcHost, unsigned int ByteCount, CUstream hStream);
-    typedef CUresult  CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, unsigned int srcOffset,
-                                                 unsigned int ByteCount, CUstream hStream);
-#endif
-
-// 2D memcpy
-typedef CUresult  CUDAAPI tcuMemcpy2DAsync(const CUDA_MEMCPY2D *pCopy, CUstream hStream);
-
-// 3D memcpy
-typedef CUresult  CUDAAPI tcuMemcpy3DAsync(const CUDA_MEMCPY3D *pCopy, CUstream hStream);
-
-/************************************
- **
- **    Memset
- **
- ***********************************/
-typedef CUresult  CUDAAPI tcuMemsetD8(CUdeviceptr dstDevice, unsigned char uc, unsigned int N);
-typedef CUresult  CUDAAPI tcuMemsetD16(CUdeviceptr dstDevice, unsigned short us, unsigned int N);
-typedef CUresult  CUDAAPI tcuMemsetD32(CUdeviceptr dstDevice, unsigned int ui, unsigned int N);
-
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult  CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, size_t Width, size_t Height);
-    typedef CUresult  CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, size_t Width, size_t Height);
-    typedef CUresult  CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, size_t Width, size_t Height);
-#else
-    typedef CUresult  CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, unsigned int Width, unsigned int Height);
-    typedef CUresult  CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, unsigned int Width, unsigned int Height);
-    typedef CUresult  CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, unsigned int Width, unsigned int Height);
-#endif
-
-/************************************
- **
- **    Function management
- **
- ***********************************/
-
-
-typedef CUresult CUDAAPI tcuFuncSetBlockShape(CUfunction hfunc, int x, int y, int z);
-typedef CUresult CUDAAPI tcuFuncSetSharedSize(CUfunction hfunc, unsigned int bytes);
-typedef CUresult CUDAAPI tcuFuncGetAttribute(int *pi, CUfunction_attribute attrib, CUfunction hfunc);
-typedef CUresult CUDAAPI tcuFuncSetCacheConfig(CUfunction hfunc, CUfunc_cache config);
-typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f,
-                                         unsigned int gridDimX,  unsigned int gridDimY,  unsigned int gridDimZ,
-                                         unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
-                                         unsigned int sharedMemBytes,
-                                         CUstream hStream, void **kernelParams, void **extra);
-
-/************************************
- **
- **    Array management
- **
- ***********************************/
-
-typedef CUresult  CUDAAPI tcuArrayCreate(CUarray *pHandle, const CUDA_ARRAY_DESCRIPTOR *pAllocateArray);
-typedef CUresult  CUDAAPI tcuArrayGetDescriptor(CUDA_ARRAY_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
-typedef CUresult  CUDAAPI tcuArrayDestroy(CUarray hArray);
-
-typedef CUresult  CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR *pAllocateArray);
-typedef CUresult  CUDAAPI tcuArray3DGetDescriptor(CUDA_ARRAY3D_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
-
-
-/************************************
- **
- **    Texture reference management
- **
- ***********************************/
-typedef CUresult  CUDAAPI tcuTexRefCreate(CUtexref *pTexRef);
-typedef CUresult  CUDAAPI tcuTexRefDestroy(CUtexref hTexRef);
-
-typedef CUresult  CUDAAPI tcuTexRefSetArray(CUtexref hTexRef, CUarray hArray, unsigned int Flags);
-
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult  CUDAAPI tcuTexRefSetAddress(size_t *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, size_t bytes);
-    typedef CUresult  CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, size_t Pitch);
-#else
-    typedef CUresult  CUDAAPI tcuTexRefSetAddress(unsigned int *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, unsigned int bytes);
-    typedef CUresult  CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, unsigned int Pitch);
-#endif
-
-typedef CUresult  CUDAAPI tcuTexRefSetFormat(CUtexref hTexRef, CUarray_format fmt, int NumPackedComponents);
-typedef CUresult  CUDAAPI tcuTexRefSetAddressMode(CUtexref hTexRef, int dim, CUaddress_mode am);
-typedef CUresult  CUDAAPI tcuTexRefSetFilterMode(CUtexref hTexRef, CUfilter_mode fm);
-typedef CUresult  CUDAAPI tcuTexRefSetFlags(CUtexref hTexRef, unsigned int Flags);
-
-typedef CUresult  CUDAAPI tcuTexRefGetAddress(CUdeviceptr *pdptr, CUtexref hTexRef);
-typedef CUresult  CUDAAPI tcuTexRefGetArray(CUarray *phArray, CUtexref hTexRef);
-typedef CUresult  CUDAAPI tcuTexRefGetAddressMode(CUaddress_mode *pam, CUtexref hTexRef, int dim);
-typedef CUresult  CUDAAPI tcuTexRefGetFilterMode(CUfilter_mode *pfm, CUtexref hTexRef);
-typedef CUresult  CUDAAPI tcuTexRefGetFormat(CUarray_format *pFormat, int *pNumChannels, CUtexref hTexRef);
-typedef CUresult  CUDAAPI tcuTexRefGetFlags(unsigned int *pFlags, CUtexref hTexRef);
-
-/************************************
- **
- **    Surface reference management
- **
- ***********************************/
-typedef CUresult  CUDAAPI tcuSurfRefSetArray(CUsurfref hSurfRef, CUarray hArray, unsigned int Flags);
-typedef CUresult  CUDAAPI tcuSurfRefGetArray(CUarray *phArray, CUsurfref hSurfRef);
-
-/************************************
- **
- **    Parameter management
- **
- ***********************************/
-
-typedef CUresult  CUDAAPI tcuParamSetSize(CUfunction hfunc, unsigned int numbytes);
-typedef CUresult  CUDAAPI tcuParamSeti(CUfunction hfunc, int offset, unsigned int value);
-typedef CUresult  CUDAAPI tcuParamSetf(CUfunction hfunc, int offset, float value);
-typedef CUresult  CUDAAPI tcuParamSetv(CUfunction hfunc, int offset, void *ptr, unsigned int numbytes);
-typedef CUresult  CUDAAPI tcuParamSetTexRef(CUfunction hfunc, int texunit, CUtexref hTexRef);
-
-
-/************************************
- **
- **    Launch functions
- **
- ***********************************/
-
-typedef CUresult CUDAAPI tcuLaunch(CUfunction f);
-typedef CUresult CUDAAPI tcuLaunchGrid(CUfunction f, int grid_width, int grid_height);
-typedef CUresult CUDAAPI tcuLaunchGridAsync(CUfunction f, int grid_width, int grid_height, CUstream hStream);
-
-/************************************
- **
- **    Events
- **
- ***********************************/
-typedef CUresult CUDAAPI tcuEventCreate(CUevent *phEvent, unsigned int Flags);
-typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream);
-typedef CUresult CUDAAPI tcuEventQuery(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventSynchronize(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventDestroy(CUevent hEvent);
-typedef CUresult CUDAAPI tcuEventElapsedTime(float *pMilliseconds, CUevent hStart, CUevent hEnd);
-
-/************************************
- **
- **    Streams
- **
- ***********************************/
-typedef CUresult CUDAAPI  tcuStreamCreate(CUstream *phStream, unsigned int Flags);
-typedef CUresult CUDAAPI  tcuStreamQuery(CUstream hStream);
-typedef CUresult CUDAAPI  tcuStreamSynchronize(CUstream hStream);
-typedef CUresult CUDAAPI  tcuStreamDestroy(CUstream hStream);
-
-/************************************
- **
- **    Graphics interop
- **
- ***********************************/
-typedef CUresult CUDAAPI tcuGraphicsUnregisterResource(CUgraphicsResource resource);
-typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray *pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel);
-
-#if __CUDA_API_VERSION >= 3020
-    typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, size_t *pSize, CUgraphicsResource resource);
-#else
-    typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, unsigned int *pSize, CUgraphicsResource resource);
-#endif
-
-typedef CUresult CUDAAPI tcuGraphicsResourceSetMapFlags(CUgraphicsResource resource, unsigned int flags);
-typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
-typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
-
-/************************************
- **
- **    Export tables
- **
- ***********************************/
-typedef CUresult CUDAAPI tcuGetExportTable(const void **ppExportTable, const CUuuid *pExportTableId);
-
-/************************************
- **
- **    Limits
- **
- ***********************************/
-
-typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);
-typedef CUresult CUDAAPI tcuCtxGetLimit(size_t *pvalue, CUlimit limit);
-
-
-extern tcuDriverGetVersion             *cuDriverGetVersion;
-extern tcuDeviceGet                    *cuDeviceGet;
-extern tcuDeviceGetCount               *cuDeviceGetCount;
-extern tcuDeviceGetName                *cuDeviceGetName;
-extern tcuDeviceComputeCapability      *cuDeviceComputeCapability;
-extern tcuDeviceGetProperties          *cuDeviceGetProperties;
-extern tcuDeviceGetAttribute           *cuDeviceGetAttribute;
-extern tcuCtxDestroy                   *cuCtxDestroy;
-extern tcuCtxAttach                    *cuCtxAttach;
-extern tcuCtxDetach                    *cuCtxDetach;
-extern tcuCtxPushCurrent               *cuCtxPushCurrent;
-extern tcuCtxPopCurrent                *cuCtxPopCurrent;
-
-extern tcuCtxSetCurrent                *cuCtxSetCurrent;
-extern tcuCtxGetCurrent                *cuCtxGetCurrent;
-
-extern tcuCtxGetDevice                 *cuCtxGetDevice;
-extern tcuCtxSynchronize               *cuCtxSynchronize;
-extern tcuModuleLoad                   *cuModuleLoad;
-extern tcuModuleLoadData               *cuModuleLoadData;
-extern tcuModuleLoadDataEx             *cuModuleLoadDataEx;
-extern tcuModuleLoadFatBinary          *cuModuleLoadFatBinary;
-extern tcuModuleUnload                 *cuModuleUnload;
-extern tcuModuleGetFunction            *cuModuleGetFunction;
-extern tcuModuleGetTexRef              *cuModuleGetTexRef;
-extern tcuModuleGetSurfRef             *cuModuleGetSurfRef;
-extern tcuMemFreeHost                  *cuMemFreeHost;
-extern tcuMemHostAlloc                 *cuMemHostAlloc;
-extern tcuMemHostGetFlags              *cuMemHostGetFlags;
-
-extern tcuMemHostRegister              *cuMemHostRegister;
-extern tcuMemHostUnregister            *cuMemHostUnregister;
-extern tcuMemcpy                       *cuMemcpy;
-extern tcuMemcpyPeer                   *cuMemcpyPeer;
-
-extern tcuDeviceTotalMem               *cuDeviceTotalMem;
-extern tcuCtxCreate                    *cuCtxCreate;
-extern tcuModuleGetGlobal              *cuModuleGetGlobal;
-extern tcuMemGetInfo                   *cuMemGetInfo;
-extern tcuMemAlloc                     *cuMemAlloc;
-extern tcuMemAllocPitch                *cuMemAllocPitch;
-extern tcuMemFree                      *cuMemFree;
-extern tcuMemGetAddressRange           *cuMemGetAddressRange;
-extern tcuMemAllocHost                 *cuMemAllocHost;
-extern tcuMemHostGetDevicePointer      *cuMemHostGetDevicePointer;
-extern tcuFuncSetBlockShape            *cuFuncSetBlockShape;
-extern tcuFuncSetSharedSize            *cuFuncSetSharedSize;
-extern tcuFuncGetAttribute             *cuFuncGetAttribute;
-extern tcuFuncSetCacheConfig           *cuFuncSetCacheConfig;
-extern tcuLaunchKernel                 *cuLaunchKernel;
-extern tcuArrayDestroy                 *cuArrayDestroy;
-extern tcuTexRefCreate                 *cuTexRefCreate;
-extern tcuTexRefDestroy                *cuTexRefDestroy;
-extern tcuTexRefSetArray               *cuTexRefSetArray;
-extern tcuTexRefSetFormat              *cuTexRefSetFormat;
-extern tcuTexRefSetAddressMode         *cuTexRefSetAddressMode;
-extern tcuTexRefSetFilterMode          *cuTexRefSetFilterMode;
-extern tcuTexRefSetFlags               *cuTexRefSetFlags;
-extern tcuTexRefGetArray               *cuTexRefGetArray;
-extern tcuTexRefGetAddressMode         *cuTexRefGetAddressMode;
-extern tcuTexRefGetFilterMode          *cuTexRefGetFilterMode;
-extern tcuTexRefGetFormat              *cuTexRefGetFormat;
-extern tcuTexRefGetFlags               *cuTexRefGetFlags;
-extern tcuSurfRefSetArray              *cuSurfRefSetArray;
-extern tcuSurfRefGetArray              *cuSurfRefGetArray;
-extern tcuParamSetSize                 *cuParamSetSize;
-extern tcuParamSeti                    *cuParamSeti;
-extern tcuParamSetf                    *cuParamSetf;
-extern tcuParamSetv                    *cuParamSetv;
-extern tcuParamSetTexRef               *cuParamSetTexRef;
-extern tcuLaunch                       *cuLaunch;
-extern tcuLaunchGrid                   *cuLaunchGrid;
-extern tcuLaunchGridAsync              *cuLaunchGridAsync;
-extern tcuEventCreate                  *cuEventCreate;
-extern tcuEventRecord                  *cuEventRecord;
-extern tcuEventQuery                   *cuEventQuery;
-extern tcuEventSynchronize             *cuEventSynchronize;
-extern tcuEventDestroy                 *cuEventDestroy;
-extern tcuEventElapsedTime             *cuEventElapsedTime;
-extern tcuStreamCreate                 *cuStreamCreate;
-extern tcuStreamQuery                  *cuStreamQuery;
-extern tcuStreamSynchronize            *cuStreamSynchronize;
-extern tcuStreamDestroy                *cuStreamDestroy;
-extern tcuGraphicsUnregisterResource   *cuGraphicsUnregisterResource;
-extern tcuGraphicsSubResourceGetMappedArray  *cuGraphicsSubResourceGetMappedArray;
-extern tcuGraphicsResourceSetMapFlags  *cuGraphicsResourceSetMapFlags;
-extern tcuGraphicsMapResources         *cuGraphicsMapResources;
-extern tcuGraphicsUnmapResources       *cuGraphicsUnmapResources;
-extern tcuGetExportTable               *cuGetExportTable;
-extern tcuCtxSetLimit                  *cuCtxSetLimit;
-extern tcuCtxGetLimit                  *cuCtxGetLimit;
-
-// These functions could be using the CUDA 3.2 interface (_v2)
-extern tcuMemcpyHtoD                   *cuMemcpyHtoD;
-extern tcuMemcpyDtoH                   *cuMemcpyDtoH;
-extern tcuMemcpyDtoD                   *cuMemcpyDtoD;
-extern tcuMemcpyDtoA                   *cuMemcpyDtoA;
-extern tcuMemcpyAtoD                   *cuMemcpyAtoD;
-extern tcuMemcpyHtoA                   *cuMemcpyHtoA;
-extern tcuMemcpyAtoH                   *cuMemcpyAtoH;
-extern tcuMemcpyAtoA                   *cuMemcpyAtoA;
-extern tcuMemcpy2D                     *cuMemcpy2D;
-extern tcuMemcpy2DUnaligned            *cuMemcpy2DUnaligned;
-extern tcuMemcpy3D                     *cuMemcpy3D;
-extern tcuMemcpyHtoDAsync              *cuMemcpyHtoDAsync;
-extern tcuMemcpyDtoHAsync              *cuMemcpyDtoHAsync;
-extern tcuMemcpyDtoDAsync              *cuMemcpyDtoDAsync;
-extern tcuMemcpyHtoAAsync              *cuMemcpyHtoAAsync;
-extern tcuMemcpyAtoHAsync              *cuMemcpyAtoHAsync;
-extern tcuMemcpy2DAsync                *cuMemcpy2DAsync;
-extern tcuMemcpy3DAsync                *cuMemcpy3DAsync;
-extern tcuMemsetD8                     *cuMemsetD8;
-extern tcuMemsetD16                    *cuMemsetD16;
-extern tcuMemsetD32                    *cuMemsetD32;
-extern tcuMemsetD2D8                   *cuMemsetD2D8;
-extern tcuMemsetD2D16                  *cuMemsetD2D16;
-extern tcuMemsetD2D32                  *cuMemsetD2D32;
-extern tcuArrayCreate                  *cuArrayCreate;
-extern tcuArrayGetDescriptor           *cuArrayGetDescriptor;
-extern tcuArray3DCreate                *cuArray3DCreate;
-extern tcuArray3DGetDescriptor         *cuArray3DGetDescriptor;
-extern tcuTexRefSetAddress             *cuTexRefSetAddress;
-extern tcuTexRefSetAddress2D           *cuTexRefSetAddress2D;
-extern tcuTexRefGetAddress             *cuTexRefGetAddress;
-extern tcuGraphicsResourceGetMappedPointer   *cuGraphicsResourceGetMappedPointer;
-
-/************************************/
-CUresult CUDAAPI cuInit   (unsigned int, int cudaVersion);
-void CUDAAPI cuUninit();
-/************************************/
-
-
-#ifndef __CUDA_API_VERSION
-#define __CUDA_API_VERSION 4000
-#endif
-
-
-#include <gpac/setup.h>
-#include "../../src/compositor/gl_inc.h"
-
-/**
- * \file dynlink_cudaGL.h
- * \brief Header file for the OpenGL interoperability functions of the
- * low-level CUDA driver application programming interface.
- */
-
-/**
- * \defgroup CUDA_GL OpenGL Interoperability
- * \ingroup CUDA_DRIVER
- *
- * ___MANBRIEF___ OpenGL interoperability functions of the low-level CUDA
- * driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
- *
- * This section describes the OpenGL interoperability functions of the
- * low-level CUDA driver application programming interface. Note that mapping 
- * of OpenGL resources is performed with the graphics API agnostic, resource 
- * mapping interface described in \ref CUDA_GRAPHICS "Graphics Interoperability".
- *
- * @{
- */
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-#if !defined(WGL_NV_gpu_affinity)
-typedef void* HGPUNV;
-#endif
-#endif /* _WIN32 */
-
-typedef CUresult CUDAAPI tcuGraphicsGLRegisterBuffer(CUgraphicsResource *pCudaResource, GLuint buffer, unsigned int Flags);
-typedef CUresult CUDAAPI tcuGraphicsGLRegisterImage(CUgraphicsResource *pCudaResource, GLuint image, GLenum target, unsigned int Flags);
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-typedef CUresult CUDAAPI tcuWGLGetDevice(CUdevice *pDevice, HGPUNV hGpu);
-#endif /* _WIN32 */
-
-/**
- * CUDA devices corresponding to an OpenGL device
- */
-typedef enum CUGLDeviceList_enum {
-    CU_GL_DEVICE_LIST_ALL            = 0x01, /**< The CUDA devices for all GPUs used by the current OpenGL context */
-    CU_GL_DEVICE_LIST_CURRENT_FRAME  = 0x02, /**< The CUDA devices for the GPUs used by the current OpenGL context in its currently rendering frame */
-    CU_GL_DEVICE_LIST_NEXT_FRAME     = 0x03, /**< The CUDA devices for the GPUs to be used by the current OpenGL context in the next frame */
-} CUGLDeviceList;
-
-#if __CUDA_API_VERSION >= 6050
-typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
-#endif /* __CUDA_API_VERSION >= 6050 */
-
-/**
- * \defgroup CUDA_GL_DEPRECATED OpenGL Interoperability [DEPRECATED]
- *
- * ___MANBRIEF___ deprecated OpenGL interoperability functions of the low-level
- * CUDA driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
- *
- * This section describes deprecated OpenGL interoperability functionality.
- *
- * @{
- */
-
-/** Flags to map or unmap a resource */
-typedef enum CUGLmap_flags_enum {
-    CU_GL_MAP_RESOURCE_FLAGS_NONE          = 0x00,
-    CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
-    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,    
-} CUGLmap_flags;
-
-//#if __CUDA_API_VERSION >= 3020
-typedef CUresult CUDAAPI tcuGLCtxCreate(CUcontext *pCtx, unsigned int Flags, CUdevice device);
-//#endif /* __CUDA_API_VERSION >= 3020 */
-
-typedef CUresult CUDAAPI tcuGLInit(void);
-typedef CUresult CUDAAPI tcuGLRegisterBufferObject(GLuint buffer);
-
-#if __CUDA_API_VERSION >= 3020
-typedef CUresult CUDAAPI tcuGLMapBufferObject(CUdeviceptr *dptr, size_t *size, GLuint buffer);
-#endif /* __CUDA_API_VERSION >= 3020 */
-
-typedef CUresult CUDAAPI tcuGLUnmapBufferObject(GLuint buffer);
-typedef CUresult CUDAAPI tcuGLUnregisterBufferObject(GLuint buffer);
-typedef CUresult CUDAAPI tcuGLSetBufferObjectMapFlags(GLuint buffer, unsigned int Flags);
-
-#if __CUDA_API_VERSION >= 3020
-typedef CUresult CUDAAPI tcuGLMapBufferObjectAsync(CUdeviceptr *dptr, size_t *size, GLuint buffer, CUstream hStream);
-#endif /* __CUDA_API_VERSION >= 3020 */
-
-typedef CUresult CUDAAPI tcuGLUnmapBufferObjectAsync(GLuint buffer, CUstream hStream);
-typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-extern tcuWGLGetDevice                 *cuWGLGetDevice;
-#endif
-
-extern tcuGLCtxCreate                  *cuGLCtxCreate;
-extern tcuGLCtxCreate                  *cuGLCtxCreate_v2;
-extern tcuGLMapBufferObject            *cuGLMapBufferObject;
-extern tcuGLMapBufferObject            *cuGLMapBufferObject_v2;
-extern tcuGLMapBufferObjectAsync       *cuGLMapBufferObjectAsync;
-
-#if __CUDA_API_VERSION >= 6050
-extern tcuGLGetDevices                 *cuGLGetDevices;
-#endif
-
-extern tcuGraphicsGLRegisterBuffer     *cuGraphicsGLRegisterBuffer;
-extern tcuGraphicsGLRegisterImage      *cuGraphicsGLRegisterImage;
-extern tcuGLSetBufferObjectMapFlags    *cuGLSetBufferObjectMapFlags;
-extern tcuGLRegisterBufferObject       *cuGLRegisterBufferObject;
-
-extern tcuGLUnmapBufferObject          *cuGLUnmapBufferObject;
-extern tcuGLUnmapBufferObjectAsync     *cuGLUnmapBufferObjectAsync;
-
-extern tcuGLUnregisterBufferObject     *cuGLUnregisterBufferObject;
-extern tcuGLGetDevices                 *cuGLGetDevices; // CUDA 6.5 only
-
-
-#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
-#include <Windows.h>
-typedef HMODULE CUDADRIVER;
-#else
-typedef void *CUDADRIVER;
-#endif
-
-
-
-
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
-#if (CUDA_VERSION >= 3020) && (!defined(CUDA_FORCE_API_VERSION) || (CUDA_FORCE_API_VERSION >= 3020))
-#define __CUVID_DEVPTR64
-#endif
-#endif
-
-
-typedef void *CUvideodecoder;
-typedef struct _CUcontextlock_st *CUvideoctxlock;
-
-/**
- * \addtogroup VIDEO_DECODER Video Decoder
- * @{
- */
-
-/*!
- * \enum cudaVideoCodec
- * Video Codec Enums
- */
-typedef enum cudaVideoCodec_enum {
-    cudaVideoCodec_MPEG1=0,                 /**<  MPEG1   */
-    cudaVideoCodec_MPEG2,                   /**<  MPEG2  */
-    cudaVideoCodec_MPEG4,                   /**<  MPEG4   */
-    cudaVideoCodec_VC1,                     /**<  VC1   */
-    cudaVideoCodec_H264,                    /**<  H264   */
-    cudaVideoCodec_JPEG,                    /**<  JPEG   */
-    cudaVideoCodec_H264_SVC,                /**<  H264-SVC   */
-    cudaVideoCodec_H264_MVC,                /**<  H264-MVC   */
-    cudaVideoCodec_HEVC,                    /**<  HEVC   */
-    cudaVideoCodec_VP8,                     /**<  VP8   */
-    cudaVideoCodec_VP9,                     /**<  VP9   */
-    cudaVideoCodec_NumCodecs,               /**<  Max COdecs   */
-    // Uncompressed YUV
-    cudaVideoCodec_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')),   /**< Y,U,V (4:2:0)  */
-    cudaVideoCodec_YV12   = (('Y'<<24)|('V'<<16)|('1'<<8)|('2')),   /**< Y,V,U (4:2:0)  */
-    cudaVideoCodec_NV12   = (('N'<<24)|('V'<<16)|('1'<<8)|('2')),   /**< Y,UV  (4:2:0)  */
-    cudaVideoCodec_YUYV   = (('Y'<<24)|('U'<<16)|('Y'<<8)|('V')),   /**< YUYV/YUY2 (4:2:2)  */
-    cudaVideoCodec_UYVY   = (('U'<<24)|('Y'<<16)|('V'<<8)|('Y'))    /**< UYVY (4:2:2)  */
-} cudaVideoCodec;
-
-/*!
- * \enum cudaVideoSurfaceFormat
- * Video Surface Formats Enums
- */
-typedef enum cudaVideoSurfaceFormat_enum {
-    cudaVideoSurfaceFormat_NV12=0,       /**< NV12 (currently the only supported output format)  */
-	cudaVideoSurfaceFormat_P016=1
-} cudaVideoSurfaceFormat;
-
-/*!
- * \enum cudaVideoDeinterlaceMode
- * Deinterlacing Modes Enums
- */
-typedef enum cudaVideoDeinterlaceMode_enum {
-    cudaVideoDeinterlaceMode_Weave=0,   /**< Weave both fields (no deinterlacing) */
-    cudaVideoDeinterlaceMode_Bob,       /**< Drop one field  */
-    cudaVideoDeinterlaceMode_Adaptive   /**< Adaptive deinterlacing  */
-} cudaVideoDeinterlaceMode;
-
-/*!
- * \enum cudaVideoChromaFormat
- * Chroma Formats Enums
- */
-typedef enum cudaVideoChromaFormat_enum {
-    cudaVideoChromaFormat_Monochrome=0,  /**< MonoChrome */
-    cudaVideoChromaFormat_420,           /**< 4:2:0 */
-    cudaVideoChromaFormat_422,           /**< 4:2:2 */
-    cudaVideoChromaFormat_444            /**< 4:4:4 */
-} cudaVideoChromaFormat;
-
-/*!
- * \enum cudaVideoCreateFlags
- * Decoder Flags Enums
- */
-typedef enum cudaVideoCreateFlags_enum {
-    cudaVideoCreate_Default = 0x00,     /**< Default operation mode: use dedicated video engines */
-    cudaVideoCreate_PreferCUDA = 0x01,  /**< Use a CUDA-based decoder if faster than dedicated engines (requires a valid vidLock object for multi-threading) */
-    cudaVideoCreate_PreferDXVA = 0x02,  /**< Go through DXVA internally if possible (requires D3D9 interop) */
-    cudaVideoCreate_PreferCUVID = 0x04  /**< Use dedicated video engines directly */
-} cudaVideoCreateFlags;
-
-/*!
- * \struct CUVIDDECODECREATEINFO
- * Struct used in create decoder
- */
-typedef struct _CUVIDDECODECREATEINFO
-{
-    unsigned long ulWidth;              /**< Coded Sequence Width */
-    unsigned long ulHeight;             /**< Coded Sequence Height */
-    unsigned long ulNumDecodeSurfaces;  /**< Maximum number of internal decode surfaces */
-    cudaVideoCodec CodecType;           /**< cudaVideoCodec_XXX */
-    cudaVideoChromaFormat ChromaFormat; /**< cudaVideoChromaFormat_XXX (only 4:2:0 is currently supported) */
-    unsigned long ulCreationFlags;      /**< Decoder creation flags (cudaVideoCreateFlags_XXX) */
-    unsigned long bitDepthMinus8;
-    unsigned long Reserved1[4];         /**< Reserved for future use - set to zero */
-    /**
-    * area of the frame that should be displayed
-    */
-    struct {
-        short left;
-        short top;
-        short right;
-        short bottom;
-    } display_area;
-
-    cudaVideoSurfaceFormat OutputFormat;       /**< cudaVideoSurfaceFormat_XXX */
-    cudaVideoDeinterlaceMode DeinterlaceMode;  /**< cudaVideoDeinterlaceMode_XXX */
-    unsigned long ulTargetWidth;               /**< Post-processed Output Width (Should be aligned to 2) */
-    unsigned long ulTargetHeight;              /**< Post-processed Output Height (Should be aligbed to 2) */
-    unsigned long ulNumOutputSurfaces;         /**< Maximum number of output surfaces simultaneously mapped */
-    CUvideoctxlock vidLock;                    /**< If non-NULL, context lock used for synchronizing ownership of the cuda context */
-    /**
-    * target rectangle in the output frame (for aspect ratio conversion)
-    * if a null rectangle is specified, {0,0,ulTargetWidth,ulTargetHeight} will be used
-    */
-    struct {
-        short left;
-        short top;
-        short right;
-        short bottom;
-    } target_rect;
-    unsigned long Reserved2[5];                /**< Reserved for future use - set to zero */
-} CUVIDDECODECREATEINFO;
-
-/*!
- * \struct CUVIDH264DPBENTRY
- * H.264 DPB Entry
- */
-typedef struct _CUVIDH264DPBENTRY
-{
-    int PicIdx;                 /**< picture index of reference frame */
-    int FrameIdx;               /**< frame_num(short-term) or LongTermFrameIdx(long-term) */
-    int is_long_term;           /**< 0=short term reference, 1=long term reference */
-    int not_existing;           /**< non-existing reference frame (corresponding PicIdx should be set to -1) */
-    int used_for_reference;     /**< 0=unused, 1=top_field, 2=bottom_field, 3=both_fields */
-    int FieldOrderCnt[2];       /**< field order count of top and bottom fields */
-} CUVIDH264DPBENTRY;
-
-/*!
- * \struct CUVIDH264MVCEXT
- * H.264 MVC Picture Parameters Ext
- */
-typedef struct _CUVIDH264MVCEXT
-{
-    int num_views_minus1;
-    int view_id;
-    unsigned char inter_view_flag;
-    unsigned char num_inter_view_refs_l0;
-    unsigned char num_inter_view_refs_l1;
-    unsigned char MVCReserved8Bits;
-    int InterViewRefsL0[16];
-    int InterViewRefsL1[16];
-} CUVIDH264MVCEXT;
-
-/*!
- * \struct CUVIDH264SVCEXT
- * H.264 SVC Picture Parameters Ext
- */
-typedef struct _CUVIDH264SVCEXT
-{
-    unsigned char profile_idc;
-    unsigned char level_idc;
-    unsigned char DQId;
-    unsigned char DQIdMax;
-    unsigned char disable_inter_layer_deblocking_filter_idc;
-    unsigned char ref_layer_chroma_phase_y_plus1;
-    signed char   inter_layer_slice_alpha_c0_offset_div2;
-    signed char   inter_layer_slice_beta_offset_div2;
-
-    unsigned short DPBEntryValidFlag;
-    unsigned char inter_layer_deblocking_filter_control_present_flag;
-    unsigned char extended_spatial_scalability_idc;
-    unsigned char adaptive_tcoeff_level_prediction_flag;
-    unsigned char slice_header_restriction_flag;
-    unsigned char chroma_phase_x_plus1_flag;
-    unsigned char chroma_phase_y_plus1;
-
-    unsigned char tcoeff_level_prediction_flag;
-    unsigned char constrained_intra_resampling_flag;
-    unsigned char ref_layer_chroma_phase_x_plus1_flag;
-    unsigned char store_ref_base_pic_flag;
-    unsigned char Reserved8BitsA;
-    unsigned char Reserved8BitsB;
-    // For the 4 scaled_ref_layer_XX fields below,
-    // if (extended_spatial_scalability_idc == 1), SPS field, G.7.3.2.1.4, add prefix "seq_"
-    // if (extended_spatial_scalability_idc == 2), SLH field, G.7.3.3.4,
-    short scaled_ref_layer_left_offset;
-    short scaled_ref_layer_top_offset;
-    short scaled_ref_layer_right_offset;
-    short scaled_ref_layer_bottom_offset;
-    unsigned short Reserved16Bits;
-    struct _CUVIDPICPARAMS *pNextLayer; /**< Points to the picparams for the next layer to be decoded. Linked list ends at the target layer. */
-    int bRefBaseLayer;                  /**< whether to store ref base pic */
-} CUVIDH264SVCEXT;
-
-/*!
- * \struct CUVIDH264PICPARAMS
- * H.264 Picture Parameters
- */
-typedef struct _CUVIDH264PICPARAMS
-{
-    // SPS
-    int log2_max_frame_num_minus4;
-    int pic_order_cnt_type;
-    int log2_max_pic_order_cnt_lsb_minus4;
-    int delta_pic_order_always_zero_flag;
-    int frame_mbs_only_flag;
-    int direct_8x8_inference_flag;
-    int num_ref_frames;             // NOTE: shall meet level 4.1 restrictions
-    unsigned char residual_colour_transform_flag;
-    unsigned char bit_depth_luma_minus8;    // Must be 0 (only 8-bit supported)
-    unsigned char bit_depth_chroma_minus8;  // Must be 0 (only 8-bit supported)
-    unsigned char qpprime_y_zero_transform_bypass_flag;
-    // PPS
-    int entropy_coding_mode_flag;
-    int pic_order_present_flag;
-    int num_ref_idx_l0_active_minus1;
-    int num_ref_idx_l1_active_minus1;
-    int weighted_pred_flag;
-    int weighted_bipred_idc;
-    int pic_init_qp_minus26;
-    int deblocking_filter_control_present_flag;
-    int redundant_pic_cnt_present_flag;
-    int transform_8x8_mode_flag;
-    int MbaffFrameFlag;
-    int constrained_intra_pred_flag;
-    int chroma_qp_index_offset;
-    int second_chroma_qp_index_offset;
-    int ref_pic_flag;
-    int frame_num;
-    int CurrFieldOrderCnt[2];
-    // DPB
-    CUVIDH264DPBENTRY dpb[16];          // List of reference frames within the DPB
-    // Quantization Matrices (raster-order)
-    unsigned char WeightScale4x4[6][16];
-    unsigned char WeightScale8x8[2][64];
-    // FMO/ASO
-    unsigned char fmo_aso_enable;
-    unsigned char num_slice_groups_minus1;
-    unsigned char slice_group_map_type;
-    signed char pic_init_qs_minus26;
-    unsigned int slice_group_change_rate_minus1;
-    union
-    {
-        unsigned long long slice_group_map_addr;
-        const unsigned char *pMb2SliceGroupMap;
-    } fmo;
-    unsigned int  Reserved[12];
-    // SVC/MVC
-    union
-    {
-        CUVIDH264MVCEXT mvcext;
-        CUVIDH264SVCEXT svcext;
-    };
-} CUVIDH264PICPARAMS;
-
-
-/*!
- * \struct CUVIDMPEG2PICPARAMS
- * MPEG-2 Picture Parameters
- */
-typedef struct _CUVIDMPEG2PICPARAMS
-{
-    int ForwardRefIdx;          // Picture index of forward reference (P/B-frames)
-    int BackwardRefIdx;         // Picture index of backward reference (B-frames)
-    int picture_coding_type;
-    int full_pel_forward_vector;
-    int full_pel_backward_vector;
-    int f_code[2][2];
-    int intra_dc_precision;
-    int frame_pred_frame_dct;
-    int concealment_motion_vectors;
-    int q_scale_type;
-    int intra_vlc_format;
-    int alternate_scan;
-    int top_field_first;
-    // Quantization matrices (raster order)
-    unsigned char QuantMatrixIntra[64];
-    unsigned char QuantMatrixInter[64];
-} CUVIDMPEG2PICPARAMS;
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// MPEG-4 Picture Parameters
-//
-
-// MPEG-4 has VOP types instead of Picture types
-#define I_VOP 0
-#define P_VOP 1
-#define B_VOP 2
-#define S_VOP 3
-
-/*!
- * \struct CUVIDMPEG4PICPARAMS
- * MPEG-4 Picture Parameters
- */
-typedef struct _CUVIDMPEG4PICPARAMS
-{
-    int ForwardRefIdx;          // Picture index of forward reference (P/B-frames)
-    int BackwardRefIdx;         // Picture index of backward reference (B-frames)
-    // VOL
-    int video_object_layer_width;
-    int video_object_layer_height;
-    int vop_time_increment_bitcount;
-    int top_field_first;
-    int resync_marker_disable;
-    int quant_type;
-    int quarter_sample;
-    int short_video_header;
-    int divx_flags;
-    // VOP
-    int vop_coding_type;
-    int vop_coded;
-    int vop_rounding_type;
-    int alternate_vertical_scan_flag;
-    int interlaced;
-    int vop_fcode_forward;
-    int vop_fcode_backward;
-    int trd[2];
-    int trb[2];
-    // Quantization matrices (raster order)
-    unsigned char QuantMatrixIntra[64];
-    unsigned char QuantMatrixInter[64];
-    int gmc_enabled;
-} CUVIDMPEG4PICPARAMS;
-
-/*!
- * \struct CUVIDVC1PICPARAMS
- * VC1 Picture Parameters
- */
-typedef struct _CUVIDVC1PICPARAMS
-{
-    int ForwardRefIdx;      /**< Picture index of forward reference (P/B-frames) */
-    int BackwardRefIdx;     /**< Picture index of backward reference (B-frames) */
-    int FrameWidth;         /**< Actual frame width */
-    int FrameHeight;        /**< Actual frame height */
-    // PICTURE
-    int intra_pic_flag;     /**< Set to 1 for I,BI frames */
-    int ref_pic_flag;       /**< Set to 1 for I,P frames */
-    int progressive_fcm;    /**< Progressive frame */
-    // SEQUENCE
-    int profile;
-    int postprocflag;
-    int pulldown;
-    int interlace;
-    int tfcntrflag;
-    int finterpflag;
-    int psf;
-    int multires;
-    int syncmarker;
-    int rangered;
-    int maxbframes;
-    // ENTRYPOINT
-    int panscan_flag;
-    int refdist_flag;
-    int extended_mv;
-    int dquant;
-    int vstransform;
-    int loopfilter;
-    int fastuvmc;
-    int overlap;
-    int quantizer;
-    int extended_dmv;
-    int range_mapy_flag;
-    int range_mapy;
-    int range_mapuv_flag;
-    int range_mapuv;
-    int rangeredfrm;    // range reduction state
-} CUVIDVC1PICPARAMS;
-
-/*!
- * \struct CUVIDJPEGPICPARAMS
- * JPEG Picture Parameters
- */
-typedef struct _CUVIDJPEGPICPARAMS
-{
-    int Reserved;
-} CUVIDJPEGPICPARAMS;
-
-
- /*!
- * \struct CUVIDHEVCPICPARAMS
- * HEVC Picture Parameters
- */
-typedef struct _CUVIDHEVCPICPARAMS
-{
-    // sps
-    int pic_width_in_luma_samples;
-    int pic_height_in_luma_samples;
-    unsigned char log2_min_luma_coding_block_size_minus3;
-    unsigned char log2_diff_max_min_luma_coding_block_size;
-    unsigned char log2_min_transform_block_size_minus2;
-    unsigned char log2_diff_max_min_transform_block_size;
-    unsigned char pcm_enabled_flag;
-    unsigned char log2_min_pcm_luma_coding_block_size_minus3;
-    unsigned char log2_diff_max_min_pcm_luma_coding_block_size;
-    unsigned char pcm_sample_bit_depth_luma_minus1;
-
-    unsigned char pcm_sample_bit_depth_chroma_minus1;
-    unsigned char pcm_loop_filter_disabled_flag;
-    unsigned char strong_intra_smoothing_enabled_flag;
-    unsigned char max_transform_hierarchy_depth_intra;
-    unsigned char max_transform_hierarchy_depth_inter;
-    unsigned char amp_enabled_flag;
-    unsigned char separate_colour_plane_flag;
-    unsigned char log2_max_pic_order_cnt_lsb_minus4;
-
-    unsigned char num_short_term_ref_pic_sets;
-    unsigned char long_term_ref_pics_present_flag;
-    unsigned char num_long_term_ref_pics_sps;
-    unsigned char sps_temporal_mvp_enabled_flag;
-    unsigned char sample_adaptive_offset_enabled_flag;
-    unsigned char scaling_list_enable_flag;
-    unsigned char IrapPicFlag;
-    unsigned char IdrPicFlag;
-
-    unsigned char bit_depth_luma_minus8;
-    unsigned char bit_depth_chroma_minus8;
-    unsigned char reserved1[14];
-
-    // pps
-    unsigned char dependent_slice_segments_enabled_flag;
-    unsigned char slice_segment_header_extension_present_flag;
-    unsigned char sign_data_hiding_enabled_flag;
-    unsigned char cu_qp_delta_enabled_flag;
-    unsigned char diff_cu_qp_delta_depth;
-    signed char init_qp_minus26;
-    signed char pps_cb_qp_offset;
-    signed char pps_cr_qp_offset;
-
-    unsigned char constrained_intra_pred_flag;
-    unsigned char weighted_pred_flag;
-    unsigned char weighted_bipred_flag;
-    unsigned char transform_skip_enabled_flag;
-    unsigned char transquant_bypass_enabled_flag;
-    unsigned char entropy_coding_sync_enabled_flag;
-    unsigned char log2_parallel_merge_level_minus2;
-    unsigned char num_extra_slice_header_bits;
-
-    unsigned char loop_filter_across_tiles_enabled_flag;
-    unsigned char loop_filter_across_slices_enabled_flag;
-    unsigned char output_flag_present_flag;
-    unsigned char num_ref_idx_l0_default_active_minus1;
-    unsigned char num_ref_idx_l1_default_active_minus1;
-    unsigned char lists_modification_present_flag;
-    unsigned char cabac_init_present_flag;
-    unsigned char pps_slice_chroma_qp_offsets_present_flag;
-
-    unsigned char deblocking_filter_override_enabled_flag;
-    unsigned char pps_deblocking_filter_disabled_flag;
-    signed char pps_beta_offset_div2;
-    signed char pps_tc_offset_div2;
-    unsigned char tiles_enabled_flag;
-    unsigned char uniform_spacing_flag;
-    unsigned char num_tile_columns_minus1;
-    unsigned char num_tile_rows_minus1;
-
-    unsigned short column_width_minus1[21];
-    unsigned short row_height_minus1[21];
-    unsigned int reserved3[15];
-
-    // RefPicSets
-    int NumBitsForShortTermRPSInSlice;
-    int NumDeltaPocsOfRefRpsIdx;
-    int NumPocTotalCurr;
-    int NumPocStCurrBefore;
-    int NumPocStCurrAfter;
-    int NumPocLtCurr;
-    int CurrPicOrderCntVal;
-    int RefPicIdx[16];                  // [refpic] Indices of valid reference pictures (-1 if unused for reference)
-    int PicOrderCntVal[16];             // [refpic]
-    unsigned char IsLongTerm[16];       // [refpic] 0=not a long-term reference, 1=long-term reference
-    unsigned char RefPicSetStCurrBefore[8]; // [0..NumPocStCurrBefore-1] -> refpic (0..15)
-    unsigned char RefPicSetStCurrAfter[8];  // [0..NumPocStCurrAfter-1] -> refpic (0..15)
-    unsigned char RefPicSetLtCurr[8];       // [0..NumPocLtCurr-1] -> refpic (0..15)
-    unsigned char RefPicSetInterLayer0[8];
-    unsigned char RefPicSetInterLayer1[8];
-    unsigned int reserved4[12];
-
-    // scaling lists (diag order)
-    unsigned char ScalingList4x4[6][16];       // [matrixId][i]
-    unsigned char ScalingList8x8[6][64];       // [matrixId][i]
-    unsigned char ScalingList16x16[6][64];     // [matrixId][i]
-    unsigned char ScalingList32x32[2][64];     // [matrixId][i]
-    unsigned char ScalingListDCCoeff16x16[6];  // [matrixId]
-    unsigned char ScalingListDCCoeff32x32[2];  // [matrixId]
-} CUVIDHEVCPICPARAMS;
-
-
-/*!
- * \struct CUVIDVP8PICPARAMS
- * VP8 Picture Parameters
- */
-typedef struct _CUVIDVP8PICPARAMS
-{
-    int width;
-    int height;
-    unsigned int first_partition_size;
-    //Frame Indexes
-    unsigned char LastRefIdx;
-    unsigned char GoldenRefIdx;
-    unsigned char AltRefIdx;
-    union {
-        struct {
-            unsigned char frame_type : 1;    /**< 0 = KEYFRAME, 1 = INTERFRAME  */
-            unsigned char version : 3;
-            unsigned char show_frame : 1;
-            unsigned char update_mb_segmentation_data : 1;    /**< Must be 0 if segmentation is not enabled */
-            unsigned char Reserved2Bits : 2;
-        };
-        unsigned char wFrameTagFlags;
-    };
-    unsigned char Reserved1[4];
-    unsigned int  Reserved2[3];
-} CUVIDVP8PICPARAMS;
-
-/*!
- * \struct CUVIDVP9PICPARAMS
- * VP9 Picture Parameters
- */
-typedef struct _CUVIDVP9PICPARAMS
-{
-    unsigned int width;
-    unsigned int height;
-
-    //Frame Indices
-    unsigned char LastRefIdx;
-    unsigned char GoldenRefIdx;
-    unsigned char AltRefIdx;
-    unsigned char colorSpace;
-
-    unsigned short profile : 3;
-    unsigned short frameContextIdx : 2;
-    unsigned short frameType : 1;
-    unsigned short showFrame : 1;
-    unsigned short errorResilient : 1;
-    unsigned short frameParallelDecoding : 1;
-    unsigned short subSamplingX : 1;
-    unsigned short subSamplingY : 1;
-    unsigned short intraOnly : 1;
-    unsigned short allow_high_precision_mv : 1;
-    unsigned short refreshEntropyProbs : 1;
-    unsigned short reserved2Bits : 2;
-
-    unsigned short reserved16Bits;
-
-    unsigned char  refFrameSignBias[4];
-
-    unsigned char bitDepthMinus8Luma;
-    unsigned char bitDepthMinus8Chroma;
-    unsigned char loopFilterLevel;
-    unsigned char loopFilterSharpness;
-
-    unsigned char modeRefLfEnabled;
-    unsigned char log2_tile_columns;
-    unsigned char log2_tile_rows;
-
-    unsigned char segmentEnabled : 1;
-    unsigned char segmentMapUpdate : 1;
-    unsigned char segmentMapTemporalUpdate : 1;
-    unsigned char segmentFeatureMode : 1;
-    unsigned char reserved4Bits : 4;
-
-
-    unsigned char segmentFeatureEnable[8][4];
-    short segmentFeatureData[8][4];
-    unsigned char mb_segment_tree_probs[7];
-    unsigned char segment_pred_probs[3];
-    unsigned char reservedSegment16Bits[2];
-
-    int qpYAc;
-    int qpYDc;
-    int qpChDc;
-    int qpChAc;
-
-    unsigned int activeRefIdx[3];
-    unsigned int resetFrameContext;
-    unsigned int mcomp_filter_type;
-    unsigned int mbRefLfDelta[4];
-    unsigned int mbModeLfDelta[2];
-    unsigned int frameTagSize;
-    unsigned int offsetToDctParts;
-    unsigned int reserved128Bits[4];
-
-} CUVIDVP9PICPARAMS;
-
-
-/*!
- * \struct CUVIDPICPARAMS
- * Picture Parameters for Decoding
- */
-typedef struct _CUVIDPICPARAMS
-{
-    int PicWidthInMbs;                    /**< Coded Frame Size */
-    int FrameHeightInMbs;                 /**< Coded Frame Height */
-    int CurrPicIdx;                       /**< Output index of the current picture */
-    int field_pic_flag;                   /**< 0=frame picture, 1=field picture */
-    int bottom_field_flag;                /**< 0=top field, 1=bottom field (ignored if field_pic_flag=0) */
-    int second_field;                     /**< Second field of a complementary field pair */
-    // Bitstream data
-    unsigned int nBitstreamDataLen;        /**< Number of bytes in bitstream data buffer */
-    const unsigned char *pBitstreamData;   /**< Ptr to bitstream data for this picture (slice-layer) */
-    unsigned int nNumSlices;               /**< Number of slices in this picture */
-    const unsigned int *pSliceDataOffsets; /**< nNumSlices entries, contains offset of each slice within the bitstream data buffer */
-    int ref_pic_flag;                      /**< This picture is a reference picture */
-    int intra_pic_flag;                    /**< This picture is entirely intra coded */
-    unsigned int Reserved[30];             /**< Reserved for future use */
-    // Codec-specific data
-    union {
-        CUVIDMPEG2PICPARAMS mpeg2;         /**< Also used for MPEG-1 */
-        CUVIDH264PICPARAMS h264;
-        CUVIDVC1PICPARAMS vc1;
-        CUVIDMPEG4PICPARAMS mpeg4;
-        CUVIDJPEGPICPARAMS jpeg;
-        CUVIDHEVCPICPARAMS hevc;
-        CUVIDVP8PICPARAMS vp8;
-        CUVIDVP9PICPARAMS vp9;
-        unsigned int CodecReserved[1024];
-    } CodecSpecific;
-} CUVIDPICPARAMS;
-
-
-/*!
- * \struct CUVIDPROCPARAMS
- * Picture Parameters for Postprocessing
- */
-typedef struct _CUVIDPROCPARAMS
-{
-    int progressive_frame;  /**< Input is progressive (deinterlace_mode will be ignored)  */
-    int second_field;       /**< Output the second field (ignored if deinterlace mode is Weave) */
-    int top_field_first;    /**< Input frame is top field first (1st field is top, 2nd field is bottom) */
-    int unpaired_field;     /**< Input only contains one field (2nd field is invalid) */
-    // The fields below are used for raw YUV input
-    unsigned int reserved_flags;        /**< Reserved for future use (set to zero) */
-    unsigned int reserved_zero;         /**< Reserved (set to zero) */
-    unsigned long long raw_input_dptr;  /**< Input CUdeviceptr for raw YUV extensions */
-    unsigned int raw_input_pitch;       /**< pitch in bytes of raw YUV input (should be aligned appropriately) */
-    unsigned int raw_input_format;      /**< Reserved for future use (set to zero) */
-    unsigned long long raw_output_dptr; /**< Reserved for future use (set to zero) */
-    unsigned int raw_output_pitch;      /**< Reserved for future use (set to zero) */
-    unsigned int Reserved[48];
-    void *Reserved3[3];
-} CUVIDPROCPARAMS;
-
-
-/**
- *
- * In order to minimize decode latencies, there should be always at least 2 pictures in the decode
- * queue at any time, in order to make sure that all decode engines are always busy.
- *
- * Overall data flow:
- *  - cuvidCreateDecoder(...)
- *  For each picture:
- *  - cuvidDecodePicture(N)
- *  - cuvidMapVideoFrame(N-4)
- *  - do some processing in cuda
- *  - cuvidUnmapVideoFrame(N-4)
- *  - cuvidDecodePicture(N+1)
- *  - cuvidMapVideoFrame(N-3)
- *    ...
- *  - cuvidDestroyDecoder(...)
- *
- * NOTE:
- * - When the cuda context is created from a D3D device, the D3D device must also be created
- *   with the D3DCREATE_MULTITHREADED flag.
- * - There is a limit to how many pictures can be mapped simultaneously (ulNumOutputSurfaces)
- * - cuVidDecodePicture may block the calling thread if there are too many pictures pending
- *   in the decode queue
- */
-
-/**
- * \fn CUresult CUDAAPI cuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci)
- * Create the decoder object
- */
-typedef CUresult CUDAAPI tcuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci);
-
-/**
- * \fn CUresult CUDAAPI cuvidDestroyDecoder(CUvideodecoder hDecoder)
- * Destroy the decoder object
- */
-typedef CUresult CUDAAPI tcuvidDestroyDecoder(CUvideodecoder hDecoder);
-
-/**
- * \fn CUresult CUDAAPI cuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams)
- * Decode a single picture (field or frame)
- */
-typedef CUresult CUDAAPI tcuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams);
-
-
-#if !defined(__CUVID_DEVPTR64) || defined(__CUVID_INTERNAL)
-/**
- * \fn CUresult CUDAAPI cuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx, unsigned int *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
- * Post-process and map a video frame for use in cuda
- */
-typedef CUresult CUDAAPI tcuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx,
-                                           unsigned int *pDevPtr, unsigned int *pPitch,
-                                           CUVIDPROCPARAMS *pVPP);
-
-/**
- * \fn CUresult CUDAAPI cuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr)
- * Unmap a previously mapped video frame
- */
-typedef CUresult CUDAAPI tcuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr);
-#endif
-
-#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
-/**
- * \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
- * map a video frame
- */
-typedef CUresult CUDAAPI tcuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr,
-                                             unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
-
-/**
- * \fn CUresult CUDAAPI cuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
- * Unmap a previously mapped video frame
- */
-typedef CUresult CUDAAPI tcuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
-
-#if defined(__CUVID_DEVPTR64) && !defined(__CUVID_INTERNAL)
-#define tcuvidMapVideoFrame      tcuvidMapVideoFrame64
-#define tcuvidUnmapVideoFrame    tcuvidUnmapVideoFrame64
-#endif
-#endif
-
-
-
-/**
- *
- * Context-locking: to facilitate multi-threaded implementations, the following 4 functions
- * provide a simple mutex-style host synchronization. If a non-NULL context is specified
- * in CUVIDDECODECREATEINFO, the codec library will acquire the mutex associated with the given
- * context before making any cuda calls.
- * A multi-threaded application could create a lock associated with a context handle so that
- * multiple threads can safely share the same cuda context:
- *  - use cuCtxPopCurrent immediately after context creation in order to create a 'floating' context
- *    that can be passed to cuvidCtxLockCreate.
- *  - When using a floating context, all cuda calls should only be made within a cuvidCtxLock/cuvidCtxUnlock section.
- *
- * NOTE: This is a safer alternative to cuCtxPushCurrent and cuCtxPopCurrent, and is not related to video
- * decoder in any way (implemented as a critical section associated with cuCtx{Push|Pop}Current calls).
-*/
-
-/**
- * \fn CUresult CUDAAPI cuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx)
- */
-typedef CUresult CUDAAPI tcuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx);
-
-/**
- * \fn CUresult CUDAAPI cuvidCtxLockDestroy(CUvideoctxlock lck)
- */
-typedef CUresult CUDAAPI tcuvidCtxLockDestroy(CUvideoctxlock lck);
-
-/**
- * \fn CUresult CUDAAPI cuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags)
- */
-typedef CUresult CUDAAPI tcuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags);
-
-/**
- * \fn CUresult CUDAAPI cuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags)
- */
-typedef CUresult CUDAAPI tcuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags);
-
-/** @} */  /* End VIDEO_DECODER */
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-extern tcuvidCreateDecoder        *cuvidCreateDecoder;
-extern tcuvidDestroyDecoder       *cuvidDestroyDecoder;
-extern tcuvidDecodePicture        *cuvidDecodePicture;
-extern tcuvidMapVideoFrame        *cuvidMapVideoFrame;
-extern tcuvidUnmapVideoFrame      *cuvidUnmapVideoFrame;
-
-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
-extern tcuvidMapVideoFrame64      *cuvidMapVideoFrame64;
-extern tcuvidUnmapVideoFrame64    *cuvidUnmapVideoFrame64;
-#endif
-
-//extern tcuvidGetVideoFrameSurface *cuvidGetVideoFrameSurface;
-
-extern tcuvidCtxLockCreate        *cuvidCtxLockCreate;
-extern tcuvidCtxLockDestroy       *cuvidCtxLockDestroy;
-extern tcuvidCtxLock              *cuvidCtxLock;
-extern tcuvidCtxUnlock            *cuvidCtxUnlock;
-    
-////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// High-level helper APIs for video sources
-//
-
-typedef void *CUvideosource;
-typedef void *CUvideoparser;
-typedef long long CUvideotimestamp;
-
-/**
- * \addtogroup VIDEO_PARSER Video Parser
- * @{
- */
-
-/*!
- * \enum cudaVideoState
- * Video Source State
- */
-typedef enum {
-    cudaVideoState_Error   = -1,    /**< Error state (invalid source)  */
-    cudaVideoState_Stopped = 0,     /**< Source is stopped (or reached end-of-stream)  */
-    cudaVideoState_Started = 1      /**< Source is running and delivering data  */
-} cudaVideoState;
-
-/*!
- * \enum cudaAudioCodec
- * Audio compression
- */
-typedef enum {
-    cudaAudioCodec_MPEG1=0,         /**< MPEG-1 Audio  */
-    cudaAudioCodec_MPEG2,           /**< MPEG-2 Audio  */
-    cudaAudioCodec_MP3,             /**< MPEG-1 Layer III Audio  */
-    cudaAudioCodec_AC3,             /**< Dolby Digital (AC3) Audio  */
-    cudaAudioCodec_LPCM             /**< PCM Audio  */
-} cudaAudioCodec;
-
-/*!
- * \struct CUVIDEOFORMAT
- * Video format
- */
-typedef struct
-{
-    cudaVideoCodec codec;                   /**< Compression format  */
-   /**
-    * frame rate = numerator / denominator (for example: 30000/1001)
-    */
-    struct {
-        unsigned int numerator;             /**< frame rate numerator   (0 = unspecified or variable frame rate) */
-        unsigned int denominator;           /**< frame rate denominator (0 = unspecified or variable frame rate) */
-    } frame_rate;
-    unsigned char progressive_sequence;     /**< 0=interlaced, 1=progressive */
-    unsigned char bit_depth_luma_minus8;    /**< high bit depth Luma */
-    unsigned char bit_depth_chroma_minus8;  /**< high bit depth Chroma */
-    unsigned char reserved1;                /**< Reserved for future use */
-    unsigned int coded_width;               /**< coded frame width */
-    unsigned int coded_height;              /**< coded frame height  */
-   /**
-    *   area of the frame that should be displayed
-    * typical example:
-    *   coded_width = 1920, coded_height = 1088
-    *   display_area = { 0,0,1920,1080 }
-    */
-    struct {
-        int left;                           /**< left position of display rect  */
-        int top;                            /**< top position of display rect  */
-        int right;                          /**< right position of display rect  */
-        int bottom;                         /**< bottom position of display rect  */
-    } display_area;
-    cudaVideoChromaFormat chroma_format;    /**<  Chroma format */
-    unsigned int bitrate;                   /**< video bitrate (bps, 0=unknown) */
-   /**
-    * Display Aspect Ratio = x:y (4:3, 16:9, etc)
-    */
-    struct {
-        int x;
-        int y;
-    } display_aspect_ratio;
-    /**
-    * Video Signal Description
-    */
-    struct {
-        unsigned char video_format          : 3;
-        unsigned char video_full_range_flag : 1;
-        unsigned char reserved_zero_bits    : 4;
-        unsigned char color_primaries;
-        unsigned char transfer_characteristics;
-        unsigned char matrix_coefficients;
-    } video_signal_description;
-    unsigned int seqhdr_data_length;          /**< Additional bytes following (CUVIDEOFORMATEX)  */
-} CUVIDEOFORMAT;
-
-/*!
- * \struct CUVIDEOFORMATEX
- * Video format including raw sequence header information
- */
-typedef struct
-{
-    CUVIDEOFORMAT format;
-    unsigned char raw_seqhdr_data[1024];
-} CUVIDEOFORMATEX;
-
-/*!
- * \struct CUAUDIOFORMAT
- * Audio Formats
- */
-typedef struct
-{
-    cudaAudioCodec codec;       /**< Compression format  */
-    unsigned int channels;      /**< number of audio channels */
-    unsigned int samplespersec; /**< sampling frequency */
-    unsigned int bitrate;       /**< For uncompressed, can also be used to determine bits per sample */
-    unsigned int reserved1;     /**< Reserved for future use */
-    unsigned int reserved2;     /**< Reserved for future use */
-} CUAUDIOFORMAT;
-
-
-/*!
- * \enum CUvideopacketflags
- * Data packet flags
- */
-typedef enum {
-    CUVID_PKT_ENDOFSTREAM   = 0x01,   /**< Set when this is the last packet for this stream  */
-    CUVID_PKT_TIMESTAMP     = 0x02,   /**< Timestamp is valid  */
-    CUVID_PKT_DISCONTINUITY = 0x04    /**< Set when a discontinuity has to be signalled  */
-} CUvideopacketflags;
-
-/*!
- * \struct CUVIDSOURCEDATAPACKET
- * Data Packet
- */
-typedef struct _CUVIDSOURCEDATAPACKET
-{
-    unsigned long flags;            /**< Combination of CUVID_PKT_XXX flags */
-    unsigned long payload_size;     /**< number of bytes in the payload (may be zero if EOS flag is set) */
-    const unsigned char *payload;   /**< Pointer to packet payload data (may be NULL if EOS flag is set) */
-    CUvideotimestamp timestamp;     /**< Presentation timestamp (10MHz clock), only valid if CUVID_PKT_TIMESTAMP flag is set */
-} CUVIDSOURCEDATAPACKET;
-
-// Callback for packet delivery
-typedef int (CUDAAPI *PFNVIDSOURCECALLBACK)(void *, CUVIDSOURCEDATAPACKET *);
-
-/*!
- * \struct CUVIDSOURCEPARAMS
- * Source Params
- */
-typedef struct _CUVIDSOURCEPARAMS
-{
-    unsigned int ulClockRate;                   /**< Timestamp units in Hz (0=default=10000000Hz)  */
-    unsigned int uReserved1[7];                 /**< Reserved for future use - set to zero  */
-    void *pUserData;                            /**< Parameter passed in to the data handlers  */
-    PFNVIDSOURCECALLBACK pfnVideoDataHandler;   /**< Called to deliver audio packets  */
-    PFNVIDSOURCECALLBACK pfnAudioDataHandler;   /**< Called to deliver video packets  */
-    void *pvReserved2[8];                       /**< Reserved for future use - set to NULL */
-} CUVIDSOURCEPARAMS;
-
-/*!
- * \enum CUvideosourceformat_flags
- * CUvideosourceformat_flags
- */
-typedef enum {
-    CUVID_FMT_EXTFORMATINFO = 0x100             /**< Return extended format structure (CUVIDEOFORMATEX) */
-} CUvideosourceformat_flags;
-
-#if !defined(__APPLE__)
-/**
- * \fn CUresult CUDAAPI cuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams)
- * Create Video Source
- */
-typedef CUresult CUDAAPI tcuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams);
-
-/**
- * \fn CUresult CUDAAPI cuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams)
- * Create Video Source
- */
-typedef CUresult CUDAAPI tcuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams);
-
-/**
- * \fn CUresult CUDAAPI cuvidDestroyVideoSource(CUvideosource obj)
- * Destroy Video Source
- */
-typedef CUresult CUDAAPI tcuvidDestroyVideoSource(CUvideosource obj);
-
-/**
- * \fn CUresult CUDAAPI cuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state)
- * Set Video Source state
- */
-typedef CUresult CUDAAPI tcuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state);
-
-/**
- * \fn cudaVideoState CUDAAPI cuvidGetVideoSourceState(CUvideosource obj)
- * Get Video Source state
- */
-typedef cudaVideoState CUDAAPI tcuvidGetVideoSourceState(CUvideosource obj);
-
-/**
- * \fn CUresult CUDAAPI cuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags)
- * Get Video Source Format
- */
-typedef CUresult CUDAAPI tcuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags);
-
-/**
- * \fn CUresult CUDAAPI cuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags)
- * Set Video Source state
- */
-typedef CUresult CUDAAPI tcuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags);
-
-#endif
-
-/**
- * \struct CUVIDPARSERDISPINFO
- */
-typedef struct _CUVIDPARSERDISPINFO
-{
-    int picture_index;         /**<                 */
-    int progressive_frame;     /**<                 */
-    int top_field_first;       /**<                 */
-    int repeat_first_field;    /**< Number of additional fields (1=ivtc, 2=frame doubling, 4=frame tripling, -1=unpaired field)  */
-    CUvideotimestamp timestamp; /**<     */
-} CUVIDPARSERDISPINFO;
-
-//
-// Parser callbacks
-// The parser will call these synchronously from within cuvidParseVideoData(), whenever a picture is ready to
-// be decoded and/or displayed.
-//
-typedef int (CUDAAPI *PFNVIDSEQUENCECALLBACK)(void *, CUVIDEOFORMAT *);
-typedef int (CUDAAPI *PFNVIDDECODECALLBACK)(void *, CUVIDPICPARAMS *);
-typedef int (CUDAAPI *PFNVIDDISPLAYCALLBACK)(void *, CUVIDPARSERDISPINFO *);
-
-/**
- * \struct CUVIDPARSERPARAMS
- */
-typedef struct _CUVIDPARSERPARAMS
-{
-    cudaVideoCodec CodecType;               /**< cudaVideoCodec_XXX  */
-    unsigned int ulMaxNumDecodeSurfaces;    /**< Max # of decode surfaces (parser will cycle through these) */
-    unsigned int ulClockRate;               /**< Timestamp units in Hz (0=default=10000000Hz) */
-    unsigned int ulErrorThreshold;          /**< % Error threshold (0-100) for calling pfnDecodePicture (100=always call pfnDecodePicture even if picture bitstream is fully corrupted) */
-    unsigned int ulMaxDisplayDelay;         /**< Max display queue delay (improves pipelining of decode with display) - 0=no delay (recommended values: 2..4) */
-    unsigned int uReserved1[5];             /**< Reserved for future use - set to 0 */
-    void *pUserData;                        /**< User data for callbacks */
-    PFNVIDSEQUENCECALLBACK pfnSequenceCallback; /**< Called before decoding frames and/or whenever there is a format change */
-    PFNVIDDECODECALLBACK pfnDecodePicture;      /**< Called when a picture is ready to be decoded (decode order) */
-    PFNVIDDISPLAYCALLBACK pfnDisplayPicture;    /**< Called whenever a picture is ready to be displayed (display order)  */
-    void *pvReserved2[7];                       /**< Reserved for future use - set to NULL */
-    CUVIDEOFORMATEX *pExtVideoInfo;             /**< [Optional] sequence header data from system layer */
-} CUVIDPARSERPARAMS;
-
-/**
- * \fn CUresult CUDAAPI cuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams)
- */
-typedef CUresult CUDAAPI tcuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams);
-
-/**
- * \fn CUresult CUDAAPI cuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket)
- */
-typedef CUresult CUDAAPI tcuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket);
-
-/**
- * \fn CUresult CUDAAPI cuvidDestroyVideoParser(CUvideoparser obj)
- */
-typedef CUresult CUDAAPI tcuvidDestroyVideoParser(CUvideoparser obj);
-
-extern tcuvidCreateVideoSource               *cuvidCreateVideoSource;
-extern tcuvidCreateVideoSourceW              *cuvidCreateVideoSourceW;
-extern tcuvidDestroyVideoSource              *cuvidDestroyVideoSource;
-extern tcuvidSetVideoSourceState             *cuvidSetVideoSourceState;
-extern tcuvidGetVideoSourceState             *cuvidGetVideoSourceState;
-extern tcuvidGetSourceVideoFormat            *cuvidGetSourceVideoFormat;
-extern tcuvidGetSourceAudioFormat            *cuvidGetSourceAudioFormat;
-
-extern tcuvidCreateVideoParser               *cuvidCreateVideoParser;
-extern tcuvidParseVideoData                  *cuvidParseVideoData;
-extern tcuvidDestroyVideoParser              *cuvidDestroyVideoParser;
-
-/** @} */  /* END VIDEO_PARSER */
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-const char *cudaGetErrorEnum(CUresult error);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //__cuda_tools_h__

gpac-0.8.0.tar.gz/modules/nvdec/nvdec.c Deleted

@@ -1,1254 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2017
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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/thread.h>
-#include <gpac/modules/codec.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-
-#include "../../src/compositor/gl_inc.h"
-
-#include "cuda_sdk.h"
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-#  pragma comment(lib, "opengl32")
-#endif
-
-
-#ifdef LOAD_GL_1_5
-GLDECL_STATIC(glGenBuffers);
-GLDECL_STATIC(glBindBuffer);
-GLDECL_STATIC(glBufferData);
-#endif
-
-typedef struct _nv_dec_inst NVDecInstance;
-
-typedef struct _nv_dec_ctx
-{
-	GF_ESD *esd;
-	Bool use_gl_texture;
-	u32 width, height, bpp_luma, bpp_chroma;
-	cudaVideoCodec codec_type;
-	cudaVideoChromaFormat chroma_fmt;
-	
-	u32 pixel_ar, out_size, stride, pix_fmt;
-	u32 reload_decoder_state;
-	Bool skip_next_frame;
-	CUresult decode_error, dec_create_error;
-	Bool frame_size_changed;
-	u32 num_surfaces;
-	Bool needs_resetup;
-	u32 unload_inactive_mode;
-	unsigned long prefer_dec_mode;
-
-	NVDecInstance *dec_inst;
-
-	GF_List *frames;
-	GF_List *frames_res;
-
-	struct __nv_frame *pending_frame;
-
-	GLint y_tx_id, uv_tx_id;
-	GLint y_pbo_id, uv_pbo_id;
-} NVDecCtx;
-
-
-struct _nv_dec_inst 
-{
-	u32 width, height, bpp_luma, bpp_chroma, stride;
-	cudaVideoCodec codec_type;
-	cudaVideoChromaFormat chroma_fmt;
-	u32 id;
-	u32 th_id;
-
-	//allocated video parser and decoder
-	CUvideoparser cu_parser;
-	CUvideodecoder cu_decoder;
-
-	//current associated context, 0 is none
-	NVDecCtx *ctx;
-};
-
-
-typedef struct __nv_frame
-{
-	CUVIDPARSERDISPINFO frame_info;
-	NVDecCtx *ctx;
-	GF_MediaDecoderFrame gframe;
-	Bool y_mapped, uv_mapped;
-} NVDecFrame;
-
-static GF_List *global_unactive_decoders=NULL;
-static u32 global_nb_loaded_nvdec = 0;
-static u32 global_nb_loaded_decoders = 0;
-static GF_Mutex *global_inst_mutex = NULL;
-static CUdevice  cuda_dev = -1;
-static CUcontext cuda_ctx = NULL;
-static Bool cuda_ctx_gl = GF_FALSE;
-
-
-//#define ENABLE_10BIT_OUTPUT
-
-static GF_Err nvdec_init_decoder(NVDecCtx *ctx)
-{
-	CUresult res;
-	CUVIDDECODECREATEINFO cuvid_info;
-
-	assert(ctx->dec_inst);
-
-	memset(&cuvid_info, 0, sizeof(CUVIDDECODECREATEINFO));
-	cuvid_info.CodecType = ctx->codec_type;
-	cuvid_info.ulWidth = ctx->width;
-	cuvid_info.ulHeight = ctx->height;
-	cuvid_info.ulNumDecodeSurfaces = ctx->num_surfaces;
-	cuvid_info.ChromaFormat = ctx->chroma_fmt;
-	cuvid_info.OutputFormat = cudaVideoSurfaceFormat_NV12;
-#ifdef ENABLE_10BIT_OUTPUT
-	if (ctx->bpp_luma + ctx->bpp_chroma > 16)
-		cuvid_info.OutputFormat = cudaVideoSurfaceFormat_P016;
-#endif
-    cuvid_info.DeinterlaceMode = cudaVideoDeinterlaceMode_Adaptive;
-	cuvid_info.bitDepthMinus8 = ctx->bpp_luma - 8;
-	cuvid_info.ulTargetWidth = ctx->width;
-	cuvid_info.ulTargetHeight = ctx->height;
-    cuvid_info.display_area.left = 0;
-    cuvid_info.display_area.right = ctx->width;
-    cuvid_info.display_area.top = 0;
-	cuvid_info.display_area.bottom = ctx->height;
-
-    cuvid_info.ulNumOutputSurfaces = 1;
-	cuvid_info.ulCreationFlags = ctx->prefer_dec_mode;
-
-    // create the decoder
-	res = cuvidCreateDecoder(&ctx->dec_inst->cu_decoder, &cuvid_info);
-	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create cuvid decoder %s\n", cudaGetErrorEnum(res) ) );
-		ctx->dec_create_error = res;
-		return GF_IO_ERR;
-	}
-	global_nb_loaded_decoders++;
-	assert(global_nb_loaded_decoders);
-	ctx->dec_inst->id = global_nb_loaded_decoders;
-	ctx->dec_inst->th_id = gf_th_id();
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] decoder instance %d created (%dx%d) - %d total decoders loaded\n", ctx->dec_inst->id, ctx->width, ctx->height, global_nb_loaded_decoders) );
-	return GF_OK;
-}
-
-Bool load_inactive_dec(NVDecCtx *ctx)
-{
-	u32 i, count;
-	//look for unactive decoder with same settings
-	if (global_unactive_decoders) {
-
-		gf_mx_p(global_inst_mutex);
-		count = gf_list_count(global_unactive_decoders);
-		for (i=0; i<count; i++) {
-			NVDecInstance *inst = gf_list_get(global_unactive_decoders, i);
-			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
-				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
-				) {
-
-					gf_list_rem(global_unactive_decoders, i);
-					ctx->dec_inst = inst;
-					inst->ctx = ctx;
-					gf_mx_v(global_inst_mutex);
-					return GF_TRUE;
-			}
-		}
-		if (ctx->dec_inst && !ctx->dec_inst->cu_decoder) {
-			ctx->dec_inst->ctx = ctx;
-			gf_mx_v(global_inst_mutex);
-			return GF_FALSE;
-		}
-		if (ctx->dec_inst) {
-			NVDecInstance *inst = ctx->dec_inst;
-			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
-				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
-				) {
-				ctx->dec_inst = inst;
-				inst->ctx = ctx;
-				gf_mx_v(global_inst_mutex);
-				return GF_TRUE;
-			}
-		} else {
-			ctx->dec_inst = gf_list_pop_back(global_unactive_decoders);
-		}
-		gf_mx_v(global_inst_mutex);
-	}
-	if (!ctx->dec_inst) {
-		GF_SAFEALLOC(ctx->dec_inst, NVDecInstance);
-	}
-	ctx->dec_inst->ctx = ctx;
-	return GF_FALSE;
-}
-
-static void nvdec_destroy_decoder(NVDecInstance *inst)
-{
-	if (inst->cu_decoder) {
-		cuvidDestroyDecoder(inst->cu_decoder);
-		inst->cu_decoder = NULL;
-		global_nb_loaded_decoders--;
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] decoder instance %d destruction - %d decoders still loaded\n", inst->id, global_nb_loaded_decoders ) );
-	}
-}
-
-static void update_pix_fmt(NVDecCtx *ctx, Bool use_10bits)
-{
-	switch (ctx->chroma_fmt) {
-	case cudaVideoChromaFormat_420:
-		ctx->pix_fmt = use_10bits ? GF_PIXEL_NV12_10 : GF_PIXEL_NV12;
-		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		break;
-	case cudaVideoChromaFormat_422:
-		ctx->pix_fmt = use_10bits  ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
-		ctx->out_size = ctx->stride * ctx->height * 2;
-		break;
-	case cudaVideoChromaFormat_444:
-		ctx->pix_fmt = use_10bits  ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
-		ctx->out_size = ctx->stride * ctx->height * 3;
-		break;
-	default:
-		ctx->pix_fmt = 0;
-		ctx->out_size = 0;
-	}
-}
-
-static int CUDAAPI HandleVideoSequence(void *pUserData, CUVIDEOFORMAT *pFormat)
-{
-	Bool use_10bits=GF_FALSE;
-	Bool skip_output_resize=GF_FALSE;
-	NVDecInstance *inst= (NVDecInstance *)pUserData;
-	NVDecCtx *ctx = inst->ctx;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] Decoder instance %d Video sequence change detected - new setup %u x %u, %u bpp\n", inst->id, pFormat->coded_width, pFormat->coded_height, pFormat->bit_depth_luma_minus8 + 8) );
-	//no change in config
-	if ((ctx->width == pFormat->coded_width) 
-		&& (ctx->height == pFormat->coded_height)
-		&& (ctx->bpp_luma == 8 + pFormat->bit_depth_luma_minus8)
-		&& (ctx->bpp_chroma == 8 + pFormat->bit_depth_chroma_minus8)
-		&& (ctx->codec_type == pFormat->codec)
-		&& (ctx->chroma_fmt == pFormat->chroma_format)
-	) {
-		if (ctx->dec_inst && ctx->dec_inst->cu_decoder)
-			return 1;
-		skip_output_resize = GF_TRUE;
-	}
-	
-	//commented out since this falls back to soft decoding !
-#ifdef ENABLE_10BIT_OUTPUT
-	if (ctx->bpp_luma + ctx->bpp_chroma > 16)  use_10bits = GF_TRUE;
-#endif
-
-	ctx->width = pFormat->coded_width;
-	ctx->height = pFormat->coded_height;
-	ctx->bpp_luma = 8 + pFormat->bit_depth_luma_minus8;
-	ctx->bpp_chroma = 8 + pFormat->bit_depth_chroma_minus8;
-	ctx->codec_type = pFormat->codec;
-	ctx->chroma_fmt = pFormat->chroma_format;
-
-	//if load_inatcive 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;
-		//initial config, need to trigger output resize
-		if (!ctx->out_size) ctx->reload_decoder_state = 1;
-
-		update_pix_fmt(ctx, use_10bits);
-		return GF_OK;
-	}
-	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
-	//if we have an existing decoder but with a different config, let's reload
-	nvdec_destroy_decoder(ctx->dec_inst);
-
-	ctx->dec_inst->width = ctx->width;
-	ctx->dec_inst->height = ctx->height;
-	ctx->dec_inst->bpp_luma = ctx->bpp_luma;
-	ctx->dec_inst->bpp_chroma = ctx->bpp_chroma;
-	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;
-
-	update_pix_fmt(ctx, use_10bits);
-
-	assert(ctx->out_size);
-	assert(ctx->stride);
-	ctx->dec_inst->stride = ctx->stride;
-
-	if (! ctx->dec_inst->cu_decoder) {
-		nvdec_init_decoder(ctx);
-		if (!skip_output_resize) {
-			ctx->reload_decoder_state = 1;
-		}
-	} else {
-		ctx->reload_decoder_state = 2;
-	}
-	return 1;
-}
-
-static int CUDAAPI HandlePictureDecode(void *pUserData, CUVIDPICPARAMS *pPicParams)
-{
-	NVDecInstance *inst = (NVDecInstance *)pUserData;
-	inst->ctx->decode_error = cuvidDecodePicture(inst->cu_decoder, pPicParams);
-
-	if (inst->ctx->decode_error != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to decode picture %s\n", inst->id, cudaGetErrorEnum(inst->ctx->decode_error) ) );
-		return GF_IO_ERR;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] decoded picture %u OK\n", pPicParams->CurrPicIdx ) );
-
-	return 1;
-}
-
-static int CUDAAPI HandlePictureDisplay(void *pUserData, CUVIDPARSERDISPINFO *pPicParams)
-{
-	u32 i, count;
-	NVDecFrame *f;
-	NVDecInstance *inst = (NVDecInstance *)pUserData;
-	NVDecCtx *ctx = (NVDecCtx *)inst->ctx;
-
-	if (pPicParams->timestamp > 0xFFFFFFFF) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] picture %u CTS %u seek flag, discarding\n", pPicParams->picture_index, (u32) (pPicParams->timestamp & 0xFFFFFFFF)) );
-		return 1;
-	} 
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] picture %u CTS %u ready for display, queuing it\n", pPicParams->picture_index, (u32) (pPicParams->timestamp & 0xFFFFFFFF)) );
-
-	f = gf_list_pop_back(ctx->frames_res);
-	if (!f) {
-		GF_SAFEALLOC(f, NVDecFrame);
-	}
-	f->frame_info = *pPicParams;
-	f->frame_info.timestamp = (u32) (pPicParams->timestamp & 0xFFFFFFFF);
-	f->ctx = ctx;
-	count = gf_list_count(ctx->frames);
-	for (i=0; i<count; i++) {
-		NVDecFrame *af = gf_list_get(ctx->frames, i);
-		if (af->frame_info.timestamp > f->frame_info.timestamp) {
-			gf_list_insert(ctx->frames, f, i);
-			return 1;
-		}
-	}
-	gf_list_add(ctx->frames, f);
-	return 1;
-}
-
-static GF_Err NVDec_ConfigureStream(GF_BaseDecoder *ifcg)
-{
-	CUresult res;
-    CUVIDPARSERPARAMS oVideoParserParameters;
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-
-	//create a video parser and a video decoder
-    memset(&oVideoParserParameters, 0, sizeof(CUVIDPARSERPARAMS));
-	ctx->needs_resetup = GF_FALSE;
-
-	switch (ctx->esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_MPEG1: 
-		ctx->codec_type = cudaVideoCodec_MPEG1;
-		break;
-	case GPAC_OTI_VIDEO_MPEG2_SIMPLE: 
-	case GPAC_OTI_VIDEO_MPEG2_MAIN: 
-	case GPAC_OTI_VIDEO_MPEG2_SNR: 
-	case GPAC_OTI_VIDEO_MPEG2_SPATIAL: 
-	case GPAC_OTI_VIDEO_MPEG2_HIGH: 
-	case GPAC_OTI_VIDEO_MPEG2_422: 
-		ctx->codec_type = cudaVideoCodec_MPEG2;
-		break;
-	case GPAC_OTI_VIDEO_MPEG4_PART2: 
-		ctx->codec_type = cudaVideoCodec_MPEG4;
-		break;
-	case GPAC_OTI_VIDEO_AVC: 
-		ctx->codec_type = cudaVideoCodec_H264;
-		break;
-	case GPAC_OTI_VIDEO_HEVC: 
-		ctx->codec_type = cudaVideoCodec_HEVC;
-		break;
-	}
-
-	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;
-	}
-	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
-
-	ctx->decode_error = CUDA_SUCCESS;
-
-	oVideoParserParameters.CodecType = ctx->codec_type;
-    oVideoParserParameters.ulMaxNumDecodeSurfaces = ctx->num_surfaces;
-    oVideoParserParameters.ulMaxDisplayDelay = 4;
-	oVideoParserParameters.ulClockRate = 1000;
-    oVideoParserParameters.pExtVideoInfo = NULL;
-    oVideoParserParameters.pfnSequenceCallback = HandleVideoSequence;    // Called before decoding frames and/or whenever there is a format change
-    oVideoParserParameters.pfnDecodePicture = HandlePictureDecode;    // Called when a picture is ready to be decoded (decode order)
-    oVideoParserParameters.pfnDisplayPicture = HandlePictureDisplay;   // Called whenever a picture is ready to be displayed (display order)
-	oVideoParserParameters.pUserData = ctx->dec_inst;
-
-    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) ) );
-	}
-	res = cuvidCreateVideoParser(&ctx->dec_inst->cu_parser, &oVideoParserParameters);
-	cuCtxPopCurrent(NULL);
-
-	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create CUVID parserCTX %s\n", cudaGetErrorEnum(res) ) );
-		return GF_PROFILE_NOT_SUPPORTED;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] video parser init OK\n") );
-
-	return GF_OK;
-}
-
-static GF_Err NVDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	const char *opt;
-	CUresult res;
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-	
-	if (ctx->esd) return GF_NOT_SUPPORTED;
-	ctx->esd = esd;
-
-	if (! cuda_ctx) {
-	    int major, minor;
-	    char deviceName[256];
-		res = cuDeviceGet(&cuda_dev, 0);
-		if (res != CUDA_SUCCESS) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda device %s\n", cudaGetErrorEnum(res) ) );
-			return GF_IO_ERR;
-		}
-
-		cuDeviceComputeCapability(&major, &minor, cuda_dev);
-		cuDeviceGetName(deviceName, 256, cuda_dev);
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] GPU Device %s (idx 0) has SM %d.%d compute capability\n", deviceName, major, minor));
-
-		if (ctx->use_gl_texture) {
-			res = cuGLCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
-
-#ifdef LOAD_GL_1_5
-			GET_GLFUN(glGenBuffers);
-			GET_GLFUN(glBindBuffer);
-			GET_GLFUN(glBufferData);
-#endif
-			cuda_ctx_gl = GF_TRUE;
-
-		} else {
-			res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
-			cuda_ctx_gl = GF_FALSE;
-		}		
-		if (res != CUDA_SUCCESS) {
-			if (ctx->use_gl_texture) {
-				cuda_ctx_gl = GF_FALSE;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Couldn't initialize cuda OpenGL context %s\n\tcheck you started the player without compositor thread (-no-cthread option)\n\tRetrying without OpenGL support\n", cudaGetErrorEnum(res) ) );
-				res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
-				if (res != CUDA_SUCCESS) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
-				} else {
-					ctx->use_gl_texture = GF_FALSE;
-				}
-			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
-			}
-
-			if (res != CUDA_SUCCESS) {
-				return GF_IO_ERR;
-			}
-		}
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "NumSurfaces");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "NumSurfaces", "20");
-		ctx->num_surfaces = 20;
-	} else {
-		ctx->num_surfaces = atoi(opt);
-		if (!ctx->num_surfaces) ctx->num_surfaces = 20;
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "UnloadInactive");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "UnloadInactive", "no");
-	} else if (!strcmp(opt, "destroy")) {
-		ctx->unload_inactive_mode = 1;
-	} else if (!strcmp(opt, "reuse")) {
-		ctx->unload_inactive_mode = 2;
-	}
-
-	if (ctx->unload_inactive_mode == 2) {
-		global_nb_loaded_nvdec++;
-		if (!global_inst_mutex ) global_inst_mutex  = gf_mx_new("NVDecGlobal");
-		gf_mx_p(global_inst_mutex);
-		if (!global_unactive_decoders) global_unactive_decoders = gf_list_new();
-		gf_mx_v(global_inst_mutex);
-	}
-
-    ctx->prefer_dec_mode = cudaVideoCreate_PreferCUVID;
-	opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "PreferMode");
-	if (opt && !stricmp(opt, "dxva")) {
-	    ctx->prefer_dec_mode = cudaVideoCreate_PreferDXVA;
-	} else if (opt && !stricmp(opt, "cuda")) {
-	    ctx->prefer_dec_mode = cudaVideoCreate_PreferCUDA;
-	} else if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "NVDec", "PreferMode", "cuvid");
-	}
-
-
-	ctx->needs_resetup = GF_TRUE;
-
-	return GF_OK;
-}
-
-static GF_Err NVDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-	ctx->esd = NULL;
-	ctx->dec_create_error = 0;
-
-	if (ctx->unload_inactive_mode == 2) {
-		global_nb_loaded_nvdec--;
-		if (ctx->dec_inst) {
-			assert(global_unactive_decoders);
-			gf_mx_p(global_inst_mutex);
-			ctx->dec_inst->ctx = NULL;
-			gf_list_add(global_unactive_decoders, ctx->dec_inst);
-			ctx->dec_inst = NULL;
-			gf_mx_v(global_inst_mutex);
-		}
-	}
-	return GF_OK;
-}
-
-static Bool NVDec_check_cuda_gl(NVDecCtx *ctx)
-{
-    int major, minor;
-    char deviceName[256];
-	CUresult res;
-
-	if (cuda_ctx) return cuda_ctx_gl;
-
-	res = cuDeviceGet(&cuda_dev, 0);
-	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda device %s\n", cudaGetErrorEnum(res) ) );
-		return GF_IO_ERR;
-	}
-
-	cuDeviceComputeCapability(&major, &minor, cuda_dev);
-	cuDeviceGetName(deviceName, 256, cuda_dev);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] GPU Device %s (idx 0) has SM %d.%d compute capability\n", deviceName, major, minor));
-
-	res = cuGLCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
-
-	if (res == CUDA_SUCCESS) {
-#ifdef LOAD_GL_1_5
-		GET_GLFUN(glGenBuffers);
-		GET_GLFUN(glBindBuffer);
-		GET_GLFUN(glBufferData);
-#endif
-		cuda_ctx_gl = GF_TRUE;
-	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Couldn't initialize cuda OpenGL context %s\n\tcheck you started the player without compositor thread (-no-cthread option)\n\tDisabling OpenGL support\n", cudaGetErrorEnum(res) ) );
-	}
-	return cuda_ctx_gl;
-}
-
-static GF_Err NVDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-	const char *opt;
-	
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 30.0;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pix_fmt;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		//since we do the temporal de-interleaving ask for more CUs to avoid displaying refs before reordered frames
-		capability->cap.valueInt = ctx->use_gl_texture ? 6 : 4;
-		break;
-	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	/*reorder is up to us*/
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_WANTS_THREAD:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_FRAME_OUTPUT:
-		opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "NVDec", "DisableGL");
-		capability->cap.valueInt = (!opt || strcmp(opt, "yes")) ? 1 : 0;
-		if (capability->cap.valueInt && !NVDec_check_cuda_gl(ctx)) {
-			capability->cap.valueInt = 0;
-		}
-		break;
-	case GF_CODEC_FORCE_ANNEXB:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err NVDec_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-	
-	switch (capability.CapCode) {
-	case GF_CODEC_FRAME_OUTPUT:
-		if (capability.cap.valueInt == 2) {
-			ctx->use_gl_texture = GF_TRUE;
-		} else if (capability.cap.valueInt == 0) {
-			ctx->use_gl_texture = GF_FALSE;
-		} else {
-			return GF_NOT_SUPPORTED;
-		}
-		return GF_OK;
-
-	case GF_CODEC_ABORT:
-		while (gf_list_count(ctx->frames)) {
-			NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
-			memset(f, 0, sizeof(NVDecFrame));
-			gf_list_add(ctx->frames_res, f);
-		}
-		if (ctx->unload_inactive_mode == 2) {
-			if (ctx->dec_inst) {
-				assert(global_unactive_decoders);
-				gf_mx_p(global_inst_mutex);
-				if (ctx->decode_error) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] deactivating decoder %dx%d and destroying instance\n", ctx->width, ctx->height ) );
-					nvdec_destroy_decoder(ctx->dec_inst);
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] deactivating decoder %dx%d\n", ctx->width, ctx->height ) );
-				}
-				ctx->dec_inst->ctx = NULL;
-				gf_list_add(global_unactive_decoders, ctx->dec_inst);
-				ctx->dec_inst = NULL;
-				gf_mx_v(global_inst_mutex);
-			}
-			ctx->needs_resetup = GF_TRUE;
-			ctx->dec_create_error = CUDA_SUCCESS;
-		} else if (ctx->unload_inactive_mode == 1) {
-			if (ctx->dec_inst) {
-				nvdec_destroy_decoder(ctx->dec_inst);
-			}
-			ctx->needs_resetup = GF_TRUE;
-			ctx->dec_create_error = CUDA_SUCCESS;
-		}
-		return GF_OK;
-	}
-
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GF_Err NVDec_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	NVDecFrame *f;
-    CUdeviceptr map_mem = 0;
-	CUVIDPROCPARAMS params;
-	unsigned int pitch = 0;
-	GF_Err e;
-    CUVIDSOURCEDATAPACKET cu_pkt;
-	CUresult res;
-	NVDecCtx *ctx = (NVDecCtx *)ifcg->privateStack;
-
-	if (ctx->needs_resetup) {
-		NVDec_ConfigureStream((GF_BaseDecoder*)ifcg);
-	}
-
-	memset(&cu_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET));
-	cu_pkt.flags = CUVID_PKT_TIMESTAMP;
-	if (!inBuffer) {
-		cu_pkt.flags |= CUVID_PKT_ENDOFSTREAM;
-		ctx->skip_next_frame = GF_FALSE;
-	}
-
-	if (ctx->dec_create_error) 
-		return GF_IO_ERR;
-	
-	cu_pkt.payload_size = inBufferLength;
-	cu_pkt.payload = inBuffer;
-	cu_pkt.timestamp = *CTS;
-	if (mmlevel == GF_CODEC_LEVEL_SEEK) 
-		cu_pkt.timestamp |= 0x1FFFFFFFFUL;
-
-	assert(!ctx->dec_inst->th_id || (ctx->dec_inst->th_id == gf_th_id() ) );
-
-    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) ) );
-	}
-	if (ctx->skip_next_frame) {
-		ctx->skip_next_frame = GF_FALSE;
-	} 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) ) );
-		}
-	}
-	
-	*outBufferLength = 0;
-	e = GF_OK;
-	if (ctx->reload_decoder_state) {
-		if (ctx->reload_decoder_state==2) {
-			nvdec_destroy_decoder(ctx->dec_inst);
-		} else {
-			ctx->skip_next_frame = GF_TRUE;
-		}
-
-		ctx->reload_decoder_state = 0;
-		if (!ctx->out_size || !ctx->pix_fmt) {
-			cuCtxPopCurrent(NULL);
-			return GF_NOT_SUPPORTED;
-		}
-
-		//need to setup decoder
-		if (! ctx->dec_inst->cu_decoder) {
-			nvdec_init_decoder(ctx);
-		}
-		cuCtxPopCurrent(NULL);
-		*outBufferLength = ctx->out_size;
-		ctx->frame_size_changed = GF_TRUE;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-
-	f = gf_list_pop_front(ctx->frames);
-	if (!f) {
-		cuCtxPopCurrent(NULL);
-		return GF_OK;
-	}
-	if (ctx->use_gl_texture) {
-		*outBufferLength = ctx->out_size;
-		*CTS = (u32) f->frame_info.timestamp;
-		assert(!ctx->pending_frame);
-		ctx->pending_frame = f;
-		return GF_OK;
-	}
-
-	assert(ctx->out_size);
-	memset(&params, 0, sizeof(params));
-	params.progressive_frame = f->frame_info.progressive_frame;
-	//params.second_field = 0;
-	params.top_field_first = f->frame_info.top_field_first;
-
-	e = GF_OK;
-	res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &map_mem , &pitch, &params);
-	if (res == CUDA_SUCCESS) {
-        CUDA_MEMCPY2D mcpi;
-		memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
-		mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-		mcpi.srcDevice = map_mem;
-		mcpi.srcPitch = pitch;
-
-		mcpi.dstMemoryType = CU_MEMORYTYPE_HOST;
-		mcpi.dstHost = outBuffer;
-		mcpi.dstPitch = ctx->stride;
-		mcpi.WidthInBytes = MIN(pitch, ctx->stride);
-		mcpi.Height = ctx->height;
-
-		res = cuMemcpy2D(&mcpi);
-		if (res != CUDA_SUCCESS) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
-			e = GF_IO_ERR;
-		} else {
-
-			mcpi.srcDevice = map_mem + ctx->height * pitch;
-			mcpi.dstHost = outBuffer + ctx->stride * ctx->height;
-			mcpi.Height = ctx->height/2;
-
-			res = cuMemcpy2D(&mcpi);
-			if (res != CUDA_SUCCESS) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy UV video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
-				e = GF_IO_ERR;
-			} else {
-				*outBufferLength = ctx->out_size;
-				*CTS = (u32) f->frame_info.timestamp;
-			}
-		}
-		cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, map_mem);
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map video frame data %s\n", cudaGetErrorEnum(res) ) );
-		e = GF_IO_ERR;
-	}
-	cuCtxPopCurrent(NULL);
-
-	memset(f, 0, sizeof(NVDecFrame));
-	gf_list_add(ctx->frames_res, f);
-
-	return e;
-}
-
-void NVDecFrame_Release(GF_MediaDecoderFrame *frame)
-{
-	NVDecFrame *f = (NVDecFrame *)frame->user_data;
-	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
-	memset(f, 0, sizeof(NVDecFrame));
-	gf_list_add(ctx->frames_res, f);
-}
-
-GF_Err NVDecFrame_GetGLTexture(GF_MediaDecoderFrame *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
-{
-	CUDA_MEMCPY2D mcpi;
-	CUVIDPROCPARAMS params;
-	CUresult res;
-	GF_Err e = GF_OK;
-	CUdeviceptr tx_data, vid_data;
-	size_t tx_pitch;
-	u32 vid_pitch;
-	u32 pbo_id, tx_id, gl_fmt, gl_btype = GL_UNSIGNED_BYTE;
-	NVDecFrame *f = (NVDecFrame *)frame->user_data;
-	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
-
-	if (plane_idx>1) return GF_BAD_PARAM;
-	
-	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) ) );
-	}
-
-	if (! *gl_tex_id && ! plane_idx && ctx->y_tx_id ) {
-		cuGLUnregisterBufferObject(ctx->y_pbo_id);
-		ctx->y_pbo_id = 0;
-		ctx->y_tx_id = 0;
-	}
-	if (! *gl_tex_id && plane_idx && ctx->uv_tx_id ) {
-		cuGLUnregisterBufferObject(ctx->uv_pbo_id);
-		ctx->uv_pbo_id = 0;
-		ctx->uv_tx_id = 0;
-	}
-
-#ifdef ENABLE_10BIT_OUTPUT
-	if ((ctx->bpp_luma>8) || (ctx->bpp_chroma>8)) {
-		gl_btype = GL_UNSIGNED_SHORT;
-	}
-#endif
-	if (!plane_idx) {
-		if (!ctx->y_pbo_id) {
-			glGenBuffers(1, &ctx->y_pbo_id);
-			glGenTextures(1, &ctx->y_tx_id);
-
-	        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->y_pbo_id);
-			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height, NULL, GL_STREAM_DRAW_ARB);
-			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-
-			cuGLRegisterBufferObject(ctx->y_pbo_id);
-
-			glBindTexture(GL_TEXTURE_2D, ctx->y_tx_id);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, ctx->width, ctx->height, 0, GL_LUMINANCE, gl_btype, NULL);
-			glBindTexture(GL_TEXTURE_2D, 0);
-
-			f->y_mapped = GF_FALSE;
-		}
-		*gl_tex_format = GL_TEXTURE_2D;
-		*gl_tex_id = tx_id = ctx->y_tx_id;
-		if (f->y_mapped) {
-			cuCtxPopCurrent(NULL);
-			return GF_OK;
-		}
-		f->y_mapped = GF_TRUE;
-		pbo_id = ctx->y_pbo_id;
-		gl_fmt = GL_LUMINANCE;
-	} else {
-		if (!ctx->uv_pbo_id) {
-			glGenBuffers(1, &ctx->uv_pbo_id);
-			glGenTextures(1, &ctx->uv_tx_id);
-
-	        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->uv_pbo_id);
-			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height / 2, NULL, GL_STREAM_DRAW_ARB);
-			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-
-			cuGLRegisterBufferObject(ctx->uv_pbo_id);
-
-		    glBindTexture(GL_TEXTURE_2D, ctx->uv_tx_id);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, ctx->width/2, ctx->height/2, 0, GL_LUMINANCE_ALPHA, gl_btype, NULL);
-			glBindTexture(GL_TEXTURE_2D, 0);
-			f->uv_mapped = GF_FALSE;
-		}
-		*gl_tex_format = GL_TEXTURE_2D;
-		*gl_tex_id = tx_id = ctx->uv_tx_id;
-		if (f->uv_mapped) {
-			cuCtxPopCurrent(NULL);
-			return GF_OK;
-		}
-		f->uv_mapped = GF_TRUE;
-		pbo_id = ctx->uv_pbo_id;
-		gl_fmt = GL_LUMINANCE_ALPHA;
-	}
-
-	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;
-	}
-	assert(tx_pitch != 0);
-
-	memset(&params, 0, sizeof(params));
-	params.progressive_frame = f->frame_info.progressive_frame;
-	//params.second_field = 0;
-	params.top_field_first = f->frame_info.top_field_first;
-	res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &vid_data, &vid_pitch, &params);
-	
-	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map decoded picture data %s\n", cudaGetErrorEnum(res) ) );
-		return GF_IO_ERR;
-	}
-	assert(vid_pitch != 0);
-
-	memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
-	mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
-	if (plane_idx) {
-		mcpi.srcDevice = vid_data + ctx->height * vid_pitch;
-		tx_pitch *= 2; //2 bytes per pixel
-	} else {
-		mcpi.srcDevice = vid_data;
-	}
-	mcpi.srcPitch = vid_pitch;
-
-	mcpi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
-	mcpi.dstDevice = tx_data;
-	mcpi.dstPitch = tx_pitch / ctx->height;
-
-	mcpi.WidthInBytes = MIN(mcpi.dstPitch, vid_pitch);
-	mcpi.Height = ctx->height;
-	if (plane_idx) mcpi.Height /= 2;
-
-	res = cuMemcpy2D(&mcpi);
-	if (res != CUDA_SUCCESS) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
-		e = GF_IO_ERR;
-	}
-
-	cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, vid_data);
-	cuGLUnmapBufferObject(pbo_id);
-
-
-	cuCtxPopCurrent(NULL);
-
-	/*bind PBO to texture and call glTexSubImage2D only after PBO transfer is queued, otherwise we'll have a one frame delay*/
-	glBindTexture(GL_TEXTURE_2D, tx_id);
-	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_id);
-
-#ifdef ENABLE_10BIT_OUTPUT
-	if (ctx->bpp_chroma+ctx->bpp_luma>16) {
-		Float a, b;
-#error "FIX NVDEC GL color mapping in 10 bit"
-		a = 65535.0f / (65472.0f - 63.0f);
-		b = -63.0f * a / 65535.0f;
-
-		glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
-		//glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
-		//glPixelStorei(GL_UNPACK_LSB_FIRST, 1);
-		//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
-		//glPixelTransferf(GL_RED_BIAS, 0.00096317f);
-		//glPixelTransferf(GL_RED_SCALE, 0.000015288f);
-		
-		glPixelTransferf(GL_RED_SCALE, a);
-		glPixelTransferf(GL_RED_BIAS, b);
-
-		if (plane_idx) {
-			glPixelTransferf(GL_ALPHA_SCALE, a);
-			glPixelTransferf(GL_ALPHA_BIAS, b);
-		}
-	}
-#endif
-	if (!plane_idx) {
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width, ctx->height, gl_fmt , gl_btype, NULL);
-	} else {
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width/2, ctx->height/2, gl_fmt , gl_btype, NULL);
-	}
-
-	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	return e;
-}
-
-GF_Err NVDec_GetOutputFrame(struct _mediadecoder *dec, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
-{
-	NVDecFrame *f;
-	NVDecCtx *ctx = (NVDecCtx *)dec->privateStack;
-	
-	*needs_resize = GF_FALSE;
-	
-	if (!ctx->pending_frame) return GF_BAD_PARAM;
-	f = ctx->pending_frame;
-	ctx->pending_frame = NULL;
-
-	f->gframe.user_data = f;
-	f->gframe.Release = NVDecFrame_Release;
-	f->gframe.GetPlane = NULL;
-	f->gframe.GetGLTexture = NVDecFrame_GetGLTexture;
-
-	*frame = &f->gframe;
-	if (ctx->frame_size_changed) {
-		ctx->frame_size_changed = GF_FALSE;
-		*needs_resize = GF_TRUE;
-	}
-	return GF_OK;
-}
-
-
-static u32 NVDec_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	const char *opt;
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)dec, "NVDec", "Enabled");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)dec, "NVDec", "Enabled", "no");
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] nvdec disabled by default, enable it in config file NVDec:Enabled=yes\n") );
-		return GF_CODEC_NOT_SUPPORTED;
-	} else if (!strcmp(opt, "no")) {
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_HEVC:
-		return GF_CODEC_SUPPORTED * 2;
-	case GPAC_OTI_VIDEO_AVC:
-		return GF_CODEC_SUPPORTED * 2;
-
-	case GPAC_OTI_VIDEO_MPEG4_PART2:
-		return GF_CODEC_SUPPORTED * 2;
-
-	case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-	case GPAC_OTI_VIDEO_MPEG2_MAIN:
-	case GPAC_OTI_VIDEO_MPEG2_SNR:
-	case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-	case GPAC_OTI_VIDEO_MPEG2_HIGH:
-	case GPAC_OTI_VIDEO_MPEG2_422:
-		return GF_CODEC_SUPPORTED * 2;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *NVDec_GetCodecName(GF_BaseDecoder *dec)
-{
-	NVDecCtx *ctx = (NVDecCtx *)dec->privateStack;
-	switch (ctx->codec_type) {
-	case cudaVideoCodec_MPEG1:
-		return ctx->use_gl_texture ? "NVidia HWGL MPEG-1" :  "NVidia HW MPEG-1";
-	case cudaVideoCodec_MPEG2:
-		return ctx->use_gl_texture ? "NVidia HWGLMPEG-2" : "NVidia HW MPEG-2";
-	case cudaVideoCodec_MPEG4:
-		return ctx->use_gl_texture ? "NVidia HWGL MPEG-4 part2" : "NVidia HW MPEG-4 part2";
-	case cudaVideoCodec_H264:
-		return ctx->use_gl_texture ? "NVidia HWGL AVC|H264" : "NVidia HW AVC|H264";
-	case cudaVideoCodec_HEVC:
-		return ctx->use_gl_texture ? "NVidia HWGL HEVC" : "NVidia HW HEVC";
-	case cudaVideoCodec_VC1:
-		return ctx->use_gl_texture ? "NVidia HWGL VC1" : "NVidia HW VC1";
-	default:
-		break;
-	}
-	return ctx->use_gl_texture ? "NVidia HWGL unknown decoder" : "NVidia HW unknown decoder";
-}
-
-
-static u32 cuvid_load_state = 0;
-static u32 nb_cuvid_inst=0;
-static void init_cuda_sdk()
-{
-	if (!cuvid_load_state) {
-		CUresult res;
-		int device_count;
-	    res = cuInit(0, __CUDA_API_VERSION);
-		nb_cuvid_inst++;
-		cuvid_load_state = 1;
-		if (res != CUDA_SUCCESS) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda %s\n", cudaGetErrorEnum(res) ) );
-		} else {
-			res = cuDeviceGetCount(&device_count);
-			if (res != CUDA_SUCCESS) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to query cuda/nvidia cards %s\n", cudaGetErrorEnum(res) ) );
-			} else {
-				if (! device_count) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] no device found\n" ) );
-				} else {
-					cuvid_load_state = 2;
-				}
-			}
-		}
-	} else {
-		nb_cuvid_inst++;
-	}
-}
-
-GF_BaseDecoder *NewNVDec()
-{
-	GF_MediaDecoder *ifcd;
-	NVDecCtx *dec;
-
-	init_cuda_sdk();
-
-	if (cuvid_load_state != 2) return NULL;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	if (!ifcd) return NULL;
-	GF_SAFEALLOC(dec, NVDecCtx);
-	if (!dec) {
-		gf_free(ifcd);
-		return NULL;
-	}
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "NVidia HW Decoder", "gpac distribution")
-
-	dec->frames = gf_list_new();
-	dec->frames_res = gf_list_new();
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = NVDec_AttachStream;
-	ifcd->DetachStream = NVDec_DetachStream;
-	ifcd->GetCapabilities = NVDec_GetCapabilities;
-	ifcd->SetCapabilities = NVDec_SetCapabilities;
-	ifcd->GetName = NVDec_GetCodecName;
-	ifcd->CanHandleStream = NVDec_CanHandleStream;
-
-	ifcd->ProcessData = NVDec_ProcessData;
-	ifcd->GetOutputFrame = NVDec_GetOutputFrame;
-
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteNVDec(GF_BaseDecoder *ifcg)
-{
-	NVDecCtx *ctx= (NVDecCtx *)ifcg->privateStack;
-
-	if (!global_nb_loaded_nvdec && global_unactive_decoders) {
-		while (gf_list_count(global_unactive_decoders)) {
-			NVDecInstance *inst = gf_list_pop_back(global_unactive_decoders);
-			nvdec_destroy_decoder(inst);
-			if (inst->cu_parser) cuvidDestroyVideoParser(inst->cu_parser);
-			gf_free(inst);
-		}
-		gf_list_del(global_unactive_decoders);
-
-		gf_mx_del(global_inst_mutex);
-	}
-
-	if (ctx->dec_inst) {
-		nvdec_destroy_decoder(ctx->dec_inst);
-		if (ctx->dec_inst->cu_parser) cuvidDestroyVideoParser(ctx->dec_inst->cu_parser);
-		gf_free(ctx->dec_inst);
-	}
-
-
-	assert(nb_cuvid_inst);
-	nb_cuvid_inst--;
-	if (!nb_cuvid_inst) {
-		if (cuda_ctx) cuCtxDestroy(cuda_ctx);
-		cuda_ctx = NULL;
-		cuUninit();
-		cuvid_load_state = 0;
-	}
-	while (gf_list_count(ctx->frames)) {
-		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
-		gf_free(f);
-	}
-	gf_list_del(ctx->frames);
-	while (gf_list_count(ctx->frames_res)) {
-		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames_res);
-		gf_free(f);
-	}
-	gf_list_del(ctx->frames_res);
-	gf_free(ctx);
-	gf_free(ifcg);
-
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_MEDIA_DECODER_INTERFACE,
-		0
-	};
-
-	init_cuda_sdk();
-
-	if (cuvid_load_state != 2) return NULL;
-
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewNVDec();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteNVDec((GF_BaseDecoder*)ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( nvdec )

gpac-0.8.0.tar.gz/modules/odf_dec Deleted

gpac-0.8.0.tar.gz/modules/odf_dec/Makefile Deleted

gpac-0.8.0.tar.gz/modules/odf_dec/odf_dec.c Deleted

@@ -1,323 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OD decoder module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/constants.h>
-
-typedef struct
-{
-	GF_Scene *scene;
-	u32 PL;
-} ODPriv;
-
-static GF_Err ODF_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err ODF_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-
-static GF_Err ODF_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_inline_scene)
-{
-	ODPriv *priv = (ODPriv *)plug->privateStack;
-	if (priv && !priv->scene) priv->scene = scene;
-	return GF_OK;
-}
-
-static void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od)
-{
-	GF_ObjectManager *odm;
-	odm = gf_scene_find_odm(scene, od->objectDescriptorID);
-	/*remove the old OD*/
-	if (odm) gf_odm_disconnect(odm, 1);
-	odm = gf_odm_new();
-	odm->OD = od;
-	odm->term = scene->root_od->term;
-	odm->parentscene = scene;
-	gf_mx_p(scene->mx_resources);
-	gf_list_add(scene->resources, odm);
-	gf_mx_v(scene->mx_resources);
-
-	/*locate service owner*/
-	gf_odm_setup_object(odm, scene->root_od->net_service);
-}
-
-static GF_Err ODS_ODUpdate(ODPriv *priv, GF_ODUpdate *odU)
-{
-	GF_ObjectDescriptor *od;
-	u32 count;
-
-	/*extract all our ODs and compare with what we already have...*/
-	count = gf_list_count(odU->objectDescriptors);
-	if (count > 255) return GF_ODF_INVALID_DESCRIPTOR;
-
-	while (count) {
-		od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, 0);
-		gf_list_rem(odU->objectDescriptors, 0);
-		count--;
-		ODS_SetupOD(priv->scene, od);
-	}
-	return GF_OK;
-}
-
-
-
-static GF_Err ODS_RemoveOD(ODPriv *priv, GF_ODRemove *odR)
-{
-	u32 i;
-	for (i=0; i< odR->NbODs; i++) {
-		GF_ObjectManager *odm = gf_scene_find_odm(priv->scene, odR->OD_ID[i]);
-		if (odm) gf_odm_disconnect(odm, 1);
-	}
-	return GF_OK;
-}
-
-static GF_Err ODS_UpdateESD(ODPriv *priv, GF_ESDUpdate *ESDs)
-{
-	GF_ESD *esd, *prev;
-	GF_ObjectManager *odm;
-	u32 count, i;
-
-	odm = gf_scene_find_odm(priv->scene, ESDs->ODID);
-	/*spec: "ignore"*/
-	if (!odm) return GF_OK;
-
-	count = gf_list_count(ESDs->ESDescriptors);
-
-	while (count) {
-		esd = (GF_ESD*)gf_list_get(ESDs->ESDescriptors, 0);
-		/*spec: "ES_Descriptors with ES_IDs that have already been received within the same name scope shall be ignored."*/
-		prev = NULL;
-		i=0;
-		while ((prev = (GF_ESD*)gf_list_enum(odm->OD->ESDescriptors, &i))) {
-			if (prev->ESID == esd->ESID) break;
-		}
-		if (prev) {
-			gf_odf_desc_del((GF_Descriptor *)esd);
-		} else {
-			/*and register new stream*/
-			gf_list_add(odm->OD->ESDescriptors, esd);
-			gf_odm_setup_es(odm, esd, odm->net_service, NULL);
-		}
-
-		/*remove the desc from the AU*/
-		gf_list_rem(ESDs->ESDescriptors, 0);
-		count--;
-	}
-	/*resetup object since a new ES has been inserted
-	(typically an empty object first sent, then a stream added - cf how ogg demuxer works)*/
-	gf_scene_setup_object(priv->scene, odm);
-	return GF_OK;
-}
-
-
-static GF_Err ODS_RemoveESD(ODPriv *priv, GF_ESDRemove *ESDs)
-{
-	GF_ObjectManager *odm;
-	u32 i;
-	odm = gf_scene_find_odm(priv->scene, ESDs->ODID);
-	/*spec: "ignore"*/
-	if (!odm) return GF_OK;
-
-	for (i=0; i<ESDs->NbESDs; i++) {
-		/*blindly call remove*/
-		gf_odm_remove_es(odm, ESDs->ES_ID[i]);
-	}
-	return GF_OK;
-}
-
-static GF_Err ODF_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	return esd->decoderConfig->upstream ? GF_NOT_SUPPORTED : GF_OK;
-}
-
-
-static GF_Err ODF_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	return GF_OK;
-}
-
-
-static GF_Err ODF_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 AU_time, u32 mmlevel)
-{
-	GF_Err e;
-	GF_ODCom *com;
-	GF_ODCodec *oddec;
-	ODPriv *priv = (ODPriv *)plug->privateStack;
-
-	oddec = gf_odf_codec_new();
-
-	e = gf_odf_codec_set_au(oddec, inBuffer, inBufferLength);
-	if (!e)  e = gf_odf_codec_decode(oddec);
-	if (e) goto err_exit;
-
-	//3- process all the commands in this AU, in order
-	while (1) {
-		com = gf_odf_codec_get_com(oddec);
-		if (!com) break;
-
-		//ok, we have a command
-		switch (com->tag) {
-		case GF_ODF_OD_UPDATE_TAG:
-			e = ODS_ODUpdate(priv, (GF_ODUpdate *) com);
-			break;
-		case GF_ODF_OD_REMOVE_TAG:
-			e = ODS_RemoveOD(priv, (GF_ODRemove *) com);
-			break;
-		case GF_ODF_ESD_UPDATE_TAG:
-			e = ODS_UpdateESD(priv, (GF_ESDUpdate *)com);
-			break;
-		case GF_ODF_ESD_REMOVE_TAG:
-			e = ODS_RemoveESD(priv, (GF_ESDRemove *)com);
-			break;
-		case GF_ODF_IPMP_UPDATE_TAG:
-#if 0
-		{
-			GF_IPMPUpdate *ipmpU = (GF_IPMPUpdate *)com;
-			while (gf_list_count(ipmpU->IPMPDescList)) {
-				GF_IPMP_Descriptor *ipmp = gf_list_get(ipmpU->IPMPDescList, 0);
-				gf_list_rem(ipmpU->IPMPDescList, 0);
-				IS_UpdateIPMP(priv->scene, ipmp);
-			}
-			e = GF_OK;
-		}
-#else
-		e = GF_OK;
-#endif
-		break;
-		case GF_ODF_IPMP_REMOVE_TAG:
-			e = GF_NOT_SUPPORTED;
-			break;
-		/*should NEVER exist outside the file format*/
-		case GF_ODF_ESD_REMOVE_REF_TAG:
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			break;
-		default:
-			if (com->tag >= GF_ODF_COM_ISO_BEGIN_TAG && com->tag <= GF_ODF_COM_ISO_END_TAG) {
-				e = GF_ODF_FORBIDDEN_DESCRIPTOR;
-			} else {
-				/*we don't process user commands*/
-				e = GF_OK;
-			}
-			break;
-		}
-		gf_odf_com_del(&com);
-		if (e) break;
-	}
-
-err_exit:
-	gf_odf_codec_del(oddec);
-	return e;
-}
-
-
-static u32 ODF_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	ODPriv *priv = (ODPriv *)ifce->privateStack;
-	if (StreamType==GF_STREAM_OD) {
-		priv->PL = PL;
-		return GF_CODEC_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-void DeleteODDec(GF_BaseDecoder *plug)
-{
-	ODPriv *priv;
-	if (!plug)
-		return;
-	priv = (ODPriv *)plug->privateStack;
-	if (priv) {
-		gf_free(priv);
-		plug->privateStack = NULL;
-	}
-	gf_free(plug);
-}
-
-GF_BaseDecoder *NewODDec()
-{
-	GF_SceneDecoder *tmp;
-	ODPriv *priv;
-
-	GF_SAFEALLOC(tmp, GF_SceneDecoder);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, ODPriv);
-
-	tmp->privateStack = priv;
-	tmp->AttachStream = ODF_AttachStream;
-	tmp->DetachStream = ODF_DetachStream;
-	tmp->GetCapabilities = ODF_GetCapabilities;
-	tmp->SetCapabilities = ODF_SetCapabilities;
-	tmp->ProcessData = ODF_ProcessData;
-	tmp->AttachScene = ODF_AttachScene;
-	tmp->CanHandleStream = ODF_CanHandleStream;
-
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC OD Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) tmp;
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_SCENE_DECODER_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewODDec();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	if (!ifce)
-		return;
-	switch (ifce->InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteODDec((GF_BaseDecoder *)ifce);
-		break;
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( odf_dec )

gpac-0.8.0.tar.gz/modules/ogg Deleted

gpac-0.8.0.tar.gz/modules/ogg/Makefile Deleted

@@ -1,83 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/ogg
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS= ogg_in.o ogg_load.o
-
-SRCS := $(OBJS:.o=.c) 
-
-NEED_LOCAL_LIB="no"
-LOCAL_LIB=../../bin/gcc
-LINKLIBS= -lgpac -logg
-
-ifeq ($(CONFIG_OGG), local)
-NEED_LOCAL_LIB="yes"
-endif
-
-ifeq ($(CONFIG_VORBIS), no)
-else
-OBJS+= vorbis_dec.o
-LINKLIBS+= -lvorbis
-CFLAGS+=-DGPAC_HAS_VORBIS
-ifeq ($(CONFIG_VORBIS), local)
-NEED_LOCAL_LIB="yes"
-CFLAGS+= -I"$(LOCAL_INC_PATH)"
-endif
-endif
-
-ifeq ($(CONFIG_THEORA), no)
-else
-OBJS+= theora_dec.o
-LINKLIBS+= -ltheora
-CFLAGS+=-DGPAC_HAS_THEORA
-ifeq ($(CONFIG_THEORA), local)
-NEED_LOCAL_LIB="yes"
-CFLAGS+= -I"$(LOCAL_INC_PATH)"
-endif
-endif
-
-
-#add local lib path
-ifeq ($(NEED_LOCAL_LIB), "yes")
-LOCAL_LIB+=-L../../extra_lib/lib/gcc
-endif
-
-
-LIB=gm_ogg_xiph$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols ogg.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/ogg/ogg_in.c Deleted

@@ -1,1019 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / XIPH.org module
- *
- *  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 "ogg_in.h"
-#include <ogg/ogg.h>
-
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
-
-typedef struct
-{
-	u32 streamType;	/*MPEG-4 streamType*/
-	u32 num_init_headers;
-	u32 sample_rate, bitrate;
-
-	u32 theora_kgs;
-	Float frame_rate;
-	u32 frame_rate_base;
-
-	u32 type;
-} OGGInfo;
-
-typedef struct
-{
-	ogg_stream_state os;
-	u32 serial_no;
-	/*DSI for ogg in mp4 - cf constants.h*/
-	char *dsi;
-	u32 dsi_len;
-
-	OGGInfo info;
-	Bool got_headers;
-	s64 seek_granule, last_granule;
-
-	Bool is_running;
-	u32 parse_headers;
-	LPNETCHANNEL ch;
-	u16 ESID;
-	Bool eos_detected, map_time;
-
-	u32 ogg_ts;
-
-	GF_VorbisParser vp;
-} OGGStream;
-
-typedef struct
-{
-	GF_ClientService *service;
-	GF_Thread *demuxer;
-
-	GF_List *streams;
-
-	FILE *ogfile;
-	u64 file_size;
-	Bool is_remote, is_inline;
-	u32 nb_playing, kill_demux, do_seek, service_type, init_remain, bos_done;
-
-	/*ogg ogfile state*/
-	ogg_sync_state oy;
-
-	OGGStream *resync_stream;
-
-	Bool has_video, has_audio, is_single_media;
-
-	Double dur;
-	u32 data_buffer_ms;
-
-	Bool needs_connection;
-	Double start_range, end_range;
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-	Bool is_live;
-	u32 tune_in_time;
-} OGGReader;
-
-
-void OGG_EndOfFile(OGGReader *read)
-{
-	OGGStream *st;
-	u32 i=0;
-	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-		gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
-	}
-}
-
-#define OGG_BUFFER_SIZE 4096
-
-static Bool OGG_ReadPage(OGGReader *read, ogg_page *oggpage)
-{
-	char buf[OGG_BUFFER_SIZE];
-	GF_Err e;
-
-	/*remote file, check if we use cache*/
-	if (read->is_remote) {
-		u32 total_size;
-		GF_NetIOStatus status;
-		e = gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, &status);
-		/*not ready*/
-		if ((e<GF_OK) || (status > GF_NETIO_DATA_EXCHANGE)) return GF_FALSE;
-		if (status == GF_NETIO_DATA_EXCHANGE) {
-			if (!total_size && !read->is_live) {
-				read->is_live = GF_TRUE;
-				read->tune_in_time = gf_sys_clock();
-			}
-			else if (!read->is_live  && !read->ogfile) {
-				const char *szCache = gf_dm_sess_get_cache_name(read->dnload);
-				if (!szCache) return GF_FALSE;
-				read->ogfile = gf_fopen((char *) szCache, "rb");
-				if (!read->ogfile) return GF_FALSE;
-			}
-		}
-	}
-
-	while (ogg_sync_pageout(&read->oy, oggpage ) != 1 ) {
-		char *buffer;
-		u32 bytes;
-
-		if (read->ogfile) {
-			if (feof(read->ogfile)) {
-				OGG_EndOfFile(read);
-				return GF_FALSE;
-			}
-			bytes = (u32) fread(buf, 1, OGG_BUFFER_SIZE, read->ogfile);
-		} else {
-			e = gf_dm_sess_fetch_data(read->dnload, buf, OGG_BUFFER_SIZE, &bytes);
-			if (e) return GF_FALSE;
-		}
-		if (!bytes) return GF_FALSE;
-		buffer = ogg_sync_buffer(&read->oy, bytes);
-		memcpy(buffer, buf, bytes);
-		if (ogg_sync_wrote(&read->oy, bytes)) return GF_FALSE;
-	}
-	return GF_TRUE;
-}
-
-static OGGStream *OGG_FindStreamForPage(OGGReader *read, ogg_page *oggpage)
-{
-	u32 i, count;
-	count = gf_list_count(read->streams);
-	for (i=0; i<count; i++) {
-		OGGStream *st = (OGGStream*)gf_list_get(read->streams, i);
-		if (ogg_stream_pagein(&st->os, oggpage) == 0) return st;
-	}
-	return NULL;
-}
-
-
-
-static GF_ObjectDescriptor *OGG_GetOD(OGGStream *st)
-{
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
-
-	od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	od->objectDescriptorID = (st->info.streamType==GF_STREAM_AUDIO) ? 3 : 2;
-	esd = gf_odf_desc_esd_new(0);
-	esd->decoderConfig->streamType = st->info.streamType;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OGG;
-	esd->decoderConfig->avgBitrate = st->info.bitrate;
-	esd->ESID = st->ESID;
-
-	esd->slConfig->useTimestampsFlag = 1;
-	esd->slConfig->useAccessUnitEndFlag = esd->slConfig->useAccessUnitStartFlag = 1;
-	esd->slConfig->timestampResolution = st->info.sample_rate ? st->info.sample_rate : (u32) (1000*st->info.frame_rate);
-	if (st->info.sample_rate) esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-	else esd->slConfig->useRandomAccessPointFlag = 1;
-
-	esd->decoderConfig->decoderSpecificInfo->dataLength = st->dsi_len;
-	esd->decoderConfig->decoderSpecificInfo->data = (char *) gf_malloc(sizeof(char) * st->dsi_len);
-	memcpy(esd->decoderConfig->decoderSpecificInfo->data, st->dsi, sizeof(char) * st->dsi_len);
-	gf_list_add(od->ESDescriptors, esd);
-	return od;
-}
-
-u64 OGG_GranuleToTime(OGGInfo *cfg, s64 granule)
-{
-	if (cfg->sample_rate) {
-		return granule;
-	}
-	if (cfg->frame_rate) {
-		s64 iframe = granule>>cfg->theora_kgs;
-		s64 pframe = granule - (iframe<<cfg->theora_kgs);
-		pframe += iframe;
-		pframe *= cfg->frame_rate_base;
-		return (u64) (pframe / cfg->frame_rate);
-	}
-	return 0;
-}
-
-Double OGG_GranuleToMediaTime(OGGInfo *cfg, s64 granule)
-{
-	Double t = (Double) (s64) OGG_GranuleToTime(cfg, granule);
-	if (cfg->sample_rate) t /= cfg->sample_rate;
-	else t /= cfg->frame_rate_base;
-	return t;
-}
-
-
-static void OGG_GetStreamInfo(ogg_packet *oggpacket, OGGInfo *info)
-{
-	oggpack_buffer opb;
-
-	memset(info, 0, sizeof(OGGInfo));
-
-	/*vorbis*/
-	if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "vorbis", 6)) {
-		info->streamType = GF_STREAM_AUDIO;
-		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
-		oggpack_adv( &opb, 88);
-		oggpack_adv( &opb, 8);	/*nb chan*/
-		info->sample_rate = oggpack_read(&opb, 32);
-		oggpack_adv( &opb, 32);	/*max rate*/
-		info->bitrate = oggpack_read(&opb, 32);
-		info->num_init_headers = 3;
-		info->type = OGG_VORBIS;
-	}
-	/*speex*/
-	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[0], "Speex", 5)) {
-		info->streamType = GF_STREAM_AUDIO;
-		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
-		oggpack_adv(&opb, 224);
-		oggpack_adv(&opb, 32);
-		oggpack_adv( &opb, 32);
-		info->sample_rate = oggpack_read(&opb, 32);
-		info->type = OGG_SPEEX;
-		info->num_init_headers = 1;
-	}
-	/*flac*/
-	else if ((oggpacket->bytes >= 4) && !strncmp((char *) &oggpacket->packet[0], "fLaC", 4)) {
-		info->streamType = GF_STREAM_AUDIO;
-		info->type = 3;
-		info->num_init_headers = OGG_FLAC;
-	}
-	/*theora*/
-	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "theora", 6)) {
-		GF_BitStream *bs;
-		u32 fps_numerator, fps_denominator, keyframe_freq_force;
-
-		info->streamType = GF_STREAM_VISUAL;
-		info->type = OGG_THEORA;
-		bs = gf_bs_new((char *) oggpacket->packet, oggpacket->bytes, GF_BITSTREAM_READ);
-		gf_bs_read_int(bs, 56);
-		gf_bs_read_int(bs, 8); /* major version num */
-		gf_bs_read_int(bs, 8); /* minor version num */
-		gf_bs_read_int(bs, 8); /* subminor version num */
-		gf_bs_read_int(bs, 16) /*<< 4*/; /* width */
-		gf_bs_read_int(bs, 16) /*<< 4*/; /* height */
-		gf_bs_read_int(bs, 24); /* frame width */
-		gf_bs_read_int(bs, 24); /* frame height */
-		gf_bs_read_int(bs, 8); /* x offset */
-		gf_bs_read_int(bs, 8); /* y offset */
-		fps_numerator = gf_bs_read_u32(bs);
-		fps_denominator = gf_bs_read_u32(bs);
-		gf_bs_read_int(bs, 24); /* aspect_numerator */
-		gf_bs_read_int(bs, 24); /* aspect_denominator */
-		gf_bs_read_int(bs, 8); /* colorspace */
-		gf_bs_read_int(bs, 24);/* bitrate */
-		gf_bs_read_int(bs, 6); /* quality */
-
-		keyframe_freq_force = 1 << gf_bs_read_int(bs, 5);
-		info->theora_kgs = 0;
-		keyframe_freq_force--;
-		while (keyframe_freq_force) {
-			info->theora_kgs ++;
-			keyframe_freq_force >>= 1;
-		}
-		info->frame_rate = ((Float)fps_numerator) / fps_denominator;
-		info->num_init_headers = 3;
-		gf_bs_del(bs);
-		info->frame_rate_base = fps_denominator;
-	}
-}
-
-static void OGG_ResetupStream(OGGReader *read, OGGStream *st, ogg_page *oggpage)
-{
-	ogg_stream_clear(&st->os);
-	ogg_stream_init(&st->os, st->serial_no);
-	ogg_stream_pagein(&st->os, oggpage);
-	st->parse_headers = st->info.num_init_headers;
-
-	if (st->info.sample_rate) {
-		st->seek_granule = (s64) (read->start_range * st->info.sample_rate);
-	} else if (st->info.frame_rate) {
-		s64 seek = (s64) (read->start_range * st->info.frame_rate) - 1;
-		if (seek<0) seek=0;
-		st->seek_granule = (seek)<<st->info.theora_kgs;
-	}
-	st->last_granule = -1;
-}
-
-static void OGG_NewStream(OGGReader *read, ogg_page *oggpage)
-{
-	ogg_packet oggpacket;
-	u32 serial_no, i;
-	OGGStream *st;
-
-	/*reannounce of stream (caroussel in live streams) - until now I don't think icecast uses this*/
-	serial_no = ogg_page_serialno(oggpage);
-	i=0;
-	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-		if (st->serial_no==serial_no) {
-			OGG_ResetupStream(read, st, oggpage);
-			return;
-		}
-	}
-
-	/*look if we have the same stream defined (eg, reuse first stream dead with same header page)*/
-	i=0;
-	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-		if (st->eos_detected) {
-			ogg_stream_state os;
-			ogg_stream_init(&os, serial_no);
-			ogg_stream_pagein(&os, oggpage);
-			ogg_stream_packetpeek(&os, &oggpacket);
-			if (st->dsi && !memcmp(st->dsi, oggpacket.packet, oggpacket.bytes)) {
-				ogg_stream_clear(&os);
-				st->serial_no = serial_no;
-				OGG_ResetupStream(read, st, oggpage);
-				return;
-			}
-			ogg_stream_clear(&os);
-			/*nope streams are different, signal eos on this one*/
-			gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
-		}
-	}
-
-	GF_SAFEALLOC(st, OGGStream);
-	if (!st) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] Failed to allocate stream for demux\n"));
-		return;
-	}
-	st->serial_no = serial_no;
-	ogg_stream_init(&st->os, st->serial_no);
-	ogg_stream_pagein(&st->os, oggpage);
-
-	ogg_stream_packetpeek(&st->os, &oggpacket);
-	OGG_GetStreamInfo(&oggpacket, &st->info);
-
-	/*check we don't discard audio or visual streams*/
-	if ( ((read->service_type==1) && (st->info.streamType==GF_STREAM_AUDIO))
-	        || ((read->service_type==2) && (st->info.streamType==GF_STREAM_VISUAL)) )
-	{
-		ogg_stream_clear(&st->os);
-		gf_free(st);
-		return;
-	}
-
-	gf_list_add(read->streams, st);
-	st->ESID = 2 + gf_list_count(read->streams);
-	st->parse_headers = st->info.num_init_headers;
-	if (st->parse_headers) read->init_remain++;
-
-	if (st->info.sample_rate) {
-		st->seek_granule = (s64) (read->start_range * st->info.sample_rate);
-	} else if (st->info.frame_rate) {
-		s64 seek = (s64) (read->start_range * st->info.frame_rate) - 1;
-		if (seek<0) seek=0;
-		st->seek_granule = (seek)<<st->info.theora_kgs;
-	}
-	st->last_granule = -1;
-
-	if (st->info.streamType==GF_STREAM_VISUAL) {
-		read->has_video = GF_TRUE;
-	} else {
-		read->has_audio = GF_TRUE;
-	}
-	if (st->got_headers && read->is_inline) gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), GF_FALSE);
-}
-
-void OGG_SignalEndOfStream(OGGReader *read, OGGStream *st)
-{
-	if (st->eos_detected) {
-		gf_service_send_packet(read->service, st->ch, NULL, 0, NULL, GF_EOS);
-		ogg_stream_clear(&st->os);
-	}
-}
-
-/*GFINLINE*/
-void OGG_SendPackets(OGGReader *read, OGGStream *st, ogg_packet *oggpacket)
-{
-	GF_SLHeader slh;
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	if (st->info.type==OGG_VORBIS) {
-		slh.accessUnitEndFlag = slh.accessUnitStartFlag = 1;
-		slh.randomAccessPointFlag = 1;
-		slh.compositionTimeStampFlag = 1;
-		slh.compositionTimeStamp = st->ogg_ts;
-		gf_service_send_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
-		st->ogg_ts += gf_vorbis_check_frame(&st->vp, (char *) oggpacket->packet, oggpacket->bytes);
-	}
-	else if (st->info.type==OGG_THEORA) {
-		oggpack_buffer opb;
-		oggpackB_readinit(&opb, oggpacket->packet, oggpacket->bytes);
-		/*new frame*/
-		if (oggpackB_read(&opb, 1) == 0) {
-			slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
-			/*add packet*/
-			slh.randomAccessPointFlag = oggpackB_read(&opb, 1) ? 0 : 1;
-			slh.compositionTimeStampFlag = 1;
-			slh.compositionTimeStamp = st->ogg_ts;
-			gf_service_send_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
-			st->ogg_ts += 1000;
-		}
-	}
-}
-
-void OGG_Process(OGGReader *read)
-{
-	OGGStream *st;
-	ogg_packet oggpacket;
-	ogg_page oggpage;
-
-	if (read->resync_stream) {
-		st = read->resync_stream;
-		read->resync_stream = NULL;
-		goto process_stream;
-	}
-
-	if (!OGG_ReadPage(read, &oggpage)) {
-		return;
-	}
-
-	if (ogg_page_bos(&oggpage)) {
-		OGG_NewStream(read, &oggpage);
-		return;
-	}
-
-	st = OGG_FindStreamForPage(read, &oggpage);
-	if (!st) {
-		if (!read->bos_done && read->is_live) {
-			u32 now = gf_sys_clock();
-			if (now-read->tune_in_time > 1000) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[OGG]: Waiting for tune in...\n"));
-				read->tune_in_time = now;
-			}
-		}
-		return;
-	}
-
-	if (ogg_page_eos(&oggpage))
-		st->eos_detected = GF_TRUE;
-
-	if (st->parse_headers && !st->got_headers) {
-		while (ogg_stream_packetout(&st->os, &oggpacket ) > 0 ) {
-			GF_BitStream *bs;
-			if (st->info.type == OGG_VORBIS) {
-				ogg_audio_codec_desc codec;
-				memset(&codec, 0, sizeof(ogg_audio_codec_desc));
-				codec.parserPrivateState = &st->vp;
-				gf_vorbis_parse_header(&codec, (char *)oggpacket.packet, oggpacket.bytes);
-			}
-
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			if (st->dsi) {
-				gf_bs_write_data(bs, st->dsi, st->dsi_len);
-				gf_free(st->dsi);
-				st->dsi = NULL;
-				st->dsi_len=0;
-			}
-			gf_bs_write_u16(bs, oggpacket.bytes);
-			gf_bs_write_data(bs, (char *) oggpacket.packet, oggpacket.bytes);
-			gf_bs_get_content(bs, (char **)&st->dsi, &st->dsi_len);
-			gf_bs_del(bs);
-			st->parse_headers--;
-			if (!st->parse_headers) {
-				st->got_headers = GF_TRUE;
-				if (read->is_inline)
-					gf_service_declare_media(read->service, (GF_Descriptor*) OGG_GetOD(st), GF_FALSE);
-				break;
-			}
-		}
-		if (!st->got_headers) return;
-		assert(read->init_remain);
-		read->init_remain--;
-		if (!read->init_remain) read->bos_done = 1;
-		return;
-	}
-	/*from here we should have passed all headers*/
-	if (read->init_remain) return;
-
-process_stream:
-	/*live insertion (not supported yet, just a reminder)*/
-	if (!st->ch) {
-		read->resync_stream = st;
-		return;
-	}
-
-	while (ogg_stream_packetout(&st->os, &oggpacket ) > 0 ) {
-		if (oggpacket.granulepos != -1) {
-			st->last_granule = oggpacket.granulepos;
-		}
-		/*stream reinit, don't resend headers*/
-		if (st->parse_headers) st->parse_headers--;
-		else if (st->map_time) {
-			Double t;
-			if (read->start_range && (oggpacket.granulepos==-1)) continue;
-			t = OGG_GranuleToMediaTime(&st->info, st->last_granule);
-			if (t>=read->start_range) {
-				GF_NetworkCommand map;
-				map.command_type = GF_NET_CHAN_MAP_TIME;
-				map.map_time.on_channel = st->ch;
-				map.map_time.reset_buffers = (read->start_range>0.2) ? GF_TRUE : GF_FALSE;
-				map.map_time.timestamp = st->ogg_ts = 0;
-				map.map_time.media_time = t;
-				gf_service_command(read->service, &map, GF_OK);
-				st->map_time = GF_FALSE;
-				OGG_SendPackets(read, st, &oggpacket);
-			}
-		}
-		else {
-			OGG_SendPackets(read, st, &oggpacket);
-		}
-	}
-}
-
-static u32 OggDemux(void *par)
-{
-	GF_NetworkCommand com;
-	Bool go;
-	u32 i, count;
-	OGGStream *st;
-	OGGReader *read = (OGGReader *) par;
-
-	read->bos_done = 0;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-
-	if (read->needs_connection) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, GF_OK);
-	}
-
-	ogg_sync_init(&read->oy);
-
-
-	while (!read->kill_demux) {
-		OGG_Process(read);
-
-		if (!read->bos_done) continue;
-
-		/*wait for stream connection*/
-		while (!read->kill_demux && !read->nb_playing) {
-			gf_sleep(20);
-		}
-
-		/*(re)starting, seek*/
-		if (read->do_seek) {
-			read->do_seek = 0;
-			ogg_sync_clear(&read->oy);
-			ogg_sync_init(&read->oy);
-//			OGG_SendStreams(read);
-
-			if (read->ogfile) {
-				u32 seek_to = 0;
-				read->resync_stream = NULL;
-				if (read->dur) seek_to = (u32) (read->file_size * (read->start_range/read->dur) * 0.6f);
-				if ((s32) seek_to > gf_ftell(read->ogfile) ) {
-					gf_fseek(read->ogfile, seek_to, SEEK_SET);
-				} else {
-					gf_fseek(read->ogfile, 0, SEEK_SET);
-				}
-			}
-		}
-
-
-		/*sleep untill the buffer occupancy is too low - note that this work because all streams in this
-		demuxer are synchronized*/
-		go = read->nb_playing;
-		while (go && !read->kill_demux) {
-			count = gf_list_count(read->streams);
-			for (i=0; i<count; i++) {
-				st = (OGGStream*)gf_list_get(read->streams, i);
-				if (!st->ch) continue;
-				com.base.on_channel = st->ch;
-				gf_service_command(read->service, &com, GF_OK);
-				if (com.buffer.occupancy < read->data_buffer_ms) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[OGG] channel %d needs fill (%d ms data, %d max buffer)\n", st->ESID, com.buffer.occupancy, read->data_buffer_ms));
-					go = GF_FALSE;
-					break;
-				}
-			}
-			if (!i || !read->nb_playing) break;
-			gf_sleep(0);
-		}
-	}
-	ogg_sync_clear(&read->oy);
-	read->kill_demux=2;
-	return 0;
-}
-
-/*get streams & duration*/
-Bool OGG_CheckFile(OGGReader *read)
-{
-	OGGInfo info, the_info;
-	ogg_page oggpage;
-	ogg_packet oggpacket;
-	ogg_stream_state os, the_os;
-	u64 max_gran;
-	Bool has_stream = GF_FALSE;
-	gf_fseek(read->ogfile, 0, SEEK_SET);
-
-	ogg_sync_init(&read->oy);
-	memset(&the_info, 0, sizeof(OGGInfo));
-	max_gran = 0;
-	while (1) {
-		if (!OGG_ReadPage(read, &oggpage)) break;
-
-		if (ogg_page_bos(&oggpage)) {
-			ogg_stream_init(&os, ogg_page_serialno(&oggpage));
-			if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
-				ogg_stream_packetpeek(&os, &oggpacket);
-				if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
-					ogg_stream_packetpeek(&os, &oggpacket);
-					OGG_GetStreamInfo(&oggpacket, &info);
-				}
-				if (!has_stream) {
-					has_stream = GF_TRUE;
-					ogg_stream_init(&the_os, ogg_page_serialno(&oggpage));
-					the_info = info;
-				}
-			}
-			ogg_stream_clear(&os);
-			continue;
-		}
-		if (has_stream && (ogg_stream_pagein(&the_os, &oggpage) >= 0) ) {
-			while (ogg_stream_packetout(&the_os, &oggpacket ) > 0 ) {
-				if ((oggpacket.granulepos>=0) && ((u64) oggpacket.granulepos>max_gran) ) {
-					max_gran = oggpacket.granulepos;
-				}
-			}
-		}
-	}
-	ogg_sync_clear(&read->oy);
-	read->file_size = gf_ftell(read->ogfile);
-	gf_fseek(read->ogfile, 0, SEEK_SET);
-	read->dur = 0;
-	if (has_stream) {
-		ogg_stream_clear(&the_os);
-		read->dur = (Double) (s64) OGG_GranuleToTime(&the_info, max_gran);
-		if (the_info.sample_rate) read->dur /= the_info.sample_rate;
-		else read->dur /= the_info.frame_rate_base;
-	}
-	return has_stream;
-}
-
-static const char * OGG_MIMES_AUDIO[] = {
-	"audio/ogg", "audio/x-ogg", "audio/x-vorbis+ogg", NULL
-};
-
-static const char * OGG_MIMES_AUDIO_EXT = "oga spx";
-
-static const char * OGG_MIMES_AUDIO_DESC = "Xiph.org OGG Music";
-
-static const char * OGG_MIMES_VIDEO[] = {
-	"application/ogg", "application/x-ogg", "video/ogg", "video/x-ogg", "video/x-ogm+ogg", NULL
-};
-
-static const char * OGG_MIMES_VIDEO_DESC = "Xiph.org OGG Movie";
-
-static const char * OGG_MIMES_VIDEO_EXT = "ogg ogv oggm";
-
-static u32 OGG_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i, c;
-	for (i = 0 ; OGG_MIMES_AUDIO[i]; i++)
-		gf_service_register_mime(plug, OGG_MIMES_AUDIO[i], OGG_MIMES_AUDIO_EXT, OGG_MIMES_AUDIO_DESC);
-	c = i;
-	for (i = 0 ; OGG_MIMES_VIDEO[i]; i++)
-		gf_service_register_mime(plug, OGG_MIMES_VIDEO[i], OGG_MIMES_VIDEO_EXT, OGG_MIMES_VIDEO_DESC);
-	return c+i;
-}
-
-static Bool OGG_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	u32 i;
-	sExt = strrchr(url, '.');
-	for (i = 0 ; OGG_MIMES_AUDIO[i]; i++) {
-		if (gf_service_check_mime_register(plug, OGG_MIMES_AUDIO[i], OGG_MIMES_AUDIO_EXT, OGG_MIMES_AUDIO_DESC, sExt))
-			return GF_TRUE;
-	}
-	for (i = 0 ; OGG_MIMES_VIDEO[i]; i++) {
-		if (gf_service_check_mime_register(plug, OGG_MIMES_VIDEO[i], OGG_MIMES_VIDEO_EXT, OGG_MIMES_VIDEO_DESC, sExt))
-			return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool ogg_is_local(const char *url)
-{
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-void OGG_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	OGGReader *read = (OGGReader *) cbk;
-
-	gf_service_download_update_stats(read->dnload);
-
-	/*done*/
-	if ((param->msg_type==GF_NETIO_DATA_TRANSFERED) && read->ogfile) {
-		read->is_remote = GF_FALSE;
-		/*reload file*/
-		OGG_CheckFile(read);
-		return;
-	}
-	if (param->error && read->needs_connection) {
-		read->needs_connection = GF_FALSE;
-		read->kill_demux = 2;
-		gf_service_connect_ack(read->service, NULL, param->error);
-	}
-	/*we never receive data from here since the downloader is not threaded*/
-}
-
-void OGG_DownloadFile(GF_InputService *plug, char *url)
-{
-	OGGReader *read = (OGGReader*) plug->priv;
-
-	read->dnload = gf_service_download_new(read->service, url, GF_NETIO_SESSION_NOT_THREADED, OGG_NetIO, read);
-	if (!read->dnload) {
-		read->kill_demux=2;
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	}
-	/*service confirm is done once fetched, but start the demuxer thread*/
-	gf_th_run(read->demuxer, OggDemux, read);
-}
-
-
-static GF_Err OGG_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *ext;
-	GF_Err reply=GF_OK;
-	OGGReader *read = (OGGReader*)plug->priv;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	read->service_type = 0;
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) {
-		if (!strcmp(ext, "#video")) read->service_type = 1;
-		else if (!strcmp(ext, "#audio")) read->service_type = 2;
-		ext[0] = 0;
-	}
-
-	/*remote fetch*/
-	read->is_remote = !ogg_is_local(szURL);
-	if (read->is_remote) {
-		read->needs_connection = GF_TRUE;
-		OGG_DownloadFile(plug, szURL);
-		return GF_OK;
-	} else {
-		read->ogfile = gf_fopen(szURL, "rb");
-		if (!read->ogfile) {
-			reply = GF_URL_ERROR;
-		} else {
-			/*init ogg file in local mode*/
-			if (!OGG_CheckFile(read)) {
-				gf_fclose(read->ogfile);
-				reply = GF_NON_COMPLIANT_BITSTREAM;
-			} else {
-				read->needs_connection = GF_TRUE;
-				/*start the demuxer thread*/
-				gf_th_run(read->demuxer, OggDemux, read);
-				return GF_OK;
-			}
-		}
-	}
-	/*error*/
-	read->kill_demux=2;
-	gf_service_connect_ack(serv, NULL, reply);
-	return GF_OK;
-}
-
-static GF_Err OGG_CloseService(GF_InputService *plug)
-{
-	OGGReader *read = (OGGReader*)plug->priv;
-	if (!read->kill_demux) {
-		read->kill_demux = 1;
-		while (read->kill_demux!=2) gf_sleep(2);
-	}
-
-	if (read->ogfile) gf_fclose(read->ogfile);
-	read->ogfile = NULL;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *OGG_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 i;
-	GF_ObjectDescriptor *od;
-	OGGStream *st;
-	OGGReader *read = (OGGReader*)plug->priv;
-	/*since we don't handle multitrack in ogg yes, we don't need to check sub_url, only use expected type*/
-
-	/*single object*/
-	if ((expect_type==GF_MEDIA_OBJECT_AUDIO) || (expect_type==GF_MEDIA_OBJECT_VIDEO)) {
-		if ((expect_type==GF_MEDIA_OBJECT_AUDIO) && !read->has_audio) return NULL;
-		if ((expect_type==GF_MEDIA_OBJECT_VIDEO) && !read->has_video) return NULL;
-		i=0;
-		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-			if ((expect_type==GF_MEDIA_OBJECT_AUDIO) && (st->info.streamType!=GF_STREAM_AUDIO)) continue;
-			if ((expect_type==GF_MEDIA_OBJECT_VIDEO) && (st->info.streamType!=GF_STREAM_VISUAL)) continue;
-
-			od = OGG_GetOD(st);
-			read->is_single_media = GF_TRUE;
-			return (GF_Descriptor *) od;
-		}
-		/*not supported yet - we need to know what's in the ogg stream for that*/
-	}
-	read->is_inline = GF_TRUE;
-	return NULL;
-}
-
-static GF_Err OGG_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID, i;
-	GF_Err e;
-	OGGStream *st;
-	OGGReader *read = (OGGReader*)plug->priv;
-
-	ES_ID=0;
-	e = GF_STREAM_NOT_FOUND;
-	if (strstr(url, "ES_ID")) {
-		sscanf(url, "ES_ID=%u", &ES_ID);
-	}
-	/*URL setup*/
-//	else if (!read->es_ch && OGG_CanHandleURL(plug, url)) ES_ID = 3;
-
-	i=0;
-	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-		if (st->ESID==ES_ID) {
-			st->ch = channel;
-			e = GF_OK;
-			break;
-		}
-	}
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err OGG_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_Err e;
-	OGGStream *st;
-	u32 i=0;
-	OGGReader *read = (OGGReader*)plug->priv;
-
-	e = GF_STREAM_NOT_FOUND;
-	while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-		if (st->ch==channel) {
-			st->ch = NULL;
-			e = GF_OK;
-			break;
-		}
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err OGG_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	OGGStream *st;
-	u32 i;
-	OGGReader *read = (OGGReader*)plug->priv;
-
-	if (!com->base.on_channel) {
-		/*if live session we may cache*/
-		if (read->is_live && (com->command_type==GF_NET_IS_CACHABLE)) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		/*no way to demux streams independently, and we keep OD as dynamic ogfile to handle
-		chained streams*/
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_INTERACTIVE:
-		//live: return GF_NOT_SUPPORTED;
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.min = com->buffer.max = 0;
-		if (read->is_live) com->buffer.max = read->data_buffer_ms;
-		return GF_OK;
-	case GF_NET_CHAN_SET_PADDING:
-		return GF_NOT_SUPPORTED;
-
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->dur;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		read->start_range = com->play.start_range;
-		read->end_range = com->play.end_range;
-		i=0;
-		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-			if (st->ch == com->base.on_channel) {
-				st->is_running = GF_TRUE;
-				st->map_time = read->dur ? GF_TRUE : GF_FALSE;
-				if (!read->nb_playing) read->do_seek = 1;
-				read->nb_playing ++;
-				break;
-			}
-		}
-		/*recfg duration in case*/
-		if (!read->is_remote && read->dur) {
-			GF_NetworkCommand rcfg;
-			rcfg.base.on_channel = NULL;
-			rcfg.base.command_type = GF_NET_CHAN_DURATION;
-			rcfg.duration.duration = read->dur;
-			gf_service_command(read->service, &rcfg, GF_OK);
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		i=0;
-		while ((st = (OGGStream*)gf_list_enum(read->streams, &i))) {
-			if (st->ch == com->base.on_channel) {
-				st->is_running = GF_FALSE;
-				read->nb_playing --;
-				break;
-			}
-		}
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-static Bool OGG_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	char szURL[2048], *sep;
-	OGGReader *read = (OGGReader *)plug->priv;
-	const char *this_url = gf_service_get_url(read->service);
-	if (!this_url || !url) return GF_FALSE;
-
-	strcpy(szURL, this_url);
-	sep = strrchr(szURL, '#');
-	if (sep) sep[0] = 0;
-
-	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
-	sep = strrchr(url, '#');
-	if (!stricmp(sep, "#video") && (read->has_video)) return GF_TRUE;
-	if (!stricmp(sep, "#audio") && (read->has_audio)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-GF_InputService *OGG_LoadDemux()
-{
-	OGGReader *reader;
-	GF_InputService *plug = (GF_InputService*)gf_malloc(sizeof(GF_InputService));
-	memset(plug, 0, sizeof(GF_InputService));
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC OGG Reader", "gpac distribution")
-	plug->RegisterMimeTypes = OGG_RegisterMimeTypes;
-	plug->CanHandleURL = OGG_CanHandleURL;
-	plug->ConnectService = OGG_ConnectService;
-	plug->CloseService = OGG_CloseService;
-	plug->GetServiceDescriptor = OGG_GetServiceDesc;
-	plug->ConnectChannel = OGG_ConnectChannel;
-	plug->DisconnectChannel = OGG_DisconnectChannel;
-	plug->ServiceCommand = OGG_ServiceCommand;
-	plug->CanHandleURLInService = OGG_CanHandleURLInService;
-
-	reader = (OGGReader*)gf_malloc(sizeof(OGGReader));
-	memset(reader, 0, sizeof(OGGReader));
-	reader->streams = gf_list_new();
-	reader->demuxer = gf_th_new("OGGDemux");
-	reader->data_buffer_ms = 1000;
-
-	plug->priv = reader;
-	return plug;
-}
-
-void OGG_DeleteDemux(void *ifce)
-{
-	GF_InputService *plug = (GF_InputService *) ifce;
-	OGGReader *read = (OGGReader*)plug->priv;
-	gf_th_del(read->demuxer);
-
-	/*just in case something went wrong*/
-	while (gf_list_count(read->streams)) {
-		OGGStream *st = (OGGStream*)gf_list_get(read->streams, 0);
-		gf_list_rem(read->streams, 0);
-		ogg_stream_clear(&st->os);
-		if (st->dsi) gf_free(st->dsi);
-		gf_free(st);
-	}
-	gf_list_del(read->streams);
-	gf_free(read);
-	gf_free(plug);
-}
-
-#endif /* !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)*/

gpac-0.8.0.tar.gz/modules/ogg/ogg_in.h Deleted

@@ -1,64 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / XIPH.org module
- *
- *  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 OGG_IN_H
-#define OGG_IN_H
-
-#include <gpac/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/thread.h>
-
-GF_InputService *OGG_LoadDemux();
-void OGG_DeleteDemux(void *ifce);
-
-
-enum
-{
-	OGG_VORBIS = 1,
-	OGG_SPEEX,
-	OGG_FLAC,
-	OGG_THEORA
-};
-
-typedef struct
-{
-	u32 type;
-	void *opaque;
-} OGGWraper;
-
-#ifdef GPAC_HAS_VORBIS
-u32 NewVorbisDecoder(GF_BaseDecoder *ifcd);
-void DeleteVorbisDecoder(GF_BaseDecoder *ifcg);
-#endif
-
-#ifdef GPAC_HAS_THEORA
-u32 NewTheoraDecoder(GF_BaseDecoder *ifcd);
-void DeleteTheoraDecoder(GF_BaseDecoder *ifcg);
-#endif
-
-#endif
-

gpac-0.8.0.tar.gz/modules/ogg/ogg_load.c Deleted

@@ -1,165 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / XIPH.org module
- *
- *  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 "ogg_in.h"
-
-
-#if !defined(__GNUC__)
-# if (defined(_WIN32_WCE) || defined (WIN32))
-#  pragma comment(lib, "libogg_static")
-#  pragma comment(lib, "libvorbis_static")
-#  pragma comment(lib, "libtheora_static")
-# endif
-#endif
-
-
-static u32 OGG_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	/*media type query*/
-	if (!esd) return ((StreamType == GF_STREAM_VISUAL) || (StreamType == GF_STREAM_AUDIO)) ? GF_CODEC_STREAM_TYPE_SUPPORTED : GF_CODEC_NOT_SUPPORTED;
-	/*video decs*/
-	if (StreamType == GF_STREAM_VISUAL) {
-#ifdef GPAC_HAS_THEORA
-		char *dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-#endif
-		switch (esd->decoderConfig->objectTypeIndication) {
-#ifdef GPAC_HAS_THEORA
-		case GPAC_OTI_MEDIA_OGG:
-			if (dsi && (esd->decoderConfig->decoderSpecificInfo->dataLength>=9)  && !strncmp((char *) &dsi[3], "theora", 6)) {
-				if (NewTheoraDecoder(dec)) return GF_CODEC_SUPPORTED;
-			}
-			return GF_CODEC_NOT_SUPPORTED;
-#endif
-		default:
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-	/*audio decs*/
-	if (StreamType == GF_STREAM_AUDIO) {
-#ifdef GPAC_HAS_VORBIS
-		char *dsi = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data : NULL;
-#endif
-		switch (esd->decoderConfig->objectTypeIndication) {
-#ifdef GPAC_HAS_VORBIS
-		case GPAC_OTI_MEDIA_OGG:
-			if (dsi && (esd->decoderConfig->decoderSpecificInfo->dataLength>=9)  && !strncmp((char *) &dsi[3], "vorbis", 6)) {
-				if (NewVorbisDecoder(dec)) return GF_CODEC_SUPPORTED;
-			}
-			return GF_CODEC_NOT_SUPPORTED;
-#endif
-		default:
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-GF_BaseDecoder *OGG_LoadDecoder()
-{
-	GF_MediaDecoder *ifce;
-	OGGWraper *wrap;
-	GF_SAFEALLOC(ifce, GF_MediaDecoder);
-	if (!ifce) return NULL;
-	GF_SAFEALLOC(wrap, OGGWraper);
-	if (!wrap) {
-		gf_free(ifce);
-		return NULL;
-	}
-	ifce->privateStack = wrap;
-	ifce->CanHandleStream = OGG_CanHandleStream;
-	GF_REGISTER_MODULE_INTERFACE(ifce, GF_MEDIA_DECODER_INTERFACE, "GPAC XIPH.org package", "gpac distribution")
-
-	/*other interfaces will be setup at run time*/
-	return (GF_BaseDecoder *)ifce;
-}
-
-void DeleteOGGDecoder(GF_BaseDecoder *ifcd)
-{
-	OGGWraper *wrap;
-	if (!ifcd)
-		return;
-	wrap = (OGGWraper *)ifcd->privateStack;
-	if (wrap) {
-		switch (wrap->type) {
-#ifdef GPAC_HAS_VORBIS
-		case OGG_VORBIS:
-			DeleteVorbisDecoder(ifcd);
-			break;
-#endif
-#ifdef GPAC_HAS_THEORA
-		case OGG_THEORA:
-			DeleteTheoraDecoder(ifcd);
-			break;
-#endif
-		default:
-			break;
-		}
-		gf_free(wrap);
-		ifcd->privateStack = NULL;
-	}
-	gf_free(ifcd);
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		GF_MEDIA_DECODER_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)OGG_LoadDemux();
-#endif
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)OGG_LoadDecoder();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
-	case GF_NET_CLIENT_INTERFACE:
-		OGG_DeleteDemux(ifce);
-		break;
-#endif
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteOGGDecoder((GF_BaseDecoder *) ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( ogg_in )

gpac-0.8.0.tar.gz/modules/ogg/theora_dec.c Deleted

@@ -1,235 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / XIPH.org module
- *
- *  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 "ogg_in.h"
-
-#ifdef GPAC_HAS_THEORA
-
-#include <theora/theora.h>
-
-typedef struct
-{
-	theora_info ti;
-	theora_state td;
-	theora_comment tc;
-	ogg_packet op;
-
-	u16 ES_ID;
-	Bool has_reconfigured;
-} TheoraDec;
-
-#define THEORACTX() TheoraDec *ctx = (TheoraDec *) ((OGGWraper *)ifcg->privateStack)->opaque
-
-static GF_Err THEO_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	ogg_packet oggpacket;
-	GF_BitStream *bs;
-
-	THEORACTX();
-	if (ctx->ES_ID) return GF_BAD_PARAM;
-
-	if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
-
-	if (esd->decoderConfig->objectTypeIndication != GPAC_OTI_MEDIA_OGG) return GF_NON_COMPLIANT_BITSTREAM;
-	if ( (esd->decoderConfig->decoderSpecificInfo->dataLength<9) || strncmp(&esd->decoderConfig->decoderSpecificInfo->data[3], "theora", 6)) return GF_NON_COMPLIANT_BITSTREAM;
-
-	oggpacket.granulepos = -1;
-	oggpacket.b_o_s = 1;
-	oggpacket.e_o_s = 0;
-	oggpacket.packetno = 0;
-
-	ctx->ES_ID = esd->ESID;
-
-	theora_info_init(&ctx->ti);
-	theora_comment_init(&ctx->tc);
-
-
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	while (gf_bs_available(bs)) {
-		oggpacket.bytes = gf_bs_read_u16(bs);
-		oggpacket.packet = gf_malloc(sizeof(char) * oggpacket.bytes);
-		gf_bs_read_data(bs, oggpacket.packet, oggpacket.bytes);
-		if (theora_decode_header(&ctx->ti, &ctx->tc, &oggpacket) < 0 ) {
-			gf_free(oggpacket.packet);
-			gf_bs_del(bs);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		gf_free(oggpacket.packet);
-	}
-	theora_decode_init(&ctx->td, &ctx->ti);
-	gf_bs_del(bs);
-	return GF_OK;
-}
-
-static GF_Err THEO_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	THEORACTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-
-	theora_clear(&ctx->td);
-	theora_info_clear(&ctx->ti);
-	theora_comment_clear(&ctx->tc);
-
-	ctx->ES_ID = 0;
-	return GF_OK;
-}
-static GF_Err THEO_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	THEORACTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->ti.width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->ti.height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->ti.width;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = (Float) ctx->ti.fps_numerator;
-		capability->cap.valueFloat /= ctx->ti.fps_denominator;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = 3*ctx->ti.width * ctx->ti.height / 2;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err THEO_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GF_Err THEO_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	ogg_packet op;
-	yuv_buffer yuv;
-	u32 i;
-	char *pYO, *pUO, *pVO;
-	unsigned char *pYD, *pUD, *pVD;
-
-	THEORACTX();
-	/*not using scalabilty*/
-	assert(ctx->ES_ID == ES_ID);
-
-	op.granulepos = -1;
-	op.b_o_s = 0;
-	op.e_o_s = 0;
-	op.packetno = 0;
-	op.packet = inBuffer;
-	op.bytes = inBufferLength;
-
-
-	*outBufferLength = 0;
-
-	if (theora_decode_packetin(&ctx->td, &op)<0) return GF_NON_COMPLIANT_BITSTREAM;
-	if (mmlevel	== GF_CODEC_LEVEL_SEEK) return GF_OK;
-	if (theora_decode_YUVout(&ctx->td, &yuv)<0) return GF_OK;
-
-	pYO = yuv.y;
-	pUO = yuv.u;
-	pVO = yuv.v;
-	pYD = outBuffer;
-	pUD = outBuffer + ctx->ti.width * ctx->ti.height;
-	pVD = outBuffer + 5 * ctx->ti.width * ctx->ti.height / 4;
-
-	for (i=0; i<(u32)yuv.y_height; i++) {
-		memcpy(pYD, pYO, sizeof(char) * yuv.y_width);
-		pYD += ctx->ti.width;
-		pYO += yuv.y_stride;
-		if (i%2) continue;
-
-		memcpy(pUD, pUO, sizeof(char) * yuv.uv_width);
-		memcpy(pVD, pVO, sizeof(char) * yuv.uv_width);
-		pUD += ctx->ti.width/2;
-		pVD += ctx->ti.width/2;
-		pUO += yuv.uv_stride;
-		pVO += yuv.uv_stride;
-	}
-	*outBufferLength = 3*ctx->ti.width*ctx->ti.height/2;
-	return GF_OK;
-}
-
-
-
-static const char *THEO_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "Theora Decoder";
-}
-
-u32 NewTheoraDecoder(GF_BaseDecoder *ifcd)
-{
-	TheoraDec *dec;
-	GF_SAFEALLOC(dec, TheoraDec);
-	((OGGWraper *)ifcd->privateStack)->opaque = dec;
-	((OGGWraper *)ifcd->privateStack)->type = OGG_THEORA;
-	/*setup our own interface*/
-	ifcd->AttachStream = THEO_AttachStream;
-	ifcd->DetachStream = THEO_DetachStream;
-	ifcd->GetCapabilities = THEO_GetCapabilities;
-	ifcd->SetCapabilities = THEO_SetCapabilities;
-	((GF_MediaDecoder*)ifcd)->ProcessData = THEO_ProcessData;
-	ifcd->GetName = THEO_GetCodecName;
-	return 1;
-}
-
-void DeleteTheoraDecoder(GF_BaseDecoder *ifcg)
-{
-	THEORACTX();
-	gf_free(ctx);
-}
-
-#endif
-

gpac-0.8.0.tar.gz/modules/ogg/vorbis_dec.c Deleted

@@ -1,278 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / XIPH.org module
- *
- *  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 "ogg_in.h"
-
-#ifdef GPAC_HAS_VORBIS
-
-#include <vorbis/codec.h>
-
-typedef struct
-{
-	vorbis_info vi;
-	vorbis_dsp_state vd;
-	vorbis_block vb;
-	vorbis_comment vc;
-	ogg_packet op;
-
-	u16 ES_ID;
-	Bool has_reconfigured;
-} VorbDec;
-
-#define VORBISCTX() VorbDec *ctx = (VorbDec *) ((OGGWraper *)ifcg->privateStack)->opaque
-
-static GF_Err VORB_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	ogg_packet oggpacket;
-	GF_BitStream *bs;
-
-	VORBISCTX();
-	if (ctx->ES_ID) return GF_BAD_PARAM;
-
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_NON_COMPLIANT_BITSTREAM;
-	if (esd->decoderConfig->objectTypeIndication != GPAC_OTI_MEDIA_OGG) return GF_NON_COMPLIANT_BITSTREAM;
-	if ((esd->decoderConfig->decoderSpecificInfo->dataLength<9) || strncmp(&esd->decoderConfig->decoderSpecificInfo->data[3], "vorbis", 6)) return GF_NON_COMPLIANT_BITSTREAM;
-
-	ctx->ES_ID = esd->ESID;
-
-	vorbis_info_init(&ctx->vi);
-	vorbis_comment_init(&ctx->vc);
-
-	oggpacket.granulepos = -1;
-	oggpacket.b_o_s = 1;
-	oggpacket.e_o_s = 0;
-	oggpacket.packetno = 0;
-
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	while (gf_bs_available(bs)) {
-		oggpacket.bytes = gf_bs_read_u16(bs);
-		oggpacket.packet = gf_malloc(sizeof(char) * oggpacket.bytes);
-		gf_bs_read_data(bs, oggpacket.packet, oggpacket.bytes);
-		if (vorbis_synthesis_headerin(&ctx->vi, &ctx->vc, &oggpacket) < 0 ) {
-			gf_free(oggpacket.packet);
-			gf_bs_del(bs);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		gf_free(oggpacket.packet);
-	}
-	vorbis_synthesis_init(&ctx->vd, &ctx->vi);
-	vorbis_block_init(&ctx->vd, &ctx->vb);
-	gf_bs_del(bs);
-
-	return GF_OK;
-}
-
-static GF_Err VORB_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	VORBISCTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-
-	vorbis_block_clear(&ctx->vb);
-	vorbis_dsp_clear(&ctx->vd);
-	vorbis_info_clear(&ctx->vi);
-	vorbis_comment_clear(&ctx->vc);
-
-	ctx->ES_ID = 0;
-	return GF_OK;
-}
-static GF_Err VORB_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	VORBISCTX();
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = vorbis_info_blocksize(&ctx->vi, 1) * 2 * ctx->vi.channels;
-		break;
-	case GF_CODEC_SAMPLERATE:
-		capability->cap.valueInt = ctx->vi.rate;
-		break;
-	case GF_CODEC_NB_CHAN:
-		capability->cap.valueInt = ctx->vi.channels;
-		break;
-	case GF_CODEC_BITS_PER_SAMPLE:
-		capability->cap.valueInt = 16;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = ctx->vi.rate / 4 / vorbis_info_blocksize(&ctx->vi, 0);
-		/*blocks are not of fixed size, so indicate a default CM size*/
-		//capability->cap.valueInt = 12 * vorbis_info_blocksize(&ctx->vi, 1) / vorbis_info_blocksize(&ctx->vi, 0);
-		break;
-	case GF_CODEC_CU_DURATION:
-		/*this CANNOT work with vorbis, blocks are not of fixed size*/
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_CHANNEL_CONFIG:
-		switch (ctx->vi.channels) {
-		case 1:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
-			break;
-		case 2:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
-			break;
-		case 3:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER;
-			break;
-		case 4:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_BACK_LEFT | GF_AUDIO_CH_BACK_RIGHT;
-			break;
-		case 5:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_BACK_LEFT | GF_AUDIO_CH_BACK_RIGHT;
-			break;
-		case 6:
-			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_BACK_LEFT | GF_AUDIO_CH_BACK_RIGHT | GF_AUDIO_CH_LFE;
-			break;
-		}
-		break;
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err VORB_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like SR changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GFINLINE void vorbis_to_intern(u32 samples, Float **pcm, char *buf, u32 channels)
-{
-	u32 i, j;
-	s32 val;
-	ogg_int16_t *ptr, *data = (ogg_int16_t*)buf ;
-	Float *mono;
-
-	for (i=0 ; i<channels ; i++) {
-		ptr = &data[i];
-		if (channels>2) {
-			/*center is third in gpac*/
-			if (i==1) ptr = &data[2];
-			/*right is 2nd in gpac*/
-			else if (i==2) ptr = &data[1];
-			/*LFE is 4th in gpac*/
-			if ((channels==6) && (i>3)) {
-				if (i==6) ptr = &data[4];	/*LFE*/
-				else ptr = &data[i+1];	/*back l/r*/
-			}
-		}
-
-		mono = pcm[i];
-		for (j=0; j<samples; j++) {
-			val = (s32) (mono[j] * 32767.f);
-			if (val > 32767) val = 32767;
-			if (val < -32768) val = -32768;
-			*ptr = val;
-			ptr += channels;
-		}
-	}
-}
-
-static GF_Err VORB_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	ogg_packet op;
-	Float **pcm;
-	u32 samples, total_samples, total_bytes;
-
-	VORBISCTX();
-	/*not using scalabilty*/
-	assert(ctx->ES_ID == ES_ID);
-
-	op.granulepos = -1;
-	op.b_o_s = 0;
-	op.e_o_s = 0;
-	op.packetno = 0;
-	op.packet = inBuffer;
-	op.bytes = inBufferLength;
-
-
-	*outBufferLength = 0;
-
-	if (vorbis_synthesis(&ctx->vb, &op) == 0)
-		vorbis_synthesis_blockin(&ctx->vd, &ctx->vb) ;
-
-	/*trust vorbis max block info*/
-	total_samples = 0;
-	total_bytes = 0;
-	while ((samples = vorbis_synthesis_pcmout(&ctx->vd, &pcm)) > 0) {
-		vorbis_to_intern(samples, pcm, (char*) outBuffer + total_bytes, ctx->vi.channels);
-		total_bytes += samples * 2 * ctx->vi.channels;
-		total_samples += samples;
-		vorbis_synthesis_read(&ctx->vd, samples);
-	}
-	*outBufferLength = total_bytes;
-	return GF_OK;
-}
-
-
-static const char *VORB_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "Vorbis Decoder";
-}
-
-u32 NewVorbisDecoder(GF_BaseDecoder *ifcd)
-{
-	VorbDec *dec;
-	GF_SAFEALLOC(dec, VorbDec);
-	((OGGWraper *)ifcd->privateStack)->opaque = dec;
-	((OGGWraper *)ifcd->privateStack)->type = OGG_VORBIS;
-	/*setup our own interface*/
-	ifcd->AttachStream = VORB_AttachStream;
-	ifcd->DetachStream = VORB_DetachStream;
-	ifcd->GetCapabilities = VORB_GetCapabilities;
-	ifcd->SetCapabilities = VORB_SetCapabilities;
-	((GF_MediaDecoder*)ifcd)->ProcessData = VORB_ProcessData;
-	ifcd->GetName = VORB_GetCodecName;
-	return 1;
-}
-
-void DeleteVorbisDecoder(GF_BaseDecoder *ifcg)
-{
-	VorbDec *ctx;
-	if (!ifcg || !ifcg->privateStack)
-		return;
-	ctx = (VorbDec *) ((OGGWraper *)ifcg->privateStack)->opaque;
-	if (ctx) {
-		gf_free(ctx);
-		((OGGWraper *)ifcg->privateStack)->opaque = NULL;
-	}
-}
-
-#endif
-

gpac-0.8.0.tar.gz/modules/opencv_is Deleted

gpac-0.8.0.tar.gz/modules/openhevc_dec Deleted

gpac-0.8.0.tar.gz/modules/openhevc_dec/Makefile Deleted

gpac-0.8.0.tar.gz/modules/openhevc_dec/openhevc_dec.c Deleted

@@ -1,988 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OpenSVC Decoder module
- *
- *  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/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/internal/media_dev.h>
-#include <libopenhevc/openhevc.h>
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-#define OPEN_SHVC
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
-#  pragma comment(lib, "openhevc")
-
-#if !defined _WIN64
-void oh_select_view_layer(OHHandle codec, int val)
-{
-}
-#endif
-
-#endif
-//
-typedef struct
-{
-	u16 ES_ID;
-	u32 width, stride, height, out_size, pixel_ar, layer, nb_threads, luma_bpp, chroma_bpp;
-
-	Bool is_init;
-	Bool had_pic;
-
-	u32 hevc_nalu_size_length;
-	u32 threading_type;
-	Bool direct_output, has_pic;
-
-	GF_ESD *esd;
-	OHHandle codec;
-	u32 nb_layers, cur_layer, prev_cur_layer;
-	u32 output_cb_size;
-
-	Bool decoder_started;
-
-	u32 frame_idx;
-	Bool pack_mode;
-	Bool reset_dec;
-	u32 dec_frames;
-	u8  chroma_format_idc;
-
-	u32 nb_views;
-	Bool force_stereo, force_stereo_reset;
-
-#ifdef  OHCONFIG_AVCBASE
-	u32 avc_base_id;
-	u32 avc_nalu_size_length;
-	char *avc_base;
-	u32 avc_base_size;
-	u32 avc_base_pts;
-#endif
-	FILE *raw_out;
-} HEVCDec;
-
-static GF_Err HEVC_ConfigurationScalableStream(HEVCDec *ctx, GF_ESD *esd)
-{
-	GF_HEVCConfig *cfg = NULL;
-	char *data;
-	u32 data_len;
-	GF_BitStream *bs;
-	u32 i, j;
-
-	if (!ctx->codec) return GF_NOT_SUPPORTED;
-	if (! esd->has_scalable_layers) return GF_OK;
-
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-		ctx->nb_layers++;
-		ctx->prev_cur_layer = ctx->cur_layer;
-		ctx->cur_layer++;
-		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
-		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
-		return GF_OK;
-	}
-
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC) {
-		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-	} else {
-		cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-	}
-
-	if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-	if (!ctx->hevc_nalu_size_length) ctx->hevc_nalu_size_length = cfg->nal_unit_size;
-	else if (ctx->hevc_nalu_size_length != cfg->nal_unit_size)
-		return GF_NON_COMPLIANT_BITSTREAM;
-
-	ctx->nb_layers++;
-	ctx->cur_layer++;
-	oh_select_active_layer(ctx->codec, ctx->nb_layers-1);
-	oh_select_view_layer(ctx->codec, ctx->nb_layers-1);
-
-#ifdef  OHCONFIG_AVCBASE
-	//LHVC mode with base AVC layer: set extradata for LHVC
-	if (ctx->avc_base_id) {
-		oh_extradata_cpy_lhvc(ctx->codec, NULL, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, 0, esd->decoderConfig->decoderSpecificInfo->dataLength);
-	} else
-#endif
-	//LHVC mode with base HEVC layer: decode the LHVC SPS/PPS/VPS
-	{
-		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);
-			for (j=0; j< gf_list_count(ar->nalus); j++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)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);
-			}
-		}
-
-		gf_bs_get_content(bs, &data, &data_len);
-		gf_bs_del(bs);
-		//the decoder may not be already started
-		if (!ctx->decoder_started) {
-			oh_start(ctx->codec);
-			ctx->decoder_started=1;
-		}
-
-		oh_decode(ctx->codec, (u8 *)data, data_len, 0);
-		if (ctx->raw_out) fwrite((u8 *)data, 1, data_len, ctx->raw_out);
-
-		gf_free(data);
-	}
-	gf_odf_hevc_cfg_del(cfg);
-	return GF_OK;
-}
-
-#if defined(OHCONFIG_AVCBASE) && !defined(GPAC_DISABLE_LOG)
-void openhevc_log_callback(void *udta, int l, const char*fmt, va_list vl)
-{
-	u32 level = GF_LOG_DEBUG;
-	if (l <= OHEVC_LOG_ERROR) l = GF_LOG_ERROR;
-	else if (l <= OHEVC_LOG_WARNING) l = GF_LOG_WARNING;
-	else if (l <= OHEVC_LOG_INFO) l = GF_LOG_INFO;
-	else if (l >= OHEVC_LOG_VERBOSE) return;
-
-	if (gf_log_tool_level_on(GF_LOG_CODEC, level)) {
-		gf_log_va_list(level, GF_LOG_CODEC, fmt, vl);
-	}
-}
-#endif
-
-
-static GF_Err HEVC_ConfigureStream(HEVCDec *ctx, GF_ESD *esd)
-{
-	u32 i, j, stride_mul=1;
-	ctx->ES_ID = esd->ESID;
-	ctx->width = ctx->height = ctx->out_size = ctx->luma_bpp = ctx->chroma_bpp = ctx->chroma_format_idc = 0;
-
-	ctx->nb_layers = 1;
-	ctx->cur_layer = 1;
-
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC)
-#ifdef  OHCONFIG_AVCBASE
-		ctx->avc_base_id=esd->ESID;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-
-	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-#ifdef  OHCONFIG_AVCBASE
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
-			GF_AVCConfig *avcc = NULL;
-			AVCState avc;
-			memset(&avc, 0, sizeof(AVCState));
-
-			avcc = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
-			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);
-				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;
-				ctx->chroma_bpp = avcc->chroma_bit_depth;
-				ctx->chroma_format_idc = avcc->chroma_format;
-			}
-			gf_odf_avc_cfg_del(avcc);
-		} else
-
-#endif
-	{
-		GF_HEVCConfig *hvcc = NULL;
-		HEVCState hevc;
-		memset(&hevc, 0, sizeof(HEVCState));
-
-		hvcc = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-		if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->hevc_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);
-			for (j=0; j< gf_list_count(ar->nalus); j++) {
-				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)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);
-					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);
-					ctx->chroma_bpp = MAX(hevc.sps[idx].bit_depth_chroma, ctx->chroma_bpp);
-					ctx->chroma_format_idc  = hevc.sps[idx].chroma_format_idc;
-
-					if (hdr & 0x1f8) {
-						ctx->nb_layers ++;
-					}
-				}
-				else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-					gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
-				}
-				else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-					gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
-				}
-			}
-		}
-		gf_odf_hevc_cfg_del(hvcc);
-	}
-
-	}
-
-#ifdef  OHCONFIG_AVCBASE
-	if (ctx->avc_base_id) {
-		ctx->codec = oh_init_lhvc(ctx->nb_threads, ctx->threading_type);
-	} else
-#endif
-	{
-		ctx->codec = oh_init(ctx->nb_threads, ctx->threading_type);
-	}
-
-#if defined(OHCONFIG_AVCBASE) && !defined(GPAC_DISABLE_LOG)
-
-	if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG) ) {
-		oh_set_log_level(ctx->codec, OHEVC_LOG_DEBUG);
-	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_INFO) ) {
-		oh_set_log_level(ctx->codec, OHEVC_LOG_INFO);
-	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_WARNING) ) {
-		oh_set_log_level(ctx->codec, OHEVC_LOG_WARNING);
-	} else {
-		oh_set_log_level(ctx->codec, OHEVC_LOG_ERROR);
-	}
-	oh_set_log_callback(ctx->codec, openhevc_log_callback);
-#endif
-
-	if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		if (esd->has_scalable_layers) {
-			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);
-		} else {
-			oh_select_active_layer(ctx->codec, 1);
-			oh_select_view_layer(ctx->codec, 0);
-		}
-
-#ifdef  OHCONFIG_AVCBASE
-		if (ctx->avc_base_id) {
-			oh_extradata_cpy_lhvc(ctx->codec, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, NULL, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
-		} else
-#endif
-			oh_extradata_cpy(ctx->codec, (u8 *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-	}else{
-		//decode and display layer 0 by default - will be changed when attaching enhancement layers
-
-		//has_scalable_layers is set, the esd describes a set of HEVC stream but we don't know how many - for now only two decoders so easy,
-		//but should be fixed in the future
-		if (esd->has_scalable_layers) {
-			ctx->nb_layers = 2;
-			ctx->cur_layer = 2;
-		}
-		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
-		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
-	}
-
-	//in case we don't have a config record
-	if (!ctx->chroma_format_idc) ctx->chroma_format_idc = 1;
-
-	//we start decoder on the first frame
-
-	//FIXME - we need to get the views info from the decoder ...
-	if (ctx->nb_views>1) stride_mul = ctx->nb_layers;
-	else if (ctx->force_stereo && ctx->nb_layers>1)
-		stride_mul = ctx->nb_layers;
-
-	ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
-	if ( ctx->chroma_format_idc  == 1) { // 4:2:0
-		ctx->out_size = stride_mul * ctx->stride * ctx->height * 3 / 2;
-	}
-	else if ( ctx->chroma_format_idc  == 2) { // 4:2:2
-		ctx->out_size = stride_mul * ctx->stride * ctx->height * 2 ;
-	}
-	else if ( ctx->chroma_format_idc  == 3) { // 4:4:4
-		ctx->out_size = stride_mul * ctx->stride * ctx->height * 3;
-	}
-	else {
-		return GF_NOT_SUPPORTED;
-	}
-
-
-	ctx->dec_frames = 0;
-	return GF_OK;
-}
-
-static GF_Err HEVC_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_SystemRTInfo rti;
-	const char *sOpt;
-	u32 nb_threads = 1;
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	/*scalable layer, configure enhancement only*/
-	if (esd->dependsOnESID) {
-		HEVC_ConfigurationScalableStream(ctx, esd);
-		return GF_OK;
-	}
-
-	if (gf_sys_get_rti(0, &rti, 0) ) {
-		nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
-	}
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "Compositor", "NumViews");
-	ctx->nb_views = atoi(sOpt);
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads");
-	if (!sOpt) {
-		char szO[100];
-		sprintf(szO, "%d", nb_threads);
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads", szO);
-		ctx->nb_threads = nb_threads;
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenHEVC] Initializing with %d threads\n", ctx->nb_threads));
-	} else {
-		ctx->nb_threads = atoi(sOpt);
-		if (ctx->nb_threads > nb_threads) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[OpenHEVC] Initializing with %d threads but only %d available cores detected on the system\n", ctx->nb_threads, rti.nb_cores));
-		}
-	}
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceStereo");
-	if (sOpt && !strcmp(sOpt, "yes")) ctx->force_stereo = GF_TRUE;
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType");
-	if (sOpt && !strcmp(sOpt, "wpp")) ctx->threading_type = 2;
-	else if (sOpt && !strcmp(sOpt, "frame+wpp")) ctx->threading_type = 4;
-	else {
-		ctx->threading_type = 1;
-		if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType", "frame");
-	}
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits");
-	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits", "4");
-	if (sOpt) ctx->output_cb_size = atoi(sOpt);
-	if (!ctx->output_cb_size) ctx->output_cb_size = 4;
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR");
-	if (sOpt && !strcmp(sOpt, "yes") && !ctx->direct_output ) ctx->pack_mode = GF_TRUE;
-	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "PackHFR", "no");
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ResetAtReinit");
-	if (sOpt && !strcmp(sOpt, "yes") ) ctx->reset_dec = GF_TRUE;
-	else if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ResetAtReinit", "no");
-
-	if (!ctx->raw_out) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "InputRipFile");
-		if (sOpt) ctx->raw_out = fopen(sOpt, "wb");
-	}
-
-	ctx->esd = esd;
-	return HEVC_ConfigureStream(ctx, esd);
-}
-
-
-static GF_Err HEVC_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	if (ctx->codec) {
-		oh_close(ctx->codec);
-		ctx->codec = NULL;
-	}
-	ctx->is_init = GF_FALSE;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-
-static u32 HEVC_GetPixelFormat( u32 luma_bpp, u8 chroma_format_idc)
-{
-	u32 ret = 0;
-	if (chroma_format_idc == 1)
-	{
-		ret =  (luma_bpp==10) ? GF_PIXEL_YV12_10 : GF_PIXEL_YV12;
-	}
-	else if (chroma_format_idc == 2)
-	{
-		ret = (luma_bpp==10) ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
-	}
-	else if (chroma_format_idc == 3)
-	{
-		ret = (luma_bpp==10) ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
-	}
-
-	return ret;
-
-}
-
-
-static GF_Err HEVC_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		if (ctx->pack_mode) {
-			capability->cap.valueInt *= 2;
-		}
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		if (ctx->pack_mode) {
-			capability->cap.valueInt *= 2;
-		} else if (ctx->force_stereo && ctx->cur_layer>1) {
-			capability->cap.valueInt *= 2;
-		}
-
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		if (ctx->pack_mode) {
-			capability->cap.valueInt *= 2;
-		}
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		if (ctx->pack_mode) {
-			capability->cap.valueInt *= 4;
-		}
-		break;
-	case GF_CODEC_NBVIEWS:
-		capability->cap.valueInt = ctx->force_stereo ? 1 : ctx->nb_views;
-		break;
-	case GF_CODEC_NBLAYERS:
-		capability->cap.valueInt = ctx->force_stereo ? 1 : ctx->nb_layers;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = HEVC_GetPixelFormat(ctx->luma_bpp, ctx->chroma_format_idc);
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = ctx->output_cb_size;
-		break;
-	case GF_CODEC_WANTS_THREAD:
-		capability->cap.valueBool= GF_TRUE;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_TRUSTED_CTS:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_RAW_MEMORY:
-		capability->cap.valueBool = GF_TRUE;
-		break;
-	case GF_CODEC_FORCE_ANNEXB:
-	{
-		const char *opt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceAnnexB");
-		if (!opt)
-			gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ForceAnnexB", "no");
-		else if ( !strcmp(opt, "yes"))
-			capability->cap.valueBool = GF_TRUE;
-	}
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-
-static GF_Err HEVC_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	switch (capability.CapCode) {
-	case GF_CODEC_WAIT_RAP:
-		if (ctx->reset_dec && ctx->dec_frames) {
-			u32 cl = ctx->cur_layer;
-			u32 nl = ctx->nb_layers;
-
-			//quick hack, we have an issue with openHEVC resuming after being flushed ...
-			ctx->had_pic = GF_FALSE;
-			oh_close(ctx->codec);
-			ctx->codec = NULL;
-			ctx->decoder_started = GF_FALSE;
-			ctx->is_init = GF_FALSE;
-			HEVC_ConfigureStream(ctx, ctx->esd);
-			ctx->cur_layer = cl;
-			ctx->nb_layers = nl;
-			if (ctx->codec) {
-				oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
-				oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
-			}
-		}
-		return GF_OK;
-	case GF_CODEC_MEDIA_LAYER_DETACH:
-		if (ctx->cur_layer<=1) return GF_OK;
-		ctx->cur_layer--;
-		if (ctx->nb_layers>1) ctx->nb_layers--;
-		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
-		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
-		ctx->force_stereo_reset = ctx->force_stereo;
-		return GF_OK;
-	case GF_CODEC_MEDIA_SWITCH_QUALITY:
-		if (ctx->nb_layers==1) return GF_OK;
-		if (ctx->nb_layers==1 || ctx->nb_views!=1) return GF_OK;
-		/*switch up*/
-		if (capability.cap.valueInt > 0) {
-			if (ctx->cur_layer>=ctx->nb_layers) return GF_OK;
-			ctx->cur_layer++;
-		} else {
-			if (ctx->cur_layer<=1) return GF_OK;
-			ctx->cur_layer--;
-		}
-		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
-		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
-		ctx->force_stereo_reset = ctx->force_stereo;
-		return GF_OK;
-	case GF_CODEC_RAW_MEMORY:
-		ctx->direct_output = GF_TRUE;
-		ctx->pack_mode = GF_FALSE;
-		return GF_OK;
-	case GF_CODEC_CAN_INIT:
-		if (!ctx->decoder_started && ctx->codec) {
-			ctx->decoder_started=1;
-			oh_start(ctx->codec);
-		}
-		return GF_OK;
-	}
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-
-}
-
-static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength, u32 *CTS)
-{
-	unsigned int a_w, a_h, a_stride, bit_depth;
-	OHFrame_cpy openHevcFrame_FL, openHevcFrame_SL;
-	int        chromat_format;
-
-	if (ctx->direct_output){
-		oh_frameinfo_update(ctx->codec, &openHevcFrame_FL.frame_par);
-	}else{
-		oh_cropped_frameinfo(ctx->codec, &openHevcFrame_FL.frame_par);
-		if (ctx->nb_layers == 2) {
-			int res = oh_cropped_frameinfo_from_layer(ctx->codec, &openHevcFrame_SL.frame_par, 1);
-			if ( (res==1) && (ctx->prev_cur_layer != ctx->cur_layer)) {
-				ctx->prev_cur_layer = ctx->cur_layer;
-				ctx->force_stereo_reset = GF_TRUE;
-			}
-		}
-	}
-
-	a_w      = openHevcFrame_FL.frame_par.width;
-	a_h      = openHevcFrame_FL.frame_par.height;
-	a_stride = openHevcFrame_FL.frame_par.linesize_y;
-	bit_depth = openHevcFrame_FL.frame_par.bitdepth;
-	chromat_format = openHevcFrame_FL.frame_par.chromat_format;
-	*CTS = (u32) openHevcFrame_FL.frame_par.pts;
-
-	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)) )
-	{
-		/*u32 stride_mul = 1;*/
-		ctx->width = a_w;
-		ctx->stride = a_stride;
-		ctx->height = a_h;
-		ctx->force_stereo_reset = GF_FALSE;
-
-		/*if (ctx->nb_views>1) stride_mul = ctx->cur_layer;
-		else if (ctx->force_stereo && ctx->cur_layer>1)
-			stride_mul = ctx->cur_layer;*/
-
-		if( chromat_format == OH_YUV420 ) {
-			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		} else if  ( chromat_format == OH_YUV422 ) {
-			ctx->out_size = ctx->stride * ctx->height * 2;
-		} 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->cur_layer==2)  && !ctx->direct_output && (ctx->nb_views>1 || ctx->force_stereo) ){
-			ctx->out_size *= 2;
-		}
-
-		ctx->had_pic = GF_TRUE;
-		ctx->luma_bpp = ctx->chroma_bpp = bit_depth;
-		ctx->chroma_format_idc = chromat_format + 1;
-		/*always force layer resize*/
-		*outBufferLength = ctx->out_size;
-
-		return GF_BUFFER_TOO_SMALL;
-	}
-	if (ctx->direct_output) {
-		*outBufferLength = ctx->out_size;
-		ctx->has_pic = GF_TRUE;
-		return GF_OK;
-	}
-
-
-	if (ctx->pack_mode) {
-		OHFrame openHFrame;
-		u8 *pY, *pU, *pV;
-
-		u32 idx_w, idx_h;
-		idx_w = ((ctx->frame_idx==0) || (ctx->frame_idx==2)) ? 0 : ctx->stride;
-		idx_h = ((ctx->frame_idx==0) || (ctx->frame_idx==1)) ? 0 : ctx->height*2*ctx->stride;
-
-		pY = (u8*) (outBuffer + idx_h + idx_w );
-
-
-		if (chromat_format == OH_YUV422) {
-			pU = (u8*)(outBuffer + 4 * ctx->stride  * ctx->height + idx_w / 2 + idx_h / 2);
-			pV = (u8*)(outBuffer + 4 * (3 * ctx->stride * ctx->height /2)  + idx_w / 2 + idx_h / 2);
-		} else if (chromat_format == OH_YUV444) {
-			pU = (u8*)(outBuffer + 4 * ctx->stride * ctx->height + idx_w + idx_h);
-			pV = (u8*)(outBuffer + 4 * ( 2 * ctx->stride * ctx->height) + idx_w + idx_h);
-		} else {
-			pU = (u8*)(outBuffer + 2 * ctx->stride * 2 * ctx->height + idx_w / 2 + idx_h / 4);
-			pV = (u8*)(outBuffer + 4 * ( 5 *ctx->stride  * ctx->height  / 4) + idx_w / 2 + idx_h / 4);
-
-		}
-
-		*outBufferLength = 0;
-		if (oh_output_update(ctx->codec, 1, &openHFrame)) {
-			u32 i, s_stride, hs_stride, qs_stride, d_stride, dd_stride, hd_stride;
-
-			s_stride = openHFrame.frame_par.linesize_y;
-			qs_stride = s_stride / 4;
-			hs_stride = s_stride / 2;
-
-			d_stride = ctx->stride;
-			dd_stride = 2*ctx->stride;
-			hd_stride = ctx->stride/2;
-
-			if (chromat_format == OH_YUV422) {
-
-				for (i = 0; i < ctx->height; i++) {
-
-					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
-					pY += dd_stride;
-
-					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*hs_stride, hd_stride);
-					pU += d_stride;
-
-					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*hs_stride, hd_stride);
-					pV += d_stride;
-				}
-			}
-			else if (chromat_format == OH_YUV444) {
-
-				for (i = 0; i < ctx->height; i++) {
-
-					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
-					pY += dd_stride;
-
-					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*s_stride, d_stride);
-					pU += dd_stride;
-
-					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*s_stride, d_stride);
-					pV += dd_stride;
-				}
-			}
-			else {
-				for (i = 0; i<ctx->height; i++) {
-					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
-					pY += dd_stride;
-
-					if (!(i % 2)) {
-						memcpy(pU, (u8 *)openHFrame.data_cb_p + i*qs_stride, hd_stride);
-						pU += d_stride;
-
-						memcpy(pV, (u8 *)openHFrame.data_cr_p + i*qs_stride, hd_stride);
-						pV += d_stride;
-					}
-				}
-			}
-
-			ctx->frame_idx++;
-			if (ctx->frame_idx==4) {
-				*outBufferLength = 4 * ctx->out_size;
-				ctx->frame_idx = 0;
-			}
-		}
-		return GF_OK;
-	}
-
-
-	*outBufferLength = 0;
-	openHevcFrame_FL.data_y = (void*) outBuffer;
-	if ((ctx->cur_layer==2)  && !ctx->direct_output && (ctx->nb_views>1 || ctx->force_stereo) ){
-		int out1, out2;
-		if( chromat_format == OH_YUV420){
-			openHevcFrame_SL.data_y = (void*) (outBuffer +  ctx->stride * ctx->height);
-			openHevcFrame_FL.data_cb = (void*) (outBuffer + 2*ctx->stride * ctx->height);
-			openHevcFrame_SL.data_cb = (void*) (outBuffer +  9*ctx->stride * ctx->height/4);
-			openHevcFrame_FL.data_cr = (void*) (outBuffer + 5*ctx->stride * ctx->height/2);
-			openHevcFrame_SL.data_cr = (void*) (outBuffer + 11*ctx->stride * ctx->height/4);
-		}
-
-		out1 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_FL, 0);
-		out2 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_SL, 1);
-
-		if (out1 && out2) *outBufferLength = ctx->out_size*2;
-
-	}else{
-		openHevcFrame_FL.data_cb = (void*) (outBuffer + ctx->stride * ctx->height);
-		if( chromat_format == OH_YUV420) {
-			openHevcFrame_FL.data_cr = (void*) (outBuffer + 5*ctx->stride * ctx->height/4);
-		} else if (chromat_format == OH_YUV422) {
-			openHevcFrame_FL.data_cr = (void*) (outBuffer + 3*ctx->stride * ctx->height/2);
-		} else if ( chromat_format == OH_YUV444) {
-			openHevcFrame_FL.data_cr = (void*) (outBuffer + 2*ctx->stride * ctx->height);
-		}
-
-		if (oh_output_cropped_cpy(ctx->codec, &openHevcFrame_FL))
-			*outBufferLength = ctx->out_size;
-	}
-	return GF_OK;
-}
-
-static GF_Err HEVC_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	GF_Err e;
-	int got_pic;
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	if (!ctx->decoder_started) {
-		oh_start(ctx->codec);
-		ctx->decoder_started=1;
-	}
-
-	if (!inBuffer) {
-#ifdef  OHCONFIG_AVCBASE
-		if (ctx->avc_base_id)
-			got_pic = oh_decode_lhvc(ctx->codec, NULL, NULL, 0, 0, 0, 0);
-		else
-#endif
-			got_pic = oh_decode(ctx->codec, NULL, 0, 0);
-
-		if ( got_pic ) {
-			return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
-		}
-		return GF_OK;
-	}
-
-	if (!ES_ID) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	*outBufferLength = 0;
-
-	if (ctx->had_pic) {
-		ctx->had_pic = GF_FALSE;
-		return HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
-	}
-	ctx->dec_frames++;
-	got_pic = 0;
-
-#ifdef  OHCONFIG_AVCBASE
-	if (ctx->avc_base_id) {
-		if (ctx->avc_base_id == ES_ID) {
-			if (ctx->cur_layer<=1) {
-				got_pic = oh_decode_lhvc(ctx->codec, (u8 *) inBuffer, NULL, inBufferLength, 0, *CTS, 0);
-				if (ctx->avc_base) {
-					gf_free(ctx->avc_base);
-					ctx->avc_base=NULL;
-					ctx->avc_base_size=0;
-					ctx->avc_base_pts=0;
-				}
-			} else {
-				ctx->avc_base = gf_realloc(ctx->avc_base, inBufferLength);
-				memcpy(ctx->avc_base, inBuffer, inBufferLength);
-				ctx->avc_base_size = inBufferLength;
-				ctx->avc_base_pts = *CTS;
-			}
-		} else if (ctx->cur_layer>1) {
-			got_pic = oh_decode_lhvc(ctx->codec, (u8*)ctx->avc_base, (u8 *) inBuffer, ctx->avc_base_size, inBufferLength, ctx->avc_base_pts, *CTS);
-			if (ctx->avc_base) {
-				gf_free(ctx->avc_base);
-				ctx->avc_base = NULL;
-				ctx->avc_base_size = 0;
-			}
-		}
-	}
-	else
-#endif
-		got_pic = oh_decode(ctx->codec, (u8 *) inBuffer, inBufferLength, *CTS);
-
-	if (ctx->raw_out) fwrite((u8 *) inBuffer, 1, inBufferLength, ctx->raw_out);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Decode CTS %d - size %d - got pic %d\n", *CTS, inBufferLength, got_pic));
-	if (got_pic>0) {
-		e = HEVC_flush_picture(ctx, outBuffer, outBufferLength, CTS);
-		if (e) return e;
-	}
-
-	return GF_OK;
-}
-
-
-static GF_Err HEVC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ESID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
-{
-	s32 res;
-	OHFrame openHevcFrame;
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	if (!ctx->has_pic) return GF_BAD_PARAM;
-	ctx->has_pic = GF_FALSE;
-
-	res = oh_output_update(ctx->codec, 1, &openHevcFrame);
-	if ((res<=0) || !openHevcFrame.data_y_p || !openHevcFrame.data_cb_p || !openHevcFrame.data_cr_p)
-		return GF_SERVICE_ERROR;
-
-	*pY_or_RGB = (u8 *) openHevcFrame.data_y_p;
-	*pU = (u8 *) openHevcFrame.data_cb_p;
-	*pV = (u8 *) openHevcFrame.data_cr_p;
-	return GF_OK;
-}
-
-
-
-static u32 HEVC_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_HEVC:
-	case GPAC_OTI_VIDEO_LHVC:
-		return GF_CODEC_SUPPORTED;
-	case GPAC_OTI_VIDEO_AVC:
-#ifdef  OHCONFIG_AVCBASE
-		return GF_CODEC_MAYBE_SUPPORTED;
-#else
-		return GF_CODEC_NOT_SUPPORTED;
-#endif
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *HEVC_GetCodecName(GF_BaseDecoder *dec)
-{
-	HEVCDec *ctx = (HEVCDec*) dec->privateStack;
-#ifdef  OHCONFIG_AVCBASE
-	if (ctx->avc_base_id) {
-		if (ctx->cur_layer==1) return "OpenHEVC v"NV_VERSION" - H264";
-		else return "OpenHEVC v"NV_VERSION" - H264+LHVC";
-	}
-	if (ctx->cur_layer==1) return "OpenHEVC v"NV_VERSION;
-	else return "OpenHEVC v"NV_VERSION" - LHVC";
-#else
-	return openhevc_ident();
-#endif
-}
-
-GF_BaseDecoder *NewHEVCDec()
-{
-	GF_MediaDecoder *ifcd;
-	HEVCDec *dec;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	if (!ifcd) return NULL;
-	GF_SAFEALLOC(dec, HEVCDec);
-	if (!dec) {
-		gf_free(ifcd);
-		return NULL;
-	}
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "HEVC Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = HEVC_AttachStream;
-	ifcd->DetachStream = HEVC_DetachStream;
-	ifcd->GetCapabilities = HEVC_GetCapabilities;
-	ifcd->SetCapabilities = HEVC_SetCapabilities;
-	ifcd->GetName = HEVC_GetCodecName;
-	ifcd->CanHandleStream = HEVC_CanHandleStream;
-	ifcd->ProcessData = HEVC_ProcessData;
-	ifcd->GetOutputBuffer = HEVC_GetOutputBuffer;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteHEVCDec(GF_BaseDecoder *ifcg)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	if (ctx->raw_out) fclose(ctx->raw_out);
-
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-#endif
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewHEVCDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteHEVCDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( openhevc )

gpac-0.8.0.tar.gz/modules/opensvc_dec Deleted

gpac-0.8.0.tar.gz/modules/opensvc_dec/Makefile Deleted

gpac-0.8.0.tar.gz/modules/opensvc_dec/opensvc_dec.c Deleted

@@ -1,458 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OpenSVC Decoder module
- *
- *  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/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/internal/media_dev.h>
-
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-#  pragma comment(lib, "OpenSVCDecoder")
-#endif
-
-#include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
-
-typedef struct
-{
-	u16 ES_ID;
-	u16 baseES_ID;
-	u32 width, stride, height, out_size, pixel_ar;
-
-	u32 nalu_size_length;
-	Bool init_layer_set;
-	Bool state_found;
-
-	/*OpenSVC things*/
-	void *codec;
-	int CurrentDqId;
-	int MaxDqId;
-	int DqIdTable[8];
-	int TemporalId;
-	int TemporalCom;
-} OSVCDec;
-
-static GF_Err OSVC_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	u32 i, count;
-	s32 res;
-	OPENSVCFRAME Picture;
-	int Layer[4];
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-
-	/*todo: we should check base layer of this stream is indeed our base layer*/
-	if (!ctx->ES_ID) {
-		ctx->ES_ID = esd->ESID;
-		ctx->width = ctx->height = ctx->out_size = 0;
-		if (!esd->dependsOnESID) ctx->baseES_ID = esd->ESID;
-	}
-
-	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-		if (!esd->dependsOnESID) {
-			ctx->nalu_size_length = cfg->nal_unit_size;
-			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
-		}
-
-		/*decode all NALUs*/
-		count = gf_list_count(cfg->sequenceParameterSets);
-		SetCommandLayer(Layer, 255, 0, &res, 0);//bufindex can be reset without pb
-		for (i=0; i<count; i++) {
-			u32 w=0, h=0, sid;
-			s32 par_n=0, par_d=0;
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)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);
-#endif
-			/*by default use the base layer*/
-			if (!i) {
-				if ((ctx->width<w) || (ctx->height<h)) {
-					ctx->width = w;
-					ctx->height = h;
-					if ( ((s32)par_n>0) && ((s32)par_d>0) )
-						ctx->pixel_ar = (par_n<<16) || par_d;
-				}
-			}
-			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, Layer);
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding SPS %d\n", res));
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", slc->id, slc->data[0] & 0x1F, slc->size));
-		}
-
-		count = gf_list_count(cfg->pictureParameterSets);
-		for (i=0; i<count; i++) {
-			u32 sps_id, pps_id;
-			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, i);
-			gf_avc_get_pps_info(slc->data, slc->size, &pps_id, &sps_id);
-			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, Layer);
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding PPS %d\n", res));
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", pps_id, slc->data[0] & 0x1F, slc->size, sps_id));
-		}
-		ctx->state_found = GF_TRUE;
-		gf_odf_avc_cfg_del(cfg);
-	} else {
-		if (ctx->nalu_size_length) {
-			return GF_NOT_SUPPORTED;
-		}
-		ctx->nalu_size_length = 0;
-		if (!esd->dependsOnESID) {
-			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
-		}
-		ctx->pixel_ar = (1<<16) || 1;
-	}
-	ctx->stride = ctx->width + 32;
-	ctx->CurrentDqId = ctx->MaxDqId = 0;
-	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-	return GF_OK;
-}
-static GF_Err OSVC_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-
-	if (ctx->codec) SVCDecoder_close(ctx->codec);
-	ctx->codec = NULL;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-static GF_Err OSVC_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err OSVC_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-	switch (capability.CapCode) {
-	case GF_CODEC_MEDIA_SWITCH_QUALITY:
-
-		if (capability.cap.valueInt) {
-			if (ctx->CurrentDqId < ctx->MaxDqId)
-				// set layer up (command=1)
-				UpdateLayer( ctx->DqIdTable, &ctx->CurrentDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
-		} else {
-			if (ctx->CurrentDqId > 0)
-				// set layer down (command=0)
-				UpdateLayer( ctx->DqIdTable, &ctx->CurrentDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
-		}
-		return GF_OK;
-	}
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-
-}
-
-static GF_Err OSVC_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-
-	s32 got_pic;
-	OPENSVCFRAME pic;
-	int Layer[4];
-	u32 i, nalu_size, sc_size;
-	u8 *ptr;
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-	u32 curMaxDqId = ctx->MaxDqId;
-
-	if (!ES_ID || !ctx->codec) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	ctx->MaxDqId = GetDqIdMax((unsigned char *) inBuffer, inBufferLength, ctx->nalu_size_length, ctx->DqIdTable, ctx->nalu_size_length ? 1 : 0);
-	if (!ctx->init_layer_set) {
-		//AVC stream in a h264 file
-		if (ctx->MaxDqId == -1)
-			ctx->MaxDqId = 0;
-
-		ctx->CurrentDqId = ctx->MaxDqId;
-		ctx->init_layer_set = GF_TRUE;
-	}
-	if (curMaxDqId != ctx->MaxDqId)
-		ctx->CurrentDqId = ctx->MaxDqId;
-	/*decode only current layer*/
-	SetCommandLayer(Layer, ctx->MaxDqId, ctx->CurrentDqId, &ctx->TemporalCom, ctx->TemporalId);
-
-	got_pic = 0;
-	nalu_size = 0;
-	ptr = (u8 *) inBuffer;
-	sc_size = 0;
-
-	if (!ctx->nalu_size_length) {
-		u32 size;
-		size = gf_media_nalu_next_start_code((u8 *) inBuffer, inBufferLength, &sc_size);
-		if (sc_size) {
-			ptr += size+sc_size;
-			assert(inBufferLength >= size+sc_size);
-			inBufferLength -= size+sc_size;
-		} else {
-			/*no annex-B start-code found, discard */
-			*outBufferLength = 0;
-			return GF_OK;
-		}
-	}
-
-	while (inBufferLength) {
-		if (ctx->nalu_size_length) {
-			for (i=0; i<ctx->nalu_size_length; i++) {
-				nalu_size = (nalu_size<<8) + ptr[i];
-			}
-			ptr += ctx->nalu_size_length;
-		} else {
-			nalu_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
-		}
-#ifndef GPAC_DISABLE_LOG
-		switch (ptr[0] & 0x1F) {
-		case GF_AVC_NALU_SEQ_PARAM:
-		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-		{
-			u32 sps_id;
-			gf_avc_get_sps_info((char *)ptr, nalu_size, &sps_id, NULL, NULL, NULL, NULL);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", ES_ID, sps_id, ptr[0] & 0x1F, nalu_size));
-		}
-		break;
-		case GF_AVC_NALU_PIC_PARAM:
-		{
-			u32 sps_id, pps_id;
-			gf_avc_get_pps_info((char *)ptr, nalu_size, &pps_id, &sps_id);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", ES_ID, pps_id, ptr[0] & 0x1F, nalu_size, sps_id));
-		}
-		break;
-		default:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] ES%d: NALU code=\"%d\" size=\"%d\"\n", ES_ID, ptr[0] & 0x1F, nalu_size));
-		}
-#endif
-		if (!ctx->state_found) {
-			u8 nal_type = (ptr[0] & 0x1F) ;
-			switch (nal_type) {
-			case GF_AVC_NALU_SEQ_PARAM:
-			case GF_AVC_NALU_PIC_PARAM:
-				if (ctx->baseES_ID == ES_ID)
-					ctx->state_found = GF_TRUE;
-				break;
-			}
-		}
-
-		if (ctx->state_found) {
-			if (!got_pic)
-				got_pic = decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
-			else
-				decodeNAL(ctx->codec, ptr, nalu_size, &pic, Layer);
-		}
-
-		ptr += nalu_size;
-		if (ctx->nalu_size_length) {
-			if (inBufferLength < nalu_size + ctx->nalu_size_length) break;
-			inBufferLength -= nalu_size + ctx->nalu_size_length;
-		} else {
-			if (!sc_size || (inBufferLength < nalu_size + sc_size)) break;
-			inBufferLength -= nalu_size + sc_size;
-			ptr += sc_size;
-		}
-	}
-
-	if (got_pic!=1) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-
-	if ((curMaxDqId != ctx->MaxDqId) || (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 ));
-		ctx->width = pic.Width;
-		ctx->stride = pic.Width + 32;
-		ctx->height = pic.Height;
-		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		/*always force layer resize*/
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-	*outBufferLength = ctx->out_size;
-	memcpy(outBuffer, pic.pY[0], ctx->stride*ctx->height);
-	memcpy(outBuffer + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
-	memcpy(outBuffer + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);
-
-	return GF_OK;
-}
-
-static u32 OSVC_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-	case GPAC_OTI_VIDEO_SVC:
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			Bool is_svc = GF_FALSE;
-			u32 i, count;
-			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
-
-			if (esd->has_scalable_layers)
-				is_svc = GF_TRUE;
-
-			/*decode all NALUs*/
-			count = gf_list_count(cfg->sequenceParameterSets);
-			for (i=0; i<count; i++) {
-				GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
-				u8 nal_type = slc->data[0] & 0x1F;
-
-				if (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
-					is_svc = GF_TRUE;
-					break;
-				}
-			}
-			gf_odf_avc_cfg_del(cfg);
-			return is_svc ? GF_CODEC_SUPPORTED : GF_CODEC_MAYBE_SUPPORTED;
-		}
-		return esd->has_scalable_layers ? GF_CODEC_SUPPORTED : GF_CODEC_MAYBE_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *OSVC_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "OpenSVC Decoder";
-}
-
-GF_BaseDecoder *NewOSVCDec()
-{
-	GF_MediaDecoder *ifcd;
-	OSVCDec *dec;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	GF_SAFEALLOC(dec, OSVCDec);
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "OpenSVC Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = OSVC_AttachStream;
-	ifcd->DetachStream = OSVC_DetachStream;
-	ifcd->GetCapabilities = OSVC_GetCapabilities;
-	ifcd->SetCapabilities = OSVC_SetCapabilities;
-	ifcd->GetName = OSVC_GetCodecName;
-	ifcd->CanHandleStream = OSVC_CanHandleStream;
-	ifcd->ProcessData = OSVC_ProcessData;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteOSVCDec(GF_BaseDecoder *ifcg)
-{
-	OSVCDec *ctx = (OSVCDec*) ifcg->privateStack;
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewOSVCDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteOSVCDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( opensvc )
-

gpac-0.8.0.tar.gz/modules/osd Deleted

gpac-0.8.0.tar.gz/modules/osd/osd.c Deleted

@@ -1,306 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2011-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Sampe On-Scvreen Display 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/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/nodes_mpeg4.h>
-
-
-typedef struct
-{
-	GF_ObjectManager *odm;
-	GF_Terminal *term;
-	GF_TermEventFilter evt_filter;
-
-	/*some of our nodes*/
-	M_Switch *visible;
-	M_Transform2D *transform;
-	M_CompositeTexture2D *ct2d;
-	M_Text *text;
-
-	char statBuffer[100];
-	u32 refresh_time_ms;
-	GF_SystemRTInfo rti;
-} GF_OSD;
-
-#if 0
-static GFINLINE GF_Node *create_node(GF_OSD *osd, u32 tag, GF_Node *par)
-{
-	GF_Node *n = gf_node_new(osd->odm->subscene->graph, tag);
-	if (n) {
-		gf_node_init(n);
-		if (par) {
-			gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n);
-			gf_node_register(n, par);
-		}
-	}
-	return n;
-}
-#endif
-
-const char *osd_scene_graph = "\
-EXTERNPROTO Untransform [\
-    exposedField MFNode children []\
-]\
-[ \"urn:inet:gpac:builtin:Untransform\"]\
-OrderedGroup {\
- children [\
-  Untransform {\
-   children [\
-  DEF N1 Switch {\
-   whichChoice 0\
-   choice [\
-    DEF N2 Transform2D {\
-     children [\
-      Shape {\
-       appearance Appearance {\
-        material Material2D {\
-         transparency 0\
-         filled TRUE\
-        }\
-        texture DEF N3 CompositeTexture2D {\
-         pixelWidth 256\
-         pixelHeight 16\
-         children [\
-          Background2D {backColor 0.6 0.6 0.6}\
-          Shape {\
-           appearance Appearance {\
-            material Material2D {\
-             emissiveColor 0 0 0\
-             filled TRUE\
-            }\
-           }\
-           geometry DEF N4 Text {\
-            string [\"My Sample Text !\"]\
-            fontStyle FontStyle {\
-             size 12\
-             justify [\"MIDDLE\", \"MIDDLE\"]\
-             family [\"SANS\"]\
-            }\
-           }\
-          }\
-         ]\
-        }\
-       }\
-       geometry Bitmap {}\
-      }\
-     ]\
-    }\
-   ]\
-  }\
-   ]\
-  }\
- ]\
-}\
-";
-
-void osd_on_resize(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
-{
-	GF_DOMHandler *the_hdl = (GF_DOMHandler *) hdl;
-	GF_OSD *osd = the_hdl->evt_listen_obj;
-
-	if (osd->ct2d) {
-		//osd->ct2d->pixelWidth = FIX2INT(event->screen_rect.width);
-		gf_node_dirty_set((GF_Node *) osd->ct2d, GF_SG_NODE_DIRTY, 1);
-
-		if (osd->transform) {
-			osd->transform->translation.y = INT2FIX( (FIX2INT(event->screen_rect.height) - osd->ct2d->pixelHeight) / 2 ) ;
-			gf_node_dirty_set((GF_Node *) osd->transform, GF_SG_NODE_DIRTY, 1);
-		}
-	}
-}
-
-Bool osd_load_scene(GF_OSD *osd)
-{
-	GF_Node *n;
-	GF_List *nodes;
-	const char *opt;
-	GF_DOMHandler *hdl;
-	/*BT/VRML from string*/
-	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, const char *node_str, Bool force_wrl);
-
-	/*create a new scene*/
-	osd->odm = gf_odm_new();
-	osd->odm->term = osd->term;
-	osd->odm->subscene = gf_scene_new(NULL);
-	osd->odm->subscene->root_od = osd->odm;
-	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
-
-	/*create a scene graph*/
-	nodes = gf_sm_load_bt_from_string(osd->odm->subscene->graph, osd_scene_graph, 0);
-	n = gf_list_get(nodes, 0);
-	gf_list_del(nodes);
-
-	if (!n) return 0;
-
-	gf_sg_set_root_node(osd->odm->subscene->graph, n);
-	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
-
-	hdl = gf_dom_listener_build(n, GF_EVENT_RESIZE, 0);
-	hdl->handle_event = osd_on_resize;
-	hdl->evt_listen_obj = osd;
-
-	osd->visible = (M_Switch *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N1");
-	osd->transform = (M_Transform2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N2");
-	osd->ct2d = (M_CompositeTexture2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N3");
-	osd->text = (M_Text *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N4");
-	if (osd->text->string.vals[0]) {
-		gf_free(osd->text->string.vals[0]);
-		osd->text->string.vals[0] = NULL;
-	}
-	strcpy(osd->statBuffer, "Hello World !");
-	osd->text->string.vals[0] = osd->statBuffer;
-
-	opt = gf_cfg_get_key(osd->term->user->config, "OSD", "Visible");
-	if (!opt || strcmp(opt, "yes")) osd->visible->whichChoice = -1;
-
-
-	return 1;
-}
-
-
-Bool osd_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
-{
-	GF_OSD* osd = (GF_OSD*)udta;
-	switch (event->type) {
-	case GF_EVENT_SCENE_SIZE:
-		gf_sg_set_scene_size_info(osd->odm->subscene->graph, event->size.width, event->size.height, 1);
-		break;
-	case GF_EVENT_KEYUP:
-		if ( (event->key.key_code == GF_KEY_I) && (event->key.flags & GF_KEY_MOD_CTRL)) {
-			if (osd->visible->whichChoice==0) {
-				osd->visible->whichChoice = -1;
-				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "no");
-			} else {
-				osd->visible->whichChoice = 0;
-				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "yes");
-			}
-			gf_node_dirty_set((GF_Node *) osd->visible, GF_SG_NODE_DIRTY, 1);
-		}
-		break;
-	}
-	return 0;
-}
-static Bool osd_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt;
-	GF_OSD *osd = termext->udta;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		osd->term = (GF_Terminal *) param;
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "OSD", "Enabled");
-		if (!opt || strcmp(opt, "yes")) return 0;
-
-		/*load scene*/
-		if (! osd_load_scene(osd)) return 0;
-		/*attach scene to compositor*/
-		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 0);
-
-
-		/*we are not threaded*/
-		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
-
-		osd->refresh_time_ms = 500;
-		osd->evt_filter.on_event = osd_on_event_play;
-		osd->evt_filter.udta = osd;
-		gf_term_add_event_filter(osd->term, &osd->evt_filter);
-		return 1;
-
-	case GF_TERM_EXT_STOP:
-		osd->text->string.vals[0] = NULL;
-		/*remove scene to compositor*/
-		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 1);
-		gf_odm_disconnect(osd->odm, 1);
-		osd->odm = NULL;
-
-		gf_term_remove_event_filter(osd->term, &osd->evt_filter);
-		osd->term = NULL;
-		break;
-
-	case GF_TERM_EXT_PROCESS:
-		/*flush all events until current time if reached*/
-		if ((osd->visible->whichChoice==0) && gf_sys_get_rti(osd->refresh_time_ms, &osd->rti, 0)) {
-			sprintf(osd->statBuffer, "CPU %02d - FPS %02.2f - MEM "LLU" KB", osd->rti.process_cpu_usage, gf_sc_get_fps(osd->term->compositor, 0), osd->rti.process_memory/1000);
-			gf_node_dirty_set((GF_Node *) osd->text, GF_SG_NODE_DIRTY, 1);
-		}
-		break;
-	}
-	return 0;
-}
-
-
-GF_TermExt *osd_new()
-{
-	GF_TermExt *dr;
-	GF_OSD *osd;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC OnScreen Display", "gpac distribution");
-
-	GF_SAFEALLOC(osd, GF_OSD);
-	dr->process = osd_process;
-	dr->udta = osd;
-	return dr;
-}
-
-
-void osd_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_OSD *osd = dr->udta;
-	gf_free(osd);
-	gf_free(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)osd_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		osd_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( osd )

gpac-0.8.0.tar.gz/modules/oss_audio Deleted

gpac-0.8.0.tar.gz/modules/oss_audio/oss.c Deleted

@@ -1,286 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / linux_oss audio render module
- *
- *  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.
- *
- */
-
-
-#if defined(__DARWIN__) || defined(__APPLE__)
-#include <soundcard.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <string.h>
-
-#else
-
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#ifdef OSS_FIX_INC
-#include <soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-
-#endif
-
-#include <gpac/modules/audio_out.h>
-
-#define OSS_AUDIO_DEVICE	"/dev/dsp"
-
-typedef struct
-{
-	int audio_dev, sr, nb_ch;
-	u32 buf_size, delay, num_buffers, total_duration;
-	u32 force_sr;
-	char *wav_buf;
-} OSSContext;
-
-
-#define OSSCTX()	OSSContext *ctx = (OSSContext *)dr->opaque;
-
-
-static GF_Err OSS_Setup(GF_AudioOutput*dr, void *os_handle, u32 num_buffers, u32 total_duration)
-{
-	int audio;
-	const char *opt;
-	OSSCTX();
-
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "OSS", "ForceSampleRate");
-	if (opt) ctx->force_sr = atoi(opt);
-
-	/*open OSS in non-blocking mode*/
-	audio = open(OSS_AUDIO_DEVICE, 0);
-	if (audio < 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[OSS] Cannot open audio device\n"));
-		return GF_NOT_SUPPORTED;
-	}
-
-	/*set blocking mode back*/
-	//fcntl(audio, F_SETFL, fcntl(audio, F_GETFL) & ~FNDELAY);
-	ctx->audio_dev=audio;
-	ctx->num_buffers = num_buffers;
-	ctx->total_duration = total_duration;
-	return GF_OK;
-}
-
-static void OSS_Shutdown(GF_AudioOutput*dr)
-{
-	OSSCTX();
-	ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
-	close(ctx->audio_dev);
-	if (ctx->wav_buf) gf_free(ctx->wav_buf);
-	ctx->wav_buf = NULL;
-}
-
-
-static GF_Err OSS_ConfigureOutput(GF_AudioOutput*dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
-{
-	int format, blockalign, nb_bufs, frag_spec;
-	long flags;
-	OSSCTX();
-
-	if (!ctx) return GF_BAD_PARAM;
-	/* reset and reopen audio-device */
-	ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
-	close(ctx->audio_dev);
-	if (ctx->wav_buf) gf_free(ctx->wav_buf);
-	ctx->wav_buf = NULL;
-	ctx->audio_dev=open(OSS_AUDIO_DEVICE,O_WRONLY|O_NONBLOCK);
-	if (!ctx->audio_dev) return GF_IO_ERR;
-
-	/* Make the file descriptor use blocking writes with fcntl() so that
-	 we don't have to handle sleep() ourselves*/
-	flags = fcntl(ctx->audio_dev, F_GETFL);
-	flags &= ~O_NONBLOCK;
-	if (fcntl(ctx->audio_dev, F_SETFL, flags) < 0 ) return GF_IO_ERR;
-
-	ctx->nb_ch = (int) (*NbChannels);
-	if (ioctl(ctx->audio_dev, SNDCTL_DSP_CHANNELS, &ctx->nb_ch)==-1) return GF_IO_ERR;
-
-	blockalign = ctx->nb_ch;
-	if ((*nbBitsPerSample) == 16) {
-		blockalign *= 2;
-		format = AFMT_S16_LE;
-	} else {
-		format = AFMT_S8;
-	}
-	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SETFMT,&format)==-1) return GF_IO_ERR;
-	ctx->sr = (*SampleRate);
-	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&ctx->sr)==-1) return GF_IO_ERR;
-
-	nb_bufs = ctx->num_buffers ? ctx->num_buffers : 8;
-	ctx->buf_size = (*SampleRate * blockalign * ctx->total_duration) / (1000 * nb_bufs);
-	frag_spec = 4;
-	while (ctx->buf_size > (1<<(frag_spec+1)))
-		frag_spec++;
-
-	ctx->buf_size = 1<<frag_spec;
-
-	ctx->delay = (1000*ctx->buf_size) / (*SampleRate * blockalign);
-	frag_spec = ((nb_bufs<<16) & 0xFFFF0000) | frag_spec;
-
-	ctx->delay = (1000*ctx->buf_size*nb_bufs) / (*SampleRate * blockalign);
-	if ( ioctl(ctx->audio_dev, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) return GF_IO_ERR;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] setup %d buffers %d bytes each (%d ms buffer delay)", nb_bufs, ctx->buf_size, ctx->delay));
-	ctx->wav_buf = gf_realloc(ctx->wav_buf, ctx->buf_size*sizeof(char));
-	if(!ctx->wav_buf) return GF_OUT_OF_MEM;
-	memset(ctx->wav_buf, 0, ctx->buf_size*sizeof(char));
-	return GF_OK;
-}
-
-static void OSS_WriteAudio(GF_AudioOutput*dr)
-{
-	u32 written;
-	OSSCTX();
-	written = dr->FillBuffer(dr->audio_renderer, ctx->wav_buf, ctx->buf_size);
-	/*this will also perform sleep*/
-	if (written) {
-		u32 reallyWritten = write(ctx->audio_dev, ctx->wav_buf, written);
-		if (reallyWritten != written) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[OSS] Failed to write all audio to device, has written %u, should have %u", reallyWritten, written));
-		}
-	}
-}
-
-static void OSS_SetVolume(GF_AudioOutput*dr, u32 Volume) {}
-static void OSS_SetPan(GF_AudioOutput*dr, u32 Pan) {}
-static void OSS_SetPriority(GF_AudioOutput*dr, u32 Priority) {}
-static u32 OSS_GetAudioDelay(GF_AudioOutput*dr)
-{
-	OSSCTX()
-	return ctx->delay;
-}
-
-/*
- * to get the best matching samplerate the oss-device can be set up
- * with the desired sr. if not supported the returned value contains the
- * best matching sr.
- *
- * todo: supported samplerate could depend on nb_channels and format
- */
-static GF_Err OSS_QueryOutputSampleRate(GF_AudioOutput*dr, u32 *desired_sr, u32 *NbChannels, u32 *nbBitsPerSample)
-{
-#ifdef FORCE_SR_LIMIT
-	*NbChannels = 2;
-	if (!( *desired_sr % 11025)) return GF_OK;
-	if (*desired_sr<22050) *desired_sr = 22050;
-	else *desired_sr = 44100;
-	return GF_OK;
-#else
-	/* reset and reopen audio-device */
-	int i;
-	OSSCTX();
-	if (ctx->force_sr) {
-		*desired_sr = ctx->force_sr;
-		return GF_OK;
-	}
-	i=*desired_sr;
-	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&i)==-1) return GF_IO_ERR;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] uses samplerate %d for desired sr %d\n", i, *desired_sr));
-	*desired_sr = i;
-	i = *NbChannels;
-	if(ioctl(ctx->audio_dev,SNDCTL_DSP_CHANNELS, &i)==-1) return GF_IO_ERR;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] uses %d channels for %d desired ones\n", i, *NbChannels));
-	*NbChannels = i;
-	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&ctx->sr)==-1) return GF_OK;
-	if(ioctl(ctx->audio_dev,SNDCTL_DSP_CHANNELS, &ctx->nb_ch)==-1) return GF_OK;
-	return GF_OK;
-#endif
-}
-
-void *NewOSSRender()
-{
-	OSSContext *ctx;
-	GF_AudioOutput*driv;
-	ctx = gf_malloc(sizeof(OSSContext));
-	if(!ctx)
-		return NULL;
-	memset(ctx, 0, sizeof(OSSContext));
-	driv = gf_malloc(sizeof(GF_AudioOutput));
-	if(!driv)
-	{
-		gf_free(ctx);
-		ctx=NULL;
-		return NULL;
-	}
-	memset(driv, 0, sizeof(GF_AudioOutput));
-	driv->opaque = ctx;
-	driv->SelfThreaded = 0;
-	driv->Setup = OSS_Setup;
-	driv->Shutdown = OSS_Shutdown;
-	driv->ConfigureOutput = OSS_ConfigureOutput;
-	driv->GetAudioDelay = OSS_GetAudioDelay;
-	driv->SetVolume = OSS_SetVolume;
-	driv->SetPan = OSS_SetPan;
-	driv->SetPriority = OSS_SetPriority;
-	driv->QueryOutputSampleRate = OSS_QueryOutputSampleRate;
-	driv->WriteAudio = OSS_WriteAudio;
-
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "OSS Audio Output", "gpac distribution");
-	return driv;
-}
-
-void DeleteOSSRender(void *ifce)
-{
-	GF_AudioOutput*dr = (GF_AudioOutput*) ifce;
-	OSSContext *ctx = (OSSContext *)dr->opaque;
-	gf_free(ctx);
-	gf_free(dr);
-}
-
-
-/*
- * ********************************************************************
- * interface
- */
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_AUDIO_OUTPUT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
-		return NewOSSRender();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	if (ifce->InterfaceType==GF_AUDIO_OUTPUT_INTERFACE)
-		DeleteOSSRender((GF_AudioOutput*)ifce);
-}
-
-GPAC_MODULE_STATIC_DECLARATION( oss )

gpac-0.8.0.tar.gz/modules/platinum Deleted

gpac-0.8.0.tar.gz/modules/platinum/GPACPlatinum.cpp Deleted

@@ -1,1740 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2009-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Platinum UPnP module
- *
- *  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.
- *
- *
- *	----------------------------------------------------------------------------------
- *		PLATINUM IS LICENSED UNDER GPL or commercial agreement - cf platinum license
- *	----------------------------------------------------------------------------------
- *
- */
-
-//declaration of export functions is done first due to a linker bug on OSX ...
-#include <gpac/modules/term_ext.h>
-
-GF_TermExt *upnp_new();
-void upnp_delete(GF_BaseInterface *ifce);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)upnp_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		upnp_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( platinum )
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#include "GPACPlatinum.h"
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE)
-#  pragma comment(lib, "js32")
-# elif defined (_WIN64)
-#  pragma comment(lib, "js")
-# elif defined (WIN32)
-#  pragma comment(lib, "js")
-# endif
-#endif
-
-#endif
-
-GF_UPnP::GF_UPnP()
-{
-	m_pTerm = NULL;
-	m_pPlatinum = NULL;
-	m_pMediaRenderer = NULL;
-	m_pMediaServer = NULL;
-	m_pAVCtrlPoint = NULL;
-	m_renderer_bound = GF_FALSE;
-	m_pGenericController = NULL;
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-	m_Devices = NULL;
-	m_pJSCtx = NULL;
-	m_nbJSInstances=0;
-	last_time = 0;
-#endif
-}
-
-GF_UPnP::~GF_UPnP()
-{
-#ifdef GPAC_HAS_SPIDERMONKEY
-	if (m_Devices) gf_list_del(m_Devices);
-#endif
-}
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-void GF_UPnP::LockJavascript(Bool do_lock)
-{
-	gf_sg_lock_javascript(m_pJSCtx, do_lock);
-}
-#endif
-
-void GF_UPnP::OnStop(const char *src_url)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaStop", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[1];
-			argv[0] = GetUPnPDevice(src_url);
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	} else {
-//		gf_term_disconnect(m_pTerm);
-		gf_term_play_from_time(m_pTerm, 0, 1);
-	}
-}
-
-NPT_String GF_UPnP::OnMigrate()
-{
-	NPT_String res = "";
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return res;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMigrate", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 0, NULL, &rval);
-			if (JSVAL_IS_STRING(rval)) {
-				char *_res = SMJS_CHARS(m_pJSCtx, rval);
-				res = _res;
-				SMJS_FREE(m_pJSCtx, _res);
-			}
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	} else {
-		GF_NetworkCommand com;
-
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_MIGRATION_INFO;
-		m_pTerm->root_scene->root_od->net_service->ifce->ServiceCommand(m_pTerm->root_scene->root_od->net_service->ifce, &com);
-		if (com.migrate.data) {
-			res = com.migrate.data;
-		} else {
-			res = m_pTerm->root_scene->root_od->net_service->url;
-		}
-	}
-	return res;
-}
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-jsval GF_UPnP::GetUPnPDevice(const char *src_url)
-{
-	return src_url ? STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, src_url ) ) : JSVAL_NULL;
-}
-#endif
-
-void GF_UPnP::OnConnect(const char *url, const char *src_url)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaConnect", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[2];
-			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, url ) );
-			argv[1] = GetUPnPDevice(src_url);
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	} else {
-		gf_term_navigate_to(m_pTerm, url);
-	}
-}
-void GF_UPnP::OnPause(Bool do_resume, const char *src_url)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, do_resume ? "onMediaPlay" : "onMediaPause", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[1];
-			argv[0] = GetUPnPDevice(src_url);
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	} else {
-		gf_term_set_option(m_pTerm, GF_OPT_PLAY_STATE, do_resume ? GF_STATE_PLAYING : GF_STATE_PAUSED);
-	}
-}
-
-void GF_UPnP::OnSeek(Double time)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaSeek", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[1];
-			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	} else {
-		/* CanSeek and Duration set for each media by event_proc */
-		if (!m_pTerm->root_scene || (m_pTerm->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL)
-		        || (m_pTerm->root_scene->duration<2000)
-		   ) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] Scene not seekable\n"));
-		} else {
-			gf_term_play_from_time(m_pTerm, (u64) (time * 1000), 0);
-		}
-	}
-}
-
-void GF_UPnP::ContainerChanged(PLT_DeviceDataReference& device, const char *item_id, const char *update_id)
-{
-}
-
-void GF_UPnP::onTimeChanged(s32 renderer_idx, Double time)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaTimeChanged", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[2];
-			argv[0] = INT_TO_JSVAL( renderer_idx);
-			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	}
-}
-
-void GF_UPnP::onDurationChanged(s32 renderer_idx, Double dur)
-{
-	if (m_renderer_bound) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		jsval funval, rval;
-		if (!m_pJSCtx) return;
-		LockJavascript(GF_TRUE);
-		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaDurationChanged", &funval);
-		if (JSVAL_IS_OBJECT(funval)) {
-			jsval argv[2];
-			argv[0] = INT_TO_JSVAL( renderer_idx);
-			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, dur) );
-			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
-		}
-		LockJavascript(GF_FALSE);
-#endif
-	}
-}
-
-
-Bool GF_UPnP::ProcessEvent(GF_Event *evt)
-{
-	if (!m_pMediaRenderer) return GF_FALSE;
-	switch (evt->type) {
-	case GF_EVENT_CONNECT:
-		if (evt->connect.is_connected) {
-			const char *url = gf_term_get_url(m_pTerm);
-			if (url) {
-				m_pMediaRenderer->SetConnected(url);
-			}
-		}
-		break;
-
-	case GF_EVENT_DURATION:
-		m_pMediaRenderer->SetDuration(evt->duration.duration, evt->duration.can_seek);
-	case GF_EVENT_METADATA:
-		if (m_pTerm->root_scene) {
-			char szName[1024];
-			NetInfoCommand com;
-			memset(&com, 0, sizeof(NetInfoCommand));
-
-			/*get any service info*/
-			if (gf_term_get_service_info(m_pTerm, m_pTerm->root_scene->root_od, &com) == GF_OK) {
-				strcpy(szName, "");
-				if (com.name) {
-					strcat(szName, com.name);
-					strcat(szName, " ");
-				}
-				if (com.album) {
-					strcat(szName, "(");
-					strcat(szName, com.album);
-					strcat(szName, ")");
-				}
-
-				/*const char *artist = "Unknown";
-				if (com.artist) artist = com.artist;
-				else if (com.writer) artist = com.writer;
-				else if (com.composer) artist = com.composer;
-
-				MRSetMediaInfo(0, szName, com.artist ? com.artist : "Unknown");*/
-			}
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-Bool upnp_on_term_event(void *udta, GF_Event *evt, Bool consumed)
-{
-	GF_UPnP *upnp = (GF_UPnP *) udta;
-	if (!consumed && upnp) return upnp->ProcessEvent(evt);
-	return GF_FALSE;
-}
-
-void GF_UPnP::Load(GF_Terminal *term)
-{
-	u16 port = 0;
-	Bool save_uuids=GF_FALSE;
-	Bool ignore_local_devices=GF_FALSE;
-	const char *uuid, *opt, *name;
-	char hostname[100], friendly_name[1024];
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Starting UPnP\n"));
-
-	m_pCtrlPoint = NULL;
-	m_pTerm = term;
-
-	m_pPlatinum = new PLT_UPnP();
-	m_pPlatinum->SetIgnoreLocalUUIDs(false);
-
-	gf_sk_get_host_name((char*)hostname);
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "AllowedDevicesIP");
-	if (!opt) {
-		gf_cfg_set_key(m_pTerm->user->config, "UPnP", "AllowedDevicesIP", "");
-		opt="";
-	}
-	m_IPFilter = opt;
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices");
-	if (!opt || !strcmp(opt, "yes")) {
-		ignore_local_devices = GF_TRUE;
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
-	}
-
-
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices");
-	if (!opt || !strcmp(opt, "yes")) {
-		ignore_local_devices = GF_TRUE;
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
-	}
-
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "SaveUUIDs");
-	if (opt && !strcmp(opt, "yes")) save_uuids = GF_TRUE;
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaRendererEnabled");
-	if (!opt || !strcmp(opt, "yes")) {
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaRendererEnabled", "yes");
-
-		name = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaRendererName");
-		if (!name) {
-			sprintf(friendly_name, "GPAC @ %s", hostname);
-			name = friendly_name;
-		}
-
-		port = 0;
-		opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaRendererPort");
-		if (opt) port = atoi(opt);
-
-		uuid = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaRendererUUID");
-		if (uuid) {
-			m_pMediaRenderer = new GPAC_MediaRenderer(this, name, false, uuid, port);
-		} else {
-			m_pMediaRenderer = new GPAC_MediaRenderer(this, name, false, NULL, port);
-			if (save_uuids) {
-				uuid = m_pMediaRenderer->GetUUID();
-				gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaRendererUUID", uuid);
-			}
-		}
-
-		PLT_DeviceHostReference device(m_pMediaRenderer );
-		device->m_ModelDescription = "GPAC Media Renderer";
-		device->m_ModelURL = "http://gpac.sourceforge.net";
-		device->m_ModelNumber = GPAC_FULL_VERSION;
-		device->m_ModelName = "GPAC Media Renderer";
-		device->m_Manufacturer = "Telecom ParisTech";
-		device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
-		m_pPlatinum->AddDevice(device);
-	}
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaServerEnabled");
-	if (!opt || !strcmp(opt, "yes")) {
-		char *media_root;
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerEnabled", "yes");
-
-		name = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaServerName");
-		if (!name) {
-			sprintf(friendly_name, "GPAC @ %s", hostname);
-			name = friendly_name;
-		}
-
-		port = 0;
-		opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaServerPort");
-		if (opt) port = atoi(opt);
-
-		uuid = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaServerUUID");
-		if (uuid) {
-			m_pMediaServer = new GPAC_FileMediaServer(name, false, uuid, port);
-		} else {
-			m_pMediaServer = new GPAC_FileMediaServer(name, false, NULL, port);
-			if (save_uuids) {
-				uuid = m_pMediaServer->GetUUID();
-				gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerUUID", uuid);
-			}
-		}
-		media_root = (char *) gf_cfg_get_key(m_pTerm->user->config, "UPnP", "MediaServerRoot");
-		if (!media_root) {
-			gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerRoot", "all:/");
-			m_pMediaServer->AddSharedDirectory("/", "all");
-		} else {
-			while (media_root) {
-				Bool is_hidden = GF_FALSE;
-				char *sep1 = (char *)strchr(media_root, ':');
-				if (!sep1) break;
-				char *sep2 = (char *)strchr(sep1, ';');
-
-				if (!strncmp(media_root, "(h)", 3)) {
-					media_root+=3;
-					is_hidden = GF_TRUE;
-				}
-				sep1[0] = 0;
-				if (sep2) sep2[0] = 0;
-				m_pMediaServer->AddSharedDirectory(sep1+1, media_root, is_hidden);
-				sep1[0] = ':';
-				if (sep2) sep2[0] = ';';
-				else break;
-				media_root = sep2+1;
-			}
-		}
-		PLT_DeviceHostReference device(m_pMediaServer);
-		device->m_ModelDescription = "GPAC Media Server";
-		device->m_ModelURL = "http://gpac.sourceforge.net";
-		device->m_ModelNumber = GPAC_FULL_VERSION;
-		device->m_ModelName = "GPAC Media Server";
-		device->m_Manufacturer = "Telecom ParisTech";
-		device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
-		m_pPlatinum->AddDevice(device);
-	}
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "GenericControllerEnabled");
-	if (!opt || !strcmp(opt, "yes")) {
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "GenericControllerEnabled", "yes");
-		/*create our generic control point*/
-		if (!m_pCtrlPoint) {
-			m_pCtrlPoint = new PLT_CtrlPoint();
-			m_ctrlPtRef = PLT_CtrlPointReference(m_pCtrlPoint);
-		}
-		m_pGenericController = new GPAC_GenericController(m_ctrlPtRef, this);
-	}
-
-	opt = gf_cfg_get_key(m_pTerm->user->config, "UPnP", "AVCPEnabled");
-	if (!opt || !strcmp(opt, "yes")) {
-		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "AVCPEnabled", "yes");
-
-		if (!m_pCtrlPoint) {
-			m_pCtrlPoint = new PLT_CtrlPoint();
-			m_ctrlPtRef = PLT_CtrlPointReference(m_pCtrlPoint);
-		}
-		m_pAVCtrlPoint = new GPAC_MediaController(m_ctrlPtRef, this);
-	}
-
-	// add control point to upnp engine
-	if (m_pCtrlPoint) {
-		if (ignore_local_devices) {
-			if (m_pMediaServer) m_pCtrlPoint->IgnoreUUID(m_pMediaServer->GetUUID());
-			if (m_pMediaRenderer) m_pCtrlPoint->IgnoreUUID(m_pMediaRenderer->GetUUID());
-		}
-		m_pPlatinum->AddCtrlPoint(m_ctrlPtRef);
-	}
-
-
-
-	gf_term_add_event_filter(term, &evt_filter);
-
-	//start UPnP engine
-	m_pPlatinum->Start();
-
-	/*if we have a control point, force a rescan of the network servcies*/
-	if (m_pCtrlPoint) {
-		m_pCtrlPoint->Search();
-	}
-}
-
-void GF_UPnP::Unload()
-{
-	m_pPlatinum->Stop();
-	if (m_pGenericController) delete m_pGenericController;
-	if (m_pAVCtrlPoint) delete m_pAVCtrlPoint;
-	/*this will delete all UPnP devices*/
-	delete m_pPlatinum;
-
-	/*final cleanup of UPnP lib*/
-	NPT_AutomaticCleaner::Shutdown();
-}
-
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-void GF_UPnP::OnMediaRendererAdd(PLT_DeviceDataReference& device, int added)
-{
-	jsval funval, rval;
-	if (!m_pJSCtx) return;
-
-	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
-
-	LockJavascript(GF_TRUE);
-
-	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaRendererAdd", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		jsval argv[3];
-		argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetFriendlyName() ) );
-		argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetUUID() ) );
-		argv[2] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
-
-		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
-	}
-	LockJavascript(GF_FALSE);
-}
-
-
-void GF_UPnP::OnMediaServerAdd(PLT_DeviceDataReference& device, int added)
-{
-	jsval funval, rval;
-	if (!m_pJSCtx) return;
-
-	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
-
-	LockJavascript(GF_TRUE);
-	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaServerAdd", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		jsval argv[3];
-		argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetFriendlyName() ) );
-		argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetUUID() ) );
-		argv[2] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
-
-		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
-	}
-	LockJavascript(GF_FALSE);
-}
-
-static SMJS_DECL_FUNC_PROP_GET(  upnpdevice_getProperty)
-{
-#ifdef USE_FFDEV_15
-	JSObject *obj = (JSObject *) __hobj;
-	jsid id = (jsid) __hid;
-#endif
-
-	char *prop_name;
-	GPAC_DeviceItem *dev = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!dev) return JS_FALSE;
-
-	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-	if (!prop_name) return JS_FALSE;
-
-	if (!strcmp(prop_name, "Name")) {
-		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetFriendlyName()) ) );
-	}
-	else if (!strcmp(prop_name, "UUID")) {
-		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetUUID()) ) );
-	}
-	else if (!strcmp(prop_name, "PresentationURL")) {
-		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->m_PresentationURL) )  );
-	}
-	else if (!strcmp(prop_name, "ServicesCount")) {
-		u32 count = gf_list_count(dev->m_Services);
-		if (!count) {
-			dev->RefreshServiceList();
-			count = gf_list_count(dev->m_Services);
-		}
-		VPASSIGN( INT_TO_JSVAL(count)  );
-	}
-	SMJS_FREE(c, prop_name);
-	return JS_TRUE;
-}
-
-#ifdef GPAC_UNUSED_FUNC
-static JSBool upnp_device_subscribe(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	PLT_Service* service;
-	char *service_uuid;
-	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!item || (argc!=2) ) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	if (!JSVAL_IS_OBJECT(argv[1])) return JS_FALSE;
-
-	service_uuid = SMJS_CHARS(c, argv[0]);
-	if (item->m_device->FindServiceByType(service_uuid, service) == NPT_SUCCESS) {
-		item->m_pUPnP->m_pGenericController->m_CtrlPoint->Subscribe(service);
-	}
-	SMJS_FREE(c, service_uuid);
-	return JS_TRUE;
-}
-#endif
-
-static JSBool SMJS_FUNCTION(upnp_device_find_service)
-{
-	char *service_uuid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!item || !argc) return JS_FALSE;
-	service_uuid = SMJS_CHARS(c, argv[0]);
-
-	GPAC_ServiceItem *serv = item->FindService(service_uuid);
-	SMJS_FREE(c, service_uuid);
-	if (!serv) {
-		SMJS_SET_RVAL( JSVAL_NULL );
-		return JS_TRUE;
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_device_get_service)
-{
-	u32 service_index;
-	SMJS_OBJ
-	SMJS_ARGS
-	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
-	if (!item || !argc || !JSVAL_IS_INT(argv[0])) return JS_FALSE;
-	service_index = JSVAL_TO_INT(argv[0]);
-
-	GPAC_ServiceItem *serv = (GPAC_ServiceItem*)gf_list_get(item->m_Services, service_index);
-	if (!serv) {
-		SMJS_SET_RVAL( JSVAL_NULL );
-		return JS_TRUE;
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
-	return JS_TRUE;
-}
-
-
-void GF_UPnP::OnDeviceAdd(GPAC_DeviceItem *item, int added)
-{
-	jsval funval, rval;
-	if (!m_pJSCtx) return;
-
-	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)item->m_device->GetURLBase().GetHost()) == NULL) ) return;
-
-	LockJavascript(GF_TRUE);
-
-	if (added) {
-		item->js_ctx = m_pJSCtx;
-		item->obj = JS_NewObject(m_pJSCtx, &upnpGenericDeviceClass._class, 0, 0);
-		item->m_pUPnP = this;
-		gf_js_add_root(m_pJSCtx, &item->obj, GF_JSGC_OBJECT);
-		SMJS_SET_PRIVATE(item->js_ctx, item->obj, item);
-	}
-
-	JS_LookupProperty(m_pJSCtx, m_pObj, "onDeviceAdd", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		jsval argv[2];
-		argv[0] = OBJECT_TO_JSVAL( item->obj );
-		argv[1] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
-		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
-	}
-	LockJavascript(GF_FALSE);
-}
-
-static SMJS_DECL_FUNC_PROP_GET(  upnp_getProperty)
-{
-#ifdef USE_FFDEV_15
-	JSObject *obj = (JSObject *) __hobj;
-	jsid id = (jsid) __hid;
-#endif
-
-
-	char *prop_name;
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp) return JS_FALSE;
-
-	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-	if (!prop_name) return JS_FALSE;
-
-	if (!strcmp(prop_name, "MediaRendererEnabled")) {
-		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaRenderer ? JS_TRUE : JS_FALSE ) );
-	}
-	else if (!strcmp(prop_name, "MediaServerEnabled")) {
-		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaServer ? JS_TRUE : JS_FALSE)	);
-	}
-	else if (!strcmp(prop_name, "MediaControlEnabled")) {
-		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pAVCtrlPoint ? JS_TRUE : JS_FALSE)	);
-	}
-	else if (!strcmp(prop_name, "MediaServersCount")) {
-		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers) : 0)	);
-	}
-	else if (!strcmp(prop_name, "MediaRenderersCount")) {
-		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers) : 0) );
-	}
-	else if (!strcmp(prop_name, "DevicesCount")) {
-		VPASSIGN( INT_TO_JSVAL( upnp->m_pGenericController ? gf_list_count(upnp->m_pGenericController->m_Devices) : 0) );
-	}
-	SMJS_FREE(c, prop_name);
-	return JS_TRUE;
-}
-
-static SMJS_DECL_FUNC_PROP_SET(upnp_setProperty)
-{
-#ifdef USE_FFDEV_15
-	JSObject *obj = (JSObject *) __hobj;
-	jsid id = (jsid) __hid;
-#endif
-	char *prop_name;
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp) return JS_FALSE;
-
-	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-	if (!prop_name) return JS_FALSE;
-
-	if (upnp->m_pMediaRenderer ) {
-		if (!strcmp(prop_name, "MovieDuration") && JSVAL_IS_DOUBLE( VPGET() )) {
-			jsdouble d;
-			JS_ValueToNumber(c, VPGET(), &d);
-			upnp->m_pMediaRenderer->SetDuration(d, GF_TRUE);
-		}
-		else if (!strcmp(prop_name, "MovieTime") && JSVAL_IS_DOUBLE( VPGET() )) {
-			jsdouble d;
-			JS_ValueToNumber(c, VPGET(), &d);
-			upnp->m_pMediaRenderer->SetTime(d);
-		}
-		else if (!strcmp(prop_name, "MovieURL") && JSVAL_IS_STRING( VPGET() ) ) {
-			char *url = SMJS_CHARS(c, VPGET() );
-			if (url) upnp->m_pMediaRenderer->SetConnected(url);
-			SMJS_FREE(c, url);
-		}
-	}
-	SMJS_FREE(c, prop_name);
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(upnp_get_device)
-{
-	u32 idx;
-	GPAC_DeviceItem *device;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || !argc || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
-
-	idx = JSVAL_TO_INT(argv[0]);
-	if (!upnp->m_pGenericController) return JS_FALSE;
-
-	device = (GPAC_DeviceItem *)gf_list_get(upnp->m_pGenericController->m_Devices, idx);
-	if (!device) return JS_FALSE;
-	if (!device->obj) {
-		device->js_ctx = upnp->m_pJSCtx;
-		device->obj = JS_NewObject(upnp->m_pJSCtx, &upnp->upnpGenericDeviceClass._class, 0, 0);
-		device->m_pUPnP = upnp;
-		gf_js_add_root(upnp->m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
-		SMJS_SET_PRIVATE(device->js_ctx, device->obj, device);
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(device->obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_find_service)
-{
-	char *dev_ip;
-	char *serv_name;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc!=2) || !JSVAL_IS_STRING(argv[0]) || !JSVAL_IS_STRING(argv[1]) ) return JS_FALSE;
-
-	dev_ip = SMJS_CHARS(c, argv[0]);
-	serv_name = SMJS_CHARS(c, argv[1]);
-	SMJS_SET_RVAL(JSVAL_NULL);
-	if (!dev_ip || !serv_name || !upnp->m_pGenericController) {
-		SMJS_FREE(c, dev_ip);
-		SMJS_FREE(c, serv_name);
-		return JS_TRUE;
-	}
-
-	u32 i, count = gf_list_count(upnp->m_pGenericController->m_Devices);
-	for (i=0; i<count; i++) {
-		GPAC_DeviceItem *item = (GPAC_DeviceItem *) gf_list_get(upnp->m_pGenericController->m_Devices, i);
-		if (item->m_device->GetURLBase().GetHost() == (const char *)dev_ip) {
-			GPAC_ServiceItem *serv = item->FindService(serv_name);
-			if (serv) {
-				SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
-				break;
-			}
-		}
-	}
-	SMJS_FREE(c, dev_ip);
-	SMJS_FREE(c, serv_name);
-	return JS_TRUE;
-}
-
-static GPAC_MediaRendererItem *upnp_renderer_get_device(GF_UPnP *upnp , JSContext *c, JSObject *obj)
-{
-	char *uuid;
-	jsval val;
-	u32 i, count;
-	GPAC_MediaRendererItem *render;
-	if (!JS_LookupProperty(c, obj, "UUID", &val) || JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val) )
-		return NULL;
-	uuid = SMJS_CHARS(c, val);
-	if (!uuid) return NULL;
-
-	count = gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers);
-	for (i=0; i<count; i++) {
-		render = (GPAC_MediaRendererItem *)gf_list_get(upnp->m_pAVCtrlPoint->m_MediaRenderers, i);
-		if (render->m_UUID==(const char *)uuid) {
-			SMJS_FREE(c, uuid);
-			return render;
-		}
-	}
-	SMJS_FREE(c, uuid);
-	return NULL;
-}
-
-static GPAC_MediaServerItem *upnp_server_get_device(GF_UPnP *upnp , JSContext *c, JSObject *obj)
-{
-	char *uuid;
-	jsval val;
-	u32 i, count;
-	GPAC_MediaServerItem *server;
-	if (!JS_LookupProperty(c, obj, "UUID", &val) || JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val) )
-		return NULL;
-	uuid = SMJS_CHARS(c, val);
-	if (!uuid) return NULL;
-
-	count = gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers);
-	for (i=0; i<count; i++) {
-		server = (GPAC_MediaServerItem *)gf_list_get(upnp->m_pAVCtrlPoint->m_MediaServers, i);
-		if (server->m_UUID==(const char *)uuid) {
-			SMJS_FREE(c, uuid);
-			return server;
-		}
-	}
-	SMJS_FREE(c, uuid);
-	return NULL;
-}
-
-
-static JSBool SMJS_FUNCTION(upnp_renderer_open)
-{
-	JSObject *sobj, *fobj;
-	jsval val;
-	GPAC_MediaRendererItem *render;
-	GPAC_MediaServerItem *server;
-	char *item, *resource_url;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc<1) ) return JS_FALSE;
-
-	render = upnp_renderer_get_device(upnp, c, obj);
-	if (!render) return JS_TRUE;
-
-	PLT_Service* service;
-	server = NULL;
-	if (argc==2) {
-		sobj = JSVAL_IS_NULL(argv[1]) ? NULL : JSVAL_TO_OBJECT(argv[1]);
-		server = sobj ? upnp_server_get_device(upnp, c, sobj) : NULL;
-		if (NPT_FAILED(server->m_device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
-			server = NULL;
-		}
-		if (!server) return JS_TRUE;
-	}
-	item = NULL;
-	resource_url = NULL;
-	if (JSVAL_IS_OBJECT(argv[0])) {
-		fobj = JSVAL_TO_OBJECT(argv[0]);
-		if (!JS_LookupProperty(c, fobj, "ObjectID", &val) || JSVAL_IS_NULL(val) || !JSVAL_IS_STRING(val)) return JS_TRUE;
-		item = SMJS_CHARS(c, val);
-	}
-	else if (JSVAL_IS_STRING(argv[0]))
-		resource_url = SMJS_CHARS(c, argv[0]);
-
-	if (!item && !resource_url) {
-		SMJS_FREE(c, item);
-		SMJS_FREE(c, resource_url);
-		return JS_TRUE;
-	}
-	if (item && !server) {
-		SMJS_FREE(c, item);
-		SMJS_FREE(c, resource_url);
-		return JS_TRUE;
-	}
-
-	if (NPT_SUCCEEDED(render->m_device->FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", service))) {
-		if (resource_url) {
-			upnp->m_pAVCtrlPoint->m_MediaController->SetAVTransportURI(render->m_device, 0, resource_url, NULL, NULL);
-			upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
-		} else {
-			NPT_String objID = item;
-
-			// look back for the PLT_MediaItem in the results
-			NPT_List<PLT_MediaObject*>::Iterator item = server->m_BrowseResults->GetFirstItem();
-			while (item) {
-				if ((*item)->m_ObjectID == objID) {
-					if ((*item)->m_Resources.GetItemCount()) {
-						upnp->m_pAVCtrlPoint->m_MediaController->SetAVTransportURI(render->m_device, 0, (*item)->m_Resources[0].m_Uri, (*item)->m_Didl, NULL);
-						upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
-					}
-					break;
-				}
-				++item;
-			}
-		}
-	}
-	SMJS_FREE(c, item);
-	SMJS_FREE(c, resource_url);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION_EXT(upnp_renderer_playback, u32 act_type)
-{
-	char szSpeed[20];
-	GPAC_MediaRendererItem *render;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp) return JS_FALSE;
-
-	render = upnp_renderer_get_device(upnp, c, obj);
-	if (!render) return JS_TRUE;
-
-	switch (act_type) {
-	/*play/setspeed*/
-	case 0:
-		strcpy(szSpeed, "1");
-		if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
-			jsdouble d;
-			JS_ValueToNumber(c, argv[0], &d);
-			sprintf(szSpeed, "%2.2f", d);
-		}
-		upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, szSpeed, NULL);
-		break;
-	/*pause*/
-	case 1:
-		upnp->m_pAVCtrlPoint->m_MediaController->Pause(render->m_device, 0, NULL);
-		break;
-	/*stop*/
-	case 2:
-		upnp->m_pAVCtrlPoint->m_MediaController->Stop(render->m_device, 0, NULL);
-		break;
-	/*seek*/
-	case 3:
-		if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
-			char szVal[100];
-			jsdouble d;
-			JS_ValueToNumber(c, argv[0], &d);
-			format_time_string(szVal, d);
-			upnp->m_pAVCtrlPoint->m_MediaController->Seek(render->m_device, 0, "ABS_TIME", szVal, NULL);
-		}
-		break;
-	}
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(upnp_renderer_play)
-{
-	return upnp_renderer_playback(SMJS_CALL_ARGS, 0);
-}
-static JSBool SMJS_FUNCTION(upnp_renderer_pause)
-{
-	return upnp_renderer_playback(SMJS_CALL_ARGS, 1);
-}
-static JSBool SMJS_FUNCTION(upnp_renderer_stop)
-{
-	return upnp_renderer_playback(SMJS_CALL_ARGS, 2);
-}
-static JSBool SMJS_FUNCTION(upnp_renderer_seek)
-{
-	return upnp_renderer_playback(SMJS_CALL_ARGS, 3);
-}
-
-static JSBool SMJS_FUNCTION(upnp_get_renderer)
-{
-	JSObject *s_obj;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || !upnp->m_pAVCtrlPoint || (argc!=1) ) return JS_FALSE;
-
-	GPAC_MediaRendererItem *mr = NULL;
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 id = JSVAL_TO_INT(argv[0]);
-		mr = (GPAC_MediaRendererItem *) gf_list_get(upnp->m_pAVCtrlPoint->m_MediaRenderers, id);
-	}
-	else if (JSVAL_IS_STRING(argv[0])) {
-		u32 i=0;
-		char *uuid = SMJS_CHARS(c, argv[0]);
-		while ((mr = (GPAC_MediaRendererItem *) gf_list_enum(upnp->m_pAVCtrlPoint->m_MediaRenderers, &i))) {
-			if (mr->m_UUID==(const char *)uuid) break;
-		}
-		SMJS_FREE(c, uuid);
-	}
-	if (!mr) return JS_FALSE;
-
-	s_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, s_obj, upnp);
-
-	JS_DefineProperty(c, s_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_device->GetFriendlyName()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, s_obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_UUID ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, s_obj, "HostName", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_device->GetURLBase().GetHost() ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineFunction(c, s_obj, "Open", upnp_renderer_open, 2, 0);
-	JS_DefineFunction(c, s_obj, "Play", upnp_renderer_play, 1, 0);
-	JS_DefineFunction(c, s_obj, "Pause", upnp_renderer_pause, 0, 0);
-	JS_DefineFunction(c, s_obj, "Stop", upnp_renderer_stop, 0, 0);
-	JS_DefineFunction(c, s_obj, "Seek", upnp_renderer_seek, 0, 0);
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(s_obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_server_browse)
-{
-	NPT_String parent;
-	GPAC_MediaServerItem *server;
-	char *dir, *filter, *_dir, *_filter;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc!=2) ) return JS_FALSE;
-
-	server = upnp_server_get_device(upnp, c, obj);
-	if (!server) return JS_FALSE;
-
-	_dir = _filter = NULL;
-
-	dir = _dir = SMJS_CHARS(c, argv[0]);
-	if (!dir) dir = (char*)"0";
-	filter = _filter = SMJS_CHARS(c, argv[1]);
-	if (!filter) filter = (char*)"*";
-
-	PLT_Service* service;
-	if (NPT_SUCCEEDED(server->m_device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
-		if (!strcmp(dir, "0") || !strcmp(dir, "\\") || !strcmp(dir, "/")) {
-			server->m_ParentDirectories.Clear();
-		}
-		if (!strcmp(dir, "..")) {
-			if (!server->m_ParentDirectories.GetItemCount()) {
-				SMJS_FREE(c, _dir);
-				SMJS_FREE(c, _filter);
-				return JS_FALSE;
-			}
-			server->m_ParentDirectories.Pop(parent);
-			server->m_ParentDirectories.Peek(parent);
-			dir=parent;
-
-			if (server->m_ParentDirectories.GetItemCount()==1)
-				server->m_ParentDirectories.Clear();
-
-		} else {
-			server->m_ParentDirectories.Push(dir);
-		}
-		upnp->m_pAVCtrlPoint->Browse(server, dir, filter);
-
-
-		jsval aval = INT_TO_JSVAL(0);
-		if (!server->m_BrowseResults.IsNull()) {
-			aval = INT_TO_JSVAL(server->m_BrowseResults->GetItemCount());
-		}
-		JS_SetProperty(c, obj, "FilesCount", &aval);
-	}
-	SMJS_FREE(c, _dir);
-	SMJS_FREE(c, _filter);
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(upnp_server_has_parent_dir)
-{
-	GPAC_MediaServerItem *server;
-	SMJS_OBJ
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp) return JS_FALSE;
-
-	server = upnp_server_get_device(upnp, c, obj);
-	if (!server) return JS_TRUE;
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( server->m_ParentDirectories.GetItemCount() ? JS_TRUE : JS_FALSE));
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_server_get_resource_uri)
-{
-	u32 idx;
-	SMJS_OBJ
-	SMJS_ARGS
-	PLT_MediaObject *mo = (PLT_MediaObject *)SMJS_GET_PRIVATE(c, obj);
-	if (!mo || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
-	idx = JSVAL_TO_INT(argv[0]);
-	if (idx<mo->m_Resources.GetItemCount()) {
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Resources[idx].m_Uri)));
-	} else {
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, "")));
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_server_get_file)
-{
-	GPAC_MediaServerItem *server;
-	u32 id;
-	JSObject *f_obj;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
-
-	server = upnp_server_get_device(upnp, c, obj);
-	if (!server) return JS_TRUE;
-	if (server->m_BrowseResults.IsNull()) return JS_TRUE;
-
-	id = JSVAL_TO_INT(argv[0]);
-	PLT_MediaObject *mo;
-	server->m_BrowseResults->Get(id, mo);
-	if (!mo) return JS_TRUE;
-
-	f_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, f_obj, mo);
-
-	JS_DefineProperty(c, f_obj, "ObjectID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_ObjectID)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, f_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Title)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, f_obj, "ParentID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_ParentID)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, f_obj, "Directory", BOOLEAN_TO_JSVAL( mo->IsContainer() ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	if (!mo->IsContainer()) {
-		JS_DefineProperty(c, f_obj, "ResourceCount", INT_TO_JSVAL(mo->m_Resources.GetItemCount()), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineFunction(c, f_obj, "GetResourceURI", upnp_server_get_resource_uri, 1, 0);
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(f_obj));
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_server_get_file_uri)
-{
-	GPAC_MediaServerItem *server;
-	u32 id;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
-
-	server = upnp_server_get_device(upnp, c, obj);
-	if (!server) return JS_TRUE;
-	if (server->m_BrowseResults.IsNull()) return JS_TRUE;
-
-	id = JSVAL_TO_INT(argv[0]);
-	PLT_MediaObject *mo;
-	server->m_BrowseResults->Get(id, mo);
-	if (!mo) return JS_TRUE;
-
-	if (mo->m_Resources.GetItemCount()) {
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Resources[0].m_Uri) ) );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_get_server)
-{
-	JSObject *s_obj;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || !upnp->m_pAVCtrlPoint || (argc!=1)) return JS_FALSE;
-
-
-	GPAC_MediaServerItem *ms = NULL;
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 id = JSVAL_TO_INT(argv[0]);
-		ms = (GPAC_MediaServerItem *) gf_list_get(upnp->m_pAVCtrlPoint->m_MediaServers, id);
-	}
-	else if (JSVAL_IS_STRING(argv[0])) {
-		u32 i=0;
-		char *uuid = SMJS_CHARS(c, argv[0]);
-		while ((ms = (GPAC_MediaServerItem *) gf_list_enum(upnp->m_pAVCtrlPoint->m_MediaServers, &i))) {
-			if (ms->m_UUID==(const char *)uuid) break;
-		}
-		SMJS_FREE(c, uuid);
-	}
-	if (!ms) return JS_FALSE;
-	s_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, s_obj, upnp);
-
-	JS_DefineProperty(c, s_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ms->m_device->GetFriendlyName()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, s_obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ms->m_UUID ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, s_obj, "FilesCount", INT_TO_JSVAL(10), 0, 0, 0  | JSPROP_PERMANENT);
-	JS_DefineFunction(c, s_obj, "Browse", upnp_server_browse, 2, 0);
-	JS_DefineFunction(c, s_obj, "GetFile", upnp_server_get_file, 1, 0);
-	JS_DefineFunction(c, s_obj, "GetFileURI", upnp_server_get_file_uri, 1, 0);
-	JS_DefineFunction(c, s_obj, "HasParentDirectory", upnp_server_has_parent_dir, 0, 0);
-
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(s_obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_bind_renderer)
-{
-	SMJS_OBJ
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp) return JS_TRUE;
-	upnp->m_renderer_bound = GF_TRUE;
-
-	/*remove ourselves from the event filters since we will only be called through JS*/
-	gf_term_remove_event_filter(upnp->m_pTerm, &upnp->evt_filter);
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_share_resource)
-{
-	char *url, *host;
-	NPT_String resourceURI;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || !upnp->m_pMediaServer || !argc || !JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
-	url = SMJS_CHARS(c, argv[0]);
-	if (!url) return JS_TRUE;
-
-	host = NULL;
-	if (argc && JSVAL_IS_STRING(argv[1]) ) {
-		host = SMJS_CHARS(c, argv[1]);
-	}
-
-	resourceURI = upnp->m_pMediaServer->GetResourceURI(url, host);
-	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, resourceURI ) ));
-
-	SMJS_FREE(c, url);
-	SMJS_FREE(c, host);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_share_virtual_resource)
-{
-	Bool temp = GF_FALSE;
-	char *res_url, *res_val, *mime;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || !upnp->m_pMediaServer || (argc<2) || !JSVAL_IS_STRING(argv[0]) || !JSVAL_IS_STRING(argv[1]) ) return JS_TRUE;
-	res_url = SMJS_CHARS(c, argv[0]);
-	if (!res_url) return JS_TRUE;
-	res_val = SMJS_CHARS(c, argv[1]);
-	if (!res_val) {
-		SMJS_FREE(c, res_url);
-		return JS_TRUE;
-	}
-	mime = NULL;
-	if (argc==3) mime = SMJS_CHARS(c, argv[2]);
-	if ((argc==4) && JSVAL_IS_BOOLEAN(argv[3]) && (JSVAL_TO_BOOLEAN(argv[3])==JS_TRUE) ) temp = GF_TRUE;
-
-	upnp->m_pMediaServer->ShareVirtualResource(res_url, res_val, mime ? mime : "application/octet-stream", temp);
-	SMJS_FREE(c, res_url);
-	SMJS_FREE(c, res_val);
-	SMJS_FREE(c, mime);
-	return JS_TRUE;
-}
-
-
-static NPT_UInt8 GENERIC_SCPDXML[] = "<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\"><specVersion>  <major>1</major>   <minor>0</minor> </specVersion> <actionList>  <action>  <name>GetStatus</name>    <argumentList>    <argument>     <name>ResultStatus</name>     <direction>out</direction>      <relatedStateVariable>Status</relatedStateVariable>     </argument>   </argumentList>  </action> </actionList>  <serviceStateTable>  <stateVariable sendEvents=\"yes\">   <name>Status</name>    <dataType>boolean</dataType>   </stateVariable></serviceStateTable> </scpd>";
-
-
-static JSBool SMJS_FUNCTION(upnp_device_setup_service)
-{
-	char *name, *type, *id, *scpd_xml;
-	NPT_Result res;
-	SMJS_OBJ
-	SMJS_ARGS
-	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
-	if (!device) return JS_FALSE;
-	if (argc<3) return JS_FALSE;
-
-	name = SMJS_CHARS(c, argv[0]);
-	type = SMJS_CHARS(c, argv[1]);
-	id = SMJS_CHARS(c, argv[2]);
-
-	if (!name || !type || !id) {
-		SMJS_FREE(c, name);
-		SMJS_FREE(c, type);
-		SMJS_FREE(c, id);
-		return JS_FALSE;
-	}
-
-	scpd_xml = NULL;
-	if ((argc>3) && JSVAL_IS_STRING(argv[3])) scpd_xml = SMJS_CHARS(c, argv[3]);
-
-	GPAC_Service* service = new GPAC_Service(device, type, id, name);
-	res = service->SetSCPDXML((const char*) scpd_xml ? scpd_xml : (char *)GENERIC_SCPDXML);
-
-	SMJS_FREE(c, name);
-	SMJS_FREE(c, type);
-	SMJS_FREE(c, id);
-
-	if (res != NPT_SUCCESS) {
-		delete service;
-		return JS_FALSE;
-	}
-
-	gf_list_add(device->m_pServices, service);
-
-	service->SetupJS(c, device->m_pUPnP, device->obj);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(service->m_pObj) );
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(upnp_device_start)
-{
-	jsval sval;
-	char *str;
-	SMJS_OBJ
-	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
-	if (!device) return JS_FALSE;
-
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "PresentationURL", &sval) && JSVAL_IS_STRING(sval)) {
-		str = SMJS_CHARS(c, sval);
-		char *url = gf_url_concatenate(device->js_source, str);
-		SMJS_FREE(c, str);
-
-		/*we will use our media server to exchange the URL if file based
-			!!! THIS IS BROKEN IF MULTIPLE INTERFACES EXIST ON THE DEVICE !!!
-		*/
-		if (device->m_pUPnP->m_pMediaServer) {
-			device->m_PresentationURL = device->m_pUPnP->m_pMediaServer->GetResourceURI(url, NULL);
-		}
-		/*otherwise we can only use absolute URLs */
-		else if (strstr(url, "://") && !strstr(url, "file://")) {
-			device->m_PresentationURL = url;
-		}
-		gf_free(url);
-	}
-
-	str = NULL;
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelDescription", &sval) && JSVAL_IS_STRING(sval))
-		str = SMJS_CHARS(c, sval);
-
-	device->m_ModelDescription = str ? str : "GPAC Generic Device";
-	SMJS_FREE(c, str);
-
-	str = NULL;
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelURL", &sval) && JSVAL_IS_STRING(sval))
-		str = SMJS_CHARS(c, sval);
-	device->m_ModelURL = str ? str : "http://gpac.sourceforge.net";
-	SMJS_FREE(c, str);
-
-	str = NULL;
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelNumber", &sval) && JSVAL_IS_STRING(sval))
-		str = SMJS_CHARS(c, sval);
-	device->m_ModelNumber = str ? str : GPAC_FULL_VERSION;
-	SMJS_FREE(c, str);
-
-	str = NULL;
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelName", &sval) && JSVAL_IS_STRING(sval))
-		str = SMJS_CHARS(c, sval);
-	device->m_ModelName = str ? str : "GPAC Generic Device";
-	SMJS_FREE(c, str);
-
-	device->m_Manufacturer = "Telecom ParisTech";
-	device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
-
-	if (device->m_pUPnP->m_pGenericController) {
-		const char *opt = gf_cfg_get_key(device->m_pUPnP->m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices");
-		if (!opt || !strcmp(opt, "yes")) {
-			device->m_pUPnP->m_pGenericController->m_CtrlPoint->IgnoreUUID(device->GetUUID());
-		}
-	}
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "Run", &sval) && JSVAL_IS_OBJECT(sval)) {
-		device->obj = obj;
-		device->run_proc = sval;
-		gf_js_add_root(device->m_pUPnP->m_pJSCtx, &device->run_proc, GF_JSGC_VAL);
-	}
-	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "OnAction", &sval) && JSVAL_IS_OBJECT(sval)) {
-		device->obj = obj;
-		device->act_proc = sval;
-		gf_js_add_root(device->m_pUPnP->m_pJSCtx, &device->act_proc, GF_JSGC_VAL);
-	}
-	PLT_DeviceHostReference devRef(device);
-	device->m_pUPnP->m_pPlatinum->AddDevice(devRef);
-
-	return JS_TRUE;
-}
-
-#ifdef GPAC_UNUSED_FUNC
-static JSBool SMJS_FUNCTION(upnp_device_stop)
-{
-	SMJS_OBJ
-	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
-	if (!device) return JS_FALSE;
-
-	PLT_DeviceHostReference devRef(device);
-	device->m_pUPnP->m_pPlatinum->RemoveDevice(devRef);
-
-	return JS_TRUE;
-}
-#endif
-
-static GPAC_GenericDevice *upnp_create_generic_device(GF_UPnP *upnp, JSObject*global, const char *id, const char *name)
-{
-	GPAC_GenericDevice *device;
-	device = new GPAC_GenericDevice(name, id);
-	device->m_pUPnP = upnp;
-	device->js_source = "";
-
-	device->obj = JS_NewObject(upnp->m_pJSCtx, &upnp->upnpDeviceClass._class, 0, global);
-	gf_js_add_root(upnp->m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
-
-	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "ID", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, id) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, device->GetUUID()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "SetupService", upnp_device_setup_service, 0, 0);
-	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "Start", upnp_device_start, 0, 0);
-//	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "Stop", upnp_device_stop, 0, 0);
-	SMJS_SET_PRIVATE(upnp->m_pJSCtx, device->obj, device);
-	if (!upnp->m_Devices) upnp->m_Devices = gf_list_new();
-	gf_list_add(upnp->m_Devices, device);
-
-	return device;
-}
-
-static JSBool SMJS_FUNCTION(upnp_create_device)
-{
-	GPAC_GenericDevice *device;
-	char *id, *name;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc != 2)) return JS_FALSE;
-
-	id = SMJS_CHARS(c, argv[0]);
-	name = SMJS_CHARS(c, argv[1]);
-	if (!id || !name) {
-		SMJS_FREE(c, name);
-		SMJS_FREE(c, id);
-		return JS_FALSE;
-	}
-
-	device = upnp_create_generic_device(upnp, NULL, id, name);
-	if (device)
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(device->obj) );
-
-	SMJS_FREE(c, name);
-	SMJS_FREE(c, id);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(upnp_delete_device)
-{
-	GPAC_GenericDevice *device;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
-	if (!upnp || (argc != 1)) return JS_FALSE;
-
-	device = (GPAC_GenericDevice *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!device) return JS_FALSE;
-
-	gf_list_del_item(upnp->m_Devices, device);
-	device->DetachJS(c);
-	PLT_DeviceHostReference devRef = PLT_DeviceHostReference(device);
-	upnp->m_pPlatinum->RemoveDevice(devRef);
-	devRef.Detach();
-	return JS_TRUE;
-}
-
-Bool GF_UPnP::LoadJS(GF_TermExtJS *param)
-{
-	u32 i, count;
-	JSPropertySpec upnpClassProps[] = {
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec upnpClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("BindRenderer", upnp_bind_renderer, 0),
-		SMJS_FUNCTION_SPEC("GetMediaServer", upnp_get_server, 1),
-		SMJS_FUNCTION_SPEC("GetMediaRenderer", upnp_get_renderer, 1),
-		SMJS_FUNCTION_SPEC("ShareResource", upnp_share_resource, 1),
-		SMJS_FUNCTION_SPEC("ShareVirtualResource", upnp_share_virtual_resource, 2),
-		SMJS_FUNCTION_SPEC("GetDevice", upnp_get_device, 1),
-		SMJS_FUNCTION_SPEC("FindService", upnp_find_service, 1),
-		SMJS_FUNCTION_SPEC("CreateDevice", upnp_create_device, 2),
-		SMJS_FUNCTION_SPEC("DeleteDevice", upnp_delete_device, 1),
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-
-	if (param->unload) {
-		if (m_nbJSInstances) {
-			m_nbJSInstances--;
-			if (m_pJSCtx==param->ctx) m_nbJSInstances = 0;
-
-			if (!m_nbJSInstances) {
-				if (m_pGenericController) {
-					u32 i, count;
-					count = gf_list_count(m_pGenericController->m_Devices);
-					for (i=0; i<count; i++) {
-						GPAC_DeviceItem *item = (GPAC_DeviceItem *)gf_list_get(m_pGenericController->m_Devices, i);
-						item->DetachJS();
-						item->js_ctx = NULL;
-					}
-				}
-				if (m_Devices) {
-					while (gf_list_count(m_Devices)) {
-						GPAC_GenericDevice *device = (GPAC_GenericDevice*)gf_list_get(m_Devices, 0);
-						gf_list_rem(m_Devices, 0);
-						device->DetachJS(m_pJSCtx);
-					}
-					gf_list_del(m_Devices);
-					m_Devices = NULL;
-				}
-				m_pJSCtx = NULL;
-			}
-		}
-		return GF_FALSE;
-	}
-	if (m_nbJSInstances) {
-		/*FIXME - this was possible in previous version of SpiderMonkey, don't know how to fix that for new ones*/
-#if (JS_VERSION>=185)
-		m_nbJSInstances++;
-		return GF_FALSE;
-#else
-		JS_DefineProperty((JSContext*)param->ctx, (JSObject*)param->global, "UPnP", OBJECT_TO_JSVAL(m_pObj), 0, 0, 0);
-		m_nbJSInstances++;
-#endif
-		return GF_FALSE;
-	}
-
-	m_pJSCtx = (JSContext*)param->ctx;
-	/*setup JS bindings*/
-	JS_SETUP_CLASS(upnpClass, "UPNPMANAGER", JSCLASS_HAS_PRIVATE, upnp_getProperty, upnp_setProperty, JS_FinalizeStub);
-
-	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpClass, 0, 0, upnpClassProps, upnpClassFuncs, 0, 0);
-	m_pObj = JS_DefineObject(m_pJSCtx, (JSObject*)param->global, "UPnP", &upnpClass._class, 0, 0);
-	SMJS_SET_PRIVATE(m_pJSCtx, m_pObj, this);
-
-	JS_SETUP_CLASS(upnpDeviceClass, "UPNPAVDEVICE", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-
-	/*setup JS bindings*/
-	JSPropertySpec upnpDeviceClassProps[] = {
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec upnpDeviceClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("FindService", upnp_device_find_service, 0),
-		SMJS_FUNCTION_SPEC("GetService", upnp_device_get_service, 0),
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-	JS_SETUP_CLASS(upnpGenericDeviceClass, "UPNPDEVICE", JSCLASS_HAS_PRIVATE, upnpdevice_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpGenericDeviceClass, 0, 0, upnpDeviceClassProps, upnpDeviceClassFuncs, 0, 0);
-
-	JS_SETUP_CLASS(upnpServiceClass, "UPNPSERVICEDEVICE", JSCLASS_HAS_PRIVATE, upnpservice_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpServiceClass, 0, 0, 0, 0, 0, 0);
-
-	m_nbJSInstances=1;
-
-	upnp_init_time = gf_sys_clock();
-
-	count = gf_cfg_get_key_count(m_pTerm->user->config, "UPnPDevices");
-	for (i=0; i<count; i++) {
-		char szFriendlyName[1024], szFile[1024], *sep;
-		const char *device_id = gf_cfg_get_key_name(m_pTerm->user->config, "UPnPDevices", i);
-		const char *dev = gf_cfg_get_key(m_pTerm->user->config, "UPnPDevices", device_id);
-
-		if (!strncmp(dev, "off;", 4)) continue;
-
-		if (!strncmp(dev, "on;", 3)) dev += 3;
-
-		sep = (char*)strchr(dev, ';');
-		if (!sep) continue;
-		sep[0] = 0;
-		strcpy(szFile, dev);
-		sep[0] = ';';
-
-		if (!sep[1]) continue;
-		strcpy(szFriendlyName, sep+1);
-
-		FILE *f = gf_fopen(szFile, "rt");
-		if (!f) continue;
-
-
-		GPAC_GenericDevice *device = upnp_create_generic_device(this, (JSObject*)param->global, device_id, szFriendlyName);
-		device->js_source = szFile;
-
-		jsval aval;
-		gf_fseek(f, 0, SEEK_END);
-		u32 size = (u32) gf_ftell(f);
-		gf_fseek(f, 0, SEEK_SET);
-		char *buf = (char*)gf_malloc(sizeof(char)*(size+1));
-		size = (u32) fread(buf, 1, size, f);
-		buf[size]=0;
-		/*evaluate the script on the object only*/
-		if (JS_EvaluateScript(m_pJSCtx, device->obj, buf, size, 0, 0, &aval) != JS_TRUE) {
-			gf_js_remove_root(m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] Unable to load device %s: script error in %s\n", szFriendlyName, szFile));
-			gf_list_del_item(m_Devices, device);
-			delete device;
-		}
-		gf_fclose(f);
-		gf_free(buf);
-	}
-	return GF_TRUE;
-}
-
-#endif
-
-static Bool upnp_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt;
-	GF_UPnP *upnp = (GF_UPnP *) termext->udta;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "UPnP", "Enabled");
-		if (!opt) {
-			//UPnP is disabled by default on all platforms until we have a more stable state on load and exit
-			opt = "no";
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in GPAC config file\n"));
-			gf_modules_set_option((GF_BaseInterface*)termext, "UPnP", "Enabled", opt);
-		}
-		if (!strcmp(opt, "yes")) {
-			upnp->Load((GF_Terminal *)param);
-			return GF_TRUE;
-		}
-		return GF_FALSE;
-
-	case GF_TERM_EXT_STOP:
-		upnp->Unload();
-		break;
-
-	case GF_TERM_EXT_PROCESS:
-#ifdef GPAC_HAS_SPIDERMONKEY
-		if (upnp->m_Devices) {
-			u32 now;
-			now = gf_sys_clock() - upnp->upnp_init_time;
-			if (now - upnp->last_time > 200) {
-				u32 i, count, arg_set;
-				jsval argv[1], rval;
-				upnp->LockJavascript(GF_TRUE);
-				arg_set = 0;
-				count = gf_list_count(upnp->m_Devices);
-				for (i=0; i<count; i++) {
-					GPAC_GenericDevice *device = (GPAC_GenericDevice *)gf_list_get(upnp->m_Devices, i);
-					if (!JSVAL_IS_NULL(device->run_proc)) {
-						if (!arg_set) {
-							argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(upnp->m_pJSCtx, (Double)now / 1000.0) );
-							arg_set = 1;
-						}
-						JS_CallFunctionValue(upnp->m_pJSCtx, device->obj, device->run_proc, 1, argv, &rval);
-					}
-				}
-				upnp->LockJavascript(GF_FALSE);
-				upnp->last_time = now;
-			}
-		}
-#endif
-		break;
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-	case GF_TERM_EXT_JSBIND:
-		return upnp->LoadJS((GF_TermExtJS*)param);
-#endif
-	}
-	return GF_FALSE;
-}
-
-
-GF_TermExt *upnp_new()
-{
-	GF_TermExt *dr;
-	GF_UPnP *ext;
-	dr = (GF_TermExt *) gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC UPnP Platinum", "gpac distribution");
-
-	dr->process = upnp_process;
-	ext = new GF_UPnP();
-	dr->udta = ext;
-	ext->term_ext = dr;
-	ext->evt_filter.on_event = upnp_on_term_event;
-	ext->evt_filter.udta = ext;
-
-	dr->caps = GF_TERM_EXTENSION_NOT_THREADED;
-#ifdef GPAC_HAS_SPIDERMONKEY
-	dr->caps |= GF_TERM_EXTENSION_JS;
-#endif
-	return dr;
-}
-
-
-void upnp_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_UPnP *ext = (GF_UPnP *) dr->udta;
-	delete ext;
-	gf_free(dr);
-}
-

gpac-0.8.0.tar.gz/modules/platinum/Makefile Deleted

@@ -1,63 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/platinum
-
-CFLAGS= $(CXXFLAGS) -I"$(SRC_PATH)/include" -I$(SRC_PATH)/extra_lib/include/platinum/ -DGPAC_HAVE_CONFIG_H -I../..
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKLIBS= -lgpac -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread -laxTLS
-LOCAL_LIB=../../bin/gcc -L../../extra_lib/lib/gcc
-
-#common objects
-OBJS=GPACFileMediaServer.o GPACMediaController.o GPACMediaRenderer.o GenericDevice.o GPACPlatinum.o 
-
-ifeq ($(CONFIG_JS),no)
-else
-CFLAGS+= $(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+=-L../../extra_lib/lib/gcc
-endif
-LINKLIBS+= $(JS_LIBS)
-endif
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_platinum$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols platinum.def 
-endif
-
-ifeq ($(CONFIG_DARWIN), yes)
-LDFLAGS+=-framework Foundation
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CXX) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CXX) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/psvr Deleted

gpac-0.8.0.tar.gz/modules/psvr/psvr.c Deleted

@@ -1,213 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2011-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / PSVR input 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/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/nodes_mpeg4.h>
-
-#include <hidapi/hidapi.h>
-
-typedef struct
-{
-	GF_ObjectManager *odm;
-	GF_Terminal *term;
-	GF_Thread *th;
-	Bool do_run;
-	void * device;
-
-	Float yaw, pitch, roll;
-	GF_TermEventFilter evt_filter;
-	Bool reset_mx;
-	Bool is_active;
-} GF_PSVR;
-
-#define PSVR_VENDOR_ID	0x054c
-#define PSVR_PRODUCT_ID	0x09af
-
-#define ACCELERATION_COEF 0.00003125f * GF_PI / 180
-
-static s16 read_s16(unsigned char *buffer, int offset)
-{
-	int16_t v;
-	v = buffer[offset];
-	v |= buffer[offset+1] << 8;
-	return v;
-}
-
-Bool psvr_on_event(void *udta, GF_Event *event, Bool consumed_by_compositor)
-{
-	GF_PSVR *psvr = (GF_PSVR *)udta;
-	if (event->type==GF_EVENT_KEYDOWN) {
-		if (event->key.key_code==GF_KEY_HOME) {
-			psvr->reset_mx = GF_TRUE;
-		}
-	}
-	else if (event->type==GF_EVENT_SENSOR_REQUEST) {
-		if (event->activate_sensor.sensor_type==GF_EVENT_SENSOR_ORIENTATION) {
-			psvr->is_active = event->activate_sensor.activate;
-			return GF_TRUE;
-		}
-	}
-	return GF_FALSE;
-}
-
-static u32 psvr_run(void *__psvr)
-{
-	GF_PSVR *psvr = (GF_PSVR *)__psvr;
-
-	hid_init();
-
-	psvr->device = hid_open(PSVR_VENDOR_ID, PSVR_PRODUCT_ID, 0);
-	if(!psvr->device) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PSVR] Failed to open PSVR HID device\n"));
-		return 0;
-	}
-
-	psvr->evt_filter.udta = psvr;
-	psvr->evt_filter.on_event = psvr_on_event;
-	gf_term_add_event_filter(psvr->term, &psvr->evt_filter);
-
-	psvr->is_active = GF_TRUE;
-	psvr->do_run = GF_TRUE;
-	while (psvr->do_run && psvr->device) {
-		unsigned char buffer[64];
-		//read device with 1 ms timeout
-		int size = hid_read_timeout(psvr->device, buffer, 64, 1);
-
-		if (size == 64) {
-			GF_Event evt;
-			s32 x_acc = read_s16(buffer, 20) + read_s16(buffer, 36);
-			s32 y_acc = read_s16(buffer, 22) + read_s16(buffer, 38);
-			s32 z_acc = read_s16(buffer, 24) + read_s16(buffer, 40);
-
-			if (psvr->reset_mx) {
-				psvr->reset_mx = 0;
-				psvr->yaw = psvr->pitch = psvr->roll = 0;
-			}
-
-			psvr->roll += -y_acc * ACCELERATION_COEF;
-			psvr->yaw += x_acc * ACCELERATION_COEF;
-			psvr->pitch += z_acc * ACCELERATION_COEF;
-
-			if (!psvr->is_active ) continue;
-
-			//post our event
-			memset(&evt, 0, sizeof(GF_Event));
-			evt.type = GF_EVENT_SENSOR_ORIENTATION;
-			evt.sensor.x = psvr->yaw - GF_PI;
-			evt.sensor.y = psvr->pitch;
-			evt.sensor.z = GF_PI2 - psvr->roll;
-			evt.sensor.w = 0;
-
-			gf_term_user_event(psvr->term, &evt);
-		}
-	}
-	if (psvr->device) {
-		hid_close(psvr->device);
-		psvr->device = 0;
-	}
-	gf_term_remove_event_filter(psvr->term, &psvr->evt_filter);
-	psvr->term = NULL;
-	hid_exit();
-	return 0;
-}
-
-static Bool psvr_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt;
-	GF_PSVR *psvr = termext->udta;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		psvr->term = (GF_Terminal *) param;
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "PSVR", "Enabled");
-		if (!opt || strcmp(opt, "yes")) return 0;
-
-		gf_th_run(psvr->th, psvr_run, psvr);
-		return 1;
-
-	case GF_TERM_EXT_STOP:
-		psvr->do_run = GF_FALSE;
-		break;
-	}
-	return 0;
-}
-
-
-GF_TermExt *psvr_new()
-{
-	GF_TermExt *dr;
-	GF_PSVR *psvr;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "PSVR Input", "gpac distribution");
-
-	GF_SAFEALLOC(psvr, GF_PSVR);
-	dr->process = psvr_process;
-	dr->udta = psvr;
-	psvr->th = gf_th_new("PSVR");
-
-	return dr;
-}
-
-
-void psvr_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_PSVR *psvr= dr->udta;
-	gf_th_del(psvr->th);
-	gf_free(psvr);
-	gf_free(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)psvr_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		psvr_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( osd )

gpac-0.8.0.tar.gz/modules/raw_out Deleted

gpac-0.8.0.tar.gz/modules/raw_out/Makefile Deleted

@@ -1,58 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/raw_out
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -DGPAC_HAVE_CONFIG_H -I../../
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(ENABLE_JOYSTICK), yes)
-CFLAGS+=-DENABLE_JOYSTICK
-endif
-
-ifeq ($(ENABLE_JOYSTICK_NO_CURSOR), yes)
-CFLAGS+=-DENABLE_JOYSTICK_NO_CURSOR
-endif
-
-#common obj
-OBJS= raw_video.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_raw_out$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols raw_out.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_raw_out-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
-endif
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/raw_out/raw_video.c Deleted

@@ -1,321 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / DirectX audio and video render module
- *
- *  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.
- *
- */
-
-
-
-/*driver interfaces*/
-#include <gpac/modules/video_out.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/user.h>
-#include <gpac/list.h>
-#include <gpac/constants.h>
-
-#include <gpac/setup.h>
-
-typedef struct
-{
-	char *pixels;
-	u32 width, height;
-	u32 pixel_format, bpp;
-	Bool passthrough;
-
-	u32 sample_rate, nb_channels, chan_cfg;
-} RawContext;
-
-#define RAWCTX	RawContext *rc = (RawContext *)dr->opaque
-
-static GF_Err raw_resize(GF_VideoOutput *dr, u32 w, u32 h)
-{
-	RAWCTX;
-	if (rc->pixels) gf_free(rc->pixels);
-	rc->width = w;
-	rc->height = h;
-	rc->pixels = (char*)gf_malloc(sizeof(char) * rc->bpp * w * h);
-	if (!rc->pixels) return GF_OUT_OF_MEM;
-	return GF_OK;
-}
-
-static GF_Err RAW_BlitPassthrough(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
-{
-	return GF_OK;
-}
-
-GF_Err RAW_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
-{
-	const char *opt;
-	RAWCTX;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "RAWVideo", "RawOutput");
-	if (opt && !strcmp(opt, "null")) {
-		rc->passthrough = GF_TRUE;
-		dr->Blit = RAW_BlitPassthrough;
-		dr->hw_caps |= GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_HAS_YUV_OVERLAY;
-	}
-
-	if (init_flags & GF_TERM_WINDOW_TRANSPARENT) {
-		rc->bpp = 4;
-		rc->pixel_format = GF_PIXEL_ARGB;
-	} else {
-		rc->bpp = 3;
-		rc->pixel_format = GF_PIXEL_RGB_24;
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "RAWVideo", "PixelFormat");
-		if (opt) {
-			if (!strcmp(opt, "555")) {
-				rc->bpp = 2;
-				rc->pixel_format = GF_PIXEL_RGB_555;
-			} else if (!strcmp(opt, "565")) {
-				rc->bpp = 2;
-				rc->pixel_format = GF_PIXEL_RGB_565;
-			} else if (!strcmp(opt, "bgr")) {
-				rc->bpp = 3;
-				rc->pixel_format = GF_PIXEL_BGR_24;
-			} else if (!strcmp(opt, "rgb")) {
-				rc->bpp = 3;
-				rc->pixel_format = GF_PIXEL_RGB_24;
-			} else if (!strcmp(opt, "bgr32")) {
-				rc->bpp = 4;
-				rc->pixel_format = GF_PIXEL_BGR_32;
-			} else if (!strcmp(opt, "rgb32")) {
-				rc->bpp = 4;
-				rc->pixel_format = GF_PIXEL_RGB_32;
-			} else if (!strcmp(opt, "rgba")) {
-				rc->bpp = 4;
-				rc->pixel_format = GF_PIXEL_RGBA;
-			} else if (!strcmp(opt, "argb")) {
-				rc->bpp = 4;
-				rc->pixel_format = GF_PIXEL_ARGB;
-			}
-		}
-	}
-	raw_resize(dr, 100, 100);
-	return GF_OK;
-}
-
-
-static void RAW_Shutdown(GF_VideoOutput *dr)
-{
-	RAWCTX;
-	if (rc->pixels) gf_free(rc->pixels);
-	rc->pixels = NULL;
-}
-
-
-static GF_Err RAW_Flush(GF_VideoOutput *dr, GF_Window *dest)
-{
-#if 0
-	RAWCTX;
-	char szName[1024];
-	sprintf(szName, "test%d.png", gf_sys_clock());
-	gf_img_png_enc_file(rc->pixels, rc->width, rc->height, rc->width*rc->bpp, rc->pixel_format, szName);
-#endif
-	return GF_OK;
-}
-
-static GF_Err RAW_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-{
-	RAWCTX;
-	if (do_lock) {
-		if (!vi) return GF_BAD_PARAM;
-		memset(vi, 0, sizeof(GF_VideoSurface));
-		vi->height = rc->height;
-		vi->width = rc->width;
-		vi->video_buffer = rc->pixels;
-		vi->pitch_x = rc->bpp;
-		vi->pitch_y = rc->bpp * vi->width;
-		vi->pixel_format = rc->pixel_format;
-	}
-	return GF_OK;
-}
-
-static GF_Err RAW_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
-{
-	if (evt) {
-		switch (evt->type) {
-		case GF_EVENT_VIDEO_SETUP:
-			if (evt->setup.opengl_mode) return GF_NOT_SUPPORTED;
-			return raw_resize(dr, evt->setup.width, evt->setup.height);
-		}
-	}
-	return GF_OK;
-}
-
-GF_VideoOutput *NewRawVideoOutput()
-{
-	RawContext *pCtx;
-	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-	memset(driv, 0, sizeof(GF_VideoOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Raw Video Output", "gpac distribution")
-
-	pCtx = (RawContext*)gf_malloc(sizeof(RawContext));
-	memset(pCtx, 0, sizeof(RawContext));
-
-	driv->opaque = pCtx;
-
-	driv->Flush = RAW_Flush;
-	driv->LockBackBuffer = RAW_LockBackBuffer;
-	driv->Setup = RAW_Setup;
-	driv->Shutdown = RAW_Shutdown;
-	driv->ProcessEvent = RAW_ProcessEvent;
-	return driv;
-}
-
-void DeleteRawVideoOutput(void *ifce)
-{
-	RawContext *rc;
-	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-	rc = (RawContext *)driv->opaque;
-	gf_free(rc);
-	gf_free(driv);
-}
-
-
-static GF_Err RAW_AudioSetup(GF_AudioOutput *dr, void *os_handle, u32 num_buffers, u32 total_duration)
-{
-	return GF_OK;
-}
-
-static void RAW_AudioShutdown(GF_AudioOutput *dr)
-{
-}
-
-/*we assume what was asked is what we got*/
-static GF_Err RAW_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
-{
-	RAWCTX;
-	rc->sample_rate = *SampleRate;
-	rc->nb_channels = *NbChannels;
-	rc->chan_cfg = channel_cfg;
-	return GF_OK;
-}
-
-static void RAW_WriteAudio(GF_AudioOutput *dr)
-{
-	char buf[4096];
-	dr->FillBuffer(dr->audio_renderer, buf, 4096);
-}
-
-static void RAW_Play(GF_AudioOutput *dr, u32 PlayType)
-{
-}
-
-static void RAW_SetVolume(GF_AudioOutput *dr, u32 Volume)
-{
-}
-
-static void RAW_SetPan(GF_AudioOutput *dr, u32 Pan)
-{
-}
-
-static GF_Err RAW_QueryOutputSampleRate(GF_AudioOutput *dr, u32 *desired_samplerate, u32 *NbChannels, u32 *nbBitsPerSample)
-{
-	return GF_OK;
-}
-
-static u32 RAW_GetAudioDelay(GF_AudioOutput *dr)
-{
-	return 0;
-}
-
-static u32 RAW_GetTotalBufferTime(GF_AudioOutput *dr)
-{
-	return 0;
-}
-
-void *NewRawAudioOutput()
-{
-	RawContext *ctx;
-	GF_AudioOutput *driv;
-	ctx = (RawContext*)gf_malloc(sizeof(RawContext));
-	memset(ctx, 0, sizeof(RawContext));
-	driv = (GF_AudioOutput*)gf_malloc(sizeof(GF_AudioOutput));
-	memset(driv, 0, sizeof(GF_AudioOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "Raw Audio Output", "gpac distribution")
-
-	driv->opaque = ctx;
-
-	driv->SelfThreaded = GF_FALSE;
-	driv->Setup = RAW_AudioSetup;
-	driv->Shutdown = RAW_AudioShutdown;
-	driv->ConfigureOutput = RAW_ConfigureOutput;
-	driv->GetAudioDelay = RAW_GetAudioDelay;
-	driv->GetTotalBufferTime = RAW_GetTotalBufferTime;
-	driv->SetVolume = RAW_SetVolume;
-	driv->SetPan = RAW_SetPan;
-	driv->Play = RAW_Play;
-	driv->QueryOutputSampleRate = RAW_QueryOutputSampleRate;
-	driv->WriteAudio = RAW_WriteAudio;
-	return driv;
-}
-
-static void DeleteAudioOutput(void *ifce)
-{
-	GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
-	RawContext *ctx = (RawContext*)dr->opaque;
-	gf_free(ctx);
-	gf_free(dr);
-}
-
-
-#ifndef GPAC_STANDALONE_RENDER_2D
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_VIDEO_OUTPUT_INTERFACE,
-		GF_AUDIO_OUTPUT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewRawVideoOutput();
-	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewRawAudioOutput();
-	return NULL;
-}
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_VIDEO_OUTPUT_INTERFACE:
-		DeleteRawVideoOutput((GF_VideoOutput *)ifce);
-		break;
-	case GF_AUDIO_OUTPUT_INTERFACE:
-		DeleteAudioOutput((GF_AudioOutput *)ifce);
-		break;
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( raw_out )
-
-#endif

gpac-0.8.0.tar.gz/modules/redirect_av Deleted

gpac-0.8.0.tar.gz/modules/redirect_av/Makefile Deleted

gpac-0.8.0.tar.gz/modules/redirect_av/ffmpeg_ts_muxer.c Deleted

@@ -1,417 +0,0 @@
-#include "ts_muxer.h"
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-
-#ifdef AVIO_FLAG_WRITE
-#include <libavutil/samplefmt.h>
-#define url_fopen avio_open
-#define url_fclose avio_close
-#define URL_WRONLY	AVIO_FLAG_WRITE
-#define av_write_header(__a)	avformat_write_header(__a, NULL)
-#define dump_format av_dump_format
-
-#define SAMPLE_FMT_S16 AV_SAMPLE_FMT_S16
-#endif
-
-
-
-#define STREAM_FRAME_RATE 25 /* 25 images/s */
-#define STREAM_NB_FRAMES  ((int)(STREAM_DURATION * STREAM_FRAME_RATE))
-#define STREAM_PIX_FMT PIX_FMT_YUV420P /* default pix_fmt */
-
-#define PACKETS_BUFFER_LEN 1024
-
-struct avr_ts_muxer {
-	AVFormatContext *oc;
-	AVStream *audio_st, *video_st;
-	AVPacketList * videoPackets;
-	AVPacketList * audioPackets;
-	volatile Bool encode;
-	GF_Mutex *videoMx, *audioMx;
-	GF_Thread * tsEncodingThread;
-	const char * destination;
-};
-
-static Bool has_packet_ready(GF_AbstractTSMuxer* ts, GF_Mutex * mx, AVPacketList ** pkts) {
-	Bool ret;
-	gf_mx_p(mx);
-	ret = (*pkts) != NULL;
-	gf_mx_v(mx);
-	return ret;
-}
-
-
-/*!
- * Wait for a packet on a given queue
- * \param ts The muxer
- * \param mx The mutex to use
- * \param pkts The list of packets to watch
- * \param idx a pointer to the index in the list
- * \return NULL if encoding is ended, the first packet available otherwise
- */
-static AVPacketList * wait_for_packet(GF_AbstractTSMuxer* ts, GF_Mutex * mx, AVPacketList ** pkts) {
-	AVPacketList * p;
-	gf_mx_p(mx);
-	while (ts->encode && !(*pkts)) {
-		gf_mx_v(mx);
-		gf_mx_p(mx);
-		gf_sleep(1);
-	}
-	if (!ts->encode) {
-		gf_mx_v(mx);
-		return NULL;
-	}
-	p = *pkts;
-	*pkts = p->next;
-	gf_mx_v(mx);
-	return p;
-}
-
-
-static u32 ts_interleave_thread_run(void *param) {
-	GF_AbstractTSMuxer * mux = (GF_AbstractTSMuxer *) param;
-	AVStream * video_st = mux->video_st;
-	AVStream * audio_st = mux->audio_st;
-	u64 audio_pts, video_pts;
-	u64 audioSize, videoSize, videoKbps, audioKbps;
-	u32 pass;
-	u32 now, start;
-	/* open the output file, if needed */
-	if (!(mux->oc->oformat->flags & AVFMT_NOFILE)) {
-		if (url_fopen(&mux->oc->pb, mux->destination, URL_WRONLY) < 0) {
-			fprintf(stderr, "Could not open '%s'\n", mux->destination);
-			return 0;
-		}
-	}
-	/* write the stream header, if any */
-	av_write_header(mux->oc);
-	audio_pts = video_pts = 0;
-	// Buffering...
-	gf_sleep(1000);
-	now = start = gf_sys_clock();
-	audioSize = videoSize = 0;
-	audioKbps = videoKbps = 0;
-	pass = 0;
-	while ( mux->encode) {
-		pass++;
-		if (0== (pass%16)) {
-			now = gf_sys_clock();
-			if (now - start > 1000) {
-				videoKbps = videoSize * 8000 / (now-start) / 1024;
-				audioKbps = audioSize * 8000 / (now-start) / 1024;
-				audioSize = videoSize = 0;
-				start = now;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("\rPTS audio="LLU" ("LLU"kbps), video="LLU" ("LLU"kbps)", audio_pts, audioKbps, video_pts, videoKbps));
-			}
-		}
-		/* write interleaved audio and video frames */
-		if (!video_st ||
-		        (audio_pts == AV_NOPTS_VALUE && has_packet_ready(mux, mux->audioMx, &mux->audioPackets)) ||
-		        ((audio_st && audio_pts < video_pts && audio_pts!= AV_NOPTS_VALUE))) {
-			AVPacketList * pl = wait_for_packet(mux, mux->audioMx, &mux->audioPackets);
-			if (!pl)
-				goto exit;
-			audio_pts = pl->pkt.pts ;
-			audioSize+=pl->pkt.size;
-			if (pl->pkt.pts == AV_NOPTS_VALUE) {
-				pl->pkt.pts = 0;
-			}
-			if (av_interleaved_write_frame(mux->oc, &(pl->pkt)) < 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] : failed to write audio interleaved frame audio_pts="LLU", video_pts="LLU"\n", audio_pts, video_pts));
-			}
-			gf_free(pl);
-		} else {
-			AVPacketList * pl = wait_for_packet(mux, mux->videoMx, &mux->videoPackets);
-			if (!pl)
-				goto exit;
-			video_pts = pl->pkt.pts;
-			/* write the compressed frame in the media file */
-			if (0 && audio_pts != AV_NOPTS_VALUE && audio_pts > video_pts && pl->next) {
-				u32 skipped = 0;
-				u64 first = video_pts;
-				/* We may be too slow... */
-				gf_mx_p(mux->videoMx);
-				while (video_pts < audio_pts && pl->next) {
-					AVPacketList * old = pl;
-					// We skip frames...
-					pl = pl->next;
-					video_pts = pl->pkt.pts;
-					skipped++;
-					gf_free(old);
-				}
-				mux->videoPackets = pl->next;
-				gf_mx_v(mux->videoMx);
-				if (skipped > 0)
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Skipped %u video frames, frame was "LLU", but is now "LLU"\n", skipped, first, video_pts));
-			}
-			videoSize+=pl->pkt.size;
-			video_pts = pl->pkt.pts; // * video_st->time_base.num / video_st->time_base.den;
-			assert( video_pts);
-			if (av_interleaved_write_frame(mux->oc, &(pl->pkt)) < 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] : failed to write video interleaved frame audio_pts="LLU", video_pts="LLU"\n", audio_pts, video_pts));
-			}
-			gf_free(pl);
-		}
-		gf_sleep(1);
-	}
-exit:
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Ending TS thread...\n"));
-	av_write_trailer(mux->oc);
-	if (!(mux->oc->oformat->flags & AVFMT_NOFILE)) {
-		/* close the output file */
-		url_fclose(mux->oc->pb);
-	}
-	return 0;
-}
-
-
-#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
-#define GUESS_FORMAT guess_stream_format
-#else
-#define GUESS_FORMAT av_guess_format
-#endif
-
-GF_AbstractTSMuxer * ts_amux_new(GF_AVRedirect * avr, u32 videoBitrateInBitsPerSec, u32 width, u32 height, u32 audioBitRateInBitsPerSec) {
-	GF_AbstractTSMuxer * ts = (GF_AbstractTSMuxer*)gf_malloc( sizeof(GF_AbstractTSMuxer));
-	memset( ts, 0, sizeof( GF_AbstractTSMuxer));
-	ts->oc = avformat_alloc_context();
-	ts->destination = avr->destination;
-	av_register_all();
-	ts->oc->oformat = GUESS_FORMAT(NULL, avr->destination, NULL);
-	if (!ts->oc->oformat)
-		ts->oc->oformat = GUESS_FORMAT("mpegts", NULL, NULL);
-	assert( ts->oc->oformat);
-#if REDIRECT_AV_AUDIO_ENABLED
-
-#ifdef FF_API_AVFRAME_LAVC
-	ts->audio_st = avformat_new_stream(ts->oc, avr->audioCodec);
-#else
-	ts->audio_st = av_new_stream(ts->oc, avr->audioCodec->id);
-#endif
-	{
-		AVCodecContext * c = ts->audio_st->codec;
-		c->codec_id = avr->audioCodec->id;
-		c->codec_type = AVMEDIA_TYPE_AUDIO;
-		/* put sample parameters */
-		c->sample_fmt = SAMPLE_FMT_S16;
-		c->bit_rate = audioBitRateInBitsPerSec;
-		c->sample_rate = avr->audioSampleRate;
-		c->channels = 2;
-		c->time_base.num = 1;
-		c->time_base.den = 1000;
-		// some formats want stream headers to be separate
-		if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER)
-			c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-	}
-#endif
-
-#ifdef FF_API_AVFRAME_LAVC
-	ts->video_st = avformat_new_stream(ts->oc, avr->videoCodec);
-#else
-	ts->video_st = av_new_stream(ts->oc, avr->videoCodec->id);
-#endif
-	{
-		AVCodecContext * c = ts->video_st->codec;
-		c->codec_id = avr->videoCodec->id;
-		c->codec_type = AVMEDIA_TYPE_VIDEO;
-
-		/* put sample parameters */
-		c->bit_rate = videoBitrateInBitsPerSec;
-		/* resolution must be a multiple of two */
-		c->width = width;
-		c->height = height;
-		/* time base: this is the fundamental unit of time (in seconds) in terms
-		   of which frame timestamps are represented. for fixed-fps content,
-		   timebase should be 1/framerate and timestamp increments should be
-		   identically 1. */
-		c->time_base.den = STREAM_FRAME_RATE;
-		c->time_base.num = 1;
-		c->gop_size = 12; /* emit one intra frame every twelve frames at most */
-		c->pix_fmt = STREAM_PIX_FMT;
-		if (c->codec_id == CODEC_ID_MPEG2VIDEO) {
-			/* just for testing, we also add B frames */
-			c->max_b_frames = 2;
-		}
-		if (c->codec_id == CODEC_ID_MPEG1VIDEO) {
-			/* Needed to avoid using macroblocks in which some coeffs overflow.
-			   This does not happen with normal video, it just happens here as
-			   the motion of the chroma plane does not match the luma plane. */
-			c->mb_decision=2;
-		}
-		// some formats want stream headers to be separate
-		if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER)
-			c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
-	}
-	//av_set_pts_info(ts->audio_st, 33, 1, audioBitRateInBitsPerSec);
-
-#ifndef AVIO_FLAG_WRITE
-	/* set the output parameters (must be done even if no
-	   parameters). */
-	if (av_set_parameters(ts->oc, NULL) < 0) {
-		fprintf(stderr, "Invalid output format parameters\n");
-		return NULL;
-	}
-#endif
-
-	dump_format(ts->oc, 0, avr->destination, 1);
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] DUMPING to %s...\n", ts->destination));
-
-#if (LIBAVCODEC_VERSION_MAJOR<55)
-	if (avcodec_open(ts->video_st->codec, avr->videoCodec) < 0) {
-#else
-	if (avcodec_open2(ts->video_st->codec, avr->videoCodec, NULL) < 0) {
-#endif
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open video codec\n"));
-		return NULL;
-	}
-#if REDIRECT_AV_AUDIO_ENABLED
-#if (LIBAVCODEC_VERSION_MAJOR<55)
-	if (avcodec_open(ts->audio_st->codec, avr->audioCodec) < 0) {
-#else
-	if (avcodec_open2(ts->audio_st->codec, avr->audioCodec, NULL) < 0) {
-#endif
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open audio codec\n"));
-		return NULL;
-	}
-	ts->audioMx = gf_mx_new("TS_AudioMx");
-#endif
-	ts->videoMx = gf_mx_new("TS_VideoMx");
-	ts->tsEncodingThread = gf_th_new("ts_interleave_thread_run");
-	ts->encode = GF_TRUE;
-	ts->audioPackets = NULL;
-	ts->videoPackets = NULL;
-	gf_th_run(ts->tsEncodingThread, ts_interleave_thread_run, ts);
-	return ts;
-}
-
-void ts_amux_del(GF_AbstractTSMuxer * muxerToDelete) {
-	if (!muxerToDelete)
-		return;
-	muxerToDelete->encode = GF_FALSE;
-	gf_sleep(100);
-	gf_th_stop(muxerToDelete->tsEncodingThread);
-	muxerToDelete->tsEncodingThread = NULL;
-#if REDIRECT_AV_AUDIO_ENABLED
-	gf_mx_del(muxerToDelete->audioMx);
-	muxerToDelete->audioMx = NULL;
-#endif
-	gf_mx_del(muxerToDelete->videoMx);
-	muxerToDelete->videoMx = NULL;
-	if (muxerToDelete->video_st) {
-		avcodec_close(muxerToDelete->video_st->codec);
-		muxerToDelete->video_st = NULL;
-	}
-#if REDIRECT_AV_AUDIO_ENABLED
-	if (muxerToDelete->audio_st) {
-		avcodec_close(muxerToDelete->audio_st->codec);
-		muxerToDelete->audio_st = NULL;
-	}
-#endif
-	/* write the trailer, if any.  the trailer must be written
-	 * before you close the CodecContexts open when you wrote the
-	 * header; otherwise write_trailer may try to use memory that
-	 * was freed on av_codec_close() */
-	if (muxerToDelete->oc) {
-		u32 i;
-		/* free the streams */
-		for (i = 0; i < muxerToDelete->oc->nb_streams; i++) {
-			av_freep(&muxerToDelete->oc->streams[i]->codec);
-			av_freep(&muxerToDelete->oc->streams[i]);
-		}
-
-		/* free the stream */
-		av_free(muxerToDelete->oc);
-		muxerToDelete->oc = NULL;
-	}
-}
-
-Bool ts_encode_audio_frame(GF_AbstractTSMuxer * ts, uint8_t * data, int encoded, u64 pts) {
-	AVPacketList *pl;
-	AVPacket * pkt;
-	if (!ts->encode)
-		return GF_TRUE;
-	pl = (AVPacketList*)gf_malloc(sizeof(AVPacketList));
-	pl->next = NULL;
-	pkt = &(pl->pkt);
-	av_init_packet(pkt);
-	assert( ts->audio_st);
-	assert( ts->audio_st->codec);
-	pkt->flags = 0;
-	if (ts->audio_st->codec->coded_frame) {
-		if (ts->audio_st->codec->coded_frame->key_frame)
-			pkt->flags = AV_PKT_FLAG_KEY;
-		if (ts->audio_st->codec->coded_frame->pts != AV_NOPTS_VALUE) {
-			pkt->pts = av_rescale_q(ts->audio_st->codec->coded_frame->pts, ts->audio_st->codec->time_base, ts->audio_st->time_base);
-		} else {
-			if (pts == AV_NOPTS_VALUE)
-				pkt->pts = AV_NOPTS_VALUE;
-			else {
-				pkt->pts = av_rescale_q(pts, ts->audio_st->codec->time_base, ts->audio_st->time_base);
-			}
-		}
-	} else {
-		if (pts == AV_NOPTS_VALUE)
-			pkt->pts = AV_NOPTS_VALUE;
-		else
-			pkt->pts = av_rescale_q(pts, ts->audio_st->codec->time_base, ts->audio_st->time_base);
-	}
-	pkt->stream_index= ts->audio_st->index;
-	pkt->data = data;
-	pkt->size = encoded;
-	//fprintf(stderr, "AUDIO PTS="LLU" was: "LLU" (%p)\n", pkt->pts, pts, pl);
-	gf_mx_p(ts->audioMx);
-	if (!ts->audioPackets)
-		ts->audioPackets = pl;
-	else {
-		AVPacketList * px = ts->audioPackets;
-		while (px->next)
-			px = px->next;
-		px->next = pl;
-	}
-	gf_mx_v(ts->audioMx);
-	return GF_FALSE;
-}
-
-Bool ts_encode_video_frame(GF_AbstractTSMuxer* ts, uint8_t* data, int encoded) {
-	AVPacketList *pl;
-	AVPacket * pkt;
-	if (!ts->encode)
-		return GF_TRUE;
-	pl = (AVPacketList*)gf_malloc(sizeof(AVPacketList));
-	pl->next = NULL;
-	pkt = &(pl->pkt);
-
-	av_init_packet(pkt);
-
-	if (ts->video_st->codec->coded_frame->pts != AV_NOPTS_VALUE) {
-		//pkt->pts= av_rescale_q(ts->video_st->codec->coded_frame->pts, ts->video_st->codec->time_base, ts->video_st->time_base);
-		pkt->pts = ts->video_st->codec->coded_frame->pts * ts->video_st->time_base.den / ts->video_st->time_base.num / 1000;
-		//pkt->pts = ts->video_st->codec->coded_frame->pts;
-	}
-	if (ts->video_st->codec->coded_frame->key_frame)
-		pkt->flags |= AV_PKT_FLAG_KEY;
-	pkt->stream_index= ts->video_st->index;
-	pkt->data= data;
-	pkt->size= encoded;
-	//fprintf(stderr, "VIDEO PTS="LLU" was: "LLU" (%p)\n", pkt->pts, ts->video_st->codec->coded_frame->pts, pl);
-	gf_mx_p(ts->videoMx);
-	if (!ts->videoPackets)
-		ts->videoPackets = pl;
-	else {
-		AVPacketList * px = ts->videoPackets;
-		while (px->next)
-			px = px->next;
-		px->next = pl;
-	}
-	gf_mx_v(ts->videoMx);
-	return GF_FALSE;
-}
-
-AVCodecContext * ts_get_video_codec_context(GF_AbstractTSMuxer * ts) {
-	return !ts ? NULL : ts->video_st->codec;
-}
-
-AVCodecContext * ts_get_audio_codec_context(GF_AbstractTSMuxer * ts) {
-	return !ts ? NULL : ts->audio_st->codec;
-}

gpac-0.8.0.tar.gz/modules/redirect_av/gpac_ts_muxer.c Deleted

@@ -1,178 +0,0 @@
-#include "ts_muxer.h"
-#include <gpac/mpegts.h>
-
-struct avr_ts_muxer {
-	GF_M2TS_Mux *muxer;
-	GF_ESIPacket videoCurrentTSPacket;
-	GF_ESIPacket audioCurrentTSPacket;
-	GF_ESInterface * video, * audio;
-	u64 frameTimeSentOverTS;
-	GF_Socket * ts_output_udp_sk;
-};
-
-/*!
- * Sends the TS mux to socket
- * \param avr The AVRedirect structure pointer
- */
-static GF_Err sendTSMux(GF_AbstractTSMuxer * ts)
-{
-	u32 status;
-	const char * pkt;
-	GF_Err e;
-	u32 padding, data;
-	padding = data = 0;
-	while ( (NULL!= ( pkt = gf_m2ts_mux_process ( ts->muxer, &status ))))
-	{
-		switch (status) {
-		case GF_M2TS_STATE_IDLE:
-			break;
-		case GF_M2TS_STATE_DATA:
-			data+=188;
-			break;
-		case GF_M2TS_STATE_PADDING:
-			padding+=188;
-			break;
-		default:
-			break;
-		}
-		if (ts->ts_output_udp_sk) {
-			e = gf_sk_send ( ts->ts_output_udp_sk, pkt, 188);
-			if ( e )
-			{
-				GF_LOG ( GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Unable to send TS data : %s\n", gf_error_to_string(e)) );
-				return e;
-			}
-		}
-	}
-	if (data || padding)
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[AVRedirect] : Sent TS data=%u/padding=%u\n", data, padding));
-	return GF_OK;
-}
-
-//Bool *add_video_stream(GF_AbstractTSMuxer * ts, int codec_id)
-
-Bool ts_encode_audio_frame(GF_AbstractTSMuxer * ts, AVFrame * encodedFrame, uint8_t * data, int encoded) {
-	ts->audioCurrentTSPacket.data = data;
-	ts->audioCurrentTSPacket.data_len = encoded;
-	ts->audioCurrentTSPacket.flags = GF_ESI_DATA_AU_START|GF_ESI_DATA_AU_END | GF_ESI_DATA_HAS_CTS | GF_ESI_DATA_HAS_DTS;
-	//avr->audioCurrentTSPacket.cts = avr->audioCurrentTSPacket.dts = myTime;
-	ts->videoCurrentTSPacket.dts = ts->videoCurrentTSPacket.cts = gf_m2ts_get_sys_clock(ts->muxer);
-	ts->audio->output_ctrl(ts->audio, GF_ESI_OUTPUT_DATA_DISPATCH, &(ts->audioCurrentTSPacket));
-	return 0;
-}
-
-static GF_Err void_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
-{
-	GF_AbstractTSMuxer * ts = (GF_AbstractTSMuxer *)  ifce->input_udta;
-	if (!ts)
-		return GF_BAD_PARAM;
-	switch (act_type) {
-	case GF_ESI_INPUT_DATA_FLUSH:
-		break;
-	case GF_ESI_INPUT_DESTROY:
-		break;
-	/*    case GF_ESI_INPUT_DATA_PULL:
-	        gf_mx_p(ts->encodingMutex);
-	        if (ts->frameTimeEncoded > ts->frameTimeSentOverTS) {
-	            //fprintf(stderr, "Data PULL, avr=%p, avr->video=%p, encoded="LLU", sent over TS="LLU"\n", avr, &avr->video, avr->frameTimeEncoded, avr->frameTimeSentOverTS);
-	            ts->video->output_ctrl( ts->video, GF_ESI_OUTPUT_DATA_DISPATCH, &(ts->videoCurrentTSPacket));
-	            ts->frameTimeSentOverTS = ts->frameTime;
-	        } else {
-	            //fprintf(stderr, "Data PULL IGNORED : encoded = "LLU", sent on TS="LLU"\n", avr->frameTimeEncoded, avr->frameTimeSentOverTS);
-	        }
-	        gf_mx_v(avr->encodingMutex);
-	        break;*/
-	case GF_ESI_INPUT_DATA_RELEASE:
-		break;
-	default:
-		fprintf(stderr, "Asking unknown : %u\n", act_type);
-	}
-	return GF_OK;
-}
-
-Bool ts_encode_video_frame(GF_AbstractTSMuxer * ts, AVFrame * encodedFrame, uint8_t * data, int encoded, AVCodecContext * videoCodecContext) {
-	if ( ts->muxer )
-	{	//  currentFrameTimeProcessed / 1000;  //
-		ts->videoCurrentTSPacket.dts = videoCodecContext->coded_frame->coded_picture_number;
-		ts->videoCurrentTSPacket.cts = videoCodecContext->coded_frame->display_picture_number;
-		//avr->videoCurrentTSPacket.dts = avr->videoCurrentTSPacket.cts = sysclock;
-		//ts->videoCurrentTSPacket.dts = ts->videoCurrentTSPacket.cts = currentFrameTimeProcessed;
-		ts->videoCurrentTSPacket.dts = ts->videoCurrentTSPacket.cts = gf_m2ts_get_sys_clock(ts->muxer);
-		ts->videoCurrentTSPacket.data = data;
-		ts->videoCurrentTSPacket.data_len = encoded;
-		ts->videoCurrentTSPacket.flags = GF_ESI_DATA_HAS_CTS | GF_ESI_DATA_HAS_DTS;
-		//if (ts_packets_sent == 0) {
-		ts->videoCurrentTSPacket.flags|=GF_ESI_DATA_AU_START|GF_ESI_DATA_AU_END ;
-		//}
-		void_input_ctrl(ts->video, GF_ESI_INPUT_DATA_PULL, NULL);
-		sendTSMux(ts);
-	}
-	return 0;
-}
-
-GF_AbstractTSMuxer * ts_amux_new(GF_AVRedirect * avr, u32 videoBitrateInBitsPerSec, u32 audioBitRateInBitsPerSec, GF_Socket * ts_output_udp_sk) {
-	GF_AbstractTSMuxer * ts = malloc(sizeof(GF_AbstractTSMuxer));
-	ts->muxer = gf_m2ts_mux_new ( videoBitrateInBitsPerSec * audioBitRateInBitsPerSec + 1000000, 0, 1 );
-	ts->ts_output_udp_sk = ts_output_udp_sk;
-	{
-		//u32 cur_pid = 100;	/*PIDs start from 100*/
-		GF_M2TS_Mux_Program *program = gf_m2ts_mux_program_add ( ts->muxer, 1, 100, 0, 0 );
-
-		ts->video = gf_malloc( sizeof( GF_ESInterface));
-		memset( ts->video, 0, sizeof( GF_ESInterface));
-		//audio.stream_id = 101;
-		//gf_m2ts_program_stream_add ( program, &audifero, 101, 1 );
-		ts->video->stream_id = 101;
-		ts->video->stream_type = GF_STREAM_VISUAL;
-		ts->video->bit_rate = 410000;
-		/* ms resolution */
-		ts->video->timescale = 1000;
-
-		ts->video->object_type_indication = GPAC_OTI_VIDEO_MPEG2_SIMPLE;
-		ts->video->input_udta = ts;
-#ifdef TS_MUX_MODE_PUT
-		ts->video->caps = GF_ESI_SIGNAL_DTS;
-#else
-		avr->video->input_ctrl = void_input_ctrl;
-		avr->video->caps = GF_ESI_AU_PULL_CAP | GF_ESI_SIGNAL_DTS;
-#endif /* TS_MUX_MODE_PUT */
-
-
-		ts->audio = gf_malloc( sizeof( GF_ESInterface));
-		memset( ts->audio, 0, sizeof( GF_ESInterface));
-		ts->audio->stream_id = 102;
-		ts->audio->stream_type = GF_STREAM_AUDIO;
-		ts->audio->bit_rate = audioBitRateInBitsPerSec;
-		/* ms resolution */
-		ts->audio->timescale = 1000;
-
-		ts->audio->object_type_indication = GPAC_OTI_AUDIO_MPEG2_PART3;
-		ts->audio->input_udta = ts;
-#ifdef TS_MUX_MODE_PUT
-		ts->audio->caps = 0;
-#else
-		ts->audio->input_ctrl = void_input_ctrl;
-		ts->audio->caps = GF_ESI_AU_PULL_CAP;
-#endif /* TS_MUX_MODE_PUT */
-
-		gf_m2ts_program_stream_add ( program, ts->video, 101, 0 );
-		gf_m2ts_program_stream_add ( program, ts->audio, 102, 1 );
-
-		assert(program->streams->mpeg2_stream_type == GF_M2TS_VIDEO_MPEG2 ||
-		       program->streams->mpeg2_stream_type == GF_M2TS_VIDEO_DCII);
-	}
-	gf_m2ts_mux_update_config ( ts->muxer, 1 );
-	return ts;
-}
-
-void ts_amux_del(GF_AbstractTSMuxer * ts) {
-	if (!ts)
-		return;
-	if ( ts->ts_output_udp_sk )
-	{
-		gf_sk_del ( ts->ts_output_udp_sk );
-		ts->ts_output_udp_sk = NULL;
-	}
-
-
-}

gpac-0.8.0.tar.gz/modules/redirect_av/redirect_av.c Deleted

@@ -1,865 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean le Feuvre
- *			Copyright (c) 2010-20XX Telecom ParisTech
- *			All rights reserved
- *
- *  This file is part of GPAC / AVI Recorder demo module
- *
- *  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 <stdlib.h>
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__MINGW32__)
-
-#define EMULATE_INTTYPES
-#define EMULATE_FAST_INT
-#ifndef inline
-#define inline __inline
-#endif
-
-#if defined(__SYMBIAN32__)
-#define EMULATE_INTTYPES
-#endif
-
-
-#ifndef __MINGW32__
-#define __attribute__(s)
-#endif
-
-
-/*include FFMPEG APIs*/
-#ifdef _WIN32_WCE
-#define inline	__inline
-#endif
-
-
-#  define INT64_C(x)  (x ## i64)
-#  define UINT64_C(x)  (x ## Ui64)
-
-
-#endif
-
-
-#include "ts_muxer.h"
-
-//#define USE_GPAC_MPEG2TS
-#undef  USE_GPAC_MPEG2TS
-
-//#define MULTITHREAD_REDIRECT_AV
-
-#if (LIBAVCODEC_VERSION_MAJOR<56)
-#define REDIRECT_AV_AUDIO_ENABLED 1
-#endif
-
-#ifdef USE_GPAC_MPEG2TS
-#include "gpac_ts_muxer.c"
-#else
-#include "ffmpeg_ts_muxer.c"
-#endif /* USE_GPAC_MPEG2TS */
-
-#include <libavcodec/avcodec.h>
-#include <libswscale/swscale.h>
-#include <libavutil/avutil.h>
-
-
-#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
-
-#if defined(_WIN32_WCE)
-#pragma comment(lib, "toolhelp")
-#pragma comment(lib, "winsock")
-#endif
-
-#define _TOSTR(_val) #_val
-#define TOSTR(_val) _TOSTR(_val)
-
-#endif
-
-
-
-
-/* This number * 188 should be lower than the UDP packet size */
-#define TS_PACKETS_PER_UDP_PACKET 1
-
-#define audioCodecBitrate 96000
-
-#if !defined(WIN32) && !defined(_WIN32_WCE)
-#include <unistd.h>
-#endif
-
-static const u32 maxFPS = 25;
-
-static const char * moduleName = "AVRedirect";
-
-static const char * AVR_VIDEO_CODEC_OPTION = "VideoCodec";
-
-
-#define AVR_TIMERS_LENGHT 25
-
-#define U32_ABS( a, b ) (a > b ? a - b : b - a)
-
-#define DUMP_MP3
-#undef DUMP_MP3
-
-#if REDIRECT_AV_AUDIO_ENABLED
-/**
- * This thread sends the frame to TS mux
- * \param param The GF_AVRedirect pointer
- */
-static u32 audio_encoding_thread_run(void *param)
-{
-	u8 * inBuff;
-	u8 * outBuff;
-	u32 inBuffSize, outBuffSize, samplesReaden, toRead;
-	u64 myTime = 0;
-	u32 frameCountSinceReset = 0;
-	u32 lastCurrentTime;
-	Bool sendPts = GF_TRUE;
-	GF_AVRedirect * avr = (GF_AVRedirect*) param;
-	AVCodecContext * ctx = NULL;
-	assert( avr );
-
-	outBuffSize = FF_MIN_BUFFER_SIZE;
-
-	outBuff = (u8*)gf_malloc(outBuffSize* sizeof(u8));
-	inBuff = NULL;
-#ifdef DUMP_MP3
-	FILE * mp3 = gf_fopen("/tmp/dump.mp3", "w");
-#endif /* DUMP_MP3 */
-	sendPts = GF_TRUE;
-	gf_sc_add_audio_listener ( avr->term->compositor, &avr->audio_listen );
-	while (avr->is_running && !ctx) {
-		ctx = ts_get_audio_codec_context(avr->ts_implementation);
-		gf_sleep(16);
-	}
-	if (!ctx) {
-		goto exit;
-	}
-
-	fprintf(stderr, "******* Audio Codec Context = %d/%d, start="LLU", frame_size=%u\n", ctx->time_base.num, ctx->time_base.den, ctx->timecode_frame_start, ctx->frame_size);
-	samplesReaden = ctx->frame_size * ctx->channels;
-
-	//fprintf(stderr, "SETUP input sample size=%u, output samplesize=%u, buffsize=%u, samplesReaden=%u\n", ctx->input_sample_size, ctx->frame_size, sizeof(outbuf), samplesReaden);
-	// 2 chars are needed for each short
-	toRead = samplesReaden * 2;
-	inBuffSize = toRead;
-	inBuff = (u8*)gf_malloc(inBuffSize * sizeof(u8));
-	while (avr->is_running && !avr->audioCurrentTime) {
-		gf_sleep(16);
-	}
-	myTime = lastCurrentTime = avr->audioCurrentTime;
-	frameCountSinceReset = 0;
-	while (avr->is_running) {
-		u32 readen;
-		if (U32_ABS(avr->audioCurrentTime, myTime) > 25000) {
-			//GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] Drift in audio : audioCurrentTime = %u, myTime=%u, resync...\n", avr->audioCurrentTime, myTime));
-			//myTime = lastCurrentTime = avr->audioCurrentTime;
-			//frameCountSinceReset = 0;
-			sendPts = GF_TRUE;
-		}
-		while (toRead <= gf_ringbuffer_available_for_read(avr->pcmAudio) ) {
-			memset( inBuff, 0, inBuffSize);
-			memset( outBuff, 0, outBuffSize);
-			readen = gf_ringbuffer_read(avr->pcmAudio, inBuff, toRead);
-			assert( readen == toRead );
-			if (avr->encode)
-			{
-				//u32 oldFrameSize = ctx->frame_size;
-				//ctx->frame_size = readable / (2 * ctx->channels);
-				//assert( oldFrameSize <= ctx->frame_size );
-				/* buf_size * input_sample_size / output_sample_size */
-				int encoded = avcodec_encode_audio(ctx, outBuff, outBuffSize, (const short *) inBuff);
-
-				if (encoded < 0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[RedirectAV]: failed to encode audio, buffer size=%u, readen=%u, frame_size=%u\n", outBuffSize, readen, ctx->frame_size));
-				} else if (encoded > 0) {
-					ts_encode_audio_frame(avr->ts_implementation, outBuff, encoded, sendPts ? myTime : AV_NOPTS_VALUE );
-					frameCountSinceReset++;
-#ifdef DUMP_MP3
-					gf_fwrite( outBuff, sizeof(char), encoded, mp3);
-#endif /* DUMP_MP3 */
-					//if (ctx->codec->id == CODEC_ID_MP3) {
-					/* It seems the MP3 codec only fetches 50% of data... */
-					//    myTime= lastCurrentTime + (frameCountSinceReset * ctx->frame_size * 500 / ctx->sample_rate);
-					//} else
-					//myTime = lastCurrentTime + (frameCountSinceReset * toRead * 1000 / ctx->sample_rate/ ctx->channels / 4);
-					/* Avoid overflow , multiply by 10 and divide sample rate by 100 instead of  *1000 / sampleRate */
-					myTime = lastCurrentTime + (frameCountSinceReset * toRead * 10 / (ctx->sample_rate / 100) / ctx->channels / 4);
-					//sendPts = 0;
-					sendPts = GF_TRUE;
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[RedirectAV]: no encoded frame.\n"));
-					//frameCountSinceReset++;
-				}
-				//ctx->frame_size = oldFrameSize;
-			}
-		}
-		gf_sleep(1);
-	}
-exit:
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Ending audio encoding thread...\n"));
-	if (inBuff)
-		gf_free( inBuff );
-	if (outBuff)
-		gf_free( outBuff );
-#ifdef DUMP_MP3
-	if (mp3)
-		gf_fclose(mp3);
-#endif /* DUMP_MP3 */
-	if (avr->term)
-		gf_sc_remove_audio_listener ( avr->term->compositor, &avr->audio_listen );
-	return GF_OK;
-}
-#endif
-
-/**
- * This thread sends the frame to TS mux
- * \param param The GF_AVRedirect pointer
- */
-static u32 video_encoding_thread_run(void *param)
-{
-	GF_AVRedirect * avr = (GF_AVRedirect*) param;
-	u64 currentFrameTimeProcessed = 0, lastEncodedFrameTime = 0;
-	AVCodecContext * ctx = NULL;
-	assert( avr );
-	gf_sc_add_video_listener ( avr->term->compositor, &avr->video_listen );
-	while (avr->is_running && (!ctx || !avr->swsContext)) {
-		ctx = ts_get_video_codec_context(avr->ts_implementation);
-		gf_sleep(16);
-	}
-	if (!ctx) {
-		goto exit;
-	}
-	fprintf(stderr, "******* Video Codec Context = %d/%d, start="LLU"\n", ctx->time_base.num, ctx->time_base.den, ctx->timecode_frame_start);
-	while (avr->is_running) {
-		{
-			gf_mx_p(avr->frameMutex);
-			while (!avr->frameTime || currentFrameTimeProcessed == avr->frameTime) {
-				gf_mx_v(avr->frameMutex);
-				if (!avr->is_running) {
-					goto exit;
-				}
-				gf_mx_p(avr->frameMutex);
-				gf_sleep(1);
-			}
-			assert( currentFrameTimeProcessed != avr->frameTime);
-			currentFrameTimeProcessed = avr->frameTime;
-			{
-				avpicture_fill ( ( AVPicture * ) avr->RGBpicture, (const uint8_t*)avr->frame, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight );
-				assert( avr->swsContext );
-				sws_scale ( avr->swsContext,
-#ifdef USE_AVCODEC2
-				            ( const uint8_t * const * )
-#else
-				            ( uint8_t ** )
-#endif /* USE_AVCODEC2 */
-				            avr->RGBpicture->data, avr->RGBpicture->linesize,
-				            0, avr->srcHeight,
-				            avr->YUVpicture->data, avr->YUVpicture->linesize );
-#ifdef AVR_DUMP_RAW_AVI
-				if ( AVI_write_frame ( avr->avi_out, avr->frame, avr->size, 1 ) <0 )
-				{
-					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Error writing video frame\n" ) );
-				}
-#endif /* AVR_DUMP_RAW_AVI */
-				gf_mx_v(avr->frameMutex);
-				if (avr->encode)
-				{
-					int written;
-					u32 sysclock_begin = gf_sys_clock(), sysclock_end=0;
-					avr->YUVpicture->pts = currentFrameTimeProcessed;
-					{
-						int got_packet = 0;
-						AVPacket pkt;
-						av_init_packet(&pkt);
-						pkt.data = avr->videoOutbuf;
-						pkt.size = avr->videoOutbufSize;
-						written = avcodec_encode_video2(ctx, &pkt, avr->YUVpicture, &got_packet);
-						if (written >= 0) {
-							written = pkt.size;
-							if (got_packet) {
-								ctx->coded_frame->pts = pkt.pts;
-								ctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
-							}
-						}
-					}
-					sysclock_end = gf_sys_clock();
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Encoding frame PTS="LLD", frameNum=%u, time="LLU", size=%d\t in %ums\n", avr->YUVpicture->pts, avr->YUVpicture->coded_picture_number, currentFrameTimeProcessed, written, sysclock_end-sysclock_begin));
-					ctx->coded_frame->pts = currentFrameTimeProcessed;
-
-					if (written<0) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Error while encoding video frame =%d\n", written ) );
-					} else {
-						if (written>0)
-							ts_encode_video_frame(avr->ts_implementation, avr->videoOutbuf, written);
-						lastEncodedFrameTime = currentFrameTimeProcessed;
-					}
-				}
-			}
-		}
-		avr->frameTimeEncoded = currentFrameTimeProcessed;
-		gf_sleep(1);
-	} /* End of main loop */
-exit:
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Ending video encoding thread...\n"));
-	if (avr->term)
-		gf_sc_remove_video_listener ( avr->term->compositor, &avr->video_listen );
-	return 0;
-}
-
-#define VIDEO_RATE 400000
-
-static Bool start_if_needed(GF_AVRedirect *avr) {
-	enum PixelFormat pxlFormatForCodec = PIX_FMT_YUV420P;
-	if (avr->is_open)
-		return GF_FALSE;
-	gf_mx_p(avr->frameMutex);
-	if (avr->is_open) {
-		gf_mx_v(avr->frameMutex);
-		return GF_FALSE;
-	}
-	if (!avr->srcWidth || !avr->srcHeight
-#if REDIRECT_AV_AUDIO_ENABLED
-	        || !avr->audioSampleRate || !avr->audioChannels
-#endif
-	   ) {
-		gf_mx_v(avr->frameMutex);
-		return 3;
-	}
-#ifdef AVR_DUMP_RAW_AVI
-	avr->avi_out = AVI_open_output_file ( "dump.avi" );
-	if ( !avr->avi_out )
-	{
-		gf_mx_v(avr->frameMutex);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Error opening output AVI file\n" ) );
-		return 4;
-	}
-#endif /* AVR_DUMP_RAW_AVI */
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Initializing...\n"));
-	if (!avr->pcmAudio)
-		avr->pcmAudio = gf_ringbuffer_new(48000*2*2); //1s of 16b stereo 48000Hz
-
-	/* Setting up the video encoding ... */
-	{
-		avr->YUVpicture = avr->RGBpicture = NULL;
-		avr->videoOutbuf = NULL;
-#if REDIRECT_AV_AUDIO_ENABLED
-		if ( !avr->audioCodec)
-		{
-			gf_mx_v(avr->frameMutex);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Cannot find audio codec.\n" ) );
-			return GF_TRUE;
-		}
-#endif
-
-		if ( !avr->videoCodec )
-		{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Cannot find video codec.\n" ) );
-			return 2;
-		}
-
-		if (avr->videoCodec->id == CODEC_ID_MJPEG) {
-			pxlFormatForCodec = PIX_FMT_YUVJ420P;
-		}
-
-#if !defined(FF_API_AVFRAME_LAVC)
-		avr->RGBpicture = avcodec_alloc_frame();
-#else
-		avr->RGBpicture = av_frame_alloc();
-#endif
-		assert ( avr->RGBpicture );
-		avr->RGBpicture->data[0] = NULL;
-#if !defined(FF_API_AVFRAME_LAVC)
-		avr->YUVpicture = avcodec_alloc_frame();
-#else
-		avr->YUVpicture = av_frame_alloc();
-#endif
-		assert ( avr->YUVpicture );
-		{
-			u32 sz = sizeof ( uint8_t ) * avpicture_get_size ( pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
-			avr->yuv_data = (uint8_t*)av_malloc ( sz ); /* size for YUV 420 */
-			assert ( avr->yuv_data );
-			memset ( avr->yuv_data, 0, sz );
-			avpicture_fill ( ( AVPicture* ) avr->YUVpicture, avr->yuv_data, pxlFormatForCodec, avr->srcWidth, avr->srcHeight );
-			avr->YUVpicture->coded_picture_number = 0;
-		}
-		avr->videoOutbufSize = avr->srcHeight * avr->srcWidth * 4;
-		avr->videoOutbuf = (uint8_t*)gf_malloc ( avr->videoOutbufSize );
-		memset ( avr->videoOutbuf, 0, avr->videoOutbufSize );
-	}
-#ifdef AVR_DUMP_RAW_AVI
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ( "[AVRedirect] Open output AVI file %s\n", "dump.avi" ) );
-#endif /* AVR_DUMP_RAW_AVI */
-	/* Setting up the TS mux */
-	{
-		/*
-		  GF_Socket * ts_output_udp_sk = gf_sk_new ( GF_SOCK_TYPE_UDP );
-		  if ( gf_sk_is_multicast_address ( avr->udp_address ) )
-		  {
-		      e = gf_sk_setup_multicast ( ts_output_udp_sk, avr->udp_address, avr->udp_port, 0, 0, NULL );
-		  }
-		  else
-		  {
-		      e = gf_sk_bind ( ts_output_udp_sk, NULL, avr->udp_port, avr->udp_address, avr->udp_port, GF_SOCK_REUSE_PORT );
-		  }
-		  gf_sk_set_buffer_size(ts_output_udp_sk, 0, 188 * TS_PACKETS_PER_UDP_PACKET);
-		  gf_sk_set_block_mode(ts_output_udp_sk, 0);*/
-		assert( avr->destination );
-		avr->ts_implementation = ts_amux_new(avr, VIDEO_RATE, avr->srcWidth, avr->srcHeight, audioCodecBitrate);
-	}
-	/*
-	    if ( e )
-	    {
-	        GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Error while initializing UDP address %s\n", gf_error_to_string ( e ) ) );
-	        return e;
-	    }
-	*/
-	avr->is_open = avr->ts_implementation != NULL;
-	gf_mx_v(avr->frameMutex);
-	return avr->is_open ? GF_TRUE : GF_FALSE;
-}
-
-
-static GF_Err avr_open ( GF_AVRedirect *avr )
-{
-	assert( avr );
-	if ( avr->is_open)
-		return GF_OK;
-	if (!avr->is_running) {
-		avr->is_running = GF_TRUE;
-		gf_th_run(avr->encodingThread, video_encoding_thread_run, avr);
-#if REDIRECT_AV_AUDIO_ENABLED
-		gf_th_run(avr->audioEncodingThread, audio_encoding_thread_run, avr);
-#endif
-	}
-	return GF_OK;
-}
-
-
-
-static void avr_on_audio_frame ( void *udta, char *buffer, u32 buffer_size, u32 time, u32 delay_ms )
-{
-	GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
-	if (start_if_needed(avr))
-		return;
-#ifdef AVR_DUMP_RAW_AVI
-	AVI_write_audio ( avr->avi_out, buffer, buffer_size );
-#endif /* AVR_DUMP_RAW_AVI */
-	{
-		gf_ringbuffer_write(avr->pcmAudio, buffer, buffer_size);
-		avr->audioCurrentTime = time - delay_ms;
-	}
-}
-
-static void avr_on_audio_reconfig ( void *udta, u32 samplerate, u32 bits_per_sample, u32 nb_channel, u32 channel_cfg )
-{
-	GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
-	if (avr->audioSampleRate != samplerate || avr->audioChannels != nb_channel) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Audio %u Hz, bitsPerSample=%u, nbchannels=%u\n", samplerate, bits_per_sample, nb_channel));
-#ifdef AVR_DUMP_RAW_AVI
-		AVI_set_audio ( avr->avi_out, nb_channel, samplerate, bits_per_sample, WAVE_FORMAT_PCM, 0 );
-#endif /* AVR_DUMP_RAW_AVI */
-		avr->audioChannels = nb_channel;
-		avr->audioSampleRate = samplerate;
-	}
-}
-
-static void avr_on_video_frame ( void *udta, u32 time )
-{
-	u32 i, j;
-	GF_Err e;
-	GF_VideoSurface fb;
-	GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
-
-	if (start_if_needed(avr))
-		return;
-	gf_mx_p(avr->frameMutex);
-	e = gf_sc_get_screen_buffer ( avr->term->compositor, &fb, 0 );
-	if ( e )
-	{
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Error grabing frame buffer %s\n", gf_error_to_string ( e ) ) );
-		return;
-	}
-	/*convert colorspace for input frame*/
-	if (fb.pixel_format == GF_PIXEL_ARGB) {
-		/*ARGB -> RGB24*/
-		for (i=0; i<fb.height; i++) {
-			char *dst = avr->frame + i * fb.width * 3;
-			char *src = fb.video_buffer + i * fb.pitch_y;
-			for (j=0; j<fb.width; j++) {
-				dst[0] = src[2];
-				dst[1] = src[1];
-				dst[2] = src[0];
-				src+=4;
-				dst += 3;
-			}
-		}
-	} else {
-		assert(fb.pixel_format == GF_PIXEL_RGB_24);
-		for (i=0; i<fb.height; i++)
-			memcpy(avr->frame+i*fb.width*3, fb.video_buffer+i*fb.pitch_y, fb.width*3);
-	}
-	avr->frameTime = time;
-	gf_mx_v(avr->frameMutex);
-	gf_sc_release_screen_buffer ( avr->term->compositor, &fb );
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ( "[AVRedirect] Writing video frame\n" ) );
-}
-
-static void avr_on_video_reconfig ( void *udta, u32 width, u32 height, u8 bpp )
-{
-
-	GF_AVRedirect *avr = ( GF_AVRedirect * ) udta;
-
-	if ((avr->srcHeight != height || avr->srcWidth != width))
-	{
-#ifdef AVR_DUMP_RAW_AVI
-		char comp[5];
-		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
-		AVI_set_video ( avr->avi_out, width, height, 30, comp );
-#endif /* AVR_DUMP_RAW_AVI */
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ( "[AVRedirect] Video reconfig width %d height %d\n", width, height ) );
-		gf_mx_p(avr->frameMutex);
-		if ( avr->frame ) gf_free ( avr->frame );
-		avr->size = 3*width*height;
-		avr->frame = (char*)gf_malloc ( sizeof ( char ) *avr->size );
-		avr->srcWidth = width;
-		avr->srcHeight = height;
-		avr->swsContext = sws_getCachedContext ( avr->swsContext, avr->srcWidth, avr->srcHeight, PIX_FMT_RGB24, avr->srcWidth, avr->srcHeight, PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL );
-		gf_mx_v(avr->frameMutex);
-	}
-}
-
-
-#ifdef MULTITHREAD_REDIRECT_AV
-/**
- * This thread sends the TS packets over the network
- * \param Parameter The GF_AVRedirect pointer
- */
-static Bool ts_thread_run(void *param)
-{
-	GF_Err e;
-	GF_AVRedirect * avr = (GF_AVRedirect*) param;
-	assert( avr );
-	gf_mx_p(avr->tsMutex);
-	while (!avr->frameTimeEncoded && avr->is_running) {
-		gf_mx_v(avr->tsMutex);
-		gf_sleep(1);
-		gf_mx_p(avr->tsMutex);
-	}
-	fprintf(stderr, "avr->frameTimeEncoded="LLU"\n", avr->frameTimeEncoded);
-
-	while (avr->is_running) {
-		e = sendTSMux(avr);
-		gf_mx_v(avr->tsMutex);
-		gf_mx_p(avr->tsMutex);
-	}
-	gf_mx_v(avr->tsMutex);
-	return 0;
-}
-#endif /* MULTITHREAD_REDIRECT_AV */
-
-static const char * possibleCodecs = "supported codecs : MPEG-1, MPEG-2, MPEG-4, MSMPEG-4, H263, H263I, H263P, RV10, MJPEG";
-
-/*#define DEFAULT_UDP_OUT_ADDRESS "127.0.0.1"
-#define DEFAULT_UDP_OUT_PORT 1234
-#define DEFAULT_UDP_OUT_PORT_STR "1234"*/
-
-#define AVR_DEFAULT_DESTINATION "udp://224.0.0.1:1234"
-
-#include <libavutil/pixfmt.h>
-
-
-static void avr_close ( GF_AVRedirect *avr )
-{
-	if ( !avr->is_open ) return;
-	avr->is_open = GF_FALSE;
-#ifdef AVR_DUMP_RAW_AVI
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ( "[AVRedirect] Closing output AVI file\n" ) );
-	AVI_close ( avr->avi_out );
-	avr->avi_out = NULL;
-#endif /* AVR_DUMP_RAW_AVI */
-}
-
-static Bool avr_on_event ( void *udta, GF_Event *evt, Bool consumed_by_compositor )
-{
-	GF_AVRedirect *avr = (GF_AVRedirect*)udta;
-	switch ( evt->type )
-	{
-	case GF_EVENT_CONNECT:
-		if ( evt->connect.is_connected )
-		{
-			avr_open ( avr );
-		}
-		else
-		{
-			avr_close ( avr );
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-static const char * AVR_ENABLED_OPTION = "Enabled";
-
-//static const char * AVR_UDP_PORT_OPTION = "udp.port";
-
-//static const char * AVR_UDP_ADDRESS_OPTION = "udp.address";
-
-static const char * AVR_DESTINATION = "destination";
-
-static Bool avr_process ( GF_TermExt *termext, u32 action, void *param )
-{
-	const char *opt;
-	GF_AVRedirect *avr = (GF_AVRedirect*)termext->udta;
-
-	switch ( action )
-	{
-	case GF_TERM_EXT_START:
-		avr->term = ( GF_Terminal * ) param;
-		opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_ENABLED_OPTION );
-		if ( !opt )
-			gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_ENABLED_OPTION, "no" );
-		if ( !opt || strcmp ( opt, "yes" ) ) return GF_FALSE;
-		opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_VIDEO_CODEC_OPTION );
-		avr->globalLock = gf_global_resource_lock("AVRedirect:output");
-		if (!avr->globalLock) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Failed to lock global resource 'AVRedirect:output', another GPAC instance must be running, disabling AVRedirect\n"));
-			return GF_FALSE;
-		}
-#ifndef AVIO_FLAG_WRITE
-		/* must be called before using avcodec lib */
-		avcodec_init();
-#endif
-
-		/* register all the codecs */
-		avcodec_register_all();
-		if ( !opt )
-			gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_VIDEO_CODEC_OPTION, possibleCodecs );
-		{
-			if ( !opt )
-			{
-				avr->videoCodec = avcodec_find_encoder ( CODEC_ID_MPEG2VIDEO );
-			}
-			else if ( !strcmp ( "MPEG-1", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_MPEG1VIDEO );
-			}
-			else if ( !strcmp ( "MPEG-2", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_MPEG2VIDEO );
-			}
-			else if ( !strcmp ( "MPEG-4", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_MPEG4 );
-			}
-			else if ( !strcmp ( "MSMPEG-4", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_MSMPEG4V3 );
-			}
-			else if ( !strcmp ( "H263", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_H263 );
-			}
-			else if ( !strcmp ( "RV10", opt ) )
-			{
-				avr->videoCodec = avcodec_find_encoder ( CODEC_ID_RV10 );
-			}
-			else if ( !strcmp ( "H263P", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_H263P );
-			}
-			else if ( !strcmp ( "H263I", opt ) )
-			{
-				avr->videoCodec=avcodec_find_encoder ( CODEC_ID_H263I );
-			}
-			else if ( !strcmp( "MJPEG", opt))
-			{
-				avr->videoCodec=avcodec_find_encoder( CODEC_ID_MJPEG);
-			}
-			else
-			{
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] Not a known Video codec : %s, using MPEG-2 video instead, %s\n", opt, possibleCodecs ) );
-				avr->videoCodec = avcodec_find_encoder ( CODEC_ID_MPEG2VIDEO );
-			}
-		}
-#if REDIRECT_AV_AUDIO_ENABLED
-		avr->audioCodec = avcodec_find_encoder(CODEC_ID_MP2);
-#endif
-		/*
-		        opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_UDP_ADDRESS_OPTION);
-		        if (!opt) {
-		            gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_UDP_ADDRESS_OPTION, DEFAULT_UDP_OUT_ADDRESS);
-		            avr->udp_address = DEFAULT_UDP_OUT_ADDRESS;
-		            GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] %s not set, using %s\n", AVR_UDP_ADDRESS_OPTION, DEFAULT_UDP_OUT_ADDRESS ) );
-		        } else
-		            avr->udp_address = opt;
-		        opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_UDP_PORT_OPTION);
-		        if (opt) {
-		            char *endPtr = NULL;
-		            unsigned int x = strtoul(opt, &endPtr, 10);
-		            if (endPtr == opt || x > 65536) {
-		                fprintf(stderr, "Failed to parse : %s\n", opt);
-		                opt = NULL;
-		            } else
-		                avr->udp_port = (u16) x;
-		        }
-		        if (!opt) {
-		            gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_UDP_PORT_OPTION, DEFAULT_UDP_OUT_PORT_STR);
-		            GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] %s is not set or valid, using %s\n", AVR_UDP_PORT_OPTION, DEFAULT_UDP_OUT_PORT_STR ) );
-		            avr->udp_port = DEFAULT_UDP_OUT_PORT;
-		        }
-		*/
-		opt = gf_modules_get_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_DESTINATION);
-		if (!opt) {
-			gf_modules_set_option ( ( GF_BaseInterface* ) termext, moduleName, AVR_DESTINATION, AVR_DEFAULT_DESTINATION);
-			avr->destination = AVR_DEFAULT_DESTINATION;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ( "[AVRedirect] %s not set, using %s\n", AVR_DESTINATION, AVR_DEFAULT_DESTINATION ) );
-		} else
-			avr->destination = opt;
-		avr->audio_listen.udta = avr;
-		avr->audio_listen.on_audio_frame = avr_on_audio_frame;
-		avr->audio_listen.on_audio_reconfig = avr_on_audio_reconfig;
-		avr->video_listen.udta = avr;
-		avr->video_listen.on_video_frame = avr_on_video_frame;
-		avr->video_listen.on_video_reconfig = avr_on_video_reconfig;
-
-		avr->term_listen.udta = avr;
-		avr->term_listen.on_event = avr_on_event;
-		gf_term_add_event_filter ( avr->term, &avr->term_listen );
-		return GF_TRUE;
-
-	case GF_TERM_EXT_STOP:
-		gf_term_remove_event_filter ( avr->term, &avr->term_listen );
-		avr->term = NULL;
-		break;
-
-	/*if not threaded, perform our tasks here*/
-	case GF_TERM_EXT_PROCESS:
-		break;
-	}
-	return GF_FALSE;
-}
-
-
-GF_TermExt *avr_new()
-{
-	GF_TermExt *dr;
-	GF_AVRedirect *uir;
-	GF_SAFEALLOC ( dr, GF_TermExt );
-	GF_REGISTER_MODULE_INTERFACE ( dr, GF_TERM_EXT_INTERFACE, "GPAC Output Recorder", "gpac distribution" );
-
-	GF_SAFEALLOC ( uir, GF_AVRedirect );
-	dr->process = avr_process;
-	dr->udta = uir;
-	uir->encodingMutex = gf_mx_new("RedirectAV_encodingMutex");
-	assert( uir->encodingMutex);
-	uir->frameMutex = gf_mx_new("RedirectAV_frameMutex");
-	uir->encodingThread = gf_th_new("RedirectAV_EncodingThread");
-	uir->audioEncodingThread = gf_th_new("RedirectAV_AudioEncodingThread");
-	uir->encode = GF_TRUE;
-	uir->is_open = GF_FALSE;
-	uir->is_running = GF_FALSE;
-	return dr;
-}
-
-
-void avr_delete ( GF_BaseInterface *ifce )
-{
-	GF_TermExt *dr = ( GF_TermExt * ) ifce;
-	GF_AVRedirect *avr = (GF_AVRedirect*)dr->udta;
-	avr->is_running = GF_FALSE;
-	/* Ensure encoding is finished */
-	gf_mx_p(avr->frameMutex);
-	gf_mx_v(avr->frameMutex);
-	gf_sleep(200);
-	gf_th_stop(avr->encodingThread);
-	gf_mx_del(avr->frameMutex);
-	avr->frameMutex = NULL;
-	gf_th_del(avr->encodingThread);
-	avr->encodingThread = NULL;
-	gf_mx_del(avr->encodingMutex);
-	avr->encodingMutex = NULL;
-	if ( avr->ts_implementation )
-	{
-		ts_amux_del(avr->ts_implementation);
-		avr->ts_implementation = NULL;
-	}
-	avr->videoCodec = NULL;
-	if ( avr->YUVpicture )
-	{
-		av_free ( avr->YUVpicture );
-	}
-	if ( avr->yuv_data )
-		av_free ( avr->yuv_data );
-	avr->yuv_data = NULL;
-	avr->YUVpicture = NULL;
-	if ( avr->RGBpicture )
-	{
-		av_free ( avr->RGBpicture );
-	}
-	avr->RGBpicture = NULL;
-	if ( avr->swsContext )
-		sws_freeContext ( avr->swsContext );
-	avr->swsContext = NULL;
-	if ( avr->videoOutbuf )
-		gf_free ( avr->videoOutbuf );
-	avr->videoOutbuf = NULL;
-	if ( avr->pcmAudio )
-		gf_ringbuffer_del(avr->pcmAudio);
-	avr->pcmAudio = NULL;
-	gf_global_resource_unlock(avr->globalLock);
-	avr->globalLock = NULL;
-	if (avr->audioEncodingThread) {
-		gf_th_stop(avr->audioEncodingThread);
-		gf_th_del(avr->audioEncodingThread);
-	}
-	avr->audioEncodingThread = NULL;
-	gf_free ( avr );
-	gf_free ( dr );
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] =
-	{
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface ( u32 InterfaceType )
-{
-	if ( InterfaceType == GF_TERM_EXT_INTERFACE ) return ( GF_BaseInterface * ) avr_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface ( GF_BaseInterface *ifce )
-{
-	switch ( ifce->InterfaceType )
-	{
-	case GF_TERM_EXT_INTERFACE:
-		avr_delete ( ifce );
-		break;
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( redirect_av )

gpac-0.8.0.tar.gz/modules/redirect_av/ts_muxer.h Deleted

@@ -1,161 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean le Feuvre
- *			Copyright (c) 2010-20XX Telecom ParisTech
- *			All rights reserved
- *
- *  This file is part of GPAC / AVI Recorder demo module
- *
- *  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 _AVR_TS_MUXER_H_
-#define _AVR_TS_MUXER_H_
-
-#include <gpac/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/network.h>
-#include <gpac/tools.h>
-#include <libavcodec/avcodec.h>
-
-#if ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR <= 20)) || (LIBAVCODEC_VERSION_MAJOR < 52)
-#undef USE_AVCODEC2
-#else
-#define USE_AVCODEC2	1
-#endif
-
-#define TS_MUX_MODE_PUT
-
-#undef AVR_DUMP_RAW_AVI
-
-#ifdef AVR_DUMP_RAW_AVI
-/*sample raw AVI writing*/
-#include <gpac/internal/avilib.h>
-#endif /* AVR_DUMP_RAW_AVI */
-
-typedef struct avr_ts_muxer GF_AbstractTSMuxer;
-
-#if LIBAVUTIL_VERSION_MAJOR<51
-#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-#define AV_PKT_FLAG_KEY	PKT_FLAG_KEY
-#endif
-
-
-
-/*TODO - we need to cleanup the ffmpeg code to align with only latest version and remove old compatibility code*/
-#ifndef CODEC_ID_MJPEG
-
-#define CODEC_ID_SVQ3	AV_CODEC_ID_SVQ3
-#define CODEC_ID_MPEG4	AV_CODEC_ID_MPEG4
-#define CODEC_ID_H264	AV_CODEC_ID_H264
-#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
-#define CODEC_ID_MJPEG	AV_CODEC_ID_MJPEG
-#define CODEC_ID_MP2	AV_CODEC_ID_MP2
-#define CODEC_ID_AC3	AV_CODEC_ID_AC3
-#define CODEC_ID_EAC3	AV_CODEC_ID_EAC3
-#define CODEC_ID_DVD_SUBTITLE	AV_CODEC_ID_DVD_SUBTITLE
-#define CODEC_ID_RAWVIDEO	AV_CODEC_ID_RAWVIDEO
-#define CODEC_ID_MJPEGB	AV_CODEC_ID_MJPEGB
-#define CODEC_ID_LJPEG	AV_CODEC_ID_LJPEG
-#define CODEC_ID_GIF	AV_CODEC_ID_GIF
-#define CODEC_ID_H263	AV_CODEC_ID_H263
-#define CODEC_ID_MP3	AV_CODEC_ID_MP3
-#define CODEC_ID_AAC	AV_CODEC_ID_AAC
-#define CODEC_ID_MPEG1VIDEO	AV_CODEC_ID_MPEG1VIDEO
-#define CODEC_ID_MSMPEG4V3	AV_CODEC_ID_MSMPEG4V3
-#define CODEC_ID_RV10	AV_CODEC_ID_RV10
-#define CODEC_ID_H263P	AV_CODEC_ID_H263P
-#define CODEC_ID_H263I	AV_CODEC_ID_H263I
-#endif
-
-#ifndef PIX_FMT_YUV420P
-#define PIX_FMT_YUV420P AV_PIX_FMT_YUV420P
-#define PIX_FMT_YUV420P10LE AV_PIX_FMT_YUV420P10LE
-#define PIX_FMT_BGR24 AV_PIX_FMT_BGR24
-#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24
-#define PIX_FMT_YUVJ420P AV_PIX_FMT_YUVJ420P
-#endif
-
-#if (LIBAVCODEC_VERSION_MAJOR>56)
-#ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC
-#endif
-
-#endif
-
-#include <gpac/ringbuffer.h>
-
-typedef struct
-{
-	GF_Terminal *term;
-
-	Bool is_open;
-	GF_AudioListener audio_listen;
-	GF_VideoListener video_listen;
-	GF_TermEventFilter term_listen;
-#ifdef AVR_DUMP_RAW_AVI
-	avi_t *avi_out;
-#endif
-	char *frame;
-	u32 size;
-	GF_AbstractTSMuxer * ts_implementation;
-	Bool encode;
-	AVCodec *audioCodec;
-	AVCodec *videoCodec;
-	AVFrame *YUVpicture, *RGBpicture;
-	struct SwsContext * swsContext;
-	uint8_t * yuv_data;
-	uint8_t * videoOutbuf;
-	u32 videoOutbufSize;
-	GF_Ringbuffer * pcmAudio;
-	u32 audioCurrentTime;
-	GF_Thread * encodingThread;
-	GF_Thread * audioEncodingThread;
-	GF_Mutex * frameMutex;
-	GF_Mutex * encodingMutex;
-	volatile Bool is_running;
-	u64 frameTime;
-	u64 frameTimeEncoded;
-	/**
-	 * Audio parameters for encoding
-	 */
-	u32 audioSampleRate;
-	u16 audioChannels;
-	/**
-	 * Video parameters for encoding
-	 */
-	u32 srcWidth;
-	u32 srcHeight;
-	const char * destination;
-	GF_GlobalLock * globalLock;
-	Bool started;
-} GF_AVRedirect;
-
-GF_AbstractTSMuxer * ts_amux_new(GF_AVRedirect * avr, u32 videoBitrateInBitsPerSec, u32 width, u32 height, u32 audioBitRateInBitsPerSec);
-
-void ts_amux_del(GF_AbstractTSMuxer * muxerToDelete);
-
-Bool ts_encode_audio_frame(GF_AbstractTSMuxer * ts, uint8_t * data, int encoded, u64 pts);
-
-Bool ts_encode_video_frame(GF_AbstractTSMuxer* ts, uint8_t* data, int encoded);
-
-AVCodecContext * ts_get_video_codec_context(GF_AbstractTSMuxer * ts);
-
-AVCodecContext * ts_get_audio_codec_context(GF_AbstractTSMuxer * ts);
-
-#endif /* _AVR_TS_MUXER_H_ */

gpac-0.8.0.tar.gz/modules/rtp_in Deleted

gpac-0.8.0.tar.gz/modules/rtp_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/rtp_in/rtp_in.c Deleted

@@ -1,1020 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-
-#ifndef GPAC_DISABLE_STREAMING
-
-#define RTP_DEFAULT_TIMEOUT 10000
-#define RTSP_DEFAULT_TIMEOUT 2000
-
-static void RT_LoadPrefs(GF_InputService *plug, RTPClient *rtp)
-{
-	const char *sOpt;
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Streaming", "DefaultPort");
-	if (sOpt) {
-		rtp->default_port = atoi(sOpt);
-	} else {
-		rtp->default_port = 554;
-	}
-	if ((rtp->default_port == 80) || (rtp->default_port == 8080))
-		gf_modules_set_option((GF_BaseInterface *)plug, "Streaming", "RTPoverRTSP", "yes");
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Streaming", "RTPoverRTSP");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		rtp->transport_mode = 1;
-	} else if (sOpt && !stricmp(sOpt, "OnlyCritical")) {
-		rtp->transport_mode = 2;
-	} else {
-		rtp->transport_mode = 0;
-	}
-
-	/*
-		get heneral network config for UDP
-	*/
-	/*if UDP not available don't try it*/
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Network", "UDPNotAvailable");
-	if (sOpt && !stricmp(sOpt, "yes")) {
-		if (!rtp->transport_mode) rtp->transport_mode = 1;
-		/*turn it off*/
-		gf_modules_set_option((GF_BaseInterface *)plug, "Network", "UDPNotAvailable", "no");
-	}
-
-	if (!rtp->transport_mode) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Network", "UDPTimeout");
-		if (sOpt ) {
-			rtp->udp_time_out = atoi(sOpt);
-		} else {
-			rtp->udp_time_out = RTP_DEFAULT_TIMEOUT;
-		}
-	}
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Streaming", "RTSPTimeout");
-	if (sOpt ) {
-		rtp->time_out = atoi(sOpt);
-	} else {
-		rtp->time_out = RTSP_DEFAULT_TIMEOUT;
-	}
-
-	/*packet drop emulation*/
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Streaming", "FirstPacketDrop");
-	if (sOpt) {
-		rtp->first_packet_drop = atoi(sOpt);
-	} else {
-		rtp->first_packet_drop = 0;
-	}
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Streaming", "PacketDropFrequency");
-	if (sOpt) {
-		rtp->frequency_drop = atoi(sOpt);
-	} else {
-		rtp->frequency_drop = 0;
-	}
-
-//	rtp->handle_announce = 0;
-}
-
-static void RP_cleanup(RTPClient *rtp)
-{
-	RTSPSession *sess;
-
-	while (gf_list_count(rtp->channels)) {
-		RTPStream *ch = (RTPStream *)gf_list_get(rtp->channels, 0);
-		gf_list_rem(rtp->channels, 0);
-		RP_DeleteStream(ch);
-	}
-
-	while ( (sess = (RTSPSession *)gf_list_last(rtp->sessions)) ) {
-		gf_list_rem_last(rtp->sessions);
-		RP_DelSession(sess);
-	}
-
-	if (rtp->session_desc) gf_odf_desc_del(rtp->session_desc);
-	rtp->session_desc = NULL;
-
-	if (rtp->sdp_temp) {
-		gf_free(rtp->sdp_temp->remote_url);
-		gf_free(rtp->sdp_temp);
-	}
-	rtp->sdp_temp = NULL;
-}
-
-u32 RP_Thread(void *param)
-{
-	u32 i;
-	GF_NetworkCommand com;
-	RTSPSession *sess;
-	RTPStream *ch;
-	RTPClient *rtp = (RTPClient *)param;
-
-	rtp->th_state = 1;
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-	while (rtp->th_state) {
-		gf_mx_p(rtp->mx);
-
-		/*fecth data on udp*/
-		i=0;
-		while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-			if ((ch->flags & RTP_EOS) || (ch->status!=RTP_Running) ) continue;
-			/*for interleaved channels don't read too fast, query the buffer occupancy*/
-			if (ch->flags & RTP_INTERLEAVED) {
-				com.base.on_channel = ch->channel;
-				gf_service_command(rtp->service, &com, GF_OK);
-				/*if no buffering, use a default value (3 sec of data should do it)*/
-				if (!com.buffer.max) com.buffer.max = 3000;
-				if (com.buffer.occupancy <= com.buffer.max) ch->rtsp->flags |= RTSP_TCP_FLUSH;
-			} else {
-				RP_ReadStream(ch);
-			}
-		}
-
-		/*and process commands / flush TCP*/
-		i=0;
-		while ((sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i))) {
-			RP_ProcessCommands(sess);
-
-			if (sess->connect_error) {
-				gf_service_connect_ack(sess->owner->service, NULL, sess->connect_error);
-				sess->connect_error = GF_OK;
-			}
-
-		}
-
-		gf_mx_v(rtp->mx);
-
-		gf_sleep(1);
-	}
-
-	if (rtp->dnload) gf_service_download_del(rtp->dnload);
-	rtp->dnload = NULL;
-
-	rtp->th_state = 2;
-	return 0;
-}
-
-static const char * sdp_mime = "application/sdp";
-
-static const char * sdp_exts = "sdp";
-
-static const char * sdp_desc = "OnDemand Media/Multicast Session";
-
-static u32 RP_RegisterMimeTypes(const GF_InputService *plug) {
-	if (!plug)
-		return 0;
-	gf_service_register_mime(plug, sdp_mime, sdp_exts, sdp_desc);
-	return 1;
-}
-
-static Bool RP_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-
-	if (sExt && gf_service_check_mime_register(plug, sdp_mime, sdp_exts, sdp_desc, sExt)) return GF_TRUE;
-
-	/*local */
-	if (strstr(url, "data:application/sdp")) return GF_TRUE;
-	/*embedded data*/
-	if (strstr(url, "data:application/mpeg4-od-au;base64") ||
-	        strstr(url, "data:application/mpeg4-bifs-au;base64") ||
-	        strstr(url, "data:application/mpeg4-es-au;base64")) return GF_TRUE;
-
-	/*we need rtsp/tcp , rtsp/udp or direct RTP sender (no control)*/
-	if (!strnicmp(url, "rtsp://", 7) || !strnicmp(url, "rtspu://", 8) || !strnicmp(url, "rtp://", 6)  || !strnicmp(url, "satip://", 6))
-		return GF_TRUE;
-	/*we don't check extensions*/
-	return GF_FALSE;
-}
-
-//simplified version of RTSP_UnpackURL for SAT>IP
-static void Satip_GetServerIP(const char *sURL, char *Server)
-{
-	char schema[10], *test, text[1024], *retest;
-	u32 i, len;
-	Bool is_ipv6;
-
-	strcpy(Server, "");
-
-	//extract the schema
-	i = 0;
-	while (i <= strlen(sURL)) {
-		if (sURL[i] == ':')
-			goto found;
-		schema[i] = sURL[i];
-		i += 1;
-	}
-	return;
-
-found:
-	schema[i] = 0;
-	if (stricmp(schema, "satip")) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Wrong SATIP schema %s - not setting up\n", schema));
-		return;
-	}
-	test = strstr(sURL, "://");
-	test += 3;
-	//check for service
-	retest = strstr(test, "/");
-
-	//check for port
-	retest = strrchr(test, ':');
-	/*IPV6 address*/
-	if (retest && strchr(retest, ']')) retest = NULL;
-
-	if (retest && strstr(retest, "/")) {
-		retest += 1;
-		i = 0;
-		while (i<strlen(retest)) {
-			if (retest[i] == '/') break;
-			text[i] = retest[i];
-			i += 1;
-		}
-		text[i] = 0;
-	}
-	//get the server name
-	is_ipv6 = GF_FALSE;
-	len = (u32)strlen(test);
-	i = 0;
-	while (i<len) {
-		if (test[i] == '[') is_ipv6 = GF_TRUE;
-		else if (test[i] == ']') is_ipv6 = GF_FALSE;
-		if ((test[i] == '/') || (!is_ipv6 && (test[i] == ':'))) break;
-		text[i] = test[i];
-		i += 1;
-	}
-	text[i] = 0;
-	strcpy(Server, text);
-}
-
-GF_Err RP_ConnectServiceEx(GF_InputService *plug, GF_ClientService *serv, const char *url, Bool skip_migration)
-{
-	char *session_cache;
-	RTSPSession *sess;
-	RTPClient *priv = (RTPClient *)plug->priv;
-
-	/*store user address*/
-	priv->service = serv;
-
-	if (priv->dnload) gf_service_download_del(priv->dnload);
-	priv->dnload = NULL;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Opening service %s\n", url));
-
-	/*load preferences*/
-	RT_LoadPrefs(plug, priv);
-
-	/*start thread*/
-	gf_th_run(priv->th, RP_Thread, priv);
-
-	if (!skip_migration) {
-		session_cache = (char *) gf_modules_get_option((GF_BaseInterface *) plug, "Streaming", "SessionMigrationFile");
-		if (session_cache && session_cache[0]) {
-			FILE *f = gf_fopen(session_cache, "rb");
-			if (f) {
-				gf_fclose(f);
-				GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Restarting RTSP session from %s\n", session_cache));
-				RP_FetchSDP(priv, (char *) session_cache, NULL, (char *) url);
-				return GF_OK;
-			}
-			if (!strncmp(session_cache, "http://", 7)) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Restarting RTSP session from %s\n", session_cache));
-				RP_FetchSDP(priv, (char *) session_cache, NULL, (char *) url);
-				return GF_OK;
-			}
-		}
-	}
-
-
-	/*local or remote SDP*/
-	if (strstr(url, "data:application/sdp") || (strnicmp(url, "rtsp", 4) && strstr(url, ".sdp")) ) {
-		RP_FetchSDP(priv, (char *) url, NULL, NULL);
-		return GF_OK;
-	}
-
-	/*rtsp and rtsp over udp*/
-	if (!strnicmp(url, "rtsp://", 7) || !strnicmp(url, "rtspu://", 8) || !strnicmp(url, "satip://", 8)) {
-		char *the_url = gf_strdup(url);
-		char *the_ext = strrchr(the_url, '#');
-		if (the_ext) {
-			if (!stricmp(the_ext, "#audio")) priv->media_type = GF_MEDIA_OBJECT_AUDIO;
-			else if (!stricmp(the_ext, "#video")) priv->media_type = GF_MEDIA_OBJECT_VIDEO;
-			the_ext[0] = 0;
-		}
-		sess = RP_NewSession(priv, (char *) the_url);
-		if (!strnicmp(url, "satip://", 8)) {
-			sess->satip = GF_TRUE;
-			sess->satip_server = gf_malloc(GF_MAX_PATH);
-			Satip_GetServerIP(url, sess->satip_server);
-		}
-		gf_free(the_url);
-		if (!sess) {
-			gf_service_connect_ack(serv, NULL, GF_NOT_SUPPORTED);
-		} else {
-			RP_Describe(sess, 0, NULL);
-		}
-		return GF_OK;
-	}
-
-	/*direct RTP (no control) or embedded data - this means the service is attached to a single channel (no IOD)
-	reply right away*/
-	gf_service_connect_ack(serv, NULL, GF_OK);
-	RP_SetupObjects(priv);
-	return GF_OK;
-}
-
-GF_Err RP_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	return RP_ConnectServiceEx(plug, serv, url, GF_FALSE);
-}
-
-static void RP_FlushCommands(RTPClient *rtp)
-{
-	u32 i, nb_com;
-	RTSPSession *sess;
-	/*process teardown on all sessions*/
-	while (1) {
-		nb_com = 0;
-		i=0;
-		while ((sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i))) {
-			if (!sess->connect_error)
-				nb_com += gf_list_count(sess->rtsp_commands);
-		}
-		if (!nb_com) break;
-		gf_sleep(10);
-	}
-}
-
-static GF_Err RP_CloseService(GF_InputService *plug)
-{
-	u32 i;
-	const char *opt;
-	RTSPSession *sess;
-	RTPClient *rtp = (RTPClient *)plug->priv;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Closing service\n"));
-
-	RP_FlushCommands(rtp);
-
-	if (rtp->session_migration) {
-		opt = gf_modules_get_option((GF_BaseInterface *) plug, "Streaming", "SessionMigrationPause");
-		if (opt && !strcmp(opt, "yes")) {
-			GF_NetworkCommand com;
-			com.command_type = GF_NET_CHAN_PAUSE;
-			com.base.on_channel = NULL;
-			/*send pause on all sessions*/
-			i=0;
-			while ((sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i))) {
-				RP_UserCommand(sess, NULL, &com);
-			}
-		}
-		RP_SaveSessionState(rtp);
-	} else {
-		/*remove session state file*/
-		if (rtp->session_state_data) {
-			gf_free(rtp->session_state_data);
-			rtp->session_state_data = NULL;
-		}
-
-		/*send teardown on all sessions*/
-		i=0;
-		while ((sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i))) {
-			RP_Teardown(sess, NULL);
-		}
-	}
-	RP_FlushCommands(rtp);
-
-	/*shutdown thread*/
-	if (rtp->th_state==1) rtp->th_state = 0;
-
-	/*confirm close*/
-	gf_service_disconnect_ack(rtp->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *RP_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_Descriptor *desc;
-	RTSPSession *sess = NULL;
-	RTPClient *priv = (RTPClient *)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Fetching service descriptor\n"));
-
-	sess = gf_list_get(priv->sessions, 0);
-	if (sess && sess->satip) {
-		RTPStream *ch = gf_list_get(priv->channels, 0);
-		if (!ch) return NULL;
-		return ch->satip_m2ts_ifce->GetServiceDescriptor(ch->satip_m2ts_ifce, expect_type, sub_url);
-	}
-
-	if ((expect_type!=GF_MEDIA_OBJECT_UNDEF) && (expect_type!=GF_MEDIA_OBJECT_SCENE) && (expect_type!=GF_MEDIA_OBJECT_UPDATES)) {
-		/*ignore the SDP IOD and regenerate one*/
-		if (priv->session_desc) gf_odf_desc_del(priv->session_desc);
-		priv->session_desc = NULL;
-		priv->media_type = expect_type;
-		return RP_EmulateIOD(priv, sub_url);
-	}
-
-	desc = priv->session_desc;
-	priv->session_desc = NULL;
-	return desc;
-}
-
-static GF_Err RP_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID, i;
-	RTPStream *ch, *next_ch;
-	RTSPSession *sess = NULL;
-	char *es_url;
-	RTPClient *priv = (RTPClient *)plug->priv;
-	if (upstream) return GF_NOT_SUPPORTED;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Connecting channel @%08x - %s\n", channel, url));
-
-	sess = gf_list_get(priv->sessions, 0);
-	if (sess && sess->satip) {
-		RTPStream *ch = gf_list_get(priv->channels, 0);
-		if (!ch) return GF_SERVICE_ERROR;
-		return ch->satip_m2ts_ifce->ConnectChannel(ch->satip_m2ts_ifce, channel, url, upstream);
-	}
-
-	ch = RP_FindChannel(priv, channel, 0, (char *) url, GF_FALSE);
-	if (ch && (ch->status != RTP_Disconnected) ) return GF_SERVICE_ERROR;
-
-	es_url = NULL;
-	sess = NULL;
-	if (strstr(url, "ES_ID=")) {
-		sscanf(url, "ES_ID=%ud", &ESID);
-		/*first case: simple URL (same namespace)*/
-		ch = RP_FindChannel(priv, NULL, ESID, NULL, GF_FALSE);
-		/*this should not happen, the sdp must describe all streams in the service*/
-		if (!ch) return GF_STREAM_NOT_FOUND;
-
-		/*search for next stream*/
-		ch->next_stream = 0;
-		for (i = 0; i < gf_list_count(priv->channels); i++) {
-			next_ch = (RTPStream *)gf_list_get(priv->channels, i);
-			if (next_ch->prev_stream == ch->mid)
-			{
-				ch->next_stream = next_ch->mid;
-				break;
-			}
-		}
-
-		/*assign app channel*/
-		ch->channel = channel;
-		sess = ch->rtsp;
-	}
-	/*rtsp url - create a session if needed*/
-	else if (!strnicmp(url, "rtsp://", 7) || !strnicmp(url, "rtspu://", 8) || !strnicmp(url, "satip://", 8)) {
-		sess = RP_CheckSession(priv, (char *) url);
-		if (!sess) sess = RP_NewSession(priv, (char *) url);
-		es_url = (char *) url;
-	}
-	/*data: url*/
-	else if (strstr(url, "data:application/mpeg4-od-au;base64")
-	         || strstr(url, "data:application/mpeg4-bifs-au;base64")
-	         || strstr(url, "data:application/mpeg4-es-au;base64")
-	        ) {
-
-		GF_SAFEALLOC(ch, RTPStream);
-		if (!ch) return GF_OUT_OF_MEM;
-		
-		ch->control = gf_strdup(url);
-		ch->owner = priv;
-		ch->channel = channel;
-		ch->status = RTP_Connected;
-		/*register*/
-		gf_list_add(priv->channels, ch);
-		RP_ConfirmChannelConnect(ch, GF_OK);
-
-		return GF_OK;
-	}
-	/*session migration resume - don't send data to the server*/
-	if (ch && (ch->status==RTP_SessionResume)) {
-		ch->flags |= RTP_CONNECTED;
-		RP_InitStream(ch, GF_FALSE);
-		RP_ConfirmChannelConnect(ch, GF_OK);
-		return GF_OK;
-	}
-	/*send a DESCRIBE (not a setup) on the channel. If the channel is already created then the
-	describe is skipped and a SETUP is sent directly, otherwise the channel is first described then setup*/
-	if (sess) RP_Describe(sess, es_url, channel);
-	/*otherwise confirm channel connection*/
-	else RP_ConfirmChannelConnect(ch, GF_OK);
-
-	return GF_OK;
-}
-
-
-static GF_Err RP_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	RTPStream *ch;
-	RTPClient *priv = (RTPClient *)plug->priv;
-	RTSPSession *sess = NULL;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Disconnecting channel @%08x\n", channel));
-	
-	sess = gf_list_get(priv->sessions, 0);
-	if (sess && sess->satip) {
-		RTPStream *ch = gf_list_get(priv->channels, 0);
-		if (!ch) return GF_SERVICE_ERROR;
-		return ch->satip_m2ts_ifce->DisconnectChannel(ch->satip_m2ts_ifce, channel);
-	}
-
-	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-	gf_mx_p(priv->mx);
-	/*disconnect stream BUT DO NOT DELETE IT since we don't store SDP*/
-	ch->flags &= ~RTP_CONNECTED;
-	ch->channel = NULL;
-	gf_mx_v(priv->mx);
-	gf_service_disconnect_ack(priv->service, channel, GF_OK);
-	return GF_OK;
-}
-
-static void gf_rtp_switch_quality(RTPClient *rtp, Bool switch_up)
-{
-	u32 i,count;
-	RTPStream *ch, *cur_ch;
-	GF_NetworkCommand com;
-
-	count = gf_list_count(rtp->channels);
-	/*find the current stream*/
-	ch = cur_ch = NULL;
-	for (i = 0; i < count; i++) {
-		cur_ch = (RTPStream *) gf_list_get(rtp->channels, i);
-		if (cur_ch->mid != rtp->cur_mid) {
-			cur_ch=NULL;
-			continue;
-		}
-		break;
-	}
-	if (!cur_ch) return;
-
-	if (switch_up)
-	{
-		/*this is the highest stream*/
-		if (!cur_ch->next_stream)
-		{
-			cur_ch->status = RTP_Running;
-			return;
-		}
-		else
-		{
-			for (i = 0; i < count; i++) {
-				ch = (RTPStream *) gf_list_get(rtp->channels, i);
-				if (ch->mid == cur_ch->next_stream)
-				{
-					/*resume streaming next channel*/
-					gf_mx_p(rtp->mx);
-					RP_InitStream(ch, GF_FALSE);
-					gf_mx_v(rtp->mx);
-					ch->status = RTP_Running;
-					rtp->cur_mid = ch->mid;
-					break;
-				}
-
-			}
-		}
-	}
-	else
-	{
-		/*this is the lowest stream i.e base layer*/
-		if (!cur_ch->prev_stream)
-		{
-			cur_ch->status = RTP_Running;
-			return;
-		}
-		else
-		{
-			for (i = 0; i < count; i++) {
-				ch = (RTPStream *) gf_list_get(rtp->channels, i);
-				if (ch->mid == cur_ch->prev_stream)
-				{
-					/*stop streaming current channel*/
-					gf_rtp_stop(cur_ch->rtp_ch);
-					cur_ch->status = RTP_Connected;
-					com.command_type = GF_NET_CHAN_RESET;
-					com.base.on_channel = cur_ch;
-					gf_service_command(rtp->service, &com, GF_OK);
-					rtp->cur_mid = ch->mid;
-					break;
-				}
-			}
-		}
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Switch from ES%d to ES %d\n", cur_ch->mid, ch->mid));
-	return;
-}
-
-static GF_Err RP_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	RTPStream *ch;
-	RTPClient *priv = (RTPClient *)plug->priv;
-	RTSPSession *sess = NULL;
-
-	sess = gf_list_get(priv->sessions, 0);
-	if (sess && sess->satip) {
-		RTPStream *ch = gf_list_get(priv->channels, 0);
-		if (!ch) return GF_SERVICE_ERROR;
-		return ch->satip_m2ts_ifce->ServiceCommand(ch->satip_m2ts_ifce, com);
-	}
-
-	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
-		u32 i;
-		for (i=0; i<gf_list_count(priv->channels); i++) {
-			ch = (RTPStream*)gf_list_get(priv->channels, i);
-			if (ch->depacketizer->sl_map.StreamType==GF_STREAM_AUDIO)
-				return GF_OK;
-		}
-		return GF_NOT_SUPPORTED;
-	}
-	if (com->command_type==GF_NET_SERVICE_MIGRATION_INFO) {
-		RP_SaveSessionState(priv);
-		priv->session_migration = GF_TRUE;
-		if (priv->session_state_data) {
-			com->migrate.data = priv->session_state_data;
-			com->migrate.data_len = (u32) strlen(priv->session_state_data);
-			return GF_OK;
-		}
-		return GF_NOT_SUPPORTED;
-	}
-
-	if (com->command_type == GF_NET_SERVICE_QUALITY_SWITCH)
-	{
-		gf_rtp_switch_quality(priv, com->switch_quality.up);
-		return GF_OK;
-	}
-
-	/*ignore commands other than channels one*/
-	if (!com->base.on_channel) {
-		if (com->command_type==GF_NET_IS_CACHABLE) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	}
-
-	ch = RP_FindChannel(priv, com->base.on_channel, 0, NULL, GF_FALSE);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		if (ch->rtp_ch || ch->rtsp || !ch->control) return GF_NOT_SUPPORTED;
-		/*embedded channels work in pull mode*/
-		if (strstr(ch->control, "data:application/")) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_INTERACTIVE:
-		/*looks like pure RTP / multicast etc, not interactive*/
-		if (!ch->control) return GF_NOT_SUPPORTED;
-		/*emulated broadcast mode*/
-		else if (ch->flags & RTP_FORCE_BROADCAST) return GF_NOT_SUPPORTED;
-		/*regular rtsp mode*/
-		else if (ch->flags & RTP_HAS_RANGE) return GF_OK;
-		/*embedded data*/
-		else if (strstr(ch->control, "application")) return GF_OK;
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		if (!(ch->rtp_ch || ch->rtsp || !ch->control)) {
-			com->buffer.max = com->buffer.min = 0;
-		}
-		//otherwise use default player config
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = (ch->flags & RTP_HAS_RANGE) ? (ch->range_end - ch->range_start) : 0;
-		return GF_OK;
-	/*RTP channel config is done upon connection, once the complete SL mapping is known
-	however we must store some info not carried in SDP*/
-	case GF_NET_CHAN_CONFIG:
-		if (com->cfg.frame_duration) ch->depacketizer->sl_hdr.au_duration = com->cfg.frame_duration;
-		ch->ts_res = com->cfg.sl_config.timestampResolution;
-		return GF_OK;
-
-	case GF_NET_CHAN_PLAY:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Processing play on channel @%08x - %s\n", ch, ch->rtsp ? "RTSP control" : "No control (RTP)" ));
-		/*is this RTSP or direct RTP?*/
-		ch->flags &= ~RTP_EOS;
-		if (ch->rtsp) {
-			if (ch->status==RTP_SessionResume) {
-				const char *opt = gf_modules_get_option((GF_BaseInterface *) plug, "Streaming", "SessionMigrationPause");
-				if (opt && !strcmp(opt, "yes")) {
-					ch->status = RTP_Connected;
-					com->play.start_range = ch->current_start;
-				} else {
-					ch->status = RTP_Running;
-					return GF_OK;
-				}
-			}
-			RP_UserCommand(ch->rtsp, ch, com);
-		} else {
-			ch->status = RTP_Running;
-			if (!ch->next_stream)
-				priv->cur_mid = ch->mid;
-
-			if (ch->rtp_ch) {
-				/*technically we shouldn't attempt to synchronize streams based on RTP, we should use RTCP/ However it
-				may happen that the RTCP traffic is absent ...*/
-				//ch->check_rtp_time = RTP_SET_TIME_RTP;
-				ch->rtcp_init = GF_FALSE;
-				gf_mx_p(priv->mx);
-				RP_InitStream(ch, (ch->flags & RTP_CONNECTED) ? GF_TRUE : GF_FALSE);
-				gf_mx_v(priv->mx);
-				gf_rtp_set_info_rtp(ch->rtp_ch, 0, 0, 0);
-			} else {
-				/*direct channel, store current start*/
-				ch->current_start = com->play.start_range;
-				ch->flags |= GF_RTP_NEW_AU;
-				gf_rtp_depacketizer_reset(ch->depacketizer, GF_FALSE);
-			}
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		/*is this RTSP or direct RTP?*/
-		if (ch->rtsp) {
-			if (! ch->owner->session_migration) {
-				RP_UserCommand(ch->rtsp, ch, com);
-			}
-		} else {
-			ch->status = RTP_Connected;
-			ch->owner->last_ntp = 0;
-		}
-		ch->rtcp_init = GF_FALSE;
-		return GF_OK;
-	case GF_NET_CHAN_SET_SPEED:
-	case GF_NET_CHAN_PAUSE:
-	case GF_NET_CHAN_RESUME:
-		assert(ch->rtsp);
-		RP_UserCommand(ch->rtsp, ch, com);
-		return GF_OK;
-
-	case GF_NET_CHAN_GET_DSI:
-		if (ch->depacketizer && ch->depacketizer->sl_map.configSize) {
-			com->get_dsi.dsi_len = ch->depacketizer->sl_map.configSize;
-			com->get_dsi.dsi = (char*)gf_malloc(sizeof(char)*com->get_dsi.dsi_len);
-			memcpy(com->get_dsi.dsi, ch->depacketizer->sl_map.config, sizeof(char)*com->get_dsi.dsi_len);
-		} else {
-			com->get_dsi.dsi = NULL;
-			com->get_dsi.dsi_len = 0;
-		}
-		return GF_OK;
-
-
-	case GF_NET_GET_STATS:
-		memset(&com->net_stats, 0, sizeof(GF_NetComStats));
-		if (ch->rtp_ch) {
-			u32 time;
-			Float bps;
-			com->net_stats.pck_loss_percentage = gf_rtp_get_loss(ch->rtp_ch);
-			if (ch->flags & RTP_INTERLEAVED) {
-				com->net_stats.multiplex_port = gf_rtsp_get_session_port(ch->rtsp->session);
-				com->net_stats.port = gf_rtp_get_low_interleave_id(ch->rtp_ch);
-				com->net_stats.ctrl_port = gf_rtp_get_hight_interleave_id(ch->rtp_ch);
-			} else {
-				com->net_stats.multiplex_port = 0;
-				gf_rtp_get_ports(ch->rtp_ch, &com->net_stats.port, &com->net_stats.ctrl_port);
-			}
-			if (ch->stat_stop_time) {
-				time = ch->stat_stop_time - ch->stat_start_time;
-			} else {
-				time = gf_sys_clock() - ch->stat_start_time;
-			}
-			bps = 8.0f * ch->rtp_bytes;
-			bps *= 1000;
-			bps /= time;
-			com->net_stats.bw_down = (u32) bps;
-			bps = 8.0f * ch->rtcp_bytes;
-			bps *= 1000;
-			bps /= time;
-			com->net_stats.ctrl_bw_down = (u32) bps;
-			bps = 8.0f * gf_rtp_get_tcp_bytes_sent(ch->rtp_ch);
-			bps *= 1000;
-			bps /= time;
-			com->net_stats.ctrl_bw_up = (u32) bps;
-		}
-		return GF_OK;
-	case GF_NET_CHAN_NALU_MODE:
-		if (com->nalu_mode.extract_mode)
-			ch->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
-		else
-			ch->depacketizer->flags &= ~GF_RTP_AVC_USE_ANNEX_B;
-		return GF_OK;
-	default:
-		break;
-	}
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err RP_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	char *data;
-	RTPStream *ch;
-	RTPClient *priv = (RTPClient *)plug->priv;
-
-	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-	if (ch->rtp_ch || ch->rtsp || !ch->control) return GF_SERVICE_ERROR;
-	if (ch->status != RTP_Running) return GF_SERVICE_ERROR;
-	data = strstr(ch->control, ";base64");
-	if (!data) return GF_SERVICE_ERROR;
-
-	if (ch->current_start>=0) {
-		*sl_compressed = GF_FALSE;
-		memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
-		out_sl_hdr->accessUnitEndFlag = 1;
-		out_sl_hdr->accessUnitStartFlag = 1;
-		out_sl_hdr->compositionTimeStamp = (u64) (ch->current_start * ch->ts_res);
-		out_sl_hdr->compositionTimeStampFlag = 1;
-		out_sl_hdr->randomAccessPointFlag = 1;
-		*out_reception_status = GF_OK;
-		*is_new_data = (ch->flags & GF_RTP_NEW_AU) ? GF_TRUE : GF_FALSE;
-
-		/*decode data*/
-		data = strstr(data, ",");
-		data += 1;
-		*out_data_size = gf_base64_decode(data, (u32) strlen(data), ch->buffer, RTP_BUFFER_SIZE);
-		/*FIXME - currently only support for empty SL header*/
-		*out_data_ptr = ch->buffer;
-		ch->flags &= ~GF_RTP_NEW_AU;
-	} else {
-		*out_data_ptr = NULL;
-		*out_data_size = 0;
-		*out_reception_status = GF_EOS;
-		ch->flags |= RTP_EOS;
-	}
-	return GF_OK;
-}
-
-static GF_Err RP_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	RTPStream *ch;
-	RTPClient *priv = (RTPClient *)plug->priv;
-
-	ch = RP_FindChannel(priv, channel, 0, NULL, GF_FALSE);
-	if (!ch) return GF_STREAM_NOT_FOUND;
-	if (ch->rtp_ch || ch->rtsp || !ch->control) return GF_SERVICE_ERROR;
-	if (ch->status != RTP_Running) return GF_SERVICE_ERROR;
-
-	/*this will trigger EOS at next fetch*/
-	ch->current_start = -1.0;
-	return GF_OK;
-}
-
-static Bool RP_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	RTSPSession *sess;
-	RTPClient *priv = (RTPClient *)plug->priv;
-
-	if (strstr(url, "data:application/mpeg4-od-au;base64")
-	        || strstr(url, "data:application/mpeg4-bifs-au;base64")
-	        || strstr(url, "data:application/mpeg4-es-au;base64")
-	   ) return GF_TRUE;
-
-	if (url[0]=='#') {
-		Bool st_type = GF_FALSE;
-		if (!stricmp(url, "#video")) st_type = GF_STREAM_VISUAL;
-		else if (!stricmp(url, "#audio")) st_type = GF_STREAM_AUDIO;
-
-		if (st_type) {
-			u32 i=0;
-			RTPStream *st;
-			while ((st = (RTPStream *)gf_list_enum(priv->channels, &i))) {
-				if (st->depacketizer && (st->depacketizer->sl_map.StreamType==st_type))
-					return GF_TRUE;
-			}
-		}
-		return GF_FALSE;
-	} else if (!RP_CanHandleURL(plug, url)) {
-		return GF_FALSE;
-	}
-	/*if this URL is part of a running session then ok*/
-	sess = RP_CheckSession(priv, (char *) url);
-	if (sess) return GF_TRUE;
-	return GF_FALSE;
-}
-
-
-GF_InputService *RTP_Load()
-{
-	RTPClient *priv;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC RTP/RTSP Client", "gpac distribution")
-
-	GF_SAFEALLOC(priv, RTPClient);
-	if (!priv) {
-		gf_free(plug);
-		return NULL;
-	}
-
-	plug->CanHandleURL = RP_CanHandleURL;
-	plug->CanHandleURLInService = RP_CanHandleURLInService;
-	plug->ConnectService = RP_ConnectService;
-	plug->CloseService = RP_CloseService;
-	plug->GetServiceDescriptor = RP_GetServiceDesc;
-	plug->ConnectChannel = RP_ConnectChannel;
-	plug->DisconnectChannel = RP_DisconnectChannel;
-	plug->ServiceCommand = RP_ServiceCommand;
-	plug->RegisterMimeTypes = RP_RegisterMimeTypes;
-
-	/*PULL mode for embedded streams*/
-	plug->ChannelGetSLP = RP_ChannelGetSLP;
-	plug->ChannelReleaseSLP = RP_ChannelReleaseSLP;
-
-	priv->sessions = gf_list_new();
-	priv->channels = gf_list_new();
-
-	plug->priv = priv;
-
-	priv->time_out = RTSP_DEFAULT_TIMEOUT;
-	priv->mx = gf_mx_new("RTPDemux");
-	priv->th = gf_th_new("RTPDemux");
-
-	return plug;
-}
-
-
-void RTP_Delete(GF_BaseInterface *bi)
-{
-	RTPClient *rtp;
-	u32 retry;
-	GF_InputService *plug = (GF_InputService *) bi;
-	rtp = (RTPClient *)plug->priv;
-
-	/*shutdown thread*/
-	if (rtp->th_state==1) rtp->th_state = 0;
-	retry = 20;
-	while ((rtp->th_state==1) && retry) {
-		gf_sleep(10);
-		retry--;
-	}
-	assert(retry);
-
-	if (rtp->session_state_data) gf_free(rtp->session_state_data);
-
-	RP_cleanup(rtp);
-	gf_th_del(rtp->th);
-	gf_mx_del(rtp->mx);
-	gf_list_del(rtp->sessions);
-	gf_list_del(rtp->channels);
-	gf_free(rtp);
-	gf_free(bi);
-}
-
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_STREAMING
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_STREAMING
-	if (InterfaceType == GF_NET_CLIENT_INTERFACE) return (GF_BaseInterface *)RTP_Load();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_STREAMING
-	case GF_NET_CLIENT_INTERFACE:
-		RTP_Delete(ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( rtp_in )

gpac-0.8.0.tar.gz/modules/rtp_in/rtp_in.h Deleted

@@ -1,387 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 RTP_IN_H
-#define RTP_IN_H
-
-/*module interface*/
-#include <gpac/modules/service.h>
-#ifndef GPAC_DISABLE_STREAMING
-
-#include <gpac/thread.h>
-#include <gpac/constants.h>
-#include <gpac/base_coding.h>
-/*IETF lib*/
-#include <gpac/ietf.h>
-
-
-#define RTP_BUFFER_SIZE			0x100000ul
-#define RTSP_BUFFER_SIZE		5000
-#define RTSP_TCP_BUFFER_SIZE    0x100000ul
-#define RTSP_LANGUAGE		"English"
-
-
-/*the rtsp/rtp client*/
-typedef struct
-{
-	/*the service we're responsible for*/
-	GF_ClientService *service;
-
-	/*the one and only IOD*/
-	GF_Descriptor *session_desc;
-
-	/*RTSP sessions*/
-	GF_List *sessions;
-	/*RTP/RTCP media channels*/
-	GF_List *channels;
-
-	/*sdp downloader*/
-	GF_DownloadSession * dnload;
-	/*initial sdp download if any (temp storage)*/
-	struct _sdp_fetch *sdp_temp;
-
-	/*RTSP communication/deinterleaver thread*/
-	GF_Mutex *mx;
-	GF_Thread *th;
-	u32 th_state;
-
-	/*RTSP config*/
-	/*transport mode. 0 is udp, 1 is tcp, 3 is tcp if unreliable media */
-	u32 transport_mode;
-	/*default RTSP port*/
-	u16 default_port;
-	/*signaling timeout in msec*/
-	u32 time_out;
-	/*udp timeout in msec*/
-	u32 udp_time_out;
-
-	/*packet drop emulation*/
-	u32 first_packet_drop;
-	u32 frequency_drop;
-
-	/*for single-object control*/
-	u32 media_type;
-
-	/*session state data, formatyed as "data:application/sdp;SDPDATA"*/
-	char *session_state_data;
-
-	/*if set ANNOUNCE (sent by server) will be handled*/
-//	Bool handle_announce;
-
-	Double last_ntp;
-
-	Bool session_migration;
-
-	Bool is_scalable;
-
-	u32 cur_mid;
-} RTPClient;
-
-enum
-{
-	RTSP_AGG_CONTROL = 1,
-	RTSP_TCP_FLUSH = 1<<1,
-	RTSP_FORCE_INTER = 1<<2,
-	RTSP_WAIT_REPLY = 1<<3,
-	RTSP_DSS_SERVER = 1<<4,
-	RTSP_AGG_ONLY = 1<<5,
-};
-
-/*rtsp session*/
-typedef struct _rtp_session
-{
-	u32 flags;
-
-	/*owner*/
-	RTPClient *owner;
-
-	/*RTSP session object*/
-	GF_RTSPSession *session;
-	/*session ID for aggregated stream control*/
-	char *session_id;
-
-	/*session control string*/
-	char *control;
-
-	/*response object*/
-	GF_RTSPResponse *rtsp_rsp;
-
-	Double last_range;
-	u32 command_time;
-	GF_List *rtsp_commands;
-	GF_Err connect_error;
-
-	/*SAT>IP uses a non-conformant version of RTSP*/
-	Bool satip;
-	char *satip_server;
-} RTSPSession;
-
-/*creates new RTSP session handler*/
-RTSPSession *RP_NewSession(RTPClient *rtp, char *session_control);
-/*disconnects and destroy RTSP session handler - if immediate_shutdown do not wait for response*/
-void RP_DelSession(RTSPSession *sess);
-/*check session by control string*/
-RTSPSession *RP_CheckSession(RTPClient *rtp, char *control);
-
-void RP_SetupObjects(RTPClient *rtp);
-
-void RP_ProcessCommands(RTSPSession *sess);
-
-void RP_SendMessage(GF_ClientService *service, GF_Err e, const char *message);
-
-/*RTP channel state*/
-enum
-{
-	/*channel is setup and waits for connection request*/
-	RTP_Setup,
-	/*waiting for server reply*/
-	RTP_WaitingForAck,
-	/*connection OK*/
-	RTP_Connected,
-	/*data exchange on this service/channel*/
-	RTP_Running,
-	/*deconnection OK - a download channel can automatically disconnect when download is done*/
-	RTP_Disconnected,
-	/*service/channel is not (no longer) available/found and should be removed*/
-	RTP_Unavailable,
-
-	RTP_SessionResume
-
-};
-
-
-/*rtp channel flags*/
-enum
-{
-	/*static RTP channel flags*/
-
-	/*set if sending RTCP reports is enabled (default)*/
-	RTP_ENABLE_RTCP = 1,
-	/*set if stream control possible*/
-	RTP_HAS_RANGE = (1<<1),
-	/*set if RTP over RTSP*/
-	RTP_INTERLEAVED = (1<<2),
-	/*broadcast emultaion is on (no time control for stream)*/
-	RTP_FORCE_BROADCAST = (1<<3),
-
-	/*RTP channel runtime flags*/
-
-	/*set if next command (PLAY/PAUSE) is to be skipped (aggregation control)*/
-	RTP_SKIP_NEXT_COM = (1<<4),
-	/*indicates whether channel creation has been acknowledged or not
-	this is needed to filter real channel_connect calls from RTSP re-setup (after STOP) ones*/
-	RTP_CONNECTED = (1<<5),
-	/*EOS signaled (RTCP or range-based)*/
-	RTP_EOS = (1<<6),
-
-	/*RTP stream is using mobileIP - this will disable RTP over RTSP*/
-	RTP_MOBILEIP = (1<<7),
-
-};
-
-enum
-{
-	RTP_SET_TIME_NONE = 0,
-	RTP_SET_TIME_RTP,
-	RTP_SET_TIME_RTP_SEEK,
-};
-
-#define RTCP_DEFAULT_TIMEOUT_MS	5000
-
-/*rtp channel*/
-typedef struct
-{
-	/*module*/
-	RTPClient *owner;
-
-	/*channel flags*/
-	u32 flags;
-
-	/*control session (may be null)*/
-	RTSPSession *rtsp;
-	/*session ID for independent stream control*/
-	char *session_id;
-
-	/*RTP channel*/
-	GF_RTPChannel *rtp_ch;
-
-	/*depacketizer*/
-	GF_RTPDepacketizer *depacketizer;
-
-	/*logical app channel*/
-	LPNETCHANNEL channel;
-	u32 status;
-
-	u32 ES_ID, OD_ID;
-	char *control;
-
-	/*rtp receive buffer*/
-	char buffer[RTP_BUFFER_SIZE];
-	/*set at play/seek stages to sync app NPT to RTP time (RTSP) or NTP to RTP (RTCP)
-	*/
-	u32 check_rtp_time;
-
-	/*can we control the stream ?*/
-	Double range_start, range_end;
-	/*current start time in npt (for pause/resume)*/
-	Double current_start;
-
-	Bool paused;
-	Bool rtcp_init;
-	/*UDP time-out detection*/
-	u32 last_udp_time;
-	/*RTP stats*/
-	u32 rtp_bytes, rtcp_bytes, stat_start_time, stat_stop_time;
-	u32 ts_res;
-
-	/*stream id*/
-	u32 mid;
-
-	u32 prev_stream;
-	u32 next_stream;
-	u32 base_stream;
-
-	u32 rtcp_check_start;
-
-	u64 ts_offset;
-	
-	/*SAT>IP M2TS demux*/
-	GF_InputService *satip_m2ts_ifce;
-	Bool satip_m2ts_service_connected;
-} RTPStream;
-
-GF_Err RP_ConnectServiceEx(GF_InputService *plug, GF_ClientService *serv, const char *url, Bool skip_migration);
-
-
-/*creates new RTP stream from SDP info*/
-RTPStream *RP_NewStream(RTPClient *rtp, GF_SDPMedia *media, GF_SDPInfo *sdp, RTPStream *input_stream);
-/*creates new SAT>IP stream*/
-RTPStream *RP_NewSatipStream(RTPClient *rtp, const char *server_ip);
-/*destroys RTP stream */
-void RP_DeleteStream(RTPStream *ch);
-/*resets stream state and inits RTP sockets if ResetOnly is false*/
-GF_Err RP_InitStream(RTPStream *ch, Bool ResetOnly);
-
-/*RTSP -> RTP de-interleaving callback*/
-GF_Err RP_DataOnTCP(GF_RTSPSession *sess, void *cbck, char *buffer, u32 bufferSize, Bool IsRTCP);
-/*send confirmation of connection - if no error, also setup SL based on payload*/
-void RP_ConfirmChannelConnect(RTPStream *ch, GF_Err e);
-
-/*fetch sdp file - stream is the RTP channel this sdp describes, or NULL if session sdp*/
-void RP_FetchSDP(RTPClient *rtp, char *url, RTPStream *stream, char *original_url);
-
-/*locate RTP stream by channel or ES_ID or control*/
-RTPStream *RP_FindChannel(RTPClient *rtp, LPNETCHANNEL ch, u32 ES_ID, char *es_control, Bool remove_stream);
-/*adds channel to session identified by session_control. If no session exists, the session is created if needed*/
-GF_Err RP_AddStream(RTPClient *rtp, RTPStream *stream, char *session_control);
-/*removes stream from session*/
-void RP_RemoveStream(RTPClient *rtp, RTPStream *ch);
-/*reads input socket and process*/
-void RP_ReadStream(RTPStream *ch);
-
-/*parse RTP payload for MPEG4*/
-void RP_ParsePayloadMPEG4(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for MPEG12*/
-void RP_ParsePayloadMPEG12(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for AMR*/
-void RP_ParsePayloadAMR(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for H263+*/
-void RP_ParsePayloadH263(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for 3GPP Text*/
-void RP_ParsePayloadText(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for H264/AVC*/
-void RP_ParsePayloadH264(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-/*parse RTP payload for LATM audio*/
-void RP_ParsePayloadLATM(RTPStream *ch, GF_RTPHeader *hdr, char *payload, u32 size);
-
-/*load SDP and setup described media in SDP. If stream is null this is the root
-SDP and IOD will be extracted, otherwise this a channel SDP*/
-void RP_LoadSDP(RTPClient *rtp, char *sdp, u32 sdp_len, RTPStream *stream);
-
-/*returns 1 if payload type is supported*/
-u32 payt_get_type(RTPClient *rtp, GF_RTPMap *map, GF_SDPMedia *media);
-/*setup payload type, returns 1 if success, 0 otherwise (in which case the stream will be deleted)*/
-Bool payt_setup(RTPStream *st, GF_RTPMap *map, GF_SDPMedia *media);
-
-
-/*RTSP signaling is handled by stacking commands and processing them
-in the main session thread. Each RTSP command has an associated private stack as follows*/
-
-/*describe stack for single channel (not for session)*/
-typedef struct
-{
-	u32 ES_ID;
-	LPNETCHANNEL channel;
-	char *esd_url;
-} ChannelDescribe;
-
-typedef struct
-{
-	RTPStream *ch;
-	GF_NetworkCommand com;
-} ChannelControl;
-
-/*RTSP signaling */
-Bool RP_PreprocessDescribe(RTSPSession *sess, GF_RTSPCommand *com);
-GF_Err RP_ProcessDescribe(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e);
-void RP_ProcessSetup(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e);
-void RP_ProcessTeardown(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e);
-Bool RP_PreprocessUserCom(RTSPSession *sess, GF_RTSPCommand *com);
-void RP_ProcessUserCommand(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e);
-
-/*send describe - if esd_url is given, this is a describe on es*/
-void RP_Describe(RTSPSession *sess, char *esd_url, LPNETCHANNEL channel);
-/*send setup for stream*/
-void RP_Setup(RTPStream *ch);
-/*filter setup if no session (rtp only), otherwise setup channel - ch_desc may be NULL
-if channel association is already done*/
-GF_Err RP_SetupChannel(RTPStream *ch, ChannelDescribe *ch_desc);
-/*send command for stream - handles aggregation*/
-void RP_UserCommand(RTSPSession *sess, RTPStream *ch, GF_NetworkCommand *command);
-/*disconnect the session - if @ch, only the channel is teardown*/
-void RP_Teardown(RTSPSession *sess, RTPStream *ch);
-
-/*emulate IOD*/
-GF_Descriptor *RP_EmulateIOD(RTPClient *rtp, const char *sub_url);
-
-
-/*sdp file downloader*/
-typedef struct _sdp_fetch
-{
-	RTPClient *client;
-	/*when loading a channel from SDP*/
-	RTPStream *chan;
-
-	char *remote_url;
-	char *original_url;
-} SDPFetch;
-
-
-void RP_SaveSessionState(RTPClient *rtp);
-
-
-#endif /*GPAC_DISABLE_STREAMING*/
-
-#endif

gpac-0.8.0.tar.gz/modules/rtp_in/rtp_session.c Deleted

@@ -1,412 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-
-#ifndef GPAC_DISABLE_STREAMING
-
-
-void RP_SendFailure(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	char sMsg[1000];
-	sprintf(sMsg, "Cannot send %s", com->method);
-	RP_SendMessage(sess->owner->service, e, sMsg);
-}
-
-GF_Err RP_ProcessResponse(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	if (!strcmp(com->method, GF_RTSP_DESCRIBE))
-		return RP_ProcessDescribe(sess, com, e);
-	else if (!strcmp(com->method, GF_RTSP_SETUP))
-		RP_ProcessSetup(sess, com, e);
-	else if (!strcmp(com->method, GF_RTSP_TEARDOWN))
-		RP_ProcessTeardown(sess, com, e);
-	else if (!strcmp(com->method, GF_RTSP_PLAY) || !strcmp(com->method, GF_RTSP_PAUSE))
-		RP_ProcessUserCommand(sess, com, e);
-	return GF_OK;
-}
-
-/*access to command list is protected bymutex, BUT ONLY ACCESS - this way we're sure that command queueing
-from app will not deadlock if we're waiting for the app to release any mutex (don't forget play request may
-come on stream N while we're processing stream P setup)*/
-static GF_RTSPCommand *RP_GetCommand(RTSPSession *sess)
-{
-	GF_RTSPCommand *com;
-	gf_mx_p(sess->owner->mx);
-	com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
-	gf_mx_v(sess->owner->mx);
-	return com;
-}
-
-static void RP_RemoveCommand(RTSPSession *sess)
-{
-	gf_mx_p(sess->owner->mx);
-	gf_list_rem(sess->rtsp_commands, 0);
-	gf_mx_v(sess->owner->mx);
-}
-
-void RP_ProcessCommands(RTSPSession *sess)
-{
-	GF_RTSPCommand *com;
-	GF_Err e;
-	u32 time;
-
-	com = RP_GetCommand(sess);
-
-	/*if asked or command to send, flushout TCP - TODO: check what's going on with ANNOUNCE*/
-	if ((com && !(sess->flags & RTSP_WAIT_REPLY) ) || (sess->flags & RTSP_TCP_FLUSH) ) {
-		while (1) {
-			e = gf_rtsp_session_read(sess->session);
-			if (e) break;
-		}
-		sess->flags &= ~RTSP_TCP_FLUSH;
-	}
-
-	/*handle response or announce*/
-	if ( (com && (sess->flags & RTSP_WAIT_REPLY) ) /*|| (!com && sess->owner->handle_announce)*/) {
-		e = gf_rtsp_get_response(sess->session, sess->rtsp_rsp);
-		if (e!= GF_IP_NETWORK_EMPTY) {
-			e = RP_ProcessResponse(sess, com, e);
-			/*this is a service connect error -> plugin may be discarded */
-			if (e!=GF_OK) {
-				RP_RemoveCommand(sess);
-				gf_rtsp_command_del(com);
-				gf_service_connect_ack(sess->owner->service, NULL, e);
-				return;
-			}
-
-			RP_RemoveCommand(sess);
-			gf_rtsp_command_del(com);
-			sess->flags &= ~RTSP_WAIT_REPLY;
-			sess->command_time = 0;
-		} else {
-			u32 time_out = sess->owner->time_out;
-			/*evaluate timeout*/
-			time = gf_sys_clock() - sess->command_time;
-
-			if (!strcmp(com->method, GF_RTSP_DESCRIBE) && (time_out < 10000) ) time_out = 10000;
-			/*don't waste time waiting for teardown ACK, half a sec is enough. If server is not replying
-			in time it is likely to never reply (happens with RTP over RTSP) -> kill session
-			and create new one*/
-			else if (!strcmp(com->method, GF_RTSP_TEARDOWN) && (time>=500) ) time = time_out;
-
-			//signal what's going on
-			if (time >= time_out) {
-				if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
-					gf_rtsp_session_reset(sess->session, GF_TRUE);
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Request Timeout for command %s after %d ms\n", com->method, time));
-				}
-
-				RP_ProcessResponse(sess, com, GF_IP_NETWORK_FAILURE);
-				RP_RemoveCommand(sess);
-				gf_rtsp_command_del(com);
-				sess->flags &= ~RTSP_WAIT_REPLY;
-				sess->command_time = 0;
-				gf_rtsp_reset_aggregation(sess->session);
-			}
-		}
-		return;
-	}
-
-	if (!com) return;
-
-	/*send command - check RTSP session state first*/
-	switch (gf_rtsp_get_session_state(sess->session)) {
-	case GF_RTSP_STATE_WAITING:
-	case GF_RTSP_STATE_WAIT_FOR_CONTROL:
-		return;
-	case GF_RTSP_STATE_INVALIDATED:
-		RP_SendFailure(sess, com, GF_IP_NETWORK_FAILURE);
-		RP_RemoveCommand(sess);
-		gf_rtsp_command_del(com);
-		sess->flags &= ~RTSP_WAIT_REPLY;
-		sess->command_time = 0;
-		return;
-	}
-	/*process*/
-	com->User_Agent = (char*)gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(sess->owner->service), "Downloader", "UserAgent");
-	if (!com->User_Agent) com->User_Agent = "GPAC " GPAC_VERSION " RTSP Client";
-	com->Accept_Language = RTSP_LANGUAGE;
-	/*if no session assigned and a session ID is valid, use it*/
-	if (sess->session_id && !com->Session)
-		com->Session = sess->session_id;
-
-	/*preprocess describe before sending (always the ESD url thing)*/
-	if (!strcmp(com->method, GF_RTSP_DESCRIBE)) {
-		com->Session = NULL;
-		if (!RP_PreprocessDescribe(sess, com)) {
-			e = GF_BAD_PARAM;
-			goto exit;
-		}
-	}
-	/*preprocess play/stop/pause before sending (aggregation)*/
-	if (!strcmp(com->method, GF_RTSP_PLAY)
-	        || !strcmp(com->method, GF_RTSP_PAUSE)
-	        || !strcmp(com->method, GF_RTSP_TEARDOWN)) {
-		//command is skipped
-		if (!RP_PreprocessUserCom(sess, com)) {
-			e = GF_BAD_PARAM;
-			goto exit;
-		}
-	}
-	e = gf_rtsp_send_command(sess->session, com);
-	if (e) {
-		RP_SendFailure(sess, com, e);
-		RP_ProcessResponse(sess, com, e);
-	} else {
-		sess->command_time = gf_sys_clock();
-		sess->flags |= RTSP_WAIT_REPLY;
-	}
-
-exit:
-	/*reset static strings*/
-	com->User_Agent = NULL;
-	com->Accept_Language = NULL;
-	com->Session = NULL;
-	/*remove command*/
-	if (e) {
-		RP_RemoveCommand(sess);
-		gf_rtsp_command_del(com);
-		sess->flags &= ~RTSP_WAIT_REPLY;
-		sess->command_time = 0;
-	}
-}
-
-
-/*locate channel - if requested remove from session*/
-RTPStream *RP_FindChannel(RTPClient *rtp, LPNETCHANNEL ch, u32 ES_ID, char *es_control, Bool remove_stream)
-{
-	u32 i=0;
-	RTPStream *st;
-
-	while ((st = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-		if (ch && (st->channel==ch)) goto found;
-		if (ES_ID && (st->ES_ID==ES_ID)) goto found;
-		if (es_control && st->control) {
-			char *ctrl_start = strstr(es_control, st->control);
-			if (ctrl_start && !strcmp(ctrl_start, st->control)) goto found;
-		}
-	}
-	return NULL;
-
-found:
-	if (remove_stream) gf_list_rem(rtp->channels, i-1);
-	return st;
-}
-
-/*locate session by control*/
-RTSPSession *RP_CheckSession(RTPClient *rtp, char *control)
-{
-	u32 i;
-	RTSPSession *sess;
-	if (!control) return NULL;
-
-	if (!strcmp(control, "*")) control = (char *) gf_service_get_url(rtp->service);
-
-	i=0;
-	while ( (sess = (RTSPSession *)gf_list_enum(rtp->sessions, &i)) ) {
-		if (gf_rtsp_is_my_session(sess->session, control)) return sess;
-	}
-	return NULL;
-}
-
-RTSPSession *RP_NewSession(RTPClient *rtp, char *session_control)
-{
-	char *szCtrl, *szExt;
-	RTSPSession *tmp;
-	GF_RTSPSession *rtsp;
-
-	if (!session_control) return NULL;
-
-	/*little fix: some servers don't understand DESCRIBE URL/trackID=, so remove the trackID...*/
-	szCtrl = gf_strdup(session_control);
-	szExt = szCtrl ? strrchr(szCtrl, '.') : NULL;
-	if (szExt) {
-		szExt = strchr(szExt, '/');
-		if (szExt) {
-			if (!strnicmp(szExt+1, "trackID=", 8) || !strnicmp(szExt+1, "ESID=", 5) || !strnicmp(szExt+1, "ES_ID=", 6)) szExt[0] = 0;
-		}
-	}
-
-	rtsp = gf_rtsp_session_new(szCtrl, rtp->default_port);
-	gf_free(szCtrl);
-
-	if (!rtsp) return NULL;
-
-	GF_SAFEALLOC(tmp, RTSPSession);
-	if (!tmp) return NULL;
-	tmp->owner = rtp;
-	tmp->session = rtsp;
-
-	szCtrl = (char *)gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Network", "MobileIPEnabled");
-	if (szCtrl && !strcmp(szCtrl, "yes")) {
-		char *ip = (char *)gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Network", "MobileIP");
-		gf_rtsp_set_mobile_ip(rtsp, ip);
-	}
-
-	if (rtp->transport_mode) {
-		gf_rtsp_set_buffer_size(rtsp, RTSP_TCP_BUFFER_SIZE);
-	} else {
-		gf_rtsp_set_buffer_size(rtsp, RTSP_BUFFER_SIZE);
-	}
-	tmp->rtsp_commands = gf_list_new();
-	tmp->rtsp_rsp = gf_rtsp_response_new();
-
-	gf_list_add(rtp->sessions, tmp);
-
-	return tmp;
-}
-
-GF_Err RP_AddStream(RTPClient *rtp, RTPStream *stream, char *session_control)
-{
-	Bool has_aggregated_control;
-	char *service_name, *ctrl;
-	RTSPSession *in_session = RP_CheckSession(rtp, session_control);
-
-	has_aggregated_control = GF_FALSE;
-	if (session_control) {
-		//if (!strcmp(session_control, "*")) session_control = NULL;
-		if (session_control) has_aggregated_control = GF_TRUE;
-	}
-
-	/*regular setup in an established session (RTSP DESCRIBE)*/
-	if (in_session) {
-		in_session->flags |= RTSP_AGG_CONTROL;
-		stream->rtsp = in_session;
-		gf_list_add(rtp->channels, stream);
-		return GF_OK;
-	}
-
-	/*setup through SDP with control - assume this is RTSP and try to create a session*/
-	if (stream->control) {
-		/*stream control is relative to main session*/
-		if (strnicmp(stream->control, "rtsp://", 7) && strnicmp(stream->control, "rtspu://", 8) && strnicmp(stream->control, "satip://", 8)) {
-			/*locate session by control - if no control was provided for the session, use default
-			session*/
-			if (!in_session) in_session = RP_CheckSession(rtp, session_control ? session_control : "*");
-			/*none found, try to create one*/
-			if (!in_session) in_session = RP_NewSession(rtp, session_control);
-			/*cannot add an RTSP session for this channel, check if multicast*/
-//			if (!in_session && gf_rtp_is_unicast(stream->rtp_ch) ) return GF_SERVICE_ERROR;
-		}
-		/*stream control is absolute*/
-		else {
-			in_session = RP_CheckSession(rtp, stream->control);
-			if (!in_session) in_session = RP_CheckSession(rtp, session_control);
-			if (!in_session) {
-				if (session_control && strstr(stream->control, session_control))
-					in_session = RP_NewSession(rtp, session_control);
-				else
-					in_session = RP_NewSession(rtp, stream->control);
-				if (!in_session) return GF_SERVICE_ERROR;
-			}
-			/*remove session control part from channel control*/
-			service_name = gf_rtsp_get_service_name(in_session->session);
-			ctrl = strstr(stream->control, service_name);
-			if (ctrl && (strlen(ctrl) != strlen(service_name)) ) {
-				ctrl += strlen(service_name) + 1;
-				service_name = gf_strdup(ctrl);
-				gf_free(stream->control);
-				stream->control = service_name;
-			}
-		}
-	}
-	/*no control specified, assume this is multicast*/
-	else {
-		in_session = NULL;
-	}
-
-	if (in_session) {
-		if (has_aggregated_control)
-			in_session->flags |= RTSP_AGG_CONTROL;
-	} else if (stream->control) {
-		gf_free(stream->control);
-		stream->control = NULL;
-	}
-	stream->rtsp = in_session;
-	gf_list_add(rtp->channels, stream);
-	return GF_OK;
-}
-
-
-void RP_RemoveStream(RTPClient *rtp, RTPStream *ch)
-{
-	u32 i=0;
-	RTPStream *st;
-	gf_mx_p(rtp->mx);
-	while ((st = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-		if (st == ch) {
-			gf_list_rem(rtp->channels, i-1);
-			break;
-		}
-	}
-	gf_mx_v(rtp->mx);
-}
-
-void RP_ResetSession(RTSPSession *sess, GF_Err e)
-{
-	GF_RTSPCommand *com;
-	//u32 first = 1;
-
-	//destroy command list
-	while (gf_list_count(sess->rtsp_commands)) {
-		com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
-		gf_list_rem(sess->rtsp_commands, 0);
-		//this destroys stacks if any
-//		RP_SendFailure(sess, com, first ? e : GF_OK);
-		gf_rtsp_command_del(com);
-		//first = 0;
-	}
-	/*reset session state*/
-	gf_rtsp_session_reset(sess->session, GF_TRUE);
-	sess->flags &= ~RTSP_WAIT_REPLY;
-}
-
-
-void RP_DelSession(RTSPSession *sess)
-{
-	RP_ResetSession(sess, GF_OK);
-	gf_list_del(sess->rtsp_commands);
-	gf_rtsp_response_del(sess->rtsp_rsp);
-	gf_rtsp_session_del(sess->session);
-	if (sess->control) gf_free(sess->control);
-	if (sess->session_id) gf_free(sess->session_id);
-	if (sess->satip_server) gf_free(sess->satip_server);
-	gf_free(sess);
-}
-
-void RP_SendMessage(GF_ClientService *service, 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-0.8.0.tar.gz/modules/rtp_in/rtp_signaling.c Deleted

@@ -1,922 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-#include <gpac/internal/ietf_dev.h>
-
-#ifndef GPAC_DISABLE_STREAMING
-
-#define GPAC_SATIP_PORT 1400
-
-Bool channel_is_valid(RTPClient *rtp, RTPStream *ch)
-{
-	u32 i=0;
-	RTPStream *st;
-	while ((st = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-		if (st == ch) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-void RP_StopChannel(RTPStream *ch)
-{
-	if (!ch || !ch->rtsp) return;
-
-	ch->flags &= ~RTP_SKIP_NEXT_COM;
-	//ch->status = RTP_Disconnected;
-	//remove interleaved
-	if (gf_rtp_is_interleaved(ch->rtp_ch)) {
-		gf_rtsp_unregister_interleave(ch->rtsp->session, gf_rtp_get_low_interleave_id(ch->rtp_ch));
-	}
-}
-
-/*this prevent sending teardown on session with running channels*/
-Bool RP_SessionActive(RTPStream *ch)
-{
-	RTPStream *ach;
-	u32 i, count;
-	i = count = 0;
-	while ((ach = (RTPStream *)gf_list_enum(ch->owner->channels, &i))) {
-		if (ach->rtsp != ch->rtsp) continue;
-		/*count only active channels*/
-		if (ach->status == RTP_Running) count++;
-	}
-	return count ? GF_TRUE : GF_FALSE;
-}
-
-static void RP_QueueCommand(RTSPSession *sess, RTPStream *ch, GF_RTSPCommand *com, Bool needs_sess_id)
-{
-	if (needs_sess_id) {
-		com->Session = sess->session_id;
-	}
-	if (gf_mx_try_lock(sess->owner->mx)) {
-		gf_list_add(sess->rtsp_commands, com);
-		gf_mx_v(sess->owner->mx);
-	} else {
-		gf_list_add(sess->rtsp_commands, com);
-	}
-}
-
-
-
-/*
- 						channel setup functions
-																*/
-
-void RP_Setup(RTPStream *ch)
-{
-	u16 def_first_port;
-	const char *opt;
-	GF_RTSPCommand *com;
-	GF_RTSPTransport *trans;
-
-	com = gf_rtsp_command_new();
-	com->method = gf_strdup(GF_RTSP_SETUP);
-
-	def_first_port = 0;
-	opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceFirstPort");
-	if (opt) def_first_port = atoi(opt);
-
-	opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
-
-	//setup ports if unicast non interleaved or multicast
-	if (gf_rtp_is_unicast(ch->rtp_ch) && (ch->owner->transport_mode != 1) && !gf_rtp_is_interleaved(ch->rtp_ch) ) {
-		gf_rtp_set_ports(ch->rtp_ch, def_first_port);
-	} else if (opt) {
-		gf_rtp_set_ports(ch->rtp_ch, def_first_port);
-	}
-
-	trans = gf_rtsp_transport_clone(gf_rtp_get_transport(ch->rtp_ch));
-
-	/*some servers get confused when trying to resetup on the same remote ports, so reset info*/
-	trans->port_first = trans->port_last = 0;
-	trans->SSRC = 0;
-
-	/*override transport: */
-	/*1: multicast forced*/
-	opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastIP");
-	if (opt) {
-		trans->IsUnicast = GF_FALSE;
-		trans->destination = gf_strdup(opt);
-		opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceMulticastTTL");
-		trans->TTL = opt ? atoi(opt) : 127;
-		if (trans->Profile) gf_free(trans->Profile);
-		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP);
-		if (!(ch->rtsp->flags & RTSP_DSS_SERVER) ) {
-			trans->port_first = trans->client_port_first;
-			trans->port_last = trans->client_port_last;
-			/*this is correct but doesn't work with DSS: the server expects "client_port" to indicate
-			the multicast port, not "port" - this will send both*/
-			//trans->client_port_first = trans->client_port_last = 0;
-		}
-		gf_rtp_setup_transport(ch->rtp_ch, trans, NULL);
-	}
-	/*2: RTP over RTSP forced*/
-	else if (ch->rtsp->flags & RTSP_FORCE_INTER) {
-		if (trans->Profile) gf_free(trans->Profile);
-		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP_TCP);
-		//some servers expect the interleaved to be set during the setup request
-		trans->IsInterleaved = GF_TRUE;
-		trans->rtpID = gf_list_find(ch->owner->channels, ch);
-		trans->rtcpID = trans->rtpID+1;
-		gf_rtp_setup_transport(ch->rtp_ch, trans, NULL);
-	}
-
-	if (trans->source) {
-		gf_free(trans->source);
-		trans->source = NULL;
-	}
-
-	/*turn off interleaving in case of re-setup, some servers don't like it (we still signal it
-	through RTP/AVP/TCP profile so it's OK)*/
-//	trans->IsInterleaved = 0;
-	gf_list_add(com->Transports, trans);
-	if (strlen(ch->control)) com->ControlString = gf_strdup(ch->control);
-
-	com->user_data = ch;
-	ch->status = RTP_WaitingForAck;
-
-	RP_QueueCommand(ch->rtsp, ch, com, GF_TRUE);
-}
-
-/*filter setup if no session (rtp only)*/
-GF_Err RP_SetupChannel(RTPStream *ch, ChannelDescribe *ch_desc)
-{
-	GF_Err resp;
-
-	/*assign ES_ID of the channel*/
-	if (ch_desc && !ch->ES_ID && ch_desc->ES_ID) ch->ES_ID = ch_desc->ES_ID;
-
-	ch->status = RTP_Setup;
-
-	/*assign channel handle if not done*/
-	if (ch_desc && ch->channel) {
-		assert(ch->channel == ch_desc->channel);
-	} else if (!ch->channel && ch->rtsp && !ch->rtsp->satip) {
-		assert(ch_desc);
-		assert(ch_desc->channel);
-		ch->channel = ch_desc->channel;
-	}
-
-	/*no session , setup for pure rtp*/
-	if (!ch->rtsp) {
-		ch->flags |= RTP_CONNECTED;
-		/*init rtp*/
-		resp = RP_InitStream(ch, GF_FALSE);
-		/*send confirmation to user*/
-		RP_ConfirmChannelConnect(ch, resp);
-	} else {
-		RP_Setup(ch);
-	}
-	return GF_OK;
-}
-
-void RP_ProcessSetup(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	RTPStream *ch;
-	u32 i;
-	GF_RTSPTransport *trans;
-
-	ch = (RTPStream *)com->user_data;
-	if (e) goto exit;
-
-	switch (sess->rtsp_rsp->ResponseCode) {
-	case NC_RTSP_OK:
-		break;
-	case NC_RTSP_Not_Found:
-		e = GF_STREAM_NOT_FOUND;
-		goto exit;
-	default:
-		e = GF_SERVICE_ERROR;
-		goto exit;
-	}
-	e = GF_SERVICE_ERROR;
-	if (!ch) goto exit;
-
-	/*assign session ID*/
-	if (!sess->rtsp_rsp->Session) {
-		e = GF_SERVICE_ERROR;
-		goto exit;
-	}
-	if (!sess->session_id) sess->session_id = gf_strdup(sess->rtsp_rsp->Session);
-	assert(!ch->session_id);
-
-	/*transport setup: break at the first correct transport */
-	i=0;
-	while ((trans = (GF_RTSPTransport *)gf_list_enum(sess->rtsp_rsp->Transports, &i))) {
-		/*copy over previous ports (hack for some servers overriding client ports)*/
-		const char *opt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ForceClientPorts");
-		if (opt && !stricmp(opt, "yes"))
-			gf_rtp_get_ports(ch->rtp_ch, &trans->client_port_first, &trans->client_port_last);
-
-		if (gf_rtp_is_interleaved(ch->rtp_ch) && !trans->IsInterleaved) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Requested interleaved RTP over RTSP but server did not setup interleave - cannot process command\n"));
-			e = GF_REMOTE_SERVICE_ERROR;
-			continue;
-		}
-
-		e = gf_rtp_setup_transport(ch->rtp_ch, trans, gf_rtsp_get_server_name(sess->session));
-		if (!e) break;
-	}
-	if (e) goto exit;
-
-	e = RP_InitStream(ch, GF_FALSE);
-	if (e) goto exit;
-	ch->status = RTP_Connected;
-
-	//in case this is TCP channel, setup callbacks
-	ch->flags &= ~RTP_INTERLEAVED;
-	if (gf_rtp_is_interleaved(ch->rtp_ch)) {
-		ch->flags |= RTP_INTERLEAVED;
-		gf_rtsp_set_interleave_callback(sess->session, RP_DataOnTCP);
-	}
-
-	if (sess->satip) {
-		ChannelControl *ch_ctrl = NULL;
-		GF_RTSPCommand *com = gf_rtsp_command_new();
-		com->method = gf_strdup(GF_RTSP_PLAY);
-		GF_SAFEALLOC(ch_ctrl, ChannelControl);
-		ch_ctrl->ch = ch;
-		com->user_data = ch_ctrl;
-		RP_QueueCommand(sess, ch, com, GF_TRUE);
-	}
-
-exit:
-	/*confirm only on first connect, otherwise this is a re-SETUP of the rtsp session, not the channel*/
-	if (ch && ! (ch->flags & RTP_CONNECTED) ) {
-		if (!e)
-			ch->flags |= RTP_CONNECTED;
-		RP_ConfirmChannelConnect(ch, e);
-	}
-	com->user_data = NULL;
-}
-
-
-/*
- 						session/channel describe functions
-																*/
-/*filter describe commands in case of ESD URLs*/
-Bool RP_PreprocessDescribe(RTSPSession *sess, GF_RTSPCommand *com)
-{
-	RTPStream *ch;
-	ChannelDescribe *ch_desc;
-	/*not a channel describe*/
-	if (!com->user_data) {
-		RP_SendMessage(sess->owner->service, GF_OK, "Connecting...");
-		return GF_TRUE;
-	}
-
-	ch_desc = (ChannelDescribe *)com->user_data;
-	ch = RP_FindChannel(sess->owner, NULL, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
-	if (!ch) return GF_TRUE;
-
-	/*channel has been described already, skip describe and send setup directly*/
-	RP_SetupChannel(ch, ch_desc);
-
-	if (ch_desc->esd_url) gf_free(ch_desc->esd_url);
-	gf_free(ch_desc);
-	return GF_FALSE;
-}
-
-/*process describe reply*/
-GF_Err RP_ProcessDescribe(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	RTPStream *ch;
-	ChannelDescribe *ch_desc;
-
-	ch = NULL;
-	ch_desc = (ChannelDescribe *)com->user_data;
-	if (e) goto exit;
-
-	switch (sess->rtsp_rsp->ResponseCode) {
-	//TODO handle all 3xx codes  (redirections)
-	case NC_RTSP_Multiple_Choice:
-		e = ch_desc ? GF_STREAM_NOT_FOUND : GF_URL_ERROR;
-		goto exit;
-	case NC_RTSP_Not_Found:
-		e = GF_URL_ERROR;
-		goto exit;
-	case NC_RTSP_OK:
-		break;
-	default:
-		//we should have a basic error code mapping here
-		e = GF_SERVICE_ERROR;
-		goto exit;
-	}
-
-	ch = NULL;
-	if (ch_desc) {
-		ch = RP_FindChannel(sess->owner, ch_desc->channel, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
-	} else {
-		RP_SendMessage(sess->owner->service, GF_OK, "Connected");
-	}
-
-	/*error on loading SDP is done internally*/
-	RP_LoadSDP(sess->owner, sess->rtsp_rsp->body, sess->rtsp_rsp->Content_Length, ch);
-
-	if (!ch_desc) goto exit;
-	if (!ch) {
-		e = GF_STREAM_NOT_FOUND;
-		goto exit;
-	}
-	e = RP_SetupChannel(ch, ch_desc);
-
-exit:
-	com->user_data = NULL;
-	if (e) {
-		if (!ch_desc) {
-			sess->connect_error = e;
-			return e;
-		} else if (ch) {
-			RP_ConfirmChannelConnect(ch, e);
-		} else {
-			gf_service_connect_ack(sess->owner->service, ch_desc->channel, e);
-		}
-	}
-	if (ch_desc) gf_free(ch_desc);
-	return GF_OK;
-}
-
-/*send describe*/
-void RP_Describe(RTSPSession *sess, char *esd_url, LPNETCHANNEL channel)
-{
-	const char *opt;
-	RTPStream *ch;
-	ChannelDescribe *ch_desc;
-	GF_RTSPCommand *com;
-
-	/*locate the channel by URL - if we have one, this means the channel is already described
-	this happens when 2 ESD with URL use the same RTSP service - skip describe and send setup*/
-	if (esd_url || channel) {
-		ch = RP_FindChannel(sess->owner, channel, 0, esd_url, GF_FALSE);
-		if (ch) {
-			if (!ch->channel) ch->channel = channel;
-			switch (ch->status) {
-			case RTP_Connected:
-			case RTP_Running:
-				RP_ConfirmChannelConnect(ch, GF_OK);
-				return;
-			default:
-				break;
-			}
-			ch_desc = (ChannelDescribe *)gf_malloc(sizeof(ChannelDescribe));
-			ch_desc->esd_url = esd_url ? gf_strdup(esd_url) : NULL;
-			ch_desc->channel = channel;
-			RP_SetupChannel(ch, ch_desc);
-
-			if (esd_url) gf_free(ch_desc->esd_url);
-			gf_free(ch_desc);
-			return;
-		}
-		/*channel not found, send describe on service*/
-	}
-
-	/*send describe*/
-	com = gf_rtsp_command_new();
-	if (!sess->satip) {
-		com->method = gf_strdup(GF_RTSP_DESCRIBE);
-	} else {
-		GF_Err e;
-		GF_RTSPTransport *trans;
-		RTPStream *ch = NULL;
-
-		com->method = gf_strdup(GF_RTSP_SETUP);
-
-		/*setup transport ports*/
-		GF_SAFEALLOC(trans, GF_RTSPTransport);
-		trans->IsUnicast = GF_TRUE;
-		trans->client_port_first = GPAC_SATIP_PORT;
-		trans->client_port_last = GPAC_SATIP_PORT+1;
-		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP);
-		gf_list_add(com->Transports, trans);
-
-		/*hardcoded channel*/
-		ch = RP_NewSatipStream(sess->owner, sess->satip_server);
-		if (!ch) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("SAT>IP: couldn't create the RTP stream.\n"));
-			return;
-		}
-		e = RP_AddStream(sess->owner, ch, "*");
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("SAT>IP: couldn't add the RTP stream.\n"));
-			return;
-		}
-		com->user_data = ch;
-	}
-
-	if (channel || esd_url) {
-		com->Accept = gf_strdup("application/sdp");
-		com->ControlString = esd_url ? gf_strdup(esd_url) : NULL;
-
-		ch_desc = (ChannelDescribe *)gf_malloc(sizeof(ChannelDescribe));
-		ch_desc->esd_url = esd_url ? gf_strdup(esd_url) : NULL;
-		ch_desc->channel = channel;
-
-		com->user_data = ch_desc;
-	} else {
-		//always accept both SDP and IOD
-		com->Accept = gf_strdup("application/sdp, application/mpeg4-iod");
-//		com->Accept = gf_strdup("application/sdp");
-	}
-
-	/*need better tuning ...*/
-	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(sess->owner->service), "Network", "Bandwidth");
-	if (opt && !stricmp(opt, "yes")) com->Bandwidth = atoi(opt);
-
-	RP_QueueCommand(sess, NULL, com, GF_FALSE);
-}
-
-
-static void SkipCommandOnSession(RTPStream *ch)
-{
-	u32 i;
-	RTPStream *a_ch;
-	if (!ch || (ch->flags & RTP_SKIP_NEXT_COM) || !(ch->rtsp->flags & RTSP_AGG_CONTROL) ) return;
-	i=0;
-	while ((a_ch = (RTPStream *)gf_list_enum(ch->owner->channels, &i))) {
-		if ((ch == a_ch) || (a_ch->rtsp != ch->rtsp) ) continue;
-		if (a_ch->status>=RTP_Connected)
-			a_ch->flags |= RTP_SKIP_NEXT_COM;
-	}
-}
-
-
-/*
- 						channel control functions
-																*/
-/*remove command if session is using aggregated control*/
-Bool RP_PreprocessUserCom(RTSPSession *sess, GF_RTSPCommand *com)
-{
-	ChannelControl *ch_ctrl;
-	RTPStream *ch;
-	GF_Err e;
-	Bool skip_it;
-
-	ch_ctrl = NULL;
-	if (strcmp(com->method, GF_RTSP_TEARDOWN)) ch_ctrl = (ChannelControl *)com->user_data;
-	if (!ch_ctrl || !ch_ctrl->ch) return GF_TRUE;
-	ch = ch_ctrl->ch;
-
-	if (!sess->satip) {
-		if (!ch->channel || !channel_is_valid(sess->owner, ch)) {
-			gf_free(ch_ctrl);
-			com->user_data = NULL;
-			return GF_FALSE;
-		}
-
-		assert(ch->rtsp == sess);
-		assert(ch->channel == ch_ctrl->com.base.on_channel);
-	}
-
-	skip_it = GF_FALSE;
-	if (!com->Session) {
-		/*re-SETUP failed*/
-		if (!strcmp(com->method, GF_RTSP_PLAY) || !strcmp(com->method, GF_RTSP_PAUSE)) {
-			e = GF_SERVICE_ERROR;
-			goto err_exit;
-		}
-		/*this is a stop, no need for SessionID just skip*/
-		skip_it = GF_TRUE;
-	} else {
-		SkipCommandOnSession(ch);
-	}
-
-	/*check if aggregation discards this command*/
-	if (skip_it || ( (sess->flags & RTSP_AGG_CONTROL) && (ch->flags & RTP_SKIP_NEXT_COM) )) {
-		ch->flags &= ~RTP_SKIP_NEXT_COM;
-		gf_service_command(sess->owner->service, &ch_ctrl->com, GF_OK);
-		gf_free(ch_ctrl);
-		com->user_data = NULL;
-		return GF_FALSE;
-	}
-	return GF_TRUE;
-
-err_exit:
-	gf_rtsp_reset_aggregation(ch->rtsp->session);
-	ch->status = RTP_Disconnected;
-	ch->check_rtp_time = RTP_SET_TIME_NONE;
-	gf_service_command(sess->owner->service, &ch_ctrl->com, e);
-	gf_free(ch_ctrl);
-	com->user_data = NULL;
-	return GF_FALSE;
-}
-
-void RP_ProcessUserCommand(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	ChannelControl *ch_ctrl;
-	RTPStream *ch, *agg_ch;
-	u32 i, count;
-	GF_RTPInfo *info;
-
-	ch_ctrl = (ChannelControl *)com->user_data;
-	ch = ch_ctrl->ch;
-
-	if (sess->satip) {
-		if (!strcmp(com->method, GF_RTSP_PLAY)) {
-			char url[64];
-			snprintf(url, 64, "mpegts-sk://%p", ch->rtp_ch->rtp);
-			e = ch->satip_m2ts_ifce->ConnectService(ch->satip_m2ts_ifce, sess->owner->service, url);
-			if (e) {
-				assert(0);
-				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[SATIP] Couldn't connect the M2TS service.\n"));
-				return;
-			} else {
-				ch->satip_m2ts_service_connected = GF_TRUE;
-			}
-		} else if (!strcmp(com->method, GF_RTSP_PLAY)) {
-			if (ch->satip_m2ts_service_connected) {
-				ch->satip_m2ts_ifce->CloseService(ch->satip_m2ts_ifce);
-				ch->satip_m2ts_service_connected = GF_FALSE;
-			}
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[SATIP] Unhandled RTSP command: %s\n", com->method));
-			return;
-		}
-		return;
-	}
-
-	if (ch) {
-		if (!ch->channel || !channel_is_valid(sess->owner, ch)) {
-			gf_free(ch_ctrl);
-			com->user_data = NULL;
-			return;
-		}
-
-		assert(ch->channel==ch_ctrl->com.base.on_channel);
-	}
-
-	/*some consistency checking: on interleaved sessions, some servers do NOT reply to the
-	teardown. If our command is STOP just skip the error notif*/
-	if (e) {
-		if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
-			goto process_reply;
-		} else {
-			/*spec is not really clear about what happens if the server doesn't support
-			non aggregated operations. Since this happen only on pause/play, we consider
-			that no error occured and wait for next play*/
-			if (sess->rtsp_rsp->ResponseCode == NC_RTSP_Only_Aggregate_Operation_Allowed) {
-				sess->flags |= RTSP_AGG_ONLY;
-				sess->rtsp_rsp->ResponseCode = NC_RTSP_OK;
-			} else {
-				goto err_exit;
-			}
-		}
-	}
-
-	switch (sess->rtsp_rsp->ResponseCode) {
-	//handle all 3xx codes  (redirections)
-	case NC_RTSP_Method_Not_Allowed:
-		e = GF_NOT_SUPPORTED;
-		goto err_exit;
-	case NC_RTSP_OK:
-		break;
-	default:
-		//we should have a basic error code mapping here
-		e = GF_SERVICE_ERROR;
-		goto err_exit;
-	}
-
-process_reply:
-
-	gf_service_command(sess->owner->service, &ch_ctrl->com, GF_OK);
-
-	if ( (ch_ctrl->com.command_type==GF_NET_CHAN_PLAY)
-	        || (ch_ctrl->com.command_type==GF_NET_CHAN_SET_SPEED)
-	        || (ch_ctrl->com.command_type==GF_NET_CHAN_RESUME) ) {
-
-		//auto-detect any aggregated control if not done yet
-		if (gf_list_count(sess->rtsp_rsp->RTP_Infos) > 1) {
-			sess->flags |= RTSP_AGG_CONTROL;
-		}
-
-		//process all RTP infos
-		count = gf_list_count(sess->rtsp_rsp->RTP_Infos);
-		for (i=0; i<count; i++) {
-			info = (GF_RTPInfo*)gf_list_get(sess->rtsp_rsp->RTP_Infos, i);
-			agg_ch = RP_FindChannel(sess->owner, NULL, 0, info->url, GF_FALSE);
-
-			if (!agg_ch || (agg_ch->rtsp != sess) ) continue;
-			/*channel is already playing*/
-			if (agg_ch->status == RTP_Running) {
-				gf_rtp_set_info_rtp(agg_ch->rtp_ch, info->seq, info->rtp_time, info->ssrc);
-				agg_ch->check_rtp_time = RTP_SET_TIME_RTP;
-				continue;
-			}
-
-			/*if play/seeking we must send update RTP/NPT link*/
-			if (ch_ctrl->com.command_type != GF_NET_CHAN_RESUME) {
-				agg_ch->check_rtp_time = RTP_SET_TIME_RTP;
-			}
-			/*this is used to discard RTP packets re-sent on resume*/
-			else {
-				agg_ch->check_rtp_time = RTP_SET_TIME_RTP_SEEK;
-			}
-			/* reset the buffers */
-			RP_InitStream(agg_ch, GF_TRUE);
-
-			gf_rtp_set_info_rtp(agg_ch->rtp_ch, info->seq, info->rtp_time, info->ssrc);
-			agg_ch->status = RTP_Running;
-
-			/*skip next play command on this channel if aggregated control*/
-			if ((ch != agg_ch) && ch && (ch->rtsp->flags & RTSP_AGG_CONTROL) ) agg_ch->flags |= RTP_SKIP_NEXT_COM;
-
-
-			if (gf_rtp_is_interleaved(agg_ch->rtp_ch)) {
-				gf_rtsp_register_interleave(sess->session,
-				                            agg_ch,
-				                            gf_rtp_get_low_interleave_id(agg_ch->rtp_ch),
-				                            gf_rtp_get_hight_interleave_id(agg_ch->rtp_ch));
-			}
-		}
-		/*no rtp info (just in case), no time mapped - set to 0 and specify we're not interactive*/
-		if (ch && !i) {
-			ch->current_start = 0.0;
-			ch->check_rtp_time = RTP_SET_TIME_RTP;
-			RP_InitStream(ch, GF_TRUE);
-			ch->status = RTP_Running;
-			if (gf_rtp_is_interleaved(ch->rtp_ch)) {
-				gf_rtsp_register_interleave(sess->session,
-				                            ch, gf_rtp_get_low_interleave_id(ch->rtp_ch), gf_rtp_get_hight_interleave_id(ch->rtp_ch));
-			}
-		}
-		if (ch) ch->flags &= ~RTP_SKIP_NEXT_COM;
-	} else if (ch_ctrl->com.command_type == GF_NET_CHAN_PAUSE) {
-		if (ch) {
-			SkipCommandOnSession(ch);
-			ch->flags &= ~RTP_SKIP_NEXT_COM;
-
-		}
-	} else if (ch_ctrl->com.command_type == GF_NET_CHAN_STOP) {
-	}
-	gf_free(ch_ctrl);
-	com->user_data = NULL;
-	return;
-
-
-err_exit:
-	gf_service_command(sess->owner->service, &ch_ctrl->com, e);
-	if (ch) {
-		ch->status = RTP_Disconnected;
-		gf_rtsp_reset_aggregation(ch->rtsp->session);
-		ch->check_rtp_time = RTP_SET_TIME_NONE;
-	}
-	gf_free(ch_ctrl);
-	com->user_data = NULL;
-}
-
-#if 0
-static void RP_FlushAndTearDown(RTSPSession *sess)
-{
-	GF_RTSPCommand *com;
-	gf_mx_p(sess->owner->mx);
-
-	while (gf_list_count(sess->rtsp_commands)) {
-		com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
-		gf_list_rem(sess->rtsp_commands, 0);
-		gf_rtsp_command_del(com);
-	}
-	if (sess->flags & RTSP_WAIT_REPLY) {
-		GF_Err e;
-		while (1) {
-			e = gf_rtsp_get_response(sess->session, sess->rtsp_rsp);
-			if (e!= GF_IP_NETWORK_EMPTY) break;
-		}
-		sess->flags &= ~RTSP_WAIT_REPLY;
-	}
-	gf_mx_v(sess->owner->mx);
-
-
-	/*no private stack on teardown - shutdown now*/
-	com	= gf_rtsp_command_new();
-	com->method = gf_strdup(GF_RTSP_TEARDOWN);
-	RP_QueueCommand(sess, NULL, com, 1);
-}
-#endif
-
-
-void RP_UserCommand(RTSPSession *sess, RTPStream *ch, GF_NetworkCommand *command)
-{
-	RTPStream *a_ch;
-	ChannelControl *ch_ctrl;
-	u32 i;
-	Bool needs_setup = GF_FALSE;
-	GF_RTSPCommand *com;
-	GF_RTSPRange *range;
-
-	switch (command->command_type) {
-	case GF_NET_CHAN_PLAY:
-	case GF_NET_CHAN_RESUME:
-		needs_setup = GF_TRUE;
-		break;
-	case GF_NET_CHAN_PAUSE:
-	case GF_NET_CHAN_STOP:
-		break;
-	default:
-		gf_service_command(sess->owner->service, command, GF_NOT_SUPPORTED);
-		return;
-	}
-
-
-	/*we may need to re-setup stream/session*/
-	if (needs_setup) {
-		if (ch->status == RTP_Disconnected) {
-			if (sess->flags & RTSP_AGG_CONTROL) {
-				i=0;
-				while ((a_ch = (RTPStream *)gf_list_enum(sess->owner->channels, &i))) {
-					if (a_ch->rtsp != sess) continue;
-					if (a_ch->status == RTP_Disconnected)
-						RP_Setup(a_ch);
-				}
-			} else {
-				RP_Setup(ch);
-			}
-		}
-	}
-
-	com	= gf_rtsp_command_new();
-	range = NULL;
-
-	if ( (command->command_type==GF_NET_CHAN_PLAY) || (command->command_type==GF_NET_CHAN_RESUME) ) {
-
-		range = gf_rtsp_range_new();
-		range->start = ch->range_start;
-		range->end = ch->range_end;
-
-		com->method = gf_strdup(GF_RTSP_PLAY);
-
-		ch->paused = GF_FALSE;
-
-		/*specify pause range on resume - this is not mandatory but most servers need it*/
-		if (command->command_type==GF_NET_CHAN_RESUME) {
-			range->start = ch->current_start;
-
-			ch->stat_start_time -= ch->stat_stop_time;
-			ch->stat_start_time += gf_sys_clock();
-			ch->stat_stop_time = 0;
-		} else {
-			range->start = ch->range_start;
-			if (command->play.start_range>=0) range->start += command->play.start_range;
-			range->end = ch->range_start;
-			if (command->play.end_range >=0) {
-				range->end += command->play.end_range;
-				if (range->end > ch->range_end) range->end = ch->range_end;
-			}
-
-			ch->stat_start_time = gf_sys_clock();
-			ch->stat_stop_time = 0;
-		}
-		/*if aggregated the command is sent once, so store info at session level*/
-		if (ch->flags & RTP_SKIP_NEXT_COM) {
-			ch->current_start = ch->rtsp->last_range;
-		} else {
-			ch->rtsp->last_range = range->start;
-			ch->current_start = range->start;
-		}
-		/*some RTSP servers don't accept Range=npt:0.0- (for ex, broadcast only...), so skip it if:
-		- a range was given in initial describe
-		- the command is not a RESUME
-		*/
-		if (!(ch->flags & RTP_HAS_RANGE) && (command->command_type != GF_NET_CHAN_RESUME) ) {
-			gf_rtsp_range_del(range);
-			com->Range = NULL;
-		} else {
-			com->Range = range;
-		}
-
-		if (sess->flags & RTSP_AGG_CONTROL)
-			SkipCommandOnSession(ch);
-		else if (strlen(ch->control))
-			com->ControlString = gf_strdup(ch->control);
-
-		if (RP_SessionActive(ch)) {
-			if (!com->ControlString && ch->control) com->ControlString = gf_strdup(ch->control);
-		} else {
-			if (com->ControlString) {
-				gf_free(com->ControlString);
-				com->ControlString=NULL;
-			}
-		}
-
-	} else if (command->command_type==GF_NET_CHAN_PAUSE) {
-		com->method = gf_strdup(GF_RTSP_PAUSE);
-		if (ch) {
-			range = gf_rtsp_range_new();
-			/*update current time*/
-			ch->current_start += gf_rtp_get_current_time(ch->rtp_ch);
-			ch->stat_stop_time = gf_sys_clock();
-			range->start = ch->current_start;
-			range->end = -1.0;
-			com->Range = range;
-
-			if (sess->flags & RTSP_AGG_CONTROL)
-				SkipCommandOnSession(ch);
-			else if (strlen(ch->control))
-				com->ControlString = gf_strdup(ch->control);
-
-			ch->paused = GF_TRUE;
-		}
-	}
-	else if (command->command_type==GF_NET_CHAN_STOP) {
-		ch->current_start = 0;
-		ch->stat_stop_time = gf_sys_clock();
-
-		ch->status = RTP_Connected;
-		RP_InitStream(ch, GF_TRUE);
-
-		/*if server only support aggregation on pause, skip the command or issue
-		a teardown if last active stream*/
-		if (ch->rtsp->flags & RTSP_AGG_ONLY) {
-			RP_StopChannel(ch);
-			if (com) gf_rtsp_command_del(com);
-			if (!RP_SessionActive(ch))
-				RP_Teardown(sess, ch);
-			return;
-		}
-		/* otherwise send a PAUSE on the stream */
-		else {
-			if (ch->paused) {
-				if (com) gf_rtsp_command_del(com);
-				return;
-			}
-			range = gf_rtsp_range_new();
-			range->start = 0;
-			range->end = -1;
-			com->method = gf_strdup(GF_RTSP_PAUSE);
-			com->Range = range;
-			/*only pause the specified stream*/
-			if (ch->control) com->ControlString = gf_strdup(ch->control);
-		}
-	} else {
-		gf_service_command(sess->owner->service, command, GF_NOT_SUPPORTED);
-		gf_rtsp_command_del(com);
-		return;
-	}
-
-	ch_ctrl = (ChannelControl *)gf_malloc(sizeof(ChannelControl));
-	ch_ctrl->ch = ch;
-	memcpy(&ch_ctrl->com, command, sizeof(GF_NetworkCommand));
-	com->user_data = ch_ctrl;
-
-	RP_QueueCommand(sess, ch, com, GF_TRUE);
-	return;
-}
-
-
-/*
- 						session/channel teardown functions
-																*/
-void RP_ProcessTeardown(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
-{
-	RTPStream *ch = (RTPStream *)com->user_data;
-	if (ch) {
-		if (ch->session_id) gf_free(ch->session_id);
-		ch->session_id = NULL;
-	} else {
-		if (sess->session_id) gf_free(sess->session_id);
-		sess->session_id = NULL;
-	}
-}
-
-void RP_Teardown(RTSPSession *sess, RTPStream *ch)
-{
-	GF_RTSPCommand *com;
-	if (sess->owner->session_migration) return;
-	/*we need a session id*/
-	if (!sess->session_id) return;
-	/*ignore teardown on channels*/
-	if ((sess->flags & RTSP_AGG_CONTROL) && ch) return;
-
-	com = gf_rtsp_command_new();
-	com->method = gf_strdup(GF_RTSP_TEARDOWN);
-	/*this only works in RTSP2*/
-	if (ch && ch->control) {
-		com->ControlString = gf_strdup(ch->control);
-		com->user_data = ch;
-	}
-
-	RP_QueueCommand(sess, ch, com, GF_TRUE);
-}
-
-#endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/modules/rtp_in/rtp_stream.c Deleted

@@ -1,643 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-#include <gpac/internal/ietf_dev.h>
-#include <gpac/internal/terminal_dev.h> //for SAT>IP: we need to instantiate the M2TS demuxer
-
-#ifndef GPAC_DISABLE_STREAMING
-
-void RP_ConfirmChannelConnect(RTPStream *ch, GF_Err e)
-{
-	GF_NetworkCommand com;
-
-	/*in case the channel has been disconnected while SETUP was issued&processed. We also could
-	clean up the command stack*/
-	if (!ch->channel) return;
-
-	gf_service_connect_ack(ch->owner->service, ch->channel, e);
-	if (e != GF_OK || !ch->rtp_ch) return;
-
-	/*success, overwrite SL config*/
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type =	GF_NET_CHAN_RECONFIG;
-	com.base.on_channel = ch->channel;
-
-	gf_rtp_depacketizer_get_slconfig(ch->depacketizer, &com.cfg.sl_config);
-	/*reconfig*/
-	gf_service_command(ch->owner->service, &com, GF_OK);
-
-	/*ISMACryp config*/
-	if (ch->depacketizer->flags & GF_RTP_HAS_ISMACRYP) {
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.on_channel = ch->channel;
-		com.command_type = GF_NET_CHAN_DRM_CFG;
-		com.drm_cfg.scheme_type = ch->depacketizer->isma_scheme;
-		com.drm_cfg.scheme_version = 1;
-		/*not transported in SDP!!!*/
-		com.drm_cfg.scheme_uri = NULL;
-		com.drm_cfg.kms_uri = ch->depacketizer->key;
-		gf_service_command(ch->owner->service, &com, GF_OK);
-	}
-}
-
-GF_Err RP_InitStream(RTPStream *ch, Bool ResetOnly)
-{
-	gf_rtp_depacketizer_reset(ch->depacketizer, !ResetOnly);
-
-	if (!ResetOnly) {
-		const char *ip_ifce = NULL;
-		u32 reorder_size = 0;
-		if (!ch->owner->transport_mode) {
-			const char *sOpt = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Streaming", "ReorderSize");
-			if (sOpt) reorder_size = atoi(sOpt);
-			else reorder_size = 10;
-
-			ip_ifce = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Network", "DefaultMCastInterface");
-			if (!ip_ifce) {
-				const char *mob_on = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Network", "MobileIPEnabled");
-				if (mob_on && !strcmp(mob_on, "yes")) {
-					ip_ifce = gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(ch->owner->service), "Network", "MobileIP");
-					ch->flags |= RTP_MOBILEIP;
-				}
-
-			}
-		}
-		return gf_rtp_initialize(ch->rtp_ch, RTP_BUFFER_SIZE, GF_FALSE, 0, reorder_size, 200, (char *)ip_ifce);
-	}
-	//just reset the sockets
-	gf_rtp_reset_buffers(ch->rtp_ch);
-	return GF_OK;
-}
-
-void RP_DeleteStream(RTPStream *ch)
-{
-	if (ch->rtsp) {
-		if (ch->status == RTP_Running) {
-			RP_Teardown(ch->rtsp, ch);
-			ch->status = RTP_Disconnected;
-		}
-		RP_RemoveStream(ch->owner, ch);
-	} else {
-		RP_FindChannel(ch->owner, ch->channel, 0, NULL, GF_TRUE);
-	}
-
-	if (ch->depacketizer) gf_rtp_depacketizer_del(ch->depacketizer);
-	if (ch->rtp_ch) gf_rtp_del(ch->rtp_ch);
-	if (ch->control) gf_free(ch->control);
-	if (ch->session_id) gf_free(ch->session_id);
-	if (ch->satip_m2ts_ifce) {
-		if (ch->satip_m2ts_service_connected) {
-			ch->satip_m2ts_ifce->CloseService(ch->satip_m2ts_ifce);
-		}
-		gf_modules_close_interface((GF_BaseInterface *)ch->satip_m2ts_ifce);
-	}
-	gf_free(ch);
-}
-
-
-static void rtp_sl_packet_cbk(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
-{
-	u64 cts, dts;
-	RTPStream *ch = (RTPStream *)udta;
-
-	if (!ch->rtcp_init) {
-		if (!ch->rtcp_check_start) {
-			ch->rtcp_check_start = gf_sys_clock();
-			return;
-		}
-		else if (gf_sys_clock() - ch->rtcp_check_start <= RTCP_DEFAULT_TIMEOUT_MS) {
-			return;
-		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Timeout for RTCP: no SR recevied after %d ms - forcing playback, sync may be broken\n", RTCP_DEFAULT_TIMEOUT_MS));
-		ch->rtcp_init = GF_TRUE;
-	}
-
-	cts = hdr->compositionTimeStamp;
-	dts = hdr->decodingTimeStamp;
-
-	if (hdr->compositionTimeStamp < ch->ts_offset) {
-		hdr->compositionTimeStamp = hdr->decodingTimeStamp = 0;
-		hdr->seekFlag = 1;
-	} else {
-		hdr->seekFlag = 0;
-		hdr->compositionTimeStamp -= ch->ts_offset;
-
-		if (hdr->decodingTimeStamp) {
-			hdr->decodingTimeStamp -= ch->ts_offset;
-		}
-	}
-
-	if (ch->rtp_ch->packet_loss) e = GF_REMOTE_SERVICE_ERROR;
-
-	if (ch->owner->first_packet_drop && (hdr->packetSequenceNumber >= ch->owner->first_packet_drop) ) {
-		if ( (hdr->packetSequenceNumber - ch->owner->first_packet_drop) % ch->owner->frequency_drop)
-			gf_service_send_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
-	} else {
-		gf_service_send_packet(ch->owner->service, ch->channel, payload, size, hdr, e);
-	}
-	hdr->compositionTimeStamp = cts;
-	hdr->decodingTimeStamp = dts;
-}
-
-RTPStream *RP_NewSatipStream(RTPClient *rtp, const char *server_ip)
-{
-	char *ctrl;
-	GF_RTPMap map;
-	GF_RTSPTransport trans;
-	RTPStream *tmp;
-	GF_SAFEALLOC(tmp, RTPStream);
-	if (!tmp) return NULL;
-	tmp->owner = rtp;
-
-	/*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 = gf_strdup(server_ip);
-	trans.IsUnicast = GF_TRUE;
-	trans.client_port_first = 0;
-	trans.client_port_last = 0;
-	trans.port_first = 0;
-	trans.port_last = 0;
-
-	if (gf_rtp_setup_transport(tmp->rtp_ch, &trans, NULL) != GF_OK) {
-		RP_DeleteStream(tmp);
-		return NULL;
-	}
-
-	/*setup channel*/
-	memset(&map, 0, sizeof(GF_RTPMap));
-	map.PayloadType = 33;
-	map.ClockRate = 90000;
-	gf_rtp_setup_payload(tmp->rtp_ch, &map);
-
-	ctrl = (char *)gf_modules_get_option((GF_BaseInterface *)gf_service_get_interface(rtp->service), "Streaming", "DisableRTCP");
-	if (!ctrl || stricmp(ctrl, "yes")) tmp->flags |= RTP_ENABLE_RTCP;
-
-	/*setup NAT keep-alive*/
-	ctrl = (char *)gf_modules_get_option((GF_BaseInterface *)gf_service_get_interface(rtp->service), "Streaming", "NATKeepAlive");
-	if (ctrl) {
-		gf_rtp_enable_nat_keepalive(tmp->rtp_ch, atoi(ctrl));
-	} else {
-		gf_rtp_enable_nat_keepalive(tmp->rtp_ch, 30000); /*keep-alive every 30s, SAT>IP max is 60s*/
-	}
-
-	tmp->range_start = 0;
-	tmp->range_end = 0;
-
-	tmp->satip_m2ts_ifce = (GF_InputService*)gf_modules_load_interface_by_name(rtp->service->term->user->modules, "GPAC MPEG-2 TS Reader", GF_NET_CLIENT_INTERFACE);
-	if (!tmp->satip_m2ts_ifce) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[SAT>IP] Couldn't load the M2TS demuxer.\n"));
-		RP_DeleteStream(tmp);
-		return NULL;
-	}
-	tmp->satip_m2ts_ifce->proxy_udta = rtp;
-
-	return tmp;
-}
-
-RTPStream *RP_NewStream(RTPClient *rtp, GF_SDPMedia *media, GF_SDPInfo *sdp, RTPStream *input_stream)
-{
-	GF_RTSPRange *range;
-	RTPStream *tmp;
-	GF_RTPMap *map;
-	u32 i, ESID, ODID, ssrc, rtp_seq, rtp_time;
-	Bool force_bcast = GF_FALSE;
-	Double Start, End;
-	Float CurrentTime;
-	u16 rvc_predef = 0;
-	char *rvc_config_att = NULL;
-	u32 s_port_first, s_port_last;
-	GF_X_Attribute *att;
-	Bool is_migration = GF_FALSE;
-	char *ctrl;
-	GF_SDPConnection *conn;
-	GF_RTSPTransport trans;
-	u32 mid, prev_stream, base_stream;
-
-	//extract all relevant info from the GF_SDPMedia
-	Start = 0.0;
-	End = -1.0;
-	CurrentTime = 0.0f;
-	ODID = 0;
-	ESID = 0;
-	ctrl = NULL;
-	range = NULL;
-	s_port_first = s_port_last = 0;
-	ssrc = rtp_seq = rtp_time = 0;
-	mid = prev_stream = base_stream = 0;
-	i=0;
-	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
-		if (!stricmp(att->Name, "control")) ctrl = att->Value;
-		else if (!stricmp(att->Name, "gpac-broadcast")) force_bcast = GF_TRUE;
-		else if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ESID = atoi(att->Value);
-		else if (!stricmp(att->Name, "mpeg4-odid") && att->Value) ODID = atoi(att->Value);
-		else if (!stricmp(att->Name, "range") && !range) range = gf_rtsp_range_parse(att->Value);
-		else if (!stricmp(att->Name, "x-stream-state") ) {
-			sscanf(att->Value, "server-port=%u-%u;ssrc=%X;npt=%g;seq=%u;rtptime=%u",
-			       &s_port_first, &s_port_last, &ssrc, &CurrentTime, &rtp_seq, &rtp_time);
-			is_migration = GF_TRUE;
-		}
-		else if (!stricmp(att->Name, "x-server-port") ) {
-			sscanf(att->Value, "%u-%u", &s_port_first, &s_port_last);
-		} else if (!stricmp(att->Name, "rvc-config-predef")) {
-			rvc_predef = atoi(att->Value);
-		} else if (!stricmp(att->Name, "rvc-config")) {
-			rvc_config_att = att->Value;
-		} else if (!stricmp(att->Name, "mid")) {
-			sscanf(att->Value, "L%d", &mid);
-		} else if (!stricmp(att->Name, "depend")) {
-			char buf[3000];
-			memset(buf, 0, 3000);
-			sscanf(att->Value, "%*d lay L%d %*s %s", &base_stream, buf);
-			if (!strlen(buf))
-				sscanf(att->Value, "%*d lay %s", buf);
-			sscanf(buf, "L%d", &prev_stream);
-		}
-	}
-
-	if (range) {
-		Start = range->start;
-		End = range->end;
-		gf_rtsp_range_del(range);
-	}
-
-	/*check connection*/
-	conn = sdp->c_connection;
-	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
-
-	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
-	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
-
-	if (!conn) {
-		/*RTSP RFC recommends an empty "c= " line but some server don't send it. Use session info (o=)*/
-		if (!sdp->o_net_type || !sdp->o_add_type || strcmp(sdp->o_net_type, "IN")) return NULL;
-		if (strcmp(sdp->o_add_type, "IP4") && strcmp(sdp->o_add_type, "IP6")) return NULL;
-	} else {
-		if (strcmp(conn->net_type, "IN")) return NULL;
-		if (strcmp(conn->add_type, "IP4") && strcmp(conn->add_type, "IP6")) return NULL;
-	}
-	/*do we support transport*/
-	if (strcmp(media->Profile, "RTP/AVP") && strcmp(media->Profile, "RTP/AVP/TCP")
-	        && strcmp(media->Profile, "RTP/SAVP") && strcmp(media->Profile, "RTP/SAVP/TCP")
-	   ) return NULL;
-
-	/*check RTP map. For now we only support 1 RTPMap*/
-	if (media->fmt_list || (gf_list_count(media->RTPMaps) > 1)) return NULL;
-
-	/*check payload type*/
-	map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
-
-	/*this is an ESD-URL setup, we likely have namespace conflicts so overwrite given ES_ID
-	by the app one (client side), but keep control (server side) if provided*/
-	if (input_stream) {
-		ESID = input_stream->ES_ID;
-		if (!ctrl) ctrl = input_stream->control;
-		tmp = input_stream;
-	} else {
-		tmp = RP_FindChannel(rtp, NULL, ESID, NULL, GF_FALSE);
-		if (tmp) return NULL;
-
-		GF_SAFEALLOC(tmp, RTPStream);
-		if (!tmp) return NULL;
-		tmp->owner = rtp;
-	}
-
-	/*create an RTP channel*/
-	tmp->rtp_ch = gf_rtp_new();
-	if (ctrl) tmp->control = gf_strdup(ctrl);
-	tmp->ES_ID = ESID;
-	tmp->OD_ID = ODID;
-	tmp->mid = mid;
-	tmp->prev_stream = prev_stream;
-	tmp->base_stream = base_stream;
-
-	memset(&trans, 0, sizeof(GF_RTSPTransport));
-	trans.Profile = media->Profile;
-	trans.source = conn ? conn->host : sdp->o_address;
-	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
-	if (!trans.IsUnicast) {
-		trans.port_first = media->PortNumber;
-		trans.port_last = media->PortNumber + 1;
-		trans.TTL = conn ? conn->TTL : 0;
-	} else {
-		trans.client_port_first = media->PortNumber;
-		trans.client_port_last = media->PortNumber + 1;
-		trans.port_first = s_port_first ? s_port_first : trans.client_port_first;
-		trans.port_last = s_port_last ? s_port_last : trans.client_port_last;
-	}
-
-	if (gf_rtp_setup_transport(tmp->rtp_ch, &trans, NULL) != GF_OK) {
-		RP_DeleteStream(tmp);
-		return NULL;
-	}
-	/*setup depacketizer*/
-	tmp->depacketizer = gf_rtp_depacketizer_new(media, rtp_sl_packet_cbk, tmp);
-	if (!tmp->depacketizer) {
-		RP_DeleteStream(tmp);
-		return NULL;
-	}
-	/*setup channel*/
-	gf_rtp_setup_payload(tmp->rtp_ch, map);
-
-//	tmp->status = NM_Disconnected;
-
-	ctrl = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Streaming", "DisableRTCP");
-	if (!ctrl || stricmp(ctrl, "yes")) tmp->flags |= RTP_ENABLE_RTCP;
-
-	/*setup NAT keep-alive*/
-	ctrl = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Streaming", "NATKeepAlive");
-	if (ctrl) gf_rtp_enable_nat_keepalive(tmp->rtp_ch, atoi(ctrl));
-
-	tmp->range_start = Start;
-	tmp->range_end = End;
-	if (End != -1.0) tmp->flags |= RTP_HAS_RANGE;
-
-	if (force_bcast) tmp->flags |= RTP_FORCE_BROADCAST;
-
-	if (is_migration) {
-		tmp->current_start = (Double) CurrentTime;
-		tmp->check_rtp_time = RTP_SET_TIME_RTP;
-		gf_rtp_set_info_rtp(tmp->rtp_ch, rtp_seq, rtp_time, ssrc);
-		tmp->status = RTP_SessionResume;
-	}
-
-	if (rvc_predef) {
-		tmp->depacketizer->sl_map.rvc_predef = rvc_predef ;
-	} else if (rvc_config_att) {
-		char *rvc_data=NULL;
-		u32 rvc_size;
-		Bool is_gz = GF_FALSE;
-		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 32) && strstr(rvc_config_att, "base64") ) {
-			char *data = strchr(rvc_config_att, ',');
-			if (data) {
-				rvc_size = (u32) strlen(data) * 3 / 4 + 1;
-				rvc_data = (char*)gf_malloc(sizeof(char) * rvc_size);
-				rvc_size = gf_base64_decode(data, (u32) strlen(data), rvc_data, rvc_size);
-				rvc_data[rvc_size] = 0;
-			}
-			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = GF_TRUE;
-		} else if (!strnicmp(rvc_config_att, "http://", 7) || !strnicmp(rvc_config_att, "https://", 8) ) {
-			char *mime;
-			if (gf_dm_get_file_memory(rvc_config_att, &rvc_data, &rvc_size, &mime) == GF_OK) {
-				if (mime && strstr(mime, "+gz")) is_gz = GF_TRUE;
-				if (mime) gf_free(mime);
-			}
-		}
-		if (rvc_data) {
-			if (is_gz) {
-#ifdef GPAC_DISABLE_ZLIB
-				fprintf(stderr, "Error: no zlib support - RVC not supported in RTP\n");
-				return NULL;
-#endif
-				gf_gz_decompress_payload(rvc_data, rvc_size, &tmp->depacketizer->sl_map.rvc_config, &tmp->depacketizer->sl_map.rvc_config_size);
-				gf_free(rvc_data);
-			} else {
-				tmp->depacketizer->sl_map.rvc_config = rvc_data;
-				tmp->depacketizer->sl_map.rvc_config_size = rvc_size;
-			}
-		}
-	}
-
-	return tmp;
-}
-
-
-static void RP_ProcessRTP(RTPStream *ch, char *pck, u32 size)
-{
-	GF_NetworkCommand com;
-	GF_Err e;
-	GF_RTPHeader hdr;
-	u32 PayloadStart;
-	ch->rtp_bytes += size;
-
-	/*first decode RTP*/
-	e = gf_rtp_decode_rtp(ch->rtp_ch, pck, size, &hdr, &PayloadStart);
-
-	/*corrupted or NULL data*/
-	if (e || (PayloadStart >= size)) {
-		//gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_CORRUPTED_DATA);
-		return;
-	}
-
-	/*if we must notify some timing, do it now. If the channel has no range, this should NEVER be called*/
-	if (ch->check_rtp_time /*&& gf_rtp_is_active(ch->rtp_ch)*/) {
-		Double ch_time;
-
-		/*it may happen that we still receive packets from a previous "play" request. If this is the case,
-		filter until we reach the indicated rtptime*/
-		if (ch->rtp_ch->rtp_time
-		        && (ch->rtp_ch->rtp_first_SN > hdr.SequenceNumber)
-		        && (ch->rtp_ch->rtp_time < hdr.TimeStamp)
-		   ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Rejecting too early packet (TS %d vs signaled rtp time %d - diff %d ms)\n",
-			                                    hdr.TimeStamp, ch->rtp_ch->rtp_time, ((hdr.TimeStamp - ch->rtp_ch->rtp_time)*1000) / ch->rtp_ch->TimeScale));
-			return;
-		}
-
-		ch_time = gf_rtp_get_current_time(ch->rtp_ch);
-
-		/*this is the first packet on the channel (no PAUSE)*/
-		if (ch->check_rtp_time == RTP_SET_TIME_RTP) {
-			/*Note: in a SEEK with RTSP, the rtp-info time given by the server is
-			the rtp time of the desired range. But the server may (and should) send from
-			the previous I frame on video, so the time of the first rtp packet after
-			a SEEK can actually be less than CurrentStart. We don't drop these
-			packets in order to see the maximum video. We could drop it, this would mean
-			wait for next RAP...*/
-
-			memset(&com, 0, sizeof(com));
-			com.command_type = GF_NET_CHAN_MAP_TIME;
-			com.base.on_channel = ch->channel;
-			if (ch->rtsp) {
-				com.map_time.media_time = ch->current_start + ch_time;
-			} else {
-				com.map_time.media_time = 0;
-			}
-
-			com.map_time.timestamp = hdr.TimeStamp;
-			com.map_time.reset_buffers = GF_FALSE;
-			gf_service_command(ch->owner->service, &com, GF_OK);
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Mapping RTP Time seq %d TS %d Media Time %g - rtp info seq %d TS %d\n",
-			                                 hdr.SequenceNumber, hdr.TimeStamp, com.map_time.media_time, ch->rtp_ch->rtp_first_SN, ch->rtp_ch->rtp_time
-			                                ));
-
-			/*skip RTCP clock init when RTSP is used*/
-			if (ch->rtsp) ch->rtcp_init = GF_TRUE;
-
-			if (ch->depacketizer->payt==GF_RTP_PAYT_H264_AVC) ch->depacketizer->flags |= GF_RTP_AVC_WAIT_RAP;
-		}
-		/*this is RESUME on channel, filter packet based on time (darwin seems to send
-		couple of packet before)
-		do not fetch if we're below 10 ms or <0, because this means we already have
-		this packet - as the PAUSE is issued with the RTP currentTime*/
-		else if (ch_time <= 0.021) {
-			return;
-		}
-		ch->check_rtp_time = RTP_SET_TIME_NONE;
-	}
-
-	gf_rtp_depacketizer_process(ch->depacketizer, &hdr, pck + PayloadStart, size - PayloadStart);
-
-	/*last check: signal EOS if we're close to end range in case the server do not send RTCP BYE*/
-	if ((ch->flags & RTP_HAS_RANGE) && !(ch->flags & RTP_EOS) ) {
-		/*also check last CTS*/
-		Double ts = (Double) ((u32) ch->depacketizer->sl_hdr.compositionTimeStamp - hdr.TimeStamp);
-		ts /= gf_rtp_get_clockrate(ch->rtp_ch);
-		if (ABSDIFF(ch->range_end, (ts + ch->current_start + gf_rtp_get_current_time(ch->rtp_ch)) ) < 0.2) {
-			ch->flags |= RTP_EOS;
-			ch->stat_stop_time = gf_sys_clock();
-			gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
-		}
-	}
-}
-
-void RP_ProcessRTCP(RTPStream *ch, char *pck, u32 size)
-{
-	Bool has_sr;
-	GF_Err e;
-
-	if (ch->status == RTP_Connected) return;
-
-	ch->rtcp_bytes += size;
-
-	e = gf_rtp_decode_rtcp(ch->rtp_ch, pck, size, &has_sr);
-	if (e<0) return;
-
-	/*update sync if on pure RTP*/
-	if (!ch->rtcp_init && has_sr) {
-		Double ntp_clock;
-
-		ntp_clock = ch->rtp_ch->last_SR_NTP_sec;
-		ntp_clock += ((Double)ch->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
-
-		if (!ch->owner->last_ntp) {
-			//add safety in case this RTCP report is received before another report
-			//that was supposed to come in earlier (with earlier NTP)
-			//Double safety_offset, time = ch->rtp_ch->last_SR_rtp_time;
-			//time /= ch->rtp_ch->TimeScale;
-			//safety_offset = time/2;
-			ch->owner->last_ntp = ntp_clock;
-		}
-
-		if (ntp_clock >= ch->owner->last_ntp) {
-			ntp_clock -= ch->owner->last_ntp;
-		} else {
-			ntp_clock = 0;
-		}
-
-		//assert(ch->rtp_ch->last_SR_rtp_time >= (u64) (ntp_clock * ch->rtp_ch->TimeScale));
-		ch->ts_offset = ch->rtp_ch->last_SR_rtp_time;
-		ch->ts_offset -= (s64) (ntp_clock * ch->rtp_ch->TimeScale);
-
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTCP] At %d Using Sender Report to map RTP TS %d to NTP clock %g - new TS offset "LLD" \n",
-		                                 gf_sys_clock(), ch->rtp_ch->last_SR_rtp_time, ntp_clock, ch->ts_offset
-		                                ));
-
-		ch->rtcp_init = GF_TRUE;
-		ch->check_rtp_time = RTP_SET_TIME_NONE;
-	}
-
-	if (e == GF_EOS) {
-		ch->flags |= RTP_EOS;
-		ch->stat_stop_time = gf_sys_clock();
-		gf_service_send_packet(ch->owner->service, ch->channel, NULL, 0, NULL, GF_EOS);
-	}
-}
-
-GF_Err RP_DataOnTCP(GF_RTSPSession *sess, void *cbk, char *buffer, u32 bufferSize, Bool IsRTCP)
-{
-	RTPStream *ch = (RTPStream *) cbk;
-	if (!ch) return GF_OK;
-	if (IsRTCP) {
-		RP_ProcessRTCP(ch, buffer, bufferSize);
-	} else {
-		RP_ProcessRTP(ch, buffer, bufferSize);
-	}
-	return GF_OK;
-}
-
-
-static GF_Err SendTCPData(void *par, char *pck, u32 pck_size)
-{
-	return GF_OK;
-}
-
-
-void RP_ReadStream(RTPStream *ch)
-{
-	u32 size, tot_size;
-
-	if (!ch->rtp_ch) return;
-
-	/*NOTE: A weird bug on windows wrt to select(): if both RTP and RTCP are in the same loop
-	there is a hudge packet drop on RTP. We therefore split RTP and RTCP reading, this is not a big
-	deal as the RTCP traffic is far less than RTP, and we should never have more than one RTCP
-	packet reading per RTP reading loop
-	NOTE2: a better implementation would be to use select() to get woken up...
-	*/
-	tot_size = 0;
-
-	while (1) {
-		size = gf_rtp_read_rtcp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
-		if (!size) break;
-		tot_size += size;
-		RP_ProcessRTCP(ch, ch->buffer, size);
-	}
-
-	while (1) {
-		size = gf_rtp_read_rtp(ch->rtp_ch, ch->buffer, RTP_BUFFER_SIZE);
-		if (!size) break;
-		tot_size += size;
-		RP_ProcessRTP(ch, ch->buffer, size);
-	}
-	/*and send the report*/
-	if (ch->flags & RTP_ENABLE_RTCP) gf_rtp_send_rtcp_report(ch->rtp_ch, SendTCPData, ch);
-
-	if (tot_size) ch->owner->udp_time_out = 0;
-
-	/*detect timeout*/
-	if (ch->owner->udp_time_out) {
-		if (!ch->last_udp_time) {
-			ch->last_udp_time = gf_sys_clock();
-		} else if (ch->rtp_ch->net_info.IsUnicast && !(ch->flags & RTP_MOBILEIP) ) {
-			u32 diff = gf_sys_clock() - ch->last_udp_time;
-			if (diff >= ch->owner->udp_time_out) {
-				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", diff);
-				RP_SendMessage(ch->owner->service, GF_IP_UDP_TIMEOUT, szMessage);
-				ch->status = RTP_Unavailable;
-			}
-		}
-	}
-}
-
-#endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/modules/rtp_in/sdp_fetch.c Deleted

@@ -1,186 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-
-#ifndef GPAC_DISABLE_STREAMING
-
-
-void RP_SDPFromData(RTPClient *rtp, char *s_url, RTPStream *stream)
-{
-	char *url;
-	char buf[2000];
-	u32 size;
-
-	url = strstr(s_url, ",");
-	if (!url) {
-		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
-		return;
-	}
-	url += 1;
-	if (strstr(url, ";base64")) {
-		//decode
-		size = gf_base64_decode(url, (u32) strlen(url), buf, 2000);
-		buf[size] = 0;
-		url = buf;
-	}
-	RP_LoadSDP(rtp, url, (u32) strlen(url), stream);
-}
-
-void RP_SDPFromFile(RTPClient *rtp, char *file_name, RTPStream *stream)
-{
-	FILE *_sdp;
-	char *sdp_buf;
-	u32 sdp_size;
-
-	sdp_buf = NULL;
-
-	if (file_name && strstr(file_name, "file://")) file_name += strlen("file://");
-	if (!file_name || !(_sdp = gf_fopen(file_name, "rt")) ) {
-		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
-		return;
-	}
-
-	gf_fseek(_sdp, 0, SEEK_END);
-	sdp_size = (u32) gf_ftell(_sdp);
-	gf_fseek(_sdp, 0, SEEK_SET);
-	sdp_buf = (char*)gf_malloc(sdp_size);
-	if (1 > fread(sdp_buf, 1, sdp_size, _sdp)) {
-		gf_service_connect_ack(rtp->service, NULL, GF_URL_ERROR);
-	} else {
-		RP_LoadSDP(rtp, sdp_buf, sdp_size, stream);
-	}
-	gf_fclose(_sdp);
-	gf_free(sdp_buf);
-}
-
-void SDP_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	RTPClient *rtp = (RTPClient *)cbk;
-	SDPFetch *sdp = rtp->sdp_temp;
-
-	gf_service_download_update_stats(rtp->dnload);
-
-	e = param->error;
-	switch (param->msg_type) {
-	case GF_NETIO_GET_METHOD:
-		if (sdp->original_url)
-			param->name = "POST";
-		return;
-	case GF_NETIO_GET_CONTENT:
-		if (sdp->original_url) {
-			char szBody[4096], *opt;
-			opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Network", "MobileIP");
-			sprintf(szBody, "ipadd\n%s\n\nurl\n%s\n\n", opt, sdp->original_url);
-			param->data = szBody;
-			param->size = (u32) strlen(szBody);
-		}
-		return;
-	case GF_NETIO_DATA_TRANSFERED:
-		if (sdp->original_url) {
-			u32 sdp_size;
-			e = gf_dm_sess_get_stats(rtp->dnload, NULL, NULL, &sdp_size, NULL, NULL, NULL);
-			if (sdp_size) {
-				const char *szFile = gf_dm_sess_get_cache_name(rtp->dnload);
-				if (!szFile) {
-					e = GF_SERVICE_ERROR;
-				} else {
-					RP_SDPFromFile(rtp, (char *) szFile, sdp->chan);
-					gf_free(sdp->remote_url);
-					if (sdp->original_url) gf_free(sdp->original_url);
-					gf_free(sdp);
-					rtp->sdp_temp = NULL;
-					return;
-				}
-			}
-		}
-		break;
-	default:
-		if (e == GF_OK) return;
-	}
-
-	if (sdp->original_url) {
-		char *url = sdp->original_url;
-		gf_free(sdp->remote_url);
-		gf_free(sdp);
-		rtp->sdp_temp = NULL;
-		RP_SendMessage(rtp->service, e, "Error fetching session state - restarting");
-		RP_ConnectServiceEx(gf_service_get_interface(rtp->service), rtp->service, url, GF_TRUE);
-		gf_free(url);
-		return;
-	}
-
-	/*error*/
-	if (sdp->chan) {
-		gf_service_connect_ack(rtp->service, sdp->chan->channel, e);
-	} else {
-		gf_service_connect_ack(rtp->service, NULL, e);
-		rtp->sdp_temp = NULL;
-	}
-	gf_free(sdp->remote_url);
-	if (sdp->original_url) gf_free(sdp->original_url);
-	gf_free(sdp);
-	rtp->sdp_temp = NULL;
-}
-
-void RP_FetchSDP(RTPClient *rtp, char *url, RTPStream *stream, char *original_url)
-{
-	SDPFetch *sdp;
-	/*if local URL get file*/
-	if (strstr(url, "data:application/sdp")) {
-		RP_SDPFromData(rtp, url, stream);
-		return;
-	}
-	if (!strnicmp(url, "file://", 7) || !strstr(url, "://")) {
-		RP_SDPFromFile(rtp, url, stream);
-		return;
-	}
-
-	sdp = (SDPFetch*)gf_malloc(sizeof(SDPFetch));
-	memset(sdp, 0, sizeof(SDPFetch));
-	sdp->client = rtp;
-	sdp->remote_url = gf_strdup(url);
-	sdp->chan = stream;
-	if (original_url) {
-		sdp->original_url = gf_strdup(original_url);
-	}
-
-	/*otherwise setup download*/
-	if (rtp->dnload) gf_service_download_del(rtp->dnload);
-	rtp->dnload = NULL;
-
-	rtp->sdp_temp = sdp;
-	rtp->dnload = gf_service_download_new(rtp->service, url, 0, SDP_NetIO, rtp);
-	if (!rtp->dnload) {
-		gf_service_connect_ack(rtp->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(rtp->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-#endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/modules/rtp_in/sdp_load.c Deleted

@@ -1,585 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / RTP input module
- *
- *  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 "rtp_in.h"
-#include <gpac/internal/ietf_dev.h>
-
-#ifndef GPAC_DISABLE_STREAMING
-
-GF_Err RP_SetupSDP(RTPClient *rtp, GF_SDPInfo *sdp, RTPStream *stream)
-{
-	GF_Err e;
-	GF_SDPMedia *media;
-	Double Start, End;
-	u32 i;
-	char *sess_ctrl, *session_id, *url;
-	GF_X_Attribute *att;
-	GF_RTSPRange *range;
-	RTPStream *ch;
-	RTSPSession *migrate_sess = NULL;
-
-	Start = 0.0;
-	End = -1.0;
-
-	sess_ctrl = NULL;
-	range = NULL;
-	session_id = url = NULL;
-
-	i=0;
-	while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
-		//session-level control string. Keep it in the current session if any
-		if (!strcmp(att->Name, "control") && att->Value) sess_ctrl = att->Value;
-		//NPT range only for now
-		else if (!strcmp(att->Name, "range") && !range) range = gf_rtsp_range_parse(att->Value);
-		/*session migration*/
-		else if (!strcmp(att->Name, "x-session-name")) url = att->Value;
-		else if (!strcmp(att->Name, "x-session-id")) session_id = att->Value;
-		/*we have the H264-SVC streams*/
-		else if (!strcmp(att->Name, "group") && !strncmp(att->Value, "DDP", 3)) rtp->is_scalable = GF_TRUE;
-	}
-	if (range) {
-		Start = range->start;
-		End = range->end;
-		gf_rtsp_range_del(range);
-	}
-
-	if (url) {
-		migrate_sess = RP_NewSession(rtp, url);
-		if (migrate_sess && session_id) {
-			migrate_sess->session_id = gf_strdup(session_id);
-		}
-		sess_ctrl = url;
-	}
-
-	//setup all streams
-	i=0;
-	while ((media = (GF_SDPMedia*)gf_list_enum(sdp->media_desc, &i))) {
-		ch = RP_NewStream(rtp, media, sdp, stream);
-		//do not generate error if the channel is not created, just assume
-		//1 - this is not an MPEG-4 configured channel -> not needed
-		//2 - this is a 2nd describe and the channel was already created
-		if (!ch) continue;
-
-		e = RP_AddStream(rtp, ch, sess_ctrl);
-		if (e) {
-			RP_DeleteStream(ch);
-			return e;
-		}
-
-		if (!(ch->flags & RTP_HAS_RANGE)) {
-			ch->range_start = Start;
-			ch->range_end = End;
-			if (End > 0) ch->flags |= RTP_HAS_RANGE;
-		}
-
-		/*force interleaving whenever needed*/
-		if (ch->rtsp) {
-			switch (ch->depacketizer->sl_map.StreamType) {
-			case GF_STREAM_VISUAL:
-			case GF_STREAM_AUDIO:
-				if ((rtp->transport_mode==1) && ! (ch->rtsp->flags & RTSP_FORCE_INTER) ) {
-					gf_rtsp_set_buffer_size(ch->rtsp->session, RTSP_TCP_BUFFER_SIZE);
-					ch->rtsp->flags |= RTSP_FORCE_INTER;
-				}
-				break;
-			default:
-				if (rtp->transport_mode && ! (ch->rtsp->flags & RTSP_FORCE_INTER) ) {
-					gf_rtsp_set_buffer_size(ch->rtsp->session, RTSP_TCP_BUFFER_SIZE);
-					ch->rtsp->flags |= RTSP_FORCE_INTER;
-				}
-				break;
-			}
-		}
-
-	}
-	return GF_OK;
-}
-
-/*load iod from data:application/mpeg4-iod;base64*/
-GF_Err RP_SDPLoadIOD(RTPClient *rtp, char *iod_str)
-{
-	char buf[2000];
-	u32 size;
-
-	if (rtp->session_desc) return GF_SERVICE_ERROR;
-	/*the only IOD format we support*/
-	iod_str += 1;
-	if (!strnicmp(iod_str, "data:application/mpeg4-iod;base64", strlen("data:application/mpeg4-iod;base64"))) {
-		char *buf64;
-		u32 size64;
-
-		buf64 = strstr(iod_str, ",");
-		if (!buf64) return GF_URL_ERROR;
-		buf64 += 1;
-		size64 = (u32) strlen(buf64) - 1;
-
-		size = gf_base64_decode(buf64, size64, buf, 2000);
-		if (!size) return GF_SERVICE_ERROR;
-	} else if (!strnicmp(iod_str, "data:application/mpeg4-iod;base16", strlen("data:application/mpeg4-iod;base16"))) {
-		char *buf16;
-		u32 size16;
-
-		buf16 = strstr(iod_str, ",");
-		if (!buf16) return GF_URL_ERROR;
-		buf16 += 1;
-		size16 = (u32) strlen(buf16) - 1;
-
-		size = gf_base16_decode(buf16, size16, buf, 2000);
-		if (!size) return GF_SERVICE_ERROR;
-	} else {
-		return GF_NOT_SUPPORTED;
-	}
-
-	gf_odf_desc_read(buf, size, &rtp->session_desc);
-	return GF_OK;
-}
-
-
-static u32 get_stream_type_from_hint(u32 ht)
-{
-	switch (ht) {
-	case GF_MEDIA_OBJECT_VIDEO:
-		return GF_STREAM_VISUAL;
-	case GF_MEDIA_OBJECT_AUDIO:
-		return GF_STREAM_AUDIO;
-	case GF_MEDIA_OBJECT_TEXT:
-		return GF_STREAM_TEXT;
-	default:
-		return 0;
-	}
-}
-
-static GF_ESD *RP_GetChannelESD(RTPStream *ch, u32 ch_idx)
-{
-	GF_ESD *esd;
-
-	if (!ch->ES_ID) ch->ES_ID = ch_idx + 1;
-	if (!ch->depacketizer) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("RTP Stream channel %u has no depacketizer\n", ch_idx));
-		return NULL;
-	}
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = gf_rtp_get_clockrate(ch->rtp_ch);
-	esd->slConfig->useRandomAccessPointFlag = 1;
-	esd->slConfig->useTimestampsFlag = 1;
-	esd->slConfig->no_dts_signaling = ch->depacketizer->sl_map.DTSDeltaLength ? GF_FALSE : GF_TRUE;
-	esd->ESID = ch->ES_ID;
-	esd->OCRESID = 0;
-	if (ch->mid)
-		esd->has_scalable_layers = GF_TRUE;
-
-	esd->decoderConfig->streamType = ch->depacketizer->sl_map.StreamType;
-	esd->decoderConfig->objectTypeIndication = ch->depacketizer->sl_map.ObjectTypeIndication;
-	if (ch->depacketizer->sl_map.config) {
-		esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char) * ch->depacketizer->sl_map.configSize);
-		memcpy(esd->decoderConfig->decoderSpecificInfo->data, ch->depacketizer->sl_map.config, sizeof(char) * ch->depacketizer->sl_map.configSize);
-		esd->decoderConfig->decoderSpecificInfo->dataLength = ch->depacketizer->sl_map.configSize;
-	}
-	if (ch->depacketizer->sl_map.rvc_predef) {
-		esd->decoderConfig->predefined_rvc_config = ch->depacketizer->sl_map.rvc_predef;
-	} else if (ch->depacketizer->sl_map.rvc_config) {
-		esd->decoderConfig->rvc_config = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		esd->decoderConfig->rvc_config->data = ch->depacketizer->sl_map.rvc_config;
-		esd->decoderConfig->rvc_config->dataLength = ch->depacketizer->sl_map.rvc_config_size;
-		ch->depacketizer->sl_map.rvc_config = NULL;
-		ch->depacketizer->sl_map.rvc_config_size = 0;
-	}
-
-	return esd;
-}
-
-static GF_ObjectDescriptor *RP_GetChannelOD(RTPStream *ch, u32 ch_idx)
-{
-	GF_ESD *esd;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-
-	esd = RP_GetChannelESD(ch, ch_idx);
-
-	od->objectDescriptorID = ch->OD_ID ? ch->OD_ID : ch->ES_ID;
-
-	gf_list_add(od->ESDescriptors, esd);
-
-	// for each channel depending on this channel, get esd, set esd->dependsOnESID and add to od
-	if (ch->owner->is_scalable) {
-		u32 i, count;
-
-		count = gf_list_count(ch->owner->channels);
-		for (i = 0; i < count; i++) {
-			RTPStream *the_channel;
-			GF_ESD *the_esd;
-
-			the_channel = (RTPStream *)gf_list_get(ch->owner->channels, i);
-			if (the_channel->base_stream == ch->mid) {
-				the_esd = RP_GetChannelESD(the_channel, i);
-				the_esd->dependsOnESID = the_channel->prev_stream;
-				gf_list_add(od->ESDescriptors, the_esd);
-			}
-		}
-	}
-
-	return od;
-}
-
-GF_Descriptor *RP_EmulateIOD(RTPClient *rtp, const char *sub_url)
-{
-	GF_ObjectDescriptor *the_od;
-	RTPStream *a_str, *ch;
-	u32 i;
-
-	if (rtp->media_type==GF_MEDIA_OBJECT_INTERACT) return NULL;
-	if (rtp->media_type==GF_MEDIA_OBJECT_UPDATES) return NULL;
-
-	/*single object generation*/
-	a_str = NULL;
-	if (sub_url || ((rtp->media_type != GF_MEDIA_OBJECT_SCENE) && (rtp->media_type != GF_MEDIA_OBJECT_UNDEF)) ) {
-		i=0;
-		while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-			if (ch->depacketizer->sl_map.StreamType != get_stream_type_from_hint(rtp->media_type)) continue;
-
-			if (!sub_url || (ch->control && strstr(sub_url, ch->control)) ) {
-				the_od = RP_GetChannelOD(ch, i-1);
-				if (!the_od) continue;
-				return (GF_Descriptor *) the_od;
-			}
-			if (!a_str) a_str = ch;
-		}
-		if (a_str) {
-			the_od = RP_GetChannelOD(a_str, gf_list_find(rtp->channels, a_str) );
-			return (GF_Descriptor *) the_od;
-		}
-		return NULL;
-	}
-	return NULL;
-}
-
-
-void RP_SetupObjects(RTPClient *rtp)
-{
-	GF_ObjectDescriptor *od;
-	RTPStream *ch;
-	u32 i;
-
-	/*add everything*/
-	i=0;
-	while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-		if (ch->control && !strnicmp(ch->control, "data:", 5)) continue;
-		if (ch->prev_stream) continue;
-
-		if (!rtp->media_type) {
-			od = RP_GetChannelOD(ch, i);
-			if (!od) continue;
-			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, GF_TRUE);
-		} else if (rtp->media_type==ch->depacketizer->sl_map.StreamType) {
-			od = RP_GetChannelOD(ch, i);
-			if (!od) continue;
-			gf_service_declare_media(rtp->service, (GF_Descriptor*)od, GF_TRUE);
-			rtp->media_type = 0;
-			break;
-		}
-	}
-	gf_service_declare_media(rtp->service, NULL, GF_FALSE);
-}
-
-void RP_LoadSDP(RTPClient *rtp, char *sdp_text, u32 sdp_len, RTPStream *stream)
-{
-	GF_Err e;
-	u32 i;
-	GF_SDPInfo *sdp;
-	Bool is_isma_1, has_iod;
-	char *iod_str;
-	GF_X_Attribute *att;
-
-	is_isma_1 = GF_FALSE;
-	iod_str = NULL;
-	sdp = gf_sdp_info_new();
-	e = gf_sdp_info_parse(sdp, sdp_text, sdp_len);
-
-	if (e == GF_OK) e = RP_SetupSDP(rtp, sdp, stream);
-
-	/*root SDP, attach service*/
-	if (!stream) {
-		/*look for IOD*/
-		if (e==GF_OK) {
-			i=0;
-			while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
-				if (!iod_str && !strcmp(att->Name, "mpeg4-iod") ) iod_str = att->Value;
-				if (!is_isma_1 && !strcmp(att->Name, "isma-compliance") ) {
-					if (!stricmp(att->Value, "1,1.0,1")) is_isma_1 = GF_TRUE;
-				}
-			}
-
-			/*force iod reconstruction with ISMA to use proper clock dependencies*/
-			if (is_isma_1) iod_str = NULL;
-
-			/*some folks have weird notions of MPEG-4 systems, they use hardcoded IOD
-			with AAC ESD even when streaming AMR...*/
-			if (iod_str) {
-				RTPStream *ch;
-				i=0;
-				while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-					if ((ch->depacketizer->payt==GF_RTP_PAYT_AMR) || (ch->depacketizer->payt==GF_RTP_PAYT_AMR_WB) ) {
-						iod_str = NULL;
-						break;
-					}
-				}
-			}
-			if (!iod_str) {
-				RTPStream *ch;
-				Bool needs_iod = GF_FALSE;
-				i=0;
-				while ((ch = (RTPStream *)gf_list_enum(rtp->channels, &i))) {
-					if (ch->depacketizer && (ch->depacketizer->payt==GF_RTP_PAYT_MPEG4) && (ch->depacketizer->sl_map.StreamType==GF_STREAM_SCENE)
-//						|| ((ch->depacketizer->payt==GF_RTP_PAYT_3GPP_DIMS) && (ch->depacketizer->sl_map.StreamType==GF_STREAM_SCENE))
-					   ) {
-						needs_iod = GF_TRUE;
-						break;
-					}
-				}
-				if (needs_iod) {
-					rtp->session_desc = (GF_Descriptor *)RP_GetChannelOD(ch, 0);
-				}
-			}
-
-			if (iod_str) e = RP_SDPLoadIOD(rtp, iod_str);
-		}
-		/*attach service*/
-		has_iod = rtp->session_desc ? GF_TRUE : GF_FALSE;
-		gf_service_connect_ack(rtp->service, NULL, e);
-		if (!e && !has_iod && !rtp->media_type) RP_SetupObjects(rtp);
-		rtp->media_type = 0;
-	}
-	/*channel SDP */
-	else {
-		if (e) {
-			gf_service_connect_ack(rtp->service, stream->channel, e);
-			stream->status = RTP_Unavailable;
-		} else {
-			/*connect*/
-			RP_SetupChannel(stream, NULL);
-		}
-	}
-	/*store SDP for later session migration*/
-	if (sdp) {
-		char *buf=NULL;
-		gf_sdp_info_write(sdp, &buf);
-		if (buf) {
-			rtp->session_state_data = (char*)gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(buf) + 1) );
-			strcpy(rtp->session_state_data, "data:application/sdp,");
-			strcat(rtp->session_state_data, buf);
-			gf_free(buf);
-		}
-		gf_sdp_info_del(sdp);
-	}
-}
-
-void MigrateSDP_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	RTPClient *rtp = (RTPClient *)cbk;
-
-	switch (param->msg_type) {
-	case GF_NETIO_GET_METHOD:
-		param->name = "POST";
-		return;
-	case GF_NETIO_GET_HEADER:
-		if (!strcmp(param->name, "POST")) {
-			param->name = "Content-Type";
-			param->value = "application/sdp";
-		}
-		return;
-
-	case GF_NETIO_GET_CONTENT:
-		param->data = rtp->session_state_data + strlen("data:application/sdp,");
-		param->size = (u32) strlen(param->data);
-		return;
-	default:
-		return;
-	}
-}
-
-
-void RP_SaveSessionState(RTPClient *rtp)
-{
-	GF_Err e;
-	char *sdp_buf;
-	const char *opt;
-	GF_X_Attribute*att;
-	u32 i, j;
-	GF_SDPInfo *sdp;
-	RTSPSession *sess = NULL;
-
-	if (!rtp->session_state_data) return;
-
-	sdp_buf = rtp->session_state_data + strlen("data:application/sdp,");
-	sdp = gf_sdp_info_new();
-	e = gf_sdp_info_parse(sdp, sdp_buf, (u32) strlen(sdp_buf) );
-
-	for (i=0; i<gf_list_count(rtp->channels); i++) {
-		GF_SDPMedia *media = NULL;
-		RTPStream *ch = (RTPStream*)gf_list_get(rtp->channels, i);
-		if (!ch->control) continue;
-
-		for (j=0; j<gf_list_count(sdp->media_desc); j++) {
-			u32 k;
-			GF_SDPMedia *med = (GF_SDPMedia*)gf_list_get(sdp->media_desc, j);
-
-			for (k=0; k<gf_list_count(med->Attributes); k++) {
-				att = (GF_X_Attribute*)gf_list_get(med->Attributes, k);
-				if (!stricmp(att->Name, "control") && (strstr(att->Value, ch->control)!=NULL) ) {
-					media = med;
-					break;
-				}
-			}
-			if (media)
-				break;
-		}
-		if (!media) continue;
-
-		if (ch->rtp_ch->net_info.IsUnicast) {
-			char szPorts[4096];
-			u16 porta, portb;
-			media->PortNumber = ch->rtp_ch->net_info.client_port_first;
-
-			/*remove x-server-port extension*/
-			for (j=0; j<gf_list_count(media->Attributes); j++) {
-				att = (GF_X_Attribute*)gf_list_get(media->Attributes, j);
-				if (!stricmp(att->Name, "x-stream-state") ) {
-					gf_free(att->Name);
-					gf_free(att->Value);
-					gf_free(att);
-					gf_list_rem(media->Attributes, j);
-				}
-			}
-			ch->current_start += gf_rtp_get_current_time(ch->rtp_ch);
-
-			GF_SAFEALLOC(att, GF_X_Attribute);
-			if (!att) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Failed to save stream state for channel\n"));
-				continue;
-			}
-			att->Name = gf_strdup("x-stream-state");
-			porta = ch->rtp_ch->net_info.port_first ? ch->rtp_ch->net_info.port_first : ch->rtp_ch->net_info.client_port_first;
-			portb = ch->rtp_ch->net_info.port_last ? ch->rtp_ch->net_info.port_last : ch->rtp_ch->net_info.client_port_last;
-
-			sprintf(szPorts, "server-port=%d-%d;ssrc=%X;npt=%g;seq=%d;rtptime=%d",
-			        porta,
-			        portb,
-			        ch->rtp_ch->SenderSSRC,
-			        ch->current_start,
-			        ch->rtp_ch->rtp_first_SN,
-			        ch->rtp_ch->rtp_time
-			       );
-			att->Value = gf_strdup(szPorts);
-			gf_list_add(media->Attributes, att);
-
-			if (ch->rtsp)
-				sess = ch->rtsp;
-		} else {
-			media->PortNumber = ch->rtp_ch->net_info.port_first;
-		}
-
-	}
-	/*remove x-server-port/x-session-id extension*/
-	for (j=0; j<gf_list_count(sdp->Attributes); j++) {
-		att = (GF_X_Attribute*)gf_list_get(sdp->Attributes, j);
-		if (!stricmp(att->Name, "x-session-id") || !stricmp(att->Name, "x-session-name")
-		   ) {
-			gf_free(att->Name);
-			gf_free(att->Value);
-			gf_free(att);
-			gf_list_rem(sdp->Attributes, j);
-		}
-	}
-	if (sess) {
-		char szURL[4096];
-
-		if (sess->session_id) {
-			GF_SAFEALLOC(att, GF_X_Attribute);
-			if (!att) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Failed to save session ID\n"));
-			} else {
-				att->Name = gf_strdup("x-session-id");
-				att->Value = gf_strdup(sess->session_id);
-				gf_list_add(sdp->Attributes, att);
-			}
-		}
-
-		GF_SAFEALLOC(att, GF_X_Attribute);
-		if (!att) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Failed to save session name\n"));
-		} else {
-			att->Name = gf_strdup("x-session-name");
-			sprintf(szURL, "rtsp://%s:%d/%s", sess->session->Server, sess->session->Port, sess->session->Service);
-			att->Value = gf_strdup(szURL);
-			gf_list_add(sdp->Attributes, att);
-		}
-	}
-
-	gf_free(rtp->session_state_data);
-	sdp_buf = NULL;
-	gf_sdp_info_write(sdp, &sdp_buf);
-	if (sdp_buf) {
-		rtp->session_state_data = (char*)gf_malloc(sizeof(char) * (strlen("data:application/sdp,") + strlen(sdp_buf) + 1) );
-		strcpy(rtp->session_state_data, "data:application/sdp,");
-		strcat(rtp->session_state_data, sdp_buf);
-		gf_free(sdp_buf);
-	}
-
-
-	gf_sdp_info_del(sdp);
-
-
-	opt = (char *) gf_modules_get_option((GF_BaseInterface *) gf_service_get_interface(rtp->service), "Streaming", "SessionMigrationServer");
-	if (opt) {
-		if (rtp->dnload) gf_service_download_del(rtp->dnload);
-		rtp->dnload = NULL;
-
-		if (strnicmp(opt, "http://", 7)) {
-			rtp->dnload = gf_service_download_new(rtp->service, opt, GF_NETIO_SESSION_NOT_THREADED, MigrateSDP_NetIO, rtp);
-			while (1) {
-				char buffer[100];
-				u32 read;
-				e = gf_dm_sess_fetch_data(rtp->dnload, buffer, 100, &read);
-				if (e && (e!=GF_IP_NETWORK_EMPTY)) break;
-			}
-			gf_service_download_del(rtp->dnload);
-			rtp->dnload = NULL;
-		} else {
-			FILE *f = gf_fopen(opt, "wt");
-			if (f) {
-				sdp_buf = rtp->session_state_data + strlen("data:application/sdp,");
-				gf_fwrite(sdp_buf, 1, strlen(sdp_buf), f);
-				gf_fclose(f);
-			} else {
-				e = GF_IO_ERR;
-			}
-		}
-		if (sess && sess->owner && (e<0)) {
-			RP_SendMessage(sess->owner->service, e, "Error saving session state");
-		}
-	}
-}
-
-#endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/modules/rvc_dec Deleted

gpac-0.8.0.tar.gz/modules/rvc_dec/rvc_dec.c Deleted

@@ -1,499 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OpenSVC Decoder module
- *
- *  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/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-
-#ifdef WIN32
-#define DllImport __declspec( dllimport )
-
-
-#if !defined(__GNUC__)
-#  pragma comment(lib, "RVCDecoder")
-#endif
-
-#else
-#define DllImport
-#endif
-
-
-
-typedef struct {
-	int Width;
-	int Height;
-	unsigned char* pY[1];
-	unsigned char* pU[1];
-	unsigned char* pV[1];
-} RVCFRAME;
-
-
-DllImport int rvc_init(char* XDF, char* VTLFolder, int isAVCFile);
-DllImport int rvc_decode(unsigned char* nal, int nal_length, char *outBuffer, int newBuffer);
-DllImport void rvc_close();
-
-
-typedef struct
-{
-	u16 ES_ID;
-	u32 width, stride, height, out_size, pixel_ar, layer;
-	Bool first_frame;
-
-	u32 nalu_size_length;
-
-	void *codec;
-} RVCDec;
-
-
-static GF_Err RVCD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	u32 i, count;
-	s32 res;
-	char Picture;
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-	char* VTLFolder;
-	char *XDF_doc = NULL;
-	int isNALUFile;
-
-	/*not supported in this version*/
-	if (esd->dependsOnESID) return GF_NOT_SUPPORTED;
-
-	ctx->ES_ID = esd->ESID;
-	ctx->width = ctx->height = ctx->out_size = 0;
-
-	VTLFolder = (char *)gf_modules_get_option((GF_BaseInterface *)ifcg, "RVCDecoder", "VTLPath");
-	if (!VTLFolder) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Cannot locate VTL: path is unknown. Please indicate path in GPAC config file:\n[RVCDecoder]\nVTLPath=PATH\n"));
-		return GF_SERVICE_ERROR;
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[RVC Decoder] Using VTL in %s\n", VTLFolder));
-	}
-
-	/*initialize RVC*/
-	if (esd->decoderConfig->predefined_rvc_config) {
-		char opt[100], *path;
-		FILE *f;
-		u32 size;
-		sprintf(opt, "Predefined_%d", esd->decoderConfig->predefined_rvc_config);
-		path = (char *) gf_modules_get_option((GF_BaseInterface *)ifcg, "RVCDecoder", (const char *)opt);
-		if (!opt) return GF_NOT_SUPPORTED;
-		f = gf_fopen(path, "rt");
-		if (!f) return GF_NOT_SUPPORTED;
-		fseek(f, 0, SEEK_END);
-		size = ftell(f);
-		fseek(f, 0, SEEK_SET);
-		XDF_doc = gf_malloc(sizeof(char)*(size+1));
-		if (!XDF_doc) {
-			gf_fclose(f);
-			return GF_OUT_OF_MEM;
-		}
-		fread(XDF_doc, 1, size, f);
-		gf_fclose(f);
-		XDF_doc[size]=0;
-	} else {
-		if (!esd->decoderConfig->rvc_config)
-			return GF_NOT_SUPPORTED;
-		XDF_doc = esd->decoderConfig->rvc_config->data;
-	}
-
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-	case GPAC_OTI_VIDEO_SVC:
-	case GPAC_OTI_VIDEO_HEVC:
-	case GPAC_OTI_VIDEO_SHVC:
-		isNALUFile = 1;
-		break;
-	default:
-		isNALUFile = 0;
-		break;
-	}
-
-	rvc_init(XDF_doc, VTLFolder, isNALUFile); //->data contains the uncompressed XDF
-
-	/*free data*/
-	gf_free(XDF_doc);
-	if (esd->decoderConfig->rvc_config) {
-		esd->decoderConfig->rvc_config->data = NULL;
-		esd->decoderConfig->rvc_config->dataLength = 0;
-	}
-
-	/*decoder config not known, output buffers will be reconfigured at run-time*/
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
-		return GF_OK;
-
-	/*initialize the decoder */
-	if ( (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) ||  (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
-		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->nalu_size_length = cfg->nal_unit_size;
-
-		/*decode all NALUs*/
-		count = gf_list_count(cfg->sequenceParameterSets);
-		for (i=0; i<count; i++) {
-			u32 w, h, par_n, par_d;
-			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
-
-			gf_avc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
-			/*by default use the base layer*/
-			if (!i) {
-				if ((ctx->width<w) || (ctx->height<h)) {
-					ctx->width = w;
-					ctx->height = h;
-					if ( ((s32)par_n>0) && ((s32)par_d>0) )
-						ctx->pixel_ar = (par_n<<16) || par_d;
-				}
-			}
-
-			/* call decode*/
-			res = rvc_decode(slc->data, slc->size, &Picture, 1);
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding SPS %d\n", res));
-			}
-		}
-
-		count = gf_list_count(cfg->pictureParameterSets);
-		for (i=0; i<count; i++) {
-			GF_AVCConfigSlot *slc = gf_list_get(cfg->pictureParameterSets, i);
-			res = rvc_decode(slc->data, slc->size, &Picture, 1);
-			if (res<0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
-			}
-
-		}
-
-		gf_odf_avc_cfg_del(cfg);
-		/*initialize the decoder */
-	} else if ( (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) ||  (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)) {
-		GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
-		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->nalu_size_length = cfg->nal_unit_size;
-
-		/*decode all NALUs*/
-		count = gf_list_count(cfg->param_array);
-		for (i=0; i<count; i++) {
-			u32 j, count2;
-			GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
-			count2 = gf_list_count(ar->nalus);
-			for (j=0; j<count2; j++) {
-				u32 w, h, par_n, par_d;
-				GF_AVCConfigSlot *slc = gf_list_get(ar->nalus, j);
-
-				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-					gf_hevc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
-					/*by default use the base layer*/
-					if (!j) {
-						if ((ctx->width<w) || (ctx->height<h)) {
-							ctx->width = w;
-							ctx->height = h;
-							if ( ((s32)par_n>0) && ((s32)par_d>0) )
-								ctx->pixel_ar = (par_n<<16) || par_d;
-						}
-					}
-				}
-
-				/* call decode*/
-				res = rvc_decode(slc->data, slc->size, &Picture, 1);
-				if (res<0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding parameter set: %d\n", res));
-				}
-			}
-		}
-
-		gf_odf_hevc_cfg_del(cfg);
-	} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-		GF_M4VDecSpecInfo dsi;
-		GF_Err e;
-		/*decode DSI*/
-		e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-		if (e) return e;
-		if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->width = dsi.width;
-		ctx->height = dsi.height;
-		ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
-
-
-		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
-		if (res<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
-		}
-
-
-	} else {
-		/*unknown type, do what you want*/
-
-		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
-		if (res<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
-		}
-
-	}
-	/*adjust stride to what you decoder uses*/
-	ctx->stride = ctx->width;
-	/*precompute output buffer size*/
-	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-	return GF_OK;
-}
-static GF_Err RVCD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	//close RVC decoder
-	rvc_close();
-	ctx->codec = NULL;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-static GF_Err RVCD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 2;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err RVCD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	return GF_NOT_SUPPORTED;
-}
-
-
-int bookmark = 0;
-
-static GF_Err RVCD_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	s32 got_pic;
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	if (!ES_ID || (ES_ID!=ctx->ES_ID) /*|| !ctx->codec*/) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	//if your decoder outputs directly in the memory passed, setup pointers for your decoder output picture
-
-	got_pic = 0;
-
-	if (ctx->nalu_size_length) {
-		u32 i, nalu_size = 0;
-		u8 *ptr = inBuffer;
-		int nalNumber = 1;
-
-		while (inBufferLength) {
-			for (i=0; i<ctx->nalu_size_length; i++) {
-				nalu_size = (nalu_size<<8) + ptr[i];
-			}
-			ptr += ctx->nalu_size_length;
-
-			//same remark as above regardin start codes
-
-			if(nalNumber > bookmark) {
-				got_pic = rvc_decode(ptr, nalu_size, outBuffer, !got_pic);
-				bookmark ++;
-				if(got_pic>1) {
-					return GF_PACKED_FRAMES;
-				}
-			} else if(nalNumber == bookmark) {
-				got_pic = rvc_decode(NULL, 0, outBuffer, !got_pic);
-				if(got_pic>1) {
-					return GF_PACKED_FRAMES;
-				}
-			}
-			nalNumber ++;
-
-			ptr += nalu_size;
-			if (inBufferLength < nalu_size + ctx->nalu_size_length)
-				break;
-
-			inBufferLength -= nalu_size + ctx->nalu_size_length;
-		}
-		bookmark = 0;
-
-	} else {
-		u32 nalu_size = 0;
-		u8 *ptr = inBuffer;
-
-
-		got_pic = rvc_decode(ptr, inBufferLength, outBuffer, 1);
-	}
-
-	//if (got_pic!=1) return GF_OK;
-
-	/*if size changed during the decoding, resize the composition buffer*/
-	/*if ((pic.Width != ctx->width) || (pic.Height!=ctx->height))
-	{
-		ctx->width = pic.Width;
-		ctx->stride = pic.Width;
-		ctx->height = pic.Height;
-		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	*outBufferLength = ctx->out_size;*/
-
-	/*if your decoder does not output directly in the memory passed, copy over the data*/
-
-	/*memcpy(outBuffer, pic.pY[0], ctx->stride*ctx->height);
-	memcpy(outBuffer + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
-	memcpy(outBuffer + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);*/
-
-	if(got_pic>1) return GF_PACKED_FRAMES;
-	return GF_OK;
-}
-
-static u32 RVCD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-	case GPAC_OTI_VIDEO_SVC:
-	case GPAC_OTI_VIDEO_MPEG4_PART2:
-	case GPAC_OTI_VIDEO_HEVC:
-	case GPAC_OTI_VIDEO_SHVC:
-		if (!esd->decoderConfig->rvc_config && !esd->decoderConfig->predefined_rvc_config) return GF_CODEC_NOT_SUPPORTED;
-		return GF_CODEC_SUPPORTED+1;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *RVCD_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "Reconfigurable Video Decoder";
-}
-
-GF_BaseDecoder *NewRVCDec()
-{
-	GF_MediaDecoder *ifcd;
-	RVCDec *dec;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	GF_SAFEALLOC(dec, RVCDec);
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "RVC Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = RVCD_AttachStream;
-	ifcd->DetachStream = RVCD_DetachStream;
-	ifcd->GetCapabilities = RVCD_GetCapabilities;
-	ifcd->SetCapabilities = RVCD_SetCapabilities;
-	ifcd->GetName = RVCD_GetCodecName;
-	ifcd->CanHandleStream = RVCD_CanHandleStream;
-	ifcd->ProcessData = RVCD_ProcessData;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteRVCDec(GF_BaseDecoder *ifcg)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewRVCDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteRVCDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( rev_dec )

gpac-0.8.0.tar.gz/modules/saf_in Deleted

gpac-0.8.0.tar.gz/modules/saf_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/saf_in/saf_in.c Deleted

@@ -1,645 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / SAF reader module
- *
- *  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/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-#include <gpac/thread.h>
-
-typedef struct
-{
-	LPNETCHANNEL ch;
-	u32 au_sn, stream_id, ts_res, buffer_min;
-	GF_ESD *esd;
-} SAFChannel;
-
-enum
-{
-	SAF_FILE_LOCAL,
-	SAF_FILE_REMOTE,
-	SAF_LIVE_STREAM
-};
-
-typedef struct
-{
-	GF_ClientService *service;
-	GF_List *channels;
-	Bool needs_connection;
-
-	u32 saf_type;
-
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-
-	/*SAF buffer for both lcoal, remote and live streams*/
-	char *saf_data;
-	u32 saf_size, alloc_size;
-
-	/*local file playing*/
-	GF_Thread *th;
-	FILE *stream;
-	u32 run_state;
-	u32 start_range, end_range;
-	Double duration;
-	u32 nb_playing;
-} SAFIn;
-
-static GFINLINE SAFChannel *saf_get_channel(SAFIn *saf, u32 stream_id, LPNETCHANNEL a_ch)
-{
-	SAFChannel *ch;
-	u32 i=0;
-	while ((ch = (SAFChannel *)gf_list_enum(saf->channels, &i))) {
-		if (ch->stream_id==stream_id) return ch;
-		if (a_ch && (ch->ch==a_ch)) return ch;
-	}
-	return NULL;
-}
-
-static const char * SAF_MIME = "application/x-saf";
-
-static const char * SAF_MIME_EXT = "saf lsr";
-
-static const char * SAF_MIME_DESC = "SAF Rich Media";
-
-static u32 SAF_RegisterMimeTypes(const GF_InputService *plug)
-{
-	if (!plug)
-		return 0;
-	gf_service_register_mime(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC);
-	return 1;
-}
-
-static Bool SAF_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (gf_service_check_mime_register(plug, SAF_MIME, SAF_MIME_EXT, SAF_MIME_DESC, sExt)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-static void SAF_Regulate(SAFIn *read)
-{
-	GF_NetworkCommand com;
-	SAFChannel *ch;
-
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
-	/*sleep untill the buffer occupancy is too low - note that this work because all streams in this
-	demuxer are synchronized*/
-	while (read->run_state) {
-		u32 min_occ = (u32) -1;
-		u32 i=0;
-		while ( (ch = (SAFChannel *)gf_list_enum(read->channels, &i))) {
-			com.base.on_channel = ch->ch;
-			gf_service_command(read->service, &com, GF_OK);
-			if (com.buffer.occupancy < ch->buffer_min) return;
-			if (com.buffer.occupancy) min_occ = MIN(min_occ, com.buffer.occupancy - ch->buffer_min);
-		}
-		if (min_occ == (u32) -1) break;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[SAF] Regulating SAF demux - sleeping for %d ms\n", min_occ));
-		gf_sleep(min_occ);
-	}
-}
-
-static void SAF_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	Bool is_rap, go;
-	SAFChannel *ch;
-	u32 cts, au_sn, au_size, type, i, stream_id;
-	u64 bs_pos;
-	GF_BitStream *bs;
-	GF_SLHeader sl_hdr;
-
-	SAFIn *read = (SAFIn *) cbk;
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		if (read->stream && (read->saf_type==SAF_FILE_REMOTE)) read->saf_type = SAF_FILE_LOCAL;
-		return;
-	} else {
-		/*handle service message*/
-		gf_service_download_update_stats(read->dnload);
-		if (param->msg_type!=GF_NETIO_DATA_EXCHANGE) {
-			if (e<0) {
-				if (read->needs_connection) {
-					read->needs_connection = GF_FALSE;
-					gf_service_connect_ack(read->service, NULL, e);
-				}
-				return;
-			}
-			if (read->needs_connection) {
-				u32 total_size;
-				gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, NULL);
-				if (!total_size) read->saf_type = SAF_LIVE_STREAM;
-			}
-			return;
-		}
-	}
-	if (!param->size) return;
-
-	if (!read->run_state) return;
-
-	if (read->alloc_size < read->saf_size + param->size) {
-		read->saf_data = (char*)gf_realloc(read->saf_data, sizeof(char)*(read->saf_size + param->size) );
-		read->alloc_size = read->saf_size + param->size;
-	}
-	memcpy(read->saf_data + read->saf_size, param->data, sizeof(char)*param->size);
-	read->saf_size += param->size;
-
-	/*first AU not complete yet*/
-	if (read->saf_size<10) return;
-
-	bs = gf_bs_new(read->saf_data, read->saf_size, GF_BITSTREAM_READ);
-	bs_pos = 0;
-
-	go = GF_TRUE;
-	while (go) {
-		u64 avail = gf_bs_available(bs);
-		bs_pos = gf_bs_get_position(bs);
-
-		if (avail<10) break;
-
-		is_rap = (Bool)gf_bs_read_int(bs, 1);
-		au_sn = gf_bs_read_int(bs, 15);
-		gf_bs_read_int(bs, 2);
-		cts = gf_bs_read_int(bs, 30);
-		au_size = gf_bs_read_int(bs, 16);
-		avail-=8;
-
-		if (au_size > avail) break;
-		assert(au_size>=2);
-
-		type = gf_bs_read_int(bs, 4);
-		stream_id = gf_bs_read_int(bs, 12);
-		au_size -= 2;
-
-		ch = saf_get_channel(read, stream_id, NULL);
-		switch (type) {
-		case 1:
-		case 2:
-		case 7:
-			if (ch) {
-				gf_bs_skip_bytes(bs, au_size);
-			} else {
-				SAFChannel *first = (SAFChannel *)gf_list_get(read->channels, 0);
-				GF_SAFEALLOC(ch, SAFChannel);
-				if (!ch) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SAF] Failed to allocate SAF channel"));
-					gf_bs_del(bs);
-					return;
-				}
-				ch->stream_id = stream_id;
-				ch->esd = gf_odf_desc_esd_new(0);
-				ch->esd->ESID = stream_id;
-				ch->esd->OCRESID = first ? first->stream_id : stream_id;
-				ch->esd->slConfig->useRandomAccessPointFlag = 1;
-				ch->esd->slConfig->AUSeqNumLength = 0;
-				ch->esd->decoderConfig->objectTypeIndication = gf_bs_read_u8(bs);
-				ch->esd->decoderConfig->streamType = gf_bs_read_u8(bs);
-				ch->ts_res = ch->esd->slConfig->timestampResolution = gf_bs_read_u24(bs);
-				ch->esd->decoderConfig->bufferSizeDB = gf_bs_read_u16(bs);
-				au_size -= 7;
-				if ((ch->esd->decoderConfig->objectTypeIndication == 0xFF) && (ch->esd->decoderConfig->streamType == 0xFF) ) {
-					u16 mimeLen = gf_bs_read_u16(bs);
-					gf_bs_skip_bytes(bs, mimeLen);
-					au_size -= mimeLen+2;
-				}
-				if (type==7) {
-					u16 urlLen = gf_bs_read_u16(bs);
-					ch->esd->URLString = (char*)gf_malloc(sizeof(char)*(urlLen+1));
-					gf_bs_read_data(bs, ch->esd->URLString, urlLen);
-					ch->esd->URLString[urlLen] = 0;
-					au_size -= urlLen+2;
-				}
-				if (au_size) {
-					ch->esd->decoderConfig->decoderSpecificInfo->dataLength = au_size;
-					ch->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*au_size);
-					gf_bs_read_data(bs, ch->esd->decoderConfig->decoderSpecificInfo->data, au_size);
-				}
-				if (ch->esd->decoderConfig->streamType==4) ch->buffer_min=100;
-				else if (ch->esd->decoderConfig->streamType==5) ch->buffer_min=400;
-				else ch->buffer_min=0;
-
-				if (read->needs_connection && (ch->esd->decoderConfig->streamType==GF_STREAM_SCENE)) {
-					gf_list_add(read->channels, ch);
-					read->needs_connection = GF_FALSE;
-					gf_service_connect_ack(read->service, NULL, GF_OK);
-				} else if (read->needs_connection) {
-					gf_odf_desc_del((GF_Descriptor *) ch->esd);
-					gf_free(ch);
-					ch = NULL;
-				} else {
-					GF_ObjectDescriptor *od;
-					gf_list_add(read->channels, ch);
-
-					od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-					gf_list_add(od->ESDescriptors, ch->esd);
-					ch->esd = NULL;
-					od->objectDescriptorID = ch->stream_id;
-					gf_service_declare_media(read->service, (GF_Descriptor*)od, GF_FALSE);
-
-				}
-			}
-			break;
-		case 4:
-			//don't dispatch anything until we have a play request
-			while (!read->nb_playing) {
-				if (read->run_state==0) {
-					gf_bs_del(bs);
-					return;
-				}
-				gf_sleep(1);
-			}
-			
-			if (ch) {
-				bs_pos = gf_bs_get_position(bs);
-				memset(&sl_hdr, 0, sizeof(GF_SLHeader));
-				sl_hdr.accessUnitLength = au_size;
-				sl_hdr.AU_sequenceNumber = au_sn;
-				sl_hdr.compositionTimeStampFlag = 1;
-				sl_hdr.compositionTimeStamp = cts;
-				sl_hdr.randomAccessPointFlag = is_rap;
-				if (read->start_range && (read->start_range*ch->ts_res>cts*1000)) {
-					sl_hdr.compositionTimeStamp = read->start_range*ch->ts_res/1000;
-				}
-				gf_service_send_packet(read->service, ch->ch, read->saf_data+bs_pos, au_size, &sl_hdr, GF_OK);
-			}
-			gf_bs_skip_bytes(bs, au_size);
-			break;
-		case 3:
-			if (ch) gf_service_send_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
-			break;
-		case 5:
-			go = GF_FALSE;
-			read->run_state = 0;
-			i=0;
-			while ((ch = (SAFChannel *)gf_list_enum(read->channels, &i))) {
-				gf_service_send_packet(read->service, ch->ch, NULL, 0, NULL, GF_EOS);
-			}
-			break;
-		}
-	}
-
-	gf_bs_del(bs);
-	if (bs_pos) {
-		u32 remain = (u32) (read->saf_size - bs_pos);
-		if (remain) memmove(read->saf_data, read->saf_data+bs_pos, sizeof(char)*remain);
-		read->saf_size = remain;
-	}
-	SAF_Regulate(read);
-}
-
-
-u32 SAF_Run(void *_p)
-{
-	GF_NETIO_Parameter par;
-	char data[1024];
-	SAFIn *read = (SAFIn *)_p;
-
-	par.msg_type = GF_NETIO_DATA_EXCHANGE;
-	par.data = data;
-
-	gf_fseek(read->stream, 0, SEEK_SET);
-	read->saf_size=0;
-	read->run_state = 1;
-	while (read->run_state && !feof(read->stream) ) {
-		par.size = (u32) fread(data, 1, 1024, read->stream);
-		if ((s32) par.size <= 0) break;
-		SAF_NetIO(read, &par);
-	}
-	read->run_state = 2;
-	return 0;
-}
-
-static void SAF_DownloadFile(GF_InputService *plug, char *url)
-{
-	SAFIn *read = (SAFIn*) plug->priv;
-
-	read->dnload = gf_service_download_new(read->service, url, 0, SAF_NetIO, read);
-	if (!read->dnload) {
-		read->needs_connection = GF_FALSE;
-		gf_service_connect_ack(read->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(read->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-typedef struct
-{
-	u32 stream_id;
-	u32 ts_res;
-} StreamInfo;
-
-static void SAF_CheckFile(SAFIn *read)
-{
-	u32 nb_streams, i, cts, au_size, au_type, stream_id, ts_res;
-	GF_BitStream *bs;
-	StreamInfo si[1024];
-	gf_fseek(read->stream, 0, SEEK_SET);
-	bs = gf_bs_from_file(read->stream, GF_BITSTREAM_READ);
-
-	nb_streams=0;
-	while (gf_bs_available(bs)) {
-		gf_bs_read_u16(bs);
-		gf_bs_read_int(bs, 2);
-		cts = gf_bs_read_int(bs, 30);
-		au_size = gf_bs_read_int(bs, 16);
-		au_type = gf_bs_read_int(bs, 4);
-		stream_id = gf_bs_read_int(bs, 12);
-		au_size-=2;
-		ts_res = 0;
-		for (i=0; i<nb_streams; i++) {
-			if (si[i].stream_id==stream_id) ts_res = si[i].ts_res;
-		}
-		if (!ts_res) {
-			if ((au_type==1) || (au_type==2) || (au_type==7)) {
-				gf_bs_read_u16(bs);
-				ts_res = gf_bs_read_u24(bs);
-				au_size -= 5;
-				si[nb_streams].stream_id = stream_id;
-				si[nb_streams].ts_res = ts_res;
-				nb_streams++;
-			}
-		}
-		if (ts_res && (au_type==4)) {
-			Double ts = cts;
-			ts /= ts_res;
-			if (ts>read->duration) read->duration = ts;
-		}
-		gf_bs_skip_bytes(bs, au_size);
-	}
-	gf_bs_del(bs);
-	gf_fseek(read->stream, 0, SEEK_SET);
-}
-
-static GF_Err SAF_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	char szURL[2048];
-	char *ext;
-	SAFIn *read = (SAFIn *)plug->priv;
-	read->service = serv;
-
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-
-	strcpy(szURL, url);
-	ext = strrchr(szURL, '#');
-	if (ext) ext[0] = 0;
-
-	read->needs_connection = GF_TRUE;
-	read->duration = 0;
-
-	read->saf_type = SAF_FILE_LOCAL;
-	/*remote fetch*/
-	if (strnicmp(url, "file://", 7) && strstr(url, "://")) {
-		read->saf_type = SAF_FILE_REMOTE;
-		SAF_DownloadFile(plug, (char *) szURL);
-		return GF_OK;
-	}
-
-	read->stream = gf_fopen(szURL, "rb");
-	if (!read->stream) {
-		gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
-		return GF_OK;
-	}
-	SAF_CheckFile(read);
-	read->th = gf_th_new("SAFDemux");
-	/*start playing for tune-in*/
-	gf_th_run(read->th, SAF_Run, read);
-	return GF_OK;
-}
-
-static GF_Err SAF_CloseService(GF_InputService *plug)
-{
-	SAFIn *read = (SAFIn *)plug->priv;
-
-	if (read->th) {
-		if (read->run_state == 1) {
-			read->run_state=0;
-			while (read->run_state!=2) gf_sleep(2);
-		}
-		gf_th_del(read->th);
-		read->th = NULL;
-	}
-
-	if (read->stream) gf_fclose(read->stream);
-	read->stream = NULL;
-	if (read->dnload) gf_service_download_del(read->dnload);
-	read->dnload = NULL;
-	gf_service_disconnect_ack(read->service, NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *SAF_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	u32 i=0;
-	SAFChannel *root;
-	SAFIn *read = (SAFIn *)plug->priv;
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
-
-	od->objectDescriptorID = 1;
-
-	while ( (root = (SAFChannel *)gf_list_enum(read->channels, &i))) {
-		if (root->esd && (root->esd->decoderConfig->streamType==GF_STREAM_SCENE)) break;
-	}
-	if (!root) return NULL;
-
-	/*inline scene*/
-	gf_list_add(od->ESDescriptors, root->esd);
-	root->esd = NULL;
-	return (GF_Descriptor *) od;
-}
-
-static GF_Err SAF_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID;
-	SAFChannel *ch;
-	GF_Err e;
-	SAFIn *read = (SAFIn *)plug->priv;
-
-
-	ch = saf_get_channel(read, 0, channel);
-	if (ch) {
-		e = GF_SERVICE_ERROR;
-	} else {
-		e = GF_STREAM_NOT_FOUND;
-		if (strstr(url, "ES_ID")) {
-			sscanf(url, "ES_ID=%d", &ES_ID);
-			ch = saf_get_channel(read, ES_ID, NULL);
-			if (ch && !ch->ch) {
-				ch->ch = channel;
-				e = GF_OK;
-			}
-		}
-	}
-
-	gf_service_connect_ack(read->service, channel, e);
-	return e;
-}
-
-static GF_Err SAF_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	SAFChannel *ch;
-	SAFIn *read = (SAFIn *)plug->priv;
-
-	GF_Err e = GF_STREAM_NOT_FOUND;
-	ch = saf_get_channel(read, 0, channel);
-	if (ch) {
-		gf_list_del_item(read->channels, ch);
-		if (ch->esd) gf_odf_desc_del((GF_Descriptor*)ch->esd);
-		gf_free(ch);
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(read->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err SAF_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	SAFIn *read = (SAFIn *)plug->priv;
-
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PULL:
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_OK;
-	case GF_NET_CHAN_BUFFER:
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = read->duration;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		if (!read->nb_playing) {
-			read->start_range = (u32) (com->play.start_range*1000);
-			read->end_range = (u32) (com->play.end_range*1000);
-			/*start demuxer*/
-			if ((read->saf_type == SAF_FILE_LOCAL) && (read->run_state!=1)) {
-				gf_th_run(read->th, SAF_Run, read);
-			}
-		}
-		read->nb_playing++;
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		assert(read->nb_playing);
-		read->nb_playing--;
-		/*stop demuxer*/
-		if (!read->nb_playing && (read->run_state==1)) {
-			read->run_state=0;
-			while (read->run_state!=2) gf_sleep(2);
-		}
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-GF_InputService *NewSAFReader()
-{
-	SAFIn *reader;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC SAF Reader", "gpac distribution")
-
-	GF_SAFEALLOC(reader, SAFIn);
-	if (!reader) {
-		gf_free(plug);
-		return NULL;
-	}
-
-	plug->RegisterMimeTypes = SAF_RegisterMimeTypes;
-	plug->CanHandleURL = SAF_CanHandleURL;
-	plug->ConnectService = SAF_ConnectService;
-	plug->CloseService = SAF_CloseService;
-	plug->GetServiceDescriptor = SAF_GetServiceDesc;
-	plug->ConnectChannel = SAF_ConnectChannel;
-	plug->DisconnectChannel = SAF_DisconnectChannel;
-	plug->ServiceCommand = SAF_ServiceCommand;
-
-	reader->channels = gf_list_new();
-	plug->priv = reader;
-	return plug;
-}
-
-void DeleteSAFReader(void *ifce)
-{
-	GF_InputService *plug = (GF_InputService *) ifce;
-	SAFIn *read = (SAFIn *)plug->priv;
-	if (!ifce)
-		return;
-	while (gf_list_count(read->channels)) {
-		SAFChannel *ch = (SAFChannel *)gf_list_last(read->channels);
-		gf_list_rem_last(read->channels);
-		if (ch->esd) gf_odf_desc_del((GF_Descriptor *) ch->esd);
-		gf_free(ch);
-	}
-	gf_list_del(read->channels);
-	if (read->saf_data)
-		gf_free(read->saf_data);
-	read->saf_data = NULL;
-	gf_free(read);
-	plug->priv = NULL;
-	gf_free(plug);
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *) NewSAFReader();
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteSAFReader(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( saf_in )

gpac-0.8.0.tar.gz/modules/soft_raster Deleted

gpac-0.8.0.tar.gz/modules/soft_raster/Makefile Deleted

@@ -1,55 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/soft_raster
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#big-endian config (needed for ARGB pixel format)
-ifeq ($(IS_BIGENDIAN), yes)
-CFLAGS+=-DEVG_BIG_ENDIAN
-endif
-
-
-#common obj
-OBJS= ftgrays.o raster_load.o raster_565.o raster_argb.o raster_rgb.o stencil.o surface.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_soft_raster$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols rast_soft.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_soft_raster-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
-endif
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/soft_raster/ftgrays.c Deleted

@@ -1,782 +0,0 @@
-/***************************************************************************/
-/*                                                                         */
-/*  ftgrays.c                                                              */
-/*                                                                         */
-/*    A new `perfect' anti-aliasing renderer (body).                       */
-/*                                                                         */
-/*  Copyright 2000-2001, 2002 by                                           */
-/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
-/*                                                                         */
-/*  This file is part of the FreeType project, and may only be used,       */
-/*  modified, and distributed under the terms of the FreeType project      */
-/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
-/*  this file you indicate that you have read the license and              */
-/*  understand and accept it fully.                                        */
-/*                                                                         */
-/***************************************************************************/
-
-/*************************************************************************/
-/*                                                                       */
-/* This is a new anti-aliasing scan-converter for FreeType 2.  The       */
-/* algorithm used here is _very_ different from the one in the standard  */
-/* `ftraster' module.  Actually, `ftgrays' computes the _exact_          */
-/* coverage of the outline on each pixel cell.                           */
-/*                                                                       */
-/* It is based on ideas that I initially found in Raph Levien's          */
-/* excellent LibArt graphics library (see http://www.levien.com/libart   */
-/* for more information, though the web pages do not tell anything       */
-/* about the renderer; you'll have to dive into the source code to       */
-/* understand how it works).                                             */
-/*                                                                       */
-/* Note, however, that this is a _very_ different implementation         */
-/* compared to Raph's.  Coverage information is stored in a very         */
-/* different way, and I don't use sorted vector paths.  Also, it doesn't */
-/* use floating point values.                                            */
-/*                                                                       */
-/* This renderer has the following advantages:                           */
-/*                                                                       */
-/* - It doesn't need an intermediate bitmap.  Instead, one can supply a  */
-/*   callback function that will be called by the renderer to draw gray  */
-/*   spans on any target surface.  You can thus do direct composition on */
-/*   any kind of bitmap, provided that you give the renderer the right   */
-/*   callback.                                                           */
-/*                                                                       */
-/* - A perfect anti-aliaser, i.e., it computes the _exact_ coverage on   */
-/*   each pixel cell.                                                    */
-/*                                                                       */
-/* - It performs a single pass on the outline (the `standard' FT2        */
-/*   renderer makes two passes).                                         */
-/*                                                                       */
-/* - It can easily be modified to render to _any_ number of gray levels  */
-/*   cheaply.                                                            */
-/*                                                                       */
-/* - For small (< 20) pixel sizes, it is faster than the standard        */
-/*   renderer.                                                           */
-/*                                                                       */
-/*************************************************************************/
-
-
-/*
-	GPAC version modifications:
-		* removed all cubic/quadratic support (present in GPAC path objects)
-		* moved span data memoru to dynamic allocation
-		* bypassed Y-sorting of cells by using an array of scanlines: a bit more consuming
-		in memory, but faster cell sorting (X-sorting only)
-*/
-
-#include "rast_soft.h"
-
-#include <limits.h>
-
-#define ErrRaster_MemoryOverflow   -4
-#define ErrRaster_Invalid_Mode     -2
-#define ErrRaster_Invalid_Outline  -1
-
-
-#define GPAC_FIX_BITS		16
-#define PIXEL_BITS  8
-#define PIXEL_BITS_DIFF 8	/*GPAC_FIX_BITS - PIXEL_BITS*/
-
-#define ONE_PIXEL       ( 1L << PIXEL_BITS )
-#define PIXEL_MASK      ( -1L << PIXEL_BITS )
-#define TRUNC( x )      ( (TCoord)((x) >> PIXEL_BITS) )
-#define SUBPIXELS( x )  ( (TPos)(x) << PIXEL_BITS )
-#define FLOOR( x )      ( (x) & -ONE_PIXEL )
-#define CEILING( x )    ( ( (x) + ONE_PIXEL - 1 ) & -ONE_PIXEL )
-#define ROUND( x )      ( ( (x) + ONE_PIXEL / 2 ) & -ONE_PIXEL )
-#define UPSCALE( x )    ( (x) >> ( PIXEL_BITS_DIFF) )
-#define DOWNSCALE( x )  ( (x) << ( PIXEL_BITS_DIFF) )
-
-
-/*************************************************************************/
-/*                                                                       */
-/*   TYPE DEFINITIONS                                                    */
-/*                                                                       */
-
-/* don't change the following types to FT_Int or FT_Pos, since we might */
-/* need to define them to "float" or "double" when experimenting with   */
-/* new algorithms                                                       */
-
-typedef int   TCoord;   /* integer scanline/pixel coordinate */
-typedef long  TPos;     /* sub-pixel coordinate              */
-
-/* determine the type used to store cell areas.  This normally takes at */
-/* least PIXEL_BYTES*2 + 1.  On 16-bit systems, we need to use `long'   */
-/* instead of `int', otherwise bad things happen                        */
-
-/* approximately determine the size of integers using an ANSI-C header */
-#if UINT_MAX == 0xFFFFU
-typedef long  TArea;
-#else
-typedef int  TArea;
-#endif
-
-
-/* maximal number of gray spans in a call to the span callback */
-#define FT_MAX_GRAY_SPANS  64
-
-typedef struct  TCell_
-{
-	TCoord  x;
-	int     cover;
-	TArea   area;
-} AACell;
-
-typedef struct
-{
-	AACell *cells;
-	int alloc, num;
-} AAScanline;
-
-
-typedef struct  TRaster_
-{
-	AAScanline *scanlines;
-	int max_lines;
-	TPos min_ex, max_ex, min_ey, max_ey;
-	TCoord ex, ey;
-	TPos x,  y, last_ey;
-	TArea area;
-	int cover;
-
-	EVG_Span gray_spans[FT_MAX_GRAY_SPANS];
-	int num_gray_spans;
-	EVG_Raster_Span_Func  render_span;
-	void *render_span_data;
-
-#ifdef INLINE_POINT_CONVERSION
-	GF_Matrix2D *mx;
-#endif
-} TRaster;
-
-#define AA_CELL_STEP_ALLOC	8
-
-static GFINLINE void gray_record_cell( TRaster *raster )
-{
-	if (( raster->area | raster->cover) && (raster->ey<raster->max_ey)) {
-		AACell *cell;
-		long y = raster->ey - raster->min_ey;
-		if (y>=0) {
-			AAScanline *sl = &raster->scanlines[y];
-			if (sl->num >= sl->alloc) {
-				sl->cells = (AACell*)gf_realloc(sl->cells, sizeof(AACell)* (sl->alloc + AA_CELL_STEP_ALLOC));
-				sl->alloc += AA_CELL_STEP_ALLOC;
-			}
-			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;
-		}
-	}
-}
-
-static GFINLINE void gray_set_cell( TRaster *raster, 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;
-	}
-}
-
-
-#ifdef INLINE_POINT_CONVERSION
-
-static GFINLINE void evg_translate_point(GF_Matrix2D *mx, EVG_Vector *pt, TPos *x, TPos *y)
-{
-	Fixed _x, _y;
-	_x = pt->x;
-	_y = pt->y;
-	gf_mx2d_apply_coords(mx, &_x, &_y);
-#ifdef GPAC_FIXED_POINT
-	*x = UPSCALE(_x);
-	*y = UPSCALE(_y);
-#else
-	*x = (s32) (_x * ONE_PIXEL);
-	*y = (s32) (_y * ONE_PIXEL);
-#endif
-}
-#endif
-
-static GFINLINE int gray_move_to( EVG_Vector*  to, EVG_Raster   raster)
-{
-	TPos  x, y;
-	TCoord  ex, ey;
-
-	/* record current cell, if any */
-	gray_record_cell(raster);
-
-#ifdef INLINE_POINT_CONVERSION
-	evg_translate_point(raster->mx, to, &x, &y);
-#else
-	x = UPSCALE( to->x );
-	y = UPSCALE( to->y );
-#endif
-	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 (ey<0) ey=0;
-	raster->last_ey = SUBPIXELS( ey );
-
-	raster->x = x;
-	raster->y = y;
-	return 0;
-}
-
-/*************************************************************************/
-/*                                                                       */
-/* 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)
-{
-	TCoord  ex1, ex2, fx1, fx2, delta;
-	long    p, first;
-	long dx;
-	int     incr, lift, mod, rem;
-
-	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 ) );
-
-	/* trivial case.  Happens often */
-	if ( y1 == y2 ) {
-		gray_set_cell( raster, 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;
-		return;
-	}
-
-	/* ok, we'll have to render a run of adjacent cells on the same */
-	/* scanline...                                                  */
-	p     = ( ONE_PIXEL - fx1 ) * ( y2 - y1 );
-	first = ONE_PIXEL;
-	incr  = 1;
-
-	if ( dx < 0 ) {
-		p     = fx1 * ( y2 - y1 );
-		first = 0;
-		incr  = -1;
-		dx    = -dx;
-	}
-	delta = (TCoord)( p / dx );
-	mod   = (TCoord)( p % dx );
-	if ( mod < 0 ) {
-		delta--;
-		mod += (TCoord)dx;
-	}
-	raster->area  += (TArea)( fx1 + first ) * delta;
-	raster->cover += delta;
-
-	ex1 += incr;
-	gray_set_cell( raster, ex1, ey );
-	y1  += delta;
-
-	if ( ex1 != ex2 ) {
-		p     = ONE_PIXEL * ( y2 - y1 + delta );
-		lift  = (TCoord)( p / dx );
-		rem   = (TCoord)( p % dx );
-		if ( rem < 0 ) {
-			lift--;
-			rem += (TCoord)dx;
-		}
-		mod -= (int) dx;
-
-		while ( ex1 != ex2 ) {
-			delta = lift;
-			mod  += rem;
-			if ( mod >= 0 ) {
-				mod -= (TCoord)dx;
-				delta++;
-			}
-
-			raster->area  += (TArea)ONE_PIXEL * delta;
-			raster->cover += delta;
-			y1        += delta;
-			ex1       += incr;
-			gray_set_cell( raster, ex1, ey );
-		}
-	}
-	delta      = y2 - y1;
-	raster->area  += (TArea)( fx2 + ONE_PIXEL - first ) * delta;
-	raster->cover += delta;
-}
-
-
-/*************************************************************************/
-/*                                                                       */
-/* Render a given line as a series of scanlines.                         */
-static GFINLINE void gray_render_line(TRaster *raster, TPos  to_x, TPos  to_y, int is_line)
-{
-	TCoord  min, max;
-	TCoord  ey1, ey2, fy1, fy2;
-	TPos    x, x2;
-	long dx, dy;
-	long    p, first;
-	int     delta, rem, mod, lift, incr;
-
-	/*point filtering*/
-#if 0
-	if (is_line) {
-		dx = (to_x - raster->x)>>PIXEL_BITS;
-		dy = (to_y - raster->y)>>PIXEL_BITS;
-		if ( dx*dx + dy*dy < 1) return;
-	}
-#endif
-
-
-	ey1 = TRUNC( raster->last_ey );
-	ey2 = TRUNC( to_y ); /* if (ey2 >= raster->max_ey) ey2 = raster->max_ey-1; */
-	if (ey2<0) ey2=0;
-	fy1 = (TCoord)( raster->y - raster->last_ey );
-	fy2 = (TCoord)( to_y - SUBPIXELS( ey2 ) );
-
-	dx = to_x - raster->x;
-	dy = to_y - raster->y;
-
-	/* perform vertical clipping */
-	min = ey1;
-	max = ey2;
-	if ( ey1 > ey2 ) {
-		min = ey2;
-		max = ey1;
-	}
-	if ( min >= raster->max_ey || max < raster->min_ey ) goto End;
-
-	/* everything is on a single scanline */
-	if ( ey1 == ey2 ) {
-		gray_render_scanline( raster, ey1, raster->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 );
-		TPos    area;
-
-		first = ONE_PIXEL;
-		if ( dy < 0 ) {
-			first = 0;
-			incr  = -1;
-		}
-
-		delta      = (int)( first - fy1 );
-		raster->area  += (TArea)two_fx * delta;
-		raster->cover += delta;
-		ey1       += incr;
-
-		gray_set_cell( raster, ex, ey1 );
-
-		delta = (int)( first + first - ONE_PIXEL );
-		area  = (TArea)two_fx * delta;
-		while ( ey1 != ey2 ) {
-			raster->area  += area;
-			raster->cover += delta;
-			ey1       += incr;
-			gray_set_cell( raster, ex, ey1 );
-		}
-		delta      = (int)( fy2 - ONE_PIXEL + first );
-		raster->area  += (TArea)two_fx * delta;
-		raster->cover += delta;
-		goto End;
-	}
-	/* ok, we have to render several scanlines */
-	p     = ( ONE_PIXEL - fy1 ) * dx;
-	first = ONE_PIXEL;
-	incr  = 1;
-
-	if ( dy < 0 ) {
-		p     = fy1 * dx;
-		first = 0;
-		incr  = -1;
-		dy    = -dy;
-	}
-
-	delta = (int)( p / dy );
-	mod   = (int)( p % dy );
-	if ( mod < 0 ) {
-		delta--;
-		mod += (TCoord)dy;
-	}
-	x = raster->x + delta;
-	gray_render_scanline( raster, ey1, raster->x, fy1, x, (TCoord)first );
-
-	ey1 += incr;
-	gray_set_cell( raster, TRUNC( x ), ey1 );
-
-	if ( ey1 != ey2 ) {
-		p     = ONE_PIXEL * dx;
-		lift  = (int)( p / dy );
-		rem   = (int)( p % dy );
-		if ( rem < 0 ) {
-			lift--;
-			rem += (int)dy;
-		}
-		mod -= (int)dy;
-
-		while ( ey1 != ey2 ) {
-			delta = lift;
-			mod  += rem;
-			if ( mod >= 0 )	{
-				mod -= (int)dy;
-				delta++;
-			}
-
-			x2 = x + delta;
-			gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), x2, (TCoord)first );
-			x = x2;
-
-			ey1 += incr;
-			gray_set_cell( raster, TRUNC( x ), ey1 );
-		}
-	}
-
-	gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), to_x, fy2 );
-
-End:
-	raster->x       = to_x;
-	raster->y       = to_y;
-	raster->last_ey = SUBPIXELS( ey2 );
-}
-
-
-
-static int EVG_Outline_Decompose(EVG_Outline *outline, TRaster *user)
-{
-	EVG_Vector   v_start;
-	EVG_Vector*  point;
-	EVG_Vector*  limit;
-	char*       tags;
-	int   n;         /* index of contour in outline     */
-	int   first;     /* index of first point in contour */
-#ifdef INLINE_POINT_CONVERSION
-	TPos _x, _y;
-#endif
-
-	first = 0;
-	for ( n = 0; n < outline->n_contours; n++ ) {
-		int  last;  /* index of last point in contour */
-		last  = outline->contours[n];
-		limit = outline->points + last;
-		v_start = outline->points[first];
-		point = outline->points + first;
-		tags  = (char*) outline->tags  + first;
-		gray_move_to(&v_start, user);
-		while ( point < limit ) {
-			point++;
-			tags++;
-#ifdef INLINE_POINT_CONVERSION
-			evg_translate_point(user->mx, point, &_x, &_y);
-			gray_render_line(user, _x, _y, 1);
-#else
-			gray_render_line(user, UPSCALE(point->x), UPSCALE( point->y), 1);
-#endif
-		}
-#ifdef INLINE_POINT_CONVERSION
-		evg_translate_point(user->mx, &v_start, &_x, &_y);
-		gray_render_line(user, _x, _y, 0);
-#else
-		/* close the contour with a line segment */
-		gray_render_line(user, UPSCALE(v_start.x), UPSCALE( v_start.y), 0);
-#endif
-		first = last + 1;
-	}
-	return 0;
-}
-
-
-
-#define SWAP_CELLS( a, b, temp )  {              \
-                                    temp = *(a); \
-                                    *(a) = *(b); \
-                                    *(b) = temp; \
-                                  }
-
-
-/* This is a non-recursive quicksort that directly process our cells     */
-/* array.  It should be faster than calling the stdlib qsort(), and we   */
-/* can even tailor our insertion threshold...                            */
-
-#define QSORT_THRESHOLD  9  /* below this size, a sub-array will be sorted */
-/* through a normal insertion sort             */
-
-static void gray_quick_sort( AACell *cells, int    count )
-{
-	AACell *stack[80];  /* should be enough ;-) */
-	AACell **top;        /* top of stack */
-	AACell *base, *limit;
-	AACell temp;
-
-	limit = cells + count;
-	base  = cells;
-	top   = stack;
-
-	for (;;) {
-		int    len = (int)( limit - base );
-		AACell *i, *j, *pivot;
-		if ( len > QSORT_THRESHOLD ) {
-			/* we use base + len/2 as the pivot */
-			pivot = base + len / 2;
-			SWAP_CELLS( base, pivot, temp );
-
-			i = base + 1;
-			j = limit - 1;
-
-			/* now ensure that *i <= *base <= *j */
-			if(j->x < i->x)
-				SWAP_CELLS( i, j, temp );
-
-			if(base->x < i->x)
-				SWAP_CELLS( base, i, temp );
-
-			if(j->x < base->x)
-				SWAP_CELLS( base, j, temp );
-
-			for (;;) {
-				int x = base->x;
-				do i++;
-				while( i->x < x );
-				do j--;
-				while( x < j->x );
-
-				if ( i > j )
-					break;
-
-				SWAP_CELLS( i, j, temp );
-			}
-
-			SWAP_CELLS( base, j, temp );
-
-			/* now, push the largest sub-array */
-			if ( j - base > limit - i ) {
-				top[0] = base;
-				top[1] = j;
-				base   = i;
-			} else {
-				top[0] = i;
-				top[1] = limit;
-				limit  = j;
-			}
-			top += 2;
-		} else {
-			/* the sub-array is small, perform insertion sort */
-			j = base;
-			i = j + 1;
-
-			for ( ; i < limit; j = i, i++ ) {
-				for ( ; j[1].x < j->x; j-- ) {
-					SWAP_CELLS( j + 1, j, temp );
-					if ( j == base )
-						break;
-				}
-			}
-			if ( top > stack ) {
-				top  -= 2;
-				base  = top[0];
-				limit = top[1];
-			} else
-				break;
-		}
-	}
-}
-
-
-static void gray_hline( TRaster *raster, TCoord  x, TCoord  y, TPos    area, int     acount, Bool zero_non_zero_rule)
-{
-	EVG_Span*   span;
-	int        count;
-	int        coverage;
-
-	x += (TCoord)raster->min_ex;
-	if (x>=raster->max_ex) return;
-	y += (TCoord)raster->min_ey;
-
-	/* compute the coverage line's coverage, depending on the    */
-	/* outline fill rule                                         */
-	/*                                                           */
-	/* the coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
-	/*                                                           */
-	coverage = (int)( area >> ( PIXEL_BITS * 2 + 1 - 8 ) );
-	/* use range 0..256 */
-	if ( coverage < 0 )
-		coverage = -coverage;
-
-	if (zero_non_zero_rule) {
-		/* normal non-zero winding rule */
-		if ( coverage >= 256 )
-			coverage = 255;
-	} else {
-		coverage &= 511;
-
-		if ( coverage > 256 )
-			coverage = 512 - coverage;
-		else if ( coverage == 256 )
-			coverage = 255;
-	}
-
-	if ( coverage ) {
-		/* 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 )
-		{
-			span->len = (unsigned short)( span->len + acount );
-			return;
-		}
-
-		if (count >= FT_MAX_GRAY_SPANS ) {
-			raster->render_span(y, count, raster->gray_spans, raster->render_span_data );
-			raster->num_gray_spans = 0;
-
-			span  = raster->gray_spans;
-		} else
-			span++;
-
-		/* add a gray span to the current list */
-		span->x        = (short)x;
-		span->len      = (unsigned short)acount;
-		span->coverage = (unsigned char)coverage;
-		raster->num_gray_spans++;
-	}
-}
-
-static void gray_sweep_line( TRaster *raster, AAScanline *sl, int y, Bool zero_non_zero_rule)
-{
-	TCoord  x, cover;
-	TArea   area;
-	AACell *start, *cur;
-
-	cur = sl->cells;
-	cover = 0;
-	raster->num_gray_spans = 0;
-
-	while (sl->num) {
-		start  = cur;
-		x      = start->x;
-		area   = start->area;
-		cover += start->cover;
-		/* accumulate all start cells */
-		while(--sl->num) {
-			++cur ;
-			if (cur->x != start->x )
-				break;
-
-			area  += cur->area;
-			cover += cur->cover;
-		}
-
-		/* 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);
-			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);
-	}
-	raster->render_span((int) (y + raster->min_ey), raster->num_gray_spans, raster->gray_spans, raster->render_span_data );
-}
-
-
-int evg_raster_render(EVG_Raster raster, EVG_Raster_Params*  params)
-{
-	Bool zero_non_zero_rule;
-	int i, size_y;
-	EVG_Outline*  outline = (EVG_Outline*)params->source;
-	/* return immediately if the outline is empty */
-	if ( outline->n_points == 0 || outline->n_contours <= 0 ) return 0;
-
-	raster->render_span  = (EVG_Raster_Span_Func) params->gray_spans;
-	raster->render_span_data = params->user;
-
-	/* Set up state in the raster object */
-	raster->min_ex = params->clip_xMin;
-	raster->min_ey = params->clip_yMin;
-	raster->max_ex = params->clip_xMax;
-	raster->max_ey = params->clip_yMax;
-
-#ifdef INLINE_POINT_CONVERSION
-	raster->mx = params->mx;
-#endif
-
-	size_y = (int) (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;
-	}
-
-	raster->ex = (int) (raster->max_ex+1);
-	raster->ey = (int) (raster->max_ey+1);
-	raster->cover = 0;
-	raster->area = 0;
-	EVG_Outline_Decompose(outline, raster);
-	gray_record_cell( raster );
-
-	/*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=0; 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 0
-	for (i=0; i<raster->max_lines; i++) {
-		gf_free(raster->scanlines[i].cells);
-	}
-	gf_free(raster->scanlines);
-	raster->scanlines = 0;
-	raster->max_lines = 0;
-#endif
-
-	return 0;
-}
-
-EVG_Raster evg_raster_new()
-{
-	TRaster *raster;
-	GF_SAFEALLOC(raster , TRaster);
-	return raster;
-}
-
-void evg_raster_del(EVG_Raster raster)
-{
-	int i;
-	for (i=0; i<raster->max_lines; i++) {
-		gf_free(raster->scanlines[i].cells);
-	}
-	gf_free(raster->scanlines);
-	gf_free(raster);
-}
-
-/* END */

gpac-0.8.0.tar.gz/modules/soft_raster/rast_soft.h Deleted

@@ -1,364 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 _RAST_SOFT_H_
-#define _RAST_SOFT_H_
-
-#include <gpac/modules/raster2d.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*RGB 555 support is disabled by default*/
-//#define GF_RGB_555_SUPORT
-
-/*for symbian enable 4k color depth (RGB444, 4096 colors) since a good amount of devices use that*/
-#ifdef __SYMBIAN32__
-#define GF_RGB_444_SUPORT
-#endif
-
-
-typedef struct _evg_surface EVGSurface;
-
-/*base stencil stack*/
-#define EVGBASESTENCIL	\
-	u32 type;	\
-	void (*fill_run)(struct _evg_base_stencil *p, EVGSurface *surf, s32 x, s32 y, u32 count);	\
-	GF_Matrix2D pmat;					\
-	GF_Matrix2D smat;					\
-	GF_Rect frame;					\
-	GF_ColorMatrix cmat;			\
- 
-typedef struct _evg_base_stencil
-{
-	EVGBASESTENCIL
-} EVGStencil;
-
-/*define this macro to convert points in the outline decomposition rather than when attaching path
-to surface. When point conversion is inlined in the raster, memory usage is lower (no need for temp storage)*/
-#define INLINE_POINT_CONVERSION
-
-#ifdef INLINE_POINT_CONVERSION
-typedef struct __vec2f EVG_Vector;
-#else
-typedef struct
-{
-	s32 x;
-	s32 y;
-} EVG_Vector;
-#endif
-
-typedef struct
-{
-	s32 n_contours;
-	s32 n_points;
-	EVG_Vector *points;
-	u8 *tags;
-	s32 *contours;
-	s32 flags; /*same as path flags*/
-} EVG_Outline;
-
-typedef struct TRaster_ *EVG_Raster;
-
-typedef struct EVG_Span_
-{
-	short           x;
-	unsigned short  len;
-	unsigned char   coverage;
-} EVG_Span;
-
-typedef void (*EVG_SpanFunc)(int y, int count, EVG_Span *spans, void *user);
-#define EVG_Raster_Span_Func  EVG_SpanFunc
-
-typedef struct EVG_Raster_Params_
-{
-	EVG_Outline *source;
-#ifdef INLINE_POINT_CONVERSION
-	GF_Matrix2D *mx;
-#endif
-	EVG_SpanFunc gray_spans;
-
-	s32 clip_xMin, clip_yMin, clip_xMax, clip_yMax;
-
-	void *user;
-} EVG_Raster_Params;
-
-
-EVG_Raster evg_raster_new();
-void evg_raster_del(EVG_Raster raster);
-int evg_raster_render(EVG_Raster raster, EVG_Raster_Params *params);
-
-/*the surface object - currently only ARGB/RGB32, RGB/BGR and RGB555/RGB565 supported*/
-struct _evg_surface
-{
-	/*surface info*/
-	char *pixels;
-	u32 pixelFormat, BPP;
-	u32 width, height;
-	s32 pitch_x, pitch_y;
-	Bool center_coords;
-
-	/*color buffer for variable stencils - size of width*/
-	u32 *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*/
-	EVGStencil *sten;
-
-	void *raster_cbk;
-	/*fills line pixels without any blending operation*/
-	void (*raster_fill_run_no_alpha)(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color);
-	/*fills line pixels with blending operation - alpha combines both fill color and anti-aliasing blending*/
-	void (*raster_fill_run_alpha)(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color, u8 alpha);
-	/*fills rectangle with or without blending operation - alpha combines both fill color and anti-aliasing blending*/
-	void (*raster_fill_rectangle)(void *cbk, u32 x, u32 y, u32 width, u32 height, GF_Color color);
-
-
-	/*in solid color mode to speed things*/
-	u32 fill_col;
-	u32 fill_565;
-
-#ifdef GF_RGB_444_SUPORT
-	u32 fill_444;
-#endif
-
-#ifdef GF_RGB_555_SUPORT
-	u32 fill_555;
-#endif
-
-	/*FreeType raster*/
-	EVG_Raster raster;
-
-	/*FreeType outline (path converted to ft)*/
-	EVG_Outline ftoutline;
-	EVG_Raster_Params ftparams;
-
-#ifndef INLINE_POINT_CONVERSION
-	/*transformed point list*/
-	u32 pointlen;
-	EVG_Vector *points;
-#endif
-};
-
-/*solid color brush*/
-typedef struct
-{
-	EVGBASESTENCIL
-	GF_Color color;
-} EVG_Brush;
-
-/*max number of interpolation points*/
-#define EVGGRADIENTSLOTS		12
-
-/*(2^EVGGRADIENTBITS)-1 colors in gradient. Below 6 bits the gradient is crappy */
-#define EVGGRADIENTBITS		10
-
-
-/*base gradient stencil*/
-#define EVGGRADIENT	\
-		s32	mod;	\
-		u32	pre[(1<<EVGGRADIENTBITS)];	\
-		u32	col[EVGGRADIENTSLOTS];		\
-		Fixed pos[EVGGRADIENTSLOTS];	\
-		u8 alpha;		\
- 
-typedef struct
-{
-	EVGBASESTENCIL
-	EVGGRADIENT
-} EVG_BaseGradient;
-
-/*linear gradient*/
-typedef struct
-{
-	EVGBASESTENCIL
-	EVGGRADIENT
-
-	GF_Point2D start, end;
-	GF_Matrix2D vecmat;
-	s32	curp;
-	Fixed pos_ft;
-} EVG_LinearGradient;
-
-/*radial gradient*/
-typedef struct
-{
-	EVGBASESTENCIL
-	EVGGRADIENT
-
-	GF_Point2D center, focus, radius;
-	/*drawing state vars*/
-	GF_Point2D cur_p, d_f, d_i;
-	Fixed rad;
-} EVG_RadialGradient;
-
-/*texture stencil - should be reworked, is very slow*/
-typedef struct
-{
-	EVGBASESTENCIL
-	u32 width, height, stride;
-	u32 pixel_format, Bpp;
-	char *pixels;
-
-	GF_Point2D cur_pt;
-	Fixed cur_y, inc_x, inc_y;
-
-	u32 mod, filter;
-	u32 replace_col;
-	Bool cmat_is_replace;
-
-	u8 alpha;
-
-	/*YUV->RGB local buffer*/
-	unsigned char *conv_buf;
-	u32 conv_size;
-	unsigned char *orig_buf;
-	u32 orig_stride, orig_format;
-	Bool is_converted;
-
-	Bool owns_texture;
-
-	u32 (*tx_get_pixel)(char *pix);
-} EVG_Texture;
-
-#define GF_TEXTURE_FILTER_DEFAULT	GF_TEXTURE_FILTER_HIGH_SPEED
-
-
-void evg_radial_init(EVG_RadialGradient *_this) ;
-void evg_bmp_init(EVGStencil *p);
-void evg_set_texture_active(EVGStencil *st);
-
-
-GF_STENCIL evg_stencil_new(GF_Raster2D *, GF_StencilType type);
-void evg_stencil_delete(GF_STENCIL st);
-GF_Err evg_stencil_set_matrix(GF_STENCIL st, GF_Matrix2D *mx);
-GF_Err evg_stencil_set_brush_color(GF_STENCIL st, GF_Color c);
-GF_Err evg_stencil_set_linear_gradient(GF_STENCIL st, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y);
-GF_Err evg_stencil_set_radial_gradient(GF_STENCIL st, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius);
-GF_Err evg_stencil_set_gradient_interpolation(GF_STENCIL p, Fixed *pos, GF_Color *col, u32 count);
-GF_Err evg_stencil_set_gradient_mode(GF_STENCIL p, GF_GradientMode mode);
-
-GF_Err evg_stencil_set_alpha(GF_STENCIL st, u8 alpha);
-
-/*texture only*/
-GF_Err evg_stencil_set_texture(GF_STENCIL st, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy);
-GF_Err evg_stencil_set_tiling(GF_STENCIL st, GF_TextureTiling mode);
-GF_Err evg_stencil_set_filter(GF_STENCIL st, GF_TextureFilter filter_mode);
-GF_Err evg_stencil_set_color_matrix(GF_STENCIL st, GF_ColorMatrix *cmat);
-
-
-
-GF_SURFACE evg_surface_new(GF_Raster2D *, Bool center_coords);
-void evg_surface_delete(GF_SURFACE _this);
-void evg_surface_detach(GF_SURFACE _this);
-GF_Err evg_surface_attach_to_buffer(GF_SURFACE _this, char *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat);
-GF_Err evg_surface_attach_to_texture(GF_SURFACE _this, GF_STENCIL sten);
-GF_Err evg_surface_attach_to_callbacks(GF_SURFACE _this, GF_RasterCallback *callbacks, u32 width, u32 height);
-
-GF_Err evg_surface_set_matrix(GF_SURFACE surf, GF_Matrix2D *mat);
-GF_Err evg_surface_set_raster_level(GF_SURFACE surf , GF_RasterLevel RasterSetting);
-GF_Err evg_surface_set_clipper(GF_SURFACE surf, GF_IRect *rc);
-GF_Err evg_surface_set_path(GF_SURFACE surf, GF_Path *gp);
-GF_Err evg_surface_fill(GF_SURFACE surf, GF_STENCIL stencil);
-GF_Err evg_surface_clear(GF_SURFACE surf, GF_IRect *rc, u32 color);
-
-
-/*FT raster callbacks */
-void evg_bgra_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgra_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgra_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_bgra(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-
-void evg_rgba_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgba_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgba_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgba_fill_erase(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_rgba(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-
-void evg_bgrx_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgrx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgrx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-
-void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_rgbx(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-
-void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_rgb(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-
-void evg_bgr_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgr_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_bgr_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_bgr(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-
-void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_565(GF_SURFACE _this, GF_IRect rc, GF_Color col);
-
-#ifdef GF_RGB_444_SUPORT
-void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_444(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-#endif
-
-#ifdef GF_RGB_555_SUPORT
-void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-GF_Err evg_surface_clear_555(GF_SURFACE surf, GF_IRect rc, GF_Color col);
-#endif
-
-void evg_user_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_user_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-void evg_user_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf);
-
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-

gpac-0.8.0.tar.gz/modules/soft_raster/raster_565.c Deleted

@@ -1,495 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Scene Rendering 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 "rast_soft.h"
-
-
-/*
-	FIXME / WARNING - this code only works for little endian platfoms
-		not seen any big endian platform using RGB565/RGB555 output
-*/
-
-
-static GFINLINE s32
-mul255(s32 a, s32 b)
-{
-	return ((a + 1) * b) >> 8;
-}
-
-
-/*
-			RGB 565 part
-*/
-
-static u16 overmask_565(u32 src, u16 dst, u32 alpha)
-{
-	u32 resr, resg, resb;
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-	s32 dstr = (dst >> 8) & 0xf8;
-	s32 dstg = (dst >> 3) & 0xfc;
-	s32 dstb = (dst << 3) & 0xf8;
-
-	srca = mul255(srca, alpha);
-	resr = mul255(srca, srcr - dstr) + dstr;
-	resg = mul255(srca, srcg - dstg) + dstg;
-	resb = mul255(srca, srcb - dstb) + dstb;
-	return GF_COL_565(resr, resg, resb);
-}
-
-void overmask_565_const_run(u32 src, u16 *dst, s32 dst_pitch_x, u32 count)
-{
-	u32 resr, resg, resb;
-	u8 srca = (src >> 24) & 0xff;
-	u8 srcr = (src >> 16) & 0xff;
-	u8 srcg = (src >> 8) & 0xff;
-	u8 srcb = (src >> 0) & 0xff;
-
-	while (count) {
-		register u16 val = *dst;
-		register u8 dstr = (val >> 8) & 0xf8;
-		register u8 dstg = (val >> 3) & 0xfc;
-		register u8 dstb = (val << 3) & 0xf8;
-
-		resr = mul255(srca, srcr - dstr) + dstr;
-		resg = mul255(srca, srcg - dstg) + dstg;
-		resb = mul255(srca, srcb - dstb) + dstb;
-		*dst = GF_COL_565(resr, resg, resb);
-		dst = (u16*) (((u8*)dst)+dst_pitch_x);
-		count--;
-	}
-}
-
-void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u16 col565 = surf->fill_565;
-	u32 col = surf->fill_col;
-	register u32 a, fin, col_no_a;
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	register s32 i;
-	u32 len;
-	s32 x;
-
-	col_no_a = col&0x00FFFFFF;
-
-	for (i=0; i<count; i++) {
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | (col_no_a);
-			overmask_565_const_run(fin, (u16*) (dst+x), surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(u16*) (dst + x) = col565;
-				x+=surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	register u32 a, fin, col_no_a;
-	register s32 i;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col&0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_565_const_run(fin, (u16*) (dst + spans[i].x * surf->pitch_x), surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	register u8 spanalpha, col_a;
-	register s32 i, x;
-	register u32 len;
-	register u32 *col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					*(u16*) (dst+x) = overmask_565(*col, *(u16*) (dst+x), spanalpha);
-				} else {
-					*(u16*) (dst+x)  = GF_COL_TO_565(*col);
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_565(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	register u32 x, y, w, h, sx, sy;
-	s32 st;
-	register u16 val;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_y;
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	/*convert to 565*/
-	val = GF_COL_TO_565(col);
-
-	for (y=0; y<h; y++) {
-		u8 *data = (u8 *) _this->pixels + (sy+y) * st + _this->pitch_x*sx;
-		for (x=0; x<w; x++)  {
-			*(u16*) data = val;
-			data += _this->pitch_x;
-		}
-	}
-	return GF_OK;
-}
-
-
-
-/*
-			RGB 555 part
-*/
-#ifdef GF_RGB_555_SUPORT
-
-static u16 overmask_555(u32 src, u16 dst, u32 alpha)
-{
-	u32 resr, resg, resb;
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-	s32 dstr = (dst >> 7) & 0xf8;
-	s32 dstg = (dst >> 2) & 0xf8;
-	s32 dstb = (dst << 3) & 0xf8;
-
-	srca = mul255(srca, alpha);
-	resr = mul255(srca, srcr - dstr) + dstr;
-	resg = mul255(srca, srcg - dstg) + dstg;
-	resb = mul255(srca, srcb - dstb) + dstb;
-	return GF_COL_555(resr, resg, resb);
-}
-
-static void overmask_555_const_run(u32 src, u16 *dst, s32 dst_pitch_x, u32 count)
-{
-	u32 resr, resg, resb;
-	u8 srca = (src >> 24) & 0xff;
-	u8 srcr = (src >> 16) & 0xff;
-	u8 srcg = (src >> 8) & 0xff;
-	u8 srcb = (src >> 0) & 0xff;
-
-	while (count) {
-		u16 val = *dst;
-		u8 dstr = (val >> 7) & 0xf8;
-		u8 dstg = (val >> 2) & 0xf8;
-		u8 dstb = (val << 3) & 0xf8;
-
-		resr = mul255(srca, srcr - dstr) + dstr;
-		resg = mul255(srca, srcg - dstg) + dstg;
-		resb = mul255(srca, srcb - dstb) + dstb;
-		*dst = GF_COL_555(resr, resg, resb);
-		dst = (u16*) (((u8*)dst)+dst_pitch_x);
-		count--;
-	}
-}
-
-void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u16 col555 = surf->fill_555;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
-	s32 i, x;
-	u32 len;
-	u8 aa_lev = surf->AALevel;
-
-	col_no_a = col&0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | col_no_a;
-			overmask_555_const_run(fin, (u16*) (dst+x), surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(u16*) (dst+x) = col555;
-				x+=surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = surf->pixels + y * surf->pitch_x;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-	u8 aa_lev = surf->AALevel;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_555_const_run(fin, (u16*) (dst + spans[i].x*surf->pitch_x), surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col;
-	u8 aa_lev = surf->AALevel;
-
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					*(u16*) (dst+x) = overmask_555(*col, *(u16*) (dst+x), spanalpha);
-				} else {
-					*(u16*) (dst+x) = GF_COL_TO_555(*col);
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_555(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u32 x, y, w, h, sx, sy;
-	u16 val;
-	EVGSurface *_this = (EVGSurface *)surf;
-
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	/*convert to 565*/
-	val = GF_COL_TO_555(col);
-
-	for (y=0; y<h; y++) {
-		u8 *data = _this->pixels + (sy+y) * _this->pitch_y + _this->pitch_x*sx;
-		for (x=0; x<w; x++)  {
-			*(u16*)data = val;
-			data += _this->pitch_x;
-		}
-	}
-	return GF_OK;
-}
-
-#endif
-
-
-/*
-			RGB 444 part
-*/
-
-#ifdef GF_RGB_444_SUPORT
-
-static u16 overmask_444(u32 src, u16 dst, u32 alpha)
-{
-	u32 resr, resg, resb;
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-	s32 dstr = (dst >> 4) & 0xf0;
-	s32 dstg = (dst ) & 0xf0;
-	s32 dstb = (dst << 4) & 0xf0;
-
-	srca = mul255(srca, alpha);
-	resr = mul255(srca, srcr - dstr) + dstr;
-	resg = mul255(srca, srcg - dstg) + dstg;
-	resb = mul255(srca, srcb - dstb) + dstb;
-	return GF_COL_444(resr, resg, resb);
-}
-
-static void overmask_444_const_run(u32 src, u16 *dst, s32 dst_pitch_x, u32 count)
-{
-	u32 resr, resg, resb;
-	u8 srca = (src >> 24) & 0xff;
-	u8 srcr = (src >> 16) & 0xff;
-	u8 srcg = (src >> 8) & 0xff;
-	u8 srcb = (src >> 0) & 0xff;
-
-	while (count) {
-		u16 val = *dst;
-		u8 dstr = (val >> 4) & 0xf0;
-		u8 dstg = (val ) & 0xf0;
-		u8 dstb = (val << 4) & 0xf0;
-
-		resr = mul255(srca, srcr - dstr) + dstr;
-		resg = mul255(srca, srcg - dstg) + dstg;
-		resb = mul255(srca, srcb - dstb) + dstb;
-		*dst = GF_COL_444(resr, resg, resb);
-		dst = (u16*) (((u8*)dst)+dst_pitch_x);
-		count--;
-	}
-}
-
-void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u16 col444 = surf->fill_444;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	u8 *dst = surf->pixels + y * surf->pitch_y;
-	s32 i, x;
-	u32 len;
-	u8 aa_lev = surf->AALevel;
-
-	col_no_a = col&0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | col_no_a;
-			overmask_444_const_run(fin, (u16*) (dst+x), surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(u16*) (dst+x) = col444;
-				x+=surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-	u8 aa_lev = surf->AALevel;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_444_const_run(fin, (u16*) (dst + spans[i].x*surf->pitch_x), surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = surf->pixels + y * surf->pitch_x;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col;
-	u8 aa_lev = surf->AALevel;
-
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage<aa_lev) continue;
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					*(u16*) (dst+x) = overmask_444(*col, *(u16*) (dst+x), spanalpha);
-				} else {
-					*(u16*) (dst+x) = GF_COL_TO_444(*col);
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_444(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u32 x, y, w, h, sx, sy;
-	u16 val;
-	EVGSurface *_this = (EVGSurface *)surf;
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	val = GF_COL_TO_444(col);
-
-	for (y=0; y<h; y++) {
-		u8 *data = _this->pixels + (sy+y) * _this->pitch_y + _this->pitch_x*sx;
-		for (x=0; x<w; x++)  {
-			*(u16*)data = val;
-			data += _this->pitch_x;
-		}
-	}
-	return GF_OK;
-}
-
-#endif
-

gpac-0.8.0.tar.gz/modules/soft_raster/raster_argb.c Deleted

@@ -1,730 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 "rast_soft.h"
-
-
-static GFINLINE s32
-mul255(s32 a, s32 b)
-{
-	return ((a+1) * b) >> 8;
-}
-
-/*
-		32 bit ARGB
-*/
-
-static void overmask_bgra(u32 src, u8 *dst, u32 alpha)
-{
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-	s32 dsta = dst[3];
-	srca = mul255(srca, alpha);
-	if (dsta) {
-		s32 dstr = dst[1];
-		s32 dstg = dst[1];
-		s32 dstb = dst[0];
-		dst[0] = mul255(srca, srcb - dstb) + dstb;
-		dst[1] = mul255(srca, srcg - dstg) + dstg;
-		dst[2] = mul255(srca, srcr - dstr) + dstr;
-		dst[3] = mul255(srca, srca) + mul255(255-srca, dsta);
-	} else {
-		dst[0] = srcb;
-		dst[1] = srcg;
-		dst[2] = srcr;
-		dst[3] = srca;
-	}
-}
-
-static void overmask_bgra_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
-{
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-
-	while (count) {
-		s32 dsta = dst[3];
-		/*special case for ARGB: if dst alpha is 0, consider the surface is empty and copy pixel*/
-		if (dsta) {
-			s32 dstb = dst[0];
-			s32 dstg = dst[1];
-			s32 dstr = dst[2];
-
-			dst[0] = mul255(srca, srcb - dstb) + dstb;
-			dst[1] = mul255(srca, srcg - dstg) + dstg;
-			dst[2] = mul255(srca, srcr - dstr) + dstr;
-			dst[3] = mul255(srca, srca) + mul255(255-srca, dsta);
-		} else {
-			dst[0] = srcr;
-			dst[1] = srcg;
-			dst[2] = srcr;
-			dst[3] = srca;
-		}
-		dst += dst_pitch_x;
-		count--;
-	}
-}
-
-void evg_bgra_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	s32 i, x;
-	u32 len;
-	u8 col_a, col_r, col_g, col_b;
-
-	col_a = GF_COL_A(col);
-	col_r = GF_COL_R(col);
-	col_g = GF_COL_G(col);
-	col_b = GF_COL_B(col);
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | col_no_a;
-			overmask_bgra_const_run(fin, dst + x, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				dst[x] = col_b;
-				dst[x+1] = col_g;
-				dst[x+2] = col_r;
-				dst[x+3] = col_a;
-				x += surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_bgra_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_bgra_const_run(fin, dst + surf->pitch_x*spans[i].x, surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_bgra_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col, _col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_bgra(*col, (dst + x) , spanalpha);
-				} else {
-					dst[x] = GF_COL_B(_col);
-					dst[x+1] = GF_COL_G(_col);
-					dst[x+2] = GF_COL_R(_col);
-					dst[x+3] = col_a;
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_bgra(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u8 *data;
-	u8 col_a, col_b, col_g, col_r;
-	u32 x, y, w, h, sx, sy;
-	s32 st;
-	Bool use_memset;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_y;
-
-	col_a = GF_COL_A(col);
-	col_r = GF_COL_R(col);
-	col_g = GF_COL_G(col);
-	col_b = GF_COL_B(col);
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	use_memset = GF_FALSE;
-	if (_this->pitch_x !=4) use_memset = GF_FALSE;
-	else if (!col_a) use_memset = GF_TRUE;
-	else if ((col_a==col_r) && (col_a==col_g) && (col_a==col_b)) use_memset = GF_TRUE;
-
-	if (!use_memset) {
-		for (y = 0; y < h; y++) {
-			data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x*sx;
-			for (x = 0; x < w; x++) {
-				data[0] = col_b;
-				data[1] = col_g;
-				data[2] = col_r;
-				data[3] = col_a;
-				data += _this->pitch_x;
-			}
-		}
-	} else {
-		u32 sw = 4*w;
-		for (y = 0; y < h; y++) {
-			memset(_this ->pixels + (sy+y)* st + _this->pitch_x * sx, col_a, sizeof(char)*sw);
-		}
-	}
-	return GF_OK;
-}
-
-
-/*
-		32 bit RGB
-*/
-
-static void overmask_bgrx(u32 src, u8 *dst, u32 alpha)
-{
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-	s32 dstb = dst[0];
-	s32 dstg = dst[1];
-	s32 dstr = dst[2];
-
-	srca = mul255(srca, alpha);
-	dst[0] = mul255(srca, srcb - dstb) + dstb;
-	dst[1] = mul255(srca, srcg - dstg) + dstg;
-	dst[2] = mul255(srca, srcr - dstr) + dstr;
-	dst[3] = 0xFF;
-}
-
-GFINLINE static void overmask_bgrx_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
-{
-	s32 srca = (src>>24) & 0xff;
-	u32 srcr = mul255(srca, ((src >> 16) & 0xff)) ;
-	u32 srcg = mul255(srca, ((src >> 8) & 0xff)) ;
-	u32 srcb = mul255(srca, ((src) & 0xff)) ;
-	u32 inva = 1 + 0xFF - srca;
-
-	while (count) {
-		dst[0] = srcb + ((inva*dst[0])>>8);
-		dst[1] = srcg + ((inva*dst[1])>>8);
-		dst[2] = srcr + ((inva*dst[2])>>8);
-		dst[3] = 0xFF;
-		dst += dst_pitch_x;
-		count--;
-	}
-}
-
-void evg_bgrx_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 fin, col_no_a, spana;
-	u8 col_r, col_g, col_b;
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	s32 i, x;
-	u32 len;
-
-	col_no_a = col & 0x00FFFFFF;
-	col_r = GF_COL_R(col);
-	col_g = GF_COL_G(col);
-	col_b = GF_COL_B(col);
-	for (i=0; i<count; i++) {
-		spana = spans[i].coverage;
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-
-		if (spana != 0xFF) {
-			fin = (spana<<24) | col_no_a;
-			overmask_bgrx_const_run(fin, dst + x, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				dst[x] = col_b;
-				dst[x+1] = col_g;
-				dst[x+2] = col_r;
-				dst[x+3] = 0xFF;
-				x += surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_bgrx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_bgrx_const_run(fin, dst + surf->pitch_x*spans[i].x, surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_bgrx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->fill_run(surf->sten, surf, spans[i].x, y, len);
-		col = surf->stencil_pix_run;
-		x = spans[i].x * surf->pitch_x;
-		while (len--) {
-			u32 _col = *col;
-			col_a = GF_COL_A(_col);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_bgrx(*col, dst+x, spanalpha);
-				} else {
-					dst[x] = GF_COL_B(_col);
-					dst[x+1] = GF_COL_G(_col);
-					dst[x+2] = GF_COL_R(_col);
-					dst[x+3] = 0xFF;
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-/*
-		32 bit BGR
-*/
-
-static void overmask_rgbx(u32 src, u8 *dst, u32 alpha)
-{
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src >> 0) & 0xff;
-
-	s32 dstr = dst[0];
-	s32 dstg = dst[1];
-	s32 dstb = dst[2];
-
-	srca = mul255(srca, alpha);
-	dst[0] = mul255(srca, srcr - dstr) + dstr;
-	dst[1] = mul255(srca, srcg - dstg) + dstg;
-	dst[2] = mul255(srca, srcb - dstb) + dstb;
-	dst[3] = 0xFF;
-}
-
-GFINLINE static void overmask_rgbx_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
-{
-	s32 srca = (src>>24) & 0xff;
-	u32 srcr = mul255(srca, ((src >> 16) & 0xff)) ;
-	u32 srcg = mul255(srca, ((src >> 8) & 0xff)) ;
-	u32 srcb = mul255(srca, ((src) & 0xff)) ;
-	u32 inva = 1 + 0xFF - srca;
-
-	while (count) {
-		dst[0] = srcr + ((inva*dst[0])>>8);
-		dst[1] = srcg + ((inva*dst[1])>>8);
-		dst[2] = srcb + ((inva*dst[2])>>8);
-		dst += dst_pitch_x;
-		count--;
-	}
-}
-
-void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 fin, col_no_a, spana;
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 r, g, b;
-	s32 i, x;
-	u32 len;
-
-	col_no_a = col & 0x00FFFFFF;
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	for (i=0; i<count; i++) {
-		spana = spans[i].coverage;
-		x = spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-
-		if (spana != 0xFF) {
-			fin = (spana<<24) | col_no_a;
-			overmask_rgbx_const_run(fin, dst + x, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				dst[x] = r;
-				dst[x+1] = g;
-				dst[x+2] = b;
-				dst[x+3] = 0xFF;
-				x += surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_rgbx_const_run(fin, dst + surf->pitch_x*spans[i].x, surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col, _col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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 = *col;
-			col_a = GF_COL_A(_col);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_rgbx(*col, dst+x, spanalpha);
-				} else {
-					dst[x] = GF_COL_R(_col);
-					dst[x+1] = GF_COL_G(_col);
-					dst[x+2] = GF_COL_B(_col);
-					dst[x+3] = 0xFF;
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_rgbx(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u32 x, y, w, h, sx, sy;
-	u8 r,g,b;
-	s32 st;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_x;
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-	
-	for (y = 0; y < h; y++) {
-		u8 *data = (u8 *) _this ->pixels + (y + sy) * _this->pitch_y + st*sx;
-		for (x = 0; x < w; x++) {
-			data[0] = r;
-			data[1] = g;
-			data[2] = b;
-			data[3] = 0xFF;
-			data += st;
-		}
-	}
-	return GF_OK;
-}
-
-
-
-
-/*
-		32 bit RGBA
-*/
-
-GFINLINE static void overmask_rgba(u32 src, u8 *dst, u32 alpha)
-{
-	u8 srca = GF_COL_A(src);
-	u8 srcr = GF_COL_R(src);
-	u8 srcg = GF_COL_G(src);
-	u8 srcb = GF_COL_B(src);
-	u8 dsta = dst[3];
-
-	srca = mul255(srca, alpha);
-	/*special case for RGBA:
-		if dst alpha is 0, consider the surface is empty and copy pixel
-		if source alpha is 0xFF erase the entire pixel
-	*/
-	if (dsta && (srca!=0xFF) ) {
-		u8 final_a;
-		u8 dstr = dst[0];
-		u8 dstg = dst[1];
-		u8 dstb = dst[2];
-
-		//do the maths , so that the result of the blend follows the sam DST = SRC*apha + DST(1-alpha)
-		//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
-		//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
-		final_a = dsta + srca - mul255(dsta, srca);
-		if (final_a) {
-			dst[0] = (u8) ((srcr*srca + dstr*(dsta-srca)) / final_a);
-			dst[1] = (u8) ((srcg*srca + dstg*(dsta-srca)) / final_a);
-			dst[2] = (u8) ((srcb*srca + dstb*(dsta-srca)) / final_a);
-			dst[3] = final_a;
-		} else {
-			assert(0);
-		}
-	} else {
-		dst[0] = srcr;
-		dst[1] = srcg;
-		dst[2] = srcb;
-		dst[3] = srca;
-	}
-}
-
-GFINLINE static void overmask_rgba_const_run(u32 src, u8 *dst, s32 dst_pitch_x,  u32 count)
-{
-	u8 srca = GF_COL_A(src);
-	u8 srcr = GF_COL_R(src);
-	u8 srcg = GF_COL_G(src);
-	u8 srcb = GF_COL_B(src);
-
-	while (count) {
-		u8 dsta = dst[3];
-		/*special case for RGBA:
-			if dst alpha is 0, consider the surface is empty and copy pixel
-			if source alpha is 0xFF erase the entire pixel
-		*/
-		if ((dsta != 0) && (srca != 0xFF)) {
-			u8 final_a;
-			u8 dstr = dst[0];
-			u8 dstg = dst[1];
-			u8 dstb = dst[2];
-
-			//do the maths , so that the result of the blend follows the sam DST = SRC*apha + DST(1-alpha)
-			//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
-			//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
-			final_a = dsta + srca - mul255(dsta, srca);
-			if (final_a) {
-				dst[0] = (u8) ((srcr*srca + dstr*(dsta-srca)) / final_a);
-				dst[1] = (u8) ((srcg*srca + dstg*(dsta-srca)) / final_a);
-				dst[2] = (u8) ((srcb*srca + dstb*(dsta-srca)) / final_a);
-				dst[3] = final_a;
-			} else {
-				assert(0);
-			}
-		} else {
-			dst[0] = srcr;
-			dst[1] = srcg;
-			dst[2] = srcb;
-			dst[3] = srca;
-		}
-		dst+=dst_pitch_x;
-		count--;
-	}
-}
-
-
-void evg_rgba_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 new_a, fin, col_no_a;
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 *p;
-	s32 i;
-	u32 len;
-
-	col_no_a = col & 0x00FFFFFF;
-
-	for (i=0; i<count; i++) {
-		p = dst + spans[i].x*surf->pitch_x;
-		len = spans[i].len;
-
-		new_a = spans[i].coverage;
-		fin = (new_a<<24) | col_no_a;
-		//we must blend in all cases since we have to merge with the dst alpha
-		overmask_rgba_const_run(fin, p, surf->pitch_x, len);
-	}
-}
-
-void evg_rgba_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u32 a, fin, col_no_a;
-	s32 i;
-
-	a = GF_COL_A(surf->fill_col);
-	col_no_a = surf->fill_col & 0x00FFFFFF;
-
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_rgba_const_run(fin, dst + spans[i].x*surf->pitch_x, surf->pitch_x, spans[i].len);
-	}
-}
-
-void evg_rgba_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 *p;
-	u8 spanalpha;
-	s32 i;
-	u32 len;
-	u32 *col;
-
-	for (i=0; i<count; i++) {
-		p = dst + spans[i].x * surf->pitch_x;
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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_rgba(*col, p, spanalpha);
-			col++;
-			p += surf->pitch_x;
-		}
-	}
-}
-
-
-void evg_rgba_fill_erase(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
-	u8 *p;
-	s32 i;
-	u32 len;
-
-	for (i=0; i<count; i++) {
-		p = dst + spans[i].x*surf->pitch_x;
-		len = spans[i].len;
-
-		if (spans[i].coverage != 0xFF) {
-			/*			while (len--) {
-							*p = 0xFF-spans[i].coverage;
-							p += surf->pitch_x;
-						}
-			*/
-		} else {
-			while (len--) {
-				*(u32 *)p = 0;
-				p += surf->pitch_x;
-			}
-		}
-	}
-}
-
-GF_Err evg_surface_clear_rgba(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u8 *data;
-	u8 a, r, g, b;
-	u32 x, y, w, h, sy;
-	s32 st;
-	Bool use_memset;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_y;
-
-	h = rc.height;
-	w = rc.width;
-	sy = rc.y;
-
-	if (sy+h > _this->height) {
-		h = _this->height - sy;
-	}
-	if (rc.x + w > _this->width) {
-		w = _this->width - rc.x;
-	}
-
-	a = GF_COL_A(col);
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	use_memset = GF_FALSE;
-	if (_this->pitch_x !=4) use_memset = GF_FALSE;
-	else if (!a) use_memset = GF_TRUE;
-	else if ((a==r) && (a==g) && (a==b)) use_memset = GF_TRUE;
-
-
-	if (!use_memset) {
-		for (y = 0; y < h; y++) {
-			data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x * rc.x;
-			for (x = 0; x < w; x++) {
-				*(data) = r;
-				*(data+1) = g;
-				*(data+2) = b;
-				*(data+3) = a;
-				data += 4;
-			}
-		}
-	} else {
-		u32 sw = 4*w;
-		for (y = 0; y < h; y++) {
-			memset(_this ->pixels + (sy+y)* st + _this->pitch_x * rc.x, a, sizeof(char)*sw);
-		}
-	}
-	return GF_OK;
-}
-

gpac-0.8.0.tar.gz/modules/soft_raster/raster_load.c Deleted

@@ -1,106 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 "rast_soft.h"
-
-/*we don't need any private context*/
-GF_Raster2D *EVG_LoadRenderer()
-{
-	GF_Raster2D *dr;
-	GF_SAFEALLOC(dr, GF_Raster2D);
-	if (!dr) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_RASTER_2D_INTERFACE, "GPAC 2D Raster", "gpac distribution")
-
-
-	dr->stencil_new = evg_stencil_new;
-	dr->stencil_delete = evg_stencil_delete;
-	dr->stencil_set_matrix = evg_stencil_set_matrix;
-	dr->stencil_set_brush_color = evg_stencil_set_brush_color;
-	dr->stencil_set_gradient_mode = evg_stencil_set_gradient_mode;
-	dr->stencil_set_linear_gradient = evg_stencil_set_linear_gradient;
-	dr->stencil_set_radial_gradient = evg_stencil_set_radial_gradient;
-	dr->stencil_set_gradient_interpolation = evg_stencil_set_gradient_interpolation;
-	dr->stencil_set_alpha = evg_stencil_set_alpha;
-	dr->stencil_set_texture = evg_stencil_set_texture;
-	dr->stencil_set_tiling = evg_stencil_set_tiling;
-	dr->stencil_set_filter = evg_stencil_set_filter;
-	dr->stencil_set_color_matrix = evg_stencil_set_color_matrix;
-	dr->stencil_texture_modified = NULL;
-
-	dr->surface_new = evg_surface_new;
-	dr->surface_delete = evg_surface_delete;
-	dr->surface_attach_to_device = NULL;
-	dr->surface_attach_to_texture = evg_surface_attach_to_texture;
-	dr->surface_attach_to_buffer = evg_surface_attach_to_buffer;
-	dr->surface_detach = evg_surface_detach;
-	dr->surface_set_raster_level = evg_surface_set_raster_level;
-	dr->surface_set_matrix = evg_surface_set_matrix;
-	dr->surface_set_clipper = evg_surface_set_clipper;
-	dr->surface_set_path = evg_surface_set_path;
-	dr->surface_fill = evg_surface_fill;
-	dr->surface_attach_to_callbacks = evg_surface_attach_to_callbacks;
-	dr->surface_flush = NULL;
-	dr->surface_clear = evg_surface_clear;
-	return dr;
-}
-
-void EVG_ShutdownRenderer(GF_Raster2D *dr)
-{
-	gf_free(dr);
-}
-
-#ifndef GPAC_STANDALONE_RENDER_2D
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_RASTER_2D_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType==GF_RASTER_2D_INTERFACE) {
-		return (GF_BaseInterface *)EVG_LoadRenderer();
-	}
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	if (ifce->InterfaceType == GF_RASTER_2D_INTERFACE) {
-		EVG_ShutdownRenderer((GF_Raster2D *)ifce);
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( soft_raster )
-
-#endif

gpac-0.8.0.tar.gz/modules/soft_raster/raster_rgb.c Deleted

@@ -1,402 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 "rast_soft.h"
-
-static s32
-mul255(s32 a, s32 b)
-{
-	return ((a + 1) * b) >> 8;
-}
-
-
-/*
-			RGB part
-*/
-
-static void overmask_rgb(u32 src, char *dst, u32 alpha)
-{
-	s32 srca = (src >> 24) & 0xff;
-	u32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src) & 0xff;
-
-	s32 dstr = (*dst) & 0xFF;
-	s32 dstg = *(dst+1) & 0xFF;
-	s32 dstb = *(dst+2) & 0xFF;
-
-	srca = mul255(srca, alpha);
-	*dst = mul255(srca, srcr - dstr) + dstr;
-	*(dst+1) = mul255(srca, srcg - dstg) + dstg;
-	*(dst+2) = mul255(srca, srcb - dstb) + dstb;
-}
-
-static void overmask_rgb_const_run(u32 src, char *dst, s32 dst_pitch_x, u32 count)
-{
-	u8 srca = (src >> 24) & 0xff;
-	u8 srcr = (src >> 16) & 0xff;
-	u8 srcg = (src >> 8) & 0xff;
-	u8 srcb = (src) & 0xff;
-
-	while (count) {
-		u8 dstr = *(dst);
-		u8 dstg = *(dst+1);
-		u8 dstb = *(dst+2);
-		*dst = (u8) mul255(srca, srcr - dstr) + dstr;
-		*(dst+1) = (u8) mul255(srca, srcg - dstg) + dstg;
-		*(dst+2) = (u8) mul255(srca, srcb - dstb) + dstb;
-		dst += dst_pitch_x;
-		count--;
-	}
-}
-
-void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	char *dst = surf->pixels + y * surf->pitch_y;
-	char *p;
-	s32 i;
-	u32 len, r, g, b;
-
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		p = dst + spans[i].x * surf->pitch_x;
-
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | col_no_a;
-			overmask_rgb_const_run(fin, p, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(p) = r;
-				*(p + 1) = g;
-				*(p + 2) = b;
-				p += surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	char *dst = surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin;
-	s32 i;
-
-	a = (col>>24)&0xFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | (col&0x00FFFFFF);
-		overmask_rgb_const_run(fin, dst + surf->pitch_x * spans[i].x, surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	char *dst = surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i;
-	s32 x;
-	u32 len;
-	u32 *col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->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);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_rgb(*col, dst + x, spanalpha);
-				} else {
-					*(dst + x) = GF_COL_R(*col);
-					*(dst + x + 1) = GF_COL_G(*col);
-					*(dst + x + 2) = GF_COL_B(*col);
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_rgb(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u32 x, y, w, h, sx, sy;
-	s32 st;
-	u8 r, g, b;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_y;
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	for (y = 0; y < h; y++) {
-		char *data = _this ->pixels + (y + sy) * st + _this->pitch_x*sx;
-		for (x = 0; x < w; x++) {
-			*(data) = r;
-			*(data+1) = g;
-			*(data+2) = b;
-			data += _this->pitch_x;
-		}
-	}
-	return GF_OK;
-}
-
-
-/*
-
-			BGR part
-*/
-
-static void overmask_bgr(u32 src, char *dst, u32 alpha)
-{
-	s32 srca = (src >> 24) & 0xff;
-	s32 srcr = (src >> 16) & 0xff;
-	s32 srcg = (src >> 8) & 0xff;
-	s32 srcb = (src) & 0xff;
-
-	s32 dstb = *dst & 0xFF;
-	s32 dstg = *(dst+1) & 0xFF;
-	s32 dstr = *(dst+2) & 0xFF;
-
-	srca = mul255(srca, alpha);
-	*(dst) = mul255(srca, srcb - dstb) + dstb;
-	*(dst+1) = mul255(srca, srcg - dstg) + dstg;
-	*(dst+2) = mul255(srca, srcr - dstr) + dstr;
-}
-
-static void overmask_bgr_const_run(u32 src, char *dst, s32 dst_pitch_x, u32 count)
-{
-	u8 srca = (src >> 24) & 0xff;
-	u8 srcr = (src >> 16) & 0xff;
-	u8 srcg = (src >> 8) & 0xff;
-	u8 srcb = (src) & 0xff;
-
-	while (count) {
-		u8 dstb = *(dst);
-		u8 dstg = *(dst+1);
-		u8 dstr = *(dst+2);
-		*dst = (u8) mul255(srca, srcb - dstb) + dstb;
-		*(dst+1) = (u8) mul255(srca, srcg - dstg) + dstg;
-		*(dst+2) = (u8) mul255(srca, srcr - dstr) + dstr;
-		dst += dst_pitch_x;
-		count--;
-	}
-}
-
-void evg_bgr_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	char *dst = surf->pixels + y * surf->pitch_y;
-	char *p;
-	s32 i;
-	u32 len, r, g, b;
-
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		p = dst + spans[i].x * surf->pitch_x;
-
-		if (spans[i].coverage != 0xFF) {
-			a = mul255(0xFF, spans[i].coverage);
-			fin = (a<<24) | col_no_a;
-			overmask_bgr_const_run(fin, p, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(p) = b;
-				*(p + 1) = g;
-				*(p + 2) = r;
-				p += surf->pitch_x;
-			}
-		}
-	}
-}
-
-void evg_bgr_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	char *dst = surf->pixels + y * surf->pitch_y;
-	u32 col = surf->fill_col;
-	u32 a, fin, col_no_a;
-	s32 i;
-
-	a = (col>>24)&0xFF;
-	col_no_a = col & 0x00FFFFFF;
-	for (i=0; i<count; i++) {
-		fin = mul255(a, spans[i].coverage);
-		fin = (fin<<24) | col_no_a;
-		overmask_bgr_const_run(fin, dst + surf->pitch_x * spans[i].x, surf->pitch_x, spans[i].len);
-	}
-}
-
-
-void evg_bgr_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	char *dst = surf->pixels + y * surf->pitch_y;
-	u8 spanalpha, col_a;
-	s32 i, x;
-	u32 len;
-	u32 *col, _col;
-
-	for (i=0; i<count; i++) {
-		x = spans[i].x;
-		len = spans[i].len;
-		spanalpha = spans[i].coverage;
-		surf->sten->fill_run(surf->sten, surf, x, y, len);
-		x *= surf->pitch_x;
-		col = surf->stencil_pix_run;
-		while (len--) {
-			_col = *col;
-			col_a = GF_COL_A(_col);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_bgr(_col, dst + x, spanalpha);
-				} else {
-					*(dst + x) = GF_COL_B(_col);
-					*(dst + x + 1) = GF_COL_G(_col);
-					*(dst + x + 2) = GF_COL_R(_col);
-				}
-			}
-			col++;
-			x += surf->pitch_x;
-		}
-	}
-}
-
-GF_Err evg_surface_clear_bgr(GF_SURFACE surf, GF_IRect rc, GF_Color col)
-{
-	u32 x, y, w, h, sx, sy;
-	s32 st;
-	u8 r, g, b;
-	EVGSurface *_this = (EVGSurface *)surf;
-	st = _this->pitch_y;
-
-	h = rc.height;
-	w = rc.width;
-	sx = rc.x;
-	sy = rc.y;
-
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
-
-	for (y = 0; y < h; y++) {
-		char *data = _this ->pixels + (y+sy) * st + _this->pitch_x*sx;
-		for (x = 0; x < w; x++) {
-			*(data) = b;
-			*(data+1) = g;
-			*(data+2) = r;
-			data += 3;
-		}
-	}
-	return GF_OK;
-}
-
-
-/*
-	user-defined callbacks
-*/
-
-void evg_user_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col_no_a;
-	s32 i;
-
-	col_no_a = surf->fill_col;
-	for (i=0; i<count; i++) {
-		if (spans[i].coverage != 0xFF) {
-			u32 a = mul255(0xFF, spans[i].coverage);
-			surf->raster_fill_run_alpha(surf->raster_cbk, spans[i].x, y, spans[i].len, col_no_a, a);
-		} else {
-			surf->raster_fill_run_no_alpha(surf->raster_cbk, spans[i].x, y, spans[i].len, col_no_a);
-		}
-	}
-}
-
-void evg_user_fill_const_a(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u32 col, a, col_no_a;
-	s32 i;
-	a = (surf->fill_col>>24)&0xFF;
-	col_no_a = surf->fill_col | 0xFF000000;
-	for (i=0; i<count; i++) {
-		col = mul255(a, spans[i].coverage);
-		surf->raster_fill_run_alpha(surf->raster_cbk, spans[i].x, y, spans[i].len, col_no_a, col);
-	}
-}
-
-void evg_user_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
-{
-	u8 spanalpha, col_a, a;
-	s32 i;
-	u32 x, len;
-	u32 *col;
-
-	for (i=0; i<count; i++) {
-		len = spans[i].len;
-		x = spans[i].x;
-		spanalpha = spans[i].coverage;
-		surf->sten->fill_run(surf->sten, surf, x, y, len);
-		col = surf->stencil_pix_run;
-		while (len--) {
-			col_a = GF_COL_A(*col);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					a = mul255(col_a, spans[i].coverage);
-					surf->raster_fill_run_alpha(surf->raster_cbk, x, y, 1, *col, a);
-				} else {
-					surf->raster_fill_run_no_alpha(surf->raster_cbk, x, y, 1, *col);
-				}
-			}
-			col++;
-			x ++;
-		}
-	}
-}
-

gpac-0.8.0.tar.gz/modules/soft_raster/stencil.c Deleted

@@ -1,943 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 "rast_soft.h"
-
-EVGStencil *evg_solid_brush();
-EVGStencil *evg_texture_brush();
-EVGStencil *evg_linear_gradient_brush();
-EVGStencil *evg_radial_gradient_brush();
-
-
-
-GF_Color color_interpolate(u32 a, u32 b, u8 pos)
-{
-	u32 ca = ((a>>24)     )*(u32)(0xFF-pos)+((b>>24)     )*(u32)pos;
-	u32 cr = ((a>>16)&0xFF)*(u32)(0xFF-pos)+((b>>16)&0xFF)*(u32)pos;
-	u32 cg = ((a>> 8)&0xFF)*(u32)(0xFF-pos)+((b>> 8)&0xFF)*(u32)pos;
-	u32 cb = ((a    )&0xFF)*(u32)(0xFF-pos)+((b    )&0xFF)*(u32)pos;
-	return	(((ca+(ca>>8)+1)>>8)<<24)|
-	        (((cr+(cr>>8)+1)>>8)<<16)|
-	        (((cg+(cg>>8)+1)>>8)<< 8)|
-	        (((cb+(cb>>8)+1)>>8)    );
-}
-
-
-
-
-/*
-	Generic gradient tools
-*/
-
-#define EVGGRADIENTBUFFERSIZE	(1<<EVGGRADIENTBITS)
-#define EVGGRADIENTMAXINTPOS		EVGGRADIENTBUFFERSIZE - 1
-
-static void gradient_update(EVG_BaseGradient *_this)
-{
-	s32 i, c;
-	s32 start, end, diff;
-	Fixed maxPos = INT2FIX(EVGGRADIENTMAXINTPOS);
-
-	if (_this->pos[0]>=0) {
-		if(_this->pos[0]>0) {
-			end = FIX2INT(gf_mulfix(_this->pos[0], maxPos));
-			for (i=0; i<= end; i++) {
-				_this->pre[i] = _this->col[0];
-			}
-		}
-		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));
-				diff = end-start;
-
-				if (diff) {
-					for (i=start; i<=end; i++) {
-						_this->pre[i] = color_interpolate(_this->col[c], _this->col[c+1],
-						                                  (u8) ( ( (i-start) * 255) / diff) );
-					}
-				}
-			} else {
-				start = FIX2INT(gf_mulfix(_this->pos[c+0], maxPos));
-				for(i=start; i<=EVGGRADIENTMAXINTPOS; i++) {
-					_this->pre[i] = _this->col[c];
-				}
-			}
-		}
-	}
-}
-
-static u32 gradient_get_color(EVG_BaseGradient *_this, s32 pos)
-{
-	s32 max_pos = 1 << EVGGRADIENTBITS;
-
-	switch (_this->mod) {
-	case GF_GRADIENT_MODE_SPREAD:
-		if (pos<0) pos = -pos;
-		return _this->pre[(pos & max_pos) ?  EVGGRADIENTMAXINTPOS - (pos % max_pos) :  pos % max_pos];
-
-	case GF_GRADIENT_MODE_REPEAT:
-		while (pos < 0) pos += max_pos;
-		return _this->pre[pos % max_pos];
-
-	case GF_GRADIENT_MODE_PAD:
-	default:
-		return _this->pre[ MIN(EVGGRADIENTMAXINTPOS, MAX((s32) 0, pos))];
-	}
-}
-
-GF_Err evg_stencil_set_gradient_interpolation(GF_STENCIL p, Fixed *pos, GF_Color *col, u32 count)
-{
-	EVG_BaseGradient *_this = (EVG_BaseGradient *) p;
-	if ( (_this->type != GF_STENCIL_LINEAR_GRADIENT) && (_this->type != GF_STENCIL_RADIAL_GRADIENT) ) return GF_BAD_PARAM;
-	if (count>=EVGGRADIENTSLOTS-1) return GF_OUT_OF_MEM;
-	memcpy(_this->col, col, sizeof(GF_Color) * count);
-	memcpy(_this->pos, pos, sizeof(Fixed) * count);
-	_this->col[count] = 0;
-	_this->pos[count] = -FIX_ONE;
-	gradient_update(_this);
-	return GF_OK;
-}
-
-GF_Err evg_stencil_set_gradient_mode(GF_STENCIL p, GF_GradientMode mode)
-{
-	EVG_BaseGradient *_this = (EVG_BaseGradient *) p;
-	if ( (_this->type != GF_STENCIL_LINEAR_GRADIENT) && (_this->type != GF_STENCIL_RADIAL_GRADIENT) ) return GF_BAD_PARAM;
-	_this->mod = mode;
-	return GF_OK;
-}
-
-/*
-	Generic stencil
-*/
-
-GF_STENCIL evg_stencil_new(GF_Raster2D *_dr, GF_StencilType type)
-{
-	EVGStencil *st;
-	switch (type) {
-	case GF_STENCIL_SOLID:
-		st = evg_solid_brush();
-		break;
-	case GF_STENCIL_LINEAR_GRADIENT:
-		st = evg_linear_gradient_brush();
-		break;
-	case GF_STENCIL_RADIAL_GRADIENT:
-		st = evg_radial_gradient_brush();
-		break;
-	case GF_STENCIL_TEXTURE:
-		st = evg_texture_brush();
-		break;
-	default:
-		return 0L;
-	}
-	if (st) {
-		gf_mx2d_init(st->pmat);
-		gf_mx2d_init(st->smat);
-		gf_cmx_init(&st->cmat);
-	}
-	return st;
-}
-
-void evg_stencil_delete(GF_STENCIL st)
-{
-	EVGStencil *_this = (EVGStencil *) st;
-	switch(_this->type) {
-	case GF_STENCIL_SOLID:
-	case GF_STENCIL_LINEAR_GRADIENT:
-	case GF_STENCIL_RADIAL_GRADIENT:
-		gf_free(_this);
-		return;
-	case GF_STENCIL_TEXTURE:
-	{
-		EVG_Texture *tx = (EVG_Texture *)_this;
-		/*destroy conversion buffer if any*/
-		if ( tx->conv_buf) gf_free( tx->conv_buf );
-		/*destroy local texture iof any*/
-		if (tx->owns_texture && tx->pixels) gf_free(tx->pixels);
-		gf_free(_this);
-	}
-	return;
-	}
-}
-
-GF_Err evg_stencil_set_matrix(GF_STENCIL st, GF_Matrix2D *mx)
-{
-	EVGStencil *_this = (EVGStencil *)st;
-	if (!_this || _this->type>GF_STENCIL_TEXTURE) return GF_BAD_PARAM;
-	if (mx) {
-		gf_mx2d_copy(_this->smat, *mx);
-	} else {
-		gf_mx2d_init(_this->smat);
-	}
-	return GF_OK;
-}
-
-
-/*
-	Solid color stencil
-*/
-
-EVGStencil *evg_solid_brush()
-{
-	EVG_Brush *tmp;
-	GF_SAFEALLOC(tmp, EVG_Brush);
-	if (!tmp) return 0L;
-	tmp->fill_run = NULL;
-	tmp->color = 0xFF000000;
-	tmp->type = GF_STENCIL_SOLID;
-	return (EVGStencil *) tmp;
-}
-
-GF_Err evg_stencil_set_brush_color(GF_STENCIL st, GF_Color c)
-{
-	EVG_Brush *_this = (EVG_Brush *) st;
-	if (!_this  || (_this ->type != GF_STENCIL_SOLID) ) return GF_BAD_PARAM;
-	_this->color = c;
-	return GF_OK;
-}
-
-
-/*
-	linear gradient stencil
-*/
-
-static void lgb_fill_run(EVGStencil *p, EVGSurface *surf, s32 x, s32 y, u32 count)
-{
-	Bool has_cmat, has_a;
-	Fixed _res;
-	s32 val;
-	u32 col, ca;
-	u32 *data = surf->stencil_pix_run;
-	EVG_LinearGradient *_this = (EVG_LinearGradient *) p;
-
-	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
-	has_a = (_this->alpha==0xFF) ? GF_FALSE : GF_TRUE;
-
-	/*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 (has_a) {
-			ca = ((GF_COL_A(col) + 1) * _this->alpha) >> 8;
-			col = ( ((ca<<24) & 0xFF000000) ) | (col & 0x00FFFFFF);
-		}
-		if (has_cmat) col = gf_cmx_apply(&p->cmat, col);
-		*data++ = col;
-		count--;
-	}
-}
-
-GF_Err evg_stencil_set_linear_gradient(GF_STENCIL st, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y)
-{
-	GF_Matrix2D mtx;
-	GF_Point2D s;
-	Fixed f;
-	EVG_LinearGradient *_this = (EVG_LinearGradient *) st;
-	if (_this->type != GF_STENCIL_LINEAR_GRADIENT) return GF_BAD_PARAM;
-
-	_this->start.x = start_x;
-	_this->start.y = start_y;
-	_this->end.x = end_x;
-	_this->end.y = end_y;
-	s.x = end_x - start_x;
-	s.y = end_y - start_y;
-	f = gf_v2d_len(&s);
-	if (f) f = gf_invfix(f);
-
-	gf_mx2d_init(mtx);
-	mtx.m[2] = - _this->start.x;
-	mtx.m[5] = - _this->start.y;
-	_this->vecmat = mtx;
-
-	gf_mx2d_init(mtx);
-	gf_mx2d_add_rotation(&mtx, 0, 0, - gf_atan2(s.y, s.x));
-	gf_mx2d_add_matrix(&_this->vecmat, &mtx);
-
-	gf_mx2d_init(mtx);
-	gf_mx2d_add_scale(&mtx, f, f);
-	gf_mx2d_add_matrix(&_this->vecmat, &mtx);
-	return GF_OK;
-}
-
-EVGStencil *evg_linear_gradient_brush()
-{
-	s32 i;
-	EVG_LinearGradient *tmp;
-	GF_SAFEALLOC(tmp, EVG_LinearGradient);
-	if (!tmp) return 0L;
-	gf_mx2d_init(tmp->vecmat);
-	tmp->fill_run = lgb_fill_run;
-	tmp->type = GF_STENCIL_LINEAR_GRADIENT;
-	for(i=0; i<EVGGRADIENTSLOTS; i++) tmp->pos[i]=-1;
-
-	tmp->alpha = 0xFF;
-	evg_stencil_set_linear_gradient((EVGStencil *)tmp, 0, 0, FIX_ONE, 0);
-	return (EVGStencil *) tmp;
-}
-
-
-/*
-	radial gradient stencil
-*/
-
-static void rg_fill_run(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count)
-{
-	Fixed x, y, dx, dy, b, val;
-	Bool has_cmat, has_a;
-	s32 pos;
-	u32 col, ca;
-	u32 *data = surf->stencil_pix_run;
-	EVG_RadialGradient *_this = (EVG_RadialGradient *) p;
-
-	x = INT2FIX(_x);
-	y = INT2FIX(_y);
-	gf_mx2d_apply_coords(&_this->smat, &x, &y);
-
-	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
-	has_a = (_this->alpha==0xFF) ? GF_FALSE : GF_TRUE;
-
-	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 (has_a) {
-			ca = ((GF_COL_A(col) + 1) * _this->alpha) >> 8;
-			col = ( ((ca<<24) & 0xFF000000) ) | (col & 0x00FFFFFF);
-		}
-		if (has_cmat) col = gf_cmx_apply(&p->cmat, col);
-		*data++ = col;
-
-		dx += _this->d_i.x;
-		dy += _this->d_i.y;
-		count--;
-	}
-}
-
-void evg_radial_init(EVG_RadialGradient *_this)
-{
-	GF_Point2D p0, p1;
-	p0.x = p0.y = p1.y = 0;
-	p1.x = FIX_ONE;
-
-	gf_mx2d_apply_point(&_this->smat, &p0);
-	gf_mx2d_apply_point(&_this->smat, &p1);
-	_this->d_i.x = p1.x - p0.x;
-	_this->d_i.y = p1.y - p0.y;
-
-	_this->rad = FIX_ONE - gf_mulfix(_this->d_f.x, _this->d_f.x) - gf_mulfix(_this->d_f.y, _this->d_f.y);
-	if (_this->rad) {
-		_this->rad = gf_invfix(_this->rad);
-	} else {
-		_this->rad = EVGGRADIENTBUFFERSIZE;
-	}
-}
-
-EVGStencil *evg_radial_gradient_brush()
-{
-	s32 i;
-	EVG_RadialGradient *tmp;
-	GF_SAFEALLOC(tmp, EVG_RadialGradient);
-	if (!tmp) return 0L;
-
-	tmp->fill_run = rg_fill_run;
-	tmp->type = GF_STENCIL_RADIAL_GRADIENT;
-	for(i=0; i<EVGGRADIENTSLOTS; i++) tmp->pos[i]=-1;
-
-	tmp->center.x = tmp->center.y = FIX_ONE/2;
-	tmp->focus = tmp->center;
-	tmp->radius = tmp->center;
-	tmp->alpha = 0xFF;
-	return (EVGStencil *) tmp;
-}
-
-
-GF_Err evg_stencil_set_radial_gradient(GF_STENCIL st, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius)
-{
-	EVG_RadialGradient *_this = (EVG_RadialGradient *) st;
-	if (_this->type != GF_STENCIL_RADIAL_GRADIENT) return GF_BAD_PARAM;
-
-	_this->center.x = cx;
-	_this->center.y = cy;
-	_this->focus.x = fx;
-	_this->focus.y = fy;
-	_this->radius.x = x_radius;
-	_this->radius.y = y_radius;
-	return GF_OK;
-}
-
-/*
-	Texture stencil - this is just a crude texture mapper, it lacks precision and filtering ...
-*/
-
-#define USE_BILINEAR	0
-
-#if USE_BILINEAR
-static GFINLINE s32 mul255(s32 a, s32 b)
-{
-	return ((a+1) * b) >> 8;
-}
-static u32 EVG_LERP(u32 c0, u32 c1, u8 t)
-{
-	s32 a0, r0, g0, b0;
-	s32 a1, r1, g1, b1;
-	s32 a2, r2, g2, b2;
-
-	if (!t) return c0;
-
-	a0 = GF_COL_A(c0);
-	r0 = GF_COL_R(c0);
-	g0 = GF_COL_G(c0);
-	b0 = GF_COL_B(c0);
-	a1 = GF_COL_A(c1);
-	r1 = GF_COL_R(c1);
-	g1 = GF_COL_G(c1);
-	b1 = GF_COL_B(c1);
-
-	a2 = a0 + mul255(t, (a1 - a0));
-	r2 = r0 + mul255(t, (r1 - r0));
-	g2 = g0 + mul255(t, (g1 - g0));
-	b2 = b0 + mul255(t, (b1 - b0));
-	return (a2<<24) | (r2<<16) | (g2<<8) | b2;
-}
-#endif
-
-static void bmp_untransform_coord(EVG_Texture *_this, s32 _x, s32 _y, Fixed *outx, Fixed *outy)
-{
-	u32 checkx, checky;
-	Fixed x, y, dim;
-
-	/* reverse to texture coords*/
-	x = INT2FIX(_x);
-	y = INT2FIX(_y);
-	gf_mx2d_apply_coords(&_this->smat, &x, &y);
-
-	checkx = checky = 0;
-	if (ABS(x)< FIX_ONE/20) checkx = 1;
-	if (ABS(y)< FIX_ONE/20) checky = 1;
-
-	/*we may have a numerical stability issues, try to figure out whether we are close from 0 or width/height*/
-	if ( checkx || checky) {
-		Fixed tx, ty;
-		tx = INT2FIX(_x+1);
-		ty = INT2FIX(_y+1);
-		gf_mx2d_apply_coords(&_this->smat, &tx, &ty);
-
-		if (checkx) {
-			if (tx<0) x = INT2FIX(_this->width - 1);
-			else x = 0;
-		}
-		if (checky) {
-			if (ty<0) y = INT2FIX(_this->height - 1);
-			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;
-	}
-
-	*outx=x;
-	*outy=y;
-}
-
-static void bmp_fill_run(EVGStencil *p, EVGSurface *surf, 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;
-#if USE_BILINEAR
-	s32 incx, incy;
-#endif
-	u32 *data = surf->stencil_pix_run;
-	EVG_Texture *_this = (EVG_Texture *) p;
-
-	bmp_untransform_coord(_this, _x, _y, &x, &y);
-
-#if USE_BILINEAR
-	incx = (_this->inc_x>0) ? 1 : -1;
-	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;
-	has_cmat = _this->cmat.identity ? GF_FALSE : GF_TRUE;
-	replace_col = _this->replace_col;
-
-	while (count) {
-		x0 = FIX2INT(x);
-		assert((s32)x0 >=0);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else {
-			x0 = MIN(x0, (s32) _this->width - 1);
-		}
-
-		y0 = FIX2INT(y);
-		assert((s32)y0 >=0);
-		if (repeat_t) {
-			y0 = (y0) % _this->height;
-		} else if (y0 >= (s32) _this->height) {
-			y0 = _this->height-1;
-		}
-
-		pix = _this->tx_get_pixel(_this->pixels + _this->stride*y0 + _this->Bpp*x0);
-
-		_x++;
-		bmp_untransform_coord(_this, _x, _y, &x, &y);
-
-		if (x<0) x+=INT2FIX(_this->width);
-		if (y<0) y+=INT2FIX(_this->height);
-
-		/*bilinear filtering - disabled (too slow and not precise enough)*/
-#if USE_BILINEAR
-		if (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) {
-			u32 p00, p01, p10, p11;
-			s32 x1, y1;
-			u8 tx, ty;
-
-			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) {
-					while (x1<0) x1 += _this->width;
-				} else {
-					x1 = x1 % _this->width;
-				}
-				y1 = (y0+incy);
-				if (y1<0) {
-					while (y1<0) y1+=_this->height;
-				} 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;
-				p01 = _this->tx_get_pixel(_this->pixels + _this->stride*y0 + _this->Bpp*x1);
-				p10 = _this->tx_get_pixel(_this->pixels + _this->stride*y1 + _this->Bpp*x0);
-				p11 = _this->tx_get_pixel(_this->pixels + _this->stride*y1 + _this->Bpp*x1);
-
-				p00 = EVG_LERP(p00, p01, tx);
-				p10 = EVG_LERP(p10, p11, tx);
-				pix = EVG_LERP(p00, p10, ty);
-			}
-		}
-#endif
-
-		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);
-			pix = ((__a<<24) | (replace_col & 0x00FFFFFF));
-		} else if (has_cmat) {
-			pix = gf_cmx_apply(&_this->cmat, pix);
-		}
-		*data++ = pix;
-		count--;
-	}
-}
-
-
-/*just a little faster...*/
-static void bmp_fill_run_straight(EVGStencil *p, EVGSurface *surf, s32 _x, s32 _y, u32 count)
-{
-	s32 x0, y0;
-	u32 pix;
-	u32 __a;
-	Bool repeat_s = GF_FALSE;
-	Fixed x, y, _fdim;
-	char *pix_line;
-	u32 *data = surf->stencil_pix_run;
-	EVG_Texture *_this = (EVG_Texture *) p;
-
-	/*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];
-
-	/*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);
-		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);
-		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;
-	pix_line = _this->pixels + _this->stride*y0;
-
-	while (count) {
-		x0 = FIX2INT(x);
-		if (repeat_s) {
-			x0 = (x0) % _this->width;
-		} else if (x0 >= (s32) _this->width) x0 = _this->width-1;
-
-		x += _this->inc_x;
-		pix = _this->tx_get_pixel(pix_line + _this->Bpp*x0);
-
-		if (_this->replace_col) {
-			__a = GF_COL_A(pix);
-			pix = ((__a<<24) | (_this->replace_col & 0x00FFFFFF));
-		}
-		*data++ = pix;
-		count--;
-	}
-}
-
-void evg_bmp_init(EVGStencil *p)
-{
-	GF_Point2D p0, p1;
-	EVG_Texture *_this = (EVG_Texture *) p;
-
-	p0.x = p0.y = p1.y = 0;
-	p1.x = FIX_ONE;
-	gf_mx2d_apply_point(&_this->smat, &p0);
-	gf_mx2d_apply_point(&_this->smat, &p1);
-	_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 ((_this->alpha == 255) && !_this->smat.m[1] && !_this->smat.m[3] && (_this->cmat.identity || _this->cmat_is_replace)) {
-		_this->fill_run = bmp_fill_run_straight;
-	} else {
-		_this->fill_run = bmp_fill_run;
-	}
-}
-
-
-EVGStencil *evg_texture_brush()
-{
-	EVG_Texture *tmp;
-	GF_SAFEALLOC(tmp, EVG_Texture);
-	if (!tmp) return 0L;
-
-	tmp->fill_run = bmp_fill_run;
-	tmp->type = GF_STENCIL_TEXTURE;
-	/*default is using the surface settings*/
-	tmp->filter = GF_TEXTURE_FILTER_DEFAULT;
-	tmp->mod = 0;
-	gf_cmx_init(&tmp->cmat);
-	tmp->alpha = 255;
-	return (EVGStencil *) tmp;
-}
-
-
-u32 get_pix_argb(char *pix) {
-	return GF_COL_ARGB(*(pix+3) & 0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *pix & 0xFF);
-}
-u32 get_pix_rgba(char *pix) {
-	return GF_COL_ARGB(*(pix+3) & 0xFF, *pix & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
-}
-u32 get_pix_rgb_32(char *pix) {
-	return GF_COL_ARGB(0xFF, *(pix+2) & 0xFF, *(pix+1) & 0xFF, *pix & 0xFF);
-}
-u32 get_pix_rgb_24(char *pix) {
-	return GF_COL_ARGB(0xFF, *pix & 0xFF, *(pix+1) & 0xFF, *(pix+2) & 0xFF);
-}
-u32 get_pix_bgr_24(char *pix) {
-	return GF_COL_ARGB(0xFF, *(pix+2) & 0xFF, * (pix+1) & 0xFF, *pix & 0xFF);
-}
-u32 get_pix_444(char *pix) {
-	u16 val = *(u16*)pix;
-	return GF_COL_ARGB(0xFF,  (u8) ( (val >> 4) & 0xf0), (u8) ( (val) & 0xf0),  (u8) ( (val << 4) & 0xf0)	);
-}
-u32 get_pix_555(char *pix) {
-	u16 val = *(u16*)pix;
-	return GF_COL_ARGB(0xFF, (u8) ( (val >> 7) & 0xf8), (u8) ( (val >> 2) & 0xf8), (u8) ( (val << 3) & 0xf8) );
-}
-u32 get_pix_565(char *pix) {
-	u16 val = *(u16*)pix;
-	return GF_COL_ARGB(0xFF,  (u8) ( (val >> 8) & 0xf8), (u8) ( (val >> 3) & 0xfc),  (u8) ( (val << 3) & 0xf8)	);
-}
-u32 get_pix_grey(char *pix) {
-	u8 val = *pix;
-	return GF_COL_ARGB(0xFF, val, val, val);
-}
-u32 get_pix_alphagrey(char *pix) {
-	return GF_COL_ARGB((u8) *(pix+1), (u8) *pix, (u8) *pix, (u8) *pix);
-}
-
-static void texture_set_callback(EVG_Texture *_this)
-{
-	switch (_this->pixel_format) {
-	case GF_PIXEL_RGBA:
-		_this->tx_get_pixel = get_pix_rgba;
-		return;
-	case GF_PIXEL_ARGB:
-		_this->tx_get_pixel = get_pix_argb;
-		return;
-	case GF_PIXEL_RGB_32:
-		_this->tx_get_pixel = get_pix_rgb_32;
-		return;
-	case GF_PIXEL_RGB_24:
-		_this->tx_get_pixel = get_pix_rgb_24;
-		return;
-	case GF_PIXEL_BGR_24:
-		_this->tx_get_pixel = get_pix_bgr_24;
-		return;
-	case GF_PIXEL_RGB_444:
-		_this->tx_get_pixel = get_pix_444;
-		return;
-	case GF_PIXEL_RGB_555:
-		_this->tx_get_pixel = get_pix_555;
-		return;
-	case GF_PIXEL_RGB_565:
-		_this->tx_get_pixel = get_pix_565;
-		return;
-	case GF_PIXEL_GREYSCALE:
-		_this->tx_get_pixel = get_pix_grey;
-		return;
-	case GF_PIXEL_ALPHAGREY:
-		_this->tx_get_pixel = get_pix_alphagrey;
-		return;
-	}
-}
-
-GF_Err evg_stencil_set_texture(GF_STENCIL st, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy)
-{
-	EVG_Texture *_this = (EVG_Texture *) st;
-	if (!_this || (_this->type != GF_STENCIL_TEXTURE) || !pixels || !width || !height || !stride || _this->owns_texture)
-		return GF_BAD_PARAM;
-
-	_this->pixels = 0L;
-	_this->is_converted = GF_TRUE;
-
-	switch (pixelFormat) {
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGBA:
-	case GF_PIXEL_RGB_32:
-		_this->Bpp = 4;
-		break;
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_BGR_24:
-		_this->Bpp = 3;
-		break;
-	case GF_PIXEL_RGB_555:
-	case GF_PIXEL_RGB_565:
-	case GF_PIXEL_RGB_444:
-	case GF_PIXEL_ALPHAGREY:
-		_this->Bpp = 2;
-		break;
-	case GF_PIXEL_GREYSCALE:
-		_this->Bpp = 1;
-		break;
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_IYUV:
-	case GF_PIXEL_I420:
-		_this->orig_format = GF_PIXEL_YV12;
-		_this->orig_buf = (u8 *) pixels;
-		_this->orig_stride = stride;
-		_this->is_converted = GF_FALSE;
-		break;
-	case GF_PIXEL_YUVA:
-		_this->orig_format = GF_PIXEL_YUVA;
-		_this->orig_buf = (u8 *) pixels;
-		_this->orig_stride = stride;
-		_this->is_converted = GF_FALSE;
-		break;
-	default:
-		/*the rest is not supported (eg BGR32)*/
-		return GF_NOT_SUPPORTED;
-	}
-	_this->pixel_format = pixelFormat;
-	_this->width = width;
-	_this->height = height;
-	_this->stride = stride;
-	_this->pixels = (char *) pixels;
-	texture_set_callback(_this);
-	return GF_OK;
-}
-
-
-GF_Err evg_stencil_set_tiling(GF_STENCIL st, GF_TextureTiling mode)
-{
-	EVG_Texture *_this = (EVG_Texture *) st;
-	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
-	_this->mod = mode;
-	return GF_OK;
-}
-
-GF_Err evg_stencil_set_filter(GF_STENCIL st, GF_TextureFilter filter_mode)
-{
-	EVG_Texture *_this = (EVG_Texture *) st;
-	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
-	_this->filter = filter_mode;
-	return GF_OK;
-}
-
-GF_Err evg_stencil_set_color_matrix(GF_STENCIL st, GF_ColorMatrix *cmat)
-{
-	EVG_Texture *_this = (EVG_Texture *)st;
-	if (!_this) return GF_BAD_PARAM;
-	if (!cmat) gf_cmx_init(&_this->cmat);
-	else gf_cmx_copy(&_this->cmat, cmat);
-	return GF_OK;
-}
-
-GF_Err evg_stencil_set_alpha(GF_STENCIL st, u8 alpha)
-{
-	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_TEXTURE)
-		_this->alpha = alpha;
-	else
-		((EVG_BaseGradient*)st)->alpha = alpha;
-	return GF_OK;
-}
-
-
-/*internal*/
-void evg_set_texture_active(EVGStencil *st)
-{
-	GF_VideoSurface src, dst;
-	EVG_Texture *_this = (EVG_Texture *)st;
-	if (_this->is_converted) return;
-
-	/*perform YUV->RGB*/
-
-	if (_this->orig_format == GF_PIXEL_YV12) {
-		_this->Bpp = 3;
-		_this->pixel_format = GF_PIXEL_RGB_24;
-	} else {
-		_this->Bpp = 4;
-		_this->pixel_format = GF_PIXEL_ARGB;
-	}
-	if (_this->Bpp * _this->width * _this->height > _this->conv_size) {
-		if (_this->conv_buf) gf_free(_this->conv_buf);
-		_this->conv_size = _this->Bpp * _this->width * _this->height;
-		_this->conv_buf = (unsigned char *) gf_malloc(sizeof(unsigned char)*_this->conv_size);
-	}
-
-	memset(&src, 0, sizeof(GF_VideoSurface));
-	src.height = _this->height;	
-	src.width = _this->width;
-	src.pitch_x = 0;
-	src.pitch_y = _this->orig_stride;
-	src.pixel_format = _this->orig_format;
-	src.video_buffer = (char *)_this->orig_buf;
-
-	memset(&dst, 0, sizeof(GF_VideoSurface));
-	dst.width = _this->width;
-	dst.height = _this->height;
-	dst.pitch_x = _this->Bpp;
-	dst.pitch_y = _this->Bpp * _this->width;
-	dst.pixel_format = _this->pixel_format;
-	dst.video_buffer = (char *) _this->conv_buf;
-
-	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, GF_FALSE, NULL, NULL);
-
-	_this->is_converted = GF_TRUE;
-	_this->pixels = (char *) _this->conv_buf;
-	_this->stride = _this->Bpp * _this->width;
-	texture_set_callback(_this);
-}
-

gpac-0.8.0.tar.gz/modules/soft_raster/surface.c Deleted

@@ -1,662 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / software 2D rasterizer module
- *
- *  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 "rast_soft.h"
-
-static void get_surface_world_matrix(EVGSurface *_this, GF_Matrix2D *mat)
-{
-	gf_mx2d_init(*mat);
-	if (_this->center_coords) {
-		gf_mx2d_add_scale(mat, FIX_ONE, -FIX_ONE);
-		gf_mx2d_add_translation(mat, INT2FIX(_this->width / 2), INT2FIX(_this->height / 2));
-	}
-}
-
-GF_SURFACE evg_surface_new(GF_Raster2D *_dr, Bool center_coords)
-{
-	EVGSurface *_this;
-	GF_SAFEALLOC(_this, EVGSurface);
-	if (_this) {
-		_this->center_coords = center_coords;
-		_this->texture_filter = GF_TEXTURE_FILTER_DEFAULT;
-		_this->ftparams.source = &_this->ftoutline;
-		_this->ftparams.user = _this;
-		_this->raster = evg_raster_new();
-	}
-	return _this;
-}
-
-void evg_surface_delete(GF_SURFACE _this)
-{
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf)
-		return;
-#ifndef INLINE_POINT_CONVERSION
-	if (surf->points) gf_free(surf->points);
-	surf->points = NULL;
-#endif
-	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;
-	gf_free(surf);
-}
-
-GF_Err evg_surface_set_matrix(GF_SURFACE _this, GF_Matrix2D *mat)
-{
-	GF_Matrix2D tmp;
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf) return GF_BAD_PARAM;
-	get_surface_world_matrix(surf, &surf->mat);
-	if (!mat) return GF_OK;
-	gf_mx2d_init(tmp);
-	gf_mx2d_add_matrix(&tmp, mat);
-	gf_mx2d_add_matrix(&tmp, &surf->mat);
-	gf_mx2d_copy(surf->mat, tmp);
-	return GF_OK;
-}
-
-
-GF_Err evg_surface_attach_to_callbacks(GF_SURFACE _this, GF_RasterCallback *callbacks, u32 width, u32 height)
-{
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf || !width || !height || !callbacks) return GF_BAD_PARAM;
-	if (!callbacks->cbk || !callbacks->fill_run_alpha || !callbacks->fill_run_no_alpha || !callbacks->fill_rect) return GF_BAD_PARAM;
-
-	surf->width = width;
-	surf->height = height;
-	if (surf->stencil_pix_run) gf_free(surf->stencil_pix_run);
-	surf->stencil_pix_run = (u32 *) gf_malloc(sizeof(u32) * (width+2));
-
-	surf->raster_cbk = callbacks->cbk;
-	surf->raster_fill_run_alpha = callbacks->fill_run_alpha;
-	surf->raster_fill_run_no_alpha = callbacks->fill_run_no_alpha;
-	surf->raster_fill_rectangle = callbacks->fill_rect;
-	evg_surface_set_matrix(surf, NULL);
-	return GF_OK;
-}
-
-
-GF_Err evg_surface_attach_to_buffer(GF_SURFACE _this, char *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
-{
-	u32 BPP;
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf || !pixels || (pixelFormat>GF_PIXEL_YUVA)) return GF_BAD_PARAM;
-
-	switch (pixelFormat) {
-#ifdef GF_RGB_444_SUPORT
-	case GF_PIXEL_RGB_444:
-#endif
-#ifdef GF_RGB_555_SUPORT
-	case GF_PIXEL_RGB_555:
-#endif
-	case GF_PIXEL_RGB_565:
-		BPP = 2;
-		break;
-	case GF_PIXEL_BGR_24:
-	case GF_PIXEL_RGB_24:
-		BPP = 3;
-		break;
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGBA:
-	case GF_PIXEL_BGR_32:
-		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->stencil_pix_run) gf_free(surf->stencil_pix_run);
-		surf->stencil_pix_run = (u32 *) gf_malloc(sizeof(u32) * (width+2));
-	}
-	surf->width = width;
-	surf->height = height;
-	surf->pixels = (char*)pixels;
-	surf->pixelFormat = pixelFormat;
-	surf->BPP = BPP;
-
-	surf->raster_cbk = NULL;
-	surf->raster_fill_run_alpha = NULL;
-	surf->raster_fill_run_no_alpha = NULL;
-	evg_surface_set_matrix(_this, NULL);
-	return GF_OK;
-}
-
-
-GF_Err evg_surface_attach_to_texture(GF_SURFACE _this, GF_STENCIL sten)
-{
-	u32 BPP;
-	EVGSurface *surf = (EVGSurface *)_this;
-	EVG_Texture *tx = (EVG_Texture *) sten;
-	if (!surf || (tx->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
-
-	switch (tx->pixel_format) {
-	case GF_PIXEL_GREYSCALE:
-		BPP = 1;
-		break;
-	case GF_PIXEL_ALPHAGREY:
-#ifdef GF_RGB_444_SUPORT
-	case GF_PIXEL_RGB_444:
-#endif
-#ifdef GF_RGB_555_SUPORT
-	case GF_PIXEL_RGB_555:
-#endif
-	case GF_PIXEL_RGB_565:
-		BPP = 2;
-		break;
-	case GF_PIXEL_BGR_24:
-	case GF_PIXEL_RGB_24:
-		BPP = 3;
-		break;
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_BGR_32:
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGBA:
-		BPP = 4;
-		break;
-	default:
-		return GF_NOT_SUPPORTED;
-	}
-	surf->pitch_x = BPP;
-	surf->pitch_y = tx->stride;
-	if (surf->stencil_pix_run) gf_free(surf->stencil_pix_run);
-	surf->stencil_pix_run = (u32 *) gf_malloc(sizeof(u32) * (tx->width+2));
-
-	surf->width = tx->width;
-	surf->height = tx->height;
-	surf->pixels = tx->pixels;
-	surf->pixelFormat = tx->pixel_format;
-	surf->BPP = BPP;
-	surf->raster_cbk = NULL;
-	surf->raster_fill_run_alpha = NULL;
-	surf->raster_fill_run_no_alpha = NULL;
-	evg_surface_set_matrix(surf, NULL);
-	return GF_OK;
-}
-
-void evg_surface_detach(GF_SURFACE _this)
-{
-	EVGSurface *surf = (EVGSurface *)_this;
-	surf->raster_cbk = NULL;
-	surf->raster_fill_run_alpha = NULL;
-	surf->raster_fill_run_no_alpha = NULL;
-}
-
-GF_Err evg_surface_clear(GF_SURFACE _this, GF_IRect *rc, u32 color)
-{
-	GF_IRect clear;
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf) return GF_BAD_PARAM;
-
-	if (rc) {
-		s32 _x, _y;
-		if (surf->center_coords) {
-			_x = rc->x + surf->width / 2;
-			_y = surf->height / 2 - rc->y;
-		} else {
-			_x = rc->x;
-			_y = rc->y - rc->height;
-		}
-
-		clear.width = (u32) rc->width;
-		if (_x>=0) {
-			clear.x = (u32) _x;
-		} else {
-			if ( (s32) clear.width + _x < 0) return GF_BAD_PARAM;
-			clear.width += _x;
-			clear.x = 0;
-		}
-		clear.height = (u32) rc->height;
-		if (_y>=0) {
-			clear.y = _y;
-		} else {
-			if ( (s32) clear.height + _y < 0) return GF_BAD_PARAM;
-			clear.height += _y;
-			clear.y = 0;
-		}
-	} else {
-		clear.x = clear.y = 0;
-		clear.width = surf->width;
-		clear.height = surf->height;
-	}
-
-	if (surf->raster_cbk) {
-		surf->raster_fill_rectangle(surf->raster_cbk, clear.x, clear.y, clear.width, clear.height, color);
-		return GF_OK;
-	}
-
-	switch (surf->pixelFormat) {
-	case GF_PIXEL_ARGB:
-	case GF_PIXEL_RGB_32:
-		return evg_surface_clear_bgra(surf, clear, color);
-	case GF_PIXEL_BGR_32:
-		return evg_surface_clear_rgbx(surf, clear, color);
-	case GF_PIXEL_RGBA:
-		return evg_surface_clear_rgba(surf, clear, color);
-	case GF_PIXEL_BGR_24:
-		return evg_surface_clear_bgr(surf, clear, color);
-	case GF_PIXEL_RGB_24:
-		return evg_surface_clear_rgb(surf, clear, color);
-	case GF_PIXEL_RGB_565:
-		return evg_surface_clear_565(surf, clear, color);
-#ifdef GF_RGB_444_SUPORT
-	case GF_PIXEL_RGB_444:
-		return evg_surface_clear_444(surf, clear, color);
-#endif
-#ifdef GF_RGB_555_SUPORT
-	case GF_PIXEL_RGB_555:
-		return evg_surface_clear_555(surf, clear, color);
-#endif
-	default:
-		return GF_BAD_PARAM;
-	}
-}
-
-GF_Err evg_surface_set_raster_level(GF_SURFACE _this, GF_RasterLevel RasterSetting)
-{
-	EVGSurface *surf = (EVGSurface *)_this;
-	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;
-	}
-	return GF_OK;
-}
-
-
-GF_Err evg_surface_set_clipper(GF_SURFACE _this , GF_IRect *rc)
-{
-	EVGSurface *surf = (EVGSurface *)_this;
-	if (!surf) return GF_BAD_PARAM;
-	if (rc) {
-		surf->clipper = *rc;
-		surf->useClipper = 1;
-		/*clipper was given in BIFS like coords, we work with bottom-min for rect, (0,0) top-left of surface*/
-		if (surf->center_coords) {
-			surf->clipper.x += surf->width / 2;
-			surf->clipper.y = surf->height / 2 - rc->y;
-		} else {
-			surf->clipper.y -= rc->height;
-		}
-
-		if (surf->clipper.x <=0) {
-			if (surf->clipper.x + (s32) surf->clipper.width < 0) return GF_BAD_PARAM;
-			surf->clipper.width += surf->clipper.x;
-			surf->clipper.x = 0;
-		}
-		if (surf->clipper.y <=0) {
-			if (surf->clipper.y + (s32) surf->clipper.height < 0) return GF_BAD_PARAM;
-			surf->clipper.height += surf->clipper.y;
-			surf->clipper.y = 0;
-		}
-		if (surf->clipper.x + surf->clipper.width > (s32) surf->width) {
-			surf->clipper.width = surf->width - surf->clipper.x;
-		}
-		if (surf->clipper.y + surf->clipper.height > (s32) surf->height) {
-			surf->clipper.height = surf->height - surf->clipper.y;
-		}
-	} else {
-		surf->useClipper = 0;
-	}
-	return GF_OK;
-}
-
-
-static Bool setup_grey_callback(EVGSurface *surf)
-{
-	u32 col, a;
-	Bool use_const = GF_TRUE;
-
-	if (surf->sten->type == GF_STENCIL_SOLID) {
-		col = surf->fill_col = ((EVG_Brush *)surf->sten)->color;
-		a = GF_COL_A(surf->fill_col);
-	} else {
-		col = a = 0;
-		use_const = GF_FALSE;
-	}
-
-	if (surf->raster_cbk) {
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_user_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_user_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_user_fill_var;
-		}
-		return GF_TRUE;
-	}
-
-	switch (surf->pixelFormat) {
-	case GF_PIXEL_ARGB:
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgra_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgra_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgra_fill_var;
-		}
-		break;
-
-	case GF_PIXEL_RGBA:
-		if (use_const) {
-			if (!a) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgba_fill_erase;
-			} else if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgba_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgba_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgba_fill_var;
-		}
-		break;
-
-	case GF_PIXEL_RGB_32:
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgrx_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgrx_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgrx_fill_var;
-		}
-		break;
-
-	case GF_PIXEL_BGR_32:
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_var;
-		}
-		break;
-
-	case GF_PIXEL_RGB_24:
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_var;
-		}
-		break;
-	case GF_PIXEL_BGR_24:
-		if (use_const) {
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgr_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgr_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_bgr_fill_var;
-		}
-		break;
-	case GF_PIXEL_RGB_565:
-		if (use_const) {
-			surf->fill_565 = GF_COL_TO_565(col);
-			if (!a) return GF_FALSE;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_565_fill_var;
-			assert(surf->sten->fill_run);
-		}
-		break;
-#ifdef GF_RGB_444_SUPORT
-		if (use_const) {
-			surf->fill_444 = GF_COL_TO_444(col);
-			if (!a) return 0;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_444_fill_var;
-		}
-		break;
-#endif
-#ifdef GF_RGB_555_SUPORT
-	case GF_PIXEL_RGB_555:
-		if (use_const) {
-			surf->fill_555 = GF_COL_TO_555(col);
-			if (!a) return 0;
-			if (a!=0xFF) {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const_a;
-			} else {
-				surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const;
-			}
-		} else {
-			surf->ftparams.gray_spans = (EVG_Raster_Span_Func) evg_555_fill_var;
-		}
-		break;
-#endif
-	}
-	return GF_TRUE;
-}
-
-
-GF_Err evg_surface_set_path(GF_SURFACE _this, GF_Path *gp)
-{
-#ifndef INLINE_POINT_CONVERSION
-	u32 i;
-	GF_Point2D pt;
-#endif
-	EVGSurface *surf = (EVGSurface *)_this;
-
-	if (!surf) return GF_BAD_PARAM;
-	if (!gp || !gp->n_points) {
-		surf->ftoutline.n_points = 0;
-		surf->ftoutline.n_contours = 0;
-		return GF_OK;
-	}
-	gf_path_flatten(gp);
-	surf->ftoutline.n_points = gp->n_points;
-	surf->ftoutline.n_contours = gp->n_contours;
-
-	surf->ftoutline.tags = gp->tags;
-	surf->ftoutline.contours = (s32*) gp->contours;
-
-	/*store path bounds for gradient/textures*/
-	gf_path_get_bounds(gp, &surf->path_bounds);
-	/*invert Y (ft uses min Y)*/
-	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;
-
-#ifdef INLINE_POINT_CONVERSION
-	surf->ftoutline.n_points = gp->n_points;
-	surf->ftoutline.points = gp->points;
-	surf->ftparams.mx = &surf->mat;
-#else
-	if (surf->pointlen < gp->n_points) {
-		surf->points = gf_realloc(surf->points, sizeof(EVG_Vector) * gp->n_points);
-		if (surf->points == NULL) {
-			surf->pointlen = 0;
-			return GF_OUT_OF_MEM;
-		}
-		surf->pointlen = gp->n_points;
-	}
-	surf->ftoutline.points = surf->points;
-
-	for (i=0; i<gp->n_points; i++) {
-		pt = gp->points[i];
-		gf_mx2d_apply_point(&surf->mat, &pt);
-#ifdef GPAC_FIXED_POINT
-		surf->points[i].x = pt.x;
-		surf->points[i].y = pt.y;
-#else
-		/*move to 16.16 representation*/
-		surf->points[i].x = (u32) (pt.x * 0x10000L);
-		surf->points[i].y = (u32) (pt.y * 0x10000L);
-#endif
-	}
-#endif
-	return GF_OK;
-}
-
-/* static void gray_spans_stub(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf){} */
-
-GF_Err evg_surface_fill(GF_SURFACE _this, GF_STENCIL stencil)
-{
-	GF_Rect rc;
-	GF_Matrix2D mat, st_mat;
-	Bool restore_filter;
-	EVGSurface *surf = (EVGSurface *)_this;
-	EVGStencil *sten = (EVGStencil *)stencil;
-	if (!surf || !stencil) return GF_BAD_PARAM;
-	if (!surf->ftoutline.n_points) return GF_OK;
-	surf->sten = sten;
-
-	/*setup ft raster calllbacks*/
-	if (!setup_grey_callback(surf)) return GF_OK;
-
-	/*	surf->ftparams.gray_spans = gray_spans_stub; */
-
-	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);
-		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_init(sten->smat);
-		switch (sten->type) {
-		case GF_STENCIL_TEXTURE:
-			if (! ((EVG_Texture *)sten)->pixels) return GF_BAD_PARAM;
-
-			if (((EVG_Texture *)sten)->mod & GF_TEXTURE_FLIP) {
-				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);
-			}
-			evg_set_texture_active(sten);
-			gf_mx2d_add_matrix(&sten->smat, &st_mat);
-			gf_mx2d_add_matrix(&sten->smat, &mat);
-			gf_mx2d_inverse(&sten->smat);
-			evg_bmp_init(sten);
-			if (((EVG_Texture *)sten)->filter == GF_TEXTURE_FILTER_DEFAULT) {
-				restore_filter = GF_TRUE;
-				((EVG_Texture *)sten)->filter = surf->texture_filter;
-			}
-
-			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_inverse(&sten->smat);
-			/*and finalize matrix in gradient coord system*/
-			gf_mx2d_add_matrix(&sten->smat, &lin->vecmat);
-			gf_mx2d_add_scale(&sten->smat, INT2FIX(1<<EVGGRADIENTBITS), INT2FIX(1<<EVGGRADIENTBITS));
-
-		}
-		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_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);
-		}
-		break;
-		}
-	}
-
-	if (surf->useClipper) {
-		surf->ftparams.clip_xMin = surf->clipper.x;
-		surf->ftparams.clip_yMin = surf->clipper.y;
-		surf->ftparams.clip_xMax = (surf->clipper.x + surf->clipper.width);
-		surf->ftparams.clip_yMax = (surf->clipper.y + surf->clipper.height);
-	} else {
-		surf->ftparams.clip_xMin = 0;
-		surf->ftparams.clip_yMin = 0;
-		surf->ftparams.clip_xMax = (surf->width);
-		surf->ftparams.clip_yMax = (surf->height);
-	}
-
-	/*and call the raster*/
-	evg_raster_render(surf->raster, &surf->ftparams);
-
-	/*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;
-	}
-	surf->sten = 0L;
-	return GF_OK;
-}
-
-
-

gpac-0.8.0.tar.gz/modules/svg_in Deleted

gpac-0.8.0.tar.gz/modules/svg_in/Makefile Deleted

@@ -1,57 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/svg_in
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-ifeq ($(CONFIG_ZLIB), local)
-CFLAGS+= -I"$(LOCAL_INC_PATH)/zlib"
-EXTRALIBS+=-L../../extra_lib/lib/gcc
-endif
-ifneq ($(CONFIG_ZLIB), no)
-EXTRALIBS+=-lz
-endif
-
-#common obj
-OBJS= svg_in.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_svg_in$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols svg_in.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
-ifeq ($(STATICBUILD),yes)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_svg_in-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
-endif
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/svg_in/svg_in.c Deleted

@@ -1,466 +0,0 @@
-/*
- *					GPAC Multimedia Framework
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / SVG Loader module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/scene_manager.h>
-#include <gpac/constants.h>
-
-#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB)
-
-#include <zlib.h>
-
-typedef struct
-{
-	GF_SceneLoader loader;
-	GF_Scene *scene;
-	u8 oti;
-	char *file_name;
-	u32 file_size;
-	u32 sax_max_duration;
-	u16 base_es_id;
-	u32 file_pos;
-	gzFile src;
-} SVGIn;
-
-static Bool svg_check_download(SVGIn *svgin)
-{
-	u64 size;
-	FILE *f = gf_fopen(svgin->file_name, "rb");
-	if (!f) return GF_FALSE;
-	gf_fseek(f, 0, SEEK_END);
-	size = gf_ftell(f);
-	gf_fclose(f);
-	if (size==svgin->file_size) return GF_TRUE;
-	return GF_FALSE;
-}
-
-#define SVG_PROGRESSIVE_BUFFER_SIZE		4096
-
-static GF_Err svgin_deflate(SVGIn *svgin, const char *buffer, u32 buffer_len)
-{
-	GF_Err e;
-	char svg_data[2049];
-	int err;
-	u32 done = 0;
-	z_stream d_stream;
-	d_stream.zalloc = (alloc_func)0;
-	d_stream.zfree = (free_func)0;
-	d_stream.opaque = (voidpf)0;
-	d_stream.next_in  = (Bytef*)buffer;
-	d_stream.avail_in = buffer_len;
-	d_stream.next_out = (Bytef*)svg_data;
-	d_stream.avail_out = 2048;
-
-	err = inflateInit(&d_stream);
-	if (err == Z_OK) {
-		e = GF_OK;
-		while (d_stream.total_in < buffer_len) {
-			err = inflate(&d_stream, Z_NO_FLUSH);
-			if (err < Z_OK) {
-				e = GF_NON_COMPLIANT_BITSTREAM;
-				break;
-			}
-			svg_data[d_stream.total_out - done] = 0;
-			e = gf_sm_load_string(&svgin->loader, svg_data, GF_FALSE);
-			if (e || (err== Z_STREAM_END)) break;
-			done = (u32) d_stream.total_out;
-			d_stream.avail_out = 2048;
-			d_stream.next_out = (Bytef*)svg_data;
-		}
-		inflateEnd(&d_stream);
-		return e;
-	}
-	return GF_NON_COMPLIANT_BITSTREAM;
-}
-
-static GF_Err SVG_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 stream_time, u32 mmlevel)
-{
-	GF_Err e = GF_OK;
-	SVGIn *svgin = (SVGIn *)plug->privateStack;
-
-	if (stream_time==(u32)-1) {
-		if (svgin->src) 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;
-	}
-
-	switch (svgin->oti) {
-	/*!OTI for SVG dummy stream (dsi = file name) - GPAC internal*/
-	case GPAC_OTI_PRIVATE_SCENE_SVG:
-		/*full doc parsing*/
-		if ((svgin->sax_max_duration==(u32) -1) && svgin->file_size) {
-			/*init step*/
-			if (!svgin->loader.fileName) {
-				/*not done yet*/
-				if (!svg_check_download(svgin)) return GF_OK;
-				svgin->loader.fileName = svgin->file_name;
-				e = gf_sm_load_init(&svgin->loader);
-			} else {
-				e = gf_sm_load_run(&svgin->loader);
-			}
-		}
-		/*chunk parsing*/
-		else {
-			u32 entry_time;
-			char file_buf[SVG_PROGRESSIVE_BUFFER_SIZE+2];
-			/*initial load*/
-			if (!svgin->src && !svgin->file_pos) {
-				svgin->src = gzopen(svgin->file_name, "rb");
-				if (!svgin->src) return GF_URL_ERROR;
-				svgin->loader.fileName = svgin->file_name;
-				gf_sm_load_init(&svgin->loader);
-			}
-			e = GF_OK;
-			entry_time = gf_sys_clock();
-
-			while (1) {
-				u32 diff;
-				s32 nb_read;
-				nb_read = gzread(svgin->src, file_buf, SVG_PROGRESSIVE_BUFFER_SIZE);
-				/*we may have read nothing but we still need to call parse in case the parser got suspended*/
-				if (nb_read<=0) {
-					if ((e==GF_EOS) && gzeof(svgin->src)) {
-						gf_set_progress("SVG Parsing", svgin->file_pos, svgin->file_size);
-						gzclose(svgin->src);
-						svgin->src = NULL;
-						gf_sm_load_done(&svgin->loader);
-					}
-					goto exit;
-				}
-
-				file_buf[nb_read] = file_buf[nb_read+1] = 0;
-
-				e = gf_sm_load_string(&svgin->loader, file_buf, GF_FALSE);
-				svgin->file_pos += nb_read;
-
-
-
-				/*handle decompression*/
-				if (svgin->file_pos > svgin->file_size) svgin->file_size = svgin->file_pos + 1;
-				if (e) break;
-
-				gf_set_progress("SVG Parsing", svgin->file_pos, svgin->file_size);
-				diff = gf_sys_clock() - entry_time;
-				if (diff > svgin->sax_max_duration) {
-					break;
-				}
-			}
-		}
-		break;
-
-	/*!OTI for streaming SVG - GPAC internal*/
-	case GPAC_OTI_SCENE_SVG:
-		e = gf_sm_load_string(&svgin->loader, inBuffer, GF_FALSE);
-		break;
-
-	/*!OTI for streaming SVG + gz - GPAC internal*/
-	case GPAC_OTI_SCENE_SVG_GZ:
-		e = svgin_deflate(svgin, inBuffer, inBufferLength);
-		break;
-
-	/*!OTI for DIMS (dsi = 3GPP DIMS configuration) - GPAC internal*/
-	case GPAC_OTI_SCENE_DIMS:
-	{
-		u8 prev, dims_hdr;
-		u32 nb_bytes, size;
-		u64 pos;
-		char * buf2 = gf_malloc(inBufferLength);
-		GF_BitStream *bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
-		memcpy(buf2, inBuffer, inBufferLength);
-//			FILE *f = gf_fopen("dump.svg", "wb");
-//
-		while (gf_bs_available(bs)) {
-			pos = gf_bs_get_position(bs);
-			size = gf_bs_read_u16(bs);
-			nb_bytes = 2;
-			/*GPAC internal hack*/
-			if (!size) {
-				size = gf_bs_read_u32(bs);
-				nb_bytes = 6;
-			}
-//	            gf_fwrite( inBuffer + pos + nb_bytes + 1, 1, size - 1, f );
-
-			dims_hdr = gf_bs_read_u8(bs);
-			prev = buf2[pos + nb_bytes + size];
-
-			buf2[pos + nb_bytes + size] = 0;
-			if (dims_hdr & GF_DIMS_UNIT_C) {
-				e = svgin_deflate(svgin, buf2 + pos + nb_bytes + 1, size - 1);
-			} else {
-				e = gf_sm_load_string(&svgin->loader, buf2 + pos + nb_bytes + 1, GF_FALSE);
-			}
-			buf2[pos + nb_bytes + size] = prev;
-			gf_bs_skip_bytes(bs, size-1);
-
-		}
-//          gf_fclose(f);
-		gf_bs_del(bs);
-	}
-	break;
-
-	default:
-		return GF_BAD_PARAM;
-	}
-
-exit:
-	if ((e>=GF_OK) && (svgin->scene->graph_attached!=1) && (gf_sg_get_root_node(svgin->loader.scene_graph)!=NULL) ) {
-		gf_scene_attach_to_compositor(svgin->scene);
-	}
-	/*prepare for next playback*/
-	if (e) {
-		gf_sm_load_done(&svgin->loader);
-		svgin->loader.fileName = NULL;
-		e = GF_EOS;
-	}
-	return e;
-}
-
-
-
-static GF_Err SVG_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	SVGIn *svgin = (SVGIn *)plug->privateStack;
-	memset(&svgin->loader, 0, sizeof(GF_SceneLoader));
-	svgin->loader.is = scene;
-	svgin->scene = scene;
-	svgin->loader.scene_graph = scene->graph;
-	svgin->loader.localPath = gf_modules_get_option((GF_BaseInterface *)plug, "General", "CacheDirectory");
-	/*Warning: svgin->loader.type may be overriden in attach stream */
-	svgin->loader.type = GF_SM_LOAD_SVG;
-	svgin->loader.flags = GF_SM_LOAD_FOR_PLAYBACK;
-
-	if (svgin->oti!= GPAC_OTI_PRIVATE_SCENE_SVG)
-		gf_sm_load_init(&svgin->loader);
-	return GF_OK;
-}
-
-static GF_Err SVG_ReleaseScene(GF_SceneDecoder *plug)
-{
-	return GF_OK;
-}
-
-static GF_Err SVG_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	const char *sOpt;
-	GF_BitStream *bs;
-	SVGIn *svgin = (SVGIn *)plug->privateStack;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-
-	svgin->loader.type = GF_SM_LOAD_SVG;
-	/* decSpecInfo is not null only when reading from an SVG file (local or distant, cached or not) */
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_SCENE_SVG:
-	case GPAC_OTI_SCENE_SVG_GZ:
-		svgin->loader.flags |= GF_SM_LOAD_CONTEXT_STREAMING;
-		/*no decSpecInfo defined for streaming svg yet*/
-		break;
-	case GPAC_OTI_SCENE_DIMS:
-		svgin->loader.type = GF_SM_LOAD_DIMS;
-		svgin->loader.flags |= GF_SM_LOAD_CONTEXT_STREAMING;
-		/*decSpecInfo not yet supported for DIMS svg - we need properties at the scene level to store the
-		various indications*/
-		break;
-	case GPAC_OTI_PRIVATE_SCENE_SVG:
-	default:
-		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		svgin->file_size = gf_bs_read_u32(bs);
-		svgin->file_pos = 0;
-		gf_bs_del(bs);
-		svgin->file_name =  (char *) gf_malloc(sizeof(char)*(1 + esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32)) );
-		memcpy(svgin->file_name, esd->decoderConfig->decoderSpecificInfo->data + sizeof(u32), esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) );
-		svgin->file_name[esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) ] = 0;
-		break;
-	}
-	svgin->oti = esd->decoderConfig->objectTypeIndication;
-
-	if (!esd->dependsOnESID) svgin->base_es_id = esd->ESID;
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "Progressive");
-	if (sOpt && !strcmp(sOpt, "yes")) {
-		svgin->sax_max_duration = 30;
-		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "SAXLoader", "MaxDuration");
-		if (sOpt) {
-			svgin->sax_max_duration = atoi(sOpt);
-		} else {
-			svgin->sax_max_duration = 30;
-			gf_modules_set_option((GF_BaseInterface *)plug, "SAXLoader", "MaxDuration", "30");
-		}
-	} else {
-		svgin->sax_max_duration = (u32) -1;
-	}
-	return GF_OK;
-}
-
-static GF_Err SVG_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	SVGIn *svgin = (SVGIn *)plug->privateStack;
-	if (svgin->file_name) gf_free(svgin->file_name);
-	svgin->file_name = NULL;
-	gf_sm_load_done(&svgin->loader);
-	return GF_OK;
-}
-
-const char *SVG_GetName(struct _basedecoder *plug)
-{
-	SVGIn *svgin = (SVGIn *)plug->privateStack;
-	if (svgin->oti==GPAC_OTI_PRIVATE_SCENE_SVG) return ((svgin->sax_max_duration==(u32)-1) && svgin->file_size) ? "GPAC SVG SAX Parser" : "GPAC SVG Progressive Parser";
-	if (svgin->oti==GPAC_OTI_SCENE_SVG) return "GPAC Streaming SVG Parser";
-	if (svgin->oti==GPAC_OTI_SCENE_SVG_GZ) return "GPAC Streaming SVGZ Parser";
-	if (svgin->oti==GPAC_OTI_SCENE_DIMS) return "GPAC DIMS Parser";
-	return "INTERNAL ERROR";
-}
-
-static u32 SVG_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType==GF_STREAM_PRIVATE_SCENE) {
-		/*media type query*/
-		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_SVG) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-	} else if (StreamType==GF_STREAM_SCENE) {
-		/*media type query*/
-		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_SCENE_SVG:
-		case GPAC_OTI_SCENE_SVG_GZ:
-		case GPAC_OTI_SCENE_DIMS:
-			return GF_CODEC_SUPPORTED;
-		default:
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static GF_Err SVG_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	if (cap->CapCode==GF_CODEC_PADDING_BYTES) {
-		/* Adding one byte of padding for \r\n problems*/
-		cap->cap.valueInt = 1;
-		return GF_OK;
-	}
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err SVG_SetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability cap)
-{
-	if (cap.CapCode==GF_CODEC_ABORT) {
-		SVGIn *svgin = (SVGIn *)plug->privateStack;
-		gf_sm_load_suspend(&svgin->loader, GF_TRUE);
-	}
-	return GF_OK;
-}
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	SVGIn *svgin;
-	GF_SceneDecoder *sdec;
-
-	if (InterfaceType != GF_SCENE_DECODER_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(sdec, GF_SceneDecoder)
-	if (!sdec) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(sdec, GF_SCENE_DECODER_INTERFACE, "GPAC SVG Parser", "gpac distribution");
-
-	GF_SAFEALLOC(svgin, SVGIn);
-	if (!svgin) {
-		gf_free(sdec);
-		return NULL;
-	}
-	sdec->privateStack = svgin;
-	sdec->AttachStream = SVG_AttachStream;
-	sdec->CanHandleStream = SVG_CanHandleStream;
-	sdec->DetachStream = SVG_DetachStream;
-	sdec->AttachScene = SVG_AttachScene;
-	sdec->ReleaseScene = SVG_ReleaseScene;
-	sdec->ProcessData = SVG_ProcessData;
-	sdec->GetName = SVG_GetName;
-	sdec->SetCapabilities = SVG_SetCapabilities;
-	sdec->GetCapabilities = SVG_GetCapabilities;
-	return (GF_BaseInterface *)sdec;
-}
-
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	SVGIn *svgin;
-	GF_SceneDecoder *sdec = (GF_SceneDecoder *)ifce;
-	if (!sdec)
-		return;
-	if (sdec->InterfaceType != GF_SCENE_DECODER_INTERFACE) return;
-	svgin = (SVGIn *) sdec->privateStack;
-	if (svgin)
-		gf_free(svgin);
-	sdec->privateStack = NULL;
-	gf_free(sdec);
-}
-
-#else
-
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	return NULL;
-}
-
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-}
-
-#endif
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_SVG
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_STATIC_DECLARATION( svg_in )

gpac-0.8.0.tar.gz/modules/timedtext Deleted

gpac-0.8.0.tar.gz/modules/timedtext/Makefile Deleted

gpac-0.8.0.tar.gz/modules/timedtext/timedtext_dec.c Deleted

@@ -1,1263 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / 3GPP/MPEG4 timed text module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/internal/isomedia_dev.h>
-#include <gpac/utf.h>
-#include <gpac/constants.h>
-#include <gpac/nodes_mpeg4.h>
-
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
-
-
-/*
-	this decoder is simply a scene decoder generating its own scene graph based on input data,
-	this scene graph is then used as an extra graph by the renderer, and manipulated by the decoder
-	for any time animation handling.
-	Translation from text to MPEG-4 scene graph:
-		* all modifiers (styles, hilight, etc) are unrolled into chunks forming a unique, linear
-	sequence of text data (startChar, endChar) with associated styles & modifs
-		* chunks are mapped to classic MPEG-4/VRML text
-		* these chunks are then gathered in a Form node (supported by 2D and 3D renderers), with
-	text truncation at each newline char.
-		* the Form then performs all alignment of the chunks
-
-	It could be possible to use Layout instead of form, BUT layout cannot handle new lines at the time being...
-
-	Currently supported for 3GP text streams:
-		* text box positioning & filling, dynamic text box
-		* text color
-		* proper alignment (H and V) with horizontal text. Vertical text may not be properly layed out (not fully tested)
-		* style Records (font, size, fontstyles, and colors change) - any nb per sample supported
-		* hilighting (static only) with color or reverse video - any nb per sample supported
-		* hypertext links - any nb per sample supported
-		* blinking - any nb per sample supported
-		* complete scrolling: in, out, in+out, up, down, right and left directions. All other
-		modifiers are supported when scrolling
-		* scroll delay
-
-	It does NOT support:
-		* dynamic hilighting (karaoke)
-		* wrap
-
-	The decoder only accepts complete timed text units TTU(1). In band reconfig (TTU(5) is not supported,
-	nor fragmented TTUs (2, 3, 4).
-	UTF16 support should work but MP4Box does not support it at encoding time.
-*/
-
-typedef struct
-{
-	GF_Scene *inlineScene;
-	GF_Terminal *app;
-	u32 nb_streams;
-
-	GF_TextConfig *cfg;
-
-	GF_SceneGraph *sg;
-
-	/*avoid searching the graph for things we know...*/
-	M_Transform2D *tr_track, *tr_box, *tr_scroll;
-	M_Material2D *mat_track, *mat_box;
-	M_Layer2D *dlist;
-	M_Rectangle *rec_box, *rec_track;
-
-	M_TimeSensor *ts_blink, *ts_scroll;
-	M_ScalarInterpolator *process_blink, *process_scroll;
-	GF_Route *time_route;
-	GF_List *blink_nodes;
-	u32 scroll_type, scroll_mode;
-	Fixed scroll_time, scroll_delay;
-	Bool is_active, use_texture, outline;
-} TTDPriv;
-
-
-static void ttd_set_blink_fraction(GF_Node *node, GF_Route *route);
-static void ttd_set_scroll_fraction(GF_Node *node, GF_Route *route);
-static void TTD_ResetDisplay(TTDPriv *priv);
-
-/*the WORST thing about 3GP in MPEG4 is positioning of the text track...*/
-static void TTD_UpdateSizeInfo(TTDPriv *priv)
-{
-	u32 w, h;
-	Bool has_size;
-	s32 offset, thw, thh, vw, vh;
-
-	has_size = gf_sg_get_scene_size_info(priv->inlineScene->graph, &w, &h);
-	/*no size info is given in main scene, override by associated video size if any, or by text track size*/
-	if (!has_size) {
-		if (priv->cfg->has_vid_info && priv->cfg->video_width && priv->cfg->video_height) {
-			gf_sg_set_scene_size_info(priv->sg, priv->cfg->video_width, priv->cfg->video_height, GF_TRUE);
-		} else {
-			gf_sg_set_scene_size_info(priv->sg, priv->cfg->text_width, priv->cfg->text_height, GF_TRUE);
-		}
-		gf_sg_get_scene_size_info(priv->sg, &w, &h);
-		if (!w || !h) return;
-		gf_scene_force_size(priv->inlineScene, w, h);
-	}
-
-	if (!w || !h) return;
-	/*apply*/
-	gf_sg_set_scene_size_info(priv->sg, w, h, GF_TRUE);
-	/*make sure the scene size is big enough to contain the text track after positioning. RESULTS ARE UNDEFINED
-	if offsets are negative: since MPEG-4 uses centered coord system, we must assume video is aligned to top-left*/
-	if (priv->cfg->has_vid_info) {
-		Bool set_size = GF_FALSE;
-		vw = priv->cfg->horiz_offset;
-		if (vw<0) vw = 0;
-		vh = priv->cfg->vert_offset;
-		if (vh<0) vh = 0;
-		if (priv->cfg->text_width + (u32) vw > w) {
-			w = priv->cfg->text_width+vw;
-			set_size = GF_TRUE;
-		}
-		if (priv->cfg->text_height + (u32) vh > h) {
-			h = priv->cfg->text_height+vh;
-			set_size = GF_TRUE;
-		}
-		if (set_size) {
-			gf_sg_set_scene_size_info(priv->sg, w, h, GF_TRUE);
-			gf_scene_force_size(priv->inlineScene, w, h);
-		}
-	} else {
-		/*otherwise override (mainly used for SRT & TTXT file direct loading*/
-		priv->cfg->text_width = w;
-		priv->cfg->text_height = h;
-	}
-
-	/*ok override video size with main scene size*/
-	priv->cfg->video_width = w;
-	priv->cfg->video_height = h;
-
-	vw = (s32) w;
-	vh = (s32) h;
-	thw = priv->cfg->text_width / 2;
-	thh = priv->cfg->text_height / 2;
-	/*check translation, we must not get out of scene size - not supported in GPAC*/
-	offset = priv->cfg->horiz_offset - vw/2 + thw;
-	/*safety checks ?
-	if (offset + thw < - vw/2) offset = - vw/2 + thw;
-	else if (offset - thw > vw/2) offset = vw/2 - thw;
-	*/
-	priv->tr_track->translation.x = INT2FIX(offset);
-
-	offset = vh/2 - priv->cfg->vert_offset - thh;
-	/*safety checks ?
-	if (offset + thh > vh/2) offset = vh/2 - thh;
-	else if (offset - thh < -vh/2) offset = -vh/2 + thh;
-	*/
-	priv->tr_track->translation.y = INT2FIX(offset);
-
-	gf_node_changed((GF_Node *)priv->tr_track, NULL);
-}
-
-static GF_Err TTD_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *capability)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = priv->cfg->text_width;
-		return GF_OK;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = priv->cfg->text_height;
-		return GF_OK;
-	case GF_CODEC_MEDIA_NOT_OVER:
-		capability->cap.valueInt = priv->is_active;
-		return GF_OK;
-	default:
-		capability->cap.valueInt = 0;
-		return GF_OK;
-	}
-}
-
-static GF_Err TTD_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	if (capability.CapCode==GF_CODEC_SHOW_SCENE) {
-		if (capability.cap.valueInt) {
-			TTD_ResetDisplay(priv);
-			TTD_UpdateSizeInfo(priv);
-			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_FALSE);
-		} else {
-			gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_TRUE);
-		}
-	}
-	return GF_OK;
-}
-
-GF_Err TTD_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	if (priv->nb_streams) return GF_BAD_PARAM;
-	/*timedtext cannot be a root scene object*/
-	if (is_scene_decoder) return GF_BAD_PARAM;
-	priv->inlineScene = scene;
-	priv->app = scene->root_od->term;
-	return GF_OK;
-}
-
-GF_Err TTD_ReleaseScene(GF_SceneDecoder *plug)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	if (priv->nb_streams) return GF_BAD_PARAM;
-	return GF_OK;
-}
-
-static GFINLINE void add_child(GF_Node *n1, GF_Node *par)
-{
-	gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n1);
-	gf_node_register(n1, par);
-}
-
-
-static GFINLINE GF_Node *ttd_create_node(TTDPriv *ttd, u32 tag, const char *def_name)
-{
-	GF_Node *n = gf_node_new(ttd->sg, tag);
-	if (n) {
-		if (def_name) gf_node_set_id(n, gf_sg_get_next_available_node_id(ttd->sg), def_name);
-		gf_node_init(n);
-	}
-	return n;
-}
-
-static GF_Err TTD_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	GF_Err e;
-	GF_Node *root, *n1, *n2;
-	const char *opt;
-	/*no scalable, no upstream*/
-	if (priv->nb_streams || esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_NON_COMPLIANT_BITSTREAM;
-
-	priv->cfg = (GF_TextConfig *) gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
-	e = gf_odf_get_text_config(esd->decoderConfig->decoderSpecificInfo, (u8) esd->decoderConfig->objectTypeIndication, priv->cfg);
-	if (e) {
-		gf_odf_desc_del((GF_Descriptor *) priv->cfg);
-		priv->cfg = NULL;
-		return e;
-	}
-	priv->nb_streams++;
-	if (!priv->cfg->timescale) priv->cfg->timescale = 1000;
-
-	priv->sg = gf_sg_new_subscene(priv->inlineScene->graph);
-
-	root = ttd_create_node(priv, TAG_MPEG4_OrderedGroup, NULL);
-	gf_sg_set_root_node(priv->sg, root);
-	gf_node_register(root, NULL);
-	/*root transform*/
-	priv->tr_track = (M_Transform2D *)ttd_create_node(priv, TAG_MPEG4_Transform2D, NULL);
-	add_child((GF_Node *) priv->tr_track, root);
-
-	TTD_UpdateSizeInfo(priv);
-
-	/*txt track background*/
-	n1 = ttd_create_node(priv, TAG_MPEG4_Shape, NULL);
-	add_child(n1, (GF_Node *) priv->tr_track);
-	((M_Shape *)n1)->appearance = ttd_create_node(priv, TAG_MPEG4_Appearance, NULL);
-	gf_node_register(((M_Shape *)n1)->appearance, n1);
-	priv->mat_track = (M_Material2D *) ttd_create_node(priv, TAG_MPEG4_Material2D, NULL);
-	priv->mat_track->filled = 1;
-	priv->mat_track->transparency = 1;
-	((M_Appearance *) ((M_Shape *)n1)->appearance)->material = (GF_Node *) priv->mat_track;
-	gf_node_register((GF_Node *) priv->mat_track, ((M_Shape *)n1)->appearance);
-	n2 = ttd_create_node(priv, TAG_MPEG4_Rectangle, NULL);
-	((M_Rectangle *)n2)->size.x = 0;
-	((M_Rectangle *)n2)->size.y = 0;
-	((M_Shape *)n1)->geometry = n2;
-	gf_node_register(n2, n1);
-	priv->rec_track = (M_Rectangle *)n2;
-
-	/*txt box background*/
-	priv->tr_box = (M_Transform2D *) ttd_create_node(priv, TAG_MPEG4_Transform2D, NULL);
-	add_child((GF_Node*) priv->tr_box, (GF_Node*)priv->tr_track);
-	n1 = ttd_create_node(priv, TAG_MPEG4_Shape, NULL);
-	add_child(n1, (GF_Node*)priv->tr_box);
-	((M_Shape *)n1)->appearance = ttd_create_node(priv, TAG_MPEG4_Appearance, NULL);
-	gf_node_register(((M_Shape *)n1)->appearance, n1);
-	priv->mat_box = (M_Material2D *) ttd_create_node(priv, TAG_MPEG4_Material2D, NULL);
-	priv->mat_box->filled = 1;
-	priv->mat_box->transparency = 1;
-	((M_Appearance *) ((M_Shape *)n1)->appearance)->material = (GF_Node *)priv->mat_box;
-	gf_node_register((GF_Node *)priv->mat_box, ((M_Shape *)n1)->appearance);
-	priv->rec_box = (M_Rectangle *) ttd_create_node(priv, TAG_MPEG4_Rectangle, NULL);
-	priv->rec_box->size.x = 0;
-	priv->rec_box->size.y = 0;
-	((M_Shape *)n1)->geometry = (GF_Node *) priv->rec_box;
-	gf_node_register((GF_Node *) priv->rec_box, n1);
-
-	priv->dlist = (M_Layer2D *) ttd_create_node(priv, TAG_MPEG4_Layer2D, NULL);
-	priv->dlist->size.x = priv->cfg->text_width;
-	priv->dlist->size.y = priv->cfg->text_height;
-	add_child((GF_Node *)priv->dlist, (GF_Node *)priv->tr_box);
-
-	priv->blink_nodes = gf_list_new();
-	priv->ts_blink = (M_TimeSensor *) ttd_create_node(priv, TAG_MPEG4_TimeSensor, "TimerBlink");
-	priv->ts_blink->cycleInterval = 0.25;
-	priv->ts_blink->startTime = 0.0;
-	priv->ts_blink->loop = 1;
-	priv->process_blink = (M_ScalarInterpolator *) ttd_create_node(priv, TAG_MPEG4_ScalarInterpolator, NULL);
-	/*override set_fraction*/
-	priv->process_blink->on_set_fraction = ttd_set_blink_fraction;
-	gf_node_set_private((GF_Node *) priv->process_blink, priv);
-	/*route from fraction_changed to set_fraction*/
-	gf_sg_route_new(priv->sg, (GF_Node *) priv->ts_blink, 6, (GF_Node *) priv->process_blink, 0);
-
-	priv->ts_scroll = (M_TimeSensor *) ttd_create_node(priv, TAG_MPEG4_TimeSensor, "TimerScroll");
-	priv->ts_scroll->cycleInterval = 0;
-	priv->ts_scroll->startTime = -1;
-	priv->ts_scroll->loop = 0;
-	priv->process_scroll = (M_ScalarInterpolator *) ttd_create_node(priv, TAG_MPEG4_ScalarInterpolator, NULL);
-	/*override set_fraction*/
-	priv->process_scroll->on_set_fraction = ttd_set_scroll_fraction;
-	gf_node_set_private((GF_Node *) priv->process_scroll, priv);
-	/*route from fraction_changed to set_fraction*/
-	gf_sg_route_new(priv->sg, (GF_Node *) priv->ts_scroll, 6, (GF_Node *) priv->process_scroll, 0);
-
-	gf_node_register((GF_Node *) priv->ts_blink, NULL);
-	gf_node_register((GF_Node *) priv->process_blink, NULL);
-	gf_node_register((GF_Node *) priv->ts_scroll, NULL);
-	gf_node_register((GF_Node *) priv->process_scroll, NULL);
-
-	/*option setup*/
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "StreamingText", "UseTexturing");
-	priv->use_texture = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-	opt = gf_modules_get_option((GF_BaseInterface *)plug, "StreamingText", "OutlineText");
-	priv->outline = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-	return e;
-}
-
-static GF_Err TTD_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	if (!priv->nb_streams) return GF_BAD_PARAM;
-
-	gf_scene_register_extra_graph(priv->inlineScene, priv->sg, GF_TRUE);
-
-	gf_node_unregister((GF_Node *) priv->ts_blink, NULL);
-	gf_node_unregister((GF_Node *) priv->process_blink, NULL);
-	gf_node_unregister((GF_Node *) priv->ts_scroll, NULL);
-	gf_node_unregister((GF_Node *) priv->process_scroll, NULL);
-
-	gf_sg_del(priv->sg);
-	priv->sg = NULL;
-	if (priv->cfg) gf_odf_desc_del((GF_Descriptor *) priv->cfg);
-	priv->cfg = NULL;
-	priv->nb_streams = 0;
-	gf_list_del(priv->blink_nodes);
-	return GF_OK;
-}
-
-static void ttd_set_blink_fraction(GF_Node *node, GF_Route *route)
-{
-	M_Material2D *m;
-	u32 i;
-	TTDPriv *priv = (TTDPriv *)gf_node_get_private(node);
-
-	Bool blink_on = GF_TRUE;
-	if (priv->process_blink->set_fraction>FIX_ONE/2) blink_on = GF_FALSE;
-	i=0;
-	while ((m = (M_Material2D*)gf_list_enum(priv->blink_nodes, &i))) {
-		if (m->filled != blink_on) {
-			m->filled = blink_on;
-			gf_node_changed((GF_Node *) m, NULL);
-		}
-	}
-}
-
-static void ttd_set_scroll_fraction(GF_Node *node, GF_Route *route)
-{
-	Fixed frac;
-	TTDPriv *priv = (TTDPriv *)gf_node_get_private(node);
-	frac = priv->process_scroll->set_fraction;
-	if (frac==FIX_ONE) priv->is_active = GF_FALSE;
-	if (!priv->tr_scroll) return;
-
-	switch (priv->scroll_type - 1) {
-	case GF_TXT_SCROLL_CREDITS:
-	case GF_TXT_SCROLL_DOWN:
-		priv->tr_scroll->translation.x = 0;
-		if (priv->scroll_mode & GF_TXT_SCROLL_IN) {
-			if (frac>priv->scroll_time) {
-				priv->scroll_mode &= ~GF_TXT_SCROLL_IN;
-				priv->tr_scroll->translation.y = 0;
-			} else {
-				priv->tr_scroll->translation.y = gf_muldiv(priv->dlist->size.y, frac, priv->scroll_time) - priv->dlist->size.y;
-			}
-		} else if (priv->scroll_mode & GF_TXT_SCROLL_OUT) {
-			if (frac < FIX_ONE - priv->scroll_time) return;
-			frac -= FIX_ONE - priv->scroll_time;
-			if (priv->scroll_type - 1 == GF_TXT_SCROLL_DOWN) {
-				priv->tr_scroll->translation.y = gf_muldiv(priv->dlist->size.y, frac, priv->scroll_time);
-			} else {
-				priv->tr_scroll->translation.y = gf_muldiv(priv->dlist->size.y, frac, priv->scroll_time);
-			}
-		}
-		if (priv->scroll_type - 1 == GF_TXT_SCROLL_DOWN) priv->tr_scroll->translation.y *= -1;
-		break;
-	case GF_TXT_SCROLL_MARQUEE:
-	case GF_TXT_SCROLL_RIGHT:
-		priv->tr_scroll->translation.y = 0;
-		if (priv->scroll_mode & GF_TXT_SCROLL_IN) {
-			if (! (priv->scroll_mode & GF_TXT_SCROLL_OUT)) {
-				if (frac<priv->scroll_delay) return;
-				frac-=priv->scroll_delay;
-			}
-			if (frac>priv->scroll_time) {
-				priv->scroll_mode &= ~GF_TXT_SCROLL_IN;
-				priv->tr_scroll->translation.x = 0;
-			} else {
-				priv->tr_scroll->translation.x = gf_muldiv(priv->dlist->size.x, frac, priv->scroll_time) - priv->dlist->size.x;
-			}
-		} else if (priv->scroll_mode & GF_TXT_SCROLL_OUT) {
-			if (frac < FIX_ONE - priv->scroll_time) return;
-			frac -= FIX_ONE - priv->scroll_time;
-			priv->tr_scroll->translation.x = gf_muldiv(priv->dlist->size.x, frac, priv->scroll_time);
-		}
-		if (priv->scroll_type - 1 == GF_TXT_SCROLL_MARQUEE) priv->tr_scroll->translation.x *= -1;
-		break;
-	default:
-		break;
-	}
-	gf_node_changed((GF_Node *)priv->tr_scroll, NULL);
-}
-
-static void TTD_ResetDisplay(TTDPriv *priv)
-{
-	gf_list_reset(priv->blink_nodes);
-	gf_node_unregister_children((GF_Node*)priv->dlist, priv->dlist->children);
-	priv->dlist->children = NULL;
-	gf_node_changed((GF_Node *) priv->dlist, NULL);
-	priv->tr_scroll = NULL;
-}
-
-char *TTD_FindFont(GF_TextSampleDescriptor *tsd, u32 ID)
-{
-	u32 i;
-	for (i=0; i<tsd->font_count; i++) {
-		if (tsd->fonts[i].fontID==ID) return tsd->fonts[i].fontName;
-	}
-	return "SERIF";
-}
-
-static void ttd_add_item(M_Form *form)
-{
-	s32 *new_gr;
-	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &new_gr);
-	(*new_gr) = gf_node_list_get_count(form->children);
-	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &new_gr);
-	(*new_gr) = -1;
-	/*store line info*/
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &new_gr);
-	(*new_gr) = gf_node_list_get_count(form->children);
-}
-
-static void ttd_add_line(M_Form *form)
-{
-	s32 *new_gr;
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &new_gr);
-	(*new_gr) = -1;
-}
-
-typedef struct
-{
-	u32 start_char, end_char;
-	GF_StyleRecord *srec;
-	Bool is_hilight;
-	u32 hilight_col;	/*0 means RV*/
-	GF_TextHyperTextBox *hlink;
-	Bool has_blink;
-	/*karaoke not done yet*/
-	/*text wrapping is not supported - we will need to move to Layout (rather than form), and modify
-	layout to handle new lines and proper scrolling*/
-} TTDTextChunk;
-
-static void TTD_NewTextChunk(TTDPriv *priv, GF_TextSampleDescriptor *tsd, M_Form *form, u16 *utf16_txt, TTDTextChunk *tc)
-{
-	GF_Node *txt_model, *n2, *txt_material;
-	M_Text *text;
-	M_FontStyle *fs;
-	char *fontName;
-	char szStyle[1024];
-	u32 fontSize, styleFlags, color, i, start_char;
-
-	if (!tc->srec) {
-		fontName = TTD_FindFont(tsd, tsd->default_style.fontID);
-		fontSize = tsd->default_style.font_size;
-		styleFlags = tsd->default_style.style_flags;
-		color = tsd->default_style.text_color;
-	} else {
-		fontName = TTD_FindFont(tsd, tc->srec->fontID);
-		fontSize = tc->srec->font_size;
-		styleFlags = tc->srec->style_flags;
-		color = tc->srec->text_color;
-	}
-
-	/*create base model for text node. It will then be cloned for each text item*/
-	txt_model = ttd_create_node(priv, TAG_MPEG4_Shape, NULL);
-	gf_node_register(txt_model, NULL);
-	n2 = ttd_create_node(priv, TAG_MPEG4_Appearance, NULL);
-	((M_Shape *)txt_model)->appearance = n2;
-	gf_node_register(n2, txt_model);
-	txt_material = ttd_create_node(priv, TAG_MPEG4_Material2D, NULL);
-	((M_Appearance *)n2)->material = txt_material;
-	gf_node_register(txt_material, n2);
-
-	((M_Material2D *)txt_material)->filled = 1;
-	((M_Material2D *)txt_material)->transparency = FIX_ONE - INT2FIX((color>>24) & 0xFF) / 255;
-	((M_Material2D *)txt_material)->emissiveColor.red = INT2FIX((color>>16) & 0xFF) / 255;
-	((M_Material2D *)txt_material)->emissiveColor.green = INT2FIX((color>>8) & 0xFF) / 255;
-	((M_Material2D *)txt_material)->emissiveColor.blue = INT2FIX((color) & 0xFF) / 255;
-	/*force 0 lineWidth if blinking (the stupid MPEG-4 default values once again..)*/
-	if (tc->has_blink) {
-		((M_Material2D *)txt_material)->lineProps = ttd_create_node(priv, TAG_MPEG4_LineProperties, NULL);
-		((M_LineProperties *)((M_Material2D *)txt_material)->lineProps)->width = 0;
-		gf_node_register(((M_Material2D *)txt_material)->lineProps, txt_material);
-	}
-
-	n2 = ttd_create_node(priv, TAG_MPEG4_Text, NULL);
-	((M_Shape *)txt_model)->geometry = n2;
-	gf_node_register(n2, txt_model);
-	text = (M_Text *) n2;
-	fs = (M_FontStyle *) ttd_create_node(priv, TAG_MPEG4_FontStyle, NULL);
-	gf_free(fs->family.vals[0]);
-
-	/*translate default fonts to MPEG-4/VRML names*/
-	if (!stricmp(fontName, "Serif")) fs->family.vals[0] = gf_strdup("SERIF");
-	else if (!stricmp(fontName, "Sans-Serif")) fs->family.vals[0] = gf_strdup("SANS");
-	else if (!stricmp(fontName, "Monospace")) fs->family.vals[0] = gf_strdup("TYPEWRITER");
-	else fs->family.vals[0] = gf_strdup(fontName);
-
-	fs->size = INT2FIX(fontSize);
-	gf_free(fs->style.buffer);
-	strcpy(szStyle, "");
-	if (styleFlags & GF_TXT_STYLE_BOLD) {
-		if (styleFlags & GF_TXT_STYLE_ITALIC) strcpy(szStyle, "BOLDITALIC");
-		else strcpy(szStyle, "BOLD");
-	} else if (styleFlags & GF_TXT_STYLE_ITALIC) strcat(szStyle, "ITALIC");
-	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 (tc->is_hilight) {
-		if (tc->hilight_col) {
-			char szTxt[50];
-			sprintf(szTxt, " HIGHLIGHT#%x", tc->hilight_col);
-			strcat(szStyle, szTxt);
-		} else {
-			strcat(szStyle, " HIGHLIGHT#RV");
-		}
-	}
-	/*a better way would be to draw the entire text box in a composite texture & bitmap but we can't really rely
-	on text box size (in MP4Box, it actually defaults to the entire video area) and drawing a too large texture
-	& bitmap could slow down rendering*/
-	if (priv->use_texture) strcat(szStyle, " TEXTURED");
-	if (priv->outline) strcat(szStyle, " OUTLINED");
-
-	fs->style.buffer = gf_strdup(szStyle);
-	fs->horizontal = (tsd->displayFlags & GF_TXT_VERTICAL) ? 0 : 1;
-	text->fontStyle = (GF_Node *) fs;
-	gf_node_register((GF_Node *)fs, (GF_Node *)text);
-	gf_sg_vrml_mf_reset(&text->string, GF_SG_VRML_MFSTRING);
-
-	if (tc->hlink && tc->hlink->URL) {
-		SFURL *s;
-		M_Anchor *anc = (M_Anchor *) ttd_create_node(priv, TAG_MPEG4_Anchor, NULL);
-		gf_sg_vrml_mf_append(&anc->url, GF_SG_VRML_MFURL, (void **) &s);
-		s->OD_ID = 0;
-		s->url = gf_strdup(tc->hlink->URL);
-		if (tc->hlink->URL_hint) anc->description.buffer = gf_strdup(tc->hlink->URL_hint);
-		gf_node_list_add_child(& anc->children, txt_model);
-		gf_node_register(txt_model, (GF_Node *)anc);
-		txt_model = (GF_Node *)anc;
-		gf_node_register((GF_Node *)anc, NULL);
-	}
-
-	start_char = tc->start_char;
-	for (i=tc->start_char; i<tc->end_char; i++) {
-		Bool new_line = GF_FALSE;
-		if ((utf16_txt[i] == '\n') || (utf16_txt[i] == '\r') || (utf16_txt[i] == 0x85) || (utf16_txt[i] == 0x2028) || (utf16_txt[i] == 0x2029))
-			new_line = GF_TRUE;
-
-		if (new_line || (i+1==tc->end_char) ) {
-			SFString *st;
-
-			if (i+1==tc->end_char) i++;
-
-			if (i!=start_char) {
-				char szLine[5000];
-				u32 len;
-				s16 wsChunk[5000], *sp;
-
-				/*splitting lines, duplicate node*/
-
-				n2 = gf_node_clone(priv->sg, txt_model, NULL, "", GF_TRUE);
-				if (tc->hlink && tc->hlink->URL) {
-					GF_Node *t = ((M_Anchor *)n2)->children->node;
-					text = (M_Text *) ((M_Shape *)t)->geometry;
-					txt_material = ((M_Appearance *) ((M_Shape *)t)->appearance)->material;
-				} else {
-					text = (M_Text *) ((M_Shape *)n2)->geometry;
-					txt_material = ((M_Appearance *) ((M_Shape *)n2)->appearance)->material;
-				}
-				gf_sg_vrml_mf_reset(&text->string, GF_SG_VRML_MFSTRING);
-				gf_node_list_add_child( &form->children, n2);
-				gf_node_register(n2, (GF_Node *) form);
-				ttd_add_item(form);
-				/*clone node always register by default*/
-				gf_node_unregister(n2, NULL);
-
-				if (tc->has_blink && txt_material) gf_list_add(priv->blink_nodes, txt_material);
-
-
-				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);
-				szLine[len] = 0;
-
-				gf_sg_vrml_mf_append(&text->string, GF_SG_VRML_MFSTRING, (void **) &st);
-				st->buffer = gf_strdup(szLine);
-			}
-			start_char = i+1;
-			if (new_line) {
-				ttd_add_line(form);
-				if ((utf16_txt[i]=='\r') && (utf16_txt[i+1]=='\n')) i++;
-			}
-		}
-	}
-	gf_node_unregister(txt_model, NULL);
-	return;
-}
-
-
-/*mod can be any of TextHighlight, TextKaraoke, TextHyperText, TextBlink*/
-void TTD_SplitChunks(GF_TextSample *txt, u32 nb_chars, GF_List *chunks, GF_Box *mod)
-{
-	TTDTextChunk *tc;
-	u32 start_char, end_char;
-	u32 i;
-	switch (mod->type) {
-	/*these 3 can be safelly typecasted to the same struct for start/end char*/
-	case GF_ISOM_BOX_TYPE_HLIT:
-	case GF_ISOM_BOX_TYPE_HREF:
-	case GF_ISOM_BOX_TYPE_BLNK:
-		start_char = ((GF_TextHighlightBox *)mod)->startcharoffset;
-		end_char = ((GF_TextHighlightBox *)mod)->endcharoffset;
-		break;
-	case GF_ISOM_BOX_TYPE_KROK:
-	default:
-		return;
-	}
-
-	if (end_char>nb_chars) end_char = nb_chars;
-
-	i=0;
-	while ((tc = (TTDTextChunk *)gf_list_enum(chunks, &i))) {
-		if (tc->end_char<=start_char) continue;
-		/*need to split chunk at begin*/
-		if (tc->start_char<start_char) {
-			TTDTextChunk *tc2;
-			tc2 = (TTDTextChunk *) gf_malloc(sizeof(TTDTextChunk));
-			memcpy(tc2, tc, sizeof(TTDTextChunk));
-			tc2->start_char = start_char;
-			tc2->end_char = tc->end_char;
-			tc->end_char = start_char;
-			gf_list_insert(chunks, tc2, i+1);
-			i++;
-			tc = tc2;
-		}
-		/*need to split chunks at end*/
-		if (tc->end_char>end_char) {
-			TTDTextChunk *tc2;
-			tc2 = (TTDTextChunk *) gf_malloc(sizeof(TTDTextChunk));
-			memcpy(tc2, tc, sizeof(TTDTextChunk));
-			tc2->start_char = tc->start_char;
-			tc2->end_char = end_char;
-			tc->start_char = end_char;
-			gf_list_insert(chunks, tc2, i);
-			i++;
-			tc = tc2;
-		}
-		/*assign mod*/
-		switch (mod->type) {
-		case GF_ISOM_BOX_TYPE_HLIT:
-			tc->is_hilight = GF_TRUE;
-			if (txt->highlight_color) tc->hilight_col = txt->highlight_color->hil_color;
-			break;
-		case GF_ISOM_BOX_TYPE_HREF:
-			tc->hlink = (GF_TextHyperTextBox *) mod;
-			break;
-		case GF_ISOM_BOX_TYPE_BLNK:
-			tc->has_blink = GF_TRUE;
-			break;
-		}
-		/*done*/
-		if (tc->end_char==end_char) return;
-	}
-}
-
-
-static void TTD_ApplySample(TTDPriv *priv, GF_TextSample *txt, u32 sdi, Bool is_utf_16, u32 sample_duration)
-{
-	u32 i, nb_lines, start_idx, count;
-	s32 *id, thw, thh, tw, th, offset;
-	Bool vertical;
-	MFInt32 idx;
-	SFString *s;
-	GF_BoxRecord br;
-	M_Material2D *n;
-	M_Form *form;
-	u16 utf16_text[5000];
-	u32 char_offset, char_count;
-	GF_List *chunks;
-	TTDTextChunk *tc;
-	GF_Box *a;
-	GF_TextSampleDescriptor *td = NULL;
-
-	/*stop timer sensor*/
-	if (gf_list_count(priv->blink_nodes)) {
-		priv->ts_blink->stopTime = gf_node_get_scene_time((GF_Node *) priv->ts_blink);
-		gf_node_changed((GF_Node *) priv->ts_blink, NULL);
-	}
-	priv->ts_scroll->stopTime = gf_node_get_scene_time((GF_Node *) priv->ts_scroll);
-	gf_node_changed((GF_Node *) priv->ts_scroll, NULL);
-	/*flush routes to avoid getting the set_fraction of the scroll sensor deactivation*/
-	gf_sg_activate_routes(priv->inlineScene->graph);
-
-	TTD_ResetDisplay(priv);
-	if (!sdi || !txt || !txt->len) return;
-
-	i=0;
-	while ((td = (GF_TextSampleDescriptor *)gf_list_enum(priv->cfg->sample_descriptions, &i))) {
-		if (td->sample_index==sdi) break;
-		td = NULL;
-	}
-	if (!td) return;
-
-
-	vertical = (td->displayFlags & GF_TXT_VERTICAL) ? GF_TRUE : GF_FALSE;
-
-	/*set back color*/
-	/*do we fill the text box or the entire text track region*/
-	if (td->displayFlags & GF_TXT_FILL_REGION) {
-		priv->mat_box->transparency = FIX_ONE;
-		n = priv->mat_track;
-	} else {
-		priv->mat_track->transparency = FIX_ONE;
-		n = priv->mat_box;
-	}
-
-	n->transparency = FIX_ONE - INT2FIX((td->back_color>>24) & 0xFF) / 255;
-	n->emissiveColor.red = INT2FIX((td->back_color>>16) & 0xFF) / 255;
-	n->emissiveColor.green = INT2FIX((td->back_color>>8) & 0xFF) / 255;
-	n->emissiveColor.blue = INT2FIX((td->back_color) & 0xFF) / 255;
-	gf_node_changed((GF_Node *) n, NULL);
-
-	if (txt->box) {
-		br = txt->box->box;
-	} else {
-		br = td->default_pos;
-	}
-	if (!br.right || !br.bottom) {
-		br.top = br.left = 0;
-		br.right = priv->cfg->text_width;
-		br.bottom = priv->cfg->text_height;
-	}
-	thw = br.right - br.left;
-	thh = br.bottom - br.top;
-	if (!thw || !thh) {
-		br.top = br.left = 0;
-		thw = priv->cfg->text_width;
-		thh = priv->cfg->text_height;
-	}
-
-	priv->dlist->size.x = INT2FIX(thw);
-	priv->dlist->size.y = INT2FIX(thh);
-
-	/*disable backgrounds if not used*/
-	if (priv->mat_track->transparency<FIX_ONE) {
-		if (priv->rec_track->size.x != priv->cfg->text_width) {
-			priv->rec_track->size.x = priv->cfg->text_width;
-			priv->rec_track->size.y = priv->cfg->text_height;
-			gf_node_changed((GF_Node *) priv->rec_track, NULL);
-		}
-	} else if (priv->rec_track->size.x) {
-		priv->rec_track->size.x = priv->rec_track->size.y = 0;
-		gf_node_changed((GF_Node *) priv->rec_box, NULL);
-	}
-
-	if (priv->mat_box->transparency<FIX_ONE) {
-		if (priv->rec_box->size.x != priv->dlist->size.x) {
-			priv->rec_box->size.x = priv->dlist->size.x;
-			priv->rec_box->size.y = priv->dlist->size.y;
-			gf_node_changed((GF_Node *) priv->rec_box, NULL);
-		}
-	} else if (priv->rec_box->size.x) {
-		priv->rec_box->size.x = priv->rec_box->size.y = 0;
-		gf_node_changed((GF_Node *) priv->rec_box, NULL);
-	}
-
-	form = (M_Form *) ttd_create_node(priv, TAG_MPEG4_Form, NULL);
-	form->size.x = INT2FIX(thw);
-	form->size.y = INT2FIX(thh);
-
-	thw /= 2;
-	thh /= 2;
-	tw = priv->cfg->text_width;
-	th = priv->cfg->text_height;
-
-	/*check translation, we must not get out of scene size - not supported in GPAC*/
-	offset = br.left - tw/2 + thw;
-	if (offset + thw < - tw/2) offset = - tw/2 + thw;
-	else if (offset - thw > tw/2) offset = tw/2 - thw;
-	priv->tr_box->translation.x = INT2FIX(offset);
-
-	offset = th/2 - br.top - thh;
-	if (offset + thh > th/2) offset = th/2 - thh;
-	else if (offset - thh < -th/2) offset = -th/2 + thh;
-	priv->tr_box->translation.y = INT2FIX(offset);
-
-	gf_node_dirty_set((GF_Node *)priv->tr_box, 0, GF_TRUE);
-
-
-	if (priv->scroll_type) {
-		priv->ts_scroll->stopTime = gf_node_get_scene_time((GF_Node *) priv->ts_scroll);
-		gf_node_changed((GF_Node *) priv->ts_scroll, NULL);
-	}
-	priv->scroll_mode = 0;
-	if (td->displayFlags & GF_TXT_SCROLL_IN) priv->scroll_mode |= GF_TXT_SCROLL_IN;
-	if (td->displayFlags & GF_TXT_SCROLL_OUT) priv->scroll_mode |= GF_TXT_SCROLL_OUT;
-
-	priv->scroll_type = 0;
-	if (priv->scroll_mode) {
-		priv->scroll_type = (td->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
-		priv->scroll_type ++;
-	}
-	/*no sample duration, cannot determine scroll rate, so just show*/
-	if (!sample_duration) priv->scroll_type = 0;
-	/*no scroll*/
-	if (!priv->scroll_mode) priv->scroll_type = 0;
-
-	if (priv->scroll_type) {
-		priv->tr_scroll = (M_Transform2D *) ttd_create_node(priv, TAG_MPEG4_Transform2D, NULL);
-		gf_node_list_add_child( &priv->dlist->children, (GF_Node*)priv->tr_scroll);
-		gf_node_register((GF_Node *) priv->tr_scroll, (GF_Node *) priv->dlist);
-		gf_node_list_add_child( &priv->tr_scroll->children, (GF_Node*)form);
-		gf_node_register((GF_Node *) form, (GF_Node *) priv->tr_scroll);
-		priv->tr_scroll->translation.x = priv->tr_scroll->translation.y = (priv->scroll_mode & GF_TXT_SCROLL_IN) ? -INT2FIX(1000) : 0;
-		/*if no delay, text is in motion for the duration of the sample*/
-		priv->scroll_time = FIX_ONE;
-		priv->scroll_delay = 0;
-
-		if (txt->scroll_delay) {
-			priv->scroll_delay = gf_divfix(INT2FIX(txt->scroll_delay->scroll_delay), INT2FIX(sample_duration));
-			if (priv->scroll_delay>FIX_ONE) priv->scroll_delay = FIX_ONE;
-			priv->scroll_time = (FIX_ONE - priv->scroll_delay);
-		}
-		/*if both scroll (in and out), use same scroll duration for both*/
-		if ((priv->scroll_mode & GF_TXT_SCROLL_IN) && (priv->scroll_mode & GF_TXT_SCROLL_OUT)) priv->scroll_time /= 2;
-
-	} else {
-		gf_node_list_add_child( &priv->dlist->children, (GF_Node*)form);
-		gf_node_register((GF_Node *) form, (GF_Node *) priv->dlist);
-		priv->tr_scroll = NULL;
-	}
-
-	if (is_utf_16) {
-		memcpy((char *) utf16_text, txt->text, sizeof(char) * txt->len);
-		((char *) utf16_text)[txt->len] = 0;
-		((char *) utf16_text)[txt->len+1] = 0;
-		char_count = txt->len / 2;
-	} else {
-		char *p = txt->text;
-		char_count = (u32) gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
-	}
-
-	chunks = gf_list_new();
-	/*flatten all modifiers*/
-	if (!txt->styles || !txt->styles->entry_count) {
-		GF_SAFEALLOC(tc, TTDTextChunk);
-		if (!tc) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
-		} else {
-			tc->end_char = char_count;
-			gf_list_add(chunks, tc);
-		}
-	} else {
-		GF_StyleRecord *srec = NULL;
-		char_offset = 0;
-		for (i=0; i<txt->styles->entry_count; i++) {
-			TTDTextChunk *tc;
-			srec = &txt->styles->styles[i];
-			if (srec->startCharOffset==srec->endCharOffset) continue;
-			/*handle not continuous modifiers*/
-			if (char_offset < srec->startCharOffset) {
-				GF_SAFEALLOC(tc, TTDTextChunk);
-				if (!tc) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
-				} else {
-					tc->start_char = char_offset;
-					tc->end_char = srec->startCharOffset;
-					gf_list_add(chunks, tc);
-				}
-			}
-			GF_SAFEALLOC(tc, TTDTextChunk);
-			if (!tc) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
-			} else {
-				tc->start_char = srec->startCharOffset;
-				tc->end_char = srec->endCharOffset;
-				tc->srec = srec;
-				gf_list_add(chunks, tc);
-			}
-			char_offset = srec->endCharOffset;
-		}
-
-		if (srec->endCharOffset<char_count) {
-			GF_SAFEALLOC(tc, TTDTextChunk);
-			if (!tc) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
-			} else {
-				tc->start_char = char_offset;
-				tc->end_char = char_count;
-				gf_list_add(chunks, tc);
-			}
-		}
-	}
-	/*apply all other modifiers*/
-	i=0;
-	while ((a = (GF_Box*)gf_list_enum(txt->others, &i))) {
-		TTD_SplitChunks(txt, char_count, chunks, a);
-	}
-
-	while (gf_list_count(chunks)) {
-		tc = (TTDTextChunk*)gf_list_get(chunks, 0);
-		gf_list_rem(chunks, 0);
-		TTD_NewTextChunk(priv, td, form, utf16_text, tc);
-		gf_free(tc);
-	}
-	gf_list_del(chunks);
-
-	if (form->groupsIndex.vals[form->groupsIndex.count-1] != -1)
-		ttd_add_line(form);
-
-	/*rewrite form groupIndex - group is fine (eg one child per group)*/
-	idx.count = form->groupsIndex.count;
-	idx.vals = form->groupsIndex.vals;
-	form->groupsIndex.vals = NULL;
-	form->groupsIndex.count = 0;
-
-	nb_lines = 0;
-	start_idx = 0;
-	for (i=0; i<idx.count; i++) {
-		if (idx.vals[i] == -1) {
-			s32 *id;
-			u32 j;
-
-			/*only one item in line, no need for alignment, but still add a group (we could use the
-			item as a group but that would complicate the alignment generation)*/
-			if (start_idx==i-1) {
-				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-				(*id) = idx.vals[start_idx];
-				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-				(*id) = -1;
-			} else {
-				/*spread horizontal 0 pixels (eg align) all items in line*/
-				gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
-				s->buffer = gf_strdup(vertical ? "SV 0" : "SH 0");
-				for (j=start_idx; j<i; j++) {
-					gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-					(*id) = idx.vals[j];
-					/*also add a group for the line, for final justif*/
-					gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-					(*id) = idx.vals[j];
-				}
-				gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-				(*id) = -1;
-				/*mark end of group*/
-				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-				(*id) = -1;
-			}
-			start_idx = i+1;
-			nb_lines ++;
-		}
-	}
-	gf_free(idx.vals);
-
-	/*finally add constraints on lines*/
-	start_idx = gf_node_list_get_count(form->children) + 1;
-	/*horizontal alignment*/
-	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
-	if (vertical) {
-		switch (td->vert_justif) {
-		case 1:
-			s->buffer = gf_strdup("AV");
-			break;/*center*/
-		case -1:
-			s->buffer = gf_strdup("AB");
-			break;/*bottom*/
-		default:
-			s->buffer = gf_strdup("AT");
-			break;/*top*/
-		}
-	} else {
-		switch (td->horiz_justif) {
-		case 1:
-			s->buffer = gf_strdup("AH");
-			break;/*center*/
-		case -1:
-			s->buffer = gf_strdup("AR");
-			break;/*right*/
-		default:
-			s->buffer = gf_strdup("AL");
-			break;/*left*/
-		}
-	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = 0;
-	for (i=0; i<nb_lines; i++) {
-		gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-		(*id) = i+start_idx;
-	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = -1;
-
-
-	/*vertical alignment: first align all items vertically, 0 pixel */
-	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
-	s->buffer = gf_strdup(vertical ? "SH 0" : "SV 0");
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = 0;
-	for (i=0; i<nb_lines; i++) {
-		gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-		(*id) = i+start_idx;
-	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = -1;
-
-	/*define a group with every item drawn*/
-	count = gf_node_list_get_count(form->children);
-	for (i=0; i<count; i++) {
-		gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-		(*id) = i+1;
-	}
-	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = -1;
-
-	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
-	if (vertical) {
-		switch (td->horiz_justif) {
-		case 1:
-			s->buffer = gf_strdup("AH");
-			break;/*center*/
-		case -1:
-			s->buffer = gf_strdup("AR");
-			break;/*right*/
-		default:
-			s->buffer = gf_strdup("AL");
-			break;/*left*/
-		}
-	} else {
-		switch (td->vert_justif) {
-		case 1:
-			s->buffer = gf_strdup("AV");
-			break;/*center*/
-		case -1:
-			s->buffer = gf_strdup("AB");
-			break;/*bottom*/
-		default:
-			s->buffer = gf_strdup("AT");
-			break;/*top*/
-		}
-	}
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = 0;
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = start_idx + nb_lines;
-	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
-	(*id) = -1;
-
-
-	gf_node_dirty_set((GF_Node *)form, 0, GF_TRUE);
-	gf_node_changed((GF_Node *)form, NULL);
-	gf_node_changed((GF_Node *) priv->dlist, NULL);
-
-	if (gf_list_count(priv->blink_nodes)) {
-		/*restart time sensor*/
-		priv->ts_blink->startTime = gf_node_get_scene_time((GF_Node *) priv->ts_blink);
-		gf_node_changed((GF_Node *) priv->ts_blink, NULL);
-	}
-
-	priv->is_active = GF_TRUE;
-	/*scroll timer also acts as AU timer*/
-	priv->ts_scroll->startTime = gf_node_get_scene_time((GF_Node *) priv->ts_scroll);
-	priv->ts_scroll->stopTime = priv->ts_scroll->startTime - 1.0;
-	priv->ts_scroll->cycleInterval = sample_duration;
-	priv->ts_scroll->cycleInterval /= priv->cfg->timescale;
-	priv->ts_scroll->cycleInterval -= 0.1;
-	gf_node_changed((GF_Node *) priv->ts_scroll, NULL);
-}
-
-static GF_Err TTD_ProcessData(GF_SceneDecoder*plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 AU_time, u32 mmlevel)
-{
-	GF_BitStream *bs;
-	GF_Err e = GF_OK;
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-
-	bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
-	while (gf_bs_available(bs)) {
-		GF_TextSample *txt;
-		Bool is_utf_16;
-		u32 type, /*length, */sample_index, sample_duration;
-		is_utf_16 = (Bool)gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 4);
-		type = gf_bs_read_int(bs, 3);
-		/*length = */gf_bs_read_u16(bs);
-
-		/*currently only full text samples are supported*/
-		if (type != 1) {
-			gf_bs_del(bs);
-			return GF_NOT_SUPPORTED;
-		}
-		sample_index = gf_bs_read_u8(bs);
-		/*duration*/
-		sample_duration = gf_bs_read_u24(bs);
-		/*txt length is parsed with the sample*/
-		txt = gf_isom_parse_texte_sample(bs);
-		TTD_ApplySample(priv, txt, sample_index, is_utf_16, sample_duration);
-		gf_isom_delete_text_sample(txt);
-		/*since we support only TTU(1), no need to go on*/
-		break;
-	}
-	gf_bs_del(bs);
-	return e;
-}
-
-static u32 TTD_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	/*TTDPriv *priv = (TTDPriv *)ifce->privateStack;*/
-	if (StreamType!=GF_STREAM_TEXT) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	if (esd->decoderConfig->objectTypeIndication==0x08) return GF_CODEC_SUPPORTED;
-
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-void DeleteTimedTextDec(GF_BaseDecoder *plug)
-{
-	TTDPriv *priv = (TTDPriv *)plug->privateStack;
-	/*in case something went wrong*/
-	if (priv->cfg) gf_odf_desc_del((GF_Descriptor *) priv->cfg);
-	gf_free(priv);
-	gf_free(plug);
-}
-
-GF_BaseDecoder *NewTimedTextDec()
-{
-	TTDPriv *priv;
-	GF_SceneDecoder *tmp;
-
-	GF_SAFEALLOC(tmp, GF_SceneDecoder);
-	if (!tmp) return NULL;
-	GF_SAFEALLOC(priv, TTDPriv);
-
-	tmp->privateStack = priv;
-	tmp->AttachStream = TTD_AttachStream;
-	tmp->DetachStream = TTD_DetachStream;
-	tmp->GetCapabilities = TTD_GetCapabilities;
-	tmp->SetCapabilities = TTD_SetCapabilities;
-	tmp->ProcessData = TTD_ProcessData;
-	tmp->AttachScene = TTD_AttachScene;
-	tmp->CanHandleStream = TTD_CanHandleStream;
-	tmp->ReleaseScene = TTD_ReleaseScene;
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC TimedText Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) tmp;
-}
-
-#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-void DeleteTTReader(void *ifce);
-void *NewTTReader();
-#endif
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewTimedTextDec();
-#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-	case GF_NET_CLIENT_INTERFACE:
-		return (GF_BaseInterface *)NewTTReader();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteTimedTextDec((GF_BaseDecoder *)ifce);
-		break;
-#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-	case GF_NET_CLIENT_INTERFACE:
-		DeleteTTReader(ifce);
-		break;
-#endif
-	}
-}
-
-#else
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) {
-	return NULL;
-}
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce) {}
-
-
-#endif /*!defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)*/
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
-		GF_SCENE_DECODER_INTERFACE,
-		GF_NET_CLIENT_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_STATIC_DECLARATION( timedtext )

gpac-0.8.0.tar.gz/modules/timedtext/timedtext_in.c Deleted

@@ -1,470 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / 3GPP/MPEG4 timed text module
- *
- *  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/modules/service.h>
-#include <gpac/modules/codec.h>
-#include <gpac/constants.h>
-
-#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-
-#include <gpac/media_tools.h>
-
-typedef struct
-{
-	GF_ClientService *service;
-	Bool od_done;
-	Bool needs_connection;
-	u32 status;
-	LPNETCHANNEL ch;
-
-	GF_SLHeader sl_hdr;
-
-	GF_ISOFile *mp4;
-	char *szFile;
-	u32 tt_track;
-	GF_ISOSample *samp;
-	u32 samp_num;
-
-	u32 start_range;
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-} TTIn;
-
-
-const char * TTIN_MIME_TYPES[] = {
-	"x-subtitle/srt", "srt", "SRT SubTitles",
-	"x-subtitle/sub", "sub", "SUB SubTitles",
-	"x-subtitle/ttxt", "ttxt", "3GPP TimedText",
-	"text/vtt", "vtt", "VTT SubTitles",
-	NULL
-};
-
-static u32 TTIN_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	if (!plug)
-		return 0;
-	for (i = 0 ; TTIN_MIME_TYPES[i]; i+=3) {
-		gf_service_register_mime(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2]);
-	}
-	return i/3;
-}
-
-static Bool TTIn_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	char *sExt;
-	u32 i;
-	if (!plug || !url)
-		return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (!sExt)
-		return GF_FALSE;
-	for (i = 0 ; TTIN_MIME_TYPES[i]; i+=3) {
-		if (gf_service_check_mime_register(plug, TTIN_MIME_TYPES[i], TTIN_MIME_TYPES[i+1], TTIN_MIME_TYPES[i+2], sExt))
-			return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool TTIn_is_local(const char *url)
-{
-	if (!url)
-		return GF_FALSE;
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (!strnicmp(url, "gmem://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-static GF_ESD *tti_get_esd(TTIn *tti)
-{
-	return gf_media_map_esd(tti->mp4, tti->tt_track);
-}
-
-static void tti_setup_object(TTIn *tti, GF_InputService *plug)
-{
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	GF_ESD *esd = tti_get_esd(tti);
-	od->objectDescriptorID = 0;
-	od->service_ifce = plug;
-	gf_list_add(od->ESDescriptors, esd);
-	gf_service_declare_media(tti->service, (GF_Descriptor *)od, GF_FALSE);
-}
-
-
-GF_Err TTIn_LoadFile(GF_InputService *plug, const char *url, Bool is_cache)
-{
-	GF_Err e;
-	GF_MediaImporter import;
-	char szFILE[GF_MAX_PATH];
-	TTIn *tti = (TTIn *)plug->priv;
-	const char *cache_dir;
-	if (!tti || !url)
-		return GF_BAD_PARAM;
-	cache_dir = gf_modules_get_option((GF_BaseInterface *)plug, "General", "CacheDirectory");
-	if (cache_dir && strlen(cache_dir)) {
-		if (cache_dir[strlen(cache_dir)-1] != GF_PATH_SEPARATOR) {
-			sprintf(szFILE, "%s%csrt_%p_mp4", cache_dir, GF_PATH_SEPARATOR, tti);
-		} else {
-			sprintf(szFILE, "%ssrt_%p_mp4", cache_dir, tti);
-		}
-	} else {
-		sprintf(szFILE, "%p_temp_mp4", tti);
-	}
-	tti->mp4 = gf_isom_open(szFILE, GF_ISOM_OPEN_WRITE, NULL);
-	if (!tti->mp4) return gf_isom_last_error(NULL);
-	if (tti->szFile)
-		gf_free(tti->szFile);
-	tti->szFile = gf_strdup(szFILE);
-
-	memset(&import, 0, sizeof(GF_MediaImporter));
-	import.dest = tti->mp4;
-	/*override layout from sub file*/
-	import.flags = GF_IMPORT_SKIP_TXT_BOX;
-
-	if (!strnicmp(url, "gmem://", 7)) {
-		u8 *mem_address;
-		u32 size;
-		FILE *tmp_txt;
-		import.streamFormat = "TEXT";
-
-		if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_BAD_PARAM;
-		}
-		strcat(szFILE, "_tmptxt");
-		tmp_txt = gf_fopen(szFILE, "w");
-		if (!tmp_txt) return GF_IO_ERR;
-		fwrite(mem_address, size, 1, tmp_txt);
-		gf_fclose(tmp_txt);
-
-		import.in_name = szFILE;
-		e = gf_media_import(&import);
-
-		gf_delete_file(szFILE);
-
-	} else {
-		import.in_name = (char *) url;
-		e = gf_media_import(&import);
-	}
-	if (!e) {
-		tti->tt_track = 1;
-		gf_isom_text_set_streaming_mode(tti->mp4, GF_TRUE);
-	}
-	return e;
-}
-
-void TTIn_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	GF_InputService *plug = (GF_InputService *)cbk;
-	TTIn *tti = (TTIn *) plug->priv;
-	if (!tti)
-		return;
-	gf_service_download_update_stats(tti->dnload);
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		szCache = gf_dm_sess_get_cache_name(tti->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			e = TTIn_LoadFile(plug, szCache, GF_TRUE);
-		}
-	}
-	else if (!e || (param->msg_type==GF_NETIO_DATA_EXCHANGE))
-		return;
-
-	/*OK confirm*/
-	if (tti->needs_connection) {
-		tti->needs_connection = GF_FALSE;
-		gf_service_connect_ack(tti->service, NULL, e);
-		if (!e && !tti->od_done) tti_setup_object(tti, plug);
-	}
-}
-
-void TTIn_download_file(GF_InputService *plug, const char *url)
-{
-	TTIn *tti = (TTIn *) plug->priv;
-	if (!plug || !url)
-		return;
-	tti->needs_connection = GF_TRUE;
-	tti->dnload = gf_service_download_new(tti->service, url, 0, TTIn_NetIO, plug);
-	if (!tti->dnload) {
-		tti->needs_connection = GF_FALSE;
-		gf_service_connect_ack(tti->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(tti->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-static GF_Err TTIn_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_Err e;
-	TTIn *tti = (TTIn *)plug->priv;
-	if (!plug || !url)
-		return GF_BAD_PARAM;
-	tti->service = serv;
-
-	if (tti->dnload) gf_service_download_del(tti->dnload);
-	tti->dnload = NULL;
-
-	/*remote fetch*/
-	if (!TTIn_is_local(url)) {
-		TTIn_download_file(plug, url);
-		return GF_OK;
-	}
-	e = TTIn_LoadFile(plug, url, GF_FALSE);
-	gf_service_connect_ack(serv, NULL, e);
-	if (!e && !tti->od_done) tti_setup_object(tti, plug);
-	return GF_OK;
-}
-
-static GF_Err TTIn_CloseService(GF_InputService *plug)
-{
-	TTIn *tti;
-	if (!plug)
-		return GF_BAD_PARAM;
-	tti = (TTIn *)plug->priv;
-	if (!tti)
-		return GF_BAD_PARAM;
-	if (tti->samp)
-		gf_isom_sample_del(&tti->samp);
-	tti->samp = NULL;
-	if (tti->mp4)
-		gf_isom_delete(tti->mp4);
-	tti->mp4 = NULL;
-	if (tti->szFile) {
-		gf_delete_file(tti->szFile);
-		gf_free(tti->szFile);
-		tti->szFile = NULL;
-	}
-	if (tti->dnload)
-		gf_service_download_del(tti->dnload);
-	tti->dnload = NULL;
-	if (tti->service)
-		gf_service_disconnect_ack(tti->service, NULL, GF_OK);
-	tti->service = NULL;
-	return GF_OK;
-}
-
-static GF_Descriptor *TTIn_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	TTIn *tti;
-	if (!plug)
-		return NULL;
-	tti = (TTIn *)plug->priv;
-	if (!tti)
-		return NULL;
-	/*visual object*/
-	switch (expect_type) {
-	case GF_MEDIA_OBJECT_UNDEF:
-	case GF_MEDIA_OBJECT_UPDATES:
-	case GF_MEDIA_OBJECT_TEXT:
-	{
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		GF_ESD *esd = tti_get_esd(tti);
-		od->objectDescriptorID = esd->ESID;
-		gf_list_add(od->ESDescriptors, esd);
-		tti->od_done = GF_TRUE;
-		return (GF_Descriptor *) od;
-	}
-	default:
-		return NULL;
-	}
-	return NULL;
-}
-
-static GF_Err TTIn_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID;
-	GF_Err e;
-	TTIn *tti = (TTIn *)plug->priv;
-	if (!tti)
-		return GF_BAD_PARAM;
-	e = GF_SERVICE_ERROR;
-	if (!tti || tti->ch==channel) goto exit;
-
-	e = GF_STREAM_NOT_FOUND;
-	ES_ID = 0;
-	if (strstr(url, "ES_ID")) sscanf(url, "ES_ID=%ud", &ES_ID);
-
-	if (ES_ID==1) {
-		tti->ch = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(tti->service, channel, e);
-	return e;
-}
-
-static GF_Err TTIn_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	TTIn *tti = (TTIn *)plug->priv;
-	GF_Err e = GF_STREAM_NOT_FOUND;
-
-	if (tti->ch == channel) {
-		tti->ch = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(tti->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err TTIn_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	TTIn *tti = (TTIn *)plug->priv;
-	if (!tti)
-		return GF_BAD_PARAM;
-	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_PADDING:
-		gf_isom_set_sample_padding(tti->mp4, tti->tt_track, com->pad.padding_bytes);
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = (Double) (s64) gf_isom_get_media_duration(tti->mp4, tti->tt_track);
-		com->duration.duration /= gf_isom_get_media_timescale(tti->mp4, tti->tt_track);
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		tti->start_range = (com->play.start_range>0) ? (u32) (com->play.start_range * 1000) : 0;
-		if (tti->ch == com->base.on_channel) {
-			tti->samp_num = 0;
-			if (tti->samp) gf_isom_sample_del(&tti->samp);
-		}
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	default:
-		return GF_OK;
-	}
-}
-
-
-static GF_Err TTIn_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	TTIn *tti = (TTIn *)plug->priv;
-
-	*out_reception_status = GF_OK;
-	*sl_compressed = GF_FALSE;
-	*is_new_data = GF_FALSE;
-
-	memset(&tti->sl_hdr, 0, sizeof(GF_SLHeader));
-	tti->sl_hdr.randomAccessPointFlag = 1;
-	tti->sl_hdr.compositionTimeStampFlag = 1;
-	tti->sl_hdr.accessUnitStartFlag = tti->sl_hdr.accessUnitEndFlag = 1;
-
-	/*fetching es data*/
-	if (tti->ch == channel) {
-		if (tti->samp_num>=gf_isom_get_sample_count(tti->mp4, tti->tt_track)) {
-			*out_reception_status = GF_EOS;
-			return GF_OK;
-		}
-
-		if (!tti->samp) {
-			u32 di;
-			if (tti->start_range) {
-				u32 di;
-				*out_reception_status = gf_isom_get_sample_for_movie_time(tti->mp4, tti->tt_track, tti->start_range, &di, GF_ISOM_SEARCH_SYNC_BACKWARD, &tti->samp, &tti->samp_num);
-				tti->start_range = 0;
-			} else {
-				tti->samp = gf_isom_get_sample(tti->mp4, tti->tt_track, tti->samp_num+1, &di);
-			}
-			if (!tti->samp) {
-				*out_reception_status = GF_CORRUPTED_DATA;
-				return GF_OK;
-			}
-			*is_new_data = GF_TRUE;
-		}
-		tti->sl_hdr.compositionTimeStamp = tti->sl_hdr.decodingTimeStamp = tti->samp->DTS;
-		*out_data_ptr = tti->samp->data;
-		*out_data_size = tti->samp->dataLength;
-		*out_sl_hdr = tti->sl_hdr;
-		return GF_OK;
-	}
-	return GF_STREAM_NOT_FOUND;
-}
-
-static GF_Err TTIn_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	TTIn *tti = (TTIn *)plug->priv;
-
-	if (tti->ch == channel) {
-		if (!tti->samp) return GF_BAD_PARAM;
-		gf_isom_sample_del(&tti->samp);
-		tti->samp = NULL;
-		tti->samp_num++;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-
-void *NewTTReader()
-{
-	TTIn *priv;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	if (!plug) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC TimedText Reader", "gpac distribution")
-
-	GF_SAFEALLOC(priv, TTIn);
-	if (!priv) {
-		gf_free(plug);
-		return NULL;
-	}
-	plug->priv = priv;
-
-	plug->RegisterMimeTypes = TTIN_RegisterMimeTypes;
-	plug->CanHandleURL = TTIn_CanHandleURL;
-	plug->CanHandleURLInService = NULL;
-	plug->ConnectService = TTIn_ConnectService;
-	plug->CloseService = TTIn_CloseService;
-	plug->GetServiceDescriptor = TTIn_GetServiceDesc;
-	plug->ConnectChannel = TTIn_ConnectChannel;
-	plug->DisconnectChannel = TTIn_DisconnectChannel;
-	plug->ChannelGetSLP = TTIn_ChannelGetSLP;
-	plug->ChannelReleaseSLP = TTIn_ChannelReleaseSLP;
-	plug->ServiceCommand = TTIn_ServiceCommand;
-	return plug;
-}
-
-void DeleteTTReader(void *ifce)
-{
-	TTIn *tti;
-	GF_InputService *plug = (GF_InputService *) ifce;
-	if (!plug)
-		return;
-	tti = (TTIn *)plug->priv;
-	if (tti) {
-		TTIn_CloseService(plug);
-		gf_free(tti);
-	}
-	plug->priv = NULL;
-	gf_free(plug);
-}
-
-#endif /* !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)*/

gpac-0.8.0.tar.gz/modules/ui_rec Deleted

gpac-0.8.0.tar.gz/modules/ui_rec/ui_rec.c Deleted

@@ -1,252 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / User Event Recorder 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.
- *
- */
-
-/*base SVG type*/
-#include <gpac/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-
-
-typedef struct __ui_rec
-{
-	FILE *uif;
-	GF_BitStream *bs;
-	GF_Terminal *term;
-	GF_Clock *ck;
-
-	GF_Event next_event;
-	u32 next_time;
-	Bool evt_loaded;
-
-	GF_TermEventFilter evt_filter;
-} GF_UIRecord;
-
-Bool uir_on_event_play(GF_UIRecord *uir , GF_Event *event, Bool consumed_by_compositor)
-{
-	switch (event->type) {
-	case GF_EVENT_CONNECT:
-		if (event->connect.is_connected) {
-			uir->ck = uir->term->root_scene->scene_codec ? uir->term->root_scene->scene_codec->ck : uir->term->root_scene->dyn_ck;
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-Bool uir_on_event_record(GF_UIRecord *uir , GF_Event *event, Bool consumed_by_compositor)
-{
-	switch (event->type) {
-	case GF_EVENT_CONNECT:
-		if (event->connect.is_connected) {
-			uir->ck = uir->term->root_scene->scene_codec ? uir->term->root_scene->scene_codec->ck : uir->term->root_scene->dyn_ck;
-		}
-		break;
-	case GF_EVENT_CLICK:
-	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN:
-	case GF_EVENT_MOUSEOVER:
-	case GF_EVENT_MOUSEOUT:
-	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
-	case GF_EVENT_MOUSEMOVE:
-	/*mouse wheel event*/
-	case GF_EVENT_MOUSEWHEEL:
-		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
-		gf_bs_write_u8(uir->bs, event->type);
-		gf_bs_write_u8(uir->bs, event->mouse.button);
-		gf_bs_write_u32(uir->bs, event->mouse.x);
-		gf_bs_write_u32(uir->bs, event->mouse.y);
-		gf_bs_write_float(uir->bs, FIX2FLT(event->mouse.wheel_pos) );
-		gf_bs_write_u8(uir->bs, event->mouse.key_states);
-		break;
-	/*Key Events*/
-	case GF_EVENT_KEYUP:
-	case GF_EVENT_KEYDOWN:
-	case GF_EVENT_LONGKEYPRESS:
-		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
-		gf_bs_write_u8(uir->bs, event->type);
-		gf_bs_write_u32(uir->bs, event->key.key_code);
-		gf_bs_write_u32(uir->bs, event->key.hw_code);
-		gf_bs_write_u32(uir->bs, event->key.flags);
-		break;
-	/*character input*/
-	case GF_EVENT_TEXTINPUT:
-		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
-		gf_bs_write_u8(uir->bs, event->type);
-		gf_bs_write_u32(uir->bs, event->character.unicode_char);
-		break;
-	}
-	return GF_FALSE;
-}
-
-void uir_load_event(GF_UIRecord *uir)
-{
-	memset(&uir->next_event, 0, sizeof(GF_Event));
-	uir->evt_loaded = GF_FALSE;
-	if (!gf_bs_available(uir->bs)) return;
-
-
-	uir->next_time = gf_bs_read_u32(uir->bs);
-	uir->next_event.type = gf_bs_read_u8(uir->bs);
-	switch (uir->next_event.type) {
-	case GF_EVENT_CLICK:
-	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN:
-	case GF_EVENT_MOUSEOVER:
-	case GF_EVENT_MOUSEOUT:
-	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
-	case GF_EVENT_MOUSEMOVE:
-	/*mouse wheel event*/
-	case GF_EVENT_MOUSEWHEEL:
-		uir->next_event.mouse.button = gf_bs_read_u8(uir->bs);
-		uir->next_event.mouse.x = gf_bs_read_u32(uir->bs);
-		uir->next_event.mouse.y = gf_bs_read_u32(uir->bs);
-		uir->next_event.mouse.wheel_pos = FLT2FIX( gf_bs_read_float(uir->bs) );
-		uir->next_event.mouse.key_states = gf_bs_read_u8(uir->bs);
-		break;
-	/*Key Events*/
-	case GF_EVENT_KEYUP:
-	case GF_EVENT_KEYDOWN:
-	case GF_EVENT_LONGKEYPRESS:
-		uir->next_event.key.key_code = gf_bs_read_u32(uir->bs);
-		uir->next_event.key.hw_code = gf_bs_read_u32(uir->bs);
-		uir->next_event.key.flags = gf_bs_read_u32(uir->bs);
-		break;
-	/*character input*/
-	case GF_EVENT_TEXTINPUT:
-		uir->next_event.character.unicode_char = gf_bs_read_u32(uir->bs);
-		break;
-	}
-	uir->evt_loaded = GF_TRUE;
-}
-
-static Bool uir_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt, *uifile;
-	GF_UIRecord *uir = (GF_UIRecord*)termext->udta;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		uir->term = (GF_Terminal *) param;
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "UIRecord", "Mode");
-		if (!opt) return GF_FALSE;
-		uifile = gf_modules_get_option((GF_BaseInterface*)termext, "UIRecord", "File");
-		if (!uifile) return GF_FALSE;
-
-		if (!strcmp(opt, "Play")) {
-			uir->uif = gf_fopen(uifile, "rb");
-			if (!uir->uif) return GF_FALSE;
-			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_READ);
-			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
-
-			uir->evt_filter.on_event = uir_on_event_play;
-			uir->evt_filter.udta = uir;
-			gf_term_add_event_filter(uir->term, &uir->evt_filter);
-
-			uir_load_event(uir);
-		} else if (!strcmp(opt, "Record")) {
-			uir->uif = gf_fopen(uifile, "wb");
-			if (!uir->uif) return GF_FALSE;
-			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_WRITE);
-
-			uir->evt_filter.on_event = uir_on_event_record;
-			uir->evt_filter.udta = uir;
-			gf_term_add_event_filter(uir->term, &uir->evt_filter);
-		} else {
-			return GF_FALSE;
-		}
-		return GF_TRUE;
-
-	case GF_TERM_EXT_STOP:
-		if (uir->uif) gf_fclose(uir->uif);
-		if (uir->bs) gf_bs_del(uir->bs);
-		gf_term_remove_event_filter(uir->term, &uir->evt_filter);
-		uir->term = NULL;
-		/*auto-disable the plugin by default*/
-		gf_modules_set_option((GF_BaseInterface*)termext, "UIRecord", "Mode", "Disable");
-		break;
-
-	case GF_TERM_EXT_PROCESS:
-		/*flush all events until current time if reached*/
-		while (uir->evt_loaded && uir->ck && (uir->next_time <= gf_clock_time(uir->ck) )) {
-			uir->term->compositor->video_out->on_event(uir->term->compositor->video_out->evt_cbk_hdl, &uir->next_event);
-			uir_load_event(uir);
-		}
-		break;
-	}
-	return GF_FALSE;
-}
-
-
-GF_TermExt *uir_new()
-{
-	GF_TermExt *dr;
-	GF_UIRecord *uir;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC UI Recorder", "gpac distribution");
-
-	GF_SAFEALLOC(uir, GF_UIRecord);
-	dr->process = uir_process;
-	dr->udta = uir;
-	return dr;
-}
-
-
-void uir_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_UIRecord *uir = (GF_UIRecord*)dr->udta;
-	gf_free(uir);
-	gf_free(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)uir_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		uir_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( ui_rec )

gpac-0.8.0.tar.gz/modules/vtb_decode Deleted

gpac-0.8.0.tar.gz/modules/vtb_decode/Makefile Deleted

gpac-0.8.0.tar.gz/modules/vtb_decode/vtb_decode.c Deleted

@@ -1,1643 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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 <stdint.h>
-
-#define Picture QuickdrawPicture
-#include <VideoToolbox/VideoToolbox.h>
-#undef Picture
-
-#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
-#  define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder")
-#endif
-
-//do not include math.h we would have a conflict with Fixed ... we're lucky we don't need maths routines here
-#define _GF_MATH_H_
-
-#include <gpac/modules/codec.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-
-#include "../../src/compositor/gl_inc.h"
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-	Bool is_hardware;
-	u32 width, height;
-	u32 pixel_ar, pix_fmt;
-	u32 out_size;
-	Bool raw_frame_dispatch;
-	
-	GF_ESD *esd;
-	GF_Err last_error;
-	
-	int vtb_type;
-	VTDecompressionSessionRef vtb_session;
-    CMFormatDescriptionRef fmt_desc;
-	CVPixelBufferRef frame;
-	u32 cts;
-	
-	u8 chroma_format, luma_bit_depth, chroma_bit_depth;
-	Bool frame_size_changed;
-	
-	u32 decoded_frames_pending;
-	Bool reconfig_needed;
-	
-	//MPEG-1/2 specific
-	Bool init_mpeg12;
-	
-	//MPEG-4 specific
-	Bool skip_mpeg4_vosh;
-	char *vosh;
-	u32 vosh_size;
-	
-	//NAL-based specific
-	Bool is_avc;
-	Bool is_annex_b;
-	char *cached_annex_b;
-	u32 cached_annex_b_size;
-	u32 nalu_size_length;
-	GF_List *SPSs, *PPSs, *VPSs;
-	s32 active_sps, active_pps, active_vps;
-	AVCState avc;
-	Bool check_h264_isma;
-
-	HEVCState hevc;
-	Bool is_hevc;
-
-	//openGL output
-#ifdef GPAC_IPHONE
-	Bool use_gl_textures;
-	CVOpenGLESTextureCacheRef cache_texture;
-#endif
-	void *gl_context;
-} VTBDec;
-
-
-static void VTBDec_on_frame(void *opaque, void *sourceFrameRefCon, OSStatus status, VTDecodeInfoFlags flags, CVImageBufferRef image, CMTime pts, CMTime duration)
-{
-	VTBDec *ctx = (VTBDec *)opaque;
-    if (ctx->frame) {
-        CVPixelBufferRelease(ctx->frame);
-        ctx->frame = NULL;
-    }
-	if (status != kCVReturnSuccess) {
-		ctx->last_error = GF_NON_COMPLIANT_BITSTREAM;
-        GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Decode error - status %d\n", status));
-	}
-
-    if (!image) {
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] No output buffer - status %d\n", status));
-        return;
-    }
-    ctx->frame = CVPixelBufferRetain(image);
-}
-
-static CFDictionaryRef VTBDec_CreateBufferAttributes(VTBDec *ctx, OSType pix_fmt)
-{
-    CFMutableDictionaryRef buffer_attributes;
-    CFMutableDictionaryRef surf_props;
-    CFNumberRef w;
-    CFNumberRef h;
-    CFNumberRef pixel_fmt;
-
-    w = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &ctx->width);
-    h = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &ctx->height);
-    pixel_fmt = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pix_fmt);
-
-    buffer_attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 4, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-    surf_props = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-	
-    CFDictionarySetValue(buffer_attributes, kCVPixelBufferWidthKey, w);
-    CFRelease(w);
-    CFDictionarySetValue(buffer_attributes, kCVPixelBufferHeightKey, h);
-    CFRelease(h);
-    CFDictionarySetValue(buffer_attributes, kCVPixelBufferPixelFormatTypeKey, pixel_fmt);
-    CFRelease(pixel_fmt);
-
-#ifdef GPAC_IPHONE
-	if (ctx->use_gl_textures)
-		CFDictionarySetValue(buffer_attributes, kCVPixelBufferOpenGLESCompatibilityKey, kCFBooleanTrue);
-#endif
-
-    CFDictionarySetValue(buffer_attributes, kCVPixelBufferIOSurfacePropertiesKey, surf_props);
-    CFRelease(surf_props);
-
-    return buffer_attributes;
-}
-
-static GF_Err VTBDec_InitDecoder(VTBDec *ctx)
-{
-	CFMutableDictionaryRef dec_dsi, dec_type;
-	CFMutableDictionaryRef dsi;
-	VTDecompressionOutputCallbackRecord cbacks;
-    CFDictionaryRef buffer_attribs;
-    OSStatus status;
-	OSType kColorSpace;
-	
-	CFDataRef data = NULL;
-	char *dsi_data=NULL;
-	u32 dsi_data_size=0;
-	
-    dec_dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-	
-//	kColorSpace = kCVPixelFormatType_420YpCbCr8Planar;
-//	ctx->pix_fmt = GF_PIXEL_YV12;
-
-	kColorSpace = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-	ctx->pix_fmt = GF_PIXEL_NV12;
-	
-	switch (ctx->esd->decoderConfig->objectTypeIndication) {
-    case GPAC_OTI_VIDEO_AVC :
-		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
-			s32 idx;
-			u32 i;
-			GF_AVCConfig *cfg;
-			GF_AVCConfigSlot *sps = NULL;
-			GF_AVCConfigSlot *pps = NULL;
-
-			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
-				sps = gf_list_get(ctx->SPSs, i);
-				if (ctx->active_sps<0) ctx->active_sps = sps->id;
-
-				if (sps->id==ctx->active_sps) break;
-				sps = NULL;
-			}
-			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
-			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
-				pps = gf_list_get(ctx->PPSs, i);
-				if (ctx->active_pps<0) ctx->active_pps = pps->id;
-
-				if (pps->id==ctx->active_pps) break;
-				pps = NULL;
-			}
-			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
-			ctx->reconfig_needed = GF_FALSE;
-			
-			ctx->vtb_type = kCMVideoCodecType_H264;
-
-			idx = ctx->active_sps;
-			ctx->width = ctx->avc.sps[idx].width;
-			ctx->height = ctx->avc.sps[idx].height;
-			if (ctx->avc.sps[idx].vui.par_num && ctx->avc.sps[idx].vui.par_den) {
-				ctx->pixel_ar = ctx->avc.sps[idx].vui.par_num;
-				ctx->pixel_ar <<= 16;
-				ctx->pixel_ar |= ctx->avc.sps[idx].vui.par_den;
-			}
-			ctx->chroma_format = ctx->avc.sps[idx].chroma_format;
-			ctx->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
-			ctx->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
-		
-			switch (ctx->chroma_format) {
-			case 2:
-				//422 decoding doesn't seem supported ...
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_422YpCbCr10;
-					ctx->pix_fmt = GF_PIXEL_YUV422_10;
-				} else {
-					kColorSpace = kCVPixelFormatType_422YpCbCr8;
-					ctx->pix_fmt = GF_PIXEL_YUV422;
-				}
-				break;
-			case 3:
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_444YpCbCr10;
-					ctx->pix_fmt = GF_PIXEL_YUV444_10;
-				} else {
-					kColorSpace = kCVPixelFormatType_444YpCbCr8;
-					ctx->pix_fmt = GF_PIXEL_YUV444;
-				}
-				break;
-			default:
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-					ctx->pix_fmt = GF_PIXEL_YV12_10;
-				}
-				break;
-			}
-			//always rewrite with cirrent sps and pps
-			cfg = gf_odf_avc_cfg_new();
-			cfg->configurationVersion = 1;
-			cfg->profile_compatibility = ctx->avc.sps[idx].prof_compat;
-			cfg->AVCProfileIndication = ctx->avc.sps[idx].profile_idc;
-			cfg->AVCLevelIndication = ctx->avc.sps[idx].level_idc;
-			cfg->chroma_format = ctx->avc.sps[idx].chroma_format;
-			cfg->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
-			cfg->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
-			cfg->nal_unit_size = 4;
-				
-			gf_list_add(cfg->sequenceParameterSets, sps);
-			//we send all PPS
-			gf_list_del(cfg->pictureParameterSets);
-			cfg->pictureParameterSets = ctx->PPSs;
-
-			gf_odf_avc_cfg_write(cfg, &dsi_data, &dsi_data_size);
-			gf_list_reset(cfg->sequenceParameterSets);
-			cfg->pictureParameterSets = NULL;
-			gf_odf_avc_cfg_del((cfg));
-			
-			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)dsi_data, dsi_data_size);
-			if (data) {
-				CFDictionarySetValue(dsi, CFSTR("avcC"), data);
-				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
-				CFRelease(data);
-			}
-			CFRelease(dsi);
-		
-			gf_free(dsi_data);
-		}
-        break;
-
-    case GPAC_OTI_VIDEO_HEVC:
-		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
-			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;
-
-			for (i=0; i<gf_list_count(ctx->VPSs); i++) {
-				vps = gf_list_get(ctx->VPSs, i);
-				if (ctx->active_vps<0) ctx->active_vps = vps->id;
-
-				if (vps->id==ctx->active_vps) break;
-				vps = NULL;
-			}
-			if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
-
-			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
-				sps = gf_list_get(ctx->SPSs, i);
-				if (ctx->active_sps<0) ctx->active_sps = sps->id;
-
-				if (sps->id==ctx->active_sps) break;
-				sps = NULL;
-			}
-			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
-			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
-				pps = gf_list_get(ctx->PPSs, i);
-				if (ctx->active_pps<0) ctx->active_pps = pps->id;
-
-				if (pps->id==ctx->active_pps) break;
-				pps = NULL;
-			}
-			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
-			ctx->reconfig_needed = GF_FALSE;
-
-			ctx->vtb_type = kCMVideoCodecType_HEVC;
-
-			idx = ctx->active_sps;
-			ctx->width = ctx->hevc.sps[idx].width;
-			ctx->height = ctx->hevc.sps[idx].height;
-			if (ctx->hevc.sps[idx].aspect_ratio_info_present_flag && ctx->hevc.sps[idx].sar_width && ctx->hevc.sps[idx].sar_height) {
-				ctx->pixel_ar = ctx->hevc.sps[idx].sar_width;
-				ctx->pixel_ar <<= 16;
-				ctx->pixel_ar |= ctx->hevc.sps[idx].sar_height;
-			}
-			ctx->chroma_format = ctx->hevc.sps[idx].chroma_format_idc;
-			ctx->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
-			ctx->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
-
-			switch (ctx->chroma_format) {
-			case 2:
-#ifndef GPAC_IPHONE
-				//422 decoding doesn't seem supported ...
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_422YpCbCr10;
-					ctx->pix_fmt = GF_PIXEL_YUV422_10;
-				} else
-#endif
-				{
-					kColorSpace = kCVPixelFormatType_422YpCbCr8;
-					ctx->pix_fmt = GF_PIXEL_YUV422;
-				}
-				break;
-			case 3:
-#ifndef GPAC_IPHONE
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_444YpCbCr10;
-					ctx->pix_fmt = GF_PIXEL_YUV444_10;
-				} else
-#endif
-				{
-					kColorSpace = kCVPixelFormatType_444YpCbCr8;
-					ctx->pix_fmt = GF_PIXEL_YUV444;
-				}
-				break;
-			default:
-				//we disable support for 10bit output on ios and old OSX, defaulting back to 8 bits
-#if !defined(GPAC_IPHONE) && defined(AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER)
-				if (ctx->luma_bit_depth>8) {
-					kColorSpace = kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
-					ctx->pix_fmt = GF_PIXEL_NV12_10;
-				}
-#endif
-				break;
-			}
-			//always rewrite with cirrent sps and pps
-			cfg = gf_odf_hevc_cfg_new();
-			cfg->configurationVersion = 1;
-			cfg->profile_space = ctx->hevc.sps[idx].ptl.profile_space;
-			cfg->tier_flag = ctx->hevc.sps[idx].ptl.tier_flag;
-			cfg->profile_idc = ctx->hevc.sps[idx].ptl.profile_idc;
-			cfg->general_profile_compatibility_flags = ctx->hevc.sps[idx].ptl.profile_compatibility_flag;
-			cfg->progressive_source_flag = ctx->hevc.sps[idx].ptl.general_progressive_source_flag;
-			cfg->interlaced_source_flag = ctx->hevc.sps[idx].ptl.general_interlaced_source_flag;
-			cfg->non_packed_constraint_flag = ctx->hevc.sps[idx].ptl.general_non_packed_constraint_flag;
-			cfg->frame_only_constraint_flag = ctx->hevc.sps[idx].ptl.general_frame_only_constraint_flag;
-
-			cfg->constraint_indicator_flags = ctx->hevc.sps[idx].ptl.general_reserved_44bits;
-			cfg->level_idc = ctx->hevc.sps[idx].ptl.level_idc;
-
-			cfg->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
-			cfg->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
-			cfg->chromaFormat = ctx->hevc.sps[idx].chroma_format_idc;
-			cfg->complete_representation = GF_TRUE;
-
-			cfg->nal_unit_size = 4;
-
-			GF_SAFEALLOC(vpsa, GF_HEVCParamArray);
-			vpsa->array_completeness = 1;
-			vpsa->type = GF_HEVC_NALU_VID_PARAM;
-			vpsa->nalus = gf_list_new();
-			gf_list_add(vpsa->nalus, vps);
-			gf_list_add(cfg->param_array, vpsa);
-
-			GF_SAFEALLOC(spsa, GF_HEVCParamArray);
-			spsa->array_completeness = 1;
-			spsa->type = GF_HEVC_NALU_SEQ_PARAM;
-			spsa->nalus = gf_list_new();
-			gf_list_add(spsa->nalus, sps);
-			gf_list_add(cfg->param_array, spsa);
-
-			GF_SAFEALLOC(ppsa, GF_HEVCParamArray);
-			ppsa->array_completeness = 1;
-			ppsa->type = GF_HEVC_NALU_PIC_PARAM;
-			//we send all PPS
-			ppsa->nalus = ctx->PPSs;
-
-			gf_list_add(cfg->param_array, ppsa);
-
-			gf_odf_hevc_cfg_write(cfg, &dsi_data, &dsi_data_size);
-			gf_list_reset(vpsa->nalus);
-			gf_list_reset(spsa->nalus);
-			ppsa->nalus = NULL;
-			gf_odf_hevc_cfg_del(cfg);
-
-			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)dsi_data, dsi_data_size);
-			if (data) {
-				CFDictionarySetValue(dsi, CFSTR("hvcC"), data);
-				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
-				CFRelease(data);
-			}
-			CFRelease(dsi);
-
-			gf_free(dsi_data);
-		}
-        break;
-
-	case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-	case GPAC_OTI_VIDEO_MPEG2_MAIN:
-	case GPAC_OTI_VIDEO_MPEG2_SNR:
-	case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-	case GPAC_OTI_VIDEO_MPEG2_HIGH:
-	case GPAC_OTI_VIDEO_MPEG2_422:
-        ctx->vtb_type = kCMVideoCodecType_MPEG2Video;
-		if (!ctx->width || !ctx->height) {
-			ctx->init_mpeg12 = GF_TRUE;
-			return GF_OK;
-		}
-		ctx->init_mpeg12 = GF_FALSE;
-        break;
-		
-	case GPAC_OTI_VIDEO_MPEG1:
-		ctx->vtb_type = kCMVideoCodecType_MPEG1Video;
-		if (!ctx->width || !ctx->height) {
-			ctx->init_mpeg12 = GF_TRUE;
-			return GF_OK;
-		}
-		ctx->init_mpeg12 = GF_FALSE;
-		break;
-    case GPAC_OTI_VIDEO_MPEG4_PART2 :
-	{
-		Bool reset_dsi = GF_FALSE;
-		ctx->vtb_type = kCMVideoCodecType_MPEG4Video;
-		if (!ctx->esd->decoderConfig->decoderSpecificInfo) {
-			ctx->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		}
-
-		if (!ctx->esd->decoderConfig->decoderSpecificInfo->data) {
-			reset_dsi = GF_TRUE;
-			ctx->esd->decoderConfig->decoderSpecificInfo->data = ctx->vosh;
-			ctx->esd->decoderConfig->decoderSpecificInfo->dataLength = ctx->vosh_size;
-		}
-		
-		if (ctx->esd->decoderConfig->decoderSpecificInfo->data) {
-			GF_M4VDecSpecInfo vcfg;
-			GF_BitStream *bs;
-			
-			gf_m4v_get_config(ctx->esd->decoderConfig->decoderSpecificInfo->data, ctx->esd->decoderConfig->decoderSpecificInfo->dataLength, &vcfg);
-			ctx->width = vcfg.width;
-			ctx->height = vcfg.height;
-			if (ctx->esd->slConfig) {
-				ctx->esd->slConfig->predefined  = 2;
-			}
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_u32(bs, 0);
-			gf_odf_desc_write_bs((GF_Descriptor *) ctx->esd, bs);
-			gf_bs_get_content(bs, &dsi_data, &dsi_data_size);
-			gf_bs_del(bs);
-			
-			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*) dsi_data, dsi_data_size);
-			gf_free(dsi_data);
-			
-			if (data) {
-				CFDictionarySetValue(dsi, CFSTR("esds"), data);
-				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
-				CFRelease(data);
-			}
-			CFRelease(dsi);
-			
-			if (reset_dsi) {
-				ctx->esd->decoderConfig->decoderSpecificInfo->data = NULL;
-				ctx->esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
-			}
-			ctx->skip_mpeg4_vosh = GF_FALSE;
-		} else {
-			ctx->skip_mpeg4_vosh = GF_TRUE;
-			return GF_OK;
-		}
-        break;
-    }
-	case GPAC_OTI_MEDIA_GENERIC:
-		if (ctx->esd->decoderConfig->decoderSpecificInfo && ctx->esd->decoderConfig->decoderSpecificInfo->dataLength) {
-			char *dsi = ctx->esd->decoderConfig->decoderSpecificInfo->data;
-			if (ctx->esd->decoderConfig->decoderSpecificInfo->dataLength<8) return GF_NON_COMPLIANT_BITSTREAM;
-			if (strnicmp(dsi, "s263", 4)) return GF_NOT_SUPPORTED;
-			
-			ctx->width = ((u8) dsi[4]); ctx->width<<=8; ctx->width |= ((u8) dsi[5]);
-			ctx->height = ((u8) dsi[6]); ctx->height<<=8; ctx->height |= ((u8) dsi[7]);
-			ctx->vtb_type = kCMVideoCodecType_H263;
-		}
-		break;
-		
-	default :
-		return GF_NOT_SUPPORTED;
-    }
-
-	if (! ctx->width || !ctx->height) return GF_NOT_SUPPORTED;
-
-    status = CMVideoFormatDescriptionCreate(kCFAllocatorDefault, ctx->vtb_type, ctx->width, ctx->height, dec_dsi, &ctx->fmt_desc);
-
-    if (!ctx->fmt_desc) {
-		if (dec_dsi) CFRelease(dec_dsi);
-        return GF_NON_COMPLIANT_BITSTREAM;
-    }
-	buffer_attribs = VTBDec_CreateBufferAttributes(ctx, kColorSpace);
-	
-	cbacks.decompressionOutputCallback = VTBDec_on_frame;
-    cbacks.decompressionOutputRefCon   = ctx;
-
-    dec_type = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-    CFDictionarySetValue(dec_type, kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue);
-	ctx->is_hardware = GF_TRUE;
-
-    status = VTDecompressionSessionCreate(NULL, ctx->fmt_desc, dec_type, buffer_attribs, &cbacks, &ctx->vtb_session);
-	//if HW decoder not available, try soft one
-	if (status) {
-		status = VTDecompressionSessionCreate(NULL, ctx->fmt_desc, NULL, buffer_attribs, &cbacks, &ctx->vtb_session);
-		ctx->is_hardware = GF_FALSE;
-	}
-	
-	if (dec_dsi)
-		CFRelease(dec_dsi);
-	if (dec_type)
-		CFRelease(dec_type);
-    if (buffer_attribs)
-        CFRelease(buffer_attribs);
-
-    switch (status) {
-    case kVTVideoDecoderNotAvailableNowErr:
-    case kVTVideoDecoderUnsupportedDataFormatErr:
-        return GF_NOT_SUPPORTED;
-    case kVTVideoDecoderMalfunctionErr:
-        return GF_IO_ERR;
-    case kVTVideoDecoderBadDataErr :
-        return GF_BAD_PARAM;
-
-	case kVTPixelTransferNotSupportedErr:
-	case kVTCouldNotFindVideoDecoderErr:
-		return GF_NOT_SUPPORTED;
-    case 0:
-        break;
-    default:
-        return GF_SERVICE_ERROR;
-    }
-	
-	//good to go !
-	if (ctx->pix_fmt == GF_PIXEL_YUV422) {
-		ctx->out_size = ctx->width*ctx->height*2;
-	} else if (ctx->pix_fmt == GF_PIXEL_YUV444) {
-		ctx->out_size = ctx->width*ctx->height*3;
-	} else {
-		// (ctx->pix_fmt == GF_PIXEL_YV12)
-		ctx->out_size = ctx->width*ctx->height*3/2;
-	}
-	if (ctx->luma_bit_depth>8) {
-		ctx->out_size *= 2;
-	}
-	ctx->frame_size_changed = GF_TRUE;
-	return GF_OK;
-}
-
-static void VTB_RegisterParameterSet(VTBDec *ctx, char *data, u32 size, Bool is_sps, u8 hevc_nal_type)
-{
-	Bool add = GF_TRUE;
-	u32 i, count;
-	s32 ps_id;
-	GF_List *dest = NULL;
-
-	if (hevc_nal_type) {
-		is_sps = GF_FALSE;
-		if (hevc_nal_type==GF_HEVC_NALU_SEQ_PARAM) {
-			dest = ctx->SPSs;
-			ps_id = gf_media_hevc_read_sps(data, size, &ctx->hevc);
-			if (ps_id<0) return;
-			is_sps = GF_TRUE;
-		}
-		else if (hevc_nal_type==GF_HEVC_NALU_PIC_PARAM) {
-			dest = ctx->PPSs;
-			ps_id = gf_media_hevc_read_pps(data, size, &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(data, size, &ctx->hevc);
-			if (ps_id<0) return;
-		}
-
-	} else {
-		dest = is_sps ? ctx->SPSs : ctx->PPSs;
-
-		if (is_sps) {
-			ps_id = gf_media_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);
-			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);
-		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) ) {
-			gf_free(a_slc->data);
-			gf_free(a_slc);
-			gf_list_rem(dest, i);
-			break;
-		} else {
-			add = GF_FALSE;
-		}
-		break;
-	}
-	if (add) {
-		GF_AVCConfigSlot *slc;
-		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
-		slc->data = gf_malloc(size);
-		memcpy(slc->data, data, size);
-		slc->size = size;
-		slc->id = ps_id;
-		gf_list_add(dest, slc);
-
-		//force re-activation of sps/pps
-		if (is_sps) ctx->active_sps = -1;
-		else ctx->active_pps = -1;
-	}
-}
-
-static GF_Err VTBDec_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_Err e;
-	VTBDec *ctx = (VTBDec *)ifcg->privateStack;
-	ctx->esd = esd;
-
-	//check AVC config
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
-		ctx->SPSs = gf_list_new();
-		ctx->PPSs = gf_list_new();
-		ctx->is_avc = GF_TRUE;
-		ctx->check_h264_isma = GF_TRUE;
-
-		ctx->avc.sps_active_idx = -1;
-		ctx->active_sps = ctx->active_pps = -1;
-
-		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-			ctx->is_annex_b = GF_TRUE;
-			ctx->width=ctx->height=128;
-			ctx->out_size = ctx->width*ctx->height*3/2;
-			ctx->pix_fmt = GF_PIXEL_YV12;
-			return GF_OK;
-		} else {
-			u32 i;
-			GF_AVCConfigSlot *slc;
-			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			for (i=0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
-				slc = gf_list_get(cfg->sequenceParameterSets, i);
-				slc->id = -1;
-				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_TRUE, 0);
-			}
-
-			for (i=0; i<gf_list_count(cfg->pictureParameterSets); i++) {
-				slc = gf_list_get(cfg->pictureParameterSets, i);
-				slc->id = -1;
-				VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE, 0);
-			}
-
-			slc = gf_list_get(ctx->SPSs, 0);
-			if (slc) ctx->active_sps = slc->id;
-
-			slc = gf_list_get(ctx->PPSs, 0);
-			if (slc) ctx->active_pps = slc->id;
-			
-			ctx->nalu_size_length = cfg->nal_unit_size;
-			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) ) {
-				e = VTBDec_InitDecoder(ctx);
-			} else {
-				e = GF_OK;
-			}
-			gf_odf_avc_cfg_del(cfg);
-			return e;
-		}
-	}
-
-	//check HEVC config
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
-		ctx->SPSs = gf_list_new();
-		ctx->PPSs = gf_list_new();
-		ctx->VPSs = gf_list_new();
-		ctx->is_hevc = GF_TRUE;
-
-		ctx->hevc.sps_active_idx = -1;
-		ctx->active_sps = ctx->active_pps = ctx->active_vps = -1;
-
-		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-			ctx->is_annex_b = GF_TRUE;
-			ctx->width=ctx->height=128;
-			ctx->out_size = ctx->width*ctx->height*3/2;
-			ctx->pix_fmt = GF_PIXEL_YV12;
-			return GF_OK;
-		} else {
-			u32 i, j;
-			GF_AVCConfigSlot *slc;
-			GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-
-			for (i=0; i<gf_list_count(cfg->param_array); i++) {
-				GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
-
-
-				for (j=0; j<gf_list_count(pa->nalus); j++) {
-					slc = gf_list_get(pa->nalus, j);
-					slc->id = -1;
-
-					VTB_RegisterParameterSet(ctx, slc->data, slc->size, GF_FALSE, pa->type);
-				}
-			}
-
-			slc = gf_list_get(ctx->SPSs, 0);
-			if (slc) ctx->active_sps = slc->id;
-
-			slc = gf_list_get(ctx->PPSs, 0);
-			if (slc) ctx->active_pps = slc->id;
-
-			slc = gf_list_get(ctx->VPSs, 0);
-			if (slc) ctx->active_vps = slc->id;
-
-			ctx->nalu_size_length = cfg->nal_unit_size;
-			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)  && gf_list_count(ctx->VPSs) ) {
-				e = VTBDec_InitDecoder(ctx);
-			} else {
-				e = GF_OK;
-			}
-			gf_odf_hevc_cfg_del(cfg);
-			return e;
-		}
-	}
-
-	//check VOSH config
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-		if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) {
-			ctx->width=ctx->height=128;
-			ctx->out_size = ctx->width*ctx->height*3/2;
-			ctx->pix_fmt = GF_PIXEL_YV12;
-		} else {
-			return VTBDec_InitDecoder(ctx);
-		}
-	}
-
-	return VTBDec_InitDecoder(ctx);
-}
-
-static void VTB_DelParamList(GF_List *list)
-{
-	while (gf_list_count(list)) {
-		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
-		gf_free(slc->data);
-		gf_free(slc);
-		gf_list_rem(list, 0);
-	}
-	gf_list_del(list);
-}
-
-static void VTBDec_DeleteDecoder(VTBDec *ctx)
-{
-	if (ctx->fmt_desc) {
-		CFRelease(ctx->fmt_desc);
-		ctx->fmt_desc = NULL;
-	}
-	if (ctx->vtb_session) {
-		VTDecompressionSessionInvalidate(ctx->vtb_session);
-		ctx->vtb_session=NULL;
-	}
-	VTB_DelParamList(ctx->SPSs);
-	ctx->SPSs = NULL;
-	VTB_DelParamList(ctx->PPSs);
-	ctx->PPSs = NULL;
-	VTB_DelParamList(ctx->VPSs);
-	ctx->VPSs = NULL;
-}
-
-static GF_Err VTBDec_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	return GF_OK;
-}
-
-static GF_Err VTBDec_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	VTBDec *ctx = (VTBDec *)ifcg->privateStack;
-	
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = 30.0;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->pix_fmt;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		//since we do the temporal de-interleaving ask for more CUs to avoid displaying refs before reordered frames
-		capability->cap.valueInt = 8;
-		break;
-	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 0;
-		break;
-	/*reorder is up to us*/
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_WANTS_THREAD:
-		capability->cap.valueInt = 0;
-		break;
-	case GF_CODEC_FRAME_OUTPUT:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err VTBDec_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	VTBDec *ctx = (VTBDec *)ifcg->privateStack;
-	
-	switch (capability.CapCode) {
-	case GF_CODEC_FRAME_OUTPUT:
-		ctx->raw_frame_dispatch = capability.cap.valueInt ? GF_TRUE : GF_FALSE;
-#ifdef GPAC_IPHONE
-		if (ctx->raw_frame_dispatch && (capability.cap.valueInt==2))
-			ctx->use_gl_textures = GF_TRUE;
-#endif
-		return GF_OK;
-	}
-
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-
-
-static GF_Err VTB_ParseNALs(VTBDec *ctx, char *inBuffer, u32 inBufferLength, char **out_buffer, u32 *out_size)
-{
-	u32 i, sc_size;
-	char *ptr = inBuffer;
-	u32 nal_size;
-	GF_Err e = GF_OK;
-	GF_BitStream *bs = NULL;
-	
-	if (out_buffer) {
-		*out_buffer = NULL;
-		*out_size = 0;
-	}
-	
-	if (!ctx->nalu_size_length) {
-		sc_size=0;
-		nal_size = gf_media_nalu_next_start_code((u8 *) inBuffer, inBufferLength, &sc_size);
-		if (!sc_size) return GF_NON_COMPLIANT_BITSTREAM;
-		ptr += nal_size + sc_size;
-		assert(inBufferLength >= nal_size + sc_size);
-		inBufferLength -= nal_size + sc_size;
-	}
-	
-	while (inBufferLength) {
-		Bool add_nal = GF_TRUE;
-		u8 nal_type, nal_hdr;
-		GF_BitStream *nal_bs=NULL;
-		
-		if (ctx->nalu_size_length) {
-			nal_size = 0;
-			for (i=0; i<ctx->nalu_size_length; i++) {
-				nal_size = (nal_size<<8) + ((u8) ptr[i]);
-			}
-			ptr += ctx->nalu_size_length;
-		} else {
-			nal_size = gf_media_nalu_next_start_code((const u8 *) ptr, inBufferLength, &sc_size);
-		}
-
-		if (ctx->is_avc) {
-			nal_bs = gf_bs_new(ptr, nal_size, GF_BITSTREAM_READ);
-			nal_hdr = gf_bs_read_u8(nal_bs);
-			nal_type = nal_hdr & 0x1F;
-			switch (nal_type) {
-			case GF_AVC_NALU_SEQ_PARAM:
-				VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_TRUE, 0);
-				add_nal = GF_FALSE;
-				break;
-			case GF_AVC_NALU_PIC_PARAM:
-				VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE, 0);
-				add_nal = GF_FALSE;
-				break;
-			case GF_AVC_NALU_ACCESS_UNIT:
-			case GF_AVC_NALU_END_OF_SEQ:
-			case GF_AVC_NALU_END_OF_STREAM:
-			case GF_AVC_NALU_FILLER_DATA:
-				add_nal = GF_FALSE;
-				break;
-			default:
-				break;
-			}
-
-			gf_media_avc_parse_nalu(nal_bs, nal_hdr, &ctx->avc);
-			gf_bs_del(nal_bs);
-
-			if ((nal_type<=GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
-				if (ctx->avc.sps_active_idx != ctx->active_sps) {
-					ctx->reconfig_needed = 1;
-					ctx->active_sps = ctx->avc.sps_active_idx;
-					ctx->active_pps = ctx->avc.s_info.pps->id;
-					return GF_OK;
-				}
-			}
-		} else if (ctx->is_hevc) {
-			u8 temporal_id, ayer_id;
-			s32 res = gf_media_hevc_parse_nalu(ptr, nal_size, &ctx->hevc, &nal_type, &temporal_id, &ayer_id);
-			if (res>=0) {
-				switch (nal_type) {
-				case GF_HEVC_NALU_VID_PARAM:
-				case GF_HEVC_NALU_SEQ_PARAM:
-				case GF_HEVC_NALU_PIC_PARAM:
-					VTB_RegisterParameterSet(ctx, ptr, nal_size, GF_FALSE, nal_type);
-					add_nal = GF_FALSE;
-					break;
-				case GF_HEVC_NALU_ACCESS_UNIT:
-				case GF_HEVC_NALU_END_OF_SEQ:
-				case GF_HEVC_NALU_END_OF_STREAM:
-				case GF_HEVC_NALU_FILLER_DATA:
-					add_nal = GF_FALSE;
-					break;
-				default:
-					break;
-				}
-
-				if ((nal_type<=GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
-					if (ctx->hevc.sps_active_idx != ctx->active_sps) {
-						ctx->reconfig_needed = 1;
-						ctx->active_sps = ctx->hevc.sps_active_idx;
-						ctx->active_pps = ctx->hevc.s_info.pps->id;
-						ctx->active_vps = ctx->hevc.s_info.sps->vps_id;
-						return GF_OK;
-					}
-				}
-			}
-		}
-		
-		//if sps and pps are ready, init decoder
-		if (!ctx->vtb_session && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) ) {
-			e = VTBDec_InitDecoder(ctx);
-			if (e) return e;
-		}
-		
-		if (!out_buffer) add_nal = GF_FALSE;
-		else if (add_nal && !ctx->vtb_session) add_nal = GF_FALSE;
-
-		if (add_nal) {
-			if (!bs) bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			
-			gf_bs_write_u32(bs, nal_size);
-			gf_bs_write_data(bs, ptr, nal_size);
-		}
-		
-		ptr += nal_size;
-		if (ctx->nalu_size_length) {
-			if (inBufferLength < nal_size + ctx->nalu_size_length) break;
-			inBufferLength -= nal_size + ctx->nalu_size_length;
-		} else {
-			if (!sc_size || (inBufferLength < nal_size + sc_size)) break;
-			inBufferLength -= nal_size + sc_size;
-			ptr += sc_size;
-		}
-	}
-	
-	if (bs) {
-		gf_bs_get_content(bs, out_buffer, out_size);
-		gf_bs_del(bs);
-	}
-	return e;
-}
-
-static GF_Err VTBDec_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-    OSStatus status;
-    CMSampleBufferRef sample = NULL;
-    CMBlockBufferRef block_buffer = NULL;
-	OSType type;
-	char *in_data;
-	u32 in_data_size;
-	Bool do_free=GF_FALSE;
-	
-	GF_Err e;
-	VTBDec *ctx = (VTBDec *)ifcg->privateStack;
-	
-	if (ctx->skip_mpeg4_vosh) {
-		GF_M4VDecSpecInfo dsi;
-		dsi.width = dsi.height = 0;
-		e = gf_m4v_get_config(inBuffer, inBufferLength, &dsi);
-		//found a vosh - remove it from payload, init decoder if needed
-		if ((e==GF_OK) && dsi.width && dsi.height) {
-			if (!ctx->vtb_session) {
-				ctx->vosh = inBuffer;
-				ctx->vosh_size = dsi.next_object_start;
-				e = VTBDec_InitDecoder(ctx);
-				if (e) return e;
-
-				//enfoce removal for all frames
-				ctx->skip_mpeg4_vosh = GF_TRUE;
-				
-				if (!ctx->raw_frame_dispatch && (ctx->out_size != *outBufferLength)) {
-					*outBufferLength = ctx->out_size;
-					return GF_BUFFER_TOO_SMALL;
-				}
-			}
-			ctx->vosh_size = dsi.next_object_start;
-		} else if (!ctx->vtb_session) {
-			*outBufferLength=0;
-			return GF_OK;
-		}
-	}
-
-	if (ctx->init_mpeg12) {
-		GF_M4VDecSpecInfo dsi;
-		dsi.width = dsi.height = 0;
-		
-		e = gf_mpegv12_get_config(inBuffer, inBufferLength, &dsi);
-		if ((e==GF_OK) && dsi.width && dsi.height) {
-			ctx->width = dsi.width;
-			ctx->height = dsi.height;
-			ctx->pixel_ar = dsi.par_num;
-			ctx->pixel_ar <<= 16;
-			ctx->pixel_ar |= dsi.par_den;
-			
-			e = VTBDec_InitDecoder(ctx);
-			if (e) return e;
-
-			if (!ctx->raw_frame_dispatch && (ctx->out_size != *outBufferLength)) {
-				*outBufferLength = ctx->out_size;
-				return GF_BUFFER_TOO_SMALL;
-			}
-		}
-
-		if (!ctx->vtb_session) {
-			*outBufferLength=0;
-			return GF_OK;
-		}
-	}
-	
-	if (ctx->check_h264_isma) {
-		if (inBuffer && !inBuffer[0] && !inBuffer[1] && !inBuffer[2] && (inBuffer[3]==0x01)) {
-			ctx->check_h264_isma=GF_FALSE;
-			ctx->nalu_size_length=0;
-			ctx->is_annex_b=GF_TRUE;
-		}
-	}
-
-	//Always parse AVC data , remove SPS/PPS/... and reconfig if needed
-	if (ctx->is_annex_b || ctx->nalu_size_length) {
-		do_free=GF_TRUE;
-		if (ctx->vtb_session && ctx->cached_annex_b) {
-			in_data = ctx->cached_annex_b;
-			in_data_size = ctx->cached_annex_b_size;
-			ctx->cached_annex_b = NULL;
-		} else {
-			e = VTB_ParseNALs(ctx, inBuffer, inBufferLength, &in_data, &in_data_size);
-			if (e) return e;
-		}
-
-		if (ctx->reconfig_needed) {
-			if (ctx->raw_frame_dispatch && ctx->decoded_frames_pending) {
-				*outBufferLength = 1;
-				gf_free(in_data);
-				ctx->cached_annex_b = NULL;
-				return GF_BUFFER_TOO_SMALL;
-			}
-			if (ctx->fmt_desc) {
-				CFRelease(ctx->fmt_desc);
-				ctx->fmt_desc = NULL;
-			}
-			if (ctx->vtb_session) {
-				VTDecompressionSessionInvalidate(ctx->vtb_session);
-				ctx->vtb_session=NULL;
-			}
-			VTBDec_InitDecoder(ctx);
-			if (ctx->out_size != *outBufferLength) {
-				*outBufferLength = ctx->out_size;
-				gf_free(in_data);
-				ctx->cached_annex_b = NULL;
-				return GF_BUFFER_TOO_SMALL;
-			}
-		}
-
-
-		if (!ctx->raw_frame_dispatch && (ctx->out_size != *outBufferLength)) {
-			*outBufferLength = ctx->out_size;
-			ctx->cached_annex_b = in_data;
-			ctx->cached_annex_b_size = in_data_size;
-
-			return GF_BUFFER_TOO_SMALL;
-		}
-	} else if (ctx->vosh_size) {
-		in_data = inBuffer + ctx->vosh_size;
-		in_data_size = inBufferLength - ctx->vosh_size;
-		ctx->vosh_size = 0;
-	} else {
-		in_data = inBuffer;
-		in_data_size = inBufferLength;
-	}
-	
-	if (!ctx->vtb_session) {
-		*outBufferLength=0;
-		return GF_OK;
-	}
-	
-
-	status = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, in_data, in_data_size, kCFAllocatorNull, NULL, 0, in_data_size, 0, &block_buffer);
-
-	if (status) {
-		return GF_IO_ERR;
-	}
-
-	*outBufferLength=0;
-	if (block_buffer == NULL)
-		return GF_OK;
-		
-	
-	status = CMSampleBufferCreate(kCFAllocatorDefault, block_buffer, TRUE, NULL, NULL, ctx->fmt_desc, 1, 0, NULL, 0, NULL, &sample);
-
-    if (status || (sample==NULL)) {
-		if (block_buffer)
-			CFRelease(block_buffer);
-		return GF_IO_ERR;
-	}
-	ctx->last_error = GF_OK;
-    status = VTDecompressionSessionDecodeFrame(ctx->vtb_session, sample, 0, NULL, 0);
-    if (!status)
-		status = VTDecompressionSessionWaitForAsynchronousFrames(ctx->vtb_session);
-	
-
-	CFRelease(block_buffer);
-	CFRelease(sample);
-	if (do_free)
-		gf_free(in_data);
-	
-	if (ctx->last_error) return ctx->last_error;
-	if (status)
-		return GF_NON_COMPLIANT_BITSTREAM;
-	
-	if (!ctx->frame) {
-		*outBufferLength=0;
-		return ctx->last_error;
-	}
-	ctx->cts = *CTS;
-	*outBufferLength = ctx->out_size;
-	if (ctx->raw_frame_dispatch) return GF_OK;
-
-	status = CVPixelBufferLockBaseAddress(ctx->frame, kCVPixelBufferLock_ReadOnly);
-    if (status != kCVReturnSuccess) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
-        return GF_IO_ERR;
-    }
-
-	type = CVPixelBufferGetPixelFormatType(ctx->frame);
-	
-	if ((type==kCVPixelFormatType_420YpCbCr8Planar)
-		|| (type==kCVPixelFormatType_420YpCbCr8PlanarFullRange)
-		|| (type==kCVPixelFormatType_422YpCbCr8_yuvs)
-		|| (type==kCVPixelFormatType_444YpCbCr8)
-		|| (type=='444v')
-		|| (type==kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange)
-		|| (type==kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)
-	) {
-        u32 i, j, nb_planes = (u32) CVPixelBufferGetPlaneCount(ctx->frame);
-		char *dst = outBuffer;
-		Bool needs_stride=GF_FALSE;
-		u32 stride = (u32) CVPixelBufferGetBytesPerRowOfPlane(ctx->frame, 0);
-			
-		//TOCHECK - for now the 3 planes are consecutive in VideoToolbox
-		if (stride==ctx->width) {
-			char *data = CVPixelBufferGetBaseAddressOfPlane(ctx->frame, 0);
-			memcpy(dst, data, sizeof(char)*ctx->out_size);
-		} else {
-			for (i=0; i<nb_planes; i++) {
-				char *data = CVPixelBufferGetBaseAddressOfPlane(ctx->frame, i);
-				u32 stride = (u32) CVPixelBufferGetBytesPerRowOfPlane(ctx->frame, i);
-				u32 w, h = (u32) CVPixelBufferGetHeightOfPlane(ctx->frame, i);
-				w = ctx->width;
-				if (i) {
-					switch (ctx->pix_fmt) {
-					case GF_PIXEL_YUV444:
-						break;
-					case GF_PIXEL_YUV422:
-					case GF_PIXEL_YV12:
-						w /= 2;
-						break;
-					}
-				}
-				if (stride != w) {
-					needs_stride=GF_TRUE;
-					for (j=0; j<h; j++) {
-						memcpy(dst, data, sizeof(char)*w);
-						dst += w;
-						data += stride;
-					}
-				} else {
-					memcpy(dst, data, sizeof(char)*h*stride);
-					dst += sizeof(char)*h*stride;
-				}
-			}
-		}
-	}
-    CVPixelBufferUnlockBaseAddress(ctx->frame, kCVPixelBufferLock_ReadOnly);
-
-	return GF_OK;
-}
-
-typedef struct
-{
-	Bool locked;
-	CVPixelBufferRef frame;
-	VTBDec *ctx;
-	u32 cts;
-	
-	//openGL mode
-#ifdef GPAC_IPHONE
-	CVOpenGLESTextureRef y, u, v;
-#endif
-} VTB_Frame;
-
-void VTBFrame_Release(GF_MediaDecoderFrame *frame)
-{
-	VTB_Frame *f = (VTB_Frame *)frame->user_data;
-	if (f->locked) {
-		CVPixelBufferUnlockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
-	}
-#ifdef GPAC_IPHONE
-	if (f->y) CVBufferRelease(f->y);
-	if (f->u) CVBufferRelease(f->u);
-	if (f->v) CVBufferRelease(f->v);
-	if (f->ctx->cache_texture)
-		CVOpenGLESTextureCacheFlush(f->ctx->cache_texture, 0);
-#endif
-	
-	if (f->frame) {
-        CVPixelBufferRelease(f->frame);
-    }
-	f->ctx->decoded_frames_pending--;
-
-	gf_free(f);
-	gf_free(frame);
-}
-
-GF_Err VTBFrame_GetPlane(GF_MediaDecoderFrame *frame, u32 plane_idx, const char **outPlane, u32 *outStride)
-{
-    OSStatus status;
-	GF_Err e;
-	VTB_Frame *f = (VTB_Frame *)frame->user_data;
-	if (! outPlane || !outStride) return GF_BAD_PARAM;
-	*outPlane = NULL;
-	*outStride = 0;
-
-//	if (!f->locked) {
-		status = CVPixelBufferLockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
-		if (status != kCVReturnSuccess) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
-			return GF_IO_ERR;
-		}
-//		f->locked = GF_TRUE;
-//	}
-	e = GF_OK;
-	
-    if (CVPixelBufferIsPlanar(f->frame)) {
-		*outStride = (u32) CVPixelBufferGetBytesPerRowOfPlane(f->frame, plane_idx);
-		*outPlane = CVPixelBufferGetBaseAddressOfPlane(f->frame, plane_idx);
-	} else if (plane_idx==0) {
-		*outStride = (u32) CVPixelBufferGetBytesPerRow(f->frame);
-		*outPlane = CVPixelBufferGetBaseAddress(f->frame);
-	} else {
-		e = GF_BAD_PARAM;
-	}
-		CVPixelBufferUnlockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
-
-	return e;
-}
-
-#ifdef GPAC_IPHONE
-
-void *myGetGLContext();
-
-GF_Err VTBFrame_GetGLTexture(GF_MediaDecoderFrame *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
-{
-    OSStatus status;
-	GLenum target_fmt;
-	u32 w, h;
-	CVOpenGLESTextureRef *outTexture=NULL;
-	VTB_Frame *f = (VTB_Frame *)frame->user_data;
-	if (! gl_tex_format || !gl_tex_id) return GF_BAD_PARAM;
-	*gl_tex_format = 0;
-	*gl_tex_id = 0;
-
-	if (!f->ctx->gl_context) {
-		f->ctx->gl_context = myGetGLContext();
-		if (!f->ctx->gl_context) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locating current GL context\n"));
-			return GF_IO_ERR;
-		}
-	}
-	if (! f->ctx->decoded_frames_pending) return GF_IO_ERR;
-	
-	if (!f->ctx->cache_texture) {
-		status = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, NULL, f->ctx->gl_context, NULL, &f->ctx->cache_texture);
-		if (status != kCVReturnSuccess) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error creating cache texture\n"));
-			return GF_IO_ERR;
-		}
-	}
-	
-	if (!f->locked) {
-		status = CVPixelBufferLockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
-		if (status != kCVReturnSuccess) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
-			return GF_IO_ERR;
-		}
-		f->locked = GF_TRUE;
-	}
-	
-	if (plane_idx >= (u32) CVPixelBufferGetPlaneCount(f->frame)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Wrong plane index\n"));
-		return GF_BAD_PARAM;
-	}
-
-	target_fmt = GL_LUMINANCE;
-	w = f->ctx->width;
-	h = f->ctx->height;
-	if (plane_idx) {
-		w /= 2;
-		h /= 2;
-		target_fmt = GL_LUMINANCE_ALPHA;
-	}
-	if (plane_idx==0) {
-		outTexture = &f->y;
-	}
-	else if (plane_idx==1) {
-		outTexture = &f->u;
-	}
-	//don't create texture if already done !
-	if ( *outTexture == NULL) {
-		status = CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, f->ctx->cache_texture, f->frame, NULL, GL_TEXTURE_2D, target_fmt, w, h, target_fmt, GL_UNSIGNED_BYTE, plane_idx, outTexture);
-	
-		if (status != kCVReturnSuccess) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error creating cache texture for plane %d\n", plane_idx));
-			return GF_IO_ERR;
-		}
-	}
-	*gl_tex_format = CVOpenGLESTextureGetTarget(*outTexture);
-	*gl_tex_id = CVOpenGLESTextureGetName(*outTexture);
-
-	return GF_OK;
-}
-#endif
-
-GF_Err VTBDec_GetOutputFrame(GF_MediaDecoder *dec, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
-{
-	GF_MediaDecoderFrame *a_frame;
-	VTB_Frame *vtb_frame;
-	VTBDec *ctx = (VTBDec *)dec->privateStack;
-	
-	*needs_resize = GF_FALSE;
-	
-	if (!ctx->frame) return GF_BAD_PARAM;
-	
-	GF_SAFEALLOC(a_frame, GF_MediaDecoderFrame);
-	if (!a_frame) return GF_OUT_OF_MEM;
-	GF_SAFEALLOC(vtb_frame, VTB_Frame);
-	if (!vtb_frame) {
-		gf_free(a_frame);
-		return GF_OUT_OF_MEM;
-	}
-	a_frame->user_data = vtb_frame;
-	vtb_frame->ctx = ctx;
-	vtb_frame->frame = ctx->frame;
-	ctx->frame = NULL;
-	a_frame->Release = VTBFrame_Release;
-	a_frame->GetPlane = VTBFrame_GetPlane;
-#ifdef GPAC_IPHONE
-	if (ctx->use_gl_textures)
-		a_frame->GetGLTexture = VTBFrame_GetGLTexture;
-#endif
-
-	*frame = a_frame;
-	if (ctx->frame_size_changed) {
-		ctx->frame_size_changed = GF_FALSE;
-		*needs_resize = GF_TRUE;
-	}
-	vtb_frame->cts = ctx->cts;
-	ctx->decoded_frames_pending++;
-	return GF_OK;
-}
-
-static u32 VTBDec_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-#ifdef GPAC_IPHONE
-	u32 ret_val_OK = GF_CODEC_SUPPORTED * 2;
-#else
-	u32 ret_val_OK = GF_CODEC_MAYBE_SUPPORTED;
-#endif
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			Bool cp_ok = GF_TRUE;
-			GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
-			if (!cfg->chroma_format) {
-				GF_AVCConfigSlot *s = gf_list_get(cfg->sequenceParameterSets, 0);
-				if (s) {
-					AVCState avc;
-					s32 idx;
-					memset(&avc, 0, sizeof(AVCState));
-					avc.sps_active_idx = -1;
-					idx = gf_media_avc_read_sps(s->data, s->size, &avc, 0, NULL);
-					cfg->chroma_format = avc.sps[idx].chroma_format;
-					cfg->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
-					cfg->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
-				}
-			}
-			if ((cfg->chroma_bit_depth>8) || (cfg->luma_bit_depth > 8) || (cfg->chroma_format>1)) {
-				cp_ok = GF_FALSE;
-			}
-			gf_odf_avc_cfg_del(cfg);
-			if (!cp_ok) return GF_CODEC_PROFILE_NOT_SUPPORTED;
-		}
-		return ret_val_OK;
-
-	case GPAC_OTI_VIDEO_HEVC:
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-			Bool cp_ok = GF_TRUE;
-			GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_FALSE);
-			if (!cfg) return GF_CODEC_NOT_SUPPORTED;
-			if (!cfg->chromaFormat) {
-				u32 i=0;
-				for (i=0; i<gf_list_count(cfg->param_array); i++) {
-					GF_AVCConfigSlot *s;
-					GF_HEVCParamArray *pa = gf_list_get(cfg->param_array, i);
-					if (pa->type!=GF_HEVC_NALU_SEQ_PARAM) continue;
-					s = gf_list_get(pa->nalus, 0);
-					if (s) {
-						HEVCState hevc;
-						s32 idx;
-						memset(&hevc, 0, sizeof(HEVCState));
-						hevc.sps_active_idx = -1;
-						idx = gf_media_hevc_read_sps(s->data, s->size, &hevc);
-						cfg->chromaFormat = hevc.sps[idx].chroma_format_idc;
-						cfg->luma_bit_depth = 8 + hevc.sps[idx].bit_depth_luma;
-						cfg->chroma_bit_depth = 8 + hevc.sps[idx].bit_depth_chroma;
-					}
-				}
-			}
-			if ((cfg->chroma_bit_depth>8) || (cfg->luma_bit_depth > 8) || (cfg->chromaFormat>1)) {
-				cp_ok = GF_FALSE;
-			}
-			gf_odf_hevc_cfg_del(cfg);
-			if (!cp_ok) return GF_CODEC_PROFILE_NOT_SUPPORTED;
-		}
-		return ret_val_OK;
-
-	case GPAC_OTI_VIDEO_MPEG4_PART2:
-		return ret_val_OK;
-
-	case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-	case GPAC_OTI_VIDEO_MPEG2_MAIN:
-	case GPAC_OTI_VIDEO_MPEG2_SNR:
-	case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-	case GPAC_OTI_VIDEO_MPEG2_HIGH:
-	case GPAC_OTI_VIDEO_MPEG2_422:
-		//not supported on iphone
-#ifdef GPAC_IPHONE
-		return GF_CODEC_NOT_SUPPORTED;
-#else
-		return ret_val_OK;
-#endif
-
-	//cannot make it work on ios and OSX version seems buggy (wrong frame output order)
-//	case GPAC_OTI_VIDEO_MPEG1:
-//		return GF_CODEC_SUPPORTED * 2;
-
-	case GPAC_OTI_MEDIA_GENERIC:
-		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->dataLength) {
-			char *dsi = esd->decoderConfig->decoderSpecificInfo->data;
-			if (!strnicmp(dsi, "s263", 4)) return ret_val_OK;
-		}
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *VTBDec_GetCodecName(GF_BaseDecoder *dec)
-{
-	VTBDec *ctx = (VTBDec *)dec->privateStack;
-	switch (ctx->vtb_type) {
-	case kCMVideoCodecType_H264:
-		return ctx->is_hardware ? "VTB hardware AVC|H264" : "VTB software AVC|H264";
-	case kCMVideoCodecType_HEVC:
-		return ctx->is_hardware ? "VTB hardware HEVC" : "VTB software HEVC";
-	case kCMVideoCodecType_MPEG2Video:
-		return ctx->is_hardware ? "VTB hardware MPEG-2" : "VTB software MPEG-2";
-    case  kCMVideoCodecType_MPEG4Video:
-		return ctx->is_hardware ? "VTB hardware MPEG-4 Part2" : "VTB software MPEG-4 Part2";
-    case kCMVideoCodecType_H263:
-		return ctx->is_hardware ? "VTB hardware H263" : "VTB software H263";
-	case kCMVideoCodecType_MPEG1Video:
-		return ctx->is_hardware ? "VTB hardware MPEG-1" : "VTB software MPEG-1";
-	default:
-		return "VideoToolbox unknown Decoder";
-	}
-}
-
-GF_BaseDecoder *NewVTBDec()
-{
-	GF_MediaDecoder *ifcd;
-	VTBDec *dec;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	if (!ifcd) return NULL;
-	GF_SAFEALLOC(dec, VTBDec);
-	if (!dec) {
-		gf_free(ifcd);
-		return NULL;
-	}
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "VideoToolbox Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/
-	ifcd->AttachStream = VTBDec_AttachStream;
-	ifcd->DetachStream = VTBDec_DetachStream;
-	ifcd->GetCapabilities = VTBDec_GetCapabilities;
-	ifcd->SetCapabilities = VTBDec_SetCapabilities;
-	ifcd->GetName = VTBDec_GetCodecName;
-	ifcd->CanHandleStream = VTBDec_CanHandleStream;
-	ifcd->ProcessData = VTBDec_ProcessData;
-	ifcd->GetOutputFrame = VTBDec_GetOutputFrame;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteVTBDec(GF_BaseDecoder *ifcg)
-{
-	VTBDec *ctx = (VTBDec *)ifcg->privateStack;
-	VTBDec_DeleteDecoder(ctx);
-
-#ifdef GPAC_IPHONE
-	if (ctx->cache_texture) {
-		CFRelease(ctx->cache_texture);
-    }
-#endif
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewVTBDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteVTBDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( vtb )

gpac-0.8.0.tar.gz/modules/vtt_in Deleted

gpac-0.8.0.tar.gz/modules/vtt_in/Makefile Deleted

gpac-0.8.0.tar.gz/modules/vtt_in/vtt_dec.c Deleted

@@ -1,490 +0,0 @@
-/*
- *					GPAC Multimedia Framework
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
- *					All rights reserved
- *
- *  This file is part of GPAC / VTT Loader/Decoder module
- *
- *  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/constants.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/isomedia_dev.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/nodes_svg.h>
-#include <gpac/webvtt.h>
-
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
-
-typedef struct {
-	GF_BaseInterface *module;
-
-	/* Object Type Indication to distinguish between WebVTT content passsed to the decoder as:
-	   - a single file (GPAC_OTI_PRIVATE_SCENE_VTT)
-	   - character strings (GPAC_OTI_SCENE_VTT)
-	   - ISO sample (GPAC_OTI_SCENE_VTT_MP4)
-	*/
-	u32 oti;
-
-	/* Boolean indicating if there is already a WebVTT stream attached to this decoder */
-	Bool is_stream_attached;
-
-	/* ID of the Elementary Stream on which this stream depends (if any)
-	   0 if no dependency */
-	u32 base_es_id;
-
-	/* file_name of the VTT file when parsing a input text file
-	   not used when parsing from MP4 or from a stream */
-	char *file_name;
-	u64 file_size;
-	u64 file_pos;
-
-	/* config of the VTT file when parsing an MP4 file
-	   not used when parsing from text file or from a stream */
-	char *config;
-
-	/* Boolean indicating if a progressive download/parsing is required */
-	Bool use_progressive;
-
-	/* Scene to which this WebVTT stream is linked */
-	GF_Scene *scene;
-
-	/* Terminal to which this WebVTT stream is linked */
-	GF_Terminal *terminal;
-
-	GF_List *cues;
-
-	/* Scene graph for the subtitle content */
-	GF_SceneGraph *sg;
-	Bool has_rendering_script;
-} VTTDec;
-
-
-#define VTT_BUFFER_SIZE 4096
-
-/* Checks that the file is fully downloaded
-   requires that the file_size is given in the DecoderSpecificInfo */
-static Bool vtt_check_download(VTTDec *vttdec)
-{
-	u64 size;
-	FILE *f = gf_fopen(vttdec->file_name, "rt");
-	if (!f) return GF_FALSE;
-	gf_fseek(f, 0, SEEK_END);
-	size = gf_ftell(f);
-	gf_fclose(f);
-	if (size==vttdec->file_size) return GF_TRUE;
-	return GF_FALSE;
-}
-
-
-static GF_Err VTT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 stream_time, u32 mmlevel)
-{
-	GF_Err e = GF_OK;
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	if (!vttdec->has_rendering_script) return GF_BAD_PARAM;
-
-	if (stream_time==(u32)-1) {
-		/* TODO */
-		return GF_OK;
-	}
-
-	switch (vttdec->oti) {
-	case GPAC_OTI_PRIVATE_SCENE_VTT:
-		/*full parsing*/
-		if (vttdec->file_size) {
-			/*init step*/
-			if (!vttdec->use_progressive) {
-				/*not done yet*/
-				if (!vtt_check_download(vttdec)) return GF_OK;
-				/* TODO: parse */
-			} else {
-				/* TODO: parse what you can */
-			}
-		}
-		break;
-
-	case GPAC_OTI_SCENE_VTT:
-		/* TODO: try to parse a cue from the given string */
-		break;
-
-	case GPAC_OTI_SCENE_VTT_MP4:
-	{
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-		char start[100], end[100];
-		GF_List *cues;
-		cues = gf_webvtt_parse_cues_from_data(inBuffer, inBufferLength, 0);
-		gf_webvtt_js_removeCues(vttdec->sg->RootNode);
-		if (gf_list_count(cues)) {
-			while (gf_list_count(cues)) {
-				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
-				gf_list_rem(cues, 0);
-				sprintf(start, "%02d:%02d:%02d.%03d", cue->start.hour, cue->start.min, cue->start.sec, cue->start.ms);
-				sprintf(end, "%02d:%02d:%02d.%03d", cue->end.hour, cue->end.min, cue->end.sec, cue->end.ms);
-				gf_webvtt_js_addCue(vttdec->sg->RootNode, cue->id, start, end, cue->settings, cue->text);
-
-				gf_webvtt_cue_del(cue);
-			}
-		}
-		gf_list_del(cues);
-#endif
-	}
-	break;
-
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	return e;
-}
-
-void VTT_UpdateSizeInfo(VTTDec *vttdec)
-{
-	u32 w, h;
-	GF_FieldInfo info;
-	char szVB[100];
-	GF_Node *root = gf_sg_get_root_node(vttdec->sg);
-	if (!root) return;
-#if 0
-	w = vttdec->scene->root_od->term->compositor->display_width;
-	h = vttdec->scene->root_od->term->compositor->display_height;
-#else
-	w=1280;
-	h=720;
-#endif
-
-	/*apply*/
-	gf_sg_set_scene_size_info(vttdec->sg, w, h, GF_TRUE);
-
-	sprintf(szVB, "0 0 %d %d", w, h);
-	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
-	gf_svg_parse_attribute(root, &info, szVB, 0);
-
-}
-
-
-
-void VTT_load_script(VTTDec *vttdec, GF_SceneGraph *graph)
-{
-	GF_Node *n, *root;
-	GF_FieldInfo info;
-	const char *path;
-	FILE *jsfile;
-
-	if (!graph) return;
-	gf_sg_add_namespace(graph, "http://www.w3.org/2000/svg", NULL);
-	gf_sg_add_namespace(graph, "http://www.w3.org/1999/xlink", "xlink");
-	gf_sg_add_namespace(graph, "http://www.w3.org/2001/xml-events", "ev");
-	gf_sg_set_scene_size_info(graph, 800, 600, GF_TRUE);
-
-	/* modify the scene with an Inline/Animation pointing to the VTT Renderer */
-	n = root = gf_node_new(graph, TAG_SVG_svg);
-	gf_node_register(root, NULL);
-	gf_sg_set_root_node(graph, root);
-	gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
-	gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
-	VTT_UpdateSizeInfo(vttdec);
-	gf_node_init(n);
-
-	n = gf_node_new(graph, TAG_SVG_script);
-	gf_node_register(n, root);
-	gf_node_list_add_child(&((GF_ParentNode *)root)->children, n);
-	path = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript");
-	if (!path) {
-		/* try to find the JS renderer in the default GPAC installation folder */
-		const char *startuppath = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "General", "StartupFile");
-		char *jspath = gf_url_concatenate(startuppath, "webvtt-renderer.js");
-		jsfile = gf_fopen(jspath, "rt");
-		if (jsfile) {
-			gf_modules_set_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript", jspath);
-			gf_fclose(jsfile);
-			gf_free(jspath);
-			path = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript");
-		} else {
-			gf_free(jspath);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot find Rendering Script [WebVTT:RenderingScript] - check config file\n"));
-			return;
-		}
-	}
-	jsfile = gf_fopen(path, "rt");
-	if (jsfile) {
-		gf_fclose(jsfile);
-		gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
-		if (strstr(path, ":\\")) {
-			gf_svg_parse_attribute(n, &info, (char *) path, 0);
-		} else {
-			char szPath[GF_MAX_PATH];
-			strcpy(szPath, "file://");
-			strcat(szPath, path);
-			gf_svg_parse_attribute(n, &info, (char *) szPath, 0);
-		}
-
-		vttdec->has_rendering_script = GF_TRUE;
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot open Rendering Script - %s\n", path));
-		return;
-	}
-	gf_node_init(n);
-
-}
-
-static GF_Err VTT_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	/*WebVTT cannot be a root scene object*/
-	//if (is_scene_decoder) return GF_BAD_PARAM;
-	vttdec->scene = scene;
-	vttdec->terminal = scene->root_od->term;
-
-	vttdec->sg = gf_sg_new_subscene(vttdec->scene->graph);
-	VTT_load_script(vttdec, vttdec->sg);
-	//vtt_create_text_node(vttdec, 2000, GF_TRUE);
-	return GF_OK;
-}
-
-static void VTT_CleanExtraScene(VTTDec *vttdec)
-{
-	/* Cleaning scene graph related data */
-	if (vttdec->sg) {
-		gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_TRUE);
-		gf_sg_del(vttdec->sg);
-		vttdec->sg = NULL;
-	}
-}
-
-static GF_Err VTT_ReleaseScene(GF_SceneDecoder *plug)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-
-	VTT_CleanExtraScene(vttdec);
-	vttdec->scene = NULL;
-	vttdec->terminal = NULL;
-
-	return GF_OK;
-}
-
-static void VTT_ReadFileNameFromDSI(VTTDec *vttdec, GF_DefaultDescriptor *dsi)
-{
-	GF_BitStream *bs;
-	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
-	vttdec->file_size = gf_bs_read_u32(bs);
-	vttdec->file_pos = 0;
-	gf_bs_del(bs);
-	vttdec->file_name =  (char *) gf_malloc(sizeof(char)*(1 + dsi->dataLength - sizeof(u32)) );
-	memcpy(vttdec->file_name, dsi->data + sizeof(u32), dsi->dataLength - sizeof(u32) );
-	vttdec->file_name[dsi->dataLength - sizeof(u32) ] = 0;
-}
-
-static void VTT_ReadConfigFromDSI(VTTDec *vttdec, GF_DefaultDescriptor *dsi)
-{
-	GF_BitStream *bs;
-	u32 entry_type;
-
-	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
-	entry_type = gf_bs_read_u32(bs);
-	if (entry_type == GF_ISOM_BOX_TYPE_WVTT) {
-		GF_Box *b;
-		gf_isom_box_parse(&b, bs);
-		vttdec->config = ((GF_StringBox *)b)->string;
-		((GF_StringBox *)b)->string = NULL;
-		gf_isom_box_del(b);
-	}
-	gf_bs_del(bs);
-}
-
-static GF_Err VTT_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	/* This is a down stream */
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	/* Only process one stream at a time*/
-	if (vttdec->is_stream_attached) return GF_NOT_SUPPORTED;
-
-	/* decSpecInfo is not null only when reading from an SVG file (local or distant, cached or not) */
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_SCENE_VTT:
-		/*no decSpecInfo defined for streaming VTT*/
-		break;
-	case GPAC_OTI_SCENE_VTT_MP4:
-		/* decSpecInfo for VTT in MP4 contains WVTT config box */
-		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
-		VTT_ReadConfigFromDSI(vttdec, esd->decoderConfig->decoderSpecificInfo);
-		break;
-	case GPAC_OTI_PRIVATE_SCENE_VTT:
-	default:
-		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
-		VTT_ReadFileNameFromDSI(vttdec, esd->decoderConfig->decoderSpecificInfo);
-		break;
-	}
-	vttdec->oti = esd->decoderConfig->objectTypeIndication;
-	vttdec->is_stream_attached = GF_TRUE;
-
-	if (!esd->dependsOnESID) vttdec->base_es_id = esd->ESID;
-
-	return GF_OK;
-}
-
-static GF_Err VTT_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	if (vttdec->file_name) gf_free(vttdec->file_name);
-	VTT_CleanExtraScene(vttdec);
-	vttdec->file_name = NULL;
-	vttdec->is_stream_attached = GF_FALSE;
-	if (vttdec->config) {
-		gf_free(vttdec->config);
-		vttdec->config = NULL;
-	}
-	return GF_OK;
-}
-
-const char *VTT_GetName(struct _basedecoder *plug)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	if (vttdec->oti==GPAC_OTI_PRIVATE_SCENE_VTT) return "GPAC WebVTT Parser";
-	if (vttdec->oti==GPAC_OTI_SCENE_VTT) return "GPAC WebVTT Streaming Parser";
-	if (vttdec->oti==GPAC_OTI_SCENE_VTT_MP4) return "GPAC WebVTT/MP4 Parser";
-	return "INTERNAL ERROR";
-}
-
-static u32 VTT_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType==GF_STREAM_TEXT) {
-		/*media type query*/
-		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_SCENE_VTT:
-		case GPAC_OTI_SCENE_VTT_MP4:
-			return GF_CODEC_SUPPORTED;
-		default:
-			return GF_CODEC_NOT_SUPPORTED;
-		}
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static GF_Err VTT_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	/* TODO */
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err VTT_SetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability capability)
-{
-	VTTDec *vttdec = (VTTDec *)plug->privateStack;
-	if (capability.CapCode==GF_CODEC_ABORT) {
-		/* TODO */
-	} else if (capability.CapCode==GF_CODEC_SHOW_SCENE) {
-		if (capability.cap.valueInt) {
-			VTT_UpdateSizeInfo(vttdec);
-			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_FALSE);
-		} else {
-			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_TRUE);
-		}
-	}
-	return GF_OK;
-}
-
-GF_BaseInterface *NewVTTDec()
-{
-	VTTDec *vttdec;
-	GF_SceneDecoder *sdec;
-
-	GF_SAFEALLOC(sdec, GF_SceneDecoder)
-	if (!sdec) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(sdec, GF_SCENE_DECODER_INTERFACE, "GPAC WebVTT Parser", "gpac distribution");
-
-	GF_SAFEALLOC(vttdec, VTTDec);
-	if (!vttdec) {
-		gf_free(sdec);
-		return NULL;
-	}
-	vttdec->cues = gf_list_new();
-	vttdec->module = (GF_BaseInterface *)sdec;
-
-	sdec->privateStack = vttdec;
-	sdec->CanHandleStream	= VTT_CanHandleStream;
-	sdec->AttachStream		= VTT_AttachStream;
-	sdec->DetachStream		= VTT_DetachStream;
-	sdec->AttachScene		= VTT_AttachScene;
-	sdec->ReleaseScene		= VTT_ReleaseScene;
-	sdec->ProcessData		= VTT_ProcessData;
-	sdec->GetName			= VTT_GetName;
-	sdec->SetCapabilities	= VTT_SetCapabilities;
-	sdec->GetCapabilities	= VTT_GetCapabilities;
-	return (GF_BaseInterface *)sdec;
-}
-
-void DeleteVTTDec(GF_BaseDecoder *plug)
-{
-	VTTDec *dec= (VTTDec *)plug->privateStack;
-	gf_list_del(dec->cues);
-	gf_free(dec);
-	gf_free(plug);
-}
-
-#endif // !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
-
-
-/*interface create*/
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	switch (InterfaceType) {
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
-	case GF_SCENE_DECODER_INTERFACE:
-		return (GF_BaseInterface *)NewVTTDec();
-#endif
-	default:
-		return NULL;
-	}
-}
-
-
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
-	case GF_SCENE_DECODER_INTERFACE:
-		DeleteVTTDec((GF_BaseDecoder *)ifce);
-		break;
-#endif
-	}
-}
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG)
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_STATIC_DECLARATION( vtt_dec )

gpac-0.8.0.tar.gz/modules/vtt_in/vtt_in.c Deleted

@@ -1,374 +0,0 @@
-/*
- *					GPAC Multimedia Framework
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
- *					All rights reserved
- *
- *  This file is part of GPAC / VTT Loader/Decoder module
- *
- *  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/internal/terminal_dev.h>
-#include <gpac/scene_manager.h>
-#include <gpac/constants.h>
-#include <gpac/modules/js_usr.h>
-
-#if 0
-
-typedef struct
-{
-	/* Counter-part object in the terminal */
-	GF_ClientService *service;
-	/* Channel object associated to this object */
-	LPNETCHANNEL channel;
-
-	/*file downloader*/
-	GF_DownloadSession * dnload;
-
-	Bool needs_connection;
-
-	/* Header for the SL packets created by this module and sent out to the terminal */
-	GF_SLHeader sl_hdr;
-} VTTIn;
-
-const char * VTT_MIME_TYPES[] = {
-	"text/vtt", "vtt", "VTT SubTitles",
-	NULL
-};
-
-static u32 VTT_RegisterMimeTypes(const GF_InputService *plug) {
-	u32 i;
-	if (!plug) return 0;
-	for (i = 0 ; VTT_MIME_TYPES[i]; i+=3) {
-		gf_service_register_mime(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2]);
-	}
-	return i/3;
-}
-
-static Bool VTT_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	const char *sExt;
-	u32 i;
-	if (!plug || !url) return GF_FALSE;
-	sExt = strrchr(url, '.');
-	if (!sExt) return GF_FALSE;
-	for (i = 0 ; VTT_MIME_TYPES[i]; i+=3) {
-		if (gf_service_check_mime_register(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2], sExt)) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool VTT_is_local(const char *url)
-{
-	if (!url)	return GF_FALSE;
-	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
-	if (strstr(url, "://")) return GF_FALSE;
-	return GF_TRUE;
-}
-
-void VTT_NetIO(void *cbk, GF_NETIO_Parameter *param)
-{
-	GF_Err e;
-	const char *szCache;
-	GF_InputService *plug = (GF_InputService *)cbk;
-	VTTIn *vttin = (VTTIn *) plug->priv;
-
-	if (!vttin)	return;
-	gf_service_download_update_stats(vttin->dnload);
-
-	e = param->error;
-	/*done*/
-	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
-		szCache = gf_dm_sess_get_cache_name(vttin->dnload);
-		if (!szCache) e = GF_IO_ERR;
-		else {
-			//e = TTIn_LoadFile(plug, szCache, 1);
-		}
-	}
-	else if (param->msg_type==GF_NETIO_DATA_EXCHANGE) {
-		return;
-	}
-
-	/*OK confirm*/
-	if (vttin->needs_connection) {
-		vttin->needs_connection = GF_FALSE;
-		gf_service_connect_ack(vttin->service, NULL, e);
-		//if (!e && !vttin->od_done) tti_setup_object(vttin);
-	}
-}
-
-void VTT_download_file(GF_InputService *plug, const char *url)
-{
-	VTTIn *vttin = (VTTIn *) plug->priv;
-	if (!plug || !url)
-		return;
-	vttin->needs_connection = GF_TRUE;
-	vttin->dnload = gf_service_download_new(vttin->service, url, 0, VTT_NetIO, plug);
-	if (!vttin->dnload) {
-		vttin->needs_connection = GF_FALSE;
-		gf_service_connect_ack(vttin->service, NULL, GF_NOT_SUPPORTED);
-	} else {
-		/*start our download (threaded)*/
-		gf_dm_sess_process(vttin->dnload);
-	}
-	/*service confirm is done once fetched*/
-}
-
-static GF_Err VTT_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	GF_Err e;
-	VTTIn *vttin = (VTTIn *)plug->priv;
-	if (!plug || !url)
-		return GF_BAD_PARAM;
-	vttin->service = serv;
-
-	if (vttin->dnload) gf_service_download_del(vttin->dnload);
-	vttin->dnload = NULL;
-
-	/*remote fetch*/
-	if (!VTT_is_local(url)) {
-		VTT_download_file(plug, url);
-		return GF_OK;
-	} else {
-		e = GF_OK;
-		//e = TTIn_LoadFile(plug, url, 0);
-		gf_service_connect_ack(serv, NULL, e);
-		//if (!e && !vttin->od_done) tti_setup_object(vttin);
-	}
-	return GF_OK;
-}
-
-static GF_Err VTT_CloseService(GF_InputService *plug)
-{
-	VTTIn *vttin;
-	if (!plug)	return GF_BAD_PARAM;
-
-	vttin = (VTTIn *)plug->priv;
-	if (!vttin)	return GF_BAD_PARAM;
-
-	//if (vttin->szFile) {
-	//	gf_delete_file(vttin->szFile);
-	//	gf_free(vttin->szFile);
-	//}
-	//vttin->szFile = NULL;
-
-	if (vttin->dnload) {
-		gf_service_download_del(vttin->dnload);
-	}
-	vttin->dnload = NULL;
-
-	if (vttin->service) {
-		gf_service_disconnect_ack(vttin->service, NULL, GF_OK);
-	}
-	vttin->service = NULL;
-
-	return GF_OK;
-}
-
-static GF_Descriptor *VTT_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	VTTIn *vttin;
-	if (!plug)	return NULL;
-	vttin = (VTTIn *)plug->priv;
-	if (!vttin)	return NULL;
-	/*visual object*/
-	switch (expect_type) {
-	case GF_MEDIA_OBJECT_UNDEF:
-	case GF_MEDIA_OBJECT_UPDATES:
-	case GF_MEDIA_OBJECT_TEXT:
-	{
-		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-		//GF_ESD *esd = tti_get_esd(vttin);
-		//od->objectDescriptorID = esd->ESID;
-		//gf_list_add(od->ESDescriptors, esd);
-		//vttin->od_done = 1;
-		return (GF_Descriptor *) od;
-	}
-	default:
-		return NULL;
-	}
-	return NULL;
-}
-
-static GF_Err VTT_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ES_ID;
-	GF_Err e;
-	VTTIn *vttin = (VTTIn *)plug->priv;
-	if (!vttin)	return GF_BAD_PARAM;
-	e = GF_SERVICE_ERROR;
-	if (!vttin || vttin->channel==channel) goto exit;
-
-	e = GF_STREAM_NOT_FOUND;
-	ES_ID = 0;
-	if (strstr(url, "ES_ID")) sscanf(url, "ES_ID=%ud", &ES_ID);
-
-	if (ES_ID==1) {
-		vttin->channel = channel;
-		e = GF_OK;
-	}
-
-exit:
-	gf_service_connect_ack(vttin->service, channel, e);
-	return e;
-}
-
-static GF_Err VTT_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	VTTIn *vttin = (VTTIn *)plug->priv;
-	GF_Err e = GF_STREAM_NOT_FOUND;
-
-	if (!vttin)	return GF_BAD_PARAM;
-
-	if (vttin->channel == channel) {
-		vttin->channel = NULL;
-		e = GF_OK;
-	}
-	gf_service_disconnect_ack(vttin->service, channel, e);
-	return GF_OK;
-}
-
-static GF_Err VTT_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	//VTTIn *vttin = (VTTIn *)plug->priv;
-
-	//if (!vttin)	return GF_BAD_PARAM;
-	//if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-	//switch (com->command_type) {
-	//case GF_NET_CHAN_SET_PADDING:
-	//	gf_isom_set_sample_padding(vttin->mp4, vttin->tt_track, com->pad.padding_bytes);
-	//	return GF_OK;
-	//case GF_NET_CHAN_DURATION:
-	//	com->duration.duration = (Double) (s64) gf_isom_get_media_duration(vttin->mp4, vttin->tt_track);
-	//	com->duration.duration /= gf_isom_get_media_timescale(vttin->mp4, vttin->tt_track);
-	//	return GF_OK;
-	//case GF_NET_CHAN_PLAY:
-	//	vttin->start_range = (com->play.start_range>0) ? (u32) (com->play.start_range * 1000) : 0;
-	//	if (vttin->channel == com->base.on_channel) {
-	//		vttin->samp_num = 0;
-	//		if (vttin->samp) gf_isom_sample_del(&vttin->samp);
-	//	}
-	//	return GF_OK;
-	//case GF_NET_CHAN_STOP:
-	//	return GF_OK;
-	//default:
-	//	return GF_OK;
-	//}
-	return GF_OK;
-}
-
-static GF_Err VTT_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	//VTTIn *vttin = (VTTIn *)plug->priv;
-
-	//*out_reception_status = GF_OK;
-	//*sl_compressed = GF_FALSE;
-	//*is_new_data = GF_FALSE;
-
-	//memset(&vttin->sl_hdr, 0, sizeof(GF_SLHeader));
-	//vttin->sl_hdr.randomAccessPointFlag = 1;
-	//vttin->sl_hdr.compositionTimeStampFlag = 1;
-	//vttin->sl_hdr.accessUnitStartFlag = vttin->sl_hdr.accessUnitEndFlag = 1;
-
-	///*fetching es data*/
-	//if (vttin->channel == channel) {
-	//	if (vttin->samp_num>=gf_isom_get_sample_count(vttin->mp4, vttin->tt_track)) {
-	//		*out_reception_status = GF_EOS;
-	//		return GF_OK;
-	//	}
-
-	//	if (!vttin->samp) {
-	//		u32 di;
-	//		if (vttin->start_range) {
-	//			u32 di;
-	//			*out_reception_status = gf_isom_get_sample_for_movie_time(vttin->mp4, vttin->tt_track, vttin->start_range, &di, GF_ISOM_SEARCH_SYNC_BACKWARD, &vttin->samp, &vttin->samp_num);
-	//			vttin->start_range = 0;
-	//		} else {
-	//			vttin->samp = gf_isom_get_sample(vttin->mp4, vttin->tt_track, vttin->samp_num+1, &di);
-	//		}
-	//		if (!vttin->samp) {
-	//			*out_reception_status = GF_CORRUPTED_DATA;
-	//			return GF_OK;
-	//		}
-	//		*is_new_data = 1;
-	//	}
-	//	vttin->sl_hdr.compositionTimeStamp = vttin->sl_hdr.decodingTimeStamp = vttin->samp->DTS;
-	//	*out_data_ptr = vttin->samp->data;
-	//	*out_data_size = vttin->samp->dataLength;
-	//	*out_sl_hdr = vttin->sl_hdr;
-	//	return GF_OK;
-	//}
-	return GF_STREAM_NOT_FOUND;
-}
-
-static GF_Err VTT_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	//VTTIn *vttin = (VTTIn *)plug->priv;
-	//if (vttin->channel == channel) {
-	//	if (!vttin->samp) return GF_BAD_PARAM;
-	//	gf_isom_sample_del(&vttin->samp);
-	//	vttin->samp = NULL;
-	//	vttin->samp_num++;
-	//	return GF_OK;
-	//}
-	return GF_OK;
-}
-
-static void *NewVTTInput()
-{
-	VTTIn *priv;
-	GF_InputService *plug;
-	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC VTT Reader", "gpac distribution")
-
-	plug->RegisterMimeTypes = VTT_RegisterMimeTypes;
-	plug->CanHandleURL = VTT_CanHandleURL;
-	plug->CanHandleURLInService = NULL;
-	plug->ConnectService = VTT_ConnectService;
-	plug->CloseService = VTT_CloseService;
-	plug->GetServiceDescriptor = VTT_GetServiceDesc;
-	plug->ConnectChannel = VTT_ConnectChannel;
-	plug->DisconnectChannel = VTT_DisconnectChannel;
-	plug->ChannelGetSLP = VTT_ChannelGetSLP;
-	plug->ChannelReleaseSLP = VTT_ChannelReleaseSLP;
-	plug->ServiceCommand = VTT_ServiceCommand;
-
-	GF_SAFEALLOC(priv, VTTIn);
-	plug->priv = priv;
-	return plug;
-}
-
-void DeleteVTTInput(void *ifce)
-{
-	VTTIn *vttin;
-	GF_InputService *plug = (GF_InputService *)ifce;
-	if (!plug)
-		return;
-	vttin = (VTTIn *)plug->priv;
-	if (vttin) {
-		VTT_CloseService(plug);
-		gf_free(vttin);
-	}
-	plug->priv = NULL;
-	gf_free(plug);
-}
-
-
-#endif
-

gpac-0.8.0.tar.gz/modules/widgetman Deleted

gpac-0.8.0.tar.gz/modules/widgetman/Makefile Deleted

@@ -1,64 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/widgetman
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKLIBS= -lgpac -lz
-LOCAL_LIB=-L../../bin/gcc
-
-#common objects
-OBJS=widgetman.o unzip.o widget.o wgt_load.o
-
-ifeq ($(CONFIG_ZLIB), local)
-CFLAGS+=-I"$(LOCAL_INC_PATH)/zlib"
-LOCAL_LIB+= -L../../extra_lib/lib/gcc
-endif
-
-ifeq ($(CONFIG_JS),no)
-else
-CFLAGS+=$(JS_FLAGS)
-ifeq ($(CONFIG_JS),local)
-NEED_LOCAL_LIB="yes"
-LOCAL_LIB+= -L../../extra_lib/lib/gcc
-endif
-LINKLIBS+= $(JS_LIBS)
-endif
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_widgetman$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols widgetman.def 
-endif
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) $(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/widgetman/wgt_load.c Deleted

@@ -1,308 +0,0 @@
-//This software module was originally developed by TelecomParisTech in the
-//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
-//
-//This software module is an implementation of a part of one or
-//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
-//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
-//(ISO/IEC 23007-1) free license to this software module or modifications
-//thereof for use in hardware or software products claiming conformance to
-//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
-//module in hardware or software products are advised that its use may
-//infringe existing patents.
-//The original developer of this software module and his/her company, the
-//subsequent editors and their companies, and ISO/IEC have no liability
-//for use of this software module or modifications thereof in an implementation.
-//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
-//products.
-//Telecom ParisTech retains full right to use the code for his/her own purpose,
-//assign or donate the code to a third party and to inhibit third parties from
-//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
-//
-//This copyright notice must be included in all copies or derivative works.
-//
-//Copyright (c) 2009 Telecom ParisTech.
-//
-// Alternatively, this software module may be redistributed and/or modified
-//  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.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:
-//					Cyril Concolato, Telecom ParisTech
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/nodes_svg.h>
-#include <gpac/constants.h>
-
-#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG)
-
-typedef struct
-{
-	GF_Scene *scene;
-	u8 oti;
-	char *file_name;
-	u32 file_size;
-	Bool loaded;
-} WgtLoad;
-
-static GF_Err WGT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                              u16 ES_ID, u32 stream_time, u32 mmlevel)
-{
-	GF_Err e = GF_OK;
-	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
-
-	if (stream_time==(u32)-1) {
-		gf_sg_reset(wgtload->scene->graph);
-		return GF_OK;
-	}
-
-	switch (wgtload->oti) {
-	case GPAC_OTI_PRIVATE_SCENE_WGT:
-		if (wgtload->file_name && !wgtload->loaded) {
-			const char *path, *wmpath;
-			char *tmp;
-			GF_Node *n, *root;
-			GF_FieldInfo info;
-			FILE *jsfile;
-			GF_ChildNodeItem *last;
-
-			wgtload->loaded = GF_TRUE;
-
-			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2000/svg", NULL);
-			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/1999/xlink", "xlink");
-			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2001/xml-events", "ev");
-			gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, GF_TRUE);
-
-			/* modify the scene with an Inline/Animation pointing to the widget start file URL */
-			n = root = gf_node_new(wgtload->scene->graph, TAG_SVG_svg);
-			gf_node_register(root, NULL);
-			gf_sg_set_root_node(wgtload->scene->graph, root);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
-			gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
-			gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
-			gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
-			/*
-						gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, 1);
-						gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, 1, 0, &info);
-						gf_svg_parse_attribute(n, &info, "800", 0);
-						gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, 1, 0, &info);
-						gf_svg_parse_attribute(n, &info, "600", 0);
-			*/
-			gf_node_init(n);
-
-			n = gf_node_new(wgtload->scene->graph, TAG_SVG_animation);
-			gf_node_set_id(n, 1, "w_anim");
-			gf_node_register(n, root);
-			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_FALSE, &info);
-			gf_svg_parse_attribute(n, &info, "320", 0);
-			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_FALSE, &info);
-			gf_svg_parse_attribute(n, &info, "240", 0);
-			gf_node_init(n);
-
-			tmp = wgtload->file_name;
-			while ((tmp = strchr(tmp, '\\'))) {
-				tmp[0] = '/';
-				tmp++;
-			}
-
-			n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
-			gf_node_register(n, root);
-			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-			path = gf_modules_get_option((GF_BaseInterface *)plug, "Widgets", "WidgetLoadScript");
-			jsfile = path ? gf_fopen(path, "rt") : NULL;
-			if (jsfile) {
-				gf_fclose(jsfile);
-				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
-				gf_svg_parse_attribute(n, &info, (char *) path, 0);
-			} else {
-				const char *load_fun = "function load_widget(wid_url) {\n"
-				                       "	var wid = WidgetManager.load(wid_url);\n"
-				                       "	var anim = document.getElementById('w_anim');\n"
-				                       "	if (wid != null) {\n"
-				                       "		wid.activate(anim);"
-				                       "		anim.setAttributeNS('http://www.w3.org/1999/xlink', 'href', wid.main);\n"
-				                       "	} else {\n"
-				                       "		alert('Widget ' + wid_url + ' is not valid');\n"
-				                       "	}\n"
-				                       "}\n";
-
-				gf_dom_add_text_node(n, gf_strdup(load_fun) );
-			}
-			gf_node_init(n);
-
-
-			wmpath = gf_modules_get_option((GF_BaseInterface *)plug, "Widgets", "WidgetManagerScript");
-			jsfile = wmpath ? gf_fopen(wmpath, "rt") : NULL;
-			if (jsfile) {
-				gf_fclose(jsfile);
-				n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
-				gf_node_register(n, root);
-				gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
-				gf_svg_parse_attribute(n, &info, (char *) wmpath, 0);
-				gf_node_init(n);
-
-				n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
-				gf_node_register(n, root);
-				gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-				gf_dom_add_text_node(n, gf_strdup("widget_manager_init();") );
-				gf_node_init(n);
-			}
-
-			tmp = (char*)gf_malloc(sizeof(char) * (strlen(wgtload->file_name)+50) );
-			sprintf(tmp, "load_widget(\"%s\");\n", wgtload->file_name);
-
-			n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
-			gf_node_register(n, root);
-			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
-			gf_dom_add_text_node(n, gf_strdup(tmp) );
-			gf_free(tmp);
-
-			gf_node_init(n);
-
-			if ((wgtload->scene->graph_attached!=1) && (gf_sg_get_root_node(wgtload->scene->graph)!=NULL) ) {
-				gf_scene_attach_to_compositor(wgtload->scene);
-				e = GF_EOS;
-			}
-		}
-		break;
-
-	default:
-		return GF_BAD_PARAM;
-	}
-	return e;
-}
-
-static GF_Err WGT_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
-{
-	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
-	wgtload->scene = scene;
-	return GF_OK;
-}
-
-static GF_Err WGT_ReleaseScene(GF_SceneDecoder *plug)
-{
-	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
-	wgtload->scene = NULL;
-	return GF_OK;
-}
-
-static GF_Err WGT_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	GF_BitStream *bs;
-	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-
-	/* decSpecInfo is not null only when reading from an WGT file (local or distant, cached or not) */
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_PRIVATE_SCENE_WGT:
-	default:
-		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
-		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-		wgtload->file_size = gf_bs_read_u32(bs);
-		gf_bs_del(bs);
-		wgtload->file_name =  (char *) gf_malloc(sizeof(char)*(1 + esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32)) );
-		memcpy(wgtload->file_name, esd->decoderConfig->decoderSpecificInfo->data + sizeof(u32), esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) );
-		wgtload->file_name[esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) ] = 0;
-		break;
-	}
-	wgtload->oti = esd->decoderConfig->objectTypeIndication;
-	return GF_OK;
-}
-
-static GF_Err WGT_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
-	if (wgtload->file_name) gf_free(wgtload->file_name);
-	wgtload->file_name = NULL;
-	return GF_OK;
-}
-
-const char *WGT_GetName(struct _basedecoder *plug)
-{
-	return "GPAC W3C Widget Loader";
-}
-
-static u32 WGT_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	/*don't reply to media type query*/
-	if (!esd) return GF_CODEC_NOT_SUPPORTED;
-
-	if (StreamType==GF_STREAM_PRIVATE_SCENE) {
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_PRIVATE_SCENE_WGT) return GF_CODEC_SUPPORTED;
-		return GF_CODEC_NOT_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static GF_Err WGT_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	if (cap->CapCode==GF_CODEC_PADDING_BYTES) {
-		/* Adding one byte of padding for \r\n problems*/
-		cap->cap.valueInt = 1;
-		return GF_OK;
-	}
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err WGT_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-/*interface create*/
-GF_BaseInterface *LoadWidgetReader()
-{
-	WgtLoad *wgtload;
-	GF_SceneDecoder *sdec;
-
-	GF_SAFEALLOC(sdec, GF_SceneDecoder)
-	if (!sdec) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(sdec, GF_SCENE_DECODER_INTERFACE, "GPAC W3C Widget Loader", "gpac distribution");
-
-	GF_SAFEALLOC(wgtload, WgtLoad);
-	if (!wgtload) {
-		gf_free(sdec);
-		return NULL;
-	}
-	
-	sdec->privateStack = wgtload;
-	sdec->AttachStream = WGT_AttachStream;
-	sdec->CanHandleStream = WGT_CanHandleStream;
-	sdec->DetachStream = WGT_DetachStream;
-	sdec->AttachScene = WGT_AttachScene;
-	sdec->ReleaseScene = WGT_ReleaseScene;
-	sdec->ProcessData = WGT_ProcessData;
-	sdec->GetName = WGT_GetName;
-	sdec->SetCapabilities = WGT_SetCapabilities;
-	sdec->GetCapabilities = WGT_GetCapabilities;
-	return (GF_BaseInterface *)sdec;
-}
-
-
-/*interface destroy*/
-void ShutdownWidgetReader(GF_BaseInterface *ifce)
-{
-	GF_SceneDecoder *sdec = (GF_SceneDecoder *)ifce;
-	WgtLoad *wgtload;
-	if (!ifce)
-		return;
-	wgtload = (WgtLoad *) sdec->privateStack;
-	if (wgtload)
-		gf_free(wgtload);
-	sdec->privateStack = NULL;
-	gf_free(sdec);
-}
-
-#endif	/* defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG) */

gpac-0.8.0.tar.gz/modules/widgetman/widget.c Deleted

@@ -1,452 +0,0 @@
-//This software module was originally developed by TelecomParisTech in the
-//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
-//
-//This software module is an implementation of a part of one or
-//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
-//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
-//(ISO/IEC 23007-1) free license to this software module or modifications
-//thereof for use in hardware or software products claiming conformance to
-//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
-//module in hardware or software products are advised that its use may
-//infringe existing patents.
-//The original developer of this software module and his/her company, the
-//subsequent editors and their companies, and ISO/IEC have no liability
-//for use of this software module or modifications thereof in an implementation.
-//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
-//products.
-//Telecom ParisTech retains full right to use the code for his/her own purpose,
-//assign or donate the code to a third party and to inhibit third parties from
-//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
-//
-//This copyright notice must be included in all copies or derivative works.
-//
-//Copyright (c) 2009 Telecom ParisTech.
-//
-// Alternatively, this software module may be redistributed and/or modified
-//  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.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:
-//					Jean Le Feuvre, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-
-#include "widgetman.h"
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-JSBool SMJS_FUNCTION(widget_has_feature)
-{
-	char *feat_name;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	feat_name = SMJS_CHARS(c, argv[0]);
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-
-	if (!strcmp(feat_name, "urn:mpeg:systems:mpeg-u:2009")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( JS_TRUE ));
-	SMJS_FREE(c, feat_name);
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(widget_open_url)
-{
-	GF_Event evt;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_NAVIGATE;
-	evt.navigate.to_url = SMJS_CHARS(c, argv[0]);
-	gf_term_send_event(wid->widget->wm->term, &evt);
-	SMJS_FREE(c, (char *)evt.navigate.to_url);
-
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(widget_get_attention)
-{
-	jsval fval;
-	SMJS_OBJ
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_TRUE;
-
-	if ((JS_LookupProperty(c, wid->widget->wm->obj, "getAttention", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
-		jsval args[1];
-		args[0] = OBJECT_TO_JSVAL(wid->obj);
-		JS_CallFunctionValue(c, wid->widget->wm->obj, fval, 1, args, SMJS_GET_RVAL);
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(widget_show_notification)
-{
-	jsval fval;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_TRUE;
-
-	if ((JS_LookupProperty(c, wid->widget->wm->obj, "showNotification", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
-		jsval *vars;
-		u32 i;
-		vars = (jsval*)gf_malloc(sizeof(jsval)*(argc+1));
-		vars[0] = OBJECT_TO_JSVAL(wid->obj);
-		for (i=0; i<argc; i++)
-			vars[i+1] = argv[i];
-
-		JS_CallFunctionValue(c, wid->widget->wm->obj, fval, argc+1, vars, SMJS_GET_RVAL);
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(widget_call_message_reply_callback)
-{
-	JSObject *list;
-	jsval *vals, fval;
-	u32 i, count;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetMessage *msg = SMJS_GET_PRIVATE(c, obj);
-	if (!msg || !argc || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
-
-	if ((JS_LookupProperty(c, obj, "replyCallback", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
-		list = JSVAL_TO_OBJECT(argv[0]);
-		JS_GetArrayLength(c, list, (jsuint*) &count);
-		vals = (jsval*)gf_malloc(sizeof(jsval)*(count+1));
-		vals[0] = OBJECT_TO_JSVAL(obj);
-		for (i=0; i<count; i++) {
-			JS_GetElement(c, list, (jsint) i, &vals[i+1]);
-		}
-		JS_CallFunctionValue(c, obj, fval, count, vals, SMJS_GET_RVAL);
-		gf_free(vals);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(widget_message_handler_factory)
-{
-	char *msg_name;
-	u32 i, count;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!bifce) return JS_FALSE;
-
-	if (!argc) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-
-	msg_name = SMJS_CHARS(c, argv[0]);
-	if (!msg_name ) return JS_FALSE;
-
-	SMJS_SET_RVAL( JSVAL_NULL );
-	count = gf_list_count(bifce->ifce->messages);
-	for (i=0; i<count; i++) {
-		GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, i);
-		if (!strcmp(msg->name, msg_name)) {
-			JSObject *an_obj = JS_NewObject(c, &bifce->wid->widget->wm->widgetAnyClass._class, 0, 0);
-			SMJS_SET_PRIVATE(c, an_obj, msg);
-			JS_DefineProperty(c, an_obj, "msgName", STRING_TO_JSVAL( JS_NewStringCopyZ(c, msg->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, an_obj, "interfaceHandler", OBJECT_TO_JSVAL( obj ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineFunction(c, an_obj, "onInvokeReply", widget_call_message_reply_callback, 1, 0);
-
-			if ((argc==2) && JSVAL_IS_OBJECT(argv[1]) && !JSVAL_IS_NULL(argv[1]))
-				JS_DefineProperty(c, an_obj, "replyCallback", argv[1], 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-			SMJS_SET_RVAL( OBJECT_TO_JSVAL(an_obj) );
-		}
-	}
-	SMJS_FREE(c, msg_name);
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(widget_invoke_message)
-{
-	jsval oval;
-	GF_WidgetMessage *msg = NULL;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!bifce) return JS_FALSE;
-
-	SMJS_SET_RVAL( JSVAL_NULL );
-
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-	if (JSVAL_IS_NULL(argv[0])) return JS_FALSE;
-	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!msg) return JS_FALSE;
-
-	/*look for JS Callback "invoke" in the widget manager script*/
-	if (JS_LookupProperty(c, bifce->ifce->obj, "invoke", &oval)==JS_TRUE) {
-		if (JSVAL_IS_OBJECT(oval)) {
-			JS_CallFunctionValue(bifce->wid->widget->wm->ctx, bifce->ifce->obj, oval, argc, argv, SMJS_GET_RVAL );
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(widget_invoke_message_reply)
-{
-	jsval oval;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetMessage *msg = NULL;
-	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!bifce) return JS_FALSE;
-
-	SMJS_SET_RVAL( JSVAL_NULL );
-
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-	if (JSVAL_IS_NULL(argv[0])) return JS_FALSE;
-	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!msg) return JS_FALSE;
-
-	/*look for JS Callback "invokeReply" in the widget manager script*/
-	if (JS_LookupProperty(c, bifce->ifce->obj, "invokeReply", &oval)==JS_TRUE) {
-		if (JSVAL_IS_OBJECT(oval)) {
-			JS_CallFunctionValue(bifce->wid->widget->wm->ctx, bifce->ifce->obj, oval, argc, argv, SMJS_GET_RVAL);
-		}
-	}
-	return JS_TRUE;
-}
-
-static void widget_interface_js_bind(JSContext *c, GF_WidgetInterfaceInstance *ifce)
-{
-	if (!ifce->obj) {
-		ifce->obj = JS_NewObject(c, &ifce->wid->widget->wm->widgetAnyClass._class, 0, 0);
-		SMJS_SET_PRIVATE(c, ifce->obj, ifce);
-		gf_js_add_root(c, &ifce->obj, GF_JSGC_OBJECT);
-		JS_DefineProperty(c, ifce->obj, "type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->ifce->type) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, ifce->obj, "bound", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->hostname) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineFunction(c, ifce->obj, "invoke", widget_invoke_message, 1, 0);
-		JS_DefineFunction(c, ifce->obj, "msgHandlerFactory", widget_message_handler_factory, 1, 0);
-		JS_DefineFunction(c, ifce->obj, "invokeReply", widget_invoke_message_reply, 1, 0);
-	}
-}
-
-static JSBool SMJS_FUNCTION(widget_get_interfaces)
-{
-	u32 i, count;
-	char *ifce_name;
-	JSObject *list;
-	jsuint idx;
-	jsval v;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	ifce_name = SMJS_CHARS(c, argv[0]);
-
-	list = JS_NewArrayObject(c, 0, 0);
-
-	count = gf_list_count(wid->bound_ifces);
-	for (i=0; i<count; i++) {
-		GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
-		if (strcmp(ifce->ifce->type, ifce_name)) continue;
-
-		widget_interface_js_bind(c, ifce);
-
-		JS_GetArrayLength(c, list, &idx);
-		v = OBJECT_TO_JSVAL(ifce->obj);
-		JS_SetElement(c, list, idx, &v);
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(list) );
-	SMJS_FREE(c, ifce_name);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION_EXT(widget_activate_component, Bool is_deactivate)
-{
-	u32 i, count;
-	char *comp_id;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	comp_id = SMJS_CHARS(c, argv[0]);
-
-	count = gf_list_count(wid->widget->main->components);
-	for (i=0; i<count; i++) {
-		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
-		if (!comp->id  || strcmp(comp->id, comp_id)) continue;
-
-		if (is_deactivate) {
-			wm_deactivate_component(c, wid, comp, NULL);
-		} else {
-			wm_activate_component(c, wid, comp, GF_FALSE);
-		}
-		break;
-	}
-	SMJS_FREE(c, comp_id);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(widget_activate_widget)
-{
-	return widget_activate_component(SMJS_CALL_ARGS, GF_FALSE);
-}
-
-static JSBool SMJS_FUNCTION(widget_deactivate_widget)
-{
-	return widget_activate_component(SMJS_CALL_ARGS, GF_TRUE);
-}
-
-void widget_on_interface_bind(GF_WidgetInterfaceInstance *ifce, Bool unbind)
-{
-	jsval funval, rval, argv[1];
-
-	const char *fun_name = unbind ? "onInterfaceUnbind" : "onInterfaceBind";
-	if (!ifce || !ifce->wid || !ifce->wid->scene_context) return;
-
-	/*look for JS Callback "invoke" in the widget manager script*/
-	if (JS_LookupProperty(ifce->wid->scene_context, ifce->wid->scene_obj, fun_name, &funval)!=JS_TRUE)
-		return;
-	if (!JSVAL_IS_OBJECT(funval)) return;
-
-	widget_interface_js_bind(ifce->wid->widget->wm->ctx, ifce);
-	argv[0] = OBJECT_TO_JSVAL(ifce->obj);
-	JS_CallFunctionValue(ifce->wid->widget->wm->ctx, ifce->ifce->obj, funval, 1, argv, &rval);
-
-}
-
-SMJS_FUNC_PROP_GET(widget_getProperty)
-
-const char *opt;
-char *prop_name;
-GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-if (!wid) return JS_FALSE;
-
-if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-if (!prop_name) return JS_FALSE;
-
-if (!strcmp(prop_name, "viewMode")) {
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "floating") );
-}
-else if (!strcmp(prop_name, "locale")) {
-	opt = gf_cfg_get_key(wid->widget->wm->term->user->config, "Systems", "Language2CC");
-	if (!opt) opt = "und";
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, opt) );
-}
-else if (!strcmp(prop_name, "identifier")) {
-	if (wid->widget->identifier) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->identifier) );
-}
-else if (!strcmp(prop_name, "authorName")) {
-	if (wid->widget->authorName) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorName) );
-}
-else if (!strcmp(prop_name, "authorEmail")) {
-	if (wid->widget->authorEmail) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorEmail) );
-}
-else if (!strcmp(prop_name, "authorHref")) {
-	if (wid->widget->authorHref) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorHref) );
-}
-else if (!strcmp(prop_name, "name")) {
-	if (wid->widget->name) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->name) );
-}
-else if (!strcmp(prop_name, "version")) {
-	if (wid->widget->version) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->version) );
-}
-else if (!strcmp(prop_name, "description")) {
-	if (wid->widget->description) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->description) );
-}
-else if (!strcmp(prop_name, "width")) {
-	opt = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, "width");
-	*vp = INT_TO_JSVAL( (opt ? atoi(opt) : 0) );
-}
-else if (!strcmp(prop_name, "height")) {
-	opt = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, "height");
-	*vp = INT_TO_JSVAL( (opt ? atoi(opt) : 0) );
-}
-else if (!strcmp(prop_name, "preferences")) {
-}
-SMJS_FREE(c, prop_name);
-return JS_TRUE;
-}
-
-SMJS_FUNC_PROP_SET( widget_setProperty)
-
-/*avoids GCC warning*/
-if (!obj) obj = NULL;
-#ifndef GPAC_CONFIG_DARWIN
-if (!id) id=0;
-#endif
-if (!vp) vp=0;
-return JS_TRUE;
-}
-
-void widget_load(GF_WidgetManager *wm, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
-{
-	u32 i, count;
-	GF_WidgetInstance *wi;
-
-	/*Is this scenegraph a widget or not ? To find out, browse all widget instances*/
-	i=0;
-	while ((wi = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i))) {
-		if (!wi->scene || (wi->scene != scene)) continue;
-		break;
-	}
-	if (!wi) return;
-
-	/*OK we found our widget*/
-
-	if (unload) {
-		/*detach all bound interfaces from this script*/
-		count = gf_list_count(wi->bound_ifces);
-		for (i=0; i<count; i++) {
-			GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wi->bound_ifces, i);
-			if (ifce->obj) {
-				SMJS_SET_PRIVATE(c, ifce->obj, NULL);
-				gf_js_remove_root(c, &ifce->obj, GF_JSGC_OBJECT);
-				ifce->obj = NULL;
-			}
-		}
-		return;
-	} else {
-
-		JSPropertySpec widgetClassProps[] = {
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec widgetClassFuncs[] = {
-			/*W3C*/
-			SMJS_FUNCTION_SPEC("has_feature", widget_has_feature, 1),
-			SMJS_FUNCTION_SPEC("openURL", widget_open_url, 1),
-			SMJS_FUNCTION_SPEC("getAttention", widget_get_attention, 0),
-			SMJS_FUNCTION_SPEC("showNotification", widget_show_notification, 0),
-			/*MPEG*/
-			SMJS_FUNCTION_SPEC("getInterfaceHandlersByType", widget_get_interfaces, 1),
-			SMJS_FUNCTION_SPEC("activateComponentWidget", widget_activate_widget, 1),
-			SMJS_FUNCTION_SPEC("deactivateComponentWidget", widget_deactivate_widget, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-
-		GF_JS_InitClass(c, global, 0, &wm->widgetClass, 0, 0,widgetClassProps, widgetClassFuncs, 0, 0);
-
-
-		wi->scene_obj = JS_DefineObject(c, global, "widget", &wm->widgetClass._class, 0, 0);
-		//JS_AliasProperty(c, global, "widget", "MPEGWidget");
-		SMJS_SET_PRIVATE(c, wi->scene_obj, wi);
-		/*and remember the script*/
-		wi->scene_context = c;
-		wi->scene_global = global;
-	}
-}
-
-#endif

gpac-0.8.0.tar.gz/modules/widgetman/widgetman.c Deleted

@@ -1,3747 +0,0 @@
-//This software module was originally developed by TelecomParisTech in the
-//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
-//
-//This software module is an implementation of a part of one or
-//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
-//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
-//(ISO/IEC 23007-1) free license to this software module or modifications
-//thereof for use in hardware or software products claiming conformance to
-//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
-//module in hardware or software products are advised that its use may
-//infringe existing patents.
-//The original developer of this software module and his/her company, the
-//subsequent editors and their companies, and ISO/IEC have no liability
-//for use of this software module or modifications thereof in an implementation.
-//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
-//products.
-//Telecom ParisTech retains full right to use the code for his/her own purpose,
-//assign or donate the code to a third party and to inhibit third parties from
-//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
-//
-//This copyright notice must be included in all copies or derivative works.
-//
-//Copyright (c) 2009 Telecom ParisTech.
-//
-// Alternatively, this software module may be redistributed and/or modified
-//  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.
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////////
-//
-//	Authors:
-//					Jean Le Feuvre, Telecom ParisTech
-//					Cyril Concolato, Telecom ParisTech
-//
-/////////////////////////////////////////////////////////////////////////////////
-
-#include "widgetman.h"
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE)
-#  pragma comment(lib, "js32")
-# elif defined (_WIN64)
-#  pragma comment(lib, "js")
-# elif defined (WIN32)
-#  pragma comment(lib, "js")
-# endif
-#endif
-
-
-JSBool gf_sg_js_event_add_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, GF_Node *vrml_node);
-JSBool gf_sg_js_event_remove_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, GF_Node *vrml_node);
-
-
-
-static Bool is_same_path(const char *p1, const char *p2, u32 len)
-{
-	char c1, c2;
-	u32 i=0;
-	do {
-		if (len && (i==len))
-			break;
-		c1 = p1[i];
-		c2 = p2[i];
-		if (p1[i] != p2[i]) {
-			if ((c1=='/') && (c2=='\\')) {}
-			else if ((c1=='\\') && (c2=='/')) {}
-			else return GF_FALSE;
-		}
-		i++;
-	} while (c1);
-
-	return GF_TRUE;
-}
-
-static void widget_package_extract_file(GF_WidgetPackage *wpack, GF_WidgetPackageResource *res)
-{
-	u32 i;
-
-	if (wpack->is_zip) {
-		unz_global_info gi;
-		unzFile uf = unzOpen2(wpack->package_path, NULL);
-		if (!uf) return;
-
-		unzGetGlobalInfo(uf, &gi);
-		for (i=0; i<gi.number_entry; i++)  {
-			char buf[8192];
-			int err;
-			FILE *fout;
-			char filename_inzip[256];
-
-			unz_file_info file_info;
-			unzGetCurrentFileInfo(uf, &file_info, filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-
-			if (strcmp(res->inner_path, filename_inzip)) {
-				if ((i+1)<gi.number_entry)
-					unzGoToNextFile(uf);
-				continue;
-			}
-
-			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
-
-			fout=gf_fopen(res->extracted_path, "wb");
-			if (!fout) break;
-			do {
-				err = unzReadCurrentFile(uf,buf,8192);
-				if (err<0) break;
-				if (err>0)
-					if (gf_fwrite(buf,err,1,fout)!=1) {
-						//err=UNZ_ERRNO;
-						break;
-					}
-			} while (err>0);
-			if (fout) gf_fclose(fout);
-
-			res->extracted = GF_TRUE;
-			break;
-		}
-		unzClose(uf);
-#ifndef GPAC_DISABLE_ISOM
-	} else {
-		u32 count;
-		GF_ISOFile *isom = gf_isom_open(wpack->package_path, GF_ISOM_OPEN_READ, 0);
-		if (!isom ) return;
-
-		count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
-		for (i=0; i<count; i++)  {
-			u32 ID;
-			const char *url, *urn, *enc;
-			Bool self_ref;
-			const char *item_name;
-
-			gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
-			if (strcmp(res->inner_path, item_name)) continue;
-
-			gf_isom_extract_meta_item(isom, GF_TRUE, 0, ID, res->extracted_path);
-			res->extracted = GF_TRUE;
-			break;
-		}
-		gf_isom_close(isom);
-#endif /*GPAC_DISABLE_ISOM*/
-	}
-
-}
-
-static Bool package_find_res(GF_WidgetPackage *wpack, char *res_path, char *relocated_path, char *localized_rel_path)
-{
-	u32 count, i;
-	count = gf_list_count(wpack->resources);
-	for (i=0; i<count; i++) {
-		GF_WidgetPackageResource *pack_res = (GF_WidgetPackageResource*)gf_list_get(wpack->resources, i);
-		if (is_same_path(res_path, pack_res->inner_path, 0)) {
-			strcpy(localized_rel_path, res_path);
-			strcpy(relocated_path, pack_res->extracted_path);
-			if (!pack_res->extracted) widget_package_extract_file(wpack, pack_res);
-			return GF_TRUE;
-		}
-	}
-	return GF_FALSE;
-}
-
-/* Checks if a resource in the package has the given rel_path, potentially in a localized sub-folder */
-static Bool widget_package_relocate_uri(void *__self, const char *parent_uri, const char *rel_path, char *relocated_path, char *localized_rel_path)
-{
-	char path[GF_MAX_PATH];
-	const char *opt;
-	GF_WidgetPackage *wpack = (GF_WidgetPackage *)__self;
-
-	assert(parent_uri);
-	/*resource belongs to our archive*/
-	if (strstr(rel_path, wpack->archive_id)) {
-		rel_path = strstr(rel_path, wpack->archive_id) + strlen(wpack->archive_id);
-	}
-	/*parent resource belongs to our archive*/
-	else if (strstr(parent_uri, wpack->archive_id)) {
-	}
-	/*resource doesn't belong to our archive*/
-	else {
-		return GF_FALSE;
-	}
-
-	/* First try to locate the resource in the locales folder */
-	opt = gf_cfg_get_key(wpack->wm->term->user->config, "Systems", "Language2CC");
-	if (opt) {
-		if (!strcmp(opt, "*") || !strcmp(opt, "un") )
-			opt = NULL;
-	}
-
-	while (opt) {
-		char lan[100];
-		char *sep;
-		char *sep_lang = strchr(opt, ';');
-		if (sep_lang) sep_lang[0] = 0;
-
-		while (strchr(" \t", opt[0]))
-			opt++;
-		strcpy(lan, opt);
-
-		if (sep_lang) {
-			sep_lang[0] = ';';
-			opt = sep_lang+1;
-		} else {
-			opt = NULL;
-		}
-
-		while (1) {
-			sep = strstr(lan, "-*");
-			if (!sep) break;
-			strncpy(sep, sep+2, strlen(sep)-2);
-		}
-
-		sprintf(path, "locales/%s/%s", lan, rel_path);
-		if (package_find_res(wpack, path, relocated_path, localized_rel_path))
-			return GF_TRUE;
-
-		/*recursively remove region (sub)tags*/
-		while (1) {
-			sep = strrchr(lan, '-');
-			if (!sep) break;
-			sep[0] = 0;
-			sprintf(path, "locales/%s/%s", lan, rel_path);
-			if (package_find_res(wpack, path, relocated_path, localized_rel_path))
-				return GF_TRUE;
-		}
-	}
-
-	/*no locale*/
-	if (package_find_res(wpack, (char*)rel_path, relocated_path, localized_rel_path))
-		return GF_TRUE;
-
-	strcpy(localized_rel_path, "");
-	strcpy(relocated_path, "");
-	return GF_FALSE;
-}
-
-
-static GF_WidgetPackage *widget_isom_new(GF_WidgetManager *wm, const char *path)
-{
-#ifdef GPAC_DISABLE_ISOM
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Widgetman] GPAC was compiled without ISO File Format support\n"));
-	return NULL;
-#else
-	GF_WidgetPackageResource *pack_res;
-	char szPath[GF_MAX_PATH];
-	const char *dir;
-	GF_WidgetPackage *wzip;
-	u32 brand = 0;
-	u32 i, count;
-	GF_ISOFile *isom = gf_isom_open(path, GF_ISOM_OPEN_READ, 0);
-	if (!isom ) return NULL;
-
-	brand = gf_isom_get_meta_type(isom, GF_TRUE, 0);
-	if ((brand!=GF_4CC('m','w','g','t') )		|| !gf_isom_has_meta_xml(isom, GF_TRUE, 0) ) {
-		gf_isom_close(isom);
-		return NULL;
-	}
-
-	GF_SAFEALLOC(wzip, GF_WidgetPackage);
-	if (!wzip) return NULL;
-
-	wzip->wm = wm;
-	wzip->relocate_uri = widget_package_relocate_uri;
-	wzip->resources = gf_list_new();
-	dir = gf_cfg_get_key(wm->term->user->config, "General", "CacheDirectory");
-	/* create the extracted path for the package root using:
-	   the cache dir + a CRC of the file path and the instance*/
-	sprintf(wzip->root_extracted_path, "%s%p", path, wzip);
-	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
-	sprintf(wzip->archive_id, "GWM_%08X_", i);
-	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
-
-
-	strcpy(szPath, wzip->root_extracted_path);
-	strcat(szPath, "config.xml");
-	if (gf_isom_extract_meta_xml(isom, GF_TRUE, 0, szPath, NULL) != GF_OK) {
-		gf_list_del(wzip->resources);
-		gf_free(wzip);
-		gf_isom_close(isom);
-		return NULL;
-	}
-
-	wzip->package_path = gf_strdup(path);
-
-	GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
-	if (!pack_res) {
-		gf_list_del(wzip->resources);
-		gf_free(wzip);
-		gf_isom_close(isom);
-		return NULL;
-	}
-	pack_res->extracted_path = gf_strdup(szPath);
-	pack_res->inner_path = gf_strdup("config.xml");
-	pack_res->extracted = GF_TRUE;
-	gf_list_add(wzip->resources, pack_res);
-
-
-	count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
-	for (i=0; i<count; i++)  {
-		u32 ID;
-		const char *url, *urn, *enc;
-		Bool self_ref;
-		char *sep;
-		const char *item_name;
-
-		gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
-
-		sep = strrchr(item_name, '/');
-		if (!sep) sep = strrchr(item_name, '\\');
-		if (sep) {
-			sep[0] = 0;
-			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32((char*)item_name, (u32) strlen(item_name)), sep+1);
-			sep[0] = '/';
-		} else {
-			strcpy(szPath, wzip->root_extracted_path);
-			strcat(szPath, item_name);
-		}
-		GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
-		if (!pack_res) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
-			continue;
-		}
-		pack_res->extracted_path = gf_strdup(szPath);
-		pack_res->inner_path = gf_strdup(item_name);
-		pack_res->extracted = GF_FALSE;
-		gf_list_add(wzip->resources, pack_res);
-	}
-	gf_isom_close(isom);
-
-
-	/* register this widget package as a relocator to enable localization of resources inside this package */
-	gf_mx_p(wm->term->net_mx);
-	gf_list_add(wm->term->uri_relocators, wzip);
-	gf_mx_v(wm->term->net_mx);
-	return wzip;
-#endif /*GPAC_DISABLE_ISOM*/
-}
-
-static GF_WidgetPackage *widget_zip_new(GF_WidgetManager *wm, const char *path)
-{
-	unz_global_info gi;
-	const char *dir;
-	u32 i;
-	GF_WidgetPackage *wzip;
-	unzFile uf = unzOpen2(path, NULL);
-	if (!uf) return NULL;
-
-	GF_SAFEALLOC(wzip, GF_WidgetPackage);
-	if (!wzip) return NULL;
-
-	wzip->wm = wm;
-	wzip->is_zip = GF_TRUE;
-	wzip->relocate_uri = widget_package_relocate_uri;
-	wzip->resources = gf_list_new();
-	wzip->package_path = gf_strdup(path);
-	dir = gf_cfg_get_key(wm->term->user->config, "General", "CacheDirectory");
-	/* create the extracted path for the package root using:
-	   the cache dir + a CRC of the file path and the instance*/
-	sprintf(wzip->root_extracted_path, "%s%p", path, wzip);
-	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
-	sprintf(wzip->archive_id, "GWM_%08X_", i);
-	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
-
-	unzGetGlobalInfo(uf, &gi);
-	for (i=0; i<gi.number_entry; i++)  {
-		char szPath[GF_MAX_PATH];
-		char *sep;
-		GF_WidgetPackageResource *pack_res;
-		char filename_inzip[256];
-		unz_file_info file_info;
-		unzGetCurrentFileInfo(uf, &file_info, filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
-
-		sep = strrchr(filename_inzip, '/');
-		if (!sep) sep = strrchr(filename_inzip, '\\');
-		if (sep) {
-			sep[0] = 0;
-			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32(filename_inzip, (u32) strlen(filename_inzip)), sep+1);
-			sep[0] = '/';
-		} else {
-			strcpy(szPath, wzip->root_extracted_path);
-			strcat(szPath, filename_inzip);
-		}
-
-
-		if (!strcmp(filename_inzip, "config.xml")) {
-			int err;
-			char buf[8192];
-			FILE *fout;
-			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
-
-			fout=gf_fopen(szPath,"wb");
-			if (!fout) return NULL;
-
-			do {
-				err = unzReadCurrentFile(uf,buf,8192);
-				if (err<0) break;
-
-				if (err>0)
-					if (gf_fwrite(buf,err,1,fout)!=1) {
-						err=UNZ_ERRNO;
-						break;
-					}
-			} while (err>0);
-			if (fout) gf_fclose(fout);
-			if (err==0) {
-				GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
-				if (!pack_res) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
-					continue;
-				}
-				
-				pack_res->extracted_path = gf_strdup(szPath);
-				pack_res->inner_path = gf_strdup(filename_inzip);
-				pack_res->extracted = GF_TRUE;
-				gf_list_add(wzip->resources, pack_res);
-			}
-		} else {
-			GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
-			if (!pack_res) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
-				continue;
-			}
-			pack_res->extracted_path = gf_strdup(szPath);
-			pack_res->inner_path = gf_strdup(filename_inzip);
-			pack_res->extracted = GF_FALSE;
-			gf_list_add(wzip->resources, pack_res);
-		}
-
-		if ((i+1)<gi.number_entry)
-			unzGoToNextFile(uf);
-	}
-	unzClose(uf);
-
-	/* register this widget package as a relocator to enable localization of resources inside this package */
-	gf_mx_p(wm->term->net_mx);
-	gf_list_add(wm->term->uri_relocators, wzip);
-	gf_mx_v(wm->term->net_mx);
-	return wzip;
-}
-
-GF_WidgetPackage *widget_package_new(GF_WidgetManager *wm, const char *path)
-{
-	if (gf_unzip_probe(path)) {
-		return widget_zip_new(wm, path);
-	}
-#ifndef GPAC_DISABLE_ISOM
-	/*ISOFF-based packaged widget */
-	else if (gf_isom_probe_file(path)) {
-		return widget_isom_new(wm, path);
-	}
-#endif
-	return NULL;
-}
-
-static void widget_package_del(GF_WidgetManager *wm, GF_WidgetPackage *wpackage)
-{
-	gf_mx_p(wm->term->net_mx);
-	gf_list_del_item(wm->term->uri_relocators, wpackage);
-	gf_mx_v(wm->term->net_mx);
-
-	while (gf_list_count(wpackage->resources)) {
-		GF_WidgetPackageResource *wu = (GF_WidgetPackageResource*)gf_list_get(wpackage->resources, 0);
-		gf_list_rem(wpackage->resources, 0);
-		gf_delete_file(wu->extracted_path);
-		gf_free(wu->extracted_path);
-		gf_free(wu->inner_path);
-		gf_free(wu);
-	}
-	gf_list_del(wpackage->resources);
-	if (wpackage->sess) gf_dm_sess_del(wpackage->sess);
-	gf_free(wpackage->package_path);
-	gf_free(wpackage);
-}
-
-
-
-static void wm_delete_message_param(GF_WidgetPin *mp)
-{
-	if (!mp) return;
-	if (mp->node) gf_free(mp->node);
-	if (mp->attribute) gf_free(mp->attribute);
-	if (mp->default_value) gf_free(mp->default_value);
-	if (mp->name) gf_free(mp->name);
-	gf_free(mp);
-}
-
-static void wm_delete_widget_content(GF_WidgetContent *content)
-{
-	if (!content) return;
-
-	while (gf_list_count(content->interfaces)) {
-		GF_WidgetInterface *ifce = (GF_WidgetInterface*)gf_list_last(content->interfaces);
-		gf_list_rem_last(content->interfaces);
-
-		while (gf_list_count(ifce->messages)) {
-			GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_last(ifce->messages);
-			gf_list_rem_last(ifce->messages);
-
-			while (gf_list_count(msg->params)) {
-				GF_WidgetPin *par = (GF_WidgetPin*)gf_list_last(msg->params);
-				gf_list_rem_last(msg->params);
-				wm_delete_message_param(par);
-			}
-			gf_list_del(msg->params);
-
-			wm_delete_message_param(msg->input_action);
-			wm_delete_message_param(msg->output_trigger);
-			gf_free(msg->name);
-			gf_free(msg);
-		}
-		gf_list_del(ifce->messages);
-		wm_delete_message_param(ifce->bind_action);
-		wm_delete_message_param(ifce->unbind_action);
-		if (ifce->obj) gf_js_remove_root(ifce->content->widget->wm->ctx, &ifce->obj, GF_JSGC_OBJECT);
-
-		if (ifce->connectTo) gf_free(ifce->connectTo);
-		gf_free(ifce->type);
-		gf_free(ifce);
-	}
-	gf_list_del(content->interfaces);
-
-	while (gf_list_count(content->components)) {
-		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_last(content->components);
-		gf_list_rem_last(content->components);
-
-		wm_delete_message_param(comp->activateTrigger);
-		wm_delete_message_param(comp->deactivateTrigger);
-
-		while (gf_list_count(comp->required_interfaces)) {
-			char *type = (char*)gf_list_last(comp->required_interfaces);
-			gf_list_rem_last(comp->required_interfaces);
-			if (type) gf_free(type);
-		}
-		gf_list_del(comp->required_interfaces);
-		if (comp->id) gf_free(comp->id);
-		if (comp->src) gf_free(comp->src);
-		gf_free(comp);
-	}
-	gf_list_del(content->components);
-
-	while (gf_list_count(content->preferences)) {
-		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_last(content->preferences);
-		gf_list_rem_last(content->preferences);
-
-		wm_delete_message_param(pref->connectTo);
-		if (pref->value) gf_free(pref->value);
-		gf_free(pref->name);
-		gf_free(pref);
-	}
-	gf_list_del(content->preferences);
-
-	wm_delete_message_param(content->saveTrigger);
-	wm_delete_message_param(content->restoreTrigger);
-	wm_delete_message_param(content->savedAction);
-	wm_delete_message_param(content->restoredAction);
-
-	gf_free(content->src);
-	gf_free(content->relocated_src);
-	gf_free(content->mimetype);
-	gf_free(content->encoding);
-	gf_free(content);
-}
-
-static void wm_delete_widget(GF_WidgetManager *wm, GF_Widget *wid)
-{
-	gf_list_del_item(wm->widgets, wid);
-
-	if (wid->url) gf_free(wid->url);
-	if (wid->manifest_path) gf_free(wid->manifest_path);
-	wm_delete_widget_content(wid->main);
-	if (wid->local_path) gf_free(wid->local_path);
-	if (wid->name) gf_free(wid->name);
-	if (wid->shortname) gf_free(wid->shortname);
-	if (wid->identifier) gf_free(wid->identifier);
-	if (wid->authorName) gf_free(wid->authorName);
-	if (wid->authorEmail) gf_free(wid->authorEmail);
-	if (wid->authorHref) gf_free(wid->authorHref);
-	if (wid->description) gf_free(wid->description);
-	if (wid->license) gf_free(wid->license);
-	if (wid->licenseHref) gf_free(wid->licenseHref);
-	if (wid->viewmodes) gf_free(wid->viewmodes);
-	if (wid->version) gf_free(wid->version);
-	if (wid->uuid) gf_free(wid->uuid);
-
-
-	while (gf_list_count(wid->icons)) {
-		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->icons, 0);
-		gf_list_rem(wid->icons, 0);
-		wm_delete_widget_content(icon);
-	}
-	gf_list_del(wid->icons);
-
-	while (gf_list_count(wid->features)) {
-		GF_WidgetFeature *f = (GF_WidgetFeature*)gf_list_get(wid->features, 0);
-		gf_list_rem(wid->features, 0);
-		if (f->name) gf_free(f->name);
-		while (gf_list_count(f->params)) {
-			GF_WidgetFeatureParam *p = (GF_WidgetFeatureParam*)gf_list_get(f->params, 0);
-			gf_list_rem(f->params, 0);
-			if (p->name) gf_free(p->name);
-			if (p->value) gf_free(p->value);
-			gf_free(p);
-		}
-		gf_free(f);
-	}
-	gf_list_del(wid->features);
-
-	if (wid->wpack) widget_package_del(wm, wid->wpack);
-	gf_free(wid);
-}
-
-static void wm_delete_interface_instance(GF_WidgetManager *wm, GF_WidgetInterfaceInstance *bifce)
-{
-	if (bifce->hostname) gf_free(bifce->hostname);
-	if (bifce->obj) {
-		SMJS_SET_PRIVATE(wm->ctx, bifce->obj, NULL);
-		gf_js_remove_root(wm->ctx, &bifce->obj, GF_JSGC_OBJECT);
-	}
-	gf_free(bifce);
-}
-
-static void wm_delete_widget_instance(GF_WidgetManager *wm, GF_WidgetInstance *widg)
-{
-
-	while (gf_list_count(widg->components)) {
-		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(widg->components, 0);
-		gf_list_rem(widg->components, 0);
-		if (comp->wid) wm_delete_widget_instance(wm, comp->wid);
-		gf_free(comp);
-	}
-	gf_list_del(widg->components);
-
-	while (gf_list_count(widg->bound_ifces)) {
-		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(widg->bound_ifces, 0);
-		gf_list_rem(widg->bound_ifces, 0);
-		wm_delete_interface_instance(wm, bifce);
-	}
-	gf_list_del(widg->bound_ifces);
-
-	gf_list_del(widg->output_triggers);
-
-	if (widg->obj) {
-		SMJS_SET_PRIVATE(wm->ctx, widg->obj, NULL);
-		gf_js_remove_root(wm->ctx, &widg->obj, GF_JSGC_OBJECT);
-	}
-	gf_list_del_item(wm->widget_instances, widg);
-	widg->widget->nb_instances--;
-	if (!widg->widget->nb_instances) wm_delete_widget(wm, widg->widget);
-
-	if (!widg->permanent) {
-		gf_cfg_del_section(wm->term->user->config, (const char *)widg->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *)widg->secname, NULL);
-	}
-	if (widg->mpegu_context) gf_xml_dom_del(widg->mpegu_context);
-
-	gf_free(widg);
-}
-
-
-
-static JSBool wm_widget_call_script(GF_WidgetInstance *wid, GF_WidgetPin *pin, uintN argc, jsval *argv, jsval *rval)
-{
-	jsval fval;
-	if (!wid->scene_context || !wid->scene_global) return JS_FALSE;
-
-	/*if on_load property is assigned to this widget, add an event listener on the root.*/
-	JS_LookupProperty(wid->scene_context, wid->scene_global, pin->node, &fval);
-	if (JSVAL_IS_OBJECT(fval)) {
-		JS_CallFunctionValue(wid->scene_context, wid->scene_global, fval, argc, argv, rval);
-	}
-	return JS_TRUE;
-}
-
-static JSBool wm_widget_set_scene_input_value(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, u32 type, GF_WidgetInstance *wid, GF_WidgetPin *param, const char *value)
-{
-	char *str_val;
-	GF_Node *n;
-	GF_FieldInfo info;
-	GF_WidgetMessage *msg;
-	GF_WidgetInterface *ifce;
-
-	if (!wid && obj) wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-	if (!wid->scene) return JS_TRUE;
-
-	if (!param) {
-		if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-
-		switch (type) {
-		/*set_input*/
-		case 0:
-			if (argc!=2) return JS_FALSE;
-			param = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-			break;
-		/*call_input_action*/
-		case 1:
-			msg = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-			param = msg ? msg->input_action : NULL;
-			break;
-		/*bind_interface*/
-		case 2:
-			ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-			param = ifce ? ifce->bind_action : NULL;
-			break;
-		/*unbind_interface*/
-		case 3:
-			ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-			param = ifce ? ifce->unbind_action : NULL;
-			break;
-		}
-	}
-
-	if (!param  || !param->node) return JS_TRUE;
-	/*this is a script call*/
-	if (!param->attribute) {
-		return wm_widget_call_script(wid, param, 0, NULL, rval);
-	}
-
-	n = gf_sg_find_node_by_name(wid->scene, param->node);
-	if (!n) return JS_TRUE;
-
-	if (param->in_action) return JS_TRUE;
-
-	param->in_action = GF_TRUE;
-
-#ifndef GPAC_DISABLE_SVG
-	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
-		u32 evt_type;
-		if (!type) {
-			char *_str_val = NULL;
-			if (value) {
-				str_val = (char *)value;
-			} else {
-				if (!JSVAL_IS_STRING(argv[1])) goto exit;
-				str_val = _str_val = SMJS_CHARS(c, argv[1]);
-			}
-
-			/* first check if the set_input refers to an attribute name or to an event name */
-			evt_type = gf_dom_event_type_by_name(param->attribute);
-
-			/*events are not allowed for <input> and <output>*/
-			if (evt_type == GF_EVENT_UNKNOWN) {
-				/* modify an attribute */
-				if (!strcmp(param->attribute, "textContent")) {
-					gf_dom_set_textContent(n, (char *)str_val);
-					gf_node_changed(n, NULL);
-				}
-				else {
-					if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-						gf_svg_parse_attribute(n, &info, (char *)str_val, 0);
-						if (info.fieldType==XMLRI_datatype) gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
-						gf_node_changed(n, &info);
-					}
-				}
-			}
-			SMJS_FREE(c, _str_val);
-
-		} else {
-			GF_DOM_Event evt;
-			memset(&evt, 0, sizeof(GF_DOM_Event));
-			/* first check if the set_input refers to an attribute name or to an event name */
-			evt_type = gf_dom_event_type_by_name(param->attribute);
-			/* launch an event */
-			if (evt_type != GF_EVENT_UNKNOWN) {
-				evt.type = evt_type;
-				gf_dom_event_fire(n, &evt);
-			} else {
-				/*should we fire a DOMAttrModified event ? to clarify in the spec*/
-
-				if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-					evt.bubbles = 1;
-					evt.type = GF_EVENT_ATTR_MODIFIED;
-					evt.attr = &info;
-					gf_dom_event_fire(n, &evt);
-				}
-			}
-		}
-	} else
-#endif
-
-
-#ifndef GPAC_DISABLE_VRML
-	{
-		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return JS_TRUE;
-
-		if (!type) {
-			char *_str_val = NULL;
-			jsdouble val;
-
-			switch (info.fieldType) {
-			case GF_SG_VRML_SFSTRING:
-				if (value) {
-					str_val = (char *)value;
-				} else {
-					if (!JSVAL_IS_STRING(argv[1]))goto exit;
-					str_val = SMJS_CHARS(c, argv[1]);
-				}
-				if ( ((SFString*)info.far_ptr)->buffer) gf_free(((SFString*)info.far_ptr)->buffer);
-				((SFString*)info.far_ptr)->buffer = str_val ? gf_strdup(str_val) : NULL;
-				break;
-			case GF_SG_VRML_SFBOOL:
-				if (value) *((SFBool*)info.far_ptr) = (!strcmp(value, "true")) ? 1 : 0;
-				else if (JSVAL_IS_BOOLEAN(argv[1])) *((SFBool*)info.far_ptr) = JSVAL_TO_BOOLEAN(argv[1]);
-				else if (JSVAL_IS_INT(argv[1])) *((SFBool*)info.far_ptr) = JSVAL_TO_INT(argv[1]);
-				else if (JSVAL_IS_STRING(argv[1])) {
-					str_val = SMJS_CHARS(c, argv[1]);
-					*((SFBool*)info.far_ptr) = (str_val && !strcmp(str_val, "true")) ? 1 : 0;
-					SMJS_FREE(c, str_val);
-				} else
-					goto exit;
-				break;
-			case GF_SG_VRML_SFINT32:
-				if (value) *((SFInt32*)info.far_ptr) = (s32) atof(value);
-				else if (JSVAL_IS_INT(argv[1])) *((SFInt32*)info.far_ptr) = JSVAL_TO_INT(argv[1]);
-				else if (JSVAL_IS_NUMBER(argv[1])) {
-					JS_ValueToNumber(c, argv[1], &val);
-					*((SFInt32*)info.far_ptr) = (s32) val;
-				} else if (JSVAL_IS_STRING(argv[1])) {
-					Double a_val;
-					str_val = SMJS_CHARS(c, argv[1]);
-					a_val = str_val ? atof(str_val) : 0;
-					*((SFInt32*)info.far_ptr) = (s32) a_val;
-					SMJS_FREE(c, str_val);
-				} else
-					goto exit;
-				break;
-			case GF_SG_VRML_SFFLOAT:
-				if (value) *((SFFloat*)info.far_ptr) = FLT2FIX(atof(value));
-				else if (JSVAL_IS_INT(argv[1])) *((SFFloat *)info.far_ptr) = INT2FIX( JSVAL_TO_INT(argv[1]) );
-				else if (JSVAL_IS_NUMBER(argv[1])) {
-					JS_ValueToNumber(c, argv[1], &val);
-					*((SFFloat *)info.far_ptr) = FLT2FIX( val );
-				} else if (JSVAL_IS_STRING(argv[1])) {
-					Double a_val;
-					str_val = SMJS_CHARS(c, argv[1]);
-					a_val = str_val ? atof(str_val) : 0;
-					*((SFFloat*)info.far_ptr) = FLT2FIX(a_val);
-					SMJS_FREE(c, str_val);
-				} else
-					goto exit;
-				break;
-			case GF_SG_VRML_SFTIME:
-				if (value) *((SFTime*)info.far_ptr) = atof(value);
-				else if (JSVAL_IS_INT(argv[1])) *((SFTime *)info.far_ptr) = JSVAL_TO_INT(argv[1]);
-				else if (JSVAL_IS_NUMBER(argv[1])) {
-					JS_ValueToNumber(c, argv[1], &val);
-					*((SFTime *)info.far_ptr) = val;
-				} else if (JSVAL_IS_STRING(argv[1])) {
-					Double a_val;
-					str_val = SMJS_CHARS(c, argv[1]);
-					a_val = str_val ? atof(str_val) : 0;
-					*((SFTime *)info.far_ptr) = a_val;
-					SMJS_FREE(c, str_val);
-				} else
-					goto exit;
-				break;
-			case GF_SG_VRML_MFSTRING:
-				if (value) {
-					str_val = (char *)value;
-				} else {
-					if (!JSVAL_IS_STRING(argv[1])) goto exit;
-					str_val = _str_val = SMJS_CHARS(c, argv[1]);
-				}
-				if ( ((GenMFField *)info.far_ptr)->count != 1) {
-					gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFSTRING);
-					gf_sg_vrml_mf_alloc(info.far_ptr, GF_SG_VRML_MFSTRING, 1);
-				}
-				if ( ((MFString*)info.far_ptr)->vals[0]) gf_free( ((MFString*)info.far_ptr)->vals[0] );
-				((MFString*)info.far_ptr)->vals[0] = str_val ? gf_strdup(str_val) : NULL;
-
-				SMJS_FREE(c, _str_val);
-				break;
-			}
-		}
-
-		//if this is a script eventIn call directly script
-		if ((n->sgprivate->tag==TAG_MPEG4_Script)
-#ifndef GPAC_DISABLE_X3D
-		        || (n->sgprivate->tag==TAG_X3D_Script)
-#endif
-		   )
-			gf_sg_script_event_in(n, &info);
-
-		gf_node_changed(n, &info);
-
-		/*if this is an exposedField, route it*/
-		if (info.eventType==GF_SG_EVENT_EXPOSED_FIELD) {
-			gf_node_event_out(n, info.fieldIndex);
-		}
-	}
-#endif /*GPAC_DISABLE_VRML*/
-
-exit:
-	param->in_action = GF_FALSE;
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(wm_widget_set_input)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	SMJS_DECL_RVAL
-	return wm_widget_set_scene_input_value(c, obj, argc, argv, rval, 0, NULL, NULL, NULL);
-}
-static JSBool SMJS_FUNCTION(wm_widget_call_input_action)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	SMJS_DECL_RVAL
-	return wm_widget_set_scene_input_value(c, obj, 1, argv, rval, 1, NULL, NULL, NULL);
-}
-
-
-static JSBool SMJS_FUNCTION(wm_widget_call_input_script)
-{
-	GF_WidgetMessage *msg;
-	GF_WidgetPin *param;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || (argc!=2) ) return JS_FALSE;
-	if (!wid->scene) return JS_TRUE;
-
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-	msg = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	param = msg ? msg->input_action : NULL;
-	if (!param || !param->node || param->attribute) return JS_FALSE;
-
-	if (JSVAL_IS_OBJECT(argv[1])) {
-		jsval *args;
-		JSObject *list = JSVAL_TO_OBJECT(argv[1]);
-		u32 i, count;
-		JS_GetArrayLength(c, list, (jsuint*) &count);
-		args = (jsval*)gf_malloc(sizeof(jsval)*count);
-		for (i=0; i<count; i++) {
-			JS_GetElement(c, list, (jsint) i, &args[i] );
-		}
-
-		wm_widget_call_script(wid, param, count, args, SMJS_GET_RVAL);
-
-		gf_free(args);
-	}
-	return JS_TRUE;
-}
-
-
-static void wm_handler_destroy(GF_Node *node, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		SVG_handlerElement *handler = (SVG_handlerElement *)node;
-		if (handler->js_fun_val) {
-			gf_js_remove_root(handler->js_context, &handler->js_fun_val, GF_JSGC_VAL);
-			handler->js_fun_val=0;
-		}
-	}
-}
-
-static SVG_handlerElement *wm_create_scene_listener(GF_WidgetInstance *wid, GF_WidgetPin *param)
-{
-	/*FIXME - we need to split SVG and base DOM !!*/
-#ifdef GPAC_DISABLE_SVG
-	return NULL;
-#else
-	u32 evt_type, att_name;
-	GF_Node *listener;
-	GF_FieldInfo info;
-	GF_Node *n = NULL;
-	SVG_handlerElement *handler;
-
-	evt_type = GF_EVENT_ATTR_MODIFIED;
-	n = gf_sg_find_node_by_name(wid->scene, param->node);
-	if (!n)
-		return NULL;
-
-	att_name = 0;
-
-#ifndef GPAC_DISABLE_SVG
-	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
-		/* first check if the set_input refers to an attribute name or to an event name */
-		evt_type = gf_dom_event_type_by_name(param->attribute);
-		if (evt_type == GF_EVENT_UNKNOWN) {
-			evt_type = GF_EVENT_ATTR_MODIFIED;
-
-			/* modify textContent */
-			if (!strcmp(param->attribute, "textContent")) {
-				att_name = (u32) -1;
-			}
-			/* modify an attribute */
-			else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-				att_name = info.fieldIndex;
-			}
-			else {
-				return NULL;
-			}
-		}
-	} else
-#endif
-	{
-		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK)
-			return NULL;
-		att_name = info.fieldIndex;
-	}
-
-	listener = gf_node_new(wid->scene, TAG_SVG_listener);
-
-	handler = (SVG_handlerElement *) gf_node_new(wid->scene, TAG_SVG_handler);
-	/*we register the handler with the listener node to avoid modifying the DOM*/
-	gf_node_register((GF_Node *)handler, listener);
-	gf_node_list_add_child(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler);
-	handler->sgprivate->UserCallback = wm_handler_destroy;
-
-	/*create attributes if needed*/
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
-	((XMLEV_Event*)info.far_ptr)->type = evt_type;
-	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
-	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
-	((XMLRI*)info.far_ptr)->target = n;
-
-	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
-	((XMLEV_Event*)info.far_ptr)->type = evt_type;
-	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
-
-	gf_node_dom_listener_add((GF_Node *) n, listener);
-
-	return handler;
-#endif
-}
-
-static void wm_component_activation_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer, Bool unload)
-{
-	JSObject *obj;
-	JSContext *c;
-	GF_WidgetInstance *wid;
-	GF_WidgetComponent *comp;
-	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
-
-	c = (JSContext*)handler->js_context;
-	obj = (JSObject*)handler->evt_listen_obj;
-	if (!c || !obj) return;
-	wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return;
-
-	comp = (GF_WidgetComponent *)handler->js_fun;
-	if (unload) {
-		wm_deactivate_component(c, wid, comp, NULL);
-	} else {
-		wm_activate_component(c, wid, comp, GF_FALSE);
-	}
-}
-static void wm_component_activate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
-{
-	wm_component_activation_event(hdl, evt, observer, GF_FALSE);
-}
-static void wm_component_deactivate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
-{
-	wm_component_activation_event(hdl, evt, observer, GF_TRUE);
-}
-
-static void wm_widget_set_pref_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
-{
-	char *att;
-	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
-	GF_WidgetInstance *wid = (GF_WidgetInstance *) handler->evt_listen_obj;
-	GF_WidgetPreference *pref = (GF_WidgetPreference *) handler->js_fun;
-
-	if (evt->type != GF_EVENT_ATTR_MODIFIED) return;
-
-	if (evt->detail == (u32) -1) {
-#ifndef GPAC_DISABLE_SVG
-		att = gf_dom_flatten_textContent(evt->target);
-#endif
-	} else {
-		att = gf_node_dump_attribute(evt->target, evt->attr);
-	}
-	if (!att) return;
-	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name, att);
-	gf_free(att);
-}
-
-static void on_widget_activated(JSContext *c, JSObject *obj)
-{
-	jsval funval, rval;
-	u32 i, count;
-	GF_XMLNode *context = NULL;
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || wid->activated) return;
-
-	/*widget is now activated*/
-	wid->activated = GF_TRUE;
-
-	/*for all components, setup bindings on activateTrigger & deactivateTrigger*/
-	count = gf_list_count(wid->widget->main->components);
-	for (i=0; i<count; i++) {
-		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
-		/*setup listener*/
-		if (comp->activateTrigger && comp->activateTrigger->attribute) {
-			SVG_handlerElement *a_hdl = wm_create_scene_listener(wid, comp->activateTrigger);
-			if (!a_hdl) return;
-			a_hdl->evt_listen_obj = obj;
-			a_hdl->js_context = c;
-			a_hdl->js_fun = comp;
-			a_hdl->handle_event = wm_component_activate_event;
-		}
-		/*setup listener*/
-		if (comp->deactivateTrigger && comp->deactivateTrigger->attribute) {
-			SVG_handlerElement *a_hdl = wm_create_scene_listener(wid, comp->deactivateTrigger);
-			if (!a_hdl) continue;
-			a_hdl->evt_listen_obj = obj;
-			a_hdl->js_context = c;
-			a_hdl->js_fun = comp;
-			a_hdl->handle_event = wm_component_deactivate_event;
-		}
-	}
-
-	if (wid->mpegu_context)
-		context = gf_xml_dom_get_root(wid->mpegu_context);
-
-	/*load preferences*/
-	count = gf_list_count(wid->widget->main->preferences);
-	for (i=0; i<count; i++) {
-		const char *value;
-		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
-
-
-		/*get stored value for this preference*/
-		value = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name);
-		/*if none found, use preference*/
-		if (!value) value = pref->value;
-
-		/*and overload with migrated context*/
-		if (context) {
-			GF_XMLNode *pref_node;
-			u32 j=0;
-			while ((pref_node = (GF_XMLNode*)gf_list_enum(context->content, &j))) {
-				const char *att;
-				if (pref_node->type != GF_XML_NODE_TYPE) continue;
-				if (strcmp(pref_node->name, "preference")) continue;
-				att = wm_xml_get_attr(pref_node, "name");
-				if (!att) continue;
-				if (strcmp(att, pref->name)) continue;
-
-				att = wm_xml_get_attr(pref_node, "value");
-				if (att) value = att;
-				break;
-			}
-		}
-
-		if (pref->connectTo) {
-			SVG_handlerElement *hdl;
-
-			if (value)
-				wm_widget_set_scene_input_value(NULL, NULL, 0, 0, 0, 0, wid, pref->connectTo, value);
-
-			/*preference is read only, do not setup listener*/
-			if (pref->flags & GF_WM_PREF_READONLY) continue;
-			/*preference is migratable only, do not setup listener*/
-			if (!(pref->flags & GF_WM_PREF_SAVE)) continue;
-
-			/*create the listener*/
-			hdl = wm_create_scene_listener(wid, pref->connectTo);
-			if (!hdl) continue;
-
-			hdl->evt_listen_obj = wid;
-			hdl->js_fun = pref;
-			hdl->handle_event = wm_widget_set_pref_event;
-
-		}
-	}
-	if (count && wid->widget->main->restoredAction) {
-		wm_widget_set_scene_input_value(wid->widget->wm->ctx, wid->obj, 0, NULL, &rval, 0, wid, wid->widget->main->restoredAction, NULL);
-	}
-
-	if (wid->mpegu_context) {
-		gf_xml_dom_del(wid->mpegu_context);
-		wid->mpegu_context = NULL;
-	}
-
-	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_TRUE);
-	/*refresh all interface bindings*/
-	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "check_bindings", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		JS_CallFunctionValue(wid->widget->wm->ctx, wid->widget->wm->obj, funval, 0, 0, &rval);
-	}
-
-	/*if on_load property is assigned to this widget, call it.*/
-	JS_LookupProperty(c, obj, "on_load", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, funval, 0, 0, &rval);
-	}
-	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_FALSE);
-}
-
-
-static void wm_widget_load_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
-{
-	JSObject *obj;
-	JSContext *c;
-	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
-
-	c = (JSContext*)handler->js_context;
-	obj = (JSObject*)handler->evt_listen_obj;
-	if (!c || !obj) return;
-
-	on_widget_activated(c, obj);
-}
-
-
-static JSBool SMJS_FUNCTION(wm_widget_activate)
-{
-#ifndef GPAC_DISABLE_SVG
-	SVG_handlerElement *handler;
-#endif
-	GF_MediaObject *mo;
-	Bool direct_trigger = GF_FALSE;
-	MFURL url;
-	SFURL _url;
-	GF_Node *inl;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !argc) return JS_FALSE;
-
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-
-	inl = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!inl) return JS_FALSE;
-
-	_url.OD_ID = 0;
-	_url.url = gf_url_concatenate(wid->widget->url, wid->widget->main->relocated_src);
-	url.count = 1;
-	url.vals = &_url;
-	mo = gf_mo_register(inl, &url, GF_FALSE, GF_TRUE);
-	if (mo) {
-		wid->scene = gf_mo_get_scenegraph(mo);
-		if (wid->scene && gf_sg_get_root_node(wid->scene)) direct_trigger = GF_TRUE;
-	}
-	if (_url.url) gf_free(_url.url);
-
-	wid->anchor = inl;
-
-	if (direct_trigger) {
-		on_widget_activated(c, obj);
-	} else {
-#ifndef GPAC_DISABLE_SVG
-		handler = gf_dom_listener_build(inl, GF_EVENT_SCENE_ATTACHED, 0);
-		handler->handle_event = wm_widget_load_event;
-		handler->js_context = c;
-		handler->evt_listen_obj = obj;
-#endif
-	}
-
-	return JS_TRUE;
-}
-
-
-static void wm_handle_dom_event(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
-{
-	GF_FieldInfo info;
-	GF_Node *n;
-	jsval argv[1], rval, jsfun;
-	SVG_handlerElement *handler = (SVG_handlerElement *) hdl;
-	GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)handler->evt_listen_obj;
-
-	if (!wid->scene)
-		return;
-
-	n = gf_sg_find_node_by_name(wid->scene, param->node);
-	if (!n) return;
-
-	/*this is a regular event output*/
-	if (event->type != GF_EVENT_ATTR_MODIFIED) {
-		jsfun = (jsval) handler->js_fun_val;
-		if (JSVAL_IS_OBJECT(jsfun))
-			JS_CallFunctionValue(handler->js_context, wid->obj, (jsval) handler->js_fun_val, 0, 0, &rval);
-		return;
-	}
-
-	/*otherwise this is a node.attr output through DOMAttributeModified*/
-	argv[0] = JSVAL_NULL;
-
-#ifndef GPAC_DISABLE_SVG
-	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
-		if (!strcmp(param->attribute, "textContent")) {
-			char *txt = gf_dom_flatten_textContent(n);
-			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, txt ? txt : "") );
-			if (txt) gf_free(txt);
-		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-			char *attValue;
-			if (event->attr->fieldIndex != info.fieldIndex) return;
-
-			attValue = gf_node_dump_attribute(n, &info);
-			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, attValue) );
-			if (attValue) gf_free(attValue);
-		} else {
-			return;
-		}
-	} else
-#endif
-	{
-		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return;
-		if (event->attr->fieldIndex != info.fieldIndex) return;
-
-		switch (info.fieldType) {
-		case GF_SG_VRML_SFSTRING:
-			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, ((SFString*)info.far_ptr)->buffer ) );
-			break;
-		case GF_SG_VRML_SFINT32:
-			argv[0] = INT_TO_JSVAL( *((SFInt32*)info.far_ptr) );
-			break;
-		case GF_SG_VRML_SFBOOL:
-			argv[0] = BOOLEAN_TO_JSVAL( *((SFBool*)info.far_ptr) );
-			break;
-		case GF_SG_VRML_SFFLOAT:
-			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(handler->js_context, FIX2FLT( *((SFFloat*)info.far_ptr) ) ) );
-			break;
-		case GF_SG_VRML_SFTIME:
-			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(handler->js_context, *((SFTime *)info.far_ptr) ) );
-			break;
-		}
-	}
-
-	jsfun = (jsval) handler->js_fun_val;
-	if (JSVAL_IS_OBJECT(jsfun))
-		JS_CallFunctionValue(handler->js_context, wid->obj, (jsval) handler->js_fun_val, 1, argv, &rval);
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_param_value)
-{
-	GF_Node *n;
-	GF_FieldInfo info;
-	GF_WidgetPin *param;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !wid->scene || !argc || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
-
-	param = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!param) return JS_FALSE;
-
-	if (!param->node) {
-		if (param->default_value) {
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->default_value) ) );
-			return JS_TRUE;
-		}
-		return JS_FALSE;
-	}
-
-	n = gf_sg_find_node_by_name(wid->scene, param->node);
-	if (!n) return JS_FALSE;
-
-#ifndef GPAC_DISABLE_SVG
-	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
-		if (!strcmp(param->attribute, "textContent")) {
-			char *txt = gf_dom_flatten_textContent(n);
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, txt ? txt : "") ));
-			if (txt) gf_free(txt);
-		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-			char *attValue = gf_node_dump_attribute(n, &info);
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, attValue) ));
-			if (attValue) gf_free(attValue);
-		} else {
-			return JS_FALSE;
-		}
-	} else
-#endif
-	{
-		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return JS_FALSE;
-
-		switch (info.fieldType) {
-		case GF_SG_VRML_SFSTRING:
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, ((SFString*)info.far_ptr)->buffer ) ) );
-			break;
-		case GF_SG_VRML_SFINT32:
-			SMJS_SET_RVAL( INT_TO_JSVAL( *((SFInt32*)info.far_ptr) ));
-			break;
-		case GF_SG_VRML_SFBOOL:
-			SMJS_SET_RVAL(BOOLEAN_TO_JSVAL( *((SFBool*)info.far_ptr) ));
-			break;
-		case GF_SG_VRML_SFFLOAT:
-			SMJS_SET_RVAL( DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT( *((SFFloat*)info.far_ptr) ) ) ));
-			break;
-		case GF_SG_VRML_SFTIME:
-			SMJS_SET_RVAL( DOUBLE_TO_JSVAL( JS_NewDouble(c, *((SFTime *)info.far_ptr) ) ));
-			break;
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_message_param)
-{
-	GF_WidgetPin *par = NULL;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetMessage *msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, obj);
-	if (!msg || !argc  ) return JS_FALSE;
-
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 idx = JSVAL_TO_INT(argv[0]);
-		par = gf_list_get(msg->params, idx);
-	} else if (JSVAL_IS_STRING(argv[0])) {
-		u32 i, count = gf_list_count(msg->params);
-		char *name =  SMJS_CHARS(c, argv[0]);
-		for (i=0; i<count; i++) {
-			par = gf_list_get(msg->params, i);
-			if (!strcmp(par->name, name)) break;
-			par = NULL;
-		}
-		SMJS_FREE(c, name);
-	}
-
-	if (par) {
-		JSObject *obj = JS_NewObject(c, &msg->ifce->content->widget->wm->widgetAnyClass._class, 0, 0);
-		SMJS_SET_PRIVATE(c, obj, par);
-		JS_DefineProperty(c, obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, par->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "is_input", BOOLEAN_TO_JSVAL( (par->type == GF_WM_PARAM_OUTPUT) ? JS_FALSE : JS_TRUE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		switch (par->script_type) {
-		case GF_WM_PARAM_SCRIPT_BOOL:
-			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "boolean") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			break;
-		case GF_WM_PARAM_SCRIPT_NUMBER:
-			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "number") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			break;
-		case GF_WM_PARAM_SCRIPT_STRING:
-		default:
-			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "string") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			break;
-		}
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_message)
-{
-	GF_WidgetMessage *msg;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInterface *ifce = (GF_WidgetInterface*)SMJS_GET_PRIVATE(c, obj);
-	if (!ifce || !argc) return JS_FALSE;
-	msg = NULL;
-
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 idx;
-		idx = JSVAL_TO_INT(argv[0]);
-		msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, idx);
-	} else if (JSVAL_IS_STRING(argv[0])) {
-		u32 i, count = gf_list_count(ifce->messages);
-		char *name = SMJS_CHARS(c, argv[0]);
-		for (i=0; i<count; i++) {
-			msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, i);
-			if (!strcmp(msg->name, name)) break;
-			msg = NULL;
-		}
-		SMJS_FREE(c, name);
-	}
-	if (msg) {
-		JSObject *obj = JS_NewObject(c, &ifce->content->widget->wm->widgetAnyClass._class, 0, 0);
-		SMJS_SET_PRIVATE(c, obj, msg);
-		JS_DefineProperty(c, obj, "num_params", INT_TO_JSVAL( gf_list_count(msg->params) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, msg->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "is_input", BOOLEAN_TO_JSVAL( msg->is_output ? JS_FALSE : JS_TRUE ) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "has_output_trigger", BOOLEAN_TO_JSVAL( msg->output_trigger ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "has_input_action", BOOLEAN_TO_JSVAL( (msg->input_action && msg->input_action->attribute) ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, obj, "has_script_input", BOOLEAN_TO_JSVAL( (msg->input_action && !msg->input_action->attribute) ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineFunction(c, obj, "get_param", wm_widget_get_message_param, 1, 0);
-
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_component)
-{
-	char *comp_id;
-	u32 i, count;
-	GF_WidgetComponentInstance *comp_inst;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !argc || !JSVAL_IS_STRING(argv[0]) ) return JS_FALSE;
-
-	comp_id = SMJS_CHARS(c, argv[0]);
-	count = gf_list_count(wid->components);
-	for (i=0; i<count; i++) {
-		comp_inst = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
-		if (comp_inst->comp->id && !strcmp(comp_inst->comp->id, comp_id)) {
-			SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
-			SMJS_FREE(c, comp_id);
-			return JS_TRUE;
-		}
-	}
-	/*if requested load the component*/
-	if ((argc==2) && JSVAL_IS_BOOLEAN(argv[1]) && (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
-		count = gf_list_count(wid->widget->main->components);
-		for (i=0; i<count; i++) {
-			GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
-			if (!comp->id  || strcmp(comp->id, comp_id)) continue;
-
-			comp_inst = wm_activate_component(c, wid, comp, GF_TRUE);
-			if (comp_inst) {
-				SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
-				SMJS_FREE(c, comp_id);
-				return JS_TRUE;
-			}
-			SMJS_FREE(c, comp_id);
-			return JS_TRUE;
-		}
-	}
-
-	SMJS_FREE(c, comp_id);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_interface)
-{
-	u32 idx;
-	GF_WidgetInterface *ifce;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !argc || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
-
-	idx = JSVAL_TO_INT(argv[0]);
-	ifce = (GF_WidgetInterface*)gf_list_get(wid->widget->main->interfaces, idx);
-
-	if (ifce) {
-		if (!ifce->obj) {
-			ifce->obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
-			SMJS_SET_PRIVATE(c, ifce->obj, ifce);
-			JS_DefineProperty(c, ifce->obj, "num_messages", INT_TO_JSVAL( gf_list_count(ifce->messages) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, ifce->obj, "type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->type) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, ifce->obj, "serviceProvider", BOOLEAN_TO_JSVAL( ifce->provider ? JS_TRUE : JS_FALSE ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, ifce->obj, "multipleBinding", BOOLEAN_TO_JSVAL( ifce->multiple_binding ? JS_TRUE : JS_FALSE ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineFunction(c, ifce->obj, "get_message", wm_widget_get_message, 1, 0);
-			gf_js_add_root(c, &ifce->obj, GF_JSGC_OBJECT);
-		}
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(ifce->obj) );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_bind_output_trigger)
-{
-	GF_WidgetMessage *msg;
-	GF_WidgetPin *param;
-	SVG_handlerElement *handler;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
-	if (!wid || !wid->scene || (argc!=3)) return JS_TRUE;
-
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-	if (!JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	if (!JSVAL_IS_OBJECT(argv[2])) return JS_TRUE;
-
-	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!msg) return JS_TRUE;
-	param = msg->output_trigger;
-	if (!param) return JS_TRUE;
-
-
-	handler = wm_create_scene_listener(wid, param);
-	if (!handler) return JS_TRUE;
-	handler->js_fun_val = * (u64 *) & argv[1];
-	gf_js_add_root(c, &handler->js_fun_val, GF_JSGC_VAL);
-	handler->evt_listen_obj = wid;
-	handler->js_fun = param;
-	handler->js_context = c;
-	handler->handle_event = wm_handle_dom_event;
-	handler->sgprivate->UserPrivate = JSVAL_TO_OBJECT(argv[2]);
-
-	gf_list_add(wid->output_triggers, handler);
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_get_context)
-{
-	GF_BitStream *bs;
-	u32 i, count;
-	const char *str;
-	char *att;
-	SMJS_OBJ
-	//SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-	if (!wid->scene) {
-		SMJS_SET_RVAL(JSVAL_NULL);
-		return JS_TRUE;
-	}
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<contextInformation xmlns=\"urn:mpeg:mpegu:schema:widgets:contextinfo:2010\">\n";
-	gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
-
-	count = gf_list_count(wid->widget->main->preferences);
-	for (i=0; i<count; i++) {
-		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
-
-		/*preference is read only, do not include in context*/
-		if (pref->flags & GF_WM_PREF_READONLY) continue;
-		/*preference is not migratable, do not include in context*/
-		if (!(pref->flags & GF_WM_PREF_MIGRATE)) continue;
-
-		str = " <preference name=\"";
-		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
-
-		gf_bs_write_data(bs, (const char *) pref->name, (u32) strlen(pref->name) );
-
-		str = "\" value=\"";
-		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
-
-		/*read from node*/
-		if (pref->connectTo && pref->connectTo->attribute) {
-			GF_FieldInfo info;
-			GF_Node *n = gf_sg_find_node_by_name(wid->scene, pref->connectTo->node);
-			if (n) {
-
-#ifndef GPAC_DISABLE_SVG
-				if ((n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) && !strcmp(pref->connectTo->attribute, "textContent")) {
-					char *txt = gf_dom_flatten_textContent(n);
-					gf_bs_write_data(bs, (const char *) txt, (u32) strlen(txt) );
-				} else
-#endif
-					if (gf_node_get_field_by_name(n, pref->connectTo->attribute, &info)==GF_OK) {
-						att = gf_node_dump_attribute(n, &info);
-						if (att) {
-							gf_bs_write_data(bs, (const char *)  att, (u32) strlen(att) );
-							gf_free(att);
-						}
-					}
-			}
-		}
-		/*read from config*/
-		else {
-			att = (char *)gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, pref->name);
-			if (!att) att = pref->value;
-
-			if (att) gf_bs_write_data(bs, (const char *) att, (u32) strlen(att) );
-		}
-
-		str = "\"/>\n";
-		gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
-	}
-	str = "</contextInformation>\n";
-	gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
-
-	gf_bs_write_u8(bs, 0);
-	att = NULL;
-	gf_bs_get_content(bs, &att, &count);
-	gf_bs_del(bs);
-
-	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, att) ) );
-	gf_free(att);
-
-	return JS_TRUE;
-}
-
-
-static SMJS_FUNC_PROP_GET( wm_widget_getProperty)
-
-JSString *s;
-char *prop_name;
-const char *opt;
-GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-if (!wid) return JS_FALSE;
-
-if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-if (!prop_name) return JS_FALSE;
-
-/*
-		Manifest properties
-*/
-if (!strcmp(prop_name, "manifest")) {
-	s = JS_NewStringCopyZ(c, wid->widget->manifest_path);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "url")) {
-	s = JS_NewStringCopyZ(c, wid->widget->local_path ? wid->widget->local_path : wid->widget->url);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "main")) {
-	s = JS_NewStringCopyZ(c, wid->widget->main->relocated_src);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "localizedSrc")) {
-	s = JS_NewStringCopyZ(c, wid->widget->main->src);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "mainEncoding")) {
-	s = JS_NewStringCopyZ(c, wid->widget->main->encoding);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "mainMimeType")) {
-	s = JS_NewStringCopyZ(c, wid->widget->main->mimetype);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "defaultWidth")) {
-	*vp = INT_TO_JSVAL(wid->widget->width);
-}
-else if (!strcmp(prop_name, "defaultHeight")) {
-	*vp = INT_TO_JSVAL(wid->widget->height);
-}
-else if (!strcmp(prop_name, "icons")) {
-	u32 i, count;
-	JSObject *arr;
-	count = gf_list_count(wid->widget->icons);
-	arr = JS_NewArrayObject(c, count, NULL);
-	for (i = 0; i<count; i++) {
-		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->widget->icons, i);
-		if (icon) {
-			char *abs_reloc_url;
-			jsval icon_obj_val;
-			JSObject *icon_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
-			SMJS_SET_PRIVATE(c, icon_obj, icon);
-			JS_DefineProperty(c, icon_obj, "src", STRING_TO_JSVAL( JS_NewStringCopyZ(c, icon->src) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			if (strlen(icon->relocated_src)) abs_reloc_url = gf_url_concatenate(wid->widget->url, icon->relocated_src);
-			else abs_reloc_url = gf_strdup("");
-			JS_DefineProperty(c, icon_obj, "relocated_src", STRING_TO_JSVAL( JS_NewStringCopyZ(c, abs_reloc_url) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, icon_obj, "width", INT_TO_JSVAL( icon->width ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, icon_obj, "height", INT_TO_JSVAL( icon->height ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			icon_obj_val = OBJECT_TO_JSVAL(icon_obj);
-			JS_SetElement(c, arr, i, &icon_obj_val);
-			gf_free(abs_reloc_url);
-		}
-	}
-	*vp = OBJECT_TO_JSVAL(arr);
-}
-else if (!strcmp(prop_name, "preferences")) {
-	u32 i, count;
-	JSObject *arr;
-	count = gf_list_count(wid->widget->main->preferences);
-	arr = JS_NewArrayObject(c, count, NULL);
-	for (i = 0; i<count; i++) {
-		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
-		if (pref) {
-			jsval pref_obj_val;
-			JSObject *pref_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
-			SMJS_SET_PRIVATE(c, pref_obj, pref);
-			JS_DefineProperty(c, pref_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, pref->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, pref_obj, "value", STRING_TO_JSVAL( JS_NewStringCopyZ(c, pref->value) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, pref_obj, "readonly", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ((pref->flags & GF_WM_PREF_READONLY)?"true":"false")) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			pref_obj_val = OBJECT_TO_JSVAL(pref_obj);
-			JS_SetElement(c, arr, i, &pref_obj_val);
-		}
-	}
-	*vp = OBJECT_TO_JSVAL(arr);
-}
-else if (!strcmp(prop_name, "features")) {
-	u32 i, count;
-	JSObject *arr;
-	count = gf_list_count(wid->widget->features);
-	arr = JS_NewArrayObject(c, count, NULL);
-	for (i = 0; i<count; i++) {
-		GF_WidgetFeature *feat = (GF_WidgetFeature*)gf_list_get(wid->widget->features, i);
-		if (feat) {
-			jsval feat_obj_val;
-			JSObject *feat_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
-			SMJS_SET_PRIVATE(c, feat_obj, feat);
-			JS_DefineProperty(c, feat_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, feat->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			JS_DefineProperty(c, feat_obj, "required", BOOLEAN_TO_JSVAL( (feat->required? JS_TRUE : JS_FALSE) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			{
-				u32 j, pcount;
-				JSObject *params_arr;
-				pcount = gf_list_count(feat->params);
-				params_arr = JS_NewArrayObject(c, pcount, NULL);
-				for (j=0; j < pcount; j++) {
-					GF_WidgetFeatureParam *param = (GF_WidgetFeatureParam*)gf_list_get(feat->params, j);
-					JSObject *param_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
-					jsval param_obj_val;
-					SMJS_SET_PRIVATE(c, param_obj, param);
-					JS_DefineProperty(c, param_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-					JS_DefineProperty(c, param_obj, "value", STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->value) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-					param_obj_val = OBJECT_TO_JSVAL(param_obj);
-					JS_SetElement(c, params_arr, j, &param_obj_val);
-				}
-				JS_DefineProperty(c, feat_obj, "params", OBJECT_TO_JSVAL(params_arr), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-			}
-			feat_obj_val = OBJECT_TO_JSVAL(feat_obj);
-			JS_SetElement(c, arr, i, &feat_obj_val);
-		}
-	}
-	*vp = OBJECT_TO_JSVAL(arr);
-}
-
-else if (!strcmp(prop_name, "components")) {
-	u32 i, count;
-	jsval val;
-	JSObject *arr;
-	count = gf_list_count(wid->components);
-	arr = JS_NewArrayObject(c, count, NULL);
-	for (i = 0; i<count; i++) {
-		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
-		val = OBJECT_TO_JSVAL(comp->wid->obj);
-		JS_SetElement(c, arr, i, &val);
-	}
-	*vp = OBJECT_TO_JSVAL(arr);
-}
-else if (!strcmp(prop_name, "identifier")) {
-	s = JS_NewStringCopyZ(c, wid->widget->identifier);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "name")) {
-	s = JS_NewStringCopyZ(c, wid->widget->name);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "shortName")) {
-	s = JS_NewStringCopyZ(c, wid->widget->shortname);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "authorName")) {
-	s = JS_NewStringCopyZ(c, wid->widget->authorName);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "authorEmail")) {
-	s = JS_NewStringCopyZ(c, wid->widget->authorEmail);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "authorHref")) {
-	s = JS_NewStringCopyZ(c, wid->widget->authorHref);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "description")) {
-	s = JS_NewStringCopyZ(c, wid->widget->description);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "viewmodes")) {
-	if (wid->widget->viewmodes) s = JS_NewStringCopyZ(c, wid->widget->viewmodes);
-	else s = JS_NewStringCopyZ(c, "");
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "license")) {
-	s = JS_NewStringCopyZ(c, wid->widget->license);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "licenseHref")) {
-	s = JS_NewStringCopyZ(c, wid->widget->licenseHref);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "version")) {
-	s = JS_NewStringCopyZ(c, wid->widget->version);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "uuid")) {
-	s = JS_NewStringCopyZ(c, wid->widget->uuid);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "discardable")) {
-	*vp = BOOLEAN_TO_JSVAL( wid->widget->discardable ? JS_TRUE : JS_FALSE);
-}
-else if (!strcmp(prop_name, "multipleInstances")) {
-	*vp = BOOLEAN_TO_JSVAL( wid->widget->multipleInstance ? JS_TRUE : JS_FALSE);
-}
-
-/*
-		Widget Manager special properties (common to all implementations)
-*/
-else if (!strcmp(prop_name, "permanent")) {
-	*vp = BOOLEAN_TO_JSVAL( wid->permanent ? JS_TRUE : JS_FALSE);
-}
-else if (!strcmp(prop_name, "is_component")) {
-	*vp = BOOLEAN_TO_JSVAL( wid->parent ? JS_TRUE : JS_FALSE);
-}
-else if (!strcmp(prop_name, "parent")) {
-	*vp = wid->parent ? OBJECT_TO_JSVAL(wid->parent->obj) : JSVAL_NULL;
-}
-else if (!strcmp(prop_name, "activated")) {
-	*vp = BOOLEAN_TO_JSVAL( wid->activated ? JS_TRUE : JS_FALSE);
-}
-else if (!strcmp(prop_name, "section")) {
-	s = JS_NewStringCopyZ(c, (const char *) wid->secname);
-	*vp = STRING_TO_JSVAL(s);
-}
-else if (!strcmp(prop_name, "num_instances")) {
-	*vp = INT_TO_JSVAL( wid->widget->nb_instances);
-}
-else if (!strcmp(prop_name, "num_interfaces")) {
-	*vp = INT_TO_JSVAL( gf_list_count(wid->widget->main->interfaces));
-}
-else if (!strcmp(prop_name, "num_components")) {
-	*vp = INT_TO_JSVAL( gf_list_count(wid->components));
-}
-else if (!strcmp(prop_name, "num_bound_interfaces")) {
-	*vp = INT_TO_JSVAL( gf_list_count(wid->bound_ifces));
-}
-/*all variables used by the WidgetManager script but not stored*/
-else if (!strcmp(prop_name, "originating_device_ip")
-         || !strcmp(prop_name, "originating_device")
-         || !strcmp(prop_name, "device")
-        ) {
-}
-/*
-		Widget properties, common to each implementation
-*/
-else {
-	char szName[1024];
-	sprintf(szName, "WM:%s", prop_name);
-	opt = gf_cfg_get_key(wid->widget->wm->term->user->config, (const char *) wid->secname, szName);
-	if (opt) {
-		Double val=0;
-		if (!strcmp(opt, "true")) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-		else if (!strcmp(opt, "false")) *vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		else if (sscanf(opt, "%lf", &val)==1) {
-			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, val) );
-		} else {
-			s = JS_NewStringCopyZ(c, opt);
-			*vp = STRING_TO_JSVAL(s);
-		}
-	}
-}
-SMJS_FREE(c, prop_name);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET( wm_widget_setProperty)
-
-char szVal[32];
-jsdouble val;
-char *prop_name;
-GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-if (!wid) return JS_FALSE;
-
-if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-
-/*internal to WidgetManager, never stored*/
-if (!strcmp(prop_name, "permanent")) {
-	wid->permanent = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? GF_TRUE : GF_FALSE;
-}
-
-/*any widget properties*/
-else {
-	char szName[1024], *value, *_val = NULL;
-
-	if (JSVAL_IS_STRING(*vp)) {
-		value = _val = SMJS_CHARS(c, *vp);
-		if (!value) value = "";
-	}
-	else if (JSVAL_IS_BOOLEAN(*vp)) {
-		strcpy(szVal, (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? "true" : "false");
-		value = szVal;
-	}
-	else if (JSVAL_IS_NUMBER(*vp)) {
-		JS_ValueToNumber(c, *vp, &val);
-		sprintf(szVal, "%f", val);
-		value = szVal;
-	} else {
-		SMJS_FREE(c, prop_name);
-		return JS_TRUE;
-	}
-
-	sprintf(szName, "WM:%s", prop_name);
-	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *) wid->secname, szName, value);
-	SMJS_FREE(c, _val);
-}
-
-SMJS_FREE(c, prop_name);
-return JS_TRUE;
-}
-
-
-
-static JSBool wm_widget_bind_interface_ex(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, Bool is_unbind)
-{
-	u32 i, count;
-	GF_WidgetInterfaceInstance *bifce;
-	GF_WidgetInterface *ifce;
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !wid->scene) return JS_FALSE;
-
-	ifce = NULL;
-	if (argc) {
-		if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-		ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-		if (!ifce) return JS_FALSE;
-	}
-
-	if (!is_unbind) {
-		char *hostname;
-		JSObject *cookie;
-		if ((argc<3) || !JSVAL_IS_OBJECT(argv[1]) || !JSVAL_IS_STRING(argv[2])) return JS_FALSE;
-
-		cookie = JSVAL_TO_OBJECT(argv[1]);
-		hostname = SMJS_CHARS(c, argv[2]);
-		count = gf_list_count(wid->bound_ifces);
-		for (i=0; i<count; i++) {
-			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
-			if (!strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie) ) {
-				SMJS_FREE(c, hostname);
-				return JS_TRUE;
-			}
-		}
-		GF_SAFEALLOC(bifce, GF_WidgetInterfaceInstance);
-		bifce->wid = wid;
-		bifce->ifce = ifce;
-		bifce->cookie = cookie;
-		bifce->hostname = gf_strdup(hostname);
-		SMJS_FREE(c, hostname);
-		gf_list_add(wid->bound_ifces, bifce);
-
-		if (ifce->bind_action) {
-			return wm_widget_set_scene_input_value(c, obj, 1, argv, rval, 2, NULL, NULL, NULL);
-		} else {
-			widget_on_interface_bind(bifce, GF_FALSE);
-		}
-	} else {
-		JSObject *cookie = NULL;
-		if ((argc==2) && JSVAL_IS_OBJECT(argv[1])) cookie = JSVAL_TO_OBJECT(argv[1]);
-
-		count = gf_list_count(wid->bound_ifces);
-		for (i=0; i<count; i++) {
-			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
-			if (!ifce || ( !strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie)) ) {
-				gf_list_rem(wid->bound_ifces, i);
-				if (bifce->ifce->unbind_action) {
-					wm_widget_set_scene_input_value(c, NULL, 0, NULL, rval, 3, wid, bifce->ifce->unbind_action, NULL);
-				} else {
-					widget_on_interface_bind(bifce, GF_TRUE);
-				}
-				if (ifce) {
-					/*unregister our message handlers*/
-					count = gf_list_count(wid->output_triggers);
-					for (i=0; i<count; i++) {
-						u32 j, c2, found;
-						GF_DOMHandler *handler = (GF_DOMHandler*)gf_list_get(wid->output_triggers, i);
-						GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
-
-						if (handler->sgprivate->UserPrivate != cookie) continue;
-						found = 0;
-						c2 = gf_list_count(bifce->ifce->messages);
-						for (j=0; j<c2; j++) {
-							GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, j);
-							if (msg->output_trigger == param) {
-								found = 1;
-								break;
-							}
-						}
-						if (found) {
-#ifndef GPAC_DISABLE_SVG
-							GF_Node *listener = handler->sgprivate->parents->node;
-							gf_dom_listener_del(listener, listener->sgprivate->UserPrivate);
-#endif
-							gf_list_rem(wid->output_triggers, i);
-							i--;
-							count--;
-						}
-					}
-				}
-				wm_delete_interface_instance(wid->widget->wm, bifce);
-				if (ifce) return JS_TRUE;
-				i--;
-				count--;
-			}
-		}
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_bind_interface)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	SMJS_DECL_RVAL
-	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_FALSE);
-}
-static JSBool SMJS_FUNCTION(wm_widget_unbind_interface)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	SMJS_DECL_RVAL
-	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_TRUE);
-}
-
-
-static JSBool SMJS_FUNCTION(wm_widget_deactivate)
-{
-	u32 i, count;
-	jsval funval;
-	SMJS_OBJ
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid) return JS_FALSE;
-
-	/*widget is a component of another widget, unregister*/
-	if (wid->parent) {
-		GF_WidgetInstance *par_wid = wid->parent;
-		count = gf_list_count(par_wid->components);
-		for (i=0; i<count; i++) {
-			GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(par_wid->components, i);
-			if (comp->wid == wid) {
-				gf_list_rem(par_wid->components, i);
-				gf_free(comp);
-				break;
-			}
-		}
-		wid->parent = NULL;
-	}
-
-	/*remove all components*/
-	while (gf_list_count(wid->components)) {
-		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, 0);
-		wm_deactivate_component(c, wid, NULL, comp);
-		gf_list_rem(wid->components, 0);
-	}
-
-	/*mark the widget as deactivated, so it is no longer valid when checking all widgets bindings*/
-	wid->activated = GF_FALSE;
-
-	/*unbind existing widgets*/
-	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "unbind_widget", &funval);
-	if (JSVAL_IS_OBJECT(funval)) {
-		jsval an_argv[1];
-		an_argv[0] = OBJECT_TO_JSVAL(obj);
-		JS_CallFunctionValue(wid->widget->wm->ctx, wid->widget->wm->obj, funval, 1, an_argv, SMJS_GET_RVAL );
-	}
-
-	/*unbind all interfaces of this widget*/
-	wm_widget_bind_interface_ex(c, obj, 0, NULL, SMJS_GET_RVAL, GF_TRUE);
-
-	/*detach scene now that all unbind events have been sent*/
-	wid->scene = NULL;
-	return JS_TRUE;
-}
-
-
-static void wm_widget_jsbind(GF_WidgetManager *wm, GF_WidgetInstance *wid)
-{
-	if (wid->obj)
-		return;
-	wid->obj = JS_NewObject(wm->ctx, &wm->wmWidgetClass._class, 0, 0);
-	SMJS_SET_PRIVATE(wm->ctx, wid->obj, wid);
-	/*protect from GC*/
-	gf_js_add_root(wm->ctx, &wid->obj, GF_JSGC_OBJECT);
-}
-
-void wm_deactivate_component(JSContext *c, GF_WidgetInstance *wid, GF_WidgetComponent *comp, GF_WidgetComponentInstance *comp_inst)
-{
-	jsval fval, rval;
-
-	if (!comp_inst) {
-		u32 i=0;
-		while ((comp_inst = (GF_WidgetComponentInstance*)gf_list_enum(wid->components, &i))) {
-			if (comp_inst->comp == comp) break;
-			comp_inst = NULL;
-		}
-	}
-	if (!comp_inst) return;
-
-	if ((JS_LookupProperty(c, wid->widget->wm->obj, "on_widget_remove", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
-		jsval argv[1];
-		argv[0] = OBJECT_TO_JSVAL(comp_inst->wid->obj);
-		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, fval, 1, argv, &rval);
-	}
-}
-
-GF_WidgetComponentInstance *wm_activate_component(JSContext *c, GF_WidgetInstance *wid, GF_WidgetComponent *comp, Bool skip_wm_notification)
-{
-	u32 i, count;
-	const char *fun_name = NULL;
-	jsval fval, rval;
-	GF_WidgetComponentInstance *comp_inst;
-	GF_WidgetInstance *comp_wid;
-
-	comp_wid = NULL;
-	if (comp->src) {
-		char *url = gf_url_concatenate(wid->widget->url, comp->src);
-
-		count = gf_list_count(wid->widget->wm->widget_instances);
-		for (i=0; i<count; i++) {
-			comp_wid = (GF_WidgetInstance*)gf_list_get(wid->widget->wm->widget_instances, i);
-			if (!strcmp(comp_wid->widget->url, url) && !comp_wid->parent) break;
-			comp_wid = NULL;
-		}
-		if (!comp_wid) {
-			comp_wid = wm_load_widget(wid->widget->wm, url, 0, GF_FALSE);
-			if (comp_wid) comp_wid->permanent = GF_FALSE;
-		}
-		gf_free(url);
-	}
-	if (!comp_wid) return NULL;
-
-	if (!comp_wid->activated)
-		fun_name = "on_widget_add";
-
-	GF_SAFEALLOC(comp_inst, GF_WidgetComponentInstance);
-	if (!comp_inst) return NULL;
-	comp_inst->comp = comp;
-	comp_inst->wid = comp_wid;
-	comp_wid->parent = wid;
-
-	gf_list_add(wid->components, comp_inst);
-
-	if (!comp_inst->wid->obj) wm_widget_jsbind(wid->widget->wm, comp_inst->wid);
-
-	if (!skip_wm_notification && fun_name && (JS_LookupProperty(c, wid->widget->wm->obj, fun_name, &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
-		jsval argv[1];
-		argv[0] = OBJECT_TO_JSVAL(comp_inst->wid->obj);
-		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, fval, 1, argv, &rval);
-	}
-	if (comp_inst) return comp_inst;
-	return NULL;
-}
-
-static JSBool SMJS_FUNCTION(wm_widget_is_interface_bound)
-{
-	u32 i, count;
-	JSObject *cookie;
-	GF_WidgetInterface *ifce;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
-	if (!wid || !wid->scene || (argc<1) || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
-
-	ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!ifce) return JS_FALSE;
-	cookie = NULL;
-	if ((argc==2) && JSVAL_IS_OBJECT(argv[1]) )
-		cookie = JSVAL_TO_OBJECT(argv[1]);
-
-	SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(JS_FALSE));
-	count = gf_list_count(wid->bound_ifces);
-	for (i=0; i<count; i++) {
-		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
-		if (!strcmp(bifce->ifce->type, ifce->type) && (!cookie || (bifce->cookie==cookie))) {
-			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-			break;
-		}
-	}
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(wm_load)
-{
-	u32 i, count;
-	char *manifest, *url, *widget_ctx;
-	GF_WidgetInstance *wid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	manifest = SMJS_CHARS(c, argv[0]);
-
-	url = NULL;
-	if ((argc==2) && ! JSVAL_IS_NULL(argv[1]) && JSVAL_IS_OBJECT(argv[1])) {
-		GF_WidgetInstance *parent_widget;
-		if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[1]), &wm->wmWidgetClass, NULL) ) return JS_FALSE;
-		parent_widget = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[1]) );
-
-		if (parent_widget->widget->url) url = gf_url_concatenate(parent_widget->widget->url, manifest);
-	}
-
-	widget_ctx = NULL;
-	if ((argc==3) && !JSVAL_IS_NULL(argv[2]) && JSVAL_IS_STRING(argv[2])) {
-		widget_ctx = SMJS_CHARS(c, argv[2]);
-	}
-
-	if (!url) {
-		url = gf_strdup(manifest);
-	}
-
-	wid=NULL;
-	count = gf_list_count(wm->widget_instances);
-	for (i=0; i<count; i++) {
-		wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
-		if (!strcmp(wid->widget->url, url) && !wid->activated) break;
-		wid = NULL;
-	}
-	if (!wid) {
-		wid = wm_load_widget(wm, url, 0, GF_TRUE);
-	}
-	if (url) gf_free(url);
-
-	/*parse context if any*/
-	if (wid && wid->mpegu_context) {
-		gf_xml_dom_del(wid->mpegu_context);
-		wid->mpegu_context = NULL;
-	}
-	if (wid && widget_ctx && strlen(widget_ctx)) {
-		GF_Err e;
-		GF_XMLNode *context = NULL;
-		wid->mpegu_context = gf_xml_dom_new();
-		e = gf_xml_dom_parse_string(wid->mpegu_context, widget_ctx);
-		if (!e) {
-			context = gf_xml_dom_get_root(wid->mpegu_context);
-			if (strcmp(context->name, "contextInformation")) context = NULL;
-		} else {
-		}
-
-		if (!context && wid->mpegu_context) {
-			gf_xml_dom_del(wid->mpegu_context);
-			wid->mpegu_context = NULL;
-		}
-	}
-
-	if (wid) {
-		wm_widget_jsbind(wm, wid);
-		SMJS_SET_RVAL(OBJECT_TO_JSVAL(wid->obj));
-	}
-	SMJS_FREE(c, manifest);
-	SMJS_FREE(c, widget_ctx);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_unload)
-{
-	GF_WidgetInstance *wid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-
-	if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &wm->wmWidgetClass, NULL) ) return JS_FALSE;
-	wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
-	if (!wid) return JS_TRUE;
-
-	/*unless explecetely requested, remove the section*/
-	if ((argc!=2) || !JSVAL_IS_BOOLEAN(argv[1]) || (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
-		/*create section*/
-		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
-	}
-	wm_delete_widget_instance(wm, wid);
-	return JS_TRUE;
-}
-
-
-
-static SMJS_FUNC_PROP_GET( wm_getProperty)
-
-char *prop_name;
-GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-if (!wm) return JS_FALSE;
-
-if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-if (!prop_name) return JS_FALSE;
-
-if (!strcmp(prop_name, "num_widgets")) {
-	*vp = INT_TO_JSVAL(gf_list_count(wm->widget_instances));
-}
-else if (!strcmp(prop_name, "last_widget_dir")) {
-	const char *opt = gf_cfg_get_key(wm->term->user->config, "Widgets", "last_widget_dir");
-	if (!opt) opt = "/";
-	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, opt));
-}
-SMJS_FREE(c, prop_name);
-return JS_TRUE;
-}
-
-
-static SMJS_FUNC_PROP_SET( wm_setProperty)
-
-char *prop_name;
-GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-if (!wm) return JS_FALSE;
-
-if (!JSVAL_IS_STRING(*vp)) return JS_TRUE;
-if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
-prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
-
-if (!strcmp(prop_name, "last_widget_dir")) {
-	char *v = SMJS_CHARS(c, *vp);
-	gf_cfg_set_key(wm->term->user->config, "Widgets", "last_widget_dir", v);
-	SMJS_FREE(c, v);
-}
-SMJS_FREE(c, prop_name);
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_get)
-{
-	u32 i;
-	GF_WidgetInstance *wid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-	if (!argc || !JSVAL_IS_INT(argv[0])) return JS_TRUE;
-
-	i = JSVAL_TO_INT(argv[0]);
-	wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
-	if (wid) SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(wm_find_interface)
-{
-	char *ifce_name;
-	u32 i;
-	GF_WidgetInstance *wid;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	ifce_name = SMJS_CHARS(c, argv[0]);
-	i=0;
-	while ( (wid = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i) )) {
-		u32 j=0;
-		GF_WidgetInterface *wid_ifce;
-		while ((wid_ifce = (GF_WidgetInterface*)gf_list_enum(wid->widget->main->interfaces, &j))) {
-			if (!strcmp(wid_ifce->type, ifce_name)) {
-				SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
-				SMJS_FREE(c, ifce_name);
-				return JS_TRUE;
-			}
-		}
-	}
-	SMJS_FREE(c, ifce_name);
-	return JS_TRUE;
-}
-
-
-const char *wm_xml_get_attr(GF_XMLNode *root, const char *name)
-{
-
-	u32 i, count;
-	count = gf_list_count(root->attributes);
-	for (i=0; i<count; i++) {
-		char *sep;
-		GF_XMLAttribute *att = gf_list_get(root->attributes, i);
-		if (!att->name) continue;
-		if (!strcmp(att->name, name)) return att->value;
-		sep = strchr(att->name, ':');
-		if (sep && !strcmp(sep+1, name)) return att->value;
-	}
-	return NULL;
-}
-
-/* TODO Implement real language check according to BCP 47*/
-static Bool wm_check_language(const char *xml_lang_value, const char *user_locale)
-{
-	Bool ret = GF_FALSE;
-	char *sep, *val;
-	val = (char*)xml_lang_value;
-	while (!ret) {
-		sep = strchr(val, ';');
-		if (sep) sep[0] = 0;
-		if (strstr(user_locale, val)) ret = GF_TRUE;
-		if (sep) {
-			sep[0] = ';';
-			val = sep+1;
-		} else {
-			break;
-		}
-	}
-	return ret;
-}
-
-static GF_XMLNode *wm_xml_find(GF_XMLNode *root, const char *ns_prefix, const char *name, const char *user_locale)
-{
-	GF_XMLNode *localized = NULL;
-	GF_XMLNode *non_localized = NULL;
-	u32 i, count;
-
-	if (!root) return NULL;
-
-	count = gf_list_count(root->content);
-	for (i=0; i<count; i++) {
-		GF_XMLNode *n = (GF_XMLNode*)gf_list_get(root->content, i);
-		if (n->type==GF_XML_NODE_TYPE && n->name && !strcmp(n->name, name) && ((!ns_prefix && !n->ns) || (ns_prefix && n->ns && !strcmp(ns_prefix, n->ns)))) {
-			const char *lang = wm_xml_get_attr(n, "xml:lang");
-			if (!lang) {
-				if (!non_localized) non_localized = n;
-			} else {
-				if (user_locale && wm_check_language(lang, user_locale) && !localized) localized = n;
-			}
-		}
-	}
-	if (localized) return localized;
-	else return non_localized;
-}
-
-static GF_WidgetPin *wm_parse_pin(const char *value, u16 type, const char *pin_name, const char *scriptType, const char *default_value)
-{
-	GF_WidgetPin *pin;
-	char *sep;
-
-	if (!value && !scriptType && !default_value) return NULL;
-
-	GF_SAFEALLOC(pin, GF_WidgetPin);
-	if (!pin) return NULL;
-	
-	pin->type = type;
-	if (pin_name) pin->name = gf_strdup(pin_name);
-
-	if (value) {
-		sep = strrchr(value, '.');
-		if (!sep && (type==GF_WM_PREF_CONNECT)) {
-			gf_free(pin);
-			return NULL;
-		}
-
-		/*node.event || node.attribute*/
-		if (sep) {
-			sep[0] = 0;
-			pin->node = gf_strdup(value);
-			pin->attribute = gf_strdup(sep+1);
-			sep[0] = '.';
-		}
-		/*script function*/
-		else {
-			pin->node = gf_strdup(value);
-		}
-	}
-
-	if (scriptType) {
-		if (!strcmp(scriptType, "boolean")) pin->script_type = GF_WM_PARAM_SCRIPT_BOOL;
-		else if (!strcmp(scriptType, "number")) pin->script_type = GF_WM_PARAM_SCRIPT_NUMBER;
-	} else if (default_value) {
-		pin->default_value = gf_strdup(default_value);
-	}
-	return pin;
-}
-
-static void wm_parse_mpegu_content_element(GF_WidgetContent *content, GF_XMLNode *root, const char *ns_prefix, GF_List *global_prefs)
-{
-	GF_XMLNode *ifces, *context, *pref_node;
-	GF_WidgetMessage *msg;
-	GF_WidgetInterface *ifce;
-	GF_XMLNode *ifce_node;
-	GF_WidgetPreference *pref;
-	const char *att;
-	u32 i = 0;
-
-	ifces = wm_xml_find(root, ns_prefix, "interfaces", NULL);
-	if (ifces) {
-
-		/*get all interface element*/
-		while ((ifce_node = (GF_XMLNode*)gf_list_enum(ifces->content, &i))) {
-			GF_XMLNode *msg_node;
-			u32 j;
-			const char *ifce_type, *act;
-			if (ifce_node->type != GF_XML_NODE_TYPE) continue;
-			if (strcmp(ifce_node->name, "interface")) continue;
-			ifce_type = wm_xml_get_attr(ifce_node, "type");
-			if (!ifce_type) continue;
-
-			GF_SAFEALLOC(ifce, GF_WidgetInterface);
-			ifce->type = gf_strdup(ifce_type);
-			ifce->messages = gf_list_new();
-			ifce->content = content;
-			gf_list_add(content->interfaces, ifce);
-
-			act = wm_xml_get_attr(ifce_node, "serviceProvider");
-			if (act && !strcmp(act, "true")) ifce->provider = GF_TRUE;
-
-			act = wm_xml_get_attr(ifce_node, "multipleBindings");
-			if (act && !strcmp(act, "true")) ifce->multiple_binding = GF_TRUE;
-
-			act = wm_xml_get_attr(ifce_node, "required");
-			if (act && !strcmp(act, "true")) ifce->required = GF_TRUE;
-
-			act = wm_xml_get_attr(ifce_node, "connectTo");
-			if (act) ifce->connectTo = gf_strdup(act);
-
-			act = wm_xml_get_attr(ifce_node, "bindAction");
-			if (act) {
-				ifce->bind_action = wm_parse_pin(act, GF_WM_BIND_ACTION, NULL, NULL, NULL);
-			}
-			act = wm_xml_get_attr(ifce_node, "unbindAction");
-			if (act) {
-				ifce->unbind_action = wm_parse_pin(act, GF_WM_UNBIND_ACTION, NULL, NULL, NULL);
-			}
-
-			j=0;
-			while ((msg_node = (GF_XMLNode*)gf_list_enum(ifce_node->content, &j))) {
-				u32 k;
-				GF_XMLNode *par_node;
-				const char *msg_name, *action;
-				if (msg_node->type != GF_XML_NODE_TYPE) continue;
-				if (strcmp(msg_node->name, "messageIn") && strcmp(msg_node->name, "messageOut")) continue;
-
-				msg_name = wm_xml_get_attr(msg_node, "name");
-				if (!msg_name) continue;
-				GF_SAFEALLOC(msg, GF_WidgetMessage);
-				msg->name = gf_strdup(msg_name);
-				msg->params = gf_list_new();
-				msg->ifce = ifce;
-				if (!strcmp(msg_node->name, "messageOut")) msg->is_output = 1;
-
-				gf_list_add(ifce->messages, msg);
-
-				/*get inputAction*/
-				action = wm_xml_get_attr(msg_node, "inputAction");
-				if (action) {
-					msg->input_action = wm_parse_pin(action, GF_WM_INPUT_ACTION, NULL, NULL, NULL);
-				}
-
-				/*get outputTrigger*/
-				action = wm_xml_get_attr(msg_node, "outputTrigger");
-				if (action) {
-					msg->output_trigger = wm_parse_pin(action, GF_WM_OUTPUT_TRIGGER, NULL, NULL, NULL);
-				}
-
-				/*get params*/
-				k=0;
-				while ((par_node=gf_list_enum(msg_node->content, &k))) {
-					GF_WidgetPin *wpin;
-					u16 type;
-					const char *par_name, *att_name;
-					if (par_node->type != GF_XML_NODE_TYPE) continue;
-					if (strcmp(par_node->name, "input") && strcmp(par_node->name, "output")) continue;
-
-
-					par_name = wm_xml_get_attr(par_node, "name");
-					/*invalid param, discard message*/
-					if (!par_name) {
-						gf_list_del_item(ifce->messages, msg);
-						gf_list_del(msg->params);
-						gf_free(msg->name);
-						gf_free(msg);
-						break;
-					}
-
-					if (!strcmp(par_node->name, "output")) {
-						type = GF_WM_PARAM_OUTPUT;
-						att_name = wm_xml_get_attr(par_node, "attributeModified");
-					} else {
-						type = GF_WM_PARAM_INPUT;
-						att_name = wm_xml_get_attr(par_node, "setAttribute");
-					}
-					wpin = wm_parse_pin(att_name, type, par_name, wm_xml_get_attr(par_node, "scriptParamType"), wm_xml_get_attr(par_node, "default"));
-					if (!wpin) continue;
-					wpin->msg = msg;
-
-					gf_list_add(msg->params, wpin);
-				}
-			}
-		}
-	}
-
-	/*get all component elements*/
-	i=0;
-	while (root && (ifce_node = gf_list_enum(root->content, &i))) {
-		GF_XMLNode *req_node;
-		u32 j;
-		const char *src, *id, *act;
-		GF_WidgetComponent *comp;
-		if (ifce_node->type != GF_XML_NODE_TYPE) continue;
-		if (strcmp(ifce_node->name, "component")) continue;
-		src = wm_xml_get_attr(ifce_node, "src");
-		id = wm_xml_get_attr(ifce_node, "id");
-
-		GF_SAFEALLOC(comp, GF_WidgetComponent);
-		comp->required_interfaces = gf_list_new();
-		comp->content = content;
-		if (id) comp->id = gf_strdup(id);
-		if (src) comp->src = gf_strdup(src);
-		j=0;
-		while ((req_node=gf_list_enum(ifce_node->content, &j))) {
-			const char *ifce_type;
-			if (req_node->type != GF_XML_NODE_TYPE) continue;
-			if (strcmp(req_node->name, "requiredInterface")) continue;
-			ifce_type = wm_xml_get_attr(req_node, "type");
-			if (!ifce_type) continue;
-			gf_list_add(comp->required_interfaces, gf_strdup(ifce_type));
-		}
-
-		act = wm_xml_get_attr(ifce_node, "activateTrigger");
-		if (act) comp->activateTrigger = wm_parse_pin(act, GF_WM_ACTIVATE_TRIGGER, NULL, NULL, NULL);
-		act = wm_xml_get_attr(ifce_node, "deactivateTrigger");
-		if (act) comp->deactivateTrigger = wm_parse_pin(act, GF_WM_DEACTIVATE_TRIGGER, NULL, NULL, NULL);
-
-		gf_list_add(content->components, comp);
-	}
-
-	/*clone global prefs for this content*/
-	i=0;
-	while ((pref = gf_list_enum(global_prefs, &i))) {
-		GF_WidgetPreference *apref;
-		GF_SAFEALLOC(apref, GF_WidgetPreference);
-		apref->name = gf_strdup(pref->name);
-		if (pref->value) apref->value = gf_strdup(pref->value);
-		apref->flags = pref->flags;
-		gf_list_add(content->preferences, apref);
-	}
-
-	context = wm_xml_find(root, ns_prefix, "contextConfiguration", NULL);
-	if (context) {
-		u32 j;
-		/*get all preference elements*/
-		i=0;
-		while ((pref_node = gf_list_enum(context->content, &i))) {
-			const char *att;
-			if (pref_node->type != GF_XML_NODE_TYPE) continue;
-			if (strcmp(pref_node->name, "preferenceConnect")) continue;
-			att = wm_xml_get_attr(pref_node, "name");
-			if (!att) continue;
-
-			j=0;
-			while ((pref = gf_list_enum(content->preferences, &j))) {
-				if (!strcmp(pref->name, att) && !pref->connectTo) break;
-			}
-
-			if (!pref) {
-				GF_SAFEALLOC(pref, GF_WidgetPreference);
-				if (!pref) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget preference\n"));
-					continue;
-				}
-
-				pref->name = gf_strdup(att);
-				gf_list_add(content->preferences, pref);
-			}
-			att = wm_xml_get_attr(pref_node, "value");
-			if (att) {
-				if (pref->value) gf_free(pref->value);
-				pref->value = gf_strdup(att);
-			}
-			att = wm_xml_get_attr(pref_node, "readOnly");
-			if (att && !strcmp(att, "true")) pref->flags |= GF_WM_PREF_READONLY;
-			att = wm_xml_get_attr(pref_node, "migratable");
-			if (att && !strcmp(att, "saveOnly")) pref->flags |= GF_WM_PREF_SAVE;
-			else if (att && !strcmp(att, "migrateOnly")) pref->flags |= GF_WM_PREF_MIGRATE;
-			else pref->flags |= GF_WM_PREF_SAVE | GF_WM_PREF_MIGRATE;
-
-			att = wm_xml_get_attr(pref_node, "connectTo");
-			if (att) pref->connectTo = wm_parse_pin(att, GF_WM_PREF_CONNECT, NULL, NULL, NULL);
-		}
-
-		att = wm_xml_get_attr(context, "savedAction");
-		if (att) content->savedAction = wm_parse_pin(att, GF_WM_PREF_SAVEDACTION, NULL, NULL, NULL);
-		att = wm_xml_get_attr(context, "restoredAction");
-		if (att) content->restoredAction = wm_parse_pin(att, GF_WM_PREF_RESTOREDACTION, NULL, NULL, NULL);
-		att = wm_xml_get_attr(context, "saveTrigger");
-		if (att) content->saveTrigger = wm_parse_pin(att, GF_WM_PREF_SAVETRIGGER, NULL, NULL, NULL);
-		att = wm_xml_get_attr(context, "restoreTrigger");
-		if (att) content->restoreTrigger = wm_parse_pin(att, GF_WM_PREF_RESTORETRIGGER, NULL, NULL, NULL);
-	}
-}
-
-/* Implements the W3C P&C rule for getting a single attribute value
-   see http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-valu0
-   should be different from getting normalized text but for now it's ok
-   */
-static char *wm_get_single_attribute(const char *input) {
-	u32 i, j, len;
-	char *output;
-	Bool first_space_copied;
-
-	if (!input) return gf_strdup("");
-
-	len = (u32) strlen(input);
-	output = gf_malloc(len+1);
-
-	first_space_copied = 1;
-	j = 0;
-	for (i = 0; i<len; i++) {
-		switch (input[i]) {
-		case ' ':
-		case '\t':
-		case '\r':
-		case '\n':
-			if (!first_space_copied) {
-				output[j] = ' ';
-				j++;
-				first_space_copied = 1;
-			}
-			break;
-		default:
-			output[j] = input[i];
-			j++;
-			first_space_copied = 0;
-		}
-	}
-	if (j && output[j-1] == ' ') output[j-1] = 0;
-	output[j] = 0;
-	return output;
-}
-
-/* Implements the W3C P&C rule for getting a single attribute value
-   see http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-valu0 */
-static u32 wm_parse_non_neg(const char *input) {
-	u32 result = 0;
-	if (strlen(input) && !strchr(input, '-')) {
-		if (sscanf(input, "%u", &result) != 1) result = 0;
-	}
-	return result;
-}
-
-/* returns the localized concatenated text content
-see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#Node3-textContent
-and http://www.w3.org/TR/widgets/#rule-for-getting-text-content0
-*/
-static char *wm_get_text_content(GF_XMLNode *node, char *inherited_locale, const char *user_locale) {
-	if (node->type == GF_XML_TEXT_TYPE) {
-		if (node->name) return gf_strdup(node->name);
-		else return gf_strdup("");
-	} else {
-		char *xml_lang = (char *)wm_xml_get_attr(node, "xml:lang");
-		if (!xml_lang) xml_lang = inherited_locale;
-		/*
-		if (xml_lang && user_locale && wm_check_language(xml_lang, user_locale))
-		*/
-		{
-			u32 i, count;
-			char *text_content;
-			u32 text_content_len = 0;
-			text_content = gf_strdup("");
-			count = gf_list_count(node->content);
-			for (i=0; i<count; i++) {
-				GF_XMLNode *child = (GF_XMLNode *)gf_list_get(node->content, i);
-				char *child_content = wm_get_text_content(child, xml_lang, user_locale);
-				u32 child_content_len = (u32) strlen(child_content);
-				text_content = gf_realloc(text_content, text_content_len+child_content_len+1);
-				memcpy(text_content+text_content_len, child_content, child_content_len);
-				text_content[text_content_len+child_content_len] = 0;
-				text_content_len+=child_content_len;
-				gf_free(child_content);
-			}
-			return text_content;
-		}
-		/*
-		} else {
-			return gf_strdup("");
-		*/
-	}
-}
-
-static char *wm_get_normalized_text_content(GF_XMLNode *node, char *inherited_locale, const char *user_locale) {
-	char *text_content, *result;
-	/* first aggregate text content */
-	text_content = wm_get_text_content(node, inherited_locale, user_locale);
-	/* calling normalization of text content */
-	result = wm_get_single_attribute(text_content);
-	gf_free(text_content);
-	return result;
-}
-
-/* When relocating resources over HTTP, we check if the resources for a given locale exists
-  on the server by sending a HEAD message with an Accept-Language header. */
-void wm_relocate_proc(void *usr_cbk, GF_NETIO_Parameter *parameter)
-{
-	switch (parameter->msg_type) {
-	case GF_NETIO_GET_METHOD:
-		parameter->name = "HEAD";
-		break;
-	default:
-		return;
-	}
-}
-
-/* relocate the given resource name (res_name) using registered relocators (e.g. locales, package folder)
-   The result is the path of the file, possibly uncompressed, possibly localized.
-   The parameter widget_path provides the path for converting relative resource paths into absolute paths.*/
-static Bool wm_relocate_url(GF_WidgetManager *wm, const char *widget_path, const char *res_name, char *relocated_name, char *localized_res_name)
-{
-	Bool ok = 0;
-	char *res_url;
-	Bool result = gf_term_relocate_url(wm->term, res_name, widget_path, relocated_name, localized_res_name);
-	if (result) return result;
-
-	res_url = gf_url_concatenate(widget_path, res_name);
-
-	/*try with HTTP HEAD */
-	if (!strnicmp(widget_path, "http", 4)) {
-		GF_Err e;
-		/*fetch the remote widget manifest synchronously and load it */
-		GF_DownloadSession *sess = gf_dm_sess_new(wm->term->downloader, (char *)res_url, GF_NETIO_SESSION_NOT_THREADED, wm_relocate_proc, NULL, &e);
-		if (sess) {
-			e = gf_dm_sess_process(sess);
-			gf_dm_sess_del(sess);
-			if (e==GF_OK) {
-				const char *opt = gf_cfg_get_key(wm->term->user->config, "Systems", "Language2CC");
-				strcpy(relocated_name, res_url);
-				if (opt)
-					sprintf(localized_res_name, "%s/%s", opt, res_name);
-				else
-					strcpy(localized_res_name, res_name);
-				ok = 1;
-			}
-		}
-	}
-	gf_free(res_url);
-	return ok;
-}
-
-/* function that checks if the default start file exists in the widget (package or folder)
-   according to the default start files table from the W3C P&C spec.
-   The widget path attribute is used to get the associated relocator from the registered relocators */
-static void wm_set_default_start_file(GF_WidgetManager *wm, GF_WidgetContent *content, const char *widget_path) {
-	Bool result;
-	char localized_path[GF_MAX_PATH], relocated_path[GF_MAX_PATH];
-	char *mimetype = "text/html";
-	result = wm_relocate_url(wm, widget_path, "index.htm", relocated_path, localized_path);
-	if (result) {
-		mimetype = "text/html";
-	} else {
-		result = wm_relocate_url(wm, widget_path, "index.html", relocated_path, localized_path);
-		if (result) {
-			mimetype = "text/html";
-		} else {
-			result = wm_relocate_url(wm, widget_path, "index.svg", relocated_path, localized_path);
-			if (result) {
-				mimetype = "image/svg+xml";
-			} else {
-				result = wm_relocate_url(wm, widget_path, "index.xhtml", relocated_path, localized_path);
-				if (result) {
-					mimetype = "application/xhtml+xml";
-				} else {
-					result = wm_relocate_url(wm, widget_path, "index.xht", relocated_path, localized_path);
-					if (result) mimetype = "application/xhtml+xml";
-				}
-			}
-		}
-	}
-	if (content->src) gf_free(content->src);
-	content->src = gf_strdup(localized_path);
-	if (content->relocated_src) gf_free(content->relocated_src);
-	content->relocated_src = gf_strdup(relocated_path);
-	if (content->mimetype) gf_free(content->mimetype);
-	content->mimetype = gf_strdup(mimetype);
-	if (content->encoding) gf_free(content->encoding);
-	content->encoding = gf_strdup("utf-8");
-}
-
-static GF_WidgetContent *wm_add_icon(GF_Widget *widget, const char *icon_relocated_path, const char *icon_localized_path, const char *uri_fragment)
-{
-	GF_WidgetContent *icon;
-	u32 i, count;
-	Bool already_in = 0;
-
-	count = gf_list_count(widget->icons);
-	for (i =0; i<count; i++) {
-		GF_WidgetContent *in_icon = gf_list_get(widget->icons, i);
-		if (!strcmp(icon_localized_path, in_icon->src)) {
-			already_in = 1;
-			break;
-		}
-	}
-	if (already_in) return NULL;
-
-	GF_SAFEALLOC(icon, GF_WidgetContent);
-	if (!icon) return NULL;
-	
-	if (uri_fragment) {
-		icon->src = gf_malloc(strlen(icon_localized_path) + strlen(uri_fragment) + 1);
-		if (icon->src) {
-			strcpy(icon->src, icon_localized_path);
-			strcat(icon->src, uri_fragment);
-		}
-		icon->relocated_src = gf_malloc(strlen(icon_relocated_path) + strlen(uri_fragment) + 1);
-		if (icon->relocated_src) {
-			strcpy(icon->relocated_src, icon_relocated_path);
-			strcat(icon->relocated_src, uri_fragment);
-		}
-	} else {
-		icon->src = gf_strdup(icon_localized_path);
-		icon->relocated_src = gf_strdup(icon_relocated_path);
-	}
-	icon->interfaces = gf_list_new();
-	icon->components = gf_list_new();
-	icon->preferences = gf_list_new();
-	icon->widget = widget;
-	gf_list_add(widget->icons, icon);
-	return icon;
-}
-
-/* Scans the W3C default icons table and add each icon */
-static void wm_set_default_icon_files(GF_WidgetManager *wm, const char *widget_path, GF_Widget *widget) {
-	char relocated_path[GF_MAX_PATH], localized_path[GF_MAX_PATH];
-	Bool result;
-
-	result = wm_relocate_url(wm, widget_path, "icon.svg", relocated_path, localized_path);
-	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
-
-	result = wm_relocate_url(wm, widget_path, "icon.ico", relocated_path, localized_path);
-	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
-
-	result = wm_relocate_url(wm, widget_path, "icon.png", relocated_path, localized_path);
-	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
-
-	result = wm_relocate_url(wm, widget_path, "icon.gif", relocated_path, localized_path);
-	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
-
-	result = wm_relocate_url(wm, widget_path, "icon.jpg", relocated_path, localized_path);
-	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
-}
-
-GF_WidgetInstance *wm_load_widget(GF_WidgetManager *wm, const char *path, u32 InstanceID, Bool skip_context)
-{
-	char szName[GF_MAX_PATH];
-	u32 i, count;
-	GF_Widget *widget = NULL;
-	GF_WidgetInstance *wi = NULL;
-	GF_XMLNode *root, *icon, *nmain, *name, *xml_node;
-	GF_Err e;
-	GF_DOMParser *dom = NULL;
-	GF_WidgetPackage *wpackage = NULL;
-
-	GF_DownloadSession *sess = NULL;
-	const char *widget_ns_prefix = NULL;
-	const char *mpegu_ns_prefix = NULL;
-	const char *user_locale = gf_cfg_get_key(wm->term->user->config, "Systems", "Language2CC");
-
-	/* Try to see if this widget is already loaded */
-	e = GF_OK;
-	count = gf_list_count(wm->widgets);
-	for (i=0; i<count; i++) {
-		widget = gf_list_get(wm->widgets, i);
-		if (!strcmp(widget->url, path)) break;
-		widget = NULL;
-	}
-
-	/*not found, retrieve the widget (if http), check the package if needed and parse the configuration document/widget manifest*/
-	if (!widget) {
-		Bool isDownloadedPackage = 0;
-
-		/* path used to locate the widget (config.xml if unpackaged or zip/isoff package), potentially after download */
-		const char *szLocalPath = path;
-		/* used to locate the config document/widget manifest potentially after unzipping */
-		const char *szManifestPath = path;
-		/* */
-		const char *szWidgetPath = path;
-		const char *desc;
-		GF_WidgetPreference *pref;
-		GF_List *global_prefs;
-		GF_WidgetContent *content;
-		Bool correct_ns = 0;
-
-		if (strstr(path, "http://")) {
-			/*fetch the remote widget manifest synchronously and load it */
-			sess = gf_dm_sess_new(wm->term->downloader, (char *)path, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					szLocalPath = gf_dm_sess_get_cache_name(sess);
-
-					if (gf_unzip_probe(szLocalPath)) {
-						isDownloadedPackage = 1;
-					} else {
-						/* TODO ISOFF-based packaged widget */
-					}
-				}
-			}
-			if (!sess || (e!=GF_OK) || !szLocalPath) goto exit;
-		}
-
-		/* Check if the widget package is a valid package and if it contains a config.xml file */
-		szManifestPath = szLocalPath;
-
-		wpackage = widget_package_new(wm, szLocalPath);
-		if (wpackage) {
-			count = gf_list_count(wpackage->resources);
-			for (i=0; i<count; i++) {
-				GF_WidgetPackageResource *wu = gf_list_get(wpackage->resources, i);
-				/* According to W3C WPC, the config.xml file (lower case) shall only be located
-				   at the root of the package
-				   see http://www.w3.org/TR/widgets/#ta-dxzVDWpaWg */
-				if (!strcmp(wu->inner_path, "config.xml")) {
-					szManifestPath = wu->extracted_path;
-					break;
-				}
-			}
-			szWidgetPath = szManifestPath;
-		}
-
-
-		/* Parse the Widget Config Document as a DOM */
-		dom = gf_xml_dom_new();
-		e = gf_xml_dom_parse(dom, szManifestPath, NULL, NULL);
-		if (e) goto exit;
-
-		root = gf_xml_dom_get_root(dom);
-		if (!root) goto exit;
-
-		correct_ns = 0;
-		count = gf_list_count(root->attributes);
-		for (i=0; i<count; i++) {
-			GF_XMLAttribute *att = gf_list_get(root->attributes, i);
-			if (att->name) {
-				if (!strcmp(att->name, "xmlns")) {
-					if (!strcmp(att->value, "http://www.w3.org/ns/widgets")) {
-						correct_ns = 1;
-					}
-				} else if (!strnicmp(att->name, "xmlns:", 6)) {
-					if (!strcmp(att->value, "http://www.w3.org/ns/widgets")) {
-						widget_ns_prefix = att->name+6;
-						correct_ns = 1;
-					} else if (!strcmp(att->value, "urn:mpeg:mpegu:schema:widgets:manifest:2010")) {
-						mpegu_ns_prefix = att->name+6;
-					}
-				}
-			}
-		}
-		/* According to the spec, wrong or no namespace means invalid widget
-		see http://www.w3.org/TR/widgets/#ta-ACCJfDGwDQ */
-		if (!correct_ns) goto exit;
-
-		/* see http://www.w3.org/TR/widgets/#ta-ACCJfDGwDQ */
-		if ((root->ns && (!widget_ns_prefix || strcmp(root->ns, widget_ns_prefix) || strcmp(root->name, "widget"))) ||
-		        (!root->ns && (widget_ns_prefix || strcmp(root->name, "widget"))))
-			goto exit;
-
-
-		/*pre-parse the root-level preference for use when parsing MPEG-U elements */
-		global_prefs = gf_list_new();
-		i=0;
-		while ((nmain = gf_list_enum(root->content, &i))) {
-			const char *pname, *pvalue;
-			/* 'normalized' preference name and readonly*/
-			char *npname, *npro;
-			u32 i, count;
-			Bool pref_exists = 0;
-			Bool readOnly = 0;
-			if (nmain->type != GF_XML_NODE_TYPE) continue;
-			if (strcmp(nmain->name, "preference")) continue;
-			pname = wm_xml_get_attr(nmain, "name");
-			npname = wm_get_single_attribute(pname);
-			if (!npname || !strlen(npname)) continue;
-
-			count = gf_list_count(global_prefs);
-			for (i = 0; i < count; i++) {
-				GF_WidgetPreference *tmp_pref = gf_list_get(global_prefs, i);
-				if (!strcmp(tmp_pref->name, npname)) {
-					pref_exists = 1;
-					break;
-				}
-			}
-			if (pref_exists) continue;
-
-			pvalue = wm_xml_get_attr(nmain, "readonly");
-			npro = wm_get_single_attribute(pvalue);
-			if (npro && strlen(npro) && !strcmp(npro, "true")) readOnly=1;
-			if (npro) gf_free(npro);
-
-			pvalue = wm_xml_get_attr(nmain, "value");
-
-			GF_SAFEALLOC(pref, GF_WidgetPreference);
-			pref->name = npname;
-			if (pvalue) pref->value = wm_get_single_attribute(pvalue);
-			/*global preferences are save and migratable*/
-			pref->flags = GF_WM_PREF_SAVE | GF_WM_PREF_MIGRATE;
-			if (readOnly) pref->flags |= GF_WM_PREF_READONLY;
-			gf_list_add(global_prefs, pref);
-		}
-
-		/* get the content element from the XML Config document */
-		GF_SAFEALLOC(content, GF_WidgetContent);
-		if (!content) {
-			e = GF_OUT_OF_MEM;
-			goto exit;
-		}
-		content->interfaces = gf_list_new();
-		content->components = gf_list_new();
-		content->preferences = gf_list_new();
-		nmain = wm_xml_find(root, widget_ns_prefix, "content", NULL);
-		if (!nmain) {
-			/* if not found, use the default table of start files */
-			wm_set_default_start_file(wm, content, szWidgetPath);
-		} else {
-			const char *src, *encoding, *mimetype;
-			src = wm_xml_get_attr(nmain, "src");
-
-			/*check the resource exists*/
-			if (src) {
-				Bool result;
-				char relocated_path[GF_MAX_PATH], localized_path[GF_MAX_PATH];
-				/*remove any existing fragment*/
-				char *sep = strchr(src, '#');
-				if (sep) sep[0] = 0;
-				result = wm_relocate_url(wm, szWidgetPath, src, relocated_path, localized_path);
-				if (sep) sep[0] = '#';
-				if (result) {
-					content->relocated_src = gf_strdup(relocated_path);
-					content->src = gf_strdup(localized_path);
-				}
-			}
-
-			encoding = wm_xml_get_attr(nmain, "encoding");
-			if (encoding && strlen(encoding)) content->encoding = wm_get_single_attribute(encoding);
-			else content->encoding = gf_strdup("utf-8");
-
-			mimetype = wm_xml_get_attr(nmain, "type");
-			if (mimetype && strlen(mimetype)) {
-				char *sep = strchr(mimetype, ';');
-				if (sep) sep[0] = 0;
-				content->mimetype = wm_get_single_attribute(mimetype);
-				if (sep) sep[0] = ';';
-			}
-			else content->mimetype = gf_strdup("text/html");
-
-			if (!content->relocated_src) wm_set_default_start_file(wm, content, szWidgetPath);
-		}
-		if (strlen(content->relocated_src) == 0) {
-			gf_list_del(content->interfaces);
-			gf_list_del(content->components);
-			gf_list_del(content->preferences);
-			gf_free(content);
-			content = NULL;
-			goto exit;
-		}
-		/* We need to call the parse of the MPEG-U elements to clone the global preferences into widget preferences,
-		   this should probably be changed to extract the clone from that function */
-		wm_parse_mpegu_content_element(content, nmain, mpegu_ns_prefix, global_prefs);
-
-		GF_SAFEALLOC(widget, GF_Widget);
-		if (!widget) {
-			e = GF_OUT_OF_MEM;
-			goto exit;
-		}
-		widget->url = gf_strdup(path);
-		widget->manifest_path = gf_strdup(szManifestPath);
-		if (isDownloadedPackage) widget->local_path = gf_strdup(szLocalPath);
-		widget->wm = wm;
-		widget->main = content;
-		content->widget = widget;
-		widget->icons = gf_list_new();
-		widget->features = gf_list_new();
-		if (wpackage) {
-			widget->wpack = wpackage;
-			wpackage->widget = widget;
-			/*attach downloader to our package to avoid destroying the cache file*/
-			wpackage->sess = sess;
-			sess = NULL;
-		}
-
-		/*check for icon - can be optional*/
-		i=0;
-		while ((icon = gf_list_enum(root->content, &i))) {
-			if (icon->type==GF_XML_NODE_TYPE &&
-			        icon->name && !strcmp(icon->name, "icon") &&
-			        ((!widget_ns_prefix && !icon->ns) || !strcmp(widget_ns_prefix, icon->ns))) {
-				char *sep;
-				char relocated[GF_MAX_PATH], localized_path[GF_MAX_PATH];
-				char *icon_width, *icon_height;
-				GF_WidgetContent *iconic;
-				Bool result;
-
-				char *pname = (char *)wm_xml_get_attr(icon, "src");
-				if (!pname || !strlen(pname)) continue;
-
-				/*remove any existing fragment*/
-				sep = strchr(pname, '#');
-				if (sep) sep[0] = 0;
-				result = wm_relocate_url(wm, szWidgetPath, pname, relocated, localized_path);
-				if (sep) sep[0] = '#';
-				if (!result) continue;
-
-				iconic = wm_add_icon(widget, relocated, localized_path, sep);
-				if (iconic) {
-					wm_parse_mpegu_content_element(iconic, icon, mpegu_ns_prefix, global_prefs);
-					icon_width = (char *)wm_xml_get_attr(icon, "width");
-					if (icon_width) iconic->width = wm_parse_non_neg(icon_width);
-					icon_height = (char *)wm_xml_get_attr(icon, "height");
-					if (icon_height) iconic->height = wm_parse_non_neg(icon_height);
-				}
-			}
-		}
-		/* after processing the icon elements (wether there are valid icons or not), we use the default icon table
-		  see http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/004/ */
-		wm_set_default_icon_files(wm, szWidgetPath, widget);
-
-		/*delete the root-level preference*/
-		i=0;
-		while ((pref = gf_list_enum(global_prefs , &i))) {
-			if (pref->value) gf_free(pref->value);
-			gf_free(pref->name);
-			gf_free(pref);
-		}
-		gf_list_del(global_prefs);
-
-		/*check for optional meta data*/
-		name = wm_xml_find(root, widget_ns_prefix, "name", user_locale);
-		if (name) {
-			const char *shortname = wm_xml_get_attr(name, "short");
-			widget->shortname = wm_get_single_attribute(shortname);
-
-			widget->name = wm_get_normalized_text_content(name, NULL, user_locale);
-		}
-
-		desc = wm_xml_get_attr(root, "id");
-		if (desc) {
-			/* TODO check if this is a valid IRI, for the moment, just hack to pass the test, check for ':'
-			  see http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-RawAIWHoMs/ */
-			if (strchr(desc, ':'))
-				widget->identifier = wm_get_single_attribute(desc);
-		}
-
-		desc = wm_xml_get_attr(root, "width");
-		if (desc) {
-			widget->width = wm_parse_non_neg(desc);
-		}
-		desc = wm_xml_get_attr(root, "height");
-		if (desc) {
-			widget->height = wm_parse_non_neg(desc);
-		}
-
-		name = wm_xml_find(root, widget_ns_prefix, "description", user_locale);
-		if (name) {
-			widget->description = wm_get_normalized_text_content(name, NULL, user_locale);
-		}
-
-		name = wm_xml_find(root, widget_ns_prefix, "license", user_locale);
-		if (name) {
-			const char *href = wm_xml_get_attr(name, "href");
-			widget->licenseHref = wm_get_single_attribute(href);
-
-			/* Warning the license text content should not be normalized */
-			widget->license = wm_get_text_content(name, NULL, user_locale);
-		}
-
-		desc = wm_xml_get_attr(root, "version");
-		if (desc) widget->version = wm_get_single_attribute(desc);
-
-		desc = wm_xml_get_attr(root, "uuid");
-		if (desc) widget->uuid = gf_strdup(desc);
-
-		desc = wm_xml_get_attr(root, "discardable");
-		if (desc) widget->discardable = !strcmp(desc, "true") ? 1 : 0;
-
-		desc = wm_xml_get_attr(root, "multipleInstances");
-		if (desc) widget->multipleInstance = !strcmp(desc, "true") ? 1 : 0;
-
-		name = wm_xml_find(root, widget_ns_prefix, "author", NULL);
-		if (name) {
-			desc = wm_xml_get_attr(name, "href");
-			if (desc && strchr(desc, ':')) widget->authorHref = wm_get_single_attribute(desc);
-
-			desc = wm_xml_get_attr(name, "email");
-			widget->authorEmail = wm_get_single_attribute(desc);
-
-			widget->authorName = wm_get_normalized_text_content(name, NULL, user_locale);
-		}
-
-		i=0;
-		while ((xml_node = gf_list_enum(root->content, &i))) {
-			if (xml_node->type==GF_XML_NODE_TYPE &&
-			        xml_node->name && !strcmp(xml_node->name, "feature") &&
-			        ((!widget_ns_prefix && !xml_node->ns) || !strcmp(widget_ns_prefix, xml_node->ns))) {
-
-				u32 i, count;
-				Bool already_in = 0;
-				GF_WidgetFeature *feat;
-				const char *feature_name, *req_att;
-				char *nfname;
-				Bool required = 1;
-				u32 j;
-				GF_XMLNode *param_node;
-
-				feature_name = (char *)wm_xml_get_attr(xml_node, "name");
-				if (!feature_name || !strlen(feature_name) || !strchr(feature_name, ':')) continue;
-				nfname = wm_get_single_attribute(feature_name);
-
-				req_att = (char *)wm_xml_get_attr(xml_node, "required");
-				if (req_att && !strcmp(req_att, "false")) required = 0;
-
-				count = gf_list_count(widget->features);
-				for (i = 0; i<count; i++) {
-					GF_WidgetFeature *tmp = gf_list_get(widget->features, i);
-					if (!strcmp(nfname, tmp->name)) {
-						already_in = 1;
-						break;
-					}
-				}
-				if (already_in) continue;
-
-				GF_SAFEALLOC(feat, GF_WidgetFeature);
-				if (!feat) {
-					e = GF_OUT_OF_MEM;
-					goto exit;
-				}
-				feat->name = nfname;
-				feat->required = required;
-				feat->params = gf_list_new();
-				gf_list_add(widget->features, feat);
-
-				j = 0;
-				while ((param_node = gf_list_enum(xml_node->content, &j))) {
-					if (param_node->type==GF_XML_NODE_TYPE &&
-					        param_node->name && !strcmp(param_node->name, "param") &&
-					        ((!widget_ns_prefix && !param_node->ns) || !strcmp(widget_ns_prefix, param_node->ns))) {
-						GF_WidgetFeatureParam *wfp;
-						const char *param_name, *param_value;
-						char *npname, *npvalue;
-
-						param_name = (char *)wm_xml_get_attr(param_node, "name");
-						npname = wm_get_single_attribute(param_name);
-						if (!strlen(npname)) continue;
-
-						param_value = (char *)wm_xml_get_attr(param_node, "value");
-						npvalue = wm_get_single_attribute(param_value);
-						if (!strlen(npvalue)) {
-							gf_free(npname);
-							continue;
-						}
-
-						GF_SAFEALLOC(wfp, GF_WidgetFeatureParam);
-						if (!wfp) {
-							e = GF_OUT_OF_MEM;
-							goto exit;
-						}
-
-						wfp->name = npname;
-						wfp->value = npvalue;
-						gf_list_add(feat->params, wfp);
-
-					}
-				}
-
-			}
-		}
-
-		gf_list_add(wm->widgets, widget);
-	}
-
-	GF_SAFEALLOC(wi, GF_WidgetInstance);
-	if (!wi) {
-		e = GF_OUT_OF_MEM;
-		goto exit;
-	}
-	
-	wi->widget = widget;
-	wi->bound_ifces = gf_list_new();
-	wi->output_triggers = gf_list_new();
-	wi->components = gf_list_new();
-	widget->nb_instances++;
-	wi->instance_id = InstanceID;
-	wi->permanent = 1;
-
-	if (!InstanceID) {
-		char szInst[20];
-
-		count = gf_list_count(wm->widget_instances);
-		for (i=0; i<count; i++) {
-			GF_WidgetInstance *awi = gf_list_get(wm->widget_instances, i);
-			if (awi->widget == wi->widget)
-				wi->instance_id = awi->instance_id;
-		}
-		wi->instance_id ++;
-
-		sprintf(szName, "%s#%s#Instance%d", path, wi->widget->name, wi->instance_id);
-		sprintf((char *)wi->secname, "Widget#%08X", gf_crc_32(szName, (u32) strlen(szName)));
-
-		/*create section*/
-		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wi->secname, " ");
-		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:Manifest", wi->widget->url);
-		sprintf(szInst, "%d", wi->instance_id);
-		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:InstanceID", szInst);
-	}
-	gf_list_add(wm->widget_instances, wi);
-
-
-	if (!skip_context && strstr(path, "http://")) {
-		GF_XMLNode *context;
-		GF_DownloadSession *ctx_sess = NULL;
-		char *ctxPath;
-		context = NULL;
-
-		/*fetch the remote widget context synchronously and load it */
-		ctxPath = gf_malloc(sizeof(char) * (strlen(path) + 1 + 15/*?mpeg-u-context*/));
-		strcpy(ctxPath, path);
-		if ((strchr(path, '?') == NULL) && (strstr(path, "%3f")==NULL) && (strstr(path, "%3F")==NULL) ) {
-			strcat(ctxPath, "?mpeg-u-context");
-		} else {
-			strcat(ctxPath, "&mpeg-u-context");
-		}
-
-		/*try to fetch the associated context*/
-		ctx_sess = gf_dm_sess_new(wm->term->downloader, (char *)ctxPath, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-		if (ctx_sess) {
-			e = gf_dm_sess_process(ctx_sess);
-			if (e==GF_OK) {
-				wi->mpegu_context = gf_xml_dom_new();
-				e = gf_xml_dom_parse(wi->mpegu_context , gf_dm_sess_get_cache_name(ctx_sess), NULL, NULL);
-				if (!e) {
-					context = gf_xml_dom_get_root(wi->mpegu_context);
-					if (strcmp(context->name, "contextInformation")) context = NULL;
-				}
-			}
-			gf_dm_sess_del(ctx_sess);
-			e = GF_OK;
-		}
-		gf_free(ctxPath);
-		ctxPath = NULL;
-
-		if (!context && wi->mpegu_context) {
-			gf_xml_dom_del(wi->mpegu_context);
-			wi->mpegu_context = NULL;
-		}
-
-	}
-
-exit:
-	if (dom) gf_xml_dom_del(dom);
-	if (sess) gf_dm_sess_del(sess);
-	if (e || !wi) {
-		if (wi) wm_delete_widget_instance(wm, wi);
-		else {
-			if (wpackage) widget_package_del(wm, wpackage);
-		}
-		return NULL;
-	}
-	return wi;
-}
-
-
-static Bool wm_enum_widget(void *cbk, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
-{
-	GF_WidgetInstance *wid;
-	GF_WidgetManager *wm = (GF_WidgetManager *)cbk;
-	wid = wm_load_widget(wm, file_path, 0, 0);
-	if (wid) {
-		wm_widget_jsbind(wm, wid);
-		/*remove section info*/
-		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
-		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
-	}
-	return 0;
-}
-
-static Bool wm_enum_dir(void *cbk, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
-{
-	return (gf_enum_directory(file_path, 0, wm_enum_widget, cbk, "mgt")==GF_OK) ? GF_FALSE : GF_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(wm_initialize)
-{
-	u32 i, count;
-	const char*opt;
-	SMJS_OBJ
-	//SMJS_ARGS
-	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
-
-	count = gf_cfg_get_key_count(wm->term->user->config, "Widgets");
-	for (i=0; i<count; i++) {
-		const char *name = gf_cfg_get_key_name(wm->term->user->config, "Widgets", i);
-		/*this is a previously loaded widgets - reload it*/
-		if (!strnicmp(name, "Widget#", 7)) {
-			const char *manifest = gf_cfg_get_key(wm->term->user->config, name, "WM:Manifest");
-			if (manifest) {
-				const char *ID = gf_cfg_get_key(wm->term->user->config, name, "WM:InstanceID");
-				u32 instID = ID ? atoi(ID) : 0;
-				GF_WidgetInstance *wi = wm_load_widget(wm, manifest, instID, 0);
-				if (wi) {
-					strcpy((char *)wi->secname, (const char *) name);
-					wm_widget_jsbind(wm, wi);
-				}
-			}
-		}
-	}
-
-	opt = gf_cfg_get_key(wm->term->user->config, "Widgets", "WidgetStore");
-	if (opt) gf_enum_directory(opt, 1, wm_enum_dir, wm, NULL);
-
-	return JS_TRUE;
-}
-
-static void widgetmanager_load(GF_JSUserExtension *jsext, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
-{
-	GF_WidgetManager *wm;
-
-	GF_JSAPIParam par;
-	JSPropertySpec wmClassProps[] = {
-		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-	};
-	JSFunctionSpec wmClassFuncs[] = {
-		SMJS_FUNCTION_SPEC("initialize", wm_initialize, 0),
-		SMJS_FUNCTION_SPEC("load", wm_load, 2),
-		SMJS_FUNCTION_SPEC("unload", wm_unload, 1),
-		SMJS_FUNCTION_SPEC("get", wm_get, 1),
-		SMJS_FUNCTION_SPEC("findByInterface", wm_find_interface, 1),
-		SMJS_FUNCTION_SPEC(0, 0, 0)
-	};
-
-	wm = jsext->udta;
-	/*widget manager is only loaded once*/
-	if (wm->ctx && (wm->ctx != c)) {
-		/*load the 'Widget' object in the global scope*/
-		widget_load(wm, scene, c, global, unload);
-		return;
-	}
-
-	/*unload widgets*/
-	if (unload) {
-		if (wm->obj) {
-			gf_js_remove_root(wm->ctx, &wm->obj, GF_JSGC_OBJECT);
-			wm->obj = NULL;
-		}
-
-		while (gf_list_count(wm->widget_instances)) {
-			GF_WidgetInstance *widg = gf_list_get(wm->widget_instances, 0);
-			wm_delete_widget_instance(wm, widg);
-		}
-		wm->ctx = NULL;
-		return;
-	}
-	wm->ctx = c;
-
-	if (!scene) return;
-
-	/*setup JS bindings*/
-	JS_SETUP_CLASS(wm->widmanClass, "WIDGETMANAGER", JSCLASS_HAS_PRIVATE, wm_getProperty, wm_setProperty, JS_FinalizeStub);
-
-	GF_JS_InitClass(c, global, 0, &wm->widmanClass, 0, 0, wmClassProps, wmClassFuncs, 0, 0);
-	wm->obj = JS_DefineObject(c, global, "WidgetManager", &wm->widmanClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, wm->obj, wm);
-	gf_js_add_root(c, &wm->obj, GF_JSGC_OBJECT);
-
-
-	{
-		JSPropertySpec wmWidgetClassProps[] = {
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec wmWidgetClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("activate", wm_widget_activate, 1),
-			SMJS_FUNCTION_SPEC("deactivate", wm_widget_deactivate, 0),
-			SMJS_FUNCTION_SPEC("get_interface", wm_widget_get_interface, 1),
-			SMJS_FUNCTION_SPEC("bind_output_trigger", wm_widget_bind_output_trigger, 2),
-			SMJS_FUNCTION_SPEC("set_input", wm_widget_set_input, 2),
-			SMJS_FUNCTION_SPEC("bind_interface", wm_widget_bind_interface, 2),
-			SMJS_FUNCTION_SPEC("unbind_interface", wm_widget_unbind_interface, 1),
-			SMJS_FUNCTION_SPEC("call_input_action", wm_widget_call_input_action, 1),
-			SMJS_FUNCTION_SPEC("call_input_script", wm_widget_call_input_script, 2),
-			SMJS_FUNCTION_SPEC("is_interface_bound", wm_widget_is_interface_bound, 1),
-			SMJS_FUNCTION_SPEC("get_param_value", wm_widget_get_param_value, 1),
-			SMJS_FUNCTION_SPEC("get_context", wm_widget_get_context, 0),
-			SMJS_FUNCTION_SPEC("get_component", wm_widget_get_component, 2),
-
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		/*setup JS bindings*/
-		JS_SETUP_CLASS(wm->wmWidgetClass, "WMWIDGET", JSCLASS_HAS_PRIVATE, wm_widget_getProperty, wm_widget_setProperty, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &wm->wmWidgetClass, 0, 0, wmWidgetClassProps, wmWidgetClassFuncs, 0, 0);
-
-		JS_SETUP_CLASS(wm->widgetAnyClass, "WIDGETANY", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		GF_JS_InitClass(c, global, 0, &wm->widgetAnyClass, 0, 0, 0, 0, 0, 0);
-	}
-
-	JS_SETUP_CLASS(wm->widgetClass, "MPEGWidget", JSCLASS_HAS_PRIVATE, widget_getProperty, widget_setProperty, JS_FinalizeStub);
-
-	if (scene->script_action) {
-		if (!scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_TERM, scene->RootNode, &par))
-			return;
-		wm->term = par.term;
-	}
-
-}
-
-
-static GF_JSUserExtension *gwm_new()
-{
-	GF_JSUserExtension *dr;
-	GF_WidgetManager *wm;
-	GF_SAFEALLOC(dr, GF_JSUserExtension);
-	if (!dr) return NULL;
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_JS_USER_EXT_INTERFACE, "WidgetManager JavaScript Bindings", "gpac distribution");
-
-	GF_SAFEALLOC(wm, GF_WidgetManager);
-	if (!wm) {
-		gf_free(dr);
-		return NULL;
-	}
-	wm->widget_instances = gf_list_new();
-	wm->widgets = gf_list_new();
-	dr->load = widgetmanager_load;
-	dr->udta = wm;
-	return dr;
-}
-
-
-static void gwm_delete(GF_BaseInterface *ifce)
-{
-	GF_WidgetManager *wm;
-	GF_JSUserExtension *dr = (GF_JSUserExtension *) ifce;
-	if (!dr)
-		return;
-	wm = dr->udta;
-	if (!wm)
-		return;
-	if (wm->widget_instances)
-		gf_list_del(wm->widget_instances);
-	wm->widget_instances = NULL;
-	if (wm->widgets)
-		gf_list_del(wm->widgets);
-	wm->widgets = NULL;
-	gf_free(wm);
-	dr->udta = NULL;
-	gf_free(dr);
-}
-#endif
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifdef GPAC_HAS_SPIDERMONKEY
-		GF_JS_USER_EXT_INTERFACE,
-#ifndef GPAC_DISABLE_SVG
-		GF_SCENE_DECODER_INTERFACE,
-#endif
-
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifdef GPAC_HAS_SPIDERMONKEY
-	if (InterfaceType == GF_JS_USER_EXT_INTERFACE) return (GF_BaseInterface *)gwm_new();
-#ifndef GPAC_DISABLE_SVG
-	else if (InterfaceType == GF_SCENE_DECODER_INTERFACE) return (GF_BaseInterface *)LoadWidgetReader();
-#endif
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifdef GPAC_HAS_SPIDERMONKEY
-	case GF_JS_USER_EXT_INTERFACE:
-		gwm_delete(ifce);
-		break;
-#ifndef GPAC_DISABLE_SVG
-	case GF_SCENE_DECODER_INTERFACE:
-		ShutdownWidgetReader(ifce);
-		break;
-#endif
-
-#endif
-	}
-}
-
-
-GPAC_MODULE_STATIC_DECLARATION( widgetman )

gpac-0.8.0.tar.gz/modules/wiiis Deleted

gpac-0.8.0.tar.gz/modules/wiiis/wiiis.c Deleted

@@ -1,264 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2009-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Dummy input module
- *
- *  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/modules/codec.h>
-#include <gpac/scenegraph_vrml.h>
-#include <gpac/thread.h>
-
-#include <wiiuse.h>
-
-typedef struct
-{
-	u32 nb_wiimotes;
-	wiimote** wiimotes;
-	Bool running;
-	u32 prev_id;
-
-	GF_Thread *th;
-} GF_WiiMote;
-
-static Bool WII_RegisterDevice(struct __input_device *ifce, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
-{
-	const char *opt;
-	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
-	if (strcmp(urn, "WiiMote")) return 0;
-
-	/*init wiiuse lib*/
-	opt = gf_modules_get_option((GF_BaseInterface*)ifce, "WII", "MaxWiimotes");
-	if (opt) wii->nb_wiimotes = atoi(opt);
-	if (!wii->nb_wiimotes) wii->nb_wiimotes = 1;
-
-	wii->wiimotes = wiiuse_init(wii->nb_wiimotes);
-	if (!wii->wiimotes) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[Wii] Cannot initialize wiiuse library\n"));
-		return 0;
-	}
-
-	/*declare the interface*/
-	AddField(ifce, GF_SG_VRML_SFINT32, "uid");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "1");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "2");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "A");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "B");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "-");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "home");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "+");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "left");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "right");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "down");
-	AddField(ifce, GF_SG_VRML_SFBOOL, "up");
-	AddField(ifce, GF_SG_VRML_SFVEC3F, "ypr");
-	AddField(ifce, GF_SG_VRML_SFVEC3F, "gravity");
-
-	return 1;
-}
-
-#define WRITE_BUTTON(_b)	\
-	if (IS_JUST_PRESSED(wm, _b)) {	gf_bs_write_int(bs, 1, 1); gf_bs_write_int(bs, 1, 1); }	\
-	else if (IS_RELEASED(wm, _b)) {	gf_bs_write_int(bs, 1, 1); gf_bs_write_int(bs, 0, 1); }	\
-	else gf_bs_write_int(bs, 0, 1); \
- 
-
-#define WII_PI	3.1415926535898f
-
-static u32 WII_Run(void *par)
-{
-	GF_BitStream *bs;
-	char *buf;
-	u32 i, buf_size, count, scan_delay;
-	const char *opt;
-
-	GF_InputSensorDevice *ifce = (GF_InputSensorDevice *)par;
-	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
-
-
-	scan_delay = 5;
-	opt = gf_modules_get_option((GF_BaseInterface*)ifce, "WII", "ScanDelay");
-	if (opt) scan_delay = atoi(opt);
-
-	/*locate the wiimotes*/
-	count = wiiuse_find(wii->wiimotes, wii->nb_wiimotes, scan_delay);
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Found %d wiimotes\n", count));
-	count = wiiuse_connect(wii->wiimotes, wii->nb_wiimotes);
-	if (count) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Connected to %d connected wiimotes\n", count));
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Failed to connect to any wiimote\n"));
-	}
-
-	opt = gf_modules_get_option((GF_BaseInterface*)ifce, "WII", "MotionSensing");
-	/*enable motion sensing*/
-	if (!opt || !strcmp(opt, "yes")) {
-		Float smooth_alpha = 0.5;
-		Float ori_threshold = 10.0;
-		opt = gf_modules_get_option((GF_BaseInterface*)ifce, "WII", "OrientationThreshold");
-		if (opt) ori_threshold = (Float) atof(opt);
-		opt = gf_modules_get_option((GF_BaseInterface*)ifce, "WII", "SmoothAlpha");
-		if (opt) {
-			smooth_alpha = (Float) atof(opt);
-			if (smooth_alpha<0) smooth_alpha = 0.5;
-			else if (smooth_alpha>1.0) smooth_alpha=0.5;
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Enabling motion sensing - Alpha smoothing %f - Orientation Threshold %f\n", smooth_alpha, ori_threshold));
-
-		for (i=0; i<count; i++) {
-			wiiuse_motion_sensing(wii->wiimotes[i], 1);
-			wiiuse_set_smooth_alpha(wii->wiimotes[i],smooth_alpha);
-			wiiuse_set_orient_threshold(wii->wiimotes[i], ori_threshold);
-		}
-	}
-
-	while (wii->running) {
-		count = wiiuse_poll(wii->wiimotes, wii->nb_wiimotes);
-		if (!count) {
-			continue;
-		}
-		for (i=0; i<count; i++) {
-			struct wiimote_t* wm = wii->wiimotes[i];
-			switch (wm->event) {
-			case WIIUSE_EVENT:/* A generic event occured on the wiimote. */
-				/*create the data frame*/
-				bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-				/*if not the same wiimote write the UID*/
-				if (wii->prev_id != wm->unid) {
-					gf_bs_write_int(bs, 1, 1);
-					gf_bs_write_int(bs,  wm->unid, 32);
-					wii->prev_id = wm->unid;
-				} else {
-					gf_bs_write_int(bs, 0, 1);
-				}
-
-				/*write buttons state*/
-				WRITE_BUTTON(WIIMOTE_BUTTON_ONE);
-				WRITE_BUTTON(WIIMOTE_BUTTON_TWO);
-				WRITE_BUTTON(WIIMOTE_BUTTON_A);
-				WRITE_BUTTON(WIIMOTE_BUTTON_B);
-				WRITE_BUTTON(WIIMOTE_BUTTON_MINUS);
-				WRITE_BUTTON(WIIMOTE_BUTTON_HOME);
-				WRITE_BUTTON(WIIMOTE_BUTTON_PLUS);
-				WRITE_BUTTON(WIIMOTE_BUTTON_LEFT);
-				WRITE_BUTTON(WIIMOTE_BUTTON_RIGHT);
-				WRITE_BUTTON(WIIMOTE_BUTTON_DOWN);
-				WRITE_BUTTON(WIIMOTE_BUTTON_UP);
-
-				/*write yaw-pitch-roll - FIXME: wiiuse seems to output NaN in these values upon init*/
-				gf_bs_write_int(bs, 1, 1);
-				gf_bs_write_float(bs, WII_PI * wm->orient.yaw / 24 );
-				gf_bs_write_float(bs, WII_PI * wm->orient.pitch / 180);
-				gf_bs_write_float(bs, WII_PI * wm->orient.roll / 180);
-
-				/*write gravity - FIXME: wiiuse seems to output NaN in these values upon init*/
-				gf_bs_write_int(bs, 1, 1);
-				gf_bs_write_float(bs, wm->gforce.x);
-				gf_bs_write_float(bs, wm->gforce.y);
-				gf_bs_write_float(bs, wm->gforce.z);
-
-				gf_bs_align(bs);
-				gf_bs_get_content(bs, &buf, &buf_size);
-				gf_bs_del(bs);
-
-				ifce->DispatchFrame(ifce, buf, buf_size);
-				gf_free(buf);
-				break;
-			case WIIUSE_STATUS: /*A status report was obtained from the wiimote. */
-				break;
-			case WIIUSE_DISCONNECT:/*The wiimote disconnected. */
-				break;
-			case WIIUSE_READ_DATA:/* Data was returned that was previously requested from the wiimote ROM/registers. */
-				break;
-			case WIIUSE_NUNCHUK_INSERTED:
-			case WIIUSE_NUNCHUK_REMOVED:
-			case  WIIUSE_CLASSIC_CTRL_INSERTED:
-			case WIIUSE_CLASSIC_CTRL_REMOVED:
-			case WIIUSE_GUITAR_HERO_3_CTRL_INSERTED:
-			case WIIUSE_GUITAR_HERO_3_CTRL_REMOVED:
-				break;
-			}
-		}
-	}
-	return 0;
-}
-
-static void WII_Start(struct __input_device *ifce)
-{
-	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
-	wii->running = 1;
-	gf_th_run(wii->th, WII_Run, ifce);
-}
-
-static void WII_Stop(struct __input_device *ifce)
-{
-	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
-	wii->running = 0;
-}
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_INPUT_DEVICE_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	GF_WiiMote *wii;
-	GF_InputSensorDevice *plug;
-	if (InterfaceType != GF_INPUT_DEVICE_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputSensorDevice);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_INPUT_DEVICE_INTERFACE, "GPAC Wiimote InputSensor", "gpac distribution")
-
-	plug->RegisterDevice = WII_RegisterDevice;
-	plug->Start = WII_Start;
-	plug->Stop = WII_Stop;
-
-	GF_SAFEALLOC(wii, GF_WiiMote);
-	plug->udta = wii;
-	wii->th = gf_th_new("WiiMote");
-	return (GF_BaseInterface *)plug;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *bi)
-{
-	GF_WiiMote *wii;
-	GF_InputSensorDevice *ifce = (GF_InputSensorDevice*)bi;
-	if (ifce->InterfaceType!=GF_INPUT_DEVICE_INTERFACE) return;
-
-	wii = ifce->udta;
-	if (wii->wiimotes) {
-		wiiuse_cleanup(wii->wiimotes, wii->nb_wiimotes);
-	}
-	gf_free(wii);
-	gf_free(bi);
-}
-
-GPAC_MODULE_STATIC_DECLARATION( wiiis )

gpac-0.8.0.tar.gz/modules/xvid_dec Deleted

gpac-0.8.0.tar.gz/modules/xvid_dec/Makefile Deleted

@@ -1,61 +0,0 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/xvid_dec
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS=xvid_dec.o
-
-#local xvid lib
-ifeq ($(CONFIG_XVID), local)
-CFLAGS+= -I"$(LOCAL_INC_PATH)/xvid"
-EXTRALIBS+= -L../../extra_lib/lib/gcc
-endif
-EXTRALIBS+= -lxvidcore -lpthread
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_xvid_dec$(DYN_LIB_SUFFIX)
-ifeq ($(CONFIG_WIN32),yes)
-#LDFLAGS+=-export-symbols xvid_dec.def 
-endif
-
-
-ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
-ifneq ($(prefix), /usr)
-EXTRALIBS+=-L$(prefix)/lib
-endif
-endif
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc -lgpac $(EXTRALIBS) $(LDFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
--include .depend

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_dec.c Deleted

@@ -1,515 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-
-/*if we don't have M4V (A)SP parser, we con't get width and height and xvid is then unusable ...*/
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE) || defined (WIN32)
-#  pragma comment(lib, "libxvidcore")
-# endif
-#endif
-
-
-#include <xvid.h>
-
-#ifndef XVID_DEC_FRAME
-#define XVID_DEC_FRAME xvid_dec_frame_t
-#define XVID_DEC_PARAM xvid_dec_create_t
-#else
-#define XVID_USE_OLD_API
-#endif
-
-#undef XVID_USE_OLD_API
-
-static Bool xvid_is_init = GF_FALSE;
-
-typedef struct
-{
-	void *base_codec;
-	u16 base_ES_ID;
-
-	u32 width, height, out_size, pixel_ar;
-	Bool first_frame;
-	s32 base_filters;
-	Float FPS;
-	u32 offset;
-
-	/*demo for depth coding (auxiliary video data): the codec is pseudo-scalable with the depth data carried in
-	another stream - this is not very elegant ...*/
-	void *depth_codec;
-	u16 depth_ES_ID;
-	char *temp_uv;
-	u32 yuv_size;
-} XVIDDec;
-
-#define XVIDCTX()	XVIDDec *ctx = (XVIDDec *) ifcg->privateStack
-
-
-static GF_Err XVID_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_M4VDecSpecInfo dsi;
-	GF_Err e;
-	void **codec;
-#ifdef XVID_USE_OLD_API
-	XVID_DEC_FRAME frame;
-	XVID_DEC_PARAM par;
-#else
-	xvid_dec_frame_t frame;
-	xvid_dec_create_t par;
-#endif
-
-	XVIDCTX();
-
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*locate any auxiliary video data descriptor on this stream*/
-	if (esd->dependsOnESID) {
-		u32 i = 0;
-		GF_Descriptor *d = NULL;
-		if (esd->dependsOnESID != ctx->base_ES_ID) return GF_NOT_SUPPORTED;
-#ifdef XVID_USE_OLD_API
-		return GF_NOT_SUPPORTED;
-#endif
-
-		while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
-			if (d->tag == GF_ODF_AUX_VIDEO_DATA) break;
-		}
-		if (!d) return GF_NOT_SUPPORTED;
-		codec = &ctx->depth_codec;
-		ctx->depth_ES_ID = esd->ESID;
-	} else {
-		if (ctx->base_ES_ID && ctx->base_ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-		codec = &ctx->base_codec;
-		ctx->base_ES_ID = esd->ESID;
-	}
-	if (*codec) xvid_decore(*codec, XVID_DEC_DESTROY, NULL, NULL);
-
-	/*decode DSI*/
-	e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-	if (e) return e;
-	if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
-
-	memset(&par, 0, sizeof(par));
-	par.width = dsi.width;
-	par.height = dsi.height;
-	/*note that this may be irrelevant when used through systems (FPS is driven by systems CTS)*/
-	ctx->FPS = dsi.clock_rate;
-	ctx->FPS /= 1000;
-	if (!ctx->FPS) ctx->FPS = 30.0f;
-	ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
-
-#ifndef XVID_USE_OLD_API
-	par.version = XVID_VERSION;
-#endif
-
-	if (xvid_decore(NULL, XVID_DEC_CREATE, &par, NULL) < 0) return GF_NON_COMPLIANT_BITSTREAM;
-
-	ctx->width = par.width;
-	ctx->height = par.height;
-	*codec = par.handle;
-
-	/*init decoder*/
-	memset(&frame, 0, sizeof(frame));
-	frame.bitstream = (void *) esd->decoderConfig->decoderSpecificInfo->data;
-	frame.length = esd->decoderConfig->decoderSpecificInfo->dataLength;
-#ifndef XVID_USE_OLD_API
-	frame.version = XVID_VERSION;
-	xvid_decore(*codec, XVID_DEC_DECODE, &frame, NULL);
-#else
-	/*don't perform error check, XviD doesn't like DSI only frame ...*/
-	xvid_decore(*codec, XVID_DEC_DECODE, &frame, NULL);
-#endif
-
-	ctx->first_frame = GF_TRUE;
-	/*output in YV12 only - let the player handle conversion*/
-	if (ctx->depth_codec) {
-		ctx->out_size = ctx->width * ctx->height * 5 / 2;
-		ctx->temp_uv = (char*)gf_malloc(sizeof(char)*ctx->width * ctx->height / 2);
-	} else {
-		ctx->yuv_size = ctx->out_size = ctx->width * ctx->height * 3 / 2;
-	}
-	return GF_OK;
-}
-static GF_Err XVID_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	XVIDCTX();
-	if (ctx->base_ES_ID == ES_ID) {
-		if (ctx->base_codec) xvid_decore(ctx->base_codec, XVID_DEC_DESTROY, NULL, NULL);
-		ctx->base_codec = NULL;
-		ctx->base_ES_ID = 0;
-		ctx->width = ctx->height = ctx->out_size = 0;
-	}
-	else if (ctx->depth_ES_ID == ES_ID) {
-		if (ctx->depth_codec) xvid_decore(ctx->depth_codec, XVID_DEC_DESTROY, NULL, NULL);
-		ctx->depth_codec = NULL;
-		ctx->depth_ES_ID = 0;
-		if (ctx->temp_uv) gf_free(ctx->temp_uv);
-		ctx->temp_uv = NULL;
-	}
-	return GF_OK;
-}
-static GF_Err XVID_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	XVIDCTX();
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = ctx->FPS;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = ctx->depth_codec ? GF_PIXEL_YUVD : GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 4;
-		break;
-	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	/*XviD performs frame reordering internally*/
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WANTS_THREAD:
-	{
-		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "XviD", "Threaded");
-		capability->cap.valueInt = (sOpt && stricmp(sOpt, "yes")) ? 1 : 0;
-	}
-	break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err XVID_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-static GF_Err XVID_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-#ifdef XVID_USE_OLD_API
-	XVID_DEC_FRAME frame;
-#else
-	xvid_dec_frame_t frame;
-#endif
-	void *codec;
-	s32 postproc, res;
-	XVIDCTX();
-
-	if (!ES_ID) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-
-	if (ES_ID == ctx->depth_ES_ID) {
-		codec = ctx->depth_codec;
-	} else {
-		codec = ctx->base_codec;
-	}
-	if (!codec) return GF_OK;
-
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	memset(&frame, 0, sizeof(frame));
-	frame.bitstream = (void *) (inBuffer + ctx->offset);
-	frame.length = inBufferLength -  ctx->offset;
-	ctx->offset = 0;
-
-
-#ifdef XVID_USE_OLD_API
-	frame.colorspace = XVID_CSP_I420;
-	frame.stride = ctx->width;
-	frame.image = (void *) outBuffer;
-#else
-	frame.version = XVID_VERSION;
-	if (ES_ID == ctx->depth_ES_ID) {
-		frame.output.csp = XVID_CSP_PLANAR;
-		frame.output.stride[0] = ctx->width;
-		frame.output.plane[0] = (void *) (outBuffer + ctx->yuv_size);
-		frame.output.stride[1] = ctx->width/4;
-		frame.output.plane[1] = (void *) ctx->temp_uv;
-		frame.output.stride[2] = ctx->width/4;
-		frame.output.plane[2] = (void *) ctx->temp_uv;
-	} else {
-		frame.output.csp = XVID_CSP_I420;
-		frame.output.stride[0] = ctx->width;
-		frame.output.plane[0] = (void *) outBuffer;
-	}
-#endif
-
-
-
-	/*to check, not convinced yet by results...*/
-	postproc = ctx->base_filters;
-
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		/*turn off all post-proc*/
-#ifdef XVID_USE_OLD_API
-		postproc &= ~XVID_DEC_DEBLOCKY;
-		postproc &= ~XVID_DEC_DEBLOCKUV;
-#else
-		postproc &= ~XVID_DEBLOCKY;
-		postproc &= ~XVID_DEBLOCKUV;
-		postproc &= ~XVID_FILMEFFECT;
-#endif
-		break;
-	case GF_CODEC_LEVEL_VERY_LATE:
-		/*turn off post-proc*/
-#ifdef XVID_USE_OLD_API
-		postproc &= ~XVID_DEC_DEBLOCKY;
-#else
-		postproc &= ~XVID_FILMEFFECT;
-		postproc &= ~XVID_DEBLOCKY;
-#endif
-		break;
-	case GF_CODEC_LEVEL_LATE:
-#ifdef XVID_USE_OLD_API
-		postproc &= ~XVID_DEC_DEBLOCKUV;
-#else
-		postproc &= ~XVID_DEBLOCKUV;
-		postproc &= ~XVID_FILMEFFECT;
-#endif
-		break;
-	}
-	postproc = 0;
-
-	/*xvid may keep the first I frame and force a 1-frame delay, so we simply trick it*/
-	if (ctx->first_frame) {
-		outBuffer[0] = 'v';
-		outBuffer[1] = 'o';
-		outBuffer[2] = 'i';
-		outBuffer[3] = 'd';
-	}
-
-	res = xvid_decore(codec, XVID_DEC_DECODE, &frame, NULL);
-	if (res < 0) {
-		*outBufferLength = 0;
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	if (0 && res <= 6) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-
-	/*dispatch nothing if seeking or droping*/
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		if (ES_ID == ctx->base_ES_ID)
-			*outBufferLength = 0;
-		break;
-	default:
-		*outBufferLength = ctx->out_size;
-		if (ctx->first_frame) {
-			ctx->first_frame = GF_FALSE;
-			if ((outBuffer[0] == 'v') && (outBuffer[1] == 'o') && (outBuffer[2] == 'i') && (outBuffer[3] == 'd')) {
-				*outBufferLength = 0;
-				return GF_OK;
-			}
-		}
-		if (res + 6 < frame.length) {
-			ctx->offset = res;
-			return GF_PACKED_FRAMES;
-		}
-		break;
-	}
-
-	return GF_OK;
-}
-
-static u32 XVID_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-		if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
-		return GF_CODEC_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *XVID_GetCodecName(GF_BaseDecoder *dec)
-{
-#ifdef XVID_USE_OLD_API
-	return "XviD Dev Version";
-#else
-	return "XviD 1.0";
-#endif
-}
-
-GF_BaseDecoder *NewXVIDDec()
-{
-	const char *sOpt;
-	GF_MediaDecoder *ifcd;
-	XVIDDec *dec;
-
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	GF_SAFEALLOC(dec, XVIDDec);
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "XviD Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	if (!xvid_is_init) {
-#ifdef XVID_USE_OLD_API
-		XVID_INIT_PARAM init;
-		init.api_version = 0;
-		init.core_build = 0;
-		/*get info*/
-		init.cpu_flags = XVID_CPU_CHKONLY;
-		xvid_init(NULL, 0, &init, NULL);
-		/*then init*/
-		xvid_init(NULL, 0, &init, NULL);
-#else
-		xvid_gbl_init_t init;
-		init.debug = 0;
-		init.version = XVID_VERSION;
-		init.cpu_flags = 0; /*autodetect*/
-		xvid_global(NULL, 0, &init, NULL);
-#endif
-		xvid_is_init = GF_TRUE;
-	}
-
-	/*get config*/
-	dec->base_filters = 0;
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcd, "XviD", "PostProc");
-	if (sOpt) {
-#ifndef XVID_USE_OLD_API
-		if (strstr(sOpt, "FilmEffect")) dec->base_filters |= XVID_FILMEFFECT;
-#endif
-		if (strstr(sOpt, "Deblock_Y")) {
-#ifdef XVID_USE_OLD_API
-			dec->base_filters |= XVID_DEC_DEBLOCKY;
-#else
-			dec->base_filters |= XVID_DEBLOCKY;
-#endif
-		}
-		if (strstr(sOpt, "Deblock_UV")) {
-#ifdef XVID_USE_OLD_API
-			dec->base_filters |= XVID_DEC_DEBLOCKUV;
-#else
-			dec->base_filters |= XVID_DEBLOCKUV;
-#endif
-		}
-	}
-
-	/*setup our own interface*/
-	ifcd->AttachStream = XVID_AttachStream;
-	ifcd->DetachStream = XVID_DetachStream;
-	ifcd->GetCapabilities = XVID_GetCapabilities;
-	ifcd->SetCapabilities = XVID_SetCapabilities;
-	ifcd->GetName = XVID_GetCodecName;
-	ifcd->CanHandleStream = XVID_CanHandleStream;
-	ifcd->ProcessData = XVID_ProcessData;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteXVIDDec(GF_BaseDecoder *ifcg)
-{
-	XVIDCTX();
-	if (ctx->base_codec) xvid_decore(ctx->base_codec, XVID_DEC_DESTROY, NULL, NULL);
-	if (ctx->depth_codec) xvid_decore(ctx->depth_codec, XVID_DEC_DESTROY, NULL, NULL);
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewXVIDDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteXVIDDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( xvid )

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_dec_wce.cpp Deleted

@@ -1,303 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / codec pack module
- *
- *  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/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-
-#include "xvid_wce/xvid.h"
-
-typedef struct
-{
-	void *codec;
-	/*no support for scalability in XVID yet*/
-	u16 ES_ID;
-	u32 width, height, out_size, pixel_ar;
-	u32 cb_size, cb_trig;
-	Bool first_frame;
-	s32 base_filters;
-	Float FPS;
-} XVIDDec;
-
-#define XVIDCTX()	XVIDDec *ctx = (XVIDDec *) (ifcg->privateStack)
-
-
-static GF_Err XVID_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	GF_M4VDecSpecInfo dsi;
-	GF_Err e;
-	unsigned char *ptr;
-	unsigned long pitch;
-
-	XVIDCTX();
-
-	if (ctx->ES_ID && ctx->ES_ID!=esd->ESID) return GF_NOT_SUPPORTED;
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*decode DSI*/
-	e = gf_m4v_get_config((char *) esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-	if (e) return e;
-	if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[XviD] Attaching Stream %d - framesize %d x %d\n", esd->ESID, dsi.width, dsi.height ));
-
-	ctx->codec =  InitCodec(dsi.width, dsi.height, GF_4CC('x', 'v', 'i', 'd'));
-	if (!ctx->codec) return GF_OUT_OF_MEM;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[XviD] Decoding DecoderSpecificInfo\n"));
-
-	DecodeFrame(ctx->codec, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, ptr, ptr, ptr, pitch);
-
-	/*note that this may be irrelevant when used through systems (FPS is driven by systems CTS)*/
-	ctx->FPS = dsi.clock_rate;
-	ctx->FPS /= 1000;
-	if (!ctx->FPS) ctx->FPS = 30.0f;
-	ctx->width = dsi.width;
-	ctx->height = dsi.height;
-	ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
-	ctx->pixel_ar = 0;
-	ctx->ES_ID = esd->ESID;
-	ctx->first_frame = 1;
-	/*output in YV12 only - let the player handle conversion*/
-	ctx->out_size = 3 * ctx->width * ctx->height / 2;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[XviD] Decoder setup - output size %d\n", ctx->out_size ));
-	return GF_OK;
-}
-static GF_Err XVID_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	XVIDCTX();
-	if (ctx->ES_ID != ES_ID) return GF_BAD_PARAM;
-	if (ctx->codec) CloseCodec(ctx->codec);
-	ctx->codec = NULL;
-	ctx->ES_ID = 0;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-static GF_Err XVID_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	XVIDCTX();
-
-	switch (capability->CapCode) {
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_FPS:
-		capability->cap.valueFloat = ctx->FPS;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = ctx->cb_trig;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = ctx->cb_size;
-		break;
-	/*by default we use 4 bytes padding (otherwise it happens that XviD crashes on some videos...)*/
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	/*XviD performs frame reordering internally*/
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WANTS_THREAD:
-	{
-		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "XviD", "Threaded");
-		capability->cap.valueInt = (sOpt && stricmp(sOpt, "yes")) ? 1 : 0;
-	}
-	break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err XVID_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-}
-static GF_Err XVID_ProcessData(GF_MediaDecoder *ifcg,
-                               char *inBuffer, u32 inBufferLength,
-                               u16 ES_ID, u32 *CTS,
-                               char *outBuffer, u32 *outBufferLength,
-                               u8 PaddingBits, u32 mmlevel)
-{
-	unsigned char *pY, *pU, *pV;
-	u32 i, uv_w, half_h;
-	unsigned long pitch;
-	XVIDCTX();
-
-	/*check not using scalabilty*/
-	if (ES_ID != ctx->ES_ID) return GF_BAD_PARAM;
-
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	if (!DecodeFrame(ctx->codec, inBuffer, inBufferLength, pY, pU, pV, pitch)) {
-		*outBufferLength = 0;
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	/*dispatch nothing if seeking or droping*/
-	switch (mmlevel) {
-	case GF_CODEC_LEVEL_SEEK:
-	case GF_CODEC_LEVEL_DROP:
-		*outBufferLength = 0;
-		return GF_OK;
-	default:
-		break;
-	}
-	*outBufferLength = ctx->out_size;
-	for (i=0; i<ctx->height; i++) {
-		unsigned char *src = pY + pitch*i;
-		char *dst = outBuffer + ctx->width*i;
-		memcpy(dst, src, sizeof(char) * ctx->width);
-	}
-	outBuffer += ctx->width * ctx->height;
-	half_h = ctx->height/2;
-	uv_w = ctx->width/2;
-	for (i=0; i<half_h; i++) {
-		unsigned char *src = pU + pitch/2*i;
-		char *dst = outBuffer + i*uv_w;
-		memcpy(dst, src, sizeof(char) * uv_w);
-	}
-	outBuffer += ctx->width * ctx->height / 4;
-	for (i=0; i<half_h; i++) {
-		unsigned char *src = pV + pitch/2*i;
-		char *dst = outBuffer + i*uv_w;
-		memcpy(dst, src, sizeof(char) * uv_w);
-	}
-
-	return GF_OK;
-}
-
-static const char *XVID_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "XviD 1.0 for WinCE";
-}
-
-static u32 XVID_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-
-
-GF_BaseDecoder *NewXVIDDec()
-{
-	GF_MediaDecoder *ifcd;
-	XVIDDec *dec;
-
-	ifcd = (GF_MediaDecoder*) gf_malloc(sizeof(GF_MediaDecoder));
-	memset(ifcd, 0, sizeof(GF_MediaDecoder));
-
-	dec = (XVIDDec*) gf_malloc(sizeof(XVIDDec));
-	memset(dec, 0, sizeof(XVIDDec));
-
-	dec->cb_size = 4;
-	dec->cb_trig = 1;
-	/*setup our own interface*/
-	ifcd->AttachStream = XVID_AttachStream;
-	ifcd->DetachStream = XVID_DetachStream;
-	ifcd->GetCapabilities = XVID_GetCapabilities;
-	ifcd->SetCapabilities = XVID_SetCapabilities;
-	ifcd->GetName = XVID_GetCodecName;
-	ifcd->ProcessData = XVID_ProcessData;
-	ifcd->CanHandleStream = XVID_CanHandleStream;
-	ifcd->privateStack = dec;
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "XviD for CE Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteXVIDDec(GF_BaseDecoder *ifcg)
-{
-	XVIDCTX();
-	if (ctx->codec) CloseCodec(ctx->codec);
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *) NewXVIDDec();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_MEDIA_DECODER_INTERFACE:
-		DeleteXVIDDec((GF_BaseDecoder *)ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DECLARATION( xvid_dec_wce )
-
-#ifdef __cplusplus
-}
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce Deleted

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/AUTHORS Deleted

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/CodecAPI.cpp Deleted

@@ -1,114 +0,0 @@
-//----------------------------
-// Symbian codec API
-//
-//----------------------------
-#include "rules.h"
-#include "global.h"
-#include "xvid.h"
-
-#ifdef __SYMBIAN32__
-#include <e32std.h>
-#include <e32base.h>
-//GLDEF_C TInt E32Dll(TDllReason){ return KErrNone; }
-#else
-#endif
-
-
-//----------------------------
-
-struct S_decoder {
-	xvid_dec_frame_t xvid_dec_frame;
-	dword size_x;
-	void *dec_handle;
-};
-
-#define FCC(a, b, c, d) dword((d<<24) | (c<<16) | (b<<8) | a)
-
-//----------------------------
-
-void * InitCodec(dword sx, dword sy, dword fcc) {
-
-	switch(fcc) {
-	case FCC('x', 'v', 'i', 'd'):
-	case FCC('X', 'V', 'I', 'D'):
-	case FCC('D', 'I', 'V', 'X'):
-	case FCC('d', 'i', 'v', 'x'):
-	case FCC('D', 'X', '5', '0'):
-	case FCC('3', 'I', 'V', '2'):
-	case FCC('3', 'i', 'v', '2'):
-	case FCC('3', 'I', 'V', 'X'):
-		break;
-	default:
-		return NULL;
-	}
-	S_decoder *dec = new S_decoder;
-	if (!dec) return NULL;
-	dec->size_x = sx;
-
-	xvid_dec_frame_t &xvid_dec_frame = dec->xvid_dec_frame;
-	MemSet(&xvid_dec_frame, 0, sizeof(xvid_dec_frame));
-	xvid_dec_frame.version = XVID_VERSION;
-	//xvid_dec_frame.general = 0;
-	//convert into true-color, we'll perform convertion to dest format ourselves
-	//xvid_dec_frame.output.csp = XVID_CSP_BGR;
-
-	xvid_gbl_init_t xvid_gbl_init;
-	MemSet(&xvid_gbl_init, 0, sizeof(xvid_gbl_init));
-	xvid_gbl_init.version = XVID_VERSION;
-	xvid_gbl_init.cpu_flags = 0;
-	//xvid_gbl_init.debug = XVID_DEBUG_ERROR | XVID_DEBUG_STARTCODE | XVID_DEBUG_HEADER;
-	xvid_global(NULL, 0, &xvid_gbl_init, NULL);
-
-	xvid_dec_create_t xvid_dec_create;
-	MemSet(&xvid_dec_create, 0, sizeof(xvid_dec_create));
-	xvid_dec_create.version = XVID_VERSION;
-	xvid_dec_create.width = 0;
-	xvid_dec_create.height = 0;
-#ifdef PROFILE
-	xvid_dec_create.prof = &prof;
-#endif
-	xvid_dec_create.width = sx;
-	xvid_dec_create.height = sy;
-
-	int ret = xvid_decore(NULL, XVID_DEC_CREATE, &xvid_dec_create, NULL);
-	if(ret) {
-		delete dec;
-		return NULL;
-	}
-	dec->size_x = sx;
-	dec->dec_handle = xvid_dec_create.handle;
-
-	return dec;
-}
-
-//----------------------------
-
-void CloseCodec(void *handle) {
-	S_decoder *dec = (S_decoder*)handle;
-	xvid_decore(dec->dec_handle, XVID_DEC_DESTROY, NULL, NULL);
-	delete dec;
-}
-
-//----------------------------
-
-int DecodeFrame(void *handle, const void *buf, dword sz_in, byte *&y, byte *&u, byte *&v, dword &pitch) {
-
-	S_decoder *dec = (S_decoder*)handle;
-
-	dec->xvid_dec_frame.bitstream = buf;
-	dec->xvid_dec_frame.length = sz_in;
-	xvid_decore(dec->dec_handle, XVID_DEC_DECODE, &dec->xvid_dec_frame, NULL);
-
-	const C_xvid_image *img = dec->xvid_dec_frame.img_out;
-	if(!img)
-		return 0;
-
-	y = img->y;
-	u = img->u;
-	v = img->v;
-	int mb_width = (dec->size_x + 15) / 16;
-	pitch = 16 * mb_width + 2 * EDGE_SIZE;
-	return 1;
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/LICENSE Deleted

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-&#xc;
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-&#xc;
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-&#xc;
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-&#xc;
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-&#xc;
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/README Deleted

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/ReadMe.txt Deleted

@@ -1,65 +0,0 @@
-This is a port of the XviD decoder for symbian and PocketPC OS. It was found by luck on the net at http://www.lonelycatgames.com/mobile/smartmovie/
-
-Symbian codec system:
-
-//----------------------------
-General rules:
-- All codecs are located in c:\system\codecs on target device
-- Each codec is single native DLL
-- One codec may support one or more video formats
-- Formats are identified by 32-bit fourcc code
-
-//----------------------------
-Codec API:
-
-Codec DLL need to have following functions exported:
-
-Function    Ordinal
-InitCodec      1
-CloseCodec     2
-DecodeFrame    3
-
-Because Symbian DLL doesn't support exporting DLL functions by name, exported functions
-must have ordinals as specified in above table.
-
-//----------------------------
-Detailed API definition:
-
-void *InitCodec(dword sx, dword sy, dword fcc);
-Initialize codec, using provided fcc code and dimensions of video image.
-Parameters:
-   [IN] sx, sy - resolution of video image (width, height)
-   [IN] fcc - Four-cc code of video stream
-Return value:
-   pointer to decoder handle (passed to other functions), or NULL if fourcc code is not supported by codec
-
-//----------------------------
-void CloseCodec(void *handle);
-Close codec, unitinialize memory, etc.
-Parameters:
-   [IN] handle - handle value obtained by InitCodec function
-
-//----------------------------
-int DecodeFrame(void *handle, const void *buf, dword sz_in, const byte *&y, const byte *&u, const byte *&v, dword &pitch);
-Decode single frame. The frame data may depend on previous frame data passed in by previous call to this function.
-It is safe to call this function with data of non-contiguous frame, for example when seeking, provided that
-the frame is a keyframe - i.e. contains data for entire image.
-Parameters:
-   [IN] handle - handle value obtained by InitCodec function
-   [IN] buf - pointer to bitstream buffer
-   [IN] sz_in - size of 'buf' buffer data
-   [OUT] y, u, v - pointer references filled with YUV to YUV data of decoded frame when the call returns; these
-      pointers are valid until next call to DecodeFrame or CloseCodec functions
-   [OUT] pitch - size of image line, in bytes (for Y array; U and V arrays have half pitch of Y, because UV is
-      coded only for each 4x4 pixel block
-Return value:
-   0 - frame was not decoded (i.e. preroll frame); pointers y, u, v are not filled
-   1 - frame was decoded, contains packed YUV data
-   2 - frame was decoded, contains interleaved RGB data, returned in 'y' pointer
-
-//----------------------------
-
-Note:
-The source project is built in Microsoft Visual C++ 6 environment.
-It is assumed that Symbian Series60 SDK is installed in C:\Symbian\6.1\Series60\Epoc32
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/Rules.h Deleted

@@ -1,66 +0,0 @@
-#ifndef __RULES_H
-#define __RULES_H
-
-/*----------------------------
-   Copyright (c) Lonely Cat Games  All rights reserved.
-   General types required for compilation of Insanity group of libraries.
-----------------------------*/
-//warning settings for MS compiler
-#ifdef _MSC_VER
-
-#pragma warning(disable: 4786)//trunc symbols to 255 chars
-#pragma warning(disable: 4530)//exception handling
-#pragma warning(disable: 4800)//exception handling
-#pragma warning(disable: 4096)//exception handling
-#pragma warning(disable: 4100)//unreferenced formal parameter
-#pragma warning(disable: 4505)//unreferenced local function has been removed
-#pragma warning(disable: 4514)//unreferenced inline function has been removed
-#pragma warning(disable: 4663)//C++ error in std headers
-#pragma warning(disable: 4710)//function not inlined
-#pragma warning(disable: 4201)//nonstandard extension with unnamed structs
-#pragma warning(disable: 4244)//conversion from ??? to ???, possible loss of data
-#pragma warning(disable: 4146)//unary minus operator applied to unsigned type, result still unsigned
-#pragma warning(disable: 4284)//C++...
-#pragma warning(disable: 4290)//C++ Exception Specification ignored
-#pragma warning(disable: 4127)//conditional expression is constant
-#pragma warning(disable: 4663)//C++ language change...
-#pragma warning(disable: 4702)//unreachable code
-#pragma warning(disable: 4511)//copy constructor could not be generated
-#pragma warning(disable: 4512)//assignment operator could not be generated
-#pragma warning(disable: 4711)//function selected for automatic inline expansion
-
-
-
-//level4 warnings:
-#pragma warning(3: 4189)      //local variable is initialized but not referenced
-#pragma warning(3: 4305)      //truncation from const double to float
-//#pragma warning(3: 4244)      //conversion from ??? to ???, possible loss of data
-#pragma warning(3: 4245)      //signed/unsigned mismatch
-#pragma warning(3: 4018)      //signed/unsigned mismatch
-#pragma warning(3: 4706)      //assignment within conditional expression
-#pragma warning(3: 4701)      //local variable may be used without having been initialized
-#pragma warning(3: 4211)      //nonstandard extension used : redefined extern to static
-#pragma warning(3: 4310)      //cast truncates constant value
-
-#endif
-
-//----------------------------
-
-typedef unsigned char byte;
-typedef signed char schar;
-typedef unsigned short word;
-typedef unsigned long dword;
-typedef unsigned long ulong;
-
-#ifndef _SIZE_T_DEFINED_
-#define _SIZE_T_DEFINED_
-typedef unsigned size_t;
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-//----------------------------
-
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/TODO Deleted

@@ -1,52 +0,0 @@
-TODO
-====
-
-This file lists the TODO items stll pending for the 1.0 release.
-
-
-Active Items to work on:
-------------------------
-
-* update vfw & dshow decoder frontends
-  - GUI isn't perfect for vfw
-* update/fix CBR plugin
-  - misses target bitrate, bitrate burst in static motion/high motion
-    transitions
-* bug hunting (ed.gomez/syskin)
-  - xvidcore is still a place where bugs feel confortable
-* docbook writing (every developer should contribute)
-  - New API has to be documented.
-* two pass code should not introduce quality regressions (every tester)
-  - first feedback proved kfthresholding was hurting quality, a
-    decision on its behavior has to be settled.   
-* MMX MPEG4 quantization is unprecise. This is probably an inherent
-  problem in some MMX opcode precision.
-
-
-Already completed items:
-------------------------
-
-* remove divx4 api (ed.gomez)
-* remove VOP_TYPE enumerations (peter)
-* remove HINTed ME stuff (ed.gomez)
-* xvid_image_t/xvid_gbl_convert_t (peter)
-* xvid_global structs (peter)
-* errors codes (peter)
-* xvid_decoder structs (peter)
-* apply encoder api changes "HEAPS" (peter)
-* rawdec (use xvid_decraw instead) (ed.gomez)
-* Support for GMC 3 warp points (christoph)
-* New Qpel code (michael)
-* ME splitting and ME improvements (syskin)
-* New unix build process (ed.gomez)
-* New thread/instance safe sse2 code (p.massimino)
-* INSTALL guide for Unix and Win32 (ed.gomez)
-* dshow static link to libxvidcore.lib (peter)
-* update/fix Lumimasking (syskin)
-* trellis for mpeg and relaxed optimization for big levels (skal)
-* thread safe mpeg quantizing (michael)
-* Interlacing for bvop and svop (syskin)
-* YV12/I420/USER clarification (christoph)
-* vfw and dshow link dynamically to xvidcore.dll (syskin)
-
-Last edited: $Date: 2005-07-13 14:36:16 $

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/bitstream.cpp Deleted

@@ -1,1104 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Bitstream reader/writer -
- *
- *  Copyright (C) 2001-2003 Peter Ross <pross@xvid.org>
- *                     2003 Cristoph Lampert <gruel@web.de>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: bitstream.cpp,v 1.1.1.1 2005-07-13 14:36:12 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "bitstream.h"
-#include "quant_matrix.h"
-
-#ifdef WIN32
-#include <stdio.h>
-#endif
-
-//----------------------------
-
-inline dword ByteSwap(dword a) {
-	return (a<<24) | ((a&0xff00) << 8) | ((a&0xff0000) >> 8) | (a>>24);
-}
-
-//----------------------------
-
-void Bitstream::Init(const void *bitstream, dword _length) {
-
-	dword adjbitstream = (dword)bitstream;
-
-	/*
-	 * Start the stream on a dword boundary, by rounding down to the
-	 * previous dword and skipping the intervening bytes.
-	 */
-	long bitpos = ((sizeof(dword)-1) & (long)bitstream);
-	adjbitstream = adjbitstream - bitpos;
-	start = tail = (dword *) adjbitstream;
-
-	if(_length) {
-		dword tmp = *start;
-#ifndef ARCH_IS_BIG_ENDIAN
-		tmp = ByteSwap(tmp);
-#endif
-		bufa = tmp;
-		if(_length>4) {
-			tmp = *(start + 1);
-#ifndef ARCH_IS_BIG_ENDIAN
-			tmp = ByteSwap(tmp);
-#endif
-			bufb = tmp;
-		} else
-			bufb = 0;
-	} else
-		bufa = bufb = 0;
-
-	buf = 0;
-	pos = initpos = bitpos*8;
-	length = _length;
-}
-
-//---------------------------
-
-/* reads n bits from bitstream without changing the stream pos */
-
-dword Bitstream::ShowBits(dword bits) {
-
-	int nbit = (bits + pos) - 32;
-	if(nbit > 0)
-		return ((bufa & (0xffffffff >> pos)) << nbit) | (bufb >> (32 - nbit));
-	return (bufa & (0xffffffff >> pos)) >> (32 - pos - bits);
-}
-
-//---------------------------
-// skip n bits forward in bitstream
-void Bitstream::Skip(dword bits) {
-
-	pos += bits;
-	if(pos >= 32) {
-		dword tmp;
-
-		bufa = bufb;
-		tmp = *((dword *) tail + 2);
-#ifndef ARCH_IS_BIG_ENDIAN
-		tmp = ByteSwap(tmp);
-#endif
-		bufb = tmp;
-		tail++;
-		pos -= 32;
-	}
-}
-
-//---------------------------
-/* show nbits from next byte alignment */
-dword Bitstream::ShowBitsFromByteAlign(int bits) {
-
-	int bspos = pos + NumBitsToByteAlign();
-	int nbit = (bits + bspos) - 32;
-
-	if (bspos >= 32) {
-		return bufb >> (32 - nbit);
-	} else   if (nbit > 0) {
-		return ((bufa & (0xffffffff >> bspos)) << nbit) | (bufb >> (32 - nbit));
-	} else {
-		return (bufa & (0xffffffff >> bspos)) >> (32 - bspos - bits);
-	}
-
-}
-
-//---------------------------
-/* read n bits from bitstream */
-dword Bitstream::GetBits(dword n) {
-	dword ret = ShowBits(n);
-	Skip(n);
-	return ret;
-}
-
-//---------------------------
-
-static const dword intra_dc_threshold_table[] = {
-	32,                     /* never use */
-	13,
-	15,
-	17,
-	19,
-	21,
-	23,
-	1,
-};
-
-//----------------------------
-
-void Bitstream::get_matrix(byte * matrix) {
-
-	int i = 0;
-	int last, value = 0;
-
-	do {
-		last = value;
-		value = GetBits(8);
-		matrix[scan_tables[0][i++]] = value;
-	}
-	while (value != 0 && i < 64);
-	i--;    /* fix little bug at coeff not full */
-
-	while (i < 64) {
-		matrix[scan_tables[0][i++]] = last;
-	}
-}
-
-//----------------------------
-/*
- * for PVOP addbits == fcode - 1
- * for BVOP addbits == max(fcode,bcode) - 1
- * returns mbpos
- */
-int S_decoder::read_video_packet_header(Bitstream *bs, const int addbits, int *quant, int *fcode_forward, int *fcode_backward, int *intra_dc_threshold) {
-
-	int startcode_bits = NUMBITS_VP_RESYNC_MARKER + addbits;
-	int mbnum_bits = log2bin(mb_width *  mb_height - 1);
-	int mbnum;
-	int hec = 0;
-
-	bs->Skip(bs->NumBitsToByteAlign());
-	bs->Skip(startcode_bits);
-
-	DPRINTF(XVID_DEBUG_STARTCODE, "<video_packet_header>\n");
-
-	if (shape != VIDOBJLAY_SHAPE_RECTANGULAR)
-	{
-		hec = bs->GetBit();     /* header_extension_code */
-		if (hec && !(sprite_enable == SPRITE_STATIC /* && current_coding_type = I_VOP */))
-		{
-			bs->Skip(13);        /* vop_width */
-			READ_MARKER();
-			bs->Skip(13);        /* vop_height */
-			READ_MARKER();
-			bs->Skip(13);        /* vop_horizontal_mc_spatial_ref */
-			READ_MARKER();
-			bs->Skip(13);        /* vop_vertical_mc_spatial_ref */
-			READ_MARKER();
-		}
-	}
-
-	mbnum = bs->GetBits(mbnum_bits);    /* macroblock_number */
-	DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);
-
-	if (shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
-	{
-		*quant = bs->GetBits(quant_bits);   /* quant_scale */
-		DPRINTF(XVID_DEBUG_HEADER, "quant %i\n", *quant);
-	}
-
-	if (shape == VIDOBJLAY_SHAPE_RECTANGULAR)
-		hec = bs->GetBit();     /* header_extension_code */
-
-
-	DPRINTF(XVID_DEBUG_HEADER, "header_extension_code %i\n", hec);
-	if (hec)
-	{
-		int time_base;
-		int time_increment = 0;
-		int coding_type;
-
-		for (time_base=0; bs->GetBit()!=0; time_base++);      /* modulo_time_base */
-		READ_MARKER();
-		if (time_inc_bits)
-			time_increment = (bs->GetBits(time_inc_bits));  /* vop_time_increment */
-		READ_MARKER();
-		//DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment);
-
-		coding_type = bs->GetBits(2);
-		DPRINTF(XVID_DEBUG_HEADER,"coding_type %i\n", coding_type);
-
-		if (shape != VIDOBJLAY_SHAPE_RECTANGULAR)
-		{
-			bs->Skip(1);   /* change_conv_ratio_disable */
-			if (coding_type != I_VOP)
-				bs->Skip(1);   /* vop_shape_coding_type */
-		}
-
-		if (shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
-		{
-			*intra_dc_threshold = intra_dc_threshold_table[bs->GetBits(3)];
-
-			if (sprite_enable == SPRITE_GMC && coding_type == S_VOP &&
-			        sprite_warping_points > 0)
-			{
-				/* TODO: sprite trajectory */
-			}
-			if(reduced_resolution_enable && shape == VIDOBJLAY_SHAPE_RECTANGULAR && (coding_type == P_VOP || coding_type == I_VOP)) {
-				bs->Skip(1); /* XXX: vop_reduced_resolution */
-			}
-
-			if (coding_type != I_VOP && fcode_forward)
-			{
-				*fcode_forward = bs->GetBits(3);
-				DPRINTF(XVID_DEBUG_HEADER,"fcode_forward %i\n", *fcode_forward);
-			}
-
-			if (coding_type == B_VOP && fcode_backward)
-			{
-				*fcode_backward = bs->GetBits(3);
-				DPRINTF(XVID_DEBUG_HEADER,"fcode_backward %i\n", *fcode_backward);
-			}
-		}
-
-	}
-
-	if (newpred_enable) {
-		int vop_id;
-		int vop_id_for_prediction;
-
-		vop_id = bs->GetBits(MIN(time_inc_bits + 3, 15));
-		DPRINTF(XVID_DEBUG_HEADER, "vop_id %i\n", vop_id);
-		if (bs->GetBit()) /* vop_id_for_prediction_indication */
-		{
-			vop_id_for_prediction = bs->GetBits(MIN(time_inc_bits + 3, 15));
-			DPRINTF(XVID_DEBUG_HEADER, "vop_id_for_prediction %i\n", vop_id_for_prediction);
-		}
-		READ_MARKER();
-	}
-
-	return mbnum;
-}
-
-//----------------------------
-/* vol estimation header */
-void S_decoder::read_vol_complexity_estimation_header(Bitstream * bs) {
-
-	ESTIMATION * e = &estimation;
-
-	e->method = bs->GetBits(2);   /* estimation_method */
-	DPRINTF(XVID_DEBUG_HEADER,"+ complexity_estimation_header; method=%i\n", e->method);
-
-	if (e->method == 0 || e->method == 1) {
-		if(!bs->GetBit()) {
-			//shape_complexity_estimation_disable
-			e->opaque = bs->GetBit();     /* opaque */
-			e->transparent = bs->GetBit();      /* transparent */
-			e->intra_cae = bs->GetBit();     /* intra_cae */
-			e->inter_cae = bs->GetBit();     /* inter_cae */
-			e->no_update = bs->GetBit();     /* no_update */
-			e->upsampling = bs->GetBit();    /* upsampling */
-		}
-
-		if (!bs->GetBit())   /* texture_complexity_estimation_set_1_disable */
-		{
-			e->intra_blocks = bs->GetBit();     /* intra_blocks */
-			e->inter_blocks = bs->GetBit();     /* inter_blocks */
-			e->inter4v_blocks = bs->GetBit();      /* inter4v_blocks */
-			e->not_coded_blocks = bs->GetBit();    /* not_coded_blocks */
-		}
-	}
-
-	READ_MARKER();
-
-	if (!bs->GetBit()) {
-		//texture_complexity_estimation_set_2_disable
-		e->dct_coefs = bs->GetBit();     /* dct_coefs */
-		e->dct_lines = bs->GetBit();     /* dct_lines */
-		e->vlc_symbols = bs->GetBit();      /* vlc_symbols */
-		e->vlc_bits = bs->GetBit();      /* vlc_bits */
-	}
-
-	if (!bs->GetBit()) {
-		//motion_compensation_complexity_disable
-		e->apm = bs->GetBit();     /* apm */
-		e->npm = bs->GetBit();     /* npm */
-		e->interpolate_mc_q = bs->GetBit();    /* interpolate_mc_q */
-		e->forw_back_mc_q = bs->GetBit();      /* forw_back_mc_q */
-		e->halfpel2 = bs->GetBit();      /* halfpel2 */
-		e->halfpel4 = bs->GetBit();      /* halfpel4 */
-	}
-
-	READ_MARKER();
-
-	if (e->method == 1) {
-		if (!bs->GetBit()) {
-			//version2_complexity_estimation_disable
-			e->sadct = bs->GetBit();      /* sadct */
-			e->quarterpel = bs->GetBit();    /* quarterpel */
-		}
-	}
-}
-
-//----------------------------
-/* vop estimation header */
-void S_decoder::read_vop_complexity_estimation_header(Bitstream * bs, int coding_type) {
-
-	ESTIMATION * e = &estimation;
-
-	if (e->method == 0 || e->method == 1)
-	{
-		if (coding_type == I_VOP) {
-			if (e->opaque)    bs->Skip(8);   /* dcecs_opaque */
-			if (e->transparent) bs->Skip(8); /* */
-			if (e->intra_cae) bs->Skip(8);   /* */
-			if (e->inter_cae) bs->Skip(8);   /* */
-			if (e->no_update) bs->Skip(8);   /* */
-			if (e->upsampling)   bs->Skip(8);   /* */
-			if (e->intra_blocks) bs->Skip(8);   /* */
-			if (e->not_coded_blocks) bs->Skip(8);  /* */
-			if (e->dct_coefs) bs->Skip(8);   /* */
-			if (e->dct_lines) bs->Skip(8);   /* */
-			if (e->vlc_symbols) bs->Skip(8); /* */
-			if (e->vlc_bits)  bs->Skip(8);   /* */
-			if (e->sadct)     bs->Skip(8);   /* */
-		}
-
-		if (coding_type == P_VOP) {
-			if (e->opaque) bs->Skip(8);      /* */
-			if (e->transparent) bs->Skip(8); /* */
-			if (e->intra_cae) bs->Skip(8);   /* */
-			if (e->inter_cae) bs->Skip(8);   /* */
-			if (e->no_update) bs->Skip(8);   /* */
-			if (e->upsampling) bs->Skip(8);  /* */
-			if (e->intra_blocks) bs->Skip(8);   /* */
-			if (e->not_coded_blocks)   bs->Skip(8);   /* */
-			if (e->dct_coefs) bs->Skip(8);   /* */
-			if (e->dct_lines) bs->Skip(8);   /* */
-			if (e->vlc_symbols) bs->Skip(8); /* */
-			if (e->vlc_bits)  bs->Skip(8);   /* */
-			if (e->inter_blocks) bs->Skip(8);   /* */
-			if (e->inter4v_blocks) bs->Skip(8); /* */
-			if (e->apm)       bs->Skip(8);   /* */
-			if (e->npm)       bs->Skip(8);   /* */
-			if (e->forw_back_mc_q) bs->Skip(8); /* */
-			if (e->halfpel2)  bs->Skip(8);   /* */
-			if (e->halfpel4)  bs->Skip(8);   /* */
-			if (e->sadct)     bs->Skip(8);   /* */
-			if (e->quarterpel)   bs->Skip(8);   /* */
-		}
-		if (coding_type == B_VOP) {
-			if (e->opaque)    bs->Skip(8);   /* */
-			if (e->transparent)  bs->Skip(8);   /* */
-			if (e->intra_cae) bs->Skip(8);   /* */
-			if (e->inter_cae) bs->Skip(8);   /* */
-			if (e->no_update) bs->Skip(8);   /* */
-			if (e->upsampling)   bs->Skip(8);   /* */
-			if (e->intra_blocks) bs->Skip(8);   /* */
-			if (e->not_coded_blocks) bs->Skip(8);  /* */
-			if (e->dct_coefs) bs->Skip(8);   /* */
-			if (e->dct_lines) bs->Skip(8);   /* */
-			if (e->vlc_symbols)  bs->Skip(8);   /* */
-			if (e->vlc_bits)  bs->Skip(8);   /* */
-			if (e->inter_blocks) bs->Skip(8);   /* */
-			if (e->inter4v_blocks) bs->Skip(8); /* */
-			if (e->apm)       bs->Skip(8);   /* */
-			if (e->npm)       bs->Skip(8);   /* */
-			if (e->forw_back_mc_q) bs->Skip(8); /* */
-			if (e->halfpel2)  bs->Skip(8);   /* */
-			if (e->halfpel4)  bs->Skip(8);   /* */
-			if (e->interpolate_mc_q) bs->Skip(8);  /* */
-			if (e->sadct)     bs->Skip(8);   /* */
-			if (e->quarterpel)   bs->Skip(8);   /* */
-		}
-
-		if (coding_type == S_VOP && sprite_enable == SPRITE_STATIC) {
-			if (e->intra_blocks) bs->Skip(8);   /* */
-			if (e->not_coded_blocks) bs->Skip(8);  /* */
-			if (e->dct_coefs) bs->Skip(8);   /* */
-			if (e->dct_lines) bs->Skip(8);   /* */
-			if (e->vlc_symbols)  bs->Skip(8);   /* */
-			if (e->vlc_bits)  bs->Skip(8);   /* */
-			if (e->inter_blocks) bs->Skip(8);   /* */
-			if (e->inter4v_blocks)  bs->Skip(8);   /* */
-			if (e->apm)       bs->Skip(8);   /* */
-			if (e->npm)       bs->Skip(8);   /* */
-			if (e->forw_back_mc_q)  bs->Skip(8);   /* */
-			if (e->halfpel2)  bs->Skip(8);   /* */
-			if (e->halfpel4)  bs->Skip(8);   /* */
-			if (e->interpolate_mc_q) bs->Skip(8);  /* */
-		}
-	}
-}
-
-//----------------------------
-// decode headers
-// returns coding_type, or -1 if error
-
-#define VIDOBJ_START_CODE_MASK      0x0000001f
-#define VIDOBJLAY_START_CODE_MASK   0x0000000f
-
-int S_decoder::BitstreamReadHeaders(Bitstream * bs, bool &rounding, bool *reduced_resolution, dword *quant, dword *fcode_forward,
-                                    dword *fcode_backward, dword *intra_dc_threshold, WARPPOINTS *gmc_warp) {
-
-	dword vol_ver_id;
-	dword coding_type;
-	dword start_code;
-	dword time_incr = 0;
-	int time_increment = 0;
-	int resize = 0;
-
-	while((bs->Pos() >> 3) < bs->length) {
-		bs->ByteAlign();
-		start_code = bs->ShowBits(32);
-
-		switch(start_code) {
-		case VISOBJSEQ_START_CODE:
-		{
-			DPRINTF(XVID_DEBUG_STARTCODE, "<visual_object_sequence>\n");
-
-			bs->Skip(32);     //visual_object_sequence_start_code
-			int profile = bs->GetBits(8);  //profile_and_level_indication
-
-			DPRINTF(XVID_DEBUG_HEADER, "profile_and_level_indication %i\n", profile);
-		}
-		break;
-		case VISOBJSEQ_STOP_CODE:
-		{
-			//visual_object_sequence_stop_code
-			bs->Skip(32);
-			DPRINTF(XVID_DEBUG_STARTCODE, "</visual_object_sequence>\n");
-
-		}
-		break;
-		case VISOBJ_START_CODE:
-		{
-			DPRINTF(XVID_DEBUG_STARTCODE, "<visual_object>\n");
-
-			bs->Skip(32);  //visual_object_start_code
-
-			int visobj_ver_id;
-			//is_visual_object_identified
-			if(bs->GetBit()) {
-				visobj_ver_id = bs->GetBits(4);  /* visual_object_ver_id */
-				DPRINTF(XVID_DEBUG_HEADER,"visobj_ver_id %i\n", visobj_ver_id);
-				bs->Skip(3);   //visual_object_priority
-			} else {
-				visobj_ver_id = 1;
-			}
-
-			if(bs->ShowBits(4) != VISOBJ_TYPE_VIDEO) {
-				//visual_object_type
-				DPRINTF(XVID_DEBUG_ERROR, "visual_object_type != video\n");
-				return -1;
-			}
-			bs->Skip(4);
-			//video_signal_type
-
-			if(bs->GetBit()) {
-				DPRINTF(XVID_DEBUG_HEADER,"+ video_signal_type\n");
-				bs->Skip(3);   /* video_format */
-				bs->Skip(1);   /* video_range */
-				if (bs->GetBit()) /* color_description */
-				{
-					DPRINTF(XVID_DEBUG_HEADER,"+ color_description");
-					bs->Skip(8);   /* color_primaries */
-					bs->Skip(8);   /* transfer_characteristics */
-					bs->Skip(8);   /* matrix_coefficients */
-				}
-			}
-		}
-		break;
-		case GRPOFVOP_START_CODE:
-		{
-			DPRINTF(XVID_DEBUG_STARTCODE, "<group_of_vop>\n");
-
-			bs->Skip(32);
-			{
-				int hours, minutes, seconds;
-
-				hours = bs->GetBits(5);
-				minutes = bs->GetBits(6);
-				READ_MARKER();
-				seconds = bs->GetBits(6);
-				//DPRINTF(XVID_DEBUG_HEADER, "time %ih%im%is\n", hours,minutes,seconds);
-			}
-			bs->Skip(1);   /* closed_gov */
-			bs->Skip(1);   /* broken_link */
-		}
-		break;
-		case VOP_START_CODE:
-		{
-
-			DPRINTF(XVID_DEBUG_STARTCODE, "<vop>\n");
-
-			bs->Skip(32);  /* vop_start_code */
-
-			coding_type = bs->GetBits(2); /* vop_coding_type */
-			DPRINTF(XVID_DEBUG_HEADER, "coding_type %i\n", coding_type);
-
-			/*********************** for decode B-frame time ***********************/
-			while (bs->GetBit() != 0)  /* time_base */
-				time_incr++;
-
-			READ_MARKER();
-
-			if (time_inc_bits) {
-				time_increment = (bs->GetBits(time_inc_bits));  /* vop_time_increment */
-			}
-
-			DPRINTF(XVID_DEBUG_HEADER, "time_base %i\n", time_incr);
-			DPRINTF(XVID_DEBUG_HEADER, "time_increment %i\n", time_increment);
-
-			//DPRINTF(XVID_DEBUG_TIMECODE, "%c %i:%i\n", coding_type == I_VOP ? 'I' : coding_type == P_VOP ? 'P' : coding_type == B_VOP ? 'B' : 'S', time_incr, time_increment);
-			if (coding_type != B_VOP) {
-				last_time_base = time_base;
-				time_base += time_incr;
-				time = time_increment;
-
-#if 0
-				time_base * time_inc_resolution +
-				time_increment;
-#endif
-				time_pp = (dword)
-				          (time_inc_resolution + time - last_non_b_time)%time_inc_resolution;
-				last_non_b_time = time;
-			} else {
-				time = time_increment;
-#if 0
-				(last_time_base +
-				 time_incr) * time_inc_resolution + time_increment;
-#endif
-				time_bp = (dword)
-				          (time_inc_resolution + last_non_b_time - time)%time_inc_resolution;
-			}
-			DPRINTF(XVID_DEBUG_HEADER,"time_pp=%i\n", time_pp);
-			DPRINTF(XVID_DEBUG_HEADER,"time_bp=%i\n", time_bp);
-
-			READ_MARKER();
-
-			if (!bs->GetBit())   /* vop_coded */
-			{
-				DPRINTF(XVID_DEBUG_HEADER, "vop_coded==false\n");
-				return N_VOP;
-			}
-
-			if (newpred_enable) {
-				int vop_id;
-				int vop_id_for_prediction;
-
-				vop_id = bs->GetBits(MIN(time_inc_bits + 3, 15));
-				DPRINTF(XVID_DEBUG_HEADER, "vop_id %i\n", vop_id);
-				if (bs->GetBit()) /* vop_id_for_prediction_indication */
-				{
-					vop_id_for_prediction = bs->GetBits(MIN(time_inc_bits + 3, 15));
-					DPRINTF(XVID_DEBUG_HEADER, "vop_id_for_prediction %i\n", vop_id_for_prediction);
-				}
-				READ_MARKER();
-			}
-
-			//fix a little bug by MinChen <chenm002@163.com>
-			if((shape != VIDOBJLAY_SHAPE_BINARY_ONLY) &&
-			        ((coding_type == P_VOP) || (coding_type == S_VOP && sprite_enable == SPRITE_GMC))) {
-				rounding = !!bs->GetBit();  //rounding_type
-				DPRINTF(XVID_DEBUG_HEADER, "rounding %i\n", rounding);
-			}
-
-			if(reduced_resolution_enable && shape == VIDOBJLAY_SHAPE_RECTANGULAR && (coding_type == P_VOP || coding_type == I_VOP)) {
-
-				*reduced_resolution = !!bs->GetBit();
-				DPRINTF(XVID_DEBUG_HEADER, "reduced_resolution %i\n", *reduced_resolution);
-			} else {
-				*reduced_resolution = false;
-			}
-
-			if (shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
-				if(!(sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {
-
-					dword width, height;
-					dword horiz_mc_ref, vert_mc_ref;
-
-					width = bs->GetBits(13);
-					READ_MARKER();
-					height = bs->GetBits(13);
-					READ_MARKER();
-					horiz_mc_ref = bs->GetBits(13);
-					READ_MARKER();
-					vert_mc_ref = bs->GetBits(13);
-					READ_MARKER();
-
-					DPRINTF(XVID_DEBUG_HEADER, "width %i\n", width);
-					DPRINTF(XVID_DEBUG_HEADER, "height %i\n", height);
-					DPRINTF(XVID_DEBUG_HEADER, "horiz_mc_ref %i\n", horiz_mc_ref);
-					DPRINTF(XVID_DEBUG_HEADER, "vert_mc_ref %i\n", vert_mc_ref);
-				}
-
-				bs->Skip(1);   /* change_conv_ratio_disable */
-				if (bs->GetBit()) /* vop_constant_alpha */
-				{
-					bs->Skip(8);   /* vop_constant_alpha_value */
-				}
-			}
-
-			if (shape != VIDOBJLAY_SHAPE_BINARY_ONLY) {
-
-				if (!complexity_estimation_disable)
-				{
-					read_vop_complexity_estimation_header(bs, coding_type);
-				}
-
-				/* intra_dc_vlc_threshold */
-				*intra_dc_threshold =
-				    intra_dc_threshold_table[bs->GetBits(3)];
-
-				top_field_first = 0;
-				alternate_vertical_scan = 0;
-
-				if(interlacing) {
-					top_field_first = bs->GetBit();
-					DPRINTF(XVID_DEBUG_HEADER, "interlace top_field_first %i\n", top_field_first);
-					alternate_vertical_scan = bs->GetBit();
-					DPRINTF(XVID_DEBUG_HEADER, "interlace alternate_vertical_scan %i\n", alternate_vertical_scan);
-
-				}
-			}
-
-			if ((sprite_enable == SPRITE_STATIC || sprite_enable== SPRITE_GMC) && coding_type == S_VOP) {
-
-				int i;
-
-				for (i = 0 ; i < sprite_warping_points; i++)
-				{
-					int length;
-					int x = 0, y = 0;
-
-					/* sprite code borowed from ffmpeg; thx Michael Niedermayer <michaelni@gmx.at> */
-					length = bs->bs_get_spritetrajectory();
-					if(length) {
-						x= bs->GetBits(length);
-						if ((x >> (length - 1)) == 0) /* if MSB not set it is negative*/
-							x = - (x ^ ((1 << length) - 1));
-					}
-					READ_MARKER();
-
-					length = bs->bs_get_spritetrajectory();
-					if(length) {
-						y = bs->GetBits(length);
-						if ((y >> (length - 1)) == 0) /* if MSB not set it is negative*/
-							y = - (y ^ ((1 << length) - 1));
-					}
-					READ_MARKER();
-
-					gmc_warp->duv[i].x = x;
-					gmc_warp->duv[i].y = y;
-
-					//DPRINTF(XVID_DEBUG_HEADER,"sprite_warping_point[%i] xy=(%i,%i)\n", i, x, y);
-				}
-
-				if (sprite_brightness_change)
-				{
-					/* XXX: brightness_change_factor() */
-				}
-				if (sprite_enable == SPRITE_STATIC)
-				{
-					/* XXX: todo */
-				}
-
-			}
-
-			if ((*quant = bs->GetBits(quant_bits)) < 1)  /* vop_quant */
-				*quant = 1;
-			DPRINTF(XVID_DEBUG_HEADER, "quant %i\n", *quant);
-
-			if (coding_type != I_VOP) {
-				*fcode_forward = bs->GetBits(3); /* fcode_forward */
-				DPRINTF(XVID_DEBUG_HEADER, "fcode_forward %i\n", *fcode_forward);
-			}
-
-			if (coding_type == B_VOP) {
-				*fcode_backward = bs->GetBits(3);   /* fcode_backward */
-				DPRINTF(XVID_DEBUG_HEADER, "fcode_backward %i\n", *fcode_backward);
-			}
-			if(!scalability) {
-				if ((shape != VIDOBJLAY_SHAPE_RECTANGULAR) &&
-				        (coding_type != I_VOP)) {
-					bs->Skip(1);   /* vop_shape_coding_type */
-				}
-			}
-			return coding_type;
-
-		}
-		break;
-		case USERDATA_START_CODE:
-		{
-			char tmp[256];
-			int i;
-
-			bs->Skip(32);  /* user_data_start_code */
-
-			tmp[0] = bs->ShowBits(8);
-
-			for(i = 1; i < 256; i++) {
-				tmp[i] = (bs->ShowBits(16) & 0xFF);
-
-				if(tmp[i] == 0)
-					break;
-
-				bs->Skip(8);
-			}
-
-			//DPRINTF(XVID_DEBUG_STARTCODE, "<user_data>: %s\n", tmp);
-
-			/* read xvid bitstream version */
-#ifdef WIN32
-			{
-				char packed;
-				int version, build;
-				if(MemCmp(tmp, "XviD", 4) == 0) {
-					sscanf(tmp, "XviD%d", &bs_version);
-					DPRINTF(XVID_DEBUG_HEADER, "xvid bitstream version=%i", bs_version);
-				}
-
-				/* divx detection */
-				i = sscanf(tmp, "DivX%dBuild%d%c", &version, &build, &packed);
-				if (i < 2)
-					i = sscanf(tmp, "DivX%db%d%c", &version, &build, &packed);
-				if (i >= 2) {
-					packed_mode = (i == 3 && packed == 'p');
-					//DPRINTF(XVID_DEBUG_HEADER, "divx version=%i, build=%i packed=%i\n", version, build, packed_mode);
-				}
-			}
-#endif
-		}
-		break;
-		default:
-			switch(start_code & ~VIDOBJ_START_CODE_MASK) {
-			case VIDOBJ_START_CODE:
-			{
-
-				DPRINTF(XVID_DEBUG_STARTCODE, "<video_object>\n");
-				DPRINTF(XVID_DEBUG_HEADER, "vo id %i\n", start_code & VIDOBJ_START_CODE_MASK);
-				//video_object_start_code
-				bs->Skip(32);
-			}
-			break;
-			case VIDOBJLAY_START_CODE:
-			{
-
-				DPRINTF(XVID_DEBUG_STARTCODE, "<video_object_layer>\n");
-				DPRINTF(XVID_DEBUG_HEADER, "vol id %i\n", start_code & VIDOBJLAY_START_CODE_MASK);
-
-				bs->Skip(32);  //video_object_layer_start_code
-				bs->Skip(1);   //random_accessible_vol
-
-				bs->Skip(8);   //video_object_type_indication
-
-				if(bs->GetBit()) {
-					//is_object_layer_identifier
-					DPRINTF(XVID_DEBUG_HEADER, "+ is_object_layer_identifier\n");
-					vol_ver_id = bs->GetBits(4);  /* video_object_layer_verid */
-					DPRINTF(XVID_DEBUG_HEADER,"ver_id %i\n", vol_ver_id);
-					bs->Skip(3);   /* video_object_layer_priority */
-				} else {
-					vol_ver_id = 1;
-				}
-
-				aspect_ratio = bs->GetBits(4);
-
-				if(aspect_ratio == VIDOBJLAY_AR_EXTPAR) {
-					//aspect_ratio_info
-					DPRINTF(XVID_DEBUG_HEADER, "+ aspect_ratio_info\n");
-					par_width = bs->GetBits(8);   /* par_width */
-					par_height = bs->GetBits(8);  /* par_height */
-				}
-
-				if(bs->GetBit()) {
-					//vol_control_parameters
-					DPRINTF(XVID_DEBUG_HEADER, "+ vol_control_parameters\n");
-					bs->Skip(2);   /* chroma_format */
-					low_delay = (bs->GetBit()!=0);
-					DPRINTF(XVID_DEBUG_HEADER, "low_delay %i\n", (int)low_delay);
-					if (bs->GetBit()) /* vbv_parameters */
-					{
-						unsigned int bitrate;
-						unsigned int buffer_size;
-						unsigned int occupancy;
-
-						DPRINTF(XVID_DEBUG_HEADER,"+ vbv_parameters\n");
-
-						bitrate = bs->GetBits(15) << 15; /* first_half_bit_rate */
-						READ_MARKER();
-						bitrate |= bs->GetBits(15);      /* latter_half_bit_rate */
-						READ_MARKER();
-
-						buffer_size = bs->GetBits(15) << 3; /* first_half_vbv_buffer_size */
-						READ_MARKER();
-						buffer_size |= bs->GetBits(3);      /* latter_half_vbv_buffer_size */
-
-						occupancy = bs->GetBits(11) << 15;  /* first_half_vbv_occupancy */
-						READ_MARKER();
-						occupancy |= bs->GetBits(15); /* latter_half_vbv_occupancy */
-						READ_MARKER();
-
-						DPRINTF(XVID_DEBUG_HEADER,"bitrate %d (unit=400 bps)\n", bitrate);
-						DPRINTF(XVID_DEBUG_HEADER,"buffer_size %d (unit=16384 bits)\n", buffer_size);
-						DPRINTF(XVID_DEBUG_HEADER,"occupancy %d (unit=64 bits)\n", occupancy);
-					}
-				} else {
-					low_delay = low_delay_default;
-				}
-
-				//video_object_layer_shape
-				shape = bs->GetBits(2);
-
-				DPRINTF(XVID_DEBUG_HEADER, "shape %i\n", shape);
-				if(shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
-					DPRINTF(XVID_DEBUG_ERROR,"non-rectangular shapes are not supported\n");
-				}
-
-				if(shape == VIDOBJLAY_SHAPE_GRAYSCALE && vol_ver_id != 1) {
-					//video_object_layer_shape_extension
-					bs->Skip(4);
-				}
-
-				READ_MARKER();
-
-				/********************** for decode B-frame time ***********************/
-				time_inc_resolution = bs->GetBits(16); /* vop_time_increment_resolution */
-				DPRINTF(XVID_DEBUG_HEADER,"vop_time_increment_resolution %i\n", time_inc_resolution);
-
-#if 0
-				time_inc_resolution--;
-#endif
-
-				if(time_inc_resolution > 0) {
-					time_inc_bits = log2bin(time_inc_resolution-1);
-				} else {
-#if 0
-					time_inc_bits = 0;
-#endif
-					/* for "old" xvid compatibility, set time_inc_bits = 1 */
-					time_inc_bits = 1;
-				}
-
-				READ_MARKER();
-
-				if(bs->GetBit()) {
-					//fixed_vop_rate
-					DPRINTF(XVID_DEBUG_HEADER, "+ fixed_vop_rate\n");
-					bs->Skip(time_inc_bits);   //fixed_vop_time_increment
-				}
-
-				if(shape != VIDOBJLAY_SHAPE_BINARY_ONLY) {
-
-					if(shape == VIDOBJLAY_SHAPE_RECTANGULAR) {
-						dword _width, _height;
-
-						READ_MARKER();
-						_width = bs->GetBits(13);  //video_object_layer_width
-						READ_MARKER();
-						_height = bs->GetBits(13); //video_object_layer_height
-						READ_MARKER();
-
-						DPRINTF(XVID_DEBUG_HEADER, "width %i\n", _width);
-						DPRINTF(XVID_DEBUG_HEADER, "height %i\n", _height);
-
-						if(width != _width || height != _height) {
-							if(fixed_dimensions) {
-								DPRINTF(XVID_DEBUG_ERROR, "decoder width/height does not match bitstream\n");
-								return -1;
-							}
-							resize = 1;
-							width = _width;
-							height = _height;
-						}
-					}
-
-					interlacing = !!bs->GetBit();
-					DPRINTF(XVID_DEBUG_HEADER, "interlacing %i\n", interlacing);
-
-					if(!bs->GetBit()) {
-						//obmc_disable
-						DPRINTF(XVID_DEBUG_ERROR, "obmc_disabled==false not supported\n");
-						/* TODO */
-						/* fucking divx4.02 has this enabled */
-					}
-
-					sprite_enable = bs->GetBits((vol_ver_id == 1 ? 1 : 2));
-
-					if(sprite_enable == SPRITE_STATIC || sprite_enable == SPRITE_GMC) {
-						int low_latency_sprite_enable;
-
-						if(sprite_enable != SPRITE_GMC) {
-							int sprite_width;
-							int sprite_height;
-							int sprite_left_coord;
-							int sprite_top_coord;
-							sprite_width = bs->GetBits(13);     /* sprite_width */
-							READ_MARKER();
-							sprite_height = bs->GetBits(13); /* sprite_height */
-							READ_MARKER();
-							sprite_left_coord = bs->GetBits(13);   /* sprite_left_coordinate */
-							READ_MARKER();
-							sprite_top_coord = bs->GetBits(13); /* sprite_top_coordinate */
-							READ_MARKER();
-						}
-						sprite_warping_points = bs->GetBits(6);      /* no_of_sprite_warping_points */
-						sprite_warping_accuracy = bs->GetBits(2);    /* sprite_warping_accuracy */
-						sprite_brightness_change = bs->GetBits(1);      /* brightness_change */
-						if (sprite_enable != SPRITE_GMC)
-						{
-							low_latency_sprite_enable = bs->GetBits(1);     /* low_latency_sprite_enable */
-						}
-					}
-
-					if(vol_ver_id != 1 && shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
-						//sadct_disable
-						bs->Skip(1);
-					}
-
-					if(bs->GetBit()) {
-						//not_8_bit
-						DPRINTF(XVID_DEBUG_HEADER, "not_8_bit==true (ignored)\n");
-						quant_bits = bs->GetBits(4);  /* quant_precision */
-						bs->Skip(4);   /* bits_per_pixel */
-					} else {
-						quant_bits = 5;
-					}
-
-					if(shape == VIDOBJLAY_SHAPE_GRAYSCALE) {
-						bs->Skip(1);   /* no_gray_quant_update */
-						bs->Skip(1);   /* composition_method */
-						bs->Skip(1);   /* linear_composition */
-					}
-
-					quant_type = bs->GetBit();
-					DPRINTF(XVID_DEBUG_HEADER, "quant_type %i\n", quant_type);
-
-					if(quant_type) {
-						if (bs->GetBit()) //load_intra_quant_mat
-						{
-							byte matrix[64];
-
-							DPRINTF(XVID_DEBUG_HEADER, "load_intra_quant_mat\n");
-
-							bs->get_matrix(matrix);
-							set_intra_matrix(mpeg_quant_matrices, matrix);
-						} else
-							set_intra_matrix(mpeg_quant_matrices, get_default_intra_matrix());
-
-						if (bs->GetBit()) /* load_inter_quant_mat */
-						{
-							byte matrix[64];
-
-							DPRINTF(XVID_DEBUG_HEADER, "load_inter_quant_mat\n");
-
-							bs->get_matrix(matrix);
-							set_inter_matrix(mpeg_quant_matrices, matrix);
-						} else
-							set_inter_matrix(mpeg_quant_matrices, get_default_inter_matrix());
-
-						if (shape == VIDOBJLAY_SHAPE_GRAYSCALE) {
-							DPRINTF(XVID_DEBUG_ERROR, "greyscale matrix not supported\n");
-							return -1;
-						}
-
-					}
-
-					if(vol_ver_id != 1) {
-						quarterpel = bs->GetBit();
-						DPRINTF(XVID_DEBUG_HEADER,"quarterpel %i\n", quarterpel);
-					} else
-						quarterpel = 0;
-
-
-					complexity_estimation_disable = bs->GetBit();
-					if(!complexity_estimation_disable) {
-						read_vol_complexity_estimation_header(bs);
-					}
-
-					bs->Skip(1);   //resync_marker_disable
-
-					if(bs->GetBit()) {
-						//data_partitioned
-						DPRINTF(XVID_DEBUG_ERROR, "data_partitioned not supported\n");
-						bs->Skip(1);   /* reversible_vlc */
-					}
-
-					if(vol_ver_id != 1) {
-						newpred_enable = !!bs->GetBit();
-						if (newpred_enable)  /* newpred_enable */
-						{
-							DPRINTF(XVID_DEBUG_HEADER, "+ newpred_enable\n");
-							bs->Skip(2);   /* requested_upstream_message_type */
-							bs->Skip(1);   /* newpred_segment_type */
-						}
-						reduced_resolution_enable = !!bs->GetBit(); //reduced_resolution_vop_enable
-						DPRINTF(XVID_DEBUG_HEADER, "reduced_resolution_enable %i\n", reduced_resolution_enable);
-					} else {
-						newpred_enable = false;
-						reduced_resolution_enable = false;
-					}
-
-					scalability = (bs->GetBit()!=0);
-					if(scalability) {
-						DPRINTF(XVID_DEBUG_ERROR, "scalability not supported\n");
-						bs->Skip(1);   /* hierarchy_type */
-						bs->Skip(4);   /* ref_layer_id */
-						bs->Skip(1);   /* ref_layer_sampling_direc */
-						bs->Skip(5);   /* hor_sampling_factor_n */
-						bs->Skip(5);   /* hor_sampling_factor_m */
-						bs->Skip(5);   /* vert_sampling_factor_n */
-						bs->Skip(5);   /* vert_sampling_factor_m */
-						bs->Skip(1);   /* enhancement_type */
-						if(shape == VIDOBJLAY_SHAPE_BINARY /* && hierarchy_type==0 */) {
-							bs->Skip(1);   /* use_ref_shape */
-							bs->Skip(1);   /* use_ref_texture */
-							bs->Skip(5);   /* shape_hor_sampling_factor_n */
-							bs->Skip(5);   /* shape_hor_sampling_factor_m */
-							bs->Skip(5);   /* shape_vert_sampling_factor_n */
-							bs->Skip(5);   /* shape_vert_sampling_factor_m */
-						}
-						return -1;
-					}
-				} else {
-					//shape == BINARY_ONLY
-					if(vol_ver_id != 1) {
-						scalability = (bs->GetBit()!=0);
-						if(scalability) {
-							DPRINTF(XVID_DEBUG_ERROR, "scalability not supported\n");
-							bs->Skip(4);   /* ref_layer_id */
-							bs->Skip(5);   /* hor_sampling_factor_n */
-							bs->Skip(5);   /* hor_sampling_factor_m */
-							bs->Skip(5);   /* vert_sampling_factor_n */
-							bs->Skip(5);   /* vert_sampling_factor_m */
-							return -1;
-						}
-					}
-					bs->Skip(1);   /* resync_marker_disable */
-
-				}
-
-				return (resize ? -3 : -2);   //VOL
-
-			}
-			break;
-			default:
-			{
-				//start_code == ?
-				//if(bs->ShowBits(24) == 0x000001)
-				if((start_code&0x00ffffff) == 0x000001) {
-					DPRINTF(XVID_DEBUG_STARTCODE, "<unknown: %x>\n", bs->ShowBits(32));
-				}
-				bs->Skip(8);
-			}
-			}
-		}
-	}
-
-#if 0
-	DPRINTF("*** WARNING: no vop_start_code found");
-#endif
-	return -1;                 //ignore it
-}
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/bitstream.h Deleted

@@ -1,116 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Bitstream reader/writer inlined functions and constants-
- *
- *  Copyright (C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: bitstream.h,v 1.1.1.1 2005-07-13 14:36:12 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _BITSTREAM_H_
-#define _BITSTREAM_H_
-
-#include "portab.h"
-#include "decoder.h"
-
-
-/*****************************************************************************
- * Constants
- ****************************************************************************/
-
-/* comment any #defs we dont use */
-
-#define VIDOBJ_START_CODE		0x00000100	/* ..0x0000011f  */
-#define VIDOBJLAY_START_CODE	0x00000120	/* ..0x0000012f */
-#define VISOBJSEQ_START_CODE	0x000001b0
-#define VISOBJSEQ_STOP_CODE		0x000001b1	/* ??? */
-#define USERDATA_START_CODE		0x000001b2
-#define GRPOFVOP_START_CODE		0x000001b3
-/*#define VIDSESERR_ERROR_CODE  0x000001b4 */
-#define VISOBJ_START_CODE		0x000001b5
-#define VOP_START_CODE			0x000001b6
-/*#define STUFFING_START_CODE	0x000001c3 */
-
-
-#define VISOBJ_TYPE_VIDEO				1
-/*#define VISOBJ_TYPE_STILLTEXTURE      2 */
-/*#define VISOBJ_TYPE_MESH              3 */
-/*#define VISOBJ_TYPE_FBA               4 */
-/*#define VISOBJ_TYPE_3DMESH            5 */
-
-
-#define VIDOBJLAY_TYPE_SIMPLE			1
-/*#define VIDOBJLAY_TYPE_SIMPLE_SCALABLE    2 */
-/*#define VIDOBJLAY_TYPE_CORE				3 */
-/*#define VIDOBJLAY_TYPE_MAIN				4 */
-/*#define VIDOBJLAY_TYPE_NBIT				5 */
-/*#define VIDOBJLAY_TYPE_ANIM_TEXT			6 */
-/*#define VIDOBJLAY_TYPE_ANIM_MESH			7 */
-/*#define VIDOBJLAY_TYPE_SIMPLE_FACE		8 */
-/*#define VIDOBJLAY_TYPE_STILL_SCALABLE		9 */
-#define VIDOBJLAY_TYPE_ART_SIMPLE		10
-/*#define VIDOBJLAY_TYPE_CORE_SCALABLE		11 */
-/*#define VIDOBJLAY_TYPE_ACE				12 */
-/*#define VIDOBJLAY_TYPE_ADVANCED_SCALABLE_TEXTURE 13 */
-/*#define VIDOBJLAY_TYPE_SIMPLE_FBA			14 */
-/*#define VIDEOJLAY_TYPE_SIMPLE_STUDIO    15*/
-/*#define VIDEOJLAY_TYPE_CORE_STUDIO      16*/
-#define VIDOBJLAY_TYPE_ASP              17
-/*#define VIDOBJLAY_TYPE_FGS              18*/
-
-
-/*#define VIDOBJLAY_AR_SQUARE           1 */
-/*#define VIDOBJLAY_AR_625TYPE_43       2 */
-/*#define VIDOBJLAY_AR_525TYPE_43       3 */
-/*#define VIDOBJLAY_AR_625TYPE_169      8 */
-/*#define VIDOBJLAY_AR_525TYPE_169      9 */
-#define VIDOBJLAY_AR_EXTPAR				15
-
-
-#define VIDOBJLAY_SHAPE_RECTANGULAR		0
-#define VIDOBJLAY_SHAPE_BINARY			1
-#define VIDOBJLAY_SHAPE_BINARY_ONLY		2
-#define VIDOBJLAY_SHAPE_GRAYSCALE		3
-
-
-#define SPRITE_NONE		0
-#define SPRITE_STATIC	1
-#define SPRITE_GMC		2
-
-
-
-#define READ_MARKER()	bs->Skip(1)
-//#define WRITE_MARKER()	BitstreamPutBit(bs, 1)
-
-/* vop coding types  */
-/* intra, prediction, backward, sprite, not_coded */
-#define I_VOP	0
-#define P_VOP	1
-#define B_VOP	2
-#define S_VOP	3
-#define N_VOP	4
-
-/* resync-specific */
-#define NUMBITS_VP_RESYNC_MARKER  17
-#define RESYNC_MARKER 1
-
-extern const dword scan_tables[3][64];
-
-
-#endif /* _BITSTREAM_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/decoder.cpp Deleted

@@ -1,1439 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Decoder Module -
- *
- *  Copyright(C) 2002      MinChen <chenm001@163.com>
- *               2002-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: decoder.cpp,v 1.4 2008-08-20 13:57:54 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "quant.h"
-#include "quant_matrix.h"
-#include "interpolate8x8.h"
-#include "reduced.h"
-#include "mbprediction.h"
-#include "gmc.h"
-#include "mem_align.h"
-
-#ifdef __SYMBIAN32__
-#include <e32base.h>
-#endif
-
-//----------------------------
-
-# define DECLARE_ALIGNED_MATRIX(name,sizex,sizey,type,alignment) \
-                type name##_storage[(sizex)*(sizey)+(alignment)-1]; \
-                type * name = (type *) (((int) name##_storage+(alignment - 1)) & ~((int)(alignment)-1))
-
-//----------------------------
-//----------------------------
-/* K = 4 */
-static const dword roundtab_76[16] = { 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1 };
-
-/* K = 1 */
-const dword roundtab_79[4] = { 0, 1, 0, 0 };
-
-//----------------------------
-
-int S_decoder::Resize() {
-	//free existing
-	image_destroy(&cur, edged_width, edged_height);
-	image_destroy(&refn[0], edged_width, edged_height);
-	image_destroy(&refn[1], edged_width, edged_height);
-	image_destroy(&tmp, edged_width, edged_height);
-	image_destroy(&qtmp, edged_width, edged_height);
-
-	image_destroy(&gmc, edged_width, edged_height);
-
-	if(last_mbs)
-		xvid_free(last_mbs);
-	if(mbs)
-		xvid_free(mbs);
-
-	//realloc
-	mb_width = (width + 15) / 16;
-	mb_height = (height + 15) / 16;
-
-	edged_width = 16 * mb_width + 2 * EDGE_SIZE;
-	edged_height = 16 * mb_height + 2 * EDGE_SIZE;
-
-	if(image_create(&cur, edged_width, edged_height)) {
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-
-	if(image_create(&refn[0], edged_width, edged_height)) {
-		image_destroy(&cur, edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-
-	//support B-frame to reference last 2 frame
-	if(image_create(&refn[1], edged_width, edged_height)) {
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-	if(image_create(&tmp, edged_width, edged_height)) {
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		image_destroy(&refn[1], edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-
-	if(image_create(&qtmp, edged_width, edged_height)) {
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		image_destroy(&refn[1], edged_width, edged_height);
-		image_destroy(&tmp, edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-
-	if(image_create(&gmc, edged_width, edged_height)) {
-		image_destroy(&qtmp, edged_width, edged_height);
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		image_destroy(&refn[1], edged_width, edged_height);
-		image_destroy(&tmp, edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-
-	mbs = (MACROBLOCK*)xvid_malloc(sizeof(MACROBLOCK) * mb_width * mb_height, CACHE_LINE);
-	if(mbs == NULL) {
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		image_destroy(&refn[1], edged_width, edged_height);
-		image_destroy(&tmp, edged_width, edged_height);
-		image_destroy(&qtmp, edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-	MemSet(mbs, 0, sizeof(MACROBLOCK) * mb_width * mb_height);
-
-	//for skip MB flag
-	last_mbs = (MACROBLOCK*)xvid_malloc(sizeof(MACROBLOCK) * mb_width * mb_height, CACHE_LINE);
-	if(!last_mbs) {
-		xvid_free(mbs);
-		image_destroy(&cur, edged_width, edged_height);
-		image_destroy(&refn[0], edged_width, edged_height);
-		image_destroy(&refn[1], edged_width, edged_height);
-		image_destroy(&tmp, edged_width, edged_height);
-		image_destroy(&qtmp, edged_width, edged_height);
-		xvid_free(this);
-		return XVID_ERR_MEMORY;
-	}
-	MemSet(last_mbs, 0, sizeof(MACROBLOCK) * mb_width * mb_height);
-
-	return 0;
-}
-
-//----------------------------
-
-int decoder_create(xvid_dec_create_t *create) {
-
-	if(XVID_VERSION_MAJOR(create->version) != 1)   /* v1.x.x */
-		return XVID_ERR_VERSION;
-
-	S_decoder *dec = (S_decoder*)xvid_malloc(sizeof(S_decoder), CACHE_LINE);
-	//S_decoder *dec = new(ELeave) S_decoder(create);
-	if(!dec)
-		return XVID_ERR_MEMORY;
-
-	return dec->Init(create);
-}
-
-//----------------------------
-
-S_decoder::S_decoder(xvid_dec_create_t *create):
-#ifdef PROFILE
-	prof(*create->prof),
-#endif
-	time_inc_resolution(0),
-	fixed_time_inc(0),
-	time_inc_bits(0),
-	shape(0),
-	quant_bits(0),
-	quant_type(0),
-	mpeg_quant_matrices(0),
-	quarterpel(0),
-	complexity_estimation_disable(0),
-	interlacing(false),
-	top_field_first(0),
-	alternate_vertical_scan(0),
-	aspect_ratio(0),
-	par_width(0),
-	par_height(0),
-	sprite_enable(0),
-	sprite_warping_points(0),
-	sprite_warping_accuracy(0),
-	sprite_brightness_change(0),
-	newpred_enable(0),
-	reduced_resolution_enable(false),
-	bs_version(0),
-	width(0),
-	height(0),
-	edged_width(0),
-	edged_height(0),
-	mb_width(0),
-	mb_height(0),
-	mbs(0),
-	last_mbs(0),
-	last_coding_type(0),
-	frames(0),
-	time(0),
-	time_base(0),
-	last_time_base(0),
-	last_non_b_time(0),
-	time_pp(0),
-	time_bp(0),
-	fixed_dimensions(false),
-	scalability(false),
-	low_delay(false),
-	low_delay_default(false),
-	last_reduced_resolution(false),
-	packed_mode(false)
-{
-	MemSet(&p_fmv, 0, sizeof(p_fmv));
-	MemSet(&p_bmv, 0, sizeof(p_bmv));
-}
-
-//----------------------------
-
-S_decoder::~S_decoder() {
-
-	xvid_free(last_mbs);
-	xvid_free(mbs);
-
-	//image based GMC
-	image_destroy(&gmc, edged_width, edged_height);
-
-	image_destroy(&refn[0], edged_width, edged_height);
-	image_destroy(&refn[1], edged_width, edged_height);
-	image_destroy(&tmp, edged_width, edged_height);
-	image_destroy(&qtmp, edged_width, edged_height);
-	image_destroy(&cur, edged_width, edged_height);
-	xvid_free(mpeg_quant_matrices);
-}
-
-//----------------------------
-
-int S_decoder::Init(xvid_dec_create_t *create) {
-
-	mpeg_quant_matrices = (dword*)xvid_malloc(sizeof(dword) * 64 * 8, CACHE_LINE);
-	if(!mpeg_quant_matrices) {
-		delete this;
-		return XVID_ERR_MEMORY;
-	}
-
-	create->handle = this;
-
-	width = create->width;
-	height = create->height;
-
-	cur.Null();
-	refn[0].Null();
-	refn[1].Null();
-	tmp.Null();
-	qtmp.Null();
-
-	//image based GMC
-	gmc.Null();
-
-
-	mbs = NULL;
-	last_mbs = NULL;
-
-	init_mpeg_matrix(mpeg_quant_matrices);
-
-	//For B-frame support (used to save reference frame's time
-	frames = 0;
-	time = time_base = last_time_base = 0;
-	low_delay = false;
-	packed_mode = false;
-
-	fixed_dimensions = (width > 0 && height > 0);
-
-	init_vlc_tables();
-	idct_int32_init();
-
-	if(fixed_dimensions)
-		return Resize();
-	return 0;
-}
-
-//----------------------------
-
-static const int dquant_table[4] = {
-	-1, -2, 1, 2
-};
-
-//----------------------------
-
-static dword get_dc_scaler(dword quant, dword lum) {
-
-	if(quant < 5)
-		return 8;
-	if(quant < 25 && !lum)
-		return (quant + 13) / 2;
-	if(quant < 9)
-		return 2 * quant;
-	if(quant < 25)
-		return quant + 8;
-	if(lum)
-		return 2 * quant - 16;
-	return quant - 6;
-}
-
-//---------------------------
-
-#ifdef _ARM_
-extern"C"
-void XVID_ClearMatrix(void *dst);
-
-#else
-void XVID_ClearMatrix(void *dst);
-#ifndef USE_ARM_ASM
-inline void XVID_ClearMatrix(void *dst) {
-	MemSet(dst, 0, 64 * sizeof(int));
-}
-#endif
-#endif
-
-//--------------------------
-/* decode an intra macroblock */
-void S_decoder::MBIntra(MACROBLOCK *pMB, dword x_pos, dword y_pos, dword acpred_flag, dword cbp, Bitstream *bs,
-                        dword quant, dword intra_dc_threshold, dword bound, bool reduced_resolution) {
-
-	DECLARE_ALIGNED_MATRIX(block, 6, 64, int, CACHE_LINE);
-	DECLARE_ALIGNED_MATRIX(data, 6, 64, int, CACHE_LINE);
-
-	int i;
-
-	dword stride = edged_width;
-	const dword stride2 = stride / 2;
-	byte *pY_Cur, *pU_Cur, *pV_Cur;
-
-	if(reduced_resolution) {
-		pY_Cur = cur.y + (y_pos << 5) * stride + (x_pos << 5);
-		pU_Cur = cur.u + (y_pos << 4) * stride2 + (x_pos << 4);
-		pV_Cur = cur.v + (y_pos << 4) * stride2 + (x_pos << 4);
-	} else {
-		pY_Cur = cur.y + (y_pos << 4) * stride + (x_pos << 4);
-		pU_Cur = cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-		pV_Cur = cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
-	}
-
-	MemSet(block, 0, 6 * 64 * sizeof(int));  //clear
-
-	const dword iQuant = pMB->quant;
-	for(i = 0; i < 6; i++) {
-		dword iDcScaler = get_dc_scaler(iQuant, i < 4);
-		int predictors[8];
-		int start_coeff;
-
-		predict_acdc(mbs, x_pos, y_pos, mb_width, i, &block[i * 64], iQuant, iDcScaler, predictors, bound);
-		if(!acpred_flag)
-			pMB->acpred_directions[i] = 0;
-
-		if(quant < intra_dc_threshold) {
-			PROF_S(PROF_1);
-			int dc_size;
-			int dc_dif;
-
-			dc_size = i < 4 ? bs->get_dc_size_lum() : bs->get_dc_size_chrom();
-			dc_dif = dc_size ? bs->get_dc_dif(dc_size) : 0;
-
-			if (dc_size > 8) {
-				bs->Skip(1);   /* marker */
-			}
-
-			block[i * 64 + 0] = dc_dif;
-			start_coeff = 1;
-
-			DPRINTF(XVID_DEBUG_COEFF,"block[0] %i\n", dc_dif);
-			PROF_E(PROF_1);
-		} else {
-			start_coeff = 0;
-		}
-		if(cbp & (1 << (5 - i))) {
-			//coded
-			int direction = alternate_vertical_scan ? 2 : pMB->acpred_directions[i];
-			get_intra_block(bs, &block[i * 64], direction, start_coeff);
-		}
-		add_acdc(pMB, i, &block[i * 64], iDcScaler, predictors);
-		if(quant_type == 0) {
-			dequant_h263_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler, mpeg_quant_matrices);
-		} else {
-			dequant_mpeg_intra(&data[i * 64], &block[i * 64], iQuant, iDcScaler, mpeg_quant_matrices);
-		}
-		InverseDiscreteCosineTransform(&data[i * 64]);
-	}
-
-	dword next_block = stride * 8;
-	if(interlacing && pMB->field_dct) {
-		next_block = stride;
-		stride *= 2;
-	}
-	if(reduced_resolution) {
-		next_block*=2;
-		copy_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride);
-		copy_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride);
-		copy_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride);
-		copy_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride);
-		copy_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2);
-		copy_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2);
-	} else {
-		transfer_16to8copy(pY_Cur, &data[0 * 64], stride);
-		transfer_16to8copy(pY_Cur + 8, &data[1 * 64], stride);
-		transfer_16to8copy(pY_Cur + next_block, &data[2 * 64], stride);
-		transfer_16to8copy(pY_Cur + 8 + next_block, &data[3 * 64], stride);
-		transfer_16to8copy(pU_Cur, &data[4 * 64], stride2);
-		transfer_16to8copy(pV_Cur, &data[5 * 64], stride2);
-	}
-}
-
-//----------------------------
-
-void S_decoder::mb_decode(const dword cbp, Bitstream * bs, byte * pY_Cur, byte * pU_Cur, byte * pV_Cur, bool reduced_resolution, const MACROBLOCK *pMB) {
-
-	DECLARE_ALIGNED_MATRIX(block, 1, 64, int, CACHE_LINE);
-	DECLARE_ALIGNED_MATRIX(data, 6, 64, int, CACHE_LINE);
-
-	int i;
-	int stride = edged_width;
-	const int stride2 = stride/2;
-
-	const dword iQuant = pMB->quant;
-	const int direction = alternate_vertical_scan ? 2 : 0;
-	const quant_interFuncPtr dequant = quant_type == 0 ? dequant_h263_inter : dequant_mpeg_inter;
-	for(i = 0; i < 6; i++) {
-		if(cbp & (1 << (5 - i))) {
-			//coded
-			XVID_ClearMatrix(block);
-			get_inter_block(bs, block, direction);
-			dequant(&data[i * 64], block, iQuant, mpeg_quant_matrices);
-			InverseDiscreteCosineTransform(&data[i * 64]);
-		}
-	}
-
-	int next_block = stride * (reduced_resolution ? 16 : 8);
-	if(interlacing && pMB->field_dct) {
-		next_block = stride;
-		stride *= 2;
-	}
-
-	if(reduced_resolution) {
-		if(cbp & 32)
-			add_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride);
-		if(cbp & 16)
-			add_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride);
-		if(cbp & 8)
-			add_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride);
-		if(cbp & 4)
-			add_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride);
-		if(cbp & 2)
-			add_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2);
-		if(cbp & 1)
-			add_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2);
-	} else {
-		if(cbp & 32)
-			transfer_16to8add(pY_Cur, &data[0 * 64], stride);
-		if(cbp & 16)
-			transfer_16to8add(pY_Cur + 8, &data[1 * 64], stride);
-		if(cbp & 8)
-			transfer_16to8add(pY_Cur + next_block, &data[2 * 64], stride);
-		if(cbp & 4)
-			transfer_16to8add(pY_Cur + 8 + next_block, &data[3 * 64], stride);
-		if(cbp & 2)
-			transfer_16to8add(pU_Cur, &data[4 * 64], stride2);
-		if(cbp & 1)
-			transfer_16to8add(pV_Cur, &data[5 * 64], stride2);
-	}
-}
-
-//----------------------------
-
-void S_decoder::DecodeInterMacroBlock(const MACROBLOCK * pMB, dword x_pos, dword y_pos, dword cbp, Bitstream *bs,
-                                      bool rounding, bool reduced_resolution, int ref) {
-
-	dword stride = edged_width;
-	dword stride2 = stride / 2;
-	dword i;
-
-	byte *pY_Cur, *pU_Cur, *pV_Cur;
-
-	int uv_dx, uv_dy;
-	VECTOR mv[4];              //local copy of mvs
-
-	if(reduced_resolution) {
-		pY_Cur = cur.y + (y_pos << 5) * stride + (x_pos << 5);
-		pU_Cur = cur.u + (y_pos << 4) * stride2 + (x_pos << 4);
-		pV_Cur = cur.v + (y_pos << 4) * stride2 + (x_pos << 4);
-		for (i = 0; i < 4; i++) {
-			mv[i].x = RRV_MV_SCALEUP(pMB->mvs[i].x);
-			mv[i].y = RRV_MV_SCALEUP(pMB->mvs[i].y);
-		}
-	} else {
-		pY_Cur = cur.y + (y_pos << 4) * stride + (x_pos << 4);
-		pU_Cur = cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-		pV_Cur = cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
-		for(i = 0; i < 4; i++)
-			mv[i] = pMB->mvs[i];
-	}
-
-	if(pMB->mode != MODE_INTER4V) {
-		//INTER, INTER_Q, NOT_CODED, FORWARD, BACKWARD
-
-		uv_dx = mv[0].x;
-		uv_dy = mv[0].y;
-		if (quarterpel) {
-			uv_dx /= 2;
-			uv_dy /= 2;
-		}
-		uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3];
-		uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3];
-
-		if(reduced_resolution)
-			interpolate32x32_switch(cur.y, refn[0].y, 32*x_pos, 32*y_pos, mv[0].x, mv[0].y, stride, rounding);
-		else if(quarterpel)
-			interpolate16x16_quarterpel(cur.y, refn[ref].y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, mv[0].x, mv[0].y, stride, rounding);
-		else
-			interpolate16x16_switch(cur.y, refn[ref].y, 16*x_pos, 16*y_pos, mv[0].x, mv[0].y, stride, rounding);
-	} else {
-		//MODE_INTER4V
-
-		if(quarterpel) {
-			uv_dx = (mv[0].x / 2) + (mv[1].x / 2) + (mv[2].x / 2) + (mv[3].x / 2);
-			uv_dy = (mv[0].y / 2) + (mv[1].y / 2) + (mv[2].y / 2) + (mv[3].y / 2);
-		} else {
-			uv_dx = mv[0].x + mv[1].x + mv[2].x + mv[3].x;
-			uv_dy = mv[0].y + mv[1].y + mv[2].y + mv[3].y;
-		}
-
-		uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];
-		uv_dy = (uv_dy >> 3) + roundtab_76[uv_dy & 0xf];
-
-		if(reduced_resolution) {
-			interpolate16x16_switch(cur.y, refn[0].y, 32*x_pos,      32*y_pos,      mv[0].x, mv[0].y, stride, rounding);
-			interpolate16x16_switch(cur.y, refn[0].y, 32*x_pos + 16, 32*y_pos,      mv[1].x, mv[1].y, stride, rounding);
-			interpolate16x16_switch(cur.y, refn[0].y, 32*x_pos,      32*y_pos + 16, mv[2].x, mv[2].y, stride, rounding);
-			interpolate16x16_switch(cur.y, refn[0].y, 32*x_pos + 16, 32*y_pos + 16, mv[3].x, mv[3].y, stride, rounding);
-			interpolate16x16_switch(cur.u, refn[0].u, 16*x_pos,      16*y_pos,      uv_dx,   uv_dy,   stride2, rounding);
-			interpolate16x16_switch(cur.v, refn[0].v, 16*x_pos,      16*y_pos,      uv_dx,   uv_dy,   stride2, rounding);
-		} else if(quarterpel) {
-			interpolate8x8_quarterpel(cur.y, refn[0].y , qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, mv[0].x, mv[0].y, stride, rounding);
-			interpolate8x8_quarterpel(cur.y, refn[0].y , qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos, mv[1].x, mv[1].y, stride, rounding);
-			interpolate8x8_quarterpel(cur.y, refn[0].y , qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos + 8, mv[2].x, mv[2].y, stride, rounding);
-			interpolate8x8_quarterpel(cur.y, refn[0].y , qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, mv[3].x, mv[3].y, stride, rounding);
-		} else {
-			interpolate8x8_switch(cur.y, refn[0].y , 16*x_pos, 16*y_pos, mv[0].x, mv[0].y, stride, rounding);
-			interpolate8x8_switch(cur.y, refn[0].y , 16*x_pos + 8, 16*y_pos, mv[1].x, mv[1].y, stride, rounding);
-			interpolate8x8_switch(cur.y, refn[0].y , 16*x_pos, 16*y_pos + 8, mv[2].x, mv[2].y, stride, rounding);
-			interpolate8x8_switch(cur.y, refn[0].y , 16*x_pos + 8, 16*y_pos + 8, mv[3].x, mv[3].y, stride, rounding);
-		}
-	}
-	//chroma
-	if(reduced_resolution) {
-		interpolate16x16_switch(cur.u, refn[0].u, 16*x_pos, 16*y_pos, uv_dx, uv_dy, stride2, rounding);
-		interpolate16x16_switch(cur.v, refn[0].v, 16*x_pos, 16*y_pos, uv_dx, uv_dy, stride2, rounding);
-	} else {
-		interpolate8x8_switch(cur.u, refn[ref].u,  8*x_pos,  8*y_pos, uv_dx, uv_dy, stride2, rounding);
-		interpolate8x8_switch(cur.v, refn[ref].v,  8*x_pos,  8*y_pos, uv_dx, uv_dy, stride2, rounding);
-	}
-	if(cbp)
-		mb_decode(cbp, bs, pY_Cur, pU_Cur, pV_Cur, reduced_resolution, pMB);
-}
-
-//----------------------------
-
-inline int gmc_sanitize(int value, int quarterpel, int fcode) {
-
-	int length = 1 << (fcode+4);
-
-#if 0
-	if (quarterpel) value *= 2;
-#endif
-
-	if (value < -length)
-		return -length;
-	else if (value >= length)
-		return length-1;
-	else return value;
-}
-
-//----------------------------
-
-void S_decoder::mbgmc(MACROBLOCK *pMB, dword x_pos, dword y_pos, dword fcode, dword cbp, Bitstream * bs, bool rounding) {
-
-	const dword stride = edged_width;
-	const dword stride2 = stride / 2;
-
-	byte *const pY_Cur=cur.y + (y_pos << 4) * stride + (x_pos << 4);
-	byte *const pU_Cur=cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-	byte *const pV_Cur=cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
-
-	NEW_GMC_DATA *gmc_data = &new_gmc_data;
-
-	pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
-
-	//this is where the calculations are done
-	gmc_data->predict_16x16(gmc_data, cur.y + y_pos*16*stride + x_pos*16, refn[0].y, stride, stride, x_pos, y_pos, rounding);
-	gmc_data->predict_8x8(gmc_data, cur.u + y_pos*8*stride2 + x_pos*8, refn[0].u, cur.v + y_pos*8*stride2 + x_pos*8, refn[0].v, stride2, stride2, x_pos, y_pos, rounding);
-	gmc_data->get_average_mv(gmc_data, &pMB->amv, x_pos, y_pos, quarterpel);
-
-	pMB->amv.x = gmc_sanitize(pMB->amv.x, quarterpel, fcode);
-	pMB->amv.y = gmc_sanitize(pMB->amv.y, quarterpel, fcode);
-
-	pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv;
-
-	if(cbp)
-		mb_decode(cbp, bs, pY_Cur, pU_Cur, pV_Cur, 0, pMB);
-}
-
-//----------------------------
-
-void S_decoder::I_Frame(Bitstream * bs, bool reduced_resolution, int quant, int intra_dc_threshold) {
-
-	dword bound;
-	dword x, y;
-	//dword mb_width = mb_width;
-	//dword mb_height = mb_height;
-
-	if (reduced_resolution) {
-		mb_width = (width + 31) / 32;
-		mb_height = (height + 31) / 32;
-	}
-
-	bound = 0;
-
-	for (y = 0; y < mb_height; y++) {
-		for (x = 0; x < mb_width; x++) {
-			dword mcbpc;
-			dword cbpc;
-			dword acpred_flag;
-			dword cbpy;
-			dword cbp;
-
-			while(bs->ShowBits(9) == 1)
-				bs->Skip(9);
-
-			if(bs->check_resync_marker(0)) {
-				bound = read_video_packet_header(bs, 0, &quant, NULL, NULL, &intra_dc_threshold);
-				x = bound % mb_width;
-				y = bound / mb_width;
-			}
-			MACROBLOCK *mb = &mbs[y * mb_width + x];
-
-			//DPRINTF(XVID_DEBUG_MB, "macroblock (%i,%i) %08x\n", x, y, bs->ShowBits(32));
-
-			mcbpc = bs->get_mcbpc_intra();
-			mb->mode = mcbpc & 7;
-			cbpc = (mcbpc >> 4);
-
-			acpred_flag = bs->GetBit();
-
-			cbpy = bs->GetCbpy(1);
-			cbp = (cbpy << 2) | cbpc;
-
-			if (mb->mode == MODE_INTRA_Q) {
-				quant += dquant_table[bs->GetBits(2)];
-				if (quant > 31) {
-					quant = 31;
-				} else if (quant < 1) {
-					quant = 1;
-				}
-			}
-			mb->quant = quant;
-			mb->mvs[0].x = mb->mvs[0].y =
-			                   mb->mvs[1].x = mb->mvs[1].y =
-			                                      mb->mvs[2].x = mb->mvs[2].y =
-			                                              mb->mvs[3].x = mb->mvs[3].y =0;
-
-			if(interlacing) {
-				mb->field_dct = bs->GetBit();
-				DPRINTF(XVID_DEBUG_MB,"deci: field_dct: %i\n", mb->field_dct);
-			}
-			MBIntra(mb, x, y, acpred_flag, cbp, bs, quant, intra_dc_threshold, bound, reduced_resolution);
-		}
-		/*
-		#ifdef XVID_CSP_SLICE
-		if(out_frm)
-		   output_slice(&cur, edged_width,width,out_frm,0,y,mb_width);
-		#endif
-		   */
-	}
-}
-
-//----------------------------
-
-void S_decoder::GetMotionVector(Bitstream * bs, int x, int y, int k, VECTOR *ret_mv, int fcode, int bound) {
-
-	const int scale_fac = 1 << (fcode - 1);
-	const int high = (32 * scale_fac) - 1;
-	const int low = ((-32) * scale_fac);
-	const int range = (64 * scale_fac);
-
-	const VECTOR pmv = get_pmv2(mbs, mb_width, bound, x, y, k);
-	VECTOR mv;
-
-	mv.x = bs->GetMoveVector(fcode);
-	mv.y = bs->GetMoveVector(fcode);
-
-	//DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", mv.x, mv.y, pmv.x, pmv.y, mv.x+pmv.x, mv.y+pmv.y);
-
-	mv.x += pmv.x;
-	mv.y += pmv.y;
-
-	if(mv.x < low) {
-		mv.x += range;
-	} else if(mv.x > high) {
-		mv.x -= range;
-	}
-
-	if(mv.y < low) {
-		mv.y += range;
-	} else if(mv.y > high) {
-		mv.y -= range;
-	}
-
-	ret_mv->x = mv.x;
-	ret_mv->y = mv.y;
-}
-
-//----------------------------
-// for P_VOP set gmc_warp to NULL
-void S_decoder::P_Frame(Bitstream *bs, int rounding, bool reduced_resolution, int quant, int fcode,
-                        int intra_dc_threshold, const WARPPOINTS *gmc_warp) {
-
-	//dword mb_width = mb_width;
-	//dword mb_height = mb_height;
-
-	if(reduced_resolution) {
-		mb_width = (width + 31) / 32;
-		mb_height = (height + 31) / 32;
-	}
-
-	SetEdges(refn[0]);
-
-	if(gmc_warp) {
-		//accuracy: 0==1/2, 1=1/4, 2=1/8, 3=1/16
-		generate_GMCparameters(sprite_warping_points, sprite_warping_accuracy, gmc_warp, width, height, &new_gmc_data);
-		//image warping is done block-based in decoder_mbgmc(), now
-	}
-
-	PROF_S(PROF_FRM_P);
-	dword bound = 0;
-
-	for(dword y = 0; y < mb_height; y++) {
-		//int cp_mb = 0, st_mb = 0;
-		for(dword x = 0; x < mb_width; x++) {
-			//skip stuffing
-			while(bs->ShowBits(10) == 1)
-				bs->Skip(10);
-
-			if(bs->check_resync_marker(fcode - 1)) {
-				bound = read_video_packet_header(bs, fcode - 1, &quant, &fcode, NULL, &intra_dc_threshold);
-				x = bound % mb_width;
-				y = bound / mb_width;
-			}
-			MACROBLOCK *mb = &mbs[y * mb_width + x];
-
-			//DPRINTF(XVID_DEBUG_MB, "macroblock (%i,%i) %08x\n", x, y, bs->ShowBits(32));
-
-			if(!(bs->GetBit())) {
-				//block _is_ coded
-				int mcsel = 0;    //mcsel: '0'=local motion, '1'=GMC
-
-				//cp_mb++;
-				dword mcbpc = bs->GetMcbpcInter();
-				mb->mode = mcbpc & 7;
-				dword cbpc = (mcbpc >> 4);
-
-				DPRINTF(XVID_DEBUG_MB, "mode %i\n", mb->mode);
-				DPRINTF(XVID_DEBUG_MB, "cbpc %i\n", cbpc);
-
-				dword intra = (mb->mode == MODE_INTRA || mb->mode == MODE_INTRA_Q);
-
-				dword acpred_flag = 0;
-				if(gmc_warp && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q))
-					mcsel = bs->GetBit();
-				else if(intra)
-					acpred_flag = bs->GetBit();
-
-				dword cbpy = bs->GetCbpy(intra);
-				//DPRINTF(XVID_DEBUG_MB, "cbpy %i mcsel %i \n", cbpy,mcsel);
-
-				dword cbp = (cbpy << 2) | cbpc;
-
-				if(mb->mode == MODE_INTER_Q || mb->mode == MODE_INTRA_Q) {
-					int dquant = dquant_table[bs->GetBits(2)];
-					DPRINTF(XVID_DEBUG_MB, "dquant %i\n", dquant);
-					quant += dquant;
-					if (quant > 31) {
-						quant = 31;
-					} else if (quant < 1) {
-						quant = 1;
-					}
-					DPRINTF(XVID_DEBUG_MB, "quant %i\n", quant);
-				}
-				mb->quant = quant;
-
-				if(interlacing) {
-					if((cbp || intra) && !mcsel) {
-						mb->field_dct = bs->GetBit();
-						DPRINTF(XVID_DEBUG_MB,"decp: field_dct: %i\n", mb->field_dct);
-					}
-
-					if(mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
-						mb->field_pred = bs->GetBit();
-						DPRINTF(XVID_DEBUG_MB, "decp: field_pred: %i\n", mb->field_pred);
-
-						if(mb->field_pred) {
-							mb->field_for_top = bs->GetBit();
-							DPRINTF(XVID_DEBUG_MB,"decp: field_for_top: %i\n", mb->field_for_top);
-							mb->field_for_bot = bs->GetBit();
-							DPRINTF(XVID_DEBUG_MB,"decp: field_for_bot: %i\n", mb->field_for_bot);
-						}
-					}
-				}
-				if(mcsel) {
-					mbgmc(mb, x, y, fcode, cbp, bs, rounding);
-					PROF_E(PROF_0);
-					continue;
-
-				} else if(mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) {
-					if(interlacing && mb->field_pred) {
-						GetMotionVector(bs, x, y, 0, &mb->mvs[0], fcode, bound);
-						GetMotionVector(bs, x, y, 0, &mb->mvs[1], fcode, bound);
-					} else {
-						GetMotionVector(bs, x, y, 0, &mb->mvs[0], fcode, bound);
-						mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0];
-					}
-				} else if(mb->mode == MODE_INTER4V) {
-					GetMotionVector(bs, x, y, 0, &mb->mvs[0], fcode, bound);
-					GetMotionVector(bs, x, y, 1, &mb->mvs[1], fcode, bound);
-					GetMotionVector(bs, x, y, 2, &mb->mvs[2], fcode, bound);
-					GetMotionVector(bs, x, y, 3, &mb->mvs[3], fcode, bound);
-				} else {   /* MODE_INTRA, MODE_INTRA_Q */
-					mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0;
-					mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0;
-					MBIntra(mb, x, y, acpred_flag, cbp, bs, quant, intra_dc_threshold, bound, reduced_resolution);
-					continue;
-				}
-				PROF_S(PROF_5);
-				DecodeInterMacroBlock(mb, x, y, cbp, bs, rounding, reduced_resolution, 0);
-				PROF_E(PROF_5);
-			} else if(gmc_warp) {
-				//a not coded S(GMC)-VOP macroblock
-				mb->mode = MODE_NOT_CODED_GMC;
-				mbgmc(mb, x, y, fcode, 0x00, bs, rounding);
-
-				/*
-				#ifdef XVID_CSP_SLICE
-				if(out_frm && cp_mb > 0) {
-				   output_slice(&cur, edged_width,width,out_frm,st_mb,y,cp_mb);
-				   cp_mb = 0;
-				}
-				st_mb = x+1;
-				#endif
-				*/
-			} else {
-				//not coded P_VOP macroblock
-				mb->mode = MODE_NOT_CODED;
-
-				mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0;
-				mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0;
-
-				DecodeInterMacroBlock(mb, x, y, 0, bs, rounding, reduced_resolution, 0);
-				/*
-				#ifdef XVID_CSP_SLICE
-				if(out_frm && cp_mb > 0) {
-				   output_slice(&cur, edged_width,width,out_frm,st_mb,y,cp_mb);
-				   cp_mb = 0;
-				}
-				st_mb = x+1;
-				#endif
-				*/
-			}
-		}
-		/*
-		#ifdef XVID_CSP_SLICE
-		if(out_frm && cp_mb > 0)
-		   output_slice(&cur, edged_width,width,out_frm,st_mb,y,cp_mb);
-		#endif
-		   */
-	}
-	PROF_E(PROF_FRM_P);
-}
-
-//----------------------------
-/* decode B-frame motion vector */
-static void get_b_motion_vector(Bitstream * bs, VECTOR * mv, int fcode, const VECTOR pmv) {
-
-	const int scale_fac = 1 << (fcode - 1);
-	const int high = (32 * scale_fac) - 1;
-	const int low = ((-32) * scale_fac);
-	const int range = (64 * scale_fac);
-
-	int mv_x = bs->GetMoveVector(fcode);
-	int mv_y = bs->GetMoveVector(fcode);
-
-	mv_x += pmv.x;
-	mv_y += pmv.y;
-
-	if (mv_x < low)
-		mv_x += range;
-	else if (mv_x > high)
-		mv_x -= range;
-
-	if (mv_y < low)
-		mv_y += range;
-	else if (mv_y > high)
-		mv_y -= range;
-
-	mv->x = mv_x;
-	mv->y = mv_y;
-}
-
-//----------------------------
-/* decode an B-frame direct & interpolate macroblock */
-void S_decoder::BFrameInterpolateMBInter(const IMAGE &forward, const IMAGE &backward, const MACROBLOCK *pMB, dword x_pos, dword y_pos, Bitstream *bs, int direct) {
-
-	PROF_S(PROF_BINT_MBI);
-	dword stride = edged_width;
-	dword stride2 = stride / 2;
-	int uv_dx, uv_dy;
-	int b_uv_dx, b_uv_dy;
-	byte *pY_Cur, *pU_Cur, *pV_Cur;
-	const dword cbp = pMB->cbp;
-
-	pY_Cur = cur.y + (y_pos << 4) * stride + (x_pos << 4);
-	pU_Cur = cur.u + (y_pos << 3) * stride2 + (x_pos << 3);
-	pV_Cur = cur.v + (y_pos << 3) * stride2 + (x_pos << 3);
-
-	if(!direct) {
-		uv_dx = pMB->mvs[0].x;
-		uv_dy = pMB->mvs[0].y;
-
-		b_uv_dx = pMB->b_mvs[0].x;
-		b_uv_dy = pMB->b_mvs[0].y;
-
-		if(quarterpel) {
-			uv_dx /= 2;
-			uv_dy /= 2;
-			b_uv_dx /= 2;
-			b_uv_dy /= 2;
-		}
-		uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3];
-		uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3];
-
-		b_uv_dx = (b_uv_dx >> 1) + roundtab_79[b_uv_dx & 0x3];
-		b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3];
-	} else {
-		if(quarterpel) {
-			uv_dx = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2);
-			uv_dy = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2);
-			b_uv_dx = (pMB->b_mvs[0].x / 2) + (pMB->b_mvs[1].x / 2) + (pMB->b_mvs[2].x / 2) + (pMB->b_mvs[3].x / 2);
-			b_uv_dy = (pMB->b_mvs[0].y / 2) + (pMB->b_mvs[1].y / 2) + (pMB->b_mvs[2].y / 2) + (pMB->b_mvs[3].y / 2);
-		} else {
-			uv_dx = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x;
-			uv_dy = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y;
-			b_uv_dx = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x;
-			b_uv_dy = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y;
-		}
-
-		uv_dx = (uv_dx >> 3) + roundtab_76[uv_dx & 0xf];
-		uv_dy = (uv_dy >> 3) + roundtab_76[uv_dy & 0xf];
-		b_uv_dx = (b_uv_dx >> 3) + roundtab_76[b_uv_dx & 0xf];
-		b_uv_dy = (b_uv_dy >> 3) + roundtab_76[b_uv_dy & 0xf];
-	}
-
-	if(quarterpel) {
-		if(!direct) {
-			interpolate16x16_quarterpel(cur.y, forward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
-		} else {
-			interpolate8x8_quarterpel(cur.y, forward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
-			interpolate8x8_quarterpel(cur.y, forward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos, pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
-			interpolate8x8_quarterpel(cur.y, forward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
-			interpolate8x8_quarterpel(cur.y, forward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, 0);
-		}
-	} else {
-		interpolate8x8_switch(cur.y, forward.y, 16 * x_pos, 16 * y_pos, pMB->mvs[0].x, pMB->mvs[0].y, stride, 0);
-		interpolate8x8_switch(cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos, pMB->mvs[1].x, pMB->mvs[1].y, stride, 0);
-		interpolate8x8_switch(cur.y, forward.y, 16 * x_pos, 16 * y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, 0);
-		interpolate8x8_switch(cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, 0);
-	}
-
-	interpolate8x8_switch(cur.u, forward.u, 8 * x_pos, 8 * y_pos, uv_dx, uv_dy, stride2, 0);
-	interpolate8x8_switch(cur.v, forward.v, 8 * x_pos, 8 * y_pos, uv_dx, uv_dy, stride2, 0);
-
-	if(quarterpel) {
-		if(!direct) {
-			interpolate16x16_quarterpel(tmp.y, backward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
-		} else {
-			interpolate8x8_quarterpel(tmp.y, backward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos, pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
-			interpolate8x8_quarterpel(tmp.y, backward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0);
-			interpolate8x8_quarterpel(tmp.y, backward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos, 16*y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0);
-			interpolate8x8_quarterpel(tmp.y, backward.y, qtmp.y, qtmp.y + 64, qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0);
-		}
-	} else {
-		interpolate8x8_switch(tmp.y, backward.y, 16 * x_pos, 16 * y_pos, pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0);
-		interpolate8x8_switch(tmp.y, backward.y, 16 * x_pos + 8, 16 * y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0);
-		interpolate8x8_switch(tmp.y, backward.y, 16 * x_pos, 16 * y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0);
-		interpolate8x8_switch(tmp.y, backward.y, 16 * x_pos + 8, 16 * y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0);
-	}
-
-	interpolate8x8_switch(tmp.u, backward.u, 8 * x_pos, 8 * y_pos, b_uv_dx, b_uv_dy, stride2, 0);
-	interpolate8x8_switch(tmp.v, backward.v, 8 * x_pos, 8 * y_pos, b_uv_dx, b_uv_dy, stride2, 0);
-
-	interpolate8x8_avg2(cur.y + (16 * y_pos * stride) + 16 * x_pos, cur.y + (16 * y_pos * stride) + 16 * x_pos,
-	                    tmp.y + (16 * y_pos * stride) + 16 * x_pos, stride, 1, 8);
-
-	interpolate8x8_avg2(cur.y + (16 * y_pos * stride) + 16 * x_pos + 8, cur.y + (16 * y_pos * stride) + 16 * x_pos + 8,
-	                    tmp.y + (16 * y_pos * stride) + 16 * x_pos + 8, stride, 1, 8);
-
-	interpolate8x8_avg2(cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos,
-	                    tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, stride, 1, 8);
-
-	interpolate8x8_avg2(cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8,
-	                    tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, stride, 1, 8);
-
-	interpolate8x8_avg2(cur.u + (8 * y_pos * stride2) + 8 * x_pos, cur.u + (8 * y_pos * stride2) + 8 * x_pos,
-	                    tmp.u + (8 * y_pos * stride2) + 8 * x_pos, stride2, 1, 8);
-
-	interpolate8x8_avg2(cur.v + (8 * y_pos * stride2) + 8 * x_pos, cur.v + (8 * y_pos * stride2) + 8 * x_pos,
-	                    tmp.v + (8 * y_pos * stride2) + 8 * x_pos, stride2, 1, 8);
-
-	if(cbp)
-		mb_decode(cbp, bs, pY_Cur, pU_Cur, pV_Cur, 0, pMB);
-	PROF_E(PROF_BINT_MBI);
-}
-
-//----------------------------
-/* for decode B-frame dbquant */
-static int get_dbquant(Bitstream * bs) {
-	if (!bs->GetBit())     /*  '0' */
-		return (0);
-	else if (!bs->GetBit())   /* '10' */
-		return (-2);
-	else                    /* '11' */
-		return (2);
-}
-
-//----------------------------
-/*
- * decode B-frame mb_type
- * bit      ret_value
- * 1     0
- * 01    1
- * 001      2
- * 0001     3
- */
-static int get_mbtype(Bitstream * bs) {
-	int mb_type;
-
-	for (mb_type = 0; mb_type <= 3; mb_type++)
-		if (bs->GetBit())
-			return (mb_type);
-
-	return -1;
-}
-
-//----------------------------
-
-void S_decoder::B_Frame(Bitstream *bs, int quant, int fcode_forward, int fcode_backward) {
-
-	dword x, y;
-	VECTOR mv;
-	const VECTOR zeromv = {0,0};
-	const int64_t TRB = time_pp - time_bp, TRD = time_pp;
-	int i;
-
-	PROF_S(PROF_FRM_B);
-	SetEdges(refn[0]);
-	SetEdges(refn[1]);
-
-	for(y = 0; y < mb_height; y++) {
-		//initialize Pred Motion Vector
-		p_fmv = p_bmv = zeromv;
-		for(x = 0; x < mb_width; x++) {
-			MACROBLOCK *mb = &mbs[y * mb_width + x];
-			MACROBLOCK *last_mb = &last_mbs[y * mb_width + x];
-			const int fcode_max = (fcode_forward>fcode_backward) ? fcode_forward : fcode_backward;
-
-			if(bs->check_resync_marker(fcode_max  - 1)) {
-				dword intra_dc_threshold; /* fake variable */
-				int bound = read_video_packet_header(bs, fcode_max - 1, &quant, &fcode_forward, &fcode_backward, (int*)&intra_dc_threshold);
-				x = bound % mb_width;
-				y = bound / mb_width;
-				//reset predicted macroblocks
-				p_fmv = p_bmv = zeromv;
-			}
-
-			mv = mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] = mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv;
-			mb->quant = quant;
-
-			/*
-			 * skip if the co-located P_VOP macroblock is not coded
-			 * if not codec in co-located S_VOP macroblock is _not_
-			 * automatically skipped
-			 */
-
-			if(last_mb->mode == MODE_NOT_CODED) {
-				mb->cbp = 0;
-				mb->mode = MODE_FORWARD;
-				DecodeInterMacroBlock(mb, x, y, mb->cbp, bs, 0, 0, 1);
-				continue;
-			}
-
-			if(!bs->GetBit()) {
-				//modb=='0'
-				const byte modb2 = bs->GetBit();
-
-				mb->mode = get_mbtype(bs);
-
-				if (!modb2)    /* modb=='00' */
-					mb->cbp = bs->GetBits(6);
-				else
-					mb->cbp = 0;
-
-				if (mb->mode && mb->cbp) {
-					quant += get_dbquant(bs);
-					if (quant > 31)
-						quant = 31;
-					else if (quant < 1)
-						quant = 1;
-				}
-				mb->quant = quant;
-
-				if(interlacing) {
-					if (mb->cbp) {
-						mb->field_dct = bs->GetBit();
-						DPRINTF(XVID_DEBUG_MB,"decp: field_dct: %i\n", mb->field_dct);
-					}
-
-					if (mb->mode) {
-						mb->field_pred = bs->GetBit();
-						DPRINTF(XVID_DEBUG_MB, "decp: field_pred: %i\n", mb->field_pred);
-
-						if (mb->field_pred) {
-							mb->field_for_top = bs->GetBit();
-							DPRINTF(XVID_DEBUG_MB,"decp: field_for_top: %i\n", mb->field_for_top);
-							mb->field_for_bot = bs->GetBit();
-							DPRINTF(XVID_DEBUG_MB,"decp: field_for_bot: %i\n", mb->field_for_bot);
-						}
-					}
-				}
-
-			} else {
-				mb->mode = MODE_DIRECT_NONE_MV;
-				mb->cbp = 0;
-			}
-
-			switch(mb->mode) {
-			case MODE_DIRECT:
-				get_b_motion_vector(bs, &mv, 1, zeromv);
-			//flow...
-			case MODE_DIRECT_NONE_MV:
-				for(i=0; i<4; i++) {
-					mb->mvs[i].x = (int)((int(TRB) * last_mb->mvs[i].x) / (int)TRD + mv.x);
-					mb->b_mvs[i].x = (int) ((mv.x == 0) ?
-					                        (int(TRB - TRD) * last_mb->mvs[i].x) / (int)TRD :
-					                        mb->mvs[i].x - last_mb->mvs[i].x);
-					mb->mvs[i].y = (int) ((int(TRB) * last_mb->mvs[i].y) / (int)TRD + mv.y);
-					mb->b_mvs[i].y = (int) ((mv.y == 0) ?
-					                        (int(TRB - TRD) * last_mb->mvs[i].y) / int(TRD) :
-					                        int(mb->mvs[i].y - last_mb->mvs[i].y));
-				}
-				BFrameInterpolateMBInter(refn[1], refn[0], mb, x, y, bs, 1);
-				break;
-
-			case MODE_INTERPOLATE:
-				get_b_motion_vector(bs, &mb->mvs[0], fcode_forward, p_fmv);
-				p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] =   mb->mvs[0];
-
-				get_b_motion_vector(bs, &mb->b_mvs[0], fcode_backward, p_bmv);
-				p_bmv = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] = mb->b_mvs[0];
-
-				BFrameInterpolateMBInter(refn[1], refn[0], mb, x, y, bs, 0);
-				break;
-
-			case MODE_BACKWARD:
-				get_b_motion_vector(bs, &mb->mvs[0], fcode_backward, p_bmv);
-				p_bmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] =   mb->mvs[0];
-
-				DecodeInterMacroBlock(mb, x, y, mb->cbp, bs, 0, 0, 0);
-				break;
-
-			case MODE_FORWARD:
-				get_b_motion_vector(bs, &mb->mvs[0], fcode_forward, p_fmv);
-				p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] =   mb->mvs[0];
-
-				DecodeInterMacroBlock(mb, x, y, mb->cbp, bs, 0, 0, 1);
-				break;
-
-			default:
-				DPRINTF(XVID_DEBUG_ERROR,"Not supported B-frame mb_type = %i\n", mb->mode);
-			}
-		}
-	}
-	PROF_E(PROF_FRM_B);
-}
-
-//----------------------------
-/* perform post processing if necessary, and output the image */
-/*
-void S_decoder::Output(IMAGE *img, xvid_dec_frame_t *frame, xvid_dec_stats_t *stats, int coding_type){
-
-   //image_output(img, width, height, edged_width, (byte**)frame->output.plane, (unsigned int*)frame->output.stride, frame->output.csp, interlacing);
-   yv12_to_bgr((byte*)frame->output.plane, frame->output.stride, img->y, img->u, img->v, edged_width, edged_width/2, width, height, false);
-
-   if(stats){
-      stats->type = coding2type(coding_type);
-      stats->data.vop.time_base = (int)time_base;
-      stats->data.vop.time_increment = 0; //XXX: todo
-   }
-}
-*/
-
-//----------------------------
-
-int S_decoder::Decode(xvid_dec_frame_t *frame, xvid_dec_stats_t *stats) {
-
-	PROF_S(PROF_DECODE);
-
-	Bitstream bs;
-	bool rounding;
-	bool reduced_resolution;
-	dword quant;
-	dword fcode_forward;
-	dword fcode_backward;
-	dword intra_dc_threshold;
-	WARPPOINTS gmc_warp;
-	int coding_type;
-
-	frame->img_out = NULL;
-
-	if(XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1)) { //v1.x.x
-		PROF_E(PROF_DECODE);
-		return XVID_ERR_VERSION;
-	}
-
-	//start_global_timer();
-
-	low_delay_default = (frame->general & XVID_LOWDELAY);
-	if((frame->general & XVID_DISCONTINUITY))
-		frames = 0;
-	/*
-	#ifdef XVID_CSP_SLICE
-	out_frm = (frame->output.csp == XVID_CSP_SLICE) ? &frame->output : NULL;
-	#endif
-	*/
-
-	if(frame->length < 0) {
-		//decoder flush
-		int ret;
-		//if not decoding "low_delay/packed", and this isn't low_delay and
-		// we have a reference frame, then outout the reference frame
-		if(!(low_delay_default && packed_mode) && !low_delay && frames>0) {
-			//Output(&refn[0], frame, stats, last_coding_type);
-			frame->img_out = &refn[0];
-			frames = 0;
-			ret = 0;
-		} else {
-			if (stats) stats->type = XVID_TYPE_NOTHING;
-			ret = XVID_ERR_END;
-		}
-		//stop_global_timer();
-		PROF_E(PROF_DECODE);
-		return ret;
-	}
-
-	bs.Init(frame->bitstream, frame->length);
-
-	//XXX: 0x7f is only valid whilst decoding vfw xvid/divx5 avi's
-	if(low_delay_default && frame->length == 1 && bs.ShowBits(8) == 0x7f) {
-		//image_output(&refn[0], width, height, edged_width, (byte**)frame->output.plane, (unsigned int*)frame->output.stride, frame->output.csp, interlacing);
-		if(stats)
-			stats->type = XVID_TYPE_NOTHING;
-		PROF_E(PROF_DECODE);
-		return 1;               //one byte consumed
-	}
-
-	bool success = false;
-	bool output = false;
-	bool seen_something = false;
-
-	/*
-	cur.Clear(width, height, edged_width, 0, 0, 0);
-	refn[0].Clear(width, height, edged_width, 0, 0, 0);
-	refn[1].Clear(width, height, edged_width, 0, 0, 0);
-	*/
-
-repeat:
-
-	coding_type = BitstreamReadHeaders(&bs, rounding, &reduced_resolution, &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, &gmc_warp);
-
-	//DPRINTF(XVID_DEBUG_HEADER, "coding_type=%i, packed=%i, time=%lli, time_pp=%i, time_bp=%i\n", coding_type, packed_mode, time, time_pp, time_bp);
-
-	if(coding_type == -1) {
-		//nothing
-		if(success)
-			goto done;
-		if(stats)
-			stats->type = XVID_TYPE_NOTHING;
-		PROF_E(PROF_DECODE);
-		return bs.Pos()/8;
-	}
-
-	if(coding_type == -2 || coding_type == -3) {
-		//vol and/or resize
-
-		if(coding_type == -3)
-			Resize();
-		/*
-		if(stats){
-		   stats->type = XVID_TYPE_VOL;
-		   stats->data.vol.general = 0;
-		   //XXX: if (interlacing) stats->data.vol.general |= ++INTERLACING;
-		   stats->data.vol.width = width;
-		   stats->data.vol.height = height;
-		   stats->data.vol.par = aspect_ratio;
-		   stats->data.vol.par_width = par_width;
-		   stats->data.vol.par_height = par_height;
-		   return bs.Pos()/8;   //number of bytes consumed
-		}
-		*/
-		goto repeat;
-	}
-	p_bmv.x = p_bmv.y = p_fmv.y = p_fmv.y = 0;
-
-	//packed_mode: special-N_VOP treament
-	if(packed_mode && coding_type == N_VOP) {
-		if(low_delay_default && frames > 0) {
-			//Output(&refn[0], frame, stats, last_coding_type);
-			frame->img_out = &refn[0];
-			output = true;
-		}
-		//ignore otherwise
-	} else if(coding_type != B_VOP) {
-		switch(coding_type) {
-		case I_VOP:
-			PROF_S(PROF_FRM_I);
-			I_Frame(&bs, reduced_resolution, quant, intra_dc_threshold);
-			PROF_E(PROF_FRM_I);
-			break;
-		case P_VOP:
-			P_Frame(&bs, rounding, reduced_resolution, quant, fcode_forward, intra_dc_threshold, NULL);
-			break;
-		case S_VOP:
-			//not called (or very rare)
-			P_Frame(&bs, rounding, reduced_resolution, quant, fcode_forward, intra_dc_threshold, &gmc_warp);
-			break;
-		case N_VOP:
-			//XXX: not_coded vops are not used for forward prediction we should not swap(last_mbs,mbs)
-			cur.Copy(&refn[0], edged_width, height);
-			break;
-		}
-		if(reduced_resolution)
-			cur.deblock_rrv(edged_width, mbs, (width + 31) / 32, (height + 31) / 32, mb_width, 16, 0);
-
-		//note: for packed_mode, output is performed when the special-N_VOP is decoded
-		if(!(low_delay_default && packed_mode)) {
-			if(low_delay) {
-				//Output(&cur, frame, stats, coding_type);
-				frame->img_out = &cur;
-				output = true;
-			} else if(frames > 0) {
-				//is the reference frame valid?
-				// output the reference frame
-				//Output(&refn[0], frame, stats, last_coding_type);
-				frame->img_out = &refn[1];
-				output = true;
-			}
-		}
-		refn[0].Swap(&refn[1]);
-		cur.Swap(&refn[0]);
-		Swap(mbs, last_mbs);
-		last_reduced_resolution = reduced_resolution;
-		last_coding_type = coding_type;
-
-		frames++;
-		seen_something = true;
-	} else {
-		//B_VOP
-		if(low_delay) {
-			DPRINTF(XVID_DEBUG_ERROR, "warning: bvop found in low_delay==1 stream\n");
-			low_delay = true;
-		}
-
-		if(frames < 2) {
-			/* attemping to decode a bvop without atleast 2 reference frames */
-			cur.Print(edged_width, height, 16, 16, "broken b-frame, mising ref frames");
-		} else if(time_pp <= time_bp) {
-			//this occurs when dx50_bvop_compatibility==0 sequences are decoded in vfw
-			cur.Print(edged_width, height, 16, 16, "broken b-frame");
-		} else {
-			B_Frame(&bs, quant, fcode_forward, fcode_backward);
-		}
-		//Output(&cur, frame, stats, coding_type);
-		frame->img_out = &cur;
-		output = true;
-		frames++;
-	}
-
-	bs.ByteAlign();
-
-	//low_delay_default mode: repeat in packed_mode
-	if(low_delay_default && packed_mode && !output && !success) {
-		success = true;
-		goto repeat;
-	}
-done:
-	//low_delay_default mode: if we've gotten here without outputting anything,
-	// then output the recently decoded frame, or print an error message
-	if(low_delay_default && !output) {
-		if(packed_mode && seen_something) {
-			//output the recently decoded frame
-			//Output(&refn[0], frame, stats, last_coding_type);
-			frame->img_out = &refn[0];
-		} else {
-			cur.Clear(width, height, edged_width, 0, 128, 128);
-			cur.Print(edged_width, height, 16, 16, "warning: nothing to output");
-			cur.Print(edged_width, height, 16, 64, "bframe decoder lag");
-
-			//Output(&cur, frame, stats, P_VOP);
-			frame->img_out = &cur;
-			if(stats)
-				stats->type = XVID_TYPE_NOTHING;
-		}
-	}
-
-	PROF_E(PROF_DECODE);
-	//number of bytes consumed
-	return bs.Pos() / 8;
-}
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/decoder.h Deleted

@@ -1,269 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Decoder related header -
- *
- *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: decoder.h,v 1.1.1.1 2005-07-13 14:36:13 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _DECODER_H_
-#define _DECODER_H_
-
-#include "xvid.h"
-#include "portab.h"
-#include "global.h"
-#include "image.h"
-#include "vlc_codes.h"
-#include "Interpolate8x8.h"
-
-/*****************************************************************************
- * Structures
- ****************************************************************************/
-
-/* complexity estimation toggles */
-struct ESTIMATION {
-int method;
-
-int opaque;
-int transparent;
-int intra_cae;
-int inter_cae;
-int no_update;
-int upsampling;
-
-int intra_blocks;
-int inter_blocks;
-int inter4v_blocks;
-int gmc_blocks;
-int not_coded_blocks;
-
-int dct_coefs;
-int dct_lines;
-int vlc_symbols;
-int vlc_bits;
-
-int apm;
-int npm;
-int interpolate_mc_q;
-int forw_back_mc_q;
-int halfpel2;
-int halfpel4;
-
-int sadct;
-int quarterpel;
-
-ESTIMATION() {
-	MemSet(this, 0, sizeof(ESTIMATION));
-}
-};
-
-//----------------------------
-
-struct S_decoder {
-private:
-#ifdef PROFILE
-mutable C_profiler &prof;
-#endif
-
-int Resize();
-
-//----------------------------
-void SetEdges(IMAGE &img) const;
-
-//----------------------------
-void I_Frame(Bitstream * bs, bool reduced_resolution, int quant, int intra_dc_threshold);
-void P_Frame(Bitstream * bs, int rounding, bool reduced_resolution, int quant, int fcode, int intra_dc_threshold, const WARPPOINTS *const gmc_warp);
-void MBIntra(MACROBLOCK *pMB, dword x_pos, dword y_pos, dword acpred_flag, dword cbp,
-             Bitstream *bs, dword quant, dword intra_dc_threshold, dword bound, bool reduced_resolution);
-
-void mb_decode(const dword cbp, Bitstream * bs, byte * pY_Cur, byte * pU_Cur, byte * pV_Cur, bool reduced_resolution, const MACROBLOCK * pMB);
-
-void DecodeInterMacroBlock(const MACROBLOCK *pMB, dword x_pos, dword y_pos, dword cbp, Bitstream *bs,
-                           bool rounding, bool reduced_resolution, int ref);
-
-void mbgmc(MACROBLOCK *pMB, dword x_pos, dword y_pos, dword fcode, dword cbp, Bitstream *bs, bool rounding);
-
-void BFrameInterpolateMBInter(const IMAGE &forward, const IMAGE &backward, const MACROBLOCK *pMB, dword x_pos, dword y_pos, Bitstream *bs, int direct);
-
-void B_Frame(Bitstream * bs, int quant, int fcode_forward, int fcode_backward);
-void GetMotionVector(Bitstream *bs, int x, int y, int k, VECTOR *ret_mv, int fcode, int bound);
-//void Output(IMAGE *img, xvid_dec_frame_t *frame, xvid_dec_stats_t *stats, int coding_type);
-
-int read_video_packet_header(Bitstream *bs, const int addbits, int *quant, int *fcode_forward, int *fcode_backward, int *intra_dc_threshold);
-void read_vol_complexity_estimation_header(Bitstream * bs);
-int BitstreamReadHeaders(Bitstream * bs, bool &rounding, bool *reduced_resolution, dword *quant, dword *fcode_forward,
-                         dword *fcode_backward, dword *intra_dc_threshold, WARPPOINTS *gmc_warp);
-void read_vop_complexity_estimation_header(Bitstream * bs, int coding_type);
-
-int get_coeff(Bitstream *bs, int *run, int *last, int intra, int short_video_header);
-void get_intra_block(Bitstream * bs, int *block, int direction, int coeff);
-void get_inter_block(Bitstream * bs, int *block, int direction);
-
-void idct_int32_init();
-void InverseDiscreteCosineTransform(int *block) const;
-
-friend int decoder_create(xvid_dec_create_t *create);
-
-int Init(xvid_dec_create_t *create);
-
-#ifdef PROFILE
-void interpolate8x8_quarterpel(byte *cur, byte *refn, byte *refh, byte *refv, byte *refhv, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-	::interpolate8x8_quarterpel(cur, refn, refh, refv, refhv, x, y, dx, dy, stride, rounding);
-}
-void interpolate16x16_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-	interpolate8x8_switch(cur, refn, x,   y,   dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x+8, y,   dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x,   y+8, dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x+8, y+8, dx, dy, stride, rounding);
-}
-void interpolate8x8_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-	const byte *src = refn + ((y + (dy>>1)) * stride + x + (dx>>1));
-	byte *dst = cur + (y * stride + x);
-
-	int code = ((dx & 1) << 1) + (dy & 1);
-	//PROF_S(PROF_4+MIN(3, code));
-	switch(code) {
-	case 0:
-		transfer8x8_copy(dst, src, stride);
-		break;
-	case 1:
-		interpolate8x8_halfpel_v(dst, src, stride, rounding);
-		break;
-	case 2:
-		interpolate8x8_halfpel_h(dst, src, stride, rounding);
-		break;
-	default:
-		interpolate8x8_halfpel_hv(dst, src, stride, rounding);
-		break;
-	}
-	//PROF_E(PROF_4+MIN(3, code));
-}
-#endif
-public:
-S_decoder(xvid_dec_create_t *create);
-~S_decoder();
-//vol bitstream
-int time_inc_resolution;
-int fixed_time_inc;
-dword time_inc_bits;
-
-dword shape;
-dword quant_bits;
-dword quant_type;
-dword *mpeg_quant_matrices;
-int quarterpel;
-int complexity_estimation_disable;
-ESTIMATION estimation;
-
-dword top_field_first;
-dword alternate_vertical_scan;
-
-int aspect_ratio;
-int par_width;
-int par_height;
-
-int sprite_enable;
-int sprite_warping_points;
-int sprite_warping_accuracy;
-int sprite_brightness_change;
-
-bool interlacing;
-bool newpred_enable;
-bool reduced_resolution_enable;
-
-/* The bitstream version if it's a XviD stream */
-int bs_version;
-
-/* image */
-
-dword width;
-dword height;
-dword edged_width;
-dword edged_height;
-
-IMAGE cur;
-IMAGE refn[2];          /* 0   -- last I or P VOP */
-
-/* 1   -- first I or P */
-IMAGE tmp;     /* bframe interpolation, and post processing tmp buffer */
-IMAGE qtmp;    /* quarter pel tmp buffer */
-
-/* macroblock */
-
-dword mb_width;
-dword mb_height;
-MACROBLOCK *mbs;
-
-//for B-frame & low_delay==0
-// XXX: should move frame based stuff into a DECODER_FRAMEINFO struct
-MACROBLOCK *last_mbs;         /* last MB */
-int last_coding_type;           /* last coding type value */
-int frames;            /* total frame number */
-VECTOR p_fmv, p_bmv;    /* pred forward & backward motion vector */
-int64_t time;           /* for record time */
-int64_t time_base;
-int64_t last_time_base;
-int64_t last_non_b_time;
-dword time_pp;
-dword time_bp;
-bool fixed_dimensions;
-bool scalability;
-bool low_delay;            //low_delay flage (1 means no B_VOP)
-bool low_delay_default;    //default value for low_delay flag
-bool last_reduced_resolution; //last reduced_resolution value
-bool packed_mode;          //bframes packed bitstream? (1 = yes)
-
-//for GMC: central place for all parameters
-
-IMAGE gmc;     /* gmc tmp buffer, remove for blockbased compensation */
-GMC_DATA gmc_data;
-NEW_GMC_DATA new_gmc_data;
-
-/*
-#ifdef XVID_CSP_SLICE
-xvid_image_t* out_frm;                //This is used for slice rendering
-#endif
-*/
-
-struct REVERSE_EVENT {
-	byte len;
-	EVENT event;
-};
-//decoding tables
-REVERSE_EVENT DCT3D[2][4096];
-VLC coeff_VLC[2][2][64][64];
-
-typedef int t_clip_val;
-t_clip_val iclip[1024];            //clipping table
-
-void init_vlc_tables();
-int Decode(xvid_dec_frame_t * frame, xvid_dec_stats_t * stats);
-};
-
-/*****************************************************************************
- * Decoder prototypes
- ****************************************************************************/
-
-void init_decoder(dword cpu_flags);
-
-int decoder_create(xvid_dec_create_t * param);
-
-
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/font.cpp Deleted

@@ -1,662 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Font rendering to frame buffer functions -
- *
- *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: font.cpp,v 1.1.1.1 2005-07-13 14:36:13 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "image.h"
-
-#define FONT_WIDTH	4
-#define FONT_HEIGHT	6
-
-//----------------------------
-
-static const char ascii33[33][FONT_WIDTH*FONT_HEIGHT] = {
-
-	/* ! */
-	{	0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,1,0
-	},
-
-	/* " */
-	{	0,1,0,1,
-		0,1,0,1,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0
-	},
-
-	/* # */
-	{	0,1,1,0,
-		1,1,1,1,
-		0,1,1,0,
-		0,1,1,0,
-		1,1,1,1,
-		0,1,1,0
-	},
-
-	/* $ */
-	{	0,1,1,0,
-		1,0,1,1,
-		1,1,1,0,
-		0,1,1,1,
-		1,1,0,1,
-		0,1,1,0
-	},
-
-	/* % */
-	{	1,1,0,1,
-		1,0,0,1,
-		0,0,1,0,
-		0,1,0,0,
-		1,0,0,1,
-		1,0,1,1
-	},
-
-	/* & */
-	{	0,1,1,0,
-		1,0,0,0,
-		0,1,0,1,
-		1,0,1,0,
-		1,0,1,0,
-		0,1,0,1
-	},
-
-	/* ' */
-	{	0,0,1,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0
-	},
-
-	/* ( */
-	{	0,0,1,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,0,1,0
-	},
-
-	/* ) */
-	{	0,1,0,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,1,0,0
-	},
-
-	/* * */
-	{	0,0,0,0,
-		1,0,0,1,
-		0,1,1,0,
-		1,1,1,1,
-		0,1,1,0,
-		1,0,0,1
-	},
-
-	/* + */
-	{	0,0,0,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,1,1,1,
-		0,0,1,0,
-		0,0,1,0
-	},
-
-	/* , */
-	{	0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,1,1,0,
-		0,0,1,0
-	},
-
-	/* - */
-	{	0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		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,1,1,0,
-		0,1,1,0
-	},
-
-	/* / */
-	{	0,0,0,1,
-		0,0,0,1,
-		0,0,1,0,
-		0,1,0,0,
-		1,0,0,0,
-		1,0,0,0
-	},
-
-	/* 0 */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,1,1,
-		1,1,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* 1 */
-	{	0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0
-	},
-
-	/* 2 */
-	{	0,1,1,0,
-		1,0,0,1,
-		0,0,1,0,
-		0,1,0,0,
-		1,0,0,0,
-		1,1,1,1
-	},
-
-	/* 3 */
-	{	0,1,1,0,
-		1,0,0,1,
-		0,0,1,0,
-		0,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* 4 */
-	{	0,0,1,0,
-		0,1,1,0,
-		1,0,1,0,
-		1,1,1,1,
-		0,0,1,0,
-		0,0,1,0
-	},
-
-	/* 5 */
-	{	1,1,1,1,
-		1,0,0,0,
-		1,1,1,0,
-		0,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* 6 */
-	{	0,1,1,1,
-		1,0,0,0,
-		1,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* 7 */
-	{	1,1,1,0,
-		0,0,0,1,
-		0,0,0,1,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0
-	},
-
-	/* 8 */
-	{	0,1,1,0,
-		1,0,0,1,
-		0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* 9 */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,1,
-		0,0,0,1,
-		1,1,1,0
-	},
-
-	/* : */
-	{	0,0,0,0,
-		0,0,0,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,1,0,
-		0,0,0,0
-	},
-
-	/* ; */
-	{	0,0,0,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,1,1,0,
-		0,0,1,0
-	},
-
-	/* < */
-	{	0,0,0,1,
-		0,0,1,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,0,1,0,
-		0,0,0,1
-	},
-
-	/* = */
-	{	0,0,0,0,
-		1,1,1,1,
-		0,0,0,0,
-		0,0,0,0,
-		1,1,1,1,
-		0,0,0,0
-	},
-
-	/* > */
-	{	0,1,0,0,
-		0,0,1,0,
-		0,0,0,1,
-		0,0,0,1,
-		0,0,1,0,
-		0,1,0,0
-	},
-
-	/* ? */
-	{	0,1,1,0,
-		1,0,0,1,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,1,0
-	},
-
-	/* @ */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,1,1,
-		1,0,1,1,
-		1,0,0,0,
-		0,1,1,0
-	},
-
-};
-
-
-static const char ascii65[26][FONT_WIDTH*FONT_HEIGHT] = {
-	/* A */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,1,1,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* B */
-	{	1,1,1,0,
-		1,0,0,1,
-		1,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,1,1,0
-	},
-
-	/* C */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,0,0,
-		1,0,0,0,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* D */
-	{	1,1,0,0,
-		1,0,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,1,0,
-		1,1,0,0
-	},
-
-	/* E */
-	{	1,1,1,1,
-		1,0,0,0,
-		1,1,1,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,1,1,1
-	},
-
-	/* F */
-	{	1,1,1,1,
-		1,0,0,0,
-		1,1,1,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,0,0,0
-	},
-
-	/* G */
-	{	0,1,1,1,
-		1,0,0,0,
-		1,0,1,1,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* H */
-	{	1,0,0,1,
-		1,0,0,1,
-		1,1,1,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* I */
-	{	0,1,1,1,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,1,1,1
-	},
-
-	/* J */
-	{	0,1,1,1,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		1,0,1,0,
-		0,1,0,0
-	},
-
-	/* K */
-	{	1,0,0,1,
-		1,0,0,1,
-		1,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* L */
-	{	1,0,0,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,1,1,1
-	},
-
-	/* M */
-	{	1,0,0,1,
-		1,1,1,1,
-		1,1,1,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* N */
-	{	1,0,0,1,
-		1,1,0,1,
-		1,1,0,1,
-		1,0,1,1,
-		1,0,1,1,
-		1,0,0,1
-	},
-
-	/* 0 */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* P */
-	{	1,1,1,0,
-		1,0,0,1,
-		1,1,1,0,
-		1,0,0,0,
-		1,0,0,0,
-		1,0,0,0
-	},
-
-	/* Q */
-	{	0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,1,0,
-		0,1,0,1
-	},
-
-
-	/* R */
-	{	1,1,1,0,
-		1,0,0,1,
-		1,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* S */
-	{	0,1,1,0,
-		1,0,0,1,
-		0,1,0,0,
-		0,0,1,0,
-		1,0,0,1,
-		0,1,1,0
-	},
-
-	/* T */
-	{	0,1,1,1,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0
-	},
-
-	/* U */
-	{	1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,1,1,1
-	},
-
-	/* V */
-	{	1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		0,1,1,0,
-		0,1,1,0,
-		0,1,1,0
-	},
-
-	/* W */
-	{	1,0,0,1,
-		1,0,0,1,
-		1,0,0,1,
-		1,1,1,1,
-		1,1,1,1,
-		1,0,0,1
-	},
-
-	/* X */
-	{	1,0,0,1,
-		1,0,0,1,
-		0,1,1,0,
-		1,0,0,1,
-		1,0,0,1,
-		1,0,0,1
-	},
-
-	/* Y */
-	{	1,0,0,1,
-		1,0,0,1,
-		0,1,0,0,
-		0,0,1,0,
-		0,1,0,0,
-		1,0,0,0
-	},
-
-	/* Z */
-	{	1,1,1,1,
-		0,0,0,1,
-		0,0,1,0,
-		0,1,0,0,
-		1,0,0,0,
-		1,1,1,1
-	},
-
-};
-
-
-
-static const char ascii91[6][FONT_WIDTH*FONT_HEIGHT] = {
-	/* [ */
-	{	0,1,1,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,1,0,0,
-		0,1,1,0
-	},
-
-	/* '\' */
-	{	1,0,0,0,
-		1,0,0,0,
-		0,1,0,0,
-		0,0,1,0,
-		0,0,0,1,
-		0,0,0,1
-	},
-
-	/* ] */
-	{	0,1,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,0,1,0,
-		0,1,1,0
-	},
-
-	/* ^ */
-	{	0,1,0,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,
-		1,1,1,1
-	},
-
-	/* ` */
-	{	0,1,0,0,
-		0,0,1,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0,
-		0,0,0,0
-	}
-};
-
-//----------------------------
-
-#define FONT_ZOOM	2
-
-void IMAGE::draw_num(const int stride, const int height, const char * font, const int x, const int y) {
-
-	for(int j = 0; j < FONT_ZOOM * FONT_HEIGHT && y+j < height; j++) {
-		for(int i = 0; i < FONT_ZOOM * FONT_WIDTH && x+i < stride; i++) {
-			if(font[(j/FONT_ZOOM)*FONT_WIDTH + (i/FONT_ZOOM)]) {
-				int offset = (y+j)*stride + (x+i);
-				int offset2 =((y+j)/2)*(stride/2) + ((x+i)/2);
-				IMAGE::y[offset] = 255;
-				IMAGE::u[offset2] = 127;
-				IMAGE::v[offset2] = 127;
-			}
-		}
-	}
-}
-
-//----------------------------
-
-void IMAGE::Print(int edged_width, int height, int x, int y, const char *buf) {
-
-	int i;
-
-	for(i = 0; buf[i]; i++) {
-		const char * font;
-
-		if (buf[i] >= '!' && buf[i] <= '@')
-			font = ascii33[buf[i]-'!'];
-		else if (buf[i] >= 'A' && buf[i] <= 'Z')
-			font = ascii65[buf[i]-'A'];
-		else if (buf[i] >= '[' && buf[i] <= '`')
-			font = ascii91[buf[i]-'['];
-		else if (buf[i] >= 'a' && buf[i] <= 'z')
-			font = ascii65[buf[i]-'a'];
-		else
-			continue;
-		draw_num(edged_width, height, font, x + i*FONT_ZOOM*(FONT_WIDTH+1), y);
-	}
-}

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/global.h Deleted

@@ -1,361 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Global definitions  -
- *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: global.h,v 1.1.1.1 2005-07-13 14:36:14 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
-
-#include "xvid.h"
-#include "portab.h"
-
-//----------------------------
-
-void MemSet(void *dst, byte c, dword len);
-int MemCmp(const void *mem1, const void *mem2, dword len);
-void MemCpy(void *dst, const void *src, dword len);
-
-template<class T>
-inline void Swap(T &l, T &r) {
-T tmp = r;
-r = l;
-l = tmp;
-}
-
-#ifndef __SYMBIAN32__
-
-enum TLeave { ELeave };
-void *operator new(size_t sz, TLeave);
-inline void operator delete(void *vp, TLeave) {
-	operator delete(vp);
-}
-
-#endif
-
-//----------------------------
-// Fatal error - display message, and exit program immediately.
-void Fatal(const char *msg, dword code = 0);
-
-//----------------------------
-#ifndef assert
-
-#ifdef NDEBUG
-#define assert(exp) ((void)0)
-#else
-
-#define assert(exp) if(!(exp)){\
-   Fatal(#exp, __LINE__); }
-
-#endif
-#endif
-
-//----------------------------
-/* --- macroblock modes --- */
-
-#define MODE_INTER      0
-#define MODE_INTER_Q 1
-#define MODE_INTER4V 2
-#define  MODE_INTRA     3
-#define MODE_INTRA_Q 4
-#define MODE_NOT_CODED  16
-#define MODE_NOT_CODED_GMC 17
-
-/* --- bframe specific --- */
-
-#define MODE_DIRECT        0
-#define MODE_INTERPOLATE   1
-#define MODE_BACKWARD      2
-#define MODE_FORWARD    3
-#define MODE_DIRECT_NONE_MV   4
-#define MODE_DIRECT_NO4V   5
-
-
-/*
- * vop coding types
- * intra, prediction, backward, sprite, not_coded
- */
-#define I_VOP  0
-#define P_VOP  1
-#define B_VOP  2
-#define S_VOP  3
-#define N_VOP  4
-
-//----------------------------
-// convert mpeg-4 coding type i/p/b/s_VOP to XVID_TYPE_xxx
-inline int coding2type(int coding_type) {
-	return coding_type + 1;
-}
-
-//----------------------------
-// convert XVID_TYPE_xxx to bitstream coding type i/p/b/s_VOP
-inline int type2coding(int xvid_type) {
-	return xvid_type - 1;
-}
-
-
-typedef struct
-{
-	int x;
-	int y;
-}
-VECTOR;
-
-
-
-typedef struct
-{
-	VECTOR duv[3];
-}
-WARPPOINTS;
-
-/* save all warping parameters for GMC once and for all, instead of
-   recalculating for every block. This is needed for encoding&decoding
-   When switching to incremental calculations, this will get much shorter
-*/
-
-/* we don't include WARPPOINTS wp   here, but in FRAMEINFO itself */
-
-struct GMC_DATA {
-	int num_wp;    /* [input]: 0=none, 1=translation, 2,3 = warping */
-	/* a value of -1 means: "structure not initialized!" */
-	int s;               /* [input]: calc is done with 1/s pel resolution */
-
-	int W;
-	int H;
-
-	int ss;
-	int smask;
-	int sigma;
-
-	int r;
-	int rho;
-
-	int i0s;
-	int j0s;
-	int i1s;
-	int j1s;
-	int i2s;
-	int j2s;
-
-	int i1ss;
-	int j1ss;
-	int i2ss;
-	int j2ss;
-
-	int alpha;
-	int beta;
-	int Ws;
-	int Hs;
-
-	int dxF, dyF, dxG, dyG;
-	int Fo, Go;
-	int cFo, cGo;
-
-	GMC_DATA() {
-		MemSet(this, 0, sizeof(GMC_DATA));
-	}
-};
-
-struct NEW_GMC_DATA {
-	/*  0=none, 1=translation, 2,3 = warping
-	*  a value of -1 means: "structure not initialized!" */
-	int num_wp;
-
-	/* {0,1,2,3}  =>   {1/2,1/4,1/8,1/16} pel */
-	int accuracy;
-
-	/* sprite size * 16 */
-	int sW, sH;
-
-	/* gradient, calculated from warp points */
-	int dU[2], dV[2], Uo, Vo, Uco, Vco;
-
-	void (*predict_16x16)(const NEW_GMC_DATA * const This,
-	                      byte *dst, const byte *src,
-	                      int dststride, int srcstride, int x, int y, int rounding);
-	void (*predict_8x8)  (const NEW_GMC_DATA * const This,
-	                      byte *uDst, const byte *uSrc,
-	                      byte *vDst, const byte *vSrc,
-	                      int dststride, int srcstride, int x, int y, int rounding);
-	void (*get_average_mv)(const NEW_GMC_DATA * const Dsp, VECTOR * const mv,
-	                       int x, int y, int qpel);
-
-	NEW_GMC_DATA() {
-		MemSet(this, 0, sizeof(NEW_GMC_DATA));
-	}
-};
-
-//----------------------------
-
-struct IMAGE: public C_xvid_image {
-private:
-	void draw_num(const int stride, const int height, const char * font, const int x, const int y);
-public:
-	void Print(int edged_width, int height, int x, int y, const char *fmt);
-	void Swap(IMAGE *image2);
-	void Copy(const IMAGE * image2, dword edged_width, dword height);
-	void Clear(int width, int height, int edged_width, int y, int u, int v);
-	void deblock_rrv(int edged_width, const struct MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride, int block, int flags);
-
-	inline void Null() {
-		y = u = v = 0;
-	}
-};
-
-//----------------------------
-
-struct Bitstream {
-	dword bufa;
-	dword bufb;
-	dword buf;
-	dword pos;                //bit position in currently cached 2 dwords (0-31)
-	dword *tail;
-	dword *start;
-	dword length;
-	dword initpos;
-
-	void Init(const void *bitstream, dword length);
-	dword ShowBits(dword bits);
-	void get_matrix(byte *matrix);
-	void Skip(dword bits);
-
-//----------------------------
-// number of bits to next byte alignment
-	inline dword NumBitsToByteAlign() const {
-		dword n = (32 - pos) & 7;
-		return n == 0 ? 8 : n;
-	}
-	dword ShowBitsFromByteAlign(int bits);
-
-//----------------------------
-// move forward to the next byte boundary
-	void ByteAlign() {
-		dword remainder = pos & 7;
-		if (remainder) {
-			Skip(8 - remainder);
-		}
-	}
-
-//----------------------------
-// bitstream length (unit bits)
-	inline dword Pos() const {
-		return((dword)(8*((dword)tail - (dword)start) + pos - initpos));
-	}
-
-	dword GetBits(const dword n);
-
-//----------------------------
-// read single bit from bitstream
-	inline dword GetBit() {
-		return GetBits(1);
-	}
-
-//----------------------------
-
-	int GetMcbpcInter();
-	int GetCbpy(int intra);
-	int GetMoveVector(int fcode);
-
-//----------------------------
-
-	int check_resync_marker(int addbits);
-	int bs_get_spritetrajectory();
-	int get_mcbpc_intra();
-	int get_dc_dif(dword dc_size);
-	int get_dc_size_lum();
-	int get_dc_size_chrom();
-};
-
-
-#define MBPRED_SIZE  15
-
-
-struct MACROBLOCK {
-	/* decoder/encoder */
-	VECTOR mvs[4];
-
-	int pred_values[6][MBPRED_SIZE];
-	int acpred_directions[6];
-
-	int mode;
-	int quant;              /* absolute quant */
-
-	int field_dct;
-	int field_pred;
-	int field_for_top;
-	int field_for_bot;
-
-	/* encoder specific */
-
-	VECTOR mv16;
-	VECTOR pmvs[4];
-	VECTOR qmvs[4];            /* mvs in quarter pixel resolution */
-
-	int sad8[4];        /* SAD values for inter4v-VECTORs */
-	int sad16;          /* SAD value for inter-VECTOR */
-
-	int dquant;
-	int cbp;
-
-	/* bframe stuff */
-
-	VECTOR b_mvs[4];
-	VECTOR b_qmvs[4];
-
-	int mb_type;
-
-	/*
-	 * stuff for block based ME (needed for Qpel ME)
-	 * backup of last integer ME vectors/sad
-	 */
-
-	VECTOR amv; /* average motion vectors from GMC  */
-	int mcsel;
-
-	/* This structure has become way to big! What to do? Split it up?   */
-
-};
-
-//----------------------------
-
-inline dword log2bin(dword value) {
-	int n = 0;
-
-	while (value) {
-		value >>= 1;
-		n++;
-	}
-	return n;
-}
-
-//----------------------------
-
-/* useful macros */
-
-#define MIN(X, Y) ((X)<(Y)?(X):(Y))
-#define MAX(X, Y) ((X)>(Y)?(X):(Y))
-#define ABS(X)    (((X)>0)?(X):-(X))
-#define SIGN(X)   (((X)>0)?1:-1)
-#define CLIP(X,AMIN,AMAX)   (((X)<(AMIN)) ? (AMIN) : ((X)>(AMAX)) ? (AMAX) : (X))
-
-#endif                     /* _GLOBAL_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/gmc.cpp Deleted

@@ -1,412 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - GMC interpolation module -
- *
- *  Copyright(C) 2002-2003 Pascal Massimino <skal@planet-d.net>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: gmc.cpp,v 1.1.1.1 2005-07-13 14:36:14 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "portab.h"
-#include "global.h"
-#include "gmc.h"
-
-/* ************************************************************
- * Pts = 2 or 3
- *
- * Warning! *src is the global frame pointer (that is: address
- * of pixel 0,0), not the macroblock one.
- * Conversely, *dst is the macroblock top-left address.
- */
-static void Predict_16x16_C(const NEW_GMC_DATA * const This, byte *dst, const byte *src, int dststride, int srcstride, int x, int y, int rounding) {
-
-	const int W = This->sW;
-	const int H = This->sH;
-	const int rho = 3 - This->accuracy;
-	const int Rounder = ( (1<<7) - (rounding<<(2*rho)) ) << 16;
-
-	const int dUx = This->dU[0];
-	const int dVx = This->dV[0];
-	const int dUy = This->dU[1];
-	const int dVy = This->dV[1];
-
-	int Uo = This->Uo + 16*(dUy*y + dUx*x);
-	int Vo = This->Vo + 16*(dVy*y + dVx*x);
-
-	int i, j;
-
-	dst += 16;
-	for (j=16; j>0; --j) {
-		int U = Uo, V = Vo;
-		Uo += dUy;
-		Vo += dVy;
-		for (i=-16; i<0; ++i) {
-			unsigned int f0, f1, ri = 16, rj = 16;
-			int Offset;
-			int u = ( U >> 16 ) << rho;
-			int v = ( V >> 16 ) << rho;
-
-			U += dUx;
-			V += dVx;
-
-			if (u > 0 && u <= W) {
-				ri = MTab[u&15];
-				Offset = u>>4;
-			}
-			else if (u > W) Offset = W>>4;
-			else Offset = -1;
-
-			if (v > 0 && v <= H) {
-				rj = MTab[v&15];
-				Offset += (v>>4)*srcstride;
-			}
-			else if (v > H) Offset += (H>>4)*srcstride;
-			else Offset -= srcstride;
-
-			f0 = src[Offset + 0];
-			f0 |= src[Offset + 1] << 16;
-			f1 = src[Offset + srcstride + 0];
-			f1 |= src[Offset + srcstride + 1] << 16;
-			f0 = (ri*f0)>>16;
-			f1 = (ri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = (rj*f0 + Rounder) >> 24;
-
-			dst[i] = (byte)f0;
-		}
-		dst += dststride;
-	}
-}
-
-//----------------------------
-
-static void Predict_8x8_C(const NEW_GMC_DATA * const This, byte *uDst, const byte *uSrc,
-                          byte *vDst, const byte *vSrc, int dststride, int srcstride, int x, int y, int rounding) {
-
-	const int W  = This->sW >> 1;
-	const int H  = This->sH >> 1;
-	const int rho = 3-This->accuracy;
-	const int Rounder = ( 128 - (rounding<<(2*rho)) ) << 16;
-
-	const int dUx = This->dU[0];
-	const int dVx = This->dV[0];
-	const int dUy = This->dU[1];
-	const int dVy = This->dV[1];
-
-	int Uo = This->Uco + 8*(dUy*y + dUx*x);
-	int Vo = This->Vco + 8*(dVy*y + dVx*x);
-
-	int i, j;
-
-	uDst += 8;
-	vDst += 8;
-	for (j=8; j>0; --j) {
-		int U = Uo, V = Vo;
-		Uo += dUy;
-		Vo += dVy;
-
-		for (i=-8; i<0; ++i) {
-			int Offset;
-			dword f0, f1, ri, rj;
-			int u, v;
-
-			u = ( U >> 16 ) << rho;
-			v = ( V >> 16 ) << rho;
-			U += dUx;
-			V += dVx;
-
-			if (u > 0 && u <= W) {
-				ri = MTab[u&15];
-				Offset = u>>4;
-			} else {
-				ri = 16;
-				if (u>W) Offset = W>>4;
-				else Offset = -1;
-			}
-
-			if (v > 0 && v <= H) {
-				rj = MTab[v&15];
-				Offset += (v>>4)*srcstride;
-			} else {
-				rj = 16;
-				if (v>H) Offset += (H>>4)*srcstride;
-				else Offset -= srcstride;
-			}
-
-			f0 = uSrc[Offset + 0];
-			f0 |= uSrc[Offset + 1] << 16;
-			f1 = uSrc[Offset + srcstride + 0];
-			f1 |= uSrc[Offset + srcstride + 1] << 16;
-			f0 = (ri*f0)>>16;
-			f1 = (ri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = (rj*f0 + Rounder) >> 24;
-
-			uDst[i] = (byte)f0;
-
-			f0 = vSrc[Offset + 0];
-			f0 |= vSrc[Offset + 1] << 16;
-			f1 = vSrc[Offset + srcstride + 0];
-			f1 |= vSrc[Offset + srcstride + 1] << 16;
-			f0 = (ri*f0)>>16;
-			f1 = (ri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = (rj*f0 + Rounder) >> 24;
-
-			vDst[i] = (byte)f0;
-		}
-		uDst += dststride;
-		vDst += dststride;
-	}
-}
-
-//----------------------------
-
-static void get_average_mv_C(const NEW_GMC_DATA * const Dsp, VECTOR * const mv, int x, int y, int qpel) {
-
-	int i, j;
-	int vx = 0, vy = 0;
-	int uo = Dsp->Uo + 16*(Dsp->dU[1]*y + Dsp->dU[0]*x);
-	int vo = Dsp->Vo + 16*(Dsp->dV[1]*y + Dsp->dV[0]*x);
-	for (j=16; j>0; --j)
-	{
-		int U, V;
-		U = uo;
-		uo += Dsp->dU[1];
-		V = vo;
-		vo += Dsp->dV[1];
-		for (i=16; i>0; --i)
-		{
-			int u,v;
-			u = U >> 16;
-			U += Dsp->dU[0];
-			vx += u;
-			v = V >> 16;
-			V += Dsp->dV[0];
-			vy += v;
-		}
-	}
-	vx -= (256*x+120) << (5+Dsp->accuracy);   /* 120 = 15*16/2 */
-	vy -= (256*y+120) << (5+Dsp->accuracy);
-
-	mv->x = RSHIFT( vx, 8+Dsp->accuracy - qpel );
-	mv->y = RSHIFT( vy, 8+Dsp->accuracy - qpel );
-}
-
-//----------------------------
-/* ************************************************************
- * simplified version for 1 warp point
- */
-static void Predict_1pt_16x16_C(const NEW_GMC_DATA * const This, byte *Dst, const byte *Src, int dststride, int srcstride, int x, int y, int rounding) {
-
-	const int W  = This->sW;
-	const int H  = This->sH;
-	const int rho = 3-This->accuracy;
-	const int Rounder = ( 128 - (rounding<<(2*rho)) ) << 16;
-
-
-	int uo = This->Uo + (x<<8);    /* ((16*x)<<4) */
-	int vo = This->Vo + (y<<8);
-	const dword ri = MTab[uo & 15];
-	const dword rj = MTab[vo & 15];
-	int i, j;
-
-	int Offset;
-	if ((dword)vo<=(dword)H) Offset  = (vo>>4)*srcstride;
-	else if (vo>H)           Offset  = ( H>>4)*srcstride;
-	else                     Offset  =-16*srcstride;
-	if ((dword)uo<=(dword)W) Offset += (uo>>4);
-	else if (uo>W)           Offset += ( W>>4);
-	else                     Offset -= 16;
-
-	Dst += 16;
-
-	for(j=16; j>0; --j, Offset+=srcstride-16)
-	{
-		for(i=-16; i<0; ++i, ++Offset)
-		{
-			dword f0, f1;
-			f0 = Src[ Offset     +0 ];
-			f0 |= Src[ Offset    +1 ] << 16;
-			f1 = Src[ Offset+srcstride +0 ];
-			f1 |= Src[ Offset+srcstride +1 ] << 16;
-			f0 = (ri*f0)>>16;
-			f1 = (ri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = ( rj*f0 + Rounder ) >> 24;
-			Dst[i] = (byte)f0;
-		}
-		Dst += dststride;
-	}
-}
-
-//----------------------------
-
-static void Predict_1pt_8x8_C(const NEW_GMC_DATA * const This, byte *uDst, const byte *uSrc,
-                              byte *vDst, const byte *vSrc, int dststride, int srcstride, int x, int y, int rounding) {
-
-	const int W  = This->sW >> 1;
-	const int H  = This->sH >> 1;
-	const int rho = 3-This->accuracy;
-	const int Rounder = ( 128 - (rounding<<(2*rho)) ) << 16;
-
-	int uo = This->Uco + (x<<7);
-	int vo = This->Vco + (y<<7);
-	const dword rri = MTab[uo & 15];
-	const dword rrj = MTab[vo & 15];
-	int i, j;
-
-	int Offset;
-	if ((dword)vo<=(dword)H) Offset = (vo>>4)*srcstride;
-	else if (vo>H) Offset = ( H>>4)*srcstride;
-	else Offset =-8*srcstride;
-	if ((dword)uo<=(dword)W) Offset += (uo>>4);
-	else if (uo>W) Offset += (W>>4);
-	else Offset -= 8;
-
-	uDst += 8;
-	vDst += 8;
-	for(j=8; j>0; --j, Offset+=srcstride-8)
-	{
-		for(i=-8; i<0; ++i, Offset++)
-		{
-			dword f0, f1;
-			f0 = uSrc[ Offset + 0 ];
-			f0 |= uSrc[ Offset + 1 ] << 16;
-			f1 = uSrc[ Offset + srcstride + 0 ];
-			f1 |= uSrc[ Offset + srcstride + 1 ] << 16;
-			f0 = (rri*f0)>>16;
-			f1 = (rri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = ( rrj*f0 + Rounder ) >> 24;
-			uDst[i] = (byte)f0;
-
-			f0 = vSrc[ Offset + 0 ];
-			f0 |= vSrc[ Offset + 1 ] << 16;
-			f1 = vSrc[ Offset + srcstride + 0 ];
-			f1 |= vSrc[ Offset + srcstride + 1 ] << 16;
-			f0 = (rri*f0)>>16;
-			f1 = (rri*f1) & 0x0fff0000;
-			f0 |= f1;
-			f0 = ( rrj*f0 + Rounder ) >> 24;
-			vDst[i] = (byte)f0;
-		}
-		uDst += dststride;
-		vDst += dststride;
-	}
-}
-
-//----------------------------
-
-static void get_average_mv_1pt_C(const NEW_GMC_DATA *const Dsp, VECTOR * const mv, int x, int y, int qpel) {
-
-	mv->x = RSHIFT(Dsp->Uo<<qpel, 3);
-	mv->y = RSHIFT(Dsp->Vo<<qpel, 3);
-}
-
-//----------------------------
-
-void generate_GMCparameters(int nb_pts, int accuracy, const WARPPOINTS *pts, int width, int height, NEW_GMC_DATA *gmc) {
-
-	gmc->sW = width   << 4;
-	gmc->sH = height << 4;
-	gmc->accuracy = accuracy;
-	gmc->num_wp = nb_pts;
-
-	//reduce the number of points, if possible
-	if(nb_pts<3 || (pts->duv[2].x==-pts->duv[1].y && pts->duv[2].y==pts->duv[1].x)) {
-		if(nb_pts<2 || (pts->duv[1].x==0 && pts->duv[1].y==0)) {
-			if(nb_pts<1 || (pts->duv[0].x==0 && pts->duv[0].y==0)) {
-				nb_pts = 0;
-			} else
-				nb_pts = 1;
-		} else
-			nb_pts = 2;
-	} else
-		nb_pts = 3;
-
-	//now, nb_pts stores the actual number of points required for interpolation
-	if(nb_pts<=1) {
-		if(nb_pts==1) {
-			/* store as 4b fixed point */
-			gmc->Uo = pts->duv[0].x << accuracy;
-			gmc->Vo = pts->duv[0].y << accuracy;
-			gmc->Uco = ((pts->duv[0].x>>1) | (pts->duv[0].x&1)) << accuracy;   /* DIV2RND() */
-			gmc->Vco = ((pts->duv[0].y>>1) | (pts->duv[0].y&1)) << accuracy;   /* DIV2RND() */
-		} else {  /* zero points?! */
-			gmc->Uo  = gmc->Vo   = 0;
-			gmc->Uco = gmc->Vco = 0;
-		}
-
-		gmc->predict_16x16   = Predict_1pt_16x16_C;
-		gmc->predict_8x8  = Predict_1pt_8x8_C;
-		gmc->get_average_mv = get_average_mv_1pt_C;
-	} else {     /* 2 or 3 points */
-		const int rho   = 3 - accuracy;  /* = {3,2,1,0} for Acc={0,1,2,3} */
-		int Alpha = log2bin(width-1);
-		int Ws = 1 << Alpha;
-
-		gmc->dU[0] = 16*Ws + RDIV( 8*Ws*pts->duv[1].x, width );   /* dU/dx */
-		gmc->dV[0] =       RDIV( 8*Ws*pts->duv[1].y, width );  /* dV/dx */
-
-		/*  disabled, because possibly buggy? */
-
-#if 0
-		if (nb_pts==2) {
-			gmc->dU[1] = -gmc->dV[0];  /* -Sin */
-			gmc->dV[1] =   gmc->dU[0] ;   /* Cos */
-		}
-		else
-#endif
-		{
-			const int Beta = log2bin(height-1);
-			const int Hs = 1<<Beta;
-			gmc->dU[1] =       RDIV( 8*Hs*pts->duv[2].x, height );    /* dU/dy */
-			gmc->dV[1] = 16*Hs + RDIV( 8*Hs*pts->duv[2].y, height );  /* dV/dy */
-			if (Beta>Alpha) {
-				gmc->dU[0] <<= (Beta-Alpha);
-				gmc->dV[0] <<= (Beta-Alpha);
-				Alpha = Beta;
-				Ws = Hs;
-			}
-			else {
-				gmc->dU[1] <<= Alpha - Beta;
-				gmc->dV[1] <<= Alpha - Beta;
-			}
-		}
-		/* upscale to 16b fixed-point */
-		gmc->dU[0] <<= (16-Alpha - rho);
-		gmc->dU[1] <<= (16-Alpha - rho);
-		gmc->dV[0] <<= (16-Alpha - rho);
-		gmc->dV[1] <<= (16-Alpha - rho);
-
-		gmc->Uo  = ( pts->duv[0].x  <<(16+ accuracy)) + (1<<15);
-		gmc->Vo  = ( pts->duv[0].y  <<(16+ accuracy)) + (1<<15);
-		gmc->Uco = ((pts->duv[0].x-1)<<(17+ accuracy)) + (1<<17);
-		gmc->Vco = ((pts->duv[0].y-1)<<(17+ accuracy)) + (1<<17);
-		gmc->Uco = (gmc->Uco + gmc->dU[0] + gmc->dU[1])>>2;
-		gmc->Vco = (gmc->Vco + gmc->dV[0] + gmc->dV[1])>>2;
-
-		gmc->predict_16x16   = Predict_16x16_C;
-		gmc->predict_8x8  = Predict_8x8_C;
-		gmc->get_average_mv = get_average_mv_C;
-	}
-}
-
-//----------------------------
\ No newline at end of file

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/gmc.h Deleted

@@ -1,45 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - GMC interpolation module header -
- *
- *  Copyright(C) 2002-2003 Pascal Massimino <skal@planet-d.net>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: gmc.h,v 1.1.1.1 2005-07-13 14:36:14 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "portab.h"
-#include "global.h"
-
-
-#define RDIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-#define RSHIFT(a,b) ( (a)>0 ? ((a) + (1<<((b)-1)))>>(b) : ((a) + (1<<((b)-1))-1)>>(b))
-
-#define MLT(i)  (((16-(i))<<16) + (i))
-static const dword MTab[16] = {
-	MLT( 0), MLT( 1), MLT( 2), MLT( 3), MLT( 4), MLT( 5), MLT( 6), MLT( 7),
-	MLT( 8), MLT( 9), MLT(10), MLT(11), MLT(12), MLT(13), MLT(14), MLT(15)
-};
-#undef MLT
-
-
-/* *************************************************************
- * Warning! It's Accuracy being passed, not 'resolution'!
- */
-void generate_GMCparameters(int nb_pts, int accuracy, const WARPPOINTS *pts, int width, int height, NEW_GMC_DATA *gmc);
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/idct.cpp Deleted

@@ -1,210 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Inverse DCT  -
- *
- *  These routines are from Independent JPEG Group's free JPEG software
- *  Copyright (C) 1991-1998, Thomas G. Lane (see the file README.IJG)
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: idct.cpp,v 1.2 2006-12-13 15:12:27 jeanlf Exp $
- *
- ****************************************************************************/
-
-/* Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. */
-
-/*
- * Disclaimer of Warranty
- *
- * These software programs are available to the user without any license fee or
- * royalty on an "as is" basis.  The MPEG Software Simulation Group disclaims
- * any and all warranties, whether express, implied, or statuary, including any
- * implied warranties or merchantability or of fitness for a particular
- * purpose.  In no event shall the copyright-holder be liable for any
- * incidental, punitive, or consequential damages of any kind whatsoever
- * arising from the use of these programs.
- *
- * This disclaimer of warranty extends to the user of these programs and user's
- * customers, employees, agents, transferees, successors, and assigns.
- *
- * The MPEG Software Simulation Group does not represent or warrant that the
- * programs furnished hereunder are free of infringement of any third-party
- * patents.
- *
- * Commercial implementations of MPEG-1 and MPEG-2 video, including shareware,
- * are subject to royalty fees to patent holders.  Many of these patents are
- * general enough such that they are unavoidable regardless of implementation
- * design.
- *
- * MPEG2AVI
- * --------
- * v0.16B33 renamed the initialization function to init_idct_int32()
- * v0.16B32 removed the unused idct_row() and idct_col() functions
- * v0.16B3  changed var declarations to static, to enforce data align
- * v0.16B22  idct_FAST() renamed to idct_int32()
- *        also merged idct_FAST() into a single function, to help VC++
- *        optimize it.
- *
- * v0.14  changed int to long, to avoid confusion when compiling on x86
- *        platform ( in VC++ "int" -> 32bits )
- */
-
-/**********************************************************/
-/* inverse two dimensional DCT, Chen-Wang algorithm       */
-/* (cf. IEEE ASSP-32, pp. 803-816, Aug. 1984)             */
-/* 32-bit integer arithmetic (8 bit coefficients)         */
-/* 11 mults, 29 adds per DCT                              */
-/*                                      sE, 18.8.91       */
-/**********************************************************/
-/* coefficients extended to 12 bit for IEEE1180-1990      */
-/* compliance                           sE,  2.1.94       */
-/**********************************************************/
-
-/* this code assumes >> to be a two's-complement arithmetic */
-/* right shift: (-2)>>1 == -1 , (-3)>>1 == -2               */
-
-#include "Decoder.h"
-
-const int __W1 = 2841,        //2048*sqrt(2)*cos(1*pi/16)
-          __W2 = 2676,               // 2048*sqrt(2)*cos(2*pi/16)
-          __W3 = 2408,               // 2048*sqrt(2)*cos(3*pi/16)
-          __W5 = 1609,               // 2048*sqrt(2)*cos(5*pi/16)
-          __W6 = 1108,               // 2048*sqrt(2)*cos(6*pi/16)
-          __W7 = 565;                // 2048*sqrt(2)*cos(7*pi/16)
-
-//----------------------------
-/* two dimensional inverse discrete cosine transform */
-//idct_int32_init() must be called before the first call to this function!
-void S_decoder::InverseDiscreteCosineTransform(int *block) const {
-
-	const t_clip_val *iclp = iclip + 512;
-#if defined USE_ARM_ASM
-	void InverseDiscreteCosineTransform_ARM(int *block, const int *iclip);
-	InverseDiscreteCosineTransform_ARM(block, iclp);
-#else
-	int i;
-	//idct rows
-	for(i = 8; i--; block += 8) {
-		int X0 = block[0];
-		int X1, X2, X3, X4, X5, X6, X7;
-		if(!((X1 = block[4]) | (X2 = block[6]) | (X3 = block[2]) | (X4 = block[1]) | (X5 = block[7]) | (X6 = block[5]) | (X7 = block[3]))) {
-			block[0] = block[1] = block[2] = block[3] = block[4] = block[5] = block[6] = block[7] = X0 << 3;
-			continue;
-		}
-		//for proper rounding in the fourth stage
-		X0 = (X0 << 11) + 128;
-		X1 <<= 11;
-
-		//first stage
-		int X8 = __W7 * (X4 + X5);
-		X4 = X8 + (__W1 - __W7) * X4;
-		X5 = X8 - (__W1 + __W7) * X5;
-		X8 = __W3 * (X6 + X7);
-		X6 = X8 - (__W3 - __W5) * X6;
-		X7 = X8 - (__W3 + __W5) * X7;
-
-		//second stage
-		X8 = X0 + X1;
-		X0 -= X1;
-		X1 = __W6 * (X3 + X2);
-		X2 = X1 - (__W2 + __W6) * X2;
-		X3 = X1 + (__W2 - __W6) * X3;
-		X1 = X4 + X6;
-		X4 -= X6;
-		X6 = X5 + X7;
-		X5 -= X7;
-
-		//third stage
-		X7 = X8 + X3;
-		X8 -= X3;
-		X3 = X0 + X2;
-		X0 -= X2;
-		X2 = (181 * (X4 + X5) + 128) >> 8;
-		X4 = (181 * (X4 - X5) + 128) >> 8;
-
-		//fourth stage
-		block[0] = ((X7 + X1) >> 8);
-		block[1] = ((X3 + X2) >> 8);
-		block[2] = ((X0 + X4) >> 8);
-		block[3] = ((X8 + X6) >> 8);
-		block[4] = ((X8 - X6) >> 8);
-		block[5] = ((X0 - X4) >> 8);
-		block[6] = ((X3 - X2) >> 8);
-		block[7] = ((X7 - X1) >> 8);
-	}
-	block -= 8*8;
-	//idct columns
-	for(i = 8; i--; ++block) {
-		int X0 = block[8 * 0];
-		int X1, X2, X3, X4, X5, X6, X7;
-		//shortcut
-		if(!((X1 = block[8 * 4]) | (X2 = block[8 * 6]) | (X3 = block[8 * 2]) | (X4 = block[8 * 1]) | (X5 = block[8 * 7]) | (X6 = block[8 * 5]) | (X7 = block[8 * 3]))) {
-			block[8 * 0] = block[8 * 1] = block[8 * 2] = block[8 * 3] = block[8 * 4] = block[8 * 5] = block[8 * 6] = block[8 * 7] = iclp[(X0 + 32) >> 6];
-			continue;
-		}
-		X0 = (X0 << 8) + 8192;
-		X1 <<= 8;
-
-		//first stage
-		int X8 = __W7 * (X4 + X5) + 4;
-		X4 = (X8 + (__W1 - __W7) * X4) >> 3;
-		X5 = (X8 - (__W1 + __W7) * X5) >> 3;
-		X8 = __W3 * (X6 + X7) + 4;
-		X6 = (X8 - (__W3 - __W5) * X6) >> 3;
-		X7 = (X8 - (__W3 + __W5) * X7) >> 3;
-
-		//second stage
-		X8 = X0 + X1;
-		X0 -= X1;
-		X1 = __W6 * (X3 + X2) + 4;
-		X2 = (X1 - (__W2 + __W6) * X2) >> 3;
-		X3 = (X1 + (__W2 - __W6) * X3) >> 3;
-		X1 = X4 + X6;
-		X4 -= X6;
-		X6 = X5 + X7;
-		X5 -= X7;
-
-		//third stage
-		X7 = X8 + X3;
-		X8 -= X3;
-		X3 = X0 + X2;
-		X0 -= X2;
-		X2 = (181 * (X4 + X5) + 128) >> 8;
-		X4 = (181 * (X4 - X5) + 128) >> 8;
-
-		//fourth stage
-		block[8 * 0] = iclp[(X7 + X1) >> 14];
-		block[8 * 1] = iclp[(X3 + X2) >> 14];
-		block[8 * 2] = iclp[(X0 + X4) >> 14];
-		block[8 * 3] = iclp[(X8 + X6) >> 14];
-		block[8 * 4] = iclp[(X8 - X6) >> 14];
-		block[8 * 5] = iclp[(X0 - X4) >> 14];
-		block[8 * 6] = iclp[(X3 - X2) >> 14];
-		block[8 * 7] = iclp[(X7 - X1) >> 14];
-	}
-#endif
-}
-
-//----------------------------
-
-void S_decoder::idct_int32_init() {
-
-	t_clip_val *iclp = iclip + 512;
-	for(int i = -512; i < 512; i++)
-		iclp[i] = (i < -256) ? -256 : ((i > 255) ? 255 : i);
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/image.cpp Deleted

@@ -1,356 +0,0 @@
-/**************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Image management functions -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: image.cpp,v 1.1.1.1 2005-07-13 14:36:14 jeanlf Exp $
- *
- ****************************************************************************/
-//#include <math.h>
-
-#include "portab.h"
-#include "global.h"        /* XVID_CSP_XXX's */
-#include "xvid.h"       /* XVID_CSP_XXX's */
-#include "image.h"
-#include "interpolate8x8.h"
-#include "reduced.h"
-#include "decoder.h"
-#include "mem_align.h"
-
-#define SAFETY 64
-#define EDGE_SIZE2  (EDGE_SIZE/2)
-
-//----------------------------
-
-int image_create(IMAGE * image, dword edged_width, dword edged_height) {
-
-	const dword edged_width2 = edged_width / 2;
-	const dword edged_height2 = edged_height / 2;
-
-	image->y = (unsigned char*)xvid_malloc(edged_width * (edged_height + 1) + SAFETY, CACHE_LINE);
-	if (image->y == NULL) {
-		return -1;
-	}
-	MemSet(image->y, 0, edged_width * (edged_height + 1) + SAFETY);
-
-	image->u = (unsigned char*)xvid_malloc(edged_width2 * edged_height2 + SAFETY, CACHE_LINE);
-	if (image->u == NULL) {
-		xvid_free(image->y);
-		image->y = NULL;
-		return -1;
-	}
-	MemSet(image->u, 0, edged_width2 * edged_height2 + SAFETY);
-
-	image->v = (unsigned char*)xvid_malloc(edged_width2 * edged_height2 + SAFETY, CACHE_LINE);
-	if (image->v == NULL) {
-		xvid_free(image->u);
-		image->u = NULL;
-		xvid_free(image->y);
-		image->y = NULL;
-		return -1;
-	}
-	MemSet(image->v, 0, edged_width2 * edged_height2 + SAFETY);
-
-	image->y += EDGE_SIZE * edged_width + EDGE_SIZE;
-	image->u += EDGE_SIZE2 * edged_width2 + EDGE_SIZE2;
-	image->v += EDGE_SIZE2 * edged_width2 + EDGE_SIZE2;
-
-	return 0;
-}
-
-//----------------------------
-
-void image_destroy(IMAGE * image, dword edged_width, dword edged_height) {
-
-	const dword edged_width2 = edged_width / 2;
-
-	if(image->y) {
-		xvid_free(image->y - (EDGE_SIZE * edged_width + EDGE_SIZE));
-		image->y = NULL;
-	}
-	if(image->u) {
-		xvid_free(image->u - (EDGE_SIZE2 * edged_width2 + EDGE_SIZE2));
-		image->u = NULL;
-	}
-	if(image->v) {
-		xvid_free(image->v - (EDGE_SIZE2 * edged_width2 + EDGE_SIZE2));
-		image->v = NULL;
-	}
-}
-
-//----------------------------
-
-void IMAGE::Swap(IMAGE *image2) {
-	::Swap(y, image2->y);
-	::Swap(u, image2->u);
-	::Swap(v, image2->v);
-}
-
-//----------------------------
-
-#ifdef _ARM_
-
-extern"C"
-void XVID_MemCpy(void *dst, const void *src, dword count);
-
-#else
-
-void XVID_MemCpy(void *dst, const void *src, dword count) {
-	assert(!(dword(dst)&3));
-	assert(!(dword(count)&3));
-#ifdef USE_ARM_ASM
-	int t0, t1, t2, t3;
-	asm volatile(
-	    "subs %2, %2, #16\n   blt .mc_no16\n\t"
-	    "\n.mc_loop16:\n\t"
-	    //the order of regs in {} is not important, now it's ordered as to avoid compiler warnings
-	    "ldmia %1!, {%6, %3, %5, %4}\n\t"
-	    "stmia %0!, {%6, %3, %5, %4}\n\t"
-	    "subs %2, %2, #16\n   bge .mc_loop16\n\t"
-	    "\n.mc_no16:\n\t"
-	    "adds %2, %2, #16\n\t"
-	    "beq .mc_end\n\t"
-	    "\n.mc_loop4:\n\t"
-	    "ldr %3, [%1], #4\n\t"
-	    "str %3, [%0], #4\n\t"
-	    "subs %2, %2, #4\n   bne .mc_loop4\n\t"
-	    "\n.mc_end:\n\t"
-	    : "+r"(dst), "+r"(src), "+r"(count), "&=r"(t0), "&=r"(t1), "&=r"(t2), "&=r"(t3)
-	    :
-	);
-#else
-	MemCpy(dst, src, count);
-#endif
-}
-
-#endif
-
-//---------------------------
-
-void IMAGE::Copy(const IMAGE * image2, dword edged_width, dword height) {
-	XVID_MemCpy(y, image2->y, edged_width * height);
-	XVID_MemCpy(u, image2->u, edged_width * height / 4);
-	XVID_MemCpy(v, image2->v, edged_width * height / 4);
-}
-
-//----------------------------
-
-inline void XVID_Set16bytes(void *dst, dword val) {
-	assert(!(dword(dst)&3));
-	val |= val<<8;
-	val |= val<<16;
-	((dword*)dst)[0] = val;
-	((dword*)dst)[1] = val;
-	((dword*)dst)[2] = val;
-	((dword*)dst)[3] = val;
-}
-
-//---------------------------
-
-inline void XVID_Set8bytes(void *dst, dword val) {
-	assert(!(dword(dst)&3));
-	val |= val<<8;
-	val |= val<<16;
-	((dword*)dst)[0] = val;
-	((dword*)dst)[1] = val;
-}
-
-//--------------------------
-
-void S_decoder::SetEdges(IMAGE &img) const {
-
-	const dword edged_width2 = edged_width / 2;
-
-	assert(EDGE_SIZE==16);
-
-	byte *dst = img.y - (EDGE_SIZE + EDGE_SIZE * edged_width);
-	const byte *src = img.y;
-
-	//according to the Standard Clause 7.6.4, padding is done starting at 16
-	// * pixel width and height multiples
-	dword width  = (S_decoder::width+15)&~15;
-	dword height = (S_decoder::height+15)&~15;
-	dword width2 = width/2;
-
-	dword i;
-	for(i = 0; i < EDGE_SIZE; i++) {
-		XVID_Set16bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE, src, width);
-		XVID_Set16bytes(dst + edged_width - EDGE_SIZE, *(src + width - 1));
-		dst += edged_width;
-	}
-	for(i = 0; i < height; i++) {
-		XVID_Set16bytes(dst, *src);
-		XVID_Set16bytes(dst + edged_width - EDGE_SIZE, src[width - 1]);
-		dst += edged_width;
-		src += edged_width;
-	}
-
-	src -= edged_width;
-	for(i = 0; i < EDGE_SIZE; i++) {
-		XVID_Set16bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE, src, width);
-		XVID_Set16bytes(dst + edged_width - EDGE_SIZE, *(src + width - 1));
-		dst += edged_width;
-	}
-
-	//U
-	dst = img.u - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
-	src = img.u;
-
-	for (i = 0; i < EDGE_SIZE2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE2, src, width2);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, *(src + width2 - 1));
-		dst += edged_width2;
-	}
-
-	for (i = 0; i < height / 2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, src[width2 - 1]);
-		dst += edged_width2;
-		src += edged_width2;
-	}
-	src -= edged_width2;
-	for (i = 0; i < EDGE_SIZE2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE2, src, width2);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, *(src + width2 - 1));
-		dst += edged_width2;
-	}
-
-	//V
-	dst = img.v - (EDGE_SIZE2 + EDGE_SIZE2 * edged_width2);
-	src = img.v;
-
-	for(i = 0; i < EDGE_SIZE2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE2, src, width2);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, *(src + width2 - 1));
-		dst += edged_width2;
-	}
-
-	for(i = 0; i < height / 2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, src[width2 - 1]);
-		dst += edged_width2;
-		src += edged_width2;
-	}
-	src -= edged_width2;
-	for(i = 0; i < EDGE_SIZE2; i++) {
-		XVID_Set8bytes(dst, *src);
-		XVID_MemCpy(dst + EDGE_SIZE2, src, width2);
-		XVID_Set8bytes(dst + edged_width2 - EDGE_SIZE2, *(src + width2 - 1));
-		dst += edged_width2;
-	}
-}
-
-//----------------------------
-
-void IMAGE::Clear(int width, int height, int edged_width, int y, int u, int v) {
-
-	byte * p;
-	int i;
-
-	p = IMAGE::y;
-	for(i = 0; i < height; i++) {
-		MemSet(p, y, width);
-		p += edged_width;
-	}
-
-	p = IMAGE::u;
-	for(i = 0; i < height/2; i++) {
-		MemSet(p, u, width/2);
-		p += edged_width/2;
-	}
-
-	p = IMAGE::v;
-	for(i = 0; i < height/2; i++) {
-		MemSet(p, v, width/2);
-		p += edged_width/2;
-	}
-}
-
-//----------------------------
-/* reduced resolution deblocking filter
-   block = block size (16=rrv, 8=full resolution)
-   flags = XVID_DEC_YDEBLOCK|XVID_DEC_UVDEBLOCK
-*/
-void IMAGE::deblock_rrv(int edged_width, const MACROBLOCK * mbs, int mb_width, int mb_height, int mb_stride, int block, int flags) {
-
-	const int edged_width2 = edged_width /2;
-	const int nblocks = block / 8;   //skals code uses 8pixel block uints
-	int i,j;
-
-	for (j = 1; j < mb_height*2; j++)      //horizontal deblocking
-		for (i = 0; i < mb_width*2; i++)
-		{
-			if(mbs[(j-1)/2*mb_stride + (i/2)].mode != MODE_NOT_CODED ||
-			        mbs[(j+0)/2*mb_stride + (i/2)].mode != MODE_NOT_CODED)
-			{
-				hfilter_31(IMAGE::y + (j*block - 1)*edged_width + i*block,
-				           IMAGE::y + (j*block + 0)*edged_width + i*block, nblocks);
-			}
-		}
-
-	for (j = 0; j < mb_height*2; j++)      // vertical deblocking
-		for (i = 1; i < mb_width*2; i++)
-		{
-			if (mbs[(j/2)*mb_stride + (i-1)/2].mode != MODE_NOT_CODED ||
-			        mbs[(j/2)*mb_stride + (i+0)/2].mode != MODE_NOT_CODED)
-			{
-				vfilter_31(IMAGE::y + (j*block)*edged_width + i*block - 1,
-				           IMAGE::y + (j*block)*edged_width + i*block + 0,
-				           edged_width, nblocks);
-			}
-		}
-
-
-	//chroma
-
-	for (j = 1; j < mb_height; j++)     //orizontal deblocking
-		for (i = 0; i < mb_width; i++)
-		{
-			if (mbs[(j-1)*mb_stride + i].mode != MODE_NOT_CODED ||
-			        mbs[(j+0)*mb_stride + i].mode != MODE_NOT_CODED)
-			{
-				hfilter_31(IMAGE::u + (j*block - 1)*edged_width2 + i*block,
-				           IMAGE::u + (j*block + 0)*edged_width2 + i*block, nblocks);
-				hfilter_31(IMAGE::v + (j*block - 1)*edged_width2 + i*block,
-				           IMAGE::v + (j*block + 0)*edged_width2 + i*block, nblocks);
-			}
-		}
-
-	for (j = 0; j < mb_height; j++)     //ertical deblocking
-		for (i = 1; i < mb_width; i++)
-		{
-			if (mbs[j*mb_stride + i - 1].mode != MODE_NOT_CODED ||
-			        mbs[j*mb_stride + i + 0].mode != MODE_NOT_CODED)
-			{
-				vfilter_31(IMAGE::u + (j*block)*edged_width2 + i*block - 1,
-				           IMAGE::u + (j*block)*edged_width2 + i*block + 0,
-				           edged_width2, nblocks);
-				vfilter_31(IMAGE::v + (j*block)*edged_width2 + i*block - 1,
-				           IMAGE::v + (j*block)*edged_width2 + i*block + 0,
-				           edged_width2, nblocks);
-			}
-		}
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/image.h Deleted

@@ -1,37 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Image related header  -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: image.h,v 1.1.1.1 2005-07-13 14:36:14 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _IMAGE_H_
-#define _IMAGE_H_
-
-#include "portab.h"
-#include "global.h"
-#include "xvid.h"
-
-int image_create(IMAGE * image, dword edged_width, dword edged_height);
-void image_destroy(IMAGE * image, dword edged_width, dword edged_height);
-
-
-#endif							/* _IMAGE_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/interpolate8x8.cpp Deleted

@@ -1,872 +0,0 @@
-/*****************************************************************************
- *
- * XVID MPEG-4 VIDEO CODEC
- * - 8x8 block-based halfpel interpolation -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: interpolate8x8.cpp,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "portab.h"
-#include "global.h"
-#include "interpolate8x8.h"
-
-//----------------------------
-
-void interpolate8x8_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-
-	const byte *src = refn + ((y + (dy>>1)) * stride + x + (dx>>1));
-	byte *dst = cur + (y * stride + x);
-
-	switch(((dx & 1) << 1) + (dy & 1)) {
-	case 0:
-		transfer8x8_copy(dst, src, stride);
-		break;
-	case 1:
-		interpolate8x8_halfpel_v(dst, src, stride, rounding);
-		break;
-	case 2:
-		interpolate8x8_halfpel_h(dst, src, stride, rounding);
-		break;
-	default:
-		interpolate8x8_halfpel_hv(dst, src, stride, rounding);
-		break;
-	}
-}
-
-//----------------------------
-
-void interpolate8x8_quarterpel(byte *cur, byte *refn, byte *refh, byte *refv, byte *refhv, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-
-	const int xRef = x*4 + dx;
-	const int yRef = y*4 + dy;
-
-	byte *src, *dst;
-	byte *halfpel_h, *halfpel_v, *halfpel_hv;
-	int x_int, y_int, x_frac, y_frac;
-
-	x_int = xRef/4;
-	if(xRef < 0 && xRef % 4)
-		x_int--;
-
-	x_frac = xRef - (4*x_int);
-
-	y_int  = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
-
-	y_frac = yRef - (4*y_int);
-
-	src = refn + y_int * stride + x_int;
-	halfpel_h = refh;
-	halfpel_v = refv;
-	halfpel_hv = refhv;
-
-	dst = cur + y * stride + x;
-
-	switch((y_frac << 2) | (x_frac)) {
-
-	case 0:
-		transfer8x8_copy(dst, src, stride);
-		break;
-
-	case 1:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, src, halfpel_h, stride, rounding, 8);
-		break;
-
-	case 2:
-		interpolate8x8_lowpass_h(dst, src, stride, rounding);
-		break;
-
-	case 3:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, src + 1, halfpel_h, stride, rounding, 8);
-		break;
-
-	case 4:
-		interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding);
-		interpolate8x8_avg2(dst, src, halfpel_v, stride, rounding, 8);
-		break;
-
-	case 5:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding, 8);
-		break;
-
-	case 6:
-		interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_h, halfpel_hv, stride, rounding, 8);
-		break;
-
-	case 7:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_v, halfpel_hv, stride, rounding, 8);
-		break;
-
-	case 8:
-		interpolate8x8_lowpass_v(dst, src, stride, rounding);
-		break;
-
-	case 9:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(dst, halfpel_v, stride, rounding);
-		break;
-
-	case 10:
-		interpolate8x8_lowpass_hv(dst, halfpel_h, src, stride, rounding);
-		break;
-
-	case 11:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(dst, halfpel_v, stride, rounding);
-		break;
-
-	case 12:
-		interpolate8x8_lowpass_v(halfpel_v, src, stride, rounding);
-		interpolate8x8_avg2(dst, src+stride, halfpel_v, stride, rounding, 8);
-		break;
-
-	case 13:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_v+stride, halfpel_hv, stride, rounding, 8);
-		break;
-
-	case 14:
-		interpolate8x8_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_h+stride, halfpel_hv, stride, rounding, 8);
-		break;
-
-	case 15:
-		interpolate8x8_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src + 1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_hv, halfpel_v + stride, stride, rounding, 8);
-		break;
-	}
-}
-
-//----------------------------
-
-void interpolate16x16_quarterpel(byte *cur, byte *refn, byte *refh, byte *refv, byte *refhv, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-
-	const int xRef = x*4 + dx;
-	const int yRef = y*4 + dy;
-
-	byte *src, *dst;
-	byte *halfpel_h, *halfpel_v, *halfpel_hv;
-	int x_int, y_int, x_frac, y_frac;
-
-	x_int = xRef/4;
-	if (xRef < 0 && xRef % 4)
-		x_int--;
-
-	x_frac = xRef - (4*x_int);
-
-	y_int  = yRef/4;
-	if (yRef < 0 && yRef % 4)
-		y_int--;
-
-	y_frac = yRef - (4*y_int);
-
-	src = refn + y_int * stride + x_int;
-	halfpel_h = refh;
-	halfpel_v = refv;
-	halfpel_hv = refhv;
-
-	dst = cur + y * stride + x;
-
-	switch((y_frac << 2) | (x_frac)) {
-	case 0:
-		transfer16x16_copy(dst, src, stride);
-		break;
-
-	case 1:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, src, halfpel_h, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, src+8, halfpel_h+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, src+8*stride, halfpel_h+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 2:
-		interpolate16x16_lowpass_h(dst, src, stride, rounding);
-		break;
-
-	case 3:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, src + 1, halfpel_h, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, src + 8 + 1, halfpel_h+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, src + 8*stride + 1, halfpel_h+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8 + 1, halfpel_h+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 4:
-		interpolate16x16_lowpass_v(halfpel_v, src, stride, rounding);
-		interpolate8x8_avg2(dst, src, halfpel_v, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, src+8, halfpel_v+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, src+8*stride, halfpel_v+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, src+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 5:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-
-		interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_hv, halfpel_v, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 6:
-		interpolate16x16_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_h, halfpel_hv, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_h+8, halfpel_hv+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_h+8*stride, halfpel_hv+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_h+8*stride+8, halfpel_hv+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 7:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-
-		interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_hv, halfpel_v, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 8:
-		interpolate16x16_lowpass_v(dst, src, stride, rounding);
-		break;
-
-	case 9:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-		interpolate16x16_lowpass_v(dst, halfpel_v, stride, rounding);
-		break;
-
-	case 10:
-		interpolate16x16_lowpass_hv(dst, halfpel_h, src, stride, rounding);
-		break;
-
-	case 11:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-		interpolate16x16_lowpass_v(dst, halfpel_v, stride, rounding);
-		break;
-
-	case 12:
-		interpolate16x16_lowpass_v(halfpel_v, src, stride, rounding);
-		interpolate8x8_avg2(dst, src+stride, halfpel_v, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, src+stride+8, halfpel_v+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, src+stride+8*stride, halfpel_v+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, src+stride+8*stride+8, halfpel_v+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 13:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-
-		interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_hv, halfpel_v+stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+stride+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+stride+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+stride+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 14:
-		interpolate16x16_lowpass_hv(halfpel_hv, halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_h+stride, halfpel_hv, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_h+stride+8, halfpel_hv+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_h+stride+8*stride, halfpel_hv+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_h+stride+8*stride+8, halfpel_hv+8*stride+8, stride, rounding, 8);
-		break;
-
-	case 15:
-		interpolate16x16_lowpass_h(halfpel_h, src, stride, rounding);
-		interpolate8x8_avg2(halfpel_v, src+1, halfpel_h, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8, src+1 + 8, halfpel_h+8, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride, src+1 + 8*stride, halfpel_h+8*stride, stride, rounding, 9);
-		interpolate8x8_avg2(halfpel_v+8*stride+8, src+1+8*stride+8, halfpel_h+8*stride+8, stride, rounding, 9);
-
-		interpolate16x16_lowpass_v(halfpel_hv, halfpel_v, stride, rounding);
-		interpolate8x8_avg2(dst, halfpel_hv, halfpel_v+stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8, halfpel_hv+8, halfpel_v+stride+8, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride, halfpel_hv+8*stride, halfpel_v+stride+8*stride, stride, rounding, 8);
-		interpolate8x8_avg2(dst+8*stride+8, halfpel_hv+8*stride+8, halfpel_v+stride+8*stride+8, stride, rounding, 8);
-		break;
-	}
-}
-
-//----------------------------
-
-void interpolate8x8_avg2(byte *dst, const byte *src1, const byte *src2, dword stride, bool rounding, dword height) {
-
-	const int round = 1 - rounding;
-	for(dword i = 0; i < height; i++) {
-		dst[0] = (src1[0] + src2[0] + round) >> 1;
-		dst[1] = (src1[1] + src2[1] + round) >> 1;
-		dst[2] = (src1[2] + src2[2] + round) >> 1;
-		dst[3] = (src1[3] + src2[3] + round) >> 1;
-		dst[4] = (src1[4] + src2[4] + round) >> 1;
-		dst[5] = (src1[5] + src2[5] + round) >> 1;
-		dst[6] = (src1[6] + src2[6] + round) >> 1;
-		dst[7] = (src1[7] + src2[7] + round) >> 1;
-
-		dst += stride;
-		src1 += stride;
-		src2 += stride;
-	}
-}
-
-//----------------------------
-
-#ifndef _ARM_
-
-void interpolate8x8_halfpel_h(byte *dst, const byte *src, dword stride, bool rounding) {
-
-#if defined USE_ARM_ASM && 1
-	int y, tmp, tmp1, tmp2, tmp3;
-	if(rounding) {
-		asm volatile(
-		    "mov %7, #8\n\t"
-		    "\n.ihh_loop:\n\t"
-		    "ldrb %2, [%1, #8]\n\t"
-		    //7+8
-		    "ldrb %3, [%1, #7]\n\t"
-		    "add %4, %2, %3\n\t"
-		    "mov %4, %4, asr #1\n\t"
-		    //6+7
-		    "ldrb %2, [%1, #6]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //5+6
-		    "ldrb %3, [%1, #5]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //4+5
-		    "ldrb %2, [%1, #4]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-
-		    "str %4, [%0, #4]\n\t"
-
-		    //3+4
-		    "ldrb %3, [%1, #3]\n\t"
-		    "add %4, %2, %3\n\t"
-		    "mov %4, %4, asr #1\n\t"
-		    //2+3
-		    "ldrb %2, [%1, #2]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //1+2
-		    "ldrb %3, [%1, #1]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //0+1
-		    "ldrb %2, [%1, #0]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-
-		    "str %4, [%0, #0]\n\t"
-
-		    "add %0, %0, %6\n   add %1, %1, %6\n\t"
-		    "subs %7, %7, #1\n   bne .ihh_loop\n\t"
-		    : "+r"(dst), "+r"(src), "&=r"(tmp), "&=r"(tmp1), "&=r"(tmp2), "&=r"(tmp3)
-		    : "r"(stride), "%r"(y)
-		);
-	} else {
-		asm volatile(
-		    "mov %7, #8\n\t"
-		    "\n.ihh_loop1:\n\t"
-		    "ldrb %2, [%1, #8]\n\t"
-		    //7+8
-		    "ldrb %3, [%1, #7]\n\t"
-		    "add %4, %2, %3\n\t"
-		    "add %4, %4, #1\n\t"
-		    "mov %4, %4, asr #1\n\t"
-		    //6+7
-		    "ldrb %2, [%1, #6]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //5+6
-		    "ldrb %3, [%1, #5]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //4+5
-		    "ldrb %2, [%1, #4]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-
-		    "str %4, [%0, #4]\n\t"
-
-		    //3+4
-		    "ldrb %3, [%1, #3]\n\t"
-		    "add %4, %2, %3\n\t"
-		    "add %4, %4, #1\n\t"
-		    "mov %4, %4, asr #1\n\t"
-		    //2+3
-		    "ldrb %2, [%1, #2]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //1+2
-		    "ldrb %3, [%1, #1]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-		    //0+1
-		    "ldrb %2, [%1, #0]\n\t"
-		    "add %5, %2, %3\n\t"
-		    "add %5, %5, #1\n\t"
-		    "mov %5, %5, asr #1\n\t"
-		    "orr %4, %5, %4, asl #8\n\t"
-
-		    "str %4, [%0, #0]\n\t"
-
-		    "add %0, %0, %6\n   add %1, %1, %6\n\t"
-		    "subs %7, %7, #1\n   bne .ihh_loop1\n\t"
-		    : "+r"(dst), "+r"(src), "&=r"(tmp), "&=r"(tmp1), "&=r"(tmp2), "&=r"(tmp3)
-		    : "r"(stride), "%r"(y)
-		);
-	}
-#else
-	if(rounding) {
-		for(dword j = 0; j < 8*stride; j+=stride) {
-			dst[j + 0] = byte((src[j + 0] + src[j + 1] )>>1);
-			dst[j + 1] = byte((src[j + 1] + src[j + 2] )>>1);
-			dst[j + 2] = byte((src[j + 2] + src[j + 3] )>>1);
-			dst[j + 3] = byte((src[j + 3] + src[j + 4] )>>1);
-			dst[j + 4] = byte((src[j + 4] + src[j + 5] )>>1);
-			dst[j + 5] = byte((src[j + 5] + src[j + 6] )>>1);
-			dst[j + 6] = byte((src[j + 6] + src[j + 7] )>>1);
-			dst[j + 7] = byte((src[j + 7] + src[j + 8] )>>1);
-		}
-	} else {
-		for(dword j = 0; j < 8*stride; j+=stride) {
-			//forward or backwards? Who knows ...
-			dst[j + 0] = byte((src[j + 0] + src[j + 1] + 1)>>1);
-			dst[j + 1] = byte((src[j + 1] + src[j + 2] + 1)>>1);
-			dst[j + 2] = byte((src[j + 2] + src[j + 3] + 1)>>1);
-			dst[j + 3] = byte((src[j + 3] + src[j + 4] + 1)>>1);
-			dst[j + 4] = byte((src[j + 4] + src[j + 5] + 1)>>1);
-			dst[j + 5] = byte((src[j + 5] + src[j + 6] + 1)>>1);
-			dst[j + 6] = byte((src[j + 6] + src[j + 7] + 1)>>1);
-			dst[j + 7] = byte((src[j + 7] + src[j + 8] + 1)>>1);
-		}
-	}
-#endif
-}
-
-#endif
-
-//----------------------------
-
-#ifndef _ARM_
-
-void interpolate8x8_halfpel_v(byte *dst, const byte *src, dword stride, bool rounding) {
-
-#if defined USE_ARM_ASM && 1
-	int y, tmp, tmp1, tmp2, tmp3, tmp4;
-	if(rounding) {
-		asm volatile(
-		    "mov %7, #8\n\t"
-		    "\n.ihv_loop:\n\t"
-		    "add %5, %1, %6\n\t"
-		    //3
-		    "ldrb %2, [%1, #3]\n   ldrb %3, [%5, #3]\n\t"
-		    "add %4, %2, %3\n   mov %4, %4, asr #1\n\t"
-		    //2
-		    "ldrb %2, [%1, #2]\n   ldrb %3, [%5, #2]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //1
-		    "ldrb %2, [%1, #1]\n   ldrb %3, [%5, #1]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //0
-		    "ldrb %2, [%1, #0]\n   ldrb %3, [%5, #0]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-
-		    "str %4, [%0, #0]\n\t"
-
-		    //7
-		    "ldrb %2, [%1, #7]\n   ldrb %3, [%5, #7]\n\t"
-		    "add %4, %2, %3\n   mov %4, %4, asr #1\n\t"
-		    //6
-		    "ldrb %2, [%1, #6]\n   ldrb %3, [%5, #6]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //5
-		    "ldrb %2, [%1, #5]\n   ldrb %3, [%5, #5]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //4
-		    "ldrb %2, [%1, #4]\n   ldrb %3, [%5, #4]\n\t"
-		    "add %2, %2, %3\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-
-		    "str %4, [%0, #4]\n\t"
-
-		    "add %0, %0, %6\n   add %1, %1, %6\n\t"
-		    "subs %7, %7, #1\n   bne .ihv_loop\n\t"
-		    : "+r"(dst), "+r"(src), "&=r"(tmp), "&=r"(tmp1), "&=r"(tmp2), "&=r"(tmp3)
-		    : "r"(stride), "%r"(y)
-		);
-	} else {
-		asm volatile(
-		    "mov %7, #8\n\t"
-		    "\n.ihv_loop1:\n\t"
-		    "add %5, %1, %6\n\t"
-		    //3
-		    "ldrb %2, [%1, #3]\n   ldrb %3, [%5, #3]\n\t"
-		    "add %4, %2, %3\n   add %4, %4, #1\n   mov %4, %4, asr #1\n\t"
-		    //2
-		    "ldrb %2, [%1, #2]\n   ldrb %3, [%5, #2]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //1
-		    "ldrb %2, [%1, #1]\n   ldrb %3, [%5, #1]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //0
-		    "ldrb %2, [%1, #0]\n   ldrb %3, [%5, #0]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-
-		    "str %4, [%0, #0]\n\t"
-
-		    //7
-		    "ldrb %2, [%1, #7]\n   ldrb %3, [%5, #7]\n\t"
-		    "add %4, %2, %3\n   add %4, %4, #1\n   mov %4, %4, asr #1\n\t"
-		    //6
-		    "ldrb %2, [%1, #6]\n   ldrb %3, [%5, #6]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //5
-		    "ldrb %2, [%1, #5]\n   ldrb %3, [%5, #5]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-		    //4
-		    "ldrb %2, [%1, #4]\n   ldrb %3, [%5, #4]\n\t"
-		    "add %2, %2, %3\n   add %2, %2, #1\n   mov %2, %2, asr #1\n\t"
-		    "orr %4, %2, %4, asl #8\n\t"
-
-		    "str %4, [%0, #4]\n\t"
-
-		    "add %0, %0, %6\n   add %1, %1, %6\n\t"
-		    "subs %7, %7, #1\n   bne .ihv_loop1\n\t"
-		    : "+r"(dst), "+r"(src), "&=r"(tmp), "&=r"(tmp1), "&=r"(tmp2), "&=r"(tmp3)
-		    : "r"(stride), "%r"(y)
-		);
-	}
-#else
-	if(rounding) {
-		for(dword j = 0; j < 8*stride; j+=stride) {     /* forward is better. Some automatic prefetch perhaps. */
-			dst[j + 0] = byte((src[j + 0] + src[j + stride + 0] )>>1);
-			dst[j + 1] = byte((src[j + 1] + src[j + stride + 1] )>>1);
-			dst[j + 2] = byte((src[j + 2] + src[j + stride + 2] )>>1);
-			dst[j + 3] = byte((src[j + 3] + src[j + stride + 3] )>>1);
-			dst[j + 4] = byte((src[j + 4] + src[j + stride + 4] )>>1);
-			dst[j + 5] = byte((src[j + 5] + src[j + stride + 5] )>>1);
-			dst[j + 6] = byte((src[j + 6] + src[j + stride + 6] )>>1);
-			dst[j + 7] = byte((src[j + 7] + src[j + stride + 7] )>>1);
-		}
-	} else {
-		for(dword j = 0; j < 8*stride; j+=stride) {
-			dst[j + 0] = byte((src[j + 0] + src[j + stride + 0] + 1)>>1);
-			dst[j + 1] = byte((src[j + 1] + src[j + stride + 1] + 1)>>1);
-			dst[j + 2] = byte((src[j + 2] + src[j + stride + 2] + 1)>>1);
-			dst[j + 3] = byte((src[j + 3] + src[j + stride + 3] + 1)>>1);
-			dst[j + 4] = byte((src[j + 4] + src[j + stride + 4] + 1)>>1);
-			dst[j + 5] = byte((src[j + 5] + src[j + stride + 5] + 1)>>1);
-			dst[j + 6] = byte((src[j + 6] + src[j + stride + 6] + 1)>>1);
-			dst[j + 7] = byte((src[j + 7] + src[j + stride + 7] + 1)>>1);
-		}
-	}
-#endif
-}
-#endif
-
-//----------------------------
-
-#ifndef _ARM_                  //PPC
-
-#ifndef USE_ARM_ASM           //implemented in asm for ARM
-
-void interpolate8x8_halfpel_hv(byte *dst, const byte *src, dword stride, bool rounding) {
-
-	if(rounding) {
-		for(dword j = 0; j < 8*stride; j+=stride) {
-			dst[j + 0] = (byte)((src[j+0] + src[j+1] + src[j+stride+0] + src[j+stride+1] +1)>>2);
-			dst[j + 1] = (byte)((src[j+1] + src[j+2] + src[j+stride+1] + src[j+stride+2] +1)>>2);
-			dst[j + 2] = (byte)((src[j+2] + src[j+3] + src[j+stride+2] + src[j+stride+3] +1)>>2);
-			dst[j + 3] = (byte)((src[j+3] + src[j+4] + src[j+stride+3] + src[j+stride+4] +1)>>2);
-			dst[j + 4] = (byte)((src[j+4] + src[j+5] + src[j+stride+4] + src[j+stride+5] +1)>>2);
-			dst[j + 5] = (byte)((src[j+5] + src[j+6] + src[j+stride+5] + src[j+stride+6] +1)>>2);
-			dst[j + 6] = (byte)((src[j+6] + src[j+7] + src[j+stride+6] + src[j+stride+7] +1)>>2);
-			dst[j + 7] = (byte)((src[j+7] + src[j+8] + src[j+stride+7] + src[j+stride+8] +1)>>2);
-		}
-	} else {
-		for(dword j = 0; j < 8*stride; j+=stride) {
-			dst[j + 0] = (byte)((src[j+0] + src[j+1] + src[j+stride+0] + src[j+stride+1] +2)>>2);
-			dst[j + 1] = (byte)((src[j+1] + src[j+2] + src[j+stride+1] + src[j+stride+2] +2)>>2);
-			dst[j + 2] = (byte)((src[j+2] + src[j+3] + src[j+stride+2] + src[j+stride+3] +2)>>2);
-			dst[j + 3] = (byte)((src[j+3] + src[j+4] + src[j+stride+3] + src[j+stride+4] +2)>>2);
-			dst[j + 4] = (byte)((src[j+4] + src[j+5] + src[j+stride+4] + src[j+stride+5] +2)>>2);
-			dst[j + 5] = (byte)((src[j+5] + src[j+6] + src[j+stride+5] + src[j+stride+6] +2)>>2);
-			dst[j + 6] = (byte)((src[j+6] + src[j+7] + src[j+stride+6] + src[j+stride+7] +2)>>2);
-			dst[j + 7] = (byte)((src[j+7] + src[j+8] + src[j+stride+7] + src[j+stride+8] +2)>>2);
-		}
-	}
-}
-#endif
-#endif
-
-//----------------------------
-
-void interpolate16x16_lowpass_h(byte *dst, byte *src, int stride, int rounding) {
-
-	int round_add = 16 - rounding;
-	for(int i = 0; i < 17; i++) {
-
-		dst[0] = CLIP(((7 * ((src[0]<<1) - src[2]) +  23 * src[1] + 3 * src[3] - src[4] + round_add) >> 5), 0, 255);
-		dst[1] = CLIP(((19 * src[1] + 20 * src[2] - src[5] + 3 * (src[4] - src[0] - (src[3]<<1)) + round_add) >> 5), 0, 255);
-		dst[2] = CLIP(((20 * (src[2] + src[3]) + (src[0]<<1) + 3 * (src[5] - ((src[1] + src[4])<<1)) - src[6] + round_add) >> 5), 0, 255);
-
-		dst[3] = CLIP(((20 * (src[3] + src[4]) + 3 * ((src[6] + src[1]) - ((src[2] + src[5])<<1)) - (src[0] + src[7]) + round_add) >> 5), 0, 255);
-		dst[4] = CLIP(((20 * (src[4] + src[5]) - 3 * (((src[3] + src[6])<<1) - (src[2] + src[7])) - (src[1] + src[8]) + round_add) >> 5), 0, 255);
-		dst[5] = CLIP(((20 * (src[5] + src[6]) - 3 * (((src[4] + src[7])<<1) - (src[3] + src[8])) - (src[2] + src[9]) + round_add) >> 5), 0, 255);
-		dst[6] = CLIP(((20 * (src[6] + src[7]) - 3 * (((src[5] + src[8])<<1) - (src[4] + src[9])) - (src[3] + src[10]) + round_add) >> 5), 0, 255);
-		dst[7] = CLIP(((20 * (src[7] + src[8]) - 3 * (((src[6] + src[9])<<1) - (src[5] + src[10])) - (src[4] + src[11]) + round_add) >> 5), 0, 255);
-		dst[8] = CLIP(((20 * (src[8] + src[9]) - 3 * (((src[7] + src[10])<<1) - (src[6] + src[11])) - (src[5] + src[12]) + round_add) >> 5), 0, 255);
-		dst[9] = CLIP(((20 * (src[9] + src[10]) - 3 * (((src[8] + src[11])<<1) - (src[7] + src[12])) - (src[6] + src[13]) + round_add) >> 5), 0, 255);
-		dst[10] = CLIP(((20 * (src[10] + src[11]) - 3 * (((src[9] + src[12])<<1) - (src[8] + src[13])) - (src[7] + src[14]) + round_add) >> 5), 0, 255);
-		dst[11] = CLIP(((20 * (src[11] + src[12]) - 3 * (((src[10] + src[13])<<1) - (src[9] + src[14])) - (src[8] + src[15]) + round_add) >> 5), 0, 255);
-		dst[12] = CLIP(((20 * (src[12] + src[13]) - 3 * (((src[11] + src[14])<<1) - (src[10] + src[15])) - (src[9] + src[16]) + round_add) >> 5), 0, 255);
-
-		dst[13] = CLIP(((20 * (src[13] + src[14]) + (src[16]<<1) + 3 * (src[11] - ((src[12] + src[15]) << 1)) - src[10] + round_add) >> 5), 0, 255);
-		dst[14] = CLIP(((19 * src[15] + 20 * src[14] + 3 * (src[12] - src[16] - (src[13] << 1)) - src[11] + round_add) >> 5), 0, 255);
-		dst[15] = CLIP(((23 * src[15] + 7 * ((src[16]<<1) - src[14]) + 3 * src[13] - src[12] + round_add) >> 5), 0, 255);
-
-		dst += stride;
-		src += stride;
-	}
-}
-
-//----------------------------
-
-void interpolate8x8_lowpass_h(byte *dst, byte *src, int stride, int rounding) {
-
-	int round_add = 16 - rounding;
-	for(int i = 0; i < 9; i++) {
-
-		dst[0] = CLIP(((7 * ((src[0]<<1) - src[2]) + 23 * src[1] + 3 * src[3] - src[4] + round_add) >> 5), 0, 255);
-		dst[1] = CLIP(((19 * src[1] + 20 * src[2] - src[5] + 3 * (src[4] - src[0] - (src[3]<<1)) + round_add) >> 5), 0, 255);
-		dst[2] = CLIP(((20 * (src[2] + src[3]) + (src[0]<<1) + 3 * (src[5] - ((src[1] + src[4])<<1)) - src[6] + round_add) >> 5), 0, 255);
-		dst[3] = CLIP(((20 * (src[3] + src[4]) + 3 * ((src[6] + src[1]) - ((src[2] + src[5])<<1)) - (src[0] + src[7]) + round_add) >> 5), 0, 255);
-		dst[4] = CLIP(((20 * (src[4] + src[5]) - 3 * (((src[3] + src[6])<<1) - (src[2] + src[7])) - (src[1] + src[8]) + round_add) >> 5), 0, 255);
-		dst[5] = CLIP(((20 * (src[5] + src[6]) + (src[8]<<1) + 3 * (src[3] - ((src[4] + src[7]) << 1)) - src[2] + round_add) >> 5), 0, 255);
-		dst[6] = CLIP(((19 * src[7] + 20 * src[6] + 3 * (src[4] - src[8] - (src[5] << 1)) - src[3] + round_add) >> 5), 0, 255);
-		dst[7] = CLIP(((23 * src[7] + 7 * ((src[8]<<1) - src[6]) + 3 * src[5] - src[4] + round_add) >> 5), 0, 255);
-
-		dst += stride;
-		src += stride;
-	}
-}
-
-//----------------------------
-
-void interpolate16x16_lowpass_v(byte *dst, byte *src, int stride, int rounding) {
-
-	int round_add = 16 - rounding;
-	for(int i = 0; i < 17; i++) {
-		int src0 = src[0];
-		int src1 = src[stride];
-		int src2 = src[2 * stride];
-		int src3 = src[3 * stride];
-		int src4 = src[4 * stride];
-		int src5 = src[5 * stride];
-		int src6 = src[6 * stride];
-		int src7 = src[7 * stride];
-		int src8 = src[8 * stride];
-		int src9 = src[9 * stride];
-		int src10 = src[10 * stride];
-		int src11 = src[11 * stride];
-		int src12 = src[12 * stride];
-		int src13 = src[13 * stride];
-		int src14 = src[14 * stride];
-		int src15 = src[15 * stride];
-		int src16 = src[16 * stride];
-
-
-		dst[0] = CLIP(((7 * ((src0<<1) - src2) +  23 * src1 + 3 * src3 - src4 + round_add) >> 5), 0, 255);
-		dst[stride] = CLIP(((19 * src1 + 20 * src2 - src5 + 3 * (src4 - src0 - (src3<<1)) + round_add) >> 5), 0, 255);
-		dst[2*stride] = CLIP(((20 * (src2 + src3) + (src0<<1) + 3 * (src5 - ((src1 + src4)<<1)) - src6 + round_add) >> 5), 0, 255);
-
-		dst[3*stride] = CLIP(((20 * (src3 + src4) + 3 * ((src6 + src1) - ((src2 + src5)<<1)) - (src0 + src7) + round_add) >> 5), 0, 255);
-		dst[4*stride] = CLIP(((20 * (src4 + src5) - 3 * (((src3 + src6)<<1) - (src2 + src7)) - (src1 + src8) + round_add) >> 5), 0, 255);
-		dst[5*stride] = CLIP(((20 * (src5 + src6) - 3 * (((src4 + src7)<<1) - (src3 + src8)) - (src2 + src9) + round_add) >> 5), 0, 255);
-		dst[6*stride] = CLIP(((20 * (src6 + src7) - 3 * (((src5 + src8)<<1) - (src4 + src9)) - (src3 + src10) + round_add) >> 5), 0, 255);
-		dst[7*stride] = CLIP(((20 * (src7 + src8) - 3 * (((src6 + src9)<<1) - (src5 + src10)) - (src4 + src11) + round_add) >> 5), 0, 255);
-		dst[8*stride] = CLIP(((20 * (src8 + src9) - 3 * (((src7 + src10)<<1) - (src6 + src11)) - (src5 + src12) + round_add) >> 5), 0, 255);
-		dst[9*stride] = CLIP(((20 * (src9 + src10) - 3 * (((src8 + src11)<<1) - (src7 + src12)) - (src6 + src13) + round_add) >> 5), 0, 255);
-		dst[10*stride] = CLIP(((20 * (src10 + src11) - 3 * (((src9 + src12)<<1) - (src8 + src13)) - (src7 + src14) + round_add) >> 5), 0, 255);
-		dst[11*stride] = CLIP(((20 * (src11 + src12) - 3 * (((src10 + src13)<<1) - (src9 + src14)) - (src8 + src15) + round_add) >> 5), 0, 255);
-		dst[12*stride] = CLIP(((20 * (src12 + src13) - 3 * (((src11 + src14)<<1) - (src10 + src15)) - (src9 + src16) + round_add) >> 5), 0, 255);
-
-		dst[13*stride] = CLIP(((20 * (src13 + src14) + (src16<<1) + 3 * (src11 - ((src12 + src15) << 1)) - src10 + round_add) >> 5), 0, 255);
-		dst[14*stride] = CLIP(((19 * src15 + 20 * src14 + 3 * (src12 - src16 - (src13 << 1)) - src11 + round_add) >> 5), 0, 255);
-		dst[15*stride] = CLIP(((23 * src15 + 7 * ((src16<<1) - src14) + 3 * src13 - src12 + round_add) >> 5), 0, 255);
-
-		dst++;
-		src++;
-	}
-}
-
-//----------------------------
-
-void interpolate8x8_lowpass_v(byte *dst, byte *src, int stride, int rounding) {
-
-	int round_add = 16 - rounding;
-	for(int i = 0; i < 9; i++) {
-		int src0 = src[0];
-		int src1 = src[stride];
-		int src2 = src[2 * stride];
-		int src3 = src[3 * stride];
-		int src4 = src[4 * stride];
-		int src5 = src[5 * stride];
-		int src6 = src[6 * stride];
-		int src7 = src[7 * stride];
-		int src8 = src[8 * stride];
-
-		dst[0]       = CLIP(((7 * ((src0<<1) - src2) + 23 * src1 + 3 * src3 - src4 + round_add) >> 5), 0, 255);
-		dst[stride]     = CLIP(((19 * src1 + 20 * src2 - src5 + 3 * (src4 - src0 - (src3 << 1)) + round_add) >> 5), 0, 255);
-		dst[2 * stride] = CLIP(((20 * (src2 + src3) + (src0<<1) + 3 * (src5 - ((src1 + src4) <<1 )) - src6 + round_add) >> 5), 0, 255);
-		dst[3 * stride] = CLIP(((20 * (src3 + src4) + 3 * ((src6 + src1) - ((src2 + src5)<<1)) - (src0 + src7) + round_add) >> 5), 0, 255);
-		dst[4 * stride] = CLIP(((20 * (src4 + src5) + 3 * ((src2 + src7) - ((src3 + src6)<<1)) - (src1 + src8) + round_add) >> 5), 0, 255);
-		dst[5 * stride] = CLIP(((20 * (src5 + src6) + (src8<<1) + 3 * (src3 - ((src4 + src7) << 1)) - src2 + round_add) >> 5), 0, 255);
-		dst[6 * stride] = CLIP(((19 * src7 + 20 * src6 - src3 + 3 * (src4 - src8 - (src5 << 1)) + round_add) >> 5), 0, 255);
-		dst[7 * stride] = CLIP(((7 * ((src8<<1) - src6) + 23 * src7 + 3 * src5 - src4 + round_add) >> 5), 0, 255);
-
-		dst++;
-		src++;
-	}
-}
-
-//----------------------------
-
-void interpolate16x16_lowpass_hv(byte *dst1, byte *dst2, byte *src, int stride, int rounding) {
-
-	byte round_add = 16 - rounding;
-	byte *h_ptr = dst2;
-	for(int i = 0; i < 17; i++) {
-
-		h_ptr[0] = CLIP(((7 * ((src[0]<<1) - src[2]) +  23 * src[1] + 3 * src[3] - src[4] + round_add) >> 5), 0, 255);
-		h_ptr[1] = CLIP(((19 * src[1] + 20 * src[2] - src[5] + 3 * (src[4] - src[0] - (src[3]<<1)) + round_add) >> 5), 0, 255);
-		h_ptr[2] = CLIP(((20 * (src[2] + src[3]) + (src[0]<<1) + 3 * (src[5] - ((src[1] + src[4])<<1)) - src[6] + round_add) >> 5), 0, 255);
-
-		h_ptr[3] = CLIP(((20 * (src[3] + src[4]) + 3 * ((src[6] + src[1]) - ((src[2] + src[5])<<1)) - (src[0] + src[7]) + round_add) >> 5), 0, 255);
-		h_ptr[4] = CLIP(((20 * (src[4] + src[5]) - 3 * (((src[3] + src[6])<<1) - (src[2] + src[7])) - (src[1] + src[8]) + round_add) >> 5), 0, 255);
-		h_ptr[5] = CLIP(((20 * (src[5] + src[6]) - 3 * (((src[4] + src[7])<<1) - (src[3] + src[8])) - (src[2] + src[9]) + round_add) >> 5), 0, 255);
-		h_ptr[6] = CLIP(((20 * (src[6] + src[7]) - 3 * (((src[5] + src[8])<<1) - (src[4] + src[9])) - (src[3] + src[10]) + round_add) >> 5), 0, 255);
-		h_ptr[7] = CLIP(((20 * (src[7] + src[8]) - 3 * (((src[6] + src[9])<<1) - (src[5] + src[10])) - (src[4] + src[11]) + round_add) >> 5), 0, 255);
-		h_ptr[8] = CLIP(((20 * (src[8] + src[9]) - 3 * (((src[7] + src[10])<<1) - (src[6] + src[11])) - (src[5] + src[12]) + round_add) >> 5), 0, 255);
-		h_ptr[9] = CLIP(((20 * (src[9] + src[10]) - 3 * (((src[8] + src[11])<<1) - (src[7] + src[12])) - (src[6] + src[13]) + round_add) >> 5), 0, 255);
-		h_ptr[10] = CLIP(((20 * (src[10] + src[11]) - 3 * (((src[9] + src[12])<<1) - (src[8] + src[13])) - (src[7] + src[14]) + round_add) >> 5), 0, 255);
-		h_ptr[11] = CLIP(((20 * (src[11] + src[12]) - 3 * (((src[10] + src[13])<<1) - (src[9] + src[14])) - (src[8] + src[15]) + round_add) >> 5), 0, 255);
-		h_ptr[12] = CLIP(((20 * (src[12] + src[13]) - 3 * (((src[11] + src[14])<<1) - (src[10] + src[15])) - (src[9] + src[16]) + round_add) >> 5), 0, 255);
-
-		h_ptr[13] = CLIP(((20 * (src[13] + src[14]) + (src[16]<<1) + 3 * (src[11] - ((src[12] + src[15]) << 1)) - src[10] + round_add) >> 5), 0, 255);
-		h_ptr[14] = CLIP(((19 * src[15] + 20 * src[14] + 3 * (src[12] - src[16] - (src[13] << 1)) - src[11] + round_add) >> 5), 0, 255);
-		h_ptr[15] = CLIP(((23 * src[15] + 7 * ((src[16]<<1) - src[14]) + 3 * src[13] - src[12] + round_add) >> 5), 0, 255);
-
-		h_ptr += stride;
-		src += stride;
-	}
-	interpolate16x16_lowpass_v(dst1, dst2, stride, rounding);
-
-}
-
-//----------------------------
-
-void interpolate8x8_lowpass_hv(byte *dst1, byte *dst2, byte *src, int stride, int rounding) {
-
-	byte round_add = 16 - rounding;
-	byte *h_ptr = dst2;
-	for(int i = 0; i < 9; i++) {
-
-		h_ptr[0] = CLIP(((7 * ((src[0]<<1) - src[2]) + 23 * src[1] + 3 * src[3] - src[4] + round_add) >> 5), 0, 255);
-		h_ptr[1] = CLIP(((19 * src[1] + 20 * src[2] - src[5] + 3 * (src[4] - src[0] - (src[3]<<1)) + round_add) >> 5), 0, 255);
-		h_ptr[2] = CLIP(((20 * (src[2] + src[3]) + (src[0]<<1) + 3 * (src[5] - ((src[1] + src[4])<<1)) - src[6] + round_add) >> 5), 0, 255);
-		h_ptr[3] = CLIP(((20 * (src[3] + src[4]) + 3 * ((src[6] + src[1]) - ((src[2] + src[5])<<1)) - (src[0] + src[7]) + round_add) >> 5), 0, 255);
-		h_ptr[4] = CLIP(((20 * (src[4] + src[5]) - 3 * (((src[3] + src[6])<<1) - (src[2] + src[7])) - (src[1] + src[8]) + round_add) >> 5), 0, 255);
-		h_ptr[5] = CLIP(((20 * (src[5] + src[6]) + (src[8]<<1) + 3 * (src[3] - ((src[4] + src[7]) << 1)) - src[2] + round_add) >> 5), 0, 255);
-		h_ptr[6] = CLIP(((19 * src[7] + 20 * src[6] + 3 * (src[4] - src[8] - (src[5] << 1)) - src[3] + round_add) >> 5), 0, 255);
-		h_ptr[7] = CLIP(((23 * src[7] + 7 * ((src[8]<<1) - src[6]) + 3 * src[5] - src[4] + round_add) >> 5), 0, 255);
-
-		h_ptr += stride;
-		src += stride;
-	}
-	interpolate8x8_lowpass_v(dst1, dst2, stride, rounding);
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/interpolate8x8.h Deleted

@@ -1,107 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Interpolation related header  -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: interpolate8x8.h,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _INTERPOLATE8X8_H_
-#define _INTERPOLATE8X8_H_
-
-#include "mem_transfer.h"
-
-typedef void (INTERPOLATE8X8)(byte *dst, const byte *src, dword stride, bool rounding);
-typedef INTERPOLATE8X8 *INTERPOLATE8X8_PTR;
-
-typedef void (INTERPOLATE8X8_AVG2)(byte *dst, const byte *src1, const byte *src2, dword stride, bool rounding, dword height);
-typedef INTERPOLATE8X8_AVG2 *INTERPOLATE8X8_AVG2_PTR;
-
-typedef void (INTERPOLATE8X8_AVG4)(byte *dst, const byte *src1, const byte *src2, const byte *src3, const byte *src4, dword stride, bool rounding);
-typedef INTERPOLATE8X8_AVG4 *INTERPOLATE8X8_AVG4_PTR;
-
-typedef void (INTERPOLATE_LOWPASS) (byte *dst,
-                                    byte *src,
-                                    int stride,
-                                    int rounding);
-
-typedef INTERPOLATE_LOWPASS *INTERPOLATE_LOWPASS_PTR;
-
-typedef void (INTERPOLATE_LOWPASS_HV) (byte *dst1,
-                                       byte *dst2,
-                                       byte *src,
-                                       int stride,
-                                       int rounding);
-
-typedef INTERPOLATE_LOWPASS_HV *INTERPOLATE_LOWPASS_HV_PTR;
-
-typedef void (INTERPOLATE8X8_6TAP_LOWPASS)(byte *dst, byte *src, int stride, bool rounding);
-
-typedef INTERPOLATE8X8_6TAP_LOWPASS *INTERPOLATE8X8_6TAP_LOWPASS_PTR;
-
-#ifdef _ARM_                  //PPC
-extern"C" {
-#endif
-
-	INTERPOLATE8X8 interpolate8x8_halfpel_h;
-	INTERPOLATE8X8 interpolate8x8_halfpel_hv;
-	INTERPOLATE8X8 interpolate8x8_halfpel_v;
-
-#ifdef _ARM_
-}
-#endif
-
-
-INTERPOLATE8X8_AVG2 interpolate8x8_avg2;
-
-INTERPOLATE_LOWPASS interpolate8x8_lowpass_h;
-INTERPOLATE_LOWPASS interpolate8x8_lowpass_v;
-
-INTERPOLATE_LOWPASS interpolate16x16_lowpass_h;
-INTERPOLATE_LOWPASS interpolate16x16_lowpass_v;
-
-INTERPOLATE_LOWPASS_HV interpolate8x8_lowpass_hv;
-INTERPOLATE_LOWPASS_HV interpolate16x16_lowpass_hv;
-
-//----------------------------
-// Notes:
-//    x, y is always multiply of 4, so writing to 'cur' is always dword aligned
-//    stride is always multiply of 4
-void interpolate8x8_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding);
-
-inline void interpolate16x16_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-
-	interpolate8x8_switch(cur, refn, x,   y,   dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x+8, y,   dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x,   y+8, dx, dy, stride, rounding);
-	interpolate8x8_switch(cur, refn, x+8, y+8, dx, dy, stride, rounding);
-}
-
-inline void interpolate32x32_switch(byte *cur, const byte *refn, dword x, dword y, int dx, int dy, dword stride, bool rounding) {
-	interpolate16x16_switch(cur, refn, x,    y,    dx, dy, stride, rounding);
-	interpolate16x16_switch(cur, refn, x+16, y,    dx, dy, stride, rounding);
-	interpolate16x16_switch(cur, refn, x,    y+16, dx, dy, stride, rounding);
-	interpolate16x16_switch(cur, refn, x+16, y+16, dx, dy, stride, rounding);
-}
-
-void interpolate8x8_quarterpel(byte *cur, byte *refn, byte *refh, byte *refv, byte *refhv, dword x, dword y, int dx, int dy, dword stride, bool rounding);
-void interpolate16x16_quarterpel(byte *cur, byte *refn, byte *refh, byte *refv, byte *refhv, dword x, dword y, int dx, int dy, dword stride, bool rounding);
-
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mbcoding.cpp Deleted

@@ -1,937 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - MB coding -
- *
- *  Copyright (C) 2002 Michael Militzer <isibaar@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mbcoding.cpp,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "portab.h"
-#include "global.h"
-#include "bitstream.h"
-#include "vlc_codes.h"
-
-//----------------------------
-/*****************************************************************************
- * VLC tables and other constant arrays
- ****************************************************************************/
-
-struct VLC_TABLE {
-	VLC vlc;
-	EVENT event;
-};
-
-static const VLC_TABLE coeff_tab[2][102] = {
-	/* intra = 0 */
-	{
-		{{ 2,  2}, {0, 0, 1}},
-		{{15,  4}, {0, 0, 2}},
-		{{21,  6}, {0, 0, 3}},
-		{{23,  7}, {0, 0, 4}},
-		{{31,  8}, {0, 0, 5}},
-		{{37,  9}, {0, 0, 6}},
-		{{36,  9}, {0, 0, 7}},
-		{{33, 10}, {0, 0, 8}},
-		{{32, 10}, {0, 0, 9}},
-		{{ 7, 11}, {0, 0, 10}},
-		{{ 6, 11}, {0, 0, 11}},
-		{{32, 11}, {0, 0, 12}},
-		{{ 6,  3}, {0, 1, 1}},
-		{{20,  6}, {0, 1, 2}},
-		{{30,  8}, {0, 1, 3}},
-		{{15, 10}, {0, 1, 4}},
-		{{33, 11}, {0, 1, 5}},
-		{{80, 12}, {0, 1, 6}},
-		{{14,  4}, {0, 2, 1}},
-		{{29,  8}, {0, 2, 2}},
-		{{14, 10}, {0, 2, 3}},
-		{{81, 12}, {0, 2, 4}},
-		{{13,  5}, {0, 3, 1}},
-		{{35,  9}, {0, 3, 2}},
-		{{13, 10}, {0, 3, 3}},
-		{{12,  5}, {0, 4, 1}},
-		{{34,  9}, {0, 4, 2}},
-		{{82, 12}, {0, 4, 3}},
-		{{11,  5}, {0, 5, 1}},
-		{{12, 10}, {0, 5, 2}},
-		{{83, 12}, {0, 5, 3}},
-		{{19,  6}, {0, 6, 1}},
-		{{11, 10}, {0, 6, 2}},
-		{{84, 12}, {0, 6, 3}},
-		{{18,  6}, {0, 7, 1}},
-		{{10, 10}, {0, 7, 2}},
-		{{17,  6}, {0, 8, 1}},
-		{{ 9, 10}, {0, 8, 2}},
-		{{16,  6}, {0, 9, 1}},
-		{{ 8, 10}, {0, 9, 2}},
-		{{22,  7}, {0, 10, 1}},
-		{{85, 12}, {0, 10, 2}},
-		{{21,  7}, {0, 11, 1}},
-		{{20,  7}, {0, 12, 1}},
-		{{28,  8}, {0, 13, 1}},
-		{{27,  8}, {0, 14, 1}},
-		{{33,  9}, {0, 15, 1}},
-		{{32,  9}, {0, 16, 1}},
-		{{31,  9}, {0, 17, 1}},
-		{{30,  9}, {0, 18, 1}},
-		{{29,  9}, {0, 19, 1}},
-		{{28,  9}, {0, 20, 1}},
-		{{27,  9}, {0, 21, 1}},
-		{{26,  9}, {0, 22, 1}},
-		{{34, 11}, {0, 23, 1}},
-		{{35, 11}, {0, 24, 1}},
-		{{86, 12}, {0, 25, 1}},
-		{{87, 12}, {0, 26, 1}},
-		{{ 7,  4}, {1, 0, 1}},
-		{{25,  9}, {1, 0, 2}},
-		{{ 5, 11}, {1, 0, 3}},
-		{{15,  6}, {1, 1, 1}},
-		{{ 4, 11}, {1, 1, 2}},
-		{{14,  6}, {1, 2, 1}},
-		{{13,  6}, {1, 3, 1}},
-		{{12,  6}, {1, 4, 1}},
-		{{19,  7}, {1, 5, 1}},
-		{{18,  7}, {1, 6, 1}},
-		{{17,  7}, {1, 7, 1}},
-		{{16,  7}, {1, 8, 1}},
-		{{26,  8}, {1, 9, 1}},
-		{{25,  8}, {1, 10, 1}},
-		{{24,  8}, {1, 11, 1}},
-		{{23,  8}, {1, 12, 1}},
-		{{22,  8}, {1, 13, 1}},
-		{{21,  8}, {1, 14, 1}},
-		{{20,  8}, {1, 15, 1}},
-		{{19,  8}, {1, 16, 1}},
-		{{24,  9}, {1, 17, 1}},
-		{{23,  9}, {1, 18, 1}},
-		{{22,  9}, {1, 19, 1}},
-		{{21,  9}, {1, 20, 1}},
-		{{20,  9}, {1, 21, 1}},
-		{{19,  9}, {1, 22, 1}},
-		{{18,  9}, {1, 23, 1}},
-		{{17,  9}, {1, 24, 1}},
-		{{ 7, 10}, {1, 25, 1}},
-		{{ 6, 10}, {1, 26, 1}},
-		{{ 5, 10}, {1, 27, 1}},
-		{{ 4, 10}, {1, 28, 1}},
-		{{36, 11}, {1, 29, 1}},
-		{{37, 11}, {1, 30, 1}},
-		{{38, 11}, {1, 31, 1}},
-		{{39, 11}, {1, 32, 1}},
-		{{88, 12}, {1, 33, 1}},
-		{{89, 12}, {1, 34, 1}},
-		{{90, 12}, {1, 35, 1}},
-		{{91, 12}, {1, 36, 1}},
-		{{92, 12}, {1, 37, 1}},
-		{{93, 12}, {1, 38, 1}},
-		{{94, 12}, {1, 39, 1}},
-		{{95, 12}, {1, 40, 1}}
-	},
-	/* intra = 1 */
-	{
-		{{ 2,  2}, {0, 0, 1}},
-		{{15,  4}, {0, 0, 3}},
-		{{21,  6}, {0, 0, 6}},
-		{{23,  7}, {0, 0, 9}},
-		{{31,  8}, {0, 0, 10}},
-		{{37,  9}, {0, 0, 13}},
-		{{36,  9}, {0, 0, 14}},
-		{{33, 10}, {0, 0, 17}},
-		{{32, 10}, {0, 0, 18}},
-		{{ 7, 11}, {0, 0, 21}},
-		{{ 6, 11}, {0, 0, 22}},
-		{{32, 11}, {0, 0, 23}},
-		{{ 6,  3}, {0, 0, 2}},
-		{{20,  6}, {0, 1, 2}},
-		{{30,  8}, {0, 0, 11}},
-		{{15, 10}, {0, 0, 19}},
-		{{33, 11}, {0, 0, 24}},
-		{{80, 12}, {0, 0, 25}},
-		{{14,  4}, {0, 1, 1}},
-		{{29,  8}, {0, 0, 12}},
-		{{14, 10}, {0, 0, 20}},
-		{{81, 12}, {0, 0, 26}},
-		{{13,  5}, {0, 0, 4}},
-		{{35,  9}, {0, 0, 15}},
-		{{13, 10}, {0, 1, 7}},
-		{{12,  5}, {0, 0, 5}},
-		{{34,  9}, {0, 4, 2}},
-		{{82, 12}, {0, 0, 27}},
-		{{11,  5}, {0, 2, 1}},
-		{{12, 10}, {0, 2, 4}},
-		{{83, 12}, {0, 1, 9}},
-		{{19,  6}, {0, 0, 7}},
-		{{11, 10}, {0, 3, 4}},
-		{{84, 12}, {0, 6, 3}},
-		{{18,  6}, {0, 0, 8}},
-		{{10, 10}, {0, 4, 3}},
-		{{17,  6}, {0, 3, 1}},
-		{{ 9, 10}, {0, 8, 2}},
-		{{16,  6}, {0, 4, 1}},
-		{{ 8, 10}, {0, 5, 3}},
-		{{22,  7}, {0, 1, 3}},
-		{{85, 12}, {0, 1, 10}},
-		{{21,  7}, {0, 2, 2}},
-		{{20,  7}, {0, 7, 1}},
-		{{28,  8}, {0, 1, 4}},
-		{{27,  8}, {0, 3, 2}},
-		{{33,  9}, {0, 0, 16}},
-		{{32,  9}, {0, 1, 5}},
-		{{31,  9}, {0, 1, 6}},
-		{{30,  9}, {0, 2, 3}},
-		{{29,  9}, {0, 3, 3}},
-		{{28,  9}, {0, 5, 2}},
-		{{27,  9}, {0, 6, 2}},
-		{{26,  9}, {0, 7, 2}},
-		{{34, 11}, {0, 1, 8}},
-		{{35, 11}, {0, 9, 2}},
-		{{86, 12}, {0, 2, 5}},
-		{{87, 12}, {0, 7, 3}},
-		{{ 7,  4}, {1, 0, 1}},
-		{{25,  9}, {0, 11, 1}},
-		{{ 5, 11}, {1, 0, 6}},
-		{{15,  6}, {1, 1, 1}},
-		{{ 4, 11}, {1, 0, 7}},
-		{{14,  6}, {1, 2, 1}},
-		{{13,  6}, {0, 5, 1}},
-		{{12,  6}, {1, 0, 2}},
-		{{19,  7}, {1, 5, 1}},
-		{{18,  7}, {0, 6, 1}},
-		{{17,  7}, {1, 3, 1}},
-		{{16,  7}, {1, 4, 1}},
-		{{26,  8}, {1, 9, 1}},
-		{{25,  8}, {0, 8, 1}},
-		{{24,  8}, {0, 9, 1}},
-		{{23,  8}, {0, 10, 1}},
-		{{22,  8}, {1, 0, 3}},
-		{{21,  8}, {1, 6, 1}},
-		{{20,  8}, {1, 7, 1}},
-		{{19,  8}, {1, 8, 1}},
-		{{24,  9}, {0, 12, 1}},
-		{{23,  9}, {1, 0, 4}},
-		{{22,  9}, {1, 1, 2}},
-		{{21,  9}, {1, 10, 1}},
-		{{20,  9}, {1, 11, 1}},
-		{{19,  9}, {1, 12, 1}},
-		{{18,  9}, {1, 13, 1}},
-		{{17,  9}, {1, 14, 1}},
-		{{ 7, 10}, {0, 13, 1}},
-		{{ 6, 10}, {1, 0, 5}},
-		{{ 5, 10}, {1, 1, 3}},
-		{{ 4, 10}, {1, 2, 2}},
-		{{36, 11}, {1, 3, 2}},
-		{{37, 11}, {1, 4, 2}},
-		{{38, 11}, {1, 15, 1}},
-		{{39, 11}, {1, 16, 1}},
-		{{88, 12}, {0, 14, 1}},
-		{{89, 12}, {1, 0, 8}},
-		{{90, 12}, {1, 5, 2}},
-		{{91, 12}, {1, 6, 2}},
-		{{92, 12}, {1, 17, 1}},
-		{{93, 12}, {1, 18, 1}},
-		{{94, 12}, {1, 19, 1}},
-		{{95, 12}, {1, 20, 1}}
-	}
-};
-
-//----------------------------
-/* constants taken from momusys/vm_common/inlcude/max_level.h */
-static const byte max_level[2][2][64] = {
-	{
-		/* intra = 0, last = 0 */
-		{
-			12, 6, 4, 3, 3, 3, 3, 2,
-			2, 2, 2, 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
-		},
-		/* intra = 0, last = 1 */
-		{
-			3, 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, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0
-		}
-	},
-	{
-		/* intra = 1, last = 0 */
-		{
-			27, 10, 5, 4, 3, 3, 3, 3,
-			2, 2, 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
-		},
-		/* intra = 1, last = 1 */
-		{
-			8, 3, 2, 2, 2, 2, 2, 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
-		}
-	}
-};
-
-//----------------------------
-
-static const byte max_run[2][2][64] = {
-	{
-		/* intra = 0, last = 0 */
-		{
-			0, 26, 10, 6, 2, 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,
-		},
-		/* intra = 0, last = 1 */
-		{
-			0, 40, 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,
-		}
-	},
-	{
-		/* intra = 1, last = 0 */
-		{
-			0, 14, 9, 7, 3, 2, 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,
-		},
-		/* intra = 1, last = 1 */
-		{
-			0, 20, 6, 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,
-		}
-	}
-};
-
-/******************************************************************
- * encoder tables                                                 *
- ******************************************************************/
-
-static const VLC sprite_trajectory_len[15] = {
-	{ 0x00 , 2},
-	{ 0x02 , 3}, { 0x03, 3}, { 0x04, 3}, { 0x05, 3}, { 0x06, 3},
-	{ 0x0E , 4}, { 0x1E, 5}, { 0x3E, 6}, { 0x7E, 7}, { 0xFE, 8},
-	{ 0x1FE, 9}, {0x3FE,10}, {0x7FE,11}, {0xFFE,12}
-};
-
-
-/******************************************************************
- * decoder tables                                                 *
- ******************************************************************/
-
-static const VLC mcbpc_intra_table[64] = {
-	{-1, 0}, {20, 6}, {36, 6}, {52, 6}, {4, 4},  {4, 4},  {4, 4},  {4, 4},
-	{19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3},
-	{35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3}, {35, 3},
-	{51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3}, {51, 3},
-	{3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},
-	{3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},
-	{3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},
-	{3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1},  {3, 1}
-};
-
-//----------------------------
-
-static const VLC mcbpc_inter_table[257] = {
-	{VLC_ERROR, 0}, {255, 9}, {52, 9}, {36, 9}, {20, 9}, {49, 9}, {35, 8}, {35, 8},
-	{19, 8}, {19, 8}, {50, 8}, {50, 8}, {51, 7}, {51, 7}, {51, 7}, {51, 7},
-	{34, 7}, {34, 7}, {34, 7}, {34, 7}, {18, 7}, {18, 7}, {18, 7}, {18, 7},
-	{33, 7}, {33, 7}, {33, 7}, {33, 7}, {17, 7}, {17, 7}, {17, 7}, {17, 7},
-	{4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6}, {4, 6},
-	{48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6}, {48, 6},
-	{3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},
-	{3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5}, {3, 5},
-	{32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
-	{32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
-	{32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
-	{32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4}, {32, 4},
-	{16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
-	{16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
-	{16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
-	{16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4}, {16, 4},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3},
-	{0, 1}
-};
-
-//----------------------------
-
-static const VLC cbpy_table[64] = {
-	{-1, 0}, {-1, 0}, {6, 6},  {9, 6},  {8, 5},  {8, 5},  {4, 5},  {4, 5},
-	{2, 5},  {2, 5},  {1, 5},  {1, 5},  {0, 4},  {0, 4},  {0, 4},  {0, 4},
-	{12, 4}, {12, 4}, {12, 4}, {12, 4}, {10, 4}, {10, 4}, {10, 4}, {10, 4},
-	{14, 4}, {14, 4}, {14, 4}, {14, 4}, {5, 4},  {5, 4},  {5, 4},  {5, 4},
-	{13, 4}, {13, 4}, {13, 4}, {13, 4}, {3, 4},  {3, 4},  {3, 4},  {3, 4},
-	{11, 4}, {11, 4}, {11, 4}, {11, 4}, {7, 4},  {7, 4},  {7, 4},  {7, 4},
-	{15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2},
-	{15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}, {15, 2}
-};
-
-//----------------------------
-
-static const VLC TMNMVtab0[] = {
-	{3, 4}, {-3, 4}, {2, 3}, {2, 3}, {-2, 3}, {-2, 3}, {1, 2},
-	{1, 2}, {1, 2}, {1, 2}, {-1, 2}, {-1, 2}, {-1, 2}, {-1, 2}
-};
-
-//----------------------------
-
-static const VLC TMNMVtab1[] = {
-	{12, 10}, {-12, 10}, {11, 10}, {-11, 10},
-	{10, 9}, {10, 9}, {-10, 9}, {-10, 9},
-	{9, 9}, {9, 9}, {-9, 9}, {-9, 9},
-	{8, 9}, {8, 9}, {-8, 9}, {-8, 9},
-	{7, 7}, {7, 7}, {7, 7}, {7, 7},
-	{7, 7}, {7, 7}, {7, 7}, {7, 7},
-	{-7, 7}, {-7, 7}, {-7, 7}, {-7, 7},
-	{-7, 7}, {-7, 7}, {-7, 7}, {-7, 7},
-	{6, 7}, {6, 7}, {6, 7}, {6, 7},
-	{6, 7}, {6, 7}, {6, 7}, {6, 7},
-	{-6, 7}, {-6, 7}, {-6, 7}, {-6, 7},
-	{-6, 7}, {-6, 7}, {-6, 7}, {-6, 7},
-	{5, 7}, {5, 7}, {5, 7}, {5, 7},
-	{5, 7}, {5, 7}, {5, 7}, {5, 7},
-	{-5, 7}, {-5, 7}, {-5, 7}, {-5, 7},
-	{-5, 7}, {-5, 7}, {-5, 7}, {-5, 7},
-	{4, 6}, {4, 6}, {4, 6}, {4, 6},
-	{4, 6}, {4, 6}, {4, 6}, {4, 6},
-	{4, 6}, {4, 6}, {4, 6}, {4, 6},
-	{4, 6}, {4, 6}, {4, 6}, {4, 6},
-	{-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
-	{-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
-	{-4, 6}, {-4, 6}, {-4, 6}, {-4, 6},
-	{-4, 6}, {-4, 6}, {-4, 6}, {-4, 6}
-};
-
-//----------------------------
-
-static const VLC TMNMVtab2[] = {
-	{32, 12}, {-32, 12}, {31, 12}, {-31, 12},
-	{30, 11}, {30, 11}, {-30, 11}, {-30, 11},
-	{29, 11}, {29, 11}, {-29, 11}, {-29, 11},
-	{28, 11}, {28, 11}, {-28, 11}, {-28, 11},
-	{27, 11}, {27, 11}, {-27, 11}, {-27, 11},
-	{26, 11}, {26, 11}, {-26, 11}, {-26, 11},
-	{25, 11}, {25, 11}, {-25, 11}, {-25, 11},
-	{24, 10}, {24, 10}, {24, 10}, {24, 10},
-	{-24, 10}, {-24, 10}, {-24, 10}, {-24, 10},
-	{23, 10}, {23, 10}, {23, 10}, {23, 10},
-	{-23, 10}, {-23, 10}, {-23, 10}, {-23, 10},
-	{22, 10}, {22, 10}, {22, 10}, {22, 10},
-	{-22, 10}, {-22, 10}, {-22, 10}, {-22, 10},
-	{21, 10}, {21, 10}, {21, 10}, {21, 10},
-	{-21, 10}, {-21, 10}, {-21, 10}, {-21, 10},
-	{20, 10}, {20, 10}, {20, 10}, {20, 10},
-	{-20, 10}, {-20, 10}, {-20, 10}, {-20, 10},
-	{19, 10}, {19, 10}, {19, 10}, {19, 10},
-	{-19, 10}, {-19, 10}, {-19, 10}, {-19, 10},
-	{18, 10}, {18, 10}, {18, 10}, {18, 10},
-	{-18, 10}, {-18, 10}, {-18, 10}, {-18, 10},
-	{17, 10}, {17, 10}, {17, 10}, {17, 10},
-	{-17, 10}, {-17, 10}, {-17, 10}, {-17, 10},
-	{16, 10}, {16, 10}, {16, 10}, {16, 10},
-	{-16, 10}, {-16, 10}, {-16, 10}, {-16, 10},
-	{15, 10}, {15, 10}, {15, 10}, {15, 10},
-	{-15, 10}, {-15, 10}, {-15, 10}, {-15, 10},
-	{14, 10}, {14, 10}, {14, 10}, {14, 10},
-	{-14, 10}, {-14, 10}, {-14, 10}, {-14, 10},
-	{13, 10}, {13, 10}, {13, 10}, {13, 10},
-	{-13, 10}, {-13, 10}, {-13, 10}, {-13, 10}
-};
-
-//----------------------------
-
-static const VLC dc_lum_tab[] = {
-	{0, 0}, {4, 3}, {3, 3}, {0, 3},
-	{2, 2}, {2, 2}, {1, 2}, {1, 2},
-};
-
-//---------------------------
-#define LEVELOFFSET 32
-
-int Bitstream::bs_get_spritetrajectory() {
-
-	for(int i = 0; i < 12; i++) {
-		if((int)ShowBits(sprite_trajectory_len[i].len) == sprite_trajectory_len[i].code) {
-			Skip(sprite_trajectory_len[i].len);
-			return i;
-		}
-	}
-	return -1;
-}
-
-//----------------------------
-
-void S_decoder::init_vlc_tables() {
-
-	dword i, j, intra, last, run,  run_esc, level, level_esc, escape, escape_len, offset;
-
-	for (intra = 0; intra < 2; intra++)
-		for (i = 0; i < 4096; i++)
-			DCT3D[intra][i].event.level = 0;
-
-	for (intra = 0; intra < 2; intra++) {
-		for (last = 0; last < 2; last++) {
-			for (run = 0; run < 63 + last; run++) {
-				for (level = 0; level < (dword)(32 << intra); level++) {
-					offset = !intra * LEVELOFFSET;
-					coeff_VLC[intra][last][level + offset][run].len = 128;
-				}
-			}
-		}
-	}
-
-	for (intra = 0; intra < 2; intra++) {
-		for (i = 0; i < 102; i++) {
-			offset = !intra * LEVELOFFSET;
-
-			for (j = 0; j < (dword)(1 << (12 - coeff_tab[intra][i].vlc.len)); j++) {
-				DCT3D[intra][(coeff_tab[intra][i].vlc.code << (12 - coeff_tab[intra][i].vlc.len)) | j].len    = coeff_tab[intra][i].vlc.len;
-				DCT3D[intra][(coeff_tab[intra][i].vlc.code << (12 - coeff_tab[intra][i].vlc.len)) | j].event = coeff_tab[intra][i].event;
-			}
-
-			coeff_VLC[intra][coeff_tab[intra][i].event.last][coeff_tab[intra][i].event.level + offset][coeff_tab[intra][i].event.run].code
-			    = coeff_tab[intra][i].vlc.code << 1;
-			coeff_VLC[intra][coeff_tab[intra][i].event.last][coeff_tab[intra][i].event.level + offset][coeff_tab[intra][i].event.run].len
-			    = coeff_tab[intra][i].vlc.len + 1;
-
-			if (!intra) {
-				coeff_VLC[intra][coeff_tab[intra][i].event.last][offset - coeff_tab[intra][i].event.level][coeff_tab[intra][i].event.run].code
-				    = (coeff_tab[intra][i].vlc.code << 1) | 1;
-				coeff_VLC[intra][coeff_tab[intra][i].event.last][offset - coeff_tab[intra][i].event.level][coeff_tab[intra][i].event.run].len
-				    = coeff_tab[intra][i].vlc.len + 1;
-			}
-		}
-	}
-
-	for (intra = 0; intra < 2; intra++) {
-		for (last = 0; last < 2; last++) {
-			for (run = 0; run < 63 + last; run++) {
-				for (level = 1; level < (dword)(32 << intra); level++) {
-
-					if (level <= max_level[intra][last][run] && run <= max_run[intra][last][level])
-						continue;
-
-					offset = !intra * LEVELOFFSET;
-					level_esc = level - max_level[intra][last][run];
-					run_esc = run - 1 - max_run[intra][last][level];
-
-					if (level_esc <= max_level[intra][last][run] && run <= max_run[intra][last][level_esc]) {
-						escape     = ESCAPE1;
-						escape_len = 7 + 1;
-						run_esc    = run;
-					} else {
-						if (run_esc <= max_run[intra][last][level] && level <= max_level[intra][last][run_esc]) {
-							escape     = ESCAPE2;
-							escape_len = 7 + 2;
-							level_esc  = level;
-						} else {
-							if (!intra) {
-								coeff_VLC[intra][last][level + offset][run].code
-								    = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((level & 0xfff) << 1) | 1;
-								coeff_VLC[intra][last][level + offset][run].len = 30;
-								coeff_VLC[intra][last][offset - level][run].code
-								    = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((-(int)level & 0xfff) << 1) | 1;
-								coeff_VLC[intra][last][offset - level][run].len = 30;
-							}
-							continue;
-						}
-					}
-
-					coeff_VLC[intra][last][level + offset][run].code
-					    = (escape << coeff_VLC[intra][last][level_esc + offset][run_esc].len)
-					      |  coeff_VLC[intra][last][level_esc + offset][run_esc].code;
-					coeff_VLC[intra][last][level + offset][run].len
-					    = coeff_VLC[intra][last][level_esc + offset][run_esc].len + escape_len;
-
-					if (!intra) {
-						coeff_VLC[intra][last][offset - level][run].code
-						    = (escape << coeff_VLC[intra][last][level_esc + offset][run_esc].len)
-						      |  coeff_VLC[intra][last][level_esc + offset][run_esc].code | 1;
-						coeff_VLC[intra][last][offset - level][run].len
-						    = coeff_VLC[intra][last][level_esc + offset][run_esc].len + escape_len;
-					}
-				}
-
-				if (!intra) {
-					coeff_VLC[intra][last][0][run].code
-					    = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((-32 & 0xfff) << 1) | 1;
-					coeff_VLC[intra][last][0][run].len = 30;
-				}
-			}
-		}
-	}
-
-	/* init sprite_trajectory tables
-	 * even if GMC is not specified (it might be used later...) */
-	/*
-	{
-	   dword k;
-	   int l;
-	sprite_trajectory_code[0+16384].code = 0;
-	sprite_trajectory_code[0+16384].len = 0;
-	for (k=0;k<14;k++) {
-	   int limit = (1<<k);
-
-	   for (l=-(2*limit-1); l <= -limit; l++) {
-	      sprite_trajectory_code[l+16384].code = (2*limit-1)+l;
-	      sprite_trajectory_code[l+16384].len = k+1;
-	   }
-
-	   for (l=limit; l<= 2*limit-1; l++) {
-	      sprite_trajectory_code[l+16384].code = l;
-	      sprite_trajectory_code[l+16384].len = k+1;
-	   }
-	}
-	}
-	*/
-}
-
-
-/***************************************************************
- * decoding stuff starts here                                  *
- ***************************************************************/
-
-
-/*
- * for IVOP addbits == 0
- * for PVOP addbits == fcode - 1
- * for BVOP addbits == max(fcode,bcode) - 1
- * returns true or false
- */
-int Bitstream::check_resync_marker(int addbits) {
-
-	dword nbitsresyncmarker = NUMBITS_VP_RESYNC_MARKER + addbits;
-	dword nbits = NumBitsToByteAlign();
-	dword code = ShowBits(nbits);
-
-	if(code == (((dword)1 << (nbits - 1)) - 1)) {
-		return ShowBitsFromByteAlign(nbitsresyncmarker) == RESYNC_MARKER;
-	}
-	return 0;
-}
-
-//----------------------------
-
-int Bitstream::get_mcbpc_intra() {
-
-	dword index;
-
-	index = ShowBits(9);
-	index >>= 3;
-
-	Skip(mcbpc_intra_table[index].len);
-
-	return mcbpc_intra_table[index].code;
-
-}
-
-//----------------------------
-
-int Bitstream::GetMcbpcInter() {
-
-	dword index = MIN(ShowBits(9), 256);
-	Skip(mcbpc_inter_table[index].len);
-
-	return mcbpc_inter_table[index].code;
-}
-
-//----------------------------
-
-int Bitstream::GetCbpy(int intra) {
-
-	dword index = ShowBits(6);
-	Skip(cbpy_table[index].len);
-	int cbpy = cbpy_table[index].code;
-	if(!intra)
-		cbpy = 15 - cbpy;
-	return cbpy;
-}
-
-//----------------------------
-
-static int get_mv_data(Bitstream * bs) {
-
-	if(bs->GetBit())
-		return 0;
-
-	dword index = bs->ShowBits(12);
-
-	if(index >= 512) {
-		index = (index >> 8) - 2;
-		bs->Skip(TMNMVtab0[index].len);
-		return TMNMVtab0[index].code;
-	}
-
-	if (index >= 128) {
-		index = (index >> 2) - 32;
-		bs->Skip(TMNMVtab1[index].len);
-		return TMNMVtab1[index].code;
-	}
-
-	index -= 4;
-
-	bs->Skip(TMNMVtab2[index].len);
-	return TMNMVtab2[index].code;
-}
-
-//----------------------------
-
-int Bitstream::GetMoveVector(int fcode) {
-
-	int scale_fac = 1 << (fcode - 1);
-	int data = get_mv_data(this);
-
-	if(scale_fac == 1 || data == 0)
-		return data;
-
-	int res = GetBits(fcode - 1);
-	int mv = ((ABS(data) - 1) * scale_fac) + res + 1;
-
-	return data < 0 ? -mv : mv;
-}
-
-//----------------------------
-
-int Bitstream::get_dc_dif(dword dc_size) {
-
-	int code = GetBits(dc_size);
-	int msb = code >> (dc_size - 1);
-
-	if (msb == 0)
-		return (-1 * (code ^ ((1 << dc_size) - 1)));
-
-	return code;
-
-}
-
-//----------------------------
-
-int Bitstream::get_dc_size_lum() {
-
-	int code = ShowBits(11);
-
-	for(int i = 11; i > 3; i--) {
-		if (code == 1) {
-			Skip(i);
-			return i + 1;
-		}
-		code >>= 1;
-	}
-
-	Skip(dc_lum_tab[code].len);
-	return dc_lum_tab[code].code;
-
-}
-
-//----------------------------
-
-int Bitstream::get_dc_size_chrom() {
-
-	dword code, i;
-
-	code = ShowBits(12);
-
-	for (i = 12; i > 2; i--) {
-		if (code == 1) {
-			Skip(i);
-			return i;
-		}
-		code >>= 1;
-	}
-
-	return 3 - GetBits(2);
-
-}
-
-//----------------------------
-
-int S_decoder::get_coeff(Bitstream *bs, int *run, int *last, int intra, int short_video_header) {
-
-	dword mode;
-	int level;
-	REVERSE_EVENT *reverse_event;
-
-	if(short_video_header)    /* inter-VLCs will be used for both intra and inter blocks */
-		intra = 0;
-
-	if(bs->ShowBits(7) != ESCAPE) {
-		reverse_event = &DCT3D[intra][bs->ShowBits(12)];
-
-		if((level = reverse_event->event.level) == 0)
-			goto error;
-
-		*last = reverse_event->event.last;
-		*run  = reverse_event->event.run;
-
-		bs->Skip(reverse_event->len);
-
-		return bs->GetBits(1) ? -level : level;
-	}
-
-	bs->Skip(7);
-
-	if(short_video_header) {
-		//escape mode 4 - H.263 type, only used if short_video_header = 1
-		*last = bs->GetBit();
-		*run = bs->GetBits(6);
-		level = bs->GetBits(8);
-		if (level == 0 || level == 128)
-			DPRINTF(XVID_DEBUG_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d\n", level);
-		return (level << 24) >> 24;
-	}
-
-	mode = bs->ShowBits(2);
-	if(mode < 3) {
-		bs->Skip((mode == 2) ? 2 : 1);
-
-		reverse_event = &DCT3D[intra][bs->ShowBits(12)];
-
-		if((level = reverse_event->event.level) == 0)
-			goto error;
-		*last = reverse_event->event.last;
-		*run  = reverse_event->event.run;
-		bs->Skip(reverse_event->len);
-
-		if(mode < 2)        /* first escape mode, level is offset */
-			level += max_level[intra][*last][*run];
-		else              /* second escape mode, run is offset */
-			*run += max_run[intra][*last][level] + 1;
-		return bs->GetBits(1) ? -level : level;
-	}
-	//third escape mode - fixed length codes
-	bs->Skip(2);
-	*last = bs->GetBits(1);
-	*run = bs->GetBits(6);
-	bs->Skip(1);      //marker
-	level = bs->GetBits(12);
-	bs->Skip(1);      //marker
-
-	return (level << 20) >> 20;
-
-error:
-	*run = VLC_ERROR;
-	return 0;
-}
-
-//----------------------------
-
-void S_decoder::get_intra_block(Bitstream *bs, int *block, int direction, int coeff) {
-
-	const dword *scan = scan_tables[direction];
-	int last;
-	do {
-		int run;
-		int level = get_coeff(bs, &run, &last, 1, 0);
-		if(run == -1) {
-			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
-			break;
-		}
-		coeff += run;
-		block[scan[coeff]] = level;
-
-		//DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level);
-
-		if(level < -2047 || level > 2047) {
-			DPRINTF(XVID_DEBUG_ERROR,"warning: intra_overflow %i\n", level);
-		}
-		coeff++;
-	} while(!last);
-}
-
-//----------------------------
-
-void S_decoder::get_inter_block(Bitstream * bs, int *block, int direction) {
-
-	const dword *scan = scan_tables[direction];
-	int p = 0;
-	int last;
-	do {
-		int run;
-		int level = get_coeff(bs, &run, &last, 0, 0);
-		if(run == -1) {
-			DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run");
-			break;
-		}
-		p += run;
-		block[scan[p]] = level;
-
-		//DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[p], level);
-
-		if(level < -2047 || level > 2047) {
-			DPRINTF(XVID_DEBUG_ERROR,"warning: inter overflow %i\n", level);
-		}
-		p++;
-	} while(!last);
-}
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mbprediction.cpp Deleted

@@ -1,396 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Prediction module -
- *
- *  Copyright (C) 2001-2003 Michael Militzer <isibaar@xvid.org>
- *                2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mbprediction.cpp,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "global.h"
-#include "mbprediction.h"
-
-//----------------------------
-
-#if 0
-
-#define Divide(a,b)    (((a)>0) ? ((a)+((b)>>1))/(b) : ((a)-((b)>>1))/(b))
-
-#else
-
-#define RET_DIV(a, N) return (a*N+32768) >> 16;
-#define RET_SHR(a, N, S) return (a+N) >> S;
-
-static int Divide(int a, int b) {
-	switch(b) {
-	case 1:
-		return a;
-	case 2:
-		return a >> 1;
-	case 4:
-		RET_SHR(a, 2, 2);
-	case 8:
-		RET_SHR(a, 4, 3);
-	case 16:
-		RET_SHR(a, 8, 4);
-	case 32:
-		RET_SHR(a, 16, 5);
-	case 3:
-		RET_DIV(a, 21845);
-	case 5:
-		RET_DIV(a, 13107);
-	case 6:
-		RET_DIV(a, 10923);
-	case 7:
-		RET_DIV(a, 9362);
-	case 9:
-		RET_DIV(a, 7282);
-	case 10:
-		RET_DIV(a, 6554);
-	case 11:
-		RET_DIV(a, 5958);
-	case 12:
-		RET_DIV(a, 5461);
-	case 13:
-		RET_DIV(a, 5041);
-	case 14:
-		RET_DIV(a, 4681);
-	case 15:
-		RET_DIV(a, 4369);
-	case 17:
-		RET_DIV(a, 3855);
-	case 18:
-		RET_DIV(a, 3641);
-	case 19:
-		RET_DIV(a, 3449);
-	case 20:
-		RET_DIV(a, 3277);
-	case 21:
-		RET_DIV(a, 3121);
-	case 22:
-		RET_DIV(a, 2979);
-	case 23:
-		RET_DIV(a, 2849);
-	case 24:
-		RET_DIV(a, 2731);
-	case 25:
-		RET_DIV(a, 2621);
-	case 26:
-		RET_DIV(a, 2521);
-	case 27:
-		RET_DIV(a, 2427);
-	case 28:
-		RET_DIV(a, 2341);
-	case 29:
-		RET_DIV(a, 2260);
-	case 30:
-		RET_DIV(a, 2185);
-	case 31:
-		RET_DIV(a, 2114);
-	}
-	return ((a>0) ? (a+(b>>1))/b : (a-(b>>1))/b);
-}
-#endif
-
-//----------------------------
-
-inline int rescale(int predict_quant, int current_quant, int coeff) {
-
-	if(!coeff)
-		return 0;
-	return Divide(coeff * predict_quant, current_quant);
-}
-
-//----------------------------
-
-static const int default_acdc_values[15] = {
-	1024,
-	0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0
-};
-
-//----------------------------
-/* get dc/ac prediction direction for a single block and place
-   predictor values into MB->pred_values[j][..]
-*/
-void predict_acdc(MACROBLOCK *pMBs, dword x, dword y, dword mb_width, dword block, int qcoeff[64], dword current_quant, int iDcScaler, int predictors[8], int bound) {
-
-	const int mbpos = (y * mb_width) + x;
-	int *left, *top, *diag, *current;
-
-	int left_quant = current_quant;
-	int top_quant = current_quant;
-
-	const int *pLeft = default_acdc_values;
-	const int *pTop = default_acdc_values;
-	const int *pDiag = default_acdc_values;
-
-	dword index = x + y * mb_width;  /* current macroblock */
-	int *acpred_direction = &pMBs[index].acpred_directions[block];
-	dword i;
-
-	left = top = diag = current = 0;
-
-	/* grab left,top and diag macroblocks */
-
-	/* left macroblock */
-
-	if (x && mbpos >= bound + 1  &&
-	        (pMBs[index - 1].mode == MODE_INTRA ||
-	         pMBs[index - 1].mode == MODE_INTRA_Q)) {
-
-		left = pMBs[index - 1].pred_values[0];
-		left_quant = pMBs[index - 1].quant;
-	}
-	/* top macroblock */
-
-	if (mbpos >= bound + (int)mb_width &&
-	        (pMBs[index - mb_width].mode == MODE_INTRA ||
-	         pMBs[index - mb_width].mode == MODE_INTRA_Q)) {
-
-		top = pMBs[index - mb_width].pred_values[0];
-		top_quant = pMBs[index - mb_width].quant;
-	}
-	/* diag macroblock */
-
-	if (x && mbpos >= bound + (int)mb_width + 1 &&
-	        (pMBs[index - 1 - mb_width].mode == MODE_INTRA ||
-	         pMBs[index - 1 - mb_width].mode == MODE_INTRA_Q)) {
-
-		diag = pMBs[index - 1 - mb_width].pred_values[0];
-	}
-
-	current = pMBs[index].pred_values[0];
-
-	/* now grab pLeft, pTop, pDiag _blocks_ */
-
-	switch(block) {
-	case 0:
-		if(left)
-			pLeft = left + MBPRED_SIZE;
-		if(top)
-			pTop = top + (MBPRED_SIZE << 1);
-		if(diag)
-			pDiag = diag + 3 * MBPRED_SIZE;
-		break;
-
-	case 1:
-		pLeft = current;
-		left_quant = current_quant;
-		if(top) {
-			pTop = top + 3 * MBPRED_SIZE;
-			pDiag = top + (MBPRED_SIZE << 1);
-		}
-		break;
-
-	case 2:
-		if(left) {
-			pLeft = left + 3 * MBPRED_SIZE;
-			pDiag = left + MBPRED_SIZE;
-		}
-		pTop = current;
-		top_quant = current_quant;
-		break;
-
-	case 3:
-		pLeft = current + (MBPRED_SIZE << 1);
-		left_quant = current_quant;
-		pTop = current + MBPRED_SIZE;
-		top_quant = current_quant;
-		pDiag = current;
-		break;
-
-	case 4:
-		if(left)
-			pLeft = left + (MBPRED_SIZE << 2);
-		if(top)
-			pTop = top + (MBPRED_SIZE << 2);
-		if(diag)
-			pDiag = diag + (MBPRED_SIZE << 2);
-		break;
-
-	case 5:
-		if(left)
-			pLeft = left + 5 * MBPRED_SIZE;
-		if(top)
-			pTop = top + 5 * MBPRED_SIZE;
-		if(diag)
-			pDiag = diag + 5 * MBPRED_SIZE;
-		break;
-	}
-
-	/*
-	 * determine ac prediction direction & ac/dc predictor place rescaled ac/dc
-	 * predictions into predictors[] for later use
-	 */
-
-	if(ABS(pLeft[0] - pDiag[0]) < ABS(pDiag[0] - pTop[0])) {
-		//vertical
-		*acpred_direction = 1;
-		predictors[0] = Divide(pTop[0], iDcScaler);
-		for(i = 1; i < 8; i++)
-			predictors[i] = rescale(top_quant, current_quant, pTop[i]);
-	} else {
-		//horizontal
-		*acpred_direction = 2;
-		predictors[0] = Divide(pLeft[0], iDcScaler);
-		for(i = 1; i < 8; i++)
-			predictors[i] = rescale(left_quant, current_quant, pLeft[i + 7]);
-	}
-}
-
-//----------------------------
-/* decoder: add predictors to dct_codes[] and
-   store current coeffs to pred_values[] for future prediction
-*/
-void add_acdc(MACROBLOCK *pMB, dword block, int dct_codes[64], dword iDcScaler, int predictors[8]) {
-
-	byte acpred_direction = pMB->acpred_directions[block];
-	int *pCurrent = pMB->pred_values[block];
-
-	DPRINTF(XVID_DEBUG_COEFF,"predictor[0] %i\n", predictors[0]);
-
-	dct_codes[0] += predictors[0];   /* dc prediction */
-	pCurrent[0] = dct_codes[0] * iDcScaler;
-
-	if(acpred_direction == 1) {
-		for(int i = 1; i < 8; i++) {
-			int level = dct_codes[i] + predictors[i];
-			//DPRINTF(XVID_DEBUG_COEFF,"predictor[%i] %i\n",i, predictors[i]);
-			dct_codes[i] = level;
-			pCurrent[i] = level;
-			pCurrent[i + 7] = dct_codes[i * 8];
-		}
-	} else if(acpred_direction == 2) {
-		for(int i = 1; i < 8; i++) {
-			int level = dct_codes[i * 8] + predictors[i];
-			//DPRINTF(XVID_DEBUG_COEFF,"predictor[%i] %i\n",i*8, predictors[i]);
-			dct_codes[i * 8] = level;
-			pCurrent[i + 7] = level;
-			pCurrent[i] = dct_codes[i];
-		}
-	} else {
-		for(int i = 1; i < 8; i++) {
-			pCurrent[i] = dct_codes[i];
-			pCurrent[i + 7] = dct_codes[i * 8];
-		}
-	}
-}
-
-//----------------------------
-
-static const VECTOR zeroMV = { 0, 0 };
-
-VECTOR get_pmv2(const MACROBLOCK * const mbs, const int mb_width, const int bound, const int x, const int y, const int block) {
-
-	int lx, ly, lz;      /* left */
-	int tx, ty, tz;      /* top */
-	int rx, ry, rz;      /* top-right */
-	int lpos, tpos, rpos;
-	int num_cand = 0, last_cand = 1;
-
-	VECTOR pmv[4]; /* left neighbour, top neighbour, top-right neighbour */
-
-	switch(block) {
-	case 0:
-		lx = x - 1;
-		ly = y;
-		lz = 1;
-		tx = x;
-		ty = y - 1;
-		tz = 2;
-		rx = x + 1;
-		ry = y - 1;
-		rz = 2;
-		break;
-	case 1:
-		lx = x;
-		ly = y;
-		lz = 0;
-		tx = x;
-		ty = y - 1;
-		tz = 3;
-		rx = x + 1;
-		ry = y - 1;
-		rz = 2;
-		break;
-	case 2:
-		lx = x - 1;
-		ly = y;
-		lz = 3;
-		tx = x;
-		ty = y;
-		tz = 0;
-		rx = x;
-		ry = y;
-		rz = 1;
-		break;
-	default:
-		lx = x;
-		ly = y;
-		lz = 2;
-		tx = x;
-		ty = y;
-		tz = 0;
-		rx = x;
-		ry = y;
-		rz = 1;
-	}
-
-	lpos = lx + ly * mb_width;
-	rpos = rx + ry * mb_width;
-	tpos = tx + ty * mb_width;
-
-	if(lpos >= bound && lx >= 0) {
-		num_cand++;
-		pmv[1] = mbs[lpos].mvs[lz];
-	} else
-		pmv[1] = zeroMV;
-
-	if(tpos >= bound) {
-		num_cand++;
-		last_cand = 2;
-		pmv[2] = mbs[tpos].mvs[tz];
-	} else
-		pmv[2] = zeroMV;
-
-	if(rpos >= bound && rx < mb_width) {
-		num_cand++;
-		last_cand = 3;
-		pmv[3] = mbs[rpos].mvs[rz];
-	} else
-		pmv[3] = zeroMV;
-
-	//if there're more than one candidate, we return the median vector
-	if(num_cand > 1) {
-		//set median
-		pmv[0].x =
-		    MIN(MAX(pmv[1].x, pmv[2].x),
-		        MIN(MAX(pmv[2].x, pmv[3].x), MAX(pmv[1].x, pmv[3].x)));
-		pmv[0].y =
-		    MIN(MAX(pmv[1].y, pmv[2].y),
-		        MIN(MAX(pmv[2].y, pmv[3].y), MAX(pmv[1].y, pmv[3].y)));
-		return pmv[0];
-	}
-
-	return pmv[last_cand];  //no point calculating median mv
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mbprediction.h Deleted

@@ -1,54 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Prediction header -
- *
- *  Copyright(C) 2002-2003 xvid team <xvid-devel@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mbprediction.h,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-
-#ifndef _MBPREDICTION_H_
-#define _MBPREDICTION_H_
-
-#include "portab.h"
-#include "decoder.h"
-#include "global.h"
-
-#define MIN(X, Y) ((X)<(Y)?(X):(Y))
-#define MAX(X, Y) ((X)>(Y)?(X):(Y))
-
-/* very large value */
-#define MV_MAX_ERROR	(4096 * 256)
-
-#define MVequal(A,B) ( ((A).x)==((B).x) && ((A).y)==((B).y) )
-
-void add_acdc(MACROBLOCK *pMB, dword block, int dct_codes[64], dword iDcScaler, int predictors[8]);
-
-void predict_acdc(MACROBLOCK * pMBs, dword x, dword y, dword mb_width, dword block, int qcoeff[64], dword current_quant, int iDcScaler, int predictors[8], int bound);
-
-VECTOR
-get_pmv2(const MACROBLOCK * const mbs,
-         const int mb_width,
-         const int bound,
-         const int x,
-         const int y,
-         const int block);
-
-#endif							/* _MBPREDICTION_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mem_align.cpp Deleted

@@ -1,131 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Aligned Memory Allocator -
- *
- *  Copyright(C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mem_align.cpp,v 1.3 2010-02-23 16:23:32 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "mem_align.h"
-#include "global.h"
-
-#ifdef __SYMBIAN32__
-#include <e32std.h>
-#endif
-
-/*****************************************************************************
- * xvid_malloc
- *
- * This function allocates 'size' bytes (usable by the user) on the heap and
- * takes care of the requested 'alignment'.
- * In order to align the allocated memory block, the xvid_malloc allocates
- * 'size' bytes + 'alignment' bytes. So try to keep alignment very small
- * when allocating small pieces of memory.
- *
- * NB : a block allocated by xvid_malloc _must_ be freed with xvid_free
- *      (the libc free will return an error)
- *
- * Returned value : - NULL on error
- *                  - Pointer to the allocated aligned block
- *
- ****************************************************************************/
-
-#include "Rules.h"
-
-void *xvid_malloc(long size, dword alignment) {
-
-	byte *mem_ptr;
-
-
-	if (!alignment) {
-
-		/* We have not to satisfy any alignment */
-		//mem_ptr = (byte*)gf_malloc(size + 1);
-		//mem_ptr = new(ELeave) byte[size+1];
-		mem_ptr = new byte[size+1];
-		if(mem_ptr) {
-
-			/* Store (mem_ptr - "real allocated memory") in *(mem_ptr-1) */
-			*mem_ptr = (byte)1;
-
-			/* Return the mem_ptr pointer */
-			return ((void *)(mem_ptr+1));
-		}
-	} else {
-		byte *tmp;
-
-		/* Allocate the required size memory + alignment so we
-		 * can realign the data if necessary */
-		//tmp = (byte *) gf_malloc(size + alignment);
-		//tmp = new(ELeave) byte[size + alignment];
-		tmp = new byte[size + alignment];
-		if(tmp) {
-
-			/* Align the tmp pointer */
-			mem_ptr =
-			    (byte *) ((dword)(tmp + alignment - 1) & (~(dword)(alignment - 1)));
-
-			/* Special case where gf_malloc have already satisfied the alignment
-			 * We must add alignment to mem_ptr because we must store
-			 * (mem_ptr - tmp) in *(mem_ptr-1)
-			 * If we do not add alignment to mem_ptr then *(mem_ptr-1) points
-			 * to a forbidden memory space */
-			if (mem_ptr == tmp)
-				mem_ptr += alignment;
-
-			/* (mem_ptr - tmp) is stored in *(mem_ptr-1) so we are able to retrieve
-			 * the real gf_malloc block allocated and free it in xvid_free */
-			*(mem_ptr - 1) = (byte) (mem_ptr - tmp);
-
-			/* Return the aligned pointer */
-			return ((void *)mem_ptr);
-		}
-	}
-	return 0;
-}
-
-/*****************************************************************************
- * xvid_free
- *
- * Free a previously 'xvid_malloc' allocated block. Does not free NULL
- * references.
- *
- * Returned value : None.
- *
- ****************************************************************************/
-
-void xvid_free(void *mem_ptr) {
-
-	if(!mem_ptr)
-		return;
-
-	/* Aligned pointer */
-	byte *ptr = (byte*)mem_ptr;
-
-	/* *(ptr - 1) holds the offset to the real allocated block
-	 * we sub that offset os we free the real pointer */
-	ptr -= *(ptr - 1);
-
-	/* Free the memory */
-	//free(ptr);
-	delete[] ptr;
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mem_align.h Deleted

@@ -1,35 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Aligned Memory Allocator header  -
- *
- *  Copyright(C) 2002-2003 Edouard Gomez <ed.gomez@free.fr>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mem_align.h,v 1.1.1.1 2005-07-13 14:36:15 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _MEM_ALIGN_H_
-#define _MEM_ALIGN_H_
-
-#include "portab.h"
-#include "Rules.h"
-
-void *xvid_malloc(long size, dword alignment);
-void xvid_free(void *mem_ptr);
-
-#endif							/* _MEM_ALIGN_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mem_transfer.cpp Deleted

@@ -1,283 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - 8bit<->16bit transfer  -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mem_transfer.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "global.h"
-#include "mem_transfer.h"
-
-/*****************************************************************************
- *
- * All these functions are used to transfer data from a 8 bit data array
- * to a 16 bit data array.
- *
- * This is typically used during motion compensation, that's why some
- * functions also do the addition/substraction of another buffer during the
- * so called  transfer.
- *
- ****************************************************************************/
-
-//----------------------------
-/*
- * SRC - the source buffer
- * DST - the destination buffer
- *
- * Then the function does the 8->16 bit transfer and this serie of operations :
- *
- *    SRC (16bit) = SRC
- *    DST (8bit)  = max(min(SRC, 255), 0)
- */
-void transfer_16to8copy(byte *dst, const int *src, dword stride) {
-
-	for(int j = 0; j < 8; j++) {
-		for(int i = 0; i < 8; i++) {
-			int pixel = *src++;
-
-			if(pixel < 0)
-				pixel = 0;
-			//else
-			if(pixel > 255)
-				pixel = 255;
-			dst[i] = byte(pixel);
-		}
-		dst += stride;
-	}
-}
-
-//----------------------------
-/*
- * SRC - the source buffer
- * DST - the destination buffer
- *
- * Then the function does the 16->8 bit transfer and this serie of operations :
- *
- *    SRC (16bit) = SRC
- *    DST (8bit)  = max(min(DST+SRC, 255), 0)
- */
-void transfer_16to8add(byte *dst, const int *src, dword stride) {
-
-	for(int j = 0; j < 8; j++) {
-		for(int i = 0; i < 8; i++) {
-			int pixel = dst[i] + *src++;
-
-			if(pixel < 0)
-				pixel = 0;
-			//else
-			if(pixel > 255)
-				pixel = 255;
-			dst[i] = byte(pixel);
-		}
-		//src += 8;
-		dst += stride;
-	}
-}
-
-#ifndef _ARM_
-//----------------------------
-/*
- * SRC - the source buffer
- * DST - the destination buffer
- *
- * Then the function does the 8->8 bit transfer and this serie of operations :
- *
- *    SRC (8bit) = SRC
- *    DST (8bit) = SRC
- */
-void transfer8x8_copy(byte *dst, const byte *src, dword stride) {
-
-	assert(!(stride&3));
-	assert(!(dword(dst)&3));
-#if defined USE_ARM_ASM && 1
-	int y, tmp, tmp1;
-
-#define NL "add %0, %0, %4\n   add %1, %1, %4\n\t"
-	asm volatile(
-	    "orr %2, %1, %4\n\t"
-	    "tst %2, #3\n   bne .tc_no_dw\n\t"
-	    //dword version
-	    "\n.tc_dw_loop:\n\t"
-#define COPY_QW "ldmia %1, { %2, %3 }\n   stmia %0, { %2, %3 }\n\t"
-	    COPY_QW NL COPY_QW NL COPY_QW NL COPY_QW NL COPY_QW NL COPY_QW NL COPY_QW NL COPY_QW
-	    "b .tc_end\n\t"
-
-	    "\n.tc_no_dw:\n\t"
-	    "tst %2, #1\n   bne .tc_no_w\n\t"
-	    //word version
-	    "\n.tc_w_loop:\n\t"
-#define COPY_W \
-      "ldrh %2, [%1, #0]\n   strh %2, [%0, #0]\n\t" \
-      "ldrh %2, [%1, #2]\n   strh %2, [%0, #2]\n\t" \
-      "ldrh %2, [%1, #4]\n   strh %2, [%0, #4]\n\t" \
-      "ldrh %2, [%1, #6]\n   strh %2, [%0, #6]\n\t"
-	    COPY_W NL COPY_W NL COPY_W NL COPY_W NL COPY_W NL COPY_W NL COPY_W NL COPY_W
-	    "b .tc_end\n\t"
-
-	    "\n.tc_no_w:\n\t"
-	    "mov %5, #8\n\t"
-	    "\n.tc_b_loop:\n\t"
-	    "ldrb %2, [%1, #0]\n   strb %2, [%0, #0]\n\t"
-	    "ldrb %2, [%1, #1]\n   strb %2, [%0, #1]\n\t"
-	    "ldrb %2, [%1, #2]\n   strb %2, [%0, #2]\n\t"
-	    "ldrb %2, [%1, #3]\n   strb %2, [%0, #3]\n\t"
-	    "ldrb %2, [%1, #4]\n   strb %2, [%0, #4]\n\t"
-	    "ldrb %2, [%1, #5]\n   strb %2, [%0, #5]\n\t"
-	    "ldrb %2, [%1, #6]\n   strb %2, [%0, #6]\n\t"
-	    "ldrb %2, [%1, #7]\n   strb %2, [%0, #7]\n\t"
-	    NL
-	    "subs %5, %5, #1\n   bne .tc_b_loop\n\t"
-	    "\n.tc_end:\n\t"
-	    : "+r"(dst), "+r"(src), "&=r"(tmp), "&=r"(tmp1)
-	    : "r"(stride), "r"(y)
-	);
-#else
-	if(!(dword(src)&3) && !(dword(dst)&3)) {
-		for(dword y = 8; y--; ) {
-			((dword*)dst)[0] = ((dword*)src)[0];
-			((dword*)dst)[1] = ((dword*)src)[1];
-
-			src += stride;
-			dst += stride;
-		}
-	} else if(!(dword(src)&1) && !(dword(dst)&1)) {
-		for(dword y = 8; y--; ) {
-			((word*)dst)[0] = ((word*)src)[0];
-			((word*)dst)[1] = ((word*)src)[1];
-			((word*)dst)[2] = ((word*)src)[2];
-			((word*)dst)[3] = ((word*)src)[3];
-
-			src += stride;
-			dst += stride;
-		}
-	} else {
-		for(dword y = 8; y--; ) {
-			dst[0] = src[0];
-			dst[1] = src[1];
-			dst[2] = src[2];
-			dst[3] = src[3];
-			dst[4] = src[4];
-			dst[5] = src[5];
-			dst[6] = src[6];
-			dst[7] = src[7];
-
-			src += stride;
-			dst += stride;
-		}
-	}
-#endif
-}
-#endif
-
-//----------------------------
-#ifndef PROFILE
-
-#ifdef __SYMBIAN32__
-
-#include <e32base.h>
-
-void MemSet(void *dst, byte c, dword len) {
-	Mem::Fill(dst, len, c);
-}
-
-//----------------------------
-
-void MemCpy(void *dst, const void *src, dword len) {
-	Mem::Copy(dst, src, len);
-}
-
-//----------------------------
-
-int MemCmp(const void *mem1, const void *mem2, dword len) {
-	return Mem::Compare((byte*)mem1, len, (byte*)mem2, len);
-}
-
-//----------------------------
-
-dword StrLen(const char *cp) {
-	return User::StringLength((const byte*)cp);
-}
-
-//----------------------------
-
-void Fatal(const char *msg, dword code) {
-
-	int len = StrLen(msg);
-	TBuf16<20> desc;
-	desc.Copy(TPtr8((byte*)msg, Min(len, 20), len));
-	User::Panic(desc, code);
-}
-
-
-#else
-
-//----------------------------
-#include <memory.h>
-#include <stdio.h>
-
-void MemSet(void *dst, byte c, dword len) {
-	memset(dst, c, len);
-}
-
-//----------------------------
-
-void MemCpy(void *dst, const void *src, dword len) {
-	memcpy(dst, src, len);
-}
-
-//----------------------------
-
-int MemCmp(const void *mem1, const void *mem2, dword len) {
-	return memcmp(mem1, mem2, len);
-}
-
-//----------------------------
-
-void *operator new(size_t sz, TLeave) {
-	void *vp = new byte[sz];
-	if(!vp) {
-		//todo: fatal error
-		Fatal("Not enough memory", sz);
-	}
-	return vp;
-}
-
-//----------------------------
-#include <windows.h>
-
-void Fatal(const char *msg, dword code) {
-
-#ifdef _WIN32_WCE
-	wchar_t buf[256];
-	swprintf(buf, L"%i (%i)", msg, code);
-	MessageBox(NULL, buf, L"Fatal error", MB_OK | MB_ICONERROR);
-#else
-	char buf[256];
-	sprintf(buf, "%i (%i)", msg, code);
-	MessageBox(NULL, buf, "Fatal error", MB_OK | MB_ICONERROR);
-#endif
-	exit(1);
-}
-
-//----------------------------
-#endif
-#endif
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/mem_transfer.h Deleted

@@ -1,61 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - 8<->16 bit buffer transfer header -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: mem_transfer.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _MEM_TRANSFER_H
-#define _MEM_TRANSFER_H
-
-#include "Rules.h"
-
-/*****************************************************************************
- * transfer16to8 API
- ****************************************************************************/
-void transfer_16to8copy(byte *dst, const int *src, dword stride);
-
-/*****************************************************************************
- * transfer16to8 + addition op API
- ****************************************************************************/
-void transfer_16to8add(byte *dst, const int *src, dword stride);
-
-/*****************************************************************************
- * transfer8to8 + no op
- ****************************************************************************/
-#ifdef _ARM_
-extern"C"
-#endif
-void transfer8x8_copy(byte *const dst, const byte * const src, const dword stride);
-
-//----------------------------
-
-inline void transfer16x16_copy(byte * const dst, const byte * const src, const dword stride) {
-
-	transfer8x8_copy(dst, src, stride);
-	transfer8x8_copy(dst + 8, src + 8, stride);
-	transfer8x8_copy(dst + 8*stride, src + 8*stride, stride);
-	transfer8x8_copy(dst + 8*stride + 8, src + 8*stride + 8, stride);
-}
-
-//----------------------------
-
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/note Deleted

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/portab.h Deleted

@@ -1,166 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Portable macros, types and inlined assembly -
- *
- *  Copyright(C) 2002      Michael Militzer <isibaar@xvid.org>
- *               2002-2003 Peter Ross <pross@xvid.org>
- *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: portab.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _PORTAB_H_
-#define _PORTAB_H_
-
-#include "Rules.h"
-
-#define ARCH_IS_LITTLE_ENDIAN
-#define ARCH_IS_GENERIC
-
-
-/*****************************************************************************
- *  Common things
- ****************************************************************************/
-
-/* Buffer size for msvc implementation because it outputs to DebugOutput */
-#ifdef _DEBUG
-extern dword xvid_debug;
-#define DPRINTF_BUF_SZ  1024
-#endif
-
-/*****************************************************************************
- *  Types used in XviD sources
- ****************************************************************************/
-
-/*----------------------------------------------------------------------------
- | For MSVC
- *---------------------------------------------------------------------------*/
-
-//#if defined(_MSC_VER) || defined (__WATCOMC__)
-#define int64_t  int
-
-/*----------------------------------------------------------------------------
- | For all other compilers, use the standard header file
- | (compiler should be ISO C99 compatible, perhaps ISO C89 is enough)
- *---------------------------------------------------------------------------*/
-
-//#endif
-
-/*****************************************************************************
- *  Some things that are only architecture dependant
- ****************************************************************************/
-
-#define CACHE_LINE 32
-
-/*****************************************************************************
- *  MSVC compiler specific macros, functions
- ****************************************************************************/
-
-#ifdef _MSC_VER
-
-/*----------------------------------------------------------------------------
- | Common msvc stuff
- *---------------------------------------------------------------------------*/
-
-/*
- * This function must be declared/defined all the time because MSVC does
- * not support C99 variable arguments macros.
- *
- * Btw, if the MS compiler does its job well, it should remove the nop
- * DPRINTF function when not compiling in _DEBUG mode
- */
-#if defined _DEBUG && defined _WINDOWS
-
-void DPRINTF(int level, char *fmt, int p=0);
-
-#else
-
-inline void DPRINTF(int level, char *fmt, int p=0) {}
-
-#endif
-
-
-/*****************************************************************************
- *  GNU CC compiler stuff
- ****************************************************************************/
-
-#elif defined __GNUC__ || defined __ICC /* Compiler test */
-
-/*----------------------------------------------------------------------------
- | Common gcc stuff
- *---------------------------------------------------------------------------*/
-
-/*
- * As gcc is (mostly) C99 compliant, we define DPRINTF only if it's realy needed
- * and it's a macro calling fprintf directly
- */
-#    ifdef _DEBUG
-
-/* Needed for all debuf fprintf calls */
-#       include <stdio.h>
-#       include <stdarg.h>
-
-inline void DPRINTF(int level, char *format, int p=0) {
-	va_list args;
-	va_start(args, format);
-	if(xvid_debug & level) {
-		vfprintf(stderr, format, args);
-	}
-}
-
-# else /* _DEBUG */
-inline void DPRINTF(int level, char *format, int p=0) {}
-# endif /* _DEBUG */
-
-#else                         //Compiler test
-
-/*
- * Ok we know nothing about the compiler, so we fallback to ANSI C
- * features, so every compiler should be happy and compile the code.
- *
- * This is (mostly) equivalent to ARCH_IS_GENERIC.
- */
-
-#ifdef _DEBUG
-/* Needed for all debuf fprintf calls */
-# include <stdio.h>
-# include <stdarg.h>
-
-static __inline void DPRINTF(int level, char *format, int p=0) {
-	va_list args;
-	va_start(args, format);
-	if(xvid_debug & level) {
-		vfprintf(stderr, format, args);
-	}
-}
-
-# else //_DEBUG
-inline void DPRINTF(int level, char *format, int p=0) {}
-#endif //_DEBUG
-
-#define ByteSwap(a) \
-   ((a) = ((a) << 24)  | (((a) & 0xff00) << 8) | (((a) >> 8) & 0xff00) | (((a) >> 24) & 0xff))
-
-#define DECLARE_ALIGNED_MATRIX(name, sizex, sizey, type, alignment) \
-   type name[(sizex)*(sizey)]
-
-#endif //Compiler test
-
-
-#endif /* PORTAB_H */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/qpel.inl Deleted

@@ -1,146 +0,0 @@
-static void FUNC_H(byte *Dst, const byte *Src, int H, int BpS, int Rnd){
-   while(H-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      for(i=0; i<=SIZE; ++i)
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * Src[i];
-
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd ) >> 5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         STORE(Dst[i], C);
-      }
-      Src += BpS;
-      Dst += BpS;
-   }
-}
-
-static void FUNC_V(byte *Dst, const byte *Src, int W, int BpS, int Rnd){
-   while(W-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      const byte *S = Src++;
-      byte *D = Dst++;
-      for(i=0; i<=SIZE; ++i) {
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * S[0];
-         S += BpS;
-      }
-
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd )>>5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         STORE(D[0], C);
-         D += BpS;
-      }
-   }
-}
-
-static
-void FUNC_HA(byte *Dst, const byte *Src, int H, int BpS, int Rnd)
-{
-   while(H-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      for(i=0; i<=SIZE; ++i)
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * Src[i];
-
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd ) >> 5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         C = (C+Src[i]+1-Rnd) >> 1;
-         STORE(Dst[i], C);
-      }
-      Src += BpS;
-      Dst += BpS;
-   }
-}
-
-static
-void FUNC_HA_UP(byte *Dst, const byte *Src, int H, int BpS, int Rnd)
-{
-   while(H-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      for(i=0; i<=SIZE; ++i)
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * Src[i];
-
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd ) >> 5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         C = (C+Src[i+1]+1-Rnd) >> 1;
-         STORE(Dst[i], C);
-      }
-      Src += BpS;
-      Dst += BpS;
-   }
-}
-
-static
-void FUNC_VA(byte *Dst, const byte *Src, int W, int BpS, int Rnd)
-{
-   while(W-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      const byte *S = Src;
-      byte *D = Dst;
-
-      for(i=0; i<=SIZE; ++i) {
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * S[0];
-         S += BpS;
-      }
-
-      S = Src;
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd )>>5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         C = ( C+S[0]+1-Rnd ) >> 1;
-         STORE(D[0], C);
-         D += BpS;
-         S += BpS;
-      }
-      Src++;
-      Dst++;
-   }
-}
-
-static
-void FUNC_VA_UP(byte *Dst, const byte *Src, int W, int BpS, int Rnd)
-{
-   while(W-->0) {
-      int i, k;
-      int Sums[SIZE] = { 0 };
-      const byte *S = Src;
-      byte *D = Dst;
-
-      for(i=0; i<=SIZE; ++i) {
-         for(k=0; k<SIZE; ++k)
-            Sums[k] += TABLE[i][k] * S[0];
-         S += BpS;
-      }
-
-      S = Src + BpS;
-      for(i=0; i<SIZE; ++i) {
-         int C = ( Sums[i] + 16-Rnd )>>5;
-         if (C<0) C = 0; else if (C>255) C = 255;
-         C = ( C+S[0]+1-Rnd ) >> 1;
-         STORE(D[0], C);
-         D += BpS;
-         S += BpS;
-      }
-      Dst++;
-      Src++;
-   }
-}
-
-#undef STORE
-#undef FUNC_H
-#undef FUNC_V
-#undef FUNC_HA
-#undef FUNC_VA
-#undef FUNC_HA_UP
-#undef FUNC_VA_UP

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/qpel_tab.cpp Deleted

@@ -1,103 +0,0 @@
-#include "portab.h"
-
-//----------------------------
-// Quarterpel FIR definition
-
-static const int FIR_Tab_16[17][16] = {
-	{ 14, -3,  2, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
-	{ 23, 19, -6,  3, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
-	{ -7, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
-	{  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
-	{ -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0,  0,  0,  0 },
-	{  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0,  0,  0 },
-	{  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0,  0 },
-	{  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0,  0 },
-	{  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0,  0 },
-	{  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0,  0 },
-	{  0,  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0,  0 },
-	{  0,  0,  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1,  0 },
-	{  0,  0,  0,  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3, -1 },
-	{  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -6,  3 },
-	{  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  3, -6, 20, 20, -7 },
-	{  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  3, -6, 19, 23 },
-	{  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1,  2, -3, 14 }
-};
-
-static const int FIR_Tab_8[9][8] = {
-	{ 14, -3,  2, -1,  0,  0,  0,  0 },
-	{ 23, 19, -6,  3, -1,  0,  0,  0 },
-	{ -7, 20, 20, -6,  3, -1,  0,  0 },
-	{  3, -6, 20, 20, -6,  3, -1,  0 },
-	{ -1,  3, -6, 20, 20, -6,  3, -1 },
-	{  0, -1,  3, -6, 20, 20, -6,  3 },
-	{  0,  0, -1,  3, -6, 20, 20, -7 },
-	{  0,  0,  0, -1,  3, -6, 19, 23 },
-	{  0,  0,  0,  0, -1,  2, -3, 14 }
-};
-
-
-//----------------------------
-
-/* Implementation
- ****************************************************************************/
-
-/* 16x? filters */
-
-#define SIZE  16
-#define TABLE FIR_Tab_16
-
-#define STORE(d,s)  (d) = (s)
-#define FUNC_H      H_Pass_16_C
-#define FUNC_V      V_Pass_16_C
-#define FUNC_HA     H_Pass_Avrg_16_C
-#define FUNC_VA     V_Pass_Avrg_16_C
-#define FUNC_HA_UP  H_Pass_Avrg_Up_16_C
-#define FUNC_VA_UP  V_Pass_Avrg_Up_16_C
-
-#include "qpel.inl"
-
-/* note: B-frame always uses Rnd=0... */
-#define STORE(d,s)  (d) = ( (s)+(d)+1 ) >> 1
-#define FUNC_H      H_Pass_16_Add_C
-#define FUNC_V      V_Pass_16_Add_C
-#define FUNC_HA     H_Pass_Avrg_16_Add_C
-#define FUNC_VA     V_Pass_Avrg_16_Add_C
-#define FUNC_HA_UP  H_Pass_Avrg_Up_16_Add_C
-#define FUNC_VA_UP  V_Pass_Avrg_Up_16_Add_C
-
-#include "qpel.inl"
-
-#undef SIZE
-#undef TABLE
-
-/* 8x? filters */
-
-#define SIZE  8
-#define TABLE FIR_Tab_8
-
-#define STORE(d,s)  (d) = (s)
-#define FUNC_H      H_Pass_8_C
-#define FUNC_V      V_Pass_8_C
-#define FUNC_HA     H_Pass_Avrg_8_C
-#define FUNC_VA     V_Pass_Avrg_8_C
-#define FUNC_HA_UP  H_Pass_Avrg_Up_8_C
-#define FUNC_VA_UP  V_Pass_Avrg_Up_8_C
-
-#include "qpel.inl"
-
-/* note: B-frame always uses Rnd=0... */
-#define STORE(d,s)  (d) = ( (s)+(d)+1 ) >> 1
-#define FUNC_H      H_Pass_8_Add_C
-#define FUNC_V      V_Pass_8_Add_C
-#define FUNC_HA     H_Pass_Avrg_8_Add_C
-#define FUNC_VA     V_Pass_Avrg_8_Add_C
-#define FUNC_HA_UP  H_Pass_Avrg_Up_8_Add_C
-#define FUNC_VA_UP  V_Pass_Avrg_Up_8_Add_C
-
-#include "qpel.inl"
-
-#undef SIZE
-#undef TABLE
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/quant.h Deleted

@@ -1,54 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - (de)Quantization related header  -
- *
- *  Copyright(C) 2003 Edouard Gomez <ed.gomez@free.fr>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: quant.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _QUANT_H_
-#define _QUANT_H_
-
-#include "portab.h"
-
-/*****************************************************************************
- * Common API for Intra (de)Quant functions
- ****************************************************************************/
-
-typedef void (quant_intraFunc)(int *coeff, const int *data, dword quant, dword dcscalar, const dword *mpeg_quant_matrices);
-
-typedef quant_intraFunc *quant_intraFuncPtr;
-
-/* DeQuant functions */
-quant_intraFunc dequant_h263_intra;
-quant_intraFunc dequant_mpeg_intra;
-
-/*****************************************************************************
- * Common API for Inter (de)Quant functions
- ****************************************************************************/
-
-typedef void (quant_interFunc)(int *coeff, const int* data, dword quant, const dword *mpeg_quant_matrices);
-
-typedef quant_interFunc *quant_interFuncPtr;
-
-quant_interFunc dequant_h263_inter;
-quant_interFunc dequant_mpeg_inter;
-
-#endif /* _QUANT_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/quant_h263.cpp Deleted

@@ -1,83 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - MPEG4 Quantization H263 implementation -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: quant_h263.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "global.h"
-#include "quant.h"
-
-//----------------------------
-/* dequantize intra-block & clamp to [-2048,2047]
- */
-void dequant_h263_intra(int *data, const int *coeff, dword quant, dword dcscalar, const dword *mpeg_quant_matrices) {
-
-	const int quant_m_2 = quant << 1;
-	const int quant_add = (quant & 1 ? quant : quant - 1);
-
-	data[0] = *coeff++ * dcscalar;
-	if(data[0] < -2048) {
-		data[0] = -2048;
-	}//else
-	if(data[0] > 2047) {
-		data[0] = 2047;
-	}
-	for(int i = 1; i < 64; i++) {
-		int acLevel = *coeff++;
-
-		if(acLevel == 0) {
-			data[i] = 0;
-		} else if(acLevel < 0) {
-			acLevel = quant_m_2 * -acLevel + quant_add;
-			data[i] = (acLevel <= 2048 ? -acLevel : -2048);
-		} else {
-			acLevel = quant_m_2 * acLevel + quant_add;
-			data[i] = (acLevel <= 2047 ? acLevel : 2047);
-		}
-	}
-}
-
-//----------------------------
-/* dequantize inter-block & clamp to [-2048,2047]
- */
-
-void dequant_h263_inter(int *data, const int *coeff, dword quant, const dword *mpeg_quant_matrices) {
-
-	const dword quant_m_2 = quant << 1;
-	const dword quant_add = (quant & 1 ? quant : quant - 1);
-
-	for(int i = 0; i < 64; i++) {
-		int acLevel = *coeff++;
-
-		if(acLevel == 0) {
-			data[i] = 0;
-		} else if(acLevel < 0) {
-			acLevel = acLevel * quant_m_2 - quant_add;
-			data[i] = (acLevel >= -2048 ? acLevel : -2048);
-		} else {
-			acLevel = acLevel * quant_m_2 + quant_add;
-			data[i] = (acLevel <= 2047 ? acLevel : 2047);
-		}
-	}
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/quant_matrix.cpp Deleted

@@ -1,115 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Quantization matrix management code  -
- *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *               2002 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: quant_matrix.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "quant_matrix.h"
-
-#define FIX(X)   (((X)==1) ? 0xFFFF : ((1UL << 16) / (X) + 1))
-#define FIXL(X)    ((1UL << 16) / (X) - 1)
-
-/*****************************************************************************
- * Default matrices
- ****************************************************************************/
-
-static const byte default_intra_matrix[64] = {
-	8, 17, 18, 19, 21, 23, 25, 27,
-	17, 18, 19, 21, 23, 25, 27, 28,
-	20, 21, 22, 23, 24, 26, 28, 30,
-	21, 22, 23, 24, 26, 28, 30, 32,
-	22, 23, 24, 26, 28, 30, 32, 35,
-	23, 24, 26, 28, 30, 32, 35, 38,
-	25, 26, 28, 30, 32, 35, 38, 41,
-	27, 28, 30, 32, 35, 38, 41, 45
-};
-
-//----------------------------
-
-static const byte default_inter_matrix[64] = {
-	16, 17, 18, 19, 20, 21, 22, 23,
-	17, 18, 19, 20, 21, 22, 23, 24,
-	18, 19, 20, 21, 22, 23, 24, 25,
-	19, 20, 21, 22, 23, 24, 26, 27,
-	20, 21, 22, 23, 25, 26, 27, 28,
-	21, 22, 23, 24, 26, 27, 28, 30,
-	22, 23, 24, 26, 27, 28, 30, 31,
-	23, 24, 25, 27, 28, 30, 31, 33
-};
-
-//----------------------------
-
-const byte *get_default_intra_matrix() {
-	return default_intra_matrix;
-}
-
-//----------------------------
-
-const byte *get_default_inter_matrix() {
-	return default_inter_matrix;
-}
-
-//----------------------------
-
-void set_intra_matrix(dword *mpeg_quant_matrices, const byte *matrix) {
-
-	dword *intra_matrix = mpeg_quant_matrices + 0*64;
-	dword *intra_matrix1 = mpeg_quant_matrices + 1*64;
-	dword *intra_matrix_fix = mpeg_quant_matrices + 2*64;
-	dword *intra_matrix_fixl = mpeg_quant_matrices + 3*64;
-
-	for(int i = 0; i < 64; i++) {
-		intra_matrix[i] = (!i) ? 8 : matrix[i];
-		intra_matrix1[i] = (intra_matrix[i]>>1);
-		intra_matrix1[i] += ((intra_matrix[i] == 1) ? 1: 0);
-		intra_matrix_fix[i] = FIX(intra_matrix[i]);
-		intra_matrix_fixl[i] = FIXL(intra_matrix[i]);
-	}
-}
-
-//----------------------------
-
-void set_inter_matrix(dword *mpeg_quant_matrices, const byte *matrix) {
-
-	dword *inter_matrix = mpeg_quant_matrices + 4*64;
-	dword *inter_matrix1 = mpeg_quant_matrices + 5*64;
-	dword *inter_matrix_fix = mpeg_quant_matrices + 6*64;
-	dword *inter_matrix_fixl = mpeg_quant_matrices + 7*64;
-
-	for(int i = 0; i < 64; i++) {
-		inter_matrix1[i] = ((inter_matrix[i] = matrix[i])>>1);
-		inter_matrix1[i] += ((inter_matrix[i] == 1) ? 1: 0);
-		inter_matrix_fix[i] = FIX(inter_matrix[i]);
-		inter_matrix_fixl[i] = FIXL(inter_matrix[i]);
-	}
-}
-
-//----------------------------
-
-void init_mpeg_matrix(dword *mpeg_quant_matrices) {
-
-	set_intra_matrix(mpeg_quant_matrices, default_intra_matrix);
-	set_inter_matrix(mpeg_quant_matrices, default_inter_matrix);
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/quant_matrix.h Deleted

@@ -1,48 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Quantization matrix management header  -
- *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *               2002 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: quant_matrix.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _QUANT_MATRIX_H_
-#define _QUANT_MATRIX_H_
-
-#include "portab.h"
-#include "Rules.h"
-
-void init_mpeg_matrix(dword *mpeg_quant_matrices);
-
-void set_intra_matrix(dword *mpeg_quant_matrices, const byte *matrix);
-void set_inter_matrix(dword *mpeg_quant_matrices, const byte *matrix);
-
-inline const dword *get_intra_matrix(const dword *mpeg_quant_matrices) {
-	return (mpeg_quant_matrices + 0*64);
-}
-inline const dword *get_inter_matrix(const dword *mpeg_quant_matrices) {
-	return(mpeg_quant_matrices + 4*64);
-}
-
-const byte *get_default_intra_matrix(void);
-const byte *get_default_inter_matrix(void);
-
-#endif							/* _QUANT_MATRIX_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/quant_mpeg.cpp Deleted

@@ -1,95 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - MPEG4 Quantization related header  -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: quant_mpeg.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "global.h"
-#include "quant.h"
-#include "quant_matrix.h"
-
-//----------------------------
-/* dequantize intra-block & clamp to [-2048,2047]
- *
- * data[i] = (coeff[i] * default_intra_matrix[i] * quant2) >> 4;
- */
-void dequant_mpeg_intra(int *data, const int *coeff, dword quant, dword dcscalar, const dword *mpeg_quant_matrices) {
-
-	const dword *intra_matrix = get_intra_matrix(mpeg_quant_matrices);
-
-	data[0] = coeff[0] * dcscalar;
-	if(data[0] < -2048) {
-		data[0] = -2048;
-	} else if(data[0] > 2047) {
-		data[0] = 2047;
-	}
-
-	for(int i = 1; i < 64; i++) {
-		if(coeff[i] == 0) {
-			data[i] = 0;
-		} else if(coeff[i] < 0) {
-			int level = -coeff[i];
-
-			level = (level * intra_matrix[i] * quant) >> 3;
-			data[i] = (level <= 2048 ? -level : -2048);
-		} else {
-			dword level = coeff[i];
-
-			level = (level * intra_matrix[i] * quant) >> 3;
-			data[i] = (level <= 2047 ? level : 2047);
-		}
-	}
-}
-
-//----------------------------
-/* dequantize inter-block & clamp to [-2048,2047]
- * data = ((2 * coeff + SIGN(coeff)) * inter_matrix[i] * quant) / 16
- */
-
-void dequant_mpeg_inter(int *data, const int *coeff, dword quant, const dword *mpeg_quant_matrices) {
-
-	dword sum = 0;
-	const dword *inter_matrix = get_inter_matrix(mpeg_quant_matrices);
-
-	for(int i = 0; i < 64; i++) {
-		if(coeff[i] == 0) {
-			data[i] = 0;
-		} else if(coeff[i] < 0) {
-			int level = -coeff[i];
-
-			level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4;
-			data[i] = (level <= 2048 ? -level : -2048);
-		} else {
-			dword level = coeff[i];
-			level = ((2 * level + 1) * inter_matrix[i] * quant) >> 4;
-			data[i] = (level <= 2047 ? level : 2047);
-		}
-		sum ^= data[i];
-	}
-	/* mismatch control */
-	if ((sum & 1) == 0) {
-		data[63] ^= 1;
-	}
-}
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/reduced.cpp Deleted

@@ -1,195 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *   Reduced-Resolution utilities
- *
- *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
- *
- *  This file is part of XviD, a free MPEG-4 video encoder/decoder
- *
- *  XviD is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- *  Under section 8 of the GNU General Public License, the copyright
- *  holders of XVID explicitly forbid distribution in the following
- *  countries:
- *
- *    - Japan
- *    - United States of America
- *
- *  Linking XviD statically or dynamically with other modules is making a
- *  combined work based on XviD.  Thus, the terms and conditions of the
- *  GNU General Public License cover the whole combination.
- *
- *  As a special exception, the copyright holders of XviD give you
- *  permission to link XviD with independent modules that communicate with
- *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
- *  license terms of these independent modules, and to copy and distribute
- *  the resulting combined work under terms of your choice, provided that
- *  every copy of the combined work is accompanied by a complete copy of
- *  the source code of XviD (the version of XviD used to produce the
- *  combined work), being distributed under the terms of the GNU General
- *  Public License plus this exception.  An independent module is a module
- *  which is not derived from or based on XviD.
- *
- *  Note that people who make modified versions of XviD are not obligated
- *  to grant this special exception for their modified versions; it is
- *  their choice whether to do so.  The GNU General Public License gives
- *  permission to release a modified version without this exception; this
- *  exception also makes it possible to release a modified version which
- *  carries forward this exception.
- *
- * $Id: reduced.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "portab.h"
-#include "global.h"
-#include "reduced.h"
-
-/*----------------------------------------------------------------------------
- * Upsampling (1/3/3/1) filter
- *--------------------------------------------------------------------------*/
-
-#define ADD(dst,src)  (dst) = CLIP((dst)+(src), 0, 255)
-
-inline void Filter_31(byte *Dst1, byte *Dst2, const int *Src1, const int *Src2) {
-
-	/* Src[] is assumed to be >=0. So we can use ">>2" instead of "/2" */
-	int a = (3*Src1[0]+  Src2[0]+2) >> 2;
-	int b = (  Src1[0]+3*Src2[0]+2) >> 2;
-	Dst1[0] = CLIP(a, 0, 255);
-	Dst2[0] = CLIP(b, 0, 255);
-}
-
-//----------------------------
-
-inline void Filter_9331(byte *Dst1, byte *Dst2, const int *Src1, const int *Src2) {
-
-	/* Src[] is assumed to be >=0. So we can use ">>4" instead of "/16" */
-	int a = (9*Src1[0]+  3*Src1[1]+ 3*Src2[0] + 1*Src2[1] + 8) >> 4;
-	int b = (3*Src1[0]+  9*Src1[1]+ 1*Src2[0] + 3*Src2[1] + 8) >> 4;
-	int c = (3*Src1[0]+  1*Src1[1]+ 9*Src2[0] + 3*Src2[1] + 8) >> 4;
-	int d = (1*Src1[0]+  3*Src1[1]+ 3*Src2[0] + 9*Src2[1] + 8) >> 4;
-	Dst1[0] = CLIP(a, 0, 255);
-	Dst1[1] = CLIP(b, 0, 255);
-	Dst2[0] = CLIP(c, 0, 255);
-	Dst2[1] = CLIP(d, 0, 255);
-}
-
-//----------------------------
-
-void copy_upsampled_8x8_16to8(byte *Dst, const int *Src, int BpS) {
-	int x, y;
-
-	Dst[0] = CLIP(Src[0], 0, 255);
-	for(x=0; x<7; ++x)
-		Filter_31(Dst+2*x+1, Dst+2*x+2, Src+x, Src+x+1);
-	Dst[15] = CLIP(Src[7], 0, 255);
-	Dst += BpS;
-	for(y=0; y<7; ++y) {
-		byte *const Dst2 = Dst + BpS;
-		Filter_31(Dst, Dst2, Src, Src+8);
-		for(x=0; x<7; ++x)
-			Filter_9331(Dst+2*x+1, Dst2+2*x+1, Src+x, Src+x+8);
-		Filter_31(Dst+15, Dst2+15, Src+7, Src+7+8);
-		Src += 8;
-		Dst += 2*BpS;
-	}
-	Dst[0] = CLIP(Src[0], 0, 255);
-	for(x=0; x<7; ++x) Filter_31(Dst+2*x+1, Dst+2*x+2, Src+x, Src+x+1);
-	Dst[15] = CLIP(Src[7], 0, 255);
-}
-
-//----------------------------
-
-inline void Filter_Add_31(byte *Dst1, byte *Dst2, const int *Src1, const int *Src2) {
-
-	/* Here, we must use "/4", since Src[] is in [-256, 255] */
-	int a = (3*Src1[0]+  Src2[0] + 2) / 4;
-	int b = (  Src1[0]+3*Src2[0] + 2) / 4;
-	ADD(Dst1[0], a);
-	ADD(Dst2[0], b);
-}
-
-//----------------------------
-
-inline void Filter_Add_9331(byte *Dst1, byte *Dst2, const int *Src1, const int *Src2) {
-
-	int a = (9*Src1[0]+  3*Src1[1]+ 3*Src2[0] + 1*Src2[1] + 8) / 16;
-	int b = (3*Src1[0]+  9*Src1[1]+ 1*Src2[0] + 3*Src2[1] + 8) / 16;
-	int c = (3*Src1[0]+  1*Src1[1]+ 9*Src2[0] + 3*Src2[1] + 8) / 16;
-	int d = (1*Src1[0]+  3*Src1[1]+ 3*Src2[0] + 9*Src2[1] + 8) / 16;
-	ADD(Dst1[0], a);
-	ADD(Dst1[1], b);
-	ADD(Dst2[0], c);
-	ADD(Dst2[1], d);
-}
-
-//----------------------------
-
-void add_upsampled_8x8_16to8(byte *Dst, const int *Src, const int BpS) {
-
-	int x, y;
-
-	ADD(Dst[0], Src[0]);
-	for(x=0; x<7; ++x)
-		Filter_Add_31(Dst+2*x+1, Dst+2*x+2, Src+x, Src+x+1);
-	ADD(Dst[15], Src[7]);
-	Dst += BpS;
-	for(y=0; y<7; ++y) {
-		byte *const Dst2 = Dst + BpS;
-		Filter_Add_31(Dst, Dst2, Src, Src+8);
-		for(x=0; x<7; ++x)
-			Filter_Add_9331(Dst+2*x+1, Dst2+2*x+1, Src+x, Src+x+8);
-		Filter_Add_31(Dst+15, Dst2+15, Src+7, Src+7+8);
-		Src += 8;
-		Dst += 2*BpS;
-	}
-	ADD(Dst[0], Src[0]);
-	for(x=0; x<7; ++x) Filter_Add_31(Dst+2*x+1, Dst+2*x+2, Src+x, Src+x+1);
-	ADD(Dst[15], Src[7]);
-}
-#undef ADD
-
-/*----------------------------------------------------------------------------
- * horizontal and vertical deblocking
- *--------------------------------------------------------------------------*/
-
-void hfilter_31(byte *Src1, byte *Src2, int Nb_Blks) {
-
-	Nb_Blks *= 8;
-	while(Nb_Blks-->0) {
-		byte a = ( 3*Src1[0] + 1*Src2[0] + 2 ) >> 2;
-		byte b = ( 1*Src1[0] + 3*Src2[0] + 2 ) >> 2;
-		*Src1++ = a;
-		*Src2++ = b;
-	}
-}
-
-//----------------------------
-
-void vfilter_31(byte *Src1, byte *Src2, const int BpS, int Nb_Blks) {
-	Nb_Blks *= 8;
-	while(Nb_Blks-->0) {
-		byte a = ( 3*Src1[0] + 1*Src2[0] + 2 ) >> 2;
-		byte b = ( 1*Src1[0] + 3*Src2[0] + 2 ) >> 2;
-		*Src1 = a;
-		*Src2 = b;
-		Src1 += BpS;
-		Src2 += BpS;
-	}
-}
-
-//----------------------------

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/reduced.h Deleted

@@ -1,54 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Reduced VOP header  -
- *
- *  Copyright(C) 2002 Pascal Massimino <skal@planet-d.net>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: reduced.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _REDUCED_H_
-#define _REDUCED_H_
-
-#include "portab.h"
-
-/* decoding */
-typedef void (COPY_UPSAMPLED_8X8_16TO8)(byte *Dst, const int *Src, int BpS);
-typedef void (ADD_UPSAMPLED_8X8_16TO8)(byte *Dst, const int *Src, int BpS);
-
-/* deblocking: Note: "Nb"_Blks is the number of 8-pixels blocks to process */
-typedef void HFILTER_31(byte *Src1, byte *Src2, int Nb_Blks);
-typedef void VFILTER_31(byte *Src1, byte *Src2, int BpS, int Nb_Blks);
-
-/* encoding: WARNING! These read 1 pixel outside of the input 16x16 block! */
-typedef void FILTER_18X18_TO_8X8(int *Dst, const byte *Src, int BpS);
-typedef void FILTER_DIFF_18X18_TO_8X8(int *Dst, const byte *Src, int BpS);
-
-
-extern COPY_UPSAMPLED_8X8_16TO8 copy_upsampled_8x8_16to8;
-extern ADD_UPSAMPLED_8X8_16TO8 add_upsampled_8x8_16to8;
-
-extern VFILTER_31 vfilter_31;
-
-extern HFILTER_31 hfilter_31;
-
-/* rrv motion vector scale-up */
-#define RRV_MV_SCALEUP(a)	( (a)>0 ? 2*(a)-1 : (a)<0 ? 2*(a)+1 : (a) )
-
-#endif /* _REDUCED_H_ */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/vlc_codes.h Deleted

@@ -1,50 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Variable Length Code header  -
- *
- *  Copyright(C) 2002 Michael Militzer <isibaar@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: vlc_codes.h,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-#ifndef _VLC_CODES_H_
-#define _VLC_CODES_H_
-
-#include "portab.h"
-
-#define VLC_ERROR	(-1)
-
-#define ESCAPE  3
-#define ESCAPE1 6
-#define ESCAPE2 14
-#define ESCAPE3 15
-
-struct VLC {
-	int code;
-	byte len;
-};
-
-struct EVENT {
-	byte last;
-	byte run;
-	char level;
-};
-
-
-
-#endif /* _VLC_CODES_H */

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/xvid.cpp Deleted

@@ -1,188 +0,0 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Native API implementation  -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: xvid.cpp,v 1.1.1.1 2005-07-13 14:36:16 jeanlf Exp $
- *
- ****************************************************************************/
-
-#include "xvid.h"
-#include "decoder.h"
-#include "interpolate8x8.h"
-#include "reduced.h"
-#include "mem_transfer.h"
-#include "quant.h"
-
-#ifdef _DEBUG
-dword xvid_debug = 0;
-#endif
-
-/*****************************************************************************
- * XviD Init Entry point
- *
- * Well this function initialize all internal function pointers according
- * to the CPU features forced by the library client or autodetected (depending
- * on the XVID_CPU_FORCE flag). It also initializes vlc coding tables and all
- * image colorspace transformation tables.
- *
- * Returned value : XVID_ERR_OK
- *                  + API_VERSION in the input XVID_INIT_PARAM structure
- *                  + core build  "   "    "       "               "
- *
- ****************************************************************************/
-
-
-static int xvid_gbl_init(xvid_gbl_init_t * init) {
-	//unsigned int cpu_flags;
-
-	if (XVID_VERSION_MAJOR(init->version) != 1)
-		return XVID_ERR_VERSION;
-
-#if defined(_DEBUG)
-	xvid_debug = init->debug;
-#endif
-
-	return 0;
-}
-
-/*****************************************************************************
- * XviD Global Entry point
- *
- * Well this function initialize all internal function pointers according
- * to the CPU features forced by the library client or autodetected (depending
- * on the XVID_CPU_FORCE flag). It also initializes vlc coding tables and all
- * image colorspace transformation tables.
- *
- ****************************************************************************/
-
-int xvid_global(void *handle, int opt, void *param1, void *param2) {
-
-	switch(opt) {
-	case XVID_GBL_INIT :
-		return xvid_gbl_init((xvid_gbl_init_t*)param1);
-	/*
-	case XVID_GBL_INFO :
-	   return xvid_gbl_info((xvid_gbl_info_t*)param1);
-	case XVID_GBL_CONVERT:
-	   return xvid_gbl_convert((xvid_gbl_convert_t*)param1);
-	   */
-
-	default :
-		return XVID_ERR_FAIL;
-	}
-}
-
-/*****************************************************************************
- * XviD Native decoder entry point
- *
- * This function is just a wrapper to all the option cases.
- *
- * Returned values : XVID_ERR_FAIL when opt is invalid
- *                   else returns the wrapped function result
- *
- ****************************************************************************/
-int xvid_decore(void *handle, int opt, void *param1, void *param2) {
-
-	switch (opt) {
-	case XVID_DEC_CREATE:
-		return decoder_create((xvid_dec_create_t *) param1);
-
-	case XVID_DEC_DESTROY:
-		delete (S_decoder*)handle;
-		return 0;
-
-	case XVID_DEC_DECODE:
-		return ((S_decoder*)handle)->Decode((xvid_dec_frame_t *) param1, (xvid_dec_stats_t*) param2);
-
-	default:
-		return XVID_ERR_FAIL;
-	}
-}
-
-//----------------------------
-
-extern const dword scan_tables[3][64];
-const dword scan_tables[3][64] = {
-	/* zig_zag_scan */
-	{	0,  1,  8, 16,  9,  2,  3, 10,
-		17, 24, 32, 25, 18, 11,  4,  5,
-		12, 19, 26, 33, 40, 48, 41, 34,
-		27, 20, 13,  6,  7, 14, 21, 28,
-		35, 42, 49, 56, 57, 50, 43, 36,
-		29, 22, 15, 23, 30, 37, 44, 51,
-		58, 59, 52, 45, 38, 31, 39, 46,
-		53, 60, 61, 54, 47, 55, 62, 63
-	},
-
-	/* horizontal_scan */
-	{	0,  1,  2,  3,  8,  9, 16, 17,
-		10, 11,  4,  5,  6,  7, 15, 14,
-		13, 12, 19, 18, 24, 25, 32, 33,
-		26, 27, 20, 21, 22, 23, 28, 29,
-		30, 31, 34, 35, 40, 41, 48, 49,
-		42, 43, 36, 37, 38, 39, 44, 45,
-		46, 47, 50, 51, 56, 57, 58, 59,
-		52, 53, 54, 55, 60, 61, 62, 63
-	},
-
-	/* vertical_scan */
-	{	0,  8, 16, 24,  1,  9,  2, 10,
-		17, 25, 32, 40, 48, 56, 57, 49,
-		41, 33, 26, 18,  3, 11,  4, 12,
-		19, 27, 34, 42, 50, 58, 35, 43,
-		51, 59, 20, 28,  5, 13,  6, 14,
-		21, 29, 36, 44, 52, 60, 37, 45,
-		53, 61, 22, 30,  7, 15, 23, 31,
-		38, 46, 54, 62, 39, 47, 55, 63
-	}
-};
-
-//----------------------------
-
-#ifdef WIN32
-# include <windows.h>
-# include <stdio.h>
-
-#ifdef _DEBUG
-#    define snprintf _snprintf
-#    define vsnprintf _vsnprintf
-
-void DPRINTF(int level, char *fmt, int p) {
-	if(xvid_debug & level) {
-		//va_list args;
-		char buf[DPRINTF_BUF_SZ];
-		//va_start(args, fmt);
-		//vsprintf(buf, fmt, args);
-		sprintf(buf, fmt, p);
-		OutputDebugString(buf);
-		//fprintf(stderr, "%s", buf);
-	}
-}
-#endif
-
-#elif defined _WINDOWS
-
-inline void DPRINTF(int level, char *fmt, int p) {
-}
-
-#endif
-
-//----------------------------
-

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/xvid.h Deleted

@@ -1,502 +0,0 @@
-/*****************************************************************************
- *
- * XVID MPEG-4 VIDEO CODEC
- * - XviD Main header file -
- *
- *  Copyright(C) 2001-2003 Peter Ross <pross@xvid.org>
- *
- *  This program is free software ; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation ; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program ; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
- * $Id: xvid.h,v 1.2 2006-12-13 15:12:27 jeanlf Exp $
- *
- ****************************************************************************/
-
-#ifndef _XVID_H_
-#define _XVID_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include "Rules.h"
-
-
-#ifdef PROFILE
-#include <Profiler.h>
-#define PROF_S(n) prof.MarkS(n)
-#define PROF_E(n) prof.MarkE(n)
-
-enum {
-	PROF_TICK,
-	PROF_CONV,
-	PROF_UPD,
-	PROF_DECODE,
-	PROF_DRAWTXT,
-	PROF_FRM_I,
-	PROF_FRM_P,
-	PROF_BINT_MBI,
-	PROF_FRM_B,
-	PROF_0,
-	PROF_1,
-	PROF_2,
-	PROF_3,
-	PROF_4,
-	PROF_5,
-	PROF_6,
-	PROF_7,
-};
-
-#else
-#define PROF_S(n)
-#define PROF_E(n)
-#endif
-
-#ifdef __MARM__
-//#define USE_ARM_ASM
-#endif
-
-/*****************************************************************************
- * versioning
- ****************************************************************************/
-
-/* versioning
-	version takes the form "$major.$minor.$patch"
-	$patch is incremented when there is no api change
-	$minor is incremented when the api is changed, but remains backwards compatible
-	$major is incremented when the api is changed significantly
-
-	when initialising an xvid structure, you must always zero it, and set the version field.
-		memset(&struct,0,sizeof(struct));
-		struct.version = XVID_VERSION;
-
-	XVID_UNSTABLE is defined only during development.
-	*/
-
-#define XVID_MAKE_VERSION(a,b,c) ((((a)&0xff)<<16) | (((b)&0xff)<<8) | ((c)&0xff))
-#define XVID_VERSION_MAJOR(a)    ((char)(((a)>>16) & 0xff))
-#define XVID_VERSION_MINOR(a)    ((char)(((a)>> 8) & 0xff))
-#define XVID_VERSION_PATCH(a)    ((char)(((a)>> 0) & 0xff))
-
-#define XVID_MAKE_API(a,b)       ((((a)&0xff)<<16) | (((b)&0xff)<<0))
-#define XVID_API_MAJOR(a)        (((a)>>16) & 0xff)
-#define XVID_API_MINOR(a)        (((a)>> 0) & 0xff)
-
-#define XVID_VERSION             XVID_MAKE_VERSION(1,0,-127)
-#define XVID_API                 XVID_MAKE_API(4, 0)
-
-#define EDGE_SIZE 16
-
-#define XVID_UNSTABLE
-
-/* Bitstream Version
- * this will be writen into the bitstream to allow easy detection of xvid
- * encoder bugs in the decoder, without this it might not possible to
- * automatically distinquish between a file which has been encoded with an
- * old & buggy XVID from a file which has been encoded with a bugfree version
- * see the infamous interlacing bug ...
- *
- * this MUST be increased if an encoder bug is fixed, increasing it too often
- * doesnt hurt but not increasing it could cause difficulty for decoders in the
- * future
- */
-#define XVID_BS_VERSION "0023"
-
-
-/*****************************************************************************
- * error codes
- ****************************************************************************/
-
-/*	all functions return values <0 indicate error */
-
-#define XVID_ERR_FAIL		-1		/* general fault */
-#define XVID_ERR_MEMORY		-2		/* memory allocation error */
-#define XVID_ERR_FORMAT		-3		/* file format error */
-#define XVID_ERR_VERSION	-4		/* structure version not supported */
-#define XVID_ERR_END		-5		/* encoder only; end of stream reached */
-
-
-
-/*****************************************************************************
- * xvid_image_t
- ****************************************************************************/
-
-/* colorspace values */
-
-//#define XVID_CSP_USER     (1<< 0) /* 4:2:0 planar */
-//#define XVID_CSP_I420     (1<< 1) /* 4:2:0 packed(planar win32) */
-//#define XVID_CSP_YV12     (1<< 2) /* 4:2:0 packed(planar win32) */
-//#define XVID_CSP_YUY2     (1<< 3) /* 4:2:2 packed */
-//#define XVID_CSP_UYVY     (1<< 4) /* 4:2:2 packed */
-//#define XVID_CSP_YVYU     (1<< 5) /* 4:2:2 packed */
-//#define XVID_CSP_BGRA     (1<< 6) /* 32-bit bgra packed */
-//#define XVID_CSP_ABGR     (1<< 7) /* 32-bit abgr packed */
-//#define XVID_CSP_RGBA     (1<< 8) /* 32-bit rgba packed */
-//#define XVID_CSP_BGR      (1<< 9) /* 24-bit bgr packed */
-//#define XVID_CSP_RGB555   (1<<10) /* 16-bit rgb555 packed */
-//#define XVID_CSP_RGB565   (1<<11) /* 16-bit rgb565 packed */
-//#define XVID_CSP_SLICE    (1<<12) /* decoder only: 4:2:0 planar, per slice rendering */
-//#define XVID_CSP_INTERNAL (1<<13) /* decoder only: 4:2:0 planar, returns ptrs to internal buffers */
-//#define XVID_CSP_NULL     (1<<14) /* decoder only: dont output anything */
-//#define XVID_CSP_VFLIP    (1<<31) /* vertical flip mask */
-
-/* xvid_image_t
-	for non-planar colorspaces use only plane[0] and stride[0]
-	four plane reserved for alpha*/
-/*
-typedef struct {
-	int csp;				// [in] colorspace; or with XVID_CSP_VFLIP to perform vertical flip
-	void *plane;		// [in] image plane ptrs
-	int stride;			// [in] image stride; "bytes per row"
-} xvid_image_t;
-*/
-
-/* video-object-sequence profiles */
-#define XVID_PROFILE_S_L0    0x08 /* simple */
-#define XVID_PROFILE_S_L1    0x01
-#define XVID_PROFILE_S_L2    0x02
-#define XVID_PROFILE_S_L3    0x03
-#define XVID_PROFILE_ARTS_L1 0x91 /* advanced realtime simple */
-#define XVID_PROFILE_ARTS_L2 0x92
-#define XVID_PROFILE_ARTS_L3 0x93
-#define XVID_PROFILE_ARTS_L4 0x94
-#define XVID_PROFILE_AS_L0   0xf0 /* advanced simple */
-#define XVID_PROFILE_AS_L1   0xf1
-#define XVID_PROFILE_AS_L2   0xf2
-#define XVID_PROFILE_AS_L3   0xf3
-#define XVID_PROFILE_AS_L4   0xf4
-
-/* aspect ratios */
-#define XVID_PAR_11_VGA    1 /* 1:1 vga (square), default if AR is not precised (ie: ==0) */
-#define XVID_PAR_43_PAL    2 /* 4:3 pal (12:11 625-line) */
-#define XVID_PAR_43_NTSC   3 /* 4:3 ntsc (10:11 525-line) */
-#define XVID_PAR_169_PAL   4 /* 16:9 pal (16:11 625-line) */
-#define XVID_PAR_169_NTSC  5 /* 16:9 ntsc (40:33 525-line) */
-#define XVID_PAR_EXT      15 /* extended par; use par_width, par_height */
-
-/* frame type flags */
-#define XVID_TYPE_VOL     -1 /* decoder only: vol was decoded */
-#define XVID_TYPE_NOTHING  0 /* decoder only (encoder stats): nothing was decoded/encoded */
-#define XVID_TYPE_AUTO     0 /* encoder: automatically determine coding type */
-#define XVID_TYPE_IVOP     1 /* intra frame */
-#define XVID_TYPE_PVOP     2 /* predicted frame */
-#define XVID_TYPE_BVOP     3 /* bidirectionally encoded */
-#define XVID_TYPE_SVOP     4 /* predicted+sprite frame */
-
-
-/*****************************************************************************
- * xvid_global()
- ****************************************************************************/
-
-/* cpu_flags definitions (make sure to sync this with cpuid.asm for ia32) */
-
-//#define XVID_CPU_FORCE    (1<<31) /* force passed cpu flags */
-//#define XVID_CPU_ASM      (1<< 7) /* native assembly */
-/* ARCH_IS_IA32 */
-//#define XVID_CPU_MMX      (1<< 0) /*       mmx : pentiumMMX,k6 */
-//#define XVID_CPU_MMXEXT   (1<< 1) /*   mmx-ext : pentium2, athlon */
-//#define XVID_CPU_SSE      (1<< 2) /*       sse : pentium3, athlonXP */
-//#define XVID_CPU_SSE2     (1<< 3) /*      sse2 : pentium4, athlon64 */
-//#define XVID_CPU_3DNOW    (1<< 4) /*     3dnow : k6-2 */
-//#define XVID_CPU_3DNOWEXT (1<< 5) /* 3dnow-ext : athlon */
-//#define XVID_CPU_TSC      (1<< 6) /*       tsc : Pentium */
-/* ARCH_IS_PPC */
-//#define XVID_CPU_ALTIVEC  (1<< 0) /* altivec */
-
-
-#define XVID_DEBUG_ERROR     (1<< 0)
-#define XVID_DEBUG_STARTCODE (1<< 1)
-#define XVID_DEBUG_HEADER    (1<< 2)
-#define XVID_DEBUG_TIMECODE  (1<< 3)
-#define XVID_DEBUG_MB        (1<< 4)
-#define XVID_DEBUG_COEFF     (1<< 5)
-#define XVID_DEBUG_MV        (1<< 6)
-#define XVID_DEBUG_RC        (1<< 7)
-#define XVID_DEBUG_DEBUG     (1<<31)
-
-/* XVID_GBL_INIT param1 */
-typedef struct {
-	int version;
-	unsigned int cpu_flags; /* [in:opt] zero = autodetect cpu; XVID_CPU_FORCE|{cpu features} = force cpu features */
-	int debug;     /* [in:opt] debug level */
-} xvid_gbl_init_t;
-
-
-/* XVID_GBL_INFO param1 */
-#if 0
-typedef struct {
-	int version;
-	int actual_version; // [out] returns the actual xvidcore version
-	const char * build; // [out] if !null, points to description of this xvid core build
-	unsigned int cpu_flags;      // [out] detected cpu features
-	int num_threads;    // [out] detected number of cpus/threads
-} xvid_gbl_info_t;
-#endif
-
-
-#define XVID_GBL_INIT    0 /* initialize xvidcore; must be called before using xvid_decore, or xvid_encore) */
-//#define XVID_GBL_INFO    1 /* return some info about xvidcore, and the host computer */
-//#define XVID_GBL_CONVERT 2 /* colorspace conversion utility */
-
-int xvid_global(void *handle, int opt, void *param1, void *param2);
-
-
-class C_xvid_image {
-public:
-	byte *y;
-	byte *u;
-	byte *v;
-
-	C_xvid_image():
-		y(NULL),
-		u(NULL),
-		v(NULL)
-	{}
-};
-
-void * InitCodec(dword sx, dword sy, dword fcc);
-void CloseCodec(void *handle);
-//int DecodeFrame(void *handle, const void *buf, dword sz_in, byte **y, byte **u, byte **v, dword *pitch);
-int DecodeFrame(void *handle, const void *buf, dword sz_in, byte *&y, byte *&u, byte *&v, dword &pitch);
-
-/*****************************************************************************
- * xvid_decore()
- ****************************************************************************/
-
-#define XVID_DEC_CREATE  0 /* create decore instance; return 0 on success */
-#define XVID_DEC_DESTROY 1 /* destroy decore instance: return 0 on success */
-#define XVID_DEC_DECODE  2 /* decode a frame: returns number of bytes consumed >= 0 */
-
-int xvid_decore(void *handle, int opt, void *param1, void *param2);
-
-/* XVID_DEC_CREATE param 1
-	image width & height may be specified here when the dimensions are
-	known in advance. */
-typedef struct {
-	int version;
-	int width;     /* [in:opt] image width */
-	int height;    /* [in:opt] image width */
-	void *handle; /* [out]	   decore context handle */
-#ifdef PROFILE
-	C_profiler *prof;
-#endif
-} xvid_dec_create_t;
-
-
-/* XVID_DEC_DECODE param1 */
-/* general flags */
-#define XVID_LOWDELAY      (1<<0) /* lowdelay mode  */
-#define XVID_DISCONTINUITY (1<<1) /* indicates break in stream */
-
-typedef struct {
-	int version;
-	int general;         /* [in:opt] general flags */
-	const void *bitstream;     /* [in]     bitstream (read from)*/
-	int length;          /* [in]     bitstream length */
-	//xvid_image_t output; /* [in]     output image (written to) */
-	const C_xvid_image *img_out;
-} xvid_dec_frame_t;
-
-
-/* XVID_DEC_DECODE param2 :: optional */
-typedef struct
-{
-	int version;
-
-	int type;                   /* [out] output data type */
-	union {
-		struct { /* type>0 {XVID_TYPE_IVOP,XVID_TYPE_PVOP,XVID_TYPE_BVOP,XVID_TYPE_SVOP} */
-			int general;        /* [out] flags */
-			int time_base;      /* [out] time base */
-			int time_increment; /* [out] time increment */
-
-			/* XXX: external deblocking stuff */
-			int * qscale;	    /* [out] pointer to quantizer table */
-			int qscale_stride;  /* [out] quantizer scale stride */
-
-		} vop;
-		struct {	/* XVID_TYPE_VOL */
-			int general;        /* [out] flags */
-			int width;          /* [out] width */
-			int height;         /* [out] height */
-			int par;            /* [out] picture aspect ratio (refer to XVID_PAR_xxx above) */
-			int par_width;      /* [out] aspect ratio width */
-			int par_height;     /* [out] aspect ratio height */
-		} vol;
-	} data;
-} xvid_dec_stats_t;
-
-
-
-#define XVID_ZONE_QUANT  (1<<0)
-#define XVID_ZONE_WEIGHT (1<<1)
-
-typedef struct
-{
-	int frame;
-	int mode;
-	int increment;
-	int base;
-} xvid_enc_zone_t;
-
-
-
-/*****************************************************************************
-  xvid plugin system -- internals
-
-  xvidcore will call XVID_PLG_INFO and XVID_PLG_CREATE during XVID_ENC_CREATE
-  before encoding each frame xvidcore will call XVID_PLG_BEFORE
-  after encoding each frame xvidcore will call XVID_PLG_AFTER
-  xvidcore will call XVID_PLG_DESTROY during XVID_ENC_DESTROY
- ****************************************************************************/
-
-
-#define XVID_PLG_CREATE  (1<<0)
-#define XVID_PLG_DESTROY (1<<1)
-#define XVID_PLG_INFO    (1<<2)
-#define XVID_PLG_BEFORE  (1<<3)
-#define XVID_PLG_FRAME   (1<<4)
-#define XVID_PLG_AFTER   (1<<5)
-
-/* xvid_plg_info_t.flags */
-#define XVID_REQORIGINAL (1<<0) /* plugin requires a copy of the original (uncompressed) image */
-#define XVID_REQPSNR     (1<<1) /* plugin requires psnr between the uncompressed and compressed image*/
-#define XVID_REQDQUANTS  (1<<2) /* plugin requires access to the dquant table */
-
-
-typedef struct
-{
-	int version;
-	int flags;   /* [in:opt] plugin flags */
-} xvid_plg_info_t;
-
-
-typedef struct
-{
-	int version;
-
-	int num_zones;           /* [out] */
-	xvid_enc_zone_t * zones; /* [out] */
-
-	int width;               /* [out] */
-	int height;              /* [out] */
-	int mb_width;            /* [out] */
-	int mb_height;           /* [out] */
-	int fincr;               /* [out] */
-	int fbase;               /* [out] */
-
-	void * param;            /* [out] */
-} xvid_plg_create_t;
-
-
-typedef struct
-{
-	int version;
-
-	int num_frames; /* [out] total frame encoded */
-} xvid_plg_destroy_t;
-
-
-
-/*****************************************************************************
-  xvid plugin system -- external
-
-  the application passes xvid an array of "xvid_plugin_t" at XVID_ENC_CREATE. the array
-  indicates the plugin function pointer and plugin-specific data.
-  xvidcore handles the rest. example:
-
-  xvid_enc_create_t create;
-  xvid_enc_plugin_t plugins[2];
-
-  plugins[0].func = xvid_psnr_func;
-  plugins[0].param = NULL;
-  plugins[1].func = xvid_cbr_func;
-  plugins[1].param = &cbr_data;
-
-  create.num_plugins = 2;
-  create.plugins = plugins;
-
- ****************************************************************************/
-
-typedef int (xvid_plugin_func)(void * handle, int opt, void * param1, void * param2);
-
-typedef struct
-{
-	xvid_plugin_func * func;
-	void * param;
-} xvid_enc_plugin_t;
-
-
-xvid_plugin_func xvid_plugin_single;   /* single-pass rate control */
-xvid_plugin_func xvid_plugin_2pass1;   /* two-pass rate control: first pass */
-xvid_plugin_func xvid_plugin_2pass2;   /* two-pass rate control: second pass */
-
-xvid_plugin_func xvid_plugin_lumimasking;  /* lumimasking */
-
-xvid_plugin_func xvid_plugin_psnr;	/* write psnr values to stdout */
-xvid_plugin_func xvid_plugin_dump;	/* dump before and after yuvpgms */
-
-
-/* single pass rate control
- * CBR and Constant quantizer modes */
-typedef struct
-{
-	int version;
-
-	int bitrate;               /* [in] bits per second */
-	int reaction_delay_factor; /* [in] */
-	int averaging_period;      /* [in] */
-	int buffer;                /* [in] */
-} xvid_plugin_single_t;
-
-
-typedef struct {
-	int version;
-
-	char * filename;
-} xvid_plugin_2pass1_t;
-
-
-#define XVID_PAYBACK_BIAS 0 /* payback with bias */
-#define XVID_PAYBACK_PROP 1 /* payback proportionally */
-
-typedef struct {
-	int version;
-
-	int bitrate;                  /* [in] bits per second */
-	char * filename;              /* [in] first pass stats filename */
-
-	int keyframe_boost;           /* [in] keyframe boost percentage: [0..100] */
-	int curve_compression_high;   /* [in] percentage of compression performed on the high part of the curve (above average) */
-	int curve_compression_low;    /* [in] percentage of compression performed on the low  part of the curve (below average) */
-	int overflow_control_strength;/* [in] Payback delay expressed in number of frames */
-	int max_overflow_improvement; /* [in] percentage of allowed range for a frame that gets bigger because of overflow bonus */
-	int max_overflow_degradation; /* [in] percentage of allowed range for a frame that gets smaller because of overflow penalty */
-
-	int kfreduction;              /* [in] maximum bitrate reduction applied to an iframe under the kfthreshold distance limit */
-	int kfthreshold;              /* [in] if an iframe is closer to the next iframe than this distance, a quantity of bits
-								   *      is substracted from its bit allocation. The reduction is computed as multiples of
-								   *      kfreduction/kthreshold. It reaches kfreduction when the distance == kfthreshold,
-								   *      0 for 1<distance<kfthreshold */
-
-	int container_frame_overhead; /* [in] How many bytes the controller has to compensate per frame due to container format overhead */
-} xvid_plugin_2pass2_t;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

gpac-0.8.0.tar.gz/modules/xvid_dec/xvid_wce/xvid_ppc.asm Deleted

@@ -1,592 +0,0 @@
-
-   AREA XVID,CODE,READONLY
-   EXPORT XVID_ClearMatrix
-   EXPORT XVID_MemCpy
-   EXPORT interpolate8x8_halfpel_hv
-   EXPORT interpolate8x8_halfpel_h
-   EXPORT interpolate8x8_halfpel_v
-   EXPORT transfer8x8_copy
-
-;----------------------------
-XVID_ClearMatrix
-
-   mov r1, #0
-   mov r2, #0
-   mov r3, #0
-   mov r12, #0
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-   stmia r0!, { r1, r2, r3, r12 }
-
-   mov pc, lr
-
-;----------------------------
-XVID_MemCpy
-
-   stmfd sp!, { r4 - r6 }
-
-   subs r2, r2, #16
-   blt mc_no16
-mc_loop16
-                              ;the order of regs in {} is not important, now it's ordered as to avoid compiler warnings
-   ldmia r1!, { r3 - r6 }
-   stmia r0!, { r3 - r6 }
-   subs r2, r2, #16
-   bge mc_loop16
-mc_no16
-   adds r2, r2, #16
-   beq mc_end
-mc_loop4
-   ldr r3, [r1], #4
-   str r3, [r0], #4
-   subs r2, r2, #4
-   bne mc_loop4
-mc_end
-
-   ldmfd sp!, { r4 - r6 }
-   mov pc, lr
-
-;----------------------------
-interpolate8x8_halfpel_hv
-
-   stmfd sp!, { r4 - r9, r14 }
-
-   tst r3, r3
-   movne r14, #1
-   moveq r14, #2
-
-   mov r3, #8
-ihhv_loop
-   add r4, r1, r2
-   ldrb r5, [r1, #8]
-   ldrb r7, [r4, #8]
-   add r5, r5, r7
-                           ;7+8
-   ldrb r6, [r1, #7]
-   ldrb r7, [r4, #7]
-   add r6, r6, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r8, r7, asr #2
-                           ;6+7
-   ldrb r5, [r1, #6]
-   ldrb r7, [r4, #6]
-   add r5, r5, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-                           ;5+6
-   ldrb r6, [r1, #5]
-   ldrb r7, [r4, #5]
-   add r6, r6, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-                           ;4+5
-   ldrb r5, [r1, #4]
-   ldrb r7, [r4, #4]
-   add r5, r5, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-
-   str r8, [r0, #4]
-
-                           ;3+4
-   ldrb r6, [r1, #3]
-   ldrb r7, [r4, #3]
-   add r6, r6, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r8, r7, asr #2
-                           ;2+3
-   ldrb r5, [r1, #2]
-   ldrb r7, [r4, #2]
-   add r5, r5, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-                           ;1+2
-   ldrb r6, [r1, #1]
-   ldrb r7, [r4, #1]
-   add r6, r6, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-                           ;0+1
-   ldrb r5, [r1, #0]
-   ldrb r7, [r4, #0]
-   add r5, r5, r7
-   add r7, r5, r6
-   add r7, r7, r14
-   mov r7, r7, asr #2
-   orr r8, r7, r8, asl #8
-
-   str r8, [r0, #0]
-
-   add r0, r0, r2
-   add r1, r1, r2
-   subs r3, r3, #1
-   bne ihhv_loop
-
-   ldmfd sp!, { r4 - r9, r14 }
-   mov pc, lr
-
-;----------------------------
-interpolate8x8_halfpel_h
-
-   stmfd sp!, { r4 - r6 }
-
-   ands r3, r3, #1
-   beq i_hp_h_no_round
-
-   mov r6, #8
-ihh_loop
-   ldrb r12, [r1, #8]
-                                 ;7+8
-   ldrb r3, [r1, #7]
-   add r4, r12, r3
-   mov r4, r4, asr #1
-                                 ;6+7
-   ldrb r12, [r1, #6]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;5+6
-   ldrb r3, [r1, #5]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;4+5
-   ldrb r12, [r1, #4]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-
-   str r4, [r0, #4]
-
-                                 ;3+4
-   ldrb r3, [r1, #3]
-   add r4, r12, r3
-   mov r4, r4, asr #1
-                                 ;2+3
-   ldrb r12, [r1, #2]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;1+2
-   ldrb r3, [r1, #1]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;0+1
-   ldrb r12, [r1, #0]
-   add r5, r12, r3
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-
-   str r4, [r0, #0]
-
-   add r0, r0, r2
-   add r1, r1, r2
-   subs r6, r6, #1   
-   bne ihh_loop
-   b i_hp_h_end
-
-i_hp_h_no_round
-
-   mov r6, #8
-ihh_loop1
-   ldrb r12, [r1, #8]
-                                 ;7+8
-   ldrb r3, [r1, #7]
-   add r4, r12, r3
-   add r4, r4, #1
-   mov r4, r4, asr #1
-                                 ;6+7
-   ldrb r12, [r1, #6]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;5+6
-   ldrb r3, [r1, #5]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;4+5
-   ldrb r12, [r1, #4]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-
-   str r4, [r0, #4]
-
-                                 ;3+4
-   ldrb r3, [r1, #3]
-   add r4, r12, r3
-   add r4, r4, #1
-   mov r4, r4, asr #1
-                                 ;2+3
-   ldrb r12, [r1, #2]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;1+2
-   ldrb r3, [r1, #1]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-                                 ;0+1
-   ldrb r12, [r1, #0]
-   add r5, r12, r3
-   add r5, r5, #1
-   mov r5, r5, asr #1
-   orr r4, r5, r4, asl #8
-
-   str r4, [r0, #0]
-
-   add r0, r0, r2
-   add r1, r1, r2
-   subs r6, r6, #1   
-   bne ihh_loop1
-
-i_hp_h_end
-   ldmfd sp!, { r4 - r6 }
-   mov pc, lr
-
-;----------------------------
-interpolate8x8_halfpel_v
-
-   stmfd sp!, { r4 - r6 }
-
-   ands r3, r3, #1
-   beq i_hp_v_no_round
-
-   mov r6, #8
-ihv_loop
-   add r5, r1, r2
-                           ;3
-   ldrb r12, [r1, #3]   
-   ldrb r3, [r5, #3]
-   add r4, r12, r3   
-   mov r4, r4, asr #1
-                           ;2
-   ldrb r12, [r1, #2]   
-   ldrb r3, [r5, #2]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;1
-   ldrb r12, [r1, #1]   
-   ldrb r3, [r5, #1]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;0
-   ldrb r12, [r1, #0]   
-   ldrb r3, [r5, #0]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-
-   str r4, [r0, #0]
-
-                           ;7
-   ldrb r12, [r1, #7]   
-   ldrb r3, [r5, #7]
-   add r4, r12, r3   
-   mov r4, r4, asr #1
-                           ;6
-   ldrb r12, [r1, #6]   
-   ldrb r3, [r5, #6]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;5
-   ldrb r12, [r1, #5]   
-   ldrb r3, [r5, #5]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;4
-   ldrb r12, [r1, #4]   
-   ldrb r3, [r5, #4]
-   add r12, r12, r3   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-
-   str r4, [r0, #4]
-
-   add r0, r0, r2   
-   add r1, r1, r2
-   subs r6, r6, #1   
-   bne ihv_loop
-   b i_hp_v_end
-
-i_hp_v_no_round
-   mov r6, #8
-ihv_loop1
-   add r5, r1, r2
-                           ;3
-   ldrb r12, [r1, #3]   
-   ldrb r3, [r5, #3]
-   add r4, r12, r3   
-   add r4, r4, #1   
-   mov r4, r4, asr #1
-                           ;2
-   ldrb r12, [r1, #2]   
-   ldrb r3, [r5, #2]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;1
-   ldrb r12, [r1, #1]   
-   ldrb r3, [r5, #1]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;0
-   ldrb r12, [r1, #0]   
-   ldrb r3, [r5, #0]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-
-   str r4, [r0, #0]
-
-                           ;7
-   ldrb r12, [r1, #7]   
-   ldrb r3, [r5, #7]
-   add r4, r12, r3   
-   add r4, r4, #1   
-   mov r4, r4, asr #1
-                           ;6
-   ldrb r12, [r1, #6]   
-   ldrb r3, [r5, #6]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;5
-   ldrb r12, [r1, #5]   
-   ldrb r3, [r5, #5]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-                           ;4
-   ldrb r12, [r1, #4]   
-   ldrb r3, [r5, #4]
-   add r12, r12, r3   
-   add r12, r12, #1   
-   mov r12, r12, asr #1
-   orr r4, r12, r4, asl #8
-
-   str r4, [r0, #4]
-
-   add r0, r0, r2   
-   add r1, r1, r2
-   subs r6, r6, #1   
-   bne ihv_loop1
-i_hp_v_end
-   ldmfd sp!, { r4 - r6 }
-   mov pc, lr
-
-;----------------------------
-transfer8x8_copy
-   
-   orr r12, r1, r2
-   tst r12, #3
-   bne tc_no_dw
-                              ;dword version
-;tc_dw_loop
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldmia r1, { r12, r3 }  
-   stmia r0, { r12, r3 }
-
-   mov pc, lr
-
-tc_no_dw
-   tst r12, #1   
-   bne tc_no_w
-                           ;word version
-;tc_w_loop
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   ldrh r12, [r1, #0]   
-   strh r12, [r0, #0] 
-   ldrh r12, [r1, #2]   
-   strh r12, [r0, #2] 
-   ldrh r12, [r1, #4]   
-   strh r12, [r0, #4] 
-   ldrh r12, [r1, #6]   
-   strh r12, [r0, #6]
-
-   mov pc, lr
-
-tc_no_w
-   mov r3, #8
-tc_b_loop
-   ldrb r12, [r1, #0]   
-   strb r12, [r0, #0]
-   ldrb r12, [r1, #1]   
-   strb r12, [r0, #1]
-   ldrb r12, [r1, #2]   
-   strb r12, [r0, #2]
-   ldrb r12, [r1, #3]   
-   strb r12, [r0, #3]
-   ldrb r12, [r1, #4]   
-   strb r12, [r0, #4]
-   ldrb r12, [r1, #5]   
-   strb r12, [r0, #5]
-   ldrb r12, [r1, #6]   
-   strb r12, [r0, #6]
-   ldrb r12, [r1, #7]   
-   strb r12, [r0, #7]
-   add r0, r0, r2   
-   add r1, r1, r2
-
-   subs r3, r3, #1   
-   bne tc_b_loop
-
-   mov pc, lr
-
-;----------------------------
-
-   END
\ No newline at end of file

gpac-0.8.0.tar.gz/shaders Deleted

gpac-0.8.0.tar.gz/shaders/fragment.glsl Deleted

@@ -1,388 +0,0 @@
-/**
- * Shader implementing: Clipping, Texturing (RGB and YUV), Lighting, Fog
- **/
-
-//version defined first, at shader compilation
-#ifdef GF_GL_IS_ExternalOES
-#extension GL_OES_EGL_image_external : require
-#endif
-#if defined(GL_ES)
-#if defined(GL_FRAGMENT_PRECISION_HIGH)
-precision highp float;	//ES2.0 supporting highp
-#else
-precision mediump float;	//Default
-#endif
-#endif
-
-//#pragma STDGL invariant(all)	//removed due to incompatibility with the emulator
-
-//LIGHTS_MAX and CLIP_MAX defined at shader compilation
-
-
-#ifdef GF_GL_HAS_LIGHT
-
-#define FOG_TYPE_LINEAR 0
-#define FOG_TYPE_EXP    1
-#define FOG_TYPE_EXP2   2
-
-#define L_DIRECTIONAL	0
-#define L_SPOT		    1
-#define L_POINT			2
-
-//Light Structure
-struct gfLight{
-#if defined(GL_ES)
-	lowp int type;
-#else
-	int type;
-#endif
-	vec4 position;
-	vec4 direction;
-	vec3 attenuation;
-	vec4 color;
-	float ambientIntensity;	//it is not used - we calculate it inside the shader
-	float intensity;
-	float beamWidth;	//it is not used - we calculate it inside the shader
-	float cutOffAngle;
-};
-
-//Generic (Scene) Uniforms
-#if defined(GL_ES)
-uniform lowp int gfNumLights;
-#else
-uniform int gfNumLights;
-#endif
-uniform bool gfLightTwoSide;
-uniform gfLight lights[LIGHTS_MAX];
-
-//Material and Lighting Properties
-uniform vec4 gfAmbientColor;
-uniform vec4 gfDiffuseColor;
-uniform vec4 gfSpecularColor;
-uniform float gfShininess;	//a.k.a. specular exponent
-uniform vec4 gfLightDiffuse;
-uniform vec4 gfLightAmbient;
-uniform vec4 gfLightSpecular;
-
-//Fog
-uniform bool gfFogEnabled;
-uniform vec3 gfFogColor;
-
-#endif
-
-uniform bool hasMaterial2D;
-uniform vec4 gfEmissionColor;
-
-#ifdef GF_GL_HAS_COLOR
-uniform bool hasMeshColor;
-#endif
-
-#ifdef GF_GL_HAS_CLIP
-#if defined(GL_ES)
-uniform lowp int gfNumClippers;
-#else
-uniform int gfNumClippers;
-#endif
-#endif
-
-//Color Matrix
-uniform mat4 gfColorMatrix;
-uniform bool hasColorMatrix;
-uniform vec4 gfTranslationVector;
-	
-//Color Key
-uniform vec3 gfKeyColor;
-uniform float gfKeyAlpha;
-uniform float gfKeyLow;
-uniform float gfKeyHigh;
-uniform bool hasColorKey;
-
-#ifdef GF_GL_HAS_TEXTURE
-
-uniform int gfNumTextures;
-
-//Texture samplers
-#if defined(GF_GL_IS_YUV)
-uniform int yuvPixelFormat;
-uniform sampler2D y_plane;
-uniform sampler2D u_plane;
-uniform sampler2D v_plane;
-#elif defined(GF_GL_IS_ExternalOES)
-uniform samplerExternalOES imgOES;
-#else
-uniform sampler2D img;
-#endif
-
-//Texture other
-uniform float alpha;
-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);
-
-#endif
-
-
-//Varyings
-#ifdef GF_GL_HAS_LIGHT
-varying vec3 m_normal;
-varying vec4 gfEye;
-varying vec3 lightVector[LIGHTS_MAX];
-varying float gfFogFactor;
-#endif
-
-#ifdef GF_GL_HAS_TEXTURE
-varying vec2 TexCoord;
-#endif
-
-#ifdef GF_GL_HAS_COLOR
-varying vec4 m_color;
-#endif
-
-#ifdef GF_GL_HAS_CLIP
-varying float clipDistance[CLIPS_MAX];
-#endif
-
-//constants
-const float zero_float = 0.0;
-const float one_float = 1.0;
-
-
-#ifdef GF_GL_HAS_LIGHT
-vec4 doLighting(int i){
-
-	vec4 lightColor = vec4(zero_float, zero_float, zero_float, zero_float);
-	float att = zero_float;
-	gfLight tempLight;	//we use a temp gfLight, because array of straucts in fragment are not supported in android
-	vec3 lightVnorm; //normalized lightVector
-	vec3 lightV; //temp lightVector
-	vec3 halfVnorm; //temp lightVector
-
-	//FIXME - couldn't we use a light[i]. something here ?
-	if(i==0) {	//ES2 does not support switch() statements
-		tempLight = lights[0];
-		lightV = lightVector[0];
-		halfVnorm = normalize( lightVector[0] + gfEye.xyz );
-	} else if (i==1) {
-		tempLight = lights[1];
-		lightV = lightVector[1];
-		halfVnorm = normalize( lightVector[1] + gfEye.xyz );
-	} else if(i==2) {
-		tempLight = lights[2];
-		lightV = lightVector[2];
-		halfVnorm = normalize( lightVector[2] + gfEye.xyz );
-	}
-	
-	lightVnorm = normalize(lightV);
-	vec3 normal = normalize(m_normal);
-
-	if (gfLightTwoSide && (!gl_FrontFacing)){//light back face
-		//originally: normal *=-1; -> Not compliant with Shading Language v1.0
-		normal *= vec3(-1.0, -1.0, -1.0);
-	}
-	
-	float light_cos = max(zero_float, dot(normal, lightVnorm));	//ndotl
-	float half_cos = dot(normal, halfVnorm);
-
-	if (tempLight.type == L_POINT) {	//we have a point
-		float distance = length(lightV);	
-		att = 1.0 / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
-
-		if (att <= 0.0)
-			return lightColor;
-			
-		lightColor += light_cos * tempLight.color * gfDiffuseColor;
-		
-		if (light_cos > 0.0) {
-			float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
-			lightColor += (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
-			lightColor *= att;
-		}
-		lightColor.a = gfDiffuseColor.a;
-		return lightColor;
-		
-	} else if (tempLight.type == L_SPOT) {	//we have a spot
-		if (light_cos > 0.0) {
-			float spot = dot(normalize(tempLight.direction.xyz), lightVnorm);	//it should be -direction, but we invert it before parsing
-			if (spot > tempLight.cutOffAngle) {
-				float distance = length(lightV);	
-				float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
-				spot = pow(spot, tempLight.intensity);
-				att = spot / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
-				lightColor += att * (light_cos * tempLight.color * gfDiffuseColor);
-				lightColor += att * (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
-			}
-		}
-		return lightColor;
-
-	} else if(tempLight.position.w == zero_float || tempLight.type == L_DIRECTIONAL) { //we have a direction
-		vec3 lightDirection = vec3(tempLight.position);
-		lightColor = (gfDiffuseColor * gfLightDiffuse) * light_cos; 
-		if (half_cos > zero_float) {
-			lightColor += (gfSpecularColor * gfLightSpecular) * pow(half_cos, gfShininess);
-		}
-		lightColor.a = gfDiffuseColor.a;
-		return lightColor;
-	}
-
-	return vec4(zero_float);
-}
-#endif //GF_GL_HAS_LIGHT
-
-void main()
-{
-#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
-	bool do_clip=false;
-#endif
-	int i;
-	vec2 texc;
-	vec3 yuv, rgb;
-	vec4 rgba, fragColor;
-
-#ifdef GF_GL_HAS_CLIP
-	//clipping
-	for (int i=0; i<CLIPS_MAX; i++) {
-		if (i==gfNumClippers) break;
-		if (clipDistance[i]<0.0) {
-			//do not discard on GLES too slow on most devices
-#if defined(GL_ES)
-			do_clip=true;
-			break;
-#else
-			discard;
-#endif
-		}
-	}
-#endif
-	
-#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
-	if (do_clip) {
-		gl_FragColor = vec4(zero_float);
-	} else {
-#endif
-		
-		
-#ifdef GF_GL_HAS_COLOR
-	fragColor = m_color;
-#else
-	fragColor = vec4(zero_float);
-#endif
-
-	if (hasMaterial2D) {
-		fragColor = gfEmissionColor;
-	}
-
-#if defined (GF_GL_HAS_LIGHT)
-	if (gfNumLights>0) {
-#ifdef GF_GL_HAS_COLOR
-		fragColor += (gfAmbientColor * gfLightAmbient);
-#else
-		fragColor = gfEmissionColor + (gfAmbientColor * gfLightAmbient);
-#endif
-	}
-#endif
-
-#ifdef GF_GL_HAS_LIGHT
-	if (gfNumLights > 0) {
-		for (int i=0; i<LIGHTS_MAX; i++) {
-			if (i==gfNumLights) break;
-			fragColor += doLighting(i);
-		}
-		fragColor.a = gfDiffuseColor.a;
-	}
-#endif
-	
-	fragColor = clamp(fragColor, zero_float, one_float);
-
-#ifdef GF_GL_HAS_TEXTURE
-	
-	//currently supporting 1 texture
-	if (gfNumTextures>0) {
-#if defined(GF_GL_IS_YUV)
-		texc = TexCoord.st;
-		yuv.x = texture2D(y_plane, texc).r;
-		if (yuvPixelFormat==2) {
-			yuv.y = texture2D(u_plane, texc).r;
-			yuv.z = texture2D(u_plane, texc).a;
-		}
-		else if (yuvPixelFormat==1) {
-			yuv.y = texture2D(u_plane, texc).a;
-			yuv.z = texture2D(u_plane, texc).r;
-		}
-		else {
-			yuv.y = texture2D(u_plane, texc).r;
-			yuv.z = texture2D(v_plane, texc).r;
-		}
-		yuv += offset;
-		rgb.r = dot(yuv, R_mul);
-		rgb.g = dot(yuv, G_mul);
-		rgb.b = dot(yuv, B_mul);
-
-		rgba = vec4(rgb, alpha);
-
-#elif defined(GF_GL_IS_ExternalOES)
-		rgba = texture2D(imgOES, TexCoord);
-#else
-		rgba = texture2D(img, TexCoord);
-#endif
-
-#ifdef GF_GL_HAS_LIGHT
-		if (gfNumLights>0) {	//RGB texture
-			fragColor *= rgba;
-		}
-		//RGB texture with material 2D [TODO: check]
-		else if(gfNumLights==0)
-#endif
-		{
-			fragColor = rgba;
-		}
-
-		//we have mat 2D + texture
-#ifndef GF_GL_IS_ExternalOES
-		if (hasMaterial2D) {
-			if (gfEmissionColor.a > 0.0) {
-				fragColor *= gfEmissionColor;
-			}
-			//hack - if full transparency on texture with material2D, use material color
-			else if (fragColor.rgb == vec3(0.0, 0.0, 0.0)){
-				fragColor.rgb = gfEmissionColor.rgb;
-			}
-		}
-#endif // GF_GL_IS_ExternalOES
-	}
-	
-#endif // GF_GL_HAS_TEXTURE
-	
-	
-	if (hasColorMatrix) {
-		fragColor = gfColorMatrix * fragColor;
-		fragColor += gfTranslationVector;
-		fragColor = clamp(fragColor, zero_float, one_float);
-	}
-	
-	if (hasColorKey) {
-		vec3 tempColour = vec3(0.0, 0.0, 0.0);
-		float mean = 0.0;
-		
-		tempColour.r = abs(gfKeyColor.r-fragColor.r);
-		tempColour.g = abs(gfKeyColor.g-fragColor.g);
-		tempColour.b = abs(gfKeyColor.b-fragColor.b);
-		mean = (tempColour.r + tempColour.g + tempColour.b)/3.0;
-		
-		if (mean<gfKeyLow) {
-			fragColor.a =0.0;
-		} else if(mean<=gfKeyHigh) {
-			fragColor.a = (mean-gfKeyLow) * gfKeyAlpha / (gfKeyHigh - gfKeyLow);
-		}
-	}
-	
-#ifdef GF_GL_HAS_LIGHT
-	if (gfFogEnabled)
-		fragColor = fragColor * gfFogFactor + vec4(gfFogColor, zero_float) * (one_float - gfFogFactor);
-#endif
-	gl_FragColor = fragColor;
-
-#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
-	}
-#endif
-}

gpac-0.8.0.tar.gz/src/dir_info Deleted

@@ -1,47 +0,0 @@
-This is a short overview of the gpac library source repository. 
-  
-gpac/src/bifs
-	BInary Format for Scene coding (decoder and encoder) (BIFS tables are with MPEG4Gen application)
-
-gpac/src/ietf
-	Small RTP/RTSP/SDP library, plus media packetizers.
-
-gpac/src/isomedia
-	IsoMedia File Format - features file reading/writing/editing, precise interleaving, hint track creation 
-and supports movie fragments (read/write). Includes 3GPP/3GPP2 features and simple AVC support - JPEG2000 support to be done.
-
-gpac/src/crypto
-	Cryptographic tools (AES 128 CBC and CTR only for now)
-
-gpac/src/media_tools
-	media tools for authoring: ISMA & 3GPP tools, media importing and exporting, hinting
-
-gpac/src/odf
-	MPEG-4 Object Descriptor Framework: encoding/decoding of all descriptors, OD codec and OCI codec
-
-gpac/src/compositor
-	Compositor for 2D & 3D drawing - handles MPEG-4, X3D/VRML and SVG.
-
-gpac/src/scene_manager
-	memory representation of the scene, importers (BT/XMT/SWF/QT), dumpers and encoding
-
-gpac/src/scenegraph
-	Scene Graph API (MPEG4/VRML/X3D/SVG) 
-
-gpac/src/terminal
-	Client application engine. The guts of the gpac client performing stream synchronization and 
-media object setup, control and decoding. All decoders / network services are abstracted through plugins
-
-gpac/src/utils
-	All generic objects used throughout the lib (list, bitstream, thread, mutex...)
-The OS specific files are in dedicated sub_folders (eg ./Tools/w32 for all windows code, ...)
-porting the lib means barely porting these files and updating the makefile
-
-gpac/include/gpac
-	all exported files of the lib (high level APIs). Development headers are <gpac/file>
-
-gpac/include/gpac/internal
-	all development files of the lib (low level access).
-
-gpac/include/gpac/modules
-	all module APIs defined in GPAC.

gpac-0.8.0.tar.gz/src/media_tools/filestreamer.c Deleted

@@ -1,680 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / mp4 simple streamer application
- *
- *  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/internal/media_dev.h>
-#include <gpac/constants.h>
-#include <gpac/maths.h>
-
-#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
-
-#include <gpac/isomedia.h>
-#include <gpac/ietf.h>
-#include <gpac/config_file.h>
-#include <gpac/base_coding.h>
-#include <gpac/filestreamer.h>
-#include <gpac/rtp_streamer.h>
-
-typedef struct __tag_rtp_track
-{
-	struct __tag_rtp_track *next;
-
-	GF_RTPStreamer *rtp;
-	u16 port;
-
-	/*scale from TimeStamps in media timescales to TimeStamps in microseconds*/
-	Double microsec_ts_scale;
-
-	/*NALU size for H264/AVC parsing*/
-	u32 avc_nalu_size;
-
-	/*track info*/
-	u32 track_num;
-	u32 timescale;
-	u32 nb_aus;
-
-	/*loaded AU info*/
-	GF_ISOSample  *au;
-	u32 current_au;
-	u32 sample_duration;
-	u32 sample_desc_index;
-	/*normalized DTS in micro-sec*/
-	u64 microsec_dts;
-
-	/*offset of CTS/DTS in media timescale, used when looping the track*/
-	u32 ts_offset;
-	/*offset of CTS/DTS in microseconds, used when looping the track*/
-	u32 microsec_ts_offset;
-} GF_RTPTrack;
-
-
-struct __isom_rtp_streamer
-{
-	GF_ISOFile *isom;
-	char *dest_ip;
-	Bool loop;
-	Bool force_mpeg4_generic;
-	/*timeline origin of our session (all tracks) in microseconds*/
-	u64 timelineOrigin;
-	/*list of streams in session*/
-	GF_RTPTrack *stream;
-
-	/*to sync looping sessions with tracks of # length*/
-	u32 duration_ms;
-
-	/*base track if this stream contains a media decoding dependancy, 0 otherwise*/
-	u32 base_track;
-
-	Bool first_RTCP_sent;
-    u64 last_min_dts;
-};
-
-
-
-static GF_Err gf_isom_streamer_setup_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename, char **out_sdp_buffer)
-{
-	GF_RTPTrack *track;
-	FILE *sdp_out;
-	char filename[GF_MAX_PATH];
-	char sdpLine[20000];
-	u32 t, count;
-	u8 *payload_type;
-
-	strcpy(filename, sdpfilename ? sdpfilename : "videosession.sdp");
-	sdp_out = gf_fopen(filename, "wt");
-	if (!sdp_out) return GF_IO_ERR;
-
-	if (!out_sdp_buffer) {
-		sprintf(sdpLine, "v=0");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "o=MP4Streamer 3357474383 1148485440000 IN IP%d %s", gf_net_is_ipv6(streamer->dest_ip) ? 6 : 4, streamer->dest_ip);
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "s=livesession");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "i=This is an MP4 time-sliced Streaming demo");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "u=http://gpac.io");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "e=admin@");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "c=IN IP%d %s", gf_net_is_ipv6(streamer->dest_ip) ? 6 : 4, streamer->dest_ip);
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "t=0 0");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		sprintf(sdpLine, "a=x-copyright: Streamed with GPAC (C)2000-2016 - http://gpac.io");
-		fprintf(sdp_out, "%s\n", sdpLine);
-		if (streamer->base_track)
-		{
-			sprintf(sdpLine, "a=group:DDP L%d", streamer->base_track);
-			fprintf(sdp_out, "%s", sdpLine);
-			count = gf_isom_get_track_count(streamer->isom);
-			for (t = 0; t < count; t++)
-			{
-				if (gf_isom_has_track_reference(streamer->isom, t+1, GF_ISOM_REF_BASE, gf_isom_get_track_id(streamer->isom, streamer->base_track)))
-				{
-					sprintf(sdpLine, " L%d", t+1);
-					fprintf(sdp_out, "%s", sdpLine);
-				}
-			}
-			fprintf(sdp_out, "\n");
-		}
-	}
-
-	/*prepare array of payload type*/
-	count = gf_isom_get_track_count(streamer->isom);
-	payload_type = (u8 *)gf_malloc(count * sizeof(u8));
-	track = streamer->stream;
-	while (track) {
-		payload_type[track->track_num-1] = gf_rtp_streamer_get_payload_type(track->rtp);
-		track = track->next;
-	}
-
-
-	track = streamer->stream;
-	while (track) {
-		char *sdp_media=NULL;
-		const char *KMS = NULL;
-		char *dsi = NULL;
-		u32 w, h;
-		u32 dsi_len = 0;
-		GF_DecoderConfig *dcd;
-        u32 mtype;
-        
-		//use inspect mode so that we don't aggregate xPS from the base in the enhancement ESD
-		gf_isom_set_nalu_extract_mode(streamer->isom, track->track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
-		dcd = gf_isom_get_decoder_config(streamer->isom, track->track_num, 1);
-
-		if (dcd && dcd->decoderSpecificInfo) {
-			dsi = dcd->decoderSpecificInfo->data;
-			dsi_len = dcd->decoderSpecificInfo->dataLength;
-		}
-		w = h = 0;
-        mtype = gf_isom_get_media_type(streamer->isom, track->track_num);
-		if (gf_isom_is_video_subtype(mtype)) {
-			gf_isom_get_visual_info(streamer->isom, track->track_num, 1, &w, &h);
-		}
-
-		gf_isom_get_ismacryp_info(streamer->isom, track->track_num, 1, NULL, NULL, NULL, NULL, &KMS, NULL, NULL, NULL);
-
-		/*TODO retrieve DIMS content encoding from track to set the flags */
-		gf_rtp_streamer_append_sdp_extended(track->rtp, gf_isom_get_track_id(streamer->isom, track->track_num), dsi, dsi_len, streamer->isom, track->track_num, (char *)KMS, w, h, &sdp_media);
-		if (streamer->base_track)
-			gf_rtp_streamer_append_sdp_decoding_dependency(streamer->isom, track->track_num, payload_type, &sdp_media);
-		if (sdp_media) {
-			fprintf(sdp_out, "%s", sdp_media);
-			gf_free(sdp_media);
-		}
-
-		if (dcd) gf_odf_desc_del((GF_Descriptor *)dcd);
-
-		track = track->next;
-	}
-	fprintf(sdp_out, "\n");
-    GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[FileStreamer] SDP file generated\n"));
-    
-	gf_fclose(sdp_out);
-	if (out_sdp_buffer) {
-		u64 size;
-		sdp_out = gf_fopen(filename, "r");
-		gf_fseek(sdp_out, 0, SEEK_END);
-		size = gf_ftell(sdp_out);
-		gf_fseek(sdp_out, 0, SEEK_SET);
-		if (*out_sdp_buffer) gf_free(*out_sdp_buffer);
-		*out_sdp_buffer = gf_malloc(sizeof(char)*(size_t)(size+1));
-		size = fread(*out_sdp_buffer, 1, (size_t)size, sdp_out);
-		gf_fclose(sdp_out);
-		(*out_sdp_buffer)[size]=0;
-	}
-
-	gf_free(payload_type);
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_isom_streamer_write_sdp(GF_ISOMRTPStreamer *streamer, char*sdpfilename)
-{
-	return gf_isom_streamer_setup_sdp(streamer, sdpfilename, NULL);
-}
-
-GF_EXPORT
-GF_Err gf_isom_streamer_get_sdp(GF_ISOMRTPStreamer *streamer, char **out_sdp_buffer)
-{
-	return gf_isom_streamer_setup_sdp(streamer, NULL, out_sdp_buffer);
-}
-
-GF_EXPORT
-void gf_isom_streamer_reset(GF_ISOMRTPStreamer *streamer, Bool is_loop)
-{
-	GF_RTPTrack *track;
-	if (!streamer) return;
-	track = streamer->stream;
-	while (track) {
-		if (is_loop) {
-			Double scale = track->timescale/1000.0;
-			track->ts_offset += (u32) (streamer->duration_ms * scale);
-			track->microsec_ts_offset = (u32) (track->ts_offset*(1000000.0/track->timescale) + streamer->timelineOrigin);
-		} else {
-			track->ts_offset += 0;
-			track->microsec_ts_offset = 0;
-		}
-		track->current_au = 0;
-		track = track->next;
-	}
-	if (is_loop) streamer->timelineOrigin = 0;
-}
-
-GF_EXPORT
-GF_Err gf_isom_streamer_send_next_packet(GF_ISOMRTPStreamer *streamer, s32 send_ahead_delay, s32 max_sleep_time)
-{
-	GF_Err e = GF_OK;
-	GF_RTPTrack *track, *to_send;
-	u32 duration;
-	s32 diff;
-	u64 min_ts, dts, cts, clock;
-
-	if (!streamer) return GF_BAD_PARAM;
-
-	/*browse all sessions and locate most mature stream*/
-	to_send = NULL;
-	min_ts = (u64) -1;
-
-	clock = gf_sys_clock_high_res();
-
-	/*init session timeline - all sessions are sync'ed for packet scheduling purposes*/
-	if (!streamer->timelineOrigin) {
-		streamer->timelineOrigin = clock;
-		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[FileStreamer] RTP session %s initialized - time origin set to "LLU"\n", gf_isom_get_filename(streamer->isom), clock));
-	}
-
-	track = streamer->stream;
-	while (track) {
-		/*load next AU*/
-		gf_isom_set_nalu_extract_mode(streamer->isom, track->track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY);
-		if (!track->au) {
-			if (track->current_au >= track->nb_aus) {
-				Double scale;
-				if (!streamer->loop) {
-					track = track->next;
-					continue;
-				}
-				/*increment ts offset*/
-				scale = track->timescale/1000.0;
-				track->ts_offset += (u32) (streamer->duration_ms * scale);
-				track->microsec_ts_offset = (u32) (track->ts_offset*(1000000.0/track->timescale) + streamer->timelineOrigin);
-				track->current_au = 0;
-			}
-
-			track->au = gf_isom_get_sample(streamer->isom, track->track_num, track->current_au + 1, &track->sample_desc_index);
-			track->current_au ++;
-			if (track->au) {
-				track->microsec_dts = (u64) (track->microsec_ts_scale * (s64) (track->au->DTS) + track->microsec_ts_offset + streamer->timelineOrigin);
-			}
-		}
-
-		/*check timing*/
-		if (track->au) {
-			if (min_ts > track->microsec_dts) {
-				min_ts = track->microsec_dts;
-				to_send = track;
-			}
-		}
-
-		track = track->next;
-	}
-
-	/*no input data ...*/
-	if( !to_send) return GF_EOS;
-
-    streamer->last_min_dts = min_ts;
-
-	/*we are about to send scalable base: trigger RTCP reports with the same NTP. This avoids
-	NTP drift due to system clock precision which could break sync decoding*/
-	if (!streamer->first_RTCP_sent || (streamer->base_track && streamer->base_track==to_send->track_num)) {
-		u32 ntp_sec, ntp_frac;
-		/*force sending RTCP SR every RAP ? - not really compliant but we cannot perform scalable tuning otherwise*/
-		u32 ntp_type = to_send->au->IsRAP ? 2 : 1;
-		gf_net_get_ntp(&ntp_sec, &ntp_frac);
-		track = streamer->stream;
-		while (track && track->au) {
-			u32 ts = (u32) (track->au->DTS + track->au->CTS_Offset + track->ts_offset);
-			gf_rtp_streamer_send_rtcp(track->rtp, GF_TRUE, ts, ntp_type, ntp_sec, ntp_frac);
-			track = track->next;
-		}
-
-		streamer->first_RTCP_sent = 1;
-	}
-
-	min_ts /= 1000;
-
-	if (max_sleep_time) {
-		diff = ((u32) min_ts) - gf_sys_clock();
-		if (diff>max_sleep_time)
-			return GF_OK;
-	}
-
-
-	/*sleep until TS is mature*/
-	while (1) {
-		diff = ((u32) min_ts) - gf_sys_clock();
-
-		if (diff > send_ahead_delay) {
-			gf_sleep(1);
-		} else {
-			if (diff<10) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("WARNING: RTP session %s stream %d - sending packet %d ms too late\n", gf_isom_get_filename(streamer->isom), to_send->track_num, -diff));
-			}
-			break;
-		}
-	}
-
-	/*send packets*/
-	dts = to_send->au->DTS + to_send->ts_offset;
-	cts = to_send->au->DTS + to_send->au->CTS_Offset + to_send->ts_offset;
-	duration = gf_isom_get_sample_duration(streamer->isom, to_send->track_num, to_send->current_au);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[FileStreamer] Sending RTP packets for track %d AU %d/%d DTS "LLU" - CTS "LLU" - RTP TS "LLU" - size %d - RAP %d\n", to_send->track_num, to_send->current_au, to_send->nb_aus, to_send->au->DTS, to_send->au->DTS+to_send->au->CTS_Offset, cts, to_send->au->dataLength, to_send->au->IsRAP ) );
-
-	/*unpack nal units*/
-	if (to_send->avc_nalu_size) {
-		Bool au_start, au_end;
-		u32 v, size;
-		u32 remain = to_send->au->dataLength;
-		char *ptr = to_send->au->data;
-
-		au_start = 1;
-		while (remain) {
-			size = 0;
-			v = to_send->avc_nalu_size;
-			while (v) {
-				size |= (u8) *ptr;
-				ptr++;
-				remain--;
-				v-=1;
-				if (v) size<<=8;
-			}
-			if (remain < size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp hinter] Broken AVC nalu encapsulation: NALU size is %d but only %d bytes left in sample %d\n", size, remain, to_send->current_au));
-				break;
-			}
-			remain -= size;
-			au_end = remain ? 0 : 1;
-
-			e = gf_rtp_streamer_send_data(to_send->rtp, ptr, size, to_send->au->dataLength, cts, dts, (to_send->au->IsRAP==RAP) ? 1 : 0, au_start, au_end, to_send->current_au, duration, to_send->sample_desc_index);
-			ptr += size;
-			au_start = 0;
-		}
-	} else {
-		e = gf_rtp_streamer_send_data(to_send->rtp, to_send->au->data, to_send->au->dataLength, to_send->au->dataLength, cts, dts, (to_send->au->IsRAP==RAP) ? 1 : 0, 1, 1, to_send->current_au, duration, to_send->sample_desc_index);
-	}
-	/*delete sample*/
-	gf_isom_sample_del(&to_send->au);
-
-	return e;
-}
-
-GF_EXPORT
-Double gf_isom_streamer_get_current_time(GF_ISOMRTPStreamer *streamer)
-{
-    Double res = (Double) (streamer->last_min_dts - streamer->timelineOrigin);
-    res /= 1000000;
-    return res;
-}
-
-
-static u16 check_next_port(GF_ISOMRTPStreamer *streamer, u16 first_port)
-{
-	GF_RTPTrack *track = streamer->stream;
-	while (track) {
-		if (track->port==first_port) {
-			return check_next_port(streamer, (u16) (first_port+2) );
-		}
-		track = track->next;
-	}
-	return first_port;
-}
-
-GF_EXPORT
-GF_ISOMRTPStreamer *gf_isom_streamer_new(const char *file_name, const char *ip_dest, u16 port, Bool loop, Bool force_mpeg4, u32 path_mtu, u32 ttl, char *ifce_addr)
-{
-	GF_ISOMRTPStreamer *streamer;
-	GF_Err e = GF_OK;
-	const char *opt = NULL;
-	/*GF_Config *configFile = NULL;	*/
-	u32 i, max_ptime, au_sn_len;
-	u8 payt;
-	GF_ISOFile *file;
-	GF_RTPTrack *track, *prev_track;
-	u16 first_port;
-	u32 nb_tracks;
-	u32 sess_data_size;
-	u32 base_track;
-
-	if (!ip_dest) ip_dest = "127.0.0.1";
-	if (!port) port = 7000;
-	if (!path_mtu) path_mtu = 1450;
-
-	GF_SAFEALLOC(streamer, GF_ISOMRTPStreamer);
-	if (!streamer) return NULL;
-	streamer->dest_ip = gf_strdup(ip_dest);
-
-	payt = 96;
-	max_ptime = au_sn_len = 0;
-
-	file = gf_isom_open(file_name, GF_ISOM_OPEN_READ, NULL);
-	if (!file) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Error opening file %s: %s\n", opt, gf_error_to_string(gf_isom_last_error(NULL))));
-		return NULL;
-	}
-
-	streamer->isom = file;
-	streamer->loop = loop;
-	streamer->force_mpeg4_generic = force_mpeg4;
-	first_port = port;
-
-	sess_data_size = 0;
-	prev_track = NULL;
-
-	nb_tracks = gf_isom_get_track_count(streamer->isom);
-	for (i=0; i<nb_tracks; i++) {
-		u32 mediaSize, mediaDuration, flags, MinSize, MaxSize, avgTS, streamType, oti, const_dur, nb_ch, samplerate, maxDTSDelta, TrackMediaSubType, TrackMediaType, bandwidth, IV_length, KI_length, dsi_len;
-		const char *url, *urn;
-		char *dsi;
-		Bool is_crypted;
-
-		dsi_len = samplerate = streamType = oti = nb_ch = IV_length = KI_length = 0;
-		is_crypted = 0;
-		dsi = NULL;
-
-		flags = 0;
-
-		/*we only support self-contained files for hinting*/
-		gf_isom_get_data_reference(streamer->isom, i+1, 1, &url, &urn);
-		if (url || urn) continue;
-
-		TrackMediaType = gf_isom_get_media_type(streamer->isom, i+1);
-		TrackMediaSubType = gf_isom_get_media_subtype(streamer->isom, i+1, 1);
-
-		switch (TrackMediaType) {
-		case GF_ISOM_MEDIA_TEXT:
-			break;
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-		case GF_ISOM_MEDIA_AUDIO:
-		case GF_ISOM_MEDIA_SUBT:
-		case GF_ISOM_MEDIA_OD:
-		case GF_ISOM_MEDIA_SCENE:
-			if (gf_isom_get_sample_description_count(streamer->isom, i+1) > 1) continue;
-			break;
-		default:
-			continue;
-		}
-
-		GF_SAFEALLOC(track, GF_RTPTrack);
-		if (!track) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Could not allocate file streamer track\n"));
-			continue;
-		}
-		if (prev_track) prev_track->next = track;
-		else streamer->stream = track;
-		prev_track = track;
-
-		track->track_num = i+1;
-
-		track->nb_aus = gf_isom_get_sample_count(streamer->isom, track->track_num);
-		track->timescale = gf_isom_get_media_timescale(streamer->isom, track->track_num);
-		mediaDuration = (u32)(gf_isom_get_media_duration(streamer->isom, track->track_num)*1000/track->timescale); // ms
-		mediaSize = (u32)gf_isom_get_media_data_size(streamer->isom, track->track_num);
-
-		sess_data_size += mediaSize;
-		if (mediaDuration > streamer->duration_ms) streamer->duration_ms = mediaDuration;
-
-		track->port = check_next_port(streamer, first_port);
-		first_port = track->port+2;
-
-		/*init packetizer*/
-		if (streamer->force_mpeg4_generic) flags = GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_FORCE_MPEG4;
-
-
-		switch (TrackMediaSubType) {
-		case GF_ISOM_SUBTYPE_MPEG4_CRYP:
-			is_crypted = 1;
-		case GF_ISOM_SUBTYPE_MPEG4:
-		{
-			GF_ESD *esd = gf_isom_get_esd(streamer->isom, track->track_num, 1);
-			if (esd) {
-				streamType = esd->decoderConfig->streamType;
-				oti = esd->decoderConfig->objectTypeIndication;
-
-				/*systems streams*/
-				if (streamType==GF_STREAM_AUDIO) {
-					gf_isom_get_audio_info(streamer->isom, track->track_num, 1, &samplerate, &nb_ch, NULL);
-				}
-				/*systems streams*/
-				else if (streamType==GF_STREAM_SCENE) {
-					if (gf_isom_has_sync_shadows(streamer->isom, track->track_num) || gf_isom_has_sample_dependency(streamer->isom, track->track_num))
-						flags |= GP_RTP_PCK_SYSTEMS_CAROUSEL;
-				}
-
-				if (esd->decoderConfig->decoderSpecificInfo) {
-					dsi = esd->decoderConfig->decoderSpecificInfo->data;
-					dsi_len = esd->decoderConfig->decoderSpecificInfo->dataLength;
-					esd->decoderConfig->decoderSpecificInfo->data = NULL;
-					esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
-				}
-				gf_odf_desc_del((GF_Descriptor*)esd);
-			}
-		}
-		break;
-		case GF_ISOM_SUBTYPE_AVC_H264:
-		case GF_ISOM_SUBTYPE_AVC2_H264:
-		case GF_ISOM_SUBTYPE_AVC3_H264:
-		case GF_ISOM_SUBTYPE_AVC4_H264:
-		case GF_ISOM_SUBTYPE_SVC_H264:
-		case GF_ISOM_SUBTYPE_MVC_H264:
-		{
-			GF_AVCConfig *avcc, *svcc, *mvcc;
-			avcc = gf_isom_avc_config_get(streamer->isom, track->track_num, 1);
-			if (avcc)
-			{
-				track->avc_nalu_size = avcc->nal_unit_size;
-				gf_odf_avc_cfg_del(avcc);
-				streamType = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_AVC;
-			}
-			svcc = gf_isom_svc_config_get(streamer->isom, track->track_num, 1);
-			if (svcc)
-			{
-				track->avc_nalu_size = svcc->nal_unit_size;
-				gf_odf_avc_cfg_del(svcc);
-				streamType = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_SVC;
-			}
-			mvcc = gf_isom_mvc_config_get(streamer->isom, track->track_num, 1);
-			if (mvcc)
-			{
-				track->avc_nalu_size = mvcc->nal_unit_size;
-				gf_odf_avc_cfg_del(mvcc);
-				streamType = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_MVC;
-			}
-			break;
-		}
-		break;
-		case GF_ISOM_SUBTYPE_HVC1:
-		case GF_ISOM_SUBTYPE_HEV1:
-		case GF_ISOM_SUBTYPE_HVC2:
-		case GF_ISOM_SUBTYPE_HEV2:
-		case GF_ISOM_SUBTYPE_LHV1:
-		{
-			GF_HEVCConfig *hevcc = NULL, *lhvcc = NULL;
-			hevcc = gf_isom_hevc_config_get(streamer->isom, track->track_num, 1);
-			if (hevcc) {
-				track->avc_nalu_size = hevcc->nal_unit_size;
-				gf_odf_hevc_cfg_del(hevcc);
-				streamType = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_HEVC;
-			}
-			lhvcc = gf_isom_lhvc_config_get(streamer->isom, track->track_num, 1);
-			if (lhvcc) {
-				track->avc_nalu_size = lhvcc->nal_unit_size;
-				gf_odf_hevc_cfg_del(lhvcc);
-				streamType = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_LHVC;
-			}
-			flags |= GP_RTP_PCK_USE_MULTI;
-			break;
-		}
-		break;
-		default:
-			streamType = GF_STREAM_4CC;
-			oti = TrackMediaSubType;
-			break;
-		}
-
-		/*get sample info*/
-		gf_media_get_sample_average_infos(streamer->isom, track->track_num, &MinSize, &MaxSize, &avgTS, &maxDTSDelta, &const_dur, &bandwidth);
-
-		if (is_crypted) {
-			Bool use_sel_enc;
-			gf_isom_get_ismacryp_info(streamer->isom, track->track_num, 1, NULL, NULL, NULL, NULL, NULL, &use_sel_enc, &IV_length, &KI_length);
-			if (use_sel_enc) flags |= GP_RTP_PCK_SELECTIVE_ENCRYPTION;
-		}
-
-		track->rtp = gf_rtp_streamer_new_extended(streamType, oti, track->timescale,
-		             (char *) streamer->dest_ip, track->port, path_mtu, ttl, ifce_addr,
-		             flags, dsi, dsi_len,
-		             payt, samplerate, nb_ch,
-		             is_crypted, IV_length, KI_length,
-		             MinSize, MaxSize, avgTS, maxDTSDelta, const_dur, bandwidth, max_ptime, au_sn_len);
-
-		if (!track->rtp) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Could not initialize RTP streamer: %s\n", gf_error_to_string(e)));
-			goto exit;
-		}
-
-		payt++;
-		track->microsec_ts_scale = 1000000;
-		track->microsec_ts_scale /= gf_isom_get_media_timescale(streamer->isom, track->track_num);
-
-		/*does this stream have the decoding dependency ?*/
-		gf_isom_get_reference(streamer->isom, track->track_num, GF_ISOM_REF_BASE, 1, &base_track);
-		if (base_track)
-			streamer->base_track = base_track;
-
-		if (dsi) gf_free(dsi);
-	}
-
-	/*if scalable coding is found, disable auto RTCP reports and send them ourselves*/
-	if (streamer->base_track) {
-		GF_RTPTrack *track = streamer->stream;
-		while (track) {
-			gf_rtp_streamer_disable_auto_rtcp(track->rtp);
-			track = track->next;
-		}
-	}
-	return streamer;
-
-exit:
-	gf_free(streamer);
-	return NULL;
-}
-
-GF_EXPORT
-void gf_isom_streamer_del(GF_ISOMRTPStreamer *streamer)
-{
-	GF_RTPTrack *track = streamer->stream;
-	while (track) {
-		GF_RTPTrack *tmp = track;
-		if (track->au) gf_isom_sample_del(&track->au);
-		if (track->rtp) gf_rtp_streamer_del(track->rtp);
-		track = track->next;
-		gf_free(tmp);
-	}
-	if (streamer->isom) gf_isom_close(streamer->isom);
-	gf_free(streamer->dest_ip);
-	gf_free(streamer);
-}
-
-#endif /* !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING) */

gpac-0.8.0.tar.gz/src/media_tools/ismacryp.c Deleted

@@ -1,3017 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media Tools 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/ismacryp.h>
-#include <gpac/xml.h>
-#include <gpac/base_coding.h>
-#include <gpac/constants.h>
-#include <gpac/internal/isomedia_dev.h>
-#include <gpac/crypt.h>
-#include <math.h>
-
-
-#if !defined(GPAC_DISABLE_MCRYPT)
-
-typedef struct
-{
-	GF_List *tcis;
-	Bool has_common_key;
-	Bool in_text_header;
-	//global for all tracks unless overriden
-	u32 def_crypt_type;
-
-	GF_Err parse_error;
-} GF_CryptInfo;
-
-static u32 get_crypt_type(char *cr_type)
-{
-	if (!stricmp(cr_type, "ISMA") || !stricmp(cr_type, "iAEC"))
-		return GF_CRYPT_TYPE_ISMA;
-	else if (!stricmp(cr_type, "CENC AES-CTR") || !stricmp(cr_type, "cenc"))
-		return GF_CRYPT_TYPE_CENC;
-	else if (!stricmp(cr_type, "CENC AES-CBC") || !stricmp(cr_type, "cbc1"))
-		return GF_CRYPT_TYPE_CBC1;
-	else if (!stricmp(cr_type, "ADOBE") || !stricmp(cr_type, "adkm"))
-		return GF_CRYPT_TYPE_ADOBE;
-	else if (!stricmp(cr_type, "CENC AES-CTR Pattern") || !stricmp(cr_type, "cens"))
-		return GF_CRYPT_TYPE_CENS;
-	else if (!stricmp(cr_type, "CENC AES-CBC Pattern") || !stricmp(cr_type, "cbcs"))
-		return GF_CRYPT_TYPE_CBCS;
-
-	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Unrecognized crypto type %s\n", cr_type));
-	return 0;
-}
-
-void isma_ea_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
-{
-	GF_XMLAttribute *att;
-	GF_TrackCryptInfo *tkc;
-	u32 i;
-	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
-
-	if (!strcmp(node_name, "OMATextHeader")) {
-		info->in_text_header = 1;
-		return;
-	}
-	if (!strcmp(node_name, "GPACDRM")) {
-		for (i=0; i<nb_attributes; i++) {
-			att = (GF_XMLAttribute *) &attributes[i];
-			if (!stricmp(att->name, "type")) {
-				info->def_crypt_type = get_crypt_type(att->value);
-			}
-		}
-		return;
-	}
-	if (!strcmp(node_name, "CrypTrack")) {
-		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"));
-			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;
-		gf_list_add(info->tcis, tkc);
-
-		if (!strcmp(node_name, "OMATrack")) {
-			tkc->enc_type = 1;
-			/*default to AES 128 in OMA*/
-			tkc->encryption = 2;
-		}
-
-		for (i=0; i<nb_attributes; i++) {
-			att = (GF_XMLAttribute *) &attributes[i];
-			if (!stricmp(att->name, "trackID") || !stricmp(att->name, "ID")) {
-				if (!strcmp(att->value, "*")) info->has_common_key = 1;
-				else {
-					tkc->trackID = atoi(att->value);
-					has_common_key = GF_FALSE;
-				}
-			}
-			else if (!stricmp(att->name, "type")) {
-				tkc->scheme_type = get_crypt_type(att->value);
-			}
-			else if (!stricmp(att->name, "key")) {
-				GF_Err e = gf_bin128_parse(att->value, tkc->key);
-                if (e != GF_OK) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value in CrypTrack\n"));
-                    info->parse_error = e;
-                    return;
-                }
-			}
-			else if (!stricmp(att->name, "salt")) {
-				u32 len, j;
-				char *sKey = att->value;
-				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
-				len = (u32) strlen(sKey);
-				for (j=0; j<len; j+=2) {
-					char szV[5];
-					u32 v;
-					sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
-					sscanf(szV, "%x", &v);
-					tkc->salt[j/2] = v;
-				}
-			}
-			else if (!stricmp(att->name, "kms_URI")) strcpy(tkc->KMS_URI, att->value);
-			else if (!stricmp(att->name, "rightsIssuerURL")) strcpy(tkc->KMS_URI, att->value);
-			else if (!stricmp(att->name, "scheme_URI")) strcpy(tkc->Scheme_URI, att->value);
-			else if (!stricmp(att->name, "selectiveType")) {
-				if (!stricmp(att->value, "Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAP;
-				else if (!stricmp(att->value, "Non-Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_NON_RAP;
-				else if (!stricmp(att->value, "Rand")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAND;
-				else if (!strnicmp(att->value, "Rand", 4)) {
-					tkc->sel_enc_type = GF_CRYPT_SELENC_RAND_RANGE;
-					tkc->sel_enc_range = atoi(&att->value[4]);
-				}
-				else if (sscanf(att->value, "%u", &tkc->sel_enc_range)==1) {
-					if (tkc->sel_enc_range==1) tkc->sel_enc_range = 0;
-					else tkc->sel_enc_type = GF_CRYPT_SELENC_RANGE;
-				}
-				else if (!strnicmp(att->value, "Preview", 7)) {
-					tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
-				}
-				else if (!strnicmp(att->value, "Clear", 5)) {
-					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR;
-				}
-				else if (!strnicmp(att->value, "ForceClear", 10)) {
-					char *sep = strchr(att->value, '=');
-					if (sep) tkc->sel_enc_range = atoi(sep+1);
-					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR_FORCED;
-				}
-			}
-			else if (!stricmp(att->name, "forceType")) {
-				tkc->force_type = GF_TRUE;
-			}
-			else if (!stricmp(att->name, "Preview")) {
-				tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
-				sscanf(att->value, "%u", &tkc->sel_enc_range);
-			}
-			else if (!stricmp(att->name, "ipmpType")) {
-				if (!stricmp(att->value, "None")) tkc->ipmp_type = 0;
-				else if (!stricmp(att->value, "IPMP")) tkc->sel_enc_type = 1;
-				else if (!stricmp(att->value, "IPMPX")) tkc->sel_enc_type = 2;
-			}
-			else if (!stricmp(att->name, "ipmpDescriptorID")) tkc->ipmp_desc_id = atoi(att->value);
-			else if (!stricmp(att->name, "encryptionMethod")) {
-				if (!strcmp(att->value, "AES_128_CBC")) tkc->encryption = 1;
-				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 if (!stricmp(att->name, "contentID")) strcpy(tkc->Scheme_URI, att->value);
-			else if (!stricmp(att->name, "rightsIssuerURL")) strcpy(tkc->KMS_URI, att->value);
-			else if (!stricmp(att->name, "transactionID")) {
-				if (strlen(att->value)<=16) strcpy(tkc->TransactionID, att->value);
-			}
-			else if (!stricmp(att->name, "textualHeaders")) {
-			}
-			/*CENC extensions*/
-			else if (!stricmp(att->name, "IsEncrypted")) {
-				if (!stricmp(att->value, "1"))
-					tkc->IsEncrypted = 1;
-				else
-					tkc->IsEncrypted = 0;
-			}
-			else if (!stricmp(att->name, "IV_size")) {
-				tkc->IV_size = atoi(att->value);
-			}
-			else if (!stricmp(att->name, "first_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->first_IV[j/2] = v;
-					}
-					if (!tkc->IV_size) tkc->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 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 (!stricmp(att->name, "metadata")) {
-				tkc->metadata_len = gf_base64_encode(att->value, (u32) strlen(att->value), tkc->metadata, 5000);
-				tkc->metadata[tkc->metadata_len] = 0;
-			}
-			else if (!stricmp(att->name, "crypt_byte_block")) {
-				tkc->crypt_byte_block = atoi(att->value);
-			}
-			else if (!stricmp(att->name, "skip_byte_block")) {
-				tkc->skip_byte_block = atoi(att->value);
-			}
-			else if (!stricmp(att->name, "clear_bytes")) {
-				tkc->clear_bytes = atoi(att->value);
-			}
-			else if (!stricmp(att->name, "constant_IV_size")) {
-				tkc->constant_IV_size = atoi(att->value);
-				if (tkc->constant_IV_size != 8 && tkc->constant_IV_size != 16) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong given constant IV size %d, should be 8 or 16\n", tkc->constant_IV_size));
-				}
-			}
-			else if (!stricmp(att->name, "constant_IV")) {
-				char *sKey = att->value;
-				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
-				if (!tkc->constant_IV_size) {
-					tkc->constant_IV_size = (u8) strlen(sKey) / 2;
-				} else {
-					u8 expected_size = (u8) strlen(sKey) / 2;
-					if (tkc->constant_IV_size != expected_size) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Mismatch between given constant_IV_size %d and constant_IV length %d\n", tkc->constant_IV_size, expected_size));
-					}
-				}
-				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->constant_IV[j/2] = v;
-					}
-				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong constant IV value size %d, should be 16 or 32\n", strlen(sKey)));
-				}
-			}
-			else if (!stricmp(att->name, "encryptSliceHeader")) {
-				tkc->allow_encrypted_slice_header = !strcmp(att->value, "yes") ? GF_TRUE : GF_FALSE;
-			}
-			else if (!stricmp(att->name, "blockAlign")) {
-				if (!strcmp(att->value, "disable")) tkc->block_align = 1;
-				else if (!strcmp(att->value, "always")) tkc->block_align = 2;
-				else tkc->block_align = 0;
-			}
-		}
-
-		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_ERROR, GF_LOG_AUTHOR, ("[CENC] wrong IV size %d for AES-128, using 16\n", (u32) tkc->IV_size));
-			tkc->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_ERROR, 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) ));
-				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_ERROR, 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;
-				} else {
-					tkc->constant_IV_size = 0;
-					memset(tkc->constant_IV, 0, 16);
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using scheme type %s, constant IV shall not be used, ignoring\n", gf_4cc_to_str(tkc->scheme_type)));
-				}
-			}
-		}
-	}
-
-	if (!strcmp(node_name, "key")) {
-		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));
-
-		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]);
-                if (e != GF_OK) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse KID\n"));
-                    info->parse_error = e;
-                    return;
-                }
-			}
-			else if (!stricmp(att->name, "value")) {
-				GF_Err e = gf_bin128_parse(att->value, tkc->keys[tkc->KID_count]);
-                if (e != GF_OK) {
-                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value\n"));
-                    info->parse_error = e;
-                    return;
-                }
-			}
-		}
-		tkc->KID_count++;
-	}
-}
-
-void isma_ea_node_end(void *sax_cbck, const char *node_name, const char *name_space)
-{
-	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
-	if (!strcmp(node_name, "OMATextHeader")) {
-		info->in_text_header = 0;
-		return;
-	}
-}
-
-void isma_ea_text(void *sax_cbck, const char *text, Bool is_cdata)
-{
-	u32 len;
-	GF_TrackCryptInfo *tkc;
-	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
-
-	if (!info->in_text_header) return;
-
-	tkc = (GF_TrackCryptInfo *) gf_list_last(info->tcis);
-	len = (u32) strlen(text);
-	if (len+tkc->TextualHeadersLen > 5000) return;
-
-	if (tkc->TextualHeadersLen) {
-		tkc->TextualHeadersLen ++;
-		tkc->TextualHeaders[tkc->TextualHeadersLen] = 0;
-	}
-
-	memcpy(tkc->TextualHeaders + tkc->TextualHeadersLen, text, sizeof(char)*len);
-	tkc->TextualHeadersLen += len;
-	tkc->TextualHeaders[tkc->TextualHeadersLen] = 0;
-}
-
-static void del_crypt_info(GF_CryptInfo *info)
-{
-	while (gf_list_count(info->tcis)) {
-		GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
-		if (tci->KIDs) gf_free(tci->KIDs);
-		if (tci->keys) gf_free(tci->keys);
-		gf_list_rem_last(info->tcis);
-		gf_free(tci);
-	}
-	gf_list_del(info->tcis);
-	gf_free(info);
-}
-
-static GF_CryptInfo *load_crypt_file(const char *file)
-{
-	GF_Err e;
-	GF_CryptInfo *info;
-	GF_SAXParser *sax;
-	GF_SAFEALLOC(info, GF_CryptInfo);
-	if (!info) return NULL;
-	info->tcis = gf_list_new();
-	sax = gf_xml_sax_new(isma_ea_node_start, isma_ea_node_end, isma_ea_text, info);
-	e = gf_xml_sax_parse_file(sax, file, NULL);
-	gf_xml_sax_del(sax);
-	if (e>=0) e = info->parse_error;
-	if (e<0) {
-		del_crypt_info(info);
-		return NULL;
-	}
-	return info;
-}
-
-
-GF_EXPORT
-GF_Err gf_ismacryp_gpac_get_info(u32 stream_id, char *drm_file, char *key, char *salt)
-{
-	GF_Err e;
-	u32 i, count;
-	GF_CryptInfo *info;
-	GF_TrackCryptInfo *tci;
-
-	e = GF_OK;
-	info = load_crypt_file(drm_file);
-	if (!info) return GF_NOT_SUPPORTED;
-	count = gf_list_count(info->tcis);
-	for (i=0; i<count; i++) {
-		tci = (GF_TrackCryptInfo *) gf_list_get(info->tcis, i);
-		if ((info->has_common_key && !tci->trackID) || (tci->trackID == stream_id) ) {
-			memcpy(key, tci->key, sizeof(char)*16);
-			memcpy(salt, tci->salt, sizeof(char)*8);
-			e = GF_OK;
-			break;
-		}
-	}
-	del_crypt_info(info);
-	return e;
-}
-
-GF_EXPORT
-Bool gf_ismacryp_mpeg4ip_get_info(char *kms_uri, char *key, char *salt)
-{
-	char szPath[1024], catKey[24];
-	u32 i, x;
-	Bool got_it;
-	FILE *kms;
-	strcpy(szPath, getenv("HOME"));
-	strcat(szPath , "/.kms_data");
-	got_it = 0;
-	kms = gf_fopen(szPath, "r");
-	while (kms && !feof(kms)) {
-		if (!fgets(szPath, 1024, kms)) break;
-		szPath[strlen(szPath) - 1] = 0;
-		if (stricmp(szPath, kms_uri)) continue;
-		for (i=0; i<24; i++) {
-			if (!fscanf(kms, "%x", &x)) break;
-			catKey[i] = x;
-		}
-		if (i==24) got_it = 1;
-		break;
-	}
-	if (kms) gf_fclose(kms);
-	if (got_it) {
-		/*watchout, MPEG4IP stores SALT|KEY, NOT KEY|SALT*/
-		memcpy(key, catKey+8, sizeof(char)*16);
-		memcpy(salt, catKey, sizeof(char)*8);
-		return 1;
-	}
-	return 0;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-/*ISMACrypt*/
-
-static GFINLINE void isma_resync_IV(GF_Crypt *mc, u64 BSO, char *salt)
-{
-	char IV[17];
-	u64 count;
-	u32 remain;
-	GF_BitStream *bs;
-	count = BSO / 16;
-	remain = (u32) (BSO % 16);
-
-	/*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, salt, 8);
-	gf_bs_write_u64(bs, (s64) count);
-	gf_bs_del(bs);
-	gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE+1);
-
-	/*decrypt remain bytes*/
-	if (remain) {
-		char dummy[20];
-		gf_crypt_decrypt(mc, dummy, remain);
-	}
-}
-
-GF_EXPORT
-GF_Err gf_ismacryp_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	GF_Err e;
-	Bool use_sel_enc;
-	u32 track, count, i, j, si, otype, is_nalu;
-	GF_ISOSample *samp;
-	GF_ISMASample *ismasamp;
-	GF_Crypt *mc;
-	unsigned char IV[17];
-	u32 IV_size;
-	Bool prev_sample_encrypted;
-	GF_ESD *esd;
-
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	e = gf_isom_get_ismacryp_info(mp4, track, 1, &otype, NULL, NULL, NULL, NULL, &use_sel_enc, &IV_size, NULL);
-	if (e) return e;
-	is_nalu = ((otype==GF_ISOM_BOX_TYPE_264B) || (otype==GF_ISOM_BOX_TYPE_265B)) ? 1 : 0;
-
-
-	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 cryptography\n", tci->trackID));
-		return GF_IO_ERR;
-	}
-
-	memset(IV, 0, sizeof(char)*16);
-	memcpy(IV, tci->salt, sizeof(char)*8);
-	e = gf_crypt_init(mc, tci->key, IV);
-	if (e) {
-		gf_crypt_close(mc);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)));
-		return GF_IO_ERR;
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] Decrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, use_sel_enc ? " - Selective Decryption" : ""));
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	/*start as initialized*/
-	prev_sample_encrypted = 1;
-	/* decrypt each sample */
-	count = gf_isom_get_sample_count(mp4, track);
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		samp = gf_isom_get_sample(mp4, track, i+1, &si);
-		ismasamp = gf_isom_get_ismacryp_sample(mp4, track, samp, si);
-
-		gf_free(samp->data);
-		samp->data = (char *)gf_malloc(ismasamp->dataLength);
-		memmove(samp->data, ismasamp->data, ismasamp->dataLength);
-		samp->dataLength = ismasamp->dataLength;
-
-		/* Decrypt payload */
-		if (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
-			/*restore IV*/
-			if (!prev_sample_encrypted) isma_resync_IV(mc, ismasamp->IV, (char *) tci->salt);
-			gf_crypt_decrypt(mc, samp->data, samp->dataLength);
-		}
-		prev_sample_encrypted = (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED);
-		gf_isom_ismacryp_delete_sample(ismasamp);
-
-		/*replace AVC start codes (0x00000001) by nalu size*/
-		if (is_nalu) {
-			u32 nalu_size;
-			u32 remain = samp->dataLength;
-			char *start, *end;
-			start = samp->data;
-			end = start + 4;
-			while (remain>4) {
-				if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
-					nalu_size = (u32) (end - start - 4);
-					start[0] = (nalu_size>>24)&0xFF;
-					start[1] = (nalu_size>>16)&0xFF;
-					start[2] = (nalu_size>>8)&0xFF;
-					start[3] = (nalu_size)&0xFF;
-					start = end;
-					end = start+4;
-					remain -= 4;
-					continue;
-				}
-				end++;
-				remain--;
-			}
-			nalu_size = (u32) (end - start - 4);
-			start[0] = (nalu_size>>24)&0xFF;
-			start[1] = (nalu_size>>16)&0xFF;
-			start[2] = (nalu_size>>8)&0xFF;
-			start[3] = (nalu_size)&0xFF;
-		}
-
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_isom_sample_del(&samp);
-		gf_set_progress("ISMA Decrypt", i+1, count);
-	}
-
-	gf_crypt_close(mc);
-	/*and remove protection info*/
-	e = gf_isom_remove_track_protection(mp4, track, 1);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Error ISMACryp signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
-	}
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-
-	/*remove all IPMP ptrs*/
-	esd = gf_isom_get_esd(mp4, track, 1);
-	if (esd) {
-		while (gf_list_count(esd->IPMPDescriptorPointers)) {
-			GF_Descriptor *d = (GF_Descriptor *)gf_list_get(esd->IPMPDescriptorPointers, 0);
-			gf_list_rem(esd->IPMPDescriptorPointers, 0);
-			gf_odf_desc_del(d);
-		}
-		gf_isom_change_mpeg4_description(mp4, track, 1, esd);
-		gf_odf_desc_del((GF_Descriptor *)esd);
-	}
-
-	gf_media_update_bitrate(mp4, track);
-
-	/*update OD track if any*/
-	for (i=0; i<gf_isom_get_track_count(mp4); i++) {
-		GF_ODCodec *cod;
-		if (gf_isom_get_media_type(mp4, i+1) != GF_ISOM_MEDIA_OD) continue;
-
-		/*remove all IPMPUpdate commads...*/
-		samp = gf_isom_get_sample(mp4, i+1, 1, &si);
-		cod = gf_odf_codec_new();
-		gf_odf_codec_set_au(cod, samp->data, samp->dataLength);
-		gf_odf_codec_decode(cod);
-		for (j=0; j<gf_list_count(cod->CommandList); j++) {
-			GF_IPMPUpdate *com = (GF_IPMPUpdate *)gf_list_get(cod->CommandList, j);
-			if (com->tag != GF_ODF_IPMP_UPDATE_TAG) continue;
-			gf_list_rem(cod->CommandList, j);
-			j--;
-			gf_odf_com_del((GF_ODCom **)&com);
-		}
-		gf_free(samp->data);
-		samp->data = NULL;
-		samp->dataLength = 0;
-		gf_odf_codec_encode(cod, 1);
-		gf_odf_codec_get_au(cod, &samp->data, &samp->dataLength);
-		gf_odf_codec_del(cod);
-		gf_isom_update_sample(mp4, i+1, 1, samp, 1);
-		gf_isom_sample_del(&samp);
-
-		/*remove IPMPToolList if any*/
-		gf_isom_ipmpx_remove_tool_list(mp4);
-		break;
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_ismacryp_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	char IV[16];
-	GF_ISOSample *samp;
-	GF_ISMASample *isamp;
-	GF_Crypt *mc;
-	u32 i, count, di, track, IV_size, rand, avc_size_length, hevc_size_length;
-	u64 BSO, range_end;
-	GF_ESD *esd;
-	GF_IPMPPtr *ipmpdp;
-	GF_IPMP_Descriptor *ipmpd;
-	GF_IPMPUpdate *ipmpdU;
-#ifndef GPAC_MINIMAL_ODF
-	GF_IPMPX_ISMACryp *ismac;
-#endif
-	GF_Err e;
-	Bool prev_sample_encryped, has_crypted_samp;
-
-	avc_size_length = hevc_size_length = 0;
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
-		return GF_OK;
-	}
-	esd = gf_isom_get_esd(mp4, track, 1);
-	if (esd && (esd->decoderConfig->streamType==GF_STREAM_OD)) {
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt OD tracks - skipping"));
-		return GF_NOT_SUPPORTED;
-	}
-	if (esd) {
-		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) avc_size_length = 1;
-		else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC)) hevc_size_length = 1;
-		gf_odf_desc_del((GF_Descriptor*) esd);
-	}
-	if (avc_size_length) {
-		GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track, 1);
-		avc_size_length = avccfg->nal_unit_size;
-		gf_odf_avc_cfg_del(avccfg);
-		if (avc_size_length != 4) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt AVC/H264 track with %d size_length field - only 4 supported\n", avc_size_length));
-			return GF_NOT_SUPPORTED;
-		}
-	}
-	if (hevc_size_length) {
-		GF_HEVCConfig *hvccfg = gf_isom_hevc_config_get(mp4, track, 1);
-		avc_size_length = hvccfg->nal_unit_size;
-		gf_odf_hevc_cfg_del(hvccfg);
-		if (avc_size_length != 4) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt HEVC/H265 track with %d size_length field - only 4 supported\n", avc_size_length));
-			return GF_NOT_SUPPORTED;
-		}
-	}
-
-	if (!tci->enc_type && !strlen(tci->Scheme_URI)) strcpy(tci->Scheme_URI, "urn:gpac:isma:encryption_scheme");
-
-	if (!gf_isom_has_sync_points(mp4, track) &&
-	        ((tci->sel_enc_type==GF_CRYPT_SELENC_RAP) || (tci->sel_enc_type==GF_CRYPT_SELENC_NON_RAP)) ) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] All samples in trackID %d are random access - disabling selective encryption\n", tci->trackID));
-		tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
-	}
-	else if ((tci->sel_enc_type==GF_CRYPT_SELENC_RAND) || (tci->sel_enc_type==GF_CRYPT_SELENC_RAND_RANGE)) {
-		gf_rand_init(1);
-	}
-
-	BSO = gf_isom_get_media_data_size(mp4, track);
-	if (tci->enc_type==0) {
-		if (BSO<0xFFFF) IV_size = 2;
-		else if (BSO<0xFFFFFFFF) IV_size = 4;
-		else IV_size = 8;
-	} else {
-		/*128 bit IV in OMA*/
-		IV_size = 16;
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] Encrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, tci->sel_enc_type ? " - Selective Encryption" : ""));
-
-	/*init crypto*/
-	memset(IV, 0, sizeof(char)*16);
-	memcpy(IV, tci->salt, sizeof(char)*8);
-	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;
-	}
-	e = gf_crypt_init(mc, tci->key, IV);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
-		gf_crypt_close(mc);
-		return GF_IO_ERR;
-	}
-	if (!stricmp(tci->KMS_URI, "self")) {
-		char Data[100], d64[100];
-		u32 s64;
-		memcpy(Data, tci->key, sizeof(char)*16);
-		memcpy(Data+16, tci->salt, sizeof(char)*8);
-		s64 = gf_base64_encode(Data, 24, d64, 100);
-		d64[s64] = 0;
-		strcpy(tci->KMS_URI, "(key)");
-		strcat(tci->KMS_URI, d64);
-	}
-
-	/*create ISMA protection*/
-	if (tci->enc_type==0) {
-		e = gf_isom_set_ismacryp_protection(mp4, track, 1, GF_ISOM_ISMACRYP_SCHEME, 1,
-		                                    tci->Scheme_URI, tci->KMS_URI, (tci->sel_enc_type!=0) ? 1 : 0, 0, IV_size);
-	} else {
-		if ((tci->sel_enc_type==GF_CRYPT_SELENC_PREVIEW) && tci->sel_enc_range) {
-			char *szPreview = tci->TextualHeaders + tci->TextualHeadersLen;
-			sprintf(szPreview, "PreviewRange:%d", tci->sel_enc_range);
-			tci->TextualHeadersLen += (u32) strlen(szPreview)+1;
-		}
-		e = gf_isom_set_oma_protection(mp4, track, 1,
-		                               strlen(tci->Scheme_URI) ? tci->Scheme_URI : NULL,
-		                               tci->KMS_URI,
-		                               tci->encryption, BSO,
-		                               tci->TextualHeadersLen ? tci->TextualHeaders : NULL,
-		                               tci->TextualHeadersLen,
-		                               (tci->sel_enc_type!=0) ? 1 : 0, 0, IV_size);
-	}
-	if (e) return e;
-
-	has_crypted_samp = 0;
-	BSO = 0;
-	prev_sample_encryped = 1;
-	range_end = 0;
-	if (tci->sel_enc_type==GF_CRYPT_SELENC_PREVIEW) {
-		range_end = gf_isom_get_media_timescale(mp4, track) * tci->sel_enc_range;
-	}
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	count = gf_isom_get_sample_count(mp4, track);
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		samp = gf_isom_get_sample(mp4, track, i+1, &di);
-
-		isamp = gf_isom_ismacryp_new_sample();
-		isamp->IV_length = IV_size;
-		isamp->KI_length = 0;
-
-		switch (tci->sel_enc_type) {
-		case GF_CRYPT_SELENC_RAP:
-			if (!samp->IsRAP)
-				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
-			if (samp->IsRAP) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		case GF_CRYPT_SELENC_NON_RAP:
-			if (!samp->IsRAP) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		/*random*/
-		case GF_CRYPT_SELENC_RAND:
-			rand = gf_rand();
-			if (rand%2) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		/*random every sel_freq samples*/
-		case GF_CRYPT_SELENC_RAND_RANGE:
-			if (!(i%tci->sel_enc_range)) has_crypted_samp = 0;
-			if (!has_crypted_samp) {
-				rand = gf_rand();
-				if (!(rand%tci->sel_enc_range)) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-
-				if (!(isamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) && !( (1+i)%tci->sel_enc_range)) {
-					isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-				}
-				has_crypted_samp = (isamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED);
-			}
-			break;
-		/*every sel_freq samples*/
-		case GF_CRYPT_SELENC_RANGE:
-			if (!(i%tci->sel_enc_type)) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		case GF_CRYPT_SELENC_PREVIEW:
-			if (samp->DTS + samp->CTS_Offset >= range_end)
-				isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		case 0:
-			isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
-			break;
-		default:
-			break;
-		}
-		if (tci->sel_enc_type) isamp->flags |= GF_ISOM_ISMA_USE_SEL_ENC;
-
-		/*isma e&a stores AVC1 in AVC/H264 annex B bitstream fashion, with 0x00000001 start codes*/
-		if (avc_size_length) {
-			u32 done = 0;
-			u8 *d = (u8*)samp->data;
-			while (done < samp->dataLength) {
-				u32 nal_size = GF_4CC(d[0], d[1], d[2], d[3]);
-				d[0] = d[1] = d[2] = 0;
-				d[3] = 1;
-				d += 4 + nal_size;
-				done += 4 + nal_size;
-			}
-		}
-
-		if (isamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
-			/*resync IV*/
-			if (!prev_sample_encryped) isma_resync_IV(mc, BSO, (char *) tci->salt);
-			gf_crypt_encrypt(mc, samp->data, samp->dataLength);
-			prev_sample_encryped = 1;
-		} else {
-			prev_sample_encryped = 0;
-		}
-
-
-		isamp->IV = BSO;
-		BSO += samp->dataLength;
-		isamp->data = samp->data;
-		isamp->dataLength = samp->dataLength;
-		samp->data = NULL;
-		samp->dataLength = 0;
-
-		gf_isom_ismacryp_sample_to_sample(isamp, samp);
-		gf_isom_ismacryp_delete_sample(isamp);
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_isom_sample_del(&samp);
-		gf_set_progress("ISMA Encrypt", i+1, count);
-	}
-	gf_crypt_close(mc);
-
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-	gf_media_update_bitrate(mp4, track);
-
-
-	/*format as IPMP(X) - note that the ISMACryp spec is broken since it always uses IPMPPointers to a
-	single desc which would assume the same protection (eg key & salt) for all streams using it...*/
-	if (!tci->ipmp_type) return GF_OK;
-
-	ipmpdp = (GF_IPMPPtr*)gf_odf_desc_new(GF_ODF_IPMP_PTR_TAG);
-	if (!tci->ipmp_desc_id) tci->ipmp_desc_id = track;
-	if (tci->ipmp_type==2) {
-		ipmpdp->IPMP_DescriptorID = 0xFF;
-		ipmpdp->IPMP_DescriptorIDEx = tci->ipmp_desc_id;
-	} else {
-		ipmpdp->IPMP_DescriptorID = tci->ipmp_desc_id;
-	}
-	gf_isom_add_desc_to_description(mp4, track, 1, (GF_Descriptor *)ipmpdp);
-	gf_odf_desc_del((GF_Descriptor*)ipmpdp);
-
-	ipmpdU = (GF_IPMPUpdate*)gf_odf_com_new(GF_ODF_IPMP_UPDATE_TAG);
-	/*format IPMPD*/
-	ipmpd = (GF_IPMP_Descriptor*)gf_odf_desc_new(GF_ODF_IPMP_TAG);
-	if (tci->ipmp_type==2) {
-#ifndef GPAC_MINIMAL_ODF
-		ipmpd->IPMP_DescriptorID = 0xFF;
-		ipmpd->IPMP_DescriptorIDEx = tci->ipmp_desc_id;
-		ipmpd->IPMPS_Type = 0xFFFF;
-		ipmpd->IPMP_ToolID[14] = 0x49;
-		ipmpd->IPMP_ToolID[15] = 0x53;
-		ipmpd->control_point = 1;
-		ipmpd->cp_sequence_code = 0x80;
-		/*format IPMPXData*/
-		ismac = (GF_IPMPX_ISMACryp *) gf_ipmpx_data_new(GF_IPMPX_ISMACRYP_TAG);
-		ismac->cryptoSuite = 1;	/*default ISMA AESCTR128*/
-		ismac->IV_length = IV_size;
-		ismac->key_indicator_length = 0;
-		ismac->use_selective_encryption = (tci->sel_enc_type!=0)? 1 : 0;
-		gf_list_add(ipmpd->ipmpx_data, ismac);
-#endif
-	} else {
-		ipmpd->IPMP_DescriptorID = tci->ipmp_desc_id;
-	}
-	gf_list_add(ipmpdU->IPMPDescList, ipmpd);
-
-	for (i=0; i<gf_isom_get_track_count(mp4); i++) {
-		GF_ODCodec *cod;
-		if (gf_isom_get_media_type(mp4, i+1) != GF_ISOM_MEDIA_OD) continue;
-
-		/*add com*/
-		samp = gf_isom_get_sample(mp4, i+1, 1, &di);
-		cod = gf_odf_codec_new();
-		gf_odf_codec_set_au(cod, samp->data, samp->dataLength);
-		gf_odf_codec_decode(cod);
-		gf_odf_codec_add_com(cod, (GF_ODCom *) ipmpdU);
-		gf_free(samp->data);
-		samp->data = NULL;
-		samp->dataLength = 0;
-		gf_odf_codec_encode(cod, 1);
-		gf_odf_codec_get_au(cod, &samp->data, &samp->dataLength);
-		ipmpdU = NULL;
-		gf_odf_codec_del(cod);
-		gf_isom_update_sample(mp4, i+1, 1, samp, 1);
-		gf_isom_sample_del(&samp);
-
-		if (tci->ipmp_type==2) {
-			GF_IPMP_ToolList*ipmptl = (GF_IPMP_ToolList*)gf_odf_desc_new(GF_ODF_IPMP_TL_TAG);
-			GF_IPMP_Tool *ipmpt = (GF_IPMP_Tool*)gf_odf_desc_new(GF_ODF_IPMP_TOOL_TAG);
-			gf_list_add(ipmptl->ipmp_tools, ipmpt);
-			ipmpt->IPMP_ToolID[14] = 0x49;
-			ipmpt->IPMP_ToolID[15] = 0x53;
-			gf_isom_add_desc_to_root_od(mp4, (GF_Descriptor *)ipmptl);
-			gf_odf_desc_del((GF_Descriptor *)ipmptl);
-		}
-		break;
-	}
-	return e;
-}
-
-/*Common Encryption*/
-static void increase_counter(char *x, int x_size) {
-	register int i, y=0;
-
-	for (i=x_size-1; i>=0; i--) {
-		y = 0;
-		if ((u8) x[i] == 0xFF) {
-			x[i] = 0;
-			y = 1;
-		} else x[i]++;
-
-		if (y==0) break;
-	}
-
-	return;
-}
-
-static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u8 IV_size)
-{
-	char next_IV[17];
-	u32 size = 17;
-
-	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 beginning 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 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
-		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.
-
-		NOTE 4: Since CENC forces declaration of a unique, potentially random, IV per sample, we could increase the IV counter at each sample start
-		but this is currently not done
-	*/
-	if (IV_size == 8) {
-		/*cf note 2*/
-		increase_counter(&next_IV[1], IV_size);
-		next_IV[0] = 0;
-		/*cf note 3*/
-		memset(&next_IV[9], 0, 8*sizeof(char));
-	} else if (next_IV[0]) {
-		/*cf note 1*/
-		increase_counter(&next_IV[1], IV_size);
-		next_IV[0] = 0;
-	}
-
-	gf_crypt_set_IV(mc, next_IV, size);
-
-	memset(IV, 0, 16*sizeof(char));
-	memcpy(IV, next_IV+1, 16*sizeof(char));
-}
-
-//parses slice header and returns its size
-static u32 gf_cenc_get_clear_bytes(GF_TrackCryptInfo *tci, GF_BitStream *plaintext_bs, char *samp_data, u32 nal_size, u32 bytes_in_nalhr)
-{
-	u32 clear_bytes = 0;
-	if (tci->slice_header_clear) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		u32 nal_start = (u32) gf_bs_get_position(plaintext_bs);
-		if (tci->is_avc) {
-			s32 ret;
-			u32 ntype, nhdr, nb_epb_count;
-			GF_BitStream *bs = NULL;
-			char *epb_rem_bytes;
-
-			//check if we have EP bytes in the payload (they could be in slice header)
-			nb_epb_count = gf_media_nalu_emulation_bytes_remove_count(samp_data + nal_start, nal_size);
-			if (nb_epb_count) {
-				epb_rem_bytes = gf_malloc(sizeof(char) * nal_size);
-				nb_epb_count = gf_media_nalu_remove_emulation_bytes(samp_data + nal_start, epb_rem_bytes, nal_size);
-				bs = gf_bs_new(epb_rem_bytes, nb_epb_count, GF_BITSTREAM_READ);
-			}
-			nhdr = gf_bs_read_u8(bs ? bs : plaintext_bs);
-
-			ntype = nhdr & 0x1F;
-			switch (ntype) {
-			case GF_AVC_NALU_NON_IDR_SLICE:
-			case GF_AVC_NALU_DP_A_SLICE:
-			case GF_AVC_NALU_DP_B_SLICE:
-			case GF_AVC_NALU_DP_C_SLICE:
-			case GF_AVC_NALU_IDR_SLICE:
-			case GF_AVC_NALU_SLICE_AUX:
-			case GF_AVC_NALU_SVC_SLICE:
-				ret = gf_media_avc_parse_nalu(bs ? bs : plaintext_bs, nhdr, &tci->avc);
-				if (ret<0) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error parsing slice header, cannot get slice header size. Assuming 8 bytes is enough, but resulting file will not be compliant\n"));
-					clear_bytes = 8;
-				} else {
-					//skip bits till alignment
-					gf_bs_align(bs ? bs : plaintext_bs);
-					if (bs) {
-						clear_bytes = (u32) gf_bs_get_position(bs);
-					} else {
-						clear_bytes = (u32) gf_bs_get_position(plaintext_bs) - nal_start;
-					}
-				}
-				break;
-			case GF_AVC_NALU_SEQ_PARAM:
-				gf_media_avc_read_sps(samp_data + nal_start, nal_size, &tci->avc, 0, NULL);
-				clear_bytes = nal_size;
-				break;
-			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-				gf_media_avc_read_sps(samp_data + nal_start, nal_size, &tci->avc, 1, NULL);
-				clear_bytes = nal_size;
-				break;
-			case GF_AVC_NALU_PIC_PARAM:
-				gf_media_avc_read_pps(samp_data + nal_start, nal_size, &tci->avc);
-				clear_bytes = nal_size;
-				break;
-
-			default:
-				clear_bytes = nal_size;
-				break;
-			}
-			if (bs) {
-				gf_bs_del(bs);
-				gf_free(epb_rem_bytes);
-
-				//check if we have EP bytes in slice header
-				if (clear_bytes < nal_size) {
-					nb_epb_count = gf_media_nalu_emulation_bytes_remove_count(samp_data + nal_start, clear_bytes);
-					if (nb_epb_count)
-						clear_bytes += nb_epb_count;
-				}
-			}
-		} else {
-#if !defined(GPAC_DISABLE_HEVC)
-			u8 ntype, ntid, nlid;
-			u32 nal_start = (u32) gf_bs_get_position(plaintext_bs);
-			tci->hevc.full_slice_header_parse = GF_TRUE;
-			gf_media_hevc_parse_nalu (samp_data + nal_start, nal_size, &tci->hevc, &ntype, &ntid, &nlid);
-			if (ntype<=GF_HEVC_NALU_SLICE_CRA) {
-				clear_bytes = tci->hevc.s_info.payload_start_offset;
-			} else {
-				clear_bytes = nal_size;
-			}
-		}
-		gf_bs_seek(plaintext_bs, nal_start);
-#endif
-
-#else
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] AV parsers disabled, cannot get slice header size. Assuming 8 bytes is enough, but resulting file will not be compliant\n"));
-		clear_bytes = 8;
-#endif //GPAC_DISABLE_AV_PARSERS
-
-	} else {
-		clear_bytes = bytes_in_nalhr;
-	}
-	return clear_bytes;
-}
-
-typedef enum {
-	ENC_FULL_SAMPLE,
-
-	/*below types may have several ranges (clear/encrypted) per sample*/
-	ENC_NALU, /*NALU-based*/
-	ENC_OBU,  /*OBU-based*/
-	ENC_VP9,  /*custom, see https://www.webmproject.org/vp9/mp4/*/
-} GF_Enc_BsFmt;
-
-static GF_Err gf_cenc_encrypt_sample_ctr(GF_Crypt *mc, GF_TrackCryptInfo *tci, GF_ISOSample *samp, GF_Enc_BsFmt bs_type, u32 nalu_size_length_in_bytes, char IV[16], u32 IV_size, char **sai, u32 *saiz,
-										 u32 bytes_in_nalhr, u8 crypt_byte_block, u8 skip_byte_block)
-{
-	GF_BitStream *plaintext_bs = NULL, *cyphertext_bs, *sai_bs = NULL;
-	GF_CENCSubSampleEntry *prev_entry = NULL;
-	char *buffer;
-	u32 max_size_in_bytes, unit_size = 0;
-	GF_Err e = GF_OK;
-	GF_List *subsamples = NULL;
-
-	plaintext_bs = cyphertext_bs = sai_bs = NULL;
-	max_size_in_bytes = 4096;
-	buffer = (char*)gf_malloc(sizeof(char) * max_size_in_bytes);
-	memset(buffer, 0, max_size_in_bytes);
-	plaintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
-	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_data(sai_bs, IV, IV_size);
-	subsamples = gf_list_new();
-	if (!subsamples) {
-		e = GF_IO_ERR;
-		goto exit;
-	}
-	if ((bs_type == ENC_OBU) || (bs_type == ENC_VP9))
-		nalu_size_length_in_bytes = 0;
-
-	while (gf_bs_available(plaintext_bs)) {
-		if (bs_type != ENC_FULL_SAMPLE) {
-			u32 clear_bytes = 0;
-			u32 range_idx = 0;
-			struct {
-				int clear, encrypted;
-			} ranges[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
-			u32 nb_ranges=1;
-
-			switch(bs_type) {
-			case ENC_NALU:
-				unit_size = gf_bs_read_int(plaintext_bs, 8*nalu_size_length_in_bytes);
-				if (unit_size == 0) {
-					continue;
-				}
-				if (unit_size > gf_bs_available(plaintext_bs) ) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] NAL size %u larger than bytes remaining in sample\n", unit_size ));
-					e = GF_NON_COMPLIANT_BITSTREAM;
-					goto exit;
-				}
-
-	 			clear_bytes = gf_cenc_get_clear_bytes(tci, plaintext_bs, samp->data, unit_size, bytes_in_nalhr);
-				break;
-			case ENC_OBU: {
-				ObuType obut;
-				u64 pos, obu_size;
-				u32 hdr_size, i;
-
-				pos = gf_bs_get_position(plaintext_bs);
-				e = gf_media_aom_av1_parse_obu(plaintext_bs, &obut, &obu_size, &hdr_size, &tci->av1);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CTR] Failed to parse OBU\n"));
-					goto exit;
-				}
-				gf_bs_seek(plaintext_bs, pos);
-
-				unit_size = (u32)obu_size;
-				switch (obut) { //we only encrypt frame and tile group
-				case OBU_FRAME:
-				case OBU_TILE_GROUP:
-					assert(tci->av1.frame_state.nb_tiles_in_obu > 0);
-					nb_ranges = tci->av1.frame_state.nb_tiles_in_obu;
-
-					ranges[0].clear = tci->av1.frame_state.tiles[0].obu_start_offset;
-					ranges[0].encrypted = tci->av1.frame_state.tiles[0].size;
-					for (i = 1; i < nb_ranges; ++i) {
-						ranges[i].clear = tci->av1.frame_state.tiles[i].obu_start_offset - (tci->av1.frame_state.tiles[i - 1].obu_start_offset + tci->av1.frame_state.tiles[i - 1].size);
-						ranges[i].encrypted = tci->av1.frame_state.tiles[i].size;
-					}
-					clear_bytes = ranges[0].clear;
-					unit_size = clear_bytes + ranges[0].encrypted;
-					if (ranges[0].encrypted >= 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 && prev_entry->bytes_encrypted_data)
-							prev_entry = NULL;
-					} else {
-						clear_bytes = unit_size;
-					}
-					break;
-				default:
-					clear_bytes = (u32)obu_size;
-					break;
-				}
-			}
-				break;
-			case ENC_VP9: {
-				u64 pos = 0;
-				int num_frames_in_superframe = 0, superframe_index_size = 0, i = 0;
-				u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
-
-				if (tci->block_align != 2) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] VP9 mandates that blockAlign=\"always\". Forcing value.\n"));
-					tci->block_align = 2;
-				}
-
-				pos = gf_bs_get_position(plaintext_bs);
-				e = vp9_parse_superframe(plaintext_bs, samp->dataLength, &num_frames_in_superframe, frame_sizes, &superframe_index_size);
-				if (e) goto exit;
-				gf_bs_seek(plaintext_bs, pos);
-
-				nb_ranges = num_frames_in_superframe;
-
-				for (i = 0; i < num_frames_in_superframe; ++i) {
-					Bool key_frame;
-					int width = 0, height = 0, renderWidth = 0, renderHeight = 0;
-					GF_VPConfig *vp9_cfg = gf_odf_vp_cfg_new();
-					u64 pos2 = gf_bs_get_position(plaintext_bs);
-					e = vp9_parse_sample(plaintext_bs, vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight);
-					gf_odf_vp_cfg_del(vp9_cfg);
-					if (e) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC-CTR][VP9] Error parsing sample at DTS="LLU"\n", samp->DTS));
-						goto exit;
-					}
-
-					ranges[i].clear = (int)(gf_bs_get_position(plaintext_bs) - pos2);
-					ranges[i].encrypted = frame_sizes[i] - ranges[i].clear;
-
-					gf_bs_seek(plaintext_bs, pos2 + frame_sizes[i]);
-				}
-				if (gf_bs_get_position(plaintext_bs) + superframe_index_size != pos + samp->dataLength) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[CENC-CTR][VP9] Inconsistent sample size %u (parsed "LLU") at DTS="LLU". Re-import raw VP9/IVF for more details.\n",
-						samp->dataLength, gf_bs_get_position(plaintext_bs) + superframe_index_size - pos, samp->DTS));
-				}
-				gf_bs_seek(plaintext_bs, pos);
-
-				clear_bytes = ranges[0].clear;
-				assert(frame_sizes[0] == ranges[0].clear + ranges[0].encrypted);
-				unit_size = frame_sizes[0];
-
-				//final superframe index must be in clear
-				if (superframe_index_size > 0) {
-					ranges[nb_ranges].clear = superframe_index_size;
-					ranges[nb_ranges].encrypted = 0;
-					nb_ranges++;
-				}
-
-				//not clearly defined in the spec (so we do the same as in AV1 which is more clearly defined):
-				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 && prev_entry->bytes_encrypted_data)
-						prev_entry = NULL;
-				} else {
-					clear_bytes = unit_size;
-				}
-			}
-				break;
-			default:
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CTR] Unsupported bitstream format (%s).\n", bs_type));
-				e = GF_NOT_SUPPORTED;
-				goto exit;
-			}
-
-
-			while (nb_ranges) {
-				if (unit_size > max_size_in_bytes) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*unit_size);
-					max_size_in_bytes = unit_size;
-				}
-
-				// adjust so that encrypted bytes are a multiple of 16 bytes: cenc SHOULD, cens SHALL, we always do it
-				if (unit_size > clear_bytes) {
-					u32 ret = (unit_size - clear_bytes) % 16;
-					//in OBU (AV1) always enforced
-					if (bs_type == ENC_OBU) {
-						clear_bytes += ret;
-					}
-					//for CENC (should),
-					else if (tci->scheme_type == GF_CRYPT_TYPE_CENC) {
-						//do it if not disabled by user
-						if (tci->block_align != 1) {
-							//always align even if sample is not encrypted in the end
-							if (tci->block_align == 2) {
-								clear_bytes += ret;
-							}
-							//or if we don't end up with sample in the clear
-							else if (unit_size > clear_bytes + ret) {
-								clear_bytes += ret;
-							}
-						}
-					} else {
-						clear_bytes += ret;
-					}
-				}
-
-				/*read clear data and transfer to output*/
-				gf_bs_read_data(plaintext_bs, buffer, clear_bytes);
-				if (bs_type == ENC_NALU)
-					gf_bs_write_int(cyphertext_bs, unit_size, 8*nalu_size_length_in_bytes);
-
-				gf_bs_write_data(cyphertext_bs, buffer, clear_bytes);
-
-				//read data to encrypt
-				if (unit_size > clear_bytes) {
-					gf_bs_read_data(plaintext_bs, buffer, unit_size - clear_bytes);
-
-					//pattern encryption
-					if (crypt_byte_block && skip_byte_block) {
-						u32 pos = 0;
-						u32 res = unit_size - clear_bytes;
-						while (res) {
-							gf_crypt_encrypt(mc, buffer+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);
-							} else {
-								res = 0;
-							}
-						}
-					} else {
-						gf_crypt_encrypt(mc, buffer, unit_size - clear_bytes);
-					}
-
-					/*write encrypted data to bitstream*/
-					gf_bs_write_data(cyphertext_bs, buffer, unit_size - clear_bytes);
-				}
-				//prev entry is not a VCL, append this NAL
-				if (prev_entry && !prev_entry->bytes_encrypted_data) {
-					prev_entry->bytes_clear_data += nalu_size_length_in_bytes + clear_bytes;
-					prev_entry->bytes_encrypted_data += unit_size - clear_bytes;
-				} else {
-					prev_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-					prev_entry->bytes_clear_data = nalu_size_length_in_bytes + clear_bytes;
-					prev_entry->bytes_encrypted_data = unit_size - clear_bytes;
-					gf_list_add(subsamples, prev_entry);
-				}
-				//check bytes of clear is not larger than 16bits
-				while (prev_entry->bytes_clear_data > 0xFFFF) {
-					GF_CENCSubSampleEntry *split_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-					split_entry->bytes_clear_data = prev_entry->bytes_clear_data - 0xFFFF;
-					split_entry->bytes_encrypted_data = prev_entry->bytes_encrypted_data;
-					prev_entry->bytes_clear_data = 0xFFFF;
-					prev_entry->bytes_encrypted_data = 0;
-					gf_list_add(subsamples, split_entry);
-					prev_entry = split_entry;
-				}
-
-
-				nb_ranges--;
-				if (!nb_ranges) break;
-
-				range_idx++;
-				switch (bs_type) {
-				case ENC_OBU:
-					clear_bytes = ranges[range_idx].clear;
-					unit_size = clear_bytes + ranges[range_idx].encrypted;
-					prev_entry = NULL; //a subsample SHALL be created for each tile.
-					break;
-				case ENC_VP9:
-					if (nb_ranges > 1) {
-						clear_bytes = ranges[range_idx].clear;
-						unit_size = clear_bytes + ranges[range_idx].encrypted;
-					} else { /*last*/
-						unit_size = clear_bytes = ranges[range_idx].clear;
-						assert(ranges[range_idx].encrypted == 0);
-					}
-					prev_entry = NULL; //a subsample SHALL be created for each tile.
-					break;
-				default:
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Detected unexpected subrange in bitstream format %d\n", bs_type));
-					assert(0);
-					break;
-				}
-			}
-		} else {
-			assert(bs_type == ENC_FULL_SAMPLE);
-			if (samp->dataLength > max_size_in_bytes) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
-				max_size_in_bytes = samp->dataLength;
-			}
-
-			gf_bs_read_data(plaintext_bs, buffer, samp->dataLength);
-			gf_crypt_encrypt(mc, buffer, samp->dataLength);
-			gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength);
-		}
-	}
-
-
-	if (samp->data) {
-		gf_free(samp->data);
-		samp->data = NULL;
-		samp->dataLength = 0;
-	}
-	gf_bs_get_content(cyphertext_bs, &samp->data, &samp->dataLength);
-	if (gf_list_count(subsamples)) {
-		gf_bs_write_u16(sai_bs, gf_list_count(subsamples));
-		while (gf_list_count(subsamples)) {
-			GF_CENCSubSampleEntry *ptr = (GF_CENCSubSampleEntry *)gf_list_get(subsamples, 0);
-			gf_list_rem(subsamples, 0);
-			gf_bs_write_u16(sai_bs, ptr->bytes_clear_data);
-			gf_bs_write_u32(sai_bs, ptr->bytes_encrypted_data);
-			gf_free(ptr);
-		}
-	}
-	gf_list_del(subsamples);
-	gf_bs_get_content(sai_bs, sai, saiz);
-	cenc_resync_IV(mc, IV, IV_size);
-
-exit:
-	if (buffer) gf_free(buffer);
-	if (plaintext_bs) gf_bs_del(plaintext_bs);
-	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
-	if (sai_bs) gf_bs_del(sai_bs);
-	return e;
-}
-
-
-static GF_Err gf_cenc_encrypt_sample_cbc(GF_Crypt *mc, GF_TrackCryptInfo *tci, GF_ISOSample *samp, GF_Enc_BsFmt bs_type, u32 nalu_size_length_in_bytes, char IV[16], u32 IV_size, char **sai, u32 *saiz,
-										u32 bytes_in_nalhr, u8 crypt_byte_block, u8 skip_byte_block) {
-	GF_BitStream *plaintext_bs = NULL, *cyphertext_bs = NULL, *sai_bs = NULL;
-	GF_CENCSubSampleEntry *prev_entry = NULL;
-	char *buffer = NULL;
-	u32 max_size, unit_size;
-	GF_Err e = GF_OK;
-	GF_List *subsamples;
-
-	plaintext_bs = cyphertext_bs = sai_bs = NULL;
-	max_size = 4096;
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-	memset(buffer, 0, max_size);
-	plaintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
-	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_data(sai_bs, IV, IV_size);
-	subsamples = gf_list_new();
-	if (!subsamples) {
-		e = GF_IO_ERR;
-		goto exit;
-	}
-	if ((bs_type == ENC_OBU) || (bs_type == ENC_VP9))
-		nalu_size_length_in_bytes = 0;
-
-	while (gf_bs_available(plaintext_bs)) {
-		if (skip_byte_block || (bs_type == ENC_NALU) || (bs_type == ENC_OBU)) {
-			u32 clear_bytes = 0;
-			u32 clear_bytes_at_end = 0;
-			u32 av1_tile_idx = 0;
-			struct {
-				int clear, encrypted;
-			} ranges[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
-			u32 nb_ranges=1;
-
-			if (bs_type == ENC_NALU) {
-				unit_size = gf_bs_read_int(plaintext_bs, 8*nalu_size_length_in_bytes);
-
-				gf_bs_write_int(cyphertext_bs, unit_size, 8*nalu_size_length_in_bytes);
-
-				clear_bytes = gf_cenc_get_clear_bytes(tci, plaintext_bs, samp->data, unit_size, bytes_in_nalhr);
-			} else if (bs_type == ENC_OBU) {
-				ObuType obut;
-				u64 pos, obu_size;
-				u32 hdr_size, i;
-				pos = gf_bs_get_position(plaintext_bs);
-				e = gf_media_aom_av1_parse_obu(plaintext_bs, &obut, &obu_size, &hdr_size, &tci->av1);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC-CBC] Failed to parse OBU\n"));
-					goto exit;
-				}
-				gf_bs_seek(plaintext_bs, pos);
-
-				unit_size = (u32) obu_size;
-				switch (obut) {
-				//we only encrypt frame and tile group
-				case OBU_FRAME:
-				case OBU_TILE_GROUP:
-					assert(tci->av1.frame_state.nb_tiles_in_obu > 0);
-					nb_ranges = tci->av1.frame_state.nb_tiles_in_obu;
-					ranges[0].clear = tci->av1.frame_state.tiles[0].obu_start_offset;
-					ranges[0].encrypted = tci->av1.frame_state.tiles[0].size;
-					for (i = 1; i < nb_ranges; ++i) {
-						ranges[i].clear = tci->av1.frame_state.tiles[i].obu_start_offset - (tci->av1.frame_state.tiles[i - 1].obu_start_offset + tci->av1.frame_state.tiles[i - 1].size);
-						ranges[i].encrypted = tci->av1.frame_state.tiles[i].size;
-					}
-
-					clear_bytes = ranges[0].clear;
-					unit_size = clear_bytes + ranges[0].encrypted;
-					if (ranges[0].encrypted >= 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 && prev_entry->bytes_encrypted_data)
-							prev_entry = NULL;
-					} else {
-						clear_bytes = unit_size;
-					}
-					break;
-				default:
-					clear_bytes = (u32) obu_size;
-					break;
-				}
-			} else {
-				unit_size = (u32) gf_bs_available(plaintext_bs);
-				clear_bytes = bytes_in_nalhr;
-				if (unit_size<clear_bytes) {
-					if (tci->block_align==2) {
-						clear_bytes = unit_size;
-					} else {
-						clear_bytes = 0;
-					}
-				}
-			}
-
-			while (nb_ranges) {
-				if (unit_size+1 > max_size) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*(unit_size+1));
-					memset(buffer, 0, sizeof(char)*(unit_size+1));
-					max_size = unit_size + 1;
-				}
-
-				//in cbcs, we don't adjust bytes_encrypted_data to be a multiple of 16 bytes and leave the last block unencrypted
-				//except in AV1, where BytesOfProtectedData SHALL end on the last byte of the decode_tile structure
-				if ( ( (bs_type != ENC_OBU) && (bs_type != ENC_VP9) ) && (tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) {
-					u32 ret = (unit_size-clear_bytes) % 16;
-					clear_bytes_at_end = ret;
-				}
-				//in cbc1, we adjust bytes_encrypted_data to be a multiple of 16 bytes
-				else {
-					u32 ret = (unit_size-clear_bytes) % 16;
-					clear_bytes += ret;
-					clear_bytes_at_end = 0;
-				}
-				//copy over clear bytes
-				if (clear_bytes) {
-					assert(gf_bs_available(plaintext_bs) >= clear_bytes);
-
-					gf_bs_read_data(plaintext_bs, buffer, clear_bytes);
-					gf_bs_write_data(cyphertext_bs, buffer, clear_bytes);
-				}
-
-				if (unit_size - clear_bytes) {
-					//read the bytes to be encrypted
-					assert(gf_bs_available(plaintext_bs) >= unit_size - clear_bytes);
-					gf_bs_read_data(plaintext_bs, buffer, unit_size - clear_bytes);
-
-					//cbcs scheme (constant IV), reinit at each sub sample,
-					if (!IV_size)
-						gf_crypt_set_IV(mc, IV, 16);
-					//pattern encryption
-					if (crypt_byte_block && skip_byte_block) {
-						u32 pos = 0;
-						u32 res = unit_size - clear_bytes - clear_bytes_at_end;
-						assert((res % 16) == 0);
-
-						while (res) {
-							gf_crypt_encrypt(mc, buffer + 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);
-							} else {
-								res = 0;
-							}
-						}
-					} else {
-						gf_crypt_encrypt(mc, buffer, unit_size - clear_bytes - clear_bytes_at_end);
-					}
-					//write the cyphered data, including the non encrypted bytes at the end of the block
-					gf_bs_write_data(cyphertext_bs, buffer, unit_size - clear_bytes);
-				}
-
-				//for NALU-based, subsamples. Otherwise, if bytes in clear at the beginning, subsample
-				//the spec is not clear here: can we ommit subsamples if we always cypher everything ?
-				//for now commented out for max compatibility
-				//if (is_nalu_video || bytes_in_nalhr)
-				{
-					//note that we write encrypted data to cover the complete byte range after the slice header
-					//but the last incomplete block might be unencrypted, but is still signaled in bytes_encrypted, as per the spec
-
-					//prev entry is not a VCL, append this NAL
-					if (prev_entry && !prev_entry->bytes_encrypted_data) {
-						prev_entry->bytes_clear_data += nalu_size_length_in_bytes + clear_bytes;
-						prev_entry->bytes_encrypted_data += unit_size - clear_bytes;
-					} else {
-						prev_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-						prev_entry->bytes_clear_data = nalu_size_length_in_bytes + clear_bytes;
-						prev_entry->bytes_encrypted_data = unit_size - clear_bytes;
-						gf_list_add(subsamples, prev_entry);
-					}
-
-					//check bytes of clear is not larger than 16bits
-					while (prev_entry->bytes_clear_data > 0xFFFF) {
-						GF_CENCSubSampleEntry *split_entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
-						split_entry->bytes_clear_data = prev_entry->bytes_clear_data - 0xFFFF;
-						split_entry->bytes_encrypted_data = prev_entry->bytes_encrypted_data;
-						prev_entry->bytes_clear_data = 0xFFFF;
-						prev_entry->bytes_encrypted_data = 0;
-						gf_list_add(subsamples, split_entry);
-						prev_entry = split_entry;
-					}
-					assert((s32)prev_entry->bytes_encrypted_data >= 0);
-					assert(prev_entry->bytes_encrypted_data <= samp->dataLength);
-				}
-				nb_ranges--;
-				if (!nb_ranges) break;
-
-				av1_tile_idx++;
-				clear_bytes = ranges[av1_tile_idx].clear;
-				unit_size = clear_bytes + ranges[av1_tile_idx].encrypted;
-				//A subsample SHALL be created for each tile.
-				prev_entry = NULL;
-			}
-		} else {
-			u32 clear_trailing;
-
-			if (samp->dataLength > max_size) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
-				max_size = samp->dataLength;
-			}
-
-			gf_bs_read_data(plaintext_bs, buffer, samp->dataLength);
-			clear_trailing = samp->dataLength % 16;
-
-			//cbcs scheme with constant IV, reinit at each sample,
-			if (!IV_size)
-				gf_crypt_set_IV(mc, IV, 16);
-
-			if (samp->dataLength >= 16) {
-				gf_crypt_encrypt(mc, buffer, samp->dataLength - clear_trailing);
-				gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength - clear_trailing);
-			}
-			if (clear_trailing) {
-				gf_bs_write_data(cyphertext_bs, buffer+samp->dataLength - clear_trailing, clear_trailing);
-			}
-		}
-	}
-
-	if (samp->data) {
-		gf_free(samp->data);
-		samp->data = NULL;
-		samp->dataLength = 0;
-	}
-	gf_bs_get_content(cyphertext_bs, &samp->data, &samp->dataLength);
-	if (gf_list_count(subsamples)) {
-		gf_bs_write_u16(sai_bs, gf_list_count(subsamples));
-		while (gf_list_count(subsamples)) {
-			GF_CENCSubSampleEntry *ptr = (GF_CENCSubSampleEntry *)gf_list_get(subsamples, 0);
-			gf_list_rem(subsamples, 0);
-			gf_bs_write_u16(sai_bs, ptr->bytes_clear_data);
-			gf_bs_write_u32(sai_bs, ptr->bytes_encrypted_data);
-			gf_free(ptr);
-		}
-	}
-	gf_list_del(subsamples);
-	gf_bs_get_content(sai_bs, sai, saiz);
-
-exit:
-	if (buffer) gf_free(buffer);
-	if (plaintext_bs) gf_bs_del(plaintext_bs);
-	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
-	if (sai_bs) gf_bs_del(sai_bs);
-	return e;
-}
-
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-static void hevc_parse_ps(GF_HEVCConfig *hevccfg, HEVCState *hevc, u32 nal_type)
-{
-	u32 i, j;
-	for (i=0; i<gf_list_count(hevccfg->param_array); i++) {
-		GF_HEVCParamArray *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);
-		}
-	}
-}
-#endif
-
-/*encrypts track - logs, progress: info callbacks, NULL for default*/
-GF_Err gf_cenc_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	GF_Err e;
-	char IV[16];
-	GF_ISOSample *samp = NULL;
-	GF_Crypt *mc;
-	Bool all_rap = GF_FALSE;
-	u32 i, count, di, track, saiz_len, nb_samp_encrypted, nalu_size_length, idx, bytes_in_nalhr;
-	GF_ESD *esd;
-	Bool has_crypted_samp;
-	GF_Enc_BsFmt bs_type = ENC_FULL_SAMPLE;
-	Bool use_subsamples = GF_FALSE;
-	char *saiz_buf;
-	Bool use_seig = GF_FALSE;
-	Bool has_seig = GF_FALSE;
-	GF_BitStream *bs;
-
-	nalu_size_length = 0;
-	mc = NULL;
-	saiz_buf = NULL;
-	bs = NULL;
-	bytes_in_nalhr = 0;
-
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
-		return GF_OK;
-	}
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	esd = gf_isom_get_esd(mp4, track, 1);
-	if (esd && (esd->decoderConfig->streamType == GF_STREAM_OD)) {
-		gf_odf_desc_del((GF_Descriptor *) esd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot encrypt OD tracks - skipping"));
-		return GF_NOT_SUPPORTED;
-	}
-	if (esd) {
-		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
-			GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track, 1);
-			GF_AVCConfig *svccfg = gf_isom_svc_config_get(mp4, track, 1);
-
-			bytes_in_nalhr = 1;
-
-			if (avccfg)
-				nalu_size_length = avccfg->nal_unit_size;
-			else if (svccfg)
-				nalu_size_length = svccfg->nal_unit_size;
-
-			switch (gf_isom_get_media_subtype(mp4, track, 1)) {
-			case GF_ISOM_BOX_TYPE_AVC1:
-				if (!tci->allow_encrypted_slice_header) {
-					tci->slice_header_clear = GF_TRUE;
-				} else if (tci->scheme_type==GF_CRYPT_TYPE_CBCS) {
-					tci->slice_header_clear = GF_TRUE;
-				}
-				break;
-			default:
-				tci->slice_header_clear = GF_TRUE;
-				break;
-			}
-			tci->is_avc = GF_TRUE;
-			if (!tci->slice_header_clear && tci->clear_bytes)
-				bytes_in_nalhr = tci->clear_bytes;
-
-#if !defined(GPAC_DISABLE_AV_PARSERS)
-			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, &tci->avc, 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, &tci->avc);
-			}
-#endif
-			if (avccfg) gf_odf_avc_cfg_del(avccfg);
-			if (svccfg) gf_odf_avc_cfg_del(svccfg);
-			bs_type = ENC_NALU;
-		} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
-			GF_HEVCConfig *hevccfg = gf_isom_hevc_config_get(mp4, track, 1);
-			if (hevccfg)
-				nalu_size_length = hevccfg->nal_unit_size;
-
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_VID_PARAM);
-			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_SEQ_PARAM);
-			hevc_parse_ps(hevccfg, &tci->hevc, GF_HEVC_NALU_PIC_PARAM);
-#endif
-			//mandatory for HEVC
-			tci->slice_header_clear = GF_TRUE;
-			tci->is_avc = GF_FALSE;
-
-			if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
-			bs_type = ENC_NALU;
-			bytes_in_nalhr = 2;
-		} else if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AV1) {
-			tci->av1.config = gf_odf_av1_cfg_new();
-			bs_type = ENC_OBU;
-			bytes_in_nalhr = 2;
-		} else if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_VP9) {
-			bs_type = ENC_VP9;
-			bytes_in_nalhr = 2;
-		}
-		gf_odf_desc_del((GF_Descriptor*) esd);
-	}
-
-	if ( (tci->scheme_type == GF_CRYPT_TYPE_CENS) || (tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) {
-		if ( (bs_type == ENC_NALU) || (bs_type == ENC_OBU) ) {
-			if (!tci->crypt_byte_block || !tci->skip_byte_block) {
-				if (tci->crypt_byte_block || tci->skip_byte_block) {
-					GF_LOG(GF_LOG_ERROR, 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"));
-				}
-				tci->crypt_byte_block = 1;
-				tci->skip_byte_block = 9;
-			}
-		} else if (bs_type == ENC_VP9) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Using pattern mode, CBCS or CENS, is not supported with VP9.\n"));
-			e = GF_NOT_SUPPORTED;
-			goto exit;
-		}
-	}
-
-
-	if (bs_type != ENC_FULL_SAMPLE) {
-		use_subsamples = GF_TRUE;
-	}
-	//CBCS mode with skip byte block may be used for any track, in which case we need subsamples
-	else if (tci->scheme_type == GF_CRYPT_TYPE_CBCS) {
-		if (tci->skip_byte_block) {
-			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"));
-			//cbcs allows bytes of clear data
-			bytes_in_nalhr = tci->clear_bytes;
-		}
-		//This is not clear in the spec, setting skip and crypt to 0 means no pattern, in which case tenc version shall be 0
-		//but cbcs asks for 1 - needs further clarification
-#if 0
-		//setup defaults
-		else if (!tci->crypt_byte_block) {
-			tci->crypt_byte_block = 1;
-		}
-#else
-		else {
-			tci->crypt_byte_block = 0;
-		}
-#endif
-	}
-	else if ((tci->scheme_type == GF_CRYPT_TYPE_CENS) && 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"));
-		tci->skip_byte_block = 0;
-		if (!tci->crypt_byte_block) {
-			tci->crypt_byte_block = 1;
-		}
-	}
-	samp = NULL;
-
-	if (tci->ctr_mode) {
-		mc = gf_crypt_open(GF_AES_128, GF_CTR);
-	} else {
-		mc = gf_crypt_open(GF_AES_128, GF_CBC);
-	}
-	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", tci->ctr_mode ? "CTR" : "CBC"));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-
-	/*select key*/
-	if (!tci->keys) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] No key specified\n"));
-		e = GF_BAD_PARAM;
-		goto exit;
-	}
-	if (tci->defaultKeyIdx && (tci->defaultKeyIdx < tci->KID_count)) {
-		memcpy(tci->key, tci->keys[tci->defaultKeyIdx], 16);
-		memcpy(tci->default_KID, tci->KIDs[tci->defaultKeyIdx], 16);
-		idx = tci->defaultKeyIdx;
-	} else {
-		memcpy(tci->key, tci->keys[0], 16);
-		memcpy(tci->default_KID, tci->KIDs[0], 16);
-		idx = 0;
-		tci->defaultKeyIdx = 0;
-	}
-
-	/*create CENC protection*/
-	e = gf_isom_set_cenc_protection(mp4, track, 1, tci->scheme_type, 0x00010000, tci->IsEncrypted, tci->IV_size, tci->default_KID,
-		tci->crypt_byte_block, tci->skip_byte_block, tci->constant_IV_size, tci->constant_IV);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot create CENC protection: %s\n", gf_error_to_string(e)));
-		goto exit;
-	}
-
-
-	count = gf_isom_get_sample_count(mp4, track);
-
-	has_crypted_samp = GF_FALSE;
-	nb_samp_encrypted = 0;
-
-	//if constantIV and not using CENC subsample, no CENC auxiliary info
-	if (!tci->constant_IV_size || use_subsamples) {
-		/*Sample Encryption Box*/
-		e = gf_isom_cenc_allocate_storage(mp4, track, tci->sai_saved_box_type, 0, 0, NULL);
-		if (e) goto exit;
-	}
-
-	if (! gf_isom_has_sync_points(mp4, track))
-		all_rap = GF_TRUE;
-
-	if (tci->keyRoll) {
-		use_seig = GF_TRUE;
-	} else if (tci->sel_enc_type == GF_CRYPT_SELENC_RAP) {
-		if (gf_isom_has_sync_points(mp4, track))
-			use_seig = GF_TRUE;
-	} else if (tci->sel_enc_type > GF_CRYPT_SELENC_RAP) {
-		use_seig = GF_TRUE;
-	}
-
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		Bool forced_clear = GF_FALSE;
-		saiz_len=0;
-		samp = gf_isom_get_sample(mp4, track, i+1, &di);
-		if (!samp) {
-			e = GF_IO_ERR;
-			goto exit;
-		}
-
-		switch (tci->sel_enc_type) {
-		case GF_CRYPT_SELENC_RAP:
-			if (!samp->IsRAP)
-				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
-			if (!samp->IsRAP && !all_rap) {
-				bin128 NULL_IV;
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, samp->dataLength, use_subsamples, NULL);
-				if (e)
-					goto exit;
-				saiz_buf = NULL;
-
-				//already done: memset(tmp, 0, 16);
-				memset(NULL_IV, 0, 16);
-				e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL_IV, 0, 0, 0, NULL);
-				if (e) goto exit;
-
-				gf_isom_sample_del(&samp);
-				continue;
-			}
-			break;
-		case GF_CRYPT_SELENC_NON_RAP:
-			if (samp->IsRAP || all_rap) {
-				bin128 NULL_IV;
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, 0, NULL, samp->dataLength, use_subsamples, NULL);
-				if (e)
-					goto exit;
-				saiz_buf = NULL;
-
-				memset(NULL_IV, 0, 16);
-				e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 0, 0, NULL_IV, 0, 0, 0, NULL);
-				if (e) goto exit;
-
-				gf_isom_sample_del(&samp);
-				continue;
-			}
-			break;
-		case GF_CRYPT_SELENC_CLEAR_FORCED:
-			forced_clear = GF_TRUE;
-		case GF_CRYPT_SELENC_CLEAR:
-			{
-				bin128 NULL_IV;
-				memset(NULL_IV, 0, 16);
-				memcpy(NULL_IV, (char *) &i, 4);
-				e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, forced_clear ? tci->IV_size : 0, NULL, samp->dataLength, use_subsamples, forced_clear ? (char *)NULL_IV : NULL);
-				if (e)
-					goto exit;
-				saiz_buf = NULL;
-
-				if (!forced_clear) {
-					memset(NULL_IV, 0, 16);
-					e = gf_isom_set_sample_cenc_group(mp4, track, i + 1, 0, 0, NULL_IV, 0, 0, 0, NULL);
-					if (e) goto exit;
-				}
-
-				gf_isom_sample_del(&samp);
-
-				//we have a range, go back to regulare encryption once done
-				if (forced_clear && tci->sel_enc_range && (i+1>=tci->sel_enc_range)) {
-					tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
-				}
-				continue;
-			}
-			break;
-		default:
-			break;
-		}
-
-		/*generate initialization vector for the first sample in track ... */
-		if (!has_crypted_samp) {
-			memset(IV, 0, sizeof(char)*16);
-			if (tci->IV_size == 8) {
-				memcpy(IV, tci->first_IV, sizeof(char)*8);
-				memset(IV+8, 0, sizeof(char)*8);
-			}
-			else if (tci->IV_size == 16) {
-				memcpy(IV, tci->first_IV, sizeof(char)*16);
-			}
-			else if (!tci->IV_size) {
-				if (tci->constant_IV_size == 8) {
-					memcpy(IV, tci->constant_IV, sizeof(char)*8);
-					memset(IV+8, 0, sizeof(char)*8);
-				}
-				else if (tci->constant_IV_size == 16) {
-					memcpy(IV, tci->constant_IV, sizeof(char)*16);
-				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] No IV set and invalid constant IV size %d crypt info file\n", tci->constant_IV_size));
-					return GF_BAD_PARAM;
-				}
-			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Invalid IV size %d in crypt info file\n", tci->IV_size));
-				return GF_NOT_SUPPORTED;
-			}
-
-			e = gf_crypt_init(mc, tci->key, IV);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", tci->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-				gf_crypt_close(mc);
-				mc = NULL;
-				e = GF_IO_ERR;
-				goto exit;
-			}
-			has_crypted_samp = GF_TRUE;
-		}
-		else {
-			if (tci->keyRoll) {
-				idx = (nb_samp_encrypted / tci->keyRoll) % tci->KID_count;
-				memcpy(tci->key, tci->keys[idx], 16);
-				e = gf_crypt_set_key(mc, tci->key);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", tci->ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-					gf_crypt_close(mc);
-					mc = NULL;
-					e = GF_IO_ERR;
-					goto exit;
-				}
-			}
-		}
-
-		if (use_seig && (tci->defaultKeyIdx != idx) ) {
-			/*add this sample to sample encryption group*/
-			e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 1, tci->IV_size, tci->KIDs[idx], tci->crypt_byte_block, tci->skip_byte_block, tci->constant_IV_size, tci->constant_IV);
-			if (e) goto exit;
-			has_seig = GF_TRUE;
-		} else if (has_seig) {
-			e = gf_isom_set_sample_cenc_default(mp4, track, i+1);
-			if (e) goto exit;
-		}
-
-		if (tci->ctr_mode) {
-			e = gf_cenc_encrypt_sample_ctr(mc, tci, samp, bs_type, nalu_size_length, IV, tci->IV_size, &saiz_buf, &saiz_len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
-			if (e) goto exit;
-		} else {
-			//in cbcs scheme, if Per_Sample_IV_size is not 0 (no constant IV), fetch current IV
-			if (tci->IV_size) {
-				u32 IV_size = 16;
-				gf_crypt_get_IV(mc, IV, &IV_size);
-			}
-			e = gf_cenc_encrypt_sample_cbc(mc, tci, samp, bs_type, nalu_size_length, IV, tci->IV_size, &saiz_buf, &saiz_len, bytes_in_nalhr, tci->crypt_byte_block, tci->skip_byte_block);
-			if (e) goto exit;
-		}
-
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_isom_sample_del(&samp);
-		samp = NULL;
-
-		if (saiz_len) {
-			e = gf_isom_track_cenc_add_sample_info(mp4, track, tci->sai_saved_box_type, tci->IV_size, saiz_buf, saiz_len, use_subsamples, NULL);
-			if (e)
-				goto exit;
-		}
-		gf_free(saiz_buf);
-		saiz_buf = NULL;
-
-		nb_samp_encrypted++;
-		gf_set_progress("CENC Encrypt", i+1, count);
-	}
-
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-	//not strictly needed but we call it in case bitrate info in source is wrong
-	gf_media_update_bitrate(mp4, track);
-
-exit:
-	if (samp) gf_isom_sample_del(&samp);
-	if (mc) gf_crypt_close(mc);
-	if (saiz_buf) gf_free(saiz_buf);
-	if (bs) gf_bs_del(bs);
-	if (tci->av1.config) gf_odf_av1_cfg_del(tci->av1.config);
-	return e;
-}
-
-/*decrypts track - logs, progress: info callbacks, NULL for default*/
-GF_Err gf_cenc_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	GF_Err e;
-	u32 track, count, i, j, si, max_size, subsample_count, nb_samp_decrypted;
-	GF_ISOSample *samp = NULL;
-	GF_Crypt *mc;
-	char IV[17];
-	Bool prev_sample_encrypted;
-	GF_BitStream *plaintext_bs, *cyphertext_bs;
-	GF_CENCSampleAuxInfo *sai;
-	char *buffer;
-	u32 scheme_type;
-	Bool is_ctr_mode = GF_FALSE;
-
-	plaintext_bs = cyphertext_bs = NULL;
-	mc = NULL;
-	buffer = NULL;
-	max_size = 4096;
-	nb_samp_decrypted = 0;
-	sai = NULL;
-
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
-		return GF_OK;
-	}
-
-	scheme_type = gf_isom_is_media_encrypted(mp4, track, 1);
-	if ((scheme_type==GF_CRYPT_TYPE_CENC) || (scheme_type==GF_CRYPT_TYPE_CENS))
-		is_ctr_mode = GF_TRUE;
-
-	if (is_ctr_mode)
-		mc = gf_crypt_open(GF_AES_128, GF_CTR);
-	else
-		mc = gf_crypt_open(GF_AES_128, GF_CBC);
-	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", is_ctr_mode ? "CTR" : "CBC"));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	/* decrypt each sample */
-	count = gf_isom_get_sample_count(mp4, track);
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-	prev_sample_encrypted = GF_FALSE;
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		u32 Is_Encrypted;
-		u8 IV_size, constant_IV_size, skip_byte_block, crypt_byte_block;
-		bin128 KID, constant_IV;
-
-		constant_IV_size = skip_byte_block = crypt_byte_block = 0;
-		e = gf_isom_get_sample_cenc_info(mp4, track, i+1, &Is_Encrypted, &IV_size, &KID, &crypt_byte_block, &skip_byte_block, &constant_IV_size, &constant_IV);
-		if (e) goto exit;
-
-		if (!Is_Encrypted)
-			continue;
-
-		/*select key*/
-		for (j = 0; j < tci->KID_count; j++) {
-			if (!strncmp((const char *)tci->KIDs[j], (const char *)KID, 16)) {
-				memcpy(tci->key, tci->keys[j], 16);
-				break;
-			}
-		}
-		if (j == tci->KID_count)
-			memcpy(tci->key, tci->keys[tci->defaultKeyIdx], 16);
-
-		memset(IV, 0, 17);
-		memset(buffer, 0, max_size);
-
-		samp = gf_isom_get_sample(mp4, track, i+1, &si);
-		if (!samp)
-		{
-			e = GF_IO_ERR;
-			goto exit;
-		}
-
-		e = gf_isom_cenc_get_sample_aux_info(mp4, track, i+1, &sai, NULL);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot fetch senc data for sample %d\n", i+1) );
-			goto exit;
-		}
-
-		cyphertext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
-		plaintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-		if (sai)
-			sai->IV_size = IV_size;
-
-
-		if (!prev_sample_encrypted) {
-			if (sai && sai->IV_size) {
-				memmove(IV, sai->IV, sai->IV_size);
-				if (sai->IV_size == 8)
-					memset(IV+8, 0, sizeof(char)*8);
-			} else {
-				//cbcs scheme mode, use constant IV
-				memmove(IV, constant_IV, constant_IV_size);
-				if (constant_IV_size == 8)
-					memset(IV+8, 0, sizeof(char)*8);
-			}
-
-			e = gf_crypt_init(mc, tci->key, IV);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", is_ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-				gf_crypt_close(mc);
-				mc = NULL;
-				e = GF_IO_ERR;
-				goto exit;
-			}
-			prev_sample_encrypted = GF_TRUE;
-		}
-		else {
-			e = gf_crypt_set_key(mc, tci->key);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", is_ctr_mode ? "CTR" : "CBC", gf_error_to_string(e)) );
-				gf_crypt_close(mc);
-				mc = NULL;
-				e = GF_IO_ERR;
-				goto exit;
-			}
-			if (sai && sai->IV_size) {
-				if (is_ctr_mode) {
-					GF_BitStream *bs;
-					bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
-					gf_bs_write_u8(bs, 0);	/*begin of counter*/
-					gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
-					if (sai->IV_size == 8)
-						gf_bs_write_u64(bs, 0);
-					gf_bs_del(bs);
-					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE+1);
-				}
-				else {
-					memmove(IV, sai->IV, 16);
-					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
-				}
-			} else {
-				//cbcs scheme mode, use constant IV
-				memmove(IV, constant_IV, constant_IV_size);
-				if (constant_IV_size == 8)
-					memset(IV+8, 0, sizeof(char)*8);
-				gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
-			}
-		}
-
-		//sub-sample encryption
-		if (sai && sai->subsample_count) {
-			u32 nb_done = 0;
-			subsample_count = 0;
-			while (gf_bs_available(cyphertext_bs)) {
-				GF_CENCSubSampleEntry *sai_e;
-				assert(subsample_count < sai->subsample_count);
-				if (!sai->IV_size) {
-					//cbcs scheme mode, use constant IV
-					memmove(IV, constant_IV, constant_IV_size);
-					if (constant_IV_size == 8)
-						memset(IV+8, 0, sizeof(char)*8);
-					gf_crypt_set_IV(mc, IV, GF_AES_128_KEYSIZE);
-				}
-				sai_e = &sai->subsamples[subsample_count];
-				if (nb_done + sai_e->bytes_clear_data + sai_e->bytes_encrypted_data > samp->dataLength) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error in sample %d subsample info: %d bytes in samples but more bytes signaled in subsample data (%d bytes at subsample %d)\n", i+1, samp->dataLength, nb_done + sai_e->bytes_clear_data + sai_e->bytes_encrypted_data, subsample_count+1));
-					e = GF_NON_COMPLIANT_BITSTREAM;
-					goto exit;
-				}
-				nb_done += sai_e->bytes_clear_data + sai_e->bytes_encrypted_data;
-
-				/*read clear data and write it to plaintext bitstream*/
-				if (max_size < sai_e->bytes_clear_data) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai_e->bytes_clear_data);
-					max_size = sai_e->bytes_clear_data;
-				}
-				gf_bs_read_data(cyphertext_bs, buffer, sai_e->bytes_clear_data);
-				gf_bs_write_data(plaintext_bs, buffer, sai_e->bytes_clear_data);
-
-				/*now read encrypted data, decrypted it and write to pleintext bitstream*/
-				if (max_size < sai_e->bytes_encrypted_data) {
-					buffer = (char*)gf_realloc(buffer, sizeof(char)*sai_e->bytes_encrypted_data);
-					max_size = sai_e->bytes_encrypted_data;
-				}
-				gf_bs_read_data(cyphertext_bs, buffer, sai_e->bytes_encrypted_data);
-				//pattern decryption
-				if (crypt_byte_block && skip_byte_block) {
-					u32 pos = 0;
-					u32 res = sai_e->bytes_encrypted_data;
-
-					if (!is_ctr_mode) {
-						u32 clear_trailing = res % 16;
-						res -= clear_trailing;
-					}
-
-					while (res) {
-						gf_crypt_decrypt(mc, buffer+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);
-						} else {
-							res = 0;
-						}
-					}
-				} else {
-					gf_crypt_decrypt(mc, buffer, sai_e->bytes_encrypted_data);
-				}
-				gf_bs_write_data(plaintext_bs, buffer, sai_e->bytes_encrypted_data);
-
-				subsample_count++;
-			}
-		}
-		//full sample encryption
-		else {
-			u32 clear_trailing = 0;
-			if (max_size < samp->dataLength) {
-				buffer = (char*)gf_realloc(buffer, sizeof(char)*samp->dataLength);
-				max_size = samp->dataLength;
-			}
-			gf_bs_read_data(cyphertext_bs, buffer,samp->dataLength);
-
-			if (!is_ctr_mode) {
-				clear_trailing = samp->dataLength % 16;
-			}
-			if (skip_byte_block && crypt_byte_block) {
-				u32 pos = 0;
-				u32 res = samp->dataLength - clear_trailing;
-				while (res) {
-					gf_crypt_decrypt(mc, buffer+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);
-					} else {
-						res = 0;
-					}
-				}
-			} else {
-				gf_crypt_decrypt(mc, buffer, samp->dataLength - clear_trailing);
-			}
-			gf_bs_write_data(plaintext_bs, buffer, samp->dataLength - clear_trailing);
-
-			if (clear_trailing) {
-				gf_bs_write_data(plaintext_bs, buffer + samp->dataLength - clear_trailing, clear_trailing);
-			}
-		}
-
-		if (sai) {
-			gf_isom_cenc_samp_aux_info_del(sai);
-			sai = NULL;
-		}
-
-		gf_bs_del(cyphertext_bs);
-		cyphertext_bs = NULL;
-		if (samp->data) {
-			gf_free(samp->data);
-			samp->data = NULL;
-			samp->dataLength = 0;
-		}
-		gf_bs_get_content(plaintext_bs, &samp->data, &samp->dataLength);
-		gf_bs_del(plaintext_bs);
-		plaintext_bs = NULL;
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_isom_sample_del(&samp);
-		samp = NULL;
-		nb_samp_decrypted++;
-
-		gf_set_progress("CENC Decrypt", i+1, count);
-	}
-
-	/*remove protection info*/
-	e = gf_isom_remove_track_protection(mp4, track, 1);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error CENC signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
-	}
-
-	gf_isom_remove_cenc_saiz(mp4, track);
-	gf_isom_remove_cenc_saio(mp4, track);
-	gf_isom_remove_samp_enc_box(mp4, track);
-	gf_isom_remove_samp_group_box(mp4, track);
-
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-
-exit:
-	if (mc) gf_crypt_close(mc);
-	if (plaintext_bs) gf_bs_del(plaintext_bs);
-	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
-	if (samp) gf_isom_sample_del(&samp);
-	if (buffer) gf_free(buffer);
-	if (sai) gf_isom_cenc_samp_aux_info_del(sai);
-	return e;
-}
-
-GF_Err gf_adobe_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	GF_Err e;
-	char IV[16];
-	GF_ISOSample *samp;
-	GF_Crypt *mc;
-	Bool all_rap = GF_FALSE;
-	u32 i, count, di, track, len;
-	Bool has_crypted_samp;
-	char *buf;
-	GF_BitStream *bs;
-	u32 IV_size;
-
-	samp = NULL;
-	mc = NULL;
-	buf = NULL;
-	bs = NULL;
-
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
-		return GF_OK;
-	}
-
-	mc = gf_crypt_open(GF_AES_128, GF_CBC);
-	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot open AES-128 CBC \n"));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-
-	/*Adobe's protection scheme does not support selective key*/
-	memcpy(tci->key, tci->keys[0], 16);
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	e = gf_isom_set_adobe_protection(mp4, track, 1, GF_ISOM_ADOBE_SCHEME, 1, GF_TRUE, tci->metadata, tci->metadata_len);
-	if (e) goto  exit;
-
-	count = gf_isom_get_sample_count(mp4, track);
-	has_crypted_samp = GF_FALSE;
-	if (! gf_isom_has_sync_points(mp4, track))
-		all_rap = GF_TRUE;
-
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		Bool is_encrypted_au = GF_TRUE;
-		samp = gf_isom_get_sample(mp4, track, i+1, &di);
-		if (!samp)
-		{
-			e = GF_IO_ERR;
-			goto exit;
-		}
-
-		len = samp->dataLength;
-		buf = (char *) gf_malloc(len*sizeof(char));
-		memmove(buf, samp->data, len);
-		gf_free(samp->data);
-		samp->dataLength = 0;
-
-		switch (tci->sel_enc_type) {
-		case GF_CRYPT_SELENC_RAP:
-			if (!samp->IsRAP)
-				gf_isom_get_sample_rap_roll_info(mp4, track, i+1, (Bool *) &samp->IsRAP, NULL, NULL);
-			if (!samp->IsRAP && !all_rap) {
-				is_encrypted_au = GF_FALSE;
-			}
-			break;
-		case GF_CRYPT_SELENC_NON_RAP:
-			if (samp->IsRAP || all_rap) {
-				is_encrypted_au = GF_FALSE;
-			}
-			break;
-		default:
-			break;
-		}
-
-		if (is_encrypted_au) {
-			u32 padding_bytes;
-			if (!has_crypted_samp) {
-				memset(IV, 0, sizeof(char)*16);
-				memcpy(IV, tci->first_IV, sizeof(char)*16);
-				e = gf_crypt_init(mc, tci->key, 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_crypt_close(mc);
-					mc = NULL;
-					e = GF_IO_ERR;
-					goto exit;
-				}
-				has_crypted_samp = GF_TRUE;
-			}
-			else {
-				IV_size = 16;
-				e = gf_crypt_get_IV(mc, IV, &IV_size);
-			}
-
-			padding_bytes = 16 - len % 16;
-			len += padding_bytes;
-			buf = (char *)gf_realloc(buf, len);
-			memset(buf+len-padding_bytes, padding_bytes, padding_bytes);
-
-			gf_crypt_encrypt(mc, buf, len);
-		}
-
-		/*rewrite sample with AU header*/
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		if (is_encrypted_au) {
-			gf_bs_write_u8(bs, 0x10);
-			gf_bs_write_data(bs, (char *) IV, 16);
-		}
-		else {
-			gf_bs_write_u8(bs, 0x0);
-		}
-		gf_bs_write_data(bs, buf, len);
-		gf_bs_get_content(bs, &samp->data, &samp->dataLength);
-		gf_bs_del(bs);
-		bs = NULL;
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_isom_sample_del(&samp);
-		samp = NULL;
-		gf_free(buf);
-		buf = NULL;
-
-		gf_set_progress("Adobe's protection scheme Encrypt", i+1, count);
-	}
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-	gf_media_update_bitrate(mp4, track);
-
-exit:
-	if (samp) gf_isom_sample_del(&samp);
-	if (mc) gf_crypt_close(mc);
-	if (buf) gf_free(buf);
-	if (bs) gf_bs_del(bs);
-	return e;
-}
-
-GF_Err gf_adobe_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
-{
-	GF_Err e;
-	u32 track, count, len, i, prev_sample_decrypted, si;
-	u8 encrypted_au;
-	GF_Crypt *mc;
-	GF_ISOSample *samp;
-	char IV[17];
-	char *ptr;
-	GF_BitStream *bs;
-
-	mc = NULL;
-	samp = NULL;
-	bs = NULL;
-	prev_sample_decrypted = GF_FALSE;
-
-	track = gf_isom_get_track_by_id(mp4, tci->trackID);
-	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
-		return GF_OK;
-	}
-
-	mc = gf_crypt_open(GF_AES_128, GF_CBC);
-	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot open AES-128 CBC\n"));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-
-	memcpy(tci->key, tci->keys[0], 16);
-
-	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, GF_TRUE);
-
-	count = gf_isom_get_sample_count(mp4, track);
-	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	for (i = 0; i < count; i++) {
-		u32 trim_bytes = 0;
-		samp = gf_isom_get_sample(mp4, track, i+1, &si);
-		if (!samp)
-		{
-			e = GF_IO_ERR;
-			goto exit;
-		}
-
-		ptr = samp->data;
-		len = samp->dataLength;
-
-		encrypted_au = ptr[0];
-		if (encrypted_au) {
-			memmove(IV, ptr+1, 16);
-			if (!prev_sample_decrypted) {
-				e = gf_crypt_init(mc, tci->key, 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_crypt_close(mc);
-					mc = NULL;
-					e = GF_IO_ERR;
-					goto exit;
-				}
-				prev_sample_decrypted = GF_TRUE;
-			}
-			else {
-				e = gf_crypt_set_IV(mc, 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_crypt_close(mc);
-					mc = NULL;
-					e = GF_IO_ERR;
-					goto exit;
-				}
-			}
-
-			ptr += 17;
-			len -= 17;
-
-			gf_crypt_decrypt(mc, ptr, len);
-			trim_bytes = ptr[len-1];
-		}
-		else {
-			ptr += 1;
-			len -= 1;
-		}
-
-		//rewrite decrypted sample
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_data(bs, ptr, len - trim_bytes);
-		gf_free(samp->data);
-		samp->dataLength = 0;
-		gf_bs_get_content(bs, &samp->data, &samp->dataLength);
-		gf_isom_update_sample(mp4, track, i+1, samp, 1);
-		gf_bs_del(bs);
-		bs = NULL;
-		gf_isom_sample_del(&samp);
-		samp = NULL;
-		gf_set_progress("Adobe's protection scheme Decrypt", i+1, count);
-	}
-
-	/*remove protection info*/
-	e = gf_isom_remove_track_protection(mp4, track, 1);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Error Adobe's protection scheme signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
-	}
-	gf_isom_set_cts_packing(mp4, track, GF_FALSE);
-	gf_media_update_bitrate(mp4, track);
-
-exit:
-	if (mc) gf_crypt_close(mc);
-	if (samp) gf_isom_sample_del(&samp);
-	if (bs) gf_bs_del(bs);
-	return e;
-}
-
-
-GF_EXPORT
-GF_Err gf_decrypt_file(GF_ISOFile *mp4, const char *drm_file)
-{
-	GF_Err e;
-	u32 i, idx, count, common_idx, nb_tracks, scheme_type;
-	const char *scheme_URI="", *KMS_URI="";
-	GF_CryptInfo *info;
-	Bool is_oma, is_cenc;
-	GF_TrackCryptInfo *a_tci, tci;
-
-	is_oma = is_cenc = GF_FALSE;
-	count = 0;
-	info = NULL;
-	if (drm_file) {
-		info = load_crypt_file(drm_file);
-		if (!info) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
-			return GF_NOT_SUPPORTED;
-		}
-		count = gf_list_count(info->tcis);
-	}
-
-	common_idx=0;
-	if (info && info->has_common_key) {
-		for (common_idx=0; common_idx<count; common_idx++) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
-			if (!a_tci->trackID) break;
-		}
-	}
-
-	nb_tracks = gf_isom_get_track_count(mp4);
-	e = GF_OK;
-	for (i=0; i<nb_tracks; i++) {
-		GF_Err (*gf_decrypt_track)(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
-
-		u32 trackID = gf_isom_get_track_id(mp4, i+1);
-		scheme_type = gf_isom_is_media_encrypted(mp4, i+1, 1);
-		if (!scheme_type) continue;
-
-		for (idx=0; idx<count; idx++) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			if (a_tci->trackID == trackID) break;
-		}
-		if (idx==count) {
-			if (!drm_file || info->has_common_key) idx = common_idx;
-			/*no available KMS info for this track*/
-			else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] No crypt info found in %s for track %d, keeping track encrypted\n", drm_file, trackID));
-				continue;
-			}
-		}
-		if (count) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			memcpy(&tci, a_tci, sizeof(GF_TrackCryptInfo));
-		} else {
-			memset(&tci, 0, sizeof(GF_TrackCryptInfo));
-			tci.trackID = trackID;
-			a_tci = NULL;
-		}
-
-		if (a_tci && a_tci->force_type) {
-			scheme_type = tci.scheme_type = a_tci->scheme_type;
-		}
-		if (!tci.trackID)
-			tci.trackID = trackID;
-
-		switch (scheme_type) {
-		case GF_CRYPT_TYPE_ISMA:
-			gf_decrypt_track = gf_ismacryp_decrypt_track;
-			break;
-		case GF_CRYPT_TYPE_CENC:
-		case GF_CRYPT_TYPE_CENS:
-			tci.ctr_mode = GF_TRUE;
-		case GF_CRYPT_TYPE_CBC1:
-		case GF_CRYPT_TYPE_CBCS:
-			is_cenc = GF_TRUE;
-			gf_decrypt_track = gf_cenc_decrypt_track;
-			break;
-		case GF_CRYPT_TYPE_ADOBE:
-			gf_decrypt_track = gf_adobe_decrypt_track;
-			break;
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Encryption type not supported\n"));
-			return GF_NOT_SUPPORTED;
-		}
-
-		if (gf_isom_is_ismacryp_media(mp4, i+1, 1)) {
-			e = gf_isom_get_ismacryp_info(mp4, i+1, 1, NULL, &scheme_type, NULL, &scheme_URI, &KMS_URI, NULL, NULL, NULL);
-		} else if (gf_isom_is_omadrm_media(mp4, i+1, 1)) {
-			if (!drm_file) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot decrypt OMA (P)DCF file without GPAC's DRM file & keys\n"));
-				continue;
-			}
-			KMS_URI = "OMA DRM";
-			is_oma = 1;
-		} else if (!gf_isom_is_cenc_media(mp4, i+1, 1) && !gf_isom_is_adobe_protection_media(mp4, i+1, 1)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] TrackID %d encrypted with unknown scheme %s - skipping\n", trackID, gf_4cc_to_str(scheme_type) ));
-			continue;
-		}
-
-		if (scheme_type == GF_CRYPT_TYPE_ISMA) {
-			/*get key and salt from KMS*/
-			/*GPAC*/
-			if (!strnicmp(KMS_URI, "(key)", 5)) {
-				char data[100];
-				gf_base64_decode((char*)KMS_URI+5, (u32) strlen(KMS_URI)-5, data, 100);
-				memcpy(tci.key, data, sizeof(char)*16);
-				memcpy(tci.salt, data+16, sizeof(char)*8);
-			}
-			/*MPEG4IP*/
-			else if (!stricmp(KMS_URI, "AudioKey") || !stricmp(KMS_URI, "VideoKey")) {
-				if (!gf_ismacryp_mpeg4ip_get_info((char *) KMS_URI, (char *) tci.key, (char *) tci.salt)) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Couldn't load MPEG4IP ISMACryp keys for TrackID %d\n", trackID));
-					continue;
-				}
-			} else if (!drm_file) {
-				FILE *test = NULL;
-				if (!stricmp(scheme_URI, "urn:gpac:isma:encryption_scheme")) test = gf_fopen(KMS_URI, "rt");
-
-				if (!test) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] TrackID %d does not contain decryption keys - skipping\n", trackID));
-					continue;
-				}
-				gf_fclose(test);
-				if (gf_ismacryp_gpac_get_info(tci.trackID, (char *) KMS_URI, (char *) tci.key, (char *) tci.salt) != GF_OK) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Couldn't load TrackID %d keys in GPAC DRM file %s\n", tci.trackID, KMS_URI));
-					continue;
-				}
-			}
-
-			if (KMS_URI && strlen(tci.KMS_URI) && strcmp(KMS_URI, tci.KMS_URI) )
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] KMS URI for TrackID %d Mismatch: \"%s\" in file vs \"%s\" in licence\n", trackID, KMS_URI, tci.KMS_URI));
-
-			if (drm_file || (KMS_URI && strncmp(KMS_URI, "(key)", 5)) ) {
-				strcpy(tci.KMS_URI, KMS_URI ? KMS_URI : "");
-			} else {
-				strcpy(tci.KMS_URI, "self-contained");
-			}
-		}
-		e = gf_decrypt_track(mp4, &tci, NULL, NULL);
-		if (e) break;
-	}
-	if (is_oma) {
-		e = gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_ISO2, 0x00000001);
-		if (!e) e = gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_ODCF, 0);
-	}
-
-	if (is_cenc && !e)
-		e = gf_isom_remove_pssh_box(mp4);
-	if (info) del_crypt_info(info);
-	return e;
-}
-
-static GF_Err gf_cenc_parse_drm_system_info(GF_ISOFile *mp4, const char *drm_file) {
-	GF_DOMParser *parser;
-	GF_XMLNode *root, *node;
-	u32 i;
-	GF_Err e = GF_OK;
-
-	parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser, drm_file, NULL, NULL);
-	if (e) {
-		gf_xml_dom_del(parser);
-		return e;
-	}
-	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", drm_file));
-		return GF_NOT_SUPPORTED;
-	}
-	i=0;
-	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
-		Bool is_pssh;
-		u32 version, cypherMode, specInfoSize, len, KID_count, j;
-		bin128 cypherKey, cypherIV, systemID;
-		GF_XMLAttribute *att;
-		char *data, *specInfo;
-		GF_BitStream *bs;
-		bin128 *KIDs;
-		s32 cypherOffset = -1;
-		Bool has_key = GF_FALSE, has_IV = GF_FALSE;
-
-		if (strcmp(node->name, "DRMInfo")) continue;
-
-		j = 0;
-		is_pssh = GF_FALSE;
-		version = cypherMode = 0;
-		data = specInfo = NULL;
-		bs = NULL;
-
-		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
-			if (!strcmp(att->name, "type")) {
-				if (!strcmp(att->value, "pssh"))
-					is_pssh = GF_TRUE;
-			} else if (!strcmp(att->name, "version")) {
-				version = atoi(att->value);
-			} else if (!strcmp(att->name, "cypher-mode")) {
-				/*cypher-mode: 0: data (default mode) -  1: all - 2: clear*/
-				if (!strcmp(att->value, "data"))
-					cypherMode = 0;
-				else if (!strcmp(att->value, "all"))
-					cypherMode = 1;
-				else if (!strcmp(att->value, "clear"))
-					cypherMode = 2;
-			} else if (!strcmp(att->name, "cypherKey")) {
-				GF_Err 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;
-                }
-				has_key = GF_TRUE;
-			} else if (!strcmp(att->name, "cypherIV")) {
-				GF_Err 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;
-                }
-				has_IV = GF_TRUE;
-			} else if (!strcmp(att->name, "cypherOffset")) {
-				cypherOffset = atoi(att->value);
-			}
-		}
-
-		if (!is_pssh) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Not a Protection System Specific Header Box - skipping\n"));
-			continue;
-		}
-
-
-
-		e = gf_xml_parse_bit_sequence(node, &specInfo, &specInfoSize);
-		if (e) {
-			if (specInfo) gf_free(specInfo);
-			gf_xml_dom_del(parser);
-			return e;
-		}
-
-		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);
-			KIDs = (bin128 *)gf_malloc(KID_count*sizeof(bin128));
-			for (j = 0; j < KID_count; j++) {
-				gf_bs_read_data(bs, (char *)KIDs[j], 16);
-			}
-		}
-		else {
-			KID_count = 0;
-			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));
-			if (specInfo) gf_free(specInfo);
-			if (KIDs) gf_free(KIDs);
-			if (bs) gf_bs_del(bs);
-			continue;
-		}
-		len = specInfoSize - 16 - (version ? 4 + 16*KID_count : 0);
-		data = (char *)gf_malloc(len*sizeof(char));
-		gf_bs_read_data(bs, data, len);
-
-		if (has_key && has_IV && (cypherOffset >= 0) && (cypherMode != 2)) {
-			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;
-			}
-			e = gf_crypt_init(gc, cypherKey, cypherIV);
-			gf_crypt_encrypt(gc, data+cypherOffset, len-cypherOffset);
-			gf_crypt_close(gc);
-		}
-		if (!e) e = gf_cenc_set_pssh(mp4, systemID, version, KID_count, KIDs, data, len);
-		if (specInfo) gf_free(specInfo);
-		if (data) gf_free(data);
-		if (KIDs) gf_free(KIDs);
-		if (bs) gf_bs_del(bs);
-		if (e) {
-			gf_xml_dom_del(parser);
-			return e;
-		}
-	}
-
-	gf_xml_dom_del(parser);
-	return GF_OK;
-}
-
-
-GF_EXPORT
-GF_Err gf_crypt_file(GF_ISOFile *mp4, const char *drm_file)
-{
-	GF_Err e;
-	u32 i, count, nb_tracks, common_idx, idx;
-	GF_CryptInfo *info;
-	Bool is_oma, is_encrypted=GF_FALSE;
-	GF_TrackCryptInfo *tci;
-	Bool check_pssh = GF_FALSE;
-	is_oma = 0;
-
-	info = load_crypt_file(drm_file);
-	if (!info) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
-		return GF_BAD_PARAM;
-	}
-
-	e = GF_OK;
-	count = gf_list_count(info->tcis);
-	for (i=0; i<count; i++) {
-		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, i);
-		/*write pssh box in case of CENC*/
-		if ((tci->scheme_type == GF_CRYPT_TYPE_CENC) || (tci->scheme_type == GF_CRYPT_TYPE_CBC1) || (tci->scheme_type == GF_CRYPT_TYPE_CENS) || (tci->scheme_type == GF_CRYPT_TYPE_CBCS)) {
-			check_pssh = GF_TRUE;
-		}
-	}
-	if (check_pssh) {
-		e = gf_cenc_parse_drm_system_info(mp4, drm_file);
-		if (e) return e;
-	}
-
-	common_idx=0;
-	if (info && info->has_common_key) {
-		for (common_idx=0; common_idx<count; common_idx++) {
-			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
-			if (!tci->trackID) break;
-		}
-	}
-	nb_tracks = gf_isom_get_track_count(mp4);
-	for (i=0; i<nb_tracks; i++) {
-		GF_Err (*gf_encrypt_track)(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
-		u32 trackID = gf_isom_get_track_id(mp4, i+1);
-
-		if (gf_isom_is_track_encrypted(mp4, i+1)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Track %d is already encrypted\n", trackID));
-			continue;
-		}
-		for (idx=0; idx<count; idx++) {
-			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			if (tci->trackID==trackID) break;
-		}
-		if (idx==count) {
-			if (!info->has_common_key) continue;
-			idx = common_idx;
-		}
-		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-		switch (tci->scheme_type) {
-		case GF_CRYPT_TYPE_ISMA:
-			gf_encrypt_track = gf_ismacryp_encrypt_track;
-			break;
-		case GF_CRYPT_TYPE_CENC:
-		case GF_CRYPT_TYPE_CENS:
-			tci->ctr_mode = GF_TRUE;
-		case GF_CRYPT_TYPE_CBC1:
-		case GF_CRYPT_TYPE_CBCS:
-			gf_encrypt_track = gf_cenc_encrypt_track;
-			break;
-		case GF_CRYPT_TYPE_ADOBE:
-			gf_encrypt_track = gf_adobe_encrypt_track;
-			break;
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Encryption type not supported\n"));
-			return GF_NOT_SUPPORTED;
-		}
-
-		/*default to FILE uri*/
-		if (!strlen(tci->KMS_URI)) strcpy(tci->KMS_URI, drm_file);
-
-		if (tci->IsEncrypted > 0) {
-			GF_TrackCryptInfo bck;
-			memcpy(&bck, tci, sizeof(GF_TrackCryptInfo));
-			if (!tci->trackID) tci->trackID = trackID;
-
- 			e = gf_encrypt_track(mp4, tci, NULL, NULL);
-			memcpy(tci, &bck, sizeof(GF_TrackCryptInfo));
-			if (e) break;
-
-			is_encrypted = GF_TRUE;
-			if (tci->enc_type == 1) is_oma = 1;
-		}
-	}
-
-	if (is_oma) {
-#if 0
-		/*set as OMA V2*/
-		e = gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_ODCF, 0x00000002);
-		gf_isom_reset_alt_brands(mp4);
-#else
-		e = gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_OPF2, 1);
-#endif
-	}
-
-	if (!e && (is_encrypted == GF_FALSE)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Warning: no track was encrypted (but PSSH was written).\n"));
-	}
-
-	del_crypt_info(info);
-	return e;
-}
-
-#endif /* !defined(GPAC_DISABLE_ISOM_WRITE)*/
-#endif /* !defined(GPAC_DISABLE_MCRYPT)*/
-

gpac-0.8.0.tar.gz/src/media_tools/text_import.c Deleted

@@ -1,2694 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media Tools 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/constants.h>
-#include <gpac/utf.h>
-#include <gpac/xml.h>
-#include <gpac/token.h>
-#include <gpac/color.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/internal/isomedia_dev.h>
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-enum
-{
-	GF_TEXT_IMPORT_NONE = 0,
-	GF_TEXT_IMPORT_SRT,
-	GF_TEXT_IMPORT_SUB,
-	GF_TEXT_IMPORT_TTXT,
-	GF_TEXT_IMPORT_TEXML,
-	GF_TEXT_IMPORT_WEBVTT,
-	GF_TEXT_IMPORT_TTML,
-	GF_TEXT_IMPORT_SWF_SVG,
-};
-
-#define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
-		u32 _len = (u32) strlen(__str);		\
-		if (!_len) break;	\
-		_len--;				\
-		if (strchr(__sep, __str[_len])) __str[_len] = 0;	\
-		else break;	\
-	}	\
- 
-
-s32 gf_text_get_utf_type(FILE *in_src)
-{
-	u32 read;
-	unsigned char BOM[5];
-	read = (u32) fread(BOM, sizeof(char), 5, in_src);
-	if ((s32) read < 1)
-		return -1;
-
-	if ((BOM[0]==0xFF) && (BOM[1]==0xFE)) {
-		/*UTF32 not supported*/
-		if (!BOM[2] && !BOM[3]) return -1;
-		gf_fseek(in_src, 2, SEEK_SET);
-		return 3;
-	}
-	if ((BOM[0]==0xFE) && (BOM[1]==0xFF)) {
-		/*UTF32 not supported*/
-		if (!BOM[2] && !BOM[3]) return -1;
-		gf_fseek(in_src, 2, SEEK_SET);
-		return 2;
-	} else if ((BOM[0]==0xEF) && (BOM[1]==0xBB) && (BOM[2]==0xBF)) {
-		gf_fseek(in_src, 3, SEEK_SET);
-		return 1;
-	}
-	if (BOM[0]<0x80) {
-		gf_fseek(in_src, 0, SEEK_SET);
-		return 0;
-	}
-	return -1;
-}
-
-static GF_Err gf_text_guess_format(char *filename, u32 *fmt)
-{
-	char szLine[2048];
-	u32 val;
-	s32 uni_type;
-	FILE *test = gf_fopen(filename, "rb");
-	if (!test) return GF_URL_ERROR;
-	uni_type = gf_text_get_utf_type(test);
-
-	if (uni_type>1) {
-		const u16 *sptr;
-		char szUTF[1024];
-		u32 read = (u32) fread(szUTF, 1, 1023, test);
-		if ((s32) read < 0) {
-			gf_fclose(test);
-			return GF_IO_ERR;
-		}
-		szUTF[read]=0;
-		sptr = (u16*)szUTF;
-		/*read = (u32) */gf_utf8_wcstombs(szLine, read, &sptr);
-	} else {
-		val = (u32) fread(szLine, 1, 1024, test);
-		if ((s32) val<0) return GF_IO_ERR;
-		
-		szLine[val]=0;
-	}
-	REM_TRAIL_MARKS(szLine, "\r\n\t ")
-
-	*fmt = GF_TEXT_IMPORT_NONE;
-	if ((szLine[0]=='{') && strstr(szLine, "}{")) *fmt = GF_TEXT_IMPORT_SUB;
-	else if (szLine[0] == '<') {
-		char *ext = strrchr(filename, '.');
-		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TEXT_IMPORT_TTXT;
-		else if (!strnicmp(ext, ".ttml", 5)) *fmt = GF_TEXT_IMPORT_TTML;
-		ext = strstr(szLine, "?>");
-		if (ext) ext += 2;
-		if (ext && !ext[0]) {
-			if (!fgets(szLine, 2048, test))
-				szLine[0] = '\0';
-		}
-		if (strstr(szLine, "x-quicktime-tx3g") || strstr(szLine, "text3GTrack")) *fmt = GF_TEXT_IMPORT_TEXML;
-		else if (strstr(szLine, "TextStream")) *fmt = GF_TEXT_IMPORT_TTXT;
-		else if (strstr(szLine, "tt")) *fmt = GF_TEXT_IMPORT_TTML;
-	}
-	else if (strstr(szLine, "WEBVTT") )
-		*fmt = GF_TEXT_IMPORT_WEBVTT;
-	else if (strstr(szLine, " --> ") )
-		*fmt = GF_TEXT_IMPORT_SRT; /* might want to change the default to WebVTT */
-
-	gf_fclose(test);
-	return GF_OK;
-}
-
-
-#define TTXT_DEFAULT_WIDTH	400
-#define TTXT_DEFAULT_HEIGHT	60
-#define TTXT_DEFAULT_FONT_SIZE	18
-
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-void gf_text_get_video_size(GF_MediaImporter *import, u32 *width, u32 *height)
-{
-	u32 w, h, f_w, f_h, i;
-	GF_ISOFile *dest = import->dest;
-
-	if (import->text_track_width && import->text_track_height) {
-		(*width) = import->text_track_width;
-		(*height) = import->text_track_height;
-		return;
-	}
-
-	f_w = f_h = 0;
-	for (i=0; i<gf_isom_get_track_count(dest); i++) {
-		switch (gf_isom_get_media_type(dest, i+1)) {
-		case GF_ISOM_MEDIA_SCENE:
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-			gf_isom_get_visual_info(dest, i+1, 1, &w, &h);
-			if (w > f_w) f_w = w;
-			if (h > f_h) f_h = h;
-			gf_isom_get_track_layout_info(dest, i+1, &w, &h, NULL, NULL, NULL);
-			if (w > f_w) f_w = w;
-			if (h > f_h) f_h = h;
-			break;
-		}
-	}
-	(*width) = f_w ? f_w : TTXT_DEFAULT_WIDTH;
-	(*height) = f_h ? f_h : TTXT_DEFAULT_HEIGHT;
-}
-
-
-void gf_text_import_set_language(GF_MediaImporter *import, u32 track)
-{
-	if (import->esd && import->esd->langDesc) {
-		char lang[4];
-		lang[0] = (import->esd->langDesc->langCode>>16) & 0xFF;
-		lang[1] = (import->esd->langDesc->langCode>>8) & 0xFF;
-		lang[2] = (import->esd->langDesc->langCode) & 0xFF;
-		lang[3] = 0;
-		gf_isom_set_media_language(import->dest, track, lang);
-	}
-}
-#endif
-
-char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type)
-{
-	u32 i, j, len;
-	char *sOK;
-	char szLineConv[1024];
-	unsigned short *sptr;
-
-	memset(szLine, 0, sizeof(char)*lineSize);
-	sOK = fgets(szLine, lineSize, txt_in);
-	if (!sOK) return NULL;
-	if (unicode_type<=1) {
-		j=0;
-		len = (u32) strlen(szLine);
-		for (i=0; i<len && j < sizeof(szLineConv) - 1; i++, j++) {
-
-			if (!unicode_type && (szLine[i] & 0x80)) {
-				/*non UTF8 (likely some win-CP)*/
-				if ((szLine[i+1] & 0xc0) != 0x80) {
-					if (j + 1 < sizeof(szLineConv) - 1) {
-						szLineConv[j] = 0xc0 | ((szLine[i] >> 6) & 0x3);
-						j++;
-						szLine[i] &= 0xbf;
-					}
-					else
-						break;
-				}
-				/*UTF8 2 bytes char*/
-				else if ( (szLine[i] & 0xe0) == 0xc0) {
-
-					// don't cut multibyte in the middle in there is no more room in dest
-					if (j + 1 < sizeof(szLineConv) - 1 && i + 1 < len) {
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-					}
-					else {
-						break;
-					}
-				}
-				/*UTF8 3 bytes char*/
-				else if ( (szLine[i] & 0xf0) == 0xe0) {
-					if (j + 2 < sizeof(szLineConv) - 1 && i + 2 < len) {
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-					}
-					else {
-						break;
-					}
-				}
-				/*UTF8 4 bytes char*/
-				else if ( (szLine[i] & 0xf8) == 0xf0) {
-					if (j + 3 < sizeof(szLineConv) - 1 && i + 3 < len) {
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-						szLineConv[j] = szLine[i];
-						i++;
-						j++;
-					}
-					else {
-						break;
-					}
-				} else {
-					i+=1;
-					continue;
-				}
-			}
-			if (j < sizeof(szLineConv)-1 && i<len)
-				szLineConv[j] = szLine[i];
-
-		}
-		if (j >= sizeof(szLineConv))
-			szLineConv[sizeof(szLineConv) - 1] = 0;
-		else
-			szLineConv[j] = 0;
-
-		strcpy(szLine, szLineConv);
-		return sOK;
-	}
-
-#ifdef GPAC_BIG_ENDIAN
-	if (unicode_type==3) {
-#else
-	if (unicode_type==2) {
-#endif
-		i=0;
-		while (1) {
-			char c;
-			if (!szLine[i] && !szLine[i+1]) break;
-			c = szLine[i+1];
-			szLine[i+1] = szLine[i];
-			szLine[i] = c;
-			i+=2;
-		}
-	}
-	sptr = (u16 *)szLine;
-	i = (u32) gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
-	if (i >= (u32)ARRAY_LENGTH(szLineConv))
-		return NULL;
-	szLineConv[i] = 0;
-	strcpy(szLine, szLineConv);
-	/*this is ugly indeed: since input is UTF16-LE, there are many chances the fgets never reads the \0 after a \n*/
-	if (unicode_type==3) fgetc(txt_in);
-	return sOK;
-}
-
-
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-
-static GF_Err gf_text_import_srt(GF_MediaImporter *import)
-{
-	FILE *srt_in;
-	u32 track, timescale, i, count;
-	GF_TextConfig*cfg;
-	GF_Err e;
-	GF_StyleRecord rec;
-	GF_TextSample * samp;
-	GF_ISOSample *s;
-	u32 sh, sm, ss, sms, eh, em, es, ems, txt_line, char_len, char_line, nb_samp, j, duration, rem_styles;
-	Bool set_start_char, set_end_char, first_samp, rem_color;
-	u64 start, end, prev_end, file_size;
-	u32 state, curLine, line, len, ID, OCR_ES_ID, default_color;
-	s32 unicode_type;
-	char szLine[2048], szText[2048], *ptr;
-	unsigned short uniLine[5000], uniText[5000], *sptr;
-
-	srt_in = gf_fopen(import->in_name, "rt");
-	gf_fseek(srt_in, 0, SEEK_END);
-	file_size = gf_ftell(srt_in);
-	gf_fseek(srt_in, 0, SEEK_SET);
-
-	unicode_type = gf_text_get_utf_type(srt_in);
-	if (unicode_type<0) {
-		gf_fclose(srt_in);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported SRT UTF encoding");
-	}
-
-	cfg = NULL;
-	if (import->esd) {
-		if (!import->esd->slConfig) {
-			import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->predefined = 2;
-			import->esd->slConfig->timestampResolution = 1000;
-		}
-		timescale = import->esd->slConfig->timestampResolution;
-		if (!timescale) timescale = 1000;
-
-		/*explicit text config*/
-		if (import->esd->decoderConfig && import->esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_TEXT_CFG_TAG) {
-			cfg = (GF_TextConfig *) import->esd->decoderConfig->decoderSpecificInfo;
-			import->esd->decoderConfig->decoderSpecificInfo = NULL;
-		}
-		ID = import->esd->ESID;
-		OCR_ES_ID = import->esd->OCRESID;
-	} else {
-		timescale = 1000;
-		OCR_ES_ID = ID = 0;
-	}
-
-	if (cfg && cfg->timescale) timescale = cfg->timescale;
-	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, timescale);
-	if (!track) {
-		gf_fclose(srt_in);
-		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
-
-	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_OCR, OCR_ES_ID);
-
-	/*setup track*/
-	if (cfg) {
-		char *firstFont = NULL;
-		/*set track info*/
-		gf_isom_set_track_layout_info(import->dest, track, cfg->text_width<<16, cfg->text_height<<16, 0, 0, cfg->layer);
-
-		/*and set sample descriptions*/
-		count = gf_list_count(cfg->sample_descriptions);
-		for (i=0; i<count; i++) {
-			GF_TextSampleDescriptor *sd= (GF_TextSampleDescriptor *)gf_list_get(cfg->sample_descriptions, i);
-			if (!sd->font_count) {
-				sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-				sd->font_count = 1;
-				sd->fonts[0].fontID = 1;
-				sd->fonts[0].fontName = gf_strdup("Serif");
-			}
-			if (!sd->default_style.fontID) sd->default_style.fontID = sd->fonts[0].fontID;
-			if (!sd->default_style.font_size) sd->default_style.font_size = 16;
-			if (!sd->default_style.text_color) sd->default_style.text_color = 0xFF000000;
-			/*store attribs*/
-			if (!i) rec = sd->default_style;
-
-			gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &state);
-			if (!firstFont) firstFont = sd->fonts[0].fontName;
-		}
-		gf_import_message(import, GF_OK, "Timed Text (SRT) import - text track %d x %d, font %s (size %d)", cfg->text_width, cfg->text_height, firstFont, rec.font_size);
-
-		gf_odf_desc_del((GF_Descriptor *)cfg);
-	} else {
-		u32 w, h;
-		GF_TextSampleDescriptor *sd;
-		gf_text_get_video_size(import, &w, &h);
-
-		/*have to work with default - use max size (if only one video, this means the text region is the
-		entire display, and with bottom alignment things should be fine...*/
-		gf_isom_set_track_layout_info(import->dest, track, w<<16, h<<16, 0, 0, 0);
-		sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
-		sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-		sd->font_count = 1;
-		sd->fonts[0].fontID = 1;
-		sd->fonts[0].fontName = gf_strdup(import->fontName ? import->fontName : "Serif");
-		sd->back_color = 0x00000000;	/*transparent*/
-		sd->default_style.fontID = 1;
-		sd->default_style.font_size = import->fontSize ? import->fontSize : TTXT_DEFAULT_FONT_SIZE;
-		sd->default_style.text_color = 0xFFFFFFFF;	/*white*/
-		sd->default_style.style_flags = 0;
-		sd->horiz_justif = 1; /*center of scene*/
-		sd->vert_justif = (s8) -1;	/*bottom of scene*/
-
-		if (import->flags & GF_IMPORT_SKIP_TXT_BOX) {
-			sd->default_pos.top = sd->default_pos.left = sd->default_pos.right = sd->default_pos.bottom = 0;
-		} else {
-			if ((sd->default_pos.bottom==sd->default_pos.top) || (sd->default_pos.right==sd->default_pos.left)) {
-				sd->default_pos.left = import->text_x;
-				sd->default_pos.top = import->text_y;
-				sd->default_pos.right = (import->text_width ? import->text_width : w) + sd->default_pos.left;
-				sd->default_pos.bottom = (import->text_height ? import->text_height : h) + sd->default_pos.top;
-			}
-		}
-
-		/*store attribs*/
-		rec = sd->default_style;
-		gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &state);
-
-		gf_import_message(import, GF_OK, "Timed Text (SRT) import - text track %d x %d, font %s (size %d)", w, h, sd->fonts[0].fontName, rec.font_size);
-		gf_odf_desc_del((GF_Descriptor *)sd);
-	}
-	gf_text_import_set_language(import, track);
-	duration = (u32) (((Double) import->duration)*timescale/1000.0);
-
-	default_color = rec.text_color;
-
-	e = GF_OK;
-	state = 0;
-	end = prev_end = 0;
-	curLine = 0;
-	txt_line = 0;
-	set_start_char = set_end_char = GF_FALSE;
-	char_len = 0;
-	start = 0;
-	nb_samp = 0;
-	samp = gf_isom_new_text_sample();
-
-	first_samp = GF_TRUE;
-	while (1) {
-		char *sOK = gf_text_get_utf8_line(szLine, 2048, srt_in, unicode_type);
-
-		if (sOK) REM_TRAIL_MARKS(szLine, "\r\n\t ")
-			if (!sOK || !strlen(szLine)) {
-				rec.style_flags = 0;
-				rec.startCharOffset = rec.endCharOffset = 0;
-				if (txt_line) {
-					if (prev_end && (start != prev_end)) {
-						GF_TextSample * empty_samp = gf_isom_new_text_sample();
-						s = gf_isom_text_to_sample(empty_samp);
-						gf_isom_delete_text_sample(empty_samp);
-						if (state<=2) {
-							s->DTS = (u64) ((timescale*prev_end)/1000);
-							s->IsRAP = RAP;
-							gf_isom_add_sample(import->dest, track, 1, s);
-							nb_samp++;
-						}
-						gf_isom_sample_del(&s);
-					}
-
-					s = gf_isom_text_to_sample(samp);
-					if (state<=2) {
-						s->DTS = (u64) ((timescale*start)/1000);
-						s->IsRAP = RAP;
-						gf_isom_add_sample(import->dest, track, 1, s);
-						gf_isom_sample_del(&s);
-						nb_samp++;
-						prev_end = end;
-					}
-					txt_line = 0;
-					char_len = 0;
-					set_start_char = set_end_char = GF_FALSE;
-					rec.startCharOffset = rec.endCharOffset = 0;
-					gf_isom_text_reset(samp);
-
-					//gf_import_progress(import, nb_samp, nb_samp+1);
-					gf_set_progress("Importing SRT", gf_ftell(srt_in), file_size);
-					if (duration && (end >= duration)) break;
-				}
-				state = 0;
-				if (!sOK) break;
-				continue;
-			}
-
-		switch (state) {
-		case 0:
-			if (sscanf(szLine, "%u", &line) != 1) {
-				e = gf_import_message(import, GF_CORRUPTED_DATA, "Bad SRT formatting - expecting number got \"%s\"", szLine);
-				goto exit;
-			}
-			if (line != curLine + 1) gf_import_message(import, GF_OK, "WARNING: corrupted SRT frame %d after frame %d", line, curLine);
-			curLine = line;
-			state = 1;
-			break;
-		case 1:
-			if (sscanf(szLine, "%u:%u:%u,%u --> %u:%u:%u,%u", &sh, &sm, &ss, &sms, &eh, &em, &es, &ems) != 8) {
-				sh = eh = 0;
-				if (sscanf(szLine, "%u:%u,%u --> %u:%u,%u", &sm, &ss, &sms, &em, &es, &ems) != 6) {
-					e = gf_import_message(import, GF_CORRUPTED_DATA, "Error scanning SRT frame %d timing", curLine);
-					goto exit;
-				}
-			}
-			start = (3600*sh + 60*sm + ss)*1000 + sms;
-			if (start<end) {
-				gf_import_message(import, GF_OK, "WARNING: overlapping SRT frame %d - starts "LLD" ms is before end of previous one "LLD" ms - adjusting time stamps", curLine, start, end);
-				start = end;
-			}
-
-			end = (3600*eh + 60*em + es)*1000 + ems;
-			/*make stream start at 0 by inserting a fake AU*/
-			if (first_samp && (start>0)) {
-				s = gf_isom_text_to_sample(samp);
-				s->DTS = 0;
-				gf_isom_add_sample(import->dest, track, 1, s);
-				gf_isom_sample_del(&s);
-				nb_samp++;
-			}
-			rec.style_flags = 0;
-			state = 2;
-			if (end<=prev_end) {
-				gf_import_message(import, GF_OK, "WARNING: overlapping SRT frame %d end "LLD" is at or before previous end "LLD" - removing", curLine, end, prev_end);
-				start = end;
-				state = 3;
-			}
-			break;
-
-		default:
-			/*reset only when text is present*/
-			first_samp = GF_FALSE;
-
-			/*go to line*/
-			if (txt_line) {
-				gf_isom_text_add_text(samp, "\n", 1);
-				char_len += 1;
-			}
-
-			ptr = (char *) szLine;
-			{
-				size_t _len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
-				if (_len == (size_t) -1) {
-					e = gf_import_message(import, GF_CORRUPTED_DATA, "Invalid UTF data (line %d)", curLine);
-					goto exit;
-				}
-				len = (u32) _len;
-			}
-			i=j=0;
-			rem_styles = 0;
-			rem_color = 0;
-			while (i<len) {
-				u32 font_style = 0;
-				u32 style_nb_chars = 0;
-				u32 style_def_type = 0;
-
-				if ( (uniLine[i]=='<') && (uniLine[i+2]=='>')) {
-					style_nb_chars = 3;
-					style_def_type = 1;
-				}
-				else if ( (uniLine[i]=='<') && (uniLine[i+1]=='/') && (uniLine[i+3]=='>')) {
-					style_def_type = 2;
-					style_nb_chars = 4;
-				}
-				else if (uniLine[i]=='<')  {
-					const unsigned short* src = uniLine + i;
-					size_t alen = gf_utf8_wcstombs(szLine, 2048, (const unsigned short**) & src);
-					szLine[alen] = 0;
-					strlwr(szLine);
-					if (!strncmp(szLine, "<font ", 6) ) {
-						char *a_sep = strstr(szLine, "color");
-						if (a_sep) a_sep = strchr(a_sep, '"');
-						if (a_sep) {
-							char *e_sep = strchr(a_sep+1, '"');
-							if (e_sep) {
-								e_sep[0] = 0;
-								font_style = gf_color_parse(a_sep+1);
-								e_sep[0] = '"';
-								e_sep = strchr(e_sep+1, '>');
-								if (e_sep) {
-									style_nb_chars = (u32) (1 + e_sep - szLine);
-									style_def_type = 1;
-								}
-							}
-
-						}
-					}
-					else if (!strncmp(szLine, "</font>", 7) ) {
-						style_nb_chars = 7;
-						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);
-							i += style_nb_chars;
-							continue;
-						}
-					}
-
-				}
-
-				/*start of new style*/
-				if (style_def_type==1)  {
-					/*store prev style*/
-					if (set_end_char) {
-						assert(set_start_char);
-						gf_isom_text_add_style(samp, &rec);
-						set_end_char = set_start_char = GF_FALSE;
-						rec.style_flags &= ~rem_styles;
-						rem_styles = 0;
-						if (rem_color) {
-							rec.text_color = default_color;
-							rem_color = 0;
-						}
-					}
-					if (set_start_char && (rec.startCharOffset != j)) {
-						rec.endCharOffset = char_len + j;
-						if (rec.style_flags) gf_isom_text_add_style(samp, &rec);
-					}
-					switch (uniLine[i+1]) {
-					case 'b':
-					case 'B':
-						rec.style_flags |= GF_TXT_STYLE_BOLD;
-						set_start_char = GF_TRUE;
-						rec.startCharOffset = char_len + j;
-						break;
-					case 'i':
-					case 'I':
-						rec.style_flags |= GF_TXT_STYLE_ITALIC;
-						set_start_char = GF_TRUE;
-						rec.startCharOffset = char_len + j;
-						break;
-					case 'u':
-					case 'U':
-						rec.style_flags |= GF_TXT_STYLE_UNDERLINED;
-						set_start_char = GF_TRUE;
-						rec.startCharOffset = char_len + j;
-						break;
-					case 'f':
-					case 'F':
-						if (font_style) {
-							rec.text_color = font_style;
-							set_start_char = GF_TRUE;
-							rec.startCharOffset = char_len + j;
-						}
-						break;
-					}
-					i += style_nb_chars;
-					continue;
-				}
-
-				/*end of prev style*/
-				if (style_def_type==2)  {
-					switch (uniLine[i+2]) {
-					case 'b':
-					case 'B':
-						rem_styles |= GF_TXT_STYLE_BOLD;
-						set_end_char = GF_TRUE;
-						rec.endCharOffset = char_len + j;
-						break;
-					case 'i':
-					case 'I':
-						rem_styles |= GF_TXT_STYLE_ITALIC;
-						set_end_char = GF_TRUE;
-						rec.endCharOffset = char_len + j;
-						break;
-					case 'u':
-					case 'U':
-						rem_styles |= GF_TXT_STYLE_UNDERLINED;
-						set_end_char = GF_TRUE;
-						rec.endCharOffset = char_len + j;
-						break;
-					case 'f':
-					case 'F':
-						if (font_style) {
-							rem_color = 1;
-							set_end_char = GF_TRUE;
-							rec.endCharOffset = char_len + j;
-						}
-					}
-					i+=style_nb_chars;
-					continue;
-				}
-				/*store style*/
-				if (set_end_char) {
-					gf_isom_text_add_style(samp, &rec);
-					set_end_char = GF_FALSE;
-					set_start_char = GF_TRUE;
-					rec.startCharOffset = char_len + j;
-					rec.style_flags &= ~rem_styles;
-					rem_styles = 0;
-					rec.text_color = default_color;
-					rem_color = 0;
-				}
-
-				uniText[j] = uniLine[i];
-				j++;
-				i++;
-			}
-			/*store last style*/
-			if (set_end_char) {
-				gf_isom_text_add_style(samp, &rec);
-				set_end_char = GF_FALSE;
-				set_start_char = GF_TRUE;
-				rec.startCharOffset = char_len + j;
-				rec.style_flags &= ~rem_styles;
-			}
-
-			char_line = j;
-			uniText[j] = 0;
-
-			sptr = (u16 *) uniText;
-			len = (u32) gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
-
-			gf_isom_text_add_text(samp, szText, len);
-			char_len += char_line;
-			txt_line ++;
-			break;
-		}
-		if (duration && (start >= duration)) {
-			end = 0;
-			break;
-		}
-	}
-
-	/*final flush*/	
-	if (end && !(import->flags & GF_IMPORT_NO_TEXT_FLUSH ) ) {
-		gf_isom_text_reset(samp);
-		s = gf_isom_text_to_sample(samp);
-		s->DTS = (u64) ((timescale*end)/1000);
-		s->IsRAP = RAP;
-		gf_isom_add_sample(import->dest, track, 1, s);
-		gf_isom_sample_del(&s);
-		nb_samp++;
-		gf_isom_set_last_sample_duration(import->dest, track, 0);
-	} else {
-		if (duration && (start >= duration)) {
-			gf_isom_set_last_sample_duration(import->dest, track, (timescale*duration)/1000);
-		} else {
-			gf_isom_set_last_sample_duration(import->dest, track, 0);
-		}
-	}
-	gf_isom_delete_text_sample(samp);
-	gf_set_progress("Importing SRT", nb_samp, nb_samp);
-
-exit:
-	if (e) gf_isom_remove_track(import->dest, track);
-	gf_fclose(srt_in);
-	return e;
-}
-
-/* Structure used to pass importer and track data to the parsers without exposing the GF_MediaImporter structure
-   used by WebVTT and Flash->SVG */
-typedef struct {
-	GF_MediaImporter *import;
-	u32 timescale;
-	u32 track;
-	u32 descriptionIndex;
-} GF_ISOFlusher;
-
-#ifndef GPAC_DISABLE_VTT
-
-static GF_Err gf_webvtt_import_report(void *user, GF_Err e, char *message, const char *line)
-{
-	GF_ISOFlusher     *flusher = (GF_ISOFlusher *)user;
-	return gf_import_message(flusher->import, e, message, line);
-}
-
-static void gf_webvtt_import_header(void *user, const char *config)
-{
-	GF_ISOFlusher     *flusher = (GF_ISOFlusher *)user;
-	gf_isom_update_webvtt_description(flusher->import->dest, flusher->track, flusher->descriptionIndex, config);
-}
-
-static void gf_webvtt_flush_sample_to_iso(void *user, GF_WebVTTSample *samp)
-{
-	GF_ISOSample            *s;
-	GF_ISOFlusher     *flusher = (GF_ISOFlusher *)user;
-	//gf_webvtt_dump_sample(stdout, samp);
-	s = gf_isom_webvtt_to_sample(samp);
-	if (s) {
-		s->DTS = (u64) (flusher->timescale*gf_webvtt_sample_get_start(samp)/1000);
-		s->IsRAP = RAP;
-		gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
-		gf_isom_sample_del(&s);
-	}
-	gf_webvtt_sample_del(samp);
-}
-
-static GF_Err gf_text_import_webvtt(GF_MediaImporter *import)
-{
-	GF_Err						e;
-	u32							track;
-	u32							timescale;
-	u32							duration;
-	u32							descIndex=1;
-	u32							ID;
-	u32							OCR_ES_ID;
-	GF_GenericSubtitleConfig	*cfg;
-	GF_WebVTTParser				*vttparser;
-	GF_ISOFlusher				flusher;
-
-	cfg	= NULL;
-	if (import->esd) {
-		if (!import->esd->slConfig)	{
-			import->esd->slConfig =	(GF_SLConfig *)	gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->predefined =	2;
-			import->esd->slConfig->timestampResolution = 1000;
-		}
-		timescale =	import->esd->slConfig->timestampResolution;
-		if (!timescale)	timescale =	1000;
-
-		/*explicit text	config*/
-		if (import->esd->decoderConfig && import->esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_GEN_SUB_CFG_TAG) {
-			cfg	= (GF_GenericSubtitleConfig	*) import->esd->decoderConfig->decoderSpecificInfo;
-			import->esd->decoderConfig->decoderSpecificInfo	= NULL;
-		}
-		ID = import->esd->ESID;
-		OCR_ES_ID =	import->esd->OCRESID;
-	} else {
-		timescale =	1000;
-		OCR_ES_ID =	ID = 0;
-	}
-
-	if (cfg	&& cfg->timescale) timescale = cfg->timescale;
-	track =	gf_isom_new_track(import->dest,	ID,	GF_ISOM_MEDIA_TEXT,	timescale);
-	if (!track)	{
-		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating WebVTT track");
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
-
-	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track,	GF_ISOM_REF_OCR, OCR_ES_ID);
-
-	/*setup	track*/
-	if (cfg) {
-		u32	i;
-		u32	count;
-		/*set track	info*/
-		gf_isom_set_track_layout_info(import->dest,	track, cfg->text_width<<16,	cfg->text_height<<16, 0, 0,	cfg->layer);
-
-		/*and set sample descriptions*/
-		count =	gf_list_count(cfg->sample_descriptions);
-		for	(i=0; i<count; i++)	{
-			gf_isom_new_webvtt_description(import->dest, track, NULL, NULL, NULL, &descIndex);
-		}
-		gf_import_message(import, GF_OK, "WebVTT import	- text track %d	x %d", cfg->text_width,	cfg->text_height);
-		gf_odf_desc_del((GF_Descriptor *)cfg);
-	} else {
-		u32	w;
-		u32	h;
-
-		gf_text_get_video_size(import, &w, &h);
-		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
-
-		gf_isom_new_webvtt_description(import->dest, track,	NULL, NULL,	NULL, &descIndex);
-
-		gf_import_message(import, GF_OK, "WebVTT import");
-	}
-	gf_text_import_set_language(import, track);
-	duration = (u32) (((Double) import->duration)*timescale/1000.0);
-
-	vttparser = gf_webvtt_parser_new();
-	flusher.import = import;
-	flusher.timescale = timescale;
-	flusher.track = track;
-	flusher.descriptionIndex = descIndex;
-	e = gf_webvtt_parser_init(vttparser, import->in_name, &flusher, gf_webvtt_import_report, gf_webvtt_flush_sample_to_iso, gf_webvtt_import_header);
-	if (e != GF_OK) {
-		gf_webvtt_parser_del(vttparser);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported WebVTT UTF encoding");
-	}
-	e = gf_webvtt_parser_parse(vttparser, duration);
-	if (e != GF_OK) {
-		gf_isom_remove_track(import->dest, track);
-	}
-
-	/*do not add any empty sample at the end since it modifies track duration and is not needed - it is the player job
-	to figure out when to stop displaying the last text sample
-	However update the last sample duration*/
-	gf_isom_set_last_sample_duration(import->dest, track, (u32) gf_webvtt_parser_last_duration(vttparser));
-	
-	gf_webvtt_parser_del(vttparser);
-	return e;
-}
-
-#endif /*GPAC_DISABLE_VTT*/
-
-static char *ttxt_parse_string(GF_MediaImporter *import, char *str, Bool strip_lines)
-{
-	u32 i=0;
-	u32 k=0;
-	u32 len = (u32) strlen(str);
-	u32 state = 0;
-
-	if (!strip_lines) {
-		for (i=0; i<len; i++) {
-			if ((str[i] == '\r') && (str[i+1] == '\n')) {
-				i++;
-			}
-			str[k] = str[i];
-			k++;
-		}
-		str[k]=0;
-		return str;
-	}
-
-	if (str[0]!='\'') return str;
-	for (i=0; i<len; i++) {
-		if (str[i] == '\'') {
-
-			if (!state) {
-				if (k) {
-					str[k]='\n';
-					k++;
-				}
-				state = !state;
-			} else if (state) {
-				if ( (i+1==len) ||
-				        ((str[i+1]==' ') || (str[i+1]=='\n') || (str[i+1]=='\r') || (str[i+1]=='\t') || (str[i+1]=='\''))
-				   ) {
-					state = !state;
-				} else {
-					str[k] = str[i];
-					k++;
-				}
-			}
-		} else if (state) {
-			str[k] = str[i];
-			k++;
-		}
-	}
-	str[k]=0;
-	return str;
-}
-
-static void ttml_import_progress(void *cbk, u64 cur_samp, u64 count)
-{
-	gf_set_progress("TTML Loading", cur_samp, count);
-}
-
-static void gf_text_import_ebu_ttd_remove_samples(GF_XMLNode *root, GF_XMLNode **sample_list_node)
-{
-	u32 idx = 0, body_num = 0;
-	GF_XMLNode *node = NULL;
-	*sample_list_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;
-			while ( (body_node = (GF_XMLNode*)gf_list_enum(node->content, &body_idx))) {
-				if (!strcmp(body_node->name, "div")) {
-					*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);
-						assert(gf_list_find(body_node->content, content_node) == 0);
-						gf_list_rem(body_node->content, 0);
-						gf_xml_dom_node_del(content_node);
-					}
-					return;
-				}
-			}
-		}
-	}
-}
-
-#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
-static GF_Err gf_text_import_ebu_ttd(GF_MediaImporter *import, GF_DOMParser *parser, GF_XMLNode *root)
-{
-	GF_Err e, e_opt;
-	u32 i, track, ID, desc_idx, nb_samples, nb_children;
-	u64 last_sample_duration, last_sample_end;
-	GF_XMLAttribute *att;
-	GF_XMLNode *node, *root_working_copy, *sample_list_node;
-	GF_DOMParser *parser_working_copy;
-	char *samp_text;
-	Bool has_body;
-
-	samp_text = NULL;
-	root_working_copy = NULL;
-	parser_working_copy = NULL;
-
-	/*setup track in 3GP format directly (no ES desc)*/
-	ID = (import->esd) ? import->esd->ESID : 0;
-	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_MPEG_SUBT, 1000);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-
-	/*some MPEG-4 setup*/
-	if (import->esd) {
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->timestampResolution = 1000;
-		import->esd->decoderConfig->streamType = GF_STREAM_TEXT;
-		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_TEXT_MPEG4;
-		if (import->esd->OCRESID) gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_OCR, import->esd->OCRESID);
-	}
-
-	gf_import_message(import, GF_OK, "TTML EBU-TTD Import");
-
-	/*** root (including language) ***/
-	i=0;
-	while ( (att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("Found root attribute name %s, value %s\n", att->name, att->value));
-
-		if (!strcmp(att->name, "xmlns")) {
-			if (strcmp(att->value, TTML_NAMESPACE)) {
-				e = gf_import_message(import, GF_BAD_PARAM, "Found invalid EBU-TTD root attribute name %s, value %s (shall be \"%s\")\n", att->name, att->value, TTML_NAMESPACE);
-				goto exit;
-			}
-		} else if (!strcmp(att->name, "xml:lang")) {
-			if (import->esd && !import->esd->langDesc) {
-				char *lang;
-				lang = gf_strdup(att->value);
-				import->esd->langDesc = (GF_Language *) gf_odf_desc_new(GF_ODF_LANG_TAG);
-				gf_isom_set_media_language(import->dest, track, lang);
-			} else {
-				gf_isom_set_media_language(import->dest, track, att->value);
-			}
-		}
-	}
-
-	/*** style ***/
-#if 0
-	{
-		Bool has_styling, has_style;
-		GF_TextSampleDescriptor *sd;
-		has_styling = GF_FALSE;
-		has_style = GF_FALSE;
-		sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
-		i=0;
-		while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
-			if (node->type) {
-				continue;
-			} else if (gf_xml_get_element_check_namespace(node, "head", root->ns) == GF_OK) {
-				GF_XMLNode *head_node;
-				u32 head_idx = 0;
-				while ( (head_node = (GF_XMLNode*)gf_list_enum(node->content, &head_idx))) {
-					if (gf_xml_get_element_check_namespace(head_node, "styling", root->ns) == GF_OK) {
-						GF_XMLNode *styling_node;
-						u32 styling_idx;
-						if (has_styling) {
-							e = gf_import_message(import, GF_BAD_PARAM, "[TTML EBU-TTD] duplicated \"styling\" element. Abort.\n");
-							goto exit;
-						}
-						has_styling = GF_TRUE;
-
-						styling_idx = 0;
-						while ( (styling_node = (GF_XMLNode*)gf_list_enum(head_node->content, &styling_idx))) {
-							if (gf_xml_get_element_check_namespace(styling_node, "style", root->ns) == GF_OK) {
-								GF_XMLAttribute *p_att;
-								u32 style_idx = 0;
-								while ( (p_att = (GF_XMLAttribute*)gf_list_enum(styling_node->attributes, &style_idx))) {
-									if (!strcmp(p_att->name, "tts:direction")) {
-									} else if (!strcmp(p_att->name, "tts:fontFamily")) {
-										sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-										sd->font_count = 1;
-										sd->fonts[0].fontID = 1;
-										sd->fonts[0].fontName = gf_strdup(p_att->value);
-									} else if (!strcmp(p_att->name, "tts:backgroundColor")) {
-										GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("EBU-TTD style attribute \"%s\" ignored.\n", p_att->name));
-										//sd->back_color = ;
-									} else {
-										if ( !strcmp(p_att->name, "tts:fontSize")
-										        || !strcmp(p_att->name, "tts:lineHeight")
-										        || !strcmp(p_att->name, "tts:textAlign")
-										        || !strcmp(p_att->name, "tts:color")
-										        || !strcmp(p_att->name, "tts:fontStyle")
-										        || !strcmp(p_att->name, "tts:fontWeight")
-										        || !strcmp(p_att->name, "tts:textDecoration")
-										        || !strcmp(p_att->name, "tts:unicodeBidi")
-										        || !strcmp(p_att->name, "tts:wrapOption")
-										        || !strcmp(p_att->name, "tts:multiRowAlign")
-										        || !strcmp(p_att->name, "tts:linePadding")) {
-											GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("EBU-TTD style attribute \"%s\" ignored.\n", p_att->name));
-										} else {
-											GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("EBU-TTD unknown style attribute: \"%s\". Ignoring.\n", p_att->name));
-										}
-									}
-								}
-								break; //TODO: we only take care of the first style
-							}
-						}
-					}
-				}
-			}
-		}
-		if (!has_styling) {
-			e = gf_import_message(import, GF_BAD_PARAM, "[TTML EBU-TTD] missing \"styling\" element. Abort.\n");
-			goto exit;
-		}
-		if (!has_style) {
-			e = gf_import_message(import, GF_BAD_PARAM, "[TTML EBU-TTD] missing \"style\" element. Abort.\n");
-			goto exit;
-		}
-		e = gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &desc_idx);
-		gf_odf_desc_del((GF_Descriptor*)sd);
-	}
-#else
-	e = gf_isom_new_xml_subtitle_description(import->dest, track, TTML_NAMESPACE, NULL, NULL, &desc_idx);
-#endif
-	if (e != GF_OK) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] incorrect sample description. Abort.\n"));
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-
-	/*** body ***/
-	parser_working_copy = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser_working_copy, import->in_name, NULL, NULL);
-	assert (e == GF_OK);
-	root_working_copy = gf_xml_dom_get_root(parser_working_copy);
-	assert(root_working_copy);
-	last_sample_duration = 0;
-	last_sample_end = 0;
-	nb_samples = 0;
-	nb_children = gf_list_count(root->content);
-	has_body = GF_FALSE;
-	i=0;
-	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
-		if (node->type) {
-			nb_children--;
-			continue;
-		}
-
-		e_opt = gf_xml_get_element_check_namespace(node, "body", root->ns);
-		if (e_opt == 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_opt == GF_OK) {
-			GF_XMLNode *body_node;
-			u32 body_idx = 0;
-
-			if (has_body) {
-				e = gf_import_message(import, GF_BAD_PARAM, "[TTML EBU-TTD] duplicated \"body\" element. Abort.\n");
-				goto exit;
-			}
-			has_body = GF_TRUE;
-
-			/*remove all the entries from the working copy, we'll add samples one to one to create full XML samples*/
-			gf_text_import_ebu_ttd_remove_samples(root_working_copy, &sample_list_node);
-
-			while ( (body_node = (GF_XMLNode*)gf_list_enum(node->content, &body_idx))) {
-				e_opt = gf_xml_get_element_check_namespace(body_node, "div", root->ns);
-				if (e_opt == 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_opt == GF_OK) {
-					GF_XMLNode *div_node;
-					u32 div_idx = 0, nb_p_found = 0;
-					while ( (div_node = (GF_XMLNode*)gf_list_enum(body_node->content, &div_idx))) {
-						e_opt = gf_xml_get_element_check_namespace(div_node, "p", root->ns);
-						if (e_opt != GF_OK) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
-						} else if (e_opt == GF_OK) {
-							GF_XMLNode *p_node;
-							GF_XMLAttribute *p_att;
-							u32 p_idx = 0, h, m, s, f, ms;
-							s64 ts_begin = -1, ts_end = -1;
-
-							//sample is either in the <p> ...
-							while ( (p_att = (GF_XMLAttribute*)gf_list_enum(div_node->attributes, &p_idx))) {
-								if (!p_att) continue;
-								
-								if (!strcmp(p_att->name, "begin")) {
-									if (ts_begin != -1) {
-										e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"begin\" attribute. Abort.\n");
-										goto exit;
-									}
-									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-										ts_begin = (h*3600 + m*60+s)*1000+ms;
-									} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
-										ts_begin = (h*3600 + m*60+s)*1000+f*40;
-									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
-										ts_begin = (h*3600 + m*60+s)*1000;
-									}
-								} else if (!strcmp(p_att->name, "end")) {
-									if (ts_end != -1) {
-										e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"end\" attribute. Abort.\n");
-										goto exit;
-									}
-									if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-										ts_end = (h*3600 + m*60+s)*1000+ms;
-									} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
-										ts_end = (h*3600 + m*60+s)*1000+f*40;
-									} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
-										ts_end = (h*3600 + m*60+s)*1000;
-									}
-								}
-								if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
-									e = gf_xml_dom_append_child(sample_list_node, div_node);
-									assert(e == GF_OK);
-									assert(!samp_text);
-									samp_text = gf_xml_dom_serialize((GF_XMLNode*)root_working_copy, GF_FALSE);
-									e = gf_xml_dom_rem_child(sample_list_node, div_node);
-									assert(e == GF_OK);
-								}
-							}
-
-							//or under a <span>
-							p_idx = 0;
-							while ( (p_node = (GF_XMLNode*)gf_list_enum(div_node->content, &p_idx))) {
-								e_opt = gf_xml_get_element_check_namespace(p_node, "span", root->ns);
-								if (e_opt == GF_BAD_PARAM) {
-									GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] ignored \"%s\" node, check your namespaces\n", node->name));
-								} else if (e_opt == GF_OK) {
-									u32 span_idx = 0;
-									GF_XMLAttribute *span_att;
-									while ( (span_att = (GF_XMLAttribute*)gf_list_enum(p_node->attributes, &span_idx))) {
-										if (!span_att) continue;
-									
-										if (!strcmp(span_att->name, "begin")) {
-											if (ts_begin != -1) {
-												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"begin\" attribute under <span>. Abort.\n");
-												goto exit;
-											}
-											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-												ts_begin = (h*3600 + m*60+s)*1000+ms;
-											} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
-												ts_begin = (h*3600 + m*60+s)*1000+f*40;
-											} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
-												ts_begin = (h*3600 + m*60+s)*1000;
-											}
-										} else if (!strcmp(span_att->name, "end")) {
-											if (ts_end != -1) {
-												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated \"end\" attribute under <span>. Abort.\n");
-												goto exit;
-											}
-											if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-												ts_end = (h*3600 + m*60+s)*1000+ms;
-											} else if (sscanf(p_att->value, "%u:%u:%u:%u", &h, &m, &s, &f) == 4) {
-												ts_end = (h*3600 + m*60+s)*1000+f*40;
-											} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
-												ts_end = (h*3600 + m*60+s)*1000;
-											}
-										}
-										if ((ts_begin != -1) && (ts_end != -1) && !samp_text && sample_list_node) {
-											if (samp_text) {
-												e = gf_import_message(import, GF_BAD_PARAM, "[TTML] duplicated sample text under <span>. Abort.\n");
-												goto exit;
-											}
-
-											/*append the sample*/
-											e = gf_xml_dom_append_child(sample_list_node, div_node);
-											assert(e == GF_OK);
-											assert(!samp_text);
-											samp_text = gf_xml_dom_serialize((GF_XMLNode*)root_working_copy, GF_FALSE);
-											e = gf_xml_dom_rem_child(sample_list_node, div_node);
-											assert(e == GF_OK);
-										}
-									}
-								}
-							}
-
-							if ((ts_begin != -1) && (ts_end != -1) && samp_text) {
-								GF_ISOSample *s;
-								GF_GenericSubtitleSample *samp;
-								u32 len;
-								char *str;
-
-								if (ts_end < ts_begin) {
-									e = gf_import_message(import, GF_BAD_PARAM, "[TTML] invalid timings: \"begin\"="LLD" , \"end\"="LLD". Abort.\n", ts_begin, ts_end);
-									goto exit;
-								}
-
-								if (ts_begin < (s64)last_sample_end) {
-									e = gf_import_message(import, GF_BAD_PARAM, "[TTML] timing overlapping not supported: \"begin\" is "LLD" , last \"end\" was "LLD". Abort.\n", ts_begin, last_sample_end);
-									goto exit;
-								}
-
-								str = ttxt_parse_string(import, samp_text, GF_TRUE);
-								len = (u32) strlen(str);
-								samp = gf_isom_new_xml_subtitle_sample();
-								/*each sample consists of a full valid XML file*/
-								e = gf_isom_xml_subtitle_sample_add_text(samp, str, len);
-								if (e) {
-									GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML] ISOM - sample add text: %s", gf_error_to_string(e)));
-									goto exit;
-								}
-								gf_free(samp_text);
-								samp_text = NULL;
-
-								s = gf_isom_xml_subtitle_to_sample(samp);
-								gf_isom_delete_xml_subtitle_sample(samp);
-								if (!nb_samples) {
-									s->DTS = 0; /*in MP4 we must start at T=0*/
-									last_sample_duration = ts_end;
-								} else {
-									s->DTS = ts_begin;
-									last_sample_duration = ts_end - ts_begin;
-								}
-								last_sample_end = ts_end;
-								GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("ts_begin="LLD", ts_end="LLD", last_sample_duration="LLU" (real duration: "LLU"), last_sample_end="LLU"\n", ts_begin, ts_end, ts_end - last_sample_end, last_sample_duration, last_sample_end));
-
-								e = gf_isom_add_sample(import->dest, track, desc_idx, s);
-								if (e) {
-									GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML] ISOM - Add Sample: %s", gf_error_to_string(e)));
-									goto exit;
-								}
-								gf_isom_sample_del(&s);
-								nb_samples++;
-
-								nb_p_found++;
-								gf_set_progress("Importing TTML", nb_samples, nb_children);
-								if (import->duration && (ts_end > import->duration))
-									break;
-							} else {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML] incomplete sample (begin="LLD", end="LLD", text=\"%s\"). Skip.\n", ts_begin, ts_end, samp_text ? samp_text : "NULL"));
-							}
-						}
-					}
-
-					if (!nb_p_found) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] \"%s\" div node has no <p> elements. Aborting.\n", node->name));
-						goto exit;
-					}
-				}
-			}
-		}
-	}
-	if (!has_body) {
-		e = gf_import_message(import, GF_BAD_PARAM, "[TTML EBU-TTD] missing \"body\" element. Abort.\n");
-		goto exit;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("last_sample_duration="LLU", last_sample_end="LLU"\n", last_sample_duration, last_sample_end));
-	gf_isom_set_last_sample_duration(import->dest, track, (u32) last_sample_duration);
-	gf_media_update_bitrate(import->dest, track);
-	gf_set_progress("Importing TTML EBU-TTD", nb_samples, nb_samples);
-
-exit:
-	gf_free(samp_text);
-	gf_xml_dom_del(parser_working_copy);
-	if (!gf_isom_get_sample_count(import->dest, track)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] No sample imported. Might be an error. Check your content.\n"));
-	}
-	return e;
-}
-
-static GF_Err gf_text_import_ttml(GF_MediaImporter *import)
-{
-	GF_Err e;
-	GF_DOMParser *parser;
-	GF_XMLNode *root;
-
-	if (import->flags == GF_IMPORT_PROBE_ONLY)
-		return GF_OK;
-
-	parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser, import->in_name, ttml_import_progress, import);
-	if (e) {
-		gf_import_message(import, e, "Error parsing TTML file: Line %d - %s. Abort.", 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) {
-		gf_import_message(import, e, "Error parsing TTML file: no \"root\" found. Abort.");
-		gf_xml_dom_del(parser);
-		return e;
-	}
-
-	/*look for TTML*/
-	if (gf_xml_get_element_check_namespace(root, "tt", NULL) == GF_OK) {
-		e = gf_text_import_ebu_ttd(import, parser, root);
-		if (e == GF_OK) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Note: TTML import - EBU-TTD detected\n"));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("Parsing TTML file with error: %s\n", gf_error_to_string(e)));
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Unsupported TTML file - only EBU-TTD is supported (root shall be \"tt\", got \"%s\")\n", root->name));
-			GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("Importing as generic TTML\n"));
-			e = GF_OK;
-		}
-	} else {
-		if (root->ns) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s:%s\" (check your namespaces)\n", root->ns, root->name));
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s\"\n", root->name));
-		}
-		e = GF_BAD_PARAM;
-	}
-
-	gf_xml_dom_del(parser);
-	return e;
-}
-
-/* SimpleText Text tracks -related functions */
-GF_Box *boxstring_new_with_data(u32 type, const char *string);
-
-#ifndef GPAC_DISABLE_SWF_IMPORT
-
-/* SWF Importer */
-#include <gpac/internal/swf_dev.h>
-
-static GF_Err swf_svg_add_iso_sample(void *user, const char *data, u32 length, u64 timestamp, Bool isRap)
-{
-	GF_Err				e = GF_OK;
-	GF_ISOFlusher		*flusher = (GF_ISOFlusher *)user;
-	GF_ISOSample		*s;
-	GF_BitStream		*bs;
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (!bs) return GF_BAD_PARAM;
-	gf_bs_write_data(bs, data, length);
-	s = gf_isom_sample_new();
-	if (s) {
-		gf_bs_get_content(bs, &s->data, &s->dataLength);
-		s->DTS = (u64) (flusher->timescale*timestamp/1000);
-		s->IsRAP = isRap ? RAP : RAP_NO;
-		gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
-		gf_isom_sample_del(&s);
-	} else {
-		e = GF_BAD_PARAM;
-	}
-	gf_bs_del(bs);
-	return e;
-}
-
-static GF_Err swf_svg_add_iso_header(void *user, const char *data, u32 length, Bool isHeader)
-{
-	GF_ISOFlusher		*flusher = (GF_ISOFlusher *)user;
-	if (!flusher) return GF_BAD_PARAM;
-	if (isHeader) {
-		return gf_isom_update_stxt_description(flusher->import->dest, flusher->track, NULL, data, flusher->descriptionIndex);
-	} else {
-		return gf_isom_append_sample_data(flusher->import->dest, flusher->track, (char *)data, length);
-	}
-}
-
-GF_EXPORT
-GF_Err gf_text_import_swf(GF_MediaImporter *import)
-{
-	GF_Err						e = GF_OK;
-	u32							track;
-	u32							timescale;
-	//u32							duration;
-	u32							descIndex;
-	u32							ID;
-	u32							OCR_ES_ID;
-	GF_GenericSubtitleConfig	*cfg;
-	SWFReader					*read;
-	GF_ISOFlusher				flusher;
-	char						*mime;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		return GF_OK;
-	}
-
-	cfg	= NULL;
-	if (import->esd) {
-		if (!import->esd->slConfig)	{
-			import->esd->slConfig =	(GF_SLConfig *)	gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->predefined =	2;
-			import->esd->slConfig->timestampResolution = 1000;
-		}
-		timescale =	import->esd->slConfig->timestampResolution;
-		if (!timescale)	timescale =	1000;
-
-		/*explicit text	config*/
-		if (import->esd->decoderConfig && import->esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_GEN_SUB_CFG_TAG) {
-			cfg	= (GF_GenericSubtitleConfig	*) import->esd->decoderConfig->decoderSpecificInfo;
-			import->esd->decoderConfig->decoderSpecificInfo	= NULL;
-		}
-		ID = import->esd->ESID;
-		OCR_ES_ID =	import->esd->OCRESID;
-	} else {
-		timescale =	1000;
-		OCR_ES_ID =	ID = 0;
-	}
-
-	if (cfg	&& cfg->timescale) timescale = cfg->timescale;
-	track =	gf_isom_new_track(import->dest,	ID,	GF_ISOM_MEDIA_TEXT,	timescale);
-	if (!track)	{
-		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
-	}
-	gf_isom_set_track_enabled(import->dest,	track, 1);
-	if (import->esd	&& !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-
-	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track,	GF_ISOM_REF_OCR, OCR_ES_ID);
-
-	if (!stricmp(import->streamFormat, "SVG")) {
-		mime = "image/svg+xml";
-	} else {
-		mime = "application/octet-stream";
-	}
-
-	read = gf_swf_reader_new(NULL, import->in_name);
-	gf_swf_read_header(read);
-
-	/*setup	track*/
-	if (cfg) {
-		u32	i;
-		u32	count;
-		/*set track	info*/
-		gf_isom_set_track_layout_info(import->dest,	track, cfg->text_width<<16,	cfg->text_height<<16, 0, 0,	cfg->layer);
-
-		/*and set sample descriptions*/
-		count =	gf_list_count(cfg->sample_descriptions);
-		for	(i=0; i<count; i++)	{
-			gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT, mime, NULL, NULL, &descIndex);
-		}
-		gf_import_message(import, GF_OK, "SWF import - text track %d	x %d", cfg->text_width,	cfg->text_height);
-		gf_odf_desc_del((GF_Descriptor *)cfg);
-	} else {
-		u32	w = (u32)read->width;
-		u32	h = (u32)read->height;
-
-		if (!w || !h)
-			gf_text_get_video_size(import, &w, &h);
-
-		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
-
-		gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT, mime, NULL,	NULL, &descIndex);
-
-		gf_import_message(import, GF_OK, "SWF import (as text - type: %s)", import->streamFormat);
-	}
-	gf_text_import_set_language(import, track);
-	//duration = (u32) (((Double) import->duration)*timescale/1000.0);
-
-	flusher.import = import;
-	flusher.track = track;
-	flusher.timescale = timescale;
-	flusher.descriptionIndex = descIndex;
-	gf_swf_reader_set_user_mode(read, &flusher, swf_svg_add_iso_sample, swf_svg_add_iso_header);
-
-	if (!import->streamFormat || (import->streamFormat && !stricmp(import->streamFormat, "SVG"))) {
-#ifndef GPAC_DISABLE_SVG
-		e = swf_to_svg_init(read, import->swf_flags, import->swf_flatten_angle);
-#endif
-	} else { /*if (import->streamFormat && !strcmp(import->streamFormat, "BIFS"))*/
-#ifndef GPAC_DISABLE_VRML
-		e = swf_to_bifs_init(read);
-#endif
-	}
-	if (e) {
-		goto exit;
-	}
-	/*parse all tags*/
-	while (e == GF_OK) {
-		e = swf_parse_tag(read);
-	}
-	if (e==GF_EOS) e = GF_OK;
-exit:
-	gf_swf_reader_del(read);
-	gf_media_update_bitrate(import->dest, track);
-	return e;
-}
-/* end of SWF Importer */
-
-#else
-
-GF_EXPORT
-GF_Err gf_text_import_swf(GF_MediaImporter *import)
-{
-	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Warning: GPAC was compiled without SWF import support, can't import track.\n"));
-	return GF_NOT_SUPPORTED;
-}
-
-#endif /*GPAC_DISABLE_SWF_IMPORT*/
-
-static GF_Err gf_text_import_sub(GF_MediaImporter *import)
-{
-	FILE *sub_in;
-	u32 track, ID, timescale, i, j, desc_idx, start, end, prev_end, nb_samp, duration, len, line;
-	u64 file_size;
-	GF_TextConfig*cfg;
-	GF_Err e;
-	Double FPS;
-	GF_TextSample * samp;
-	Bool first_samp;
-	s32 unicode_type;
-	char szLine[2048], szTime[20], szText[2048];
-	GF_ISOSample *s;
-
-	sub_in = gf_fopen(import->in_name, "rt");
-	unicode_type = gf_text_get_utf_type(sub_in);
-	if (unicode_type<0) {
-		gf_fclose(sub_in);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported SUB UTF encoding");
-	}
-
-	FPS = GF_IMPORT_DEFAULT_FPS;
-	if (import->video_fps) FPS = import->video_fps;
-
-	cfg = NULL;
-	if (import->esd) {
-		if (!import->esd->slConfig) {
-			import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->predefined = 2;
-			import->esd->slConfig->timestampResolution = 1000;
-		}
-		timescale = import->esd->slConfig->timestampResolution;
-		if (!timescale) timescale = 1000;
-
-		/*explicit text config*/
-		if (import->esd->decoderConfig && import->esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_TEXT_CFG_TAG) {
-			cfg = (GF_TextConfig *) import->esd->decoderConfig->decoderSpecificInfo;
-			import->esd->decoderConfig->decoderSpecificInfo = NULL;
-		}
-		ID = import->esd->ESID;
-	} else {
-		timescale = 1000;
-		ID = 0;
-	}
-
-	if (cfg && cfg->timescale) timescale = cfg->timescale;
-	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, timescale);
-	if (!track) {
-		gf_fclose(sub_in);
-		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-
-	gf_text_import_set_language(import, track);
-
-	file_size = 0;
-	/*setup track*/
-	if (cfg) {
-		u32 count;
-		char *firstFont = NULL;
-		/*set track info*/
-		gf_isom_set_track_layout_info(import->dest, track, cfg->text_width<<16, cfg->text_height<<16, 0, 0, cfg->layer);
-
-		/*and set sample descriptions*/
-		count = gf_list_count(cfg->sample_descriptions);
-		for (i=0; i<count; i++) {
-			GF_TextSampleDescriptor *sd= (GF_TextSampleDescriptor *)gf_list_get(cfg->sample_descriptions, i);
-			if (!sd->font_count) {
-				sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-				sd->font_count = 1;
-				sd->fonts[0].fontID = 1;
-				sd->fonts[0].fontName = gf_strdup("Serif");
-			}
-			if (!sd->default_style.fontID) sd->default_style.fontID = sd->fonts[0].fontID;
-			if (!sd->default_style.font_size) sd->default_style.font_size = 16;
-			if (!sd->default_style.text_color) sd->default_style.text_color = 0xFF000000;
-			file_size = sd->default_style.font_size;
-			gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &desc_idx);
-			if (!firstFont) firstFont = sd->fonts[0].fontName;
-		}
-		gf_import_message(import, GF_OK, "Timed Text (SUB @ %02.2f) import - text track %d x %d, font %s (size %d)", FPS, cfg->text_width, cfg->text_height, firstFont, file_size);
-
-		gf_odf_desc_del((GF_Descriptor *)cfg);
-	} else {
-		u32 w, h;
-		GF_TextSampleDescriptor *sd;
-		gf_text_get_video_size(import, &w, &h);
-
-		/*have to work with default - use max size (if only one video, this means the text region is the
-		entire display, and with bottom alignment things should be fine...*/
-		gf_isom_set_track_layout_info(import->dest, track, w<<16, h<<16, 0, 0, 0);
-		sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
-		sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-		sd->font_count = 1;
-		sd->fonts[0].fontID = 1;
-		sd->fonts[0].fontName = gf_strdup("Serif");
-		sd->back_color = 0x00000000;	/*transparent*/
-		sd->default_style.fontID = 1;
-		sd->default_style.font_size = TTXT_DEFAULT_FONT_SIZE;
-		sd->default_style.text_color = 0xFFFFFFFF;	/*white*/
-		sd->default_style.style_flags = 0;
-		sd->horiz_justif = 1; /*center of scene*/
-		sd->vert_justif = (s8) -1;	/*bottom of scene*/
-
-		if (import->flags & GF_IMPORT_SKIP_TXT_BOX) {
-			sd->default_pos.top = sd->default_pos.left = sd->default_pos.right = sd->default_pos.bottom = 0;
-		} else {
-			if ((sd->default_pos.bottom==sd->default_pos.top) || (sd->default_pos.right==sd->default_pos.left)) {
-				sd->default_pos.left = import->text_x;
-				sd->default_pos.top = import->text_y;
-				sd->default_pos.right = (import->text_width ? import->text_width : w) + sd->default_pos.left;
-				sd->default_pos.bottom = (import->text_height ? import->text_height : h) + sd->default_pos.top;
-			}
-		}
-
-		gf_isom_new_text_description(import->dest, track, sd, NULL, NULL, &desc_idx);
-		gf_import_message(import, GF_OK, "Timed Text (SUB @ %02.2f) import - text track %d x %d, font %s (size %d)", FPS, w, h, sd->fonts[0].fontName, TTXT_DEFAULT_FONT_SIZE);
-		gf_odf_desc_del((GF_Descriptor *)sd);
-	}
-
-	duration = (u32) (((Double) import->duration)*timescale/1000.0);
-
-	e = GF_OK;
-	nb_samp = 0;
-	samp = gf_isom_new_text_sample();
-
-	FPS = ((Double) timescale ) / FPS;
-	end = prev_end = 0;
-
-	line = 0;
-	first_samp = GF_TRUE;
-	while (1) {
-		char *sOK = gf_text_get_utf8_line(szLine, 2048, sub_in, unicode_type);
-		if (!sOK) break;
-
-		REM_TRAIL_MARKS(szLine, "\r\n\t ")
-
-		line++;
-		len = (u32) strlen(szLine);
-		if (!len) continue;
-
-		i=0;
-		if (szLine[i] != '{') {
-			e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Bad SUB file (line %d): expecting \"{\" got \"%c\"", line, szLine[i]);
-			goto exit;
-		}
-		while (szLine[i+1] && szLine[i+1]!='}') {
-			szTime[i] = szLine[i+1];
-			i++;
-		}
-		szTime[i] = 0;
-		start = atoi(szTime);
-		if (start<end) {
-			gf_import_message(import, GF_OK, "WARNING: corrupted SUB frame (line %d) - starts (at %d ms) before end of previous one (%d ms) - adjusting time stamps", line, start, end);
-			start = end;
-		}
-		j=i+2;
-		i=0;
-		if (szLine[i+j] != '{') {
-			e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Bad SUB file - expecting \"{\" got \"%c\"", szLine[i]);
-			goto exit;
-		}
-		while (szLine[i+1+j] && szLine[i+1+j]!='}') {
-			szTime[i] = szLine[i+1+j];
-			i++;
-		}
-		szTime[i] = 0;
-		end = atoi(szTime);
-		j+=i+2;
-
-		if (start>end) {
-			gf_import_message(import, GF_OK, "WARNING: corrupted SUB frame (line %d) - ends (at %d ms) before start of current frame (%d ms) - skipping", line, end, start);
-			continue;
-		}
-
-		gf_isom_text_reset(samp);
-
-		if (start && first_samp) {
-			s = gf_isom_text_to_sample(samp);
-			s->DTS = 0;
-			s->IsRAP = RAP;
-			gf_isom_add_sample(import->dest, track, 1, s);
-			gf_isom_sample_del(&s);
-			first_samp = GF_FALSE;
-			nb_samp++;
-		}
-
-		for (i=j; i<len; i++) {
-			if (szLine[i]=='|') {
-				szText[i-j] = '\n';
-			} else {
-				szText[i-j] = szLine[i];
-			}
-		}
-		szText[i-j] = 0;
-		gf_isom_text_add_text(samp, szText, (u32) strlen(szText) );
-
-		if (prev_end) {
-			GF_TextSample * empty_samp = gf_isom_new_text_sample();
-			s = gf_isom_text_to_sample(empty_samp);
-			s->DTS = (u64) (FPS*(s64)prev_end);
-			gf_isom_add_sample(import->dest, track, 1, s);
-			gf_isom_sample_del(&s);
-			nb_samp++;
-			gf_isom_delete_text_sample(empty_samp);
-		}
-
-		s = gf_isom_text_to_sample(samp);
-		s->DTS = (u64) (FPS*(s64)start);
-		gf_isom_add_sample(import->dest, track, 1, s);
-		gf_isom_sample_del(&s);
-		nb_samp++;
-		gf_isom_text_reset(samp);
-		prev_end = end;
-		gf_set_progress("Importing SUB", gf_ftell(sub_in), file_size);
-		if (duration && (end >= duration)) break;
-	}
-	/*final flush*/
-	if (end && !(import->flags & GF_IMPORT_NO_TEXT_FLUSH ) ) {
-		gf_isom_text_reset(samp);
-		s = gf_isom_text_to_sample(samp);
-		s->DTS = (u64)(FPS*(s64)end);
-		gf_isom_add_sample(import->dest, track, 1, s);
-		gf_isom_sample_del(&s);
-		nb_samp++;
-	}
-	gf_isom_delete_text_sample(samp);
-	
-	gf_isom_set_last_sample_duration(import->dest, track, 0);
-	gf_set_progress("Importing SUB", nb_samp, nb_samp);
-
-exit:
-	if (e) gf_isom_remove_track(import->dest, track);
-	gf_fclose(sub_in);
-	return e;
-}
-
-
-#define CHECK_STR(__str)	\
-	if (!__str) { \
-		e = gf_import_message(import, GF_BAD_PARAM, "Invalid XML formatting (line %d)", parser.line);	\
-		goto exit;	\
-	}	\
- 
-
-u32 ttxt_get_color(GF_MediaImporter *import, char *val)
-{
-	u32 r, g, b, a, res;
-	r = g = b = a = 0;
-	if (sscanf(val, "%x %x %x %x", &r, &g, &b, &a) != 4) {
-		gf_import_message(import, GF_OK, "Warning: color badly formatted");
-	}
-	res = (a&0xFF);
-	res<<=8;
-	res |= (r&0xFF);
-	res<<=8;
-	res |= (g&0xFF);
-	res<<=8;
-	res |= (b&0xFF);
-	return res;
-}
-
-void ttxt_parse_text_box(GF_MediaImporter *import, GF_XMLNode *n, GF_BoxRecord *box)
-{
-	u32 i=0;
-	GF_XMLAttribute *att;
-	memset(box, 0, sizeof(GF_BoxRecord));
-	while ( (att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
-		if (!stricmp(att->name, "top")) box->top = atoi(att->value);
-		else if (!stricmp(att->name, "bottom")) box->bottom = atoi(att->value);
-		else if (!stricmp(att->name, "left")) box->left = atoi(att->value);
-		else if (!stricmp(att->name, "right")) box->right = atoi(att->value);
-	}
-}
-
-void ttxt_parse_text_style(GF_MediaImporter *import, GF_XMLNode *n, GF_StyleRecord *style)
-{
-	u32 i=0;
-	GF_XMLAttribute *att;
-	memset(style, 0, sizeof(GF_StyleRecord));
-	style->fontID = 1;
-	style->font_size = TTXT_DEFAULT_FONT_SIZE;
-	style->text_color = 0xFFFFFFFF;
-
-	while ( (att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
-		if (!stricmp(att->name, "fromChar")) style->startCharOffset = atoi(att->value);
-		else if (!stricmp(att->name, "toChar")) style->endCharOffset = atoi(att->value);
-		else if (!stricmp(att->name, "fontID")) style->fontID = atoi(att->value);
-		else if (!stricmp(att->name, "fontSize")) style->font_size = atoi(att->value);
-		else if (!stricmp(att->name, "color")) style->text_color = ttxt_get_color(import, att->value);
-		else if (!stricmp(att->name, "styles")) {
-			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;
-		}
-	}
-}
-
-static void ttxt_import_progress(void *cbk, u64 cur_samp, u64 count)
-{
-	gf_set_progress("TTXT Loading", cur_samp, count);
-}
-
-static GF_Err gf_text_import_ttxt(GF_MediaImporter *import)
-{
-	GF_Err e;
-	Bool last_sample_empty;
-	u32 i, j, k, track, ID, nb_samples, nb_descs, nb_children;
-	u64 last_sample_duration;
-	GF_XMLAttribute *att;
-	GF_DOMParser *parser;
-	GF_XMLNode *root, *node, *ext;
-
-	if (import->flags==GF_IMPORT_PROBE_ONLY) return GF_OK;
-
-	parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser, import->in_name, ttxt_import_progress, import);
-	if (e) {
-		gf_import_message(import, e, "Error parsing TTXT file: Line %d - %s", 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);
-
-	e = GF_OK;
-	if (strcmp(root->name, "TextStream")) {
-		e = gf_import_message(import, GF_BAD_PARAM, "Invalid Timed Text file - expecting \"TextStream\" got %s", "TextStream", root->name);
-		goto exit;
-	}
-
-	/*setup track in 3GP format directly (no ES desc)*/
-	ID = (import->esd) ? import->esd->ESID : 0;
-	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, 1000);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	/*some MPEG-4 setup*/
-	if (import->esd) {
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->timestampResolution = 1000;
-		import->esd->decoderConfig->streamType = GF_STREAM_TEXT;
-		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_TEXT_MPEG4;
-		if (import->esd->OCRESID) gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_OCR, import->esd->OCRESID);
-	}
-	gf_text_import_set_language(import, track);
-
-	gf_import_message(import, GF_OK, "Timed Text (GPAC TTXT) Import");
-
-	last_sample_empty = GF_FALSE;
-	last_sample_duration = 0;
-	nb_descs = 0;
-	nb_samples = 0;
-	nb_children = gf_list_count(root->content);
-
-	i=0;
-	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
-		if (node->type) {
-			nb_children--;
-			continue;
-		}
-
-		if (!strcmp(node->name, "TextStreamHeader")) {
-			GF_XMLNode *sdesc;
-			s32 w, h, tx, ty, layer;
-			u32 tref_id;
-			w = TTXT_DEFAULT_WIDTH;
-			h = TTXT_DEFAULT_HEIGHT;
-			tx = ty = layer = 0;
-			nb_children--;
-			tref_id = 0;
-
-			j=0;
-			while ( (att=(GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
-				if (!strcmp(att->name, "width")) w = atoi(att->value);
-				else if (!strcmp(att->name, "height")) h = atoi(att->value);
-				else if (!strcmp(att->name, "layer")) layer = atoi(att->value);
-				else if (!strcmp(att->name, "translation_x")) tx = atoi(att->value);
-				else if (!strcmp(att->name, "translation_y")) ty = atoi(att->value);
-				else if (!strcmp(att->name, "trefID")) tref_id = atoi(att->value);
-			}
-
-			if (tref_id)
-				gf_isom_set_track_reference(import->dest, track, GF_ISOM_BOX_TYPE_CHAP, tref_id);
-
-			gf_isom_set_track_layout_info(import->dest, track, w<<16, h<<16, tx<<16, ty<<16, (s16) layer);
-
-			j=0;
-			while ( (sdesc=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
-				if (sdesc->type) continue;
-
-				if (!strcmp(sdesc->name, "TextSampleDescription")) {
-					GF_TextSampleDescriptor td;
-					u32 idx;
-					memset(&td, 0, sizeof(GF_TextSampleDescriptor));
-					td.tag = GF_ODF_TEXT_CFG_TAG;
-					td.vert_justif = (s8) -1;
-					td.default_style.fontID = 1;
-					td.default_style.font_size = TTXT_DEFAULT_FONT_SIZE;
-
-					k=0;
-					while ( (att=(GF_XMLAttribute *)gf_list_enum(sdesc->attributes, &k))) {
-						if (!strcmp(att->name, "horizontalJustification")) {
-							if (!stricmp(att->value, "center")) td.horiz_justif = 1;
-							else if (!stricmp(att->value, "right")) td.horiz_justif = (s8) -1;
-							else if (!stricmp(att->value, "left")) td.horiz_justif = 0;
-						}
-						else if (!strcmp(att->name, "verticalJustification")) {
-							if (!stricmp(att->value, "center")) td.vert_justif = 1;
-							else if (!stricmp(att->value, "bottom")) td.vert_justif = (s8) -1;
-							else if (!stricmp(att->value, "top")) td.vert_justif = 0;
-						}
-						else if (!strcmp(att->name, "backColor")) td.back_color = ttxt_get_color(import, att->value);
-						else if (!strcmp(att->name, "verticalText") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_VERTICAL;
-						else if (!strcmp(att->name, "fillTextRegion") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_FILL_REGION;
-						else if (!strcmp(att->name, "continuousKaraoke") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_KARAOKE;
-						else if (!strcmp(att->name, "scroll")) {
-							if (!stricmp(att->value, "inout")) td.displayFlags |= GF_TXT_SCROLL_IN | GF_TXT_SCROLL_OUT;
-							else if (!stricmp(att->value, "in")) td.displayFlags |= GF_TXT_SCROLL_IN;
-							else if (!stricmp(att->value, "out")) td.displayFlags |= GF_TXT_SCROLL_OUT;
-						}
-						else if (!strcmp(att->name, "scrollMode")) {
-							u32 scroll_mode = GF_TXT_SCROLL_CREDITS;
-							if (!stricmp(att->value, "Credits")) scroll_mode = GF_TXT_SCROLL_CREDITS;
-							else if (!stricmp(att->value, "Marquee")) scroll_mode = GF_TXT_SCROLL_MARQUEE;
-							else if (!stricmp(att->value, "Right")) scroll_mode = GF_TXT_SCROLL_RIGHT;
-							else if (!stricmp(att->value, "Down")) scroll_mode = GF_TXT_SCROLL_DOWN;
-							td.displayFlags |= ((scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION);
-						}
-					}
-
-					k=0;
-					while ( (ext=(GF_XMLNode*)gf_list_enum(sdesc->content, &k))) {
-						if (ext->type) continue;
-						if (!strcmp(ext->name, "TextBox")) ttxt_parse_text_box(import, ext, &td.default_pos);
-						else if (!strcmp(ext->name, "Style")) ttxt_parse_text_style(import, ext, &td.default_style);
-						else if (!strcmp(ext->name, "FontTable")) {
-							GF_XMLNode *ftable;
-							u32 z=0;
-							while ( (ftable=(GF_XMLNode*)gf_list_enum(ext->content, &z))) {
-								u32 m;
-								if (ftable->type || strcmp(ftable->name, "FontTableEntry")) continue;
-								td.font_count += 1;
-								td.fonts = (GF_FontRecord*)gf_realloc(td.fonts, sizeof(GF_FontRecord)*td.font_count);
-								m=0;
-								while ( (att=(GF_XMLAttribute *)gf_list_enum(ftable->attributes, &m))) {
-									if (!stricmp(att->name, "fontID")) td.fonts[td.font_count-1].fontID = atoi(att->value);
-									else if (!stricmp(att->name, "fontName")) td.fonts[td.font_count-1].fontName = gf_strdup(att->value);
-								}
-							}
-						}
-					}
-					if (import->flags & GF_IMPORT_SKIP_TXT_BOX) {
-						td.default_pos.top = td.default_pos.left = td.default_pos.right = td.default_pos.bottom = 0;
-					} else {
-						if ((td.default_pos.bottom==td.default_pos.top) || (td.default_pos.right==td.default_pos.left)) {
-							td.default_pos.top = td.default_pos.left = 0;
-							td.default_pos.right = w;
-							td.default_pos.bottom = h;
-						}
-					}
-					if (!td.fonts) {
-						td.font_count = 1;
-						td.fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-						td.fonts[0].fontID = 1;
-						td.fonts[0].fontName = gf_strdup("Serif");
-					}
-					gf_isom_new_text_description(import->dest, track, &td, NULL, NULL, &idx);
-					for (k=0; k<td.font_count; k++) gf_free(td.fonts[k].fontName);
-					gf_free(td.fonts);
-					nb_descs ++;
-				}
-			}
-		}
-		/*sample text*/
-		else if (!strcmp(node->name, "TextSample")) {
-			GF_ISOSample *s;
-			GF_TextSample * samp;
-			u32 ts, descIndex;
-			Bool has_text = GF_FALSE;
-			if (!nb_descs) {
-				e = gf_import_message(import, GF_BAD_PARAM, "Invalid Timed Text file - text stream header not found or empty");
-				goto exit;
-			}
-			samp = gf_isom_new_text_sample();
-			ts = 0;
-			descIndex = 1;
-			last_sample_empty = GF_TRUE;
-
-			j=0;
-			while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
-				if (!strcmp(att->name, "sampleTime")) {
-					u32 h, m, s, ms;
-					if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-						ts = (h*3600 + m*60 + s)*1000 + ms;
-					} else {
-						ts = (u32) (atof(att->value) * 1000);
-					}
-				}
-				else if (!strcmp(att->name, "sampleDescriptionIndex")) descIndex = atoi(att->value);
-				else if (!strcmp(att->name, "text")) {
-					u32 len;
-					char *str = ttxt_parse_string(import, att->value, GF_TRUE);
-					len = (u32) strlen(str);
-					gf_isom_text_add_text(samp, str, len);
-					last_sample_empty = len ? GF_FALSE : GF_TRUE;
-					has_text = GF_TRUE;
-				}
-				else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, (u32) (1000*atoi(att->value)));
-				else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color_argb(samp, ttxt_get_color(import, att->value));
-				else if (!strcmp(att->name, "wrap") && !strcmp(att->value, "Automatic")) gf_isom_text_set_wrap(samp, 0x01);
-			}
-
-			/*get all modifiers*/
-			j=0;
-			while ( (ext=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
-				if (!has_text && (ext->type==GF_XML_TEXT_TYPE)) {
-					u32 len;
-					char *str = ttxt_parse_string(import, ext->name, GF_FALSE);
-					len = (u32) strlen(str);
-					gf_isom_text_add_text(samp, str, len);
-					last_sample_empty = len ? GF_FALSE : GF_TRUE;
-					has_text = GF_TRUE;
-				}
-				if (ext->type) continue;
-
-				if (!stricmp(ext->name, "Style")) {
-					GF_StyleRecord r;
-					ttxt_parse_text_style(import, ext, &r);
-					gf_isom_text_add_style(samp, &r);
-				}
-				else if (!stricmp(ext->name, "TextBox")) {
-					GF_BoxRecord r;
-					ttxt_parse_text_box(import, ext, &r);
-					gf_isom_text_set_box(samp, r.top, r.left, r.bottom, r.right);
-				}
-				else if (!stricmp(ext->name, "Highlight")) {
-					u16 start, end;
-					start = end = 0;
-					k=0;
-					while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
-						if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
-						else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
-					}
-					gf_isom_text_add_highlight(samp, start, end);
-				}
-				else if (!stricmp(ext->name, "Blinking")) {
-					u16 start, end;
-					start = end = 0;
-					k=0;
-					while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
-						if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
-						else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
-					}
-					gf_isom_text_add_blink(samp, start, end);
-				}
-				else if (!stricmp(ext->name, "HyperLink")) {
-					u16 start, end;
-					char *url, *url_tt;
-					start = end = 0;
-					url = url_tt = NULL;
-					k=0;
-					while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
-						if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
-						else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
-						else if (!strcmp(att->name, "URL")) url = gf_strdup(att->value);
-						else if (!strcmp(att->name, "URLToolTip")) url_tt = gf_strdup(att->value);
-					}
-					gf_isom_text_add_hyperlink(samp, url, url_tt, start, end);
-					if (url) gf_free(url);
-					if (url_tt) gf_free(url_tt);
-				}
-				else if (!stricmp(ext->name, "Karaoke")) {
-					u32 startTime;
-					GF_XMLNode *krok;
-					startTime = 0;
-					k=0;
-					while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
-						if (!strcmp(att->name, "startTime")) startTime = (u32) (1000*atof(att->value));
-					}
-					gf_isom_text_add_karaoke(samp, startTime);
-					k=0;
-					while ( (krok=(GF_XMLNode*)gf_list_enum(ext->content, &k))) {
-						u16 start, end;
-						u32 endTime, m;
-						if (krok->type) continue;
-						if (strcmp(krok->name, "KaraokeRange")) continue;
-						start = end = 0;
-						endTime = 0;
-						m=0;
-						while ( (att=(GF_XMLAttribute *)gf_list_enum(krok->attributes, &m))) {
-							if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
-							else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
-							else if (!strcmp(att->name, "endTime")) endTime = (u32) (1000*atof(att->value));
-						}
-						gf_isom_text_set_karaoke_segment(samp, endTime, start, end);
-					}
-				}
-			}
-
-			/*in MP4 we must start at T=0, so add an empty sample*/
-			if (ts && !nb_samples) {
-				GF_TextSample * firstsamp = gf_isom_new_text_sample();
-				s = gf_isom_text_to_sample(firstsamp);
-				s->DTS = 0;
-				gf_isom_add_sample(import->dest, track, 1, s);
-				nb_samples++;
-				gf_isom_delete_text_sample(firstsamp);
-				gf_isom_sample_del(&s);
-			}
-
-			s = gf_isom_text_to_sample(samp);
-			gf_isom_delete_text_sample(samp);
-			s->DTS = ts;
-			if (last_sample_empty) {
-				last_sample_duration = s->DTS - last_sample_duration;
-			} else {
-				last_sample_duration = s->DTS;
-			}
-
-			e = gf_isom_add_sample(import->dest, track, descIndex, s);
-			if (e) goto exit;
-			gf_isom_sample_del(&s);
-			nb_samples++;
-
-			gf_set_progress("Importing TTXT", nb_samples, nb_children);
-			if (import->duration && (ts>import->duration)) break;
-		}
-	}
-	if (last_sample_empty) {
-		gf_isom_remove_sample(import->dest, track, nb_samples);
-		gf_isom_set_last_sample_duration(import->dest, track, (u32) last_sample_duration);
-	}
-	gf_set_progress("Importing TTXT", nb_samples, nb_samples);
-
-exit:
-	gf_xml_dom_del(parser);
-	return e;
-}
-
-
-u32 tx3g_get_color(GF_MediaImporter *import, char *value)
-{
-	u32 r, g, b, a;
-	u32 res, v;
-	r = g = b = a = 0;
-	if (sscanf(value, "%u%%, %u%%, %u%%, %u%%", &r, &g, &b, &a) != 4) {
-		gf_import_message(import, GF_OK, "Warning: color badly formatted");
-	}
-	v = (u32) (a*255/100);
-	res = (v&0xFF);
-	res<<=8;
-	v = (u32) (r*255/100);
-	res |= (v&0xFF);
-	res<<=8;
-	v = (u32) (g*255/100);
-	res |= (v&0xFF);
-	res<<=8;
-	v = (u32) (b*255/100);
-	res |= (v&0xFF);
-	return res;
-}
-
-void tx3g_parse_text_box(GF_MediaImporter *import, GF_XMLNode *n, GF_BoxRecord *box)
-{
-	u32 i=0;
-	GF_XMLAttribute *att;
-	memset(box, 0, sizeof(GF_BoxRecord));
-	while ((att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
-		if (!stricmp(att->name, "x")) box->left = atoi(att->value);
-		else if (!stricmp(att->name, "y")) box->top = atoi(att->value);
-		else if (!stricmp(att->name, "height")) box->bottom = atoi(att->value);
-		else if (!stricmp(att->name, "width")) box->right = atoi(att->value);
-	}
-}
-
-typedef struct
-{
-	u32 id;
-	u32 pos;
-} Marker;
-
-#define GET_MARKER_POS(_val, __isend) \
-	{	\
-		u32 i, __m = atoi(att->value);	\
-		_val = 0;	\
-		for (i=0; i<nb_marks; i++) { if (__m==marks[i].id) { _val = marks[i].pos; /*if (__isend) _val--; */break; } }	 \
-	}
-
-
-static void texml_import_progress(void *cbk, u64 cur_samp, u64 count)
-{
-	gf_set_progress("TeXML Loading", cur_samp, count);
-}
-
-static GF_Err gf_text_import_texml(GF_MediaImporter *import)
-{
-	GF_Err e;
-	u32 track, ID, nb_samples, nb_children, nb_descs, timescale, w, h, i, j, k;
-	u64 DTS;
-	s32 tx, ty, layer;
-	GF_StyleRecord styles[50];
-	Marker marks[50];
-	GF_XMLAttribute *att;
-	GF_DOMParser *parser;
-	GF_XMLNode *root, *node;
-
-	if (import->flags==GF_IMPORT_PROBE_ONLY) return GF_OK;
-
-	parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser, import->in_name, texml_import_progress, import);
-	if (e) {
-		gf_import_message(import, e, "Error parsing TeXML file: Line %d - %s", 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 (strcmp(root->name, "text3GTrack")) {
-		e = gf_import_message(import, GF_BAD_PARAM, "Invalid QT TeXML file - expecting root \"text3GTrack\" got \"%s\"", root->name);
-		goto exit;
-	}
-	w = TTXT_DEFAULT_WIDTH;
-	h = TTXT_DEFAULT_HEIGHT;
-	tx = ty = 0;
-	layer = 0;
-	timescale = 1000;
-	i=0;
-	while ( (att=(GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
-		if (!strcmp(att->name, "trackWidth")) w = atoi(att->value);
-		else if (!strcmp(att->name, "trackHeight")) h = atoi(att->value);
-		else if (!strcmp(att->name, "layer")) layer = atoi(att->value);
-		else if (!strcmp(att->name, "timescale")) timescale = atoi(att->value);
-		else if (!strcmp(att->name, "transform")) {
-			Float fx, fy;
-			sscanf(att->value, "translate(%f,%f)", &fx, &fy);
-			tx = (u32) fx;
-			ty = (u32) fy;
-		}
-	}
-
-	/*setup track in 3GP format directly (no ES desc)*/
-	ID = (import->esd) ? import->esd->ESID : 0;
-	track = gf_isom_new_track(import->dest, ID, GF_ISOM_MEDIA_TEXT, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	/*some MPEG-4 setup*/
-	if (import->esd) {
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->timestampResolution = timescale;
-		import->esd->decoderConfig->streamType = GF_STREAM_TEXT;
-		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_TEXT_MPEG4;
-		if (import->esd->OCRESID) gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_OCR, import->esd->OCRESID);
-	}
-	DTS = 0;
-	gf_isom_set_track_layout_info(import->dest, track, w<<16, h<<16, tx<<16, ty<<16, (s16) layer);
-
-	gf_text_import_set_language(import, track);
-	e = GF_OK;
-
-	gf_import_message(import, GF_OK, "Timed Text (QT TeXML) Import - Track Size %d x %d", w, h);
-
-	nb_children = gf_list_count(root->content);
-	nb_descs = 0;
-	nb_samples = 0;
-	i=0;
-	while ( (node=(GF_XMLNode*)gf_list_enum(root->content, &i))) {
-		GF_XMLNode *desc;
-		GF_TextSampleDescriptor td;
-		GF_TextSample * samp = NULL;
-		GF_ISOSample *s;
-		u32 duration, descIndex, nb_styles, nb_marks;
-		Bool isRAP, same_style, same_box;
-
-		if (node->type) continue;
-		if (strcmp(node->name, "sample")) continue;
-
-		isRAP = GF_FALSE;
-		duration = 1000;
-		j=0;
-		while ((att=(GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
-			if (!strcmp(att->name, "duration")) duration = atoi(att->value);
-			else if (!strcmp(att->name, "keyframe")) isRAP = (!stricmp(att->value, "true") ? GF_TRUE : GF_FALSE);
-		}
-		nb_styles = 0;
-		nb_marks = 0;
-		same_style = same_box = GF_FALSE;
-		descIndex = 1;
-		j=0;
-		while ((desc=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
-			if (desc->type) continue;
-
-			if (!strcmp(desc->name, "description")) {
-				GF_XMLNode *sub;
-				memset(&td, 0, sizeof(GF_TextSampleDescriptor));
-				td.tag = GF_ODF_TEXT_CFG_TAG;
-				td.vert_justif = (s8) -1;
-				td.default_style.fontID = 1;
-				td.default_style.font_size = TTXT_DEFAULT_FONT_SIZE;
-
-				k=0;
-				while ((att=(GF_XMLAttribute *)gf_list_enum(desc->attributes, &k))) {
-					if (!strcmp(att->name, "horizontalJustification")) {
-						if (!stricmp(att->value, "center")) td.horiz_justif = 1;
-						else if (!stricmp(att->value, "right")) td.horiz_justif = (s8) -1;
-						else if (!stricmp(att->value, "left")) td.horiz_justif = 0;
-					}
-					else if (!strcmp(att->name, "verticalJustification")) {
-						if (!stricmp(att->value, "center")) td.vert_justif = 1;
-						else if (!stricmp(att->value, "bottom")) td.vert_justif = (s8) -1;
-						else if (!stricmp(att->value, "top")) td.vert_justif = 0;
-					}
-					else if (!strcmp(att->name, "backgroundColor")) td.back_color = tx3g_get_color(import, att->value);
-					else if (!strcmp(att->name, "displayFlags")) {
-						Bool rev_scroll = GF_FALSE;
-						if (strstr(att->value, "scroll")) {
-							u32 scroll_mode = 0;
-							if (strstr(att->value, "scrollIn")) td.displayFlags |= GF_TXT_SCROLL_IN;
-							if (strstr(att->value, "scrollOut")) td.displayFlags |= GF_TXT_SCROLL_OUT;
-							if (strstr(att->value, "reverse")) rev_scroll = GF_TRUE;
-							if (strstr(att->value, "horizontal")) scroll_mode = rev_scroll ? GF_TXT_SCROLL_RIGHT : GF_TXT_SCROLL_MARQUEE;
-							else scroll_mode = (rev_scroll ? GF_TXT_SCROLL_DOWN : GF_TXT_SCROLL_CREDITS);
-							td.displayFlags |= (scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION;
-						}
-						/*TODO FIXME: check in QT doc !!*/
-						if (strstr(att->value, "writeTextVertically")) td.displayFlags |= GF_TXT_VERTICAL;
-						if (!strcmp(att->name, "continuousKaraoke")) td.displayFlags |= GF_TXT_KARAOKE;
-					}
-				}
-
-				k=0;
-				while ((sub=(GF_XMLNode*)gf_list_enum(desc->content, &k))) {
-					if (sub->type) continue;
-					if (!strcmp(sub->name, "defaultTextBox")) tx3g_parse_text_box(import, sub, &td.default_pos);
-					else if (!strcmp(sub->name, "fontTable")) {
-						GF_XMLNode *ftable;
-						u32 m=0;
-						while ((ftable=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
-							if (ftable->type) continue;
-							if (!strcmp(ftable->name, "font")) {
-								u32 n=0;
-								td.font_count += 1;
-								td.fonts = (GF_FontRecord*)gf_realloc(td.fonts, sizeof(GF_FontRecord)*td.font_count);
-								while ((att=(GF_XMLAttribute *)gf_list_enum(ftable->attributes, &n))) {
-									if (!stricmp(att->name, "id")) td.fonts[td.font_count-1].fontID = atoi(att->value);
-									else if (!stricmp(att->name, "name")) td.fonts[td.font_count-1].fontName = gf_strdup(att->value);
-								}
-							}
-						}
-					}
-					else if (!strcmp(sub->name, "sharedStyles")) {
-						GF_XMLNode *style, *ftable;
-						u32 m=0;
-						while ((style=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
-							if (style->type) continue;
-							if (!strcmp(style->name, "style")) break;
-						}
-						if (style) {
-							char *cur;
-							s32 start=0;
-							char css_style[1024], css_val[1024];
-							memset(&styles[nb_styles], 0, sizeof(GF_StyleRecord));
-							m=0;
-							while ( (att=(GF_XMLAttribute *)gf_list_enum(style->attributes, &m))) {
-								if (!strcmp(att->name, "id")) styles[nb_styles].startCharOffset = atoi(att->value);
-							}
-							m=0;
-							while ( (ftable=(GF_XMLNode*)gf_list_enum(style->content, &m))) {
-								if (ftable->type) break;
-							}
-							cur = ftable->name;
-							while (cur) {
-								start = gf_token_get_strip(cur, 0, "{:", " ", css_style, 1024);
-								if (start <0) break;
-								start = gf_token_get_strip(cur, start, ":}", " ", css_val, 1024);
-								if (start <0) break;
-								cur = strchr(cur+start, '{');
-
-								if (!strcmp(css_style, "font-table")) {
-									u32 z;
-									styles[nb_styles].fontID = atoi(css_val);
-									for (z=0; z<td.font_count; z++) {
-										if (td.fonts[z].fontID == styles[nb_styles].fontID)
-											break;
-									}
-								}
-								else if (!strcmp(css_style, "font-size")) styles[nb_styles].font_size = atoi(css_val);
-								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, "color")) styles[nb_styles].text_color = tx3g_get_color(import, css_val);
-							}
-							if (!nb_styles) td.default_style = styles[0];
-							nb_styles++;
-						}
-					}
-
-				}
-				if ((td.default_pos.bottom==td.default_pos.top) || (td.default_pos.right==td.default_pos.left)) {
-					td.default_pos.top = td.default_pos.left = 0;
-					td.default_pos.right = w;
-					td.default_pos.bottom = h;
-				}
-				if (!td.fonts) {
-					td.font_count = 1;
-					td.fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-					td.fonts[0].fontID = 1;
-					td.fonts[0].fontName = gf_strdup("Serif");
-				}
-				gf_isom_text_has_similar_description(import->dest, track, &td, &descIndex, &same_box, &same_style);
-				if (!descIndex) {
-					gf_isom_new_text_description(import->dest, track, &td, NULL, NULL, &descIndex);
-					same_style = same_box = GF_TRUE;
-				}
-
-				for (k=0; k<td.font_count; k++) gf_free(td.fonts[k].fontName);
-				gf_free(td.fonts);
-				nb_descs ++;
-			}
-			else if (!strcmp(desc->name, "sampleData")) {
-				GF_XMLNode *sub;
-				u16 start, end;
-				u32 styleID;
-				u32 nb_chars, txt_len, m;
-				nb_chars = 0;
-
-				samp = gf_isom_new_text_sample();
-
-				k=0;
-				while ((att=(GF_XMLAttribute *)gf_list_enum(desc->attributes, &k))) {
-					if (!strcmp(att->name, "targetEncoding") && !strcmp(att->value, "utf16")) ;//is_utf16 = 1;
-					else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, atoi(att->value) );
-					else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color_argb(samp, tx3g_get_color(import, att->value));
-				}
-				start = end = 0;
-				k=0;
-				while ((sub=(GF_XMLNode*)gf_list_enum(desc->content, &k))) {
-					if (sub->type) continue;
-					if (!strcmp(sub->name, "text")) {
-						GF_XMLNode *text;
-						styleID = 0;
-						m=0;
-						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
-							if (!strcmp(att->name, "styleID")) styleID = atoi(att->value);
-						}
-						txt_len = 0;
-
-						m=0;
-						while ((text=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
-							if (!text->type) {
-								if (!strcmp(text->name, "marker")) {
-									u32 z;
-									memset(&marks[nb_marks], 0, sizeof(Marker));
-									marks[nb_marks].pos = nb_chars+txt_len;
-
-									z = 0;
-									while ( (att=(GF_XMLAttribute *)gf_list_enum(text->attributes, &z))) {
-										if (!strcmp(att->name, "id")) marks[nb_marks].id = atoi(att->value);
-									}
-									nb_marks++;
-								}
-							} else if (text->type==GF_XML_TEXT_TYPE) {
-								txt_len += (u32) strlen(text->name);
-								gf_isom_text_add_text(samp, text->name, (u32) strlen(text->name));
-							}
-						}
-						if (styleID && (!same_style || (td.default_style.startCharOffset != styleID))) {
-							GF_StyleRecord st = td.default_style;
-							for (m=0; m<nb_styles; m++) {
-								if (styles[m].startCharOffset==styleID) {
-									st = styles[m];
-									break;
-								}
-							}
-							st.startCharOffset = nb_chars;
-							st.endCharOffset = nb_chars + txt_len;
-							gf_isom_text_add_style(samp, &st);
-						}
-						nb_chars += txt_len;
-					}
-					else if (!stricmp(sub->name, "highlight")) {
-						m=0;
-						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
-							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
-								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
-								}
-						gf_isom_text_add_highlight(samp, start, end);
-					}
-					else if (!stricmp(sub->name, "blink")) {
-						m=0;
-						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
-							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
-								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
-								}
-						gf_isom_text_add_blink(samp, start, end);
-					}
-					else if (!stricmp(sub->name, "link")) {
-						char *url, *url_tt;
-						url = url_tt = NULL;
-						m=0;
-						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
-							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
-								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
-									else if (!strcmp(att->name, "URL") || !strcmp(att->name, "href")) url = gf_strdup(att->value);
-									else if (!strcmp(att->name, "URLToolTip") || !strcmp(att->name, "altString")) url_tt = gf_strdup(att->value);
-						}
-						gf_isom_text_add_hyperlink(samp, url, url_tt, start, end);
-						if (url) gf_free(url);
-						if (url_tt) gf_free(url_tt);
-					}
-					else if (!stricmp(sub->name, "karaoke")) {
-						u32 time = 0;
-						GF_XMLNode *krok;
-						m=0;
-						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
-							if (!strcmp(att->name, "startTime")) time = atoi(att->value);
-						}
-						gf_isom_text_add_karaoke(samp, time);
-						m=0;
-						while ((krok=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
-							u32 u=0;
-							if (krok->type) continue;
-							if (strcmp(krok->name, "run")) continue;
-							start = end = 0;
-							while ((att=(GF_XMLAttribute *)gf_list_enum(krok->attributes, &u))) {
-								if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
-									else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
-										else if (!strcmp(att->name, "duration")) time += atoi(att->value);
-							}
-							gf_isom_text_set_karaoke_segment(samp, time, start, end);
-						}
-					}
-				}
-			}
-		}
-		/*OK, let's add the sample*/
-		if (samp) {
-			if (!same_box) gf_isom_text_set_box(samp, td.default_pos.top, td.default_pos.left, td.default_pos.bottom, td.default_pos.right);
-//			if (!same_style) gf_isom_text_add_style(samp, &td.default_style);
-
-			s = gf_isom_text_to_sample(samp);
-			gf_isom_delete_text_sample(samp);
-			s->IsRAP = isRAP ? RAP : RAP_NO;
-			s->DTS = DTS;
-			gf_isom_add_sample(import->dest, track, descIndex, s);
-			gf_isom_sample_del(&s);
-			nb_samples++;
-			DTS += duration;
-			gf_set_progress("Importing TeXML", nb_samples, nb_children);
-			if (import->duration && (DTS*1000> timescale*import->duration)) break;
-		}
-	}
-	gf_isom_set_last_sample_duration(import->dest, track, 0);
-	gf_set_progress("Importing TeXML", nb_samples, nb_samples);
-
-exit:
-	gf_xml_dom_del(parser);
-	return e;
-}
-
-
-GF_Err gf_import_timed_text(GF_MediaImporter *import)
-{
-	GF_Err e;
-	u32 fmt;
-	e = gf_text_guess_format(import->in_name, &fmt);
-	if (e) return e;
-	if (import->streamFormat) {
-		if (!strcmp(import->streamFormat, "VTT")) fmt = GF_TEXT_IMPORT_WEBVTT;
-		else if (!strcmp(import->streamFormat, "TTML")) fmt = GF_TEXT_IMPORT_TTML;
-		if ((strstr(import->in_name, ".swf") || strstr(import->in_name, ".SWF")) && !stricmp(import->streamFormat, "SVG")) fmt = GF_TEXT_IMPORT_SWF_SVG;
-	}
-	if (!fmt) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTXT Import] Input %s does not look like a supported text format - ignoring\n", import->in_name));
-		return GF_NOT_SUPPORTED;
-	}
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		if (fmt==GF_TEXT_IMPORT_SUB) import->flags |= GF_IMPORT_OVERRIDE_FPS;
-		return GF_OK;
-	}
-	switch (fmt) {
-	case GF_TEXT_IMPORT_SRT:
-		return gf_text_import_srt(import);
-	case GF_TEXT_IMPORT_SUB:
-		return gf_text_import_sub(import);
-	case GF_TEXT_IMPORT_TTXT:
-		return gf_text_import_ttxt(import);
-	case GF_TEXT_IMPORT_TEXML:
-		return gf_text_import_texml(import);
-#ifndef GPAC_DISABLE_VTT
-	case GF_TEXT_IMPORT_WEBVTT:
-		return gf_text_import_webvtt(import);
-#endif
-	case GF_TEXT_IMPORT_SWF_SVG:
-		return gf_text_import_swf(import);
-	case GF_TEXT_IMPORT_TTML:
-		return gf_text_import_ttml(import);
-	default:
-		return GF_BAD_PARAM;
-	}
-}
-
-#endif /*GPAC_DISABLE_MEDIA_IMPORT*/
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-

gpac-0.8.0.tar.gz/src/scenegraph/dom_smjs.c Deleted

@@ -1,4947 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2007-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/setup.h>
-#include <gpac/internal/scenegraph_dev.h>
-
-/*base SVG type*/
-#include <gpac/nodes_svg.h>
-/*dom events*/
-#include <gpac/events.h>
-/*dom text event*/
-#include <gpac/utf.h>
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/xml.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#include <gpac/html5_mse.h>
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif /* XP_UNIX */
-#endif
-
-#include <gpac/html5_media.h>
-#include <gpac/internal/smjs_api.h>
-
-typedef struct __xhr_context XMLHTTPContext;
-GF_DOMEventTarget *xml_http_get_event_target(XMLHTTPContext *ctx);
-GF_SceneGraph *xml_http_get_scenegraph(XMLHTTPContext *ctx);
-
-static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
-{
-	if (scene->script_action)
-		return scene->script_action(scene->script_action_cbck, type, node, param);
-	return GF_FALSE;
-}
-
-static GFINLINE GF_SceneGraph *xml_get_scenegraph(JSContext *c)
-{
-	GF_SceneGraph *scene;
-	JSObject *global = JS_GetGlobalObject(c);
-	assert(global);
-	scene = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, global);
-	assert(scene);
-	return scene;
-}
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-char *js_get_utf8(JSContext *c, jsval val)
-{
-#if 0
-	jschar *utf16;
-	char *txt;
-	u32 len;
-	if (!JSVAL_CHECK_STRING(val) || JSVAL_IS_NULL(val)) return NULL;
-
-	/*locate SVG sequence responsible for this code add-on in test suit*/
-	utf16 = JS_GetStringChars(JSVAL_TO_STRING(val) );
-	len = gf_utf8_wcslen(utf16)*2 + 1;
-	txt = gf_malloc(sizeof(char)*len);
-	len = gf_utf8_wcstombs(txt, len, (const u16**) &utf16);
-	if ((s32)len<0) {
-		gf_free(txt);
-		return NULL;
-	}
-	txt[len]=0;
-	return txt;
-#elif (JS_VERSION>=185)
-	char *result, *txt;
-	if (!JSVAL_CHECK_STRING(val) || JSVAL_IS_NULL(val)) return NULL;
-	txt = SMJS_CHARS(c, val);
-	result = gf_strdup(txt);
-	SMJS_FREE(c, txt);
-	return result;
-#else
-	if (!JSVAL_CHECK_STRING(val) || JSVAL_IS_NULL(val)) return NULL;
-	return gf_strdup( SMJS_CHARS(c, val) );
-#endif
-}
-
-/************************************************************
- *
- *				DOM3 core implementation
- *
- *	This is NOT a full dom implementation :)
- *
- *************************************************************/
-typedef struct
-{
-	u32 nb_inst;
-	GF_JSClass domDocumentClass;
-	GF_JSClass domNodeClass;
-	GF_JSClass domElementClass;
-	GF_JSClass domTextClass;
-	GF_JSClass domNodeListClass;
-	GF_JSClass domEventClass;
-
-	GF_JSClass xmlHTTPRequestClass;
-	GF_JSClass DCCIClass;
-
-	GF_JSClass storageClass;
-
-	GF_JSClass htmlMediaElementClass;
-
-	void *(*get_element_class)(GF_Node *n);
-	void *(*get_document_class)(GF_SceneGraph *n);
-	GF_List *handlers;
-} GF_DOMRuntime;
-
-static GF_DOMRuntime *dom_rt = NULL;
-
-typedef enum {
-	NODE_JSPROPERTY_NODENAME				= -1,
-	NODE_JSPROPERTY_NODEVALUE				= -2,
-	NODE_JSPROPERTY_NODETYPE				= -3,
-	NODE_JSPROPERTY_PARENTNODE				= -4,
-	NODE_JSPROPERTY_CHILDNODES				= -5,
-	NODE_JSPROPERTY_FIRSTCHILD				= -6,
-	NODE_JSPROPERTY_LASTCHILD				= -7,
-	NODE_JSPROPERTY_PREVIOUSSIBLING			= -8,
-	NODE_JSPROPERTY_NEXTSIBLING				= -9,
-	NODE_JSPROPERTY_ATTRIBUTES				= -10,
-	NODE_JSPROPERTY_OWNERDOCUMENT			= -11,
-	NODE_JSPROPERTY_NAMESPACEURI			= -12,
-	NODE_JSPROPERTY_PREFIX					= -13,
-	NODE_JSPROPERTY_LOCALNAME				= -14,
-	NODE_JSPROPERTY_BASEURI					= -15,
-	NODE_JSPROPERTY_TEXTCONTENT				= -16,
-	NODE_JSPROPERTY_FIRSTELEMENTCHILD		= -17,
-	NODE_JSPROPERTY_LASTELEMENTCHILD		= -18,
-	NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING	= -19,
-	NODE_JSPROPERTY_NEXTELEMENTSIBLING		= -20
-} GF_DOMNodeJSProperty;
-
-typedef enum {
-	DOCUMENT_JSPROPERTY_DOCTYPE				= -1,
-	DOCUMENT_JSPROPERTY_IMPLEMENTATION		= -2,
-	DOCUMENT_JSPROPERTY_DOCUMENTELEMENT		= -3,
-	DOCUMENT_JSPROPERTY_INPUTENCODING		= -4,
-	DOCUMENT_JSPROPERTY_XMLENCODING			= -5,
-	DOCUMENT_JSPROPERTY_XMLSTANDALONE		= -6,
-	DOCUMENT_JSPROPERTY_XMLVERSION			= -7,
-	DOCUMENT_JSPROPERTY_STRICTERRORCHECKING	= -8,
-	DOCUMENT_JSPROPERTY_DOCUMENTURI			= -9,
-	DOCUMENT_JSPROPERTY_LOCATION			= -10,
-	DOCUMENT_JSPROPERTY_DOMCONFIG			= -11,
-	DOCUMENT_JSPROPERTY_GLOBAL				= -12
-} GF_DOMDocumentJSProperty;
-
-typedef enum {
-	ELEMENT_JSPROPERTY_TAGNAME			= -1,
-	ELEMENT_JSPROPERTY_SCHEMATYPEINFO	= -2,
-} GF_DOMElementJSProperty;
-
-typedef enum {
-	DCCI_JSPROPERTY_VALUE						= -1,
-	DCCI_JSPROPERTY_VALUETYPE					= -2,
-	DCCI_JSPROPERTY_PROPERTYTYPE				= -3,
-	DCCI_JSPROPERTY_READONLY					= -4,
-	DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE	= -5,
-	DCCI_JSPROPERTY_DCCIMETADATAINTERFACE		= -6,
-	DCCI_JSPROPERTY_VERSION						= -7,
-} GF_DCCIJSProperty;
-
-typedef enum {
-	NODELIST_JSPROPERTY_LENGTH = -1,
-} GF_DOMNodeListJSProperty;
-
-typedef enum {
-	EVENT_JSPROPERTY_TYPE						= -1,
-	EVENT_JSPROPERTY_TARGET						= -2,
-	EVENT_JSPROPERTY_CURRENTTARGET				= -3,
-	EVENT_JSPROPERTY_EVENTPHASE					= -4,
-	EVENT_JSPROPERTY_BUBBLES					= -5,
-	EVENT_JSPROPERTY_CANCELABLE					= -6,
-	EVENT_JSPROPERTY_TIMESTAMP					= -7,
-	EVENT_JSPROPERTY_NAMESPACEURI				= -8,
-	EVENT_JSPROPERTY_DEFAULTPREVENTED			= -9,
-	EVENT_JSPROPERTY_DETAIL						= -10,
-	EVENT_JSPROPERTY_DATA						= -11,
-	EVENT_JSPROPERTY_SCREENX					= -12,
-	EVENT_JSPROPERTY_SCREENY					= -13,
-	EVENT_JSPROPERTY_CLIENTX					= -14,
-	EVENT_JSPROPERTY_CLIENTY					= -15,
-	EVENT_JSPROPERTY_BUTTON						= -16,
-	EVENT_JSPROPERTY_RELATEDTARGET				= -17,
-	EVENT_JSPROPERTY_WHEELDELTA					= -18,
-	EVENT_JSPROPERTY_KEYIDENTIFIER				= -19,
-	EVENT_JSPROPERTY_KEYCHAR					= -20,
-	EVENT_JSPROPERTY_CHARCODE					= -21,
-	EVENT_JSPROPERTY_LENGTHCOMPUTABLE			= -22,
-	EVENT_JSPROPERTY_TYPEARG					= -23,
-	EVENT_JSPROPERTY_LOADED						= -24,
-	EVENT_JSPROPERTY_TOTAL						= -25,
-	EVENT_JSPROPERTY_BUFFER_ON					= -26,
-	EVENT_JSPROPERTY_BUFFERLEVEL				= -27,
-	EVENT_JSPROPERTY_BUFFERREMAININGTIME		= -28,
-	EVENT_JSPROPERTY_STATUS						= -29,
-	EVENT_JSPROPERTY_WIDTH						= -30,
-	EVENT_JSPROPERTY_HEIGHT						= -31,
-	EVENT_JSPROPERTY_OFFSETX					= -32,
-	EVENT_JSPROPERTY_OFFSETY					= -33,
-	EVENT_JSPROPERTY_VPWIDTH					= -34,
-	EVENT_JSPROPERTY_VPHEIGHT					= -35,
-	EVENT_JSPROPERTY_TRANSLATIONX				= -36,
-	EVENT_JSPROPERTY_TRANSLATIONY				= -37,
-	EVENT_JSPROPERTY_TYPE3D						= -38,
-	EVENT_JSPROPERTY_ERROR						= -39,
-	EVENT_JSPROPERTY_DYNAMIC_SCENE				= -40,
-	EVENT_JSPROPERTY_URL							= -41,
-} GF_DOMEventJSProperty;
-
-typedef enum {
-	TEXT_JSPROPERTY_DATA						= -1,
-	TEXT_JSPROPERTY_LENGTH						= -2,
-	TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE	= -3,
-	TEXT_JSPROPERTY_WHOLETEXT					= -4,
-} GF_DOMTextJSProperty;
-
-static JSBool SMJS_FUNCTION(xml_dom3_not_implemented)
-{
-	return JS_TRUE;
-}
-
-
-#define JS_DOM3_uDOM_FIRST_PROP		18
-
-void dom_node_changed(GF_Node *n, Bool child_modif, GF_FieldInfo *info)
-{
-	if (info) {
-		if (child_modif) {
-			gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
-		}
-#ifndef GPAC_DISABLE_SVG
-		else {
-			u32 flag = gf_svg_get_modification_flags((SVG_Element *)n, info);
-			gf_node_dirty_set(n, flag, GF_FALSE);
-		}
-#endif
-	}
-	gf_node_changed(n, info);
-}
-
-static void define_dom_exception(JSContext *c, JSObject *global)
-{
-#define DEF_EXC(_val)	\
-	JS_DefineProperty(c, obj, #_val, INT_TO_JSVAL(GF_DOM_EXC_##_val), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	JSObject *obj = JS_DefineObject(c, global, "DOMException", NULL, 0, 0);
-
-	DEF_EXC(INDEX_SIZE_ERR);
-	DEF_EXC(DOMSTRING_SIZE_ERR);
-	DEF_EXC(HIERARCHY_REQUEST_ERR);
-	DEF_EXC(WRONG_DOCUMENT_ERR);
-	DEF_EXC(INVALID_CHARACTER_ERR);
-	DEF_EXC(NO_DATA_ALLOWED_ERR);
-	DEF_EXC(NO_MODIFICATION_ALLOWED_ERR);
-	DEF_EXC(NOT_FOUND_ERR);
-	DEF_EXC(NOT_SUPPORTED_ERR);
-	DEF_EXC(INUSE_ATTRIBUTE_ERR);
-	DEF_EXC(INVALID_STATE_ERR);
-	DEF_EXC(SYNTAX_ERR);
-	DEF_EXC(INVALID_MODIFICATION_ERR);
-	DEF_EXC(NAMESPACE_ERR);
-	DEF_EXC(INVALID_ACCESS_ERR);
-	DEF_EXC(VALIDATION_ERR);
-	DEF_EXC(TYPE_MISMATCH_ERR);
-	DEF_EXC(SECURITY_ERR);
-	DEF_EXC(NETWORK_ERR);
-	DEF_EXC(ABORT_ERR);
-	DEF_EXC(URL_MISMATCH_ERR);
-	DEF_EXC(QUOTA_EXCEEDED_ERR);
-	DEF_EXC(TIMEOUT_ERR);
-	DEF_EXC(INVALID_NODE_TYPE_ERR);
-	DEF_EXC(DATA_CLONE_ERR);
-	DEF_EXC(SECURITY_ERR);
-#undef  DEF_EXC
-
-	//JS_AliasProperty(c, global, "DOMException", "e");
-	obj = JS_DefineObject(c, global, "EventException", NULL, 0, 0);
-	JS_DefineProperty(c, obj, "UNSPECIFIED_EVENT_TYPE_ERR", INT_TO_JSVAL(0), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "DISPATCH_REQUEST_ERR", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-}
-
-
-JSBool dom_throw_exception(JSContext *c, u32 code)
-{
-	JSObject *obj = JS_NewObject(c, NULL, 0, 0);
-	JS_DefineProperty(c, obj, "code", INT_TO_JSVAL(code), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_SetPendingException(c, OBJECT_TO_JSVAL(obj));
-	return JS_FALSE;
-}
-
-
-GF_Node *dom_get_node(JSContext *c, JSObject *obj)
-{
-	GF_Node *n = (obj ? (GF_Node *)SMJS_GET_PRIVATE(c, obj) : NULL);
-	if (n && n->sgprivate) return n;
-	return NULL;
-}
-
-GF_Node *dom_get_element(JSContext *c, JSObject *obj)
-{
-	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-	if (!n || !n->sgprivate) return NULL;
-	if (n->sgprivate->tag==TAG_DOMText) return NULL;
-	return n;
-}
-
-GF_SceneGraph *dom_get_doc(JSContext *c, JSObject *obj)
-{
-	GF_SceneGraph *sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
-	if (sg && !sg->__reserved_null) return sg;
-	return NULL;
-}
-
-static void dom_js_define_document_ex(JSContext *c, JSObject *global, GF_SceneGraph *doc, const char *name)
-{
-	GF_JSClass *__class;
-	JSObject *obj;
-	if (!doc || !doc->RootNode) return;
-
-	if (doc->reference_count)
-		doc->reference_count++;
-	gf_node_register(doc->RootNode, NULL);
-
-	__class = NULL;
-	if (dom_rt->get_document_class)
-		__class = (GF_JSClass *)dom_rt->get_document_class(doc);
-	if (!__class) __class = &dom_rt->domDocumentClass;
-
-	obj = JS_DefineObject(c, global, name, & __class->_class, 0, 0 );
-	SMJS_SET_PRIVATE(c, obj, doc);
-	doc->document = obj;
-}
-
-void dom_js_define_document(JSContext *c, JSObject *global, GF_SceneGraph *doc)
-{
-	dom_js_define_document_ex(c, global, doc, "document");
-}
-
-/* Constructs a new document based on the given context and scene graph, used for documents in XHR */
-static jsval dom_document_construct(JSContext *c, GF_SceneGraph *sg)
-{
-	GF_JSClass *jsclass;
-	JSObject *new_obj;
-	if (sg->document) return OBJECT_TO_JSVAL(sg->document);
-
-	if (sg->reference_count)
-		sg->reference_count++;
-	gf_node_register(sg->RootNode, NULL);
-
-	jsclass = NULL;
-	if (dom_rt->get_document_class)
-		jsclass = (GF_JSClass *) dom_rt->get_document_class(sg);
-	if (!jsclass) jsclass = &dom_rt->domDocumentClass;
-
-	new_obj = JS_NewObject(c, & jsclass->_class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, sg);
-	sg->document = new_obj;
-	return OBJECT_TO_JSVAL(new_obj);
-}
-
-static jsval dom_base_node_construct(JSContext *c, GF_JSClass *_class, GF_Node *n)
-{
-	Bool set_rooted;
-	GF_SceneGraph *sg;
-	JSObject *new_obj;
-	if (!n || !n->sgprivate->scenegraph) return JSVAL_VOID;
-	if (n->sgprivate->tag<TAG_DOMText) return JSVAL_VOID;
-
-	sg = n->sgprivate->scenegraph;
-	/*if parent doc is not a scene (eg it is a doc being parsed/constructed from script, don't root objects*/
-	set_rooted = sg->reference_count ? GF_FALSE : GF_TRUE;
-
-	if (n->sgprivate->interact && n->sgprivate->interact->js_binding && n->sgprivate->interact->js_binding->node) {
-		if (set_rooted && (gf_list_find(sg->objects, n->sgprivate->interact->js_binding->node)<0)) {
-			const char *name = gf_node_get_name(n);
-			if (name) {
-				gf_js_add_named_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT, name);
-			} else {
-				gf_js_add_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT);
-			}
-			gf_list_add(sg->objects, n->sgprivate->interact->js_binding->node);
-		}
-		return OBJECT_TO_JSVAL(n->sgprivate->interact->js_binding->node);
-	}
-
-	if (n->sgprivate->scenegraph->reference_count)
-		n->sgprivate->scenegraph->reference_count ++;
-
-	gf_node_register(n, NULL);
-	new_obj = JS_NewObject(c, & _class->_class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, n);
-
-	if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio)
-	{
-		html_media_element_js_init(c, new_obj, n);
-	}
-	if (!n->sgprivate->interact) {
-		GF_SAFEALLOC(n->sgprivate->interact, struct _node_interactive_ext);
-		if (!n->sgprivate->interact) {
-			return JSVAL_NULL;
-		}
-	}
-	if (!n->sgprivate->interact->js_binding) {
-		GF_SAFEALLOC(n->sgprivate->interact->js_binding, struct _node_js_binding);
-		if (!n->sgprivate->interact->js_binding) {
-			return JSVAL_NULL;
-		}
-	}
-	n->sgprivate->interact->js_binding->node = new_obj;
-
-	/*don't root the node until inserted in the tree*/
-	if (n->sgprivate->parents && set_rooted) {
-		const char *name = gf_node_get_name(n);
-		if (name) {
-			gf_js_add_named_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT, name);
-		} else {
-			gf_js_add_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT);
-		}
-		gf_list_add(sg->objects, n->sgprivate->interact->js_binding->node);
-	}
-	return OBJECT_TO_JSVAL(new_obj);
-}
-static jsval dom_node_construct(JSContext *c, GF_Node *n)
-{
-	GF_JSClass *__class = NULL;
-
-	if (!n) return JSVAL_NULL;
-	if (n->sgprivate->scenegraph->dcci_doc)
-		__class = &dom_rt->DCCIClass;
-	else if (dom_rt->get_element_class)
-		__class = (GF_JSClass *) dom_rt->get_element_class(n);
-
-	if (!__class ) __class  = &dom_rt->domElementClass;
-
-	/*in our implementation ONLY ELEMENTS are created, never attributes. We therefore always
-	create Elements when asked to create a node !!*/
-	return dom_base_node_construct(c, __class, n);
-}
-jsval dom_element_construct(JSContext *c, GF_Node *n)
-{
-	GF_JSClass *__class = NULL;
-
-	if (!n) return JSVAL_NULL;
-	if (n->sgprivate->scenegraph->dcci_doc)
-		__class = &dom_rt->DCCIClass;
-	else if (dom_rt->get_element_class)
-		__class = (GF_JSClass *) dom_rt->get_element_class(n);
-
-	if (!__class) __class = &dom_rt->domElementClass;
-
-	return dom_base_node_construct(c, __class, n);
-}
-
-static jsval dom_text_construct(JSContext *c, GF_Node *n)
-{
-	return dom_base_node_construct(c, &dom_rt->domTextClass, n);
-}
-
-static void dom_unregister_node(GF_Node *n)
-{
-	GF_SceneGraph *sg = n->sgprivate->scenegraph;
-	if (!sg) return;
-	/*!! node is being deleted !! */
-	if (!n->sgprivate->num_instances) return;
-
-	gf_node_unregister(n, NULL);
-	if (sg->reference_count) {
-		sg->reference_count--;
-		if (!sg->reference_count)
-			gf_sg_del(sg);
-	}
-}
-
-jsval dom_node_get_sibling(JSContext *c, GF_Node *n, Bool is_prev, Bool elt_only)
-{
-	GF_Node *val;
-	GF_ChildNodeItem *child;
-	s32 idx, cur;
-	GF_ParentNode *par;
-	if (!n) return JSVAL_NULL;
-	par = (GF_ParentNode *)gf_node_get_parent(n, 0);
-	if (!par) return JSVAL_NULL;
-
-	idx = gf_node_list_find_child(par->children, n);
-	if (idx<0) return JSVAL_NULL;
-
-	if (!elt_only) {
-		if (is_prev) {
-			idx--;
-			if (idx<0) return JSVAL_NULL;
-		}
-		else idx++;
-		return dom_node_construct(c, gf_node_list_get_child(par->children, idx) );
-	}
-	cur = 0;
-	val = NULL;
-	child = par->children;
-	while (child) {
-		if ((idx!=cur) && (child->node->sgprivate->tag!=TAG_DOMText)) {
-			val = child->node;
-		}
-		if (is_prev) {
-			if (idx<=cur)
-				break;
-		} else {
-			if (idx>=cur) val = NULL;
-			if (val && idx<cur)
-				break;
-		}
-		child = child->next;
-		cur++;
-	}
-	return dom_node_construct(c, val);
-}
-
-
-
-/*dom3 NodeList/NamedNodeMap*/
-typedef struct
-{
-	/*set if the object is a childList from an existing node*/
-	GF_ParentNode *owner;
-	/*child list*/
-	GF_ChildNodeItem *child;
-} DOMNodeList;
-
-
-static jsval dom_nodelist_construct(JSContext *c, GF_ParentNode *n)
-{
-	DOMNodeList *nl;
-	JSObject *new_obj;
-	if (!n) return JSVAL_VOID;
-	GF_SAFEALLOC(nl, DOMNodeList);
-	if (!nl) return JSVAL_NULL;
-	
-	nl->owner = n;
-	if (n->sgprivate->scenegraph->reference_count)
-		n->sgprivate->scenegraph->reference_count++;
-
-	gf_node_register((GF_Node*)n, NULL);
-	new_obj = JS_NewObject(c, &dom_rt->domNodeListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, nl);
-	return OBJECT_TO_JSVAL(new_obj);
-}
-
-static DECL_FINALIZE(dom_nodelist_finalize)
-
-DOMNodeList *nl;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL) )
-	return;
-
-nl = (DOMNodeList *) SMJS_GET_PRIVATE(c, obj);
-if (!nl) return;
-
-if (nl->owner) {
-	dom_unregister_node((GF_Node*)nl->owner);
-} else {
-	/*unregister all nodes for created lists*/
-	while (nl->child) {
-		GF_ChildNodeItem *child = nl->child;
-		nl->child = child->next;
-		dom_unregister_node(child->node);
-		gf_free(child);
-	}
-}
-gf_free(nl);
-}
-
-static JSBool SMJS_FUNCTION(dom_nodelist_item)
-{
-	GF_Node *n;
-	u32 count;
-	s32 idx;
-	DOMNodeList *nl;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL) )
-		return JS_TRUE;
-	if ((argc!=1) || !JSVAL_IS_INT(argv[0]))
-		return JS_TRUE;
-
-	nl = (DOMNodeList *)SMJS_GET_PRIVATE(c, obj);
-	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
-	idx = JSVAL_TO_INT(argv[0]);
-	if ((idx<0) || ((u32) idx>=count)) {
-		SMJS_SET_RVAL( JSVAL_VOID );
-		return JS_TRUE;
-	}
-	n = gf_node_list_get_child(nl->owner ? nl->owner->children : nl->child, idx);
-	SMJS_SET_RVAL( dom_node_construct(c, n) );
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( dom_nodelist_getProperty)
-
-DOMNodeList *nl;
-u32			count;
-s32			idx;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL)) {
-	return JS_TRUE;
-}
-nl = (DOMNodeList *) SMJS_GET_PRIVATE(c, obj);
-count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-switch (SMJS_ID_TO_INT(id)) {
-case NODELIST_JSPROPERTY_LENGTH:
-	*vp = INT_TO_JSVAL( count );
-	return JS_TRUE;
-default:
-	idx = SMJS_ID_TO_INT(id);
-	if ((idx<0) || ((u32) idx>=count)) {
-		*vp = JSVAL_VOID;
-		return JS_TRUE;
-	} else {
-		GF_Node *n;
-		n = gf_node_list_get_child(nl->owner ? nl->owner->children : nl->child, idx);
-		*vp = dom_node_construct(c, n);
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET_NOVP( dom_nodelist_setProperty)
-
-/*avoids gcc warning*/
-if (!obj) obj=NULL;
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-/*no write prop*/
-return JS_TRUE;
-}
-
-
-/*dom event listener*/
-
-#define JS_DOM3_EVENT_TARGET_INTERFACE	\
-	SMJS_FUNCTION_SPEC("addEventListenerNS", dom_event_add_listener, 4),	\
-	SMJS_FUNCTION_SPEC("removeEventListenerNS", dom_event_remove_listener, 4),	\
-	SMJS_FUNCTION_SPEC("addEventListener", dom_event_add_listener, 3),		\
-	SMJS_FUNCTION_SPEC("removeEventListener", dom_event_remove_listener, 3),	\
-	SMJS_FUNCTION_SPEC("dispatchEvent", xml_dom3_not_implemented, 1),
-
-
-static void dom_handler_remove(GF_Node *node, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		SVG_handlerElement *handler = (SVG_handlerElement *)node;
-		if (handler->js_context && handler->js_fun_val) {
-			/*unprotect the function*/
-			gf_js_remove_root((JSContext *)handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
-			handler->js_fun_val=0;
-			gf_list_del_item(dom_rt->handlers, handler);
-		}
-	}
-}
-
-static JSBool sg_js_get_event_target(JSContext *c, JSObject *obj, GF_EventType evtType, GF_Node *vrml_node,
-                                     GF_SceneGraph **sg, GF_DOMEventTarget **target, GF_Node **n)
-{
-	Bool is_svg_document_class(JSContext *c, JSObject *obj);
-	Bool is_svg_element_class(JSContext *c, JSObject *obj);
-	Bool gf_mse_is_mse_object(JSContext *c, JSObject *obj);
-	*target = NULL;
-	*sg = NULL;
-	*n = NULL;
-
-	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIA) {
-		void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
-		gf_html_media_get_event_target(c, obj, target, sg);
-		if (*target && *sg) return JS_TRUE;
-	}
-
-	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIASOURCE) {
-		void gf_mse_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
-		gf_mse_get_event_target(c, obj, target, sg);
-		if (*target && *sg) return JS_TRUE;
-	}
-
-	if (GF_JS_InstanceOf(c, obj, &dom_rt->domDocumentClass, NULL) || is_svg_document_class(c, obj)) {
-		/*document interface*/
-		*sg = dom_get_doc(c, obj);
-		if (*sg) {
-#ifndef GPAC_DISABLE_SVG
-			*target = (*sg)->dom_evt;
-#else
-			return JS_TRUE;
-#endif
-		} else {
-			return JS_TRUE;
-		}
-	} else if (GF_JS_InstanceOf(c, obj, &dom_rt->domElementClass, NULL) || is_svg_element_class(c, obj) || vrml_node) {
-		/*Element interface*/
-		if (vrml_node) {
-			*n = vrml_node;
-		} else {
-			*n = dom_get_element(c, obj);
-		}
-		if (*n) {
-			*sg = (*n)->sgprivate->scenegraph;
-			if (!(*n)->sgprivate->interact->dom_evt) {
-				(*n)->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, *n);
-			}
-			*target = (*n)->sgprivate->interact->dom_evt;
-		} else {
-			return JS_TRUE;
-		}
-	} else if (GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL)) {
-		/*XHR interface*/
-		XMLHTTPContext *ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-		if (ctx) {
-			*sg = xml_get_scenegraph(c);
-			*target = xml_http_get_event_target(ctx);
-		} else {
-			return JS_TRUE;
-		}
-	} else {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-static GF_Err sg_js_parse_event_args(JSContext *c, JSObject *obj, uintN argc, jsval *argv,
-                                     GF_EventType *evtType,
-                                     char **callback, jsval *funval, JSObject **evt_handler) {
-	u32 offset = 0;
-	char *type = NULL;
-	char *inNS = NULL;
-
-	*evtType = GF_EVENT_UNKNOWN;
-	*callback = NULL;
-	*funval = JSVAL_NULL;
-	if (evt_handler) *evt_handler = obj;
-
-	/*NS version (4 args in DOM2, 5 in DOM3 for evt_group param)*/
-	if (argc>=4) {
-		if (!JSVAL_CHECK_STRING(argv[0])) return GF_BAD_PARAM;
-		inNS = js_get_utf8(c, argv[0]);
-		offset = 1;
-	}
-
-	if (!JSVAL_CHECK_STRING(argv[offset])) goto err_exit;
-	type = SMJS_CHARS(c, argv[offset]);
-
-	if (JSVAL_CHECK_STRING(argv[offset+1])) {
-		*callback = SMJS_CHARS(c, argv[offset+1]);
-		if (!*callback) goto err_exit;
-	} else if (JSVAL_IS_OBJECT(argv[offset+1])) {
-		if (JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[offset+1]))) {
-			*funval = argv[offset+1];
-		} else {
-			JSBool found;
-			jsval evt_fun;
-			if (evt_handler) {
-				*evt_handler = JSVAL_TO_OBJECT(argv[offset+1]);
-			} else {
-				goto err_exit;
-			}
-			found = JS_GetProperty(c, *evt_handler, "handleEvent", &evt_fun);
-			if (!found || !JSVAL_IS_OBJECT(evt_fun) ) goto err_exit;
-			if (!JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(evt_fun)) ) goto err_exit;
-			*funval = evt_fun;
-		}
-	}
-
-	*evtType = gf_dom_event_type_by_name(type);
-	if (*evtType==GF_EVENT_UNKNOWN) goto err_exit;
-
-	SMJS_FREE(c, type);
-	if (inNS) gf_free(inNS);
-	return GF_OK;
-
-err_exit:
-	if (inNS) gf_free(inNS);
-	if (type) SMJS_FREE(c, type);
-	if (callback) SMJS_FREE(c, *callback);
-	*callback = NULL;
-	*evtType = GF_EVENT_UNKNOWN;
-	*funval = JSVAL_NULL;
-	if (evt_handler) *evt_handler = NULL;
-	return GF_BAD_PARAM;
-}
-
-static GF_Node *create_listener(GF_SceneGraph *sg, GF_EventType evtType, GF_Node *n, GF_Node *vrml_node,
-                                JSContext *c, char *callback, jsval funval, JSObject *evt_handler)
-{
-	GF_FieldInfo info;
-	GF_Node *listener;
-	SVG_handlerElement *handler;
-
-	listener = gf_node_new(sg, TAG_SVG_listener);
-	/*we don't register the listener with the parent node , it will be registered
-	on gf_dom_listener_add*/
-
-	/*!!! create the handler in the scene owning the script context !!! */
-	{
-		/* removed in harmonisation with XHR, was it really needed ?
-		GF_SceneGraph *sg = xml_get_scenegraph(c);
-		*/
-		handler = (SVG_handlerElement *) gf_node_new(sg, TAG_SVG_handler);
-		/*we register the handler with the listener node to avoid modifying the DOM*/
-		gf_node_register((GF_Node *)handler, listener);
-		gf_node_list_add_child(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler);
-
-		if (!callback) {
-			handler->js_fun = NULL;
-			handler->js_fun_val = *(u64 *) &funval;
-			if (handler->js_fun_val) {
-				handler->js_context = c;
-				/*protect the function - we don't know how it was passed to us, so prevent it from being GCed*/
-				gf_js_add_root((JSContext *)handler->js_context, &handler->js_fun_val, GF_JSGC_VAL);
-				handler->sgprivate->UserCallback = dom_handler_remove;
-				gf_list_add(dom_rt->handlers, handler);
-			}
-			handler->evt_listen_obj = evt_handler;
-		}
-	}
-
-	/*create attributes if needed*/
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
-	((XMLEV_Event*)info.far_ptr)->type = evtType;
-	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
-	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
-	if (n) {
-		gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
-		((XMLRI*)info.far_ptr)->target = n;
-	}
-
-	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
-	((XMLEV_Event*)info.far_ptr)->type = evtType;
-
-	if (callback) gf_dom_add_text_node((GF_Node *)handler, gf_strdup(callback));
-
-#ifndef GPAC_DISABLE_SVG
-	if (handler->sgprivate->scenegraph->svg_js)
-		handler->handle_event = gf_sg_handle_dom_event;
-#endif
-
-	if (vrml_node) {
-		handler->js_context = c;
-#ifndef GPAC_DISABLE_VRML
-		if (vrml_node->sgprivate->tag <= GF_NODE_RANGE_LAST_VRML)
-			handler->handle_event = gf_sg_handle_dom_event_for_vrml;
-#endif
-	}
-
-	return listener;
-}
-
-/*eventListeners routines used by document, element and XHR interfaces*/
-JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node)
-{
-	GF_DOMEventTarget *target = NULL;
-	GF_Node *listener = NULL;
-	GF_EventType evtType = GF_EVENT_UNKNOWN;
-	GF_SceneGraph *sg = NULL;
-	char *callback = NULL;
-	jsval funval = JSVAL_NULL;
-	GF_Node *n = NULL;
-	JSObject *evt_handler = NULL;
-	GF_Err e;
-
-	SMJS_OBJ
-	SMJS_ARGS
-
-	/* Determine the event type and handler params */
-	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, &evt_handler);
-	if (e != GF_OK) goto err_exit;
-
-	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
-	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &n);
-	if (!sg || !target) goto err_exit;
-
-	listener = create_listener(sg, evtType, n, vrml_node, c, callback, funval, evt_handler);
-	if (!listener) goto err_exit;
-
-	/*don't add listener directly, post it and wait for event processing*/
-	if (n) {
-		gf_sg_listener_post_add((GF_Node *) n, listener);
-	} else {
-		gf_sg_listener_add(listener, target);
-	}
-
-err_exit:
-	if (callback) SMJS_FREE(c, callback);
-	return JS_TRUE;
-}
-
-
-JSBool SMJS_FUNCTION(dom_event_add_listener)
-{
-	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
-}
-
-JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node)
-{
-#ifndef GPAC_DISABLE_SVG
-	char *callback = NULL;
-	GF_EventType evtType = GF_EVENT_UNKNOWN;
-	u32 i, count;
-	GF_Node *node = NULL;
-	jsval funval = JSVAL_NULL;
-	GF_SceneGraph *sg = NULL;
-	GF_DOMEventTarget *target = NULL;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	/* Determine the event type and handler params */
-	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, NULL);
-	if (e != GF_OK) goto err_exit;
-
-	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
-	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &node);
-	if (!sg || !target) return JS_TRUE;
-
-	/*flush all pending add_listener*/
-	gf_dom_listener_process_add(sg);
-
-	count = gf_list_count(target->listeners);
-	for (i=0; i<count; i++) {
-		GF_FieldInfo info;
-		GF_DOMText *txt;
-		SVG_handlerElement *hdl;
-		GF_Node *el = (GF_Node *)gf_list_get(target->listeners, i);
-
-		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
-		if (!info.far_ptr) continue;
-		if (((XMLEV_Event*)info.far_ptr)->type != evtType) continue;
-
-		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
-		if (!info.far_ptr) continue;
-		hdl = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
-		if (!hdl) continue;
-		if (! JSVAL_IS_NULL(funval) ) {
-#if (JS_VERSION>=185)
-			JSBool res = JS_FALSE;
-			if (! JS_StrictlyEqual(c, funval, *(jsval *)&hdl->js_fun_val, &res))
-				continue;
-#else
-			if (funval != *(jsval *)&hdl->js_fun_val) continue;
-#endif
-		} else if (hdl->children) {
-			txt = (GF_DOMText *) hdl->children->node;
-			if (txt->sgprivate->tag != TAG_DOMText) continue;
-			if (!txt->textContent || !callback || strcmp(txt->textContent, callback)) continue;
-		} else {
-			continue;
-		}
-
-		/*this will destroy the listener and its child handler*/
-		gf_dom_listener_del(el, target);
-		break;
-	}
-#endif
-
-err_exit:
-	if (callback) SMJS_FREE(c, callback);
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(dom_event_remove_listener)
-{
-	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
-}
-
-/*dom3 node*/
-static DECL_FINALIZE( dom_node_finalize)
-
-GF_Node *n = (GF_Node *) SMJS_GET_PRIVATE(c, obj);
-/*the JS proto of the svgClass or a destroyed object*/
-if (!n) return;
-if (!n->sgprivate) return;
-
-SMJS_SET_PRIVATE(c, obj, NULL);
-gf_list_del_item(n->sgprivate->scenegraph->objects, obj);
-
-gf_sg_js_dom_pre_destroy(c, n->sgprivate->scenegraph, n);
-dom_unregister_node(n);
-}
-
-static Bool check_dom_parents(JSContext *c, GF_Node *n, GF_Node *parent)
-{
-	GF_ParentList *par = n->sgprivate->parents;
-	if (n->sgprivate->scenegraph != parent->sgprivate->scenegraph) {
-		dom_throw_exception(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
-		return GF_FALSE;
-	}
-	while (par) {
-		if (par->node==parent) {
-			dom_throw_exception(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
-			return GF_FALSE;
-		}
-		if (!check_dom_parents(c, par->node, parent))
-			return GF_FALSE;
-		par = par->next;
-	}
-	return GF_TRUE;
-}
-
-static void dom_node_inserted(JSContext *c, GF_Node *n, GF_Node *parent, s32 pos)
-{
-	GF_ParentNode *old_parent;
-	Bool do_init = GF_FALSE;
-
-	/*if node is already in graph, remove it from its parent*/
-	old_parent = (GF_ParentNode*)gf_node_get_parent(n, 0);
-	if (old_parent) {
-		/*prevent destruction when removing node*/
-		n->sgprivate->num_instances++;
-		gf_node_list_del_child(&old_parent->children, n);
-		gf_node_unregister(n, (GF_Node*)old_parent);
-		n->sgprivate->num_instances--;
-	} else {
-		do_init = (n->sgprivate->UserCallback || n->sgprivate->UserPrivate) ? GF_FALSE : GF_TRUE;
-
-	}
-	/*node is being inserted - if node has a valid binding, re-root it if needed*/
-	if (n->sgprivate->interact && n->sgprivate->interact->js_binding) {
-		JSObject *nobj = (JSObject *)n->sgprivate->interact->js_binding->node;
-		if (nobj && (gf_list_find(n->sgprivate->scenegraph->objects, nobj)<0) ) {
-			const char *name = gf_node_get_name(n);
-			if (name) {
-				gf_js_add_named_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT, name);
-			} else {
-				gf_js_add_root(c, &n->sgprivate->interact->js_binding->node, GF_JSGC_OBJECT);
-			}
-			gf_list_add(n->sgprivate->scenegraph->objects, nobj);
-		}
-	}
-
-	if (pos<0) gf_node_list_add_child( & ((GF_ParentNode *)parent)->children, n);
-	else gf_node_list_insert_child( & ((GF_ParentNode *)parent)->children, n, (u32) pos);
-	gf_node_register(n, parent);
-
-	if (do_init) {
-		/*node is a handler, create listener*/
-		if (parent && (n->sgprivate->tag==TAG_SVG_handler)) {
-			gf_dom_listener_build_ex(parent, 0, 0, n, NULL);
-		}
-		gf_node_init(n);
-
-
-#ifndef GPAC_DISABLE_SVG
-		if (n->sgprivate->interact && n->sgprivate->interact->dom_evt) {
-			GF_DOM_Event evt;
-			memset(&evt, 0, sizeof(GF_DOM_Event));
-			evt.type = GF_EVENT_LOAD;
-			gf_dom_event_fire(n, &evt);
-		}
-#endif
-	}
-	/*node is being re-inserted, activate it in case*/
-	if (!old_parent) gf_node_activate(n);
-
-	dom_node_changed(parent, GF_TRUE, NULL);
-}
-
-static JSBool SMJS_FUNCTION(xml_node_insert_before)
-{
-	s32 idx;
-	u32 tag;
-	GF_Node *n, *target, *new_node;
-	GF_ParentNode *par;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !JSVAL_IS_OBJECT(argv[0]))
-		return JS_TRUE;
-
-	n = dom_get_node(c, obj);
-	if (!n) {
-		return dom_throw_exception(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
-	}
-
-	new_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!new_node) return JS_TRUE;
-
-	target = NULL;
-	if ((argc==2) && JSVAL_IS_OBJECT(argv[1]) && !JSVAL_IS_NULL(argv[1])) {
-		target = dom_get_node(c, JSVAL_TO_OBJECT(argv[1]));
-		if (!target) return JS_TRUE;
-	}
-	tag = gf_node_get_tag(n);
-	if (tag==TAG_DOMText) return JS_TRUE;
-
-	if (!check_dom_parents(c, n, new_node))
-		return JS_FALSE;
-
-	par = (GF_ParentNode*)n;
-	idx = -1;
-	if (target) {
-		idx = gf_node_list_find_child(par->children, target);
-		if (idx<0) {
-			return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
-		}
-	}
-	dom_node_inserted(c, new_node, n, idx);
-	SMJS_SET_RVAL( argv[0] );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_node_append_child)
-{
-	u32 tag;
-	GF_Node *n, *new_node;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) {
-		return JS_TRUE;
-	}
-	n = dom_get_node(c, obj);
-	if (!n) {
-		return dom_throw_exception(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
-	}
-
-	new_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!new_node) {
-		return JS_TRUE;
-	}
-	tag = gf_node_get_tag(n);
-	if (tag==TAG_DOMText) {
-		return JS_TRUE;
-	}
-
-	if (!check_dom_parents(c, n, new_node)) {
-		return JS_FALSE;
-	}
-
-	dom_node_inserted(c, new_node, n, -1);
-
-	SMJS_SET_RVAL( argv[0] );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_node_replace_child)
-{
-	s32 idx;
-	u32 tag;
-	GF_Node *n, *new_node, *old_node;
-	GF_ParentNode *par;
-	SMJS_OBJ
-	SMJS_ARGS
-	if ((argc!=2) || !JSVAL_IS_OBJECT(argv[0]) || !JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	new_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!new_node) return JS_TRUE;
-	old_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[1]));
-	if (!old_node) return JS_TRUE;
-	tag = gf_node_get_tag(n);
-	if (tag==TAG_DOMText) return JS_TRUE;
-	par = (GF_ParentNode*)n;
-	idx = gf_node_list_find_child(par->children, old_node);
-	if (idx<0) return JS_TRUE;
-
-	gf_node_list_del_child(&par->children, old_node);
-	gf_node_unregister(old_node, n);
-
-	dom_node_inserted(c, new_node, n, -1);
-
-	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
-	n->sgprivate->scenegraph->svg_js->force_gc = GF_TRUE;
-
-	SMJS_SET_RVAL( argv[0] );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_node_remove_child)
-{
-	u32 tag;
-	GF_Node *n, *old_node;
-	GF_ParentNode *par;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	old_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!old_node) return JS_TRUE;
-	tag = gf_node_get_tag(n);
-	if (tag==TAG_DOMText) return JS_TRUE;
-	par = (GF_ParentNode*)n;
-
-	/*if node is present in parent, unregister*/
-	if (gf_node_list_del_child(&par->children, old_node)) {
-		gf_node_unregister(old_node, n);
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
-	}
-	SMJS_SET_RVAL( argv[0]);
-	dom_node_changed(n, GF_TRUE, NULL);
-	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
-	n->sgprivate->scenegraph->svg_js->force_gc = GF_TRUE;
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(xml_clone_node)
-{
-	Bool deep;
-	GF_Node *n, *clone;
-	SMJS_OBJ
-	SMJS_ARGS
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	deep = argc ? (JSVAL_TO_BOOLEAN(argv[0]) ? GF_TRUE : GF_FALSE) : GF_FALSE;
-
-	clone = gf_node_clone(n->sgprivate->scenegraph, n, NULL, "", deep);
-	SMJS_SET_RVAL( dom_node_construct(c, clone) );
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(xml_node_has_children)
-{
-	GF_Node *n;
-	SMJS_OBJ
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( ((GF_ParentNode*)n)->children ? JS_TRUE : JS_FALSE) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_node_has_attributes)
-{
-	u32 tag;
-	GF_Node *n;
-	SMJS_OBJ
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	tag = gf_node_get_tag(n);
-	if (tag>=GF_NODE_FIRST_DOM_NODE_TAG) {
-		SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( ((GF_DOMNode*)n)->attributes ? JS_TRUE : JS_FALSE) );
-	} else {
-		/*not supported for other node types*/
-		SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( JS_FALSE) );
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_node_is_same_node)
-{
-	GF_Node *n, *a_node;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-	n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	a_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!a_node) return JS_TRUE;
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( (a_node==n) ? JS_TRUE : JS_FALSE) );
-	return JS_TRUE;
-}
-
-static const char *node_get_local_name(GF_Node *node)
-{
-	const char *res;
-	GF_List *l;
-	if (!node) return NULL;
-	l = node->sgprivate->scenegraph->ns;
-	node->sgprivate->scenegraph->ns = NULL;
-	res = gf_node_get_class_name(node);
-	node->sgprivate->scenegraph->ns = l;
-	return res;
-}
-
-static const char *node_lookup_namespace_by_tag(GF_Node *node, u32 tag)
-{
-	/*browse attributes*/
-	GF_DOMAttribute *att;
-	if (!node) return NULL;
-	att = ((SVG_Element*)node)->attributes;
-	while (att) {
-		if (att->tag==TAG_DOM_ATT_any) {
-			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
-			if (datt->name && !strncmp(datt->name, "xmlns", 5)) {
-				char *xmlns = *(DOM_String *) datt->data;
-				u32 crc = gf_crc_32(xmlns, (u32) strlen(xmlns));
-				if (tag==crc) return xmlns;
-			}
-		}
-		att = att->next;
-	}
-	/*browse for parent*/
-	return node_lookup_namespace_by_tag(gf_node_get_parent(node, 0), tag);
-}
-
-#ifdef GPAC_UNUSED_FUNC
-/**
- * FIXME : function is not used by anybody
- */
-static u32 get_namespace_code_by_prefix(GF_Node *node, char *prefix)
-{
-	/*browse attributes*/
-	GF_DOMAttribute *att;
-	if (!node) return 0;
-	att = ((SVG_Element*)node)->attributes;
-	while (att) {
-		if (att->tag==TAG_DOM_ATT_any) {
-			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
-			if (!prefix) {
-				if (!strcmp(datt->name, "xmlns")) return datt->xmlns;
-			} else if (!strncmp(datt->name, "xmlns:", 6)) {
-				if (!strcmp(datt->name+6, prefix)) return datt->xmlns;
-			}
-		}
-		att = att->next;
-	}
-	/*browse for parent*/
-	return get_namespace_code_by_prefix(gf_node_get_parent(node, 0), prefix);
-}
-#endif /*GPAC_UNUSED_FUNC*/
-
-static SMJS_FUNC_PROP_GET( dom_node_getProperty)
-
-u32 tag;
-GF_Node *n;
-GF_SceneGraph *sg = NULL;
-GF_ParentNode *par;
-
-n = dom_get_node(c, obj);
-if (!n) {
-	sg = dom_get_doc(c, obj);
-	if (!sg) return JS_TRUE;
-}
-
-/*not supported*/
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-tag = n ? gf_node_get_tag(n) : 0;
-par = (GF_ParentNode*)n;
-
-switch (SMJS_ID_TO_INT(id)) {
-case NODE_JSPROPERTY_NODENAME:
-	if (sg) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "#document") );
-	}
-	else if (tag==TAG_DOMText) {
-		GF_DOMText *txt = (GF_DOMText *)n;
-		if (txt->type==GF_DOM_TEXT_CDATA) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "#cdata-section") );
-		else *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "#text") );
-	}
-	else {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_node_get_class_name(n) ) );
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_NODEVALUE:
-	*vp = JSVAL_VOID;
-	if (tag==TAG_DOMText) {
-		GF_DOMText *txt = (GF_DOMText *)n;
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, txt->textContent) );
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_NODETYPE:
-	if (sg) *vp = INT_TO_JSVAL(9);
-	else if (tag==TAG_DOMText) {
-		GF_DOMText *txt = (GF_DOMText *)n;
-		if (txt->type==GF_DOM_TEXT_CDATA) *vp = INT_TO_JSVAL(4);
-		else *vp = INT_TO_JSVAL(3);
-	}
-	else *vp = INT_TO_JSVAL(1);
-	return JS_TRUE;
-case NODE_JSPROPERTY_PARENTNODE:
-	if (sg) {
-		*vp = JSVAL_NULL;
-	}
-	/*if root node of the tree, the parentNode is the document*/
-	else if (n->sgprivate->scenegraph->RootNode==n) {
-		*vp = dom_document_construct(c, n->sgprivate->scenegraph);
-	} else {
-		*vp = dom_node_construct(c, gf_node_get_parent(n, 0) );
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_CHILDNODES:
-	/*NOT SUPPORTED YET*/
-	if (sg) *vp = JSVAL_VOID;
-	else if (tag==TAG_DOMText) *vp = JSVAL_NULL;
-	else *vp = dom_nodelist_construct(c, par);
-	return JS_TRUE;
-case NODE_JSPROPERTY_FIRSTCHILD:
-	if (sg) *vp = dom_node_construct(c, sg->RootNode);
-	else if (tag==TAG_DOMText) *vp = JSVAL_NULL;
-	else if (!par->children) {
-		*vp = JSVAL_NULL;
-	}
-	else *vp = dom_node_construct(c, par->children->node);
-	return JS_TRUE;
-case NODE_JSPROPERTY_LASTCHILD:
-	if (sg) *vp = dom_node_construct(c, sg->RootNode);
-	else if ((tag==TAG_DOMText) || !par->children) *vp = JSVAL_VOID;
-	else *vp = dom_node_construct(c, gf_node_list_get_child(par->children, -1) );
-	return JS_TRUE;
-case NODE_JSPROPERTY_PREVIOUSSIBLING:
-	/*works for doc as well since n is NULL*/
-	*vp = dom_node_get_sibling(c, n, GF_TRUE, GF_FALSE);
-	return JS_TRUE;
-case NODE_JSPROPERTY_NEXTSIBLING:
-	*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_FALSE);
-	return JS_TRUE;
-case NODE_JSPROPERTY_ATTRIBUTES:
-	/*NOT SUPPORTED YET*/
-	*vp = JSVAL_VOID;
-	return JS_TRUE;
-case NODE_JSPROPERTY_OWNERDOCUMENT:
-	if (sg) *vp = JSVAL_NULL;
-	else *vp = dom_document_construct(c, n->sgprivate->scenegraph);
-	return JS_TRUE;
-case NODE_JSPROPERTY_NAMESPACEURI:
-	*vp = JSVAL_NULL;
-	if (!sg) {
-		tag = gf_xml_get_element_namespace(n);
-		if (tag) {
-			const char *xmlns = gf_sg_get_namespace(n->sgprivate->scenegraph, tag);
-			if (!xmlns) xmlns = node_lookup_namespace_by_tag(n, tag);
-			*vp = xmlns ? STRING_TO_JSVAL( JS_NewStringCopyZ(c, xmlns) ) : JSVAL_VOID;
-		}
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_PREFIX:
-	if (sg) tag = gf_sg_get_namespace_code(sg, NULL);
-	else tag = gf_xml_get_element_namespace(n);
-	*vp = JSVAL_NULL;
-	if (tag) {
-		char *xmlns = (char *)gf_sg_get_namespace_qname(sg ? sg : n->sgprivate->scenegraph, tag);
-		if (xmlns) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, xmlns) );
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_LOCALNAME:
-	*vp = JSVAL_NULL;
-	if (!sg && (tag!=TAG_DOMText)) {
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, node_get_local_name(n) ) );
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_BASEURI:
-	/*NOT SUPPORTED YET*/
-	*vp = JSVAL_NULL;
-	return JS_TRUE;
-case NODE_JSPROPERTY_TEXTCONTENT:
-	*vp = JSVAL_VOID;
-	if (!sg)  {
-		char *res = gf_dom_flatten_textContent(n);
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, res) );
-		gf_free(res);
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_FIRSTELEMENTCHILD:
-	*vp = JSVAL_NULL;
-	if (n->sgprivate->tag!=TAG_DOMText) {
-		GF_ChildNodeItem *child = ((GF_ParentNode*)n)->children;
-		while (child) {
-			if (child->node->sgprivate->tag != TAG_DOMText) {
-				*vp = dom_element_construct(c, child->node);
-				break;
-			}
-			child = child->next;
-		}
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_LASTELEMENTCHILD:
-	*vp = JSVAL_NULL;
-	if (n->sgprivate->tag!=TAG_DOMText) {
-		GF_Node *last = NULL;
-		GF_ChildNodeItem *child = ((GF_ParentNode*)n)->children;
-		while (child) {
-			if (child->node->sgprivate->tag != TAG_DOMText) {
-				last = child->node;
-			}
-			child = child->next;
-		}
-		if (last) *vp = dom_element_construct(c, last);
-	}
-	return JS_TRUE;
-case NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING:
-	*vp = dom_node_get_sibling(c, n, GF_TRUE, GF_TRUE);
-	return JS_TRUE;
-case NODE_JSPROPERTY_NEXTELEMENTSIBLING:
-	*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_TRUE);
-	return JS_TRUE;
-
-}
-/*not supported*/
-return JS_TRUE;
-}
-
-void dom_node_set_textContent(GF_Node *n, char *text)
-{
-	GF_FieldInfo info;
-	gf_dom_set_textContent(n, text);
-
-	gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
-	memset(&info, 0, sizeof(GF_FieldInfo));
-	info.fieldIndex = (u32) -1;
-	gf_node_changed(n, &info);
-}
-
-static SMJS_FUNC_PROP_SET( dom_node_setProperty)
-
-u32 tag;
-GF_Node *n;
-
-n = dom_get_node(c, obj);
-/*note an element - we don't support property setting on document yet*/
-if (!n) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-tag = n ? gf_node_get_tag(n) : 0;
-
-switch (SMJS_ID_TO_INT(id)) {
-case NODE_JSPROPERTY_NODEVALUE:
-	if ((tag==TAG_DOMText) && JSVAL_CHECK_STRING(*vp)) {
-		GF_DOMText *txt = (GF_DOMText *)n;
-		if (txt->textContent) gf_free(txt->textContent);
-		txt->textContent = js_get_utf8(c, *vp);
-		dom_node_changed(n, GF_TRUE, NULL);
-	}
-	/*we only support element and sg in the Node interface, no set*/
-	return JS_TRUE;
-case NODE_JSPROPERTY_PREFIX:
-	/*NOT SUPPORTED YET*/
-	return JS_TRUE;
-case NODE_JSPROPERTY_TEXTCONTENT:
-{
-	char *txt;
-	txt = js_get_utf8(c, *vp);
-	dom_node_set_textContent(n, txt);
-	if (txt) gf_free(txt);
-}
-return JS_TRUE;
-}
-/*not supported*/
-return JS_TRUE;
-}
-
-
-/*dom3 document*/
-
-/*don't attempt to do anything with the scenegraph, it may be destroyed
-fortunately a sg cannot be created like that...*/
-DECL_FINALIZE(dom_document_finalize)
-
-GF_SceneGraph *sg;
-
-sg = (GF_SceneGraph*) SMJS_GET_PRIVATE(c, obj);
-/*the JS proto of the svgClass or a destroyed object*/
-if (!sg) return;
-
-SMJS_SET_PRIVATE(c, sg->document, NULL);
-sg->document = NULL;
-if (sg->RootNode) {
-	gf_node_unregister(sg->RootNode, NULL);
-	if (sg->reference_count) {
-		sg->reference_count--;
-		if (!sg->reference_count)
-			gf_sg_del(sg);
-	}
-}
-}
-
-static SMJS_FUNC_PROP_GET( dom_document_getProperty )
-
-u32 prop_id;
-GF_SceneGraph *sg = dom_get_doc(c, obj);
-if (!sg) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case DOCUMENT_JSPROPERTY_IMPLEMENTATION:
-	/*FIXME, this is wrong, we should have our own implementation
-	but at the current time we rely on the global object to provide it*/
-	*vp = OBJECT_TO_JSVAL( JS_GetGlobalObject(c) );
-	return JS_TRUE;
-case DOCUMENT_JSPROPERTY_DOCUMENTELEMENT:
-	*vp = dom_element_construct(c, sg->RootNode);
-	return JS_TRUE;
-case DOCUMENT_JSPROPERTY_GLOBAL:
-	*vp = OBJECT_TO_JSVAL( JS_GetGlobalObject(c) );
-	return JS_TRUE;
-
-	/*NOT SUPPORTED YET*/
-
-case DOCUMENT_JSPROPERTY_DOCTYPE:
-case DOCUMENT_JSPROPERTY_INPUTENCODING:
-case DOCUMENT_JSPROPERTY_XMLENCODING:
-case DOCUMENT_JSPROPERTY_XMLSTANDALONE:
-case DOCUMENT_JSPROPERTY_XMLVERSION:
-case DOCUMENT_JSPROPERTY_STRICTERRORCHECKING:
-case DOCUMENT_JSPROPERTY_DOCUMENTURI:
-case DOCUMENT_JSPROPERTY_LOCATION:
-case DOCUMENT_JSPROPERTY_DOMCONFIG:
-	*vp = JSVAL_VOID;
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET_NOVP(dom_document_setProperty)
-
-u32 prop_id;
-GF_SceneGraph *sg = dom_get_doc(c, obj);
-if (!sg) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case DOCUMENT_JSPROPERTY_XMLSTANDALONE:
-	break;
-case DOCUMENT_JSPROPERTY_XMLVERSION:
-	break;
-case DOCUMENT_JSPROPERTY_STRICTERRORCHECKING:
-	break;
-case DOCUMENT_JSPROPERTY_DOCUMENTURI:
-	break;
-case DOCUMENT_JSPROPERTY_DOMCONFIG:
-	break;
-
-	/*the rest is read-only*/
-}
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_document_create_element)
-{
-	u32 tag, ns;
-	GF_Node *n;
-	char *name, *xmlns;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-
-	if (!sg || !argc || !JSVAL_CHECK_STRING(argv[0]) )
-		return JS_TRUE;
-
-	name = NULL;
-	/*NS version*/
-	ns = 0;
-	xmlns = NULL;
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		xmlns = js_get_utf8(c, argv[0]);
-		if (xmlns) ns = gf_sg_get_namespace_code_from_name(sg, xmlns);
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-
-	if (name) {
-		/*browse all our supported DOM implementations*/
-		tag = gf_xml_get_element_tag(name, ns);
-		if (!tag) tag = TAG_DOMFullNode;
-		n = gf_node_new(sg, tag);
-		if (n && (tag == TAG_DOMFullNode)) {
-			GF_DOMFullNode *elt = (GF_DOMFullNode *)n;
-			elt->name = gf_strdup(name);
-			if (xmlns) {
-				gf_sg_add_namespace(sg, xmlns, NULL);
-				elt->ns	= gf_sg_get_namespace_code_from_name(sg, xmlns);
-			}
-		}
-		SMJS_SET_RVAL( dom_element_construct(c, n) );
-	}
-	if (xmlns) gf_free(xmlns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_document_create_text)
-{
-	GF_Node *n;
-	SMJS_OBJ
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_TRUE;
-
-	n = gf_node_new(sg, TAG_DOMText);
-	if (argc) {
-		SMJS_ARGS
-		char *str = js_get_utf8(c, argv[0]);
-		if (!str) str = gf_strdup("");
-		((GF_DOMText*)n)->textContent = str;
-	}
-	SMJS_SET_RVAL( dom_text_construct(c, n) );
-	return JS_TRUE;
-}
-
-static void xml_doc_gather_nodes(GF_ParentNode *node, char *name, DOMNodeList *nl)
-{
-	Bool bookmark = GF_TRUE;
-	GF_ChildNodeItem *child;
-	const char *node_name;
-	if (!node) return;
-	if (name) {
-		node_name = gf_node_get_class_name((GF_Node*)node);
-		if (strcmp(node_name, name)) bookmark = GF_FALSE;
-	}
-	if (bookmark) {
-		gf_node_register((GF_Node*)node, NULL);
-		if (node->sgprivate->scenegraph->reference_count)
-			node->sgprivate->scenegraph->reference_count++;
-		gf_node_list_add_child(&nl->child, (GF_Node*)node);
-	}
-	if (node->sgprivate->tag<GF_NODE_FIRST_PARENT_NODE_TAG) return;
-	child = node->children;
-	while (child) {
-		xml_doc_gather_nodes((GF_ParentNode*)child->node, name, nl);
-		child = child->next;
-	}
-}
-
-static JSBool SMJS_FUNCTION(xml_document_elements_by_tag)
-{
-	DOMNodeList *nl;
-	JSObject *new_obj;
-	char *name;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_TRUE;
-
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-
-	/*NS version - TODO*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-
-	GF_SAFEALLOC(nl, DOMNodeList);
-	if (name && !strcmp(name, "*")) name = NULL;
-	xml_doc_gather_nodes((GF_ParentNode*)sg->RootNode, name, nl);
-	new_obj = JS_NewObject(c, &dom_rt->domNodeListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, nl);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(new_obj));
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_document_element_by_id)
-{
-	NodeIDedItem *reg_node;
-	GF_Node *n;
-	char *id;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_SceneGraph *sg = dom_get_doc(c, obj);
-	if (!sg) return JS_FALSE;
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	id = SMJS_CHARS(c, argv[0]);
-
-	/*we don't use the regular gf_sg_find_node_by_name because we may have nodes defined with the
-	same ID and we need to locate the first one which is inserted in the tree*/
-	n = NULL;
-	reg_node = sg->id_node;
-	while (reg_node) {
-		if (reg_node->NodeName && !strcmp(reg_node->NodeName, id)) {
-			n = reg_node->node;
-			/*element is not inserted - fixme, we should check all parents*/
-			if (n && (n->sgprivate->scenegraph->RootNode!=n) && !n->sgprivate->parents) n = NULL;
-			else break;
-		}
-		reg_node = reg_node->next;
-	}
-	SMJS_SET_RVAL( dom_element_construct(c, n));
-	SMJS_FREE(c, id);
-	return JS_TRUE;
-}
-
-/*dom3 element*/
-DECL_FINALIZE( dom_element_finalize)
-
-dom_node_finalize(c, obj);
-}
-
-static SMJS_FUNC_PROP_GET( dom_element_getProperty)
-
-u32 prop_id;
-GF_Node *n = dom_get_node(c, obj);
-if (!n) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-switch (prop_id) {
-case ELEMENT_JSPROPERTY_TAGNAME:
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_node_get_class_name(n) ) );
-	return JS_TRUE;
-case ELEMENT_JSPROPERTY_SCHEMATYPEINFO:
-	/*NOT SUPPORTED YET*/
-	*vp = JSVAL_VOID;
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_element_get_attribute)
-{
-	char *name, *ns;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (!argc || !JSVAL_CHECK_STRING(argv[0]))
-		return JS_TRUE;
-	name = ns = NULL;
-	/*NS version*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1]))
-			return JS_TRUE;
-		ns = js_get_utf8(c, argv[0]);
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-	if (!name) goto exit;
-
-	/*ugly ugly hack ...*/
-	if (!strcmp(name, "id") || !strcmp(name, "xml:id") ) {
-		char *sID = (char *) gf_node_get_name(n);
-		if (sID) {
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, sID ? sID : "") ) );
-			goto exit;
-		}
-	}
-
-	if (n->sgprivate->tag==TAG_DOMFullNode) {
-		GF_DOMFullNode *node = (GF_DOMFullNode*)n;
-		GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
-		while (att) {
-			if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
-				SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, *(char**)att->data ) ));
-				goto exit;
-			}
-			att = (GF_DOMFullAttribute *) att->next;
-		}
-	}
-	else if (n->sgprivate->tag==TAG_DOMText) {
-
-	} else if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
-		GF_FieldInfo info;
-		u32 ns_code = 0;
-		if (ns) {
-			ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
-			if (!ns_code) ns_code = gf_crc_32(ns, (u32) strlen(ns));
-		}
-		else {
-			ns_code = gf_xml_get_element_namespace(n);
-		}
-
-		if (gf_node_get_attribute_by_name(n, name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-			char *szAtt = gf_svg_dump_attribute(n, &info);
-			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
-			if (szAtt) gf_free(szAtt);
-			goto exit;
-		}
-	}
-	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, "") ));
-exit:
-	if (ns) gf_free(ns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(xml_element_has_attribute)
-{
-	char *name, *ns;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n)
-		return JS_TRUE;
-
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	name = ns = NULL;
-	/*NS version*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		ns = js_get_utf8(c, argv[0]);
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-	if (!name) goto exit;
-
-	if (n->sgprivate->tag==TAG_DOMFullNode) {
-		GF_DOMFullNode *node = (GF_DOMFullNode*)n;
-		GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
-		while (att) {
-			if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
-				SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE));
-				goto exit;
-			}
-			att = (GF_DOMFullAttribute *) att->next;
-		}
-	}
-	else if (n->sgprivate->tag==TAG_DOMText) {
-	}
-	else if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
-		GF_FieldInfo info;
-		u32 ns_code = 0;
-		if (ns) ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
-		else ns_code = gf_sg_get_namespace_code(n->sgprivate->scenegraph, NULL);
-
-		if (gf_node_get_attribute_by_name(n, name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-			goto exit;
-		}
-	}
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
-exit:
-	if (ns) gf_free(ns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-
-
-static JSBool SMJS_FUNCTION(xml_element_remove_attribute)
-{
-	u32 tag;
-	GF_DOMFullNode *node;
-	GF_DOMFullAttribute *prev, *att;
-	char *name, *ns;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	name = ns = NULL;
-	/*NS version*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		ns = js_get_utf8(c, argv[0]);
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-	if (!name) goto exit;
-
-	tag = TAG_DOM_ATT_any;
-	node = (GF_DOMFullNode*)n;
-	prev = NULL;
-	att = (GF_DOMFullAttribute*)node->attributes;
-
-	if (n->sgprivate->tag==TAG_DOMFullNode) tag = TAG_DOM_ATT_any;
-	else if (n->sgprivate->tag==TAG_DOMText) {
-		goto exit;
-	} 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, ns);
-		else ns_code = gf_sg_get_namespace_code(n->sgprivate->scenegraph, NULL);
-
-		tag = gf_xml_get_attribute_tag(n, name, ns_code);
-	}
-
-	while (att) {
-		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
-			if (prev) prev->next = att->next;
-			else node->attributes = att->next;
-			if (att->data) gf_free(att->data);
-			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;
-			gf_svg_delete_attribute_value(att->data_type, att->data, n->sgprivate->scenegraph);
-			gf_free(att);
-			dom_node_changed(n, GF_FALSE, NULL);
-			goto exit;
-		}
-		prev = att;
-		att = (GF_DOMFullAttribute *) att->next;
-	}
-exit:
-	if (ns) gf_free(ns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-static void gf_dom_add_handler_listener(GF_Node *n, u32 evtType, char *handlerCode)
-{
-	/*check if we're modifying an existing listener*/
-	SVG_handlerElement *handler;
-	u32 i, count = gf_dom_listener_count(n);
-	for (i=0; i<count; i++) {
-		GF_FieldInfo info;
-		GF_DOMText *text;
-		GF_Node *listen = gf_dom_listener_get(n, i);
-
-		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
-		if (!info.far_ptr || (((XMLEV_Event*)info.far_ptr)->type != evtType)) continue;
-
-		/* found a listener for this event, override the handler
-		TODO: FIX this, there may be a listener/handler already set with JS, why overriding ? */
-		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
-		assert(info.far_ptr);
-		handler = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
-		text = (GF_DOMText*)handler->children->node;
-		if (text->sgprivate->tag==TAG_DOMText) {
-			if (text->textContent) gf_free(text->textContent);
-			text->textContent = gf_strdup(handlerCode);
-		}
-		return;
-	}
-	/*nope, create a listener*/
-	handler = gf_dom_listener_build(n, evtType, 0);
-	gf_dom_add_text_node((GF_Node*)handler, gf_strdup(handlerCode));
-	return;
-}
-
-static void gf_dom_full_set_attribute(GF_DOMFullNode *node, char *attribute_name, char *attribute_content)
-{
-	GF_DOMFullAttribute *prev = NULL;
-	GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
-	while (att) {
-		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, attribute_name)) {
-			if (att->data) gf_free(att->data);
-			att->data = gf_strdup(attribute_content);
-			dom_node_changed((GF_Node *)node, GF_FALSE, NULL);
-			return;
-		}
-		prev = att;
-		att = (GF_DOMFullAttribute *) att->next;
-	}
-	/*create new att*/
-	GF_SAFEALLOC(att, GF_DOMFullAttribute);
-	if (!att) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM attribute\n"));
-		return;
-	}
-	att->name = gf_strdup(attribute_name);
-	att->data = gf_strdup(attribute_content);
-	if (prev) prev->next = (GF_DOMAttribute*) att;
-	else node->attributes = (GF_DOMAttribute*) att;
-	return;
-}
-
-void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val)
-{
-	GF_FieldInfo info;
-	u32 anim_value_type = 0;
-
-	if (!strcmp(name, "attributeName")) {
-		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info) == GF_OK) {
-			SMIL_AttributeName *attname = (SMIL_AttributeName *)info.far_ptr;
-
-			/*parse the attribute name even if the target is not found, because a namespace could be specified and
-			only valid for the current node*/
-			if (!attname->type) {
-				char *sep;
-				char *name = attname->name;
-				sep = strchr(name, ':');
-				if (sep) {
-					sep[0] = 0;
-					attname->type = gf_sg_get_namespace_code(n->sgprivate->scenegraph, name);
-					sep[0] = ':';
-					name = gf_strdup(sep+1);
-					gf_free(attname->name);
-					attname->name = name;
-				}
-			}
-		}
-	}
-
-	if ((n->sgprivate->tag == TAG_SVG_animateTransform) && (strstr(name, "from") || strstr(name, "to")) ) {
-		if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_transform_type, GF_TRUE, GF_FALSE, &info) != GF_OK) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'type' from animateTransform\n"));
-			return;
-		}
-
-		switch(*(SVG_TransformType *) info.far_ptr) {
-		case SVG_TRANSFORM_TRANSLATE:
-			anim_value_type = SVG_Transform_Translate_datatype;
-			break;
-		case SVG_TRANSFORM_SCALE:
-			anim_value_type = SVG_Transform_Scale_datatype;
-			break;
-		case SVG_TRANSFORM_ROTATE:
-			anim_value_type = SVG_Transform_Rotate_datatype;
-			break;
-		case SVG_TRANSFORM_SKEWX:
-			anim_value_type = SVG_Transform_SkewX_datatype;
-			break;
-		case SVG_TRANSFORM_SKEWY:
-			anim_value_type = SVG_Transform_SkewY_datatype;
-			break;
-		case SVG_TRANSFORM_MATRIX:
-			anim_value_type = SVG_Transform_datatype;
-			break;
-		default:
-			return;
-		}
-	}
-
-	if (gf_node_get_attribute_by_name(n, name, ns_code,  GF_TRUE, GF_TRUE, &info)==GF_OK) {
-		GF_Err e;
-		if (!strcmp(name, "from") || !strcmp(name, "to") || !strcmp(name, "values") ) {
-			GF_FieldInfo attType;
-			SMIL_AttributeName *attname;
-			if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &attType) != GF_OK) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'attributeName'\n"));
-				return;
-			}
-
-			attname = (SMIL_AttributeName *)attType.far_ptr;
-			if (!attname->type && attname->name) {
-				GF_Node *anim_target = gf_smil_anim_get_target(n);
-				if (anim_target) {
-					gf_node_get_attribute_by_name((GF_Node *)anim_target, attname->name, attname->type, GF_FALSE, GF_FALSE, &attType);
-					attname->type = attType.fieldType;
-				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Cannot find target of the animation to parse attribute %s\n", attname->name));
-				}
-			}
-
-			anim_value_type = attname->type;
-		}
-		e = gf_svg_parse_attribute(n, &info, val, anim_value_type);
-		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Error parsing attribute\n"));
-		}
-
-		if (info.fieldType==SVG_ID_datatype) {
-			char *idname = *(SVG_String*)info.far_ptr;
-			gf_svg_parse_element_id(n, idname, GF_FALSE);
-		}
-		if (info.fieldType==XMLRI_datatype) {
-			gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
-		}
-		dom_node_changed(n, GF_FALSE, &info);
-		return;
-	}
-}
-
-void gf_svg_set_attribute(GF_Node *n, char * ns, char *name, char *val)
-{
-	u32 ns_code = 0;
-	if (ns) {
-		ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
-	} else {
-		ns_code = gf_xml_get_element_namespace(n);
-	}
-	gf_svg_set_attributeNS(n, ns_code, name, val);
-}
-
-JSBool SMJS_FUNCTION(xml_element_set_attribute)
-{
-	u32 idx;
-	char *name, *val, *ns, *_val;
-	char szVal[100];
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	if ((argc < 2)) return JS_TRUE;
-
-	if (!JSVAL_CHECK_STRING(argv[0]))
-		return JS_TRUE;
-
-	idx = 1;
-	_val = name = ns = NULL;
-	/*NS version*/
-	if (argc==3) {
-		char *sep;
-		if (!JSVAL_CHECK_STRING(argv[1]))
-			return JS_TRUE;
-		ns = js_get_utf8(c, argv[0]);
-		gf_sg_add_namespace(n->sgprivate->scenegraph, ns, NULL);
-		name = SMJS_CHARS(c, argv[1]);
-		idx = 2;
-
-		sep = strchr(name, ':');
-		if (sep) name = sep+1;
-
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-
-	val = NULL;
-	if (JSVAL_CHECK_STRING(argv[idx])) {
-		val = _val = SMJS_CHARS(c, argv[idx]);
-	} else if (JSVAL_IS_INT(argv[idx])) {
-		sprintf(szVal, "%d", JSVAL_TO_INT(argv[idx]));
-		val = szVal;
-	} else if (JSVAL_IS_NUMBER(argv[idx])) {
-		jsdouble d;
-		JS_ValueToNumber(c, argv[idx], &d);
-		sprintf(szVal, "%g", d);
-		val = szVal;
-	} else if (JSVAL_IS_BOOLEAN(argv[idx])) {
-		sprintf(szVal, "%s", JSVAL_TO_BOOLEAN(argv[idx]) ? "true" : "false");
-		val = szVal;
-	} else {
-		goto exit;
-	}
-	if (!name || !val)
-		goto exit;
-
-
-	/* For on* attribute (e.g. onclick), we create a couple listener/handler elements on setting the attribute */
-	if ((name[0]=='o') && (name[1]=='n')) {
-		u32 evtType = gf_dom_event_type_by_name(name + 2);
-		if (evtType != GF_EVENT_UNKNOWN) {
-			gf_dom_add_handler_listener(n, evtType, val);
-			goto exit;
-		}
-	}
-
-	if (n->sgprivate->tag==TAG_DOMFullNode) {
-		gf_dom_full_set_attribute((GF_DOMFullNode*)n, name, val);
-		goto exit;
-	}
-
-	if (n->sgprivate->tag==TAG_DOMText) {
-		goto exit;
-	}
-
-	if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
-		gf_svg_set_attribute(n, ns, name, val);
-	}
-exit:
-	if (ns) gf_free(ns);
-	SMJS_FREE(c, name);
-	SMJS_FREE(c, _val);
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(xml_element_elements_by_tag)
-{
-	DOMNodeList *nl;
-	JSObject *new_obj;
-	char *name;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-
-	/*NS version*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		name = SMJS_CHARS(c, argv[1]);
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-	}
-	GF_SAFEALLOC(nl, DOMNodeList);
-	if (name && !strcmp(name, "*")) {
-		SMJS_FREE(c, name);
-		name = NULL;
-	}
-	xml_doc_gather_nodes((GF_ParentNode*)n, name, nl);
-	new_obj = JS_NewObject(c, &dom_rt->domNodeListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, nl);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(new_obj) );
-
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_element_set_id)
-{
-	u32 node_id;
-	char *name;
-	Bool is_id;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-
-	if ((argc<2) || !JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-
-	/*NS version*/
-	if (argc==2) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		name = SMJS_CHARS(c, argv[1]);
-		is_id = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? GF_TRUE : GF_FALSE;
-	} else {
-		name = SMJS_CHARS(c, argv[0]);
-		is_id = (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ? GF_TRUE : GF_FALSE;
-	}
-	gf_node_get_name_and_id(n, &node_id);
-	if (node_id && is_id) {
-		/*we only support ONE ID per node*/
-		SMJS_FREE(c, name);
-		return JS_TRUE;
-	}
-	if (is_id) {
-		if (!name) return JS_TRUE;
-		gf_node_set_id(n, gf_sg_get_max_node_id(n->sgprivate->scenegraph) + 1, gf_strdup(name) );
-	} else if (node_id) {
-		gf_node_remove_id(n);
-	}
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-
-/*dom3 character/text/comment*/
-
-static SMJS_FUNC_PROP_GET( dom_text_getProperty)
-
-u32 prop_id;
-GF_DOMText *txt = (GF_DOMText*)dom_get_node(c, obj);
-if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return JS_TRUE;
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case TEXT_JSPROPERTY_DATA:
-	if (txt->textContent) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, txt->textContent ) );
-	else *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "") );
-	return JS_TRUE;
-case TEXT_JSPROPERTY_LENGTH:
-	*vp = INT_TO_JSVAL(txt->textContent ? strlen(txt->textContent) : 0);
-	return JS_TRUE;
-case TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE:
-	*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-case TEXT_JSPROPERTY_WHOLETEXT:
-	/*FIXME - this is wrong*/
-	*vp = INT_TO_JSVAL(txt->textContent ? strlen(txt->textContent) : 0);
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( dom_text_setProperty)
-
-u32 prop_id;
-GF_DOMText *txt = (GF_DOMText*)dom_get_node(c, obj);
-if (!txt || (txt->sgprivate->tag != TAG_DOMText)) return JS_TRUE;
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case TEXT_JSPROPERTY_DATA:
-	if (txt->textContent) gf_free(txt->textContent);
-	txt->textContent = NULL;
-	if (JSVAL_CHECK_STRING(*vp)) {
-		char *str = js_get_utf8(c, *vp);
-		txt->textContent = str ? str : gf_strdup("" );
-	}
-	dom_node_changed((GF_Node*)txt, GF_FALSE, NULL);
-	return JS_TRUE;
-	/*the rest is read-only*/
-}
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(event_stop_propagation)
-{
-	SMJS_OBJ
-	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
-	if (!evt) return JS_TRUE;
-	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL;
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(event_stop_immediate_propagation)
-{
-	SMJS_OBJ
-	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
-	if (!evt) return JS_TRUE;
-	evt->event_phase |= GF_DOM_EVENT_PHASE_CANCEL_ALL;
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(event_prevent_default)
-{
-	SMJS_OBJ
-	GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
-	if (!evt) return JS_TRUE;
-	evt->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( event_getProperty)
-
-JSString *s;
-GF_DOM_Event *evt = (GF_DOM_Event *)SMJS_GET_PRIVATE(c, obj);
-if (evt==NULL) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case EVENT_JSPROPERTY_TYPE:
-		s = JS_NewStringCopyZ(c, gf_dom_event_get_name(evt->type) );
-		*vp = STRING_TO_JSVAL( s );
-		break;
-	case EVENT_JSPROPERTY_TARGET:
-		if (evt->is_vrml) return JS_TRUE;
-		switch (evt->target_type) {
-		case GF_DOM_EVENT_TARGET_NODE:
-			*vp = dom_element_construct(c, (GF_Node*) evt->target);
-			break;
-		case GF_DOM_EVENT_TARGET_DOCUMENT:
-			*vp = dom_document_construct(c, (GF_SceneGraph *) evt->target);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_MediaSource *)evt->target)->_this);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_SourceBuffer *)evt->target)->_this);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_SourceBufferList *)evt->target)->_this);
-			break;
-		default:
-			break;
-		}
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_CURRENTTARGET:
-		if (evt->is_vrml) return JS_TRUE;
-		switch (evt->currentTarget->ptr_type) {
-		case GF_DOM_EVENT_TARGET_NODE:
-			*vp = dom_element_construct(c, (GF_Node*) evt->currentTarget->ptr);
-			break;
-		case GF_DOM_EVENT_TARGET_DOCUMENT:
-			*vp = dom_document_construct(c, (GF_SceneGraph *) evt->currentTarget->ptr);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_MediaSource *)evt->target)->_this);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_SourceBuffer *)evt->target)->_this);
-			break;
-		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
-			*vp = OBJECT_TO_JSVAL(((GF_HTML_SourceBufferList *)evt->target)->_this);
-			break;
-		default:
-			break;
-		}
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_EVENTPHASE:
-		*vp = INT_TO_JSVAL( (evt->event_phase & 0x3) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_BUBBLES:
-		*vp = BOOLEAN_TO_JSVAL(evt->bubbles ? JS_TRUE : JS_FALSE);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_CANCELABLE:
-		*vp = BOOLEAN_TO_JSVAL(evt->cancelable ? JS_TRUE : JS_FALSE);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_NAMESPACEURI:
-		*vp = JSVAL_NULL;
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_TIMESTAMP:
-		*vp = JSVAL_VOID;
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_DEFAULTPREVENTED:
-		*vp = BOOLEAN_TO_JSVAL((evt->event_phase & GF_DOM_EVENT_PHASE_PREVENT) ? JS_TRUE : JS_FALSE);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_DETAIL:
-		*vp = INT_TO_JSVAL(evt->detail);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_DATA:
-	{
-		u32 len;
-		s16 txt[2];
-		const u16 *srcp;
-		char szData[5];
-		txt[0] = evt->detail;
-		txt[1] = 0;
-		srcp = (const u16 *) txt;
-		len = (u32) gf_utf8_wcstombs(szData, 5, &srcp);
-		szData[len] = 0;
-		s = JS_NewStringCopyZ(c, szData);
-		*vp = STRING_TO_JSVAL( s );
-	}
-	return JS_TRUE;
-
-	case EVENT_JSPROPERTY_SCREENX:
-		*vp = INT_TO_JSVAL(evt->screenX);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_SCREENY:
-		*vp = INT_TO_JSVAL(evt->screenY);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_CLIENTX:
-		*vp = INT_TO_JSVAL(evt->clientX);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_CLIENTY:
-		*vp = INT_TO_JSVAL(evt->clientY);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_BUTTON:
-		*vp = INT_TO_JSVAL(evt->button);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_RELATEDTARGET:
-		if (evt->is_vrml) return JS_TRUE;
-		*vp = dom_element_construct(c, evt->relatedTarget);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_WHEELDELTA:
-		*vp = INT_TO_JSVAL(FIX2INT(evt->new_scale) );
-		return JS_TRUE;
-
-	case EVENT_JSPROPERTY_KEYIDENTIFIER:
-		s = JS_NewStringCopyZ(c, gf_dom_get_key_name(evt->detail) );
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	/*Mozilla keyChar, charCode: wrap up to same value*/
-	case EVENT_JSPROPERTY_KEYCHAR:
-	case EVENT_JSPROPERTY_CHARCODE:
-		*vp = INT_TO_JSVAL(evt->detail);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_LOADED:
-		*vp = INT_TO_JSVAL( evt->media_event.loaded_size);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_TOTAL:
-		*vp = INT_TO_JSVAL( evt->media_event.total_size);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_BUFFER_ON:
-		*vp = BOOLEAN_TO_JSVAL( evt->media_event.bufferValid ? JS_TRUE : JS_FALSE);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_BUFFERLEVEL:
-		*vp = INT_TO_JSVAL( evt->media_event.level);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_BUFFERREMAININGTIME:
-		*vp = JS_MAKE_DOUBLE(c, evt->media_event.remaining_time);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_STATUS:
-		*vp = INT_TO_JSVAL( evt->media_event.status);
-		return JS_TRUE;
-
-	/*VRML ones*/
-	case EVENT_JSPROPERTY_WIDTH:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.width) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_HEIGHT:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.height) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_OFFSETX:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.x) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_OFFSETY:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.y) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_VPWIDTH:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->prev_translate.x) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_VPHEIGHT:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->prev_translate.y) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_TRANSLATIONX:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->new_translate.x) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_TRANSLATIONY:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->new_translate.y) );
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_TYPE3D:
-		*vp = INT_TO_JSVAL(evt->detail);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_ERROR:
-		*vp = INT_TO_JSVAL(evt->error_state);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_DYNAMIC_SCENE:
-		*vp = INT_TO_JSVAL(evt->key_flags);
-		return JS_TRUE;
-	case EVENT_JSPROPERTY_URL:
-		s = JS_NewStringCopyZ(c, evt->addon_url ? evt->addon_url : "");
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-/************************************************************
- *
- *	xmlHttpRequest implementation
- *
- *************************************************************/
-typedef enum {
-	XHR_ONABORT					= -1,
-	XHR_ONERROR					= -2,
-	XHR_ONLOAD					= -3,
-	XHR_ONLOADEND				= -4,
-	XHR_ONLOADSTART				= -5,
-	XHR_ONPROGRESS				= -6,
-	XHR_ONREADYSTATECHANGE		= -7,
-	XHR_ONTIMEOUT				= -8,
-	XHR_READYSTATE				= -9,
-	XHR_RESPONSE				= -10,
-	XHR_RESPONSETYPE			= -11,
-	XHR_RESPONSETEXT			= -12,
-	XHR_RESPONSEXML				= -13,
-	XHR_STATUS					= -14,
-	XHR_STATUSTEXT				= -15,
-	XHR_TIMEOUT					= -16,
-	XHR_UPLOAD					= -17,
-	XHR_WITHCREDENTIALS			= -18,
-	XHR_STATIC_UNSENT			= -19,
-	XHR_STATIC_OPENED			= -20,
-	XHR_STATIC_HEADERS_RECEIVED = -21,
-	XHR_STATIC_LOADING			= -22,
-	XHR_STATIC_DONE				= -23,
-	XHR_CACHE					= -24
-} XHR_JSProperty;
-
-typedef enum {
-	XHR_READYSTATE_UNSENT			= 0,
-	XHR_READYSTATE_OPENED			= 1,
-	XHR_READYSTATE_HEADERS_RECEIVED = 2,
-	XHR_READYSTATE_LOADING			= 3,
-	XHR_READYSTATE_DONE				= 4
-} XHR_ReadyState;
-
-typedef enum {
-	XHR_RESPONSETYPE_NONE,
-	XHR_RESPONSETYPE_ARRAYBUFFER,
-	XHR_RESPONSETYPE_BLOB,
-	XHR_RESPONSETYPE_DOCUMENT,
-	XHR_RESPONSETYPE_JSON,
-	XHR_RESPONSETYPE_TEXT,
-	XHR_RESPONSETYPE_STREAM
-} XHR_ResponseType;
-
-typedef enum {
-	XHR_CACHETYPE_NORMAL,
-	XHR_CACHETYPE_NONE,
-	XHR_CACHETYPE_MEMORY,
-} XHR_CacheType;
-
-struct __xhr_context
-{
-	JSContext *c;
-	JSObject *_this;
-
-	/* callback functions */
-	jsval onabort;
-	jsval onerror;
-	jsval onreadystatechange;
-	jsval onload;
-	jsval onloadstart;
-	jsval onloadend;
-	jsval onprogress;
-	jsval ontimeout;
-
-	XHR_ReadyState readyState;
-	Bool async;
-
-	/* GPAC extension to control the caching of XHR-downloaded resources */
-	XHR_CacheType  cache;
-
-	/*header/header-val, terminated by NULL*/
-	char **headers;
-	u32 cur_header;
-	char **recv_headers;
-
-	char *method, *url;
-	GF_DownloadSession *sess;
-	char *data;
-	u32 size;
-	JSObject *arraybuffer;
-	GF_Err ret_code;
-	u32 html_status;
-	char *statusText;
-	char *mime;
-	u32 timeout;
-	XHR_ResponseType responseType;
-	Bool withCredentials;
-	Bool isFile;
-
-	GF_SAXParser *sax;
-	GF_List *node_stack;
-
-	GF_DOMEventTarget *event_target;
-
-	/* dom graph in which the XHR is created */
-	GF_SceneGraph *owning_graph;
-	/* dom graph used to parse XML into */
-	GF_SceneGraph *document;
-};
-
-GF_SceneGraph *xml_http_get_scenegraph(XMLHTTPContext *ctx)
-{
-	return ctx->owning_graph;
-}
-
-GF_DOMEventTarget *xml_http_get_event_target(XMLHTTPContext *ctx)
-{
-	return ctx->event_target;
-}
-
-static void xml_http_reset_recv_hdr(XMLHTTPContext *ctx)
-{
-	u32 nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) {
-			gf_free(ctx->recv_headers[nb_hdr]);
-			gf_free(ctx->recv_headers[nb_hdr+1]);
-			nb_hdr+=2;
-		}
-		gf_free(ctx->recv_headers);
-		ctx->recv_headers = NULL;
-	}
-}
-
-static void xml_http_append_recv_header(XMLHTTPContext *ctx, const char *hdr, const char *val)
-{
-	u32 nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) nb_hdr+=2;
-	}
-	ctx->recv_headers = (char **)gf_realloc(ctx->recv_headers, sizeof(char*)*(nb_hdr+3));
-	ctx->recv_headers[nb_hdr] = gf_strdup(hdr);
-	ctx->recv_headers[nb_hdr+1] = gf_strdup(val ? val : "");
-	ctx->recv_headers[nb_hdr+2] = NULL;
-}
-
-static void xml_http_append_send_header(XMLHTTPContext *ctx, char *hdr, char *val)
-{
-	if (!hdr) return;
-
-	if (ctx->headers) {
-		u32 nb_hdr = 0;
-		while (ctx->headers && ctx->headers[nb_hdr]) {
-			if (stricmp(ctx->headers[nb_hdr], hdr)) {
-				nb_hdr+=2;
-				continue;
-			}
-			/*ignore these ones*/
-			if (!stricmp(hdr, "Accept-Charset")
-			        || !stricmp(hdr, "Accept-Encoding")
-			        || !stricmp(hdr, "Content-Length")
-			        || !stricmp(hdr, "Expect")
-			        || !stricmp(hdr, "Date")
-			        || !stricmp(hdr, "Host")
-			        || !stricmp(hdr, "Keep-Alive")
-			        || !stricmp(hdr, "Referer")
-			        || !stricmp(hdr, "TE")
-			        || !stricmp(hdr, "Trailer")
-			        || !stricmp(hdr, "Transfer-Encoding")
-			        || !stricmp(hdr, "Upgrade")
-			   ) {
-				return;
-			}
-
-			/*replace content for these ones*/
-			if (!stricmp(hdr, "Authorization")
-			        || !stricmp(hdr, "Content-Base")
-			        || !stricmp(hdr, "Content-Location")
-			        || !stricmp(hdr, "Content-MD5")
-			        || !stricmp(hdr, "Content-Range")
-			        || !stricmp(hdr, "Content-Type")
-			        || !stricmp(hdr, "Content-Version")
-			        || !stricmp(hdr, "Delta-Base")
-			        || !stricmp(hdr, "Depth")
-			        || !stricmp(hdr, "Destination")
-			        || !stricmp(hdr, "ETag")
-			        || !stricmp(hdr, "From")
-			        || !stricmp(hdr, "If-Modified-Since")
-			        || !stricmp(hdr, "If-Range")
-			        || !stricmp(hdr, "If-Unmodified-Since")
-			        || !stricmp(hdr, "Max-Forwards")
-			        || !stricmp(hdr, "MIME-Version")
-			        || !stricmp(hdr, "Overwrite")
-			        || !stricmp(hdr, "Proxy-Authorization")
-			        || !stricmp(hdr, "SOAPAction")
-			        || !stricmp(hdr, "Timeout") ) {
-				gf_free(ctx->headers[nb_hdr+1]);
-				ctx->headers[nb_hdr+1] = gf_strdup(val);
-				return;
-			}
-			/*append value*/
-			else {
-				char *new_val = (char *)gf_malloc(sizeof(char) * (strlen(ctx->headers[nb_hdr+1])+strlen(val)+3));
-				sprintf(new_val, "%s, %s", ctx->headers[nb_hdr+1], val);
-				gf_free(ctx->headers[nb_hdr+1]);
-				ctx->headers[nb_hdr+1] = new_val;
-				return;
-			}
-			nb_hdr+=2;
-		}
-	}
-	xml_http_append_recv_header(ctx, hdr, val);
-}
-
-void xhr_del_array_buffer(void *udta)
-{
-	if (udta) {
-		((XMLHTTPContext *)udta)->arraybuffer = NULL;
-		((XMLHTTPContext *)udta)->data = NULL;
-	}
-}
-
-static void xml_http_del_data(XMLHTTPContext *ctx)
-{
-	if (ctx->data) {
-		if (ctx->arraybuffer) {
-			/* if there is an arraybuffer holding a point to that data, we need to release it */
-			if (ctx->arraybuffer) {
-//				GF_HTML_ArrayBuffer *html_array = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(ctx->c, ctx->arraybuffer);
-				//detach the ArrayBuffer from this object
-				JS_SetParent(ctx->c, ctx->arraybuffer, NULL);
-				ctx->arraybuffer = NULL;
-			}
-		} else {
-			gf_free(ctx->data);
-		}
-		ctx->data = NULL;
-		ctx->size = 0;
-	}
-}
-
-static void xml_http_reset_partial(XMLHTTPContext *ctx)
-{
-	xml_http_reset_recv_hdr(ctx);
-	xml_http_del_data(ctx);
-	if (ctx->mime) {
-		gf_free(ctx->mime);
-		ctx->mime = NULL;
-	}
-	if (ctx->statusText) {
-		gf_free(ctx->statusText);
-		ctx->statusText = NULL;
-	}
-	ctx->cur_header = 0;
-	ctx->html_status = 0;
-}
-
-static void xml_http_reset(XMLHTTPContext *ctx)
-{
-	if (ctx->method) {
-		gf_free(ctx->method);
-		ctx->method = NULL;
-	}
-	if (ctx->url) {
-		gf_free(ctx->url);
-		ctx->url = NULL;
-	}
-
-	xml_http_reset_partial(ctx);
-
-	if (ctx->sess) {
-		GF_DownloadSession *tmp = ctx->sess;
-		ctx->sess = NULL;
-		gf_dm_sess_abort(tmp);
-		gf_dm_sess_del(tmp);
-	}
-
-	if (ctx->url) {
-		gf_free(ctx->url);
-		ctx->url = NULL;
-	}
-	if (ctx->sax) {
-		gf_xml_sax_del(ctx->sax);
-		ctx->sax = NULL;
-	}
-	if (ctx->node_stack) {
-		gf_list_del(ctx->node_stack);
-		ctx->node_stack = NULL;
-	}
-	if (ctx->document) {
-		gf_node_unregister(ctx->document->RootNode, NULL);
-		/*we're sure the graph is a "nomade" one since we initially put the refcount to 1 ourselves*/
-		ctx->document->reference_count--;
-		if (!ctx->document->reference_count) {
-			gf_sg_js_dom_pre_destroy(ctx->c, ctx->document, NULL);
-			gf_sg_del(ctx->document);
-		}
-	}
-	ctx->document = NULL;
-	ctx->size = 0;
-	ctx->async = GF_FALSE;
-	ctx->readyState = XHR_READYSTATE_UNSENT;
-	ctx->ret_code = GF_OK;
-}
-
-static DECL_FINALIZE(xml_http_finalize)
-
-XMLHTTPContext *ctx;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return;
-ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-if (ctx) {
-	if (! JSVAL_IS_NULL(ctx->onabort))				gf_js_remove_root(c, &(ctx->onabort), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onerror))				gf_js_remove_root(c, &(ctx->onerror), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onload))					gf_js_remove_root(c, &(ctx->onload), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onloadend))				gf_js_remove_root(c, &(ctx->onloadend), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onloadstart))			gf_js_remove_root(c, &(ctx->onloadstart), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onprogress))				gf_js_remove_root(c, &(ctx->onprogress), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->onreadystatechange))		gf_js_remove_root(c, &(ctx->onreadystatechange), GF_JSGC_VAL);
-	if (! JSVAL_IS_NULL(ctx->ontimeout))				gf_js_remove_root(c, &(ctx->ontimeout), GF_JSGC_VAL);
-	xml_http_reset(ctx);
-	gf_dom_event_target_del(ctx->event_target);
-	ctx->event_target = NULL;
-	gf_free(ctx);
-}
-}
-static JSBool SMJS_FUNCTION(xml_http_constructor)
-{
-	XMLHTTPContext *p;
-	SMJS_OBJ_CONSTRUCTOR(&dom_rt->xmlHTTPRequestClass)
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	GF_SAFEALLOC(p, XMLHTTPContext);
-	if (!p) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[WHR] Failed to allocate XHR object\n"));
-		return JS_FALSE;
-	}
-	p->c = c;
-	p->_this = obj;
-	p->owning_graph = xml_get_scenegraph(c);
-	p->event_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_XHR, p);
-	p->onabort = JSVAL_NULL;
-	p->onerror = JSVAL_NULL;
-	p->onreadystatechange = JSVAL_NULL;
-	p->onload = JSVAL_NULL;
-	p->onloadstart = JSVAL_NULL;
-	p->onloadend = JSVAL_NULL;
-	p->onprogress = JSVAL_NULL;
-	p->ontimeout = JSVAL_NULL;
-
-	SMJS_SET_PRIVATE(c, obj, p);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static void xml_http_fire_event(XMLHTTPContext *ctx, GF_EventType evtType)
-{
-	GF_DOM_Event xhr_evt;
-	memset(&xhr_evt, 0, sizeof(GF_DOM_Event));
-	xhr_evt.type = evtType;
-	xhr_evt.target = ctx->event_target->ptr;
-	xhr_evt.target_type = ctx->event_target->ptr_type;
-	gf_sg_fire_dom_event(ctx->event_target, &xhr_evt, ctx->owning_graph, NULL);
-}
-
-static void xml_http_state_change(XMLHTTPContext *ctx)
-{
-#ifndef GPAC_DISABLE_VRML
-	GF_SceneGraph *scene;
-	GF_Node *n;
-#endif
-	jsval rval;
-
-	gf_sg_lock_javascript(ctx->c, GF_TRUE);
-	if (! JSVAL_IS_NULL(ctx->onreadystatechange))
-		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onreadystatechange, 0, NULL, &rval);
-
-	gf_sg_lock_javascript(ctx->c, GF_FALSE);
-
-	/*Flush BIFS eventOut events*/
-#ifndef GPAC_DISABLE_VRML
-	scene = (GF_SceneGraph *)JS_GetContextPrivate(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;
-	n = (GF_Node *)JS_GetContextPrivate(ctx->c);
-	gf_js_vrml_flush_event_out(n, (GF_ScriptPriv *)n->sgprivate->UserPrivate);
-#endif
-}
-
-
-static JSBool SMJS_FUNCTION(xml_http_open)
-{
-	char *val;
-	GF_JSAPIParam par;
-	XMLHTTPContext *ctx;
-	GF_SceneGraph *scene;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	/*reset*/
-	if (ctx->readyState) xml_http_reset(ctx);
-
-	if (argc<2) return JS_TRUE;
-	/*method is a string*/
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	/*url is a string*/
-	if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-
-	xml_http_reset(ctx);
-	val = SMJS_CHARS(c, argv[0]);
-	if (strcmp(val, "GET") && strcmp(val, "POST") && strcmp(val, "HEAD")
-	        && strcmp(val, "PUT") && strcmp(val, "DELETE") && strcmp(val, "OPTIONS") ) {
-		SMJS_FREE(c, val);
-		return JS_TRUE;
-	}
-
-	ctx->method = gf_strdup(val);
-
-	SMJS_FREE(c, val);
-
-	/*concatenate URL*/
-	scene = xml_get_scenegraph(c);
-#ifndef GPAC_DISABLE_VRML
-	while (scene->pOwningProto && scene->parent_scene) scene = scene->parent_scene;
-#endif
-
-	par.uri.nb_params = 0;
-	val = SMJS_CHARS(c, argv[1]);
-	par.uri.url = val;
-	ScriptAction(scene, GF_JSAPI_OP_RESOLVE_URI, scene->RootNode, &par);
-	ctx->url = par.uri.url;
-	SMJS_FREE(c, val);
-
-	/*async defaults to true*/
-	ctx->async = GF_TRUE;
-	if (argc>2) {
-		val = NULL;
-		ctx->async = (JSVAL_TO_BOOLEAN(argv[2])==JS_TRUE) ? GF_TRUE : GF_FALSE;
-		if (argc>3) {
-			if (!JSVAL_CHECK_STRING(argv[3])) return JS_TRUE;
-			/*TODO*/
-			if (argc>4) {
-				if (!JSVAL_CHECK_STRING(argv[4])) return JS_TRUE;
-				val = SMJS_CHARS(c, argv[4]);
-				/*TODO*/
-			} else {
-				val = SMJS_CHARS(c, argv[3]);
-			}
-		}
-		SMJS_FREE(c, val);
-	}
-	/*OPEN success*/
-	ctx->readyState = XHR_READYSTATE_OPENED;
-	xml_http_state_change(ctx);
-	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_START);
-	if (! JSVAL_IS_NULL(ctx->onloadstart) ) {
-		jsval rval;
-		return JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onloadstart, 0, NULL, &rval);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_set_header)
-{
-	char *hdr, *val;
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_TRUE;
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-
-	hdr = SMJS_CHARS(c, argv[0]);
-	val = SMJS_CHARS(c, argv[1]);
-	xml_http_append_send_header(ctx, hdr, val);
-	SMJS_FREE(c, hdr);
-	SMJS_FREE(c, val);
-	return JS_TRUE;
-}
-static void xml_http_sax_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
-{
-	u32 i;
-	GF_DOMFullAttribute *prev = NULL;
-	GF_DOMFullNode *par;
-	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
-	GF_DOMFullNode *node = (GF_DOMFullNode *) gf_node_new(ctx->document, TAG_DOMFullNode);
-
-	node->name = gf_strdup(node_name);
-	for (i=0; i<nb_attributes; i++) {
-		/* special case for 'xml:id' to be parsed as an ID
-		NOTE: we do not test for the 'id' attribute because without DTD we are not sure that it's an ID */
-		if (!stricmp(attributes[i].name, "xml:id")) {
-			u32 id = gf_sg_get_max_node_id(ctx->document) + 1;
-			gf_node_set_id((GF_Node *)node, id, attributes[i].value);
-		} else {
-			GF_DOMFullAttribute *att;
-			GF_SAFEALLOC(att, GF_DOMFullAttribute);
-			if (!att) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XHR] Fail to allocate DOM attribute\n"));
-				continue;
-			}
-			att->tag = TAG_DOM_ATT_any;
-			att->name = gf_strdup(attributes[i].name);
-			att->data_type = (u16) DOM_String_datatype;
-			att->data = gf_svg_create_attribute_value(att->data_type);
-			*((char **)att->data) = gf_strdup(attributes[i].value);
-			if (prev) prev->next = (GF_DOMAttribute*)att;
-			else node->attributes = (GF_DOMAttribute*)att;
-			prev = att;
-		}
-	}
-	par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	gf_node_register((GF_Node*)node, (GF_Node*)par);
-	if (par) {
-		gf_node_list_add_child(&par->children, (GF_Node*)node);
-	} else {
-		assert(!ctx->document->RootNode);
-		ctx->document->RootNode = (GF_Node*)node;
-	}
-	gf_list_add(ctx->node_stack, node);
-}
-
-static void xml_http_sax_end(void *sax_cbck, const char *node_name, const char *name_space)
-{
-	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
-	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	if (par) {
-		/*depth mismatch*/
-		if (strcmp(par->name, node_name)) return;
-		gf_list_rem_last(ctx->node_stack);
-	}
-}
-static void xml_http_sax_text(void *sax_cbck, const char *content, Bool is_cdata)
-{
-	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
-	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	if (par) {
-		u32 i, len;
-		GF_DOMText *txt;
-		/*basic check, remove all empty text nodes*/
-		len = (u32) strlen(content);
-		for (i=0; i<len; i++) {
-			if (!strchr(" \n\r\t", content[i])) break;
-		}
-		if (i==len) return;
-
-		txt = gf_dom_add_text_node((GF_Node *)par, gf_strdup(content) );
-		txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
-	}
-}
-
-#define USE_PROGRESSIVE_SAX	0
-
-static void xml_http_terminate(XMLHTTPContext *ctx, GF_Err error)
-{
-	/*if we get here, destroy downloader - FIXME we'll need a mutex here for sync case...*/
-	if (ctx->sess) {
-		gf_dm_sess_del(ctx->sess);
-		ctx->sess = NULL;
-	}
-
-	/*but stay in loaded mode*/
-	ctx->readyState = XHR_READYSTATE_DONE;
-	xml_http_state_change(ctx);
-	xml_http_fire_event(ctx, GF_EVENT_LOAD);
-	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_DONE);
-	if (! JSVAL_IS_NULL(ctx->onload)) {
-		jsval rval;
-		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onload, 0, NULL, &rval);
-	}
-	if (! JSVAL_IS_NULL(ctx->onloadend)) {
-		jsval rval;
-		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onloadend, 0, NULL, &rval);
-	}
-}
-
-static void xml_http_on_data(void *usr_cbk, GF_NETIO_Parameter *parameter)
-{
-	Bool locked = GF_FALSE;
-	XMLHTTPContext *ctx = (XMLHTTPContext *)usr_cbk;
-
-	/*make sure we can grab JS and the session is not destroyed*/
-	while (ctx->sess) {
-		if (gf_sg_try_lock_javascript(ctx->c) ) {
-			locked = GF_TRUE;
-			break;
-		}
-		gf_sleep(1);
-	}
-	/*if session not set, we've had an abort*/
-	if (!ctx->sess && !ctx->isFile) {
-		if (locked)
-			gf_sg_lock_javascript(ctx->c, GF_FALSE);
-		return;
-	}
-
-	if (!ctx->isFile) {
-		assert( locked );
-		gf_sg_lock_javascript(ctx->c, GF_FALSE);
-	}
-	switch (parameter->msg_type) {
-	case GF_NETIO_SETUP:
-		/*nothing to do*/
-		return;
-	case GF_NETIO_CONNECTED:
-		/*nothing to do*/
-		return;
-	case GF_NETIO_WAIT_FOR_REPLY:
-		/*reset send() state (data, current header) and prepare recv headers*/
-		xml_http_reset_partial(ctx);
-		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
-		xml_http_state_change(ctx);
-		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
-		if (! JSVAL_IS_NULL(ctx->onprogress) ) {
-			jsval rval;
-			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onprogress, 0, NULL, &rval);
-		}
-		return;
-	/*this is signaled sent AFTER headers*/
-	case GF_NETIO_PARSE_REPLY:
-		ctx->html_status = parameter->reply;
-		if (parameter->value) {
-			ctx->statusText = gf_strdup(parameter->value);
-		}
-		ctx->readyState = XHR_READYSTATE_LOADING;
-		xml_http_state_change(ctx);
-		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
-		xml_http_state_change(ctx);
-		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
-		if (! JSVAL_IS_NULL(ctx->onprogress) ) {
-			jsval rval;
-			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onprogress, 0, NULL, &rval);
-		}
-		return;
-
-	case GF_NETIO_GET_METHOD:
-		parameter->name = ctx->method;
-		return;
-	case GF_NETIO_GET_HEADER:
-		if (ctx->headers && ctx->headers[2*ctx->cur_header]) {
-			parameter->name = ctx->headers[2*ctx->cur_header];
-			parameter->value = ctx->headers[2*ctx->cur_header+1];
-			ctx->cur_header++;
-		}
-		return;
-	case GF_NETIO_GET_CONTENT:
-		if (ctx->data) {
-			parameter->data = ctx->data;
-			parameter->size = (u32) strlen(ctx->data);
-		}
-		return;
-	case GF_NETIO_PARSE_HEADER:
-		xml_http_append_recv_header(ctx, parameter->name, parameter->value);
-		/*prepare DOM*/
-		if (strcmp(parameter->name, "Content-Type")) return;
-		if (!strncmp(parameter->value, "application/xml", 15)
-		        || !strncmp(parameter->value, "text/xml", 8)
-		        || strstr(parameter->value, "+xml")
-		        || strstr(parameter->value, "/xml")
-//			|| !strncmp(parameter->value, "text/plain", 10)
-		   ) {
-			assert(!ctx->sax);
-			ctx->sax = gf_xml_sax_new(xml_http_sax_start, xml_http_sax_end, xml_http_sax_text, ctx);
-			ctx->node_stack = gf_list_new();
-			ctx->document = gf_sg_new();
-			/*mark this doc as "nomade", and let it leave until all references to it are destroyed*/
-			ctx->document->reference_count = 1;
-		}
-		return;
-	case GF_NETIO_DATA_EXCHANGE:
-		if (parameter->data && parameter->size) {
-#if USE_PROGRESSIVE_SAX
-			if (ctx->sax) {
-				GF_Err e;
-				if (!ctx->size) e = gf_xml_sax_init(ctx->sax, parameter->data);
-				else e = gf_xml_sax_parse(ctx->sax, parameter->data);
-				if (e) {
-					gf_xml_sax_del(ctx->sax);
-					ctx->sax = NULL;
-				}
-			}
-#endif
-			ctx->data = (char *)gf_realloc(ctx->data, sizeof(char)*(ctx->size+parameter->size+1));
-			memcpy(ctx->data + ctx->size, parameter->data, sizeof(char)*parameter->size);
-			ctx->size += parameter->size;
-			ctx->data[ctx->size] = 0;
-		}
-		return;
-	case GF_NETIO_DATA_TRANSFERED:
-		if (ctx->sax) {
-#if !USE_PROGRESSIVE_SAX
-			gf_xml_sax_init(ctx->sax, (unsigned char *) ctx->data);
-#endif
-		}
-		/* No return, go till the end of the function */
-		break;
-	case GF_NETIO_DISCONNECTED:
-		return;
-	case GF_NETIO_STATE_ERROR:
-		ctx->ret_code = parameter->error;
-		/* 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;
-	}
-	if (ctx->async) {
-		xml_http_terminate(ctx, parameter->error);
-	}
-}
-
-static GF_Err xml_http_process_local(XMLHTTPContext *ctx)
-{
-	/* For XML Http Requests to files, we fake the processing by calling the HTTP callbacks */
-	GF_NETIO_Parameter par;
-	u64 fsize;
-	FILE *responseFile;
-
-	/*opera-style local host*/
-	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_fopen(ctx->url+16, "rb");
-	/*regular-style local host*/
-	else if (!strnicmp(ctx->url, "file://", 7)) responseFile = gf_fopen(ctx->url+7, "rb");
-	/* other types: e.g. "C:\" */
-	else responseFile = gf_fopen(ctx->url, "rb");
-
-	if (!responseFile) {
-		ctx->html_status = 404;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] cannot open local file %s\n", ctx->url));
-		xml_http_fire_event(ctx, GF_EVENT_ERROR);
-		if (! JSVAL_IS_NULL(ctx->onerror) ) {
-			jsval rval;
-			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onerror, 0, NULL, &rval);
-		}
-		return GF_BAD_PARAM;
-	}
-	ctx->isFile = GF_TRUE;
-
-	par.msg_type = GF_NETIO_WAIT_FOR_REPLY;
-	xml_http_on_data(ctx, &par);
-
-	gf_fseek(responseFile, 0, SEEK_END);
-	fsize = gf_ftell(responseFile);
-	gf_fseek(responseFile, 0, SEEK_SET);
-
-	ctx->html_status = 200;
-
-	ctx->data = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
-	fsize = fread(ctx->data, sizeof(char), (size_t)fsize, responseFile);
-	gf_fclose(responseFile);
-	ctx->data[fsize] = 0;
-	ctx->size = (u32)fsize;
-
-	memset(&par, 0, sizeof(GF_NETIO_Parameter));
-	par.msg_type = GF_NETIO_PARSE_HEADER;
-	par.name = "Content-Type";
-	if (ctx->responseType == XHR_RESPONSETYPE_DOCUMENT) {
-		par.value = "application/xml";
-	} else {
-		par.value = "application/octet-stream";
-	}
-	xml_http_on_data(ctx, &par);
-
-	{
-		char contentLengthHeader[256];
-		memset(&par, 0, sizeof(GF_NETIO_Parameter));
-		par.msg_type = GF_NETIO_PARSE_HEADER;
-		par.name = "Content-Length";
-		sprintf(contentLengthHeader, "%d", ctx->size);
-		par.value = contentLengthHeader;
-		xml_http_on_data(ctx, &par);
-	}
-
-	memset(&par, 0, sizeof(GF_NETIO_Parameter));
-	par.msg_type = GF_NETIO_DATA_TRANSFERED;
-	xml_http_on_data(ctx, &par);
-
-	if (!ctx->async) {
-		xml_http_terminate(ctx, GF_OK);
-	}
-	return GF_OK;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_send)
-{
-	GF_Err e;
-	GF_JSAPIParam par;
-	GF_SceneGraph *scene;
-	char *data = NULL;
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_TRUE;
-	if (ctx->sess) return JS_TRUE;
-
-	scene = xml_get_scenegraph(c);
-	par.dnld_man = NULL;
-	ScriptAction(scene, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
-	if (!par.dnld_man) return JS_TRUE;
-
-	if (argc) {
-		if (JSVAL_IS_NULL(argv[0])) {
-		} else  if (JSVAL_IS_OBJECT(argv[0])) {
-//			if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &documentClass, NULL) ) return JS_TRUE;
-
-			/*NOT SUPPORTED YET, we must serialize the sg*/
-			return JS_TRUE;
-		} else {
-			if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-			data = SMJS_CHARS(c, argv[0]);
-		}
-	}
-
-	/*reset previous text*/
-	xml_http_del_data(ctx);
-	ctx->data = data ? gf_strdup(data) : NULL;
-	SMJS_FREE(c, data);
-
-	if (!strncmp(ctx->url, "http://", 7)) {
-		u32 flags = GF_NETIO_SESSION_NOTIFY_DATA;
-		if (!ctx->async)
-			flags |= GF_NETIO_SESSION_NOT_THREADED;
-
-		if (ctx->cache != XHR_CACHETYPE_NORMAL) {
-			if (ctx->cache == XHR_CACHETYPE_NONE) {
-				flags |= GF_NETIO_SESSION_NOT_CACHED;
-			}
-			if (ctx->cache == XHR_CACHETYPE_MEMORY) {
-				flags |= GF_NETIO_SESSION_MEMORY_CACHE;
-			}
-		}
-		ctx->sess = gf_dm_sess_new(par.dnld_man, ctx->url, flags, xml_http_on_data, ctx, &e);
-		if (!ctx->sess) return JS_TRUE;
-
-		/*start our download (whether the session is threaded or not)*/
-		e = gf_dm_sess_process(ctx->sess);
-		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
-		}
-		if (!ctx->async) {
-			xml_http_terminate(ctx, e);
-		}
-	} else {
-		e = xml_http_process_local(ctx);
-		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
-		}
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_abort)
-{
-	GF_DownloadSession *sess;
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	sess = ctx->sess;
-	ctx->sess = NULL;
-	if (sess) gf_dm_sess_del(sess);
-
-	xml_http_fire_event(ctx, GF_EVENT_ABORT);
-	if (! JSVAL_IS_NULL(ctx->onabort)) {
-		jsval rval;
-		return JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onabort, 0, NULL, &rval);
-	}
-
-	xml_http_reset(ctx);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_wait)
-{
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	gf_sleep(2000);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_get_all_headers)
-{
-	u32 nb_hdr;
-	char szVal[4096];
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	/*must be received or loaded*/
-	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
-	szVal[0] = 0;
-	nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) {
-			if (szVal[0]) strcat(szVal, "\r\n");
-			strcat(szVal, ctx->recv_headers[nb_hdr]);
-			strcat(szVal, ": ");
-			strcat(szVal, ctx->recv_headers[nb_hdr+1]);
-			nb_hdr+=2;
-		}
-	}
-	if (!szVal[0]) {
-		SMJS_SET_RVAL( JSVAL_VOID );
-	} else {
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szVal) ) );
-	}
-
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_get_header)
-{
-	u32 nb_hdr;
-	char *hdr;
-	char szVal[2048];
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	/*must be received or loaded*/
-	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
-	hdr = SMJS_CHARS(c, argv[0]);
-
-	szVal[0] = 0;
-	nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) {
-			if (!strcmp(ctx->recv_headers[nb_hdr], hdr)) {
-				if (szVal[0]) strcat(szVal, ", ");
-				strcat(szVal, ctx->recv_headers[nb_hdr+1]);
-			}
-			nb_hdr+=2;
-		}
-	}
-	if (!szVal[0]) {
-		SMJS_SET_RVAL( JSVAL_VOID );
-	} else {
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szVal)) );
-	}
-	SMJS_FREE(c, hdr);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(xml_http_overrideMimeType)
-{
-	char *mime;
-	XMLHTTPContext *ctx;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!argc || !GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-	if (!ctx) return JS_TRUE;
-
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	mime = SMJS_CHARS(c, argv[0]);
-	ctx->mime = gf_strdup(mime);
-	SMJS_FREE(c, mime);
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(xml_http_getProperty)
-
-JSString *s;
-XMLHTTPContext *ctx;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-if (!ctx) return JS_TRUE;
-
-s = NULL;
-if (SMJS_ID_IS_INT(id)) {
-	*vp = JSVAL_VOID;
-	switch (SMJS_ID_TO_INT(id)) {
-	case XHR_ONABORT:
-		if (! JSVAL_IS_NULL(ctx->onabort)) {
-			*vp = ctx->onabort;
-		}
-		return JS_TRUE;
-	case XHR_ONERROR:
-		if (! JSVAL_IS_NULL(ctx->onerror)) {
-			*vp = ctx->onerror;
-		}
-		return JS_TRUE;
-	case XHR_ONLOAD:
-		if (! JSVAL_IS_NULL(ctx->onload)) {
-			*vp = ctx->onload;
-		}
-		return JS_TRUE;
-	case XHR_ONLOADSTART:
-		if (! JSVAL_IS_NULL(ctx->onloadstart) ) {
-			*vp = ctx->onloadstart;
-		}
-		return JS_TRUE;
-	case XHR_ONLOADEND:
-		if (! JSVAL_IS_NULL(ctx->onloadend)) {
-			*vp = ctx->onloadend;
-		}
-		return JS_TRUE;
-	case XHR_ONPROGRESS:
-		if (! JSVAL_IS_NULL(ctx->onprogress) ) {
-			*vp = ctx->onprogress;
-		}
-		return JS_TRUE;
-	case XHR_ONREADYSTATECHANGE:
-		if (! JSVAL_IS_NULL(ctx->onreadystatechange)) {
-			*vp = ctx->onreadystatechange;
-		}
-		return JS_TRUE;
-	case XHR_ONTIMEOUT:
-		if (! JSVAL_IS_NULL(ctx->ontimeout)) {
-			*vp = ctx->ontimeout;
-		}
-		return JS_TRUE;
-	case XHR_READYSTATE:
-		*vp = INT_TO_JSVAL(ctx->readyState);
-		return JS_TRUE;
-	case XHR_RESPONSETEXT:
-		if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
-		if (ctx->data) {
-			s = JS_NewStringCopyZ(c, ctx->data);
-			*vp = STRING_TO_JSVAL( s );
-		} else {
-			*vp = JSVAL_VOID;
-		}
-		return JS_TRUE;
-	case XHR_RESPONSEXML:
-		if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
-		if (ctx->data && ctx->document) {
-			*vp = dom_document_construct(c, ctx->document);
-		} else {
-			*vp = JSVAL_VOID;
-		}
-		return JS_TRUE;
-	case XHR_RESPONSE:
-		if (ctx->readyState<XHR_READYSTATE_LOADING) {
-			return JS_TRUE;
-		}
-		if (ctx->data) {
-			switch(ctx->responseType)
-			{
-			case XHR_RESPONSETYPE_NONE:
-			case XHR_RESPONSETYPE_TEXT:
-				s =	JS_NewStringCopyZ(c, ctx->data);
-				*vp	= STRING_TO_JSVAL( s );
-				break;
-			case XHR_RESPONSETYPE_ARRAYBUFFER:
-				if (!ctx->arraybuffer) {
-					/* always return the same ArrayBuffer, is this correct? Probably not in chunked/loading mode */
-					ctx->arraybuffer = gf_arraybuffer_js_new(c, ctx->data, ctx->size, obj);
-				}
-				*vp = OBJECT_TO_JSVAL( ctx->arraybuffer );
-				break;
-			case XHR_RESPONSETYPE_DOCUMENT:
-				if (ctx->data && ctx->document) {
-					*vp = dom_document_construct(c, ctx->document);
-				} else {
-					*vp = JSVAL_VOID;
-				}
-				break;
-			default:
-				/*other	types not supported	*/
-				*vp = JSVAL_VOID;
-			}
-		} else {
-			*vp = JSVAL_VOID;
-		}
-		return JS_TRUE;
-	case XHR_STATUS:
-		*vp = INT_TO_JSVAL(ctx->html_status);
-		return JS_TRUE;
-	case XHR_STATUSTEXT:
-		if (ctx->statusText) {
-			s = JS_NewStringCopyZ(c, ctx->statusText);
-			*vp = STRING_TO_JSVAL( s );
-		} else {
-			*vp = JSVAL_VOID;
-		}
-		return JS_TRUE;
-	case XHR_TIMEOUT:
-		*vp = INT_TO_JSVAL(ctx->timeout);
-		return JS_TRUE;
-	case XHR_WITHCREDENTIALS:
-		*vp = BOOLEAN_TO_JSVAL(ctx->withCredentials ? JS_TRUE : JS_FALSE);
-		return JS_TRUE;
-	case XHR_UPLOAD:
-		/* TODO */
-		return JS_TRUE;
-	case XHR_RESPONSETYPE:
-		switch (ctx->responseType)
-		{
-		case XHR_RESPONSETYPE_NONE:
-			s = JS_NewStringCopyZ(c, "");
-			break;
-		case XHR_RESPONSETYPE_ARRAYBUFFER:
-			s = JS_NewStringCopyZ(c, "arraybuffer");
-			break;
-		case XHR_RESPONSETYPE_BLOB:
-			s = JS_NewStringCopyZ(c, "blob");
-			break;
-		case XHR_RESPONSETYPE_DOCUMENT:
-			s = JS_NewStringCopyZ(c, "document");
-			break;
-		case XHR_RESPONSETYPE_JSON:
-			s = JS_NewStringCopyZ(c, "json");
-			break;
-		case XHR_RESPONSETYPE_TEXT:
-			s = JS_NewStringCopyZ(c, "text");
-			break;
-		case XHR_RESPONSETYPE_STREAM:
-			s = JS_NewStringCopyZ(c, "stream");
-			break;
-		}
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	case XHR_STATIC_UNSENT:
-		*vp = INT_TO_JSVAL(XHR_READYSTATE_UNSENT);
-		return JS_TRUE;
-	case XHR_STATIC_OPENED:
-		*vp = INT_TO_JSVAL(XHR_READYSTATE_OPENED);
-		return JS_TRUE;
-	case XHR_STATIC_HEADERS_RECEIVED:
-		*vp = INT_TO_JSVAL(XHR_READYSTATE_HEADERS_RECEIVED);
-		return JS_TRUE;
-	case XHR_STATIC_LOADING:
-		*vp = INT_TO_JSVAL(XHR_READYSTATE_LOADING);
-		return JS_TRUE;
-	case XHR_STATIC_DONE:
-		*vp = INT_TO_JSVAL(XHR_READYSTATE_DONE);
-		return JS_TRUE;
-	case XHR_CACHE:
-		switch (ctx->cache) {
-		case XHR_CACHETYPE_NORMAL:
-			s = JS_NewStringCopyZ(c, "normal");
-			break;
-		case XHR_CACHETYPE_NONE:
-			s = JS_NewStringCopyZ(c, "none");
-			break;
-		case XHR_CACHETYPE_MEMORY:
-			s = JS_NewStringCopyZ(c, "memory");
-			break;
-		}
-		*vp = STRING_TO_JSVAL(s);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return SMJS_CALL_PROP_STUB();
-}
-
-JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval) {
-	if (!callbackfuncval) return JS_FALSE;
-	if (! JSVAL_IS_NULL( *callbackfuncval )) {
-		gf_js_remove_root(c, callbackfuncval, GF_JSGC_VAL);
-	}
-	if (JSVAL_IS_VOID(vp)) {
-		return JS_TRUE;
-	} else if (JSVAL_CHECK_STRING(vp)) {
-		jsval fval;
-		char *callbackstr = SMJS_CHARS(c, vp);
-		if (! JS_LookupProperty(c, JS_GetGlobalObject(c), callbackstr, &fval)) return JS_TRUE;
-		*callbackfuncval = fval;
-		SMJS_FREE(c, callbackstr);
-	} else if (JSVAL_IS_OBJECT(vp)) {
-		*callbackfuncval = vp;
-	}
-	if (! JSVAL_IS_NULL( *callbackfuncval )) {
-		gf_js_add_root(c, callbackfuncval, GF_JSGC_VAL);
-	}
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET( xml_http_setProperty)
-
-XMLHTTPContext *ctx;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
-ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
-if (!ctx) return JS_TRUE;
-
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case XHR_ONERROR:
-		gf_set_js_eventhandler(c, *vp, &ctx->onerror);
-		break;
-	case XHR_ONABORT:
-		gf_set_js_eventhandler(c, *vp, &ctx->onabort);
-		break;
-	case XHR_ONLOAD:
-		gf_set_js_eventhandler(c, *vp, &ctx->onload);
-		break;
-	case XHR_ONLOADSTART:
-		gf_set_js_eventhandler(c, *vp, &ctx->onloadstart);
-		break;
-	case XHR_ONLOADEND:
-		gf_set_js_eventhandler(c, *vp, &ctx->onloadend);
-		break;
-	case XHR_ONPROGRESS:
-		gf_set_js_eventhandler(c, *vp, &ctx->onprogress);
-		break;
-	case XHR_ONREADYSTATECHANGE:
-		gf_set_js_eventhandler(c, *vp, &ctx->onreadystatechange);
-		break;
-	case XHR_ONTIMEOUT:
-		gf_set_js_eventhandler(c, *vp, &ctx->ontimeout);
-		break;
-	case XHR_TIMEOUT:
-		ctx->timeout = JSVAL_TO_INT(*vp);
-		return JS_TRUE;
-	case XHR_WITHCREDENTIALS:
-		ctx->withCredentials = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
-		return JS_TRUE;
-	case XHR_RESPONSETYPE:
-	{
-		char *str = SMJS_CHARS(c, *vp);
-		if (!str) return JS_TRUE;
-		if (!strcmp(str, "")) {
-			ctx->responseType = XHR_RESPONSETYPE_NONE;
-		} else if (!strcmp(str, "arraybuffer")) {
-			ctx->responseType = XHR_RESPONSETYPE_ARRAYBUFFER;
-		} else if (!strcmp(str, "blob")) {
-			ctx->responseType = XHR_RESPONSETYPE_BLOB;
-		} else if (!strcmp(str, "document")) {
-			ctx->responseType = XHR_RESPONSETYPE_DOCUMENT;
-		} else if (!strcmp(str, "json")) {
-			ctx->responseType = XHR_RESPONSETYPE_JSON;
-		} else if (!strcmp(str, "text")) {
-			ctx->responseType = XHR_RESPONSETYPE_TEXT;
-		} else if (!strcmp(str, "stream")) {
-			ctx->responseType = XHR_RESPONSETYPE_STREAM;
-		}
-		break;
-		return JS_TRUE;
-	}
-	case XHR_CACHE:
-	{
-		char *str = SMJS_CHARS(c, *vp);
-		if (!str) return JS_TRUE;
-		if (!strcmp(str, "normal")) {
-			ctx->cache = XHR_CACHETYPE_NORMAL;
-		} else if (!strcmp(str, "none")) {
-			ctx->cache = XHR_CACHETYPE_NONE;
-		} else if (!strcmp(str, "memory")) {
-			ctx->cache = XHR_CACHETYPE_MEMORY;
-		}
-		break;
-		return JS_TRUE;
-	}
-	/*all other properties are read-only*/
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-
-static SMJS_FUNC_PROP_GET(dcci_getProperty)
-
-GF_DOMFullAttribute *att;
-GF_ChildNodeItem *child;
-GF_DOMFullNode *n;
-char *value;
-JSString *s;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->DCCIClass, NULL) ) return JS_TRUE;
-n = (GF_DOMFullNode*) dom_get_node(c, obj);
-if (!n) return JS_TRUE;
-
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case DCCI_JSPROPERTY_VALUE:
-		child = n->children;
-		while (child) {
-			if (child->node && (child->node->sgprivate->tag==TAG_DOMText)) {
-				GF_DOMText *txt = (GF_DOMText *)child->node;
-				if (txt->type==GF_DOM_TEXT_REGULAR) {
-					s = JS_NewStringCopyZ(c, txt->textContent);
-					*vp = STRING_TO_JSVAL( s );
-					return JS_TRUE;
-				}
-			}
-			child = child->next;
-		}
-		*vp = JSVAL_NULL;
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_VALUETYPE:
-		value = "DOMString";
-		att = (GF_DOMFullAttribute*) n->attributes;
-		while (att) {
-			if (att->name && !strcmp(att->name, "valueType") && att->data) {
-				value = (char *)att->data;
-				break;
-			}
-			att = (GF_DOMFullAttribute*) att->next;
-		}
-		s = JS_NewStringCopyZ(c, value);
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_PROPERTYTYPE:
-		value = "DOMString";
-		att = (GF_DOMFullAttribute*) n->attributes;
-		while (att) {
-			if (att->name && !strcmp(att->name, "propertyType") && att->data) {
-				value = (char *)att->data;
-				break;
-			}
-			att = (GF_DOMFullAttribute*) att->next;
-		}
-		s = JS_NewStringCopyZ(c, value);
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_READONLY:
-		att = (GF_DOMFullAttribute*) n->attributes;
-		while (att) {
-			if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp((const char *)att->data, "true")) {
-				*vp = BOOLEAN_TO_JSVAL(JS_TRUE);
-				return JS_TRUE;
-			}
-			att = (GF_DOMFullAttribute*) att->next;
-		}
-		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE:
-		*vp = JSVAL_NULL;
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_DCCIMETADATAINTERFACE:
-		*vp = JSVAL_NULL;
-		return JS_TRUE;
-	case DCCI_JSPROPERTY_VERSION:
-		s = JS_NewStringCopyZ(c, "1.0");
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return SMJS_CALL_PROP_STUB();
-}
-
-static SMJS_FUNC_PROP_SET( dcci_setProperty)
-
-GF_ChildNodeItem *child;
-GF_DOMFullNode *n;
-GF_DOMFullAttribute*att;
-GF_DOM_Event evt;
-char *str;
-Bool readonly;
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->DCCIClass, NULL) ) return JS_TRUE;
-n = (GF_DOMFullNode*) dom_get_node(c, obj);
-if (!n) return JS_TRUE;
-
-str = SMJS_CHARS(c, *vp);
-if (!str) return JS_TRUE;
-
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case DCCI_JSPROPERTY_VALUE:
-		readonly = GF_FALSE;
-		att = (GF_DOMFullAttribute*) n->attributes;
-		while (att) {
-			if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp((const char *)att->data, "true")) {
-				readonly = GF_TRUE;
-				break;
-			}
-			att = (GF_DOMFullAttribute*) att->next;
-		}
-		if (readonly) break;
-		child = n->children;
-		while (child) {
-			if (child->node && (child->node->sgprivate->tag==TAG_DOMText)) {
-				GF_DOMText *txt = (GF_DOMText *)child->node;
-				if (txt->type==GF_DOM_TEXT_REGULAR) {
-					if (txt->textContent) gf_free(txt->textContent);
-					txt->textContent = gf_strdup(str);
-					break;
-
-				}
-			}
-			child = child->next;
-		}
-		if (!child)
-			gf_dom_add_text_node((GF_Node*)n, gf_strdup(str) );
-
-		memset(&evt, 0, sizeof(GF_DOM_Event));
-		evt.type = GF_EVENT_DCCI_PROP_CHANGE;
-		evt.bubbles = 1;
-		evt.relatedNode = (GF_Node*)n;
-		gf_dom_event_fire((GF_Node*)n, &evt);
-		n->sgprivate->scenegraph->modified = GF_TRUE;
-		break;
-	case DCCI_JSPROPERTY_PROPERTYTYPE:
-		break;
-
-	/*all other properties are read-only*/
-	default:
-		break;
-	}
-}
-SMJS_FREE(c, str);
-return JS_TRUE;
-}
-
-Bool dcci_prop_lookup(GF_DOMFullNode *n, char *ns, char *name, Bool deep, Bool first)
-{
-	Bool ok = GF_TRUE;
-	GF_ChildNodeItem *child = n->children;
-	/*ns mismatch*/
-	if (strcmp(ns, "*") && n->ns && strcmp(ns, gf_sg_get_namespace(n->sgprivate->scenegraph, n->ns) ))
-		ok = GF_FALSE;
-	/*name mismatch*/
-	if (strcmp(name, "*") && n->name && strcmp(name, n->name))
-		ok = GF_FALSE;
-
-	/*"Some DCCIProperty nodes may not have a value"*/
-	if (ok) return GF_TRUE;
-
-	/*not found*/
-	if (!first && !deep) return GF_FALSE;
-
-	while (child) {
-		if (child->node && (child->node->sgprivate->tag==TAG_DOMFullNode)) {
-			ok = dcci_prop_lookup((GF_DOMFullNode *)child->node, ns, name, deep, GF_FALSE);
-			if (ok) return GF_TRUE;
-		}
-		child = child->next;
-	}
-	return GF_FALSE;
-}
-
-static JSBool SMJS_FUNCTION(dcci_has_property)
-{
-	GF_DOMFullNode *n;
-	Bool deep;
-	char *ns, *name;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->DCCIClass, NULL) ) return JS_TRUE;
-	n = (GF_DOMFullNode*) dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	if (argc!=3) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-	ns = SMJS_CHARS(c, argv[0]);
-	name = SMJS_CHARS(c, argv[1]);
-
-	deep = JSVAL_TO_BOOLEAN(argv[2]) ? GF_TRUE : GF_FALSE;
-	deep = dcci_prop_lookup(n, ns, name, deep, GF_TRUE);
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(deep ? JS_TRUE : JS_FALSE) );
-	SMJS_FREE(c, ns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-void dcci_prop_collect(DOMNodeList *nl, GF_DOMFullNode *n, char *ns, char *name, Bool deep, Bool first)
-{
-	Bool ok = GF_TRUE;
-	GF_ChildNodeItem *child = n->children;
-	/*ns mismatch*/
-	if (strcmp(ns, "*") && n->ns && strcmp(ns, gf_sg_get_namespace(n->sgprivate->scenegraph, n->ns) ))
-		ok = GF_FALSE;
-	/*name mismatch*/
-	if (strcmp(name, "*") && n->name && strcmp(name, n->name))
-		ok = GF_FALSE;
-
-	/*"Some DCCIProperty nodes may not have a value"*/
-	if (ok) {
-		gf_node_register((GF_Node*)n, NULL);
-		if (n->sgprivate->scenegraph->reference_count)
-			n->sgprivate->scenegraph->reference_count++;
-		gf_node_list_add_child(&nl->child, (GF_Node*)n);
-	}
-
-	/*not found*/
-	if (!first && !deep) return;
-
-	while (child) {
-		if (child->node && (child->node->sgprivate->tag==TAG_DOMFullNode)) {
-			dcci_prop_collect(nl, (GF_DOMFullNode *)child->node, ns, name, GF_TRUE, GF_FALSE);
-		}
-		child = child->next;
-	}
-}
-
-static JSBool SMJS_FUNCTION(dcci_search_property)
-{
-	JSObject *new_obj;
-	DOMNodeList *nl;
-	GF_DOMFullNode *n;
-	Bool deep;
-	char *ns, *name;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->DCCIClass, NULL) ) return JS_TRUE;
-	n = (GF_DOMFullNode*) dom_get_node(c, obj);
-	if (!n) return JS_TRUE;
-	if (argc!=4) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-	ns = SMJS_CHARS(c, argv[0]);
-	name = SMJS_CHARS(c, argv[1]);
-	/*todo - DCCI prop filter*/
-	deep = JSVAL_TO_BOOLEAN(argv[3]) ? GF_TRUE : GF_FALSE;
-
-	GF_SAFEALLOC(nl, DOMNodeList);
-	dcci_prop_collect(nl, n, ns, name, deep, GF_TRUE);
-	new_obj = JS_NewObject(c, &dom_rt->domNodeListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, new_obj, nl);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(new_obj) );
-	SMJS_FREE(c, ns);
-	SMJS_FREE(c, name);
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( storage_getProperty)
-
-/*avoids gcc warning*/
-#ifndef GPAC_CONFIG_DARWIN
-if (!id) id=0;
-#endif
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
-*vp = JSVAL_VOID;
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET_NOVP( storage_setProperty)
-
-/*avoids gcc warning*/
-#ifndef GPAC_CONFIG_DARWIN
-if (!id) id=0;
-#endif
-if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(storage_constructor)
-{
-	SMJS_OBJ_CONSTRUCTOR(&dom_rt->storageClass)
-
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
-	return JS_TRUE;
-}
-
-static DECL_FINALIZE( storage_finalize)
-
-/*avoids GCC warning*/
-if (!c) c=NULL;
-}
-
-void dom_js_define_storage(JSContext *c, JSObject *parent_obj, const char *name)
-{
-	JS_DefineObject(c, parent_obj, name, &dom_rt->storageClass._class, 0, 0 );
-}
-
-void dom_js_load(GF_SceneGraph *scene, JSContext *c, JSObject *global)
-{
-	if (!dom_rt) {
-		GF_SAFEALLOC(dom_rt, GF_DOMRuntime);
-		dom_rt->handlers = gf_list_new();
-		JS_SETUP_CLASS(dom_rt->domNodeClass, "Node", JSCLASS_HAS_PRIVATE, dom_node_getProperty, dom_node_setProperty, dom_node_finalize);
-		JS_SETUP_CLASS(dom_rt->domDocumentClass, "Document", JSCLASS_HAS_PRIVATE, dom_document_getProperty, dom_document_setProperty, dom_document_finalize);
-		/*Element uses the same destructor as node*/
-		JS_SETUP_CLASS(dom_rt->domElementClass, "Element", JSCLASS_HAS_PRIVATE, dom_element_getProperty, JS_PropertyStub_forSetter, dom_node_finalize);
-		/*Text uses the same destructor as node*/
-		JS_SETUP_CLASS(dom_rt->domTextClass, "Text", JSCLASS_HAS_PRIVATE, dom_text_getProperty, dom_text_setProperty, dom_node_finalize);
-		/*Event class*/
-		JS_SETUP_CLASS(dom_rt->domEventClass , "Event", JSCLASS_HAS_PRIVATE, event_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-
-		JS_SETUP_CLASS(dom_rt->domNodeListClass, "NodeList", JSCLASS_HAS_PRIVATE, dom_nodelist_getProperty, dom_nodelist_setProperty, dom_nodelist_finalize);
-		JS_SETUP_CLASS(dom_rt->xmlHTTPRequestClass, "XMLHttpRequest", JSCLASS_HAS_PRIVATE, xml_http_getProperty, xml_http_setProperty, xml_http_finalize);
-		JS_SETUP_CLASS(dom_rt->storageClass, "Storage", JSCLASS_HAS_PRIVATE, storage_getProperty, storage_setProperty, storage_finalize);
-
-		JS_SETUP_CLASS(dom_rt->DCCIClass, "DCCI", JSCLASS_HAS_PRIVATE, dcci_getProperty, dcci_setProperty, dom_node_finalize);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] dom run-time allocated\n"));
-	}
-	dom_rt->nb_inst++;
-
-	define_dom_exception(c, global);
-
-	{
-		JSFunctionSpec nodeFuncs[] = {
-			SMJS_FUNCTION_SPEC("insertBefore",			xml_node_insert_before, 2),
-			SMJS_FUNCTION_SPEC("replaceChild",			xml_node_replace_child, 2),
-			SMJS_FUNCTION_SPEC("removeChild",			xml_node_remove_child, 1),
-			SMJS_FUNCTION_SPEC("appendChild",			xml_node_append_child, 1),
-			SMJS_FUNCTION_SPEC("hasChildNodes",			xml_node_has_children, 0),
-			SMJS_FUNCTION_SPEC("cloneNode",				xml_clone_node, 1),
-			SMJS_FUNCTION_SPEC("normalize",				xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("isSupported",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("hasAttributes",			xml_node_has_attributes, 0),
-			SMJS_FUNCTION_SPEC("compareDocumentPosition", xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("isSameNode",			xml_node_is_same_node, 1),
-			SMJS_FUNCTION_SPEC("lookupPrefix",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("isDefaultNamespace",	xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("lookupNamespaceURI",	xml_dom3_not_implemented, 1),
-			/*we don't support full node compare*/
-			SMJS_FUNCTION_SPEC("isEqualNode",			xml_node_is_same_node, 1),
-			SMJS_FUNCTION_SPEC("getFeature",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("setUserData",			xml_dom3_not_implemented, 3),
-			SMJS_FUNCTION_SPEC("getUserData",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec nodeProps[] = {
-			SMJS_PROPERTY_SPEC("nodeName",		NODE_JSPROPERTY_NODENAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nodeValue",		NODE_JSPROPERTY_NODEVALUE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("nodeType",		NODE_JSPROPERTY_NODETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("parentNode",	NODE_JSPROPERTY_PARENTNODE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("childNodes",	NODE_JSPROPERTY_CHILDNODES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("firstChild",	NODE_JSPROPERTY_FIRSTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("lastChild",		NODE_JSPROPERTY_LASTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("previousSibling",NODE_JSPROPERTY_PREVIOUSSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nextSibling",	NODE_JSPROPERTY_NEXTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("attributes",	NODE_JSPROPERTY_ATTRIBUTES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("ownerDocument",	NODE_JSPROPERTY_OWNERDOCUMENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("namespaceURI",	NODE_JSPROPERTY_NAMESPACEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("prefix",		NODE_JSPROPERTY_PREFIX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("localName",		NODE_JSPROPERTY_LOCALNAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("baseURI",		NODE_JSPROPERTY_BASEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("textContent",	NODE_JSPROPERTY_TEXTCONTENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			/*elementTraversal interface*/
-			SMJS_PROPERTY_SPEC("firstElementChild",		NODE_JSPROPERTY_FIRSTELEMENTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("lastElementChild",		NODE_JSPROPERTY_LASTELEMENTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("previousElementSibling",NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nextElementSibling",	NODE_JSPROPERTY_NEXTELEMENTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(c, global, JS_NewObject(c, NULL, NULL, NULL), &dom_rt->domNodeClass, 0, 0, nodeProps, nodeFuncs, 0, 0);
-		if (!dom_rt->domNodeClass._proto) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMCore] Not enough memory to initialize JS node class\n"));
-			return;
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] node class initialized\n"));
-
-		JS_DefineProperty(c, dom_rt->domNodeClass._proto, "ELEMENT_NODE", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domNodeClass._proto, "TEXT_NODE", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domNodeClass._proto, "CDATA_SECTION_NODE", INT_TO_JSVAL(4), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domNodeClass._proto, "DOCUMENT_NODE", INT_TO_JSVAL(9), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	}
-	{
-		JSFunctionSpec documentFuncs[] = {
-			SMJS_FUNCTION_SPEC("createElement",				xml_document_create_element, 1),
-			SMJS_FUNCTION_SPEC("createDocumentFragment",	xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("createTextNode",			xml_document_create_text, 1),
-			SMJS_FUNCTION_SPEC("createComment",				xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("createCDATASection",		xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("createProcessingInstruction",	xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("createAttribute",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("createEntityReference",		xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("getElementsByTagName",		xml_document_elements_by_tag, 1),
-			SMJS_FUNCTION_SPEC("importNode",				xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("createElementNS",			xml_document_create_element, 2),
-			SMJS_FUNCTION_SPEC("createAttributeNS",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",	xml_document_elements_by_tag, 2),
-			SMJS_FUNCTION_SPEC("getElementById",			xml_document_element_by_id, 1),
-			SMJS_FUNCTION_SPEC("adoptNode",					xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("normalizeDocument",			xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("renameNode",				xml_dom3_not_implemented, 3),
-			/*eventTarget interface*/
-			JS_DOM3_EVENT_TARGET_INTERFACE
-			/*DocumentEvent interface*/
-			SMJS_FUNCTION_SPEC("createEvent",				xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-
-		JSPropertySpec documentProps[] = {
-			SMJS_PROPERTY_SPEC("doctype",			 DOCUMENT_JSPROPERTY_DOCTYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("implementation",	 DOCUMENT_JSPROPERTY_IMPLEMENTATION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("documentElement",	 DOCUMENT_JSPROPERTY_DOCUMENTELEMENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("inputEncoding",		 DOCUMENT_JSPROPERTY_INPUTENCODING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlEncoding",		 DOCUMENT_JSPROPERTY_XMLENCODING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlStandalone",		 DOCUMENT_JSPROPERTY_XMLSTANDALONE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlVersion",		 DOCUMENT_JSPROPERTY_XMLVERSION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("strictErrorChecking",DOCUMENT_JSPROPERTY_STRICTERRORCHECKING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("documentURI",		 DOCUMENT_JSPROPERTY_DOCUMENTURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("location",			 DOCUMENT_JSPROPERTY_LOCATION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("domConfig",			 DOCUMENT_JSPROPERTY_DOMCONFIG,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("global",			 DOCUMENT_JSPROPERTY_GLOBAL,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
-		};
-
-		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domDocumentClass, 0, 0, documentProps, documentFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] document class initialized\n"));
-	}
-
-	{
-		JSFunctionSpec elementFuncs[] = {
-			SMJS_FUNCTION_SPEC("getAttribute",				xml_element_get_attribute, 1),
-			SMJS_FUNCTION_SPEC("setAttribute",				xml_element_set_attribute, 2),
-			SMJS_FUNCTION_SPEC("removeAttribute",			xml_element_remove_attribute, 1),
-			SMJS_FUNCTION_SPEC("getAttributeNS",			xml_element_get_attribute, 2),
-			SMJS_FUNCTION_SPEC("setAttributeNS",			xml_element_set_attribute, 3),
-			SMJS_FUNCTION_SPEC("removeAttributeNS",			xml_element_remove_attribute, 2),
-			SMJS_FUNCTION_SPEC("hasAttribute",				xml_element_has_attribute, 1),
-			SMJS_FUNCTION_SPEC("hasAttributeNS",			xml_element_has_attribute, 2),
-			SMJS_FUNCTION_SPEC("getElementsByTagName",		xml_element_elements_by_tag, 1),
-			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",	xml_element_elements_by_tag, 2),
-			SMJS_FUNCTION_SPEC("setIdAttribute",			xml_element_set_id, 2),
-			SMJS_FUNCTION_SPEC("setIdAttributeNS",			xml_element_set_id, 3),
-			SMJS_FUNCTION_SPEC("getAttributeNode",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("setAttributeNode",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("removeAttributeNode",		xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("getAttributeNodeNS",		xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("setAttributeNodeNS",		xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("setIdAttributeNode",		xml_dom3_not_implemented, 2),
-			/*eventTarget interface*/
-			JS_DOM3_EVENT_TARGET_INTERFACE
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-
-		JSPropertySpec elementProps[] = {
-			SMJS_PROPERTY_SPEC("tagName",		ELEMENT_JSPROPERTY_TAGNAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("schemaTypeInfo",ELEMENT_JSPROPERTY_SCHEMATYPEINFO,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
-		};
-		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domElementClass, 0, 0, elementProps, elementFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] element class initialized\n"));
-	}
-
-	{
-		JSFunctionSpec textFuncs[] = {
-#if 0
-			SMJS_FUNCTION_SPEC("substringData",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("appendData",				xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("insertData",				xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("deleteData",				xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("replaceData",				xml_dom3_not_implemented, 3),
-			/*text*/
-			SMJS_FUNCTION_SPEC("splitText",				xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("replaceWholeText",		xml_dom3_not_implemented, 1),
-#endif
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec textProps[] = {
-			SMJS_PROPERTY_SPEC("data",						TEXT_JSPROPERTY_DATA,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("length",					TEXT_JSPROPERTY_LENGTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*text*/
-			SMJS_PROPERTY_SPEC("isElementContentWhitespace",TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("wholeText",					TEXT_JSPROPERTY_WHOLETEXT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
-		};
-		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domTextClass, 0, 0, textProps, textFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] text class initialized\n"));
-	}
-
-	/*event API*/
-	{
-		JSFunctionSpec eventFuncs[] = {
-			SMJS_FUNCTION_SPEC("stopPropagation", event_stop_propagation, 0),
-			SMJS_FUNCTION_SPEC("stopImmediatePropagation", event_stop_immediate_propagation, 0),
-			SMJS_FUNCTION_SPEC("preventDefault", event_prevent_default, 0),
-#if 0
-			SMJS_FUNCTION_SPEC("initEvent", event_prevent_default, 3),
-			SMJS_FUNCTION_SPEC("initEventNS", event_prevent_default, 4),
-#endif
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec eventProps[] = {
-			SMJS_PROPERTY_SPEC("type",			EVENT_JSPROPERTY_TYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("target",		EVENT_JSPROPERTY_TARGET,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("currentTarget",	EVENT_JSPROPERTY_CURRENTTARGET,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("eventPhase",	EVENT_JSPROPERTY_EVENTPHASE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bubbles",		EVENT_JSPROPERTY_BUBBLES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("cancelable",	EVENT_JSPROPERTY_CANCELABLE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("timeStamp",		EVENT_JSPROPERTY_TIMESTAMP,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("namespaceURI",	EVENT_JSPROPERTY_NAMESPACEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("defaultPrevented",EVENT_JSPROPERTY_DEFAULTPREVENTED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			/*UIEvent*/
-			SMJS_PROPERTY_SPEC("detail",			EVENT_JSPROPERTY_DETAIL,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*text, connectionEvent*/
-			SMJS_PROPERTY_SPEC("data",				EVENT_JSPROPERTY_DATA,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*MouseEvent*/
-			SMJS_PROPERTY_SPEC("screenX",			EVENT_JSPROPERTY_SCREENX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("screenY",			EVENT_JSPROPERTY_SCREENY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("clientX",			EVENT_JSPROPERTY_CLIENTX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("clientY",			EVENT_JSPROPERTY_CLIENTY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("button",			EVENT_JSPROPERTY_BUTTON,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("relatedTarget",		EVENT_JSPROPERTY_RELATEDTARGET, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*wheelEvent*/
-			SMJS_PROPERTY_SPEC("wheelDelta",		EVENT_JSPROPERTY_WHEELDELTA,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			/*keyboard*/
-			SMJS_PROPERTY_SPEC("keyIdentifier",	EVENT_JSPROPERTY_KEYIDENTIFIER,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("keyChar",		EVENT_JSPROPERTY_KEYCHAR,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("charCode",		EVENT_JSPROPERTY_CHARCODE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			/*progress*/
-			SMJS_PROPERTY_SPEC("lengthComputable",	EVENT_JSPROPERTY_LENGTHCOMPUTABLE,	JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("typeArg",			EVENT_JSPROPERTY_TYPEARG,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("loaded",			EVENT_JSPROPERTY_LOADED,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("total",				EVENT_JSPROPERTY_TOTAL,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("buffering",			EVENT_JSPROPERTY_BUFFER_ON,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bufferLevel",		EVENT_JSPROPERTY_BUFFERLEVEL,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bufferRemainingTime",EVENT_JSPROPERTY_BUFFERREMAININGTIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("status",			EVENT_JSPROPERTY_STATUS,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			/*used by vrml*/
-			SMJS_PROPERTY_SPEC("width",			EVENT_JSPROPERTY_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("height",		EVENT_JSPROPERTY_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("offset_x",		EVENT_JSPROPERTY_OFFSETX,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("offset_y",		EVENT_JSPROPERTY_OFFSETY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("vp_width",		EVENT_JSPROPERTY_VPWIDTH,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("vp_height",		EVENT_JSPROPERTY_VPHEIGHT,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("translation_x",	EVENT_JSPROPERTY_TRANSLATIONX,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("translation_y",	EVENT_JSPROPERTY_TRANSLATIONY,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("type3d",		EVENT_JSPROPERTY_TYPE3D,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("error",			EVENT_JSPROPERTY_ERROR,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("dynamic_scene",	EVENT_JSPROPERTY_DYNAMIC_SCENE,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("url",			EVENT_JSPROPERTY_URL,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
-		};
-		GF_JS_InitClass(c, global, 0, &dom_rt->domEventClass, 0, 0, eventProps, eventFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] Event class initialized\n"));
-
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "CAPTURING_PHASE", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "AT_TARGET", INT_TO_JSVAL(2), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "BUBBLING_PHASE", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "DOM_KEY_LOCATION_STANDARD ", INT_TO_JSVAL(0), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "DOM_KEY_LOCATION_LEFT", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "DOM_KEY_LOCATION_RIGHT", INT_TO_JSVAL(2), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(c, dom_rt->domEventClass._proto, "DOM_KEY_LOCATION_NUMPAD", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	}
-
-	{
-		JSFunctionSpec nodeListFuncs[] = {
-			SMJS_FUNCTION_SPEC("item", dom_nodelist_item, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec nodeListProps[] = {
-			SMJS_PROPERTY_SPEC("length",	NODELIST_JSPROPERTY_LENGTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(c, global, 0, &dom_rt->domNodeListClass, 0, 0, nodeListProps, nodeListFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] nodeList class initialized\n"));
-	}
-
-	{
-		JSPropertySpec xmlHTTPRequestClassProps[] = {
-			SMJS_PROPERTY_SPEC("onabort",				XHR_ONABORT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onerror",				XHR_ONERROR,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onload",				XHR_ONLOAD,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onloadend",				XHR_ONLOADEND,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onloadstart",			XHR_ONLOADSTART,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onprogress",			XHR_ONPROGRESS,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("onreadystatechange",	XHR_ONREADYSTATECHANGE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("ontimeout",				XHR_ONTIMEOUT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("readyState",			XHR_READYSTATE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("response",				XHR_RESPONSE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("responseType",			XHR_RESPONSETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("responseText",			XHR_RESPONSETEXT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("responseXML",			XHR_RESPONSEXML,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("status",				XHR_STATUS,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("statusText",			XHR_STATUSTEXT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("timeout",				XHR_TIMEOUT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("upload",				XHR_UPLOAD,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("withCredentials",		XHR_WITHCREDENTIALS,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("cache",					XHR_CACHE,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSPropertySpec xmlHTTPRequestStaticClassProps[] = {
-			SMJS_PROPERTY_SPEC("UNSENT",			XHR_STATIC_UNSENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
-			SMJS_PROPERTY_SPEC("OPENED",			XHR_STATIC_OPENED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
-			SMJS_PROPERTY_SPEC("HEADERS_RECEIVED",	XHR_STATIC_HEADERS_RECEIVED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
-			SMJS_PROPERTY_SPEC("LOADING",			XHR_STATIC_LOADING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
-			SMJS_PROPERTY_SPEC("DONE",				XHR_STATIC_DONE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec xmlHTTPRequestClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("abort",					xml_http_abort, 0),
-			SMJS_FUNCTION_SPEC("getAllResponseHeaders",	xml_http_get_all_headers, 0),
-			SMJS_FUNCTION_SPEC("getResponseHeader",		xml_http_get_header, 1),
-			SMJS_FUNCTION_SPEC("open",					xml_http_open, 2),
-			SMJS_FUNCTION_SPEC("overrideMimeType",		xml_http_overrideMimeType, 1),
-			SMJS_FUNCTION_SPEC("send",					xml_http_send, 0),
-			SMJS_FUNCTION_SPEC("setRequestHeader",		xml_http_set_header, 2),
-			SMJS_FUNCTION_SPEC("wait",					xml_http_wait, 0),
-			/*eventTarget interface*/
-			JS_DOM3_EVENT_TARGET_INTERFACE
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(c, global, NULL, &dom_rt->xmlHTTPRequestClass, xml_http_constructor, 0, xmlHTTPRequestClassProps, xmlHTTPRequestClassFuncs, xmlHTTPRequestStaticClassProps, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] XMLHttpRequest class initialized\n"));
-	}
-
-	{
-		JSPropertySpec storageClassProps[] = {
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec storageClassFuncs[] = {
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(c, global, 0, &dom_rt->storageClass, storage_constructor, 0, storageClassProps, storageClassFuncs, 0, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] Storage class initialized\n"));
-	}
-
-	{
-		GF_SceneGraph *dcci;
-		jsval dcci_root;
-
-		dcci = NULL;
-		if (scene->script_action) {
-			GF_JSAPIParam par;
-			par.node = NULL;
-			scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_DCCI, NULL, &par);
-			dcci = par.scene;
-		}
-		if (dcci && dcci->RootNode) {
-
-			JSPropertySpec DCCIClassProps[] = {
-				SMJS_PROPERTY_SPEC("value",						DCCI_JSPROPERTY_VALUE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-				SMJS_PROPERTY_SPEC("valueType",					DCCI_JSPROPERTY_VALUETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("propertyType",				DCCI_JSPROPERTY_PROPERTYTYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-				SMJS_PROPERTY_SPEC("readOnly",					DCCI_JSPROPERTY_READONLY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("DCCIMetadataInterfaceType",	DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("DCCIMetadataInterface",		DCCI_JSPROPERTY_DCCIMETADATAINTERFACE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("version",					DCCI_JSPROPERTY_VERSION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-			};
-			JSFunctionSpec DCCIClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("hasProperty",			dcci_has_property, 3),
-				SMJS_FUNCTION_SPEC("searchProperty",		dcci_search_property, 4),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-
-			GF_JS_InitClass(c, global, dom_rt->domElementClass._proto, &dom_rt->DCCIClass, 0, 0, DCCIClassProps, DCCIClassFuncs, 0, 0);
-			dcci_root = dom_base_node_construct(c, &dom_rt->DCCIClass, dcci->RootNode);
-			JS_DefineProperty(c, global, "DCCIRoot", dcci_root, 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-
-			dcci->dcci_doc = GF_TRUE;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] DCCI class initialized\n"));
-		}
-	}
-}
-
-void html_media_element_js_finalize(JSContext *c, GF_Node *n);
-
-GF_EXPORT
-void gf_sg_js_dom_pre_destroy(JSContext *c, GF_SceneGraph *sg, GF_Node *n)
-{
-	u32 i, count;
-	if (n) {
-		if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
-			//html_media_element_js_finalize(c, n);
-		}
-		if (n->sgprivate->interact && n->sgprivate->interact->js_binding && n->sgprivate->interact->js_binding->node) {
-			JSObject *obj = (JSObject *)n->sgprivate->interact->js_binding->node;
-			SMJS_SET_PRIVATE(c, obj, NULL);
-			n->sgprivate->interact->js_binding->node=NULL;
-			if (gf_list_del_item(sg->objects, obj)>=0) {
-				gf_js_remove_root(c, &(n->sgprivate->interact->js_binding->node), GF_JSGC_OBJECT);
-			}
-		}
-		return;
-	}
-
-	/*force cleanup of scripts/handlers not destroyed - this usually happens when a script/handler node has been created in a script
-	but not inserted in the graph*/
-	while (gf_list_count(sg->objects)) {
-		GF_Node *n;
-		JSObject *obj = (JSObject *)gf_list_get(sg->objects, 0);
-		n = dom_get_node(c, obj);
-		if (n) {
-			if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
-				html_media_element_js_finalize(c, n);
-			}
-			SMJS_SET_PRIVATE(c, obj, NULL);
-			n->sgprivate->interact->js_binding->node=NULL;
-			gf_node_unregister(n, NULL);
-			gf_js_remove_root(c, &(n->sgprivate->interact->js_binding->node), GF_JSGC_OBJECT);
-		}
-		gf_list_rem(sg->objects, 0);
-	}
-
-	count = gf_list_count(dom_rt->handlers);
-	for (i=0; i<count; i++) {
-		SVG_handlerElement *handler = (SVG_handlerElement *)gf_list_get(dom_rt->handlers, i);
-		/*if same context and same document, discard handler*/
-		if ( (handler->js_context==c) && (!sg || (handler->sgprivate->scenegraph==sg)) ) {
-			/*unprotect the function*/
-			gf_js_remove_root((JSContext *)handler->js_context, &(handler->js_fun_val), GF_JSGC_VAL);
-			handler->js_fun_val=0;
-			handler->js_context=0;
-			gf_list_rem(dom_rt->handlers, i);
-			i--;
-			count--;
-		}
-	}
-	if (sg->document) {
-#ifdef USE_FFDEV_15
-		dom_document_finalize(NULL, sg->document);
-#else
-		dom_document_finalize(c, sg->document);
-#endif
-	}
-}
-
-void dom_js_unload()
-{
-	if (!dom_rt) return;
-	dom_rt->nb_inst--;
-	if (!dom_rt->nb_inst) {
-		gf_list_del(dom_rt->handlers);
-		gf_free(dom_rt);
-		dom_rt = NULL;
-	}
-}
-
-JSObject *dom_js_define_event(JSContext *c, JSObject *global)
-{
-	JSObject *obj = JS_DefineObject(c, global, "evt", &dom_rt->domEventClass._class, 0, 0 );
-	//JS_AliasProperty(c, global, "evt", "event");
-	return obj;
-}
-
-JSObject *gf_dom_new_event(JSContext *c)
-{
-	return JS_NewObject(c, &dom_rt->domEventClass._class, 0, 0);
-}
-JSObject *dom_js_get_node_proto(JSContext *c) {
-	return dom_rt->domNodeClass._proto;
-}
-JSObject *dom_js_get_element_proto(JSContext *c) {
-	return dom_rt->domElementClass._proto;
-}
-JSObject *dom_js_get_document_proto(JSContext *c) {
-	return dom_rt->domDocumentClass._proto;
-}
-JSObject *dom_js_get_event_proto(JSContext *c) {
-	return dom_rt->domEventClass._proto;
-}
-
-void dom_set_class_selector(JSContext *c, void *(*get_element_class)(GF_Node *n), void *(*get_document_class)(GF_SceneGraph *n) )
-{
-	if (dom_rt) {
-		dom_rt->get_document_class = get_document_class;
-		dom_rt->get_element_class = get_element_class;
-	}
-}
-
-#endif	/*GPAC_HAS_SPIDERMONKEY*/
-
-
-
-GF_Err gf_sg_new_from_xml_doc(const char *src, GF_SceneGraph **scene)
-{
-#ifdef GPAC_HAS_SPIDERMONKEY
-	GF_Err e;
-	XMLHTTPContext *ctx;
-	GF_SceneGraph *sg;
-
-	GF_SAFEALLOC(ctx, XMLHTTPContext);
-	if (!ctx) return GF_OUT_OF_MEM;
-
-	ctx->sax = gf_xml_sax_new(xml_http_sax_start, xml_http_sax_end, xml_http_sax_text, ctx);
-	ctx->node_stack = gf_list_new();
-	sg = gf_sg_new();
-	ctx->document = sg;
-	e = gf_xml_sax_parse_file(ctx->sax, src, NULL);
-	gf_xml_sax_del(ctx->sax);
-	gf_list_del(ctx->node_stack);
-	gf_free(ctx);
-
-	*scene = NULL;
-	if (e<0) {
-		gf_sg_del(sg);
-		return e;
-	}
-	*scene = sg;
-	return GF_OK;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-typedef struct
-{
-	GF_SAXParser *sax;
-	GF_List *node_stack;
-	/*dom graph*/
-	GF_SceneGraph *document;
-} XMLReloadContext;
-
-static void xml_reload_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
-{
-	GF_DOM_Event evt;
-	Bool is_root = GF_FALSE;
-	Bool modified = GF_FALSE;
-	Bool atts_modified = GF_FALSE;
-	Bool new_node = GF_FALSE;
-	u32 i;
-	GF_DOMFullAttribute *prev = NULL;
-	GF_DOMFullNode *par = NULL;
-	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
-	GF_DOMFullNode *node;
-
-	node = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	if (!node) {
-		is_root = GF_TRUE;
-		node = (GF_DOMFullNode *) ctx->document->RootNode;
-	}
-
-	if (is_root) {
-		Bool same_node = GF_TRUE;
-		if (strcmp(node->name, node_name)) same_node = GF_FALSE;
-		if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
-
-		if (!same_node) {
-			if (node->name) gf_free(node->name);
-			node->name = gf_strdup(node_name);
-			node->ns = 0;
-			if (name_space) {
-				gf_sg_add_namespace(node->sgprivate->scenegraph, (char *) name_space, NULL);
-				node->ns = gf_sg_get_namespace_code_from_name(node->sgprivate->scenegraph, (char*)name_space);
-			}
-			modified = GF_TRUE;
-		}
-	} else {
-		GF_ChildNodeItem *child = node->children;
-		node = NULL;
-		/*locate the node in the children*/
-		while (child) {
-			Bool same_node = GF_TRUE;
-			node = (GF_DOMFullNode*)child->node;
-			if (strcmp(node->name, node_name)) same_node = GF_FALSE;
-			if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
-			if (same_node) {
-				break;
-			}
-			node = NULL;
-			child = child->next;
-		}
-		if (!node) {
-			modified = GF_TRUE;
-
-			/*create the new node*/
-			node = (GF_DOMFullNode *) gf_node_new(ctx->document, TAG_DOMFullNode);
-			node->name = gf_strdup(node_name);
-			if (name_space) {
-				gf_sg_add_namespace(node->sgprivate->scenegraph, (char *)name_space, NULL);
-				node->ns = gf_sg_get_namespace_code(node->sgprivate->scenegraph, (char *)name_space);
-			}
-
-			par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-			gf_node_register((GF_Node*)node, (GF_Node*)par);
-			gf_node_list_add_child(&par->children, (GF_Node*)node);
-			new_node = GF_TRUE;
-		}
-	}
-	gf_list_add(ctx->node_stack, node);
-
-	if (!modified) {
-		u32 count = 0;
-		GF_DOMFullAttribute *att = (GF_DOMFullAttribute *)node->attributes;
-		while (att) {
-			Bool found = GF_FALSE;
-			for (i=0; i<nb_attributes; i++) {
-				if (!stricmp(attributes[i].name, "xml:id")) {
-					const char *id = gf_node_get_name((GF_Node*)node);
-					if (!id || strcmp(id, attributes[i].value))
-						modified = GF_TRUE;
-				} else if (!strcmp(att->name, attributes[i].name)) {
-					found = GF_TRUE;
-					if (strcmp((const char *)att->data, attributes[i].value)) {
-						atts_modified = GF_TRUE;
-						gf_free(att->data);
-						att->data = gf_strdup(attributes[i].value);
-					}
-				}
-			}
-			if (!found) {
-				modified = GF_TRUE;
-				break;
-			}
-			count++;
-			att = (GF_DOMFullAttribute *)att->next;
-		}
-		if (count != nb_attributes)
-			modified = GF_TRUE;
-	}
-
-
-	if (modified) {
-		GF_DOMFullAttribute *tmp, *att;
-		att = (GF_DOMFullAttribute *)node->attributes;
-		while (att) {
-			if (att->name) gf_free(att->name);
-			if (att->data) gf_free(att->data);
-			tmp = att;
-			att = (GF_DOMFullAttribute *)att->next;
-			gf_free(tmp);
-		}
-
-		/*parse all atts*/
-		for (i=0; i<nb_attributes; i++) {
-			if (!stricmp(attributes[i].name, "xml:id")) {
-				u32 id = gf_sg_get_max_node_id(ctx->document) + 1;
-				gf_node_set_id((GF_Node *)node, id, attributes[i].value);
-			} else {
-				GF_DOMFullAttribute *att;
-				GF_SAFEALLOC(att, GF_DOMFullAttribute);
-				if (!att) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM attribute\n"));
-					continue;
-				}
-				att->tag = TAG_DOM_ATT_any;
-				att->name = gf_strdup(attributes[i].name);
-				att->data = gf_strdup(attributes[i].value);
-				if (prev) prev->next = (GF_DOMAttribute*)att;
-				else node->attributes = (GF_DOMAttribute*)att;
-				prev = att;
-			}
-		}
-		atts_modified = GF_TRUE;
-	}
-
-	if (atts_modified || new_node) {
-		memset(&evt, 0, sizeof(GF_DOM_Event));
-		evt.type = new_node ? GF_EVENT_NODE_INSERTED : GF_EVENT_ATTR_MODIFIED;
-		evt.bubbles = 1;
-		evt.relatedNode = (GF_Node*) (GF_EVENT_NODE_INSERTED ? par : node);
-		gf_dom_event_fire((GF_Node*)node, &evt);
-	}
-}
-
-static void xml_reload_node_end(void *sax_cbck, const char *node_name, const char *name_space)
-{
-	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
-	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	if (par) {
-		/*depth mismatch*/
-		if (strcmp(par->name, node_name)) return;
-		gf_list_rem_last(ctx->node_stack);
-	}
-}
-static void xml_reload_text_content(void *sax_cbck, const char *content, Bool is_cdata)
-{
-	GF_DOM_Event evt;
-	u32 i, len;
-	GF_ChildNodeItem *child;
-	GF_DOMText *txt = NULL;
-	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
-	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
-	if (!par) return;
-
-	/*basic check, remove all empty text nodes*/
-	len = (u32) strlen(content);
-	for (i=0; i<len; i++) {
-		if (!strchr(" \n\r\t", content[i])) break;
-	}
-	if (i==len) return;
-
-	child = par->children;
-	while (child) {
-		if (child->node->sgprivate->tag == TAG_DOMText) {
-			txt = (GF_DOMText *)child->node;
-			if (!strcmp(txt->textContent, content) && ((txt->type==GF_DOM_TEXT_REGULAR) || is_cdata))
-				return;
-			if (txt->textContent) gf_free(txt->textContent);
-			txt->textContent = gf_strdup(content);
-			txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
-			break;
-		}
-		child = child->next;
-	}
-	if (!txt) {
-		txt = gf_dom_add_text_node((GF_Node *)par, gf_strdup(content) );
-		txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
-
-		memset(&evt, 0, sizeof(GF_DOM_Event));
-		evt.type = GF_EVENT_NODE_INSERTED;
-		evt.bubbles = 1;
-		evt.relatedNode = (GF_Node*) par;
-		gf_dom_event_fire((GF_Node*)txt, &evt);
-	}
-
-	memset(&evt, 0, sizeof(GF_DOM_Event));
-	evt.type = GF_EVENT_CHAR_DATA_MODIFIED;
-	evt.bubbles = 1;
-	evt.relatedNode = (GF_Node*)par;
-	gf_dom_event_fire((GF_Node*)par, &evt);
-
-	memset(&evt, 0, sizeof(GF_DOM_Event));
-	evt.type = GF_EVENT_DCCI_PROP_CHANGE;
-	evt.bubbles = 1;
-	evt.relatedNode = (GF_Node*)par;
-	gf_dom_event_fire((GF_Node*)par, &evt);
-}
-#endif
-
-GF_Err gf_sg_reload_xml_doc(const char *src, GF_SceneGraph *scene)
-{
-#ifndef GPAC_HAS_SPIDERMONKEY
-	return GF_NOT_SUPPORTED;
-#else
-	GF_Err e;
-	XMLReloadContext ctx;
-
-	if (!src || !scene) return GF_BAD_PARAM;
-	memset(&ctx, 0, sizeof(XMLReloadContext));
-	ctx.document = scene;
-	ctx.node_stack = gf_list_new();
-
-	ctx.sax = gf_xml_sax_new(xml_reload_node_start, xml_reload_node_end, xml_reload_text_content, &ctx);
-	e = gf_xml_sax_parse_file(ctx.sax, src, NULL);
-	gf_list_del(ctx.node_stack);
-	gf_xml_sax_del(ctx.sax);
-	if (e<0) return e;
-	return GF_OK;
-#endif
-}
-
-#endif	/*GPAC_DISABLE_SVG*/

gpac-0.8.0.tar.gz/src/scenegraph/html5_media_smjs.c Deleted

@@ -1,1718 +0,0 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2007-2012
- *          All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
-
-/*base SVG type*/
-#include <gpac/nodes_svg.h>
-/*dom events*/
-#include <gpac/events.h>
-/*dom text event*/
-#include <gpac/utf.h>
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/xml.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif /* XP_UNIX */
-#endif
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#include <gpac/internal/smjs_api.h>
-#include <gpac/html5_media.h>
-
-/***********************************************************
- *
- * DOM generic functions being used
- *
- ***********************************************************/
-#ifdef USE_FFDEV_15
-void dom_element_finalize(JSFreeOp *fop, JSObject *obj);
-void dom_document_finalize(JSFreeOp *fop, JSObject *obj);
-#else
-void dom_element_finalize(JSContext *c, JSObject *obj);
-void dom_document_finalize(JSContext *c, JSObject *obj);
-#endif
-
-void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val);
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-/* including terminal dev for MediaObject */
-
-#include <gpac/internal/terminal_dev.h>
-
-/* including Compositor dev for TextureHandler and AudioInput */
-#include <gpac/internal/compositor_dev.h>
-
-static GF_HTML_MediaRuntime *html_media_rt = NULL;
-
-/* Enumeration of the property codes for use in JS Bindings for the the HTML5 MediaError interface */
-typedef enum
-{
-	MEDIA_ERROR_PROP_ABORTED            = -1,
-	MEDIA_ERROR_PROP_NETWORK            = -2,
-	MEDIA_ERROR_PROP_DECODE             = -3,
-	MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED  = -4,
-	MEDIA_ERROR_PROP_CODE               = -5
-} GF_HTML_MediaErrorPropEnum;
-
-/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLMediaElement interface */
-typedef enum
-{
-	HTML_MEDIA_PROP_SRC                         = -1,
-	HTML_MEDIA_PROP_CURRENTSRC                  = -2,
-	HTML_MEDIA_PROP_CROSSORIGIN                 = -3,
-	HTML_MEDIA_PROP_NETWORKSTATE                = -4,
-	HTML_MEDIA_PROP_PRELOAD                     = -5,
-	HTML_MEDIA_PROP_BUFFERED                    = -6,
-	HTML_MEDIA_PROP_READYSTATE                  = -7,
-	HTML_MEDIA_PROP_SEEKING                     = -8,
-	HTML_MEDIA_PROP_CURRENTTIME                 = -9,
-	HTML_MEDIA_PROP_DURATION                    = -10,
-	HTML_MEDIA_PROP_STARTDATE                   = -11,
-	HTML_MEDIA_PROP_PAUSED                      = -12,
-	HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE         = -13,
-	HTML_MEDIA_PROP_PLAYBACKRATE                = -14,
-	HTML_MEDIA_PROP_PLAYED                      = -15,
-	HTML_MEDIA_PROP_SEEKABLE                    = -16,
-	HTML_MEDIA_PROP_ENDED                       = -17,
-	HTML_MEDIA_PROP_AUTOPLAY                    = -18,
-	HTML_MEDIA_PROP_LOOP                        = -19,
-	HTML_MEDIA_PROP_MEDIAGROUP                  = -20,
-	HTML_MEDIA_PROP_CONTROLLER                  = -21,
-	HTML_MEDIA_PROP_CONTROLS                    = -22,
-	HTML_MEDIA_PROP_VOLUME                      = -23,
-	HTML_MEDIA_PROP_MUTED                       = -24,
-	HTML_MEDIA_PROP_DEFAULTMUTED                = -25,
-	HTML_MEDIA_PROP_AUDIOTRACKS                 = -26,
-	HTML_MEDIA_PROP_VIDEOTRACKS                 = -27,
-	HTML_MEDIA_PROP_TEXTTRACKS                  = -28,
-	HTML_MEDIA_PROP_NETWORK_EMPTY               = -29,
-	HTML_MEDIA_PROP_NETWORK_IDLE                = -30,
-	HTML_MEDIA_PROP_NETWORK_LOADING             = -31,
-	HTML_MEDIA_PROP_NETWORK_NO_SOURCE           = -32,
-	HTML_MEDIA_PROP_HAVE_NOTHING                = -33,
-	HTML_MEDIA_PROP_HAVE_METADATA               = -34,
-	HTML_MEDIA_PROP_HAVE_CURRENT_DATA           = -35,
-	HTML_MEDIA_PROP_HAVE_FUTURE_DATA            = -36,
-	HTML_MEDIA_PROP_HAVE_ENOUGH_DATA            = -37,
-	HTML_MEDIA_PROP_ERROR                       = -38
-} GF_HTML_MediaEltPropEnum;
-
-/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLVideoElement interface */
-typedef enum {
-	HTML_VIDEO_PROP_WIDTH                       = -1,
-	HTML_VIDEO_PROP_HEIGHT                      = -2,
-	HTML_VIDEO_PROP_VIDEOWIDTH                  = -3,
-	HTML_VIDEO_PROP_VIDEOHEIGHT                 = -4,
-	HTML_VIDEO_PROP_POSTER                      = -5
-} GF_HTML_VideoEltPropEnum;
-
-/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLTrackElement interface */
-typedef enum {
-	HTML_TRACK_PROP_ID                          = -1,
-	HTML_TRACK_PROP_KIND                        = -2,
-	HTML_TRACK_PROP_LABEL                       = -3,
-	HTML_TRACK_PROP_LANGUAGE                    = -4,
-	HTML_TRACK_PROP_SELECTED                    = -5,
-	HTML_TRACK_PROP_ENABLED                     = -6,
-	HTML_TRACK_PROP_INBANDTYPE                  = -7
-} GF_HTML_TrackPropEnum;
-
-#define HTML_MEDIA_JS_CHECK     GF_HTML_MediaElement *me; \
-                                GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj); \
-                                if (!n || (n->sgprivate->tag != TAG_SVG_video && n->sgprivate->tag != TAG_SVG_audio)) \
-                                { \
-									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
-                                } \
-                                me = (GF_HTML_MediaElement *)html_media_element_get_from_node(c, n); \
-                                if (!me) { \
-									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
-                                }
-
-#define HTML_MEDIA_JS_START     HTML_MEDIA_JS_CHECK
-
-/* Structure copied over from svg_media.c
-   TODO : fix this - remove the copy */
-typedef struct
-{
-	GF_TextureHandler txh;
-	struct _drawable *graph;
-	MFURL txurl;
-	Bool first_frame_fetched;
-	GF_Node *audio;
-	Bool audio_dirty;
-	Bool stop_requested;
-} SVG_video_stack;
-
-/* Structure copied over from svg_media.c
-   TODO : fix this - remove the copy */
-typedef struct
-{
-	GF_AudioInput input;
-	Bool is_active, is_error;
-	MFURL aurl;
-} SVG_audio_stack;
-
-/* Gets the GF_MediaObject associated with this node
- *
- *  \param n the node either an SVG/HTML5 video or audio element
- *  \return the GF_MediaObject attached to this node or null if none
- */
-static GF_MediaObject *gf_html_media_object(GF_Node *n)
-{
-	GF_MediaObject *mo = NULL;
-	if (n->sgprivate->tag == TAG_SVG_video)
-	{
-		SVG_video_stack *video_stack;
-		video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
-		mo = video_stack->txh.stream;
-	}
-	else if (n->sgprivate->tag == TAG_SVG_audio)
-	{
-		SVG_audio_stack *audio_stack;
-		audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
-		mo = audio_stack->input.stream;
-	}
-	return mo;
-}
-
-static void gf_html_track_init_js(GF_HTML_Track *track, JSContext *c, GF_HTML_TrackList *tracklist)
-{
-	JSObject *track_obj;
-	track->c     = c;
-	if (track->type == HTML_MEDIA_TRACK_TYPE_AUDIO)
-	{
-		track_obj = JS_NewObject(c, &html_media_rt->audioTrackClass._class, NULL, tracklist->_this);
-	}
-	else if (track->type == HTML_MEDIA_TRACK_TYPE_VIDEO)
-	{
-		track_obj = JS_NewObject(c, &html_media_rt->videoTrackClass._class, NULL, tracklist->_this);
-	}
-	else if (track->type == HTML_MEDIA_TRACK_TYPE_TEXT)
-	{
-		track_obj = JS_NewObject(c, &html_media_rt->textTrackClass._class, NULL, tracklist->_this);
-	}
-	else
-	{
-		return;
-	}
-	tracklist->onchange = JSVAL_NULL;
-	tracklist->onaddtrack = JSVAL_NULL;
-	tracklist->onremovetrack = JSVAL_NULL;
-	track->_this = track_obj;
-	SMJS_SET_PRIVATE(c, track->_this, track);
-}
-
-/* Not yet used, removed for GCC warning
-static void gf_html_media_controller_init_js(GF_HTML_MediaController *mc, JSContext *c)
-{
-    mc->c            = c;
-    mc->_this        = JS_NewObject(c, &html_media_rt->mediaControllerClass._class, NULL, NULL);
-    SMJS_SET_PRIVATE(c, mc->_this, mc);
-    mc->buffered->c              = c;
-    mc->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->buffered->_this, mc->buffered);
-    mc->played->c                = c;
-    mc->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->played->_this, mc->played);
-    mc->seekable->c              = c;
-    mc->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->seekable->_this, mc->seekable);
-}
-*/
-
-static void gf_html_media_element_init_js(GF_HTML_MediaElement *me, JSContext *c, JSObject *node_obj)
-{
-	me->c                       = c;
-	me->_this                   = JS_NewObject(c, &html_media_rt->htmlMediaElementClass._class, NULL, node_obj);
-	SMJS_SET_PRIVATE(c, me->_this, me);
-
-	me->error.c                 = c;
-	me->error._this             = JS_NewObject(c, &html_media_rt->mediaErrorClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->error._this, &me->error);
-
-	me->audioTracks.c           = c;
-	me->audioTracks._this       = JS_NewObject(c, &html_media_rt->audioTrackListClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->audioTracks._this, &me->audioTracks);
-
-	me->videoTracks.c           = c;
-	me->videoTracks._this       = JS_NewObject(c, &html_media_rt->videoTrackListClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->videoTracks._this, &me->videoTracks);
-
-	me->textTracks.c            = c;
-	me->textTracks._this        = JS_NewObject(c, &html_media_rt->textTrackListClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->textTracks._this, &me->textTracks);
-
-	me->buffered->c              = c;
-	me->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->buffered->_this, me->buffered);
-
-	me->played->c                = c;
-	me->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->played->_this, me->played);
-
-	me->seekable->c              = c;
-	me->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-	SMJS_SET_PRIVATE(c, me->seekable->_this, me->seekable);
-}
-
-/* Function to browse the tracks in the MediaObject associated with the Media Element and to create appropriate HTML Track objects
- *
- * \param c The JavaScript Context to create the new JS object
- * \param me the HTMLMediaElement to update
- */
-static void html_media_element_populate_tracks(JSContext *c, GF_HTML_MediaElement *me)
-{
-	GF_HTML_Track *track;
-	GF_MediaObject *mo;
-	GF_ClientService *service;
-	GF_Scene *scene;
-	u32 i, count;
-
-	if (!me || !me->node) {
-		return;
-	}
-	mo = gf_html_media_object(me->node);
-	if (!mo || !mo->odm || !mo->odm->net_service || !mo->odm->parentscene) {
-		return;
-	}
-	service = mo->odm->net_service;
-	scene = mo->odm->parentscene;
-
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		u32 j;
-		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
-		if (odm->net_service != service) continue;
-		if (!odm->mo || !odm->OD) continue;
-		for (j = 0; j < gf_list_count(odm->OD->ESDescriptors); j++)
-		{
-			char id[256];
-			char *lang = "";
-			GF_ESD *esd = (GF_ESD *)gf_list_get(odm->OD->ESDescriptors, j);
-			sprintf(id, "track%d", esd->ESID);
-			if (esd->langDesc)
-			{
-				lang  = "";
-			}
-			switch(odm->mo->type)
-			{
-			case GF_MEDIA_OBJECT_VIDEO:
-				if (!html_media_tracklist_has_track(&me->videoTracks, id))
-				{
-					track = html_media_add_new_track_to_list(&me->videoTracks, HTML_MEDIA_TRACK_TYPE_VIDEO,
-					        "video/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
-					gf_html_track_init_js(track, c, &me->videoTracks);
-				}
-				break;
-			case GF_MEDIA_OBJECT_AUDIO:
-				if (!html_media_tracklist_has_track(&me->audioTracks, id))
-				{
-					track = html_media_add_new_track_to_list(&me->audioTracks, HTML_MEDIA_TRACK_TYPE_AUDIO,
-					        "audio/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
-					gf_html_track_init_js(track, c, &me->audioTracks);
-				}
-				break;
-			case GF_MEDIA_OBJECT_TEXT:
-				if (!html_media_tracklist_has_track(&me->textTracks, id))
-				{
-					track = html_media_add_new_track_to_list(&me->textTracks, HTML_MEDIA_TRACK_TYPE_TEXT,
-					        "text/plain", GF_TRUE, id, "myKind", "myLabel", lang);
-					gf_html_track_init_js(track, c, &me->textTracks);
-				}
-				break;
-			}
-		}
-	}
-}
-
-/* Used to retrieve the structure implementing the GF_HTML_MediaElement interface associated with this node
- * Usually this is done with the private stack of the node (see gf_node_get_private), but in this case,
- * the stack already contains the rendering stack SVG_video_stack.
- * So, we store the structure implementing the GF_HTML_MediaElement interface in the JavaScript context of this node,
- * as a non enumeratable property named 'gpac_me_impl'
- *
- *  \param c the global JavaScript context
- *  \param n the audio or video node
- *  \return the GF_HTML_MediaElement associated with this node in the given context
- */
-static GF_HTML_MediaElement *html_media_element_get_from_node(JSContext *c, GF_Node *n)
-{
-	jsval vp;
-	JSObject *me_obj;
-	JSObject *node_obj;
-	GF_HTML_MediaElement *me = NULL;
-
-	if ((n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) && n->sgprivate->interact && n->sgprivate->interact->js_binding) {
-		node_obj = (JSObject *)n->sgprivate->interact->js_binding->node;
-		if (node_obj) {
-			JS_GetProperty(c, node_obj, "gpac_me_impl", &vp);
-			me_obj = JSVAL_TO_OBJECT(vp);
-			me = (GF_HTML_MediaElement *)SMJS_GET_PRIVATE(c, me_obj);
-		}
-	}
-	return me;
-}
-
-static JSBool SMJS_FUNCTION(html_media_load)
-{
-	SMJS_OBJ
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
-	{
-		MFURL mfurl;
-		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-		GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
-		mfurl.count = 1;
-		mfurl.vals = (SFURL *)gf_malloc(sizeof(SFURL));
-		mfurl.vals[0].url = me->currentSrc;
-		mfurl.vals[0].OD_ID = GF_MEDIA_EXTERNAL_ID;
-		gf_mo_register(n, &mfurl, GF_FALSE, GF_FALSE);
-		gf_free(mfurl.vals);
-		return JS_TRUE;
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-}
-
-static JSBool SMJS_FUNCTION(html_media_canPlayType)
-{
-	SMJS_OBJ
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
-	{
-		return JS_TRUE;
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-}
-
-static JSBool SMJS_FUNCTION(html_media_fastSeek)
-{
-	SMJS_OBJ
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
-	{
-		return JS_TRUE;
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-}
-
-static JSBool SMJS_FUNCTION(html_media_addTextTrack)
-{
-	SMJS_OBJ
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
-	{
-		return JS_TRUE;
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-}
-
-void *html_get_element_class(GF_Node *n)
-{
-	if (!n || !html_media_rt)
-	{
-		return NULL;
-	} else if (n->sgprivate->tag == TAG_SVG_video) {
-		return &html_media_rt->htmlVideoElementClass;
-	} else if (n->sgprivate->tag == TAG_SVG_audio) {
-		return &html_media_rt->htmlAudioElementClass;
-	} else {
-		return NULL;
-	}
-}
-
-/* Creates the GF_HTML_MediaElement structure for this node
- * Store it in the JavaScript context of this node, as a non enumeratable property named 'gpac_me_impl'
- * see \ref html_media_element_get_from_node for retrieving it
- *
- *  \param c the global JavaScript context
- *  \param n the audio or video node
- *  \param node_obj the JavaScript object representing the audio or video node
- */
-void html_media_element_js_init(JSContext *c, JSObject *node_obj, GF_Node *n)
-{
-	if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
-		GF_HTML_MediaElement *me;
-		me = gf_html_media_element_new(n, NULL);
-		gf_html_media_element_init_js(me, c, node_obj);
-		/* To be able to retrieve the Media Element interface from the Node element */
-		JS_DefineProperty(c, node_obj, "gpac_me_impl", OBJECT_TO_JSVAL(me->_this), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	}
-}
-
-/* Deletes the GF_HTML_MediaElement structure for this node
- *
- *  \param c the global JavaScript context
- *  \param n the audio or video node
- */
-void html_media_element_js_finalize(JSContext *c, GF_Node *n)
-{
-	GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
-	/* TODO: finalize child objects */
-	gf_html_media_element_del(me);
-}
-
-/* Gets The EventTarget and SceneGraph from the GF_HTML_MediaElement structure for a audio/video JS node
- *
- *  \param c the global JavaScript context
- *  \param obj the JS object representing the HTMLAudioElement or HTMLVideoElement
- *  \param target the GF_DOMEventTarget object
- *  \param sg the scene graph
- */
-void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
-	if (!sg || !target || !html_media_rt) return;
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ) {
-		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-		*target = gf_dom_event_get_target_from_node(n);
-		*sg = n->sgprivate->scenegraph;
-	} else {
-		*target = NULL;
-		*sg = NULL;
-	}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_error_get_code)
-if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaErrorClass, NULL))
-{
-	GF_HTML_MediaError *error = (GF_HTML_MediaError*)SMJS_GET_PRIVATE(c, obj);
-	if (!SMJS_ID_IS_INT(id)) {
-		return JS_TRUE;
-	}
-	switch (SMJS_ID_TO_INT(id))
-	{
-	case MEDIA_ERROR_PROP_ABORTED:
-		*vp = INT_TO_JSVAL(MEDIA_ERR_ABORTED);
-		return JS_TRUE;
-	case MEDIA_ERROR_PROP_NETWORK:
-		*vp = INT_TO_JSVAL(MEDIA_ERR_NETWORK);
-		return JS_TRUE;
-	case MEDIA_ERROR_PROP_DECODE:
-		*vp = INT_TO_JSVAL(MEDIA_ERR_DECODE);
-		return JS_TRUE;
-	case MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED:
-		*vp = INT_TO_JSVAL(MEDIA_ERR_SRC_NOT_SUPPORTED);
-		return JS_TRUE;
-	case MEDIA_ERROR_PROP_CODE:
-		*vp = INT_TO_JSVAL(error->code);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_error)
-HTML_MEDIA_JS_START
-*vp = OBJECT_TO_JSVAL(me->error._this);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_src)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "href", GF_XMLNS_XLINK, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_src)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_XLINK, "href", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_cors)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "crossorigin", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_cors)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "crossorigin", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-void media_event_collect_info(GF_ClientService *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer);
-
-static void html_media_get_states(GF_MediaObject *mo, GF_HTML_MediaReadyState *readyState, GF_HTML_NetworkState *networkState)
-{
-	GF_DOMMediaEvent media_event;
-	u32 min_time;
-	u32 min_buffer;
-	if (!mo) return;
-
-	if (!mo->odm) {
-		*readyState = HAVE_NOTHING;
-		*networkState = NETWORK_EMPTY;
-		return;
-	}
-
-	memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
-	media_event_collect_info(mo->odm->net_service, mo->odm, &media_event, &min_time, &min_buffer);
-	//GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] min_time: %d, min_buffer: %d loaded: "LLD"/"LLD"\n",
-	//                                                    min_time, min_buffer, media_event.loaded_size, media_event.total_size));
-	if (min_buffer == 0)
-	{
-		*readyState = HAVE_NOTHING;
-		*networkState = NETWORK_EMPTY;
-	}
-	else
-	{
-		if (media_event.loaded_size != 0)
-		{
-			*readyState = HAVE_METADATA;
-		}
-		else if (media_event.loaded_size == media_event.total_size)
-		{
-			*readyState = HAVE_ENOUGH_DATA;
-		}
-	}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_ready_state)
-GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
-GF_HTML_NetworkState networkState = NETWORK_EMPTY;
-GF_MediaObject *mo = NULL;
-HTML_MEDIA_JS_START
-html_media_element_populate_tracks(c, me);
-mo = gf_html_media_object(n);
-html_media_get_states(mo, &readyState, &networkState);
-*vp = INT_TO_JSVAL( readyState );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_network_state)
-GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
-GF_HTML_NetworkState networkState = NETWORK_EMPTY;
-GF_MediaObject *mo = NULL;
-HTML_MEDIA_JS_START
-mo = gf_html_media_object(n);
-html_media_get_states(mo, &readyState, &networkState);
-*vp = INT_TO_JSVAL( networkState );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_const)
-u32 v = 0;
-if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL))
-{
-	if (!SMJS_ID_IS_INT(id)) {
-		return JS_TRUE;
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_MEDIA_PROP_NETWORK_EMPTY:
-		v = NETWORK_EMPTY;
-		break;
-	case HTML_MEDIA_PROP_NETWORK_IDLE:
-		v = NETWORK_IDLE;
-		break;
-	case HTML_MEDIA_PROP_NETWORK_LOADING:
-		v = NETWORK_LOADING;
-		break;
-	case HTML_MEDIA_PROP_NETWORK_NO_SOURCE:
-		v = NETWORK_NO_SOURCE;
-		break;
-	case HTML_MEDIA_PROP_HAVE_NOTHING:
-		v = HAVE_NOTHING;
-		break;
-	case HTML_MEDIA_PROP_HAVE_METADATA:
-		v = HAVE_METADATA;
-		break;
-	case HTML_MEDIA_PROP_HAVE_CURRENT_DATA:
-		v = HAVE_CURRENT_DATA;
-		break;
-	case HTML_MEDIA_PROP_HAVE_FUTURE_DATA:
-		v = HAVE_FUTURE_DATA;
-		break;
-	case HTML_MEDIA_PROP_HAVE_ENOUGH_DATA:
-		v = HAVE_ENOUGH_DATA;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	*vp = INT_TO_JSVAL( v );
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_preload)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "preload", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_preload)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "preload", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_buffered)
-HTML_MEDIA_JS_START
-*vp = OBJECT_TO_JSVAL( me->buffered->_this );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_seeking)
-HTML_MEDIA_JS_START
-/* TODO: implement it for real */
-*vp = BOOLEAN_TO_JSVAL( (me->seeking ? JS_TRUE : JS_FALSE) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_current_time)
-u32 time_ms = 0;
-Double time_s;
-GF_MediaObject *mo = NULL;
-HTML_MEDIA_JS_START
-mo = gf_html_media_object(n);
-gf_mo_get_object_time(mo, &time_ms);
-time_s = time_ms / 1000.0;
-*vp = JS_MAKE_DOUBLE(c, time_s );
-return JS_TRUE;
-}
-
-static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
-{
-	if (scene->script_action)
-	{
-		return scene->script_action(scene->script_action_cbck, type, node, param);
-	}
-	return GF_FALSE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_current_time)
-double d;
-GF_JSAPIParam par;
-HTML_MEDIA_JS_START
-if (!JSVAL_IS_NUMBER(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-par.time = d;
-ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_duration)
-Double dur;
-GF_MediaObject *mo = NULL;
-HTML_MEDIA_JS_START
-mo = gf_html_media_object(n);
-dur = gf_mo_get_duration(mo);
-if (dur <= 0) {
-	*vp = JS_GetNaNValue(c);
-} else {
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, dur));
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_start_date)
-HTML_MEDIA_JS_START
-// SpiderMonkey 1.8.5 JSObject * JS_NewDateObject(JSContext *cx, int year, int mon, int mday, int hour, int min, int sec);
-*vp = JSVAL_NULL;
-/* TODO */
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_paused)
-HTML_MEDIA_JS_START
-*vp =( BOOLEAN_TO_JSVAL( (me->paused ? JS_TRUE : JS_FALSE) ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_default_playback_rate)
-HTML_MEDIA_JS_START
-*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, me->defaultPlaybackRate));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_default_playback_rate)
-jsdouble d;
-HTML_MEDIA_JS_START
-if (!JSVAL_IS_NUMBER(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-me->defaultPlaybackRate = d;
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_playback_rate)
-Double speed;
-GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-GF_MediaObject *mo = gf_html_media_object(n);
-speed = gf_mo_get_current_speed(mo);
-*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, speed));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_playback_rate)
-jsdouble d;
-Fixed speed;
-GF_MediaObject *mo;
-HTML_MEDIA_JS_START
-mo = gf_html_media_object(n);
-if (!JSVAL_IS_NUMBER(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-speed = FLT2FIX(d);
-gf_mo_set_speed(mo, speed);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_played)
-HTML_MEDIA_JS_START
-*vp =( OBJECT_TO_JSVAL( me->played->_this ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_seekable)
-HTML_MEDIA_JS_START
-*vp =( OBJECT_TO_JSVAL( me->seekable->_this ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_ended)
-GF_MediaObject *mo;
-HTML_MEDIA_JS_START
-mo = gf_html_media_object(n);
-*vp = BOOLEAN_TO_JSVAL( gf_mo_is_done(mo) ? JS_TRUE : JS_FALSE);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_autoplay)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "autoplay", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
-		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-	} else {
-		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-	}
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_autoplay)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "autoplay", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_loop)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-/* TODO: gf_mo_get_loop */
-if (gf_node_get_attribute_by_name(n, "loop", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
-		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-	} else {
-		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-	}
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_loop)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "loop", str);
-	//TODO: use gf_mo_get_loop
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_mediagroup)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "mediagroup", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	*vp =( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_mediagroup)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "mediagroup", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_controller)
-HTML_MEDIA_JS_START
-if (me->controller) {
-	*vp = OBJECT_TO_JSVAL( me->controller->_this );
-} else {
-	*vp = JSVAL_NULL;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_controller)
-HTML_MEDIA_JS_START
-if (JSVAL_IS_OBJECT(*vp)) {
-	me->controller = (GF_HTML_MediaController *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_controls)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "controls", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
-		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-	} else {
-		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-	}
-	if (szAtt) gf_free(szAtt);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_controls)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "controls", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SVG_audio_stack *html_media_get_audio_stack(GF_Node *n) {
-	SVG_video_stack *video_stack = NULL;
-	SVG_audio_stack *audio_stack = NULL;
-	if (n->sgprivate->tag == TAG_SVG_video) {
-		video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
-		if (video_stack->audio) {
-			audio_stack = (SVG_audio_stack *)video_stack->audio->sgprivate->UserPrivate;
-		}
-	} else if (n->sgprivate->tag == TAG_SVG_audio) {
-		audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
-	}
-	return audio_stack;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_volume)
-Fixed volume = FIX_ONE;
-SVG_audio_stack *audio_stack = NULL;
-HTML_MEDIA_JS_CHECK
-audio_stack = html_media_get_audio_stack(n);
-if (audio_stack) {
-	audio_stack->input.input_ifce.GetChannelVolume(&audio_stack->input.input_ifce.callback, &volume);
-}
-*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, FIX2FLT(volume)));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_volume)
-jsdouble volume;
-SVG_audio_stack *audio_stack = NULL;
-HTML_MEDIA_JS_CHECK
-audio_stack = html_media_get_audio_stack(n);
-if (audio_stack) {
-	JS_ValueToNumber(c, *vp, &volume);
-	audio_stack->input.intensity = FLT2FIX(volume);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_muted)
-SVG_audio_stack *audio_stack = NULL;
-HTML_MEDIA_JS_CHECK
-audio_stack = html_media_get_audio_stack(n);
-if (audio_stack) {
-	*vp = BOOLEAN_TO_JSVAL(audio_stack->input.is_muted ? JS_TRUE : JS_FALSE);
-} else {
-	*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_muted)
-SVG_audio_stack *audio_stack = NULL;
-HTML_MEDIA_JS_CHECK
-audio_stack = html_media_get_audio_stack(n);
-if (audio_stack) {
-	audio_stack->input.is_muted = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_default_muted)
-GF_FieldInfo info;
-HTML_MEDIA_JS_START
-if (gf_node_get_attribute_by_name(n, "muted", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-	char *szAtt = gf_svg_dump_attribute(n, &info);
-	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
-		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-	} else {
-		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-	}
-	if (szAtt) gf_free(szAtt);
-} else {
-	*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_default_muted)
-HTML_MEDIA_JS_START
-if (JSVAL_CHECK_STRING(*vp)) {
-	char *str = SMJS_CHARS(c, *vp);
-	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "muted", str);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_audio_tracks)
-HTML_MEDIA_JS_START
-*vp =( OBJECT_TO_JSVAL( me->audioTracks._this ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_video_tracks)
-HTML_MEDIA_JS_START
-*vp =( OBJECT_TO_JSVAL( me->videoTracks._this ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_text_tracks)
-HTML_MEDIA_JS_START
-*vp =( OBJECT_TO_JSVAL( me->textTracks._this ) );
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_time_ranges_get_length)
-GF_HTML_MediaTimeRanges *timeranges;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
-*vp = INT_TO_JSVAL( gf_list_count(timeranges->times)/2);
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(html_time_ranges_start)
-{
-	GF_HTML_MediaTimeRanges *timeranges;
-	SMJS_OBJ
-	SMJS_ARGS
-	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
-	if (!timeranges) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 i = JSVAL_TO_INT(argv[0]);
-		u64 *start_value = (u64 *)gf_list_get(timeranges->times, 2*i);
-		if (!start_value) {
-			return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
-		} else {
-			SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*start_value)*1.0/timeranges->timescale)));
-		}
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(html_time_ranges_end)
-{
-	GF_HTML_MediaTimeRanges *timeranges;
-	SMJS_OBJ
-	SMJS_ARGS
-	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
-	if (!timeranges) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (JSVAL_IS_INT(argv[0])) {
-		u32 i = JSVAL_TO_INT(argv[0]);
-		u64 *end_value = (u64 *)gf_list_get(timeranges->times, 2*i+1);
-		if (!end_value) {
-			return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
-		} else {
-			SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*end_value)*1.0/timeranges->timescale)));
-		}
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	return JS_TRUE;
-}
-
-static Bool html_is_track_list(JSContext *c, JSObject *obj) {
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackListClass, NULL)) return GF_TRUE;
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackListClass, NULL)) return GF_TRUE;
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackListClass, NULL)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_length)
-GF_HTML_TrackList *tracklist;
-if (html_is_track_list(c, obj)) {
-	tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	if (tracklist) {
-		*vp = INT_TO_JSVAL( gf_list_count(tracklist->tracks) );
-		return JS_TRUE;
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static JSBool SMJS_FUNCTION(html_track_list_get_track_by_id)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	if (html_is_track_list(c, obj)) {
-		GF_HTML_TrackList *tracklist;
-		GF_HTML_Track *track;
-		char *str;
-		tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-		str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
-		track = html_media_tracklist_get_track(tracklist, str);
-		SMJS_FREE(c, str);
-		if (track) {
-			SMJS_SET_RVAL(OBJECT_TO_JSVAL(track->_this));
-			return JS_TRUE;
-		} else {
-			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-		}
-	} else {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_property)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist;
-	s32 index;
-
-	tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	index = SMJS_ID_TO_INT(id);
-	if (index >= 0 && (u32)index < gf_list_count(tracklist->tracks)) {
-		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tracklist->tracks, (u32)index);
-		*vp = OBJECT_TO_JSVAL(track->_this);
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_selected_index)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	*vp = INT_TO_JSVAL(tracklist->selected_index);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onchange)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	if (! JSVAL_IS_NULL(tracklist->onchange)) {
-		*vp = tracklist->onchange;
-	} else {
-		*vp = JSVAL_NULL;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval);
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onchange)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	gf_set_js_eventhandler(c, *vp, &tracklist->onchange);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onaddtrack)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	if (! JSVAL_IS_NULL(tracklist->onaddtrack)) {
-		*vp = tracklist->onaddtrack;
-	} else {
-		*vp = JSVAL_NULL;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onaddtrack)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	gf_set_js_eventhandler(c, *vp, &tracklist->onaddtrack);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onremovetrack)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	if (! JSVAL_IS_NULL(tracklist->onremovetrack) ) {
-		*vp = tracklist->onremovetrack;
-	} else {
-		*vp = JSVAL_NULL;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onremovetrack)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-	gf_set_js_eventhandler(c, *vp, &tracklist->onremovetrack);
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_track_get_property)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
-	if (!SMJS_ID_IS_INT(id)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_TRACK_PROP_ID:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->id ? track->id : "") );
-		return JS_TRUE;
-	case HTML_TRACK_PROP_KIND:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->kind ? track->kind : "") );
-		return JS_TRUE;
-	case HTML_TRACK_PROP_LABEL:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->label ? track->label : "") );
-		return JS_TRUE;
-	case HTML_TRACK_PROP_LANGUAGE:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->language ? track->language  : "") );
-		return JS_TRUE;
-	case HTML_TRACK_PROP_INBANDTYPE:
-		if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL)) {
-			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->mime ? track->mime  : "") );
-			return JS_TRUE;
-		}
-	case HTML_TRACK_PROP_SELECTED:
-		if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) {
-			*vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
-		}
-		return JS_TRUE;
-	case HTML_TRACK_PROP_ENABLED:
-		if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL)) {
-			*vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
-		}
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_SET(html_track_set_property)
-if (html_is_track_list(c, obj)) {
-	GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
-	if (!SMJS_ID_IS_INT(id)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_TRACK_PROP_SELECTED:
-		if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL))
-		{
-			track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
-		}
-		return JS_TRUE;
-	case HTML_TRACK_PROP_ENABLED:
-		if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL))
-		{
-			track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
-		}
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_GET(html_video_get_property)
-if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL))
-{
-	GF_FieldInfo    info;
-	SVG_video_stack *video;
-	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-	if (!n) return JS_TRUE;
-
-	video = (SVG_video_stack *)n->sgprivate->UserPrivate;
-	if (!SMJS_ID_IS_INT(id)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_VIDEO_PROP_WIDTH:
-		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-			SVG_Length *length;
-			length = (SVG_Length *)info.far_ptr;
-			*vp = INT_TO_JSVAL( FIX2FLT(length->value) );
-		}
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_HEIGHT:
-		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-			SVG_Length *length;
-			length = (SVG_Length *)info.far_ptr;
-			*vp = INT_TO_JSVAL( FIX2FLT(length->value) );
-		}
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_VIDEOWIDTH:
-		*vp = INT_TO_JSVAL( video->txh.width );
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_VIDEOHEIGHT:
-		*vp = INT_TO_JSVAL( video->txh.height );
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_POSTER:
-		if (gf_node_get_attribute_by_name(n, "poster", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-			char *szAtt = gf_svg_dump_attribute(n, &info);
-			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-			if (szAtt) gf_free(szAtt);
-		}
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static SMJS_FUNC_PROP_SET(html_video_set_property)
-if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL))
-{
-	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-	if (!SMJS_ID_IS_INT(id)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_VIDEO_PROP_WIDTH:
-		/* TODO: change value and dirty node */
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_HEIGHT:
-		/* TODO: change value and dirty node */
-		return JS_TRUE;
-	case HTML_VIDEO_PROP_POSTER:
-	{
-		char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, *vp) );
-		gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "poster", str);
-		SMJS_FREE(c, str);
-		return JS_TRUE;
-	}
-	}
-	return JS_TRUE;
-} else {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-}
-
-static JSBool SMJS_FUNCTION(html_media_event_add_listener)
-{
-	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
-	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
-}
-
-static JSBool SMJS_FUNCTION(html_media_event_remove_listener)
-{
-	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
-	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
-}
-
-static JSBool SMJS_FUNCTION(html_media_event_dispatch)
-{
-	return JS_TRUE;
-}
-
-void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *html_media_rt);
-
-void html_media_js_api_del() {
-	if (html_media_rt) {
-		gf_free(html_media_rt);
-		html_media_rt = NULL;
-	}
-}
-
-void html_media_init_js_api(GF_SceneGraph *scene) {
-	/* HTML Media Element */
-	if (!html_media_rt) {
-		GF_SAFEALLOC(html_media_rt, GF_HTML_MediaRuntime);
-
-		/* Setting up MediaError class (no constructor, no finalizer) */
-		JS_SETUP_CLASS(html_media_rt->mediaErrorClass, "MediaError", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec mediaErrorClassProps[] = {
-				{"MEDIA_ERR_ABORTED",           MEDIA_ERROR_PROP_ABORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-				{"MEDIA_ERR_NETWORK",           MEDIA_ERROR_PROP_NETWORK,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-				{"MEDIA_ERR_DECODE",            MEDIA_ERROR_PROP_DECODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-				{"MEDIA_ERR_SRC_NOT_SUPPORTED", MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-				{"code",                        MEDIA_ERROR_PROP_CODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec mediaErrorClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaErrorClass, 0, 0, mediaErrorClassProps, mediaErrorClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaError class initialized\n"));
-		}
-
-		/* Setting up TimeRanges class (no constructor, no finalizer) */
-		JS_SETUP_CLASS(html_media_rt->timeRangesClass, "TimeRanges", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec timeRangesClassProps[] = {
-				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_time_ranges_get_length, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec timeRangesClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("start",                 html_time_ranges_start, 1),
-				SMJS_FUNCTION_SPEC("end",                   html_time_ranges_end, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->timeRangesClass, 0, 0, timeRangesClassProps, timeRangesClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TimeRanges class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->audioTrackClass, "AudioTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-		{
-			JSPropertySpec audioTrackClassProps[] = {
-				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"enabled",          HTML_TRACK_PROP_SELECTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec audioTrackClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackClass, 0, 0, audioTrackClassProps, audioTrackClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrack class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->videoTrackClass, "VideoTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-		{
-			JSPropertySpec videoTrackClassProps[] = {
-				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"kind",             HTML_TRACK_PROP_KIND,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"label",            HTML_TRACK_PROP_LABEL,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"language",         HTML_TRACK_PROP_LANGUAGE,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"selected",         HTML_TRACK_PROP_SELECTED,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec videoTrackClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackClass, 0, 0, videoTrackClassProps, videoTrackClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrack class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->textTrackClass, "TextTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-		{
-			JSPropertySpec textTrackClassProps[] = {
-				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"inBandMetadataTrackDispatchType",         HTML_TRACK_PROP_INBANDTYPE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec textTrackClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackClass, 0, 0, textTrackClassProps, textTrackClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrack class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->audioTrackListClass, "AudioTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec audioTrackListClassProps[] = {
-				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-				{"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
-				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec audioTrackListClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackListClass, 0, 0, audioTrackListClassProps, audioTrackListClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrackList class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->videoTrackListClass, "VideoTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec videoTrackListClassProps[] = {
-				{"selectedIndex",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_selected_index, 0},
-				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-				{"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
-				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec videoTrackListClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackListClass, 0, 0, videoTrackListClassProps, videoTrackListClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrackList class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->textTrackListClass, "TextTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec textTrackListClassProps[] = {
-				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec textTrackListClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackListClass, 0, 0, textTrackListClassProps, textTrackListClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrackList class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->mediaControllerClass, "MediaController", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec mediaControllerClassProps[] = {
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec mediaControllerClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaControllerClass, 0, 0, mediaControllerClassProps, mediaControllerClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaController class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->htmlMediaElementClass, "HTMLMediaElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		{
-			JSPropertySpec htmlMediaElementClassProps[] = {
-				{"error",               HTML_MEDIA_PROP_ERROR,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_error, 0},
-				{"src",                 HTML_MEDIA_PROP_SRC,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , html_media_get_src, html_media_set_src},
-				{"currentSrc",          HTML_MEDIA_PROP_CURRENTSRC,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_src, 0},
-				{"crossOrigin",         HTML_MEDIA_PROP_CROSSORIGIN,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_cors, html_media_set_cors},
-				{"NETWORK_EMPTY",       HTML_MEDIA_PROP_NETWORK_EMPTY,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"NETWORK_IDLE",        HTML_MEDIA_PROP_NETWORK_IDLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"NETWORK_LOADING",     HTML_MEDIA_PROP_NETWORK_LOADING,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"NETWORK_NO_SOURCE",   HTML_MEDIA_PROP_NETWORK_NO_SOURCE,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"networkState",        HTML_MEDIA_PROP_NETWORKSTATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_network_state, 0},
-				{"preload",             HTML_MEDIA_PROP_PRELOAD,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_preload, html_media_set_preload},
-				{"buffered",            HTML_MEDIA_PROP_BUFFERED,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_buffered, 0},
-				{"HAVE_NOTHING",        HTML_MEDIA_PROP_HAVE_NOTHING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"HAVE_METADATA",       HTML_MEDIA_PROP_HAVE_METADATA,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"HAVE_CURRENT_DATA",   HTML_MEDIA_PROP_HAVE_CURRENT_DATA, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"HAVE_FUTURE_DATA",    HTML_MEDIA_PROP_HAVE_FUTURE_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"HAVE_ENOUGH_DATA",    HTML_MEDIA_PROP_HAVE_ENOUGH_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-				{"readyState",          HTML_MEDIA_PROP_READYSTATE,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ready_state, 0},
-				{"seeking",             HTML_MEDIA_PROP_SEEKING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seeking, 0},
-				{"currentTime",         HTML_MEDIA_PROP_CURRENTTIME,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_current_time, html_media_set_current_time},
-				{"duration",            HTML_MEDIA_PROP_DURATION,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_duration, 0},
-				{"startDate",           HTML_MEDIA_PROP_STARTDATE,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_start_date, 0},
-				{"paused",              HTML_MEDIA_PROP_PAUSED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_paused, 0},
-				{"defaultPlaybackRate", HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_playback_rate, html_media_set_default_playback_rate},
-				{"playbackRate",        HTML_MEDIA_PROP_PLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_playback_rate, html_media_set_playback_rate},
-				{"played",              HTML_MEDIA_PROP_PLAYED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_played, 0},
-				{"seekable",            HTML_MEDIA_PROP_SEEKABLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seekable, 0},
-				{"ended",               HTML_MEDIA_PROP_ENDED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ended, 0},
-				{"autoplay",            HTML_MEDIA_PROP_AUTOPLAY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_autoplay, html_media_set_autoplay},
-				{"loop",                HTML_MEDIA_PROP_LOOP,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_loop, html_media_set_loop},
-				{"mediaGroup",          HTML_MEDIA_PROP_MEDIAGROUP,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_mediagroup, html_media_set_mediagroup},
-				{"controller",          HTML_MEDIA_PROP_CONTROLLER,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controller, html_media_set_controller},
-				{"controls",            HTML_MEDIA_PROP_CONTROLS,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controls, html_media_set_controls},
-				{"volume",              HTML_MEDIA_PROP_VOLUME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_volume, html_media_set_volume},
-				{"muted",               HTML_MEDIA_PROP_MUTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_muted, html_media_set_muted},
-				{"defaultMuted",        HTML_MEDIA_PROP_DEFAULTMUTED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_muted, html_media_set_default_muted},
-				{"audioTracks",         HTML_MEDIA_PROP_AUDIOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_audio_tracks, 0},
-				{"videoTracks",         HTML_MEDIA_PROP_VIDEOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_video_tracks, 0},
-				{"textTracks",          HTML_MEDIA_PROP_TEXTTRACKS,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_text_tracks, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSBool SMJS_FUNCTION(svg_udom_smil_pause);
-			JSBool SMJS_FUNCTION(svg_udom_smil_begin);
-			JSBool SMJS_FUNCTION(svg_udom_smil_end);
-			JSFunctionSpec htmlMediaElementClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("load",                  html_media_load, 0),
-				SMJS_FUNCTION_SPEC("canPlayType",           html_media_canPlayType, 1),
-				SMJS_FUNCTION_SPEC("fastSeek",              html_media_fastSeek, 1),
-				SMJS_FUNCTION_SPEC("play",                  svg_udom_smil_begin, 0),
-				SMJS_FUNCTION_SPEC("pause",                 svg_udom_smil_pause, 0),
-				SMJS_FUNCTION_SPEC("addTextTrack",          html_media_addTextTrack, 1),
-				SMJS_FUNCTION_SPEC("addEventListener",		html_media_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("removeEventListener",	html_media_event_remove_listener, 3),
-				SMJS_FUNCTION_SPEC("dispatchEvent",			html_media_event_dispatch, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &html_media_rt->htmlMediaElementClass, 0, 0, htmlMediaElementClassProps, htmlMediaElementClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLMediaElement class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->htmlVideoElementClass, "HTMLVideoElement", JSCLASS_HAS_PRIVATE, html_video_get_property, html_video_set_property, dom_element_finalize);
-		{
-			JSPropertySpec htmlVideoElementClassProps[] = {
-				{"width",       HTML_VIDEO_PROP_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-				{"height",      HTML_VIDEO_PROP_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-				{"videoWidth",  HTML_VIDEO_PROP_VIDEOWIDTH,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"videoHeight", HTML_VIDEO_PROP_VIDEOHEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{"poster",      HTML_VIDEO_PROP_POSTER,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec htmlVideoElementClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlVideoElementClass, 0, 0, htmlVideoElementClassProps, htmlVideoElementClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLVideoElement class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->htmlAudioElementClass, "HTMLAudioElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, dom_element_finalize);
-		{
-			JSPropertySpec htmlAudioElementClassProps[] = {
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec htmlAudioElementClassFuncs[] = {
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlAudioElementClass, 0, 0, htmlAudioElementClassProps, htmlAudioElementClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLAudioElement class initialized\n"));
-		}
-		html_media_source_init_js_api(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt);
-	}
-}
-#endif  /*GPAC_HAS_SPIDERMONKEY*/
-
-#endif  /*GPAC_DISABLE_SVG*/

gpac-0.8.0.tar.gz/src/scenegraph/html5_mse_smjs.c Deleted

@@ -1,951 +0,0 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2012-
- *          All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/setup.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif /* XP_UNIX */
-#endif
-
-#include <gpac/html5_mse.h>
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-typedef enum
-{
-	/* MediaSource properties */
-	HTML_MEDIASOURCE_PROP_SOURCEBUFFERS         = -1,
-	HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS   = -2,
-	HTML_MEDIASOURCE_PROP_DURATION              = -3,
-	HTML_MEDIASOURCE_PROP_READYSTATE            = -4,
-	/* SourceBuffer properties */
-	HTML_SOURCEBUFFER_PROP_MODE					= -5,
-	HTML_SOURCEBUFFER_PROP_UPDATING             = -6,
-	HTML_SOURCEBUFFER_PROP_BUFFERED             = -7,
-	HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET      = -8,
-	HTML_SOURCEBUFFER_PROP_TIMESCALE            = -9,
-	HTML_SOURCEBUFFER_PROP_AUDIOTRACKS          = -10,
-	HTML_SOURCEBUFFER_PROP_VIDEOTRACKS          = -11,
-	HTML_SOURCEBUFFER_PROP_TEXTTRACKS           = -12,
-	HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART    = -13,
-	HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND      = -14,
-	/* SourceBufferList properties */
-	HTML_SOURCEBUFFERLIST_PROP_LENGTH           = -15,
-} GF_HTML_MediaSourcePropEnum;
-
-static GF_HTML_MediaRuntime *html_media_rt = NULL;
-
-Bool gf_mse_is_mse_object(JSContext *c, JSObject *obj) {
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return GF_TRUE;
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return GF_TRUE;
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) return GF_TRUE;
-	return GF_FALSE;
-}
-
-static GFINLINE GF_SceneGraph *mediasource_get_scenegraph(JSContext *c)
-{
-	GF_SceneGraph *scene;
-	JSObject *global = JS_GetGlobalObject(c);
-	assert(global);
-	scene = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, global);
-	assert(scene);
-	return scene;
-}
-
-void gf_mse_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
-	if (!sg || !target) return;
-	*sg = mediasource_get_scenegraph(c);
-	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-		GF_HTML_MediaSource *ms = NULL;
-		ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-		*target = ms->evt_target;
-	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) {
-		GF_HTML_SourceBuffer *sb = NULL;
-		sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
-		*target = sb->evt_target;
-	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) {
-		GF_HTML_SourceBufferList *sbl = NULL;
-		sbl = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
-		*target = sbl->evt_target;
-	} else {
-		*target = NULL;
-		*sg = NULL;
-	}
-}
-
-static void mediasource_sourceBuffer_initjs(JSContext *c, JSObject *ms_obj, GF_HTML_SourceBuffer *sb)
-{
-	sb->_this = JS_NewObject(c, &html_media_rt->sourceBufferClass._class, 0, 0);
-	//gf_js_add_root(c, &sb->_this, GF_JSGC_OBJECT);
-	SMJS_SET_PRIVATE(c, sb->_this, sb);
-	sb->buffered->_this = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, sb->_this);
-	SMJS_SET_PRIVATE(c, sb->buffered->_this, sb->buffered);
-}
-
-#include <gpac/internal/terminal_dev.h>
-Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime);
-
-static JSBool SMJS_FUNCTION(mediasource_is_type_supported)
-{
-	SMJS_ARGS
-	GF_SceneGraph *sg;
-	GF_JSAPIParam par;
-	Bool isSupported = GF_TRUE;
-	char *mime;
-	if (!argc || !JSVAL_CHECK_STRING(argv[0])) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	mime = SMJS_CHARS(c, argv[0]);
-	sg = mediasource_get_scenegraph(c);
-	assert(sg);
-	if (!strlen(mime)) {
-		isSupported = GF_FALSE;
-	} else {
-		sg->script_action(sg->script_action_cbck, GF_JSAPI_OP_GET_TERM, NULL, &par);
-		isSupported = gf_term_is_type_supported((GF_Terminal *)par.term, mime);
-	}
-	SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(isSupported ? JS_TRUE : JS_FALSE));
-	SMJS_FREE(c, mime);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(mediasource_addSourceBuffer)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_HTML_SourceBuffer    *sb;
-	GF_HTML_MediaSource     *ms;
-	const char              *mime;
-	GF_Err					e;
-	u32						exception = 0;
-
-
-	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (!argc || !JSVAL_CHECK_STRING(argv[0]))
-	{
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	mime = SMJS_CHARS(c, argv[0]);
-	if (!strlen(mime))     {
-		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
-		goto exit;
-	}
-	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-	if (!ms) {
-		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
-		goto exit;
-	} else if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
-		exception = GF_DOM_EXC_INVALID_STATE_ERR;
-		goto exit;
-	}
-	assert(ms->service);
-	/*
-	if (gf_list_count(ms->sourceBuffers.list) > 0) {
-		dom_throw_exception(c, GF_DOM_EXC_QUOTA_EXCEEDED_ERR);
-		e = GF_BAD_PARAM;
-		goto exit;
-	}
-	*/
-	sb = gf_mse_source_buffer_new(ms);
-	assert(sb);
-	e = gf_mse_source_buffer_load_parser(sb, mime);
-	if (e == GF_OK) {
-		gf_mse_mediasource_add_source_buffer(ms, sb);
-		mediasource_sourceBuffer_initjs(c, obj, sb);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(sb->_this) );
-	} else {
-		gf_mse_source_buffer_del(sb);
-		exception = GF_DOM_EXC_NOT_SUPPORTED_ERR;
-	}
-exit:
-	if (mime) {
-		SMJS_FREE(c, (void *)mime);
-	}
-	if (exception) {
-		return dom_throw_exception(c, exception);
-	} else {
-		return JS_TRUE;
-	}
-}
-
-static JSBool SMJS_FUNCTION(mediasource_removeSourceBuffer)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_HTML_MediaSource *ms;
-	GF_HTML_SourceBuffer *sb;
-	JSObject *sb_obj;
-	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-	if (!ms) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	sb_obj = JSVAL_TO_OBJECT(argv[0]);
-	if (!GF_JS_InstanceOf(c, sb_obj, &html_media_rt->sourceBufferClass, NULL) ) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, sb_obj);
-	if (!sb) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	} else {
-		GF_Err e = gf_mse_remove_source_buffer(ms, sb);
-		if (e == GF_NOT_FOUND) {
-			return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
-		}
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(mediasource_endOfStream)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_HTML_MediaSource *ms;
-	u32 i;
-	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-	if (!ms) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-	}
-	for (i = 0; i < gf_list_count(ms->sourceBuffers.list); i++) {
-		GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
-		if (sb->updating) {
-			return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-		}
-	}
-	if (argc > 0)  {
-		char *error = NULL;
-		if (!JSVAL_CHECK_STRING(argv[0])) {
-			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-		}
-		error = SMJS_CHARS(c, argv[0]);
-		if (strcmp(error, "decode") && strcmp(error, "network")) {
-			SMJS_FREE(c, error);
-			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-		}
-		SMJS_FREE(c, error);
-	}
-	gf_mse_mediasource_end(ms);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(media_source_constructor)
-{
-	GF_HTML_MediaSource *p;
-	SMJS_OBJ_CONSTRUCTOR(&html_media_rt->mediaSourceClass)
-
-	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return JS_TRUE;
-
-	p = gf_mse_media_source_new();
-	p->c = c;
-	p->_this = obj;
-	SMJS_SET_PRIVATE(c, obj, p);
-
-	p->sourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, p->sourceBuffers._this, &p->sourceBuffers);
-
-	p->activeSourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, p->activeSourceBuffers._this, &p->activeSourceBuffers);
-
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static DECL_FINALIZE(media_source_finalize)
-
-GF_HTML_MediaSource *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return;
-p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-gf_mse_mediasource_del(p, GF_TRUE);
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_source_buffers)
-GF_HTML_MediaSource *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-if (!p) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-} else {
-	*vp = OBJECT_TO_JSVAL(p->sourceBuffers._this);
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_active_source_buffers)
-GF_HTML_MediaSource *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-	return JS_TRUE;
-}
-p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-if (p) {
-	*vp = OBJECT_TO_JSVAL(p->activeSourceBuffers._this);
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_ready_state)
-GF_HTML_MediaSource *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-if (!p) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-} else {
-	switch (p->readyState)
-	{
-	case MEDIA_SOURCE_READYSTATE_CLOSED:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "closed"));
-		break;
-	case MEDIA_SOURCE_READYSTATE_OPEN:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "open"));
-		break;
-	case MEDIA_SOURCE_READYSTATE_ENDED:
-		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "ended"));
-		break;
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_duration)
-GF_HTML_MediaSource *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-	return JS_TRUE;
-}
-p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-if (p) {
-	if (p->readyState == MEDIA_SOURCE_READYSTATE_CLOSED || p->durationType == DURATION_NAN) {
-		*vp = JS_GetNaNValue(c);
-	} else if (p->durationType == DURATION_INFINITY) {
-		*vp = JS_GetPositiveInfinityValue(c);
-	} else {
-		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, p->duration));
-	}
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(media_source_set_duration)
-GF_HTML_MediaSource *ms;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-if (!ms) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-} else {
-	if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-	} else if (!JSVAL_IS_NUMBER(*vp)) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	} else {
-		u32 i, count;
-		count = gf_list_count(ms->sourceBuffers.list);
-		for (i = 0; i < count; i++) {
-			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
-			if (sb->updating) {
-				return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-			}
-		}
-		{
-			jsdouble durationValue;
-			JS_ValueToNumber(c, *vp, &durationValue);
-			if (durationValue < 0) {
-				return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-			} else {
-				ms->duration = durationValue;
-				ms->durationType = DURATION_VALUE;
-				/* TODO: call the run duration algorithm */
-			}
-		}
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( sourcebufferlist_getProperty)
-GF_HTML_SourceBufferList *p;
-u32 count;
-s32 idx;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) )
-{
-	return JS_TRUE;
-}
-p = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
-if (p) {
-	count = gf_list_count(p->list);
-	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-	switch (SMJS_ID_TO_INT(id)) {
-	case HTML_SOURCEBUFFERLIST_PROP_LENGTH:
-		*vp = INT_TO_JSVAL(count);
-		break;
-	default:
-		idx = SMJS_ID_TO_INT(id);
-		if ((idx<0) || ((u32) idx>=count)) {
-			*vp = JSVAL_VOID;
-			return JS_TRUE;
-		} else {
-			GF_HTML_SourceBuffer *sb;
-			sb = (GF_HTML_SourceBuffer *)gf_list_get(p->list, idx);
-			*vp = OBJECT_TO_JSVAL(sb->_this);
-			return JS_TRUE;
-		}
-
-	}
-}
-return JS_TRUE;
-
-}
-
-
-#define SB_BASIC_CHECK \
-    GF_HTML_SourceBuffer *sb; \
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) )  \
-    { \
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
-    }\
-    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);\
-    if (!sb)\
-    {\
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
-    }
-
-#define SB_UPDATING_CHECK \
-    SB_BASIC_CHECK \
-    /* check if this source buffer is still in the list of source buffers */\
-    if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0)\
-    {\
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
-    } \
-    if (sb->updating)\
-    {\
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
-    }
-
-/* FIXME : Function not used, generates warning on debian
-static DECL_FINALIZE(sourcebuffer_finalize)
-
-    GF_HTML_SourceBuffer *sb;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return;
-    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
-    if (sb) {
-         TODO delete lists, remove functions
-        gf_free(sb);
-    }
-}
-*/
-
-static JSBool SMJS_FUNCTION(sourcebuffer_appendBuffer)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_HTML_ArrayBuffer  *ab;
-	JSObject             *js_ab;
-
-	SB_UPDATING_CHECK
-	if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_CLOSED) {
-		return JS_TRUE;
-	} else if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
-		gf_mse_mediasource_open(sb->mediasource, NULL);
-	}
-
-	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	js_ab = JSVAL_TO_OBJECT(argv[0]);
-	if (!GF_JS_InstanceOf(c, js_ab, &html_media_rt->arrayBufferClass, NULL) )
-	{
-		return dom_throw_exception(c, GF_DOM_EXC_TYPE_MISMATCH_ERR);
-	}
-	ab = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, js_ab);
-	if (!ab->length)
-	{
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	/* TODO: handle buffer full flag case */
-	/* TODO: run the coded frame eviction algo */
-	gf_mse_source_buffer_append_arraybuffer(sb, ab);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(sourcebuffer_appendStream)
-{
-	SMJS_OBJ
-	SB_UPDATING_CHECK
-	/* TODO */
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(sourcebuffer_abort)
-{
-	SMJS_OBJ
-	SB_BASIC_CHECK
-	if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-	}
-	if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-	}
-	if (gf_mse_source_buffer_abort(sb) != GF_OK) {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(sourcebuffer_remove)
-{
-	SMJS_OBJ
-	SMJS_ARGS
-	jsdouble start, end;
-	SB_UPDATING_CHECK
-	if (argc < 2 || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	JS_ValueToNumber(c, argv[0], &start);
-	JS_ValueToNumber(c, argv[1], &end);
-	if (start < 0 /* || start > sb->duration */ || start >= end) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
-		gf_mse_mediasource_open(sb->mediasource, NULL);
-	}
-	gf_mse_remove(sb, start, end);
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_mode)
-SB_BASIC_CHECK
-if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEGMENTS) {
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "segments"));
-} else if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
-	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "sequence"));
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_mode)
-char *smode = NULL;
-GF_HTML_MediaSource_AppendMode mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
-SB_BASIC_CHECK
-if (!JSVAL_CHECK_STRING(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-smode = SMJS_CHARS(c, *vp);
-if (stricmp(smode, "segments") && stricmp(smode, "sequence")) {
-	SMJS_FREE(c, smode);
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-if (!stricmp(smode, "segments")) {
-	mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
-} else if (!stricmp(smode, "sequence")) {
-	mode = MEDIA_SOURCE_APPEND_MODE_SEQUENCE;
-}
-SMJS_FREE(c, smode);
-if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-}
-if (sb->updating) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-}
-if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
-	gf_mse_mediasource_open(sb->mediasource, NULL);
-}
-if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-}
-sb->append_mode = mode;
-if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
-	sb->group_start_timestamp_flag = GF_TRUE;
-	sb->group_start_timestamp = sb->group_end_timestamp;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_updating)
-SB_BASIC_CHECK
-*vp = BOOLEAN_TO_JSVAL(sb->updating ? JS_TRUE : JS_FALSE);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_timestampOffset)
-SB_BASIC_CHECK
-*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->timestampOffset*1.0/sb->timescale));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_timestampOffset)
-jsdouble d;
-SB_UPDATING_CHECK
-if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
-	gf_mse_mediasource_open(sb->mediasource, NULL);
-}
-if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-gf_mse_source_buffer_set_timestampOffset(sb, d);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_timescale)
-SB_BASIC_CHECK
-*vp = INT_TO_JSVAL(sb->timescale);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_timescale)
-SB_BASIC_CHECK
-gf_mse_source_buffer_set_timescale(sb, JSVAL_TO_INT(*vp));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowStart)
-SB_BASIC_CHECK
-*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowStart));
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowStart)
-jsdouble d;
-SB_UPDATING_CHECK
-if (!JSVAL_IS_NUMBER(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-if (d < 0 || d >= sb->appendWindowEnd) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-sb->appendWindowStart = d;
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowEnd)
-SB_BASIC_CHECK
-if (sb->appendWindowEnd == GF_MAX_DOUBLE) {
-	*vp = JS_GetPositiveInfinityValue(c);
-} else {
-	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowEnd));
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowEnd)
-jsdouble d;
-SB_UPDATING_CHECK
-if (!JSVAL_IS_NUMBER(*vp)) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-JS_ValueToNumber(c, *vp, &d);
-if (d <= sb->appendWindowStart) {
-	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-}
-sb->appendWindowEnd = d;
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_buffered)
-SB_BASIC_CHECK
-gf_mse_source_buffer_update_buffered(sb);
-*vp = OBJECT_TO_JSVAL(sb->buffered->_this);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_tracks)
-SB_BASIC_CHECK
-/* TODO */
-return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(html_url_createObjectURL)
-{
-	SMJS_ARGS
-	JSObject    *js_ms;
-	GF_HTML_MediaSource *ms;
-	char        blobURI[256];
-
-	SMJS_SET_RVAL(JSVAL_NULL);
-	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
-		return JS_TRUE;
-	}
-	js_ms = JSVAL_TO_OBJECT(argv[0]);
-	if (!GF_JS_InstanceOf(c, js_ms, &html_media_rt->mediaSourceClass, NULL) )
-	{
-		return JS_TRUE;
-	}
-	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, js_ms);
-	sprintf(blobURI, "blob:%p", ms);
-	ms->blobURI = gf_strdup(blobURI);
-	SMJS_SET_RVAL(STRING_TO_JSVAL( JS_NewStringCopyZ(c, blobURI)));
-	return JS_TRUE;
-}
-
-GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length)
-{
-	GF_HTML_ArrayBuffer *ab = NULL;
-	GF_SAFEALLOC(ab, GF_HTML_ArrayBuffer);
-	if (!ab) return NULL;
-	
-	if (length > 0) {
-		ab->data = data;
-		ab->length = length;
-	}
-	ab->reference_count = 0;
-	return ab;
-}
-
-JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent)
-{
-	JSObject *obj;
-	GF_HTML_ArrayBuffer *p;
-	if (!data) return NULL;
-	p = gf_arraybuffer_new(data, length);
-	obj = JS_NewObject(c, &html_media_rt->arrayBufferClass._class, NULL, parent);
-	if (!parent) {
-		p->reference_count = 0;
-	}
-	SMJS_SET_PRIVATE(c, obj, p);
-	p->c = c;
-	p->_this = obj;
-	return obj;
-}
-
-void xhr_del_array_buffer(void *udta);
-
-void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js)
-{
-	if (buffer) {
-		if (del_js && buffer->_this) {
-			/*if we have a JS object, make sure the parent XHR doesn't point to us ...*/
-			JSObject *xhro = JS_GetParent(buffer->c, buffer->_this);
-			if (xhro) {
-				void *xhr_ctx = SMJS_GET_PRIVATE(buffer->c, xhro);
-				xhr_del_array_buffer(xhr_ctx);
-			}
-
-			/* finalize the object from the JS perspective */
-			buffer->c = NULL;
-			buffer->_this = NULL;
-		}
-		/* but only delete if the data is not used elsewhere */
-		if(!del_js && buffer->reference_count) {
-			buffer->reference_count--;
-		}
-		if (!buffer->reference_count && !buffer->_this) {
-			gf_free(buffer->data);
-			if (buffer->url) gf_free(buffer->url);
-			gf_free(buffer);
-		}
-	}
-}
-
-static JSBool SMJS_FUNCTION(arraybuffer_constructor)
-{
-	SMJS_ARGS
-	u32 length = 0;
-	SMJS_OBJ_CONSTRUCTOR(&html_media_rt->arrayBufferClass)
-
-	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL))
-	{
-		return JS_TRUE;
-	}
-	if (argc && !JSVAL_IS_NULL(argv[0]) && JSVAL_IS_INT(argv[0])) {
-		length = JSVAL_TO_INT(argv[0]);
-	}
-	if (length > 0) {
-		gf_arraybuffer_js_new(c, (char *)gf_malloc(length), length, NULL);
-	}
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(arraybuffer_get_byteLength)
-GF_HTML_ArrayBuffer *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) {
-	return JS_TRUE;
-}
-p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
-if (p) {
-	*vp = INT_TO_JSVAL(p->length);
-}
-return JS_TRUE;
-}
-
-static DECL_FINALIZE(arraybuffer_finalize)
-
-GF_HTML_ArrayBuffer *p;
-if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) return;
-p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
-if (!p) return;
-gf_arraybuffer_del(p, GF_TRUE);
-}
-
-static JSBool SMJS_FUNCTION(mse_event_add_listener)
-{
-	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
-	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
-}
-
-static JSBool SMJS_FUNCTION(mse_event_remove_listener)
-{
-	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
-	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
-}
-
-static JSBool SMJS_FUNCTION(mse_event_dispatch)
-{
-	/* TODO */
-	return JS_TRUE;
-}
-
-void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *_html_media_rt)
-{
-	/* HTML Media Element */
-	if (_html_media_rt) {
-		html_media_rt = _html_media_rt;
-
-		JS_SETUP_CLASS(html_media_rt->arrayBufferClass, "ArrayBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, arraybuffer_finalize);
-		{
-			JSPropertySpec arrayBufferClassProps[] = {
-				{"byteLength",       -1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, arraybuffer_get_byteLength, 0},
-				{0, 0, 0, 0, 0}
-			};
-			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->arrayBufferClass, arraybuffer_constructor, 0, arrayBufferClassProps, 0, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] ArrayBuffer class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->mediaSourceClass, "MediaSource", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, media_source_finalize);
-		{
-			JSPropertySpec htmlMediaSourceClassProps[] = {
-				{"sourceBuffers",       HTML_MEDIASOURCE_PROP_SOURCEBUFFERS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_source_buffers, 0},
-				{"activeSourceBuffers", HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_active_source_buffers, 0},
-				{"readyState",          HTML_MEDIASOURCE_PROP_READYSTATE,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_ready_state, 0},
-				{"duration",            HTML_MEDIASOURCE_PROP_DURATION,            JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, media_source_get_duration, media_source_set_duration},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec htmlMediaSourceClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("addSourceBuffer", mediasource_addSourceBuffer, 1),
-				SMJS_FUNCTION_SPEC("removeSourceBuffer", mediasource_removeSourceBuffer, 1),
-				SMJS_FUNCTION_SPEC("endOfStream", mediasource_endOfStream, 1),
-				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_remove_listener, 3),
-				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_dispatch, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			JSFunctionSpec htmlMediaSourceClassStaticFuncs[] = {
-				SMJS_FUNCTION_SPEC("isTypeSupported", mediasource_is_type_supported, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->mediaSourceClass, media_source_constructor, 0, htmlMediaSourceClassProps, htmlMediaSourceClassFuncs, 0, htmlMediaSourceClassStaticFuncs);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] MediaSource class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->sourceBufferClass, "SourceBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
-		{
-			JSPropertySpec SourceBufferClassProps[] = {
-				{"mode",			  HTML_SOURCEBUFFER_PROP_MODE,             JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_mode, sourceBuffer_set_mode},
-				{"updating",          HTML_SOURCEBUFFER_PROP_UPDATING,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_updating, 0},
-				{"buffered",          HTML_SOURCEBUFFER_PROP_BUFFERED,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_buffered, 0},
-				{"timestampOffset",   HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timestampOffset, sourceBuffer_set_timestampOffset},
-				{"timescale",         HTML_SOURCEBUFFER_PROP_TIMESCALE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timescale, sourceBuffer_set_timescale},
-				{"appendWindowStart", HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowStart, sourceBuffer_set_appendWindowStart},
-				{"appendWindowEnd",   HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowEnd, sourceBuffer_set_appendWindowEnd},
-				{"audioTracks",       HTML_SOURCEBUFFER_PROP_AUDIOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
-				{"videoTracks",       HTML_SOURCEBUFFER_PROP_VIDEOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
-				{"textTracks",        HTML_SOURCEBUFFER_PROP_TEXTTRACKS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec SourceBufferClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("appendBuffer", sourcebuffer_appendBuffer, 1),
-				SMJS_FUNCTION_SPEC("appendStream", sourcebuffer_appendStream, 1),
-				SMJS_FUNCTION_SPEC("abort",  sourcebuffer_abort, 0),
-				SMJS_FUNCTION_SPEC("remove", sourcebuffer_remove, 2),
-				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferClass, 0, 0, SourceBufferClassProps, SourceBufferClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBuffer class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->sourceBufferListClass, "SourceBufferList", JSCLASS_HAS_PRIVATE, sourcebufferlist_getProperty, JS_PropertyStub_forSetter, JS_PropertyStub);
-		{
-			JSPropertySpec SourceBufferListClassProps[] = {
-				{"length",        HTML_SOURCEBUFFERLIST_PROP_LENGTH,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec SourceBufferListClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
-				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferListClass, 0, 0, SourceBufferListClassProps, SourceBufferListClassFuncs, 0, 0);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBufferList class initialized\n"));
-		}
-
-		JS_SETUP_CLASS(html_media_rt->URLClass, "URL", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
-		{
-			JSPropertySpec URLClassProps[] = {
-				{0, 0, 0, 0, 0}
-			};
-			JSFunctionSpec URLClassFuncs[] = {
-				SMJS_FUNCTION_SPEC("createObjectURL", html_url_createObjectURL, 1),
-				SMJS_FUNCTION_SPEC(0, 0, 0)
-			};
-			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->URLClass, 0, 0, URLClassProps, 0, 0, URLClassFuncs);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] URL class initialized\n"));
-		}
-	}
-}
-
-
-#endif  /*GPAC_HAS_SPIDERMONKEY*/
-
-#endif  /*GPAC_DISABLE_SVG*/

gpac-0.8.0.tar.gz/src/scenegraph/svg_smjs.c Deleted

@@ -1,2986 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
-
-#ifndef GPAC_DISABLE_SVG
-#include <gpac/events.h>
-#include <gpac/nodes_svg.h>
-
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif
-#endif
-
-#include <gpac/internal/smjs_api.h>
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script);
-
-
-jsval dom_element_construct(JSContext *c, GF_Node *n);
-#ifdef USE_FFDEV_15
-void dom_element_finalize(JSFreeOp *fop, JSObject *obj);
-void dom_document_finalize(JSFreeOp *fop, JSObject *obj);
-#else
-void dom_element_finalize(JSContext *c, JSObject *obj);
-void dom_document_finalize(JSContext *c, JSObject *obj);
-#endif
-
-GF_Node *dom_get_element(JSContext *c, JSObject *obj);
-GF_SceneGraph *dom_get_doc(JSContext *c, JSObject *obj);
-
-void dom_node_changed(GF_Node *n, Bool child_modif, GF_FieldInfo *info);
-
-JSBool dom_event_add_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-JSBool dom_event_remove_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-char *js_get_utf8(jsval val);
-
-void dom_node_set_textContent(GF_Node *n, char *text);
-
-jsval dom_node_get_sibling(JSContext *c, GF_Node *n, Bool is_prev, Bool elt_only);
-
-void html_media_init_js_api(GF_SceneGraph *scene);
-
-#define _ScriptMessage(_sg, _msg) {\
-			GF_JSAPIParam par;	\
-			par.info.e = GF_SCRIPT_INFO;			\
-			par.info.msg = _msg;		\
-			_sg->script_action(_sg->script_action_cbck, GF_JSAPI_OP_MESSAGE, NULL, &par);\
-		}
-
-static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
-{
-	if (scene->script_action)
-		return scene->script_action(scene->script_action_cbck, type, node, param);
-	return GF_FALSE;
-}
-
-typedef struct
-{
-	u32 nb_inst;
-	/*SVG uDOM classes*/
-	GF_JSClass svgElement;
-	GF_JSClass svgDocument;
-	GF_JSClass globalClass;
-	GF_JSClass connectionClass;
-	GF_JSClass rgbClass;
-	GF_JSClass rectClass;
-	GF_JSClass pointClass;
-	GF_JSClass pathClass;
-	GF_JSClass matrixClass;
-
-	GF_JSClass consoleClass;
-} GF_SVGuDOM;
-static GF_SVGuDOM *svg_rt = NULL;
-
-static JSObject *svg_new_path_object(JSContext *c, SVG_PathData *d);
-
-
-
-/*note we are using float to avoid conversions fixed to/from JS native */
-typedef struct
-{
-	u32 r, g, b;
-} rgbCI;
-
-
-typedef struct
-{
-	Float x, y, w, h;
-	/*if set, this is the svg.viewport uDOM object, its values are updated upon query*/
-	GF_SceneGraph *sg;
-} rectCI;
-
-typedef struct
-{
-	Float x, y;
-	/*if set, this is the svg.currentTranslate uDOM object, its values are updated upon query*/
-	GF_SceneGraph *sg;
-} pointCI;
-
-typedef struct
-{
-	Float x, y;
-} ptCI;
-
-typedef struct
-{
-	u32 nb_coms;
-	u8 *tags;
-	ptCI *pts;
-} pathCI;
-
-static JSBool SMJS_FUNCTION(svg_nav_to_location)
-{
-	GF_JSAPIParam par;
-	GF_SceneGraph *sg;
-	SMJS_OBJ
-	SMJS_ARGS
-	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL)) return JS_TRUE;
-	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
-	par.uri.url = SMJS_CHARS(c, argv[0]);
-	par.uri.nb_params = 0;
-	ScriptAction(sg, GF_JSAPI_OP_LOAD_URL, sg->RootNode, &par);
-	SMJS_FREE(c, par.uri.url);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_parse_xml)
-{
-	GF_SceneGraph *sg;
-	JSObject *doc_obj;
-	GF_Node *node;
-	char *str;
-	SMJS_ARGS
-	GF_Node *gf_sm_load_svg_from_string(GF_SceneGraph *sg, char *svg_str);
-
-	doc_obj = JSVAL_TO_OBJECT(argv[1]);
-	if (!doc_obj) {
-		dom_throw_exception(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
-		return JS_FALSE;
-	}
-
-	str = js_get_utf8(argv[0]);
-	if (!str) return JS_TRUE;
-	sg = dom_get_doc(c, doc_obj);
-
-	node = gf_sm_load_svg_from_string(sg, str);
-	gf_free(str);
-	SMJS_SET_RVAL( dom_element_construct(c, node) );
-	return JS_TRUE;
-}
-
-static void svg_script_error(JSContext *c, const char *msg, JSErrorReport *jserr)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] %s in file %s:%d (%s)\n", msg, jserr->filename, jserr->lineno+1, jserr->linebuf));
-}
-
-static JSBool SMJS_FUNCTION(svg_echo)
-{
-	GF_SceneGraph *sg;
-	SMJS_OBJ
-	SMJS_ARGS
-	if ((argc!=1) || (!GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL) && !GF_JS_InstanceOf(c, obj, &svg_rt->consoleClass, NULL))) return JS_TRUE;
-	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
-	if (!sg) return JS_TRUE;
-
-	{
-		char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
-		_ScriptMessage(sg, str);
-		SMJS_FREE(c, str);
-	}
-	return JS_TRUE;
-}
-
-static void svg_define_udom_exception(JSContext *c, JSObject *global)
-{
-	JSObject *obj = JS_DefineObject(c, global, "GlobalException", NULL, 0, 0);
-	JS_DefineProperty(c, obj, "NOT_CONNECTED_ERR", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "ENCODING_ERR", INT_TO_JSVAL(2), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "DENIED_ERR", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "UNKNOWN_ERR", INT_TO_JSVAL(4), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	obj = JS_DefineObject(c, global, "SVGException", NULL, 0, 0);
-	JS_DefineProperty(c, obj, "SVG_WRONG_TYPE_ERR", INT_TO_JSVAL(0), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "SVG_INVALID_VALUE_ERR", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "SVG_MATRIX_NOT_INVERTABLE", INT_TO_JSVAL(2), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	obj = JS_DefineObject(c, global, "SVGSVGElement", NULL, 0, 0);
-	JS_DefineProperty(c, obj, "NAV_AUTO", INT_TO_JSVAL(1), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_NEXT", INT_TO_JSVAL(2), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_PREV", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_UP",		INT_TO_JSVAL(4), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_UP_RIGHT", INT_TO_JSVAL(5), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_RIGHT", INT_TO_JSVAL(6), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_DOWN_RIGHT", INT_TO_JSVAL(7), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_DOWN", INT_TO_JSVAL(8), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_DOWN_LEFT", INT_TO_JSVAL(9), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_LEFT", INT_TO_JSVAL(10), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-	JS_DefineProperty(c, obj, "NAV_UP_LEFT", INT_TO_JSVAL(11), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-}
-
-static SMJS_FUNC_PROP_GET( global_getProperty)
-
-GF_SceneGraph *sg;
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL) )
-	return JS_TRUE;
-
-sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	/*namespaceURI*/
-	case 0:
-		return JS_TRUE;
-	/*parent*/
-	case 1:
-		*vp = JSVAL_VOID;
-		if (sg->parent_scene && sg->parent_scene->svg_js) *vp = OBJECT_TO_JSVAL(sg->parent_scene->svg_js->global);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-/*TODO - try to be more precise...*/
-static JSBool SMJS_FUNCTION(dom_imp_has_feature)
-{
-	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
-	if (argc) {
-		u32 len;
-		char sep;
-		SMJS_ARGS
-		char *fname = SMJS_CHARS(c, argv[0]);
-		if (!fname) return JS_TRUE;
-		while (strchr(" \t\n\r", fname[0])) fname++;
-		len = (u32) strlen(fname);
-		while (len && strchr(" \t\n\r", fname[len-1])) len--;
-		sep = fname[len];
-		fname[len] = 0;
-		if (!stricmp(fname, "xml")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "core")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "traversal")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "uievents")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "mouseevents")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "mutationevents")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-		else if (!stricmp(fname, "events")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
-
-		fname[len] = sep;
-		SMJS_FREE(c, fname);
-	}
-	return JS_TRUE;
-}
-
-static GF_Node *get_corresponding_use(GF_Node *n)
-{
-	GF_Node *t;
-	u32 i, count;
-	if (!n || !n->sgprivate->scenegraph->use_stack) return NULL;
-
-	/*find current node in the use stack - if found, return the use element*/
-	count = gf_list_count(n->sgprivate->scenegraph->use_stack);
-	for (i=count; i>0; i-=2) {
-		t = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-2);
-		if (t==n) {
-			GF_Node *use = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-1);
-			GF_Node *par_use = get_corresponding_use(use);
-			return par_use ? par_use : use;
-		}
-	}
-	/*otherwise recursively get up the tree*/
-	return get_corresponding_use(gf_node_get_parent(n, 0));
-}
-static SMJS_FUNC_PROP_GET( svg_doc_getProperty)
-
-u32 prop_id;
-GF_SceneGraph *sg = dom_get_doc(c, obj);
-if (!sg) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-switch (prop_id) {
-case 0:/*global*/
-	*vp = OBJECT_TO_JSVAL( JS_GetGlobalObject(c) );
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(svg_element_getProperty)
-
-u32 prop_id;
-GF_JSAPIParam par;
-JSString *s;
-GF_Node *n = dom_get_element(c, obj);
-if (!n) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case 0: /*id*/
-{
-	const char *node_name = gf_node_get_name((GF_Node*)n);
-	if (node_name) {
-		s = JS_NewStringCopyZ(c, node_name);
-		*vp = STRING_TO_JSVAL( s );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-case 5:/*currentScale*/
-	if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_SCALE, (GF_Node *)n, &par)) {
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(par.val) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-case 6:/*currentRotate*/
-	if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_ROTATION, (GF_Node *)n, &par)) {
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT(par.val) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-case 7:/*currentTranslate*/
-	if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSLATE, (GF_Node *)n, &par)) {
-		JSObject *r = JS_NewObject(c, &svg_rt->pointClass._class, 0, 0);
-		pointCI *rc = (pointCI *)gf_malloc(sizeof(pointCI));
-		rc->x = FIX2FLT(par.pt.x);
-		rc->y = FIX2FLT(par.pt.y);
-		rc->sg = n->sgprivate->scenegraph;
-		SMJS_SET_PRIVATE(c, r, rc);
-		*vp = OBJECT_TO_JSVAL(r);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-case 8:/*viewport*/
-	if (n->sgprivate->tag!=TAG_SVG_svg) return JS_TRUE;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_VIEWPORT, (GF_Node *)n, &par)) {
-		JSObject *r = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-		rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
-		rc->x = FIX2FLT(par.rc.x);
-		rc->y = FIX2FLT(par.rc.y);
-		rc->w = FIX2FLT(par.rc.width);
-		rc->h = FIX2FLT(par.rc.height);
-		rc->sg = n->sgprivate->scenegraph;
-		SMJS_SET_PRIVATE(c, r, rc);
-		*vp = OBJECT_TO_JSVAL(r);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-case 9:/*currentTime*/
-	*vp = JS_MAKE_DOUBLE(c, gf_node_get_scene_time((GF_Node *)n) );
-	return JS_TRUE;
-case 10:/*isPaused*/
-	*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
-	return JS_TRUE;
-case 11:/*ownerSVGElement*/
-	while (1) {
-		GF_Node *par = gf_node_get_parent(n, 0);
-		if (!par) return JS_TRUE;
-		if (par->sgprivate->tag==TAG_SVG_svg) {
-			*vp = dom_element_construct(c, par);
-			return JS_TRUE;
-		}
-		n = par;
-	}
-	return JS_TRUE;
-case 12:/*correspondingElement*/
-	/*if we can find a corresponding element for this node, then this is an SVGElementInstance*/
-	if (get_corresponding_use(n)) {
-		*vp = dom_element_construct(c, n);
-	} else {
-		*vp = dom_element_construct(c, NULL);
-	}
-	return JS_TRUE;
-case 13:/*correspondingUseElement*/
-	*vp = dom_element_construct(c, get_corresponding_use(n));
-	return JS_TRUE;
-default:
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET( svg_element_setProperty)
-
-GF_JSAPIParam par;
-jsdouble d;
-u32 prop_id;
-GF_Node *n = dom_get_element(c, obj);
-if (!n) return JS_TRUE;
-
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-prop_id = SMJS_ID_TO_INT(id);
-
-switch (prop_id) {
-case 0:/*id*/
-	if (JSVAL_CHECK_STRING(*vp)) {
-		char *id = SMJS_CHARS(c, *vp);
-		if (id) {
-			GF_FieldInfo info;
-			u32 nid = gf_node_get_id(n);
-			if (!nid) nid = gf_sg_get_next_available_node_id(n->sgprivate->scenegraph);
-			gf_node_set_id(n, nid, id);
-			if (gf_node_get_attribute_by_tag(n, TAG_XML_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-				if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
-				*(DOM_String *)info.far_ptr = gf_strdup(id);
-			}
-			if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
-				if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
-				*(DOM_String *)info.far_ptr = gf_strdup(id);
-			}
-			SMJS_FREE(c, id);
-		}
-	}
-	return JS_TRUE;
-	/*currentScale*/
-case 5:
-	if (!JSVAL_IS_NUMBER(*vp) || (n->sgprivate->tag!=TAG_SVG_svg)) return JS_TRUE;
-	JS_ValueToNumber(c, *vp, &d);
-	par.val = FLT2FIX(d);
-	if (!par.val) {
-		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-	}
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_SCALE, (GF_Node *)n, &par)) {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-	/*currentRotate*/
-case 6:
-	if (!JSVAL_IS_NUMBER(*vp) || (n->sgprivate->tag!=TAG_SVG_svg)) return JS_TRUE;
-	JS_ValueToNumber(c, *vp, &d);
-	par.val = FLT2FIX(d);
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_ROTATION, (GF_Node *)n, &par)) {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-	/*currentTime*/
-case 9:
-	if (!JSVAL_IS_NUMBER(*vp) || (n->sgprivate->tag!=TAG_SVG_svg)) return JS_TRUE;
-	JS_ValueToNumber(c, *vp, &d);
-	par.time = d;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par)) {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-default:
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-
-static GF_Node *svg_udom_smil_check_instance(JSContext *c, JSObject *obj)
-{
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return NULL;
-	switch (n->sgprivate->tag) {
-	case TAG_SVG_animate:
-	case TAG_SVG_animateColor:
-	case TAG_SVG_animateMotion:
-	case TAG_SVG_animateTransform:
-	case TAG_SVG_animation:
-	case TAG_SVG_audio:
-	case TAG_SVG_video:
-	case TAG_SVG_set:
-	case TAG_LSR_updates:
-	/*not sure about this one...*/
-	case TAG_SVG_discard:
-		return n;
-	}
-	return NULL;
-}
-
-
-/*TODO*/
-JSBool SMJS_FUNCTION_EXT(svg_udom_smil_time_insert, Bool is_end)
-{
-	GF_FieldInfo info;
-	u32 i, count;
-	Double offset;
-	GF_List *times;
-	SMIL_Time *newtime;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = svg_udom_smil_check_instance(c, obj);
-	if (!n) return JS_TRUE;
-
-
-	if (is_end) {
-		info.far_ptr = ((SVGTimedAnimBaseElement *)n)->timingp->end;
-	} else {
-		info.far_ptr = ((SVGTimedAnimBaseElement *)n)->timingp->begin;
-	}
-	if (!info.far_ptr) {
-		return JS_FALSE;
-	}
-
-
-	times = *((GF_List **)info.far_ptr);
-	GF_SAFEALLOC(newtime, SMIL_Time);
-	if (!newtime) {
-		dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-		return JS_FALSE;
-	}
-	newtime->type = GF_SMIL_TIME_EVENT_RESOLVED;
-
-	offset = 0;
-	if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
-		jsdouble d;
-		JS_ValueToNumber(c, argv[0], &d);
-		offset = d;
-	}
-	newtime->clock = gf_node_get_scene_time(n) + offset;
-
-	/*insert in sorted order*/
-	count = gf_list_count(times);
-	for (i=0; i<count; i++) {
-		SMIL_Time*t = (SMIL_Time*)gf_list_get(times, i);
-		if ( GF_SMIL_TIME_IS_CLOCK(t->type) ) {
-			if (t->clock > newtime->clock) break;
-		} else {
-			break;
-		}
-	}
-	gf_list_insert(times, newtime, i);
-
-	info.fieldType = SMIL_Times_datatype;
-	gf_node_changed(n, &info);
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_smil_begin)
-{
-	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, GF_FALSE);
-}
-
-JSBool SMJS_FUNCTION(svg_udom_smil_end)
-{
-	return svg_udom_smil_time_insert(SMJS_CALL_ARGS, GF_TRUE);
-}
-
-/*TODO*/
-JSBool SMJS_FUNCTION(svg_udom_smil_pause)
-{
-	u32 tag;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-
-	tag = gf_node_get_tag(n);
-	if (gf_svg_is_animation_tag(tag)) {
-		/* pausing an animation element (set, animate ...) should pause the main time line ? */
-		gf_smil_timing_pause(n);
-	} else if (gf_svg_is_timing_tag(tag)) {
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_PAUSE_SVG, n, NULL);
-	} else if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_PAUSE_SVG, n, NULL);
-	} else {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-/*TODO*/
-JSBool SMJS_FUNCTION(svg_udom_smil_resume)
-{
-	u32 tag;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-
-	tag = gf_node_get_tag(n);
-	if (gf_svg_is_animation_tag(tag)) {
-		/* resuming an animation element (set, animate ...) should resume the main time line ? */
-		gf_smil_timing_resume(n);
-	} else if (gf_svg_is_timing_tag(tag)) {
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESUME_SVG, n, NULL);
-	} else if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESUME_SVG, n, NULL);
-	} else {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_smil_restart)
-{
-	u32 tag;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-
-	tag = gf_node_get_tag(n);
-	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESTART_SVG, n, NULL);
-	} else {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_smil_set_speed)
-{
-	u32 tag;
-	Double speed = 1.0;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-
-	if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
-		jsdouble d;
-		JS_ValueToNumber(c, argv[0], &d);
-		speed = d;
-	}
-
-	tag = gf_node_get_tag(n);
-	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
-		GF_JSAPIParam par;
-		memset(&par, 0, sizeof(GF_JSAPIParam));
-		par.val = FLT2FIX(speed);
-		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_SCENE_SPEED, n, &par);
-	} else {
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_get_trait)
-{
-	char *attValue, *ns, *name;
-	GF_Err e;
-	GF_FieldInfo info;
-	SMJS_ARGS
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	ns = name = NULL;
-	if (! JSVAL_CHECK_STRING(argv[0]) ) return JS_TRUE;
-	if (argc==2) {
-		ns = SMJS_CHARS(c, argv[0]);
-		name = SMJS_CHARS(c, argv[1]);
-	} else if (argc==1) {
-		name = SMJS_CHARS(c, argv[0]);
-	} else return JS_TRUE;
-
-	if (!name) {
-		SMJS_FREE(c, ns);
-		return JS_TRUE;
-	}
-	if (!strcmp(name, "#text")) {
-		char *res = gf_dom_flatten_textContent(n);
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, res) ) );
-		gf_free(res);
-		SMJS_FREE(c, ns);
-		SMJS_FREE(c, name);
-		return JS_TRUE;
-	}
-	e = gf_node_get_field_by_name(n, name, &info);
-
-	SMJS_FREE(c, ns);
-	SMJS_FREE(c, name);
-
-	if (e!=GF_OK) return JS_TRUE;
-	SMJS_SET_RVAL( JSVAL_VOID );
-
-	switch (info.fieldType) {
-	/* inheritable floats */
-	case SVG_FontSize_datatype:
-	case SVG_Color_datatype:
-	case SVG_Paint_datatype:
-	/* inheritable float and unit */
-	case SVG_Length_datatype:
-	case SVG_Coordinate_datatype:
-	/*Number*/
-	case SVG_Number_datatype:
-
-	/*all string traits*/
-	case SVG_Boolean_datatype:
-	case SVG_FillRule_datatype:
-	case SVG_StrokeLineJoin_datatype:
-	case SVG_StrokeLineCap_datatype:
-	case SVG_FontStyle_datatype:
-	case SVG_FontWeight_datatype:
-	case SVG_FontVariant_datatype:
-	case SVG_TextAnchor_datatype:
-	case SVG_Display_datatype:
-	case SVG_Visibility_datatype:
-	case SVG_GradientUnit_datatype:
-	case SVG_PreserveAspectRatio_datatype:
-	case XML_Space_datatype:
-	case XMLEV_Propagate_datatype:
-	case XMLEV_DefaultAction_datatype:
-	case XMLEV_Phase_datatype:
-	case SMIL_SyncBehavior_datatype:
-	case SMIL_SyncTolerance_datatype:
-	case SMIL_AttributeType_datatype:
-	case SMIL_CalcMode_datatype:
-	case SMIL_Additive_datatype:
-	case SMIL_Accumulate_datatype:
-	case SMIL_Restart_datatype:
-	case SMIL_Fill_datatype:
-	case SVG_Overflow_datatype:
-	case SVG_ZoomAndPan_datatype:
-	case SVG_DisplayAlign_datatype:
-	case SVG_TextAlign_datatype:
-	case SVG_PointerEvents_datatype:
-	case SVG_RenderingHint_datatype:
-	case SVG_VectorEffect_datatype:
-	case SVG_PlaybackOrder_datatype:
-	case SVG_TimelineBegin_datatype:
-	/*end of string traits*/
-	/*DOM string traits*/
-	case SVG_FontFamily_datatype:
-	case XMLRI_datatype:
-	case DOM_String_datatype:
-	case SVG_ContentType_datatype:
-	case SVG_LanguageID_datatype:
-	case SVG_Focus_datatype:
-	case SVG_ID_datatype:
-	case SVG_GradientOffset_datatype:
-		/*end of DOM string traits*/
-		attValue = gf_svg_dump_attribute(n, &info);
-		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, attValue) ) );
-		if (attValue) gf_free(attValue);
-		return JS_TRUE;
-		/*dump to trait*/
-		break;
-
-#if 0
-	/*SVGT 1.2 default traits*/
-	case SMIL_KeyTimes_datatype:
-	case SMIL_KeyPoints_datatype:
-	case SMIL_KeySplines_datatype:
-	case SVG_Coordinates_datatype:
-	case SVG_StrokeDashArray_datatype:
-	case SVG_Points_datatype:
-	case SVG_Motion_datatype:
-	/*end SVGT 1.2 default traits*/
-
-	/*unimplemented/unnkown/FIXME traits*/
-	case SMIL_SyncTolerance_datatype:
-	case SVG_TransformType_datatype:
-	case SVG_TransformList_datatype:
-	case SMIL_AnimateValue_datatype:
-	case SMIL_AnimateValues_datatype:
-	case SMIL_AttributeName_datatype:
-	case SMIL_Times_datatype:
-	case SMIL_Duration_datatype:
-	case SMIL_RepeatCount_datatype:
-	default:
-		/*end unimplemented/unnkown/FIXME traits*/
-		return JS_TRUE;
-#endif
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_get_float_trait)
-{
-	char *szName;
-	GF_FieldInfo info;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=1) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	szName = SMJS_CHARS(c, argv[0]);
-	if (!szName) return JS_FALSE;
-
-	SMJS_SET_RVAL( JSVAL_VOID );
-
-	e = gf_node_get_attribute_by_name(n, szName, 0, GF_TRUE, GF_TRUE, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	switch (info.fieldType) {
-	/* inheritable floats */
-	case SVG_Number_datatype:
-	case SVG_FontSize_datatype:
-	case SVG_Length_datatype:
-	case SVG_Coordinate_datatype:
-	{
-		SVG_Number *l = (SVG_Number *)info.far_ptr;
-		if (l->type==SVG_NUMBER_AUTO || l->type==SVG_NUMBER_INHERIT) return JS_TRUE;
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(l->value) ) );
-		return JS_TRUE;
-	}
-	case SVG_Clock_datatype:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, *(SVG_Clock*)info.far_ptr ) );
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_get_matrix_trait)
-{
-	char *szName;
-	JSObject *mO;
-	GF_FieldInfo info;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=1) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	szName = SMJS_CHARS(c, argv[0]);
-	SMJS_SET_RVAL( JSVAL_VOID );
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_Transform_datatype) {
-		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
-		mO = JS_NewObject(c, &svg_rt->matrixClass._class, 0, 0);
-		gf_mx2d_init(*mx);
-		gf_mx2d_copy(*mx, ((SVG_Transform*)info.far_ptr)->mat);
-
-		SMJS_SET_PRIVATE(c, mO, mx);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(mO) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_get_rect_trait)
-{
-	JSObject *newObj;
-	char *szName;
-	GF_FieldInfo info;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=1) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	szName = SMJS_CHARS(c, argv[0]);
-	SMJS_SET_RVAL( JSVAL_VOID );
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_ViewBox_datatype) {
-		rectCI *rc;
-		SVG_ViewBox *v = (SVG_ViewBox *)info.far_ptr;
-		newObj = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-		GF_SAFEALLOC(rc, rectCI);
-		if (!rc) {
-			dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-			return JS_FALSE;
-		}
-		rc->x = FIX2FLT(v->x);
-		rc->y = FIX2FLT(v->y);
-		rc->w = FIX2FLT(v->width);
-		rc->h = FIX2FLT(v->height);
-		SMJS_SET_PRIVATE(c, newObj, rc);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(newObj) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_get_path_trait)
-{
-	char *szName;
-	GF_FieldInfo info;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=1) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	szName = SMJS_CHARS(c, argv[0]);
-	SMJS_SET_RVAL( JSVAL_VOID );
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_PathData_datatype) {
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL( svg_new_path_object(c, (SVG_PathData *)info.far_ptr) ) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_get_rgb_color_trait)
-{
-	char *szName;
-	GF_FieldInfo info;
-	rgbCI *rgb;
-	GF_Err e;
-	JSObject *newObj;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=1) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	szName = SMJS_CHARS(c, argv[0]);
-	SMJS_SET_RVAL( JSVAL_VOID );
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	switch (info.fieldType) {
-	case SVG_Color_datatype:
-	{
-		SVG_Color *col = (SVG_Color *)info.far_ptr;
-		if (col->type == SVG_COLOR_CURRENTCOLOR) return JS_TRUE;
-		if (col->type == SVG_COLOR_INHERIT) return JS_TRUE;
-		newObj = JS_NewObject(c, &svg_rt->rgbClass._class, 0, 0);
-		GF_SAFEALLOC(rgb, rgbCI);
-		if (!rgb) {
-			dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-			return JS_FALSE;
-		}
-		rgb->r = (u8) (255*FIX2FLT(col->red)) ;
-		rgb->g = (u8) (255*FIX2FLT(col->green)) ;
-		rgb->b = (u8) (255*FIX2FLT(col->blue)) ;
-		SMJS_SET_PRIVATE(c, newObj, rgb);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(newObj) );
-		return JS_TRUE;
-	}
-	break;
-	case SVG_Paint_datatype:
-	{
-		SVG_Paint *paint = (SVG_Paint *)info.far_ptr;
-		if (1 || paint->type==SVG_PAINT_COLOR) {
-			newObj = JS_NewObject(c, &svg_rt->rgbClass._class, 0, 0);
-			GF_SAFEALLOC(rgb, rgbCI);
-			if (!rgb) {
-				dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-				return JS_FALSE;
-			}
-			rgb->r = (u8) (255*FIX2FLT(paint->color.red) );
-			rgb->g = (u8) (255*FIX2FLT(paint->color.green) );
-			rgb->b = (u8) (255*FIX2FLT(paint->color.blue) );
-			SMJS_SET_PRIVATE(c, newObj, rgb);
-			SMJS_SET_RVAL( OBJECT_TO_JSVAL(newObj) );
-			return JS_TRUE;
-		}
-		return JS_TRUE;
-	}
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_set_trait)
-{
-	char *ns, *name, *val;
-	GF_Err e;
-	GF_FieldInfo info;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	val = ns = name = NULL;
-	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-	if (argc==3) {
-		if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
-		if (!JSVAL_CHECK_STRING(argv[2])) return JS_TRUE;
-		ns = SMJS_CHARS(c, argv[0]);
-		name = SMJS_CHARS(c, argv[1]);
-		val = SMJS_CHARS(c, argv[2]);
-	} else if (argc==2) {
-		name = SMJS_CHARS(c, argv[0]);
-		val = SMJS_CHARS(c, argv[1]);
-	} else {
-		return JS_TRUE;
-	}
-	if (!name) {
-		SMJS_FREE(c, ns);
-		SMJS_FREE(c, val);
-		return JS_TRUE;
-	}
-	if (!strcmp(name, "#text")) {
-		if (val) dom_node_set_textContent(n, val);
-		SMJS_FREE(c, ns);
-		SMJS_FREE(c, name);
-		SMJS_FREE(c, val);
-		return JS_TRUE;
-	}
-	e = gf_node_get_field_by_name(n, name, &info);
-	SMJS_FREE(c, ns);
-	SMJS_FREE(c, name);
-
-	if (!val || (e!=GF_OK)) {
-		SMJS_FREE(c, val);
-		return JS_TRUE;
-	}
-	SMJS_SET_RVAL( JSVAL_VOID );
-
-	e = gf_svg_parse_attribute(n, &info, val, 0);
-	SMJS_FREE(c, val);
-
-	if (e) return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
-
-	dom_node_changed(n, GF_FALSE, &info);
-
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_set_float_trait)
-{
-	GF_FieldInfo info;
-	jsdouble d;
-	GF_Err e;
-	char *szName;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	if (!JSVAL_IS_NUMBER(argv[1])) return JS_TRUE;
-	JS_ValueToNumber(c, argv[1], &d);
-	SMJS_SET_RVAL( JSVAL_VOID );
-	szName = SMJS_CHARS(c, argv[0]);
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	switch (info.fieldType) {
-	/* inheritable floats */
-	case SVG_FontSize_datatype:
-	case SVG_Length_datatype:
-	case SVG_Coordinate_datatype:
-	case SVG_Number_datatype:
-	{
-		SVG_Number *l = (SVG_Number *)info.far_ptr;
-		l->type=SVG_NUMBER_VALUE;
-		l->value = FLT2FIX(d);
-		break;
-	}
-	case SVG_Numbers_datatype:
-	case SVG_Coordinates_datatype:
-	{
-		SVG_Number *val;
-		SVG_Coordinates *l = (SVG_Coordinates *)info.far_ptr;
-		while (gf_list_count(*l)) {
-			val = (SVG_Number *)gf_list_get(*l, 0);
-			gf_list_rem(*l, 0);
-			if (val) gf_free(val);
-		}
-		GF_SAFEALLOC(val, SVG_Coordinate);
-		if (!val) {
-			dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-			return JS_FALSE;
-		}
-		val->type=SVG_NUMBER_VALUE;
-		val->value = FLT2FIX(d);
-		gf_list_add(*l, val);
-		break;
-	}
-	default:
-		return JS_TRUE;
-	}
-	dom_node_changed(n, GF_FALSE, &info);
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_set_matrix_trait)
-{
-	JSObject *mO;
-	char *szName;
-	GF_FieldInfo info;
-	GF_Matrix2D *mx;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	if (JSVAL_IS_NULL(argv[1]) || !JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	mO = JSVAL_TO_OBJECT(argv[1]);
-	if (!GF_JS_InstanceOf(c, mO, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx = SMJS_GET_PRIVATE(c, mO);
-	if (!mx) return JS_TRUE;
-
-	szName = SMJS_CHARS(c, argv[0]);
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_Transform_datatype) {
-		gf_mx2d_copy(((SVG_Transform*)info.far_ptr)->mat, *mx);
-		dom_node_changed(n, GF_FALSE, NULL);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_set_rect_trait)
-{
-	JSObject *rO;
-	char *szName;
-	GF_FieldInfo info;
-	rectCI *rc;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	if (JSVAL_IS_NULL(argv[1]) || !JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	rO = JSVAL_TO_OBJECT(argv[1]);
-	if (!GF_JS_InstanceOf(c, rO, &svg_rt->rectClass, NULL) ) return JS_TRUE;
-	rc = SMJS_GET_PRIVATE(c, rO);
-	if (!rc) return JS_TRUE;
-
-	szName = SMJS_CHARS(c, argv[0]);
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_ViewBox_datatype) {
-		SVG_ViewBox *v = (SVG_ViewBox *)info.far_ptr;
-		v->x = FLT2FIX(rc->x);
-		v->y = FLT2FIX(rc->y);
-		v->width = FLT2FIX(rc->w);
-		v->height = FLT2FIX(rc->h);
-		dom_node_changed(n, GF_FALSE, NULL);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_set_path_trait)
-{
-	pathCI *path;
-	GF_FieldInfo info;
-	JSObject *pO;
-	char *szName;
-	GF_Err e;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	if (JSVAL_IS_NULL(argv[1]) || !JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	pO = JSVAL_TO_OBJECT(argv[1]);
-	if (!GF_JS_InstanceOf(c, pO, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	path = SMJS_GET_PRIVATE(c, pO);
-	if (!path) return JS_TRUE;
-
-	szName = SMJS_CHARS(c, argv[0]);
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	if (info.fieldType==SVG_PathData_datatype) {
-#if USE_GF_PATH
-#else
-		u32 i;
-		u32 nb_pts;
-		SVG_PathData *d = (SVG_PathData *)info.far_ptr;
-		while (gf_list_count(d->commands)) {
-			u8 *t = gf_list_get(d->commands, 0);
-			gf_list_rem(d->commands, 0);
-			gf_free(t);
-		}
-		while (gf_list_count(d->points)) {
-			SVG_Point *t = gf_list_get(d->points, 0);
-			gf_list_rem(d->points, 0);
-			gf_free(t);
-		}
-		nb_pts = 0;
-		for (i=0; i<path->nb_coms; i++) {
-			u8 *t = gf_malloc(sizeof(u8));
-			*t = path->tags[i];
-			gf_list_add(d->commands, t);
-			switch (*t) {
-			case 0:
-			case 1:
-				nb_pts++;
-				break;
-			case 2:
-				nb_pts+=3;
-				break;
-			case 4:
-				nb_pts+=2;
-				break;
-			}
-		}
-		for (i=0; i<nb_pts; i++) {
-			SVG_Point *t = gf_malloc(sizeof(SVG_Point));
-			t->x = FLT2FIX(path->pts[i].x);
-			t->y = FLT2FIX(path->pts[i].y);
-			gf_list_add(d->points, t);
-		}
-		dom_node_changed(n, 0, NULL);
-		return JS_TRUE;
-#endif
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_set_rgb_color_trait)
-{
-	GF_FieldInfo info;
-	rgbCI *rgb;
-	JSObject *colO;
-	GF_Err e;
-	char *szName;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	if (argc!=2) return JS_TRUE;
-	if (!JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-	if (!JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
-	colO = JSVAL_TO_OBJECT(argv[1]);
-	if (!colO) return JS_TRUE;
-	if (!GF_JS_InstanceOf(c, colO, &svg_rt->rgbClass, NULL) ) return JS_TRUE;
-	rgb = SMJS_GET_PRIVATE(c, colO);
-	if (!rgb) return JS_TRUE;
-
-	SMJS_SET_RVAL(JSVAL_VOID);
-	szName = SMJS_CHARS(c, argv[0]);
-	e = gf_node_get_field_by_name(n, szName, &info);
-	SMJS_FREE(c, szName);
-	if (e != GF_OK) return JS_TRUE;
-
-	switch (info.fieldType) {
-	case SVG_Color_datatype:
-	{
-		SVG_Color *col = (SVG_Color *)info.far_ptr;
-		col->type = SVG_COLOR_RGBCOLOR;
-		col->red = FLT2FIX(rgb->r / 255.0f);
-		col->green = FLT2FIX(rgb->g / 255.0f);
-		col->blue = FLT2FIX(rgb->b / 255.0f);
-		dom_node_changed(n, GF_FALSE, &info);
-		return JS_TRUE;
-	}
-	case SVG_Paint_datatype:
-	{
-		SVG_Paint *paint = (SVG_Paint *)info.far_ptr;
-		paint->type = SVG_PAINT_COLOR;
-		paint->color.type = SVG_COLOR_RGBCOLOR;
-		paint->color.red = FLT2FIX(rgb->r / 255.0f);
-		paint->color.green = FLT2FIX(rgb->g / 255.0f);
-		paint->color.blue = FLT2FIX(rgb->b / 255.0f);
-		dom_node_changed(n, GF_FALSE, &info);
-		return JS_TRUE;
-	}
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION_EXT(svg_get_bbox, Bool get_screen)
-{
-	GF_JSAPIParam par;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	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) {
-			JSObject *rO = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-			rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
-			rc->sg = NULL;
-			rc->x = FIX2FLT(par.bbox.min_edge.x);
-			/*BBox is in 3D coord system style*/
-			rc->y = FIX2FLT(par.bbox.min_edge.y);
-			rc->w = FIX2FLT(par.bbox.max_edge.x - par.bbox.min_edge.x);
-			rc->h = FIX2FLT(par.bbox.max_edge.y - par.bbox.min_edge.y);
-			SMJS_SET_PRIVATE(c, rO, rc);
-			SMJS_SET_RVAL( OBJECT_TO_JSVAL(rO) );
-		} else {
-			SMJS_SET_RVAL( JSVAL_VOID );
-		}
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_get_local_bbox)
-{
-	return svg_get_bbox(SMJS_CALL_ARGS, GF_FALSE);
-}
-JSBool SMJS_FUNCTION(svg_udom_get_screen_bbox)
-{
-	return svg_get_bbox(SMJS_CALL_ARGS, GF_TRUE);
-}
-
-JSBool SMJS_FUNCTION(svg_udom_get_screen_ctm)
-{
-	GF_JSAPIParam par;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_TRANSFORM, (GF_Node *)n, &par)) {
-		JSObject *mO = JS_NewObject(c, &svg_rt->matrixClass._class, 0, 0);
-		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
-		gf_mx2d_from_mx(mx, &par.mx);
-		SMJS_SET_PRIVATE(c, mO, mx);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(mO) );
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_create_matrix_components)
-{
-	GF_Matrix2D *mx;
-	JSObject *mat;
-	jsdouble v;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-	if (argc!=6) return JS_TRUE;
-
-	GF_SAFEALLOC(mx, GF_Matrix2D)
-	JS_ValueToNumber(c, argv[0], &v);
-	mx->m[0] = FLT2FIX(v);
-	JS_ValueToNumber(c, argv[1], &v);
-	mx->m[3] = FLT2FIX(v);
-	JS_ValueToNumber(c, argv[2], &v);
-	mx->m[1] = FLT2FIX(v);
-	JS_ValueToNumber(c, argv[3], &v);
-	mx->m[4] = FLT2FIX(v);
-	JS_ValueToNumber(c, argv[4], &v);
-	mx->m[2] = FLT2FIX(v);
-	JS_ValueToNumber(c, argv[5], &v);
-	mx->m[5] = FLT2FIX(v);
-	mat = JS_NewObject(c, &svg_rt->matrixClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, mat, mx);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(mat) );
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_create_rect)
-{
-	rectCI *rc;
-	JSObject *r;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	GF_SAFEALLOC(rc, rectCI);
-	r = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, r, rc);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(r) );
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_create_point)
-{
-	pointCI *pt;
-	JSObject *r;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	GF_SAFEALLOC(pt, pointCI);
-	r = JS_NewObject(c, &svg_rt->pointClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, r, pt);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(r) );
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_create_path)
-{
-	pathCI *path;
-	JSObject *p;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	GF_SAFEALLOC(path, pathCI);
-	p = JS_NewObject(c, &svg_rt->pathClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, p, path);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(p) );
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_create_color)
-{
-	rgbCI *col;
-	JSObject *p;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-	if (argc!=3) return JS_TRUE;
-
-	GF_SAFEALLOC(col, rgbCI);
-	if (!col) {
-		dom_throw_exception(c, GF_DOM_EXC_DATA_CLONE_ERR);
-		return JS_FALSE;
-	}
-	col->r = JSVAL_TO_INT(argv[0]);
-	col->g = JSVAL_TO_INT(argv[1]);
-	col->b = JSVAL_TO_INT(argv[2]);
-	p = JS_NewObject(c, &svg_rt->rgbClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, p, col);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(p) );
-	return JS_TRUE;
-}
-
-
-JSBool SMJS_FUNCTION(svg_path_get_total_length)
-{
-	Double length = 0;
-	GF_FieldInfo info;
-	SMJS_OBJ
-
-	GF_Node *n = (GF_Node *)dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-	if (n->sgprivate->tag != TAG_SVG_path) return JS_TRUE;
-
-	gf_node_get_field_by_name(n, "d", &info);
-	if (info.fieldType == SVG_PathData_datatype) {
-#if USE_GF_PATH
-		GF_Path *p = (GF_Path *)info.far_ptr;
-		GF_PathIterator *path_it = gf_path_iterator_new(p);
-		if (path_it) {
-			Fixed len = gf_path_iterator_get_length(path_it);
-			length = FIX2FLT(len);
-			gf_path_iterator_del(path_it);
-		}
-#endif
-	}
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, length ) );
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_move_focus)
-{
-	GF_JSAPIParam par;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-	if ((argc!=1) || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-
-	par.opt = JSVAL_TO_INT(argv[1]);
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
-		return JS_TRUE;
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_set_focus)
-{
-	GF_JSAPIParam par;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-	if ((argc!=1) || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-
-	par.node = dom_get_element(c, JSVAL_TO_OBJECT(argv[0]));
-
-	/*NOT IN THE GRAPH*/
-	if (!par.node || !par.node->sgprivate->num_instances) return JS_TRUE;
-	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
-		return JS_TRUE;
-	return JS_TRUE;
-}
-JSBool SMJS_FUNCTION(svg_udom_get_focus)
-{
-	GF_JSAPIParam par;
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n || argc) return JS_TRUE;
-
-	SMJS_SET_RVAL( JSVAL_VOID );
-	if (!ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_FOCUS, (GF_Node *)n, &par))
-		return JS_TRUE;
-
-	if (par.node) {
-		SMJS_SET_RVAL( dom_element_construct(c, par.node) );
-	}
-	return JS_TRUE;
-}
-
-JSBool SMJS_FUNCTION(svg_udom_get_time)
-{
-	SMJS_OBJ
-	GF_Node *n = dom_get_element(c, obj);
-	if (!n) return JS_TRUE;
-
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, gf_node_get_scene_time(n)) );
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(svg_connection_create)
-{
-	return JS_TRUE;
-}
-
-#ifdef GPAC_UNUSED_FUNC
-/**
- * FIXME : those 5 funcs and two variables are not used anywhere...
- */
-static JSBool svg_connection_set_encoding(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	return JS_TRUE;
-}
-static JSBool svg_connection_connect(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	return JS_TRUE;
-}
-static JSBool svg_connection_send(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	return JS_TRUE;
-}
-static JSBool svg_connection_close(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	return JS_TRUE;
-}
-
-static JSPropertySpec connectionProps[] = {
-	SMJS_PROPERTY_SPEC("connected",			0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-	SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-};
-static JSFunctionSpec connectionFuncs[] = {
-	/*eventTarget interface*/
-	{"addEventListenerNS", dom_event_add_listener, 4, 0, 0},
-	{"removeEventListenerNS", dom_event_remove_listener, 4, 0, 0},
-	{"addEventListener", dom_event_add_listener, 3, 0, 0},
-	{"removeEventListener", dom_event_remove_listener, 3, 0, 0},
-	/*connection interface*/
-	{"setEncoding", svg_connection_set_encoding, 1, 0, 0},
-	{"connect", svg_connection_connect, 1, 0, 0},
-	{"send", svg_connection_send, 1, 0, 0},
-	{"close", svg_connection_close, 0, 0, 0},
-	{0, 0, 0, 0, 0}
-};
-#endif /*GPAC_UNUSED_FUNC*/
-
-static DECL_FINALIZE( baseCI_finalize)
-
-/*avoids GCC warning*/
-void *data = SMJS_GET_PRIVATE(c, obj);
-if (!c) c=NULL;
-if (data) gf_free(data);
-}
-
-static SMJS_FUNC_PROP_GET(rgb_getProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->rgbClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	rgbCI *col = (rgbCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!col) return JS_TRUE;
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = INT_TO_JSVAL(col->r);
-		return JS_TRUE;
-	case 1:
-		*vp = INT_TO_JSVAL(col->g);
-		return JS_TRUE;
-	case 2:
-		*vp = INT_TO_JSVAL(col->b);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( rgb_setProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->rgbClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	rgbCI *col = (rgbCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!col) return JS_TRUE;
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		col->r = JSVAL_TO_INT(*vp);
-		return JS_TRUE;
-	case 1:
-		col->g = JSVAL_TO_INT(*vp);
-		return JS_TRUE;
-	case 2:
-		col->b = JSVAL_TO_INT(*vp);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-
-static SMJS_FUNC_PROP_GET(rect_getProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->rectClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	rectCI *rc = (rectCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!rc) return JS_TRUE;
-	if (rc->sg) {
-		GF_JSAPIParam par;
-		ScriptAction(rc->sg, GF_JSAPI_OP_GET_VIEWPORT, rc->sg->RootNode, &par);
-		rc->x = FIX2FLT(par.rc.x);
-		rc->y = FIX2FLT(par.rc.y);
-		rc->w = FIX2FLT(par.rc.width);
-		rc->h = FIX2FLT(par.rc.height);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, rc->x);
-		return JS_TRUE;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, rc->y);
-		return JS_TRUE;
-	case 2:
-		*vp = JS_MAKE_DOUBLE(c, rc->w);
-		return JS_TRUE;
-	case 3:
-		*vp = JS_MAKE_DOUBLE(c, rc->h);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( rect_setProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->rectClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	jsdouble d;
-	rectCI *rc = (rectCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!rc) return JS_TRUE;
-	JS_ValueToNumber(c, *vp, &d);
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		rc->x = (Float) d;
-		return JS_TRUE;
-	case 1:
-		rc->y = (Float) d;
-		return JS_TRUE;
-	case 2:
-		rc->w = (Float) d;
-		return JS_TRUE;
-	case 3:
-		rc->h = (Float) d;
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( point_getProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->pointClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	pointCI *pt = (pointCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!pt) return JS_TRUE;
-	if (pt->sg) {
-		GF_JSAPIParam par;
-		ScriptAction(pt->sg, GF_JSAPI_OP_GET_TRANSLATE, pt->sg->RootNode, &par);
-		pt->x = FIX2FLT(par.pt.x);
-		pt->y = FIX2FLT(par.pt.y);
-	}
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, pt->x);
-		return JS_TRUE;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, pt->y);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( point_setProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->pointClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	jsdouble d;
-	pointCI *pt = (pointCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!pt) return JS_TRUE;
-	JS_ValueToNumber(c, *vp, &d);
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		pt->x = (Float) d;
-		break;
-	case 1:
-		pt->y = (Float) d;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	if (pt->sg) {
-		GF_JSAPIParam par;
-		par.pt.x = FLT2FIX(pt->x);
-		par.pt.y = FLT2FIX(pt->y);
-		ScriptAction(pt->sg, GF_JSAPI_OP_SET_TRANSLATE, pt->sg->RootNode, &par);
-	}
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-
-static JSObject *svg_new_path_object(JSContext *c, SVG_PathData *d)
-{
-#if USE_GF_PATH
-	return NULL;
-#else
-	JSObject *obj;
-	pathCI *p;
-	GF_SAFEALLOC(p, pathCI);
-	if (d) {
-		u32 i, count;
-		p->nb_coms = gf_list_count(d->commands);
-		p->tags = gf_malloc(sizeof(u8) * p->nb_coms);
-		for (i=0; i<p->nb_coms; i++) p->tags[i] = * (u8 *) gf_list_get(d->commands, i);
-		count = gf_list_count(d->points);
-		p->pts = gf_malloc(sizeof(pointCI) * count);
-		for (i=0; i<count; i++) {
-			GF_Point2D *pt = gf_list_get(d->commands, i);
-			p->pts[i].x = FIX2FLT(pt->x);
-			p->pts[i].y = FIX2FLT(pt->y);
-		}
-	}
-	obj = JS_NewObject(c, &svg_rt->pathClass._class, 0, 0);
-	SMJS_SET_PRIVATE(c, obj, p);
-	return obj;
-#endif
-}
-
-#ifdef GPAC_UNUSED_FUNC
-static JSBool pathCI_constructor(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-	pathCI *p;
-	GF_SAFEALLOC(p, pathCI);
-	SMJS_SET_PRIVATE(c, obj, p);
-	*rval = OBJECT_TO_JSVAL(obj);
-	return JS_TRUE;
-}
-#endif /*GPAC_UNUSED_FUNC*/
-
-static void pathCI_finalize(JSContext *c, JSObject *obj)
-{
-	pathCI *p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (p) {
-		if (p->pts) gf_free(p->pts);
-		if (p->tags) gf_free(p->tags);
-		gf_free(p);
-	}
-}
-
-static SMJS_FUNC_PROP_GET( path_getProperty)
-
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-if (SMJS_ID_IS_INT(id)) {
-	pathCI *p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = INT_TO_JSVAL(p->nb_coms);
-		return JS_TRUE;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(svg_path_get_segment)
-{
-	pathCI *p;
-	u32 idx;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=1) || !JSVAL_IS_INT(argv[0])) return JS_TRUE;
-	idx = JSVAL_TO_INT(argv[0]);
-	if (idx>=p->nb_coms) return JS_TRUE;
-	switch (p->tags[idx]) {
-	case 0:
-		SMJS_SET_RVAL( INT_TO_JSVAL(77));
-		return JS_TRUE;	/* Move To */
-	case 1:
-		SMJS_SET_RVAL( INT_TO_JSVAL(76));
-		return JS_TRUE;	/* Line To */
-	case 2:/* Curve To */
-	case 3:/* next Curve To */
-		SMJS_SET_RVAL( INT_TO_JSVAL(67));
-		return JS_TRUE;
-	case 4:/* Quad To */
-	case 5:/* next Quad To */
-		SMJS_SET_RVAL( INT_TO_JSVAL(81));
-		return JS_TRUE;
-	case 6:
-		SMJS_SET_RVAL( INT_TO_JSVAL(90));
-		return JS_TRUE;	/* Close */
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_path_get_segment_param)
-{
-	pathCI *p;
-	ptCI *pt;
-	SMJS_OBJ
-	SMJS_ARGS
-	u32 i, idx, param_idx, pt_idx;
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=2) || !JSVAL_IS_INT(argv[0]) || !JSVAL_IS_INT(argv[1])) return JS_TRUE;
-	idx = JSVAL_TO_INT(argv[0]);
-	param_idx = JSVAL_TO_INT(argv[1]);
-	if (idx>=p->nb_coms) return JS_TRUE;
-	pt_idx = 0;
-	for (i=0; i<idx; i++) {
-		switch (p->tags[i]) {
-		case 0:
-			pt_idx++;
-			break;
-		case 1:
-			pt_idx++;
-			break;
-		case 2:
-			pt_idx+=3;
-			break;
-		case 3:
-			pt_idx+=2;
-			break;
-		case 4:
-			pt_idx+=2;
-			break;
-		case 5:
-			pt_idx+=1;
-			break;
-		}
-	}
-	switch (p->tags[idx]) {
-	case 0:
-	case 1:
-		if (param_idx>1) return JS_TRUE;
-		pt = &p->pts[pt_idx];
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, param_idx ? pt->y : pt->x));
-		return JS_TRUE;
-	case 2:/* Curve To */
-		if (param_idx>5) return JS_TRUE;
-		pt = &p->pts[pt_idx + (param_idx/2) ];
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, (param_idx%2) ? pt->y : pt->x));
-		return JS_TRUE;
-	case 3:/* Next Curve To */
-		if (param_idx>5) return JS_TRUE;
-		if (param_idx<2) {
-			pt = &p->pts[pt_idx - 1];
-			SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, param_idx ? pt->y : pt->x));
-		} else {
-			param_idx-=2;
-			pt = &p->pts[pt_idx + (param_idx/2)];
-			SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, (param_idx%2) ? pt->y : pt->x));
-		}
-		return JS_TRUE;
-	case 4:/* Quad To */
-		if (param_idx>3) return JS_TRUE;
-		pt = &p->pts[pt_idx + (param_idx/2) ];
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, (param_idx%2) ? pt->y : pt->x));
-		return JS_TRUE;
-	case 5:/* Next Quad To */
-		if (param_idx>3) return JS_TRUE;
-		if (param_idx<2) {
-			pt = &p->pts[pt_idx - 1];
-			SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, param_idx ? pt->y : pt->x));
-		} else {
-			param_idx-=2;
-			pt = &p->pts[pt_idx];
-			SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, param_idx ? pt->y : pt->x));
-		}
-		return JS_TRUE;
-	/*spec is quite obscur here*/
-	case 6:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, 0));
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-static u32 svg_path_realloc_pts(pathCI *p, u32 nb_pts)
-{
-	u32 i, orig_pts;
-	orig_pts = 0;
-	for (i=0; i<p->nb_coms; i++) {
-		switch (p->tags[i]) {
-		case 0:
-			orig_pts++;
-			break;
-		case 1:
-			orig_pts++;
-			break;
-		case 2:
-			orig_pts+=3;
-			break;
-		case 3:
-			orig_pts+=2;
-			break;
-		case 4:
-			orig_pts+=2;
-			break;
-		case 5:
-			orig_pts+=1;
-			break;
-		}
-	}
-	p->pts = (ptCI *)gf_realloc(p->pts, sizeof(ptCI)*(nb_pts+orig_pts));
-	return orig_pts;
-}
-static JSBool SMJS_FUNCTION(svg_path_move_to)
-{
-	pathCI *p;
-	jsdouble x, y;
-	u32 nb_pts;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=2) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &x);
-	JS_ValueToNumber(c, argv[1], &y);
-	nb_pts = svg_path_realloc_pts(p, 1);
-	p->pts[nb_pts].x = (Float) x;
-	p->pts[nb_pts].y = (Float) y;
-	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
-	p->tags[p->nb_coms] = 0;
-	p->nb_coms++;
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(svg_path_line_to)
-{
-	pathCI *p;
-	jsdouble x, y;
-	u32 nb_pts;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=2) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &x);
-	JS_ValueToNumber(c, argv[1], &y);
-	nb_pts = svg_path_realloc_pts(p, 1);
-	p->pts[nb_pts].x = (Float) x;
-	p->pts[nb_pts].y = (Float) y;
-	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
-	p->tags[p->nb_coms] = 1;
-	p->nb_coms++;
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_path_quad_to)
-{
-	pathCI *p;
-	jsdouble x1, y1, x2, y2;
-	u32 nb_pts;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=4) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1]) || !JSVAL_IS_NUMBER(argv[2]) || !JSVAL_IS_NUMBER(argv[3])) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &x1);
-	JS_ValueToNumber(c, argv[1], &y1);
-	JS_ValueToNumber(c, argv[2], &x2);
-	JS_ValueToNumber(c, argv[3], &y2);
-	nb_pts = svg_path_realloc_pts(p, 2);
-	p->pts[nb_pts].x = (Float) x1;
-	p->pts[nb_pts].y = (Float) y1;
-	p->pts[nb_pts+1].x = (Float) x2;
-	p->pts[nb_pts+1].y = (Float) y2;
-	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
-	p->tags[p->nb_coms] = 4;
-	p->nb_coms++;
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(svg_path_curve_to)
-{
-	pathCI *p;
-	jsdouble x1, y1, x2, y2, x, y;
-	u32 nb_pts;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if ((argc!=6) || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1]) || !JSVAL_IS_NUMBER(argv[2]) || !JSVAL_IS_NUMBER(argv[3]) || !JSVAL_IS_NUMBER(argv[4]) || !JSVAL_IS_NUMBER(argv[5])) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &x1);
-	JS_ValueToNumber(c, argv[1], &y1);
-	JS_ValueToNumber(c, argv[2], &x2);
-	JS_ValueToNumber(c, argv[3], &y2);
-	JS_ValueToNumber(c, argv[4], &x);
-	JS_ValueToNumber(c, argv[5], &y);
-	nb_pts = svg_path_realloc_pts(p, 3);
-	p->pts[nb_pts].x = (Float) x1;
-	p->pts[nb_pts].y = (Float) y1;
-	p->pts[nb_pts+1].x = (Float) x2;
-	p->pts[nb_pts+1].y = (Float) y2;
-	p->pts[nb_pts+2].x = (Float) x;
-	p->pts[nb_pts+2].y = (Float) y;
-	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
-	p->tags[p->nb_coms] = 2;
-	p->nb_coms++;
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(svg_path_close)
-{
-	pathCI *p;
-	SMJS_OBJ
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->pathClass, NULL) ) return JS_TRUE;
-	p = (pathCI *)SMJS_GET_PRIVATE(c, obj);
-	if (!p) return JS_TRUE;
-	if (argc) return JS_TRUE;
-	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
-	p->tags[p->nb_coms] = 6;
-	p->nb_coms++;
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( matrix_getProperty)
-
-GF_Matrix2D *mx;
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-if (!mx) return JS_TRUE;
-switch (SMJS_ID_TO_INT(id)) {
-case 0:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[0]));
-	return JS_TRUE;
-case 1:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[3]));
-	return JS_TRUE;
-case 2:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[1]));
-	return JS_TRUE;
-case 3:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[4]));
-	return JS_TRUE;
-case 4:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[2]));
-	return JS_TRUE;
-case 5:
-	*vp = JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[5]));
-	return JS_TRUE;
-default:
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( matrix_setProperty)
-
-jsdouble d;
-GF_Matrix2D *mx;
-if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
-
-JS_ValueToNumber(c, *vp, &d);
-switch (SMJS_ID_TO_INT(id)) {
-case 0:
-	mx->m[0] = FLT2FIX(d);
-	break;
-case 1:
-	mx->m[3] = FLT2FIX(d);
-	break;
-case 2:
-	mx->m[1] = FLT2FIX(d);
-	break;
-case 3:
-	mx->m[4] = FLT2FIX(d);
-	break;
-case 4:
-	mx->m[2] = FLT2FIX(d);
-	break;
-case 5:
-	mx->m[5] = FLT2FIX(d);
-	break;
-default:
-	return JS_TRUE;
-}
-return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(svg_mx2d_get_component)
-{
-	GF_Matrix2D *mx;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx || (argc!=1)) return JS_TRUE;
-	if (!JSVAL_IS_INT(argv[0])) return JS_TRUE;
-	switch (JSVAL_TO_INT(argv[0])) {
-	case 0:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[0])));
-		return JS_TRUE;
-	case 1:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[3])));
-		return JS_TRUE;
-	case 2:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[1])));
-		return JS_TRUE;
-	case 3:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[4])));
-		return JS_TRUE;
-	case 4:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[2])));
-		return JS_TRUE;
-	case 5:
-		SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(mx->m[5])));
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_mx2d_multiply)
-{
-	JSObject *mat;
-	GF_Matrix2D *mx1, *mx2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx1 || (argc!=1)) return JS_TRUE;
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
-	mat = JSVAL_TO_OBJECT(argv[0]);
-	if (!GF_JS_InstanceOf(c, mat, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx2 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, mat);
-	if (!mx2) return JS_TRUE;
-	gf_mx2d_add_matrix(mx1, mx2);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_mx2d_inverse)
-{
-	GF_Matrix2D *mx1;
-	SMJS_OBJ
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx1) return JS_TRUE;
-	gf_mx2d_inverse(mx1);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_mx2d_translate)
-{
-	jsdouble x, y;
-	GF_Matrix2D *mx1, mx2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx1 || (argc!=2)) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &x);
-	JS_ValueToNumber(c, argv[1], &y);
-
-	gf_mx2d_init(mx2);
-	mx2.m[2] = FLT2FIX(x);
-	mx2.m[5] = FLT2FIX(y);
-	gf_mx2d_pre_multiply(mx1, &mx2);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_mx2d_scale)
-{
-	jsdouble scale;
-	GF_Matrix2D *mx1, mx2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx1 || (argc!=1)) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &scale);
-	gf_mx2d_init(mx2);
-	mx2.m[0] = mx2.m[4] = FLT2FIX(scale);
-	gf_mx2d_pre_multiply(mx1, &mx2);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(svg_mx2d_rotate)
-{
-	jsdouble angle;
-	GF_Matrix2D *mx1, mx2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (!GF_JS_InstanceOf(c, obj, &svg_rt->matrixClass, NULL) ) return JS_TRUE;
-	mx1 = (GF_Matrix2D *)SMJS_GET_PRIVATE(c, obj);
-	if (!mx1 || (argc!=1)) return JS_TRUE;
-	JS_ValueToNumber(c, argv[0], &angle);
-	gf_mx2d_init(mx2);
-	gf_mx2d_add_rotation(&mx2, 0, 0, gf_mulfix(FLT2FIX(angle/180), GF_PI));
-	gf_mx2d_pre_multiply(mx1, &mx2);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj ));
-	return JS_TRUE;
-}
-
-jsval svg_udom_new_rect(JSContext *c, Fixed x, Fixed y, Fixed width, Fixed height)
-{
-	JSObject *r = JS_NewObject(c, &svg_rt->rectClass._class, 0, 0);
-	rectCI *rc = (rectCI *)gf_malloc(sizeof(rectCI));
-	rc->x = FIX2FLT(x);
-	rc->y = FIX2FLT(y);
-	rc->w = FIX2FLT(width);
-	rc->h = FIX2FLT(height);
-	rc->sg = NULL;
-	SMJS_SET_PRIVATE(c, r, rc);
-	return OBJECT_TO_JSVAL(r);
-}
-
-jsval svg_udom_new_point(JSContext *c, Fixed x, Fixed y)
-{
-	JSObject *p = JS_NewObject(c, &svg_rt->pointClass._class, 0, 0);
-	pointCI *pt = (pointCI *)gf_malloc(sizeof(pointCI));
-	pt->x = FIX2FLT(x);
-	pt->y = FIX2FLT(y);
-	pt->sg = NULL;
-	SMJS_SET_PRIVATE(c, p, pt);
-	return OBJECT_TO_JSVAL(p);
-}
-
-void *html_get_element_class(GF_Node *n);
-
-void *svg_get_element_class(GF_Node *n)
-{
-	if (!n) return NULL;
-	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG)) {
-		if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
-			return html_get_element_class(n);
-		}
-		return &svg_rt->svgElement;
-	}
-	return NULL;
-}
-void *svg_get_document_class(GF_SceneGraph *sg)
-{
-	GF_Node *n = sg->RootNode;
-	if (!n) return NULL;
-	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG))
-		return &svg_rt->svgDocument;
-	return NULL;
-}
-
-Bool is_svg_document_class(JSContext *c, JSObject *obj)
-{
-	if (!svg_rt || !obj) return GF_FALSE;
-	if (GF_JS_InstanceOf(c, obj, &svg_rt->svgDocument, NULL))
-		return GF_TRUE;
-	return GF_FALSE;
-}
-
-Bool is_svg_element_class(JSContext *c, JSObject *obj)
-{
-	if (!svg_rt || !obj) return GF_FALSE;
-	if (GF_JS_InstanceOf(c, obj, &svg_rt->svgElement, NULL))
-		return GF_TRUE;
-	return GF_FALSE;
-}
-
-static void svg_init_js_api(GF_SceneGraph *scene)
-{
-	JS_SetContextPrivate(scene->svg_js->js_ctx, scene);
-	JS_SetErrorReporter(scene->svg_js->js_ctx, svg_script_error);
-
-	/*init global object*/
-	scene->svg_js->global = gf_sg_js_global_object(scene->svg_js->js_ctx, &svg_rt->globalClass);
-
-	JS_InitStandardClasses(scene->svg_js->js_ctx, scene->svg_js->global);
-	/*remember pointer to scene graph!!*/
-	SMJS_SET_PRIVATE(scene->svg_js->js_ctx, scene->svg_js->global, scene);
-	{
-		JSPropertySpec globalClassProps[] = {
-			SMJS_PROPERTY_SPEC("connected",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("parent",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec globalClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("createConnection", svg_connection_create, 0),
-			SMJS_FUNCTION_SPEC("gotoLocation", svg_nav_to_location, 1),
-			SMJS_FUNCTION_SPEC("alert",           svg_echo,          0),
-			SMJS_FUNCTION_SPEC("print",           svg_echo,          0),
-			/*technically, this is part of Implementation interface, not global, but let's try not to complicate things too much*/
-			SMJS_FUNCTION_SPEC("hasFeature", dom_imp_has_feature, 2),
-			SMJS_FUNCTION_SPEC("parseXML",   svg_parse_xml,          0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JS_DefineFunctions(scene->svg_js->js_ctx, scene->svg_js->global, globalClassFuncs);
-		JS_DefineProperties(scene->svg_js->js_ctx, scene->svg_js->global, globalClassProps);
-	}
-
-	/*initialize DOM core */
-	dom_js_load(scene, scene->svg_js->js_ctx, scene->svg_js->global);
-
-	/*user-defined extensions*/
-	gf_sg_load_script_extensions(scene, scene->svg_js->js_ctx, scene->svg_js->global, GF_FALSE);
-
-	svg_define_udom_exception(scene->svg_js->js_ctx, scene->svg_js->global);
-
-	/*Console class*/
-	{
-
-		JSPropertySpec consoleProps[] = {
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec consoleFuncs[] = {
-			/*trait access interface*/
-			SMJS_FUNCTION_SPEC("log", svg_echo, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->consoleClass, 0, 0, consoleProps, 0, 0, consoleFuncs);
-	}
-
-	/*SVGDocument class*/
-	{
-
-		JSPropertySpec svgDocumentProps[] = {
-			/*in our implementation, defaultView is just an alias to the global Window object*/
-			SMJS_PROPERTY_SPEC("defaultView",			0,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSObject *doc_proto = dom_js_get_document_proto(scene->svg_js->js_ctx);
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, doc_proto, &svg_rt->svgDocument, 0, 0, svgDocumentProps, 0, 0, 0);
-	}
-
-	/*SVGElement class*/
-	{
-		JSFunctionSpec svgElementFuncs[] = {
-			/*trait access interface*/
-			SMJS_FUNCTION_SPEC("getTrait", svg_udom_get_trait, 1),
-			SMJS_FUNCTION_SPEC("getTraitNS", svg_udom_get_trait, 2),
-			SMJS_FUNCTION_SPEC("getFloatTrait", svg_udom_get_float_trait, 1),
-			SMJS_FUNCTION_SPEC("getMatrixTrait", svg_udom_get_matrix_trait, 1),
-			SMJS_FUNCTION_SPEC("getRectTrait", svg_udom_get_rect_trait, 1),
-			SMJS_FUNCTION_SPEC("getPathTrait", svg_udom_get_path_trait, 1),
-			SMJS_FUNCTION_SPEC("getRGBColorTrait", svg_udom_get_rgb_color_trait, 1),
-			/*FALLBACK TO BASE-VALUE FOR NOW - WILL NEED EITHER DOM TREE-CLONING OR A FAKE RENDER
-			PASS FOR EACH PRESENTATION VALUE ACCESS*/
-			SMJS_FUNCTION_SPEC("getPresentationTrait", svg_udom_get_trait, 1),
-			SMJS_FUNCTION_SPEC("getPresentationTraitNS", svg_udom_get_trait, 2),
-			SMJS_FUNCTION_SPEC("getFloatPresentationTrait", svg_udom_get_float_trait, 1),
-			SMJS_FUNCTION_SPEC("getMatrixPresentationTrait", svg_udom_get_matrix_trait, 1),
-			SMJS_FUNCTION_SPEC("getRectPresentationTrait", svg_udom_get_rect_trait, 1),
-			SMJS_FUNCTION_SPEC("getPathPresentationTrait", svg_udom_get_path_trait, 1),
-			SMJS_FUNCTION_SPEC("getRGBColorPresentationTrait", svg_udom_get_rgb_color_trait, 1),
-			SMJS_FUNCTION_SPEC("setTrait", svg_udom_set_trait, 2),
-			SMJS_FUNCTION_SPEC("setTraitNS", svg_udom_set_trait, 3),
-			SMJS_FUNCTION_SPEC("setFloatTrait", svg_udom_set_float_trait, 2),
-			SMJS_FUNCTION_SPEC("setMatrixTrait", svg_udom_set_matrix_trait, 2),
-			SMJS_FUNCTION_SPEC("setRectTrait", svg_udom_set_rect_trait, 2),
-			SMJS_FUNCTION_SPEC("setPathTrait", svg_udom_set_path_trait, 2),
-			SMJS_FUNCTION_SPEC("setRGBColorTrait", svg_udom_set_rgb_color_trait, 2),
-			/*locatable interface*/
-			SMJS_FUNCTION_SPEC("getBBox", svg_udom_get_local_bbox, 0),
-			SMJS_FUNCTION_SPEC("getScreenCTM", svg_udom_get_screen_ctm, 0),
-			SMJS_FUNCTION_SPEC("getScreenBBox", svg_udom_get_screen_bbox, 0),
-			/*svgSVGElement interface*/
-			SMJS_FUNCTION_SPEC("createSVGMatrixComponents", svg_udom_create_matrix_components, 0),
-			SMJS_FUNCTION_SPEC("createSVGRect", svg_udom_create_rect, 0),
-			SMJS_FUNCTION_SPEC("createSVGPath", svg_udom_create_path, 0),
-			SMJS_FUNCTION_SPEC("createSVGRGBColor", svg_udom_create_color, 0),
-			SMJS_FUNCTION_SPEC("createSVGPoint", svg_udom_create_point, 0),
-
-			SMJS_FUNCTION_SPEC("moveFocus", svg_udom_move_focus, 0),
-			SMJS_FUNCTION_SPEC("setFocus", svg_udom_set_focus, 0),
-			SMJS_FUNCTION_SPEC("getCurrentFocusedObject", svg_udom_get_focus, 0),
-			SMJS_FUNCTION_SPEC("getCurrentTime", svg_udom_get_time, 0),
-
-			/*timeControl interface*/
-			SMJS_FUNCTION_SPEC("beginElementAt", svg_udom_smil_begin, 1),
-			SMJS_FUNCTION_SPEC("beginElement", svg_udom_smil_begin, 0),
-			SMJS_FUNCTION_SPEC("endElementAt", svg_udom_smil_end, 1),
-			SMJS_FUNCTION_SPEC("endElement", svg_udom_smil_end, 0),
-			SMJS_FUNCTION_SPEC("pauseElement", svg_udom_smil_pause, 0),
-			SMJS_FUNCTION_SPEC("resumeElement", svg_udom_smil_resume, 0),
-			SMJS_FUNCTION_SPEC("restartElement", svg_udom_smil_restart, 0),
-			SMJS_FUNCTION_SPEC("setSpeed", svg_udom_smil_set_speed, 0),
-
-			SMJS_FUNCTION_SPEC("getTotalLength", svg_path_get_total_length, 0),
-
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-
-		JSPropertySpec svgElementProps[] = {
-			/*svgElement interface*/
-			SMJS_PROPERTY_SPEC("id",						0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			/*svgSVGElement interface*/
-			SMJS_PROPERTY_SPEC("currentScale",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("currentRotate",			6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("currentTranslate",		7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("viewport",				8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("currentTime",				9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			/*timeControl interface*/
-			SMJS_PROPERTY_SPEC("isPaused",				10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*old SVG1.1 stuff*/
-			SMJS_PROPERTY_SPEC("ownerSVGElement",			11,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			/*SVGElementInstance*/
-			SMJS_PROPERTY_SPEC("correspondingElement",	12, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("correspondingUseElement",	13, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &svg_rt->svgElement, 0, 0, svgElementProps, svgElementFuncs, 0, 0);
-
-	}
-
-	/*RGBColor class*/
-	{
-		JSPropertySpec rgbClassProps[] = {
-			SMJS_PROPERTY_SPEC("red",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("green",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("blue",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->rgbClass, 0, 0, rgbClassProps, 0, 0, 0);
-	}
-	/*SVGRect class*/
-	{
-		JSPropertySpec rectClassProps[] = {
-			SMJS_PROPERTY_SPEC("x",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("y",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("width",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("height",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->rectClass, 0, 0, rectClassProps, 0, 0, 0);
-	}
-	/*SVGPoint class*/
-	{
-		JSPropertySpec pointClassProps[] = {
-			SMJS_PROPERTY_SPEC("x",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("y",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->pointClass, 0, 0, pointClassProps, 0, 0, 0);
-	}
-	/*SVGMatrix class*/
-	{
-		JSFunctionSpec matrixClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("getComponent", svg_mx2d_get_component, 1),
-			SMJS_FUNCTION_SPEC("mMultiply", svg_mx2d_multiply, 1),
-			SMJS_FUNCTION_SPEC("inverse", svg_mx2d_inverse, 0),
-			SMJS_FUNCTION_SPEC("mTranslate", svg_mx2d_translate, 2),
-			SMJS_FUNCTION_SPEC("mScale", svg_mx2d_scale, 1),
-			SMJS_FUNCTION_SPEC("mRotate", svg_mx2d_rotate, 1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec matrixClassProps[] = {
-			SMJS_PROPERTY_SPEC("a",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("b",	1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("c",	2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("d",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("e",	4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("f",	5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->matrixClass, 0, 0, matrixClassProps, matrixClassFuncs, 0, 0);
-	}
-	/*SVGPath class*/
-	{
-		JSFunctionSpec pathClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("getSegment", svg_path_get_segment, 1),
-			SMJS_FUNCTION_SPEC("getSegmentParam", svg_path_get_segment_param, 2),
-			SMJS_FUNCTION_SPEC("moveTo", svg_path_move_to, 2),
-			SMJS_FUNCTION_SPEC("lineTo", svg_path_line_to, 2),
-			SMJS_FUNCTION_SPEC("quadTo", svg_path_quad_to, 4),
-			SMJS_FUNCTION_SPEC("curveTo", svg_path_curve_to, 6),
-			SMJS_FUNCTION_SPEC("close", svg_path_close, 0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec pathClassProps[] = {
-			SMJS_PROPERTY_SPEC("numberOfSegments",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->pathClass, 0, 0, pathClassProps, pathClassFuncs, 0, 0);
-		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "MOVE_TO", INT_TO_JSVAL(77), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "LINE_TO", INT_TO_JSVAL(76), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "CURVE_TO", INT_TO_JSVAL(67), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "QUAD_TO", INT_TO_JSVAL(81), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-		JS_DefineProperty(scene->svg_js->js_ctx, svg_rt->pathClass._proto, "CLOSE", INT_TO_JSVAL(90), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
-
-	}
-	/*we have our own constructors*/
-	dom_set_class_selector(scene->svg_js->js_ctx, svg_get_element_class, svg_get_document_class);
-
-	/*create document object*/
-	dom_js_define_document(scene->svg_js->js_ctx, scene->svg_js->global, scene);
-	/*create event object, and remember it*/
-	scene->svg_js->event = dom_js_define_event(scene->svg_js->js_ctx, scene->svg_js->global);
-}
-
-Bool svg_script_execute(GF_SceneGraph *sg, char *utf8_script, GF_DOM_Event *event)
-{
-	char szFuncName[1024];
-	JSBool ret;
-	jsval rval;
-	GF_DOM_Event *prev_event = NULL;
-	char *sep = strchr(utf8_script, '(');
-
-	if (!sep) {
-		strcpy(szFuncName, utf8_script);
-		strcat(szFuncName, "(evt)");
-		utf8_script = szFuncName;
-	}
-
-	gf_sg_lock_javascript(sg->svg_js->js_ctx, GF_TRUE);
-
-	prev_event = (GF_DOM_Event *)SMJS_GET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event);
-	SMJS_SET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event, event);
-	ret = JS_EvaluateScript(sg->svg_js->js_ctx, sg->svg_js->global, utf8_script, (u32) strlen(utf8_script), 0, 0, &rval);
-	SMJS_SET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event, prev_event);
-
-	if (ret==JS_FALSE) {
-		char *sep = strchr(utf8_script, '(');
-		if (sep) {
-			sep[0] = 0;
-			ret = JS_LookupProperty(sg->svg_js->js_ctx, sg->svg_js->global, utf8_script, &rval);
-			sep[0] = '(';
-		}
-	}
-
-	if (sg->svg_js->force_gc) {
-		gf_sg_js_call_gc(sg->svg_js->js_ctx);
-		sg->svg_js->force_gc = GF_FALSE;
-	}
-	gf_sg_lock_javascript(sg->svg_js->js_ctx, GF_FALSE);
-
-	return (ret==JS_FALSE) ? GF_FALSE : GF_TRUE;
-}
-
-void html_media_js_api_del();
-
-void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph)
-{
-	gf_sg_js_dom_pre_destroy(svg_js->js_ctx, scenegraph, NULL);
-	/*user-defined extensions*/
-	gf_sg_load_script_extensions(scenegraph, svg_js->js_ctx, svg_js->global, GF_TRUE);
-	gf_sg_ecmascript_del(svg_js->js_ctx);
-	dom_js_unload();
-	gf_free(svg_js);
-	scenegraph->svg_js = NULL;
-	assert(svg_rt);
-	svg_rt->nb_inst--;
-	if (!svg_rt->nb_inst) {
-		/* HTML */
-		html_media_js_api_del();
-		gf_free(svg_rt);
-		svg_rt = NULL;
-	}
-}
-
-static void svg_script_predestroy(GF_Node *n, void *eff, Bool is_destroy)
-{
-	if (is_destroy) {
-		GF_SVGJS *svg_js = n->sgprivate->scenegraph->svg_js;
-		/*unregister script from parent scene (cf base_scenegraph::sg_reset) */
-		gf_list_del_item(n->sgprivate->scenegraph->scripts, n);
-
-		if (svg_js->nb_scripts) {
-			svg_js->nb_scripts--;
-
-			/*detach this script from our object cache*/
-			gf_sg_js_dom_pre_destroy(svg_js->js_ctx, n->sgprivate->scenegraph, n);
-
-			if (!svg_js->nb_scripts) {
-				gf_svg_script_context_del(svg_js, n->sgprivate->scenegraph);
-			}
-		}
-	}
-}
-
-GF_Err JSScript_CreateSVGContext(GF_SceneGraph *sg)
-{
-	GF_SVGJS *svg_js;
-
-	if (sg->svg_js) {
-		/* the JS/SVG context is already created, no need to do anything  */
-		return GF_OK;
-	}
-
-	GF_SAFEALLOC(svg_js, GF_SVGJS);
-	if (!svg_js) {
-		return GF_OUT_OF_MEM;
-	}
-	/*create new ecmascript context*/
-	svg_js->js_ctx = gf_sg_ecmascript_new(sg);
-	if (!svg_js->js_ctx) {
-		gf_free(svg_js);
-		return GF_SCRIPT_ERROR;
-	}
-
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_TRUE);
-
-	if (!svg_rt) {
-		GF_SAFEALLOC(svg_rt, GF_SVGuDOM);
-		JS_SETUP_CLASS(svg_rt->svgElement, "SVGElement", JSCLASS_HAS_PRIVATE, svg_element_getProperty, svg_element_setProperty, dom_element_finalize);
-		JS_SETUP_CLASS(svg_rt->svgDocument, "SVGDocument", JSCLASS_HAS_PRIVATE, svg_doc_getProperty, JS_PropertyStub_forSetter, dom_document_finalize);
-		JS_SETUP_CLASS(svg_rt->globalClass, "Window", JSCLASS_HAS_PRIVATE, global_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
-		JS_SETUP_CLASS(svg_rt->rgbClass, "SVGRGBColor", JSCLASS_HAS_PRIVATE, rgb_getProperty, rgb_setProperty, baseCI_finalize);
-		JS_SETUP_CLASS(svg_rt->rectClass, "SVGRect", JSCLASS_HAS_PRIVATE, rect_getProperty, rect_setProperty, baseCI_finalize);
-		JS_SETUP_CLASS(svg_rt->pointClass, "SVGPoint", JSCLASS_HAS_PRIVATE, point_getProperty, point_setProperty, baseCI_finalize);
-		JS_SETUP_CLASS(svg_rt->matrixClass, "SVGMatrix", JSCLASS_HAS_PRIVATE, matrix_getProperty, matrix_setProperty, baseCI_finalize);
-		JS_SETUP_CLASS(svg_rt->pathClass, "SVGPath", JSCLASS_HAS_PRIVATE, path_getProperty, JS_PropertyStub_forSetter, pathCI_finalize);
-		JS_SETUP_CLASS(svg_rt->consoleClass, "console", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
-	}
-	svg_rt->nb_inst++;
-
-	sg->svg_js = svg_js;
-	/*load SVG & DOM APIs*/
-	svg_init_js_api(sg);
-
-	/* HTML */
-	html_media_init_js_api(sg);
-
-	svg_js->script_execute = svg_script_execute;
-	svg_js->handler_execute = svg_script_execute_handler;
-
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
-
-	return GF_OK;
-}
-
-GF_DOMText *svg_get_text_child(GF_Node *node)
-{
-	GF_ChildNodeItem *child;
-	GF_DOMText *txt;
-	txt = NULL;
-	child = ((SVG_Element*)node)->children;
-	if (! child) return NULL;
-	while (child) {
-		txt = (GF_DOMText*)child->node;
-		if ((txt->sgprivate->tag==TAG_DOMText) && txt->textContent) return txt;
-		txt = NULL;
-		child = child->next;
-	}
-	return NULL;
-}
-
-static Bool svg_js_load_script(GF_Node *script, char *file)
-{
-	FILE *jsf;
-	char *jsscript;
-	u32 fsize;
-	Bool success = GF_TRUE;
-	JSBool ret;
-	jsval rval;
-	GF_SVGJS *svg_js;
-
-	svg_js = script->sgprivate->scenegraph->svg_js;
-	if (!strnicmp(file, "file://", 7)) file += 7;
-	jsf = gf_fopen(file, "rb");
-	if (!jsf) {
-		GF_JSAPIParam par;
-		GF_SceneGraph *scene = script->sgprivate->scenegraph;
-		char *abs_url = NULL;
-		par.uri.url = file;
-		if (scene->script_action && scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_RESOLVE_XLINK, script, &par))
-			abs_url = (char *) par.uri.url;
-
-		if (abs_url) {
-			jsf = gf_fopen(abs_url, "rb");
-			gf_free(abs_url);
-		}
-	}
-	if (!jsf) return GF_FALSE;
-
-	gf_fseek(jsf, 0, SEEK_END);
-	fsize = (u32) gf_ftell(jsf);
-	gf_fseek(jsf, 0, SEEK_SET);
-	jsscript = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
-	fsize = (u32) fread(jsscript, sizeof(char), (size_t)fsize, jsf);
-	gf_fclose(jsf);
-	jsscript[fsize] = 0;
-	if ((s32) fsize<0) return GF_FALSE;
-
-	/*for handler, only load code*/
-	if (script->sgprivate->tag==TAG_SVG_handler) {
-		GF_DOMText *txt = gf_dom_add_text_node(script, jsscript);
-		txt->type = GF_DOM_TEXT_INSERTED;
-		return GF_TRUE;
-	}
-
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_TRUE);
-
-	ret = JS_EvaluateScript(svg_js->js_ctx, svg_js->global, jsscript, sizeof(char)*fsize, file, 0, &rval);
-
-	if (svg_js->force_gc) {
-		gf_sg_js_call_gc(svg_js->js_ctx);
-		svg_js->force_gc = GF_FALSE;
-	}
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
-
-	if (ret==JS_FALSE) success = GF_FALSE;
-	gf_dom_listener_process_add(script->sgprivate->scenegraph);
-
-	gf_free(jsscript);
-	return success;
-}
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-
-
-void JSScript_LoadSVG(GF_Node *node)
-{
-	GF_DOMText *txt;
-	GF_SVGJS *svg_js;
-	JSBool ret;
-	jsval rval;
-	GF_FieldInfo href_info;
-
-	if (!node->sgprivate->scenegraph->svg_js) {
-		if (JSScript_CreateSVGContext(node->sgprivate->scenegraph) != GF_OK) return;
-	}
-
-	/*register script with parent scene (cf base_scenegraph::sg_reset) */
-	gf_list_add(node->sgprivate->scenegraph->scripts, node);
-
-	svg_js = node->sgprivate->scenegraph->svg_js;
-	if (!node->sgprivate->UserCallback) {
-		svg_js->nb_scripts++;
-		node->sgprivate->UserCallback = svg_script_predestroy;
-	}
-	/*if href download the script file*/
-	if (gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &href_info) == GF_OK) {
-		GF_DownloadManager *dnld_man;
-		GF_JSAPIParam par;
-		char *url;
-		GF_Err e;
-		XMLRI *xmlri = (XMLRI *)href_info.far_ptr;
-
-		/* getting a download manager */
-		par.dnld_man = NULL;
-		ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
-		dnld_man = par.dnld_man;
-
-
-		/* resolve the uri of the script*/
-		par.uri.nb_params = 0;
-		par.uri.url = xmlri->string;
-		ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_RESOLVE_URI, node, &par);
-		url = (char *)par.uri.url;
-
-		/* if the file is local, we don't need to download it */
-		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
-			svg_js_load_script(node, url);
-		} else if (dnld_man) {
-			/*fetch the remote script synchronously and load it - cf section on script processing in SVG specs*/
-			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					const char *szCache = gf_dm_sess_get_cache_name(sess);
-					if (!svg_js_load_script(node, (char *) szCache))
-						e = GF_SCRIPT_ERROR;
-				}
-				gf_dm_sess_del(sess);
-			}
-			if (e) {
-				par.info.e = e;
-				par.info.msg = "Cannot fetch script";
-				ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_MESSAGE, NULL, &par);
-			}
-		}
-		gf_free(url);
-	}
-	/*for scripts only, execute*/
-	else if (node->sgprivate->tag == TAG_SVG_script) {
-		txt = svg_get_text_child(node);
-		if (!txt) return;
-		ret = JS_EvaluateScript(svg_js->js_ctx, svg_js->global, txt->textContent, (u32) strlen(txt->textContent), 0, 0, &rval);
-		if (ret==JS_FALSE) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid script\n") );
-		}
-		gf_dom_listener_process_add(node->sgprivate->scenegraph);
-	}
-}
-
-
-#ifdef _DEBUG
-//#define DUMP_DEF_AND_ROOT
-#endif
-
-#ifdef DUMP_DEF_AND_ROOT
-void dump_root(const char *name, void *rp, void *data)
-{
-	if (name[0]=='_') fprintf(stderr, "\t%s\n", name);
-}
-#endif
-
-/* Executes JavaScript code in response to an event being triggered
-  The code to be executed (stored in a GF_DOMHandler struct) is either:
-  - text content not yet passed to the JS engine
-     - text contained in a node's text content not yet parsed (node)
-	 - text, outside of a node, obtained by some external means (XHR, ...) - utf8_script
-  - already in the JS engine, in the form of:
-     - an anonymous function (js_fun_val)
-	 - a named function (js_fun)
-*/
-static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script)
-{
-	GF_DOMText *txt = NULL;
-	GF_SVGJS *svg_js;
-	JSObject *__this;
-	JSBool ret = JS_TRUE;
-	GF_DOM_Event *prev_event = NULL;
-	GF_DOMHandler *hdl = (GF_DOMHandler *)node;
-	jsval fval, rval;
-
-	/*LASeR hack for encoding scripts without handler - node is a listener in this case, not a handler*/
-	if (utf8_script) {
-		if (!node) return GF_FALSE;
-		hdl = NULL;
-	} else {
-		if (!hdl->js_fun && !hdl->js_fun_val && !hdl->evt_listen_obj) {
-			txt = svg_get_text_child(node);
-			if (!txt) return GF_FALSE;
-		}
-		/*not sure about this (cf test struct-use-205-t.svg)*/
-		//if (!node->sgprivate->parents) return GF_FALSE;
-	}
-
-	svg_js = node->sgprivate->scenegraph->svg_js;
-
-#ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_SCRIPT, GF_LOG_DEBUG)) {
-		char *content, *_content = NULL;
-		if (utf8_script) {
-			content = utf8_script;
-		} else if (hdl->js_fun_val) {
-			JSString *s = JS_DecompileFunction(svg_js->js_ctx, JS_ValueToFunction(svg_js->js_ctx, (jsval) hdl->js_fun_val), 0);
-			content = _content = SMJS_CHARS_FROM_STRING(svg_js->js_ctx, s);
-		} else if (hdl->js_fun) {
-			JSString *s=JS_DecompileFunction(svg_js->js_ctx, (JSFunction *)hdl->js_fun, 0);
-			content = _content = SMJS_CHARS_FROM_STRING(svg_js->js_ctx, s);
-		} else if (txt) {
-			content = txt->textContent;
-		} else {
-			content = "unknown";
-		}
-		gf_log_lt(GF_LOG_DEBUG, GF_LOG_SCRIPT);
-		gf_log("[DOM Events    ] Executing script code from handler: %s\n", content);
-		SMJS_FREE(svg_js->js_ctx, _content);
-	}
-#endif
-
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_TRUE);
-	prev_event = (GF_DOM_Event *)SMJS_GET_PRIVATE(svg_js->js_ctx, svg_js->event);
-	/*break loops*/
-	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
-		gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
-		return GF_FALSE;
-	}
-	SMJS_SET_PRIVATE(svg_js->js_ctx, svg_js->event, event);
-
-	svg_js->in_script = GF_TRUE;
-
-	/*if an observer is being specified, use it*/
-	if (hdl && hdl->evt_listen_obj) __this = (JSObject *)hdl->evt_listen_obj;
-	/*compile the jsfun if any - 'this' is the associated observer*/
-	else __this = observer ? JSVAL_TO_OBJECT( dom_element_construct(svg_js->js_ctx, observer) ) : svg_js->global;
-	if (txt && hdl && !hdl->js_fun) {
-		const char *argn = "evt";
-		hdl->js_fun = JS_CompileFunction(svg_js->js_ctx, __this, NULL, 1, &argn, txt->textContent, strlen(txt->textContent), NULL, 0);
-	}
-
-	if (utf8_script) {
-		ret = JS_EvaluateScript(svg_js->js_ctx, __this, utf8_script, (u32) strlen(utf8_script), 0, 0, &rval);
-	}
-	else if (hdl->js_fun || hdl->js_fun_val || hdl->evt_listen_obj) {
-		JSObject *evt;
-		jsval argv[1];
-		evt = gf_dom_new_event(svg_js->js_ctx);
-		SMJS_SET_PRIVATE(svg_js->js_ctx, evt, event);
-		argv[0] = OBJECT_TO_JSVAL(evt);
-
-		if (hdl->js_fun) {
-			ret = JS_CallFunction(svg_js->js_ctx, __this, (JSFunction *)hdl->js_fun, 1, argv, &rval);
-		}
-		else if (hdl->js_fun_val) {
-			jsval funval = (jsval) hdl->js_fun_val;
-			ret = JS_CallFunctionValue(svg_js->js_ctx, __this, funval, 1, argv, &rval);
-		} else {
-			ret = JS_CallFunctionName(svg_js->js_ctx, (JSObject *)hdl->evt_listen_obj, "handleEvent", 1, argv, &rval);
-		}
-	}
-	else if (JS_LookupProperty(svg_js->js_ctx, svg_js->global, txt->textContent, &fval) && !JSVAL_IS_VOID(fval) ) {
-		if (svg_script_execute(node->sgprivate->scenegraph, txt->textContent, event))
-			ret = JS_FALSE;
-	}
-	else {
-		ret = JS_EvaluateScript(svg_js->js_ctx, __this, txt->textContent, (u32) strlen(txt->textContent), 0, 0, &rval);
-	}
-
-	/*check any pending exception if outer-most event*/
-	if (!prev_event && JS_IsExceptionPending(svg_js->js_ctx)) {
-		JS_ReportPendingException(svg_js->js_ctx);
-		JS_ClearPendingException(svg_js->js_ctx);
-	}
-
-	SMJS_SET_PRIVATE(svg_js->js_ctx, svg_js->event, prev_event);
-	if (txt && hdl) hdl->js_fun=0;
-
-	while (svg_js->force_gc) {
-		svg_js->force_gc = GF_FALSE;
-		gf_sg_js_call_gc(svg_js->js_ctx);
-	}
-	svg_js->in_script = GF_FALSE;
-
-	gf_sg_lock_javascript(svg_js->js_ctx, GF_FALSE);
-
-#ifdef DUMP_DEF_AND_ROOT
-	if ((event->type==GF_EVENT_CLICK) || (event->type==GF_EVENT_MOUSEOVER)) {
-		NodeIDedItem *reg_node;
-		fprintf(stderr, "Node registry\n");
-		reg_node = node->sgprivate->scenegraph->id_node;
-		while (reg_node) {
-			fprintf(stderr, "\t%s\n", reg_node->NodeName);
-			reg_node = reg_node->next;
-		}
-
-		fprintf(stderr, "\n\nNamed roots:\n");
-		JS_DumpNamedRoots(JS_GetRuntime(svg_js->js_ctx), dump_root, NULL);
-	}
-#endif
-
-	if (ret==JS_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid event handler script\n" ));
-		return GF_FALSE;
-	}
-	return GF_TRUE;
-}
-
-#endif
-
-#endif

gpac-0.8.0.tar.gz/src/scenegraph/vrml_smjs.c Deleted

@@ -1,5134 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
-
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/modules/term_ext.h>
-#include <gpac/modules/js_usr.h>
-
-#include <gpac/internal/smjs_api.h>
-
-
-/*fixes for JS > 1.8.0rc1 where GC routines have changed*/
-GF_EXPORT
-Bool gf_js_add_root(JSContext *cx, void *rp, u32 type)
-{
-#if (JS_VERSION>=185)
-	JSBool ret;
-	switch (type) {
-	case GF_JSGC_STRING:
-		ret = JS_AddStringRoot(cx, rp);
-		break;
-	case GF_JSGC_OBJECT:
-		ret = JS_AddObjectRoot(cx, rp);
-		break;
-	case GF_JSGC_VAL:
-		ret = JS_AddValueRoot(cx, rp);
-		break;
-	default:
-		ret = JS_AddGCThingRoot(cx, rp);
-		break;
-	}
-	return (ret == JS_TRUE) ? 1 : 0;
-#else
-	return (JS_AddRoot(cx, rp)==JS_TRUE) ? 1 : 0;
-#endif
-}
-
-GF_EXPORT
-Bool gf_js_add_named_root(JSContext *cx, void *rp, u32 type, const char *name)
-{
-#if (JS_VERSION>=185)
-	JSBool ret;
-	switch (type) {
-	case GF_JSGC_STRING:
-		ret = JS_AddNamedStringRoot(cx, rp, name);
-		break;
-	case GF_JSGC_OBJECT:
-		ret = JS_AddNamedObjectRoot(cx, rp, name);
-		break;
-	case GF_JSGC_VAL:
-		ret = JS_AddNamedValueRoot(cx, rp, name);
-		break;
-	default:
-		ret = JS_AddNamedGCThingRoot(cx, rp, name);
-		break;
-	}
-	return (ret == JS_TRUE) ? 1 : 0;
-#else
-	return (JS_AddNamedRoot(cx, rp, name)==JS_TRUE) ? 1 : 0;
-#endif
-}
-
-
-JSObject *gf_sg_js_global_object(JSContext *cx, GF_JSClass *__class)
-{
-#if (JS_VERSION>=185)
-	__class->_class.flags |= JSCLASS_GLOBAL_FLAGS;
-#ifdef USE_FFDEV_16
-	return JS_NewGlobalObject(cx, &__class->_class, NULL);
-#else
-	return JS_NewCompartmentAndGlobalObject(cx, &__class->_class, NULL);
-#endif
-
-#else
-	return JS_NewObject(cx, &__class->_class, 0, 0 );
-#endif
-}
-
-#if !defined(__GNUC__)
-# if defined(_WIN32_WCE)
-#  pragma comment(lib, "js32")
-# elif defined (_WIN64)
-#  pragma comment(lib, "js")
-# elif defined (WIN32)
-#  pragma comment(lib, "js")
-# endif
-#endif
-
-/*define this macro to force Garbage Collection after each input to JS (script initialize/shutdown and all eventIn)
-on latest SM, GC will crash if called from a different thread than the thread creating the contex, no clue why
-
-for iOS don't force GC (better performances according to Ivica)
-
-NOTE - this is currently disabled, as performing the GC at each root with complex scenes (lots of objects) really decreases performances
-*/
-#if !defined(GPAC_IPHONE)
-# if (JS_VERSION<180)
-//#  define FORCE_GC
-# endif
-#endif
-
-
-typedef struct
-{
-	u8 is_setup;
-	/*set to true for proto IS fields*/
-	u8 IS_route;
-
-	u32 ID;
-	char *name;
-
-	/*scope of this route*/
-	GF_SceneGraph *graph;
-	u32 lastActivateTime;
-
-	GF_Node *FromNode;
-	GF_FieldInfo FromField;
-
-	GF_Node *ToNode;
-	GF_FieldInfo ToField;
-
-	JSObject *obj;
-	jsval fun;
-} GF_RouteToScript;
-
-
-#define _ScriptMessage(_c, _msg) {	\
-		GF_Node *_n = (GF_Node *) JS_GetContextPrivate(_c);	\
-		if (_n->sgprivate->scenegraph->script_action) {\
-			GF_JSAPIParam par;	\
-			par.info.e = GF_SCRIPT_INFO;			\
-			par.info.msg = (_msg);		\
-			_n->sgprivate->scenegraph->script_action(_n->sgprivate->scenegraph->script_action_cbck, GF_JSAPI_OP_MESSAGE, NULL, &par);\
-		}	\
-		}
-
-static Bool ScriptAction(JSContext *c, GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
-{
-	if (!scene) {
-		GF_Node *n = (GF_Node *) JS_GetContextPrivate(c);
-		scene = n->sgprivate->scenegraph;
-	}
-	if (scene->script_action)
-		return scene->script_action(scene->script_action_cbck, type, node, param);
-	return 0;
-}
-
-typedef struct
-{
-	JSRuntime *js_runtime;
-	u32 nb_inst;
-	JSContext *ctx;
-
-	GF_Mutex *mx;
-	GF_JSClass SFNodeClass;
-
-#ifndef GPAC_DISABLE_VRML
-	GF_JSClass globalClass;
-	GF_JSClass browserClass;
-	GF_JSClass SFVec2fClass;
-	GF_JSClass SFVec3fClass;
-	GF_JSClass SFRotationClass;
-	GF_JSClass SFColorClass;
-	GF_JSClass SFImageClass;
-	GF_JSClass MFInt32Class;
-	GF_JSClass MFBoolClass;
-	GF_JSClass MFFloatClass;
-	GF_JSClass MFTimeClass;
-	GF_JSClass MFVec2fClass;
-	GF_JSClass MFVec3fClass;
-	GF_JSClass MFRotationClass;
-	GF_JSClass MFColorClass;
-	GF_JSClass MFStringClass;
-	GF_JSClass MFUrlClass;
-	GF_JSClass MFNodeClass;
-	GF_JSClass AnyClass;
-#endif
-
-	/*extensions are loaded for the lifetime of the runtime NOT of the context - this avoids nasty
-	crashes with multiple contexts in SpiderMonkey (root'ing bug with InitStandardClasses)*/
-	GF_List *extensions;
-
-	GF_List *allocated_contexts;
-} GF_JSRuntime;
-
-static GF_JSRuntime *js_rt = NULL;
-
-GF_EXPORT
-Bool gf_js_remove_root(JSContext *cx, void *rp, u32 type)
-{
-#if (JS_VERSION>=185)
-	switch (type) {
-	case GF_JSGC_STRING:
-#ifdef USE_FFDEV_15
-		if (!cx) JS_RemoveStringRootRT(js_rt->js_runtime, rp);
-		else
-#endif
-			JS_RemoveStringRoot(cx, rp);
-		break;
-	case GF_JSGC_OBJECT:
-#ifdef USE_FFDEV_15
-		if (!cx) JS_RemoveObjectRootRT(js_rt->js_runtime, rp);
-		else
-#endif
-			JS_RemoveObjectRoot(cx, rp);
-		break;
-	case GF_JSGC_VAL:
-#ifdef USE_FFDEV_15
-		if (!cx) JS_RemoveValueRootRT(js_rt->js_runtime, rp);
-		else
-#endif
-			JS_RemoveValueRoot(cx, (jsval *) rp);
-		break;
-	default:
-		if (cx) JS_RemoveGCThingRoot(cx, rp);
-		break;
-	}
-	return 1;
-#else
-	return (JS_RemoveRoot(cx, rp)==JS_TRUE) ? 1 : 0;
-#endif
-}
-
-void gf_sg_load_script_extensions(GF_SceneGraph *sg, JSContext *c, JSObject *obj, Bool unload)
-{
-	u32 i, count;
-	count = gf_list_count(js_rt->extensions);
-	for (i=0; i<count; i++) {
-		GF_JSUserExtension *ext = (GF_JSUserExtension *) gf_list_get(js_rt->extensions, i);
-		ext->load(ext, sg, c, obj, unload);
-	}
-
-	//if (js_rt->nb_inst==1)
-	{
-		GF_Terminal *term;
-		GF_JSAPIParam par;
-
-		if (!sg->script_action) return;
-		if (!sg->script_action(sg->script_action_cbck, GF_JSAPI_OP_GET_TERM, sg->RootNode, &par))
-			return;
-
-		term = par.term;
-
-		count = gf_list_count(term->extensions);
-		for (i=0; i<count; i++) {
-			GF_TermExt *ext = (GF_TermExt *) gf_list_get(term->extensions, i);
-			if (ext->caps & GF_TERM_EXTENSION_JS) {
-				GF_TermExtJS te;
-				te.ctx = c;
-				te.global = obj;
-				te.scenegraph = sg;
-				te.unload = unload;
-				ext->process(ext, GF_TERM_EXT_JSBIND, &te);
-			}
-		}
-	}
-}
-
-
-static void gf_sg_load_script_modules(GF_SceneGraph *sg)
-{
-	GF_Terminal *term;
-	u32 i, count;
-	GF_JSAPIParam par;
-
-	js_rt->extensions = gf_list_new();
-
-	if (!sg->script_action) return;
-	if (!sg->script_action(sg->script_action_cbck, GF_JSAPI_OP_GET_TERM, sg->RootNode, &par))
-		return;
-
-	term = par.term;
-
-	count = gf_modules_get_count(term->user->modules);
-	for (i=0; i<count; i++) {
-		GF_JSUserExtension *ext = (GF_JSUserExtension *) gf_modules_load_interface(term->user->modules, i, GF_JS_USER_EXT_INTERFACE);
-		if (!ext) continue;
-		gf_list_add(js_rt->extensions, ext);
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_SCRIPT, ("[ECMAScript] found %d JS extensions for %d modules\n", gf_list_count(js_rt->extensions), count));
-}
-
-static void gf_sg_unload_script_modules()
-{
-	while (gf_list_count(js_rt->extensions)) {
-		GF_JSUserExtension *ext = gf_list_last(js_rt->extensions);
-		gf_list_rem_last(js_rt->extensions);
-		gf_modules_close_interface((GF_BaseInterface *) ext);
-	}
-	gf_list_del(js_rt->extensions);
-}
-
-
-#ifdef NO_JS_RUNTIMETHREAD
-void JS_SetRuntimeThread(JSRuntime *jsr)
-{
-}
-void JS_ClearRuntimeThread(JSRuntime *jsr)
-{
-}
-#endif
-
-
-#ifdef __SYMBIAN32__
-const long MAX_HEAP_BYTES = 256 * 1024L;
-#else
-const long MAX_HEAP_BYTES = 32*1024*1024L;
-#endif
-const long STACK_CHUNK_BYTES = 8*1024L;
-
-JSContext *gf_sg_ecmascript_new(GF_SceneGraph *sg)
-{
-	JSContext *ctx;
-	if (!js_rt) {
-		JSRuntime *js_runtime = JS_NewRuntime(MAX_HEAP_BYTES);
-		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));
-		gf_sg_load_script_modules(sg);
-	}
-	js_rt->nb_inst++;
-
-	gf_mx_p(js_rt->mx);
-#if defined(JS_THREADSAFE) && (JS_VERSION>=185)
-	if (gf_mx_get_num_locks(js_rt->mx)==1) {
-		JS_SetRuntimeThread(js_rt->js_runtime);
-	}
-#endif
-
-	ctx = JS_NewContext(js_rt->js_runtime, STACK_CHUNK_BYTES);
-	JS_SetOptions(ctx, JS_GetOptions(ctx) | JSOPTION_WERROR);
-
-#if defined(JS_THREADSAFE) && (JS_VERSION>=185)
-	JS_ClearContextThread(ctx);
-	if (gf_mx_get_num_locks(js_rt->mx)==1) {
-		JS_ClearRuntimeThread(js_rt->js_runtime);
-	}
-#endif
-
-	gf_list_add(js_rt->allocated_contexts, ctx);
-	gf_mx_v(js_rt->mx);
-
-	return ctx;
-}
-
-void gf_sg_ecmascript_del(JSContext *ctx)
-{
-#ifdef JS_THREADSAFE
-#if (JS_VERSION>=185)
-	assert(js_rt);
-	JS_SetRuntimeThread(js_rt->js_runtime);
-	JS_SetContextThread(ctx);
-#endif
-#endif
-
-	gf_sg_js_call_gc(ctx);
-
-	gf_list_del_item(js_rt->allocated_contexts, ctx);
-	JS_DestroyContext(ctx);
-	if (js_rt) {
-		js_rt->nb_inst --;
-		if (js_rt->nb_inst == 0) {
-			JS_DestroyRuntime(js_rt->js_runtime);
-			JS_ShutDown();
-			gf_sg_unload_script_modules();
-			gf_list_del(js_rt->allocated_contexts);
-			gf_mx_del(js_rt->mx);
-			gf_free(js_rt);
-			js_rt = NULL;
-		}
-	}
-}
-
-
-GF_EXPORT
-#if (JS_VERSION>=185)
-#if defined(USE_FFDEV_18)
-JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj, JSMutableHandleValue __val, JSBool *vp)
-#elif defined(USE_FFDEV_15)
-JSBool gf_sg_js_has_instance(JSContext *c, JSHandleObject obj,const jsval *val, JSBool *vp)
-#else
-JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj,const jsval *val, JSBool *vp)
-#endif
-#else
-JSBool gf_sg_js_has_instance(JSContext *c, JSObject *obj, jsval val, JSBool *vp)
-#endif
-{
-#ifdef USE_FFDEV_18
-	jsval       *val = __val._;
-#endif
-	*vp = JS_FALSE;
-#if (JS_VERSION>=185)
-	if (val && JSVAL_IS_OBJECT(*val)) {
-		JSObject *p = JSVAL_TO_OBJECT(*val);
-#else
-	if (JSVAL_IS_OBJECT(val)) {
-		JSObject *p = JSVAL_TO_OBJECT(val);
-#endif
-		JSClass *js_class = JS_GET_CLASS(c, obj);
-		if (JS_InstanceOf(c, p, js_class, NULL) ) *vp = JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-#ifndef GPAC_DISABLE_SVG
-/*SVG tags for script handling*/
-#include <gpac/nodes_svg.h>
-
-GF_Node *dom_get_element(JSContext *c, JSObject *obj);
-#endif
-
-
-JSBool gf_sg_script_to_node_field(struct JSContext *c, jsval v, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent);
-jsval gf_sg_script_to_smjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate);
-
-static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script);
-
-Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, jsval *rval);
-
-void gf_sg_js_call_gc(JSContext *c)
-{
-	gf_sg_lock_javascript(c, 1);
-#ifdef 	USE_FFDEV_14
-	JS_GC(js_rt->js_runtime);
-#else
-	JS_GC(c);
-#endif
-	gf_sg_lock_javascript(c, 0);
-}
-
-void do_js_gc(JSContext *c, GF_Node *node)
-{
-#ifdef FORCE_GC
-	node->sgprivate->scenegraph->trigger_gc = GF_TRUE;
-#endif
-
-	if (node->sgprivate->scenegraph->trigger_gc) {
-		node->sgprivate->scenegraph->trigger_gc = GF_FALSE;
-		gf_sg_js_call_gc(c);
-	}
-}
-
-
-#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)
-{
-	Fixed f, q, t, p, hue, sat, val;
-	u32 i;
-	hue = col->red;
-	sat = col->green;
-	val = col->blue;
-	if (sat==0) {
-		col->red = col->green = col->blue = val;
-		return;
-	}
-	if (hue == FIX_ONE) hue = 0;
-	else hue *= 6;
-	i = FIX2INT( gf_floor(hue) );
-	f = hue-i;
-	p = gf_mulfix(val, FIX_ONE - sat);
-	q = gf_mulfix(val, FIX_ONE - gf_mulfix(sat,f));
-	t = gf_mulfix(val, FIX_ONE - gf_mulfix(sat, FIX_ONE - f));
-	switch (i) {
-	case 0:
-		col->red = val;
-		col->green = t;
-		col->blue = p;
-		break;
-	case 1:
-		col->red = q;
-		col->green = val;
-		col->blue = p;
-		break;
-	case 2:
-		col->red = p;
-		col->green = val;
-		col->blue = t;
-		break;
-	case 3:
-		col->red = p;
-		col->green = q;
-		col->blue = val;
-		break;
-	case 4:
-		col->red = t;
-		col->green = p;
-		col->blue = val;
-		break;
-	case 5:
-		col->red = val;
-		col->green = p;
-		col->blue = q;
-		break;
-	}
-}
-
-void SFColor_toHSV(SFColor *col)
-{
-	Fixed h, s;
-	Fixed _max = MAX(col->red, MAX(col->green, col->blue));
-	Fixed _min = MIN(col->red, MAX(col->green, col->blue));
-
-	s = (_max == 0) ? 0 : gf_divfix(_max - _min, _max);
-	if (s != 0) {
-		Fixed rl = gf_divfix(_max - col->red, _max - _min);
-		Fixed gl = gf_divfix(_max - col->green, _max - _min);
-		Fixed bl = gf_divfix(_max - col->blue, _max - _min);
-		if (_max == col->red) {
-			if (_min == col->green) h = 60*(5+bl);
-			else h = 60*(1-gl);
-		} else if (_max == col->green) {
-			if (_min == col->blue) h = 60*(1+rl);
-			else h = 60*(3-bl);
-		} else {
-			if (_min == col->red) h = 60*(3+gl);
-			else h = 60*(5-rl);
-		}
-	} else {
-		h = 0;
-	}
-	col->red = h;
-	col->green = s;
-	col->blue = _max;
-}
-
-static GFINLINE GF_JSField *NewJSField(JSContext *c)
-{
-	GF_JSField *ptr;
-	GF_SAFEALLOC(ptr, GF_JSField);
-	if (!ptr) return NULL;
-	ptr->js_ctx = c;
-	return ptr;
-}
-
-static GFINLINE M_Script *JS_GetScript(JSContext *c)
-{
-	return (M_Script *) JS_GetContextPrivate(c);
-}
-static GFINLINE GF_ScriptPriv *JS_GetScriptStack(JSContext *c)
-{
-	M_Script *script = (M_Script *) JS_GetContextPrivate(c);
-	return script->sgprivate->UserPrivate;
-}
-
-static void script_error(JSContext *c, const char *msg, JSErrorReport *jserr)
-{
-	if (jserr->linebuf) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d (%s) - file %s\n", msg, jserr->lineno, jserr->linebuf, jserr->filename));
-	} else if (jserr->filename) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d - file %s\n", msg, jserr->lineno, jserr->filename));
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d\n", msg, jserr->lineno));
-	}
-}
-
-static JSBool SMJS_FUNCTION(JSPrint)
-{
-	SMJS_ARGS
-	if (!argc) return JS_FALSE;
-
-	if (JSVAL_IS_STRING(argv[0])) {
-		char *str = SMJS_CHARS(c, argv[0]);
-		_ScriptMessage(c, str);
-		SMJS_FREE(c, str);
-	}
-	if (JSVAL_IS_INT(argv[0]) && (argc>1) && JSVAL_IS_STRING(argv[1]) ) {
-		u32 level = JSVAL_TO_INT(argv[0]);
-		char *str = SMJS_CHARS(c, argv[1]);
-		if (level > GF_LOG_DEBUG) level = GF_LOG_DEBUG;
-		if (str[0] == '[') {
-			GF_LOG(level, GF_LOG_CONSOLE, ("%s\n", str));
-		} else {
-			GF_LOG(level, GF_LOG_CONSOLE, ("[JS] %s\n", str));
-		}
-		SMJS_FREE(c, str);
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(getName)
-{
-	JSString *s = JS_NewStringCopyZ(c, "GPAC RichMediaEngine");
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(getVersion)
-{
-	JSString *s = JS_NewStringCopyZ(c, GPAC_FULL_VERSION);
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(getCurrentSpeed)
-{
-	GF_JSAPIParam par;
-	GF_Node *node = JS_GetContextPrivate(c);
-	par.time = 0;
-	ScriptAction(c, NULL, GF_JSAPI_OP_GET_SPEED, node->sgprivate->scenegraph->RootNode, &par);
-	SMJS_SET_RVAL(  JS_MAKE_DOUBLE( c, par.time) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(getCurrentFrameRate)
-{
-	GF_JSAPIParam par;
-	GF_Node *node = JS_GetContextPrivate(c);
-	par.time = 0;
-	ScriptAction(c, NULL, GF_JSAPI_OP_GET_FPS, node->sgprivate->scenegraph->RootNode, &par);
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE( c, par.time) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(getWorldURL)
-{
-	GF_JSAPIParam par;
-	GF_Node *node = JS_GetContextPrivate(c);
-	par.uri.url = NULL;
-	par.uri.nb_params = 0;
-	if (ScriptAction(c, NULL, GF_JSAPI_OP_RESOLVE_URI, node->sgprivate->scenegraph->RootNode, &par)) {
-		JSString *s = JS_NewStringCopyZ(c, par.uri.url);
-		if (!s) return JS_FALSE;
-		SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-		gf_free(par.uri.url);
-		return JS_TRUE;
-	}
-	return JS_FALSE;
-}
-
-static JSObject *node_get_binding(GF_ScriptPriv *priv, GF_Node *node, Bool is_constructor)
-{
-	JSObject *obj;
-	GF_JSField *field;
-
-	if (node->sgprivate->interact && node->sgprivate->interact->js_binding && node->sgprivate->interact->js_binding->node) {
-		field = node->sgprivate->interact->js_binding->node;
-		if (!field->is_rooted) {
-			gf_js_add_root(priv->js_ctx, &field->obj, GF_JSGC_OBJECT);
-			field->is_rooted=1;
-		}
-		return field->obj;
-	}
-
-	field = NewJSField(priv->js_ctx);
-	field->field.fieldType = GF_SG_VRML_SFNODE;
-	field->node = node;
-	field->field.far_ptr = &field->node;
-
-
-	node->sgprivate->flags |= GF_NODE_HAS_BINDING;
-	gf_node_register(node, NULL);
-
-	obj = JS_NewObject(priv->js_ctx, &js_rt->SFNodeClass._class, 0, 0);
-	SMJS_SET_PRIVATE(priv->js_ctx, obj, field);
-
-	field->obj = obj;
-	gf_list_add(priv->js_cache, obj);
-
-	/*remember the object*/
-	if (!node->sgprivate->interact) {
-		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 NULL;
-		}
-	}
-	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 NULL;
-		}
-		node->sgprivate->interact->js_binding->fields = gf_list_new();
-	}
-	node->sgprivate->flags |= GF_NODE_HAS_BINDING;
-	node->sgprivate->interact->js_binding->node = field;
-	if (!is_constructor) {
-		field->is_rooted = 1;
-		gf_js_add_root(priv->js_ctx, &field->obj, GF_JSGC_OBJECT);
-	}
-	return obj;
-}
-
-static JSBool SMJS_FUNCTION(getScript)
-{
-	GF_ScriptPriv *priv = JS_GetScriptStack(c);
-	GF_Node *node = JS_GetContextPrivate(c);
-	JSObject *an_obj = node_get_binding(priv, node, 0);
-
-	if (an_obj) SMJS_SET_RVAL( OBJECT_TO_JSVAL(an_obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(loadScript)
-{
-	Bool no_complain = 0;
-	char *url;
-	GF_Node *node = JS_GetContextPrivate(c);
-	SMJS_ARGS
-	jsval aval;
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
-
-	if ((argc>1) && JSVAL_IS_BOOLEAN(argv[1])) no_complain = (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ? 1 : 0;
-
-	url = SMJS_CHARS(c, argv[0]);
-	if (url) {
-		JSScriptFromFile(node, url, no_complain, &aval);
-		SMJS_SET_RVAL(aval);
-	}
-	SMJS_FREE(c, url);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(getProto)
-{
-	JSObject *an_obj;
-	GF_ScriptPriv *priv = JS_GetScriptStack(c);
-	GF_Node *node = JS_GetContextPrivate(c);
-	SMJS_SET_RVAL( JSVAL_NULL);
-	if (!node->sgprivate->scenegraph->pOwningProto) {
-		return JS_TRUE;
-	}
-	node = (GF_Node *) node->sgprivate->scenegraph->pOwningProto;
-
-	an_obj = node_get_binding(priv, node, 0);
-	if (an_obj) SMJS_SET_RVAL( OBJECT_TO_JSVAL(an_obj) );
-	return JS_TRUE;
-}
-
-#ifndef GPAC_DISABLE_SVG
-char *js_get_utf8(jsval val);
-jsval dom_element_construct(JSContext *c, GF_Node *n);
-#endif
-
-static JSBool SMJS_FUNCTION(vrml_parse_xml)
-{
-#ifndef GPAC_DISABLE_SVG
-	GF_SceneGraph *sg;
-	GF_Node *node;
-	char *str;
-	GF_Node *gf_sm_load_svg_from_string(GF_SceneGraph *sg, char *svg_str);
-	SMJS_ARGS
-
-	str = js_get_utf8(argv[0]);
-	if (!str) return JS_TRUE;
-
-	node = JS_GetContextPrivate(c);
-	sg = node->sgprivate->scenegraph;
-
-	node = gf_sm_load_svg_from_string(sg, str);
-	gf_free(str);
-	SMJS_SET_RVAL( dom_element_construct(c, node) );
-#endif
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(getElementById)
-{
-	GF_Node *elt;
-	JSObject *an_obj;
-	char *name = NULL;
-	u32 ID = 0;
-	GF_ScriptPriv *priv = JS_GetScriptStack(c);
-	GF_Node *sc = JS_GetContextPrivate(c);
-	SMJS_ARGS
-	if (JSVAL_IS_STRING(argv[0])) name = SMJS_CHARS(c, argv[0]);
-	else if (JSVAL_IS_INT(argv[0])) ID = JSVAL_TO_INT(argv[0]);
-
-	if (!ID && !name) return JS_FALSE;
-
-	elt = NULL;
-	if (ID) elt = gf_sg_find_node(sc->sgprivate->scenegraph, ID);
-	else elt = gf_sg_find_node_by_name(sc->sgprivate->scenegraph, name);
-
-	SMJS_FREE(c, name);
-	if (!elt) return JS_TRUE;
-
-	an_obj = node_get_binding(priv, elt, 0);
-	if (an_obj) SMJS_SET_RVAL( OBJECT_TO_JSVAL(an_obj) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(replaceWorld)
-{
-	return JS_TRUE;
-}
-
-static void on_route_to_object(GF_Node *node, GF_Route *_r)
-{
-	jsval argv[2], rval;
-	Double time;
-	GF_FieldInfo t_info;
-	GF_ScriptPriv *priv;
-	JSObject *obj;
-	GF_RouteToScript *r = (GF_RouteToScript *)_r;
-	if (!node) return;
-	priv = gf_node_get_private(node);
-	if (!priv) return;
-
-	if (!r->FromNode) {
-		if (r->obj) {
-//			gf_js_remove_root(priv->js_ctx, &r->obj, GF_JSGC_OBJECT);
-			r->obj=NULL;
-		}
-		if ( ! JSVAL_IS_VOID(r->fun)) {
-//			gf_js_remove_root(priv->js_ctx, &r->fun, GF_JSGC_OBJECT);
-			r->fun=JSVAL_NULL;
-		}
-		return;
-	}
-
-	obj = (JSObject *) r->obj;
-	if (!obj) obj = priv->js_obj;
-
-	memset(&t_info, 0, sizeof(GF_FieldInfo));
-	time = gf_node_get_scene_time(node);
-	t_info.far_ptr = &time;
-	t_info.fieldType = GF_SG_VRML_SFTIME;
-	t_info.fieldIndex = -1;
-	t_info.name = "timestamp";
-
-	gf_sg_lock_javascript(priv->js_ctx, 1);
-
-	argv[1] = gf_sg_script_to_smjs_field(priv, &t_info, node, 1);
-	argv[0] = gf_sg_script_to_smjs_field(priv, &r->FromField, r->FromNode, 1);
-
-	/*protect args*/
-	if (JSVAL_IS_GCTHING(argv[0])) gf_js_add_root(priv->js_ctx, &argv[0], GF_JSGC_VAL);
-	if (JSVAL_IS_GCTHING(argv[1])) gf_js_add_root(priv->js_ctx, &argv[1], GF_JSGC_VAL);
-
-	JS_CallFunctionValue(priv->js_ctx, obj, (jsval) r->fun, 2, argv, &rval);
-
-	/*release args*/
-	if (JSVAL_IS_GCTHING(argv[0])) gf_js_remove_root(priv->js_ctx, &argv[0], GF_JSGC_VAL);
-	if (JSVAL_IS_GCTHING(argv[1])) gf_js_remove_root(priv->js_ctx, &argv[1], GF_JSGC_VAL);
-
-	/*check any pending exception if outer-most event*/
-	if ( (JS_IsRunning(priv->js_ctx)==JS_FALSE) && JS_IsExceptionPending(priv->js_ctx)) {
-		JS_ReportPendingException(priv->js_ctx);
-		JS_ClearPendingException(priv->js_ctx);
-	}
-
-	gf_sg_lock_javascript(priv->js_ctx, 0);
-
-	do_js_gc(priv->js_ctx, node);
-}
-
-static JSBool SMJS_FUNCTION(addRoute)
-{
-	GF_JSField *ptr;
-	GF_Node *n1, *n2;
-	char *f1, *f2;
-	GF_FieldInfo info;
-	u32 f_id1, f_id2;
-	GF_Err e;
-	SMJS_ARGS
-	if (argc!=4) return JS_FALSE;
-
-	if (!JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]));
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-	n1 = * ((GF_Node **)ptr->field.far_ptr);
-	if (!n1) return JS_FALSE;
-	n2 = NULL;
-
-	if (!JSVAL_IS_STRING(argv[1])) return JS_FALSE;
-	f1 = SMJS_CHARS(c, argv[1]);
-	if (!f1) return JS_FALSE;
-	if (!strnicmp(f1, "_field", 6)) {
-		f_id1 = atoi(f1+6);
-		e = gf_node_get_field(n1, f_id1, &info);
-	} else {
-		e = gf_node_get_field_by_name(n1, f1, &info);
-		f_id1 = info.fieldIndex;
-	}
-	SMJS_FREE(c, f1);
-	if (e != GF_OK) return JS_FALSE;
-
-
-	if (!JSVAL_IS_OBJECT(argv[2])) return JS_FALSE;
-
-	/*regular route*/
-	if (GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[2]), &js_rt->SFNodeClass, NULL) && JSVAL_IS_STRING(argv[3]) ) {
-		GF_Route *r;
-		ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[2]));
-		assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-		n2 = * ((GF_Node **)ptr->field.far_ptr);
-		if (!n2) return JS_FALSE;
-
-		f2 = SMJS_CHARS(c, argv[3]);
-		if (!f2) return JS_FALSE;
-
-		if (!strnicmp(f2, "_field", 6)) {
-			f_id2 = atoi(f2+6);
-			e = gf_node_get_field(n2, f_id2, &info);
-		} else {
-			if ((n2->sgprivate->tag==TAG_MPEG4_Script)
-#ifndef GPAC_DISABLE_X3D
-			        || (n2->sgprivate->tag==TAG_X3D_Script)
-#endif
-			   ) {
-				GF_FieldInfo src = info;
-				if (gf_node_get_field_by_name(n2, f2, &info) != GF_OK) {
-					gf_sg_script_field_new(n2, GF_SG_SCRIPT_TYPE_EVENT_IN, src.fieldType, f2);
-				}
-			}
-			e = gf_node_get_field_by_name(n2, f2, &info);
-			f_id2 = info.fieldIndex;
-		}
-		SMJS_FREE(c, f2);
-		if (e != GF_OK) return JS_FALSE;
-
-		r = gf_sg_route_new(n1->sgprivate->scenegraph, n1, f_id1, n2, f_id2);
-		if (!r) return JS_FALSE;
-	}
-	/*route to object*/
-	else {
-		u32 i = 0;
-		const char *fun_name;
-		GF_RouteToScript *r = NULL;
-		if (!JSVAL_IS_OBJECT(argv[3]) || !JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[3])) ) return JS_FALSE;
-
-		fun_name = JS_GetFunctionName( JS_ValueToFunction(c, argv[3] ) );
-		if (fun_name && n1->sgprivate->interact && n1->sgprivate->interact->routes ) {
-			while ( (r = (GF_RouteToScript*)gf_list_enum(n1->sgprivate->interact->routes, &i) )) {
-				if ( (r->FromNode == n1)
-				        && (r->FromField.fieldIndex == f_id1)
-				        && (r->ToNode == (GF_Node*)JS_GetScript(c))
-				        && !stricmp(r->ToField.name, fun_name)
-				   )
-					break;
-			}
-		}
-
-		if ( !r ) {
-			GF_SAFEALLOC(r, GF_RouteToScript)
-			if (!r) return JS_FALSE;
-			r->FromNode = n1;
-			r->FromField.fieldIndex = f_id1;
-			gf_node_get_field(r->FromNode, f_id1, &r->FromField);
-
-			r->ToNode = (GF_Node*)JS_GetScript(c);
-			r->ToField.fieldType = GF_SG_VRML_SCRIPT_FUNCTION;
-			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;
-
-			r->obj = JSVAL_TO_OBJECT( argv[2] ) ;
-//			gf_js_add_root(c, & r->obj, GF_JSGC_OBJECT);
-
-			r->fun = argv[3];
-//			gf_js_add_root(c, &r->fun, GF_JSGC_OBJECT);
-
-			r->is_setup = 1;
-			r->graph = n1->sgprivate->scenegraph;
-
-			if (!n1->sgprivate->interact) {
-				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_FALSE;
-				}
-			}
-			if (!n1->sgprivate->interact->routes) n1->sgprivate->interact->routes = gf_list_new();
-			gf_list_add(n1->sgprivate->interact->routes, r);
-			gf_list_add(n1->sgprivate->scenegraph->Routes, r);
-		}
-	}
-
-	return JS_TRUE;
-}
-
-
-static JSBool SMJS_FUNCTION(deleteRoute)
-{
-	GF_JSField *ptr;
-	GF_Node *n1, *n2;
-	char *f1, *f2;
-	GF_FieldInfo info;
-	GF_Route *r;
-	GF_Err e;
-	u32 f_id1, f_id2, i;
-	SMJS_ARGS
-	if (argc!=4) return JS_FALSE;
-
-	if (!JSVAL_IS_OBJECT(argv[0]) || JSVAL_IS_NULL(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-
-	if (JSVAL_IS_STRING(argv[1]) && JSVAL_IS_NULL(argv[2]) && JSVAL_IS_NULL(argv[3])) {
-		ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]));
-		assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-		n1 = * ((GF_Node **)ptr->field.far_ptr);
-		f1 = SMJS_CHARS(c, argv[1]);
-		if (!strcmp(f1, "ALL")) {
-			while (n1->sgprivate->interact && n1->sgprivate->interact->routes && gf_list_count(n1->sgprivate->interact->routes) ) {
-				r = gf_list_get(n1->sgprivate->interact->routes, 0);
-				gf_sg_route_del(r);
-			}
-		}
-		SMJS_FREE(c, f1);
-		return JS_TRUE;
-	}
-
-	if (!JSVAL_IS_OBJECT(argv[2]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[2]), &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-	if (!JSVAL_IS_STRING(argv[1]) || !JSVAL_IS_STRING(argv[3])) return JS_FALSE;
-
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]));
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-	n1 = * ((GF_Node **)ptr->field.far_ptr);
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[2]));
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-	n2 = * ((GF_Node **)ptr->field.far_ptr);
-
-	if (!n1 || !n2) return JS_FALSE;
-	if (!n1->sgprivate->interact) return JS_TRUE;
-
-	f1 = SMJS_CHARS(c, argv[1]);
-	f2 = SMJS_CHARS(c, argv[3]);
-	if (!f1 || !f2) {
-		SMJS_FREE(c, f1);
-		SMJS_FREE(c, f2);
-		return JS_FALSE;
-	}
-
-	if (!strnicmp(f1, "_field", 6)) {
-		f_id1 = atoi(f1+6);
-		e = gf_node_get_field(n1, f_id1, &info);
-	} else {
-		e = gf_node_get_field_by_name(n1, f1, &info);
-		f_id1 = info.fieldIndex;
-	}
-	SMJS_FREE(c, f1);
-	if (e != GF_OK) return JS_FALSE;
-
-	if (!strnicmp(f2, "_field", 6)) {
-		f_id2 = atoi(f2+6);
-		e = gf_node_get_field(n2, f_id2, &info);
-	} else {
-		e = gf_node_get_field_by_name(n2, f2, &info);
-		f_id2 = info.fieldIndex;
-	}
-	SMJS_FREE(c, f2);
-	if (e != GF_OK) return JS_FALSE;
-
-	i=0;
-	while ((r = gf_list_enum(n1->sgprivate->interact->routes, &i))) {
-		if (r->FromField.fieldIndex != f_id1) continue;
-		if (r->ToNode != n2) continue;
-		if (r->ToField.fieldIndex != f_id2) continue;
-		gf_sg_route_del(r);
-		return JS_TRUE;
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(loadURL)
-{
-	u32 i;
-	GF_JSAPIParam par;
-	jsval item;
-	jsuint len;
-	JSObject *p;
-	GF_JSField *f;
-	SMJS_ARGS
-	M_Script *script = (M_Script *) JS_GetContextPrivate(c);
-
-	if (argc < 1) return JS_FALSE;
-
-	if (JSVAL_IS_STRING(argv[0])) {
-		Bool res;
-		par.uri.url = SMJS_CHARS(c, argv[0]);
-		/*TODO add support for params*/
-		par.uri.nb_params = 0;
-		res = ScriptAction(c, NULL, GF_JSAPI_OP_LOAD_URL, (GF_Node *)script, &par);
-		SMJS_FREE(c, par.uri.url);
-		return res ? JS_TRUE : JS_FALSE;
-	}
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-
-	JS_ValueToObject(c, argv[0], &p);
-
-	f = (GF_JSField *) SMJS_GET_PRIVATE(c, p);
-	if (!f || !f->js_list) return JS_FALSE;
-	JS_GetArrayLength(c, f->js_list, &len);
-
-	for (i=0; i<len; i++) {
-		JS_GetElement(c, f->js_list, (jsint) i, &item);
-
-		if (JSVAL_IS_STRING(item)) {
-			Bool res;
-			par.uri.url = SMJS_CHARS(c, item);
-			/*TODO add support for params*/
-			par.uri.nb_params = 0;
-			res = ScriptAction(c, NULL, GF_JSAPI_OP_LOAD_URL, (GF_Node*)script, &par);
-			SMJS_FREE(c, par.uri.url);
-			if (res) return JS_TRUE;
-		}
-	}
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(setDescription)
-{
-	GF_JSAPIParam par;
-	GF_Node *node = JS_GetContextPrivate(c);
-	SMJS_ARGS
-	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	par.uri.url = SMJS_CHARS(c, argv[0]);
-	ScriptAction(c, NULL, GF_JSAPI_OP_SET_TITLE, node->sgprivate->scenegraph->RootNode, &par);
-	SMJS_FREE(c, par.uri.url);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(createVrmlFromString)
-{
-#ifndef GPAC_DISABLE_LOADER_BT
-	GF_ScriptPriv *priv;
-	GF_FieldInfo field;
-	/*BT/VRML from string*/
-	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, char *node_str, Bool force_wrl);
-	char *str;
-	GF_List *nlist;
-	SMJS_ARGS
-	GF_Node *sc_node = JS_GetContextPrivate(c);
-	if (argc < 1) return JS_FALSE;
-
-	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
-	str = SMJS_CHARS(c, argv[0]);
-	nlist = gf_sm_load_bt_from_string(sc_node->sgprivate->scenegraph, str, 1);
-	SMJS_FREE(c, str);
-	if (!nlist) return JS_FALSE;
-
-	priv = JS_GetScriptStack(c);
-	memset(&field, 0, sizeof(GF_FieldInfo));
-	field.fieldType = GF_SG_VRML_MFNODE;
-	field.far_ptr = &nlist;
-	SMJS_SET_RVAL( gf_sg_script_to_smjs_field(priv, &field, NULL, 0) );
-
-	/*don't forget to unregister all this stuff*/
-	while (gf_list_count(nlist)) {
-		GF_Node *n = gf_list_get(nlist, 0);
-		gf_list_rem(nlist, 0);
-		gf_node_unregister(n, NULL);
-	}
-	gf_list_del(nlist);
-	return JS_TRUE;
-#else
-	return JS_FALSE;
-#endif
-}
-
-void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex);
-
-void Script_FieldChanged(JSContext *c, GF_Node *parent, GF_JSField *parent_owner, GF_FieldInfo *field)
-{
-	GF_ScriptPriv *priv;
-	u32 script_field;
-	u32 i;
-	GF_ScriptField *sf;
-
-
-	if (!parent) {
-		parent = parent_owner->owner;
-		field = &parent_owner->field;
-	}
-	if (!parent) return;
-
-	script_field = 0;
-	if ((parent->sgprivate->tag == TAG_MPEG4_Script)
-#ifndef GPAC_DISABLE_X3D
-	        || (parent->sgprivate->tag == TAG_X3D_Script)
-#endif
-	   ) {
-		script_field = 1;
-		if ( (GF_Node *) JS_GetContextPrivate(c) == parent) script_field = 2;
-	}
-
-	if (script_field!=2) {
-		if (field->on_event_in) field->on_event_in(parent, NULL);
-		else if (script_field && (field->eventType==GF_SG_EVENT_IN) ) {
-			gf_sg_script_event_in(parent, field);
-			gf_node_changed_internal(parent, field, 0);
-			return;
-		}
-		/*field has changed, set routes...*/
-		if (parent->sgprivate->tag == TAG_ProtoNode) {
-			GF_ProtoInstance *inst = (GF_ProtoInstance *)parent;
-			gf_sg_proto_propagate_event(parent, field->fieldIndex, (GF_Node*)JS_GetScript(c));
-			/* Node exposedField can also be routed to another field */
-			gf_node_event_out_proto(parent, field->fieldIndex);
-
-			//hardcoded protos be implemented in ways not inspecting the node_dirty propagation scheme (eg defining an SFNode in their interface, not linked with the graph).
-			//in this case handle the node as a regular one
-			if (inst->flags & GF_SG_PROTO_HARDCODED) {
-				gf_node_changed_internal(parent, field, 0);
-			}
-		} else {
-			gf_node_event_out(parent, field->fieldIndex);
-			gf_node_changed_internal(parent, field, 0);
-		}
-		return;
-	}
-	/*otherwise mark field if eventOut*/
-	if (parent_owner || parent) {
-		priv = parent ? parent->sgprivate->UserPrivate : parent_owner->owner->sgprivate->UserPrivate;
-		i=0;
-		while ((sf = gf_list_enum(priv->fields, &i))) {
-			if (sf->ALL_index == field->fieldIndex) {
-				/*queue eventOut*/
-				if (sf->eventType == GF_SG_EVENT_OUT) {
-					sf->activate_event_out = 1;
-				}
-			}
-		}
-	}
-}
-
-SMJS_FUNC_PROP_SET( gf_sg_script_eventout_set_prop)
-
-u32 i;
-char *eventName;
-GF_ScriptPriv *script;
-GF_Node *n;
-GF_ScriptField *sf;
-GF_FieldInfo info;
-jsval idval;
-JSString *str;
-JS_IdToValue(c, id, &idval);
-if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-str = SMJS_ID_TO_STRING(id);
-if (!str) return JS_FALSE;
-/*avoids gcc warning*/
-if (!obj) obj=NULL;
-
-script = JS_GetScriptStack(c);
-if (!script) return JS_FALSE;
-n = (GF_Node *) JS_GetScript(c);
-
-eventName = SMJS_CHARS_FROM_STRING(c, str);
-i=0;
-while ((sf = gf_list_enum(script->fields, &i))) {
-	if (!stricmp(sf->name, eventName)) {
-		gf_node_get_field(n, sf->ALL_index, &info);
-		gf_sg_script_to_node_field(c, *vp, &info, n, NULL);
-		sf->activate_event_out = 1;
-		SMJS_FREE(c, eventName);
-		return JS_TRUE;
-	}
-}
-SMJS_FREE(c, eventName);
-return JS_FALSE;
-}
-
-
-/*generic ToString method*/
-static GFINLINE void sffield_toString(char *str, void *f_ptr, u32 fieldType)
-{
-	char temp[1000];
-
-	switch (fieldType) {
-	case GF_SG_VRML_SFVEC2F:
-	{
-		SFVec2f val = * ((SFVec2f *) f_ptr);
-		sprintf(temp, "%f %f", FIX2FLT(val.x), FIX2FLT(val.y));
-		strcat(str, temp);
-		break;
-	}
-	case GF_SG_VRML_SFVEC3F:
-	{
-		SFVec3f val = * ((SFVec3f *) f_ptr);
-		sprintf(temp, "%f %f %f", FIX2FLT(val.x), FIX2FLT(val.y), FIX2FLT(val.z));
-		strcat(str, temp);
-		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));
-		strcat(str, temp);
-		break;
-	}
-	case GF_SG_VRML_SFROTATION:
-	{
-		SFRotation val = * ((SFRotation *) f_ptr);
-		sprintf(temp, "%f %f %f %f", FIX2FLT(val.x), FIX2FLT(val.y), FIX2FLT(val.z), FIX2FLT(val.q));
-		strcat(str, temp);
-		break;
-	}
-	case GF_SG_VRML_SFCOLOR:
-	{
-		SFColor val = * ((SFColor *) f_ptr);
-		sprintf(temp, "%f %f %f", FIX2FLT(val.red), FIX2FLT(val.green), FIX2FLT(val.blue));
-		strcat(str, temp);
-		break;
-	}
-	case GF_SG_VRML_SFIMAGE:
-	{
-		SFImage *val = ((SFImage *)f_ptr);
-		sprintf(temp, "%dx%dx%d", val->width, val->height, val->numComponents);
-		strcat(str, temp);
-		break;
-	}
-
-	}
-}
-
-static void JS_ObjectDestroyed(JSContext *c, JSObject *obj, GF_JSField *ptr, Bool is_js_call)
-{
-	SMJS_SET_PRIVATE(c, obj, NULL);
-
-	if (ptr) {
-		/*if ptr is a node, remove node binding*/
-		if (ptr->node
-		        && ptr->node->sgprivate->interact
-		        && ptr->node->sgprivate->interact->js_binding
-		        && (ptr->node->sgprivate->interact->js_binding->node == ptr)
-		   ) {
-			ptr->node->sgprivate->interact->js_binding->node = NULL;
-		}
-
-		/*if ptr is a field, remove field binding from parent*/
-		if (ptr->owner && ptr->owner->sgprivate->interact && ptr->owner->sgprivate->interact->js_binding) {
-			gf_list_del_item(ptr->owner->sgprivate->interact->js_binding->fields, ptr);
-		}
-
-
-		/*
-			If object is still registered, remove it from the js_cache
-
-						!!! WATCHOUT !!!
-		SpiderMonkey GC may call an object finalizer on ANY context, not the one in which the object
-		was created !! We therefore keep a pointer to the parent context to remove GC'ed objects from the context cache
-		*/
-		if (ptr->obj && is_js_call) {
-			GF_ScriptPriv *priv;
-			if (ptr->js_ctx) {
-				if (gf_list_find(js_rt->allocated_contexts, ptr->js_ctx) < 0)
-					return;
-				c = ptr->js_ctx;
-			}
-			priv = JS_GetScriptStack(c);
-			gf_list_del_item(priv->js_cache, obj);
-		}
-	}
-}
-
-
-static JSBool SMJS_FUNCTION(field_toString)
-{
-	u32 i;
-	jsuint len;
-	jsdouble d;
-	char temp[1000];
-	char str[5000];
-	JSString *s;
-	jsval item;
-	SMJS_OBJ
-	GF_JSField *f = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	if (!f) return JS_FALSE;
-
-	strcpy(str, "");
-
-	if (gf_sg_vrml_is_sf_field(f->field.fieldType)) {
-		sffield_toString(str, f->field.far_ptr, f->field.fieldType);
-	} else {
-		if (f->field.fieldType == GF_SG_VRML_MFNODE) return JS_TRUE;
-
-		strcat(str, "[");
-		JS_GetArrayLength(c, f->js_list, &len);
-		for (i=0; i<len; i++) {
-			JS_GetElement(c, f->js_list, (jsint) i, &item);
-			switch (f->field.fieldType) {
-			case GF_SG_VRML_MFBOOL:
-				sprintf(temp, "%s", JSVAL_TO_BOOLEAN(item) ? "TRUE" : "FALSE");
-				strcat(str, temp);
-				break;
-			case GF_SG_VRML_MFINT32:
-				sprintf(temp, "%d", JSVAL_TO_INT(item));
-				strcat(str, temp);
-				break;
-			case GF_SG_VRML_MFFLOAT:
-			case GF_SG_VRML_MFTIME:
-				SMJS_GET_NUMBER(item, d);
-				sprintf(temp, "%g", d);
-				strcat(str, temp);
-				break;
-			case GF_SG_VRML_MFSTRING:
-			case GF_SG_VRML_MFURL:
-			{
-				char *str_val = SMJS_CHARS(c, item);
-				strcat(str, str_val);
-				SMJS_FREE(c, str_val);
-			}
-			break;
-			default:
-				if (JSVAL_IS_OBJECT(item)) {
-					GF_JSField *sf = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
-					sffield_toString(str, sf->field.far_ptr, sf->field.fieldType);
-				}
-				break;
-			}
-			if (i<len-1) strcat(str, ", ");
-		}
-		strcat(str, "]");
-	}
-	s = JS_NewStringCopyZ(c, str);
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(SFNodeConstructor)
-{
-	u32 tag, ID;
-	GF_Node *new_node;
-	GF_JSField *field;
-	GF_Proto *proto;
-	GF_SceneGraph *sg;
-	char *node_name;
-	GF_ScriptPriv *priv = JS_GetScriptStack(c);
-	M_Script *sc = JS_GetScript(c);
-	SMJS_ARGS
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFNodeClass)
-	tag = 0;
-	if (!argc) {
-		field = NewJSField(c);
-		field->field.fieldType = GF_SG_VRML_SFNODE;
-		field->node = NULL;
-		field->field.far_ptr = &field->node;
-		SMJS_SET_PRIVATE(c, obj, field);
-		SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-		return JS_TRUE;
-	}
-	if (!GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-
-	ID = 0;
-	node_name = SMJS_CHARS(c, argv[0]);
-	if (!strnicmp(node_name, "_proto", 6)) {
-		ID = atoi(node_name+6);
-		SMJS_FREE(c, node_name);
-		node_name = NULL;
-
-locate_proto:
-
-		/*locate proto in current graph and all parents*/
-		sg = sc->sgprivate->scenegraph;
-		while (1) {
-			proto = gf_sg_find_proto(sg, ID, node_name);
-			if (proto) break;
-			if (!sg->parent_scene) break;
-			sg = sg->parent_scene;
-		}
-		if (!proto) {
-			SMJS_FREE(c, node_name);
-			return JS_FALSE;
-		}
-		/* create interface and load code in current graph*/
-		new_node = gf_sg_proto_create_instance(sc->sgprivate->scenegraph, proto);
-		if (!new_node) {
-			SMJS_FREE(c, node_name);
-			return JS_FALSE;
-		}
-		/*OK, instantiate proto code*/
-		if (gf_sg_proto_load_code(new_node) != GF_OK) {
-			gf_node_unregister(new_node, NULL);
-			SMJS_FREE(c, node_name);
-			return JS_FALSE;
-		}
-	} else {
-		switch (sc->sgprivate->tag) {
-		case TAG_MPEG4_Script:
-			tag = gf_node_mpeg4_type_by_class_name(node_name);
-			break;
-#ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_Script:
-			tag = gf_node_x3d_type_by_class_name(node_name);
-			break;
-#endif
-		}
-		if (!tag) goto locate_proto;
-		new_node = gf_node_new(sc->sgprivate->scenegraph, tag);
-		if (!new_node) {
-			SMJS_FREE(c, node_name);
-			return JS_FALSE;
-		}
-		gf_node_init(new_node);
-	}
-
-	SMJS_FREE(c, node_name);
-
-	obj = node_get_binding(priv, new_node, 1);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-
-	return JS_TRUE;
-}
-static void node_finalize_ex(JSContext *c, JSObject * obj, Bool is_js_call)
-{
-	GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-#ifndef USE_FFDEV_15
-	JS_ObjectDestroyed(c, obj, ptr, is_js_call);
-#endif
-
-	if (ptr) {
-		JS_GetScript(ptr->js_ctx ? ptr->js_ctx : c);
-		if (ptr->node
-		        /*num_instances may be 0 if the node is the script being destroyed*/
-		        && ptr->node->sgprivate->num_instances
-		   ) {
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] unregistering node %s (%s)\n", gf_node_get_name(ptr->node), gf_node_get_class_name(ptr->node)));
-			//gf_node_unregister(ptr->node, (ptr->node==parent) ? NULL : parent);
-			gf_node_unregister(ptr->node, NULL);
-		}
-		gf_free(ptr);
-	}
-}
-
-static DECL_FINALIZE(node_finalize)
-
-node_finalize_ex(c, obj, 1);
-}
-
-static SMJS_FUNC_PROP_GET(node_getProperty)
-
-GF_Node *n;
-u32 index;
-JSString *str;
-GF_FieldInfo info;
-GF_JSField *ptr;
-GF_ScriptPriv *priv;
-
-if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) )
-	return JS_FALSE;
-ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-n = * ((GF_Node **)ptr->field.far_ptr);
-priv = JS_GetScriptStack(c);
-
-if (n && SMJS_ID_IS_STRING(id) && ( (str = SMJS_ID_TO_STRING(id)) != 0) ) {
-	char *fieldName = SMJS_CHARS_FROM_STRING(c, str);
-	if (!strnicmp(fieldName, "toString", 8)) {
-		SMJS_FREE(c, fieldName);
-		return JS_TRUE;
-	}
-	/*fieldID indexing*/
-	if (!strnicmp(fieldName, "_field", 6)) {
-		index = atoi(fieldName+6);
-		if ( gf_node_get_field(n, index, &info) == GF_OK) {
-			*vp = gf_sg_script_to_smjs_field(priv, &info, n, 0);
-			SMJS_FREE(c, fieldName);
-			return JS_TRUE;
-		}
-	} else if ( gf_node_get_field_by_name(n, fieldName, &info) == GF_OK) {
-		*vp = gf_sg_script_to_smjs_field(priv, &info, n, 0);
-		SMJS_FREE(c, fieldName);
-		return JS_TRUE;
-	}
-
-	if (!strcmp(fieldName, "_bounds")) {
-		GF_JSAPIParam par;
-		par.bbox.is_set = 0;
-		if (ScriptAction(c, n->sgprivate->scenegraph, GF_JSAPI_OP_GET_LOCAL_BBOX, (GF_Node *)n, &par) ) {
-			JSObject *_obj = JS_NewObject(priv->js_ctx, &js_rt->AnyClass._class, 0, 0);
-			Float x, y, w, h;
-			x = y = w = h = 0;
-			if (par.bbox.is_set) {
-				x = FIX2FLT(par.bbox.min_edge.x);
-				y = FIX2FLT(par.bbox.min_edge.y);
-				w = FIX2FLT(par.bbox.max_edge.x - par.bbox.min_edge.x);
-				h = FIX2FLT(par.bbox.max_edge.y - par.bbox.min_edge.y);
-			}
-			JS_DefineProperty(priv->js_ctx, _obj, "x", JS_MAKE_DOUBLE(c, x), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-			JS_DefineProperty(priv->js_ctx, _obj, "y", JS_MAKE_DOUBLE(c, y), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-			JS_DefineProperty(priv->js_ctx, _obj, "width", JS_MAKE_DOUBLE(c, w), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-			JS_DefineProperty(priv->js_ctx, _obj, "height", JS_MAKE_DOUBLE(c, h), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-			*vp = OBJECT_TO_JSVAL(_obj);
-			SMJS_FREE(c, fieldName);
-			return JS_TRUE;
-		}
-	}
-	SMJS_FREE(c, fieldName);
-	return JS_TRUE;
-}
-
-return JS_FALSE;
-}
-
-static SMJS_FUNC_PROP_SET( node_setProperty)
-
-GF_Node *n;
-GF_FieldInfo info;
-u32 index;
-char *fieldname;
-GF_JSField *ptr;
-
-if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-
-assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-n = * ((GF_Node **)ptr->field.far_ptr);
-
-if (n && SMJS_ID_IS_STRING(id)) {
-	JSString *str = SMJS_ID_TO_STRING(id);
-	fieldname = SMJS_CHARS_FROM_STRING(c, str);
-
-	/*fieldID indexing*/
-	if (!strnicmp(fieldname, "_field", 6)) {
-		index = atoi(fieldname+6);
-		SMJS_FREE(c, fieldname);
-		if ( gf_node_get_field(n, index, &info) != GF_OK) {
-			SMJS_FREE(c, fieldname);
-			return JS_TRUE;
-		}
-	} else {
-		if (gf_node_get_field_by_name(n, fieldname, &info) != GF_OK) {
-			/*VRML style*/
-			if (!strnicmp(fieldname, "set_", 4)) {
-				if (gf_node_get_field_by_name(n, fieldname + 4, &info) != GF_OK) {
-					SMJS_FREE(c, fieldname);
-					return JS_TRUE;
-				}
-			} else {
-				SMJS_FREE(c, fieldname);
-				return JS_TRUE;
-			}
-		}
-	}
-	SMJS_FREE(c, fieldname);
-
-	if (gf_node_get_tag(n)==TAG_ProtoNode)
-		gf_sg_proto_mark_field_loaded(n, &info);
-
-	gf_sg_script_to_node_field(c, *vp, &info, n, ptr);
-}
-return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(node_toString)
-{
-	char str[1000];
-	u32 id;
-	GF_Node *n;
-	JSString *s;
-	GF_JSField *f;
-	const char *name;
-	SMJS_OBJ
-	if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-	f = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	if (!f) return JS_FALSE;
-
-	str[0] = 0;
-	n = * ((GF_Node **)f->field.far_ptr);
-	if (!n) return JS_FALSE;
-
-	name = gf_node_get_name_and_id(n, &id);
-	if (id) {
-		if (name) {
-			sprintf(str , "DEF %s ", name);
-		} else {
-			sprintf(str , "DEF %d ", id - 1);
-		}
-	}
-	strcat(str, gf_node_get_class_name(n));
-	s = JS_NewStringCopyZ(c, (const char *) str);
-	if (!s) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL(s) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(node_getTime)
-{
-	GF_Node *n;
-	GF_JSField *f;
-	SMJS_OBJ
-	if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-	f = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	if (!f) return JS_FALSE;
-
-	n = * ((GF_Node **)f->field.far_ptr);
-	if (!n) return JS_FALSE;
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, gf_node_get_scene_time(n)) );
-	return JS_TRUE;
-}
-
-/* Generic field destructor */
-static DECL_FINALIZE(field_finalize)
-
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-JS_ObjectDestroyed(c, obj, ptr, 1);
-if (!ptr) return;
-
-if (ptr->field_ptr) gf_sg_vrml_field_pointer_del(ptr->field_ptr, ptr->field.fieldType);
-gf_free(ptr);
-}
-
-
-
-
-
-/*SFImage class functions */
-static GFINLINE GF_JSField *SFImage_Create(JSContext *c, JSObject *obj, u32 w, u32 h, u32 nbComp, MFInt32 *pixels)
-{
-	u32 i, len;
-	GF_JSField *field;
-	SFImage *v;
-	field = NewJSField(c);
-	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFIMAGE);
-	field->field_ptr = field->field.far_ptr = v;
-	field->field.fieldType = GF_SG_VRML_SFIMAGE;
-	v->width = w;
-	v->height = h;
-	v->numComponents = nbComp;
-	v->pixels = (u8 *) gf_malloc(sizeof(u8) * nbComp * w * h);
-	len = MIN(nbComp * w * h, pixels->count);
-	for (i=0; i<len; i++) v->pixels[i] = (u8) pixels->vals[i];
-	SMJS_SET_PRIVATE(c, obj, field);
-	return field;
-}
-static JSBool SMJS_FUNCTION(SFImageConstructor)
-{
-	u32 w, h, nbComp;
-	MFInt32 *pixels;
-	SMJS_ARGS
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFImageClass)
-	if (argc<4) return 0;
-	if (!JSVAL_IS_INT(argv[0]) || !JSVAL_IS_INT(argv[1]) || !JSVAL_IS_INT(argv[2])) return JS_FALSE;
-	if (!JSVAL_IS_OBJECT(argv[3]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[3]), &js_rt->MFInt32Class, NULL)) return JS_FALSE;
-	w = JSVAL_TO_INT(argv[0]);
-	h = JSVAL_TO_INT(argv[1]);
-	nbComp = JSVAL_TO_INT(argv[2]);
-	pixels = (MFInt32 *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[3])))->field.far_ptr;
-	SFImage_Create(c, obj, w, h, nbComp, pixels);
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(image_getProperty)
-
-GF_ScriptPriv *priv = JS_GetScriptStack(c);
-GF_JSField *val = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-SFImage *sfi;
-if (!val) return JS_FALSE;
-sfi = (SFImage*)val->field.far_ptr;
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = INT_TO_JSVAL( sfi->width );
-		break;
-	case 1:
-		*vp = INT_TO_JSVAL( sfi->height);
-		break;
-	case 2:
-		*vp = INT_TO_JSVAL( sfi->numComponents );
-		break;
-	case 3:
-	{
-		u32 i, len;
-		JSObject *an_obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFInt32Class, priv->js_obj);
-		len = sfi->width*sfi->height*sfi->numComponents;
-		for (i=0; i<len; i++) {
-			jsval newVal = INT_TO_JSVAL(sfi->pixels[i]);
-			JS_SetElement(priv->js_ctx, an_obj, (jsint) i, &newVal);
-		}
-	}
-	break;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET( image_setProperty)
-
-u32 ival;
-Bool changed = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-SFImage *sfi;
-
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-sfi = (SFImage*)ptr->field.far_ptr;
-
-if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 4) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		ival = JSVAL_TO_INT(*vp);
-		changed = ! (sfi->width == ival);
-		sfi->width = ival;
-		if (changed && sfi->pixels) {
-			gf_free(sfi->pixels);
-			sfi->pixels = NULL;
-		}
-		break;
-	case 1:
-		ival =  JSVAL_TO_INT(*vp);
-		changed = ! (sfi->height == ival);
-		sfi->height = ival;
-		if (changed && sfi->pixels) {
-			gf_free(sfi->pixels);
-			sfi->pixels = NULL;
-		}
-		break;
-	case 2:
-		ival =  JSVAL_TO_INT(*vp);
-		changed = ! (sfi->numComponents == ival);
-		sfi->numComponents = ival;
-		if (changed && sfi->pixels) {
-			gf_free(sfi->pixels);
-			sfi->pixels = NULL;
-		}
-		break;
-	case 3:
-	{
-		MFInt32 *pixels;
-		u32 len, i;
-		if (!JSVAL_IS_OBJECT(*vp) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(*vp), &js_rt->MFInt32Class, NULL)) return JS_FALSE;
-		pixels = (MFInt32 *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp)))->field.far_ptr;
-		if (sfi->pixels) gf_free(sfi->pixels);
-		len = sfi->width*sfi->height*sfi->numComponents;
-		sfi->pixels = (unsigned char *) gf_malloc(sizeof(char)*len);
-		len = MAX(len, pixels->count);
-		for (i=0; i<len; i++) sfi->pixels[i] = (u8) pixels->vals[i];
-		changed = 1;
-		break;
-	}
-	default:
-		return JS_FALSE;
-	}
-	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-return JS_FALSE;
-}
-
-/*SFVec2f class functions */
-static GFINLINE GF_JSField *SFVec2f_Create(JSContext *c, JSObject *obj, Fixed x, Fixed y)
-{
-	GF_JSField *field;
-	SFVec2f *v;
-	field = NewJSField(c);
-	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFVEC2F);
-	field->field_ptr = field->field.far_ptr = v;
-	field->field.fieldType = GF_SG_VRML_SFVEC2F;
-	v->x = x;
-	v->y = y;
-	SMJS_SET_PRIVATE(c, obj, field);
-	return field;
-}
-static JSBool SMJS_FUNCTION(SFVec2fConstructor)
-{
-	jsdouble x = 0.0, y = 0.0;
-	SMJS_ARGS
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFVec2fClass)
-	if (argc > 0) SMJS_GET_NUMBER(argv[0], x);
-	if (argc > 1) SMJS_GET_NUMBER(argv[1], y);
-
-	SFVec2f_Create(c, obj, FLT2FIX( x), FLT2FIX( y));
-	return JS_TRUE;
-}
-static SMJS_FUNC_PROP_GET(vec2f_getProperty)
-
-GF_JSField *val = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFVec2f*)val->field.far_ptr)->x));
-		break;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFVec2f*)val->field.far_ptr)->y));
-		break;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(vec2f_setProperty)
-
-jsdouble d;
-Fixed v;
-Bool changed = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-
-if (SMJS_ID_IS_INT(id)) {
-	if (! JSVAL_IS_NUMBER(*vp)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec2f\n"));
-		return JS_FALSE;
-	}
-
-	SMJS_GET_NUMBER(*vp, d);
-
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		v = FLT2FIX( d);
-		changed = ! ( ((SFVec2f*)ptr->field.far_ptr)->x == v);
-		((SFVec2f*)ptr->field.far_ptr)->x = v;
-		break;
-	case 1:
-		v = FLT2FIX( d);
-		changed = ! ( ((SFVec2f*)ptr->field.far_ptr)->y == v);
-		((SFVec2f*)ptr->field.far_ptr)->y = v;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-return JS_FALSE;
-}
-
-static JSBool SMJS_FUNCTION(vec2f_add)
-{
-	SFVec2f *v1, *v2;
-	JSObject *pNew;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec2fClass, NULL))
-		return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec2f_Create(c, pNew, v1->x + v2->x, v1->y + v2->y);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_subtract)
-{
-	SFVec2f *v1, *v2;
-	JSObject *pNew;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec2fClass, NULL))
-		return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec2f_Create(c, pNew, v1->x - v2->x, v1->y - v2->y);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_negate)
-{
-	SFVec2f *v1;
-	JSObject *pNew;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec2f_Create(c, pNew, -v1->x , -v1->y );
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_multiply)
-{
-	SFVec2f *v1;
-	JSObject *pNew;
-	jsdouble d;
-	Fixed v;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0) return JS_FALSE;
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SMJS_GET_NUMBER(argv[0], d );
-	v = FLT2FIX( d);
-	SFVec2f_Create(c, pNew, gf_mulfix(v1->x , v), gf_mulfix(v1->y, v) );
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_divide)
-{
-	SFVec2f *v1;
-	JSObject *pNew;
-	jsdouble d;
-	Fixed v;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0) return JS_FALSE;
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SMJS_GET_NUMBER(argv[0], d );
-	v = FLT2FIX(d);
-	SFVec2f_Create(c, pNew, gf_divfix(v1->x, v),  gf_divfix(v1->y, v));
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_length)
-{
-	Double res;
-	SFVec2f *v1;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	res = FIX2FLT(gf_v2d_len(v1));
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, res) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_normalize)
-{
-	SFVec2f *v1;
-	Fixed res;
-	JSObject *pNew;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	res = gf_v2d_len(v1);
-	pNew = JS_NewObject(c, &js_rt->SFVec2fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec2f_Create(c, pNew, gf_divfix(v1->x, res), gf_divfix(v1->y, res) );
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec2f_dot)
-{
-	SFVec2f *v1, *v2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec2fClass, NULL))
-		return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT( gf_mulfix(v1->x, v2->x) + gf_mulfix(v1->y, v2->y) ) ) );
-	return JS_TRUE;
-}
-
-
-/*SFVec3f class functions */
-static GFINLINE GF_JSField *SFVec3f_Create(JSContext *c, JSObject *obj, Fixed x, Fixed y, Fixed z)
-{
-	GF_JSField *field;
-	SFVec3f *v;
-	field = NewJSField(c);
-	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFVEC3F);
-	field->field_ptr = field->field.far_ptr = v;
-	field->field.fieldType = GF_SG_VRML_SFVEC3F;
-	v->x = x;
-	v->y = y;
-	v->z = z;
-	SMJS_SET_PRIVATE(c, obj, field);
-	return field;
-}
-static JSBool SMJS_FUNCTION(SFVec3fConstructor)
-{
-	SMJS_ARGS
-	jsdouble x = 0.0, y = 0.0, z = 0.0;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFVec3fClass)
-	if (argc > 0) SMJS_GET_NUMBER(argv[0], x);
-	if (argc > 1) SMJS_GET_NUMBER(argv[1], y);
-	if (argc > 2) SMJS_GET_NUMBER(argv[2], z);
-	SFVec3f_Create(c, obj, FLT2FIX( x), FLT2FIX( y), FLT2FIX( z));
-	return JS_TRUE;
-}
-static SMJS_FUNC_PROP_GET(vec3f_getProperty)
-
-GF_JSField *val = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->x) );
-		break;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->y) );
-		break;
-	case 2:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->z) );
-		break;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( vec3f_setProperty )
-
-jsdouble d;
-Fixed v;
-Bool changed = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-
-if (! JSVAL_IS_NUMBER(*vp)) {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec3f\n"));
-	return JS_FALSE;
-}
-
-if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 3) {
-
-	SMJS_GET_NUMBER(*vp, d);
-
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		v = FLT2FIX( d);
-		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->x == v);
-		((SFVec3f*)ptr->field.far_ptr)->x = v;
-		break;
-	case 1:
-		v = FLT2FIX( d);
-		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->y == v);
-		((SFVec3f*)ptr->field.far_ptr)->y = v;
-		break;
-	case 2:
-		v = FLT2FIX( d);
-		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->z == v);
-		((SFVec3f*)ptr->field.far_ptr)->z = v;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-return JS_FALSE;
-}
-static JSBool SMJS_FUNCTION(vec3f_add)
-{
-	SFVec3f *v1, *v2;
-	JSObject *pNew;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, v1->x + v2->x, v1->y + v2->y, v1->z + v2->z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_subtract)
-{
-	SFVec3f *v1, *v2;
-	JSObject *pNew;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, v1->x - v2->x, v1->y - v2->y, v1->z - v2->z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_negate)
-{
-	SFVec3f *v1;
-	JSObject *pNew;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, -v1->x , -v1->y , -v1->z );
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_multiply)
-{
-	SFVec3f *v1;
-	JSObject *pNew;
-	jsdouble d;
-	Fixed v;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0) return JS_FALSE;
-
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SMJS_GET_NUMBER(argv[0], d );
-	v = FLT2FIX(d);
-	SFVec3f_Create(c, pNew, gf_mulfix(v1->x, v), gf_mulfix(v1->y, v), gf_mulfix(v1->z, v) );
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_divide)
-{
-	SFVec3f *v1;
-	JSObject *pNew;
-	jsdouble d;
-	Fixed v;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0) return JS_FALSE;
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SMJS_GET_NUMBER(argv[0], d );
-	v = FLT2FIX(d);
-	SFVec3f_Create(c, pNew, gf_divfix(v1->x, v), gf_divfix(v1->y, v), gf_divfix(v1->z, v));
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_length)
-{
-	Fixed res;
-	SFVec3f *v1;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	res = gf_vec_len(*v1);
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(res) ) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_normalize)
-{
-	SFVec3f v1;
-	JSObject *pNew;
-	SMJS_OBJ
-	v1 = * (SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	gf_vec_norm(&v1);
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, v1.x, v1.y, v1.z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_dot)
-{
-	SFVec3f v1, v2;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	v1 = *(SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = *(SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	SMJS_SET_RVAL( JS_MAKE_DOUBLE(c, FIX2FLT(gf_vec_dot(v1, v2)) ) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(vec3f_cross)
-{
-	SFVec3f v1, v2, v3;
-	JSObject *pNew;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	v1 = * (SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = * (SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	v3 = gf_vec_cross(v1, v2);
-	SFVec3f_Create(c, pNew, v3.x, v3.y, v3.z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-
-
-
-/*SFRotation class*/
-static GFINLINE GF_JSField *SFRotation_Create(JSContext *c, JSObject *obj, Fixed x, Fixed y, Fixed z, Fixed q)
-{
-	GF_JSField *field;
-	SFRotation *v;
-	field = NewJSField(c);
-	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFROTATION);
-	field->field_ptr = field->field.far_ptr = v;
-	field->field.fieldType = GF_SG_VRML_SFROTATION;
-	v->x = x;
-	v->y = y;
-	v->z = z;
-	v->q = q;
-	SMJS_SET_PRIVATE(c, obj, field);
-	return field;
-}
-static JSBool SMJS_FUNCTION(SFRotationConstructor)
-{
-	JSObject *an_obj;
-	SFVec3f v1, v2;
-	Fixed l1, l2, dot;
-	SMJS_ARGS
-	jsdouble x = 0.0, y = 0.0, z = 0.0, a = 0.0;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFRotationClass)
-
-	if (argc == 0) {
-		SFRotation_Create(c, obj, FLT2FIX(x), FLT2FIX(y), FIX_ONE, FLT2FIX(a) );
-		return JS_TRUE;
-	}
-	if ((argc>0) && JSVAL_IS_NUMBER(argv[0])) {
-		if (argc > 0) SMJS_GET_NUMBER(argv[0], x);
-		if (argc > 1) SMJS_GET_NUMBER(argv[1], y);
-		if (argc > 2) SMJS_GET_NUMBER(argv[2], z);
-		if (argc > 3) SMJS_GET_NUMBER(argv[3], a);
-		SFRotation_Create(c, obj, FLT2FIX(x), FLT2FIX(y), FLT2FIX(z), FLT2FIX(a));
-		return JS_TRUE;
-	}
-	if (argc!=2) return JS_FALSE;
-	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
-	an_obj = JSVAL_TO_OBJECT(argv[0]);
-	if (! GF_JS_InstanceOf(c, an_obj, &js_rt->SFVec3fClass, NULL)) return JS_FALSE;
-	v1 = * (SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, an_obj))->field.far_ptr;
-	if (JSVAL_IS_DOUBLE(argv[1])) {
-		SMJS_GET_NUMBER(argv[1], a);
-		SFRotation_Create(c, obj, v1.x, v1.y, v1.z, FLT2FIX(a));
-		return JS_TRUE;
-	}
-
-	if (!JSVAL_IS_OBJECT(argv[1])) return JS_FALSE;
-	an_obj = JSVAL_TO_OBJECT(argv[1]);
-	if (!GF_JS_InstanceOf(c, an_obj, &js_rt->SFVec3fClass, NULL)) return JS_FALSE;
-	v2 = * (SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, an_obj))->field.far_ptr;
-	l1 = gf_vec_len(v1);
-	l2 = gf_vec_len(v2);
-	dot = gf_divfix(gf_vec_dot(v1, v2), gf_mulfix(l1, l2) );
-	a = gf_atan2(gf_sqrt(FIX_ONE - gf_mulfix(dot, dot)), dot);
-	SFRotation_Create(c, obj, gf_mulfix(v1.y, v2.z) - gf_mulfix(v2.y, v1.z),
-	                  gf_mulfix(v1.z, v2.x) - gf_mulfix(v2.z, v1.x),
-	                  gf_mulfix(v1.x, v2.y) - gf_mulfix(v2.x, v1.y),
-	                  FLT2FIX(a));
-	return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(rot_getProperty)
-
-GF_JSField *val = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->x));
-		break;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->y));
-		break;
-	case 2:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->z));
-		break;
-	case 3:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->q));
-		break;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-static SMJS_FUNC_PROP_SET( rot_setProperty )
-
-jsdouble d;
-Fixed v;
-Bool changed = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-
-if (! JSVAL_IS_NUMBER(*vp)) {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec3f\n"));
-	return JS_FALSE;
-}
-if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 4 ) {
-	SMJS_GET_NUMBER(*vp, d);
-
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->x == v);
-		((SFRotation*)ptr->field.far_ptr)->x = v;
-		break;
-	case 1:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->y == v);
-		((SFRotation*)ptr->field.far_ptr)->y = v;
-		break;
-	case 2:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->z == v);
-		((SFRotation*)ptr->field.far_ptr)->z = v;
-		break;
-	case 3:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->q == v);
-		((SFRotation*)ptr->field.far_ptr)->q = v;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-return JS_FALSE;
-}
-static JSBool SMJS_FUNCTION(rot_getAxis)
-{
-	SFRotation r;
-	JSObject *pNew;
-	SMJS_OBJ
-	r = * (SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, r.x, r.y, r.z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(rot_inverse)
-{
-	SFRotation r;
-	JSObject *pNew;
-	SMJS_OBJ
-	r = * (SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	pNew = JS_NewObject(c, &js_rt->SFRotationClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFRotation_Create(c, pNew, r.x, r.y, r.z, r.q-GF_PI);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(rot_multiply)
-{
-	SFRotation r1, r2;
-	SFVec4f q1, q2;
-	JSObject *pNew;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFRotationClass, NULL))
-		return JS_FALSE;
-
-	r1 = * (SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	r2 = * (SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	q1 = gf_quat_from_rotation(r1);
-	q2 = gf_quat_from_rotation(r2);
-	q1 = gf_quat_multiply(&q1, &q2);
-	r1 = gf_quat_to_rotation(&q1);
-
-	pNew = JS_NewObject(c, &js_rt->SFRotationClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFRotation_Create(c, pNew, r1.x, r1.y, r1.z, r1.q);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(rot_multVec)
-{
-	SFVec3f v;
-	SFRotation r;
-	GF_Matrix mx;
-	JSObject *pNew;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0) return JS_FALSE;
-
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	r = *(SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v = *(SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	gf_mx_init(mx);
-	gf_mx_add_rotation(&mx, r.q, r.x, r.y, r.z);
-	gf_mx_apply_vec(&mx, &v);
-	pNew = JS_NewObject(c, &js_rt->SFVec3fClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFVec3f_Create(c, pNew, v.x, v.y, v.z);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(rot_setAxis)
-{
-	SFVec3f v;
-	SFRotation *r;
-	GF_JSField *ptr;
-	SMJS_OBJ
-	SMJS_ARGS
-	if (argc<=0) return JS_FALSE;
-
-	if (argc<=0 || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFVec3fClass, NULL))
-		return JS_FALSE;
-
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	r = (SFRotation *) ptr->field.far_ptr;
-
-	v = *(SFVec3f *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-
-	r->x = v.x;
-	r->y = v.y;
-	r->z = v.z;
-	Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-static JSBool SMJS_FUNCTION(rot_slerp)
-{
-	SFRotation v1, v2, res;
-	SFVec4f q1, q2;
-	JSObject *pNew;
-	jsdouble d;
-	SMJS_ARGS
-	SMJS_OBJ
-	if (argc<=1) return JS_FALSE;
-
-	if (!JSVAL_IS_DOUBLE(argv[1]) || !JSVAL_IS_OBJECT(argv[0]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &js_rt->SFRotationClass, NULL)) return JS_FALSE;
-
-	v1 = *(SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	v2 = *(SFRotation *) ((GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0])))->field.far_ptr;
-	SMJS_GET_NUMBER(argv[1], d );
-	q1 = gf_quat_from_rotation(v1);
-	q2 = gf_quat_from_rotation(v2);
-	q1 = gf_quat_slerp(q1, q2, FLT2FIX( d));
-	res = gf_quat_to_rotation(&q1);
-	pNew = JS_NewObject(c, &js_rt->SFRotationClass._class, 0, SMJS_GET_PARENT(c, obj));
-	SFRotation_Create(c, pNew, res.x, res.y, res.z, res.q);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(pNew) );
-	return JS_TRUE;
-}
-
-/* SFColor class functions */
-static GFINLINE GF_JSField *SFColor_Create(JSContext *c, JSObject *obj, Fixed r, Fixed g, Fixed b)
-{
-	GF_JSField *field;
-	SFColor *v;
-	field = NewJSField(c);
-	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFCOLOR);
-	field->field_ptr = field->field.far_ptr = v;
-	field->field.fieldType = GF_SG_VRML_SFCOLOR;
-	v->red = r;
-	v->green = g;
-	v->blue = b;
-	SMJS_SET_PRIVATE(c, obj, field);
-	return field;
-}
-static JSBool SMJS_FUNCTION(SFColorConstructor)
-{
-	SMJS_ARGS
-	jsdouble r = 0.0, g = 0.0, b = 0.0;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->SFColorClass)
-	if (argc > 0) SMJS_GET_NUMBER(argv[0], r);
-	if (argc > 1) SMJS_GET_NUMBER(argv[1], g);
-	if (argc > 2) SMJS_GET_NUMBER(argv[2], b);
-	SFColor_Create(c, obj, FLT2FIX( r), FLT2FIX( g), FLT2FIX( b));
-	return JS_TRUE;
-}
-static SMJS_FUNC_PROP_GET( color_getProperty )
-
-GF_JSField *val = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-if (SMJS_ID_IS_INT(id)) {
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->red));
-		break;
-	case 1:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->green));
-		break;
-	case 2:
-		*vp = JS_MAKE_DOUBLE(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->blue));
-		break;
-	default:
-		return JS_TRUE;
-	}
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(color_setProperty)
-
-jsdouble d;
-Fixed v;
-Bool changed = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-/*this is the prototype*/
-if (!ptr) {
-	if (! SMJS_ID_IS_STRING(id)) return JS_FALSE;
-	return JS_TRUE;
-}
-
-if (! JSVAL_IS_NUMBER(*vp)) {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Value is not a number while assigning SFVec3f\n"));
-	return JS_FALSE;
-}
-if (SMJS_ID_IS_INT(id) && SMJS_ID_TO_INT(id) >= 0 && SMJS_ID_TO_INT(id) < 3 ) {
-	SMJS_GET_NUMBER(*vp, d);
-	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFColor*)ptr->field.far_ptr)->red == v);
-		((SFColor*)ptr->field.far_ptr)->red = v;
-		break;
-	case 1:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFColor*)ptr->field.far_ptr)->green == v);
-		((SFColor*)ptr->field.far_ptr)->green = v;
-		break;
-	case 2:
-		v = FLT2FIX(d);
-		changed = ! ( ((SFColor*)ptr->field.far_ptr)->blue == v);
-		((SFColor*)ptr->field.far_ptr)->blue = v;
-		break;
-	default:
-		return JS_TRUE;
-	}
-	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-return JS_FALSE;
-}
-static JSBool SMJS_FUNCTION(color_setHSV)
-{
-	SFColor *v1, hsv;
-	jsdouble h, s, v;
-	SMJS_OBJ
-	SMJS_ARGS
-	GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	if (argc != 3) return JS_FALSE;
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	SMJS_GET_NUMBER(argv[0], h);
-	SMJS_GET_NUMBER(argv[1], s);
-	SMJS_GET_NUMBER(argv[2], v);
-	hsv.red = FLT2FIX( h);
-	hsv.green = FLT2FIX( s);
-	hsv.blue = FLT2FIX( v);
-	SFColor_fromHSV(&hsv);
-	gf_sg_vrml_field_copy(v1, &hsv, GF_SG_VRML_SFCOLOR);
-	Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(color_getHSV)
-{
-	SFColor *v1, hsv;
-	jsval vec[3];
-	JSObject *arr;
-	SMJS_OBJ
-	v1 = ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-	hsv = *v1;
-	SFColor_toHSV(&hsv);
-	vec[0] = JS_MAKE_DOUBLE(c, FIX2FLT(hsv.red));
-	vec[1] = JS_MAKE_DOUBLE(c, FIX2FLT(hsv.green));
-	vec[2] = JS_MAKE_DOUBLE(c, FIX2FLT(hsv.blue));
-	arr = JS_NewArrayObject(c, 3, vec);
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(arr) );
-	return JS_TRUE;
-}
-
-static void setup_js_array(JSContext *c, JSObject *obj, GF_JSField *ptr, uintN argc, jsval *argv)
-{
-//	GF_ScriptPriv *priv = JS_GetScriptStack(c);
-	ptr->obj = obj;
-	ptr->js_list = JS_NewArrayObject(c, (jsint) argc, argv);
-
-	/*
-		gf_js_add_root(c, &ptr->js_list, GF_JSGC_OBJECT);
-		ptr->is_rooted = 1;
-		gf_list_add(priv->js_cache, obj);
-	*/
-}
-
-#define MFARRAY_CONSTRUCTOR(__classp, _fieldType)	\
-	GF_JSField *ptr;	\
-	SMJS_ARGS	\
-	SMJS_OBJ_CONSTRUCTOR(__classp)	\
-	ptr = NewJSField(c);	\
-	ptr->field.fieldType = _fieldType;	\
-	setup_js_array(c, obj, ptr, (jsint) argc, argv);	\
-	SMJS_SET_PRIVATE(c, obj, ptr);	\
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );	\
-	return obj == 0 ? JS_FALSE : JS_TRUE;	\
- 
-static JSBool SMJS_FUNCTION(MFBoolConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFBoolClass, GF_SG_VRML_MFBOOL);
-}
-static JSBool SMJS_FUNCTION(MFInt32Constructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFInt32Class, GF_SG_VRML_MFINT32);
-}
-static JSBool SMJS_FUNCTION(MFFloatConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFFloatClass, GF_SG_VRML_MFFLOAT);
-}
-static JSBool SMJS_FUNCTION(MFTimeConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFTimeClass, GF_SG_VRML_MFTIME);
-}
-static JSBool SMJS_FUNCTION(MFStringConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFStringClass, GF_SG_VRML_MFSTRING);
-}
-static JSBool SMJS_FUNCTION(MFURLConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFUrlClass, GF_SG_VRML_MFURL);
-}
-static JSBool SMJS_FUNCTION(MFNodeConstructor)
-{
-	MFARRAY_CONSTRUCTOR(&js_rt->MFNodeClass, GF_SG_VRML_MFNODE);
-}
-
-
-static void array_finalize_ex(JSContext *c, JSObject *obj, Bool is_js_call)
-{
-	GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-
-#ifndef USE_FFDEV_15
-	JS_ObjectDestroyed(c, obj, ptr, 1);
-#endif
-
-	if (!ptr) return;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] unregistering MFField %s\n", ptr->field.name));
-
-	if (ptr->js_list && ptr->is_rooted) {
-		gf_js_remove_root(c, &ptr->js_list, GF_JSGC_OBJECT);
-	}
-
-	/*MFNode*/
-	if (ptr->temp_list) {
-		gf_node_unregister_children(ptr->owner, ptr->temp_list);
-	}
-	if (ptr->field_ptr) {
-		gf_sg_vrml_field_pointer_del(ptr->field_ptr, ptr->field.fieldType);
-	}
-	gf_free(ptr);
-}
-
-static DECL_FINALIZE(array_finalize)
-
-array_finalize_ex(c, obj, 1);
-}
-
-static SMJS_FUNC_PROP_GET( array_getElement )
-
-u32 i;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-if (SMJS_ID_IS_INT(id)) {
-	i = SMJS_ID_TO_INT(id);
-	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-		GF_Node *node = gf_node_list_get_child(*(GF_ChildNodeItem **)ptr->field.far_ptr, i);
-		JSObject *anobj = node ? node_get_binding(JS_GetScriptStack(c), node, 0) : NULL;
-		if (anobj) *vp = OBJECT_TO_JSVAL(anobj);
-	} else {
-		JS_GetElement(c, ptr->js_list, (jsint) i, vp);
-	}
-}
-return JS_TRUE;
-}
-
-
-//this could be overloaded for each MF type...
-static SMJS_FUNC_PROP_SET(array_setElement)
-
-u32 ind;
-jsuint len;
-jsdouble d;
-GF_JSField *from;
-JSBool ret;
-GF_JSClass *the_sf_class = NULL;
-JSString *str;
-char *str_val;
-void *sf_slot;
-Bool is_append = 0;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-ind = SMJS_ID_TO_INT(id);
-
-ret = JS_GetArrayLength(c, ptr->js_list, &len);
-if (ret==JS_FALSE) return JS_FALSE;
-
-if (!ptr->js_list && gf_sg_vrml_is_sf_field(ptr->field.fieldType)) return JS_FALSE;
-
-
-switch (ptr->field.fieldType) {
-case GF_SG_VRML_MFVEC2F:
-	the_sf_class = &js_rt->SFVec2fClass;
-	break;
-case GF_SG_VRML_MFVEC3F:
-	the_sf_class = &js_rt->SFVec3fClass;
-	break;
-case GF_SG_VRML_MFCOLOR:
-	the_sf_class = &js_rt->SFColorClass;
-	break;
-case GF_SG_VRML_MFROTATION:
-	the_sf_class = &js_rt->SFRotationClass;
-	break;
-}
-/*dynamic expend*/
-if (ind>=len) {
-	is_append = 1;
-	ret = JS_SetArrayLength(c, ptr->js_list, len+1);
-	if (ret==JS_FALSE) return JS_FALSE;
-	while (len<ind) {
-		jsval a_val;
-		switch (ptr->field.fieldType) {
-		case GF_SG_VRML_MFBOOL:
-			a_val = BOOLEAN_TO_JSVAL(0);
-			break;
-		case GF_SG_VRML_MFINT32:
-			a_val = INT_TO_JSVAL(0);
-			break;
-		case GF_SG_VRML_MFFLOAT:
-		case GF_SG_VRML_MFTIME:
-			a_val = JS_MAKE_DOUBLE(c, 0);
-			break;
-		case GF_SG_VRML_MFSTRING:
-		case GF_SG_VRML_MFURL:
-			a_val = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "") );
-			break;
-		case GF_SG_VRML_MFVEC2F:
-		case GF_SG_VRML_MFVEC3F:
-		case GF_SG_VRML_MFCOLOR:
-		case GF_SG_VRML_MFROTATION:
-			a_val = OBJECT_TO_JSVAL( SMJS_CONSTRUCT_OBJECT(c, the_sf_class, obj) );
-			break;
-		default:
-			a_val = INT_TO_JSVAL(0);
-			break;
-		}
-
-		if (ptr->field.fieldType!=GF_SG_VRML_MFNODE) {
-			gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, len);
-			JS_SetElement(c, ptr->js_list, len, &a_val);
-		}
-		len++;
-	}
-	if (ptr->field.far_ptr && (ptr->field.fieldType!=GF_SG_VRML_MFNODE))
-		gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, ind);
-}
-
-if (ptr->field.far_ptr && (ptr->field.fieldType!=GF_SG_VRML_MFNODE)) {
-	u32 items = ((GenMFField *)ptr->field.far_ptr)->count;
-	while (ind>=items) {
-		gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, ind);
-		items++;
-	}
-}
-
-/*assign object*/
-if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-	JSObject *o;
-	if (JSVAL_IS_VOID(*vp)) return JS_FALSE;
-	if (JSVAL_IS_NULL(*vp) ) return JS_FALSE;
-	o = JSVAL_TO_OBJECT(*vp);
-	if (!GF_JS_InstanceOf(c, o, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-} else if (the_sf_class) {
-	if (JSVAL_IS_VOID(*vp)) return JS_FALSE;
-	if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(*vp), the_sf_class, NULL) ) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFBOOL) {
-	if (!JSVAL_IS_BOOLEAN(*vp)) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFINT32) {
-	if (!JSVAL_IS_INT(*vp)) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFFLOAT) {
-	if (!JSVAL_IS_NUMBER(*vp)) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFTIME) {
-	if (!JSVAL_IS_NUMBER(*vp)) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFSTRING) {
-	if (!JSVAL_IS_STRING(*vp)) return JS_FALSE;
-} else if (ptr->field.fieldType==GF_SG_VRML_MFURL) {
-	if (!JSVAL_IS_STRING(*vp)) return JS_FALSE;
-}
-
-
-/*rewrite MFNode entry*/
-if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-	GF_Node *prev_n, *new_n;
-
-	if (!ptr->owner) return JS_TRUE;
-
-	/*get new node*/
-	from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	new_n = *(GF_Node**)from->field.far_ptr;
-	prev_n = NULL;
-
-	if (!is_append) {
-		/*get and delete previous node if any, but unregister later*/
-		prev_n = gf_node_list_del_child_idx( (GF_ChildNodeItem **)ptr->field.far_ptr, ind);
-	}
-
-	if (new_n) {
-		gf_node_list_insert_child( (GF_ChildNodeItem **)ptr->field.far_ptr , new_n, ind);
-		gf_node_register(new_n, ptr->owner);
-
-		/*node created from script and inserted in the tree, root it*/
-		if (!from->is_rooted)
-			node_get_binding(JS_GetScriptStack(c), new_n, 0);
-	}
-	/*unregister previous node*/
-	if (prev_n) gf_node_unregister(prev_n, ptr->owner);
-
-	Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-
-ret = JS_SetElement(c, ptr->js_list, ind, vp);
-if (ret==JS_FALSE) return JS_FALSE;
-
-if (!ptr->owner) return JS_TRUE;
-if (!ptr->field.far_ptr) return JS_FALSE;
-
-/*rewrite MF slot*/
-switch (ptr->field.fieldType) {
-case GF_SG_VRML_MFBOOL:
-	((MFBool *)ptr->field.far_ptr)->vals[ind] = (Bool) JSVAL_TO_BOOLEAN(*vp);
-	break;
-case GF_SG_VRML_MFINT32:
-	((MFInt32 *)ptr->field.far_ptr)->vals[ind] = (s32) JSVAL_TO_INT(*vp);
-	break;
-case GF_SG_VRML_MFFLOAT:
-	SMJS_GET_NUMBER(*vp, d);
-	((MFFloat *)ptr->field.far_ptr)->vals[ind] = FLT2FIX(d);
-	break;
-case GF_SG_VRML_MFTIME:
-	SMJS_GET_NUMBER(*vp, d);
-	((MFTime *)ptr->field.far_ptr)->vals[ind] = d;
-	break;
-case GF_SG_VRML_MFSTRING:
-	if (((MFString *)ptr->field.far_ptr)->vals[ind]) {
-		gf_free(((MFString *)ptr->field.far_ptr)->vals[ind]);
-		((MFString *)ptr->field.far_ptr)->vals[ind] = NULL;
-	}
-	str = JSVAL_IS_STRING(*vp) ? JSVAL_TO_STRING(*vp) : JS_ValueToString(c, *vp);
-	str_val = SMJS_CHARS_FROM_STRING(c, str);
-	((MFString *)ptr->field.far_ptr)->vals[ind] = gf_strdup(str_val);
-	SMJS_FREE(c, str_val);
-	break;
-
-case GF_SG_VRML_MFURL:
-	if (((MFURL *)ptr->field.far_ptr)->vals[ind].url) {
-		gf_free(((MFURL *)ptr->field.far_ptr)->vals[ind].url);
-		((MFURL *)ptr->field.far_ptr)->vals[ind].url = NULL;
-	}
-	str = JSVAL_IS_STRING(*vp) ? JSVAL_TO_STRING(*vp) : JS_ValueToString(c, *vp);
-	str_val = SMJS_CHARS_FROM_STRING(c, str);
-	((MFURL *)ptr->field.far_ptr)->vals[ind].url = gf_strdup(str_val);
-	((MFURL *)ptr->field.far_ptr)->vals[ind].OD_ID = 0;
-	SMJS_FREE(c, str_val);
-	break;
-
-case GF_SG_VRML_MFVEC2F:
-	from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	gf_sg_vrml_field_copy(& ((MFVec2f *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
-	break;
-case GF_SG_VRML_MFVEC3F:
-	from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	gf_sg_vrml_field_copy(& ((MFVec3f *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
-	break;
-case GF_SG_VRML_MFROTATION:
-	from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	gf_sg_vrml_field_copy(& ((MFRotation *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
-	break;
-case GF_SG_VRML_MFCOLOR:
-	from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-	gf_sg_vrml_field_copy(& ((MFColor *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
-	break;
-}
-
-Script_FieldChanged(c, NULL, ptr, NULL);
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET( array_setLength)
-
-u32 len, i, sftype, old_len;
-JSBool ret;
-GF_JSClass *the_sf_class;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-if (!JSVAL_IS_INT(*vp) || JSVAL_TO_INT(*vp) < 0) return JS_FALSE;
-/*avoids gcc warning*/
-#ifndef GPAC_CONFIG_DARWIN
-if (!id) id=0;
-#endif
-len = JSVAL_TO_INT(*vp);
-
-
-if (!len) {
-	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-		gf_node_unregister_children(ptr->owner, *(GF_ChildNodeItem**)ptr->field.far_ptr);
-		*(GF_ChildNodeItem**)ptr->field.far_ptr = NULL;
-	} else {
-		gf_sg_vrml_mf_reset(ptr->field.far_ptr, ptr->field.fieldType);
-	}
-	JS_SetArrayLength(c, ptr->js_list, 0);
-	Script_FieldChanged(c, NULL, ptr, NULL);
-	return JS_TRUE;
-}
-
-ret = JS_GetArrayLength(c, ptr->js_list, &old_len);
-if (ret==JS_FALSE) return ret;
-
-ret = JS_SetArrayLength(c, ptr->js_list, len);
-if (ret==JS_FALSE) return ret;
-
-the_sf_class = NULL;
-switch (ptr->field.fieldType) {
-case GF_SG_VRML_MFVEC2F:
-	the_sf_class = &js_rt->SFVec2fClass;
-	break;
-case GF_SG_VRML_MFVEC3F:
-	the_sf_class = &js_rt->SFVec3fClass;
-	break;
-case GF_SG_VRML_MFCOLOR:
-	the_sf_class = &js_rt->SFColorClass;
-	break;
-case GF_SG_VRML_MFROTATION:
-	the_sf_class = &js_rt->SFRotationClass;
-	break;
-case GF_SG_VRML_MFNODE:
-{
-	u32 c = gf_node_list_get_count(*(GF_ChildNodeItem**)ptr->field.far_ptr);
-	while (len < c) {
-		GF_Node *n = gf_node_list_del_child_idx((GF_ChildNodeItem**)ptr->field.far_ptr, c-1);
-		if (n) gf_node_unregister(n, ptr->owner);
-		c--;
-	}
-	if (len>c) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML] MFARRAY EXPANSION NOT SUPPORTED!!!\n"));
-	}
-}
-return JS_TRUE;
-}
-
-sftype = gf_sg_vrml_get_sf_type(ptr->field.fieldType);
-for (i=old_len; i<len; i++) {
-	jsval a_val;
-	if (the_sf_class) {
-		JSObject *an_obj = SMJS_CONSTRUCT_OBJECT(c, the_sf_class, obj);
-		a_val = OBJECT_TO_JSVAL(an_obj );
-	} else {
-		switch (sftype) {
-		case GF_SG_VRML_SFBOOL:
-			a_val = BOOLEAN_TO_JSVAL(0);
-			break;
-		case GF_SG_VRML_SFINT32:
-			a_val = INT_TO_JSVAL(0);
-			break;
-		case GF_SG_VRML_SFFLOAT:
-		case GF_SG_VRML_SFTIME:
-			a_val = JS_MAKE_DOUBLE(c, 0);
-			break;
-		case GF_SG_VRML_SFSTRING:
-		case GF_SG_VRML_SFURL:
-			a_val = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "") );
-			break;
-		default:
-			a_val = INT_TO_JSVAL(0);
-			break;
-		}
-	}
-	JS_SetElement(c, ptr->js_list, i, &a_val);
-}
-return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET( array_getLength)
-
-JSBool ret;
-jsuint len;
-GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-/*avoids gcc warning*/
-#ifndef GPAC_CONFIG_DARWIN
-if (!id) id=0;
-#endif
-if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
-	len = gf_node_list_get_count(*(GF_ChildNodeItem **)ptr->field.far_ptr);
-	ret = JS_TRUE;
-} else {
-	ret = JS_GetArrayLength(c, ptr->js_list, &len);
-}
-*vp = INT_TO_JSVAL(len);
-return ret;
-}
-
-
-/* MFVec2f class constructor */
-static JSBool SMJS_FUNCTION(MFVec2fConstructor)
-{
-	jsval val;
-	JSObject *item;
-	u32 i;
-	SMJS_ARGS
-	GF_JSField *ptr = NewJSField(c);
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFVec2fClass)
-
-	setup_js_array(c, obj, ptr, 0, 0);
-	JS_SetArrayLength(c, ptr->js_list, argc);
-	SMJS_SET_PRIVATE(c, obj, ptr);
-
-	for (i=0; i<argc; i++) {
-		if (!JSVAL_IS_OBJECT(argv[i]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[i]), &js_rt->SFVec2fClass, NULL) ) {
-			item = SMJS_CONSTRUCT_OBJECT(c, &js_rt->SFVec2fClass, obj);
-			val = OBJECT_TO_JSVAL(item);
-			JS_SetElement(c, ptr->js_list, i, &val);
-		} else {
-			JS_SetElement(c, ptr->js_list, i, &argv[i]);
-		}
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return obj == 0 ? JS_FALSE : JS_TRUE;
-}
-
-/* MFVec3f class constructor */
-static JSBool SMJS_FUNCTION(MFVec3fConstructor)
-{
-	jsval val;
-	JSObject *item;
-	u32 i;
-	SMJS_ARGS
-	GF_JSField *ptr;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFVec3fClass)
-
-	ptr = NewJSField(c);
-	ptr->field.fieldType = GF_SG_VRML_MFVEC3F;
-	setup_js_array(c, obj, ptr, 0, 0);
-	JS_SetArrayLength(c, ptr->js_list, argc);
-	SMJS_SET_PRIVATE(c, obj, ptr);
-
-	for (i=0; i<argc; i++) {
-		if (!JSVAL_IS_OBJECT(argv[i]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[i]), &js_rt->SFVec3fClass, NULL) ) {
-			item = SMJS_CONSTRUCT_OBJECT(c, &js_rt->SFVec3fClass, obj);
-			val = OBJECT_TO_JSVAL(item);
-			JS_SetElement(c, ptr->js_list, i, &val);
-		} else {
-			JS_SetElement(c, ptr->js_list, i, &argv[i]);
-		}
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return obj == 0 ? JS_FALSE : JS_TRUE;
-}
-
-/* MFRotation class constructor */
-static JSBool SMJS_FUNCTION(MFRotationConstructor)
-{
-	jsval val;
-	JSObject *item;
-	u32 i;
-	SMJS_ARGS
-	GF_JSField *ptr;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFRotationClass)
-
-	ptr = NewJSField(c);
-	ptr->field.fieldType = GF_SG_VRML_MFROTATION;
-	setup_js_array(c, obj, ptr, 0, 0);
-	JS_SetArrayLength(c, ptr->js_list, argc);
-	SMJS_SET_PRIVATE(c, obj, ptr);
-
-	for (i=0; i<argc; i++) {
-		if (!JSVAL_IS_OBJECT(argv[i]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[i]), &js_rt->SFRotationClass, NULL) ) {
-			item = SMJS_CONSTRUCT_OBJECT(c, &js_rt->SFVec3fClass, obj);
-			val = OBJECT_TO_JSVAL(item);
-			JS_SetElement(c, ptr->js_list, i, &val);
-		} else {
-			JS_SetElement(c, ptr->js_list, i, &argv[i]);
-		}
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return obj == 0 ? JS_FALSE : JS_TRUE;
-}
-
-/*MFColor class constructor */
-static JSBool SMJS_FUNCTION(MFColorConstructor)
-{
-	jsval val;
-	JSObject *item;
-	u32 i;
-	SMJS_ARGS
-	GF_JSField *ptr;
-	SMJS_OBJ_CONSTRUCTOR(&js_rt->MFColorClass)
-
-	ptr = NewJSField(c);
-	ptr->field.fieldType = GF_SG_VRML_MFCOLOR;
-	setup_js_array(c, obj, ptr, 0, 0);
-	JS_SetArrayLength(c, ptr->js_list, argc);
-	SMJS_SET_PRIVATE(c, obj, ptr);
-
-	for (i=0; i<argc; i++) {
-		if (!JSVAL_IS_OBJECT(argv[i]) || !GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[i]), &js_rt->SFColorClass, NULL) ) {
-			item = SMJS_CONSTRUCT_OBJECT(c, &js_rt->SFColorClass, obj);
-			val = OBJECT_TO_JSVAL(item);
-			JS_SetElement(c, ptr->js_list, i, &val);
-		} else {
-			JS_SetElement(c, ptr->js_list, i, &argv[i]);
-		}
-	}
-	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-	return obj == 0 ? JS_FALSE : JS_TRUE;
-}
-
-#ifndef GPAC_DISABLE_SVG
-
-/*CHECK IF THIS WORKS WITH NEW API*/
-JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
-JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
-
-JSBool SMJS_FUNCTION(vrml_event_add_listener)
-{
-	GF_Node *node;
-	GF_JSField *ptr;
-	SMJS_OBJ
-	if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-	node = * ((GF_Node **)ptr->field.far_ptr);
-
-	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, node);
-}
-JSBool SMJS_FUNCTION(vrml_event_remove_listener)
-{
-	GF_Node *node;
-	GF_JSField *ptr;
-	SMJS_OBJ
-	if (! GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) return JS_FALSE;
-	ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
-	node = * ((GF_Node **)ptr->field.far_ptr);
-
-	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, node);
-}
-#endif
-
-static JSBool SMJS_FUNCTION(vrml_dom3_not_implemented)
-{
-	return JS_FALSE;
-}
-
-
-void gf_sg_script_init_sm_api(GF_ScriptPriv *sc, GF_Node *script)
-{
-	JS_SETUP_CLASS(js_rt->globalClass, "global", JSCLASS_HAS_PRIVATE,
-	               JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-
-
-	JS_SETUP_CLASS(js_rt->AnyClass, "AnyClass", JSCLASS_HAS_PRIVATE,
-	               JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-
-	JS_SETUP_CLASS(js_rt->browserClass , "Browser", 0,
-	               JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-
-#if 1
-	JS_SETUP_CLASS(js_rt->SFNodeClass, "SFNode", JSCLASS_HAS_PRIVATE,
-	               node_getProperty, node_setProperty, node_finalize);
-#else
-	/*only used to debug JS_SETUP_CLASS at each of the numerous changes of JSAPI ............ */
-	memset(&js_rt->SFNodeClass, 0, sizeof(js_rt->SFNodeClass));
-	js_rt->SFNodeClass._class.name = "SFNode";
-	js_rt->SFNodeClass._class.flags = JSCLASS_HAS_PRIVATE;
-	js_rt->SFNodeClass._class.addProperty = JS_PropertyStub;
-	js_rt->SFNodeClass._class.delProperty = JS_PropertyStub;
-	js_rt->SFNodeClass._class.getProperty = node_getProperty;
-	js_rt->SFNodeClass._class.setProperty = node_setProperty;
-	js_rt->SFNodeClass._class.enumerate = JS_EnumerateStub;
-	js_rt->SFNodeClass._class.resolve = JS_ResolveStub;
-	js_rt->SFNodeClass._class.convert = JS_ConvertStub;
-	js_rt->SFNodeClass._class.finalize = node_finalize;
-	js_rt->SFNodeClass._class.hasInstance = gf_sg_js_has_instance;
-#endif
-
-	JS_SETUP_CLASS(js_rt->SFVec2fClass , "SFVec2f", JSCLASS_HAS_PRIVATE,
-	               vec2f_getProperty, vec2f_setProperty, field_finalize);
-
-	JS_SETUP_CLASS(js_rt->SFVec3fClass , "SFVec3f", JSCLASS_HAS_PRIVATE,
-	               vec3f_getProperty, vec3f_setProperty, field_finalize);
-
-	JS_SETUP_CLASS(js_rt->SFRotationClass , "SFRotation", JSCLASS_HAS_PRIVATE,
-	               rot_getProperty, rot_setProperty,  field_finalize);
-
-	JS_SETUP_CLASS(js_rt->SFColorClass , "SFColor", JSCLASS_HAS_PRIVATE,
-	               color_getProperty, color_setProperty, field_finalize);
-
-	JS_SETUP_CLASS(js_rt->SFImageClass , "SFImage", JSCLASS_HAS_PRIVATE,
-	               image_getProperty, image_setProperty, field_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFInt32Class , "MFInt32", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement, array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFBoolClass , "MFBool", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement, array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFTimeClass , "MFTime", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFFloatClass , "MFFloat", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFUrlClass , "MFUrl", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFStringClass , "MFString", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFNodeClass , "MFNode", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFVec2fClass , "MFVec2f", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFVec3fClass , "MFVec3f", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFRotationClass , "MFRotation", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SETUP_CLASS(js_rt->MFColorClass , "MFColor", JSCLASS_HAS_PRIVATE,
-	               array_getElement,  array_setElement,  array_finalize);
-
-	JS_SetErrorReporter(sc->js_ctx, script_error);
-
-	sc->js_obj = gf_sg_js_global_object(sc->js_ctx, &js_rt->globalClass);
-
-	JS_InitStandardClasses(sc->js_ctx, sc->js_obj);
-	{
-		JSFunctionSpec globalFunctions[] = {
-			SMJS_FUNCTION_SPEC("print", JSPrint, 0),
-			SMJS_FUNCTION_SPEC("alert", JSPrint, 0),
-			SMJS_FUNCTION_SPEC("parseXML", vrml_parse_xml, 0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JS_DefineFunctions(sc->js_ctx, sc->js_obj, globalFunctions );
-	}
-	/*remember pointer to scene graph!!*/
-	SMJS_SET_PRIVATE(sc->js_ctx, sc->js_obj, script->sgprivate->scenegraph);
-
-
-	JS_DefineProperty(sc->js_ctx, sc->js_obj, "FALSE", BOOLEAN_TO_JSVAL(JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-	JS_DefineProperty(sc->js_ctx, sc->js_obj, "TRUE", BOOLEAN_TO_JSVAL(JS_TRUE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-	JS_DefineProperty(sc->js_ctx, sc->js_obj, "NULL", JSVAL_NULL, 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-	JS_DefineProperty(sc->js_ctx, sc->js_obj, "_this", PRIVATE_TO_JSVAL(script), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-
-	sc->js_browser = JS_DefineObject(sc->js_ctx, sc->js_obj, "Browser", &js_rt->browserClass._class, 0, 0 );
-	JS_DefineProperty(sc->js_ctx, sc->js_browser, "_this", PRIVATE_TO_JSVAL(script), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
-	{
-		JSFunctionSpec browserFunctions[] = {
-			SMJS_FUNCTION_SPEC("getName", getName, 0),
-			SMJS_FUNCTION_SPEC("getVersion", getVersion, 0),
-			SMJS_FUNCTION_SPEC("getCurrentSpeed", getCurrentSpeed, 0),
-			SMJS_FUNCTION_SPEC("getCurrentFrameRate", getCurrentFrameRate, 0),
-			SMJS_FUNCTION_SPEC("getWorldURL", getWorldURL, 0),
-			SMJS_FUNCTION_SPEC("replaceWorld", replaceWorld, 1),
-			SMJS_FUNCTION_SPEC("addRoute", addRoute, 4),
-			SMJS_FUNCTION_SPEC("deleteRoute", deleteRoute, 4),
-			SMJS_FUNCTION_SPEC("loadURL", loadURL, 1),
-			SMJS_FUNCTION_SPEC("createVrmlFromString", createVrmlFromString, 1),
-			SMJS_FUNCTION_SPEC("setDescription", setDescription, 1),
-			SMJS_FUNCTION_SPEC("print",           JSPrint,          1),
-			SMJS_FUNCTION_SPEC("getScript",  getScript,          0),
-			SMJS_FUNCTION_SPEC("getProto",  getProto,          0),
-			SMJS_FUNCTION_SPEC("loadScript",  loadScript,          1),
-			SMJS_FUNCTION_SPEC("getElementById",  getElementById,   1),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JS_DefineFunctions(sc->js_ctx, sc->js_browser, browserFunctions);
-	}
-
-	{
-		JSFunctionSpec SFNodeMethods[] = {
-			SMJS_FUNCTION_SPEC("toString", node_toString, 0),
-			SMJS_FUNCTION_SPEC("getTime", node_getTime, 0),
-#ifndef GPAC_DISABLE_SVG
-			SMJS_FUNCTION_SPEC("addEventListenerNS", vrml_event_add_listener, 4),
-			SMJS_FUNCTION_SPEC("removeEventListenerNS", vrml_event_remove_listener, 4),
-			SMJS_FUNCTION_SPEC("addEventListener", vrml_event_add_listener, 3),
-			SMJS_FUNCTION_SPEC("removeEventListener", vrml_event_remove_listener, 3),
-			SMJS_FUNCTION_SPEC("dispatchEvent", vrml_dom3_not_implemented, 1),
-#endif
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		JSPropertySpec SFNodeProps[] = {
-			SMJS_PROPERTY_SPEC("__dummy",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFNodeClass, SFNodeConstructor, 1, SFNodeProps, SFNodeMethods, 0, 0);
-	}
-	{
-		JSPropertySpec SFVec2fProps[] = {
-			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec SFVec2fMethods[] = {
-			SMJS_FUNCTION_SPEC("add",			vec2f_add,      1),
-			SMJS_FUNCTION_SPEC("divide",          vec2f_divide,   1),
-			SMJS_FUNCTION_SPEC("dot",             vec2f_dot,      1),
-			SMJS_FUNCTION_SPEC("length",          vec2f_length,   0),
-			SMJS_FUNCTION_SPEC("multiply",        vec2f_multiply, 1),
-			SMJS_FUNCTION_SPEC("normalize",       vec2f_normalize,0),
-			SMJS_FUNCTION_SPEC("subtract",        vec2f_subtract, 1),
-			SMJS_FUNCTION_SPEC("negate",          vec2f_negate,   0),
-			SMJS_FUNCTION_SPEC("toString",        field_toString, 0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFVec2fClass, SFVec2fConstructor, 0, SFVec2fProps, SFVec2fMethods, 0, 0);
-	}
-	{
-		JSPropertySpec SFVec3fProps[] = {
-			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("z",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec SFVec3fMethods[] = {
-			SMJS_FUNCTION_SPEC("add",             vec3f_add,      1),
-			SMJS_FUNCTION_SPEC("divide",          vec3f_divide,   1),
-			SMJS_FUNCTION_SPEC("dot",             vec3f_dot,      1),
-			SMJS_FUNCTION_SPEC("length",          vec3f_length,   0),
-			SMJS_FUNCTION_SPEC("multiply",        vec3f_multiply, 1),
-			SMJS_FUNCTION_SPEC("normalize",       vec3f_normalize,0),
-			SMJS_FUNCTION_SPEC("subtract",        vec3f_subtract, 1),
-			SMJS_FUNCTION_SPEC("cross",			vec3f_cross,	1),
-			SMJS_FUNCTION_SPEC("negate",          vec3f_negate,   0),
-			SMJS_FUNCTION_SPEC("toString",        field_toString,	0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFVec3fClass, SFVec3fConstructor, 0, SFVec3fProps, SFVec3fMethods, 0, 0);
-	}
-	{
-		JSPropertySpec SFRotationProps[] = {
-			SMJS_PROPERTY_SPEC("xAxis",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("yAxis",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("zAxis",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("angle",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec SFRotationMethods[] = {
-			SMJS_FUNCTION_SPEC("getAxis",         rot_getAxis,      1),
-			SMJS_FUNCTION_SPEC("inverse",         rot_inverse,   1),
-			SMJS_FUNCTION_SPEC("multiply",        rot_multiply,      1),
-			SMJS_FUNCTION_SPEC("multVec",         rot_multVec,   0),
-			SMJS_FUNCTION_SPEC("setAxis",			rot_setAxis, 1),
-			SMJS_FUNCTION_SPEC("slerp",			rot_slerp,0),
-			SMJS_FUNCTION_SPEC("toString",        field_toString,	0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFRotationClass, SFRotationConstructor, 0, SFRotationProps, SFRotationMethods, 0, 0);
-	}
-	{
-		JSPropertySpec SFColorProps[] = {
-			SMJS_PROPERTY_SPEC("r",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("g",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("b",       2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		JSFunctionSpec SFColorMethods[] = {
-			SMJS_FUNCTION_SPEC("setHSV",          color_setHSV,   3),
-			SMJS_FUNCTION_SPEC("getHSV",          color_getHSV,   0),
-			SMJS_FUNCTION_SPEC("toString",        field_toString,       0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFColorClass, SFColorConstructor, 0, SFColorProps, SFColorMethods, 0, 0);
-	}
-	{
-		JSPropertySpec SFImageProps[] = {
-			SMJS_PROPERTY_SPEC("x",       0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("y",       1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("comp",    2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("array",   3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
-		};
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->SFImageClass, SFImageConstructor, 0, SFImageProps, 0, 0, 0);
-	}
-
-	{
-		JSPropertySpec MFArrayProp[] = {
-			SMJS_PROPERTY_SPEC( "length", 0, JSPROP_PERMANENT | JSPROP_SHARED, array_getLength, array_setLength ),
-			SMJS_PROPERTY_SPEC( "assign", 1, JSPROP_PERMANENT | JSPROP_SHARED, array_getElement, array_setElement),
-			SMJS_PROPERTY_SPEC( 0, 0, 0, 0, 0 )
-		};
-		JSFunctionSpec MFArrayMethods[] = {
-			SMJS_FUNCTION_SPEC("toString",        field_toString,       0),
-			SMJS_FUNCTION_SPEC(0, 0, 0)
-		};
-
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFInt32Class, MFInt32Constructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFBoolClass, MFBoolConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFFloatClass, MFFloatConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFTimeClass, MFTimeConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFStringClass, MFStringConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFUrlClass, MFURLConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFVec2fClass, MFVec2fConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFVec3fClass, MFVec3fConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFRotationClass, MFRotationConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFColorClass, MFColorConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &js_rt->MFNodeClass, MFNodeConstructor, 0, MFArrayProp, MFArrayMethods, 0, 0);
-	}
-
-	/*
-		cant get any doc specifying if these are supposed to be supported in MPEG4Script...
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &SFVec4fClass, SFVec4fConstructor, 0, SFVec4fProps, SFVec4fMethods, 0, 0);
-		GF_JS_InitClass(sc->js_ctx, sc->js_obj, 0, &MFVec4fClass, MFVec4fCons, 0, MFArrayProp, 0, 0, 0);
-	*/
-
-}
-
-
-
-JSBool gf_sg_script_to_node_field(JSContext *c, jsval val, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent)
-{
-	jsdouble d;
-	Bool changed;
-	JSObject *obj;
-	GF_JSField *p, *from;
-	jsuint len;
-	jsval item;
-	u32 i;
-
-	if (JSVAL_IS_VOID(val)) return JS_TRUE;
-	if ((field->fieldType != GF_SG_VRML_SFNODE) && JSVAL_IS_NULL(val)) return JS_TRUE;
-
-
-	switch (field->fieldType) {
-	case GF_SG_VRML_SFBOOL:
-	{
-		if (JSVAL_IS_BOOLEAN(val)) {
-			*((SFBool *) field->far_ptr) = JSVAL_TO_BOOLEAN(val);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFINT32:
-	{
-		if (JSVAL_IS_INT(val) ) {
-			* ((SFInt32 *) field->far_ptr) = JSVAL_TO_INT(val);
-			Script_FieldChanged(c, owner, parent, field);
-		} else if (JSVAL_IS_NUMBER(val) ) {
-			SMJS_GET_NUMBER(val, d );
-			*((SFInt32 *) field->far_ptr) = (s32) d;
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFFLOAT:
-	{
-		if (JSVAL_IS_NUMBER(val) ) {
-			SMJS_GET_NUMBER(val, d );
-			*((SFFloat *) field->far_ptr) = FLT2FIX( d);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFTIME:
-	{
-		if (JSVAL_IS_NUMBER(val) ) {
-			SMJS_GET_NUMBER(val, d );
-			*((SFTime *) field->far_ptr) = (Double) d;
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFSTRING:
-	{
-		SFString *s = (SFString*)field->far_ptr;
-		JSString *str = JSVAL_IS_STRING(val) ? JSVAL_TO_STRING(val) : JS_ValueToString(c, val);
-		char *str_val = SMJS_CHARS_FROM_STRING(c, str);
-		/*we do filter strings since rebuilding a text is quite slow, so let's avoid killing the compositors*/
-		if (!s->buffer || strcmp(str_val, s->buffer)) {
-			if ( s->buffer) gf_free(s->buffer);
-			s->buffer = gf_strdup(str_val);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		SMJS_FREE(c, str_val);
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFURL:
-	{
-		char *str_val;
-		JSString *str = JSVAL_IS_STRING(val) ? JSVAL_TO_STRING(val) : JS_ValueToString(c, val);
-		if (((SFURL*)field->far_ptr)->url) gf_free(((SFURL*)field->far_ptr)->url);
-		str_val = SMJS_CHARS_FROM_STRING(c, str);
-		((SFURL*)field->far_ptr)->url = gf_strdup(str_val);
-		((SFURL*)field->far_ptr)->OD_ID = 0;
-		Script_FieldChanged(c, owner, parent, field);
-		SMJS_FREE(c, str_val);
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_MFSTRING:
-		if (JSVAL_IS_STRING(val)) {
-			char *str_val;
-			JSString *str = JSVAL_TO_STRING(val);
-			gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
-			gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, 1);
-			str_val = SMJS_CHARS_FROM_STRING(c, str);
-			((MFString*)field->far_ptr)->vals[0] = gf_strdup(str_val);
-			Script_FieldChanged(c, owner, parent, field);
-			SMJS_FREE(c, str_val);
-			return JS_TRUE;
-		}
-	case GF_SG_VRML_MFURL:
-		if (JSVAL_IS_STRING(val)) {
-			char *str_val;
-			JSString *str = JSVAL_TO_STRING(val);
-			gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
-			gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, 1);
-			str_val = SMJS_CHARS_FROM_STRING(c, str);
-			((MFURL*)field->far_ptr)->vals[0].url = gf_strdup(str_val);
-			((MFURL*)field->far_ptr)->vals[0].OD_ID = 0;
-			Script_FieldChanged(c, owner, parent, field);
-			SMJS_FREE(c, str_val);
-			return JS_TRUE;
-		}
-
-	default:
-		break;
-	}
-
-	//from here we must have an object
-	if (! JSVAL_IS_OBJECT(val)) return JS_FALSE;
-	obj = JSVAL_TO_OBJECT(val) ;
-
-	switch (field->fieldType) {
-	case GF_SG_VRML_SFVEC2F:
-	{
-		if (GF_JS_InstanceOf(c, obj, &js_rt->SFVec2fClass, NULL) ) {
-			p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC2F);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFVEC3F:
-	{
-		if (GF_JS_InstanceOf(c, obj, &js_rt->SFVec3fClass, NULL) ) {
-			p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC3F);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFROTATION:
-	{
-		if ( GF_JS_InstanceOf(c, obj, &js_rt->SFRotationClass, NULL) ) {
-			p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFROTATION);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFCOLOR:
-	{
-		if (GF_JS_InstanceOf(c, obj, &js_rt->SFColorClass, NULL) ) {
-			p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFCOLOR);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFNODE:
-	{
-		/*replace object*/
-		if (*((GF_Node**)field->far_ptr)) {
-			gf_node_unregister(*((GF_Node**)field->far_ptr), owner);
-			*((GF_Node**)field->far_ptr) = NULL;
-		}
-
-		if (JSVAL_IS_NULL(val)) {
-			Script_FieldChanged(c, owner, parent, field);
-		} else if (GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) {
-			GF_Node *n = * (GF_Node**) ((GF_JSField *) SMJS_GET_PRIVATE(c, obj))->field.far_ptr;
-			* ((GF_Node **)field->far_ptr) = n;
-			gf_node_register(n, owner);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	case GF_SG_VRML_SFIMAGE:
-	{
-		if ( GF_JS_InstanceOf(c, obj, &js_rt->SFImageClass, NULL) ) {
-			p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFIMAGE);
-			Script_FieldChanged(c, owner, parent, field);
-		}
-		return JS_TRUE;
-	}
-	default:
-		break;
-	}
-
-	//from here we handle only MF fields
-	if ( !GF_JS_InstanceOf(c, obj, &js_rt->MFBoolClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFInt32Class, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFFloatClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFTimeClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFStringClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFUrlClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFVec2fClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFVec3fClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFRotationClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFColorClass, NULL)
-	        && !GF_JS_InstanceOf(c, obj, &js_rt->MFNodeClass, NULL)
-	        /*
-	        		&& !GF_JS_InstanceOf(c, obj, &MFVec4fClass, NULL)
-	        */
-	   ) return JS_TRUE;
-
-
-	p = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-	JS_GetArrayLength(c, p->js_list, &len);
-
-	/*special handling for MF node, reset list first*/
-	if (GF_JS_InstanceOf(c, obj, &js_rt->MFNodeClass, NULL)) {
-		GF_Node *child;
-		GF_ChildNodeItem *last = NULL;
-		gf_node_unregister_children(owner, * (GF_ChildNodeItem **) field->far_ptr);
-		* (GF_ChildNodeItem **) field->far_ptr = NULL;
-
-		for (i=0; i<len; i++) {
-			JSObject *node_obj;
-			JS_GetElement(c, p->js_list, (jsint) i, &item);
-			if (JSVAL_IS_NULL(item)) break;
-			if (!JSVAL_IS_OBJECT(item)) break;
-			node_obj = JSVAL_TO_OBJECT(item);
-			if ( !GF_JS_InstanceOf(c, node_obj, &js_rt->SFNodeClass, NULL)) break;
-			from = (GF_JSField *) SMJS_GET_PRIVATE(c, node_obj);
-
-			child = * ((GF_Node**)from->field.far_ptr);
-
-			gf_node_list_add_child_last( (GF_ChildNodeItem **) field->far_ptr , child, &last);
-			gf_node_register(child, owner);
-		}
-		Script_FieldChanged(c, owner, parent, field);
-		/*and mark the field as changed*/
-		JSScript_NodeModified(owner->sgprivate->scenegraph, owner, field, NULL);
-		return JS_TRUE;
-	}
-
-	/*again, check text changes*/
-	changed = (field->fieldType == GF_SG_VRML_MFSTRING) ? 0 : 1;
-	/*gf_realloc*/
-	if (len != ((GenMFField *)field->far_ptr)->count) {
-		gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
-		gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, len);
-		changed = 1;
-	}
-	/*assign each slot*/
-	for (i=0; i<len; i++) {
-		JS_GetElement(c, p->js_list, (jsint) i, &item);
-
-		switch (field->fieldType) {
-		case GF_SG_VRML_MFBOOL:
-			if (JSVAL_IS_BOOLEAN(item)) {
-				((MFBool*)field->far_ptr)->vals[i] = (Bool) JSVAL_TO_BOOLEAN(item);
-			}
-			break;
-		case GF_SG_VRML_MFINT32:
-			if (JSVAL_IS_INT(item)) {
-				((MFInt32 *)field->far_ptr)->vals[i] = (s32) JSVAL_TO_INT(item);
-			}
-			break;
-		case GF_SG_VRML_MFFLOAT:
-			if (JSVAL_IS_NUMBER(item)) {
-				SMJS_GET_NUMBER(item, d);
-				((MFFloat *)field->far_ptr)->vals[i] = FLT2FIX( d);
-			}
-			break;
-		case GF_SG_VRML_MFTIME:
-			if (JSVAL_IS_NUMBER(item)) {
-				SMJS_GET_NUMBER(item, d);
-				((MFTime *)field->far_ptr)->vals[i] = d;
-			}
-			break;
-		case GF_SG_VRML_MFSTRING:
-		{
-			MFString *mfs = (MFString *) field->far_ptr;
-			JSString *str = JSVAL_IS_STRING(item) ? JSVAL_TO_STRING(item) : JS_ValueToString(c, item);
-			char *str_val = SMJS_CHARS_FROM_STRING(c, str);
-			if (!mfs->vals[i] || strcmp(str_val, mfs->vals[i]) ) {
-				if (mfs->vals[i]) gf_free(mfs->vals[i]);
-				mfs->vals[i] = gf_strdup(str_val);
-				changed = 1;
-			}
-			SMJS_FREE(c, str_val);
-		}
-		break;
-		case GF_SG_VRML_MFURL:
-		{
-			char *str_val;
-			MFURL *mfu = (MFURL *) field->far_ptr;
-			JSString *str = JSVAL_IS_STRING(item) ? JSVAL_TO_STRING(item) : JS_ValueToString(c, item);
-			if (mfu->vals[i].url) gf_free(mfu->vals[i].url);
-			str_val = SMJS_CHARS_FROM_STRING(c, str);
-			mfu->vals[i].url = gf_strdup(str_val);
-			mfu->vals[i].OD_ID = 0;
-			SMJS_FREE(c, str_val);
-		}
-		break;
-
-		case GF_SG_VRML_MFVEC2F:
-			if ( JSVAL_IS_OBJECT(item) && GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(item), &js_rt->SFVec2fClass, NULL) ) {
-				from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
-				gf_sg_vrml_field_copy(& ((MFVec2f*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFVEC2F);
-			}
-			break;
-		case GF_SG_VRML_MFVEC3F:
-			if ( JSVAL_IS_OBJECT(item) && GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(item), &js_rt->SFVec3fClass, NULL) ) {
-				from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
-				gf_sg_vrml_field_copy(& ((MFVec3f*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFVEC3F);
-			}
-			break;
-		case GF_SG_VRML_MFROTATION:
-			if ( JSVAL_IS_OBJECT(item) && GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(item), &js_rt->SFRotationClass, NULL) ) {
-				from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
-				gf_sg_vrml_field_copy(& ((MFRotation*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFROTATION);
-			}
-			break;
-		case GF_SG_VRML_MFCOLOR:
-			if ( JSVAL_IS_OBJECT(item) && GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(item), &js_rt->SFColorClass, NULL) ) {
-				from = (GF_JSField *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(item));
-				gf_sg_vrml_field_copy(& ((MFColor*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFCOLOR);
-			}
-			break;
-
-		default:
-			return JS_TRUE;
-		}
-	}
-	if (changed) Script_FieldChanged(c, owner, parent, field);
-	return JS_TRUE;
-}
-
-
-static void gf_sg_script_update_cached_object(GF_ScriptPriv *priv, JSObject *obj, GF_JSField *jsf, GF_FieldInfo *field, GF_Node *parent)
-{
-	u32 i;
-	jsval newVal;
-	JSString *s;
-
-	/*we need to rebuild MF types where SF is a native type.*/
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Recomputing cached jsobj\n") );
-	switch (jsf->field.fieldType) {
-	case GF_SG_VRML_MFBOOL:
-	{
-		MFBool *f = (MFBool *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			newVal = BOOLEAN_TO_JSVAL(f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	case GF_SG_VRML_MFINT32:
-	{
-		MFInt32 *f = (MFInt32 *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			newVal = INT_TO_JSVAL(f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	case GF_SG_VRML_MFFLOAT:
-	{
-		MFFloat *f = (MFFloat *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			newVal = JS_MAKE_DOUBLE(priv->js_ctx, FIX2FLT(f->vals[i]));
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	case GF_SG_VRML_MFTIME:
-	{
-		MFTime *f = (MFTime *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			newVal = JS_MAKE_DOUBLE(priv->js_ctx, f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	case GF_SG_VRML_MFSTRING:
-	{
-		MFString *f = (MFString *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			s = JS_NewStringCopyZ(priv->js_ctx, f->vals[i]);
-			newVal = STRING_TO_JSVAL( s );
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	case GF_SG_VRML_MFURL:
-	{
-		MFURL *f = (MFURL *) field->far_ptr;
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-		JS_SetArrayLength(priv->js_ctx, jsf->js_list, f->count);
-		for (i=0; i<f->count; i++) {
-			if (f->vals[i].OD_ID > 0) {
-				char msg[30];
-				sprintf(msg, "od:%d", f->vals[i].OD_ID);
-				s = JS_NewStringCopyZ(priv->js_ctx, (const char *) msg);
-			} else {
-				s = JS_NewStringCopyZ(priv->js_ctx, f->vals[i].url);
-			}
-			newVal = STRING_TO_JSVAL(s);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-	}
-	break;
-	/*
-		MFNode is tricky because in VRML/MPEG-4, SFNode are assigned by referenced, not copy.
-		We therefore need to make sure we reuse existing SFNode object rather than
-		blindly recreating them
-	*/
-	case GF_SG_VRML_MFNODE:
-	{
-#if 0
-		GF_ChildNodeItem *f = *(GF_ChildNodeItem **) field->far_ptr;
-		u32 j;
-		jsuint count;
-		GF_List *temp_objs = gf_list_new();
-
-		/*1: find all existing objs for each node*/
-		JS_GetArrayLength(priv->js_ctx, jsf->js_list, &count);
-
-		/*this may introduce bugs when a child is being replaced through an update command, but it is way
-		too costly to handle in script*/
-		if (gf_node_list_get_count(f)==count) return;
-
-		fprintf(stderr, "rewriting MFNode cache\n");
-		while (f) {
-			slot = NULL;
-			/*first look in the original array*/
-			for (j=0; j<count; j++) {
-				JSObject *an_obj;
-				JS_GetElement(priv->js_ctx, jsf->js_list, (jsint) j, &newVal);
-				an_obj = JSVAL_TO_OBJECT(newVal);
-				if (an_obj) slot = SMJS_GET_PRIVATE(priv->js_ctx, an_obj);
-				if (slot && (slot->node==f->node)) {
-					gf_list_add(temp_objs, an_obj);
-					break;
-				}
-				slot = NULL;
-			}
-			if (!slot) {
-				JSObject *an_obj = node_get_binding(priv, f->node, 0);
-				gf_list_add(temp_objs, an_obj);
-			}
-			f = f->next;
-		}
-		/*2- and rewrite the final array*/
-		count = gf_list_count(temp_objs);
-		if (JS_SetArrayLength(priv->js_ctx, jsf->js_list, count) != JS_TRUE) return;
-		for (j=0; j<count; j++) {
-			JSObject *an_obj = gf_list_get(temp_objs, j);
-			slot = SMJS_GET_PRIVATE(priv->js_ctx, an_obj);
-			newVal = OBJECT_TO_JSVAL(an_obj);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) j, &newVal);
-		}
-		gf_list_del(temp_objs);
-#endif
-	}
-	break;
-	}
-	jsf->field.NDTtype = 0;
-}
-
-
-
-#define SETUP_FIELD	\
-		jsf = NewJSField(priv->js_ctx);	\
-		jsf->owner = parent;	\
-		if(parent) gf_node_get_field(parent, field->fieldIndex, &jsf->field);	\
- 
-#define SETUP_MF_FIELD	\
-		if (!obj) return JSVAL_NULL; \
-		jsf = (GF_JSField *) SMJS_GET_PRIVATE(priv->js_ctx, obj);	\
-		jsf->owner = parent;		\
-		if (parent) gf_node_get_field(parent, field->fieldIndex, &jsf->field);	\
- 
-
-
-jsval gf_sg_script_to_smjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate)
-{
-	u32 i;
-	JSObject *obj = NULL;
-	GF_JSField *jsf = NULL;
-	GF_JSField *slot = NULL;
-	jsval newVal;
-	JSString *s;
-
-	/*native types*/
-	switch (field->fieldType) {
-	case GF_SG_VRML_SFBOOL:
-		return BOOLEAN_TO_JSVAL( * ((SFBool *) field->far_ptr) );
-	case GF_SG_VRML_SFINT32:
-		return INT_TO_JSVAL(  * ((SFInt32 *) field->far_ptr));
-	case GF_SG_VRML_SFFLOAT:
-		return JS_MAKE_DOUBLE(priv->js_ctx, FIX2FLT(* ((SFFloat *) field->far_ptr) ));
-	case GF_SG_VRML_SFTIME:
-		return JS_MAKE_DOUBLE(priv->js_ctx, * ((SFTime *) field->far_ptr));
-	case GF_SG_VRML_SFSTRING:
-	{
-		s = JS_NewStringCopyZ(priv->js_ctx, ((SFString *) field->far_ptr)->buffer);
-		return STRING_TO_JSVAL( s );
-	}
-	case GF_SG_VRML_SFURL:
-	{
-		SFURL *url = (SFURL *)field->far_ptr;
-		if (url->OD_ID > 0) {
-			char msg[30];
-			sprintf(msg, "od:%d", url->OD_ID);
-			s = JS_NewStringCopyZ(priv->js_ctx, (const char *) msg);
-		} else {
-			s = JS_NewStringCopyZ(priv->js_ctx, (const char *) url->url);
-		}
-		return STRING_TO_JSVAL( s );
-	}
-	}
-
-	obj =  NULL;
-
-	/*look into object bank in case we already have this object*/
-	if (parent && parent->sgprivate->interact && parent->sgprivate->interact->js_binding) {
-		i=0;
-		while ((jsf = gf_list_enum(parent->sgprivate->interact->js_binding->fields, &i))) {
-			obj = jsf->obj;
-			if (
-			    /*make sure we use the same JS context*/
-			    (jsf->js_ctx == priv->js_ctx)
-			    && (jsf->owner == parent)
-			    && (jsf->field.far_ptr==field->far_ptr)
-			) {
-				Bool do_rebuild = 0;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] found cached jsobj %p (field %s) in script %s bank (%d entries)\n", obj, field->name, gf_node_get_log_name((GF_Node*)JS_GetScript(priv->js_ctx)), gf_list_count(priv->js_cache) ) );
-				if (!force_evaluate && !jsf->field.NDTtype) return OBJECT_TO_JSVAL(obj);
-
-				switch (field->fieldType) {
-				//we need to rewrite these
-				case GF_SG_VRML_MFVEC2F:
-				case GF_SG_VRML_MFVEC3F:
-				case GF_SG_VRML_MFROTATION:
-				case GF_SG_VRML_MFCOLOR:
-					if (force_evaluate) {
-						do_rebuild = 1;
-						break;
-					}
-				default:
-					break;
-				}
-				if (do_rebuild) {
-					JS_SetArrayLength(priv->js_ctx, jsf->js_list, 0);
-					break;
-				}
-
-				gf_sg_script_update_cached_object(priv, obj, jsf, field, parent);
-				return OBJECT_TO_JSVAL(obj);
-			}
-			obj = NULL;
-		}
-	}
-
-	if (!obj) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] creating jsobj %s.%s\n", gf_node_get_name(parent), field->name) );
-	}
-
-	switch (field->fieldType) {
-	case GF_SG_VRML_SFVEC2F:
-		SETUP_FIELD
-		obj = JS_NewObject(priv->js_ctx, &js_rt->SFVec2fClass._class, 0, priv->js_obj);
-		break;
-	case GF_SG_VRML_SFVEC3F:
-		SETUP_FIELD
-		obj = JS_NewObject(priv->js_ctx, &js_rt->SFVec3fClass._class, 0, priv->js_obj);
-		break;
-	case GF_SG_VRML_SFROTATION:
-		SETUP_FIELD
-		obj = JS_NewObject(priv->js_ctx, &js_rt->SFRotationClass._class, 0, priv->js_obj);
-		break;
-	case GF_SG_VRML_SFCOLOR:
-		SETUP_FIELD
-		obj = JS_NewObject(priv->js_ctx, &js_rt->SFColorClass._class, 0, priv->js_obj);
-		break;
-	case GF_SG_VRML_SFIMAGE:
-		SETUP_FIELD
-		obj = JS_NewObject(priv->js_ctx, &js_rt->SFImageClass._class, 0, priv->js_obj);
-		break;
-	case GF_SG_VRML_SFNODE:
-		if (! *(GF_Node**) field->far_ptr)
-			return JSVAL_NULL;
-
-		obj = node_get_binding(priv, *(GF_Node**) field->far_ptr, 0);
-		jsf = SMJS_GET_PRIVATE(priv->js_ctx, obj);
-		if (!jsf->owner)
-			jsf->owner = parent;
-		else
-			return OBJECT_TO_JSVAL(obj);
-		break;
-
-
-	case GF_SG_VRML_MFBOOL:
-	{
-		MFBool *f = (MFBool *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFBoolClass, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i = 0; i<f->count; i++) {
-			jsval newVal = BOOLEAN_TO_JSVAL(f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFINT32:
-	{
-		MFInt32 *f = (MFInt32 *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFInt32Class, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i=0; i<f->count; i++) {
-			jsval newVal = INT_TO_JSVAL(f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFFLOAT:
-	{
-		MFFloat *f = (MFFloat *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFFloatClass, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i=0; i<f->count; i++) {
-			jsval newVal = JS_MAKE_DOUBLE(priv->js_ctx, FIX2FLT(f->vals[i]));
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFTIME:
-	{
-		MFTime *f = (MFTime *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFTimeClass, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i=0; i<f->count; i++) {
-			jsval newVal = JS_MAKE_DOUBLE(priv->js_ctx, f->vals[i]);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFSTRING:
-	{
-		MFString *f = (MFString *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFStringClass, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i=0; i<f->count; i++) {
-			s = JS_NewStringCopyZ(priv->js_ctx, f->vals[i]);
-			newVal = STRING_TO_JSVAL( s );
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFURL:
-	{
-		MFURL *f = (MFURL *) field->far_ptr;
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFUrlClass, priv->js_obj);
-		SETUP_MF_FIELD
-		for (i=0; i<f->count; i++) {
-			if (f->vals[i].OD_ID > 0) {
-				char msg[30];
-				sprintf(msg, "od:%d", f->vals[i].OD_ID);
-				s = JS_NewStringCopyZ(priv->js_ctx, (const char *) msg);
-			} else {
-				s = JS_NewStringCopyZ(priv->js_ctx, f->vals[i].url);
-			}
-			newVal = STRING_TO_JSVAL( s );
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-
-	case GF_SG_VRML_MFVEC2F:
-	{
-		MFVec2f *f = (MFVec2f *) field->far_ptr;
-		if (!obj) {
-			obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFVec2fClass, priv->js_obj);
-			SETUP_MF_FIELD
-		}
-		for (i=0; i<f->count; i++) {
-			JSObject *pf = JS_NewObject(priv->js_ctx, &js_rt->SFVec2fClass._class, 0, obj);
-			newVal = OBJECT_TO_JSVAL(pf);
-			slot = SFVec2f_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y);
-			slot->owner = parent;
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFVEC3F:
-	{
-		MFVec3f *f = (MFVec3f *) field->far_ptr;
-		if (!obj) {
-			obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFVec3fClass, priv->js_obj);
-			SETUP_MF_FIELD
-		}
-		for (i=0; i<f->count; i++) {
-			JSObject *pf = JS_NewObject(priv->js_ctx, &js_rt->SFVec3fClass._class, 0, obj);
-			newVal = OBJECT_TO_JSVAL(pf);
-			slot = SFVec3f_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y, f->vals[i].z);
-			slot->owner = parent;
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFROTATION:
-	{
-		MFRotation *f = (MFRotation*) field->far_ptr;
-		if (!obj) {
-			obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFRotationClass, priv->js_obj);
-			SETUP_MF_FIELD
-		}
-		for (i=0; i<f->count; i++) {
-			JSObject *pf = JS_NewObject(priv->js_ctx, &js_rt->SFRotationClass._class, 0, obj);
-			newVal = OBJECT_TO_JSVAL(pf);
-			slot = SFRotation_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y, f->vals[i].z, f->vals[i].q);
-			slot->owner = parent;
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-	case GF_SG_VRML_MFCOLOR:
-	{
-		MFColor *f = (MFColor *) field->far_ptr;
-		if (!obj) {
-			obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFColorClass, priv->js_obj);
-			SETUP_MF_FIELD
-		}
-		for (i=0; i<f->count; i++) {
-			JSObject *pf = JS_NewObject(priv->js_ctx, &js_rt->SFColorClass._class, 0, obj);
-			newVal = OBJECT_TO_JSVAL(pf);
-			slot = SFColor_Create(priv->js_ctx, pf, f->vals[i].red, f->vals[i].green, f->vals[i].blue);
-			slot->owner = parent;
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-		}
-		break;
-	}
-
-	case GF_SG_VRML_MFNODE:
-	{
-		u32 size;
-		GF_ChildNodeItem *f = * ((GF_ChildNodeItem **)field->far_ptr);
-		obj = SMJS_CONSTRUCT_OBJECT(priv->js_ctx, &js_rt->MFNodeClass, priv->js_obj);
-		SETUP_MF_FIELD
-		size = gf_node_list_get_count(f);
-
-		if (JS_SetArrayLength(priv->js_ctx, jsf->js_list, size) != JS_TRUE) return JSVAL_NULL;
-		/*get binding for all objects*/
-		while (f) {
-			node_get_binding(priv, f->node, 0);
-			f = f->next;
-		}
-
-#if 0
-		i=0;
-		while (f) {
-			JSObject *pf;
-			slot = NULL;
-
-			n = f->node;
-			pf = node_get_binding(priv, n, 0);
-
-			if (n->sgprivate->tag == TAG_ProtoNode) {
-				GF_ProtoInstance *proto_inst = (GF_ProtoInstance *) n;
-				if (!proto_inst->RenderingNode && !(proto_inst->flags&GF_SG_PROTO_LOADED) )
-					gf_sg_proto_instantiate(proto_inst);
-			}
-
-			slot = SMJS_GET_PRIVATE(priv->js_ctx, pf);
-			if (!slot->owner) slot->owner = parent;
-
-			newVal = OBJECT_TO_JSVAL(pf);
-			JS_SetElement(priv->js_ctx, jsf->js_list, (jsint) i, &newVal);
-			f = f->next;
-			i++;
-		}
-#endif
-		break;
-	}
-
-	//not supported
-	default:
-		return JSVAL_NULL;
-	}
-
-	if (!obj) return JSVAL_NULL;
-	//store field associated with object if needed
-	if (jsf) {
-		SMJS_SET_PRIVATE(priv->js_ctx, obj, jsf);
-		/*if this is the obj corresponding to an existing field/node, store it and prevent GC on object*/
-		if (parent) {
-
-			/*remember the object*/
-			if (!parent->sgprivate->interact) GF_SAFEALLOC(parent->sgprivate->interact, struct _node_interactive_ext);
-			if (!parent->sgprivate->interact) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create interact storage\n"));
-				return JSVAL_NULL;
-			}
-			if (!parent->sgprivate->interact->js_binding) {
-				GF_SAFEALLOC(parent->sgprivate->interact->js_binding, struct _node_js_binding);
-				if (!parent->sgprivate->interact->js_binding) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create JS bindings storage\n"));
-					return JSVAL_NULL;
-				}
-				parent->sgprivate->interact->js_binding->fields = gf_list_new();
-			}
-
-			if ( gf_list_find(parent->sgprivate->interact->js_binding->fields, jsf) < 0) {
-				assert(jsf->owner == parent);
-				gf_list_add(parent->sgprivate->interact->js_binding->fields, jsf);
-			}
-
-
-			if (!jsf->obj) {
-				jsf->obj = obj;
-				assert(gf_list_find(priv->js_cache, obj)<0);
-				gf_list_add(priv->js_cache, obj);
-			}
-
-			/*our JS Array object (MFXXX) are always rooted and added to the cache upon construction*/
-			if (jsf->js_list) {
-				u32 i;
-				jsuint count;
-
-				JS_GetArrayLength(jsf->js_ctx, jsf->js_list, &count);
-
-				for (i=0; i<count; i++) {
-					jsval item;
-					JS_GetElement(jsf->js_ctx, jsf->js_list, (jsint) i, &item);
-					if (JSVAL_IS_OBJECT(item)) {
-						GF_JSField *afield = SMJS_GET_PRIVATE(jsf->js_ctx, JSVAL_TO_OBJECT(item));
-						if (afield->owner != parent) continue;
-
-						if ( gf_list_find(parent->sgprivate->interact->js_binding->fields, afield) < 0) {
-							gf_list_add(parent->sgprivate->interact->js_binding->fields, afield);
-						}
-					}
-				}
-			}
-			parent->sgprivate->flags |= GF_NODE_HAS_BINDING;
-		}
-	}
-	return OBJECT_TO_JSVAL(obj);
-
-}
-
-static void JS_ReleaseRootObjects(GF_ScriptPriv *priv)
-{
-	while (gf_list_count(priv->js_cache)) {
-		GF_JSField *jsf;
-		/*we don't walk through the list since unprotecting an element could trigger GC which in turn could modify this list content*/
-		JSObject *obj = gf_list_last(priv->js_cache);
-		gf_list_rem_last(priv->js_cache);
-		jsf = (GF_JSField *) SMJS_GET_PRIVATE(priv->js_ctx, obj);
-		if (!jsf) continue;
-
-		/*				!!! WARNING !!!
-
-		SpiderMonkey GC is handled at the JSRuntime level, not at the JSContext level.
-		Objects may not be finalized until the runtime is destroyed/GC'ed, which is not what we want.
-		We therefore destroy by hand all SFNode/MFNode
-		*/
-
-		if (jsf->is_rooted) {
-			if (jsf->js_list) {
-				gf_js_remove_root(priv->js_ctx, &jsf->js_list, GF_JSGC_OBJECT);
-			} else {
-				gf_js_remove_root(priv->js_ctx, &jsf->obj, GF_JSGC_OBJECT);
-			}
-			jsf->is_rooted=0;
-		}
-		jsf->obj = NULL;
-
-		if (jsf->js_list)
-			array_finalize_ex(priv->js_ctx, obj, 0);
-		else if (jsf->node)
-			node_finalize_ex(priv->js_ctx, obj, 0);
-		else
-			jsf->js_ctx=NULL;
-	}
-}
-
-static void JS_PreDestroy(GF_Node *node)
-{
-#if 0
-	jsval fval, rval;
-#endif
-	GF_ScriptPriv *priv = node->sgprivate->UserPrivate;
-	if (!priv) return;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[Script] Destroying script node %s", gf_node_get_log_name(node) ));
-
-	/*"shutdown" is no longer supported, as it is typically called when one of a parent node is destroyed through
-	a GC call. Calling JS_LookupProperty or JS_CallFunctionValue when GC is running will crash SpiderMonkey*/
-#if 0
-	if (JS_LookupProperty(priv->js_ctx, priv->js_obj, "shutdown", &fval))
-		if (! JSVAL_IS_VOID(fval))
-			JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 0, NULL, &rval);
-#endif
-
-	gf_sg_lock_javascript(priv->js_ctx, 1);
-
-	if (priv->the_event) gf_js_remove_root(priv->js_ctx, &priv->the_event, GF_JSGC_OBJECT);
-
-	/*unprotect all cached objects from GC*/
-	JS_ReleaseRootObjects(priv);
-
-	gf_sg_load_script_extensions(node->sgprivate->scenegraph, priv->js_ctx, priv->js_obj, 1);
-
-#ifndef GPAC_DISABLE_SVG
-	gf_sg_js_dom_pre_destroy(priv->js_ctx, node->sgprivate->scenegraph, NULL);
-#endif
-
-	gf_sg_lock_javascript(priv->js_ctx, 0);
-
-	gf_sg_ecmascript_del(priv->js_ctx);
-
-#ifndef GPAC_DISABLE_SVG
-	dom_js_unload();
-#endif
-
-	gf_list_del(priv->js_cache);
-
-	priv->js_ctx = NULL;
-
-	/*unregister script from parent scene (cf base_scenegraph::sg_reset) */
-	gf_list_del_item(node->sgprivate->scenegraph->scripts, node);
-}
-
-
-static void JS_InitScriptFields(GF_ScriptPriv *priv, GF_Node *sc)
-{
-	u32 i;
-	GF_ScriptField *sf;
-	GF_FieldInfo info;
-	jsval val;
-
-	i=0;
-	while ((sf = gf_list_enum(priv->fields, &i))) {
-
-		switch (sf->eventType) {
-		case GF_SG_EVENT_IN:
-			gf_node_get_field(sc, sf->ALL_index, &info);
-			/*val = */gf_sg_script_to_smjs_field(priv, &info, sc, 0);
-			break;
-		case GF_SG_EVENT_OUT:
-			gf_node_get_field(sc, sf->ALL_index, &info);
-			val = gf_sg_script_to_smjs_field(priv, &info, sc, 0);
-			/*for native types directly modified*/
-			JS_DefineProperty(priv->js_ctx, priv->js_obj, (const char *) sf->name, val, 0, gf_sg_script_eventout_set_prop, JSPROP_PERMANENT );
-			break;
-		default:
-			gf_node_get_field(sc, sf->ALL_index, &info);
-			val = gf_sg_script_to_smjs_field(priv, &info, sc, 0);
-			JS_DefineProperty(priv->js_ctx, priv->js_obj, (const char *) sf->name, val, 0, 0, JSPROP_PERMANENT);
-			break;
-		}
-	}
-}
-
-GF_EXPORT
-void gf_js_vrml_flush_event_out(GF_Node *node, GF_ScriptPriv *priv)
-{
-	u32 i;
-	GF_ScriptField *sf;
-
-	/*flush event out*/
-	i=0;
-	while ((sf = gf_list_enum(priv->fields, &i))) {
-		if (sf->activate_event_out) {
-			sf->activate_event_out = 0;
-			gf_node_event_out(node, sf->ALL_index);
-#ifndef GPAC_DISABLE_SVG
-			if (node->sgprivate->interact && node->sgprivate->interact->dom_evt) {
-				GF_FieldInfo info;
-				if (gf_node_get_field(node, sf->ALL_index, &info)==GF_OK)
-					gf_node_changed(node, &info);
-			}
-#endif
-		}
-	}
-}
-
-static void JS_EventIn(GF_Node *node, GF_FieldInfo *in_field)
-{
-	jsval fval, rval;
-	Double time;
-	jsval argv[2];
-	GF_ScriptField *sf;
-	GF_FieldInfo t_info;
-	GF_ScriptPriv *priv;
-	u32 i;
-	uintN attr;
-	JSBool found;
-	priv = node->sgprivate->UserPrivate;
-
-	/*no support for change of static fields*/
-	if (in_field->fieldIndex<3) return;
-
-	i = (node->sgprivate->tag==TAG_MPEG4_Script) ? 3 : 4;
-	sf = gf_list_get(priv->fields, in_field->fieldIndex - i);
-	time = gf_node_get_scene_time(node);
-
-	/*
-	if (sf->last_route_time == time) return;
-	*/
-	sf->last_route_time = time;
-
-	gf_sg_lock_javascript(priv->js_ctx, 1);
-
-	//locate function
-	if (!JS_LookupProperty(priv->js_ctx, priv->js_obj, sf->name, &fval) || JSVAL_IS_VOID(fval) ||
-	        !JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, sf->name, &attr, &found) || found != JS_TRUE ) {
-		gf_sg_lock_javascript(priv->js_ctx, 0);
-		return;
-	}
-
-	argv[0] = gf_sg_script_to_smjs_field(priv, in_field, node, 1);
-
-	memset(&t_info, 0, sizeof(GF_FieldInfo));
-	t_info.far_ptr = &sf->last_route_time;
-	t_info.fieldType = GF_SG_VRML_SFTIME;
-	t_info.fieldIndex = -1;
-	t_info.name = "timestamp";
-	argv[1] = gf_sg_script_to_smjs_field(priv, &t_info, node, 1);
-
-	/*protect args*/
-	if (JSVAL_IS_GCTHING(argv[0])) gf_js_add_root(priv->js_ctx, &argv[0], GF_JSGC_VAL);
-	if (JSVAL_IS_GCTHING(argv[1])) gf_js_add_root(priv->js_ctx, &argv[1], GF_JSGC_VAL);
-
-	JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 2, argv, &rval);
-
-	/*release args*/
-	if (JSVAL_IS_GCTHING(argv[0])) gf_js_remove_root(priv->js_ctx, &argv[0], GF_JSGC_VAL);
-	if (JSVAL_IS_GCTHING(argv[1])) gf_js_remove_root(priv->js_ctx, &argv[1], GF_JSGC_VAL);
-
-	/*check any pending exception if outer-most event*/
-	if ( (JS_IsRunning(priv->js_ctx)==JS_FALSE) && JS_IsExceptionPending(priv->js_ctx)) {
-		JS_ReportPendingException(priv->js_ctx);
-		JS_ClearPendingException(priv->js_ctx);
-	}
-
-	gf_sg_lock_javascript(priv->js_ctx, 0);
-
-	gf_js_vrml_flush_event_out(node, priv);
-
-	do_js_gc(priv->js_ctx, node);
-}
-
-
-static Bool vrml_js_load_script(M_Script *script, char *file, Bool primary_script, jsval *rval)
-{
-	FILE *jsf;
-	char *jsscript;
-	u64 fsize;
-	Bool success = 1;
-	JSBool ret;
-	jsval fval;
-	GF_ScriptPriv *priv = (GF_ScriptPriv *) script->sgprivate->UserPrivate;
-	uintN attr;
-	JSBool found;
-
-	jsf = gf_fopen(file, "rb");
-	if (!jsf) return 0;
-
-	gf_fseek(jsf, 0, SEEK_END);
-	fsize = gf_ftell(jsf);
-	gf_fseek(jsf, 0, SEEK_SET);
-	jsscript = gf_malloc(sizeof(char)*(size_t)(fsize+1));
-	fsize = fread(jsscript, sizeof(char), (size_t)fsize, jsf);
-	gf_fclose(jsf);
-	jsscript[fsize] = 0;
-
-	*rval = JSVAL_NULL;
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, jsscript, (u32) (sizeof(char)*fsize), file, 0, rval);
-	if (ret==JS_FALSE) success = 0;
-
-	if (success && primary_script
-	        && JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval) && !JSVAL_IS_VOID(fval)
-	        && JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, "initialize", &attr, &found) && found == JS_TRUE) {
-
-		JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 0, NULL, rval);
-		gf_js_vrml_flush_event_out((GF_Node *)script, priv);
-	}
-	gf_free(jsscript);
-	return success;
-}
-
-/*fetches each listed URL and attempts to load the script - this is SYNCHRONOUS*/
-Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, jsval *rval)
-{
-	GF_JSAPIParam par;
-	u32 i;
-	GF_DownloadManager *dnld_man;
-	char *url;
-	GF_Err e;
-	const char *ext;
-	M_Script *script = (M_Script *)node;
-
-	e = GF_SCRIPT_ERROR;
-	*rval = JSVAL_NULL;
-
-	par.dnld_man = NULL;
-	ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
-	if (!par.dnld_man) return 0;
-	dnld_man = par.dnld_man;
-
-	for (i=0; i<script->url.count; i++) {
-		char *_url = script->url.vals[i].script_text;
-		if (opt_file) {
-			if (strnicmp(_url+4, "script:", 7) && strnicmp(_url+5, "script:", 5)) {
-				_url = gf_url_concatenate(script->url.vals[i].script_text, opt_file);
-			} else {
-				_url = gf_strdup(opt_file);
-			}
-		}
-		par.uri.url = _url;
-		par.uri.nb_params = 0;
-		ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_RESOLVE_URI, node, &par);
-		if (opt_file) gf_free(_url);
-		url = (char *)par.uri.url;
-
-		ext = strrchr(url, '.');
-		if (ext && strnicmp(ext, ".js", 3)) {
-			gf_free(url);
-			continue;
-		}
-
-		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
-			Bool res = vrml_js_load_script(script, url, opt_file ? 0 : 1, rval);
-			gf_free(url);
-			if (res) return 1;
-			if (no_complain) return 0;
-		} else {
-			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
-			if (sess) {
-				e = gf_dm_sess_process(sess);
-				if (e==GF_OK) {
-					const char *szCache = gf_dm_sess_get_cache_name(sess);
-					if (!vrml_js_load_script(script, (char *) szCache, opt_file ? 0 : 1, rval))
-						e = GF_SCRIPT_ERROR;
-				}
-				gf_dm_sess_del(sess);
-			}
-			gf_free(url);
-			if (!e) return 1;
-		}
-	}
-
-	par.info.e = GF_SCRIPT_ERROR;
-	par.info.msg = "Cannot fetch script";
-	ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_MESSAGE, NULL, &par);
-	return 0;
-}
-
-
-static void JSScript_LoadVRML(GF_Node *node)
-{
-	char *str;
-	JSBool ret;
-	u32 i;
-	Bool local_script;
-	jsval rval, fval;
-	M_Script *script = (M_Script *)node;
-	GF_ScriptPriv *priv = (GF_ScriptPriv *) node->sgprivate->UserPrivate;
-	uintN attr;
-	JSBool found;
-
-	if (!priv || priv->is_loaded) return;
-	if (!script->url.count) return;
-	priv->is_loaded = 1;
-
-	/*register script width parent scene (cf base_scenegraph::sg_reset) */
-	gf_list_add(node->sgprivate->scenegraph->scripts, node);
-
-	str = NULL;
-	for (i=0; i<script->url.count; i++) {
-		str = script->url.vals[i].script_text;
-		while (strchr("\n\t ", str[0])) str++;
-
-		if (!strnicmp(str, "javascript:", 11)) str += 11;
-		else if (!strnicmp(str, "vrmlscript:", 11)) str += 11;
-		else if (!strnicmp(str, "ecmascript:", 11)) str += 11;
-		else if (!strnicmp(str, "mpeg4script:", 12)) str += 12;
-		else str = NULL;
-		if (str) break;
-	}
-	local_script = str ? 1 : 0;
-
-	/*lock runtime and set current thread before creating the context*/
-	priv->js_ctx = gf_sg_ecmascript_new(node->sgprivate->scenegraph);
-	if (!priv->js_ctx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Cannot allocate ECMAScript context for node\n"));
-		return;
-	}
-
-	gf_sg_lock_javascript(priv->js_ctx, 1);
-
-	JS_SetContextPrivate(priv->js_ctx, node);
-	gf_sg_script_init_sm_api(priv, node);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Built-in classes initialized\n"));
-#ifndef GPAC_DISABLE_SVG
-	/*initialize DOM*/
-	dom_js_load(node->sgprivate->scenegraph, priv->js_ctx, priv->js_obj);
-	/*create event object, and remember it*/
-	priv->the_event = dom_js_define_event(priv->js_ctx, priv->js_obj);
-	gf_js_add_root(priv->js_ctx, &priv->the_event, GF_JSGC_OBJECT);
-#endif
-
-	gf_sg_load_script_extensions(node->sgprivate->scenegraph, priv->js_ctx, priv->js_obj, 0);
-
-	priv->js_cache = gf_list_new();
-
-	/*setup fields interfaces*/
-	JS_InitScriptFields(priv, node);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] script fields initialized\n"));
-
-	priv->JS_PreDestroy = JS_PreDestroy;
-	priv->JS_EventIn = JS_EventIn;
-
-	if (!local_script) {
-		JSScriptFromFile(node, NULL, 0, &rval);
-		gf_sg_lock_javascript(priv->js_ctx, 0);
-		return;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Evaluating script %s\n", str));
-
-	ret = JS_EvaluateScript(priv->js_ctx, priv->js_obj, str, (u32) strlen(str), 0, 0, &rval);
-	if (ret==JS_TRUE) {
-		/*call initialize if present*/
-		if (JS_LookupProperty(priv->js_ctx, priv->js_obj, "initialize", &fval) && !JSVAL_IS_VOID(fval)
-		        && JS_GetPropertyAttributes(priv->js_ctx, priv->js_obj, "initialize", &attr, &found) && found == JS_TRUE)
-
-			JS_CallFunctionValue(priv->js_ctx, priv->js_obj, fval, 0, NULL, &rval);
-		gf_js_vrml_flush_event_out(node, priv);
-	}
-
-	gf_sg_lock_javascript(priv->js_ctx, 0);
-
-	do_js_gc(priv->js_ctx, node);
-}
-
-static void JSScript_Load(GF_Node *node)
-{
-#ifndef GPAC_DISABLE_SVG
-	void JSScript_LoadSVG(GF_Node *node);
-#endif
-
-	switch (node->sgprivate->tag) {
-	case TAG_MPEG4_Script:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Script:
-#endif
-		JSScript_LoadVRML(node);
-		break;
-#ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_script:
-	case TAG_SVG_handler:
-		JSScript_LoadSVG(node);
-		break;
-#endif
-	default:
-		break;
-	}
-}
-
-
-static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script)
-{
-	u32 i;
-	GF_JSField *jsf;
-	/*this is REPLACE NODE signaling*/
-	if (script) {
-		u32 count;
-		GF_ScriptPriv *priv = gf_node_get_private(script);
-		count = gf_list_count(priv->js_cache);
-		for (i=0; i<count; i++) {
-			JSObject *obj = gf_list_get(priv->js_cache, i);
-			jsf = SMJS_GET_PRIVATE(priv->js_ctx, obj);
-			if (jsf->node && (jsf->node==node)) {
-				jsf->node = NULL;
-				/*Ivica patch*/
-				node->sgprivate->interact->js_binding->node = NULL;
-			}
-		}
-		return;
-	}
-
-	if (!info) {
-		/*handle DOM case*/
-		if ((node->sgprivate->tag>=GF_NODE_FIRST_PARENT_NODE_TAG)
-		        && node->sgprivate->interact
-		        && node->sgprivate->interact->js_binding
-		        && node->sgprivate->interact->js_binding->node)
-		{
-
-			if (gf_list_del_item(sg->objects, node->sgprivate->interact->js_binding->node)>=0) {
-#ifndef GPAC_DISABLE_SVG
-				gf_js_remove_root(sg->svg_js->js_ctx, &(node->sgprivate->interact->js_binding->node), GF_JSGC_OBJECT);
-				if (sg->svg_js->in_script)
-					sg->svg_js->force_gc = 1;
-				else
-				{
-					gf_sg_js_call_gc(sg->svg_js->js_ctx);
-					//invalid with firefox>7: JS_ClearNewbornRoots(sg->svg_js->js_ctx);
-				}
-#endif
-			}
-			return;
-		}
-		/*this is unregister signaling*/
-
-#if 0
-		if (node->sgprivate->parents) {
-			switch (node->sgprivate->parents->node->sgprivate->tag) {
-			case TAG_MPEG4_Script:
-#ifndef GPAC_DISABLE_X3D
-			case TAG_X3D_Script:
-#endif
-				/*node is no longer used in the graph, remove root and let the script handle it, */
-				if (node->sgprivate->interact->js_binding->node) {
-					GF_JSField *field = node->sgprivate->interact->js_binding->node;
-					if (field->is_rooted) {
-						gf_js_remove_root(field->js_ctx, &field->obj);
-						field->is_rooted = 0;
-					}
-				}
-				break;
-			}
-			return;
-		}
-#else
-		if (!node->sgprivate->parents && node->sgprivate->interact && node->sgprivate->interact->js_binding && node->sgprivate->interact->js_binding->node) {
-			GF_JSField *field = node->sgprivate->interact->js_binding->node;
-			if (field->is_rooted) {
-				gf_js_remove_root(field->js_ctx, &field->obj, GF_JSGC_OBJECT);
-				field->is_rooted = 0;
-			}
-			return;
-		}
-#endif
-
-		/*final destroy*/
-		if (!node->sgprivate->num_instances) {
-			i=0;
-			while (node->sgprivate->interact && node->sgprivate->interact->js_binding && (jsf = gf_list_enum(node->sgprivate->interact->js_binding->fields, &i))) {
-				jsf->owner = NULL;
-
-				if (jsf->js_list) {
-					u32 j;
-
-					if (jsf->field.fieldType != GF_SG_VRML_MFNODE) {
-						jsuint count;
-						JS_GetArrayLength(jsf->js_ctx, jsf->js_list, &count);
-
-						for (j=0; j<count; j++) {
-							jsval item;
-							JS_GetElement(jsf->js_ctx, jsf->js_list, (jsint) j, &item);
-							if (JSVAL_IS_OBJECT(item)) {
-								GF_JSField *afield = SMJS_GET_PRIVATE(jsf->js_ctx, JSVAL_TO_OBJECT(item));
-								afield->owner = NULL;
-							}
-						}
-					}
-
-					if (jsf->is_rooted) gf_js_remove_root(jsf->js_ctx, &jsf->js_list, GF_JSGC_OBJECT);
-					jsf->js_list = NULL;
-				}
-			}
-		}
-		return;
-	}
-	/*this is field modification signaling*/
-	if (!node->sgprivate->interact || !node->sgprivate->interact->js_binding) return;
-	i=0;
-	while ((jsf = gf_list_enum(node->sgprivate->interact->js_binding->fields, &i))) {
-		if ((jsf->field.fieldIndex == info->fieldIndex) && (jsf->field.fieldType == info->fieldType)) {
-			jsf->field.NDTtype = 1;
-
-			/*if field is a script field, rewrite it right away because script fields are exposed
-			as global variables within the script
-
-			We also have a special value '-1' for the NDT for addChildren and removeChildren*/
-
-#if 0
-			if ((info->NDTtype == (u32) -1) || (node == (GF_Node*)JS_GetScript(jsf->js_ctx))) {
-				gf_sg_script_update_cached_object( JS_GetScriptStack(jsf->js_ctx), jsf->obj, jsf, &jsf->field, node);
-			}
-#endif
-			return;
-		}
-	}
-}
-
-GF_EXPORT
-void gf_sg_handle_dom_event_for_vrml(GF_Node *node, GF_DOM_Event *event, GF_Node *observer)
-{
-#ifndef GPAC_DISABLE_SVG
-	GF_ScriptPriv *priv;
-	Bool prev_type;
-	//JSBool ret = JS_FALSE;
-	GF_DOM_Event *prev_event = NULL;
-	SVG_handlerElement *hdl;
-	jsval rval;
-	JSObject *evt;
-	jsval argv[1];
-
-	hdl = (SVG_handlerElement *) node;
-	if (!hdl->js_fun_val && !hdl->evt_listen_obj) return;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[DOM Events] Executing script code from VRML handler\n"));
-
-	priv = JS_GetScriptStack(hdl->js_context);
-	gf_sg_lock_javascript(priv->js_ctx, 1);
-
-	prev_event = SMJS_GET_PRIVATE(priv->js_ctx, priv->the_event);
-	/*break loops*/
-	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
-		gf_sg_lock_javascript(priv->js_ctx, 0);
-		return;
-	}
-
-	evt = gf_dom_new_event(priv->js_ctx);
-	if (!evt) {
-		gf_sg_lock_javascript(priv->js_ctx, 0);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM Events] Cannot create JavaScript dom event for event type %d\n", event->type));
-		return;
-	}
-
-	prev_type = event->is_vrml;
-	event->is_vrml = 1;
-	SMJS_SET_PRIVATE(priv->js_ctx, priv->the_event, event);
-
-	SMJS_SET_PRIVATE(priv->js_ctx, evt, event);
-	argv[0] = OBJECT_TO_JSVAL(evt);
-
-	if (hdl->js_fun_val) {
-		jsval funval = (jsval ) hdl->js_fun_val;
-		/*ret = */JS_CallFunctionValue(priv->js_ctx, hdl->evt_listen_obj ? (JSObject *)hdl->evt_listen_obj: priv->js_obj, funval, 1, argv, &rval);
-	} else {
-		/*ret = */JS_CallFunctionName(priv->js_ctx, hdl->evt_listen_obj, "handleEvent", 1, argv, &rval);
-	}
-
-	/*check any pending exception if outer-most event*/
-	if (!prev_event && JS_IsExceptionPending(priv->js_ctx)) {
-		JS_ReportPendingException(priv->js_ctx);
-		JS_ClearPendingException(priv->js_ctx);
-	}
-
-	event->is_vrml = prev_type;
-	SMJS_SET_PRIVATE(priv->js_ctx, priv->the_event, prev_event);
-
-	gf_sg_lock_javascript(priv->js_ctx, 0);
-
-#endif
-}
-
-#endif	/*GPAC_DISABLE_VRML*/
-
-#endif /*GPAC_HAS_SPIDERMONKEY*/
-
-
-
-/*set JavaScript interface*/
-void gf_sg_set_script_action(GF_SceneGraph *scene, gf_sg_script_action script_act, void *cbk)
-{
-	if (!scene) return;
-	scene->script_action = script_act;
-	scene->script_action_cbck = cbk;
-
-#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_VRML)
-	scene->script_load = JSScript_Load;
-	scene->on_node_modified = JSScript_NodeModified;
-#endif
-
-}
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-GF_EXPORT
-GF_Node *gf_sg_js_get_node(JSContext *c, JSObject *obj)
-{
-#ifndef GPAC_DISABLE_VRML
-	if (js_rt && GF_JS_InstanceOf(c, obj, &js_rt->SFNodeClass, NULL) ) {
-		GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
-		if (ptr->field.fieldType==GF_SG_VRML_SFNODE) return * ((GF_Node **)ptr->field.far_ptr);
-	}
-#endif
-
-#ifndef GPAC_DISABLE_SVG
-	{
-		JSBool has_p = 0;
-		if (JS_HasProperty(c, obj, "namespaceURI", &has_p)) {
-			if (has_p==JS_TRUE) return dom_get_element(c, obj);
-		}
-	}
-#endif
-	return NULL;
-}
-
-#endif
-
-GF_EXPORT
-Bool gf_sg_has_scripting()
-{
-#ifdef GPAC_HAS_SPIDERMONKEY
-	return 1;
-#else
-	return 0;
-#endif
-}
-
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-/*
- * locking/try-locking the JS context
- * we need to test whether the calling thread already has the lock on the script context
- * if this is not the case (i.e. first lock on mutex), we switch JS context threads and
- * call begin/end requests. Nesting begin/end request in a reentrant way crashes JS
- * (mozilla doc is wrong here)
- *
- * */
-GF_EXPORT
-void gf_sg_lock_javascript(struct JSContext *cx, Bool LockIt)
-{
-	if (!js_rt) return;
-
-	if (LockIt) {
-		gf_mx_p(js_rt->mx);
-#ifdef JS_THREADSAFE
-		assert(cx);
-		if (gf_mx_get_num_locks(js_rt->mx)==1) {
-#if (JS_VERSION>=185)
-			JS_SetRuntimeThread(js_rt->js_runtime);
-			JS_SetContextThread(cx);
-#endif
-			JS_BeginRequest(cx);
-		}
-#endif
-	} else {
-#ifdef JS_THREADSAFE
-		assert(cx);
-		if (gf_mx_get_num_locks(js_rt->mx)==1) {
-			JS_EndRequest(cx);
-#if (JS_VERSION>=185)
-			JS_ClearContextThread(cx);
-			JS_ClearRuntimeThread(js_rt->js_runtime);
-#endif
-		}
-#endif
-		gf_mx_v(js_rt->mx);
-	}
-}
-
-GF_EXPORT
-Bool gf_sg_try_lock_javascript(struct JSContext *cx)
-{
-	assert(cx);
-	if (gf_mx_try_lock(js_rt->mx)) {
-#ifdef JS_THREADSAFE
-		if (gf_mx_get_num_locks(js_rt->mx)==1) {
-#if (JS_VERSION>=185)
-			JS_SetRuntimeThread(js_rt->js_runtime);
-			JS_SetContextThread(cx);
-#endif
-			JS_BeginRequest(cx);
-		}
-#endif
-		return 1;
-	}
-	return 0;
-}
-
-#endif /* GPAC_HAS_SPIDERMONKEY */
-
-GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com)
-{
-#if defined(GPAC_HAS_SPIDERMONKEY) && !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_SVGJS *svg_js = sg->svg_js;
-			Bool ret = svg_js->script_execute(sg, (char *)com, NULL);
-			return (ret == GF_TRUE ? GF_OK : GF_BAD_PARAM);
-		} else {
-			e = GF_NOT_SUPPORTED;
-			return e;
-		}
-	}
-	return GF_BAD_PARAM;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}

gpac-0.8.0.tar.gz/src/scenegraph/webvtt_smjs.c Deleted

@@ -1,128 +0,0 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2007-2012
- *          All rights reserved
- *
- *  This file is part of GPAC / Scene Graph 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/setup.h>
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/webvtt.h>
-
-#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG)
-
-
-#include <gpac/internal/smjs_api.h>
-
-GF_EXPORT
-GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id,
-                           const char *start, const char *end,
-                           const char *settings,
-                           const char *payload)
-{
-	GF_Err e;
-	JSBool found;
-	JSContext *c = node->sgprivate->scenegraph->svg_js->js_ctx;
-	JSObject *global = node->sgprivate->scenegraph->svg_js->global;
-	jsval fun_val;
-
-	gf_sg_lock_javascript(c, GF_TRUE);
-	found = JS_LookupProperty(c, global, "addCue", &fun_val);
-	if (!found || JSVAL_IS_VOID(fun_val) || !JSVAL_IS_OBJECT(fun_val) ) {
-		e = GF_BAD_PARAM;
-	} else {
-		JSBool ret;
-		uintN attr;
-		ret = JS_GetPropertyAttributes(c, global, "addCue", &attr, &found);
-		if (ret == JS_TRUE && found == JS_TRUE) {
-			jsval rval;
-			jsval argv[5];
-			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (id ? id : "")) );
-			argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (start ? start : "")) );
-			argv[2] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (end ? end : "")) );
-			argv[3] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (settings ? settings : "")) );
-			argv[4] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (payload ? payload : "")) );
-
-			ret = JS_CallFunctionValue(c, global, fun_val, 5, argv, &rval);
-			//ret = JS_CallFunctionName(c, global, "addCue", 5, argv, &rval);
-			if (ret == JS_TRUE) {
-				e = GF_OK;
-			} else {
-				e = GF_BAD_PARAM;
-			}
-		} else {
-			e = GF_BAD_PARAM;
-		}
-	}
-	gf_sg_lock_javascript(c, GF_FALSE);
-	return e;
-}
-
-GF_EXPORT
-GF_Err gf_webvtt_js_removeCues(GF_Node *node)
-{
-	GF_Err e;
-	JSBool found;
-	JSContext *c = node->sgprivate->scenegraph->svg_js->js_ctx;
-	JSObject *global = node->sgprivate->scenegraph->svg_js->global;
-	jsval fun_val;
-
-	gf_sg_lock_javascript(c, GF_TRUE);
-	found = JS_LookupProperty(c, global, "removeCues", &fun_val);
-	if (!found || JSVAL_IS_VOID(fun_val) || !JSVAL_IS_OBJECT(fun_val) ) {
-		e = GF_BAD_PARAM;
-	} else {
-		JSBool ret;
-		uintN attr;
-		ret = JS_GetPropertyAttributes(c, global, "removeCues", &attr, &found);
-		if (ret == JS_TRUE && found == JS_TRUE) {
-			jsval rval;
-			ret = JS_CallFunctionValue(c, global, fun_val, 0, NULL, &rval);
-			if (ret == JS_TRUE) {
-				e = GF_OK;
-			} else {
-				e = GF_BAD_PARAM;
-			}
-		} else {
-			e = GF_BAD_PARAM;
-		}
-	}
-	gf_sg_lock_javascript(c, GF_FALSE);
-	return e;
-}
-
-#else
-GF_EXPORT
-GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id,
-                           const char *start, const char *end,
-                           const char *settings,
-                           const char *payload)
-{
-	return GF_BAD_PARAM;
-}
-
-GF_EXPORT
-GF_Err gf_webvtt_js_removeCues(GF_Node *node)
-{
-	return GF_BAD_PARAM;
-}
-#endif  /*GPAC_HAS_SPIDERMONKEY*/

gpac-0.8.0.tar.gz/src/scenegraph/xbl_process.c Deleted

@@ -1,242 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2008-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Scene Management 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/scene_manager.h>
-#include <gpac/constants.h>
-#include <gpac/utf.h>
-#include <gpac/xml.h>
-#include <gpac/scenegraph_svg.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-#include <gpac/nodes_xbl.h>
-
-typedef struct
-{
-	GF_SceneLoader *load;
-	GF_Err last_error;
-	GF_SAXParser *sax_parser;
-	XBL_Element *root;
-
-	/* stack of XBL nodes*/
-	GF_List *node_stack;
-} GF_XBL_Parser;
-
-
-typedef struct
-{
-	/*top of parsed sub-tree*/
-	XBL_Element *node;
-	/*depth of unknown elements being skipped*/
-	u32 unknown_depth;
-	/*last child added, used to speed-up parsing*/
-	GF_ChildNodeItem *last_child;
-} XBL_NodeStack;
-
-static GF_Err xbl_parse_report(GF_XBL_Parser *parser, GF_Err e, char *format, ...)
-{
-#ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
-		char szMsg[2048];
-		va_list args;
-		va_start(args, format);
-		vsnprintf(szMsg, 2048, format, args);
-		va_end(args);
-		GF_LOG((u32) (e ? GF_LOG_ERROR : GF_LOG_WARNING), GF_LOG_PARSER, ("[XBL Parsing] line %d - %s\n", gf_xml_sax_get_line(parser->sax_parser), szMsg));
-	}
-#endif
-	if (e) parser->last_error = e;
-	return e;
-}
-
-static void xbl_parse_progress(void *cbk, u64 done, u64 total)
-{
-	gf_set_progress("XBL Parsing", done, total);
-}
-
-XBL_Element *gf_xbl_create_node(u32 ElementTag)
-{
-	XBL_Element *p;
-	GF_SAFEALLOC(p, SVG_Element);
-	gf_node_setup((GF_Node *)p, ElementTag);
-	gf_sg_parent_setup((GF_Node *) p);
-	return p;
-}
-
-static XBL_Element *xbl_parse_element(GF_XBL_Parser *parser, const char *name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes, XBL_NodeStack *parent)
-{
-	u32	tag, attribute_tag, i;
-	XBL_Element *elt = NULL;
-
-//	if (name_space && strlen(name_space)) return NULL;
-
-	tag = gf_sg_node_get_tag_by_class_name(name, 0);
-	if (tag != TAG_UndefinedNode) {
-		elt = (XBL_Element *)gf_node_new(parser->load->scene_graph, tag);
-	} else {
-		elt = (XBL_Element *)gf_node_new(parser->load->scene_graph, TAG_DOMFullNode);
-	}
-	gf_node_register((GF_Node *)elt, (parent ? (GF_Node *)parent->node : NULL));
-	if (parent && elt) gf_node_list_add_child_last( & parent->node->children, (GF_Node*)elt, & parent->last_child);
-
-	for (i=0; i<nb_attributes; i++) {
-		GF_XMLAttribute *att = (GF_XMLAttribute *)&attributes[i];
-		if (!att->value || !strlen(att->value)) continue;
-		attribute_tag = gf_xml_get_attribute_tag((GF_Node *)elt, att->name, 0);
-		if (attribute_tag!=TAG_DOM_ATT_any) {
-			/*FIXME do we need to check if the attribute is specified several times*/
-			GF_DOMAttribute *dom_att = gf_xml_create_attribute((GF_Node*)elt, attribute_tag);
-			dom_att->data = gf_strdup(att->value);
-		} else {
-			xbl_parse_report(parser, GF_OK, "Skipping attribute %s on node %s", att->name, name);
-		}
-	}
-
-	return elt;
-}
-
-static void xbl_node_start(void *sax_cbck, const char *name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
-{
-	GF_XBL_Parser *parser = (GF_XBL_Parser *)sax_cbck;
-	XBL_NodeStack *stack, *parent;
-	XBL_Element *elt;
-
-	parent = (XBL_NodeStack *)gf_list_last(parser->node_stack);
-
-	elt = xbl_parse_element(parser, name, name_space, attributes, nb_attributes, parent);
-	if (!elt) {
-		if (parent) parent->unknown_depth++;
-		xbl_parse_report(parser, GF_OK, "Ignoring unknown element %s", name);
-		return;
-	}
-	if (!parser->root) parser->root = elt;
-
-	GF_SAFEALLOC(stack, XBL_NodeStack);
-	if (!stack) {
-		return;
-	}
-	stack->node = elt;
-	gf_list_add(parser->node_stack, stack);
-
-}
-
-static void xbl_text_content(void *sax_cbck, const char *text_content, Bool is_cdata)
-{
-	/* FIXME : this function does nothing
-	GF_XBL_Parser *parser = (GF_XBL_Parser *)sax_cbck;
-	XBL_NodeStack *top = (XBL_NodeStack *)gf_list_last(parser->node_stack);
-
-	*/
-}
-
-static void xbl_node_end(void *sax_cbck, const char *name, const char *name_space)
-{
-	GF_XBL_Parser *parser = (GF_XBL_Parser *)sax_cbck;
-	XBL_NodeStack *top = (XBL_NodeStack *)gf_list_last(parser->node_stack);
-
-	if (!top) return;
-	if (/*!name_space && */gf_sg_node_get_tag_by_class_name(name, 0) != TAG_UndefinedNode) {
-		const char *the_name;
-		XBL_Element *node = top->node;
-		/*check node name...*/
-		the_name = gf_node_get_class_name((GF_Node *) node);
-		if (strcmp(the_name, name)) {
-			if (top->unknown_depth) {
-				top->unknown_depth--;
-				return;
-			} else {
-				xbl_parse_report(parser, GF_BAD_PARAM, "depth mismatch");
-				return;
-			}
-		}
-		gf_free(top);
-		gf_list_rem_last(parser->node_stack);
-	} else if (top) {
-		if (top->unknown_depth) {
-			top->unknown_depth--;
-		} else {
-			xbl_parse_report(parser, GF_BAD_PARAM, "depth mismatch");
-		}
-	}
-
-}
-
-static GF_XBL_Parser *xbl_new_parser(GF_SceneLoader *load)
-{
-	GF_XBL_Parser *parser;
-	if (load->type==GF_SM_LOAD_XBL) {
-		if (!load->ctx) return NULL;
-	} else if (load->type!=GF_SM_LOAD_XBL) return NULL;
-
-	GF_SAFEALLOC(parser, GF_XBL_Parser);
-	if (!parser) return NULL;
-	parser->node_stack = gf_list_new();
-	parser->sax_parser = gf_xml_sax_new(xbl_node_start, xbl_node_end, xbl_text_content, parser);
-	parser->load = load;
-	load->loader_priv = parser;
-
-	return parser;
-}
-
-
-GF_Err gf_sm_load_init_xbl(GF_SceneLoader *load)
-{
-	GF_Err e;
-	GF_XBL_Parser *parser;
-
-	if (!load->fileName) return GF_BAD_PARAM;
-	parser = xbl_new_parser(load);
-	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ( "[Parser] XBL Parsing\n") );
-	e = gf_xml_sax_parse_file(parser->sax_parser, (const char *)load->fileName, xbl_parse_progress);
-	if (e<0) return xbl_parse_report(parser, e, "Unable to parse file %s: %s", load->fileName, gf_xml_sax_get_error(parser->sax_parser) );
-	return parser->last_error;
-}
-
-GF_Err gf_sm_load_run_xbl(GF_SceneLoader *load)
-{
-	return GF_OK;
-}
-
-void gf_sm_load_done_xbl(GF_SceneLoader *load)
-{
-	GF_XBL_Parser *parser = (GF_XBL_Parser *)load->loader_priv;
-	if (!parser) return;
-	while (gf_list_count(parser->node_stack)) {
-		XBL_NodeStack *st = (XBL_NodeStack *)gf_list_last(parser->node_stack);
-		gf_list_rem_last(parser->node_stack);
-		gf_free(st);
-	}
-	gf_list_del(parser->node_stack);
-	if (parser->sax_parser) gf_xml_sax_del(parser->sax_parser);
-	gf_free(parser);
-	load->loader_priv = NULL;
-	return;
-}
-
-void apply(GF_Node *bound_doc, GF_Node *binding_doc)
-{
-
-}
-
-#endif

gpac-0.8.0.tar.gz/src/terminal/channel.c Deleted

@@ -1,1962 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/sync_layer.h>
-#include <gpac/constants.h>
-#include <gpac/isomedia.h>
-
-#include "media_memory.h"
-#include "media_control.h"
-
-void gf_es_buffer_off(GF_Channel *ch)
-{
-	/*just in case*/
-	if (ch->BufferOn) {
-		ch->BufferOn = GF_FALSE;
-		gf_clock_buffer_off(ch->clock);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) : buffering off at OTB %u (STB %d) (nb wait on clock: %d)\n", ch->esd->ESID, ch->odm->net_service->url, gf_clock_time(ch->clock), gf_term_get_time(ch->odm->term), ch->clock->Buffering));
-		//if one of the stream is done buffering, force data timeout for the clock to be the buffer time
-		//at the end of the buffering period
-		if ((ch->clock->data_timeout==ch->odm->term->net_data_timeout) && (ch->BufferTime>=(s32) ch->MaxBuffer))
-			ch->clock->data_timeout = ch->BufferTime;
-	}
-}
-
-
-void gf_es_buffer_on(GF_Channel *ch)
-{
-	/*don't buffer on an already running clock*/
-	if (ch->clock->no_time_ctrl && ch->clock->clock_init && (ch->esd->ESID!=ch->clock->clockID) ) return;
-	if (ch->dispatch_after_db) return;
-
-	/*just in case*/
-	if (!ch->BufferOn) {
-		ch->BufferOn = 1;
-		ch->last_au_time = gf_term_get_time(ch->odm->term);
-		gf_clock_buffer_on(ch->clock);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): buffering on at OTB %d (STB %d) (nb wait on clock: %d)\n", ch->esd->ESID, ch->odm->net_service->url, gf_clock_time(ch->clock), gf_term_get_time(ch->odm->term), ch->clock->Buffering));
-	}
-}
-
-/*reset channel*/
-static void gf_es_reset(GF_Channel *ch, Bool for_start)
-{
-	gf_es_lock(ch, 1);
-
-	ch->IsClockInit = 0;
-	ch->au_sn = 0;
-	ch->pck_sn = 0;
-	ch->stream_state = 1;
-	ch->IsRap = 0;
-	ch->SeekFlag = 0;
-	ch->IsEndOfStream = 0;
-	ch->skip_carousel_au = 0;
-
-	if (for_start) {
-		gf_es_lock(ch, 0);
-		return;
-	}
-
-	ch->ts_offset = 0;
-	ch->seed_ts = 0;
-	ch->min_ts_inc = 0;
-	ch->min_computed_cts = 0;
-	gf_es_buffer_off(ch);
-
-	if (ch->buffer) gf_free(ch->buffer);
-	ch->buffer = NULL;
-	ch->len = ch->allocSize = 0;
-
-	gf_db_unit_del(ch->AU_buffer_first);
-	ch->AU_buffer_first = ch->AU_buffer_last = NULL;
-	ch->AU_Count = 0;
-	ch->BufferTime = 0;
-	ch->NextIsAUStart = 1;
-
-	ch->first_au_fetched = 0;
-	if (ch->AU_buffer_pull) {
-		ch->AU_buffer_pull->data = NULL;
-		gf_db_unit_del(ch->AU_buffer_pull);
-		ch->AU_buffer_pull = NULL;
-	}
-	gf_es_lock(ch, 0);
-}
-
-GF_Channel *gf_es_new(GF_ESD *esd)
-{
-	u32 nbBits;
-	GF_Channel *tmp;
-	GF_SAFEALLOC(tmp, GF_Channel);
-	if (!tmp) return NULL;
-
-	tmp->mx = gf_mx_new("Channel");
-	tmp->esd = esd;
-	tmp->es_state = GF_ESM_ES_SETUP;
-
-	nbBits = esd->slConfig->AUSeqNumLength;
-	tmp->max_au_sn = (u32)(( ((u64)1) << nbBits ) - 1);
-
-	nbBits = esd->slConfig->packetSeqNumLength;
-	tmp->max_pck_sn = (u32)(( ((u64)1) << nbBits ) - 1);
-
-	tmp->skip_sl = (esd->slConfig->predefined == SLPredef_SkipSL) ? 1 : 0;
-
-	/*take care of dummy streams*/
-	if (!esd->slConfig->timestampResolution) esd->slConfig->timestampResolution = esd->slConfig->timeScale ? esd->slConfig->timeScale : 1000;
-	if (!esd->slConfig->OCRResolution) esd->slConfig->OCRResolution = esd->slConfig->timestampResolution;
-
-	tmp->ts_res = esd->slConfig->timestampResolution;
-	tmp->recompute_dts = esd->slConfig->no_dts_signaling;
-
-	tmp->ocr_scale = 0;
-	if (esd->slConfig->OCRResolution) {
-		tmp->ocr_scale = 1000;
-		tmp->ocr_scale /= esd->slConfig->OCRResolution;
-	}
-
-	gf_es_reset(tmp, 0);
-	return tmp;
-}
-
-
-/*reconfig SL settings for this channel - this is needed by some net services*/
-void gf_es_reconfig_sl(GF_Channel *ch, GF_SLConfig *slc, Bool use_m2ts_sections)
-{
-	u32 nbBits;
-
-	memcpy(ch->esd->slConfig, slc, sizeof(GF_SLConfig));
-
-	nbBits = sizeof(u32) * 8 - ch->esd->slConfig->AUSeqNumLength;
-	ch->max_au_sn = 0xFFFFFFFF >> nbBits;
-	nbBits = sizeof(u32) * 8 - ch->esd->slConfig->packetSeqNumLength;
-	ch->max_pck_sn = 0xFFFFFFFF >> nbBits;
-
-	ch->skip_sl = (slc->predefined == SLPredef_SkipSL) ? 1 : 0;
-
-	/*take care of dummy streams*/
-	if (!ch->esd->slConfig->timestampResolution) ch->esd->slConfig->timestampResolution = 1000;
-	if (!ch->esd->slConfig->OCRResolution) ch->esd->slConfig->OCRResolution = ch->esd->slConfig->timestampResolution;
-
-	ch->ts_res = ch->esd->slConfig->timestampResolution;
-	ch->recompute_dts = ch->esd->slConfig->no_dts_signaling;
-	ch->ocr_scale = 0;
-	if (ch->esd->slConfig->OCRResolution) {
-		ch->ocr_scale = 1000;
-		ch->ocr_scale /= ch->esd->slConfig->OCRResolution;
-	}
-	ch->carousel_type = GF_ESM_CAROUSEL_NONE;
-	if (use_m2ts_sections) {
-		ch->carousel_type = GF_ESM_CAROUSEL_MPEG2;
-	} else {
-		switch (ch->esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-		case GF_STREAM_SCENE:
-			ch->carousel_type = ch->esd->slConfig->AUSeqNumLength ? GF_ESM_CAROUSEL_MPEG4 : GF_ESM_CAROUSEL_NONE;
-			break;
-		}
-	}
-}
-
-
-/*destroy channel*/
-void gf_es_del(GF_Channel *ch)
-{
-	gf_es_reset(ch, 0);
-	if (ch->AU_buffer_pull) {
-		ch->AU_buffer_pull->data = NULL;
-		gf_db_unit_del(ch->AU_buffer_pull);
-	}
-	if (ch->ipmp_tool)
-		gf_modules_close_interface((GF_BaseInterface *) ch->ipmp_tool);
-
-	if (ch->mx) gf_mx_del(ch->mx);
-	gf_free(ch);
-}
-
-Bool gf_es_owns_clock(GF_Channel *ch)
-{
-	//if we share the clock with a clock from the same clock namespace but the clock was inherited
-	//don't trust ESIDs (typically happen in DASH where all streams may end up with the same ID...)
-	if (ch->clock_inherited) return GF_FALSE;
-
-	/*if the clock is not in the same namespace (used with dynamic scenes), it's not ours*/
-	if (gf_list_find(ch->odm->net_service->Clocks, ch->clock)<0) return 0;
-	/*It occurs in TS stream when PCR is provided in a dedicated stream. Suppose that the channel owns a clock*/
-	if (ch->clock->ocr_on_esid == ch->esd->ESID) return 1;
-	return (ch->esd->ESID==ch->clock->clockID) ? 1 : 0;
-}
-
-GF_Err gf_es_start(GF_Channel *ch)
-{
-	if (!ch) return GF_BAD_PARAM;
-
-	switch (ch->es_state) {
-	case GF_ESM_ES_UNAVAILABLE:
-	case GF_ESM_ES_SETUP:
-		return GF_BAD_PARAM;
-	/*if the channel is already running, don't reset its settings. This only happens in the case of broadcast
-	objects started several times by the scene but not stopped at the ODManager level (cf gf_odm_stop)*/
-	case GF_ESM_ES_RUNNING:
-		return GF_OK;
-	default:
-		break;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Starting ES %d\n", ch->esd->ESID));
-
-	/*reset clock if we own it*/
-	if (gf_es_owns_clock(ch) && !ch->clock->no_time_ctrl)
-		gf_clock_reset(ch->clock);
-
-	/*reset channel*/
-	gf_es_reset(ch, 1);
-	/*create pull buffer if needed*/
-	if (ch->is_pulling && !ch->AU_buffer_pull) ch->AU_buffer_pull = gf_db_unit_new();
-
-	/*and start buffering - pull channels always turn off buffering immediately, otherwise
-	buffering size is setup by the network service - except InputSensor*/
-	if ((ch->esd->decoderConfig->streamType != GF_STREAM_INTERACT) || ch->esd->URLString) {
-		if (! ch->is_pulling && !ch->odm->disable_buffer_at_next_play) {
-			gf_es_buffer_on(ch);
-		}
-	}
-	ch->last_au_time = gf_term_get_time(ch->odm->term);
-	ch->es_state = GF_ESM_ES_RUNNING;
-
-	ch->resync_drift = 0;
-	if (ch->clock->clockID==ch->esd->ESID) {
-		const char *opt = gf_cfg_get_key(ch->clock->term->user->config, "Systems", "ResyncLateClock");
-		if (opt) ch->resync_drift = atoi(opt);
-	}
-	return GF_OK;
-}
-
-GF_Err gf_es_stop(GF_Channel *ch)
-{
-	if (!ch) return GF_BAD_PARAM;
-
-	switch (ch->es_state) {
-	case GF_ESM_ES_UNAVAILABLE:
-	case GF_ESM_ES_SETUP:
-		return GF_BAD_PARAM;
-	default:
-		break;
-	}
-
-	gf_es_buffer_off(ch);
-
-	ch->es_state = GF_ESM_ES_CONNECTED;
-	gf_es_reset(ch, 0);
-	return GF_OK;
-}
-
-
-static void gf_es_wait_rap(GF_Channel *ch)
-{
-	ch->pck_sn = 0;
-
-	/*if using RAP signal and codec not resilient, wait for rap. If RAP isn't signaled, this will be ignored*/
-	if (ch->codec_resilient != GF_CODEC_RESILIENT_ALWAYS)
-		ch->stream_state = 2;
-	if (ch->buffer) gf_free(ch->buffer);
-	ch->buffer = NULL;
-	ch->AULength = 0;
-	ch->au_sn = 0;
-}
-
-void gf_es_reset_buffers(GF_Channel *ch)
-{
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): reseting buffers (%d AUs)\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
-	gf_mx_p(ch->mx);
-
-	if (ch->buffer) gf_free(ch->buffer);
-	ch->buffer = NULL;
-	ch->len = ch->allocSize = 0;
-
-	gf_db_unit_del(ch->AU_buffer_first);
-	ch->AU_buffer_first = ch->AU_buffer_last = NULL;
-	ch->AU_Count = 0;
-
-	ch->BufferTime = 0;
-	gf_mx_v(ch->mx);
-
-	if (ch->odm->codec && ch->odm->codec->CB)
-		gf_cm_reset(ch->odm->codec->CB);
-
-}
-
-void gf_es_reset_timing(GF_Channel *ch, Bool reset_buffer)
-{
-	struct _decoding_buffer *au = ch->AU_buffer_first;
-	gf_mx_p(ch->mx);
-
-	if (reset_buffer) {
-		if (ch->buffer) gf_free(ch->buffer);
-		ch->buffer = NULL;
-		ch->len = ch->allocSize = 0;
-	}
-
-	while (au) {
-		au->CTS = au->DTS = 0;
-		au = au->next;
-	}
-	ch->BufferTime = 0;
-	ch->IsClockInit = 0;
-	gf_mx_v(ch->mx);
-}
-
-static Bool gf_es_needs_buffering(GF_Channel *ch, u32 ForRebuffering)
-{
-	if (!ch->MaxBuffer || ch->IsEndOfStream)
-		return 0;
-	//not controled by the buffer level but by the service
-	if (ch->is_pulling)
-		return 1;
-
-	/*for rebuffering, check we're not below min buffer*/
-	if (ForRebuffering) {
-		if (ch->MinBuffer && (ch->BufferTime <= (s32) ch->MinBuffer)) {
-			return 1;
-		}
-		return 0;
-	}
-
-	/*nothing received, buffer needed*/
-	if (!ch->first_au_fetched && !ch->AU_buffer_first) {
-		u32 now = gf_term_get_time(ch->odm->term);
-		/*data timeout (no data sent)*/
-		if (now > ch->last_au_time + ch->clock->data_timeout) {
-			gf_term_message(ch->odm->term, ch->service->url, "Data timeout - aborting buffering", GF_OK);
-			gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
-			return 0;
-		} else {
-			now = ch->clock->data_timeout + ch->last_au_time - now;
-			now /= 1000;
-			if (now != ch->au_duration) {
-				char szMsg[500];
-				ch->au_duration = now;
-				sprintf(szMsg, "Buffering - Waiting for data (%d s)", now);
-				gf_term_message(ch->odm->term, ch->service->url, szMsg, GF_OK);
-			}
-			return 1;
-		}
-	}
-
-	/*buffer not filled yet*/
-	if (ch->BufferTime < (s32) ch->MaxBuffer) {
-		/*check last AU time*/
-		u32 now = gf_term_get_time(ch->odm->term);
-		/*if more than MaxBuffer sec since last AU don't buffer and prevent rebuffering on short streams
-		this will also work for channels ignoring timing
-		we use MaxBuffer as some transport protocols (HTTP streaming, DVB-H) will work in burst modes of MaxBuffer
-		*/
-		if (now > ch->last_au_time + 2*ch->MaxBuffer ) {
-			/*this can be safely seen as a stream with very few updates (likely only one)*/
-			if (!ch->AU_buffer_first && ch->first_au_fetched)
-				ch->MinBuffer = 0;
-			return 0;
-		}
-		return 1;
-	}
-	return 0;
-}
-
-void gf_es_update_buffering(GF_Channel *ch, Bool update_info)
-{
-	if (update_info) {
-		if (ch->MaxBuffer) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
-
-		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_TIME_UPDATE);
-	}
-
-	if (!gf_es_needs_buffering(ch, 0)) {
-		gf_es_buffer_off(ch);
-
-		if (update_info) {
-			if (ch->MaxBuffer && update_info) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
-
-			gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PLAYING);
-		}
-	}
-}
-
-static void gf_es_update_buffer_time(GF_Channel *ch)
-{
-	if (!ch->AU_buffer_first || !ch->IsClockInit) {
-		ch->BufferTime = 0;
-	}
-	else if (ch->skip_sl) {
-		GF_DBUnit *au;
-		/*compute buffer size from avg bitrate*/
-		u32 avg_rate = ch->esd->decoderConfig->avgBitrate;
-		if (!avg_rate && ch->odm->codec) avg_rate = ch->odm->codec->avg_bit_rate;
-		if (avg_rate) {
-			u32 bsize = 0;
-			au = ch->AU_buffer_first;
-			while (1) {
-				bsize += au->dataLength*8;
-				if (!au->next) break;
-				au = au->next;
-			}
-			ch->BufferTime = 1000*bsize/avg_rate;
-		} else {
-			/*we're in the dark, so don't buffer too much (assume 50ms per unit) so that we start decoding asap*/
-			ch->BufferTime = 50*ch->AU_Count;
-		}
-	} else {
-		s32 bt;
-		if (ch->clock->speed >= 0)
-			bt = ch->AU_buffer_last->DTS - gf_clock_time(ch->clock);
-		else {
-			bt = gf_clock_time(ch->clock);
-			bt -= ch->AU_buffer_last->DTS;
-		}
-
-		if (bt>0) {
-				ch->BufferTime = (u32) bt;
-		} else {
-			ch->BufferTime = 0;
-		}
-	}
-
-	ch->BufferTime += ch->au_duration;
-}
-
-/*dispatch the AU in the DB*/
-static void gf_es_dispatch_au(GF_Channel *ch, u32 duration)
-{
-	u32 time, max;
-	GF_DBUnit *au;
-
-	if (!ch->buffer || !ch->len) {
-		if (ch->buffer) {
-			gf_free(ch->buffer);
-			ch->buffer = NULL;
-		}
-		return;
-	}
-
-	if (ch->odm->codec && ch->odm->codec->decode_only_rap && !ch->IsRap) {
-		if (ch->buffer) {
-			gf_free(ch->buffer);
-			ch->buffer = NULL;
-		}
-		return;
-	}
-
-	au = gf_db_unit_new();
-	if (!au) {
-		gf_free(ch->buffer);
-		ch->buffer = NULL;
-		ch->len = 0;
-		return;
-	}
-
-	au->CTS = ch->CTS;
-	au->DTS = ch->DTS;
-	if (ch->IsRap) au->flags |= GF_DB_AU_RAP;
-	if (ch->SeekFlag) au->flags |= GF_DB_AU_IS_SEEK;
-
-	if (ch->CTS_past_offset) {
-		au->CTS = ch->CTS_past_offset;
-		au->flags |= GF_DB_AU_CTS_IN_PAST;
-		ch->CTS_past_offset = 0;
-	}
-	if (ch->no_timestamps) {
-		au->flags |= GF_DB_AU_NO_TIMESTAMPS;
-		ch->no_timestamps=0;
-	}
-	au->data = ch->buffer;
-	au->dataLength = ch->len;
-	au->PaddingBits = ch->padingBits;
-	au->sender_ntp = ch->sender_ntp;
-	ch->sender_ntp = 0;
-
-	ch->IsRap = 0;
-	ch->SeekFlag = 0;
-	ch->padingBits = 0;
-	au->next = NULL;
-	ch->buffer = NULL;
-
-	if (ch->len + ch->media_padding_bytes != ch->allocSize) {
-		au->data = (char*)gf_realloc(au->data, sizeof(char) * (au->dataLength + ch->media_padding_bytes));
-	}
-	if (ch->media_padding_bytes) memset(au->data + au->dataLength, 0, sizeof(char)*ch->media_padding_bytes);
-
-	ch->len = ch->allocSize = 0;
-
-	gf_es_lock(ch, 1);
-
-	max = 3*ch->MaxBufferOccupancy/2;
-	if (max<300000) max = 300000;
-
-	if( (ch->MaxBuffer && (ch->BufferTime > (s32) max) ) || (ch->AU_Count > max)
-	  ) {
-		if (ch->AU_Count > max) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong, too many AUs (%d) in decoding buffer - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->AU_Count));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Something really wrong,  decoding buffer exceeded (%d ms vs %d max) - trashing buffers\n", ch->esd->ESID, ch->odm->net_service->url, ch->BufferTime, ch->MaxBuffer));
-
-		}
-		gf_db_unit_del(ch->AU_buffer_first->next);
-		ch->AU_buffer_first->next = NULL;
-		ch->AU_buffer_last = ch->AU_buffer_first;
-		ch->AU_Count = 1;
-		ch->BufferTime = 0;
-	}
-
-	if (ch->service && ch->service->cache) {
-		GF_SLHeader slh;
-		memset(&slh, 0, sizeof(GF_SLHeader));
-		slh.accessUnitEndFlag = slh.accessUnitStartFlag = 1;
-		slh.compositionTimeStampFlag = slh.decodingTimeStampFlag = 1;
-		slh.decodingTimeStamp = ch->net_dts;
-		slh.compositionTimeStamp = ch->net_cts;
-		slh.randomAccessPointFlag = (au->flags & GF_DB_AU_RAP) ? 1 : 0;
-		ch->service->cache->Write(ch->service->cache, ch, au->data, au->dataLength, &slh);
-	}
-
-	if (!ch->AU_buffer_first) {
-		ch->AU_buffer_first = au;
-		ch->AU_buffer_last = au;
-		ch->AU_Count = 1;
-	} else {
-		//if speed negative always append to buffer
-		if ((ch->clock->speed < 0) || (!ch->recompute_dts && (ch->AU_buffer_last->DTS <= au->DTS))) {
-			ch->AU_buffer_last->next = au;
-			ch->AU_buffer_last = ch->AU_buffer_last->next;
-		}
-		/*enable deinterleaving only for audio channels (some video transport may not be able to compute DTS, cf MPEG1-2/RTP)
-		HOWEVER, we must recompute a monotone increasing DTS in case the decoder does perform frame reordering
-		in which case the DTS is used for presentation time!!*/
-		else if (ch->esd->decoderConfig->streamType!=GF_STREAM_AUDIO) {
-			/*append AU*/
-			ch->AU_buffer_last->next = au;
-			ch->AU_buffer_last = ch->AU_buffer_last->next;
-
-			if (ch->recompute_dts) {
-#if 0
-				if (au->DTS > au->CTS)
-					au->DTS = au->CTS;
-
-#else
-				au->CTS = au->DTS = ch->CTS;
-
-#if 0
-				GF_DBUnit *au_prev, *ins_au;
-				u32 DTS, dts_shift;
-				u32 minDIFF = (u32) -1;
-				u32 minCTS = (u32) -1;
-				DTS = (u32) -1;
-
-
-				/*compute min CTS and min CTS diff */
-				au_prev = ch->AU_buffer_first;
-				while (au_prev->next) {
-					s32 TS_diff;
-					if (au_prev->CTS > au_prev->next->CTS) {
-						TS_diff = au_prev->CTS - au_prev->next->CTS;
-					} else {
-						TS_diff = au_prev->next->CTS - au_prev->CTS;
-					}
-					if (TS_diff && (TS_diff<minDIFF))
-						minDIFF = TS_diff;
-
-					if (au_prev->DTS < minCTS)
-						minCTS = au_prev->CTS;
-
-					au_prev = au_prev->next;
-				}
-				ch->min_ts_inc = minDIFF;
-				if (!ch->min_computed_cts) {
-					ch->min_computed_cts = au->CTS;
-				}
-
-
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Media deinterleaving OD %d ch %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID));
-
-				dts_shift = 0;
-				DTS = au->DTS;
-				au_prev = ch->AU_buffer_first;
-				/*locate first AU in buffer with DTS greater than new unit CTS*/
-				while (au_prev->next && (au_prev->DTS < DTS) ) {
-					if (au_prev->DTS > au_prev->CTS) {
-						u32 au_dts_shift = au_prev->DTS - au_prev->CTS;
-						if (au_dts_shift > dts_shift) dts_shift = au_dts_shift;
-					}
-					au_prev = au_prev->next;
-				}
-				/*remember insertion point*/
-				ins_au = au_prev;
-				/*shift all following frames DTS*/
-				while (au_prev->next) {
-					au_prev->next->DTS = au_prev->DTS;
-					if (au_prev->next->DTS > au_prev->next->CTS) {
-						u32 au_dts_shift = au_prev->next->DTS - au_prev->next->CTS;
-						if (au_dts_shift > dts_shift ) dts_shift = au_dts_shift;
-					}
-					au_prev = au_prev->next;
-				}
-				/*and apply*/
-				ins_au->DTS = DTS;
-				if (ins_au->DTS > ins_au->CTS) {
-					u32 au_dts_shift = ins_au->DTS - ins_au->CTS;
-					if (au_dts_shift > dts_shift ) dts_shift = au_dts_shift;
-				}
-
-				if (dts_shift) {
-					au_prev = ch->AU_buffer_first;
-					/*locate first AU in buffer with DTS greater than new unit CTS*/
-					while (au_prev ) {
-						if (au_prev->DTS > dts_shift) {
-							au_prev->DTS -= dts_shift;
-						} else {
-							au_prev->DTS = 0;
-						}
-						/*FIXME - there is still a bug in DTS recomputation ...*/
-//						assert(au_prev->DTS<= au_prev->CTS);
-						if (au_prev->DTS> au_prev->CTS)
-							au_prev->DTS = au_prev->CTS;
-						au_prev = au_prev->next;
-					}
-				}
-#endif
-
-#endif
-
-			} else {
-				au->DTS = 0;
-			}
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] Audio deinterleaving OD %d ch %d\n", ch->esd->ESID, ch->odm->OD->objectDescriptorID));
-			/*de-interleaving of AUs*/
-			if (ch->AU_buffer_first->DTS > au->DTS) {
-				au->next = ch->AU_buffer_first;
-				ch->AU_buffer_first = au;
-			} else {
-				GF_DBUnit *au_prev = ch->AU_buffer_first;
-				while (au_prev->next && au_prev->next->DTS<au->DTS) {
-					au_prev = au_prev->next;
-				}
-				assert(au_prev);
-				if (au_prev->next && (au_prev->next->DTS==au->DTS)) {
-					gf_free(au->data);
-					gf_free(au);
-				} else {
-					au->next = au_prev->next;
-					au_prev->next = au;
-
-					if (!au->next && (ch->AU_buffer_last == au_prev)) {
-						ch->AU_buffer_last = au;
-					}
-				}
-			}
-		}
-		ch->AU_Count += 1;
-	}
-	assert(!ch->AU_buffer_last || ch->AU_buffer_last->next == NULL);
-
-	gf_es_update_buffer_time(ch);
-	ch->au_duration = 0;
-	if (duration) ch->au_duration = (u32) ((u64)1000 * duration / ch->ts_res);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ODM %d ES%d (%s) - Dispatch AU DTS %u - CTS %u - RAP %d - Seek %d - size %d time %u Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, au->DTS, au->CTS, au->flags & GF_DB_AU_RAP, (au->flags & GF_DB_AU_IS_SEEK) ? 1 :0, au->dataLength, gf_clock_real_time(ch->clock), ch->BufferTime, ch->AU_Count, ch->AU_buffer_first ? ch->AU_buffer_first->DTS - gf_clock_time(ch->clock) : 0 ));
-
-	/*little optimisation: if direct dispatching is possible, try to decode the AU
-	we must lock the media scheduler to avoid deadlocks with other codecs accessing the scene or
-	media resources*/
-	if (ch->dispatch_after_db) {
-		u32 retry = 100;
-		u32 current_frame;
-		GF_Terminal *term = ch->odm->term;
-		gf_es_buffer_off(ch);
-
-		gf_es_lock(ch, 0);
-		if (gf_mx_try_lock(term->mm_mx)) {
-			switch (ch->esd->decoderConfig->streamType) {
-			case GF_STREAM_OD:
-				gf_codec_process(ch->odm->subscene->od_codec, 100);
-				break;
-			case GF_STREAM_SCENE:
-				if (ch->odm->codec)
-					gf_codec_process(ch->odm->codec, 100);
-				else
-					gf_codec_process(ch->odm->subscene->scene_codec, 100);
-				break;
-			}
-			gf_mx_v(term->mm_mx);
-		}
-		gf_es_lock(ch, 1);
-
-		current_frame = term->compositor->frame_number;
-		/*wait for initial setup to complete before giving back the hand to the caller service*/
-		while (retry) {
-			/*Scene bootstrap: if the scene is attached, wait for first frame to complete so that initial PLAY on
-			objects can be evaluated*/
-			if (term->compositor->scene && (term->compositor->frame_number==current_frame) ) {
-				retry--;
-				gf_sleep(1);
-				continue;
-			}
-			/*Media bootstrap: wait for all pending requests on media objects are processed*/
-			if (gf_list_count(term->media_queue)) {
-				retry--;
-				gf_sleep(1);
-				continue;
-			}
-			break;
-		}
-	}
-
-	gf_es_lock(ch, 0);
-
-	time = gf_term_get_time(ch->odm->term);
-	if (ch->BufferOn) {
-		ch->last_au_time = time;
-		gf_es_update_buffering(ch, 1);
-	} else {
-		/*trigger the data progress every 500 ms*/
-		if (ch->last_au_time + 500 > time) {
-			gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-			ch->last_au_time = time;
-		}
-	}
-}
-
-
-static void gf_es_init_clock(GF_Channel *ch, u32 TS)
-{
-	ch->clock->clock_init = 0;
-
-	gf_clock_set_time(ch->clock, TS);
-	ch->clock->ts_shift = ch->ts_shift;
-
-	//once the clock is init, reset any seek request at parent scene level
-	if (ch->odm->parentscene )
-		ch->odm->parentscene->root_od->media_start_time = 0;
-	//this is the root
-	else ch->odm->media_start_time = 0;
-
-	ch->IsClockInit = 1;
-}
-
-
-void gf_es_receive_skip_sl(GF_ClientService *serv, GF_Channel *ch, const char *StreamBuf, u32 StreamLength)
-{
-	GF_DBUnit *au;
-	if (!StreamLength) return;
-
-	gf_es_lock(ch, 1);
-	au = gf_db_unit_new();
-	au->flags = GF_DB_AU_RAP;
-	au->DTS = gf_clock_time(ch->clock);
-	au->data = (char*)gf_malloc(sizeof(char) * (ch->media_padding_bytes + StreamLength));
-	memcpy(au->data, StreamBuf, sizeof(char) * StreamLength);
-	if (ch->media_padding_bytes) memset(au->data + StreamLength, 0, sizeof(char)*ch->media_padding_bytes);
-	au->dataLength = StreamLength;
-	au->next = NULL;
-
-	/*if channel owns the clock, start it*/
-	if (ch->clock && !ch->IsClockInit) {
-		if (gf_es_owns_clock(ch)) {
-			gf_es_init_clock(ch, 0);
-			ch->seed_ts = 0;
-		}
-		if (ch->clock->clock_init && !ch->IsClockInit) {
-			ch->IsClockInit = 1;
-			ch->seed_ts = gf_clock_time(ch->clock);
-		}
-	}
-
-	if (!ch->AU_buffer_first) {
-		ch->AU_buffer_first = au;
-		ch->AU_buffer_last = au;
-		ch->AU_Count = 1;
-	} else {
-		ch->AU_buffer_last->next = au;
-		ch->AU_buffer_last = ch->AU_buffer_last->next;
-		ch->AU_Count += 1;
-	}
-
-	gf_es_update_buffer_time(ch);
-
-	if (ch->BufferOn) {
-		ch->last_au_time = gf_term_get_time(ch->odm->term);
-		gf_es_update_buffering(ch, 1);
-	}
-	gf_es_lock(ch, 0);
-}
-
-
-static void gf_es_check_timing(GF_Channel *ch)
-{
-	/*the first data received inits the clock - this is needed to handle clock dependencies on non-initialized
-	streams (eg, bifs/od depends on audio/video clock)*/
-	if (!ch->clock->clock_init) {
-		if (!ch->clock->use_ocr) {
-			gf_es_init_clock(ch, ch->DTS);
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Forcing clock initialization at STB %u - AU DTS %u CTS %u\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->DTS, ch->CTS));
-		}
-	}
-	/*channel is the OCR, force a re-init of the clock since we cannot assume the AU used to init the clock was
-	not sent ahead of time*/
-	else if (gf_es_owns_clock(ch)) {
-		if (!ch->clock->use_ocr) {
-			gf_es_init_clock(ch, ch->DTS);
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: initializing clock at STB %d - AU DTS %u - %d buffering - OTB %d\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->DTS, ch->clock->Buffering, gf_clock_time(ch->clock) ));
-		}
-	}
-	else if (!ch->IsClockInit ) {
-		ch->IsClockInit = 1;
-	}
-	/*deal with some broken DMB streams were the timestamps on BIFS/OD are not set (0) or completely out of sync
-	of the OCR clock (usually audio). If the audio codec (BSAC ...) is not found, we force re-initializing of the clock
-	so that video can play back correctly*/
-	else if (gf_clock_time(ch->clock) * 1000 < ch->DTS) {
-		gf_es_init_clock(ch, ch->DTS);
-		GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: re-initializing clock at STB %d - AU DTS %u - %d buffering\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), ch->DTS, ch->clock->Buffering));
-	}
-}
-
-
-void gf_es_dispatch_raw_media_au(GF_Channel *ch, char *payload, u32 payload_size, u32 cts)
-{
-	u32 now;
-	GF_CompositionMemory *cb;
-	GF_CMUnit *cu;
-	if (!payload || !ch->odm->codec->CB) return;
-	if (!ch->odm->codec->CB->no_allocation) return;
-
-	now = gf_clock_real_time(ch->clock);
-	if (cts + ch->MinBuffer < now) {
-		if (ch->MinBuffer && (ch->is_raw_channel==2)) {
-			gf_es_init_clock(ch, cts);
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %u but frame TS is %u ms - adjusting clock\n", ch->odm->OD->objectDescriptorID, now, cts));
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched at OTB %u but frame TS is %u ms - DROPPING\n", ch->odm->OD->objectDescriptorID, now, cts));
-		}
-		return;
-	}
-
-	cb = ch->odm->codec->CB;
-	cu = gf_cm_lock_input(cb, cts, 1);
-	if (cu) {
-		u32 size = 0;
-		assert(cu->RenderedLength==0);
-		if (cb->UnitSize >= payload_size) {
-			cu->data = payload;
-			size = payload_size;
-			cu->TS = cts;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Raw Frame dispatched to CB - TS %u ms - OTB %d ms - OTB_drift %d ms\n", ch->odm->OD->objectDescriptorID, cu->TS, gf_clock_real_time(ch->clock), gf_clock_time(ch->clock) ));
-		}
-		gf_cm_unlock_input(cb, cu, size, 1);
-
-		if (ch->BufferOn) {
-			ch->BufferOn = 0;
-			gf_clock_buffer_off(ch->clock);
-			gf_cm_abort_buffering(cb);
-		}
-		/*since the CB is a simple pointer to the input frame, wait until it is released before getting
-		back to the caller module*/
-		if (size) {
-			gf_sema_wait(ch->odm->raw_frame_sema);
-			assert(cb->output->dataLength == 0);
-		}
-	}
-}
-
-
-/*handles reception of an SL-PDU, logical or physical*/
-void gf_es_receive_sl_packet(GF_ClientService *serv, GF_Channel *ch, char *payload, u32 payload_size, GF_SLHeader *header, GF_Err reception_status)
-{
-	GF_SLHeader hdr;
-	u32 nbAU, OldLength, size;
-	Bool EndAU, NewAU;
-	Bool init_ts = 0;
-
-	if (ch->bypass_sl_and_db) {
-		GF_SceneDecoder *sdec;
-		ch->IsClockInit = 1;
-		if (ch->odm->subscene) {
-			sdec = (GF_SceneDecoder *)ch->odm->subscene->scene_codec->decio;
-		} else {
-			sdec = (GF_SceneDecoder *)ch->odm->codec->decio;
-		}
-		gf_mx_p(ch->mx);
-		sdec->ProcessData(sdec, payload, payload_size, ch->esd->ESID, 0, 0);
-		gf_mx_v(ch->mx);
-		return;
-	}
-
-	if (ch->es_state != GF_ESM_ES_RUNNING) return;
-
-	if (ch->skip_sl) {
-		gf_es_receive_skip_sl(serv, ch, payload, payload_size);
-		return;
-	}
-	if (ch->is_raw_channel) {
-		ch->CTS = ch->DTS = (u32) (ch->ts_offset + (header->compositionTimeStamp - ch->seed_ts) * 1000 / ch->ts_res);
-		if (!ch->IsClockInit) {
-			gf_es_check_timing(ch);
-		}
-		if (payload)
-			gf_es_dispatch_raw_media_au(ch, payload, payload_size, ch->CTS);
-		return;
-	}
-
-	/*physical SL-PDU - depacketize*/
-	if (!header) {
-		u32 SLHdrLen;
-		if (!payload_size) return;
-		gf_sl_depacketize(ch->esd->slConfig, &hdr, payload, payload_size, &SLHdrLen);
-		payload_size -= SLHdrLen;
-		payload += SLHdrLen;
-	} else {
-		hdr = *header;
-	}
-
-	//if PCR is not trusted and this is not a PCR discontinuity, ignore it
-	if (ch->clock->broken_pcr && (hdr.m2ts_pcr == 1)) {
-		hdr.OCRflag = 0;
-	}
-
-	if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon)
-		hdr.OCRflag = 0;
-
-	if (hdr.OCRflag) {
-		if (!ch->clock->ocr_on_esid) {
-			ch->clock->ocr_on_esid = ch->esd->ESID;
-		} else if (ch->esd->ESID != ch->clock->ocr_on_esid) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Receiving OCR from a different channel (ES%d vs previous ES%d)\n", ch->esd->ESID, ch->clock->ocr_on_esid ));
-		}
-
-	}
-
-	/*we ignore OCRs for the moment*/
-	if (hdr.OCRflag) {
-		if (!ch->IsClockInit) {
-			/*channel is the OCR, re-initialize the clock with the proper OCR*/
-			if (gf_es_owns_clock(ch)) {
-				u32 OCR_TS;
-
-				/*timestamps of PCR stream haven been shifted - shift the OCR as well*/
-				if (ch->seed_ts) {
-					u64 diff_ts;
-					Double scale = hdr.m2ts_pcr ? 27000000 : ch->esd->slConfig->OCRResolution;
-					scale /= ch->ts_res;
-					diff_ts = (u64) (ch->seed_ts * scale);
-					hdr.objectClockReference -= diff_ts;
-				}
-
-				/*if SL is mapped from network module(eg not coded), OCR=PCR shall be given in 27Mhz units*/
-				if (hdr.m2ts_pcr) {
-					OCR_TS = (u32) ( hdr.objectClockReference / 27000);
-				} else {
-					OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
-				}
-				OCR_TS += ch->ts_offset;
-				ch->clock->clock_init = 0;
-				ch->prev_pcr_diff = 0;
-
-				gf_es_init_clock(ch, OCR_TS);
-
-				/*many TS streams deployed with HLS have broken PCRs - we will check their consistency
-				when receiving the first AU with DTS/CTS on this channel*/
-				ch->clock->probe_ocr = 1;
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: initializing clock at STB %d from OCR TS %u (original TS "LLD") - %d buffering - OTB %d\n", ch->esd->ESID, gf_term_get_time(ch->odm->term), OCR_TS, hdr.objectClockReference, ch->clock->Buffering, gf_clock_time(ch->clock) ));
-				if (ch->clock->clock_init) ch->IsClockInit = 1;
-
-			}
-		} else 	if (hdr.OCRflag==2) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u clock discontinuity was signaled\n", ch->esd->ESID, gf_clock_real_time(ch->clock) ));
-			gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);
-			gf_es_buffer_on(ch);
-
-			//and re-init timing
-			gf_es_receive_sl_packet(serv, ch, payload, payload_size, header, reception_status);
-			return;
-		} else {
-			Bool discontinuity = (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE;
-			u32 ck;
-			u32 OCR_TS;
-			s32 pcr_diff, pcr_pcrprev_diff;
-
-			if (hdr.m2ts_pcr) {
-				OCR_TS = (u32) ( hdr.objectClockReference / 27000);
-			} else {
-				OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
-			}
-			ck = gf_clock_time(ch->clock);
-
-			pcr_diff = (s32) OCR_TS - (s32) ck;
-			pcr_pcrprev_diff = pcr_diff - ch->prev_pcr_diff;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u got OCR %u (original TS "LLU") - diff %d%s (diff with prev OCR %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, pcr_diff, discontinuity ? " - PCR Discontinuity flag" : "", pcr_pcrprev_diff));
-
-			//PCR loop or disc - use 60 sec as a threshold to cope with HLS where TS are sent in burst - it may happen that video is sent up to 4 or 5 seconds ahead of the PCR in some systems
-			//1- check the PCR diff is greater than 60 seconds
-			//2- check the diff between this PCR diff and last PCR diff is greater than 60 seconds
-			//the first test is used to avoid disc detecting when the TS is sent in burst (eg DASH):
-			if (ch->IsClockInit && (ABS(pcr_diff) > 60000)  && (ABS(pcr_pcrprev_diff) > 60000) ) {
-				discontinuity = GF_TRUE;
-			}
-			//try to ignore PCR disc signaling if our PCR diff seems to be reasonnable
-			if ((hdr.m2ts_pcr==2) && (ABS(pcr_diff) <= 60000)) {
-				discontinuity = GF_FALSE;
-			}
-
-			if (discontinuity) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u detected PCR %s (PCR diff %d - last PCR diff %d)\n", ch->esd->ESID, gf_clock_real_time(ch->clock), (hdr.m2ts_pcr==2) ? "discontinuity" : "looping", pcr_diff, ch->prev_pcr_diff));
-				gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);
-
-				//and re-init timing
-				gf_es_receive_sl_packet(serv, ch, payload, payload_size, header, reception_status);
-				//do not probe OCR after a discontinuity
-				ch->clock->probe_ocr = (hdr.m2ts_pcr==2) ? 0 : 1;
-				ch->last_pcr = hdr.objectClockReference;
-				return;
-			} else {
-				ch->prev_pcr_diff = pcr_diff;
-				ch->last_pcr = hdr.objectClockReference;
-			}
-		}
-		if (!payload_size) return;
-	}
-
-
-	/*check state*/
-	if (!ch->codec_resilient && (reception_status==GF_CORRUPTED_DATA)) {
-		gf_es_wait_rap(ch);
-		return;
-	}
-
-	if (!ch->esd->slConfig->useAccessUnitStartFlag) {
-		/*no AU signaling - each packet is an AU*/
-		if (!ch->esd->slConfig->useAccessUnitEndFlag)
-			hdr.accessUnitEndFlag = hdr.accessUnitStartFlag = 1;
-		/*otherwise AU are signaled by end of previous packet*/
-		else
-			hdr.accessUnitStartFlag = ch->NextIsAUStart;
-	}
-
-	/*get RAP*/
-	if (ch->esd->slConfig->hasRandomAccessUnitsOnlyFlag) {
-		hdr.randomAccessPointFlag = 1;
-	} else if ((ch->carousel_type!=GF_ESM_CAROUSEL_MPEG2) && (!ch->esd->slConfig->useRandomAccessPointFlag || (ch->codec_resilient==GF_CODEC_RESILIENT_ALWAYS) ) ) {
-		ch->stream_state = 0;
-	}
-
-	if (ch->esd->slConfig->packetSeqNumLength) {
-		if (ch->pck_sn && hdr.packetSequenceNumber) {
-			/*repeated -> drop*/
-			if (ch->pck_sn == hdr.packetSequenceNumber) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: repeated packet, droping\n", ch->esd->ESID));
-				return;
-			}
-			/*if codec has no resiliency check packet drops*/
-			if (!ch->codec_resilient && !hdr.accessUnitStartFlag) {
-				if (ch->pck_sn == (u32) (1<<ch->esd->slConfig->packetSeqNumLength) ) {
-					if (hdr.packetSequenceNumber) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: packet loss, droping & wait RAP\n", ch->esd->ESID));
-						gf_es_wait_rap(ch);
-						return;
-					}
-				} else if (ch->pck_sn + 1 != hdr.packetSequenceNumber) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: packet loss, droping & wait RAP\n", ch->esd->ESID));
-					gf_es_wait_rap(ch);
-					return;
-				}
-			}
-		}
-		ch->pck_sn = hdr.packetSequenceNumber;
-	}
-
-	/*if empty, skip the packet*/
-	if (hdr.paddingFlag && !hdr.paddingBits) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: Empty packet - skipping\n", ch->esd->ESID));
-		return;
-	}
-	/*IDLE stream shall be processed*/
-
-	NewAU = 0;
-	if (hdr.accessUnitStartFlag) {
-		NewAU = 1;
-		ch->NextIsAUStart = 0;
-		ch->skip_carousel_au = 0;
-		ch->skip_time_check_for_pending = 0;
-		init_ts = 1;
-	}
-	/*if not first packet but about to force a clock init, do init timestamps*/
-	else if (!ch->IsClockInit) {
-		/*don't process anything until the clock is initialized*/
-		if (ch->esd->dependsOnESID && !gf_es_owns_clock(ch))
-			return;
-		if (hdr.compositionTimeStampFlag)
-			init_ts = 1;
-	}
-
-
-	/*if we had a previous buffer, add or discard it, depending on codec resilience*/
-	if (hdr.accessUnitStartFlag && ch->buffer) {
-		if (ch->esd->slConfig->useAccessUnitEndFlag) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: missed end of AU (DTS %u)\n", ch->esd->ESID, ch->DTS));
-		}
-		if (ch->codec_resilient) {
-			if (!ch->IsClockInit && !ch->skip_time_check_for_pending) gf_es_check_timing(ch);
-			gf_es_dispatch_au(ch, 0);
-		} else {
-			gf_free(ch->buffer);
-			ch->buffer = NULL;
-			ch->AULength = 0;
-			ch->len = ch->allocSize = 0;
-		}
-	}
-
-	if (init_ts) {
-		if (hdr.sender_ntp)
-			ch->sender_ntp = hdr.sender_ntp;
-		/*Get CTS */
-		if (ch->esd->slConfig->useTimestampsFlag) {
-			if (hdr.compositionTimeStampFlag) {
-				ch->net_dts = ch->net_cts = hdr.compositionTimeStamp;
-				/*get DTS */
-				if (hdr.decodingTimeStampFlag) ch->net_dts = hdr.decodingTimeStamp;
-
-#if 0
-				/*until clock is not init check seed ts*/
-				if (!ch->IsClockInit && (ch->net_dts < ch->seed_ts))
-					ch->seed_ts = ch->net_dts;
-#endif
-
-				if (ch->net_cts<ch->seed_ts) {
-					u64 diff = ch->seed_ts - ch->net_cts;
-					ch->CTS_past_offset = (u32) (diff * 1000 / ch->ts_res) + ch->ts_offset;
-
-					ch->net_dts = ch->net_cts = 0;
-					ch->CTS = ch->DTS = gf_clock_time(ch->clock);
-				} else {
-					if (ch->net_dts>ch->seed_ts) ch->net_dts -= ch->seed_ts;
-					else ch->net_dts=0;
-					ch->net_cts -= ch->seed_ts;
-					ch->CTS_past_offset = 0;
-
-					if (ch->clock) {
-						ch->ts_shift = ch->clock->ts_shift;
-
-						//if we init the clock to something > 32 bits, shift down close to zero
-						//this will allow us 49 days of playback without having to deal with TS loops
-						//TODO: move all our timestamps to 64 bits ...
-						if (!ch->clock->clock_init) {
-							u64 dts= ch->ts_offset + (s64) (ch->net_dts) * 1000 / ch->ts_res;
-							if (dts>0xFFFFFFFFUL) {
-								//don't reset to zero, in case DTSs are not in order (interleaved transport)
-								ch->ts_shift = dts - 2*ch->ts_res;
-							}
-						}
-					}
-
-					/*TS Wraping not tested*/
-					ch->CTS = (u32) (ch->ts_offset + (u64) (ch->net_cts * 1000 / ch->ts_res - ch->ts_shift) );
-					ch->DTS = (u32) (ch->ts_offset + (u64) (ch->net_dts * 1000 / ch->ts_res - ch->ts_shift) );
-				}
-
-				if (ch->odm->parentscene && ch->odm->parentscene->root_od->addon) {
-					s64 res;
-					if (!ch->odm->parentscene->root_od->addon->timeline_ready && (ch->odm->parentscene->root_od->addon->url[0]==0))
-						return;
-						
-					res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->DTS);
-					if (res<0) res=0;
-					ch->DTS = (u32) res;
-					
-					res = gf_scene_adjust_timestamp_for_addon(ch->odm->parentscene->root_od->addon, ch->CTS);
-					if (res<0) return;
-					ch->CTS = (u32) res;
-				}
-
-				if (ch->clock->probe_ocr && gf_es_owns_clock(ch)) {
-					s32 diff_ts = ch->DTS;
-					diff_ts -= ch->clock->init_time;
-					if (ABS(diff_ts) > 10000) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: invalid clock reference detected - DTS %u but OCR %u - using DTS as OCR\n", ch->esd->ESID, ch->DTS, ch->clock->init_time));
-						gf_es_init_clock(ch, ch->DTS-1000);
-						ch->clock->broken_pcr = 1;
-					}
-					ch->clock->probe_ocr = 0;
-				}
-				ch->no_timestamps = 0;
-			} else {
-				ch->no_timestamps = 1;
-			}
-		} else {
-			u32 AUSeqNum = hdr.AU_sequenceNumber;
-			/*use CU duration*/
-			if (!ch->IsClockInit)
-				ch->DTS = ch->CTS = ch->ts_offset;
-
-			if (!ch->esd->slConfig->AUSeqNumLength) {
-				if (!ch->au_sn) {
-					ch->CTS = ch->ts_offset;
-					ch->au_sn = 1;
-				} else {
-					ch->CTS += ch->esd->slConfig->CUDuration;
-				}
-			} else {
-				//use the sequence number to get the TS
-				if (AUSeqNum < ch->au_sn) {
-					nbAU = ( (1<<ch->esd->slConfig->AUSeqNumLength) - ch->au_sn) + AUSeqNum;
-				} else {
-					nbAU = AUSeqNum - ch->au_sn;
-				}
-				ch->CTS += nbAU * ch->esd->slConfig->CUDuration;
-			}
-		}
-	}
-
-	if (hdr.accessUnitStartFlag) {
-		u32 AUSeqNum = hdr.AU_sequenceNumber;
-
-		/*if the AU Length is carried in SL, get its size*/
-		if (ch->esd->slConfig->AULength > 0) {
-			ch->AULength = hdr.accessUnitLength;
-		} else {
-			ch->AULength = 0;
-		}
-
-		//temp hack
-		if (ch->odm->lower_layer_odm)
-			hdr.randomAccessPointFlag = 1;
-
-		/*carousel for repeated AUs.*/
-		if (ch->carousel_type) {
-			/* not used :			Bool use_rap = hdr.randomAccessPointFlag; */
-
-			if (ch->carousel_type==GF_ESM_CAROUSEL_MPEG2) {
-				AUSeqNum = hdr.m2ts_version_number_plus_one-1;
-				/*mpeg-2 section carrouseling does not take into account the RAP nature of the tables*/
-
-
-				if (AUSeqNum==ch->au_sn) {
-					if (ch->stream_state) {
-						ch->stream_state=0;
-						GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: MPEG-2 Carousel: tuning in\n", ch->esd->ESID));
-					} else {
-						ch->skip_carousel_au = 1;
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: MPEG-2 Carousel: repeated AU (TS %u) - skipping\n", ch->esd->ESID, ch->CTS));
-						return;
-					}
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: MPEG-2 Carousel: updated AU (TS %u)\n", ch->esd->ESID, ch->CTS));
-					ch->stream_state=0;
-					ch->au_sn = AUSeqNum;
-				}
-			} else {
-				if (hdr.randomAccessPointFlag) {
-					/*initial tune-in*/
-					if (ch->stream_state==1) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %u) - tuning in\n", ch->esd->ESID, ch->CTS));
-						ch->au_sn = AUSeqNum;
-						ch->stream_state = 0;
-					}
-					/*carousel RAP*/
-					else if (AUSeqNum == ch->au_sn) {
-						/*error recovery*/
-						if (ch->stream_state==2) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %u) - recovering\n", ch->esd->ESID, ch->CTS));
-							ch->stream_state = 0;
-						}
-						else {
-							ch->skip_carousel_au = 1;
-							GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %u) - skipping\n", ch->esd->ESID, ch->CTS));
-							return;
-						}
-					}
-					/*regular RAP*/
-					else {
-						if (ch->stream_state==2) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: RAP Carousel found (TS %u) - recovering from previous errors\n", ch->esd->ESID, ch->CTS));
-						}
-						ch->au_sn = AUSeqNum;
-						ch->stream_state = 0;
-					}
-				}
-				/*regular AU but waiting for RAP*/
-				else if (ch->stream_state) {
-#if 0
-					ch->skip_carousel_au = 1;
-					GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Waiting for RAP Carousel - skipping\n", ch->esd->ESID));
-					return;
-#else
-					GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Tuning in before RAP\n", ch->esd->ESID));
-#endif
-				}
-				/*previous packet(s) loss: check for critical or non-critical AUs*/
-				else if (reception_status == GF_REMOTE_SERVICE_ERROR) {
-					if (ch->au_sn == AUSeqNum) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Lost a non critical packet\n", ch->esd->ESID));
-					}
-					/*Packet lost are critical*/
-					else {
-						ch->stream_state = 2;
-						GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: Lost a critical packet - skipping\n", ch->esd->ESID));
-						return;
-					}
-				} else {
-					ch->au_sn = AUSeqNum;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: NON-RAP AU received (TS %u)\n", ch->esd->ESID, ch->DTS));
-				}
-			}
-		}
-
-		/*no carousel signaling, tune-in at first RAP*/
-		else if (hdr.randomAccessPointFlag) {
-			if (ch->stream_state) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): RAP AU received\n", ch->esd->ESID, ch->odm->net_service->url));
-				ch->stream_state = 0;
-			}
-		}
-		/*waiting for RAP, return*/
-		else if (ch->stream_state) {
-			if (ch->esd->dependsOnESID || ch->odm->lower_layer_odm) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Considering AU is RAP on enhancement layer\n", ch->esd->ESID, ch->odm->net_service->url));
-				ch->stream_state = 0;
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s): Waiting for RAP - skipping AU (DTS %u)\n", ch->esd->ESID, ch->odm->net_service->url, ch->DTS));
-				return;
-			}
-		}
-	}
-
-	/*update the RAP marker on a packet base (to cope with AVC/H264 NALU->AU reconstruction)*/
-	if (hdr.randomAccessPointFlag) ch->IsRap = 1;
-	if (hdr.seekFlag) ch->SeekFlag = 1;
-
-	/*get AU end state*/
-	OldLength = ch->buffer ? ch->len : 0;
-	EndAU = hdr.accessUnitEndFlag;
-	if (ch->AULength == OldLength + payload_size) EndAU = 1;
-	if (EndAU) ch->NextIsAUStart = 1;
-
-	/*init clock if end of AU or if header is valid*/
-	if ((EndAU || init_ts) && !ch->IsClockInit && !ch->skip_time_check_for_pending) {
-		gf_es_check_timing(ch);
-	}
-
-	/* we need to skip all the packets of the current AU in the carousel scenario */
-	if (ch->skip_carousel_au == 1) return;
-
-	if (!payload_size && EndAU && ch->buffer) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: Empty packet, flushing buffer\n", ch->esd->ESID));
-		gf_es_dispatch_au(ch, 0);
-		return;
-	}
-	if (!payload_size) return;
-
-	/*missed beginning, unusable*/
-	if (!ch->buffer && !NewAU) {
-		if (ch->esd->slConfig->useAccessUnitStartFlag) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SYNC, ("[SyncLayer] ES%d: missed begin of AU\n", ch->esd->ESID));
-		}
-		if (ch->codec_resilient) NewAU = GF_TRUE;
-		else return;
-	}
-
-	/*Write the Packet payload to the buffer*/
-	if (NewAU) {
-		/*we should NEVER have a bitstream at this stage*/
-		assert(!ch->buffer);
-		/*ignore length fields*/
-		size = payload_size + ch->media_padding_bytes;
-		ch->buffer = (char*)gf_malloc(sizeof(char) * size);
-		if (!ch->buffer) {
-			assert(0);
-			return;
-		}
-
-		ch->allocSize = size;
-		memset(ch->buffer, 0, sizeof(char) * size);
-		ch->len = 0;
-	}
-	if (!ch->esd->slConfig->usePaddingFlag) hdr.paddingFlag = 0;
-
-	if (ch->ipmp_tool) {
-		GF_Err e;
-		GF_IPMPEvent evt;
-		memset(&evt, 0, sizeof(evt));
-		evt.event_type=GF_IPMP_TOOL_PROCESS_DATA;
-		evt.channel = ch;
-		evt.data = payload;
-		evt.data_size = payload_size;
-		evt.is_encrypted = (hdr.isma_encrypted || hdr.cenc_encrypted) ? 1 : 0;
-		if (hdr.isma_encrypted) {
-			evt.isma_BSO = hdr.isma_BSO;
-		} else if (hdr.cenc_encrypted) {
-			evt.sai = hdr.sai;
-			evt.saiz = hdr.saiz;
-			evt.IV_size = hdr.IV_size;
-			evt.crypt_byte_block = hdr.crypt_byte_block;
-			evt.skip_byte_block = hdr.skip_byte_block;
-			if (!evt.IV_size) {
-				evt.constant_IV_size = hdr.constant_IV_size;
-				memmove(evt.constant_IV, hdr.constant_IV, hdr.constant_IV_size);
-			}
-		}
-		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-
-		/*we discard undecrypted AU*/
-		if (e) {
-			if (e==GF_EOS) {
-				gf_es_on_eos(ch);
-				/*restart*/
-				if (evt.restart_requested) {
-					if (ch->odm->parentscene->is_dynamic_scene) {
-						gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0, 0);
-					} else {
-						mediacontrol_restart(ch->odm);
-					}
-				}
-			}
-			return;
-		}
-	}
-
-	gf_es_lock(ch, 1);
-
-	if (hdr.paddingFlag && !EndAU) {
-		/*to do - this shouldn't happen anyway */
-
-	} else {
-		/*check if enough space*/
-		size = ch->allocSize;
-		if (size && (payload_size + ch->len <= size)) {
-			memcpy(ch->buffer+ch->len, payload, payload_size);
-			ch->len += payload_size;
-		} else {
-			size = payload_size + ch->len + ch->media_padding_bytes;
-			ch->buffer = (char*)gf_realloc(ch->buffer, sizeof(char) * size);
-			memcpy(ch->buffer+ch->len, payload, payload_size);
-			ch->allocSize = size;
-			ch->len += payload_size;
-		}
-		if (hdr.paddingFlag) ch->padingBits = hdr.paddingBits;
-	}
-
-	if (EndAU) gf_es_dispatch_au(ch, hdr.au_duration);
-
-	gf_es_lock(ch, 0);
-}
-
-
-/*notification of End of stream on this channel*/
-void gf_es_on_eos(GF_Channel *ch)
-{
-	if (!ch || ch->IsEndOfStream) return;
-	ch->IsEndOfStream = GF_TRUE;
-
-	/*flush buffer*/
-	gf_es_buffer_off(ch);
-	if (ch->len)
-		gf_es_dispatch_au(ch, 0);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Channel %d is end of stream\n", ch->odm->OD->objectDescriptorID, (u32) ch->esd->ESID));
-	gf_odm_on_eos(ch->odm, ch);
-}
-
-
-
-GF_DBUnit *gf_es_get_au(GF_Channel *ch)
-{
-	Bool comp, is_new_data;
-	GF_Err e, state;
-	GF_SLHeader slh;
-	char *reagg_au;
-	u32 reagg_au_size;
-
-	if (ch->es_state != GF_ESM_ES_RUNNING) return NULL;
-
-	if (!ch->is_pulling) {
-		gf_mx_p(ch->mx);
-
-		/*we must update buffering before fetching in order to stop buffering for streams with very few
-		updates (especially streams with one update, like most of OD streams)*/
-		if (ch->BufferOn && ch->AU_buffer_first) gf_es_update_buffering(ch, 0);
-		gf_mx_v(ch->mx);
-
-		if (ch->BufferOn) {
-			if (ch->first_au_fetched || !ch->AU_buffer_first || !ch->AU_buffer_first->next)
-				return NULL;
-		}
-		return ch->AU_buffer_first;
-	}
-
-	//pull channel is buffering: fetch first frame for systems, or fetch until CB is full
-	if (ch->BufferOn) {
-		if (ch->odm->codec && ch->odm->codec->CB) {
-			if (ch->odm->codec->CB->UnitCount) return NULL;
-		} else {
-			if (ch->first_au_fetched) return NULL;
-		}
-	}
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-
-	reagg_au = ch->AU_buffer_pull->data;
-	reagg_au_size = ch->AU_buffer_pull->dataLength;
-
-	e = gf_term_channel_get_sl_packet(ch->service, ch, (char **) &ch->AU_buffer_pull->data, &ch->AU_buffer_pull->dataLength, &slh, &comp, &state, &is_new_data);
-	if (e) state = e;
-	switch (state) {
-	case GF_EOS:
-		gf_es_on_eos(ch);
-		return NULL;
-	case GF_BUFFER_TOO_SMALL:
-		if (ch->MinBuffer) {
-			//if we have a composition buffer, only trigger buffering when no more data is available in the CB
-			if (ch->odm->codec && ch->odm->codec->CB && ch->odm->codec->CB->UnitCount<=1) {
-				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-				gf_es_buffer_on(ch);
-				ch->pull_forced_buffer = 1;
-			} else if (!ch->odm->codec || !ch->odm->codec->CB) {
-				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-				gf_es_buffer_on(ch);
-				ch->pull_forced_buffer = 1;
-			}
-		}
-		return NULL;
-	case GF_OK:
-		break;
-	default:
-	{
-		char m[100];
-		sprintf(m, "Data reception failure on channel %d", ch->esd->ESID);
-		gf_term_message(ch->odm->term, ch->service->url , m, state);
-		return NULL;
-	}
-	}
-	assert(!comp);
-	/*update timing if new stream data but send no data. in sase of encrypted data: we always need updating*/
-	if (is_new_data) {
-		ch->IsRap = 0;
-		gf_es_receive_sl_packet(ch->service, ch, NULL, 0, &slh, GF_OK);
-
-		if (ch->stream_state) {
-			gf_term_channel_release_sl_packet(ch->service, ch);
-			return NULL;
-		}
-
-		if (ch->ipmp_tool) {
-			GF_IPMPEvent evt;
-			memset(&evt, 0, sizeof(evt));
-			evt.event_type=GF_IPMP_TOOL_PROCESS_DATA;
-			evt.data = ch->AU_buffer_pull->data;
-			evt.data_size = ch->AU_buffer_pull->dataLength;
-			evt.is_encrypted = (slh.isma_encrypted || slh.cenc_encrypted) ? 1 : 0;
-			if (slh.isma_encrypted) {
-				evt.isma_BSO = slh.isma_BSO;
-			} else if (slh.cenc_encrypted) {
-				evt.sai = slh.sai;
-				evt.saiz = slh.saiz;
-				evt.IV_size = slh.IV_size;
-				evt.crypt_byte_block = slh.crypt_byte_block;
-				evt.skip_byte_block = slh.skip_byte_block;
-				if (!evt.IV_size) {
-					evt.constant_IV_size = slh.constant_IV_size;
-					memmove(evt.constant_IV, slh.constant_IV, evt.constant_IV_size);
-				}
-			}
-			evt.channel = ch;
-			e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-
-			/*we discard undecrypted AU*/
-			if (e) {
-				if (e==GF_EOS) {
-					gf_es_on_eos(ch);
-					/*restart*/
-					if (evt.restart_requested) {
-						if (ch->odm->parentscene->is_dynamic_scene) {
-							gf_scene_restart_dynamic(ch->odm->parentscene, 0, 0, 0);
-						} else {
-							mediacontrol_restart(ch->odm);
-						}
-					}
-				}
-				gf_term_channel_release_sl_packet(ch->service, ch);
-				return NULL;
-			}
-		}
-		ch->AU_buffer_pull->flags = 0;
-		if (ch->IsRap) ch->AU_buffer_pull->flags |= GF_DB_AU_RAP;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d (%s) at %u - Dispatch Pull AU DTS %u - CTS %u - size %d - RAP %d\n", ch->esd->ESID, ch->odm->net_service->url, gf_clock_real_time(ch->clock), ch->DTS, ch->CTS, ch->AU_buffer_pull->dataLength, ch->AU_buffer_pull->flags&1 ? 1 : 0));
-
-	} else if (reagg_au) {
-		ch->AU_buffer_pull->data = reagg_au;
-		ch->AU_buffer_pull->dataLength = reagg_au_size;
-	}
-
-
-	/*this may happen in file streaming when data has not arrived yet, in which case we discard the AU*/
-	if (!ch->AU_buffer_pull->data) {
-		gf_term_channel_release_sl_packet(ch->service, ch);
-		return NULL;
-	}
-	ch->AU_buffer_pull->CTS = (u32) ch->CTS;
-	ch->AU_buffer_pull->DTS = (u32) ch->DTS;
-	ch->AU_buffer_pull->sender_ntp = ch->sender_ntp;
-	ch->AU_buffer_pull->PaddingBits = ch->padingBits;
-
-	if (ch->pull_forced_buffer) {
-		assert(ch->BufferOn);
-		ch->pull_forced_buffer=0;
-		gf_es_buffer_off(ch);
-		gf_es_update_buffering(ch, 1);
-	} else if (is_new_data && !ch->first_au_fetched) {
-		gf_es_update_buffering(ch, 1);
-	}
-
-	return ch->AU_buffer_pull;
-}
-
-void gf_es_init_dummy(GF_Channel *ch)
-{
-	GF_SLHeader slh;
-	Bool comp, is_new_data;
-	GF_Err e, state;
-	/*pull from stream - resume clock if needed*/
-	gf_es_buffer_off(ch);
-
-	ch->ts_res = 1000;
-	if (ch->is_pulling) {
-		e = gf_term_channel_get_sl_packet(ch->service, ch, (char **) &ch->AU_buffer_pull->data, &ch->AU_buffer_pull->dataLength, &slh, &comp, &state, &is_new_data);
-		if (e) state = e;
-		if ((state==GF_OK) && is_new_data) gf_es_receive_sl_packet(ch->service, ch, NULL, 0, &slh, GF_OK);
-		gf_term_channel_release_sl_packet(ch->service, ch);
-	} else {
-		memset(&slh, 0, sizeof(GF_SLHeader));
-		slh.accessUnitStartFlag = 1;
-		slh.compositionTimeStampFlag = 1;
-		gf_es_receive_sl_packet(ch->service, ch, NULL, 0, &slh, GF_OK);
-	}
-}
-
-void gf_es_drop_au(GF_Channel *ch)
-{
-	GF_DBUnit *au;
-
-	if (ch->is_pulling) {
-		if (ch->AU_buffer_pull) {
-			//we have made a copy of the AU !!
-			if (ch->AU_buffer_pull->flags & GF_DB_AU_REAGGREGATED) {
-				gf_free(ch->AU_buffer_pull->data);
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[ODM%d] ES%d (%s) Droping pull AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, ch->AU_buffer_pull->CTS));
-			gf_term_channel_release_sl_packet(ch->service, ch);
-			ch->AU_buffer_pull->data = NULL;
-			ch->AU_buffer_pull->dataLength = 0;
-		}
-		if (!ch->esd->dependsOnESID)
-			ch->first_au_fetched = 1;
-		return;
-	}
-
-	/*lock the channel before touching the queue*/
-	gf_es_lock(ch, 1);
-
-	if (!ch->AU_buffer_first) {
-		gf_es_lock(ch, 0);
-		return;
-	}
-	if (!ch->esd->dependsOnESID)
-		ch->first_au_fetched = 1;
-
-	au = ch->AU_buffer_first;
-//	ch->min_computed_cts = au->CTS;
-	ch->AU_buffer_first = au->next;
-
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[ODM%d] ES%d (%s) Droping AU CTS %d\n", ch->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, au->CTS));
-
-	au->next = NULL;
-	gf_db_unit_del(au);
-	ch->AU_Count -= 1;
-
-	if (!ch->AU_Count && ch->AU_buffer_first) {
-		ch->AU_buffer_first = NULL;
-	}
-	if (!ch->AU_buffer_first) ch->AU_buffer_last = NULL;
-	else if (!ch->AU_buffer_first->next) ch->AU_buffer_last = ch->AU_buffer_first;
-
-	gf_es_update_buffer_time(ch);
-
-	/*if we get under our limit, rebuffer EXCEPT WHEN EOS is signaled*/
-	if (!ch->IsEndOfStream && gf_es_needs_buffering(ch, 1)) {
-		gf_es_buffer_on(ch);
-		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_WAITING);
-	}
-
-	/*unlock the channel*/
-	gf_es_lock(ch, 0);
-}
-
-/*(un)locks channel*/
-void gf_es_lock(GF_Channel *ch, u32 LockIt)
-{
-	if (LockIt) {
-		gf_mx_p(ch->mx);
-	} else {
-		gf_mx_v(ch->mx);
-	}
-}
-
-/*refresh all ODs when an non-interactive stream is found*/
-static void gf_es_refresh_non_interactive_clocks(GF_ObjectManager *odm)
-{
-	u32 i, j;
-	GF_Channel *ch;
-	GF_ObjectManager *test_od;
-	GF_Scene *in_scene;
-
-	/*check for inline*/
-	in_scene = odm->subscene ? odm->subscene : odm->parentscene;
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(in_scene->root_od->channels, &i)) ) {
-		if (ch->clock->no_time_ctrl) {
-			in_scene->root_od->flags |= GF_ODM_NO_TIME_CTRL;
-			//if (ch->clock->use_ocr && ch->BufferOn) gf_es_buffer_off(ch);
-		}
-	}
-
-	i=0;
-	while ((test_od = (GF_ObjectManager *)gf_list_enum(in_scene->resources, &i)) ) {
-		j=0;
-		while ((ch = (GF_Channel*)gf_list_enum(test_od->channels, &j)) ) {
-			if (ch->clock->no_time_ctrl) {
-				test_od->flags |= GF_ODM_NO_TIME_CTRL;
-				//if (ch->clock->use_ocr && ch->BufferOn) gf_es_buffer_off(ch);
-			}
-		}
-	}
-}
-/*performs final setup upon connection confirm*/
-void gf_es_on_connect(GF_Channel *ch)
-{
-	const char *sOpt;
-	Bool can_buffer;
-	GF_NetworkCommand com;
-
-	/*check whether we can work in pull mode or not*/
-	can_buffer = 1;
-	/*if local interaction streams no buffer nor pull*/
-	if ((ch->esd->decoderConfig->streamType == GF_STREAM_INTERACT) && !ch->esd->URLString) can_buffer = 0;
-
-	com.base.on_channel = ch;
-
-	ch->is_pulling = 0;
-	if (can_buffer) {
-		/*request padding*/
-		com.command_type = GF_NET_CHAN_SET_PADDING;
-		com.pad.padding_bytes = ch->media_padding_bytes;
-		if (!com.pad.padding_bytes || (gf_term_service_command(ch->service, &com) == GF_OK)) {
-			/*request pull if possible*/
-			if (ch->service->ifce->ChannelGetSLP && ch->service->ifce->ChannelReleaseSLP) {
-				com.command_type = GF_NET_CHAN_SET_PULL;
-				if (gf_term_service_command(ch->service, &com) == GF_OK) {
-					ch->is_pulling = 1;
-					can_buffer = 0;
-				}
-			}
-		}
-	}
-	/*checks whether the stream is interactive or not*/
-	com.command_type = GF_NET_CHAN_INTERACTIVE;
-	if (gf_term_service_command(ch->service, &com)!=GF_OK) {
-		ch->clock->no_time_ctrl = 1;
-		ch->odm->flags |= GF_ODM_NO_TIME_CTRL;
-		gf_es_refresh_non_interactive_clocks(ch->odm);
-	}
-
-	/*signal channel state*/
-	if (ch->es_state == GF_ESM_ES_WAIT_FOR_ACK)
-		ch->es_state = GF_ESM_ES_CONNECTED;
-	/*signal only once connected to prevent PLAY trigger on connection callback*/
-	ch->odm->pending_channels--;
-
-	/*remember channels connected on service*/
-	if (ch->esd->URLString) ch->service->nb_ch_users++;
-
-	/*turn off buffering for JPEG and PNG*/
-	switch (ch->esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_IMAGE_JPEG:
-	case GPAC_OTI_IMAGE_PNG:
-		can_buffer = 0;
-		break;
-	}
-	/*buffer setup*/
-	ch->MinBuffer = ch->MaxBuffer = 0;
-
-	/*set default values*/
-	com.buffer.max = 1000;
-	com.buffer.min = 0;
-	sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "BufferLength");
-	if (sOpt) com.buffer.max = atoi(sOpt);
-	com.buffer.min = 0;
-	sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "RebufferLength");
-	if (sOpt) com.buffer.min = atoi(sOpt);
-
-	com.buffer.occupancy = com.buffer.max;
-	sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "BufferMaxOccupancy");
-	if (sOpt) com.buffer.occupancy = atoi(sOpt);
-
-	//set the buffer command even though the channel is pulling, in order to indicate to the service the prefered values
-	com.command_type = GF_NET_CHAN_BUFFER;
-	com.base.on_channel = ch;
-	if (gf_term_service_command(ch->service, &com) == GF_OK) {
-		//only set the values if we can buffer
-		if (can_buffer) {
-			ch->MinBuffer = com.buffer.min;
-			ch->MaxBuffer = com.buffer.max;
-			ch->MaxBufferOccupancy = com.buffer.occupancy;
-			if (ch->MaxBufferOccupancy < ch->MaxBuffer) ch->MaxBufferOccupancy = ch->MaxBuffer;
-		}
-	}
-
-	if (ch && ch->odm && ch->odm->codec && !ch->is_pulling && (ch->MaxBuffer <= ch->odm->term->low_latency_buffer_max))
-		ch->odm->codec->flags |= GF_ESM_CODEC_IS_LOW_LATENCY;
-
-	if (ch->esd->decoderConfig->streamType == GF_STREAM_PRIVATE_SCENE &&
-	        ch->esd->decoderConfig->objectTypeIndication == GPAC_OTI_PRIVATE_SCENE_EPG) {
-		ch->bypass_sl_and_db = 1;
-	}
-	if (ch->clock->no_time_ctrl) {
-		switch (ch->esd->decoderConfig->streamType) {
-		case GF_STREAM_AUDIO:
-		case GF_STREAM_VISUAL:
-			break;
-		default:
-			ch->dispatch_after_db = 1;
-			break;
-		}
-	}
-
-	/*get duration*/
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_DURATION;
-	com.base.on_channel = ch;
-	if (gf_term_service_command(ch->service, &com) == GF_OK) {
-		if (com.duration.duration>=0) {
-			gf_odm_set_duration(ch->odm, ch, (u64) (1000*com.duration.duration));
-		}
-
-		if ((com.duration.duration<=0) && (com.duration.time_shift_buffer>0)) {
-			gf_odm_set_timeshift_depth(ch->odm, ch, com.duration.time_shift_buffer);
-		}
-	}
-}
-
-void gf_es_config_drm(GF_Channel *ch, GF_NetComDRMConfig *drm_cfg)
-{
-	GF_Terminal *term = ch->odm->term;
-	u32 i, count;
-	GF_Err e;
-	GF_IPMPEvent evt;
-	GF_OMADRM2Config cfg;
-	GF_OMADRM2Config isma_cfg;
-	GF_CENCConfig cenc_cfg;
-
-	/*always buffer when fetching keys*/
-	gf_es_buffer_on(ch);
-	ch->is_protected = 1;
-
-	memset(&evt, 0, sizeof(GF_IPMPEvent));
-	evt.event_type = GF_IPMP_TOOL_SETUP;
-	evt.channel = ch;
-
-	/*push all cfg data*/
-	/*CommonEncryption*/
-	if ((drm_cfg->scheme_type == GF_ISOM_CENC_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CBC_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CENS_SCHEME) || (drm_cfg->scheme_type == GF_ISOM_CBCS_SCHEME)) {
-		evt.config_data_code = drm_cfg->scheme_type;
-		memset(&cenc_cfg, 0, sizeof(cenc_cfg));
-		cenc_cfg.scheme_version = drm_cfg->scheme_version;
-		cenc_cfg.scheme_type = drm_cfg->scheme_type;
-		cenc_cfg.PSSH_count = drm_cfg->PSSH_count;
-		cenc_cfg.PSSHs = drm_cfg->PSSHs;
-		evt.config_data = &cenc_cfg;
-	} else {
-		/*ISMA and OMA*/
-		if (drm_cfg->contentID) {
-			evt.config_data_code = GF_ISOM_ODRM_SCHEME;
-			memset(&cfg, 0, sizeof(cfg));
-			cfg.scheme_version = drm_cfg->scheme_version;
-			cfg.scheme_type = drm_cfg->scheme_type;
-			cfg.scheme_uri = drm_cfg->scheme_uri;
-			cfg.kms_uri = drm_cfg->kms_uri;
-			memcpy(cfg.hash, drm_cfg->hash, sizeof(char)*20);
-			cfg.contentID = drm_cfg->contentID;
-			cfg.oma_drm_crypt_type = drm_cfg->oma_drm_crypt_type;
-			cfg.oma_drm_use_pad = drm_cfg->oma_drm_use_pad;
-			cfg.oma_drm_use_hdr = drm_cfg->oma_drm_use_hdr;
-			cfg.oma_drm_textual_headers = drm_cfg->oma_drm_textual_headers;
-			cfg.oma_drm_textual_headers_len = drm_cfg->oma_drm_textual_headers_len;
-			evt.config_data = &cfg;
-		} else {
-			evt.config_data_code = GF_ISOM_ISMA_SCHEME;
-			memset(&isma_cfg, 0, sizeof(isma_cfg));
-			isma_cfg.scheme_version = drm_cfg->scheme_version;
-			isma_cfg.scheme_type = drm_cfg->scheme_type;
-			isma_cfg.scheme_uri = drm_cfg->scheme_uri;
-			isma_cfg.kms_uri = drm_cfg->kms_uri;
-			evt.config_data = &isma_cfg;
-		}
-	}
-
-	if (ch->ipmp_tool) {
-		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-		if (e) gf_term_message(ch->odm->term, ch->service->url, "Error setting up DRM tool", e);
-		gf_es_buffer_off(ch);
-		return;
-	}
-
-	/*browse all available tools*/
-	count = gf_modules_get_count(term->user->modules);
-	for (i=0; i< count; i++) {
-		ch->ipmp_tool = (GF_IPMPTool *) gf_modules_load_interface(term->user->modules, i, GF_IPMP_TOOL_INTERFACE);
-		if (!ch->ipmp_tool) continue;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[IPMP] Checking if IPMP tool %s can handle channel protection scheme\n", ch->ipmp_tool->module_name));
-		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-		if (e==GF_OK) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[IPMP] Associating IPMP tool %s to channel %d\n", ch->ipmp_tool->module_name, ch->esd->ESID));
-			gf_es_buffer_off(ch);
-			return;
-		}
-		gf_modules_close_interface((GF_BaseInterface *) ch->ipmp_tool);
-		ch->ipmp_tool = NULL;
-	}
-	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[IPMP] No IPMP tool suitable to handle channel protection scheme %s (KMS URI %s)\n", drm_cfg->scheme_uri, drm_cfg->kms_uri));
-	gf_es_buffer_off(ch);
-}
-

gpac-0.8.0.tar.gz/src/terminal/clock.c Deleted

@@ -1,358 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file scene part of GPAC / Media terminal sub-project
- *
- *  GPAC scene 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 scene 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/internal/terminal_dev.h>
-
-GF_Clock *NewClock(GF_Terminal *term)
-{
-	GF_Clock *tmp;
-	GF_SAFEALLOC(tmp, GF_Clock);
-	if (!tmp) return NULL;
-	tmp->mx = gf_mx_new("Clock");
-	tmp->term = term;
-	tmp->speed = FIX_ONE;
-	tmp->data_timeout = term->net_data_timeout;
-	return tmp;
-}
-
-void gf_clock_del(GF_Clock *ck)
-{
-	gf_mx_del(ck->mx);
-	gf_free(ck);
-}
-
-GF_Clock *gf_clock_find(GF_List *Clocks, u16 clockID, u16 ES_ID)
-{
-	u32 i;
-	GF_Clock *tmp;
-	i=0;
-	while ((tmp = (GF_Clock *)gf_list_enum(Clocks, &i))) {
-		//first check the clock ID
-		if (tmp->clockID == clockID) return tmp;
-		//then check the ES ID
-		if (ES_ID && (tmp->clockID == ES_ID)) return tmp;
-	}
-	//no clocks found...
-	return NULL;
-}
-
-static GF_Clock *gf_ck_look_for_clock_dep(GF_Scene *scene, u16 clockID)
-{
-	u32 i, j;
-	GF_Channel *ch;
-	GF_ObjectManager *odm;
-
-	/*check in top OD*/
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &i))) {
-		if (ch->esd->ESID == clockID) return ch->clock;
-	}
-	/*check in sub ODs*/
-	j=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &j))) {
-		i=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-			if (ch->esd->ESID == clockID) return ch->clock;
-		}
-	}
-	return NULL;
-}
-
-/*remove clocks created due to out-of-order OCR dependencies*/
-static void gf_ck_resolve_clock_dep(GF_List *clocks, GF_Scene *scene, GF_Clock *ck, u16 Clock_ESID)
-{
-	u32 i, j;
-	GF_Clock *clock;
-	GF_Channel *ch;
-	GF_ObjectManager *odm;
-
-	/*check all channels - if any scene using a clock which ID == the clock_ESID then
-	this clock shall be removed*/
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &i))) {
-		if (ch->clock->clockID == Clock_ESID) {
-			if (scene->scene_codec && scene->scene_codec->ck == ch->clock) scene->scene_codec->ck = ck;
-			if (scene->od_codec && scene->od_codec->ck == ch->clock) scene->od_codec->ck = ck;
-#ifndef GPAC_MINIMAL_ODF
-			if (scene->root_od->oci_codec && scene->root_od->oci_codec->ck == ch->clock) scene->root_od->oci_codec->ck = ck;
-#endif
-			ch->clock = ck;
-			if (ch->esd) ch->esd->OCRESID = ck->clockID;
-		}
-	}
-	j=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &j))) {
-		i=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-			if (ch->clock->clockID == Clock_ESID) {
-				if (odm->codec && (odm->codec->ck==ch->clock)) odm->codec->ck = ck;
-#ifndef GPAC_MINIMAL_ODF
-				if (odm->oci_codec && (odm->oci_codec->ck==ch->clock)) odm->oci_codec->ck = ck;
-#endif
-				ch->clock = ck;
-				if (ch->esd) ch->esd->OCRESID = ck->clockID;
-			}
-		}
-	}
-	/*destroy clock*/
-	i=0;
-	while ((clock = (GF_Clock*)gf_list_enum(clocks, &i))) {
-		if (clock->clockID == Clock_ESID) {
-			gf_list_rem(clocks, i-1);
-			gf_clock_del(clock);
-			return;
-		}
-	}
-}
-
-GF_Clock *gf_clock_attach(GF_List *clocks, GF_Scene *scene, u16 clockID, u16 ES_ID, s32 hasOCR)
-{
-	Bool check_dep;
-	GF_Clock *tmp = gf_clock_find(clocks, clockID, ES_ID);
-	/*ck dep can only be solved if in the main service*/
-	check_dep = (scene->root_od->net_service && scene->root_od->net_service->Clocks==clocks) ? GF_TRUE : GF_FALSE;
-	/*this partly solves a->b->c*/
-	if (!tmp && check_dep) tmp = gf_ck_look_for_clock_dep(scene, clockID);
-	if (!tmp) {
-		tmp = NewClock(scene->root_od->term);
-		tmp->clockID = clockID;
-		gf_list_add(clocks, tmp);
-	} else {
-		if (tmp->clockID == ES_ID) tmp->clockID = clockID;
-		/*this finally solves a->b->c*/
-		if (check_dep && (tmp->clockID != ES_ID)) gf_ck_resolve_clock_dep(clocks, scene, tmp, ES_ID);
-	}
-	if (hasOCR >= 0) tmp->use_ocr = hasOCR;
-	return tmp;
-}
-
-void gf_clock_reset(GF_Clock *ck)
-{
-	ck->clock_init = 0;
-	ck->drift = 0;
-	ck->discontinuity_time = 0;
-	//do NOT reset buffering flag, because RESET scene called only
-	//for the stream owning the clock, and other streams may
-	//have signaled buffering on this clock
-	ck->init_time = 0;
-	ck->StartTime = 0;
-	ck->has_seen_eos = 0;
-	ck->media_time_at_init = 0;
-	ck->has_media_time_shift = 0;
-}
-
-void gf_clock_stop(GF_Clock *ck)
-{
-	ck->clock_init = 0;
-	ck->StartTime = 0;
-}
-
-void gf_clock_set_time(GF_Clock *ck, u32 TS)
-{
-	if (!ck->clock_init) {
-		ck->init_time = TS;
-		ck->clock_init = 1;
-		ck->broken_pcr = 0;
-		ck->drift = 0;
-		/*update starttime and pausetime even in pause mode*/
-		ck->PauseTime = ck->StartTime = gf_term_get_time(ck->term);
-	}
-}
-
-
-
-void gf_clock_pause(GF_Clock *ck)
-{
-	gf_mx_p(ck->mx);
-	if (!ck->Paused)
-		ck->PauseTime = gf_term_get_time(ck->term);
-	ck->Paused += 1;
-	gf_mx_v(ck->mx);
-}
-
-void gf_clock_resume(GF_Clock *ck)
-{
-	gf_mx_p(ck->mx);
-	assert(ck->Paused);
-	if (!ck->Paused) {
-		assert(!ck->Buffering);
-	}
-	ck->Paused -= 1;
-	if (!ck->Paused)
-		ck->StartTime += gf_term_get_time(ck->term) - ck->PauseTime;
-	gf_mx_v(ck->mx);
-}
-
-
-u32 gf_clock_real_time(GF_Clock *ck)
-{
-	u32 time;
-	assert(ck);
-	if (!ck->clock_init) return ck->StartTime;
-	time = ck->Paused > 0 ? ck->PauseTime : gf_term_get_time(ck->term);
-
-#ifdef GPAC_FIXED_POINT
-
-	if ((ck->speed < 0) && ((s32) ck->init_time < FIX2INT( (-ck->speed * 100) * (time - ck->StartTime)) / 100 ) ) {
-		time = 0;
-	} else {
-		time = ck->discontinuity_time + ck->init_time + (time - ck->StartTime) * FIX2INT(100*ck->speed) / 100;
-	}
-
-#else
-
-	if ((ck->speed < 0) && ((s32) ck->init_time < (-ck->speed) * (time - ck->StartTime))) {
-		time = 0;
-	} else {
-		//DO NOT CHANGE the position of cast float->u32, otherwise we have precision issues when ck->init_time
-		//is >= 0x40000000. We know for sure that ck->speed * (time - ck->StartTime) is positive
-		time = ck->discontinuity_time + ck->init_time + (u32) (ck->speed * (time - ck->StartTime) );
-	}
-
-#endif
-
-	return time;
-}
-
-GF_EXPORT
-u32 gf_clock_time(GF_Clock *ck)
-{
-	u32 time = gf_clock_real_time(ck);
-	if ((ck->drift>0) && (time < (u32) ck->drift)) return 0;
-	return time - ck->drift;
-}
-
-u32 gf_clock_media_time(GF_Clock *ck)
-{
-	u32 t;
-	if (!ck) return 0;
-	if (!ck->has_seen_eos && ck->last_TS_rendered) t = ck->last_TS_rendered;
-	else t = gf_clock_time(ck);
-	//if media time is not mapped, we consider that the timestamps are aligned with the media time
-	if (ck->has_media_time_shift) {
-		if (t>ck->init_time) t -= ck->init_time;
-		else t=0;
-
-		t += ck->media_time_at_init;
-	}
-	return t;
-}
-
-u32 gf_clock_elapsed_time(GF_Clock *ck)
-{
-	if (!ck || ck->Buffering || ck->Paused) return 0;
-	return gf_sys_clock() - ck->StartTime;
-}
-
-Bool gf_clock_is_started(GF_Clock *ck)
-{
-	if (!ck || ck->Buffering || ck->Paused) return 0;
-	return 1;
-}
-
-/*buffering scene protected by a mutex because it may be triggered by composition memory (audio or visual threads)*/
-void gf_clock_buffer_on(GF_Clock *ck)
-{
-	gf_mx_p(ck->mx);
-	if (!ck->Buffering) gf_clock_pause(ck);
-	ck->Buffering += 1;
-	gf_mx_v(ck->mx);
-}
-
-void gf_clock_buffer_off(GF_Clock *ck)
-{
-	gf_mx_p(ck->mx);
-	//assert(ck->Buffering);
-	if (ck->Buffering) {
-		ck->Buffering -= 1;
-		if (!ck->Buffering) gf_clock_resume(ck);
-	}
-	gf_mx_v(ck->mx);
-}
-
-
-void gf_clock_set_speed(GF_Clock *ck, Fixed speed)
-{
-	u32 time;
-	if (speed==ck->speed) return;
-	time = gf_term_get_time(ck->term);
-	/*adjust start time*/
-	ck->discontinuity_time = gf_clock_time(ck) - ck->init_time;
-	ck->PauseTime = ck->StartTime = time;
-	ck->speed = speed;
-}
-
-void gf_clock_adjust_drift(GF_Clock *ck, s32 ms_drift)
-{
-	if (ck) ck->drift = ms_drift;
-}
-
-
-/*handle clock discontinuity - for now we only reset timing of all received data and reinit the clock*/
-void gf_clock_discontinuity(GF_Clock *ck, GF_Scene *scene, Bool is_pcr_discontinuity)
-{
-	u32 i, j;
-	GF_Channel *ch;
-	GF_ObjectManager *odm;
-
-	/*check all channels and reset timing */
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &i))) {
-		if (ch->clock == ck) {
-			gf_es_reset_timing(ch, is_pcr_discontinuity);
-		}
-	}
-	j=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &j))) {
-		if (odm->state==GF_ODM_STATE_STOP)
-			continue;
-
-		i=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-			if (ch->clock == ck) {
-				gf_es_reset_timing(ch, is_pcr_discontinuity);
-
-				ch->CTS = ch->DTS = 0;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] Reinitializing timing for ES%d\n", ch->esd->ESID));
-
-				if (ch->odm->codec && ch->odm->codec->CB)
-					gf_cm_reset_timing(ch->odm->codec->CB);
-			}
-		}
-	}
-
-	gf_scene_reset_addons(scene);
-
-	if (ck->has_media_time_shift) {
-		u32 new_media_time = ck->media_time_at_init + gf_clock_time(ck) - ck->init_time;
-
-		gf_clock_reset(ck);
-
-		ck->has_media_time_shift = 1;
-		ck->media_time_at_init = new_media_time;
-	} else {
-		gf_clock_reset(ck);
-	}
-}

gpac-0.8.0.tar.gz/src/terminal/decoder.c Deleted

@@ -1,2328 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/constants.h>
-#include <gpac/crypt.h>
-#include "media_memory.h"
-#include "media_control.h"
-#include "input_sensor.h"
-
-GF_Err Codec_Load(GF_Codec *codec, GF_ESD *esd, u32 PL);
-GF_Err gf_codec_process_raw_media_pull(GF_Codec *codec, u32 TimeAvailable);
-
-GF_Codec *gf_codec_new(GF_ObjectManager *odm, GF_ESD *base_layer, s32 PL, GF_Err *e)
-{
-	GF_Codec *tmp;
-
-	//this is an addon, we must check if it's scalable stream or not ...
-	//if so, do not create any new codec
-	if (odm->parentscene && odm->parentscene->root_od->addon) {
-		switch (base_layer->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_VIDEO_LHVC:
-		case GPAC_OTI_VIDEO_SVC:
-			odm->scalable_addon = 1;
-			odm->parentscene->root_od->addon->addon_type = GF_ADDON_TYPE_SCALABLE;
-			*e = GF_OK;
-			//fixme - we need a way to signal dependencies accross services!!
-			base_layer->dependsOnESID = 0xFFFF;
-			return NULL;
-		default:
-			if (odm->parentscene->root_od->addon->addon_type == GF_ADDON_TYPE_SPLICED) {
-				*e = GF_OK;
-				odm->splice_addon_mtype = base_layer->decoderConfig->streamType;
-				return NULL;
-			}
-			break;
-		}
-	}
-
-	GF_SAFEALLOC(tmp, GF_Codec);
-	if (! tmp) {
-		*e = GF_OUT_OF_MEM;
-		return NULL;
-	}
-	tmp->odm = odm;
-
-	if (PL<0) PL = 0xFF;
-	*e = Codec_Load(tmp, base_layer, PL);
-
-	if (*e) {
-		if (odm->term->bench_mode==2) {
-			*e = GF_OK;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[Codec] ODM%d ES%d: Cannot find decoder for stream type %s - ignoring as running systems bench mode\n", odm->OD->objectDescriptorID, base_layer->ESID, gf_esd_get_textual_description(base_layer) ));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[Codec] ODM%d ES%d: Cannot find decoder for stream type %s\n", odm->OD->objectDescriptorID, base_layer->ESID, gf_esd_get_textual_description(base_layer) ));
-			gf_free(tmp);
-			return NULL;
-		}
-	}
-	/*remember codec type*/
-	tmp->type = base_layer->decoderConfig->streamType;
-	tmp->oti = base_layer->decoderConfig->objectTypeIndication;
-	tmp->inChannels = gf_list_new();
-	tmp->Status = GF_ESM_CODEC_STOP;
-
-	if (tmp->type==GF_STREAM_PRIVATE_MEDIA) tmp->type = GF_STREAM_VISUAL;
-
-	if (tmp->type==GF_STREAM_VISUAL) {
-		GF_CodecCapability cap;
-		cap.CapCode = GF_CODEC_DISPLAY_BPP;
-		cap.cap.valueInt = odm->term->compositor->video_out->max_screen_bpp;
-		gf_codec_set_capability(tmp, cap);
-	}
-	tmp->Priority = base_layer->streamPriority ? base_layer->streamPriority : 1;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[Codec] Found decoder %s for stream type %s\n", tmp->decio ? tmp->decio->module_name : "RAW", gf_esd_get_textual_description(base_layer) ));
-	return tmp;
-}
-
-GF_Codec *gf_codec_use_codec(GF_Codec *codec, GF_ObjectManager *odm)
-{
-	GF_Codec *tmp;
-	if (!codec->decio) return NULL;
-	GF_SAFEALLOC(tmp, GF_Codec);
-	if (!tmp) return NULL;
-	tmp->type = codec->type;
-	tmp->inChannels = gf_list_new();
-	tmp->Status = GF_ESM_CODEC_STOP;
-	tmp->odm = odm;
-	tmp->flags = codec->flags | GF_ESM_CODEC_IS_USE;
-	tmp->decio = codec->decio;
-	tmp->process = codec->process;
-	return tmp;
-}
-
-static void codec_check_frame_output_mode(GF_Codec *codec)
-{
-	GF_CodecCapability cap;
-	codec->direct_frame_output = GF_FALSE;
-	codec->direct_vout = GF_FALSE;
-
-	if (codec->type == GF_STREAM_VISUAL) {
-		cap.CapCode = GF_CODEC_FRAME_OUTPUT;
-		gf_codec_get_capability(codec, &cap);
-		if (cap.cap.valueBool) {
-			cap.CapCode = GF_CODEC_FRAME_OUTPUT;
-			cap.cap.valueInt = gf_sc_use_3d(codec->odm->term->compositor) ? 2 : 1;
-			if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputFrame != NULL))
-				codec->direct_frame_output = GF_TRUE;
-		}
-		if (!codec->direct_frame_output) {
-			//this works but we need at least double buffering of textures on the GPU which we don't have now
-			if ( gf_sc_use_raw_texture(codec->odm->term->compositor)) {
-				cap.CapCode = GF_CODEC_RAW_MEMORY;
-				gf_codec_get_capability(codec, &cap);
-				if (cap.cap.valueBool) {
-					cap.CapCode = GF_CODEC_RAW_MEMORY;
-					if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputBuffer != NULL))
-						codec->direct_vout = GF_TRUE;
-				}
-			}
-		}
-	}
-}
-
-GF_Err gf_codec_add_channel(GF_Codec *codec, GF_Channel *ch)
-{
-	GF_Err e;
-	Bool config_decio = GF_FALSE;
-	GF_NetworkCommand com;
-	GF_Channel *a_ch;
-	u32 CUsize, i;
-	GF_CodecCapability cap;
-	u32 min, max;
-
-	if (!ch || !ch->esd) return GF_BAD_PARAM;
-
-	/*only for valid codecs (eg not OCR)*/
-	if (codec->decio) config_decio = GF_TRUE;
-	else if (codec->odm->term->bench_mode==2) {
-		if (codec->type != GF_STREAM_OCR)
-			config_decio = GF_TRUE;
-	}
-	
-	if (config_decio) {
-		com.get_dsi.dsi = NULL;
-		if (ch->esd->decoderConfig && ch->esd->decoderConfig->upstream) codec->flags |= GF_ESM_CODEC_HAS_UPSTREAM;
-		/*For objects declared in OD stream, override with network DSI if any*/
-		if (ch->service && ch->odm && !(ch->odm->flags & GF_ODM_NOT_IN_OD_STREAM) ) {
-			com.command_type = GF_NET_CHAN_GET_DSI;
-			com.base.on_channel = ch;
-			e = gf_term_service_command(ch->service, &com);
-			if (!e && com.get_dsi.dsi) {
-				if (ch->esd->decoderConfig->decoderSpecificInfo->data) gf_free(ch->esd->decoderConfig->decoderSpecificInfo->data);
-				ch->esd->decoderConfig->decoderSpecificInfo->data = com.get_dsi.dsi;
-				ch->esd->decoderConfig->decoderSpecificInfo->dataLength = com.get_dsi.dsi_len;
-			}
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[Codec] Attaching stream %d to codec %s\n", ch->esd->ESID, codec->decio->module_name));
-
-		codec_check_frame_output_mode(codec);
-
-		if (codec->odm->term->bench_mode==2) {
-			e = GF_OK;
-		} else {
-			Bool force_annex_b = GF_FALSE;
-			GF_NetworkCommand com;
-			/*lock the channel before setup in case we are using direct_decode */
-			gf_mx_p(ch->mx);
-			ch->esd->service_url = (ch->odm && ch->odm->net_service) ? ch->odm->net_service->url : NULL;
-
-			cap.CapCode = GF_CODEC_FORCE_ANNEXB;
-			gf_codec_get_capability(codec, &cap);
-			if (cap.cap.valueBool) {
-				force_annex_b = GF_TRUE;
-			}
-
-			if (force_annex_b && ch->esd->decoderConfig->decoderSpecificInfo) {
-				gf_free(ch->esd->decoderConfig->decoderSpecificInfo->data);
-				ch->esd->decoderConfig->decoderSpecificInfo->data = NULL;
-				ch->esd->decoderConfig->decoderSpecificInfo->dataLength=0;
-			}
-
-			e = codec->decio->AttachStream(codec->decio, ch->esd);
-			while (e == GF_PROFILE_NOT_SUPPORTED) {
-				e = gf_codec_change_decoder(codec, ch->esd, GF_TRUE);
-				if (e) break;
-				codec_check_frame_output_mode(codec);
-				e = codec->decio->AttachStream(codec->decio, ch->esd);
-			}
-
-			if (force_annex_b) {
-				memset(&com, 0, sizeof(GF_NetworkCommand));
-				com.command_type = GF_NET_CHAN_NALU_MODE;
-				com.nalu_mode.extract_mode = 1;
-				com.base.on_channel = ch;
-				gf_term_service_command(ch->service, &com);
-			}
-
-			gf_mx_v(ch->mx);
-		}
-
-		if (ch->esd->decoderConfig && ch->esd->decoderConfig->rvc_config) {
-			gf_odf_desc_del((GF_Descriptor *)ch->esd->decoderConfig->rvc_config);
-			ch->esd->decoderConfig->rvc_config = NULL;
-		}
-
-		if (e) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[Codec] Attach Stream failed %s\n", gf_error_to_string(e) ));
-			return e;
-		}
-
-		/*ask codec for desired output capacity - note this may be 0 if stream is not yet configured*/
-		cap.CapCode = GF_CODEC_OUTPUT_SIZE;
-		gf_codec_get_capability(codec, &cap);
-		if (codec->CB && (cap.cap.valueInt != codec->CB->UnitSize)) {
-			gf_cm_del(codec->CB);
-			codec->CB = NULL;
-		}
-		CUsize = cap.cap.valueInt;
-
-		/*get desired amount of units and minimal fullness (used for scheduling)*/
-		switch(codec->type) {
-		case GF_STREAM_VISUAL:
-		case GF_STREAM_AUDIO:
-			cap.CapCode = GF_CODEC_BUFFER_MIN;
-			cap.cap.valueInt = 1;
-			gf_codec_get_capability(codec, &cap);
-			min = cap.cap.valueInt;
-			cap.CapCode = GF_CODEC_BUFFER_MAX;
-			cap.cap.valueInt = 1;
-			gf_codec_get_capability(codec, &cap);
-			max = cap.cap.valueInt;
-			//this may happen in sysetm bench mode since we dont configure codecs
-			if (!max) max = 1;
-			break;
-		case GF_STREAM_ND_SUBPIC:
-			max = 1;
-			min = 0;
-			break;
-		default:
-			min = max = 0;
-			break;
-		}
-		if ((codec->type==GF_STREAM_AUDIO) && (max<2)) max = 2;
-
-		/*setup CB*/
-		if (!codec->CB && max) {
-			Bool no_alloc = GF_FALSE;
-			if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
-				max = 1;
-				/*create a semaphore in non-notified stage*/
-				codec->odm->raw_frame_sema = gf_sema_new(1, 0);
-				no_alloc = 1;
-			}
-			else if (codec->direct_frame_output) {
-				no_alloc = 1;
-			}
-			else if (codec->direct_vout) {
-				max = 1;
-				no_alloc = 1;
-			}
-			//very low latency
-			else if (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) {
-				max = (codec->type==GF_STREAM_AUDIO) ? 4 : 2;
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODM] Creating composition buffer for codec %s - %d units %d bytes each\n", codec->decio->module_name, max, CUsize));
-
-			codec->CB = gf_cm_new(CUsize, max, no_alloc);
-			codec->CB->Min = min;
-			codec->CB->odm = codec->odm;
-		}
-
-		if (codec->CB) {
-			/*check re-ordering - set by default on all codecs*/
-			codec->is_reordering = 1;
-			cap.CapCode = GF_CODEC_REORDER;
-			if (gf_codec_get_capability(codec, &cap) == GF_OK)
-				codec->is_reordering = cap.cap.valueInt;
-
-			codec->trusted_cts = 0;
-			cap.CapCode = GF_CODEC_TRUSTED_CTS;
-			if (gf_codec_get_capability(codec, &cap) == GF_OK)
-				codec->trusted_cts = cap.cap.valueInt;
-
-		}
-
-		if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
-			ch->is_raw_channel = 1;
-		}
-
-		/*setup net channel config*/
-		if (ch->service) {
-			memset(&com, 0, sizeof(GF_NetworkCommand));
-			com.command_type = GF_NET_CHAN_CONFIG;
-			com.base.on_channel = ch;
-
-			com.cfg.priority = ch->esd->streamPriority;
-			assert( ch->clock );
-			com.cfg.sync_id = ch->clock->clockID;
-			memcpy(&com.cfg.sl_config, ch->esd->slConfig, sizeof(GF_SLConfig));
-			/*get the frame duration if audio (used by some network stack)*/
-			if (ch->odm->codec && (ch->odm->codec->type==GF_STREAM_AUDIO) ) {
-				cap.CapCode = GF_CODEC_SAMPLERATE;
-				gf_codec_get_capability(ch->odm->codec, &cap);
-				com.cfg.sample_rate = cap.cap.valueInt;
-				cap.CapCode = GF_CODEC_CU_DURATION;
-				gf_codec_get_capability(ch->odm->codec, &cap);
-				com.cfg.frame_duration = cap.cap.valueInt;
-			}
-			gf_term_service_command(ch->service, &com);
-
-			ch->carousel_type = GF_ESM_CAROUSEL_NONE;
-			if (com.cfg.use_m2ts_sections) {
-				ch->carousel_type = GF_ESM_CAROUSEL_MPEG2;
-			} else {
-				switch (ch->esd->decoderConfig->streamType) {
-				case GF_STREAM_OD:
-				case GF_STREAM_SCENE:
-					ch->carousel_type = ch->esd->slConfig->AUSeqNumLength ? GF_ESM_CAROUSEL_MPEG4 : GF_ESM_CAROUSEL_NONE;
-					break;
-				}
-			}
-
-		}
-	} else if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
-		cap.CapCode = GF_CODEC_OUTPUT_SIZE;
-		gf_codec_get_capability(codec, &cap);
-		if (codec->CB && (cap.cap.valueInt != codec->CB->UnitSize)) {
-			gf_cm_del(codec->CB);
-			codec->CB = NULL;
-		}
-		CUsize = cap.cap.valueInt;
-		/*create a semaphore in non-notified stage*/
-		codec->odm->raw_frame_sema = gf_sema_new(1, 0);
-
-		codec->CB = gf_cm_new(CUsize, 1, 1);
-		codec->CB->Min = 0;
-		codec->CB->odm = codec->odm;
-		ch->is_raw_channel = 1;
-		if (gf_es_owns_clock(ch))
-			ch->is_raw_channel = 2;
-
-		if (ch->is_pulling) {
-			codec->process = gf_codec_process_raw_media_pull;
-		}
-	}
-
-	/*assign the first base layer as the codec clock by default, or current channel clock if no clock set
-	Also assign codec priority here*/
-	if (!ch->esd->dependsOnESID || !codec->ck) {
-		codec->ck = ch->clock;
-		/*insert base layer first - note we are sure this is a stream of the same type
-		as the codec (other streams - OCI, MPEG7, MPEGJ - are not added that way)*/
-		return gf_list_insert(codec->inChannels, ch, 0);
-	}
-	else {
-		/*make sure all channels are in order*/
-		i=0;
-		while ((a_ch = (GF_Channel*)gf_list_enum(codec->inChannels, &i))) {
-			if (ch->esd->dependsOnESID == a_ch->esd->ESID) {
-				return gf_list_insert(codec->inChannels, ch, i);
-			}
-			if (a_ch->esd->dependsOnESID == ch->esd->ESID) {
-				return gf_list_insert(codec->inChannels, ch, i-1);
-			}
-		}
-		/*by default append*/
-		return gf_list_add(codec->inChannels, ch);
-	}
-}
-
-Bool gf_codec_is_scene_or_image(GF_Codec *codec)
-{
-	if (!codec) return GF_TRUE;
-	if (!codec->CB) return GF_TRUE;
-	if (codec->CB->Capacity>1 || codec->CB->no_allocation) return GF_FALSE;
-	return GF_TRUE;
-}
-
-Bool gf_codec_remove_channel(GF_Codec *codec, struct _es_channel *ch)
-{
-	s32 i;
-	assert( codec );
-	assert( codec->inChannels);
-	assert(ch);
-	i = gf_list_find(codec->inChannels, ch);
-	if (i>=0) {
-		if (codec->decio) {
-			if (codec->odm->term->bench_mode!=2) {
-				codec->decio->DetachStream(codec->decio, ch->esd->ESID);
-			}
-		}
-		gf_list_rem(codec->inChannels, (u32) i);
-		return 1;
-	}
-	return 0;
-}
-
-
-static void codec_update_stats(GF_Codec *codec, u32 dataLength, u64 dec_time, u32 DTS, Bool is_rap)
-{
-	codec->total_dec_time += dec_time;
-	codec->last_frame_time = gf_sys_clock();
-	if (!codec->nb_dec_frames) {
-		codec->first_frame_time = codec->last_frame_time;
-		codec->min_frame_dur = (u32) -1;
-	}
-
-	codec->nb_dec_frames++;
-	if (is_rap) {
-		codec->nb_iframes ++;
-		if (dec_time>codec->max_iframes_time) codec->max_iframes_time = (u32) dec_time;
-		codec->total_iframes_time += dec_time;
-	}
-
-	if (dec_time>codec->max_dec_time) codec->max_dec_time = (u32) dec_time;
-
-
-	if (DTS - codec->last_unit_dts < codec->min_frame_dur) {
-		//might happen with some AVI with ffmpeg ...
-		if (DTS > codec->last_unit_dts)
-			codec->min_frame_dur = DTS - codec->last_unit_dts;
-	}
-
-	if (dataLength) {
-		if (!codec->cur_bit_size || (codec->ck->speed > 0 ? codec->stat_start > DTS : codec->stat_start < DTS)) {
-			codec->stat_start = DTS;
-			codec->cur_bit_size = 8*dataLength;
-		} else {
-			if (codec->last_stat_start + 2000 <= DTS) {
-				codec->avg_bit_rate = (u32) (codec->cur_bit_size * (1000.0 / (DTS-codec->last_stat_start) ) );
-				if (codec->avg_bit_rate > codec->max_bit_rate) codec->max_bit_rate = codec->avg_bit_rate;
-				codec->last_stat_start = DTS;
-				codec->cur_bit_size = 0;
-			}
-			codec->cur_bit_size += 8*dataLength;
-		}
-	}
-}
-
-static void MediaDecoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU, Bool *prev_channel_unreliable)
-{
-	GF_Channel *ch;
-	GF_DBUnit *AU;
-	GF_List *src_channels = codec->inChannels;
-	GF_ObjectManager *current_odm = codec->odm;
-	u32 count, curCTS, i, stream_state, now=0;
-	Bool scalable_check = 0;
-	Bool splice_check = 0;
-	s32 cts_diff;
-	Bool no_au_in_enhancement = GF_FALSE;
-	GF_Channel *spliced_channel = NULL;
-	GF_DBUnit *spliced_AU = NULL;
-	GF_AddonMedia *addon=NULL;
-	*nextAU = NULL;
-	*activeChannel = NULL;
-	*prev_channel_unreliable = GF_FALSE;
-	curCTS = 0;
-
-rebrowse_object:
-
-	count = gf_list_count(src_channels);
-	if (!count) return;
-
-	/*browse from base to top layer*/
-	for (i=0; i<count; i++) {
-		ch = (GF_Channel*)gf_list_get(src_channels, i);
-
-		if ((codec->type==GF_STREAM_OCR) && ch->IsClockInit) {
-			/*check duration - we assume that scalable OCR streams are just pure nonsense...*/
-			if (ch->is_pulling && codec->odm->duration) {
-				if (gf_clock_time(codec->ck) > codec->odm->duration)
-					gf_es_on_eos(ch);
-			}
-			return;
-		}
-refetch_AU:
-		stream_state = ch->stream_state;
-		AU = gf_es_get_au(ch);
-		if (!AU) {
-			if (scalable_check==1) {
-				if (*nextAU && ((*nextAU)->flags & GF_DB_AU_REAGGREGATED)) {
-					scalable_check=2;
-				} else if (*nextAU) {
-					no_au_in_enhancement = GF_TRUE;
-				}
-			}
-			if (! (*activeChannel)) *activeChannel = ch;
-			/*we have received the first AU of enhencement layer, wait for a moment for aggregation
-			if (ch->AU_buffer_first && (ch->esd->dependsOnESID == (*activeChannel)->esd->ESID)) {
-				*nextAU = NULL;
-				return;
-			}*/
-			continue;
-		}
-
-		cts_diff = AU->CTS;
-		cts_diff -= curCTS;
-		if (cts_diff < 0) cts_diff = -cts_diff;
-
-		/*aggregate all AUs with the same timestamp on the base AU and delete the upper layers)*/
-		if (! *nextAU) {
-			if (ch->esd->dependsOnESID) {
-				//gf_es_drop_au(ch);
-				continue;
-			}
-			//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %u (size %d) selected as first layer (CTS %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->dataLength, AU->CTS));
-			*nextAU = AU;
-			*activeChannel = ch;
-			curCTS = AU->CTS;
-			now = gf_clock_time(ch->clock);
-		}
-				
-		else if (codec->hybrid_layered_coded) {
-			if (AU->DTS < (*nextAU)->DTS) {
-				if (AU->DTS>=codec->last_unit_dts) {
-					*nextAU = AU;
-					*activeChannel = ch;
-					curCTS = AU->CTS;
-					now = gf_clock_time(ch->clock);
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d %s AU DTS %u but base DTS %u: frame too late - re-fetch channel\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, (*nextAU)->DTS));
-					gf_es_drop_au(ch);
-					//restore stream state in case we got a RAP this time but we discard the AU, we need to wait again for the next RAP with the right timing
-					ch->stream_state = stream_state;
-
-					goto refetch_AU;
-				}
-			}
-		}
-
-		//we allow for +/- 1ms drift due to timestamp rounding when converting to milliseconds units
-		else if (cts_diff<=1) {
-			GF_DBUnit *baseAU = *nextAU;
-			assert(baseAU);
-			if ((*activeChannel)->is_pulling && !(baseAU->flags & GF_DB_AU_REAGGREGATED)) {
-				char *base_au = baseAU->data;
-				baseAU->data = gf_malloc(baseAU->dataLength + AU->dataLength);
-				memcpy(baseAU->data, base_au, baseAU->dataLength);
-				memcpy(baseAU->data + baseAU->dataLength , AU->data, AU->dataLength);
-			} else {
-				baseAU->data = gf_realloc(baseAU->data, baseAU->dataLength + AU->dataLength);
-				memcpy(baseAU->data + baseAU->dataLength , AU->data, AU->dataLength);
-			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %u CTS %u size %d reaggregated on base layer %d - base DTS %d size %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS, AU->dataLength, (*activeChannel)->esd->ESID, baseAU->DTS, baseAU->dataLength));
-
-			baseAU->dataLength += AU->dataLength;
-			gf_es_drop_au(ch);
-			ch->first_au_fetched = 1;
-			scalable_check = 2;
-			(*nextAU)->flags |= GF_DB_AU_REAGGREGATED;
-			no_au_in_enhancement = GF_FALSE;
-		}
-		//not the same TS for base and enhancement - either temporal scalability is used or we had a frame loss
-		else {
-			//we cannot rely on DTS - to check if this is temporal scalability, check next CTS
-			if (ch->recompute_dts) {
-				Bool au_match_base_ts = GF_FALSE;
-				GF_DBUnit *next_unit = AU->next;
-				while (next_unit) {
-					//SNR/spatial scalable found later: we need to start from the enhancement layer
-					if (next_unit->CTS==curCTS) {
-						au_match_base_ts = GF_TRUE;
-						break;
-					}
-					next_unit = next_unit->next;
-				}
-				//no AU found with the same CTS as the current base, we likely had a drop in the enhancement - aggregate from base
-				if (!au_match_base_ts) {
-				}
-				// AU found with the same CTS as the current base, we either had a drop on the base or some temporal scalability - aggregate from current channel.
-				else {
-					//we cannot tell whether this is a loss or temporal scalable, don't attempt to discard the AU
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU CTS %d doesn't have the same CTS as the base (%d)- selected as first layer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->CTS, (*nextAU)->CTS));
-					*nextAU = AU;
-					*activeChannel = ch;
-					curCTS = AU->CTS;
-				}
-			}
-			//we can rely on DTS - if DTS is earlier on the enhencement, this is a loss or temporal scalability
-			else if (AU->DTS < (*nextAU)->DTS) {
-				//Sample with the same DTS of this AU has been decoded. This is a loss, we need to drop it and re-fetch this channel
-				if ((AU->DTS <= codec->last_unit_dts)
-				        //we also prevent detecting temporal scalability until at least one frame from the base has been decoded
-				        || !codec->first_frame_processed) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d %s AU DTS %u but base DTS %u: frame too late - re-fetch channel\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, (*nextAU)->DTS));
-					gf_es_drop_au(ch);
-					//restore stream state in case we got a RAP this time but we discard the AU, we need to wait again for the next RAP with the right timing
-					ch->stream_state = stream_state;
-
-					goto refetch_AU;
-				}
-				//This is a temporal scalability so we re-aggregate from the enhencement
-				else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d (%s) AU DTS %u selected as first layer (CTS %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS));
-					*nextAU = AU;
-					*activeChannel = ch;
-					curCTS = AU->CTS;
-				}
-			} else {
-				if ((*nextAU)->flags & GF_DB_AU_REAGGREGATED) {
-					scalable_check = 2;
-				} else {
-					if (codec->last_unit_dts && (AU->DTS<codec->last_unit_dts)) {
-						gf_es_drop_au(ch);
-						ch->stream_state = 1;
-						goto refetch_AU;
-					}
-					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("AU in enhancement layer DTS %u - CTS %d too early for this AU\n", AU->DTS, AU->CTS));
-				}
-			}
-		}
-	}
-	//scalable addon, browse channels in scalable object
-	if (current_odm->upper_layer_odm) {
-		GF_CodecCapability cap;
-		Bool check_addon = GF_TRUE;
-
-		if (*nextAU) {
-			GF_AddonMedia *addon;
-			/*lock net in case the addon gets destroyed*/
-			gf_term_lock_net(current_odm->term, GF_TRUE);
-			addon = current_odm->upper_layer_odm ? current_odm->upper_layer_odm->parentscene->root_od->addon : NULL;
-			gf_term_lock_net(current_odm->term, GF_FALSE);
-
-			if (!addon) {
-				check_addon = GF_FALSE;
-				current_odm->upper_layer_odm = NULL;
-				//switch off enhancement layer
-				if (codec->coding_config_changed) {
-					cap.CapCode = GF_CODEC_MEDIA_LAYER_DETACH;
-					cap.cap.valueInt = 0;
-					gf_codec_set_capability(codec, cap);
-				}
-			} else {
-
-				if (gf_scene_check_addon_restart(addon, (*nextAU)->CTS, (*nextAU)->DTS)) {
-					//due to some issues in openhevc we reset the decoder when we restart the scalable addon
-					GF_CodecCapability cap;
-					cap.CapCode = GF_CODEC_WAIT_RAP;
-					gf_codec_set_capability(codec, cap);
-				}
-
-				assert(addon->addon_type==GF_ADDON_TYPE_SCALABLE);
-				if (addon->is_splicing) {
-					//addon start not yet reached
-					if (addon->splice_start > (*nextAU)->CTS ) check_addon = GF_FALSE;
-					//addon end reached
-					if ((addon->is_over==2) || ((addon->splice_end>=0) && (addon->splice_end <= (*nextAU)->CTS) ) ) {
-						check_addon = GF_FALSE;
-						//switch off enhancement layer
-						if (codec->coding_config_changed) {
-							cap.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
-							cap.cap.valueInt = 0;
-							gf_codec_set_capability(codec, cap);
-						}
-
-						gf_list_del_item(codec->odm->parentscene->declared_addons, addon);
-						gf_scene_reset_addon(addon, GF_TRUE);
-						current_odm->upper_layer_odm = NULL;
-						*prev_channel_unreliable = GF_TRUE;
-					}
-					//switch on enhancement layer
-					if (check_addon && !codec->coding_config_changed) {
-						codec->coding_config_changed = GF_TRUE;
-						cap.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
-						cap.cap.valueInt = 1;
-						gf_codec_set_capability(codec, cap);
-					}
-				}
-			}
-		}
-		if (check_addon) {
-			current_odm = current_odm->upper_layer_odm;
-			src_channels = current_odm->channels;
-			scalable_check = 1;
-			goto rebrowse_object;
-		}
-	}
-
-	if (*nextAU && no_au_in_enhancement ) {
-		//do we have time to wait for the enhancement to be filled ?
-		if (now < (*nextAU)->DTS) {
-			//GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Enhancement layer not ready for this AU (DTS %u) at OTB %d- decoding postponed\n", codec->decio->module_name, (*nextAU)->DTS, now));
-			*nextAU = NULL;
-			*activeChannel = NULL;
-			return;
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] Warning: could not find enhancement layer for this AU (DTS %u) at OTB %d - decoding only base\n", codec->decio->module_name, (*nextAU)->DTS, now));
-	}
-
-	if (!splice_check && *nextAU && codec->odm->parentscene->has_splicing_addons) {
-		Bool check_coding_config = GF_FALSE;
-		count = gf_list_count(codec->odm->parentscene->declared_addons);
-		for (i=0; i<count; i++) {
-			GF_AddonMedia *an_addon = gf_list_get(codec->odm->parentscene->declared_addons, i);
-			if (an_addon->addon_type!=GF_ADDON_TYPE_SPLICED) continue;
-			if (an_addon->splice_start<0) continue;
-			if (an_addon->splice_start > (*nextAU)->CTS ) continue;
-			//addon end reached
-			if ((an_addon->is_over==2) ||
-				((an_addon->splice_end>=0) && an_addon->splice_end  <= (*nextAU)->CTS )
-			) {
-				if (codec->in_splice) {
-					assert(an_addon->nb_splicing);
-					an_addon->nb_splicing --;
-					codec->in_splice = GF_FALSE;
-					check_coding_config = codec->coding_config_changed;
-				}
-				if (!an_addon->nb_splicing) {
-					gf_scene_reset_addon(an_addon, GF_TRUE);
-					gf_list_rem(codec->odm->parentscene->declared_addons, i);
-					i--;
-					count--;
-					*prev_channel_unreliable = GF_TRUE;
-				}
-				continue;
-			}
-
-			addon = an_addon;
-			break;
-		}
-		if (!addon && check_coding_config) {
-			codec->coding_config_changed = GF_FALSE;
-			gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
-		}
-		//we found our addon, browse for same codec
-		if (addon && addon->root_od->subscene) {
-			count = gf_list_count(addon->root_od->subscene->resources);
-			for (i=0; i<count; i++) {
-				GF_ObjectManager *an_odm = gf_list_get(addon->root_od->subscene->resources, i);
-				if (an_odm->splice_addon_mtype == codec->type) {
-					spliced_channel = *activeChannel;
-					spliced_AU = *nextAU;
-					*activeChannel = NULL;
-					*nextAU = NULL;
-					current_odm = an_odm;
-					src_channels = an_odm->channels;
-					splice_check = 1;
-					goto rebrowse_object;
-				}
-			}
-		}
-	}
-	if (splice_check) {
-		Bool is_over = *nextAU ? 0 : addon->is_over;
-		if (!is_over) {
-			//nextAU might be NULL if no RAP yet arrived on spliced channel
-			if (*nextAU && spliced_AU && spliced_AU->CTS <= (*nextAU)->CTS) {
-				gf_es_drop_au(spliced_channel);
-			}
-
-			if (!codec->in_splice) {
-				GF_DefaultDescriptor *dsi1, *dsi2;
-				dsi1 = spliced_channel->esd->decoderConfig->decoderSpecificInfo;
-				dsi2 = (*activeChannel)->esd->decoderConfig->decoderSpecificInfo;
-				if (!codec->coding_config_changed
-				&& (
-				(spliced_channel->esd->decoderConfig->objectTypeIndication != (*activeChannel)->esd->decoderConfig->objectTypeIndication)
-				|| (!dsi1 || ! dsi2 || (dsi1->dataLength != dsi2->dataLength)
-
-				|| memcmp(dsi1->data, dsi2->data, dsi1->dataLength)	)
-				)
-				) {
-
-					gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
-					codec->coding_config_changed = GF_TRUE;
-				}
-				codec->in_splice = GF_TRUE;
-				addon->nb_splicing++;
-			}
-		} else {
-			if (addon->is_over) addon->is_over = 2;
-			*activeChannel = spliced_channel;
-			*nextAU = spliced_AU;
-			if (codec->coding_config_changed) {
-				gf_codec_change_decoder(codec, (*activeChannel)->esd, GF_FALSE);
-				codec->coding_config_changed = GF_FALSE;
-			}
-		}
-	}
-
-	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
-		u32 diff = 0;
-
-		//if DTS is signalled, used min DTS diff to compute AU duration
-		if ((*activeChannel)->esd->slConfig->no_dts_signaling==GF_FALSE) {
-			u32 DTS = (*nextAU)->DTS;
-			diff = (DTS > codec-> last_unit_dts) ? (DTS - codec->last_unit_dts) : (codec->last_unit_dts - DTS);
-		} else {
-			//otherwise use CTS diff to compute AU duration
-			u32 prev_ts_diff;
-			u32 CTS = (*nextAU)->CTS;
-			if (codec->recomputed_cts && (codec->recomputed_cts > (*nextAU)->CTS)) {
-				diff = codec->recomputed_cts - CTS;
-				//happens when AU duration not yet initialized
-				if (diff<2) diff=0;
-			}
-			prev_ts_diff = (CTS > codec-> last_unit_cts) ? (CTS - codec->last_unit_cts) : (codec->last_unit_cts - CTS);
-			if (!diff) diff = prev_ts_diff;
-			else if (prev_ts_diff && (prev_ts_diff < diff) ) diff = prev_ts_diff;
-		}
-		if (!codec->min_au_duration || (diff < codec->min_au_duration))
-			codec->min_au_duration = diff;
-
-		if ((*activeChannel)->esd->slConfig->no_dts_signaling==GF_FALSE) {
-			/*FIXME - we're breaking sync (couple of frames delay)*/
-			(*nextAU)->CTS = (*nextAU)->DTS;
-		}
-	}
-
-}
-
-/*scalable browsing of input channels: find the AU with the lowest DTS on all input channels*/
-static void Decoder_GetNextAU(GF_Codec *codec, GF_Channel **activeChannel, GF_DBUnit **nextAU)
-{
-	GF_Channel *ch;
-	GF_DBUnit *AU;
-	u32 count, minDTS, i;
-	count = gf_list_count(codec->inChannels);
-	*nextAU = NULL;
-	*activeChannel = NULL;
-
-	if (!count) return;
-
-	minDTS = 0;
-	/*reverse browsing to make sure we fill enhancement before base layer*/
-	for (i=count; i>0; i--) {
-		ch = (GF_Channel*)gf_list_get(codec->inChannels, i-1);
-
-		if ((codec->type==GF_STREAM_OCR) && ch->IsClockInit) {
-			/*check duration - we assume that scalable OCR streams are just pure nonsense...*/
-			if (ch->is_pulling && codec->odm->duration) {
-				if (gf_clock_time(codec->ck) > codec->odm->duration)
-					gf_es_on_eos(ch);
-			}
-			return;
-		}
-
-		AU = gf_es_get_au(ch);
-		if (!AU) {
-			if (! (*activeChannel)) *activeChannel = ch;
-			continue;
-		}
-
-		/*we use <= to make sure we first fetch data on base layer if same
-		DTS (which is possible in spatial scalability)*/
-		if (!minDTS || (AU->DTS == minDTS)) {
-			minDTS = AU->DTS;
-			*activeChannel = ch;
-			*nextAU = AU;
-		}
-	}
-}
-
-
-static GF_Err SystemCodec_Process(GF_Codec *codec, u32 TimeAvailable)
-{
-	GF_DBUnit *AU;
-	GF_Channel *ch;
-	u32 obj_time, mm_level, au_time, cts;
-	u64 now;
-	GF_Scene *scene_locked;
-	Bool check_next_unit = GF_FALSE;
-	GF_SceneDecoder *sdec = (GF_SceneDecoder *)codec->decio;
-	GF_Err e = GF_OK;
-
-	scene_locked = NULL;
-
-	/*for resync, if needed - the logic behind this is that there is no composition memory on sytems codecs so
-	"frame dropping" is done by preventing the compositor from redrawing after an update and decoding following AU
-	so that the compositor is always woken up once all late systems AUs are decoded. This flag is overriden when
-	seeking*/
-	if ( (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) || (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) )
-		check_next_unit = GF_TRUE;
-
-check_unit:
-
-	/*muting systems codec means we don't decode until mute is off - likely there will be visible however
-	there is no other way to decode system AUs without modifying the content, which is what mute is about on visual...*/
-	if (codec->Muted) goto exit;
-
-	/*fetch next AU in DTS order for this codec*/
-	Decoder_GetNextAU(codec, &ch, &AU);
-
-	/*no active channel return*/
-	if (!AU || !ch) {
-		/*if the codec is in EOS state, move to STOP*/
-		if (codec->Status == GF_ESM_CODEC_EOS) {
-			GF_CodecCapability cap;
-			cap.CapCode = GF_CODEC_MEDIA_NOT_OVER;
-			cap.cap.valueInt = 0;
-			sdec->GetCapabilities(codec->decio, &cap);
-			if (!cap.cap.valueInt) {
-				gf_term_stop_codec(codec, 2);
-				if (ch)
-					gf_odm_signal_eos(ch->odm);
-				if ((codec->type==GF_STREAM_OD) && (codec->nb_dec_frames==1)) {
-					/*this is just by safety, since seeking is only allowed when a single clock is present
-					in the scene*/
-					if (gf_list_count(codec->odm->net_service->Clocks)==1)
-						codec->odm->subscene->static_media_ressources=1;
-				}
-			}
-		}
-		goto exit;
-	}
-
-#ifndef GPAC_DISABLE_VRML
-	if (ch && ch->odm->media_ctrl && !ch->odm->media_ctrl->media_speed)
-		goto exit;
-#endif
-
-	/*get the object time*/
-	obj_time = gf_clock_time(codec->ck);
-
-	/*clock is not started*/
-//	if (ch->first_au_fetched && !gf_clock_is_started(ch->clock)) goto exit;
-
-	/*check timing based on the input channel and main FPS*/
-	if (AU->DTS > obj_time) {
-		gf_sc_set_system_pending_frame(ch->odm->term->compositor, 1);
-		goto exit;
-	}
-	gf_sc_set_system_pending_frame(ch->odm->term->compositor, 0);
-
-	cts = AU->CTS;
-	/*in cases where no CTS was set for the BIFS (which may be interpreted as "now", although not compliant), use the object clock*/
-	if (AU->flags & GF_DB_AU_NO_TIMESTAMPS) au_time = obj_time;
-	/*case where CTS is in the past (carousels) */
-	else if (AU->flags & GF_DB_AU_CTS_IN_PAST) {
-		au_time = - (s32) AU->CTS;
-		cts = AU->DTS;
-	}
-	/*regular case, SFTime will be from CTS (since DTS == CTS)*/
-	else au_time = AU->DTS;
-
-	/*check seeking and update timing - do NOT use the base layer, since BIFS streams may depend on other
-	streams not on the same clock*/
-	if (codec->last_unit_cts == cts) {
-		/*seeking for systems is done by not releasing the graph until seek is done*/
-		check_next_unit = 1;
-		mm_level = GF_CODEC_LEVEL_SEEK;
-
-	}
-	/*set system stream timing*/
-	else {
-		codec->last_unit_cts = AU->CTS;
-		/*we're droping the frame*/
-		if (scene_locked) codec->nb_dropped ++;
-		mm_level = GF_CODEC_LEVEL_NORMAL;
-	}
-
-	/*lock scene*/
-	if (!scene_locked) {
-		scene_locked = codec->odm->subscene ? codec->odm->subscene : codec->odm->parentscene;
-		if (!gf_mx_try_lock(scene_locked->root_od->term->compositor->mx))
-			return GF_OK;
-		/*if terminal is paused, force step-mode: it won't hurt in regular pause/play and ensures proper frame dumping*/
-		if (codec->odm->term->play_state) codec->odm->term->compositor->step_mode = GF_TRUE;
-	}
-
-	/*current media time for system objects is the clock time, since the media is likely to have random
-	updates in time*/
-	codec->odm->media_current_time = obj_time	 - codec->ck->init_time;
-
-	now = gf_sys_clock_high_res();
-	if (codec->odm->term->bench_mode==2) {
-		e = GF_OK;
-	} else {
-		e = sdec->ProcessData(sdec, AU->data, AU->dataLength, ch->esd->ESID, au_time, mm_level);
-	}
-	now = gf_sys_clock_high_res() - now;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d at %d decoded AU TS %u in "LLU" us\n", sdec->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, obj_time, AU->CTS, now));
-
-	codec_update_stats(codec, AU->dataLength, now, AU->DTS, (AU->flags & GF_DB_AU_RAP));
-	codec->prev_au_size = AU->dataLength;
-
-	/*destroy this AU*/
-	gf_es_drop_au(ch);
-
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SysDec] Codec %s AU CTS %d Decode error %s\n", sdec->module_name , cts, gf_error_to_string(e) ));
-		if (e<0) ch->stream_state = 2;
-		goto exit;
-	}
-
-	/*in broadcast mode, generate a scene if none is available*/
-	if (codec->ck->no_time_ctrl) {
-		GF_Scene *scene = codec->odm->subscene ? codec->odm->subscene : codec->odm->parentscene;
-
-		/*static OD resources (embedded in ESD) in broadcast mode, reset time*/
-		if (codec->flags & GF_ESM_CODEC_IS_STATIC_OD) gf_clock_reset(codec->ck);
-		/*generate a temp scene if none is in place*/
-		if (scene->graph_attached != 1) {
-			Bool prev_dyn = scene->is_dynamic_scene;
-			scene->is_dynamic_scene = 1;
-			gf_scene_regenerate(scene);
-			scene->graph_attached = 2;
-			scene->is_dynamic_scene = prev_dyn;
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[Decoder] Got OD resources before scene - generating temporary scene\n"));
-		}
-	}
-
-	/*if no release restart*/
-	if (check_next_unit) goto check_unit;
-
-exit:
-	if (scene_locked) {
-		gf_mx_v(scene_locked->root_od->term->compositor->mx);
-	}
-	return e;
-}
-
-
-
-/*special handling of decoders not using ESM*/
-static GF_Err PrivateScene_Process(GF_Codec *codec, u32 TimeAvailable)
-{
-	u64 now;
-	GF_Channel *ch;
-	GF_Scene *scene_locked;
-	GF_SceneDecoder *sdec = (GF_SceneDecoder *)codec->decio;
-	GF_Err e = GF_OK;
-
-	/*muting systems codec means we don't decode until mute is off - likely there will be visible however
-	there is no other way to decode system AUs without modifying the content, which is what mute is about on visual...*/
-	if (codec->Muted) return GF_OK;
-
-	if (codec->Status == GF_ESM_CODEC_EOS) {
-		gf_term_stop_codec(codec, 2);
-		return GF_OK;
-	}
-
-	scene_locked = codec->odm->subscene ? codec->odm->subscene : codec->odm->parentscene;
-
-	ch = (GF_Channel*)gf_list_get(codec->inChannels, 0);
-	if (!ch) return GF_OK;
-	/*init channel clock*/
-	if (!ch->IsClockInit) {
-		Bool started;
-		/*signal seek*/
-		if (!gf_mx_try_lock(scene_locked->root_od->term->compositor->mx)) return GF_OK;
-		gf_es_init_dummy(ch);
-		if (codec->odm->term->bench_mode != 2) {
-			sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, -1, GF_CODEC_LEVEL_NORMAL);
-		}
-		gf_mx_v(scene_locked->root_od->term->compositor->mx);
-		started = gf_clock_is_started(ch->clock);
-		/*let's be nice to the scene loader (that usually involves quite some parsing), pause clock while
-		parsing*/
-		gf_clock_pause(ch->clock);
-		codec->last_unit_dts = 0;
-		if (!started) return GF_OK;
-	}
-
-	codec->odm->media_current_time = codec->last_unit_cts = gf_clock_time(codec->ck);
-	codec->odm->media_current_time += codec->ck->media_time_at_init;
-	codec->odm->media_current_time -= codec->ck->init_time;
-
-	/*lock scene*/
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[PrivateDec] Codec %s Processing at %d\n", sdec->module_name, codec->last_unit_cts));
-
-	if (!gf_mx_try_lock(scene_locked->root_od->term->compositor->mx)) return GF_OK;
-
-	now = gf_sys_clock_high_res();
-	if (codec->odm->term->bench_mode == 2) {
-		e = GF_OK;
-	} else {
-		e = sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, codec->last_unit_cts, GF_CODEC_LEVEL_NORMAL);
-	}
-	now = gf_sys_clock_high_res() - now;
-	codec->last_unit_dts ++;
-	/*resume on error*/
-	if (e && (codec->last_unit_dts<2) ) {
-		gf_clock_resume(ch->clock);
-		codec->last_unit_dts = 2;
-	}
-	/*resume clock on 2nd decode (we assume parsing is done in 2 steps, one for first frame display, one for complete parse)*/
-	else if (codec->last_unit_dts==2) {
-		gf_clock_resume(ch->clock);
-	}
-
-	codec_update_stats(codec, 0, now, codec->last_unit_cts, 0);
-
-	gf_mx_v(scene_locked->root_od->term->compositor->mx);
-
-	if (e==GF_EOS) {
-		/*first end of stream, evaluate duration*/
-		//if (!codec->odm->duration) gf_odm_set_duration(codec->odm, ch, codec->odm->current_time);
-		gf_es_on_eos(ch);
-		return GF_OK;
-	}
-	return e;
-}
-/*Get a pointer to the next CU buffer*/
-static GFINLINE GF_Err LockCompositionUnit(GF_Codec *dec, u32 CU_TS, GF_CMUnit **cu, u32 *cu_size)
-{
-	if (!dec->CB) return GF_BAD_PARAM;
-
-	*cu = gf_cm_lock_input(dec->CB, CU_TS, dec->is_reordering);
-	if (! *cu ) return GF_OUT_OF_MEM;
-	*cu_size = dec->CB->UnitSize;
-	return GF_OK;
-}
-
-
-static GFINLINE GF_Err UnlockCompositionUnit(GF_Codec *dec, GF_CMUnit *CU, u32 cu_size)
-{
-	if (cu_size && dec->is_reordering) {
-		if (dec->trusted_cts && (CU->prev->dataLength && CU->prev->TS > CU->TS) ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] ODM%d codec is reordering but CTSs are out of order (%u vs %u prev) - forcing CTS recomputing\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, CU->TS, CU->prev->TS));
-
-			//dec->trusted_cts = GF_FALSE;
-			CU->TS = CU->prev->TS;
-		}
-		if (!dec->trusted_cts) {
-			/*first dispatch from decoder, store CTS*/
-			if (!dec->first_frame_dispatched) {
-				dec->recomputed_cts = CU->TS;
-				dec->first_frame_dispatched = 1;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d reordering mode - first frame dispatch - CTS %d - min TS diff %d\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, dec->recomputed_cts, dec->min_au_duration));
-			} else if (dec->min_au_duration) {
-				dec->recomputed_cts += dec->min_au_duration;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d reordering mode - original CTS %d recomputed CTS %d - min TS diff %d\n", dec->decio->module_name, dec->odm->OD->objectDescriptorID, CU->TS, dec->recomputed_cts, dec->min_au_duration));
-				CU->TS = dec->recomputed_cts;
-			}
-		}
-	}
-
-	/*unlock the CB*/
-	gf_cm_unlock_input(dec->CB, CU, cu_size, dec->is_reordering);
-	return GF_OK;
-}
-
-
-GF_Err gf_codec_resize_composition_buffer(GF_Codec *dec, u32 NewSize)
-{
-	if (!dec || !dec->CB) return GF_BAD_PARAM;
-
-	/*update config*/
-	gf_mo_update_caps(dec->odm->mo);
-
-	/*bytes per sec not available: either video or audio not configured*/
-	if (!dec->bytes_per_sec) {
-		if (NewSize && (NewSize != dec->CB->UnitSize) ) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODM] Resizing composition buffer for codec %s - %d bytes per unit\n", dec->decio->module_name, NewSize));
-			gf_cm_resize(dec->CB, NewSize);
-		}
-	}
-	/*audio: make sure we have enough data in CM to entirely fill the HW audio buffer...*/
-	else {
-		u32 unit_size, audio_buf_len, unit_count;
-		GF_CodecCapability cap;
-		unit_size = NewSize;
-		audio_buf_len = 200;
-
-		cap.CapCode = GF_CODEC_BUFFER_MAX;
-		gf_codec_get_capability(dec, &cap);
-		unit_count = cap.cap.valueInt;
-		/*at least 2 units for dec and render ...*/
-		if (unit_count<2) unit_count = 2;
-		while (unit_size*unit_count*1000 < dec->bytes_per_sec*audio_buf_len) unit_count++;
-#ifdef __SYMBIAN32__
-		/*FIXME - symbian tests*/
-		unit_count = 10;
-#endif
-		gf_cm_reinit(dec->CB, unit_size, unit_count);
-		dec->CB->Min = unit_count/3;
-		if (!dec->CB->Min) dec->CB->Min = 1;
-	}
-
-	//reset decoder stat
-	dec->total_dec_time = 0;
-	dec->nb_dec_frames = 0;
-	dec->first_frame_time = 0;
-	dec->last_frame_time = 0;
-	dec->total_iframes_time = 0;
-	dec->max_iframes_time = 0;
-	dec->max_dec_time = 0;
-	dec->min_frame_dur = (u32) - 1;
-	dec->codec_reset = GF_TRUE;
-
-	//reset bitrate compute
-	dec->cur_bit_size = 0;
-	dec->last_stat_start = 0;
-
-	//if dynamic scene, set size
-	if ((dec->type==GF_STREAM_VISUAL) && dec->odm->parentscene->is_dynamic_scene) {
-		gf_scene_force_size_to_video(dec->odm->parentscene, dec->odm->mo);
-	}
-	return GF_OK;
-}
-
-static GF_Err MediaCodec_Process(GF_Codec *codec, u32 TimeAvailable)
-{
-	GF_CMUnit *CU;
-	GF_DBUnit *AU;
-	GF_Channel *ch, *prev_ch;
-	Bool drop_late_frames = 0;
-	u64 now, entryTime;
-	u32 mmlevel, cts;
-	u32 first, obj_time, unit_size;
-	GF_MediaDecoder *mdec;
-	GF_Err e = GF_OK;
-	s32 cts_diff;
-	u32 scal_unit_size=0;
-	Bool prev_channel_unreliable;
-
-	CU = NULL;
-
-	/*if video codec muted don't decode (try to saves ressources)
-	if audio codec muted we dispatch to keep sync in place*/
-	if (codec->Muted && (codec->type==GF_STREAM_VISUAL) ) return GF_OK;
-
-	//cannot output frame, do nothing (we force a channel query before for pull mode)
-	if (codec->CB->Capacity == codec->CB->UnitCount) {
-		//do not stop codec!
-		if (codec->CB->UnitCount > 1) return GF_OK;
-		else if (codec->direct_frame_output|| codec->direct_vout) return GF_OK;
-	}
-
-	entryTime = gf_sys_clock_high_res();
-
-	if (!codec->odm->term->bench_mode) {
-		if ((codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) || (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY))
-			drop_late_frames = GF_TRUE;
-	}
-
-
-	/*fetch next AU in DTS order for this codec*/
-	MediaDecoder_GetNextAU(codec, &ch, &AU, &prev_channel_unreliable);
-	mdec = (GF_MediaDecoder*)codec->decio;
-
-	/*no active channel return*/
-	if (!AU || !ch) {
-		/*if the codec is in EOS state, assume we're done*/
-		if (codec->Status == GF_ESM_CODEC_EOS) {
-			/*if codec is reordering, try to flush it*/
-			if (codec->is_reordering) {
-				if ( LockCompositionUnit(codec, codec->last_unit_cts+1, &CU, &unit_size) == GF_OUT_OF_MEM)
-					return GF_OK;
-				assert( CU );
-				unit_size = 0;
-				if (codec->odm->term->bench_mode != 2) {
-					e = mdec->ProcessData(mdec, NULL, 0, 0, &CU->TS, CU->data, &unit_size, 0, 0);
-					if (e==GF_OK) {
-						/*e = */UnlockCompositionUnit(codec, CU, unit_size);
-						if (unit_size) return GF_OK;
-					}
-				}
-			}
-			gf_term_stop_codec(codec, 2);
-		}
-		/*if no data, and channel not buffering, ABORT CB buffer (data timeout or EOS not detectable)*/
-		else if (ch && !ch->is_pulling && !ch->BufferOn && !ch->last_au_was_seek)
-			gf_cm_abort_buffering(codec->CB);
-
-		//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: No data in decoding buffer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID));
-		return GF_OK;
-	}
-
-	/*get the object time*/
-	obj_time = gf_clock_time(codec->ck);
-
-	/*Media Time for media codecs is updated in the CB*/
-
-	if (!codec->CB) {
-		gf_es_drop_au(ch);
-		return GF_BAD_PARAM;
-	}
-	/*we are still flushing our CB - keep the current pending AU and wait for CB resize*/
-	if (codec->force_cb_resize) {
-		/*we cannot destroy the CB here, as we don't know who is using its output*/
-		return GF_OK;
-	}
-
-	/*image codecs*/
-	if (!codec->CB->no_allocation && (codec->CB->Capacity == 1)) {
-		/*a SHA signature is computed for each AU. This avoids decoding/recompositing when identical (for instance streaming a carousel)*/
-		u8 new_unit_signature[20];
-		gf_sha1_csum((u8*)AU->data, AU->dataLength, new_unit_signature);
-		if (!memcmp(codec->last_unit_signature, new_unit_signature, sizeof(new_unit_signature))) {
-			codec->nb_repeted_frames++;
-			gf_es_drop_au(ch);
-			return GF_OK;
-		}
-
-		/*usually only one image is tolerated in the stream, but just in case force reset of CB*/
-		if (codec->CB->UnitCount && (obj_time>=AU->CTS)) {
-			gf_mx_p(codec->odm->mx);
-			codec->CB->output->dataLength = 0;
-			codec->CB->UnitCount = 0;
-			gf_mx_v(codec->odm->mx);
-		}
-
-		/*CB is already full*/
-		if (codec->CB->UnitCount)
-			return GF_OK;
-
-		codec->nb_repeted_frames = 0;
-		memcpy(codec->last_unit_signature, new_unit_signature, sizeof(new_unit_signature));
-
-	}
-
-
-	if (codec->ck->speed != codec->check_speed) {
-		//decrease in speed
-		if (ABS(codec->check_speed) > ABS(codec->ck->speed)) {
-			codec->decode_only_rap = 0;
-			codec->drop_modulo = 0;
-			codec->drop_count = 0;
-		}
-		codec->check_speed = codec->ck->speed;
-		codec->consecutive_late_frames = 0;
-		codec->consecutive_ontime_frames = 0;
-
-		if (codec->type==GF_STREAM_AUDIO) {
-			if (ABS(FIX2FLT(codec->ck->speed)) > 8) {
-				codec->decode_only_rap = 2;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] Speed %g too hight for audio decoder/renderer - skipping decode\n", codec->decio->module_name, FIX2FLT(codec->ck->speed)));
-			}
-		} else {
-			//dynamically decided based on late frames found
-		}
-	}
-
-	TimeAvailable*=1000;
-	/*try to refill the full buffer*/
-	first = 1;
-	while (codec->CB->Capacity > codec->CB->UnitCount) {
-		Bool force_skip = 0;
-
-		if (codec->decode_only_rap) {
-			//check whether we have to skip decoding this frame
-			if (AU->flags & GF_DB_AU_RAP) {
-				if (codec->decode_only_rap==2) {
-					if (AU->CTS > obj_time + 500)
-						return GF_OK;
-					force_skip = 1;
-				} else if (codec->drop_modulo) {
-					codec->drop_count ++;
-					if (codec->drop_count >= codec->drop_modulo) {
-						codec->drop_count = 0;
-					} else {
-						force_skip = 1;
-					}
-				}
-			} else {
-				force_skip = 1;
-			}
-		}
-
-		/*set media processing level*/
-		ch->last_au_was_seek = 0;
-		mmlevel = GF_CODEC_LEVEL_NORMAL;
-
-		/*explicit seek*/
-		if (AU->flags & GF_DB_AU_IS_SEEK) {
-			mmlevel = GF_CODEC_LEVEL_SEEK;
-			ch->last_au_was_seek = 1;
-		}
-		/*implicit seek: if the last frame had the same TS, we are seeking. Ask the codec to drop*/
-		else if (!ch->skip_sl && codec->last_unit_cts && (codec->last_unit_cts == AU->CTS) && !ch->esd->dependsOnESID) {
-			mmlevel = GF_CODEC_LEVEL_SEEK;
-			ch->last_au_was_seek = 1;
-			/*object clock is paused by media control or terminal is paused: exact frame seek*/
-			if (
-#ifndef GPAC_DISABLE_VRML
-			    (codec->ck->mc && codec->ck->mc->paused) ||
-#endif
-			    (codec->odm->term->play_state)
-			) {
-				gf_cm_rewind_input(codec->CB);
-				mmlevel = GF_CODEC_LEVEL_NORMAL;
-				/*force staying in step-mode*/
-				codec->odm->term->compositor->step_mode = GF_TRUE;
-			}
-		}
-		/*only perform drop in normal playback*/
-		else if (!force_skip && (codec->ck->speed >= 0) && (codec->CB->Status == CB_PLAY)) {
-			/*extremely late, set the level to drop
-			 NOTE: the 100 ms safety gard is to avoid discarding audio*/
-			if (!ch->skip_sl && (AU->CTS + (codec->is_reordering ? 1000 : 100) < obj_time) ) {
-				mmlevel = GF_CODEC_LEVEL_DROP;
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: frame too late (CTS %d vs time %d) - using drop level\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS, obj_time));
-
-//above 1 out of this threshold frames only shown, move to I-frame only mode. 50 = 1 frame shown out of 2 GOPs at 25hz
-#define IFRAME_MODE_THRESHOLD	50
-
-				codec->consecutive_late_frames++;
-				codec->consecutive_ontime_frames = 0;
-				if (codec->check_speed > 1) {
-					Double speed = (Double) FIX2FLT(codec->ck->speed);
-					u32 nb_check_frames = codec->decode_only_rap ? 5 : 30;
-
-					if (codec->consecutive_late_frames >= nb_check_frames) {
-						if (!codec->decode_only_rap) {
-							codec->drop_modulo += 2;
-							codec->drop_count = 0;
-
-							GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: %d consecutive late frames at speed %g - increasing frame drop modulo to %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->consecutive_late_frames, speed, codec->drop_modulo));
-							if (codec->drop_modulo > IFRAME_MODE_THRESHOLD) {
-
-								GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: %d consecutive late frames at speed %g with drop modulo %d - moving to I-frame only decoding\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->consecutive_late_frames, speed, codec->drop_modulo));
-								codec->drop_modulo = 0;
-								codec->drop_count = 0;
-								codec->decode_only_rap = 1;
-							}
-						} else {
-							codec->drop_modulo += 2;
-							codec->drop_count = 0;
-
-							GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: %d consecutive late frames at speed %g in I-frame only mode - decoding only one I-frame out of %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->consecutive_late_frames, speed, codec->drop_modulo));
-						}
-						codec->consecutive_late_frames = 0;
-					}
-					//very late even in I-frame mode, drop it
-					else if (codec->decode_only_rap) {
-						if (obj_time - AU->CTS > 2000) {
-							force_skip = 1;
-						}
-					}
-				}
-
-				if (ch->resync_drift && (AU->CTS + ch->resync_drift < obj_time)) {
-					ch->clock->StartTime += (obj_time - AU->CTS);
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] ODM%d: decoder too slow on OCR stream - rewinding clock of %d ms\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, obj_time - AU->CTS));
-					obj_time = gf_clock_time(codec->ck);
-				}
-			}
-			/*we are late according to the media manager*/
-			else if (codec->PriorityBoost) {
-				mmlevel = GF_CODEC_LEVEL_VERY_LATE;
-				codec->consecutive_late_frames = 0;
-				codec->consecutive_ontime_frames ++;
-			}
-			/*otherwise we must have an idea of the load in order to set the right level
-			use the composition buffer for that, only on the first frame*/
-			else {
-				codec->consecutive_late_frames = 0;
-				codec->consecutive_ontime_frames ++;
-				if (first) {
-					//if the CB is almost empty set to very late
-					if (codec->CB->UnitCount <= codec->CB->Min+1) {
-						mmlevel = GF_CODEC_LEVEL_VERY_LATE;
-					} else if (codec->CB->UnitCount * 2 <= codec->CB->Capacity) {
-						mmlevel = GF_CODEC_LEVEL_LATE;
-					}
-					first = 0;
-				}
-			}
-
-			if (codec->check_speed > 1) {
-				u32 nb_check_frames = codec->decode_only_rap ? 5 : 30;
-				//try to decrease the drop rate, but never switch back from I-frame mode only for a given speed
-				if (codec->consecutive_ontime_frames > nb_check_frames) {
-					if (codec->drop_modulo) {
-						codec->drop_modulo -= 2;
-						codec->drop_count = 0;
-						GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: %d consecutive on-time frames - Decreasing drop modulo %d (I-frame only mode %d)\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->consecutive_ontime_frames, codec->drop_modulo, codec->decode_only_rap));
-						codec->consecutive_late_frames = 0;
-						codec->consecutive_ontime_frames = 0;
-					}
-				}
-			}
-		}
-
-		if (ch->skip_sl) {
-			if (codec->bytes_per_sec) {
-				AU->CTS = codec->last_unit_cts + ch->ts_offset + codec->cur_audio_bytes * 1000 / codec->bytes_per_sec;
-			} else if (codec->fps) {
-				AU->CTS = codec->last_unit_cts + ch->ts_offset + (u32) (codec->cur_video_frames * 1000 / codec->fps);
-			}
-		}
-		if ( LockCompositionUnit(codec, AU->CTS, &CU, &unit_size) == GF_OUT_OF_MEM) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more space in composition buffer\n", codec->decio->module_name ));
-			return GF_OK;
-		}
-
-
-scalable_retry:
-
-		now = gf_sys_clock_high_res();
-
-		assert( CU );
-		if (!CU->data && unit_size && !codec->CB->no_allocation) {
-			e = GF_OUT_OF_MEM;
-		} else if (codec->odm->term->bench_mode==2) {
-			unit_size = 0;
-			gf_cm_abort_buffering(codec->CB);
-		} else if (force_skip) {
-			unit_size = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: force drop requested in fast playback for AU CTS %u\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, AU->CTS));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d (%s) decoding frame DTS %u CTS %u size %d (%d in channels)\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS, AU->dataLength, ch->AU_Count));
-			e = mdec->ProcessData(mdec, AU->data, AU->dataLength, ch->esd->ESID, &CU->TS, CU->data, &unit_size, AU->PaddingBits, mmlevel);
-		}
-		now = gf_sys_clock_high_res() - now;
-		if (codec->Status == GF_ESM_CODEC_STOP) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because codec has been stopped\n", codec->decio->module_name));
-			return GF_OK;
-		}
-		/*input is too small, resize composition memory*/
-		switch (e) {
-		case GF_BUFFER_TOO_SMALL:
-			/*release but no dispatch*/
-			UnlockCompositionUnit(codec, CU, 0);
-
-			/*if we have pending media, wait untill CB is completely flushed by the compositor - this shoud be fixed by avoiding to destroy the CB ... */
-			if (codec->CB->LastRenderedTS) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resize output buffer requested\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID));
-				codec->force_cb_resize = unit_size;
-				gf_cm_abort_buffering(codec->CB);
-				return GF_OK;
-			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, codec->CB->UnitSize, unit_size));
-			gf_codec_resize_composition_buffer(codec, unit_size);
-			continue;
-
-		/*this happens a lot when using non-MPEG-4 streams (ex: ffmpeg demuxer)*/
-		case GF_PACKED_FRAMES:
-			/*in seek do dispatch output otherwise we will only see the I-frame preceding the seek point*/
-			if (mmlevel == GF_CODEC_LEVEL_DROP) {
-				if (drop_late_frames && (codec->CB->UnitCount>1) ) {
-					unit_size = 0;
-					codec->nb_dropped++;
-				} else
-					ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
-			}
-			e = UnlockCompositionUnit(codec, CU, unit_size);
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d ES%d at %d decoded packed frame TS %u in "LLU" us\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now));
-			if (ch->skip_sl) {
-				if (codec->bytes_per_sec) {
-					codec->cur_audio_bytes += unit_size;
-				} else if (codec->fps && unit_size) {
-					codec->cur_video_frames += 1;
-				}
-			} else {
-				u32 deltaTS = 0;
-				if (codec->bytes_per_sec) {
-					deltaTS = unit_size * 1000 / codec->bytes_per_sec;
-				} /*else if (0 && codec->fps && unit_size) {
-					deltaTS = (u32) (1000.0f / codec->fps);
-				} */else {
-					deltaTS = (AU->DTS - codec->last_unit_dts);
-				}
-				AU->CTS += deltaTS;
-			}
-			codec_update_stats(codec, 0, now, 0, 0);
-			continue;
-
-		/*for all cases below, don't release the composition buffer until we are sure we are not
-		processing a scalable stream*/
-		case GF_OK:
-			if (unit_size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d (%s) decoded frame DTS %u CTS %u size %d in "LLU" us - %d in CB\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, ch->odm->net_service->url, AU->DTS, AU->CTS, AU->dataLength, now, codec->CB->UnitCount + 1));
-
-				if (codec->direct_frame_output) {
-					Bool needs_resize = 0;
-					//may happen during seek
-					if (CU->frame) {
-						CU->frame->Release(CU->frame);
-						CU->frame = NULL;
-					}
-
-					e = mdec->GetOutputFrame(mdec, ch->esd->ESID, &CU->frame, &needs_resize);
-					if (e!=GF_OK) {
-						CU->frame=NULL;
-					}
-					if (!CU->frame)
-						unit_size = 0;
-					else if (needs_resize) {
-						assert(unit_size);
-						//if dynamic scene, set size
-						if ((codec->type==GF_STREAM_VISUAL) && codec->odm->parentscene->is_dynamic_scene) {
-							/*update config*/
-							gf_mo_update_caps(codec->odm->mo);
-							gf_scene_force_size_to_video(codec->odm->parentscene, codec->odm->mo);
-						}
-					}
-					
-				}
-				else if (codec->direct_vout) {
-					e = mdec->GetOutputBuffer(mdec, ch->esd->ESID, &codec->CB->pY, &codec->CB->pU, &codec->CB->pV);
-					if (e==GF_OK) {
-						gf_sc_set_video_pending_frame(codec->odm->term->compositor);
-					}
-				}
-				CU->sender_ntp = AU->sender_ntp;
-			}
-#if 0
-			/*if no size and the decoder is not using the composition memory - if the object is in intitial buffering resume it!!*/
-			else if ( (!codec->CB->UnitSize && !codec->CB->Capacity) && (codec->CB->Status == CB_BUFFER)) {
-				codec->nb_dispatch_skipped++;
-				if (codec->nb_dispatch_skipped==codec->CB->UnitCount)
-					gf_cm_abort_buffering(codec->CB);
-			}
-#endif
-
-			codec_update_stats(codec, AU->dataLength, now, AU->DTS, (AU->flags & GF_DB_AU_RAP));
-			if (ch->skip_sl) {
-				if (codec->bytes_per_sec) {
-					codec->cur_audio_bytes += unit_size;
-					while (codec->cur_audio_bytes>codec->bytes_per_sec) {
-						codec->cur_audio_bytes -= codec->bytes_per_sec;
-						codec->last_unit_cts += 1000;
-					}
-				} else if (codec->fps && unit_size) {
-					codec->cur_video_frames += 1;
-				}
-			}
-#ifndef GPAC_DISABLE_LOGS
-			if (codec->odm->flags & GF_ODM_PREFETCH) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] At %d ODM%d ES%d decoding frame TS %u in prefetch mode\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS));
-			}
-#endif
-			break;
-
-		case GF_PROFILE_NOT_SUPPORTED:
-			/*release but no dispatch*/
-			UnlockCompositionUnit(codec, CU, 0);
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[%s] Unsupported profile detected, blacklisting decoder for this stream and changing decoder\n", codec->decio->module_name ));
-			return gf_codec_change_decoder(codec, NULL, GF_TRUE);
-		case GF_CODEC_BUFFER_UNAVAILABLE:
-			if (unit_size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] At %u ODM%d ES%d decoded frame DTS %u CTS %u size %d in "LLU" us - %d in CB\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->DTS, AU->CTS, AU->dataLength, now, codec->CB->UnitCount + 1));
-				
-				if (codec->direct_frame_output) {
-					Bool needs_resize = 0;
-					//may happen during seek
-					if (CU->frame) {
-						CU->frame->Release(CU->frame);
-						CU->frame = NULL;
-					}
-
-					e = mdec->GetOutputFrame(mdec, ch->esd->ESID, &CU->frame, &needs_resize);
-					if (e!=GF_OK) {
-						CU->frame=NULL;
-					}
-					if (!CU->frame)
-						unit_size = 0;
-					else if (needs_resize) {
-						assert(unit_size);
-						//if dynamic scene, set size
-						if ((codec->type==GF_STREAM_VISUAL) && codec->odm->parentscene->is_dynamic_scene) {
-							/*update config*/
-							gf_mo_update_caps(codec->odm->mo);
-							gf_scene_force_size_to_video(codec->odm->parentscene, codec->odm->mo);
-						}
-					}
-					
-				}
-				else if (codec->direct_vout) {
-					e = mdec->GetOutputBuffer(mdec, ch->esd->ESID, &codec->CB->pY, &codec->CB->pU, &codec->CB->pV);
-					if (e==GF_OK) {
-						gf_sc_set_video_pending_frame(codec->odm->term->compositor);
-					}
-				}
-				CU->sender_ntp = AU->sender_ntp;
-			}
-
-			codec_update_stats(codec, AU->dataLength, now, AU->DTS, (AU->flags & GF_DB_AU_RAP));
-			UnlockCompositionUnit(codec, CU, unit_size);
-			
-			continue;
-
-		default:
-			unit_size = 0;
-			/*error - if the object is in intitial buffering resume it!!*/
-			gf_cm_abort_buffering(codec->CB);
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] At %d ODM%d ES%d (frame TS %u - "LLU" us ): decoded error %s\n", codec->decio->module_name, gf_clock_real_time(ch->clock), codec->odm->OD->objectDescriptorID, ch->esd->ESID, AU->CTS, now, gf_error_to_string(e) ));
-			e = GF_OK;
-			break;
-		}
-
-		codec->last_unit_dts = AU->DTS;
-		/*remember base layer timing*/
-		if (!ch->esd->dependsOnESID && !ch->skip_sl) {
-			codec->last_unit_cts = AU->CTS;
-			codec->first_frame_processed = 1;
-		}
-
-#ifndef GPAC_DISABLE_LOG
-		if (unit_size) {
-			if (ch->is_pulling) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %u decoded frame DTS %u CTS %u in "LLU" us\n", codec->decio->module_name, gf_clock_real_time(ch->clock), AU->DTS,AU->CTS, now));
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %u decoded frame DTS %u CTS %u in "LLU" us - %d AU in channel\n", codec->decio->module_name, gf_clock_real_time(ch->clock), AU->DTS, AU->CTS, now, ch->AU_Count));
-			}
-		}
-#endif
-
-		/*store current CTS - we need to have exclusive access in case a PCR discontinuity remaps timestamps while we decode*/
-		gf_es_lock(ch, GF_TRUE);
-		cts = AU->CTS;
-		prev_ch = ch;
-
-		gf_es_drop_au(ch);
-		gf_es_lock(ch, GF_FALSE);
-		AU = NULL;
-
-		if (e) {
-			UnlockCompositionUnit(codec, CU, unit_size);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because error %s\n", codec->decio->module_name, gf_error_to_string(e) ));
-			return e;
-		}
-
-		MediaDecoder_GetNextAU(codec, &ch, &AU, &prev_channel_unreliable);
-		mdec = (GF_MediaDecoder*)codec->decio;
-		//in splicing we may have destroyed the previous channel, discard the info
-		if (prev_channel_unreliable)
-			prev_ch = ch ? ch : gf_list_get(codec->inChannels, 0);
-
-		/*same CTS: same output, likely scalable stream so don't release the CB*/
-		if (AU && (AU->CTS == cts) && (ch != prev_ch) ) {
-			if (scal_unit_size < unit_size) scal_unit_size = unit_size;
-			unit_size = codec->CB->UnitSize;
-			goto scalable_retry;
-		}
-		if (!unit_size && scal_unit_size)
-			unit_size = scal_unit_size;
-
-		/*in seek don't dispatch any output*/
-		if (mmlevel >= GF_CODEC_LEVEL_DROP) {
-			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) ) {
-				unit_size = 0;
-				if (drop_late_frames) codec->nb_dropped++;
-			} else
-				prev_ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
-		} else {
-			prev_ch->clock->last_TS_rendered = 0;
-		}
-
-
-		if (!codec->decode_only_rap && codec->drop_modulo) {
-			codec->drop_count++;
-			if (codec->drop_count==codec->drop_modulo) {
-				codec->drop_count = 0;
-			} else {
-				unit_size = 0;
-			}
-		}
-
-		cts_diff = (s32) cts;
-		cts_diff -= (s32) CU->TS;
-		if (cts_diff < 0) cts_diff = -cts_diff;
-		//the decoder is dispathing CTS in the previous time base , override the timestamp ...
-		if (cts_diff > 20000 ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[%s] decoded frame CTS %d but input frame CTS %d, likely due to clock discontinuity\n", codec->decio->module_name, CU->TS, cts));
-			CU->TS = cts;
-			CU->TS = 0;
-		}
-
-		UnlockCompositionUnit(codec, CU, unit_size);
-		if (unit_size) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %u dispatched frame CTS %u in CB\n", codec->decio->module_name, gf_clock_real_time(prev_ch->clock), CU->TS));
-		}
-		if (!ch || !AU) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more input data\n", codec->decio->module_name));
-			return GF_OK;
-		}
-		if (force_skip) continue;
-
-		now = gf_sys_clock_high_res() - entryTime;
-		/*escape from decoding loop only if above critical limit - this is to avoid starvation on audio*/
-		if (!ch->esd->dependsOnESID && (codec->CB->UnitCount > codec->CB->Min)) {
-			if (now >= TimeAvailable) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because time is up: %d vs %d us available\n", codec->decio->module_name, now, TimeAvailable));
-				return GF_OK;
-			}
-		} else if (now >= TimeAvailable) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because running for too long: %d vs %d us available\n", codec->decio->module_name, now, TimeAvailable));
-			return GF_OK;
-		} else if (codec->odm->term->bench_mode) {
-			return GF_OK;
-		}
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because no more space in CB\n", codec->decio->module_name));
-	return GF_OK;
-}
-
-
-GF_Err gf_codec_process_private_media(GF_Codec *codec, u32 TimeAvailable)
-{
-
-	if (codec->ck && codec->ck->Paused) {
-		u32 i;
-		for (i=0; i<gf_list_count(codec->odm->channels); i++) {
-			GF_Channel *ch = gf_list_get(codec->odm->channels, i);
-			if (ch->BufferOn) {
-				ch->BufferOn = 0;
-				gf_clock_buffer_off(ch->clock);
-			}
-		}
-		if (codec->CB)
-			gf_cm_abort_buffering(codec->CB);
-	}
-	return GF_OK;
-}
-
-
-GF_Err gf_codec_process_raw_media_pull(GF_Codec *codec, u32 TimeAvailable)
-{
-	GF_Channel *ch;
-	GF_DBUnit *db;
-	if (codec->ck && codec->ck->Paused) {
-		u32 i;
-		for (i=0; i<gf_list_count(codec->odm->channels); i++) {
-			ch = gf_list_get(codec->odm->channels, i);
-			if (ch->BufferOn) {
-				ch->BufferOn = 0;
-				gf_clock_buffer_off(ch->clock);
-			}
-		}
-		if (codec->CB)
-			gf_cm_abort_buffering(codec->CB);
-	}
-
-	/*this will pull the next AU from the service */
-	Decoder_GetNextAU(codec, &ch, &db);
-	if (!db) return GF_OK;
-
-	/*dispatch raw media - this call is blocking untill the cu has been consumed */
-	gf_es_dispatch_raw_media_au(ch, db->data, db->dataLength, db->CTS);
-
-	/*release AU from service*/
-	gf_term_channel_release_sl_packet(ch->service, ch);
-	return GF_OK;
-}
-
-GF_Err gf_codec_process_ocr(GF_Codec *codec, u32 TimeAvailable)
-{
-	/*OCR: needed for OCR in pull mode (dummy streams used to sync various sources)*/
-	GF_DBUnit *AU;
-	GF_Channel *ch;
-	/*fetch next AU on OCR (empty AUs)*/
-	Decoder_GetNextAU(codec, &ch, &AU);
-
-	/*no active channel return*/
-	if (!AU || !ch) {
-		/*if the codec is in EOS state, move to STOP*/
-		if (codec->Status == GF_ESM_CODEC_EOS) {
-			gf_term_stop_codec(codec, 2);
-#ifndef GPAC_DISABLE_VRML
-			/*if a mediacontrol is ruling this OCR*/
-			if (codec->odm->media_ctrl && codec->odm->media_ctrl->control->loop) mediacontrol_restart(codec->odm);
-#endif
-		}
-	}
-	return GF_OK;
-}
-
-GF_Err gf_codec_process(GF_Codec *codec, u32 TimeAvailable)
-{
-	if (codec->Status == GF_ESM_CODEC_STOP) return GF_OK;
-#ifndef GPAC_DISABLE_VRML
-	codec->Muted = (codec->odm->media_ctrl && codec->odm->media_ctrl->control->mute) ? 1 : 0;
-#else
-	codec->Muted = 0;
-#endif
-
-	return codec->process(codec, TimeAvailable);
-}
-
-
-GF_Err gf_codec_get_capability(GF_Codec *codec, GF_CodecCapability *cap)
-{
-	cap->cap.valueInt = 0;
-	if (codec->decio) {
-		return codec->decio->GetCapabilities(codec->decio, cap);
-	}
-
-	if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
-		GF_BitStream *bs;
-		u32 pf, w, h, stride=0, out_size, sr, nb_ch, bpp, ch_cfg, is_flipped = 0;
-		GF_Channel *ch = gf_list_get(codec->odm->channels, 0);
-		if (!ch || !ch->esd->decoderConfig->decoderSpecificInfo || !ch->esd->decoderConfig->decoderSpecificInfo->data) return 0;
-		bs = gf_bs_new(ch->esd->decoderConfig->decoderSpecificInfo->data, ch->esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-
-		pf = w = h = sr = nb_ch = bpp = ch_cfg = 0;
-		if (codec->type==GF_STREAM_VISUAL) {
-			pf = gf_bs_read_u32(bs);
-			w = gf_bs_read_u16(bs);
-			h = gf_bs_read_u16(bs);
-			out_size = gf_bs_read_u32(bs);
-			stride = gf_bs_read_u32(bs);
-			is_flipped = gf_bs_read_u8(bs);
-		} else {
-			sr = gf_bs_read_u32(bs);
-			nb_ch = gf_bs_read_u16(bs);
-			bpp = gf_bs_read_u16(bs);
-			out_size = gf_bs_read_u32(bs);
-			ch_cfg = gf_bs_read_u32(bs);
-		}
-		gf_bs_del(bs);
-		switch (cap->CapCode) {
-		case GF_CODEC_WIDTH:
-			cap->cap.valueInt = w;
-			return GF_OK;
-		case GF_CODEC_HEIGHT:
-			cap->cap.valueInt = h;
-			return GF_OK;
-		case GF_CODEC_STRIDE:
-			cap->cap.valueInt = stride;
-			return GF_OK;
-		case GF_CODEC_PIXEL_FORMAT:
-			cap->cap.valueInt = pf;
-			return GF_OK;
-		case GF_CODEC_FLIP:
-			cap->cap.valueInt = is_flipped;
-			return GF_OK;
-		case GF_CODEC_OUTPUT_SIZE:
-			cap->cap.valueInt = out_size;
-			return GF_OK;
-		case GF_CODEC_SAMPLERATE:
-			cap->cap.valueInt = sr;
-			return GF_OK;
-		case GF_CODEC_NB_CHAN:
-			cap->cap.valueInt = nb_ch;
-			return GF_OK;
-		case GF_CODEC_BITS_PER_SAMPLE:
-			cap->cap.valueInt = bpp;
-			return GF_OK;
-		case GF_CODEC_CHANNEL_CONFIG:
-			cap->cap.valueInt = ch_cfg;
-			return GF_OK;
-		case GF_CODEC_PAR:
-			cap->cap.valueInt = 0;
-			return GF_OK;
-		case GF_CODEC_PADDING_BYTES:
-			cap->cap.valueInt = 0;
-			return GF_OK;
-		case GF_CODEC_RESILIENT:
-			cap->cap.valueInt = 1;
-			return GF_OK;
-		}
-	}
-	return GF_BAD_PARAM;
-}
-
-GF_Err gf_codec_set_capability(GF_Codec *codec, GF_CodecCapability cap)
-{
-	if (!codec->decio) return GF_OK;
-	return codec->decio->SetCapabilities(codec->decio, cap);
-}
-
-
-void gf_codec_set_status(GF_Codec *codec, u32 Status)
-{
-	if (!codec) return;
-
-	if (Status == GF_ESM_CODEC_PAUSE) {
-		//stay in PLAY mode if we have a composition buffer, so that the "pause" state still output an initial picture
-		codec->Status = codec->CB ? GF_ESM_CODEC_PAUSE : GF_ESM_CODEC_STOP;
-	}
-	else if (Status == GF_ESM_CODEC_BUFFER) codec->Status = GF_ESM_CODEC_PLAY;
-	else if (Status == GF_ESM_CODEC_PLAY) {
-		codec->last_unit_cts = 0;
-		codec->prev_au_size = 0;
-		codec->Status = Status;
-		codec->last_stat_start = codec->cur_bit_size = codec->max_bit_rate = codec->avg_bit_rate = 0;
-		codec->nb_dec_frames = 0;
-		codec->nb_iframes = 0;
-		codec->max_iframes_time = 0;
-		codec->total_iframes_time = 0;
-		codec->total_dec_time = 0;
-		codec->max_dec_time = 0;
-		codec->cur_audio_bytes = codec->cur_video_frames = 0;
-		codec->nb_dropped = 0;
-		codec->nb_repeted_frames = 0;
-		codec->recomputed_cts = 0;
-		codec->first_frame_dispatched = 0;
-		codec->first_frame_processed = 0;
-		codec->nb_dispatch_skipped = 0;
-		memset(codec->last_unit_signature, 0, sizeof(codec->last_unit_signature));
-	}
-	else
-		codec->Status = Status;
-
-	if (!codec->CB) return;
-
-	/*notify CB*/
-	switch (Status) {
-	case GF_ESM_CODEC_PLAY:
-		gf_cm_set_status(codec->CB, CB_PLAY);
-		if (codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) {
-			gf_cm_abort_buffering(codec->CB);
-		}
-		return;
-	case GF_ESM_CODEC_PAUSE:
-		gf_cm_set_status(codec->CB, CB_PAUSE);
-		return;
-	case GF_ESM_CODEC_STOP:
-		gf_cm_set_status(codec->CB, CB_STOP);
-		return;
-	case GF_ESM_CODEC_EOS:
-		/*do NOT notify CB yet, wait till last AU is decoded*/
-		return;
-	case GF_ESM_CODEC_BUFFER:
-	default:
-		return;
-	}
-}
-static u32 get_codec_confidence(GF_Codec *codec, GF_BaseDecoder *ifce, GF_ESD *esd, u32 PL)
-{
-	u32 conf = 0;
-	u32 i_es;
-
-	codec->hybrid_layered_coded = 0;
-	for (i_es=0; i_es<gf_list_count(codec->odm->OD->ESDescriptors); i_es++) {
-		GF_ESD *an_esd = gf_list_get(codec->odm->OD->ESDescriptors, i_es);
-		u32 c;
-		if (an_esd->decoderConfig->streamType != esd->decoderConfig->streamType) continue;
-		if (an_esd->dependsOnESID && (an_esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_LHVC) && (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC)) {
-			codec->hybrid_layered_coded = 1;
-		}
-		c = ifce->CanHandleStream(ifce, an_esd->decoderConfig->streamType, i_es ? an_esd : esd, PL);
-		if (!conf || (c<conf) ) conf=c;
-	}
-	return conf;
-}
-
-Bool decio_blacklisted(GF_Codec *codec, const char *ifce_name)
-{
-	u32 i, count;
-	if (!codec->blacklisted) return GF_FALSE;
-	count = gf_list_count(codec->blacklisted);
-	for (i=0; i<count; i++) {
-		const char *name = gf_list_get(codec->blacklisted, i);
-		if (!stricmp(name, ifce_name)) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static GF_Err Codec_LoadModule(GF_Codec *codec, GF_ESD *esd, u32 PL)
-{
-	char szPrefDec[500];
-	const char *sOpt;
-	GF_BaseDecoder *ifce, *dec_ifce;
-	u32 i, plugCount;
-	u32 ifce_type;
-	Bool do_dec_switch = GF_TRUE;
-	u32 dec_confidence;
-	GF_Terminal *term = codec->odm->term;
-
-	codec->profile_level = PL;
-	switch (esd->decoderConfig->streamType) {
-	case GF_STREAM_AUDIO:
-	case GF_STREAM_VISUAL:
-	case GF_STREAM_ND_SUBPIC:
-		ifce_type = GF_MEDIA_DECODER_INTERFACE;
-		codec->process = MediaCodec_Process;
-		break;
-	case GF_STREAM_PRIVATE_MEDIA:
-		ifce_type = GF_PRIVATE_MEDIA_DECODER_INTERFACE;
-		codec->process = gf_codec_process_private_media;
-		break;
-	case GF_STREAM_PRIVATE_SCENE:
-		ifce_type = GF_SCENE_DECODER_INTERFACE;
-		codec->process = PrivateScene_Process;
-		break;
-	default:
-		ifce_type = GF_SCENE_DECODER_INTERFACE;
-		codec->process = SystemCodec_Process;
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_AFX) {
-			ifce_type = GF_NODE_DECODER_INTERFACE;
-		}
-		break;
-	}
-
-	/*a bit dirty, if FFMPEG is used for demuxer load it for decoder too*/
-	if (0 && !stricmp(codec->odm->net_service->ifce->module_name, "FFMPEG demuxer")) {
-		sOpt = "FFMPEG decoder";
-	} else {
-		/*use user-defined module if any*/
-		sOpt = NULL;
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_VISUAL:
-			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_JPEG) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_PNG))
-				sOpt = gf_cfg_get_key(term->user->config, "Systems", "DefImageDec");
-			else
-				sOpt = gf_cfg_get_key(term->user->config, "Systems", "DefVideoDec");
-			break;
-		case GF_STREAM_AUDIO:
-			sOpt = gf_cfg_get_key(term->user->config, "Systems", "DefAudioDec");
-			break;
-		default:
-			break;
-		}
-	}
-
-	dec_confidence = 0;
-	ifce = NULL;
-
-	if (sOpt && decio_blacklisted(codec, sOpt))
-		sOpt = NULL;
-
-	if (sOpt) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface_by_name(term->user->modules, sOpt, ifce_type);
-		if (ifce) {
-			if (ifce->CanHandleStream) {
-				dec_confidence = get_codec_confidence(codec, ifce, esd, PL);
-				if (dec_confidence==GF_CODEC_SUPPORTED) {
-					codec->decio = ifce;
-					return GF_OK;
-				}
-				if (dec_confidence==GF_CODEC_NOT_SUPPORTED) {
-					gf_modules_close_interface((GF_BaseInterface *) ifce);
-					ifce = NULL;
-				}
-			} else {
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-			}
-		}
-	}
-
-	dec_ifce = ifce;
-	/*prefered codec module per streamType/objectType from config*/
-	sprintf(szPrefDec, "codec_%02X_%02X", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", szPrefDec);
-
-	//little hack - FFMPEG has some weird issues with MPEG1/2 audio on some systems, try to default to MAD if present
-	if (!sOpt && (esd->decoderConfig->streamType==GF_STREAM_AUDIO)) {
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_AUDIO_MPEG2_PART3:
-		case GPAC_OTI_AUDIO_MPEG1:
-			sOpt = "MAD Decoder";
-			gf_cfg_set_key(term->user->config, "Systems", szPrefDec, sOpt);
-		}
-	}
-
-	if (sOpt) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface_by_name(term->user->modules, sOpt, ifce_type);
-		if (ifce) {
-			if (ifce->CanHandleStream && !decio_blacklisted(codec, ifce->module_name)) {
-				u32 conf = get_codec_confidence(codec, ifce, esd, PL);
-				if ((conf!=GF_CODEC_NOT_SUPPORTED) && (conf>=dec_confidence)) {
-					/*switch*/
-					if (dec_ifce) gf_modules_close_interface((GF_BaseInterface *) dec_ifce);
-					dec_confidence = conf;
-					dec_ifce = ifce;
-					ifce = NULL;
-					if (dec_confidence>=GF_CODEC_MAYBE_SUPPORTED) {
-						codec->decio = dec_ifce;
-						return GF_OK;
-					}
-				}
-			}
-			if (ifce)
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-		}
-	}
-	/*not found, check all modules*/
-	plugCount = gf_modules_get_count(term->user->modules);
-	for (i = 0; i < plugCount ; i++) {
-		ifce = (GF_BaseDecoder *) gf_modules_load_interface(term->user->modules, i, ifce_type);
-		if (!ifce) continue;
-		if (ifce->CanHandleStream && !decio_blacklisted(codec, ifce->module_name)) {
-			u32 conf = get_codec_confidence(codec, ifce, esd, PL);
-			
-			if (conf==GF_CODEC_PROFILE_NOT_SUPPORTED) do_dec_switch = GF_FALSE;
-
-			if ((conf!=GF_CODEC_NOT_SUPPORTED) && (conf>dec_confidence)) {
-				/*switch*/
-				if (dec_ifce) gf_modules_close_interface((GF_BaseInterface *) dec_ifce);
-				dec_confidence = conf;
-				dec_ifce = ifce;
-				ifce = NULL;
-			}
-		}
-		if (ifce)
-			gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-
-	if (dec_ifce) {
-		codec->decio = dec_ifce;
-		if (do_dec_switch && !codec->blacklisted) {
-			sprintf(szPrefDec, "codec_%02X_%02X", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
-			gf_cfg_set_key(term->user->config, "Systems", szPrefDec, dec_ifce->module_name);
-		}
-		return GF_OK;
-	}
-
-	return GF_CODEC_NOT_FOUND;
-}
-
-GF_Err gf_codec_change_decoder(GF_Codec *codec, GF_ESD *for_esd, Bool do_blacklist)
-{
-	GF_Err e;
-	u32 i, count;
-	GF_ESD *esd=NULL;
-	if (!codec || !codec->decio) return GF_CODEC_NOT_FOUND;
-	if (!codec->blacklisted) codec->blacklisted = gf_list_new();
-	if (do_blacklist) gf_list_add(codec->blacklisted, gf_strdup(codec->decio->module_name) );
-
-	count = gf_list_count(codec->inChannels);
-	for (i=0; i<count; i++) {
-		GF_Channel *ch = gf_list_get(codec->inChannels, i);
-		if (ch && ch->esd) {
-			codec->decio->DetachStream(codec->decio, ch->esd->ESID);
-			if (!esd) esd = ch->esd;
-		}
-	}
-	gf_modules_close_interface((GF_BaseInterface *) codec->decio);
-	codec->decio = NULL;
-	if (!esd && !for_esd) return GF_CODEC_NOT_FOUND;
-	e = Codec_LoadModule(codec, for_esd ? for_esd : esd, codec->profile_level);
-	if (e) return e;
-	if (!codec->decio) return GF_CODEC_NOT_FOUND;
-
-	if (for_esd) {
-		return codec->decio->AttachStream(codec->decio, for_esd);
-	}
-
-	for (i=0; i<count; i++) {
-		GF_Channel *ch = gf_list_get(codec->inChannels, i);
-		if (ch->esd == for_esd) continue;
-
-		if (ch && ch->esd) {
-			codec->decio->AttachStream(codec->decio, ch->esd);
-		}
-	}
-	return GF_OK;
-}
-
-GF_Err Codec_Load(GF_Codec *codec, GF_ESD *esd, u32 PL)
-{
-	switch (esd->decoderConfig->streamType) {
-	/*OCR has no codec, just a channel*/
-	case GF_STREAM_OCR:
-		codec->decio = NULL;
-		codec->process = gf_codec_process_ocr;
-		return GF_OK;
-#ifndef GPAC_DISABLE_VRML
-	/*InteractionStream */
-	case GF_STREAM_INTERACT:
-		codec->decio = (GF_BaseDecoder *) gf_isdec_new(esd, PL);
-		assert(codec->decio->InterfaceType == GF_SCENE_DECODER_INTERFACE);
-		codec->process = SystemCodec_Process;
-		return GF_OK;
-#endif
-
-	/*load decoder module*/
-	case GF_STREAM_VISUAL:
-	case GF_STREAM_AUDIO:
-		if (!esd->decoderConfig->objectTypeIndication)
-			return GF_NON_COMPLIANT_BITSTREAM;
-
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_RAW_MEDIA_STREAM) {
-			codec->flags |= GF_ESM_CODEC_IS_RAW_MEDIA;
-			codec->process = gf_codec_process_private_media;
-			return GF_OK;
-		}
-	default:
-		return Codec_LoadModule(codec, esd, PL);
-	}
-}
-
-
-void gf_codec_del(GF_Codec *codec)
-{
-	if (!codec || !codec->inChannels)
-		return;
-	if (gf_list_count(codec->inChannels)) return;
-
-	//delete CB first, in case we use pointers to codec data
-	if (codec->CB) gf_cm_del(codec->CB);
-	codec->CB = NULL;
-
-	if (!(codec->flags & GF_ESM_CODEC_IS_USE)) {
-		switch (codec->type) {
-			/*input sensor streams are handled internally for now*/
-#ifndef GPAC_DISABLE_VRML
-		case GF_STREAM_INTERACT:
-			gf_mx_p(codec->odm->term->net_mx);
-			gf_isdec_del(codec->decio);
-			gf_list_del_item(codec->odm->term->input_streams, codec);
-			gf_mx_v(codec->odm->term->net_mx);
-			break;
-#endif
-		default:
-			if (codec->decio)
-				gf_modules_close_interface((GF_BaseInterface *) codec->decio);
-			break;
-		}
-	}
-	if (codec->inChannels) gf_list_del(codec->inChannels);
-	codec->inChannels = NULL;
-	if (codec->blacklisted) {
-		while (gf_list_count(codec->blacklisted)) {
-			char *name = gf_list_pop_back(codec->blacklisted);
-			gf_free(name);
-		}
-		gf_list_del(codec->blacklisted);
-	}
-	gf_free(codec);
-}
-
-

gpac-0.8.0.tar.gz/src/terminal/input_sensor.c Deleted

@@ -1,996 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/utf.h>
-#include <gpac/nodes_x3d.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_VRML
-
-#include "input_sensor.h"
-
-#if GPAC_HTK_DEMO
-
-void HTK_Init(const char *htk_path);
-void HTK_Close(void);
-void HTK_SetDictionary(char *dicofile);
-void HTK_DoDetection(void);
-const char *HTK_GetWord();
-int HTK_GetWordIndex();
-float HTK_GetWordScore();
-void StartHTK(ISPriv *is_dec);
-
-static u32 htk_num_users = 0;
-#endif
-
-
-/*
-				input sensor decoder(s) handling
-*/
-
-GF_Err gf_isdec_configure(GF_BaseDecoder *plug, GF_Scene *scene, Bool is_remote)
-{
-	ISPriv *is = (ISPriv *)plug->privateStack;
-	/*we can only deal with encoded content (for now)*/
-	if (!scene->scene_codec) return GF_NOT_SUPPORTED;
-	is->scene = scene;
-	is->is_local = !is_remote;
-	return GF_OK;
-}
-
-
-static void add_field(ISPriv *priv, u32 fieldType, const char *fieldName)
-{
-	GF_FieldInfo *field = (GF_FieldInfo *) gf_malloc(sizeof(GF_FieldInfo));
-	memset(field, 0, sizeof(GF_FieldInfo));
-	field->fieldType = fieldType;
-	field->far_ptr = gf_sg_vrml_field_pointer_new(fieldType);
-	field->name = (const char *) fieldName;
-	field->fieldIndex = gf_list_count(priv->ddf);
-	gf_list_add(priv->ddf, field);
-}
-
-static void isdev_add_field(GF_InputSensorDevice *dev, u32 fieldType, const char *fieldName)
-{
-	ISPriv *is = (ISPriv *)dev->input_decoder->privateStack;
-	add_field(is, fieldType, fieldName);
-}
-
-static void isdev_dispatch_frame(struct __input_device *dev, u8 *data, u32 data_len)
-{
-	GF_SLHeader slh;
-	GF_Codec*cod;
-	u32 i;
-	ISPriv *priv = (ISPriv *)dev->input_decoder->privateStack;
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
-	slh.compositionTimeStampFlag = 1;
-	/*note we could use an exact TS but it's not needed: since the input is generated locally
-	we want it to be decoded as soon as possible, thus using 0 emulates permanent seeking on
-	InputSensor stream, hence forces input frame resync*/
-	slh.compositionTimeStamp = 0;
-
-	/*get all decoders and send frame*/
-	i=0;
-	while ((cod = (GF_Codec*)gf_list_enum(priv->scene->root_od->term->input_streams, &i))) {
-		ISPriv *is = (ISPriv *)cod->decio->privateStack;
-		if (is->type==priv->type) {
-			GF_Channel *ch = (GF_Channel *)gf_list_get(cod->inChannels, 0);
-			gf_es_receive_sl_packet(ch->service, ch, (char *)data, data_len, &slh, GF_OK);
-		}
-	}
-}
-
-static GF_Err IS_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
-{
-	GF_BitStream *bs;
-	u32 len, size, i;
-	char devName[255];
-	u16 termSeq[20];
-
-	ISPriv *is = (ISPriv *)plug->privateStack;
-	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->dataLength) return GF_NON_COMPLIANT_BITSTREAM;
-
-	/*no more than one UI stream per object*/
-	if (is->ES_ID) return GF_NOT_SUPPORTED;
-	is->ES_ID = esd->ESID;
-	/*parse config*/
-	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
-	len = gf_bs_read_int(bs, 8);
-	for (i=0; i<len; i++) {
-		devName[i] = gf_bs_read_int(bs, 8);
-	}
-	devName[i] = 0;
-	is->type = gf_crc_32(devName, len);
-	size = len + 1;
-
-	if (!stricmp(devName, "KeySensor")) {
-		is->type = IS_KeySensor;
-		add_field(is, GF_SG_VRML_SFINT32, "keyPressed");
-		add_field(is, GF_SG_VRML_SFINT32, "keyReleased");
-		add_field(is, GF_SG_VRML_SFINT32, "actionKeyPressed");
-		add_field(is, GF_SG_VRML_SFINT32, "actionKeyReleased");
-		add_field(is, GF_SG_VRML_SFBOOL, "shiftKeyPressed");
-		add_field(is, GF_SG_VRML_SFBOOL, "controlKeyPressed");
-		add_field(is, GF_SG_VRML_SFBOOL, "altKeyPressed");
-
-	} else if (!stricmp(devName, "StringSensor")) {
-		is->type = IS_StringSensor;
-		add_field(is, GF_SG_VRML_SFSTRING, "enteredText");
-		add_field(is, GF_SG_VRML_SFSTRING, "finalText");
-
-		is->termChar = '\r';
-		is->delChar = '\b';
-
-		/*get escape chars if any specified*/
-		if (size<esd->decoderConfig->decoderSpecificInfo->dataLength) {
-			const char *src = esd->decoderConfig->decoderSpecificInfo->data + size;
-			gf_utf8_mbstowcs(termSeq, esd->decoderConfig->decoderSpecificInfo->dataLength - size, &src);
-			is->termChar = termSeq[0];
-			is->delChar = termSeq[1];
-		}
-	} else if (!stricmp(devName, "Mouse")) {
-		is->type = IS_Mouse;
-		add_field(is, GF_SG_VRML_SFVEC2F, "position");
-		add_field(is, GF_SG_VRML_SFBOOL, "leftButtonDown");
-		add_field(is, GF_SG_VRML_SFBOOL, "middleButtonDown");
-		add_field(is, GF_SG_VRML_SFBOOL, "rightButtonDown");
-		add_field(is, GF_SG_VRML_SFFLOAT, "wheel");
-	}
-	else {
-		GF_InputSensorDevice *ifce;
-		/*not found, check all modules*/
-		u32 plugCount = gf_modules_get_count(is->scene->root_od->term->user->modules);
-		for (i = 0; i < plugCount ; i++) {
-			ifce = (GF_InputSensorDevice *) gf_modules_load_interface(is->scene->root_od->term->user->modules, i, GF_INPUT_DEVICE_INTERFACE);
-			if (!ifce) continue;
-			ifce->input_decoder = plug;
-			if (ifce->RegisterDevice && ifce->RegisterDevice(ifce, devName, bs, isdev_add_field) ) {
-				is->io_dev = ifce;
-				break;
-			}
-			gf_modules_close_interface((GF_BaseInterface *) ifce);
-		}
-		if (!is->io_dev) return GF_NOT_SUPPORTED;
-
-		is->io_dev->DispatchFrame = isdev_dispatch_frame;
-		plug->module_name = is->io_dev->module_name;
-		plug->author_name = is->io_dev->author_name;
-	}
-
-	gf_bs_del(bs);
-	return GF_OK;
-}
-
-static GF_Err IS_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
-{
-	ISPriv *is = (ISPriv *)plug->privateStack;
-	is->ES_ID = 0;
-	return GF_OK;
-}
-
-static GF_Err IS_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *capability)
-{
-	capability->cap.valueInt = 0;
-	return GF_OK;
-}
-
-static GF_Err IS_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
-{
-	return GF_OK;
-}
-
-static GF_Err IS_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
-                             u16 ES_ID, u32 AU_time, u32 mmlevel)
-{
-	u32 i, j, count;
-	Double scene_time;
-	GF_BitStream *bs;
-	GF_FieldInfo *field;
-	ISStack *st;
-	ISPriv *priv = (ISPriv *)plug->privateStack;
-	GF_Err e = GF_OK;
-
-	/*decode data frame except if local stringSensor*/
-	bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
-	i=0;
-	while ((field = (GF_FieldInfo *)gf_list_enum(priv->ddf, &i))) {
-		/*store present flag in eventIn for command skip - this is an ugly hack but it works since DDF don't have event types*/
-		field->eventType = gf_bs_read_int(bs, 1);
-		/*parse val ourselves (we don't want to depend on bifs codec)*/
-		if (field->eventType) {
-			switch (field->fieldType) {
-			case GF_SG_VRML_SFBOOL:
-				* ((SFBool *) field->far_ptr) = (SFBool) gf_bs_read_int(bs, 1);
-				break;
-			case GF_SG_VRML_SFFLOAT:
-				*((SFFloat *)field->far_ptr) = FLT2FIX( gf_bs_read_float(bs) );
-				break;
-			case GF_SG_VRML_SFINT32:
-				*((SFInt32 *)field->far_ptr) = (s32) gf_bs_read_int(bs, 32);
-				break;
-			case GF_SG_VRML_SFTIME:
-				*((SFTime *)field->far_ptr) = gf_bs_read_double(bs);
-				break;
-			case GF_SG_VRML_SFVEC2F:
-				((SFVec2f *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
-				((SFVec2f *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
-				break;
-			case GF_SG_VRML_SFVEC3F:
-				((SFVec3f *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
-				((SFVec3f *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
-				((SFVec3f *)field->far_ptr)->z = FLT2FIX( gf_bs_read_float(bs) );
-				break;
-			case GF_SG_VRML_SFCOLOR:
-				((SFColor *)field->far_ptr)->red = FLT2FIX( gf_bs_read_float(bs) );
-				((SFColor *)field->far_ptr)->green = FLT2FIX( gf_bs_read_float(bs) );
-				((SFColor *)field->far_ptr)->blue = FLT2FIX( gf_bs_read_float(bs) );
-				break;
-			case GF_SG_VRML_SFVEC4F:
-			case GF_SG_VRML_SFROTATION:
-				((SFRotation *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
-				((SFRotation *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
-				((SFRotation *)field->far_ptr)->z = FLT2FIX( gf_bs_read_float(bs) );
-				((SFRotation *)field->far_ptr)->q = FLT2FIX( gf_bs_read_float(bs) );
-				break;
-
-			case GF_SG_VRML_SFSTRING:
-			{
-				u32 size, length;
-				size = gf_bs_read_int(bs, 5);
-				length = gf_bs_read_int(bs, size);
-				if (gf_bs_available(bs) < length) return GF_NON_COMPLIANT_BITSTREAM;
-
-				if ( ((SFString *)field->far_ptr)->buffer ) gf_free( ((SFString *)field->far_ptr)->buffer);
-				((SFString *)field->far_ptr)->buffer = (char*)gf_malloc(sizeof(char)*(length+1));
-				memset(((SFString *)field->far_ptr)->buffer , 0, length+1);
-				for (j=0; j<length; j++) {
-					((SFString *)field->far_ptr)->buffer[j] = gf_bs_read_int(bs, 8);
-				}
-			}
-			break;
-			}
-		}
-	}
-	gf_bs_del(bs);
-
-	/*special case for StringSensor in local mode: lookup for special chars*/
-	if ((priv->type == IS_StringSensor) && priv->is_local) {
-		char tmp_utf8[5000];
-		const unsigned short *ptr;
-		u32 len;
-		GF_FieldInfo *field1 = (GF_FieldInfo *)gf_list_get(priv->ddf, 0);
-		GF_FieldInfo *field2 = (GF_FieldInfo *)gf_list_get(priv->ddf, 1);
-		SFString *inText = (SFString *) field1->far_ptr;
-		SFString *outText = (SFString *) field2->far_ptr;
-
-		field1->eventType = field2->eventType = 0;
-		priv->enteredText[priv->text_len] = (short) '\0';
-
-		len = (u32) gf_utf8_wcslen(priv->enteredText);
-		if (len && (priv->enteredText[len-1] == priv->termChar)) {
-			ptr = priv->enteredText;
-			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
-			if (outText->buffer) gf_free(outText->buffer);
-			outText->buffer = (char*)gf_malloc(sizeof(char) * (len));
-			memcpy(outText->buffer, tmp_utf8, sizeof(char) * len-1);
-			outText->buffer[len-1] = 0;
-			if (inText->buffer) gf_free(inText->buffer);
-			inText->buffer = NULL;
-			priv->text_len = 0;
-
-			field1->eventType = field2->eventType = 1;
-		} else {
-			if (priv->delChar) {
-				/*remove chars*/
-				if ((len>1) && (priv->enteredText[len-1] == priv->delChar)) {
-					priv->enteredText[len-1] = (short) '\0';
-					len--;
-					if (len) {
-						priv->enteredText[len-1] = (short) '\0';
-						len--;
-					}
-				}
-			}
-			priv->text_len = len;
-			ptr = priv->enteredText;
-			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
-			if (inText->buffer) gf_free(inText->buffer);
-			inText->buffer = (char*)gf_malloc(sizeof(char) * (len+1));
-			memcpy(inText->buffer, tmp_utf8, sizeof(char) * len);
-			inText->buffer[len] = 0;
-			field1->eventType = 1;
-		}
-	}
-
-	gf_term_lock_compositor(priv->scene->root_od->term, 1);
-
-	/*apply it*/
-	i=0;
-	while ((st = (ISStack*)gf_list_enum(priv->is_nodes, &i))) {
-		assert(st->is);
-		assert(st->mo);
-		if (!st->is->enabled) continue;
-
-		count = gf_list_count(st->is->buffer.commandList);
-		scene_time = gf_scene_get_time(priv->scene);
-		for (j=0; j<count; j++) {
-			GF_Command *com = (GF_Command *)gf_list_get(st->is->buffer.commandList, j);
-			GF_FieldInfo *field = (GF_FieldInfo *)gf_list_get(priv->ddf, j);
-			GF_CommandField *info = (GF_CommandField *)gf_list_get(com->command_fields, 0);
-			if (info && field && field->eventType) {
-				gf_sg_vrml_field_copy(info->field_ptr, field->far_ptr, field->fieldType);
-				gf_sg_command_apply(priv->scene->graph, com, scene_time);
-			}
-		}
-	}
-	gf_term_lock_compositor(priv->scene->root_od->term, 0);
-	return e;
-}
-
-void gf_isdec_del(GF_BaseDecoder *plug)
-{
-	ISPriv *priv = (ISPriv *)plug->privateStack;
-	gf_list_del(priv->is_nodes);
-
-	while (gf_list_count(priv->ddf)) {
-		GF_FieldInfo *fi = (GF_FieldInfo *)gf_list_get(priv->ddf, 0);
-		gf_list_rem(priv->ddf, 0);
-		gf_sg_vrml_field_pointer_del(fi->far_ptr, fi->fieldType);
-		gf_free(fi);
-	}
-	gf_list_del(priv->ddf);
-	gf_free(priv);
-	gf_free(plug);
-}
-
-
-GF_BaseDecoder *gf_isdec_new(GF_ESD *esd, u32 PL)
-{
-	ISPriv *priv;
-	GF_SceneDecoder *tmp;
-
-	tmp = (GF_SceneDecoder*) gf_malloc(sizeof(GF_SceneDecoder));
-	if (!tmp) return NULL;
-	memset(tmp, 0, sizeof(GF_SceneDecoder));
-
-	priv = (ISPriv *) gf_malloc(sizeof(ISPriv));
-	memset(priv, 0, sizeof(ISPriv));
-
-	priv->is_nodes = gf_list_new();
-	priv->ddf = gf_list_new();
-
-	tmp->privateStack = priv;
-
-	tmp->AttachStream = IS_AttachStream;
-	tmp->DetachStream = IS_DetachStream;
-	tmp->GetCapabilities = IS_GetCapabilities;
-	tmp->SetCapabilities = IS_SetCapabilities;
-	tmp->ProcessData = IS_ProcessData;
-	/*we don't use this...*/
-	tmp->AttachScene = NULL;
-
-	GF_REGISTER_MODULE_INTERFACE(tmp, GF_SCENE_DECODER_INTERFACE, "GPAC InputSensor Decoder", "gpac distribution")
-	return (GF_BaseDecoder *) tmp;
-}
-
-/*
-				input sensor node handling
-*/
-static void IS_Unregister(GF_Node *node, ISStack *st)
-{
-	u32 i;
-	GF_ObjectManager *odm;
-	ISPriv *is_dec;
-
-	gf_mo_unregister(node, st->mo);
-
-	odm = st->mo->odm;
-	if (!odm) return;
-
-	assert(odm->codec && (odm->codec->type == GF_STREAM_INTERACT));
-
-	/*get IS dec*/
-	is_dec = (ISPriv*)odm->codec->decio->privateStack;
-	for (i=0; i<gf_list_count(is_dec->is_nodes); i++) {
-		ISStack *tmp = (ISStack *)gf_list_get(is_dec->is_nodes, i);
-		if (tmp == st) {
-			gf_list_rem(is_dec->is_nodes, i);
-			i--;
-		}
-	}
-	/*stop stream*/
-	if (st->mo->num_open) gf_mo_stop(st->mo);
-	st->mo = NULL;
-	if (st->registered) {
-		st->registered = 0;
-		if (is_dec->io_dev && is_dec->io_dev->Stop) is_dec->io_dev->Stop(is_dec->io_dev);
-	}
-}
-
-static void IS_Register(GF_Node *n)
-{
-	GF_ObjectManager *odm;
-	ISPriv *is_dec;
-	u32 i;
-	ISStack *st = (ISStack *)gf_node_get_private(n);
-	odm = st->mo->odm;
-	if (!odm) return;
-
-	assert(odm->codec && (odm->codec->type == GF_STREAM_INTERACT));
-
-	/*get IS dec*/
-	is_dec = (ISPriv*)odm->codec->decio->privateStack;
-	if ( gf_list_find(is_dec->is_nodes, st) == -1 )
-		gf_list_add(is_dec->is_nodes, st);
-
-	/*start stream*/
-	gf_mo_play(st->mo, 0, -1, 0);
-
-	gf_term_unqueue_node_traverse(odm->term, n);
-
-	/*we want at least one sensor enabled*/
-	i=0;
-	while ((st = gf_list_enum(is_dec->is_nodes, &i))) {
-		if (st->is->enabled) {
-			st->registered = 1;
-			if (is_dec->io_dev && is_dec->io_dev->Start) is_dec->io_dev->Start(is_dec->io_dev);
-			break;
-		}
-	}
-
-}
-
-static void TraverseInputSensor(GF_Node *node, void *rs, Bool is_destroy)
-{
-	ISStack *st = (ISStack*)gf_node_get_private(node);
-	M_InputSensor *is = (M_InputSensor *)node;
-
-	if (is_destroy) {
-		GF_Scene *scene;
-		if (st->registered) IS_Unregister(node, st);
-		scene = (GF_Scene*)gf_sg_get_private(gf_node_get_graph(node));
-		gf_term_unqueue_node_traverse(scene->root_od->term, node);
-		gf_free(st);
-	} else {
-		/*get decoder object */
-		if (!st->mo) st->mo = gf_mo_register(node, &is->url, 0, 0);
-		/*register with decoder*/
-		if (st->mo && !st->registered) IS_Register(node);
-	}
-}
-
-
-void InitInputSensor(GF_Scene *scene, GF_Node *node)
-{
-	ISStack *stack;
-	GF_SAFEALLOC(stack, ISStack);
-	if (!stack) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate input sensor stack\n"));
-		return;
-	}
-	stack->is = (M_InputSensor *) node;
-	gf_node_set_private(node, stack);
-	gf_node_set_callback_function(node, TraverseInputSensor);
-	gf_term_queue_node_traverse(scene->root_od->term, node);
-}
-
-/*check only URL changes*/
-void InputSensorModified(GF_Node *node)
-{
-	GF_MediaObject *mo;
-	ISStack *st = (ISStack *)gf_node_get_private(node);
-
-	mo = gf_mo_register(node, &st->is->url, 0, 0);
-	if ((mo!=st->mo) || !st->registered) {
-		if (mo!=st->mo) {
-			if (st->mo) IS_Unregister(node, st);
-			st->mo = mo;
-		}
-		if (st->is->enabled)
-			IS_Register(node);
-		else
-			return;
-	} else if (!st->is->enabled) {
-		IS_Unregister(node, st);
-		return;
-	}
-}
-
-
-
-/*
-				input sensor DDF generations (user interface)
-*/
-GF_EXPORT
-void gf_term_mouse_input(GF_Terminal *term, GF_EventMouse *event)
-{
-	s32 X, Y;
-	u32 left_but_down, middle_but_down, right_but_down;
-	SFFloat wheel_pos;
-	u32 i;
-	GF_Codec *cod;
-	GF_BitStream *bs;
-	GF_SLHeader slh;
-	char *buf;
-	u32 buf_size;
-	Fixed bX, bY;
-
-	if (!term || !gf_list_count(term->input_streams)) return;
-
-	X = event->x;
-	Y = event->y;
-	left_but_down = middle_but_down = right_but_down = 0;
-	wheel_pos = 0;
-	switch (event->type) {
-	case GF_EVENT_MOUSEDOWN:
-		if (event->button==GF_MOUSE_RIGHT) right_but_down = 2;
-		else if (event->button==GF_MOUSE_MIDDLE) middle_but_down = 2;
-		else if (event->button==GF_MOUSE_LEFT) left_but_down = 2;
-		break;
-	case GF_EVENT_MOUSEUP:
-		if (event->button==GF_MOUSE_RIGHT) right_but_down = 1;
-		else if (event->button==GF_MOUSE_MIDDLE) middle_but_down = 1;
-		else if (event->button==GF_MOUSE_LEFT) left_but_down = 1;
-		break;
-	case GF_EVENT_MOUSEWHEEL:
-		wheel_pos = event->wheel_pos;
-		break;
-	case GF_EVENT_MOUSEMOVE:
-		break;
-	default:
-		return;
-	}
-
-	/*get BIFS coordinates*/
-	gf_sc_map_point(term->compositor, X, Y, &bX, &bY);
-	bX = gf_divfix(bX, term->compositor->scale_x);
-	bY = gf_divfix(bY, term->compositor->scale_y);
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	/*If wheel is specified disable X and Y (bug from MS wheel handling)*/
-	if (wheel_pos) {
-		gf_bs_write_int(bs, 0, 1);
-	} else {
-		gf_bs_write_int(bs, 1, 1);
-		gf_bs_write_float(bs, FIX2FLT(bX));
-		gf_bs_write_float(bs, FIX2FLT(bY));
-	}
-	gf_bs_write_int(bs, left_but_down ? 1 : 0, 1);
-	if (left_but_down) gf_bs_write_int(bs, left_but_down-1, 1);
-	gf_bs_write_int(bs, middle_but_down ? 1 : 0, 1);
-	if (middle_but_down) gf_bs_write_int(bs, middle_but_down-1, 1);
-	gf_bs_write_int(bs, right_but_down ? 1 : 0, 1);
-	if (right_but_down) gf_bs_write_int(bs, right_but_down-1, 1);
-	if (wheel_pos==0) {
-		gf_bs_write_int(bs, 0, 1);
-	} else {
-		gf_bs_write_int(bs, 1, 1);
-		gf_bs_write_float(bs, FIX2FLT(wheel_pos) );
-	}
-
-	gf_bs_align(bs);
-	gf_bs_get_content(bs, &buf, &buf_size);
-	gf_bs_del(bs);
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
-	slh.compositionTimeStampFlag = 1;
-	/*note we could use an exact TS but it's not needed: since the input is generated locally
-	we want it to be decoded as soon as possible, thus using 0 emulates permanent seeking on
-	InputSensor stream, hence forces input frame resync*/
-	slh.compositionTimeStamp = 0;
-
-	/*get all IS Mouse decoders and send frame*/
-	i=0;
-	while ((cod = (GF_Codec*)gf_list_enum(term->input_streams, &i))) {
-		ISPriv *is = (ISPriv *)cod->decio->privateStack;
-		if (is->type==IS_Mouse) {
-			GF_Channel *ch = (GF_Channel *)gf_list_get(cod->inChannels, 0);
-			gf_es_receive_sl_packet(ch->service, ch, buf, buf_size, &slh, GF_OK);
-		}
-	}
-	gf_free(buf);
-}
-
-GF_EXPORT
-Bool gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp)
-{
-	u32 i;
-	GF_BitStream *bs;
-	GF_SLHeader slh;
-	char *buf;
-#ifndef GPAC_DISABLE_X3D
-	X_KeySensor *n;
-#endif
-	u32 buf_size;
-	u32 actionKey = 0;
-	u32 shiftKeyDown, controlKeyDown, altKeyDown;
-	GF_Codec *cod;
-	s32 keyPressed, keyReleased, actionKeyPressed, actionKeyReleased;
-
-	if (!term || (!gf_list_count(term->input_streams) && !gf_list_count(term->x3d_sensors)) ) return 0;
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
-	slh.compositionTimeStampFlag = 1;
-	/*cf above*/
-	slh.compositionTimeStamp = 0;
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	shiftKeyDown = controlKeyDown = altKeyDown = 0;
-	keyPressed = keyReleased = actionKeyPressed = actionKeyReleased = 0;
-	/*key-sensor codes*/
-	switch (key_code) {
-	case GF_KEY_F1:
-		actionKey = 1;
-		break;
-	case GF_KEY_F2:
-		actionKey = 2;
-		break;
-	case GF_KEY_F3:
-		actionKey = 3;
-		break;
-	case GF_KEY_F4:
-		actionKey = 4;
-		break;
-	case GF_KEY_F5:
-		actionKey = 5;
-		break;
-	case GF_KEY_F6:
-		actionKey = 6;
-		break;
-	case GF_KEY_F7:
-		actionKey = 7;
-		break;
-	case GF_KEY_F8:
-		actionKey = 8;
-		break;
-	case GF_KEY_F9:
-		actionKey = 9;
-		break;
-	case GF_KEY_F10:
-		actionKey = 10;
-		break;
-	case GF_KEY_F11:
-		actionKey = 11;
-		break;
-	case GF_KEY_F12:
-		actionKey = 12;
-		break;
-	case GF_KEY_HOME:
-		actionKey = 13;
-		break;
-	case GF_KEY_END:
-		actionKey = 14;
-		break;
-	case GF_KEY_PAGEUP:
-		actionKey = 15;
-		break;
-	case GF_KEY_PAGEDOWN:
-		actionKey = 16;
-		break;
-	case GF_KEY_UP:
-		actionKey = 17;
-		break;
-	case GF_KEY_DOWN:
-		actionKey = 18;
-		break;
-	case GF_KEY_LEFT:
-		actionKey = 19;
-		break;
-	case GF_KEY_RIGHT:
-		actionKey = 20;
-		break;
-	case GF_KEY_SHIFT:
-		actionKey = 0;
-		shiftKeyDown = isKeyUp ? 1 : 2;
-		break;
-	case GF_KEY_CONTROL:
-		actionKey = 0;
-		controlKeyDown = isKeyUp ? 1 : 2;
-		break;
-	case GF_KEY_ALT:
-		actionKey = 0;
-		altKeyDown = isKeyUp ? 1 : 2;
-		break;
-
-	default:
-		actionKey = 0;
-		break;
-	}
-	if (actionKey) {
-		if (isKeyUp)
-			actionKeyReleased = actionKey;
-		else
-			actionKeyPressed = actionKey;
-	} else {
-		/*handle numeric pad*/
-		if ((key_code>=GF_KEY_0) && (key_code<=GF_KEY_9) ) {
-			key_code = key_code + 0x30 - GF_KEY_0;
-		}
-		else
-			key_code = hw_code;
-
-		if (isKeyUp) keyReleased = key_code;
-		else keyPressed = key_code;
-	}
-
-	gf_bs_write_int(bs, keyPressed ? 1 : 0, 1);
-	if (keyPressed) gf_bs_write_int(bs, keyPressed, 32);
-	gf_bs_write_int(bs, keyReleased ? 1 : 0, 1);
-	if (keyReleased) gf_bs_write_int(bs, keyReleased, 32);
-	gf_bs_write_int(bs, actionKeyPressed ? 1 : 0, 1);
-	if (actionKeyPressed) gf_bs_write_int(bs, actionKeyPressed, 32);
-	gf_bs_write_int(bs, actionKeyReleased ? 1 : 0, 1);
-	if (actionKeyReleased) gf_bs_write_int(bs, actionKeyReleased, 32);
-	gf_bs_write_int(bs, shiftKeyDown ? 1 : 0 , 1);
-	if (shiftKeyDown) gf_bs_write_int(bs, shiftKeyDown-1, 1);
-	gf_bs_write_int(bs, controlKeyDown ? 1 : 0 , 1);
-	if (controlKeyDown) gf_bs_write_int(bs, controlKeyDown-1, 1);
-	gf_bs_write_int(bs, altKeyDown ? 1 : 0 , 1);
-	if (altKeyDown) gf_bs_write_int(bs, altKeyDown, 1);
-
-	gf_bs_align(bs);
-	gf_bs_get_content(bs, &buf, &buf_size);
-	gf_bs_del(bs);
-
-	/*get all IS keySensor decoders and send frame*/
-	i=0;
-	while ((cod = (GF_Codec*)gf_list_enum(term->input_streams, &i))) {
-		ISPriv *is = (ISPriv *)cod->decio->privateStack;
-		if (is->type==IS_KeySensor) {
-//			GF_Channel *ch = gf_list_get(cod->inChannels, 0);
-//			gf_es_receive_sl_packet(ch->service, ch, buf, buf_size, &slh, GF_OK);
-
-			IS_ProcessData((GF_SceneDecoder*)cod->decio, buf, buf_size, 0, 0, 0);
-		}
-	}
-	gf_free(buf);
-
-#ifndef GPAC_DISABLE_X3D
-	i=0;
-	while ((n = (X_KeySensor*)gf_list_enum(term->x3d_sensors, &i))) {
-		u16 tc[2];
-		u32 len;
-		char szStr[10];
-		const unsigned short *ptr;
-		if (gf_node_get_tag((GF_Node*)n) != TAG_X3D_KeySensor) continue;
-		if (!n->enabled) return 0;
-
-		if (keyPressed) {
-			if (n->keyPress.buffer) gf_free(n->keyPress.buffer);
-			tc[0] = keyPressed;
-			tc[1] = 0;
-			ptr = tc;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
-			n->keyPress.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
-			memcpy(n->keyPress.buffer, szStr, sizeof(char) * len);
-			n->keyPress.buffer[len] = 0;
-			gf_node_event_out_str((GF_Node *)n, "keyPress");
-		}
-		if (keyReleased) {
-			if (n->keyRelease.buffer) gf_free(n->keyRelease.buffer);
-			tc[0] = keyReleased;
-			tc[1] = 0;
-			ptr = tc;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
-			n->keyRelease.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
-			memcpy(n->keyRelease.buffer, szStr, sizeof(char) * len);
-			n->keyRelease.buffer[len] = 0;
-			gf_node_event_out_str((GF_Node *)n, "keyRelease");
-		}
-		if (actionKeyPressed) {
-			n->actionKeyPress = actionKeyPressed;
-			gf_node_event_out_str((GF_Node *)n, "actionKeyPress");
-		}
-		if (actionKeyReleased) {
-			n->actionKeyRelease = actionKeyReleased;
-			gf_node_event_out_str((GF_Node *)n, "actionKeyRelease");
-		}
-		if (shiftKeyDown) {
-			n->shiftKey = (shiftKeyDown-1) ? 1 : 0;
-			gf_node_event_out_str((GF_Node *)n, "shiftKey");
-		}
-		if (controlKeyDown) {
-			n->controlKey = (controlKeyDown-1) ? 1 : 0;
-			gf_node_event_out_str((GF_Node *)n, "controlKey");
-		}
-		if (altKeyDown) {
-			n->altKey= (altKeyDown-1) ? 1 : 0;
-			gf_node_event_out_str((GF_Node *)n, "altKey");
-		}
-		if (keyPressed || actionKeyPressed || (shiftKeyDown-1) || (controlKeyDown-1) || (altKeyDown-1)) {
-			if (!n->isActive) {
-				n->isActive = 1;
-				gf_node_event_out_str((GF_Node *)n, "isActive");
-			}
-		} else if (n->isActive) {
-			n->isActive = 0;
-			gf_node_event_out_str((GF_Node *)n, "isActive");
-		}
-	}
-#endif
-	/*with KeySensor, we don't know if the key will be consumed or not, assume it is*/
-	return 1;
-}
-
-GF_EXPORT
-void gf_term_string_input(GF_Terminal *term, u32 character)
-{
-	u32 i;
-	GF_BitStream *bs;
-	GF_SLHeader slh;
-#ifndef GPAC_DISABLE_X3D
-	X_StringSensor *n;
-#endif
-	GF_Codec *cod;
-	char *buf;
-	u32 buf_size;
-
-	if (!character || !term) return;
-	if (!gf_list_count(term->input_streams) && !gf_list_count(term->x3d_sensors)) return;
-
-	memset(&slh, 0, sizeof(GF_SLHeader));
-	slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
-	slh.compositionTimeStampFlag = 1;
-	/*cf above*/
-	slh.compositionTimeStamp = 0;
-
-	/*get all IS StringSensor decoders and send frame*/
-	i=0;
-	while ((cod = (GF_Codec*)gf_list_enum(term->input_streams, &i))) {
-		ISPriv *is = (ISPriv *)cod->decio->privateStack;
-		if (is->type==IS_StringSensor) {
-
-//			GF_Channel *ch = (GF_Channel *)gf_list_get(cod->inChannels, 0);
-			is->enteredText[is->text_len] = character;
-			is->text_len += 1;
-
-			/*write empty DDF*/
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_int(bs, 0, 1);
-			gf_bs_write_int(bs, 0, 1);
-			gf_bs_align(bs);
-			gf_bs_get_content(bs, &buf, &buf_size);
-			gf_bs_del(bs);
-
-//			gf_es_receive_sl_packet(ch->service, ch, buf, buf_size, &slh, GF_OK);
-			IS_ProcessData((GF_SceneDecoder*)cod->decio, buf, buf_size, 0, 0, 0);
-
-			gf_free(buf);
-		}
-	}
-
-
-#ifndef GPAC_DISABLE_X3D
-	/*get all X3D StringSensors*/
-	i=0;
-	while ((n = (X_StringSensor*)gf_list_enum(term->x3d_sensors, &i))) {
-		StringSensorStack *st;
-		char szStr[5000];
-		const unsigned short *ptr;
-		u32 len;
-		if (gf_node_get_tag((GF_Node*)n) != TAG_X3D_StringSensor) continue;
-		if (!n->enabled) continue;
-
-		st = (StringSensorStack *) gf_node_get_private((GF_Node *)n);
-
-		if (character=='\b') {
-			if (n->deletionAllowed && st->text_len) {
-				st->text_len -= 1;
-				st->enteredText[st->text_len] = 0;
-				ptr = st->enteredText;
-				len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
-				if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
-				szStr[len] = 0;
-				n->enteredText.buffer = gf_strdup(szStr);
-				gf_node_event_out_str((GF_Node *)n, "enteredText");
-			}
-		} else if (character=='\r') {
-			if (n->finalText.buffer) gf_free(n->finalText.buffer);
-			n->finalText.buffer = n->enteredText.buffer;
-			n->enteredText.buffer = gf_strdup("");
-			st->text_len = 0;
-			gf_node_event_out_str((GF_Node *)n, "enteredText");
-			gf_node_event_out_str((GF_Node *)n, "finalText");
-		} else {
-			st->enteredText[st->text_len] = character;
-			st->text_len += 1;
-			st->enteredText[st->text_len] = 0;
-			ptr = st->enteredText;
-			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
-			if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
-			szStr[len] = 0;
-			n->enteredText.buffer = gf_strdup(szStr);
-			gf_node_event_out_str((GF_Node *)n, "enteredText");
-		}
-	}
-#endif
-}
-
-#ifndef GPAC_DISABLE_X3D
-
-void DestroyKeySensor(GF_Node *node, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		GF_Terminal *term = (GF_Terminal *) gf_node_get_private(node);
-		gf_list_del_item(term->x3d_sensors, node);
-	}
-}
-void InitKeySensor(GF_Scene *scene, GF_Node *node)
-{
-	gf_node_set_private(node, scene->root_od->term);
-	gf_node_set_callback_function(node, DestroyKeySensor);
-	gf_list_add(scene->root_od->term->x3d_sensors, node);
-}
-
-void DestroyStringSensor(GF_Node *node, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		StringSensorStack *st = (StringSensorStack *) gf_node_get_private(node);
-		gf_list_del_item(st->term->x3d_sensors, node);
-		gf_free(st);
-	}
-}
-void InitStringSensor(GF_Scene *scene, GF_Node *node)
-{
-	StringSensorStack*st;
-	GF_SAFEALLOC(st, StringSensorStack)
-	if (!st) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate string sensor stack\n"));
-		return;
-	}
-	st->term = scene->root_od->term;
-	gf_node_set_private(node, st);
-	gf_node_set_callback_function(node, DestroyStringSensor);
-	gf_list_add(scene->root_od->term->x3d_sensors, node);
-}
-
-#endif /*GPAC_DISABLE_X3D*/
-
-#else
-
-GF_EXPORT
-void gf_term_mouse_input(GF_Terminal *term, GF_EventMouse *event)
-{
-}
-GF_EXPORT
-Bool gf_term_keyboard_input(GF_Terminal *term, u32 key_code, u32 hw_code, Bool isKeyUp)
-{
-	return GF_TRUE;
-}
-GF_EXPORT
-void gf_term_string_input(GF_Terminal *term, u32 character)
-{
-}
-
-#endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/terminal/input_sensor.h Deleted

@@ -1,111 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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.
- *
- */
-
-#ifndef _INPUT_SENSOR_H_
-#define _INPUT_SENSOR_H_
-
-#include <gpac/internal/terminal_dev.h>
-/*input sensor defs*/
-#include <gpac/nodes_mpeg4.h>
-
-#ifndef GPAC_DISABLE_VRML
-
-enum
-{
-	IS_KeySensor = 1,
-	IS_StringSensor,
-	IS_Mouse,
-	IS_HTKSensor,
-};
-
-#define GPAC_HTK_DEMO  0
-
-
-typedef struct
-{
-	/*parent scene*/
-	GF_Scene *scene;
-	/*list of attached nodes*/
-	GF_List *is_nodes;
-	/*stream ID*/
-	u16 ES_ID;
-	/*uncompressed data frame*/
-	GF_List *ddf;
-
-	GF_InputSensorDevice *io_dev;
-
-	u32 type;
-
-	/*string sensor sep char */
-	s16 termChar, delChar;
-	/*current typed text in UTF-8*/
-	unsigned short enteredText[5000];
-	u32 text_len;
-	Bool is_local;
-
-#if GPAC_HTK_DEMO
-	GF_Thread *th;
-	Bool htk_running;
-	char szHTKPath[GF_MAX_PATH];
-#endif
-
-} ISPriv;
-
-
-GF_BaseDecoder *gf_isdec_new(GF_ESD *esd, u32 PL);
-void gf_isdec_del(GF_BaseDecoder *plug);
-GF_Err gf_isdec_configure(GF_BaseDecoder *plug, GF_Scene *scene, Bool is_remote);
-
-
-typedef struct
-{
-	/*stream context*/
-	u16 ES_ID;
-	Bool registered;
-	GF_MediaObject *mo;
-	M_InputSensor *is;
-} ISStack;
-
-
-void InitInputSensor(GF_Scene *scene, GF_Node *node);
-void InputSensorModified(GF_Node *n);
-
-void InitKeySensor(GF_Scene *scene, GF_Node *node);
-
-
-typedef struct
-{
-	u16 enteredText[5000];
-	u32 text_len;
-	GF_Terminal *term;
-} StringSensorStack;
-
-void InitStringSensor(GF_Scene *scene, GF_Node *node);
-
-#endif /*GPAC_DISABLE_VRML*/
-
-
-#endif	/*_INPUT_SENSOR_H_*/
-

gpac-0.8.0.tar.gz/src/terminal/media_control.c Deleted

@@ -1,714 +0,0 @@
-
-
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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 "media_control.h"
-#include <gpac/constants.h>
-#include <gpac/internal/compositor_dev.h>
-
-
-void mediacontrol_restart(GF_ObjectManager *odm)
-{
-	GF_List *to_restart;
-	GF_ObjectManager *ctrl_od;
-	GF_Clock *ck, *scene_ck;
-	u32 i;
-	u32 current_seg;
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-#endif
-
-	if (!odm || (odm->flags & GF_ODM_NO_TIME_CTRL) ) return;
-
-#ifndef GPAC_DISABLE_VRML
-	ctrl = gf_odm_get_mediacontrol(odm);
-	if (ctrl) {
-		/*we have a control - filter calls to only handle objects owning media control*/
-		ctrl_od = ctrl->stream->odm;
-		/*if media control owns the scene this OD refers to the scene is always restarted - TODO make that an option*/
-		if (!ctrl_od->subscene) {
-			if (ctrl->stream->odm != odm) return;
-		}
-		odm = ctrl->stream->odm;
-
-		/*this is inline restart - only possible through media control*/
-		if (odm->subscene && odm->subscene->root_od==ctrl->stream->odm) {
-			gf_inline_restart(odm->subscene);
-			return;
-		}
-	}
-#endif
-
-	/*if clock is main scene clock do nothing*/
-	scene_ck = gf_odm_get_media_clock(odm->parentscene->root_od);
-	if (gf_odm_shares_clock(odm, scene_ck)) {
-		if (odm->parentscene->is_dynamic_scene)
-			gf_scene_restart_dynamic(odm->parentscene, 0, 0, 0);
-		return;
-	}
-
-	/*otherwise locate all objects sharing the clock*/
-	ck = gf_odm_get_media_clock(odm);
-	if (!ck) return;
-
-	current_seg = 0;
-#ifndef GPAC_DISABLE_VRML
-	/*store current segment idx*/
-	if (ctrl) {
-		current_seg = ctrl->current_seg;
-		/*if last segment is passed restart*/
-		if (gf_list_count(ctrl->seg) == current_seg) current_seg = 0;
-	}
-#endif
-
-	to_restart = gf_list_new();
-	/*do stop/start in 2 pass, it's much cleaner for servers*/
-	i=0;
-	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(odm->parentscene->resources, &i))) {
-		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
-		/*if running, stop and collect for restart*/
-		if (ctrl_od->state) {
-			gf_odm_stop(ctrl_od, 1);
-			gf_list_add(to_restart, ctrl_od);
-		}
-	}
-	/*force clock reset since we don't know how OD ordering is done*/
-	gf_clock_reset(ck);
-#ifndef GPAC_DISABLE_VRML
-	if (ctrl) ctrl->current_seg = current_seg;
-#endif
-
-	/*play on all ODs collected for restart*/
-	i=0;
-	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
-		//we want to make sure restart is clled right away with the current media control settings
-		gf_odm_start(ctrl_od, 2);
-	}
-	gf_list_del(to_restart);
-}
-
-
-Bool MC_URLChanged(MFURL *old_url, MFURL *new_url)
-{
-	u32 i;
-	if (gf_mo_get_od_id(old_url) != gf_mo_get_od_id(new_url)) return 1;
-	
-	if ((new_url->count==1) && new_url->vals[0].url && !strlen(new_url->vals[0].url) ) new_url->count = 0;
-	
-	if (old_url->count != new_url->count) return 1;
-
-	for (i=0; i<old_url->count; i++) {
-		if (old_url->vals[i].url || new_url->vals[i].url) {
-			if (!old_url->vals[i].url || !new_url->vals[i].url) return 1;
-			if (strcmp(old_url->vals[i].url, new_url->vals[i].url)) return 1;
-		}
-	}
-	return 0;
-}
-
-
-
-
-/*resume all objects*/
-void mediacontrol_resume(GF_ObjectManager *odm, Bool resume_to_live)
-{
-	u32 i;
-	GF_ObjectManager *ctrl_od;
-	GF_Scene *in_scene;
-	GF_Clock *ck;
-
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
-
-	/*otherwise locate all objects sharing the clock*/
-	ck = gf_odm_get_media_clock(odm);
-	if (!ck) return;
-
-	in_scene = odm->parentscene;
-	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
-		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
-		/*resume root*/
-		gf_odm_resume(odm);
-		in_scene = odm->subscene;
-	}
-
-	i=0;
-	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
-		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
-			continue;
-
-		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			gf_clock_resume(ck);
-			if (resume_to_live)
-				gf_scene_select_main_addon(in_scene, ctrl_od, GF_FALSE, 0);
-		}
-
-		if (ctrl_od->subscene) {
-			mediacontrol_resume(ctrl_od, resume_to_live);
-		} else {
-			gf_odm_resume(ctrl_od);
-		}
-	}
-}
-
-
-/*pause all objects*/
-void mediacontrol_pause(GF_ObjectManager *odm)
-{
-	u32 i;
-	GF_ObjectManager *ctrl_od;
-	GF_Scene *in_scene;
-	GF_Clock *ck;
-
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
-
-	/*otherwise locate all objects sharing the clock*/
-	ck = gf_odm_get_media_clock(odm);
-	if (!ck) {
-		odm->flags |= GF_ODM_PAUSE_QUEUED;
-		return;
-	}
-
-	in_scene = odm->parentscene;
-	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
-		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
-		/*pause root*/
-		gf_odm_pause(odm);
-		in_scene = odm->subscene;
-	}
-
-	i=0;
-	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
-		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
-			continue;
-
-		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-			gf_clock_pause(ck);
-			gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
-		}
-
-		if (ctrl_od->subscene) {
-			mediacontrol_pause(ctrl_od);
-		} else {
-			gf_odm_pause(ctrl_od);
-		}
-	}
-}
-
-
-/*pause all objects*/
-void mediacontrol_set_speed(GF_ObjectManager *odm, Fixed speed)
-{
-	u32 i;
-	GF_ObjectManager *ctrl_od;
-	GF_Scene *in_scene;
-	GF_Clock *ck;
-
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
-
-	/*locate all objects sharing the clock*/
-	ck = gf_odm_get_media_clock(odm);
-	if (!ck) return;
-
-	in_scene = odm->parentscene;
-	if (odm->subscene) {
-		assert(odm->subscene->root_od==odm);
-		in_scene = odm->subscene;
-
-		//dynamic scene with speed direction, we need to re-start everything to issue new PLAY requests
-		if (in_scene->is_dynamic_scene && (gf_mulfix(ck->speed, speed) < 0)) {
-			u32 time = gf_clock_time(ck);
-			gf_clock_set_speed(ck, speed);
-
-			//enable main addon
-			if (speed<0) {
-				i=0;
-				while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
-					if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-						gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
-						break;
-					}
-				}
-			}
-			gf_scene_restart_dynamic(in_scene, time, 0, 1);
-			return;
-		}
-		gf_clock_set_speed(ck, speed);
-		gf_odm_set_speed(odm, speed, GF_TRUE);
-	}
-
-	i=0;
-	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
-		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
-
-		if (ctrl_od->subscene) {
-			mediacontrol_set_speed(ctrl_od, speed);
-		} else {
-			gf_odm_set_speed(ctrl_od, speed, GF_TRUE);
-		}
-	}
-}
-
-#ifndef GPAC_DISABLE_VRML
-
-void MC_GetRange(MediaControlStack *ctrl, Double *start_range, Double *end_range)
-{
-	u32 i;
-	Double duration;
-	GF_Segment *last_seg, *prev_seg;
-
-	if (gf_list_count(ctrl->seg)) {
-		GF_Segment *desc = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
-		if (!desc) {
-			*start_range = 0;
-			*end_range = 0;
-			return;
-		}
-		/*get last segment in consecutive range so that we never issue stop/play between consecutive segments*/
-		prev_seg = desc;
-		last_seg = NULL;
-		duration = desc->Duration;
-		i=1+ctrl->current_seg;
-		while ((last_seg = (GF_Segment *)gf_list_enum(ctrl->seg, &i))) {
-			if (prev_seg->startTime + prev_seg->Duration != last_seg->startTime) {
-				last_seg = NULL;
-				break;
-			}
-			prev_seg = last_seg;
-			duration += last_seg->Duration;
-		}
-//		if (!last_seg) last_seg = desc;
-
-		*start_range = desc->startTime;
-		if (ctrl->control->mediaStartTime>=0) *start_range += ctrl->control->mediaStartTime;
-
-		*end_range = desc->startTime;
-		if ((ctrl->control->mediaStopTime>=0) && ctrl->control->mediaStopTime<duration) {
-			*end_range += ctrl->control->mediaStopTime;
-		} else {
-			*end_range += duration;
-		}
-	} else {
-		if (ctrl->control->mediaStartTime>=0) *start_range = ctrl->control->mediaStartTime;
-		if (ctrl->control->mediaStopTime>=0) *end_range = ctrl->control->mediaStopTime;
-	}
-}
-
-
-void RenderMediaControl(GF_Node *node, void *rs, Bool is_destroy)
-{
-	Bool shall_restart, need_restart;
-	GF_MediaObject *prev;
-	GF_ObjectManager *odm;
-	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
-	MediaControlStack *stack =(MediaControlStack *) gf_node_get_private(node);
-
-	if (is_destroy) {
-		GF_ObjectManager *odm;
-		MediaControlStack *stack = (MediaControlStack *) gf_node_get_private(node);
-
-		/*reset ODM using this control*/
-		if (stack->stream) {
-			if (stack->stream->odm) {
-				odm = stack->stream->odm;
-				gf_odm_remove_mediacontrol(odm, stack);
-			}
-			/*also removes the association ck<->MC if the object has been destroyed before the node*/
-			if (stack->ck) stack->ck->mc = NULL;
-		}
-		gf_list_del(stack->seg);
-		gf_sg_vrml_mf_reset(&stack->url, GF_SG_VRML_MFURL);
-		gf_free(stack);
-		return;
-	}
-	//we need to disable culling otherwise we may never be called back again ...
-	tr_state->disable_cull = 1;
-
-	/*not changed nothing to do - note we need to register with stream yet for control switching...*/
-	if (stack->stream && (!stack->changed || !stack->control->enabled)) return;
-
-	need_restart = (stack->changed==2) ? 1 : 0;
-	shall_restart = (stack->control->mediaStartTime>=0) ? 1 : 0;
-
-	/*check url target*/
-	if (stack->stream) {
-		if (MC_URLChanged(&stack->url, &stack->control->url)) {
-			gf_sg_vrml_mf_reset(&stack->url, GF_SG_VRML_MFURL);
-
-			prev = stack->stream;
-			if (gf_list_find(stack->parent->scene_objects, prev)<0)
-				prev = NULL;
-
-			stack->stream = gf_scene_get_media_object(stack->parent, &stack->control->url, GF_MEDIA_OBJECT_UNDEF, 0);
-			if (stack->stream) {
-				if (!stack->stream->odm) return;
-				/*MediaControl on inline: if dynamic scene, make sure it is connected before attaching...*/
-				if (stack->stream->odm->subscene) {
-					if (stack->stream->odm->subscene->is_dynamic_scene && !stack->stream->odm->subscene->dyn_ck) return;
-				}
-				gf_sg_vrml_field_copy(&stack->url, &stack->control->url, GF_SG_VRML_MFURL);
-
-				/*remove from prev*/
-				if (prev && prev->odm && (prev != stack->stream)) gf_odm_remove_mediacontrol(prev->odm, stack);
-				/*register with new*/
-				/*if we assigned the media control to an exiting object - force the state of the object*/
-				gf_odm_set_mediacontrol((GF_ObjectManager *) stack->stream->odm, stack);
-
-				while (gf_list_count(stack->seg)) gf_list_rem(stack->seg, 0);
-				gf_odm_init_segments((GF_ObjectManager *) stack->stream->odm, stack->seg, &stack->control->url);
-
-				stack->current_seg = 0;
-				//do not restart if no mediaStartTime and speed is 1
-				if ((stack->control->mediaStartTime>0) || gf_list_count(stack->seg) || (stack->control->mediaSpeed != FIX_ONE) ) {
-					shall_restart = need_restart = 1;
-				} else {
-					shall_restart = need_restart = 0;
-					//URL changed, we are by default in PLAY mode.
-					stack->media_speed = 1;
-				}
-
-				stack->ck = gf_odm_get_media_clock(stack->stream->odm);
-			}
-			/*control has been removed and we were paused, resume*/
-			else if (stack->paused) {
-				if (prev)
-					mediacontrol_resume((GF_ObjectManager *) prev->odm, 0);
-				
-				stack->paused = 0;
-			}
-			/*MediaControl has been detached*/
-			else {
-				if (prev)
-					gf_odm_remove_mediacontrol(prev->odm, stack);
-				return;
-			}
-		}
-	} else {
-		stack->stream = gf_scene_get_media_object(stack->parent, &stack->control->url, GF_MEDIA_OBJECT_UNDEF, 0);
-		if (!stack->stream || !stack->stream->odm) {
-			if (stack->control->url.count) gf_term_invalidate_compositor(stack->parent->root_od->term);
-			stack->stream = NULL;
-			stack->changed = 0;
-			return;
-		}
-		stack->ck = gf_odm_get_media_clock(stack->stream->odm);
-		/*OD not ready yet*/
-		if (!stack->ck) {
-			stack->stream = NULL;
-			if (stack->control->url.count) {
-				stack->is_init = 0;
-				gf_term_invalidate_compositor(stack->parent->root_od->term);
-			}
-			return;
-		}
-		gf_sg_vrml_field_copy(&stack->url, &stack->control->url, GF_SG_VRML_MFURL);
-		gf_odm_set_mediacontrol((GF_ObjectManager *) stack->stream->odm, stack);
-
-		while (gf_list_count(stack->seg)) gf_list_rem(stack->seg, 0);
-		gf_odm_init_segments((GF_ObjectManager *) stack->stream->odm, stack->seg, &stack->control->url);
-		stack->current_seg = 0;
-
-		/*we shouldn't have to restart unless start/stop times have been changed, which is tested below*/
-		need_restart = 0;
-	}
-
-	if ((stack->is_init && !stack->changed) || !stack->control->enabled || !stack->stream) return;
-
-
-	/*if not previously enabled and now enabled, switch all other controls off and reactivate*/
-	if (!stack->enabled) {
-		stack->enabled = 1;
-		need_restart = gf_odm_switch_mediacontrol(stack->stream->odm, stack);
-	}
-
-	stack->changed = 0;
-
-	if (!stack->control->mediaSpeed) shall_restart = 0;
-
-	odm = (GF_ObjectManager *)stack->stream->odm;
-
-	/*check for changes*/
-	if (!stack->is_init) {
-		need_restart = 0;
-		/*not linked yet*/
-		if (!odm) return;
-		stack->media_speed = stack->control->mediaSpeed;
-		stack->enabled = stack->control->enabled;
-		stack->media_start = stack->control->mediaStartTime;
-		if (stack->media_stop != stack->control->mediaStopTime) {
-			if (stack->control->mediaStopTime < 1000000000) need_restart  = 1;
-			stack->media_stop = stack->control->mediaStopTime;
-		}
-		stack->is_init = 1;
-		stack->paused = 0;
-		/*the object has already been started, and media start time is not 0, restart*/
-		if (stack->stream->num_open) {
-			if (need_restart  || (stack->media_start > 0) || (gf_list_count(stack->seg)>0 )  || (stack->media_speed!=FIX_ONE ) ) {
-				mediacontrol_restart(odm);
-			} else if (stack->media_speed == 0) {
-				mediacontrol_pause(odm);
-				stack->paused = 1;
-			}
-		}
-		return;
-	}
-
-	if (stack->media_speed != stack->control->mediaSpeed) {
-		/*if no speed pause*/
-		if (!stack->control->mediaSpeed && !stack->paused) {
-			mediacontrol_pause(odm);
-			stack->paused = 1;
-		}
-		/*else resume if paused*/
-		else if (stack->control->mediaSpeed && stack->paused) {
-			mediacontrol_resume(odm, 0);
-			stack->paused = 0;
-			need_restart += shall_restart;
-		}
-		/*else set speed*/
-		else if (stack->media_speed && stack->control->mediaSpeed) {
-			/*don't set speed if we have to restart the media ...*/
-			if (!shall_restart) mediacontrol_set_speed(odm, stack->control->mediaSpeed);
-			need_restart += shall_restart;
-		}
-		/*init state was paused*/
-		else if (!stack->media_speed) {
-			need_restart ++;
-		}
-		stack->media_speed = stack->control->mediaSpeed;
-	}
-	/*check start/stop changes*/
-	if (stack->media_start != stack->control->mediaStartTime) {
-		stack->media_start = stack->control->mediaStartTime;
-		need_restart += shall_restart;
-	}
-	/*stop change triggers restart no matter what (new range) if playing*/
-	if (stack->media_stop != stack->control->mediaStopTime) {
-		stack->media_stop = stack->control->mediaStopTime;
-		if (stack->control->mediaSpeed) need_restart = 1;
-	}
-
-	if (need_restart) {
-		mediacontrol_restart(odm);
-	}
-
-	/*handle preroll*/
-
-}
-
-void InitMediaControl(GF_Scene *scene, GF_Node *node)
-{
-	MediaControlStack *stack;
-	GF_SAFEALLOC(stack, MediaControlStack);
-	if (!stack) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate media control stack\n"));
-		return;
-	}
-	stack->changed = 1;
-	stack->parent = scene;
-	stack->control = (M_MediaControl *)node;
-	stack->seg = gf_list_new();
-
-	/*default values are stored on first render*/
-	gf_node_set_callback_function(node, RenderMediaControl);
-	gf_node_set_private(node, stack);
-}
-
-
-void MC_Modified(GF_Node *node)
-{
-	MediaControlStack *stack =(MediaControlStack *) gf_node_get_private(node);
-	if (!stack) return;
-	if (stack->changed!=2) {
-		/*check URL*/
-		if (MC_URLChanged(&stack->url, &stack->control->url))
-			stack->changed = 2;
-		/*check speed (play/pause)*/
-		else if (stack->media_speed != stack->control->mediaSpeed)
-			stack->changed = 1;
-		/*check mediaStartTime (seek)*/
-		else if (stack->media_start != stack->control->mediaStartTime) {
-			/*do not reevaluate if mediaStartTime is reset to -1 (current time)*/
-			if (stack->control->mediaStartTime!=-1.0)
-				stack->changed = 2;
-			/*check mediaStopTime <0 (timeshift buffer control)*/
-		} else if (stack->media_stop != stack->control->mediaStopTime) {
-			if (stack->control->mediaStopTime<=0)
-				stack->changed = 2;
-		}
-//		else stack->changed = 1;
-	}
-
-	gf_node_dirty_set( gf_sg_get_root_node(gf_node_get_graph(node)), 0, 1);
-	/*invalidate scene, we recompute MC state in render*/
-	gf_term_invalidate_compositor(stack->parent->root_od->term);
-}
-
-
-void gf_odm_set_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
-{
-	u32 i;
-	GF_Channel *ch;
-
-	/*keep track of it*/
-	if (ctrl && (gf_list_find(odm->mc_stack, ctrl) < 0)) gf_list_add(odm->mc_stack, ctrl);
-	if (ctrl && !ctrl->control->enabled) return;
-
-	if (odm->subscene && odm->subscene->is_dynamic_scene) {
-		if (odm->subscene->dyn_ck) {
-			/*deactivate current control*/
-			if (ctrl && odm->subscene->dyn_ck->mc) {
-				odm->subscene->dyn_ck->mc->control->enabled = 0;
-				gf_node_event_out((GF_Node *)odm->subscene->dyn_ck->mc->control, 7/*"enabled"*/);
-			}
-			odm->subscene->dyn_ck->mc = ctrl;
-		}
-	} else {
-		/*for each clock in the controled OD*/
-		i=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-			if (ch->clock->mc != ctrl) {
-				/*deactivate current control*/
-				if (ctrl && ch->clock->mc) {
-					ch->clock->mc->control->enabled = 0;
-					gf_node_event_out((GF_Node *)ch->clock->mc->control, 7/*"enabled"*/);
-				}
-				/*and attach this control to the clock*/
-				ch->clock->mc = ctrl;
-			}
-		}
-	}
-	/*store active control on media*/
-	odm->media_ctrl = gf_odm_get_mediacontrol(odm);
-}
-
-
-
-MediaControlStack *gf_odm_get_mediacontrol(GF_ObjectManager *odm)
-{
-	GF_Clock *ck;
-	ck = gf_odm_get_media_clock(odm);
-	if (!ck) return NULL;
-	return ck->mc;
-}
-
-
-void gf_odm_remove_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
-{
-	gf_list_del_item(odm->mc_stack, ctrl);
-	/*removed. Note the spec doesn't say what to do in this case...*/
-	if (odm->media_ctrl == ctrl) {
-		/*we're about to release the media control from this object - if paused, force a resume (as if no MC was set)*/
-		if (ctrl->paused)
-			mediacontrol_resume(odm, 0);
-		gf_odm_set_mediacontrol(odm, NULL);
-	}
-}
-
-Bool gf_odm_switch_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
-{
-	u32 i;
-	MediaControlStack *st2;
-	if (!ctrl->control->enabled) return 0;
-
-	/*for all media controls other than this one force enable to false*/
-	i=0;
-	while ((st2 = (MediaControlStack *)gf_list_enum(odm->mc_stack, &i))) {
-		if (st2 == ctrl) continue;
-		if (st2->control->enabled) {
-			st2->control->enabled = 0;
-			gf_node_event_out((GF_Node *) st2->control, 7/*"enabled"*/);
-		}
-		st2->enabled = 0;
-	}
-	if (ctrl == odm->media_ctrl) return 0;
-	gf_odm_set_mediacontrol(odm, ctrl);
-	return 1;
-}
-
-Bool gf_odm_check_segment_switch(GF_ObjectManager *odm)
-{
-	u32 count, i;
-	GF_Segment *cur, *next;
-	MediaControlStack *ctrl = gf_odm_get_mediacontrol(odm);
-
-	/*if no control or control not on this object ignore segment switch*/
-	if (!ctrl || (ctrl->stream->odm != odm)) return 0;
-
-	count = gf_list_count(ctrl->seg);
-	/*reached end of controled stream (no more segments)*/
-	if (ctrl->current_seg>=count) return 0;
-
-	/*synth media, trigger if end of segment run-time*/
-	if (!odm->codec || ((odm->codec->type!=GF_STREAM_VISUAL) && (odm->codec->type!=GF_STREAM_AUDIO))) {
-		GF_Clock *ck = gf_odm_get_media_clock(odm);
-		u32 now = gf_clock_time(ck);
-		u64 dur = odm->subscene ? odm->subscene->duration : odm->duration;
-		cur = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
-		if (odm->subscene && odm->subscene->needs_restart) return 0;
-		if (cur) dur = (u32) ((cur->Duration+cur->startTime)*1000);
-		//if next frame is after current segment trigger switch now
-		if (now + odm->term->compositor->frame_duration < dur)
-			return 0;
-	} else {
-		/*FIXME - for natural media with scalability, we should only process when all streams of the object are done*/
-	}
-
-	/*get current segment and move to next one*/
-	cur = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
-	ctrl->current_seg ++;
-
-	/*resync in case we have been issuing a play range over several segments*/
-	for (i=ctrl->current_seg; i<count; i++) {
-		next = (GF_Segment *)gf_list_get(ctrl->seg, i);
-		if (
-		    /*if next seg start is after cur seg start*/
-		    (cur->startTime < next->startTime)
-		    /*if next seg start is before cur seg end*/
-		    && (cur->startTime + cur->Duration > next->startTime)
-		    /*if next seg start is already passed*/
-		    && (1000*next->startTime < odm->media_current_time)
-		    /*then next segment was taken into account when requesting play*/
-		) {
-			cur = next;
-			ctrl->current_seg ++;
-		}
-	}
-	/*if last segment in ctrl is done, end of stream*/
-	if (ctrl->current_seg >= count) return 0;
-	next = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
-
-	/*if next seg start is not in current seg, media needs restart*/
-	if ((next->startTime < cur->startTime) || (cur->startTime + cur->Duration < next->startTime))
-		mediacontrol_restart(odm);
-
-	return 1;
-}
-
-
-#endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/terminal/media_control.h Deleted

@@ -1,115 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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.
- *
- */
-
-
-
-#ifndef _MEDIA_CONTROL_H_
-#define _MEDIA_CONTROL_H_
-
-#include <gpac/internal/terminal_dev.h>
-/*MediaControl definition*/
-#include <gpac/nodes_mpeg4.h>
-
-
-/*restart object and takes care of media control/clock dependencies*/
-void mediacontrol_restart(GF_ObjectManager *odm);
-void mediacontrol_pause(GF_ObjectManager *odm);
-//resumes object.
-//If @resume_to_live is set, will deactivate main addon acting as PVR
-void mediacontrol_resume(GF_ObjectManager *odm, Bool resume_to_live);
-
-Bool MC_URLChanged(MFURL *old_url, MFURL *new_url);
-
-void mediasensor_update_timing(GF_ObjectManager *odm, Bool is_eos);
-
-#ifndef GPAC_DISABLE_VRML
-
-/*to do: add preroll support*/
-typedef struct _media_control
-{
-	M_MediaControl *control;
-
-	/*store current values to detect changes*/
-	Double media_start, media_stop;
-	Fixed media_speed;
-	Bool enabled;
-	MFURL url;
-
-	GF_Scene *parent;
-	/*stream owner*/
-	GF_MediaObject *stream;
-	/*stream owner's clock*/
-	GF_Clock *ck;
-
-	u32 changed;
-	Bool is_init;
-	Bool paused;
-	u32 prev_active;
-
-	/*stream object list (segments)*/
-	GF_List *seg;
-	/*current active segment index (ie, controling the PLAY range of the media)*/
-	u32 current_seg;
-} MediaControlStack;
-void InitMediaControl(GF_Scene *scene, GF_Node *node);
-void MC_Modified(GF_Node *node);
-
-void MC_GetRange(MediaControlStack *ctrl, Double *start_range, Double *end_range);
-
-/*assign mediaControl for this object*/
-void gf_odm_set_mediacontrol(GF_ObjectManager *odm, struct _media_control *ctrl);
-/*get media control ruling the clock the media is running on*/
-struct _media_control *gf_odm_get_mediacontrol(GF_ObjectManager *odm);
-/*removes control from OD context*/
-void gf_odm_remove_mediacontrol(GF_ObjectManager *odm, struct _media_control *ctrl);
-/*switches control (propagates enable=FALSE), returns 1 if control associated with OD has changed to new one*/
-Bool gf_odm_switch_mediacontrol(GF_ObjectManager *odm, struct _media_control *ctrl);
-
-/*returns 1 if this is a segment switch, 0 otherwise - takes care of object restart if segment switch*/
-Bool gf_odm_check_segment_switch(GF_ObjectManager *odm);
-
-typedef struct _media_sensor
-{
-	M_MediaSensor *sensor;
-
-	GF_Scene *parent;
-
-	GF_List *seg;
-	Bool is_init;
-	/*stream owner*/
-	GF_MediaObject *stream;
-
-	/*private cache (avoids browsing all sensor*/
-	u32 active_seg;
-} MediaSensorStack;
-
-void InitMediaSensor(GF_Scene *scene, GF_Node *node);
-void MS_Modified(GF_Node *node);
-
-void MS_Stop(MediaSensorStack *st);
-
-#endif	/*GPAC_DISABLE_VRML*/
-
-#endif	/*_MEDIA_CONTROL_H_*/

gpac-0.8.0.tar.gz/src/terminal/media_manager.c Deleted

@@ -1,779 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include "media_memory.h"
-#include <gpac/internal/compositor_dev.h>
-
-
-u32 MM_Loop(void *par);
-
-
-enum
-{
-	GF_MM_CE_RUNNING= 1,
-	GF_MM_CE_HAS_ERROR = 1<<1,
-	GF_MM_CE_THREADED = 1<<2,
-	GF_MM_CE_REQ_THREAD = 1<<3,
-	/*only used by threaded decs to signal end of thread*/
-	GF_MM_CE_DEAD = 1<<4,
-	GF_MM_CE_DISCARDED = 1<<5,
-};
-
-typedef struct
-{
-	u32 flags;
-	GF_Codec *dec;
-	/*for threaded decoders*/
-	GF_Thread *thread;
-	GF_Mutex *mx;
-} CodecEntry;
-
-GF_Err gf_term_init_scheduler(GF_Terminal *term, u32 threading_mode)
-{
-	term->mm_mx = gf_mx_new("MediaManager");
-	term->codecs = gf_list_new();
-
-	term->frame_duration = 33;
-	switch (threading_mode) {
-	case GF_TERM_THREAD_SINGLE:
-		term->flags |= GF_TERM_SINGLE_THREAD;
-		break;
-	case GF_TERM_THREAD_MULTI:
-		term->flags |= GF_TERM_MULTI_THREAD;
-		break;
-	default:
-		break;
-	}
-
-	if (term->user->init_flags & GF_TERM_NO_DECODER_THREAD)
-		return GF_OK;
-
-	term->mm_thread = gf_th_new("MediaManager");
-	term->flags |= GF_TERM_RUNNING;
-	term->priority = GF_THREAD_PRIORITY_NORMAL;
-	gf_th_run(term->mm_thread, MM_Loop, term);
-	return GF_OK;
-}
-
-void gf_term_stop_scheduler(GF_Terminal *term)
-{
-	if (term->mm_thread) {
-		u32 count, i;
-
-		term->flags &= ~GF_TERM_RUNNING;
-		while (!(term->flags & GF_TERM_DEAD) )
-			gf_sleep(2);
-
-		count = gf_list_count(term->codecs);
-		for (i=0; i<count; i++) {
-			CodecEntry *ce = gf_list_get(term->codecs, i);
-			if (ce->flags & GF_MM_CE_DISCARDED) {
-				gf_free(ce);
-				gf_list_rem(term->codecs, i);
-				count--;
-				i--;
-			}
-		}
-
-		assert(! gf_list_count(term->codecs));
-		gf_th_del(term->mm_thread);
-	}
-	gf_list_del(term->codecs);
-	gf_mx_del(term->mm_mx);
-}
-
-static CodecEntry *mm_get_codec(GF_List *list, GF_Codec *codec)
-{
-	CodecEntry *ce;
-	u32 i = 0;
-	while ((ce = (CodecEntry*)gf_list_enum(list, &i))) {
-		if (ce->dec==codec) return ce;
-	}
-	return NULL;
-}
-
-
-void gf_term_add_codec(GF_Terminal *term, GF_Codec *codec)
-{
-	u32 i, count;
-	Bool threaded;
-	CodecEntry *cd;
-	CodecEntry *ptr, *next;
-	GF_CodecCapability cap;
-	assert(codec);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Registering codec %s\n", codec->decio ? codec->decio->module_name : "RAW"));
-
-	/*caution: the mutex can be grabbed by a decoder waiting for a mutex owned by the calling thread
-	this happens when several scene codecs are running concurently and triggering play/pause on media*/
-	gf_mx_p(term->mm_mx);
-
-	cd = mm_get_codec(term->codecs, codec);
-	if (cd) goto exit;
-
-	GF_SAFEALLOC(cd, CodecEntry);
-	if (!cd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate decoder entry\n"));
-		return;
-	}
-	cd->dec = codec;
-	if (!cd->dec->Priority)
-		cd->dec->Priority = 1;
-
-	/*we force audio codecs to be threaded in free mode, so that we avoid waiting in the audio renderer if another decoder is locking the main mutex
-	this can happen when the audio decoder is running late*/
-	if (codec->type==GF_STREAM_AUDIO) {
-		threaded = 1;
-	} else {
-		cap.CapCode = GF_CODEC_WANTS_THREAD;
-		cap.cap.valueInt = 0;
-		gf_codec_get_capability(codec, &cap);
-		threaded = cap.cap.valueInt;
-	}
-
-	if (threaded) cd->flags |= GF_MM_CE_REQ_THREAD;
-
-
-	if (term->flags & GF_TERM_MULTI_THREAD) {
-		if ((codec->type==GF_STREAM_AUDIO) || (codec->type==GF_STREAM_VISUAL)) threaded = 1;
-	} else if (term->flags & GF_TERM_SINGLE_THREAD) {
-		threaded = 0;
-	}
-	if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA)
-		threaded = 0;
-
-	if (threaded) {
-		cd->thread = gf_th_new(cd->dec->decio->module_name);
-		cd->mx = gf_mx_new(cd->dec->decio->module_name);
-		cd->flags |= GF_MM_CE_THREADED;
-		gf_list_add(term->codecs, cd);
-		goto exit;
-	}
-
-	//add codec 1- per priority 2- per type, audio being first
-	//priorities inherits from Systems (5bits) so range from 0 to 31
-	//we sort from MAX to MIN
-	count = gf_list_count(term->codecs);
-	for (i=0; i<count; i++) {
-		ptr = (CodecEntry*)gf_list_get(term->codecs, i);
-		if (ptr->flags & GF_MM_CE_THREADED) continue;
-
-		//higher priority, continue
-		if (ptr->dec->Priority > codec->Priority) continue;
-
-		//same priority, put audio first
-		if (ptr->dec->Priority == codec->Priority) {
-			//we insert audio (0x05) before video (0x04)
-			if (ptr->dec->type < codec->type) {
-				gf_list_insert(term->codecs, cd, i);
-				goto exit;
-			}
-			//same prior, same type: insert after
-			if (ptr->dec->type == codec->type) {
-				if (i+1==count) {
-					gf_list_add(term->codecs, cd);
-				} else {
-					gf_list_insert(term->codecs, cd, i+1);
-				}
-				goto exit;
-			}
-			//we insert video (0x04) after audio (0x05) if next is not audio
-			//last one
-			if (i+1 == count) {
-				gf_list_add(term->codecs, cd);
-				goto exit;
-			}
-			next = (CodecEntry*)gf_list_get(term->codecs, i+1);
-			//# priority level, insert
-			if ((next->flags & GF_MM_CE_THREADED) || (next->dec->Priority != codec->Priority)) {
-				gf_list_insert(term->codecs, cd, i+1);
-				goto exit;
-			}
-			//same priority level and at least one after : continue
-			continue;
-		}
-		gf_list_insert(term->codecs, cd, i);
-		goto exit;
-	}
-	//if we got here, first in list
-	gf_list_add(term->codecs, cd);
-
-exit:
-	gf_mx_v(term->mm_mx);
-	return;
-}
-
-void gf_term_remove_codec(GF_Terminal *term, GF_Codec *codec)
-{
-	u32 i;
-	Bool locked;
-	CodecEntry *ce;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Unregistering codec %s\n", codec->decio ? codec->decio->module_name : "RAW"));
-
-	/*cf note above*/
-	locked = gf_mx_try_lock(term->mm_mx);
-
-	i=0;
-	while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {
-		if (ce->dec != codec) continue;
-
-		if (ce->thread) {
-			if (ce->flags & GF_MM_CE_RUNNING) {
-				ce->flags &= ~GF_MM_CE_RUNNING;
-				while (! (ce->flags & GF_MM_CE_DEAD)) gf_sleep(10);
-				ce->flags &= ~GF_MM_CE_DEAD;
-			}
-			gf_th_del(ce->thread);
-			gf_mx_del(ce->mx);
-		}
-		if (locked) {
-			gf_free(ce);
-			gf_list_rem(term->codecs, i-1);
-		} else {
-			ce->flags |= GF_MM_CE_DISCARDED;
-		}
-		break;
-	}
-	if (locked) gf_mx_v(term->mm_mx);
-	return;
-}
-
-Bool gf_term_find_codec(GF_Terminal *term, GF_Codec *codec)
-{
-	CodecEntry *ce;
-	u32 i=0;
-	while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {
-		if (ce->dec == codec) return 1;
-	}
-	return 0;
-}
-
-static void MM_handleServices(GF_Terminal *term)
-{
-#ifndef GF_DISABLE_LOG
-	term->compositor->networks_time = gf_sys_clock();
-#endif
-
-//	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Media Manager] Entering simultion step\n"));
-	gf_term_handle_services(term);
-
-#ifndef GF_DISABLE_LOG
-	term->compositor->networks_time = gf_sys_clock() - term->compositor->networks_time;
-#endif
-
-}
-
-static u32 MM_SimulationStep_Decoder(GF_Terminal *term, u32 *nb_active_decs)
-{
-	CodecEntry *ce;
-	GF_Err e;
-	u32 count, remain;
-	u32 time_taken, time_slice, time_left;
-
-#ifndef GF_DISABLE_LOG
-	term->compositor->decoders_time = gf_sys_clock();
-#endif
-	gf_mx_p(term->mm_mx);
-
-	count = gf_list_count(term->codecs);
-	time_left = term->frame_duration;
-	*nb_active_decs = 0;
-
-	if (term->last_codec >= count) term->last_codec = 0;
-	remain = count;
-	/*this is ultra basic a nice scheduling system would be much better*/
-	while (remain) {
-		ce = (CodecEntry*)gf_list_get(term->codecs, term->last_codec);
-		if (!ce) break;
-
-		if (!(ce->flags & GF_MM_CE_RUNNING) || (ce->flags & GF_MM_CE_THREADED) || ce->dec->force_cb_resize) {
-			remain--;
-			if (!remain) break;
-			term->last_codec = (term->last_codec + 1) % count;
-			continue;
-		}
-		time_slice = ce->dec->Priority * time_left / term->cumulated_priority;
-		if (ce->dec->PriorityBoost) time_slice *= 2;
-		time_taken = gf_sys_clock();
-		(*nb_active_decs) ++;
-		e = gf_codec_process(ce->dec, time_slice);
-		time_taken = gf_sys_clock() - time_taken;
-		/*avoid signaling errors too often...*/
-#ifndef GPAC_DISABLE_LOG
-		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[ODM%d] Decoding Error %s\n", ce->dec->odm->OD->objectDescriptorID, gf_error_to_string(e) ));
-		} else {
-			//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Decode time slice %d ms out of %d ms\n", ce->dec->decio ? ce->dec->decio->module_name : "RAW", time_taken, time_left ));
-		}
-#endif
-		if (ce->flags & GF_MM_CE_DISCARDED) {
-			gf_free(ce);
-			gf_list_rem(term->codecs, term->last_codec);
-			count--;
-			if (!count)
-				break;
-		} else {
-			if (ce->dec->CB && (ce->dec->CB->UnitCount >= ce->dec->CB->Min)) ce->dec->PriorityBoost = 0;
-		}
-		term->last_codec = (term->last_codec + 1) % count;
-
-		remain -= 1;
-		if (time_left > time_taken) {
-			time_left -= time_taken;
-			if (!remain) break;
-		} else {
-			time_left = 0;
-			break;
-		}
-	}
-	gf_mx_v(term->mm_mx);
-#ifndef GF_DISABLE_LOG
-	term->compositor->decoders_time = gf_sys_clock() - term->compositor->decoders_time;
-#endif
-
-	return time_left;
-}
-
-u32 MM_Loop(void *par)
-{
-	GF_Terminal *term = (GF_Terminal *) par;
-	Bool do_scene = (term->flags & GF_TERM_NO_VISUAL_THREAD) ? 1 : 0;
-	Bool do_codec = (term->flags & GF_TERM_NO_DECODER_THREAD) ? 0 : 1;
-	Bool do_regulate = (term->user->init_flags & GF_TERM_NO_REGULATION) ? 0 : 1;
-	Bool no_compositor_thread = (term->user->init_flags & GF_TERM_NO_COMPOSITOR_THREAD) ? 1 : 0;
-
-	gf_th_set_priority(term->mm_thread, term->priority);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[MediaManager] Entering thread ID %d\n", gf_th_id() ));
-//	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("(RTI] Terminal Cycle Log\tServices\tDecoders\tCompositor\tSleep\n"));
-
-	while (term->flags & GF_TERM_RUNNING) {
-		u32 nb_decs = 0;
-		u32 left = 0;
-
-		if (!no_compositor_thread) 
-			MM_handleServices(term);
-
-		if (do_codec) left = MM_SimulationStep_Decoder(term, &nb_decs);
-		else left = term->frame_duration;
-
-		if (do_scene) {
-			s32 ms_until_next=0;
-			u32 time_taken = gf_sys_clock();
-			gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
-			time_taken = gf_sys_clock() - time_taken;
-			if (ms_until_next< (s32) term->frame_duration/2) {
-				left = 0;
-			} else if (left>time_taken)
-				left -= time_taken;
-			else
-				left = 0;
-		}
-		if (do_regulate) {
-			if (term->bench_mode) {
-				gf_sleep(0);
-			} else {
-				if (left==term->frame_duration) {
-					//if nothing was done during this pass but we have active decoder, just yield. We don't want to sleep since
-					//composition memory could be released at any time. We should have a signal here, rather than a wait
-					gf_sleep(nb_decs ? 0 : term->frame_duration/2);
-				}
-			}
-		}
-	}
-	term->flags |= GF_TERM_DEAD;
-	return 0;
-}
-
-u32 RunSingleDec(void *ptr)
-{
-	GF_Err e;
-	u64 time_taken;
-	CodecEntry *ce = (CodecEntry *) ptr;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[MediaDecoder %d] Entering thread ID %d\n", ce->dec->odm->OD->objectDescriptorID, gf_th_id() ));
-
-	while (ce->flags & GF_MM_CE_RUNNING) {
-		time_taken = gf_sys_clock_high_res();
-		if (!ce->dec->force_cb_resize) {
-			gf_mx_p(ce->mx);
-			e = gf_codec_process(ce->dec, ce->dec->odm->term->frame_duration);
-			if (e) gf_term_message(ce->dec->odm->term, ce->dec->odm->net_service->url, "Decoding Error", e);
-			gf_mx_v(ce->mx);
-		}
-		time_taken = gf_sys_clock_high_res() - time_taken;
-
-
-		/*no priority boost this way for systems codecs, priority is dynamically set by not releasing the
-		graph when late and moving on*/
-		if (!ce->dec->CB || (ce->dec->CB->UnitCount == ce->dec->CB->Capacity))
-			ce->dec->PriorityBoost = 0;
-
-		/*while on don't sleep*/
-		if (ce->dec->PriorityBoost) continue;
-
-		if (time_taken<20) {
-			gf_sleep(1);
-		}
-	}
-	ce->flags |= GF_MM_CE_DEAD;
-	return 0;
-}
-
-/*NOTE: when starting/stopping a decoder we only lock the decoder mutex, NOT the media manager. This
-avoids deadlocking in case a system codec waits for the scene graph and the compositor requests
-a stop/start on a media*/
-void gf_term_start_codec(GF_Codec *codec, Bool is_resume)
-{
-	GF_CodecCapability cap;
-	CodecEntry *ce;
-	GF_Terminal *term = codec->odm->term;
-	if (!gf_list_count(codec->odm->channels)) return;
-	ce = mm_get_codec(term->codecs, codec);
-	if (!ce) return;
-
-	/*lock dec*/
-	if (ce->mx) gf_mx_p(ce->mx);
-
-	/*clean decoder memory and wait for RAP*/
-	if (!is_resume && codec->CB) gf_cm_reset(codec->CB);
-
-	if (!is_resume) {
-		cap.CapCode = GF_CODEC_WAIT_RAP;
-		gf_codec_set_capability(codec, cap);
-
-		if (codec->decio && (codec->decio->InterfaceType == GF_SCENE_DECODER_INTERFACE)) {
-			cap.CapCode = GF_CODEC_SHOW_SCENE;
-			cap.cap.valueInt = 1;
-			gf_codec_set_capability(codec, cap);
-		}
-	}
-
-	gf_codec_set_status(codec, GF_ESM_CODEC_PLAY);
-
-	if (!(ce->flags & GF_MM_CE_RUNNING)) {
-		ce->flags |= GF_MM_CE_RUNNING;
-		if (ce->thread) {
-			gf_th_run(ce->thread, RunSingleDec, ce);
-			gf_th_set_priority(ce->thread, term->priority);
-		} else {
-			term->cumulated_priority += ce->dec->Priority+1;
-		}
-	}
-
-
-	/*unlock dec*/
-	if (ce->mx)
-		gf_mx_v(ce->mx);
-}
-
-void gf_term_stop_codec(GF_Codec *codec, u32 reason)
-{
-	GF_CodecCapability cap;
-	Bool locked = 0;
-	CodecEntry *ce;
-	GF_Terminal *term = codec->odm->term;
-	ce = mm_get_codec(term->codecs, codec);
-	if (!ce) return;
-
-	if (ce->mx) gf_mx_p(ce->mx);
-	/*We must make sure:
-		1- media codecs are synchrounously stop otherwise we could destroy the composition memory while
-	the codec writes to it
-		2- prevent deadlock for other codecs waiting for the scene graph
-	*/
-	else if (codec->CB) {
-		locked = 1;
-		gf_mx_p(term->mm_mx);
-	} else {
-		locked = gf_mx_try_lock(term->mm_mx);
-	}
-
-	/*for audio codec force CB to stop state to discard any pending AU. Not doing so would lead to a wrong estimation of the clock drift
-	when resuming the object*/
-	if (codec->type==GF_STREAM_AUDIO) {
-		if (reason != 2) {
-			gf_codec_set_status(codec, GF_ESM_CODEC_STOP);
-		}
-	}
-	//if video is in a dynamic scene, reset the CB if user stop (eg codec was not in EOS). Otherwise (bifs,svg) we may want to keep the last decoded image
-	else if ((codec->Status<GF_ESM_CODEC_EOS) && codec->odm && codec->odm->parentscene && codec->odm->parentscene->is_dynamic_scene && codec->CB && (codec->CB->Capacity>1)) {
-		gf_codec_set_status(codec, GF_ESM_CODEC_STOP);
-	}
-	/*otherwise set status directly and don't touch CB state*/
-	else {
-		codec->Status = GF_ESM_CODEC_STOP;
-	}
-
-	if ((reason==2) && codec->CB) {
-		gf_cm_set_eos(codec->CB);
-	}
-
-	/*signal the codec we stopped*/
-	if (reason == 0) {
-		cap.CapCode = GF_CODEC_ABORT;
-		cap.cap.valueInt = 0;
-		gf_codec_set_capability(codec, cap);
-
-		if (codec->decio && codec->odm->mo && (codec->odm->mo->flags & GF_MO_DISPLAY_REMOVE) ) {
-			cap.CapCode = GF_CODEC_SHOW_SCENE;
-			cap.cap.valueInt = 0;
-			gf_codec_set_capability(codec, cap);
-			codec->odm->mo->flags &= ~GF_MO_DISPLAY_REMOVE;
-		}
-	}
-
-	/*don't wait for end of thread since this can be triggered within the decoding thread*/
-	if (ce->flags & GF_MM_CE_RUNNING) {
-		ce->flags &= ~GF_MM_CE_RUNNING;
-		if (!ce->thread)
-			term->cumulated_priority -= codec->Priority+1;
-	}
-	if (codec->CB) gf_cm_abort_buffering(codec->CB);
-
-	if (ce->mx) gf_mx_v(ce->mx);
-	/*cf note above*/
-	else if (locked) gf_mx_v(term->mm_mx);
-}
-
-void gf_term_set_threading(GF_Terminal *term, u32 mode)
-{
-	u32 i;
-	Bool thread_it, restart_it;
-	CodecEntry *ce;
-
-	switch (mode) {
-	case GF_TERM_THREAD_SINGLE:
-		if (term->flags & GF_TERM_SINGLE_THREAD) return;
-		term->flags &= ~GF_TERM_MULTI_THREAD;
-		term->flags |= GF_TERM_SINGLE_THREAD;
-		break;
-	case GF_TERM_THREAD_MULTI:
-		if (term->flags & GF_TERM_MULTI_THREAD) return;
-		term->flags &= ~GF_TERM_SINGLE_THREAD;
-		term->flags |= GF_TERM_MULTI_THREAD;
-		break;
-	default:
-		if (!(term->flags & (GF_TERM_MULTI_THREAD | GF_TERM_SINGLE_THREAD) ) ) return;
-		term->flags &= ~GF_TERM_SINGLE_THREAD;
-		term->flags &= ~GF_TERM_MULTI_THREAD;
-		break;
-	}
-
-	gf_mx_p(term->mm_mx);
-
-
-	i=0;
-	while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {
-		thread_it = 0;
-		/*free mode, decoder wants threading - do */
-		if ((mode == GF_TERM_THREAD_FREE) && (ce->flags & GF_MM_CE_REQ_THREAD)) thread_it = 1;
-		else if (mode == GF_TERM_THREAD_MULTI) thread_it = 1;
-
-		if (thread_it && (ce->flags & GF_MM_CE_THREADED)) continue;
-		if (!thread_it && !(ce->flags & GF_MM_CE_THREADED)) continue;
-
-		restart_it = 0;
-		if (ce->flags & GF_MM_CE_RUNNING) {
-			restart_it = 1;
-			ce->flags &= ~GF_MM_CE_RUNNING;
-		}
-
-		if (ce->flags & GF_MM_CE_THREADED) {
-			/*wait for thread to die*/
-			while (!(ce->flags & GF_MM_CE_DEAD)) gf_sleep(1);
-			ce->flags &= ~GF_MM_CE_DEAD;
-			gf_th_del(ce->thread);
-			ce->thread = NULL;
-			gf_mx_del(ce->mx);
-			ce->mx = NULL;
-			ce->flags &= ~GF_MM_CE_THREADED;
-		} else {
-			term->cumulated_priority -= ce->dec->Priority+1;
-		}
-
-		if (thread_it) {
-			ce->flags |= GF_MM_CE_THREADED;
-			ce->thread = gf_th_new(ce->dec->decio->module_name);
-			ce->mx = gf_mx_new(ce->dec->decio->module_name);
-		}
-
-		if (restart_it) {
-			ce->flags |= GF_MM_CE_RUNNING;
-			if (ce->thread) {
-				gf_th_run(ce->thread, RunSingleDec, ce);
-				gf_th_set_priority(ce->thread, term->priority);
-			} else {
-				term->cumulated_priority += ce->dec->Priority+1;
-			}
-		}
-	}
-	gf_mx_v(term->mm_mx);
-}
-
-Bool gf_term_lock_codec(GF_Codec *codec, Bool lock, Bool trylock)
-{
-	Bool res = 1;
-	CodecEntry *ce;
-	GF_Terminal *term = codec->odm->term;
-
-	ce = mm_get_codec(term->codecs, codec);
-	if (!ce) return 0;
-
-	if (ce->mx) {
-		if (lock) {
-			if (trylock) {
-				res = gf_mx_try_lock(ce->mx);
-			} else {
-				res = gf_mx_p(ce->mx);
-			}
-		}
-		else gf_mx_v(ce->mx);
-	}
-	else {
-		if (lock) {
-			if (trylock) {
-				res = gf_mx_try_lock(term->mm_mx);
-			} else {
-				res = gf_mx_p(term->mm_mx);
-			}
-		}
-		else gf_mx_v(term->mm_mx);
-	}
-	return res;
-}
-
-void gf_term_set_priority(GF_Terminal *term, s32 Priority)
-{
-	u32 i;
-	CodecEntry *ce;
-	gf_mx_p(term->mm_mx);
-
-	gf_th_set_priority(term->mm_thread, Priority);
-
-	i=0;
-	while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {
-		if (ce->flags & GF_MM_CE_THREADED)
-			gf_th_set_priority(ce->thread, Priority);
-	}
-	term->priority = Priority;
-	gf_mx_v(term->mm_mx);
-}
-
-GF_EXPORT
-u32 gf_term_process_step(GF_Terminal *term)
-{
-	u32 nb_decs=0;
-	u32 sleep_time=0;
-	u32 dec_time = 0, step_start_time = gf_sys_clock();
-
-	MM_handleServices(term);
-
-	if (term->flags & GF_TERM_NO_DECODER_THREAD) {
-		MM_SimulationStep_Decoder(term, &nb_decs);
-		dec_time = gf_sys_clock() - step_start_time;
-	}
-
-	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD) {
-		s32 ms_until_next;
-		gf_sc_draw_frame(term->compositor, 0, &ms_until_next);
-		if ((ms_until_next>=0) && ((u32) ms_until_next > dec_time)) {
-			sleep_time = ms_until_next - dec_time;
-		}
-	} else {
-		if (dec_time < term->frame_duration) {
-			sleep_time = term->frame_duration - dec_time;
-		}
-	}
-
-	if (term->bench_mode || (term->user->init_flags & GF_TERM_NO_REGULATION)) return sleep_time;
-
-	assert((s32) sleep_time >= 0);
-	if (sleep_time>33) sleep_time = 33;
-
-	gf_sleep(sleep_time);
-	return sleep_time;
-}
-
-GF_EXPORT
-GF_Err gf_term_process_flush(GF_Terminal *term)
-{
-	u32 i;
-	CodecEntry *ce;
-	u32 diff, now = gf_sys_clock();
-	if (!(term->flags & GF_TERM_NO_COMPOSITOR_THREAD) ) return GF_BAD_PARAM;
-
-	/*update till frame mature*/
-	while (1) {
-
-		gf_term_handle_services(term);
-		if (term->flags & GF_TERM_NO_DECODER_THREAD) {
-			gf_mx_p(term->mm_mx);
-			i=0;
-			while ((ce = (CodecEntry*)gf_list_enum(term->codecs, &i))) {
-				gf_codec_process(ce->dec, 10000);
-			}
-			gf_mx_v(term->mm_mx);
-		}
-
-		if (!gf_sc_draw_frame(term->compositor, 1, NULL)) {
-			if (!term->root_scene || !term->root_scene->root_od)
-				break;
-
-			if (gf_list_count(term->media_queue) )
-				continue;
-
-			//wait for audio to be flushed
-			if (gf_sc_check_audio_pending(term->compositor) )
-				continue;
-
-			//force end of buffer
-			if (gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene, 1))
-				break;
-
-			//consider timeout after 30 s
-			diff = gf_sys_clock() - now;
-			if (diff>30000) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Waited more than %d ms to flush frame - aborting\n", diff));
-				return GF_IP_UDP_TIMEOUT;
-			}
-		}
-
-		if (! (term->user->init_flags & GF_TERM_NO_REGULATION))
-			break;
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_term_process_flush_video(GF_Terminal *term)
-{
-	if (!(term->flags & GF_TERM_NO_COMPOSITOR_THREAD) ) return GF_BAD_PARAM;
-	gf_sc_flush_video(term->compositor);
-	return GF_OK;
-}

gpac-0.8.0.tar.gz/src/terminal/media_memory.c Deleted

@@ -1,761 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/constants.h>
-#include <gpac/network.h>
-#include "media_memory.h"
-#include "media_control.h"
-
-GF_DBUnit *gf_db_unit_new()
-{
-	GF_DBUnit *tmp;
-	GF_SAFEALLOC(tmp, GF_DBUnit)
-	if (tmp) memset(tmp, 0, sizeof(GF_DBUnit));
-	return tmp;
-}
-
-void gf_db_unit_del(GF_DBUnit *db)
-{
-	while (db) {
-		GF_DBUnit *next = db->next;
-		if (db->data) gf_free(db->data);
-		gf_free(db);
-		db = next;
-	}
-}
-
-static GF_CMUnit *gf_cm_unit_new()
-{
-	GF_CMUnit *tmp;
-	GF_SAFEALLOC(tmp, GF_CMUnit)
-	if (tmp) memset(tmp, 0, sizeof(GF_CMUnit));
-	return tmp;
-}
-
-#ifdef _WIN32_WCE
-#include <winbase.h>
-static GFINLINE void *my_large_alloc(u32 size) {
-	void *ptr;
-	if (!size) return NULL;
-	ptr = VirtualAlloc(NULL, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
-	if (!ptr) {
-		DWORD res = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Cannot resize composition buffer to %d bytes - error %d", size, res));
-		return NULL;
-	}
-	return ptr;
-}
-static GFINLINE void my_large_gf_free(void *ptr) {
-	if (ptr) VirtualFree(ptr, 0, MEM_RELEASE);
-}
-#else
-#define my_large_alloc(_size)	(_size ? gf_malloc(sizeof(char)*_size) : NULL)
-#define my_large_gf_free(_ptr)	gf_free(_ptr)
-#endif
-
-
-static void gf_cm_unit_del(GF_CMUnit *cb, Bool no_data_allocation)
-{
-	if (!cb)
-		return;
-	if (cb->next) gf_cm_unit_del(cb->next, no_data_allocation);
-
-	if (cb->data) {
-		if (!no_data_allocation) {
-			my_large_gf_free(cb->data);
-		}
-		cb->data = NULL;
-	}
-	if (cb->frame) {
-		cb->frame->Release(cb->frame);
-		cb->frame=NULL;
-	}
-	gf_free(cb);
-}
-
-GF_CompositionMemory *gf_cm_new(u32 UnitSize, u32 capacity, Bool no_allocation)
-{
-	GF_CompositionMemory *tmp;
-	GF_CMUnit *cu, *prev;
-	u32 i;
-	if (!capacity) return NULL;
-
-	GF_SAFEALLOC(tmp, GF_CompositionMemory)
-	if (!tmp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate composition memory\n"));
-		return NULL;
-	}
-
-	tmp->Capacity = capacity;
-	tmp->UnitSize = UnitSize;
-	tmp->no_allocation = no_allocation;
-
-	prev = NULL;
-	i = 1;
-	while (capacity) {
-		cu = gf_cm_unit_new();
-		if (!prev) {
-			tmp->input = cu;
-		} else {
-			prev->next = cu;
-			cu->prev = prev;
-		}
-		cu->dataLength = 0;
-		if (no_allocation) {
-			cu->data = NULL;
-		} else {
-			cu->data = UnitSize ? (char*)my_large_alloc(sizeof(char)*UnitSize) : NULL;
-			if (cu->data) memset(cu->data, 0, sizeof(char)*UnitSize);
-		}
-		prev = cu;
-		capacity --;
-		i++;
-	}
-	cu->next = tmp->input;
-	tmp->input->prev = cu;
-
-	/*close the loop. The output is the input as the first item
-	that will be ready for composition will be filled in the input*/
-	tmp->output = tmp->input;
-
-	tmp->Status = CB_STOP;
-	return tmp;
-}
-
-void gf_cm_del(GF_CompositionMemory *cb)
-{
-	gf_odm_lock(cb->odm, 1);
-	/*may happen when CB is destroyed right after creation */
-	if (cb->Status == CB_BUFFER) {
-		gf_clock_buffer_off(cb->odm->codec->ck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB destroy - ODM%d: buffering off at OTB %u (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck), gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-	}
-	if (cb->input) {
-		/*break the loop and destroy*/
-		cb->input->prev->next = NULL;
-		gf_cm_unit_del(cb->input, cb->no_allocation);
-		cb->input = NULL;
-	}
-	gf_odm_lock(cb->odm, 0);
-	gf_free(cb);
-}
-
-void gf_cm_rewind_input(GF_CompositionMemory *cb)
-{
-	if (cb->UnitCount) {
-		cb->UnitCount--;
-		cb->input = cb->input->prev;
-		cb->input->dataLength = 0;
-	}
-}
-
-/*access to the input buffer - return NULL if no input is available (buffer full)*/
-GF_CMUnit *gf_cm_lock_input(GF_CompositionMemory *cb, u32 TS, Bool codec_reordering)
-{
-	GF_CMUnit *cu;
-	if (codec_reordering) {
-		/*there is still something in the input buffer*/
-		if (cb->input->dataLength) {
-			if (cb->input->TS==TS)
-				return cb->input;
-			return NULL;
-		}
-		cb->input->TS = TS;
-		return cb->input;
-	}
-
-	/*spatial scalable, go backward to fetch same TS*/
-	cu = cb->input;
-	while (1) {
-		if (cu->TS == TS)
-			return cu;
-		cu = cu->prev;
-		if (cu == cb->input) break;
-	}
-	/*temporal scalable (find empty slot)*/
-	cu = cb->input;
-	while (1) {
-		if (!cu->dataLength) {
-//			assert(!cu->TS || (cb->Capacity==1));
-			cu->TS = TS;
-			return cu;
-		}
-		cu = cu->next;
-		if (cu == cb->input) return NULL;
-	}
-	return NULL;
-}
-
-#if 0
-static void check_temporal(GF_CompositionMemory *cb)
-{
-	GF_CMUnit *cu;
-	cu = cb->output;
-	while (1) {
-		if (cu->next==cb->output) break;
-		assert(!cu->next->dataLength || (cu->TS < cu->next->TS));
-		assert(!cu(>TS || (cu->TS >= cb->LastRenderedTS));
-		       cu = cu->next;
-	}
-}
-#endif
-
-/*re-orders units in case of temporal scalability. Blocking call as it may change the output unit too*/
-static GF_CMUnit *gf_cm_reorder_unit(GF_CompositionMemory *cb, GF_CMUnit *unit, Bool codec_reordering)
-{
-	GF_CMUnit *cu;
-	if (codec_reordering) {
-		cu = cb->input;
-		cb->input = cb->input->next;
-		return cu;
-	}
-
-	/*lock the buffer since we may move pointers*/
-	gf_odm_lock(cb->odm, 1);
-
-	/*1- unit is next on time axis (no temporal scalability)*/
-	if (!cb->input->dataLength || cb->input->TS < unit->TS) {
-
-		if (unit != cb->input) {
-			/*remove unit from the list*/
-			unit->prev->next = unit->next;
-			unit->next->prev = unit->prev;
-
-			/*insert unit after input*/
-			unit->prev = cb->input;
-			unit->next = cb->input->next;
-			unit->next->prev = unit;
-			unit->prev->next = unit;
-		}
-		/*set input to our unit*/
-		cb->input = unit;
-		goto exit;
-	}
-	/*2- unit is before our last delivered input - temporal scalability*/
-	cu = cb->input;
-	while (1) {
-
-		if (cu->TS > unit->TS) {
-			/*we have a unit after this one that has been consumed - discard our unit*/
-			if (!cu->dataLength) {
-				unit = NULL;
-				goto exit;
-			}
-			/*previous unit is the active one - check one further*/
-			if (cu->prev == unit) {
-				if (!unit->prev->dataLength || (unit->prev->TS < unit->TS))
-					break;
-			}
-			/*no previous unit or our unit is just after the previous unit*/
-			else if (!cu->prev->dataLength || (cu->prev->TS < unit->TS)) {
-				break;
-			}
-			/*otherwise need to go one further*/
-		}
-
-		/*go on*/
-		cu = cu->prev;
-		/*done (should never happen)*/
-		if (cu == cb->input)
-			goto exit;
-	}
-
-	/*remove unit from the list*/
-	unit->prev->next = unit->next;
-	unit->next->prev = unit->prev;
-
-	/*insert active before cu*/
-	unit->next = cu;
-	unit->prev = cu->prev;
-	unit->next->prev = unit;
-	unit->prev->next = unit;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Swapping CU buffer\n"));
-
-exit:
-
-	/*perform sanity check on output ordering*/
-	if (unit) {
-		/*if no more output reset to our min*/
-		if (!cb->output->dataLength) {
-			cb->output = cb->input;
-			while (1) {
-				if (!cb->output->prev->dataLength) break;
-				cb->output = cb->output->prev;
-			}
-		}
-		/*otherwise we just inserted a CU that should be the next one to be consumed*/
-		else if (cb->output->TS > unit->TS) {
-			cb->output = unit;
-		}
-
-	}
-
-	//check_temporal(cb);
-	/*unlock the buffer*/
-	gf_odm_lock(cb->odm, 0);
-	return unit;
-}
-
-static void cb_set_buffer_off(GF_CompositionMemory *cb)
-{
-	gf_clock_buffer_off(cb->odm->codec->ck);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB Buffering done ODM%d: buffering off at OTB %u (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck), gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-
-	gf_term_service_media_event(cb->odm->parentscene->root_od, GF_EVENT_MEDIA_CANPLAY);
-}
-
-void gf_cm_unlock_input(GF_CompositionMemory *cb, GF_CMUnit *cu, u32 cu_size, Bool codec_reordering)
-{
-	/*nothing dispatched, ignore*/
-	if (!cu_size || (!cu->data && !cu->frame && !cb->pY) ) {
-		if (cu->frame) {
-			cu->frame->Release(cu->frame);
-			cu->frame = NULL;
-		}
-		cu->dataLength = 0;
-		cu->TS = 0;
-		return;
-	}
-	gf_odm_lock(cb->odm, 1);
-//		assert(cu->frame);
-
-	if (codec_reordering) {
-		cb->input = cb->input->next;
-	} else {
-		cu = gf_cm_reorder_unit(cb, cu, codec_reordering);
-		assert(cu);
-	}
-
-	if (cu) {
-		/*FIXME - if the CU already has data, this is spatial scalability so same num buffers*/
-		if (!cu->dataLength) cb->UnitCount += 1;
-		cu->dataLength = cu_size;
-		cu->RenderedLength = 0;
-
-		/*turn off buffering for audio - this must be done now rather than when fetching first output frame since we're not
-		sure output is fetched (Switch node, ...)*/
-		if ( (cb->Status == CB_BUFFER) && (cb->UnitCount >= cb->Capacity) ) {
-			/*done with buffering*/
-			cb->Status = CB_BUFFER_DONE;
-			
-			//for audio, turn off buffering now. For video, we will wait for the first frame to be drawn
-			if (cb->odm->codec->type == GF_STREAM_AUDIO)
-				cb_set_buffer_off(cb);
-		}
-
-		//new FPS regulation doesn't need this signaling
-#if 0
-		/*since a new CU is here notify the compositor*/
-		if ((cb->odm->codec->type==GF_STREAM_VISUAL) && cb->odm->mo && cb->odm->mo->num_open) {
-			gf_term_invalidate_compositor(cb->odm->term);
-		}
-#endif
-	}
-	gf_odm_lock(cb->odm, 0);
-}
-
-
-/*Reset composition memory. Note we don't reset the content of each frame since it would lead to green frames
-when using bitmap (visual), where data is not cached*/
-void gf_cm_reset(GF_CompositionMemory *cb)
-{
-	GF_CMUnit *cu;
-
-	gf_odm_lock(cb->odm, 1);
-	cu = cb->input;
-	cu->RenderedLength = 0;
-	if (cu->dataLength && cb->odm->raw_frame_sema)  {
-		cu->dataLength = 0;
-		gf_sema_notify(cb->odm->raw_frame_sema, 1);
-	}
-
-	cu->dataLength = 0;
-	if (cu->frame) {
-		cu->frame->Release(cu->frame);
-		cu->frame = NULL;
-	}
-	cu->TS = 0;
-	cu = cu->next;
-	while (cu != cb->input) {
-		cu->RenderedLength = 0;
-		cu->TS = 0;
-		cu->dataLength = 0;
-		if (cu->frame) {
-			cu->frame->Release(cu->frame);
-			cu->frame = NULL;
-		}
-		cu = cu->next;
-	}
-	cb->UnitCount = 0;
-	cb->HasSeenEOS = 0;
-
-	if (cb->odm->mo) cb->odm->mo->timestamp = 0;
-
-	cb->output = cb->input;
-	gf_odm_lock(cb->odm, 0);
-}
-
-void gf_cm_reset_timing(GF_CompositionMemory *cb)
-{
-	GF_CMUnit *cu = cb->input;
-
-	gf_odm_lock(cb->odm, 1);
-	cu->TS = 0;
-	cu = cu->next;
-	while (cu != cb->input) {
-		cu->TS = 0;
-		cu = cu->next;
-	}
-	if (cb->odm->mo) cb->odm->mo->timestamp = 0;
-	gf_odm_lock(cb->odm, 0);
-}
-
-/*resize buffers (blocking)*/
-void gf_cm_resize(GF_CompositionMemory *cb, u32 newCapacity)
-{
-	GF_CMUnit *cu;
-	if (!newCapacity) return;
-
-	/*lock buffer*/
-	gf_odm_lock(cb->odm, 1);
-	cu = cb->input;
-
-	cb->UnitSize = newCapacity;
-	
-	while (1) {
-		if (cu->frame) {
-			cu->frame->Release(cu->frame);
-			cu->frame = NULL;
-		}
-		if (!cb->no_allocation) {
-			my_large_gf_free(cu->data);
-			cu->data = (char*) my_large_alloc(newCapacity);
-		} else {
-			cu->data = NULL;
-			if (cu->dataLength && cb->odm->raw_frame_sema) {
-				gf_sema_notify(cb->odm->raw_frame_sema, 1);
-			}
-		}
-		cu->dataLength = 0;
-		cu->TS = 0;
-
-		cu = cu->next;
-		if (cu == cb->input) break;
-	}
-	
-	cb->UnitCount = 0;
-	cb->output = cb->input;
-	gf_odm_lock(cb->odm, 0);
-}
-
-
-
-/*resize buffers (blocking)*/
-void gf_cm_reinit(GF_CompositionMemory *cb, u32 UnitSize, u32 Capacity)
-{
-	GF_CMUnit *cu, *prev;
-	u32 i;
-	if (!Capacity || !UnitSize) return;
-
-	gf_odm_lock(cb->odm, 1);
-	if (cb->input) {
-		/*break the loop and destroy*/
-		cb->input->prev->next = NULL;
-		gf_cm_unit_del(cb->input, cb->no_allocation);
-		cb->input = NULL;
-	}
-
-	cu = NULL;
-	cb->Capacity = Capacity;
-	cb->UnitSize = UnitSize;
-
-	prev = NULL;
-	i = 1;
-	while (Capacity) {
-		cu = gf_cm_unit_new();
-		if (!prev) {
-			cb->input = cu;
-		} else {
-			prev->next = cu;
-			cu->prev = prev;
-		}
-		cu->dataLength = 0;
-		if (cb->no_allocation) {
-			cu->data = NULL;
-		} else {
-			cu->data = (char*)my_large_alloc(UnitSize);
-		}
-		prev = cu;
-		Capacity --;
-		i++;
-	}
-	cu->next = cb->input;
-	cb->input->prev = cu;
-	cb->output = cb->input;
-	gf_odm_lock(cb->odm, 0);
-}
-
-/*access to the first available CU for rendering
-this is a blocking call since input may change the output (temporal scalability)*/
-GF_CMUnit *gf_cm_get_output(GF_CompositionMemory *cb)
-{
-	/*if paused or stop or buffering, do nothing*/
-	switch (cb->Status) {
-	case CB_BUFFER:
-	case CB_STOP:
-		/*only visual buffers deliver data when buffering or stop*/
-		if (cb->odm->codec->type != GF_STREAM_VISUAL) return NULL;
-		break;
-	case CB_BUFFER_DONE:
-		//For non-visual output move to play state upon fetch
-		if (cb->odm->codec->type != GF_STREAM_VISUAL)
-			cb->Status = CB_PLAY;
-		break;
-	//we always deliver in pause, up to the caller to decide to consume or not the frame
-	case CB_PAUSE:
-		break;
-	}
-
-	/*no output*/
-	if (!cb->UnitCount || !cb->output->dataLength) {
-		if ((cb->Status != CB_STOP) && cb->HasSeenEOS && (cb->odm && cb->odm->codec)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Switching composition memory to stop state - time %d\n", cb->odm->OD->objectDescriptorID, (u32) cb->odm->media_stop_time));
-
-			if ((cb->Status==CB_BUFFER_DONE) && (cb->odm->codec->type == GF_STREAM_VISUAL) ){
-				gf_clock_buffer_off(cb->odm->codec->ck);
-			}
-			cb->Status = CB_STOP;
-			cb->odm->media_current_time = (u32) cb->odm->media_stop_time;
-#ifndef GPAC_DISABLE_VRML
-			/*force update of media time*/
-			mediasensor_update_timing(cb->odm, 1);
-#endif
-			gf_odm_signal_eos(cb->odm);
-		}
-		return NULL;
-	}
-
-	/*update the timing*/
-	if ((cb->Status != CB_STOP) && cb->odm && cb->odm->codec) {
-		if (cb->odm->codec->ck->has_media_time_shift) {
-			cb->odm->media_current_time = cb->output->TS + cb->odm->codec->ck->media_time_at_init - cb->odm->codec->ck->init_time;
-		} else {
-			cb->odm->media_current_time = cb->output->TS;
-		}
-
-		/*handle visual object - EOS if no more data (we keep the last CU for rendering, so check next one)*/
-		if (cb->HasSeenEOS && (cb->odm->codec->type == GF_STREAM_VISUAL) && (!cb->output->next->dataLength || (cb->Capacity==1))) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Switching composition memory to stop state - time %d\n", cb->odm->OD->objectDescriptorID, (u32) cb->odm->media_stop_time));
-			if (cb->Status==CB_BUFFER_DONE) {
-				gf_clock_buffer_off(cb->odm->codec->ck);
-			}
-			cb->Status = CB_STOP;
-			cb->odm->media_current_time = (u32) cb->odm->media_stop_time;
-#ifndef GPAC_DISABLE_VRML
-			/*force update of media time*/
-			mediasensor_update_timing(cb->odm, 1);
-#endif
-			gf_odm_signal_eos(cb->odm);
-		}
-	}
-	if (cb->output->sender_ntp) {
-		cb->LastRenderedNTPDiff = gf_net_get_ntp_diff_ms(cb->output->sender_ntp);
-		cb->LastRenderedNTP = cb->output->sender_ntp;
-	}
-
-	return cb->output;
-}
-
-
-/*mark the output as reusable and init clock*/
-void gf_cm_output_kept(GF_CompositionMemory *cb)
-{
-	assert(cb->UnitCount);
-	/*this allows reuse of the CU*/
-	cb->output->RenderedLength = 0;
-	cb->LastRenderedTS = cb->output->TS;
-
-	//For visual output move to play state once first frame is drawn
-	if ((cb->Status==CB_BUFFER_DONE) &&  (cb->odm->codec->type == GF_STREAM_VISUAL)) {
-		cb_set_buffer_off(cb);
-		cb->Status=CB_PLAY;
-	}
-}
-
-/*drop the output CU*/
-void gf_cm_drop_output(GF_CompositionMemory *cb)
-{
-	gf_cm_output_kept(cb);
-
-	/*WARNING: in RAW mode, we (for the moment) only have one unit - setting output->dataLength to 0 means the input is available
-	for the raw channel - we have to make sure the output is completely reseted before releasing the sema*/
-
-	/*on visual streams (except raw oness), always keep the last AU*/
-	if (cb->output->dataLength && (cb->odm->codec->type == GF_STREAM_VISUAL) ) {
-		if ( !cb->output->next->dataLength || (cb->Capacity == 1) )  {
-			Bool no_drop = 1;
-			if (cb->no_allocation ) {
-				if (cb->odm->term->bench_mode)
-					no_drop = 0;
-				else if (gf_clock_time(cb->odm->codec->ck) > cb->output->TS)
-					no_drop = 0;
-			}
-			if (no_drop) {
-				if (cb->odm->raw_frame_sema) {
-					cb->output->dataLength = 0;
-					gf_sema_notify(cb->odm->raw_frame_sema, 1);
-				}
-				return;
-			}
-		}
-	}
-
-	/*reset the output*/
-	cb->output->dataLength = 0;
-	if (cb->output->frame) {
-		cb->output->frame->Release(cb->output->frame);
-		cb->output->frame = NULL;
-	}
-	cb->output->TS = 0;
-	cb->output = cb->output->next;
-	cb->UnitCount -= 1;
-
-	if (!cb->HasSeenEOS && cb->UnitCount <= cb->Min) {
-		cb->odm->codec->PriorityBoost = 1;
-	}
-
-	if (cb->odm->raw_frame_sema) {
-		gf_sema_notify(cb->odm->raw_frame_sema, 1);
-	}
-}
-
-void gf_cm_set_status(GF_CompositionMemory *cb, u32 Status)
-{
-	if (cb->Status == Status)
-		return;
-
-	gf_odm_lock(cb->odm, 1);
-	/*if we're asked for play, trigger on buffering*/
-	if (Status == CB_PLAY) {
-		switch (cb->Status) {
-		case CB_STOP:
-			if (cb->odm->disable_buffer_at_next_play) {
-				cb->Status = CB_BUFFER_DONE;
-			} else {
-				cb->Status = CB_BUFFER;
-				gf_clock_buffer_on(cb->odm->codec->ck);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB status changed - ODM%d: buffering on at OTB %d (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck),gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-			}
-			break;
-		case CB_PAUSE:
-			cb->Status = CB_PLAY;
-			break;
-		/*this should never happen (calling play while already buffering ...)*/
-		case CB_BUFFER:
-			cb->LastRenderedTS = 0;
-			break;
-		default:
-			cb->Status = Status;
-			break;
-		}
-	} else {
-		cb->LastRenderedTS = 0;
-		if (cb->Status == CB_BUFFER) {
-			gf_clock_buffer_off(cb->odm->codec->ck);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB status changed - ODM%d: buffering off at OTB %u (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck), gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-		}
-		if (Status == CB_STOP) {
-			gf_cm_reset(cb);
-			cb->LastRenderedTS = 0;
-		}
-		cb->Status = Status;
-		if (Status==CB_BUFFER) {
-			gf_clock_buffer_on(cb->odm->codec->ck);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB status changed - ODM%d: buffering on at OTB %d (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck), gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-		}
-	}
-
-	gf_odm_lock(cb->odm, 0);
-
-}
-
-void gf_cm_set_eos(GF_CompositionMemory *cb)
-{
-	gf_odm_lock(cb->odm, 1);
-	/*we may have a pb if the stream is so short that the EOS is signaled
-	while we're buffering. In this case we shall turn the clock on and
-	keep a trace of the EOS notif*/
-	if (cb->Status == CB_BUFFER) {
-		cb->Status = CB_BUFFER_DONE;
-		gf_clock_buffer_off(cb->odm->codec->ck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB EOS - ODM%d: buffering off at OTB %u (STB %d) (nb wait on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_clock_time(cb->odm->codec->ck), gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
-	}
-	cb->HasSeenEOS = 1;
-
-	//in bench mode eos cannot be signaled through flush of composition memory since it is always empty - do it here
-	if (cb->odm->term->bench_mode==2) {
-		cb->Status = CB_STOP;
-		gf_odm_signal_eos(cb->odm);
-	}
-
-	gf_term_invalidate_compositor(cb->odm->term);
-	gf_odm_lock(cb->odm, 0);
-}
-
-
-Bool gf_cm_is_running(GF_CompositionMemory *cb)
-{
-	if (cb->Status == CB_PLAY)
-		return !cb->odm->codec->ck->Paused;
-
-	if ((cb->Status == CB_BUFFER_DONE) && (gf_clock_is_started(cb->odm->codec->ck) || cb->odm->term->play_state) ) {
-		return 1;
-	}
-
-	if ((cb->odm->codec->type == GF_STREAM_VISUAL)
-	        && (cb->Status == CB_STOP)
-	        && cb->output->dataLength) return 1;
-
-	return 0;
-}
-
-
-Bool gf_cm_is_eos(GF_CompositionMemory *cb)
-{
-	if (cb->HasSeenEOS && ((cb->Status == CB_STOP) || (cb->UnitCount==0)) )
-		return 1;
-	return 0;
-}
-
-void gf_cm_abort_buffering(GF_CompositionMemory *cb)
-{
-	if (cb->Status == CB_BUFFER) {
-		cb->Status = CB_BUFFER_DONE;
-		cb_set_buffer_off(cb);
-	}
-}

gpac-0.8.0.tar.gz/src/terminal/media_memory.h Deleted

@@ -1,191 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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.
- *
- */
-
-#ifndef _MEDIA_MEMORY_H_
-#define _MEDIA_MEMORY_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/thread.h>
-
-enum
-{
-	/*AU is RAP*/
-	GF_DB_AU_RAP = 1,
-	/*special flag for systems streams: we may receive a CTS in a carousel, to indicate the
-	SFTime init time*/
-	GF_DB_AU_CTS_IN_PAST = 1<<1,
-	/*hack for some DMB streams not signaling TS for BIFS*/
-	GF_DB_AU_NO_TIMESTAMPS = 1<<2,
-	/*for debuging AU reassembly in scalable coding*/
-	GF_DB_AU_REAGGREGATED = 1<<3,
-	/*set for AUs that need dispatching but should not be displayed*/
-	GF_DB_AU_IS_SEEK = 1<<4,
-};
-
-/*compressed media unit*/
-typedef struct _decoding_buffer
-{
-	struct _decoding_buffer *next;
-
-	/*decoding time stamp in ms*/
-	u32 DTS;
-	/*composition time stamp in ms*/
-	u32 CTS;
-	/*AU flags*/
-	u8 flags;
-	/*amount of padding bits*/
-	u8 PaddingBits;
-	u64 sender_ntp;
-
-	u32 dataLength;
-	char *data;
-} GF_DBUnit;
-
-GF_DBUnit *gf_db_unit_new();
-void gf_db_unit_del(GF_DBUnit *db);
-
-
-/*composition memory (composition buffer) status*/
-enum
-{
-	/*CB stopped (contains invalid data)*/
-	CB_STOP = 0,
-	/*CB playing (contains valid data)*/
-	CB_PLAY,
-	/*CB is not playing but contains VALID data (prevents output droping)*/
-	CB_PAUSE,
-	/*CB is in buffering stage (internal only)*/
-	CB_BUFFER,
-	/*CB is done buffering and waits for data (internal only)*/
-	CB_BUFFER_DONE,
-};
-
-/*Composition Unit structure*/
-typedef struct _composition_unit {
-	/*next and previous buffers. previous is used for temporal scalability*/
-	struct _composition_unit *next, *prev;
-	/*TS: composition time stamp in ms*/
-	u32 TS;
-
-	/*this is for audio CU in case the whole CU is not consumed in one shot*/
-	u32 RenderedLength;
-
-	u32 dataLength;
-	char* data;
-
-	u64 sender_ntp;
-	
-	GF_MediaDecoderFrame *frame;
-} GF_CMUnit;
-
-
-/*composition buffer (circular buffer of CUs)*/
-struct _composition_memory
-{
-	/*input is used by the decoder to deliver CUs.
-	if temporal scalability is enabled, this is the LAST DELIVERED CU
-	otherwise this is the next available CU slot*/
-	GF_CMUnit *input;
-	/*output is the next available frme for rendering*/
-	GF_CMUnit *output;
-	/*capacity is the number of allocated buffers*/
-	u32 Capacity;
-	/*Min is the triggering of the media manager*/
-	u32 Min;
-	/*Unit size is the size of each buffer*/
-	u32 UnitSize;
-	Bool no_allocation;
-
-	/*Status of the buffer*/
-	u32 Status;
-	/*Number of active units*/
-	u32 UnitCount;
-
-	/*OD manager ruling this CB*/
-	struct _od_manager *odm;
-
-	/*set when EOS is received by decoder*/
-	Bool HasSeenEOS;
-
-	/*trick for temporal scalability: this is the last rendered CTS*/
-	u32 LastRenderedTS;
-
-	u8 *pY, *pU, *pV;
-
-	u64 LastRenderedNTP;
-	s32 LastRenderedNTPDiff;
-};
-
-/*a composition buffer only has fixed-size unit*/
-GF_CompositionMemory *gf_cm_new(u32 UnitSize, u32 capacity, Bool no_allocation);
-void gf_cm_del(GF_CompositionMemory *cb);
-/*re-inits complete cb*/
-void gf_cm_reinit(GF_CompositionMemory *cb, u32 UnitSize, u32 Capacity);
-
-/*locks available input for desired TS (needed for scalability) - return NULL if no
-input is available (buffer full)*/
-GF_CMUnit *gf_cm_lock_input(GF_CompositionMemory *cb, u32 TS, Bool codec_reordering);
-/*dispatch data in input. If NbBytes is 0, no data is dispatched. TS is needed for re-ordering
-of buffers*/
-void gf_cm_unlock_input(GF_CompositionMemory *cb, GF_CMUnit *cu, u32 cu_size, Bool codec_reordering);
-/*rewind input of 1 unit - used when doing precise seeking*/
-void gf_cm_rewind_input(GF_CompositionMemory *cb);
-
-/*fetch output buffer, NULL if output is empty*/
-GF_CMUnit *gf_cm_get_output(GF_CompositionMemory *cb);
-/*release the output buffer once rendered */
-void gf_cm_drop_output(GF_CompositionMemory *cb);
-/*notifies the output has not been discarded: sets render length to 0 and check clock resume if needed*/
-void gf_cm_output_kept(GF_CompositionMemory *cb);
-
-/*reset the entire memory*/
-void gf_cm_reset(GF_CompositionMemory *cb);
-
-/*resize the buffers*/
-void gf_cm_resize(GF_CompositionMemory *cb, u32 newCapacity);
-
-/*set the status of the buffer. Buffering is done automatically*/
-void gf_cm_set_status(GF_CompositionMemory *cb, u32 Status);
-
-/*return 1 if object is running (clock started), 0 otherwise*/
-Bool gf_cm_is_running(GF_CompositionMemory *cb);
-/*signals end of stream*/
-void gf_cm_set_eos(GF_CompositionMemory *cb);
-/*returns 1 if end of stream has been reached (eg, signaled and no more data)*/
-Bool gf_cm_is_eos(GF_CompositionMemory *cb);
-/*aborts buffering if any*/
-void gf_cm_abort_buffering(GF_CompositionMemory *cb);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif	/*_MEDIA_MEMORY_H_*/
-

gpac-0.8.0.tar.gz/src/terminal/media_object.c Deleted

@@ -1,1627 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/modules/codec.h>
-#include <gpac/nodes_x3d.h>
-#include "media_memory.h"
-#include "media_control.h"
-#include <gpac/nodes_svg.h>
-#include <gpac/network.h>
-
-
-#ifndef GPAC_DISABLE_SVG
-static GF_MediaObject *get_sync_reference(GF_Scene *scene, XMLRI *iri, u32 o_type, GF_Node *orig_ref, Bool *post_pone)
-{
-	MFURL mfurl;
-	SFURL sfurl;
-	GF_MediaObject *res;
-	GF_Node *ref = NULL;
-
-	u32 stream_id = 0;
-	if (post_pone) *post_pone = GF_FALSE;
-	
-	if (iri->type==XMLRI_STREAMID) {
-		stream_id = iri->lsr_stream_id;
-	} else if (!iri->string) {
-		return NULL;
-	} else {
-		if (iri->target) ref = (GF_Node *)iri->target;
-		else if (iri->string[0]=='#') ref = gf_sg_find_node_by_name(scene->graph, iri->string+1);
-		else ref = gf_sg_find_node_by_name(scene->graph, iri->string);
-
-		if (ref) {
-			GF_FieldInfo info;
-			/*safety check, break cyclic references*/
-			if (ref==orig_ref) return NULL;
-
-			switch (ref->sgprivate->tag) {
-			case TAG_SVG_audio:
-				o_type = GF_MEDIA_OBJECT_AUDIO;
-				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
-				}
-				return NULL;
-			case TAG_SVG_video:
-				o_type = GF_MEDIA_OBJECT_VIDEO;
-				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
-				}
-				return NULL;
-			default:
-				return NULL;
-			}
-		}
-	}
-	*post_pone = GF_FALSE;
-	mfurl.count = 1;
-	mfurl.vals = &sfurl;
-	mfurl.vals[0].OD_ID = stream_id;
-	mfurl.vals[0].url = iri->string;
-
-	res = gf_scene_get_media_object(scene, &mfurl, o_type, GF_FALSE);
-	if (!res) *post_pone = GF_TRUE;
-	return res;
-}
-#endif
-
-
-GF_EXPORT
-GF_MediaObject *gf_mo_register(GF_Node *node, MFURL *url, Bool lock_timelines, Bool force_new_res)
-{
-	u32 obj_type;
-#ifndef GPAC_DISABLE_SVG
-	Bool post_pone;
-	GF_FieldInfo info;
-#endif
-	GF_Scene *scene;
-	GF_MediaObject *res, *syncRef;
-	GF_SceneGraph *sg = gf_node_get_graph(node);
-	if (!sg) return NULL;
-	scene = (GF_Scene*)gf_sg_get_private(sg);
-	if (!scene) return NULL;
-
-	syncRef = NULL;
-
-	/*keep track of the kind of object expected if URL is not using OD scheme*/
-	switch (gf_node_get_tag(node)) {
-#ifndef GPAC_DISABLE_VRML
-	/*MPEG-4 / VRML / X3D only*/
-	case TAG_MPEG4_AudioClip:
-	case TAG_MPEG4_AudioSource:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_AudioClip:
-#endif
-		obj_type = GF_MEDIA_OBJECT_AUDIO;
-		break;
-	case TAG_MPEG4_SBVCAnimation:
-	case TAG_MPEG4_AnimationStream:
-		obj_type = GF_MEDIA_OBJECT_UPDATES;
-		break;
-	case TAG_MPEG4_BitWrapper:
-		obj_type = GF_MEDIA_OBJECT_SCENE;
-		break;
-	case TAG_MPEG4_InputSensor:
-		obj_type = GF_MEDIA_OBJECT_INTERACT;
-		break;
-	case TAG_MPEG4_Background2D:
-	case TAG_MPEG4_Background:
-	case TAG_MPEG4_ImageTexture:
-	case TAG_MPEG4_CacheTexture:
-	case TAG_MPEG4_MovieTexture:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Background:
-	case TAG_X3D_ImageTexture:
-	case TAG_X3D_MovieTexture:
-#endif
-		obj_type = GF_MEDIA_OBJECT_VIDEO;
-		break;
-	case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline:
-#endif
-		obj_type = GF_MEDIA_OBJECT_SCENE;
-		break;
-#endif /*GPAC_DISABLE_VRML*/
-
-		/*SVG*/
-#ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_audio:
-		obj_type = GF_MEDIA_OBJECT_AUDIO;
-		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
-			/*syncRef is specified but doesn't exist yet, post-pone*/
-			if (post_pone) return NULL;
-		}
-		break;
-	case TAG_SVG_video:
-		obj_type = GF_MEDIA_OBJECT_VIDEO;
-		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
-			/*syncRef is specified but doesn't exist yet, post-pone*/
-			if (post_pone) return NULL;
-		}
-		break;
-	case TAG_SVG_image:
-		obj_type = GF_MEDIA_OBJECT_VIDEO;
-		break;
-	case TAG_SVG_foreignObject:
-	case TAG_SVG_animation:
-		obj_type = GF_MEDIA_OBJECT_SCENE;
-		break;
-	case TAG_LSR_updates:
-		obj_type = GF_MEDIA_OBJECT_UPDATES;
-		break;
-#endif
-
-	default:
-		obj_type = GF_MEDIA_OBJECT_UNDEF;
-		break;
-	}
-
-	/*move to primary resource handler*/
-	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);
-	return res;
-}
-
-GF_EXPORT
-void gf_mo_unregister(GF_Node *node, GF_MediaObject *mo)
-{
-	if (mo && node) {
-		gf_mo_event_target_remove_by_node(mo, node);
-	}
-}
-
-GF_MediaObject *gf_mo_new()
-{
-	GF_MediaObject *mo;
-	mo = (GF_MediaObject *) gf_malloc(sizeof(GF_MediaObject));
-	memset(mo, 0, sizeof(GF_MediaObject));
-	mo->speed = FIX_ONE;
-	mo->URLs.count = 0;
-	mo->URLs.vals = NULL;
-	mo->evt_targets = gf_list_new();
-	return mo;
-}
-
-GF_EXPORT
-Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
-{
-	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
-
-	if (width) *width = mo->width;
-	if (height) *height = mo->height;
-	if (stride) *stride = mo->stride;
-	if (pixel_ar) *pixel_ar = mo->pixel_ar;
-	if (pixelFormat) *pixelFormat = mo->pixelformat;
-	if (is_flipped) *is_flipped = mo->is_flipped;
-	return GF_TRUE;
-}
-
-GF_EXPORT
-void gf_mo_get_nb_views(GF_MediaObject *mo, int * nb_views)
-{
-	if (mo) *nb_views = mo->nb_views;
-}
-
-GF_EXPORT
-
-void gf_mo_get_nb_layers(GF_MediaObject *mo, int * 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, u32 *channel_config, Bool *forced_layout)
-{
-	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
-
-	if (sample_rate) *sample_rate = mo->sample_rate;
-	if (bits_per_sample) *bits_per_sample = mo->bits_per_sample;
-	if (num_channels) *num_channels = mo->num_channels;
-	if (channel_config) *channel_config = mo->channel_config;
-	if (forced_layout) *forced_layout = GF_FALSE;
-
-	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->OD->objectDescriptorID, mo->odm->ambi_ch_id, mo->num_channels ));
-		} else {
-			if (num_channels) *num_channels = 1;
-			if (channel_config) *channel_config = 1 << (mo->odm->ambi_ch_id - 1);
-			if (forced_layout) *forced_layout = GF_TRUE;
-
-		}
-	}
-
-	return GF_TRUE;
-}
-
-static void gf_mo_update_visual_info(GF_MediaObject *mo)
-{
-	GF_Channel *ch;
-	GF_NetworkCommand com;
-
-	GF_CodecCapability cap;
-	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return;
-
-	cap.CapCode = GF_CODEC_WIDTH;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->width = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_HEIGHT;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->height = cap.cap.valueInt;
-
-	if (mo->type==GF_MEDIA_OBJECT_TEXT) return;
-
-	cap.CapCode = GF_CODEC_FLIP;
-	cap.cap.valueInt = 0;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->is_flipped = cap.cap.valueInt ? GF_TRUE : GF_FALSE;
-
-	cap.CapCode = GF_CODEC_STRIDE;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->stride = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_PIXEL_FORMAT;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->pixelformat = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_FPS;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->odm->codec->fps = cap.cap.valueFloat;
-
-	cap.CapCode = GF_CODEC_NBVIEWS;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->nb_views = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_NBLAYERS;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->nb_layers = cap.cap.valueInt;
-
-	if (mo->odm && mo->odm->parentscene->is_dynamic_scene) {
-#ifndef GPAC_DISABLE_VRML
-		const char *name = gf_node_get_name(gf_event_target_get_node(gf_mo_event_target_get(mo, 0)));
-		if (name && !strcmp(name, "DYN_VIDEO1")) {
-			const char *opt;
-			u32 r, g, b, a;
-			M_Background2D *back = (M_Background2D *) gf_sg_find_node_by_name(mo->odm->parentscene->graph, "DYN_BACK");
-			if (back) {
-				switch (cap.cap.valueInt) {
-				case GF_PIXEL_ARGB:
-				case GF_PIXEL_RGBA:
-				case GF_PIXEL_YUVA:
-					opt = gf_cfg_get_key(mo->odm->term->user->config, "Compositor", "BackColor");
-					if (!opt) {
-						gf_cfg_set_key(mo->odm->term->user->config, "Compositor", "BackColor", "FF999999");
-						opt = "FF999999";
-					}
-					sscanf(opt, "%02X%02X%02X%02X", &a, &r, &g, &b);
-					back->backColor.red = INT2FIX(r)/255;
-					back->backColor.green = INT2FIX(g)/255;
-					back->backColor.blue = INT2FIX(b)/255;
-					break;
-				default:
-					back->backColor.red = back->backColor.green = back->backColor.blue = 0;
-					break;
-				}
-				gf_node_dirty_set((GF_Node *)back, 0, GF_TRUE);
-			}
-		}
-#endif
-	}
-	/*get PAR settings*/
-	cap.CapCode = GF_CODEC_PAR;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->pixel_ar = cap.cap.valueInt;
-	if (! (mo->pixel_ar & 0x0000FFFF)) mo->pixel_ar = 0;
-	if (! (mo->pixel_ar & 0xFFFF0000)) mo->pixel_ar = 0;
-
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	ch = (GF_Channel *)gf_list_get(mo->odm->channels, 0);
-	if (!ch) return;
-	com.base.on_channel = ch;
-
-	/**/
-	if (! mo->pixel_ar) {
-		com.base.command_type = GF_NET_CHAN_GET_PIXEL_AR;
-		if (gf_term_service_command(ch->service, &com) == GF_OK) {
-			if ((com.par.hSpacing>65535) || (com.par.vSpacing>65535)) {
-				com.par.hSpacing>>=16;
-				com.par.vSpacing>>=16;
-			}
-			if (com.par.hSpacing|| com.par.vSpacing)
-				mo->pixel_ar = (com.par.hSpacing<<16) | com.par.vSpacing;
-		}
-	}
-
-	com.base.command_type = GF_NET_CHAN_GET_SRD;
-	if ((gf_term_service_command(ch->service, &com) == GF_OK)) {
-		//regular SRD object
-		if (com.srd.w && com.srd.h) {
-			mo->srd_x = com.srd.x;
-			mo->srd_y = com.srd.y;
-			mo->srd_w = com.srd.w;
-			mo->srd_h = com.srd.h;
-			mo->srd_full_w = com.srd.width;
-			mo->srd_full_h = com.srd.height;
-
-			if (mo->odm->parentscene->is_dynamic_scene) {
-				if ((mo->srd_w == mo->srd_full_w) && (mo->srd_h == mo->srd_full_h)) {
-					mo->odm->parentscene->srd_type = 2;
-				} else if (!mo->odm->parentscene->srd_type) {
-					mo->odm->parentscene->srd_type = 1;
-				}
-			}
-		}
-		// SRD object with no size but global scene size: HEVC tiled bas object
-		else if (com.srd.width && com.srd.height) {
-			if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->srd_type) {
-				mo->odm->parentscene->is_tiled_srd = GF_TRUE;
-			}
-		}
-	}
-}
-
-static void gf_mo_update_audio_info(GF_MediaObject *mo)
-{
-	GF_CodecCapability cap;
-	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return;
-
-	if (mo->odm->term->bench_mode==2) {
-		mo->sample_rate = 44100;
-		mo->bits_per_sample = 16;
-		mo->num_channels = 2;
-		mo->channel_config = 0;
-		return;
-	}
-	cap.CapCode = GF_CODEC_SAMPLERATE;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->sample_rate = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_NB_CHAN;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->num_channels = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_BITS_PER_SAMPLE;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->bits_per_sample = cap.cap.valueInt;
-
-	cap.CapCode = GF_CODEC_CHANNEL_CONFIG;
-	gf_codec_get_capability(mo->odm->codec, &cap);
-	mo->channel_config = cap.cap.valueInt;
-
-	mo->odm->codec->bytes_per_sec = mo->sample_rate * mo->num_channels * mo->bits_per_sample / 8;
-}
-
-void gf_mo_update_caps(GF_MediaObject *mo)
-{
-	mo->flags &= ~GF_MO_IS_INIT;
-
-	if (mo->type == GF_MEDIA_OBJECT_VIDEO) {
-		gf_mo_update_visual_info(mo);
-	} else if (mo->type == GF_MEDIA_OBJECT_AUDIO) {
-		gf_mo_update_audio_info(mo);
-	}
-}
-
-static Bool gf_odm_check_cb_resize(GF_MediaObject *mo, GF_Codec *codec)
-{
-	/*resize requested - if last frame destroy CB and force a decode*/
-	if (codec->force_cb_resize && (codec->CB->UnitCount<=1)) {
-		GF_CMUnit *CU = gf_cm_get_output(codec->CB);
-		if (!CU || (CU->TS==mo->timestamp)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d: Resizing output buffer %d -> %d\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, codec->CB->UnitSize, codec->force_cb_resize));
-			gf_codec_resize_composition_buffer(codec, codec->force_cb_resize);
-			codec->force_cb_resize=0;
-			//decode and resize CB
-			return GF_TRUE;
-		}
-	}
-	return GF_FALSE;
-}
-
-GF_EXPORT
-char *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_MediaDecoderFrame **outFrame)
-{
-	GF_Codec *codec;
-	u32 force_decode_mode = 0;
-	u32 obj_time;
-	GF_CMUnit *CU;
-	s32 diff;
-	Bool bench_mode, skip_resync;
-
-	*eos = GF_FALSE;
-	*timestamp = mo->timestamp;
-	*size = mo->framesize;
-	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 = NULL;
-
-	if (!gf_odm_lock_mo(mo)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] ODM %d: Failed to lock MO, returning\n", mo->odm ? mo->odm->OD->objectDescriptorID : 0));
-		return NULL;
-	}
-
-	if (!mo->odm->codec || !mo->odm->codec->CB) {
-		gf_odm_lock(mo->odm, 0);
-		return NULL;
-	}
-
-	/*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->OD->objectDescriptorID));
-		mo->nb_fetch ++;
-		gf_odm_lock(mo->odm, 0);
-		return mo->frame;
-	}
-	codec = mo->odm->codec;
-
-	/*end of stream */
-	*eos = gf_cm_is_eos(codec->CB);
-
-	/*not running and no resync (ie audio)*/
-	if (!resync && !gf_cm_is_running(codec->CB)) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] ODM %d: CB not running, returning\n", mo->odm->OD->objectDescriptorID));
-		gf_odm_lock(mo->odm, 0);
-		return NULL;
-	}
-	if (resync==GF_MO_FETCH_PAUSED)
-		resync=GF_MO_FETCH;
-
-	bench_mode = mo->odm->term->bench_mode;
-
-	/*resize requested - if last frame destroy CB and force a decode*/
-	if (gf_odm_check_cb_resize(mo, codec)) {
-		force_decode_mode = 1;
-	}
-
-	/*fast forward, bench mode with composition memory: force one decode if no data is available*/
-	if (! *eos && ((codec->ck->speed > FIX_ONE) || (codec->odm->term->bench_mode && !codec->CB->no_allocation) || (codec->type==GF_STREAM_AUDIO) ) ) {
-		force_decode_mode = 2;
-	}
-
-	if (force_decode_mode) {
-		u32 retry = 100;
-		gf_odm_lock(mo->odm, 0);
-		while (retry) {
-			gf_odm_check_cb_resize(mo, codec);
-			
-			if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
-				gf_codec_process(codec, 1);
-				gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
-			}
-//            if (force_decode_mode==2) break;
-
-			CU = gf_cm_get_output(codec->CB);
-			if (CU)
-				break;
-			
-			retry--;
-			//we will wait max 100 ms for the CB to be re-fill
-			gf_sleep(1);
-		}
-		if (!retry && (force_decode_mode==1)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] At %d could not resize, decode and fetch next frame in 100 ms - blank frame after TS %u\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), mo->timestamp));
-		}
-		if (!gf_odm_lock_mo(mo)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] ODM %d: Failed to lock ODM\n", mo->odm->OD->objectDescriptorID));
-			return NULL;
-		}
-	}
-
-	/*new frame to fetch, lock*/
-	CU = gf_cm_get_output(codec->CB);
-	/*no output*/
-	if (!CU || (CU->RenderedLength == CU->dataLength)) {
-		gf_odm_lock(mo->odm, 0);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] No CU available\n", mo->odm->OD->objectDescriptorID));
-		return NULL;
-	}
-
-	/*note this assert is NOT true when recomputing DTS from CTS on the fly (MPEG1/2 RTP and H264/AVC RTP)*/
-	//assert(CU->TS >= codec->CB->LastRenderedTS);
-
-	if (codec->CB->UnitCount<=1) resync = GF_MO_FETCH;
-
-	if (bench_mode && resync) {
-		resync = GF_MO_FETCH;
-		if (mo->timestamp == CU->TS) {
-			if (CU->next->dataLength) {
-				gf_cm_drop_output(codec->CB);
-				CU = gf_cm_get_output(codec->CB);
-			}
-		}
-	}
-
-
-	/*resync*/
-	obj_time = gf_clock_time(codec->ck);
-
-	skip_resync = GF_FALSE;
-	//no drop mode, only for speed = 1: all frames are presented, we discard the current output only if already presented and next frame time is mature
-	if ((codec->ck->speed == FIX_ONE) && (mo->type==GF_MEDIA_OBJECT_VIDEO)  && !(codec->flags & GF_ESM_CODEC_IS_LOW_LATENCY) ) {
-
-
-		if (!(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES)) {
-			if (mo->odm->term->compositor->force_late_frame_draw) {
-				mo->flags |= GF_MO_IN_RESYNC;
-			}
-			else if (mo->flags & GF_MO_IN_RESYNC) {
-				if (CU->next->TS >= obj_time) {
-					skip_resync = GF_TRUE;
-					mo->flags &= ~GF_MO_IN_RESYNC;
-				}
-			}
-			//if the next AU is at most 200 ms from the current clock use no drop mode
-			else if (CU->next->dataLength && (CU->next->TS + 200 >= obj_time)) {
-				skip_resync = GF_TRUE;
-			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[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->OD->objectDescriptorID, obj_time, CU->TS, CU->next->TS, resync));
-				mo->flags |= GF_MO_IN_RESYNC;
-			}
-		}
-	}
-
-	if (skip_resync) {
-		resync=GF_MO_FETCH;
-		if (mo->odm->term->use_step_mode) upload_time_ms=0;
-		//we are in no resync mode, drop current frame once played and object time just matured
-		//do it only if clock is started or if compositor step mode is set
-		//the time threshold for fecthing is given by the caller
-		if ( (gf_clock_is_started(codec->ck) || mo->odm->term->use_step_mode)
-
-			&& (mo->timestamp==CU->TS) && CU->next->dataLength && (CU->next->TS <= obj_time + upload_time_ms) ) {
-			
-			gf_cm_drop_output(codec->CB);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Switching to next CU CTS %u now %u\n", mo->odm->OD->objectDescriptorID, CU->next->TS, obj_time));
-			CU = gf_cm_get_output(codec->CB);
-			if (!CU) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] No next CU available, skipping\n", mo->odm->OD->objectDescriptorID));
-				gf_odm_lock(mo->odm, 0);
-				return NULL;
-			}
-		}
-	}
-
-	if (resync) {
-		while (1) {
-			if (codec->ck->speed > 0 ? CU->TS >= obj_time : CU->TS <= obj_time )
-				break;
-
-			if (mo->timestamp != CU->TS) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] Try to drop frame TS %u next frame TS %u length %d obj time %u\n", mo->odm->OD->objectDescriptorID, CU->TS, CU->next->TS, CU->next->dataLength, obj_time));
-			}
-
-			if (!CU->next->dataLength) {
-				if (force_decode_mode) {
-					obj_time = gf_clock_time(codec->ck);
-					gf_odm_lock(mo->odm, 0);
-					if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
-						gf_codec_process(codec, 1);
-						gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
-					}
-					gf_odm_lock(mo->odm, 1);
-					if (!CU->next->dataLength) {
-						break;
-					}
-				} else {
-					break;
-				}
-			}
-
-			/*figure out closest time*/
-			if (codec->ck->speed > 0 ? CU->next->TS > obj_time : CU->next->TS < obj_time) {
-				*eos = GF_FALSE;
-				break;
-			}
-
-			if (mo->timestamp != CU->TS) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u dropped frame TS %u\n", mo->odm->OD->objectDescriptorID, obj_time, CU->TS));
-				codec->nb_dropped++;
-			}
-
-			/*discard*/
-			CU->RenderedLength = CU->dataLength = 0;
-			gf_cm_drop_output(codec->CB);
-
-			/*get next*/
-			CU = gf_cm_get_output(codec->CB);
-			*eos = gf_cm_is_eos(codec->CB);
-		}
-	}
-
-	mo->framesize = CU->dataLength - CU->RenderedLength;
-	mo->frame = CU->data + CU->RenderedLength;
-	mo->media_frame = CU->frame;
-
-	if (CU->next->dataLength) {
-		diff = (s32) (CU->next->TS) - (s32) obj_time;
-	} else  {
-		diff = mo->odm->codec->min_frame_dur;
-	}
-//	fprintf(stderr, "diff is %d ms\n", diff);
-	mo->ms_until_next = FIX2INT(diff * mo->speed);
-
-	diff = (mo->speed >= 0) ? (s32) (CU->TS) - (s32) obj_time : (s32) obj_time - (s32) (CU->TS);
-	mo->ms_until_pres = FIX2INT(diff * mo->speed);
-
-
-	if (mo->timestamp != CU->TS) {
-#ifndef GPAC_DISABLE_VRML
-		if (! gf_cm_is_eos(codec->CB))
-			mediasensor_update_timing(mo->odm, 0);
-#endif
-
-		if (mo->odm->parentscene->is_dynamic_scene) {
-			GF_Scene *s = mo->odm->parentscene;
-			while (s && s->root_od->addon) {
-				s = s->root_od->parentscene;
-			}
-			if (s && s->root_od)
-				s->root_od->media_current_time = mo->odm->media_current_time;
-		}
-
-		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->OD->objectDescriptorID, mo->odm->net_service->url, gf_clock_time(codec->ck), CU->TS, mo->framesize, mo->timestamp, codec->CB->UnitCount, gf_net_get_utc(), mo->ms_until_pres, mo->ms_until_next ));
-
-		if (CU->sender_ntp) {
-			s32 ntp_diff = gf_net_get_ntp_diff_ms(CU->sender_ntp);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d (%s)] Frame TS %u NTP diff with sender %d ms\n", mo->odm->OD->objectDescriptorID, mo->odm->net_service->url, CU->TS, ntp_diff));
-		}
-
-		mo->timestamp = CU->TS;
-		/*signal EOS after rendering last frame, not while rendering it*/
-		*eos = GF_FALSE;
-
-	} else if (*eos) {
-		//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->OD->objectDescriptorID, mo->odm->net_service->url, obj_time, CU->TS ));
-	}
-
-	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/
-	if (codec->bytes_per_sec) mo->timestamp += CU->RenderedLength * 1000 / codec->bytes_per_sec;
-
-	if (bench_mode) {
-		mo->ms_until_pres = -1;
-		mo->ms_until_next = 1;
-	}
-
-
-	mo->nb_fetch ++;
-	*timestamp = mo->timestamp;
-	*size = mo->framesize;
-	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->media_frame;
-
-	gf_term_service_media_event(mo->odm, GF_EVENT_MEDIA_TIME_UPDATE);
-
-	gf_odm_lock(mo->odm, 0);
-	if (mo->media_frame)
-		return (char *) mo->media_frame;
-
-	if (codec->direct_vout)
-		return (char *) codec->CB->pY;
-	return mo->frame;
-}
-
-GF_EXPORT
-GF_Err gf_mo_get_raw_image_planes(GF_MediaObject *mo, u8 **pY_or_RGB, u8 **pU, u8 **pV, u32 *stride_luma_rgb, u32 *stride_chroma)
-{
-	u32 stride;
-	if (!mo || !mo->odm || !mo->odm->codec) return GF_BAD_PARAM;
-	if (mo->odm->codec->direct_vout) {
-		*pY_or_RGB = mo->odm->codec->CB->pY;
-		*pU = mo->odm->codec->CB->pU;
-		*pV = mo->odm->codec->CB->pV;
-		return GF_OK;
-	}
-	if (!mo->odm->codec->direct_frame_output || !mo->media_frame)
-		return GF_BAD_PARAM;
-
-	mo->media_frame->GetPlane(mo->media_frame, 0, (const char **) pY_or_RGB, stride_luma_rgb);
-	mo->media_frame->GetPlane(mo->media_frame, 1, (const char **) pU, &stride);
-	mo->media_frame->GetPlane(mo->media_frame, 2, (const char **) pV, &stride);
-	*stride_chroma = stride;
-	return GF_OK;
-}
-
-GF_EXPORT
-void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode)
-{
-#if 0
-	u32 obj_time;
-#endif
-	if (!gf_odm_lock_mo(mo))
-		return;
-
-	if (!mo->nb_fetch || !mo->odm->codec) {
-		gf_odm_lock(mo->odm, 0);
-		return;
-	}
-	mo->nb_fetch--;
-	if (mo->nb_fetch) {
-		gf_odm_lock(mo->odm, 0);
-		return;
-	}
-
-	/*	if ((drop_mode==0) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO))
-			drop_mode=1;
-		else
-	*/
-	if (mo->odm->codec->CB->no_allocation && (mo->odm->codec->CB->Capacity==1) )
-		drop_mode = 1;
-
-
-	/*perform a sanity check on TS since the CB may have changed status - this may happen in
-	temporal scalability only*/
-	if (mo->odm->codec->CB->output->dataLength ) {
-		if (nb_bytes==0xFFFFFFFF) {
-			mo->odm->codec->CB->output->RenderedLength = mo->odm->codec->CB->output->dataLength;
-		} else {
-			assert(mo->odm->codec->CB->output->RenderedLength + nb_bytes <= mo->odm->codec->CB->output->dataLength);
-			mo->odm->codec->CB->output->RenderedLength += nb_bytes;
-		}
-
-		if (drop_mode<0) {
-			/*only allow for explicit last frame keeping if only one node is using the resource
-			otherwise this would block the composition memory*/
-			if (mo->num_open>1) drop_mode=0;
-			else {
-				gf_odm_lock(mo->odm, 0);
-				return;
-			}
-		}
-
-		/*discard frame*/
-		if (mo->odm->codec->CB->output->RenderedLength == mo->odm->codec->CB->output->dataLength) {
-			if (drop_mode) {
-				gf_cm_drop_output(mo->odm->codec->CB);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u released frame TS %u\n", mo->odm->OD->objectDescriptorID, gf_clock_time(mo->odm->codec->ck), mo->timestamp));
-			} else {
-				/*we cannot drop since we don't know the speed of the playback (which can even be frame by frame)*/
-
-				//notif CB we kept the output
-				gf_cm_output_kept(mo->odm->codec->CB);
-			}
-		}
-	}
-	gf_odm_lock(mo->odm, 0);
-}
-
-GF_EXPORT
-void gf_mo_get_object_time(GF_MediaObject *mo, u32 *obj_time)
-{
-	if (!gf_odm_lock_mo(mo)) return;
-
-	/*regular media codec...*/
-	if (mo->odm->codec) {
-		/*get absolute clock (without drift) for audio*/
-		if (mo->odm->codec->type==GF_STREAM_AUDIO)
-			*obj_time = gf_clock_real_time(mo->odm->codec->ck);
-		else
-			*obj_time = gf_clock_time(mo->odm->codec->ck);
-	}
-	/*BIFS object */
-	else if (mo->odm->subscene && mo->odm->subscene->scene_codec) {
-		*obj_time = gf_clock_time(mo->odm->subscene->scene_codec->ck);
-	}
-	/*unknown / unsupported object*/
-	else {
-		*obj_time = 0;
-	}
-	gf_odm_lock(mo->odm, 0);
-}
-
-GF_EXPORT
-s32 gf_mo_get_clock_drift(GF_MediaObject *mo)
-{
-	s32 res = 0;
-	if (!gf_odm_lock_mo(mo)) return 0;
-
-	/*regular media codec...*/
-	if (mo->odm->codec) {
-		res = mo->odm->codec->ck->drift;
-	}
-	/*BIFS object */
-	else if (mo->odm->subscene && mo->odm->subscene->scene_codec) {
-		res = mo->odm->subscene->scene_codec->ck->drift;
-	}
-	gf_odm_lock(mo->odm, 0);
-	return res;
-}
-
-GF_EXPORT
-void gf_mo_play(GF_MediaObject *mo, Double clipBegin, Double clipEnd, Bool can_loop)
-{
-	if (!mo) return;
-
-	if (!mo->num_open && mo->odm) {
-		s32 res;
-		Bool is_restart = GF_FALSE;
-
-		/*remove object from media queue*/
-		gf_term_lock_media_queue(mo->odm->term, GF_TRUE);
-		res = gf_list_del_item(mo->odm->term->media_queue, mo->odm);
-		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
-
-		if (mo->odm->action_type!=GF_ODM_ACTION_PLAY) {
-			mo->odm->action_type = GF_ODM_ACTION_PLAY;
-			is_restart = GF_FALSE;
-			res = -1;
-		}
-
-		if (mo->odm->flags & GF_ODM_NO_TIME_CTRL) {
-			mo->odm->media_start_time = 0;
-		} else {
-			mo->odm->media_start_time = (u64) (clipBegin*1000);
-			if (mo->odm->duration && (mo->odm->media_start_time > mo->odm->duration)) {
-				if (can_loop) {
-					mo->odm->media_start_time %= mo->odm->duration;
-				} else {
-					mo->odm->media_start_time = mo->odm->duration;
-				}
-			}
-			if (clipEnd>=clipBegin) {
-				mo->odm->media_stop_time = (u64) (clipEnd*1000);
-				if (mo->odm->duration && (mo->odm->media_stop_time >=0) && ((u64) mo->odm->media_stop_time > mo->odm->duration)) {
-					mo->odm->media_stop_time = 0;
-				}
-			} else {
-				mo->odm->media_stop_time = 0;
-			}
-		}
-		/*done prefetching*/
-		mo->odm->flags &= ~GF_ODM_PREFETCH;
-
-		if (is_restart) {
-			mediacontrol_restart(mo->odm);
-		} else {
-			gf_odm_start(mo->odm, (res>=0) ? 1 : 0);
-		}
-	} else if (mo->odm) {
-		if (mo->num_to_restart) mo->num_restart--;
-		if (!mo->num_restart && (mo->num_to_restart==mo->num_open+1) ) {
-			mediacontrol_restart(mo->odm);
-			mo->num_to_restart = mo->num_restart = 0;
-		}
-	}
-	mo->num_open++;
-}
-
-GF_EXPORT
-Bool gf_mo_stop(GF_MediaObject *mo)
-{
-	Bool ret = GF_FALSE;
-	if (!mo || !mo->num_open) return GF_FALSE;
-
-	mo->num_open--;
-	if (!mo->num_open && mo->odm) {
-		if (mo->odm->flags & GF_ODM_DESTROYED) return GF_TRUE;
-
-		/*do not stop directly, this can delete channel data currently being decoded (BIFS anim & co)*/
-		gf_term_lock_media_queue(mo->odm->term, GF_TRUE);
-		/*if object not in media queue, add it*/
-		if (gf_list_find(mo->odm->term->media_queue, mo->odm)<0) {
-			gf_list_add(mo->odm->term->media_queue, mo->odm);
-		} else {
-			//ODM was queued for PLAY and we stop it, keep in queue for stoping buffers but don't send net commands
-			if (mo->odm->action_type == GF_ODM_ACTION_PLAY) {
-				//force a stop without network commands
-				mo->odm->state = GF_ODM_STATE_STOP_NO_NET;
-			}
-		}
-
-		/*signal STOP request*/
-		if ((mo->OD_ID==GF_MEDIA_EXTERNAL_ID) || (mo->odm && mo->odm->OD && (mo->odm->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID))) {
-			mo->odm->action_type = GF_ODM_ACTION_DELETE;
-			ret = GF_TRUE;
-		}
-		else if (mo->odm->action_type!=GF_ODM_ACTION_DELETE) {
-			mo->odm->action_type = GF_ODM_ACTION_STOP;
-		}
-
-		gf_term_lock_media_queue(mo->odm->term, GF_FALSE);
-	} else {
-		if (!mo->num_to_restart) {
-			mo->num_restart = mo->num_to_restart = mo->num_open + 1;
-		}
-	}
-	return ret;
-}
-
-GF_EXPORT
-void gf_mo_restart(GF_MediaObject *mo)
-{
-	void *mediactrl_stack = NULL;
-	if (!gf_odm_lock_mo(mo)) return;
-
-#ifndef GPAC_DISABLE_VRML
-	mediactrl_stack = gf_odm_get_mediacontrol(mo->odm);
-#endif
-	/*if no control and not root of a scene, check timelines are unlocked*/
-	if (!mediactrl_stack && !mo->odm->subscene) {
-		/*don't restart if sharing parent scene clock*/
-		if (gf_odm_shares_clock(mo->odm, gf_odm_get_media_clock(mo->odm->parentscene->root_od))) {
-			gf_odm_lock(mo->odm, 0);
-			return;
-		}
-	}
-	/*all other cases, call restart to take into account clock references*/
-	mediacontrol_restart(mo->odm);
-	gf_odm_lock(mo->odm, 0);
-}
-
-u32 gf_mo_get_od_id(MFURL *url)
-{
-	u32 i, j, tmpid;
-	char *str, *s_url;
-	u32 id = 0;
-
-	if (!url) return 0;
-
-	for (i=0; i<url->count; i++) {
-		if (url->vals[i].OD_ID) {
-			/*works because OD ID 0 is forbidden in MPEG4*/
-			if (!id) {
-				id = url->vals[i].OD_ID;
-			}
-			/*bad url, only one object can be described in MPEG4 urls*/
-			else if (id != url->vals[i].OD_ID) return 0;
-		} else if (url->vals[i].url && strlen(url->vals[i].url)) {
-			/*format: od:ID or od:ID#segment - also check for "ID" in case...*/
-			str = url->vals[i].url;
-			if (!strnicmp(str, "od:", 3)) str += 3;
-			/*remove segment info*/
-			s_url = gf_strdup(str);
-			j = 0;
-			while (j<strlen(s_url)) {
-				if (s_url[j]=='#') {
-					s_url[j] = 0;
-					break;
-				}
-				j++;
-			}
-			j = sscanf(s_url, "%u", &tmpid);
-			/*be carefull, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
-			if (j==1) {
-				char szURL[20];
-				sprintf(szURL, "%u", tmpid);
-				if (stricmp(szURL, s_url)) j = 0;
-			}
-			gf_free(s_url);
-
-			if (j!= 1) {
-				/*dynamic OD if only one URL specified*/
-				if (!i) return GF_MEDIA_EXTERNAL_ID;
-				/*otherwise ignore*/
-				continue;
-			}
-			if (!id) {
-				id = tmpid;
-				continue;
-			}
-			/*bad url, only one object can be described in MPEG4 urls*/
-			else if (id != tmpid) return 0;
-		}
-	}
-	return id;
-}
-
-
-Bool gf_mo_is_same_url(GF_MediaObject *obj, MFURL *an_url, Bool *keep_fragment, u32 obj_hint_type)
-{
-	Bool include_sub_url = GF_FALSE;
-	u32 i;
-	char szURL1[GF_MAX_PATH], szURL2[GF_MAX_PATH], *ext;
-
-	if (!obj->URLs.count) {
-		if (!obj->odm) return GF_FALSE;
-		strcpy(szURL1, obj->odm->net_service->url);
-	} else {
-		strcpy(szURL1, obj->URLs.vals[0].url);
-	}
-
-	/*don't analyse audio/video to locate segments or viewports*/
-	if ((obj->type==GF_MEDIA_OBJECT_AUDIO) || (obj->type==GF_MEDIA_OBJECT_VIDEO)) {
-		if (keep_fragment) *keep_fragment = GF_FALSE;
-		include_sub_url = GF_TRUE;
-	} else if ((obj->type==GF_MEDIA_OBJECT_SCENE) && keep_fragment && obj->odm) {
-		GF_ClientService *ns;
-		u32 j;
-		/*for remoteODs/dynamic ODs, check if one of the running service cannot be used*/
-		for (i=0; i<an_url->count; i++) {
-			char *frag = strrchr(an_url->vals[i].url, '#');
-			j=0;
-			/*this is the same object (may need some refinement)*/
-			if (!stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
-
-			/*fragment is a media segment, same URL*/
-			if (frag ) {
-				Bool same_res = GF_FALSE;
-				frag[0] = 0;
-				same_res = !strncmp(an_url->vals[i].url, szURL1, strlen(an_url->vals[i].url)) ? GF_TRUE : GF_FALSE;
-				frag[0] = '#';
-
-				/*if we're talking about the same resource, check if the fragment can be matched*/
-				if (same_res) {
-					/*if the fragment is a node which can be found, this is the same resource*/
-					if (obj->odm->subscene && (gf_sg_find_node_by_name(obj->odm->subscene->graph, frag+1)!=NULL) )
-						return GF_TRUE;
-
-					/*if the expected type is an existing segment (undefined media type), this is the same resource*/
-					if (!obj_hint_type && gf_odm_find_segment(obj->odm, frag+1))
-						return GF_TRUE;
-				}
-			}
-
-			gf_term_lock_media_queue(obj->odm->term, 1);
-			while ( (ns = (GF_ClientService*)gf_list_enum(obj->odm->term->net_services, &j)) ) {
-				/*sub-service of an existing service - don't touch any fragment*/
-				if (gf_term_service_can_handle_url(ns, an_url->vals[i].url)) {
-					*keep_fragment = GF_TRUE;
-					gf_term_lock_media_queue(obj->odm->term, 0);
-					return GF_FALSE;
-				}
-			}
-			gf_term_lock_media_queue(obj->odm->term, 0);
-		}
-	}
-
-	/*check on full URL without removing fragment IDs*/
-	if (include_sub_url) {
-		for (i=0; i<an_url->count; i++) {
-			if (an_url->vals[i].url && !stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
-		}
-		/*not same resource, we will have to check fragment as URL might point to a sub-service or single stream of a mux*/
-		if (keep_fragment) *keep_fragment = GF_TRUE;
-		return GF_FALSE;
-	}
-	ext = strrchr(szURL1, '#');
-	if (ext) ext[0] = 0;
-	for (i=0; i<an_url->count; i++) {
-		if (!an_url->vals[i].url) return GF_FALSE;
-		strcpy(szURL2, an_url->vals[i].url);
-		ext = strrchr(szURL2, '#');
-		if (ext) ext[0] = 0;
-		if (!stricmp(szURL1, szURL2)) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_mo_url_changed(GF_MediaObject *mo, MFURL *url)
-{
-	u32 od_id;
-	Bool ret = GF_FALSE;
-	if (!mo) return (url ? GF_TRUE : GF_FALSE);
-	od_id = gf_mo_get_od_id(url);
-	if ( (mo->OD_ID == GF_MEDIA_EXTERNAL_ID) && (od_id == GF_MEDIA_EXTERNAL_ID)) {
-		ret = !gf_mo_is_same_url(mo, url, NULL, 0);
-	} else {
-		ret = (mo->OD_ID == od_id) ? GF_FALSE : GF_TRUE;
-	}
-	/*special case for 3GPP text: if not playing and user node changed, force removing it*/
-	if (ret && mo->odm && !mo->num_open && (mo->type == GF_MEDIA_OBJECT_TEXT)) {
-		mo->flags |= GF_MO_DISPLAY_REMOVE;
-		gf_term_stop_codec(mo->odm->codec, GF_FALSE);
-	}
-	return ret;
-}
-
-GF_EXPORT
-void gf_mo_pause(GF_MediaObject *mo)
-{
-#ifndef GPAC_DISABLE_VRML
-	if (!mo || !mo->num_open || !mo->odm) return;
-	mediacontrol_pause(mo->odm);
-#endif
-}
-
-GF_EXPORT
-void gf_mo_resume(GF_MediaObject *mo)
-{
-#ifndef GPAC_DISABLE_VRML
-	if (!mo || !mo->num_open || !mo->odm) return;
-	mediacontrol_resume(mo->odm, 0);
-#endif
-}
-
-GF_EXPORT
-void gf_mo_set_speed(GF_MediaObject *mo, Fixed speed)
-{
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-#endif
-
-	if (!mo) return;
-	if (!mo->odm) {
-		mo->speed = speed;
-		return;
-	}
-	//override startup speed if asked to
-	if (mo->odm->set_speed) {
-		speed = mo->odm->set_speed;
-		mo->odm->set_speed = 0;
-	}
-#ifndef GPAC_DISABLE_VRML
-	/*if media control forbidd that*/
-	ctrl = gf_odm_get_mediacontrol(mo->odm);
-	if (ctrl) return;
-#endif
-	if (mo->odm->net_service && mo->odm->net_service->owner && (mo->odm->net_service->owner->flags & GF_ODM_INHERIT_TIMELINE))
-		return;
-	gf_odm_set_speed(mo->odm, speed, GF_TRUE);
-}
-
-GF_EXPORT
-Fixed gf_mo_get_current_speed(GF_MediaObject *mo)
-{
-	return (mo && mo->odm && mo->odm->codec && mo->odm->codec->ck) ? mo->odm->codec->ck->speed : FIX_ONE;
-}
-
-GF_EXPORT
-u32 gf_mo_get_min_frame_dur(GF_MediaObject *mo)
-{
-	return (mo && mo->odm && mo->odm->codec) ? mo->odm->codec->min_frame_dur : 0;
-}
-
-
-GF_EXPORT
-Fixed gf_mo_get_speed(GF_MediaObject *mo, Fixed in_speed)
-{
-	Fixed res = in_speed;
-
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-
-	if (!gf_odm_lock_mo(mo)) return in_speed;
-
-	/*get control*/
-	ctrl = gf_odm_get_mediacontrol(mo->odm);
-	if (ctrl) res = ctrl->control->mediaSpeed;
-
-	gf_odm_lock(mo->odm, 0);
-#endif
-
-	return res;
-}
-
-GF_EXPORT
-Bool gf_mo_get_loop(GF_MediaObject *mo, Bool in_loop)
-{
-	GF_Clock *ck;
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-#endif
-	if (!gf_odm_lock_mo(mo)) return in_loop;
-
-	/*get control*/
-#ifndef GPAC_DISABLE_VRML
-	ctrl = gf_odm_get_mediacontrol(mo->odm);
-	if (ctrl) in_loop = ctrl->control->loop;
-#endif
-
-	/*otherwise looping is only accepted if not sharing parent scene clock*/
-	ck = gf_odm_get_media_clock(mo->odm->parentscene->root_od);
-	if (gf_odm_shares_clock(mo->odm, ck)) {
-		in_loop = GF_FALSE;
-#ifndef GPAC_DISABLE_VRML
-		/*
-			if (ctrl && ctrl->stream->odm && ctrl->stream->odm->subscene)
-					gf_term_invalidate_compositor(mo->odm->term);
-		*/
-#endif
-	}
-	gf_odm_lock(mo->odm, 0);
-	return in_loop;
-}
-
-GF_EXPORT
-Double gf_mo_get_duration(GF_MediaObject *mo)
-{
-	Double dur;
-	if (!gf_odm_lock_mo(mo)) return -1.0;
-	dur = ((Double) (s64)mo->odm->duration)/1000.0;
-	gf_odm_lock(mo->odm, 0);
-	return dur;
-}
-
-GF_EXPORT
-Bool gf_mo_should_deactivate(GF_MediaObject *mo)
-{
-	Bool res = GF_FALSE;
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-#endif
-
-	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
-
-
-	if (!mo->odm->state || (mo->odm->parentscene && mo->odm->parentscene->is_dynamic_scene)) {
-		gf_odm_lock(mo->odm, 0);
-		return GF_FALSE;
-	}
-
-#ifndef GPAC_DISABLE_VRML
-	/*get media control and see if object owning control is running*/
-	ctrl = gf_odm_get_mediacontrol(mo->odm);
-	if (!ctrl) res = GF_TRUE;
-	/*if ctrl and ctrl not ruling this mediaObject, deny deactivation*/
-	else if (ctrl->stream->odm != mo->odm) res = GF_FALSE;
-	/*this is currently under discussion in MPEG. for now we deny deactivation as soon as a mediaControl is here*/
-	else if (ctrl->stream->odm->state) res = GF_FALSE;
-	/*otherwise allow*/
-	else
-#endif
-		res = GF_TRUE;
-
-	gf_odm_lock(mo->odm, 0);
-	return res;
-}
-
-GF_EXPORT
-Bool gf_mo_is_muted(GF_MediaObject *mo)
-{
-	Bool res = GF_FALSE;
-#ifndef GPAC_DISABLE_VRML
-	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
-	res = mo->odm->media_ctrl ? mo->odm->media_ctrl->control->mute : GF_FALSE;
-	gf_odm_lock(mo->odm, 0);
-#endif
-	return res;
-}
-
-GF_EXPORT
-Bool gf_mo_is_started(GF_MediaObject *mo)
-{
-	if (mo && mo->odm && mo->odm->codec && gf_clock_is_started(mo->odm->codec->ck)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_mo_is_done(GF_MediaObject *mo)
-{
-	Bool res = GF_FALSE;
-	GF_Codec *codec;
-	u64 dur;
-	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
-
-	if (mo->odm->codec && mo->odm->codec->CB) {
-		/*for natural media use composition buffer*/
-		res = (mo->odm->codec->CB->Status==CB_STOP) ? GF_TRUE : GF_FALSE;
-	} else {
-		/*otherwise check EOS and time*/
-		codec = mo->odm->codec;
-		dur = mo->odm->duration;
-		if (!mo->odm->codec) {
-			if (!mo->odm->subscene) res = GF_FALSE;
-			else {
-				codec = mo->odm->subscene->scene_codec;
-				dur = mo->odm->subscene->duration;
-			}
-		}
-		if (codec && (codec->Status==GF_ESM_CODEC_STOP)) {
-			/*codec is done, check by duration*/
-			GF_Clock *ck = gf_odm_get_media_clock(mo->odm);
-			if (gf_clock_time(ck) > dur) res = GF_TRUE;
-		}
-	}
-	gf_odm_lock(mo->odm, 0);
-	return res;
-}
-
-/*resyncs clock - only audio objects are allowed to use this*/
-GF_EXPORT
-void gf_mo_adjust_clock(GF_MediaObject *mo, s32 ms_drift)
-{
-	if (!mo || !mo->odm) return;
-	if (!mo->odm->codec || (mo->odm->codec->type != GF_STREAM_AUDIO) ) return;
-	gf_clock_adjust_drift(mo->odm->codec->ck, ms_drift);
-}
-
-GF_EXPORT
-u32 gf_mo_get_flags(GF_MediaObject *mo)
-{
-	return mo ? mo->flags : 0;
-}
-
-GF_EXPORT
-void gf_mo_set_flag(GF_MediaObject *mo, u32 flag, Bool set_on)
-{
-	if (mo) {
-		if (set_on)
-			mo->flags |= flag;
-		else
-			mo->flags &= ~flag;
-	}
-}
-
-GF_EXPORT
-u32 gf_mo_get_last_frame_time(GF_MediaObject *mo)
-{
-	return mo ? mo->timestamp : 0;
-}
-
-GF_EXPORT
-Bool gf_mo_is_private_media(GF_MediaObject *mo)
-{
-	if (mo && mo->odm && mo->odm->codec && mo->odm->codec->decio && (mo->odm->codec->decio->InterfaceType==GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_mo_set_position(GF_MediaObject *mo, GF_Window *src, GF_Window *dst)
-{
-	GF_Err e;
-	GF_PrivateMediaDecoder *dec;
-	if (!mo->odm || !mo->odm->codec || !mo->odm->codec->decio || (mo->odm->codec->decio->InterfaceType!=GF_PRIVATE_MEDIA_DECODER_INTERFACE)) return GF_FALSE;
-
-	dec = (GF_PrivateMediaDecoder*)mo->odm->codec->decio;
-	e = dec->Control(dec, GF_FALSE, src, dst);
-	if (e==GF_BUFFER_TOO_SMALL) return GF_TRUE;
-	return GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_mo_is_raw_memory(GF_MediaObject *mo)
-{
-	if (!mo->odm || !mo->odm->codec) return GF_FALSE;
-	return mo->odm->codec->direct_frame_output || mo->odm->codec->direct_vout ;
-}
-
-GF_EXPORT
-u32 gf_mo_has_audio(GF_MediaObject *mo)
-{
-	char *sub_url, *ext;
-	u32 i;
-	GF_NetworkCommand com;
-	GF_ClientService *ns;
-	GF_Scene *scene;
-	if (!mo || !mo->odm) return 0;
-	if (mo->type != GF_MEDIA_OBJECT_VIDEO) return 0;
-	if (!mo->odm->net_service) return 2;
-
-	ns = mo->odm->net_service;
-	scene = mo->odm->parentscene;
-	sub_url = strchr(ns->url, '#');
-	for (i=0; i<gf_list_count(scene->resources); i++) {
-		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
-		if (odm->net_service != ns) continue;
-		if (!odm->mo) continue;
-
-		if (sub_url) {
-			ext = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
-			if (ext) ext = strchr(ext, '#');
-			if (!ext || strcmp(sub_url, ext)) continue;
-		}
-		/*there is already an audio object in this service, do not recreate one*/
-		if (odm->mo->type == GF_MEDIA_OBJECT_AUDIO) return 0;
-	}
-	memset(&com, 0, sizeof(GF_NetworkCommand) );
-	com.command_type = GF_NET_SERVICE_HAS_AUDIO;
-	com.audio.base_url = mo->URLs.count ? mo->URLs.vals[0].url : NULL;
-	if (!com.audio.base_url) com.audio.base_url = ns->url;
-	if (gf_term_service_command(ns, &com) == GF_OK) return 1;
-	return 0;
-}
-
-GF_EXPORT
-GF_SceneGraph *gf_mo_get_scenegraph(GF_MediaObject *mo)
-{
-	if (!mo || !mo->odm || !mo->odm->subscene) return NULL;
-	return mo->odm->subscene->graph;
-}
-
-
-GF_EXPORT
-GF_DOMEventTarget *gf_mo_event_target_add_node(GF_MediaObject *mo, GF_Node *n)
-{
-#ifndef GPAC_DISABLE_SVG
-	GF_DOMEventTarget *target = NULL;
-	if (!mo ||!n) return NULL;
-	target = gf_dom_event_get_target_from_node(n);
-	gf_list_add(mo->evt_targets, target);
-	return target;
-#else
-	return NULL;
-#endif
-}
-
-GF_Err gf_mo_event_target_remove(GF_MediaObject *mo, GF_DOMEventTarget *target)
-{
-	if (!mo || !target) return GF_BAD_PARAM;
-	gf_list_del_item(mo->evt_targets, target);
-	return GF_OK;
-}
-
-GF_Err gf_mo_event_target_remove_by_index(GF_MediaObject *mo, u32 i)
-{
-	if (!mo) return GF_BAD_PARAM;
-	gf_list_rem(mo->evt_targets, i);
-	return GF_OK;
-}
-
-GF_Node *gf_mo_event_target_enum_node(GF_MediaObject *mo, u32 *i)
-{
-	GF_DOMEventTarget *target;
-	if (!mo || !i) return NULL;
-	target = (GF_DOMEventTarget *)gf_list_enum(mo->evt_targets, i);
-	if (!target) return NULL;
-	//if (target->ptr_type != GF_DOM_EVENT_TARGET_NODE) return NULL;
-	return (GF_Node *)target->ptr;
-}
-
-s32 gf_mo_event_target_find_by_node(GF_MediaObject *mo, GF_Node *node)
-{
-	u32 i, count;
-	count = gf_list_count(mo->evt_targets);
-	for (i = 0; i < count; i++) {
-		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
-		if (target->ptr == node) {
-			return i;
-		}
-	}
-	return -1;
-}
-
-GF_EXPORT
-GF_Err gf_mo_event_target_remove_by_node(GF_MediaObject *mo, GF_Node *node)
-{
-	u32 i, count;
-	count = gf_list_count(mo->evt_targets);
-	for (i = 0; i < count; i++) {
-		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
-		if (target->ptr == node) {
-			gf_list_del_item(mo->evt_targets, target);
-			i--;
-			count--;
-			//return GF_OK;
-		}
-	}
-	return GF_BAD_PARAM;
-}
-
-GF_EXPORT
-GF_Node *gf_event_target_get_node(GF_DOMEventTarget *target)
-{
-	if (target && (target->ptr_type == GF_DOM_EVENT_TARGET_NODE)) {
-		return (GF_Node *)target->ptr;
-	}
-	return NULL;
-}
-
-GF_EXPORT
-GF_DOMEventTarget *gf_mo_event_target_get(GF_MediaObject *mo, u32 i)
-{
-	GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
-	return target;
-}
-
-void gf_mo_event_target_reset(GF_MediaObject *mo)
-{
-	if (mo->evt_targets) gf_list_reset(mo->evt_targets);
-}
-
-u32 gf_mo_event_target_count(GF_MediaObject *mo)
-{
-	if (!mo) return 0;
-	return gf_list_count(mo->evt_targets);
-}
-
-void gf_mo_del(GF_MediaObject *mo)
-{
-	assert(gf_list_count(mo->evt_targets) == 0);
-	gf_list_del(mo->evt_targets);
-	gf_free(mo);
-}
-
-
-Bool gf_mo_get_srd_info(GF_MediaObject *mo, GF_MediaObjectVRInfo *vr_info)
-{
-	GF_Scene *scene;
-	if (!vr_info) return GF_FALSE;
-	if (!gf_odm_lock_mo(mo)) return GF_FALSE;
-	
-	scene = mo->odm->subscene ? mo->odm->subscene : mo->odm->parentscene;
-	memset(vr_info, 0, sizeof(GF_MediaObjectVRInfo));
-
-	vr_info->srd_x = mo->srd_x;
-	vr_info->srd_y = mo->srd_y;
-	vr_info->srd_w = mo->srd_w;
-	vr_info->srd_h = mo->srd_h;
-	vr_info->srd_min_x = scene->srd_min_x;
-	vr_info->srd_min_y = scene->srd_min_y;
-	vr_info->srd_max_x = scene->srd_max_x;
-	vr_info->srd_max_y = scene->srd_max_y;
-	vr_info->is_tiled_srd = scene->is_tiled_srd;
-	vr_info->has_full_coverage = (scene->srd_type==2) ? GF_TRUE : GF_FALSE;
-	
-	gf_sg_get_scene_size_info(scene->graph, &vr_info->scene_width, &vr_info->scene_height);
-
-	gf_odm_lock(mo->odm, 0);
-	return (!scene->vr_type && !scene->srd_type) ? GF_FALSE : GF_TRUE;
-}
-
-/*sets quality hint for this media object  - quality_rank is between 0 (min quality) and 100 (max quality)*/
-void gf_mo_hint_quality_degradation(GF_MediaObject *mo, u32 quality_degradation)
-{
-	if (!gf_odm_lock_mo(mo)) return;
-	if (!mo->odm || !mo->odm->codec) {
-		gf_odm_lock(mo->odm, 0);
-		return;
-	}
-	if (mo->quality_degradation_hint != quality_degradation) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_QUALITY_SWITCH;
-		com.base.on_channel = gf_list_get(mo->odm->codec->inChannels, 0);
-		com.switch_quality.quality_degradation = quality_degradation;
-		gf_term_service_command(mo->odm->net_service, &com);
-		
-		mo->quality_degradation_hint = quality_degradation;
-	}
-
-	gf_odm_lock(mo->odm, 0);
-}
-
-void gf_mo_hint_visible_rect(GF_MediaObject *mo, u32 min_x, u32 max_x, u32 min_y, u32 max_y)
-{
-	
-	if (!gf_odm_lock_mo(mo)) return;
-	if (!mo->odm || !mo->odm->codec) {
-		gf_odm_lock(mo->odm, 0);
-		return;
-	}
-	if ((mo->view_min_x!=min_x) || (mo->view_max_x!=max_x) || (mo->view_min_y!=min_y) || (mo->view_max_y!=max_y)) {
-		GF_NetworkCommand com;
-		mo->view_min_x = min_x;
-		mo->view_max_x = max_x;
-		mo->view_min_y = min_y;
-		mo->view_max_y = max_y;
-		
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_CHAN_VISIBILITY_HINT;
-		com.base.on_channel = gf_list_get(mo->odm->codec->inChannels, 0);
-		com.visibility_hint.min_x = min_x;
-		com.visibility_hint.max_x = max_x;
-		com.visibility_hint.min_y = min_y;
-		com.visibility_hint.max_y = max_y;
-		gf_term_service_command(mo->odm->net_service, &com);
-	}
-	
-	gf_odm_lock(mo->odm, 0);
-}
-
-
-

gpac-0.8.0.tar.gz/src/terminal/media_sensor.c Deleted

@@ -1,287 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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 "media_control.h"
-#include <gpac/constants.h>
-#include <gpac/internal/compositor_dev.h>
-
-#ifndef GPAC_DISABLE_VRML
-
-/*render : setup media sensor and update timing in case of inline scenes*/
-void RenderMediaSensor(GF_Node *node, void *rs, Bool is_destroy)
-{
-	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
-	GF_Clock *ck;
-	Bool do_update_clock = 1;
-	MediaSensorStack *st = (MediaSensorStack *)gf_node_get_private(node);
-
-	if (is_destroy) {
-		/*unlink from OD*/
-		if (st->stream && st->stream->odm)
-			gf_list_del_item(st->stream->odm->ms_stack, st);
-
-		gf_list_del(st->seg);
-		gf_free(st);
-		return;
-	}
-	//we need to disable culling otherwise we may never be called back again ...
-	tr_state->disable_cull = 1;
-
-	if (!st->stream) st->stream = gf_mo_register(node, &st->sensor->url, 0, 0);
-	if (!st->stream || !st->stream->odm) return;
-
-	if (!st->is_init) {
-		gf_list_add(st->stream->odm->ms_stack, st);
-		gf_odm_init_segments(st->stream->odm, st->seg, &st->sensor->url);
-		st->is_init = 1;
-		st->active_seg = 0;
-
-	}
-	/*media sensor bound to natural media (audio, video) is updated when fetching the stream
-	data for rendering.*/
-
-	ck = NULL;
-	/*check inline scenes - if the scene is set to restart DON'T MODIFY SENSOR: since we need a 2 render
-	passes to restart inline, scene is considered as not running*/
-	if (st->stream->odm->subscene && !st->stream->odm->subscene->needs_restart) {
-		if (st->stream->odm->subscene->scene_codec) ck = st->stream->odm->subscene->scene_codec->ck;
-		/*dynamic scene*/
-		else ck = st->stream->odm->subscene->dyn_ck;
-		if (st->stream->odm->subscene->is_dynamic_scene) do_update_clock = 0;
-	}
-	/*check anim streams*/
-	else if (st->stream->odm->codec && (st->stream->odm->codec->type==GF_STREAM_SCENE)) ck = st->stream->odm->codec->ck;
-	/*check OCR streams*/
-	else if (st->stream->odm->ocr_codec) ck = st->stream->odm->ocr_codec->ck;
-
-	if (ck && ck->clock_init ) {
-		if (do_update_clock)
-			st->stream->odm->media_current_time = gf_clock_media_time(ck);
-		mediasensor_update_timing(st->stream->odm, 0);
-	}
-	//if main addon is VoD , fire a timeshift update
-	else if (st->stream->odm->subscene && st->stream->odm->subscene->sys_clock_at_main_activation) {
-		GF_Event evt;
-		memset(&evt, 0, sizeof(evt));
-		evt.type = GF_EVENT_TIMESHIFT_UPDATE;
-		gf_term_send_event(st->stream->odm->term, &evt);
-	}
-}
-
-void InitMediaSensor(GF_Scene *scene, GF_Node *node)
-{
-	MediaSensorStack *st;
-	GF_SAFEALLOC(st, MediaSensorStack);
-	if (!st) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media sensor stack\n"));
-		return;
-	}
-
-	st->parent = scene;
-	st->sensor = (M_MediaSensor *)node;
-	st->seg = gf_list_new();
-	gf_node_set_callback_function(node, RenderMediaSensor);
-	gf_node_set_private(node, st);
-
-}
-
-/*only URL can be changed, so reset and get new URL*/
-void MS_Modified(GF_Node *node)
-{
-	MediaSensorStack *st = (MediaSensorStack *)gf_node_get_private(node);
-	if (!st) return;
-
-	while (gf_list_count(st->seg)) gf_list_rem(st->seg, 0);
-
-	if (st->stream) {
-		/*unlink from OD*/
-		if (st->stream->odm && st->stream->odm->ms_stack)
-			gf_list_del_item(st->stream->odm->ms_stack, st);
-
-		gf_mo_unregister(node, st->stream);
-		if (st->sensor->isActive) {
-			st->sensor->isActive = 0;
-			gf_node_event_out((GF_Node *) st->sensor, 4/*"isActive"*/);
-		}
-	}
-	st->stream = NULL;
-	st->is_init = 0;
-	gf_term_invalidate_compositor(st->parent->root_od->term);
-}
-
-
-static void media_sensor_activate_segment(MediaSensorStack *media_sens, GF_Segment *desc)
-{
-	media_sens->sensor->isActive = 1;
-	gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-	/*set info*/
-	gf_sg_vrml_mf_reset(& media_sens->sensor->info, GF_SG_VRML_MFSTRING);
-	gf_sg_vrml_mf_alloc(& media_sens->sensor->info, GF_SG_VRML_MFSTRING, 1);
-	media_sens->sensor->info.vals[0] = desc->SegmentName ? gf_strdup(desc->SegmentName) : NULL;
-	gf_node_event_out((GF_Node *) media_sens->sensor, 5/*"info"*/);
-	/*set duration*/
-	media_sens->sensor->mediaDuration = desc->Duration;
-	gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
-	/*set seg start time*/
-	media_sens->sensor->streamObjectStartTime = desc->startTime;
-	gf_node_event_out((GF_Node *) media_sens->sensor, 2/*"streamObjectStartTime"*/);
-}
-
-void mediasensor_update_timing(GF_ObjectManager *odm, Bool is_eos)
-{
-	GF_Segment *desc;
-	u32 i, count, j, ms_count;
-	Double time;
-	ms_count = gf_list_count(odm->ms_stack);
-	if (!ms_count) return;
-
-	time = odm->media_current_time / 1000.0;
-	//dirty hack to get timing of frame when very late (openhevc debug)
-	if (odm->subscene && odm->subscene->dyn_ck && odm->subscene->dyn_ck->last_TS_rendered)
-		time = odm->subscene->dyn_ck->last_TS_rendered / 1000.0;
-
-	for (j=0; j<ms_count; j++) {
-		MediaSensorStack *media_sens = (MediaSensorStack *)gf_list_get(odm->ms_stack, j);
-		if (!media_sens->is_init) continue;
-		count = gf_list_count(media_sens->seg);
-
-		/*full object controled*/
-		if (!media_sens->active_seg && !count) {
-			/*check for end of scene (MediaSensor on inline)*/
-			if (odm->subscene && odm->subscene->duration) {
-				GF_Clock *ck = gf_odm_get_media_clock(odm);
-				if (ck->has_seen_eos && (1000*time>=(Double) (s64)odm->subscene->duration)) {
-					if (media_sens->sensor->isActive) {
-						/*force notification of time (ntify the scene duration rather than the current clock*/
-						media_sens->sensor->mediaCurrentTime = (Double) odm->subscene->duration;
-						media_sens->sensor->mediaCurrentTime /= 1000;
-						gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
-						media_sens->sensor->isActive = 0;
-						gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor\n", odm->OD->objectDescriptorID));
-					}
-					continue;
-				}
-			}
-
-			if (!is_eos && !media_sens->sensor->isActive) {
-				media_sens->sensor->isActive = 1;
-				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-
-				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-				if (odm->subscene) {
-					media_sens->sensor->mediaDuration = (Double) (s64)odm->subscene->duration;
-				} else {
-					media_sens->sensor->mediaDuration = (Double) (s64)odm->duration;
-				}
-				if (media_sens->sensor->mediaDuration)
-					media_sens->sensor->mediaDuration /= 1000;
-				else
-					media_sens->sensor->mediaDuration = -FIX_ONE;
-
-				gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
-			}
-
-			if (is_eos && media_sens->sensor->isActive) {
-				if (media_sens->sensor->mediaDuration>=0) {
-					media_sens->sensor->mediaCurrentTime = media_sens->sensor->mediaDuration;
-				} else {
-					media_sens->sensor->mediaCurrentTime = time;
-				}
-				gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
-				media_sens->sensor->isActive = 0;
-				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-			} else {
-				if (media_sens->sensor->isActive && (media_sens->sensor->mediaCurrentTime != time)) {
-					media_sens->sensor->mediaCurrentTime = time;
-					gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
-				}
-			}
-			continue;
-		}
-
-		/*locate segment*/
-		for (i=media_sens->active_seg; i<count; i++) {
-			desc = (GF_Segment*)gf_list_get(media_sens->seg, i);
-			/*not controled*/
-			if (desc->startTime > time) {
-				if (media_sens->sensor->isActive) {
-					media_sens->sensor->isActive = 0;
-					gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor at time %g - segment %s\n", odm->OD->objectDescriptorID, time, desc->SegmentName));
-				}
-				continue;
-			}
-			if (desc->startTime + desc->Duration < time) continue;
-			if (desc->startTime + desc->Duration == time) {
-				continue;
-			}
-			/*segment switch, force activation (isActive TRUE send at each seg)*/
-			if (media_sens->active_seg != i) {
-				media_sens->active_seg = i;
-				media_sens->sensor->isActive = 0;
-			}
-
-			if (!media_sens->sensor->isActive) {
-				media_sensor_activate_segment(media_sens, desc);
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Activating media sensor time %g - segment %s\n", odm->OD->objectDescriptorID, time, desc->SegmentName));
-			}
-
-			/*set media time - relative to segment start time*/
-			time -= desc->startTime;
-			if (media_sens->sensor->mediaCurrentTime != time) {
-				media_sens->sensor->mediaCurrentTime = time;
-				gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
-			}
-			break;
-		}
-		if (i==count) {
-			/*we're after last segment, deactivate*/
-			if (media_sens->sensor->isActive) {
-				media_sens->sensor->isActive = 0;
-				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-				media_sens->active_seg = count;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor at time %g: no more segments\n", odm->OD->objectDescriptorID, time));
-			}
-		}
-	}
-}
-
-void MS_Stop(MediaSensorStack *st)
-{
-	if (st->sensor->isActive) {
-		st->sensor->isActive = 0;
-		gf_node_event_out((GF_Node *) st->sensor, 4/*"isActive"*/);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor\n", st->stream->odm->OD->objectDescriptorID));
-	}
-	st->active_seg = 0;
-}
-
-#endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/terminal/mpeg4_inline.c Deleted

@@ -1,783 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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.
- *
- */
-
-
-
-/*for OD service types*/
-#include <gpac/constants.h>
-/*for URL concatenation*/
-#include <gpac/network.h>
-#include <gpac/internal/terminal_dev.h>
-#include "media_control.h"
-#include <gpac/compositor.h>
-#include <gpac/nodes_x3d.h>
-#include <gpac/crypt.h>
-
-/*SVG properties*/
-#ifndef GPAC_DISABLE_SVG
-#include <gpac/scenegraph_svg.h>
-#endif
-
-
-
-#ifndef GPAC_DISABLE_VRML
-
-void gf_inline_restart(GF_Scene *scene)
-{
-	scene->needs_restart = 1;
-	gf_term_invalidate_compositor(scene->root_od->term);
-}
-
-
-static Bool gf_inline_set_scene(M_Inline *root)
-{
-	GF_MediaObject *mo;
-	GF_Scene *parent;
-	GF_SceneGraph *graph = gf_node_get_graph((GF_Node *) root);
-	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);
-	if (!mo) return GF_FALSE;
-	//invalidate as soon as we have an mo (eg something is attached to the scene)
-	gf_term_invalidate_compositor(parent->root_od->term);
-
-	if (!mo->odm) return GF_FALSE;
-
-	if (!mo->odm->subscene) {
-		gf_term_invalidate_compositor(parent->root_od->term);
-		return GF_FALSE;
-	}
-	/*assign inline scene as private stack of inline node, and remember inline node for event propagation*/
-	gf_node_set_private((GF_Node *)root, mo->odm->subscene);
-	mo->odm->subscene->object_attached = GF_TRUE;
-
-	/*play*/
-	gf_mo_play(mo, 0, -1, GF_FALSE);
-
-	return GF_TRUE;
-}
-
-void gf_inline_on_modified(GF_Node *node)
-{
-	u32 ODID;
-	GF_MediaObject *mo;
-	M_Inline *pInline = (M_Inline *) node;
-	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
-
-	ODID = gf_mo_get_od_id(&pInline->url);
-	if (scene) {
-		mo = (scene->root_od) ? scene->root_od->mo : NULL;
-
-		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
-		if (mo) {
-			Bool changed = GF_TRUE;
-			if (ODID != GF_MEDIA_EXTERNAL_ID) {
-				if (ODID && (ODID==scene->root_od->OD->objectDescriptorID)) changed = GF_FALSE;
-			} else {
-				if (gf_mo_is_same_url(mo, &pInline->url, NULL, 0) ) changed = GF_FALSE;
-			}
-			if (mo->num_open) {
-				if (!changed) return;
-
-				gf_scene_notify_event(scene, GF_EVENT_UNLOAD, node, NULL, GF_OK, GF_TRUE);
-				gf_node_dirty_parents(node);
-				gf_mo_event_target_remove_by_node(mo, node);
-
-				/*reset the scene pointer as it may get destroyed*/
-				switch (gf_node_get_tag(node)) {
-				case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-				case TAG_X3D_Inline:
-#endif
-					gf_node_set_private(node, NULL);
-					break;
-				}
-
-				scene->object_attached = GF_FALSE;
-				mo->num_open --;
-				if (!mo->num_open) {
-					if (ODID == GF_MEDIA_EXTERNAL_ID) {
-						GF_Scene *parent = scene->root_od->parentscene;
-						/*!!! THIS WILL DESTROY THE INLINE SCENE OBJECT !!!*/
-						gf_odm_disconnect(scene->root_od, GF_TRUE);
-						/*and force removal of the media object*/
-						if (parent) {
-							if (gf_list_del_item(parent->scene_objects, mo)>=0) {
-								gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
-								gf_mo_del(mo);
-							}
-						}
-					} else {
-						gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
-
-						/*external media are completely unloaded, except addons which are only declared once */
-						if (!scene->root_od->addon && (scene->root_od->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID)) {
-							scene->root_od->action_type = GF_ODM_ACTION_DELETE;
-						} else {
-							scene->root_od->action_type = GF_ODM_ACTION_STOP;
-						}
-						if (gf_list_find(scene->root_od->term->media_queue, scene->root_od)<0)
-							gf_list_add(scene->root_od->term->media_queue, scene->root_od);
-
-						gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
-					}
-				}
-			}
-		}
-	}
-	/*force a redraw and load scene at next pass - we cannot load the scene now because
-		- we can be in a JS call (eg JS mutex blocked)
-		- locating scene objects matching the new url needs exclusive access to the MediaObject list, achieved with the term net mutex
-		- another service may already be setting up objects (eg exclusive access to the net mutex grabbed), which can trigger event forwarding
-		- some event forwarders may request JS context (eg access to JS mutex)
-
-		In such a case we would end up in a deadlock - this needs urgent fixing ...
-	*/
-	if (ODID) {
-		/*if no parent we must process the url change as we may not be traversed later on (not in the scene tree)*/
-		if (gf_node_get_parent(node, 0)==NULL) {
-			gf_inline_set_scene(pInline);
-		} else {
-			gf_node_dirty_parents(node);
-		}
-	}
-}
-
-static void gf_inline_check_restart(GF_Scene *scene)
-{
-	/*no ctrl if no duration*/
-	if (!scene->duration) return;
-	if (!scene->needs_restart) gf_odm_check_segment_switch(scene->root_od);
-	if (scene->needs_restart) return;
-
-	if (scene->root_od->media_ctrl && scene->root_od->media_ctrl->control->loop) {
-		GF_Clock *ck = gf_odm_get_media_clock(scene->root_od);
-		if (ck->has_seen_eos) {
-			u32 now = gf_clock_time(ck);
-			u64 dur = scene->duration;
-			if (scene->root_od->media_ctrl->current_seg) {
-				/*only process when all segments are played*/
-				if (gf_list_count(scene->root_od->media_ctrl->seg) <= scene->root_od->media_ctrl->current_seg) {
-					scene->needs_restart = 1;
-					scene->root_od->media_ctrl->current_seg = 0;
-				}
-			}
-			else {
-				Double s, e;
-				s = now;
-				s/=1000;
-				e = -1;
-				MC_GetRange(scene->root_od->media_ctrl, &s, &e);
-				if ((e>=0) && (e<GF_MAX_FLOAT)) dur = (u32) (e*1000);
-				if (dur<=now) {
-					scene->needs_restart = 1;
-					scene->root_od->media_ctrl->current_seg = 0;
-				} else {
-					/*trigger render until to watch for restart...*/
-					gf_term_invalidate_compositor(scene->root_od->term);
-				}
-			}
-		}
-	}
-}
-
-void gf_scene_mpeg4_inline_check_restart(GF_Scene *scene)
-{
-	gf_inline_check_restart(scene);
-	
-	if (scene->needs_restart) {
-		gf_term_invalidate_compositor(scene->root_od->term);
-		return;
-	}
-}
-
-void gf_scene_mpeg4_inline_restart(GF_Scene *scene)
-{
-	u32 current_seg = 0;
-
-	if (scene->root_od->media_ctrl) current_seg = scene->root_od->media_ctrl->current_seg;
-
-	if (scene->is_dynamic_scene) {
-		s64 from = 0;
-		if (scene->root_od->media_ctrl) {
-			if (scene->root_od->media_ctrl->media_stop<=0) {
-				from = (s64) (scene->root_od->media_ctrl->media_stop * 1000) - 1;
-			}
-			else if (scene->root_od->media_ctrl->media_start>=0) {
-				scene->root_od->media_ctrl->current_seg = current_seg;
-				from = (s64) (scene->root_od->media_ctrl->media_start * 1000);
-			}
-		}
-		gf_scene_restart_dynamic(scene, from, 0, 0);
-	} else {
-		/*we cannot use gf_mo_restart since it only sets the needs_restart for inline scenes.
-		The rational is that gf_mo_restart can be called from the parent scene (OK) or from the scene itself, in
-		which case shutting down the graph would crash the compositor. We therefore need two render passes to
-		safely restart an inline scene*/
-
-		/*1- stop main object from playing but don't disconnect channels*/
-		gf_odm_stop(scene->root_od, GF_TRUE);
-		/*2- close all ODs inside the scene and reset the graph*/
-		gf_scene_disconnect(scene, GF_FALSE);
-		if (scene->root_od->media_ctrl) scene->root_od->media_ctrl->current_seg = current_seg;
-		/*3- restart the scene*/
-		gf_odm_start(scene->root_od, 0);
-	}
-}
-
-static void gf_inline_traverse(GF_Node *n, void *rs, Bool is_destroy)
-{
-	MFURL *current_url;
-	GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
-
-	if (is_destroy) {
-		GF_MediaObject *mo;
-		if (!scene) return;
-		mo = scene->root_od ? scene->root_od->mo : NULL;
-
-		gf_scene_notify_event(scene, GF_EVENT_UNLOAD, n, NULL, GF_OK, GF_TRUE);
-		if (!mo) return;
-		gf_mo_event_target_remove_by_node(mo, n);
-
-		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
-		if (mo->num_open) {
-			mo->num_open --;
-			if (!mo->num_open) {
-				gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
-
-				/*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
-					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) {
-						gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
-						if (mo->odm) {
-							gf_odm_reset_media_control(mo->odm, 1);
-							mo->odm->mo = NULL;
-						}
-						gf_mo_del(mo);
-					}
-					scene->root_od->action_type = GF_ODM_ACTION_DELETE;
-					gf_list_add(scene->root_od->term->media_queue, scene->root_od);
-				} else {
-					scene->root_od->action_type = GF_ODM_ACTION_SCENE_DISCONNECT;
-					gf_list_add(scene->root_od->term->media_queue, scene->root_od);
-				}
-				gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
-			}
-		}
-		return;
-	}
-
-
-	//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;
-		gf_inline_set_scene(inl);
-		scene = (GF_Scene *)gf_node_get_private(n);
-		if (!scene) {
-			/*just like protos, we must invalidate parent graph until attached*/
-			if (inl->url.count) {
-				if (!inl->url.vals[0].OD_ID && (!inl->url.vals[0].url || !strlen(inl->url.vals[0].url) ) ) {
-					gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
-				} else {
-					gf_node_dirty_set(n, 0, GF_TRUE);
-				}
-			}
-			return;
-		}
-	}
-
-	/*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_term_invalidate_compositor(scene->root_od->term);
-		return;
-	}
-	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
-	gf_node_dirty_clear(n, 0);
-
-	current_url = scene->current_url;
-	scene->current_url = & ((M_Inline*)n)->url;
-	gf_sc_traverse_subscene(scene->root_od->term->compositor, n, scene->graph, rs);
-	scene->current_url = current_url;
-
-	//do we have to restart for next frame ? If so let's do it
-	gf_inline_check_restart(scene);
-
-	/*if we need to restart, shutdown graph and do it*/
-	if (scene->needs_restart) {
-		/*special case: scene change*/
-		if (scene->needs_restart==2) {
-			scene->needs_restart = 0;
-			gf_inline_on_modified(n);
-			return;
-		}
-
-		scene->needs_restart = 0;
-		gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
-		scene->root_od->action_type = GF_ODM_ACTION_SCENE_INLINE_RESTART;
-		gf_list_add(scene->root_od->term->media_queue, scene->root_od);
-		gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
-
-		gf_node_dirty_set(n, 0, GF_TRUE);
-		return;
-	}
-
-}
-
-
-static Bool gf_inline_is_hardcoded_proto(GF_Terminal *term, MFURL *url)
-{
-	u32 i;
-	for (i=0; i<url->count; i++) {
-		if (!url->vals[i].url) continue;
-		if (strstr(url->vals[i].url, "urn:inet:gpac:builtin")) return GF_TRUE;
-
-		if (gf_sc_uri_is_hardcoded_proto(term->compositor, url->vals[i].url))
-			return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-GF_SceneGraph *gf_inline_get_proto_lib(void *_is, MFURL *lib_url)
-{
-	GF_ProtoLink *pl;
-	u32 i;
-	GF_Scene *scene = (GF_Scene *) _is;
-	if (!scene || !lib_url->count) return NULL;
-
-	if (gf_inline_is_hardcoded_proto(scene->root_od->term, lib_url)) return (void *) GF_SG_INTERNAL_PROTO;
-
-	i=0;
-	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i))) {
-		/*not ready yet*/
-		if (!pl->mo || !pl->mo->odm || ! pl->mo->odm->net_service) continue;
-
-		if (gf_mo_get_od_id(pl->url) != GF_MEDIA_EXTERNAL_ID) {
-			if (gf_mo_get_od_id(pl->url) == gf_mo_get_od_id(lib_url)) {
-				if (!pl->mo->odm || !pl->mo->odm->subscene) return NULL;
-				return pl->mo->odm->subscene->graph;
-			}
-		}
-	}
-
-	/*for string URL based protos, recursively check until top if the proto lib is not already present*/
-	if (lib_url->vals[0].url) {
-		GF_Scene *check_scene = scene;
-		while (check_scene) {
-			i=0;
-			while ((pl = (GF_ProtoLink*)gf_list_enum(check_scene->extern_protos, &i))) {
-				char *url1, *url2;
-				Bool ok;
-				if (!pl->mo || !pl->mo->odm) continue;
-				if (! pl->mo->odm->net_service) continue;
-				if (gf_mo_get_od_id(pl->url) != GF_MEDIA_EXTERNAL_ID) continue;
-				/*not the same url*/
-				if (!gf_mo_is_same_url(pl->mo, lib_url, NULL, 0)) continue;
-				/*check the url path is the same*/
-				url1 = gf_url_concatenate(pl->mo->odm->net_service->url, lib_url->vals[0].url);
-				url2 = gf_url_concatenate(scene->root_od->net_service->url, lib_url->vals[0].url);
-				ok = GF_FALSE;
-				if (url1 && url2 && !strcmp(url1, url2)) ok=GF_TRUE;
-				if (url1) gf_free(url1);
-				if (url2) gf_free(url2);
-				if (!ok) continue;
-				if (!pl->mo->odm || !pl->mo->odm->subscene) return NULL;
-				return pl->mo->odm->subscene->graph;
-			}
-			check_scene = check_scene->root_od->parentscene;
-		}
-	}
-
-	/*not found, let's try to load it*/
-
-	if (!lib_url || !lib_url->count) return NULL;
-
-	/*internal, don't waste ressources*/
-	if (gf_inline_is_hardcoded_proto(scene->root_od->term, lib_url)) return NULL;
-
-	i=0;
-	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i)) ) {
-		if (pl->url == lib_url) return NULL;
-		if (pl->url->vals[0].OD_ID && (pl->url->vals[0].OD_ID == lib_url->vals[0].OD_ID)) return NULL;
-		if (pl->url->vals[0].url && lib_url->vals[0].url && !stricmp(pl->url->vals[0].url, lib_url->vals[0].url) ) return NULL;
-	}
-	pl = (GF_ProtoLink*)gf_malloc(sizeof(GF_ProtoLink));
-	pl->url = lib_url;
-	gf_list_add(scene->extern_protos, pl);
-	pl->mo = gf_scene_get_media_object(scene, lib_url, GF_MEDIA_OBJECT_SCENE, GF_FALSE);
-	/*this may already be destroyed*/
-	if (pl->mo) gf_mo_play(pl->mo, 0, -1, GF_FALSE);
-
-	/*and return NULL*/
-	return NULL;
-}
-
-Bool gf_inline_is_protolib_object(GF_Scene *scene, GF_ObjectManager *odm)
-{
-	u32 i;
-	GF_ProtoLink *pl;
-	i=0;
-	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i))) {
-		if (pl->mo->odm == odm) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-GF_EXPORT
-Bool gf_inline_is_default_viewpoint(GF_Node *node)
-{
-	const char *nname, *seg_name;
-	GF_SceneGraph *sg = gf_node_get_graph(node);
-	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
-	if (!scene) return GF_FALSE;
-
-	nname = gf_node_get_name(node);
-	if (!nname) return GF_FALSE;
-
-	/*check any viewpoint*/
-	seg_name = strrchr(scene->root_od->net_service->url, '#');
-
-	/*check the URL of the parent*/
-	if (!seg_name && scene->current_url) {
-		if (scene->current_url->count && scene->current_url->vals[0].url)
-			seg_name = strrchr(scene->current_url->vals[0].url, '#');
-	} else if (!seg_name && scene->root_od->mo && scene->root_od->mo->URLs.count && scene->root_od->mo->URLs.vals[0].url) {
-		seg_name = strrchr(scene->root_od->mo->URLs.vals[0].url, '#');
-	}
-	if (!seg_name) return GF_FALSE;
-	seg_name += 1;
-	/*look for a media segment with this name - if none found, this is a viewpoint name*/
-	if (gf_odm_find_segment(scene->root_od, (char *) seg_name) != NULL) return GF_FALSE;
-
-	return (!strcmp(nname, seg_name) ? GF_TRUE : GF_FALSE);
-}
-
-
-void gf_init_inline(GF_Scene *scene, GF_Node *node)
-{
-	gf_node_set_callback_function(node, gf_inline_traverse);
-}
-
-static GF_Config *storage_get_cfg(M_Storage *storage)
-{
-	GF_Scene *scene;
-	scene = (GF_Scene *)gf_node_get_private((GF_Node*)storage);
-	return scene->root_od->term->user->config;
-}
-
-static char *storage_get_section(M_Storage *storage)
-{
-	GF_Scene *scene;
-	char *szPath;
-	u8 hash[20];
-	char name[50];
-	u32 i;
-	size_t len;
-
-	scene = (GF_Scene *)gf_node_get_private((GF_Node*)storage);
-
-	len = strlen(scene->root_od->net_service->url)+strlen(storage->name.buffer)+2;
-	szPath = (char *)gf_malloc(sizeof(char)* len);
-	strcpy(szPath, scene->root_od->net_service->url);
-	strcat(szPath, "@");
-	strcat(szPath, storage->name.buffer);
-	gf_sha1_csum((u8*)szPath, (u32) strlen(szPath), hash);
-	gf_free(szPath);
-
-	strcpy(name, "@cache=");
-	for (i=0; i<20; i++) {
-		char t[3];
-		t[2] = 0;
-		sprintf(t, "%02X", hash[i]);
-		strcat(name, t);
-	}
-	return gf_strdup(name);
-}
-
-static void storage_parse_sf(void *ptr, u32 fieldType, char *opt)
-{
-	Float v1, v2, v3;
-	switch (fieldType) {
-	case GF_SG_VRML_SFBOOL:
-		sscanf(opt, "%d", ((SFBool *)ptr));
-		break;
-	case GF_SG_VRML_SFINT32:
-		sscanf(opt, "%d",  ((SFInt32 *)ptr) );
-		break;
-	case GF_SG_VRML_SFTIME:
-		sscanf(opt, "%lf", ((SFTime *)ptr) );
-		break;
-	case GF_SG_VRML_SFFLOAT:
-		sscanf(opt, "%g", &v1);
-		* (SFFloat *)ptr = FLT2FIX(v1);
-		break;
-	case GF_SG_VRML_SFVEC2F:
-		sscanf(opt, "%g %g", &v1, &v2);
-		((SFVec2f*)ptr)->x = FLT2FIX(v1);
-		((SFVec2f*)ptr)->y = FLT2FIX(v2);
-		break;
-	case GF_SG_VRML_SFVEC3F:
-		sscanf(opt, "%g %g %g", &v1, &v2, &v3);
-		((SFVec3f*)ptr)->x = FLT2FIX(v1);
-		((SFVec3f*)ptr)->y = FLT2FIX(v2);
-		((SFVec3f*)ptr)->z = FLT2FIX(v3);
-		break;
-	case GF_SG_VRML_SFSTRING:
-		if ( ((SFString *)ptr)->buffer) gf_free(((SFString *)ptr)->buffer);
-		((SFString *)ptr)->buffer = gf_strdup(opt);
-		break;
-	default:
-		break;
-	}
-}
-
-static void gf_storage_load(M_Storage *storage)
-{
-	const char *opt;
-	char szID[20];
-	u32 i, count;
-	u32 sec, exp, frac;
-	GF_Config *cfg = storage_get_cfg(storage);
-	char *section = storage_get_section(storage);
-	if (!cfg || !section) return;
-
-	if (!gf_cfg_get_key_count(cfg, section)) {
-		gf_free(section);
-		return;
-	}
-	opt = gf_cfg_get_key(cfg, section, "expireAfterNTP");
-	gf_net_get_ntp(&sec, &frac);
-	sscanf(opt, "%u", &exp);
-	if (exp && (exp<=sec)) {
-		gf_cfg_del_section(cfg, section);
-		gf_free(section);
-		return;
-	}
-
-	count = gf_cfg_get_key_count(cfg, section)-1;
-	if (!count || (count!=storage->storageList.count)) {
-		gf_cfg_del_section(cfg, section);
-		gf_free(section);
-		return;
-	}
-
-	for (i=0; i<count; i++) {
-		GF_FieldInfo info;
-		sprintf(szID, "%d", i);
-		opt = gf_cfg_get_key(cfg, section, szID);
-		if (!opt) break;
-		if (!storage->storageList.vals[i].node) break;
-		if (gf_node_get_field(storage->storageList.vals[i].node, storage->storageList.vals[i].fieldIndex, &info) != GF_OK) break;
-
-		if (gf_sg_vrml_is_sf_field(info.fieldType)) {
-			storage_parse_sf(info.far_ptr, info.fieldType, (char *) opt);
-		} else {
-			u32 sftype = gf_sg_vrml_get_sf_type(info.fieldType);
-			char *sep, *val;
-			void *slot;
-			gf_sg_vrml_mf_reset(info.far_ptr, info.fieldType);
-			while (1) {
-				val = (char *)strchr(opt, '\'');
-				sep = val ? strchr(val+1, '\'') : NULL;
-				if (!val || !sep) break;
-
-				sep[0] = 0;
-				gf_sg_vrml_mf_append(info.far_ptr, info.fieldType, &slot);
-				storage_parse_sf(slot, sftype, val+1);
-				sep[0] = '\'';
-				opt = sep+1;
-			}
-		}
-		gf_node_changed(storage->storageList.vals[i].node, &info);
-	}
-	gf_free(section);
-}
-
-char *storage_serialize_sf(void *ptr, u32 fieldType)
-{
-	char szVal[50];
-	switch (fieldType) {
-	case GF_SG_VRML_SFBOOL:
-		sprintf(szVal, "%d", *((SFBool *)ptr) ? 1 : 0);
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFINT32:
-		sprintf(szVal, "%d",  *((SFInt32 *)ptr) );
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFTIME:
-		sprintf(szVal, "%g", *((SFTime *)ptr) );
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFFLOAT:
-		sprintf(szVal, "%g", FIX2FLT( *((SFFloat *)ptr) ) );
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFVEC2F:
-		sprintf(szVal, "%g %g", FIX2FLT( ((SFVec2f *)ptr)->x), FIX2FLT( ((SFVec2f *)ptr)->y) );
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFVEC3F:
-		sprintf(szVal, "%g %g %g", FIX2FLT( ((SFVec3f *)ptr)->x), FIX2FLT( ((SFVec3f *)ptr)->y) , FIX2FLT( ((SFVec3f *)ptr)->z) );
-		return gf_strdup(szVal);
-	case GF_SG_VRML_SFSTRING:
-		return gf_strdup( ((SFString *)ptr)->buffer ? ((SFString *)ptr)->buffer : "");
-
-	default:
-		break;
-	}
-	return NULL;
-}
-
-void gf_storage_save(M_Storage *storage)
-{
-	char szID[20];
-	u32 i, j;
-	GF_Config *cfg = storage_get_cfg(storage);
-	char *section = storage_get_section(storage);
-	if (!cfg || !section) return;
-
-	gf_cfg_del_section(cfg, section);
-
-	if (storage->expireAfter) {
-		u32 sec, frac;
-		char szNTP[100];
-		gf_net_get_ntp(&sec, &frac);
-		sec += storage->expireAfter;
-		sprintf(szNTP, "%u", sec);
-		gf_cfg_set_key(cfg, section, "expireAfterNTP", szNTP);
-	} else {
-		gf_cfg_set_key(cfg, section, "expireAfterNTP", "0");
-	}
-
-	for (i=0; i<storage->storageList.count; i++) {
-		char *val;
-		GF_FieldInfo info;
-		sprintf(szID, "%d", i);
-
-		if (!storage->storageList.vals[i].node) break;
-		if (gf_node_get_field(storage->storageList.vals[i].node, storage->storageList.vals[i].fieldIndex, &info) != GF_OK) break;
-
-		if (gf_sg_vrml_is_sf_field(info.fieldType)) {
-			val = storage_serialize_sf(info.far_ptr, info.fieldType);
-		} else {
-			//u32 sftype = gf_sg_vrml_get_sf_type(info.fieldType);
-			char *slotval;
-			void *slot;
-			val = NULL;
-			for (j=0; j<((GenMFField *)info.far_ptr)->count; j++) {
-				if (gf_sg_vrml_mf_get_item(info.far_ptr, info.fieldType, &slot, j) != GF_OK) break;
-				slotval = storage_serialize_sf(info.far_ptr, info.fieldType);
-				if (!slotval) break;
-				if (val) {
-					val = (char *)gf_realloc(val, strlen(val) + 3 + strlen((const char *)slot));
-				} else {
-					val = (char *)gf_malloc(3 + strlen((const char *)slot));
-					val[0] = 0;
-				}
-				strcat(val, "'");
-				strcat(val, slotval);
-				strcat(val, "'");
-				gf_free(slot);
-			}
-		}
-		if (val) {
-			gf_cfg_set_key(cfg, section, szID, val);
-			gf_free(val);
-		}
-	}
-	gf_free(section);
-}
-
-
-static void gf_storage_traverse(GF_Node *n, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
-		GF_ClientService *net_service = scene->root_od->net_service;
-		while (scene->root_od->parentscene) {
-			if (scene->root_od->parentscene->root_od->net_service != net_service)
-				break;
-			scene = scene->root_od->parentscene;
-		}
-		gf_list_del_item(scene->storages, n);
-	}
-}
-
-static void on_force_restore(GF_Node *n, struct _route *_route)
-{
-	gf_storage_load((M_Storage *)n);
-}
-static void on_force_save(GF_Node *n, struct _route *_route)
-{
-	gf_storage_save((M_Storage *)n);
-}
-
-void gf_scene_init_storage(GF_Scene *scene, GF_Node *node)
-{
-	GF_ClientService *net_service;
-	M_Storage *storage = (M_Storage *) node;
-
-	if (!storage->name.buffer || !strlen(storage->name.buffer) ) return;
-	if (!storage->storageList.count) return;
-
-	storage->on_forceSave = on_force_save;
-	storage->on_forceRestore = on_force_restore;
-	gf_node_set_callback_function(node, gf_storage_traverse);
-	gf_node_set_private(node, scene);
-
-	net_service = scene->root_od->net_service;
-	while (scene->root_od->parentscene) {
-		if (scene->root_od->parentscene->root_od->net_service != net_service)
-			break;
-		scene = scene->root_od->parentscene;
-	}
-	gf_list_add(scene->storages, node);
-	if (storage->_auto) gf_storage_load(storage);
-}
-
-#endif
-
-GF_Node *gf_scene_get_keynav(GF_SceneGraph *sg, GF_Node *sensor)
-{
-#ifndef GPAC_DISABLE_VRML
-	u32 i, count;
-	GF_Scene *scene = (GF_Scene *)gf_sg_get_private(sg);
-	if (!scene) return NULL;
-	if (!sensor) return (GF_Node *)gf_list_get(scene->keynavigators, 0);
-
-	count = gf_list_count(scene->keynavigators);
-	for (i=0; i<count; i++) {
-		M_KeyNavigator *kn = (M_KeyNavigator *)gf_list_get(scene->keynavigators, i);
-		if (kn->sensor==sensor) return (GF_Node *) kn;
-	}
-#endif
-	return NULL;
-}
-
-

gpac-0.8.0.tar.gz/src/terminal/network_service.c Deleted

@@ -1,1519 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/network.h>
-#include <gpac/cache.h>
-#include "media_memory.h"
-#include "media_control.h"
-
-
-
-#define GET_TERM()	GF_Terminal *term = (GF_Terminal *) user_priv; if (!term) return;
-
-static GFINLINE GF_Channel *gf_term_get_channel(GF_ClientService *service, LPNETCHANNEL ns)
-{
-	GF_Channel *ch = (GF_Channel *)ns;
-	if (!service || !ch) return NULL;
-	if (ch->service != service) return NULL;
-	return ch;
-}
-
-static void term_on_connect(GF_ClientService *service, LPNETCHANNEL netch, GF_Err err)
-{
-	GF_Channel *ch;
-	GF_ObjectManager *root;
-	GF_Terminal *term = service->term;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] %s connection ACK received from %s - %s\n", netch ? "Channel" : "Service", service->url, gf_error_to_string(err) ));
-
-	root = service->owner;
-	if (root && (root->net_service != service)) {
-		gf_term_message(term, service->url, "Incompatible module type", GF_SERVICE_ERROR);
-		return;
-	}
-	/*this is service connection*/
-	if (!netch) {
-		gf_term_service_media_event(service->owner, GF_EVENT_MEDIA_SETUP_DONE);
-		if (err) {
-			char msg[5000];
-			snprintf(msg, sizeof(msg), "Cannot open %s", service->url);
-			gf_term_message(term, service->url, msg, err);
-
-			gf_term_service_media_event(service->owner, GF_EVENT_ERROR);
-
-			/*destroy service only if attached*/
-			if (root) {
-				gf_term_lock_media_queue(term, 1);
-				//notify before disconnecting
-				if (root->subscene) gf_scene_notify_event(root->subscene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, err, GF_FALSE);
-
-				service->ifce->CloseService(service->ifce);
-				root->net_service = NULL;
-				if (service->owner && service->nb_odm_users) service->nb_odm_users--;
-				service->owner = NULL;
-				/*depends on module: some module could forget to call gf_service_disconnect_ack */
-				if ( gf_list_del_item(term->net_services, service) >= 0) {
-					/*and queue for destroy*/
-					gf_list_add(term->net_services_to_remove, service);
-				}
-
-				gf_term_lock_media_queue(term, 0);
-
-				if (!root->parentscene) {
-					GF_Event evt;
-					evt.type = GF_EVENT_CONNECT;
-					evt.connect.is_connected = 0;
-					gf_term_send_event(term, &evt);
-				} else {
-					/*try to reinsert OD for VRML/X3D with multiple URLs:
-					1- first remove from parent scene without destroying object, this will trigger a re-setup
-					if other URLs are present
-					2- then destroy object*/
-					gf_scene_remove_object(root->parentscene, root, 0);
-					gf_odm_disconnect(root, 1);
-				}
-				return;
-			}
-		}
-
-		if (!root) {
-			/*channel service connect*/
-			u32 i;
-			GF_ChannelSetup *cs;
-			GF_List *ODs;
-
-			if (!gf_list_count(term->channels_pending)) {
-				return;
-			}
-			ODs = gf_list_new();
-			gf_term_lock_net(term, 1);
-			i=0;
-			while ((cs = (GF_ChannelSetup*)gf_list_enum(term->channels_pending, &i))) {
-				if (cs->ch->service != service) continue;
-				gf_list_rem(term->channels_pending, i-1);
-				i--;
-				/*even if error do setup (channel needs to be deleted)*/
-				if (gf_odm_post_es_setup(cs->ch, cs->dec, err) == GF_OK) {
-					if (cs->ch->odm && (gf_list_find(ODs, cs->ch->odm)==-1) ) gf_list_add(ODs, cs->ch->odm);
-				}
-				gf_free(cs);
-			}
-			gf_term_lock_net(term, 0);
-			/*finally setup all ODs concerned (we do this later in case of scalability)*/
-			while (gf_list_count(ODs)) {
-				GF_ObjectManager *odm = (GF_ObjectManager*)gf_list_get(ODs, 0);
-				gf_list_rem(ODs, 0);
-				/*force re-setup*/
-				gf_scene_setup_object(odm->parentscene, odm);
-			}
-			gf_list_del(ODs);
-		} else {
-			/*setup od*/
-			gf_odm_setup_entry_point(root, service->url);
-		}
-		/*load cache if requested*/
-		if (!err && term->enable_cache) {
-			err = gf_term_service_cache_load(service);
-			/*not a fatal error*/
-			if (err) gf_term_message(term, "GPAC Cache", "Cannot load cache", err);
-		}
-		return;
-	}
-
-	/*this is channel connection*/
-	ch = gf_term_get_channel(service, netch);
-	if (!ch) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Channel connection ACK error: channel not found\n"));
-		return;
-	}
-
-	/*confirm channel connection even if error - this allow playback of objects even if not all streams are setup*/
-	gf_term_lock_net(term, 1);
-	gf_es_on_connect(ch);
-	gf_term_lock_net(term, 0);
-
-	if (err && ((err!=GF_STREAM_NOT_FOUND) || (ch->esd->decoderConfig->streamType!=GF_STREAM_INTERACT))) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Channel %d connection error: %s\n", ch->esd->ESID, gf_error_to_string(err) ));
-		ch->es_state = GF_ESM_ES_UNAVAILABLE;
-		/*		return;*/
-	}
-
-	if (ch->odm->mo) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Channel %d connected - %d objects opened\n", ch->esd->ESID, ch->odm->mo->num_open ));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Channel %d connected - not attached to the scene\n", ch->esd->ESID));
-	}
-	/*Plays request are skiped until all channels are connected. We send a PLAY on the objecy in case
-		1-OD user has requested a play
-		2-this is a channel of the root OD
-	*/
-	if ( (ch->odm->mo && ch->odm->mo->num_open)
-	        || !ch->odm->parentscene
-	   ) {
-		gf_odm_start(ch->odm, 0);
-	}
-#if 0
-	else if (ch->odm->codec && ch->odm->codec->ck && ch->odm->codec->ck->no_time_ctrl) {
-		gf_odm_play(ch->odm);
-	}
-#endif
-}
-
-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;
-				s32 idx = gf_list_del_item(scene->resources, service->owner);
-				/*destroy all media*/
-				gf_scene_disconnect(scene, 1);
-				if (idx>=0)
-					gf_list_add(scene->resources, service->owner);
-			}
-			return;
-		}
-		gf_term_lock_media_queue(term, 1);
-		/*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);
-		}
-		gf_term_lock_media_queue(term, 0);
-		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;
-}
-
-static void term_on_data_packet(GF_ClientService *service, LPNETCHANNEL netch, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
-{
-	GF_Channel *ch;
-
-	ch = gf_term_get_channel(service, netch);
-	if (!ch)
-		return;
-
-	if (reception_status==GF_EOS) {
-		gf_es_on_eos(ch);
-		return;
-	}
-	/*otherwise dispatch with error code*/
-	gf_es_receive_sl_packet(service, ch, data, data_size, hdr, reception_status);
-}
-
-static Bool is_same_od(GF_ObjectDescriptor *od1, GF_ObjectDescriptor *od2)
-{
-	GF_ESD *esd1, *esd2;
-	if (gf_list_count(od1->ESDescriptors) != gf_list_count(od2->ESDescriptors)) return 0;
-	esd1 = gf_list_get(od1->ESDescriptors, 0);
-	if (!esd1) return 0;
-	esd2 = gf_list_get(od2->ESDescriptors, 0);
-	if (!esd2) return 0;
-	if (esd1->ESID!=esd2->ESID) return 0;
-	if (esd1->decoderConfig->streamType != esd2->decoderConfig->streamType) return 0;
-	if (esd1->decoderConfig->objectTypeIndication != esd2->decoderConfig->objectTypeIndication ) return 0;
-	return 1;
-}
-
-
-static void term_on_media_add(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
-{
-	u32 i, min_od_id;
-	GF_MediaObject *the_mo;
-	GF_Scene *scene;
-	GF_ObjectManager *odm, *root;
-	GF_ObjectDescriptor *od;
-	GF_Terminal *term = service->term;
-
-	root = service->owner;
-	if (!root) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Service %s] has not root, aborting !\n", service->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", service->url));
-		return;
-	}
-	scene = root->subscene ? root->subscene : root->parentscene;
-	if (scene->root_od->addon && (scene->root_od->addon->addon_type == GF_ADDON_TYPE_MAIN)) {
-		no_scene_check = 1;
-		scene->root_od->flags |= GF_ODM_REGENERATE_SCENE;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Service %s] %s\n", service->url, media_desc ? "Adding new media object" : "Regenerating scene graph"));
-	if (!media_desc) {
-		return;
-	}
-
-	switch (media_desc->tag) {
-	case GF_ODF_OD_TAG:
-	case GF_ODF_IOD_TAG:
-		if (root && (root->net_service == service)) {
-			od = (GF_ObjectDescriptor *) media_desc;
-			break;
-		}
-	default:
-		gf_odf_desc_del(media_desc);
-		return;
-	}
-
-	gf_term_lock_net(term, 1);
-	/*object declared this way are not part of an OD stream and are considered as dynamic*/
-	/*	od->objectDescriptorID = GF_MEDIA_EXTERNAL_ID; */
-
-	/*check if we have a mediaObject in the scene not attached and matching this object*/
-	the_mo = NULL;
-	odm = NULL;
-	min_od_id = 0;
-	for (i=0; i<gf_list_count(scene->scene_objects); i++) {
-		char *frag, *ext;
-		GF_ESD *esd;
-		char *url;
-		u32 match_esid = 0;
-		GF_MediaObject *mo = gf_list_get(scene->scene_objects, i);
-
-		if ((mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (min_od_id<mo->OD_ID))
-			min_od_id = mo->OD_ID;
-
-		if (!mo->odm) continue;
-		/*if object is attached to a service, don't bother looking in a different one*/
-		if (mo->odm->net_service && (mo->odm->net_service != service)) continue;
-
-		/*already assigned object - this may happen since the compositor has no control on when objects are declared by the service,
-		therefore opening file#video and file#audio may result in the objects being declared twice if the service doesn't
-		keep track of declared objects*/
-		if (mo->odm->OD) {
-			if (od->objectDescriptorID && is_same_od(mo->odm->OD, od)) {
-				/*reassign OD ID*/
-				if (mo->OD_ID != GF_MEDIA_EXTERNAL_ID) {
-					od->objectDescriptorID = mo->OD_ID;
-				} else {
-					mo->OD_ID = od->objectDescriptorID;
-				}
-				gf_odf_desc_del(media_desc);
-				gf_term_lock_net(term, 0);
-				return;
-			}
-			continue;
-		}
-		if (mo->OD_ID != GF_MEDIA_EXTERNAL_ID) {
-			if (mo->OD_ID == od->objectDescriptorID) {
-				the_mo = mo;
-				odm = mo->odm;
-				break;
-			}
-			continue;
-		}
-		if (!mo->URLs.count || !mo->URLs.vals[0].url) continue;
-
-		frag = NULL;
-		ext = strrchr(mo->URLs.vals[0].url, '#');
-		if (ext) {
-			frag = strchr(ext, '=');
-			ext[0] = 0;
-		}
-		url = mo->URLs.vals[0].url;
-		if (!strnicmp(url, "file://localhost", 16)) url += 16;
-		else if (!strnicmp(url, "file://", 7)) url += 7;
-		else if (!strnicmp(url, "gpac://", 7)) url += 7;
-		else if (!strnicmp(url, "pid://", 6)) match_esid = atoi(url+6);
-
-		if (!match_esid && !strstr(service->url, url)) {
-			if (ext) ext[0] = '#';
-			continue;
-		}
-		if (ext) ext[0] = '#';
-
-		esd = gf_list_get(od->ESDescriptors, 0);
-		if (match_esid && (esd->ESID != match_esid))
-			continue;
-		/*match type*/
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_VISUAL:
-			if (mo->type != GF_MEDIA_OBJECT_VIDEO) continue;
-			break;
-		case GF_STREAM_AUDIO:
-			if (mo->type != GF_MEDIA_OBJECT_AUDIO) continue;
-			break;
-		case GF_STREAM_PRIVATE_MEDIA:
-			if ((mo->type != GF_MEDIA_OBJECT_AUDIO) && (mo->type != GF_MEDIA_OBJECT_VIDEO)) continue;
-			break;
-		case GF_STREAM_SCENE:
-			if (mo->type != GF_MEDIA_OBJECT_UPDATES) continue;
-			break;
-		default:
-			continue;
-		}
-		if (frag) {
-			u32 frag_id = 0;
-			u32 ID = od->objectDescriptorID;
-			if (ID==GF_MEDIA_EXTERNAL_ID) ID = esd->ESID;
-			frag++;
-			frag_id = atoi(frag);
-			if (ID!=frag_id) continue;
-		}
-		the_mo = mo;
-		odm = mo->odm;
-		break;
-	}
-
-	/*add a pass on scene->resource to check for min_od_id,
-	otherwise we may have another modules declaring an object with ID 0 from
-	another thread, which will assert (only one object with a givne OD ID)*/
-	for (i=0; i<gf_list_count(scene->resources); i++) {
-		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
-
-		if (an_odm->OD && (an_odm->OD->objectDescriptorID != GF_MEDIA_EXTERNAL_ID) && (min_od_id < an_odm->OD->objectDescriptorID))
-			min_od_id = an_odm->OD->objectDescriptorID;
-	}
-
-	if (!odm) {
-		odm = gf_odm_new();
-		odm->term = term;
-		odm->parentscene = scene;
-		gf_mx_p(scene->mx_resources);
-		gf_list_add(scene->resources, odm);
-		gf_mx_v(scene->mx_resources);
-	}
-	odm->flags |= GF_ODM_NOT_SETUP;
-	odm->OD = od;
-	odm->mo = the_mo;
-	odm->flags |= GF_ODM_NOT_IN_OD_STREAM;
-	if (!od->objectDescriptorID) {
-		od->objectDescriptorID = min_od_id + 1;
-	}
-
-	if (the_mo) the_mo->OD_ID = od->objectDescriptorID;
-	if (!scene->selected_service_id)
-		scene->selected_service_id = od->ServiceID;
-
-
-	/*net is unlocked before seting up the object as this might trigger events going into JS and deadlocks
-	with the compositor*/
-	gf_term_lock_net(term, 0);
-
-	//we post a task to make sure the AttachStream of the decoder is always called from the main thread when no compositor thread (needed for GL nvidia setup)
-	gf_term_lock_media_queue(term, GF_TRUE);
-
-	if (!odm->net_service) {
-		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->OD->objectDescriptorID));
-			return;
-		}
-		odm->net_service = service;
-		assert(odm->OD);
-		if (!odm->OD->URLString)
-			odm->net_service->nb_odm_users++;
-	}
-
-	/*OD inserted by service: resetup scene*/
-	odm->action_type = GF_ODM_ACTION_SETUP;
-	gf_list_add(term->media_queue, odm);
-	gf_term_lock_media_queue(term, GF_FALSE);
-}
-
-void gf_odm_setup_task(GF_ObjectManager *odm)
-{
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] setup object - MO %08x\n", odm->OD->objectDescriptorID, odm->mo));
-	gf_odm_setup_object(odm, odm->net_service);
-
-	gf_scene_regenerate(odm->parentscene);
-}
-
-
-static void gather_buffer_level(GF_ObjectManager *odm, GF_ClientService *service, GF_NetworkCommand *com, u32 *max_buffer_time)
-{
-	u32 j, count = gf_list_count(odm->channels);
-	for (j=0; j<count; j++) {
-		GF_Channel *ch = (GF_Channel *)gf_list_get(odm->channels, j);
-		if (ch->service != service) continue;
-		if (ch->es_state != GF_ESM_ES_RUNNING) continue;
-		if (com->base.on_channel && (com->base.on_channel != ch)) continue;
-		if (ch->dispatch_after_db || ch->bypass_sl_and_db/* || ch->IsEndOfStream*/) continue;
-
-		//if not in hybrid mode, perform buffer management only on base layer  -this is because we don't signal which ESs are on/off in the underlying service ...
-		if (ch->esd->dependsOnESID) {
-			if (!ch->odm->lower_layer_odm) continue;
-			if (ch->odm->net_service == ch->odm->lower_layer_odm->net_service) continue;
-		}
-
-		gf_es_update_buffering(ch, 0);
-
-		if (ch->MaxBuffer>com->buffer.max) com->buffer.max = ch->MaxBuffer;
-		if (ch->MinBuffer<com->buffer.min) com->buffer.min = ch->MinBuffer;
-		if (ch->MaxBufferOccupancy > com->buffer.max) com->buffer.max = ch->MaxBufferOccupancy;
-
-		if (ch->IsClockInit) {
-			s32 buf_time = (s32) (ch->BufferTime / FIX2FLT(ch->clock->speed) );
-			if (!buf_time && ch->BufferTime) buf_time = ch->BufferTime;
-
-			if (buf_time > (s32) *max_buffer_time)
-				*max_buffer_time = buf_time ;
-
-			/*if we don't have more units (compressed or not) than requested max for the composition memory, request more data*/
-			if (ch->odm->codec && ch->odm->codec->CB && (odm->codec->CB->UnitCount + ch->AU_Count <= odm->codec->CB->Capacity)) {
-				com->buffer.occupancy = 0;
-			} else if ( (u32) buf_time < com->buffer.occupancy ) {
-				com->buffer.occupancy = buf_time;
-			}
-		}
-		if (ch->BufferOn) {
-			com->buffer.buffering = GF_TRUE;
-		}
-	}
-}
-
-static void term_on_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
-{
-	GF_Channel *ch;
-	GF_Terminal *term = service->term;
-
-	if (com->command_type==GF_NET_BUFFER_QUERY) {
-		GF_Scene *scene;
-
-		u32 i, max_buffer_time;
-		GF_ObjectManager *odm;
-		com->buffer.max = 0;
-		com->buffer.min = com->buffer.occupancy = (u32) -1;
-		com->buffer.buffering = GF_FALSE;
-		if (!service->owner) {
-			com->buffer.occupancy = 0;
-			return;
-		}
-
-		/*browse all channels in the scene, running on this service, and get buffer info*/
-		scene = NULL;
-		if (service->owner->subscene) {
-			scene = service->owner->subscene;
-		} else if (service->owner->parentscene) {
-			scene = service->owner->parentscene;
-		}
-		if (!scene) {
-			com->buffer.occupancy = 0;
-			return;
-		}
-		/*get exclusive access to scene resources , to make sure ODs are not being inserted/remove*/
-		gf_mx_p(scene->mx_resources);
-
-		max_buffer_time=0;
-		if (!gf_list_count(scene->resources)) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] No object manager found for the scene (URL: %s), buffer occupancy will remain unchanged\n", service->url));
-		} else {
-			i=0;
-			while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-				gather_buffer_level(odm, service, com, &max_buffer_time);
-			}
-		}
-		gf_mx_v(scene->mx_resources);
-		if (com->buffer.occupancy==(u32) -1) com->buffer.occupancy = 0;
-
-		//in bench mode set occupancy to 0 only if we have less data than max buffer, otherwise wait
-		if (term->bench_mode) {
-			com->buffer.occupancy = (max_buffer_time < com->buffer.max) ? 0 : 2;
-			com->buffer.max = 1;
-			com->buffer.min = 0;
-		} else if (com->buffer.occupancy && max_buffer_time>com->buffer.occupancy) {
-			com->buffer.occupancy = max_buffer_time;
-		}
-		return;
-	}
-	if (com->command_type==GF_NET_SERVICE_INFO) {
-		GF_Event evt;
-		evt.type = GF_EVENT_METADATA;
-		gf_term_send_event(term, &evt);
-		return;
-	}
-	if (com->command_type==GF_NET_SERVICE_MEDIA_CAP_QUERY) {
-		gf_sc_get_av_caps(term->compositor, &com->mcaps.width, &com->mcaps.height, &com->mcaps.display_bit_depth, &com->mcaps.audio_bpp, &com->mcaps.channels, &com->mcaps.sample_rate);
-		return;
-	}
-	if (com->command_type==GF_NET_SERVICE_EVENT) {
-		/*check for UDP timeout*/
-		if (com->send_event.evt.message.error == GF_IP_UDP_TIMEOUT) {
-			const char *sOpt = gf_cfg_get_key(term->user->config, "Network", "AutoReconfigUDP");
-			if (sOpt && !stricmp(sOpt, "yes")) {
-				char szMsg[1024];
-				sprintf(szMsg, "!! UDP down (%s) - Retrying with TCP !!\n", com->send_event.evt.message.message);
-				gf_term_message(term, service->url, szMsg, GF_IP_NETWORK_FAILURE);
-
-				/*reload scene - FIXME this shall work on inline nodes, not on the root !*/
-				if (term->reload_url) gf_free(term->reload_url);
-				term->reload_state = 1;
-				term->reload_url = gf_strdup(term->root_scene->root_od->net_service->url);
-				gf_cfg_set_key(term->user->config, "Network", "UDPNotAvailable", "yes");
-				return;
-			}
-		}
-
-		com->send_event.res = 0;
-		gf_term_send_event(term, &com->send_event.evt);
-		return;
-	}
-
-	if (com->command_type==GF_NET_ASSOCIATED_CONTENT_LOCATION) {
-		GF_Scene *scene = NULL;
-		if (service->owner->subscene) {
-			scene = service->owner->subscene;
-		} else if (service->owner->parentscene) {
-			scene = service->owner->parentscene;
-		}
-		if (scene)
-			gf_scene_register_associated_media(scene, &com->addon_info);
-		return;
-	}
-	if (com->command_type==GF_NET_ASSOCIATED_CONTENT_TIMING) {
-		GF_Scene *scene = NULL;
-		if (service->owner->subscene) {
-			scene = service->owner->subscene;
-		} else if (service->owner->parentscene) {
-			scene = service->owner->parentscene;
-		}
-		if (scene)
-			gf_scene_notify_associated_media_timeline(scene, &com->addon_time);
-		return;
-	}
-	if (com->command_type==GF_NET_SERVICE_SEEK) {
-		GF_Scene *scene = NULL;
-		if (service->owner->subscene) {
-			scene = service->owner->subscene;
-		} else if (service->owner->parentscene) {
-			scene = service->owner->parentscene;
-		}
-		if (scene && scene->is_dynamic_scene) {
-			gf_sc_lock(term->compositor, 1);
-			gf_scene_restart_dynamic(scene, (u64) (com->play.start_range*1000), 0, 0);
-			gf_sc_lock(term->compositor, 0);
-		}
-		return;
-	}
-
-	if (com->command_type == GF_NET_SERVICE_CODEC_STAT_QUERY) {
-		GF_List *od_list;
-		u32 i;
-		GF_ObjectManager *odm;
-
-		com->codec_stat.avg_dec_time = 0;
-		com->codec_stat.max_dec_time = 0;
-		com->codec_stat.irap_avg_dec_time = 0;
-		com->codec_stat.irap_max_dec_time = 0;
-
-		if (!service->owner) return;
-		/*browse all channels in the scene, running on this service, and get codec stat*/
-		od_list = NULL;
-		if (service->owner->subscene) {
-			od_list = service->owner->subscene->resources;
-		} else if (service->owner->parentscene) {
-			od_list = service->owner->parentscene->resources;
-		}
-		if (!od_list) return;
-
-		/*get exclusive access to media scheduler, to make sure ODs are not being manipulated*/
-		i=0;
-		while ((odm = (GF_ObjectManager*)gf_list_enum(od_list, &i))) {
-			u32 avg_dec_time;
-			/*the decoder statistics are reliable only if we decoded at least 1s*/
-			if (!odm->codec || !odm->codec->nb_dec_frames ||
-			        (odm->codec->ck->speed > 0 ? odm->codec->stat_start + 1000 > odm->codec->last_unit_dts : odm->codec->stat_start - 1000 < odm->codec->last_unit_dts))
-				continue;
-			avg_dec_time = (u32) (odm->codec->total_dec_time / odm->codec->nb_dec_frames);
-			if (avg_dec_time > com->codec_stat.avg_dec_time) {
-				com->codec_stat.avg_dec_time = avg_dec_time;
-				com->codec_stat.max_dec_time = odm->codec->max_dec_time;
-				com->codec_stat.irap_avg_dec_time = odm->codec->nb_iframes ? (u32) (odm->codec->total_iframes_time / odm->codec->nb_iframes) : 0;
-				com->codec_stat.irap_max_dec_time = odm->codec->max_iframes_time;
-			}
-			if (odm->codec->codec_reset) {
-				com->codec_stat.codec_reset = GF_TRUE;
-				odm->codec->codec_reset = GF_FALSE;
-			}
-			com->codec_stat.decode_only_rap = odm->codec->decode_only_rap ? GF_TRUE : GF_FALSE;
-		}
-
-		return;
-	}
-
-	if (!com->base.on_channel) return;
-
-	ch = gf_term_get_channel(service, com->base.on_channel);
-	if (!ch) return;
-
-	switch (com->command_type) {
-	/*SL reconfiguration*/
-	case GF_NET_CHAN_RECONFIG:
-		gf_term_lock_net(term, 1);
-		gf_es_reconfig_sl(ch, &com->cfg.sl_config, com->cfg.use_m2ts_sections);
-		gf_term_lock_net(term, 0);
-		return;
-	case GF_NET_CHAN_SET_MEDIA_TIME:
-		if (gf_es_owns_clock(ch) || !ch->clock->has_media_time_shift) {
-			Double mtime = com->map_time.media_time;
-			if (ch->clock->clock_init) {
-				Double t = (Double) com->map_time.timestamp;
-				t /= ch->esd->slConfig->timestampResolution;
-				t -= ((Double) ch->clock->init_time) /1000;
-				mtime += t;
-			}
-			ch->clock->media_time_at_init = (u32) (1000*mtime);
-			ch->clock->has_media_time_shift = 1;
-		}
-		return;
-	/*time mapping (TS to media-time)*/
-	case GF_NET_CHAN_MAP_TIME:
-
-		if (ch->esd->dependsOnESID) {
-			//ignore everything
-		} else {
-			u32 i;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: before mapping: seed TS "LLU" - TS offset %u\n", ch->esd->ESID, ch->seed_ts, ch->ts_offset));
-			ch->seed_ts = com->map_time.timestamp;
-			ch->ts_offset = (u32) (com->map_time.media_time*1000);
-			GF_LOG(GF_LOG_INFO, GF_LOG_SYNC, ("[SyncLayer] ES%d: mapping TS "LLD" to media time %f - current time %d\n", ch->esd->ESID, com->map_time.timestamp, com->map_time.media_time, gf_clock_time(ch->clock)));
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: after mapping: seed TS "LLU" - TS offset %u\n", ch->esd->ESID, ch->seed_ts, ch->ts_offset));
-
-			if (com->map_time.reset_buffers) {
-				gf_es_reset_buffers(ch);
-			}
-			/*if we were reassembling an AU, do not perform clock init check when dispatching it since we computed its timestamps
-			according to the previous clock origin*/
-			else {
-				gf_mx_p(ch->mx);
-				ch->skip_time_check_for_pending = 1;
-				gf_mx_v(ch->mx);
-			}
-			/*if the channel is the clock, force a re-init*/
-			if (gf_es_owns_clock(ch)) {
-				ch->IsClockInit = 0;
-				gf_clock_reset(ch->clock);
-			}
-			else if (ch->odm->flags & GF_ODM_INHERIT_TIMELINE) {
-				ch->IsClockInit = 0;
-//				ch->ts_offset -= ch->seed_ts*1000/ch->ts_res;
-			}
-
-			for (i=0; i<gf_list_count(ch->odm->channels); i++) {
-				GF_Channel *a_ch = gf_list_get(ch->odm->channels, i);
-				if (ch==a_ch) continue;
-				if (! a_ch->esd->dependsOnESID) continue;
-				a_ch->seed_ts = ch->seed_ts;
-				a_ch->IsClockInit = 0;
-				a_ch->ts_offset = ch->ts_offset;
-			}
-		}
-		break;
-	/*duration changed*/
-	case GF_NET_CHAN_DURATION:
-		gf_odm_set_duration(ch->odm, ch, (u32) (1000*com->duration.duration));
-		break;
-	case GF_NET_CHAN_BUFFER_QUERY:
-		if (ch->IsEndOfStream) {
-			com->buffer.max = com->buffer.min = com->buffer.occupancy = 0;
-		} else {
-			com->buffer.max = ch->MaxBuffer;
-			com->buffer.min = ch->MinBuffer;
-			com->buffer.occupancy = (u32) (ch->BufferTime / FIX2FLT(ch->clock->speed) );
-		}
-		break;
-	case GF_NET_CHAN_DRM_CFG:
-		gf_term_lock_net(term, 1);
-		gf_es_config_drm(ch, &com->drm_cfg);
-		gf_term_lock_net(term, 0);
-		return;
-	case GF_NET_CHAN_GET_ESD:
-		gf_term_lock_net(term, 1);
-		com->cache_esd.esd = ch->esd;
-		com->cache_esd.is_iod_stream = (ch->odm->subscene /*&& (ch->odm->subscene->root_od==ch->odm)*/) ? 1 : 0;
-		gf_term_lock_net(term, 0);
-		return;
-	case GF_NET_CHAN_RESET:
-		gf_es_reset_buffers(ch);
-		break;
-	case GF_NET_CHAN_PAUSE:
-		ch->MaxBuffer = com->buffer.max;
-		ch->MinBuffer = com->buffer.min;
-		ch->BufferTime = com->buffer.max;
-		gf_es_buffer_on(ch);
-		break;
-	case GF_NET_CHAN_RESUME:
-		ch->BufferTime = ch->MaxBuffer;
-		gf_es_update_buffering(ch, 1);
-		gf_es_buffer_off(ch);
-		break;
-	case GF_NET_CHAN_BUFFER:
-		ch->MaxBuffer = com->buffer.max;
-		ch->MinBuffer = com->buffer.min;
-		ch->BufferTime = com->buffer.occupancy;
-		gf_es_update_buffering(ch, 1);
-		break;
-	default:
-		return;
-	}
-}
-
-
-Bool net_check_interface(GF_InputService *ifce)
-{
-	if (!ifce->CanHandleURL) return 0;
-	if (!ifce->ConnectService) return 0;
-	if (!ifce->CloseService) return 0;
-	if (!ifce->ConnectChannel) return 0;
-	if (!ifce->DisconnectChannel) return 0;
-	if (!ifce->GetServiceDescriptor) return 0;
-	if (!ifce->ServiceCommand) return 0;
-	return 1;
-}
-
-
-static char *get_mime_type(GF_Terminal *term, const char *url, GF_Err *ret_code, GF_DownloadSession **the_session)
-{
-	char * ret = NULL;
-	GF_DownloadSession * sess;
-	(*ret_code) = GF_OK;
-	if (strnicmp(url, "http", 4)) return NULL;
-
-	/*don't use any NetIO and don't issue a HEAD command, always go for GET, use cache and store the session*/
-	sess = gf_dm_sess_new(term->downloader, (char *) url, GF_NETIO_SESSION_NOT_THREADED , NULL, NULL, ret_code);
-	if (!sess) {
-		if (strstr(url, "rtsp://") || strstr(url, "rtp://") || strstr(url, "udp://") || strstr(url, "tcp://") ) (*ret_code) = GF_OK;
-		return NULL;
-	} else {
-		/*start processing the resource, and stop if error or as soon as we get data*/
-		while (1) {
-			*ret_code = gf_dm_sess_process_headers(sess);
-			if (*ret_code) break;
-			if (gf_dm_sess_get_status(sess)>=GF_NETIO_DATA_EXCHANGE) {
-				const char * mime = gf_dm_sess_mime_type(sess);
-				/* The mime type is returned lower case */
-				if (mime) {
-					ret = gf_strdup(mime);
-				}
-				break;
-			}
-		}
-	}
-
-	if (the_session && (*ret_code == GF_OK)) {
-		*the_session = sess;
-	} else {
-		gf_dm_sess_del(sess);
-	}
-	return ret;
-}
-
-
-static Bool check_extension(const char *szExtList, char *szExt)
-{
-	char szExt2[500];
-	if (szExtList[0] != '"') return 0;
-	szExtList += 1;
-
-	while (1) {
-		u32 i = 0;
-		while ((szExtList[0] != ' ') && (szExtList[0] != '"')) {
-			szExt2[i] = szExtList[0];
-			i++;
-			szExtList++;
-		}
-		szExt2[i] = 0;
-		if (!strncmp(szExt, szExt2, strlen(szExt2))) return 1;
-		if (szExtList[0]=='"') break;
-		else szExtList++;
-	}
-	return 0;
-}
-
-
-static GF_InputService *gf_term_can_handle_service(GF_Terminal *term, const char *url, const char *parent_url, Bool no_mime_check, char **out_url, GF_Err *ret_code, GF_DownloadSession **the_session, char **out_mime_type)
-{
-	u32 i;
-	GF_Err e;
-	char *sURL, *qm, *frag, *ext, *mime_type, *url_res;
-	char szExt[50];
-	const char *force_module = NULL;
-	GF_InputService *ifce;
-	Bool skip_mime = 0;
-	memset(szExt, 0, sizeof(szExt));
-
-	(*ret_code) = GF_OK;
-	ifce = NULL;
-	mime_type = NULL;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Looking for plugin for URL %s\n", url));
-	*out_url = NULL;
-	*out_mime_type = NULL;
-	sURL = NULL;
-	if (!url || !strncmp(url, "\\\\", 2) ) {
-		(*ret_code) = GF_URL_ERROR;
-		goto exit;
-	}
-
-	if (!strnicmp(url, "libplayer://", 12)) {
-		force_module = "LibPlayer";
-	}
-
-	/*used by GUIs scripts to skip URL concatenation*/
-	if (!strncmp(url, "gpac://", 7)) sURL = gf_strdup(url+7);
-	/*opera-style localhost URLs*/
-	else if (!strncmp(url, "file://localhost", 16)) sURL = gf_strdup(url+16);
-
-	else if (parent_url) sURL = gf_url_concatenate(parent_url, url);
-
-	/*path absolute*/
-	if (!sURL) sURL = gf_strdup(url);
-
-	if (gf_url_is_local(sURL))
-		gf_url_to_fs_path(sURL);
-
-	if (the_session) *the_session = NULL;
-	if (no_mime_check) {
-		mime_type = NULL;
-	} else {
-		/*fetch a mime type if any. If error don't even attempt to open the service	*/
-		mime_type = get_mime_type(term, sURL, &e, the_session);
-		if (e) {
-			(*ret_code) = e;
-			goto exit;
-		}
-	}
-
-	if (mime_type &&
-	        (!stricmp(mime_type, "text/plain")
-	         || !stricmp(mime_type, "video/quicktime")
-	         || !stricmp(mime_type, "video/mpeg")
-	         || !stricmp(mime_type, "application/octet-stream")
-	        )
-	   ) {
-		skip_mime = 1;
-	}
-
-	ifce = NULL;
-
-	/*load from mime type*/
-	if (mime_type && !skip_mime) {
-		const char *sPlug = gf_cfg_get_key(term->user->config, "MimeTypes", mime_type);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Mime type found: %s\n", mime_type));
-		if (!sPlug) {
-			*out_mime_type = mime_type;
-			mime_type=NULL;
-		}
-		if (sPlug) sPlug = strrchr(sPlug, '"');
-		if (sPlug) {
-			sPlug += 2;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("%s:%d FOUND matching module %s\n", __FILE__, __LINE__, sPlug));
-			ifce = (GF_InputService *) gf_modules_load_interface_by_name(term->user->modules, sPlug, GF_NET_CLIENT_INTERFACE);
-			if (force_module && ifce && !strstr(ifce->module_name, force_module)) {
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-				ifce = NULL;
-			}
-			if (ifce && !net_check_interface(ifce) ) {
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-				ifce = NULL;
-			}
-		}
-	}
-
-	/* The file extension, if any, is before '?' if any or before '#' if any.*/
-	url_res = strrchr(sURL, '/');
-	if (!url_res) url_res = strrchr(sURL, '\\');
-	if (!url_res) url_res = sURL;
-	qm = strchr(url_res, '?');
-	if (qm) {
-		qm[0] = 0;
-		ext = strrchr(url_res, '.');
-		qm[0] = '?';
-	} else {
-		frag = strchr(url_res, '#');
-		if (frag) {
-			frag[0] = 0;
-			ext = strrchr(url_res, '.');
-			frag[0] = '#';
-		} else {
-			ext = strrchr(url_res, '.');
-		}
-	}
-	if (ext && !stricmp(ext, ".gz")) {
-		char *anext;
-		ext[0] = 0;
-		anext = strrchr(sURL, '.');
-		ext[0] = '.';
-		ext = anext;
-	}
-	/*no mime type: either local or streaming. If streaming discard extension checking*/
-	if (!ifce && !mime_type && strstr(sURL, "://") && strnicmp(sURL, "file://", 7)) ext = NULL;
-
-	/*browse extensions for prefered module*/
-	if (!ifce && ext) {
-		u32 keyCount;
-		strncpy(szExt, &ext[1], 49);
-		ext = strrchr(szExt, '?');
-		if (ext) ext[0] = 0;
-		ext = strrchr(szExt, '#');
-		if (ext) ext[0] = 0;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] No mime type found - checking by extension %s\n", szExt));
-		assert( term && term->user && term->user->modules);
-		keyCount = gf_cfg_get_key_count(term->user->config, "MimeTypes");
-		for (i=0; i<keyCount; i++) {
-			char *sPlug;
-			const char *sKey;
-			const char *sMime;
-			sMime = gf_cfg_get_key_name(term->user->config, "MimeTypes", i);
-			if (!sMime) continue;
-			sKey = gf_cfg_get_key(term->user->config, "MimeTypes", sMime);
-			if (!sKey) continue;
-			if (!check_extension(sKey, szExt)) continue;
-			sPlug = strrchr(sKey, '"');
-			if (!sPlug) continue;	/*bad format entry*/
-			sPlug += 2;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Trying module[%i]=%s, mime=%s\n", i, sPlug, sMime));
-			ifce = (GF_InputService *) gf_modules_load_interface_by_name(term->user->modules, sPlug, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] module[%i]=%s, mime=%s, cannot be loaded for GF_NET_CLIENT_INTERFACE.\n", i, sPlug, sMime));
-				continue;
-			}
-			if (force_module && ifce && !strstr(ifce->module_name, force_module)) {
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-				ifce = NULL;
-				continue;
-			}
-			if (ifce && !net_check_interface(ifce)) {
-				gf_modules_close_interface((GF_BaseInterface *) ifce);
-				ifce = NULL;
-				continue;
-			}
-			break;
-		}
-	}
-
-	/*browse all modules*/
-	if (!ifce) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Not found any interface, trying browsing all modules...\n"));
-		for (i=0; i< gf_modules_get_count(term->user->modules); i++) {
-			ifce = (GF_InputService *) gf_modules_load_interface(term->user->modules, i, GF_NET_CLIENT_INTERFACE);
-			if (!ifce) continue;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Checking if module %s supports URL %s\n", ifce->module_name, sURL));
-			if (force_module && ifce && !strstr(ifce->module_name, force_module)) {
-			}
-			else if (net_check_interface(ifce) && ifce->CanHandleURL(ifce, sURL)) {
-				break;
-			}
-			gf_modules_close_interface((GF_BaseInterface *) ifce);
-			ifce = NULL;
-		}
-	}
-exit:
-	if (!ifce) {
-		if (*ret_code) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Error fetching mime type for URL %s: %s\n", sURL ? sURL : url, gf_error_to_string(*ret_code) ));
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Did not find any input plugin for URL %s (%s) \n", sURL ? sURL : url, mime_type ? mime_type : "no mime type"));
-		}
-		if (sURL) gf_free(sURL);
-		if ( (*ret_code) == GF_OK) (*ret_code) = GF_NOT_SUPPORTED;
-		*out_url = NULL;
-
-		if (the_session && *the_session) {
-			gf_dm_sess_del(*the_session);
-		}
-		if (mime_type) gf_free(mime_type);
-		mime_type = NULL;
-		if (*out_mime_type) gf_free(*out_mime_type);
-		*out_mime_type = NULL;
-	} else {
-		*out_url = sURL;
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Found input plugin %s for URL %s (%s)\n", ifce->module_name, sURL, mime_type ? mime_type : "no mime type"));
-	}
-	if (mime_type)
-		*out_mime_type = mime_type;
-	return ifce;
-}
-
-GF_ClientService *gf_term_service_new(GF_Terminal *term, struct _od_manager *owner, const char *url, const char *parent_url, GF_Err *ret_code)
-{
-	GF_DownloadSession *download_session = NULL;
-	char *sURL;
-	char *mime;
-	GF_ClientService *serv;
-	GF_InputService *ifce = gf_term_can_handle_service(term, url, parent_url, 0, &sURL, ret_code, &download_session, &mime);
-	if (!ifce) {
-		if (owner->subscene) gf_scene_notify_event(owner->subscene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, *ret_code, GF_FALSE);
-		return NULL;
-	}
-	GF_SAFEALLOC(serv, GF_ClientService);
-	if (!serv) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate network service\n"));
-		return NULL;
-	}
-	serv->term = term;
-	serv->owner = owner;
-	serv->ifce = ifce;
-	serv->url = sURL;
-	serv->mime = mime;
-	serv->Clocks = gf_list_new();
-	serv->dnloads = gf_list_new();
-	serv->pending_service_session = download_session;
-
-	gf_term_lock_media_queue(term, 1);
-	gf_list_add(term->net_services, serv);
-	gf_term_lock_media_queue(term, 0);
-
-
-	serv->fn_connect_ack = term_on_connect;
-	serv->fn_disconnect_ack = term_on_disconnect;
-	serv->fn_command = term_on_command;
-	serv->fn_data_packet = term_on_data_packet;
-	serv->fn_add_media = term_on_media_add;
-
-	if (owner && owner->OD && owner->OD->RedirectOnly) serv->serviceID = owner->OD->ServiceID;
-	return serv;
-}
-
-GF_EXPORT
-Bool gf_term_is_supported_url(GF_Terminal *term, const char *fileName, Bool use_parent_url, Bool no_mime_check)
-{
-	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);
-	return 1;
-}
-
-
-Bool gf_term_service_can_handle_url(GF_ClientService *ns, char *url)
-{
-	/*if no owner attached the service is being deleted, don't query it*/
-	if (!ns->owner || !ns->ifce->CanHandleURLInService) return 0;
-	return ns->ifce->CanHandleURLInService(ns->ifce, url);
-}
-
-GF_EXPORT
-GF_Err gf_term_service_command(GF_ClientService *ns, GF_NetworkCommand *com)
-{
-	if (ns) return ns->ifce->ServiceCommand(ns->ifce, com);
-	return GF_OK;
-}
-GF_Err gf_term_channel_get_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	if (!ns->ifce->ChannelGetSLP) return GF_NOT_SUPPORTED;
-	return ns->ifce->ChannelGetSLP(ns->ifce, channel, out_data_ptr, out_data_size, out_sl_hdr, sl_compressed, out_reception_status, is_new_data);
-}
-GF_Err gf_term_channel_release_sl_packet(GF_ClientService *ns, LPNETCHANNEL channel)
-{
-	if (!ns->ifce->ChannelGetSLP) return GF_NOT_SUPPORTED;
-	return ns->ifce->ChannelReleaseSLP(ns->ifce, channel);
-}
-
-GF_EXPORT
-void gf_service_connect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
-{
-	assert(service);
-	service->fn_connect_ack(service, ns, response);
-}
-
-GF_EXPORT
-void gf_service_disconnect_ack(GF_ClientService *service, LPNETCHANNEL ns, GF_Err response)
-{
-	assert(service);
-	service->fn_disconnect_ack(service, ns, response);
-}
-GF_EXPORT
-void gf_service_command(GF_ClientService *service, GF_NetworkCommand *com, GF_Err response)
-{
-	assert(service);
-	service->fn_command(service, com, response);
-}
-
-GF_EXPORT
-void gf_service_send_packet(GF_ClientService *service, LPNETCHANNEL ns, char *data, u32 data_size, GF_SLHeader *hdr, GF_Err reception_status)
-{
-	assert(service);
-	service->fn_data_packet(service, ns, data, data_size, hdr, reception_status);
-}
-
-GF_EXPORT
-void gf_service_declare_media(GF_ClientService *service, GF_Descriptor *media_desc, Bool no_scene_check)
-{
-	assert(service);
-	service->fn_add_media(service, media_desc, no_scene_check);
-}
-
-GF_EXPORT
-const char *gf_service_get_url(GF_ClientService *service)
-{
-	if (!service) return NULL;
-	return service->url;
-}
-
-void gf_term_delete_net_service(GF_ClientService *ns)
-{
-	const char *sOpt = gf_cfg_get_key(ns->term->user->config, "StreamingCache", "AutoSave");
-	if (ns->cache) gf_term_service_cache_close(ns, (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-
-	if (ns->pending_service_session) gf_dm_sess_del(ns->pending_service_session);
-
-	assert(!ns->nb_odm_users);
-	assert(!ns->nb_ch_users);
-	assert(!ns->owner);
-
-	gf_modules_close_interface((GF_BaseInterface *)ns->ifce);
-	gf_free(ns->url);
-	gf_free(ns->mime);
-
-
-	/*delete all the clocks*/
-	while (gf_list_count(ns->Clocks)) {
-		GF_Clock *ck = (GF_Clock *)gf_list_get(ns->Clocks, 0);
-		gf_list_rem(ns->Clocks, 0);
-		gf_clock_del(ck);
-	}
-	gf_list_del(ns->Clocks);
-
-	assert(!gf_list_count(ns->dnloads));
-	gf_list_del(ns->dnloads);
-	gf_free(ns);
-}
-
-GF_EXPORT
-GF_InputService *gf_service_get_interface(GF_ClientService *serv)
-{
-	return serv ? serv->ifce : NULL;
-}
-
-GF_EXPORT
-GF_DownloadSession *gf_service_download_new(GF_ClientService *service, const char *url, u32 flags, gf_dm_user_io user_io, void *cbk)
-{
-	GF_Err e;
-	GF_DownloadSession * sess;
-	char *sURL, *orig_url, *frag;
-	if (!service) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] service is null, cannot create new download session for %s.\n", url));
-		return NULL;
-	}
-
-	sURL = gf_url_concatenate(service->url, url);
-	/*path was absolute*/
-	if (!sURL) sURL = gf_strdup(url);
-	frag = strchr(sURL, '#');
-	if (frag) frag[0] = 0;
-	
-	assert( service->term );
-
-	orig_url = service->pending_service_session ? (char *) gf_dm_sess_get_original_resource_name(service->pending_service_session) : NULL;
-	/*this will take care of URL formatting (%20 etc ..) */
-	if (orig_url) orig_url = gf_url_concatenate(service->url, orig_url);
-
-	if (orig_url && !strcmp(orig_url, sURL)) {
-		sess = service->pending_service_session;
-		service->pending_service_session = NULL;
-		/*resetup*/
-		gf_dm_sess_reassign(sess, flags, user_io, cbk);
-	} else {
-		sess = gf_dm_sess_new(service->term->downloader, sURL, flags, user_io, cbk, &e);
-	}
-	if (orig_url) gf_free(orig_url);
-
-	if (!sess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] session could not be created for %s : %s. service url=%s, url=%s.\n", sURL, gf_error_to_string(e), service->url, url));
-		gf_free(sURL);
-		sURL = NULL;
-		return NULL;
-	}
-	gf_free(sURL);
-	sURL = NULL;
-	gf_dm_sess_set_private(sess, service);
-	gf_list_add(service->dnloads, sess);
-	return sess;
-}
-
-GF_EXPORT
-void gf_service_download_del(GF_DownloadSession * sess)
-{
-	Bool locked;
-	GF_ClientService *serv;
-	if (!sess) return;
-	serv = (GF_ClientService *)gf_dm_sess_get_private(sess);
-
-	/*avoid sending data back to user*/
-	gf_dm_sess_abort(sess);
-
-	locked = gf_mx_try_lock(serv->term->media_queue_mx);
-
-	/*unregister from service*/
-	gf_list_del_item(serv->dnloads, sess);
-
-	/*same as service: this may be called in the downloader thread (typically when download fails)
-	so we must queue the downloader and let the term delete it later on*/
-	gf_list_add(serv->term->net_services_to_remove, sess);
-
-	if (locked)
-		gf_term_lock_media_queue(serv->term, 0);
-}
-
-GF_EXPORT
-void gf_service_download_update_stats(GF_DownloadSession * sess)
-{
-	GF_ClientService *serv;
-	const char *szURI;
-	u32 total_size, bytes_done, bytes_per_sec;
-	GF_NetIOStatus net_status;
-
-	if (!sess) return;
-
-	gf_dm_sess_get_stats(sess, NULL, &szURI, &total_size, &bytes_done, &bytes_per_sec, &net_status);
-	serv = (GF_ClientService *)gf_dm_sess_get_private(sess);
-	switch (net_status) {
-	case GF_NETIO_SETUP:
-		gf_term_message(serv->term, serv->url, "Connecting", GF_OK);
-		break;
-	case GF_NETIO_CONNECTED:
-		gf_term_message(serv->term, serv->url, "Connected", GF_OK);
-		break;
-	case GF_NETIO_WAIT_FOR_REPLY:
-		gf_term_message(serv->term, serv->url, "Waiting for reply...", GF_OK);
-		break;
-	case GF_NETIO_PARSE_REPLY:
-		gf_term_message(serv->term, serv->url, "Starting download...", GF_OK);
-		break;
-	case GF_NETIO_DATA_EXCHANGE:
-		/*notify some connection / ...*/
-		if (total_size) {
-			GF_Event evt;
-			evt.type = GF_EVENT_PROGRESS;
-			evt.progress.progress_type = 1;
-			evt.progress.service = szURI;
-			evt.progress.total = total_size;
-			evt.progress.done = bytes_done;
-			evt.progress.bytes_per_seconds = bytes_per_sec;
-			gf_term_send_event(serv->term, &evt);
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] %s received %d / %d\n", szURI, bytes_done, total_size));
-		gf_term_service_media_event_with_download(serv->owner, GF_EVENT_MEDIA_PROGRESS, bytes_done, total_size, bytes_per_sec);
-		break;
-	case GF_NETIO_DATA_TRANSFERED:
-		/*notify some connection / ...*/
-		if (total_size) {
-			GF_Event evt;
-			evt.type = GF_EVENT_PROGRESS;
-			evt.progress.progress_type = 1;
-			evt.progress.service = szURI;
-			evt.progress.total = total_size;
-			evt.progress.done = total_size;
-			evt.progress.bytes_per_seconds = bytes_per_sec;
-			gf_term_send_event(serv->term, &evt);
-		}
-		gf_term_service_media_event(serv->owner, GF_EVENT_MEDIA_LOAD_DONE);
-		if (serv->owner && !(serv->owner->flags & GF_ODM_DESTROYED) && serv->owner->duration) {
-			GF_Clock *ck = gf_odm_get_media_clock(serv->owner);
-			if (!gf_clock_is_started(ck)) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP Resource] Done retrieving file - resuming playback\n"));
-				if (serv->is_paused) {
-					serv->is_paused = 0;
-#ifndef GPAC_DISABLE_VRML
-					mediacontrol_resume(serv->owner, 0);
-#endif
-				}
-			}
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-void gf_term_service_del(GF_ClientService *ns)
-{
-	/*this is a downloader session*/
-	if (! * (u32 *) ns) {
-		gf_dm_sess_del((GF_DownloadSession * ) ns);
-	} else {
-		gf_term_delete_net_service(ns);
-	}
-}
-
-GF_EXPORT
-void gf_service_register_mime(const GF_InputService *ifce, const char *mimeType, const char *extList, const char *description)
-{
-	u32 len;
-	char *buf;
-	if (!ifce || !mimeType || !extList || !description) return;
-
-	len = (u32) strlen(extList) + 3 + (u32) strlen(description) + 3 + (u32) strlen(ifce->module_name) + 1;
-	buf = (char*)gf_malloc(sizeof(char)*len);
-	sprintf(buf, "\"%s\" ", extList);
-	strlwr(buf);
-	strcat(buf, "\"");
-	strcat(buf, description);
-	strcat(buf, "\" ");
-	strcat(buf, ifce->module_name);
-	gf_modules_set_option((GF_BaseInterface *)(GF_BaseInterface *)ifce, "MimeTypes", mimeType, buf);
-	gf_free(buf);
-}
-
-GF_EXPORT
-Bool gf_service_check_mime_register(GF_InputService *ifce, const char *mimeType, const char *extList, const char *description, const char *fileExt)
-{
-	const char *szExtList;
-	char *ext, szExt[500];
-	if (!ifce || !mimeType || !extList || !description || !fileExt) return 0;
-	memset(szExt, 0, sizeof(szExt));
-	/*this is a URL*/
-	if ( (strlen(fileExt)>20) || strchr(fileExt, '/')) return 0;
-
-	if (fileExt[0]=='.') fileExt++;
-	strcpy(szExt, fileExt);
-	strlwr(szExt);
-	ext = strchr(szExt, '#');
-	if (ext) ext[0]=0;
-
-	szExtList = gf_modules_get_option((GF_BaseInterface *)(GF_BaseInterface *)ifce, "MimeTypes", mimeType);
-	if (!szExtList) {
-		gf_service_register_mime(ifce, mimeType, extList, description);
-		szExtList = gf_modules_get_option((GF_BaseInterface *)(GF_BaseInterface *)ifce, "MimeTypes", mimeType);
-	}
-	if (!strstr(szExtList, ifce->module_name)) return 0;
-	return check_extension((char *)szExtList, szExt);
-}
-
-GF_Err gf_term_service_cache_load(GF_ClientService *ns)
-{
-	GF_Err e;
-	const char *sOpt;
-	char szName[GF_MAX_PATH], szURL[1024];
-	GF_NetworkCommand com;
-	u32 i;
-	GF_StreamingCache *mcache = NULL;
-
-	/*is service cachable*/
-	com.base.on_channel = NULL;
-	com.base.command_type = GF_NET_IS_CACHABLE;
-	if (ns->ifce->ServiceCommand(ns->ifce, &com) != GF_OK) return GF_OK;
-
-	/*locate a cache*/
-	for (i=0; i< gf_modules_get_count(ns->term->user->modules); i++) {
-		mcache = (GF_StreamingCache *) gf_modules_load_interface(ns->term->user->modules, i, GF_STREAMING_MEDIA_CACHE);
-		if (mcache && mcache->Open && mcache->Close && mcache->Write && mcache->ChannelGetSLP && mcache->ChannelReleaseSLP && mcache->ServiceCommand) break;
-		if (mcache) gf_modules_close_interface((GF_BaseInterface *)mcache);
-		mcache = NULL;
-	}
-	if (!mcache) return GF_NOT_SUPPORTED;
-
-	sOpt = gf_cfg_get_key(ns->term->user->config, "StreamingCache", "RecordDirectory");
-	if (!sOpt) sOpt = gf_cfg_get_key(ns->term->user->config, "General", "CacheDirectory");
-	if (sOpt) {
-		strcpy(szName, sOpt);
-		if (szName[strlen(szName)-1]!='\\') strcat(szName, "\\");
-	} else {
-		strcpy(szName, "");
-	}
-	sOpt = gf_cfg_get_key(ns->term->user->config, "StreamingCache", "BaseFileName");
-	if (sOpt) {
-		strcat(szName, sOpt);
-	} else {
-		char *sep;
-		strcat(szName, "rec_");
-		sOpt = strrchr(ns->url, '/');
-		if (!sOpt) sOpt = strrchr(ns->url, '\\');
-		if (sOpt) sOpt += 1;
-		else {
-			sOpt = strstr(ns->url, "://");
-			if (sOpt) sOpt += 3;
-			else sOpt = ns->url;
-		}
-		strcpy(szURL, sOpt);
-		sep = strrchr(szURL, '.');
-		if (sep) sep[0] = 0;
-		for (i=0; i<strlen(szURL); i++) {
-			switch (szURL[i]) {
-			case '/':
-			case '\\':
-			case '.':
-			case ':':
-			case '?':
-				szURL[i] = '_';
-				break;
-			}
-		}
-		strcat(szName, szURL);
-	}
-
-	sOpt = gf_cfg_get_key(ns->term->user->config, "StreamingCache", "KeepExistingFiles");
-	e = mcache->Open(mcache, ns, szName, (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
-	if (e) {
-		gf_modules_close_interface((GF_BaseInterface *)mcache);
-		return e;
-	}
-	ns->cache = mcache;
-	return GF_OK;
-}
-
-GF_Err gf_term_service_cache_close(GF_ClientService *ns, Bool no_save)
-{
-	GF_Err e;
-	if (!ns->cache) return GF_OK;
-	e = ns->cache->Close(ns->cache, no_save);
-
-	gf_modules_close_interface((GF_BaseInterface *)ns->cache);
-	ns->cache = NULL;
-	return e;
-}
-
-
-GF_EXPORT
-GF_DownloadManager *gf_term_service_get_dm(GF_ClientService *ns)
-{
-	if (!ns->term) return NULL;
-	return ns->term->downloader;
-}
-

gpac-0.8.0.tar.gz/src/terminal/object_browser.c Deleted

@@ -1,504 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/scene_manager.h>
-#include <gpac/constants.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/term_info.h>
-#include "media_memory.h"
-
-
-/*WorldInfo node*/
-#include <gpac/nodes_mpeg4.h>
-/*title node*/
-#include <gpac/nodes_svg.h>
-
-
-static Bool check_in_scene(GF_Scene *scene, GF_ObjectManager *odm)
-{
-	u32 i;
-	GF_ObjectManager *ptr, *root;
-	if (!scene) return 0;
-	root = scene->root_od;
-	if (odm == root) return 1;
-	scene = root->subscene;
-
-	i=0;
-	while ((ptr = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
-		if (ptr == odm) return 1;
-		if (check_in_scene(ptr->subscene, odm)) return 1;
-	}
-	return 0;
-}
-
-static Bool gf_term_check_odm(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	if (!term->root_scene) return 0;
-	return check_in_scene(term->root_scene, odm);
-}
-
-
-/*returns top-level OD of the presentation*/
-GF_EXPORT
-GF_ObjectManager *gf_term_get_root_object(GF_Terminal *term)
-{
-	if (!term) return NULL;
-	if (!term->root_scene) return NULL;
-	return term->root_scene->root_od;
-}
-
-/*returns number of sub-ODs in the current root. scene_od must be an inline OD*/
-GF_EXPORT
-u32 gf_term_get_object_count(GF_Terminal *term, GF_ObjectManager *scene_od)
-{
-	if (!term || !scene_od) return 0;
-	if (!gf_term_check_odm(term, scene_od)) return 0;
-	if (!scene_od->subscene) return 0;
-	return gf_list_count(scene_od->subscene->resources);
-}
-
-/*returns indexed (0-based) OD manager in the scene*/
-GF_EXPORT
-GF_ObjectManager *gf_term_get_object(GF_Terminal *term, GF_ObjectManager *scene_od, u32 index)
-{
-	if (!term || !scene_od) return NULL;
-	if (!gf_term_check_odm(term, scene_od)) return NULL;
-	if (!scene_od->subscene) return NULL;
-	return (GF_ObjectManager *) gf_list_get(scene_od->subscene->resources, index);
-}
-
-GF_EXPORT
-u32 gf_term_object_subscene_type(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	if (!term || !odm) return 0;
-	if (!gf_term_check_odm(term, odm)) return 0;
-
-	if (!odm->subscene) return 0;
-#ifndef GPAC_DISABLE_VRML
-	if (odm->parentscene) return gf_inline_is_protolib_object(odm->parentscene, odm) ? 3 : 2;
-#endif
-	return 1;
-}
-
-/*select given object when stream selection is available*/
-GF_EXPORT
-void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	if (!term || !odm) return;
-	if (!gf_term_check_odm(term, odm)) return;
-
-	gf_scene_select_object(term->root_scene, odm);
-}
-
-
-/*select given object when stream selection is available*/
-GF_EXPORT
-void gf_term_select_service(GF_Terminal *term, GF_ObjectManager *odm, u32 service_id)
-{
-	if (!term || !odm || !odm->subscene) return;
-	if (!gf_term_check_odm(term, odm)) return;
-
-#ifndef GPAC_DISABLE_VRML
-	gf_scene_set_service_id(odm->subscene, service_id);
-#endif
-}
-
-GF_EXPORT
-Bool gf_term_find_service(GF_Terminal *term, GF_ObjectManager *odm, u32 service_id)
-{
-	u32 i;
-	GF_ObjectManager *anodm;
-	if (!term || !odm || !odm->subscene) return GF_FALSE;
-	if (!gf_term_check_odm(term, odm)) return GF_FALSE;
-
-	i=0;
-	while ((anodm = gf_list_enum(odm->subscene->resources, &i))) {
-		if (anodm->OD && (anodm->OD->ServiceID==service_id)) return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-
-/*select given object when stream selection is available*/
-GF_EXPORT
-void gf_term_toggle_addons(GF_Terminal *term, Bool show_addons)
-{
-	if (!term || !term->root_scene || !term->root_scene->is_dynamic_scene) return;
-#ifndef GPAC_DISABLE_VRML
-	gf_scene_toggle_addons(term->root_scene, show_addons);
-#endif
-}
-
-GF_EXPORT
-u32 gf_term_get_current_service_id(GF_Terminal *term)
-{
-	SFURL *the_url;
-	GF_MediaObject *mo;
-	if (!term || !term->root_scene) return 0;
-	if (! term->root_scene->is_dynamic_scene) return term->root_scene->root_od->OD->ServiceID;
-
-	if (term->root_scene->visual_url.OD_ID || term->root_scene->visual_url.url) the_url = &term->root_scene->visual_url;
-	else the_url = &term->root_scene->audio_url;
-
-	mo = gf_scene_find_object(term->root_scene, the_url->OD_ID, the_url->url);
-	if (mo && mo->odm && mo->odm->OD) return mo->odm->OD->ServiceID;
-	return 0;
-}
-
-
-static void get_codec_stats(GF_Codec *dec, GF_MediaInfo *info)
-{
-	info->instant_bitrate = dec->avg_bit_rate;
-	info->avg_bitrate = dec->avg_bit_rate;
-	info->max_bitrate = dec->max_bit_rate;
-	info->nb_dec_frames = dec->nb_dec_frames;
-	info->max_dec_time = dec->max_dec_time;
-	info->total_dec_time = dec->total_dec_time;
-	info->first_frame_time = dec->first_frame_time;
-	info->last_frame_time = dec->last_frame_time;
-	info->raw_media = dec->flags & GF_ESM_CODEC_IS_RAW_MEDIA;
-	info->au_duration = dec->min_frame_dur;
-	info->nb_iraps = dec->nb_iframes;
-	info->irap_max_dec_time = dec->max_iframes_time;
-	info->irap_total_dec_time = dec->total_iframes_time;
-
-
-}
-
-GF_EXPORT
-GF_Err gf_term_get_object_info(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info)
-{
-	GF_ObjectManager *an_odm;
-	GF_Channel *ch;
-	GF_Codec *codec;
-
-	memset(info, 0, sizeof(GF_MediaInfo));
-
-	if (!term || !odm || !info) return GF_BAD_PARAM;
-	if (!gf_term_check_odm(term, odm)) return GF_BAD_PARAM;
-
-	info->od = odm->OD;
-
-	info->duration = (Double) (s64)odm->duration;
-	info->duration /= 1000;
-
-	codec = odm->codec;
-	an_odm = odm;
-	while (!codec) {
-		if (!an_odm->lower_layer_odm) break;
-		an_odm = an_odm->lower_layer_odm;
-		codec = an_odm->codec;
-	}
-
-	if (codec) {
-		/*since we don't remove ODs that failed setup, check for clock*/
-		if (codec->ck) {
-			if (codec->CB) {
-				info->current_time = odm->media_current_time ? odm->media_current_time : codec->last_unit_cts;
-				info->ntp_diff = codec->CB->LastRenderedNTPDiff;
-			} else {
-				info->current_time = gf_clock_media_time(codec->ck);
-			}
-		}
-		info->current_time /= 1000;
-		info->nb_dropped = codec->nb_dropped;
-	} else if (odm->subscene) {
-		if (odm->subscene->scene_codec) {
-			if (odm->subscene->scene_codec->ck) {
-				info->current_time = gf_clock_media_time(odm->subscene->scene_codec->ck);
-				info->current_time /= 1000;
-			}
-			info->duration = (Double) (s64)odm->subscene->duration;
-			info->duration /= 1000;
-			info->nb_dropped = odm->subscene->scene_codec->nb_dropped;
-			codec = odm->subscene->scene_codec;
-		} else if (odm->subscene->is_dynamic_scene) {
-			if (odm->subscene->dyn_ck) {
-				info->current_time = gf_clock_media_time(odm->subscene->dyn_ck);
-				info->current_time /= 1000;
-			}
-			info->generated_scene = 1;
-		}
-	}
-	if (info->duration && info->current_time>info->duration)
-		info->current_time = info->duration;
-
-	info->buffer = -2;
-	info->db_unit_count = 0;
-
-	/*Warning: is_open==2 means object setup, don't check then*/
-	if (odm->state==GF_ODM_STATE_IN_SETUP) {
-		info->status = 3;
-	} else if (odm->state==GF_ODM_STATE_BLOCKED) {
-		info->status = 0;
-		info->protection = 2;
-	} else if (odm->state) {
-		u32 i, buf;
-		GF_Clock *ck;
-
-		ck = gf_odm_get_media_clock(odm);
-		/*no clock means setup failed*/
-		if (!ck) {
-			info->status = 4;
-		} else {
-			info->status = gf_clock_is_started(ck) ? 1 : 2;
-			info->clock_drift = ck->drift;
-
-			info->buffer = -1;
-			info->min_buffer = -1;
-			info->max_buffer = 0;
-			buf = 0;
-			i=0;
-			while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-				info->db_unit_count += ch->AU_Count;
-				if (!ch->is_pulling || ch->MaxBuffer) {
-					if (ch->MaxBuffer) info->buffer = 0;
-					buf += ch->BufferTime;
-
-					if (ch->MaxBuffer> info->max_buffer) info->max_buffer = ch->MaxBuffer;
-					if (ch->MinBuffer < info->min_buffer) info->min_buffer = ch->MinBuffer;
-
-				}
-				if (ch->is_protected) info->protection = ch->ipmp_tool ? 1 : 2;
-
-			}
-			if (buf) info->buffer = (s32) buf;
-		}
-	}
-
-	info->has_profiles = (odm->flags & GF_ODM_HAS_PROFILES) ? 1 : 0;
-	if (info->has_profiles) {
-		info->inline_pl = (odm->flags & GF_ODM_INLINE_PROFILES) ? 1 : 0;
-		info->OD_pl = odm->OD_PL;
-		info->scene_pl = odm->Scene_PL;
-		info->audio_pl = odm->Audio_PL;
-		info->visual_pl = odm->Visual_PL;
-		info->graphics_pl = odm->Graphics_PL;
-	}
-
-	if (odm->net_service) {
-		info->service_handler = odm->net_service->ifce->module_name;
-		info->service_url = odm->net_service->url;
-		if (odm->net_service->owner == odm) info->owns_service = 1;
-	} else if ((odm->subscene && odm->subscene->graph_attached) || (odm->codec)) {
-		info->service_url = "No associated network Service";
-	} else {
-		info->service_url = "Service not found or error";
-	}
-
-	if (codec) {
-		if (codec->decio && codec->decio->GetName) {
-			info->codec_name = codec->decio->GetName(codec->decio);
-		} else {
-			info->codec_name = codec->decio ? codec->decio->module_name : "internal decoder";
-		}
-		info->od_type = codec->type;
-
-		if (codec->CB) {
-			info->cb_max_count = codec->CB->Capacity;
-			info->cb_unit_count = codec->CB->UnitCount;
-			if (codec->direct_vout) {
-				info->direct_video_memory = 1;
-			}
-		}
-		get_codec_stats(codec, info);
-	}
-
-	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->bits_per_sample, &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;
-		}
-	}
-
-	ch = (GF_Channel*)gf_list_get(odm->channels, 0);
-	if (ch && ch->esd->langDesc) {
-		info->lang = ch->esd->langDesc->langCode;
-		info->lang_code = ch->esd->langDesc->full_lang_code;
-	}
-
-	if (odm->mo && odm->mo->URLs.count)
-		info->media_url = odm->mo->URLs.vals[0].url;
-	return GF_OK;
-}
-
-GF_EXPORT
-Bool gf_term_get_download_info(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, const char **server, const char **path, u32 *bytes_done, u32 *total_bytes, u32 *bytes_per_sec)
-{
-	GF_DownloadSession * sess;
-	if (!term || !odm || !gf_term_check_odm(term, odm)) return 0;
-	if (odm->net_service->owner != odm) return 0;
-
-	if (*d_enum >= gf_list_count(odm->net_service->dnloads)) return 0;
-	sess = (GF_DownloadSession*)gf_list_get(odm->net_service->dnloads, *d_enum);
-	if (!sess) return 0;
-	(*d_enum) ++;
-	gf_dm_sess_get_stats(sess, server, path, bytes_done, total_bytes, bytes_per_sec, NULL);
-	return 1;
-}
-
-GF_EXPORT
-Bool gf_term_get_channel_net_info(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, u32 *chid, NetStatCommand *netcom, GF_Err *ret_code)
-{
-	GF_Channel *ch;
-	GF_NetworkCommand com;
-	if (!term || !odm || !gf_term_check_odm(term, odm)) return 0;
-	if (*d_enum >= gf_list_count(odm->channels)) return 0;
-	ch = (GF_Channel*)gf_list_get(odm->channels, *d_enum);
-	if (!ch) return 0;
-	(*d_enum) ++;
-	if (ch->is_pulling) {
-		(*ret_code) = GF_NOT_SUPPORTED;
-		return 1;
-	}
-	(*chid) = ch->esd->ESID;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.base.on_channel = ch;
-	com.command_type = GF_NET_GET_STATS;
-	(*ret_code) = gf_term_service_command(ch->service, &com);
-	memcpy(netcom, &com.net_stats, sizeof(NetStatCommand));
-	return 1;
-}
-
-GF_EXPORT
-GF_Err gf_term_get_service_info(GF_Terminal *term, GF_ObjectManager *odm, NetInfoCommand *netinfo)
-{
-	GF_Err e;
-	GF_NetworkCommand com;
-	if (!term || !odm || !netinfo || !gf_term_check_odm(term, odm)) return GF_BAD_PARAM;
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_SERVICE_INFO;
-	e = gf_term_service_command(odm->net_service, &com);
-	memcpy(netinfo, &com.info, sizeof(NetInfoCommand));
-	return e;
-}
-
-GF_EXPORT
-const char *gf_term_get_world_info(GF_Terminal *term, GF_ObjectManager *scene_od, GF_List *descriptions)
-{
-	GF_Node *info;
-	if (!term) return NULL;
-	info = NULL;
-	if (!scene_od) {
-		if (!term->root_scene) return NULL;
-		info = (GF_Node*)term->root_scene->world_info;
-	} else {
-		if (!gf_term_check_odm(term, scene_od)) return NULL;
-		info = (GF_Node*) (scene_od->subscene ? scene_od->subscene->world_info : scene_od->parentscene->world_info);
-	}
-	if (!info) return NULL;
-
-	if (gf_node_get_tag(info) == TAG_SVG_title) {
-		/*FIXME*/
-		//return ((SVG_titleElement *) info)->textContent;
-		return "TO FIX IN GPAC!!";
-	} else {
-#ifndef GPAC_DISABLE_VRML
-		M_WorldInfo *wi = (M_WorldInfo *) info;
-		if (descriptions) {
-			u32 i;
-			for (i=0; i<wi->info.count; i++) {
-				gf_list_add(descriptions, wi->info.vals[i]);
-			}
-		}
-		return wi->title.buffer;
-#endif
-	}
-	return "GPAC";
-}
-
-GF_EXPORT
-GF_Err gf_term_dump_scene(GF_Terminal *term, char *rad_name, char **filename, Bool xml_dump, Bool skip_protos, GF_ObjectManager *scene_od)
-{
-#ifndef GPAC_DISABLE_SCENE_DUMP
-	GF_SceneGraph *sg;
-	GF_ObjectManager *odm;
-	GF_SceneDumper *dumper;
-	GF_List *extra_graphs;
-	u32 mode;
-	u32 i;
-	char szExt[20], *ext;
-	GF_Err e;
-
-	if (!term || !term->root_scene) return GF_BAD_PARAM;
-	if (!scene_od) {
-		if (!term->root_scene) return GF_BAD_PARAM;
-		odm = term->root_scene->root_od;
-	} else {
-		odm = scene_od;
-		if (!gf_term_check_odm(term, scene_od))
-			odm = term->root_scene->root_od;
-	}
-
-	if (odm->subscene) {
-		if (!odm->subscene->graph) return GF_IO_ERR;
-		sg = odm->subscene->graph;
-		extra_graphs = odm->subscene->extra_scenes;
-	} else {
-		if (!odm->parentscene->graph) return GF_IO_ERR;
-		sg = odm->parentscene->graph;
-		extra_graphs = odm->parentscene->extra_scenes;
-	}
-
-	mode = xml_dump ? GF_SM_DUMP_AUTO_XML : GF_SM_DUMP_AUTO_TXT;
-	/*figure out best dump format based on extension*/
-	ext = odm->net_service ? strrchr(odm->net_service->url, '.') : NULL;
-	if (ext) {
-		strcpy(szExt, ext);
-		strlwr(szExt);
-		if (!strcmp(szExt, ".wrl")) mode = xml_dump ? GF_SM_DUMP_X3D_XML : GF_SM_DUMP_VRML;
-		else if(!strncmp(szExt, ".x3d", 4) || !strncmp(szExt, ".x3dv", 5) ) mode = xml_dump ? GF_SM_DUMP_X3D_XML : GF_SM_DUMP_X3D_VRML;
-		else if(!strncmp(szExt, ".bt", 3) || !strncmp(szExt, ".xmt", 4) || !strncmp(szExt, ".mp4", 4) ) mode = xml_dump ? GF_SM_DUMP_XMTA : GF_SM_DUMP_BT;
-	}
-
-	dumper = gf_sm_dumper_new(sg, rad_name, GF_FALSE, ' ', mode);
-
-	if (!dumper) return GF_IO_ERR;
-	e = gf_sm_dump_graph(dumper, skip_protos, 0);
-	for (i = 0; i < gf_list_count(extra_graphs); i++) {
-		GF_SceneGraph *extra = (GF_SceneGraph *)gf_list_get(extra_graphs, i);
-		gf_sm_dumper_set_extra_graph(dumper, extra);
-		e = gf_sm_dump_graph(dumper, skip_protos, 0);
-	}
-
-	if (filename) *filename = gf_strdup(gf_sm_dump_get_name(dumper));
-	gf_sm_dumper_del(dumper);
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
-

gpac-0.8.0.tar.gz/src/terminal/object_manager.c Deleted

@@ -1,2431 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/constants.h>
-#include "media_memory.h"
-#include "media_control.h"
-
-#include "input_sensor.h"
-
-/*removes the channel ressources and destroy it*/
-void ODM_DeleteChannel(GF_ObjectManager *odm, struct _es_channel *ch);
-
-GF_EXPORT
-GF_ObjectManager *gf_odm_new()
-{
-	GF_ObjectManager *tmp;
-	GF_SAFEALLOC(tmp, GF_ObjectManager);
-	if (!tmp) return NULL;
-	tmp->channels = gf_list_new();
-
-	tmp->Audio_PL = (u8) -1;
-	tmp->Graphics_PL = (u8) -1;
-	tmp->OD_PL = (u8) -1;
-	tmp->Scene_PL = (u8) -1;
-	tmp->Visual_PL = (u8) -1;
-	tmp->mx = gf_mx_new("ODM");
-#ifndef GPAC_DISABLE_VRML
-	tmp->ms_stack = gf_list_new();
-	tmp->mc_stack = gf_list_new();
-#endif
-	return tmp;
-}
-
-void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset)
-{
-#ifndef GPAC_DISABLE_VRML
-	MediaSensorStack *media_sens;
-	MediaControlStack *media_ctrl;
-
-	while ((media_sens = (MediaSensorStack *)gf_list_last(odm->ms_stack))) {
-		MS_Stop(media_sens);
-		/*and detach from stream object*/
-		media_sens->stream = NULL;
-		gf_list_rem_last(odm->ms_stack);
-	}
-
-	while ((media_ctrl = (MediaControlStack *)gf_list_last(odm->mc_stack))) {
-		if (signal_reset)
-			gf_odm_remove_mediacontrol(odm, media_ctrl);
-		media_ctrl->stream = NULL;
-		media_ctrl->ck = NULL;
-		gf_list_rem_last(odm->mc_stack);
-	}
-#endif
-}
-
-
-void gf_odm_del(GF_ObjectManager *odm)
-{
-	if (odm->addon && (odm->addon->root_od==odm)) {
-		odm->addon->root_od = NULL;
-		odm->addon->started = 0;
-	}
-	if (odm->upper_layer_odm) {
-		odm->upper_layer_odm->lower_layer_odm = NULL;
-	}
-	if (odm->lower_layer_odm) {
-		odm->lower_layer_odm->upper_layer_odm = NULL;
-		if (odm->lower_layer_odm->codec) {
-			GF_CodecCapability cap;
-			//switch off enhancement layer
-			cap.CapCode = GF_CODEC_MEDIA_LAYER_DETACH;
-			cap.cap.valueInt = 0;
-			gf_codec_set_capability(odm->lower_layer_odm->codec, cap);
-		}
-	}
-	/*make sure we are not in the media queue*/
-	gf_term_lock_media_queue(odm->term, GF_TRUE);
-	gf_list_del_item(odm->term->media_queue, odm);
-	gf_term_check_connections_for_delete(odm->term, odm);
-	gf_term_lock_media_queue(odm->term, GF_FALSE);
-
-	/*detach media object as referenced by the scene - this should ensures that any attempt to lock the ODM from the
-	compositor will fail as the media object is no longer linked to object manager*/
-	gf_mx_p(odm->mx);
-	if (odm->mo) odm->mo->odm = NULL;
-	gf_mx_v(odm->mx);
-
-	/*relock the mutex for final object destruction*/
-	gf_mx_p(odm->mx);
-
-#ifndef GPAC_DISABLE_VRML
-	gf_odm_reset_media_control(odm, 0);
-	gf_list_del(odm->ms_stack);
-	gf_list_del(odm->mc_stack);
-#endif
-
-	if (odm->raw_frame_sema) gf_sema_del(odm->raw_frame_sema);
-
-	gf_list_del(odm->channels);
-	odm->channels = NULL;
-	assert (!odm->net_service);
-	gf_odf_desc_del((GF_Descriptor *)odm->OD);
-	odm->OD = NULL;
-	gf_mx_v(odm->mx);
-	gf_mx_del(odm->mx);
-	gf_free(odm);
-}
-
-
-void gf_odm_lock(GF_ObjectManager *odm, u32 LockIt)
-{
-	assert(odm);
-	if (LockIt)
-		gf_mx_p(odm->mx);
-	else
-		gf_mx_v(odm->mx);
-}
-
-Bool gf_odm_lock_mo(GF_MediaObject *mo)
-{
-	if (!mo || !mo->odm) return GF_FALSE;
-	gf_odm_lock(mo->odm, 1);
-	/*the ODM may have been destroyed here !!*/
-	if (!mo->odm) return GF_FALSE;
-	return GF_TRUE;
-}
-
-GF_EXPORT
-void gf_odm_disconnect(GF_ObjectManager *odm, u32 do_remove)
-{
-	GF_Terminal *term;
-	GF_Channel *ch;
-
-	if (do_remove) {
-		gf_mx_p(odm->term->net_mx);
-		odm->flags |= GF_ODM_DESTROYED;
-		gf_mx_v(odm->term->net_mx);
-	}
-	gf_odm_stop(odm, GF_TRUE);
-
-	/*disconnect sub-scene*/
-	if (odm->subscene) gf_scene_disconnect(odm->subscene, do_remove);
-
-	/*no destroy*/
-	if (!do_remove) return;
-
-	gf_odm_lock(odm, 1);
-
-	/*unload the decoders before deleting the channels to prevent any access fault*/
-	if (odm->codec) {
-		if (odm->codec->type==GF_STREAM_INTERACT) {
-			u32 i, count;
-			// Remove all Registered InputSensor nodes -> shut down the InputSensor threads -> prevent illegal access on deleted pointers
-			GF_MediaObject *obj = odm->mo;
-			count = gf_mo_event_target_count(obj);
-			for (i=0; i<count; i++) {
-				GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, i));
-				switch (gf_node_get_tag(n)) {
-#ifndef GPAC_DISABLE_VRML
-				case TAG_MPEG4_InputSensor:
-					((M_InputSensor*)n)->enabled = 0;
-					InputSensorModified(n);
-					break;
-#endif
-				default:
-					break;
-				}
-			}
-		}
-		gf_term_remove_codec(odm->term, odm->codec);
-	}
-	if (odm->ocr_codec) gf_term_remove_codec(odm->term, odm->ocr_codec);
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) gf_term_remove_codec(odm->term, odm->oci_codec);
-#endif
-
-	/*then delete all the channels in this OD */
-	while (gf_list_count(odm->channels)) {
-		ch = (GF_Channel*)gf_list_get(odm->channels, 0);
-#if 0
-		if (ch->clock->mc && ch->clock->mc->stream && ch->clock->mc->stream->odm==odm) {
-			ch->clock->mc->stream = NULL;
-			ch->clock->mc = NULL;
-		}
-#endif
-		ODM_DeleteChannel(odm, ch);
-	}
-
-	/*delete the decoders*/
-	if (odm->codec) {
-		gf_codec_del(odm->codec);
-		odm->codec = NULL;
-	}
-	if (odm->ocr_codec) {
-		gf_codec_del(odm->ocr_codec);
-		odm->ocr_codec = NULL;
-	}
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) {
-		gf_codec_del(odm->oci_codec);
-		odm->oci_codec = NULL;
-	}
-#endif
-
-	/*detach from network service */
-	if (odm->net_service) {
-		GF_ClientService *ns = odm->net_service;
-		if (ns->nb_odm_users) ns->nb_odm_users--;
-		if (ns->owner == odm) {
-			/*detach it!!*/
-			ns->owner = NULL;
-			/*try to assign a new root in case this is not scene shutdown*/
-			if (ns->nb_odm_users && odm->parentscene) {
-				GF_ObjectManager *new_root;
-				u32 i = 0;
-				while ((new_root = (GF_ObjectManager *)gf_list_enum(odm->parentscene->resources, &i)) ) {
-					if (new_root == odm) continue;
-					if (new_root->net_service != ns) continue;
-
-					/*if the new root is not playing or assoicated with the scene, force a destroy on it - this
-					is needed for services declaring their objects dynamically*/
-					if (!new_root->mo || (!new_root->mo->num_open)) {
-						gf_term_lock_media_queue(odm->term, GF_TRUE);
-						new_root->action_type = GF_ODM_ACTION_DELETE;
-						if (gf_list_find(odm->term->media_queue, new_root)<0) {
-							assert(! (new_root->flags & GF_ODM_DESTROYED));
-							gf_list_add(odm->term->media_queue, new_root);
-						}
-						gf_term_lock_media_queue(odm->term, GF_FALSE);
-					}
-					ns->owner = new_root;
-					break;
-				}
-			}
-		}
-		odm->net_service = NULL;
-		if (!ns->nb_odm_users) gf_term_close_service(odm->term, ns);
-	}
-
-	gf_odm_lock(odm, 0);
-
-	term = odm->term;
-
-	/*delete from the parent scene.*/
-	if (odm->parentscene) {
-		GF_Event evt;
-
-		if (odm->addon) {
-			gf_list_del_item(odm->parentscene->declared_addons, odm->addon);
-			gf_scene_reset_addon(odm->addon, GF_FALSE);
-			odm->addon = NULL;
-		}
-
-		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = GF_FALSE;
-		gf_term_forward_event(odm->term, &evt, GF_FALSE, GF_TRUE);
-
-		gf_term_lock_net(term, GF_TRUE);
-		gf_scene_remove_object(odm->parentscene, odm, do_remove);
-		if (odm->subscene) gf_scene_del(odm->subscene);
-		gf_odm_del(odm);
-		gf_term_lock_net(term, GF_FALSE);
-		return;
-	}
-
-	/*this is the scene root OD (may be a remote OD ..) */
-	if (odm->term->root_scene) {
-		GF_Event evt;
-		assert(odm->term->root_scene == odm->subscene);
-		gf_scene_del(odm->subscene);
-		/*reset main pointer*/
-		odm->term->root_scene = NULL;
-
-		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = GF_FALSE;
-		gf_term_send_event(odm->term, &evt);
-	}
-	//this is an extra scene not part of the main tree (eg declared from modules), don't post events
-	else if (odm->subscene) {
-		gf_scene_del(odm->subscene);
-	}
-
-	gf_term_lock_net(term, GF_TRUE);
-	/*delete the ODMan*/
-	gf_odm_del(odm);
-
-	gf_term_lock_net(term, GF_FALSE);
-}
-
-/*setup service for OD (extract IOD and go)*/
-void gf_odm_setup_entry_point(GF_ObjectManager *odm, const char *service_sub_url)
-{
-	u32 od_type;
-	char *ext, *redirect_url;
-	char *sub_url = (char *) service_sub_url;
-	GF_Descriptor *desc;
-
-	if (odm->flags & GF_ODM_DESTROYED) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM] Root object of service %s has been scheduled for destruction - ignoring object setup\n", service_sub_url));
-		return;
-	}
-//	assert(odm->OD==NULL);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Setting up root object for %s\n", odm->net_service->url));
-
-	if (odm->subscene) {
-		char *sep = strchr(sub_url, '#');
-		if (sep && ( !strnicmp(sep, "#LIVE360", 8) || !strnicmp(sep, "#360", 4) || !strnicmp(sep, "#VR", 3) ) ) {
-			sep[0] = 0;
-			odm->subscene->vr_type = 1;
-		}
-		od_type = GF_MEDIA_OBJECT_SCENE;
-	} else if (odm->mo) {
-		od_type = odm->mo->type;
-		if (!sub_url && odm->mo->URLs.count && odm->mo->URLs.vals[0].url) {
-			sub_url = odm->mo->URLs.vals[0].url;
-		}
-	}
-	else od_type = GF_MEDIA_OBJECT_UNDEF;
-
-	/*for remote ODs, get expected OD type in case the service needs to generate the IOD on the fly*/
-	if (odm->parentscene && odm->OD && odm->OD->URLString) {
-		GF_MediaObject *mo;
-		mo = gf_scene_find_object(odm->parentscene, odm->OD->objectDescriptorID, odm->OD->URLString);
-		if (mo) od_type = mo->type;
-		ext = strchr(odm->OD->URLString, '#');
-		if (ext) sub_url = ext;
-	}
-
-	desc = odm->net_service->ifce->GetServiceDescriptor(odm->net_service->ifce, od_type, sub_url);
-
-	/*entry point is already setup (bad design in GPAC, happens with BIFS TS and DASH*/
-	if (odm->OD) {
-		if (!desc) return;
-		if (gf_list_count(odm->OD->ESDescriptors)) {
-			gf_odf_desc_del(desc);
-			return;
-		}
-		gf_odf_desc_del((GF_Descriptor *) odm->OD);
-		odm->OD=NULL;
-		if (odm->subscene)
-			odm->subscene->is_dynamic_scene = GF_FALSE;
-	}
-
-	if (!desc) {
-		if (odm->OD && !gf_list_count(odm->OD->ESDescriptors))
-			return;
-
-		/*if desc is NULL for a media, the media will be declared later by the service (gf_term_media_add)*/
-		if (od_type != GF_MEDIA_OBJECT_SCENE) {
-			if (odm->ambi_ch_id) odm->net_service->serviceID = odm->ambi_ch_id;
-			odm->ambi_ch_id = 0;
-			return;
-		}
-		/*create empty service descriptor, this will automatically create a dynamic scene*/
-		desc = gf_odf_desc_new(GF_ODF_OD_TAG);
-	}
-	odm->flags |= GF_ODM_SERVICE_ENTRY;
-
-	if (!gf_list_count( ((GF_ObjectDescriptor*)desc)->ESDescriptors)) {
-		/*new subscene*/
-		if (!odm->subscene) {
-			assert(odm->parentscene);
-			odm->subscene = gf_scene_new(odm->parentscene);
-			odm->subscene->root_od = odm;
-		}
-	}
-
-	redirect_url = NULL;
-	switch (desc->tag) {
-	case GF_ODF_IOD_TAG:
-	{
-		GF_InitialObjectDescriptor *the_iod = (GF_InitialObjectDescriptor *)desc;
-		odm->OD = (GF_ObjectDescriptor*)gf_malloc(sizeof(GF_ObjectDescriptor));
-		memcpy(odm->OD, the_iod, sizeof(GF_ObjectDescriptor));
-		odm->OD->tag = GF_ODF_OD_TAG;
-		/*Check P&Ls of this IOD*/
-		odm->Audio_PL = the_iod->audio_profileAndLevel;
-		odm->Graphics_PL = the_iod->graphics_profileAndLevel;
-		odm->OD_PL = the_iod->OD_profileAndLevel;
-		odm->Scene_PL = the_iod->scene_profileAndLevel;
-		odm->Visual_PL = the_iod->visual_profileAndLevel;
-		odm->flags |= GF_ODM_HAS_PROFILES;
-		if (the_iod->inlineProfileFlag) odm->flags |= GF_ODM_INLINE_PROFILES;
-		redirect_url = the_iod->URLString;
-		odm->OD->URLString = NULL;
-		gf_odf_desc_del((GF_Descriptor *) the_iod->IPMPToolList);
-		gf_free(the_iod);
-	}
-	break;
-	case GF_ODF_OD_TAG:
-		odm->Audio_PL = odm->Graphics_PL = odm->OD_PL = odm->Scene_PL = odm->Visual_PL = (u8) -1;
-		odm->OD = (GF_ObjectDescriptor *)desc;
-		redirect_url = odm->OD->URLString;
-		odm->OD->URLString = NULL;
-		break;
-	default:
-		gf_term_message(odm->term, odm->net_service->url, "MPEG4 Service Setup Failure", GF_ODF_INVALID_DESCRIPTOR);
-		goto err_exit;
-	}
-
-	gf_odm_setup_object(odm, odm->net_service);
-
-	if (redirect_url && !strnicmp(redirect_url, "views://", 8)) {
-		gf_scene_generate_views(odm->subscene ? odm->subscene : odm->parentscene , (char *) redirect_url + 8, (char*)odm->parentscene ? odm->parentscene->root_od->net_service->url : NULL);
-	}
-	else if (redirect_url && !strnicmp(redirect_url, "mosaic://", 9)) {
-		gf_scene_generate_mosaic(odm->subscene ? odm->subscene : odm->parentscene , (char *) redirect_url + 9, (char*)odm->parentscene ? odm->parentscene->root_od->net_service->url : NULL);
-	}
-	/*it may happen that this object was inserted in a dynamic scene from a service through a URL redirect. In which case,
-	the scene regeneration might not have been completed since the redirection was not done yet - force a scene regenerate*/
-	else if (odm->parentscene && odm->parentscene->is_dynamic_scene) {
-		gf_scene_regenerate(odm->parentscene);
-	}
-
-	gf_free(redirect_url);
-
-	return;
-
-err_exit:
-	if (!odm->parentscene) {
-		GF_Event evt;
-		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = GF_FALSE;
-		gf_term_send_event(odm->term, &evt);
-	}
-	if (redirect_url)
-		gf_free(redirect_url);
-}
-
-
-/*locate ESD by ID*/
-static GF_ESD *od_get_esd(GF_ObjectDescriptor *OD, u16 ESID)
-{
-	GF_ESD *esd;
-	u32 i = 0;
-	while ((esd = (GF_ESD *)gf_list_enum(OD->ESDescriptors, &i)) ) {
-		if (esd->ESID==ESID) return esd;
-	}
-	return NULL;
-}
-
-static void ODM_SelectAlternateStream(GF_ObjectManager *odm, const char *lang_3cc, const char *lang_2cc, u8 stream_type)
-{
-	u32 i;
-	GF_ESD *esd;
-	u16 def_id, es_id;
-	char esCode[4];
-
-	def_id = 0;
-	i=0;
-	while ( (esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
-		if (esd->decoderConfig->streamType != stream_type) continue;
-
-		if (!esd->langDesc) {
-			if (!def_id) def_id = esd->ESID;
-			continue;
-		}
-		esCode[0] = esd->langDesc->langCode>>16;
-		esCode[1] = esd->langDesc->langCode>>8;
-		esCode[2] = esd->langDesc->langCode;
-		esCode[3] = 0;
-		
-		if (!stricmp(esCode, lang_3cc) || !strnicmp(esCode, lang_2cc, 2)) {
-			def_id = esd->ESID;
-			break;
-		} else if (!def_id) {
-			def_id = esd->ESID;
-		}
-	}
-
-	/*remove all other media streams*/
-	i=0;
-	while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
-		if (esd->decoderConfig->streamType != stream_type) continue;
-
-		/*get base stream ID for this stream*/
-		es_id = esd->ESID;
-		if (esd->dependsOnESID && (esd->dependsOnESID != es_id)) {
-			es_id = esd->dependsOnESID;
-			while (es_id) {
-				GF_ESD *base = od_get_esd(odm->OD, es_id);
-				if (!base) break;
-				/*forbidden except for BIFS->OD*/
-				if (base->decoderConfig->streamType != stream_type) break;
-				if (!base->dependsOnESID) break;
-				es_id = base->dependsOnESID;
-			}
-		}
-		/*not part of same object as base, remove*/
-		if (es_id != def_id) {
-			gf_list_del_item(odm->OD->ESDescriptors, esd);
-			gf_odf_desc_del((GF_Descriptor*) esd);
-			i--;
-		}
-	}
-}
-
-/*Validate the streams in this OD, and check if we have to setup an inline scene*/
-GF_Err ODM_ValidateOD(GF_ObjectManager *odm, Bool *hasInline)
-{
-	u32 i;
-	u16 es_id, ck_id;
-	GF_ESD *esd, *base_scene;
-	const char *lang_3cc, *lang_2cc;
-	u32 nb_od, nb_ocr, nb_scene, nb_mp7, nb_ipmp, nb_oci, nb_mpj, nb_other, prev_st;
-
-	nb_od = nb_ocr = nb_scene = nb_mp7 = nb_ipmp = nb_oci = nb_mpj = nb_other = 0;
-	prev_st = 0;
-
-	*hasInline = 0;
-
-	/*step 1: validate OD*/
-	ck_id = 0;
-	i=0;
-	while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i))) {
-		assert(esd->decoderConfig);
-		//force single clock ID in one object
-		if (!ck_id) ck_id = esd->OCRESID;
-		else esd->OCRESID = ck_id;
-
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-			nb_od++;
-			break;
-		case GF_STREAM_OCR:
-			nb_ocr++;
-			break;
-		case GF_STREAM_SCENE:
-			switch (esd->decoderConfig->objectTypeIndication) {
-			case GPAC_OTI_SCENE_AFX:
-			case GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE:
-				break;
-			default:
-				nb_scene++;
-				break;
-			}
-			break;
-		case GF_STREAM_MPEG7:
-			nb_mp7++;
-			break;
-		case GF_STREAM_IPMP:
-			nb_ipmp++;
-			break;
-		case GF_STREAM_OCI:
-			nb_oci++;
-			break;
-		case GF_STREAM_MPEGJ:
-			nb_mpj++;
-			break;
-		case GF_STREAM_PRIVATE_SCENE:
-			nb_scene++;
-			break;
-		/*all other streams shall not be mixed: text, video, audio, interaction, font*/
-		default:
-			if (esd->decoderConfig->streamType!=prev_st) nb_other++;
-			prev_st = esd->decoderConfig->streamType;
-			break;
-		}
-	}
-	/*cf spec on stream aggregation*/
-	if (nb_other>1) return GF_ODF_INVALID_DESCRIPTOR;	/*no more than one base media type*/
-	if (nb_od && !nb_scene) return GF_ODF_INVALID_DESCRIPTOR; /*if OD we must have scene description*/
-	if (nb_other && nb_scene) return GF_ODF_INVALID_DESCRIPTOR; /*scene OR media*/
-	if (nb_ocr>1) return GF_ODF_INVALID_DESCRIPTOR; /*only ONE OCR*/
-	if (nb_oci>1) return GF_ODF_INVALID_DESCRIPTOR; /*only ONE OCI*/
-	if (nb_mp7>1) return GF_ODF_INVALID_DESCRIPTOR; /*only ONE MPEG-7 - this is not in the spec, but since MPEG-7 = OCI++ this seems reasonable*/
-	if (nb_mpj>1) return GF_ODF_INVALID_DESCRIPTOR; /*only ONE MPEG-J - this is not in the spec but well...*/
-
-	/*the rest should be OK*/
-
-	/*select independant streams - check language and (TODO) bitrate & term caps*/
-	lang_3cc = gf_cfg_get_key(odm->term->user->config, "Systems", "Language3CC");
-	if (!lang_3cc) {
-		lang_3cc = "eng";
-		gf_cfg_set_key(odm->term->user->config, "Systems", "Language3CC", "eng");
-		gf_cfg_set_key(odm->term->user->config, "Systems", "Language2CC", "en");
-		gf_cfg_set_key(odm->term->user->config, "Systems", "LanguageName", "English");
-	}
-	lang_2cc = gf_cfg_get_key(odm->term->user->config, "Systems", "Language2CC");
-	if (!lang_2cc) {
-		lang_2cc = "en";
-		gf_cfg_set_key(odm->term->user->config, "Systems", "Language3CC", "eng");
-		gf_cfg_set_key(odm->term->user->config, "Systems", "Language2CC", "en");
-		gf_cfg_set_key(odm->term->user->config, "Systems", "LanguageName", "English");
-	}
-
-	if (gf_list_count(odm->OD->ESDescriptors)>1) {
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_SCENE);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_OD);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_VISUAL);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_AUDIO);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_IPMP);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_INTERACT);
-		ODM_SelectAlternateStream(odm, lang_3cc, lang_2cc, GF_STREAM_TEXT);
-	}
-
-	/*no scene, OK*/
-	if (!nb_scene) return GF_OK;
-
-	/*check if inline or animation stream*/
-	*hasInline = 1;
-	base_scene = NULL;
-	i=0;
-	while ( (esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_PRIVATE_SCENE:
-		case GF_STREAM_SCENE:
-			base_scene = esd;
-			break;
-		default:
-			break;
-		}
-		if (base_scene) break;
-	}
-
-	/*we have a scene stream without dependancies, this is an inline*/
-	if (!base_scene || !base_scene->dependsOnESID) return GF_OK;
-
-	/*if the stream the base scene depends on is in this OD, this is in inline*/
-	es_id = base_scene->dependsOnESID;
-	while (es_id) {
-		esd = od_get_esd(odm->OD, es_id);
-		/*the stream this stream depends on is not in this OD, this is some anim stream*/
-		if (!esd) {
-			*hasInline = 0;
-			return GF_OK;
-		}
-		es_id = esd->dependsOnESID;
-		/*should be forbidden (circular reference), we assume this describes inline (usually wrong BIFS->OD setup)*/
-		if (es_id==base_scene->ESID) break;
-	}
-	/*no dependency to external stream, this is an inline*/
-	return GF_OK;
-}
-
-static Bool gf_odm_should_auto_select(GF_ObjectManager *odm)
-{
-	u32 i, count;
-	if (gf_codec_is_scene_or_image(odm->codec)) return GF_TRUE;
-
-	if (odm->parentscene && !odm->parentscene->is_dynamic_scene) {
-		return GF_TRUE;
-	}
-
-	if (odm->parentscene && odm->parentscene->root_od->addon) {
-		if (odm->parentscene->root_od->addon->addon_type == GF_ADDON_TYPE_MAIN)
-			return GF_FALSE;
-	}
-
-	count = gf_list_count(odm->parentscene->resources);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *an_odm = gf_list_get(odm->parentscene->resources, i);
-		if (an_odm==odm) continue;
-		if (!an_odm->codec) continue;
-		if (an_odm->codec->type != odm->codec->type) continue;
-		//same type - if the first one has been autumatically activated, do not activate this one
-		if (an_odm->state == GF_ODM_STATE_PLAY) return GF_FALSE;
-	}
-	return GF_TRUE;
-}
-
-
-/*connection of OD and setup of streams. The streams are not requested if the OD
-is in an unexecuted state
-the ODM is created either because of IOD / remoteOD, or by the OD codec. In the later
-case, the GF_Scene pointer will be set by the OD codec.*/
-GF_EXPORT
-void gf_odm_setup_object(GF_ObjectManager *odm, GF_ClientService *serv)
-{
-	Bool hasInline;
-	u32 i, numOK;
-	GF_Err e;
-	GF_ESD *esd;
-	GF_MediaObject *syncRef;
-
-	gf_term_lock_net(odm->term, GF_TRUE);
-
-	if (!odm->net_service) {
-		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->OD->objectDescriptorID));
-			gf_term_lock_net(odm->term, GF_FALSE);
-			return;
-		}
-		odm->net_service = serv;
-		assert(odm->OD);
-		if (!odm->OD->URLString)
-			odm->net_service->nb_odm_users++;
-	}
-	/*if this is a remote OD, we need a new manager and a new service...*/
-	assert(odm->OD);
-	if (odm->OD->URLString) {
-		GF_ClientService *parent = odm->net_service;
-		char *url;
-		char *parent_url = NULL;
-		//remote OD not in our service, don't resolve
-		if (odm->OD->ServiceID && odm->parentscene->selected_service_id && (odm->parentscene->selected_service_id!=odm->OD->ServiceID)) {
-			assert(gf_list_find(odm->parentscene->resources, odm) >= 0);
-			odm->net_service->nb_odm_users++;
-			gf_term_lock_net(odm->term, GF_FALSE);
-			return;
-		}
-
-		/*store original OD ID */
-		if (!odm->media_current_time) odm->media_current_time = odm->OD->objectDescriptorID;
-		/*store original serviceID */
-		odm->ambi_ch_id = odm->OD->ServiceID;
-
-		if (odm->OD->RedirectOnly) {
-			url = gf_strdup(odm->OD->URLString);
-			odm->net_service->nb_odm_users++;
-		} else {
-			url = odm->OD->URLString;
-			odm->OD->URLString = NULL;
-
-			gf_odf_desc_del((GF_Descriptor *)odm->OD);
-			odm->OD = NULL;
-			odm->net_service = NULL;
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Object redirection to %s (MO %08x)\n", url, odm->mo));
-
-		/*if object is a scene, create the inline before connecting the object.
-			This is needed in irder 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)) {
-			odm->subscene = gf_scene_new(odm->parentscene);
-			odm->subscene->root_od = odm;
-		}
-		parent_url = parent ? parent->url : NULL;
-		if (parent_url && !strnicmp(parent_url, "views://", 8))
-			parent_url = NULL;
-		else if (parent_url && !strnicmp(parent_url, "mosaic://", 9))
-			parent_url = NULL;
-
-		gf_term_post_connect_object(odm->term, odm, url, parent_url);
-		gf_free(url);
-		gf_term_lock_net(odm->term, GF_FALSE);
-		return;
-	}
-	/*restore OD ID */
-	if (odm->media_current_time) {
-		odm->OD->objectDescriptorID = odm->media_current_time;
-		odm->media_current_time = 0;
-		odm->flags |= GF_ODM_REMOTE_OD;
-		//restore serviceID
-		odm->OD->ServiceID = odm->ambi_ch_id;
-		odm->ambi_ch_id = 0;
-	} else if (!odm->OD->ServiceID) {
-		odm->OD->ServiceID = odm->net_service->serviceID;
-	}
-
-	/*HACK - temp storage of sync ref*/
-	syncRef = (GF_MediaObject*)odm->ocr_codec;
-	odm->ocr_codec = NULL;
-
-	e = ODM_ValidateOD(odm, &hasInline);
-	if (e) {
-		GF_Terminal *term = odm->term;
-		gf_term_message(term, odm->net_service->url, "MPEG-4 Service Error", e);
-		gf_odm_disconnect(odm, GF_TRUE);
-		gf_term_lock_net(term, GF_FALSE);
-		return;
-	}
-
-	if (odm->mo && (odm->mo->type == GF_MEDIA_OBJECT_UPDATES)) {
-		hasInline = GF_TRUE;
-	}
-
-	if (odm->net_service->owner &&  (odm->net_service->owner->flags & GF_ODM_INHERIT_TIMELINE)) {
-		odm->flags |= GF_ODM_INHERIT_TIMELINE;
-	}
-
-	/*if there is a BIFS stream in the OD, we need an GF_Scene (except if we already
-	have one, which means this is the first IOD)*/
-	if (hasInline && !odm->subscene) {
-		odm->subscene = gf_scene_new(odm->parentscene);
-		odm->subscene->root_od = odm;
-	}
-	/*patch for DASH and OD streams: we need to keep track of the original service demuxing the channel, which is not the DASH service*/
-	if (!odm->OD->service_ifce && odm->parentscene) {
-		odm->OD->service_ifce  = odm->parentscene->root_od->OD->service_ifce;
-	}
-
-	numOK = odm->pending_channels = 0;
-	/*empty IOD, use a dynamic scene*/
-	if (!gf_list_count(odm->OD->ESDescriptors) && odm->subscene) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] No streams in object - taking over scene graph generation\n",odm->OD->objectDescriptorID));
-		assert(odm->subscene->root_od==odm);
-		odm->subscene->is_dynamic_scene = GF_TRUE;
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Setting up object streams\n"));
-		/*avoid channels PLAY request when confirming connection (sync network service)*/
-		odm->state = GF_ODM_STATE_IN_SETUP;
-
-		gf_odm_lock(odm, 1);
-		gf_term_lock_net(odm->term, GF_FALSE);
-		i=0;
-		while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
-			e = gf_odm_setup_es(odm, esd, serv, syncRef);
-			/*notify error but still go on, all streams are not so useful*/
-			if (e==GF_OK) {
-				numOK++;
-			} else {
-				gf_term_message(odm->term, odm->net_service->url, "Stream Setup Failure", e);
-			}
-		}
-		if (odm->codec) {
-			GF_CodecCapability cap;
-			cap.CapCode = GF_CODEC_CAN_INIT;
-			cap.cap.valueInt = odm->term->compositor->video_out->max_screen_bpp;
-			gf_codec_set_capability(odm->codec, cap);
-		}
-		gf_term_lock_net(odm->term, GF_TRUE);
-		odm->state = GF_ODM_STATE_STOP;
-		gf_odm_lock(odm, 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_term_lock_net(odm->term, GF_FALSE);
-			gf_scene_setup_object(odm->parentscene, odm);
-			gf_term_lock_net(odm->term, GF_TRUE);
-		}
-
-		/*setup node decoder*/
-		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, 0);
-		}
-
-		gf_term_lock_net(odm->term, GF_FALSE);
-
-		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = GF_TRUE;
-		gf_term_forward_event(odm->term, &evt, GF_FALSE, GF_TRUE);
-
-		gf_term_lock_net(odm->term, GF_TRUE);
-	} else {
-		/*othewise send a connect ack for top level*/
-		GF_Event evt;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Root object connected !\n", odm->net_service->url));
-
-		gf_term_lock_net(odm->term, GF_FALSE);
-
-		evt.type = GF_EVENT_CONNECT;
-		evt.connect.is_connected = GF_TRUE;
-		gf_term_send_event(odm->term, &evt);
-
-		gf_term_lock_net(odm->term, GF_TRUE);
-	}
-
-	/* start object*/
-	/*case 1: object is the root, always start*/
-	if (!odm->parentscene) {
-		assert(odm->subscene == odm->term->root_scene);
-		assert(odm->subscene && (odm->subscene->root_od==odm));
-		odm->flags &= ~GF_ODM_NOT_SETUP;
-		gf_odm_start(odm, 0);
-	}
-	/*case 2: object is a pure OCR object - connect*/
-	else if (odm->ocr_codec) {
-		odm->flags &= ~GF_ODM_NOT_SETUP;
-		gf_odm_start(odm, 0);
-	}
-	/*case 3: if the object is inserted from a broadcast, start it if not already done. This covers cases where the scene (BIFS, LASeR) and
-	the media (images) are both carrouseled and the carrousels are interleaved. If we wait for the scene to trigger a PLAY, we will likely
-	have to wait for an entire image carousel period to start filling the buffers, which is sub-optimal
-	we also force a prefetch for object declared outside the OD stream to make sure we don't loose any data before object declaration and play
-	as can be the case with MPEG2 TS (first video packet right after the PMT) - this should be refined*/
-	else if ( ((odm->flags & GF_ODM_NO_TIME_CTRL) || (odm->flags & GF_ODM_NOT_IN_OD_STREAM)) && gf_odm_should_auto_select(odm) && (odm->parentscene->selected_service_id == odm->OD->ServiceID)) {
-		Bool force_play = GF_FALSE;
-		//since we're about to evaluate the play state, lock the queue
-		gf_term_lock_media_queue(odm->term, GF_TRUE);
-		if (odm->state==GF_ODM_STATE_STOP) {
-			odm->flags |= GF_ODM_PREFETCH;
-			force_play = GF_TRUE;
-		}
-		/*the object could have been queued for play when setting up the scene object. If so, remove from queue and start right away*/
-		else if ((odm->state==GF_ODM_STATE_PLAY) && (gf_list_del_item(odm->term->media_queue, odm)>=0) ) {
-			force_play = GF_TRUE;
-		}
-		gf_term_lock_media_queue(odm->term, GF_FALSE);
-
-		if (force_play) {
-			odm->flags |= GF_ODM_INITIAL_BROADCAST_PLAY;
-			odm->parentscene->selected_service_id = odm->OD->ServiceID;
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] Inserted from input service %s - forcing play\n", odm->OD->objectDescriptorID, odm->net_service->url));
-			odm->flags &= ~GF_ODM_NOT_SETUP;
-			gf_odm_start(odm, 2);
-		}
-	}
-
-	odm->flags &= ~GF_ODM_NOT_SETUP;
-
-	/*for objects inserted by user (subs & co), auto select*/
-	if (odm->parentscene && odm->parentscene->is_dynamic_scene
-	        && (odm->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID)
-	        && (odm->flags & GF_ODM_REMOTE_OD)
-	   ) {
-		GF_Event evt;
-
-		if (odm->addon) {
-			Bool role_set = 0;
-			gf_term_lock_net(odm->term, GF_FALSE);
-
-			if (odm->addon->addon_type >= GF_ADDON_TYPE_MAIN) return;
-
-			//check role - for now look into URL, we need to inspect DASH roles
-			if (odm->mo && odm->mo->URLs.count && odm->mo->URLs.vals[0].url) {
-				char *sep = strchr(odm->mo->URLs.vals[0].url, '?');
-				if (sep && strstr(sep, "role=main")) {
-					odm->addon->addon_type = GF_ADDON_TYPE_MAIN;
-					role_set = 1;
-				}
-			}
-
-			if (!role_set) {
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(GF_NetworkCommand));
-				com.base.command_type = GF_NET_SERVICE_INFO;
-				com.info.on_channel = gf_list_get(odm->channels, 0);
-				gf_term_service_command(odm->net_service, &com);
-
-				if (com.info.role && !strcmp(com.info.role, "main")) {
-					odm->addon->addon_type = GF_ADDON_TYPE_MAIN;
-				}
-			}
-
-
-			if (odm->addon->addon_type == GF_ADDON_TYPE_ADDITIONAL) {
-				gf_scene_select_object(odm->parentscene, odm);
-			}
-			return;
-		}
-
-		if (odm->OD_PL) {
-			gf_scene_select_object(odm->parentscene, odm);
-			odm->OD_PL = 0;
-			gf_term_lock_net(odm->term, GF_FALSE);
-			return;
-		}
-
-		if (odm->parentscene==odm->term->root_scene) {
-			gf_term_lock_net(odm->term, GF_FALSE);
-
-			evt.type = GF_EVENT_STREAMLIST;
-			gf_term_send_event(odm->term,&evt);
-			return;
-		}
-	} else if (odm->codec) {
-		GF_NetworkCommand com;
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.base.command_type = GF_NET_SERVICE_INFO;
-		com.info.on_channel = gf_list_get(odm->channels, 0);
-		gf_term_service_command(odm->net_service, &com);
-
-		if (com.info.role) {
-			if (!strncmp(com.info.role, "ambi", 4)) {
-				odm->ambi_ch_id = atoi(com.info.role + 4);
-				if (odm->ambi_ch_id > odm->parentscene->ambisonic_type)
-					odm->parentscene->ambisonic_type = odm->ambi_ch_id;
-			}
-		}
-	}
-
-	/*if object codec is prefered one, auto select*/
-	if (odm->parentscene && odm->parentscene->is_dynamic_scene
-	        && odm->codec && (odm->codec->oti==odm->term->prefered_audio_codec_oti)
-	        && (odm->parentscene->selected_service_id == odm->OD->ServiceID)
-	   ) {
-		gf_scene_select_object(odm->parentscene, odm);
-	}
-
-	gf_term_lock_net(odm->term, GF_FALSE);
-}
-
-
-
-void ODM_CheckChannelService(GF_Channel *ch)
-{
-	if (ch->service == ch->odm->net_service) return;
-	/*if the stream has created a service check if close is needed or not*/
-	if (ch->esd->URLString && !ch->service->nb_ch_users)
-		gf_term_close_service(ch->odm->term, ch->service);
-}
-
-/*setup channel, clock and query caps*/
-GF_EXPORT
-GF_Err gf_odm_setup_es(GF_ObjectManager *odm, GF_ESD *esd, GF_ClientService *serv, GF_MediaObject *sync_ref)
-{
-	GF_Channel *ch;
-	GF_Clock *ck;
-	GF_List *ck_namespace;
-	GF_Codec *dec;
-	s8 flag;
-	u16 clockID;
-	Bool emulated_od = 0;
-	GF_Err e;
-	GF_Scene *scene;
-	Bool clock_inherited = GF_TRUE;
-
-	/*find the clock for this new channel*/
-	ck = NULL;
-	flag = (s8) -1;
-
-	/*sync reference*/
-	if (sync_ref && sync_ref->odm && sync_ref->odm->codec) {
-		ck = sync_ref->odm->codec->ck;
-		goto clock_setup;
-	}
-	/*timeline override*/
-	if (odm->flags & GF_ODM_INHERIT_TIMELINE) {
-		if (odm->parentscene->root_od->subscene->scene_codec) {
-			ck = odm->parentscene->root_od->subscene->scene_codec->ck;
-		} else {
-			ck = odm->parentscene->root_od->subscene->dyn_ck;
-		}
-		/**/
-		if (!ck) {
-			GF_ObjectManager *odm_par = odm->parentscene->root_od->parentscene->root_od;
-			while (odm_par) {
-				if (odm_par->subscene->scene_codec)
-					ck = odm_par->subscene->scene_codec->ck;
-				else
-					ck = odm_par->subscene->dyn_ck;
-
-				if (ck) break;
-
-				odm_par = (odm_par->parentscene && odm_par->parentscene->root_od->parentscene ) ? odm_par->parentscene->root_od->parentscene->root_od : NULL;
-			}
-		}
-		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->net_service->url));
-	}
-
-	/*get clocks namespace (eg, parent scene)*/
-	scene = odm->subscene ? odm->subscene : odm->parentscene;
-	if (!scene) return GF_BAD_PARAM;
-
-	ck_namespace = odm->net_service->Clocks;
-	odm->set_speed = odm->net_service->set_speed;
-
-	/*little trick for non-OD addressing: if object is a remote one, and service owner already has clocks,
-	override OCR. This will solve addressing like file.avi#audio and file.avi#video*/
-	if (!esd->OCRESID && (odm->flags & GF_ODM_REMOTE_OD) && (gf_list_count(ck_namespace)==1) ) {
-		ck = (GF_Clock*)gf_list_get(ck_namespace, 0);
-		esd->OCRESID = ck->clockID;
-	}
-	/*for dynamic scene, force all streams to be sync on main OD stream (one timeline, no need to reload ressources)*/
-	else if (odm->parentscene && odm->parentscene->is_dynamic_scene && !odm->subscene) {
-		GF_ObjectManager *parent_od = odm->parentscene->root_od;
-		if (parent_od->net_service && (gf_list_count(parent_od->net_service->Clocks)==1)) {
-			ck = (GF_Clock*)gf_list_get(parent_od->net_service->Clocks, 0);
-			if (!odm->OD->ServiceID || (odm->OD->ServiceID==ck->service_id)) {
-				esd->OCRESID = ck->clockID;
-				goto clock_setup;
-			}
-		}
-	}
-
-	/*do we have an OCR specified*/
-	clockID = esd->OCRESID;
-	/*if OCR stream force self-synchro !!*/
-	if (esd->decoderConfig->streamType==GF_STREAM_OCR) clockID = esd->ESID;
-	if (!clockID) {
-		/*if no clock ID but dependency, force the clock to be the base layer for AV but not systems (animation streams, ..)*/
-		if ((esd->decoderConfig->streamType==GF_STREAM_VISUAL) || (esd->decoderConfig->streamType==GF_STREAM_AUDIO)) clockID = esd->dependsOnESID;
-		if (!clockID) clockID = esd->ESID;
-	}
-
-	/*override clock dependencies if specified*/
-	if (odm->term->flags & GF_TERM_SINGLE_CLOCK) {
-		if (scene->scene_codec) {
-			clockID = scene->scene_codec->ck->clockID;
-		} else if (scene->od_codec) {
-			clockID = scene->od_codec->ck->clockID;
-		}
-		ck_namespace = odm->term->root_scene->root_od->net_service->Clocks;
-	}
-	/*if the GF_Clock is the stream, check if we have embedded OCR in the stream...*/
-	if (clockID == esd->ESID) {
-		flag = (esd->slConfig && esd->slConfig->OCRLength);
-	}
-
-	if (!esd->slConfig) {
-		esd->slConfig = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-		esd->slConfig->timestampResolution = 1000;
-	}
-
-	ck = gf_clock_attach(ck_namespace, scene, clockID, esd->ESID, flag);
-	if (!ck) return GF_OUT_OF_MEM;
-	esd->OCRESID = ck->clockID;
-	ck->service_id = odm->OD->ServiceID;
-	clock_inherited = GF_FALSE;
-	/*special case for non-dynamic scenes forcing clock share of all subscene, we assign the
-	parent scene clock to the first clock created in the sunscenes*/
-	if (scene->root_od->parentscene && scene->root_od->parentscene->force_single_timeline && !scene->root_od->parentscene->dyn_ck)
-		scene->root_od->parentscene->dyn_ck = ck;
-
-clock_setup:
-	/*create a channel for this stream*/
-	ch = gf_es_new(esd);
-	if (!ch) return GF_OUT_OF_MEM;
-	ch->clock = ck;
-	ch->service = serv;
-	ch->clock_inherited = clock_inherited;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM] Creating codec for stream %d\n", ch->esd->ESID));
-
-	/*setup the decoder for this stream or find the existing one.*/
-	e = GF_OK;
-	dec = NULL;
-	switch (esd->decoderConfig->streamType) {
-	case GF_STREAM_OD:
-		//OD - MUST be in inline
-		if (!odm->subscene) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			break;
-		}
-		/*OD codec acts as main scene codec when used to generate scene graph*/
-		if (! odm->subscene->od_codec) {
-			odm->subscene->od_codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-			if (!e) gf_term_add_codec(odm->term, odm->subscene->od_codec);
-		}
-		dec = odm->subscene->od_codec;
-		break;
-	case GF_STREAM_OCR:
-		/*OD codec acts as main scene codec when used to generate scene graph*/
-		dec = odm->ocr_codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-		if (!e) gf_term_add_codec(odm->term, odm->ocr_codec);
-		break;
-	case GF_STREAM_SCENE:
-		/*animationStream */
-		if (!odm->subscene) {
-			if (!odm->codec) {
-				odm->codec = gf_codec_new(odm, esd, odm->Scene_PL, &e);
-				if (!e) gf_term_add_codec(odm->term, odm->codec);
-			}
-			dec = odm->codec;
-		}
-		/*inline scene*/
-		else {
-			if (! odm->subscene->scene_codec) {
-				odm->subscene->scene_codec = gf_codec_new(odm, esd, odm->Scene_PL, &e);
-				if (!e) gf_term_add_codec(odm->term, odm->subscene->scene_codec);
-			}
-			dec = odm->subscene->scene_codec;
-		}
-		break;
-#ifndef GPAC_MINIMAL_ODF
-	case GF_STREAM_OCI:
-		/*OCI - only one per OD */
-		if (odm->oci_codec) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-		} else {
-			odm->oci_codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-			odm->oci_codec->odm = odm;
-			if (!e) gf_term_add_codec(odm->term, odm->oci_codec);
-		}
-		break;
-#endif
-
-	case GF_STREAM_AUDIO:
-	case GF_STREAM_VISUAL:
-		/*we have a media or user-specific codec...*/
-		if (!odm->codec) {
-			odm->codec = gf_codec_new(odm, esd, (esd->decoderConfig->streamType==GF_STREAM_VISUAL) ? odm->Visual_PL : odm->Audio_PL, &e);
-			if (!e && odm->codec) gf_term_add_codec(odm->term, odm->codec);
-		}
-		dec = odm->codec;
-		break;
-
-		/*interaction stream*/
-#ifndef GPAC_DISABLE_VRML
-	case GF_STREAM_INTERACT:
-		if (!odm->codec) {
-			odm->codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-			if (!e) {
-				gf_isdec_configure(odm->codec->decio, odm->parentscene, esd->URLString ? 1 : 0);
-				gf_term_add_codec(odm->term, odm->codec);
-				/*register it*/
-				gf_list_add(odm->term->input_streams, odm->codec);
-			}
-		}
-		dec = odm->codec;
-		if ((esd->ESID==esd->OCRESID) &&(esd->ESID>=65530)) {
-			emulated_od = 1;
-		}
-		break;
-#endif
-
-	case GF_STREAM_PRIVATE_SCENE:
-		if (odm->subscene) {
-			assert(!odm->subscene->scene_codec);
-			odm->subscene->scene_codec = gf_codec_new(odm, esd, odm->Scene_PL, &e);
-			if (odm->subscene->scene_codec) {
-				gf_term_add_codec(odm->term, odm->subscene->scene_codec);
-			}
-			dec = odm->subscene->scene_codec;
-		} else {
-			/*this is a bit tricky: the scene decoder needs to be called with the dummy streams of this
-			object, so we associate the main decoder to this object*/
-			odm->codec = dec = gf_codec_use_codec(odm->parentscene->scene_codec, odm);
-			gf_term_add_codec(odm->term, odm->codec);
-		}
-		break;
-	/*all other cases*/
-	default:
-		if (!odm->codec) {
-			odm->codec = gf_codec_new(odm, esd, odm->OD_PL, &e);
-			if (!e && odm->codec) gf_term_add_codec(odm->term, odm->codec);
-
-		}
-		dec = odm->codec;
-		break;
-	}
-
-	if (!dec && e) {
-		gf_es_del(ch);
-		return e;
-	}
-
-	/*setup scene decoder*/
-	if (dec && dec->decio && (dec->decio->InterfaceType==GF_SCENE_DECODER_INTERFACE) ) {
-		GF_SceneDecoder *sdec = (GF_SceneDecoder *) dec->decio;
-		scene = odm->subscene ? odm->subscene : odm->parentscene;
-		if (sdec->AttachScene) {
-			/*if a node asked for this media object, use the scene graph of the node (AnimationStream in PROTO)*/
-			if (odm->mo && odm->mo->node_ptr) {
-				GF_SceneGraph *sg = scene->graph;
-				/*FIXME - this MUST be cleaned up*/
-				scene->graph = gf_node_get_graph((GF_Node*)odm->mo->node_ptr);
-				sdec->AttachScene(sdec, scene, (scene->scene_codec==dec) ? 1: 0);
-				scene->graph = sg;
-				odm->mo->node_ptr = NULL;
-			} else {
-				sdec->AttachScene(sdec, scene, (scene->scene_codec==dec) ? 1: 0);
-			}
-		}
-	}
-
-	ch->es_state = GF_ESM_ES_SETUP;
-	ch->odm = odm;
-
-	if (dec) {
-		GF_CodecCapability cap;
-		cap.CapCode = GF_CODEC_RAW_MEDIA;
-		gf_codec_get_capability(dec, &cap);
-		if (cap.cap.valueInt) {
-			dec->flags |= GF_ESM_CODEC_IS_RAW_MEDIA;
-			dec->process = gf_codec_process_private_media;
-		}
-
-		/*get media padding BEFORE channel setup, since we use it on channel connect ack*/
-		cap.CapCode = GF_CODEC_PADDING_BYTES;
-		gf_codec_get_capability(dec, &cap);
-		ch->media_padding_bytes = cap.cap.valueInt;
-
-		cap.CapCode = GF_CODEC_RESILIENT;
-		gf_codec_get_capability(dec, &cap);
-		ch->codec_resilient = cap.cap.valueInt;
-	}
-
-	if (emulated_od) {
-		ch->service = NULL;
-	}
-
-	/*one more channel to wait for*/
-	odm->pending_channels++;
-
-	/*service redirection*/
-	if (esd->URLString) {
-		GF_ChannelSetup *cs;
-		/*here we have a pb with the MPEG4 model: streams are supposed to be attachable as soon as the OD
-		update is received, but this is not true with ESD URLs, where service setup may take some time (file
-		downloading, authentification, etc...). We therefore need to wait for the service connect response before
-		setting up the channel...*/
-		cs = (GF_ChannelSetup*)gf_malloc(sizeof(GF_ChannelSetup));
-		cs->ch = ch;
-		cs->dec = dec;
-
-		/*HACK: special case when OD resources are statically described in the ESD itself (ISMA streaming)*/
-		if (dec && (ch->esd->decoderConfig->streamType==GF_STREAM_OD) && strstr(ch->esd->URLString, "data:application/mpeg4-od-au;") )
-			dec->flags |= GF_ESM_CODEC_IS_STATIC_OD;
-
-		gf_term_lock_net(odm->term, 1);
-		gf_list_add(odm->term->channels_pending, cs);
-		e = gf_term_connect_remote_channel(odm->term, ch, esd->URLString);
-		if (e) {
-			s32 i = gf_list_find(odm->term->channels_pending, cs);
-			if (i>=0) {
-				gf_list_rem(odm->term->channels_pending, (u32) i);
-				gf_free(cs);
-				odm->pending_channels--;
-				ODM_CheckChannelService(ch);
-				gf_es_del(ch);
-			}
-		}
-		gf_term_lock_net(odm->term, 0);
-		if (ch->service->owner) {
-			gf_list_del_item(odm->term->channels_pending, cs);
-			gf_free(cs);
-			return gf_odm_post_es_setup(ch, dec, GF_OK);
-		}
-		return e;
-	}
-
-	/*regular setup*/
-	return gf_odm_post_es_setup(ch, dec, GF_OK);
-}
-
-GF_Err gf_odm_post_es_setup(GF_Channel *ch, GF_Codec *dec, GF_Err had_err)
-{
-	char szURL[2048];
-	GF_Err e;
-	GF_NetworkCommand com;
-
-	e = had_err;
-	if (e) {
-		ch->odm->pending_channels--;
-		goto err_exit;
-	}
-
-	/*insert channel*/
-	gf_list_insert(ch->odm->channels, ch, 0);
-
-	if (ch->service) {
-		ch->es_state = GF_ESM_ES_WAIT_FOR_ACK;
-		if (ch->esd->URLString) {
-			strcpy(szURL, ch->esd->URLString);
-		} else {
-			sprintf(szURL, "ES_ID=%u", ch->esd->ESID);
-		}
-
-		/*connect before setup: this is needed in case the decoder cfg is wrong, we may need to get it from
-		network config...*/
-		e = ch->service->ifce->ConnectChannel(ch->service->ifce, ch, szURL, ch->esd->decoderConfig->upstream);
-
-		/*special case (not really specified in specs ...): if the stream is not found and is an Interaction
-		one (ie, used by an InputSensor), consider this means the stream shall be generated by the IS device*/
-		if ((e==GF_STREAM_NOT_FOUND) && (ch->esd->decoderConfig->streamType==GF_STREAM_INTERACT)) e = GF_OK;
-	} else {
-		ch->es_state = GF_ESM_ES_CONNECTED;
-		ch->odm->pending_channels--;
-	}
-
-	if (e) {
-		if (dec) gf_list_rem(ch->odm->channels, 0);
-		goto err_exit;
-	}
-	/*add to decoder*/
-	if (dec) {
-		e = gf_codec_add_channel(dec, ch);
-		if (e) {
-			switch (ch->esd->decoderConfig->streamType) {
-			case GF_STREAM_VISUAL:
-				gf_term_message(ch->odm->term, ch->service->url, "Video Setup failed", e);
-				break;
-			case GF_STREAM_AUDIO:
-				gf_term_message(ch->odm->term, ch->service->url, "Audio Setup failed", e);
-				break;
-			}
-			gf_list_del_item(ch->odm->channels, ch);
-			/*disconnect*/
-			ch->service->ifce->DisconnectChannel(ch->service->ifce, ch);
-			if (ch->esd->URLString) {
-				assert(ch->service->nb_ch_users);
-				ch->service->nb_ch_users--;
-			}
-			goto err_exit;
-		}
-	}
-
-	/*in case a channel is inserted in a running OD, open and play if not in queue*/
-	if (ch->odm->state==GF_ODM_STATE_PLAY) {
-
-		gf_term_lock_media_queue(ch->odm->term, 1);
-		gf_list_del_item(ch->odm->term->media_queue, ch->odm);
-		gf_term_lock_media_queue(ch->odm->term, 1);
-
-
-		gf_term_lock_net(ch->odm->term, 1);
-		gf_es_start(ch);
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		com.command_type = GF_NET_CHAN_PLAY;
-		com.base.on_channel = ch;
-		com.play.speed = FIX2FLT(ch->clock->speed);
-		com.play.start_range = gf_clock_time(ch->clock);
-		com.play.start_range /= 1000;
-		com.play.end_range = 0;
-		gf_term_service_command(ch->service, &com);
-		if (dec && (dec->Status!=GF_ESM_CODEC_PLAY)) gf_term_start_codec(dec, 0);
-		gf_term_lock_net(ch->odm->term, 0);
-	}
-	return GF_OK;
-
-err_exit:
-	ODM_CheckChannelService(ch);
-	gf_es_del(ch);
-	return e;
-}
-
-/*confirmation of channel delete from net*/
-void ODM_DeleteChannel(GF_ObjectManager *odm, GF_Channel *ch)
-{
-	u32 i, count, ch_pos;
-	GF_Channel *ch2;
-	GF_Clock *ck;
-
-	if (!ch) return;
-	assert( odm );
-	assert( odm->channels );
-
-	//find a clock with this stream ES_ID
-	ck = gf_clock_find(odm->net_service->Clocks, ch->esd->ESID, 0);
-
-	count = gf_list_count(odm->channels);
-	ch_pos = count+1;
-
-	for (i=0; i<count; i++) {
-		ch2 = (GF_Channel*)gf_list_get(odm->channels, i);
-		if (ch2 == ch) {
-			ch_pos = i;
-			if (ck) continue;
-			break;
-		}
-		//note that when a stream is added, we need to update clocks info ...
-		if (ck && ch->clock && (ch2->clock->clockID == ck->clockID)) gf_es_stop(ch2);
-	}
-	/*remove channel*/
-	if (ch_pos != count+1) gf_list_rem(odm->channels, ch_pos);
-
-	/*remove from the codec*/
-	count = 0;
-	if (!count && odm->codec)
-		count = gf_codec_remove_channel(odm->codec, ch);
-	if (!count && odm->ocr_codec)
-		count = gf_codec_remove_channel(odm->ocr_codec, ch);
-#ifndef GPAC_MINIMAL_ODF
-	if (!count && odm->oci_codec)
-		count = gf_codec_remove_channel(odm->oci_codec, ch);
-#endif
-	if (!count && odm->subscene) {
-		if (odm->subscene->scene_codec) count = gf_codec_remove_channel(odm->subscene->scene_codec, ch);
-		if (!count) /*count = */gf_codec_remove_channel(odm->subscene->od_codec, ch);
-	}
-	if (ch->service) {
-		ch->service->ifce->DisconnectChannel(ch->service->ifce, ch);
-		if (ch->esd->URLString) {
-			assert(ch->service->nb_ch_users);
-			ch->service->nb_ch_users--;
-		}
-		ODM_CheckChannelService(ch);
-	}
-
-	//and delete
-	gf_es_del(ch);
-}
-
-GF_EXPORT
-void gf_odm_remove_es(GF_ObjectManager *odm, u16 ES_ID)
-{
-	GF_ESD *esd;
-	GF_Channel *ch;
-	u32 i = 0;
-	while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i)) ) {
-		if (esd->ESID==ES_ID) goto esd_found;
-	}
-	return;
-
-esd_found:
-	/*remove esd*/
-	gf_list_rem(odm->OD->ESDescriptors, i-1);
-	/*locate channel*/
-	ch = NULL;
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		if (ch->esd->ESID == ES_ID) break;
-		ch = NULL;
-	}
-	/*remove channel*/
-	if (ch) ODM_DeleteChannel(odm, ch);
-	/*destroy ESD*/
-	gf_odf_desc_del((GF_Descriptor *) esd);
-}
-
-/*this is the tricky part: make sure the net is locked before doing anything since an async service
-reply could destroy the object we're queuing for play*/
-void gf_odm_start(GF_ObjectManager *odm, u32 media_queue_state)
-{
-	Bool skip_register = 1;
-	gf_term_lock_media_queue(odm->term, 1);
-
-	if (odm->flags & GF_ODM_NOT_SETUP) {
-		gf_term_lock_media_queue(odm->term, 0);
-		return;
-	}
-
-
-	/*only if not open & ready (not waiting for ACK on channel setup)*/
-	if (!odm->pending_channels && odm->OD) {
-		/*object is not started - issue channel setup requests*/
-		if (!odm->state) {
-			GF_Channel *ch;
-			u32 i = 0;
-			odm->state = GF_ODM_STATE_PLAY;
-
-			/*look for a given segment name to play*/
-			if (odm->subscene) {
-				char *url, *frag;
-				assert(odm->subscene->root_od==odm);
-
-				url = (odm->mo && odm->mo->URLs.count) ? odm->mo->URLs.vals[0].url : odm->net_service->url;
-				frag = strrchr(url, '#');
-				if (frag) {
-					GF_Segment *seg = gf_odm_find_segment(odm, frag+1);
-					if (seg) {
-						odm->media_start_time = (u64) ((s64) seg->startTime*1000);
-						odm->media_stop_time =  (u64) ((s64) (seg->startTime + seg->Duration)*1000);
-					}
-				}
-			}
-
-			/*start all channels and postpone play - this assures that all channels of a multiplexed are setup
-			before one starts playing*/
-			while ( (ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-				gf_es_start(ch);
-				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] CH%d: At OTB %u starting channel\n", odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_time(ch->clock)));
-			}
-			skip_register = 0;
-
-		}
-		//do not issue a play request, wait for end of setup
-		else if (odm->state==GF_ODM_STATE_IN_SETUP) {
-			media_queue_state=0;
-			skip_register = 1;
-		}
-		/*object is already started - only reinsert in media queue if this function was called on an object already in the queue*/
-		else {
-			skip_register = media_queue_state ? 0 : 1;
-		}
-
-		if (media_queue_state==2) {
-			odm->action_type = GF_ODM_ACTION_PLAY;
-			gf_term_lock_media_queue(odm->term, 0);
-			gf_odm_play(odm);
-			gf_term_lock_media_queue(odm->term, 1);
-		} else if (!skip_register && (gf_list_find(odm->term->media_queue, odm)<0)) {
-			odm->action_type = GF_ODM_ACTION_PLAY;
-			assert(! (odm->flags & GF_ODM_DESTROYED));
-			gf_list_add(odm->term->media_queue, odm);
-		}
-	}
-
-#if 0
-	/*reset CB to stop state, otherwise updating a texture between gf_odm_start and gf_odm_play might trigger an end of stream*/
-	if (odm->codec && odm->codec->CB) {
-		gf_cm_set_status(odm->codec->CB, CB_STOP);
-		odm->codec->CB->HasSeenEOS = 0;
-	}
-#endif
-
-	gf_term_lock_media_queue(odm->term, 0);
-}
-
-void gf_odm_play(GF_ObjectManager *odm)
-{
-	GF_Channel *ch;
-	u32 i;
-	u32 nb_failure;
-	u64 range_end;
-	Bool skip_od_st;
-	Bool media_control_paused = 0;
-	Bool start_range_is_clock = 0;
-	GF_NetworkCommand com;
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-#endif
-	GF_Clock *parent_ck = NULL;
-	
-	if (odm->codec && odm->codec->CB && !(odm->flags & GF_ODM_PREFETCH)) {
-		/*reset*/
-		gf_cm_set_status(odm->codec->CB, CB_STOP);
-		odm->codec->CB->HasSeenEOS = 0;
-	}
-	odm->flags &= ~GF_ODM_PREFETCH;
-
-
-	if (odm->parentscene) {
-		parent_ck = gf_odm_get_media_clock(odm->parentscene->root_od);
-		if (!gf_odm_shares_clock(odm, parent_ck)) parent_ck = NULL;
-	}
-
-	skip_od_st = (odm->subscene && odm->subscene->static_media_ressources) ? 1 : 0;
-	range_end = odm->media_stop_time;
-//	odm->media_stop_time = 0;
-
-	nb_failure = gf_list_count(odm->channels);
-
-	/*send play command*/
-	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_PLAY;
-
-	if (odm->flags & GF_ODM_INITIAL_BROADCAST_PLAY) {
-		odm->flags &= ~GF_ODM_INITIAL_BROADCAST_PLAY;
-		com.play.initial_broadcast_play = 1;
-	}
-
-
-	i=0;
-	while ( (ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		Double ck_time;
-
-		if (ch->ipmp_tool) {
-			GF_IPMPEvent evt;
-			GF_Err e;
-			memset(&evt, 0, sizeof(evt));
-			evt.event_type=GF_IPMP_TOOL_GRANT_ACCESS;
-			evt.channel = ch;
-			e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-			if (e) {
-				gf_term_message(odm->term, NULL, "PLAY access is not granted on channel - please check your license", e);
-				gf_es_stop(ch);
-				continue;
-			}
-		}
-		nb_failure --;
-
-		com.base.on_channel = ch;
-		com.play.speed = 1.0;
-
-		/*play from requested time (seeking or non-mpeg4 media control)*/
-		if (odm->media_start_time && !ch->clock->clock_init) {
-			ck_time = (Double) (s64) odm->media_start_time;
-			ck_time /= 1000;
-		}
-		else if (odm->parentscene && odm->parentscene->root_od->media_start_time && !ch->clock->clock_init) {
-			ck_time = (Double) (s64) odm->parentscene->root_od->media_start_time;
-			ck_time /= 1000;
-		}
-		/*play from current time*/
-		else {
-			ck_time = gf_clock_media_time(ch->clock);
-			ck_time /= 1000;
-			start_range_is_clock = 1;
-		}
-
-		/*handle initial start - MPEG-4 is a bit annoying here, streams are not started through OD but through
-		scene nodes. If the stream runs on the BIFS/OD clock, the clock is already started at this point and we're
-		sure to get at least a one-frame delay in PLAY, so just remove it - note we're generous but this shouldn't hurt*/
-		if (ck_time<=0.5) ck_time = 0;
-
-
-		/*adjust time for addons*/
-		if (odm->parentscene && odm->parentscene->root_od->addon) {
-			com.play.initial_broadcast_play = 0;
-			//addon timing is resolved against timestamps, not media time
-			if (start_range_is_clock) {
-				if (!gf_clock_is_started(ch->clock)) {
-					ck_time = (Double) odm->parentscene->root_od->addon->media_pts;
-					ck_time /= 90000;
-				} else {
-					ck_time = gf_clock_time(ch->clock);
-					ck_time /= 1000;
-				}
-			}
-			ck_time = gf_scene_adjust_time_for_addon(odm->parentscene->root_od->addon, ck_time, &com.play.timestamp_based);
-			//we are having a play request for an addon without the main content being active - we no longer have timestamp info from the main content
-			if (!ch->clock->clock_init && com.play.timestamp_based)
-				com.play.timestamp_based = 2;
-
-			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;
-
-		if (range_end) {
-			com.play.end_range = (s64) range_end / 1000.0;
-		} else {
-			if (!odm->subscene && odm->parentscene && gf_odm_shares_clock(odm->parentscene->root_od, ch->clock)
-			        && (odm->parentscene->root_od->media_stop_time != odm->parentscene->root_od->duration)
-			   ) {
-				com.play.end_range = (s64) odm->parentscene->root_od->media_stop_time / 1000.0;
-			} else {
-				com.play.end_range = 0;
-			}
-		}
-
-		com.play.speed = ch->clock->speed;
-
-#ifndef GPAC_DISABLE_VRML
-		ctrl = parent_ck ? parent_ck->mc : gf_odm_get_mediacontrol(odm);
-		/*override range and speed with MC*/
-		if (ctrl && !odm->disable_buffer_at_next_play) {
-			//for addon, use current clock settings (media control is ignored)
-			if (!odm->parentscene || !odm->parentscene->root_od->addon) {
-				//this is fake timeshift, eg we are playing a VoD as a timeshift service: stop and start times have already been adjusted
-				if (ctrl->control->mediaStopTime<0 && !odm->timeshift_depth) {
-				} else {
-					MC_GetRange(ctrl, &com.play.start_range, &com.play.end_range);
-				}
-			}
-
-			com.play.speed = FIX2FLT(ctrl->control->mediaSpeed);
-			/*if the channel doesn't control the clock, jump to current time in the controled range, not just the beginning*/
-			if ((ch->esd->ESID!=ch->clock->clockID) && (ck_time>com.play.start_range) && (com.play.end_range>com.play.start_range) && (ck_time<com.play.end_range)) {
-				com.play.start_range = ck_time;
-			}
-			if (ctrl->paused) media_control_paused = 1;
-
-			gf_clock_set_speed(ch->clock, ctrl->control->mediaSpeed);
-			if (odm->mo) odm->mo->speed = ctrl->control->mediaSpeed;
-
-#if 0
-			/*if requested seek time AND media control, adjust start range to current play time*/
-			if ((com.play.speed>=0) && odm->media_start_time) {
-				if ((com.play.start_range>=0) && (com.play.end_range>com.play.start_range)) {
-					if (ctrl->control->loop) {
-						Double active_dur = com.play.end_range - com.play.start_range;
-						while (ck_time>active_dur) ck_time -= active_dur;
-					} else {
-						ck_time = 0;
-						//com.play.start_range = com.play.end_range;
-					}
-				}
-				com.play.start_range += ck_time;
-			}
-#endif
-
-		}
-#endif
-
-		/*full object playback*/
-		if (com.play.end_range<=0) {
-			if (com.play.speed<0) {
-				odm->media_stop_time = 0;
-			} else {
-				odm->media_stop_time = odm->subscene ? 0 : odm->duration;
-			}
-		} else {
-			/*segment playback - since our timing is in ms whereas segment ranges are double precision,
-			make sure we have a LARGER range in ms, otherwise media sensors won't deactivate properly*/
-			odm->media_stop_time = (u64) ceil(1000 * com.play.end_range);
-		}
-
-		/*don't replay OD channel, only init clock if needed*/
-		if (!ch->service || (skip_od_st && (ch->esd->decoderConfig->streamType==GF_STREAM_OD))) {
-			Bool gf_es_owns_clock(GF_Channel *ch);
-
-			if (gf_es_owns_clock(ch) )
-				gf_clock_set_time(ch->clock, (u32) (com.play.start_range*1000));
-
-			ch->IsClockInit = 1;
-			if (ch->BufferOn) {
-				ch->BufferOn = 0;
-				gf_clock_buffer_off(ch->clock);
-			}
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting PLAY from %g to %g (clock init %d) - speed %g\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock), com.play.start_range, com.play.end_range, ch->clock->clock_init, com.play.speed));
-			gf_term_service_command(ch->service, &com);
-		}
-	}
-//	odm->media_start_time = 0;
-
-	if (odm->parentscene && odm->parentscene->root_od->addon) {
-		odm->parentscene->root_od->addon->started = 1;
-	}
-	if (nb_failure) {
-		odm->state = GF_ODM_STATE_BLOCKED;
-		odm->disable_buffer_at_next_play = GF_FALSE;
-		return;
-	}
-
-	gf_term_service_media_event(odm, GF_EVENT_MEDIA_LOAD_START);
-	gf_term_service_media_event(odm, GF_EVENT_MEDIA_TIME_UPDATE);
-
-
-	/*start codecs last (otherwise we end up pulling data from channels not yet connected->pbs when seeking)*/
-	if (odm->codec) {
-		gf_term_start_codec(odm->codec, 0);
-	} else if (odm->subscene) {
-		if (odm->subscene->scene_codec) gf_term_start_codec(odm->subscene->scene_codec, 0);
-		if (!skip_od_st && odm->subscene->od_codec) gf_term_start_codec(odm->subscene->od_codec, 0);
-
-		if (odm->flags & GF_ODM_REGENERATE_SCENE) {
-			odm->flags &= ~GF_ODM_REGENERATE_SCENE;
-			if (!odm->subscene->graph_attached)
-				gf_scene_regenerate(odm->subscene);
-			else
-				gf_scene_restart_dynamic(odm->subscene, 0, 1, 0);
-		}
-	}
-	if (odm->ocr_codec) gf_term_start_codec(odm->ocr_codec, 0);
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) gf_term_start_codec(odm->oci_codec, 0);
-#endif
-
-	odm->disable_buffer_at_next_play = GF_FALSE;
-
-	if (odm->flags & GF_ODM_PAUSE_QUEUED) {
-		odm->flags &= ~GF_ODM_PAUSE_QUEUED;
-		media_control_paused = 1;
-	}
-
-	if (odm->term->root_scene) {
-		if (odm->term->root_scene->first_frame_pause_type) {
-			media_control_paused = GF_TRUE;
-		}
-	}
-
-	if ((odm->codec || odm->subscene) && media_control_paused) {
-		gf_odm_pause(odm);
-	}
-}
-
-Bool gf_odm_owns_clock(GF_ObjectManager *odm, GF_Clock *ck)
-{
-	u32 i, j;
-	GF_ObjectManager *od;
-	GF_Channel *ch;
-	i=0;
-	while ((ch = gf_list_enum(odm->channels, &i))) {
-		if (ch->esd->ESID==ck->clockID) return 1;
-	}
-	j=0;
-	while ((od = gf_list_enum(odm->subscene->resources, &j))) {
-		i=0;
-		while ((ch = gf_list_enum(od->channels, &i))) {
-			if (ch->esd->ESID==ck->clockID) return 1;
-		}
-	}
-	return 0;
-}
-
-void gf_odm_stop(GF_ObjectManager *odm, Bool force_close)
-{
-	GF_Channel *ch;
-	u32 i;
-#ifndef GPAC_DISABLE_VRML
-	MediaControlStack *ctrl;
-	MediaSensorStack *media_sens;
-#endif
-
-	GF_NetworkCommand com;
-	//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 0
-	/*Handle broadcast environment, do not stop the object if no time control and instruction
-	comes from the scene*/
-	if (odm->no_time_ctrl && !force_close) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d] - broadcast detected, ignoring Stop from scene\n", odm->OD->objectDescriptorID);
-		       return;
-	}
-#endif
-
-
-	gf_term_lock_media_queue(odm->term, 1);
-	gf_list_del_item(odm->term->media_queue, odm);
-	gf_term_lock_media_queue(odm->term, 0);
-
-	/*little opt for image codecs: don't actually stop the OD*/
-	if (!force_close && odm->codec && odm->codec->CB && !odm->codec->CB->no_allocation) {
-		if (odm->codec->CB->Capacity==1) {
-			gf_cm_abort_buffering(odm->codec->CB);
-			return;
-		}
-	}
-
-	/*if raw media, stop all channels before sending stop command to network, to avoid new media frames to be set
-	as pending and thereby locking the channel associated service*/
-	if (odm->codec && odm->codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
-		i=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-			gf_es_stop(ch);
-		}
-		gf_term_stop_codec(odm->codec, 0);
-		/*and wait until frame has been consumed by the renderer
-		we don't use semaphore wait as the raw channel may already be pending on the semaphore*/
-		while (odm->codec->CB->UnitCount) {
-			gf_sleep(1);
-		}
-	}
-
-
-	/*object was not unlocked, decoders were not started*/
-	if (odm->state==GF_ODM_STATE_BLOCKED) {
-		odm->media_current_time = 0;
-		gf_sema_notify(odm->raw_frame_sema, 1);
-		return;
-	}
-
-	if (force_close && odm->mo) odm->mo->flags |= GF_MO_DISPLAY_REMOVE;
-	/*stop codecs*/
-	if (odm->codec) {
-		gf_term_stop_codec(odm->codec, 0);
-	} else if (odm->subscene) {
-		u32 i=0;
-		GF_ObjectManager *sub_odm;
-		if (odm->subscene->scene_codec) gf_term_stop_codec(odm->subscene->scene_codec, 0);
-		if (odm->subscene->od_codec) gf_term_stop_codec(odm->subscene->od_codec, 0);
-
-		/*stops all resources of the subscene as well*/
-		while ((sub_odm=(GF_ObjectManager *)gf_list_enum(odm->subscene->resources, &i))) {
-			gf_odm_stop(sub_odm, force_close);
-		}
-	}
-	if (odm->ocr_codec) gf_term_stop_codec(odm->ocr_codec, 0);
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) gf_term_stop_codec(odm->oci_codec, 0);
-#endif
-
-//	gf_term_lock_net(odm->term, 1);
-
-	/*send stop command*/
-	com.command_type = GF_NET_CHAN_STOP;
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-
-		if (ch->ipmp_tool) {
-			GF_IPMPEvent evt;
-			memset(&evt, 0, sizeof(evt));
-			evt.event_type=GF_IPMP_TOOL_RELEASE_ACCESS;
-			evt.channel = ch;
-			ch->ipmp_tool->process(ch->ipmp_tool, &evt);
-		}
-		
-		if (ch->service &&  (odm->state != GF_ODM_STATE_STOP_NO_NET ) ) {
-			com.base.on_channel = ch;
-			gf_term_service_command(ch->service, &com);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH %d At OTB %u requesting STOP\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock)));
-		}
-	}
-
-	if (odm->parentscene && odm->parentscene->root_od->addon) {
-		odm->parentscene->root_od->addon->started = 0;
-	}
-
-	gf_term_service_media_event(odm, GF_EVENT_ABORT);
-
-	/*stop channels*/
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		/*stops clock if this is a scene stop*/
-		if (!(odm->flags & GF_ODM_INHERIT_TIMELINE) && odm->subscene && gf_odm_owns_clock(odm, ch->clock) ) {
-			gf_clock_stop(ch->clock);
-		}
-		gf_es_stop(ch);
-	}
-
-//	gf_term_lock_net(odm->term, 0);
-
-	odm->state = GF_ODM_STATE_STOP;
-	odm->media_current_time = 0;
-
-#ifndef GPAC_DISABLE_VRML
-	/*reset media sensor(s)*/
-	i = 0;
-	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))) {
-		MS_Stop(media_sens);
-	}
-	/*reset media control state*/
-	ctrl = gf_odm_get_mediacontrol(odm);
-	if (ctrl) ctrl->current_seg = 0;
-#endif
-
-}
-
-void gf_odm_on_eos(GF_ObjectManager *odm, GF_Channel *on_channel)
-{
-	u32 i, count, nb_eos, nb_share_clock, nb_ck_running;
-#ifndef GPAC_DISABLE_VRML
-	if (gf_odm_check_segment_switch(odm)) return;
-#endif
-
-	nb_share_clock=0;
-	nb_eos = 0;
-	nb_ck_running = 0;
-	count = gf_list_count(odm->channels);
-	for (i=0; i<count; i++) {
-		GF_Channel *ch = gf_list_get(odm->channels, i);
-		if (on_channel) {
-			if (ch->clock != on_channel->clock) {
-				if (! ch->clock->has_seen_eos)
-					nb_ck_running++;
-				continue;
-			}
-			nb_share_clock++;
-		}
-		if (ch->IsEndOfStream) nb_eos++;
-	}
-	if (on_channel) {
-		if (nb_eos==nb_share_clock) {
-			on_channel->clock->has_seen_eos = 1;
-#ifndef GPAC_DISABLE_VRML
-			//check for scene restart upon end of stream
-			if (odm->subscene) {
-				gf_scene_mpeg4_inline_check_restart(odm->subscene);
-			}
-#endif
-		} else {
-			nb_ck_running++;
-		}
-		if (nb_ck_running) return;
-	} else {
-		if (nb_eos != count) return;
-	}
-	if (odm->addon && odm->addon->is_splicing)
-		odm->addon->is_over = 1;
-	if (odm->parentscene && odm->parentscene->root_od->addon && odm->parentscene->root_od->addon->is_splicing)
-		odm->parentscene->root_od->addon->is_over = 1;
-
-	gf_term_service_media_event(odm, GF_EVENT_MEDIA_LOAD_DONE);
-
-	if (on_channel && on_channel->esd && on_channel->esd->decoderConfig) {
-		if (odm->codec && (on_channel->esd->decoderConfig->streamType==odm->codec->type)) {
-			gf_codec_set_status(odm->codec, GF_ESM_CODEC_EOS);
-			return;
-		}
-		if (on_channel->esd->decoderConfig->streamType==GF_STREAM_OCR) {
-			gf_codec_set_status(odm->ocr_codec, GF_ESM_CODEC_EOS);
-			return;
-		}
-		if (on_channel->esd->decoderConfig->streamType==GF_STREAM_OCI) {
-#ifndef GPAC_MINIMAL_ODF
-			gf_codec_set_status(odm->oci_codec, GF_ESM_CODEC_EOS);
-#endif
-			return;
-		}
-	}
-	if (!odm->subscene) return;
-
-	if (odm->subscene->scene_codec) {
-		gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_EOS);
-	}
-
-	if (odm->subscene->od_codec) {
-		gf_codec_set_status(odm->subscene->od_codec, GF_ESM_CODEC_EOS);
-	}
-}
-
-void gf_odm_set_duration(GF_ObjectManager *odm, GF_Channel *ch, u64 stream_duration)
-{
-	if (odm->codec) {
-		if (ch->esd->decoderConfig->streamType == odm->codec->type)
-			if (odm->duration/1000 != stream_duration/1000)
-				odm->duration = stream_duration;
-	} else if (odm->ocr_codec) {
-		if (ch->esd->decoderConfig->streamType == odm->ocr_codec->type)
-			if (odm->duration/1000 != stream_duration/1000)
-				odm->duration = stream_duration;
-	} else if (odm->subscene && odm->subscene->scene_codec) {
-		//if (gf_list_find(odm->subscene->scene_codec->inChannels, ch) >= 0) {
-		if (odm->duration/1000 != stream_duration/1000)
-			odm->duration = stream_duration;
-		//}
-	}
-
-	/*update scene duration*/
-	gf_scene_set_duration(odm->subscene ? odm->subscene : (odm->parentscene ? odm->parentscene : odm->term->root_scene));
-}
-
-
-void gf_odm_set_timeshift_depth(GF_ObjectManager *odm, GF_Channel *ch, u32 stream_timeshift)
-{
-	if (odm->codec) {
-		if (ch->esd->decoderConfig->streamType == odm->codec->type)
-			if (odm->timeshift_depth != stream_timeshift)
-				odm->timeshift_depth = stream_timeshift;
-	} else if (odm->ocr_codec) {
-		if (ch->esd->decoderConfig->streamType == odm->ocr_codec->type)
-			if (odm->timeshift_depth != stream_timeshift)
-				odm->timeshift_depth = stream_timeshift;
-	} else if (odm->subscene && odm->subscene->scene_codec) {
-		//if (gf_list_find(odm->subscene->scene_codec->inChannels, ch) >= 0) {
-		if (odm->timeshift_depth != stream_timeshift)
-			odm->timeshift_depth = stream_timeshift;
-		//}
-	}
-
-	/*update scene duration*/
-	gf_scene_set_timeshift_depth(odm->subscene ? odm->subscene : (odm->parentscene ? odm->parentscene : odm->term->root_scene));
-}
-
-
-GF_Clock *gf_odm_get_media_clock(GF_ObjectManager *odm)
-{
-	while (odm->lower_layer_odm) {
-		odm = odm->lower_layer_odm;
-	}
-	if (odm->codec) return odm->codec->ck;
-	if (odm->ocr_codec) return odm->ocr_codec->ck;
-	if (odm->subscene && odm->subscene->scene_codec) return odm->subscene->scene_codec->ck;
-	if (odm->subscene && odm->subscene->dyn_ck) return odm->subscene->dyn_ck;
-	if (odm->parentscene && odm->parentscene->dyn_ck) return odm->parentscene->dyn_ck;
-	return NULL;
-}
-
-
-
-Bool gf_odm_shares_clock(GF_ObjectManager *odm, GF_Clock *ck)
-{
-	u32 i = 0;
-	GF_Channel *ch;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-		if (ch->clock == ck) return 1;
-	}
-	if (odm->subscene) {
-		if (odm->subscene->is_dynamic_scene && odm->subscene->dyn_ck == ck) return 1;
-		if (odm->subscene->scene_codec && odm->subscene->scene_codec->ck == ck) return 1;
-	}
-	return 0;
-}
-
-
-
-void gf_odm_pause(GF_ObjectManager *odm)
-{
-	u32 i;
-	GF_NetworkCommand com;
-#ifndef GPAC_DISABLE_VRML
-	MediaSensorStack *media_sens;
-#endif
-	GF_Channel *ch;
-
-	//postpone until the PLAY request
-	if (odm->state != GF_ODM_STATE_PLAY) {
-		odm->flags |= GF_ODM_PAUSE_QUEUED;
-		return;
-	}
-
-	if (odm->flags & GF_ODM_PAUSED) return;
-	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;
-
-	/*stop codecs, and update status for media codecs*/
-	if (odm->codec) {
-		//we don't pause codec but only change its status to PAUSE - this will allow decoding until CB is full, which will turn the codec in pause mode
-		gf_codec_set_status(odm->codec, GF_ESM_CODEC_PAUSE);
-	}
-	//when pause_at_first_frame is set we still want to decode and process the first AUs in OD and scene channels, otherwise no scene and no frame to display ...
-	else if (odm->subscene && (odm->subscene->first_frame_pause_type==0) ) {
-		if (odm->subscene->scene_codec) {
-			gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_PAUSE);
-			gf_term_stop_codec(odm->subscene->scene_codec, 1);
-		}
-		if (odm->subscene->od_codec) {
-			gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_PAUSE);
-			gf_term_stop_codec(odm->subscene->od_codec, 1);
-		}
-	}
-	if (odm->ocr_codec) gf_term_stop_codec(odm->ocr_codec, 1);
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) gf_term_stop_codec(odm->oci_codec, 1);
-#endif
-
-	com.command_type = GF_NET_CHAN_PAUSE;
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-		gf_clock_pause(ch->clock);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting PAUSE (clock init %d)\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
-
-		if (odm->state != GF_ODM_STATE_PLAY) continue;
-
-		//if we are in dump mode, the clocks are paused (step-by-step render), but we don't send the pause commands to
-		//the network !
-		if (odm->term->root_scene->first_frame_pause_type!=2) {
-			com.base.on_channel = ch;
-			gf_term_service_command(ch->service, &com);
-		}
-	}
-
-	//if we are in dump mode, only the clocks are paused (step-by-step render), the media object is still in play state
-	if (odm->term->root_scene->first_frame_pause_type==2) {
-		return;
-	}
-
-#ifndef GPAC_DISABLE_VRML
-	/*mediaSensor  shall generate isActive false when paused*/
-	i=0;
-	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i)) ) {
-		if (media_sens && media_sens->sensor->isActive) {
-			media_sens->sensor->isActive = 0;
-			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-		}
-	}
-#endif
-
-}
-
-void gf_odm_resume(GF_ObjectManager *odm)
-{
-	u32 i;
-	GF_NetworkCommand com;
-	GF_Channel *ch;
-#ifndef GPAC_DISABLE_VRML
-	MediaSensorStack *media_sens;
-	MediaControlStack *ctrl;
-#endif
-
-	if (odm->flags & GF_ODM_PAUSE_QUEUED) {
-		odm->flags &= ~GF_ODM_PAUSE_QUEUED;
-		return;
-	}
-
-	if (!(odm->flags & GF_ODM_PAUSED)) return;
-	odm->flags &= ~GF_ODM_PAUSED;
-
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
-
-	/*start codecs, and update status for media codecs*/
-	if (odm->codec) {
-		gf_term_start_codec(odm->codec, 1);
-		gf_codec_set_status(odm->codec, GF_ESM_CODEC_PLAY);
-	} else if (odm->subscene) {
-		if (odm->subscene->scene_codec) {
-			gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_PLAY);
-			gf_term_start_codec(odm->subscene->scene_codec, 1);
-		}
-		if (odm->subscene->od_codec) gf_term_start_codec(odm->subscene->od_codec, 1);
-	}
-	if (odm->ocr_codec) gf_term_start_codec(odm->ocr_codec, 1);
-#ifndef GPAC_MINIMAL_ODF
-	if (odm->oci_codec) gf_term_start_codec(odm->oci_codec, 1);
-#endif
-
-#ifndef GPAC_DISABLE_VRML
-	ctrl = gf_odm_get_mediacontrol(odm);
-#endif
-	com.command_type = GF_NET_CHAN_RESUME;
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		gf_clock_resume(ch->clock);
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ODM%d %s] CH%d: At OTB %u requesting RESUME (clock init %d)\n", odm->OD->objectDescriptorID, odm->net_service->url, ch->esd->ESID, gf_clock_time(ch->clock), ch->clock->clock_init ));
-		if (odm->state!= GF_ODM_STATE_PLAY) continue;
-
-		com.base.on_channel = ch;
-		gf_term_service_command(ch->service, &com);
-
-#ifndef GPAC_DISABLE_VRML
-		/*override speed with MC*/
-		if (ctrl) {
-			gf_clock_set_speed(ch->clock, ctrl->control->mediaSpeed);
-		}
-#endif
-	}
-
-#ifndef GPAC_DISABLE_VRML
-	/*mediaSensor shall generate isActive TRUE when resumed*/
-	i=0;
-	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i)) ) {
-		if (media_sens && !media_sens->sensor->isActive) {
-			media_sens->sensor->isActive = 1;
-			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
-		}
-	}
-#endif
-}
-
-void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed, Bool adjust_clock_speed)
-{
-	u32 i;
-	GF_NetworkCommand com;
-	GF_Channel *ch;
-
-	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
-
-	com.command_type = GF_NET_CHAN_SET_SPEED;
-	com.play.speed = FIX2FLT(speed);
-	i=0;
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i)) ) {
-		if (adjust_clock_speed)
-			gf_clock_set_speed(ch->clock, speed);
-
-		com.play.on_channel = ch;
-		gf_term_service_command(ch->service, &com);
-	}
-}
-
-GF_Segment *gf_odm_find_segment(GF_ObjectManager *odm, char *descName)
-{
-	GF_Segment *desc;
-	u32 i = 0;
-	if (!odm->OD) return NULL;
-	while ( (desc = (GF_Segment *)gf_list_enum(odm->OD->OCIDescriptors, &i)) ) {
-		if (desc->tag != GF_ODF_SEGMENT_TAG) continue;
-		if (!stricmp(desc->SegmentName, descName)) return desc;
-	}
-	return NULL;
-}
-
-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))) {
-		if (desc == seg) return;
-		if (seg->startTime + seg->Duration <= desc->startTime) {
-			gf_list_insert(list, seg, i);
-			return;
-		}
-	}
-#endif
-	gf_list_add(list, seg);
-}
-
-/*add segment descriptor and sort them*/
-void gf_odm_init_segments(GF_ObjectManager *odm, GF_List *list, MFURL *url)
-{
-	char *str, *sep;
-	char seg1[1024], seg2[1024], seg_url[4096];
-	GF_Segment *first_seg, *last_seg, *seg;
-	u32 i, j;
-
-	/*browse all URLs*/
-	for (i=0; i<url->count; i++) {
-		if (!url->vals[i].url) continue;
-		str = strstr(url->vals[i].url, "#");
-		if (!str) continue;
-		str++;
-		strcpy(seg_url, str);
-		/*segment closed range*/
-		if ((sep = strstr(seg_url, "-")) ) {
-			strcpy(seg2, sep+1);
-			sep[0] = 0;
-			strcpy(seg1, seg_url);
-			first_seg = gf_odm_find_segment(odm, seg1);
-			if (!first_seg) continue;
-			last_seg = gf_odm_find_segment(odm, seg2);
-		}
-		/*segment open range*/
-		else if ((sep = strstr(seg_url, "+")) ) {
-			sep[0] = 0;
-			strcpy(seg1, seg_url);
-			first_seg = gf_odm_find_segment(odm, seg_url);
-			if (!first_seg) continue;
-			last_seg = NULL;
-		}
-		/*single segment*/
-		else {
-			first_seg = gf_odm_find_segment(odm, seg_url);
-			if (!first_seg) continue;
-			gf_odm_insert_segment(odm, first_seg, list);
-			continue;
-		}
-		/*segment range process*/
-		gf_odm_insert_segment(odm, first_seg, list);
-		j=0;
-		while ( (seg = (GF_Segment *)gf_list_enum(odm->OD->OCIDescriptors, &j)) ) {
-			if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
-			if (seg==first_seg) continue;
-			if (seg->startTime + seg->Duration <= first_seg->startTime) continue;
-			/*this also includes last_seg insertion !!*/
-			if (last_seg && (seg->startTime + seg->Duration > last_seg->startTime + last_seg->Duration) ) continue;
-			gf_odm_insert_segment(odm, seg, list);
-		}
-	}
-}
-
-void gf_odm_signal_eos(GF_ObjectManager *odm)
-{
-	if (odm->parentscene && (odm->parentscene != odm->term->root_scene) ) {
-		GF_ObjectManager *root = odm->parentscene->root_od;
-		Bool is_over = 0;
-
-		if (!gf_scene_check_clocks(root->net_service, root->subscene, 0)) return;
-		if (root->subscene->is_dynamic_scene)
-			is_over = 1;
-		else
-			is_over = gf_sc_is_over(odm->term->compositor, root->subscene->graph);
-
-		if (is_over) {
-			gf_term_service_media_event(root, GF_EVENT_MEDIA_ENDED);
-		}
-	} else {
-		if (gf_term_check_end_of_scene(odm->term, 0)) {
-			GF_Event evt;
-			evt.type = GF_EVENT_EOS;
-			gf_term_send_event(odm->term, &evt);
-		}
-	}
-}
-

gpac-0.8.0.tar.gz/src/terminal/scene.c Deleted

@@ -1,3111 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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.
- *
- */
-
-
-
-/*for OD service types*/
-#include <gpac/constants.h>
-/*for URL concatenation*/
-#include <gpac/network.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include "media_control.h"
-#include <gpac/nodes_x3d.h>
-#include <gpac/options.h>
-
-/*SVG properties*/
-#ifndef GPAC_DISABLE_SVG
-#include <gpac/scenegraph_svg.h>
-#endif
-
-#include "input_sensor.h"
-#include "media_memory.h"
-
-GF_EXPORT
-Double gf_scene_get_time(void *_is)
-{
-	GF_Scene *scene = (GF_Scene *)_is;
-#if 1
-	u32 ret;
-	GF_Clock *ck;
-	assert(scene);
-	ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-	if (!ck) return 0.0;
-	ret = gf_clock_time(ck);
-	if (scene->root_od->media_stop_time && (scene->root_od->media_stop_time<ret)) ret = (u32) scene->root_od->media_stop_time;
-	return ret/1000.0;
-#else
-	return scene->simulation_time;
-#endif
-}
-
-#ifndef GPAC_DISABLE_VRML
-
-void gf_storage_save(M_Storage *storage);
-#endif
-
-static void inline_on_media_event(GF_Scene *scene, u32 type)
-{
-	gf_term_service_media_event(scene->scene_codec->odm, type);
-}
-
-GF_EXPORT
-GF_Scene *gf_scene_new(GF_Scene *parentScene)
-{
-	GF_Scene *tmp;
-	GF_SAFEALLOC(tmp, GF_Scene);
-	if (! tmp) return NULL;
-
-	tmp->mx_resources = gf_mx_new("SceneResources");
-	tmp->resources = gf_list_new();
-	tmp->scene_objects = gf_list_new();
-	tmp->extra_scenes = gf_list_new();
-	tmp->declared_addons = gf_list_new();
-	/*init inline scene*/
-	if (parentScene) {
-		tmp->graph = gf_sg_new_subscene(parentScene->graph);
-	} else {
-		tmp->graph = gf_sg_new();
-	}
-
-	gf_sg_set_private(tmp->graph, tmp);
-	gf_sg_set_node_callback(tmp->graph, gf_term_node_callback);
-	gf_sg_set_scene_time_callback(tmp->graph, gf_scene_get_time);
-
-	//copy over pause_at_first_frame flag so that new subscene is not paused right away
-	if (parentScene)
-		tmp->first_frame_pause_type = parentScene->first_frame_pause_type;
-
-#ifndef GPAC_DISABLE_VRML
-	tmp->extern_protos = gf_list_new();
-	gf_sg_set_proto_loader(tmp->graph, gf_inline_get_proto_lib);
-
-	tmp->storages = gf_list_new();
-	tmp->keynavigators = gf_list_new();
-
-#endif
-	tmp->on_media_event = inline_on_media_event;
-	return tmp;
-}
-
-static void gf_scene_reset_urls(GF_Scene *scene)
-{
-#define SFURL_RESET(__url) if (__url.url) gf_free(__url.url);\
-	memset(&__url, 0, sizeof(SFURL));
-
-	SFURL_RESET(scene->audio_url);
-	SFURL_RESET(scene->visual_url);
-	SFURL_RESET(scene->text_url);
-	SFURL_RESET(scene->dims_url);
-}
-
-GF_EXPORT
-void gf_scene_del(GF_Scene *scene)
-{
-	gf_mx_p(scene->root_od->term->net_mx);
-
-	gf_list_del(scene->resources);
-	assert(!gf_list_count(scene->extra_scenes) );
-	gf_list_del(scene->extra_scenes);
-
-#ifndef GPAC_DISABLE_VRML
-	while (gf_list_count(scene->extern_protos)) {
-		GF_ProtoLink *pl = (GF_ProtoLink *)gf_list_get(scene->extern_protos, 0);
-		gf_list_rem(scene->extern_protos, 0);
-		gf_free(pl);
-	}
-	gf_list_del(scene->extern_protos);
-#endif
-
-	/*delete scene decoder */
-	if (scene->scene_codec) {
-		GF_SceneDecoder *dec = (GF_SceneDecoder *)scene->scene_codec->decio;
-		/*make sure the scene codec doesn't have anything left in the scene graph*/
-		if (dec->ReleaseScene) dec->ReleaseScene(dec);
-
-		gf_term_remove_codec(scene->root_od->term, scene->scene_codec);
-		gf_codec_del(scene->scene_codec);
-		/*reset pointer to NULL in case nodes try to access scene time*/
-		scene->scene_codec = NULL;
-	}
-
-	/*delete the scene graph*/
-	gf_sg_del(scene->graph);
-
-	if (scene->od_codec) {
-		gf_term_remove_codec(scene->root_od->term, scene->od_codec);
-		gf_codec_del(scene->od_codec);
-		scene->od_codec = NULL;
-	}
-	/*don't touch the root_od, will be deleted by the parent scene*/
-
-	/*clean all remaining associations*/
-	while (gf_list_count(scene->scene_objects)) {
-		GF_MediaObject *obj = (GF_MediaObject *)gf_list_get(scene->scene_objects, 0);
-		if (obj->odm) obj->odm->mo = NULL;
-		gf_list_rem(scene->scene_objects, 0);
-		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-		gf_mo_del(obj);
-	}
-	gf_list_del(scene->scene_objects);
-#ifndef GPAC_DISABLE_VRML
-	gf_list_del(scene->storages);
-	gf_list_del(scene->keynavigators);
-#endif
-
-	gf_list_del(scene->declared_addons);
-
-	gf_scene_reset_urls(scene);
-
-	if (scene->fragment_uri) gf_free(scene->fragment_uri);
-	if (scene->redirect_xml_base) gf_free(scene->redirect_xml_base);
-
-	gf_mx_v(scene->root_od->term->net_mx);
-	gf_mx_del(scene->mx_resources);
-	gf_free(scene);
-}
-
-GF_EXPORT
-GF_ObjectManager *gf_scene_find_odm(GF_Scene *scene, u16 OD_ID)
-{
-	GF_ObjectManager *odm;
-	u32 i=0;
-	while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
-		if (odm->OD && odm->OD->objectDescriptorID == OD_ID) return odm;
-	}
-	return NULL;
-}
-
-GF_EXPORT
-void gf_scene_disconnect(GF_Scene *scene, Bool for_shutdown)
-{
-	u32 i;
-	GF_MediaObject *obj;
-	GF_ObjectManager *odm;
-	GF_SceneDecoder *dec = NULL;
-	if (scene->scene_codec) dec = (GF_SceneDecoder *)scene->scene_codec->decio;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] disconnecting\n"));
-
-	gf_term_lock_compositor(scene->root_od->term, GF_TRUE);
-
-	/*force unregistering of inline nodes (for safety)*/
-	if (for_shutdown && scene->root_od->mo) {
-		/*reset private stack of all inline nodes still registered*/
-		while (gf_mo_event_target_count(scene->root_od->mo)) {
-			GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, 0));
-			gf_mo_event_target_remove_by_index(scene->root_od->mo, 0);
-#ifndef GPAC_DISABLE_VRML
-			switch (gf_node_get_tag(n)) {
-			case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-			case TAG_X3D_Inline:
-#endif
-				gf_node_set_private(n, NULL);
-				break;
-			}
-#endif
-		}
-	}
-
-	//Ivica patch: Remove all Registered InputSensor nodes -> shut down the InputSensor threads -> prevent illegal access on deleted pointers
-#ifndef GPAC_DISABLE_VRML
-	if (for_shutdown) {
-		i = 0;
-		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
-			if (for_shutdown && odm->mo) {
-				obj = odm->mo;
-				while (gf_mo_event_target_count(obj)) {
-					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
-					if (n) {
-						switch (gf_node_get_tag(n)) {
-						case TAG_MPEG4_InputSensor:
-						{
-							M_InputSensor* is = (M_InputSensor*)n;
-							is->enabled = 0;
-							InputSensorModified(n);
-							break;
-						}
-						}
-					}
-					gf_mo_event_target_remove_by_index(obj, 0);
-				}
-			}
-		}
-	}
-#endif
-
-	/*remove all associated eventTargets*/
-	i=0;
-	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		gf_mo_event_target_reset(obj);
-	}
-
-#ifndef GPAC_DISABLE_VRML
-	while (gf_list_count(scene->storages)) {
-		M_Storage *storage = (M_Storage *)gf_list_get(scene->storages, 0);
-		gf_list_rem(scene->storages, 0);
-		if (storage->_auto) gf_storage_save(storage);
-	}
-#endif
-
-	if (scene->root_od->term->root_scene == scene) {
-		gf_sc_set_scene(scene->root_od->term->compositor, NULL);
-	}
-
-	gf_scene_reset_addons(scene);
-
-	/*release the scene - at this stage, we no longer have any node stack refering to our media objects */
-	if (dec && dec->ReleaseScene) dec->ReleaseScene(dec);
-	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
-	gf_sg_reset(scene->graph);
-	scene->graph_attached = 0;
-
-	/*reset statc ressource flag since we destroyed scene objects*/
-	scene->static_media_ressources = GF_FALSE;
-
-
-	/*disconnect and kill all objects*/
-	if (!for_shutdown && scene->static_media_ressources) {
-		i=0;
-		/*stop all objects but DON'T DESTROY THEM*/
-		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
-			if (odm->state) gf_odm_disconnect(odm, GF_FALSE);
-		}
-		/*reset all stream associations*/
-		i=0;
-		while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
-			gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-			gf_mo_event_target_reset(obj);
-		}
-	} else {
-		while (gf_list_count(scene->resources)) {
-			odm = (GF_ObjectManager *)gf_list_get(scene->resources, 0);
-			gf_odm_disconnect(odm, (for_shutdown || !scene->static_media_ressources) ? 2 : 0);
-		}
-#ifndef GPAC_DISABLE_VRML
-		while (gf_list_count(scene->extern_protos)) {
-			GF_ProtoLink *pl = (GF_ProtoLink *)gf_list_get(scene->extern_protos, 0);
-			gf_list_rem(scene->extern_protos, 0);
-			gf_free(pl);
-		}
-#endif
-	}
-
-	/*remove stream associations*/
-	while (gf_list_count(scene->scene_objects)) {
-		obj = (GF_MediaObject*)gf_list_get(scene->scene_objects, 0);
-		gf_list_rem(scene->scene_objects, 0);
-		if (obj->odm) obj->odm->mo = NULL;
-		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-		gf_mo_del(obj);
-	}
-
-	//reset URLs
-	gf_scene_reset_urls(scene);
-
-	scene->object_attached = 0;
-	gf_term_lock_compositor(scene->root_od->term, GF_FALSE);
-}
-
-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)
-{
-	GF_ObjectManager *root_od;
-	GF_ObjectManager *odm;
-	char *url;
-	if (!mo || !scene) return;
-
-	odm = gf_odm_new();
-	/*remember OD*/
-	odm->mo = mo;
-	mo->odm = odm;
-	odm->parentscene = scene;
-	odm->OD = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-	odm->OD->objectDescriptorID = GF_MEDIA_EXTERNAL_ID;
-	odm->parentscene = scene;
-	odm->term = scene->root_od->term;
-	root_od = scene->root_od;
-	if (scene->force_single_timeline) lock_timelines = GF_TRUE;
-
-	url = mo->URLs.vals[0].url;
-	if (url) {
-		if (!stricmp(url, "KeySensor")) {
-			GF_ESD *esd = gf_odf_desc_esd_new(0);
-			esd->decoderConfig->streamType = GF_STREAM_INTERACT;
-			esd->decoderConfig->objectTypeIndication = 1;
-			gf_free(esd->decoderConfig->decoderSpecificInfo->data);
-			esd->decoderConfig->decoderSpecificInfo->data = gf_strdup(" KeySensor");
-			esd->decoderConfig->decoderSpecificInfo->data[0] = 9;
-			esd->decoderConfig->decoderSpecificInfo->dataLength = 10;
-			esd->ESID = esd->OCRESID = 65534;
-			gf_list_add(odm->OD->ESDescriptors, esd);
-		} else if (!stricmp(url, "StringSensor")) {
-			GF_ESD *esd = gf_odf_desc_esd_new(0);
-			esd->decoderConfig->streamType = GF_STREAM_INTERACT;
-			esd->decoderConfig->objectTypeIndication = 1;
-			gf_free(esd->decoderConfig->decoderSpecificInfo->data);
-			esd->decoderConfig->decoderSpecificInfo->data = gf_strdup(" StringSensor");
-			esd->decoderConfig->decoderSpecificInfo->data[0] = 12;
-			esd->decoderConfig->decoderSpecificInfo->dataLength = 13;
-			esd->ESID = esd->OCRESID = 65534;
-			gf_list_add(odm->OD->ESDescriptors, esd);
-		} else if (!stricmp(url, "Mouse")) {
-			GF_ESD *esd = gf_odf_desc_esd_new(0);
-			esd->decoderConfig->streamType = GF_STREAM_INTERACT;
-			esd->decoderConfig->objectTypeIndication = 1;
-			gf_free(esd->decoderConfig->decoderSpecificInfo->data);
-			esd->decoderConfig->decoderSpecificInfo->data = gf_strdup(" Mouse");
-			esd->decoderConfig->decoderSpecificInfo->data[0] = 5;
-			esd->decoderConfig->decoderSpecificInfo->dataLength = 6;
-			esd->ESID = esd->OCRESID = 65534;
-			gf_list_add(odm->OD->ESDescriptors, esd);
-		} else {
-			if (!keep_fragment) {
-				char *frag = strrchr(mo->URLs.vals[0].url, '#');
-				if (frag) frag[0] = 0;
-				odm->OD->URLString = gf_strdup(mo->URLs.vals[0].url);
-				if (frag) frag[0] = '#';
-			} else {
-				odm->OD->URLString = gf_strdup(mo->URLs.vals[0].url);
-			}
-			if (lock_timelines) odm->flags |= GF_ODM_INHERIT_TIMELINE;
-		}
-	}
-
-	/*HACK - temp storage of sync ref*/
-	if (sync_ref) odm->ocr_codec = (struct _generic_codec *)sync_ref;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] Inserting new MediaObject %08x for resource %s\n", odm->mo, url));
-	gf_mx_p(scene->mx_resources);
-	gf_list_add(scene->resources, odm);
-	gf_mx_v(scene->mx_resources);
-	if (original_parent_scene) {
-		gf_odm_setup_object(odm, original_parent_scene->root_od->net_service);
-	} else {
-		gf_odm_setup_object(odm, root_od->net_service);
-	}
-}
-
-static void gf_scene_reinsert_object(GF_Scene *scene, GF_MediaObject *mo)
-{
-	u32 i;
-	gf_free(mo->URLs.vals[0].url);
-	mo->URLs.vals[0].url = NULL;
-	for (i=0; i<mo->URLs.count-1; i++) mo->URLs.vals[i].url = mo->URLs.vals[i+1].url;
-	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);
-}
-
-
-void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, u32 for_shutdown)
-{
-	u32 i;
-	GF_MediaObject *obj;
-
-	gf_term_lock_net(odm->term, GF_TRUE);
-	gf_list_del_item(scene->resources, odm);
-	gf_term_lock_net(odm->term, GF_FALSE);
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] removing ODM %d\n", odm->OD ? odm->OD->objectDescriptorID : GF_MEDIA_EXTERNAL_ID));
-
-
-	i=0;
-	while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
-		if (
-		    /*assigned object*/
-		    (obj->odm==odm) ||
-		    /*remote OD*/
-		    ((obj->OD_ID!=GF_MEDIA_EXTERNAL_ID) && odm->OD && (obj->OD_ID == odm->OD->objectDescriptorID) ) ||
-		    /*dynamic OD*/
-		    (obj->URLs.count && odm->OD && odm->OD->URLString && !stricmp(obj->URLs.vals[0].url, odm->OD->URLString))
-		) {
-			u32 discard_obj = 0;
-			gf_odm_lock(odm, 1);
-			obj->flags = 0;
-			if (obj->odm) obj->odm->mo = NULL;
-			odm->mo = NULL;
-			obj->odm = NULL;
-
-			obj->frame = NULL;
-			obj->framesize = obj->timestamp = 0;
-
-			gf_odm_lock(odm, 0);
-
-			/*if graph not attached we can remove the link (this is likely scene shutdown for some error)*/
-			if (!scene->graph_attached) {
-#ifndef GPAC_DISABLE_VRML
-				GF_ProtoLink *pl;
-				u32 j=0;
-				while ((pl = (GF_ProtoLink *)gf_list_enum(scene->extern_protos, &j))) {
-					if (pl->mo==obj) {
-						pl->mo = NULL;
-						break;
-					}
-				}
-#endif
-				discard_obj = 1;
-			} else if (!for_shutdown) {
-				/*if dynamic OD and more than 1 URLs resetup*/
-				if ((obj->OD_ID==GF_MEDIA_EXTERNAL_ID) && (obj->URLs.count>1)) {
-					discard_obj = 0;
-					gf_scene_reinsert_object(scene, obj);
-				} else {
-					discard_obj = 2;
-				}
-			}
-			/*discard media object*/
-			else if (for_shutdown==2)
-				discard_obj = 1;
-
-			/*reset private stack of all inline nodes still registered*/
-			if (discard_obj) {
-				while (gf_mo_event_target_count(obj)) {
-					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
-					gf_mo_event_target_remove_by_index(obj, 0);
-#ifndef GPAC_DISABLE_VRML
-					switch (gf_node_get_tag(n)) {
-					case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-					case TAG_X3D_Inline:
-#endif
-						if (obj->num_open) gf_mo_stop(obj);
-						gf_node_set_private(n, NULL);
-						break;
-					}
-#endif
-				}
-			}
-
-			if ((discard_obj==1) && !obj->num_open) {
-				gf_list_rem(scene->scene_objects, i-1);
-				gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
-				gf_mo_del(obj);
-			}
-			return;
-		}
-	}
-}
-
-
-//browse all channels and update buffering info
-void gf_scene_buffering_info(GF_Scene *scene)
-{
-	u32 i, j, max_buffer, cur_buffer, max_buff_val=0;
-	GF_Channel *ch;
-	GF_Event evt;
-	GF_ObjectManager *odm;
-	if (!scene) return;
-
-	max_buffer = cur_buffer = 0;
-
-	/*get buffering on root OD*/
-	j=0;
-	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &j))) {
-		/*count only re-buffering channels*/
-		if (!ch->BufferOn) continue;
-
-		max_buffer += ch->MaxBuffer;
-		cur_buffer += (ch->BufferTime>0) ? ch->BufferTime : 1;
-	}
-
-	/*get buffering on all ODs*/
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (!odm->codec) continue;
-		j=0;
-		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &j))) {
-			if (max_buff_val < ch->MaxBuffer) max_buff_val = ch->MaxBuffer;
-
-			/*count only re-buffering channels*/
-			if (!ch->BufferOn) continue;
-			if (ch->MaxBuffer) {
-				max_buffer += ch->MaxBuffer;
-				cur_buffer += (ch->BufferTime>0) ? ch->BufferTime : 0;
-			}
-		}
-	}
-
-	evt.type = GF_EVENT_PROGRESS;
-	evt.progress.progress_type = 0;
-	evt.progress.service = scene->root_od->net_service->url;
-	if (!max_buffer || !cur_buffer || (max_buffer <= cur_buffer)) {
-		if (!max_buffer) max_buffer=max_buff_val;
-		evt.progress.done = evt.progress.total = max_buffer;
-	} else {
-		evt.progress.done = cur_buffer;
-		evt.progress.total = max_buffer;
-	}
-	gf_term_send_event(scene->root_od->term, &evt);
-}
-
-
-
-void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code, Bool no_queueing)
-{
-	/*fire resize event*/
-#ifndef GPAC_DISABLE_SVG
-	GF_Node *root;
-	u32 i, count;
-	u32 w, h;
-	GF_DOM_Event evt, *dom_event;
-	dom_event = (GF_DOM_Event *)_event;
-
-	if (!scene) return;
-	root = gf_sg_get_root_node(scene->graph);
-
-	if (!dom_event) {
-		memset(&evt, 0, sizeof(GF_DOM_Event));
-		dom_event = &evt;
-		w = h = 0;
-		gf_sg_get_scene_size_info(scene->graph, &w, &h);
-		evt.type = event_type;
-		evt.screen_rect.width = INT2FIX(w);
-		evt.screen_rect.height = INT2FIX(h);
-		evt.key_flags = scene->is_dynamic_scene ? (scene->vr_type ? 2 : 1) : 0;
-		if (root) {
-#ifndef GPAC_DISABLE_VRML
-			switch (gf_node_get_tag(root)) {
-			case TAG_MPEG4_Group:
-			case TAG_MPEG4_Layer3D:
-				evt.detail = 1;
-				break;
-#ifndef GPAC_DISABLE_X3D
-			case TAG_X3D_Group:
-				evt.detail = 2;
-				break;
-#endif
-			}
-#endif
-		}
-
-		evt.error_state = code;
-	}
-	if (n) {
-		if (no_queueing) {
-			gf_dom_event_fire(n, dom_event);
-		} else {
-			gf_sc_queue_dom_event(scene->root_od->term->compositor, n, dom_event);
-		}
-	} else {
-		if (root) {
-			if (no_queueing) {
-				gf_dom_event_fire(root, dom_event);
-			} else {
-				gf_sc_queue_dom_event(scene->root_od->term->compositor, root, dom_event);
-			}
-		}
-
-		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) {
-				gf_dom_event_fire(an, dom_event);
-			} else {
-				gf_sc_queue_dom_event(scene->root_od->term->compositor, an, dom_event);
-			}
-		}
-	}
-#endif
-}
-
-
-GF_EXPORT
-void gf_scene_attach_to_compositor(GF_Scene *scene)
-{
-	char *url;
-	if (!scene->root_od) return;
-
-	if ((scene->graph_attached==1) || (gf_sg_get_root_node(scene->graph)==NULL) ) {
-		gf_term_invalidate_compositor(scene->root_od->term);
-		return;
-	}
-	scene->graph_attached = 1;
-
-	/*locate fragment IRI*/
-	if (scene->root_od->net_service && scene->root_od->net_service->url) {
-		if (scene->fragment_uri) {
-			gf_free(scene->fragment_uri);
-			scene->fragment_uri = NULL;
-		}
-		url = strchr(scene->root_od->net_service->url, '#');
-		if (url) scene->fragment_uri = gf_strdup(url+1);
-	}
-
-	/*main display scene, setup compositor*/
-	if (scene->root_od->term->root_scene == scene) {
-		gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-	}
-	else {
-		u32 i, count;
-		count = scene->root_od->mo ? gf_mo_event_target_count(scene->root_od->mo) : 0;
-		for (i=0; i<count; i++) {
-			gf_node_dirty_parents( gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i)));
-		}
-		gf_term_invalidate_compositor(scene->root_od->term);
-
-		if (scene->root_od->parentscene->is_dynamic_scene) {
-			u32 w, h;
-			gf_sg_get_scene_size_info(scene->graph, &w, &h);
-			gf_sc_set_size(scene->root_od->term->compositor, w, h);
-		}
-		/*trigger a scene attach event*/
-		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
-	}
-}
-
-static GF_MediaObject *IS_CheckExistingObject(GF_Scene *scene, MFURL *urls, u32 type)
-{
-	GF_MediaObject *obj;
-	u32 i = 0;
-	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		if (type && (type != obj->type)) continue;
-		if ((obj->OD_ID == GF_MEDIA_EXTERNAL_ID) && gf_mo_is_same_url(obj, urls, NULL, 0)) return obj;
-		else if ((obj->OD_ID != GF_MEDIA_EXTERNAL_ID) && (obj->OD_ID == urls->vals[0].OD_ID)) return obj;
-	}
-	return NULL;
-}
-
-static GFINLINE Bool is_match_obj_type(u32 type, u32 hint_type)
-{
-	if (!hint_type) return GF_TRUE;
-	if (type==hint_type) return GF_TRUE;
-	/*TEXT are used by animation stream*/
-	if ((type==GF_MEDIA_OBJECT_TEXT) && (hint_type==GF_MEDIA_OBJECT_UPDATES)) return GF_TRUE;
-	return GF_FALSE;
-}
-
-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 *obj;
-	GF_Scene *original_parent_scene = NULL;
-	Bool keep_fragment = GF_TRUE;
-	Bool first_pass = force_new_if_not_attached ? GF_FALSE : GF_TRUE;
-	u32 i, OD_ID;
-
-	OD_ID = gf_mo_get_od_id(url);
-	if (!OD_ID) return NULL;
-
-	gf_mx_p(scene->mx_resources);
-
-	/*we may have overriden the time lines in parent scene, thus all objects in this scene have the same clock*/
-	if (scene->root_od->parentscene && scene->root_od->parentscene->force_single_timeline)
-		lock_timelines = GF_TRUE;
-
-	/*the first pass is needed to detect objects already inserted and registered with the given nodes, regardless of
-	the force_new_if_not_attached flag. This ty^pically occurs when a resource is first created then linked to an animation/inline*/
-restart:
-	obj = NULL;
-	i=0;
-	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		Bool odm_matches = GF_FALSE;
-
-		if (
-		    /*regular OD scheme*/
-		    (OD_ID != GF_MEDIA_EXTERNAL_ID && (obj->OD_ID==OD_ID))
-		    ||
-		    /*dynamic OD scheme - !! obj->OD_ID may different from GF_MEDIA_EXTERNAL_ID when ODs are
-		    directly added to the terminal by the service*/
-		    ((OD_ID == GF_MEDIA_EXTERNAL_ID)
-		     /*if object type unknown (media control, media sensor), return first obj matching URL
-		     otherwise check types*/
-		     && is_match_obj_type(obj->type, obj_type_hint)
-		     /*locate sub-url in given one and handle fragments (viewpoint/segments/...)*/
-		     && gf_mo_is_same_url(obj, url, &keep_fragment, obj_type_hint)
-		    )
-		) {
-			odm_matches = GF_TRUE;
-		}
-
-		if (!odm_matches) continue;
-
-		if (obj->odm) {
-			Bool can_reuse = GF_TRUE;
-			Bool timeline_locked = (obj->odm->flags & GF_ODM_INHERIT_TIMELINE) ? GF_TRUE : GF_FALSE;
-
-			//addon object always share the timeline
-			if (obj->odm->addon || obj->odm->parentscene->root_od->addon)
-				timeline_locked = lock_timelines = 1;
-
-			if (timeline_locked != lock_timelines)
-				continue;
-
-			gf_term_lock_media_queue(scene->root_od->term, GF_TRUE);
-			if (obj->odm->flags & GF_ODM_DESTROYED) can_reuse = GF_FALSE;
-			else if (obj->odm->action_type == GF_ODM_ACTION_DELETE) {
-				/*check if object is being destroyed (no longer in the queue)*/
-				if (gf_list_del_item(scene->root_od->term->media_queue, obj->odm)<0) {
-					can_reuse = GF_FALSE;
-				}
-				/*otherwise reuse object, discard current destroy command*/
-				else {
-					obj->odm->action_type = GF_ODM_ACTION_PLAY;
-				}
-			}
-			gf_term_lock_media_queue(scene->root_od->term, GF_FALSE);
-			if (!can_reuse) continue;
-
-		}
-
-		if (!first_pass && !force_new_if_not_attached) {
-			if (node && (gf_mo_event_target_find_by_node(obj, node)<0))
-				gf_mo_event_target_add_node(obj, node);
-			gf_mx_v(scene->mx_resources);
-			return obj;
-		}
-		/*special case where the URL is requested twice for the same node: use the existing resource*/
-		else if (node && (gf_mo_event_target_find_by_node(obj, node)>=0)) {
-			gf_mx_v(scene->mx_resources);
-			return obj;
-		}
-	}
-	if (first_pass) {
-		first_pass = GF_FALSE;
-		goto restart;
-	}
-
-	/*we cannot create an OD manager at this point*/
-	if (obj_type_hint==GF_MEDIA_OBJECT_UNDEF) {
-		gf_mx_v(scene->mx_resources);
-		return NULL;
-	}
-
-	/*create a new object identification*/
-	obj = gf_mo_new();
-	obj->OD_ID = OD_ID;
-	obj->type = obj_type_hint;
-
-	/*register node with object*/
-	if (node) {
-		gf_mo_event_target_add_node(obj, node);
-
-		original_parent_scene = (GF_Scene*) gf_sg_get_private(gf_node_get_graph(node));
-	}
-
-	/*if animation stream object, remember originating node
-		!! FIXME - this should be cleaned up !!
-	*/
-	if (obj->type == GF_MEDIA_OBJECT_UPDATES)
-		obj->node_ptr = node;
-
-	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);
-		/*safety check!!!*/
-		if (gf_list_find(scene->scene_objects, obj)<0) {
-			gf_mx_v(scene->mx_resources);
-			return NULL;
-		}
-
-		if (obj->odm==NULL) {
-			gf_list_del_item(scene->scene_objects, obj);
-			gf_mo_del(obj);
-			gf_mx_v(scene->mx_resources);
-			return NULL;
-		}
-	}
-
-	gf_mx_v(scene->mx_resources);
-	return obj;
-}
-
-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);
-}
-
-GF_EXPORT
-void gf_scene_setup_object(GF_Scene *scene, GF_ObjectManager *odm)
-{
-	GF_MediaObject *obj;
-	u32 i;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] Setup object manager %d (MO %p)\n", odm->OD->objectDescriptorID, odm->mo));
-
-	/*an object may already be assigned (when using ESD URLs, setup is performed twice)*/
-	if (odm->mo != NULL) goto existing;
-
-	i=0;
-	while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
-		/*make sure services are different*/
-		if (obj->odm && (odm->net_service != obj->odm->net_service)) continue;
-
-		if (obj->OD_ID==GF_MEDIA_EXTERNAL_ID) {
-			//assert(obj->odm);
-			if (obj->odm == odm) {
-				/*assign FINAL OD, not parent*/
-				obj->odm = odm;
-				odm->mo = obj;
-				goto existing;
-			}
-		}
-		else if (obj->OD_ID == odm->OD->objectDescriptorID) {
-			assert(obj->odm==NULL);
-			obj->odm = odm;
-			odm->mo = obj;
-			goto existing;
-		}
-	}
-	/*newly created OD*/
-	odm->mo = gf_mo_new();
-	gf_list_add(scene->scene_objects, odm->mo);
-	odm->mo->odm = odm;
-	odm->mo->OD_ID = odm->OD->objectDescriptorID;
-
-existing:
-	/*setup object type*/
-	if (!odm->codec) odm->mo->type = GF_MEDIA_OBJECT_SCENE;
-	else if (odm->codec->type == GF_STREAM_VISUAL) odm->mo->type = GF_MEDIA_OBJECT_VIDEO;
-	else if (odm->codec->type == GF_STREAM_AUDIO) odm->mo->type = GF_MEDIA_OBJECT_AUDIO;
-	else if (odm->codec->type == GF_STREAM_TEXT) odm->mo->type = GF_MEDIA_OBJECT_TEXT;
-	else if (odm->codec->type == GF_STREAM_SCENE) odm->mo->type = GF_MEDIA_OBJECT_UPDATES;
-
-	/*update info*/
-	gf_mo_update_caps(odm->mo);
-	/*media object playback has already been requested by the scene, trigger media start*/
-	if (odm->mo->num_open && !odm->state) {
-		gf_odm_start(odm, 0);
-		if (odm->mo->speed != FIX_ONE) gf_odm_set_speed(odm, odm->mo->speed, GF_TRUE);
-	}
-	if ((odm->mo->type==GF_MEDIA_OBJECT_VIDEO) && scene->is_dynamic_scene && !odm->parentscene->root_od->addon) {
-		gf_scene_force_size_to_video(scene, odm->mo);
-	}
-	/*invalidate scene for all nodes using the OD*/
-	gf_term_invalidate_compositor(odm->term);
-}
-
-GF_EXPORT
-void gf_scene_set_duration(GF_Scene *scene)
-{
-	Double dur;
-	u32 i;
-	u64 max_dur;
-	GF_ObjectManager *odm;
-#ifndef GPAC_DISABLE_VRML
-	MediaSensorStack *media_sens;
-#endif
-	GF_Clock *ck;
-
-	/*this is not normative but works in so many cases... set the duration to the max duration
-	of all streams sharing the clock*/
-	ck = gf_odm_get_media_clock(scene->root_od);
-	max_dur = scene->root_od->duration;
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (!odm->codec) continue;
-		if (!ck || gf_odm_shares_clock(odm, ck)) {
-			if (odm->duration>max_dur) max_dur = odm->duration;
-		}
-	}
-	if (scene->duration == max_dur) return;
-
-	scene->duration = max_dur;
-	if (scene->is_dynamic_scene && !scene->root_od->duration) scene->root_od->duration = max_dur;
-
-	dur = (Double) (s64) scene->duration;
-	dur /= 1000;
-
-#ifndef GPAC_DISABLE_VRML
-	i=0;
-	while ((media_sens = (MediaSensorStack*)gf_list_enum(scene->root_od->ms_stack, &i))) {
-		if (media_sens->sensor->isActive) {
-			media_sens->sensor->mediaDuration = dur;
-			gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
-		}
-	}
-#endif
-
-	if ((scene == scene->root_od->term->root_scene) && scene->root_od->term->user->EventProc) {
-		GF_Event evt;
-		evt.type = GF_EVENT_DURATION;
-		evt.duration.duration = dur;
-		evt.duration.can_seek = (scene->root_od->flags & GF_ODM_NO_TIME_CTRL) ? GF_FALSE : GF_TRUE;
-		if (dur<1.0) evt.duration.can_seek = 0;
-		gf_term_send_event(scene->root_od->term,&evt);
-	}
-
-}
-
-GF_EXPORT
-void gf_scene_set_timeshift_depth(GF_Scene *scene)
-{
-	u32 i;
-	u32 max_timeshift;
-	GF_ObjectManager *odm;
-	GF_Clock *ck;
-
-	ck = gf_odm_get_media_clock(scene->root_od);
-	max_timeshift = scene->root_od->timeshift_depth;
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (!odm->codec) continue;
-		if (!ck || gf_odm_shares_clock(odm, ck)) {
-			if (odm->timeshift_depth > max_timeshift) max_timeshift = odm->timeshift_depth;
-		}
-	}
-	if (scene->timeshift_depth == max_timeshift) return;
-
-	scene->timeshift_depth = max_timeshift;
-	if (scene->is_dynamic_scene && !scene->root_od->timeshift_depth) scene->root_od->timeshift_depth = max_timeshift;
-	if (scene->root_od->addon && (scene->root_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-		if (scene->root_od->parentscene->is_dynamic_scene && (scene->root_od->parentscene->timeshift_depth < max_timeshift)) {
-			scene->root_od->parentscene->timeshift_depth = max_timeshift;
-			scene->root_od->parentscene->root_od->timeshift_depth = max_timeshift;
-			gf_scene_notify_event(scene->root_od->parentscene, GF_EVENT_TIMESHIFT_DEPTH, NULL, NULL, GF_OK, GF_FALSE);
-		}
-	} else {
-		gf_scene_notify_event(scene, GF_EVENT_TIMESHIFT_DEPTH, NULL, NULL, GF_OK, GF_FALSE);
-	}
-}
-
-
-GF_MediaObject *gf_scene_find_object(GF_Scene *scene, u16 ODID, char *url)
-{
-	u32 i;
-	GF_MediaObject *mo;
-	if (!url && !ODID) return NULL;
-	i=0;
-	while ((mo = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
-		if ((ODID==GF_MEDIA_EXTERNAL_ID) && url) {
-			if (mo->URLs.count && !stricmp(mo->URLs.vals[0].url, url)) return mo;
-		} else if (mo->OD_ID==ODID) {
-			return mo;
-		}
-	}
-	return NULL;
-}
-
-
-GF_EXPORT
-void gf_scene_register_extra_graph(GF_Scene *scene, GF_SceneGraph *extra_scene, Bool do_remove)
-{
-	if (do_remove) {
-		if (gf_list_find(scene->extra_scenes, extra_scene)<0) return;
-		gf_list_del_item(scene->extra_scenes, extra_scene);
-		/*for root scene*/
-		if (scene->root_od->term->root_scene == scene) {
-			gf_sc_register_extra_graph(scene->root_od->term->compositor, extra_scene, 1);
-		}
-	} else {
-		if (gf_list_find(scene->extra_scenes, extra_scene)>=0) return;
-		gf_list_add(scene->extra_scenes, extra_scene);
-		/*for root scene*/
-		if (scene->root_od->term->root_scene == scene) {
-			gf_sc_register_extra_graph(scene->root_od->term->compositor, extra_scene, 0);
-		}
-	}
-}
-
-
-static void gf_scene_get_video_size(GF_MediaObject *mo, u32 *w, u32 *h)
-{
-	u32 pixel_ar;
-	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL, NULL)) return;
-	if (pixel_ar) {
-		u32 n, d;
-		n = (pixel_ar>>16) & 0x0000FFFF;
-		d = (pixel_ar) & 0x0000FFFF;
-		*w = (*w * n) / d;
-	}
-#ifndef GPAC_DISABLE_3D
-	if (mo->odm) {
-		if (mo->odm->term->compositor->frame_packing==GF_3D_STEREO_TOP) *h /= 2;
-		else if (mo->odm->term->compositor->frame_packing==GF_3D_STEREO_SIDE) *w /= 2;
-	}
-#endif
-}
-
-void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo)
-{
-	u32 w, h;
-	gf_scene_get_video_size(mo, &w, &h);
-
-	if (w && h) gf_scene_force_size(scene, w, h);
-}
-
-#ifndef GPAC_DISABLE_VRML
-
-static void IS_UpdateVideoPos(GF_Scene *scene)
-{
-	MFURL url;
-	M_Transform2D *tr;
-	GF_MediaObject *mo;
-	u32 w, h, v_w, v_h;
-	if (!scene->visual_url.OD_ID && !scene->visual_url.url) return;
-
-	if (scene->vr_type) return;
-
-	url.count = 1;
-	url.vals = &scene->visual_url;
-	mo = IS_CheckExistingObject(scene, &url, GF_MEDIA_OBJECT_VIDEO);
-	if (!mo) return;
-	tr = (M_Transform2D *) gf_sg_find_node_by_name(scene->graph, "DYN_TRANS");
-	if (!tr) return;
-
-	gf_sg_get_scene_size_info(scene->graph, &w, &h);
-	if (!w || !h) return;
-
-	gf_scene_get_video_size(mo, &v_w, &v_h);
-	if (scene->force_size_set) {
-		if (v_w && v_h) {
-			tr->scale.x = gf_divfix(INT2FIX(w), INT2FIX(v_w));
-			tr->scale.y = gf_divfix(INT2FIX(h), INT2FIX(v_h));
-		}
-		tr->translation.x = tr->translation.y = 0;
-	} else {
-		tr->scale.x = tr->scale.y = FIX_ONE;
-		tr->translation.x = INT2FIX((s32) (w - v_w)) / 2;
-		tr->translation.y = INT2FIX((s32) (h - v_h)) / 2;
-	}
-	gf_node_dirty_set((GF_Node *)tr, 0, 0);
-
-
-	gf_scene_set_addon_layout_info(scene, scene->addon_position, scene->addon_size_factor);
-
-	if (scene->root_od->term->root_scene == scene) {
-		//if (scene->graph_attached) gf_sc_set_scene(scene->root_od->term->compositor, NULL);
-		//gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-	}
-}
-
-static GF_Node *is_create_node(GF_SceneGraph *sg, u32 tag, const char *def_name)
-{
-	GF_Node *n = gf_node_new(sg, tag);
-	if (n) {
-		if (def_name) gf_node_set_id(n, gf_sg_get_next_available_node_id(sg), def_name);
-		gf_node_init(n);
-	}
-	return n;
-}
-
-static Bool is_odm_url(SFURL *url, GF_ObjectManager *odm)
-{
-	if (!url->OD_ID && !url->url) return 0;
-	if (odm->OD->objectDescriptorID != GF_MEDIA_EXTERNAL_ID) return (url->OD_ID==odm->OD->objectDescriptorID) ? 1 : 0;
-	if (!url->url || !odm->OD->URLString) return 0;
-	return !stricmp(url->url, odm->OD->URLString);
-}
-
-static void set_media_url(GF_Scene *scene, SFURL *media_url, GF_Node *node,  MFURL *node_url, u32 type)
-{
-	u32 w, h;
-	SFURL *sfu;
-	Bool url_changed = 0;
-
-	/*scene url is not set, find the first one*/
-	if (!media_url->OD_ID  ) {
-		u32 count, i;
-		GF_ObjectManager *odm = NULL;
-		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->OD)
-				continue;
-
-			if (type==GF_STREAM_TEXT) {
-				if (!odm->codec || ((odm->codec->type!=type) && (odm->codec->type!=GF_STREAM_ND_SUBPIC))) continue;
-			}
-			else if (type==GF_STREAM_SCENE) {
-				if (!odm->subscene || (!odm->subscene->scene_codec && !odm->subscene->is_dynamic_scene) ) continue;
-
-				if (odm->subscene->root_od->addon)
-					continue;
-			}
-			else {
-				if (!odm->codec || (odm->codec->type!=type)) continue;
-
-				//browse from this ODM on untill we find an object with the desired OTI (if any)
-				if ((type==GF_STREAM_AUDIO) && odm->term->prefered_audio_codec_oti) {
-					u32 j;
-					for (j=i; j<count; j++) {
-						GF_ObjectManager*an_odm = (GF_ObjectManager*)gf_list_get(scene->resources, j);
-						if (an_odm->codec && (an_odm->codec->oti==odm->term->prefered_audio_codec_oti)) {
-							odm = an_odm;
-							break;
-						}
-					}
-				}
-			}
-
-			if (scene->selected_service_id && (scene->selected_service_id != odm->OD->ServiceID)) {
-				//objects inserted from broadcast may have been played but not yet registered with the scene, we need to force a stop
-				if ((odm->mo && !odm->mo->num_open) || !odm->mo) {
-					if (odm->state==GF_ODM_STATE_PLAY) {
-						/*do not stop directly*/
-						gf_term_lock_media_queue(odm->term, GF_TRUE);
-						/*if object not in media queue, add it*/
-						if (gf_list_find(odm->term->media_queue, odm)<0) {
-							gf_list_add(odm->term->media_queue, odm);
-						}
-						odm->action_type = GF_ODM_ACTION_STOP;
-						gf_term_lock_media_queue(odm->term, GF_FALSE);
-					}
-				}
-				continue;
-			}
-
-
-			media_url->OD_ID = odm->OD->objectDescriptorID;
-			if (media_url->OD_ID==GF_MEDIA_EXTERNAL_ID) media_url->url = gf_strdup(odm->net_service->url);
-
-			if (!scene->dyn_ck) {
-				if (odm->subscene && odm->subscene->scene_codec) {
-					scene->dyn_ck = odm->subscene->scene_codec->ck;
-				} else if (odm->codec) {
-					scene->dyn_ck = odm->codec->ck;
-				}
-			}
-
-			if (odm->mo && (type==GF_STREAM_VISUAL)) {
-				gf_scene_get_video_size(odm->mo, &w, &h);
-				if (w && h) {
-					scene->force_size_set = 0;
-					gf_sg_set_scene_size_info(scene->graph, w, h, 1);
-					gf_scene_force_size(scene, w, h);
-				}
-			}
-			break;
-		}
-		if (!odm) {
-			if (media_url->OD_ID ) url_changed = 1;
-			media_url->OD_ID = 0;
-			if (media_url->url) {
-				gf_free(media_url->url);
-				media_url->url = NULL;
-			}
-		}
-	}
-
-	if (media_url->OD_ID) {
-		if (!node_url->count) url_changed = 1;
-		else if (node_url->vals[0].OD_ID!=media_url->OD_ID) url_changed = 1;
-		else if (media_url->OD_ID==GF_MEDIA_EXTERNAL_ID) {
-			if (!node_url->vals[0].url || !media_url->url || strcmp(node_url->vals[0].url, media_url->url) ) url_changed = 1;
-		}
-	} else {
-		if (node_url->count) url_changed = 1;
-	}
-
-	if (url_changed) {
-		gf_sg_vrml_mf_reset(node_url, GF_SG_VRML_MFURL);
-		gf_sg_vrml_mf_append(node_url, GF_SG_VRML_MFURL, (void **) &sfu);
-		sfu->OD_ID = media_url->OD_ID;
-		if (media_url->url) sfu->url = gf_strdup(media_url->url);
-
-		gf_node_changed(node, NULL);
-	}
-
-}
-
-static void scene_video_mouse_move(void *param, GF_FieldInfo *field)
-{
-	u32 i, count;
-	GF_Scene *scene = (GF_Scene *) param;
-	SFVec2f tx_coord = * ((SFVec2f *) field->far_ptr);
-
-	if (!scene->visual_url.OD_ID) return;
-
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
-		if (!odm->mo) continue;
-
-		if (odm->codec && odm->mo->OD_ID && (odm->mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (odm->mo->OD_ID==scene->visual_url.OD_ID)) {
-			GF_Err e;
-			u32 w, h;
-			GF_CodecCapability cap;
-			cap.CapCode = GF_CODEC_INTERACT_COORDS;
-			w = FIX2INT( tx_coord.x * 0xFFFF);
-			h = FIX2INT( tx_coord.y * 0xFFFF);
-			cap.cap.valueInt = w<<16 | h;
-
-			e = gf_codec_set_capability(odm->codec, cap);
-			if (e==GF_NOT_SUPPORTED) {
-				GF_Node *n = gf_sg_find_node_by_name(scene->graph, "DYN_TOUCH");
-				if (n) ((M_TouchSensor *)n)->enabled = GF_FALSE;
-			}
-			return;
-		}
-	}
-}
-
-static GF_Node *load_vr_proto_node(GF_SceneGraph *sg, const char *name, const char *def_name)
-{
-	GF_Proto *proto;
-	GF_Node *node;
-	if (!name) name = "urn:inet:gpac:builtin:VRGeometry";
-
-	proto = gf_sg_find_proto(sg, 0, (char *) name);
-	if (!proto) {
-		MFURL *url;
-		proto = gf_sg_proto_new(sg, 0,  (char *) name, GF_FALSE);
-		url = gf_sg_proto_get_extern_url(proto);
-		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"));
-			return NULL;
-		}
-		url->count=1;
-		url->vals[0].url = gf_strdup(name);
-	}
-	node = gf_sg_proto_create_instance(sg, proto);
-	if (node) {
-		if (def_name) gf_node_set_id(node, gf_sg_get_next_available_node_id(sg), def_name);
-		gf_node_init(node);
-	}
-	return node;
-}
-
-
-static void create_movie(GF_Scene *scene, GF_Node *root, const char *tr_name, const char *texture_name, const char *name_geo)
-{
-	M_MovieTexture *mt;
-	GF_Node *n1, *n2;
-
-	/*create a shape and bitmap node*/
-	n2 = is_create_node(scene->graph, TAG_MPEG4_Transform2D, tr_name);
-	gf_node_list_add_child( &((GF_ParentNode *)root)->children, n2);
-	gf_node_register(n2, root);
-	n1 = n2;
-	n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
-	gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-	gf_node_register(n2, n1);
-	n1 = n2;
-	n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
-	((M_Shape *)n1)->appearance = n2;
-	gf_node_register(n2, n1);
-
-	/*note we create a movie texture even for images...*/
-	mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, texture_name);
-	mt->startTime = gf_scene_get_time(scene);
-	((M_Appearance *)n2)->texture = (GF_Node *)mt;
-	gf_node_register((GF_Node *)mt, n2);
-
-	if (scene->srd_type) {
-		GF_Node *app = n2;
-
-		if (scene->vr_type) {
-			n2 = load_vr_proto_node(scene->graph, NULL, name_geo);
-		} else {
-			n2 = is_create_node(scene->graph, TAG_MPEG4_Rectangle, name_geo);
-		}
-
-		((M_Shape *)n1)->geometry = n2;
-		gf_node_register(n2, n1);
-		//force  appearance material2D.filled = TRUE
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Material2D, NULL);
-		((M_Material2D *)n2)->filled = GF_TRUE;
-		((M_Appearance *)app)->material = n2;
-		gf_node_register(n2, app);
-	} else if (scene->vr_type) {
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Sphere, name_geo);
-		((M_Shape *)n1)->geometry = n2;
-		gf_node_register(n2, n1);
-	} else {
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, name_geo);
-		((M_Shape *)n1)->geometry = n2;
-		gf_node_register(n2, n1);
-	}
-}
-/*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*/
-void gf_scene_regenerate(GF_Scene *scene)
-{
-	GF_Node *n1, *n2, *root;
-	GF_Event evt;
-	M_AudioClip *ac;
-	M_MovieTexture *mt;
-	M_AnimationStream *as;
-	M_Inline *dims;
-	M_Transform2D *addon_tr;
-	M_Layer2D *addon_layer;
-	M_Inline *addon_scene;
-	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->net_service->url));
-
-	gf_sc_lock(scene->root_od->term->compositor, 1);
-
-	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
-
-	/*this is the first time, generate a scene graph*/
-	if (!ac) {
-		GF_Event evt;
-
-		/*create an OrderedGroup*/
-		n1 = is_create_node(scene->graph, scene->vr_type ? TAG_MPEG4_Group : TAG_MPEG4_OrderedGroup, NULL);
-		gf_sg_set_root_node(scene->graph, n1);
-		gf_node_register(n1, NULL);
-		root = n1;
-
-		if (! scene->root_od->parentscene) {
-			n2 = is_create_node(scene->graph, TAG_MPEG4_Background2D, "DYN_BACK");
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-			gf_node_register(n2, n1);
-		}
-
-		//create VP info regardless of VR type
-		if (scene->vr_type) {
-			const char *opt;
-			n2 = is_create_node(scene->graph, TAG_MPEG4_Viewpoint, "DYN_VP");
-			((M_Viewpoint *)n2)->position.z = 0;
-			((M_Viewpoint *)n2)->fieldOfView = GF_PI/2;
-
-			opt = gf_cfg_get_key(scene->root_od->term->user->config, "Compositor", "VRDefaultFOV");
-			if (!opt) {
-				opt="1.570796326794897";
-				gf_cfg_set_key(scene->root_od->term->user->config, "Compositor", "VRDefaultFOV", opt);
-			}
-			((M_Viewpoint *)n2)->fieldOfView = FLT2FIX( atof(opt) );
-
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-			gf_node_register(n2, n1);
-
-			n2 = is_create_node(scene->graph, TAG_MPEG4_NavigationInfo, NULL);
-			gf_free( ((M_NavigationInfo *)n2)->type.vals[0] );
-			((M_NavigationInfo *)n2)->type.vals[0] = gf_strdup("VR");
-			gf_free( ((M_NavigationInfo *)n2)->type.vals[1] );
-			((M_NavigationInfo *)n2)->type.vals[1] = gf_strdup("NONE");
-			((M_NavigationInfo *)n2)->type.count = 2;
-			((M_NavigationInfo *)n2)->avatarSize.count = 0;
-
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-			gf_node_register(n2, n1);
-		}
-
-		/*create an sound2D and an audioClip node*/
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-		gf_node_register(n2, n1);
-
-		ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, "DYN_AUDIO1");
-		ac->startTime = gf_scene_get_time(scene);
-		((M_Sound2D *)n2)->source = (GF_Node *)ac;
-		gf_node_register((GF_Node *)ac, n2);
-
-
-		/*transform for any translation due to scene resize (3GPP)*/
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Transform2D, "DYN_TRANS");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-		gf_node_register(n2, n1);
-		n1 = n2;
-
-		/*create a touch sensor for the video*/
-		n2 = is_create_node(scene->graph, TAG_MPEG4_TouchSensor, "DYN_TOUCH");
-		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
-		gf_node_register(n2, n1);
-		gf_sg_route_new_to_callback(scene->graph, n2, 3/*"hitTexCoord_changed"*/, scene, scene_video_mouse_move);
-
-		create_movie(scene, n1, "TR1", "DYN_VIDEO1", "DYN_GEOM1");
-
-		if (! scene->vr_type) {
-			/*text streams controlled through AnimationStream*/
-			n1 = gf_sg_get_root_node(scene->graph);
-			as = (M_AnimationStream *) is_create_node(scene->graph, TAG_MPEG4_AnimationStream, "DYN_TEXT");
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)as);
-			gf_node_register((GF_Node *)as, n1);
-
-
-			/*3GPP DIMS streams controlled */
-			n1 = gf_sg_get_root_node(scene->graph);
-			dims = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "DIMS_SCENE");
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)dims);
-			gf_node_register((GF_Node *)dims, n1);
-
-			/*PVR version of live content*/
-			n1 = gf_sg_get_root_node(scene->graph);
-			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "PVR_SCENE");
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_scene);
-			gf_node_register((GF_Node *)addon_scene, (GF_Node *)n1);
-
-			/*Media addon scene*/
-			n1 = gf_sg_get_root_node(scene->graph);
-			addon_tr = (M_Transform2D *) is_create_node(scene->graph, TAG_MPEG4_Transform2D, "ADDON_TRANS");
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_tr);
-			gf_node_register((GF_Node *)addon_tr, n1);
-
-			addon_layer = (M_Layer2D *) is_create_node(scene->graph, TAG_MPEG4_Layer2D, "ADDON_LAYER");
-			gf_node_list_add_child( &((GF_ParentNode *)addon_tr)->children, (GF_Node*)addon_layer);
-			gf_node_register((GF_Node *)addon_layer, (GF_Node *)addon_tr);
-
-			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "ADDON_SCENE");
-			gf_node_list_add_child( &((GF_ParentNode *)addon_layer)->children, (GF_Node*)addon_scene);
-			gf_node_register((GF_Node *)addon_scene, (GF_Node *)addon_layer);
-		}
-		//VR mode, add VR headup
-		else {
-			GF_Node *vrhud = load_vr_proto_node(scene->graph, "urn:inet:gpac:builtin:VRHUD", NULL);
-			gf_node_list_add_child( &((GF_ParentNode *)root)->children, (GF_Node*)vrhud);
-			gf_node_register(vrhud, root);
-		}
-
-
-		//send activation for sensors
-		memset(&evt, 0, sizeof(GF_Event));
-		evt.type = GF_EVENT_SENSOR_REQUEST;
-		evt.activate_sensor.activate = scene->vr_type;
-		evt.activate_sensor.sensor_type = GF_EVENT_SENSOR_ORIENTATION;
-		if (gf_term_send_event(scene->root_od->term, &evt)==GF_TRUE) {
-			scene->root_od->term->orientation_sensors_active = scene->vr_type;
-		} else {
-			scene->root_od->term->orientation_sensors_active = GF_FALSE;
-		}
-	}
-
-	if (scene->ambisonic_type) {
-		char szName[20];
-		SFURL url;
-		u32 i, count;
-		GF_Node *an, *root = gf_sg_get_root_node(scene->graph);
-		url.url = NULL;
-		url.OD_ID = 0;
-
-		count = gf_list_count(scene->resources);
-		for (i=0; i<count; i++) {
-			GF_ObjectManager *odm = gf_list_get(scene->resources, i);
-			if (!odm->ambi_ch_id) continue;
-
-			sprintf(szName, "DYN_AUDIO%d", odm->ambi_ch_id);
-			an = gf_sg_find_node_by_name(scene->graph, szName);
-			if (!an) {
-				/*create an sound2D and an audioClip node*/
-				an = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
-				gf_node_list_add_child( &((GF_ParentNode *)root)->children, an);
-				gf_node_register(an, root);
-
-				ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, szName);
-				ac->startTime = gf_scene_get_time(scene);
-				((M_Sound2D *)an)->source = (GF_Node *)ac;
-				gf_node_register((GF_Node *)ac, an);
-			}
-			ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, szName);
-
-			url.OD_ID = odm->OD->objectDescriptorID;
-			set_media_url(scene, &url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
-		}
-	} else {
-		ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
-		set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
-	}
-
-
-	if (scene->srd_type) {
-		char szName[20], szTex[20], szGeom[20];
-		u32 i, nb_srd = 0, srd_missing = 0;
-		GF_ObjectManager *a_odm;
-		SFURL url;
-		u32 sw, sh;
-		s32 min_x, max_x, min_y, max_y;
-		i=0;
-
-		//we use 0 (and not INT_MAX) to always display the same thing regardless of holes in the srd description
-		min_x = min_y = 0;
-		max_x = max_y = 0;
-
-		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-			if (!a_odm->mo || !a_odm->mo->srd_w) {
-				srd_missing++;
-				continue;
-			}
-			if ((s32) a_odm->mo->srd_x < min_x) min_x = (s32) a_odm->mo->srd_x;
-			if ((s32) a_odm->mo->srd_y < min_y) min_y = (s32) a_odm->mo->srd_y;
-
-			if (!max_x)
-				max_x = a_odm->mo->srd_full_w;
-			if ((s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w > min_x + max_x)
-				max_x = (s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w - min_x;
-
-			if (!max_y)
-				max_y = a_odm->mo->srd_full_h;
-
-			if ((s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h > min_y + max_y)
-				max_y = (s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h - min_y;
-
-			nb_srd++;
-		}
-
-		n1 = gf_sg_find_node_by_name(scene->graph, "DYN_TRANS");
-		for (i=1; i<nb_srd+srd_missing; i++) {
-			sprintf(szName, "TR%d", i+1);
-			sprintf(szTex, "DYN_VIDEO%d", i+1);
-			sprintf(szGeom, "DYN_GEOM%d", i+1);
-			n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
-			if (!n2) {
-				create_movie(scene, n1, szName, szTex, szGeom);
-			}
-		}
-		assert(max_x>min_x);
-		assert(max_y>min_y);
-
-		scene->srd_min_x = min_x;
-		scene->srd_min_y = min_y;
-		scene->srd_max_x = max_x;
-		scene->srd_max_y = max_y;
-
-		url.url = NULL;
-		gf_sg_get_scene_size_info(scene->graph, &sw, &sh);
-		i=0;
-		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-			if (a_odm->mo && a_odm->mo->srd_w) {
-				Fixed tw, th, tx, ty;
-
-				sprintf(szName, "TR%d", i);
-				sprintf(szTex, "DYN_VIDEO%d", i);
-				sprintf(szGeom, "DYN_GEOM%d", i);
-				url.OD_ID = a_odm->OD->objectDescriptorID;
-
-				mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, szTex);
-				if (!mt) continue;
-
-				set_media_url(scene, &url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
-
-				if (!scene->dyn_ck && a_odm->codec) {
-					scene->dyn_ck = a_odm->codec->ck;
-				}
-
-				if (scene->vr_type) {
-					n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
-					gf_node_changed(n2, NULL);
-				} else {
-					tw = INT2FIX( sw * a_odm->mo->srd_w) /  (max_x - min_x);
-					th = INT2FIX(sh * a_odm->mo->srd_h) / (max_y - min_y);
-
-					n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
-					((M_Rectangle *)n2)->size.x = tw;
-					((M_Rectangle *)n2)->size.y = th;
-					gf_node_changed(n2, NULL);
-
-					tx = INT2FIX(a_odm->mo->srd_x * sw) / (max_x - min_x);
-					tx = tx - INT2FIX(sw) / 2 + INT2FIX(tw) / 2;
-
-					ty = INT2FIX(a_odm->mo->srd_y * sh) / (max_y - min_y);
-					ty = INT2FIX(sh) / 2 - ty - INT2FIX(th) / 2;
-
-					addon_tr = (M_Transform2D  *) gf_sg_find_node_by_name(scene->graph, szName);
-					addon_tr->translation.x = tx;
-					addon_tr->translation.y = ty;
-					gf_node_changed((GF_Node *)addon_tr, NULL);
-				}
-			}
-		}
-	} else {
-		mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
-		set_media_url(scene, &scene->visual_url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
-	}
-
-
-	if (! scene->vr_type) {
-		as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
-		set_media_url(scene, &scene->text_url, (GF_Node*)as, &as->url, GF_STREAM_TEXT);
-
-		dims = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "DIMS_SCENE");
-		set_media_url(scene, &scene->dims_url, (GF_Node*)dims, &dims->url, GF_STREAM_SCENE);
-	}
-
-	gf_sc_lock(scene->root_od->term->compositor, 0);
-
-	/*disconnect to force resize*/
-	if (scene->root_od->term->root_scene == scene) {
-		gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-		scene->graph_attached = 1;
-		evt.type = GF_EVENT_STREAMLIST;
-		gf_term_send_event(scene->root_od->term, &evt);
-		IS_UpdateVideoPos(scene);
-	} else {
-		gf_scene_notify_event(scene, scene->graph_attached ? GF_EVENT_STREAMLIST : GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
-		scene->graph_attached = 1;
-		gf_term_invalidate_compositor(scene->root_od->term);
-	}
-}
-
-void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons)
-{
-	M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "ADDON_SCENE");
-
-	if (show_addons) {
-		GF_AssociatedContentLocation addon_info;
-		memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
-		addon_info.timeline_id = -100;
-		gf_scene_register_associated_media(scene, &addon_info);
-	} else {
-		gf_sg_vrml_mf_reset(&dscene->url, GF_SG_VRML_MFURL);
-	}
-	gf_node_changed((GF_Node *)dscene, NULL);
-}
-
-#else
-/*!!fixme - we would need an SVG scene in case no VRML support is present !!!*/
-GF_EXPORT
-void gf_scene_regenerate(GF_Scene *scene) {}
-GF_EXPORT
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check) {}
-GF_EXPORT
-void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm) {}
-GF_EXPORT
-void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons) { }
-GF_EXPORT
-void gf_scene_resume_live(GF_Scene *subscene) { }
-GF_EXPORT
-void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor) {}
-GF_EXPORT
-void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time) { }
-
-#endif	/*GPAC_DISABLE_VRML*/
-
-#ifndef GPAC_DISABLE_VRML
-
-static Bool check_odm_deactivate(SFURL *url, GF_ObjectManager *odm, GF_Node *n)
-{
-	GF_FieldInfo info;
-	if (!is_odm_url(url, odm) || !n) return 0;
-
-	if (url->url) gf_free(url->url);
-	url->url = NULL;
-	url->OD_ID = 0;
-
-	gf_node_get_field_by_name(n, "url", &info);
-	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
-	gf_node_get_field_by_name(n, "stopTime", &info);
-	*((SFTime *)info.far_ptr) = gf_node_get_scene_time(n);
-	gf_node_changed(n, NULL);
-	return 1;
-}
-
-static void odm_deactivate(GF_Node *n)
-{
-	GF_FieldInfo info;
-
-	gf_node_get_field_by_name(n, "url", &info);
-	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
-	gf_node_get_field_by_name(n, "stopTime", &info);
-	*((SFTime *)info.far_ptr) = gf_node_get_scene_time(n);
-	gf_node_changed(n, NULL);
-}
-
-static void odm_activate(SFURL *url, GF_Node *n)
-{
-	SFURL *sfu;
-	GF_FieldInfo info;
-
-	gf_node_get_field_by_name(n, "url", &info);
-	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
-	if (url->OD_ID || url->url) {
-		gf_sg_vrml_mf_append(info.far_ptr, GF_SG_VRML_MFURL, (void **) &sfu);
-		sfu->OD_ID = url->OD_ID;
-		if (url->url) sfu->url = gf_strdup(url->url);
-
-		gf_node_get_field_by_name(n, "startTime", &info);
-		*((SFTime *)info.far_ptr) = 0.0;
-		gf_node_get_field_by_name(n, "stopTime", &info);
-		*((SFTime *)info.far_ptr) = 0.0;
-	}
-
-	gf_node_changed(n, NULL);
-}
-
-void gf_scene_set_service_id(GF_Scene *scene, u32 service_id)
-{
-	if (!scene->is_dynamic_scene) return;
-
-	gf_sc_lock(scene->root_od->term->compositor, 1);
-	if (scene->selected_service_id != service_id) {
-		u32 i;
-		GF_ObjectManager *odm, *remote_odm = NULL;
-		//delete all objects with given service ID
-		i=0;
-		while ((odm = gf_list_enum(scene->resources, &i))) {
-			if (odm->OD->ServiceID!=scene->selected_service_id) continue;
-			if (odm->OD->URLString) {
-				remote_odm = odm;
-				assert(remote_odm->net_service->nb_odm_users);
-				remote_odm->net_service->nb_odm_users--;
-				remote_odm->net_service = scene->root_od->net_service;
-				remote_odm->net_service->nb_odm_users++;
-			}
-			//delete all objects from this service
-			else if (remote_odm) {
-				gf_term_lock_media_queue(scene->root_od->term, 1);
-				if (odm->net_service==remote_odm->net_service) odm->net_service->owner = odm;
-				odm->action_type = GF_ODM_ACTION_DELETE;
-				gf_list_add(scene->root_od->term->media_queue, odm);
-				gf_term_lock_media_queue(scene->root_od->term, 0);
-			}
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Switching %s from service %d to service %d (media time %g)\n", scene->root_od->net_service->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;
-		scene->visual_url.OD_ID = 0;
-		scene->text_url.OD_ID = 0;
-		scene->dims_url.OD_ID = 0;
-		scene->force_size_set = 0;
-		//reset clock since we change service IDs, but request a PLAY from the current time
-		if (scene->dyn_ck) {
-			scene->root_od->media_start_time = gf_clock_media_time(scene->dyn_ck);
-			scene->dyn_ck = NULL;
-		}
-		if (remote_odm) {
-			i=0;
-			while ((odm = gf_list_enum(scene->resources, &i))) {
-				if (odm->OD->ServiceID!=scene->selected_service_id) continue;
-				if (odm->OD->RedirectOnly) {
-					//gf_odm_setup_object will increment the number of odms in net service (it's supposed to
-					//be called only upon startup, but we reuse the function). Since we are already registered
-					//with the service, decrement before calling
-					odm->net_service->nb_odm_users--;
-					gf_odm_setup_object(odm, odm->net_service);
-				}
-				break;
-			}
-		}
-		gf_scene_regenerate(scene);
-	}
-	gf_sc_lock(scene->root_od->term->compositor, 0);
-}
-
-GF_EXPORT
-void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm)
-{
-	char *url;
-	if (!scene->is_dynamic_scene || !scene->graph_attached || !odm) return;
-
-	if (!odm->codec) {
-		if (!odm->addon) return;
-	}
-
-	if (odm->OD->ServiceID && scene->selected_service_id && (scene->selected_service_id != odm->OD->ServiceID)) {
-		gf_scene_set_service_id(scene, odm->OD->ServiceID);
-		return;
-	}
-
-
-	if (odm->state) {
-		if (check_odm_deactivate(&scene->audio_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1")) ) return;
-		if (check_odm_deactivate(&scene->visual_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1") )) return;
-		if (check_odm_deactivate(&scene->text_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT") )) return;
-	}
-
-
-	if (!odm->codec && odm->subscene) {
-		M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "ADDON_SCENE");
-
-		if (!dscene)
-			return;
-
-		if (odm->addon && odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
-			return;
-		}
-
-		gf_sg_vrml_field_copy(&dscene->url, &odm->mo->URLs, GF_SG_VRML_MFURL);
-		gf_node_changed((GF_Node *)dscene, NULL);
-		//do not update video pos for addons, this is done only when setting up the main video object
-		return;
-	}
-
-	if (odm->codec->type == GF_STREAM_AUDIO) {
-		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
-		if (!ac) return;
-		if (scene->audio_url.url) gf_free(scene->audio_url.url);
-		scene->audio_url.url = NULL;
-		scene->audio_url.OD_ID = odm->OD->objectDescriptorID;
-		if (!ac->url.count) gf_sg_vrml_mf_alloc(&ac->url, GF_SG_VRML_MFURL, 1);
-		ac->url.vals[0].OD_ID = odm->OD->objectDescriptorID;
-		if (ac->url.vals[0].url) {
-			gf_free(ac->url.vals[0].url);
-			ac->url.vals[0].url = NULL;
-		}
-		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
-		if (url) {
-			scene->audio_url.url = gf_strdup(url);
-			ac->url.vals[0].url = gf_strdup(url);
-		}
-		ac->startTime = gf_scene_get_time(scene);
-		gf_node_changed((GF_Node *)ac, NULL);
-		return;
-	}
-
-	if (odm->codec->type == GF_STREAM_VISUAL) {
-		M_MovieTexture *mt = (M_MovieTexture*) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
-		if (!mt) return;
-		if (scene->visual_url.url) gf_free(scene->visual_url.url);
-		scene->visual_url.url = NULL;
-		scene->visual_url.OD_ID = odm->OD->objectDescriptorID;
-		if (!mt->url.count) gf_sg_vrml_mf_alloc(&mt->url, GF_SG_VRML_MFURL, 1);
-		mt->url.vals[0].OD_ID = odm->OD->objectDescriptorID;
-		if (mt->url.vals[0].url) gf_free(mt->url.vals[0].url);
-		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
-		if (url) {
-			scene->visual_url.url = gf_strdup(url);
-			mt->url.vals[0].url = gf_strdup(url);
-		}
-		mt->startTime = gf_scene_get_time(scene);
-		gf_node_changed((GF_Node *)mt, NULL);
-		if (odm->mo) gf_scene_force_size_to_video(scene, odm->mo);
-		scene->selected_service_id = odm->OD->ServiceID;
-		return;
-	}
-
-
-	if (odm->codec->type == GF_STREAM_TEXT) {
-		M_AnimationStream *as = (M_AnimationStream*) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
-		if (!as) return;
-		if (scene->text_url.url) gf_free(scene->text_url.url);
-		scene->text_url.url = NULL;
-		scene->text_url.OD_ID = odm->OD->objectDescriptorID;
-		if (!as->url.count) gf_sg_vrml_mf_alloc(&as->url, GF_SG_VRML_MFURL, 1);
-		as->url.vals[0].OD_ID = odm->OD->objectDescriptorID;
-		if (as->url.vals[0].url) gf_free(as->url.vals[0].url);
-		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
-		if (url) {
-			scene->text_url.url = gf_strdup(url);
-			as->url.vals[0].url = gf_strdup(url);
-		}
-		as->startTime = gf_scene_get_time(scene);
-		gf_node_changed((GF_Node *)as, NULL);
-		return;
-	}
-}
-
-void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time)
-{
-	GF_DOM_Event devt;
-	const char *opt = gf_cfg_get_key(scene->root_od->term->user->config, "Systems", "DebugPVRScene");
-	M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, (opt && !strcmp(opt, "yes")) ? "ADDON_SCENE" : "PVR_SCENE");
-
-	if (scene->main_addon_selected==set_on) return;
-	scene->main_addon_selected = set_on;
-
-	if (set_on) {
-		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
-		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
-		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
-
-
-		if (!odm->subscene->graph_attached) {
-			odm->flags &= ~GF_ODM_REGENERATE_SCENE;
-			gf_scene_regenerate(odm->subscene);
-		} else {
-			odm->subscene->needs_restart = 1;
-		}
-
-		//main addon is vod not live, store clock
-		if (! odm->timeshift_depth &&  !scene->sys_clock_at_main_activation) {
-			scene->sys_clock_at_main_activation = gf_sys_clock();
-			scene->obj_clock_at_main_activation = current_clock_time;
-		}
-
-
-		gf_sg_vrml_field_copy(&dscene->url, &odm->mo->URLs, GF_SG_VRML_MFURL);
-		gf_node_changed((GF_Node *)dscene, NULL);
-	} else {
-		GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-		//reactivating the main content will trigger a reset on the clock - remember where we are and resume from this point
-		scene->root_od->media_start_time = gf_clock_media_time(ck);
-
-		scene->sys_clock_at_main_activation = 0;
-		scene->obj_clock_at_main_activation = 0;
-
-		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
-		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
-		odm_activate(&scene->text_url, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
-
-		gf_sg_vrml_mf_reset(&dscene->url, GF_SG_VRML_MFURL);
-		gf_node_changed((GF_Node *)dscene, NULL);
-	}
-
-	memset(&devt, 0, sizeof(GF_DOM_Event));
-	devt.type = GF_EVENT_MAIN_ADDON_STATE;
-	devt.detail = set_on;
-	gf_scene_notify_event(scene, GF_EVENT_MAIN_ADDON_STATE, NULL, &devt, GF_OK, GF_FALSE);
-
-}
-
-GF_EXPORT
-void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor)
-{
-	MFURL url;
-	M_Transform2D *tr;
-	M_Layer2D *layer;
-	GF_MediaObject *mo;
-	s32 w, h, v_w, v_h;
-	if (!scene->visual_url.OD_ID && !scene->visual_url.url) return;
-
-	url.count = 1;
-	url.vals = &scene->visual_url;
-	mo = IS_CheckExistingObject(scene, &url, GF_MEDIA_OBJECT_VIDEO);
-	if (!mo) return;
-
-	scene->addon_position = position;
-	scene->addon_size_factor = size_factor;
-
-	gf_scene_get_video_size(mo, (u32 *) &v_w, (u32 *) &v_h);
-	w = v_w;
-	h = v_h;
-	switch (size_factor) {
-	case 0:
-		v_w /= 2;
-		v_h /= 2;
-		break;
-	case 1:
-		v_w /= 3;
-		v_h /= 3;
-		break;
-	case 2:
-	default:
-		v_w /= 4;
-		v_h /= 4;
-		break;
-	}
-
-	layer = (M_Layer2D *) gf_sg_find_node_by_name(scene->graph, "ADDON_LAYER");
-	if (!layer) return;
-	layer->size.x = INT2FIX(v_w);
-	layer->size.y = INT2FIX(v_h);
-	gf_node_dirty_set((GF_Node *)layer, 0, 0);
-
-	tr = (M_Transform2D *) gf_sg_find_node_by_name(scene->graph, "ADDON_TRANS");
-	if (!tr) return;
-	switch (position) {
-	case 0:
-		tr->translation.x = INT2FIX(w - v_w) / 2;
-		tr->translation.y = INT2FIX(v_h - h) / 2;
-		break;
-	case 1:
-		tr->translation.x = INT2FIX(w - v_w) / 2;
-		tr->translation.y = INT2FIX(h - v_h) / 2;
-		break;
-	case 2:
-		tr->translation.x = INT2FIX(v_w - w) / 2;
-		tr->translation.y = INT2FIX(v_h - h) / 2;
-		break;
-	case 3:
-		tr->translation.x = INT2FIX(v_w - w) / 2;
-		tr->translation.y = INT2FIX(h - v_h) / 2;
-		break;
-	}
-	gf_node_dirty_set((GF_Node *)tr, 0, 0);
-}
-
-GF_EXPORT
-void gf_scene_resume_live(GF_Scene *subscene)
-{
-	if (subscene->main_addon_selected)
-		mediacontrol_resume(subscene->root_od, 1);
-}
-
-void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check)
-{
-	u32 i;
-	GF_Clock *ck;
-	GF_List *to_restart;
-	GF_ObjectManager *odm;
-	if (restart_only) {
-		from_time = 0;
-	}
-
-	ck = scene->dyn_ck;
-	if (scene->scene_codec) ck = scene->scene_codec->ck;
-	if (!ck) return;
-
-	//first pass to check if we need to enable the addon acting as time shifting
-	if (!disable_addon_check) {
-		i=0;
-		while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-
-			if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
-				//assign clock if not yet available
-				if (odm->addon->root_od->subscene && !odm->addon->root_od->subscene->dyn_ck)
-					odm->addon->root_od->subscene->dyn_ck = scene->dyn_ck;
-
-				//we're timeshifting through the main addon, activate it
-				if (from_time < -1) {
-					gf_scene_select_main_addon(scene, odm, GF_TRUE, gf_clock_time(ck));
-
-					/*no timeshift, this is a VoD associated with the live broadcast: get current time*/
-					if (! odm->timeshift_depth) {
-						s64 live_clock = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
-
-						from_time += 1;
-						if (live_clock + from_time < 0) from_time = 0;
-						else from_time = live_clock + from_time;
-					}
-				} else if (scene->main_addon_selected) {
-					gf_scene_select_main_addon(scene, odm, GF_FALSE, 0);
-				}
-			}
-		}
-	}
-
-	to_restart = gf_list_new();
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (gf_odm_shares_clock(odm, ck)) {
-			if (odm->state != GF_ODM_STATE_BLOCKED) {
-
-				//object is not an addon and main addon is selected, do not add
-				if (!odm->addon && scene->main_addon_selected) {
-				}
-				//object is an addon and enabled, restart if main and main is enabled, or if not main
-				else if (odm->addon && odm->addon->enabled) {
-					if (odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
-						if (scene->main_addon_selected) {
-							gf_list_add(to_restart, odm);
-						}
-					} else {
-						gf_list_add(to_restart, odm);
-					}
-				} else if (!scene->selected_service_id || (scene->selected_service_id==odm->OD->ServiceID)) {
-					gf_list_add(to_restart, odm);
-				}
-
-				if (odm->state == GF_ODM_STATE_PLAY) {
-					gf_odm_stop(odm, 1);
-				}
-			}
-		}
-	}
-
-	if (!restart_only) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Scene] Restarting from "LLD"\n", LLD_CAST 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) ));
-	}
-
-
-	/*restart objects*/
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
-		if (from_time<0) {
-			odm->media_stop_time = from_time + 1;
-		} else {
-			odm->media_start_time = from_time;
-		}
-
-		if (odm->subscene && odm->subscene->is_dynamic_scene) {
-			gf_scene_restart_dynamic(odm->subscene, from_time, 0, 0);
-		} else {
-			gf_odm_start(odm, 0);
-		}
-	}
-	gf_list_del(to_restart);
-
-	/*also check nodes since they may be deactivated (end of stream)*/
-	if (scene->is_dynamic_scene) {
-		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
-		M_MovieTexture *mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
-		M_AnimationStream *as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
-		if (ac) {
-			ac->startTime = gf_scene_get_time(scene);
-			gf_node_changed((GF_Node *)ac, NULL);
-		}
-		if (mt) {
-			mt->startTime = gf_scene_get_time(scene);
-			gf_node_changed((GF_Node *)mt, NULL);
-		}
-		if (as) {
-			as->startTime = gf_scene_get_time(scene);
-			gf_node_changed((GF_Node *)as, NULL);
-		}
-	}
-}
-
-#endif /*GPAC_DISABLE_VRML*/
-
-
-GF_EXPORT
-void gf_scene_force_size(GF_Scene *scene, u32 width, u32 height)
-{
-	Bool skip_notif = GF_FALSE;
-
-	/*for now only allowed when no scene info*/
-	if (!scene->is_dynamic_scene) return;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Scene] Forcing scene size to %d x %d\n", width, height));
-
-	if (scene->vr_type) {
-		/*for 360 don't set scene size to full-size , only half of it*/
-		width /= 2;
-		height /= 2;
-		/*if we already processed a force size in 360, don't do it again*/
-		if (scene->force_size_set)
-			return;
-
-#ifndef GPAC_DISABLE_VRML
-		scene->force_size_set = GF_TRUE;
-		if (! scene->srd_type) {
-			GF_Node *node = gf_sg_find_node_by_name(scene->graph, "DYN_GEOM1");
-			if (node && (((M_Sphere *)node)->radius == FIX_ONE)) {
-				u32 radius = MAX(width, height)/4;
-
-				((M_Sphere *)node)->radius = - INT2FIX(radius);
-				gf_node_changed(node, NULL);
-			}
-		}
-#endif /* GPAC_DISABLE_VRML */
-	}
-
-	if (scene->is_dynamic_scene) {
-		GF_NetworkCommand com;
-
-		memset(&com, 0, sizeof(GF_NetworkCommand));
-		if (!scene->vr_type) {
-			com.base.command_type = GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE;
-			gf_term_service_command(scene->root_od->net_service, &com);
-		}
-
-		if (scene->root_od->term->root_scene == scene) {
-			if (com.par.width && com.par.height) {
-				gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, 1);
-				if (!scene->force_size_set) {
-					gf_sc_set_size(scene->root_od->term->compositor, com.par.width, com.par.height);
-					scene->force_size_set = 1;
-				} else {
-					gf_sc_set_size(scene->root_od->term->compositor, 0, 0);
-				}
-			} else {
-				if (scene->vr_type) {
-					width = MAX(width, height) / 2;
-					gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
-				} else {
-					/*need output resize*/
-					gf_sg_set_scene_size_info(scene->graph, width, height, 1);
-					gf_sc_set_scene(scene->root_od->term->compositor, scene->graph);
-					gf_sc_set_size(scene->root_od->term->compositor, width, height);
-				}
-			}
-
-		} else if (!scene->force_size_set) {
-			if (com.par.width && com.par.height) {
-				width = com.par.width;
-				height = com.par.height;
-			}
-			if (scene->vr_type) {
-				gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
-			} else {
-				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
-			}
-			scene->force_size_set = 1;
-			} else {
-			u32 w, h;
-			gf_sg_get_scene_size_info(scene->graph, &w, &h);
-			if (!com.par.width && !com.par.height && ((w<width) || (h<height)) ) {
-				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
-			} else {
-				GF_DOM_Event devt;
-				memset(&devt, 0, sizeof(GF_DOM_Event));
-				devt.type = GF_EVENT_SCENE_SIZE;
-				devt.screen_rect.width = INT2FIX(width);
-				devt.screen_rect.height = INT2FIX(height);
-
-				devt.key_flags = scene->is_dynamic_scene ? (scene->vr_type ? 2 : 1) : 0;
-
-				gf_scene_notify_event(scene, GF_EVENT_SCENE_SIZE, NULL, &devt, GF_OK, GF_FALSE);
-
-				skip_notif = GF_TRUE;
-
-				width = w;
-				height = h;
-			}
-		}
-	}
-	else if (scene->root_od->parentscene && scene->root_od->parentscene->is_dynamic_scene) {
-		gf_sg_set_scene_size_info(scene->root_od->parentscene->graph, width, height, gf_sg_use_pixel_metrics(scene->root_od->parentscene->graph));
-		if (scene->root_od->term->root_scene == scene->root_od->parentscene) {
-			if (width && height) {
-				gf_sc_set_scene_size(scene->root_od->term->compositor, width, height, GF_TRUE);
-				gf_sc_set_size(scene->root_od->term->compositor, width, height);
-			}
-		}
-	}
-
-	if (scene->vr_type) {
-		gf_sg_set_scene_size_info(scene->graph, 0, 0, GF_TRUE);
-	} else {
-		gf_sg_set_scene_size_info(scene->graph, width, height, GF_TRUE);
-	}
-	if (scene->srd_type)
-		gf_scene_regenerate(scene);
-
-#ifndef GPAC_DISABLE_VRML
-	IS_UpdateVideoPos(scene);
-#endif
-
-	if (skip_notif) return;
-
-	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
-}
-
-
-GF_EXPORT
-Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt)
-{
-	GF_Terminal *term;
-#ifndef GPAC_DISABLE_VRML
-	u32 i;
-	M_Inline *inl;
-#endif
-	GF_Scene *scene;
-	GF_SceneGraph *sg = gf_node_get_graph(caller);
-	if (!sg) return 1;
-	scene = (GF_Scene *)gf_sg_get_private(sg);
-	if (!scene) return 1;
-	term = scene->root_od->term;
-
-	/*if main scene forward to user. If no params or first one not "self" forward to user*/
-	if ((term->root_scene==scene) || !evt->navigate.parameters || !evt->navigate.param_count || (stricmp(evt->navigate.parameters[0], "self") && stricmp(evt->navigate.parameters[0], "_self"))) {
-		if (term->user->EventProc) return gf_term_send_event(term, evt);
-		return 1;
-	}
-
-	if (!scene->root_od->mo) return 1;
-
-	/*FIXME this is too restrictive, we assume the navigate URL is really a presentation one...*/
-#ifndef GPAC_DISABLE_VRML
-	i=0;
-	while ((inl = (M_Inline*)gf_mo_event_target_enum_node(scene->root_od->mo, &i))) {
-		switch (gf_node_get_tag((GF_Node *)inl)) {
-		case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-		case TAG_X3D_Inline:
-#endif
-			gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
-			gf_sg_vrml_mf_alloc(&inl->url, GF_SG_VRML_MFURL, 1);
-			inl->url.vals[0].url = gf_strdup(evt->navigate.to_url ? evt->navigate.to_url : "");
-			/*signal URL change but don't destroy inline scene now since we got this event from inside the scene,
-			this could crash compositors*/
-			scene->needs_restart = 2;
-			break;
-		}
-	}
-#endif
-
-	return 1;
-}
-
-GF_EXPORT
-GF_Compositor *gf_sc_get_compositor(GF_Node *node)
-{
-	GF_Scene *scene;
-	GF_SceneGraph *sg = gf_node_get_graph(node);
-	if (!sg) return NULL;
-	scene = (GF_Scene *)gf_sg_get_private(sg);
-	if (!scene) return NULL;
-	return scene->root_od->term->compositor;
-}
-
-const char *gf_scene_get_fragment_uri(GF_Node *node)
-{
-	GF_SceneGraph *sg = gf_node_get_graph(node);
-	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
-	if (!scene) return NULL;
-	return scene->fragment_uri;
-}
-void gf_scene_set_fragment_uri(GF_Node *node, const char *uri)
-{
-	GF_SceneGraph *sg = gf_node_get_graph(node);
-	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
-	if (!scene) return;
-	if (scene->fragment_uri) {
-		gf_free(scene->fragment_uri);
-		scene->fragment_uri = NULL;
-	}
-	if (uri) scene->fragment_uri = gf_strdup(uri);
-}
-
-
-GF_Node *gf_scene_get_subscene_root(GF_Node *node)
-{
-	GF_Scene *scene;
-	if (!node) return NULL;
-	switch (gf_node_get_tag(node)) {
-#ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline:
-#endif
-		break;
-#endif
-	default:
-		return NULL;
-	}
-	scene = (GF_Scene *)gf_node_get_private(node);
-	if (!scene) return NULL;
-	if (!scene->graph) return NULL;
-	return gf_sg_get_root_node(scene->graph);
-}
-
-/*returns 0 if any of the clock still hasn't seen EOS*/
-Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene, Bool check_buffering)
-{
-	GF_Clock *ck;
-	Bool initialized = GF_FALSE;
-	u32 i;
-	if (scene) {
-		GF_ObjectManager *odm;
-		if (scene->root_od->net_service != ns) {
-			if (!gf_scene_check_clocks(scene->root_od->net_service, scene, check_buffering)) return 0;
-		}
-		i=0;
-		while ( (odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i)) ) {
-			if (odm->net_service && (odm->net_service != ns)) {
-				if (!gf_scene_check_clocks(odm->net_service, NULL, check_buffering)) return 0;
-			} else if (odm->codec && odm->codec->CB) {
-				initialized = GF_TRUE;
-				if (!check_buffering) {
-					if (!gf_cm_is_eos(odm->codec->CB) ) {
-						return 0;
-					}
-				} else {
-					if (odm->codec->ck->Buffering) {
-						return 0;
-					}
-				}
-			}
-		}
-	}
-	i=0;
-	while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &i) ) ) {
-		initialized = GF_TRUE;
-		if (!check_buffering) {
-			if (!ck->has_seen_eos) return 0;
-		} else {
-			if (ck->Buffering) return 0;
-		}
-
-	}
-
-	if (!check_buffering && scene) {
-		if (scene->scene_codec) {
-			initialized = GF_TRUE;
-			if (scene->scene_codec->Status != GF_ESM_CODEC_STOP) return 0;
-		}
-		if (scene->od_codec && (scene->od_codec->Status != GF_ESM_CODEC_STOP)) return 0;
-	}
-	if (!initialized) return 0;
-	return 1;
-}
-
-const char *gf_scene_get_service_url(GF_SceneGraph *sg)
-{
-	GF_Scene *scene = gf_sg_get_private(sg);
-	if (scene) return scene->root_od->net_service->url;
-	return NULL;
-}
-
-Bool gf_scene_is_over(GF_SceneGraph *sg)
-{
-	u32 i, count;
-	GF_Scene *scene = gf_sg_get_private(sg);
-	if (!scene) return 0;
-	if (scene->scene_codec)
-		return (scene->scene_codec->Status==GF_ESM_CODEC_EOS) ? 1 : 0;
-
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
-		if (odm->codec && (odm->codec->Status != GF_ESM_CODEC_EOS) && (odm->codec->Status!=GF_ESM_CODEC_STOP)) return 0;
-		if (odm->subscene && !gf_scene_is_over(odm->subscene->graph) ) return 0;
-	}
-	return 1;
-}
-
-GF_SceneGraph *gf_scene_enum_extra_scene(GF_SceneGraph *sg, u32 *i)
-{
-	GF_Scene *scene = gf_sg_get_private(sg);
-	if (!scene) return NULL;
-	return gf_list_enum(scene->extra_scenes, i);
-}
-
-Bool gf_scene_is_dynamic_scene(GF_SceneGraph *sg)
-{
-	GF_Scene *scene = gf_sg_get_private(sg);
-	if (!scene) return 0;
-	return scene->is_dynamic_scene ? 1 : 0;
-}
-
-#define USE_TEXTURES	0
-
-void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_path)
-{
-#ifndef GPAC_DISABLE_VRML
-	char *url_search;
-	Bool use_old_syntax = 1;
-	GF_Node *n1, *switcher;
-#if USE_TEXTURES
-	GF_Node *n2;
-	M_MovieTexture *mt;
-#else
-	M_Inline *inl;
-#endif
-	GF_Event evt;
-	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
-	gf_sg_reset(scene->graph);
-
-	scene->force_single_timeline = 1;
-	n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
-	gf_sg_set_root_node(scene->graph, n1);
-	gf_node_register(n1, NULL);
-
-	switcher = is_create_node(scene->graph, TAG_MPEG4_Switch, NULL);
-	gf_node_register(switcher, n1);
-	gf_node_list_add_child( &((GF_ParentNode *)n1)->children, switcher);
-	((M_Switch*)switcher)->whichChoice = -2;
-
-	if (strstr(url, "::")) use_old_syntax = 0;
-
-	url_search = url;
-	while (1) {
-		char *sep;
-
-		if (use_old_syntax) {
-			sep = strchr(url_search, ':');
-			/*if :// or :\ is found, skip it*/
-			if (sep && ( ((sep[1] == '/') && (sep[2] == '/')) || (sep[1] == '\\') ) ) {
-				url_search = sep+1;
-				continue;
-			}
-		} else {
-			sep = strstr(url_search, "::");
-		}
-		if (sep) sep[0] = 0;
-
-#if USE_TEXTURES
-		/*create a shape and bitmap node*/
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
-		gf_node_list_add_child( &((M_Switch *)switcher)->choice, n2);
-		gf_node_register(n2, switcher);
-		n1 = n2;
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
-		((M_Shape *)n1)->appearance = n2;
-		gf_node_register(n2, n1);
-
-		/*note we create a movie texture even for images...*/
-		mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, NULL);
-		mt->startTime = gf_scene_get_time(scene);
-		((M_Appearance *)n2)->texture = (GF_Node *)mt;
-		gf_node_register((GF_Node *)mt, n2);
-
-		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, NULL);
-		((M_Shape *)n1)->geometry = n2;
-		gf_node_register(n2, n1);
-
-		gf_sg_vrml_mf_reset(&mt->url, GF_SG_VRML_MFURL);
-		gf_sg_vrml_mf_append(&mt->url, GF_SG_VRML_MFURL, NULL);
-		mt->url.vals[0].url = gf_url_concatenate(parent_path, url);
-#else
-		inl = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, NULL);
-		gf_node_list_add_child( &((M_Switch *)switcher)->choice, (GF_Node *)inl);
-		gf_node_register((GF_Node*) inl, switcher);
-
-		gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
-		gf_sg_vrml_mf_append(&inl->url, GF_SG_VRML_MFURL, NULL);
-		inl->url.vals[0].url = gf_url_concatenate(parent_path, url);
-#endif
-
-		if (!sep) break;
-		sep[0] = ':';
-		if (use_old_syntax) {
-			url = sep+1;
-		} else {
-			url = sep+2;
-		}
-		url_search = url;
-	}
-
-	gf_sc_set_option(scene->root_od->term->compositor, GF_OPT_USE_OPENGL, 1);
-
-	scene->is_dynamic_scene = 2;
-	gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
-
-	gf_scene_attach_to_compositor(scene);
-
-	evt.type = GF_EVENT_CONNECT;
-	evt.connect.is_connected = 1;
-	gf_term_send_event(scene->root_od->term, &evt);
-#endif
-}
-
-void gf_scene_generate_mosaic(GF_Scene *scene, char *url, char *parent_path)
-{
-#ifndef GPAC_DISABLE_VRML
-	char *url_search, *cur_url;
-	Bool use_old_syntax = 1;
-	GF_Node *n1;
-	M_Inline *inl;
-	Bool first_pass = GF_TRUE;
-	u32 nb_items=0, nb_rows=0, nb_cols=0;
-	s32 width=1920, height=1080, x, y, tw=0, th=0;
-
-	GF_Event evt;
-	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
-	gf_sg_reset(scene->graph);
-
-	scene->force_single_timeline = GF_FALSE;
-	n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
-	gf_sg_set_root_node(scene->graph, n1);
-	gf_node_register(n1, NULL);
-
-	if (strstr(url, "::")) use_old_syntax = 0;
-
-restart:
-	url_search = cur_url = url;
-	x = y = 0;
-	while (1) {
-		char *sep;
-
-		if (use_old_syntax) {
-			sep = strchr(url_search, ':');
-			/*if :// or :\ is found, skip it*/
-			if (sep && ( ((sep[1] == '/') && (sep[2] == '/')) || (sep[1] == '\\') ) ) {
-				url_search = sep+1;
-				continue;
-			}
-		} else {
-			sep = strstr(url_search, "::");
-		}
-		if (sep) sep[0] = 0;
-
-		if (first_pass) {
-			nb_items ++;
-		} else {
-			GF_Node *tr = is_create_node(scene->graph, TAG_MPEG4_Transform2D, NULL);
-			GF_Node *layer = is_create_node(scene->graph, TAG_MPEG4_Layer2D, NULL);
-			gf_node_register(tr, n1);
-			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, tr);
-
-			((M_Transform2D *)tr)->translation.x = (Fixed)(-width/2 + tw/2 + x*tw);
-			((M_Transform2D *)tr)->translation.y = (Fixed)(height/2 - th/2 - y*th);
-
-			x++;
-			if (x==nb_cols) {
-				y++;
-				x=0;
-			}
-
-			gf_node_register(layer, tr);
-			gf_node_list_add_child( &((M_Transform2D *)tr)->children, layer);
-			((M_Layer2D *)layer)->size.x = INT2FIX(tw);
-			((M_Layer2D *)layer)->size.y = INT2FIX(th);
-
-			inl = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, NULL);
-			gf_node_list_add_child( &((M_Layer2D *)layer)->children, (GF_Node *)inl);
-			gf_node_register((GF_Node*) inl, layer);
-
-			gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
-			gf_sg_vrml_mf_append(&inl->url, GF_SG_VRML_MFURL, NULL);
-			inl->url.vals[0].url = gf_url_concatenate(parent_path, cur_url);
-		}
-
-		if (!sep) break;
-		sep[0] = ':';
-		if (use_old_syntax) {
-			cur_url = sep+1;
-		} else {
-			cur_url = sep+2;
-		}
-		url_search = cur_url;
-	}
-	if (first_pass) {
-		first_pass = GF_FALSE;
-		nb_cols=(u32) gf_ceil( gf_sqrt(nb_items) );
-		nb_rows=nb_items/nb_cols;
-		if (nb_cols * nb_rows < nb_items) nb_rows++;
-		tw = width/nb_cols;
-		th = height/nb_rows;
-		goto restart;
-	}
-
-	scene->is_dynamic_scene = 2;
-	gf_sg_set_scene_size_info(scene->graph, width, height, 1);
-
-	gf_scene_attach_to_compositor(scene);
-
-	evt.type = GF_EVENT_CONNECT;
-	evt.connect.is_connected = 1;
-	gf_term_send_event(scene->root_od->term, &evt);
-#endif
-}
-
-void gf_scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
-{
-	if (addon->root_od) {
-		GF_Terminal *term = addon->root_od->term;
-		gf_term_lock_net(term, GF_TRUE);
-		addon->root_od->addon = NULL;
-		if (disconnect) {				
-			gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
-			gf_odm_disconnect(addon->root_od, 1);
-		}
-		gf_term_lock_net(term, GF_FALSE);
-	}
-
-	if (addon->url) gf_free(addon->url);
-	gf_free(addon);
-}
-
-void gf_scene_reset_addons(GF_Scene *scene)
-{
-	while (gf_list_count(scene->declared_addons)) {
-		GF_AddonMedia *addon = gf_list_last(scene->declared_addons);
-		gf_list_rem_last(scene->declared_addons);
-
-		gf_scene_reset_addon(addon, GF_FALSE);
-	}
-}
-
-static void load_associated_media(GF_Scene *scene, GF_AddonMedia *addon)
-{
-	GF_MediaObject *mo;
-	MFURL url;
-	SFURL sfurl;
-
-	if (!addon->enabled) return;
-
-	url.count=1;
-	url.vals = &sfurl;
-	url.vals[0].OD_ID = GF_MEDIA_EXTERNAL_ID;
-	url.vals[0].url = (char *)addon->url;
-
-	//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);
-
-	if (!mo || !mo->odm) {
-		assert(0);
-		return;
-	}
-
-	addon->root_od = mo->odm;
-	mo->odm->addon = addon;
-}
-
-GF_EXPORT
-void gf_scene_register_associated_media(GF_Scene *scene, GF_AssociatedContentLocation *addon_info)
-{
-	GF_AddonMedia *addon = NULL;
-	GF_Event evt;
-	u32 i, count;
-	Bool new_addon = 0;
-
-	if (!scene->is_dynamic_scene) return;
-
-	count = gf_list_count(scene->declared_addons);
-	for (i=0; i<count; i++) {
-		Bool my_addon = 0;
-		addon = gf_list_get(scene->declared_addons, i);
-		if ((addon_info->timeline_id>=0) && addon->timeline_id==addon_info->timeline_id) {
-			my_addon = 1;
-		} else if (addon->url && addon_info->external_URL && !strcmp(addon->url, addon_info->external_URL)) {
-			my_addon = 1;
-			//send message to service handler
-		}
-		//this is an already received addon
-		if (my_addon) {
-			if (addon_info->disable_if_defined) {
-				addon->enabled = GF_FALSE;
-
-				if (addon->root_od) {
-					gf_scene_toggle_addons(scene, GF_FALSE);
-					gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
-					gf_odm_disconnect(addon->root_od, 1);
-				}
-				if (addon->root_od) {
-					addon->root_od->addon = NULL;
-				}
-				return;
-			}
-
-			if (addon_info->enable_if_defined)
-				addon->enabled = GF_TRUE;
-
-			//declaration of start time
-			if (addon->is_splicing && (addon->splice_start<0) && addon_info->is_splicing) {
-				addon->splice_in_pts = addon_info->splice_time_pts;
-
-				if (addon->splice_in_pts) {
-					addon->media_pts = (u64) (addon_info->splice_start_time);
-					addon->splice_start = addon_info->splice_start_time / 90;
-					addon->splice_end = addon_info->splice_end_time / 90;
-				} else {
-					addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
-					addon->splice_start = addon_info->splice_start_time * 1000;
-					addon->splice_end = addon_info->splice_end_time * 1000;
-				}
-			}
-			
-			//restart addon
-			if (!addon->root_od && addon->timeline_ready && addon->enabled) {
-				load_associated_media(scene, addon);
-			}
-			//nothing associated, deactivate addon
-			if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
-				gf_list_rem(scene->declared_addons, i);
-				gf_scene_reset_addon(addon, GF_TRUE);
-				gf_scene_toggle_addons(scene, GF_FALSE);
-			} else if (strcmp(addon_info->external_URL, addon->url)) {
-				//reconfigure addon
-				gf_free(addon->url);
-				addon->url = NULL;
-				break;
-			}
-			return;
-		}
-		addon = NULL;
-	}
-
-	if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
-		return;
-	}
-
-	if (!addon) {
-		GF_SAFEALLOC(addon, GF_AddonMedia);
-		if (!addon) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media addon\n"));
-			return;
-		}
-		addon->timeline_id = addon_info->timeline_id;
-		gf_list_add(scene->declared_addons, addon);
-		new_addon = 1;
-	}
-
-	addon->is_splicing = addon_info->is_splicing;
-	addon->activation_time = gf_scene_get_time(scene)+addon_info->activation_countdown;
-	addon->url = gf_strdup(addon_info->external_URL);
-	addon->media_timescale = 1;
-	addon->timeline_ready = (addon_info->timeline_id<0) ? 1 : 0;
-	addon->splice_in_pts = addon_info->splice_time_pts;
-	if (addon_info->is_splicing) {
-		addon->addon_type = GF_ADDON_TYPE_SPLICED;
-		scene->has_splicing_addons = GF_TRUE;
-
-		if (addon->splice_in_pts) {
-			addon->media_pts = (u64) (addon_info->splice_start_time);
-			addon->splice_start = addon_info->splice_start_time / 90;
-			addon->splice_end = addon_info->splice_end_time / 90;
-		} else {
-			addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
-
-			addon->splice_start = addon_info->splice_start_time * 1000;
-			addon->splice_end = addon_info->splice_end_time * 1000;
-		}
-	} else {
-		addon->splice_start = addon_info->splice_start_time;
-		addon->splice_end = addon_info->splice_end_time;
-	}
-
-	if (!new_addon) return;
-
-	//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_term_send_event(scene->root_od->term,&evt);
-
-		if (addon->timeline_ready)
-			load_associated_media(scene, addon);
-	} else {
-		GF_DOM_Event devt;
-		memset(&devt, 0, sizeof(GF_DOM_Event));
-		devt.type = GF_EVENT_ADDON_DETECTED;
-		devt.addon_url = addon->url;
-		addon->enabled = 0;
-
-		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, &devt, GF_OK, GF_TRUE);
-	}
-
-}
-
-void gf_scene_notify_associated_media_timeline(GF_Scene *scene, GF_AssociatedContentTiming *addon_time)
-{
-	Double prev_time;
-	GF_AddonMedia *addon = NULL;
-
-	u32 i, count = gf_list_count(scene->declared_addons);
-	for (i=0; i<count; i++) {
-		addon = gf_list_get(scene->declared_addons, i);
-		if (addon->timeline_id==addon_time->timeline_id)
-			break;
-		addon = NULL;
-	}
-	if (!addon) return;
-
-	count = i;
-	for (i=0; i<count; i++) {
-		GF_AddonMedia *prev_addon = gf_list_get(scene->declared_addons, i);
-		//we are adding a non splicing point: discard all previously declared addons
-		if (!addon->is_splicing
-		        //this is a splicing point, discard all previsously declared splicing addons
-		        || prev_addon->is_splicing
-		   ) {
-			gf_scene_reset_addon(prev_addon, GF_TRUE);
-			gf_list_rem(scene->declared_addons, i);
-			i--;
-			count--;
-		}
-	}
-
-
-	prev_time = (Double) addon->media_timestamp;
-	prev_time /= addon->media_timescale;
-
-	//loop has been detected
-	if ( prev_time  * addon_time->media_timescale > addon_time->media_timestamp + 1.5 * addon_time->media_timescale ) {
-		if (!addon->loop_detected) {
-			addon->loop_detected = GF_TRUE;
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Loop detected in addon - PTS "LLD" (CTS %d) - media time "LLD"\n", addon_time->media_pts, addon_time->media_pts/90, addon_time->media_timestamp));
-			addon->past_media_pts = addon_time->media_pts;
-			addon->past_media_timestamp = addon_time->media_timestamp;
-			addon->past_media_timescale = addon_time->media_timescale;
-			addon->past_media_pts_scaled = addon_time->media_pts/90;
-		}
-	} else if (!addon->loop_detected) {
-		addon->media_pts = addon_time->media_pts;
-		addon->media_timestamp = addon_time->media_timestamp;
-		addon->media_timescale = addon_time->media_timescale;
-		assert(addon_time->media_timescale);
-		assert(!addon->loop_detected);
-	}
-
-	if (!addon->timeline_ready) {
-		addon->timeline_ready = GF_TRUE;
-		load_associated_media(scene, addon);
-	}
-
-	if ((addon->addon_type==GF_ADDON_TYPE_MAIN) && addon->root_od && addon->root_od->duration && !addon->root_od->timeshift_depth) {
-		Double dur, tsb;
-		dur = (Double) addon->root_od->duration;
-		dur /= 1000;
-		tsb = (Double) addon->media_timestamp;
-		tsb /= addon->media_timescale;
-		if (tsb>dur) tsb = dur;
-		addon->root_od->parentscene->root_od->timeshift_depth = (u32) (1000*tsb);
-		gf_scene_set_timeshift_depth(scene);
-	}
-
-	//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);
-	}
-}
-
-Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
-{
-	u32 i;
-	GF_ObjectManager*odm;
-	GF_Scene *subscene;
-	GF_List *to_restart = NULL;
-
-	if (!addon || !addon->loop_detected) return GF_FALSE;
-	//warning, we need to compare to media PTS/90 since we already rounded the media_ts to milliseconds (otherwise we would get rounding errors).
-	if ((cts == addon->past_media_pts_scaled) || (dts >= addon->past_media_pts_scaled) ) {
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Loop not yet active - CTS "LLD" DTS "LLD" media TS "LLD" \n", cts, dts, addon->past_media_pts_scaled));
-		return GF_FALSE;
-	}
-
-	gf_mx_p(addon->root_od->mx);
-
-	addon->loop_detected = 0;
-	addon->media_pts = addon->past_media_pts;
-	addon->media_timestamp = addon->past_media_timestamp;
-	addon->media_timescale = addon->past_media_timescale;
-	assert(addon->past_media_timescale);
-	addon->past_media_pts = 0;
-	addon->past_media_timestamp = 0;
-	addon->past_media_timescale = 0;
-
-	subscene = addon->root_od->subscene;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Looping addon - CTS "LLD" - addon media TS "LLD" (CTS "LLD") addon media time "LLD"\n", cts, addon->media_pts, addon->media_pts/90, addon->media_timestamp));
-
-	gf_mx_v(addon->root_od->mx);
-
-	to_restart = gf_list_new();
-
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(subscene->resources, &i))) {
-		if (odm->state == GF_ODM_STATE_PLAY) {
-			gf_list_add(to_restart, odm);
-		}
-		gf_odm_stop(odm, GF_FALSE);
-	}
-
-	i=0;
-	while ((odm = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
-		gf_odm_start(odm, 2);
-	}
-	gf_list_del(to_restart);
-	return GF_TRUE;
-}
-
-Double gf_scene_adjust_time_for_addon(GF_AddonMedia *addon, Double clock_time, u32 *timestamp_based)
-{
-	Double media_time;
-	if (!addon->timeline_ready)
-		return clock_time;
-
-	if (timestamp_based)
-		*timestamp_based = (addon->timeline_id>=0) ? 0 : 1;
-
-	if (addon->is_splicing) {
-		return ((Double)addon->media_timestamp) / addon->media_timescale;
-	}
-
-	//get PTS diff (clock is in ms, pt is in 90k)
-	media_time = clock_time;
-	media_time -= addon->media_pts/90000.0;
-
-	media_time += ((Double)addon->media_timestamp) / addon->media_timescale;
-	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Addon about to start - media time %g\n", media_time));
-	return media_time;
-}
-
-s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts)
-{
-	s64 media_ts_ms;
-	assert(addon->timeline_ready);
-	if (addon->is_splicing) {
-		if (!addon->min_dts_set || (orig_ts<addon->splice_min_dts)) {
-			addon->splice_min_dts = orig_ts;
-			addon->min_dts_set = GF_TRUE;
-		}
-		orig_ts -= addon->splice_min_dts;
-	}
-	media_ts_ms = orig_ts;
-	media_ts_ms -= (addon->media_timestamp*1000) / addon->media_timescale;
-	media_ts_ms += (addon->media_pts/90);
-	return media_ts_ms;
-}
-
-void gf_scene_select_scalable_addon(GF_Scene *scene, GF_ObjectManager *odm)
-{
-	GF_NetworkCommand com;
-	GF_CodecCapability caps;
-	Bool nalu_annex_b;
-	GF_Channel *ch, *base_ch;
-	GF_ObjectManager *odm_base = NULL;
-	u32 i, count, mtype;
-	Bool force_attach=GF_FALSE;
-	ch = gf_list_get(odm->channels, 0);
-	if (!ch->esd) return;
-	mtype = ch->esd->decoderConfig->streamType;
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		odm_base = gf_list_get(scene->resources, i);
-		if ((mtype==odm_base->codec->type) && odm_base->codec)
-			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;
-
-	base_ch = gf_list_get(odm_base->channels, 0);
-
-	switch (base_ch->esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-	case GPAC_OTI_VIDEO_SVC:
-	case GPAC_OTI_VIDEO_MVC:
-		switch (ch->esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_VIDEO_LHVC:
-			if (!odm_base->codec->hybrid_layered_coded) {
-				force_attach=GF_TRUE;
-			}
-			odm_base->codec->hybrid_layered_coded=GF_TRUE;
-			break;
-		}
-		break;
-	case GPAC_OTI_VIDEO_HEVC:
-		force_attach=GF_TRUE;
-		break;
-	}
-
-	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 (0 && odm_base->codec->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);
-
-}

gpac-0.8.0.tar.gz/src/terminal/svg_external.c Deleted

@@ -1,232 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / SVG Rendering 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/constants.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/mediaobject.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/nodes_svg.h>
-#include <gpac/compositor.h>
-#include <gpac/network.h>
-
-
-char *gf_term_resolve_xlink(GF_Node *node, char *the_url)
-{
-	char *url;
-	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
-	if (!scene) return NULL;
-
-	url = gf_strdup(the_url);
-	/*apply XML:base*/
-	while (node) {
-		GF_FieldInfo info;
-		if (gf_node_get_attribute_by_tag(node, TAG_XML_ATT_base, 0, 0, &info)==GF_OK) {
-			char *new_url = gf_url_concatenate( ((XMLRI*)info.far_ptr)->string, url);
-			if (new_url) {
-				gf_free(url);
-				url = new_url;
-			}
-		}
-		node = gf_node_get_parent(node, 0);
-	}
-
-	/*if this is a fragment and no XML:BASE was found, this is a fragment of the current document*/
-	if (url[0]=='#') return url;
-
-	if (scene) {
-		char *the_url;
-		if (scene->redirect_xml_base) {
-			the_url = gf_url_concatenate(scene->redirect_xml_base, url);
-		} else {
-//			the_url = gf_url_concatenate(is->root_od->net_service->url, url);
-			/*the root url of a document should be "." if not specified, so that the final URL resolve happens only once
-			at the service level*/
-			the_url = gf_strdup(url);
-		}
-		gf_free(url);
-		return the_url;
-	}
-	return url;
-}
-
-GF_EXPORT
-GF_Err gf_term_get_mfurl_from_xlink(GF_Node *node, MFURL *mfurl)
-{
-	u32 stream_id = 0;
-	GF_Err e = GF_OK;
-	SFURL *sfurl = NULL;
-	GF_FieldInfo info;
-	XMLRI *iri;
-	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
-	if (!scene) return GF_BAD_PARAM;
-
-	gf_sg_vrml_mf_reset(mfurl, GF_SG_VRML_MFURL);
-
-	e = gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, 0, 0, &info);
-	if (e) return e;
-
-	iri = (XMLRI*)info.far_ptr;
-
-	if (iri->type==XMLRI_STREAMID) {
-		stream_id = iri->lsr_stream_id;
-	} else if (!iri->string) return GF_OK;
-
-	mfurl->count = 1;
-	GF_SAFEALLOC(mfurl->vals, SFURL)
-	sfurl = mfurl->vals;
-	if (!sfurl) return GF_BAD_PARAM;
-	sfurl->OD_ID = stream_id;
-	if (stream_id) return GF_OK;
-
-	if (!strncmp(iri->string, "data:", 5)) {
-		const char *cache_dir = gf_cfg_get_key(scene->root_od->term->user->config, "General", "CacheDirectory");
-		e = gf_node_store_embedded_data(iri, cache_dir, "embedded_");
-		if (e) return e;
-		sfurl->url = gf_strdup(iri->string);
-		return GF_OK;
-	}
-	sfurl->url = gf_term_resolve_xlink(node, iri->string);
-	return e;
-}
-
-
-/* Creates a subscene from the xlink:href */
-static GF_Scene *gf_svg_get_subscene(GF_Node *elt, XLinkAttributesPointers *xlinkp, SMILSyncAttributesPointers *syncp, Bool use_sync, Bool primary_resource)
-{
-	MFURL url;
-	Bool lock_timelines = 0;
-	GF_MediaObject *mo;
-	GF_SceneGraph *graph = gf_node_get_graph(elt);
-	GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
-	if (!scene) return NULL;
-
-	if (use_sync && syncp) {
-		switch ((syncp->syncBehavior?*syncp->syncBehavior:SMIL_SYNCBEHAVIOR_DEFAULT)) {
-		case SMIL_SYNCBEHAVIOR_LOCKED:
-		case SMIL_SYNCBEHAVIOR_CANSLIP:
-			lock_timelines = 1;
-			break;
-		case SMIL_SYNCBEHAVIOR_DEFAULT:
-		{
-#if 0
-			if (svg && syncp) {
-				switch ((syncp->syncBehaviorDefault ? *syncp->syncBehaviorDefault : SMIL_SYNCBEHAVIOR_LOCKED)) {
-				case SMIL_SYNCBEHAVIOR_LOCKED:
-				case SMIL_SYNCBEHAVIOR_CANSLIP:
-					lock_timelines = 1;
-					break;
-				default:
-					break;
-				}
-			}
-#endif
-		}
-		default:
-			break;
-		}
-	}
-	memset(&url, 0, sizeof(MFURL));
-	if (!xlinkp->href) return NULL;
-
-	gf_term_get_mfurl_from_xlink(elt, &url);
-
-	while (scene->secondary_resource && scene->root_od->parentscene)
-		scene = scene->root_od->parentscene;
-
-	mo = gf_scene_get_media_object_ex(scene, &url, GF_MEDIA_OBJECT_SCENE, lock_timelines, NULL, primary_resource, elt);
-	gf_sg_vrml_mf_reset(&url, GF_SG_VRML_MFURL);
-
-	if (!mo || !mo->odm) return NULL;
-	mo->odm->subscene->secondary_resource = primary_resource ? 0 : 1;
-	return mo->odm->subscene;
-}
-
-GF_EXPORT
-GF_MediaObject *gf_mo_load_xlink_resource(GF_Node *node, Bool primary_resource, Double clipBegin, Double clipEnd)
-{
-	GF_Scene *new_resource;
-	SVGAllAttributes all_atts;
-	XLinkAttributesPointers xlinkp;
-	SMILSyncAttributesPointers syncp;
-	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
-	if (!scene) return NULL;
-
-	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
-	xlinkp.actuate = all_atts.xlink_actuate;
-	xlinkp.arcrole = all_atts.xlink_arcrole;
-	xlinkp.href = all_atts.xlink_href;
-	xlinkp.role = all_atts.xlink_role;
-	xlinkp.show = all_atts.xlink_show;
-	xlinkp.title = all_atts.xlink_title;
-	xlinkp.type = all_atts.xlink_type;
-	syncp.syncBehavior = all_atts.syncBehavior;
-	syncp.syncBehaviorDefault = all_atts.syncBehaviorDefault;
-	syncp.syncMaster = all_atts.syncMaster;
-	syncp.syncReference = all_atts.syncReference;
-	syncp.syncTolerance = all_atts.syncTolerance;
-	syncp.syncToleranceDefault = all_atts.syncToleranceDefault;
-
-	if (!xlinkp.href) return NULL;
-
-	if (xlinkp.href->type == XMLRI_ELEMENTID) return NULL;
-//	else if (xlinkp.href->string && (xlinkp.href->string[0]=='#')) return NULL;
-
-	new_resource = gf_svg_get_subscene(node, &xlinkp, &syncp, primary_resource ? 1 : 0, primary_resource);
-	if (!new_resource) return NULL;
-
-	/*play*/
-	gf_mo_play(new_resource->root_od->mo, 0, -1, 0);
-
-	return new_resource->root_od->mo;
-}
-
-GF_EXPORT
-void gf_mo_unload_xlink_resource(GF_Node *node, GF_MediaObject *mo)
-{
-	if (!mo) return;
-	if (!gf_odm_lock_mo(mo)) return;
-	if (!mo->odm->subscene) {
-		gf_odm_lock(mo->odm, 0);
-		return;
-	}
-	if (mo->num_open) {
-		mo->num_open--;
-		if (!mo->num_open) {
-			/*do we simply stop the associated document or unload it??? to check*/
-//			gf_mo_stop(mo);
-			gf_odm_disconnect(mo->odm, 2);
-			return;
-		}
-	}
-
-	/*ODM may be destroyed at this point !!*/
-	if (mo->odm) gf_odm_lock(mo->odm, 0);
-}
-
-#endif //GPAC_DISABLE_SVG
-

gpac-0.8.0.tar.gz/src/terminal/term_node_init.c Deleted

@@ -1,357 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media terminal 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/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-/*includes MPEG4 nodes + input sensor stack*/
-#include "input_sensor.h"
-/*includes X3D nodes for WorldInfo, Inline and Key/String sensors*/
-#include <gpac/nodes_x3d.h>
-#include <gpac/nodes_svg.h>
-#include <gpac/options.h>
-#ifndef GPAC_DISABLE_VRML
-
-void InitMediaControl(GF_Scene *scene, GF_Node *node);
-void MC_Modified(GF_Node *node);
-
-void InitMediaSensor(GF_Scene *scene, GF_Node *node);
-void MS_Modified(GF_Node *node);
-
-void gf_init_inline(GF_Scene *scene, GF_Node *node);
-void gf_inline_on_modified(GF_Node *node);
-
-void gf_scene_init_storage(GF_Scene *scene, GF_Node *node);
-
-
-void TraverseWorldInfo(GF_Node *node, void *rs, Bool is_destroy)
-{
-	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
-	scene->world_info = is_destroy ? NULL : (M_WorldInfo *) node;
-}
-
-void TraverseKeyNavigator(GF_Node *node, void *rs, Bool is_destroy)
-{
-	if (is_destroy) {
-		GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
-		gf_list_del_item(scene->keynavigators, node);
-		gf_sc_key_navigator_del(scene->root_od->term->compositor, node);
-	}
-}
-
-void on_kn_set_focus(GF_Node*node, GF_Route *_route)
-{
-	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
-	gf_sc_change_key_navigator(scene->root_od->term->compositor, node);
-}
-
-void evaluate_term_cap(GF_Node *node, GF_Route *route)
-{
-	GF_SystemRTInfo rti;
-	Double fps;
-	u32 height;
-	Bool b_on;
-	u32 b_charge, b_level;
-
-	M_TermCap *tc = (M_TermCap *)node;
-	GF_Scene *scene = gf_node_get_private(node);
-	tc->value = 0;
-	switch (tc->capability) {
-	case 0:	/*framerate*/
-		fps = gf_sc_get_fps(scene->root_od->term->compositor, 1);
-		if (fps<=5.0) tc->value = 1;
-		else if (fps<=10.0) tc->value = 2;
-		else if (fps<=20.0) tc->value = 3;
-		else if (fps<=40.0) tc->value = 4;
-		else tc->value = 5;
-		break;
-	case 1:	/*colordepth*/
-		return;
-	case 2:	/*screensize*/
-		height = scene->root_od->term->compositor->display_height;
-		if (height<200) tc->value = 1;
-		else if (height<400) tc->value = 2;
-		else if (height<800) tc->value = 3;
-		else if (height<1600) tc->value = 4;
-		else tc->value = 4;
-		break;
-	case 3:	/*graphics hardware*/
-		return;
-	case 32:/*audio out format*/
-		return;
-	case 33:/*audio out format*/
-		return;
-	case 34:/*spatial audio cap*/
-		return;
-	case 64:/*CPU load*/
-		if (!gf_sys_get_rti(200, &rti, 0) ) return;
-		if (rti.total_cpu_usage<20) tc->value = 1;
-		else if (rti.total_cpu_usage<40) tc->value = 2;
-		else if (rti.total_cpu_usage<60) tc->value = 3;
-		else if (rti.total_cpu_usage<80) tc->value = 4;
-		else tc->value = 5;
-		break;
-	case 65:/*mem load*/
-		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
-		rti.physical_memory_avail /= 1024;
-		if (rti.physical_memory_avail < 100) tc->value = 1;
-		else if (rti.physical_memory_avail < 512) tc->value = 2;
-		else if (rti.physical_memory_avail < 2048) tc->value = 3;
-		else if (rti.physical_memory_avail < 8192) tc->value = 4;
-		else if (rti.physical_memory_avail < 32768) tc->value = 5;
-		else if (rti.physical_memory_avail < 204800) tc->value = 6;
-		else tc->value = 7;
-		break;
-
-	/*GPAC extensions*/
-	case 100: /*display width*/
-		tc->value = scene->root_od->term->compositor->display_width;
-		break;
-	case 101: /*display height*/
-		tc->value = scene->root_od->term->compositor->display_height;
-		break;
-	case 102: /*frame rate*/
-		tc->value = (u32) gf_sc_get_fps(scene->root_od->term->compositor, 1);
-		break;
-	case 103: /*total CPU*/
-		if (!gf_sys_get_rti(200, &rti, 0) ) return;
-		tc->value = rti.total_cpu_usage;
-		break;
-	case 104: /*process CPU*/
-		if (!gf_sys_get_rti(200, &rti, 0) ) return;
-		tc->value = rti.process_cpu_usage;
-		break;
-	case 106: /*total memory in kB*/
-		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
-		tc->value = (u32) (rti.physical_memory/1024);
-		break;
-	case 107: /*total memory available in kB*/
-		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
-		tc->value = (u32) (rti.physical_memory_avail/1024);
-		break;
-	case 108: /*process memory in kB*/
-		if (!gf_sys_get_rti(200, &rti, 0) ) return;
-		tc->value = (u32) (rti.process_memory/1024);
-		break;
-	case 109: /*battery on/off*/
-		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
-		tc->value = b_on;
-		break;
-	case 110: /*battery charging*/
-		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
-		tc->value = b_charge;
-		break;
-	case 111: /*battery level*/
-		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
-		tc->value = b_level;
-		break;
-
-	case 112: /*audio vol*/
-		tc->value = gf_sc_get_option(scene->root_od->term->compositor, GF_OPT_AUDIO_VOLUME);
-		break;
-	case 113: /*audio pan*/
-		tc->value = gf_sc_get_option(scene->root_od->term->compositor, GF_OPT_AUDIO_PAN);
-		break;
-	default:
-		return;
-	}
-	gf_node_event_out(node, 2);
-}
-
-static void InitTermCap(GF_Scene *scene, GF_Node *node)
-{
-	M_TermCap *tc = (M_TermCap *)node;
-	tc->on_evaluate = evaluate_term_cap;
-	gf_node_set_private(node, scene);
-	/*evaluate upon init (cf BIFS spec)*/
-	evaluate_term_cap(node, NULL);
-}
-
-#endif /*GPAC_DISABLE_VRML*/
-
-
-#ifndef GPAC_DISABLE_SVG
-static void svg_traverse_title(GF_Node *node, void *rs, Bool is_destroy)
-{
-	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
-	scene->world_info = is_destroy ? NULL : node;
-}
-#endif
-
-
-void gf_term_on_node_init(void *_scene, GF_Node *node)
-{
-	GF_Scene *scene = (GF_Scene *)_scene;
-	if (!node || !scene) return;
-
-	switch (gf_node_get_tag(node)) {
-#ifndef GPAC_DISABLE_VRML
-
-	case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline:
-#endif
-		gf_init_inline(scene, node);
-		break;
-	case TAG_MPEG4_MediaBuffer:
-		break;
-	case TAG_MPEG4_MediaControl:
-		InitMediaControl(scene, node);
-		break;
-	case TAG_MPEG4_MediaSensor:
-		InitMediaSensor(scene, node);
-		break;
-	case TAG_MPEG4_InputSensor:
-		InitInputSensor(scene, node);
-		break;
-
-	/*BIFS nodes, get back to codec, but filter externProtos*/
-	case TAG_MPEG4_Conditional:
-		break;
-	case TAG_MPEG4_QuantizationParameter:
-		break;
-	/*world info is stored at the inline scene level*/
-	case TAG_MPEG4_WorldInfo:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_WorldInfo:
-#endif
-		gf_node_set_callback_function(node, TraverseWorldInfo);
-		gf_node_set_private(node, scene);
-		break;
-
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_KeySensor:
-		InitKeySensor(scene, node);
-		break;
-	case TAG_X3D_StringSensor:
-		InitStringSensor(scene, node);
-		break;
-#endif
-
-	case TAG_MPEG4_TermCap:
-		InitTermCap(scene, node);
-		break;
-
-	case TAG_MPEG4_Storage:
-		gf_scene_init_storage(scene, node);
-		break;
-
-	case TAG_MPEG4_KeyNavigator:
-		gf_node_set_callback_function(node, TraverseKeyNavigator);
-		gf_node_set_private(node, scene);
-		gf_list_add(scene->keynavigators, node);
-		((M_KeyNavigator*)node)->on_setFocus = on_kn_set_focus;
-		break;
-
-#endif
-
-
-#ifndef GPAC_DISABLE_SVG
-	case TAG_SVG_title:
-		gf_node_set_callback_function(node, svg_traverse_title);
-		gf_node_set_private(node, scene);
-		break;
-#endif
-
-	default:
-		gf_sc_on_node_init(scene->root_od->term->compositor, node);
-		break;
-	}
-}
-
-void gf_term_on_node_modified(void *_is, GF_Node *node)
-{
-	GF_Scene *scene = (GF_Scene *)_is;
-	if (!scene) return;
-	if (!node) {
-		gf_sc_invalidate(scene->root_od->term->compositor, NULL);
-		return;
-	}
-
-	switch (gf_node_get_tag(node)) {
-#ifndef GPAC_DISABLE_VRML
-	case TAG_MPEG4_Inline:
-#ifndef GPAC_DISABLE_X3D
-	case TAG_X3D_Inline:
-#endif
-		gf_inline_on_modified(node);
-		break;
-	case TAG_MPEG4_MediaBuffer:
-		break;
-	case TAG_MPEG4_MediaControl:
-		MC_Modified(node);
-		break;
-	case TAG_MPEG4_MediaSensor:
-		MS_Modified(node);
-		break;
-	case TAG_MPEG4_InputSensor:
-		InputSensorModified(node);
-		break;
-	case TAG_MPEG4_Conditional:
-		break;
-	case TAG_MPEG4_Storage:
-		break;
-#endif
-	default:
-		gf_sc_invalidate(scene->root_od->term->compositor, node);
-		break;
-	}
-}
-
-static void gf_term_on_node_destroyed(void *_is, GF_Node *node)
-{
-	GF_Scene *scene = (GF_Scene *)_is;
-	if (!scene) return;
-	gf_sc_node_destroy(scene->root_od->term->compositor, node, NULL);
-}
-
-GF_EXPORT
-void gf_term_node_callback(void *_is, u32 type, GF_Node *n, void *param)
-{
-	switch (type) {
-	case GF_SG_CALLBACK_MODIFIED:
-		gf_term_on_node_modified(_is, n);
-		break;
-	case GF_SG_CALLBACK_NODE_DESTROY:
-		gf_term_on_node_destroyed(_is, n);
-		break;
-	case GF_SG_CALLBACK_INIT:
-		gf_term_on_node_init(_is, n);
-		break;
-	/*get all inline nodes using this subscene and bubble up...*/
-	case GF_SG_CALLBACK_GRAPH_DIRTY:
-	{
-		u32 i=0;
-		GF_Node *root;
-		GF_Scene *scene = (GF_Scene *)_is;
-		if (scene->root_od->mo) {
-			while ((root=(GF_Node*)gf_mo_event_target_enum_node(scene->root_od->mo, &i))) {
-				gf_node_dirty_set(root, GF_SG_CHILD_DIRTY, GF_TRUE);
-			}
-		}
-	}
-	break;
-	}
-}

gpac-0.8.0.tar.gz/src/utils/gzio.cpp Deleted

@@ -1,1006 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2005 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
- */
-
-/* @(#) $Id: gzio.cpp,v 1.4 2010-02-23 16:24:20 jeanlf Exp $ */
-
-#include <stdio.h>
-
-// Benoit: ZLIB extentions of symbian ZLIB support
-#include "zlib_symbian_ext.h"
-
-#include "zutil.h"
-typedef voidp gzFile;
-
-#ifdef NO_DEFLATE       /* for compatibility with old definition */
-#  define NO_GZCOMPRESS
-#endif
-
-#ifndef NO_DUMMY_DECL
-#ifndef __SYMBIAN32__
-struct internal_state {
-	int dummy;
-}; /* for buggy compilers */
-#endif
-#endif
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-#  define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#ifdef __MVS__
-#  pragma map (fdopen , "\174\174FDOPEN")
-FILE *fdopen(int, const char *);
-#endif
-
-#ifndef STDC
-//extern voidp  gf_malloc OF((uInt size));
-//extern void   free   OF((voidpf ptr));
-#endif
-
-#define ALLOC(size) gf_malloc(size)
-#define TRYFREE(p) {if (p) gf_free(p);}
-
-static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-
-const char * const z_errmsg[10] = {
-	"need dictionary",     /* Z_NEED_DICT       2  */
-	"stream end",          /* Z_STREAM_END      1  */
-	"",                    /* Z_OK              0  */
-	"file error",          /* Z_ERRNO         (-1) */
-	"stream error",        /* Z_STREAM_ERROR  (-2) */
-	"data error",          /* Z_DATA_ERROR    (-3) */
-	"insufficient memory", /* Z_MEM_ERROR     (-4) */
-	"buffer error",        /* Z_BUF_ERROR     (-5) */
-	"incompatible version",/* Z_VERSION_ERROR (-6) */
-	""
-};
-
-#ifdef __SYMBIAN32__
-#define GZ_EXPORT EXPORT_C
-#else
-#define GZ_EXPORT
-#endif
-
-typedef struct gz_stream {
-	z_stream stream;
-	int      z_err;   /* error code for last stream operation */
-	int      z_eof;   /* set if end of input file */
-	FILE     *file;   /* .gz file */
-	Byte     *inbuf;  /* input buffer */
-	Byte     *outbuf; /* output buffer */
-	uLong    crc;     /* crc32 of uncompressed data */
-	char     *msg;    /* error message */
-	char     *path;   /* path name for debugging only */
-	int      transparent; /* 1 if input file is not a .gz file */
-	char     mode;    /* 'w' or 'r' */
-	z_off_t  start;   /* start of compressed data in file (header skipped) */
-	z_off_t  in;      /* bytes into deflate or inflate */
-	z_off_t  out;     /* bytes out of deflate or inflate */
-	int      back;    /* one character push-back */
-	int      last;    /* true if push-back is last character */
-} gz_stream;
-
-
-//local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-//local int do_flush        OF((gzFile file, int flush));
-//local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-//local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (const char *path, const char *mode, int fd)
-{
-	int err;
-	int level = Z_DEFAULT_COMPRESSION; /* compression level */
-	int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-	char *p = (char*)mode;
-	gz_stream *s;
-	char fmode[80]; /* copy of mode, without the compression level */
-	char *m = fmode;
-
-	if (!path || !mode) return Z_NULL;
-
-	s = (gz_stream *)ALLOC(sizeof(gz_stream));
-	if (!s) return Z_NULL;
-
-	s->stream.zalloc = (alloc_func)0;
-	s->stream.zfree = (free_func)0;
-	s->stream.opaque = (voidpf)0;
-	s->stream.next_in = s->inbuf = Z_NULL;
-	s->stream.next_out = s->outbuf = Z_NULL;
-	s->stream.avail_in = s->stream.avail_out = 0;
-	s->file = NULL;
-	s->z_err = Z_OK;
-	s->z_eof = 0;
-	s->in = 0;
-	s->out = 0;
-	s->back = EOF;
-	s->crc = crc32(0L, Z_NULL, 0);
-	s->msg = NULL;
-	s->transparent = 0;
-
-	s->path = (char*)ALLOC(strlen(path)+1);
-	if (s->path == NULL) {
-		return destroy(s), (gzFile)Z_NULL;
-	}
-	strcpy(s->path, path); /* do this early for debugging */
-
-	s->mode = '\0';
-	do {
-		if (*p == 'r') s->mode = 'r';
-		if (*p == 'w' || *p == 'a') s->mode = 'w';
-		if (*p >= '0' && *p <= '9') {
-			level = *p - '0';
-		} else if (*p == 'f') {
-			strategy = Z_FILTERED;
-		} else if (*p == 'h') {
-			strategy = Z_HUFFMAN_ONLY;
-			//} else if (*p == 'R') {
-			//  strategy = Z_RLE;
-		} else {
-			*m++ = *p; /* copy the mode */
-		}
-	} while (*p++ && m != fmode + sizeof(fmode));
-	if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-
-	if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-		err = Z_STREAM_ERROR;
-#else
-		err = deflateInit2(&(s->stream), level,
-		                   Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-		/* windowBits is passed < 0 to suppress zlib header */
-
-		s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-		if (err != Z_OK || s->outbuf == Z_NULL) {
-			return destroy(s), (gzFile)Z_NULL;
-		}
-	} else {
-		s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-		err = inflateInit2(&(s->stream), -MAX_WBITS);
-		/* windowBits is passed < 0 to tell that there is no zlib header.
-		 * Note that in this case inflate *requires* an extra "dummy" byte
-		 * after the compressed stream in order to complete decompression and
-		 * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-		 * present after the compressed stream.
-		 */
-		if (err != Z_OK || s->inbuf == Z_NULL) {
-			return destroy(s), (gzFile)Z_NULL;
-		}
-	}
-	s->stream.avail_out = Z_BUFSIZE;
-
-	errno = 0;
-	s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-	if (s->file == NULL) {
-		return destroy(s), (gzFile)Z_NULL;
-	}
-	if (s->mode == 'w') {
-		/* Write a very simple .gz header:
-		 */
-		fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-		        Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-		s->start = 10L;
-		/* We use 10L instead of ftell(s->file) to because ftell causes an
-		 * fflush on some systems. This version of the library doesn't use
-		 * start anyway in write mode, so this initialization is not
-		 * necessary.
-		 */
-	} else {
-		check_header(s); /* skip the .gz header */
-		s->start = ftell(s->file) - s->stream.avail_in;
-	}
-
-	return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-GZ_EXPORT
-gzFile gzopen (const char *path, const char *mode)
-{
-	return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-GZ_EXPORT
-gzFile gzdopen (int fd, const char *mode)
-{
-	char name[46];      /* allow for up to 128-bit integers */
-
-	if (fd < 0) return (gzFile)Z_NULL;
-	sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-	return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int gzsetparams (gzFile file, int level, int strategy)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-	/* Make room to allow flushing */
-	if (s->stream.avail_out == 0) {
-
-		s->stream.next_out = s->outbuf;
-		if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-			s->z_err = Z_ERRNO;
-		}
-		s->stream.avail_out = Z_BUFSIZE;
-	}
-
-	return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(gz_stream *s)
-{
-	if (s->z_eof) return EOF;
-	if (s->stream.avail_in == 0) {
-		errno = 0;
-		s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-		if (s->stream.avail_in == 0) {
-			s->z_eof = 1;
-			if (ferror(s->file)) s->z_err = Z_ERRNO;
-			return EOF;
-		}
-		s->stream.next_in = s->inbuf;
-	}
-	s->stream.avail_in--;
-	return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(gz_stream *s)
-{
-	int method; /* method byte */
-	int flags;  /* flags byte */
-	uInt len;
-	int c;
-
-	/* Assure two bytes in the buffer so we can peek ahead -- handle case
-	   where first byte of header is at the end of the buffer after the last
-	   gzip segment */
-	len = s->stream.avail_in;
-	if (len < 2) {
-		if (len) s->inbuf[0] = s->stream.next_in[0];
-		errno = 0;
-		len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file);
-		if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO;
-		s->stream.avail_in += len;
-		s->stream.next_in = s->inbuf;
-		if (s->stream.avail_in < 2) {
-			s->transparent = s->stream.avail_in;
-			return;
-		}
-	}
-
-	/* Peek ahead to check the gzip magic header */
-	if (s->stream.next_in[0] != gz_magic[0] ||
-	        s->stream.next_in[1] != gz_magic[1]) {
-		s->transparent = 1;
-		return;
-	}
-	s->stream.avail_in -= 2;
-	s->stream.next_in += 2;
-
-	/* Check the rest of the gzip header */
-	method = get_byte(s);
-	flags = get_byte(s);
-	if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-		s->z_err = Z_DATA_ERROR;
-		return;
-	}
-
-	/* Discard time, xflags and OS code: */
-	for (len = 0; len < 6; len++) (void)get_byte(s);
-
-	if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-		len  =  (uInt)get_byte(s);
-		len += ((uInt)get_byte(s))<<8;
-		/* len is garbage if EOF but the loop below will quit anyway */
-		while (len-- != 0 && get_byte(s) != EOF) ;
-	}
-	if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-		while ((c = get_byte(s)) != 0 && c != EOF) ;
-	}
-	if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-		while ((c = get_byte(s)) != 0 && c != EOF) ;
-	}
-	if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-		for (len = 0; len < 2; len++) (void)get_byte(s);
-	}
-	s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
-/* ===========================================================================
-* Cleanup then free the given gz_stream. Return a zlib error code.
-  Try freeing in the reverse order of allocations.
-*/
-local int destroy (gz_stream *s)
-{
-	int err = Z_OK;
-
-	if (!s) return Z_STREAM_ERROR;
-
-	TRYFREE(s->msg);
-
-	if (s->stream.state != NULL) {
-		if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-			err = Z_STREAM_ERROR;
-#else
-			err = deflateEnd(&(s->stream));
-#endif
-		} else if (s->mode == 'r') {
-			err = inflateEnd(&(s->stream));
-		}
-	}
-	if (s->file != NULL && gf_fclose(s->file)) {
-#ifdef ESPIPE
-		if (errno != ESPIPE) /* gf_fclose is broken for pipes in HP/UX */
-#endif
-			err = Z_ERRNO;
-	}
-	if (s->z_err < 0) err = s->z_err;
-
-	TRYFREE(s->inbuf);
-	TRYFREE(s->outbuf);
-	TRYFREE(s->path);
-	TRYFREE(s);
-	return err;
-}
-
-
-GZ_EXPORT
-int gzread (gzFile file, voidp buf, unsigned len)
-{
-	gz_stream *s = (gz_stream*)file;
-	Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-	Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-	if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-	if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-	if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-	next_out = (Byte*)buf;
-	s->stream.next_out = (Bytef*)buf;
-	s->stream.avail_out = len;
-
-	if (s->stream.avail_out && s->back != EOF) {
-		*next_out++ = s->back;
-		s->stream.next_out++;
-		s->stream.avail_out--;
-		s->back = EOF;
-		s->out++;
-		start++;
-		if (s->last) {
-			s->z_err = Z_STREAM_END;
-			return 1;
-		}
-	}
-
-	while (s->stream.avail_out != 0) {
-
-		if (s->transparent) {
-			/* Copy first the lookahead bytes: */
-			uInt n = s->stream.avail_in;
-			if (n > s->stream.avail_out) n = s->stream.avail_out;
-			if (n > 0) {
-				zmemcpy(s->stream.next_out, s->stream.next_in, n);
-				next_out += n;
-				s->stream.next_out = next_out;
-				s->stream.next_in   += n;
-				s->stream.avail_out -= n;
-				s->stream.avail_in  -= n;
-			}
-			if (s->stream.avail_out > 0) {
-				s->stream.avail_out -=
-				    (uInt)fread(next_out, 1, s->stream.avail_out, s->file);
-			}
-			len -= s->stream.avail_out;
-			s->in  += len;
-			s->out += len;
-			if (len == 0) s->z_eof = 1;
-			return (int)len;
-		}
-		if (s->stream.avail_in == 0 && !s->z_eof) {
-
-			errno = 0;
-			s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-			if (s->stream.avail_in == 0) {
-				s->z_eof = 1;
-				if (ferror(s->file)) {
-					s->z_err = Z_ERRNO;
-					break;
-				}
-			}
-			s->stream.next_in = s->inbuf;
-		}
-		s->in += s->stream.avail_in;
-		s->out += s->stream.avail_out;
-		s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-		s->in -= s->stream.avail_in;
-		s->out -= s->stream.avail_out;
-
-		if (s->z_err == Z_STREAM_END) {
-			/* Check CRC and original size */
-			s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-			start = s->stream.next_out;
-
-			if (getLong(s) != s->crc) {
-				s->z_err = Z_DATA_ERROR;
-			} else {
-				(void)getLong(s);
-				/* The uncompressed length returned by above getlong() may be
-				 * different from s->out in case of concatenated .gz files.
-				 * Check for such files:
-				 */
-				check_header(s);
-				if (s->z_err == Z_OK) {
-					inflateReset(&(s->stream));
-					s->crc = crc32(0L, Z_NULL, 0);
-				}
-			}
-		}
-		if (s->z_err != Z_OK || s->z_eof) break;
-	}
-	s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-	if (len == s->stream.avail_out &&
-	        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
-		return -1;
-	return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int gzgetc(gzFile file)
-{
-	unsigned char c;
-
-	return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Push one byte back onto the stream.
-*/
-int gzungetc(int c, gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
-	s->back = c;
-	s->out--;
-	s->last = (s->z_err == Z_STREAM_END);
-	if (s->last) s->z_err = Z_OK;
-	s->z_eof = 0;
-	return c;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * gzgets(gzFile file, char *buf, int len)
-{
-	char *b = buf;
-	if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-	while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-	*buf = '\0';
-	return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_GZCOMPRESS
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int gzwrite (gzFile file, void *const buf, unsigned len)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-	s->stream.next_in = (Bytef*)buf;
-	s->stream.avail_in = len;
-
-	while (s->stream.avail_in != 0) {
-
-		if (s->stream.avail_out == 0) {
-
-			s->stream.next_out = s->outbuf;
-			if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-				s->z_err = Z_ERRNO;
-				break;
-			}
-			s->stream.avail_out = Z_BUFSIZE;
-		}
-		s->in += s->stream.avail_in;
-		s->out += s->stream.avail_out;
-		s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-		s->in -= s->stream.avail_in;
-		s->out -= s->stream.avail_out;
-		if (s->z_err != Z_OK) break;
-	}
-	s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-	return (int)(len - s->stream.avail_in);
-}
-
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-	char buf[Z_PRINTF_BUFSIZE];
-	va_list va;
-	int len = 0;
-
-	buf[sizeof(buf) - 1] = 0;
-	va_start(va, format);
-#ifdef NO_vsnprintf
-#  ifdef HAS_vsprintf_void
-	(void)vsprintf(buf, format, va);
-	va_end(va);
-	for (len = 0; len < sizeof(buf); len++)
-		if (buf[len] == 0) break;
-#  else
-	len = vsprintf(buf, format, va);
-	va_end(va);
-#  endif
-#else
-#  ifdef HAS_vsnprintf_void
-	(void)vsnprintf(buf, sizeof(buf), format, va);
-	va_end(va);
-	len = strlen(buf);
-#  else
-	/*Benoit: to be checked if needed*/
-	//len = vsnprintf(buf, sizeof(buf), format, va);
-	//va_end(va);
-#  endif
-#endif
-	if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-		return 0;
-	return gzwrite(file, buf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int gzprintf (gzFile file, const char *format, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int a10,
-              int a11, int a12, int a13, int a14, int a15, int a16, int a17, int a18, int a19, int a20)
-{
-	char buf[Z_PRINTF_BUFSIZE];
-	int len;
-
-	buf[sizeof(buf) - 1] = 0;
-#ifdef NO_snprintf
-#  ifdef HAS_sprintf_void
-	sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-	        a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-	for (len = 0; len < sizeof(buf); len++)
-		if (buf[len] == 0) break;
-#  else
-	len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-	              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#else
-#  ifdef HAS_snprintf_void
-	snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-	         a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-	len = strlen(buf);
-#  else
-	len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-	               a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#  endif
-#endif
-	if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
-		return 0;
-	return gzwrite(file, buf, len);
-}
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int gzputc(gzFile file, int c)
-{
-	unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-	return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int gzputs(gzFile file, const char *s)
-{
-	return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (gzFile file, int flush)
-{
-	uInt len;
-	int done = 0;
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-	s->stream.avail_in = 0; /* should be zero already anyway */
-
-	for (;;) {
-		len = Z_BUFSIZE - s->stream.avail_out;
-
-		if (len != 0) {
-			if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-				s->z_err = Z_ERRNO;
-				return Z_ERRNO;
-			}
-			s->stream.next_out = s->outbuf;
-			s->stream.avail_out = Z_BUFSIZE;
-		}
-		if (done) break;
-		s->out += s->stream.avail_out;
-		s->z_err = deflate(&(s->stream), flush);
-		s->out -= s->stream.avail_out;
-
-		/* Ignore the second of two consecutive flushes: */
-		if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-		/* deflate has finished flushing only when it hasn't used up
-		 * all the available space in the output buffer:
-		 */
-		done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
-
-		if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-	}
-	return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int gzflush (gzFile file, int flush)
-{
-	gz_stream *s = (gz_stream*)file;
-	int err = do_flush (file, flush);
-
-	if (err) return err;
-	fflush(s->file);
-	return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_GZCOMPRESS */
-
-/* ===========================================================================
-     Rewinds input file.
-*/
-int gzrewind (gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'r') return -1;
-
-	s->z_err = Z_OK;
-	s->z_eof = 0;
-	s->back = EOF;
-	s->stream.avail_in = 0;
-	s->stream.next_in = s->inbuf;
-	s->crc = crc32(0L, Z_NULL, 0);
-	if (!s->transparent) (void)inflateReset(&s->stream);
-	s->in = 0;
-	s->out = 0;
-	return fseek(s->file, s->start, SEEK_SET);
-}
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t gzseek (gzFile file, z_off_t offset, int whence)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || whence == SEEK_END ||
-	        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-		return -1L;
-	}
-
-	if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-		return -1L;
-#else
-		if (whence == SEEK_SET) {
-			offset -= s->in;
-		}
-		if (offset < 0) return -1L;
-
-		/* At this point, offset is the number of zero bytes to write. */
-		if (s->inbuf == Z_NULL) {
-			s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-			if (s->inbuf == Z_NULL) return -1L;
-			zmemzero(s->inbuf, Z_BUFSIZE);
-		}
-		while (offset > 0)  {
-			uInt size = Z_BUFSIZE;
-			if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-			size = gzwrite(file, s->inbuf, size);
-			if (size == 0) return -1L;
-
-			offset -= size;
-		}
-		return s->in;
-#endif
-	}
-	/* Rest of function is for reading only */
-
-	/* compute absolute position */
-	if (whence == SEEK_CUR) {
-		offset += s->out;
-	}
-	if (offset < 0) return -1L;
-
-	if (s->transparent) {
-		/* map to fseek */
-		s->back = EOF;
-		s->stream.avail_in = 0;
-		s->stream.next_in = s->inbuf;
-		if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-		s->in = s->out = offset;
-		return offset;
-	}
-
-	/* For a negative seek, rewind and use positive seek */
-	if (offset >= s->out) {
-		offset -= s->out;
-	} else if (gzrewind(file) < 0) {
-		return -1L;
-	}
-	/* offset is now the number of bytes to skip. */
-
-	if (offset != 0 && s->outbuf == Z_NULL) {
-		s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-		if (s->outbuf == Z_NULL) return -1L;
-	}
-	if (offset && s->back != EOF) {
-		s->back = EOF;
-		s->out++;
-		offset--;
-		if (s->last) s->z_err = Z_STREAM_END;
-	}
-	while (offset > 0)  {
-		int size = Z_BUFSIZE;
-		if (offset < Z_BUFSIZE) size = (int)offset;
-
-		size = gzread(file, s->outbuf, (uInt)size);
-		if (size <= 0) return -1L;
-		offset -= size;
-	}
-	return s->out;
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t gztell (gzFile file)
-{
-	return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-GZ_EXPORT
-int gzeof (gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	/* With concatenated compressed files that can have embedded
-	 * crc trailers, z_eof is no longer the only/best indicator of EOF
-	 * on a gz_stream. Handle end-of-stream error explicitly here.
-	 */
-	if (s == NULL || s->mode != 'r') return 0;
-	if (s->z_eof) return 1;
-	return s->z_err == Z_STREAM_END;
-}
-
-/* ===========================================================================
-     Returns 1 if reading and doing so transparently, otherwise zero.
-*/
-int gzdirect (gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL || s->mode != 'r') return 0;
-	return s->transparent;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (FILE *file, uLong x)
-{
-	int n;
-	for (n = 0; n < 4; n++) {
-		fputc((int)(x & 0xff), file);
-		x >>= 8;
-	}
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (gz_stream *s)
-{
-	uLong x = (uLong)get_byte(s);
-	int c;
-
-	x += ((uLong)get_byte(s))<<8;
-	x += ((uLong)get_byte(s))<<16;
-	c = get_byte(s);
-	if (c == EOF) s->z_err = Z_DATA_ERROR;
-	x += ((uLong)c)<<24;
-	return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-GZ_EXPORT
-int gzclose (gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL) return Z_STREAM_ERROR;
-
-	if (s->mode == 'w') {
-#ifdef NO_GZCOMPRESS
-		return Z_STREAM_ERROR;
-#else
-		if (do_flush (file, Z_FINISH) != Z_OK)
-			return destroy((gz_stream*)file);
-
-		putLong (s->file, s->crc);
-		putLong (s->file, (uLong)(s->in & 0xffffffff));
-#endif
-	}
-	return destroy((gz_stream*)file);
-}
-
-#ifdef STDC
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-/* ===========================================================================
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char * gzerror (gzFile file, int *errnum)
-{
-	char *m;
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL) {
-		*errnum = Z_STREAM_ERROR;
-		return (const char*)ERR_MSG(Z_STREAM_ERROR);
-	}
-	*errnum = s->z_err;
-	if (*errnum == Z_OK) return (const char*)"";
-
-	m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-	if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-	TRYFREE(s->msg);
-	s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-	if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
-	strcpy(s->msg, s->path);
-	strcat(s->msg, ": ");
-	strcat(s->msg, m);
-	return (const char*)s->msg;
-}
-
-/* ===========================================================================
-     Clear the error and end-of-file flags, and do the same for the real file.
-*/
-void gzclearerr (gzFile file)
-{
-	gz_stream *s = (gz_stream*)file;
-
-	if (s == NULL) return;
-	if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
-	s->z_eof = 0;
-	clearerr(s->file);
-}

gpac-0.8.0.tar.gz/src/utils/map.c Deleted

@@ -1,337 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jerome Gorin
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast-Debug@dashcast_build
- *
- *  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/map.h>
-#include <gpac/list.h>
-
-struct _tag_map
-{
-	u32 hash_capacity;
-	GF_List** pairs;
-};
-
-GF_EXPORT
-GF_Err gf_map_iter_set(GF_Map* map, GF_It_Map* it) {
-	/* Iterator must be associated to a map */
-	if (!map || !it) return GF_BAD_PARAM;
-
-	/* Associate iterator to the beginning of the map */
-	it->map = map;
-	it->ilist = 0;
-	it->hash = 0;
-	return GF_OK;
-}
-
-GF_EXPORT
-void* gf_map_iter_has_next(GF_It_Map* it) {
-	GF_Pair* next_pair = NULL;
-
-	/* No iterator or iterator out of map */
-	if (!it || !(it->hash < it->map->hash_capacity)) return NULL;
-
-	next_pair = (GF_Pair*)gf_list_get(it->map->pairs[it->hash], it->ilist);
-
-	if (next_pair) {
-		/* Next element founds in the same hash */
-		it->ilist++;
-		return next_pair->value;
-	}
-
-	/* Take the next hash */
-	it->hash++;
-	it->ilist = 0;
-	return gf_map_iter_has_next(it);
-}
-
-GF_EXPORT
-GF_Err gf_map_iter_reset(GF_It_Map* it) {
-	if (!it) return GF_BAD_PARAM;
-	it->hash = 0;
-	it->ilist = 0;
-	return GF_OK;
-}
-
-
-GF_Pair* gf_pair_new(const char* key, u32 key_len, void* item) {
-	GF_Pair* new_pair;
-
-	/* Allocate space for a new pair */
-	GF_SAFEALLOC(new_pair, GF_Pair);
-	if (!new_pair)	return NULL;
-
-	/* Allocate space for a new key */
-	GF_SAFE_ALLOC_N(new_pair->key, key_len + 1, char);
-	if (!new_pair->key) {
-		gf_free(new_pair);
-		return NULL;
-	}
-
-	/* Set pair value*/
-	strcpy(new_pair->key, key);
-	new_pair->value = item;
-
-	return new_pair;
-}
-
-void gf_pair_del(GF_Pair* pair) {
-	gf_free(pair->key);
-	gf_free(pair);
-}
-
-/* Match a key to a pair */
-static GF_Pair* gf_pair_get(GF_List* pairs, const char *key)
-{
-	GF_Pair *pair;
-	u32 index = 0;
-
-	while ((pair = (GF_Pair*)gf_list_get(pairs, index))) {
-		if (pair->key && !strcmp(pair->key, key)) return pair;
-		index++;
-	}
-
-	/* Key not found */
-	return NULL;
-}
-
-/* Remove a key from pairs */
-static Bool gf_pair_rem(GF_List* pairs, const char *key)
-{
-	GF_Pair* pair;
-	u32 index = 0;
-
-	while ((pair = (GF_Pair*)gf_list_get(pairs, index))) {
-		if (pair->key && !strcmp(pair->key, key)) {
-			gf_list_rem(pairs, index);
-			gf_pair_del(pair);
-			return GF_TRUE;
-		}
-		index++;
-	}
-
-	/* Key not found */
-	return GF_FALSE;
-}
-
-
-/* Generate a hash code for the provided string */
-static unsigned long hash(const char *str)
-{
-	u32 hash = 5381;
-	int c;
-
-	while ((c = *str++)) {
-		hash = ((hash << 5) + hash) + c;
-	}
-	return hash;
-}
-
-
-
-GF_EXPORT
-GF_Map * gf_map_new(u32 hash_capacity)
-{
-	GF_Map *p_map;
-	GF_SAFEALLOC(p_map, GF_Map);
-	if (! p_map) return NULL;
-
-	p_map->hash_capacity = hash_capacity;
-	GF_SAFE_ALLOC_N(p_map->pairs, p_map->hash_capacity, GF_List*);
-	if (!p_map->pairs) {
-		gf_free(p_map);
-		return NULL;
-	}
-
-	return p_map;
-}
-
-GF_EXPORT
-void gf_map_del(GF_Map *ptr)
-{
-	u32 i, j;
-	GF_Pair *pair;
-	GF_List *bucket;
-
-	if (!ptr) return;
-
-	/* Iterate through the map and delete content */
-	for (i = 0; i < ptr->hash_capacity; i++) {
-		bucket = ptr->pairs[i];
-
-		/* Bucket has not be allocated */
-		if (bucket == NULL) continue;
-
-		/* Iterate through the bucket and delete pairs */
-		j = 0;
-		while ((pair = (GF_Pair*)gf_list_get(bucket, j))) {
-			gf_pair_del(pair);
-			j++;
-		}
-
-		gf_list_del(bucket);
-	}
-
-	/* Free map */
-	gf_free(ptr->pairs);
-	gf_free(ptr);
-}
-
-GF_EXPORT
-void gf_map_reset(GF_Map *ptr) {
-	u32 i, j;
-	GF_Pair *pair;
-	GF_List *bucket;
-
-	/* Iterate through the map and delete content */
-	for (i = 0; i < ptr->hash_capacity; i++) {
-		bucket = ptr->pairs[i];
-
-		/* Bucket has not be allocated */
-		if (bucket == NULL)
-			continue;
-
-		/* Iterate through the bucket and delete pairs */
-		j = 0;
-		while ((pair = (GF_Pair*)gf_list_get(bucket, j))) {
-			gf_pair_del(pair);
-			j++;
-		}
-
-		/* reset bucket count */
-		gf_list_del(bucket);
-		ptr->pairs[i] = NULL;
-	}
-}
-
-GF_EXPORT
-void* gf_map_find(GF_Map *ptr, const char* key) {
-	u32 index;
-	GF_List *bucket;
-	GF_Pair *pair;
-
-	/* Find requires a map and a key to work properly */
-	if (!ptr || !key) return NULL;
-
-	index = hash(key) % ptr->hash_capacity;
-	bucket = ptr->pairs[index];
-	pair = gf_pair_get(bucket, key);
-
-	/* bucket is empty */
-	if (!pair) return NULL;
-
-	return pair->value;
-}
-
-
-GF_EXPORT
-GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item) {
-	u32 key_len, index;
-	GF_List *bucket;
-	GF_Pair *pair;
-	GF_Err err;
-
-	/* Insert requiered a map, a key and a value */
-	if (!ptr || !key || !item) return GF_BAD_PARAM;
-
-	key_len = (u32) strlen(key);
-
-	/* Get a pointer to the bucket the key string hashes to */
-	index = hash(key) % ptr->hash_capacity;
-	bucket = ptr->pairs[index];
-
-	if (bucket && (pair = gf_pair_get(bucket, key))) {
-		/* The bucket already contains the provided key */
-		return GF_NOT_SUPPORTED;
-	}
-
-	if (!bucket) {
-		/* No bucket has been assigned yet */
-		bucket = gf_list_new();
-		if (!bucket) return GF_OUT_OF_MEM;
-
-		ptr->pairs[index] = bucket;
-	}
-
-	pair = gf_pair_new(key, key_len, item);
-
-	if (!pair) {
-		return GF_OUT_OF_MEM;
-	}
-
-	/* Store the new pair in the bucket */
-	err = gf_list_add(bucket, pair);
-	if(err != GF_OK) {
-		gf_free(pair);
-		return GF_OUT_OF_MEM;
-	}
-
-	return GF_OK;
-}
-
-GF_EXPORT
-Bool gf_map_rem(GF_Map *ptr, const char* key)
-{
-	u32 index;
-	GF_List *bucket;
-
-	/* Find requires a map and a key to work properly */
-	if (!ptr || !key) return GF_FALSE;
-
-	index = hash(key) % ptr->hash_capacity;
-	bucket = ptr->pairs[index];
-
-	return gf_pair_rem(bucket, key);
-}
-
-GF_EXPORT
-u32 gf_map_count(const GF_Map *ptr) {
-	u32 i = 0;
-	u32 count = 0;
-
-	/* No map provided */
-	if (!ptr) return GF_BAD_PARAM;
-
-	/* Iterate through all bucket of the map and count pair */
-	for (; i < ptr->hash_capacity; i++ ) {
-		count += gf_list_count(ptr->pairs[i]);
-	}
-
-	return count;
-}
-
-GF_EXPORT
-Bool gf_map_has_key(GF_Map *ptr, const char* key) {
-	unsigned int index;
-	GF_List *bucket;
-
-	/* Need a map  and key */
-	if (!ptr || !key) return GF_FALSE;
-
-	index = hash(key) % ptr->hash_capacity;
-	bucket = ptr->pairs[index];
-
-	/* Check if pair exists */
-	if (gf_pair_get(bucket, key)) return GF_TRUE;
-
-	return GF_FALSE;
-}

gpac-0.8.0.tar.gz/src/utils/ringbuffer.c Deleted

@@ -1,157 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Pierre Souchay
- *			Copyright (c) Telecom ParisTech 2010
- *					All rights reserved
- *
- *  This file is part of GPAC / common tools 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/ringbuffer.h>
-
-GF_EXPORT
-GF_Ringbuffer * gf_ringbuffer_new(u32 sz)
-{
-	GF_Ringbuffer *rb = (GF_Ringbuffer*)gf_malloc(sizeof(GF_Ringbuffer));
-	if (sz % 2 != 0)
-		sz++;
-	rb->size = sz;
-	rb->size_mask = rb->size;
-	rb->size_mask -= 1;
-	rb->write_ptr = 0;
-	rb->read_ptr = 0;
-	rb->buf = (u8*)gf_malloc (rb->size);
-	rb->mx = gf_mx_new("RingBufferMutex");
-	return rb;
-}
-
-GF_EXPORT
-void gf_ringbuffer_del(GF_Ringbuffer * ringbuffer) {
-	if (!ringbuffer)
-		return;
-	gf_mx_p(ringbuffer->mx);
-	gf_free( ringbuffer->buf);
-	ringbuffer->mx = NULL;
-	gf_mx_v(ringbuffer->mx);
-}
-
-/*!
- * Return the number of bytes available for writing.  This is the
- * number of bytes in front of the write pointer and behind the read
- * pointer.
- * \param rb The ringbuffer
- */
-GF_EXPORT
-u32 gf_ringbuffer_available_for_write (GF_Ringbuffer * rb)
-{
-	u32 w, r;
-
-	w = rb->write_ptr;
-	r = rb->read_ptr;
-
-	if (w > r) {
-		return ((r - w + rb->size) & rb->size_mask) - 1;
-	} else if (w < r) {
-		return (r - w) - 1;
-	} else {
-		return rb->size - 1;
-	}
-}
-
-GF_EXPORT
-u32 gf_ringbuffer_available_for_read (GF_Ringbuffer * rb)
-{
-	size_t w, r;
-
-	w = rb->write_ptr;
-	r = rb->read_ptr;
-
-	if (w > r) {
-		return (u32) (w - r);
-	} else {
-		return (u32) (w - r + rb->size) & rb->size_mask;
-	}
-}
-
-GF_EXPORT
-u32 gf_ringbuffer_read(GF_Ringbuffer *rb, u8 *dest, u32 szDest)
-{
-	u32 free_sz, sz2, to_read, n1, n2;
-
-	if ((free_sz = gf_ringbuffer_available_for_read(rb)) == 0) {
-		return 0;
-	}
-
-	to_read = szDest > free_sz ? free_sz : szDest;
-
-	sz2 = rb->read_ptr + to_read;
-
-	if (sz2 > rb->size) {
-		n1 = rb->size - rb->read_ptr;
-		n2 = sz2 & rb->size_mask;
-	} else {
-		n1 = to_read;
-		n2 = 0;
-	}
-
-	memcpy (dest, &(rb->buf[rb->read_ptr]), n1);
-	rb->read_ptr += n1;
-	rb->read_ptr &= rb->size_mask;
-
-	if (n2) {
-		memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2);
-		rb->read_ptr += n2;
-		rb->read_ptr &= rb->size_mask;
-	}
-
-	return to_read;
-}
-
-GF_EXPORT
-u32 gf_ringbuffer_write (GF_Ringbuffer * rb, const u8 *src, u32 sz)
-{
-	u32 free_sz, sz2, to_write, n1, n2;
-
-	if ((free_sz = gf_ringbuffer_available_for_write(rb)) == 0) {
-		return 0;
-	}
-
-	to_write = sz > free_sz ? free_sz : sz;
-
-	sz2 = rb->write_ptr + to_write;
-
-	if (sz2 > rb->size) {
-		n1 = rb->size - rb->write_ptr;
-		n2 = sz2 & rb->size_mask;
-	} else {
-		n1 = to_write;
-		n2 = 0;
-	}
-
-	memcpy (&(rb->buf[rb->write_ptr]), src, n1);
-	rb->write_ptr += n1;
-	rb->write_ptr &= rb->size_mask;
-
-	if (n2) {
-		memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2);
-		rb->write_ptr += n2;
-		rb->write_ptr &= rb->size_mask;
-	}
-	return to_write;
-}
-

gpac-0.8.0.tar.gz/tests Deleted

gpac-0.8.0.tar.gz/tests/README.MD Deleted

@@ -1,300 +0,0 @@
-This is the documentation for creating a new test in GPAC test suite.
-
-# Running the test suite
-
-To run the entire test suite, simply run `make_tests.sh` or use the Makefile task `make test_suite`.
-
-Running the test suite or a given test generates:
-- result/all_logs.txt: logs of all tests that were executed 
-- result/all_results.xml: GNU time/gtime statistics and execution status of all tests that were executed
-
-The different options of make_tests.sh can are given by the command:
-```
-make_tests.sh -h
-```
-In particular, tests are cached, so that only failed tests are re-launched when running the test suite. 
-
-# Writing a test
-GPAC test suite is composed of scripts written in the Bash language. Tests are placed in gpac/tests/scripts/. Each .sh file in that folder will be executed when running the entire test suite or may be run individually. To run a particular script, run `make_tests.sh ascript.sh`.
-
-Media files used in a test can be anywhere (local file, http URL). The environmnent variable `$MEDIA_DIR` can be used to access to data located in gpac/tests/media. 
-
-Scripts should use the `$TEMP_DIR` environment variable to get a directory where to place the file they generate. This directory is cleaned after each test.
-
-A simple GPAC test can be:
-```
-#!/bin/sh
-MP4Box -add $MEDIA_DIR\foo.bar $TEMP_DIR\foo.mp4
-```
-or 
-```
-#!/bin/sh
-MP4Client $MEDIA_DIR\foo.mp4
-```
-
-In order to provide test caching and produce the unified test report for all the tests, with common timing, logging, etc, `make_tests.sh` defines several functions that should be used in a test.
-
-Each test has its own log file `$LOGS` in which you can write (a lot is already in there, such as test name/data and all stderr).
-
-## Simple Testing
-A simple test whose result will be integrated in the test suite report is run using the single_test function.
-
-### single_test 
-Two arguments:
-- `CMD_LINE`: Executes the given `CMD_LINE`. The command line must be passed between quotes. 
-- `TESTNAME`: specifies the test name
-
-Each call generates:
-- a log file called `TESTNAME-single-logs.txt` containg test name, command line and all stderr of the test. You should not use file logging of GPAC ( `-lf` or `-logs` options) in your command line.
-- a file called `TESTNAME-single-passed.xml` containg the statistics of the test, as retrieved by GNU time/gtime.
-`TESTNAME` shall be unique in the test suite. In case of doubts, run the test suite script with `-check-name`.
-
-A simple test using `single_test` looks like:
-```
-#!/bin/sh
-single_test 'MP4Box -add $MEDIA_DIR\foo.bar $TEMP_DIR\foo.mp4' test01
-```
-or 
-```
-#!/bin/sh
-single_test 'MP4Client $MEDIA_DIR\foo.mp4' test02
-```
-
-### single_playback_test 
-Two arguments: 
-- `MP4CLIENT_ARGS`: specifies the arguments to be passed to MP4Client
-- `TESTNAME`: specifies the test name for logging, as used in `single_test`
-Performs a single playback test using MP4Client with the arguments given in `MP4CLIENT_ARGS`. The result of the playback is captured as a raw audio/video AVI. If ffmpeg is present on the system, the AVI is converted to mp4 in `results/video/$TESTNAME-play.mp4`.
-See `do_playback_test` for more info.
-
-## Aggregating tests
-When the results of several tests need to be aggregated, instead of using multiple `single_test` calls, sub-tests can be run within a test using the `do_test` function. 
-This is usefull when severa tests require the generation of the same input file, for example.
-
-A typical test with two subtests used in a batch will look like:
-```
-mytest()
-{
-test_begin $1
-do_test CMD_LINE1 "Name1"
-do_test CMD_LINE1 "Name2"
-test_end
-}
-
-for i in * ; do
-  mytest $i
-done
-```
-
-### test_begin 
-Argument:
-- `TESTNAME`: specifies the test name for logging, as used in `single_test`
-
-### test_end
-No argument.
-
-Triggers the end of the test and writes all logs and statistics.
-The function evaluates the variable `$result`. If not empty, the test is considered failed, otherwise (default) the test has passed. 
-All results of subtests are automatically appended to the `$result` variable in the `end_test` function.
-WARNING: this variable can not be set in a subshell (eg in `some_function SOME_PARAM &` called during a test), it must be set in the shell calling `test_begin`.
-
-### do_test
-Two arguments:
-- `CMD_LINE`: the command line to execute
-- `SUBTEST_NAME`: the subtest name as it appears in the logs and in the stats
-
-Performs a subtest in the current test. If needed, the return value is available in `$ret`. 
-Function does nothing when the test is skipped (see below) or a previous error occured in the parent test `TESTNAME`.
-
-### do_playback_test 
-Two arguments:
-- `MP4CLIENT_ARGS`: specifies the arguments to be passed to MP4Client
-- `SUBTEST_NAME`: the subtest name as it appears in the logs and in the stats
- `do_playback_test` tests the playback of MP4CLIENT_ARGS by extracting it to a raw AVI and converting it to MP4. The subtest name for logs is `SUBTEST`.
-Function does nothing when the test is skipped (see below) or a previous error occured in the parent test `TESTNAME`.
-
-The generated videos are
--  `external_videos_refs/$TESTNAME-$SUBTEST-ref.mp4` when generating the reference hashes (see below). These videos are currently not used by test suite, only used for visual checking of the reference.
--  `results/videos/$TESTNAME-$SUBTEST-test.mp4` when testing the suite. These videos are currently not used by the test suite, only used for debugging a test.
-
-This function uses overridable variables:
-- `$dump_size`: by default "200x200" but can be overriden by your test
-- `$dump_dur`: by default "10" seconds but can be overriden by your test
-
-## Test failure/success
-A test is considered successful if the execution returned 0.
-Some tests may return a non-zero value and still be considered successful (e.g. negative tests). In that case, errors to be ignored are placed in a file in the gpac/rules directory. If any of the line in this file is found, the test is considered successful. 
-The error file is named:
-- `TESTNAME-stderr.txt` for tests run with the function `single_test`
-- `$TESTNAME-$SUBTEST-stderr.txt` for subtests run with `do_test` `CMD_LINE``SUBTEST`
-
-## Customized test 
-To customize a test, a file named `$TESTNAME.sh` can be placed in the gpac/rules directory. It is called before the actual test is run and allows custom variables to be set or overriding a given variable in a batch of tests, while still using a single generic test function. Directories variables shall not be modified. Other variables of the test suite documented here are reset at the begining of each test.  
-
-## Testing and caching results
-In order to avoid running all tests again whenever one test fails, the GPAC testing environment caches previous test results. If an XML file corresponding to the test or subtest exists in the results folder, the test or subtest is not run. If you want to ignore previous results, use `make_tests.sh -clean` before running the test suite. If you only want to invalidate tests of a given script, use  `make_tests.sh -clean script.sh` 
-In case a test requires generating files before testing , it is recommended to check the variable `test_skip` to check if the test is being skipped because cached. A typical function looks like:
-
-A typical test with several subtests and hash testing looks like:
-```
-test_begin TESTNAME
-if [ $test_skip = 1 ] ; then
- return
-fi
- 
-#create some file or costly operation
-MP4Box -add 4GB.src -new TESTFILE
-do_test CMD_LINE1_USING_TESTFILE "Name1"
-do_test CMD_LINE2 "Name2"
-
-test_end
-```
-In this example, failure to checktest `$test_skip` will make the script import 4GB.src even though all `do_test` calls will be skipped.
-
-
-## Testing events and interactivity
-The functions `single_playback_test` and `single_playback_test`  may use recorded event traces to test interactivity; the recorded trace file is:
-- $RULES_DIR/${basename $FILE.*}-$SUBTEST-ui.xml
-
-The test suite has one UI trace generation mode, and one UI trace playback mode. In these two modes, all subtests are skipped (i.e.  `$test_skip` is  1), and the variable `$test_ui`is set to 1 when recording and 2 when playing. A test may use the `do_ui_test` function to perform UI testing. 
-
-### do_ui_test
-Two arguments:
-- `FILE`: the command line to execute
-- `SUBTEST_NAME`: the subtest name as it appears in the logs and in the stats
-
-Performs UI event trace generation on $FILE for the subtest, for a running duration of $dump_dur and an output size $dump_size (see `do_playback_test`). `SUBTEST_NAME` must be the same as one of the playback subtests used in this test. A typicall usage is:
-
-```
-test_begin TESTNAME
-do_ui_test $MEDIA_DIR/somefile "play"
-
-#create some file or costly operation
-do_playback_test $MEDIA_DIR/somefile "play"
-
-test_end
-```
-
-A more complex example with target playback file creation could be
-
-```
-test_begin TESTNAME
-
-if [ $test_ui != 0 ] ; then
-$MP4BOX -mp4 test.bt
-do_ui_test test.mp4 "play"
-rm test.mp4 > /dev/null
-fi
-if [ $test_skip = 1 ] ; then
- return
-fi
-
-#create some file or costly operation
-do_test "$MP4BOX -mp4 test.bt"
-do_playback_test test.mp4 "play"
-
-test_end
-```
-Note that the file has to be generated
-- before testing cache status since all tests are considered as cached in UI modes
-- manually, since subtests are deactivated when the test is cached
-
-## Parallel tests with subscripts
-
-Subtests may be run in subscripts, for example:
-```
-test_begin TESTNAME
- do_test CMD_LINE1 "Name1" &
- do_test CMD_LINE1 "Name2" &
-test_end
-```
-
-Tests may also be run in subscript, for example:
-```
-function my_test {
-  test_begin $2
-  do_test $1 $2
-  test_end
-}
-
-my_test CMD_LINE1 "Name1" &
-my_test CMD_LINE2 "Name2" &
-```
-
-
-## Testing regressions with hashes
-
-Tests may perform all the required checks to detect a regression, such as checking generated file info, counting importing samples, etc ... 
-To simplify test writing, the GPAC testing environment provide simple hashing (SHA-1) functions that you can perform on generated files such as MP4 or TS files, logs, XML dumps, ... Using hashes avoid storing such files while allowing generic regression detection. Because of this functionnality, the test suite has a specific mode for generating the hashes, `./make_tests -hash`. Hashes are typically generated only once, upon initial test creation.
-The test suite script will warn you when reference hashes are missing.
-- To clean hashes for a single test, use `./make_tests -clean-hash mytest.sh`
-- To generate hashes for a single test, use `./make_tests -hash mytest.sh`
-
-The following functions are available for hash testing.
-
-### do_hash_test 
-Two arguments
-- `FILE`
-- `HASHNAME`
-When the test suite is run in hash generation mode, this generates the reference `hash_refs/$TESTNAME-$HASHNAME.hash`. Otherwise, creates a SHA-1 of FILE and compares it with the reference `$TESTNAME-$HASHNAME.hash`. 
-Function does nothing when the test is skipped (see below) or a previous error occured in the parent test `TESTNAME`.
-
-WARNING: `HASHNAME` shall be unique for a given test, otherwise hashes will be overwritten.
-
-### do_compare_file_hashes 
-Two arguments
-- `FILE1`
-- `FILE2`
-Compares hashes of `FILE1` and `FILE2`. returns 0 if OK or error code otherwise.
-Function does nothing when the test is skipped (see below) or a previous error occured in the parent test `TESTNAME`.
-
-The playback functions `single_playback_test` and `do_playback_test` use hashes to check video and audio renderers. 
-- For  `single_playback_test`, the generated hashes are `$TESTNAME-avirawvideo.hash`and `$TESTNAME-avirawaudio.hash`. 
-- For `do_playback_test`, the generated hashes are `$TESTNAME-$SUBTEST-avirawvideo.hash` and `$TESTNAME-$SUBTEST-avirawaudio.hash`.
-
-
-A typical test with several subtests and hash testing looks like:
-```
-test_begin TESTNAME
-if [ $test_skip = 1 ] ; then
- return
-fi
- 
-#run some test creating a file FILE1
-do_test CMD_LINE1_CREATING_FILE1 "Name1"
-#perform hash on FILE1 - the hash name may be the same as the subtest names
-do_hash_test FILE1 "Name1"
-
-#play the file - hashes wil be generated/checked 
-do_playback_test FILE1 "Name1"
-
-
-test_end
-```
-
-## Test Fuzzing
-The test suite can be used to invoke afl-fuzz on the content (see test suite help). 
-By default all tests are not eligible for fuzzing unless forced by the main script but this can be too heavy, some tests using quite large inputs.
-To make your test eligible for fuzzing in default fuzzing mode, you need to overwrite the `fuzz_test` variable. The `fuzz_test` variable is evaluated at each `do_test` call.
-
-```
-test_begin TESTNAME
-if [ $test_skip = 1 ] ; then
- return
-fi
-#declare the test is elligible for fuzzing
-fuzz_test=1 
-do_test CMD_LINE1_CREATING_FILE1 "Name1"
-
-#don't fuzz next test
-fuzz_test=0
-
-do_test CMD_LINE1_CREATING_FILE2 "Name2"
-
-#and fuzz next test
-fuzz_test=1 
-do_test CMD_LINE1_CREATING_FILE3 "Name3"
-
-test_end
-```
-

gpac-0.8.0.tar.gz/tests/ghp_deploy.sh Deleted

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-if [ -z "$GH_TOKEN" ]; then
-    echo 'GH_TOKEN is not defined, do nothing'
-    exit 0
-fi
-
-set -e # exit with nonzero exit code if anything fails
-
-cp -rf stylesheet.xsl index.html ../coverage ../coverage.info results
-
-# go to the results directory and create a *new* Git repo
-cd results
-rm -rf .git
-git init
-
-# inside this git repo we'll pretend to be a new user
-git config user.name "Travis CI"
-git config user.email "travisci@gpac.io"
-
-# The first and only commit to this new Git repo contains all the
-# files present with the commit message "Deploy to GitHub Pages".
-git add all_results.xml stylesheet.xsl index.html logs coverage coverage.info
-git commit -q -m "Deploy to GitHub Pages"
-
-# Force push from the current repo's master branch to the remote
-# repo's gh-pages branch. (All previous history on the gh-pages branch
-# will be lost, since we are overwriting it.) We redirect any output to
-if grep "platform=\"Linux\"" all_results.xml > /dev/null; then
-    if [ -z "$GH_REF_LINUX" ]; then
-        echo 'GH_REF_LINUX is not defined, do nothing'
-        exit 0
-    fi
-    git push --force --quiet "https://${GH_TOKEN}@${GH_REF_LINUX}" master:gh-pages > /dev/null 2>&1
-elif grep "platform=\"Darwin\"" all_results.xml > /dev/null; then
-   if [ -z "$GH_REF_MACOS" ]; then
-        echo 'GH_REF_MACOS is not defined, do nothing'
-        exit 0
-    fi
-    git push --force --quiet "https://${GH_TOKEN}@${GH_REF_MACOS}" master:gh-pages > /dev/null 2>&1 
-else
-    echo 'platform unknown, do nothing'
-fi

gpac-0.8.0.tar.gz/tests/index.html Deleted

gpac-0.8.0.tar.gz/tests/make_tests.sh Deleted

@@ -1,1669 +0,0 @@
-#!/bin/bash
-
-#for user doc, check scripts/00-template
-
-base_args=""
-
-GNU_TIME=/usr/bin/time
-GNU_DATE=date
-GNU_TIMEOUT=timeout
-#GNU_SED=sed
-DIFF=diff
-GCOV=gcov
-FFMPEG=ffmpeg
-READLINK=readlink
-
-EXTERNAL_MEDIA_AVAILABLE=1
-
-platform=`uname -s`
-
-
-if [ $platform = "Darwin" ] ; then
-GNU_TIME=gtime
-GNU_DATE=gdate
-GNU_TIMEOUT=gtimeout
-READLINK=greadlink
-fi
-
-
-#if the script in launched from elsewhere, main_dir still needs to be the script directory
-main_dir="$(dirname $($READLINK -f $0))"
-cd $main_dir
-
-#if launched from an absolute path, set all paths as absolute (will break on cygwin)
-rel_main_dir="."
-if [[ "$0" = /* ]]; then
-  rel_main_dir=$main_dir
-fi
-
-
-MP4CLIENT_NOT_FOUND=0
-
-generate_hash=0
-play_all=0
-global_test_ui=0
-log_after_fail=0
-verbose=0
-enable_timeout=0
-enable_fuzzing=0
-fuzz_all=0
-fuzz_duration=60
-no_fuzz_cleanup=0
-skip_next_hash_test=0
-
-current_script=""
-
-DEF_DUMP_DUR=10
-DEF_DUMP_SIZE="200x200"
-DEF_TIMEOUT=20
-
-#remote location of resource files: all media files, hash files and generated videos
-REFERENCE_DIR="http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources"
-#dir where all external media are stored
-EXTERNAL_MEDIA_DIR="$rel_main_dir/external_media"
-#dir where all hashes are stored
-HASH_DIR="$rel_main_dir/hash_refs"
-#dir where all specific test rules (override of defaults, positive tests, ...) are stored
-RULES_DIR="$rel_main_dir/rules"
-#dir where all referenced videos are stored
-SCRIPTS_DIR="$rel_main_dir/scripts"
-#dir where all referenced videos are stored
-VIDEO_DIR_REF="$rel_main_dir/external_videos_refs"
-
-#dir where all local media data (ie from git repo) is stored
-MEDIA_DIR="$rel_main_dir/media"
-#local dir where all data will be generated (except hashes and referenced videos)
-LOCAL_OUT_DIR="$rel_main_dir/results"
-
-#dir where all test videos are generated
-VIDEO_DIR="$LOCAL_OUT_DIR/videos"
-#dir where all logs are generated
-LOGS_DIR="$LOCAL_OUT_DIR/logs"
-#temp dir for any test
-INTERN_TEMP_DIR="$LOCAL_OUT_DIR/temp"
-TEMP_DIR=$INTERN_TEMP_DIR
-
-ALL_REPORTS="$LOCAL_OUT_DIR/all_results.xml"
-ALL_LOGS="$LOCAL_OUT_DIR/all_logs.txt"
-
-TEST_ERR_FILE="$TEMP_DIR/err_exit"
-
-rm -f "$TEST_ERR_FILE" 2> /dev/null
-rm -f "$LOGS_DIR/*.sh" 2> /dev/null
-
-if [ ! -e $LOCAL_OUT_DIR ] ; then
-mkdir $LOCAL_OUT_DIR
-fi
-
-if [ ! -e $HASH_DIR ] ; then
-mkdir $HASH_DIR
-fi
-
-if [ ! -e $VIDEO_DIR ] ; then
-mkdir $VIDEO_DIR
-fi
-
-if [ ! -e $VIDEO_DIR_REF ] ; then
-mkdir $VIDEO_DIR_REF
-fi
-
-
-if [ ! -e $LOGS_DIR ] ; then
-mkdir $LOGS_DIR
-fi
-
-if [ ! -e $RULES_DIR ] ; then
-mkdir $RULES_DIR
-fi
-
-if [ ! -e $INTERN_TEMP_DIR ] ; then
-mkdir $INTERN_TEMP_DIR
-fi
-
-L_ERR=1
-L_WAR=2
-L_INF=3
-L_DEB=4
-
-log()
-{
- if [ $TERM = "cygwin" ]; then
-
-  if [ $1 = $L_ERR ]; then
-    echo -ne "\033[31m"
-  elif [ $1 = $L_WAR ]; then
-    echo -ne "\033[32m"
-  elif [ $1 = $L_INF ]; then
-    echo -ne "\033[34m"
-  elif [ $verbose = 0 ]; then
-    echo -ne "\033[0m"
-    return
-  fi
-
-  echo $2
-  echo -ne "\033[0m"
-
- else
-
-  if [ $1 = $L_ERR ]; then
-    tput setaf 1
-  elif [ $1 = $L_WAR ]; then
-    tput setaf 2
-  elif [ $1 = $L_INF ]; then
-    tput setaf 4
-  elif [ $verbose = 0 ]; then
-    tput sgr0
-    return
-  fi
-
-  echo $2
-  tput sgr0
-
- fi
-}
-
-print_usage ()
-{
-echo "GPAC Test Suite Usage: $0 [<options>] [<SCRIPTS>]"
-echo ""
-echo "*** Test suite validation options"
-echo "  -clean [ARG]:          removes all removes all results (logs, stat cache and video). If ARG is specified, only clean tests generated by scripts ARG."
-echo "  -play-all:             force playback of BT and XMT files for BIFS (by default only MP4)."
-echo "  -no-hash:              runs test suite without hash checking."
-echo ""
-echo "*** Test suite generation options"
-echo "  -clean-hash [ARG]:     removes all generated hash, logs, stat cache and videos. If ARG is specified, only clean tests generated by scripts ARG."
-echo "  -hash:                 regenerate tests with missing hash files."
-echo "  -uirec:                generates UI event traces."
-echo "  -uiplay:               replays all recorded UI event traces."
-echo "  -speed=N:              sets playback speed for -uiplay. Default is 1."
-echo ""
-echo "*** Fuzzing options"
-echo "  -do-fuzz:              runs test using afl-fuzz (gpac has to be compiled with afl-gcc first)."
-echo "  -fuzzdur=D:            runs fuzz tests for D (default is $fuzz_duration seconds). D is passed as is to timout program."
-echo "  -fuzzall:              fuzz all tests."
-echo "  -keepfuzz:             keeps all fuzzing data."
-echo ""
-echo "*** General options"
-echo "  -strict:               stops at the first failed test"
-echo "  -warn:                 dump logs after each failed test (used for travisCI)"
-echo "  -keep-avi:             keeps raw AVI files (warning this can be pretty big)"
-echo "  -keep-tmp:             keeps tmp folder used in tests (erased by default)"
-echo "  -sync-hash:            syncs all remote reference hashes with local base"
-echo "  -git-hash:             syncs all remote reference hashes from git with local base"
-echo "  -sync-media:           syncs all remote media with local base (warning this can be long)"
-echo "  -sync-refs:            syncs all remote reference videos with local base (warning this can be long)"
-echo "  -sync-before:          syncs all remote resources with local base (warning this can be long) before running the tests"
-echo "  -check:                check test suites (names of each test is unique)"
-echo "  -track-stack:          track stack in malloc and turns on -warn option"
-echo "  -noplay:               disables MP4Client tests"
-echo "  -test=NAME             only executes given test"
-echo "  -precommit              alias for -sync-before -git-hash -warn -noplay. Before commit/push, you should run ./make_tests -precommit"
-echo "  SCRIPTS                only runs the scripts provided as arguments, by default runs everything in $SCRIPTS_DIR"
-echo "  -v:                    set verbose output"
-echo "  -h:                    print this help"
-}
-
-
-#performs mirroring of media and references hash & videos
-sync_media ()
-{
- log $L_INF "- Mirroring $REFERENCE_DIR/media/ to $EXTERNAL_MEDIA_DIR"
- if [ ! -e $EXTERNAL_MEDIA_DIR ] ; then
-  mkdir $EXTERNAL_MEDIA_DIR
- fi
- cd $EXTERNAL_MEDIA_DIR
- wget -q -m -nH --no-parent --cut-dirs=4 --reject "*.gif" --reject "index.html*" --restrict-file-names=nocontrol "$REFERENCE_DIR/media/"
- cd "$main_dir"
-}
-
-sync_hash ()
-{
-log $L_INF "- Mirroring reference hashes from from github to $HASH_DIR"
-cd $HASH_DIR
-if [ ! -d ".git" ]; then
-  rm -f *
-  git clone https://github.com/gpac/gpac-test-hash.git .
-else
-  git fetch origin
-  git reset --hard origin/master
-fi
-cd "$main_dir"
-}
-
-
-#performs mirroring of media and references hash & videos
-sync_refs ()
-{
-log $L_INF "- Mirroring reference videos from $REFERENCE_DIR to $VIDEO_DIR_REF"
-cd $VIDEO_DIR_REF
-wget -q -m -nH --no-parent --cut-dirs=4 --reject "*.gif" "$REFERENCE_DIR/video_refs/"
-cd "$main_dir"
-}
-
-
-url_arg=()
-do_clean=0
-keep_avi=0
-do_clean_hash=0
-check_only=0
-disable_hash=0
-strict_mode=0
-track_stack=0
-speed=1
-single_test_name=""
-keep_temp_dir=0
-
-#Parse arguments
-for i in $* ; do
- case $i in
- "-hash")
-  generate_hash=1;;
- "-play-all")
-   play_all=1;;
- "-clean")
-   do_clean=1;;
- "-clean-hash")
-   do_clean_hash=1;;
- "-uirec")
-  global_test_ui=1;;
- "-uiplay")
-  global_test_ui=2;;
- -speed*)
-  speed="${i#-speed=}"
-  ;;
- "-keep-avi")
-  keep_avi=1;;
- "-keep-tmp")
-  keep_temp_dir=1;;
- "-no-hash")
-  disable_hash=1;;
- "-strict")
-  strict_mode=1;;
- "-do-fuzz")
-  enable_fuzzing=1;;
- -fuzzdur*)
-  fuzz_duration="${i#-fuzzdur=}"
-  ;;
- "-fuzzall")
-  fuzz_all=1;;
- "-keepfuzz")
-  no_fuzz_cleanup=1;;
- "-sync-hash")
-  sync_hash
-  exit;;
- "-git-hash")
-  sync_hash;;
- "-sync-media")
-  sync_media;;
- "-sync-refs")
-  sync_refs
-  exit;;
- "-sync-before")
-  sync_media;;
- "-check")
-  check_only=1;;
- "-warn")
-  log_after_fail=1;;
- "-track-stack")
-  track_stack=1;;
- "-noplay")
-	MP4CLIENT_NOT_FOUND=1;;
- -test*)
-  single_test_name="${i#-test=}"
-  ;;
- "-v")
-  verbose=1;;
- "-precommit")
-  sync_media
-  sync_hash
-  log_after_fail=1
-  MP4CLIENT_NOT_FOUND=1
-  ;;
- "-h")
-  print_usage
-  exit;;
- -*)
-   log $L_ERR "Unknown Option \"$i\" - check usage (-h)"
-   exit;;
- *)
-  url_arg+=("$i")
- ;;
-esac
-done
-
-if [ $check_only != 0 ] ; then
- do_clean_hash=0
- do_clean=0
- global_test_ui=0
-fi
-
-#Clean all hashes and reference videos
-if [ $do_clean_hash != 0 ] ; then
-
- #force cleaning as well
- do_clean=1
-
- #when using specific scripts, cleanup will be done in test_begin()
- if [ "${#url_arg[@]}" -eq 0 ] ; then
-  read -p "This will remove all referenced videos and hashes. Are you sure (y/n)?" choice
-  if [ $choice != "y" ] ; then
-   log $L_ERR "Canceled"
-   exit
-  fi
-  log $L_INF "Deleting SHA-1 Hashes"
-  rm -rf $HASH_DIR/* 2> /dev/null
-  rm -rf $VIDEO_DIR_REF/* 2> /dev/null
- fi
-fi
-
-#Clean all cached results and generated videos
-if [ $do_clean != 0 ] ; then
- rm -f $ALL_REPORTS > /dev/null
- rm -f $ALL_LOGS > /dev/null
- rm -rf $INTERN_TEMP_DIR/* 2> /dev/null
- if [ "${#url_arg[@]}" -eq 0 ] ; then
-  echo "Deleting cache (logs, stats and videos)"
-  rm -rf $LOGS_DIR/* > /dev/null
-  rm -rf $VIDEO_DIR/* 2> /dev/null
-  exit
- fi
-fi
-
-log $L_INF "Checking test suite config"
-
-if [ $generate_hash = 0 ] ; then
- if [ ! "$(ls -A $HASH_DIR)" ]; then
-  disable_hash=1
-  log $L_WAR "- Reference hashes unavailable - you may sync them using -sync-hash  - skipping hash tests"
-  else
-  log $L_INF "- Reference hashes available - enabling hash tests"
- fi
-fi
-
-if [ ! -e $EXTERNAL_MEDIA_DIR ] ; then
-EXTERNAL_MEDIA_AVAILABLE=0
-elif [ ! -e $EXTERNAL_MEDIA_DIR/counter ] ; then
-EXTERNAL_MEDIA_AVAILABLE=0
-fi
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
- log $L_WAR "- External media dir unavailable - you may sync it using -sync-media"
-else
- log $L_INF "- External media dir available"
-fi
-
-#test for GNU time
-$GNU_TIME ls > /dev/null 2>&1
-res=$?
-if [ $res != 0 ] ; then
-log $L_ERR "GNU time not found (ret $res) - exiting"
-exit 1
-fi
-
-#test for GNU date
-$GNU_DATE > /dev/null 2>&1
-res=$?
-if [ $res != 0 ] ; then
-log $L_ERR "GNU date not found (ret $res) - exiting"
-exit 1
-fi
-
-#test for timeout
-$GNU_TIMEOUT 1.0 ls > /dev/null 2>&1
-res=$?
-if [ $res != 0 ] ; then
- log $L_ERR "GNU timeout not found (ret $res) - some tests may hang forever ..."
- enable_timeout=0
- if [ $enable_fuzzing != 0 ] ; then
-  log $L_ERR "GNU timeout not found - disabling fuzzing"
-  enable_fuzzing=0
- fi
-else
-enable_timeout=1
-fi
-
-
-#test for ffmpeg - if not present, disable video storing
-do_store_video=1
-
-if [ $check_only = 0 ] ; then
-
-
-$FFMPEG -version > /dev/null 2>&1
-if [ $? != 0 ] ; then
-log $L_WAR "- FFMPEG not found - disabling playback video storage"
-do_store_video=0
-else
-  if [ $generate_hash != 0 ] ; then
-	log $L_INF "- Generating reference videos"
-  fi
-fi
-
-
-#check MP4Box, MP4Client and MP42TS (use default args, not custum ones because of -mem-track)
-MP4Box -h 2> /dev/null
-res=$?
-if [ $res != 0 ] ; then
-log $L_ERR "MP4Box not found (ret $res) - exiting"
-exit 1
-fi
-
-MP4CLIENT="MP4Client"
-
-if [ $MP4CLIENT_NOT_FOUND = 0 ] && [ $do_clean = 0 ] ; then
-  MP4Client -run-for 0 2> /dev/null
-  res=$?
-  if [ $res != 0 ] ; then
-    # to remove when travis is ready to execute playback tests
-    MP4CLIENT_NOT_FOUND=1
-    echo ""
-    log $L_WAR "WARNING: MP4Client not found (ret $res) - launch results:"
-    MP4Client -run-for 0
-    res=$?
-    if [ $res = 0 ] ; then
-      log $L_INF "MP4Client returned $res on second run - all playback tests ready but still disabled"
-    else
-      echo "** MP4Client returned $res - disabling all playback tests - dumping GPAC config file **"
-      cat $HOME/.gpac/GPAC.cfg
-      echo "** End of dump **"
-      MP4CLIENT_NOT_FOUND=1
-    fi
-  fi
-fi
-
-disable_playback=$MP4CLIENT_NOT_FOUND
-
-MP42TS -h 2> /dev/null
-res=$?
-if [ $res != 0 ] ; then
-log $L_ERR "MP42TS not found (ret $res) - exiting"
-exit 1
-fi
-
-#check mem tracking is supported
-res=`MP4Box -mem-track -h 2>&1 | grep "WARNING"`
-if [ -n "$res" ]; then
-  log $L_WAR "- GPAC not compiled with memory tracking"
-else
- log $L_INF "- Enabling memory-tracking"
- if [ $track_stack = 1 ]; then
-  base_args="$base_args -mem-track-stack"
-  log_after_fail=1
- else
-  base_args="$base_args -mem-track"
- fi
-fi
-
-#end check_only
-fi
-
-#check for afl-fuzz
-if [ $enable_fuzzing != 0 ] ; then
- log $L_INF "Checking for afl-fuzz"
- command -v afl-fuzz >/dev/null 2>&1
- if [ $? != 0 ] ; then
-  log $L_WAR "afl-fuzz not found - disabling fuzzing"
-  enable_fuzzing=0
- else
-  mkdir tmpafi
-  mkdir tmpafo
-
-  echo "void" > tmpafi/void.mp4
-  $GNU_TIMEOUT 3.0 afl-fuzz -d -i tmpafi -o tmpafo MP4Box -h > /dev/null
-  if [ $? != 0 ] ; then
-   log $L_WAR "afl-fuzz not properly configure:"
-   afl-fuzz -d -i tmpafi -o tmpafo MP4Box -h
-   exit
-  else
-   log $L_INF "afl-fuzz found and OK - enabling fuzzing with duration $fuzz_duration"
-  fi
-  rm -rf tmpaf*
- fi
-fi
-
-echo ""
-
-#reassign our default programs
-MP4BOX="MP4Box -noprog -for-test $base_args"
-MP4CLIENT="MP4Client -noprog -strict-error $base_args"
-MP42TS="MP42TS $base_args"
-DASHCAST="DashCast $base_args"
-
-$MP4BOX -version 2> $INTERN_TEMP_DIR/version.txt
-VERSION="`head -1 $INTERN_TEMP_DIR/version.txt | cut -d ' ' -f 5-` "
-rm $INTERN_TEMP_DIR/version.txt
-log $L_INF "GPAC version: $VERSION"
-log $L_INF ""
-
-#reset all the possible return values
-reset_stat ()
-{
- EXECUTION_STATUS="N/A"
- RETURN_VALUE="N/A"
- MEM_TOTAL_AVG="N/A"
- MEM_RESIDENT_AVG="N/A"
- MEM_RESIDENT_MAX="N/A"
- CPU_PERCENT="N/A"
- CPU_ELAPSED_TIME="N/A"
- CPU_USER_TIME="N/A"
- CPU_KERNEL_TIME="N/A"
- PAGE_FAULTS="N/A"
- FILE_INPUTS="N/A"
- SOCKET_MSG_REC="N/A"
- SOCKET_MSG_SENT="N/A"
-}
-
-#begin a test with name $1 and using hashes called $1-$2 ... $1-$N
-test_begin ()
-{
-  if [ $# -gt 1 ] ; then
-   log $L_ERR "> in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@test_begin takes only two arguments - wrong call (first arg is $1)"
-  fi
-
- test_skip=0
- result=""
- TEST_NAME=$1
- fuzz_test=$fuzz_all
- is_fuzz_test=0
- reference_hash_valid="$HASH_DIR/$TEST_NAME-valid-hash"
-
- log $L_DEB "Starting test $TEST_NAME"
-
- TEMP_DIR=$INTERN_TEMP_DIR
-
- report="$TEMP_DIR/$TEST_NAME-temp.txt"
- LOGS="$LOGS_DIR/$TEST_NAME-logs.txt-new"
- final_report="$LOGS_DIR/$TEST_NAME-passed.xml"
-
-
- if [ $do_clean != 0 ] ; then
-  if [ $do_clean_hash != 0 ] ; then
-   rm -rf $HASH_DIR/$TEST_NAME* 2> /dev/null
-   rm -rf $VIDEO_DIR_REF/$TEST_NAME* 2> /dev/null
-   rm -rf $reference_hash_valid 2> /dev/null
-  fi
-  rm -rf $LOGS_DIR/$TEST_NAME* > /dev/null
-  rm -rf $VIDEO_DIR/$TEST_NAME* 2> /dev/null
-  test_skip=1
-  return
- fi
-
- if [ $check_only != 0 ] ; then
-  test_ui=0
-  report="$TEMP_DIR/$TEST_NAME.test"
-  if [ -f $report ] ; then
-   log $L_ERR "Test $TEST_NAME already exists - please fix ($current_script)"
-   rm -rf $TEMP_DIR/* 2> /dev/null
-   exit
-  fi
-  echo "" > $report
-  test_skip=1
-  return
- fi
-
- if [ $keep_temp_dir != 0 ] ; then
- 	TEMP_DIR="$INTERN_TEMP_DIR/$TEST_NAME"
-	if [ ! -e $TEMP_DIR ] ; then
-		mkdir $TEMP_DIR
-	fi
- fi
-
- #reset defaults
- dump_dur=$DEF_DUMP_DUR
- dump_size=$DEF_DUMP_SIZE
- test_timeout=$DEF_TIMEOUT
-
- test_skip=0
- single_test=0
-
- test_args="$@"
- test_nb_args=$#
- skip_play_hash=0
- subtest_idx=0
- nb_subtests=0
- test_ui=$global_test_ui
-
- test_stats="$LOGS_DIR/$TEST_NAME-stats.sh"
-
- #if error in strict mode, mark the test as skippable using value 2
- if [ $strict_mode = 1 ] ; then
-  if [ -f $TEST_ERR_FILE ] ; then
-   test_skip=2
-  fi
- fi
-
- if [ $MP4CLIENT_NOT_FOUND = 0 ] ; then
-  skip_play_hash=1
- fi
-
- if [ $generate_hash = 1 ] ; then
-  #skip test only if reference hash is marked as valid
-  if [ -f "$reference_hash_valid" ] ; then
-   log $L_DEB "Reference hash found for test $TEST_NAME - skipping hash generation"
-   test_skip=1
-  fi
- elif [ $test_ui != 0 ] ; then
-   test_skip=0
- elif [ $test_skip = 0 ] ; then
-  #skip test only if final report is present (whether we generate hashes or not)
-  if [ -f "$final_report" ] ; then
-   if [ -f "$test_stats" ] ; then
-    log $L_DEB "$TEST_NAME already passed - skipping"
-    test_skip=1
-   else
-    log $L_WAR "$TEST_NAME already passed but missing stats.sh - regenerating"
-   fi
-  fi
- fi
-
- if [ "$single_test_name" != "" ] && [ "$single_test_name" != "$TEST_NAME" ] ; then
-   test_ui=0
-   test_skip=1
- fi
-
- if [ $test_skip != 0 ] ; then
-   #stats.sh may be missing when generating hashes and that's not an error
-   if [ -f "$test_stats" ] ; then
-    has_skip=`grep -w "TEST_SKIP" $test_stats`
-
-    if [ "$has_skip" = "" ]; then
-		echo "TEST_SKIP=$test_skip" >> $test_stats
-    fi
-   fi
-   test_skip=1
- elif [ $test_ui != 0 ] ; then
-   #in UI test mode don't check cache status, always run the tests
-   test_skip=1
- else
-  echo "*** $TEST_NAME logs (GPAC version $VERSION) - test date $(date '+%d/%m/%Y %H:%M:%S') ***" > $LOGS
-  echo "" >> $LOGS
- fi
-
-
- rules_sh=$RULES_DIR/$TEST_NAME.sh
- if [ -f $rules_sh ] ; then
-  source $rules_sh
- fi
-
-}
-
-mark_test_error ()
-{
- if [ $strict_mode = 1 ] ; then
-  echo "" > $TEST_ERR_FILE
-  log $L_ERR "Error test $TEST_NAME subtest $SUBTEST_NAME - aborting"
- fi
-}
-
-
-#ends test - gather all logs/stats produced and generate report
-test_end ()
-{
- #wait for all sub-tests to complete (some may use subshells)
- wait
-
- TEMP_DIR=$INTERN_TEMP_DIR
-
-  if [ $# -gt 0 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@test_end takes no argument - wrong call"
-  fi
-
- if [ $test_skip = 1 ] ; then
-  return
- fi
-
- test_stats="$LOGS_DIR/$TEST_NAME-stats.sh"
- echo "" > $test_stats
- stat_xml_temp="$TEMP_DIR/$TEST_NAME-statstemp.xml"
- echo "" > $stat_xml_temp
-
- test_fail=0
- test_leak=0
- test_exec_na=0
- nb_subtests=0
- nb_test_hash=0
- nb_hash_fail=0
- nb_hash_missing=0
-
- if [ "$result" != "" ] ; then
-  test_fail=1
- fi
-
-# makes glob on non existing files to expand to null
-# enabling loops on nonexisting* to be empty
-shopt -s nullglob
-
- #gather all stats per subtests
- for i in $TEMP_DIR/$TEST_NAME-stats-*.sh ; do
-  reset_stat
-  RETURN_VALUE=0
-  SUBTEST_NAME=""
-  COMMAND_LINE=""
-  SUBTEST_IDX=0
-
-  nb_subtests=$((nb_subtests + 1))
-
-  source $i
-
-  echo "  <stat subtest=\"$SUBTEST_NAME\" execution_status=\"$EXECUTION_STATUS\" return_status=\"$RETURN_STATUS\" mem_total_avg=\"$MEM_TOTAL_AVG\" mem_resident_avg=\"$MEM_RESIDENT_AVG\" mem_resident_max=\"$MEM_RESIDENT_MAX\" cpu_percent=\"$CPU_PERCENT\" cpu_elapsed_time=\"$CPU_ELAPSED_TIME\" cpu_user_time=\"$CPU_USER_TIME\" cpu_kernel_time=\"$CPU_KERNEL_TIME\" page_faults=\"$PAGE_FAULTS\" file_inputs=\"$FILE_INPUTS\" socket_msg_rec=\"$SOCKET_MSG_REC\" socket_msg_sent=\"$SOCKET_MSG_SENT\" return_value=\"$RETURN_VALUE\">" >> $stat_xml_temp
-
-  echo "   <command_line>$COMMAND_LINE</command_line>" >> $stat_xml_temp
-  echo "  </stat>" >> $stat_xml_temp
-
-  test_ok=1
-
-  if [ $RETURN_VALUE -eq 1 ] ; then
-   result="$SUBTEST_NAME:Fail $result"
-   test_ok=0
-   test_fail=$((test_fail + 1))
-  elif [ $RETURN_VALUE -eq 2 ] ; then
-   result="$SUBTEST_NAME:MemLeak $result"
-   test_ok=0
-   test_leak=$((test_leak + 1))
-  elif [ $RETURN_VALUE != 0 ] ; then
-   if [ $enable_timeout != 0 ] && [ $RETURN_VALUE = 124 ] ; then
-    result="$SUBTEST_NAME:Timeout $result"
-   else
-    result="$SUBTEST_NAME:Fail(ret code $RETURN_VALUE) $result"
-   fi
-   test_ok=0
-   test_fail=$((test_fail + 1))
-  fi
-
-  if [ $log_after_fail = 1 ] ; then
-   if [ $test_ok = 0 ] ; then
-    sublog=$LOGS_DIR/$TEST_NAME-logs-$SUBTEST_IDX-$SUBTEST_NAME.txt
-    if [ -f $sublog ] ; then
-	 cat $sublog 2> stderr
-    fi
-   fi
-  fi
-  rm -f $i > /dev/null
- done
-
- #gather all hashes for this test
- for i in $TEMP_DIR/$TEST_NAME-stathash-*.sh ; do
-  if [ -f $i ] ; then
-   HASH_TEST=""
-   HASH_NOT_FOUND=0
-   HASH_FAIL=0
-   SRC_NOT_FOUND=0
-
-   source $i
-   nb_test_hash=$((nb_test_hash + 1))
-   if [ $HASH_NOT_FOUND -eq 1 ] ; then
-    result="$HASH_TEST:HashNotFound $result"
-    nb_hash_missing=$((nb_hash_missing + 1))
-    test_exec_na=$((test_exec_na + 1))
-   elif [ $SRC_NOT_FOUND -eq 1 ] ; then
-    result="$HASH_TEST:HashSourceNotFound $result"
-    test_ok=0
-    nb_hash_fail=$((nb_hash_fail + 1))
-    test_exec_na=$((test_exec_na + 1))
-   elif [ $HASH_FAIL -eq 1 ] ; then
-    result="$HASH_TEST:HashFail $result"
-    test_ok=0
-    nb_hash_fail=$((nb_hash_fail + 1))
-    test_exec_na=$((test_exec_na + 1))
-   fi
-  fi
-  rm -f $i > /dev/null
- done
-
- if [ "$result" = "" ] ; then
-  result="OK"
- fi
-
- if [ ! -f $TEST_ERR_FILE ] ; then
-  if [ $generate_hash = 1 ] ; then
-    log $L_DEB "Test $TEST_NAME $nb_subtests subtests and $nb_test_hash hashes"
-    nb_hashes=$((nb_test_hash + nb_test_hash))
-  	#only allow no hash if only one subtest or fuzzing
-    if [ $subtest_idx -gt 1 ] && [ $nb_hashes -lt $subtest_idx ] && [ $is_fuzz_test = 0 ]; then
-     log $L_ERR "Test $TEST_NAME has too few hash tests: $nb_hashes for $nb_subtests subtests - please fix"
-     result="NOT ENOUGH HASHES"
-    else
-		echo "ok" > $reference_hash_valid
-	fi
-#    if [ $nb_test_hash -gt 15 ] ; then
-#     log $L_WAR "Test $TEST_NAME has too many subtests with hashes ($nb_test_hash), not efficient for hash generation - consider rewriting $current_script"
-#	fi
-  fi
- fi
-
-
- echo " <test name=\"$TEST_NAME\" result=\"$result\" date=\"$(date '+%d/%m/%Y %H:%M:%S')\">" > $report
- cat $stat_xml_temp >> $report
- rm -f $stat_xml_temp > /dev/null
- echo " </test>" >> $report
-
- echo "TEST_FAIL=$test_fail" >> $test_stats
- echo "TEST_EXEC_NA=$test_exec_na" >> $test_stats
- echo "SUBTESTS_LEAK=$test_leak" >> $test_stats
- echo "NB_HASH_SUBTESTS=$nb_test_hash" >> $test_stats
- echo "NB_HASH_SUBTESTS_MISSING=$nb_hash_missing" >> $test_stats
- echo "NB_HASH_SUBTESTS_FAIL=$nb_hash_fail" >> $test_stats
-
- # list all logs files
- for i in $LOGS_DIR/$TEST_NAME-logs-*.txt; do
-  cat $i >> $LOGS
- done
- rm -f $LOGS_DIR/$TEST_NAME-logs-*.txt > /dev/null
-
- echo "NB_SUBTESTS=$nb_subtests" >> $test_stats
-
- if [ "$result" == "OK" ] ; then
-  mv $report "$LOGS_DIR/$TEST_NAME-passed-new.xml"
-
-  echo "$TEST_NAME: $result"
- else
-  mv $report "$LOGS_DIR/$TEST_NAME-failed.xml"
-  mark_test_error
-
-  log $L_ERR "$TEST_NAME: $result"
- fi
-
-shopt -u nullglob
-}
-
-do_fuzz()
-{
-  cmd="$2"
-  fuzz="@@"
-  fuzz_cmd=${cmd/$1/$fuzz}
-  file_ext="${1##*.}"
-  orig_path=`pwd`
-  tests_gen=0
-  log $L_DEB "Fuzzing file $1 with command line $fuzz_cmd"
-
-  fuzz_res_dir="$LOCAL_OUT_DIR/fuzzing/$TEST_NAME_$SUBTEST_NAME/$fuzz_sub_idx"
-  fuzz_temp_dir="$LOCAL_OUT_DIR/fuzzing/$TEST_NAME_$SUBTEST_NAME/$fuzz_sub_idx/temp"
-  mkdir -p "$fuzz_res_dir"
-  mkdir -p "$fuzz_temp_dir/in/"
-  mkdir -p "$fuzz_temp_dir/out/"
-
-  cp $1 "$fuzz_temp_dir/in/"
-  cd $fuzz_temp_dir
-
-  $GNU_TIMEOUT $fuzz_duration afl-fuzz -d -i "in/" -o "out/" $fuzz_cmd
-  if [ $? = 0 ] ; then
-   if [ $no_fuzz_cleanup = 0 ] ; then
-    #rename all crashes and hangs
-    cd out/crashes
-    ls | cat -n | while read n f; do mv "$f" "$fuzz_res_dir/crash_$n.$file_ext"; done
-    cd ../hangs
-    ls | cat -n | while read n f; do mv "$f" "$fuzz_res_dir/hang_$n.$file_ext"; done
-    cd ../..
-    rm -f "$fuzz_res_dir/readme.txt"
-   fi
-  fi
-
-  cd "$orig_path"
-
-  if [ $no_fuzz_cleanup = 0 ] ; then
-   rm -rf $fuzz_temp_dir
-
-   tests_gen=`ls $fuzz_res_dir | wc -w`
-   if [ $no_fuzz_cleanup != 0 ] ; then
-    tests_gen=1
-   fi
-
-   if [ $tests_gen = 0 ] ; then
-    rm -rf $fuzz_res_dir
-   else
-    echo "Generated with afl-fuzz -d $fuzz_cmd" > "$fuzz_res_dir/readme.txt"
-   fi
-  fi
-}
-
-#@do_test execute the command line given $1 using GNU time and store stats with return value, command line ($1) and subtest name ($2)
-ret=0
-do_test ()
-{
-  skip_next_hash_test=0
-
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@do_test takes only two arguments - wrong call (first arg $1)"
-  fi
-
- if [ $strict_mode = 1 ] ; then
-  if [ -f $TEST_ERR_FILE ] ; then
-   return
-  fi
- fi
-
- if [ $test_skip = 1 ] ; then
-  return
- fi
-
- if [ $MP4CLIENT_NOT_FOUND = 1 ] ; then
-	case $1 in MP4Client*)
-		return
-	esac
- fi
-
- log L_DEB "executing $1"
-
- subtest_idx=$((subtest_idx + 1))
-
- log_subtest="$LOGS_DIR/$TEST_NAME-logs-$subtest_idx-$2.txt"
- stat_subtest="$INTERN_TEMP_DIR/$TEST_NAME-stats-$subtest_idx-$2.sh"
- SUBTEST_NAME=$2
-
- if [ $fuzz_test = 1 ] ; then
-   is_fuzz_test=1
- fi
-
- if [ $enable_fuzzing = 0 ] ; then
-  fuzz_test=0
- fi
-
- #fuzzing on: check all args, detect ones matching input files in $maindir and fuzz them
- #note that this is not perfect since the command line may modify an existing MP4
- #so each successfull afl-fuzz test (not call!) will modify the input...
- if [ $fuzz_test != 0 ] ; then
-  fuzz_dir="$LOCAL_OUT_DIR/fuzzing/$TEST_NAME_$SUBTEST_NAME/"
-  mkdir -p fuzz_dir
-  fuzz_sub_idx=1
-  for word in $1 ; do
-   is_file_arg=0
-   case "$word" in
-     $main_dir/*)
-      is_file_arg=1;;
-   esac
-
-   if [ $is_file_arg != 0 ] ; then
-    fuzz_src=${word%:*}
-    if [ -f $fuzz_src ] ; then
-      do_fuzz "$fuzz_src" "$1"
-      fuzz_sub_idx=$((fuzz_sub_idx + 1))
-    fi
-   fi
-  done
-
-  if [ $no_fuzz_cleanup = 0 ] ; then
-   crashes=`ls $fuzz_dir | wc -w`
-   if [ $crashes = 0 ] ; then
-    rm -rf $fuzz_dir
-   fi
-  fi
-
-  #we still run the subtest in fuzz mode, since further subtests may use the output of this test
- fi
-
-echo "" > $log_subtest
-echo "*** Subtest \"$2\": executing \"$1\" ***" >> $log_subtest
-
-timeout_args=""
-if [ $enable_timeout != 0 ] ; then
-timeout_args="$GNU_TIMEOUT $test_timeout"
-fi
-
-$timeout_args $GNU_TIME -o $stat_subtest -f ' EXECUTION_STATUS="OK"\n RETURN_STATUS=%x\n MEM_TOTAL_AVG=%K\n MEM_RESIDENT_AVG=%t\n MEM_RESIDENT_MAX=%M\n CPU_PERCENT=%P\n CPU_ELAPSED_TIME=%E\n CPU_USER_TIME=%U\n CPU_KERNEL_TIME=%S\n PAGE_FAULTS=%F\n FILE_INPUTS=%I\n SOCKET_MSG_REC=%r\n SOCKET_MSG_SENT=%s' $1 >> $log_subtest 2>&1
-rv=$?
-
-echo "SUBTEST_NAME=$2" >> $stat_subtest
-echo "SUBTEST_IDX=$subtest_idx" >> $stat_subtest
-
-#regular error, check if this is a negative test.
-if [ $rv -eq 1 ] ; then
- if [ $single_test = 1 ] ; then
-  negative_test_stderr=$RULES_DIR/$TEST_NAME-stderr.txt
- else
-  negative_test_stderr=$RULES_DIR/$TEST_NAME-$2-stderr.txt
- fi
- if [ -f $negative_test_stderr ] ; then
-  #look for all lines in -stderr file, if one found consider this a success
-  while read line ; do
-   res_err=`grep -o "$line" $log_subtest`
-   if [ -n "$res_err" ]; then
-    echo "Negative test detected, reverting to success (found \"$res_err\" in stderr)" >> $log_subtest
-    rv=0
-    skip_next_hash_test=1
-    echo "" > $stat_subtest
-    break
-   fi
-  #remove windows style endlines as they may cause some problems
-  #also remove empty lines otherwise grep always matches
-  done < <(tr -d '\r' <$negative_test_stderr | sed '/^$/d' )
- fi
-fi
-
-#override generated stats if error, since gtime may put undesired lines in output file which would break sourcing
-if [ $rv != 0 ] ; then
-echo "SUBTEST_NAME=$2" > $stat_subtest
-echo "SUBTEST_IDX=$subtest_idx" >> $stat_subtest
-mark_test_error
-fi
-
-echo "RETURN_VALUE=$rv" >> $stat_subtest
-echo "COMMAND_LINE=\"$1\"" >> $stat_subtest
-
-echo "" >> $log_subtest
-ret=$rv
-}
-#end do_test
-
-#@do_playback_test: checks for user input record if any, then launch MP4Client with $1 with dump_dur and dump_size video sec AVI recording, then checks audio and video hash of the dump and convert the video to MP4 when generating the hash. The results are logged as with do_test
-
-do_playback_test ()
-{
-
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@do_playback_test takes only two arguments - wrong call (first arg is $1)"
-  fi
-
- if [ $strict_mode = 1 ] ; then
-  if [ -f $TEST_ERR_FILE ] ; then
-   return
-  fi
- fi
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- if [ $MP4CLIENT_NOT_FOUND = 1 ] ; then
-  return
- fi
-
-
- if [ $single_test = 1 ] ; then
-  FULL_SUBTEST="$TEST_NAME"
- else
-  FULL_SUBTEST="$TEST_NAME-$2"
- fi
- AVI_DUMP="$INTERN_TEMP_DIR/$FULL_SUBTEST-dump"
-
- args="$MP4CLIENT -avi 0-$dump_dur -out $AVI_DUMP -size $dump_size $1"
-
- ui_rec=$RULES_DIR/$FULL_SUBTEST-ui.xml
-
- if [ -f $ui_rec ] ; then
-  args="$args -opt Validator:Mode=Play -opt Validator:Trace=$ui_rec"
- else
-  args="$args -opt Validator:Mode=Disable"
- fi
- do_test "$args" $2
-
- #don't try hash if error
- if [ $ret != 0 ] ; then
-  if [ $keep_avi != 0 ] ; then
-    rm "$AVI_DUMP.avi" 2> /dev/null
-  fi
-  return
- fi
-
- if [ $skip_play_hash = 0 ] ; then
-  #since AVI dump in MP4Client is based on real-time grab of multithreaded audio and video render
-  #we may have interleaving differences in the resulting AVI :(
-  #we generate a hash for both audio and video since we don't have a fix yet
-  #furthermore this will allow figuring out if the error is in the video or the audio renderer
-  $MP4BOX -aviraw video "$AVI_DUMP.avi" -out "$AVI_DUMP.video" > /dev/null 2>&1
-  do_hash_test "$AVI_DUMP.video" "$2-avirawvideo"
-  rm "$AVI_DUMP.video" 2> /dev/null
-
-  $MP4BOX -aviraw audio "$AVI_DUMP.avi" -out "$AVI_DUMP.audio" > /dev/null 2>&1
-  do_hash_test "$AVI_DUMP.audio" "$2-avirawaudio"
-  rm "$AVI_DUMP.audio" 2> /dev/null
- fi
-
- if [ $do_store_video != 0 ] ; then
-  if [ $generate_hash != 0 ] ; then
-   ffmpeg_encode "$AVI_DUMP.avi" "$VIDEO_DIR_REF/$FULL_SUBTEST-ref.mp4"
-  else
-   ffmpeg_encode "$AVI_DUMP.avi" "$VIDEO_DIR/$FULL_SUBTEST-test.mp4"
-  fi
- fi
-
-if [ $keep_avi != 0 ] ; then
- if [ $generate_hash != 0 ] ; then
-   mv "$AVI_DUMP.avi" "$VIDEO_DIR_REF/$FULL_SUBTEST-raw-ref.avi"
-  else
-   mv "$AVI_DUMP.avi" "$VIDEO_DIR/$FULL_SUBTEST-raw-test.avi"
-  fi
-else
-  rm "$AVI_DUMP.avi" 2> /dev/null
-fi
-
-}
-#end do_playback_test
-
-#@do_hash_test: generates a hash for $1 file , compare it to HASH_DIR/$TEST_NAME$2.hash
-do_hash_test ()
-{
-  if [ $skip_next_hash_test = 1 ] ; then
-    skip_next_hash_test=0
-    return
-  fi
-
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@do_hash_test takes only two argument - wrong call (first arg is $1)"
-  fi
- if [ $strict_mode = 1 ] ; then
-  if [ -f $TEST_ERR_FILE ] ; then
-   return
-  fi
- fi
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
- log L_DEB "Generating hash for $1"
-
- if [ $disable_hash = 1 ] ; then
-  return
- fi
-
- STATHASH_SH="$INTERN_TEMP_DIR/$TEST_NAME-stathash-$2.sh"
-
- test_hash="$INTERN_TEMP_DIR/$TEST_NAME-$2-test.hash"
- ref_hash="$HASH_DIR/$TEST_NAME-$2.hash"
-
- echo "HASH_TEST=$2" > $STATHASH_SH
-
- #redefine log subtest var using the hash name in case the subtest was a subscript (do_test &)
- log_subt="$LOGS_DIR/$TEST_NAME-logs-$subtest_idx-$2.txt"
-
- echo "Computing $1  ($2) hash: " >> $log_subt
- file_to_hash="$1"
-
- # for text files, we remove potential CR chars
- # to prevent having different hashes on different platforms
- if [ -n "$(file -b $1 | grep text)" ] ||  [ ${1: -4} == ".lsr" ] ||  [ ${1: -4} == ".svg" ] ; then
-  file_to_hash="to_hash_$(basename $1)"
-  if [ -f $1 ]; then
-    tr -d '\r' <  "$1" > "$file_to_hash"
-  fi
- fi
-
- $MP4BOX -hash -std $file_to_hash > $test_hash 2>> $log_subt
-
- if [ "$file_to_hash" != "$1" ] && [ -f "$file_to_hash" ]; then
-  rm "$file_to_hash"
- fi
-
- if [ $generate_hash = 0 ] ; then
-  if [ ! -f $1 ] ; then
-   echo "SRC_NOT_FOUND=1" >> $STATHASH_SH
-   echo "HASH_FAIL=0" >> $STATHASH_SH
-   echo "not found $1"
-   return
-  fi
-
-  echo "SRC_NOT_FOUND=0" >> $STATHASH_SH
-  if [ ! -f $ref_hash ] ; then
-   echo "HASH_NOT_FOUND=1" >> $STATHASH_SH
-   return
-  fi
-
-  echo "HASH_NOT_FOUND=0" >> $STATHASH_SH
-
-  $DIFF $test_hash $ref_hash > /dev/null
-  rv=$?
-
-  if [ $rv != 0 ] ; then
-   hashres=0
-   fhash=`hexdump -ve '1/1 "%.2X"' $ref_hash`
-   echo "Hash fail, ref hash $ref_hash was $fhash"  >> $log_subt
-   shopt -s nullglob
-   for alt_ref in "$ref_hash-alt"* ; do
-    $DIFF $test_hash $alt_ref > /dev/null
-    rv_alt=$?
-    if [ $rv_alt != 0 ] ; then
-      fhash=`hexdump -ve '1/1 "%.2X"' $alt_ref`
-      echo "Hash alt fail, alt ref $alt_ref was $fhash"  >> $log_subt
-    else
-      hashres=1
-      echo "Hash alt OK with alt ref $alt_ref"  >> $log_subt
-      break
-    fi
-   done
-   shopt -u nullglob
-   if [ $hashres != 0 ] ; then
-    echo "Hash OK for $1"  >> $log_subt
-    echo "HASH_FAIL=0" >> $STATHASH_SH
-   else
-    echo "HASH_FAIL=1" >> $STATHASH_SH
-   fi
-  else
-   echo "Hash OK for $1"  >> $log_subt
-   echo "HASH_FAIL=0" >> $STATHASH_SH
-  fi
-  rm $test_hash
-
- else
-  mv $test_hash $ref_hash
- fi
-}
-#end do_hash_test
-
-#compare hashes of $1 and $2, return 0 if OK, error otherwise
-do_compare_file_hashes ()
-{
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@do_compare_file_hashes takes only two arguments - wrong call (first arg is $1)"
-  fi
-test_hash_first="$INTERN_TEMP_DIR/$TEST_NAME-$(basename $1).hash"
-test_hash_second="$INTERN_TEMP_DIR/$TEST_NAME-$(basename $2).hash"
-
-$MP4BOX -hash -std $1 > $test_hash_first 2> /dev/null
-$MP4BOX -hash -std $1 > $test_hash_second 2> /dev/null
-$DIFF $test_hash_first $test_hash_first > /dev/null
-
-rv=$?
-if [ $rv != 0 ] ; then
-echo "Hash fail between $1 and $2"  >> $log_subtest
-else
-echo "Same Hash for $1 and $2"  >> $log_subtest
-fi
-
-rm $test_hash_first
-rm $test_hash_second
-
-return $rv
-
-}
-#end do_compare_file_hashes
-
-
-#@ffmpeg_encode: encode source file $1 to $2 using default ffmpeg settings
-ffmpeg_encode ()
-{
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@ffmpeg_encode takes only two arguments - wrong call (first arg is $1)"
-  fi
- #run ffmpeg in force overwrite mode
- $FFMPEG -y -i $1 -pix_fmt yuv420p -strict -2 $2 2> /dev/null
-}
-#end
-
-#@single_test: performs a single test without hash with $1 command line and $2 test name
-single_test ()
-{
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@single_test takes only two arguments - wrong call (first arg is $1)"
-  fi
-test_begin "$2"
-if [ $test_skip  = 1 ] ; then
-return
-fi
-single_test=1
-do_test $1 "single"
-test_end
-}
-
-#@single_playback_test: performs a single playback test with hashes with $1 command line and $2 test name
-single_playback_test ()
-{
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@single_playback_test takes only two arguments - wrong call (first arg is $1)"
-  fi
-test_begin "$2"
-if [ $test_skip  = 1 ] ; then
-return
-fi
-single_test=1
-do_playback_test "$1" "play"
-test_end
-}
-
-
-#@test_ui_test: if $test_ui is 1 records user input on $1 playback (10 sec) and stores in $RULES_DIR/$1-ui.xml. If $test_ui is 2, plays back the recorded stream
-do_ui_test()
-{
-  if [ $# -gt 2 ] ; then
-   log $L_ERR "> in test $TEST_NAME in script $current_script line $BASH_LINENO"
-   log $L_ERR "	@test_ui_test takes one or two arguments - wrong call (first arg is $1)"
-  fi
-
- if [ $test_ui = 0 ] ; then
-  return
- fi
-
- if [ "$single_test_name" != "" ] && [ "$single_test_name" != "$TEST_NAME" ] ; then
-   log $L_DEB "skiping ui test $TEST_NAME"
-   return
- fi
-
- src=$1
- if [ $# -gt 1 ] ; then
-  FULL_SUBTEST="$TEST_NAME-$2"
- else
-  FULL_SUBTEST="$TEST_NAME"
- fi
-
- SUBTEST=$2
- ui_stream=$RULES_DIR/$FULL_SUBTEST-ui.xml
-
- if [ $test_ui = 1 ] ; then
-  if [ -f $ui_stream ]; then
-   log $L_DEB "User input trace present for $FULL_SUBTEST - skipping"
-   return
-  fi
-  echo "Recording user input for $FULL_SUBTEST"
-  echo "Recording user input for $FULL_SUBTEST (file $src) into trace $ui_stream" >> $ALL_LOGS
-  $MP4CLIENT -run-for $dump_dur -size $dump_size $src -no-save -opt Validator:Mode=Record -opt Validator:Trace=$ui_stream 2>> $ALL_LOGS
-  rv=$?
- else
-  if [ ! -f $ui_stream ]; then
-   log $L_WAR "User input trace not found for $FULL_SUBTEST - skipping playback"
-   return
-  fi
-  echo "Playing user input for $FULL_SUBTEST"
-  echo "Playing user input for $FULL_SUBTEST (file $src) from trace $ui_stream" >> $ALL_LOGS
-  dur=$(($dump_dur / $speed))
-  $MP4CLIENT -run-for $dur -size $dump_size $src -speed $speed -no-save -opt Validator:Mode=Play -opt Validator:Trace=$ui_stream 2>> $ALL_LOGS
-  rv=$?
- fi
- #regular error, check if this is a negative test.
- if [ $rv != 0 ] ; then
-  log $L_ERR "Error executing UI test for $FULL_SUBTEST (source file $src - test name $TEST_NAME)"
-#  if [ $strict_mode = 1 ] ; then
-#   exit
-#  fi
- fi
-}
-#end test_ui_test
-
-
-#start of our tests
-start=`$GNU_DATE +%s%N`
-start_date="$(date '+%d/%m/%Y %H:%M:%S')"
-
-if [ $generate_hash = 1 ] ; then
- log $L_INF "Generating Test Suite SHA-1 Hashes"
-elif [ $do_clean = 1 ] ; then
- log $L_INF "Cleaning Test Suite"
-elif [ $check_only = 1 ] ; then
- log $L_INF "Checking Test Suite Names"
-elif [ $global_test_ui = 1 ] ; then
- log $L_INF "Generating User Input traces"
-elif [ $global_test_ui = 2 ] ; then
- log $L_INF "Playing User Input traces"
-else
- log $L_INF "Evaluating Test Suite"
-fi
-
-print_end()
-{
-end=`$GNU_DATE +%s%N`
-runtime=$((end-start))
-
-ms=$(($runtime / 1000000))
-secs=$(($ms / 1000))
-ms=$(($ms - $secs*1000))
-h=$(($secs / 3600))
-secs=$(($secs - $h*3600))
-m=$(($secs / 60))
-secs=$(($secs - $m*60))
-
-printf "$1 in %02d:%02d:%02d:%03d\n" $h $m $secs $ms
-}
-
-#gather all tests reports and build our final report
-finalize_make_test()
-{
-
-#we are cleaning, nothing to do
-if [ $do_clean != 0 ] ; then
- print_end "Cleanup done"
- return
-fi
-
-#ui tests nothing to do
-if [ $global_test_ui != 0 ] ; then
- print_end "UI Tests done"
- return
-fi
-
-#create logs and final report
-echo "Logs for GPAC test suite - execution date $start_date" > $ALL_LOGS
-
-echo '<?xml version="1.0" encoding="UTF-8"?>' > $ALL_REPORTS
-echo '<?xml-stylesheet href="stylesheet.xsl" type="text/xsl"?>' >> $ALL_REPORTS
-echo "<GPACTestSuite version=\"$VERSION\" platform=\"$platform\" start_date=\"$start_date\" end_date=\"$(date '+%d/%m/%Y %H:%M:%S')\">" >> $ALL_REPORTS
-
-
-if [ $keep_temp_dir != 1 ] ; then
-   rm -rf $TEMP_DIR/* 2> /dev/null
-fi
-
-#count all tests using generated -stats.sh
-TESTS_SKIP=0
-TESTS_TOTAL=0
-TESTS_DONE=0
-TESTS_PASSED=0
-TESTS_FAILED=0
-TESTS_LEAK=0
-TESTS_EXEC_NA=0
-
-SUBTESTS_FAIL=0
-SUBTESTS_EXEC_NA=0
-SUBTESTS_DONE=0
-SUBTESTS_LEAK=0
-SUBTESTS_HASH=0
-SUBTESTS_HASH_FAIL=0
-SUBTESTS_HASH_MISSING=0
-
-for i in $LOGS_DIR/*-stats.sh ; do
-if [ -f $i ] ; then
-
-#reset stats
-TEST_SKIP=0
-TEST_EXEC_NA=0
-SUBTESTS_LEAK=0
-NB_HASH_SUBTESTS=0
-NB_HASH_SUBTESTS_MISSING=0
-NB_HASH_SUBTESTS_FAIL=0
-NB_SUBTESTS=0
-
-#load stats
-source $i
-
-#test not run due to error in strict mode
-if [ $TEST_SKIP = 2 ] ; then
-rm -f $i > /dev/null
-continue;
-fi
-
-TESTS_TOTAL=$((TESTS_TOTAL + 1))
-if [ $TEST_SKIP = 0 ] ; then
- TESTS_DONE=$((TESTS_DONE + 1))
-else
- TESTS_SKIP=$((TESTS_SKIP + $TEST_SKIP))
-fi
-
-if [ $TEST_FAIL = 0 ] ; then
-  if [ $TEST_EXEC_NA = 0 ] && [ $SUBTESTS_LEAK = 0 ]; then
-    TESTS_PASSED=$((TESTS_PASSED + 1))
-  else
-    rm -f $i > /dev/null
-    if [ $TEST_EXEC_NA != 0 ] ; then
-      TESTS_EXEC_NA=$((TESTS_EXEC_NA + 1))
-    else
-      TESTS_LEAK=$((TESTS_LEAK + 1))
-    fi
-  fi
-else
-  TESTS_FAILED=$((TESTS_FAILED + 1))
-  rm -f $i > /dev/null
-fi
-
-
-SUBTESTS_FAIL=$((SUBTESTS_FAIL + $TEST_FAIL))
-SUBTESTS_EXEC_NA=$((SUBTESTS_EXEC_NA + $TEST_EXEC_NA))
-SUBTESTS_DONE=$((SUBTESTS_DONE + $NB_SUBTESTS))
-SUBTESTS_LEAK=$((SUBTESTS_LEAK + $SUBTESTS_LEAK))
-SUBTESTS_HASH=$((SUBTESTS_HASH + $NB_HASH_SUBTESTS))
-SUBTESTS_HASH_FAIL=$((SUBTESTS_HASH_FAIL + $NB_HASH_SUBTESTS_FAIL))
-SUBTESTS_HASH_MISSING=$((SUBTESTS_HASH_MISSING + $NB_HASH_SUBTESTS_MISSING))
-
-fi
-
-done
-
-echo "<TestSuiteResults NumTests=\"$TESTS_TOTAL\" NumSubtests=\"$SUBTESTS_DONE\" TestsPassed=\"$TESTS_PASSED\" TestsFailed=\"$TESTS_FAILED\" TestsLeaked=\"$TESTS_LEAK\" TestsUnknown=\"$TESTS_EXEC_NA\" HashFailed=\"$SUBTESTS_HASH_FAIL\" HashMissing=\"$SUBTESTS_HASH_MISSING\" />" >> $ALL_REPORTS
-
-#gather all failed reports first
-for i in $LOGS_DIR/*-failed.xml; do
- if [ -f $i ] ; then
-  cat $i >> $ALL_REPORTS
-  echo "" >> $ALL_REPORTS
-  rm $i
- fi
-done
-
-#gather all new reports
-for i in $LOGS_DIR/*-passed-new.xml; do
- if [ -f $i ] ; then
-  cat $i >> $ALL_REPORTS
-  echo "" >> $ALL_REPORTS
-  #move new report to final name
-  n=${i%"-new.xml"}
-  n="$n.xml"
-  mv "$i" "$n"
- fi
-done
-
-echo '</GPACTestSuite>' >> $ALL_REPORTS
-
-#cat all logs
-for i in $LOGS_DIR/*-logs.txt-new; do
- if [ -f $i ] ; then
-  cat $i >> $ALL_LOGS
-  echo "" >> $ALL_LOGS
-  #move new report to final name
-  n=${i%".txt-new"}
-  n="$n.txt"
-  mv "$i" "$n"
- fi
-done
-
-if [ $TESTS_TOTAL = 0 ] ; then
-log $L_INF "No tests executed"
-else
-
-
-pc1=$((100*TESTS_DONE/TESTS_TOTAL))
-pc2=$((100*TESTS_SKIP/TESTS_TOTAL))
-log $L_INF "Number of Tests $TESTS_TOTAL - $SUBTESTS_DONE subtests - Executed: $TESTS_DONE ($pc1 %) - Cached: $TESTS_SKIP ($pc2 %)"
-
-
-if [ $TESTS_DONE = 0 ] ; then
- TESTS_DONE=$TESTS_TOTAL
-fi
-if [ $SUBTESTS_DONE = 0 ] ; then
- SUBTESTS_DONE=$TESTS_TOTAL
-fi
-
- pc=$((100*TESTS_PASSED/TESTS_TOTAL))
- log $L_INF "Tests passed $TESTS_PASSED ($pc %) - $SUBTESTS_DONE sub-tests"
-
- # the follwing % are in subtests
- if [ $SUBTESTS_FAIL != 0 ] ; then
-  pc=$((100*SUBTESTS_FAIL/SUBTESTS_DONE))
-  log $L_ERR "Tests failed $TESTS_FAILED ($pc % of subtests)"
- fi
-
- if [ $SUBTESTS_LEAK != 0 ] ; then
-  pc=$((100*SUBTESTS_LEAK/SUBTESTS_DONE))
-  log $L_WAR "Tests Leaked $TESTS_LEAK ($pc % of subtests)"
- fi
-
- if [ $SUBTESTS_EXEC_NA != 0 ] ; then
-  pc=$((100*SUBTESTS_EXEC_NA/SUBTESTS_DONE))
-  log $L_WAR "Tests Unknown $TESTS_EXEC_NA ($pc % of subtests)"
- fi
-
- if [ $SUBTESTS_HASH_FAIL != 0 ] ; then
-  pc=$((100*SUBTESTS_HASH_FAIL/SUBTESTS_DONE))
-  log $L_WAR "Tests HASH total $SUBTESTS_HASH - fail $SUBTESTS_HASH_FAIL ($pc % of subtests)"
- fi
-
- if [ $SUBTESTS_HASH_MISSING != 0 ] ; then
-  pc=$((100*SUBTESTS_HASH_MISSING/$SUBTESTS_HASH))
-  log $L_WAR "Missing hashes $SUBTESTS_HASH_MISSING / $SUBTESTS_HASH ($pc % hashed subtests)"
- fi
-
-
-fi
-
-print_end "Generation done"
-
-} #end finalize_make_test
-
-
-
-# trap ctrl-c and generate reports
-trap ctrl_c_trap INT
-
-ctrl_c_trap() {
-	echo "CTRL-C trapped - cleanup and building up reports"
-	local pids=$(jobs -pr)
-	[ -n "$pids" ] && kill $pids
-	finalize_make_test
-	exit
-}
-
-# disable nullglobing in case sub-scripts aren't made for it
-shopt -u nullglob
-
-
-# by default run everything in scripts/ dir
-scripts_torun="$SCRIPTS_DIR/*.sh"
-
-# if a subset of tests was provided, run only these
-if [ "${#url_arg[@]}" -gt 0 ] ; then
-  scripts_torun="${url_arg[@]}"
-fi
-
-#run our tests
-for i in $scripts_torun ; do
-if [ $verbose = 1 ] ; then
- log $L_DEB "Source script: $i"
-fi
-current_script=$i
-source $i
-cd $main_dir
-#break if error and error
-if [ $strict_mode = 1 ] ; then
- #wait for all tests to be done before checking error marker
- wait
- if [ -f $TEST_ERR_FILE ] ; then
-  break
- fi
-fi
-
-#cleanup temp dir
-if [ $keep_temp_dir != 1 ] ; then
-   rm -rf $TEMP_DIR/* 2> /dev/null
-fi
-
-done
-
-
-#wait for all tests to be done, since some tests may use subshells
-wait
-
-if [ $check_only != 0 ] ; then
- rm -rf $TEMP_DIR/* 2> /dev/null
- exit
-fi
-
-
-finalize_make_test
-
-
-
-

gpac-0.8.0.tar.gz/tests/media Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_arabic.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_english.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_french.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_german.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_italian.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_spanish.mp3 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_video.cmp Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/count_video.mp4 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/counter.hvc Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/enst_audio.aac Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/enst_video.h264 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/enstvid.ivf Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/index2batch.xslt Deleted

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    version = "2.0"
-    xmlns:xsl = "http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs = "http://www.w3.org/2001/XMLSchema"
-    xmlns:fn = "http://www.w3.org/2005/xpath-functions"
-    xmlns:xdt = "http://www.w3.org/2005/xpath-datatypes"
-    xmlns:xmt = "urn:mpeg:mpeg4:xmta:schema:2002">
-    <xsl:output
-        method = "text"
-        version = "1.0"
-        encoding = "UTF-8"
-        indent = "yes"/>
-    <xsl:param name = "xalan_path"/>
-    <xsl:param name = "xslt_path"/>
-    <xsl:template match = "/">
-@ECHO OFF
-SET XALAN="<xsl:value-of select = "$xalan_path"/>"
-        <xsl:apply-templates select = "//file"/>
-    </xsl:template>
-    <xsl:template match = "file">
-        <xsl:if test = "@type='svg'">
-IF NOT EXIST <xsl:value-of select = "@name"/>.mp4 MP4Box -mp4 <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-            <xsl:if test = "snapshot">
-C:\Users\Cyril\sourceforge\gpac\bin\w32_deb\mp4client -bmp <xsl:for-each select = "snapshot"><xsl:value-of select = "@time"/>-</xsl:for-each> <xsl:text> </xsl:text> <xsl:value-of select = "@name"/>.mp4 -2d
-            </xsl:if>
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-@echo Creating HTML for <xsl:value-of select = "@name"/>
-IF NOT EXIST <xsl:value-of select = "@name"/>.html java -jar %XALAN% -IN <xsl:value-of select = "@name"/>.svg -OUT <xsl:value-of select = "@name"/>.html -XSL <xsl:value-of select = "$xslt_path"/>/svg2html.xslt -PARAM filename <xsl:value-of select = "@name"/> <xsl:if test = "following::file[1]"> -PARAM next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test = "preceding::file[1]"> -PARAM previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if><xsl:for-each select = "snapshot"> -PARAM snapshot<xsl:value-of select = "position()"/><xsl:text> </xsl:text><xsl:value-of select = "@time"/></xsl:for-each>
-@echo done.
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test = "@type='bt'">
-IF NOT EXIST <xsl:value-of select = "@name"/>.mp4 MP4Box -mp4 <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-IF NOT EXIST <xsl:value-of select = "@name"/>.xmt MP4Box -xmt <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-            <xsl:if test = "snapshot">
-C:\Users\Cyril\sourceforge\gpac\bin\w32_deb\mp4client -bmp <xsl:for-each select = "snapshot"><xsl:value-of select = "@time"/>-</xsl:for-each><xsl:text> </xsl:text><xsl:value-of select = "@name"/>.mp4<xsl:choose><xsl:when test = "@use3d = 'true'"> -3d</xsl:when><xsl:otherwise> -2d</xsl:otherwise></xsl:choose>
-            </xsl:if>
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-@echo Creating HTML for <xsl:value-of select = "@name"/>
-IF NOT EXIST <xsl:value-of select = "@name"/>.html java -jar %XALAN% -IN <xsl:value-of select = "@name"/>.xmt -OUT <xsl:value-of select = "@name"/>.html -XSL <xsl:value-of select = "$xslt_path"/>/xmt2html.xslt -PARAM filename <xsl:value-of select = "@name"/><xsl:if test = "@use3d = 'true'"> -PARAM use3d true</xsl:if><xsl:if test = "following::file[1]"> -PARAM next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test = "preceding::file[1]"> -PARAM previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if><xsl:for-each select = "snapshot"> -PARAM snapshot<xsl:value-of select = "position()"/><xsl:text> </xsl:text><xsl:value-of select = "@time"/></xsl:for-each>
-@echo done.
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test = "@type='x3dv'">
-IF NOT EXIST <xsl:value-of select = "@name"/>.x3d MP4Box -x3d <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-@echo Creating HTML for <xsl:value-of select = "@name"/>
-IF NOT EXIST <xsl:value-of select = "@name"/>.html java -jar %XALAN% -IN <xsl:value-of select = "@name"/>.x3d -OUT <xsl:value-of select = "@name"/>.html -XSL <xsl:value-of select = "$xslt_path"/>/x3d2html.xslt -PARAM filename <xsl:value-of select = "@name"/><xsl:if test = "@use3d = 'true'"> -PARAM use3d true</xsl:if><xsl:if test = "following::file[1]"> -PARAM next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test = "preceding::file[1]"> -PARAM previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if>
-@echo done.
-            </xsl:if>
-        </xsl:if>
-    </xsl:template>
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/index2html.xslt Deleted

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:xdt="http://www.w3.org/2005/xpath-datatypes">
-	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
-	
-		<xsl:template match="/">
-			<html>
-				<head>
-					<META http-equiv="Content-Type" content="text/html;" charset="UTF-8"/>
-					<title>GPAC Non-regression Test Suite Navigator</title>
-					<link href="index.css" type="text/css" rel="stylesheet"/>
-				</head>
-				<body>
-
-<p>The suite contains tests for:</p>
-<ul>
-<li>all BIFS nodes supported by the GPAC renderer</li>
-<li>all BIFS commands, extended BIFS commands and OD Commands</li>
-<li>Stream Management (MediaControl, MediaSegments and segmentDescriptor usage)</li>
-<li>Most BIFS Advanced Text and Graphics nodes</li>
-</ul>
-
-<p>Test sequences are provided in the BT format, and need MP4Box to be encoded or translated to XMT-A. 
-<br/>The GPAC Regression Tests are part of the <a href="../home_download.php">GPAC source code</a> and are also available on <a href="http://gpac.cvs.sourceforge.net/gpac/gpac/regression_tests">GPAC CVS</a>.</p>
-
-					<div id="content">
-						<xsl:apply-templates/>
-					</div>
-				</body>
-			</html>
-		</xsl:template>
-		
-		<xsl:template match="format">
-		    <h2><xsl:value-of select="@name"/></h2>
-		    <div id="format">
-    			<ul>			
-    				<xsl:apply-templates select="category"/>
-    			</ul>
-		    </div>
-		</xsl:template>
-
-		<xsl:template match="category">
-		    <h3><xsl:value-of select="@name"/></h3>
-		    <div id="category">
-    			<ul>			
-    				<xsl:apply-templates select="file"/>
-    			</ul>
-		    </div>
-		</xsl:template>
-
-		<xsl:template match="file">
-            <xsl:if test="not(@generate-html)or @generate-html != 'false'">
-    			<li><a href="{@name}.html">
-    			<xsl:choose>
-    			    <xsl:when test="@title"><xsl:value-of select="@title"/></xsl:when>
-    			    <xsl:otherwise><xsl:value-of select="@name"/></xsl:otherwise>
-    			</xsl:choose>
-    			</a></li>
-    		</xsl:if>
-		</xsl:template>
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/index2sh.xslt Deleted

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    version = "1.0"
-    xmlns:xsl = "http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs = "http://www.w3.org/2001/XMLSchema"
-    xmlns:fn = "http://www.w3.org/2005/xpath-functions"
-    xmlns:xdt = "http://www.w3.org/2005/xpath-datatypes"
-    xmlns:xmt = "urn:mpeg:mpeg4:xmta:schema:2002">
-    <xsl:output
-        method = "text"
-        version = "1.0"
-        encoding = "UTF-8"
-        indent = "yes"/>
-
-    <xsl:param name = "xslt_path"/>
-
-    <xsl:template match = "/">
-#!/bin/sh
-#xslt path: <xsl:value-of select = "$xslt_path"/>
-
-        <xsl:apply-templates select = "//file"/>
-    </xsl:template>
-
-    <xsl:template match = "file">
-        <xsl:if test = "@type='svg'">
-if [ ! -e <xsl:value-of select = "@name"/>.mp4 ]; then MP4Box -mp4 <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-fi
-            <xsl:if test = "snapshot">
-MP4Client -bmp <xsl:for-each select = "snapshot"><xsl:value-of select = "@time"/>-</xsl:for-each> <xsl:text> </xsl:text> <xsl:value-of select = "@name"/>.mp4 -2d
-            </xsl:if>
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-echo "Creating HTML for <xsl:value-of select = "@name"/>"
-if [ ! -e <xsl:value-of select = "@name"/>.html ]; then 
-xsltproc -o <xsl:value-of select = "@name"/>.html --stringparam filename <xsl:value-of select = "@name"/> <xsl:if test = "following::file[1]"> --stringparam next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test= "preceding::file[1]"> --stringparam previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if><xsl:for-each select = "snapshot"> --stringparam snapshot<xsl:value-of select = "position()"/><xsl:text> </xsl:text><xsl:value-of select = "@time"/></xsl:for-each> <xsl:value-of select = "$xslt_path"/>/svg2html.xslt <xsl:value-of select = "@name"/>.svg
-fi
-#echo "done."
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test = "@type='bt'">
-if [ ! -e <xsl:value-of select = "@name"/>.mp4 ]; then
-MP4Box -mp4 <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-fi
-if [ ! -e <xsl:value-of select = "@name"/>.xmt ]; then
-MP4Box -xmt <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-fi
-            <xsl:if test = "snapshot">
-MP4Client -bmp <xsl:for-each select = "snapshot"><xsl:value-of select = "@time"/>-</xsl:for-each><xsl:text> </xsl:text><xsl:value-of select = "@name"/>.mp4<xsl:choose><xsl:when test = "@use3d = 'true'"> -3d</xsl:when><xsl:otherwise> -2d</xsl:otherwise></xsl:choose>
-            </xsl:if>
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-echo "Creating HTML for <xsl:value-of select = "@name"/>"
-if [ ! -e <xsl:value-of select = "@name"/>.html ]; then 
-xsltproc --stringparam filename <xsl:value-of select = "@name"/><xsl:if test = "@use3d = 'true'"> --stringparam use3d true</xsl:if><xsl:if test = "following::file[1]"> --stringparam next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test = "preceding::file[1]"> --stringparam previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if><xsl:for-each select = "snapshot"> --stringparam snapshot<xsl:value-of select = "position()"/><xsl:text> </xsl:text><xsl:value-of select = "@time"/></xsl:for-each> -o <xsl:value-of select = "@name"/>.html <xsl:value-of select = "$xslt_path"/>/xmt2html.xslt <xsl:value-of select = "@name"/>.xmt
-fi
-#echo "done."
-            </xsl:if>
-        </xsl:if>
-        <xsl:if test = "@type='x3dv'">
-if [ ! -e <xsl:value-of select = "@name"/>.x3d ]; then
-MP4Box -x3d <xsl:value-of select = "@name"/>.<xsl:value-of select = "@type"/>
-fi
-            <xsl:if test = "not(@generate-html) or @generate-html != 'false'">
-echo "Creating HTML for <xsl:value-of select = "@name"/>"
-if [ ! -e <xsl:value-of select = "@name"/>.html ]; then
-xsltproc --stringparam filename <xsl:value-of select = "@name"/><xsl:if test = "@use3d = 'true'"> --stringparam use3d true</xsl:if><xsl:if test = "following::file[1]"> --stringparam next <xsl:value-of select = "following::file[1]/@name"/></xsl:if><xsl:if test = "preceding::file[1]"> --stringparam previous <xsl:value-of select = "preceding::file[1]/@name"/></xsl:if> -o <xsl:value-of select = "@name"/>.html <xsl:value-of select = "$xslt_path"/>/x3d2html.xslt <xsl:value-of select = "@name"/>.x3d
-#echo "done."
-fi
-            </xsl:if>
-        </xsl:if>
-    </xsl:template>
-</xsl:stylesheet>
-

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/logo.bt Deleted

@@ -1,126 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 2038
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 4
-     isCommandStream true
-     pixelMetric true
-    }
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-#  Background2D { backColor 1 1 1 }
-  DEF N0 Viewport {
-   size 140 140
-   fit 1
-  }
-
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 1 -2
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         lineProps XLineProperties {
-          lineColor 0.2 0.2 0.2
-          width 20
-         }
-        }
-       }
-       geometry Circle {
-        radius 100
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -30
-     children [
-      Shape {
-       appearance DEF N3 Appearance {
-        texture RadialGradient {
-         focalPoint 0.45 0.8
-         key [0 1]
-         keyValue [0.5 0.5 0.5 0 0 0]
-        }
-        material Material2D {
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 60
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 90
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         filled true
-        }
-        texture RadialGradient {
-         focalPoint 0.45 0.2
-         key [0 1]
-         keyValue [0.2 0.2 0.2 0 0 0]
-        }
-       }
-       geometry IndexedFaceSet2D {
-        colorPerVertex false
-        coord Coordinate2D {
-         point [-40 5 40 5 0 -60]
-        }
-       }
-      }
-     ]
-    }
-    Shape {
-     appearance Appearance {
-      material DEF N4 Material2D {
-       lineProps DEF N5 XLineProperties {
-        lineColor 1 0 0
-        width 20
-        texture RadialGradient {
-         focalPoint 0.5 0.5
-         key [0 0.8 0.9 1]
-         keyValue [0 0 0 0.5 0 0 1 0 0 0.5 0 0]
-        }
-       }
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/logo.jpg Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/nefertiti.wrl Deleted

@@ -1,649 +0,0 @@
-#VRML V2.0 utf8
-
-# Produced by 3D Studio MAX VRML 2.0 exporter, Version 2, Beta 0
-# MAX File: nefertiti.max, Date: Tue Sep 29 17:32:41 1998
-
-Viewpoint { position 0 -1 10 }
-
-DEF _____01-ROOT Transform {
-  translation -0.1337 -2.107 -1.839
-  children [
-    Shape {
-      appearance Appearance {
-        material Material {
-          diffuseColor 0.9804 0.9804 0.9804
-        }
-      }
-      geometry DEF FACES IndexedFaceSet {
-        ccw TRUE
-        solid FALSE
-        creaseAngle 2
-        coord DEF _____01-COORD Coordinate { point [
-          -2.116 1.757 -1.271, -2.036 1.587 -1.231, -2.136 1.607 -1.391, 
-          -2.206 1.837 -1.361, -2.216 1.867 -1.161, -2.116 1.697 -1.111, 
-          -2.066 1.457 -1.131, -1.946 1.607 -0.9606, -1.966 1.387 -1.011, 
-          -2.076 1.337 -1.251, -2.096 1.397 -1.301, -2.396 1.687 -1.561, 
-          -2.306 1.477 -1.521, -2.466 1.527 -1.711, -2.446 1.737 -1.651, 
-          -2.396 1.877 -1.491, -2.326 1.217 -1.511, -2.186 1.437 -1.431, 
-          -2.086 1.257 -1.391, -2.096 1.127 -1.411, -2.196 0.9375 -1.391, 
-          -2.386 1.017 -1.521, -2.486 1.217 -1.691, -2.056 0.9875 -1.251, 
-          -1.976 1.267 -1.141, -1.876 1.167 -1.121, -1.996 0.8775 -1.001, 
-          -2.116 0.8775 -1.201, -1.946 1.267 -1.001, -1.916 1.297 -0.9206, 
-          -1.966 1.197 -0.9206, -1.886 1.127 -0.9906, -1.946 1.287 -1.081, 
-          -1.986 1.017 -0.8106, -1.926 1.127 -0.7606, -1.896 0.9375 -0.6006, 
-          -1.976 0.7975 -0.6606, -1.926 0.9575 -0.9206, -2.136 0.7675 -0.8906, 
-          -1.996 0.5875 -0.6606, -2.136 0.5575 -0.9806, -2.226 0.7575 -1.111, 
-          -1.906 0.3475 -0.6006, -1.856 0.5175 -0.5106, -1.746 0.2775 -0.5806, 
-          -1.906 0.2275 -0.7406, -2.036 0.3375 -0.9706, -2.046 0.4775 -0.7806, 
-          -1.866 0.7975 -0.5406, -2.296 0.8575 -1.351, -2.196 0.6175 -1.211, 
-          -2.236 0.6575 -1.421, -2.346 0.8575 -1.581, -2.386 0.9575 -1.541, 
-          -2.116 0.4775 -1.171, -1.776 0.2875 -0.9306, -1.846 0.4775 -1.181, 
-          -1.566 0.2275 -0.7506, -1.566 0.4375 -0.9906, -1.636 0.7175 -1.341, 
-          -1.986 0.7375 -1.431, -1.756 1.027 -1.601, -2.136 1.097 -1.701, 
-          -2.276 1.537 -1.751, -2.536 1.687 -1.771, -2.466 1.217 -1.751, 
-          -1.966 1.377 -1.751, -2.076 1.717 -1.721, -2.316 1.877 -1.631, 
-          -2.546 1.537 -1.741, -2.546 1.747 -1.671, -2.556 1.937 -1.611, 
-          -2.536 1.897 -1.581, -2.206 1.947 -1.611, -2.326 2.037 -1.421, 
-          -2.316 2.027 -1.231, -2.176 2.067 -1.291, -2.356 1.927 -1.331, 
-          -2.186 1.907 -1.061, -1.976 1.957 -1.001, -2.106 1.857 -1.041, 
-          -1.866 0.9475 -0.3906, -1.936 1.367 -0.2506, -1.946 1.297 -0.0005862, 
-          -1.886 0.8775 0.4194, -1.806 0.4475 0.2294, -1.786 0.1875 0.1694, 
-          -1.806 0.3175 -0.2706, -1.366 0.3575 -2.181, -1.406 0.05749 -1.281, 
-          -1.556 -0.1525 -0.7106, -1.516 -0.6325 -1.151, -1.146 -0.6925 -1.741, 
-          -1.086 -0.2125 -1.911, -1.786 -0.1825 0.03941, -1.766 -0.1525 -0.3606, 
-          -1.706 -0.09251 0.3694, -1.706 -0.3625 0.2894, -1.616 -1.023 -0.1406, 
-          -1.646 -0.8525 -0.4206, -1.576 -0.8825 -0.6006, -1.556 -1.053 -0.4206, 
-          -1.346 -1.333 -0.3906, -1.486 -1.393 -0.9606, -0.7163 -0.6425 -2.381, 
-          -1.036 -1.113 -2.021, -0.7363 -1.093 -2.401, -0.0763 -0.5625 -2.381, 
-          -0.5963 -0.5225 -2.471, -0.5563 -0.4825 -2.571, -1.056 -0.03251 -2.361, 
-          -0.0963 -1.093 -2.371, -0.1063 -1.473 -2.511, -0.7963 -1.483 -2.531, 
-          -1.366 -1.963 -1.861, -1.386 -2.313 -2.071, -0.9363 -1.943 -2.681, 
-          -0.7963 -1.913 -2.791, -0.8963 -3.243 -3.621, -1.706 -3.973 -3.811, 
-          -0.9963 -4.103 -4.111, -0.2363 -4.093 -4.191, -0.2063 -3.353 -3.741, 
-          -0.1663 -2.603 -3.231, -0.8963 -2.513 -3.141, -1.126 -2.563 -3.001, 
-          -1.386 -3.223 -3.371, -0.1363 -2.063 -2.891, -1.826 -3.313 -2.851, 
-          -2.236 -3.693 -2.581, -2.136 -3.713 -3.151, -1.536 -2.833 -2.451, 
-          -1.946 -3.423 -2.331, -1.926 -3.633 -2.031, -1.956 -4.303 -1.764, 
-          -2.226 -3.873 -2.171, -1.676 -3.073 -2.071, -1.666 -3.253 -1.851, 
-          -1.696 -4.023 -1.671, -1.426 -4.363 -1.411, -1.276 -5.023 -1.261, 
-          -1.666 -4.683 -1.501, -1.486 -3.683 -1.491, -1.246 -4.053 -1.211, 
-          -1.216 -4.623 -1.281, -1.376 -3.073 -1.221, -1.476 -2.773 -1.491, 
-          -1.406 -2.483 -1.201, -1.166 -2.893 -0.7706, -1.046 -3.473 -0.8406, 
-          -1.526 -2.563 -1.731, -1.446 -2.233 -1.511, -0.8263 -5.193 -1.071, 
-          -0.9163 -4.373 -1.001, -0.6763 -4.483 -1.001, -0.5263 -5.313 -1.121, 
-          -0.3563 -5.333 -1.131, -0.3663 -4.643 -1.021, -0.1763 -4.753 -1.051, 
-          -0.1963 -5.383 -1.131, -0.4363 -3.893 -0.7006, -0.8863 -3.613 -0.7806, 
-          -0.4763 -3.393 -0.5006, -0.1263 -3.533 -0.5006, -0.1463 -4.033 -0.7306, 
-          -1.456 -1.853 -1.241, -1.386 -1.483 -1.611, -1.486 -1.443 -1.231, 
-          -1.316 -2.193 -0.8206, -0.5163 -2.813 -0.2806, -1.036 -3.023 -0.7006, 
-          -1.196 -2.353 -0.6606, -0.8663 -2.103 -0.1806, -0.5563 -1.883 0.2294, 
-          -0.0963 -2.933 -0.2106, -1.346 -1.533 -0.5406, -1.096 -1.573 -0.1606, 
-          -0.0563 -1.943 0.3194, -0.0363 -1.683 0.7494, -0.5663 -1.643 0.5794, 
-          -1.146 -1.393 0.3994, -1.516 -1.173 -0.2506, -1.286 -1.353 0.1994, 
-          -1.386 -1.193 0.4494, -0.5363 -1.483 1.049, -0.9463 -1.283 1.249, 
-          -0.5563 -1.473 1.399, -0.0063 -1.513 1.649, -1.566 -0.8925 0.3994, 
-          -1.396 -0.7425 0.8494, -1.636 0.04749 0.7194, -1.476 -0.1825 0.9894, 
-          -1.296 -0.3925 1.199, -1.146 -0.7725 1.289, -0.9763 -1.073 1.419, 
-          -0.6263 -1.363 1.779, -0.2763 -1.483 1.829, -0.7363 -1.173 1.769, 
-          -0.5263 -1.183 2.009, -0.3963 -1.373 1.969, 0.0137 -1.353 2.069, 
-          -0.3563 -1.223 2.149, -0.3663 -0.9425 2.139, 0.0237 -1.013 2.219, 
-          0.0237 -1.233 2.209, -0.9063 -0.8825 1.549, -0.9963 -0.5625 1.519, 
-          -0.7563 -0.6625 1.699, -0.6463 -0.8825 1.859, -1.736 0.2775 0.4994, 
-          -1.846 0.8575 0.7094, -1.696 0.3575 0.8394, -1.576 0.3675 1.109, 
-          -1.386 -0.1125 1.169, -1.756 0.8475 1.009, -1.536 0.8375 1.299, 
-          -1.326 0.4575 1.419, -1.056 0.08749 1.569, -1.106 0.6175 1.629, 
-          -0.8663 0.3575 1.769, -0.8263 0.05749 1.839, -1.026 -0.2525 1.579, 
-          -0.2263 -0.6525 2.109, -0.3863 -0.6325 2.069, -0.2463 -0.5525 2.179, 
-          0.0337 -0.6925 2.129, -0.4063 -0.5325 2.129, -0.4963 -0.4525 2.019, 
-          -0.4163 -0.3925 2.099, -0.2663 -0.4225 2.199, -0.0963 -0.4525 2.209, 
-          0.0437 -0.5625 2.209, -0.1563 -0.2725 2.139, 0.0537 -0.3125 2.179, 
-          0.0437 -0.4525 2.229, -0.5263 -0.5725 1.919, -0.7363 -0.3125 1.709, 
-          -0.5263 0.02749 1.999, -0.4263 -0.08251 2.099, -0.4263 -0.1925 2.079, 
-          -0.4063 -0.2825 2.039, -0.2963 -0.2825 2.109, -0.3363 -0.1525 2.159, 
-          -0.0563 -0.1425 2.299, -0.1863 -0.1425 2.229, -0.1263 0.02749 2.299, 
-          0.0637 -0.002507 2.319, 0.0537 -0.1425 2.299, -0.3363 -0.04251 2.209, 
-          -0.0863 0.1175 2.279, -0.2563 0.4275 2.069, -0.0263 0.3575 2.229, 
-          0.0737 0.3275 2.229, 0.0637 0.1175 2.259, -0.6963 0.1875 1.899, 
-          -0.4263 0.4675 1.969, -0.0763 0.6175 2.109, -0.3663 0.5675 2.149, 
-          -0.2263 0.6175 2.279, -0.0963 0.5975 2.359, -0.0163 0.5075 2.409, 
-          -0.4363 0.6075 2.049, -0.4963 0.6675 1.899, -0.3963 0.7375 2.139, 
-          -0.2663 0.6775 2.319, -0.0963 0.6675 2.489, -0.1363 0.8275 2.439, 
-          -0.0063 0.8675 2.529, 0.0937 0.7575 2.569, 0.0837 0.4875 2.439, 
-          -1.306 0.8475 1.509, -1.456 1.227 1.339, -1.206 1.167 1.509, 
-          -0.9263 0.8775 1.709, -0.8763 1.187 1.649, -1.126 1.447 1.479, 
-          -0.8663 1.457 1.549, -0.5663 1.487 1.569, -0.4163 1.357 1.749, 
-          -0.5063 1.017 1.849, -0.2963 0.9775 1.999, -0.2063 0.9075 2.229, 
-          -0.0763 1.177 2.229, -0.3263 1.697 1.629, -0.0663 2.097 1.749, 
-          0.1037 1.417 2.229, 0.1237 2.127 1.839, -1.386 1.727 1.249, 
-          -1.466 1.567 1.219, -1.646 1.747 0.9494, -1.346 1.887 1.359, 
-          -1.296 1.767 1.359, -1.206 1.647 1.409, -1.096 1.607 1.479, 
-          -1.146 1.707 1.479, -0.9963 1.697 1.529, -0.8663 1.597 1.529, 
-          -0.6463 1.607 1.549, -0.7663 1.707 1.549, -0.5263 1.727 1.479, 
-          -0.4563 1.667 1.539, -0.5063 1.947 1.539, -0.3563 2.047 1.509, 
-          -1.646 1.277 1.149, -1.816 1.417 0.8194, -1.906 1.207 0.5394, 
-          -1.906 1.537 0.2594, -1.836 1.747 0.4994, -1.806 1.717 0.7294, 
-          -1.436 2.037 1.149, -1.716 1.877 0.8394, -1.596 2.197 1.099, 
-          -1.186 2.287 1.359, -1.786 2.037 0.7494, -1.886 1.877 0.009414, 
-          -1.796 2.277 0.4294, -1.656 2.317 1.039, -0.9863 2.337 1.459, 
-          -0.8663 2.057 1.589, -1.086 2.037 1.549, -0.9963 2.527 1.529, 
-          -0.6863 2.507 1.579, -0.7163 2.307 1.479, -0.4863 2.207 1.479, 
-          -0.3563 2.367 1.649, -0.3163 2.517 1.709, -0.6463 2.677 1.629, 
-          -0.5563 2.997 1.479, -0.1163 2.867 1.549, -1.036 2.737 1.529, 
-          -1.326 2.467 1.369, -1.386 2.627 1.359, -1.026 3.027 1.369, 
-          0.1337 2.747 1.589, 0.1437 3.517 1.219, -0.3963 3.517 1.239, 
-          -1.026 3.427 1.129, -1.436 3.257 0.9294, -1.386 2.897 1.179, 
-          -1.696 2.607 0.7894, -1.836 2.567 0.06941, -1.706 2.937 0.5194, 
-          -1.916 2.047 -0.7406, 1.934 0.7375 0.6094, 1.854 0.7275 0.9194, 
-          1.944 1.297 0.7194, 2.004 1.917 -0.8406, 2.044 1.827 -1.101, 
-          1.994 1.477 -1.061, 2.004 1.237 -0.3506, 2.004 1.747 -0.09059, 
-          2.024 1.167 -0.1006, 2.014 1.407 0.1594, 1.964 1.627 0.3994, 
-          1.964 2.157 0.3294, 1.994 2.447 -0.03059, 1.694 3.157 0.8494, 
-          1.914 2.817 0.4294, 1.634 2.797 1.099, 1.624 2.527 1.279, 
-          1.904 2.487 0.6994, 1.854 2.207 0.9494, 1.284 2.957 1.309, 
-          1.304 3.357 1.069, 0.6837 3.487 1.209, 0.8237 2.957 1.439, 
-          0.3837 2.847 1.539, 1.554 2.377 1.299, 1.794 2.087 1.009, 
-          1.404 2.207 1.289, 1.624 1.937 1.069, 1.234 2.457 1.469, 
-          0.9037 2.627 1.589, 1.284 2.667 1.469, 0.9237 2.457 1.539, 
-          0.5937 2.337 1.629, 0.2937 2.087 1.739, 0.5637 2.487 1.689, 
-          0.5637 2.017 1.489, 1.294 1.957 1.489, 1.534 1.797 1.289, 
-          0.7137 1.907 1.509, 0.7037 2.167 1.449, 0.9437 2.257 1.439, 
-          1.074 1.997 1.539, 1.214 2.267 1.399, 1.874 1.757 0.7494, 
-          1.954 1.917 0.6494, 1.944 1.597 0.6294, 1.804 1.637 0.8594, 
-          2.004 1.077 0.4394, 1.954 0.7575 0.3194, 0.7437 1.447 1.539, 
-          0.5937 1.327 1.719, 0.6437 1.627 1.509, 1.624 1.467 1.139, 
-          1.294 1.367 1.419, 1.384 1.567 1.339, 1.784 1.167 1.059, 
-          1.654 0.7375 1.219, 1.604 1.127 1.259, 1.354 1.087 1.439, 
-          0.5137 1.667 1.609, 0.7137 1.687 1.449, 0.9537 1.647 1.509, 
-          1.184 1.627 1.469, 1.044 1.537 1.479, 1.334 1.627 1.419, 
-          1.474 1.677 1.289, 0.8237 1.557 1.509, 1.034 1.397 1.499, 
-          1.274 1.527 1.419, 1.554 1.637 1.169, 1.754 0.2475 0.7494, 
-          0.6637 0.9775 1.819, 0.4637 0.9575 1.979, 0.1937 0.8575 2.519, 
-          0.3137 0.8175 2.429, 0.2637 1.167 2.219, 0.3837 0.8875 2.209, 
-          0.4337 0.6575 2.299, 0.5537 0.7075 2.119, 0.6337 0.6275 1.869, 
-          1.064 0.8175 1.659, 0.9737 0.2975 1.719, 1.224 0.5375 1.569, 
-          0.5537 0.4375 1.939, 1.034 1.127 1.599, 1.434 0.7575 1.439, 
-          1.424 0.3675 1.349, 0.1737 0.4975 2.409, 0.2637 0.6575 2.479, 
-          0.1637 0.3475 2.229, 0.3837 0.5975 2.259, 0.2537 0.5875 2.349, 
-          0.5137 0.5375 2.129, 0.3937 0.4075 2.049, 0.5837 0.5775 2.019, 
-          0.2237 0.6075 2.099, 0.6337 -0.01251 1.969, 0.8037 0.1375 1.859, 
-          0.9237 -0.002507 1.789, 0.2437 0.01749 2.289, 0.2137 0.1075 2.269, 
-          0.4437 -0.07251 2.189, 0.2537 -0.2825 2.129, 0.2937 -0.1625 2.219, 
-          0.4337 -0.1725 2.139, 0.5237 -0.2225 2.059, 0.5237 -0.1125 2.079, 
-          0.1637 -0.1525 2.289, 0.3537 -0.4425 2.179, 0.3837 -0.3025 2.089, 
-          0.4937 -0.3125 2.019, 0.4937 -0.4225 2.079, 0.8037 -0.7125 1.659, 
-          0.5837 -0.6125 1.889, 0.8037 -0.3625 1.669, 0.5737 -0.4825 1.989, 
-          1.084 -0.3225 1.529, 1.034 -0.6325 1.469, 0.6837 -0.9225 1.829, 
-          0.4137 -0.9725 2.119, 0.4537 -0.6625 2.049, 0.3237 -0.5725 2.169, 
-          0.1837 -0.4625 2.199, 0.4837 -0.5625 2.109, 0.2937 -0.6725 2.099, 
-          1.324 -0.4725 1.129, 1.164 -0.8425 1.229, 1.514 -0.2825 0.9094, 
-          1.434 -0.2025 1.099, 1.674 -0.06251 0.6294, 1.144 0.01749 1.509, 
-          1.654 0.2675 1.029, 1.774 0.1675 0.4094, 1.844 0.3275 0.1394, 
-          1.804 0.06749 0.07941, 1.714 -0.2025 0.2794, 0.7537 -1.223 1.729, 
-          0.5537 -1.213 1.979, 0.9737 -1.133 1.369, 0.9237 -0.9425 1.499, 
-          0.9237 -1.343 1.199, 0.4037 -1.403 1.949, 0.2737 -1.503 1.819, 
-          0.5337 -1.513 1.369, 0.3837 -1.243 2.129, 0.6237 -1.403 1.749, 
-          1.694 -0.4725 0.1994, 1.524 -0.9925 0.3194, 1.384 -0.8325 0.7794, 
-          1.324 -1.283 0.3794, 1.074 -1.463 0.3394, 1.534 -1.123 -0.2206, 
-          1.564 -0.9525 -0.5006, 1.464 -1.153 -0.5006, 0.4937 -1.513 1.019, 
-          0.4837 -1.673 0.5494, 1.424 -1.263 -0.3306, 1.204 -1.433 0.1394, 
-          1.234 -1.413 -0.4606, 0.9837 -1.643 -0.2106, 0.4437 -1.913 0.1994, 
-          0.2337 -3.413 -0.5206, 0.7137 -2.153 -0.2206, 1.004 -2.423 -0.7206, 
-          1.124 -2.273 -0.8806, 1.214 -1.613 -0.6106, 1.344 -1.483 -1.031, 
-          0.7737 -3.533 -0.8906, 0.6137 -3.663 -0.8206, 0.9337 -2.963 -0.8206, 
-          0.8037 -3.083 -0.7506, 1.184 -2.563 -1.271, 0.3237 -2.843 -0.3006, 
-          0.8537 -1.173 -2.071, 1.204 -1.563 -1.681, 1.004 -0.7625 -1.801, 
-          1.414 -0.7225 -1.231, 1.324 -1.533 -1.301, 1.144 -2.043 -1.931, 
-          1.224 -2.323 -1.581, 1.264 -1.943 -1.311, 1.214 -2.863 -1.561, 
-          0.9137 -4.123 -1.271, 0.5837 -4.423 -1.041, 0.3337 -4.513 -1.031, 
-          0.1437 -3.913 -0.7206, 0.0137 -4.653 -1.031, -0.0463 -5.343 -1.141, 
-          0.1237 -5.333 -1.141, 0.4337 -5.233 -1.101, 0.8437 -4.693 -1.331, 
-          0.8837 -5.093 -1.321, 1.344 -4.123 -1.751, 1.584 -4.413 -1.854, 
-          1.284 -4.773 -1.581, 1.164 -3.773 -1.561, 1.354 -3.353 -1.931, 
-          1.264 -2.653 -1.801, 1.124 -2.393 -2.141, 1.364 -3.173 -2.151, 
-          1.114 -3.153 -1.281, 1.064 -4.443 -1.471, 1.004 -3.303 -3.431, 
-          1.244 -4.073 -3.891, 1.724 -3.833 -3.251, 1.854 -3.823 -2.691, 
-          1.854 -4.003 -2.281, 1.594 -3.533 -2.421, 1.224 -2.923 -2.521, 
-          0.6737 -1.993 -2.721, 0.8037 -2.623 -3.051, 1.584 -3.743 -2.121, 
-          1.464 -3.423 -2.941, 0.5237 -1.953 -2.821, 0.5737 -2.563 -3.181, 
-          0.4937 -3.283 -3.661, 0.5137 -4.153 -4.151, 0.5437 -1.133 -2.431, 
-          0.5637 -1.523 -2.571, 0.4337 -0.5525 -2.501, 0.3937 -0.5125 -2.591, 
-          1.274 0.2775 -2.251, 0.9237 -0.09251 -2.411, 0.9737 -0.2825 -1.961, 
-          0.5537 -0.6825 -2.411, 1.734 -0.2625 -0.4506, 1.504 -0.2525 -0.7906, 
-          1.484 -0.9825 -0.6806, 1.724 0.1675 -0.6706, 1.774 -0.2925 -0.05059, 
-          1.804 0.1975 -0.3606, 1.534 0.1275 -0.8306, 1.854 0.3975 -0.6106, 
-          1.884 0.6775 -0.6406, 1.534 0.3375 -1.071, 1.334 -0.03251 -1.351, 
-          1.604 0.6175 -1.421, 1.734 0.9175 -1.691, 1.944 1.177 -1.021, 
-          1.954 1.007 -0.8606, 1.904 0.8275 -0.4906, 1.924 0.8175 -0.7006, 
-          1.994 1.257 -1.111, 2.164 1.557 -1.221, 2.164 1.717 -1.151, 
-          2.234 1.927 -1.401, 2.244 1.767 -1.181, 2.374 1.877 -1.351, 
-          2.264 1.727 -1.281, 2.404 1.777 -1.451, 2.564 1.737 -1.711, 
-          2.434 1.717 -1.621, 2.244 1.697 -1.481, 2.464 1.577 -1.781, 
-          2.564 1.587 -1.801, 2.374 1.887 -1.541, 2.244 1.807 -1.731, 
-          2.094 1.587 -1.831, 2.344 1.727 -1.751, 2.584 1.767 -1.741, 
-          2.544 1.527 -1.901, 2.114 0.9575 -1.811, 2.314 0.7075 -1.701, 
-          2.444 1.057 -1.881, 2.314 1.327 -1.641, 2.464 1.367 -1.841, 
-          2.464 1.057 -1.821, 2.364 0.8675 -1.641, 2.364 0.8075 -1.661, 
-          2.544 1.377 -1.871, 1.954 1.247 -1.851, 2.274 1.387 -1.871, 
-          1.954 0.6075 -1.531, 1.814 0.3575 -1.271, 2.194 0.5175 -1.541, 
-          1.744 0.1775 -1.021, 1.874 0.1075 -0.8406, 2.004 0.2075 -1.071, 
-          2.084 0.3375 -1.281, 2.114 0.4175 -1.091, 2.164 0.4775 -1.321, 
-          2.214 0.6175 -1.231, 2.034 0.3475 -0.8906, 1.994 0.4575 -0.7606, 
-          2.274 0.7075 -1.471, 2.104 0.7375 -1.311, 2.174 0.7975 -1.501, 
-          1.984 0.6675 -0.7606, 1.894 0.2275 -0.7006, 1.994 0.7475 -1.101, 
-          1.934 0.8375 -1.021, 1.884 1.047 -1.221, 1.904 1.007 -1.091, 
-          2.134 0.6275 -1.001, 1.994 1.067 -1.021, 2.004 0.8875 -0.9106, 
-          2.094 1.207 -1.361, 1.964 1.157 -1.181, 1.994 1.137 -1.241, 
-          1.974 1.137 -1.101, 2.114 1.257 -1.411, 2.084 1.127 -1.501, 
-          2.044 0.8575 -1.361, 2.084 0.9975 -1.521, 2.194 1.297 -1.541, 
-          2.164 1.467 -1.501, 2.064 1.457 -1.341, 2.314 1.067 -1.631, 
-          2.414 1.537 -1.681, 2.094 1.327 -1.241, 2.154 1.617 -1.381]
-        }
-        coordIndex [
-          1, 0, 2, -1, 
-          2, 0, 3, -1, 3, 0, 4, -1, 4, 0, 5, -1, 5, 0, 1, -1, 
-          5, 6, 7, -1, 7, 6, 8, -1, 8, 6, 9, -1, 9, 6, 10, -1, 
-          10, 6, 1, -1, 1, 6, 5, -1, 3, 11, 2, -1, 2, 11, 12, -1, 
-          12, 11, 13, -1, 13, 11, 14, -1, 14, 11, 15, -1, 15, 11, 3, -1, 
-          12, 16, 17, -1, 17, 16, 10, -1, 10, 16, 18, -1, 18, 16, 19, -1, 
-          19, 16, 20, -1, 20, 16, 21, -1, 21, 16, 22, -1, 22, 16, 12, -1, 
-          1, 2, 10, -1, 17, 10, 2, -1, 17, 2, 12, -1, 9, 23, 24, -1, 
-          24, 23, 25, -1, 25, 23, 26, -1, 26, 23, 27, -1, 27, 23, 20, -1, 
-          20, 23, 19, -1, 19, 23, 18, -1, 18, 23, 9, -1, 18, 9, 10, -1, 
-          8, 28, 29, -1, 29, 28, 30, -1, 30, 28, 31, -1, 31, 28, 25, -1, 
-          25, 28, 32, -1, 32, 28, 8, -1, 25, 32, 24, -1, 24, 32, 9, -1, 
-          9, 32, 8, -1, 31, 33, 30, -1, 30, 33, 34, -1, 34, 33, 35, -1, 
-          35, 33, 36, -1, 36, 33, 37, -1, 37, 33, 31, -1, 30, 34, 29, -1, 
-          26, 38, 36, -1, 36, 38, 39, -1, 39, 38, 40, -1, 40, 38, 41, -1, 
-          41, 38, 26, -1, 36, 37, 26, -1, 31, 25, 37, -1, 37, 25, 26, -1, 
-          26, 27, 41, -1, 39, 42, 43, -1, 43, 42, 44, -1, 44, 42, 45, -1, 
-          45, 42, 46, -1, 46, 42, 47, -1, 47, 42, 39, -1, 43, 48, 39, -1, 
-          36, 39, 48, -1, 36, 48, 35, -1, 21, 49, 20, -1, 20, 49, 27, -1, 
-          27, 49, 41, -1, 41, 49, 50, -1, 50, 49, 51, -1, 51, 49, 52, -1, 
-          52, 49, 53, -1, 53, 49, 21, -1, 39, 40, 47, -1, 47, 40, 46, -1, 
-          40, 41, 50, -1, 51, 54, 50, -1, 50, 54, 40, -1, 40, 54, 46, -1, 
-          46, 54, 55, -1, 55, 54, 56, -1, 56, 54, 51, -1, 45, 46, 55, -1, 
-          45, 55, 57, -1, 45, 57, 44, -1, 57, 55, 58, -1, 56, 58, 55, -1, 
-          58, 56, 59, -1, 61, 60, 62, -1, 62, 60, 52, -1, 52, 60, 51, -1, 
-          51, 60, 56, -1, 56, 60, 59, -1, 59, 60, 61, -1, 64, 63, 65, -1, 
-          65, 63, 62, -1, 62, 63, 66, -1, 66, 63, 67, -1, 67, 63, 68, -1, 
-          68, 63, 64, -1, 66, 62, 61, -1, 14, 69, 13, -1, 13, 69, 22, -1, 
-          22, 69, 65, -1, 65, 69, 64, -1, 64, 69, 70, -1, 70, 69, 14, -1, 
-          52, 53, 65, -1, 53, 21, 65, -1, 22, 65, 21, -1, 13, 22, 12, -1, 
-          52, 65, 62, -1, 72, 71, 70, -1, 70, 71, 64, -1, 64, 71, 68, -1, 
-          68, 71, 73, -1, 73, 71, 74, -1, 74, 71, 75, -1, 75, 71, 72, -1, 
-          68, 73, 67, -1, 76, 73, 74, -1, 76, 74, 75, -1, 70, 14, 72, -1, 
-          72, 14, 15, -1, 4, 77, 3, -1, 3, 77, 15, -1, 15, 77, 72, -1, 
-          72, 77, 75, -1, 75, 77, 4, -1, 79, 78, 80, -1, 80, 78, 5, -1, 
-          5, 78, 4, -1, 4, 78, 75, -1, 75, 78, 76, -1, 76, 78, 79, -1, 
-          7, 79, 80, -1, 7, 80, 5, -1, 8, 29, 7, -1, 29, 81, 7, -1, 
-          7, 81, 82, -1, 82, 81, 83, -1, 83, 81, 84, -1, 84, 81, 85, -1, 
-          85, 81, 86, -1, 86, 81, 87, -1, 87, 81, 48, -1, 48, 81, 35, -1, 
-          35, 81, 34, -1, 34, 81, 29, -1, 61, 88, 59, -1, 58, 59, 88, -1, 
-          58, 89, 57, -1, 57, 89, 90, -1, 90, 89, 91, -1, 91, 89, 92, -1, 
-          92, 89, 93, -1, 93, 89, 88, -1, 88, 89, 58, -1, 87, 48, 43, -1, 
-          87, 43, 44, -1, 90, 44, 57, -1, 95, 94, 44, -1, 44, 94, 87, -1, 
-          87, 94, 86, -1, 86, 94, 96, -1, 96, 94, 97, -1, 97, 94, 98, -1, 
-          98, 94, 99, -1, 99, 94, 95, -1, 95, 44, 90, -1, 91, 100, 90, -1, 
-          90, 100, 99, -1, 99, 100, 101, -1, 101, 100, 102, -1, 
-          102, 100, 103, -1, 103, 100, 91, -1, 90, 99, 95, -1, 
-          93, 104, 92, -1, 92, 104, 105, -1, 105, 104, 106, -1, 
-          106, 104, 107, -1, 107, 104, 108, -1, 108, 104, 93, -1, 
-          109, 108, 110, -1, 93, 110, 108, -1, 110, 93, 88, -1, 
-          108, 109, 107, -1, 106, 111, 112, -1, 106, 113, 105, -1, 
-          105, 113, 114, -1, 114, 113, 115, -1, 115, 113, 116, -1, 
-          116, 113, 117, -1, 117, 113, 112, -1, 112, 113, 106, -1, 
-          111, 106, 107, -1, 119, 118, 120, -1, 120, 118, 121, -1, 
-          121, 118, 122, -1, 122, 118, 123, -1, 123, 118, 124, -1, 
-          124, 118, 125, -1, 125, 118, 126, -1, 126, 118, 119, -1, 
-          125, 116, 117, -1, 125, 117, 124, -1, 123, 124, 117, -1, 
-          123, 117, 127, -1, 112, 127, 117, -1, 129, 128, 130, -1, 
-          130, 128, 126, -1, 126, 128, 125, -1, 125, 128, 131, -1, 
-          131, 128, 132, -1, 132, 128, 129, -1, 134, 133, 135, -1, 
-          135, 133, 132, -1, 132, 133, 136, -1, 136, 133, 137, -1, 
-          137, 133, 138, -1, 138, 133, 134, -1, 131, 116, 125, -1, 
-          115, 116, 131, -1, 115, 131, 136, -1, 132, 136, 131, -1, 
-          135, 132, 129, -1, 119, 130, 126, -1, 140, 139, 141, -1, 
-          141, 139, 138, -1, 138, 139, 142, -1, 142, 139, 143, -1, 
-          143, 139, 144, -1, 144, 139, 140, -1, 143, 145, 142, -1, 
-          142, 145, 146, -1, 146, 145, 147, -1, 147, 145, 148, -1, 
-          148, 145, 149, -1, 149, 145, 143, -1, 146, 150, 137, -1, 
-          137, 150, 136, -1, 136, 150, 115, -1, 115, 150, 114, -1, 
-          114, 150, 151, -1, 151, 150, 146, -1, 138, 142, 137, -1, 
-          146, 137, 142, -1, 134, 141, 138, -1, 140, 152, 144, -1, 
-          143, 144, 152, -1, 143, 152, 153, -1, 154, 153, 152, -1, 
-          154, 152, 155, -1, 154, 155, 156, -1, 154, 156, 157, -1, 
-          158, 157, 156, -1, 158, 156, 159, -1, 158, 160, 157, -1, 
-          157, 160, 154, -1, 154, 160, 161, -1, 161, 160, 162, -1, 
-          162, 160, 163, -1, 163, 160, 164, -1, 164, 160, 158, -1, 
-          153, 154, 161, -1, 153, 161, 149, -1, 153, 149, 143, -1, 
-          146, 147, 151, -1, 151, 165, 166, -1, 166, 165, 167, -1, 
-          167, 165, 103, -1, 103, 165, 168, -1, 168, 165, 147, -1, 
-          147, 165, 151, -1, 151, 166, 114, -1, 105, 114, 166, -1, 
-          103, 91, 167, -1, 166, 167, 91, -1, 166, 91, 92, -1, 
-          166, 92, 105, -1, 162, 169, 170, -1, 170, 169, 171, -1, 
-          171, 169, 172, -1, 172, 169, 173, -1, 173, 169, 174, -1, 
-          174, 169, 162, -1, 148, 170, 171, -1, 148, 171, 168, -1, 
-          148, 168, 147, -1, 162, 170, 161, -1, 148, 161, 170, -1, 
-          161, 148, 149, -1, 176, 175, 168, -1, 168, 175, 103, -1, 
-          103, 175, 102, -1, 102, 175, 176, -1, 168, 171, 176, -1, 
-          172, 176, 171, -1, 176, 172, 173, -1, 163, 174, 162, -1, 
-          177, 173, 174, -1, 173, 177, 178, -1, 173, 178, 179, -1, 
-          173, 179, 180, -1, 173, 180, 176, -1, 101, 102, 181, -1, 
-          101, 181, 98, -1, 98, 182, 183, -1, 183, 182, 180, -1, 
-          180, 182, 176, -1, 176, 182, 102, -1, 102, 182, 181, -1, 
-          181, 182, 98, -1, 178, 184, 179, -1, 179, 184, 180, -1, 
-          180, 184, 185, -1, 185, 184, 186, -1, 186, 184, 187, -1, 
-          187, 184, 178, -1, 101, 98, 99, -1, 183, 188, 98, -1, 
-          98, 188, 97, -1, 183, 180, 185, -1, 97, 189, 96, -1, 
-          96, 189, 190, -1, 190, 189, 191, -1, 191, 189, 192, -1, 
-          192, 189, 193, -1, 193, 189, 194, -1, 194, 189, 185, -1, 
-          185, 189, 183, -1, 183, 189, 188, -1, 188, 189, 97, -1, 
-          196, 195, 186, -1, 186, 195, 185, -1, 185, 195, 197, -1, 
-          197, 195, 198, -1, 198, 195, 199, -1, 199, 195, 196, -1, 
-          196, 187, 200, -1, 200, 201, 199, -1, 199, 201, 198, -1, 
-          198, 201, 202, -1, 202, 201, 203, -1, 203, 201, 204, -1, 
-          204, 201, 200, -1, 187, 196, 186, -1, 196, 200, 199, -1, 
-          185, 197, 194, -1, 194, 205, 193, -1, 193, 205, 206, -1, 
-          206, 205, 207, -1, 207, 205, 208, -1, 208, 205, 197, -1, 
-          197, 205, 194, -1, 202, 208, 198, -1, 197, 198, 208, -1, 
-          190, 209, 96, -1, 96, 209, 86, -1, 86, 209, 85, -1, 
-          85, 209, 84, -1, 84, 209, 210, -1, 210, 209, 211, -1, 
-          211, 209, 190, -1, 213, 212, 191, -1, 191, 212, 211, -1, 
-          211, 212, 214, -1, 214, 212, 215, -1, 215, 212, 216, -1, 
-          216, 212, 213, -1, 216, 217, 218, -1, 218, 217, 219, -1, 
-          219, 217, 220, -1, 220, 217, 221, -1, 221, 217, 192, -1, 
-          192, 217, 213, -1, 213, 217, 216, -1, 191, 211, 190, -1, 
-          192, 213, 191, -1, 206, 192, 193, -1, 192, 206, 221, -1, 
-          203, 222, 202, -1, 202, 222, 223, -1, 223, 222, 224, -1, 
-          224, 222, 225, -1, 225, 222, 203, -1, 223, 226, 227, -1, 
-          227, 226, 228, -1, 228, 226, 229, -1, 229, 226, 224, -1, 
-          224, 226, 223, -1, 231, 230, 224, -1, 224, 230, 229, -1, 
-          229, 230, 232, -1, 232, 230, 233, -1, 233, 230, 234, -1, 
-          234, 230, 231, -1, 231, 224, 225, -1, 227, 235, 223, -1, 
-          223, 235, 208, -1, 208, 235, 207, -1, 202, 223, 208, -1, 
-          207, 236, 206, -1, 206, 236, 221, -1, 221, 236, 220, -1, 
-          220, 236, 237, -1, 237, 236, 238, -1, 238, 236, 239, -1, 
-          239, 236, 240, -1, 240, 236, 228, -1, 228, 236, 227, -1, 
-          227, 236, 235, -1, 235, 236, 207, -1, 229, 241, 228, -1, 
-          228, 241, 240, -1, 240, 241, 239, -1, 239, 241, 242, -1, 
-          242, 241, 232, -1, 232, 241, 229, -1, 233, 243, 232, -1, 
-          232, 243, 244, -1, 244, 243, 245, -1, 245, 243, 246, -1, 
-          246, 243, 247, -1, 247, 243, 233, -1, 245, 248, 244, -1, 
-          244, 248, 242, -1, 242, 248, 238, -1, 238, 248, 237, -1, 
-          242, 238, 239, -1, 244, 242, 232, -1, 245, 249, 248, -1, 
-          248, 249, 237, -1, 237, 249, 250, -1, 250, 249, 251, -1, 
-          251, 249, 252, -1, 252, 249, 253, -1, 253, 249, 246, -1, 
-          246, 249, 245, -1, 255, 254, 237, -1, 237, 254, 220, -1, 
-          220, 254, 219, -1, 219, 254, 255, -1, 255, 237, 250, -1, 
-          257, 256, 258, -1, 258, 256, 259, -1, 259, 256, 260, -1, 
-          260, 256, 251, -1, 251, 256, 250, -1, 250, 261, 255, -1, 
-          255, 261, 262, -1, 262, 261, 263, -1, 263, 261, 264, -1, 
-          264, 261, 257, -1, 257, 261, 250, -1, 257, 258, 264, -1, 
-          260, 265, 259, -1, 259, 265, 258, -1, 258, 265, 264, -1, 
-          264, 265, 266, -1, 266, 265, 267, -1, 267, 265, 268, -1, 
-          251, 252, 260, -1, 269, 260, 252, -1, 268, 265, 260, -1, 
-          268, 260, 269, -1, 218, 270, 216, -1, 216, 270, 215, -1, 
-          215, 270, 271, -1, 271, 270, 272, -1, 272, 270, 273, -1, 
-          273, 270, 218, -1, 273, 274, 272, -1, 272, 274, 275, -1, 
-          275, 274, 276, -1, 276, 274, 277, -1, 277, 274, 278, -1, 
-          278, 274, 279, -1, 279, 274, 273, -1, 255, 262, 219, -1, 
-          218, 219, 273, -1, 262, 273, 219, -1, 279, 273, 262, -1, 
-          279, 262, 280, -1, 263, 280, 262, -1, 266, 281, 263, -1, 
-          263, 281, 280, -1, 266, 263, 264, -1, 266, 282, 281, -1, 
-          281, 282, 280, -1, 280, 282, 278, -1, 278, 282, 283, -1, 
-          283, 282, 284, -1, 284, 282, 285, -1, 285, 282, 267, -1, 
-          267, 282, 266, -1, 267, 268, 285, -1, 280, 278, 279, -1, 
-          211, 214, 210, -1, 286, 284, 285, -1, 288, 287, 289, -1, 
-          289, 287, 290, -1, 290, 287, 291, -1, 291, 287, 292, -1, 
-          292, 287, 288, -1, 275, 293, 292, -1, 292, 293, 294, -1, 
-          294, 293, 295, -1, 295, 293, 296, -1, 296, 293, 276, -1, 
-          276, 293, 275, -1, 277, 297, 276, -1, 276, 297, 296, -1, 
-          296, 297, 298, -1, 299, 297, 300, -1, 300, 297, 277, -1, 
-          291, 292, 294, -1, 295, 296, 298, -1, 299, 300, 301, -1, 
-          283, 301, 300, -1, 283, 300, 278, -1, 302, 283, 284, -1, 
-          302, 301, 283, -1, 275, 288, 272, -1, 271, 272, 288, -1, 
-          288, 303, 271, -1, 271, 303, 215, -1, 215, 303, 214, -1, 
-          214, 303, 304, -1, 304, 303, 289, -1, 289, 303, 288, -1, 
-          275, 292, 288, -1, 278, 300, 277, -1, 210, 305, 84, -1, 
-          84, 305, 83, -1, 83, 305, 306, -1, 306, 305, 307, -1, 
-          307, 305, 308, -1, 308, 305, 304, -1, 304, 305, 210, -1, 
-          289, 308, 304, -1, 290, 309, 289, -1, 289, 309, 310, -1, 
-          310, 309, 311, -1, 311, 309, 312, -1, 312, 309, 290, -1, 
-          289, 310, 308, -1, 307, 308, 310, -1, 310, 313, 307, -1, 
-          307, 313, 314, -1, 314, 313, 315, -1, 315, 313, 316, -1, 
-          316, 313, 311, -1, 311, 313, 310, -1, 318, 317, 319, -1, 
-          319, 317, 312, -1, 312, 317, 320, -1, 320, 317, 321, -1, 
-          321, 317, 322, -1, 322, 317, 318, -1, 301, 323, 318, -1, 
-          318, 323, 322, -1, 322, 323, 321, -1, 321, 323, 324, -1, 
-          324, 323, 302, -1, 302, 323, 301, -1, 312, 290, 319, -1, 
-          284, 324, 302, -1, 284, 325, 324, -1, 324, 325, 326, -1, 
-          326, 325, 327, -1, 327, 325, 328, -1, 328, 325, 286, -1, 
-          286, 325, 284, -1, 324, 326, 321, -1, 320, 321, 326, -1, 
-          326, 329, 320, -1, 320, 329, 330, -1, 330, 329, 331, -1, 
-          331, 329, 332, -1, 332, 329, 327, -1, 327, 329, 326, -1, 
-          320, 330, 312, -1, 330, 311, 312, -1, 311, 330, 316, -1, 
-          316, 330, 331, -1, 286, 333, 328, -1, 334, 328, 333, -1, 
-          335, 328, 334, -1, 328, 335, 327, -1, 332, 327, 335, -1, 
-          332, 335, 336, -1, 332, 336, 337, -1, 332, 337, 338, -1, 
-          332, 338, 331, -1, 331, 339, 316, -1, 316, 339, 315, -1, 
-          315, 339, 340, -1, 340, 339, 341, -1, 341, 339, 338, -1, 
-          338, 339, 331, -1, 341, 338, 337, -1, 315, 340, 342, -1, 
-          315, 342, 314, -1, 307, 314, 306, -1, 83, 306, 314, -1, 
-          83, 314, 82, -1, 342, 82, 314, -1, 82, 342, 7, -1, 
-          79, 7, 342, -1, 214, 304, 210, -1, 344, 343, 345, -1, 
-          347, 346, 348, -1, 349, 348, 346, -1, 346, 350, 349, -1, 
-          351, 349, 350, -1, 351, 350, 352, -1, 353, 352, 350, -1, 
-          354, 350, 346, -1, 354, 346, 355, -1, 357, 356, 358, -1, 
-          358, 359, 360, -1, 357, 358, 360, -1, 355, 357, 360, -1, 
-          354, 355, 360, -1, 361, 354, 360, -1, 359, 361, 360, -1, 
-          362, 359, 358, -1, 362, 358, 356, -1, 362, 356, 363, -1, 
-          362, 363, 364, -1, 362, 364, 365, -1, 366, 365, 364, -1, 
-          364, 334, 366, -1, 334, 333, 366, -1, 286, 366, 333, -1, 
-          361, 359, 367, -1, 368, 361, 367, -1, 367, 369, 368, -1, 
-          370, 368, 369, -1, 371, 369, 367, -1, 365, 372, 373, -1, 
-          362, 365, 373, -1, 359, 362, 373, -1, 367, 359, 373, -1, 
-          371, 367, 373, -1, 372, 371, 373, -1, 371, 372, 374, -1, 
-          375, 374, 372, -1, 286, 376, 377, -1, 366, 286, 377, -1, 
-          365, 366, 377, -1, 372, 365, 377, -1, 375, 372, 377, -1, 
-          376, 375, 377, -1, 376, 378, 375, -1, 369, 379, 380, -1, 
-          378, 381, 382, -1, 375, 378, 382, -1, 374, 375, 382, -1, 
-          383, 374, 382, -1, 384, 383, 382, -1, 381, 384, 382, -1, 
-          383, 384, 385, -1, 374, 383, 385, -1, 371, 374, 385, -1, 
-          369, 371, 385, -1, 379, 369, 385, -1, 384, 379, 385, -1, 
-          368, 386, 387, -1, 361, 368, 387, -1, 354, 361, 387, -1, 
-          350, 354, 387, -1, 353, 350, 387, -1, 386, 353, 387, -1, 
-          353, 386, 388, -1, 389, 388, 386, -1, 369, 380, 370, -1, 
-          386, 368, 370, -1, 389, 386, 370, -1, 380, 389, 370, -1, 
-          389, 345, 388, -1, 345, 343, 390, -1, 388, 345, 390, -1, 
-          353, 388, 390, -1, 352, 353, 390, -1, 351, 352, 390, -1, 
-          391, 351, 390, -1, 343, 391, 390, -1, 393, 392, 394, -1, 
-          396, 395, 397, -1, 389, 395, 398, -1, 345, 389, 398, -1, 
-          344, 345, 398, -1, 399, 344, 398, -1, 400, 399, 398, -1, 
-          395, 400, 398, -1, 400, 395, 401, -1, 396, 401, 395, -1, 
-          378, 402, 381, -1, 378, 376, 402, -1, 402, 393, 394, -1, 
-          403, 381, 394, -1, 405, 404, 406, -1, 408, 407, 397, -1, 
-          394, 392, 409, -1, 403, 394, 409, -1, 404, 403, 409, -1, 
-          406, 404, 409, -1, 410, 406, 409, -1, 392, 410, 409, -1, 
-          410, 396, 411, -1, 406, 410, 411, -1, 405, 406, 411, -1, 
-          407, 405, 411, -1, 397, 407, 411, -1, 396, 397, 411, -1, 
-          397, 395, 412, -1, 408, 397, 412, -1, 380, 408, 412, -1, 
-          389, 380, 412, -1, 395, 389, 412, -1, 286, 285, 376, -1, 
-          413, 343, 344, -1, 415, 414, 393, -1, 416, 285, 268, -1, 
-          416, 417, 418, -1, 285, 416, 418, -1, 376, 285, 418, -1, 
-          402, 376, 418, -1, 393, 402, 418, -1, 415, 393, 418, -1, 
-          419, 415, 418, -1, 417, 419, 418, -1, 417, 420, 421, -1, 
-          421, 415, 419, -1, 417, 421, 419, -1, 421, 422, 415, -1, 
-          414, 415, 422, -1, 414, 422, 423, -1, 422, 424, 423, -1, 
-          425, 423, 424, -1, 426, 424, 422, -1, 414, 423, 427, -1, 
-          393, 414, 427, -1, 392, 393, 427, -1, 410, 392, 427, -1, 
-          396, 410, 427, -1, 401, 396, 427, -1, 423, 401, 427, -1, 
-          423, 425, 428, -1, 401, 423, 428, -1, 400, 401, 428, -1, 
-          399, 400, 428, -1, 429, 399, 428, -1, 425, 429, 428, -1, 
-          268, 269, 430, -1, 268, 430, 431, -1, 269, 252, 430, -1, 
-          432, 430, 252, -1, 416, 268, 431, -1, 417, 416, 431, -1, 
-          420, 417, 431, -1, 433, 420, 431, -1, 434, 433, 431, -1, 
-          430, 434, 431, -1, 435, 420, 433, -1, 435, 436, 437, -1, 
-          420, 435, 437, -1, 421, 420, 437, -1, 422, 421, 437, -1, 
-          426, 422, 437, -1, 436, 426, 437, -1, 432, 436, 438, -1, 
-          430, 432, 438, -1, 434, 430, 438, -1, 433, 434, 438, -1, 
-          435, 433, 438, -1, 436, 435, 438, -1, 426, 436, 439, -1, 
-          424, 426, 440, -1, 441, 424, 440, -1, 439, 441, 440, -1, 
-          426, 439, 440, -1, 246, 442, 443, -1, 253, 246, 443, -1, 
-          252, 253, 443, -1, 432, 252, 443, -1, 436, 432, 443, -1, 
-          439, 436, 443, -1, 444, 439, 443, -1, 442, 444, 443, -1, 
-          446, 445, 447, -1, 447, 448, 449, -1, 449, 439, 444, -1, 
-          447, 449, 444, -1, 446, 447, 444, -1, 442, 446, 444, -1, 
-          247, 233, 450, -1, 246, 247, 450, -1, 442, 246, 450, -1, 
-          446, 442, 450, -1, 445, 446, 450, -1, 233, 445, 450, -1, 
-          445, 451, 452, -1, 447, 445, 452, -1, 448, 447, 452, -1, 
-          453, 448, 452, -1, 454, 453, 452, -1, 451, 454, 452, -1, 
-          456, 455, 457, -1, 458, 456, 457, -1, 454, 458, 457, -1, 
-          453, 454, 457, -1, 448, 453, 457, -1, 449, 448, 457, -1, 
-          439, 449, 457, -1, 441, 439, 457, -1, 459, 441, 457, -1, 
-          460, 459, 457, -1, 455, 460, 457, -1, 462, 461, 463, -1, 
-          461, 455, 456, -1, 463, 461, 456, -1, 458, 463, 456, -1, 
-          231, 225, 464, -1, 234, 231, 465, -1, 233, 234, 465, -1, 
-          445, 233, 465, -1, 451, 445, 465, -1, 464, 451, 465, -1, 
-          231, 464, 465, -1, 464, 463, 466, -1, 451, 464, 466, -1, 
-          454, 451, 466, -1, 458, 454, 466, -1, 463, 458, 466, -1, 
-          225, 203, 467, -1, 464, 225, 467, -1, 463, 464, 467, -1, 
-          462, 463, 467, -1, 203, 462, 467, -1, 468, 459, 460, -1, 
-          460, 469, 468, -1, 468, 470, 471, -1, 470, 472, 413, -1, 
-          471, 429, 473, -1, 468, 471, 473, -1, 459, 468, 473, -1, 
-          441, 459, 473, -1, 424, 441, 473, -1, 425, 424, 473, -1, 
-          429, 425, 473, -1, 429, 471, 474, -1, 399, 429, 474, -1, 
-          344, 399, 474, -1, 413, 344, 474, -1, 470, 413, 474, -1, 
-          471, 470, 474, -1, 413, 472, 475, -1, 343, 413, 475, -1, 
-          391, 343, 475, -1, 476, 391, 475, -1, 477, 476, 475, -1, 
-          478, 477, 475, -1, 472, 478, 475, -1, 479, 461, 480, -1, 
-          462, 480, 461, -1, 479, 481, 482, -1, 461, 479, 482, -1, 
-          455, 461, 482, -1, 460, 455, 482, -1, 469, 460, 482, -1, 
-          481, 469, 482, -1, 483, 481, 479, -1, 485, 484, 200, -1, 
-          187, 486, 485, -1, 204, 200, 487, -1, 203, 204, 487, -1, 
-          462, 203, 487, -1, 480, 462, 487, -1, 484, 480, 487, -1, 
-          200, 484, 487, -1, 485, 200, 187, -1, 484, 485, 488, -1, 
-          480, 484, 488, -1, 479, 480, 488, -1, 483, 479, 488, -1, 
-          486, 483, 488, -1, 485, 486, 488, -1, 490, 489, 491, -1, 
-          492, 490, 491, -1, 483, 492, 491, -1, 481, 483, 491, -1, 
-          469, 481, 491, -1, 468, 469, 491, -1, 470, 468, 491, -1, 
-          472, 470, 491, -1, 478, 472, 491, -1, 489, 478, 491, -1, 
-          492, 483, 493, -1, 494, 489, 490, -1, 492, 494, 490, -1, 
-          496, 495, 494, -1, 187, 178, 497, -1, 486, 187, 497, -1, 
-          483, 486, 497, -1, 493, 483, 497, -1, 498, 493, 497, -1, 
-          178, 498, 497, -1, 499, 494, 500, -1, 501, 499, 500, -1, 
-          502, 501, 500, -1, 493, 502, 500, -1, 492, 493, 500, -1, 
-          494, 492, 500, -1, 496, 494, 499, -1, 496, 499, 501, -1, 
-          503, 502, 493, -1, 503, 493, 498, -1, 503, 498, 178, -1, 
-          503, 178, 177, -1, 177, 174, 503, -1, 163, 504, 174, -1, 
-          502, 503, 505, -1, 505, 506, 502, -1, 507, 502, 506, -1, 
-          501, 502, 508, -1, 509, 501, 508, -1, 507, 509, 508, -1, 
-          502, 507, 508, -1, 511, 510, 512, -1, 512, 513, 511, -1, 
-          504, 511, 513, -1, 512, 514, 507, -1, 512, 507, 506, -1, 
-          512, 506, 513, -1, 515, 513, 506, -1, 174, 504, 515, -1, 
-          503, 174, 515, -1, 505, 503, 515, -1, 506, 505, 515, -1, 
-          504, 513, 515, -1, 517, 516, 518, -1, 517, 518, 519, -1, 
-          517, 519, 520, -1, 509, 520, 519, -1, 516, 517, 521, -1, 
-          522, 521, 517, -1, 514, 522, 523, -1, 507, 514, 523, -1, 
-          509, 507, 523, -1, 520, 509, 523, -1, 517, 520, 523, -1, 
-          522, 517, 523, -1, 524, 522, 514, -1, 526, 525, 510, -1, 
-          526, 510, 511, -1, 526, 511, 527, -1, 164, 158, 528, -1, 
-          163, 164, 528, -1, 504, 163, 528, -1, 511, 504, 528, -1, 
-          527, 511, 528, -1, 529, 527, 528, -1, 158, 529, 528, -1, 
-          158, 159, 530, -1, 158, 530, 529, -1, 527, 529, 530, -1, 
-          527, 530, 531, -1, 527, 531, 532, -1, 527, 532, 526, -1, 
-          525, 526, 532, -1, 525, 532, 533, -1, 534, 533, 532, -1, 
-          536, 535, 537, -1, 524, 538, 539, -1, 535, 539, 538, -1, 
-          522, 524, 540, -1, 521, 522, 540, -1, 541, 521, 540, -1, 
-          542, 541, 540, -1, 539, 542, 540, -1, 524, 539, 540, -1, 
-          510, 525, 543, -1, 512, 510, 543, -1, 514, 512, 543, -1, 
-          524, 514, 543, -1, 538, 524, 543, -1, 525, 538, 543, -1, 
-          533, 534, 544, -1, 525, 533, 544, -1, 538, 525, 544, -1, 
-          535, 538, 544, -1, 537, 535, 544, -1, 534, 537, 544, -1, 
-          546, 545, 547, -1, 549, 548, 550, -1, 550, 551, 542, -1, 
-          541, 542, 551, -1, 541, 551, 552, -1, 551, 553, 552, -1, 
-          535, 536, 554, -1, 539, 535, 554, -1, 542, 539, 554, -1, 
-          550, 542, 554, -1, 549, 550, 554, -1, 536, 549, 554, -1, 
-          550, 548, 555, -1, 551, 550, 555, -1, 553, 551, 555, -1, 
-          545, 553, 555, -1, 547, 545, 555, -1, 548, 547, 555, -1, 
-          112, 556, 127, -1, 123, 127, 556, -1, 123, 556, 557, -1, 
-          553, 557, 556, -1, 553, 556, 552, -1, 545, 546, 558, -1, 
-          553, 545, 558, -1, 557, 553, 558, -1, 123, 557, 558, -1, 
-          122, 123, 558, -1, 121, 122, 558, -1, 559, 121, 558, -1, 
-          546, 559, 558, -1, 111, 107, 560, -1, 112, 560, 561, -1, 
-          556, 112, 561, -1, 552, 556, 561, -1, 541, 552, 561, -1, 
-          521, 541, 561, -1, 516, 521, 561, -1, 560, 516, 561, -1, 
-          560, 112, 111, -1, 562, 107, 563, -1, 565, 564, 566, -1, 
-          566, 562, 565, -1, 563, 565, 562, -1, 562, 566, 567, -1, 
-          107, 562, 567, -1, 560, 107, 567, -1, 516, 560, 567, -1, 
-          518, 516, 567, -1, 566, 518, 567, -1, 569, 568, 495, -1, 
-          509, 519, 570, -1, 501, 509, 570, -1, 496, 501, 570, -1, 
-          495, 496, 570, -1, 569, 495, 570, -1, 519, 569, 570, -1, 
-          568, 569, 571, -1, 495, 568, 572, -1, 494, 495, 572, -1, 
-          489, 494, 572, -1, 478, 489, 572, -1, 477, 478, 572, -1, 
-          573, 477, 572, -1, 571, 573, 572, -1, 568, 571, 572, -1, 
-          569, 574, 571, -1, 573, 571, 575, -1, 573, 575, 576, -1, 
-          564, 577, 578, -1, 566, 564, 578, -1, 518, 566, 578, -1, 
-          519, 518, 578, -1, 569, 519, 578, -1, 574, 569, 578, -1, 
-          577, 574, 578, -1, 577, 564, 579, -1, 580, 579, 564, -1, 
-          582, 581, 583, -1, 584, 582, 583, -1, 576, 584, 583, -1, 
-          573, 576, 583, -1, 477, 573, 583, -1, 476, 477, 583, -1, 
-          391, 476, 583, -1, 351, 391, 583, -1, 349, 351, 583, -1, 
-          348, 349, 583, -1, 581, 348, 583, -1, 585, 348, 581, -1, 
-          348, 586, 587, -1, 348, 587, 347, -1, 588, 347, 589, -1, 
-          590, 588, 589, -1, 591, 590, 589, -1, 586, 591, 589, -1, 
-          587, 586, 589, -1, 347, 587, 589, -1, 590, 591, 592, -1, 
-          593, 590, 592, -1, 594, 593, 592, -1, 595, 594, 592, -1, 
-          591, 595, 592, -1, 593, 594, 596, -1, 597, 593, 596, -1, 
-          588, 590, 598, -1, 588, 598, 599, -1, 601, 600, 599, -1, 
-          590, 593, 602, -1, 598, 590, 602, -1, 599, 598, 602, -1, 
-          601, 599, 602, -1, 603, 601, 602, -1, 597, 603, 602, -1, 
-          593, 597, 602, -1, 605, 604, 606, -1, 608, 607, 609, -1, 
-          609, 610, 606, -1, 611, 606, 610, -1, 605, 606, 611, -1, 
-          597, 596, 612, -1, 603, 597, 612, -1, 606, 603, 612, -1, 
-          609, 606, 612, -1, 608, 609, 612, -1, 596, 608, 612, -1, 
-          604, 580, 613, -1, 601, 603, 614, -1, 600, 601, 614, -1, 
-          613, 600, 614, -1, 604, 613, 614, -1, 606, 604, 614, -1, 
-          603, 606, 614, -1, 579, 580, 615, -1, 616, 579, 615, -1, 
-          617, 616, 615, -1, 605, 617, 615, -1, 604, 605, 615, -1, 
-          580, 604, 615, -1, 577, 579, 616, -1, 616, 618, 577, -1, 
-          574, 577, 618, -1, 619, 571, 574, -1, 619, 574, 618, -1, 
-          619, 618, 620, -1, 616, 617, 621, -1, 618, 616, 621, -1, 
-          620, 618, 621, -1, 622, 620, 621, -1, 623, 622, 621, -1, 
-          617, 623, 621, -1, 622, 623, 624, -1, 625, 620, 622, -1, 
-          626, 625, 622, -1, 611, 610, 627, -1, 605, 611, 627, -1, 
-          617, 605, 627, -1, 623, 617, 627, -1, 624, 623, 627, -1, 
-          628, 624, 627, -1, 629, 628, 627, -1, 610, 629, 627, -1, 
-          630, 584, 576, -1, 630, 576, 626, -1, 575, 626, 576, -1, 
-          625, 626, 631, -1, 620, 625, 631, -1, 619, 620, 631, -1, 
-          571, 619, 631, -1, 575, 571, 631, -1, 626, 575, 631, -1, 
-          632, 624, 628, -1, 633, 632, 634, -1, 635, 633, 634, -1, 
-          630, 632, 633, -1, 624, 632, 636, -1, 622, 624, 636, -1, 
-          626, 622, 636, -1, 630, 626, 636, -1, 632, 630, 636, -1, 
-          637, 581, 582, -1, 633, 635, 638, -1, 630, 633, 638, -1, 
-          584, 630, 638, -1, 582, 584, 638, -1, 637, 582, 638, -1, 
-          635, 637, 638, -1, 639, 585, 640, -1, 641, 639, 640, -1, 
-          634, 641, 640, -1, 640, 585, 642, -1, 634, 640, 642, -1, 
-          635, 634, 642, -1, 637, 635, 642, -1, 581, 637, 642, -1, 
-          585, 581, 642, -1, 644, 643, 639, -1, 644, 639, 645, -1, 
-          646, 644, 645, -1, 629, 646, 645, -1, 628, 629, 645, -1, 
-          632, 628, 645, -1, 634, 632, 645, -1, 641, 634, 645, -1, 
-          639, 641, 645, -1, 647, 607, 648, -1, 647, 648, 643, -1, 
-          649, 643, 648, -1, 609, 607, 650, -1, 610, 609, 650, -1, 
-          629, 610, 650, -1, 646, 629, 650, -1, 644, 646, 650, -1, 
-          643, 644, 650, -1, 647, 643, 650, -1, 607, 647, 650, -1, 
-          594, 595, 651, -1, 596, 594, 651, -1, 608, 596, 651, -1, 
-          607, 608, 651, -1, 648, 607, 651, -1, 595, 648, 651, -1, 
-          649, 586, 652, -1, 643, 649, 652, -1, 639, 643, 652, -1, 
-          585, 639, 652, -1, 348, 585, 652, -1, 586, 348, 652, -1, 
-          586, 649, 653, -1, 591, 586, 653, -1, 595, 591, 653, -1, 
-          648, 595, 653, -1, 649, 648, 653, -1, 319, 290, 291, -1, 
-          319, 291, 294, -1, 319, 294, 295, -1, 319, 295, 318, -1, 
-          318, 298, 301, -1, 301, 298, 299, -1, 381, 403, 404, -1, 
-          405, 384, 404, -1, 379, 384, 405, -1, 379, 405, 407, -1, 
-          380, 379, 407, -1, 394, 381, 402, -1, 408, 380, 407, -1, 
-          318, 295, 298, -1, 299, 298, 297, -1, 381, 404, 384, -1, 
-          257, 250, 256, -1]
-        }
-    }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/sky.jpg Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/subs.ismt Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/subtitle.srt Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/subtitle_fr.srt Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/svg2html.xslt Deleted

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    version = "1.0"
-    xmlns:xsl = "http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs = "http://www.w3.org/2001/XMLSchema"
-    xmlns:svg = "http://www.w3.org/2000/svg">
-    <xsl:output method = "xml" version = "1.0" encoding = "UTF-8" indent = "yes"/>
-    <xsl:param name = "filename"/>
-    <xsl:param name = "previous"/>
-    <xsl:param name = "next"/>
-    <xsl:param name = "use3d"/>
-    <xsl:param name = "snapshot1"/>
-    <xsl:param name = "snapshot2"/>
-    <xsl:param name = "snapshot3"/>
-    <xsl:param name = "snapshot4"/>
-    <xsl:param name = "snapshot5"/>
-    <xsl:param name = "snapshot6"/>
-    <xsl:param name = "title" select = "//svg:title"/>
-    <xsl:template match = "/">
-        <html>
-            <head>
-                <title>
-                    <xsl:value-of select = "$title"/>
-                </title>
-                <link rel = "stylesheet" type = "text/css" href = "index.css"/>
-            </head>
-            <body>
-                <h1 id = "title">
-                    <xsl:value-of select = "$title"/>
-                </h1>
-                <div id = "nav">
-                    <ul>
-                        <xsl:if test = "$previous">
-                            <li>
-                                <a href = "{$previous}.html">Previous</a>
-                            </li>
-                        </xsl:if>
-                        <li>
-                            <a href = "index.html">Index</a>
-                        </li>
-                        <xsl:if test = "$next">
-                            <li>
-                                <a href = "{$next}.html">Next</a>
-                            </li>
-                        </xsl:if>
-                    </ul>
-                </div>
-                <div id = "content">
-                    <div id = "left">                
-                        <div id = "downloadbar">
-                            <h2>Download</h2>
-                            <ul>
-                                <li><a href = "{$filename}.svg">SVG </a></li>
-                                <li><a href = "{$filename}.xsr">LASeRML </a></li>
-                                <li><a href = "{$filename}.mp4">LASeR (as MP4 file)</a></li>
-                                <li><a href = "{$filename}.saf">LASeR in SAF </a></li>
-                            </ul>
-                        </div>
-                        <div id = "description">
-                            <h2>Description</h2>
-                            <xsl:value-of select = "//svg:desc"/>
-                        </div>
-                    </div>
-                    <div id = "right">                
-                        <div id = "contentview">
-                            <h2>Viewer</h2>
-                            <object id = "player" type = "application/x-gpac"
-                                width = "100%"
-                                height = "100%"                                
-                                pluginspage = "http://tsi.enst.fr/~lefeuvre/GPAC/">
-                                <param name = "src" value = "{$filename}.svg"/>
-Your browser does not have the GPAC plugin installed, visit http://gpac.sourceforge.net for more information ...</object>
-                            
-                        </div>
-                    </div>
-                    <xsl:if test = "$snapshot1">
-                        <div id = "snapshotview">
-                            <h2>Snapshots</h2>
-                            <table>
-                                <tr>
-                                    <xsl:if test = "$snapshot1"><td>At time T = <xsl:value-of select="$snapshot1"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot2"><td>At time T = <xsl:value-of select="$snapshot2"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot3"><td>At time T = <xsl:value-of select="$snapshot3"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot4"><td>At time T = <xsl:value-of select="$snapshot4"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot5"><td>At time T = <xsl:value-of select="$snapshot5"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot6"><td>At time T = <xsl:value-of select="$snapshot6"/></td></xsl:if>
-                                </tr>
-                                <tr>
-                                    <xsl:if test = "$snapshot1">
-                                        <td><img src = "{$filename}_1.bmp" alt = "{concat('Snapshot #1 at time ',$snapshot1)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot2">
-                                        <td><img src = "{$filename}_2.bmp" alt = "{concat('Snapshot #2 at time ',$snapshot2)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot3">
-                                        <td><img src = "{$filename}_3.bmp" alt = "{concat('Snapshot #3 at time ',$snapshot3)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot4">
-                                        <td><img src = "{$filename}_4.bmp" alt = "{concat('Snapshot #4 at time ',$snapshot4)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot5">
-                                        <td><img src = "{$filename}_5.bmp" alt = "{concat('Snapshot #5 at time ',$snapshot5)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot6">
-                                        <td><img src = "{$filename}_6.bmp" alt = "{concat('Snapshot #6 at time ',$snapshot6)}"/></td>
-                                    </xsl:if>
-                                </tr>
-                            </table>
-                        </div>
-                    </xsl:if>
-                </div>
-            </body>
-        </html>
-    </xsl:template>
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/video.av1 Deleted

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/x3d2html.xslt Deleted

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    version = "1.0"
-    xmlns:xsl = "http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs = "http://www.w3.org/2001/XMLSchema">
-    <xsl:output method = "xml" version = "1.0" encoding = "UTF-8" indent = "yes"/>
-    <xsl:param name = "filename"/>
-    <xsl:param name = "previous"/>
-    <xsl:param name = "next"/>
-    <xsl:param name = "use3d"/>
-    <xsl:param name = "snapshot1"/>
-    <xsl:param name = "snapshot2"/>
-    <xsl:param name = "snapshot3"/>
-    <xsl:param name = "snapshot4"/>
-    <xsl:param name = "snapshot5"/>
-    <xsl:param name = "snapshot6"/>
-    <xsl:param name = "title" select = "//WorldInfo/@title"/>
-    <xsl:template match = "/">
-        <html>
-            <head>
-                <title>
-                    <xsl:value-of select = "$title"/>
-                </title>
-                <link rel = "stylesheet" type = "text/css" href = "index.css"/>
-            </head>
-            <body>
-                <h1 id = "title">
-                    <xsl:value-of select = "$title"/>
-                </h1>
-                <div id = "nav">
-                    <ul>
-                        <xsl:if test = "$previous">
-                            <li><a href = "{$previous}.html">Previous</a></li>
-                        </xsl:if>
-                        <li><a href = "index.html">Index</a></li>
-                        <xsl:if test = "$next">
-                            <li><a href = "{$next}.html">Next</a></li>
-                        </xsl:if>
-                    </ul>
-                </div>
-                <div id = "content">
-                    <div id = "left">                
-	                    <div id = "description">
-	                        <h2>Description</h2>
-	                        <xsl:call-template name = "WorldInfoDescriptionToParagraph"><xsl:with-param name = "string" select = "substring-after(//WorldInfo/@info, '&quot;')"/></xsl:call-template>
-	                    </div>
-                        <div id = "downloadbar">
-							<h2>Download</h2>
-                            <ul>
-                                <li><a href = "{$filename}.x3dv">X3DV (VRML-like)</a></li>
-                                <li><a href = "{$filename}.x3d">X3D (XML)</a></li>
-                            </ul>
-                        </div>
-					</div>
-					<div id = "right">
-	                    <div id = "contentview">
-	                        <h2>Viewer</h2>
-	                        <object id = "player" type = "application/x-gpac"
-	                            width = "100%"
-	                            height = "100%"	                            
-	                            pluginspage = "http://tsi.enst.fr/~lefeuvre/GPAC/">
-	                            <param name = "src" value = "{$filename}.x3d"/>
-	                            <param name = "use3d" value = "true"/>
-Your browser does not have the GPAC plugin installed, visit http://gpac.sourceforge.net for more information ...</object>	                        
-                          
-	                    </div>
-					</div>
-                    <xsl:if test = "$snapshot1">
-                        <div id = "snapshotview">
-                            <h2>Snapshots</h2>
-                            <table>
-                                <tr>
-                                    <xsl:if test = "$snapshot1"><td>At time T = <xsl:value-of select="$snapshot1"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot2"><td>At time T = <xsl:value-of select="$snapshot2"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot3"><td>At time T = <xsl:value-of select="$snapshot3"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot4"><td>At time T = <xsl:value-of select="$snapshot4"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot5"><td>At time T = <xsl:value-of select="$snapshot5"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot6"><td>At time T = <xsl:value-of select="$snapshot6"/></td></xsl:if>
-                                </tr>
-                                <tr>
-                                    <xsl:if test = "$snapshot1">
-                                        <td><img src = "{$filename}_1.bmp" alt = "{concat('Snapshot #1 at time ',$snapshot1)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot2">
-                                        <td><img src = "{$filename}_2.bmp" alt = "{concat('Snapshot #2 at time ',$snapshot2)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot3">
-                                        <td><img src = "{$filename}_3.bmp" alt = "{concat('Snapshot #3 at time ',$snapshot3)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot4">
-                                        <td><img src = "{$filename}_4.bmp" alt = "{concat('Snapshot #4 at time ',$snapshot4)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot5">
-                                        <td><img src = "{$filename}_5.bmp" alt = "{concat('Snapshot #5 at time ',$snapshot5)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot6">
-                                        <td><img src = "{$filename}_6.bmp" alt = "{concat('Snapshot #6 at time ',$snapshot6)}"/></td>
-                                    </xsl:if>
-                                </tr>
-                            </table>
-                        </div>
-                    </xsl:if>
-                </div>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template name = "WorldInfoDescriptionToParagraph">
-        <xsl:param name = "string"/>
-        <xsl:choose>
-            <xsl:when test = "contains($string,'&quot; &quot;')">
-                <p>
-                <xsl:value-of select = "substring-before($string,'&quot; &quot;')"/>
-                </p>
-                <xsl:call-template name = "WorldInfoDescriptionToParagraph">
-                    <xsl:with-param name = "string" select = "substring-after($string,'&quot; &quot;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <p>
-                <xsl:value-of select = "substring-before($string,'&quot;')"/>
-                </p>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/tests/media/auxiliary_files/xmt2html.xslt Deleted

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-    version = "1.0"
-    xmlns:xsl = "http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs = "http://www.w3.org/2001/XMLSchema"
-    xmlns:xmt = "urn:mpeg:mpeg4:xmta:schema:2002">
-    <xsl:output method = "xml" version = "1.0" encoding = "UTF-8" indent = "yes"/>
-    <xsl:param name = "filename"/>
-    <xsl:param name = "previous"/>
-    <xsl:param name = "next"/>
-    <xsl:param name = "use3d"/>
-    <xsl:param name = "snapshot1"/>
-    <xsl:param name = "snapshot2"/>
-    <xsl:param name = "snapshot3"/>
-    <xsl:param name = "snapshot4"/>
-    <xsl:param name = "snapshot5"/>
-    <xsl:param name = "snapshot6"/>
-    <xsl:param name = "title" select = "//xmt:WorldInfo/@title"/>
-    <xsl:template match = "/">
-        <html>
-            <head>
-                <title>
-                    <xsl:value-of select = "$title"/>
-                </title>
-                <link rel = "stylesheet" type = "text/css" href = "index.css"/>
-            </head>
-            <body>
-                <h1 id = "title">
-                    <xsl:value-of select = "$title"/>
-                </h1>
-                <div id = "nav">
-                    <ul>
-                        <xsl:if test = "$previous">
-                            <li>
-                                <a href = "{$previous}.html">Previous</a>
-                            </li>
-                        </xsl:if>
-                        <li>
-                            <a href = "index.html">Index</a>
-                        </li>
-                        <xsl:if test = "$next">
-                            <li>
-                                <a href = "{$next}.html">Next</a>
-                            </li>
-                        </xsl:if>
-                    </ul>
-                </div>
-                <div id = "content">
-                    <div id = "left">                
-                        <div id = "downloadbar">
-                            <h2>Download</h2>
-                            <ul>
-                                <li><a href = "{$filename}.mp4">BIFS/MP4</a></li>
-                                <li><a href = "{$filename}.bt">BT</a></li>
-                                <li><a href = "{$filename}.xmt">XMT-A</a></li>
-                            </ul>
-                        </div>
-                        <div id = "description">
-                            <h2>Description</h2>
-                            <xsl:call-template name = "xmtDescriptionToParagraph"><xsl:with-param name = "string" 
-                            select = "substring-after(//xmt:WorldInfo/@info, '&quot;')"/></xsl:call-template>
-                        </div>
-                    </div>
-                    <div id = "right">                
-                        <div id = "contentview">
-                            <h2>Viewer</h2>
-                            <object id = "player" type = "application/x-gpac"
-                                width = "{//xmt:commandStream/xmt:size/@pixelWidth}" 
-                                height = "{//xmt:commandStream/xmt:size/@pixelHeight}"                                                           
-                                pluginspage = "http://tsi.enst.fr/~lefeuvre/GPAC/"
-                                style="max-width: 100%; max-height: 100%;">
-                                <param name = "src" value = "{$filename}.mp4"/>
-                                <xsl:if test = "$use3d"><param name = "use3d" value = "true"/></xsl:if>
-Your browser does not have the GPAC plugin installed, visit http://gpac.sourceforge.net for more information ...</object>
-                            
-                        </div>
-                    </div>
-                    <xsl:if test = "$snapshot1">
-                        <div id = "snapshotview">
-                            <h2>Snapshots</h2>
-                            <table>
-                                <tr>
-                                    <xsl:if test = "$snapshot1"><td>At time T = <xsl:value-of select="$snapshot1"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot2"><td>At time T = <xsl:value-of select="$snapshot2"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot3"><td>At time T = <xsl:value-of select="$snapshot3"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot4"><td>At time T = <xsl:value-of select="$snapshot4"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot5"><td>At time T = <xsl:value-of select="$snapshot5"/></td></xsl:if>
-                                    <xsl:if test = "$snapshot6"><td>At time T = <xsl:value-of select="$snapshot6"/></td></xsl:if>
-                                </tr>
-                                <tr>
-                                    <xsl:if test = "$snapshot1">
-                                        <td><img src = "{$filename}_1.bmp" alt = "{concat('Snapshot #1 at time ',$snapshot1)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot2">
-                                        <td><img src = "{$filename}_2.bmp" alt = "{concat('Snapshot #2 at time ',$snapshot2)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot3">
-                                        <td><img src = "{$filename}_3.bmp" alt = "{concat('Snapshot #3 at time ',$snapshot3)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot4">
-                                        <td><img src = "{$filename}_4.bmp" alt = "{concat('Snapshot #4 at time ',$snapshot4)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot5">
-                                        <td><img src = "{$filename}_5.bmp" alt = "{concat('Snapshot #5 at time ',$snapshot5)}"/></td>
-                                    </xsl:if>
-                                    <xsl:if test = "$snapshot6">
-                                        <td><img src = "{$filename}_6.bmp" alt = "{concat('Snapshot #6 at time ',$snapshot6)}"/></td>
-                                    </xsl:if>
-                                </tr>
-                            </table>
-                        </div>
-                    </xsl:if>
-                    <div id = "codeview">
-                        <h2>XMT Code</h2>
-                        <object data="{$filename}.xmt" type="application/xml">
-Your browser does not support inline objects. You cannot view the XMT code, use the download link instead.
-                        </object>
-                    </div>
-                </div>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template name = "xmtDescriptionToParagraph">
-        <xsl:param name = "string"/>
-        <xsl:choose>
-            <xsl:when test = "contains($string,'&quot; &quot;')">
-        				<p>
-                <xsl:call-template name="xmtCfToA">
-        					<xsl:with-param name="string"><xsl:value-of select = "substring-before($string,'&quot; &quot;')"/></xsl:with-param>
-        				</xsl:call-template>
-                </p>
-                <xsl:call-template name = "xmtDescriptionToParagraph">
-                    <xsl:with-param name = "string" select = "substring-after($string,'&quot; &quot;')"/>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <p>
-        				<xsl:call-template name="xmtCfToA">
-        					<xsl:with-param name="string"><xsl:value-of select = "substring-before($string,'&quot;')"/></xsl:with-param>
-        				</xsl:call-template>
-                </p>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-    <xsl:template name = "xmtCfToA">
-        <xsl:param name = "string"/>
-        <xsl:choose>
-            <xsl:when test = "contains($string,'cf ')">
-        				<xsl:variable name="astring"><xsl:value-of select = "substring-after($string,'cf ')"/></xsl:variable>
-                See also <a><xsl:attribute name="href"><xsl:value-of select="$astring"/>.html</xsl:attribute><xsl:value-of select="$astring"/></a>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select = "$string"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/tests/media/bifs Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-background-background2D-bind.bt Deleted

@@ -1,71 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   backColor $FFFFFF
-  }
-  DEF B2 Background2D {
-   backColor 1 0 0
-  }
-  WorldInfo {
-   info [
-    "This shows 2 Background2D nodes and the bind mechanism" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:37:08 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Background Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE B1.set_bind BY TRUE
-   }
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE B2.set_bind BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO C2.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-background-background2D-image.bt Deleted

@@ -1,97 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   url [od:10]
-  }
-  DEF B2 Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Background2D with image" "and binding mechanism" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE B1.set_bind BY TRUE
-   }
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE B2.set_bind BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO C2.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-AT 1000 {
- REPLACE B2.set_bind BY TRUE
-}
-
-AT 2000 {
- REPLACE B1.set_bind BY TRUE
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-background-background2D-layer2D.bt Deleted

@@ -1,92 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Background2D within a layer2D" "Note that the background is stretched to the layer size" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    DEF L Layer2D {
-     size 400 300
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         filled TRUE
-         transparency 0
-        }
-       }
-       geometry DEF RC Rectangle {
-        size 200 100
-       }
-      }
-     ]
-     background Background2D {
-      url [od:10]
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.75 1]
-   keyValue [400 300 0 0 0 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO L.size
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-background-background2D-movie.bt Deleted

@@ -1,94 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   url [od:10]
-  }
-  DEF B2 Background2D {
-   backColor 1 1 1
-  }
-  MediaControl {
-   url [od:10]
-   loop TRUE
-  }
-  WorldInfo {
-   info ["This shows Background2D with image" "and binding mechanism" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE B1.set_bind BY TRUE
-   }
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE B2.set_bind BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO C2.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-background-background2D-url-change.bt Deleted

@@ -1,105 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   url [od:20]
-  }
-  WorldInfo {
-   info ["This shows Background2D with dynamic image change" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE B1.url BY ["od:20"]
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE B1.url BY ["od:10"]
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO RC1.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-AT 2000 {
- REPLACE B1.url BY ["od:20"]
-}
-
-AT 4000 {
- REPLACE B1.url BY ["od:10"]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-discsensor.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the use of the disc sensor which computes the angle in the mouse motion between mouse down and mouse up."
-    "It also uses the auto-offset field, which allows storing reusing the angle from the previous mouse up."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "DiscSensor"
-  }
-  DEF T1 Transform2D {
-   scale 1 2
-   scaleOrientation 0.75
-   translation -150 0
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF DS1 DiscSensor {}
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Auto-offset on"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-  DEF T2 Transform2D {
-   scale 1 2
-   scaleOrientation 0.75
-   translation 150 0
-   children [
-    USE S
-    DEF DS2 DiscSensor {
-     autoOffset FALSE
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Auto-offset off"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE DS1.rotation_changed TO T1.rotationAngle
-ROUTE DS2.rotation_changed TO T2.rotationAngle
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-htk-sensor.bt Deleted

@@ -1,175 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of String Sensor" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002 ENST"]
-   title "InputSensor Test - StringSensor device"
-  }
-  Transform2D {
-   translation 0 90
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["HTKSensor"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 30
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 20
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["spoken Text"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 20
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF T2 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -20
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["text index in dict"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -20
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF T3 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Recogn Score"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF T4 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF VN3 Valuator {
-   Factor2 0
-   Factor3 0
-  }
-  DEF VN4 Valuator {
-   Factor2 0
-   Factor3 0
-  }
-  InputSensor {
-   url [od:10]
-   buffer {
-    REPLACE T2.string[0] BY ""
-    REPLACE VN3.inSFInt32 BY 0
-    REPLACE VN4.inSFFloat BY 0
-   }
-  }
- ]
-}
-
-ROUTE VN3.outMFString TO T3.string
-ROUTE VN4.outMFString TO T4.string
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      decConfigDescr DecoderConfigDescriptor {
-       streamType 10
-       decSpecificInfo UIConfig {
-        deviceName "HTKSensor"
-        uiData "HTK:BLEU vcl bb ll eu sp;ROUGE rr ou jj sp;VERT vv ai rr sp"
-       }
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-keysensor.bt Deleted

@@ -1,810 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 600
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows usage of the InputSensor node to detect keys and trigger of events"
-    "The InputSensor in this case has a url which points to a specific pseudo-media object. This object contains one stream, called interaction stream."
-    "This stream is made of Device Data Frame whose content is specialized depending on the kind of input device."
-    "The InputSensor node in the scene specifies how to dispatch the content of the DDF."
-    "For each piece of information in the DDF, a REPLACE command is associated."
-    "The value of the target property is replaced by the associated content from the DDF."
-    "" 
-    "If the configuration of the stream says 'KeySensor', like here, the input device is a keyboard and the DDF content is as follows:"
-    "- the key code for the pressed key (0 if none)," 
-    "- the key code for the released key (0 if none),"
-    "- the key code for the action key (F1, ...) pressed (0 if none),"
-    "- the key code for the action key (F1, ...) released (0 for none),"
-    "- and the state of the modifier keys (CTRL, ALT and Shift)." 
-    "In this example, the target nodes are Valuator nodes which cast the key code into the char representation, and the result is displayed." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "InputSensor Node for detecting keys (KeySensor)"
-  }
-  DEF N33 Switch {
-   choice [
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.5 0.5 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.5 1 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 1 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 1 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Group {
-     children [
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 200 200
-         }
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  DEF N10 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 0
-   }
-  }
-  Group {
-   children [
-    DEF N12 TouchSensor {}
-    Transform2D {
-     translation -195 -120
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 1 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance DEF N29 Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["F1"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N20 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 1
-   }
-  }
-  Group {
-   children [
-    DEF N19 TouchSensor {}
-    Transform2D {
-     translation -195 0
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0.5 0.5 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F2"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N23 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 2
-   }
-  }
-  Group {
-   children [
-    DEF N9 TouchSensor {}
-    Transform2D {
-     translation -195 120
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0.5 1 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F3"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N14 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 3
-   }
-  }
-  Group {
-   children [
-    DEF N31 TouchSensor {}
-    Transform2D {
-     translation -195 240
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0.5 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F4"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N15 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 4
-   }
-  }
-  Group {
-   children [
-    DEF N25 TouchSensor {}
-    Transform2D {
-     translation 195 -120
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F5"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N16 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 5
-   }
-  }
-  Group {
-   children [
-    DEF N11 TouchSensor {}
-    Transform2D {
-     translation 195 0
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F6"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N17 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 6
-   }
-  }
-  Group {
-   children [
-    DEF N18 TouchSensor {}
-    Transform2D {
-     translation 195 120
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F7"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF N27 Conditional {
-   buffer {
-    REPLACE N33.whichChoice BY 7
-   }
-  }
-  Group {
-   children [
-    DEF N13 TouchSensor {}
-    Transform2D {
-     translation 195 240
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      Shape {
-       appearance USE N29
-       geometry Text {
-        string ["F8"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -120
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["KeySensor"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 30
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -150
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["KeyPress"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -150
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N32 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -170
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["KeyRelease"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -170
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N30 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -190
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["ActionKeyPress"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -190
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N28 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -210
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["ActionKeyRelease"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -210
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N26 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -230
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["shiftKey_changed"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -230
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N24 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -250
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["controlKey_changed"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -250
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N22 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -270
-   children [
-    Shape {
-     appearance USE N29
-     geometry Text {
-      string ["altKey_changed"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -270
-   children [
-    Shape {
-     appearance USE N29
-     geometry DEF N21 Text {
-      string ["0"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF N3 Valuator {}
-  DEF N7 Valuator {
-   Offset1 -1
-  }
-  DEF N6 Valuator {}
-  DEF N5 Valuator {}
-  DEF N4 Valuator {}
-  DEF N2 Valuator {}
-  DEF N1 Valuator {}
-  DEF N0 Valuator {}
-  InputSensor {
-   url [od:10]
-   buffer {
-    REPLACE N6.inSFInt32 BY 0
-    REPLACE N5.inSFInt32 BY 0
-    REPLACE N3.inSFInt32 BY 0
-    REPLACE N4.inSFInt32 BY 0
-    REPLACE N2.inSFBool BY TRUE
-    REPLACE N1.inSFBool BY TRUE
-    REPLACE N0.inSFBool BY TRUE
-   }
-  }
-  Group {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Rectangle {
-        size 200 200
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE N6.outMFString TO N32.string
-ROUTE N5.outMFString TO N30.string
-ROUTE N4.outMFString TO N26.string
-ROUTE N2.outMFString TO N24.string
-ROUTE N1.outMFString TO N22.string
-ROUTE N0.outMFString TO N21.string
-ROUTE N3.outSFInt32 TO N7.inSFInt32
-ROUTE N3.outMFString TO N28.string
-ROUTE N7.outSFInt32 TO N33.whichChoice
-ROUTE N12.isActive TO N10.activate
-ROUTE N19.isActive TO N20.activate
-ROUTE N9.isActive TO N23.activate
-ROUTE N31.isActive TO N14.activate
-ROUTE N25.isActive TO N15.activate
-ROUTE N11.isActive TO N16.activate
-ROUTE N18.isActive TO N17.activate
-ROUTE N13.isActive TO N27.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      decConfigDescr DecoderConfigDescriptor {
-       streamType 10
-       decSpecificInfo UIConfig {
-        deviceName "KeySensor"
-       }
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-mousesensor.bt Deleted

@@ -1,182 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 600
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows usage of the InputSensor node to detect keys and trigger of events"
-    "The InputSensor in this case has a url which points to a specific pseudo-media object. This object contains one stream, called interaction stream."
-    "This stream is made of Device Data Frame whose content is specialized depending on the kind of input device."
-    "The InputSensor node in the scene specifies how to dispatch the content of the DDF."
-    "For each piece of information in the DDF, a REPLACE command is associated."
-    "The value of the target property is replaced by the associated content from the DDF."
-    "" 
-    "If the configuration of the stream says 'MouseSensor', like here, the input device is a mouse and the DDF content is as follows:"
-    "- the mouse position," 
-    "- the status of the left button," 
-    "- the status of the middle button," 
-    "- the status of the right button," 
-    "- and the status of the wheel." 
-    "This configuration allows doing different things than the TouchSensor because the TouchSensor cannot give information about the buttons, or the wheel. On the other hand, it can be triggered based on sibling geometry, which is not the case of the InputSensor node in MouseSensor mode." 
-    "In this example, the result of the InputSensor node triggers ECMAScript actions." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "InputSensor Node for mouse events (MouseSensor)"
-  }
-  Transform2D {
-   translation -120 -100
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT1 Text {
-      string ["Left Down" ""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT2 Text {
-      string ["Middle Down" ""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -100
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT3 Text {
-      string ["Right Down" ""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT4 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFBool set_left
-   eventIn SFBool set_middle
-   eventIn SFBool set_right
-   eventIn SFFloat set_wheel
-   field SFFloat wheel_pos 0
-   field SFNode t1 USE TXT1
-   field SFNode t2 USE TXT2
-   field SFNode t3 USE TXT3
-   field SFNode t4 USE TXT4
-   url ["javascript:function set_left(value, timestamp) {t1.string[1] = '' + value;}function set_middle(value, timestamp) {t2.string[1] = '' + value;}function set_right(value, timestamp) {t3.string[1] = '' + value;}function set_wheel(value, timestamp) {wheel_pos += value;t4.string[0] = 'Wheel Pos ' + wheel_pos;}"   ]
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:2]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
-  InputSensor {
-   url [od:10]
-   buffer {
-    REPLACE TR.translation BY 0 0
-    REPLACE SC.set_left BY FALSE
-    REPLACE SC.set_middle BY FALSE
-    REPLACE SC.set_right BY FALSE
-    REPLACE SC.set_wheel BY 0
-   }
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 2
-    esDescr [
-     ES_Descriptor {
-      ES_ID 3
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.png"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      decConfigDescr DecoderConfigDescriptor {
-       streamType 10
-       decSpecificInfo UIConfig {
-        deviceName "Mouse"
-       }
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-nested-sensors.bt Deleted

@@ -1,123 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a mixed usage of TouchSensor and PlaneSensor2D nodes on a single shape."
-    "In some circumstances, the object can be dragged and in some other, it can be clicked." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Nested Sensors"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["PlaneSensor2D and TouchSensor:" "Drag the shape on the blue part" "and click on the center"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF T1 Transform2D {
-   children [
-    DEF TS TouchSensor {}
-    DEF PS PlaneSensor2D {
-     maxPosition 200 200
-     minPosition -200 -200
-    }
-    Shape {
-     appearance DEF A1 Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 60
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M2 Material2D {
-         emissiveColor 1 0 1
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 40
-       }
-      }
-      DEF TS2 TouchSensor {}
-     ]
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE M1.filled BY FALSE
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE M1.filled BY TRUE
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE M2.emissiveColor BY 0 1 0
-   }
-  }
-  DEF C4 Conditional {
-   buffer {
-    REPLACE M2.emissiveColor BY 1 0 1
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO C2.reverseActivate
-ROUTE TS2.isActive TO C3.activate
-ROUTE TS2.isActive TO C4.reverseActivate
-ROUTE PS.translation_changed TO T1.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-planesensor2D.bt Deleted

@@ -1,124 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the use of the PlaneSensor2D node, and its auto-offset property." 
-    "The PlaneSensor2D is used to detect mouse motion between mouse down and mouse up." 
-    "This allows to move objects between mouse down and mouse up." 
-    "The auto-offset is used to automatically store the mouse position at mouse release and use it as the offset to the next translation." 
-    "This tests shows two images (clipped by circles) which can be dragged." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"]
-   title "PlaneSensor2D for dragging objects"
-  }
-  DEF T1 Transform2D {
-   translation -150 0
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Auto-offset on"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE"]
-       size 24
-      }
-     }
-    }
-    DEF PS1 PlaneSensor2D {
-     maxPosition 200 200
-     minPosition -200 -200
-     offset -150 0
-    }
-   ]
-  }
-  DEF T2 Transform2D {
-   translation 150 0
-   children [
-    USE S
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Auto-offset off"]
-      fontStyle USE FS
-     }
-    }
-    DEF PS2 PlaneSensor2D {
-     autoOffset FALSE
-     maxPosition 200 200
-     minPosition -200 -200
-     offset 150 0
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS1.translation_changed TO T1.translation
-ROUTE PS2.translation_changed TO T2.translation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-proximitysensor2D.bt Deleted

@@ -1,89 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the ProximitySensor2D node"
-    "Two ProximitySensor2D nodes are placed on a single shape. The Shape is a 300x300 rectangle, and the ProximitySensor2D nodes define two areas centered on the rectangle: a 50x50 rectangle and a 200x200 rectangle." 
-    "When the mouse enters or exits an area, an action is triggered."
-    "Here, nothing happens when the mouse enters the object, then it turns red if the mouse enters the first area, and it turns empty if the mouse enters the second area." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ProximitySensor2D"
-  }
-  DEF T1 Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 0.5 0.6 0.4
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 300 300
-     }
-    }
-    DEF PSOUT ProximitySensor2D {
-     size 200 200
-    }
-    DEF PSIN ProximitySensor2D {
-     size 50 50
-    }
-   ]
-  }
-  DEF CIN Conditional {
-   buffer {
-    REPLACE M1.filled BY FALSE
-   }
-  }
-  DEF RCIN Conditional {
-   buffer {
-    REPLACE M1.filled BY TRUE
-   }
-  }
-  DEF COUT Conditional {
-   buffer {
-    REPLACE M1.emissiveColor BY 1 0 0
-   }
-  }
-  DEF RCOUT Conditional {
-   buffer {
-    REPLACE M1.emissiveColor BY 0.5 0.6 0.4
-   }
-  }
- ]
-}
-
-ROUTE PSOUT.isActive TO COUT.activate
-ROUTE PSOUT.isActive TO RCOUT.reverseActivate
-ROUTE PSIN.isActive TO CIN.activate
-ROUTE PSIN.isActive TO RCIN.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-stringsensor.bt Deleted

@@ -1,153 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows usage of the InputSensor node to detect keys and trigger of events"
-    "The InputSensor in this case has a url which points to a specific pseudo-media object. This object contains one stream, called interaction stream."
-    "This stream is made of Device Data Frame whose content is specialized depending on the kind of input device."
-    "The InputSensor node in the scene specifies how to dispatch the content of the DDF."
-    "For each piece of information in the DDF, a REPLACE command is associated."
-    "The value of the target property is replaced by the associated content from the DDF."
-    "" 
-    "If the configuration of the stream says 'StringSensor', like here, the input device is a keyboard and the DDF content is as follows:"
-    "- the string being edited/input," 
-    "and the previous string after final editing (return key)"
-    "In this example, the target nodes are Text nodes which display the string being edited and the final one." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "InputSensor Node for detecting string input (StringSensor)"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["StringSensor"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 30
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -30
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["enteredText"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -30
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF N3 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["finalText"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 90 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF N2 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  InputSensor {
-   url [od:10]
-   buffer {
-    REPLACE N3.string[0] BY ""
-    REPLACE N2.string[0] BY ""
-   }
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      decConfigDescr DecoderConfigDescriptor {
-       streamType 10
-       decSpecificInfo UIConfig {
-        deviceName "StringSensor"
-       }
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-4states.bt Deleted

@@ -1,103 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 140
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This shows how to make a 4 states button" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "4 States Button"
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 0 60
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      DEF TS1 TouchSensor {}
-     ]
-    }
-    Transform2D {
-     translation -100 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M1 Material2D {
-         emissiveColor 1 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 50
-       }
-      }
-     ]
-    }
-    DEF OverC Conditional {
-        buffer {
-            REPLACE M1.emissiveColor BY 1 1 0
-        }
-    }
-    DEF OverRC Conditional {
-        buffer {
-            REPLACE M1.emissiveColor BY 0 1 1
-        }
-    }
-    DEF C Conditional {
-        buffer {
-            REPLACE M1.emissiveColor BY 1 0 0
-        }
-    }
-    DEF RC Conditional {
-        buffer {
-            REPLACE M1.emissiveColor BY 0 0 1
-        }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C.activate
-ROUTE TS1.isActive TO RC.reverseActivate
-ROUTE TS1.isOver TO OverC.activate
-ROUTE TS1.isOver TO OverRC.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-hitpoint.bt Deleted

@@ -1,91 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 254
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [   
-    "This test shows how to retrieve the mouse position when it is moved."
-    "The TouchSensor node generates the hitPoint event, which is a 3D point, when the mouse moves. This can be used in scripts to trigger actions." 
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "TouchSensor & hitPoint"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {}
-
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 198 198
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 0 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 16
-      }
-     }
-    }
-   ]
-  }
-  DEF V Valuator {
-   Factor3 0
-  }
- ]
-}
-
-ROUTE TS.hitPoint_changed TO V.inSFVec3f
-ROUTE V.outMFString TO TXT.string
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-isactive-exposedfield.bt Deleted

@@ -1,99 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 140
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [   
-    "This test shows a TouchSensor node used to modify the filled property of 2 Material2D nodes."
-    "cf bifs-2D-interactivity-touchsensor-isactive" 
-    "The difference with the above test is the event propagation. Instead of routing the TouchSensor isActive event to both Material2D node, the event is only sent to one Material2D node, but since the emissiveColor field is an exposedField, it generate in turns a new event and that event is routed to the second Material2D node." 
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "TouchSensor, isActive & Event Propagation"
-
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 0 60
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      DEF TS1 TouchSensor {}
-      DEF TS2 TouchSensor {}
-     ]
-    }
-    Transform2D {
-     translation -100 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M1 Material2D {
-         emissiveColor 1 1 0
-        }
-       }
-       geometry Circle {
-        radius 50
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 100 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M2 Material2D {
-         emissiveColor 0 1 1
-        }
-       }
-       geometry Circle {
-        radius 50
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE TS1.isActive TO M1.filled
-ROUTE M1.filled TO M2.filled
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-isactive.bt Deleted

@@ -1,98 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 140
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a TouchSensor node used to modify the filled property of 2 Material2D nodes." 
-    "The TouchSensor node sends an isActive event each time a Mouse Button is pressed. The value of the event is TRUE if the Mouse is over a sibling shape of the TouchSensor node. Otherwise it is FALSE." 
-    "In this example, the event value is routed to the filled property of 2 different circles. So, when the mouse is clicked on the square, both circled are filled and when the mouse is released, both circles become empty."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "TouchSensor & isActive"
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 0 60
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 100
-       }
-      }
-      DEF TS1 TouchSensor {}
-      DEF TS2 TouchSensor {}
-     ]
-    }
-    Transform2D {
-     translation -100 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M1 Material2D {
-         emissiveColor 1 1 0
-        }
-       }
-       geometry Circle {
-        radius 50
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 100 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material DEF M2 Material2D {
-         emissiveColor 0 1 1
-        }
-       }
-       geometry Circle {
-        radius 50
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE TS1.isActive TO M1.filled
-ROUTE TS2.isActive TO M2.filled
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-isover.bt Deleted

@@ -1,59 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 260
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a TouchSensor node used to modify the filled property of a Material2D node." 
-    "The TouchSensor node sends an isOver event when the Mouse enters or exits the region delimited by a Shape node, sibling of the TouchSensor node. The value is TRUE, when it enters, and FALSE when it leaves." 
-    "In this example, the TouchSensor has only one sibling a rectangle, which turns empty when the mouse is not over it."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "TouchSensor & isOver"
-  }
-  Transform2D {
-   children [
-    DEF TS TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 0 0 1
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE TS.isOver TO M1.filled
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-interactivity-touchsensor-move_over.bt Deleted

@@ -1,268 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 254
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [   
-    "This test shows how a TouchSensor node and a TimeSensor can be used to make a new Event called MoveOver, which is TRUE when the mouse moves over a Shape or FALSE when the mouse has not moved over the Shape for a certain period of time." 
-    "This is an example to show how new events can be created based on existing tools and events (no scripting). This particular event simulates the Lingo MouseWithin event. "
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Move Over"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF V_ISOVER_TO_FACTOR Valuator {
-  }
-  DEF V_HITPOINT_CHANGED_TO_ONE Valuator {
-    Factor1 0
-    Offset1 1
-  }
-  DEF DUMMY_TIMER TimeSensor { enabled FALSE }  
-  DEF T TimeSensor {
-    cycleInterval 1
-    loop TRUE
-    startTime -1
-  }
-  DEF STOP_TIME_OFFSETER Valuator { Offset1 0.1 } # minimum duration between two mouse move
-  
-  DEF START_TIMER Conditional {
-    buffer {
-        REPLACE DUMMY_TIMER.startTime BY 0
-        REPLACE T.startTime BY 0
-    }
-  }
-  DEF VALUATOR Valuator {
-  }
-  DEF V_MOVE_OVER Valuator {
-  }
-  DEF OUT Conditional {
-    buffer {
-        REPLACE T.stopTime BY 0
-    }
-  }
-  DEF C Conditional {
-    buffer {
-        REPLACE M.emissiveColor BY 0 1 0
-    }
-  }
-  DEF RC Conditional {
-    buffer {
-        REPLACE M.emissiveColor BY 1 0 0
-    }
-  }
-  Transform2D {
-    translation 20 60
-    children [
-      Transform2D {
-        translation -80 0
-        children [
-          Transform2D {
-            translation 0 20
-            children [
-              Shape {
-                appearance DEF TEXT_APP Appearance { material Material2D { emissiveColor 0 0 0 filled TRUE } }
-                geometry Text {
-                    string "Mouse Over   & "
-                    fontStyle DEF TEXT_STYLE FontStyle { size 10 family "SANS" justify ["MIDDLE" "MIDDLE" ] }
-                }
-              }
-            ]
-          }
-          Shape {
-            appearance USE TEXT_APP
-            geometry DEF MOUSE_OVER_TEXT Text {
-                fontStyle USE TEXT_STYLE 
-            }
-          }
-        ]
-      }
-      Transform2D {
-        translation -10 0
-        children [
-          Transform2D {
-            translation 0 20
-            children [
-              Shape {
-                appearance USE TEXT_APP 
-                geometry Text {
-                    string [ " Mouse has " " moved recently  =" ]
-                    fontStyle USE TEXT_STYLE
-                }
-              }
-            ]
-          }
-          Shape {
-            appearance USE TEXT_APP
-            geometry DEF TIMER_STATUS_TEXT Text {
-                fontStyle USE TEXT_STYLE 
-            }
-          }
-        ]
-      }
-      Transform2D {
-        translation 60 0
-        children [
-          Transform2D {
-            translation 0 20
-            children [
-              Shape {
-                appearance USE TEXT_APP 
-                geometry Text {
-                    string [ "Result" "Move Over" ]
-                    fontStyle USE TEXT_STYLE 
-                }
-              }
-            ]
-          }
-          Shape {
-            appearance USE TEXT_APP
-            geometry DEF RESULT_TEXT Text {
-                fontStyle USE TEXT_STYLE 
-            }
-          }
-        ]
-      }
-    ]
-  }
-#  Transform2D {
-#    translation -60 -80
-#    children [
-#      Transform2D {
-#        translation 0 0
-#        children [
-#          Transform2D {
-#            translation 0 20
-#            children [
-#              Shape {
-#                appearance USE TEXT_APP 
-#                geometry Text {
-#                    string "Start Time"
-#                    fontStyle USE TEXT_STYLE
-#                }
-#              }
-#            ]
-#          }
-#          Shape {
-#            appearance USE TEXT_APP
-#            geometry DEF START_TIME_TEXT Text {
-#                fontStyle USE TEXT_STYLE 
-#            }
-#          }
-#        ]
-#      }
-#      Transform2D {
-#        translation 60 0
-#        children [
-#          Transform2D {
-#            translation 0 20
-#            children [
-#              Shape {
-#                appearance USE TEXT_APP 
-#                geometry Text {
-#                    string "Stop Time"
-#                    fontStyle USE TEXT_STYLE 
-#                }
-#              }
-#            ]
-#          }
-#          Shape {
-#            appearance USE TEXT_APP
-#            geometry DEF STOP_TIME_TEXT Text {
-#                fontStyle USE TEXT_STYLE 
-#            }
-#          }
-#        ]
-#      }
-#    ]
-#  }
-#  DEF V_START_TIME Valuator {Factor1 100}
-#  DEF V_STOP_TIME Valuator {Factor1 100}
- ]
-}
-
-# These two routes do the following: 
-# read the startTime field of a DUMMY_TIMER (which is equal to NOW because, has been replaced by 0)
-# offset this value by the appropriate delay
-# set the stoptime value of the real timer
-ROUTE DUMMY_TIMER.startTime TO STOP_TIME_OFFSETER.inSFTime
-ROUTE STOP_TIME_OFFSETER.outSFTime TO T.stopTime
-
-# This is a route to force the stop of the timer when the mouse exits the shape
-ROUTE TS.isOver TO OUT.reverseActivate
-
-# These 2 routes convert the isOver (a boolean) into a float 
-# and stores the value in the factor of a valuator
-ROUTE TS.isOver TO V_ISOVER_TO_FACTOR.inSFBool
-ROUTE V_ISOVER_TO_FACTOR.outSFFloat TO V_MOVE_OVER.Factor1
-
-# Display the status of the IsOver boolean
-ROUTE V_ISOVER_TO_FACTOR.outMFString TO MOUSE_OVER_TEXT.string
-
-#These 2 routes create an event (Boolean = TRUE) whenever the mouse moves
-#and activates a conditional
-ROUTE TS.hitPoint_changed TO V_HITPOINT_CHANGED_TO_ONE.inSFVec3f
-ROUTE V_HITPOINT_CHANGED_TO_ONE.outSFBool TO START_TIMER.activate
-
-# When the timer is active, it means the mouse is moving, we route this event to the move_over valuator
-ROUTE T.isActive TO V_MOVE_OVER.inSFBool
-
-# Display of the status of the timer
-ROUTE T.isActive TO VALUATOR.inSFBool
-ROUTE VALUATOR.outMFString TO TIMER_STATUS_TEXT.string
-
-# Trigger one action when the result is TRUE
-ROUTE V_MOVE_OVER.outSFBool TO C.activate
-# Trigger one action when the result is FALSE
-ROUTE V_MOVE_OVER.outSFBool TO RC.reverseActivate
-
-# Display of the final result
-ROUTE V_MOVE_OVER.outMFString TO RESULT_TEXT.string
-
-# Display of the startTime of the Timer
-#ROUTE T.startTime TO V_START_TIME.inSFTime
-#ROUTE V_START_TIME.outMFString TO START_TIME_TEXT.string
-
-# Display of the stopTime of the Timer
-#ROUTE T.stopTime TO V_STOP_TIME.inSFTime
-#ROUTE V_STOP_TIME.outMFString TO STOP_TIME_TEXT.string
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-colortransform-alpha.bt Deleted

@@ -1,101 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to modify the color components on a graphical object using the ColorTransform node."
-    "A group made of a circle and a rectangle is reused under a ColorTransform node which animates only the Red-Blue component from 0 to 1" 
-    "Note: the transparency is specified for a set of objects but is applied individually, that is why the overlapping region of the circle and of the rectangle gets black faster than the rest of the group." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ColorTranform"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 50
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
-  DEF CT ColorTransform {
-   mrr 0
-   mgg 0
-   mbb 0
-   maa 0
-   ta 1
-   children [
-    DEF MX TransformMatrix2D {
-     mxx 0.5
-     mxy 0.5
-     myy 0.5
-     ty -100
-     children [
-      USE TR
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0 100 100 0 0]
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO CT.ta
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-colortransform-bitmap.bt Deleted

@@ -1,109 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to modify the color components of an image using the ColorTransform node."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ColorTranform on an image"
-  }
-  DEF TR Transform2D {
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-      texture ImageTexture {
-       url ["od:2"]
-      }
-     }
-     geometry Rectangle { size 200  80}
-    }
-   ]
-  }
-  DEF CT ColorTransform {
-   mrr 1
-   mgg 1
-   mbb 0.2
-   tr 0
-   children [
-    Transform2D {
-     translation 0 -100
-     children [
-      USE S
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0 100 100 0 0]
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO TR.translation
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO CT.mrb
-ROUTE TS.fraction_changed TO CT.maa
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 2
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-colortransform-color.bt Deleted

@@ -1,102 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to modify the color components on a graphical object using the ColorTransform node."
-    "A group made of a circle and a rectangle is reused under a ColorTransform node which sets the color components to 0 and the alpha component is animated from 0 to 1" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ColorTranform and color changes"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 50
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
-  DEF CT ColorTransform {
-   mrr 0
-   mgg 0
-   mbb 0
-   maa 0
-   ta 1
-   children [
-    DEF MX TransformMatrix2D {
-     mxx 0.5
-     mxy 0.5
-     myy 0.5
-     ty -100
-     children [
-      USE TR
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0 100 100 0 0]
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO TR.translation
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO CT.mrb
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-colortransform-texture.bt Deleted

@@ -1,109 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to modify the color components of an image using the ColorTransform node."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ColorTranform on an image"
-  }
-  DEF TR Transform2D {
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-      texture ImageTexture {
-       url ["od:2"]
-      }
-     }
-     geometry Circle { radius  80}
-    }
-   ]
-  }
-  DEF CT ColorTransform {
-   mrr 1
-   mgg 1
-   mbb 0.2
-   tr 0
-   children [
-    Transform2D {
-     translation 0 -100
-     children [
-      USE S
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0 100 100 0 0]
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO TR.translation
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO CT.mrb
-ROUTE TS.fraction_changed TO CT.maa
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 2
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-lineproperties.bt Deleted

@@ -1,168 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
-    children [
-        Background2D { 
-            backColor 1 1 1 
-        }
-        WorldInfo {
-            info [
-                "This test shows how to set basic outline properties, using the LineProperties node"
-                "The properties are width, lineColor and lineStyle." 
-                "" 
-                "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" 
-                "(C) 2002-2006 GPAC Team"
-           ]
-           title "Setting simple line properties - the LineProperties node"
-        }
-        DEF TR1 Transform2D {
-        translation -190 0
-        children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            lineStyle 0
-            width 15
-           }
-          }
-         }
-         geometry DEF LS IndexedLineSet2D {
-          coord Coordinate2D {
-           point [-50 0 0 50 50 0]
-          }
-         }
-        }
-        ]
-        }
-        Transform2D {
-        translation -190 -30
-        children [
-        Shape {
-         appearance DEF TEXTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string ["lineStyle 0"]
-          fontStyle DEF FS FontStyle {
-           justify ["MIDDLE" "MIDDLE"]
-           size 16
-          }
-         }
-        }
-        ]
-        }
-        DEF TR2 Transform2D {
-        translation -65 0
-        children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 1 0 0
-            lineStyle 1
-            width 15
-           }
-          }
-         }
-         geometry USE LS
-        }
-        ]
-        }
-        Transform2D {
-        translation -65 -30
-        children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["lineStyle 1"]
-          fontStyle USE FS
-         }
-        }
-        ]
-        }
-        DEF TR3 Transform2D {
-        translation 65 0
-        children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps XLineProperties {
-            lineColor 0 1 1
-            lineStyle 2
-            width 15
-           }
-          }
-         }
-         geometry USE LS
-        }
-        ]
-        }
-        Transform2D {
-        translation 65 -30
-        children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["lineStyle 2"]
-          fontStyle USE FS
-         }
-        }
-        ]
-        }
-        DEF TR4 Transform2D {
-        translation 190 0
-        children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps XLineProperties {
-            lineColor 0 1 0
-            lineStyle 3
-            width 15
-           }
-          }
-         }
-         geometry USE LS
-        }
-        ]
-        }
-        Transform2D {
-        translation 190 -30
-        children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["lineStyle 3"]
-          fontStyle USE FS
-         }
-        }
-        ]
-        }
-    ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-material2D.bt Deleted

@@ -1,154 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to specify the filling and simple outlining of 2D shapes"
-    "It uses the Material2D node. The filled property indicates if the shape is filled or not. The emissiveColor property specifies the fill color if filled or the outline color if not filled. Transparency can be set using the transparency property." 
-    "In this simple example, the width and other properties of the outline cannot be set. To set more properties, use the LineProperties or XLineProperties nodes." 
-    "cf bifs-2D-painting-lineproperties" 
-    "cf bifs-2D-painting-xlineproperties-cap"
-    "cf bifs-2D-painting-xlineproperties-compositetexture2D"
-    "cf bifs-2D-painting-xlineproperties-dash"
-    "cf bifs-2D-painting-xlineproperties-imagetexture"
-    "cf bifs-2D-painting-xlineproperties-join"
-    "cf bifs-2D-painting-xlineproperties-lineargradient"
-    "cf bifs-2D-painting-xlineproperties-radialgradient"
-    "cf bifs-2D-painting-xlineproperties-scalable"
-    "cf bifs-2D-painting-xlineproperties-transparent"
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"]
-   title "Material2D properties"
-  }
-  Transform2D {
-   translation -180 0
-   children [
-    DEF TR Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 80 80
-       }
-      }
-     ]
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-      }
-     }
-     geometry DEF REC Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Not filled, Color 1 0 1"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 14
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE TR
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["filled, Color 1 0 1"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 180 0
-   children [
-    USE TR
-    Shape {
-     appearance Appearance {
-      material DEF M Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-       transparency 0.6
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["filled, Color 1 0 1" "transparency 0.6"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-cap.bt Deleted

@@ -1,211 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of cap styles of the XLineProperties node"
-    "Moving the mouse over the 'Anim' button will superpose the different lines to highlight the linecap differences" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Changing line caps using the XLineProperties node"
-  }
-  DEF TR1 Transform2D {
-   translation -190 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        lineCap 2
-        width 15
-       }
-      }
-     }
-     geometry DEF LS IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -190 -30
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Cap square"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 16
-      }
-     }
-    }
-   ]
-  }
-  DEF TR2 Transform2D {
-   translation -65 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 1 0 0
-        lineCap 1
-        width 15
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation -65 -30
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Cap round"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF TR3 Transform2D {
-   translation 65 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 1 1
-        lineCap 3
-        width 15
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 65 -30
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Cap triangle"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF TR4 Transform2D {
-   translation 190 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 1 0
-        width 15
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 190 -30
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Cap 'butt'"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 225 -75
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Anim"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE TR1.translation BY 0 0
-    REPLACE TR2.translation BY 0 0
-    REPLACE TR3.translation BY 0 0
-    REPLACE TR4.translation BY 0 0
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE TR1.translation BY -190 0
-    REPLACE TR2.translation BY -65 0
-    REPLACE TR3.translation BY 65 0
-    REPLACE TR4.translation BY 190 0
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-compositetexture2D.bt Deleted

@@ -1,153 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This shows line texturing with a composite texture using the CompositeTexture2D node using variable width and different line alignment" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Complex line texturing with the XLineProperties node"
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Line width varying between 0 and 100"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -140 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP XLineProperties {
-        width 20
-        textureTransform TextureTransform { scale 8 8}
-        texture DEF IM CompositeTexture2D {
-         pixelWidth 32
-         pixelHeight 32
-         children [
-          Shape {
-           appearance Appearance {
-           	material Material2D { emissiveColor 0 1 0 filled TRUE }
-           }
-           geometry DEF C Circle {
-            radius 6
-           }
-          }
-         ]
-        }
-       }
-      }
-     }
-     geometry Rectangle {
-      size 150 150
-     }
-    }
-    Transform2D {
-     translation 0 -150
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Line centered on shape"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 160 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP2 XLineProperties {
-        isCenterAligned FALSE
-        width 0
-        texture USE IM
-       }
-      }
-     }
-     geometry Rectangle {
-      size 150 150
-     }
-    }
-    Transform2D {
-     translation 0 -150
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Line inside shape"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 100 0]
-  }
-  DEF SI2 ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [6 10 6]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO XLP.width
-ROUTE SI.value_changed TO XLP2.width
-ROUTE TS.fraction_changed TO SI2.set_fraction
-ROUTE SI2.value_changed TO C.radius
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-dash.bt Deleted

@@ -1,142 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of line dashing using the XLineProperties node."
-    "Two properties are demonstrated: dash pattern and dash offset. The offset is animated on the left, the dash length is animated on the right." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-09-14 16:42:18 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Animating the line dashes using the XLineProperties node"
-  }
-  Transform2D {
-   translation 140 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP1 XLineProperties {
-        lineColor 0 0 1
-        lineStyle 6
-        isScalable TRUE
-        lineCap 1
-        width 20
-        dashes [0.1 80]
-       }
-      }
-     }
-     geometry DEF LS Curve2D {
-      fineness 1
-      type [2]
-      point Coordinate2D {
-       point [-100 0 -50 200 50 -200 100 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["dash pattern animation"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -140 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP2 XLineProperties {
-        lineColor 0 0 1
-        lineStyle 6
-        isScalable TRUE
-        lineCap 1
-        width 20
-        dashes [3 80]
-       }
-      }
-     }
-     geometry USE LS
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["dash offset animation"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 3
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 16 0]
-  }
-  DEF CI CoordinateInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0.2 0 80 0 17.5 0 80 0 0.2 0 80 0]
-  }
-  DEF V Valuator {
-   Factor2 0
-   Factor3 0
-   Factor4 0
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO XLP2.dashOffset
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO V.inMFVec2f
-ROUTE V.outMFFloat TO XLP1.dashes
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-imagetexture.bt Deleted

@@ -1,159 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 560
-     pixelHeight 420
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This shows line texturing with an image using variable width and different line alignment" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Line texturing with Images - the XLineProperties node"
-  }
-  Transform2D {
-   translation 0 140
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Line width varying between 0 and 100"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -140 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP XLineProperties {
-        width 20
-        texture DEF IM ImageTexture {
-         url [od:10]
-         repeatS FALSE
-         repeatT FALSE
-        }
-       }
-      }
-     }
-     geometry Rectangle {
-      size 150 150
-     }
-    }
-    Transform2D {
-     translation 0 -150
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Line centered on shape"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 140 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps DEF XLP2 XLineProperties {
-        isCenterAligned FALSE
-        width 0
-        texture USE IM
-       }
-      }
-     }
-     geometry Rectangle {
-      size 150 150
-     }
-    }
-    Transform2D {
-     translation 0 -150
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Line inside shape"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 100 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO XLP.width
-ROUTE SI.value_changed TO XLP2.width
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-join.bt Deleted

@@ -1,215 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of line join styles of the XLineProperties node"
-    "Moving the mouse over the 'Anim' button will superpose the different lines to highlight the linejoin differences" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Changing line caps using the XLineProperties node"
-  }
-  DEF TR1 Transform2D {
-   translation -200 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        width 20
-       }
-      }
-     }
-     geometry DEF LS IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -50
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Join Miter" "miterLimit: default"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 16
-      }
-     }
-    }
-   ]
-  }
-  DEF TR3 Transform2D {
-   translation 70 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 1 0
-        lineJoin 1
-        width 20
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 70 -50
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Join Round"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-
-
-  DEF TR4 Transform2D {
-   translation 200 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 1 0 1
-        lineJoin 2
-        width 20
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -50
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Join Bevel"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-
-  DEF TR2 Transform2D {
-   translation -70 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 1 0 0
-        miterLimit 0.4
-        width 20
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation -70 -50
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Join Miter" "miterLimit: 0.4"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-
-  Transform2D {
-   translation 280 -75
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Anim"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE TR1.translation BY 0 0
-    REPLACE TR2.translation BY 0 0
-    REPLACE TR3.translation BY 0 0
-    REPLACE TR4.translation BY 0 0
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE TR1.translation BY -190 0
-    REPLACE TR2.translation BY -65 0
-    REPLACE TR3.translation BY 65 0
-    REPLACE TR4.translation BY 190 0
-   }
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-lineargradient.bt Deleted

@@ -1,122 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows line texturing with a linear gradient with different spread method and animated end point"
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"]
-    title "Linear Gradient and Lines using XLineProperties"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Move over and click" "to change the spread method"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  TransformMatrix2D {
-   mxy 0.5
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         lineProps XLineProperties {
-          width 40
-          texture DEF GL LinearGradient {
-           endPoint 0 0.5
-           key [0 0.5 1]
-           keyValue [0 0 1 1 0 0 0 1 0]
-          }
-         }
-        }
-       }
-       geometry DEF R Rectangle {
-        size 200 200
-       }
-      }
-      DEF TS TouchSensor {}
-     ]
-    }
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 2
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 1
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 2
-   }
-  }
-  DEF TIME TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0.5 1 0.5 0 0.5]
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-ROUTE TS.isActive TO C2.activate
-ROUTE TS.isActive TO RC2.reverseActivate
-ROUTE TIME.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO GL.endPoint
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-radialgradient.bt Deleted

@@ -1,124 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows line texturing with a radial gradient with different spread method and animated focal point"
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"]
-   title "Radial Gradient on lines using XLineProperties node"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Move over and click" "to change the spread method"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TR TransformMatrix2D {
-   mxy 1
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        isCenterAligned TRUE
-        width 40
-        texture DEF GR RadialGradient {
-         focalPoint 0 0.5
-         key [0 0.5 1]
-         keyValue [0 0 1 1 0 0 0 1 0]
-        }
-       }
-      }
-     }
-     geometry DEF R Rectangle {
-      size 200 200
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 2
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 1
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 2
-   }
-  }
-  DEF TIME TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.25 0.5 0.75 1]
-   keyValue [0 0.5 0.5 1 1 0.5 0.5 0 0 0.5]
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-ROUTE TS.isActive TO C2.activate
-ROUTE TS.isActive TO RC2.reverseActivate
-ROUTE TIME.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO GR.focalPoint
-ROUTE TIME.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TR.mxy
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-scalable.bt Deleted

@@ -1,123 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of scalable flag in the XLineProperties node" 
-    "We see that the right line's width changes during the animation while the left one does not change." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    title "Scalability of the outline - the XLineProperties node"
-  }
-  DEF TR1 Transform2D {
-   scale 2 2
-   translation -150 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        lineColor 0 0 1
-        width 2
-       }
-      }
-     }
-     geometry DEF LS IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -50
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Not scalable"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 16
-      }
-     }
-    }
-   ]
-  }
-  DEF TR2 Transform2D {
-   scale 2 2
-   translation 150 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        width 2
-       }
-      }
-     }
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -50
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Scalable"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [1 1 3 3 1 1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO TR1.scale
-ROUTE PI.value_changed TO TR2.scale
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-painting-xlineproperties-transparent.bt Deleted

@@ -1,176 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows usage of line transparency and line alignment" 
-    "The outline or its outside is centered on the shape depending on the value of the isCenterAligned."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Positioning lines and setting transparency using the XLineProperties node"
-  }
-  Transform2D {
-   translation -100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        width 10
-       }
-      }
-     }
-     geometry DEF RC Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF TXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["No line transparency" "CenterAligned TRUE"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        isCenterAligned FALSE
-        width 10
-       }
-      }
-     }
-     geometry USE RC
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["No line transparency" "CenterAligned FALSE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -100 -80
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        transparency 0.5
-        width 10
-       }
-      }
-     }
-     geometry USE RC
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Line transparency: 0.5" "CenterAligned TRUE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 -80
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-       lineProps XLineProperties {
-        lineColor 0 0 1
-        isCenterAligned FALSE
-        transparency 0.5
-        width 10
-       }
-      }
-     }
-     geometry USE RC
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Line transparency: 0.5" "CenterAligned FALSE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-clipper2D.bt Deleted

@@ -1,316 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   url [od:5]
-  }
-  WorldInfo {
-   info ["This shows combination of Clipper2D objects" "with different modes" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Clipper2D Test"
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -200 100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 200
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition 150 150
-     minPosition -150 -150
-    }
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Translate" "round" "cliper"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 40
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -80 100
-   children [
-    DEF S1 Switch {
-     whichChoice 0
-     choice [
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["Round Clipper" "inside = FALSE"]
-          fontStyle USE FS
-         }
-        }
-        DEF TS1 TouchSensor {}
-       ]
-      }
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["Round Clipper" "inside = TRUE"]
-          fontStyle USE FS
-         }
-        }
-        DEF RTS1 TouchSensor {}
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -80 0
-   children [
-    DEF SX1 Switch {
-     whichChoice 0
-     choice [
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["XOR = FALSE"]
-          fontStyle USE FS
-         }
-        }
-        DEF TSX1 TouchSensor {}
-       ]
-      }
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["XOR = TRUE"]
-          fontStyle USE FS
-         }
-        }
-        DEF RTSX1 TouchSensor {}
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -200 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-    DEF DS DiscSensor {}
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Rotate" "square" "cliper"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -80 -120
-   children [
-    DEF S2 Switch {
-     whichChoice 0
-     choice [
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["Rect Clipper" "inside = FALSE"]
-          fontStyle USE FS
-         }
-        }
-        DEF TS2 TouchSensor {}
-       ]
-      }
-      Group {
-       children [
-        Shape {
-         appearance USE TEXTAPP
-         geometry Text {
-          string ["Rect Clipper" "inside = TRUE"]
-          fontStyle USE FS
-         }
-        }
-        DEF RTS2 TouchSensor {}
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 0
-   children [
-    DEF CLIP_SQ Clipper2D {
-     inside FALSE
-     children [
-      DEF CLIP_RD Clipper2D {
-       inside FALSE
-       children [
-        Shape {
-         appearance Appearance {
-          texture ImageTexture {
-           url [od:10]
-           repeatS FALSE
-           repeatT FALSE
-          }
-         }
-         geometry Circle {
-          radius 100
-         }
-        }
-       ]
-       geometry Circle {
-        radius 50
-       }
-       transform DEF TR_RD Transform2D {}
-
-      }
-     ]
-     geometry Rectangle {
-      size 200 75
-     }
-     transform DEF TR_SQ Transform2D {}
-
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE CLIP_RD.inside BY TRUE
-    REPLACE S1.whichChoice BY 1
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE CLIP_RD.inside BY FALSE
-    REPLACE S1.whichChoice BY 0
-   }
-  }
-  DEF CX1 Conditional {
-   buffer {
-    REPLACE CLIP_RD.XOR BY TRUE
-    REPLACE SX1.whichChoice BY 1
-   }
-  }
-  DEF RCX1 Conditional {
-   buffer {
-    REPLACE CLIP_RD.XOR BY FALSE
-    REPLACE SX1.whichChoice BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE CLIP_SQ.inside BY TRUE
-    REPLACE S2.whichChoice BY 1
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE CLIP_SQ.inside BY FALSE
-    REPLACE S2.whichChoice BY 0
-   }
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR_RD.translation
-ROUTE DS.rotation_changed TO TR_SQ.rotationAngle
-ROUTE TS1.isActive TO C1.activate
-ROUTE RTS1.isActive TO RC1.activate
-ROUTE TSX1.isActive TO CX1.activate
-ROUTE RTSX1.isActive TO RCX1.activate
-ROUTE TS2.isActive TO C2.activate
-ROUTE RTS2.isActive TO RC2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 5
-    esDescr [
-     ES_Descriptor {
-      ES_ID 10
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-form-align-center.bt Deleted

@@ -1,162 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Form node" "with horizontal and vertical center alignment" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Form Test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 200
-     }
-    }
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Constraints: AT AB AH "]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1]
-     constraints ["AT" "AB" "AH"]
-     groupsIndex [0 1 -1 0 2 -1 1 2 -1]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 30
-       }
-      }
-      DEF S2 Transform2D {
-       children [
-        Transform2D {
-         children [
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 0 1 0
-             filled TRUE
-            }
-           }
-           geometry Rectangle {
-            size 60 20
-           }
-          }
-         ]
-        }
-        Transform2D {
-         translation -20 -20
-         children [
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 0 0 1
-             filled TRUE
-            }
-           }
-           geometry Circle {
-            radius 20
-           }
-          }
-         ]
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 75 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints: AL AR AV"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 200 100
-     groups [1 -1 2 -1]
-     constraints ["AL" "AR" "AV"]
-     groupsIndex [0 1 -1 0 2 -1 1 2 -1]
-     children [
-      USE S1
-      USE S2
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-form-align-horiz.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Form node" "with horizontal alignment" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Form Test"
-  }
-  Transform2D {
-   translation -75 0
-   children [
-    DEF FORM Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 200
-     }
-    }
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Constraints: AL AL 10"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1]
-     constraints ["AL" "AL 10"]
-     groupsIndex [0 1 -1 1 2 -1]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 30
-       }
-      }
-      DEF S2 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 75 0
-   children [
-    USE FORM
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints: AR AR 10"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1]
-     constraints ["AR" "AR 10"]
-     groupsIndex [0 1 -1 1 2 -1]
-     children [
-      USE S1
-      USE S2
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-form-align-vert.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Form node" "with vertical alignment" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Form Test"
-  }
-  Transform2D {
-   translation 0 75
-   children [
-    DEF FORM Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Constraints: AT AT 10"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Form {
-     size 200 100
-     groups [1 -1 2 -1]
-     constraints ["AT" "AT 10"]
-     groupsIndex [0 1 -1 1 2 -1]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 30
-       }
-      }
-      DEF S2 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -75
-   children [
-    USE FORM
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints: AB AB 10"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 200 100
-     groups [1 -1 2 -1]
-     constraints ["AB" "AB 10"]
-     groupsIndex [0 1 -1 1 2 -1]
-     children [
-      USE S1
-      USE S2
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-form-spread-horiz.bt Deleted

@@ -1,182 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Form node" "with different horizontal spreads" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Form Test"
-  }
-  Transform2D {
-   translation 0 130
-   children [
-    DEF FORM Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-    Transform2D {
-     translation 0 -65
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Constraints: AL SH 10"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Form {
-     size 200 100
-     groups [1 -1 2 -1 3 -1]
-     constraints ["AL" "SH 10"]
-     groupsIndex [0 1 -1 1 2 3 -1]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 30
-       }
-      }
-      DEF S2 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 60 40
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE FORM
-    Transform2D {
-     translation 0 -65
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints: AL AR SH"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 200 100
-     groups [1 -1 2 -1 3 -1]
-     constraints ["AL" "AR" "SH"]
-     groupsIndex [0 1 -1 0 3 -1 1 2 3 -1]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -130
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 110 100
-     }
-    }
-    Transform2D {
-     translation 0 -65
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints: SHin"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 110 100
-     groups [1 -1 2 -1]
-     constraints ["SHin"]
-     groupsIndex [1 2 -1]
-     children [
-      Transform2D {
-       children [
-        USE S1
-        USE S2
-       ]
-      }
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-form-spread-vert.bt Deleted

@@ -1,170 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Form node" "with different vertical spreads" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Form Test"
-  }
-  Transform2D {
-   translation -120 20
-   children [
-    DEF FORM Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 200
-     }
-    }
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Constraints:" "AT SV 10"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1 3 -1]
-     constraints ["AT" "SV 10"]
-     groupsIndex [0 1 -1 1 2 3 -1]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 30
-       }
-      }
-      DEF S2 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 60 40
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 20
-   children [
-    USE FORM
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints:" "AT AB SV"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1 3 -1]
-     constraints ["AT" "AB" "SV"]
-     groupsIndex [0 1 -1 0 3 -1 1 2 3 -1]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 20
-   children [
-    USE FORM
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["Constraints:" "SVin"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Form {
-     size 100 200
-     groups [1 -1 2 -1 3 -1]
-     constraints ["SVin"]
-     groupsIndex [1 2 3 -1]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layer2D.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {  backColor 1 1 1  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the Layer2D node." 
-    "A 2D layer is defined with a size 200x200, its content is a grey square and a grey ellipse."
-    "Within the layer, the content is clipped along the 200x200 rectangle and filled with a red background." 
-    "Behind this layer, a rotated blue rectangle is displayed."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Layer2D - Rectangular Axis Aligned Clipping"
-  }
-  Transform2D {
-    translation 125 125
-    children [
-        Shape {
-            appearance Appearance { material Material2D { filled TRUE emissiveColor 1 1 0 } }
-            geometry Rectangle { size 50 50 }
-        }
-        Shape {
-            appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0 } }
-            geometry Text { string "Click Me" fontStyle FontStyle { justify [ "MIDDLE" "MIDDLE" ] size 10 }}
-        }
-        DEF S TouchSensor {}
-    ] 
-  }
-  Transform2D {
-    rotationAngle 0.57
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       filled TRUE
-       emissiveColor 0 0 1
-      }
-     }
-     geometry Rectangle {
-      size 100 400
-     }
-    }
-   ]
-  }
-  DEF ROT Transform2D {
-   translation 0 0
-   children [
-    Layer2D {
-     size 200 200
-     children [
-        Background2D { backColor 1 0 0 }
-      Transform2D {
-       translation -100 0
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           filled TRUE
-          }
-         }
-         geometry Ellipse {
-          radius 100 400
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 25 0
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 100 100
-         }
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  DEF C Conditional {
-    buffer {
-        REPLACE TS.startTime BY 0
-    }
-  }
-  DEF TS TimeSensor {
-    cycleInterval 5
-    startTime -1
-  }
-  DEF SI ScalarInterpolator {
-   key [0 1]
-   keyValue [0 1.57]
-  }
- ]
-}
-
-ROUTE S.isActive TO C.activate
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO ROT.rotationAngle
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layer2d-in-layer2d.bt Deleted

@@ -1,111 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {backColor 1 1 1}
-  WorldInfo {
-   title "Nested Clipping - Layer2D"
-   info [
-    "This test shows nested Layer2D nodes." 
-    "Both layer sizes are animated" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-  }
-
-  Transform2D {
-   translation 100 0
-   children [
-    DEF L1 Layer2D {
-     size 300 300
-     background Background2D {url 10}
-     children [
-      Shape {
-       appearance Appearance { material Material2D { filled TRUE } }
-       geometry DEF RC Rectangle {size 100 75}
-      }
-      Transform2D {
-       translation -150 0
-       children [
-      	DEF L2 Layer2D {
-         size 100 100
-		     background Background2D {backColor 0 0 1}
-      	 children [
-				  Shape {
-				   appearance Appearance { material Material2D { emissiveColor 1 0 0 filled TRUE } }
-				   geometry Circle {radius 20}
-				  }
-				 ]
-				}
-       ]
-     	}
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2.0
-   loop TRUE
-  }
-  DEF PI1 PositionInterpolator2D {
-   key [0.0 1.0]
-   keyValue [400.0 300.0 0.0 0.0]
-  }
-  DEF PI2 PositionInterpolator2D {
-   key [0.0 1.0]
-   keyValue [100.0 100.0 0.0 0.0]
-  }
- ]
-}
-
-
-ROUTE TS.fraction_changed TO PI1.set_fraction
-ROUTE PI1.value_changed TO L1.size
-ROUTE TS.fraction_changed TO PI2.set_fraction
-ROUTE PI2.value_changed TO L2.size
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "./../auxiliary_files/sky.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-ltr-nowrap.bt Deleted

@@ -1,403 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 800
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going left to right without line wrap" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -250 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 60
-     }
-    }
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-ltr-wrap-btt.bt Deleted

@@ -1,445 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going left to right with line wrap" "in direction bottom to top and 1.1 line spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -200 260
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 140 120
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "BEGIN"]
-     topToBottom FALSE
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Text#2"]
-        fontStyle USE FS
-       }
-      }
-      DEF S4 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "FIRST"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "BEGIN"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "FIRST"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "BEGIN"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "FIRST"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-ltr-wrap-ttb.bt Deleted

@@ -1,434 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going left to right with line wrap" "in direction top to bottom and 1.1 line spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -200 260
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 140 120
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "BEGIN"]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Text#2"]
-        fontStyle USE FS
-       }
-      }
-      DEF S4 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "FIRST"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "END"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-rtl-nowrap.bt Deleted

@@ -1,415 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 800
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going right to left without line wrap" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -250 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 60
-     }
-    }
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     leftToRight FALSE
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "FIRST"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "MIDDLE"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["BEGIN" "END"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "BEGIN"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "FIRST"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "MIDDLE"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["MIDDLE" "END"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "BEGIN"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "FIRST"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "MIDDLE"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 250 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 200 60
-     justify ["END" "END"]
-     leftToRight FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-rtl-wrap-btt.bt Deleted

@@ -1,469 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going right to left with line wrap" "in direction bottom to top and 1.1 line spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -200 260
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 140 120
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Text#2"]
-        fontStyle USE FS
-       }
-      }
-      DEF S4 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "FIRST"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "FIRST"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "FIRST"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-rtl-wrap-ttb.bt Deleted

@@ -1,457 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different horizontal justification" "going right to left with line wrap" "in direction top to bottom and 1.1 line spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -200 260
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 140 120
-     }
-    }
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Text#2"]
-        fontStyle USE FS
-       }
-      }
-      DEF S4 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "FIRST"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["BEGIN" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "FIRST"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["MIDDLE" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 260
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 100
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END FIRST"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "FIRST"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -220
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -80
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 140 120
-     justify ["END" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-horiz-text.bt Deleted

@@ -1,84 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing text splitting at word boundaries" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Text Test"
-  }
-  Transform2D {
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 160 160
-     }
-    }
-    Transform2D {
-     translation 0 -100
-     children [
-      DEF S Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Sample text use to check if text splitting is ok with layout: aei pqg dtS..."]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 160 160
-     justify ["BEGIN" "END"]
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample text used to check if text splitting is ok with layout: aei pqg dtS..."]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-scroll-child.bt Deleted

@@ -1,87 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 800
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node used in another layout" "both perform scrolling" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Shape {
-   appearance Appearance {
-    material Material2D {
-     emissiveColor 0 0 0
-    }
-   }
-   geometry Rectangle { size 300 200 }
-  }
-  Layout {
-   size 300 200
-   smoothScroll TRUE
-   loop TRUE
-   scrollVertical FALSE
-   scrollRate 0.1
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Rectangle { size 100 200 }
-      }
-      Layout {
-       wrap TRUE
-       size 100 200
-       smoothScroll TRUE
-       loop TRUE
-       scrollRate 0.2
-       children [
-        DEF N0 Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Circle {
-          radius 20
-         }
-        }
-        USE N0
-        USE N0
-       ]
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-scroll-full.bt Deleted

@@ -1,344 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 800
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing scrolling in different direction" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -250 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 60
-     }
-    }
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["scroll smooth vertical"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollRate 0.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 60
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth vertical inverse"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollRate -0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -40
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth horizontal"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate 0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -250 -140
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth horizontal inverse"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate -0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 120
-   children [
-    DEF BOUNDS2 Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 150
-     }
-    }
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth vertical"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollRate 0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 120
-   children [
-    USE BOUNDS2
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth vertical inverse"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollRate -0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -80
-   children [
-    USE BOUNDS2
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth horizontal"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate 0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 200 -80
-   children [
-    USE BOUNDS2
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["scroll smooth horizontal inverse"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate -0.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-scroll-modes-horiz.bt Deleted

@@ -1,349 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows an horizontal Layout node" "with different scrolling modes, direction and rates" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team", "(C) 2006 ENST ATG Conformance Streams"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation 0 40
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 60
-     }
-    }
-    DEF LAY Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate 0.1
-     scrollMode -1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry DEF TXT_MODE Text {
-        string ["mode: scroll-in"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_ALIGN Text {
-        string ["align: begin"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_DIR Text {
-        string ["scroll dir: horizontal"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -110
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_RATE Text {
-        string ["scroll rate: 0.1"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-
-  Transform2D {
-   translation -160 80
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.7 0.7 0.7 
-       filled TRUE
-       lineProps LineProperties { lineColor 0 0 0 }
-      }
-     }
-     geometry Rectangle {size 80 20}
-    }
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Begin"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_BE TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -160 60
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Middle"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_ME TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -160 40
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["End"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_EE TouchSensor {}
-   ]
-  }
-
-  Transform2D {
-   translation -160 0
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll In"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SI TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -160 -20
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll InOut"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SIO TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -160 -40
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll Out"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SO TouchSensor {}
-   ]
-  }
-  
-  Transform2D {
-   translation 160 80
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Rate>0"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_RP TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 160 60
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Rate<0"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_RN TouchSensor {}
-   ]
-  }
-
-  Transform2D {
-   translation 160 30
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Horiz"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SH TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 160 10
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Vert"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SV TouchSensor {}
-   ]
-  }
-  
-  DEF C_BE Conditional { buffer { 
-   REPLACE LAY.justify BY ["BEGIN", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: begin"]
-  } }
-  DEF C_ME Conditional { buffer { 
-   REPLACE LAY.justify BY ["MIDDLE", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: middle"]
-  } }
-  DEF C_EE Conditional { buffer { 
-   REPLACE LAY.justify BY ["END", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: end"]
-  } }
-
-  DEF C_SI Conditional { buffer { 
-   REPLACE LAY.scrollMode BY -1
-   REPLACE TXT_MODE.string BY ["mode: scroll-in"]
-  } }
-  DEF C_SIO Conditional { buffer { 
-   REPLACE LAY.scrollMode BY 0
-   REPLACE TXT_MODE.string BY ["mode: scroll-in-out"]
-  } }
-  DEF C_SO Conditional { buffer { 
-   REPLACE LAY.scrollMode BY 1
-   REPLACE TXT_MODE.string BY ["mode: scroll-out"]
-  } }
-  DEF C_RP Conditional { buffer { 
-   REPLACE LAY.scrollRate BY 0.1
-   REPLACE TXT_RATE.string BY ["scroll rate: 0.1"]
-  } }
-  DEF C_RN Conditional { buffer { 
-   REPLACE LAY.scrollRate BY -0.1
-   REPLACE TXT_RATE.string BY ["scroll rate: -0.1"]
-  } }
-  DEF C_SH Conditional { buffer { 
-   REPLACE LAY.scrollVertical BY FALSE
-   REPLACE TXT_DIR.string BY ["scroll dir: horizontal"]
-  } }
-  DEF C_SV Conditional { buffer { 
-   REPLACE LAY.scrollVertical BY TRUE
-   REPLACE TXT_DIR.string BY ["scroll dir: vertical"]
-  } }
- ]
-}
-
-ROUTE TS_BE.isActive TO C_BE.activate
-ROUTE TS_ME.isActive TO C_ME.activate
-ROUTE TS_EE.isActive TO C_EE.activate
-
-ROUTE TS_SI.isActive TO C_SI.activate
-ROUTE TS_SIO.isActive TO C_SIO.activate
-ROUTE TS_SO.isActive TO C_SO.activate
-
-ROUTE TS_RP.isActive TO C_RP.activate
-ROUTE TS_RN.isActive TO C_RN.activate
-
-ROUTE TS_SH.isActive TO C_SH.activate
-ROUTE TS_SV.isActive TO C_SV.activate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-scroll-modes-vert.bt Deleted

@@ -1,350 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows a vertical Layout node" "with different scrolling modes, direction and rates" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team", "(C) 2006 ENST ATG Conformance Streams"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation 0 80
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 60 200
-     }
-    }
-    DEF LAY Layout {
-     wrap TRUE
-     size 60 200
-     justify ["BEGIN" "BEGIN"]
-     horizontal FALSE
-     smoothScroll TRUE
-     loop TRUE
-     scrollVertical FALSE
-     scrollRate 0.1
-     scrollMode -1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 20
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -120
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry DEF TXT_MODE Text {
-        string ["mode: scroll-in"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -140
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_ALIGN Text {
-        string ["align: begin"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -160
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_DIR Text {
-        string ["scroll dir: horizontal"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -180
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry DEF TXT_RATE Text {
-        string ["scroll rate: 0.1"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-
-  Transform2D {
-   translation -110 180
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.7 0.7 0.7 
-       filled TRUE
-       lineProps LineProperties { lineColor 0 0 0 }
-      }
-     }
-     geometry Rectangle {size 80 20}
-    }
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Begin"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_BE TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -110 160
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Middle"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_ME TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -110 140
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["End"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_EE TouchSensor {}
-   ]
-  }
-
-  Transform2D {
-   translation -110 100
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll In"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SI TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -110 80
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll InOut"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SIO TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -110 60
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Scroll Out"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SO TouchSensor {}
-   ]
-  }
-  
-  Transform2D {
-   translation 110 180
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Rate>0"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_RP TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 110 160
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Rate<0"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_RN TouchSensor {}
-   ]
-  }
-
-  Transform2D {
-   translation 110 130
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Horiz"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SH TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 110 110
-   children [
-    USE S 
-    Shape {
-     appearance USE APPTEXT
-     geometry Text {
-      string ["Vert"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_SV TouchSensor {}
-   ]
-  }
-  
-  DEF C_BE Conditional { buffer { 
-   REPLACE LAY.justify BY ["BEGIN", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: begin"]
-  } }
-  DEF C_ME Conditional { buffer { 
-   REPLACE LAY.justify BY ["MIDDLE", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: middle"]
-  } }
-  DEF C_EE Conditional { buffer { 
-   REPLACE LAY.justify BY ["END", "BEGIN"] 
-   REPLACE TXT_ALIGN.string BY ["align: end"]
-  } }
-
-  DEF C_SI Conditional { buffer { 
-   REPLACE LAY.scrollMode BY -1
-   REPLACE TXT_MODE.string BY ["mode: scroll-in"]
-  } }
-  DEF C_SIO Conditional { buffer { 
-   REPLACE LAY.scrollMode BY 0
-   REPLACE TXT_MODE.string BY ["mode: scroll-in-out"]
-  } }
-  DEF C_SO Conditional { buffer { 
-   REPLACE LAY.scrollMode BY 1
-   REPLACE TXT_MODE.string BY ["mode: scroll-out"]
-  } }
-  DEF C_RP Conditional { buffer { 
-   REPLACE LAY.scrollRate BY 0.1
-   REPLACE TXT_RATE.string BY ["scroll rate: 0.1"]
-  } }
-  DEF C_RN Conditional { buffer { 
-   REPLACE LAY.scrollRate BY -0.1
-   REPLACE TXT_RATE.string BY ["scroll rate: -0.1"]
-  } }
-  DEF C_SH Conditional { buffer { 
-   REPLACE LAY.scrollVertical BY FALSE
-   REPLACE TXT_DIR.string BY ["scroll dir: horizontal"]
-  } }
-  DEF C_SV Conditional { buffer { 
-   REPLACE LAY.scrollVertical BY TRUE
-   REPLACE TXT_DIR.string BY ["scroll dir: vertical"]
-  } }
- ]
-}
-
-ROUTE TS_BE.isActive TO C_BE.activate
-ROUTE TS_ME.isActive TO C_ME.activate
-ROUTE TS_EE.isActive TO C_EE.activate
-
-ROUTE TS_SI.isActive TO C_SI.activate
-ROUTE TS_SIO.isActive TO C_SIO.activate
-ROUTE TS_SO.isActive TO C_SO.activate
-
-ROUTE TS_RP.isActive TO C_RP.activate
-ROUTE TS_RN.isActive TO C_RN.activate
-
-ROUTE TS_SH.isActive TO C_SH.activate
-ROUTE TS_SV.isActive TO C_SV.activate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-scroll-on-off.bt Deleted

@@ -1,218 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing scrolling with scrool pause/play through scrollRate field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 200 60
-     }
-    }
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["scroll smooth vertical"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    DEF LAY Layout {
-     wrap TRUE
-     size 200 60
-     justify ["BEGIN" "BEGIN"]
-     smoothScroll TRUE
-     loop TRUE
-     scrollRate 0
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -100 40
-   children [
-    Shape {
-     appearance DEF TXT_APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string ["ScrollRate: 0"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 40
-   children [
-    DEF BACK_RC Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-       lineProps LineProperties {
-        lineColor 0 0 0
-       }
-      }
-     }
-     geometry Rectangle {
-      size 60 25
-     }
-    }   
-    Shape {
-     appearance USE TXT_APP 
-     geometry Text {
-      string ["UP"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_UP TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 60 40
-   children [
-    USE BACK_RC 
-    Shape {
-     appearance USE TXT_APP
-     geometry Text {
-      string ["DOWN"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS_DOWN TouchSensor {}
-   ]
-  }
- 
-  DEF C_UP Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY 0.1
-    REPLACE TXT.string[0] BY "ScrollRate 0.1"
-   }
-  }
-  DEF RC_UP Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY 0
-    REPLACE TXT.string[0] BY "ScrollRate 0"
-   }
-  }
-  DEF C2_UP Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY 0.2
-    REPLACE TXT.string[0] BY "ScrollRate 0.2"
-   }
-  }
-  DEF RC2_UP Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY 0.1
-    REPLACE TXT.string[0] BY "ScrollRate 0.1"
-   }
-  }
-
-  DEF C_DOWN Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY -0.1
-    REPLACE TXT.string[0] BY "ScrollRate -0.1"
-   }
-  }
-  DEF RC_DOWN Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY 0
-    REPLACE TXT.string[0] BY "ScrollRate 0"
-   }
-  }
-  DEF C2_DOWN Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY -0.2
-    REPLACE TXT.string[0] BY "ScrollRate -0.2"
-   }
-  }
-  DEF RC2_DOWN Conditional {
-   buffer {
-    REPLACE LAY.scrollRate BY -0.1
-    REPLACE TXT.string[0] BY "ScrollRate -0.1"
-   }
-  }
- ]
-}
-
-ROUTE TS_UP.isOver TO C_UP.activate
-ROUTE TS_UP.isOver TO RC_UP.reverseActivate
-ROUTE TS_UP.isActive TO C2_UP.activate
-ROUTE TS_UP.isActive TO RC2_UP.reverseActivate
-ROUTE TS_DOWN.isOver TO C_DOWN.activate
-ROUTE TS_DOWN.isOver TO RC_DOWN.reverseActivate
-ROUTE TS_DOWN.isActive TO C2_DOWN.activate
-ROUTE TS_DOWN.isActive TO RC2_DOWN.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-btt-nowrap.bt Deleted

@@ -1,340 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 350
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going bottom to top without column wrap" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -120 230
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 150
-     }
-    }
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     topToBottom FALSE
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 230
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 230
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -120 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -120 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "END"]
-     topToBottom FALSE
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-btt-wrap-ltr.bt Deleted

@@ -1,372 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 500
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going from bottom to top with column wrap" "in direction left to right and 1.1 column spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -170 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-      DEF S4 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["#2"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "END"]
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-btt-wrap-rtl.bt Deleted

@@ -1,381 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 500
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going bottom to top with column wrap" "in direction right to left and 1.1 column spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -170 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-      DEF S4 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["#2"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "END"]
-     leftToRight FALSE
-     topToBottom FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-ttb-nowrap.bt Deleted

@@ -1,331 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 350
-     pixelHeight 650
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going top to bottom without column wrap" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -120 230
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 100 150
-     }
-    }
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 230
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 230
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -120 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 10
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -120 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -210
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -90
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     size 100 150
-     horizontal FALSE
-     justify ["END" "END"]
-     children [
-      USE S1
-      USE S2
-      USE S3
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-ttb-wrap-ltr.bt Deleted

@@ -1,363 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 500
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going top to bottom with column wrap" "in direction left to right and 1.1 column spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:07 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -170 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-      DEF S4 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["#2"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "END"]
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-layout-vert-ttb-wrap-rtl.bt Deleted

@@ -1,372 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 500
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Layout node" "performing different vertical justification" "going top to bottom with column wrap" "in direction right to left and 1.1 column spacing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Layout Test"
-  }
-  Transform2D {
-   translation -170 160
-   children [
-    DEF BOUNDS Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF APPTEXT Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Alignment" "BEGIN BEGIN"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE"]
-         size 16
-        }
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      DEF S1 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 50 50
-       }
-      }
-      DEF S2 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Sample Text"]
-        fontStyle USE FS
-       }
-      }
-      DEF S3 Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 1 0
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 25
-       }
-      }
-      DEF S4 Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["#2"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "BEGIN END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["BEGIN" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "MIDDLE END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["MIDDLE" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END BEGIN"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "BEGIN"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END MIDDLE"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "MIDDLE"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 -160
-   children [
-    USE BOUNDS
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE APPTEXT
-       geometry Text {
-        string ["Alignment" "END END"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-    Layout {
-     wrap TRUE
-     size 150 100
-     horizontal FALSE
-     justify ["END" "END"]
-     leftToRight FALSE
-     spacing 1.1
-     children [
-      USE S1
-      USE S2
-      USE S3
-      USE S4
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-orderedgroup.bt Deleted

@@ -1,86 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 0
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the OrderedGroup node." 
-    "The OrderedGroup node is similar to the Group node but allows for more possibilities."
-    "The difference is the addition of the 'order' property which explicitely gives the display order of the children of the OrderedGroup."
-    "Order varies from 0 to N-1, where N is the number of children. [3 2 1 0] will display the children in reverse order."
-    "This test shows how to interactively change the order based on a click."
-    "If you click on the rectangle or the circle, and keep the mouse button down, the display order is reversed. If you release the button, the display order goes back to initial."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "OrderedGroup"
-  }
-  DEF OG OrderedGroup {
-   order [1 0]
-   children [
-    DEF S1 Shape {
-     appearance DEF A1 Appearance {
-      material Material2D {
-       emissiveColor 1 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 160 60
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 40
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE OG.order BY [0 1]
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE OG.order BY [1 0]
-   }
-  }
- ]
-}
-
-ROUTE TS.isActive TO C.activate
-ROUTE TS.isActive TO RC.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-pathlayout-graphics.bt Deleted

@@ -1,177 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows PathLayout usage" "with text and graphics layout" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "PathLayout Test"
-  }
-  Transform2D {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         filled TRUE
-        }
-       }
-       geometry DEF LS Curve2D {
-        fineness 1
-        type [2]
-        point DEF C2D Coordinate2D {
-         point [-100 0 -50 400 50 -400 100 0]
-        }
-       }
-      }
-      DEF TOUCH TouchSensor {}
-     ]
-    }
-    DEF PL PathLayout {
-     alignment [0 1]
-     pathOffset 0.25
-     children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 30 20
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 1 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 30 20
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 30 20
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 30 20
-         }
-        }
-        DEF TSSTOP TouchSensor {}
-     ]
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -140
-   children [
-    Shape {
-     appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-     geometry Text {
-      string ["move over shape and click" "to change the layout wrapping mode"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 20
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [-0.5 1.5 -0.5]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 1
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 2
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 1
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE TS.enabled BY FALSE
-   }
-  }
-  DEF RC3 Conditional {
-   buffer {
-    REPLACE TS.enabled BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO PL.pathOffset
-ROUTE TSSTOP.isOver TO C3.activate
-ROUTE TSSTOP.isOver TO RC3.reverseActivate
-ROUTE TOUCH.isOver TO C1.activate
-ROUTE TOUCH.isOver TO RC1.reverseActivate
-ROUTE TOUCH.isActive TO C2.activate
-ROUTE TOUCH.isActive TO RC2.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-pathlayout.bt Deleted

@@ -1,164 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows PathLayout usage" "with text and graphics layout" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "PathLayout Test"
-  }
-  Transform2D {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         filled TRUE
-        }
-       }
-       geometry DEF LS Curve2D {
-        fineness 1
-        type [2]
-        point DEF C2D Coordinate2D {
-         point [-100 0 -50 400 50 -400 100 0]
-        }
-       }
-      }
-      DEF TOUCH TouchSensor {}
-     ]
-    }
-    DEF PL PathLayout {
-     alignment [0 1]
-     pathOffset 0.25
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["text and "]
-        fontStyle DEF FS FontStyle {
-         size 20
-        }
-       }
-      }
-      Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 30 20
-         }
-        }
-        DEF TSSTOP TouchSensor {}
-       ]
-      }
-      Shape {
-       appearance USE APP
-       geometry Text {
-        string ["along a path"]
-        fontStyle USE FS
-       }
-      }
-     ]
-     geometry USE LS
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -140
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["move over shape and click" "to change the layout wrapping mode"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 20
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [-0.5 1.5 -0.5]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 1
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 2
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE PL.wrapMode BY 1
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE TS.enabled BY FALSE
-   }
-  }
-  DEF RC3 Conditional {
-   buffer {
-    REPLACE TS.enabled BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO PL.pathOffset
-ROUTE TSSTOP.isOver TO C3.activate
-ROUTE TSSTOP.isOver TO RC3.reverseActivate
-ROUTE TOUCH.isOver TO C1.activate
-ROUTE TOUCH.isOver TO RC1.reverseActivate
-ROUTE TOUCH.isActive TO C2.activate
-ROUTE TOUCH.isActive TO RC2.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-transform2D.bt Deleted

@@ -1,133 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to apply affine transformations on a rectangle."
-    "A graphical object can be moved, rotated or scaled using the Transform2D node."     
-    "The object (or objects) to be transformed is (are) placed in the children property of the Transform2D node." 
-    "The Transform2D node indicates the transformation from the local coordinate system to the global coordinate system. It applies to any graphical object." 
-    "Possible transformations are limited to translation, rotation (including with a center different from the origin) and scaling (including along different axes that original system) using respectively the translation, rotationAngle, center, scale, scaleOrientation." 
-    "For skewing, you should see the TransformMatrix2D node." 
-    "cf bifs-2D-positioning-transformmatrix2D" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"]
-   title "Apply transformations on local coordinate systems - Transform2D node"
-  }
-  Transform2D {
-   translation -100 150
-   children [
-    Transform2D {
-     children [
-      DEF RECT Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Rectangle {
-        size 150 100
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Rectangle" "translation only"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    Transform2D {
-     scale 1 1.5
-     scaleOrientation 1
-     children [
-      USE RECT
-     ]
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Scale 1.0 1.5" "Scale Orientation 1.0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -100 -100
-   children [
-    Transform2D {
-     rotationAngle 1
-     scale 1 1.5
-     children [
-      USE RECT
-     ]
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Scale 1.0 1.5" "rotation 1.0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-positioning-transformmatrix2D.bt Deleted

@@ -1,179 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 550
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to apply affine transformations on a rectangle."
-    "The TransformMatrix2D works like the Transform2D node, but it requires giving the coefficients of a 3x2 matrix."
-    "It allows for skewing and for simple animations of skewing." 
-    "Click on the transformed rectangles to start transformation animations." 
-    "cf bifs-2D-positioning-transform2D" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Apply transformations on local coordinate systems - TransformMatrix2D node"  
-  }
-  TransformMatrix2D {
-   tx 175
-   ty 80
-   children [
-    DEF N1 Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-    Shape {
-     appearance DEF N7 Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["translated rectangle"]
-      fontStyle DEF N0 FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 15
-      }
-     }
-    }
-   ]
-  }
-  DEF N12 TransformMatrix2D {
-   mxx 0.707107
-   mxy 0.707107
-   tx -150
-   myx -0.707107
-   myy 0.707107
-   ty 80
-   children [
-    USE N1
-    Shape {
-     appearance USE N7
-     geometry Text {
-      string ["translated" "and" "Pi/4-rotated rectangle"]
-      fontStyle USE N0
-     }
-    }
-    DEF N17 TouchSensor {}
-    DEF N4 TimeSensor {
-     cycleInterval 2
-     startTime -1
-    }
-    DEF N9 ScalarInterpolator {
-     key [0 1]
-     keyValue [0.707107 1]
-    }
-    DEF N8 ScalarInterpolator {
-     key [0 1]
-     keyValue [0.707107 0]
-    }
-    DEF N6 ScalarInterpolator {
-     key [0 1]
-     keyValue [-0.707107 0]
-    }
-    DEF N5 ScalarInterpolator {
-     key [0 1]
-     keyValue [0.707107 1]
-    }
-   ]
-  }
-  DEF N11 TransformMatrix2D {
-   mxy 1
-   tx 120
-   ty -80
-   children [
-    USE N1
-    Shape {
-     appearance USE N7
-     geometry Text {
-      string ["translated" "and" "Pi/4-X-Skewed rectangle"]
-      fontStyle USE N0
-     }
-    }
-    DEF N15 TouchSensor {}
-    DEF N3 TimeSensor {
-     cycleInterval 2
-     startTime -1
-    }
-    DEF N16 ScalarInterpolator {
-     key [0 1]
-     keyValue [1 0]
-    }
-   ]
-  }
-  DEF N10 TransformMatrix2D {
-   tx -50
-   myx 1
-   ty -50
-   children [
-    USE N1
-    Shape {
-     appearance USE N7
-     geometry Text {
-      string ["translated" "and" "Pi/4-Y-Skewed rectangle"]
-      fontStyle USE N0
-     }
-    }
-    DEF N14 TouchSensor {}
-    DEF N2 TimeSensor {
-     cycleInterval 2
-     startTime -1
-    }
-    DEF N13 ScalarInterpolator {
-     key [0 1]
-     keyValue [1 0]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE N17.touchTime TO N4.startTime
-ROUTE N4.fraction_changed TO N9.set_fraction
-ROUTE N9.value_changed TO N12.mxx
-ROUTE N4.fraction_changed TO N8.set_fraction
-ROUTE N8.value_changed TO N12.mxy
-ROUTE N4.fraction_changed TO N6.set_fraction
-ROUTE N6.value_changed TO N12.myx
-ROUTE N4.fraction_changed TO N5.set_fraction
-ROUTE N5.value_changed TO N12.myy
-ROUTE N15.touchTime TO N3.startTime
-ROUTE N3.fraction_changed TO N16.set_fraction
-ROUTE N16.value_changed TO N11.mxy
-ROUTE N14.touchTime TO N2.startTime
-ROUTE N2.fraction_changed TO N13.set_fraction
-ROUTE N13.value_changed TO N10.myx
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-shapes-all.bt Deleted

@@ -1,267 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 460
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "The MPEG-4 primitive to display graphical objects on screen is the Shape node."
-    "The Shape node is allowed to have a child node contained in its geometry property." 
-    "This test shows the possible 2D nodes allowed in this geometry property:" 
-    "* IndexedLineSet2D: this node is used to draw polylines. This geometry is not considered closed, even if last point is equal to first point. As such, it cannot be filled. The origin of its local coordinate system is the point of coordinate (0,0)."
-    "* Circle: its only property is its radius. The origin of its local coordinate system is the center of the circle." 
-    "* Rectangle: its only property is its size (WxH). The origin of its local coordinate system is the center of the rectangle."
-    "* Curve2D (middle row): this node is used to display complex paths using Bezier Curves. It has two properties: type, points. Type gives the drawing types (segments or bezier), points gives the list of points to be consumed when reading the types. The node XCurve2D allows more drawing types (elliptical arcs ...):"
-    "cf bifs-2D-shapes-xcurve2D"
-    "* IndexedFaceSet2D: this node is similar to the IndexedLineSet2D node. It is used to display polygons (i.e. a list of segments implicitely closed by the segment [last point, first point]). The origin of its local coordinate system is the point of coordinate (0,0)."
-    "cf bifs-2D-shapes-indexfaceset2D"
-    "* PointSet2D: a list of points to be displayed (not really useful)"
-    ""
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 15:19:18 $ - $Revision: 1.5 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Basic 2D Geometry nodes"
-  }
-  Transform2D {
-   translation -150 150
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-      }
-     }
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["IndexedLineSet2D" "[-50 0 0 50 50 0]"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Circle" "radius 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Rectangle" "Size 100 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Curve2D Points:" "-50 0, -100 50, 0 20, 10 30, 40 80, 50 0"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      point DEF C2D Coordinate2D {
-       point [-50 0 -100 50 0 20 10 30 40 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["no type"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [2 3]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [2 3]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [1 3 1]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [1 3 1]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["IndexedFaceSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry PointSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["PointSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-shapes-indexfaceset2D.bt Deleted

@@ -1,123 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 420
-     pixelHeight 420
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a bit more how to use the IndexedFaceSet2D node with different color fill modes."
-    "This node can hold a Coordinate2D node to list points and use the coordIndex field to form faces (-1 separated indexes)."
-    "Each face can have different color. If colorPerVertex is TRUE each point has a separate color and the result is that a face is filled using color interpolation."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "IndexedFaceSet2D and Color Modes"
-  }
-  Transform2D {
-   scale 0.8 0.8
-   translation -120 120
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       lineProps DEF LP LineProperties {
-        width 6
-       }
-      }
-     }
-     geometry IndexedFaceSet2D {
-      colorIndex [0 1 2 3 4 5]
-      coordIndex [0 1 2 3 4 5]
-      color Color {
-       color [0 0 1 0 1 0 1 0 0 1 1 0 1 0 1 0 1 1]
-      }
-      coord Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.8 0.8
-   translation 120 120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      colorIndex [0 1 2 3 4 5]
-      coordIndex [0 1 2 3 4 5]
-      color Color {
-       color [0 0 1 0 1 0 1 0 0 1 1 0 1 0 1 0 1 1]
-      }
-      coord Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.8 0.8
-   translation -120 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps USE LP
-      }
-     }
-     geometry DEF IFS2 IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.8 0.8
-   translation 120 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       filled TRUE
-      }
-     }
-     geometry USE IFS2
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-shapes-indexlineset2D.bt Deleted

@@ -1,100 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 420
-     pixelHeight 420
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a bit more how to use the IndexedLineSet2D node with different line color modes."
-    "Similarly to the IndexedFaceSet2D, one can give a color to each point." 
-    "The result will be a line with a gradient color" 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"]
-   title "IndexedLineSet2D"
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -120 80
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        lineColor 0.1 0.1 0.8
-        width 10
-       }
-      }
-     }
-     geometry IndexedLineSet2D {
-      colorIndex [1 0 2 1 -1 1 0 2 1]
-      coordIndex [0 1 2 0 -1 3 4 5 3]
-      color Color {
-       color [1 1 0 1 0 1 0 1 1]
-      }
-      coord DEF COORD Coordinate2D {
-       point [-100 -100 0 -10 100 -100 100 100 0 10 -100 100]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation 120 80
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedLineSet2D {
-      colorIndex [1 0 2 -1 0 2 1]
-      colorPerVertex FALSE
-      coordIndex [0 1 2 0 -1 3 4 5 3]
-      color Color {
-       color [1 1 0 1 0 1 0 1 1]
-      }
-      coord USE COORD
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation 0 -80
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedLineSet2D {
-      colorPerVertex FALSE
-      coordIndex [0 1 2 0 -1 3 4 5 3]
-      coord USE COORD
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-shapes-pointset2D.bt Deleted

@@ -1,56 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-       "This shows the use of PointSet2D which is to display individual pixels on the screen." 
-       "" 
-       "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-       "(C) 2002-2006 GPAC Team"
-   ]
-   title "PointSet2D"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-      }
-     }
-     geometry PointSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-0.25 -0.25 0.25 -0.25 0.25 0.25 -0.25 0.25]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-shapes-xcurve2D.bt Deleted

@@ -1,188 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-       "This shows the use of XCurve2D." 
-       "This node is an extension of the Curve2D node. It allows more drawing types: quadratic Bezier curves and elliptical arcs."
-       "Both XCurve2D and Curve2D are similar to IndexedFaceSet2D and IndexedLineSet2D because they can be used to represent polygons and polylines. The difference is that it is not possible to assign a color or texture per point, nor a color per closed path. "
-       "" 
-       "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-       "(C) 2002-2006 GPAC Team"
-    ]
-   title "XCurve2D"
-  }
-  Transform2D {
-   translation -150 140
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        lineColor 0 0 1
-        width 8
-       }
-      }
-     }
-     geometry XCurve2D {
-      type [4]
-      point Coordinate2D {
-       point [0 0 40 0 40 0 40 40]
-      }
-     }
-    }
-    Transform2D {
-     translation 40 -60
-     children [
-      Shape {
-       appearance DEF TXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["anti-clockwise arc to" "point [0 0 40 0 40 0 40 40]"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 50 140
-   children [
-    Shape {
-     appearance USE APP
-     geometry XCurve2D {
-      type [5]
-      point Coordinate2D {
-       point [0 0 40 0 40 0 40 40]
-      }
-     }
-    }
-    Transform2D {
-     translation 40 -60
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["clockwise arc to" "point [0 0 40 0 40 0 40 40]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry XCurve2D {
-      type [7]
-      point Coordinate2D {
-       point [0 0 40 40 80 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 40 -30
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Quadratic Bezier arc to" "point [0 0 40 40 80 0 ]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry XCurve2D {
-      type [7 6]
-      point Coordinate2D {
-       point [0 0 40 40 80 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 40 -30
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Quadratic Bezier arc to" "with close path"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -120
-   children [
-    Shape {
-     appearance USE APP
-     geometry XCurve2D {
-      type [7 1]
-      point Coordinate2D {
-       point [0 0 40 40 80 0 0 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 40 -30
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Quadratic Bezier arc to" "without close path (lineTo origin)"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-compositetexture2D-background.bt Deleted

@@ -1,117 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the CompositeTexture node and how its background can be changed dynamically."
-    "Here, the texture is a circle repeated on the X and Y directions. Just one circle object is used here, the result of the drawing is translated in each directions, the object is not duplicated." 
-    "When the user moves the mouse over a circle, the background is changed. When the user clicks on a circle, the background is also changed." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2009-09-30 18:01:04 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "CompositeTexture and Background2D nodes"
-  }
-  Shape {
-   appearance Appearance {
-    material DEF M1 Material2D {
-     emissiveColor 0 1 0
-     filled TRUE
-    }
-    texture CompositeTexture2D {
-     pixelWidth 64
-     pixelHeight 64
-     children [
-      DEF B1 Background2D { backColor 0 1 1 }
-      DEF B2 Background2D { backColor 1 1 0 }
-      DEF B3 Background2D { backColor 1 0 0 }
-      DEF S Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-         transparency 0.5
-        }
-       }
-       geometry Circle {
-        radius 24
-       }
-      }
-      DEF TS TouchSensor {}
-     ]
-    }
-    textureTransform TextureTransform { scale 8 4 }
-   }
-   geometry Rectangle { size 300 150 }
-  }
-  
-  Transform2D {
-   translation 140 -110
-   children [
-    USE S
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Composite Texture Pattern" "Black color with 0.5 transparency"]
-        fontStyle DEF FS FontStyle {
-         family ["SANS"]
-         justify ["MIDDLE" "BEGIN"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 160
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Move mouse over texture" "to change texture background"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE TS.isOver TO B2.set_bind
-ROUTE TS.isActive TO B3.set_bind
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-compositetexture2D-bitmap.bt Deleted

@@ -1,89 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the CompositeTexture node."
-    "It allows defining a texture made of vector graphics objects, and to use the texture like images or video. It enables using hardware acceleration for texture operations."
-    "In mixed 3D/2D environment, it allows mapping 2D graphics on 3D objects."
-    "Texture in general may be repeated without the complexity of duplicating and translating the objects."
-    "Here, the texture is an animated circle on a red background. The resulting texture is used on a Bitmap node." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "CompositeTexture and Bitmap nodes"
-  }
-  Shape {
-   appearance Appearance {
-    material DEF M1 Material2D {
-     emissiveColor 0 1 0
-    }
-    texture CompositeTexture2D {
-     pixelWidth 100
-     pixelHeight 100
-     background	Background2D { backColor 1 0 0}
-     children [
-      DEF S Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-#         transparency 0.5
-         lineProps LineProperties { width 0 }
-        }
-       }
-       geometry DEF C Circle {
-        radius 20
-       }
-      }
-     ]
-    }
-   }
-   geometry Bitmap {scale 2 2}
-  }
-  
-  Transform2D {
-  	translation 200 0
-  	children [
-  		USE S
-  	]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [25 10 25]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO C.radius
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-compositetexture2D-transparent.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B Background2D {
-   backColor 1 1 0
-  }
-  WorldInfo {
-   info [
-    "This test shows how transparency applies to composite textures."
-    "" 
-    "GPAC Regression Tests" "$Date: 2009-05-20 17:11:40 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "CompositeTexture and Transparency"
-  }
-  Transform2D {
-   translation -20 80
-   rotationAngle 0.57
-   children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle { size 380 40 }
-      }
-   ]
-  }
-  Transform2D {
-   translation -20 80
-   children [
-      Shape {
-       appearance Appearance {
-        material DEF M1 Material2D {
-         emissiveColor 0 1 0
-        }
-        texture CompositeTexture2D {
-         pixelWidth 128
-         pixelHeight 128
-         children [
-          DEF S Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 0 0 0
-             filled TRUE
-             transparency 0.5
-            }
-           }
-           geometry Circle { radius 50 }
-          }
-          DEF TS TouchSensor {}
-         ]
-        }
-        textureTransform TextureTransform {
-         scale 8 4
-        }
-       }
-       #geometry Curve2D { type [2] point Coordinate2D { point [-300 0 -150 -500 150 500 300 0] } }
-       geometry Rectangle { size 300 150 }
-      }
-    ]
-  }
-  Transform2D {
-   translation 140 -100
-   children [
-    USE S
-    Transform2D {
-     translation 0 -50
-     children [
-      Shape {
-       appearance DEF APP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Composite Texture Pattern" "Black Circle Half-Transparent"]
-        fontStyle DEF FS FontStyle {
-         family ["SANS"]
-         justify ["MIDDLE" "BEGIN"]
-         size 20
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE B.backColor BY 1 0 0
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE B.backColor BY 1 1 0
-   }
-  }
- ]
-}
-
-ROUTE TS.isActive TO C.activate
-ROUTE TS.isActive TO RC.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-gradients-text.bt Deleted

@@ -1,137 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test uses a Viewport node, Gradient nodes and animation and TransformMatrix2D node in a text mirroring-like effect."
-    "" 
-    "GPAC Regression Tests" "$Date: 2008-10-31 18:08:50 $ - $Revision: 1.7 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Text Mirroring Effect"
-  }
-  Viewport {
-   size 200 200
-   description "Initial Viewport"
-  }
-#if 0
-  Viewport {
-   position -30 20
-   size 50 50
-   description "Text Center View"
-  }
-  Viewport {
-   position 75 0
-   size 50 50
-   description "Blending Zone View"
-  }
-#endif
-
-  DEF TR Transform2D {
-   children [
-    DEF PS PlaneSensor2D {
-     maxPosition 100 100
-     minPosition -100 0
-    }
-    Transform2D {
-     translation 2 -2
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         transparency 0
-         filled TRUE
-        }
-       }
-       geometry DEF T Text {
-        string ["Gradient" "Text Demo"]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "END"]
-         size 30
-         style "BOLD"
-        }
-       }
-      }
-     ]
-    }
-    DEF TESTSHAPE Shape {
-     appearance Appearance {
-      texture RadialGradient {
-       focalPoint 0.35 0.55
-       key [0 0.7 1]
-       keyValue [0 1 0.5 0 0.5 1 0 1 1]
-       radius 0.8
-      }
-     }
-     geometry USE T
-    }
-   ]
-  }
-  TransformMatrix2D {
-   mxy 1.5
-   myy -1
-   children [
-    USE TR
-   ]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      texture RadialGradient {
-       center 0.5 1
-       focalPoint 0.5 1
-       key [0 0.5 1]
-       keyValue [1 1 0 0.8 0 0.2 0.8 0 0.2]
-       opacity [0.8 1 1]
-       radius 1.2
-      }
-     }
-     geometry Rectangle {
-      size 200 200
-     }
-    }
-   ]
-  }
-  DEF TIME TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [1 1 1 0.75 1 1]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation
-ROUTE TIME.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO TR.scale
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-gradients-transparent.bt Deleted

@@ -1,120 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This shows usage of transparency with gradient" 
-    "Move the rectangle over the circle to see that the gradient is not uniformly transparent." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Gradient and Transparency"
-  }
-  DEF TR Transform2D {
-   translation 200 50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        width 0
-       }
-      }
-      texture DEF GL LinearGradient {
-       endPoint 1 1
-       key [0 0.4 1]
-       keyValue [0 0 1 1 0 1 0 1 1]
-       spreadMethod 1
-      }
-     }
-     geometry Rectangle {
-      size 200 200
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition 300 300
-     minPosition -300 -300
-     offset 200 50
-    }
-   ]
-  }
-  Transform2D {
-   scale 1 1.2
-   translation -50 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture RadialGradient {
-       focalPoint 0.75 0.5
-       key [0 0.6 1]
-       keyValue [1 1 1 1 0 0 1 1 0]
-       opacity [1 1 0.3]
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Drag square around screen"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF C PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [1 1 1 0 1 1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO C.set_fraction
-ROUTE C.value_changed TO GL.endPoint
-ROUTE PS.translation_changed TO TR.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-imagetexture-shapes.bt Deleted

@@ -1,282 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 440
-     pixelHeight 440
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows image displayed on the basic 2D shapes." 
-    "Image is considered as a texture and described in the ImageTexture node." 
-    "The url of this node points to the image using any internet protocol (http, rtsp) or using MPEG-4 OD." 
-    "The ImageTexture node is associated to the geometry as a children of the Shape node. The image is then clipped along the bounding box of the shape." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Displaying Images as a texture on any shape"
-  }
-  Transform2D {
-   translation -150 150
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["IndexedLineSet2D" "[-50 0 0 50 50 0]"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Circle" "radius 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-    Transform2D {
-     translation 0 -40
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Rectangle" "Size 100 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Curve2D Points:" "-50 0, -100 50, 0 20, 10 30, 40 80, 50 0"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      point DEF C2D Coordinate2D {
-       point [-50 0 -100 50 0 20 10 30 40 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["no type"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [2 3]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [2 3]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [1 3 1]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [1 3 1]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["IndexedFaceSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry PointSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["PointSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-lineargradient-simple.bt Deleted

@@ -1,75 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to fill object with linear gradients." 
-    "Here the start and end point of the gradient are close"
-    "You can click on the rectangle to move the start and the end of gradient." 
-    "You can also drag it." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Linear Gradient"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        width 0
-       }
-      }
-      texture DEF GL LinearGradient {
-       key [0 0.45 0.5 0.55 1]
-       keyValue [0.2118 0.447 0.039 0.2118 0.447 0.039 0.2627 0.933 0 0.2392 0.3098 0.04313 0.2392 0.3098 0.04313]
-       startPoint -1 0
-      }
-     }
-     geometry DEF R Rectangle {
-      size 400 20
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF SC Script {
-   eventIn SFVec3f set_frac
-   eventIn SFBool set_down
-   field SFNode grad USE GL
-   field SFBool isDown FALSE
-   url ["javascript:function set_down(value, timestamp) {isDown = value;}function set_frac(value, timestamp) {if (!isDown) return;pos = (value.x + 200)/400;grad.startPoint.x = pos - 1;grad.endPoint.x = 1 + pos;print('pos ' + pos);}"   ]
-  }
- ]
-}
-
-ROUTE TS.isActive TO SC.set_down
-ROUTE TS.hitPoint_changed TO SC.set_frac
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-lineargradient-spread.bt Deleted

@@ -1,113 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the different methods for spreading the gradients when the size of the object to be filled is large" 
-    "The end point of the gradient is also animated to change the gradient aspect." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Linear Gradient Spread Methods"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Move over and click" "to change the spread method"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF GL LinearGradient {
-       endPoint 0 0.5
-       key [0 0.5 1]
-       keyValue [0 0 1 1 0 0 0 1 0]
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 1
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 2
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE GL.spreadMethod BY 1
-   }
-  }
-  DEF TIME TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0 0.5 1 0.5 0 0.5]
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-ROUTE TS.isActive TO C2.activate
-ROUTE TS.isActive TO RC2.reverseActivate
-ROUTE TIME.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO GL.endPoint
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-movietexture-shapes.bt Deleted

@@ -1,285 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 440
-     pixelHeight 440
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a video displayed on the basic 2D shapes." 
-    "Video, like image, is considered as a texture and described in the MovieTexture node." 
-    "The url of this node points to the video using any internet protocol (http, rtsp) or using MPEG-4 OD." 
-    "The MovieTexture node is associated to the geometry as a children of the Shape node. The video is then clipped along the bounding box of the shape." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Displaying Videos as a texture on any shape"
-  }
-  Transform2D {
-   translation -150 150
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 1
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["IndexedLineSet2D" "[-50 0 0 50 50 0]"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Circle" "radius 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Rectangle" "Size 100 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Curve2D Points:" "-50 0, -100 50, 0 20, 10 30, 40 80, 50 0"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      point DEF C2D Coordinate2D {
-       point [-50 0 -100 50 0 20 10 30 40 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["no type"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [2 3]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [2 3]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [1 3 1]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [1 3 1]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["IndexedFaceSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry PointSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["PointSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-pixeltexture.bt Deleted

@@ -1,191 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B Background2D {
-   backColor 1 0 0
-  }
-  WorldInfo {
-   info [
-    "This test shows the usage of the PixelTexture node."
-    "The PixelTexture allows to define a non-vectorial synthetic texture. The texture is defined by giving its size, the color depth in byte, and the color components (ARGB) for each pixel in the texture" 
-    "In this scene, 4 circles are filled with a 4x4-pixels texture whose color depth are respectively 1 byte, 2 bytes, 3 and 4 bytes."
-    "1 byte corresponds to 8-bits grey scale"
-    "2 bytes corresponds to 8-bits grey scale + 8-bits transparency"
-    "3 bytes corresponds to 24-bits RGB"
-    "4 bytes corresponds to 32-bits ARGB"
-    "The background color of the scene is animated to see the effect on the texture." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Synthetic Non Vectorial Texture"
-  }
-  Transform2D {
-   translation -80 90
-   children [
-    Shape {
-     appearance Appearance {
-      texture PixelTexture {
-       image 4 4 1 
-       0xFF 0xFF 0x00 0x00 
-       0xFF 0xFF 0x00 0x00 
-       0x00 0x00 0xFF 0xFF 
-       0x00 0x00 0xFF 0xFF
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-        translation 0 -70
-        children [
-            Shape {
-                appearance DEF TA Appearance {
-                    material Material2D { 
-                        emissiveColor 1 1 1 
-                        filled TRUE
-                    }
-                }
-                geometry Text {
-                    string [ "Color Depth:" "1 Byte" ]
-                    fontStyle DEF FS FontStyle {
-                        size 20
-                        justify [ "MIDDLE" "MIDDLE" ]
-                        family "SANS"
-                    }
-                }
-            }
-        ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 90
-   children [
-    Shape {
-     appearance Appearance {
-      texture PixelTexture {
-       image 4 4 2 
-       0x00FF 0x00FF 0x0000 0x0000 
-       0x00FF 0x00FF 0x0000 0x0000 
-       0x0000 0x0000 0x00FF 0x00FF 
-       0x0000 0x0000 0x00FF 0x00FF
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-        translation 0 -70
-        children [
-            Shape {
-                appearance USE TA 
-                geometry Text {
-                    string [ "Color Depth:" "2 Bytes" ]
-                    fontStyle USE FS 
-                }
-            }
-        ]
-    }    
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    Shape {
-     appearance Appearance {
-      texture PixelTexture {
-       image 4 4 3 
-       0xFFFFFF 0xFFFFFF 0x00FF00 0x00FF00 
-       0xFFFFFF 0xFFFFFF 0x00FF00 0x00FF00 
-       0xFF00FF 0xFF00FF 0x000000 0x000000 
-       0xFF00FF 0xFF00FF 0x000000 0x000000
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-        translation 0 -70
-        children [
-            Shape {
-                appearance USE TA 
-                geometry Text {
-                    string [ "Color Depth:" "3 Bytes" ]
-                    fontStyle USE FS 
-                }
-            }
-        ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 -60
-   children [
-    Shape {
-     appearance Appearance {
-      texture PixelTexture {
-       image 4 4 4 
-       0xFFFFFF00 0xFFFFFF00 0x00FF00FF 0x00FF00FF 
-       0xFFFFFF00 0xFFFFFF00 0x00FF00FF 0x00FF00FF 
-       0xFF00FFFF 0xFF00FFFF 0x00000000 0x00000000 
-       0xFF00FFFF 0xFF00FFFF 0x00000000 0x00000000
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-        translation 0 -70
-        children [
-            Shape {
-                appearance USE TA 
-                geometry Text {
-                    string [ "Color Depth:" "4 Bytes" ]
-                    fontStyle USE FS 
-                }
-            }
-        ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF CI ColorInterpolator {
-   key [0 0.5 1]
-   keyValue [1 0 0 0 0 1 1 0 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO B.backColor
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-radialgradient-simple.bt Deleted

@@ -1,94 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to fill object with radial gradients" 
-    "The focal point can be moved to see the effect on the gradient." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Radial Gradient Focal Point"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Drag mouse on Shape" "to change the focal point"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF GR RadialGradient {
-       focalPoint 0.5 0.5
-       key [0 0.5 1]
-       keyValue [0 0 1 0 1 1 0 1 0]
-       radius 0.25
-       spreadMethod 1
-      }
-     }
-     geometry DEF R Rectangle {
-      size 200 200
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition 100 100
-     minPosition -100 -100
-    }
-   ]
-  }
-  DEF V Valuator {
-   Factor1 0.01
-   Factor2 0.01
-   Factor3 0
-   Factor4 0
-   Offset1 0.5
-   Offset2 0.5
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO V.inSFVec2f
-ROUTE V.outSFVec2f TO GR.focalPoint
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-radialgradient-spread.bt Deleted

@@ -1,118 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows the different methods for spreading radial gradients when the size of the object to be filled is large" 
-    "The focal point of the gradient is also animated to change the gradient aspect over time." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Radial Gradient Spread Methods"
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Move over and click" "to change the spread method"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        width 0
-       }
-      }
-      texture DEF GR RadialGradient {
-       focalPoint 0 0.5
-       key [0 0.5 1]
-       keyValue [0 0 1 1 0 0 0 1 0]
-      }
-     }
-     geometry DEF R Rectangle {
-      size 200 200
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 2
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 0
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 1
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE GR.spreadMethod BY 2
-   }
-  }
-  DEF TIME TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF CI PositionInterpolator2D {
-   key [0 0.25 0.5 0.75 1]
-   keyValue [0 0.5 0.5 1 1 0.5 0.5 0 0 0.5]
-  }
- ]
-}
-
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-ROUTE TS.isActive TO C2.activate
-ROUTE TS.isActive TO RC2.reverseActivate
-ROUTE TIME.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO GR.focalPoint
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-texturetransform-base.bt Deleted

@@ -1,234 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how a texture can be modified: either changing its positionning in the shape or its transparency" 
-    "The positioning is given using the TextureTransform node and the transparency using the Material2D node." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "TextureTransform"
-  }
-  Transform2D {
-   translation -180 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF TEXTURE ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry DEF REC Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["No Transform"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 14
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 140
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform TextureTransform {
-       rotation 0.78
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -60
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["TextureTransform: rotation PI/4"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 10
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform TextureTransform {
-       scale 0.5 1.5
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -60
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["TextureTransform: scale 0.5 1.5"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -120
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform TextureTransform {
-       translation 0.5 0
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -60
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["TextureTransform: translation 0.5 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 180 100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 1
-       filled TRUE
-       transparency 0.8
-      }
-      texture USE TEXTURE
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -60
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Material Transparency 0.8"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 180 -100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform TextureTransform {
-       center 0.5 0.5
-       rotation 0.78
-      }
-     }
-     geometry Circle {
-      radius 60
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Rotated On a Circle"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-texturetransform-interact.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-texturing-texturetransform-transformmatrix2D.bt Deleted

@@ -1,242 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a texture being transformed (e.g. skewed) and this transformation is animated." 
-    "The TransformMatrix2D is used here to allow skewing." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "ImageTexture"
-  }
-  Transform2D {
-   translation -180 100
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF TEXTURE ImageTexture {
-       url [od:10]
-      }
-      textureTransform DEF MX1 TransformMatrix2D {}
-
-     }
-     geometry DEF REC Rectangle {
-      size 150 100
-     }
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Texture horizontal scaling"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 14
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform DEF MX2 TransformMatrix2D {}
-
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Texture vertical scaling"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform DEF MX3 TransformMatrix2D {}
-
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Texture horizontal skewing"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform DEF MX4 TransformMatrix2D {
-       mxy 1
-      }
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Texture vertical skewing"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 180 100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform DEF MX5 TransformMatrix2D {}
-
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Texture horizontal translating"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 180 -100
-   children [
-    Shape {
-     appearance Appearance {
-      texture USE TEXTURE
-      textureTransform DEF MX6 TransformMatrix2D {}
-
-     }
-     geometry USE REC
-    }
-    Transform2D {
-     translation 0 -70
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Texture vertical translating"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 2 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO MX1.mxx
-ROUTE SI.value_changed TO MX2.myy
-ROUTE SI.value_changed TO MX3.mxy
-ROUTE SI.value_changed TO MX4.myx
-ROUTE SI.value_changed TO MX5.tx
-ROUTE SI.value_changed TO MX6.ty
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-viewport-complete.bt Deleted

@@ -1,715 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows usage of the viewport per layer" "Translated from SVG" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "SVG Test Suite - (C) W3C 2002"]
-   title "Animation Stream"
-  }
-  Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   translation -225 225
-   children [
-    Transform2D {
-     translation 0 -30
-     children [
-      Transform2D {
-       translation 10 -30
-       children [
-        Shape {
-         appearance DEF N0 Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string ["BIFS to fit"]
-          fontStyle DEF N13 FontStyle {
-           family ["SANS"]
-           size 9
-          }
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 20 -40
-       children [
-        DEF N4 Transform2D {
-         children [
-          Transform2D {
-           translation 15 -20
-           children [
-            Shape {
-             appearance Appearance {
-              material Material2D {
-               emissiveColor 0 0 0
-               filled TRUE
-               lineProps LineProperties {
-                lineColor 1 0 0
-               }
-              }
-             }
-             geometry Rectangle {
-              size 29 39
-             }
-            }
-           ]
-          }
-          Transform2D {
-           translation 0 -5
-           children [
-            Transform2D {
-             translation 15 -15
-             children [
-              Shape {
-               appearance Appearance {
-                material Material2D {
-                 emissiveColor 1 1 0
-                 filled TRUE
-                }
-               }
-               geometry Circle {
-                radius 10
-               }
-              }
-             ]
-            }
-            Transform2D {
-             translation 12 -12
-             children [
-              Shape {
-               appearance Appearance {
-                material Material2D {
-                 emissiveColor 0 0 0
-                 filled TRUE
-                }
-               }
-               geometry Circle {
-                radius 1.5
-               }
-              }
-             ]
-            }
-            Transform2D {
-             translation 17 -12
-             children [
-              Shape {
-               appearance Appearance {
-                material Material2D {
-                 emissiveColor 0 0 0
-                 filled TRUE
-                }
-               }
-               geometry Circle {
-                radius 1.5
-               }
-              }
-             ]
-            }
-            Shape {
-             appearance Appearance {
-              material Material2D {
-               emissiveColor 0 0 0
-               filled TRUE
-               lineProps LineProperties {
-                width 2
-               }
-              }
-             }
-             geometry Curve2D {
-              type [2]
-              point Coordinate2D {
-               point [10 -19 15 -22.75 15 -22.75 20 -19]
-              }
-             }
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 10 -110
-       children [
-        Shape {
-         appearance USE N0
-         geometry Text {
-          string ["Viewport 1"]
-          fontStyle USE N13
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 10 -120
-       children [
-        DEF N12 Transform2D {
-         translation 25 -15
-         children [
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             lineProps LineProperties {
-              lineColor 0 0 1
-             }
-            }
-           }
-           geometry Rectangle {
-            size 49 29
-           }
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 10 -180
-       children [
-        Shape {
-         appearance USE N0
-         geometry Text {
-          string ["Viewport 2"]
-          fontStyle USE N13
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 20 -190
-       children [
-        DEF N10 Transform2D {
-         translation 15 -30
-         children [
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             lineProps LineProperties {
-              lineColor 0 0 1
-             }
-            }
-           }
-           geometry Rectangle {
-            size 29 59
-           }
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 100 -60
-       children [
-        DEF N7 Transform2D {
-         translation 0 30
-         children [
-          Shape {
-           appearance USE N0
-           geometry Text {
-            string ["-------------- fit= 1 --------------"]
-            fontStyle USE N13
-           }
-          }
-         ]
-        }
-        Transform2D {
-         children [
-          DEF N14 Transform2D {
-           translation 15 15
-           children [
-            Shape {
-             appearance USE N0
-             geometry Text {
-              string ["alignment" "[ -1 * ]"]
-              fontStyle DEF N1 FontStyle {
-               family ["SANS"]
-               justify ["MIDDLE"]
-               size 9
-              }
-             }
-            }
-           ]
-          }
-          USE N12
-          Transform2D {
-           translation 25 -15
-           children [
-            Layer2D {
-             size 50 30
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [-1 0]
-              fit 1
-             }
-            }
-           ]
-          }
-         ]
-        }
-        Transform2D {
-         translation 70 0
-         children [
-          DEF N9 Transform2D {
-           translation 15 15
-           children [
-            Shape {
-             appearance USE N0
-             geometry Text {
-              string ["alignment" "[ 0 * ]"]
-              fontStyle USE N1
-             }
-            }
-           ]
-          }
-          USE N12
-          Transform2D {
-           translation 25 -15
-           children [
-            Layer2D {
-             size 50 30
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [0 0]
-              fit 1
-             }
-            }
-           ]
-          }
-         ]
-        }
-        Transform2D {
-         translation 0 -70
-         children [
-          DEF N5 Transform2D {
-           translation 15 15
-           children [
-            Shape {
-             appearance USE N0
-             geometry Text {
-              string ["alignment" "[ 1 * ]"]
-              fontStyle USE N1
-             }
-            }
-           ]
-          }
-          USE N12
-          Transform2D {
-           translation 25 -15
-           children [
-            Layer2D {
-             size 50 30
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [1 0]
-              fit 1
-             }
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 250 -60
-       children [
-        USE N7
-        Transform2D {
-         children [
-          DEF N11 Transform2D {
-           translation 15 15
-           children [
-            Shape {
-             appearance USE N0
-             geometry Text {
-              string ["alignment" "[ * -1 ]"]
-              fontStyle USE N1
-             }
-            }
-           ]
-          }
-          USE N10
-          Transform2D {
-           translation 15 -30
-           children [
-            Layer2D {
-             size 30 60
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [0 -1]
-              fit 1
-             }
-            }
-           ]
-          }
-          Transform2D {
-           translation 50 0
-           children [
-            DEF N3 Transform2D {
-             translation 15 15
-             children [
-              Shape {
-               appearance USE N0
-               geometry Text {
-                string ["alignment" "[ * 0 ]"]
-                fontStyle USE N1
-               }
-              }
-             ]
-            }
-            USE N10
-            Transform2D {
-             translation 15 -30
-             children [
-              Layer2D {
-               size 30 60
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-                alignment [0 0]
-                fit 1
-               }
-              }
-             ]
-            }
-           ]
-          }
-          Transform2D {
-           translation 100 0
-           children [
-            DEF N2 Transform2D {
-             translation 15 15
-             children [
-              Shape {
-               appearance USE N0
-               geometry Text {
-                string ["alignment" "[ * 1 ]"]
-                fontStyle USE N1
-               }
-              }
-             ]
-            }
-            USE N10
-            Transform2D {
-             translation 15 -30
-             children [
-              Layer2D {
-               size 30 60
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-                alignment [0 1]
-                fit 1
-               }
-              }
-             ]
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 100 -220
-       children [
-        DEF N6 Transform2D {
-         translation 0 30
-         children [
-          Shape {
-           appearance USE N0
-           geometry Text {
-            string ["---------- fit = 2 ----------"]
-            fontStyle USE N13
-           }
-          }
-         ]
-        }
-        USE N14
-        USE N10
-        Transform2D {
-         translation 15 -30
-         children [
-          Layer2D {
-           size 30 60
-           children [
-            USE N4
-           ]
-           viewport Viewport {
-            position 15 -20
-            size 30 40
-            alignment [-1 0]
-            fit 2
-           }
-          }
-         ]
-        }
-        Transform2D {
-         translation 50 0
-         children [
-          USE N9
-          USE N10
-          Transform2D {
-           translation 15 -30
-           children [
-            Layer2D {
-             size 30 60
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [0 0]
-              fit 2
-             }
-            }
-           ]
-          }
-         ]
-        }
-        Transform2D {
-         translation 100 0
-         children [
-          USE N5
-          USE N10
-          Transform2D {
-           translation 15 -30
-           children [
-            Layer2D {
-             size 30 60
-             children [
-              USE N4
-             ]
-             viewport Viewport {
-              position 15 -20
-              size 30 40
-              alignment [1 0]
-              fit 2
-             }
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 250 -190
-       children [
-        Transform2D {
-         translation 0 -30
-         children [
-          USE N6
-          Transform2D {
-           children [
-            USE N11
-            USE N12
-            Transform2D {
-             translation 25 -15
-             children [
-              Layer2D {
-               size 50 30
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-                alignment [0 -1]
-                fit 2
-               }
-              }
-             ]
-            }
-           ]
-          }
-          Transform2D {
-           translation 70 0
-           children [
-            USE N3
-            USE N12
-            Transform2D {
-             translation 25 -15
-             children [
-              Layer2D {
-               size 50 30
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-                alignment [0 0]
-                fit 2
-               }
-              }
-             ]
-            }
-           ]
-          }
-          Transform2D {
-           translation 140 0
-           children [
-            USE N2
-            USE N12
-            Transform2D {
-             translation 25 -15
-             children [
-              Layer2D {
-               size 50 30
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-                alignment [0 1]
-                fit 2
-               }
-              }
-             ]
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-      Transform2D {
-       translation 175 -300
-       children [
-        Transform2D {
-         translation 0 -30
-         children [
-          Transform2D {
-           translation 0 30
-           children [
-            Shape {
-             appearance USE N0
-             geometry Text {
-              string ["---------- fit = 0 ----------"]
-              fontStyle USE N13
-             }
-            }
-           ]
-          }
-          Transform2D {
-           children [
-            DEF N8 Transform2D {
-             translation 15 15
-             children [
-              Shape {
-               appearance USE N0
-               geometry Text {
-                string ["alignment" "[ * * ]"]
-                fontStyle USE N1
-               }
-              }
-             ]
-            }
-            USE N12
-            Transform2D {
-             translation 25 -15
-             children [
-              Layer2D {
-               size 50 30
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-               }
-              }
-             ]
-            }
-           ]
-          }
-          Transform2D {
-           translation 100 0
-           children [
-            USE N8
-            USE N10
-            Transform2D {
-             translation 15 -30
-             children [
-              Layer2D {
-               size 30 60
-               children [
-                USE N4
-               ]
-               viewport Viewport {
-                position 15 -20
-                size 30 40
-               }
-              }
-             ]
-            }
-           ]
-          }
-         ]
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-2D-viewport-simple.bt Deleted

@@ -1,88 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   url [od:10]
-  }
-  WorldInfo {
-   info ["This shows usage of Viewport in the scene" "viewport can be changed through the player's viewport list" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Viewport Test"
-  }
-  DEF VP Viewport {
-   size 200 200
-   orientation 0.5
-   alignment [0 0]
-   fit 2
-   description "basic Viewport"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture RadialGradient {
-       focalPoint 0.5 0.5
-       key [0 1]
-       keyValue [0 1 0 0 1 1]
-       radius 0.8
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
- ]
-}
-
-ROUTE TS.isOver TO VP.set_bind
-
-AT 0 {
- REPLACE VP.set_bind BY FALSE
-}
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 22
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-background-images.bt Deleted

@@ -1,87 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- includeInlineProfileLevelFlag true
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 300
-				  pixelHeight 300
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group {
- children [
-  WorldInfo {
-   info ["This shows Background with transparent texture on all back planes" "" "GPAC Regression Tests" "$Date: 2008-06-26 07:55:39 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Viewpoint {}
-  Background {
-   groundAngle [0.56 1.2]
-   groundColor [0 0 0, 0.1 0.8 0.8, 0.5 1 0]
-   skyAngle [0.5 1.2 1.8]
-   skyColor [0 0 0.5,  0.2 0.4 0.2, 0.4 0.1 0.0, 0.5 0.5 0.2]
-   frontUrl ["20"]
-   backUrl ["20"]
-   leftUrl ["20"]
-   rightUrl ["20"]
-   topUrl ["20"]
-   bottomUrl ["20"]
-  }
-
-#if 0
-  Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 1 1
-      }
-      texture ImageTexture { url ["./../auxiliary_files/logo.jpg"] }
-     }
-     geometry Box {
-      size 3 2 5
-     }
-    }
-   ]
-  }
-#endif
- ]
-}
-
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  20
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/logo.png"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-background.bt Deleted

@@ -1,56 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- includeInlineProfileLevelFlag true
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-Group {
- children [
-  WorldInfo {
-   info ["This shows a background node" "with ground and sky" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Background Test"
-  }
-  Viewpoint {}
-  Background {
-   groundAngle [0.56 1.2]
-   groundColor [0 0 0, 0.1 0.8 0.8, 0.5 1 0]
-   skyAngle [0.5 1.2 1.8]
-   skyColor [0 0 0.5,  0.2 0.4 0.2, 0.4 0.1 0.0, 0.5 0.5 0.2]
-  }
-
-  Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 1 1
-      }
-      texture ImageTexture { url ["./../auxiliary_files/logo.jpg"] }
-     }
-     geometry Box {
-      size 3 2 5
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-collision-proxy.bt Deleted

@@ -1,80 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Collision Test"
-   info ["This shows the collision node  " "used with a sphere proxy" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  DEF C Collision {
-  	proxy Shape { geometry Sphere { radius 6 }	}
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material { diffuseColor 0 1 0 }
-     	}
-      geometry Box {size 20 2 0.1}
-     }
-    ]
-  }
-  DEF S Script {
-  	eventIn SFTime on_collide
-  	eventOut MFString outText
-  	eventOut SFColor outCol
-  	url "javascript:
-  	function on_collide(value) {
-  		v = new SFColor(1, 0, 0);
-  		outCol = v;
-  		outText[0] = 'collision time: ' + value;
-  	}
-  	"
-  }
-  
-  Transform {
-  	translation 0 2 0
-  	children [
-  		Shape {
-  			appearance Appearance {
-  				material Material2D { emissiveColor 0 0 0 filled TRUE }
-  			}
-  			geometry DEF T Text {
-  				string "no collision"
-  				fontStyle FontStyle {
-  					size 2
-  					justify "MIDDLE"
-  				}
-  			}
-  		}
-  	]
-  }
-  			
- ]
-}
-
-ROUTE C.collideTime TO S.on_collide
-ROUTE S.outText TO T.string
-ROUTE S.outCol TO MAT.diffuseColor
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-collision.bt Deleted

@@ -1,79 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Collision Test"
-   info ["This shows the collision node  " "used without proxy" "" "GPAC Regression Tests" "$Date: 2008-06-26 07:55:39 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-  DEF C Collision {
-  	children [
-     DEF B Shape {
-     	appearance Appearance {
-     		material DEF MAT Material { diffuseColor 0 1 0 }
-     	}
-      geometry Box {size 20 0.5 0.1}
-     }
-    ]
-  }
-  DEF S Script {
-  	eventIn SFTime on_collide
-  	eventOut MFString outText
-  	eventOut SFColor outCol
-  	url "javascript:
-  	function on_collide(value) {
-  		v = new SFColor(1, 0, 0);
-  		outCol = v;
-  		outText[0] = 'collision time: ' + value;
-  	}
-  	"
-  }
-  
-  Transform {
-  	translation 0 0 0.055
-  	children [
-  		Shape {
-  			appearance Appearance {
-  				material Material2D { emissiveColor 0 0 0 filled TRUE }
-  			}
-  			geometry DEF T Text {
-  				string "no collision"
-  				fontStyle FontStyle {
-  					size 2
-  					justify "MIDDLE"
-  				}
-  			}
-  		}
-  	]
-  }
-  			
- ]
-}
-
-ROUTE C.collideTime TO S.on_collide
-ROUTE S.outText TO T.string
-ROUTE S.outCol TO MAT.diffuseColor
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-cylindersensor.bt Deleted

@@ -1,90 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
-  WorldInfo {
-   title "CylinderSensor test"
-   info ["This shows a cylinderSensor" "exercising isActive, rotationChanged and trackPoint_changed events" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-  Background2D {backColor 1 1 1}
-  Viewpoint {}
-  DEF TF Transform {
-   translation 2 0 0
-   children [
-    DEF CS CylinderSensor {
-    }
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 0 0
-      }
-     }
-     geometry Box {
-      size 2 2 1
-     }
-    }
-   ]
-  }
-
-  Transform {
-   translation -5 1 -10
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M Material {
-       diffuseColor 1 0 0.245
-      }
-     }
-     geometry Sphere { radius 2 }
-    }
-   ]
-  }
-  Transform {
-   translation 0 -3 0
-   children [
-    Shape {
-     #appearance Appearance { material Material2D { filled TRUE emissiveColor 0 1 0} }
-     appearance Appearance { material Material {emissiveColor 0 1 0 diffuseColor 0 0 1} }
-     geometry DEF TXT Text { string "Trackpoint" fontStyle FontStyle {size 0.8 justify "MIDDLE" } }
-    }
-   ]
-  }
-	DEF V Valuator{}
-	
-  DEF C Conditional {
-   buffer { REPLACE M.diffuseColor BY 0 0.25 0.65 }
-  }
-  DEF RC Conditional {
-   buffer { REPLACE M.diffuseColor BY 1 0 0.245}
-  }
-
- ]
-}
-ROUTE CS.isActive TO C.activate
-ROUTE CS.isActive TO RC.reverseActivate
-ROUTE CS.rotation_changed TO TF.rotation
-
-ROUTE CS.trackPoint_changed TO V.inSFVec3f
-ROUTE V.outMFString TO TXT.string

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-planesensor.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
-  Viewpoint {}
-  WorldInfo {
-   title "PlaneSensor test"
-   info ["This shows a planeSensor" "exercising isActive, translationChanged and trackPoint_changed events" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  Background2D {backColor 1 1 1}
-
-  DEF TF Transform {
-   translation 2 0 0
-   children [
-    DEF PS PlaneSensor {
-     maxPosition 2 2
-     minPosition -2 -2
-     offset 2 0 0
-    }
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 0 0
-      }
-     }
-     geometry Box {
-      size 2 2 1
-     }
-    }
-   ]
-  }
-
-  Transform {
-   translation -5 1 -10
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M Material {
-       diffuseColor 1 0 0.245
-      }
-     }
-     geometry Sphere { radius 2 }
-    }
-   ]
-  }
-  Transform {
-   translation 0 -3 0
-   children [
-    Shape {
-     appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0} }
-     geometry DEF TXT Text { string "Trackpoint" fontStyle FontStyle {size 0.8 justify "MIDDLE"} }
-    }
-   ]
-  }
-	DEF V Valuator{}
-
-  DEF C Conditional {
-   buffer { REPLACE M.diffuseColor BY 0 0.25 0.65 }
-  }
-  DEF RC Conditional {
-   buffer { REPLACE M.diffuseColor BY 1 0 0.245}
-  }
-
- ]
-}
-ROUTE PS.isActive TO C.activate
-ROUTE PS.isActive TO RC.reverseActivate
-ROUTE PS.translation_changed TO TF.translation
-
-ROUTE PS.trackPoint_changed TO V.inSFVec3f
-ROUTE V.outMFString TO TXT.string

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-proximitysensor.bt Deleted

@@ -1,80 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
- 	
-  WorldInfo {
-   title "ProximitySensor test"
-   info ["This shows a ProximitySensor" "exercising isActive event" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  Viewpoint {position 0 0 10}
-  DEF Box Transform {
-   children [
-    DEF PS ProximitySensor {
-     center 0 0 0
-     size 8 8 8
-    }
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material {
-       diffuseColor 1 0 0
-      }
-     }
-     geometry Box {
-      size 2 2 2
-     }
-    }
-   ]
-  }
-
-
-  DEF TS TimeSensor {
-   cycleInterval 5.0  
-   loop TRUE
-   startTime -1
-  }  
-
-  DEF Animation OrientationInterpolator {
-   key   [0.0,
-	0.20,
- 	0.40,
-	0.60,
-	0.80,
-	1.0]
-   keyValue [0 1 0 0,
-	0 1 0 1.57079,
-	0 1 0 3.14159,
-	0 1 0 4.71238,
-	0 1 0 5.52456,
-	0 1 0 6.28318]
-  }
- ]
-}
-
-ROUTE PS.enterTime TO TS.startTime
-ROUTE PS.exitTime TO TS.stopTime
-
-ROUTE TS.fraction_changed TO Animation.set_fraction
-ROUTE Animation.value_changed TO Box.rotation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-spheresensor.bt Deleted

@@ -1,90 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
-  Viewpoint {}
-  WorldInfo {
-   title "SphereSensor test"
-   info ["This shows a SphereSensor" "exercising isActive, rotationChanged and trackPoint_changed events" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  Background2D {backColor 1 1 1}
-
-  DEF TF Transform {
-   translation 2 0 0
-   children [
-    DEF CS SphereSensor {
-    }
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 0 0
-      }
-     }
-     geometry Box {
-      size 4 4 1
-     }
-    }
-   ]
-  }
-
-  Transform {
-   translation -5 1 -10
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M Material {
-       diffuseColor 1 0 0.245
-      }
-     }
-     geometry Sphere { radius 2 }
-    }
-   ]
-  }
-  Transform {
-   translation 0 -3 0
-   children [
-    Shape {
-     appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0} }
-     geometry DEF TXT Text { string "Trackpoint" fontStyle FontStyle {size 0.8 justify "MIDDLE"} }
-    }
-   ]
-  }
-	DEF V Valuator{}
-
-  DEF C Conditional {
-   buffer { REPLACE M.diffuseColor BY 0 0.25 0.65 }
-  }
-  DEF RC Conditional {
-   buffer { REPLACE M.diffuseColor BY 1 0 0.245}
-  }
-
- ]
-}
-ROUTE CS.isActive TO C.activate
-ROUTE CS.isActive TO RC.reverseActivate
-ROUTE CS.rotation_changed TO TF.rotation
-
-ROUTE CS.trackPoint_changed TO V.inSFVec3f
-ROUTE V.outMFString TO TXT.string

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-interactivity-visibilitysensor.bt Deleted

@@ -1,100 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
- 	
-  Viewpoint {position 0 0 10}
-
-  WorldInfo {
-   title "VisibilitySensor test"
-   info ["This shows a VisibiliitySensor" "controling spinning of a cube" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-
-  Transform {
-  	translation 10 0 0
-   children [
-  DEF PS VisibilitySensor {
-   center 0 0 0
-   size 8 8 8
-  }
-    Shape {
-     appearance Appearance {
-      material Material {
-       diffuseColor 1 1 0
-      }
-     }
-     geometry Box {
-      size 8 8 8
-     }
-    }
-   ]
-  }
-
-
-  DEF Box Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material {
-       diffuseColor 1 0 0
-      }
-     }
-     geometry Box {
-      size 2 2 2
-     }
-    }
-   ]
-  }
-
-
-  DEF TS TimeSensor {
-   cycleInterval 5.0  
-   loop TRUE
-   startTime -1
-  }  
-
-  DEF Animation OrientationInterpolator {
-   key   [0.0,
-	0.20,
- 	0.40,
-	0.60,
-	0.80,
-	1.0]
-   keyValue [0 1 0 0,
-	0 1 0 1.57079,
-	0 1 0 3.14159,
-	0 1 0 4.71238,
-	0 1 0 5.52456,
-	0 1 0 6.28318]
-  }
- ]
-}
-
-ROUTE PS.enterTime TO TS.startTime
-ROUTE PS.exitTime TO TS.stopTime
-
-ROUTE TS.fraction_changed TO Animation.set_fraction
-ROUTE Animation.value_changed TO Box.rotation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-lighting-directionalLight.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-children [
-	NavigationInfo {type ["ANY" "EXAMINE"] headlight FALSE}
-
-  WorldInfo {
-   title "DirectionalLight test"
-   info ["This shows a directional light" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	DirectionalLight {
-		color 1 0 0
-		direction 0 1 1
-	}
-	DEF BB Group {
-		children [
-			DEF B Shape {
-				appearance Appearance { material Material {}} 
-				geometry Box { size 1 1 1}
-		  }
- 	  	Transform {
-  	    translation 2 0 0
-  	    children [ USE B]
-  	  }
-  	  Transform {
- 	    	translation -2 0 0
- 	    	children [ USE B]
- 	   	}
- 	  ]
- 	}
- 	Transform {
- 		translation 0 2 0
- 		children [ USE BB]
- 	}
- 	Transform {
- 		translation 0 -2 0
- 		children [ USE BB]
- 	}
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-lighting-fog.bt Deleted

@@ -1,56 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
-   WorldInfo {
-   title "Fog test"
-   info ["This shows a fog" "with varying visibility range" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-	DEF AFOG Fog {color 0.2 0.2 0.2 visibilityRange 4}
-  Transform {
-   children [
-   	Inline { url "./../auxiliary_files/nefertiti.wrl"}
-   	DirectionalLight { color 1 0 0 direction 1 1 -1 }
-    DEF TOUCH TouchSensor{}
-   ]
-  }
-  DEF TS TimeSensor {cycleInterval 6.0  loop TRUE }
-  DEF SI ScalarInterpolator{
-	  key [0 0.5 1]
-	  keyValue [16 0 16]
-  }
-  DEF V Valuator {
-  	Factor1 -1
-  	Offset1 1
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO AFOG.visibilityRange
-
-ROUTE TOUCH.isOver TO V.inSFBool 
-ROUTE V.outSFBool TO AFOG.set_bind
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-lighting-pointlight.bt Deleted

@@ -1,71 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-children [
-	NavigationInfo {type ["ANY" "EXAMINE"] headlight FALSE}
-
-  WorldInfo {
-   title "PointLight test"
-   info ["This shows a point light" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-	DEF SP PointLight {
-		location 0.0 0.0 2.0
-		color 0 0 1
-		attenuation 1 0.5 0
-	}
-	DEF BB Group {
-		children [
-			DEF B Shape {
-				appearance Appearance { material Material {}} 
-				geometry Box { size 1 1 1}
-		  }
- 	  	Transform {
-  	    translation 2 0 0
-  	    children [ USE B]
-  	  }
-  	  Transform {
- 	    	translation -2 0 0
- 	    	children [ USE B]
- 	   	}
- 	  ]
- 	}
- 	Transform {
- 		translation 0 2 0
- 		children [ USE BB]
- 	}
- 	Transform {
- 		translation 0 -2 0
- 		children [ USE BB]
- 	}
-  DEF TS TimeSensor { loop TRUE cycleInterval 2}
-  DEF CI PositionInterpolator {
-  	key [0 0.5 1]
-  	keyValue [1 0 0 1 1 0 1 0 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO SP.attenuation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-lighting-spotlight.bt Deleted

@@ -1,72 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-children [
-	NavigationInfo {type ["ANY" "EXAMINE"] headlight FALSE}
-
-  WorldInfo {
-   title "SpotLight test"
-   info ["This shows a spot light" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-	DEF SL SpotLight {
-		location 0.0 0.0 2.0
-		color 0 0 1 	
-		direction 0 0 -1
-	}
-	DEF BB Group {
-		children [
-			DEF B Shape {
-				appearance Appearance { material Material {}} 
-				geometry Box { size 1 1 1}
-		  }
- 	  	Transform {
-  	    translation 2 0 0
-  	    children [ USE B]
-  	  }
-  	  Transform {
- 	    	translation -2 0 0
- 	    	children [ USE B]
- 	   	}
- 	  ]
- 	}
- 	Transform {
- 		translation 0 2 0
- 		children [ USE BB]
- 	}
- 	Transform {
- 		translation 0 -2 0
- 		children [ USE BB]
- 	}
-
-  DEF TS TimeSensor { loop TRUE cycleInterval 2}
-  DEF CI PositionInterpolator {
-  	key [0 0.5 1]
-  	keyValue [-2 0 -1 2 0 -1 -2 0 -1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO SL.direction

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-billboard-viewer-alignment.bt Deleted

@@ -1,62 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Billboard Test"
-   info ["This shows a Billboard in viewer-align mode" "The green box coordinate system should onlyt be a translation of the viewer one" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-	Viewpoint {position 0 0 10}
-	NavigationInfo { type ["EXAMINE" "ANY"] }
-  Billboard {
-  	axisOfRotation 0 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor  0 1 0
-     			shininess 0.5
-     		}
-     	}
-      geometry Box {size 0.5 0.5 0.5}
-     }
-    ]
-  }
-  Transform {
-  	translation -1 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 1 0 0
-     		}
-     	}
-      geometry Box {size 0.5 0.5 0.5}
-     }
-    ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-billboard.bt Deleted

@@ -1,61 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-  WorldInfo {
-   title "Billboard Test"
-   info ["This shows a Billboard" "The green box should rotate to face the viewer" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	Viewpoint {position 0 0 10}
-  Billboard {
-  	axisOfRotation 0 1 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor  0 1 0
-     			shininess 0.5
-     		}
-     	}
-      geometry Box {size 0.5 0.5 0.5}
-     }
-    ]
-  }
-  Transform {
-  	translation -1 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 1 0 0
-     		}
-     	}
-      geometry Box {size 0.5 0.5 0.5}
-     }
-    ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-gravity.bt Deleted

@@ -1,71 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-	children [
-		NavigationInfo {avatarSize [0.25 1.6 8] }
-	  Viewpoint {position 0 0 50}
-	  WorldInfo {
-	   title "Gravity test"
-	   info ["This shows an rectangle used as ground" "with an jumpable obstacle" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-	  }
-		Group { 
-		 children [
-			Background2D { backColor 1 1 1}
-		  DEF TR Transform {
-		  	rotation 1 0 0 1.57
-		  	translation 0 -8 -10
-		  	children [
-		     Shape {
-		     	appearance Appearance {
-		     		material DEF MAT Material {
-		     			diffuseColor 0 1 0
-		     			shininess 0.5
-		     		}
-		     	}
-		      geometry Rectangle {size 50 100}
-		     }
-		    ]
-		  }
-		  Transform {
-		  	translation 0 -8 -10
-		  	children [
-		  		DEF B Shape {
-		  			appearance Appearance {
-			     		texture ImageTexture { url "./../auxiliary_files/logo.jpg"}
-		  			}
-		  			geometry Box { size 2 2 2 }
-		  		}
-		  	]
-		  }
-		  Transform {
-		  	translation -10 -7 -10
-		  	children [
-		  		USE B Shape
-		  	]
-		  }
-		 ]
-		}
-	]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-layer3D-views.bt Deleted

@@ -1,160 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-
-  Background2D {backColor 1 1 1 url "od:10"}
-	MediaControl {url "od:10" loop TRUE}
-
-  WorldInfo {
-   title "Layer3D test"
-   info ["This shows several Layer3D nodes" "offering different views of the same scene" "navigation is not enabled on all layers" "" "GPAC Regression Tests" "$Date: 2008-11-24 14:58:25 $ - $Revision: 1.6 $" "(C) 2002-2004 GPAC Team"]
-  }
-	Transform2D {
-		translation -100 0
-		children [
-			Shape {
-				appearance DEF TXTAPP Appearance {
-					material Material2D { emissiveColor 1 0 0 filled TRUE }
-				}
-				geometry Text {
-					string ["This text" "is behind"]
-					fontStyle FontStyle {
-						size 26
-						justify ["MIDDLE", "BEGIN"]
-					}
-				}
-			}
-			Layer3D {
-				#SHORTCUT inline viewpoint otherwise the rotation will make all models rotate
-				viewpoint Viewpoint {position 0 -100 1000 }
-				# this forbids navigation in layer
-				navigationInfo NavigationInfo {type ["None"]}
-				size 200 200
-				children [
-						DEF TR Transform {
-	  					children [
-								DEF NEF Inline { url "../auxiliary_files/nefertiti.wrl" }
-							]
-						}
-				]
-			}
-			Shape {
-				appearance USE TXTAPP
-				geometry Text {
-					string ["This text" "is in front"]
-					fontStyle FontStyle {
-						size 26
-						justify ["MIDDLE", "END"]
-					}
-				}
-			}
-		]
-	}
-
-	Transform2D {
-		translation 100 50
-		children [
-			Layer3D {
-				viewpoint Viewpoint {position 0 -100 1000 }
-				navigationInfo NavigationInfo {type ["EXAMINE"] }
-				size 200 100
-				children [
-					Background2D {url "20" }
-					USE NEF
-		   ]
-		  }
-		]
-	}
-	Transform2D {
-		translation 100 -50
-		children [
-			Layer3D {
-				viewpoint Viewpoint {position 0 -100 1000 }
-				navigationInfo NavigationInfo {headlight FALSE}
-				size 200 100
-				children [
-					Background2D { backColor 0 0 1 }
-  				DEF DL DirectionalLight { color 0.8 0.2 0.2 direction 0 0 -1 }
-					USE NEF
-				]
-			}
-		]
-	}
-	
-
-  DEF TS TimeSensor { cycleInterval 8.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [0 1 0 0, 0 1 0 3.14, 0 1 0 6.26]
- 	}
-  DEF OI_L PositionInterpolator  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [-1 0 0, 0 0 -1, 1 0 0, 0 0 -1, -1 0 0]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-
-ROUTE TS.fraction_changed TO OI_L.set_fraction
-ROUTE OI_L.value_changed TO DL.direction
-
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      OCR_ES_ID 10
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/enst_video.h264"
-		      }
-		    }
-		  ]
-		}
-		ObjectDescriptor {
-		  objectDescriptorID  20
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/logo.png"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-layer3D.bt Deleted

@@ -1,193 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-
-  Background2D {url "./../auxiliary_files/sky.jpg" }
-
-  WorldInfo {
-   title "Layer3D test"
-   info ["This shows a Layer3D using the entire window" "and layer2D/layer3D defining a 2D control panel" "" "GPAC Regression Tests" "$Date: 2008-11-24 14:58:25 $ - $Revision: 1.5 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	Shape {
-		appearance Appearance { material DEF M2D Material2D {filled TRUE emissiveColor 0 1 0} }
-  	geometry Rectangle { size 150 150 }
-	}
-
-	Switch {
-	  whichChoice 0
-		choice [
-     Layer3D {
-			size 400 200
-			navigationInfo DEF NAV NavigationInfo {type ["Walk","ANY"] }
-			children [
-				DEF BACK Background {frontUrl "./../auxiliary_files/logo.png" }
-				Inline {url "./../auxiliary_files/nefertiti.wrl"}
-		  ]
-		 }
-		]
-	}
-	Layer2D {
-		size -1 -1
-		children [
-			Transform2D {
-				translation 0 100
-				children [
-					Shape {
-						appearance DEF TXTAPP Appearance {material Material2D { emissiveColor 0 0 0 filled TRUE } }
-						geometry Text {
-							string ["This is a Layer3D displaying" "an inline scene with a Layer2D interface"]
-							fontStyle DEF FS FontStyle {
-								size 18
-								justify ["MIDDLE", "BEGIN"]
-							}
-						}
-					}
-				]
-			}
-			Transform2D {
-				translation -150 -60
-				children [
-					Shape {
-						appearance Appearance { material DEF MAT_NAV Material2D {filled TRUE emissiveColor 1 0 0} }
-						geometry Rectangle { size 20 20 }
-					}
-					DEF TS_NAV TouchSensor {}
-					Transform2D {
-						scale 0.8 0.8
-						translation 0 -20
-						children [
-							Shape {
-								appearance USE TXTAPP
-								geometry DEF TXT_NAV Text {
-									string ["Walk"]
-									fontStyle USE FS
-								}
-							}
-						]
-					}
-				]
-			}
-			Transform2D {
-				translation 150 -60
-				children [
-					Layer3D {
-						size 40 40
-    				navigationInfo NavigationInfo {type ["Examine"] }
-    				viewpoint Viewpoint {position 0 0 40}
-						children [
-						  Background2D {backColor 1 0 0}
-							DEF TR Transform {
-								children [
-									Shape {
-										appearance Appearance { 
-#										 material Material { emissiveColor 0 1 0}
-                     texture ImageTexture { url "./../auxiliary_files/logo.jpg"}
-                    }
-										geometry Box { size 20 20 20}
-									}
-									DEF TS_BACK TouchSensor {}
-								]
-							}
-						]
-					}
-					Transform2D {
-						scale 0.8 0.8
-						translation 0 -20
-						children [
-							Shape {
-								appearance USE TXTAPP
-								geometry DEF TXT_BACK Text {
-									string ["Background Off"]
-									fontStyle USE FS
-								}
-							}
-						]
-					}
-				]
-			}
-		]
-	}
-
-	DEF SC Script {
-		eventIn SFBool set_nav
-		eventIn SFBool set_back
-		field SFNode the_nav USE NAV 
-		field SFNode the_back USE BACK
-		field SFNode navmat USE MAT_NAV 
-		field SFNode navtxt USE TXT_NAV 
-		field SFNode backtxt USE TXT_BACK
-		url "javascript:
-		function initialize(value) {
-			nav_set = 0;
-			back_set = 0;
-		}
-		function set_nav(value) {
-			if (!value) return;
-			if (nav_set) {
-				nav_set = 0;
-  			navmat.emissiveColor = new SFColor(1, 0, 0);
-				navtxt.string[0] = 'Walk';
-				the_nav.type[0] = 'Walk';
-			} else {
-				navmat.emissiveColor = new SFColor(0, 1, 0);
-				navtxt.string[0] = 'Examine';
-				the_nav.type[0] = 'Examine';
-				nav_set = 1;
-			}
-		}
-		function set_back(value) {
-			if (!value) return;
-			if (back_set) {
-				the_back.set_bind = false;
-				backtxt.string[0] = 'Background Off';
-				back_set = 0;
-			} else {
-				backtxt.string[0] = 'Background On';
-				the_back.set_bind = true;
-				back_set = 1;
-			}
-		}
-		"
-	}
-	
-  DEF TIME TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- ]
-}
-
-
-ROUTE TS_NAV.isActive TO SC.set_nav
-ROUTE TS_BACK.isActive TO SC.set_back
-ROUTE TIME.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TIME.fraction_changed TO M2D.transparency
-
-
-AT 100 { REPLACE BACK.set_bind BY 0 }

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-lod.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
- children [
-  DirectionalLight {
-   color 1 1 1
-  }
-  WorldInfo {
-   title "LOD test"
-   info ["This shows LOD with 2 level of details" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-   children [
-    LOD { 
-     range [ 4 ]
-     center 0 0 0
-     level [
-      Shape {
-       appearance Appearance {
-        material Material {
-         diffuseColor 1 0 0
-        }
-       }
-       geometry Sphere { radius 1 }
-      }
-      Shape {
-       appearance Appearance {
-        material Material {
-         diffuseColor 0 1 0
-        }
-       }
-       geometry Box { size 1 1 1 }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-positioning-transform.bt Deleted

@@ -1,64 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Transform test"
-   info ["This shows 3D transform on a box" "using DEF/USE and oriented scaling" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  DEF TR Transform {
-  	translation -50 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     		}
-     	}
-      geometry Box {size 50 50 50}
-     }
-    ]
-  }
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
-  Transform {
-  	translation 100 0 0
-  	scale 0.5 0.5 1
-  	scaleOrientation 1 0 0 0.2
-  	children [
-  		USE TR
-  	]
-  		
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-box-transparent.bt Deleted

@@ -1,117 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0x01
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric TRUE
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group {
- children [
-	Background2D {backColor 1 1 1}
-  WorldInfo {
-   title "Bitmap Test"
-   info ["This shows dragable bitmap with outscale" "with movieTexture in Meter Metrics" "and an animated textured box" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-  Viewpoint {
-   position 0 0 200
-  }
-  DEF TR Transform {
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {}
-     		texture ImageTexture { url 5}
-     	}
-      geometry Box {size 20 20 20}
-     }
-    ]
-  }
-
-  Transform2D {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture MovieTexture { 
-         url 10 
-         loop TRUE
-        }
-       }
-       geometry Bitmap {}
-      }
-     ]
-    }
-   ]
-  }
-
-  DEF TS TimeSensor { cycleInterval 10.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26, 1 1 1 3.14, 1 1 1 6.26]
- 	}
-  DEF PI PositionInterpolator  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [-60 60 0, 60 60 0, 60 -60 0, -60 -60 0, -60 60 0]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO TR.translation
-ROUTE TS.fraction_changed TO MAT.transparency
-
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      OCR_ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/enst_video.h264"
-		      }
-		    }
-		  ]
-		}
-		ObjectDescriptor {
-		  objectDescriptorID  5
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-						fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-box.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-cone.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 300
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cone test"
-   info ["This shows a cone" "with and without cap" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material {diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cone {height 150 bottomRadius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cone {height 150 bottomRadius 25 bottom FALSE}
-     }
-    ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-cylinder.bt Deleted

@@ -1,92 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 380
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cylinder test"
-   info ["This shows a cylinder" "with and without cap and side" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -100 100 0
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material {diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 100 0
-  	rotation 1 0 0 0.78
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25 top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation -100 -100 0
-  	rotation 1 0 0 -0.78
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25 bottom FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 -100 0
-  	rotation 1 0 0 1.2
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25 bottom FALSE top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 100 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25 side FALSE }
-     }
-    ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-elevationgrid.bt Deleted

@@ -1,74 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-  children [
-  	NavigationInfo {type ["ANY" "EXAMINE"]}
-  	Background2D { backColor 1 0 1}
-  	Viewpoint { position 0 0 300 }
-	  WorldInfo {
-	   title "ElevationGrid test"
-	   info ["This shows an ElevationGrid" "with interaction and texturing" "" "GPAC Regression Tests" "$Date: 2008-06-26 07:55:39 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-	  }
-  	Transform {
-  		translation -100 0 0
-  		children [
-		    Shape {
-		    	appearance Appearance {
-		    		material DEF MAT Material { diffuseColor 1 0 0 }
-		    		texture DEF TX ImageTexture {url "../auxiliary_files/logo.jpg"} 
-		    	}
-		      geometry ElevationGrid {
-				  	creaseAngle 2
-				    xSpacing 15
-				    zSpacing 8
-				    xDimension 12
-				    zDimension 11
-				    height [ 17, 14, 16, 12, 14, 21, 20, 11,  9, 16, 13, 13,
-					     22, 14, 17, 12, 15, 21, 17, 10, 14, 12, 19, 16,
-					     17, 11, 13, 11,  9, 13, 11, 11, 17,  9, 15, 11,
-					      9,  8,  6, 10,  7, 12, 15,  8, 11,  5,  7,  9,
-					      0,  0,  0,  0,  0,  5, 12,  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,
-					      6,  2,  0, -2, -6,-12,-11, -7, -2,  0,  1,  6,
-					      9,  3, -1, -4, -9,-15,-13,-11, -4, -1,  3,  9,
-					     11,  8,  1, -5,-11,-15,-11, -9, -7, -1,  5,  7,
-					      9,  8, -2,-10, -9, -9,-11,-13, -9,  1,  8,  6 ]
-				  }
-		    }
-		  ]
-		}
-    DEF TS TouchSensor {}
-		DEF C1 Conditional { buffer { REPLACE MAT.diffuseColor BY 0 0 1} }
-		DEF RC1 Conditional { buffer { REPLACE MAT.diffuseColor BY 1 0 0} }
-		DEF C2 Conditional { buffer { REPLACE TX.url BY "./../auxiliary_files/logo.png"} }
-		DEF RC2 Conditional { buffer { REPLACE TX.url BY ""} }
-  ]
-}
-
-ROUTE TS.isOver TO C1.activate
-ROUTE TS.isOver TO RC1.reverseActivate
-ROUTE TS.isActive TO C2.activate
-ROUTE TS.isActive TO RC2.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-extrusion.bt Deleted

@@ -1,99 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group {
-  children [
-  	
-  	Background2D { backColor 1 1 1}
-    DEF VIEWPOINT Viewpoint {
-        description "one"
-        position 0 0 10
-        orientation 0 1 0 0
-    }
-	  WorldInfo {
-	   title "Extrusion test"
-	   info ["This shows an Extrusion" "with interaction and texturing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-	  }
-
-
-		DEF TR Transform {
-			translation 0 -1 0
-			children [
-				Shape {
-					appearance Appearance {material Material {diffuseColor 1.0 0.8 0.0} texture DEF TX ImageTexture{} }
-					geometry Extrusion {
-						creaseAngle 1
-						endCap FALSE
-						beginCap TRUE
-						solid  FALSE
-						crossSection [
-						# Circle
-							 1.00  0.00,   0.92 -0.38,
-							 0.71 -0.71,   0.38 -0.92,
-							 0.00 -1.00,  -0.38 -0.92,
-							-0.71 -0.71,  -0.92 -0.38,
-							-1.00 -0.00,  -0.92  0.38,
-							-0.71  0.71,  -0.38  0.92,
-							 0.00  1.00,   0.38  0.92,
-							 0.71  0.71,   0.92  0.38,
-							 1.00  0.00
-						]
-						spine [
-						# Straight-line
-							0.0 0.0 0.0,  0.0 0.4 0.0,
-							0.0 0.8 0.0,  0.0 1.2 0.0,
-							0.0 1.6 0.0,  0.0 2.0 0.0,
-							0.0 2.4 0.0,  0.0 2.8 0.0,
-							0.0 3.2 0.0,  0.0 3.6 0.0,
-							0.0 4.0 0.0
-						]
-						scale [
-							1.8  1.8,  1.95 1.95,
-							2.0  2.0,  1.95 1.95
-							1.8  1.8,  1.5  1.5
-							1.2  1.2,  1.05 1.05,
-							1.0  1.0,  1.05  1.05,
-							1.15 1.15,
-						]
-					}
-				}
-				DEF TOUCH TouchSensor {}
-			]
-		}
-
-  DEF TS TimeSensor { cycleInterval 8.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
-		DEF C Conditional { buffer { REPLACE TX.url BY "./../auxiliary_files/logo.png"} }
-		DEF RC Conditional { buffer { REPLACE TX.url BY ""} }
-	]
-}
-
-ROUTE TOUCH.isActive TO C.activate
-ROUTE TOUCH.isActive TO RC.reverseActivate
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-indexedfaceset.bt Deleted

@@ -1,66 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "IndexedFaceSet test"
-   info ["This shows an IFS" "with and without colorPerVertex" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -1.5 0 0
-  	children [
-     Shape {
-     	geometry IndexedFaceSet {
-     		coord DEF COORD Coordinate {
-					point [-1 -1 1 1 -1 1 1 1 1 -1 1 1 1 1 -1 -1 1 -1 -1 -1 -1 1 -1 -1]
-				}
-				coordIndex [0 1 2 3 -1 1 7 4 2 -1 7 6 5 4 -1 0 3 5 6 -1 3 2 4 5 -1 6 7 1 0 -1]
-				color DEF COL Color { 
-					color [ 1 0 0, 0 1 0, 0 0 1, 1 1 0, 1 0 1, 0 1 1, 1 0.5 0.5, 0.5 0.5 1]
-				}
-				colorPerVertex TRUE
-   		}
-   	}
-   ]
-  }
-  Transform {
-  	translation 1.5 0 0
-  	children [
-     Shape {
-     	geometry IndexedFaceSet {
-     		coord USE COORD
-				coordIndex [0 1 2 3 -1 1 7 4 2 -1 7 6 5 4 -1 0 3 5 6 -1 3 2 4 5 -1 6 7 1 0 -1]
-				color USE COL
-				colorPerVertex FALSE
-				colorIndex [0 1 2 3 4 5 6 7]
-   		}
-   	}
-   ]
-  }
- ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-indexedlineset.bt Deleted

@@ -1,99 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "IndexedLineSet test"
-   info ["This shows an ILS" "with and without color per vertex" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -1.5 0 0
-  	children [
-     Shape {
-     	geometry IndexedLineSet {
-     		coord DEF COORD Coordinate {
-     			point [
-     				# the top of the cube
-						-1.0 1.0 1.0,
-						1.0 1.0 1.0,
-						1.0 1.0 -1.0,
-						-1.0 1.0 -1.0,
-						# around the bottom of the cube
-						-1.0 -1.0 1.0,
-						1.0 -1.0 1.0,
-						1.0 -1.0 -1.0,
-						-1.0 -1.0 -1.0
-					]
-				}
-				coordIndex [ 
-					# top
-					0, 1, 2, 3, 0, -1,
-					# bottom
-					4, 5, 6, 7, 4, -1,
-					# vertical edges
-					0, 4, -1,
-					1, 5, -1,
-					2, 6, -1,
-					3, 7
-				]
-				color Color {
-					color [1 0 0, 0 1 0, 0 0 1, 1 1 0]
-				}
-				colorPerVertex TRUE
-				colorIndex [0, 1, 2, 3, 0, -1, 0, 1, 2, 3, 0, -1, 0, 3, -1, 0, 2, -1, 0, 1, -1, 1 3]
-			}
-	   }
-   ]
-  }
-  Transform {
-  	translation 1.5 0 0
-  	children [
-     Shape {
-     	geometry IndexedLineSet {
-     		coord USE COORD 
-				coordIndex [ 
-					# top
-					0, 1, 2, 3, 0, -1,
-					# bottom
-					4, 5, 6, 7, 4, -1,
-					# vertical edges
-					0, 4, -1,
-					1, 5, -1,
-					2, 6, -1,
-					3, 7
-				]
-				color Color {
-					color [1 0 0, 0 1 0, 0 0 1, 1 1 0, 0 1 1, 1 0 1]
-				}
-				colorPerVertex FALSE
-				colorIndex [0, 1, 2, 3, 4, 5]
-			}
-		}
-   ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-nonlineardeformer.bt Deleted

@@ -1,796 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 400
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group {
-	children [
-
-  WorldInfo {
-   info ["This shows NonLinearDeformer" "in different modes and differnet axis." "Deformation is controled through the NLD.extend field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "NonLinearDeformer Test"
-  }
-  Viewpoint { position 0 -1 10 }
-  NavigationInfo {type ["EXAMINE"]}
-  Transform {
-  	translation -0.1337 -2.107 -1.839
-  	children [
-  	
-    Shape {
-      appearance Appearance {
-        material Material {
-          diffuseColor 0.9804 0.9804 0.9804
-        }
-      }
-      geometry DEF NLD NonLinearDeformer {
-      	type 0
-      	param 1
-      	axis 0 1 0
-      	extend [0 0.5 0.5 1 1 0.2]
-      	geometry IndexedFaceSet {
-        ccw TRUE
-        solid FALSE
-        creaseAngle 2
-        coord Coordinate { point [
-          -2.116 1.757 -1.271, -2.036 1.587 -1.231, -2.136 1.607 -1.391, 
-          -2.206 1.837 -1.361, -2.216 1.867 -1.161, -2.116 1.697 -1.111, 
-          -2.066 1.457 -1.131, -1.946 1.607 -0.9606, -1.966 1.387 -1.011, 
-          -2.076 1.337 -1.251, -2.096 1.397 -1.301, -2.396 1.687 -1.561, 
-          -2.306 1.477 -1.521, -2.466 1.527 -1.711, -2.446 1.737 -1.651, 
-          -2.396 1.877 -1.491, -2.326 1.217 -1.511, -2.186 1.437 -1.431, 
-          -2.086 1.257 -1.391, -2.096 1.127 -1.411, -2.196 0.9375 -1.391, 
-          -2.386 1.017 -1.521, -2.486 1.217 -1.691, -2.056 0.9875 -1.251, 
-          -1.976 1.267 -1.141, -1.876 1.167 -1.121, -1.996 0.8775 -1.001, 
-          -2.116 0.8775 -1.201, -1.946 1.267 -1.001, -1.916 1.297 -0.9206, 
-          -1.966 1.197 -0.9206, -1.886 1.127 -0.9906, -1.946 1.287 -1.081, 
-          -1.986 1.017 -0.8106, -1.926 1.127 -0.7606, -1.896 0.9375 -0.6006, 
-          -1.976 0.7975 -0.6606, -1.926 0.9575 -0.9206, -2.136 0.7675 -0.8906, 
-          -1.996 0.5875 -0.6606, -2.136 0.5575 -0.9806, -2.226 0.7575 -1.111, 
-          -1.906 0.3475 -0.6006, -1.856 0.5175 -0.5106, -1.746 0.2775 -0.5806, 
-          -1.906 0.2275 -0.7406, -2.036 0.3375 -0.9706, -2.046 0.4775 -0.7806, 
-          -1.866 0.7975 -0.5406, -2.296 0.8575 -1.351, -2.196 0.6175 -1.211, 
-          -2.236 0.6575 -1.421, -2.346 0.8575 -1.581, -2.386 0.9575 -1.541, 
-          -2.116 0.4775 -1.171, -1.776 0.2875 -0.9306, -1.846 0.4775 -1.181, 
-          -1.566 0.2275 -0.7506, -1.566 0.4375 -0.9906, -1.636 0.7175 -1.341, 
-          -1.986 0.7375 -1.431, -1.756 1.027 -1.601, -2.136 1.097 -1.701, 
-          -2.276 1.537 -1.751, -2.536 1.687 -1.771, -2.466 1.217 -1.751, 
-          -1.966 1.377 -1.751, -2.076 1.717 -1.721, -2.316 1.877 -1.631, 
-          -2.546 1.537 -1.741, -2.546 1.747 -1.671, -2.556 1.937 -1.611, 
-          -2.536 1.897 -1.581, -2.206 1.947 -1.611, -2.326 2.037 -1.421, 
-          -2.316 2.027 -1.231, -2.176 2.067 -1.291, -2.356 1.927 -1.331, 
-          -2.186 1.907 -1.061, -1.976 1.957 -1.001, -2.106 1.857 -1.041, 
-          -1.866 0.9475 -0.3906, -1.936 1.367 -0.2506, -1.946 1.297 -0.0005862, 
-          -1.886 0.8775 0.4194, -1.806 0.4475 0.2294, -1.786 0.1875 0.1694, 
-          -1.806 0.3175 -0.2706, -1.366 0.3575 -2.181, -1.406 0.05749 -1.281, 
-          -1.556 -0.1525 -0.7106, -1.516 -0.6325 -1.151, -1.146 -0.6925 -1.741, 
-          -1.086 -0.2125 -1.911, -1.786 -0.1825 0.03941, -1.766 -0.1525 -0.3606, 
-          -1.706 -0.09251 0.3694, -1.706 -0.3625 0.2894, -1.616 -1.023 -0.1406, 
-          -1.646 -0.8525 -0.4206, -1.576 -0.8825 -0.6006, -1.556 -1.053 -0.4206, 
-          -1.346 -1.333 -0.3906, -1.486 -1.393 -0.9606, -0.7163 -0.6425 -2.381, 
-          -1.036 -1.113 -2.021, -0.7363 -1.093 -2.401, -0.0763 -0.5625 -2.381, 
-          -0.5963 -0.5225 -2.471, -0.5563 -0.4825 -2.571, -1.056 -0.03251 -2.361, 
-          -0.0963 -1.093 -2.371, -0.1063 -1.473 -2.511, -0.7963 -1.483 -2.531, 
-          -1.366 -1.963 -1.861, -1.386 -2.313 -2.071, -0.9363 -1.943 -2.681, 
-          -0.7963 -1.913 -2.791, -0.8963 -3.243 -3.621, -1.706 -3.973 -3.811, 
-          -0.9963 -4.103 -4.111, -0.2363 -4.093 -4.191, -0.2063 -3.353 -3.741, 
-          -0.1663 -2.603 -3.231, -0.8963 -2.513 -3.141, -1.126 -2.563 -3.001, 
-          -1.386 -3.223 -3.371, -0.1363 -2.063 -2.891, -1.826 -3.313 -2.851, 
-          -2.236 -3.693 -2.581, -2.136 -3.713 -3.151, -1.536 -2.833 -2.451, 
-          -1.946 -3.423 -2.331, -1.926 -3.633 -2.031, -1.956 -4.303 -1.764, 
-          -2.226 -3.873 -2.171, -1.676 -3.073 -2.071, -1.666 -3.253 -1.851, 
-          -1.696 -4.023 -1.671, -1.426 -4.363 -1.411, -1.276 -5.023 -1.261, 
-          -1.666 -4.683 -1.501, -1.486 -3.683 -1.491, -1.246 -4.053 -1.211, 
-          -1.216 -4.623 -1.281, -1.376 -3.073 -1.221, -1.476 -2.773 -1.491, 
-          -1.406 -2.483 -1.201, -1.166 -2.893 -0.7706, -1.046 -3.473 -0.8406, 
-          -1.526 -2.563 -1.731, -1.446 -2.233 -1.511, -0.8263 -5.193 -1.071, 
-          -0.9163 -4.373 -1.001, -0.6763 -4.483 -1.001, -0.5263 -5.313 -1.121, 
-          -0.3563 -5.333 -1.131, -0.3663 -4.643 -1.021, -0.1763 -4.753 -1.051, 
-          -0.1963 -5.383 -1.131, -0.4363 -3.893 -0.7006, -0.8863 -3.613 -0.7806, 
-          -0.4763 -3.393 -0.5006, -0.1263 -3.533 -0.5006, -0.1463 -4.033 -0.7306, 
-          -1.456 -1.853 -1.241, -1.386 -1.483 -1.611, -1.486 -1.443 -1.231, 
-          -1.316 -2.193 -0.8206, -0.5163 -2.813 -0.2806, -1.036 -3.023 -0.7006, 
-          -1.196 -2.353 -0.6606, -0.8663 -2.103 -0.1806, -0.5563 -1.883 0.2294, 
-          -0.0963 -2.933 -0.2106, -1.346 -1.533 -0.5406, -1.096 -1.573 -0.1606, 
-          -0.0563 -1.943 0.3194, -0.0363 -1.683 0.7494, -0.5663 -1.643 0.5794, 
-          -1.146 -1.393 0.3994, -1.516 -1.173 -0.2506, -1.286 -1.353 0.1994, 
-          -1.386 -1.193 0.4494, -0.5363 -1.483 1.049, -0.9463 -1.283 1.249, 
-          -0.5563 -1.473 1.399, -0.0063 -1.513 1.649, -1.566 -0.8925 0.3994, 
-          -1.396 -0.7425 0.8494, -1.636 0.04749 0.7194, -1.476 -0.1825 0.9894, 
-          -1.296 -0.3925 1.199, -1.146 -0.7725 1.289, -0.9763 -1.073 1.419, 
-          -0.6263 -1.363 1.779, -0.2763 -1.483 1.829, -0.7363 -1.173 1.769, 
-          -0.5263 -1.183 2.009, -0.3963 -1.373 1.969, 0.0137 -1.353 2.069, 
-          -0.3563 -1.223 2.149, -0.3663 -0.9425 2.139, 0.0237 -1.013 2.219, 
-          0.0237 -1.233 2.209, -0.9063 -0.8825 1.549, -0.9963 -0.5625 1.519, 
-          -0.7563 -0.6625 1.699, -0.6463 -0.8825 1.859, -1.736 0.2775 0.4994, 
-          -1.846 0.8575 0.7094, -1.696 0.3575 0.8394, -1.576 0.3675 1.109, 
-          -1.386 -0.1125 1.169, -1.756 0.8475 1.009, -1.536 0.8375 1.299, 
-          -1.326 0.4575 1.419, -1.056 0.08749 1.569, -1.106 0.6175 1.629, 
-          -0.8663 0.3575 1.769, -0.8263 0.05749 1.839, -1.026 -0.2525 1.579, 
-          -0.2263 -0.6525 2.109, -0.3863 -0.6325 2.069, -0.2463 -0.5525 2.179, 
-          0.0337 -0.6925 2.129, -0.4063 -0.5325 2.129, -0.4963 -0.4525 2.019, 
-          -0.4163 -0.3925 2.099, -0.2663 -0.4225 2.199, -0.0963 -0.4525 2.209, 
-          0.0437 -0.5625 2.209, -0.1563 -0.2725 2.139, 0.0537 -0.3125 2.179, 
-          0.0437 -0.4525 2.229, -0.5263 -0.5725 1.919, -0.7363 -0.3125 1.709, 
-          -0.5263 0.02749 1.999, -0.4263 -0.08251 2.099, -0.4263 -0.1925 2.079, 
-          -0.4063 -0.2825 2.039, -0.2963 -0.2825 2.109, -0.3363 -0.1525 2.159, 
-          -0.0563 -0.1425 2.299, -0.1863 -0.1425 2.229, -0.1263 0.02749 2.299, 
-          0.0637 -0.002507 2.319, 0.0537 -0.1425 2.299, -0.3363 -0.04251 2.209, 
-          -0.0863 0.1175 2.279, -0.2563 0.4275 2.069, -0.0263 0.3575 2.229, 
-          0.0737 0.3275 2.229, 0.0637 0.1175 2.259, -0.6963 0.1875 1.899, 
-          -0.4263 0.4675 1.969, -0.0763 0.6175 2.109, -0.3663 0.5675 2.149, 
-          -0.2263 0.6175 2.279, -0.0963 0.5975 2.359, -0.0163 0.5075 2.409, 
-          -0.4363 0.6075 2.049, -0.4963 0.6675 1.899, -0.3963 0.7375 2.139, 
-          -0.2663 0.6775 2.319, -0.0963 0.6675 2.489, -0.1363 0.8275 2.439, 
-          -0.0063 0.8675 2.529, 0.0937 0.7575 2.569, 0.0837 0.4875 2.439, 
-          -1.306 0.8475 1.509, -1.456 1.227 1.339, -1.206 1.167 1.509, 
-          -0.9263 0.8775 1.709, -0.8763 1.187 1.649, -1.126 1.447 1.479, 
-          -0.8663 1.457 1.549, -0.5663 1.487 1.569, -0.4163 1.357 1.749, 
-          -0.5063 1.017 1.849, -0.2963 0.9775 1.999, -0.2063 0.9075 2.229, 
-          -0.0763 1.177 2.229, -0.3263 1.697 1.629, -0.0663 2.097 1.749, 
-          0.1037 1.417 2.229, 0.1237 2.127 1.839, -1.386 1.727 1.249, 
-          -1.466 1.567 1.219, -1.646 1.747 0.9494, -1.346 1.887 1.359, 
-          -1.296 1.767 1.359, -1.206 1.647 1.409, -1.096 1.607 1.479, 
-          -1.146 1.707 1.479, -0.9963 1.697 1.529, -0.8663 1.597 1.529, 
-          -0.6463 1.607 1.549, -0.7663 1.707 1.549, -0.5263 1.727 1.479, 
-          -0.4563 1.667 1.539, -0.5063 1.947 1.539, -0.3563 2.047 1.509, 
-          -1.646 1.277 1.149, -1.816 1.417 0.8194, -1.906 1.207 0.5394, 
-          -1.906 1.537 0.2594, -1.836 1.747 0.4994, -1.806 1.717 0.7294, 
-          -1.436 2.037 1.149, -1.716 1.877 0.8394, -1.596 2.197 1.099, 
-          -1.186 2.287 1.359, -1.786 2.037 0.7494, -1.886 1.877 0.009414, 
-          -1.796 2.277 0.4294, -1.656 2.317 1.039, -0.9863 2.337 1.459, 
-          -0.8663 2.057 1.589, -1.086 2.037 1.549, -0.9963 2.527 1.529, 
-          -0.6863 2.507 1.579, -0.7163 2.307 1.479, -0.4863 2.207 1.479, 
-          -0.3563 2.367 1.649, -0.3163 2.517 1.709, -0.6463 2.677 1.629, 
-          -0.5563 2.997 1.479, -0.1163 2.867 1.549, -1.036 2.737 1.529, 
-          -1.326 2.467 1.369, -1.386 2.627 1.359, -1.026 3.027 1.369, 
-          0.1337 2.747 1.589, 0.1437 3.517 1.219, -0.3963 3.517 1.239, 
-          -1.026 3.427 1.129, -1.436 3.257 0.9294, -1.386 2.897 1.179, 
-          -1.696 2.607 0.7894, -1.836 2.567 0.06941, -1.706 2.937 0.5194, 
-          -1.916 2.047 -0.7406, 1.934 0.7375 0.6094, 1.854 0.7275 0.9194, 
-          1.944 1.297 0.7194, 2.004 1.917 -0.8406, 2.044 1.827 -1.101, 
-          1.994 1.477 -1.061, 2.004 1.237 -0.3506, 2.004 1.747 -0.09059, 
-          2.024 1.167 -0.1006, 2.014 1.407 0.1594, 1.964 1.627 0.3994, 
-          1.964 2.157 0.3294, 1.994 2.447 -0.03059, 1.694 3.157 0.8494, 
-          1.914 2.817 0.4294, 1.634 2.797 1.099, 1.624 2.527 1.279, 
-          1.904 2.487 0.6994, 1.854 2.207 0.9494, 1.284 2.957 1.309, 
-          1.304 3.357 1.069, 0.6837 3.487 1.209, 0.8237 2.957 1.439, 
-          0.3837 2.847 1.539, 1.554 2.377 1.299, 1.794 2.087 1.009, 
-          1.404 2.207 1.289, 1.624 1.937 1.069, 1.234 2.457 1.469, 
-          0.9037 2.627 1.589, 1.284 2.667 1.469, 0.9237 2.457 1.539, 
-          0.5937 2.337 1.629, 0.2937 2.087 1.739, 0.5637 2.487 1.689, 
-          0.5637 2.017 1.489, 1.294 1.957 1.489, 1.534 1.797 1.289, 
-          0.7137 1.907 1.509, 0.7037 2.167 1.449, 0.9437 2.257 1.439, 
-          1.074 1.997 1.539, 1.214 2.267 1.399, 1.874 1.757 0.7494, 
-          1.954 1.917 0.6494, 1.944 1.597 0.6294, 1.804 1.637 0.8594, 
-          2.004 1.077 0.4394, 1.954 0.7575 0.3194, 0.7437 1.447 1.539, 
-          0.5937 1.327 1.719, 0.6437 1.627 1.509, 1.624 1.467 1.139, 
-          1.294 1.367 1.419, 1.384 1.567 1.339, 1.784 1.167 1.059, 
-          1.654 0.7375 1.219, 1.604 1.127 1.259, 1.354 1.087 1.439, 
-          0.5137 1.667 1.609, 0.7137 1.687 1.449, 0.9537 1.647 1.509, 
-          1.184 1.627 1.469, 1.044 1.537 1.479, 1.334 1.627 1.419, 
-          1.474 1.677 1.289, 0.8237 1.557 1.509, 1.034 1.397 1.499, 
-          1.274 1.527 1.419, 1.554 1.637 1.169, 1.754 0.2475 0.7494, 
-          0.6637 0.9775 1.819, 0.4637 0.9575 1.979, 0.1937 0.8575 2.519, 
-          0.3137 0.8175 2.429, 0.2637 1.167 2.219, 0.3837 0.8875 2.209, 
-          0.4337 0.6575 2.299, 0.5537 0.7075 2.119, 0.6337 0.6275 1.869, 
-          1.064 0.8175 1.659, 0.9737 0.2975 1.719, 1.224 0.5375 1.569, 
-          0.5537 0.4375 1.939, 1.034 1.127 1.599, 1.434 0.7575 1.439, 
-          1.424 0.3675 1.349, 0.1737 0.4975 2.409, 0.2637 0.6575 2.479, 
-          0.1637 0.3475 2.229, 0.3837 0.5975 2.259, 0.2537 0.5875 2.349, 
-          0.5137 0.5375 2.129, 0.3937 0.4075 2.049, 0.5837 0.5775 2.019, 
-          0.2237 0.6075 2.099, 0.6337 -0.01251 1.969, 0.8037 0.1375 1.859, 
-          0.9237 -0.002507 1.789, 0.2437 0.01749 2.289, 0.2137 0.1075 2.269, 
-          0.4437 -0.07251 2.189, 0.2537 -0.2825 2.129, 0.2937 -0.1625 2.219, 
-          0.4337 -0.1725 2.139, 0.5237 -0.2225 2.059, 0.5237 -0.1125 2.079, 
-          0.1637 -0.1525 2.289, 0.3537 -0.4425 2.179, 0.3837 -0.3025 2.089, 
-          0.4937 -0.3125 2.019, 0.4937 -0.4225 2.079, 0.8037 -0.7125 1.659, 
-          0.5837 -0.6125 1.889, 0.8037 -0.3625 1.669, 0.5737 -0.4825 1.989, 
-          1.084 -0.3225 1.529, 1.034 -0.6325 1.469, 0.6837 -0.9225 1.829, 
-          0.4137 -0.9725 2.119, 0.4537 -0.6625 2.049, 0.3237 -0.5725 2.169, 
-          0.1837 -0.4625 2.199, 0.4837 -0.5625 2.109, 0.2937 -0.6725 2.099, 
-          1.324 -0.4725 1.129, 1.164 -0.8425 1.229, 1.514 -0.2825 0.9094, 
-          1.434 -0.2025 1.099, 1.674 -0.06251 0.6294, 1.144 0.01749 1.509, 
-          1.654 0.2675 1.029, 1.774 0.1675 0.4094, 1.844 0.3275 0.1394, 
-          1.804 0.06749 0.07941, 1.714 -0.2025 0.2794, 0.7537 -1.223 1.729, 
-          0.5537 -1.213 1.979, 0.9737 -1.133 1.369, 0.9237 -0.9425 1.499, 
-          0.9237 -1.343 1.199, 0.4037 -1.403 1.949, 0.2737 -1.503 1.819, 
-          0.5337 -1.513 1.369, 0.3837 -1.243 2.129, 0.6237 -1.403 1.749, 
-          1.694 -0.4725 0.1994, 1.524 -0.9925 0.3194, 1.384 -0.8325 0.7794, 
-          1.324 -1.283 0.3794, 1.074 -1.463 0.3394, 1.534 -1.123 -0.2206, 
-          1.564 -0.9525 -0.5006, 1.464 -1.153 -0.5006, 0.4937 -1.513 1.019, 
-          0.4837 -1.673 0.5494, 1.424 -1.263 -0.3306, 1.204 -1.433 0.1394, 
-          1.234 -1.413 -0.4606, 0.9837 -1.643 -0.2106, 0.4437 -1.913 0.1994, 
-          0.2337 -3.413 -0.5206, 0.7137 -2.153 -0.2206, 1.004 -2.423 -0.7206, 
-          1.124 -2.273 -0.8806, 1.214 -1.613 -0.6106, 1.344 -1.483 -1.031, 
-          0.7737 -3.533 -0.8906, 0.6137 -3.663 -0.8206, 0.9337 -2.963 -0.8206, 
-          0.8037 -3.083 -0.7506, 1.184 -2.563 -1.271, 0.3237 -2.843 -0.3006, 
-          0.8537 -1.173 -2.071, 1.204 -1.563 -1.681, 1.004 -0.7625 -1.801, 
-          1.414 -0.7225 -1.231, 1.324 -1.533 -1.301, 1.144 -2.043 -1.931, 
-          1.224 -2.323 -1.581, 1.264 -1.943 -1.311, 1.214 -2.863 -1.561, 
-          0.9137 -4.123 -1.271, 0.5837 -4.423 -1.041, 0.3337 -4.513 -1.031, 
-          0.1437 -3.913 -0.7206, 0.0137 -4.653 -1.031, -0.0463 -5.343 -1.141, 
-          0.1237 -5.333 -1.141, 0.4337 -5.233 -1.101, 0.8437 -4.693 -1.331, 
-          0.8837 -5.093 -1.321, 1.344 -4.123 -1.751, 1.584 -4.413 -1.854, 
-          1.284 -4.773 -1.581, 1.164 -3.773 -1.561, 1.354 -3.353 -1.931, 
-          1.264 -2.653 -1.801, 1.124 -2.393 -2.141, 1.364 -3.173 -2.151, 
-          1.114 -3.153 -1.281, 1.064 -4.443 -1.471, 1.004 -3.303 -3.431, 
-          1.244 -4.073 -3.891, 1.724 -3.833 -3.251, 1.854 -3.823 -2.691, 
-          1.854 -4.003 -2.281, 1.594 -3.533 -2.421, 1.224 -2.923 -2.521, 
-          0.6737 -1.993 -2.721, 0.8037 -2.623 -3.051, 1.584 -3.743 -2.121, 
-          1.464 -3.423 -2.941, 0.5237 -1.953 -2.821, 0.5737 -2.563 -3.181, 
-          0.4937 -3.283 -3.661, 0.5137 -4.153 -4.151, 0.5437 -1.133 -2.431, 
-          0.5637 -1.523 -2.571, 0.4337 -0.5525 -2.501, 0.3937 -0.5125 -2.591, 
-          1.274 0.2775 -2.251, 0.9237 -0.09251 -2.411, 0.9737 -0.2825 -1.961, 
-          0.5537 -0.6825 -2.411, 1.734 -0.2625 -0.4506, 1.504 -0.2525 -0.7906, 
-          1.484 -0.9825 -0.6806, 1.724 0.1675 -0.6706, 1.774 -0.2925 -0.05059, 
-          1.804 0.1975 -0.3606, 1.534 0.1275 -0.8306, 1.854 0.3975 -0.6106, 
-          1.884 0.6775 -0.6406, 1.534 0.3375 -1.071, 1.334 -0.03251 -1.351, 
-          1.604 0.6175 -1.421, 1.734 0.9175 -1.691, 1.944 1.177 -1.021, 
-          1.954 1.007 -0.8606, 1.904 0.8275 -0.4906, 1.924 0.8175 -0.7006, 
-          1.994 1.257 -1.111, 2.164 1.557 -1.221, 2.164 1.717 -1.151, 
-          2.234 1.927 -1.401, 2.244 1.767 -1.181, 2.374 1.877 -1.351, 
-          2.264 1.727 -1.281, 2.404 1.777 -1.451, 2.564 1.737 -1.711, 
-          2.434 1.717 -1.621, 2.244 1.697 -1.481, 2.464 1.577 -1.781, 
-          2.564 1.587 -1.801, 2.374 1.887 -1.541, 2.244 1.807 -1.731, 
-          2.094 1.587 -1.831, 2.344 1.727 -1.751, 2.584 1.767 -1.741, 
-          2.544 1.527 -1.901, 2.114 0.9575 -1.811, 2.314 0.7075 -1.701, 
-          2.444 1.057 -1.881, 2.314 1.327 -1.641, 2.464 1.367 -1.841, 
-          2.464 1.057 -1.821, 2.364 0.8675 -1.641, 2.364 0.8075 -1.661, 
-          2.544 1.377 -1.871, 1.954 1.247 -1.851, 2.274 1.387 -1.871, 
-          1.954 0.6075 -1.531, 1.814 0.3575 -1.271, 2.194 0.5175 -1.541, 
-          1.744 0.1775 -1.021, 1.874 0.1075 -0.8406, 2.004 0.2075 -1.071, 
-          2.084 0.3375 -1.281, 2.114 0.4175 -1.091, 2.164 0.4775 -1.321, 
-          2.214 0.6175 -1.231, 2.034 0.3475 -0.8906, 1.994 0.4575 -0.7606, 
-          2.274 0.7075 -1.471, 2.104 0.7375 -1.311, 2.174 0.7975 -1.501, 
-          1.984 0.6675 -0.7606, 1.894 0.2275 -0.7006, 1.994 0.7475 -1.101, 
-          1.934 0.8375 -1.021, 1.884 1.047 -1.221, 1.904 1.007 -1.091, 
-          2.134 0.6275 -1.001, 1.994 1.067 -1.021, 2.004 0.8875 -0.9106, 
-          2.094 1.207 -1.361, 1.964 1.157 -1.181, 1.994 1.137 -1.241, 
-          1.974 1.137 -1.101, 2.114 1.257 -1.411, 2.084 1.127 -1.501, 
-          2.044 0.8575 -1.361, 2.084 0.9975 -1.521, 2.194 1.297 -1.541, 
-          2.164 1.467 -1.501, 2.064 1.457 -1.341, 2.314 1.067 -1.631, 
-          2.414 1.537 -1.681, 2.094 1.327 -1.241, 2.154 1.617 -1.381]
-        }
-        coordIndex [
-          1, 0, 2, -1, 
-          2, 0, 3, -1, 3, 0, 4, -1, 4, 0, 5, -1, 5, 0, 1, -1, 
-          5, 6, 7, -1, 7, 6, 8, -1, 8, 6, 9, -1, 9, 6, 10, -1, 
-          10, 6, 1, -1, 1, 6, 5, -1, 3, 11, 2, -1, 2, 11, 12, -1, 
-          12, 11, 13, -1, 13, 11, 14, -1, 14, 11, 15, -1, 15, 11, 3, -1, 
-          12, 16, 17, -1, 17, 16, 10, -1, 10, 16, 18, -1, 18, 16, 19, -1, 
-          19, 16, 20, -1, 20, 16, 21, -1, 21, 16, 22, -1, 22, 16, 12, -1, 
-          1, 2, 10, -1, 17, 10, 2, -1, 17, 2, 12, -1, 9, 23, 24, -1, 
-          24, 23, 25, -1, 25, 23, 26, -1, 26, 23, 27, -1, 27, 23, 20, -1, 
-          20, 23, 19, -1, 19, 23, 18, -1, 18, 23, 9, -1, 18, 9, 10, -1, 
-          8, 28, 29, -1, 29, 28, 30, -1, 30, 28, 31, -1, 31, 28, 25, -1, 
-          25, 28, 32, -1, 32, 28, 8, -1, 25, 32, 24, -1, 24, 32, 9, -1, 
-          9, 32, 8, -1, 31, 33, 30, -1, 30, 33, 34, -1, 34, 33, 35, -1, 
-          35, 33, 36, -1, 36, 33, 37, -1, 37, 33, 31, -1, 30, 34, 29, -1, 
-          26, 38, 36, -1, 36, 38, 39, -1, 39, 38, 40, -1, 40, 38, 41, -1, 
-          41, 38, 26, -1, 36, 37, 26, -1, 31, 25, 37, -1, 37, 25, 26, -1, 
-          26, 27, 41, -1, 39, 42, 43, -1, 43, 42, 44, -1, 44, 42, 45, -1, 
-          45, 42, 46, -1, 46, 42, 47, -1, 47, 42, 39, -1, 43, 48, 39, -1, 
-          36, 39, 48, -1, 36, 48, 35, -1, 21, 49, 20, -1, 20, 49, 27, -1, 
-          27, 49, 41, -1, 41, 49, 50, -1, 50, 49, 51, -1, 51, 49, 52, -1, 
-          52, 49, 53, -1, 53, 49, 21, -1, 39, 40, 47, -1, 47, 40, 46, -1, 
-          40, 41, 50, -1, 51, 54, 50, -1, 50, 54, 40, -1, 40, 54, 46, -1, 
-          46, 54, 55, -1, 55, 54, 56, -1, 56, 54, 51, -1, 45, 46, 55, -1, 
-          45, 55, 57, -1, 45, 57, 44, -1, 57, 55, 58, -1, 56, 58, 55, -1, 
-          58, 56, 59, -1, 61, 60, 62, -1, 62, 60, 52, -1, 52, 60, 51, -1, 
-          51, 60, 56, -1, 56, 60, 59, -1, 59, 60, 61, -1, 64, 63, 65, -1, 
-          65, 63, 62, -1, 62, 63, 66, -1, 66, 63, 67, -1, 67, 63, 68, -1, 
-          68, 63, 64, -1, 66, 62, 61, -1, 14, 69, 13, -1, 13, 69, 22, -1, 
-          22, 69, 65, -1, 65, 69, 64, -1, 64, 69, 70, -1, 70, 69, 14, -1, 
-          52, 53, 65, -1, 53, 21, 65, -1, 22, 65, 21, -1, 13, 22, 12, -1, 
-          52, 65, 62, -1, 72, 71, 70, -1, 70, 71, 64, -1, 64, 71, 68, -1, 
-          68, 71, 73, -1, 73, 71, 74, -1, 74, 71, 75, -1, 75, 71, 72, -1, 
-          68, 73, 67, -1, 76, 73, 74, -1, 76, 74, 75, -1, 70, 14, 72, -1, 
-          72, 14, 15, -1, 4, 77, 3, -1, 3, 77, 15, -1, 15, 77, 72, -1, 
-          72, 77, 75, -1, 75, 77, 4, -1, 79, 78, 80, -1, 80, 78, 5, -1, 
-          5, 78, 4, -1, 4, 78, 75, -1, 75, 78, 76, -1, 76, 78, 79, -1, 
-          7, 79, 80, -1, 7, 80, 5, -1, 8, 29, 7, -1, 29, 81, 7, -1, 
-          7, 81, 82, -1, 82, 81, 83, -1, 83, 81, 84, -1, 84, 81, 85, -1, 
-          85, 81, 86, -1, 86, 81, 87, -1, 87, 81, 48, -1, 48, 81, 35, -1, 
-          35, 81, 34, -1, 34, 81, 29, -1, 61, 88, 59, -1, 58, 59, 88, -1, 
-          58, 89, 57, -1, 57, 89, 90, -1, 90, 89, 91, -1, 91, 89, 92, -1, 
-          92, 89, 93, -1, 93, 89, 88, -1, 88, 89, 58, -1, 87, 48, 43, -1, 
-          87, 43, 44, -1, 90, 44, 57, -1, 95, 94, 44, -1, 44, 94, 87, -1, 
-          87, 94, 86, -1, 86, 94, 96, -1, 96, 94, 97, -1, 97, 94, 98, -1, 
-          98, 94, 99, -1, 99, 94, 95, -1, 95, 44, 90, -1, 91, 100, 90, -1, 
-          90, 100, 99, -1, 99, 100, 101, -1, 101, 100, 102, -1, 
-          102, 100, 103, -1, 103, 100, 91, -1, 90, 99, 95, -1, 
-          93, 104, 92, -1, 92, 104, 105, -1, 105, 104, 106, -1, 
-          106, 104, 107, -1, 107, 104, 108, -1, 108, 104, 93, -1, 
-          109, 108, 110, -1, 93, 110, 108, -1, 110, 93, 88, -1, 
-          108, 109, 107, -1, 106, 111, 112, -1, 106, 113, 105, -1, 
-          105, 113, 114, -1, 114, 113, 115, -1, 115, 113, 116, -1, 
-          116, 113, 117, -1, 117, 113, 112, -1, 112, 113, 106, -1, 
-          111, 106, 107, -1, 119, 118, 120, -1, 120, 118, 121, -1, 
-          121, 118, 122, -1, 122, 118, 123, -1, 123, 118, 124, -1, 
-          124, 118, 125, -1, 125, 118, 126, -1, 126, 118, 119, -1, 
-          125, 116, 117, -1, 125, 117, 124, -1, 123, 124, 117, -1, 
-          123, 117, 127, -1, 112, 127, 117, -1, 129, 128, 130, -1, 
-          130, 128, 126, -1, 126, 128, 125, -1, 125, 128, 131, -1, 
-          131, 128, 132, -1, 132, 128, 129, -1, 134, 133, 135, -1, 
-          135, 133, 132, -1, 132, 133, 136, -1, 136, 133, 137, -1, 
-          137, 133, 138, -1, 138, 133, 134, -1, 131, 116, 125, -1, 
-          115, 116, 131, -1, 115, 131, 136, -1, 132, 136, 131, -1, 
-          135, 132, 129, -1, 119, 130, 126, -1, 140, 139, 141, -1, 
-          141, 139, 138, -1, 138, 139, 142, -1, 142, 139, 143, -1, 
-          143, 139, 144, -1, 144, 139, 140, -1, 143, 145, 142, -1, 
-          142, 145, 146, -1, 146, 145, 147, -1, 147, 145, 148, -1, 
-          148, 145, 149, -1, 149, 145, 143, -1, 146, 150, 137, -1, 
-          137, 150, 136, -1, 136, 150, 115, -1, 115, 150, 114, -1, 
-          114, 150, 151, -1, 151, 150, 146, -1, 138, 142, 137, -1, 
-          146, 137, 142, -1, 134, 141, 138, -1, 140, 152, 144, -1, 
-          143, 144, 152, -1, 143, 152, 153, -1, 154, 153, 152, -1, 
-          154, 152, 155, -1, 154, 155, 156, -1, 154, 156, 157, -1, 
-          158, 157, 156, -1, 158, 156, 159, -1, 158, 160, 157, -1, 
-          157, 160, 154, -1, 154, 160, 161, -1, 161, 160, 162, -1, 
-          162, 160, 163, -1, 163, 160, 164, -1, 164, 160, 158, -1, 
-          153, 154, 161, -1, 153, 161, 149, -1, 153, 149, 143, -1, 
-          146, 147, 151, -1, 151, 165, 166, -1, 166, 165, 167, -1, 
-          167, 165, 103, -1, 103, 165, 168, -1, 168, 165, 147, -1, 
-          147, 165, 151, -1, 151, 166, 114, -1, 105, 114, 166, -1, 
-          103, 91, 167, -1, 166, 167, 91, -1, 166, 91, 92, -1, 
-          166, 92, 105, -1, 162, 169, 170, -1, 170, 169, 171, -1, 
-          171, 169, 172, -1, 172, 169, 173, -1, 173, 169, 174, -1, 
-          174, 169, 162, -1, 148, 170, 171, -1, 148, 171, 168, -1, 
-          148, 168, 147, -1, 162, 170, 161, -1, 148, 161, 170, -1, 
-          161, 148, 149, -1, 176, 175, 168, -1, 168, 175, 103, -1, 
-          103, 175, 102, -1, 102, 175, 176, -1, 168, 171, 176, -1, 
-          172, 176, 171, -1, 176, 172, 173, -1, 163, 174, 162, -1, 
-          177, 173, 174, -1, 173, 177, 178, -1, 173, 178, 179, -1, 
-          173, 179, 180, -1, 173, 180, 176, -1, 101, 102, 181, -1, 
-          101, 181, 98, -1, 98, 182, 183, -1, 183, 182, 180, -1, 
-          180, 182, 176, -1, 176, 182, 102, -1, 102, 182, 181, -1, 
-          181, 182, 98, -1, 178, 184, 179, -1, 179, 184, 180, -1, 
-          180, 184, 185, -1, 185, 184, 186, -1, 186, 184, 187, -1, 
-          187, 184, 178, -1, 101, 98, 99, -1, 183, 188, 98, -1, 
-          98, 188, 97, -1, 183, 180, 185, -1, 97, 189, 96, -1, 
-          96, 189, 190, -1, 190, 189, 191, -1, 191, 189, 192, -1, 
-          192, 189, 193, -1, 193, 189, 194, -1, 194, 189, 185, -1, 
-          185, 189, 183, -1, 183, 189, 188, -1, 188, 189, 97, -1, 
-          196, 195, 186, -1, 186, 195, 185, -1, 185, 195, 197, -1, 
-          197, 195, 198, -1, 198, 195, 199, -1, 199, 195, 196, -1, 
-          196, 187, 200, -1, 200, 201, 199, -1, 199, 201, 198, -1, 
-          198, 201, 202, -1, 202, 201, 203, -1, 203, 201, 204, -1, 
-          204, 201, 200, -1, 187, 196, 186, -1, 196, 200, 199, -1, 
-          185, 197, 194, -1, 194, 205, 193, -1, 193, 205, 206, -1, 
-          206, 205, 207, -1, 207, 205, 208, -1, 208, 205, 197, -1, 
-          197, 205, 194, -1, 202, 208, 198, -1, 197, 198, 208, -1, 
-          190, 209, 96, -1, 96, 209, 86, -1, 86, 209, 85, -1, 
-          85, 209, 84, -1, 84, 209, 210, -1, 210, 209, 211, -1, 
-          211, 209, 190, -1, 213, 212, 191, -1, 191, 212, 211, -1, 
-          211, 212, 214, -1, 214, 212, 215, -1, 215, 212, 216, -1, 
-          216, 212, 213, -1, 216, 217, 218, -1, 218, 217, 219, -1, 
-          219, 217, 220, -1, 220, 217, 221, -1, 221, 217, 192, -1, 
-          192, 217, 213, -1, 213, 217, 216, -1, 191, 211, 190, -1, 
-          192, 213, 191, -1, 206, 192, 193, -1, 192, 206, 221, -1, 
-          203, 222, 202, -1, 202, 222, 223, -1, 223, 222, 224, -1, 
-          224, 222, 225, -1, 225, 222, 203, -1, 223, 226, 227, -1, 
-          227, 226, 228, -1, 228, 226, 229, -1, 229, 226, 224, -1, 
-          224, 226, 223, -1, 231, 230, 224, -1, 224, 230, 229, -1, 
-          229, 230, 232, -1, 232, 230, 233, -1, 233, 230, 234, -1, 
-          234, 230, 231, -1, 231, 224, 225, -1, 227, 235, 223, -1, 
-          223, 235, 208, -1, 208, 235, 207, -1, 202, 223, 208, -1, 
-          207, 236, 206, -1, 206, 236, 221, -1, 221, 236, 220, -1, 
-          220, 236, 237, -1, 237, 236, 238, -1, 238, 236, 239, -1, 
-          239, 236, 240, -1, 240, 236, 228, -1, 228, 236, 227, -1, 
-          227, 236, 235, -1, 235, 236, 207, -1, 229, 241, 228, -1, 
-          228, 241, 240, -1, 240, 241, 239, -1, 239, 241, 242, -1, 
-          242, 241, 232, -1, 232, 241, 229, -1, 233, 243, 232, -1, 
-          232, 243, 244, -1, 244, 243, 245, -1, 245, 243, 246, -1, 
-          246, 243, 247, -1, 247, 243, 233, -1, 245, 248, 244, -1, 
-          244, 248, 242, -1, 242, 248, 238, -1, 238, 248, 237, -1, 
-          242, 238, 239, -1, 244, 242, 232, -1, 245, 249, 248, -1, 
-          248, 249, 237, -1, 237, 249, 250, -1, 250, 249, 251, -1, 
-          251, 249, 252, -1, 252, 249, 253, -1, 253, 249, 246, -1, 
-          246, 249, 245, -1, 255, 254, 237, -1, 237, 254, 220, -1, 
-          220, 254, 219, -1, 219, 254, 255, -1, 255, 237, 250, -1, 
-          257, 256, 258, -1, 258, 256, 259, -1, 259, 256, 260, -1, 
-          260, 256, 251, -1, 251, 256, 250, -1, 250, 261, 255, -1, 
-          255, 261, 262, -1, 262, 261, 263, -1, 263, 261, 264, -1, 
-          264, 261, 257, -1, 257, 261, 250, -1, 257, 258, 264, -1, 
-          260, 265, 259, -1, 259, 265, 258, -1, 258, 265, 264, -1, 
-          264, 265, 266, -1, 266, 265, 267, -1, 267, 265, 268, -1, 
-          251, 252, 260, -1, 269, 260, 252, -1, 268, 265, 260, -1, 
-          268, 260, 269, -1, 218, 270, 216, -1, 216, 270, 215, -1, 
-          215, 270, 271, -1, 271, 270, 272, -1, 272, 270, 273, -1, 
-          273, 270, 218, -1, 273, 274, 272, -1, 272, 274, 275, -1, 
-          275, 274, 276, -1, 276, 274, 277, -1, 277, 274, 278, -1, 
-          278, 274, 279, -1, 279, 274, 273, -1, 255, 262, 219, -1, 
-          218, 219, 273, -1, 262, 273, 219, -1, 279, 273, 262, -1, 
-          279, 262, 280, -1, 263, 280, 262, -1, 266, 281, 263, -1, 
-          263, 281, 280, -1, 266, 263, 264, -1, 266, 282, 281, -1, 
-          281, 282, 280, -1, 280, 282, 278, -1, 278, 282, 283, -1, 
-          283, 282, 284, -1, 284, 282, 285, -1, 285, 282, 267, -1, 
-          267, 282, 266, -1, 267, 268, 285, -1, 280, 278, 279, -1, 
-          211, 214, 210, -1, 286, 284, 285, -1, 288, 287, 289, -1, 
-          289, 287, 290, -1, 290, 287, 291, -1, 291, 287, 292, -1, 
-          292, 287, 288, -1, 275, 293, 292, -1, 292, 293, 294, -1, 
-          294, 293, 295, -1, 295, 293, 296, -1, 296, 293, 276, -1, 
-          276, 293, 275, -1, 277, 297, 276, -1, 276, 297, 296, -1, 
-          296, 297, 298, -1, 299, 297, 300, -1, 300, 297, 277, -1, 
-          291, 292, 294, -1, 295, 296, 298, -1, 299, 300, 301, -1, 
-          283, 301, 300, -1, 283, 300, 278, -1, 302, 283, 284, -1, 
-          302, 301, 283, -1, 275, 288, 272, -1, 271, 272, 288, -1, 
-          288, 303, 271, -1, 271, 303, 215, -1, 215, 303, 214, -1, 
-          214, 303, 304, -1, 304, 303, 289, -1, 289, 303, 288, -1, 
-          275, 292, 288, -1, 278, 300, 277, -1, 210, 305, 84, -1, 
-          84, 305, 83, -1, 83, 305, 306, -1, 306, 305, 307, -1, 
-          307, 305, 308, -1, 308, 305, 304, -1, 304, 305, 210, -1, 
-          289, 308, 304, -1, 290, 309, 289, -1, 289, 309, 310, -1, 
-          310, 309, 311, -1, 311, 309, 312, -1, 312, 309, 290, -1, 
-          289, 310, 308, -1, 307, 308, 310, -1, 310, 313, 307, -1, 
-          307, 313, 314, -1, 314, 313, 315, -1, 315, 313, 316, -1, 
-          316, 313, 311, -1, 311, 313, 310, -1, 318, 317, 319, -1, 
-          319, 317, 312, -1, 312, 317, 320, -1, 320, 317, 321, -1, 
-          321, 317, 322, -1, 322, 317, 318, -1, 301, 323, 318, -1, 
-          318, 323, 322, -1, 322, 323, 321, -1, 321, 323, 324, -1, 
-          324, 323, 302, -1, 302, 323, 301, -1, 312, 290, 319, -1, 
-          284, 324, 302, -1, 284, 325, 324, -1, 324, 325, 326, -1, 
-          326, 325, 327, -1, 327, 325, 328, -1, 328, 325, 286, -1, 
-          286, 325, 284, -1, 324, 326, 321, -1, 320, 321, 326, -1, 
-          326, 329, 320, -1, 320, 329, 330, -1, 330, 329, 331, -1, 
-          331, 329, 332, -1, 332, 329, 327, -1, 327, 329, 326, -1, 
-          320, 330, 312, -1, 330, 311, 312, -1, 311, 330, 316, -1, 
-          316, 330, 331, -1, 286, 333, 328, -1, 334, 328, 333, -1, 
-          335, 328, 334, -1, 328, 335, 327, -1, 332, 327, 335, -1, 
-          332, 335, 336, -1, 332, 336, 337, -1, 332, 337, 338, -1, 
-          332, 338, 331, -1, 331, 339, 316, -1, 316, 339, 315, -1, 
-          315, 339, 340, -1, 340, 339, 341, -1, 341, 339, 338, -1, 
-          338, 339, 331, -1, 341, 338, 337, -1, 315, 340, 342, -1, 
-          315, 342, 314, -1, 307, 314, 306, -1, 83, 306, 314, -1, 
-          83, 314, 82, -1, 342, 82, 314, -1, 82, 342, 7, -1, 
-          79, 7, 342, -1, 214, 304, 210, -1, 344, 343, 345, -1, 
-          347, 346, 348, -1, 349, 348, 346, -1, 346, 350, 349, -1, 
-          351, 349, 350, -1, 351, 350, 352, -1, 353, 352, 350, -1, 
-          354, 350, 346, -1, 354, 346, 355, -1, 357, 356, 358, -1, 
-          358, 359, 360, -1, 357, 358, 360, -1, 355, 357, 360, -1, 
-          354, 355, 360, -1, 361, 354, 360, -1, 359, 361, 360, -1, 
-          362, 359, 358, -1, 362, 358, 356, -1, 362, 356, 363, -1, 
-          362, 363, 364, -1, 362, 364, 365, -1, 366, 365, 364, -1, 
-          364, 334, 366, -1, 334, 333, 366, -1, 286, 366, 333, -1, 
-          361, 359, 367, -1, 368, 361, 367, -1, 367, 369, 368, -1, 
-          370, 368, 369, -1, 371, 369, 367, -1, 365, 372, 373, -1, 
-          362, 365, 373, -1, 359, 362, 373, -1, 367, 359, 373, -1, 
-          371, 367, 373, -1, 372, 371, 373, -1, 371, 372, 374, -1, 
-          375, 374, 372, -1, 286, 376, 377, -1, 366, 286, 377, -1, 
-          365, 366, 377, -1, 372, 365, 377, -1, 375, 372, 377, -1, 
-          376, 375, 377, -1, 376, 378, 375, -1, 369, 379, 380, -1, 
-          378, 381, 382, -1, 375, 378, 382, -1, 374, 375, 382, -1, 
-          383, 374, 382, -1, 384, 383, 382, -1, 381, 384, 382, -1, 
-          383, 384, 385, -1, 374, 383, 385, -1, 371, 374, 385, -1, 
-          369, 371, 385, -1, 379, 369, 385, -1, 384, 379, 385, -1, 
-          368, 386, 387, -1, 361, 368, 387, -1, 354, 361, 387, -1, 
-          350, 354, 387, -1, 353, 350, 387, -1, 386, 353, 387, -1, 
-          353, 386, 388, -1, 389, 388, 386, -1, 369, 380, 370, -1, 
-          386, 368, 370, -1, 389, 386, 370, -1, 380, 389, 370, -1, 
-          389, 345, 388, -1, 345, 343, 390, -1, 388, 345, 390, -1, 
-          353, 388, 390, -1, 352, 353, 390, -1, 351, 352, 390, -1, 
-          391, 351, 390, -1, 343, 391, 390, -1, 393, 392, 394, -1, 
-          396, 395, 397, -1, 389, 395, 398, -1, 345, 389, 398, -1, 
-          344, 345, 398, -1, 399, 344, 398, -1, 400, 399, 398, -1, 
-          395, 400, 398, -1, 400, 395, 401, -1, 396, 401, 395, -1, 
-          378, 402, 381, -1, 378, 376, 402, -1, 402, 393, 394, -1, 
-          403, 381, 394, -1, 405, 404, 406, -1, 408, 407, 397, -1, 
-          394, 392, 409, -1, 403, 394, 409, -1, 404, 403, 409, -1, 
-          406, 404, 409, -1, 410, 406, 409, -1, 392, 410, 409, -1, 
-          410, 396, 411, -1, 406, 410, 411, -1, 405, 406, 411, -1, 
-          407, 405, 411, -1, 397, 407, 411, -1, 396, 397, 411, -1, 
-          397, 395, 412, -1, 408, 397, 412, -1, 380, 408, 412, -1, 
-          389, 380, 412, -1, 395, 389, 412, -1, 286, 285, 376, -1, 
-          413, 343, 344, -1, 415, 414, 393, -1, 416, 285, 268, -1, 
-          416, 417, 418, -1, 285, 416, 418, -1, 376, 285, 418, -1, 
-          402, 376, 418, -1, 393, 402, 418, -1, 415, 393, 418, -1, 
-          419, 415, 418, -1, 417, 419, 418, -1, 417, 420, 421, -1, 
-          421, 415, 419, -1, 417, 421, 419, -1, 421, 422, 415, -1, 
-          414, 415, 422, -1, 414, 422, 423, -1, 422, 424, 423, -1, 
-          425, 423, 424, -1, 426, 424, 422, -1, 414, 423, 427, -1, 
-          393, 414, 427, -1, 392, 393, 427, -1, 410, 392, 427, -1, 
-          396, 410, 427, -1, 401, 396, 427, -1, 423, 401, 427, -1, 
-          423, 425, 428, -1, 401, 423, 428, -1, 400, 401, 428, -1, 
-          399, 400, 428, -1, 429, 399, 428, -1, 425, 429, 428, -1, 
-          268, 269, 430, -1, 268, 430, 431, -1, 269, 252, 430, -1, 
-          432, 430, 252, -1, 416, 268, 431, -1, 417, 416, 431, -1, 
-          420, 417, 431, -1, 433, 420, 431, -1, 434, 433, 431, -1, 
-          430, 434, 431, -1, 435, 420, 433, -1, 435, 436, 437, -1, 
-          420, 435, 437, -1, 421, 420, 437, -1, 422, 421, 437, -1, 
-          426, 422, 437, -1, 436, 426, 437, -1, 432, 436, 438, -1, 
-          430, 432, 438, -1, 434, 430, 438, -1, 433, 434, 438, -1, 
-          435, 433, 438, -1, 436, 435, 438, -1, 426, 436, 439, -1, 
-          424, 426, 440, -1, 441, 424, 440, -1, 439, 441, 440, -1, 
-          426, 439, 440, -1, 246, 442, 443, -1, 253, 246, 443, -1, 
-          252, 253, 443, -1, 432, 252, 443, -1, 436, 432, 443, -1, 
-          439, 436, 443, -1, 444, 439, 443, -1, 442, 444, 443, -1, 
-          446, 445, 447, -1, 447, 448, 449, -1, 449, 439, 444, -1, 
-          447, 449, 444, -1, 446, 447, 444, -1, 442, 446, 444, -1, 
-          247, 233, 450, -1, 246, 247, 450, -1, 442, 246, 450, -1, 
-          446, 442, 450, -1, 445, 446, 450, -1, 233, 445, 450, -1, 
-          445, 451, 452, -1, 447, 445, 452, -1, 448, 447, 452, -1, 
-          453, 448, 452, -1, 454, 453, 452, -1, 451, 454, 452, -1, 
-          456, 455, 457, -1, 458, 456, 457, -1, 454, 458, 457, -1, 
-          453, 454, 457, -1, 448, 453, 457, -1, 449, 448, 457, -1, 
-          439, 449, 457, -1, 441, 439, 457, -1, 459, 441, 457, -1, 
-          460, 459, 457, -1, 455, 460, 457, -1, 462, 461, 463, -1, 
-          461, 455, 456, -1, 463, 461, 456, -1, 458, 463, 456, -1, 
-          231, 225, 464, -1, 234, 231, 465, -1, 233, 234, 465, -1, 
-          445, 233, 465, -1, 451, 445, 465, -1, 464, 451, 465, -1, 
-          231, 464, 465, -1, 464, 463, 466, -1, 451, 464, 466, -1, 
-          454, 451, 466, -1, 458, 454, 466, -1, 463, 458, 466, -1, 
-          225, 203, 467, -1, 464, 225, 467, -1, 463, 464, 467, -1, 
-          462, 463, 467, -1, 203, 462, 467, -1, 468, 459, 460, -1, 
-          460, 469, 468, -1, 468, 470, 471, -1, 470, 472, 413, -1, 
-          471, 429, 473, -1, 468, 471, 473, -1, 459, 468, 473, -1, 
-          441, 459, 473, -1, 424, 441, 473, -1, 425, 424, 473, -1, 
-          429, 425, 473, -1, 429, 471, 474, -1, 399, 429, 474, -1, 
-          344, 399, 474, -1, 413, 344, 474, -1, 470, 413, 474, -1, 
-          471, 470, 474, -1, 413, 472, 475, -1, 343, 413, 475, -1, 
-          391, 343, 475, -1, 476, 391, 475, -1, 477, 476, 475, -1, 
-          478, 477, 475, -1, 472, 478, 475, -1, 479, 461, 480, -1, 
-          462, 480, 461, -1, 479, 481, 482, -1, 461, 479, 482, -1, 
-          455, 461, 482, -1, 460, 455, 482, -1, 469, 460, 482, -1, 
-          481, 469, 482, -1, 483, 481, 479, -1, 485, 484, 200, -1, 
-          187, 486, 485, -1, 204, 200, 487, -1, 203, 204, 487, -1, 
-          462, 203, 487, -1, 480, 462, 487, -1, 484, 480, 487, -1, 
-          200, 484, 487, -1, 485, 200, 187, -1, 484, 485, 488, -1, 
-          480, 484, 488, -1, 479, 480, 488, -1, 483, 479, 488, -1, 
-          486, 483, 488, -1, 485, 486, 488, -1, 490, 489, 491, -1, 
-          492, 490, 491, -1, 483, 492, 491, -1, 481, 483, 491, -1, 
-          469, 481, 491, -1, 468, 469, 491, -1, 470, 468, 491, -1, 
-          472, 470, 491, -1, 478, 472, 491, -1, 489, 478, 491, -1, 
-          492, 483, 493, -1, 494, 489, 490, -1, 492, 494, 490, -1, 
-          496, 495, 494, -1, 187, 178, 497, -1, 486, 187, 497, -1, 
-          483, 486, 497, -1, 493, 483, 497, -1, 498, 493, 497, -1, 
-          178, 498, 497, -1, 499, 494, 500, -1, 501, 499, 500, -1, 
-          502, 501, 500, -1, 493, 502, 500, -1, 492, 493, 500, -1, 
-          494, 492, 500, -1, 496, 494, 499, -1, 496, 499, 501, -1, 
-          503, 502, 493, -1, 503, 493, 498, -1, 503, 498, 178, -1, 
-          503, 178, 177, -1, 177, 174, 503, -1, 163, 504, 174, -1, 
-          502, 503, 505, -1, 505, 506, 502, -1, 507, 502, 506, -1, 
-          501, 502, 508, -1, 509, 501, 508, -1, 507, 509, 508, -1, 
-          502, 507, 508, -1, 511, 510, 512, -1, 512, 513, 511, -1, 
-          504, 511, 513, -1, 512, 514, 507, -1, 512, 507, 506, -1, 
-          512, 506, 513, -1, 515, 513, 506, -1, 174, 504, 515, -1, 
-          503, 174, 515, -1, 505, 503, 515, -1, 506, 505, 515, -1, 
-          504, 513, 515, -1, 517, 516, 518, -1, 517, 518, 519, -1, 
-          517, 519, 520, -1, 509, 520, 519, -1, 516, 517, 521, -1, 
-          522, 521, 517, -1, 514, 522, 523, -1, 507, 514, 523, -1, 
-          509, 507, 523, -1, 520, 509, 523, -1, 517, 520, 523, -1, 
-          522, 517, 523, -1, 524, 522, 514, -1, 526, 525, 510, -1, 
-          526, 510, 511, -1, 526, 511, 527, -1, 164, 158, 528, -1, 
-          163, 164, 528, -1, 504, 163, 528, -1, 511, 504, 528, -1, 
-          527, 511, 528, -1, 529, 527, 528, -1, 158, 529, 528, -1, 
-          158, 159, 530, -1, 158, 530, 529, -1, 527, 529, 530, -1, 
-          527, 530, 531, -1, 527, 531, 532, -1, 527, 532, 526, -1, 
-          525, 526, 532, -1, 525, 532, 533, -1, 534, 533, 532, -1, 
-          536, 535, 537, -1, 524, 538, 539, -1, 535, 539, 538, -1, 
-          522, 524, 540, -1, 521, 522, 540, -1, 541, 521, 540, -1, 
-          542, 541, 540, -1, 539, 542, 540, -1, 524, 539, 540, -1, 
-          510, 525, 543, -1, 512, 510, 543, -1, 514, 512, 543, -1, 
-          524, 514, 543, -1, 538, 524, 543, -1, 525, 538, 543, -1, 
-          533, 534, 544, -1, 525, 533, 544, -1, 538, 525, 544, -1, 
-          535, 538, 544, -1, 537, 535, 544, -1, 534, 537, 544, -1, 
-          546, 545, 547, -1, 549, 548, 550, -1, 550, 551, 542, -1, 
-          541, 542, 551, -1, 541, 551, 552, -1, 551, 553, 552, -1, 
-          535, 536, 554, -1, 539, 535, 554, -1, 542, 539, 554, -1, 
-          550, 542, 554, -1, 549, 550, 554, -1, 536, 549, 554, -1, 
-          550, 548, 555, -1, 551, 550, 555, -1, 553, 551, 555, -1, 
-          545, 553, 555, -1, 547, 545, 555, -1, 548, 547, 555, -1, 
-          112, 556, 127, -1, 123, 127, 556, -1, 123, 556, 557, -1, 
-          553, 557, 556, -1, 553, 556, 552, -1, 545, 546, 558, -1, 
-          553, 545, 558, -1, 557, 553, 558, -1, 123, 557, 558, -1, 
-          122, 123, 558, -1, 121, 122, 558, -1, 559, 121, 558, -1, 
-          546, 559, 558, -1, 111, 107, 560, -1, 112, 560, 561, -1, 
-          556, 112, 561, -1, 552, 556, 561, -1, 541, 552, 561, -1, 
-          521, 541, 561, -1, 516, 521, 561, -1, 560, 516, 561, -1, 
-          560, 112, 111, -1, 562, 107, 563, -1, 565, 564, 566, -1, 
-          566, 562, 565, -1, 563, 565, 562, -1, 562, 566, 567, -1, 
-          107, 562, 567, -1, 560, 107, 567, -1, 516, 560, 567, -1, 
-          518, 516, 567, -1, 566, 518, 567, -1, 569, 568, 495, -1, 
-          509, 519, 570, -1, 501, 509, 570, -1, 496, 501, 570, -1, 
-          495, 496, 570, -1, 569, 495, 570, -1, 519, 569, 570, -1, 
-          568, 569, 571, -1, 495, 568, 572, -1, 494, 495, 572, -1, 
-          489, 494, 572, -1, 478, 489, 572, -1, 477, 478, 572, -1, 
-          573, 477, 572, -1, 571, 573, 572, -1, 568, 571, 572, -1, 
-          569, 574, 571, -1, 573, 571, 575, -1, 573, 575, 576, -1, 
-          564, 577, 578, -1, 566, 564, 578, -1, 518, 566, 578, -1, 
-          519, 518, 578, -1, 569, 519, 578, -1, 574, 569, 578, -1, 
-          577, 574, 578, -1, 577, 564, 579, -1, 580, 579, 564, -1, 
-          582, 581, 583, -1, 584, 582, 583, -1, 576, 584, 583, -1, 
-          573, 576, 583, -1, 477, 573, 583, -1, 476, 477, 583, -1, 
-          391, 476, 583, -1, 351, 391, 583, -1, 349, 351, 583, -1, 
-          348, 349, 583, -1, 581, 348, 583, -1, 585, 348, 581, -1, 
-          348, 586, 587, -1, 348, 587, 347, -1, 588, 347, 589, -1, 
-          590, 588, 589, -1, 591, 590, 589, -1, 586, 591, 589, -1, 
-          587, 586, 589, -1, 347, 587, 589, -1, 590, 591, 592, -1, 
-          593, 590, 592, -1, 594, 593, 592, -1, 595, 594, 592, -1, 
-          591, 595, 592, -1, 593, 594, 596, -1, 597, 593, 596, -1, 
-          588, 590, 598, -1, 588, 598, 599, -1, 601, 600, 599, -1, 
-          590, 593, 602, -1, 598, 590, 602, -1, 599, 598, 602, -1, 
-          601, 599, 602, -1, 603, 601, 602, -1, 597, 603, 602, -1, 
-          593, 597, 602, -1, 605, 604, 606, -1, 608, 607, 609, -1, 
-          609, 610, 606, -1, 611, 606, 610, -1, 605, 606, 611, -1, 
-          597, 596, 612, -1, 603, 597, 612, -1, 606, 603, 612, -1, 
-          609, 606, 612, -1, 608, 609, 612, -1, 596, 608, 612, -1, 
-          604, 580, 613, -1, 601, 603, 614, -1, 600, 601, 614, -1, 
-          613, 600, 614, -1, 604, 613, 614, -1, 606, 604, 614, -1, 
-          603, 606, 614, -1, 579, 580, 615, -1, 616, 579, 615, -1, 
-          617, 616, 615, -1, 605, 617, 615, -1, 604, 605, 615, -1, 
-          580, 604, 615, -1, 577, 579, 616, -1, 616, 618, 577, -1, 
-          574, 577, 618, -1, 619, 571, 574, -1, 619, 574, 618, -1, 
-          619, 618, 620, -1, 616, 617, 621, -1, 618, 616, 621, -1, 
-          620, 618, 621, -1, 622, 620, 621, -1, 623, 622, 621, -1, 
-          617, 623, 621, -1, 622, 623, 624, -1, 625, 620, 622, -1, 
-          626, 625, 622, -1, 611, 610, 627, -1, 605, 611, 627, -1, 
-          617, 605, 627, -1, 623, 617, 627, -1, 624, 623, 627, -1, 
-          628, 624, 627, -1, 629, 628, 627, -1, 610, 629, 627, -1, 
-          630, 584, 576, -1, 630, 576, 626, -1, 575, 626, 576, -1, 
-          625, 626, 631, -1, 620, 625, 631, -1, 619, 620, 631, -1, 
-          571, 619, 631, -1, 575, 571, 631, -1, 626, 575, 631, -1, 
-          632, 624, 628, -1, 633, 632, 634, -1, 635, 633, 634, -1, 
-          630, 632, 633, -1, 624, 632, 636, -1, 622, 624, 636, -1, 
-          626, 622, 636, -1, 630, 626, 636, -1, 632, 630, 636, -1, 
-          637, 581, 582, -1, 633, 635, 638, -1, 630, 633, 638, -1, 
-          584, 630, 638, -1, 582, 584, 638, -1, 637, 582, 638, -1, 
-          635, 637, 638, -1, 639, 585, 640, -1, 641, 639, 640, -1, 
-          634, 641, 640, -1, 640, 585, 642, -1, 634, 640, 642, -1, 
-          635, 634, 642, -1, 637, 635, 642, -1, 581, 637, 642, -1, 
-          585, 581, 642, -1, 644, 643, 639, -1, 644, 639, 645, -1, 
-          646, 644, 645, -1, 629, 646, 645, -1, 628, 629, 645, -1, 
-          632, 628, 645, -1, 634, 632, 645, -1, 641, 634, 645, -1, 
-          639, 641, 645, -1, 647, 607, 648, -1, 647, 648, 643, -1, 
-          649, 643, 648, -1, 609, 607, 650, -1, 610, 609, 650, -1, 
-          629, 610, 650, -1, 646, 629, 650, -1, 644, 646, 650, -1, 
-          643, 644, 650, -1, 647, 643, 650, -1, 607, 647, 650, -1, 
-          594, 595, 651, -1, 596, 594, 651, -1, 608, 596, 651, -1, 
-          607, 608, 651, -1, 648, 607, 651, -1, 595, 648, 651, -1, 
-          649, 586, 652, -1, 643, 649, 652, -1, 639, 643, 652, -1, 
-          585, 639, 652, -1, 348, 585, 652, -1, 586, 348, 652, -1, 
-          586, 649, 653, -1, 591, 586, 653, -1, 595, 591, 653, -1, 
-          648, 595, 653, -1, 649, 648, 653, -1, 319, 290, 291, -1, 
-          319, 291, 294, -1, 319, 294, 295, -1, 319, 295, 318, -1, 
-          318, 298, 301, -1, 301, 298, 299, -1, 381, 403, 404, -1, 
-          405, 384, 404, -1, 379, 384, 405, -1, 379, 405, 407, -1, 
-          380, 379, 407, -1, 394, 381, 402, -1, 408, 380, 407, -1, 
-          318, 295, 298, -1, 299, 298, 297, -1, 381, 404, 384, -1, 
-          257, 250, 256, -1]
-        }
-      	}
-    	}
-  	]
-	}
-
-	DEF TS TimeSensor {cycleInterval 4 loop TRUE}
-	DEF SI ScalarInterpolator {
-		key [0 0.5 1]
-		keyValue [1 2 1]
-	}
-
-	Billboard {
-		axisOfRotation 0 0 0
-		children [
-
-		Transform {
-			translation -2 2 0
-			children [
-				Shape {
-					appearance Appearance {material Material2D { emissiveColor 1 0 0 filled TRUE}}
-					geometry Rectangle { size 4 1}
-				}
-				Shape {
-					appearance Appearance {material Material2D { emissiveColor 1 1 1 filled TRUE}}
-					geometry DEF TEXT Text { string "Taper" fontStyle DEF FS FontStyle { size 0.8 justify ["MIDDLE" "MIDDLE"] style "TEXTURED"}}
-				}
-				DEF TS_MODE TouchSensor {}
-			]
-	  }
-	  Transform {
-	  	translation 2 2 0
-	  	children [
-	  		Shape {
-	  			appearance Appearance {material Material2D { emissiveColor 0 0 1 filled TRUE}}
-	  			geometry Rectangle { size 4 1}
-	  		}
-	  		Shape {
-	  			appearance Appearance {material Material2D { emissiveColor 1 1 1 filled TRUE}}
-	  			geometry DEF TEXT_AXIS Text { string "Y Axis" fontStyle USE FS}
-	  		}
-	  		DEF TS_AXIS TouchSensor {}
-	  	]
-	  }
-	]
- }
-
-
-DEF SC Script {
-	eventIn SFBool change_mode
-	eventIn SFBool change_axis
-	field SFNode deform USE NLD
-	field SFNode inter USE SI
-	field SFNode txt USE TEXT
-	field SFNode txt_axis USE TEXT_AXIS
-	url ["javascript:
-	function initialize() {
-		def_mode = 0;
-		def_axis = 0;
-	}
-	function change_mode(value, timestamp) {
-		if (!value) return;
-		def_mode++;
-		if (def_mode==3) def_mode = 0;
-		deform.type = def_mode;
-		switch (def_mode) {
-		case 0:
-			txt.string[0] = 'Taper';
-			deform.extend[1] = 0.5;
-			deform.extend[3] = 1;
-			deform.extend[5] = 0.2;
-			inter.keyValue = new MFFloat(1, 2, 1);
-			break;
-		case 1:
-			txt.string[0] = 'Twister';
-			deform.extend[1] = 0;
-			deform.extend[3] = 6.18;
-			deform.extend[5] = 0.0;
-			inter.keyValue = new MFFloat(-1, 1, -1);
-			break;
-		case 2:
-			txt.string[0] = 'Bender';
-			deform.extend[1] = 0;
-			deform.extend[3] = 3.14;
-			deform.extend[5] = 0;
-			inter.keyValue = new MFFloat(-1, 1, -1);
-			break;
-		}
-	}
-	function change_axis(value, timestamp) {
-		if (!value) return;
-		def_axis++;
-		if (def_axis==3) def_axis = 0;
-		switch (def_axis) {
-		case 0:
-			txt_axis.string[0] = 'Y Axis';
-			deform.axis = new SFVec3f(0, 1, 0);
-			break;
-		case 1:
-			txt_axis.string[0] = 'X Axis';
-			deform.axis = new SFVec3f(1, 0, 0);
-			break;
-		case 2:
-			txt_axis.string[0] = 'Z Axis';
-			deform.axis = new SFVec3f(0, 0, 1);
-			break;
-		}
-	}
-	"]
-}
-
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO NLD.param
-
-ROUTE TS_MODE.isActive TO SC.change_mode
-ROUTE TS_AXIS.isActive TO SC.change_axis

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-shapes-pointset.bt Deleted

@@ -1,46 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetrics false
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-Group {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows PointSet" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "PointSet Test"
-  }
-  Shape {
-   appearance Appearance {
-    material Material { diffuseColor 1 0 0}
-   }
-   geometry PointSet {
-    coord DEF COORD Coordinate {
-     point [-1 1 1, 1 1 1, 1 1 -1, -1 1 -1, -1 -1 1, 1 -1 1, 1 -1 -1, -1 -1 -1]
-    }
-   }
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-box-transparent.bt Deleted

@@ -1,73 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Box test"
-   info ["This shows a 3D cube with transparency" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation 0 0 -50
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			emissiveColor 1 0 1
-     			diffuseColor 1 1 1
-     		}
-     	}
-      geometry Box {size 150 100 10}
-     }
-  	]
-  }
-
-  DEF TR Transform {
-  	translation -50 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     			shininess 0.5
-     			transparency 0.5
-     		}
-     	}
-      geometry Box {size 50 50 50}
-     }
-    ]
-  }
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO MAT.transparency
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-box-video.bt Deleted

@@ -1,184 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric FALSE
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
-children [
-
-  Background2D {
-   backColor 1 1 1
-  }
-  Viewpoint {}
-  WorldInfo {
-   info ["This shows spinning cubes with image and video textures" "GPAC Regression Tests" "$Date: 2008-11-24 14:58:25 $ - $Revision: 1.5 $" "(C) 2002-2004 GPAC Team"]
-   title "Cube, Texture Test"
-  }
-
-	DEF TR Transform {
-		rotation 1 1 1 0.5
-		children [
-			Transform {
-				children [
-					DEF Red Transform {
-						children [
-							Shape {
-								appearance  DEF Red-App Appearance {
-									material Material {
-										diffuseColor 1.0 0.0 0.0
-									}
-									texture ImageTexture {  url "5" }
-								}
-								geometry Box { }
-							}
-						]
-					}
-					Transform { translation  2.0  2.0  0.0 children [ USE Red ] }
-					Transform { translation -2.0  2.0  0.0 children [USE Red ] }
-					Transform { translation  2.0 -2.0  0.0 children [USE Red ]}
-					Transform { translation -2.0 -2.0  0.0 children [USE Red ]}
-					Transform { translation  0.0 -2.0  2.0 children [USE Red ]}
-					Transform { translation  0.0  2.0  2.0 children [USE Red ]}
-					Transform { translation  2.0  0.0  2.0 children [USE Red ]}
-					Transform { translation -2.0  0.0  2.0 children [USE Red ]}
-					Transform { translation  0.0 -2.0 -2.0 children [USE Red ]}
-					Transform { translation  0.0  2.0 -2.0 children [USE Red ]}
-					Transform { translation  2.0  0.0 -2.0 children [USE Red ]}
-					Transform { translation -2.0  0.0 -2.0 children [USE Red ]}
-				]
-			}
-			
-			Transform {
-				children [
-					DEF Blue Transform {
-						translation 2.0 0.0 0.0
-						children [
-							Shape {
-								appearance DEF Blue-App Appearance {
-									material Material {
-										diffuseColor 0.0 0.0 1.0
-									}
-									texture	DEF M2 MovieTexture { url "10" loop TRUE }
-								}
-								geometry Box { }
-							}
-						]
-					}
-					Transform { translation -4.0  0.0  0.0 children [USE Blue] }
-					Transform { translation -2.0  0.0  2.0 children [USE Blue] }
-					Transform { translation -2.0  0.0 -2.0 children [USE Blue] }
-					Transform { translation -2.0  2.0  0.0 children [USE Blue] }
-					Transform { translation -2.0 -2.0  0.0 children [USE Blue] }
-					Transform { translation  0.0  2.0  2.0 children [USE Blue] }
-					Transform { translation  0.0  2.0 -2.0 children [USE Blue] }
-					Transform { translation -4.0  2.0  2.0 children [USE Blue] }
-					Transform { translation -4.0  2.0 -2.0 children [USE Blue] }
-					Transform { translation  0.0 -2.0  2.0 children [USE Blue] }
-					Transform { translation  0.0 -2.0 -2.0 children [USE Blue] }
-					Transform { translation -4.0 -2.0  2.0 children [USE Blue] }
-					Transform { translation -4.0 -2.0 -2.0 children [USE Blue] }
-				]
-			}
-
-			DEF Clock TimeSensor {
-				cycleInterval 3.0
-				loop FALSE
-			}
-
-			DEF Trigger TimeSensor {
-				loop TRUE
-				cycleInterval 5.0
-			}
-
-			DEF RedScale PositionInterpolator {
-				key [ 0.0, 0.5, 1.0 ]
-				keyValue [
-					1.0 1.0 1.0,
-					0.0001 0.0001 0.0001,
-					1.0 1.0 1.0,
-				]
-			}
-
-			DEF BlueScale PositionInterpolator {
-				key [ 0.0, 0.25, 0.5, 0.75, 1.0 ]
-				keyValue [
-					1.0 1.0 1.0,
-					0.0001 0.0001 0.0001,
-					1.0 1.0 1.0,
-					0.0001 0.0001 0.0001,
-					1.0 1.0 1.0,
-				]
-			}
-		]
-	}
-
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
-
-]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE Trigger.cycleTime       TO Clock.startTime
-ROUTE Clock.fraction_changed  TO RedScale.set_fraction
-ROUTE Clock.fraction_changed  TO BlueScale.set_fraction
-ROUTE RedScale.value_changed  TO Red.scale
-ROUTE BlueScale.value_changed TO Blue.scale
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      OCR_ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/enst_video.h264"
-		      }
-		    }
-		  ]
-		}
-		ObjectDescriptor {
-		  objectDescriptorID  5
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-						fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-box.bt Deleted

@@ -1,69 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Box test"
-   info ["This shows a box" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	rotation 1 1 1 1.57
-  	children [
-     Shape {
-     	appearance Appearance {
-				material Material { diffuseColor 1.0 0.0 0.0 }
-				texture	ImageTexture {  url "5" }
-     	}
-      geometry Box {size 120 100 80}
-     }
-    ]
-  }
- ]
-}
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  5
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-						fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-compositetexture3D-bitmap.bt Deleted

@@ -1,113 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-
-  WorldInfo {
-   title "Box test"
-   info ["This shows a bitmap using" "a compositetexture3D" "the 3D texture is a spinning box with an image texture" "" "GPAC Regression Tests" "$Date: 2008-07-22 10:54:58 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-	Background2D{url 20}
-	
-  Shape {
-  	appearance Appearance { 
-  		material DEF MAT Material2D { emissiveColor 1 1 0 filled FALSE transparency 0}
-	  	texture CompositeTexture3D {
-	  		pixelWidth 128
-	  		pixelHeight 128
-	  		children [
-	  			DEF BACK Background2D {backColor 0 1 0}
-	  			DEF TR2 Transform {
-	  				rotation 1 1 1 -0.65
-	  				children [
-	  					Shape {
-	  						appearance Appearance {
-	  							 material DEF MAT2 Material { emissiveColor 0 0 1 } 
-	  							 texture ImageTexture {url 10}
-	  						}
-	  						geometry Box {size 50 50 50}
-							}
-							DEF TOUCH TouchSensor{}
-						]
-					}
-				]
-			}
-    }
-#    geometry Bitmap{}
-    geometry Circle {radius 60}
-   }
-
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
-
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-#ROUTE TS.fraction_changed TO MAT2.transparency
-ROUTE OI.value_changed TO TR2.rotation
-ROUTE TOUCH.isActive TO BACK.set_bind
-
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-		       fileName "./../auxiliary_files/logo.png"
-		      }
-		    }
-		  ]
-		}
-		ObjectDescriptor {
-		  objectDescriptorID  20
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "./../auxiliary_files/sky.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-
-#take care of bind delay
-AT 100 {
-#	REPLACE BACK.set_bind BY FALSE
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-compositetexture3D-box.bt Deleted

@@ -1,106 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-	Background2D { backColor 1 1 1}
-
-  WorldInfo {
-   title "Composite Texture test"
-   info ["This shows a box" "with a 3D composite texture" "the texture is a spinning sphere with an image texture"  "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-			
-
-	DEF TR Transform {
-  	translation 0 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		texture CompositeTexture3D {
-     	   pixelWidth 128
-      	 pixelHeight 128
-     			children [
-     				#MPEG-4 is stupid here, background2D can't be encoded in the CT3D.background field
-      	 		Background2D {url "../auxiliary_files/sky.jpg" backColor 1 0 0}
-						DEF TR2 Transform {
-							scale 1 0.5 1
-							children [
-						   Shape {
-						   	appearance Appearance {
-						   		 material DEF MAT2 Material { diffuseColor 0 0 1 }
-						   		 texture ImageTexture { url "10"}
-						   	 }
-								geometry Sphere {radius 60}
-							}
-						 ]
-						}
-     		  ]
-     	   }
-      }
-      geometry Box {size 64 64 64 }
-     }
-    ]
-  }
-
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF SI ScalarInterpolator {
-  	key [0 0.5 1]
-  	keyValue [0 0.8 0]
-  }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE OI.value_changed TO TR2.rotation
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO MAT2.transparency
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-cone-transparent.bt Deleted

@@ -1,68 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 300
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cone test"
-   info ["This shows cones with and without cap" "with transparency - objects should appear behing each-other" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance Appearance {
-				material DEF MAT Material { diffuseColor 1.0 0.0 0.0 transparency 0.5}
-     	}
-      geometry Cone {height 150 bottomRadius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance Appearance {
-#				material USE MAT
-				material Material { diffuseColor 1.0 0.0 1.0}
-     	}
-      geometry Cone {height 150 bottomRadius 25 bottom FALSE}
-     }
-    ]
-  }
-  DEF TS TimeSensor {loop TRUE cycleInterval 6}
-  DEF SI ScalarInterpolator {
-	  key [0 0.5 1]
-	  keyValue [0 1 0]
-	}
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO MAT.transparency
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-cone.bt Deleted

@@ -1,81 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 300
-				  pixelHeight 300
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cone test"
-   info ["This shows a cone" "with and without cap" "and a texture map" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance DEF APP Appearance {
-				material Material {diffuseColor 1.0 0.0 0.0 }
-				texture	ImageTexture {  url "5" }
-     	}
-      geometry Cone {height 150 bottomRadius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 70 0 0
-  	rotation 1 0 0 4
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cone {height 150 bottomRadius 25 bottom FALSE}
-     }
-    ]
-  }
- ]
-}
-
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  5
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-						fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-cylinder-transparent.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 380
-				  pixelHeight 300
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cylinder test"
-   info ["This shows a cylinder" "with and without cap and side and transparent material" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -100 100 0
-  	children [
-     Shape {
-     	appearance DEF APP Appearance {
-				material DEF MAT Material {diffuseColor 1.0 0.0 0.0 }
-     	}
-      geometry Cylinder {height 150 radius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 100 0
-  	rotation 1 0 0 0.78
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation -100 -100 0
-  	rotation 1 0 0 -0.78
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 bottom FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 -100 0
-  	rotation 1 0 0 1.2
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 bottom FALSE top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 100 0 0
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 side FALSE }
-     }
-    ]
-  }
-  DEF TS TimeSensor {loop TRUE cycleInterval 6}
-  DEF SI ScalarInterpolator {
-	  key [0 0.5 1]
-	  keyValue [0 1 0]
-	}
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO MAT.transparency
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-cylinder.bt Deleted

@@ -1,107 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 380
-				  pixelHeight 300
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-	Background2D { backColor 1 1 1}
-  WorldInfo {
-   title "Cylinder test"
-   info ["This shows a cylinder" "with and without cap and side and a texture map" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Transform {
-  	translation -100 100 0
-  	children [
-     Shape {
-     	appearance DEF APP Appearance {
-				material Material {diffuseColor 1.0 0.0 0.0 }
-				texture	ImageTexture {  url "5" }
-     	}
-      geometry Cylinder {height 150 radius 25}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 100 0
-  	rotation 1 0 0 0.78
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation -100 -100 0
-  	rotation 1 0 0 -0.78
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 bottom FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 0 -100 0
-  	rotation 1 0 0 1.2
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 bottom FALSE top FALSE}
-     }
-    ]
-  }
-  Transform {
-  	translation 100 0 0
-  	children [
-     Shape {
-     	appearance USE APP
-      geometry Cylinder {height 150 radius 25 side FALSE }
-     }
-    ]
-  }
- ]
-}
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  5
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 10
-		      muxInfo MuxInfo {
-						fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-transform-box.bt Deleted

@@ -1,85 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Texture Transform test"
-   info ["This shows a 3D cube" "mapped with an alpha PNG and texture transform" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-			
-	DEF TR Transform {
-  	rotation 1 1 1 0.75
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {}
-     		textureTransform DEF MX TextureTransform { scale 4 4 }
-   		 texture ImageTexture { url "10"}
-   	 }
-     geometry Box {size 64 64 64 }
-    }
-   ]
-  }
-
-  DEF TS TimeSensor { cycleInterval 2.0 loop TRUE }
-  DEF PI PositionInterpolator2D  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [1 1, 4 1, 4 4, 1 4, 1 1]
- 	}
-  DEF CI ColorInterpolator {
-  	key [0 0.5 1]
-  	keyValue [1 1 1, 0 0 1, 1 1 1]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO MX.scale
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO MAT.diffuseColor
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-texturing-transform-matrix-box.bt Deleted

@@ -1,91 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Texture Transform test"
-   info ["This shows a 3D cube" "mapped with an alpha PNG and texture transform" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-			
-	DEF TR Transform {
-  	rotation 1 1 1 0.75
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {}
-     		textureTransform DEF MX TransformMatrix2D {mxx 3 myy 2}
-	      texture ImageTexture { url "10"}
-   	 }
-     geometry Box {size 64 64 64 }
-    }
-   ]
-  }
-
-  DEF TS TimeSensor { cycleInterval 8.0 loop TRUE }
-  DEF SI ScalarInterpolator  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [1 1 1 6 1]
- 	}
-  DEF SI2 ScalarInterpolator  {
-  	key [0 0.25 0.5 0.75 1]
-  	keyValue [1 6 1 1 1]
- 	}
-  DEF CI ColorInterpolator {
-  	key [0 0.5 1]
-  	keyValue [1 1 1, 0 0 1, 1 1 1]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO MX.mxy
-ROUTE TS.fraction_changed TO SI2.set_fraction
-ROUTE SI2.value_changed TO MX.myx
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO MAT.diffuseColor
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "../auxiliary_files/logo.jpg"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-viewpoint-anim.bt Deleted

@@ -1,84 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 320
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Viewpoint animation test test"
-   info ["This shows a sphere" "and dynamic viewpoint" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-	DEF VP Viewpoint {position -200 0 100 orientation 0 1 0 -1.0 }
-
-  Transform {
-  	translation 0 0 -50
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 1 1 1
-     		}
-     	}
-      geometry Box {size 150 100 10}
-     }
-  	]
-  }
-
-  DEF TR Transform {
-  	translation -50 0 0
-  	scale 0.75 1 1
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     			shininess 0.5
-     		}
-     	}
-      geometry Sphere {radius 25 }
-     }
-    ]
-  }
-  DEF TS TimeSensor { cycleInterval 4.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [0 0 1 0, 0 0 1 3.14, 0 0 1 6.26]
- 	}
-  DEF OI2 OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [0 1 0 -1, 0 1 0 1, 0 1 0 -1]
- 	}
-  DEF PI PositionInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [-200 0 100, 200 0 100, -200 0 100]
- 	}
- ]
-}
-
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TS.fraction_changed TO OI2.set_fraction
-ROUTE OI2.value_changed TO VP.orientation
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO VP.position

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-viewpoint-bind-jump.bt Deleted

@@ -1,114 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-  WorldInfo {
-   title "Viewpoint bind test"
-   info ["This shows sensors triggering viewpoint binding" "Viewpoint switching shall not be animated" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	DEF VP1 Viewpoint {description "Front View" position 0 0 300}
-	DEF VP2 Viewpoint {description "Above View" position 0 300 30 orientation 1 0 0 -1.2 }
-	
-	DEF TR Transform {
-  	translation 50 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 0 1 1
-     		}
-     	}
-      geometry DEF BOX Box {size 50 50 50}
-     }
-     DEF TS2 TouchSensor {}
-  	]
-  }
-	
-  Transform {
-  	translation -80 0 20
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material2D { emissiveColor 1 0 0 filled TRUE }
-     	}
-      geometry DEF RC_RED Rectangle {size 100 100}
-     }
-  	]
-  }
-
-	Shape {
-		appearance Appearance {
-			material Material2D { emissiveColor 1 1 1 filled TRUE }
-		}
-		geometry DEF RC_WHITE Rectangle { size 200 200 }
-	}
-		
-
-  Transform {
-  	translation -30 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     		}
-     	}
-      geometry DEF SPHERE Sphere {radius 30}
-     }
-     DEF TOUCH TouchSensor {}
-    ]
-  }
-  DEF TS TimeSensor { enabled FALSE cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- 	
- 	DEF C Conditional { buffer { REPLACE MAT.diffuseColor BY 0 0 1 } }
- 	DEF RC Conditional { buffer { REPLACE MAT.diffuseColor BY 1 1 0 } }
-
-  DEF SETVP1 Conditional {
-  	buffer {
-  		REPLACE VP1.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP2.activate
-  	}
-  }
-  DEF SETVP2 Conditional {
-  	buffer {
-  		REPLACE VP2.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP1.activate
-  	}
-  }
-
- ]
-}
-
-DEF MVP ROUTE TOUCH.isActive TO SETVP2.activate
-ROUTE TOUCH.isOver TO TS.enabled
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TS2.isActive TO C.activate
-ROUTE TS2.isActive TO RC.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-viewpoint-bind.bt Deleted

@@ -1,115 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				  useNames true
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-  WorldInfo {
-   title "Viewpoint bind test"
-   info ["This shows sensors triggering viewpoint binding" "Viewpoint switching shall be animated" "" "GPAC Regression Tests" "$Date: 2008-11-24 14:58:25 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	DEF VP1 Viewpoint {description "Front View" position 0 0 200 jump FALSE fieldOfView 0.39}
-	DEF VP2 Viewpoint {description "Above View" position 0 300 30 orientation 1 0 0 -1.2 jump FALSE}
-	
-	DEF TR Transform {
-  	translation 50 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 0 1 1
-     		}
-     	}
-      geometry DEF BOX Box {size 50 50 50}
-     }
-     DEF TS2 TouchSensor {}
-  	]
-  }
-	
-  Transform {
-  	translation -80 0 20
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material2D { emissiveColor 1 0 0 filled TRUE }
-     	}
-      geometry DEF RC_RED Rectangle {size 100 100}
-     }
-  	]
-  }
-
-	Shape {
-		appearance Appearance {
-			material Material2D { emissiveColor 1 1 1 filled TRUE }
-		}
-		geometry DEF RC_WHITE Rectangle { size 200 200 }
-	}
-		
-
-  Transform {
-  	translation -30 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     		}
-     	}
-      geometry DEF SPHERE Sphere {radius 30}
-     }
-     DEF TOUCH TouchSensor {}
-    ]
-  }
-  DEF TS TimeSensor { enabled FALSE cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- 	
- 	DEF C Conditional { buffer { REPLACE MAT.diffuseColor BY 0 0 1 } }
- 	DEF RC Conditional { buffer { REPLACE MAT.diffuseColor BY 1 1 0 } }
-
-  DEF SETVP1 Conditional {
-  	buffer {
-  		REPLACE VP1.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP2.activate
-  	}
-  }
-  DEF SETVP2 Conditional {
-  	buffer {
-  		REPLACE VP2.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP1.activate
-  	}
-  }
-
- ]
-}
-
-DEF MVP ROUTE TOUCH.isActive TO SETVP2.activate
-ROUTE TOUCH.isOver TO TS.enabled
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TS2.isActive TO C.activate
-ROUTE TS2.isActive TO RC.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-3D-viewpoint-ortho-bind.bt Deleted

@@ -1,118 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-  WorldInfo {
-   title "Viewpoint bind test"
-   info ["This shows sensors triggering viewpoint binding" "Viewpoint switching shall be animated" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	DEF VP1 Viewpoint {description "Front View" position 0 0 200 jump FALSE}
-	DEF VP2 Viewpoint {description "Above View" position 0 300 30 orientation 1 0 0 -1.2 jump FALSE}
-
-	Shape {
-		appearance Appearance {
-			material Material2D { emissiveColor 1 1 1 filled TRUE }
-		}
-		geometry DEF RC_WHITE Rectangle { size 200 200 }
-	}
-		
-
-		
-  Transform {
-  	translation -80 0 20
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material2D { emissiveColor 1 0 0 filled TRUE }
-     	}
-      geometry DEF RC_RED Rectangle {size 100 100}
-     }
-  	]
-  }
-
-  Transform {
-  	translation -30 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     		}
-     	}
-      geometry DEF SPHERE Sphere {radius 30}
-     }
-     DEF TOUCH TouchSensor {}
-    ]
-  }
-
-
-	DEF TR Transform {
-  	translation 50 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material {
-     			diffuseColor 0 1 1
-     		}
-     	}
-      geometry DEF BOX Box {size 50 50 50}
-     }
-     DEF TS2 TouchSensor {}
-  	]
-  }
-
-
-  DEF TS TimeSensor { enabled FALSE cycleInterval 2.0 loop TRUE }
-  DEF OI OrientationInterpolator  {
-  	key [0 0.5 1]
-  	keyValue [1 1 1 0, 1 1 1 3.14, 1 1 1 6.26]
- 	}
- 	
- 	DEF C Conditional { buffer { REPLACE MAT.diffuseColor BY 0 0 1 } }
- 	DEF RC Conditional { buffer { REPLACE MAT.diffuseColor BY 1 1 0 } }
-
-  DEF SETVP1 Conditional {
-  	buffer {
-  		REPLACE VP1.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP2.activate
-  	}
-  }
-  DEF SETVP2 Conditional {
-  	buffer {
-  		REPLACE VP2.set_bind BY TRUE
-  		REPLACE ROUTE MVP BY TOUCH.isActive TO SETVP1.activate
-  	}
-  }
-
- ]
-}
-
-DEF MVP ROUTE TOUCH.isActive TO SETVP2.activate
-ROUTE TOUCH.isOver TO TS.enabled
-ROUTE TS.fraction_changed TO OI.set_fraction
-ROUTE OI.value_changed TO TR.rotation
-ROUTE TS2.isActive TO C.activate
-ROUTE TS2.isActive TO RC.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-image-meter-metrics.bt Deleted

@@ -1,80 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows dragable bitmap with scale 0.75 0.75" "in Meter Metrics" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Bitmap Test"
-  }
-  Transform2D {
-   children [
-    DEF TR Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture ImageTexture {
-         url [od:10]
-        }
-       }
-       geometry Bitmap {
-        scale 0.75 0.75
-       }
-      }
-      DEF PS PlaneSensor2D {
-       maxPosition 1 1
-       minPosition -1 -1
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-image-pixel-metrics.bt Deleted

@@ -1,89 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 0
-  }
-  WorldInfo {
-   info [
-    "This test shows an Image (the Osmo4 logo), which has an alpha component being display on a yellow background."
-    "The geometry node use to display the image is a Bitmap node with a scale of 0.75 0.75"
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:08 $ - $Revision: 1.4 $" 
-    "(C) 2002-2004 GPAC Team"
-   ]
-   title "Bitmap and Transparent Images"
-  }
-  Transform2D {
-   children [
-    DEF TR Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture ImageTexture {
-         url [od:10]
-         repeatS FALSE
-         repeatT FALSE
-        }
-       }
-       geometry Bitmap {
-        scale 0.75 0.75
-       }
-      }
-      DEF PS PlaneSensor2D {
-       maxPosition 200 200
-       minPosition -200 -200
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.png"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-image-resizing.bt Deleted

@@ -1,153 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows an image whose size is animated." 
-    "The result is displayed on top of a static image."
-    "Both textures use a Bitmap node to allow efficient handling of the textures."
-    "The resizing of the image is not done using a Transform2D node (or TransformMatrix2D) but by changing the size property of the Bitmap node."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.4 $"
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Image Resizing"
-  }
-  Transform2D {
-   translation 0 128
-   children [
-    DEF TR Transform2D {
-     children [
-      Transform2D {
-       translation -128 0
-       children [
-        DEF S Shape {
-         appearance Appearance {
-          texture ImageTexture {
-           url [od:12]
-           repeatS FALSE
-           repeatT FALSE
-          }
-         }
-         geometry Bitmap {}
-
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        USE S
-       ]
-      }
-      Transform2D {
-       translation 128 0
-       children [
-        USE S
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE TR
-   ]
-  }
-  Transform2D {
-   translation 0 -128
-   children [
-    USE TR
-   ]
-  }
-  Transform2D {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture ImageTexture {
-         url [od:10]
-         repeatS FALSE
-         repeatT FALSE
-        }
-       }
-       geometry DEF BMP Bitmap {
-        scale 0.75 0.75
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0.75 0.75 0.25 0.25 0.75 0.75]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO BMP.scale
-
-RAP AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 12
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-movie-materialkey.bt Deleted

@@ -1,101 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B Background2D {
-   backColor 0 0 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how to do Color Keying on Video."
-    "The MaterialKey node allows defining a key color or color range and to make that color transparent in the texture. The degree of transparency can be specified using the transparency property." 
-     
-    "" 
-    "GPAC Regression Tests" "$Date: 2008-05-19 15:28:17 $ - $Revision: 1.6 $" 
-    "(C) 2002-2004 GPAC Team"
-   ]
-   title "Color Keying on Video using the MaterialKey node"
-  }
-  Transform2D {
-   scale 2 2
-   children [
-    DEF TR Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture MovieTexture {
-         url [od:10]
-         loop FALSE
-        }
-        material DEF MK MaterialKey {
-         isKeyed TRUE
-         lowThreshold 0.4
-         highThreshold 0.4
-         keyColor 1 1 0 
-         transparency 0
-        }
-       }
-       geometry Bitmap {
-        scale 1 1
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {loop TRUE cycleInterval 10.0}
-  DEF CI ColorInterpolator {
-   key [0 1]
-   keyValue [1 1 1, 0 0 1]
-  }
- ]
-}
-
-#ROUTE TS.fraction_changed TO MK.highThreshold
-ROUTE TS.fraction_changed TO CI.set_fraction
-ROUTE CI.value_changed TO B.backColor
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-movie.bt Deleted

@@ -1,84 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "The Bitmap node is a geometry node which defines a rectangle on which the texture is mapped. The difference with a Rectangle node is that its size is given by the texture, hence no resampling of the texture is needed during the display. Hardware accelerated operations can be used." 
-    "This test shows a dragable video. The Bitmap node allows efficient draging and display of the video." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.4 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Efficient Display of Video using the Bitmap node"
-  }
-  Transform2D {
-   scale 2 2
-   children [
-    DEF TR Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture MovieTexture {
-         url [od:10]
-         loop FALSE
-        }
-       }
-       geometry Bitmap {
-        scale 1 1
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-bitmap-video-resizing.bt Deleted

@@ -1,152 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows a video whose size is animated, the result is displayed on top of a static image." 
-    "Both textures use a Bitmap node to allow efficient handling of the textures." 
-    "The resizing of the video is not done using a Transform2D node (or TransformMatrix2D) but by changing the size property of the Bitmap node." 
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.5 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Bitmap Video Resizing"
-  }
-  Transform2D {
-   translation 0 128
-   children [
-    DEF TR Transform2D {
-     children [
-      Transform2D {
-       translation -128 0
-       children [
-        DEF S Shape {
-         appearance Appearance {
-          texture ImageTexture {
-           url [od:12]
-           repeatS FALSE
-           repeatT FALSE
-          }
-         }
-         geometry Bitmap {}
-
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        USE S
-       ]
-      }
-      Transform2D {
-       translation 128 0
-       children [
-        USE S
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE TR
-   ]
-  }
-  Transform2D {
-   translation 0 -128
-   children [
-    USE TR
-   ]
-  }
-  Transform2D {
-   children [
-    Transform2D {
-     children [
-      Shape {
-       appearance Appearance {
-        texture MovieTexture {
-         loop TRUE
-         url [od:10]
-        }
-       }
-       geometry DEF BMP Bitmap {
-        scale 0.75 0.75
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [2 2 0.25 0.25 2 2]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO BMP.scale
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 12
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-cachetexture_cache.bt Deleted

@@ -1,90 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the CacheTexture node. The texture is cached for 3 seconds only."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "CacheTexture Node for testing cache"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture CacheTexture {
-       objectTypeIndication 108
-       image "../auxiliary_files/sky.jpg"
-       cacheURL "MyCachedPicture.jpg"
-       expirationDate 3
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-   ]
-  }
- ]
-}
-
-AT 1000 {
- REPLACE TR.children[0] BY Shape {}
-}
-
-AT 2000 {
- REPLACE TR.children[0] BY Shape {
-   appearance Appearance {
-    texture ImageTexture {
-     url "MyCachedPicture.jpg"
-    }
-   }
-   geometry Circle {
-    radius 80
-   }
-  }
- }
-}
-
-AT 3000 {
- REPLACE TR.children[0] BY Shape {}
-}
-
-AT 4000 {
- REPLACE TR.children[0] BY Shape {
-   appearance Appearance {
-    texture ImageTexture {
-     url "MyCachedPicture.jpg"
-    }
-   }
-   geometry Rectangle {
-    size 160 80
-   }
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-cachetexture_nocache.bt Deleted

@@ -1,57 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the CacheTexture node for embedding images in the BIFS bitstream."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "CacheTexture Node for in-band images"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture CacheTexture {
-       objectTypeIndication 108
-       image "../auxiliary_files/sky.jpg"
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition -1 -1
-     autoOffset TRUE
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-animated-osmo4logo.bt Deleted

@@ -1,315 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 0 1 1
-  }
-  WorldInfo {
-   info ["This shows the Osmo4 logo" "animated through BIFS commands" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Osmo4 Logo"
-  }
-  Shape {
-   appearance Appearance {
-    texture LinearGradient {
-     endPoint 0 1
-     key [0 0.33 1]
-     keyValue [0 0.5 0.5 0 0.75 0.75 0 0.75 1]
-    }
-   }
-   geometry Rectangle {
-    size 300 300
-   }
-  }
-  Switch {
-   choice [
-    DEF BCIRCLE Shape {
-     appearance DEF ABLACK Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 60
-     }
-    }
-    DEF BTRIANGLE Shape {
-     appearance USE ABLACK
-     geometry IndexedFaceSet2D {
-      colorPerVertex FALSE
-      coord Coordinate2D {
-       point [-40 0 40 0 0 -60]
-      }
-     }
-    }
-    DEF RCIRCLE Shape {
-     appearance Appearance {
-      material DEF RMAT Material2D {
-       lineProps DEF LP XLineProperties {
-        lineColor 1 0 0
-        width 20
-       }
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-  DEF MOV Transform2D {
-   children [
-    DEF LOGO Transform2D {}
-   ]
-  }
- ]
-}
-
-
-AT 1000 {
- APPEND TO LOGO.children DEF BR Transform2D {
-  scale 0 0
-  translation -150 -150
-  children [
-   USE BCIRCLE
-  ]
- }
- APPEND TO MOV.children DEF TIME TimeSensor {
-  cycleInterval 1.5
- }
- APPEND TO MOV.children DEF POS PositionInterpolator2D {
-  key [0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1]
-  keyValue [-150 -150 -135 135 120 120 105 -105 -90 -90 -75 75 60 60 45 -45 -30 -30 -15 15 0 0]
- }
- APPEND TO MOV.children DEF SCALE PositionInterpolator2D {
-  key [0 1]
-  keyValue [0.1 0.1 1 1]
- }
- INSERT ROUTE DEF R1 TIME.fraction_changed TO POS.set_fraction
- INSERT ROUTE DEF R2 TIME.fraction_changed TO SCALE.set_fraction
- INSERT ROUTE DEF R3 POS.value_changed TO BR.translation
- INSERT ROUTE DEF R4 SCALE.value_changed TO BR.scale
-}
-
-AT 2500 {
- DELETE ROUTE R1
- DELETE ROUTE R2
- DELETE ROUTE R3
- DELETE ROUTE R4
- DELETE TIME
- DELETE POS
- DELETE SCALE
- REPLACE BR.translation BY 0 0
- REPLACE BR.scale BY 1 1
- APPEND TO LOGO.children DEF BT Transform2D {
-  scale 9 0.5
-  translation 0 20
-  children [
-   USE BTRIANGLE
-  ]
- }
- APPEND TO MOV.children DEF TIME2 TimeSensor {
-  cycleInterval 1.5
- }
- APPEND TO MOV.children DEF POS_BT PositionInterpolator2D {
-  key [0 1]
-  keyValue [0 20 0 90]
- }
- APPEND TO MOV.children DEF POS_BR PositionInterpolator2D {
-  key [0 1]
-  keyValue [0 0 0 -30]
- }
- APPEND TO MOV.children DEF SCALE_BR PositionInterpolator2D {
-  key [0 0.7 1]
-  keyValue [1 1 1.4 1.4 1 1]
- }
- APPEND TO MOV.children DEF SCALE_BT PositionInterpolator2D {
-  key [0 0.7 1]
-  keyValue [9 0.5 5 0.7 1 1]
- }
- INSERT ROUTE DEF R1 TIME2.fraction_changed TO POS_BT.set_fraction
- INSERT ROUTE DEF R2 TIME2.fraction_changed TO POS_BR.set_fraction
- INSERT ROUTE DEF R3 TIME2.fraction_changed TO SCALE_BT.set_fraction
- INSERT ROUTE DEF R4 TIME2.fraction_changed TO SCALE_BR.set_fraction
- INSERT ROUTE DEF R5 POS_BT.value_changed TO BT.translation
- INSERT ROUTE DEF R6 POS_BR.value_changed TO BR.translation
- INSERT ROUTE DEF R7 SCALE_BT.value_changed TO BT.scale
- INSERT ROUTE DEF R8 SCALE_BR.value_changed TO BR.scale
-}
-
-AT 4000 {
- DELETE ROUTE R1
- DELETE ROUTE R2
- DELETE ROUTE R3
- DELETE ROUTE R4
- DELETE ROUTE R5
- DELETE ROUTE R6
- DELETE ROUTE R7
- DELETE ROUTE R8
- DELETE TIME2
- DELETE POS_BT
- DELETE SCALE_BT
- DELETE POS_BR
- DELETE SCALE_BR
- REPLACE BT.translation BY 0 90
- REPLACE BR.translation BY 0 -30
- REPLACE BR.scale BY 1 1
- REPLACE BT.scale BY 1 1
- REPLACE LP.width BY 0
- APPEND TO LOGO.children DEF RC Transform2D {
-  children [
-   USE RCIRCLE
-  ]
- }
- APPEND TO MOV.children DEF TIME3 TimeSensor {
-  cycleInterval 1.5
- }
- APPEND TO MOV.children DEF WIDTH ScalarInterpolator {
-  key [0 0.5 0.75 1]
-  keyValue [0 25 15 20]
- }
- APPEND TO MOV.children DEF COL ColorInterpolator {
-  key [0 1]
-  keyValue [0 0 0 1 0 0]
- }
- INSERT ROUTE DEF R1 TIME3.fraction_changed TO WIDTH.set_fraction
- INSERT ROUTE DEF R2 TIME3.fraction_changed TO COL.set_fraction
- INSERT ROUTE DEF R3 WIDTH.value_changed TO LP.width
- INSERT ROUTE DEF R4 COL.value_changed TO LP.lineColor
-}
-
-AT 5500 {
- DELETE ROUTE R1
- DELETE ROUTE R2
- DELETE ROUTE R3
- DELETE ROUTE R4
- DELETE TIME3
- DELETE WIDTH
- DELETE COL
- REPLACE LP.width BY 20
- REPLACE LP.transparency BY 0
- REPLACE LP.lineColor BY 1 0 0
- APPEND TO MOV.children Transform2D {
-  translation 110 38
-  children [
-   Shape {
-    appearance Appearance {
-     material DEF TXTMAT Material2D {
-      emissiveColor 0.1 0 0.1
-      filled TRUE
-      transparency 1
-     }
-    }
-    geometry Text {
-     string ["sm"]
-     fontStyle DEF FS FontStyle {
-      justify ["BEGIN" "BEGIN"]
-      size 160
-     }
-    }
-   }
-  ]
- }
- APPEND TO MOV.children Transform2D {
-  scale 0.3 0.3
-  translation 340 -70
-  children [
-   USE LOGO
-  ]
- }
- APPEND TO MOV.children Transform2D {
-  translation 380 38
-  children [
-   Shape {
-    appearance Appearance {
-     material USE TXTMAT
-    }
-    geometry Text {
-     string ["4"]
-     fontStyle USE FS
-    }
-   }
-  ]
- }
- APPEND TO MOV.children DEF TIME4 TimeSensor {
-  cycleInterval 1.5
- }
- APPEND TO MOV.children DEF POS_MOV PositionInterpolator2D {
-  key [0 0.5 1]
-  keyValue [0 0 75 0 -75 0]
- }
- APPEND TO MOV.children DEF SCALE_MOV PositionInterpolator2D {
-  key [0 0.5 1]
-  keyValue [1 1 0.4 0.4 0.4 0.4]
- }
- APPEND TO MOV.children DEF ALPHA2 ScalarInterpolator {
-  key [0 0.9 1]
-  keyValue [0.95 0.5 0]
- }
- INSERT ROUTE DEF R1 TIME4.fraction_changed TO POS_MOV.set_fraction
- INSERT ROUTE DEF R2 TIME4.fraction_changed TO SCALE_MOV.set_fraction
- INSERT ROUTE DEF R3 TIME4.fraction_changed TO ALPHA2.set_fraction
- INSERT ROUTE DEF R4 POS_MOV.value_changed TO MOV.translation
- INSERT ROUTE DEF R5 SCALE_MOV.value_changed TO MOV.scale
- INSERT ROUTE DEF R6 ALPHA2.value_changed TO TXTMAT.transparency
-}
-
-AT 7000 {
- DELETE ROUTE R1
- DELETE ROUTE R2
- DELETE ROUTE R3
- DELETE ROUTE R4
- DELETE ROUTE R5
- DELETE ROUTE R6
- DELETE TIME4
- DELETE ALPHA2
- DELETE POS_MOV
- DELETE SCALE_MOV
- REPLACE TXTMAT.transparency BY 0.5
- REPLACE MOV.translation BY -75 0
- REPLACE MOV.scale BY 0.4 0.4
- 
- APPEND TO LOGO.children Transform2D {
-  children [
-   DEF TS TimeSensor {
-    cycleInterval 4
-    loop TRUE
-   }
-   DEF PI PositionInterpolator2D {
-    key [0 0.25 0.5 0.75 1]
-    keyValue [1 1 -1 1 1 1 1 -1 1 1]
-   }
-   DEF SI ScalarInterpolator {
-    key [0 0.5 1]
-    keyValue [0 0.8 0]
-   }
-  ]
- }
- INSERT ROUTE TS.fraction_changed TO PI.set_fraction
- INSERT ROUTE TS.fraction_changed TO SI.set_fraction
- INSERT ROUTE PI.value_changed TO LOGO.scale
- INSERT ROUTE SI.value_changed TO TXTMAT.transparency
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-delete-index.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows indexed value deletion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Indexed Value delete test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- DELETE COORD.point[0]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-delete-node.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node deletion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node delete test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- DELETE MAT
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-delete-route.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows route deletion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Route delete test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO MAT.transparency
-
-AT 2500 {
- DELETE ROUTE R1
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-global-qp.bt Deleted

@@ -1,66 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows GlobalQuantizer usage" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "GlobalQuantizer test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
- ]
-}
-
-
-AT 100 {
- GLOBALQP QuantizationParameter {
-  position2DQuant TRUE
-  position2DMin -100 -100
-  position2DMax 100 100
-  position2DNbBits 2
- }
-}
-
-AT 1000 {
- APPEND TO OG.children DEF TR Transform2D {
-  scale 0.5 0.5
-  children [
-   Shape {
-    appearance Appearance {
-     material DEF MAT Material2D {
-      emissiveColor 1 0 0
-      filled TRUE
-     }
-    }
-    geometry IndexedFaceSet2D {
-     coord DEF COORD Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-insert-index.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows indexed value insertion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Indexed Value insert test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- INSERT AT COORD.point[0] -50 -50
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-insert-node.bt Deleted

@@ -1,74 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node insertion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node insert test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    DEF S Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- INSERT AT OG.children[0] Transform2D {
-  scale 0.5 0.5
-  translation -100 -50
-  children [
-   USE S
-  ]
- }
-}
-
-AT 4000 {
- APPEND TO OG.children Transform2D {
-  scale 0.5 0.5
-  translation 100 50
-  children [
-   USE S
-  ]
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-insert-nodedef.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-insert-route.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows route insertion" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "route insert test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO MAT.transparency
-
-AT 2000 {
- INSERT ROUTE SI.value_changed TO TR.rotationAngle
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-multiple-replace-field.bt Deleted

@@ -1,66 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- includeInlineProfileLevelFlag true
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows multiple field replacement" "through BIFS extended commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "multiple field replace test"
-  }
-  DEF N0 Background2D {
-   backColor 1 1 1
-  }
-  DEF N1 Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF N2 Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF N3 Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 1000 {
- MULTIPLEREPLACE N2 {
-  emissiveColor 0 1 0
-  transparency 0.9
-  lineProps LineProperties {
-   lineColor 0 0 1
-   width 2
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-multiple-replace-index.bt Deleted

@@ -1,62 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows multiple indexed field replacement" "through BIFS Extended commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "multiple indexed field replace test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- MULTIPLEINDREPLACE COORD.point [
-  0 BY -20 0
-  2 BY 50 50
-  5 BY -50 -80
- ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-node-delete-ex.bt Deleted

@@ -1,125 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows extended node deletion" "through BIFS extended commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node delete test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF OG OrderedGroup {
-   order [2 1 3]
-   children [
-    DEF TR Transform2D {
-     scale 0.5 0.5
-     children [
-      DEF S Shape {
-       appearance Appearance {
-        material DEF MAT Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry IndexedFaceSet2D {
-        coord DEF COORD Coordinate2D {
-         point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-        }
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation -50 40
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 1
-         filled TRUE
-        }
-       }
-       geometry Circle {
-        radius 30
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 50 -50
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 1
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 100 50
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string ["test"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_text
-   field SFNode t USE TXT
-   field SFNode g USE OG
-   url ["javascript: function set_text(value, ts) {t.string[0] = 'order: ' + g.order;}"   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
- ]
-}
-
-ROUTE TS.cycleTime TO SC.set_text
-
-AT 2000 {
- XDELETE TR
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-proto-delete.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-PROTO MYPROTO [
- exposedField SFVec2f translation 0 0
-] {
- Transform2D {
-  translation IS translation
-  children [
-   Shape {
-    appearance Appearance {
-     material Material2D {
-      emissiveColor 1 0 0
-      filled TRUE
-     }
-    }
-    geometry Circle {
-     radius 20
-    }
-   }
-  ]
- }
-}
-PROTO MYOTHERPROTO [
- exposedField SFVec2f translation 0 0
-] {
- Transform2D {
-  translation IS translation
-  children [
-   Shape {
-    appearance Appearance {
-     material Material2D {
-      emissiveColor 1 0 0
-      filled TRUE
-     }
-    }
-    geometry Rectangle {
-     size 100 50
-    }
-   }
-  ]
- }
-}
-DEF ORD OrderedGroup {
- children [
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows proto declaration deletion" "through BIFS Extended commands" "The player should complain about unknown proto" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto Delete test"
-  }
-  MYPROTO {}
- ]
-}
-
-
-AT 1000 {
- DELETEPROTO ALL
-}
-
-AT 2000 {
- INSERT AT ORD.children[2] MYPROTO {
-  translation -100 0
- }
-}
-
-AT 3000 {
- INSERT AT ORD.children[2] MYOTHERPROTO {
-  translation 100 0
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-proto-insert.bt Deleted

@@ -1,83 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF ORD OrderedGroup {
- children [
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows proto declaration insertion" "through BIFS Extended commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto Insert test"
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   translation -100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 1000 {
- INSERTPROTO [
-  PROTO MYPROTO [
-   exposedField SFVec2f translation 0 0
-  ] {
-   Transform2D {
-    translation IS translation
-    children [
-     Shape {
-      appearance Appearance {
-       material Material2D {
-        emissiveColor 1 0 0
-        filled TRUE
-       }
-      }
-      geometry Circle {
-       radius 20
-      }
-     }
-    ]
-   }
-  }
- ]
- INSERT AT ORD.children[0] MYPROTO {
-  translation 100 0
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-protolist-delete.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-PROTO MYPROTO [
- exposedField SFVec2f translation 0 0
-] {
- Transform2D {
-  translation IS translation
-  children [
-   Shape {
-    appearance Appearance {
-     material Material2D {
-      emissiveColor 1 0 0
-      filled TRUE
-     }
-    }
-    geometry Circle {
-     radius 20
-    }
-   }
-  ]
- }
-}
-PROTO MYOTHERPROTO [
- exposedField SFVec2f translation 0 0
-] {
- Transform2D {
-  translation IS translation
-  children [
-   Shape {
-    appearance Appearance {
-     material Material2D {
-      emissiveColor 1 0 0
-      filled TRUE
-     }
-    }
-    geometry Rectangle {
-     size 100 50
-    }
-   }
-  ]
- }
-}
-DEF ORD OrderedGroup {
- children [
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows proto declaration list deletion" "through BIFS Extended commands" "The player should complain about unknown nodes" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto List Delete test"
-  }
-  MYPROTO {}
- ]
-}
-
-
-AT 1000 {
- DELETEPROTO [MYPROTO]
-}
-
-AT 2000 {
- INSERT AT ORD.children[0] MYPROTO {
-  translation -100 0
- }
-}
-
-AT 3000 {
- INSERT AT ORD.children[0] MYOTHERPROTO {
-  translation 100 0
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-quantification.bt Deleted

@@ -1,186 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows quantification of IFS2D" "with several values" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Quantification Test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    QuantizationParameter {
-     position2DQuant TRUE
-     position2DMin -100 -100
-     position2DMax 100 100
-     position2DNbBits 9
-     colorQuant FALSE
-    }
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE TR BY DEF TR1 Transform2D {
-  scale 0.5 0.5
-  children [
-   QuantizationParameter {
-    position2DQuant TRUE
-    position2DMin -100 -100
-    position2DMax 100 100
-    position2DNbBits 8
-    colorQuant FALSE
-   }
-   Shape {
-    appearance Appearance {
-     material USE MAT
-    }
-    geometry IndexedFaceSet2D {
-     coord Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-
-AT 4000 {
- REPLACE TR1 BY DEF TR2 Transform2D {
-  scale 0.5 0.5
-  children [
-   QuantizationParameter {
-    position2DQuant TRUE
-    position2DMin -100 -100
-    position2DMax 100 100
-    position2DNbBits 6
-    colorQuant FALSE
-   }
-   Shape {
-    appearance Appearance {
-     material USE MAT
-    }
-    geometry IndexedFaceSet2D {
-     coord Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-
-AT 6000 {
- REPLACE TR2 BY DEF TR3 Transform2D {
-  scale 0.5 0.5
-  children [
-   QuantizationParameter {
-    position2DQuant TRUE
-    position2DMin -100 -100
-    position2DMax 100 100
-    position2DNbBits 4
-    colorQuant FALSE
-   }
-   Shape {
-    appearance Appearance {
-     material USE MAT
-    }
-    geometry IndexedFaceSet2D {
-     coord Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-
-AT 8000 {
- REPLACE TR3 BY DEF TR4 Transform2D {
-  scale 0.5 0.5
-  children [
-   QuantizationParameter {
-    position2DQuant TRUE
-    position2DMin -100 -100
-    position2DMax 100 100
-    position2DNbBits 2
-    colorQuant FALSE
-   }
-   Shape {
-    appearance Appearance {
-     material USE MAT
-    }
-    geometry IndexedFaceSet2D {
-     coord Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-
-AT 10000 {
- REPLACE TR4 BY DEF TR5 Transform2D {
-  scale 0.5 0.5
-  children [
-   QuantizationParameter {
-    position2DQuant TRUE
-    position2DMin -100 -100
-    position2DMax 100 100
-    position2DNbBits 1
-    colorQuant FALSE
-   }
-   Shape {
-    appearance Appearance {
-     material USE MAT
-    }
-    geometry IndexedFaceSet2D {
-     coord Coordinate2D {
-      point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-     }
-    }
-   }
-  ]
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-field.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info [
-    "This test shows field replacement using BIFS commands."
-    "At initialization, the scene shows a polygon filled in red"
-    "At 2s, the scene is modified and the polygon is not filled, just the border is diplayed."
-    "The command used in this sequence replaces the content of the field and not just a single value"
-    "It applies to both SFField and MFField, for replacement of single value in an MFField, use Indexed Replacement"
-    "cf bifs-command-replace-index"
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" 
-    "(C) 2002-2004 GPAC Team"]
-   title "Field Replacement"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE MAT.filled BY FALSE
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-index.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows indexed value replacement" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Indexed Value replace test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE COORD.point[2] BY 100 100
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-node-null.bt Deleted

@@ -1,65 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info [
-    "This test shows a BIFS command replacing a node by the NULL node" 
-    "Initially, the scene has a white background but at 2s, the Background2D node is replaced by a NULL node. Since the Background2D node is not used anymore, it is deleted." 
-    "Replacing with a NULL node does not change the index of the following siblings."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Node Replacement with a NULL node"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE BACK BY NULL
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-node.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info [
-    "This test shows node replacement through BIFS commands" 
-    "Initally, the scene has a white background, but at 2s the Background2D node is replaced by a new node defining a yellow background."
-    "The same test could be done replacing the field backColor of the Background2D node, this would be a field replacement."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" 
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Node Replacement"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE BACK BY Background2D {
-  backColor 0 1 1
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-route.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows route replacement" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "route replace test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO MAT.transparency
-
-AT 2000 {
- REPLACE ROUTE R1 BY SI.value_changed TO TR.rotationAngle
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-scene-null.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-replace-scene.bt Deleted

@@ -1,76 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 0
-  }
-  WorldInfo {
-   info [
-    "This test shows scene replacement using BIFS commands."
-    "At initialization, the scene is empty, only a yellow background."
-    "At 2s, the whole scene is replaced by a new one containing a red polygon."
-    "All resources belonging to the previous scene are reclaimed."
-    "" 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" 
-    "(C) 2002-2004 GPAC Team"]
-   title "Scene Replacement"
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE SCENE BY OrderedGroup {
-  children [
-   WorldInfo {
-    info ["This shows scene replacement" "through BIFS commands" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-    title "scene replace test"
-   }
-   DEF BACK Background2D {
-    backColor 1 1 1
-   }
-   DEF TR Transform2D {
-    scale 0.5 0.5
-    children [
-     Shape {
-      appearance Appearance {
-       material DEF MAT Material2D {
-        emissiveColor 1 0 0
-        filled TRUE
-       }
-      }
-      geometry IndexedFaceSet2D {
-       coord DEF COORD Coordinate2D {
-        point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-       }
-      }
-     }
-    ]
-   }
-  ]
- }
-
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-route-add-children.bt Deleted

@@ -1,79 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node routing" "through addChildren field" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node Routing test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR1 Transform2D {
-   translation -100 0
-  }
-  DEF TR2 Transform2D {
-   translation 100 0
-  }
- ]
-}
-
-ROUTE TR1.children TO TR2.addChildren
-
-AT 2000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material DEF M1 Material2D {
-    emissiveColor 1 0 0
-    filled TRUE
-   }
-  }
-  geometry Rectangle {
-   size 100 50
-  }
- }
-}
-
-AT 4000 {
- REPLACE M1.filled BY FALSE
-}
-
-AT 6000 {
- REPLACE TR1.children[0] BY NULL
-}
-
-AT 8000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material Material2D {
-    emissiveColor 0 1 0
-    filled TRUE
-   }
-  }
-  geometry Circle {
-   radius 25
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-route-children.bt Deleted

@@ -1,79 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node routing" "through children field" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node duplicate test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR1 Transform2D {
-   translation -100 0
-  }
-  DEF TR2 Transform2D {
-   translation 100 0
-  }
- ]
-}
-
-ROUTE TR1.children TO TR2.children
-
-AT 2000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material DEF M1 Material2D {
-    emissiveColor 1 0 0
-    filled TRUE
-   }
-  }
-  geometry Rectangle {
-   size 100 50
-  }
- }
-}
-
-AT 4000 {
- REPLACE M1.filled BY FALSE
-}
-
-AT 6000 {
- REPLACE TR1.children[0] BY NULL
-}
-
-AT 8000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material Material2D {
-    emissiveColor 0 1 0
-    filled TRUE
-   }
-  }
-  geometry Circle {
-   radius 25
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-route-node-exposedfield.bt Deleted

@@ -1,80 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows exposed field routing" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Field Routing Test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M2 Material2D {
-       emissiveColor 1 1 0
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE M1.filled TO M2.filled
-
-AT 2000 {
- REPLACE M1.filled BY TRUE
-}
-
-AT 4000 {
- REPLACE M1.filled BY FALSE
-}
-
-AT 6000 {
- REPLACE M2.filled BY TRUE
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-route-node.bt Deleted

@@ -1,76 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node routing" "through exposed fields" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node routing test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    Shape {
-     appearance DEF APP1 Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance DEF APP2 Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE APP1.material TO APP2.material
-
-AT 2000 {
- REPLACE APP1.material BY Material2D {
-  emissiveColor 1 0 1
-  filled TRUE
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-command-route-remove-children.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-DEF OG OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows node deletion" "through removeChildren field" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node delete test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR1 Transform2D {
-   translation -100 0
-  }
-  DEF TR2 Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-DEF R1 ROUTE TR1.children TO TR2.addChildren
-
-AT 2000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material DEF M1 Material2D {
-    emissiveColor 1 0 0
-    filled TRUE
-   }
-  }
-  geometry Rectangle {
-   size 100 50
-  }
- }
-}
-
-AT 3000 {
- DELETE ROUTE R1
- INSERT ROUTE TR1.children TO TR2.removeChildren
-}
-
-AT 4000 {
- APPEND TO TR1.children Shape {
-  appearance Appearance {
-   material Material2D {
-    emissiveColor 1 1 1
-    filled TRUE
-   }
-  }
-  geometry Circle {
-   radius 20
-  }
- }
-}
-
-AT 100000 {
- DELETE ROUTE R1
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-environmenttest.bt Deleted

@@ -1,129 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the EnvironmentTest node. The various settings of the node are tested."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "EnvironmentTest Node testing"
-  }
-
-  Transform2D {
-   translation 0 50
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled true
-      }
-     }
-     geometry Text {
-      string ["Width:"]
-      fontStyle DEF FSEND FontStyle {
-       size 24
-       justify "END"
-      }
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T1 Text {
-      string [""]
-      fontStyle DEF FSBEGIN FontStyle {
-       size 24
-       justify "BEGIN"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Height:"]
-      fontStyle USE FSEND
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T2 Text {
-      string [""]
-      fontStyle USE FSBEGIN 
-     }
-    }
-   ]
-  }
-
-  Transform2D {
-   translation 0 -50
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Portrait:"]
-      fontStyle USE FSEND
-     }
-    }
-    Shape {
-     appearance USE APP 
-     geometry DEF T3 Text {
-      string [""]
-      fontStyle USE FSBEGIN 
-     }
-    }
-   ]
-  }
-
-  DEF V1 Valuator {}
-  DEF EV1 EnvironmentTest {
-   parameter 2
-  }
-
-  DEF V2 Valuator {}
-  DEF EV2 EnvironmentTest {
-   parameter 3
-  }
-
-  DEF V3 Valuator {}
-  DEF EV3 EnvironmentTest {
-   parameter 1
-  }
- ]
-}
-
-ROUTE EV1.parameterValue TO V1.inSFString
-ROUTE V1.outMFString TO T1.string 
-
-ROUTE EV2.parameterValue TO V2.inSFString
-ROUTE V2.outMFString TO T2.string 
-
-ROUTE EV3.valueEqual TO V3.inSFBool
-ROUTE V3.outMFString TO T3.string

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-forestgump-lib.bt Deleted

@@ -1,463 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO FORESTGUMP [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFFloat lineWidth 3
- exposedField SFColor lineColor 0.121569 0.101961 0.0901961
- exposedField SFTime runTime 1
- exposedField SFBool loop TRUE
- exposedField SFTime start 0
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF MYSWITCH Switch {
-    whichChoice 0
-    choice [
-     Transform2D {
-      scale 0.0899561 0.0900365
-      translation 260.243 42.9024
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance DEF APP Appearance {
-           material Material2D {
-            lineProps LineProperties {
-             lineColor IS lineColor
-             width IS lineWidth
-            }
-           }
-          }
-          geometry Curve2D {
-           type [1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2827 -11 -2864 -2 -2864 -2 -2883 -2 -2883 -2 -2892 -2 -2901 -11 -2911 -11 -2920 -11 -2929 -20 -2939 -29 -2939 -29 -2957 -48 -2957 -48 -2966 -57 -2957 -57 -2966 -76 -2966 -85 -2976 -95 -2976 -104 -2976 -104 -2976 -132 -2976 -132 -2976 -132 -2976 -160 -2976 -160 -2966 -178 -2957 -188 -2957 -188 -2957 -188 -2939 -197 -2939 -197 -2939 -197 -2920 -197 -2920 -197 -2920 -197 -2911 -206 -2911 -206 -2911 -206 -2892 -206 -2892 -206 -2892 -206 -2873 -206 -2873 -206 -2873 -206 -2855 -215 -2855 -215 -2855 -215 -2836 -215 -2836 -215 -2836 -215 -2827 -206 -2827 -206 -2827 -206 -2808 -197 -2808 -197 -2799 -188 -2799 -188 -2790 -178 -2790 -178 -2790 -169 -2790 -169 -2780 -160 -2780 -160 -2771 -150 -2771 -150 -2771 -141 -2771 -141 -2771 -132 -2771 -132 -2771 -122 -2771 -122 -2771 -113 -2771 -113 -2771 -104 -2771 -104 -2771 -95 -2771 -95 -2771 -85 -2771 -85 -2771 -76 -2780 -57 -2780 -48 -2780 -48 -2790 -29 -2790 -29 -2790 -29 -2808 -20 -2808 -20 -2808 -20 -2818 -11 -2818 -11 -2827 -2 -2827 -2 -2836 -2 -2836 -2 -2846 -2 -2855 -2 -2873 -2 -2883 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2883 -225 -2883 -262 -2883 -262 -2883 -281 -2883 -281 -2883 -290 -2883 -299 -2883 -308 -2883 -327 -2883 -327 -2892 -336 -2892 -336 -2892 -336 -2892 -383 -2892 -392 -2892 -401 -2892 -429 -2892 -439 -2892 -439 -2892 -467 -2892 -467 -2892 -467 -2892 -485 -2892 -485 -2901 -485 -2901 -485 -2901 -494 -2901 -494 -2901 -504 -2901 -513 -2901 -532 -2901 -541]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-3004 -755 -2994 -727 -2985 -708 -2976 -690 -2976 -680 -2976 -643 -2976 -643 -2957 -625 -3004 -653 -3004 -653 -3004 -653 -3115 -718 -3115 -708 -3115 -662 -3032 -541 -2957 -541 -2939 -541 -2901 -522 -2883 -541 -2883 -541 -2855 -560 -2855 -560 -2846 -569 -2818 -587 -2818 -606 -2818 -625 -2790 -662 -2790 -708 -2790 -773 -2799 -848 -2799 -913 -2799 -931 -2808 -931 -2808 -950 -2808 -959 -2790 -931 -2790 -931 -2780 -904 -2743 -857 -2734 -829 -2734 -820 -2697 -773 -2706 -773]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2985 -346 -2994 -346 -3022 -374 -3032 -374 -3041 -374 -3050 -383 -3050 -392 -3050 -392 -3134 -392 -3143 -392 -3152 -392 -3134 -364 -3134 -364 -3134 -364 -3106 -346 -3106 -346 -3097 -336 -2985 -253 -2957 -253 -2939 -253 -2920 -271 -2911 -271 -2901 -271 -2873 -281 -2864 -281 -2836 -271 -2790 -234 -2771 -225 -2762 -225 -2734 -206 -2725 -197 -2715 -188 -2669 -160 -2669 -160 -2660 -160 -2660 -150 -2660 -169 -2660 -206 -2641 -262 -2641 -299]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0900093 0.0899546
-      translation 190.415 42.8184
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2083 -20 -2120 -20 -2120 -20 -2130 -20 -2130 -20 -2139 -20 -2139 -20 -2148 -20 -2148 -20 -2148 -20 -2167 -20 -2167 -20 -2167 -20 -2195 -30 -2195 -30 -2195 -30 -2204 -48 -2213 -58 -2213 -58 -2232 -67 -2241 -76 -2241 -76 -2241 -113 -2241 -113 -2241 -113 -2250 -132 -2250 -141 -2250 -151 -2241 -169 -2241 -169 -2241 -179 -2223 -188 -2223 -188 -2223 -188 -2213 -216 -2204 -216 -2195 -216 -2195 -225 -2185 -225 -2185 -225 -2157 -225 -2157 -225 -2157 -225 -2139 -225 -2139 -225 -2139 -225 -2120 -225 -2120 -225 -2120 -225 -2111 -216 -2111 -216 -2111 -216 -2092 -216 -2092 -216 -2092 -216 -2074 -206 -2074 -206 -2074 -206 -2064 -197 -2064 -197 -2064 -197 -2055 -179 -2055 -179 -2046 -179 -2046 -179 -2046 -169 -2046 -169 -2037 -160 -2037 -160 -2037 -151 -2037 -151 -2037 -141 -2037 -141 -2037 -132 -2037 -132 -2037 -123 -2037 -123 -2037 -113 -2037 -113 -2037 -104 -2037 -104 -2037 -95 -2037 -95 -2037 -95 -2037 -76 -2037 -76 -2037 -76 -2055 -39 -2055 -39 -2055 -39 -2074 -30 -2074 -30 -2074 -30 -2092 -20 -2092 -20 -2092 -20 -2102 -11 -2102 -11 -2111 -11 -2111 -11 -2120 -11 -2120 -11 -2120 -2 -2120 -2 -2157 -2 -2157 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2130 -244 -2130 -290 -2130 -318 -2130 -355 -2130 -383 -2130 -402 -2139 -420 -2139 -439 -2139 -448 -2139 -476 -2139 -485 -2139 -495 -2139 -504 -2139 -513 -2139 -523 -2139 -523 -2139 -532 -2139 -532 -2139 -541 -2139 -541 -2130 -551 -2130 -551]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2306 -792 -2269 -764 -2232 -718 -2204 -690 -2195 -681 -2204 -690 -2213 -690 -2241 -681 -2325 -671 -2343 -653 -2343 -653 -2362 -644 -2362 -644 -2371 -634 -2278 -569 -2278 -569 -2241 -560 -2213 -551 -2176 -551 -2139 -551 -2027 -578 -2027 -616 -2027 -625 -2018 -625 -2018 -634 -1999 -671 -1999 -709 -1999 -755 -1999 -811 -2074 -904 -2111 -922 -2148 -941 -2139 -950 -2102 -950 -2064 -950 -2009 -950 -1971 -950]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2223 -402 -2260 -420 -2325 -439 -2353 -411 -2371 -392 -2381 -374 -2381 -355 -2381 -318 -2371 -290 -2343 -281 -2306 -262 -2232 -244 -2185 -244 -2176 -244 -2139 -225 -2130 -225 -2120 -225 -2046 -234 -2027 -234 -1981 -234 -1897 -253 -1878 -299 -1869 -318 -1851 -346 -1851 -383 -1851 -411 -1860 -448 -1860 -467]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899291 0.0900198
-      translation 123.698 44.4248
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-1283 -11 -1320 -11 -1320 -11 -1330 -11 -1330 -11 -1339 -11 -1339 -11 -1348 -11 -1348 -11 -1348 -11 -1367 -11 -1367 -11 -1367 -20 -1367 -20 -1376 -20 -1376 -20 -1376 -20 -1413 -39 -1413 -39 -1413 -39 -1432 -76 -1432 -76 -1432 -85 -1441 -104 -1441 -113 -1441 -123 -1451 -141 -1451 -151 -1451 -169 -1451 -160 -1441 -169 -1441 -169 -1432 -188 -1432 -188 -1432 -188 -1423 -206 -1423 -206 -1423 -206 -1404 -216 -1404 -216 -1395 -216 -1386 -225 -1376 -225 -1376 -225 -1348 -225 -1348 -225 -1348 -225 -1330 -225 -1330 -225 -1330 -225 -1311 -225 -1311 -225 -1311 -225 -1293 -216 -1293 -216 -1293 -216 -1283 -206 -1283 -206 -1283 -206 -1265 -197 -1265 -197 -1265 -197 -1255 -188 -1255 -188 -1255 -188 -1246 -169 -1246 -169 -1237 -169 -1237 -169 -1237 -160 -1237 -160 -1237 -151 -1237 -151 -1237 -141 -1237 -141 -1237 -132 -1237 -132 -1237 -123 -1237 -123 -1237 -113 -1237 -113 -1237 -104 -1237 -104 -1237 -95 -1237 -95 -1237 -85 -1237 -85 -1237 -85 -1237 -67 -1237 -67 -1237 -67 -1255 -48 -1255 -39 -1255 -39 -1265 -20 -1265 -20 -1265 -20 -1283 -11 -1283 -11 -1283 -11 -1302 -2 -1302 -2 -1311 -2 -1311 -2 -1320 -2 -1320 -2 -1330 -2 -1339 -2 -1358 -2 -1367 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-1311 -234 -1311 -271 -1311 -271 -1311 -281 -1311 -281 -1311 -299 -1311 -318 -1311 -355 -1311 -374 -1311 -392 -1311 -430 -1311 -448 -1311 -457 -1311 -485 -1311 -495 -1311 -495 -1311 -513 -1311 -513 -1311 -523 -1311 -523 -1311 -532 -1311 -532 -1311 -541 -1311 -560 -1311 -578 -1311 -560]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-1572 -662 -1534 -709 -1469 -755 -1441 -783 -1423 -802 -1451 -764 -1451 -764 -1460 -736 -1506 -578 -1469 -560 -1451 -550 -1330 -597 -1320 -597 -1293 -606 -1274 -616 -1274 -662 -1274 -690 -1274 -727 -1283 -746 -1283 -755 -1293 -792 -1302 -811 -1339 -885 -1274 -904 -1274 -987]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2]
-           point Coordinate2D {
-            point [-1609 -541 -1618 -467 -1599 -504 -1590 -448 -1562 -309 -1423 -253 -1283 -253 -1237 -253 -1144 -281 -1144 -327 -1144 -346 -1135 -355 -1144 -374 -1153 -392 -1227 -467 -1227 -485]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899947 0.0899257
-      translation 62.0964 37.7238
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 1 2 1 2 1]
-           point Coordinate2D {
-            point [-511 -30 -549 -30 -567 -30 -577 -30 -586 -30 -604 -48 -604 -48 -614 -48 -623 -67 -623 -76 -623 -86 -642 -76 -642 -95 -642 -95 -642 -123 -642 -123 -642 -132 -642 -141 -642 -151 -642 -160 -623 -179 -623 -179 -623 -179 -614 -188 -614 -188 -614 -188 -595 -188 -595 -188 -595 -188 -586 -197 -586 -197 -586 -197 -567 -197 -567 -197 -567 -197 -549 -207 -549 -207 -549 -207 -539 -197 -539 -197 -539 -197 -521 -197 -521 -197 -521 -197 -502 -188 -502 -188 -493 -179 -493 -179 -484 -169 -484 -169 -474 -169 -474 -169 -474 -160 -474 -160 -465 -160 -465 -160 -465 -151 -465 -151 -465 -141 -465 -141 -465 -132 -465 -132 -456 -132 -456 -132 -456 -114 -456 -114 -456 -86 -465 -86 -465 -86 -465 -86 -474 -67 -474 -58 -474 -48 -484 -48 -484 -39 -484 -39 -493 -21 -493 -21 -502 -21 -502 -21 -511 -11 -511 -11 -521 -2 -521 -2 -558 -2 -511 -30 -521 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 2]
-           point Coordinate2D {
-            point [-539 -225 -539 -262 -549 -281 -549 -318 -549 -337 -558 -355 -558 -374 -558 -383 -558 -411 -558 -430 -558 -439 -558 -448 -558 -467 -558 -476 -558 -504 -567 -513 -558 -523]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 1 2 2 2 2 2]
-           point Coordinate2D {
-            point [-865 -551 -865 -569 -846 -653 -846 -672 -846 -690 -837 -699 -837 -709 -837 -718 -828 -718 -828 -709 -828 -681 -763 -606 -735 -588 -716 -579 -651 -541 -632 -541 -577 -541 -521 -532 -465 -560 -446 -569 -400 -616 -381 -634 -381 -634 -353 -699 -372 -699 -400 -699 -428 -672 -428 -672 -437 -672 -437 -672 -474 -653 -474 -653 -484 -653 -493 -662 -493 -672 -493 -690 -502 -755 -502 -774 -502 -783 -502 -792 -493 -811 -484 -830 -474 -848 -474 -830]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-1023 -365 -976 -318 -930 -300 -874 -272 -865 -272 -837 -253 -828 -253 -716 -216 -577 -262 -456 -262 -428 -262 -335 -318 -363 -346 -372 -355 -437 -346 -456 -346 -456 -346 -511 -337 -511 -337 -530 -337 -539 -318 -549 -318]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899962 0.0899977
-      translation -16.1993 42.7489
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [279 -20 260 -20 232 -1 223 -1 214 -1 205 -20 195 -20 186 -20 167 -29 167 -39 167 -48 149 -66 149 -76 139 -94 139 -94 139 -113 139 -132 130 -141 130 -159 130 -169 139 -178 139 -187 139 -187 149 -206 149 -206 149 -206 158 -225 158 -225 158 -225 177 -234 177 -234 177 -234 195 -234 195 -234 195 -234 214 -234 214 -234 214 -234 232 -234 232 -234 242 -234 251 -225 260 -225 270 -225 270 -225 279 -215 279 -215 288 -215 288 -215 298 -206 298 -206 307 -197 307 -197 316 -187 316 -187 316 -178 316 -178 325 -169 325 -169 335 -159 335 -159 335 -141 335 -141 335 -132 335 -122 335 -113 335 -94 325 -85 325 -76 325 -76 325 -48 325 -48 325 -48 316 -29 316 -29 316 -29 298 -20 298 -20 288 -11 288 -11 279 -11 279 -11 270 -11 260 -11 232 -11 223 -11]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [232 -252 232 -280 214 -327 214 -345 214 -364 205 -411 205 -429 205 -438 205 -466 205 -476 205 -494 205 -494 205 -513 205 -513 195 -531 195 -531 195 -569 195 -569]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 1 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [56 -848 65 -857 130 -913 149 -931 158 -941 186 -968 149 -913 149 -913 130 -866 130 -773 130 -717 130 -680 112 -662 112 -624 112 -578 139 -522 195 -522 260 -522 409 -531 409 -615 409 -615 428 -634 400 -634 372 -634 298 -615 279 -624 260 -634 279 -736 279 -755]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-56 -327 -46 -290 -37 -243 -28 -197 -28 -187 0 -159 9 -141 9 -132 19 -141 19 -150 28 -169 112 -243 149 -243 167 -243 214 -262 251 -262 279 -262 298 -252 316 -271 325 -280 353 -299 353 -299 353 -299 381 -327 391 -327 446 -355 325 -373 316 -373 279 -383 205 -373 177 -345]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0900707 0.0899924
-      translation -85.7923 41.9814
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1060 -20 1060 -20 1014 -2 1004 -2 995 -2 986 -11 976 -11 976 -11 949 -20 949 -20 939 -20 921 -48 921 -58 921 -58 902 -86 902 -86 902 -86 902 -104 902 -104 902 -113 902 -123 902 -132 902 -132 911 -151 911 -151 911 -151 921 -169 921 -169 921 -169 939 -188 939 -188 939 -188 949 -197 949 -197 949 -197 967 -206 967 -206 967 -206 986 -206 995 -206 1004 -206 1004 -206 1014 -206 1014 -206 1023 -206 1023 -206 1032 -206 1032 -206 1051 -197 1051 -197 1060 -197 1060 -197 1069 -188 1069 -188 1079 -179 1079 -179 1079 -169 1079 -169 1088 -169 1088 -169 1088 -169 1088 -151 1088 -151 1088 -141 1097 -123 1097 -104 1097 -86 1097 -86 1088 -67 1088 -67 1079 -48 1079 -48 1079 -48 1069 -39 1069 -39 1060 -30 1060 -30 1051 -30 1051 -30 1042 -20 1032 -20 1014 -11 1004 -11]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [995 -225 995 -253 1014 -318 1014 -346 1014 -365 1014 -411 1014 -430 1014 -439 1014 -467 1014 -476 1014 -485 1014 -485 1014 -504 1014 -504 1014 -513 1014 -523 1014 -541 1023 -541]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 1 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [809 -932 846 -932 893 -913 921 -913 958 -913 930 -895 930 -895 921 -895 893 -895 865 -774 865 -764 837 -699 921 -569 976 -541 1014 -523 1088 -578 1097 -588 1107 -597 1144 -625 1153 -634 1209 -690 1069 -644 1051 -662 1032 -681 1116 -792 1153 -792]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2]
-           point Coordinate2D {
-            point [688 -532 688 -485 716 -374 753 -355 800 -327 883 -262 939 -262 976 -262 1032 -281 1069 -262 1125 -234 1190 -309 1209 -327 1237 -355 1181 -383 1162 -402 1144 -420 1107 -448 1107 -476]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899064 0.08998
-      translation -164.619 43.1904
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1878 -20 1851 -11 1841 -1 1813 -1 1804 -1 1804 -11 1795 -11 1785 -11 1767 -39 1767 -48 1758 -57 1739 -66 1739 -85 1739 -85 1739 -113 1739 -113 1739 -122 1748 -132 1748 -141 1748 -141 1758 -159 1758 -169 1758 -169 1767 -187 1767 -187 1767 -187 1776 -206 1776 -206 1776 -206 1785 -215 1785 -215 1785 -215 1804 -225 1804 -225 1804 -225 1823 -225 1823 -225 1823 -225 1841 -225 1841 -225 1841 -225 1860 -215 1860 -215 1869 -215 1869 -215 1878 -206 1878 -206 1888 -197 1888 -197 1897 -187 1897 -187 1906 -178 1906 -178 1916 -169 1916 -169 1916 -159 1916 -159 1925 -150 1925 -150 1925 -150 1925 -132 1925 -132 1925 -122 1925 -122 1934 -113 1934 -113 1934 -113 1934 -85 1925 -76 1925 -76 1906 -66 1906 -57 1906 -48 1906 -39 1897 -29 1897 -29 1878 -20 1878 -20 1869 -20 1869 -20 1860 -11 1860 -11 1851 -11 1841 -11 1823 -1 1804 -1]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1832 -234 1832 -271 1841 -327 1841 -364 1841 -383 1841 -411 1841 -429 1841 -429 1841 -466 1841 -466 1841 -466 1841 -485 1841 -485 1851 -485 1851 -485 1851 -494 1851 -494 1841 -494 1841 -494 1841 -531 1841 -531]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [1758 -959 1767 -931 1804 -894 1813 -866 1813 -857 1851 -792 1851 -792 1851 -792 1851 -792 1851 -792 1851 -792 1841 -801 1841 -801 1813 -829 1776 -708 1776 -699 1776 -662 1767 -606 1776 -578 1776 -578 1776 -550 1776 -550 1776 -550 1785 -559 1795 -559 1841 -559 1916 -550 1953 -513 1962 -504 1999 -485 1999 -485 1999 -485 2018 -466 2018 -466 2018 -466 2037 -457 2037 -457 2037 -457 2027 -457 2027 -457 2009 -476 1944 -606 1944 -652 1944 -652 1934 -680 1934 -680 1934 -680 1962 -662 1962 -662 1971 -652 2018 -615 2037 -606 2037 -606 2092 -597 2074 -597]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [1674 -476 1646 -448 1618 -411 1590 -383 1581 -373 1572 -345 1572 -345 1553 -327 1692 -262 1730 -252 1776 -243 1767 -225 1804 -243 1813 -243 1897 -243 1906 -243 1944 -243 1990 -271 1999 -280 2027 -308 2092 -383 2092 -411]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.089974 0.090028
-      translation -247.069 37.0465
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2 1]
-           point Coordinate2D {
-            point [2715 -4 2687 -4 2660 -13 2641 -13 2641 -13 2622 -23 2622 -23 2613 -32 2585 -69 2585 -69 2585 -78 2576 -106 2576 -116 2576 -134 2567 -125 2576 -143 2576 -143 2576 -171 2576 -171 2576 -171 2594 -190 2594 -190 2594 -190 2604 -209 2604 -209 2604 -209 2613 -218 2613 -218 2613 -218 2632 -218 2632 -218 2632 -218 2650 -218 2650 -218 2650 -218 2669 -218 2669 -218 2669 -218 2687 -209 2687 -209 2687 -209 2706 -209 2706 -209 2715 -199 2715 -199 2725 -199 2725 -199 2734 -199 2734 -199 2743 -190 2743 -190 2753 -190 2753 -190 2762 -181 2762 -181 2762 -171 2762 -171 2771 -171 2771 -171 2771 -162 2771 -162 2780 -153 2780 -153 2780 -153 2780 -134 2780 -134 2780 -125 2780 -97 2780 -88 2780 -78 2771 -69 2771 -60 2771 -60 2762 -50 2762 -50 2762 -50 2753 -32 2753 -32 2753 -23 2753 -23 2743 -13 2743 -13 2734 -13 2734 -13 2715 5 2715 -4 2734 -13]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 1 2 1 2]
-           point Coordinate2D {
-            point [2660 -255 2660 -274 2660 -311 2660 -329 2660 -348 2660 -376 2660 -395 2660 -413 2660 -413 2660 -432 2660 -432 2660 -450 2660 -460 2660 -497 2660 -506]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [2464 -822 2483 -794 2520 -748 2539 -720 2539 -711 2576 -683 2567 -683 2529 -683 2483 -711 2446 -711 2427 -711 2474 -636 2474 -636 2492 -608 2539 -571 2567 -553 2576 -553 2585 -534 2594 -534 2622 -525 2641 -506 2669 -506 2697 -506 2734 -506 2762 -506 2780 -506 2873 -553 2883 -571 2883 -571 2892 -590 2892 -599 2892 -599 2901 -627 2901 -627 2901 -627 2911 -608 2911 -608 2920 -581 2957 -534 2957 -506]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2]
-           point Coordinate2D {
-            point [2641 -292 2585 -311 2529 -320 2464 -320 2427 -320 2483 -274 2483 -274 2529 -227 2687 -227 2799 -227 2836 -227 2920 -227 2948 -236 2966 -246 3004 -264 3004 -274 3013 -292 3050 -320 3050 -329]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-    ]
-   }
-  ]
- }
- DEF TS TimeSensor {
-  cycleInterval IS runTime
-  loop IS loop
-  startTime IS start
- }
- DEF VAL Valuator {
-  Factor1 8
- }
- ROUTE TS.fraction_changed TO VAL.inSFFloat
- ROUTE VAL.outSFInt32 TO MYSWITCH.whichChoice
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This file is used as a proto library by another file." 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-    ]
-    title "ExternProto Library File"
-  }
-  Shape {
-   appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0 } }
-   geometry Text {
-   string [
-    "This file is used as a proto library by another file."
-    "" 
-    "GPAC Regression Tests" 
-    "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    fontStyle FontStyle {
-      size 25
-      justify [ "MIDDLE" "MIDDLE" ]
-    }
-   }
-  }
-  ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-forestgump.bt Deleted

@@ -1,96 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-EXTERNPROTO FORESTGUMP [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFFloat lineWidth 3
- exposedField SFColor lineColor 0.121569 0.101961 0.0901961
- exposedField SFTime runTime 1
- exposedField SFBool loop TRUE
- exposedField SFTime start 0
-] ""od:20""
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["Each animated logo is an instance of a single proto" "defined in an external library" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Complexe proto Test"
-  }
-  FORESTGUMP {
-   translation -75 -75
-   scale 1.1 1.1
-   rotation 0.75
-   runTime 0.5
-  }
-  FORESTGUMP {
-   translation -100 50
-   scale 1 1.5
-   runTime 0.75
-   start 2
-  }
-  FORESTGUMP {
-   translation 0 10
-   scale 1.8 1.8
-   start 4
-  }
-  DEF ANIM FORESTGUMP {
-   translation 75 -75
-   rotation -1.25
-   runTime 0.8
-   start 6
-  }
-  DEF TIMER TimeSensor {
-   cycleInterval 2
-   loop TRUE
-   startTime 6
-  }
-  DEF SI ScalarInterpolator {
-   key [0 1]
-   keyValue [0 6.283]
-  }
- ]
-}
-
-ROUTE TIMER.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO ANIM.rotation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 20
-    URLstring "bifs-externproto-forestgump-lib.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-mfurl-lib.bt Deleted

@@ -1,52 +0,0 @@
-
-PROTO testURL [
- exposedField MFString theURL [""]
-] {
- Transform2D {
-  children [
-   Shape {
-    appearance Appearance {
-     texture DEF MYTEXT ImageTexture {
-      url IS theURL
-     }
-    }
-    geometry Bitmap {}
-
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This file is used as a proto library by another file." 
-    "GPAC Regression Tests" 
-    "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    title "ExternProto Library File"
-  }
-  Shape {
-   appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0 } }
-   geometry Text {
-   string [
-    "This file is used as a proto library by another file."
-    "" 
-    "GPAC Regression Tests" 
-    "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    fontStyle FontStyle {
-      size 25
-      justify [ "MIDDLE" "MIDDLE" ]
-    }
-   }
-  }
-  ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-mfurl.bt Deleted

@@ -1,69 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-EXTERNPROTO testURL [
- exposedField MFString theURL [""]
-] ""od:20""
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This is a proto with an MF URL ISed field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "ExternProto with URL Test"
-  }
-  DEF testInstance testURL {
-   theURL ["10"]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 20
-    URLstring "bifs-externproto-mfurl-lib.mp4"
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 3
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-nood-lib.bt Deleted

@@ -1,109 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   Transform2D {
-    translation -100 0
-    children [
-     USE S
-    ]
-   }
-  ]
- }
-}
-PROTO GEO_PRO [
- exposedField SFVec2f translation 0 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor 0 0 0
-      filled TRUE
-     }
-    }
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This file is used as a proto library by another file." 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-    ]
-    title "ExternProto Library File"
-  }
-  Shape {
-   appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0 } }
-   geometry Text {
-   string [
-    "This file is used as a proto library by another file."
-    "" 
-    "GPAC Regression Tests" 
-    "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    fontStyle FontStyle {
-      size 25
-      justify [ "MIDDLE" "MIDDLE" ]
-    }
-   }
-  }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-nood.bt Deleted

@@ -1,70 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-EXTERNPROTO EXPR1 [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] "bifs-externproto-nood-lib.bt#GEOMETRY_PROTO"
-
-EXTERNPROTO EXPR2 [
- exposedField SFVec2f translation 0 0
- exposedField SFNode obj NULL
-] "bifs-externproto-nood-lib.bt#GEO_PRO"
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of extern proto" "with vrml-like addressing (no MPEG-4 ODs)" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple ExternProto Test"
-  }
-  EXPR1 {
-   translation 20 50
-   color 0 1 0
-   obj DEF C Circle {
-    radius 75
-   }
-  }
-  EXPR2 {
-   translation -50 -50
-   obj USE C
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-simple-lib.bt Deleted

@@ -1,90 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   Transform2D {
-    translation -100 0
-    children [
-     USE S
-    ]
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This file is used as a proto library by another file." 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-    ]
-    title "ExternProto Library File"
-  }
-  Shape {
-   appearance Appearance { material Material2D { filled TRUE emissiveColor 0 0 0 } }
-   geometry Text {
-   string [
-    "This file is used as a proto library by another file."
-    "" 
-    "GPAC Regression Tests" 
-    "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" 
-    "(C) 2002-2004 GPAC Team"
-    ]
-    fontStyle FontStyle {
-      size 25
-      justify [ "MIDDLE" "MIDDLE" ]
-    }
-   }
-  }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-externproto-simple.bt Deleted

@@ -1,81 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-EXTERNPROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] ""od:20""
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of extern proto with regular addressing by proto ID" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple ExternProto Test"
-  }
-  DEF G GEOMETRY_PROTO {
-   translation 200 0
-   scale 1 1.5
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj Circle {
-    radius 75
-   }
-  }
-  Transform2D {
-   translation -300 0
-   children [
-    USE G
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 20
-    URLstring "bifs-externproto-simple-lib.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-game-arrange.bt Deleted

@@ -1,452 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This file demonstrates how to use ECMAScript to make games in BIFS." 
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-    ]
-    title "Arrange"
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    DEF StartTS TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.5 0.5 0.5
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 30
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Start Game"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TimeSensorTick TimeSensor {
-   enabled FALSE
-   loop TRUE
-  }
-  Transform2D {
-   translation 0 75
-   children [
-    Shape {
-     appearance DEF TA Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TextField Text {
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 22
-      }
-     }
-    }
-   ]
-  }
-  Switch {
-   choice [
-    DEF Hole Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 1
-       filled TRUE
-      }
-     }
-     geometry DEF R Rectangle {
-      size 50 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -50
-   children [
-    DEF Table Form {
-     size 150 150
-     groups [1 -1 2 -1 3 -1 4 -1 5 -1 6 -1 7 -1 8 -1 9 -1 1 2 3 -1 4 5 6 -1 7 8 9 -1]
-     constraints ["SHin" "SHin" "SHin" "SVin"]
-     groupsIndex [1 2 3 -1 4 5 6 -1 7 8 9 -1 10 11 12 -1]
-     children [
-      DEF a_1_1 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_1_1 TouchSensor {}
-          Shape {
-           appearance DEF RA Appearance {
-            material Material2D {
-             emissiveColor 0 0 0
-             filled TRUE
-            }
-           }
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["1"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_1_2 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_1_2 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["2"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_1_3 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_1_3 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["3"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_2_1 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_2_1 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["4"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_2_2 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_2_2 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["5"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_2_3 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_2_3 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["6"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_3_1 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_3_1 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["7"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_3_2 Switch {
-       whichChoice 0
-       choice [
-        Transform2D {
-         children [
-          DEF TS_3_2 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["8"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-      DEF a_3_3 Switch {
-       whichChoice 1
-       choice [
-        Transform2D {
-         children [
-          DEF TS_3_3 TouchSensor {}
-          Shape {
-           appearance USE RA
-           geometry USE R
-          }
-          Shape {
-           appearance USE TA
-           geometry Text {
-            string ["9"]
-            fontStyle USE FS
-           }
-          }
-         ]
-        }
-        USE Hole
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFVec2f move
-   eventIn SFBool startGame
-   eventIn SFTime tickTime
-   field SFNode txtField USE TextField
-   field SFNode table USE Table
-   field SFInt32 gsize 3
-   field SFInt32 ghrow 2
-   field SFInt32 ghcol 2
-   field SFInt32 gtime 0
-   field SFInt32 gmoves 0
-   field SFInt32 gshuffling 0
-   field SFInt32 size 3
-   field SFBool isStarted FALSE
-   eventOut SFBool hasWin
-   url ["javascript:
-   	function r(low,hi) {return Math.floor((hi-low)*Math.random()+low); }
-   	function r1(hi) {return Math.floor((hi-1)*Math.random()+1); }
-   	function r0(hi) {return Math.floor((hi)*Math.random()); }
-   	function startGame(value) {if (value) {shuffle();gtime = 0;gmoves = 0;isStarted = !isStarted; hasWin = false;}}
-   	function stopGame(){isStarted = !isStarted;}
-   	function tickTime(value){showStatus();gtime++;}
-   	function checkWin(){if (!isStarted) return; if (!isHole(gsize-1,gsize-1)) return;for (i=0;i<gsize;i++)for (j=0;j<gsize;j++) {if (!(i==gsize-1 && j==gsize-1)) {if (getValue(i,j)!=(i*gsize+j+1).toString()) return;}}hasWin = true;stopGame();txtField.string[0] = '!! CONGRATS !!';txtField.string[1] = 'You have done it in ' + gtime + ' secs ' + 'with ' + gmoves + ' moves!';txtField.string[2] = 'Your speed is ' + Math.round(1000*gmoves/gtime)/1000 + ' moves/sec';}
-   	function showStatus() {if (hasWin) return;txtField.string[0] = 'Time: ' + gtime + ' secs   Moves: ' + gmoves;txtField.string[1] = '';txtField.string[2] = '';}
-   	function getCell(row, col) {return table.children[row * gsize + col];}
-   	function setValue(row,col,val) {v = getCell(row, col);v.whichChoice = 0;v.choice[0].children[2].geometry.string[0] = val;}
-   	function getValue(row,col) {v = getCell(row, col);return v.choice[0].children[2].geometry.string[0];}
-   	function setHole(row,col) { v = getCell(row, col);v.whichChoice = 1;ghrow = row;ghcol = col;}
-   	function getRow(obj){a = obj.id.split('_');return a[1];}
-   	function getCol(obj) {a = obj.id.split('_');return a[2];}
-   	function isHole(row, col) {return (row==ghrow && col==ghcol) ? true : false;}
-   	function getHoleInRow(row) {return (row==ghrow) ? ghcol : -1;}
-   	function getHoleInCol(col) {return (col==ghcol) ? ghrow : -1;}
-   	function shiftHoleRow(src,dest,row) {src = parseInt(src);dest = parseInt(dest);if (src < dest) {for (i=src;i<dest;i++) {setValue(row,i,getValue(row,i+1));setHole(row,i+1);}}if (dest < src) {for (i=src;i>dest;i--) {setValue(row,i,getValue(row,i-1));setHole(row,i-1);}}}
-   	function shiftHoleCol(src,dest,col) {src = parseInt(src);dest = parseInt(dest);if (src < dest) {for (i=src;i<dest;i++) {setValue(i,col,getValue(i+1,col));setHole(i+1,col);}}if (dest < src){for (i=src;i>dest;i--){				    setValue(i,col,getValue(i-1,col));setHole(i-1,col);}}}
-   	function moveRowCol(r,c) {				  if (!isStarted && !gshuffling) { return; }if (isHole(r,c)) {return;				  }hc = getHoleInRow(r);if (hc != -1) {shiftHoleRow(hc,c,r);gmoves++;checkWin();return;} hr = getHoleInCol(c);if (hr != -1){shiftHoleCol(hr,r,c);gmoves++;checkWin();return;} }
-   	function move(value) {moveRowCol(value.x-1,value.y-1);}
-   	function shuffle() {gshuffling =  true;for (i=0;i<gsize;i++) {for (j=0;j<gsize+10;j++) {  if (j==0) {t = r0(gsize);while (t == ghrow) t = r0(gsize); moveRowCol(t, ghcol);} else {t = r0(gsize);while (t == ghcol) t = r0(gsize); moveRowCol(ghrow, t);}}}gshuffling = false;}"   ]
-  }
-  DEF V_1_1 Valuator {}
-  DEF C_1_1 Conditional {
-   buffer {
-    REPLACE V_1_1.inSFVec2f BY 1 1
-   }
-  }
-  DEF V_1_2 Valuator {}
-  DEF C_1_2 Conditional {
-   buffer {
-    REPLACE V_1_2.inSFVec2f BY 1 2
-   }
-  }
-  DEF V_1_3 Valuator {}
-  DEF C_1_3 Conditional {
-   buffer {
-    REPLACE V_1_3.inSFVec2f BY 1 3
-   }
-  }
-  DEF V_2_1 Valuator {}
-  DEF C_2_1 Conditional {
-   buffer {
-    REPLACE V_2_1.inSFVec2f BY 2 1
-   }
-  }
-  DEF V_2_2 Valuator {}
-  DEF C_2_2 Conditional {
-   buffer {
-    REPLACE V_2_2.inSFVec2f BY 2 2
-   }
-  }
-  DEF V_2_3 Valuator {}
-  DEF C_2_3 Conditional {
-   buffer {
-    REPLACE V_2_3.inSFVec2f BY 2 3
-   }
-  }
-  DEF V_3_1 Valuator {}
-  DEF C_3_1 Conditional {
-   buffer {
-    REPLACE V_3_1.inSFVec2f BY 3 1
-   }
-  }
-  DEF V_3_2 Valuator {}
-  DEF C_3_2 Conditional {
-   buffer {
-    REPLACE V_3_2.inSFVec2f BY 3 2
-   }
-  }
-  DEF V_3_3 Valuator {}
-  DEF C_3_3 Conditional {
-   buffer {
-    REPLACE V_3_3.inSFVec2f BY 3 3
-   }
-  }
-  DEF WinConditional Conditional {
-   buffer {
-    REPLACE TimeSensorTick.enabled BY FALSE
-#    REPLACE TimeSensorTick.stopTime BY 0
-   }
-  }
-  DEF StartConditional Conditional {
-   buffer {
-    REPLACE TimeSensorTick.enabled BY TRUE
-#    REPLACE TimeSensorTick.startTime BY 0
-   }
-  }
- ]
-}
-
-ROUTE StartTS.isActive TO StartConditional.activate
-ROUTE StartTS.isActive TO SC.startGame
-ROUTE TimeSensorTick.cycleTime TO SC.tickTime
-ROUTE SC.hasWin TO WinConditional.activate
-ROUTE TS_1_1.isActive TO C_1_1.activate
-ROUTE TS_1_2.isActive TO C_1_2.activate
-ROUTE TS_1_3.isActive TO C_1_3.activate
-ROUTE TS_2_1.isActive TO C_2_1.activate
-ROUTE TS_2_2.isActive TO C_2_2.activate
-ROUTE TS_2_3.isActive TO C_2_3.activate
-ROUTE TS_3_1.isActive TO C_3_1.activate
-ROUTE TS_3_2.isActive TO C_3_2.activate
-ROUTE TS_3_3.isActive TO C_3_3.activate
-ROUTE V_1_1.outSFVec2f TO SC.move
-ROUTE V_1_2.outSFVec2f TO SC.move
-ROUTE V_1_3.outSFVec2f TO SC.move
-ROUTE V_2_1.outSFVec2f TO SC.move
-ROUTE V_2_2.outSFVec2f TO SC.move
-ROUTE V_2_3.outSFVec2f TO SC.move
-ROUTE V_3_1.outSFVec2f TO SC.move
-ROUTE V_3_2.outSFVec2f TO SC.move
-ROUTE V_3_3.outSFVec2f TO SC.move
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-game-breakout.bt Deleted

@@ -1,1035 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 2
-    streamType 3
-    bufferSizeDB 5000
-    maxBitrate 13616
-    avgBitrate 13616
-    decSpecificInfo BIFSv2Config {
-     nodeIDbits 10
-     routeIDbits 10
-     protoIDbits 10
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 500
-     pixelHeight 500
-    }
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This game was translated from" "the site http://javascript.internet.com'" 
-    "Written and designed by Nick Young (ywing9787@aol.com)" 
-    "Translated and adapted by " "Cyril Concolato (cyril.concolato@enst.fr), June 2003"
-    "GPAC Regression Tests" "$Date: 2008-05-19 15:28:18 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"
-    ]
-   title "Breakout using MPEG-4 BIFS and Javascript"
-  }
-  Transform2D {
-   translation 0 200
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Breakout Using MPEG-4 BIFS and Javascript"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-       style "BOLD"
-      }
-     }
-    }
-   ]
-  }
-  DEF N0 TimeSensor {
-   cycleInterval 0.001
-   enabled FALSE
-   loop TRUE
-  }
-  Transform2D {
-   translation -215 150
-   children [
-    DEF N1 TouchSensor {}
-    Transform2D {
-     translation 16 -16
-     children [
-      Transform2D {
-       translation 197 -150
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 394 300
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF N2 Transform2D {
-     translation 21 -8
-     children [
-      Transform2D {
-       translation 29 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry DEF N3 Rectangle {
-          size 42 16
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 75 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 121 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 167 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 213 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 259 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 305 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 351 -48
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 29 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 75 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 121 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 167 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 213 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 259 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 305 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 351 -68
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.75 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 29 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 75 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 121 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 167 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 213 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 259 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 305 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 351 -88
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.5 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 29 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 75 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 121 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 167 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 213 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 259 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 305 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 351 -108
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0.25 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 29 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 75 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 121 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 167 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 213 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 259 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 305 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-      Transform2D {
-       translation 351 -128
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry USE N3
-        }
-       ]
-      }
-     ]
-    }
-    DEF N4 Transform2D {
-     translation 209 -270
-     children [
-      Transform2D {
-       translation 4 -4
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.7 0.7 0.7
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 4 8
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.7 0.7 0.7
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 8 4
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 1 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 4 4
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF N5 Transform2D {
-     translation 193 -280
-     children [
-      Transform2D {
-       translation 20 -2
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.7 0.7 1
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 40 4
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF N6 Switch {
-     whichChoice 0
-     choice [
-      Transform2D {
-       translation 210 -215
-       children [
-        DEF N7 TouchSensor {}
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.5 0.5 0.5
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 100 30
-         }
-        }
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string ["Start Game"]
-          fontStyle FontStyle {
-           justify ["MIDDLE" "MIDDLE"]
-           size 20
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  DEF N8 Script {
-   eventIn SFBool startGame
-   eventIn SFVec3f set_X
-   eventIn SFTime tickTime
-   field SFNode timer USE N0
-   field SFNode ball USE N4
-   field SFNode racket USE N5
-   field SFNode starter USE N6
-   field SFNode table USE N2
-   field SFInt32 loadFLG 0
-   field SFInt32 gameFLG 0
-   field SFInt32 missFLG 0
-   field SFTime tim 0
-   field MFColor blcol [1 1 0 1 0.75 0 1 0.5 0 1 0.25 0 1 0 0 0 0 0]
-   field MFInt32 blsta [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]
-   field MFInt32 blNO [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]
-   field SFInt32 blclr 0
-   field SFFloat ballX 209
-   field SFFloat ballY -270
-   field SFInt32 ballN 5
-   field SFFloat ballDX 0
-   field SFFloat ballDY 0
-   field SFFloat tmpRL 193
-   url ["javascript:
-function startGame(value) {
- if (value) {
-  initG();
- }
-}
-function tickTime(value) {
- mainF();
-}
-function mainF() {
- ballX+=ballDX;
- ballY+=ballDY;
- outCHK();
- blkCHK();
- ball.translation.y=ballY;
- ball.translation.x=ballX;
- racket.translation.x=tmpRL;
-}
-function initG() {
- if (blclr>=40) {
-  blclr=0;
-  ballN=3;
-  for (ib=0;ib<5;ib++){
-   for (ia=0;ia<8;ia++){
-    chc(ib*8+ia+1,ib);
-    blsta[ib*8+ia]=ib;
-   }
-  }
- }
- starter.whichChoice=-1;
- gameFLG=1;
- loadFLG=1;
- ballX=209;
- ballY=-270;
- ballDX=-3;
- ballDY=3;
- tmpRL=193;
- missFLG=0;
-}
-function set_X(value) {
- if (loadFLG==1) {
-  tmpRL=value.x + 197;
-  if (tmpRL<21) {
-   tmpRL=21;
-  }
-  if (tmpRL>373) {
-   tmpRL=373;
-  }
- }
-}
-function outCHK() {
- if (ballX<16) {
-  ballX=32-ballX;
-  ballDX=-ballDX;
- }
- if (ballX>401) {
-  ballX=802-ballX;
-  ballDX=-ballDX;
- }
- if (ballY>-16) {
-  ballY=-32-ballY;
-  ballDY=-ballDY;
- }
- if (ballY<=-272) {
-  if (missFLG==0) {
-   tmpX=(ballDX/ballDY)*(-272-ballY)+ballX;
-   if (tmpX>=tmpRL-12) {
-    if (tmpX<=tmpRL+42) {
-     ballY=-272;
-     ballDY=-ballDY;
-     ballX=tmpX;
-     ballRD=tmpX-tmpRL;
-     ballDX=8*Math.abs(ballDX)/ballDX;
-     if (ballRD<-4) {
-      ballDX=-15;
-     }
-     if (ballRD>36) {
-      ballDX=15;
-     }
-     if (ballRD>=14) {
-      if (ballRD<=16) {
-       ballDX=-2;
-      }
-     }
-     if (ballRD>=17) {
-      if (ballRD<=20) {
-       ballDX=2;
-      }
-     }
-     if (ballRD>=0) {
-      if (ballRD<=4) {
-       ballDX=-4;
-      }
-     }
-     if (ballRD>=28) {
-      if (ballRD<=32) {
-       ballDX=4;
-      }
-     }
-     if (ballRD>=-4) {
-      if (ballRD<=-1) {
-       ballDX=-11;
-      }
-     }
-     if (ballRD>=33) {
-      if (ballRD<=36) {
-       ballDX=11;
-      }
-     }
-    }
-   }
-   if (ballDY<0) {
-    missFLG=1;
-   }
-  }
-  else {
-   if (ballY<-290) {
-    missFLG=0;
-    ballN=ballN-1;
-    gameEnd();
-   }
-  }
- }
-}
-function blkCHK() {
- tmpY=ballY-4;
- tmpY=-tmpY;
- tmpX=ballX+4;
- if (tmpY>=48) {
-  if (tmpY<=147) {
-   if (tmpX>=29) {
-    if (tmpX<=396) {
-     ia=Math.floor((tmpX-29)/46);
-     ib=Math.floor((tmpY-48)/20);
-     ic=ib*8+ia;
-     if (blsta[ic]<=4) {
-      tmpbc=blsta[ic]+1;
-      blsta[ic]=tmpbc;
-      chc(ic+1,tmpbc);
-      if (tmpbc==5) {
-       blclr=blclr+1;
-      }
-      if (blclr>=40) {
-       gameEnd();
-      }
-      if (ballDX>0) {
-       iy=(-ballDY/ballDX)*(29+46*ia-tmpX)+tmpY;
-       if (iy>48+20*ib+18) {
-        tmpY1=48+20*ib+18;
-        tmpX1=(ballDX/-ballDY)*(48+20*ib+18-tmpY)+tmpX;
-        ballX=tmpX1-4;
-        ballY=-(tmpY1+4);
-        ballDY=-ballDY;
-       }
-       else {
-        if (iy<44+20*ib) {
-         tmpY1=48+20*ib;
-         tmpX1=(ballDX/-ballDY)*(48+20*ib-tmpY)+tmpX;
-         ballX=tmpX1-4;
-         ballY=-(tmpY1+4);
-         ballDY=-ballDY;
-        }
-        else {
-         tmpX1=29+46*ia;
-         tmpY1=(-ballDY/ballDX)*(29+46*ia-tmpX)+tmpY;
-         ballX=tmpX1-4;
-         ballY=-(tmpY1+4);
-         ballDX=-ballDX;
-        }
-       }
-      }
-      else {
-       iy=(-ballDY/ballDX)*(29+46*ia+44-tmpX)+tmpY;
-       if (iy>48+20*ib+18) {
-        tmpY1=48+20*ib+18;
-        tmpX1=(ballDX/-ballDY)*(48+20*ib+18-tmpY)+tmpX;
-        ballX=tmpX1-4;
-        ballY=-(tmpY1+4);
-        ballDY=-ballDY;
-       }
-       else {
-        if (iy<44+20*ib) {
-         tmpY1=48+20*ib;
-         tmpX1=(ballDX/-ballDY)*(48+20*ib-tmpY)+tmpX;
-         ballX=tmpX1-4;
-         ballY=-(tmpY1+4);
-         ballDY=-ballDY;
-        }
-        else {
-         tmpX1=29+46*ia+44;
-         tmpY1=(-ballDY/ballDX)*(29+46*ia+44-tmpX)+tmpY;
-         ballX=tmpX1-4;
-         ballY=-(tmpY1+4);
-         ballDX=-ballDX;
-        }
-       }
-      }
-     }
-    }
-   }
-  }
- }
-}
-function gameEnd() {
- gameFLG=0;
- loadFLG=0;
- timer.enabled=false;
- starter.whichChoice=0;
- if (ballN<=0) {
-  blclr=40;
- }
-}
-function initialize() {
- for (ib=0;ib<5;ib++){
-  for (ia=0;ia<8;ia++){
-   blsta[ib*8+ia]=ib;
-  }
- }
-}
-function chc(bno,bcl) {
- monBlock=table.children[bno-1].children[0].appearance.material;
- monBlock.emissiveColor=blcol[bcl];
-}
-
-"
-   ]
-  }
-  DEF N9 Conditional {
-   buffer {
-    REPLACE N0.enabled BY TRUE
-   }
-  }
- ]
-}
-
-ROUTE N7.isActive TO N8.startGame
-ROUTE N7.isActive TO N9.activate
-ROUTE N0.cycleTime TO N8.tickTime
-ROUTE N1.hitPoint_changed TO N8.set_X
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-game-bubble.bt Deleted

@@ -1,433 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  useNames true
-				}
-      }
-    }
-  ]
-}
-
-PROTO Bubble [
-  exposedField SFInt32 index 0
-  exposedField SFInt32 state 0
-  exposedField SFInt32 display 0
-  exposedField SFVec2f position 0 0
-
-  exposedField SFFloat size 9
-  exposedField SFColor color 0 0 0
-  exposedField SFFloat red 0
-  exposedField SFFloat green 0
-  exposedField SFFloat blue 0
-
-  exposedField SFFloat strokeWidth 2
-  exposedField SFFloat strokeTransparency 0.3
-  exposedField SFBool alignStroke FALSE
-
-  eventOut SFInt32 isOver 
-  eventOut SFInt32 isActive 
-] {
-  Switch { 
-    whichChoice IS display 
-    choice [  
-      Transform2D { 
-        translation IS position
-        children [ 
-          ColorTransform {
-            mrr 0.7
-            mgg 0.5
-            mbb 0.9
-            maa 0.6
-            ta 0.274
-            tr IS red
-            tg IS green
-            tb IS blue
-            children [
-              Shape {  
-                geometry DEF C Circle { radius IS size } 
-                appearance Appearance { 
-                  material Material2D {
-                    filled TRUE  
-                  }
-                  texture RadialGradient {
-                    center 0.5 0.5
-                    focalPoint 0.5 0.5
-                    key [ 0 1 ]
-                    keyValue [ 1 1 1 0 0 0 ]
-                  } 
-                } 
-              } 
-            ]
-          }
-          Shape {  
-            geometry USE C 
-            appearance Appearance { 
-              material Material2D {
-                filled FALSE
-                lineProps XLineProperties { 
-                  width 2
-                  lineColor 0.2 0.2 0.2
-                  transparency IS strokeTransparency
-                  isCenterAligned IS alignStroke
-                } 
-              }
-            } 
-          } 
-          DEF TS TouchSensor {}
-          DEF Vindex Valuator {
-            inSFInt32 IS index
-          }
-          DEF VOver Valuator {
-            outSFInt32 IS isOver
-          }
-          DEF VActive Valuator {
-            outSFInt32 IS isActive
-          }
-        ] 
-      } 
-    ] 
-  }
-  ROUTE Vindex.outSFFloat TO VOver.Factor1
-  ROUTE Vindex.outSFFloat TO VActive.Factor1
-  ROUTE TS.isOver TO VOver.inSFBool
-  ROUTE TS.isActive TO VActive.inSFBool
-}
-OrderedGroup {
-  children [
-    WorldInfo {
-      title "Classic Bubble Game"
-      info [
-        "This test shows the classic bubble game."
-        "It features:" 
-        " - a PROTO which defines a single Bubble node. This node takes as input the index of the bubble in the bubbleGrid. The bubble outputs this index on separate events: one when the mouse enters the bubble and one when a click on the bubble happens. This PROTO does not use any scripting for that." 
-        " - a Script node which handles the initialization (colors, size, index) and dynamic positionning of the bubbles. It is also responsible for the game logic."
-        "The number of of lines and columns in the bubble grid can be easily modified in the Script node." 
-        "" 
-        "GPAC Regression Tests" "$Date: 2008-11-24 14:58:25 $ - $Revision: 1.6 $" 
-        "(C) 2002-2006 GPAC Team"        
-      ]
-    }
-    DEF VIEWPORT Viewport { 
-      size 410 300
-      fit 1 
-    }
-    Background2D { backColor 1 1 1 }
-    DEF CANVAS_TRANSFORM Transform2D {
-      children [
-        Shape {
-          geometry DEF CANVAS Rectangle { size 0 0 }
-          appearance Appearance {
-            material Material2D {
-              filled TRUE
-              emissiveColor 1 1 1
-              lineProps XLineProperties {
-                width 2
-                isScalable FALSE
-                lineColor 0 0 0
-              }
-            }
-          }
-        }
-        DEF BUBBLE_ROOT Transform2D {}
-      ]
-    }
-    DEF TEXT_TRANSFORM Transform2D {
-      children [
-        Shape {
-          geometry DEF SCORE_TEXT Text { 
-            fontStyle FontStyle {
-              size 20
-              family "SANS"
-              justify [ "BEGIN" "FIRST" ]
-            } 
-          }
-          appearance Appearance {
-            material Material2D {
-              filled TRUE
-              emissiveColor 0 0 0
-            }
-          }
-        }
-      ]
-    }    
-    DEF Vover Valuator {}
-    DEF Vclick Valuator {}
-    DEF BUBBLE_SCRIPT Script {
-      field SFNode score_text   USE SCORE_TEXT
-      field SFNode bubble_root    USE BUBBLE_ROOT
-      
-      field SFNode canvas       USE CANVAS
-      field SFNode canvas_pos   USE CANVAS_TRANSFORM 
-      field SFNode viewport     USE VIEWPORT
-      field SFNode trans_text   USE TEXT_TRANSFORM
-      
-      field SFNode val_over     USE Vover
-      field SFNode val_click    USE Vclick
-      
-      eventIn SFInt32 bubbleOnClick
-      eventIn SFInt32 bubbleMouseOver
-      
-      url [ "javascript: 
-      function initialize() {
-        	bubbleGrid = new Array();
-        	nbLines = 15;
-        	nbCols = 26;
-        	bubble_radius = 9;
-        	score = 0;
-        	neutral_state  = 0;
-          selected_state = 1;
-          exploded_state = 2;
-          empty_state    = 4;
-      		      		
-          for (i=0; i<nbLines; i++) {
-      			for (j=0; j<nbCols; j++) {
-      				bubbleGrid[i*nbCols+j] = new bubble(bubble_root, i, j);
-//      				print('index: '+(i*nbCols+j));
-      			}
-      		}
-      		
-      		gridWidth = nbCols*(bubble_radius+1)*2;
-      		gridHeight = nbLines*(bubble_radius+1)*2;
-      		
-      		viewport.size = new SFVec2f(gridWidth, gridHeight+50);
-      		canvas.size = new SFVec2f(gridWidth, gridHeight);
-      		canvas_pos.translation = new SFVec2f(0, 50/2-2);
-      		
-        	score_text.string[0] = 'Score: 0';
-        	bubble_root.scale = new SFVec2f(1, -1);
-        	bubble_root.translation = new SFVec2f(-gridWidth/2 + 10, gridHeight/2-10);
-          trans_text.translation = new SFVec2f(-gridWidth/2 + 10, -(gridHeight+50)/2+10);        	
-        }
-
-        function set_neutral(bubble) {
-    	     bubble.state = neutral_state;
-      		 bubble.alignStroke = FALSE;
-           bubble.strokeWidth = 2;
-           bubble.strokeTransparency = 0.7;
-        }
-        
-        function set_selected(bubble) {
-    	     bubble.state = selected_state;
-      		 bubble.alignStroke = TRUE;
-           bubble.strokeWidth = 3;
-           bubble.strokeTransparency = 0.3;
-        }
-
-        function set_empty(bubble) {
-    	     bubble.state = empty_state;
-      		 bubble.display = -1;
-        }
-        
-        function set_exploded(bubble) {
-      		 bubble.display = -1;
-      		 bubble.state = exploded_state;
-      		 bubble.alignStroke = FALSE;
-           bubble.strokeWidth = 2;
-           bubble.strokeTransparency = 0.3;
-        }
-
-        function set_visible(bubble) {
-          bubble.display = 0;
-        }
-
-        function bubble(parent, line, column) {          
-          var bubble;
-          bubble = new SFNode('_Proto1');
-          bubble.position = new SFVec2f(2*column*(bubble_radius+1), 2*line*(bubble_radius+1));
-          bubble.index = line*nbCols+column + 1; //1-based index
-          bubble.size = bubble_radius;
-          set_neutral(bubble);
-          bubble.red = 170/255.0;
-          bubble.green = Math.round(Math.random()*1)*150/255.0;
-          bubble.blue = Math.round(Math.random()*1)*255/255.0;
-          bubble.color = new SFColor(bubble.red, bubble.green, bubble.blue);
-//          print('Color: red '+ bubble.red + ' green ' + bubble.green + ' blue '+bubble.blue);           
-          parent.children[parent.children.length] = bubble;
-          Browser.addRoute(bubble, 'isOver', val_over, 'inSFInt32');
-          Browser.addRoute(bubble, 'isActive', val_click, 'inSFInt32');
-          return bubble;
-        }
-
-        function bubbleMouseOver(value) {
-          if (!value) return;
-          value--;
-        	if (bubbleGrid[value].state == neutral_state) {
-            for (i=0; i<nbLines; i++) {
-        	   for (j=0; j<nbCols; j++) {
-        	    if (bubbleGrid[i*nbCols+j].state != empty_state) {
-        	     set_neutral(bubbleGrid[i*nbCols+j]);
-              }
-             }
-        	  }
-        	  line = Math.floor(value / nbCols);
-        	  column = value % nbCols;
-//        	  print('MouseOver l: '+line+' c: '+column);
-        		if (propagate(line, column, bubbleGrid[line*nbCols+column].color)==1) {
-        	     set_neutral(bubbleGrid[line*nbCols+column]);
-        		}
-        	} 
-        }
-        
-        function bubbleOnClick(value) {
-          if (!value) return;
-          value--;
-      		if (bubbleGrid[value].state == selected_state) {
-      		  line = Math.floor(value / nbCols);
-      		  column = value % nbCols;
-      			explode(line, column, bubbleGrid[value].color);
-      			gravity();
-      			connexity();
-      		}
-      	}
-
-        function isColorEqual(c1, c2) {
-          if (c1.r != c2.r) return 0;
-          if (c1.g != c2.g) return 0;
-          if (c1.b != c2.b) return 0;
-          return 1;
-        }
-        
-        function propagate(line, column, color) {          
-        	var colmin, colmax, curcol, k, res;
-//      	  print('propagate l: '+line+' c: '+column);
-        	if ( isColorEqual(bubbleGrid[line*nbCols+column].color, color) && 
-               (bubbleGrid[line*nbCols+column].state == neutral_state)) {
-         		res = 1;
-         		set_selected(bubbleGrid[line*nbCols+column]);
-        		
-        		//before the bubble on the same line
-        		curcol = column-1;
-        		while ( (curcol>=0) &&
-                    isColorEqual(bubbleGrid[line*nbCols+curcol].color,color) && 
-                    (bubbleGrid[line*nbCols+curcol].state == neutral_state)) {
-//          	  print('propagate before l: '+line+' c: '+curcol);
-           		set_selected(bubbleGrid[line*nbCols+curcol]);
-        			curcol--;
-        			res++;
-        		}
-
-        		//after the bubble on the same line
-        		colmin = ++curcol;
-        		curcol = column+1;
-        		while ( (curcol<nbCols) &&
-                    isColorEqual(bubbleGrid[line*nbCols+curcol].color, color) && 
-                    (bubbleGrid[line*nbCols+curcol].state == neutral_state)) {
-//          	  print('propagate after l: '+line+' c: '+curcol);
-           		set_selected(bubbleGrid[line*nbCols+curcol]);
-        			curcol++;
-        			res++;
-        		}
-
-        		colmax = --curcol;
-        		for (k=colmin; k<=colmax; k++) {
-        			if (line>0) {
-        				if (isColorEqual(bubbleGrid[(line-1)*nbCols+k].color, color)&& 
-        					(bubbleGrid[(line-1)*nbCols+k].state == neutral_state))
-        						res = res + propagate(line-1, k, color);
-        			}
-        			if (line<nbLines-1) {
-        				if (isColorEqual(bubbleGrid[(line+1)*nbCols+k].color, color)&& 
-        					(bubbleGrid[(line+1)*nbCols+k].state == neutral_state))
-        						res = res + propagate(line+1, k, color);
-        			}
-        		}        		
-            return res;
-        	} else {
-        	  return 0;
-          }
-        }
-        
-        function explode(line, column, color) {
-//      	  print('explode l: '+line+' c: '+column);
-        	if (isColorEqual(bubbleGrid[line*nbCols+column].color, color) && 
-              (bubbleGrid[line*nbCols+column].state == selected_state)) {
-        	  set_exploded(bubbleGrid[line*nbCols+column]);
-        		if (line>0) 			explode(line-1, column, color);
-        		if (column>0)			explode(line, column-1, color);					
-        		if (column<nbCols-1)	explode(line, column+1, color);
-        		if (line<nbLines-1)		explode(line+1, column, color);
-        	}
-        }
-
-        function gravity() {
-          exploded = 0;
-          for (j=0; j<nbCols; j++) {
-           	for (i=0; i<nbLines; i++) {
-           		if (bubbleGrid[i*nbCols+j].state == exploded_state) {
-           			start = end = i;
-           			while ((end<nbLines)&&(bubbleGrid[end*nbCols+j].state == exploded_state)) {
-        				  // ????
-        				  set_visible(bubbleGrid[end*nbCols+j]);
-           				end++;
-           			}
-           			lg = end-start;
-           			exploded +=lg;
-           			for (k=end-1; k>=0; k--) {
-           				if (k-lg>=0) {
-           					if (bubbleGrid[(k-lg)*nbCols+j].state != empty_state) {
-            					movebubble(k-lg, j, k, j);
-            				} else {
-            				  set_empty(bubbleGrid[k*nbCols+j]);         							
-            				}
-             			} else {
-             			  set_empty(bubbleGrid[k*nbCols+j]);
-             			}
-           			}
-           		}
-           	}
-          }
-          score += exploded * exploded;
-        	score_text.string[0] = 'Score: '+score;
-        }
-        
-        function movebubble(lsrc, csrc, ldst, cdst) {
-//        	  print('Move src l: '+lsrc+' c: '+csrc);
-//        	  print('Move dst l: '+ldst+' c: '+cdst);
-        	// move a bubble from the (lsrc, csrc) position to the (ldst, cdst) position
-        	// and let the src empty
-        	bubbleGrid[ldst*nbCols+cdst].color = bubbleGrid[lsrc*nbCols+csrc].color;
-        	bubbleGrid[ldst*nbCols+cdst].red = bubbleGrid[lsrc*nbCols+csrc].red;
-        	bubbleGrid[ldst*nbCols+cdst].green = bubbleGrid[lsrc*nbCols+csrc].green;
-        	bubbleGrid[ldst*nbCols+cdst].blue = bubbleGrid[lsrc*nbCols+csrc].blue;
-        	bubbleGrid[ldst*nbCols+cdst].state = bubbleGrid[lsrc*nbCols+csrc].state;
-        	if (bubbleGrid[ldst*nbCols+cdst].state != empty_state) 
-            set_visible(bubbleGrid[ldst*nbCols+cdst]);
-          set_empty(bubbleGrid[lsrc*nbCols+csrc]);
-        }
-      
-        function movecolumn(colnumber, delta) {
-        	for (i=0; i<nbLines; i++) movebubble(i, colnumber,i, colnumber+delta);
-        }
-        
-        function connexity() {
-        	// if there is a hole in the last line, the whole column is free and must be suppressed
-        	for (j=0; j<nbCols; j++) {
-           	if (bubbleGrid[(nbLines-1)*nbCols+j].state == empty_state) {
-        			if (j<nbCols/2) {
-        				for (k=j-1; k>=0; k--) movecolumn(k, +1);
-        			} else {
-        				for (k=j+1; k<nbCols; k++) movecolumn(k, -1);
-        			}
-        		}
-        	}
-        }
-        
-      "]
-    } 
-  ]
-}
-ROUTE Vover.outSFInt32 TO BUBBLE_SCRIPT.bubbleMouseOver
-ROUTE Vclick.outSFInt32 TO BUBBLE_SCRIPT.bubbleOnClick

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-game-minesweeper.bt Deleted

@@ -1,1538 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 2
-    streamType 3
-    bufferSizeDB 50000
-    decSpecificInfo BIFSv2Config {
-     nodeIDbits 10
-     routeIDbits 10
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-   "This game was translated from" 
-   "the site http://javascript.internet.com'"
-    "Written and designed by Peter Occil (poccil@yahoo.com)" 
-    "Translated and adapted by " 
-    "Cyril Concolato (cyril.concolato@enst.fr), June 2003"
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-]
-   title "Winmine using MPEG-4 BIFS and Javascript"
-  }
-  Transform2D {
-   translation 0 175
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["MineSweeper using" "MPEG-4 BIFS and Javascript"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-       style "BOLD"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 1.5 1.5
-   children [
-    DEF N0 TimeSensor {
-     enabled FALSE
-     loop TRUE
-    }
-    Switch {
-     choice [
-      DEF N1 Transform2D {
-       children [
-        DEF N2 Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.3 0.3 0.3
-           filled TRUE
-          }
-         }
-         geometry DEF N3 Rectangle {
-          size 16 16
-         }
-        }
-       ]
-      }
-      DEF N4 Transform2D {
-       children [
-        USE N2
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 4 4
-         }
-        }
-       ]
-      }
-      DEF N5 Transform2D {
-       children [
-        USE N2
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 1
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string ["?"]
-          fontStyle FontStyle {
-           justify ["MIDDLE" "MIDDLE"]
-           size 10
-          }
-         }
-        }
-       ]
-      }
-      DEF N6 Transform2D {
-       children [
-        USE N2
-        DEF N7 Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0.4 0.4 0.4
-           filled TRUE
-          }
-         }
-         geometry Rectangle {
-          size 15 15
-         }
-        }
-        Shape {
-         appearance DEF N9 Appearance {
-          material Material2D {
-           emissiveColor 0 1 0
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string [""]
-          fontStyle DEF N8 FontStyle {
-           justify ["MIDDLE" "MIDDLE"]
-           size 15
-          }
-         }
-        }
-       ]
-      }
-      DEF N10 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["1"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N11 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["2"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N12 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["3"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N13 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["4"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N14 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["5"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N15 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["6"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N16 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["7"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N17 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance USE N9
-         geometry Text {
-          string ["8"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N18 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry Circle {
-          radius 6
-         }
-        }
-       ]
-      }
-      DEF N19 Transform2D {
-       children [
-        USE N2
-        USE N7
-       ]
-      }
-      DEF N20 Transform2D {
-       children [
-        USE N2
-        USE N7
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 0
-           filled TRUE
-          }
-         }
-         geometry Text {
-          string ["x"]
-          fontStyle USE N8
-         }
-        }
-       ]
-      }
-      DEF N21 Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 1 0 1
-           filled TRUE
-          }
-         }
-         geometry Circle {
-          radius 10
-         }
-        }
-       ]
-      }
-      DEF N22 Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           emissiveColor 0 1 1
-           filled TRUE
-          }
-         }
-         geometry Circle {
-          radius 10
-         }
-        }
-       ]
-      }
-     ]
-    }
-    Transform2D {
-     translation -40 80
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 35 21
-       }
-      }
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry DEF N23 Text {
-        string ["010"]
-        fontStyle USE N8
-       }
-      }
-     ]
-    }
-    DEF N24 Transform2D {
-     translation 0 80
-     children [
-      DEF N25 TouchSensor {}
-      USE N22
-     ]
-    }
-    Transform2D {
-     translation 40 80
-     children [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Rectangle {
-        size 35 21
-       }
-      }
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         filled TRUE
-        }
-       }
-       geometry DEF N26 Text {
-        string ["000"]
-        fontStyle USE N8
-       }
-      }
-     ]
-    }
-    DEF N27 Form {
-     size 128 128
-     groups [1 -1 2 -1 3 -1 4 -1 5 -1 6 -1 7 -1 8 -1 9 -1 10 -1 11 -1 12 -1 13 -1 14 -1 15 -1 16 -1 17 -1 18 -1 19 -1 20 -1 21 -1 22 -1 23 -1 24 -1 25 -1 26 -1 27 -1 28 -1 29 -1 30 -1 31 -1 32 -1 33 -1 34 -1 35 -1 36 -1 37 -1 38 -1 39 -1 40 -1 41 -1 42 -1 43 -1 44 -1 45 -1 46 -1 47 -1 48 -1 49 -1 50 -1 51 -1 52 -1 53 -1 54 -1 55 -1 56 -1 57 -1 58 -1 59 -1 60 -1 61 -1 62 -1 63 -1 64 -1 1 2 3 4 5 6 7 8 -1 9 10 11 12 13 14 15 16 -1 17 18 19 20 21 22 23 24 -1 25 26 27 28 29 30 31 32 -1 33 34 35 36 37 38 39 40 -1 41 42 43 44 45 46 47 48 -1 49 50 51 52 53 54 55 56 -1 57 58 59 60 61 62 63 64 -1]
-     constraints ["SHin" "SHin" "SHin" "SHin" "SHin" "SHin" "SHin" "SHin" "SVin"]
-     groupsIndex [1 2 3 4 5 6 7 8 -1 9 10 11 12 13 14 15 16 -1 17 18 19 20 21 22 23 24 -1 25 26 27 28 29 30 31 32 -1 33 34 35 36 37 38 39 40 -1 41 42 43 44 45 46 47 48 -1 49 50 51 52 53 54 55 56 -1 57 58 59 60 61 62 63 64 -1 65 66 67 68 69 70 71 72 -1]
-     children [
-      Transform2D {
-       children [
-        DEF N28 TouchSensor {}
-        USE N1
-        DEF N29 Valuator {}
-        DEF N30 Conditional {
-         buffer {
-          REPLACE N29.inSFVec2f BY 0 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N31 TouchSensor {}
-        USE N1
-        DEF N32 Valuator {}
-        DEF N33 Conditional {
-         buffer {
-          REPLACE N32.inSFVec2f BY 0 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N34 TouchSensor {}
-        USE N1
-        DEF N35 Valuator {}
-        DEF N36 Conditional {
-         buffer {
-          REPLACE N35.inSFVec2f BY 0 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N37 TouchSensor {}
-        USE N1
-        DEF N38 Valuator {}
-        DEF N39 Conditional {
-         buffer {
-          REPLACE N38.inSFVec2f BY 0 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N40 TouchSensor {}
-        USE N1
-        DEF N41 Valuator {}
-        DEF N42 Conditional {
-         buffer {
-          REPLACE N41.inSFVec2f BY 0 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N43 TouchSensor {}
-        USE N1
-        DEF N44 Valuator {}
-        DEF N45 Conditional {
-         buffer {
-          REPLACE N44.inSFVec2f BY 0 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N46 TouchSensor {}
-        USE N1
-        DEF N47 Valuator {}
-        DEF N48 Conditional {
-         buffer {
-          REPLACE N47.inSFVec2f BY 0 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N49 TouchSensor {}
-        USE N1
-        DEF N50 Valuator {}
-        DEF N51 Conditional {
-         buffer {
-          REPLACE N50.inSFVec2f BY 0 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N52 TouchSensor {}
-        USE N1
-        DEF N53 Valuator {}
-        DEF N54 Conditional {
-         buffer {
-          REPLACE N53.inSFVec2f BY 1 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N55 TouchSensor {}
-        USE N1
-        DEF N56 Valuator {}
-        DEF N57 Conditional {
-         buffer {
-          REPLACE N56.inSFVec2f BY 1 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N58 TouchSensor {}
-        USE N1
-        DEF N59 Valuator {}
-        DEF N60 Conditional {
-         buffer {
-          REPLACE N59.inSFVec2f BY 1 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N61 TouchSensor {}
-        USE N1
-        DEF N62 Valuator {}
-        DEF N63 Conditional {
-         buffer {
-          REPLACE N62.inSFVec2f BY 1 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N64 TouchSensor {}
-        USE N1
-        DEF N65 Valuator {}
-        DEF N66 Conditional {
-         buffer {
-          REPLACE N65.inSFVec2f BY 1 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N67 TouchSensor {}
-        USE N1
-        DEF N68 Valuator {}
-        DEF N69 Conditional {
-         buffer {
-          REPLACE N68.inSFVec2f BY 1 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N70 TouchSensor {}
-        USE N1
-        DEF N71 Valuator {}
-        DEF N72 Conditional {
-         buffer {
-          REPLACE N71.inSFVec2f BY 1 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N73 TouchSensor {}
-        USE N1
-        DEF N74 Valuator {}
-        DEF N75 Conditional {
-         buffer {
-          REPLACE N74.inSFVec2f BY 1 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N76 TouchSensor {}
-        USE N1
-        DEF N77 Valuator {}
-        DEF N78 Conditional {
-         buffer {
-          REPLACE N77.inSFVec2f BY 2 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N79 TouchSensor {}
-        USE N1
-        DEF N80 Valuator {}
-        DEF N81 Conditional {
-         buffer {
-          REPLACE N80.inSFVec2f BY 2 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N82 TouchSensor {}
-        USE N1
-        DEF N83 Valuator {}
-        DEF N84 Conditional {
-         buffer {
-          REPLACE N83.inSFVec2f BY 2 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N85 TouchSensor {}
-        USE N1
-        DEF N86 Valuator {}
-        DEF N87 Conditional {
-         buffer {
-          REPLACE N86.inSFVec2f BY 2 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N88 TouchSensor {}
-        USE N1
-        DEF N89 Valuator {}
-        DEF N90 Conditional {
-         buffer {
-          REPLACE N89.inSFVec2f BY 2 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N91 TouchSensor {}
-        USE N1
-        DEF N92 Valuator {}
-        DEF N93 Conditional {
-         buffer {
-          REPLACE N92.inSFVec2f BY 2 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N94 TouchSensor {}
-        USE N1
-        DEF N95 Valuator {}
-        DEF N96 Conditional {
-         buffer {
-          REPLACE N95.inSFVec2f BY 2 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N97 TouchSensor {}
-        USE N1
-        DEF N98 Valuator {}
-        DEF N99 Conditional {
-         buffer {
-          REPLACE N98.inSFVec2f BY 2 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N100 TouchSensor {}
-        USE N1
-        DEF N101 Valuator {}
-        DEF N102 Conditional {
-         buffer {
-          REPLACE N101.inSFVec2f BY 3 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N103 TouchSensor {}
-        USE N1
-        DEF N104 Valuator {}
-        DEF N105 Conditional {
-         buffer {
-          REPLACE N104.inSFVec2f BY 3 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N106 TouchSensor {}
-        USE N1
-        DEF N107 Valuator {}
-        DEF N108 Conditional {
-         buffer {
-          REPLACE N107.inSFVec2f BY 3 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N109 TouchSensor {}
-        USE N1
-        DEF N110 Valuator {}
-        DEF N111 Conditional {
-         buffer {
-          REPLACE N110.inSFVec2f BY 3 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N112 TouchSensor {}
-        USE N1
-        DEF N113 Valuator {}
-        DEF N114 Conditional {
-         buffer {
-          REPLACE N113.inSFVec2f BY 3 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N115 TouchSensor {}
-        USE N1
-        DEF N116 Valuator {}
-        DEF N117 Conditional {
-         buffer {
-          REPLACE N116.inSFVec2f BY 3 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N118 TouchSensor {}
-        USE N1
-        DEF N119 Valuator {}
-        DEF N120 Conditional {
-         buffer {
-          REPLACE N119.inSFVec2f BY 3 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N121 TouchSensor {}
-        USE N1
-        DEF N122 Valuator {}
-        DEF N123 Conditional {
-         buffer {
-          REPLACE N122.inSFVec2f BY 3 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N124 TouchSensor {}
-        USE N1
-        DEF N125 Valuator {}
-        DEF N126 Conditional {
-         buffer {
-          REPLACE N125.inSFVec2f BY 4 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N127 TouchSensor {}
-        USE N1
-        DEF N128 Valuator {}
-        DEF N129 Conditional {
-         buffer {
-          REPLACE N128.inSFVec2f BY 4 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N130 TouchSensor {}
-        USE N1
-        DEF N131 Valuator {}
-        DEF N132 Conditional {
-         buffer {
-          REPLACE N131.inSFVec2f BY 4 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N133 TouchSensor {}
-        USE N1
-        DEF N134 Valuator {}
-        DEF N135 Conditional {
-         buffer {
-          REPLACE N134.inSFVec2f BY 4 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N136 TouchSensor {}
-        USE N1
-        DEF N137 Valuator {}
-        DEF N138 Conditional {
-         buffer {
-          REPLACE N137.inSFVec2f BY 4 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N139 TouchSensor {}
-        USE N1
-        DEF N140 Valuator {}
-        DEF N141 Conditional {
-         buffer {
-          REPLACE N140.inSFVec2f BY 4 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N142 TouchSensor {}
-        USE N1
-        DEF N143 Valuator {}
-        DEF N144 Conditional {
-         buffer {
-          REPLACE N143.inSFVec2f BY 4 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N145 TouchSensor {}
-        USE N1
-        DEF N146 Valuator {}
-        DEF N147 Conditional {
-         buffer {
-          REPLACE N146.inSFVec2f BY 4 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N148 TouchSensor {}
-        USE N1
-        DEF N149 Valuator {}
-        DEF N150 Conditional {
-         buffer {
-          REPLACE N149.inSFVec2f BY 5 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N151 TouchSensor {}
-        USE N1
-        DEF N152 Valuator {}
-        DEF N153 Conditional {
-         buffer {
-          REPLACE N152.inSFVec2f BY 5 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N154 TouchSensor {}
-        USE N1
-        DEF N155 Valuator {}
-        DEF N156 Conditional {
-         buffer {
-          REPLACE N155.inSFVec2f BY 5 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N157 TouchSensor {}
-        USE N1
-        DEF N158 Valuator {}
-        DEF N159 Conditional {
-         buffer {
-          REPLACE N158.inSFVec2f BY 5 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N160 TouchSensor {}
-        USE N1
-        DEF N161 Valuator {}
-        DEF N162 Conditional {
-         buffer {
-          REPLACE N161.inSFVec2f BY 5 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N163 TouchSensor {}
-        USE N1
-        DEF N164 Valuator {}
-        DEF N165 Conditional {
-         buffer {
-          REPLACE N164.inSFVec2f BY 5 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N166 TouchSensor {}
-        USE N1
-        DEF N167 Valuator {}
-        DEF N168 Conditional {
-         buffer {
-          REPLACE N167.inSFVec2f BY 5 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N169 TouchSensor {}
-        USE N1
-        DEF N170 Valuator {}
-        DEF N171 Conditional {
-         buffer {
-          REPLACE N170.inSFVec2f BY 5 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N172 TouchSensor {}
-        USE N1
-        DEF N173 Valuator {}
-        DEF N174 Conditional {
-         buffer {
-          REPLACE N173.inSFVec2f BY 6 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N175 TouchSensor {}
-        USE N1
-        DEF N176 Valuator {}
-        DEF N177 Conditional {
-         buffer {
-          REPLACE N176.inSFVec2f BY 6 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N178 TouchSensor {}
-        USE N1
-        DEF N179 Valuator {}
-        DEF N180 Conditional {
-         buffer {
-          REPLACE N179.inSFVec2f BY 6 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N181 TouchSensor {}
-        USE N1
-        DEF N182 Valuator {}
-        DEF N183 Conditional {
-         buffer {
-          REPLACE N182.inSFVec2f BY 6 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N184 TouchSensor {}
-        USE N1
-        DEF N185 Valuator {}
-        DEF N186 Conditional {
-         buffer {
-          REPLACE N185.inSFVec2f BY 6 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N187 TouchSensor {}
-        USE N1
-        DEF N188 Valuator {}
-        DEF N189 Conditional {
-         buffer {
-          REPLACE N188.inSFVec2f BY 6 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N190 TouchSensor {}
-        USE N1
-        DEF N191 Valuator {}
-        DEF N192 Conditional {
-         buffer {
-          REPLACE N191.inSFVec2f BY 6 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N193 TouchSensor {}
-        USE N1
-        DEF N194 Valuator {}
-        DEF N195 Conditional {
-         buffer {
-          REPLACE N194.inSFVec2f BY 6 7
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N196 TouchSensor {}
-        USE N1
-        DEF N197 Valuator {}
-        DEF N198 Conditional {
-         buffer {
-          REPLACE N197.inSFVec2f BY 7 0
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N199 TouchSensor {}
-        USE N1
-        DEF N200 Valuator {}
-        DEF N201 Conditional {
-         buffer {
-          REPLACE N200.inSFVec2f BY 7 1
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N202 TouchSensor {}
-        USE N1
-        DEF N203 Valuator {}
-        DEF N204 Conditional {
-         buffer {
-          REPLACE N203.inSFVec2f BY 7 2
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N205 TouchSensor {}
-        USE N1
-        DEF N206 Valuator {}
-        DEF N207 Conditional {
-         buffer {
-          REPLACE N206.inSFVec2f BY 7 3
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N208 TouchSensor {}
-        USE N1
-        DEF N209 Valuator {}
-        DEF N210 Conditional {
-         buffer {
-          REPLACE N209.inSFVec2f BY 7 4
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N211 TouchSensor {}
-        USE N1
-        DEF N212 Valuator {}
-        DEF N213 Conditional {
-         buffer {
-          REPLACE N212.inSFVec2f BY 7 5
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N214 TouchSensor {}
-        USE N1
-        DEF N215 Valuator {}
-        DEF N216 Conditional {
-         buffer {
-          REPLACE N215.inSFVec2f BY 7 6
-         }
-        }
-       ]
-      }
-      Transform2D {
-       children [
-        DEF N217 TouchSensor {}
-        USE N1
-        DEF N218 Valuator {}
-        DEF N219 Conditional {
-         buffer {
-          REPLACE N218.inSFVec2f BY 7 7
-         }
-        }
-       ]
-      }
-     ]
-    }
-   ]
-  }
-  DEF N220 Script {
-   eventIn SFTime timeOut
-   eventIn SFBool startGame
-   eventIn SFVec2f click
-   eventIn SFInt32 keyPressed
-   eventIn SFInt32 keyReleased
-   field SFNode timer USE N0
-   field MFNode sqtimages [
-    USE N1
-    USE N4
-    USE N5
-   ]
-   field MFNode sqimages [
-     USE N6
-     USE N10
-     USE N11
-     USE N12
-     USE N13
-     USE N14
-     USE N15
-     USE N16
-     USE N17
-   ]
-   field SFNode mineImage USE N18
-   field SFNode noMineImage USE N20
-   field SFNode mineredImage USE N19
-   field SFNode flagsNode USE N23
-   field SFNode conditionNode USE N24
-   field SFNode elapsedNode USE N26
-   field SFNode board USE N27
-   field SFNode btndead USE N21
-   field SFNode btncool USE N22
-   url ["javascript:  
-function initialize() {
- gridx=8;
- gridy=8;
- mines=new Array(gridx) ;
- shown=new Array(gridy) ;
- maxmines=10;
- squaresleft=0;
- flagsleft=0;
- elapsedtime=0;
- playing=0;
- placeflag=0;
- clicked=0;
- gridSq=gridx*16;
- grid8=gridSq-128;
- grid16=gridx-8;
- grid32=grid16*8;
- grid64=grid16*16;
- topBarWidth=8+grid64;
- menuBarWidth=86+grid64;
- wideWidth=gridx*16;
- highHeight=gridy*16;
- cplLeft=6+grid32;
- cplRight=4+grid32;
- totalWidth=gridSq+32;
- tW6=totalWidth-6;
- ww2=wideWidth+2;
- newgame(0);
-}
-function keyPressed(value) {
- print('keyPressed:'+value);
- if (value) {
-  placeflag=true;
-  setStatus();
- }
-}
-function keyReleased(value) {
- print('keyReleased'+value);
- if (value) {
-  placeflag=false;
-  setStatus();
- }
-}
-function startGame(value,timestamp) {
- if (value) {
-  newgame(timestamp);
- }
-}
-function newgame(timestamp) {
- for (y=0;y<gridy;++y){
-  mines[y]=new Array(gridx) ;
-  shown[y]=new Array(gridx) ;
-  for (x=0;x<gridx;x++){
-   mines[y][x]=false;
-   shown[y][x]=0;
-   board.children[x*gridx+y].children[1]=sqtimages[0];
-  }
- }
- conditionNode.children[1]=btncool;
- for (m=0;m<maxmines;++m){
-  x=Math.floor(Math.random()*gridx);
-  y=Math.floor(Math.random()*gridy);
-  while (mines[y][x]){
-   x=Math.floor(Math.random()*gridx);
-   y=Math.floor(Math.random()*gridy);
-  }
-  mines[y][x]=true;
- }
- squaresleft=gridy*gridx;
- flagsleft=maxmines;
- elapsedtime=0;
- playing=true;
- clicked=false;
- placeflag=false;
- timer.startTime=timestamp;
- timer.enabled=true;
-}
-function timeOut(value,timestamp) {
- ticker();
-}
-function ticker() {
- if (playing) {
-  if (clicked) {
-   elapsedtime++;
-   setStatus();
-  }
- }
-}
-function setStatus() {
- elapsedNode.string[0]=''+elapsedtime;
- flagsNode.string[0]=''+flagsleft;
-}
-function surrounding(y,x) {
- count=0;
- if (y>0&&x>0&&mines[y-1][x-1]) count++;
- if (y>0&&mines[y-1][x]) count++;
- if (y>0&&x<gridx-1&&mines[y-1][x+1]) count++;
- if (x>0&&mines[y][x-1]) count++;
- if (x<gridx-1&&mines[y][x+1]) count++;
- if (y<gridy-1&&x>0&&mines[y+1][x-1]) count++;
- if (y<gridy-1&&mines[y+1][x]) count++;
- if (y<gridy-1&&x<gridx-1&&mines[y+1][x+1]) count++;
- return count;
-
-}
-function rollback(y,x) {
- if (y>=0&&y<gridy&&x>=0&&x<gridx) {
-  if (shown[y][x]!=3) {
-   c=surrounding(y,x);
-   shown[y][x]=3;
-   squaresleft--;
-   board.children[x*gridx+y].children[1]=sqimages[c];
-   if (c==0) {
-    rollback(y-1,x-1);
-    rollback(y-1,x);
-    rollback(y-1,x+1);
-    rollback(y,x-1);
-    rollback(y,x+1);
-    rollback(y+1,x-1);
-    rollback(y+1,x);
-    rollback(y+1,x+1);
-   }
-  }
- }
-}
-function dead() {
- for (y=0;y<gridy;++y){
-  for (x=0;x<gridx;++x){
-   if (mines[y][x]) {
-    if (shown[y][x]!=1) {
-     board.children[x*gridx+y].children[1]=mineImage;
-    }
-   }
-   else if (shown[y][x]==1) {
-    board.children[x*gridx+y].children[1]=noMineImage;
-   }
-  }
- }
- conditionNode.children[1]=btndead;
- playing=false;
- clicked=false;
-}
-function click(value) {
- gridclick(value.y,value.x);
-}
-function gridclick(y,x) {
- if (playing) {
-  clicked=true;
-  if (placeflag) {
-   if (shown[y][x]<3) {
-    s=shown[y][x];
-    change=true;
-    if (s==1) {
-     flagsleft++;
-     squaresleft++;
-    }
-    if (flagsleft==0&&s==0) {
-     change=false;
-    }
-    else {
-     if (s==2) s=0;
-     else s++;
-     if (s==1) {
-      flagsleft--;
-      squaresleft--;
-     }
-    }
-    if (change) {
-     shown[y][x]=s;
-     board.children[x*gridx+y].children[1]=sqtimages[s];
-     setStatus();
-    }
-    if (squaresleft==0) {
-     conditionNode.children[1]=btncool;
-     playing=false;
-    }
-   }
-  }
-  else if (shown[y][x]!=1) {
-   if (mines[y][x]) {
-    board.children[x*gridx+y].children[1]=mineredImage;
-    dead();
-   }
-   else {
-    rollback(y,x);
-   }
-  }
- }
-}
-     "
-   ]
-  }
- ]
-}
-
-ROUTE N25.isActive TO N220.startGame
-ROUTE N0.cycleTime TO N220.timeOut
-ROUTE N28.isActive TO N30.activate
-ROUTE N29.outSFVec2f TO N220.click
-ROUTE N31.isActive TO N33.activate
-ROUTE N32.outSFVec2f TO N220.click
-ROUTE N34.isActive TO N36.activate
-ROUTE N35.outSFVec2f TO N220.click
-ROUTE N37.isActive TO N39.activate
-ROUTE N38.outSFVec2f TO N220.click
-ROUTE N40.isActive TO N42.activate
-ROUTE N41.outSFVec2f TO N220.click
-ROUTE N43.isActive TO N45.activate
-ROUTE N44.outSFVec2f TO N220.click
-ROUTE N46.isActive TO N48.activate
-ROUTE N47.outSFVec2f TO N220.click
-ROUTE N49.isActive TO N51.activate
-ROUTE N50.outSFVec2f TO N220.click
-ROUTE N52.isActive TO N54.activate
-ROUTE N53.outSFVec2f TO N220.click
-ROUTE N55.isActive TO N57.activate
-ROUTE N56.outSFVec2f TO N220.click
-ROUTE N58.isActive TO N60.activate
-ROUTE N59.outSFVec2f TO N220.click
-ROUTE N61.isActive TO N63.activate
-ROUTE N62.outSFVec2f TO N220.click
-ROUTE N64.isActive TO N66.activate
-ROUTE N65.outSFVec2f TO N220.click
-ROUTE N67.isActive TO N69.activate
-ROUTE N68.outSFVec2f TO N220.click
-ROUTE N70.isActive TO N72.activate
-ROUTE N71.outSFVec2f TO N220.click
-ROUTE N73.isActive TO N75.activate
-ROUTE N74.outSFVec2f TO N220.click
-ROUTE N76.isActive TO N78.activate
-ROUTE N77.outSFVec2f TO N220.click
-ROUTE N79.isActive TO N81.activate
-ROUTE N80.outSFVec2f TO N220.click
-ROUTE N82.isActive TO N84.activate
-ROUTE N83.outSFVec2f TO N220.click
-ROUTE N85.isActive TO N87.activate
-ROUTE N86.outSFVec2f TO N220.click
-ROUTE N88.isActive TO N90.activate
-ROUTE N89.outSFVec2f TO N220.click
-ROUTE N91.isActive TO N93.activate
-ROUTE N92.outSFVec2f TO N220.click
-ROUTE N94.isActive TO N96.activate
-ROUTE N95.outSFVec2f TO N220.click
-ROUTE N97.isActive TO N99.activate
-ROUTE N98.outSFVec2f TO N220.click
-ROUTE N100.isActive TO N102.activate
-ROUTE N101.outSFVec2f TO N220.click
-ROUTE N103.isActive TO N105.activate
-ROUTE N104.outSFVec2f TO N220.click
-ROUTE N106.isActive TO N108.activate
-ROUTE N107.outSFVec2f TO N220.click
-ROUTE N109.isActive TO N111.activate
-ROUTE N110.outSFVec2f TO N220.click
-ROUTE N112.isActive TO N114.activate
-ROUTE N113.outSFVec2f TO N220.click
-ROUTE N115.isActive TO N117.activate
-ROUTE N116.outSFVec2f TO N220.click
-ROUTE N118.isActive TO N120.activate
-ROUTE N119.outSFVec2f TO N220.click
-ROUTE N121.isActive TO N123.activate
-ROUTE N122.outSFVec2f TO N220.click
-ROUTE N124.isActive TO N126.activate
-ROUTE N125.outSFVec2f TO N220.click
-ROUTE N127.isActive TO N129.activate
-ROUTE N128.outSFVec2f TO N220.click
-ROUTE N130.isActive TO N132.activate
-ROUTE N131.outSFVec2f TO N220.click
-ROUTE N133.isActive TO N135.activate
-ROUTE N134.outSFVec2f TO N220.click
-ROUTE N136.isActive TO N138.activate
-ROUTE N137.outSFVec2f TO N220.click
-ROUTE N139.isActive TO N141.activate
-ROUTE N140.outSFVec2f TO N220.click
-ROUTE N142.isActive TO N144.activate
-ROUTE N143.outSFVec2f TO N220.click
-ROUTE N145.isActive TO N147.activate
-ROUTE N146.outSFVec2f TO N220.click
-ROUTE N148.isActive TO N150.activate
-ROUTE N149.outSFVec2f TO N220.click
-ROUTE N151.isActive TO N153.activate
-ROUTE N152.outSFVec2f TO N220.click
-ROUTE N154.isActive TO N156.activate
-ROUTE N155.outSFVec2f TO N220.click
-ROUTE N157.isActive TO N159.activate
-ROUTE N158.outSFVec2f TO N220.click
-ROUTE N160.isActive TO N162.activate
-ROUTE N161.outSFVec2f TO N220.click
-ROUTE N163.isActive TO N165.activate
-ROUTE N164.outSFVec2f TO N220.click
-ROUTE N166.isActive TO N168.activate
-ROUTE N167.outSFVec2f TO N220.click
-ROUTE N169.isActive TO N171.activate
-ROUTE N170.outSFVec2f TO N220.click
-ROUTE N172.isActive TO N174.activate
-ROUTE N173.outSFVec2f TO N220.click
-ROUTE N175.isActive TO N177.activate
-ROUTE N176.outSFVec2f TO N220.click
-ROUTE N178.isActive TO N180.activate
-ROUTE N179.outSFVec2f TO N220.click
-ROUTE N181.isActive TO N183.activate
-ROUTE N182.outSFVec2f TO N220.click
-ROUTE N184.isActive TO N186.activate
-ROUTE N185.outSFVec2f TO N220.click
-ROUTE N187.isActive TO N189.activate
-ROUTE N188.outSFVec2f TO N220.click
-ROUTE N190.isActive TO N192.activate
-ROUTE N191.outSFVec2f TO N220.click
-ROUTE N193.isActive TO N195.activate
-ROUTE N194.outSFVec2f TO N220.click
-ROUTE N196.isActive TO N198.activate
-ROUTE N197.outSFVec2f TO N220.click
-ROUTE N199.isActive TO N201.activate
-ROUTE N200.outSFVec2f TO N220.click
-ROUTE N202.isActive TO N204.activate
-ROUTE N203.outSFVec2f TO N220.click
-ROUTE N205.isActive TO N207.activate
-ROUTE N206.outSFVec2f TO N220.click
-ROUTE N208.isActive TO N210.activate
-ROUTE N209.outSFVec2f TO N220.click
-ROUTE N211.isActive TO N213.activate
-ROUTE N212.outSFVec2f TO N220.click
-ROUTE N214.isActive TO N216.activate
-ROUTE N215.outSFVec2f TO N220.click
-ROUTE N217.isActive TO N219.activate
-ROUTE N218.outSFVec2f TO N220.click
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-game-othello.bt Deleted

@@ -1,2836 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 1
-  sceneProfileLevelIndication 1
-  audioProfileLevelIndication 1
-  visualProfileLevelIndication 1
-  graphicsProfileLevelIndication 1
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSv2Config {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-OrderedGroup {
-	children [
-		Background2D {
-			backColor 1 1 1
-		}
-  WorldInfo {
-   info [
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"
-    ]
-   title "Othello using BIFS and ECMAScript"
-  }
-		DEF TimeOutSensor TimeSensor {
-			enabled FALSE
-			cycleInterval 0.15
-		}			
-		Transform2D {
-			translation 0 180
-			children [
-				DEF StartTS TouchSensor {}
-				Shape {
-					geometry Rectangle { size 100 25 }
-					appearance Appearance { material Material2D { emissiveColor 0.5 0.5 0.5 filled TRUE } }
-				}
-				Shape { 
-					appearance Appearance { 
-						material Material2D { 
-							filled TRUE
-							emissiveColor 1 0 0					
-						}
-					}
-					geometry Text { 
-						string [ "Start Game" ]
-						fontStyle FontStyle {
-							size 20			
-							justify ["MIDDLE" "MIDDLE"]
-						}
-					}
-				}
-			]
-		}
-		Switch {
-			whichChoice -1
-			choice [
-				DEF BlankPiece Transform2D {
-					children [
-						DEF BackRectangle Shape {
-							geometry DEF R Rectangle { size 42 42 }
-							appearance Appearance { 
-								material Material2D { 
-									filled TRUE 
-									emissiveColor 0 0.5 0.5
-								}
-							}
-						}	
-						Shape {
-							geometry DEF C Circle { radius 18 }
-							appearance Appearance { 
-								material Material2D { 
-									filled TRUE 
-									emissiveColor 0 0.5 0.5
-								}
-							}
-						}
-					]
-				}
-				DEF WhitePiece Transform2D {
-					children [
-						USE BackRectangle
-						DEF WhiteC Shape {
-							geometry USE C
-							appearance Appearance { 
-								material Material2D { 
-									filled TRUE 
-									emissiveColor 1 1 1 
-								} 
-							}
-						}
-					]
-				}
-				DEF WhiteTransPiece Transform2D {
-					children [
-						USE BackRectangle
-						USE WhiteC
-					]
-				}
-				DEF BlackPiece Transform2D {
-					children [
-						USE BackRectangle 
-						DEF BlackC Shape {
-							geometry USE C
-							appearance Appearance { 
-								material Material2D { 
-									filled TRUE 
-									emissiveColor 0 0 0 
-								} 
-							}
-						}
-					]
-				}
-				DEF BlackTransPiece Transform2D {
-					children [
-						USE BackRectangle 	
-						USE BlackC
-					]
-				}
-				DEF Trans1 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "1" ]
-								fontStyle DEF TFS FontStyle {
-									size 20
-									justify [ "MIDDLE" "MIDDLE" ]
-								}
-							}
-							appearance DEF TA Appearance { 
-								material Material2D { 
-									filled TRUE 
-									emissiveColor 0 1 0 
-								} 
-							}
-						}
-					]
-				}
-				DEF Trans2 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "2" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans3 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "3" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans4 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "4" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans5 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "5" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans6 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "6" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans7 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "7" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans8 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "8" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans9 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "9" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans10 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "10" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans11 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "11" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans12 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "12" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans13 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "13" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans14 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "14" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans15 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "15" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans16 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "16" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans17 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "17" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans18 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "18" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans19 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "19" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans20 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "20" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				DEF Trans21 Transform2D {
-					children [
-						USE BackRectangle 	
-						Shape {
-							geometry Text {
-								string [ "21" ]
-								fontStyle USE TFS
-							}
-							appearance USE TA 
-						}
-					]
-				}
-				
-			]
-		}
-		DEF Board Form {
-			size 345 345
-			groups [ 
-				 1 -1  2 -1  3 -1  4 -1  5 -1  6 -1  7 -1  8 -1 
-				 9 -1 10 -1 11 -1 12 -1 13 -1 14 -1 15 -1 16 -1 
-				17 -1 18 -1 19 -1 20 -1 21 -1 22 -1 23 -1 24 -1
-				25 -1 26 -1 27 -1 28 -1 29 -1 30 -1 31 -1 32 -1
-				33 -1 34 -1 35 -1 36 -1 37 -1 38 -1 39 -1 40 -1
-				41 -1 42 -1 43 -1 44 -1 45 -1 46 -1 47 -1 48 -1
-				49 -1 50 -1 51 -1 52 -1 53 -1 54 -1 55 -1 56 -1
-				57 -1 58 -1 59 -1 60 -1 61 -1 62 -1 63 -1 64 -1
-				 1  2  3  4  5  6  7  8 -1 
-				 9 10 11 12 13 14 15 16 -1
-				17 18 19 20 21 22 23 24 -1
-				25 26 27 28 29 30 31 32 -1
-				33 34 35 36 37 38 39 40 -1
-				41 42 43 44 45 46 47 48 -1
-				49 50 51 52 53 54 55 56 -1
-				57 58 59 60 61 62 63 64 -1
-			]
-			groupsIndex [ 
-				 1  2  3  4  5  6  7  8 -1 
-				 9 10 11 12 13 14 15 16 -1
-				17 18 19 20 21 22 23 24 -1
-				25 26 27 28 29 30 31 32 -1
-				33 34 35 36 37 38 39 40 -1
-				41 42 43 44 45 46 47 48 -1
-				49 50 51 52 53 54 55 56 -1
-				57 58 59 60 61 62 63 64 -1
-				65 66 67 68 69 70 71 72 -1
-			]
-			constraints [ 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SHin" 
-				"SVin" 
-			]
-			children [
-				Transform2D {
-					children [
-						DEF TS00 TouchSensor {}
-						USE BlankPiece
-						DEF V00_Over Valuator {}
-						DEF V00_Out Valuator {}
-						DEF V00_Click Valuator {}
-						DEF C00_Over Conditional {
-							buffer {
-								REPLACE V00_Over.inSFVec2f BY 0 0 
-							}
-						}
-						DEF C00_Out Conditional {
-							buffer {
-								REPLACE V00_Out.inSFVec2f BY 0 0
-							}
-						}
-						DEF C00_Click Conditional {
-							buffer {
-								REPLACE V00_Click.inSFVec2f BY 0 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS01 TouchSensor {}
-						USE BlankPiece
-						DEF V01_Over Valuator {}
-						DEF V01_Out Valuator {}
-						DEF V01_Click Valuator {}
-						DEF C01_Over Conditional {
-							buffer {
-								REPLACE V01_Over.inSFVec2f BY 0 1 
-							}
-						}
-						DEF C01_Out Conditional {
-							buffer {
-								REPLACE V01_Out.inSFVec2f BY 0 1
-							}
-						}
-						DEF C01_Click Conditional {
-							buffer {
-								REPLACE V01_Click.inSFVec2f BY 0 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS02 TouchSensor {}
-						USE BlankPiece
-						DEF V02_Over Valuator {}
-						DEF V02_Out Valuator {}
-						DEF V02_Click Valuator {}
-						DEF C02_Over Conditional {
-							buffer {
-								REPLACE V02_Over.inSFVec2f BY 0 2 
-							}
-						}
-						DEF C02_Out Conditional {
-							buffer {
-								REPLACE V02_Out.inSFVec2f BY 0 2
-							}
-						}
-						DEF C02_Click Conditional {
-							buffer {
-								REPLACE V02_Click.inSFVec2f BY 0 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS03 TouchSensor {}
-						USE BlankPiece
-						DEF V03_Over Valuator {}
-						DEF V03_Out Valuator {}
-						DEF V03_Click Valuator {}
-						DEF C03_Over Conditional {
-							buffer {
-								REPLACE V03_Over.inSFVec2f BY 0 3 
-							}
-						}
-						DEF C03_Out Conditional {
-							buffer {
-								REPLACE V03_Out.inSFVec2f BY 0 3
-							}
-						}
-						DEF C03_Click Conditional {
-							buffer {
-								REPLACE V03_Click.inSFVec2f BY 0 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS04 TouchSensor {}
-						USE BlankPiece
-						DEF V04_Over Valuator {}
-						DEF V04_Out Valuator {}
-						DEF V04_Click Valuator {}
-						DEF C04_Over Conditional {
-							buffer {
-								REPLACE V04_Over.inSFVec2f BY 0 4 
-							}
-						}
-						DEF C04_Out Conditional {
-							buffer {
-								REPLACE V04_Out.inSFVec2f BY 0 4
-							}
-						}
-						DEF C04_Click Conditional {
-							buffer {
-								REPLACE V04_Click.inSFVec2f BY 0 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS05 TouchSensor {}
-						USE BlankPiece
-						DEF V05_Over Valuator {}
-						DEF V05_Out Valuator {}
-						DEF V05_Click Valuator {}
-						DEF C05_Over Conditional {
-							buffer {
-								REPLACE V05_Over.inSFVec2f BY 0 5 
-							}
-						}
-						DEF C05_Out Conditional {
-							buffer {
-								REPLACE V05_Out.inSFVec2f BY 0 5
-							}
-						}
-						DEF C05_Click Conditional {
-							buffer {
-								REPLACE V05_Click.inSFVec2f BY 0 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS06 TouchSensor {}
-						USE BlankPiece
-						DEF V06_Over Valuator {}
-						DEF V06_Out Valuator {}
-						DEF V06_Click Valuator {}
-						DEF C06_Over Conditional {
-							buffer {
-								REPLACE V06_Over.inSFVec2f BY 0 6 
-							}
-						}
-						DEF C06_Out Conditional {
-							buffer {
-								REPLACE V06_Out.inSFVec2f BY 0 6
-							}
-						}
-						DEF C06_Click Conditional {
-							buffer {
-								REPLACE V06_Click.inSFVec2f BY 0 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS07 TouchSensor {}
-						USE BlankPiece
-						DEF V07_Over Valuator {}
-						DEF V07_Out Valuator {}
-						DEF V07_Click Valuator {}
-						DEF C07_Over Conditional {
-							buffer {
-								REPLACE V07_Over.inSFVec2f BY 0 7 
-							}
-						}
-						DEF C07_Out Conditional {
-							buffer {
-								REPLACE V07_Out.inSFVec2f BY 0 7
-							}
-						}
-						DEF C07_Click Conditional {
-							buffer {
-								REPLACE V07_Click.inSFVec2f BY 0 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS10 TouchSensor {}
-						USE BlankPiece
-						DEF V10_Over Valuator {}
-						DEF V10_Out Valuator {}
-						DEF V10_Click Valuator {}
-						DEF C10_Over Conditional {
-							buffer {
-								REPLACE V10_Over.inSFVec2f BY 1 0 
-							}
-						}
-						DEF C10_Out Conditional {
-							buffer {
-								REPLACE V10_Out.inSFVec2f BY 1 0
-							}
-						}
-						DEF C10_Click Conditional {
-							buffer {
-								REPLACE V10_Click.inSFVec2f BY 1 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS11 TouchSensor {}
-						USE BlankPiece
-						DEF V11_Over Valuator {}
-						DEF V11_Out Valuator {}
-						DEF V11_Click Valuator {}
-						DEF C11_Over Conditional {
-							buffer {
-								REPLACE V11_Over.inSFVec2f BY 1 1 
-							}
-						}
-						DEF C11_Out Conditional {
-							buffer {
-								REPLACE V11_Out.inSFVec2f BY 1 1
-							}
-						}
-						DEF C11_Click Conditional {
-							buffer {
-								REPLACE V11_Click.inSFVec2f BY 1 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS12 TouchSensor {}
-						USE BlankPiece
-						DEF V12_Over Valuator {}
-						DEF V12_Out Valuator {}
-						DEF V12_Click Valuator {}
-						DEF C12_Over Conditional {
-							buffer {
-								REPLACE V12_Over.inSFVec2f BY 1 2 
-							}
-						}
-						DEF C12_Out Conditional {
-							buffer {
-								REPLACE V12_Out.inSFVec2f BY 1 2
-							}
-						}
-						DEF C12_Click Conditional {
-							buffer {
-								REPLACE V12_Click.inSFVec2f BY 1 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS13 TouchSensor {}
-						USE BlankPiece
-						DEF V13_Over Valuator {}
-						DEF V13_Out Valuator {}
-						DEF V13_Click Valuator {}
-						DEF C13_Over Conditional {
-							buffer {
-								REPLACE V13_Over.inSFVec2f BY 1 3 
-							}
-						}
-						DEF C13_Out Conditional {
-							buffer {
-								REPLACE V13_Out.inSFVec2f BY 1 3
-							}
-						}
-						DEF C13_Click Conditional {
-							buffer {
-								REPLACE V13_Click.inSFVec2f BY 1 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS14 TouchSensor {}
-						USE BlankPiece
-						DEF V14_Over Valuator {}
-						DEF V14_Out Valuator {}
-						DEF V14_Click Valuator {}
-						DEF C14_Over Conditional {
-							buffer {
-								REPLACE V14_Over.inSFVec2f BY 1 4 
-							}
-						}
-						DEF C14_Out Conditional {
-							buffer {
-								REPLACE V14_Out.inSFVec2f BY 1 4
-							}
-						}
-						DEF C14_Click Conditional {
-							buffer {
-								REPLACE V14_Click.inSFVec2f BY 1 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS15 TouchSensor {}
-						USE BlankPiece
-						DEF V15_Over Valuator {}
-						DEF V15_Out Valuator {}
-						DEF V15_Click Valuator {}
-						DEF C15_Over Conditional {
-							buffer {
-								REPLACE V15_Over.inSFVec2f BY 1 5 
-							}
-						}
-						DEF C15_Out Conditional {
-							buffer {
-								REPLACE V15_Out.inSFVec2f BY 1 5
-							}
-						}
-						DEF C15_Click Conditional {
-							buffer {
-								REPLACE V15_Click.inSFVec2f BY 1 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS16 TouchSensor {}
-						USE BlankPiece
-						DEF V16_Over Valuator {}
-						DEF V16_Out Valuator {}
-						DEF V16_Click Valuator {}
-						DEF C16_Over Conditional {
-							buffer {
-								REPLACE V16_Over.inSFVec2f BY 1 6 
-							}
-						}
-						DEF C16_Out Conditional {
-							buffer {
-								REPLACE V16_Out.inSFVec2f BY 1 6
-							}
-						}
-						DEF C16_Click Conditional {
-							buffer {
-								REPLACE V16_Click.inSFVec2f BY 1 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS17 TouchSensor {}
-						USE BlankPiece
-						DEF V17_Over Valuator {}
-						DEF V17_Out Valuator {}
-						DEF V17_Click Valuator {}
-						DEF C17_Over Conditional {
-							buffer {
-								REPLACE V17_Over.inSFVec2f BY 1 7 
-							}
-						}
-						DEF C17_Out Conditional {
-							buffer {
-								REPLACE V17_Out.inSFVec2f BY 1 7
-							}
-						}
-						DEF C17_Click Conditional {
-							buffer {
-								REPLACE V17_Click.inSFVec2f BY 1 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS20 TouchSensor {}
-						USE BlankPiece
-						DEF V20_Over Valuator {}
-						DEF V20_Out Valuator {}
-						DEF V20_Click Valuator {}
-						DEF C20_Over Conditional {
-							buffer {
-								REPLACE V20_Over.inSFVec2f BY 2 0 
-							}
-						}
-						DEF C20_Out Conditional {
-							buffer {
-								REPLACE V20_Out.inSFVec2f BY 2 0
-							}
-						}
-						DEF C20_Click Conditional {
-							buffer {
-								REPLACE V20_Click.inSFVec2f BY 2 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS21 TouchSensor {}
-						USE BlankPiece
-						DEF V21_Over Valuator {}
-						DEF V21_Out Valuator {}
-						DEF V21_Click Valuator {}
-						DEF C21_Over Conditional {
-							buffer {
-								REPLACE V21_Over.inSFVec2f BY 2 1 
-							}
-						}
-						DEF C21_Out Conditional {
-							buffer {
-								REPLACE V21_Out.inSFVec2f BY 2 1
-							}
-						}
-						DEF C21_Click Conditional {
-							buffer {
-								REPLACE V21_Click.inSFVec2f BY 2 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS22 TouchSensor {}
-						USE BlankPiece
-						DEF V22_Over Valuator {}
-						DEF V22_Out Valuator {}
-						DEF V22_Click Valuator {}
-						DEF C22_Over Conditional {
-							buffer {
-								REPLACE V22_Over.inSFVec2f BY 2 2 
-							}
-						}
-						DEF C22_Out Conditional {
-							buffer {
-								REPLACE V22_Out.inSFVec2f BY 2 2
-							}
-						}
-						DEF C22_Click Conditional {
-							buffer {
-								REPLACE V22_Click.inSFVec2f BY 2 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS23 TouchSensor {}
-						USE BlankPiece
-						DEF V23_Over Valuator {}
-						DEF V23_Out Valuator {}
-						DEF V23_Click Valuator {}
-						DEF C23_Over Conditional {
-							buffer {
-								REPLACE V23_Over.inSFVec2f BY 2 3 
-							}
-						}
-						DEF C23_Out Conditional {
-							buffer {
-								REPLACE V23_Out.inSFVec2f BY 2 3
-							}
-						}
-						DEF C23_Click Conditional {
-							buffer {
-								REPLACE V23_Click.inSFVec2f BY 2 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS24 TouchSensor {}
-						USE BlankPiece
-						DEF V24_Over Valuator {}
-						DEF V24_Out Valuator {}
-						DEF V24_Click Valuator {}
-						DEF C24_Over Conditional {
-							buffer {
-								REPLACE V24_Over.inSFVec2f BY 2 4 
-							}
-						}
-						DEF C24_Out Conditional {
-							buffer {
-								REPLACE V24_Out.inSFVec2f BY 2 4
-							}
-						}
-						DEF C24_Click Conditional {
-							buffer {
-								REPLACE V24_Click.inSFVec2f BY 2 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS25 TouchSensor {}
-						USE BlankPiece
-						DEF V25_Over Valuator {}
-						DEF V25_Out Valuator {}
-						DEF V25_Click Valuator {}
-						DEF C25_Over Conditional {
-							buffer {
-								REPLACE V25_Over.inSFVec2f BY 2 5 
-							}
-						}
-						DEF C25_Out Conditional {
-							buffer {
-								REPLACE V25_Out.inSFVec2f BY 2 5
-							}
-						}
-						DEF C25_Click Conditional {
-							buffer {
-								REPLACE V25_Click.inSFVec2f BY 2 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS26 TouchSensor {}
-						USE BlankPiece
-						DEF V26_Over Valuator {}
-						DEF V26_Out Valuator {}
-						DEF V26_Click Valuator {}
-						DEF C26_Over Conditional {
-							buffer {
-								REPLACE V26_Over.inSFVec2f BY 2 6 
-							}
-						}
-						DEF C26_Out Conditional {
-							buffer {
-								REPLACE V26_Out.inSFVec2f BY 2 6
-							}
-						}
-						DEF C26_Click Conditional {
-							buffer {
-								REPLACE V26_Click.inSFVec2f BY 2 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS27 TouchSensor {}
-						USE BlankPiece
-						DEF V27_Over Valuator {}
-						DEF V27_Out Valuator {}
-						DEF V27_Click Valuator {}
-						DEF C27_Over Conditional {
-							buffer {
-								REPLACE V27_Over.inSFVec2f BY 2 7 
-							}
-						}
-						DEF C27_Out Conditional {
-							buffer {
-								REPLACE V27_Out.inSFVec2f BY 2 7
-							}
-						}
-						DEF C27_Click Conditional {
-							buffer {
-								REPLACE V27_Click.inSFVec2f BY 2 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS30 TouchSensor {}
-						USE BlankPiece
-						DEF V30_Over Valuator {}
-						DEF V30_Out Valuator {}
-						DEF V30_Click Valuator {}
-						DEF C30_Over Conditional {
-							buffer {
-								REPLACE V30_Over.inSFVec2f BY 3 0 
-							}
-						}
-						DEF C30_Out Conditional {
-							buffer {
-								REPLACE V30_Out.inSFVec2f BY 3 0
-							}
-						}
-						DEF C30_Click Conditional {
-							buffer {
-								REPLACE V30_Click.inSFVec2f BY 3 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS31 TouchSensor {}
-						USE BlankPiece
-						DEF V31_Over Valuator {}
-						DEF V31_Out Valuator {}
-						DEF V31_Click Valuator {}
-						DEF C31_Over Conditional {
-							buffer {
-								REPLACE V31_Over.inSFVec2f BY 3 1 
-							}
-						}
-						DEF C31_Out Conditional {
-							buffer {
-								REPLACE V31_Out.inSFVec2f BY 3 1
-							}
-						}
-						DEF C31_Click Conditional {
-							buffer {
-								REPLACE V31_Click.inSFVec2f BY 3 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS32 TouchSensor {}
-						USE BlankPiece
-						DEF V32_Over Valuator {}
-						DEF V32_Out Valuator {}
-						DEF V32_Click Valuator {}
-						DEF C32_Over Conditional {
-							buffer {
-								REPLACE V32_Over.inSFVec2f BY 3 2 
-							}
-						}
-						DEF C32_Out Conditional {
-							buffer {
-								REPLACE V32_Out.inSFVec2f BY 3 2
-							}
-						}
-						DEF C32_Click Conditional {
-							buffer {
-								REPLACE V32_Click.inSFVec2f BY 3 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS33 TouchSensor {}
-						USE WhitePiece
-						DEF V33_Over Valuator {}
-						DEF V33_Out Valuator {}
-						DEF V33_Click Valuator {}
-						DEF C33_Over Conditional {
-							buffer {
-								REPLACE V33_Over.inSFVec2f BY 3 3 
-							}
-						}
-						DEF C33_Out Conditional {
-							buffer {
-								REPLACE V33_Out.inSFVec2f BY 3 3
-							}
-						}
-						DEF C33_Click Conditional {
-							buffer {
-								REPLACE V33_Click.inSFVec2f BY 3 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS34 TouchSensor {}
-						USE BlackPiece
-						DEF V34_Over Valuator {}
-						DEF V34_Out Valuator {}
-						DEF V34_Click Valuator {}
-						DEF C34_Over Conditional {
-							buffer {
-								REPLACE V34_Over.inSFVec2f BY 3 4 
-							}
-						}
-						DEF C34_Out Conditional {
-							buffer {
-								REPLACE V34_Out.inSFVec2f BY 3 4
-							}
-						}
-						DEF C34_Click Conditional {
-							buffer {
-								REPLACE V34_Click.inSFVec2f BY 3 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS35 TouchSensor {}
-						USE BlankPiece
-						DEF V35_Over Valuator {}
-						DEF V35_Out Valuator {}
-						DEF V35_Click Valuator {}
-						DEF C35_Over Conditional {
-							buffer {
-								REPLACE V35_Over.inSFVec2f BY 3 5 
-							}
-						}
-						DEF C35_Out Conditional {
-							buffer {
-								REPLACE V35_Out.inSFVec2f BY 3 5
-							}
-						}
-						DEF C35_Click Conditional {
-							buffer {
-								REPLACE V35_Click.inSFVec2f BY 3 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS36 TouchSensor {}
-						USE BlankPiece
-						DEF V36_Over Valuator {}
-						DEF V36_Out Valuator {}
-						DEF V36_Click Valuator {}
-						DEF C36_Over Conditional {
-							buffer {
-								REPLACE V36_Over.inSFVec2f BY 3 6 
-							}
-						}
-						DEF C36_Out Conditional {
-							buffer {
-								REPLACE V36_Out.inSFVec2f BY 3 6
-							}
-						}
-						DEF C36_Click Conditional {
-							buffer {
-								REPLACE V36_Click.inSFVec2f BY 3 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS37 TouchSensor {}
-						USE BlankPiece
-						DEF V37_Over Valuator {}
-						DEF V37_Out Valuator {}
-						DEF V37_Click Valuator {}
-						DEF C37_Over Conditional {
-							buffer {
-								REPLACE V37_Over.inSFVec2f BY 3 7 
-							}
-						}
-						DEF C37_Out Conditional {
-							buffer {
-								REPLACE V37_Out.inSFVec2f BY 3 7
-							}
-						}
-						DEF C37_Click Conditional {
-							buffer {
-								REPLACE V37_Click.inSFVec2f BY 3 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS40 TouchSensor {}
-						USE BlankPiece
-						DEF V40_Over Valuator {}
-						DEF V40_Out Valuator {}
-						DEF V40_Click Valuator {}
-						DEF C40_Over Conditional {
-							buffer {
-								REPLACE V40_Over.inSFVec2f BY 4 0 
-							}
-						}
-						DEF C40_Out Conditional {
-							buffer {
-								REPLACE V40_Out.inSFVec2f BY 4 0
-							}
-						}
-						DEF C40_Click Conditional {
-							buffer {
-								REPLACE V40_Click.inSFVec2f BY 4 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS41 TouchSensor {}
-						USE BlankPiece
-						DEF V41_Over Valuator {}
-						DEF V41_Out Valuator {}
-						DEF V41_Click Valuator {}
-						DEF C41_Over Conditional {
-							buffer {
-								REPLACE V41_Over.inSFVec2f BY 4 1 
-							}
-						}
-						DEF C41_Out Conditional {
-							buffer {
-								REPLACE V41_Out.inSFVec2f BY 4 1
-							}
-						}
-						DEF C41_Click Conditional {
-							buffer {
-								REPLACE V41_Click.inSFVec2f BY 4 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS42 TouchSensor {}
-						USE BlankPiece
-						DEF V42_Over Valuator {}
-						DEF V42_Out Valuator {}
-						DEF V42_Click Valuator {}
-						DEF C42_Over Conditional {
-							buffer {
-								REPLACE V42_Over.inSFVec2f BY 4 2 
-							}
-						}
-						DEF C42_Out Conditional {
-							buffer {
-								REPLACE V42_Out.inSFVec2f BY 4 2
-							}
-						}
-						DEF C42_Click Conditional {
-							buffer {
-								REPLACE V42_Click.inSFVec2f BY 4 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS43 TouchSensor {}
-						USE BlackPiece
-						DEF V43_Over Valuator {}
-						DEF V43_Out Valuator {}
-						DEF V43_Click Valuator {}
-						DEF C43_Over Conditional {
-							buffer {
-								REPLACE V43_Over.inSFVec2f BY 4 3 
-							}
-						}
-						DEF C43_Out Conditional {
-							buffer {
-								REPLACE V43_Out.inSFVec2f BY 4 3
-							}
-						}
-						DEF C43_Click Conditional {
-							buffer {
-								REPLACE V43_Click.inSFVec2f BY 4 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS44 TouchSensor {}
-						USE WhitePiece
-						DEF V44_Over Valuator {}
-						DEF V44_Out Valuator {}
-						DEF V44_Click Valuator {}
-						DEF C44_Over Conditional {
-							buffer {
-								REPLACE V44_Over.inSFVec2f BY 4 4 
-							}
-						}
-						DEF C44_Out Conditional {
-							buffer {
-								REPLACE V44_Out.inSFVec2f BY 4 4
-							}
-						}
-						DEF C44_Click Conditional {
-							buffer {
-								REPLACE V44_Click.inSFVec2f BY 4 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS45 TouchSensor {}
-						USE BlankPiece
-						DEF V45_Over Valuator {}
-						DEF V45_Out Valuator {}
-						DEF V45_Click Valuator {}
-						DEF C45_Over Conditional {
-							buffer {
-								REPLACE V45_Over.inSFVec2f BY 4 5 
-							}
-						}
-						DEF C45_Out Conditional {
-							buffer {
-								REPLACE V45_Out.inSFVec2f BY 4 5
-							}
-						}
-						DEF C45_Click Conditional {
-							buffer {
-								REPLACE V45_Click.inSFVec2f BY 4 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS46 TouchSensor {}
-						USE BlankPiece
-						DEF V46_Over Valuator {}
-						DEF V46_Out Valuator {}
-						DEF V46_Click Valuator {}
-						DEF C46_Over Conditional {
-							buffer {
-								REPLACE V46_Over.inSFVec2f BY 4 6 
-							}
-						}
-						DEF C46_Out Conditional {
-							buffer {
-								REPLACE V46_Out.inSFVec2f BY 4 6
-							}
-						}
-						DEF C46_Click Conditional {
-							buffer {
-								REPLACE V46_Click.inSFVec2f BY 4 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS47 TouchSensor {}
-						USE BlankPiece
-						DEF V47_Over Valuator {}
-						DEF V47_Out Valuator {}
-						DEF V47_Click Valuator {}
-						DEF C47_Over Conditional {
-							buffer {
-								REPLACE V47_Over.inSFVec2f BY 4 7 
-							}
-						}
-						DEF C47_Out Conditional {
-							buffer {
-								REPLACE V47_Out.inSFVec2f BY 4 7
-							}
-						}
-						DEF C47_Click Conditional {
-							buffer {
-								REPLACE V47_Click.inSFVec2f BY 4 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS50 TouchSensor {}
-						USE BlankPiece
-						DEF V50_Over Valuator {}
-						DEF V50_Out Valuator {}
-						DEF V50_Click Valuator {}
-						DEF C50_Over Conditional {
-							buffer {
-								REPLACE V50_Over.inSFVec2f BY 5 0 
-							}
-						}
-						DEF C50_Out Conditional {
-							buffer {
-								REPLACE V50_Out.inSFVec2f BY 5 0
-							}
-						}
-						DEF C50_Click Conditional {
-							buffer {
-								REPLACE V50_Click.inSFVec2f BY 5 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS51 TouchSensor {}
-						USE BlankPiece
-						DEF V51_Over Valuator {}
-						DEF V51_Out Valuator {}
-						DEF V51_Click Valuator {}
-						DEF C51_Over Conditional {
-							buffer {
-								REPLACE V51_Over.inSFVec2f BY 5 1 
-							}
-						}
-						DEF C51_Out Conditional {
-							buffer {
-								REPLACE V51_Out.inSFVec2f BY 5 1
-							}
-						}
-						DEF C51_Click Conditional {
-							buffer {
-								REPLACE V51_Click.inSFVec2f BY 5 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS52 TouchSensor {}
-						USE BlankPiece
-						DEF V52_Over Valuator {}
-						DEF V52_Out Valuator {}
-						DEF V52_Click Valuator {}
-						DEF C52_Over Conditional {
-							buffer {
-								REPLACE V52_Over.inSFVec2f BY 5 2 
-							}
-						}
-						DEF C52_Out Conditional {
-							buffer {
-								REPLACE V52_Out.inSFVec2f BY 5 2
-							}
-						}
-						DEF C52_Click Conditional {
-							buffer {
-								REPLACE V52_Click.inSFVec2f BY 5 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS53 TouchSensor {}
-						USE BlankPiece
-						DEF V53_Over Valuator {}
-						DEF V53_Out Valuator {}
-						DEF V53_Click Valuator {}
-						DEF C53_Over Conditional {
-							buffer {
-								REPLACE V53_Over.inSFVec2f BY 5 3 
-							}
-						}
-						DEF C53_Out Conditional {
-							buffer {
-								REPLACE V53_Out.inSFVec2f BY 5 3
-							}
-						}
-						DEF C53_Click Conditional {
-							buffer {
-								REPLACE V53_Click.inSFVec2f BY 5 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS54 TouchSensor {}
-						USE BlankPiece
-						DEF V54_Over Valuator {}
-						DEF V54_Out Valuator {}
-						DEF V54_Click Valuator {}
-						DEF C54_Over Conditional {
-							buffer {
-								REPLACE V54_Over.inSFVec2f BY 5 4 
-							}
-						}
-						DEF C54_Out Conditional {
-							buffer {
-								REPLACE V54_Out.inSFVec2f BY 5 4
-							}
-						}
-						DEF C54_Click Conditional {
-							buffer {
-								REPLACE V54_Click.inSFVec2f BY 5 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS55 TouchSensor {}
-						USE BlankPiece
-						DEF V55_Over Valuator {}
-						DEF V55_Out Valuator {}
-						DEF V55_Click Valuator {}
-						DEF C55_Over Conditional {
-							buffer {
-								REPLACE V55_Over.inSFVec2f BY 5 5 
-							}
-						}
-						DEF C55_Out Conditional {
-							buffer {
-								REPLACE V55_Out.inSFVec2f BY 5 5
-							}
-						}
-						DEF C55_Click Conditional {
-							buffer {
-								REPLACE V55_Click.inSFVec2f BY 5 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS56 TouchSensor {}
-						USE BlankPiece
-						DEF V56_Over Valuator {}
-						DEF V56_Out Valuator {}
-						DEF V56_Click Valuator {}
-						DEF C56_Over Conditional {
-							buffer {
-								REPLACE V56_Over.inSFVec2f BY 5 6 
-							}
-						}
-						DEF C56_Out Conditional {
-							buffer {
-								REPLACE V56_Out.inSFVec2f BY 5 6
-							}
-						}
-						DEF C56_Click Conditional {
-							buffer {
-								REPLACE V56_Click.inSFVec2f BY 5 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS57 TouchSensor {}
-						USE BlankPiece
-						DEF V57_Over Valuator {}
-						DEF V57_Out Valuator {}
-						DEF V57_Click Valuator {}
-						DEF C57_Over Conditional {
-							buffer {
-								REPLACE V57_Over.inSFVec2f BY 5 7 
-							}
-						}
-						DEF C57_Out Conditional {
-							buffer {
-								REPLACE V57_Out.inSFVec2f BY 5 7
-							}
-						}
-						DEF C57_Click Conditional {
-							buffer {
-								REPLACE V57_Click.inSFVec2f BY 5 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS60 TouchSensor {}
-						USE BlankPiece
-						DEF V60_Over Valuator {}
-						DEF V60_Out Valuator {}
-						DEF V60_Click Valuator {}
-						DEF C60_Over Conditional {
-							buffer {
-								REPLACE V60_Over.inSFVec2f BY 6 0 
-							}
-						}
-						DEF C60_Out Conditional {
-							buffer {
-								REPLACE V60_Out.inSFVec2f BY 6 0
-							}
-						}
-						DEF C60_Click Conditional {
-							buffer {
-								REPLACE V60_Click.inSFVec2f BY 6 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS61 TouchSensor {}
-						USE BlankPiece
-						DEF V61_Over Valuator {}
-						DEF V61_Out Valuator {}
-						DEF V61_Click Valuator {}
-						DEF C61_Over Conditional {
-							buffer {
-								REPLACE V61_Over.inSFVec2f BY 6 1 
-							}
-						}
-						DEF C61_Out Conditional {
-							buffer {
-								REPLACE V61_Out.inSFVec2f BY 6 1
-							}
-						}
-						DEF C61_Click Conditional {
-							buffer {
-								REPLACE V61_Click.inSFVec2f BY 6 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS62 TouchSensor {}
-						USE BlankPiece
-						DEF V62_Over Valuator {}
-						DEF V62_Out Valuator {}
-						DEF V62_Click Valuator {}
-						DEF C62_Over Conditional {
-							buffer {
-								REPLACE V62_Over.inSFVec2f BY 6 2 
-							}
-						}
-						DEF C62_Out Conditional {
-							buffer {
-								REPLACE V62_Out.inSFVec2f BY 6 2
-							}
-						}
-						DEF C62_Click Conditional {
-							buffer {
-								REPLACE V62_Click.inSFVec2f BY 6 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS63 TouchSensor {}
-						USE BlankPiece
-						DEF V63_Over Valuator {}
-						DEF V63_Out Valuator {}
-						DEF V63_Click Valuator {}
-						DEF C63_Over Conditional {
-							buffer {
-								REPLACE V63_Over.inSFVec2f BY 6 3 
-							}
-						}
-						DEF C63_Out Conditional {
-							buffer {
-								REPLACE V63_Out.inSFVec2f BY 6 3
-							}
-						}
-						DEF C63_Click Conditional {
-							buffer {
-								REPLACE V63_Click.inSFVec2f BY 6 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS64 TouchSensor {}
-						USE BlankPiece
-						DEF V64_Over Valuator {}
-						DEF V64_Out Valuator {}
-						DEF V64_Click Valuator {}
-						DEF C64_Over Conditional {
-							buffer {
-								REPLACE V64_Over.inSFVec2f BY 6 4 
-							}
-						}
-						DEF C64_Out Conditional {
-							buffer {
-								REPLACE V64_Out.inSFVec2f BY 6 4
-							}
-						}
-						DEF C64_Click Conditional {
-							buffer {
-								REPLACE V64_Click.inSFVec2f BY 6 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS65 TouchSensor {}
-						USE BlankPiece
-						DEF V65_Over Valuator {}
-						DEF V65_Out Valuator {}
-						DEF V65_Click Valuator {}
-						DEF C65_Over Conditional {
-							buffer {
-								REPLACE V65_Over.inSFVec2f BY 6 5 
-							}
-						}
-						DEF C65_Out Conditional {
-							buffer {
-								REPLACE V65_Out.inSFVec2f BY 6 5
-							}
-						}
-						DEF C65_Click Conditional {
-							buffer {
-								REPLACE V65_Click.inSFVec2f BY 6 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS66 TouchSensor {}
-						USE BlankPiece
-						DEF V66_Over Valuator {}
-						DEF V66_Out Valuator {}
-						DEF V66_Click Valuator {}
-						DEF C66_Over Conditional {
-							buffer {
-								REPLACE V66_Over.inSFVec2f BY 6 6 
-							}
-						}
-						DEF C66_Out Conditional {
-							buffer {
-								REPLACE V66_Out.inSFVec2f BY 6 6
-							}
-						}
-						DEF C66_Click Conditional {
-							buffer {
-								REPLACE V66_Click.inSFVec2f BY 6 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS67 TouchSensor {}
-						USE BlankPiece
-						DEF V67_Over Valuator {}
-						DEF V67_Out Valuator {}
-						DEF V67_Click Valuator {}
-						DEF C67_Over Conditional {
-							buffer {
-								REPLACE V67_Over.inSFVec2f BY 6 7 
-							}
-						}
-						DEF C67_Out Conditional {
-							buffer {
-								REPLACE V67_Out.inSFVec2f BY 6 7
-							}
-						}
-						DEF C67_Click Conditional {
-							buffer {
-								REPLACE V67_Click.inSFVec2f BY 6 7
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS70 TouchSensor {}
-						USE BlankPiece
-						DEF V70_Over Valuator {}
-						DEF V70_Out Valuator {}
-						DEF V70_Click Valuator {}
-						DEF C70_Over Conditional {
-							buffer {
-								REPLACE V70_Over.inSFVec2f BY 7 0 
-							}
-						}
-						DEF C70_Out Conditional {
-							buffer {
-								REPLACE V70_Out.inSFVec2f BY 7 0
-							}
-						}
-						DEF C70_Click Conditional {
-							buffer {
-								REPLACE V70_Click.inSFVec2f BY 7 0
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS71 TouchSensor {}
-						USE BlankPiece
-						DEF V71_Over Valuator {}
-						DEF V71_Out Valuator {}
-						DEF V71_Click Valuator {}
-						DEF C71_Over Conditional {
-							buffer {
-								REPLACE V71_Over.inSFVec2f BY 7 1 
-							}
-						}
-						DEF C71_Out Conditional {
-							buffer {
-								REPLACE V71_Out.inSFVec2f BY 7 1
-							}
-						}
-						DEF C71_Click Conditional {
-							buffer {
-								REPLACE V71_Click.inSFVec2f BY 7 1
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS72 TouchSensor {}
-						USE BlankPiece
-						DEF V72_Over Valuator {}
-						DEF V72_Out Valuator {}
-						DEF V72_Click Valuator {}
-						DEF C72_Over Conditional {
-							buffer {
-								REPLACE V72_Over.inSFVec2f BY 7 2 
-							}
-						}
-						DEF C72_Out Conditional {
-							buffer {
-								REPLACE V72_Out.inSFVec2f BY 7 2
-							}
-						}
-						DEF C72_Click Conditional {
-							buffer {
-								REPLACE V72_Click.inSFVec2f BY 7 2
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS73 TouchSensor {}
-						USE BlankPiece
-						DEF V73_Over Valuator {}
-						DEF V73_Out Valuator {}
-						DEF V73_Click Valuator {}
-						DEF C73_Over Conditional {
-							buffer {
-								REPLACE V73_Over.inSFVec2f BY 7 3 
-							}
-						}
-						DEF C73_Out Conditional {
-							buffer {
-								REPLACE V73_Out.inSFVec2f BY 7 3
-							}
-						}
-						DEF C73_Click Conditional {
-							buffer {
-								REPLACE V73_Click.inSFVec2f BY 7 3
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS74 TouchSensor {}
-						USE BlankPiece
-						DEF V74_Over Valuator {}
-						DEF V74_Out Valuator {}
-						DEF V74_Click Valuator {}
-						DEF C74_Over Conditional {
-							buffer {
-								REPLACE V74_Over.inSFVec2f BY 7 4 
-							}
-						}
-						DEF C74_Out Conditional {
-							buffer {
-								REPLACE V74_Out.inSFVec2f BY 7 4
-							}
-						}
-						DEF C74_Click Conditional {
-							buffer {
-								REPLACE V74_Click.inSFVec2f BY 7 4
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS75 TouchSensor {}
-						USE BlankPiece
-						DEF V75_Over Valuator {}
-						DEF V75_Out Valuator {}
-						DEF V75_Click Valuator {}
-						DEF C75_Over Conditional {
-							buffer {
-								REPLACE V75_Over.inSFVec2f BY 7 5 
-							}
-						}
-						DEF C75_Out Conditional {
-							buffer {
-								REPLACE V75_Out.inSFVec2f BY 7 5
-							}
-						}
-						DEF C75_Click Conditional {
-							buffer {
-								REPLACE V75_Click.inSFVec2f BY 7 5
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS76 TouchSensor {}
-						USE BlankPiece
-						DEF V76_Over Valuator {}
-						DEF V76_Out Valuator {}
-						DEF V76_Click Valuator {}
-						DEF C76_Over Conditional {
-							buffer {
-								REPLACE V76_Over.inSFVec2f BY 7 6 
-							}
-						}
-						DEF C76_Out Conditional {
-							buffer {
-								REPLACE V76_Out.inSFVec2f BY 7 6
-							}
-						}
-						DEF C76_Click Conditional {
-							buffer {
-								REPLACE V76_Click.inSFVec2f BY 7 6
-							}
-						}
-					]
-				}
-				Transform2D {
-					children [
-						DEF TS77 TouchSensor {}
-						USE BlankPiece
-						DEF V77_Over Valuator {}
-						DEF V77_Out Valuator {}
-						DEF V77_Click Valuator {}
-						DEF C77_Over Conditional {
-							buffer {
-								REPLACE V77_Over.inSFVec2f BY 7 7 
-							}
-						}
-						DEF C77_Out Conditional {
-							buffer {
-								REPLACE V77_Out.inSFVec2f BY 7 7
-							}
-						}
-						DEF C77_Click Conditional {
-							buffer {
-								REPLACE V77_Click.inSFVec2f BY 7 7
-							}
-						}
-					]
-				}
-			]
-		}
-		DEF SC Script { 
-eventIn SFBool startGame
-eventIn SFVec2f mouseOver
-eventIn SFVec2f mouseOut
-eventIn SFVec2f click			
-eventIn SFBool timeOut
-
-field SFNode timer USE TimeOutSensor
-
-# some internal global variables
-field MFNode picture [ 
-	USE BlankPiece
-	USE WhitePiece
-	USE BlackPiece
-	USE WhiteTransPiece
-	USE BlackTransPiece
-	USE Trans1
-	USE Trans2
-	USE Trans3
-	USE Trans4
-	USE Trans5
-	USE Trans6
-	USE Trans7
-	USE Trans8
-	USE Trans9
-	USE Trans10
-	USE Trans11
-	USE Trans12
-	USE Trans13
-	USE Trans14
-	USE Trans15
-	USE Trans16
-	USE Trans17
-	USE Trans18
-	USE Trans19
-	USE Trans20
-	USE Trans21
-]
-field SFNode images USE Board
-
-			url "javascript:
-// JavaScript Othello Game
-// Copyright (c) 2000, 2001 Kelly Yancey <kbyanc@posi.net>
-// All rights reserved.
-//
-// Redistribution and use in source form, with or without modification, is
-// 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,
-//    without modification, immediately at the beginning of the file.
-// 2. All advertising materials mentioning features or use of this software
-//    must display the following acknowledgement:
-//      This product includes software developed by Kelly Yancey     
-//    and a reference to the URL http://www.posi.net/software/othello/
-// 3. The name of the author may not be used to endorse or promote products
-//    derived from this software without specific prior written permission.
-//    
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-
-// picture numbers
-function initialize() {
-EMPTY = 0;		// empty square
-WHITE = 1;		// white piece
-BLACK = 2;		// black piece
-WHITETRANS = 3;		// white transparent cursor piece
-BLACKTRANS = 4;		// black transparent cursor piece
-NUMBASE = 5;		// beginning of numeric pictures
-
-// size of the pictures used to represent pieces (all pictures must be the same size)
-piecewidth = 42;
-pieceheight = 42;
-
-// size of the board
-width = 8;
-height = 8;
-
-// player settings
-human = BLACK;
-showcursor = true;	// display cursor showing user where they can go
-showflips = false;	// display counts showing how many pieces they can flip by putting a piece in a given square
-
-// AI settings
-weightsquares = 1;	// whether AI prefers squares that yield higher flip counts
-edgesensitive = 1;	// whether AI is sensitive to the importance of edge squares
-
-// some internal global variables
-board = new Array(width);
-score = new Array();
-turn = BLACK;
-
-
-human = BLACK;
-showcursor = true;
-showflips = true;
-weightsquares = true;
-edgesensitive = true;
-
-InitializeBoard();
-
-Play(0);
-
-}
-
-function piece(x,y) {
-// object definition for 'piece' type
-	this.imagenum = x * width + y;
-    this.player = EMPTY;
-    // how many pieces each player could flip by taking this square
-    this.flips = new Array();
-    this.flips[WHITE] = 0;
-    this.flips[BLACK] = 0;
-    // how valuable this location is to each player
-    this.value = new Array();
-    this.value[WHITE] = 0;
-    this.value[BLACK] = 0;
-}
-
-
-function SetPieceImage(x, y, src) {
-// routine to set the image associated with the given piece
-    if(images.children[board[x][y].imagenum].children[1] != src) {
-		// we explicitely check to see if we are changing the image source to prevent
-		// unnecessary redrawing of images which do not change
-		images.children[board[x][y].imagenum].children[1] = src;
-    }
-}
-
-function InitializeBoard() {
-// routine to initialize the state of the game and draw the board
-    // build the board array
-    for(x = 0; x < width; x++)
-	board[x] = new Array (height);
-
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    // place initial pieces
-	    if((x == 3 && y == 3) || (x == 4 && y == 4)) player = WHITE;
-	    else if((x == 3 && y == 4) || (x == 4 && y == 3)) player = BLACK;
-	    else player = EMPTY;
-	    board[x][y] = new piece(x,y);
-	    board[x][y].player = player;
-	}
-    }
-    // initialize scores
-    score[WHITE] = 2;
-    score[BLACK] = 2;
-}
-
-function ResetBoard() {
-// routine to reset all of the pieces on the board
-
-    // reset the board
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    board[x][y].player = EMPTY;
-	    SetPieceImage(x, y, picture[EMPTY]);
-	}
-    }
-
-    // reset scores
-    score[WHITE] = 0;
-    score[BLACK] = 0;
-
-    // put initial pieces back on the board
-    RawPutPiece(3, 3, WHITE);
-    RawPutPiece(4, 4, WHITE);
-    RawPutPiece(3, 4, BLACK);
-    RawPutPiece(4, 3, BLACK);
-
-    turn = BLACK;
-}
-
-function NumFlips(x, y, player) {
-    count = 0;
-
-    for(deltay = -1; deltay <= 1; deltay++) {
-	for(deltax = -1; deltax <= 1; deltax++) {
-	    for(distance = 1;; distance++) {
-		posx = x + (distance * deltax);
-		posy = y + (distance * deltay);
-		// stop if we go off the board
-		if(posx < 0 || posx >= width || posy < 0 || posy >= height)
-		    break;
-		// stop when we reach an empty square
-		if(board[posx][posy].player == EMPTY)
-		    break;
-		// only update the flip count when we reach another of the
-		// player's pieces
-		if(board[posx][posy].player == player) {
-		    count += distance - 1;
-		    break;
-		}
-	    }
-	}
-    }
-    return(count);
-}
-
-function CalcFlipCounts() {
-    
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    board[x][y].flips[WHITE] = 0;
-	    board[x][y].flips[BLACK] = 0;
-
-	    if(board[x][y].player != EMPTY) continue;
-
-	    board[x][y].flips[WHITE] = NumFlips(x, y, WHITE);
-	    board[x][y].flips[BLACK] = NumFlips(x, y, BLACK);
-	}
-    }
-}
-
-function RawPutPiece(x, y, player) {
-    other = OtherPlayer(player);
-    if(board[x][y].player == other) score[other]--;
-	
-    board[x][y].player = player;
-    SetPieceImage(x, y, picture[player]);
-    score[player]++;
-}
-
-function FlipPieces(x, y, player) {
-    count = 0;
-
-    // put a piece down at the desired location
-    RawPutPiece(x, y, player);
-
-    for(deltay = -1; deltay <= 1; deltay++) {
-	for(deltax = -1; deltax <= 1; deltax++) {
-	    for(distance = 1;; distance++) {
-		posx = x + (distance * deltax);
-		posy = y + (distance * deltay);
-		// stop if we go off the board
-		if(posx < 0 || posx >= width || posy < 0 || posy >= height)
-		    break;
-		// stop when we reach an empty square
-		if(board[posx][posy].player == EMPTY)
-		    break;
-		if(board[posx][posy].player == player) {
-		    // backtrack, flipping pieces
-		    for(distance--; distance > 0; distance--) {
-			posx = x + (distance * deltax);
-			posy = y + (distance * deltay);
-			RawPutPiece(posx, posy, player);
-		    }
-		    break;
-		}
-	    }
-	}
-    }
-    return(count);
-}
-
-function AnyMoves(player) {
-    
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    if(board[x][y].player != EMPTY) continue;
-	    if(NumFlips(x, y, player) > 0) return(true);
-	}
-    }
-    return(false);
-}
-
-function CanPutPiece(x, y, player) {
-// determine whether the player can put a piece at the given position
-    if(turn != player)
-	return(false);
-    if(board[x][y].player != EMPTY)
-	return(false);
-    return(NumFlips(x, y, player) > 0);
-}
-
-function CheckPutPiece(x, y) {    
-    if(! showcursor) return;
-    if(! CanPutPiece(x, y, human)) return;
-    if(human == WHITE) over = WHITETRANS;
-    else over = BLACKTRANS;
-
-    SetPieceImage(x, y, picture[over]);
-}
-
-function RestorePiece(x, y) {
-    if(showflips && RawShowFlipCount(x, y, human)) return;
-    SetPieceImage(x, y, picture[board[x][y].player]);
-}
-
-function PutPiece(x, y, timestamp) {
-    if(! CanPutPiece(x, y, human)) return;
-
-    FlipPieces(x, y, human);
-    DoneTurn(timestamp);
-}
-
-function RawShowFlipCount(x, y, player) {
-    if(board[x][y].player != EMPTY) return(false);
-    if((flips = board[x][y].flips[player]) == 0) return(false);
-    SetPieceImage(x, y, picture[NUMBASE + flips]);
-    return(true);
-}
-
-function ShowFlipCounts(player) {
-    
-    CalcFlipCounts();
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    RawShowFlipCount(x, y, player);
-	}
-    }
-}
-
-function HideFlipCounts() {
-    
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    if(board[x][y].player == EMPTY) 
-		SetPieceImage(x, y, picture[EMPTY]);
-	}
-    }
-}
-
-function OtherPlayer(player) {
-    return((player == WHITE)? BLACK: WHITE);
-}
-
-function DoneTurn(timestamp) {
-	moves = AnyMoves(turn);
-	turn = OtherPlayer(turn);
-
-    // check whether the new player has any moves
-    if(! AnyMoves(turn)) {
-    	if(! moves) return(GameOver());
-    	
-    	// XXX inform user the player has no move
-    	// and switch players again
-    	turn = OtherPlayer(turn);
-    }
-
-    // add a slight delay before the computer takes it's turn so game feels
-    // 'warmer'; when computer is playing itself, add larger delay so user
-    // can watch
-    if(turn != human) {
-    	HideFlipCounts();
-    	timer.cycleInterval = ((human == EMPTY)? 1: 0.150);
-    	timer.startTime = timestamp;
-    	timer.enabled = true;
-    } else if(showflips) ShowFlipCounts(human);
-}
- 
-function Rate(x, y, player) {
-    
-    if(board[x][y].player != EMPTY) return(0);
-    if(x < 0 || x >= width || y < 0 || y >= height) return(0);
-
-    rating = board[x][y].flips[player];
-
-    if(! weightsquares)
-	rating = (rating > 0)? 1: 0;
-
-    if(edgesensitive && rating > 0) {
-	// increase all non-zero weightings by 3 so we have room
-	// to wait 'less ideal' squares below the baseline
-	rating += 10;
-
-	// raise edge ratings 4 points, corners are raised 8
-	if(x == 0 || x == width - 1) rating += 4;
-	if(y == 0 || y == height - 1) rating += 4;
-	// lower next-to-edge ratings by 5 points, next-to-corner by 10
-	if(x == 1 || x == width - 2) rating -= 5;
-	if(y == 1 || y == height - 2) rating -= 5;
-
-	// we cannot rule out a move because of bad location; we must
-	// always go somewhere
-	if(rating < 1) rating = 1;
-    }
-    return(rating);
-}
-
-function OthelloAI(player, timestamp) {
-    best = 0;
-    numbest = 0;
-    
-    // rank each position on the board by the potential flip count
-    CalcFlipCounts();
-
-    // apply AI rating algorithm
-    for(y = 0; y < height; y++) {
-	for(x = 0; x < width; x++) {
-	    rating = Rate(x, y, player);
-
-	    // store the rating back into the board
-	    board[x][y].value[player] = rating;
-
-	    if(rating == best)
-		numbest++;
-	    else if(rating > best) {
-		best = rating;
-		numbest = 1;
-	    }
-	}
-    }
-
-    while(numbest > 0) {
-	// pick a square to put our piece
-	pick = Math.floor(Math.random() * numbest);
-	count = 0;
-	for(y = 0; y < height; y++) {
-	    for(x = 0; x < width; x++) {
-		rating = board[x][y].value[player];
-		if(rating == best) {
-		    if(count == pick) {
-			FlipPieces(x, y, player);
-			DoneTurn(timestamp);
-			return;
-		    }
-		    else count++;
-		}
-	    }
-	}
-    }
-
-    // if we make it here, then there was nowhere to go
-    DoneTurn(timestamp);
-}
-
-function Play(timestamp) {
-    // black always goes first
-    if(human != BLACK)
-	OthelloAI(BLACK,timestamp);
-    else if(showflips)
-	ShowFlipCounts(human);
-}
-
-function GameOver() {
-    turn = EMPTY;
-}
-
-function timeOut(value, timestamp) {	
-	if (!value) {
-		OthelloAI(turn, timestamp);
-	}
-}
-
-function startGame(value,timestamp) {	
-	if (value) {
-		Play(timestamp);
-	}
-}
-
-function click(value, timestamp) {
-	PutPiece(value.x, value.y, timestamp);
-}
-
-function mouseOver(value) {
-	CheckPutPiece(value.x, value.y);
-}
-
-function mouseOut(value) {
-	RestorePiece(value.x, value.y);
-}	
- 
-			
-			"
-		}		
-	]
-}
-ROUTE StartTS.isActive TO SC.startGame
-ROUTE TimeOutSensor.isActive TO SC.timeOut
-
-ROUTE TS00.isActive TO C00_Click.activate
-ROUTE TS00.isOver TO C00_Over.activate
-ROUTE TS00.isOver TO C00_Out.reverseActivate
-ROUTE V00_Over.outSFVec2f TO SC.mouseOver
-ROUTE V00_Out.outSFVec2f TO SC.mouseOut
-ROUTE V00_Click.outSFVec2f TO SC.click
-ROUTE TS01.isActive TO C01_Click.activate
-ROUTE TS01.isOver TO C01_Over.activate
-ROUTE TS01.isOver TO C01_Out.reverseActivate
-ROUTE V01_Over.outSFVec2f TO SC.mouseOver
-ROUTE V01_Out.outSFVec2f TO SC.mouseOut
-ROUTE V01_Click.outSFVec2f TO SC.click
-ROUTE TS02.isActive TO C02_Click.activate
-ROUTE TS02.isOver TO C02_Over.activate
-ROUTE TS02.isOver TO C02_Out.reverseActivate
-ROUTE V02_Over.outSFVec2f TO SC.mouseOver
-ROUTE V02_Out.outSFVec2f TO SC.mouseOut
-ROUTE V02_Click.outSFVec2f TO SC.click
-ROUTE TS03.isActive TO C03_Click.activate
-ROUTE TS03.isOver TO C03_Over.activate
-ROUTE TS03.isOver TO C03_Out.reverseActivate
-ROUTE V03_Over.outSFVec2f TO SC.mouseOver
-ROUTE V03_Out.outSFVec2f TO SC.mouseOut
-ROUTE V03_Click.outSFVec2f TO SC.click
-ROUTE TS04.isActive TO C04_Click.activate
-ROUTE TS04.isOver TO C04_Over.activate
-ROUTE TS04.isOver TO C04_Out.reverseActivate
-ROUTE V04_Over.outSFVec2f TO SC.mouseOver
-ROUTE V04_Out.outSFVec2f TO SC.mouseOut
-ROUTE V04_Click.outSFVec2f TO SC.click
-ROUTE TS05.isActive TO C05_Click.activate
-ROUTE TS05.isOver TO C05_Over.activate
-ROUTE TS05.isOver TO C05_Out.reverseActivate
-ROUTE V05_Over.outSFVec2f TO SC.mouseOver
-ROUTE V05_Out.outSFVec2f TO SC.mouseOut
-ROUTE V05_Click.outSFVec2f TO SC.click
-ROUTE TS06.isActive TO C06_Click.activate
-ROUTE TS06.isOver TO C06_Over.activate
-ROUTE TS06.isOver TO C06_Out.reverseActivate
-ROUTE V06_Over.outSFVec2f TO SC.mouseOver
-ROUTE V06_Out.outSFVec2f TO SC.mouseOut
-ROUTE V06_Click.outSFVec2f TO SC.click
-ROUTE TS07.isActive TO C07_Click.activate
-ROUTE TS07.isOver TO C07_Over.activate
-ROUTE TS07.isOver TO C07_Out.reverseActivate
-ROUTE V07_Over.outSFVec2f TO SC.mouseOver
-ROUTE V07_Out.outSFVec2f TO SC.mouseOut
-ROUTE V07_Click.outSFVec2f TO SC.click
-ROUTE TS10.isActive TO C10_Click.activate
-ROUTE TS10.isOver TO C10_Over.activate
-ROUTE TS10.isOver TO C10_Out.reverseActivate
-ROUTE V10_Over.outSFVec2f TO SC.mouseOver
-ROUTE V10_Out.outSFVec2f TO SC.mouseOut
-ROUTE V10_Click.outSFVec2f TO SC.click
-ROUTE TS11.isActive TO C11_Click.activate
-ROUTE TS11.isOver TO C11_Over.activate
-ROUTE TS11.isOver TO C11_Out.reverseActivate
-ROUTE V11_Over.outSFVec2f TO SC.mouseOver
-ROUTE V11_Out.outSFVec2f TO SC.mouseOut
-ROUTE V11_Click.outSFVec2f TO SC.click
-ROUTE TS12.isActive TO C12_Click.activate
-ROUTE TS12.isOver TO C12_Over.activate
-ROUTE TS12.isOver TO C12_Out.reverseActivate
-ROUTE V12_Over.outSFVec2f TO SC.mouseOver
-ROUTE V12_Out.outSFVec2f TO SC.mouseOut
-ROUTE V12_Click.outSFVec2f TO SC.click
-ROUTE TS13.isActive TO C13_Click.activate
-ROUTE TS13.isOver TO C13_Over.activate
-ROUTE TS13.isOver TO C13_Out.reverseActivate
-ROUTE V13_Over.outSFVec2f TO SC.mouseOver
-ROUTE V13_Out.outSFVec2f TO SC.mouseOut
-ROUTE V13_Click.outSFVec2f TO SC.click
-ROUTE TS14.isActive TO C14_Click.activate
-ROUTE TS14.isOver TO C14_Over.activate
-ROUTE TS14.isOver TO C14_Out.reverseActivate
-ROUTE V14_Over.outSFVec2f TO SC.mouseOver
-ROUTE V14_Out.outSFVec2f TO SC.mouseOut
-ROUTE V14_Click.outSFVec2f TO SC.click
-ROUTE TS15.isActive TO C15_Click.activate
-ROUTE TS15.isOver TO C15_Over.activate
-ROUTE TS15.isOver TO C15_Out.reverseActivate
-ROUTE V15_Over.outSFVec2f TO SC.mouseOver
-ROUTE V15_Out.outSFVec2f TO SC.mouseOut
-ROUTE V15_Click.outSFVec2f TO SC.click
-ROUTE TS16.isActive TO C16_Click.activate
-ROUTE TS16.isOver TO C16_Over.activate
-ROUTE TS16.isOver TO C16_Out.reverseActivate
-ROUTE V16_Over.outSFVec2f TO SC.mouseOver
-ROUTE V16_Out.outSFVec2f TO SC.mouseOut
-ROUTE V16_Click.outSFVec2f TO SC.click
-ROUTE TS17.isActive TO C17_Click.activate
-ROUTE TS17.isOver TO C17_Over.activate
-ROUTE TS17.isOver TO C17_Out.reverseActivate
-ROUTE V17_Over.outSFVec2f TO SC.mouseOver
-ROUTE V17_Out.outSFVec2f TO SC.mouseOut
-ROUTE V17_Click.outSFVec2f TO SC.click
-ROUTE TS20.isActive TO C20_Click.activate
-ROUTE TS20.isOver TO C20_Over.activate
-ROUTE TS20.isOver TO C20_Out.reverseActivate
-ROUTE V20_Over.outSFVec2f TO SC.mouseOver
-ROUTE V20_Out.outSFVec2f TO SC.mouseOut
-ROUTE V20_Click.outSFVec2f TO SC.click
-ROUTE TS21.isActive TO C21_Click.activate
-ROUTE TS21.isOver TO C21_Over.activate
-ROUTE TS21.isOver TO C21_Out.reverseActivate
-ROUTE V21_Over.outSFVec2f TO SC.mouseOver
-ROUTE V21_Out.outSFVec2f TO SC.mouseOut
-ROUTE V21_Click.outSFVec2f TO SC.click
-ROUTE TS22.isActive TO C22_Click.activate
-ROUTE TS22.isOver TO C22_Over.activate
-ROUTE TS22.isOver TO C22_Out.reverseActivate
-ROUTE V22_Over.outSFVec2f TO SC.mouseOver
-ROUTE V22_Out.outSFVec2f TO SC.mouseOut
-ROUTE V22_Click.outSFVec2f TO SC.click
-ROUTE TS23.isActive TO C23_Click.activate
-ROUTE TS23.isOver TO C23_Over.activate
-ROUTE TS23.isOver TO C23_Out.reverseActivate
-ROUTE V23_Over.outSFVec2f TO SC.mouseOver
-ROUTE V23_Out.outSFVec2f TO SC.mouseOut
-ROUTE V23_Click.outSFVec2f TO SC.click
-ROUTE TS24.isActive TO C24_Click.activate
-ROUTE TS24.isOver TO C24_Over.activate
-ROUTE TS24.isOver TO C24_Out.reverseActivate
-ROUTE V24_Over.outSFVec2f TO SC.mouseOver
-ROUTE V24_Out.outSFVec2f TO SC.mouseOut
-ROUTE V24_Click.outSFVec2f TO SC.click
-ROUTE TS25.isActive TO C25_Click.activate
-ROUTE TS25.isOver TO C25_Over.activate
-ROUTE TS25.isOver TO C25_Out.reverseActivate
-ROUTE V25_Over.outSFVec2f TO SC.mouseOver
-ROUTE V25_Out.outSFVec2f TO SC.mouseOut
-ROUTE V25_Click.outSFVec2f TO SC.click
-ROUTE TS26.isActive TO C26_Click.activate
-ROUTE TS26.isOver TO C26_Over.activate
-ROUTE TS26.isOver TO C26_Out.reverseActivate
-ROUTE V26_Over.outSFVec2f TO SC.mouseOver
-ROUTE V26_Out.outSFVec2f TO SC.mouseOut
-ROUTE V26_Click.outSFVec2f TO SC.click
-ROUTE TS27.isActive TO C27_Click.activate
-ROUTE TS27.isOver TO C27_Over.activate
-ROUTE TS27.isOver TO C27_Out.reverseActivate
-ROUTE V27_Over.outSFVec2f TO SC.mouseOver
-ROUTE V27_Out.outSFVec2f TO SC.mouseOut
-ROUTE V27_Click.outSFVec2f TO SC.click
-ROUTE TS30.isActive TO C30_Click.activate
-ROUTE TS30.isOver TO C30_Over.activate
-ROUTE TS30.isOver TO C30_Out.reverseActivate
-ROUTE V30_Over.outSFVec2f TO SC.mouseOver
-ROUTE V30_Out.outSFVec2f TO SC.mouseOut
-ROUTE V30_Click.outSFVec2f TO SC.click
-ROUTE TS31.isActive TO C31_Click.activate
-ROUTE TS31.isOver TO C31_Over.activate
-ROUTE TS31.isOver TO C31_Out.reverseActivate
-ROUTE V31_Over.outSFVec2f TO SC.mouseOver
-ROUTE V31_Out.outSFVec2f TO SC.mouseOut
-ROUTE V31_Click.outSFVec2f TO SC.click
-ROUTE TS32.isActive TO C32_Click.activate
-ROUTE TS32.isOver TO C32_Over.activate
-ROUTE TS32.isOver TO C32_Out.reverseActivate
-ROUTE V32_Over.outSFVec2f TO SC.mouseOver
-ROUTE V32_Out.outSFVec2f TO SC.mouseOut
-ROUTE V32_Click.outSFVec2f TO SC.click
-ROUTE TS33.isActive TO C33_Click.activate
-ROUTE TS33.isOver TO C33_Over.activate
-ROUTE TS33.isOver TO C33_Out.reverseActivate
-ROUTE V33_Over.outSFVec2f TO SC.mouseOver
-ROUTE V33_Out.outSFVec2f TO SC.mouseOut
-ROUTE V33_Click.outSFVec2f TO SC.click
-ROUTE TS34.isActive TO C34_Click.activate
-ROUTE TS34.isOver TO C34_Over.activate
-ROUTE TS34.isOver TO C34_Out.reverseActivate
-ROUTE V34_Over.outSFVec2f TO SC.mouseOver
-ROUTE V34_Out.outSFVec2f TO SC.mouseOut
-ROUTE V34_Click.outSFVec2f TO SC.click
-ROUTE TS35.isActive TO C35_Click.activate
-ROUTE TS35.isOver TO C35_Over.activate
-ROUTE TS35.isOver TO C35_Out.reverseActivate
-ROUTE V35_Over.outSFVec2f TO SC.mouseOver
-ROUTE V35_Out.outSFVec2f TO SC.mouseOut
-ROUTE V35_Click.outSFVec2f TO SC.click
-ROUTE TS36.isActive TO C36_Click.activate
-ROUTE TS36.isOver TO C36_Over.activate
-ROUTE TS36.isOver TO C36_Out.reverseActivate
-ROUTE V36_Over.outSFVec2f TO SC.mouseOver
-ROUTE V36_Out.outSFVec2f TO SC.mouseOut
-ROUTE V36_Click.outSFVec2f TO SC.click
-ROUTE TS37.isActive TO C37_Click.activate
-ROUTE TS37.isOver TO C37_Over.activate
-ROUTE TS37.isOver TO C37_Out.reverseActivate
-ROUTE V37_Over.outSFVec2f TO SC.mouseOver
-ROUTE V37_Out.outSFVec2f TO SC.mouseOut
-ROUTE V37_Click.outSFVec2f TO SC.click
-ROUTE TS40.isActive TO C40_Click.activate
-ROUTE TS40.isOver TO C40_Over.activate
-ROUTE TS40.isOver TO C40_Out.reverseActivate
-ROUTE V40_Over.outSFVec2f TO SC.mouseOver
-ROUTE V40_Out.outSFVec2f TO SC.mouseOut
-ROUTE V40_Click.outSFVec2f TO SC.click
-ROUTE TS41.isActive TO C41_Click.activate
-ROUTE TS41.isOver TO C41_Over.activate
-ROUTE TS41.isOver TO C41_Out.reverseActivate
-ROUTE V41_Over.outSFVec2f TO SC.mouseOver
-ROUTE V41_Out.outSFVec2f TO SC.mouseOut
-ROUTE V41_Click.outSFVec2f TO SC.click
-ROUTE TS42.isActive TO C42_Click.activate
-ROUTE TS42.isOver TO C42_Over.activate
-ROUTE TS42.isOver TO C42_Out.reverseActivate
-ROUTE V42_Over.outSFVec2f TO SC.mouseOver
-ROUTE V42_Out.outSFVec2f TO SC.mouseOut
-ROUTE V42_Click.outSFVec2f TO SC.click
-ROUTE TS43.isActive TO C43_Click.activate
-ROUTE TS43.isOver TO C43_Over.activate
-ROUTE TS43.isOver TO C43_Out.reverseActivate
-ROUTE V43_Over.outSFVec2f TO SC.mouseOver
-ROUTE V43_Out.outSFVec2f TO SC.mouseOut
-ROUTE V43_Click.outSFVec2f TO SC.click
-ROUTE TS44.isActive TO C44_Click.activate
-ROUTE TS44.isOver TO C44_Over.activate
-ROUTE TS44.isOver TO C44_Out.reverseActivate
-ROUTE V44_Over.outSFVec2f TO SC.mouseOver
-ROUTE V44_Out.outSFVec2f TO SC.mouseOut
-ROUTE V44_Click.outSFVec2f TO SC.click
-ROUTE TS45.isActive TO C45_Click.activate
-ROUTE TS45.isOver TO C45_Over.activate
-ROUTE TS45.isOver TO C45_Out.reverseActivate
-ROUTE V45_Over.outSFVec2f TO SC.mouseOver
-ROUTE V45_Out.outSFVec2f TO SC.mouseOut
-ROUTE V45_Click.outSFVec2f TO SC.click
-ROUTE TS46.isActive TO C46_Click.activate
-ROUTE TS46.isOver TO C46_Over.activate
-ROUTE TS46.isOver TO C46_Out.reverseActivate
-ROUTE V46_Over.outSFVec2f TO SC.mouseOver
-ROUTE V46_Out.outSFVec2f TO SC.mouseOut
-ROUTE V46_Click.outSFVec2f TO SC.click
-ROUTE TS47.isActive TO C47_Click.activate
-ROUTE TS47.isOver TO C47_Over.activate
-ROUTE TS47.isOver TO C47_Out.reverseActivate
-ROUTE V47_Over.outSFVec2f TO SC.mouseOver
-ROUTE V47_Out.outSFVec2f TO SC.mouseOut
-ROUTE V47_Click.outSFVec2f TO SC.click
-ROUTE TS50.isActive TO C50_Click.activate
-ROUTE TS50.isOver TO C50_Over.activate
-ROUTE TS50.isOver TO C50_Out.reverseActivate
-ROUTE V50_Over.outSFVec2f TO SC.mouseOver
-ROUTE V50_Out.outSFVec2f TO SC.mouseOut
-ROUTE V50_Click.outSFVec2f TO SC.click
-ROUTE TS51.isActive TO C51_Click.activate
-ROUTE TS51.isOver TO C51_Over.activate
-ROUTE TS51.isOver TO C51_Out.reverseActivate
-ROUTE V51_Over.outSFVec2f TO SC.mouseOver
-ROUTE V51_Out.outSFVec2f TO SC.mouseOut
-ROUTE V51_Click.outSFVec2f TO SC.click
-ROUTE TS52.isActive TO C52_Click.activate
-ROUTE TS52.isOver TO C52_Over.activate
-ROUTE TS52.isOver TO C52_Out.reverseActivate
-ROUTE V52_Over.outSFVec2f TO SC.mouseOver
-ROUTE V52_Out.outSFVec2f TO SC.mouseOut
-ROUTE V52_Click.outSFVec2f TO SC.click
-ROUTE TS53.isActive TO C53_Click.activate
-ROUTE TS53.isOver TO C53_Over.activate
-ROUTE TS53.isOver TO C53_Out.reverseActivate
-ROUTE V53_Over.outSFVec2f TO SC.mouseOver
-ROUTE V53_Out.outSFVec2f TO SC.mouseOut
-ROUTE V53_Click.outSFVec2f TO SC.click
-ROUTE TS54.isActive TO C54_Click.activate
-ROUTE TS54.isOver TO C54_Over.activate
-ROUTE TS54.isOver TO C54_Out.reverseActivate
-ROUTE V54_Over.outSFVec2f TO SC.mouseOver
-ROUTE V54_Out.outSFVec2f TO SC.mouseOut
-ROUTE V54_Click.outSFVec2f TO SC.click
-ROUTE TS55.isActive TO C55_Click.activate
-ROUTE TS55.isOver TO C55_Over.activate
-ROUTE TS55.isOver TO C55_Out.reverseActivate
-ROUTE V55_Over.outSFVec2f TO SC.mouseOver
-ROUTE V55_Out.outSFVec2f TO SC.mouseOut
-ROUTE V55_Click.outSFVec2f TO SC.click
-ROUTE TS56.isActive TO C56_Click.activate
-ROUTE TS56.isOver TO C56_Over.activate
-ROUTE TS56.isOver TO C56_Out.reverseActivate
-ROUTE V56_Over.outSFVec2f TO SC.mouseOver
-ROUTE V56_Out.outSFVec2f TO SC.mouseOut
-ROUTE V56_Click.outSFVec2f TO SC.click
-ROUTE TS57.isActive TO C57_Click.activate
-ROUTE TS57.isOver TO C57_Over.activate
-ROUTE TS57.isOver TO C57_Out.reverseActivate
-ROUTE V57_Over.outSFVec2f TO SC.mouseOver
-ROUTE V57_Out.outSFVec2f TO SC.mouseOut
-ROUTE V57_Click.outSFVec2f TO SC.click
-ROUTE TS60.isActive TO C60_Click.activate
-ROUTE TS60.isOver TO C60_Over.activate
-ROUTE TS60.isOver TO C60_Out.reverseActivate
-ROUTE V60_Over.outSFVec2f TO SC.mouseOver
-ROUTE V60_Out.outSFVec2f TO SC.mouseOut
-ROUTE V60_Click.outSFVec2f TO SC.click
-ROUTE TS61.isActive TO C61_Click.activate
-ROUTE TS61.isOver TO C61_Over.activate
-ROUTE TS61.isOver TO C61_Out.reverseActivate
-ROUTE V61_Over.outSFVec2f TO SC.mouseOver
-ROUTE V61_Out.outSFVec2f TO SC.mouseOut
-ROUTE V61_Click.outSFVec2f TO SC.click
-ROUTE TS62.isActive TO C62_Click.activate
-ROUTE TS62.isOver TO C62_Over.activate
-ROUTE TS62.isOver TO C62_Out.reverseActivate
-ROUTE V62_Over.outSFVec2f TO SC.mouseOver
-ROUTE V62_Out.outSFVec2f TO SC.mouseOut
-ROUTE V62_Click.outSFVec2f TO SC.click
-ROUTE TS63.isActive TO C63_Click.activate
-ROUTE TS63.isOver TO C63_Over.activate
-ROUTE TS63.isOver TO C63_Out.reverseActivate
-ROUTE V63_Over.outSFVec2f TO SC.mouseOver
-ROUTE V63_Out.outSFVec2f TO SC.mouseOut
-ROUTE V63_Click.outSFVec2f TO SC.click
-ROUTE TS64.isActive TO C64_Click.activate
-ROUTE TS64.isOver TO C64_Over.activate
-ROUTE TS64.isOver TO C64_Out.reverseActivate
-ROUTE V64_Over.outSFVec2f TO SC.mouseOver
-ROUTE V64_Out.outSFVec2f TO SC.mouseOut
-ROUTE V64_Click.outSFVec2f TO SC.click
-ROUTE TS65.isActive TO C65_Click.activate
-ROUTE TS65.isOver TO C65_Over.activate
-ROUTE TS65.isOver TO C65_Out.reverseActivate
-ROUTE V65_Over.outSFVec2f TO SC.mouseOver
-ROUTE V65_Out.outSFVec2f TO SC.mouseOut
-ROUTE V65_Click.outSFVec2f TO SC.click
-ROUTE TS66.isActive TO C66_Click.activate
-ROUTE TS66.isOver TO C66_Over.activate
-ROUTE TS66.isOver TO C66_Out.reverseActivate
-ROUTE V66_Over.outSFVec2f TO SC.mouseOver
-ROUTE V66_Out.outSFVec2f TO SC.mouseOut
-ROUTE V66_Click.outSFVec2f TO SC.click
-ROUTE TS67.isActive TO C67_Click.activate
-ROUTE TS67.isOver TO C67_Over.activate
-ROUTE TS67.isOver TO C67_Out.reverseActivate
-ROUTE V67_Over.outSFVec2f TO SC.mouseOver
-ROUTE V67_Out.outSFVec2f TO SC.mouseOut
-ROUTE V67_Click.outSFVec2f TO SC.click
-ROUTE TS70.isActive TO C70_Click.activate
-ROUTE TS70.isOver TO C70_Over.activate
-ROUTE TS70.isOver TO C70_Out.reverseActivate
-ROUTE V70_Over.outSFVec2f TO SC.mouseOver
-ROUTE V70_Out.outSFVec2f TO SC.mouseOut
-ROUTE V70_Click.outSFVec2f TO SC.click
-ROUTE TS71.isActive TO C71_Click.activate
-ROUTE TS71.isOver TO C71_Over.activate
-ROUTE TS71.isOver TO C71_Out.reverseActivate
-ROUTE V71_Over.outSFVec2f TO SC.mouseOver
-ROUTE V71_Out.outSFVec2f TO SC.mouseOut
-ROUTE V71_Click.outSFVec2f TO SC.click
-ROUTE TS72.isActive TO C72_Click.activate
-ROUTE TS72.isOver TO C72_Over.activate
-ROUTE TS72.isOver TO C72_Out.reverseActivate
-ROUTE V72_Over.outSFVec2f TO SC.mouseOver
-ROUTE V72_Out.outSFVec2f TO SC.mouseOut
-ROUTE V72_Click.outSFVec2f TO SC.click
-ROUTE TS73.isActive TO C73_Click.activate
-ROUTE TS73.isOver TO C73_Over.activate
-ROUTE TS73.isOver TO C73_Out.reverseActivate
-ROUTE V73_Over.outSFVec2f TO SC.mouseOver
-ROUTE V73_Out.outSFVec2f TO SC.mouseOut
-ROUTE V73_Click.outSFVec2f TO SC.click
-ROUTE TS74.isActive TO C74_Click.activate
-ROUTE TS74.isOver TO C74_Over.activate
-ROUTE TS74.isOver TO C74_Out.reverseActivate
-ROUTE V74_Over.outSFVec2f TO SC.mouseOver
-ROUTE V74_Out.outSFVec2f TO SC.mouseOut
-ROUTE V74_Click.outSFVec2f TO SC.click
-ROUTE TS75.isActive TO C75_Click.activate
-ROUTE TS75.isOver TO C75_Over.activate
-ROUTE TS75.isOver TO C75_Out.reverseActivate
-ROUTE V75_Over.outSFVec2f TO SC.mouseOver
-ROUTE V75_Out.outSFVec2f TO SC.mouseOut
-ROUTE V75_Click.outSFVec2f TO SC.click
-ROUTE TS76.isActive TO C76_Click.activate
-ROUTE TS76.isOver TO C76_Over.activate
-ROUTE TS76.isOver TO C76_Out.reverseActivate
-ROUTE V76_Over.outSFVec2f TO SC.mouseOver
-ROUTE V76_Out.outSFVec2f TO SC.mouseOut
-ROUTE V76_Click.outSFVec2f TO SC.click
-ROUTE TS77.isActive TO C77_Click.activate
-ROUTE TS77.isOver TO C77_Over.activate
-ROUTE TS77.isOver TO C77_Out.reverseActivate
-ROUTE V77_Over.outSFVec2f TO SC.mouseOver
-ROUTE V77_Out.outSFVec2f TO SC.mouseOut
-ROUTE V77_Click.outSFVec2f TO SC.click

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-colorinterpolator.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows color interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Color Interpolator"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ColorInterpolator {
-   key [0 0.5 1]
-   keyValue [1 0 0 0 1 0 1 0 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO MAT.emissiveColor
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-coordinateinterpolator2D.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positionanimator.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0x01
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0x01
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
- 	Viewpoint {position 0 0 100 }
-  WorldInfo {
-   title "PositionAnimator test"
-   info ["This shows PositionAnimator using bezier spline interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  DEF BACK Background2D { backColor 1 1 1}
-  DEF TR Transform {   
-   scale 0.5 0.5 0.5
-   rotation 1 1 1 0.75
-   children [
-    Shape { 
-     appearance Appearance { material DEF MAT Material { diffuseColor 1 0 0} }
-     geometry Box {size 50 50 50}
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-  	cycleInterval 4.0
-   loop TRUE
-  }
-  DEF V Valuator {
-  	Factor2 0
-  	Offset2 0.5
-  }
-  DEF SI PositionAnimator {
-   key [0 0.25 0.5 0.75 1]
-
-   keyValueType 1
-   keyValue [-50 0 -50, 0 50 0, 50 0 -50]
-   keyType 4
-   keySpline [0.75 0, 0.25 1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO TR.translation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positionanimator2D.bt Deleted

@@ -1,65 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0x01
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0x01
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-  WorldInfo {
-   title "PositionAnimator2D test"
-   info ["This shows PositionAnimator2D using bezier spline interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  DEF BACK Background2D { backColor 1 1 1}
-  DEF TR Transform2D {   
-   scale 0.5 0.5
-   children [
-    Shape { 
-     appearance Appearance { material DEF MAT Material2D { emissiveColor 1 0 0 filled TRUE } }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D { 
-       point [-100 0, -50 100, 50 100, 100 0, 50 -100, -50 -100]
-      } 
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-  	cycleInterval 4.0
-   loop TRUE
-  }
-  DEF V Valuator {
-  	Factor2 0
-  	Offset2 0.5
-  }
-  DEF SI PositionAnimator2D {
-   key [0 0.25 0.5 0.75 1]
-
-   keyValueType 1
-   keyValue [-50 0 0 50 50 0]
-   keyType 4
-   keySpline [0.75 0, 0.25 1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO TR.translation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positioninterpolator-position.bt Deleted

@@ -1,94 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-Group {
- children [
- 	NavigationInfo {type ["ANY" "EXAMINE"]}
-  WorldInfo {
-   info ["This shows position interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "PositionInterpolator"
-  }
-  Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:10]
-      }
-     }
-     geometry Box {
-      size 100 100 100
-     }
-    }
-   ]
-  }
-  DEF TR Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material {diffuseColor 0 1 0 }
-     }
-     geometry Box {
-      size 100 100 100
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 10
-   loop TRUE
-  }
-  DEF SI PositionInterpolator {
-   key [0 0.25 0.5 0.75 1]
-   keyValue [100 100 100, -100 100 -100, -100 -100 -100, 100 -100 100, 100 100 100]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TR.translation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positioninterpolator-size.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-Group {
- children [
-  WorldInfo {
-   info ["This shows 3D size interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "PositionInterpolator"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform {
-   scale 0.5 0.5 0.5
-   rotation 1 1 1 0.75
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material {diffuseColor 1 0 0 }
-     }
-     geometry Box {size 100 100 50}
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
-  DEF SI PositionInterpolator {
-   key [0 0.25 0.5 0.75 1]
-   keyValue [1 1 1, 1 2 0.25, 1 1 1, 2 1 1.75, 1 1 1]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TR.scale
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positioninterpolator2D-position.bt Deleted

@@ -1,96 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows 2D position interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "PositionInterpolator2D"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:10]
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-   ]
-  }
-  DEF TR2 Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 10
-   loop TRUE
-  }
-  DEF SI PositionInterpolator2D {
-   key [0 0.25 0.5 0.75 1]
-   keyValue [100 100 -100 100 -100 -100 100 -100 100 100]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TR2.translation
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-positioninterpolator2D-size.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-scalaranimator.bt Deleted

@@ -1,66 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0x01
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0x01
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 400
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-OrderedGroup { 
- children [
-  WorldInfo {
-   title "ScalarAnimator test"
-   info ["This shows ScalarAnimator using bezier spline interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-  }
-  DEF BACK Background2D { backColor 1 1 1}
-  DEF TR Transform2D {   
-   scale 0.5 0.5
-   children [
-    Shape { 
-     appearance Appearance { material DEF MAT Material2D { emissiveColor 1 0 0 filled TRUE } }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D { 
-       point [-100 0, -50 100, 50 100, 100 0, 50 -100, -50 -100]
-      } 
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-  	cycleInterval 4.0
-   loop TRUE
-  }
-  DEF V Valuator {
-  	Factor2 0
-  	Offset2 0.5
-  }
-  DEF SI ScalarAnimator {
-#   key [0 0.25 0.5 0.75 1]
-
-   keyValueType 2
-   keyValue [0.5 0.0 1 0.5]
-   keyType 2
-   keySpline [0.4 0.5, 0.15 0.15]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO V.inSFFloat
-ROUTE V.outSFVec2f TO TR.scale

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-scalarinterpolator.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 200
-     pixelHeight 200
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This shows transparency interpolation" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Scalar Interpolator"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  DEF SI ScalarInterpolator {
-   key [0 0.5 1]
-   keyValue [0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-DEF R1 ROUTE SI.value_changed TO MAT.transparency
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-timesensor-enabled.bt Deleted

@@ -1,82 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of timesensor" "with enabling/disabling" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "TimeSensor enabled test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    DEF N3 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
-  DEF N2 TimeSensor {
-   cycleInterval 10
-   enabled FALSE
-   loop TRUE
-   stopTime -1
-  }
-  DEF N0 PositionInterpolator2D {
-   key [0 1]
-   keyValue [100 -100 100 100]
-  }
-  DEF N4 Transform2D {
-   translation 100 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.5 0.5 0.5
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE N3.isOver TO N2.enabled
-ROUTE N2.fraction_changed TO N0.set_fraction
-ROUTE N0.value_changed TO N4.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-timesensor-starttime_norestart.bt Deleted

@@ -1,81 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of timesensor start time" "Animation shall not be restartable until over" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:09 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "TimeSensor startTime test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    DEF N3 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
-  DEF N2 TimeSensor {
-   cycleInterval 2
-   startTime 2
-   stopTime -1
-  }
-  DEF N0 PositionInterpolator2D {
-   key [0 1]
-   keyValue [100 -100 100 100]
-  }
-  DEF N4 Transform2D {
-   translation 100 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.5 0.5 0.5
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE N3.touchTime TO N2.startTime
-ROUTE N2.fraction_changed TO N0.set_fraction
-ROUTE N0.value_changed TO N4.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-timesensor-starttime_restart.bt Deleted

@@ -1,82 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of timesensor start time" "Animation can be restarted even if not over" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "TimeSensor startTime test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    DEF N3 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
-  DEF N2 TimeSensor {
-   cycleInterval 2
-   startTime 2
-   stopTime -1
-  }
-  DEF N0 PositionInterpolator2D {
-   key [0 1]
-   keyValue [100 -100 100 100]
-  }
-  DEF N4 Transform2D {
-   translation 100 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0.5 0.5 0.5
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 80
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE N3.touchTime TO N2.stopTime
-ROUTE N3.touchTime TO N2.startTime
-ROUTE N2.fraction_changed TO N0.set_fraction
-ROUTE N0.value_changed TO N4.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-interpolation-valuator-sftime.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage Valuator" "with SFTime to SFString formatting" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Valuator Test"
-  }
-  Shape {
-   appearance Appearance {
-    material Material2D {
-     emissiveColor 0 0 0
-     filled TRUE
-    }
-   }
-   geometry DEF TXT Text {
-    fontStyle DEF FONT FontStyle {
-     justify ["MIDDLE"]
-     size 20
-    }
-   }
-  }
-  DEF V Valuator {
-  }
-  DEF TS TimeSensor {
-   cycleInterval 2
-   loop TRUE
-  }
- ]
-}
-
-ROUTE TS.time TO V.inSFTime
-ROUTE V.outMFString TO TXT.string
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-keynavigator.bt Deleted

@@ -1,220 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the KeyNavigator node. Navigate through the keypad between the various items."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "KeyNavigator Node for testing keypad navigation"
-  }
-  Transform2D {
-   translation -100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 1 0 0
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS1 TouchSensor {}
-    DEF V1 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation 100 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M2 Material2D {
-       emissiveColor 0 1 0
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS2 TouchSensor {}
-    DEF V2 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation -100 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M3 Material2D {
-       emissiveColor 1 0 1
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS3 TouchSensor {}
-    DEF V3 Valuator { Factor1 0.75 }
-   ]
-  }
-
-  Transform2D {
-   translation 100 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF M4 Material2D {
-       emissiveColor 0 0 1
-      }
-     }
-     geometry Rectangle {
-      size 60 60
-     }
-    }
-    DEF TS4 TouchSensor {}
-    DEF V4 Valuator { Factor1 0.75 }
-   ]
-  }
-  
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [".", "."]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-
-  DEF C1 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN1 got focus" 
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN1 lost focus" 
-   }
-  }
-  DEF KN1 KeyNavigator {
-   sensor USE TS1
-   right USE KN2
-   down USE KN3
-  }
-
-  DEF C2 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN2 got focus" 
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN2 lost focus" 
-   }
-  }
-  DEF KN2 KeyNavigator {
-   sensor USE TS2
-   left USE KN1
-   down USE KN4
-  }
-
-  DEF C3 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN3 got focus" 
-   }
-  }
-  DEF RC3 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN3 lost focus" 
-   }
-  }
-  DEF KN3 KeyNavigator {
-   sensor USE TS3
-   right USE KN4
-   up USE KN1
-   select USE KN2
-  }
-
-  DEF C4 Conditional {
-   buffer {
-    REPLACE TXT.string[0] BY "KN4 got focus" 
-   }
-  }
-  DEF RC4 Conditional {
-   buffer {
-    REPLACE TXT.string[1] BY "KN4 lost focus" 
-   }
-  }
-  DEF KN4 KeyNavigator {
-   sensor USE TS4
-   left USE KN3
-   up USE KN2
-  }
-  
-  DEF AC1 Conditional { buffer { REPLACE KN4.setFocus BY TRUE}}
- ]
-}
-
-ROUTE TS1.isOver TO M1.filled
-ROUTE TS1.isActive TO V1.inSFBool
-ROUTE V1.outSFFloat TO M1.transparency
-ROUTE TS1.isActive TO AC1.activate
-ROUTE KN1.focusSet TO C1.activate
-ROUTE KN1.focusSet TO RC1.reverseActivate
-
-ROUTE TS2.isOver TO M2.filled
-ROUTE TS2.isActive TO V2.inSFBool
-ROUTE V2.outSFFloat TO M2.transparency
-ROUTE KN2.focusSet TO C2.activate
-ROUTE KN2.focusSet TO RC2.reverseActivate
-
-ROUTE TS3.isOver TO M3.filled
-ROUTE TS3.isActive TO V3.inSFBool
-ROUTE V3.outSFFloat TO M3.transparency
-ROUTE KN3.focusSet TO C3.activate
-ROUTE KN3.focusSet TO RC3.reverseActivate
-
-ROUTE TS4.isOver TO M4.filled
-ROUTE TS4.isActive TO V4.inSFBool
-ROUTE V4.outSFFloat TO M4.transparency
-ROUTE KN4.focusSet TO C4.activate
-ROUTE KN4.focusSet TO RC4.reverseActivate

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-anchor-mp4-next.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   backColor 1 0 1
-  }
-  WorldInfo {
-   info ["This shows Anchor with MP4 hyperlinking" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Anchor Test"
-  }
-  Anchor {
-   url ["bifs-linking-anchor-mp4-prev.bt"]
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 150
-     }
-    }
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Click here to open" "prev.mp4"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-anchor-mp4-prev.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   backColor 0 1 1
-  }
-  WorldInfo {
-   info ["This shows Anchor with MP4 hyperlinking" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Anchor Test"
-  }
-  Anchor {
-   url ["bifs-linking-anchor-mp4-next.mp4"]
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Click here to open" "next.mp4"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-anchor-viewpoint.bt Deleted

@@ -1,92 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric true
-				  pixelWidth 200
-				  pixelHeight 200
-				}
-      }
-    }
-  ]
-}
-
-Group { 
- children [
-  WorldInfo {
-   title "Anchor and Viewpoints test"
-   info ["This shows anchors triggering viewpoint binding" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-	DEF VP1 Viewpoint {description "Front View" position 0 0 300}
-	DEF VP2 Viewpoint {description "Above View" position 0 300 30 orientation 1 0 0 -1.2 }
-	
-	DEF TR Transform {
-  	translation 50 0 0
-  	children [
-  		Anchor {
-  			url "#VP2"
-  			children [
-		     Shape {
-		     	appearance Appearance {
-		     		material Material {
-		     			diffuseColor 0 1 1
-		     		}
-		     	}
-		      geometry DEF BOX Box {size 50 50 50}
-		     }
-		    ]
-		  }
-  	]
-  }
-	
-  Transform {
-  	translation -80 0 20
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material Material2D { emissiveColor 1 0 0 filled TRUE }
-     	}
-      geometry DEF RC_RED Rectangle {size 100 100}
-     }
-	  ]
-  }
-
-	Anchor {
-		url "bifs-3D-viewpoint-bind.mp4#VP2"
-		children [
-			Shape {
-				appearance Appearance {
-					material Material2D { emissiveColor 1 1 1 filled TRUE }
-				}
-				geometry DEF RC_WHITE Rectangle { size 200 200 }
-			}
- 		]
- 	}		
-
-  Transform {
-  	translation -30 0 0
-  	children [
-     Shape {
-     	appearance Appearance {
-     		material DEF MAT Material {
-     			diffuseColor 1 1 0
-     		}
-     	}
-      geometry DEF SPHERE Sphere {radius 30}
-     }
-    ]
-  }
- ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-anchor-www.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 255
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  DEF B1 Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Anchor with WWW hyperlinking" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Anchor Test"
-  }
-  Anchor {
-   url ["http://www.chiariglione.org/mpeg/"]
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 200 100
-     }
-    }
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Click here to go" "to MPEG Web Site"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-animationstream.bt Deleted

@@ -1,135 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- includeInlineProfileLevelFlag true
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows an AnimationStream node" "using a BIFS-command stream" "" "GPAC Regression Tests" "$Date: 2009-09-30 18:01:04 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Animation Stream"
-  }
-  DEF N0 Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 100
-     }
-    }
-   ]
-  }
-  AnimationStream {
-   loop TRUE
-   url [od:10]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Position modified" "through animationStream"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-RAP AT 0 IN 5 {
- REPLACE N0.translation BY 100 0
-}
-
-RAP AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      dependsOn_ES_ID 1
-      OCR_ES_ID 5
-      decConfigDescr DecoderConfigDescriptor {
-       streamType 3
-       decSpecificInfo BIFSConfig {
-        nodeIDbits 1
-        isCommandStream true
-        pixelMetric true
-        pixelWidth 400
-        pixelHeight 400
-       }
-      }
-      slConfigDescr SLConfigDescriptor {
-       useAccessUnitStartFlag true
-       useAccessUnitEndFlag true
-       useTimeStampsFlag true
-       timeStampResolution 1000
-       timeStampLength 32
-      }
-     }
-    ]
-   }
-  ]
-}
-
-RAP AT 500 IN 5 {
- REPLACE N0.translation BY 100 100
-}
-
-RAP AT 1000 IN 5 {
- REPLACE N0.translation BY -100 100
-}
-
-RAP AT 1500 IN 5 {
- REPLACE N0.translation BY -100 0
-}
-
-RAP AT 2000 IN 5 {
- REPLACE N0.translation BY 100 0
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-direct-inline.bt Deleted

@@ -1,75 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["Inlined scene with planeSensor2D" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-  Background2D {
-   backColor 1 1 0
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    DEF T1 Transform2D {
-     children [
-      DEF PS PlaneSensor2D {
-       maxPosition 150 150
-       minPosition -150 -150
-      }
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0.5 0.6 0.4
-         filled TRUE
-        }
-       }
-       geometry DEF REC Rectangle {
-        size 50 100
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO T1.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-direct.bt Deleted

@@ -1,51 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 0
-  }
-  WorldInfo {
-   info ["This shows usage of the inline node" "with rotation and scaling on the inlined scene" "Inline scene is referenced without OD" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-  Transform2D {
-   rotationAngle 0.78
-   scale 1.5 1
-   children [
-    Inline {
-     url ["bifs-linking-inline-direct-inline.bt"]
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-http-no-od.bt Deleted

@@ -1,48 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of the inline node" "using remote (rtsp) scene for inline" "Inline scene is referenced with OD" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-  Transform2D {
-   children [
-    Inline {
-     url ["http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/mp4/counter_video_360.mp4"]
-    }
-   ]
-  }
- ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-http.bt Deleted

@@ -1,58 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of the inline node" "using remote (rtsp) scene for inline" "Inline scene is referenced with OD" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.5 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-  Transform2D {
-   children [
-    Inline {
-     url [od:8]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-     URLstring "http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/mp4/counter_video_360.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-od-inline.bt Deleted

@@ -1,76 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["Inlined scene with planeSensor2D" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-	
-  Background2D {
-   backColor 1 1 0
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    DEF T1 Transform2D {
-     children [
-      DEF PS PlaneSensor2D {
-       maxPosition 150 150
-       minPosition -150 -150
-      }
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 0.5 0.6 0.4
-         filled TRUE
-        }
-       }
-       geometry DEF REC Rectangle {
-        size 50 100
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO T1.translation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-od.bt Deleted

@@ -1,60 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of the inline node" "with rotation and scaling on the inlined scene" "Inline scene is referenced through an OD" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Inline Test"
-  }
-  Transform2D {
-   rotationAngle 0.78
-   scale 1.5 1
-   children [
-    Inline {
-     url [od:8]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    URLstring "bifs-linking-inline-od-inline.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-segment-inline.bt Deleted

@@ -1,74 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
- ociDescr [
- 	SegmentDescriptor { startTime 0 duration 4  name "Begin" }
- 	SegmentDescriptor { startTime 4 duration 2 name "Middle" }
- 	SegmentDescriptor { startTime 6 duration 4 name "End" }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of MediaSensor" "with media segments defined" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Sensor Test #2"
-  }
-  Shape {
-   appearance Appearance {
-    texture DEF MOV MovieTexture {
-     loop TRUE
-     stopTime -1
-     url [od:8]
-     repeatS FALSE
-     repeatT FALSE
-    }
-   }
-   geometry Bitmap {}
-  }
- ]
-}
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-linking-inline-segment.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audiobuffer.bt Deleted

@@ -1,203 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   OCR_ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows audiobuffer" "with loop and pitch" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "AudioBuffer Test"
-  }
-  Sound2D {
-   source DEF AUDBUF AudioBuffer {
-    loop TRUE
-    numChan 2
-    length 2
-    children [
-     AudioSource {
-      url [od:10]
-      stopTime -1
-     }
-    ]
-   }
-  }
-  Transform2D {
-   translation 0 -50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-    Shape {
-     appearance DEF TXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["restart"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 16
-      }
-     }
-    }
-    DEF TS1 TouchSensor {}
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE AUDBUF.stopTime BY 0
-    REPLACE AUDBUF.startTime BY 0
-   }
-  }
-  Transform2D {
-   translation -100 50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE TXTAPP
-     geometry Text {
-      string ["pitch" "0.5"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS2 TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 0 50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE TXTAPP
-     geometry Text {
-      string ["pitch" "1.0"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS3 TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 100 50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE TXTAPP
-     geometry Text {
-      string ["pitch" "2"]
-      fontStyle USE FS
-     }
-    }
-    DEF TS4 TouchSensor {}
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE AUDBUF.pitch BY 0.5
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE AUDBUF.pitch BY 1
-   }
-  }
-  DEF C4 Conditional {
-   buffer {
-    REPLACE AUDBUF.pitch BY 2
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-ROUTE TS3.isActive TO C3.activate
-ROUTE TS4.isActive TO C4.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_audio.aac"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audioclip-urlchanged.bt Deleted

@@ -1,145 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows AudioClip" "and direct modification of URL" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "AudioClip Test"
-  }
-  DEF SD Sound2D {
-   source DEF AS AudioClip {
-    loop TRUE
-    url [od:20]
-   }
-  }
-  Transform2D {
-   translation -50 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Sound1"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE AS.url BY ["od:20"]
-   }
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Sound2"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE AS.url BY ["od:10"]
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_german.mp3"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_arabic.mp3"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audioclip.bt Deleted

@@ -1,133 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows AudioClip" "controled through startTime and stopTime" "audio clock is independent from BIFS clock, thus audio restarts from begining" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "AudioClip Test"
-  }
-  DEF SD Sound2D {
-   source DEF AS AudioClip {
-    loop TRUE
-    url [od:10]
-   }
-  }
-  Transform2D {
-   translation -50 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Stop"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE AS.stopTime BY 0
-   }
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Start"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE AS.startTime BY 0
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_audio.aac"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audiosource-mixing.bt Deleted

@@ -1,194 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-PROTO AudioControler [
-	exposedField MFString the_url []
-	exposedField MFString comment []
-	exposedField SFVec2f position 0 0
-	exposedField SFColor color 0 0 0
-	exposedField SFFloat vol 1.0
-	exposedField SFInt32 numChannels 2
-] {
-	Transform2D {
-		translation IS position
-		children [
-			Transform2D {
-				children [
-					Shape {
-						appearance Appearance { material Material2D {emissiveColor IS color filled TRUE} }
-						geometry Rectangle { size 200 20 }
-					}
-					DEF TS TouchSensor {}
-				]
-			}
-			Transform2D {
-				translation -120 0
-				children [
-					Shape {
-						appearance DEF TXTAPP Appearance { material DEF MAT Material2D {emissiveColor 0 0 0 filled TRUE} }
-						geometry DEF TXT Text { string ["volume", "0"] fontStyle DEF FS FontStyle { size 12 justify ["MIDDLE"]} }
-					}
-					
-				]
-			}
-			Transform2D {
-				translation 0 20
-				children [
-					Shape {
-						appearance USE TXTAPP
-						geometry Text { string IS comment fontStyle USE FS}
-					}
-					
-				]
-			}
-		  DEF SND Sound2D {
-  		 intensity IS vol
-		   source AudioSource {
-		    url IS the_url
-		    startTime 0
-		    numChan IS numChannels
-		   }
-		  }
-		  MediaControl {
-		   url IS the_url
-		   loop TRUE
-		  }
-		]
-	}
-  DEF SC Script {
-   eventIn SFVec3f set_frac
-   eventIn SFBool set_down
-   field SFNode s USE SND
-   field SFNode t USE TXT
-   field SFBool isDown FALSE
-   url ["javascript:
-   	function initialize() {
-   		t.string[1] = '' + s.intensity;
-   	}
-   	function set_down(value, timestamp) {isDown = value;}
-   	function set_frac(value, timestamp) {
-   		if (!isDown) return;
-   		pos = (value.x + 100)/200;
-   		s.intensity = pos;
-   		t.string[1] = '' + pos;
-   	}
-   	"
-   	]
-  }
-	ROUTE TS.isActive TO SC.set_down
-	ROUTE TS.hitPoint_changed TO SC.set_frac
-	
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MediaControl" "controling audio playback speed" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-
-	AudioControler {
-		position 0 100
-		color 1 0 0
-		the_url ["od:10"]
-	  numChannels 2
-	  vol 1
-	  comment ["Audio #1 - running on its own timeline"]
-  }
-	AudioControler {
-		position 0 33
-		color 0 1 0
-		the_url ["od:11"]
-	  numChannels 2
-	  vol 0
-	  comment ["Audio #2 - running on its own timeline"]
-  }
-	AudioControler {
-		position 0 -33
-		color 0 0 1
-		the_url ["od:11"]
-	  numChannels 2
-	  vol 0
-	  comment ["Audio #3 reusing Audio #2 object"]
-  }
-	AudioControler {
-		position 0 -100
-		color 1 0 1
-		the_url ["od:12"]
-	  numChannels 2
-	  vol 0
-	  comment ["Audio #4 - running on Audio #2 timeline"]
-  }
- ]
-}
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 10
-      OCR_ES_ID 10
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 11
-    esDescr [
-     ES_Descriptor {
-      ES_ID 11
-      OCR_ES_ID 11
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 12
-    esDescr [
-     ES_Descriptor {
-      ES_ID 12
-      OCR_ES_ID 11
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audiosource-urlchanged.bt Deleted

@@ -1,146 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows AudioSource" "and direct modification of URL" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "AudioSource Test"
-  }
-  DEF SD Sound2D {
-   source DEF AS AudioSource {
-    url [od:20]
-   }
-  }
-  Transform2D {
-   translation -50 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Sound1"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE AS.startTime BY 0
-    REPLACE AS.url BY ["od:20"]
-   }
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Sound2"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE AS.startTime BY 0
-    REPLACE AS.url BY ["od:10"]
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_french.mp3"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-audiosource.bt Deleted

@@ -1,133 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows AudioSource" "controled through startTime and stopTime" "audio clock is independent from BIFS clock, thus audio restarts from begining" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "AudioSource Test"
-  }
-  DEF SD Sound2D {
-   source DEF AS AudioSource {
-    url [od:10]
-    stopTime 4
-   }
-  }
-  Transform2D {
-   translation -50 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Stop"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE AS.stopTime BY 0
-   }
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Start"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE AS.startTime BY 0
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_italian.mp3"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-OD-reuse.bt Deleted

@@ -1,89 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows two ImageTexture nodes" "using the same OD" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Image Texture test"
-  }
-  Transform2D {
-   translation -80 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 0
-   children [
-    Shape {
-     appearance Appearance {
-     	material Material2D { filled TRUE transparency 0.5 }
-      texture ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-no-od.bt Deleted

@@ -1,60 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 254
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 0 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how a URL in an ImageTexture node can be a regular URL (http, file, ...) and not an OD URL."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $"
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Image referenced by a non-OD URL"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF TXT ImageTexture {
-       url ["../auxiliary_files/logo.jpg"]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-object-scale.bt Deleted

@@ -1,97 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 440
-     pixelHeight 440
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows image texture" "with object scaling and texture transform" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Image Texture Test"
-  }
-  DEF TR Transform2D {
-   rotationAngle 0.78
-   children [
-    Shape {
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [0 200 0 -200]
-      }
-     }
-    }
-    Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:10]
-      }
-      textureTransform DEF TX TextureTransform {
-       translation 0 0.5
-      }
-     }
-     geometry Rectangle {
-      size 200 200
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 4
-   loop TRUE
-  }
-  DEF PI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [-0.5 -0.5 0.5 0.5 -0.5 -0.5]
-  }
-  DEF SI PositionInterpolator2D {
-   key [0 0.5 1]
-   keyValue [0.5 0.5 1.5 1.5 0.5 0.5]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TR.scale
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-transparent.bt Deleted

@@ -1,274 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 440
-     pixelHeight 440
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 0 1 1
-  }
-  WorldInfo {
-   info ["This shows basic 2D shapes" "with transparent image texture mapping" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Image Texture Test"
-  }
-  Transform2D {
-   translation -150 150
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [-50 0 0 50 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance DEF TEXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["IndexedLineSet2D" "[-50 0 0 50 50 0]"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Circle {
-      radius 50
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Circle" "radius 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 150
-   children [
-    Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-    Transform2D {
-     translation 0 -40
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["Rectangle" "Size 100 50"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -40
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Curve2D Points:" "-50 0, -100 50, 0 20, 10 30, 40 80, 50 0"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      point DEF C2D Coordinate2D {
-       point [-50 0 -100 50 0 20 10 30 40 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["no type"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [2 3]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [2 3]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 170 0
-   children [
-    Shape {
-     appearance USE APP
-     geometry Curve2D {
-      type [1 3 1]
-      point USE C2D
-     }
-    }
-    Transform2D {
-     translation 0 -10
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["type [1 3 1]"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry IndexedFaceSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["IndexedFaceSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    Shape {
-     appearance USE APP
-     geometry PointSet2D {
-      coord Coordinate2D {
-       point [-50 0 -25 25 0 80 50 0]
-      }
-     }
-    }
-    Transform2D {
-     translation 0 -20
-     children [
-      Shape {
-       appearance USE TEXTAPP
-       geometry Text {
-        string ["PointSet2D" "-50 0, -25, 25, 0 80, 50 0"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.png"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-imagetexture-url-change.bt Deleted

@@ -1,95 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 254
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 0 1
-  }
-  WorldInfo {
-   info ["This shows basic 2D shapes" "with dynamic URL change" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Image Texture Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF TXT ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE TXT.url BY ["od:20"]
-   }
-  }
-  DEF RC1 Conditional {
-   buffer {
-    REPLACE TXT.url BY ["od:10"]
-   }
-  }
- ]
-}
-
-ROUTE TS.isActive TO C1.activate
-ROUTE TS.isActive TO RC1.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 3
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 4
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.png"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-control.bt Deleted

@@ -1,148 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 180
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MovieTexture with playback control" "through usage of start/stop fields of movieTexture" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   children [
-    DEF TR Transform2D {
-     translation 0 30
-     children [
-      Shape {
-       appearance Appearance {
-        texture DEF MT MovieTexture {
-         loop TRUE
-         url [od:10]
-         repeatS FALSE
-         repeatT FALSE
-        }
-       }
-       geometry Bitmap {}
-
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -70
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Stop"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE MT.stopTime BY 0
-   }
-  }
-  Transform2D {
-   translation 50 -70
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Start"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE MT.startTime BY 0
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-no-od.bt Deleted

@@ -1,65 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info [
-    "This test shows how a URL in a MovieTexture node can be a regular URL (http, file, ...) and not an OD URL."
-    ""
-    "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.7 $"
-    "(C) 2002-2006 GPAC Team"
-   ]
-   title "Video referenced by a non-OD URL"
-  }
-  Sound2D {
-   source AudioClip {
-    loop TRUE
-    url ["../auxiliary_files/enst_audio.aac"]
-    #url ["rtsp://tasmanie/bhusa.mp4"]
-   }
-  }
-  Shape {
-   appearance Appearance {
-    texture DEF MT MovieTexture {
-     loop TRUE
-     url ["../auxiliary_files/enst_video.h264"]
-     #url ["rtsp://tasmanie/bhusa.mp4"]
-    }
-   }
-   geometry Bitmap {}
-
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-od-joinsession.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 180
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MovieTexture nodes" "using the same OD and looping" "with different start and stop times" "one movieTexture joins the session of the other" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture MovieTexture {
-       loop TRUE
-       startTime 4
-       url [od:10]
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       stopTime -1
-       url [od:10]
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-od-leave-session.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 180
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MovieTexture nodes" "using the same OD and looping" "with different start and stop times" "one movieTexture leaves the session of the other" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture MovieTexture {
-       loop TRUE
-       stopTime -1
-       url [od:10]
-      }
-     }
-     geometry Circle {
-      radius 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       stopTime 8
-       url [od:10]
-      }
-     }
-     geometry Rectangle {
-      size 100 50
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-owns-OCR.bt Deleted

@@ -1,75 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 180
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MovieTexture node on bitmap" "looping (visual object de-synchronized from BIFS)" "Video shall restart when done playing" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-shares-OCR.bt Deleted

@@ -1,74 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 180
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MovieTexture node on bitmap" "looping (visual object synchronized on BIFS)" "results at end of video are undefined" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-movietexture-url-change.bt Deleted

@@ -1,158 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 255
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 180
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows dynamic URL change of MovieTexture" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.5 $" "(C) 2002-2004 GPAC Team"]
-   title "MovieTexture Test"
-  }
-  Transform2D {
-   children [
-    DEF TR Transform2D {
-     translation 0 30
-     children [
-      Shape {
-       appearance Appearance {
-        texture DEF MT MovieTexture {
-         loop TRUE
-         url [od:20]
-        }
-       }
-       geometry Bitmap {}
-
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -70
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 30
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Movie 1"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE MT.url BY ["od:20"]
-   }
-  }
-  Transform2D {
-   translation 50 -70
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 80 30
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Movie 2"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE MT.url BY ["od:10"]
-   }
-  }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-sound-spatialize.bt Deleted

@@ -1,77 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0x01
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0x01
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric FALSE
-				  pixelWidth 320
-				  pixelHeight 240
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-			}
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Sound Test"
-   info ["This shows Sound node" "with distance volume control and spatialization on" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Sound { 
-  	location 0 0 1
-  	spatialize TRUE
-   source AudioClip { 
-    url [ "od:10" ]
-    loop TRUE
-   }
-  }
-  
-  Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material { diffuseColor 1 0 0 }
-     }
-     geometry Box { size 2 2 2}
-    }
-   ]
-  }
- ]
-}
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      OCR_ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "./../auxiliary_files/count_spanish.mp3"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-media-sound.bt Deleted

@@ -1,77 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0x01
-  sceneProfileLevelIndication 0x01
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFE
-  graphicsProfileLevelIndication 0x01
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric FALSE
-				  pixelWidth 320
-				  pixelHeight 240
-				}
-      }
-    }
-    ES_Descriptor {
-      es_id 2
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 1
-			}
-    }
-  ]
-}
-
-Group { 
- children [
-
-  WorldInfo {
-   title "Sound Test"
-   info ["This shows Sound node" "with distance volume control" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-  }
-
-  Sound { 
-  	location 0 0 1
-  	spatialize FALSE
-   source AudioClip { 
-    url [ "od:10" ]
-    loop TRUE
-   }
-  }
-  
-  Transform {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material { diffuseColor 1 0 0 }
-     }
-     geometry Box { size 2 2 2}
-    }
-   ]
-  }
- ]
-}
-
-AT 0 {
-	UPDATE OD [
-		ObjectDescriptor {
-		  objectDescriptorID  10
-		  esDescr [
-		    ES_Descriptor {
-		      ES_ID 20
-		      OCR_ES_ID 20
-		      muxInfo MuxInfo {
-		       fileName "./../auxiliary_files/count_english.mp3"
-		      }
-		    }
-		  ]
-		}
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-UTF16-input.bt Deleted

@@ -1,55 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 260
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows non ASCII Text characters" "Input BT file is in UTF-16 Little Endian format" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "MP4Box Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Non-Ansi:" "" "é à è ù ü ä ë ï ö ü ÿ" "" "" "XML escapes:" "" "& ' \\" > <"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 26
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-cyclic-graph.bt Deleted

@@ -1,55 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows a cyclic scene graph" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2005 GPAC Team"]
-   title "Cyclic Scene Graph Test"
-  }
-  DEF TR Transform2D {
-  	children [
-  		Shape {
-  			appearance Appearance {
-  				material Material2D {emissiveColor 1 0 0 filled TRUE }
-  			}
-  			geometry Circle { radius 60 }
-  		}
-  		Transform2D {
-  			scale 0.98 0.98
-  			translation 1 0
-  			children [
-  				ColorTransform {
-  					mrr 0.95
-  					children [ USE TR ]
-  				}
-  			]
-  		}
-  	]
-  }
- ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-events.bt Deleted

@@ -1,57 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO TestSensor [
-    eventIn SFBool trigger
-    exposedField SFFloat value 0.25
-    eventOut SFFloat result
-]
-[ "urn:inet:gpac:builtin:TestSensor"]
-
-
-
-OrderedGroup { children [
-	WorldInfo {
-   		info ["This tests GPAC HardcodedProto eventIn and eventOut" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2014 GPAC Team"]
-   		title "Events in HardcodedProto"
-  	}
-  	Background2D { backColor 1 1 0}
-	Transform2D { children [
-		Shape {
-			appearance Appearance { material DEF MAT Material2D { emissiveColor 1 0 0 filled TRUE} }
-			geometry Rectangle { size 100 50 }
-		}
-		DEF TS TouchSensor {}
-	]}
-	DEF TES TestSensor {}
-] }
-
-
-ROUTE TS.isOver TO TES.trigger
-ROUTE TES.result TO MAT.transparency
-
-
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-offscreengroup.bt Deleted

@@ -1,139 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- visualProfileLevelIndication 245
- sceneProfileLevelIndication 5
- graphicsProfileLevelIndication 3
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 2
-    streamType 3
-    bufferSizeDB 21315
-    decSpecificInfo BIFSv2Config {
-     nodeIDbits 1
-     protoIDbits 1
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 192
-     pixelWidth 300 
-     pixelHeight 300
-    }
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   OCR_ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 1
-    bufferSizeDB 10
-   }
-   slConfigDescr SLConfigDescriptor {
-    useAccessUnitStartFlag true
-    useAccessUnitEndFlag true
-    useTimeStampsFlag true
-    timeStampResolution 1000
-    timeStampLength 32
-   }
-  }
- ]
-}
-
-EXTERNPROTO Proto0 [
- exposedField MFNode _field0 [
- ]
- exposedField SFInt32 _field1 0
- exposedField SFFloat _field2 1
-] ""urn:inet:gpac:builtin:OffscreenGroup""
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       loop TRUE
-       url [od:20]
-      }
-     }
-     geometry Bitmap {
-      scale 2 2
-     }
-    }
-   ]
-  }
-
-  Proto0 {
-   _field1 1
-   _field2 1
-   _field0 [
-      Shape {
-       appearance Appearance {
-        material Material2D {
-         emissiveColor 1 0 0
-         transparency 0.5
-         filled TRUE
-        }
-       }
-       geometry Ellipse { radius 100 60 }
-      }
-   ]
-  }
- ]
-}
-
-
-#if 1
-RAP AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      decConfigDescr DecoderConfigDescriptor {
-       objectTypeIndication 32
-       streamType 4
-       bufferSizeDB 4039
-       maxBitrate 140888
-       avgBitrate 117304
-       decSpecificInfo DecoderSpecificInfo {
-        info %00%00%01%B0%F5%00%00%01%B5%09%00%00%01%00%00%00%01%20%00%86%84%00%67%0C%0F%10%30%51%8F%00%00%01%B2%44%69%76%58%39%39%39%62%30%30%30%6E%00%00%01%B2%58%76%69%44%30%30%32%39
-       }
-      }
-      slConfigDescr SLConfigDescriptor {
-       useAccessUnitStartFlag true
-       useAccessUnitEndFlag true
-       useRandomAccessPointFlag true
-       useTimeStampsFlag true
-       timeStampResolution 25000
-       OCRResolution 25000
-       timeStampLength 32
-      }
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-#endif
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-pathextrusion.bt Deleted

@@ -1,103 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO PathExtrusion [
-    exposedField SFNode geometry NULL
-    exposedField MFVec3f spine []
-    exposedField SFBool beginCap TRUE
-    exposedField SFBool endCap TRUE
-    exposedField SFFloat creaseAngle 1.0
-    exposedField MFRotation orientation []
-    exposedField MFVec2f scale []
-    exposedField SFBool txAlongSpine FALSE
-]
-[ "urn:inet:gpac:builtin:PathExtrusion"]
-
-
-
-Group {
-  children [
-  	
-  WorldInfo {
-   info ["This shows GPAC PathExtrusion HardcodedProto" "The text is extruded along a spline to get a solid text in 3D" "GPAC Regression Tests" "$Date: 2008-05-19 15:28:18 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "PathExtrusion HardcodedProto"
-  }
-  NavigationInfo { type ["EXAMINE", "ANY"] headlight FALSE}
-  	Background2D {backColor 0 0 0 url "./../auxiliary_files/logo.jpg"}
-    DEF VIEWPOINT Viewpoint {
-        description "one"
-        position 0 0 10
-    }
-		
-		DirectionalLight {
-			direction -1 -1 -1
-		}
-
-Shape {
-	appearance Appearance {
-		material Material {
-			diffuseColor 1.0 0.8 0.0
-#			specularColor 1 1 1
-#			shininess 0.3
-		}
-#		texture ImageTexture { url "../../../auxiliary_files/logo.jpg"}
-	}
-	
-	geometry PathExtrusion {
-#   geometry Curve2D { fineness 1.0 point Coordinate2D { point [0 0, 0.25 1, 0.75 1, 1 0, 1.5 0, 0.8 -2, 0 0] } type [2 0 3] 	}
-#		geometry Rectangle { size 0.5 1.0	}
-	
-		geometry Text { 
-			string ["G"]
-     fontStyle FontStyle { 
-       size 2.0
-       justify ["MIDDLE", "MIDDLE"]
-      }
-    }
-    
-		creaseAngle 0.5
-		endCap FALSE
-		beginCap TRUE
-		txAlongSpine FALSE
-		spine [
-		# Straight-line
-			0.0 0.0 0.0, 0.0 1 0,
-#			0.0 0.0 -0.8, 0.0 0.0 -1.2,
-#			0.0 0.0 -1.6, 0.0 0.0 -2.0
-		]
-#		scale [
-#			1.8  1.8,  1.95 1.95,
-#			2.0  2.0,  1.95 1.95
-#			1.8  1.8,  1.5  1.5
-#			1.2  1.2,  1.05 1.05,
-#			1.0  1.0,  1.05  1.05,
-#			1.15 1.15,
-#		]
-	}
-}
-
-]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-planarextrusion.bt Deleted

@@ -1,87 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO PlanarExtrusion [
-    exposedField SFNode geometry NULL
-    exposedField SFNode spine NULL
-    exposedField SFBool beginCap TRUE
-    exposedField SFBool endCap TRUE
-    exposedField SFFloat creaseAngle 1.0
-    exposedField MFFloat orientationKeys []
-    exposedField MFRotation orientation []
-    exposedField MFFloat scaleKeys []
-    exposedField MFVec2f scale []
-    exposedField SFBool txAlongSpine FALSE
-]
-[ "urn:inet:gpac:builtin:PlanarExtrusion"]
-
-
-
-Group {
-  children [
-  WorldInfo {
-   info ["This shows GPAC PlanarExtrusion HardcodedProto" "A circle is extruded along another circle to get a nice 3D torus" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "PlanarExtrusion HardcodedProto"
-  }
-  	
-  	Background2D { backColor 1 1 1}
-    DEF VIEWPOINT Viewpoint {
-        description "one"
-        position 0 0 10
-    }
-		
-
-Shape {
-	appearance Appearance {
-		material Material {
-			diffuseColor 1.0 0.8 0.0
-		}
-#		texture ImageTexture { url "../../../auxiliary_files/logo.jpg"}
-	}
-	
-	geometry PlanarExtrusion {
-		geometry Circle { radius 1}
-#		geometry Curve2D { 
-#			type [2]
-#			point Coordinate2D {
-#				point [0 0 0.75 2 1.5 0 2 2]
-#			}
-#		}
-		spine Circle {radius 5}
-#		spine Rectangle {size 20 10}
-		creaseAngle 1
-		endCap FALSE
-		beginCap FALSE
-#		scaleKeys [0 0.1 0.25 0.5 0.75 0.9 1]
-#		scale [0 0, 0 0, 1 1, 2 2.5, 1 1, 0 0, 0 0]
-#		orientationKeys [0 0.25 0.5 0.75 1]
-#		orientation [0 1 0 0, 0 1 1 0.25, 0 0 1 0.25, 0 1 1 0.25, 0 1 0 0]
-		txAlongSpine TRUE
-	}
-}
-
-]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-planeclipper-box.bt Deleted

@@ -1,77 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO PlaneClipper [
-    exposedField SFVec3f plane_normal 1 0 0
-    exposedField SFFloat plane_distance 0.0
-    exposedField MFNode children []
-]
-[ "urn:inet:gpac:builtin:PlaneClipper"]
-
-
-
-Group {
-  children [
-		WorldInfo {
-   		info ["This shows GPAC PlaneClipper HardcodedProto" "The plane clipper normal and distance are interpolated to cut the mesh at different places" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   		title "PlaneClipper HardcodedProto"
-  	}
-  	Background2D { backColor 1 1 0}
-    DEF VIEWPOINT Viewpoint {
-        description "one"
-        position 2 2 10
-    }
-    DEF PC PlaneClipper {
-    	children [
-     Shape {
-     	appearance Appearance {
-		material Material { diffuseColor 1.0 0.0 0.0 }
-				texture	ImageTexture {  url "../auxiliary_files/logo.jpg" }
-     	}
-      geometry Box {size 1 1 1}
-     }
-
-
-    	]
-    }
-    DEF TS TimeSensor { cycleInterval 4.0 loop TRUE}
-    DEF SI ScalarInterpolator {
-    	key [0 0.5 1]
-    	keyValue [-3 3 -3]
-    }
-    DEF TS2 TimeSensor { cycleInterval 12.0 loop TRUE}
-    DEF PI PositionInterpolator {
-#    	key [0 0.333 0.334 0.666 0.667 1]
-#    	keyValue [1 0 0 1 0 0 0 1 0 0 1 0 0 0 -1 0 0 -1]
-    	key [0 0.33 0.666 1]
-    	keyValue [1 0 0, 0 1 0, 0 0 -1, 1 1 0]
-    }
-	]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO PC.plane_distance
-ROUTE TS2.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO PC.plane_normal

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-planeclipper.bt Deleted

@@ -1,69 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-				streamType 3
-				decSpecificInfo BIFSConfig {
-				  isCommandStream true
-				  pixelMetric false
-				  pixelWidth 600
-				  pixelHeight 400
-				}
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO PlaneClipper [
-    exposedField SFVec3f plane_normal 1 0 0
-    exposedField SFFloat plane_distance 0.0
-    exposedField MFNode children []
-]
-[ "urn:inet:gpac:builtin:PlaneClipper"]
-
-
-
-Group {
-  children [
-		WorldInfo {
-   		info ["This shows GPAC PlaneClipper HardcodedProto" "The plane clipper normal and distance are interpolated to cut the mesh at different places" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   		title "PlaneClipper HardcodedProto"
-  	}
-  	Background2D { backColor 1 1 0}
-    DEF VIEWPOINT Viewpoint {
-        description "one"
-        position 0 0 10
-    }
-    DEF PC PlaneClipper {
-    	children [
-    		Inline { url "./../auxiliary_files/nefertiti.wrl" }
-    	]
-    }
-    DEF TS TimeSensor { cycleInterval 4.0 loop TRUE}
-    DEF SI ScalarInterpolator {
-    	key [0 0.5 1]
-    	keyValue [-3 3 -3]
-    }
-    DEF TS2 TimeSensor { cycleInterval 12.0 loop TRUE}
-    DEF PI PositionInterpolator {
-#    	key [0 0.333 0.334 0.666 0.667 1]
-#    	keyValue [1 0 0 1 0 0 0 1 0 0 1 0 0 0 -1 0 0 -1]
-    	key [0 0.33 0.666 1]
-    	keyValue [1 0 0, 0 1 0, 0 0 -1, 1 1 0]
-    }
-	]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO PC.plane_distance
-ROUTE TS2.fraction_changed TO PI.set_fraction
-ROUTE PI.value_changed TO PC.plane_normal

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-hc-proto-texture.bt Deleted

@@ -1,63 +0,0 @@
-InitialObjectDescriptor {
-  objectDescriptorID 1
-  ODProfileLevelIndication 0xFF
-  sceneProfileLevelIndication 0xFE
-  audioProfileLevelIndication 0xFF
-  visualProfileLevelIndication 0xFF
-  graphicsProfileLevelIndication 0xFE
-
-  esdescr [
-    ES_Descriptor {
-      es_id 1
-      decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 200
-    }
-      }
-    }
-  ]
-}
-
-
-EXTERNPROTO TestTexture [
-    exposedField SFFloat intensity 1.0
-]
-[ "urn:inet:gpac:builtin:CustomTexture"]
-
-
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This tests GPAC HardcodedProto texturing" "GPAC Regression Tests" "(C) 2002-2014 GPAC Team"]
-   title "Events in HardcodedProto"
-  }
-  Background2D { backColor 1 1 1}
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF TX TestTexture {}
-     }
-     geometry Rectangle { size 100 50 }
-    }
-   ]
-  }
-  DEF TS TimeSensor { loop TRUE }
-  DEF SI ScalarInterpolator { 
-   key [ 0 0.5 1]
-   keyValue [ 0 1 0]
-  }
- ]
-}
-
-ROUTE TS.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO TX.intensity
-
-
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-non-linear-parsing-conditional.bt Deleted

@@ -1,69 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This tests encoding of non-linear declared nodes used in conditionals" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Non-linear conditional test"
-  }
-  DEF N0 Conditional {
-   buffer {
-    REPLACE N1.point BY [-75 0 -40 75 40 75 75 0 40 -75 -40 -75]
-   }
-  }
-  DEF N2 Conditional {
-   buffer {
-    REPLACE N1.point BY [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-    DELETE ROUTE R0
-    DELETE ROUTE R1
-   }
-  }
-  Transform2D {
-   scale 0.5 0.5
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF N1 Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-    DEF N3 TouchSensor {}
-   ]
-  }
- ]
-}
-
-DEF R0 ROUTE N3.isActive TO N0.activate
-DEF R1 ROUTE N3.isActive TO N2.reverseActivate
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-non-linear-parsing-use.bt Deleted

@@ -1,60 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-   info ["This tests encoding of non-linear declared nodes used in file" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Non-linear USE test"
-  }
-  DEF BACK Background2D {
-   backColor 1 1 1
-  }
-  DEF TR Transform2D {
-   scale 0.5 0.5
-   children [
-    Transform2D {
-     translation 150 100
-     children [
-		    USE S1
-     ]
-    }
-    DEF S1 Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coord DEF COORD Coordinate2D {
-       point [-100 0 -50 100 50 100 100 0 50 -100 -50 -100]
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-srt-import-3gpp-control-share-ocr.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-srt-import-3gpp-control.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-srt-import-3gpp.bt Deleted

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-misc-srt-import.bt Deleted

@@ -1,76 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 240
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of SRT importer" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "SRT importing Test"
-  }
-  Shape {
-   appearance Appearance {
-    material Material2D {emissiveColor 0 0 0 filled TRUE }
-   }
-   geometry DEF TXT Text {
-    fontStyle DEF FONT FontStyle {
-     justify ["MIDDLE"]
-     size 30
-    }
-   }
-  }
-  AnimationStream {
-   url [od:5]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 5
-    esDescr [
-     ES_Descriptor {
-      ES_ID 4
-      OCR_ES_ID 1
-      dependsOn_ES_ID 1
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/subtitle.srt"
-       textNode "TXT"
-       fontNode "FONT"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-od-language-code.bt Deleted

@@ -1,117 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   OCR_ES_ID 1
-   dependsOn_ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-   langDescr LanguageDescriptor {
-     languageCode fre
-    }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   OCR_ES_ID 2
-   dependsOn_ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-   langDescr LanguageDescriptor {
-     languageCode eng
-   }
-  }
- ]
-}
-AT 0 IN 1 {
-    REPLACE SCENE BY OrderedGroup {
-         children [
-          Background2D {
-           backColor 1 1 0
-          }
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 0.5 0.6 0.4
-             filled TRUE
-            }
-           }
-           geometry DEF REC Rectangle {
-            size 50 100
-           }
-          }
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 1 1 1
-             filled TRUE
-            }
-           }
-           geometry Text {
-             string "Texte en français"
-             fontStyle FontStyle {
-                size 30
-                family "Arial"
-                justify [ "MIDDLE" "MIDDLE" ]
-             }
-           }
-          }
-         ]
-        }
-}
-AT 0 IN 2 {
-    REPLACE SCENE BY
-        OrderedGroup {
-         children [
-          Background2D {
-           backColor 1 1 0
-          }
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 0.5 0.6 0.4
-             filled TRUE
-            }
-           }
-           geometry Circle {
-            radius 50
-           }
-          }
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             emissiveColor 1 1 1
-             filled TRUE
-            }
-           }
-           geometry Text {
-             string "Text in English"
-             fontStyle FontStyle {
-                size 30
-                family "Arial"
-                justify [ "MIDDLE" "MIDDLE" ]
-             }
-           }
-          }
-         ]
-        }
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-od-remove-esd.bt Deleted

@@ -1,78 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This tests ESDRemove command" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "ESD Remove"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture ImageTexture {
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-AT 2000 {
-  REMOVE ESD FROM 10 [20]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-od-remove-od.bt Deleted

@@ -1,78 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This tests ODRemove command" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "OD Remove test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      texture ImageTexture {
-       url [od:10]
-       repeatS FALSE
-       repeatT FALSE
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-AT 2000 {
-  REMOVE OD [10]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-od-update-od.bt Deleted

@@ -1,89 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This tests ODUpdate command" "by sending a new OD with the same ID" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "OD Update"
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance Appearance {
-      texture ImageTexture {
-       url [od:10]
-      }
-     }
-     geometry Circle {
-      radius 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 3
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-
-AT 2000 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 4
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/sky.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-conditional.bt Deleted

@@ -1,107 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- eventIn SFBool act
- eventIn SFBool reverseAct
- exposedField SFVec2f translation 0 0
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- DEF TR Transform2D {
-  rotationAngle IS rotation
-  scale 2 1
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-  ]
- }
- DEF C Conditional {
-  activate IS act
-  buffer {
-   REPLACE TR.scale BY 1 1
-  }
- }
- DEF RC Conditional {
-  reverseActivate IS reverseAct
-  buffer {
-   REPLACE TR.scale BY 2 1
-  }
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of a conditional inside a proto" "getting events outside the proto" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple proto Test"
-  }
-  DEF PT1 GEOMETRY_PROTO {
-   translation 100 0
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj Circle {
-    radius 75
-   }
-  }
-  DEF PT2 Transform2D {
-   translation -100 0
-   children [
-    GEOMETRY_PROTO {
-     Color 1 0 0
-     obj Rectangle {
-      size 50 50
-     }
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
- ]
-}
-
-ROUTE TS.isActive TO PT1.act
-ROUTE TS.isActive TO PT1.reverseAct
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-delete-def.bt Deleted

@@ -1,91 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   Transform2D {
-    translation -100 0
-    children [
-     USE S
-    ]
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows deleteion of a proto instance by ID" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple proto Test"
-  }
-  DEF G GEOMETRY_PROTO {
-   translation 200 0
-   scale 1 1.5
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj Circle {
-    radius 75
-   }
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE G BY NULL
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-delete-index.bt Deleted

@@ -1,95 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   Transform2D {
-    translation -100 0
-    children [
-     USE S
-    ]
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows deleteion of a proto instance by index" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto Delete Test"
-  }
-  DEF TR Transform2D {
-   children [
-    DEF G GEOMETRY_PROTO {
-     translation 200 0
-     scale 1 1.5
-     rotation 0.78
-     Color 1 0 1
-     transparency 0.75
-     lineColor 1 0 0
-     lineWidth 2
-     obj Circle {
-      radius 75
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- REPLACE TR.children[0] BY NULL
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-forestgump.bt Deleted

@@ -1,478 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 250
-     pixelHeight 250
-    }
-   }
-  }
- ]
-}
-
-PROTO FORESTGUMP [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFFloat lineWidth 3
- exposedField SFColor lineColor 0.121569 0.101961 0.0901961
- exposedField SFTime runTime 1
- exposedField SFBool loop TRUE
- exposedField SFTime start 0
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF MYSWITCH Switch {
-    whichChoice 0
-    choice [
-     Transform2D {
-      scale 0.0899561 0.0900365
-      translation 260.243 42.9024
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance DEF APP Appearance {
-           material Material2D {
-            lineProps LineProperties {
-             lineColor IS lineColor
-             width IS lineWidth
-            }
-           }
-          }
-          geometry Curve2D {
-           type [1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2827 -11 -2864 -2 -2864 -2 -2883 -2 -2883 -2 -2892 -2 -2901 -11 -2911 -11 -2920 -11 -2929 -20 -2939 -29 -2939 -29 -2957 -48 -2957 -48 -2966 -57 -2957 -57 -2966 -76 -2966 -85 -2976 -95 -2976 -104 -2976 -104 -2976 -132 -2976 -132 -2976 -132 -2976 -160 -2976 -160 -2966 -178 -2957 -188 -2957 -188 -2957 -188 -2939 -197 -2939 -197 -2939 -197 -2920 -197 -2920 -197 -2920 -197 -2911 -206 -2911 -206 -2911 -206 -2892 -206 -2892 -206 -2892 -206 -2873 -206 -2873 -206 -2873 -206 -2855 -215 -2855 -215 -2855 -215 -2836 -215 -2836 -215 -2836 -215 -2827 -206 -2827 -206 -2827 -206 -2808 -197 -2808 -197 -2799 -188 -2799 -188 -2790 -178 -2790 -178 -2790 -169 -2790 -169 -2780 -160 -2780 -160 -2771 -150 -2771 -150 -2771 -141 -2771 -141 -2771 -132 -2771 -132 -2771 -122 -2771 -122 -2771 -113 -2771 -113 -2771 -104 -2771 -104 -2771 -95 -2771 -95 -2771 -85 -2771 -85 -2771 -76 -2780 -57 -2780 -48 -2780 -48 -2790 -29 -2790 -29 -2790 -29 -2808 -20 -2808 -20 -2808 -20 -2818 -11 -2818 -11 -2827 -2 -2827 -2 -2836 -2 -2836 -2 -2846 -2 -2855 -2 -2873 -2 -2883 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2883 -225 -2883 -262 -2883 -262 -2883 -281 -2883 -281 -2883 -290 -2883 -299 -2883 -308 -2883 -327 -2883 -327 -2892 -336 -2892 -336 -2892 -336 -2892 -383 -2892 -392 -2892 -401 -2892 -429 -2892 -439 -2892 -439 -2892 -467 -2892 -467 -2892 -467 -2892 -485 -2892 -485 -2901 -485 -2901 -485 -2901 -494 -2901 -494 -2901 -504 -2901 -513 -2901 -532 -2901 -541]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-3004 -755 -2994 -727 -2985 -708 -2976 -690 -2976 -680 -2976 -643 -2976 -643 -2957 -625 -3004 -653 -3004 -653 -3004 -653 -3115 -718 -3115 -708 -3115 -662 -3032 -541 -2957 -541 -2939 -541 -2901 -522 -2883 -541 -2883 -541 -2855 -560 -2855 -560 -2846 -569 -2818 -587 -2818 -606 -2818 -625 -2790 -662 -2790 -708 -2790 -773 -2799 -848 -2799 -913 -2799 -931 -2808 -931 -2808 -950 -2808 -959 -2790 -931 -2790 -931 -2780 -904 -2743 -857 -2734 -829 -2734 -820 -2697 -773 -2706 -773]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2985 -346 -2994 -346 -3022 -374 -3032 -374 -3041 -374 -3050 -383 -3050 -392 -3050 -392 -3134 -392 -3143 -392 -3152 -392 -3134 -364 -3134 -364 -3134 -364 -3106 -346 -3106 -346 -3097 -336 -2985 -253 -2957 -253 -2939 -253 -2920 -271 -2911 -271 -2901 -271 -2873 -281 -2864 -281 -2836 -271 -2790 -234 -2771 -225 -2762 -225 -2734 -206 -2725 -197 -2715 -188 -2669 -160 -2669 -160 -2660 -160 -2660 -150 -2660 -169 -2660 -206 -2641 -262 -2641 -299]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0900093 0.0899546
-      translation 190.415 42.8184
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2083 -20 -2120 -20 -2120 -20 -2130 -20 -2130 -20 -2139 -20 -2139 -20 -2148 -20 -2148 -20 -2148 -20 -2167 -20 -2167 -20 -2167 -20 -2195 -30 -2195 -30 -2195 -30 -2204 -48 -2213 -58 -2213 -58 -2232 -67 -2241 -76 -2241 -76 -2241 -113 -2241 -113 -2241 -113 -2250 -132 -2250 -141 -2250 -151 -2241 -169 -2241 -169 -2241 -179 -2223 -188 -2223 -188 -2223 -188 -2213 -216 -2204 -216 -2195 -216 -2195 -225 -2185 -225 -2185 -225 -2157 -225 -2157 -225 -2157 -225 -2139 -225 -2139 -225 -2139 -225 -2120 -225 -2120 -225 -2120 -225 -2111 -216 -2111 -216 -2111 -216 -2092 -216 -2092 -216 -2092 -216 -2074 -206 -2074 -206 -2074 -206 -2064 -197 -2064 -197 -2064 -197 -2055 -179 -2055 -179 -2046 -179 -2046 -179 -2046 -169 -2046 -169 -2037 -160 -2037 -160 -2037 -151 -2037 -151 -2037 -141 -2037 -141 -2037 -132 -2037 -132 -2037 -123 -2037 -123 -2037 -113 -2037 -113 -2037 -104 -2037 -104 -2037 -95 -2037 -95 -2037 -95 -2037 -76 -2037 -76 -2037 -76 -2055 -39 -2055 -39 -2055 -39 -2074 -30 -2074 -30 -2074 -30 -2092 -20 -2092 -20 -2092 -20 -2102 -11 -2102 -11 -2111 -11 -2111 -11 -2120 -11 -2120 -11 -2120 -2 -2120 -2 -2157 -2 -2157 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-2130 -244 -2130 -290 -2130 -318 -2130 -355 -2130 -383 -2130 -402 -2139 -420 -2139 -439 -2139 -448 -2139 -476 -2139 -485 -2139 -495 -2139 -504 -2139 -513 -2139 -523 -2139 -523 -2139 -532 -2139 -532 -2139 -541 -2139 -541 -2130 -551 -2130 -551]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2306 -792 -2269 -764 -2232 -718 -2204 -690 -2195 -681 -2204 -690 -2213 -690 -2241 -681 -2325 -671 -2343 -653 -2343 -653 -2362 -644 -2362 -644 -2371 -634 -2278 -569 -2278 -569 -2241 -560 -2213 -551 -2176 -551 -2139 -551 -2027 -578 -2027 -616 -2027 -625 -2018 -625 -2018 -634 -1999 -671 -1999 -709 -1999 -755 -1999 -811 -2074 -904 -2111 -922 -2148 -941 -2139 -950 -2102 -950 -2064 -950 -2009 -950 -1971 -950]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-2223 -402 -2260 -420 -2325 -439 -2353 -411 -2371 -392 -2381 -374 -2381 -355 -2381 -318 -2371 -290 -2343 -281 -2306 -262 -2232 -244 -2185 -244 -2176 -244 -2139 -225 -2130 -225 -2120 -225 -2046 -234 -2027 -234 -1981 -234 -1897 -253 -1878 -299 -1869 -318 -1851 -346 -1851 -383 -1851 -411 -1860 -448 -1860 -467]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899291 0.0900198
-      translation 123.698 44.4248
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-1283 -11 -1320 -11 -1320 -11 -1330 -11 -1330 -11 -1339 -11 -1339 -11 -1348 -11 -1348 -11 -1348 -11 -1367 -11 -1367 -11 -1367 -20 -1367 -20 -1376 -20 -1376 -20 -1376 -20 -1413 -39 -1413 -39 -1413 -39 -1432 -76 -1432 -76 -1432 -85 -1441 -104 -1441 -113 -1441 -123 -1451 -141 -1451 -151 -1451 -169 -1451 -160 -1441 -169 -1441 -169 -1432 -188 -1432 -188 -1432 -188 -1423 -206 -1423 -206 -1423 -206 -1404 -216 -1404 -216 -1395 -216 -1386 -225 -1376 -225 -1376 -225 -1348 -225 -1348 -225 -1348 -225 -1330 -225 -1330 -225 -1330 -225 -1311 -225 -1311 -225 -1311 -225 -1293 -216 -1293 -216 -1293 -216 -1283 -206 -1283 -206 -1283 -206 -1265 -197 -1265 -197 -1265 -197 -1255 -188 -1255 -188 -1255 -188 -1246 -169 -1246 -169 -1237 -169 -1237 -169 -1237 -160 -1237 -160 -1237 -151 -1237 -151 -1237 -141 -1237 -141 -1237 -132 -1237 -132 -1237 -123 -1237 -123 -1237 -113 -1237 -113 -1237 -104 -1237 -104 -1237 -95 -1237 -95 -1237 -85 -1237 -85 -1237 -85 -1237 -67 -1237 -67 -1237 -67 -1255 -48 -1255 -39 -1255 -39 -1265 -20 -1265 -20 -1265 -20 -1283 -11 -1283 -11 -1283 -11 -1302 -2 -1302 -2 -1311 -2 -1311 -2 -1320 -2 -1320 -2 -1330 -2 -1339 -2 -1358 -2 -1367 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [1 2 1 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [-1311 -234 -1311 -271 -1311 -271 -1311 -281 -1311 -281 -1311 -299 -1311 -318 -1311 -355 -1311 -374 -1311 -392 -1311 -430 -1311 -448 -1311 -457 -1311 -485 -1311 -495 -1311 -495 -1311 -513 -1311 -513 -1311 -523 -1311 -523 -1311 -532 -1311 -532 -1311 -541 -1311 -560 -1311 -578 -1311 -560]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-1572 -662 -1534 -709 -1469 -755 -1441 -783 -1423 -802 -1451 -764 -1451 -764 -1460 -736 -1506 -578 -1469 -560 -1451 -550 -1330 -597 -1320 -597 -1293 -606 -1274 -616 -1274 -662 -1274 -690 -1274 -727 -1283 -746 -1283 -755 -1293 -792 -1302 -811 -1339 -885 -1274 -904 -1274 -987]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2]
-           point Coordinate2D {
-            point [-1609 -541 -1618 -467 -1599 -504 -1590 -448 -1562 -309 -1423 -253 -1283 -253 -1237 -253 -1144 -281 -1144 -327 -1144 -346 -1135 -355 -1144 -374 -1153 -392 -1227 -467 -1227 -485]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899947 0.0899257
-      translation 62.0964 37.7238
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 1 2 1 2 1]
-           point Coordinate2D {
-            point [-511 -30 -549 -30 -567 -30 -577 -30 -586 -30 -604 -48 -604 -48 -614 -48 -623 -67 -623 -76 -623 -86 -642 -76 -642 -95 -642 -95 -642 -123 -642 -123 -642 -132 -642 -141 -642 -151 -642 -160 -623 -179 -623 -179 -623 -179 -614 -188 -614 -188 -614 -188 -595 -188 -595 -188 -595 -188 -586 -197 -586 -197 -586 -197 -567 -197 -567 -197 -567 -197 -549 -207 -549 -207 -549 -207 -539 -197 -539 -197 -539 -197 -521 -197 -521 -197 -521 -197 -502 -188 -502 -188 -493 -179 -493 -179 -484 -169 -484 -169 -474 -169 -474 -169 -474 -160 -474 -160 -465 -160 -465 -160 -465 -151 -465 -151 -465 -141 -465 -141 -465 -132 -465 -132 -456 -132 -456 -132 -456 -114 -456 -114 -456 -86 -465 -86 -465 -86 -465 -86 -474 -67 -474 -58 -474 -48 -484 -48 -484 -39 -484 -39 -493 -21 -493 -21 -502 -21 -502 -21 -511 -11 -511 -11 -521 -2 -521 -2 -558 -2 -511 -30 -521 -2]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 2]
-           point Coordinate2D {
-            point [-539 -225 -539 -262 -549 -281 -549 -318 -549 -337 -558 -355 -558 -374 -558 -383 -558 -411 -558 -430 -558 -439 -558 -448 -558 -467 -558 -476 -558 -504 -567 -513 -558 -523]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 1 2 2 2 2 2]
-           point Coordinate2D {
-            point [-865 -551 -865 -569 -846 -653 -846 -672 -846 -690 -837 -699 -837 -709 -837 -718 -828 -718 -828 -709 -828 -681 -763 -606 -735 -588 -716 -579 -651 -541 -632 -541 -577 -541 -521 -532 -465 -560 -446 -569 -400 -616 -381 -634 -381 -634 -353 -699 -372 -699 -400 -699 -428 -672 -428 -672 -437 -672 -437 -672 -474 -653 -474 -653 -484 -653 -493 -662 -493 -672 -493 -690 -502 -755 -502 -774 -502 -783 -502 -792 -493 -811 -484 -830 -474 -848 -474 -830]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-1023 -365 -976 -318 -930 -300 -874 -272 -865 -272 -837 -253 -828 -253 -716 -216 -577 -262 -456 -262 -428 -262 -335 -318 -363 -346 -372 -355 -437 -346 -456 -346 -456 -346 -511 -337 -511 -337 -530 -337 -539 -318 -549 -318]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899962 0.0899977
-      translation -16.1993 42.7489
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [279 -20 260 -20 232 -1 223 -1 214 -1 205 -20 195 -20 186 -20 167 -29 167 -39 167 -48 149 -66 149 -76 139 -94 139 -94 139 -113 139 -132 130 -141 130 -159 130 -169 139 -178 139 -187 139 -187 149 -206 149 -206 149 -206 158 -225 158 -225 158 -225 177 -234 177 -234 177 -234 195 -234 195 -234 195 -234 214 -234 214 -234 214 -234 232 -234 232 -234 242 -234 251 -225 260 -225 270 -225 270 -225 279 -215 279 -215 288 -215 288 -215 298 -206 298 -206 307 -197 307 -197 316 -187 316 -187 316 -178 316 -178 325 -169 325 -169 335 -159 335 -159 335 -141 335 -141 335 -132 335 -122 335 -113 335 -94 325 -85 325 -76 325 -76 325 -48 325 -48 325 -48 316 -29 316 -29 316 -29 298 -20 298 -20 288 -11 288 -11 279 -11 279 -11 270 -11 260 -11 232 -11 223 -11]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [232 -252 232 -280 214 -327 214 -345 214 -364 205 -411 205 -429 205 -438 205 -466 205 -476 205 -494 205 -494 205 -513 205 -513 195 -531 195 -531 195 -569 195 -569]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 1 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [56 -848 65 -857 130 -913 149 -931 158 -941 186 -968 149 -913 149 -913 130 -866 130 -773 130 -717 130 -680 112 -662 112 -624 112 -578 139 -522 195 -522 260 -522 409 -531 409 -615 409 -615 428 -634 400 -634 372 -634 298 -615 279 -624 260 -634 279 -736 279 -755]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [-56 -327 -46 -290 -37 -243 -28 -197 -28 -187 0 -159 9 -141 9 -132 19 -141 19 -150 28 -169 112 -243 149 -243 167 -243 214 -262 251 -262 279 -262 298 -252 316 -271 325 -280 353 -299 353 -299 353 -299 381 -327 391 -327 446 -355 325 -373 316 -373 279 -383 205 -373 177 -345]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0900707 0.0899924
-      translation -85.7923 41.9814
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1060 -20 1060 -20 1014 -2 1004 -2 995 -2 986 -11 976 -11 976 -11 949 -20 949 -20 939 -20 921 -48 921 -58 921 -58 902 -86 902 -86 902 -86 902 -104 902 -104 902 -113 902 -123 902 -132 902 -132 911 -151 911 -151 911 -151 921 -169 921 -169 921 -169 939 -188 939 -188 939 -188 949 -197 949 -197 949 -197 967 -206 967 -206 967 -206 986 -206 995 -206 1004 -206 1004 -206 1014 -206 1014 -206 1023 -206 1023 -206 1032 -206 1032 -206 1051 -197 1051 -197 1060 -197 1060 -197 1069 -188 1069 -188 1079 -179 1079 -179 1079 -169 1079 -169 1088 -169 1088 -169 1088 -169 1088 -151 1088 -151 1088 -141 1097 -123 1097 -104 1097 -86 1097 -86 1088 -67 1088 -67 1079 -48 1079 -48 1079 -48 1069 -39 1069 -39 1060 -30 1060 -30 1051 -30 1051 -30 1042 -20 1032 -20 1014 -11 1004 -11]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [995 -225 995 -253 1014 -318 1014 -346 1014 -365 1014 -411 1014 -430 1014 -439 1014 -467 1014 -476 1014 -485 1014 -485 1014 -504 1014 -504 1014 -513 1014 -523 1014 -541 1023 -541]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 1 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [809 -932 846 -932 893 -913 921 -913 958 -913 930 -895 930 -895 921 -895 893 -895 865 -774 865 -764 837 -699 921 -569 976 -541 1014 -523 1088 -578 1097 -588 1107 -597 1144 -625 1153 -634 1209 -690 1069 -644 1051 -662 1032 -681 1116 -792 1153 -792]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2]
-           point Coordinate2D {
-            point [688 -532 688 -485 716 -374 753 -355 800 -327 883 -262 939 -262 976 -262 1032 -281 1069 -262 1125 -234 1190 -309 1209 -327 1237 -355 1181 -383 1162 -402 1144 -420 1107 -448 1107 -476]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.0899064 0.08998
-      translation -164.619 43.1904
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 2 1 2 2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1878 -20 1851 -11 1841 -1 1813 -1 1804 -1 1804 -11 1795 -11 1785 -11 1767 -39 1767 -48 1758 -57 1739 -66 1739 -85 1739 -85 1739 -113 1739 -113 1739 -122 1748 -132 1748 -141 1748 -141 1758 -159 1758 -169 1758 -169 1767 -187 1767 -187 1767 -187 1776 -206 1776 -206 1776 -206 1785 -215 1785 -215 1785 -215 1804 -225 1804 -225 1804 -225 1823 -225 1823 -225 1823 -225 1841 -225 1841 -225 1841 -225 1860 -215 1860 -215 1869 -215 1869 -215 1878 -206 1878 -206 1888 -197 1888 -197 1897 -187 1897 -187 1906 -178 1906 -178 1916 -169 1916 -169 1916 -159 1916 -159 1925 -150 1925 -150 1925 -150 1925 -132 1925 -132 1925 -122 1925 -122 1934 -113 1934 -113 1934 -113 1934 -85 1925 -76 1925 -76 1906 -66 1906 -57 1906 -48 1906 -39 1897 -29 1897 -29 1878 -20 1878 -20 1869 -20 1869 -20 1860 -11 1860 -11 1851 -11 1841 -11 1823 -1 1804 -1]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 1 2 1 2]
-           point Coordinate2D {
-            point [1832 -234 1832 -271 1841 -327 1841 -364 1841 -383 1841 -411 1841 -429 1841 -429 1841 -466 1841 -466 1841 -466 1841 -485 1841 -485 1851 -485 1851 -485 1851 -494 1851 -494 1841 -494 1841 -494 1841 -531 1841 -531]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [1758 -959 1767 -931 1804 -894 1813 -866 1813 -857 1851 -792 1851 -792 1851 -792 1851 -792 1851 -792 1851 -792 1841 -801 1841 -801 1813 -829 1776 -708 1776 -699 1776 -662 1767 -606 1776 -578 1776 -578 1776 -550 1776 -550 1776 -550 1785 -559 1795 -559 1841 -559 1916 -550 1953 -513 1962 -504 1999 -485 1999 -485 1999 -485 2018 -466 2018 -466 2018 -466 2037 -457 2037 -457 2037 -457 2027 -457 2027 -457 2009 -476 1944 -606 1944 -652 1944 -652 1934 -680 1934 -680 1934 -680 1962 -662 1962 -662 1971 -652 2018 -615 2037 -606 2037 -606 2092 -597 2074 -597]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [1674 -476 1646 -448 1618 -411 1590 -383 1581 -373 1572 -345 1572 -345 1553 -327 1692 -262 1730 -252 1776 -243 1767 -225 1804 -243 1813 -243 1897 -243 1906 -243 1944 -243 1990 -271 1999 -280 2027 -308 2092 -383 2092 -411]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-     Transform2D {
-      scale 0.089974 0.090028
-      translation -247.069 37.0465
-      children [
-       Transform2D {
-        children [
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2 2 1 2 1 2 1 2 1 2 1 2 2 2 2 2 2 1 2 1 2 1]
-           point Coordinate2D {
-            point [2715 -4 2687 -4 2660 -13 2641 -13 2641 -13 2622 -23 2622 -23 2613 -32 2585 -69 2585 -69 2585 -78 2576 -106 2576 -116 2576 -134 2567 -125 2576 -143 2576 -143 2576 -171 2576 -171 2576 -171 2594 -190 2594 -190 2594 -190 2604 -209 2604 -209 2604 -209 2613 -218 2613 -218 2613 -218 2632 -218 2632 -218 2632 -218 2650 -218 2650 -218 2650 -218 2669 -218 2669 -218 2669 -218 2687 -209 2687 -209 2687 -209 2706 -209 2706 -209 2715 -199 2715 -199 2725 -199 2725 -199 2734 -199 2734 -199 2743 -190 2743 -190 2753 -190 2753 -190 2762 -181 2762 -181 2762 -171 2762 -171 2771 -171 2771 -171 2771 -162 2771 -162 2780 -153 2780 -153 2780 -153 2780 -134 2780 -134 2780 -125 2780 -97 2780 -88 2780 -78 2771 -69 2771 -60 2771 -60 2762 -50 2762 -50 2762 -50 2753 -32 2753 -32 2753 -23 2753 -23 2743 -13 2743 -13 2734 -13 2734 -13 2715 5 2715 -4 2734 -13]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 1 2 1 2]
-           point Coordinate2D {
-            point [2660 -255 2660 -274 2660 -311 2660 -329 2660 -348 2660 -376 2660 -395 2660 -413 2660 -413 2660 -432 2660 -432 2660 -450 2660 -460 2660 -497 2660 -506]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2 2 2 2 2 2 2 2]
-           point Coordinate2D {
-            point [2464 -822 2483 -794 2520 -748 2539 -720 2539 -711 2576 -683 2567 -683 2529 -683 2483 -711 2446 -711 2427 -711 2474 -636 2474 -636 2492 -608 2539 -571 2567 -553 2576 -553 2585 -534 2594 -534 2622 -525 2641 -506 2669 -506 2697 -506 2734 -506 2762 -506 2780 -506 2873 -553 2883 -571 2883 -571 2892 -590 2892 -599 2892 -599 2901 -627 2901 -627 2901 -627 2911 -608 2911 -608 2920 -581 2957 -534 2957 -506]
-           }
-          }
-         }
-         Shape {
-          appearance USE APP
-          geometry Curve2D {
-           type [2 2 2 2 2 2]
-           point Coordinate2D {
-            point [2641 -292 2585 -311 2529 -320 2464 -320 2427 -320 2483 -274 2483 -274 2529 -227 2687 -227 2799 -227 2836 -227 2920 -227 2948 -236 2966 -246 3004 -264 3004 -274 3013 -292 3050 -320 3050 -329]
-           }
-          }
-         }
-        ]
-       }
-      ]
-     }
-    ]
-   }
-  ]
- }
- DEF TS TimeSensor {
-  cycleInterval IS runTime
-  loop IS loop
-  startTime IS start
- }
- DEF VAL Valuator {
-  Factor1 8
- }
- DEF R1 ROUTE TS.fraction_changed TO VAL.inSFFloat
- ROUTE VAL.outSFInt32 TO MYSWITCH.whichChoice
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["Each animated logo is an instance of a single proto" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Complexe proto Test"
-  }
-  FORESTGUMP {
-   translation -75 -75
-   scale 1.1 1.1
-   rotation 0.75
-   runTime 0.5
-  }
-  FORESTGUMP {
-   translation -100 50
-   scale 1 1.5
-   runTime 0.75
-   start 2
-  }
-  FORESTGUMP {
-   translation 0 10
-   scale 1.8 1.8
-   start 4
-  }
-  DEF ANIM FORESTGUMP {
-   translation 75 -75
-   rotation -1.25
-   runTime 0.8
-   start 6
-  }
-  DEF TIMER TimeSensor {
-   cycleInterval 2
-   loop TRUE
-   startTime 6
-  }
-  DEF SI ScalarInterpolator {
-   key [0 1]
-   keyValue [0 6.283]
-  }
- ]
-}
-
-ROUTE TIMER.fraction_changed TO SI.set_fraction
-ROUTE SI.value_changed TO ANIM.rotation
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-mfurl.bt Deleted

@@ -1,78 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-PROTO testURL [
- exposedField MFString theURL [""]
-] {
- Transform2D {
-  children [
-   Shape {
-    appearance Appearance {
-     texture DEF MYTEXT ImageTexture {
-      url IS theURL
-     }
-    }
-    geometry Bitmap {}
-
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This is a proto with an MF URL ISed field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto with URL Test"
-  }
-  DEF testInstance testURL {
-   theURL ["10"]
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/logo.jpg"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-multiple.bt Deleted

@@ -1,180 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO PaletteElement [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFColor color 0 0 0
- exposedField SFFloat proto_ident 0
- eventOut SFBool isOver
- eventOut SFInt32 active_proto
-] {
- Transform2D {
-  scale IS scale
-  translation IS translation
-  children [
-   DEF TS TouchSensor {
-    isOver IS isOver
-   }
-   Shape {
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS color
-      filled TRUE
-      lineProps LineProperties {
-       width 3
-      }
-     }
-    }
-    geometry IndexedFaceSet2D {
-     coordIndex [0 1 2 3 4 5 -1]
-     coord Coordinate2D {
-      point [100 0 50 86.6 -50 86.6 -100 0 -50 -86.6 50 -86.6]
-     }
-    }
-   }
-  ]
- }
- DEF V Valuator {
-  outSFInt32 IS active_proto
-  Factor1 0
-  Factor2 0
-  Factor3 0
-  Factor4 0
-  Offset1 IS proto_ident
- }
- ROUTE TS.isActive TO V.inSFBool
-}
-PROTO Palette [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- eventOut SFColor selectedColor
- eventOut MFString active
-] {
- DEF TR Transform2D {
-  scale IS scale
-  translation IS translation
-  children [
-   DEF RedPaletteElement PaletteElement {
-    color 1 0 0
-    proto_ident 1
-   }
-   DEF GreenPaletteElement PaletteElement {
-    translation 150 86.6
-    color 0 1 0
-    proto_ident 2
-   }
-   DEF BluePaletteElement PaletteElement {
-    translation -150 86.6
-    color 0 0 1
-    proto_ident 3
-   }
-  ]
- }
- DEF ColorValuator Valuator {
-  outSFColor IS selectedColor
- }
- DEF RConditional Conditional {
-  buffer {
-   REPLACE ColorValuator.inSFColor BY 1 0 0
-  }
- }
- DEF GConditional Conditional {
-  buffer {
-   REPLACE ColorValuator.inSFColor BY 0 1 0
-  }
- }
- DEF BConditional Conditional {
-  buffer {
-   REPLACE ColorValuator.inSFColor BY 0 0 1
-  }
- }
- DEF V2 Valuator {
-  outMFString IS active
- }
- ROUTE RedPaletteElement.isOver TO RConditional.activate
- ROUTE GreenPaletteElement.isOver TO GConditional.activate
- ROUTE BluePaletteElement.isOver TO BConditional.activate
- ROUTE RedPaletteElement.active_proto TO V2.inSFInt32
- ROUTE GreenPaletteElement.active_proto TO V2.inSFInt32
- ROUTE BluePaletteElement.active_proto TO V2.inSFInt32
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows a Proto using Protos" "Each palette element is a proto" "The whole palette is another proto" "with routes and conditionals" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Nested Proto test"
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF Material2DNode Material2D {
-       filled TRUE
-       lineProps LineProperties {
-        width 3
-       }
-      }
-     }
-     geometry Rectangle {
-      size 10 10
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation 0 -50
-   children [
-    DEF P Palette {}
-   ]
-  }
-  Transform2D {
-   translation 0 50
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string ["Active Palette"]
-      fontStyle FontStyle {
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE P.selectedColor TO Material2DNode.emissiveColor
-ROUTE P.active TO TXT.string
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-nested.bt Deleted

@@ -1,132 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO Palette [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- eventOut SFColor selectedColor
-] {
- PROTO PaletteElement [
-  exposedField SFVec2f translation 0 0
-  exposedField SFVec2f scale 1 1
-  exposedField SFColor color 0 0 0
-  eventOut SFBool isOver
- ] {
-  Transform2D {
-   scale IS scale
-   translation IS translation
-   children [
-    TouchSensor {
-     isOver IS isOver
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor IS color
-       filled TRUE
-       lineProps LineProperties {
-        width 3
-       }
-      }
-     }
-     geometry IndexedFaceSet2D {
-      coordIndex [0 1 2 3 4 5 -1]
-      coord Coordinate2D {
-       point [100 0 50 86.6 -50 86.6 -100 0 -50 -86.6 50 -86.6]
-      }
-     }
-    }
-   ]
-  }
- }
- DEF TR Transform2D {
-  scale IS scale
-  translation IS translation
-  children [
-   DEF RedPaletteElement PaletteElement {
-    color 1 0 0
-   }
-  ]
- }
- DEF ColorValuator Valuator {
-  outSFColor IS selectedColor
- }
- DEF RConditional Conditional {
-  buffer {
-   REPLACE ColorValuator.inSFColor BY 1 0 0
-  }
- }
- DEF Conditional Conditional {
-  buffer {
-   REPLACE ColorValuator.inSFColor BY 0.8 0.8 0.8
-  }
- }
- ROUTE RedPaletteElement.isOver TO RConditional.activate
- ROUTE RedPaletteElement.isOver TO Conditional.reverseActivate
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows a Proto using DEF/USE Protos" "declared inside the proto itself" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Nested Proto test"
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    Shape {
-     appearance Appearance {
-      material DEF Material2DNode Material2D {
-       filled TRUE
-       lineProps LineProperties {
-        width 3
-       }
-      }
-     }
-     geometry Rectangle {
-      size 10 10
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation -100 -50
-   children [
-    DEF P Palette {}
-   ]
-  }
-  Transform2D {
-   scale 0.5 0.5
-   translation 50 -50
-   children [
-    Palette {}
-   ]
-  }
- ]
-}
-
-ROUTE P.selectedColor TO Material2DNode.emissiveColor
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-route.bt Deleted

@@ -1,110 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material DEF M Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   DEF TOUCH TouchSensor {}
-  ]
- }
- DEF TS TimeSensor {
-  loop TRUE
- }
- DEF C Conditional {
-  buffer {
-   DELETE ROUTE RTS
-  }
- }
- DEF RC Conditional {
-  buffer {
-   INSERT ROUTE DEF RTS TS.fraction_changed TO M.transparency
-  }
- }
- DEF RTS ROUTE TS.fraction_changed TO M.transparency
- ROUTE TOUCH.isActive TO C.activate
- ROUTE TOUCH.isActive TO RC.reverseActivate
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of ROUTES inside a proto" "with deletion/insertion through conditionals" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple proto Test"
-  }
-  GEOMETRY_PROTO {
-   translation 200 0
-   scale 1 1.5
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj DEF C Circle {
-    radius 75
-   }
-  }
-  Transform2D {
-   translation -300 0
-   children [
-    GEOMETRY_PROTO {
-     translation 200 0
-     scale 1 1.5
-     rotation 0.78
-     Color 0 0 1
-     obj USE C
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-sftime-protocode.bt Deleted

@@ -1,99 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- DEF TR Transform2D {
-  scale IS scale
-  translation IS translation
-  children [
-   Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   DEF TS TimeSensor {
-    cycleInterval 4
-    loop TRUE
-   }
-  ]
- }
- DEF SI ScalarInterpolator {
-  key [0 0.5 1]
-  keyValue [0 1.76 0]
- }
- ROUTE TS.fraction_changed TO SI.set_fraction
- ROUTE SI.value_changed TO TR.rotationAngle
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["The animation start time embedded in proto body" "Animation shall begin at node creation time" "if objects rotations are in sync the player is broken" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto SFTime Test"
-  }
-  DEF ROOT Transform2D {
-   children [
-    GEOMETRY_PROTO {
-     translation -120 0
-     Color 0 1 1
-     obj Rectangle {
-      size 200 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- APPEND TO ROOT.children GEOMETRY_PROTO {
-  translation 120 0
-  Color 1 0 1
-  lineColor 1 0 0
-  obj Rectangle {
-   size 200 100
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-sftime-protointerface.bt Deleted

@@ -1,104 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFTime start 0
- exposedField SFNode obj NULL
-] {
- DEF TR Transform2D {
-  scale IS scale
-  translation IS translation
-  children [
-   Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   DEF TS TimeSensor {
-    cycleInterval 4
-    loop TRUE
-    startTime IS start
-   }
-  ]
- }
- DEF SI ScalarInterpolator {
-  key [0 0.5 1]
-  keyValue [0 1.5708 0]
- }
- ROUTE TS.fraction_changed TO SI.set_fraction
- ROUTE SI.value_changed TO TR.rotationAngle
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["The animation start time is part of proto interface" "Second object appears at 2 sec and starts moving at 4 sec(2+2)" "If objects rotations are not in sync the player is broken" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Proto SFTime Test"
-  }
-  DEF ROOT Transform2D {
-   children [
-    GEOMETRY_PROTO {
-     translation -120 0
-     Color 0 1 1
-     obj Rectangle {
-      size 200 100
-     }
-    }
-   ]
-  }
- ]
-}
-
-
-AT 2000 {
- APPEND TO ROOT.children GEOMETRY_PROTO {
-  translation 120 0
-  Color 1 0 1
-  transparency 0.75
-  lineColor 1 0 0
-  lineWidth 2
-  start 2
-  obj Rectangle {
-   size 200 100
-  }
- }
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-simple.bt Deleted

@@ -1,88 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows simple proto usage" "The shapes are all instances of a single proto" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple proto Test"
-  }
-  GEOMETRY_PROTO {
-   translation -100 0
-   Color 0 1 1
-   obj Rectangle {
-    size 100 100
-   }
-  }
-  GEOMETRY_PROTO {
-   translation 100 0
-   scale 1 1.5
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj Circle {
-    radius 75
-   }
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-proto-use.bt Deleted

@@ -1,93 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO GEOMETRY_PROTO [
- exposedField SFVec2f translation 0 0
- exposedField SFVec2f scale 1 1
- exposedField SFFloat rotation 0
- exposedField SFColor Color 1 1 1
- exposedField SFBool filled TRUE
- exposedField SFFloat transparency 0
- exposedField SFColor lineColor 0 0 0
- exposedField SFFloat lineWidth 0
- exposedField SFNode obj NULL
-] {
- Transform2D {
-  rotationAngle IS rotation
-  scale IS scale
-  translation IS translation
-  children [
-   DEF S Shape {
-    geometry IS obj
-    appearance Appearance {
-     material Material2D {
-      emissiveColor IS Color
-      filled IS filled
-      transparency IS transparency
-      lineProps LineProperties {
-       lineColor IS lineColor
-       width IS lineWidth
-      }
-     }
-    }
-   }
-   Transform2D {
-    translation -100 0
-    children [
-     USE S
-    ]
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of DEF/USE inside a proto" "and DEF/USE of a proto" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Simple proto Test"
-  }
-  DEF G GEOMETRY_PROTO {
-   translation 200 0
-   scale 1 1.5
-   rotation 0.78
-   Color 1 0 1
-   transparency 0.75
-   lineColor 1 0 0
-   lineWidth 2
-   obj Circle {
-    radius 75
-   }
-  }
-  Transform2D {
-   translation -300 0
-   children [
-    USE G
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-char-to-int.bt Deleted

@@ -1,87 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script sending eventOuts" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script eventOut test"
-  }
-  Transform2D {
-   translation -150 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string ["What"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT_TEST Text {
-      string ["T"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 0.1
-   loop TRUE
-  }
-  DEF SCRIPT Script {
-   eventIn SFTime act
-   field SFInt32 int_val 0
-   field SFNode txt USE TEXT
-   field SFNode txt2 USE TEXT_TEST
-   url ["javascript: function initialize(value, timestamp) {int_val = txt.string[0].charCodeAt(0);txt2.string[0] = 'char val: ' +  String.fromCharCode(int_val) + ' ' + int_val;}"   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-child-create.bt Deleted

@@ -1,61 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script creating a new node in an MF field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script Node Creation test"
-  }
-  Transform2D {
-   children [
-    DEF TS TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-   ]
-  }
-  DEF TR Transform2D {
-   translation -150 -120
-  }
-  DEF SCRIPT Script {
-   eventIn SFBool act
-   field SFNode t USE TR
-   url ["javascript: function act(value, timestamp) {if (!value) return;t.children[0] = new SFNode('Shape');t.children[0].geometry = new SFNode('Rectangle');t.children[0].geometry.size = new SFVec2f(100, 50);t.children[0].appearance = new SFNode('Appearance');t.children[0].appearance.material = new SFNode('Material2D');t.children[0].appearance.material.filled = true;t.children[0].appearance.material.emissiveColor = new SFColor(0, 0, 1);}"   ]
-  }
- ]
-}
-
-ROUTE TS.isActive TO SCRIPT.act
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-date.bt Deleted

@@ -1,64 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 260
-     pixelHeight 70
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script used to retrieve system time" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script Date() test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string ["MPEG4 time on your system"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  DEF TIMER TimeSensor {
-   loop TRUE
-  }
-  DEF SC Script {
-   eventIn SFTime set_time
-   field SFNode str USE TXT
-   url ["javascript:function set_time(value, text) {today = new Date();the_day = today.getDate();the_weekday = today.getDay();the_month = today.getMonth();the_year = today.getYear();the_hour = today.getHours();the_minute = today.getMinutes();the_second = today.getSeconds();am_pm = 0;the_initials = 'a.m.';if (the_year < 1900) the_year = the_year + 1900;if ((the_hour >=2) && (the_hour <=11)) {am_pm = the_hour;the_initials = 'a.m.';} else if (the_hour == 0) {am_pm = 12;the_initials = 'a.m.';} else if (the_hour == 12) {am_pm = 12;the_initials = 'p.m.';} else if (the_hour >=13) {am_pm = the_hour - 12;the_initials = 'p.m.';}if (the_minute <=9) the_minute = '0' + (the_minute);if (the_second <=9) the_second = '0' + (the_second);if (the_month == '0') the_month = 'January';else if (the_month == '1') the_month = 'February';else if (the_month == '2') the_month = 'March';else if (the_month == '3') the_month = 'April';else if (the_month == '4') the_month = 'May';else if (the_month == '5') the_month = 'June';else if (the_month == '6') the_month = 'July';else if (the_month == '7') the_month = 'August';else if (the_month == '8') the_month = 'September';else if (the_month == '9') the_month = 'October';else if (the_month == '10') the_month = 'November';else if (the_month == '11') the_month = 'December';if (the_weekday == '0') the_weekday = 'Sunday';else if (the_weekday == '1') the_weekday = 'Monday';else if (the_weekday == '2') the_weekday = 'Tuesday';else if (the_weekday == '3') the_weekday = 'Wednesday';else if (the_weekday == '4') the_weekday = 'Thursday';else if (the_weekday == '5') the_weekday = 'Friday';else if (the_weekday == '6') the_weekday = 'Saturday';if (the_day == '1') the_day = '1st';else if (the_day == '2') the_day = '2nd';else if (the_day == '3') the_day = '3rd';else if (the_day == '4') the_day = '4th';else if (the_day == '21') the_day = '21st';else if (the_day == '22') the_day = '23rd';else if (the_day == '31') the_day = '31st';else the_day = the_day + 'th';str.string[1] = the_weekday + ' ' + the_day + ' ' + the_month + ', ' + the_year;str.string[2] = am_pm + ':' + the_minute + ':' + the_second + ' ' + the_initials;}function initialize() {set_time(0, 0);}"   ]
-  }
- ]
-}
-
-ROUTE TIMER.cycleTime TO SC.set_time
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-event-out.bt Deleted

@@ -1,85 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script sending eventOuts" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script eventOut test"
-  }
-  Shape {
-   appearance Appearance {
-    material DEF MAT Material2D {
-     emissiveColor 1 0 0
-     filled TRUE
-    }
-   }
-   geometry DEF IFS IndexedFaceSet2D {
-    colorPerVertex FALSE
-    coordIndex [0 1 2 3 4 5]
-    coord Coordinate2D {
-     point [-120 0 -50 100 50 100 120 0 50 -100 -50 -100]
-    }
-   }
-  }
-  Transform2D {
-   translation -150 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string [""]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 0.1
-   loop TRUE
-  }
-  DEF SCRIPT Script {
-   eventIn SFTime act
-   field SFInt32 count 0
-   eventOut SFFloat transp
-   eventOut MFString txt
-   url ["javascript: function act(value, timestamp) {count++;if (count>= 20) count = 0;transp = count / 20;txt[0] = 'transparency: ' + transp;     }"   ]
-  }
- ]
-}
-
-ROUTE TS.cycleTime TO SCRIPT.act
-ROUTE SCRIPT.transp TO MAT.transparency
-ROUTE SCRIPT.txt TO TEXT.string
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-initialize.bt Deleted

@@ -1,86 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script Initialize usage" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script initialize test"
-  }
-  Shape {
-   appearance Appearance {
-    material DEF MAT Material2D {
-     emissiveColor 1 0 0
-     filled TRUE
-    }
-   }
-   geometry DEF IFS IndexedFaceSet2D {
-    colorPerVertex FALSE
-    coordIndex [0 1 2 3 4 5]
-    coord Coordinate2D {
-     point [-120 0 -50 100 50 100 120 0 50 -100 -50 -100]
-    }
-   }
-  }
-  Transform2D {
-   translation -150 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string [""]
-      fontStyle FontStyle {
-       family ["SANS"]
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 0.2
-   loop TRUE
-  }
-  DEF SCRIPT Script {
-   eventIn SFTime act
-   field SFInt32 count 0
-   eventOut SFFloat transp
-   eventOut MFString txt
-   url ["javascript: function initialize(value, timestamp) {my_global_string = 'global int = ';my_global_int = 10;}function act(value, timestamp) {count++;if (count>= 20) count = 0;transp = count / 20;txt[0] = 'transparency: ' + transp;  txt[1] = my_global_string + my_global_int;  }"   ]
-  }
- ]
-}
-
-ROUTE TS.cycleTime TO SCRIPT.act
-ROUTE SCRIPT.transp TO MAT.transparency
-ROUTE SCRIPT.txt TO TEXT.string
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-load-url.bt Deleted

@@ -1,67 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script loading URL" "" "GPAC Regression Tests" "$Date: 2008-07-18 17:27:50 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Script URL loading"
-  }
-  Transform2D {
-   children [
-    DEF TS TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-   ]
-  }
-  DEF TR Transform2D {
-   translation -150 -120
-  }
-  DEF SCRIPT Script {
-   eventIn SFBool act
-   field SFNode t USE TR
-   url ["javascript: 
-    function act(value, timestamp) {
-     if (!value) return; 
-     str = new MFString('http://gpac.sourceforge.net'); 
-     Browser.loadURL(str) ;
-    }
-    "   ]
-  }
- ]
-}
-
-ROUTE TS.isActive TO SCRIPT.act
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-node-access.bt Deleted

@@ -1,86 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script modifying nodes directly" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Node Modification Script test"
-  }
-  Shape {
-   appearance Appearance {
-    material DEF MAT Material2D {
-     filled TRUE
-    }
-   }
-   geometry DEF IFS IndexedFaceSet2D {
-    colorIndex [0 1 2 3 4 5]
-    coordIndex [0 1 2 3 4 5]
-    color Color {
-     color [0 0 1 0 1 0 1 0 0 1 1 0 1 0 1 0 1 1]
-    }
-    coord Coordinate2D {
-     point [-120 0 -50 100 50 100 120 0 50 -100 -50 -100]
-    }
-   }
-  }
-  DEF TS TimeSensor {
-   loop TRUE
-  }
-  Transform2D {
-   translation -150 -120
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string [""]
-      fontStyle FontStyle {
-       family ["SANS"]
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF SCRIPT Script {
-   eventIn SFTime act
-   field SFNode n USE IFS
-   field SFNode t USE TS
-   field SFNode txt USE TEXT
-   field SFInt32 roll 0
-   url ["javascript: function act(value, timestamp) {roll++;count = n.colorIndex.length;first = n.colorIndex[0];for (i=0; i<count; i++) {if (i+1==count) {n.colorIndex[i] = first;} else {n.colorIndex[i] = n.colorIndex[i+1];}}txt.string[0] = 'ColorIndexes: ' + n.colorIndex.toSource();txt.string[2] = 'Current Cycle length: ' + (count * t.cycleInterval) + ' seconds';txt.string[1] = 'Running for ' + timestamp + ' seconds';switch (roll) {case 6:t.enabled = FALSE;t.cycleInterval = 0.5;t.enabled = TRUE;break;case 18:t.enabled = FALSE;t.cycleInterval = 0.1;t.enabled = TRUE;break;case 78:t.enabled = FALSE;t.cycleInterval = 0.05;t.enabled = TRUE;break;case 198:roll = 0;t.enabled = FALSE;t.cycleInterval = 1;t.enabled = TRUE;break;}}"   ]
-  }
- ]
-}
-
-ROUTE TS.cycleTime TO SCRIPT.act
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-node-create.bt Deleted

@@ -1,80 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script creating a new node at an SF field" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script Node Creation test"
-  }
-  Transform2D {
-   children [
-    DEF TS TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF MAT Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 50 50
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -120
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string ["test node create"]
-      fontStyle FontStyle {
-       family ["SANS"]
-       justify ["BEGIN" "BEGIN"]
-       size 40
-       style "BOLDITALIC"
-      }
-     }
-    }
-   ]
-  }
-  DEF SCRIPT Script {
-   eventIn SFBool act
-   field SFNode ap USE APP
-   url ["javascript: function act(value, timestamp) {mat = new SFNode('Material2D');if (value) {mat.emissiveColor = new SFColor(1, 0, 0);mat.filled = TRUE;} else {mat.emissiveColor = new SFColor(0, 0, 0);mat.filled = TRUE;}ap.material = mat;}"   ]
-  }
- ]
-}
-
-ROUTE TS.isActive TO SCRIPT.act
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-proto.bt Deleted

@@ -1,224 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-PROTO P0 [
- field SFVec2f trans 0 0
-] {
- Transform2D {
-  translation IS trans
-  children [
-   DEF TS TouchSensor {}
-   DEF TR1 Transform2D {
-    children [
-     Shape {
-      appearance Appearance {
-       material Material2D {
-        lineProps DEF LP LineProperties {
-         lineColor 0.2 0.5 0.8
-         width 0
-        }
-       }
-      }
-      geometry Circle {
-       radius 8
-      }
-     }
-    ]
-   }
-   DEF TIMER TimeSensor {
-    cycleInterval 0.5
-    startTime -1
-   }
-  ]
- }
- DEF SC Script {
-  eventIn SFBool set_over
-  eventIn SFFloat set_fraction
-  eventIn SFBool set_active
-  field SFNode tim USE TIMER
-  field SFNode line USE LP
-  field SFBool is_over FALSE
-  eventOut SFFloat frac_changed
-  url ["javascript: 
-  function set_active(value, timestamp) {
-   line.width = value ? 2 : 0;
-  }
-  function set_over(value, timestamp) {
-   is_over = value;
-   if (!tim.isActive) tim.startTime = timestamp;
-  }
-  function set_fraction(value, timestamp) {
-   if (is_over) {
-    frac_changed = value;
-   } else {
-    frac_changed = 1 - value;
-   }
-  }
-  "  ]
- }
- DEF PI PositionInterpolator2D {
-  key [0 1]
-  keyValue [1 1 4 4]
- }
- ROUTE TS.isOver TO SC.set_over
- ROUTE TIMER.isActive TO SC.set_active
- ROUTE TIMER.fraction_changed TO SC.set_fraction
- ROUTE SC.frac_changed TO PI.set_fraction
- ROUTE PI.value_changed TO TR1.scale
-}
-PROTO P1 [
- field SFVec2f trans 0 0
-] {
- Transform2D {
-  translation IS trans
-  children [
-   P0 {
-    trans -180 0
-   }
-   P0 {
-    trans -160 0
-   }
-   P0 {
-    trans -140 0
-   }
-   P0 {
-    trans -120 0
-   }
-   P0 {
-    trans -100 0
-   }
-   P0 {
-    trans -80 0
-   }
-   P0 {
-    trans -60 0
-   }
-   P0 {
-    trans -40 0
-   }
-   P0 {
-    trans -20 0
-   }
-   P0 {}
-   P0 {
-    trans 20 0
-   }
-   P0 {
-    trans 40 0
-   }
-   P0 {
-    trans 60 0
-   }
-   P0 {
-    trans 80 0
-   }
-   P0 {
-    trans 100 0
-   }
-   P0 {
-    trans 120 0
-   }
-   P0 {
-    trans 140 0
-   }
-   P0 {
-    trans 160 0
-   }
-   P0 {
-    trans 180 0
-   }
-  ]
- }
-}
-OrderedGroup {
- children [
-  Background2D {
-   backColor 0.2 0.4 0.7
-  }
-  WorldInfo {
-   info ["This shows script used in proto for a bubble-like effect" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Script and Proto test"
-  }
-  Transform2D {
-   children [
-    P1 {
-     trans 0 180
-    }
-    P1 {
-     trans 0 160
-    }
-    P1 {
-     trans 0 140
-    }
-    P1 {
-     trans 0 120
-    }
-    P1 {
-     trans 0 100
-    }
-    P1 {
-     trans 0 80
-    }
-    P1 {
-     trans 0 60
-    }
-    P1 {
-     trans 0 40
-    }
-    P1 {
-     trans 0 20
-    }
-    P1 {}
-    P1 {
-     trans 0 -20
-    }
-    P1 {
-     trans 0 -40
-    }
-    P1 {
-     trans 0 -60
-    }
-    P1 {
-     trans 0 -80
-    }
-    P1 {
-     trans 0 -100
-    }
-    P1 {
-     trans 0 -120
-    }
-    P1 {
-     trans 0 -140
-    }
-    P1 {
-     trans 0 -160
-    }
-    P1 {
-     trans 0 -180
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-script-timestamp.bt Deleted

@@ -1,68 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows script timestamp value" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Script timing test"
-  }
-  Transform2D {
-   translation -150 0
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TEXT Text {
-      string [""]
-      fontStyle FontStyle {
-       family ["SANS"]
-       justify ["BEGIN" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF TS TimeSensor {
-   cycleInterval 0.2
-   loop TRUE
-  }
-  DEF SCRIPT Script {
-   eventIn SFTime act
-   field SFNode n USE TEXT
-   url ["javascript: function act(value, timestamp) {n.string[0] = 'EventIn Value: ' + value;n.string[1] = 'Script Timestamp: ' + timestamp;n.string[2] = 'Diff: ' + (timestamp-value);
-}"   ]
-  }
- ]
-}
-
-ROUTE TS.cycleTime TO SCRIPT.act
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-storage.bt Deleted

@@ -1,65 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    bufferSizeDB 177
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 24
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 300
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {backColor 1 1 1}
-  WorldInfo {
-   info [
-    "This test shows usage of the Storage node. The rectangle position is stored upon closing of the scene in the player. It is restored if the scene is re-opened less than 10 seconds later."
-    "" 
-    "GPAC Regression Tests" "$Date: $ - $Revision: $" 
-    "(C) 2010-200X GPAC Team"
-   ]
-   title "Storage Node for testing persistent storage"
-  }
-  DEF TR Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled true
-      }
-     }
-     geometry Rectangle {
-      size 160 120
-     }
-    }
-    DEF PS PlaneSensor2D {
-     maxPosition -1 -1
-     autoOffset TRUE
-    }
-   ]
-  }
-  Storage {
-   expireAfter 10
-   name "test storage"
-   storageList [
-    TR.translation
-    PS.offset
-   ]
-  }
- ]
-}
-
-ROUTE PS.translation_changed TO TR.translation

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-stream-text-switch.bt Deleted

@@ -1,143 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- includeInlineProfileLevelFlag true
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 0 1 0
-  }
-  WorldInfo {
-   info ["This shows an AnimationStream node" "controling a 3GPP text stream" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2005 GPAC Team"]
-   title "3GPP Text Switch"
-  }
-
-  Transform2D {
-   translation -50 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 75 50
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["English"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 18
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 50 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 75 50
-     }
-    }
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["French"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  } 
-  
-  DEF AS AnimationStream {
-   loop TRUE
-   url [od:20]
-  }
-  DEF C1 Conditional { buffer {
-   REPLACE AS.stopTime BY 0
-   REPLACE AS.url BY ["od:10"]
-   REPLACE AS.startTime BY 0
-    } 
-  }
-  DEF C2 Conditional { buffer {
-   REPLACE AS.stopTime BY 0
-   REPLACE AS.url BY ["od:20"]
-   REPLACE AS.startTime BY 0
-  } }
- ]
-}
-
-ROUTE TS1.isActive TO C1.activate
-ROUTE TS2.isActive TO C2.activate
-
-
-RAP AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      OCR_ES_ID 5
-      muxInfo MuxInfo { fileName "../auxiliary_files/subtitle.srt" }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 20
-    esDescr [
-     ES_Descriptor {
-      ES_ID 6
-      OCR_ES_ID 6
-      muxInfo MuxInfo { fileName "../auxiliary_files/subtitle_fr.srt" }
-     }
-    ]
-   }
-  ]
-}

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-horiz1.bt Deleted

@@ -1,304 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for horizontal text" "top to bottom = TRUE" "left to right = TRUE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Horizontal Text alignment"
-  }
-  Transform2D {
-   translation -180 180
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["M:Begin" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:End"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:First"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "FIRST"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:End"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:First"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "FIRST"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["END" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["END" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:End"]
-      fontStyle FontStyle {
-       justify ["END" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:First"]
-      fontStyle FontStyle {
-       justify ["END" "FIRST"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["FIRST" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["FIRST" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:End"]
-      fontStyle FontStyle {
-       justify ["FIRST" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:First"]
-      fontStyle FontStyle {
-       justify ["FIRST" "FIRST"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-horiz2.bt Deleted

@@ -1,320 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for horizontal text" "top to bottom = FALSE" "left to right = TRUE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Horizontal Text alignment"
-  }
-  Transform2D {
-   translation -180 180
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["M:Begin" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:End"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:First"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "FIRST"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:End"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:First"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "FIRST"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["END" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["END" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:End"]
-      fontStyle FontStyle {
-       justify ["END" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:First"]
-      fontStyle FontStyle {
-       justify ["END" "FIRST"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["FIRST" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["FIRST" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:End"]
-      fontStyle FontStyle {
-       justify ["FIRST" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:First"]
-      fontStyle FontStyle {
-       justify ["FIRST" "FIRST"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-horiz3.bt Deleted

@@ -1,320 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for horizontal text" "top to bottom = TRUE" "left to right = FALSE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Horizontal Text alignment"
-  }
-  Transform2D {
-   translation -180 180
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["M:Begin" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:End"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:First"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "FIRST"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:End"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:First"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "FIRST"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["END" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["END" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:End"]
-      fontStyle FontStyle {
-       justify ["END" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:First"]
-      fontStyle FontStyle {
-       justify ["END" "FIRST"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["FIRST" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["FIRST" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:End"]
-      fontStyle FontStyle {
-       justify ["FIRST" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:First"]
-      fontStyle FontStyle {
-       justify ["FIRST" "FIRST"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-horiz4.bt Deleted

@@ -1,336 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for horizontal text" "top to bottom = FALSE" "left to right = FALSE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Horizontal Text alignment"
-  }
-  Transform2D {
-   translation -180 180
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["M:Begin" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:End"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 180
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Begin" "m:First"]
-      fontStyle FontStyle {
-       justify ["BEGIN" "FIRST"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:End"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 50
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:Middle" "m:First"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "FIRST"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["END" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["END" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:End"]
-      fontStyle FontStyle {
-       justify ["END" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:End" "m:First"]
-      fontStyle FontStyle {
-       justify ["END" "FIRST"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -180 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Begin"]
-      fontStyle FontStyle {
-       justify ["FIRST" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:Middle"]
-      fontStyle FontStyle {
-       justify ["FIRST" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 20 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:End"]
-      fontStyle FontStyle {
-       justify ["FIRST" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 120 -160
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["M:First" "m:First"]
-      fontStyle FontStyle {
-       justify ["FIRST" "FIRST"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-vert1.bt Deleted

@@ -1,200 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for vertical text" "top to bottom = TRUE" "left to right = TRUE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Vertical Text alignment"
-  }
-  Transform2D {
-   translation -150 220
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["MBegin" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 70
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -90
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 100
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "BEGIN"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -80
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "END"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-vert2.bt Deleted

@@ -1,209 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for vertical text" "top to bottom = FALSE" "left to right = TRUE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Vertical Text alignment"
-  }
-  Transform2D {
-   translation -150 100
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["MBegin" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "BEGIN"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "MIDDLE"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -120
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "END"]
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-vert3.bt Deleted

@@ -1,209 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for vertical text" "top to bottom = TRUE" "left to right = FALSE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Vertical Text alignment"
-  }
-  Transform2D {
-   translation -150 220
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["MBegin" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 70
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -90
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 100
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "BEGIN"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -80
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "END"]
-       leftToRight FALSE
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-align-vert4.bt Deleted

@@ -1,218 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text alignment for vertical text" "top to bottom = FALSE" "left to right = FALSE" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Vertical Text alignment"
-  }
-  Transform2D {
-   translation -150 100
-   children [
-    DEF LINES Shape {
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1]
-      coord Coordinate2D {
-       point [-50 0 50 0 0 -50 0 50]
-      }
-     }
-    }
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["MBegin" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MBegin" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["BEGIN" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -150
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MMiddle" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 200
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mBegin"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "BEGIN"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 60
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mMiddle"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "MIDDLE"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -120
-   children [
-    USE LINES
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["MEnd" "mEnd"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["END" "END"]
-       leftToRight FALSE
-       size 20
-       topToBottom FALSE
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-glyph-advance.bt Deleted

@@ -1,436 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSv2Config {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 480
-     pixelHeight 360
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D { backColor 1 1 1 }
-  WorldInfo {
-   info ["This test shows glyphs, along with their bounding boxes, the font baseline, the word bounding box and the two-lines text bounding box" "If the Arial font is found and used, bounding-boxes should be properly positioned" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2006 GPAC Team"]
-   title "Text bounding boxes test"
-  }
-  Transform2D {
-   translation -140 80
-   children [
-    Transform2D {
-     scale 0.048828125 0.048828125
-     children [
-      # Em Box Y Axis
-      Shape {
-       appearance DEF A1 Appearance {
-        material Material2D {
-         filled FALSE
-         lineProps LineProperties {
-          width 1
-          lineColor 0 0 0
-         }
-        }
-       }
-       geometry IndexedLineSet2D {
-        coord Coordinate2D {
-         point [ 0 -4000 0 1491 ] 
-        }
-       }
-      }
-      
-      # Baseline
-      DEF BASELINE Shape {
-       appearance USE A1 
-       geometry IndexedLineSet2D {
-        coord Coordinate2D {
-         point [ 0 0 8000 0 ] 
-        }
-       }
-      }
-
-      # bounding box for glyph a
-      Transform2D {
-       translation 0 0
-       children [
-        Shape {
-         appearance DEF A2 Appearance {
-          material Material2D {
-           filled FALSE
-           lineProps LineProperties {
-            width 1
-            lineColor 1 0 0
-           }
-          }
-         }
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [ 74  -24 1052 -24 1052 1086 74 1086 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph b
-      Transform2D {
-       translation 1139 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [ 134 -24 1055 -24 1055 1466 134 1466 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph c
-      Transform2D {
-       translation 2278 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [  80  -24 
-                  1005  -24 
-                  1005 1086 
-                    80 1086 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph d
-      Transform2D {
-       translation 3302 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [  70  -24 
-                   991  -24 
-                   991 1466 
-                    70 1466 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph e
-      Transform2D {
-       translation 4441 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [  75  -24 
-                  1054  -24 
-                  1054 1086 
-                    75 1086 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph f
-      Transform2D {
-       translation 5580 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [  19    0 
-                   640    0 
-                   640 1491
-                    19 1491 ] 
-          }
-         }
-        }
-       ]
-      }
-
-      # bounding box for glyph g
-      Transform2D {
-       translation 6149 0
-       children [
-        Shape {
-         appearance USE A2
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [   66 -431
-                   1002 -431
-                   1002 1086
-                     66 1086 ] 
-          }
-         }
-        }
-       ]
-      }
-      
-      # bounding box for the first line
-      Transform2D {
-       translation 0 0
-       children [
-        Shape {
-         appearance DEF A3 Appearance {
-          material Material2D {
-           filled FALSE
-           lineProps LineProperties {
-            width 1
-            lineColor 0 0.5 0
-           }
-          }
-         }
-         geometry IndexedFaceSet2D {
-          coord Coordinate2D {
-           point [   74 -431
-                     74 1491
-                   7151 1491
-                   7151 -431 ] 
-          }
-         }
-        }
-       ]
-      }
-      Transform2D {
-       translation 0 -2048
-       children [
-        USE BASELINE 
-        # bounding box for glyph h
-        Transform2D {
-         translation 0 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 135    0
-                    1000    0
-                    1000 1466
-                     135 1466 ] 
-            }
-           }
-          }
-         ]
-        }
-        
-        # bounding box for glyph i
-        Transform2D {
-         translation 1139 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 136    0
-                     316    0
-                     316 1466
-                     136 1466 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph j
-        Transform2D {
-         translation 1594 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ -94 -431
-                     314 -431
-                     314 1466
-                     -94 1466 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph k
-        Transform2D {
-         translation 2049 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 136    0
-                    1016    0
-                    1016 1466
-                     136 1466 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph l
-        Transform2D {
-         translation 3087 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 131    0
-                     311    0
-                     311 1466
-                     131 1466 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph m
-        Transform2D {
-         translation 3542 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 135    0
-                    1574    0
-                    1574 1086
-                     135 1086 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph n
-        Transform2D {
-         translation 5248 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [ 135    0
-                     998    0
-                     998 1086
-                     135 1086 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for glyph o
-        Transform2D {
-         translation 6387 0
-         children [
-          Shape {
-           appearance USE A2
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [  68  -24
-                    1063  -24
-                    1063 1086
-                      68 1086 ] 
-            }
-           }
-          }
-         ]
-        }
-
-        # bounding box for the second line
-        Transform2D {
-         translation 0 0
-         children [
-          Shape {
-           appearance USE A3 
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [  135 -431
-                      135 1466
-                     7436 1466
-                     7436 -431 ] 
-            }
-           }
-          }
-         ]
-        }
-
-       ]
-      }
-
-        # bounding box for the whole text
-        Transform2D {
-         translation 0 0
-         children [
-          Shape {
-           appearance Appearance {
-            material Material2D {
-             filled FALSE
-             lineProps LineProperties {
-              width 1
-              lineColor 1 1 0
-             }
-            }
-           }
-           geometry IndexedFaceSet2D {
-            coord Coordinate2D {
-             point [   74  1491
-                     7436  1491
-                     7436 -2479
-                       74 -2479 ] 
-            }
-           }
-          }
-         ]
-        }
-
-     ]
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string [ "abcdefg" "hijklmno"]
-      fontStyle FontStyle {
-       family ["Arial"]
-       justify ["BEGIN" "FIRST"]
-       size 100
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-length.bt Deleted

@@ -1,230 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 450
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text with and without length fields" "All texts use the same font and size" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Text length Test"
-  }
-  Transform2D {
-   translation -75 0
-   children [
-    Shape {
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [0 200 0 -120]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 75 0
-   children [
-    Shape {
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [0 200 0 -120]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 150
-   children [
-    Shape {
-     geometry IndexedLineSet2D {
-      coord Coordinate2D {
-       point [200 0 -200 0]
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 180
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["No length"]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 180
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Length on " "longest line"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 180
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Length on" "all lines"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 100
-   children [
-    DEF SQUARE Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 100 80
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Text" "to test length"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    USE SQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Text" "to test length"]
-      length [-1 100]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 100
-   children [
-    USE SQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Text" "to test length"]
-      length [100 100]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -150 -50
-   children [
-    DEF VSQUARE Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 80 100
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Length" "Test"]
-      fontStyle DEF FS2 FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       size 24
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -50
-   children [
-    USE VSQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Length" "Test"]
-      length [100 -1]
-      fontStyle USE FS2
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 150 -50
-   children [
-    USE VSQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Length" "Test"]
-      length [100 100]
-      fontStyle USE FS2
-     }
-    }
-   ]
-  }
-  Transform2D {
-   scale 0.8 0.8
-   translation 0 -160
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Horizontal Rectangles are 100x80 pixels" "Vertical Rectangles are 80x100 pixels" "Length is set to longest dimension of the rectangle"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-maxextend.bt Deleted

@@ -1,176 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 350
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text with and without max Extent" "All texts use the same font and size" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Text maxExtend Test"
-  }
-  Shape {
-   geometry IndexedLineSet2D {
-    coord Coordinate2D {
-     point [0 200 0 -160]
-    }
-   }
-  }
-  Transform2D {
-   translation -80 160
-   children [
-    Shape {
-     appearance DEF TEXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["maxExtent off"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 160
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["maxExtent on"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 100
-   children [
-    DEF SQUARE Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 1 1 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 90 80
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Some Text" "to test extent"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 100
-   children [
-    USE SQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Some Text" "to test extent"]
-      maxExtent 90
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -80 -60
-   children [
-    DEF VSQUARE Shape {
-     appearance USE APP
-     geometry Rectangle {
-      size 80 100
-     }
-    }
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Extent" "Text"]
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 80 -60
-   children [
-    USE VSQUARE
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Extent" "Text"]
-      maxExtent 100
-      fontStyle FontStyle {
-       horizontal FALSE
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -180
-   children [
-    Shape {
-     appearance USE TEXTAPP
-     geometry Text {
-      string ["Horizontal Rectangles: 100x80 pixels" "Vertical Rectangles: 80x100 pixels" "MaxExtent: longest dimension"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-style.bt Deleted

@@ -1,184 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 260
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows Text with different styles" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Font Style Test"
-  }
-  Transform2D {
-   translation 0 180
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Plain Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 140
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Bold Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "BOLD"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 100
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Italic Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "ITALIC"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 60
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Bold Italic Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "BOLDITALIC"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 20
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Underlined Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "UNDERLINED"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -20
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Underlined Italic Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "ITALIC UNDERLINED"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -60
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Underlined Bold Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "BOLD UNDERLINED"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Underlined Bold" "Italic Text"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "BOLDITALIC UNDERLINED"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -160
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Strikeout Text" "(Not Normative)"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 20
-       style "STRIKEOUT"
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-unicode.bt Deleted

@@ -1,55 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 260
-     pixelHeight 450
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows non ASCII Text characters" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "Font Style Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Non-Ansi:" "" "é à è ù ü ä ë ï ö ü ÿ" "" "" "XML escapes:" "" "& ' \\" > <"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 26
-      }
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-text-vrml-alignment.bt Deleted

@@ -1,161 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 1
- visualProfileLevelIndication 1
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSv2Config {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 480
-     pixelHeight 360
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows VRML text basline alignment" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "VRML Text alignmentSRT importing Test"
-  }
-  Transform2D {
-   translation -200 150
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Conformance Test"]
-      fontStyle FontStyle {
-       family ["Courier"]
-       justify ["BEGIN" "MIDDLE"]
-       size 15
-       style "BOLD"
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 40
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Sample from VRML 97 Spec (Section 6.20.1)" "FontStyle Parameters:" "    family \"Courier\"" "    size 20" "    spacing 1.5" "    justify [ \"BEGIN\" \"FIRST\" ]" "Text Position is (0,0)" "Thin lines are drawn at Y = 20, Y = -10, Y =-40." "Thick lines are drawn at Y = 0, Y = -30, Y =-60." "According to VRML, thick lines should match baseline."]
-      fontStyle FontStyle {
-       family ["Courier"]
-       justify ["BEGIN" "MIDDLE"]
-       size 15
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -215 -80
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["(0,0)"]
-      fontStyle FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 15
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -200 -80
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {
-        width 2
-       }
-      }
-     }
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1 4 5 -1]
-      coord Coordinate2D {
-       point [0 0 400 0 0 -30 400 -30 0 -60 400 -60]
-      }
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       lineProps LineProperties {}
-
-      }
-     }
-     geometry IndexedLineSet2D {
-      coordIndex [0 1 -1 2 3 -1 4 5 -1 6 7 -1 8 9 -1]
-      coord Coordinate2D {
-       point [0 20 400 20 0 -10 400 -10 0 -40 400 -40 0 20 0 -60 400 20 400 -60]
-      }
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["This is a line of text." "This is the 2nd line of text." "This is the third."]
-      fontStyle FontStyle {
-       family ["Courier"]
-       justify ["BEGIN" "FIRST"]
-       size 20
-       spacing 1.5
-      }
-     }
-    }
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 2
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-OCR.bt Deleted

@@ -1,245 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 400
-     pixelHeight 400
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows media streams synchronized to an empty OCR stream" "and mediaControl controling the OCR playback" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Animation Stream"
-  }
-  Transform2D {
-   translation 0 160
-   children [
-    Shape {
-     appearance DEF TXTAPP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry Text {
-      string ["Click on video to switch streams"]
-      fontStyle DEF TXTFT FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 16
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:12]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation -120 -160
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Rectangle {
-      size 40 20
-     }
-    }
-    Shape {
-     appearance USE TXTAPP
-     geometry DEF TXT Text {
-      string ["Stop"]
-      fontStyle USE TXTFT
-     }
-    }
-    DEF TS2 TouchSensor {}
-   ]
-  }
-  Transform2D {
-   translation 40 -160
-   children [
-    Transform2D {
-     translation -30 0
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["OCR Time:"]
-        fontStyle USE TXTFT
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 60 0
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry DEF OCR_TIME Text {
-        string ["Stop"]
-        fontStyle USE TXTFT
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 40 -180
-   children [
-    Transform2D {
-     translation -30 0
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["OCR Duration:"]
-        fontStyle USE TXTFT
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 60 0
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry DEF OCR_DUR Text {
-        string ["Stop"]
-        fontStyle USE TXTFT
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE MT.url BY ["od:12"]
-    REPLACE ROUTE R1 BY TS.isActive TO RC.activate
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE MT.url BY ["od:10"]
-    REPLACE ROUTE R1 BY TS.isActive TO C.activate
-   }
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   loop TRUE
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF VMS Valuator {}
-  DEF VMS2 Valuator {}
-  DEF C2 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 0
-    REPLACE TXT.string BY ["Play"]
-    REPLACE ROUTE R2 BY TS2.isActive TO RC2.activate
-   }
-  }
-  DEF RC2 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 1
-    REPLACE TXT.string BY ["Stop"]
-    REPLACE ROUTE R2 BY TS2.isActive TO C2.activate
-   }
-  }
- ]
-}
-
-DEF R1 ROUTE TS.isActive TO C.activate
-DEF R2 ROUTE TS2.isActive TO C2.activate
-ROUTE MS.mediaCurrentTime TO VMS.inSFTime
-ROUTE VMS.outMFString TO OCR_TIME.string
-ROUTE MS.mediaDuration TO VMS2.inSFTime
-ROUTE VMS2.outMFString TO OCR_DUR.string
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 8
-      OCR_ES_ID 8
-      decConfigDescr DecoderConfigDescriptor {
-       objectTypeIndication 1
-       streamType 2
-      }
-      muxInfo MuxInfo {
-       duration 10000
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 5
-      OCR_ES_ID 8
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 12
-    esDescr [
-     ES_Descriptor {
-      ES_ID 4
-      OCR_ES_ID 8
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-audio-speed.bt Deleted

@@ -1,214 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MediaControl" "controling audio playback speed" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Sound2D {
-   source AudioSource {
-    url [od:10]
-    stopTime -1
-    numChan 2
-   }
-  }
-  DEF MC MediaControl {
-   url [od:10]
-   loop TRUE
-  }
-  Transform2D {
-   translation -100 0
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance DEF TXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry DEF TXT_FAST Text {
-        string ["Faster" "x 2"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 0
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M2 Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry DEF TXT_SLOW Text {
-        string ["Slower" "x 0.5"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   children [
-    DEF TS3 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M3 Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Mute"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 2
-    REPLACE TXT_FAST.string BY ["Faster", "x 2"]
-    REPLACE M1.emissiveColor BY 1 0.5 0.5
-   }
-  }
-  DEF AC1 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 4
-    REPLACE TXT_FAST.string BY ["Faster", "x 4"]
-    REPLACE M1.emissiveColor BY 1 0.5 0.5
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 0.5
-    REPLACE TXT_SLOW.string BY ["Slower", "x 0.5"]
-    REPLACE M2.emissiveColor BY 0.5 0.5 1
-   }
-  }
-  DEF AC2 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 0.25
-    REPLACE TXT_SLOW.string BY ["Slower", "x 0.25"]
-    REPLACE M2.emissiveColor BY 0.5 0.5 1
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE MC.mute BY TRUE
-    REPLACE M3.emissiveColor BY 0.5 1 0.5
-   }
-  }
-  DEF RESET Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 1
-    REPLACE MC.mute BY FALSE
-    REPLACE M1.emissiveColor BY 1 0 0
-    REPLACE M2.emissiveColor BY 0 0 1
-    REPLACE M3.emissiveColor BY 0 1 0
-   }
-  }
- ]
-}
-
-ROUTE TS1.isOver TO C1.activate
-ROUTE TS1.isOver TO RESET.reverseActivate
-ROUTE TS1.isActive TO AC1.activate
-ROUTE TS1.isActive TO C1.reverseActivate
-ROUTE TS2.isOver TO C2.activate
-ROUTE TS2.isOver TO RESET.reverseActivate
-ROUTE TS2.isActive TO AC2.activate
-ROUTE TS2.isActive TO C2.reverseActivate
-ROUTE TS3.isOver TO C3.activate
-ROUTE TS3.isOver TO RESET.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-audio.bt Deleted

@@ -1,352 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows complex scripting and MediaControl" "providing complete control of the media" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Sound2D {
-   source AudioSource {
-    url [od:10]
-    stopTime -1
-   }
-  }
-  DEF MC MediaControl {
-   url [od:10]
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:10]
-  }
-  DEF PANEL Transform2D {
-   translation 0 80
-   children [
-    DEF TRPAUSE Transform2D {
-     translation -100 0
-     children [
-      DEF PAUSE TouchSensor {}
-      DEF WHICHBUT Switch {
-       whichChoice 0
-       choice [
-        Shape {
-         appearance DEF BUTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-          coord Coordinate2D {
-           point [-8 7.5 -3 7.5 -3 -7.5 -8 -7.5 0 7.5 5 7.5 5 -7.5 0 -7.5]
-          }
-         }
-        }
-        Shape {
-         appearance USE BUTAPP
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coord Coordinate2D {
-           point [-8 7.5 -8 -7.5 5 0]
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TRSTOP Transform2D {
-     translation -60 0
-     children [
-      DEF STOP TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry Rectangle {
-        size 15 15
-       }
-      }
-     ]
-    }
-    DEF TRFF Transform2D {
-     translation -20 0
-     children [
-      DEF FASTF TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry IndexedFaceSet2D {
-        colorPerVertex FALSE
-        coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-        coord Coordinate2D {
-         point [-8 7.5 -5 0 -8 -7.5 2 0 -2 7.5 1 0 -2 -7.5 8 0]
-        }
-       }
-      }
-     ]
-    }
-    DEF TRLOOP Transform2D {
-     translation 20 0
-     children [
-      DEF LOOP TouchSensor {}
-      Shape {
-       appearance Appearance {
-        material DEF MAT_LOOP Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Circle {
-        radius 6
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -160
-     children [
-      DEF TS TouchSensor {}
-      Transform2D {
-       children [
-        Shape {
-         appearance USE BUTAPP
-         geometry DEF PROGBAR Rectangle {
-          size 200 15
-         }
-        }
-       ]
-      }
-      DEF CURS Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            width 4
-           }
-          }
-         }
-         geometry Rectangle {
-          size 6 15
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TIMER Transform2D {
-     translation 80 0
-     children [
-      DEF RTIME TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry DEF TIME Text {
-        string [""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_cursor
-   eventIn SFVec3f set_seek
-   eventIn SFBool restart
-   eventIn SFBool rev_time
-   eventIn SFBool pause
-   eventIn SFBool stop
-   eventIn SFBool set_loop
-   eventIn SFBool set_ff
-   eventIn SFTime set_duration
-   field SFNode loop USE MAT_LOOP
-   field SFNode app USE CURS
-   field SFNode ctrl USE MC
-   field SFNode bar USE PROGBAR
-   field SFNode txt USE TIME
-   field SFNode but USE WHICHBUT
-   field SFNode pan USE PANEL
-   field SFTime curSeek 0
-   field SFInt32 isDown 0
-   field SFBool reverse FALSE
-   field SFBool isPaused FALSE
-   field SFBool isLooping FALSE
-   field SFTime duration -1
-   eventOut SFFloat fraction_changed
-   url ["javascript:
-   function set_duration(value, timestamp) {
-    duration = value;
-   }
-   function set_loop(value, timestamp) {
-    if (!value) return;
-    isLooping = !isLooping;
-    loop.filled = isLooping;
-    ctrl.loop = isLooping;
-   }
-   function pause(value, timestamp) {
-    if (!value) return;
-    if (isPaused) {
-     ctrl.mediaSpeed = 1;
-     but.whichChoice = 0;
-    } else {
-     ctrl.mediaSpeed = 0;
-     but.whichChoice = 1;
-     ctrl.mediaStartTime = -1;
-    }
-    isPaused = !isPaused;
-   }
-   function stop(value, timestamp) {
-    if (!value) return;
-    txt.string[0] = '';
-    app.translation.x = - bar.size.x / 2;
-    ctrl.mediaStartTime = 0;
-    ctrl.mediaSpeed = 0;
-    but.whichChoice = 1;
-    isPaused = 1;
-   }
-   function rev_time(value, timestamp) {
-    if (value) reverse = !reverse;
-   }
-   function set_time(value, timestamp) {
-    timing = new String('');
-    if (duration>=0) { 
-     if (!isLooping && value + 0.1 >=duration) {
-      stop(true, timestamp);
-      return;
-     }
-    }
-    if (isPaused) return;
-    if (duration>=0 && reverse) {
-     value = duration - value;
-     if (value<0) value=0;
-     timing += '-';
-    } else {
-     timing += ' ';
-    }
-    hours = 0;mins = 0;secs = 0;
-    if (value) {
-     hours = Math.floor(value/3600);
-     value -= hours*3600;
-     mins = Math.floor(value / 60);
-     value -= mins*60;
-     secs = Math.floor(value);
-    }
-    if (hours<10) timing += '0';
-    timing += hours + ':';
-    if (mins<10) timing += '0';
-    timing += mins + ':';
-    if (secs<10) timing += '0';
-    timing += secs;
-    txt.string[0] = timing;
-   }
-   function set_cursor(value, timestamp) {
-    set_time(value, timestamp);
-    if (duration<0) return;
-    if (ctrl.mediaSpeed && isDown != 1) {
-     if (value>duration) value = duration;
-     pos = value;
-     pos /= duration;
-     app.translation.x = bar.size.x * (pos - 0.5);
-     fraction_changed = pos;
-    }
-   }
-   function set_seek(myval, timestamp) {
-    if (duration<0) return;
-    pos = myval[0]; 
-    pos /= bar.size.x;
-    pos += 0.5;
-    if (pos>1) pos = 0;
-    curSeek = duration;
-    curSeek *= pos;
-    if (isDown == 1) {
-     app.translation.x = bar.size.x*(pos - 0.5);
-    } else if (isDown==2) {
-     isDown = 0;
-    }
-   }
-   function restart(myval, timestamp) {
-    if (myval) {
-     ctrl.mediaSpeed = 0;
-     isDown = 1;
-    } else if (isDown == 1) {
-     ctrl.mediaStartTime = curSeek;
-     ctrl.mediaSpeed = 1;
-     isDown = 2;
-     but.whichChoice = 0;
-     isPaused = FALSE;
-    }
-   }
-   function set_ff(value, timestamp) {
-    ctrl.mediaStartTime = -1;
-    if (value) {
-     ctrl.mediaSpeed = 2;
-    } else {
-     ctrl.mediaSpeed = 1;
-    }
-   }
-   "   ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO SC.set_cursor
-ROUTE TS.hitPoint_changed TO SC.set_seek
-ROUTE TS.isActive TO SC.restart
-ROUTE RTIME.isActive TO SC.rev_time
-ROUTE PAUSE.isActive TO SC.pause
-ROUTE STOP.isActive TO SC.stop
-ROUTE LOOP.isActive TO SC.set_loop
-ROUTE FASTF.isActive TO SC.set_ff
-ROUTE MS.mediaDuration TO SC.set_duration
-ROUTE FASTF.isActive TO SC.set_ff
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_audio.aac"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-complete.bt Deleted

@@ -1,266 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows complex scripting and MediaControl" "providing complete control of the media" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
-  Sound2D {
-   source AudioSource {
-    url [od:10]
-    stopTime -1
-   }
-  }
-  DEF MC MediaControl {
-   url [od:10]
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF PANEL Transform2D {
-   translation 0 85
-   children [
-    DEF TRPAUSE Transform2D {
-     translation -100 0
-     children [
-      DEF PAUSE TouchSensor {}
-      DEF WHICHBUT Switch {
-       whichChoice 0
-       choice [
-        Shape {
-         appearance DEF BUTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-          coord Coordinate2D {
-           point [-8 7.5 -3 7.5 -3 -7.5 -8 -7.5 0 7.5 5 7.5 5 -7.5 0 -7.5]
-          }
-         }
-        }
-        Shape {
-         appearance USE BUTAPP
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coord Coordinate2D {
-           point [-8 7.5 -8 -7.5 5 0]
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TRSTOP Transform2D {
-     translation -60 0
-     children [
-      DEF STOP TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry Rectangle {
-        size 15 15
-       }
-      }
-     ]
-    }
-    DEF TRFF Transform2D {
-     translation -20 0
-     children [
-      DEF FASTF TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry IndexedFaceSet2D {
-        colorPerVertex FALSE
-        coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-        coord Coordinate2D {
-         point [-8 7.5 -5 0 -8 -7.5 2 0 -2 7.5 1 0 -2 -7.5 8 0]
-        }
-       }
-      }
-     ]
-    }
-    DEF TRLOOP Transform2D {
-     translation 20 0
-     children [
-      DEF LOOP TouchSensor {}
-      Shape {
-       appearance Appearance {
-        material DEF MAT_LOOP Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Circle {
-        radius 6
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -170
-     children [
-      DEF TS TouchSensor {}
-      Transform2D {
-       children [
-        Shape {
-         appearance USE BUTAPP
-         geometry DEF PROGBAR Rectangle {
-          size 200 15
-         }
-        }
-       ]
-      }
-      DEF CURS Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            width 4
-           }
-          }
-         }
-         geometry Rectangle {
-          size 6 15
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TIMER Transform2D {
-     translation 80 0
-     children [
-      DEF RTIME TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry DEF TIME Text {
-        string [""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_cursor
-   eventIn SFVec3f set_seek
-   eventIn SFBool restart
-   eventIn SFBool rev_time
-   eventIn SFBool pause
-   eventIn SFBool stop
-   eventIn SFBool set_loop
-   eventIn SFBool set_ff
-   eventIn SFTime set_duration
-   field SFNode loop USE MAT_LOOP
-   field SFNode app USE CURS
-   field SFNode ctrl USE MC
-   field SFNode bar USE PROGBAR
-   field SFNode txt USE TIME
-   field SFNode but USE WHICHBUT
-   field SFNode pan USE PANEL
-   field SFTime curSeek 0
-   field SFInt32 isDown 0
-   field SFBool reverse FALSE
-   field SFBool isPaused FALSE
-   field SFBool isLooping FALSE
-   field SFTime duration -1
-   eventOut SFFloat fraction_changed
-   url ["javascript:function set_duration(value, timestamp) {duration = value;}function set_loop(value, timestamp) {if (!value) return;isLooping = !isLooping;loop.filled = isLooping;ctrl.loop = isLooping;}function pause(value, timestamp) {if (!value) return;if (isPaused) {ctrl.mediaSpeed = 1;but.whichChoice = 0;} else {ctrl.mediaSpeed = 0;but.whichChoice = 1;ctrl.mediaStartTime = -1;}isPaused = !isPaused;}function stop(value, timestamp) {if (!value) return;txt.string[0] = '';app.translation.x = - bar.size.x / 2;ctrl.mediaStartTime = 0;ctrl.mediaSpeed = 0;but.whichChoice = 1;isPaused = 1;}function rev_time(value, timestamp) {if (value) reverse = !reverse;}function set_time(value, timestamp) {timing = new String('');if (duration>=0) { if (!isLooping && value + 0.1 >=duration) {stop(true, timestamp);return;}}if (isPaused) return;if (duration>=0 && reverse) {value = duration - value;if (value<0) value=0;timing += '-';} else {timing += ' ';}hours = 0;mins = 0;secs = 0;if (value) {hours = Math.floor(value/3600);value -= hours*3600;mins = Math.floor(value / 60);value -= mins*60;secs = Math.floor(value);}if (hours<10) timing += '0';timing += hours + ':';if (mins<10) timing += '0';timing += mins + ':';if (secs<10) timing += '0';timing += secs;txt.string[0] = timing;}function set_cursor(value, timestamp) {set_time(value, timestamp);if (duration<0) return;if (ctrl.mediaSpeed && isDown != 1) {if (value>duration) value = duration;pos = value;pos /= duration;app.translation.x = bar.size.x * (pos - 0.5);fraction_changed = pos;} }function set_seek(myval, timestamp) {if (duration<0) return;pos = myval[0]; pos /= bar.size.x;pos += 0.5;if (pos>1) pos = 0;curSeek = duration;curSeek *= pos;if (isDown == 1) {app.translation.x = bar.size.x*(pos - 0.5);} else if (isDown==2) {isDown = 0;}}function restart(myval, timestamp) {if (myval) {ctrl.mediaSpeed = 0;isDown = 1;} else if (isDown == 1) {ctrl.mediaStartTime = curSeek;ctrl.mediaSpeed = 1;isDown = 2;but.whichChoice = 0;isPaused = FALSE;}}function set_ff(value, timestamp) {ctrl.mediaStartTime = -1;if (value) {ctrl.mediaSpeed = 4;} else {ctrl.mediaSpeed = 1;}}"   ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO SC.set_cursor
-ROUTE TS.hitPoint_changed TO SC.set_seek
-ROUTE TS.isActive TO SC.restart
-ROUTE RTIME.isActive TO SC.rev_time
-ROUTE PAUSE.isActive TO SC.pause
-ROUTE STOP.isActive TO SC.stop
-ROUTE LOOP.isActive TO SC.set_loop
-ROUTE FASTF.isActive TO SC.set_ff
-ROUTE MS.mediaDuration TO SC.set_duration
-ROUTE FASTF.isActive TO SC.set_ff
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_audio.aac"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-deactivation.bt Deleted

@@ -1,105 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MediaControl and mediaSensor" "used to watch deactivation of a node" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   mediaStartTime 2
-   mediaStopTime 4
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  Transform2D {
-   translation 0 -80
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF V Valuator {}
- ]
-}
-
-ROUTE MS.isActive TO V.inSFBool
-ROUTE V.outMFString TO TXT.string
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-http.bt Deleted

@@ -1,340 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 320
-     pixelHeight 220
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows complex scripting and MediaControl" "providing complete control of an inline scene" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Inline {
-   url [od:8]
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF PANEL Transform2D {
-   translation 0 100
-   children [
-    DEF TRPAUSE Transform2D {
-     translation -100 0
-     children [
-      DEF PAUSE TouchSensor {}
-      DEF WHICHBUT Switch {
-       whichChoice 0
-       choice [
-        Shape {
-         appearance DEF BUTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-          coord Coordinate2D {
-           point [-8 7.5 -3 7.5 -3 -7.5 -8 -7.5 0 7.5 5 7.5 5 -7.5 0 -7.5]
-          }
-         }
-        }
-        Shape {
-         appearance USE BUTAPP
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coord Coordinate2D {
-           point [-8 7.5 -8 -7.5 5 0]
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TRSTOP Transform2D {
-     translation -60 0
-     children [
-      DEF STOP TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry Rectangle {
-        size 15 15
-       }
-      }
-     ]
-    }
-    DEF TRFF Transform2D {
-     translation -20 0
-     children [
-      DEF FASTF TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry IndexedFaceSet2D {
-        colorPerVertex FALSE
-        coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-        coord Coordinate2D {
-         point [-8 7.5 -5 0 -8 -7.5 2 0 -2 7.5 1 0 -2 -7.5 8 0]
-        }
-       }
-      }
-     ]
-    }
-    DEF TRLOOP Transform2D {
-     translation 20 0
-     children [
-      DEF LOOP TouchSensor {}
-      Shape {
-       appearance Appearance {
-        material DEF MAT_LOOP Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Circle {
-        radius 6
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -200
-     children [
-      DEF TS TouchSensor {}
-      Transform2D {
-       children [
-        Shape {
-         appearance USE BUTAPP
-         geometry DEF PROGBAR Rectangle {
-          size 200 15
-         }
-        }
-       ]
-      }
-      DEF CURS Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            width 4
-           }
-          }
-         }
-         geometry Rectangle {
-          size 6 15
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TIMER Transform2D {
-     translation 80 0
-     children [
-      DEF RTIME TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry DEF TIME Text {
-        string [""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_cursor
-   eventIn SFVec3f set_seek
-   eventIn SFBool restart
-   eventIn SFBool rev_time
-   eventIn SFBool pause
-   eventIn SFBool stop
-   eventIn SFBool set_loop
-   eventIn SFBool set_ff
-   eventIn SFTime set_duration
-   field SFNode loop USE MAT_LOOP
-   field SFNode app USE CURS
-   field SFNode ctrl USE MC
-   field SFNode bar USE PROGBAR
-   field SFNode txt USE TIME
-   field SFNode but USE WHICHBUT
-   field SFNode pan USE PANEL
-   field SFTime curSeek 0
-   field SFInt32 isDown 0
-   field SFBool reverse FALSE
-   field SFBool isPaused FALSE
-   field SFBool isLooping FALSE
-   field SFTime duration -1
-   field SFBool reset_startTime FALSE
-   eventOut SFFloat fraction_changed
-   url ["javascript:
-   	function set_duration(value, timestamp) {
-   		duration = value;
-   	}
-   	function set_loop(value, timestamp) {
-   		if (!value) return;
-   		isLooping = !isLooping;
-   		loop.filled = isLooping;
-   		ctrl.loop = isLooping;
-   	}
-   	function pause(value, timestamp) {
-   		if (!value) return;
-   		if (isPaused) {
-   			ctrl.mediaSpeed = 1;
-   			but.whichChoice = 0;
-   			if (ctrl.mediaStartTime == 0) reset_startTime = TRUE;
-   		} else {
-   			ctrl.mediaSpeed = 0;
-   			but.whichChoice = 1;
-   			ctrl.mediaStartTime = -1;
-   		}
-   		isPaused = !isPaused;
-   	}
-   	function stop(value, timestamp) {
-   		if (!value || isPaused) return;
-   		txt.string[0] = '';
-   		app.translation.x = - bar.size.x / 2;
-   		ctrl.mediaStartTime = 0;
-   		ctrl.mediaSpeed = 0;
-   		but.whichChoice = 1;
-   		isPaused = 1;
-   	}
-   	function rev_time(value, timestamp) {if (value) reverse = !reverse;}
-   	function set_time(value, timestamp) {
-   		timing = new String('');
-   		if (isPaused) return;
-   		if (duration>=0.1) {
-   			 if (value + 0.1 >=duration) {
-   			 	if (!isLooping) {
-   			 		stop(true, timestamp);
-   			 	} else {
-   			 		ctrl.mediaStartTime = 0;
-   			 		reset_startTime = TRUE;
-   			 	}
-   			 	return;
-   			 }
-   			}
-   			if (reset_startTime) {
-   				ctrl.mediaStartTime = -1;
-   				reset_startTime = FALSE;
-   			}
-   			if (duration>=0 && reverse) {
-   				value = duration - value;
-   				if (value<0) value=0;
-   				timing += '-';
-   			} else {
-   				timing += ' ';
-   			}
-   			hours = 0;
-   			mins = 0;
-   			secs = 0;
-   			if (value) {
-   				hours = Math.floor(value/3600);value -= hours*3600;mins = Math.floor(value / 60);
-   				value -= mins*60;secs = Math.floor(value);
-   			}
-   			if (hours<10) timing += '0';timing += hours + ':';if (mins<10) timing += '0';timing += mins + ':';if (secs<10) timing += '0';timing += secs;txt.string[0] = timing;
-   		}
-   		function set_cursor(value, timestamp) {
-   			set_time(value, timestamp);
-   			if (duration<0) return;
-   			if (ctrl.mediaSpeed && isDown != 1) {
-   				if (value>duration) value = duration;
-   				pos = value;
-   				pos /= duration;
-   				app.translation.x = bar.size.x * (pos - 0.5);fraction_changed = pos;
-   			}
-   		}
-   		function set_seek(myval, timestamp) {
-   			if (duration<0) return;
-   			pos = myval[0]; 
-   			pos /= bar.size.x;pos += 0.5;
-   			if (pos>1) pos = 0;
-   			curSeek = duration;
-   			curSeek *= pos;
-   			if (isDown == 1) {
-   				app.translation.x = bar.size.x*(pos - 0.5);
-   			} else if (isDown==2) {isDown = 0;}
-   		}
-   		function restart(myval, timestamp) {
-   			if (myval) {
-   				ctrl.mediaSpeed = 0;
-   				isDown = 1;
-   			} else if (isDown == 1) {
-   				ctrl.mediaStartTime = curSeek;
-   				ctrl.mediaSpeed = 1;
-   				isDown = 2;
-   				but.whichChoice = 0;
-   				isPaused = FALSE;
-   			}
-   		}
-   		function set_ff(value, timestamp) {
-   			ctrl.mediaStartTime = -1;
-   			if (value) {
-   				ctrl.mediaSpeed = 8;
-   			} else {
-   				ctrl.mediaSpeed = 1;
-   			}
-   		}
-   		"
-     ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO SC.set_cursor
-ROUTE TS.hitPoint_changed TO SC.set_seek
-ROUTE TS.isActive TO SC.restart
-ROUTE RTIME.isActive TO SC.rev_time
-ROUTE PAUSE.isActive TO SC.pause
-ROUTE STOP.isActive TO SC.stop
-ROUTE LOOP.isActive TO SC.set_loop
-ROUTE FASTF.isActive TO SC.set_ff
-ROUTE MS.mediaDuration TO SC.set_duration
-ROUTE FASTF.isActive TO SC.set_ff
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    URLstring ""http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/mp4/counter_video_360.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-inline-av-inline.bt Deleted

@@ -1,96 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   OCR_ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-    title "Simple Audio-video scene"
-    info [
-      "This simple scene contains an audio stream and a video stream."
-      "It is used by other regression tests."
-      "" 
-      "GPAC Regression Tests" 
-      "$Date: 2007-07-31 13:12:35 $ - $Revision: 1.4 $" 
-      "(C) 2002-2004 GPAC Team"
-    ]
-  }
-  Background2D {}
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
-  Sound2D {
-   source AudioSource {
-    url [od:10]
-    stopTime -1
-   }
-  }
- ]
-}
-
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 1
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_audio.aac"
-      }
-     }
-    ]
-   }
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 1
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/enst_video.h264"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-inline-av.bt Deleted

@@ -1,231 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows complex scripting and MediaControl" "providing complete control of an inline scene" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Inline {
-   url [od:8]
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF PANEL Transform2D {
-   translation 0 80
-   children [
-    DEF TRPAUSE Transform2D {
-     translation -100 0
-     children [
-      DEF PAUSE TouchSensor {}
-      DEF WHICHBUT Switch {
-       whichChoice 0
-       choice [
-        Shape {
-         appearance DEF BUTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-          coord Coordinate2D {
-           point [-8 7.5 -3 7.5 -3 -7.5 -8 -7.5 0 7.5 5 7.5 5 -7.5 0 -7.5]
-          }
-         }
-        }
-        Shape {
-         appearance USE BUTAPP
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coord Coordinate2D {
-           point [-8 7.5 -8 -7.5 5 0]
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TRSTOP Transform2D {
-     translation -60 0
-     children [
-      DEF STOP TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry Rectangle {
-        size 15 15
-       }
-      }
-     ]
-    }
-    DEF TRFF Transform2D {
-     translation -20 0
-     children [
-      DEF FASTF TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry IndexedFaceSet2D {
-        colorPerVertex FALSE
-        coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-        coord Coordinate2D {
-         point [-8 7.5 -5 0 -8 -7.5 2 0 -2 7.5 1 0 -2 -7.5 8 0]
-        }
-       }
-      }
-     ]
-    }
-    DEF TRLOOP Transform2D {
-     translation 20 0
-     children [
-      DEF LOOP TouchSensor {}
-      Shape {
-       appearance Appearance {
-        material DEF MAT_LOOP Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Circle {
-        radius 6
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -160
-     children [
-      DEF TS TouchSensor {}
-      Transform2D {
-       children [
-        Shape {
-         appearance USE BUTAPP
-         geometry DEF PROGBAR Rectangle {
-          size 200 15
-         }
-        }
-       ]
-      }
-      DEF CURS Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            width 4
-           }
-          }
-         }
-         geometry Rectangle {
-          size 6 15
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TIMER Transform2D {
-     translation 80 0
-     children [
-      DEF RTIME TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry DEF TIME Text {
-        string [""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_cursor
-   eventIn SFVec3f set_seek
-   eventIn SFBool restart
-   eventIn SFBool rev_time
-   eventIn SFBool pause
-   eventIn SFBool stop
-   eventIn SFBool set_loop
-   eventIn SFBool set_ff
-   eventIn SFTime set_duration
-   field SFNode loop USE MAT_LOOP
-   field SFNode app USE CURS
-   field SFNode ctrl USE MC
-   field SFNode bar USE PROGBAR
-   field SFNode txt USE TIME
-   field SFNode but USE WHICHBUT
-   field SFNode pan USE PANEL
-   field SFTime curSeek 0
-   field SFInt32 isDown 0
-   field SFBool reverse FALSE
-   field SFBool isPaused FALSE
-   field SFBool isLooping FALSE
-   field SFTime duration -1
-   field SFBool reset_startTime FALSE
-   eventOut SFFloat fraction_changed
-   url ["javascript:function set_duration(value, timestamp) {duration = value;}function set_loop(value, timestamp) {if (!value) return;isLooping = !isLooping;loop.filled = isLooping;ctrl.loop = isLooping;}function pause(value, timestamp) {if (!value) return;if (isPaused) {ctrl.mediaSpeed = 1;but.whichChoice = 0;if (ctrl.mediaStartTime == 0) reset_startTime = TRUE;} else {ctrl.mediaSpeed = 0;but.whichChoice = 1;ctrl.mediaStartTime = -1;}isPaused = !isPaused;}function stop(value, timestamp) {if (!value || isPaused) return;txt.string[0] = '';app.translation.x = - bar.size.x / 2;ctrl.mediaStartTime = 0;ctrl.mediaSpeed = 0;but.whichChoice = 1;isPaused = 1;}function rev_time(value, timestamp) {if (value) reverse = !reverse;}function set_time(value, timestamp) {timing = new String('');if (isPaused) return;if (duration>=0) { if (value + 0.1 >=duration) {if (!isLooping) {stop(true, timestamp);} else {ctrl.mediaStartTime = 0;reset_startTime = TRUE;}return;}}if (reset_startTime) {ctrl.mediaStartTime = -1;reset_startTime = FALSE;}if (duration>=0 && reverse) {value = duration - value;if (value<0) value=0;timing += '-';} else {timing += ' ';}hours = 0;mins = 0;secs = 0;if (value) {hours = Math.floor(value/3600);value -= hours*3600;mins = Math.floor(value / 60);value -= mins*60;secs = Math.floor(value);}if (hours<10) timing += '0';timing += hours + ':';if (mins<10) timing += '0';timing += mins + ':';if (secs<10) timing += '0';timing += secs;txt.string[0] = timing;}function set_cursor(value, timestamp) {set_time(value, timestamp);if (duration<0) return;if (ctrl.mediaSpeed && isDown != 1) {if (value>duration) value = duration;pos = value;pos /= duration;app.translation.x = bar.size.x * (pos - 0.5);fraction_changed = pos;} }function set_seek(myval, timestamp) {if (duration<0) return;pos = myval[0]; pos /= bar.size.x;pos += 0.5;if (pos>1) pos = 0;curSeek = duration;curSeek *= pos;if (isDown == 1) {app.translation.x = bar.size.x*(pos - 0.5);} else if (isDown==2) {isDown = 0;}}function restart(myval, timestamp) {if (myval) {ctrl.mediaSpeed = 0;isDown = 1;} else if (isDown == 1) {ctrl.mediaStartTime = curSeek;ctrl.mediaSpeed = 1;isDown = 2;but.whichChoice = 0;isPaused = FALSE;}}function set_ff(value, timestamp) {ctrl.mediaStartTime = -1;if (value) {ctrl.mediaSpeed = 8;} else {ctrl.mediaSpeed = 1;}}"   ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO SC.set_cursor
-ROUTE TS.hitPoint_changed TO SC.set_seek
-ROUTE TS.isActive TO SC.restart
-ROUTE RTIME.isActive TO SC.rev_time
-ROUTE PAUSE.isActive TO SC.pause
-ROUTE STOP.isActive TO SC.stop
-ROUTE LOOP.isActive TO SC.set_loop
-ROUTE FASTF.isActive TO SC.set_ff
-ROUTE MS.mediaDuration TO SC.set_duration
-ROUTE FASTF.isActive TO SC.set_ff
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    URLstring "bifs-timeline-mediacontrol-inline-av-inline.mp4"
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-inline-segments-inline.bt Deleted

@@ -1,81 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 254
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 254
- graphicsProfileLevelIndication 254
- ODProfileLevelIndication 254
- includeInlineProfileLevelFlag true
- esDescr [
-  ES_Descriptor {
-   ES_ID 5
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 576
-     pixelHeight 432
-    }
-   }
-  }
- ]
- ociDescr [
-  SegmentDescriptor {
-   startTime 0
-   duration 3
-   name "red"
-  }
-  SegmentDescriptor {
-   startTime 3
-   duration 3
-   name "green"
-  }
-  SegmentDescriptor {
-   startTime 6
-   duration 3
-   name "blue"
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  WorldInfo {
-    title "Simple BIFS stream with chapters"
-    info [
-      "This simple scene contains a BIFS stream with the definition of 3 segments."
-      "It is used by other regression tests."
-      "" 
-      "GPAC Regression Tests" 
-      "$Date: 2007-07-31 13:12:35 $ - $Revision: 1.3 $" 
-      "(C) 2002-2004 GPAC Team"
-    ]
-  }
-    Shape {
-   appearance Appearance {
-    material DEF M Material2D {
-     emissiveColor 1 0 0
-     filled TRUE
-    }
-   }
-   geometry Rectangle {
-    size 200 100
-   }
-  }
- ]
-}
-
-
-AT 3000 {
- REPLACE M.emissiveColor BY 0 1 0
-}
-
-AT 6000 {
- REPLACE M.emissiveColor BY 0 0 1
-}
-
-AT 9000 {
- REPLACE M.emissiveColor BY 0 0 1
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-inline-segments.bt Deleted

@@ -1,66 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   OCR_ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     nodeIDbits 10
-     routeIDbits 10
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 600
-     pixelHeight 400
-    }
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows inline scene with segments" "and mediaControl on each of the inline segments" "" "GPAC Regression Tests" "$Date: 2008-08-21 17:05:41 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "MediaControl and Inline"
-  }
-  Inline {
-   url ["bifs-timeline-mediacontrol-inline-segments-inline.mp4"]
-  }
-  MediaSensor {
-   url ["bifs-timeline-mediacontrol-inline-segments-inline.mp4"]
-  }
-  MediaControl {
-   url ["bifs-timeline-mediacontrol-inline-segments-inline.mp4#red" "bifs-timeline-mediacontrol-inline-segments-inline.mp4#blue" "bifs-timeline-mediacontrol-inline-segments-inline.mp4#green"]
-   loop TRUE
-  }
-  Transform2D {
-   translation 0 -100
-   children [
-    Shape {
-     appearance Appearance {
-      material Material2D {
-       filled TRUE
-       emissiveColor 0 0 0
-      }
-     }
-     geometry Text {
-      string ["Colors should alternate between" "red, blue and green in order"]
-      fontStyle FontStyle {
-       justify ["MIDDLE"]
-       size 30
-      }
-     }
-    }
-   ]
-  }
-  
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-segments.bt Deleted

@@ -1,154 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows chapter selection" "through segment switching in MediaControl" "" "GPAC Regression Tests" "$Date: 2008-08-28 16:17:57 $ - $Revision: 1.4 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-    DEF TS TouchSensor {}
-   ]
-  }
-#if 0
-  Sound2D {
-   source DEF ASRC AudioSource {
-    url [od:10]
-   }
-  }
-#endif
-  DEF MC MediaControl {
-   url ["od:8#Begin" "od:8#End"]
-   loop TRUE
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  Transform2D {
-   translation 0 -80
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 0 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  DEF V Valuator {}
-  DEF C Conditional {
-   buffer {
-    REPLACE MC.url BY ["od:8#Middle"]
-   }
-  }
-  DEF RC Conditional {
-   buffer {
-    REPLACE MC.url BY ["od:8#Begin" "od:8#End"]
-   }
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO V.inSFTime
-ROUTE V.outMFString TO TXT.string
-ROUTE TS.isOver TO C.activate
-ROUTE TS.isOver TO RC.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-    ociDescr [
-     SegmentDescriptor {
-      startTime 0
-      duration 4
-      name "Begin"
-     }
-     SegmentDescriptor {
-      startTime 4
-      duration 2
-      name "Middle"
-     }
-     SegmentDescriptor {
-      startTime 6
-      duration 4
-      name "End"
-     }
-    ]
-   }
-#if 0
-   ObjectDescriptor {
-    objectDescriptorID 10
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_english.mp3"
-      }
-     }
-    ]
-   }
-#endif
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-video.bt Deleted

@@ -1,258 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 240
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows complete control of media" "through scripting and MediaControl" "" "GPAC Regression Tests" "$Date: 2009-12-07 13:19:33 $ - $Revision: 1.5 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  Transform2D {
-   children [
-    Shape {
-     appearance Appearance {
-      texture DEF MT MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   preRoll FALSE
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF PANEL Transform2D {
-   translation 0 80
-   children [
-    DEF TRPAUSE Transform2D {
-     translation -100 0
-     children [
-      DEF PAUSE TouchSensor {}
-      DEF WHICHBUT Switch {
-       whichChoice 0
-       choice [
-        Shape {
-         appearance DEF BUTAPP Appearance {
-          material Material2D {
-           emissiveColor 0 0 0
-           filled TRUE
-          }
-         }
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-          coord Coordinate2D {
-           point [-8 7.5 -3 7.5 -3 -7.5 -8 -7.5 0 7.5 5 7.5 5 -7.5 0 -7.5]
-          }
-         }
-        }
-        Shape {
-         appearance USE BUTAPP
-         geometry IndexedFaceSet2D {
-          colorPerVertex FALSE
-          coord Coordinate2D {
-           point [-8 7.5 -8 -7.5 5 0]
-          }
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TRSTOP Transform2D {
-     translation -60 0
-     children [
-      DEF STOP TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry Rectangle {
-        size 15 15
-       }
-      }
-     ]
-    }
-    DEF TRFF Transform2D {
-     translation -20 0
-     children [
-      DEF FASTF TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry IndexedFaceSet2D {
-        colorPerVertex FALSE
-        coordIndex [0 1 2 3 -1 4 5 6 7 -1]
-        coord Coordinate2D {
-         point [-8 7.5 -5 0 -8 -7.5 2 0 -2 7.5 1 0 -2 -7.5 8 0]
-        }
-       }
-      }
-     ]
-    }
-    DEF TRLOOP Transform2D {
-     translation 20 0
-     children [
-      DEF LOOP TouchSensor {}
-      Shape {
-       appearance Appearance {
-        material DEF MAT_LOOP Material2D {
-         emissiveColor 0 0 0
-        }
-       }
-       geometry Circle {
-        radius 6
-       }
-      }
-     ]
-    }
-    Transform2D {
-     translation 0 -160
-     children [
-      DEF TS TouchSensor {}
-      Transform2D {
-       children [
-        Shape {
-         appearance USE BUTAPP
-         geometry DEF PROGBAR Rectangle {
-          size 200 15
-         }
-        }
-       ]
-      }
-      DEF CURS Transform2D {
-       children [
-        Shape {
-         appearance Appearance {
-          material Material2D {
-           lineProps LineProperties {
-            lineColor 0 0 1
-            width 4
-           }
-          }
-         }
-         geometry Rectangle {
-          size 6 15
-         }
-        }
-       ]
-      }
-     ]
-    }
-    DEF TIMER Transform2D {
-     translation 80 0
-     children [
-      DEF RTIME TouchSensor {}
-      Shape {
-       appearance USE BUTAPP
-       geometry DEF TIME Text {
-        string [""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  DEF SC Script {
-   eventIn SFTime set_cursor
-   eventIn SFVec3f set_seek
-   eventIn SFBool restart
-   eventIn SFBool rev_time
-   eventIn SFBool pause
-   eventIn SFBool stop
-   eventIn SFBool set_loop
-   eventIn SFBool set_ff
-   eventIn SFTime set_duration
-   field SFNode loop USE MAT_LOOP
-   field SFNode app USE CURS
-   field SFNode ctrl USE MC
-   field SFNode bar USE PROGBAR
-   field SFNode txt USE TIME
-   field SFNode but USE WHICHBUT
-   field SFNode pan USE PANEL
-   field SFTime curSeek 0
-   field SFInt32 isDown 0
-   field SFBool reverse FALSE
-   field SFBool isPaused FALSE
-   field SFBool isLooping FALSE
-   field SFTime duration -1
-   eventOut SFFloat fraction_changed
-   url ["javascript:
-function set_duration(value, timestamp) {duration = value;}
-function set_loop(value, timestamp) {if (!value) return;isLooping = !isLooping;loop.filled = isLooping;ctrl.loop = isLooping;}
-function pause(value, timestamp) {if (!value) return;if (isPaused) {ctrl.mediaSpeed = 1;but.whichChoice = 0;} else {ctrl.mediaSpeed = 0;but.whichChoice = 1;ctrl.mediaStartTime = -1;}isPaused = !isPaused;}
-function stop(value, timestamp) {if (!value) return;txt.string[0] = '';app.translation.x = - bar.size.x / 2;ctrl.mediaStartTime = 0;ctrl.mediaSpeed = 0;but.whichChoice = 1;isPaused = 1;}
-function rev_time(value, timestamp) {if (value) reverse = !reverse;}
-function set_time(value, timestamp) {timing = new String('');if (duration>=0) { if (!isLooping && value + 0.1 >=duration) {stop(true, timestamp);print('script stop ' + value + ' ' + duration);return;}}if (isPaused) return;if (duration>=0 && reverse) {value = duration - value;if (value<0) value=0;timing += '-';} else {timing += ' ';}hours = 0;mins = 0;secs = 0;if (value) {hours = Math.floor(value/3600);value -= hours*3600;mins = Math.floor(value / 60);value -= mins*60;secs = Math.floor(value);}if (hours<10) timing += '0';timing += hours + ':';if (mins<10) timing += '0';timing += mins + ':';if (secs<10) timing += '0';timing += secs;txt.string[0] = timing;}
-function set_cursor(value, timestamp) {set_time(value, timestamp); if (duration<0) return;if (ctrl.mediaSpeed && isDown != 1) {if (value>duration) value = duration;pos = value;pos /= duration;app.translation.x = bar.size.x * (pos - 0.5);fraction_changed = pos;} }
-function set_seek(myval, timestamp) {if (duration<0) return;pos = myval[0]; pos /= bar.size.x;pos += 0.5;if (pos>1) pos = 0;curSeek = duration;curSeek *= pos;if (isDown == 1) {app.translation.x = bar.size.x*(pos - 0.5);} else if (isDown==2) {isDown = 0;}}
-function restart(myval, timestamp) {if (myval) {ctrl.mediaSpeed = 0;isDown = 1;} else if (isDown == 1) {ctrl.mediaStartTime = curSeek;ctrl.mediaSpeed = 1;isDown = 2;but.whichChoice = 0;isPaused = FALSE;}}
-function set_ff(value, timestamp) {ctrl.mediaStartTime = -1;if (value) {ctrl.mediaSpeed = 4;} else {ctrl.mediaSpeed = 1;}}"   ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO SC.set_cursor
-ROUTE TS.hitPoint_changed TO SC.set_seek
-ROUTE TS.isActive TO SC.restart
-ROUTE RTIME.isActive TO SC.rev_time
-ROUTE PAUSE.isActive TO SC.pause
-ROUTE STOP.isActive TO SC.stop
-ROUTE LOOP.isActive TO SC.set_loop
-ROUTE FASTF.isActive TO SC.set_ff
-ROUTE MS.mediaDuration TO SC.set_duration
-ROUTE FASTF.isActive TO SC.set_ff
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediacontrol-videospeed.bt Deleted

@@ -1,202 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 200
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows MediaControl" "controling video playback speed" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "Media Control Test"
-  }
-  DEF MC MediaControl {
-   url [od:8]
-   loop TRUE
-  }
-  Transform2D {
-   translation -100 -65
-   children [
-    DEF TS1 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M1 Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance DEF TXTAPP Appearance {
-        material Material2D {
-         emissiveColor 0 0 0
-         filled TRUE
-        }
-       }
-       geometry Text {
-        string ["Speed" "x4"]
-        fontStyle DEF FS FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-         size 18
-        }
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 100 -65
-   children [
-    DEF TS2 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M2 Material2D {
-       emissiveColor 0 0 1
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Speed" "x0.5"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 -65
-   children [
-    DEF TS3 TouchSensor {}
-    Shape {
-     appearance Appearance {
-      material DEF M3 Material2D {
-       emissiveColor 0 1 0
-       filled TRUE
-      }
-     }
-     geometry Circle {
-      radius 30
-     }
-    }
-    Transform2D {
-     children [
-      Shape {
-       appearance USE TXTAPP
-       geometry Text {
-        string ["Mute"]
-        fontStyle USE FS
-       }
-      }
-     ]
-    }
-   ]
-  }
-  Transform2D {
-   translation 0 30
-   children [
-    Shape {
-     appearance Appearance {
-      texture MovieTexture {
-       url [od:8]
-      }
-     }
-     geometry Bitmap {}
-
-    }
-   ]
-  }
-  DEF C1 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 4
-    REPLACE M1.emissiveColor BY 1 0.5 0.5
-   }
-  }
-  DEF C2 Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 0.5
-    REPLACE M2.emissiveColor BY 0.5 0.5 1
-   }
-  }
-  DEF C3 Conditional {
-   buffer {
-    REPLACE MC.mute BY TRUE
-    REPLACE M3.emissiveColor BY 0.5 1 0.5
-   }
-  }
-  DEF RESET Conditional {
-   buffer {
-    REPLACE MC.mediaSpeed BY 1
-    REPLACE MC.mute BY FALSE
-    REPLACE M1.emissiveColor BY 1 0 0
-    REPLACE M2.emissiveColor BY 0 0 1
-    REPLACE M3.emissiveColor BY 0 1 0
-   }
-  }
- ]
-}
-
-ROUTE TS1.isOver TO C1.activate
-ROUTE TS1.isOver TO RESET.reverseActivate
-ROUTE TS2.isOver TO C2.activate
-ROUTE TS2.isOver TO RESET.reverseActivate
-ROUTE TS3.isOver TO C3.activate
-ROUTE TS3.isOver TO RESET.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 21
-      OCR_ES_ID 21
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediasensor-segment-switch.bt Deleted

@@ -1,226 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of MediaSensor" "with media segments defined" "and dynamic changes of watched segments" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MediaSensor Test #3"
-  }
-  Shape {
-   appearance Appearance {
-    texture DEF MOV MovieTexture {
-     loop TRUE
-     stopTime -1
-     url [od:8]
-     repeatS FALSE
-     repeatT FALSE
-    }
-   }
-   geometry Bitmap {}
-
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF MSALL MediaSensor {
-   url [od:8]
-  }
-  DEF VAL Valuator {}
-  DEF VAL2 Valuator {}
-  Transform2D {
-   translation 50 -90
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Media Time:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -60 -120
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Start Time:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 70 -120
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF START Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF VAL3 Valuator {}
-  Transform2D {
-   translation -50 120
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Name:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 50 120
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF NAME Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -70 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Duration: "]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 60 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT2 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF S Script {
-   eventIn SFBool switch_seg
-   field SFNode ms_node USE MS
-   field SFInt32 num_seg 0
-   url ["javascript:function switch_seg(value, timestamp) {if (value) return;switch (num_seg) {case 0:ms_node.url[0] = '8#End';break;case 1:ms_node.url[0] = '8#Middle';break;case 2:ms_node.url[0] = '8#Begin';break;case 3:ms_node.url = new MFString('8#Begin', '8#Middle');break;case 4:ms_node.url = new MFString('8#Begin', '8#End');break;case 5:ms_node.url = new MFString('8#Middle', '8#End');break;}num_seg++;}"   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE TXT.string BY [""]
-    REPLACE TXT2.string BY [""]
-    REPLACE NAME.string BY [""]
-    REPLACE START.string BY [""]
-   }
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO VAL.inSFTime
-ROUTE VAL.outMFString TO TXT.string
-ROUTE MS.mediaDuration TO VAL2.inSFTime
-ROUTE VAL2.outMFString TO TXT2.string
-ROUTE MS.info TO NAME.string
-ROUTE MS.streamObjectStartTime TO VAL3.inSFTime
-ROUTE VAL3.outMFString TO START.string
-ROUTE MS.isActive TO C.reverseActivate
-ROUTE MSALL.isActive TO S.switch_seg
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-       duration 8930
-      }
-     }
-    ]
-    ociDescr [
-     SegmentDescriptor {
-      startTime 0
-      duration 4
-      name "Begin"
-     }
-     SegmentDescriptor {
-      startTime 4
-      duration 2
-      name "Middle"
-     }
-     SegmentDescriptor {
-      startTime 6
-      duration 4
-      name "End"
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediasensor-segment.bt Deleted

@@ -1,215 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of MediaSensor" "with media segments defined" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MediaSensor Test #2"
-  }
-  Shape {
-   appearance Appearance {
-    texture DEF MOV MovieTexture {
-     loop TRUE
-     stopTime -1
-     url [od:8]
-     repeatS FALSE
-     repeatT FALSE
-    }
-   }
-   geometry Bitmap {}
-
-  }
-  DEF MS MediaSensor {
-   url ["od:8#Begin" "od:8#End"]
-  }
-  DEF VAL Valuator {}
-  DEF VAL2 Valuator {}
-  Transform2D {
-   translation 50 -90
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Media Time:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -60 -120
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Start Time:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 70 -120
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF START Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF VAL3 Valuator {}
-  Transform2D {
-   translation -50 120
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Name:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 50 120
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF NAME Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -70 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Segment Duration: "]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 60 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT2 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  DEF C Conditional {
-   buffer {
-    REPLACE TXT.string BY [""]
-    REPLACE TXT2.string BY [""]
-    REPLACE NAME.string BY [""]
-    REPLACE START.string BY [""]
-   }
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO VAL.inSFTime
-ROUTE VAL.outMFString TO TXT.string
-ROUTE MS.mediaDuration TO VAL2.inSFTime
-ROUTE VAL2.outMFString TO TXT2.string
-ROUTE MS.info TO NAME.string
-ROUTE MS.streamObjectStartTime TO VAL3.inSFTime
-ROUTE VAL3.outMFString TO START.string
-ROUTE MS.isActive TO C.reverseActivate
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-    ociDescr [
-     SegmentDescriptor {
-      startTime 0
-      duration 4
-      name "Begin"
-     }
-     SegmentDescriptor {
-      startTime 4
-      duration 2
-      name "Middle"
-     }
-     SegmentDescriptor {
-      startTime 6
-      duration 4
-      name "End"
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/bifs-timeline-mediasensor.bt Deleted

@@ -1,137 +0,0 @@
-InitialObjectDescriptor {
- objectDescriptorID 1
- audioProfileLevelIndication 255
- visualProfileLevelIndication 254
- sceneProfileLevelIndication 1
- graphicsProfileLevelIndication 1
- ODProfileLevelIndication 1
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 3
-    decSpecificInfo BIFSConfig {
-     isCommandStream true
-     pixelMetric true
-     pixelWidth 300
-     pixelHeight 300
-    }
-   }
-  }
-  ES_Descriptor {
-   ES_ID 2
-   decConfigDescr DecoderConfigDescriptor {
-    streamType 1
-   }
-  }
- ]
-}
-
-OrderedGroup {
- children [
-  Background2D {
-   backColor 1 1 1
-  }
-  WorldInfo {
-   info ["This shows usage of MediaSensor" "without media segments defined" "" "GPAC Regression Tests" "$Date: 2007-07-27 09:46:10 $ - $Revision: 1.3 $" "(C) 2002-2004 GPAC Team"]
-   title "MediaSensor Test #1"
-  }
-  Shape {
-   appearance Appearance {
-    texture DEF MOV MovieTexture {
-     loop TRUE
-     stopTime -1
-     url [od:8]
-     repeatS FALSE
-     repeatT FALSE
-    }
-   }
-   geometry Bitmap {}
-
-  }
-  DEF MS MediaSensor {
-   url [od:8]
-  }
-  DEF VAL Valuator {}
-  DEF VAL2 Valuator {}
-  Transform2D {
-   translation 50 -90
-   children [
-    Shape {
-     appearance DEF APP Appearance {
-      material Material2D {
-       emissiveColor 1 0 0
-       filled TRUE
-      }
-     }
-     geometry DEF TXT Text {
-      string [""]
-      fontStyle DEF FS FontStyle {
-       justify ["MIDDLE" "MIDDLE"]
-       size 20
-      }
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -50 -90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Media Time:"]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation -60 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry Text {
-      string ["Media Duration: "]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform2D {
-   translation 60 90
-   children [
-    Shape {
-     appearance USE APP
-     geometry DEF TXT2 Text {
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
- ]
-}
-
-ROUTE MS.mediaCurrentTime TO VAL.inSFTime
-ROUTE VAL.outMFString TO TXT.string
-ROUTE MS.mediaDuration TO VAL2.inSFTime
-ROUTE VAL2.outMFString TO TXT2.string
-
-AT 0 {
-  UPDATE OD [
-   ObjectDescriptor {
-    objectDescriptorID 8
-    esDescr [
-     ES_Descriptor {
-      ES_ID 20
-      OCR_ES_ID 20
-      muxInfo MuxInfo {
-       fileName "../auxiliary_files/count_video.cmp"
-      }
-     }
-    ]
-   }
-  ]
-}
-

gpac-0.8.0.tar.gz/tests/media/bifs/counter-auto.bt Deleted

@@ -1,177 +0,0 @@
-
-
-InitialObjectDescriptor {
- esDescr [
-  ES_Descriptor {
-   ES_ID 1
-   decConfigDescr DecoderConfigDescriptor {
-    objectTypeIndication 1
-    streamType 3
-    decSpecificInfo BIFSv2Config {
-     pixelMetric true
-     pixelWidth 480
-     pixelHeight 360
-    }
-   }
-  }
- ]
-}
-
-DEF ROOT OrderedGroup {
- children [
-  Background2D {
-   backColor 0 0 0
-  }
-  
-  Transform2D {
-   translation -200 0
-   children [
-    Shape {
-     appearance DEF N1 Appearance {
-      material Material2D {
-       emissiveColor 1 1 1
-       filled true
-      }
-     }
-     geometry DEF TXT Text {
-      string ["	0	""	00:00:00.000	"]
-      fontStyle DEF FONTSTYLE1 FontStyle {
-       family ["Arial"]
-       style "BOLD"
-       justify ["BEGIN" "MIDDLE"]
-       size 25
-      }
-     }
-    }
-   ]
-  }
-  
-  Transform2D {
-     translation 0 -140
-     children [
-      Shape {
-       appearance USE N1
-       geometry DEF LABEL Text {
-        string ["Counter Sequence powered by GPAC" "50 FPS - resolution 1920x1080" "(c) 2016 Telecom ParisTech - http://gpac.io"]
-        fontStyle DEF FONTSTYLE2 FontStyle {
-         family ["Arial"]
-         style "BOLD"
-         justify ["MIDDLE" "MIDDLE"]
-         size 12
-        }
-       }
-      }
-     ]
-  }
-
-  Transform2D {
-        translation 120 0 
-        children [
-            #background shape
-            Shape {
-                geometry Circle { radius 100 }
-                appearance  Appearance {
-                    material DEF BACK_CIRCLE_COL Material2D { 
-                      emissiveColor 0.5 0.5 0.5
-                        filled TRUE
-                    }  
-                }
-            }
-            #front shape
-            Shape {
-                geometry XCurve2D {
-                    # Move to the top of the circle, 
-                    # define 2 focal points at the center of the coordinate system,
-                    # define an anti-clock-wise arc to 100 (cos(a), sin(a))
-                    # return to the center and close
-                    type [5 1 6]
-                    point DEF CIRCLE_COORDS Coordinate2D { 
-                        point [ 0 100 0 0 0 0 24.86898872   96.85831611 0 0 ] 
-                    }
-                }
-                appearance DEF BACK_CIRCLE_APP Appearance {
-                    material DEF CIRCLE_COL Material2D { 
-                      emissiveColor 1 1 1
-                        filled TRUE
-                    }  
-                }
-            }
-        ]
-    }
-    DEF TS TimeSensor {
-        loop TRUE
-    }
-    DEF SC Script {
-        eventIn SFFloat set_fraction
-        field SFNode root USE ROOT
-        field SFNode app_back USE BACK_CIRCLE_COL
-        field SFNode app USE CIRCLE_COL
-        field SFNode coords USE CIRCLE_COORDS
-        field SFNode text USE TXT
-        field SFNode label USE LABEL
-
-    url ["vrmlscript:
-        var fps = gpac.sim_fps;
-        var width = 480;
-        var height = 360;
-
-        //resize event callback
-        function on_resize(evt) {
-            width = evt.width;
-            height = evt.height;
-            fps = gpac.sim_fps;
-            label.string[1] = '' + fps + ' FPS - resolution ' + width + 'x' + height;
-        }
-        root.addEventListener('resize', on_resize, 0);
-
-        var mPI = 3.141592653589793;
-        var cycles = 0;
-
-        function set_fraction(value) {
-            var num_frame = Math.round(fps * value);
-            if (num_frame >= fps) {
-                cycles++;
-                num_frame = 0;
-            }
-//            alert('frame is ' + num_frame);
-
-            var angle = mPI/2 - 2*mPI*num_frame/fps;
-            var x = 100 * Math.cos(angle);
-            var y = 100 * Math.sin(angle);
-            coords.point[3] = new SFVec2f(x, y);
-//            alert('coords are ' + coords.point[3]);
-
-            if (cycles % 2) {
-                app_back.emissiveColor.r = 1.0;
-                app_back.emissiveColor.g = 1.0;
-                app_back.emissiveColor.b = 1.0;
-                app.emissiveColor.r = 0.5;
-                app.emissiveColor.g = 0.5;
-                app.emissiveColor.b = 0.5;
-            } else {
-                app_back.emissiveColor.r = 0.5;
-                app_back.emissiveColor.g = 0.5;
-                app_back.emissiveColor.b = 0.5;
-                app.emissiveColor.r = 1.0;
-                app.emissiveColor.g = 1.0;
-                app.emissiveColor.b = 1.0;
-            }
-            text.string[0] = '' + Math.round(fps*cycles + num_frame);
-            var h = Math.round(cycles/3600);
-            var m = Math.round(cycles/60 - h*60);
-            var s = Math.round(cycles - h*3600 - m*60);
-            hs = ((h<10) ? '0' : '') + h;
-            ms = ((m<10) ? '0' : '') + m;
-            ss = ((s<10) ? '0' : '') + s;
-            var f = Math.round(1000*num_frame/fps);
-            fs = ( (f<10) ? '00' : ( (f<100) ? '0' : '')) + f;
-            text.string[1] = '' + hs + ':' + ms + ':' + ss + '.' + fs;
-        }
-
-    "]
-    }
-    ]
-}
-ROUTE TS.fraction_changed TO SC.set_fraction
-
-

gpac-0.8.0.tar.gz/tests/media/browser_integration Deleted

gpac-0.8.0.tar.gz/tests/media/browser_integration/mozilla_ie_action.html Deleted

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
-  <title></title>
-</head>
-<body>
-
- <object id="gpac" width="600" height="200" type="application/x-gpac" >
-  <param name="src" value="bifs/bifs-2D-painting-material2D.bt" />
-  <param name="use3d" value="false" />
-Your browser doesn't support GPAC ...
- </object>
-
-<br/>
-
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 1 0 0');" value="red" type="button" />
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 0 1 0');" value="green" type="button" />
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 0 0 1');" value="blue" type="button" />
-
-<br/>
-
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 0');" value="opaque" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 0.5');" value="semi-transparent" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 1');" value="hidden" type="button" />
-
-<br/>
-
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 50 100');" value="vert" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 150 100');" value="normal" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 100 50');" value="horiz" type="button" />
- 
-</body>
-</html>

gpac-0.8.0.tar.gz/tests/media/browser_integration/mozilla_ie_simple.html Deleted

gpac-0.8.0.tar.gz/tests/media/browser_integration/ppc_action.html Deleted

@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta content="text/html; charset=ISO-8859-1"
- http-equiv="content-type">
-  <title></title>
-</head>
-<body>
-
- <object id="gpac" width="600" height="200" CLASSID="clsid:181D18E6-4DC1-4B55-B72E-BE2A10064995">
-  <param name="src" value="bifs/bifs-2D-painting-material2D.bt" />
-  <param name="use3d" value="false" />
-Your browser doesn't support GPAC ...
- </object>
-
-<br/>
-
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 1 0 0');" value="red" type="button" />
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 0 1 0');" value="green" type="button" />
-<input onclick="gpac.Update('bt', 'REPLACE M.emissiveColor BY 0 0 1');" value="blue" type="button" />
-
-<br/>
-
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 0');" value="opaque" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 0.5');" value="semi-transparent" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE M.transparency BY 1');" value="hidden" type="button" />
-
-<br/>
-
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 50 100');" value="vert" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 150 100');" value="normal" type="button" />
-<input onclick="gpac.Update('application/x-bt', 'REPLACE REC.size BY 100 50');" value="horiz" type="button" />
- 
-</body>
-</html>

gpac-0.8.0.tar.gz/tests/media/browser_integration/ppc_simple.html Deleted

gpac-0.8.0.tar.gz/tests/media/build-navigator-sh Deleted

gpac-0.8.0.tar.gz/tests/media/build-navigator-w32.bat Deleted

gpac-0.8.0.tar.gz/tests/media/chaptering Deleted

gpac-0.8.0.tar.gz/tests/media/chaptering/chapters.txt Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_cts.xml Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_cts_broken.xml Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_dts.xml Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_pres_time.xml Deleted

gpac-0.8.0.tar.gz/tests/media/dash_cues/counter_cues_sn.xml Deleted

gpac-0.8.0.tar.gz/tests/media/dom Deleted

gpac-0.8.0.tar.gz/tests/media/dom/gpac-dom-portability.js Deleted

@@ -1,144 +0,0 @@
-var window = (function (window) {
-if (!!window.setTimeout) return;
-var DEBUG = false;
-var svgNS = 'http://www.w3.org/2000/svg';
-var xlinkNS = 'http://www.w3.org/1999/xlink';
-var intervalIds=[];
-var timeoutIds=[];
-
-window.console = {};
-console.log = function (str) { alert(str); };
-
-function createAnimStruct(timeout, isIndefinite) {
-  var defs = document.createElementNS(svgNS, 'defs');
-  document.documentElement.appendChild(defs);
-  var g = document.createElementNS(svgNS, 'g');
-  defs.appendChild(g);
-  g.setAttributeNS(svgNS, 'display', 'none');
-  var anim = document.createElementNS(svgNS, 'animate');  
-  anim.setAttributeNS(svgNS, 'attributeName', 'display');
-  anim.setAttributeNS(svgNS, 'begin', 'indefinite');
-  anim.setAttributeNS(svgNS, 'end', 'indefinite');
-  anim.setAttributeNS(svgNS, 'dur', (+timeout)/1000);
-  if (isIndefinite) {
-    anim.setAttributeNS(svgNS, 'repeatCount', 'indefinite');
-  }
-  g.appendChild(anim);
-  anim.setAttributeNS(svgNS, 'to', 'inline');
-  return { root: defs, anim: anim};
-}
-
-var setTimer = function (useRepeatEvent, timers, callback, timeout) {
-  var args = Array.prototype.slice(arguments, 4);
-  var obj = createAnimStruct(timeout, useRepeatEvent);
-  obj.id = timers.length;
-  if (DEBUG) 
-    console.log("Creating "+(useRepeatEvent ? "Interval ":"")+"Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
-  obj.endEventCallback = function (event) { 
-						  if (DEBUG) 
-							window.console.log((useRepeatEvent ? "Interval ":"")+"Timeout "+obj.id+" reached");
-						  if (!useRepeatEvent) {
-						    document.documentElement.removeChild(obj.root);
-						  }	
-						  var newargs = [].concat(args);									
-						  callback.apply(this, newargs);
-						};
-  obj.anim.addEventListener((useRepeatEvent ? 'repeatEvent' : 'endEvent'), obj.endEventCallback, false);
-  obj.anim.beginElement();
-  timers.push(obj);
-  return obj.id;
-
-}
-
-window.setTimeout = function (callback, timeout) {
-  return setTimer(false, timeoutIds, callback, timeout);
-  // var args = Array.prototype.slice(arguments, 2);
-  // var obj = createAnimStruct(timeout, false);
-  // obj.id = timeoutIds.length;
-  // if (DEBUG) 
-    // console.log("Creating Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
-  // obj.endEventCallback = function (event) { 
-						  // if (DEBUG) 
-							// window.console.log("Timeout "+obj.id+" reached");
-						  // document.documentElement.removeChild(obj.root);
-						  // var newargs = [].concat(args);									
-						  // callback.apply(this, newargs);
-						// };
-  // obj.anim.addEventListener('endEvent', obj.endEventCallback, false);
-  // obj.anim.beginElement();
-  // timeoutIds.push(obj);
-  // return obj.id;
-}
-
-window.setInterval = function (callback, timeout) {
-  return setTimer(true, intervalIds, callback, timeout);
-  // var args = Array.prototype.slice(arguments, 2);
-  // var obj = createAnimStruct(timeout, true);
-  // obj.id = intervalIds.length;
-  // if (DEBUG) 
-    // window.console.log("Creating Interval Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
-  // obj.intervalCallback = function (event) { 
-							 // if (DEBUG) 
-							   // window.console.log("Interval "+obj.id+" reached");
-							 // var newargs = [].concat(args);									
-							 // callback.apply(this, newargs); 
-						   // };
-  // obj.anim.addEventListener('repeatEvent', obj.intervalCallback, false);
-  // obj.anim.beginElement();
-  // intervalIds.push(obj);
-  // return obj.id;
-}
-
-var clearTimer = function(useRepeatEvent, timers, id) {
-  if (DEBUG) 
-    window.console.log("Clearing "+(useRepeatEvent ? "Interval ":"")+"Timer "+id+" with id: "+id);
-  var obj = timers[id];
-  if (obj) {
-    if (obj.id != id) {
-      window.console.log("Mismatch in ids while clearing timer: "+id+" vs. "+obj.id);
-	}
-    obj.anim.removeEventListener((useRepeatEvent ? 'repeatEvent' : 'endEvent'), obj.endEventCallback);
-    document.documentElement.removeChild(obj.root);
-	timers[id] = null;
-  }
-}
-
-window.clearTimeout = function (id) {
-  return clearTimer(false, timeoutIds, id);
-  // if (DEBUG) 
-    // window.console.log("Clearing Timer "+id+" with arguments: "+Array.prototype.slice(arguments,0));
-  // var timerObj = timeoutIds[id];
-  // if (timerObj) {
-    // if (timerObj.id != id) {
-      // window.console.log("Mismatch in ids while clearing Timer: "+id+" vs. "+timerObj.id);
-	// }
-    // timerObj.anim.removeEventListener('endEvent', timerObj.endEventCallback);
-    // document.documentElement.removeChild(timerObj.root);
-	// timeoutIds[id] = null;
-  // }
-}
-
-window.clearInterval = function (id) {
-  return clearTimer(true, intervalIds, id);
-  // if (DEBUG) 
-    // window.console.log("Clearing Interval Timer with arguments: "+Array.prototype.slice(arguments,0));
-  // var intervalObj = intervalIds[id];
-  // if (intervalObj) {
-    // if (timerObj.id != id) {
-      // window.console.log("Mismatch in ids while clearing Interval Timer: "+id+" vs. "+intervalObj.id);
-	// }
-    // intervalObj.anim.removeEventListener('repeatEvent', intervalObj.intervalCallback);
-    // document.documentElement.removeChild(intervalObj.root);
-  // }
-}
-
-window.printObject = function (obj) {
-  window.console.log("Enumerating object: "+obj);
-  for (var key in obj) {
-    window.console.log("Property "+key+": "+obj[key]);
-  }
-  window.console.log("done.");
-}
-
-return window;
-})(window ? window : this);

gpac-0.8.0.tar.gz/tests/media/dom/gpac-html-portability.js Deleted

@@ -1,96 +0,0 @@
-if (!Uint8Array) {
-var Uint8Array = function () {};
-Uint8Array.prototype = new ArrayBuffer();
-}
-
-(function () {
-if (typeof(gpac) == "undefined") return;
-console.log ("Using GPAC HTML Portability script");
-var DEBUG = false;
-document.createElementOrig = document.createElement;
-document.createElement = function (str) { 
-  var e;
-  if (str == "div" ) { e = document.createElementOrig("g"); }
-  else if (str == "table" ) { e = document.createElementOrig("textArea"); e.setAttribute("width", "500");  }
-  else if (str == "tr" ) { e = document.createElementOrig("tspan"); e.break = true;}
-  else if (str == "td" ) { e = document.createElementOrig("tspan"); }
-  else if (str == "h1" || str == "h2" || str == "h3" || str == "h4" ) { e = document.createElementOrig("text"); }
-  else if ( str == "a" ) { e = document.createElementOrig("tspan"); }
-  else if ( str == "span" ) { e = document.createElementOrig("tspan"); }
-  else if (str == "textarea") { e = document.createElementOrig("textArea"); }		
-  else { e = document.createElementOrig(str); }
-  e.formerElementName = str;
-  if (DEBUG) 
-    console.log("created SVG element '"+e.tagName+"' for html tag '"+str+"'");
-  return e;
-}		
-
-document.body = document.documentElement;
-
-Node.__proto__.focus = function () { 
-  if (DEBUG)
-    console.log("focus called on node '"+this.tagName+"'"); 
-};	  
-
-SVGElement.__proto__.__defineSetter__("id", function (s) { 
-                                               if (DEBUG) 
-											     console.log("setting id on "+this.tagName+" with '"+s+"'"); 
-											   this.setAttribute("id", s); 
-											 } ); 
-SVGElement.__proto__.__defineGetter__("id", function () { 
-                                               if (DEBUG) 
-											     console.log("getting id on "+this.tagName); 
-											   return this.getAttribute("id"); 
-											 } );
-SVGElement.__proto__.__defineSetter__("innerHTML", function (s) { 
-												var t = s.replace(/&nbsp;/g, ' ');
-												t = t.replace(/&amp;/g, '&');
-                                                if (DEBUG) 
-											      console.log("setting innerHTML on "+this.tagName+" "+this.id+" with '"+t+"'"); 
-											    this.textContent = t;
-											 } ); 
-SVGElement.__proto__.__defineGetter__("innerHTML", function () { 
-                                               if (DEBUG) 
-											     console.log("getting innerHTML on "+this.tagName); 
-											   return this.textContent; 
-											 } );
-SVGElement.__proto__.__defineSetter__("classList", function (s) { 
-                                               if (DEBUG) 
-											     console.log("setting classList on "+this.tagName+" with '"+s+"'"); 
-											   this.setAttribute("classList", s); 
-											 } ); 
-SVGElement.__proto__.__defineGetter__("classList", function () { 
-                                               if (DEBUG) 
-											     console.log("getting classList on "+this.tagName); 
-											   return this.getAttribute("classList"); 
-											 } );
-SVGElement.__proto__.__defineSetter__("onclick", function (callback) { 
-                                             if (DEBUG) 
-											   console.log("setting onclick on "+this.tagName+" with callback "+callback); 
-											 var f = function (event) { 
-											   if (DEBUG) 
-												 console.log("Element "+(event.target.tagName)+" clicked, calling "+callback); 
-											   callback(event); 
-										     };
-											 this.addEventListener("click", f, false); 
-										    });	  
-											
-Node.__proto__.__defineSetter__("title", function (value) { 
-                                             if (DEBUG) 
-											   console.log("setting title on "+this.tagName+" with '"+value+"'"); 
-											 this.setAttribute("title", value);
-										    });	  											
-Node.__proto__.__defineSetter__("href", function (value) { 
-                                             if (DEBUG) 
-											   console.log("setting href on "+this.tagName+" with '"+value+"'"); 
-											 this.setAttributeNS("http://www.w3.org/1999/xlink", "href", value);
-										    });	  																					
-
-document.getElementByIdOrig = document.getElementById;
-document.getElementById = function (id) { 
-  var e = document.getElementByIdOrig(id);
-  if (DEBUG) 
-    console.log("getting element by id '"+id+"' found '"+e+"'"+(e ? " of type '"+e.tagName+"'" : ""));
-  return e;
-}
-}) ();
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/encryption Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/adobe.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/cbc.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CBC">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="2" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS ID128="0x676cb88f302d10227992649885984045"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692d6"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed"  selectiveType="RAP" saiSavedBox="senc" keyRoll="IDX=1">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
-<key KID="0x676cb88f302d10227992649885984045" value="0xccc0f2b3b279926496a7f5d25da692d6"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/cbcs.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CBC Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="1" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/cbcs_const.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CBC Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherIV="0x00000000000000000000000000000001" cypherKey="0x6770616363656E6364726D746F6F6C31">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="1" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0xccc0f2b3b279926496a7f5d25da692f6"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" constant_IV_size="16" constant_IV="0x0a610676cb88f302d10ac8bc66e039ed"  saiSavedBox="senc">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0xccc0f2b3b279926496a7f5d25da692f6"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/cens.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CTR Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="1" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0x5544694d47473326622665665a396b36"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc" skip_byte_block="1" crypt_byte_block="10">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/cens_64iv.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CTR Pattern">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="1" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0x5544694d47473326622665665a396b36"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="8" first_IV="0xd10ac8bc66e039ed" saiSavedBox="senc" skip_byte_block="1" crypt_byte_block="10">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/ctr.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_64iv.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_64iv_clearbytes.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_ba_always.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_ba_none.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_forceclear.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_piff.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_rap.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_roll.xml Deleted

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" />
-<GPACDRM type="CENC AES-CTR">
-
-<DRMInfo type="pssh" version="0">
-<BS ID128="9A04F07998404286AB92E65BE0885F95"/>
-<BS data="application/data;base64:ACE125"/>
-<BS sourceFile="cenc_blob.bin"/>
-</DRMInfo>
-
-
-<DRMInfo type="pssh" version="1" cypherOffset="9" cypherKey="0x6770616363656E6364726D746F6F6C31" cypherIV="0x00000000000000000000000000000001">
-<BS ID128="6770616363656E6364726D746F6F6C31"/>
-<BS value="4" bits="32"/>
-<BS ID128="0x279926496a7f5d25da69f2b3b2799a7f"/>
-<BS ID128="0x597669572e55547e656b56586e2f6f68"/>
-<BS ID128="0x205b2b293a342f3d3268293e6f6f4e29"/>
-<BS ID128="0x32783e367c2e4d4d6b46467b3e6b5478"/>
-<BS bits="8" string="CID=Toto"/>
-<BS ID128="0x5544694d47473326622665665a396b36"/>
-<BS ID128="0x7959493a764556786527517849756635"/>
-<BS ID128="0x3a4f3674376d6c48675a273464447b40"/>
-<BS ID128="0x3e213f6d45584f51713d534f4b417855"/>
-</DRMInfo>
-
-<CrypTrack trackID="1" IsEncrypted="1" IV_size="16" first_IV="0x0a610676cb88f302d10ac8bc66e039ed" saiSavedBox="senc" keyRoll="roll=7">
-<key KID="0x279926496a7f5d25da69f2b3b2799a7f" value="0x5544694d47473326622665665a396b36"/>
-<key KID="0x597669572e55547e656b56586e2f6f68" value="0x7959493a764556786527517849756635"/>
-<key KID="0x205b2b293a342f3d3268293e6f6f4e29" value="0x3a4f3674376d6c48675a273464447b40"/>
-<key KID="0x32783e367c2e4d4d6b46467b3e6b5478" value="0x3e213f6d45584f51713d534f4b417855"/>
-</CrypTrack>
-
-</GPACDRM>
-
-

gpac-0.8.0.tar.gz/tests/media/encryption/ctr_shdr.xml Deleted

gpac-0.8.0.tar.gz/tests/media/encryption/isma.xml Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_arraybuffer.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_audio.svg Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_mediasource.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_sourcebuffer.js Deleted

@@ -1,53 +0,0 @@
-/*****************************************************************************************
- * Testing basic support for the MSE SourceBuffer JavaScript object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e, s)
-{
-	for(var propertyName in e) {
-		alert((s==null?"":s)+" "+propertyName+": "+e[propertyName]);
-		if (typeof(e[propertyName]) == "object") {
-			enumerate(e[propertyName], " ");
-		}
-	}		
-}
-
-function onSourceOpen(event)
-{
-	alert("MediaSource opened");
-	/* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
-	var ms = event.target.ms;
-	enumerate(ms);
-	
-	alert("Checking if type video/mp4 is supported: "+MediaSource.isTypeSupported("video/mp4"));
-	alert("Checking if type video/ogg is supported: "+MediaSource.isTypeSupported("video/ogg"));
-	alert("Checking if type text/plain is supported: "+MediaSource.isTypeSupported("text/plain"));
-	alert("Checking if type application/octet-stream is supported: "+MediaSource.isTypeSupported("application/octet-stream"));
-
-	alert("Adding Source Buffer of type video/mp4 to the MediaSource");
-	var sb = ms.addSourceBuffer("video/mp4");
-	alert("SourceBuffer "+sb);
-	enumerate(sb);
-	enumerate(sb.buffered);
-}
-
-function init()
-{	
-	var v = document.getElementById("v");
-	
-	alert("Creating new MediaSource");
-	var ms = new MediaSource();			
-
-	/* GPAC Hack: the event should be dispatched to the MediaSource object */
-	v.addEventListener("sourceopen", onSourceOpen);
-				
-	var url = URL.createObjectURL(ms);
-	alert("Attaching Media Source "+url+" to Video");
-	v.src = url;
-	
-	/* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched */
-	v.ms = ms;
-	
-}
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_url.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_video.js Deleted

@@ -1,81 +0,0 @@
-/*****************************************************************************************
- * Testing support for the basic HTML5 Video object
- *****************************************************************************************/
-
-alert("Script loaded");
-
-function enumerate(e)
-{
-	for(var propertyName in e) {
-		alert(" "+propertyName+": "+e[propertyName]);
-	}
-}
-
-function print_ranges(r) {
-    alert(" time ranges length:" + r.length);
-    for (var i = 0; i < r.length; i++) {
-        alert(" (" + r.start(i) + "," + r.end(i) + ")");
-    }
-}
-
-function print_tracks(t) {
-}
-
-function print_media_info()
-{
-    var v = document.getElementById("v");
-	alert("");
-	alert("Element: "+v);
-	alert("HTMLMediaElement Properties: ");
-	alert("src:          "+v.src);
-	alert("error & code: "+v.error+":"+v.error.code);
-	alert("currentSrc:   "+v.currentSrc);
-	alert("crossOrigin:  "+v.crossOrigin);
-	alert("networkState: "+v.networkState);
-	alert("preload:      "+v.preload);
-	alert("buffered:     "+v.buffered);
-	print_ranges(v.buffered);
-	alert("readyState:   "+v.readyState);
-	alert("seeking:      "+v.seeking);
-	alert("currentTime:  "+v.currentTime);
-	alert("duration:     "+v.duration);
-	alert("startDate:    "+v.startDate);
-	alert("paused:       "+v.paused);
-	alert("def playrate: "+v.defaultPlaybackRate);
-	alert("play rate:    "+v.playbackRate);
-	alert("played:       "+v.played);
-	print_ranges(v.played);
-	alert("seekable:     "+v.seekable);
-	print_ranges(v.seekable);
-	alert("ended:        "+v.ended);
-	alert("autoplay:     "+v.autoplay);
-	alert("loop:         "+v.loop);
-	alert("mediaGroup:   "+v.mediaGroup);
-	alert("controller:   "+v.controller);
-	alert("controls:     "+v.controls);
-	alert("volume:       "+v.volume);
-	alert("muted:        "+v.muted);
-	alert("defaultMuted: "+v.defaultMuted);
-	alert("audioTracks:  "+v.audioTracks+ " length ("+v.audioTracks.length+")");
-	print_tracks(v.audioTracks);
-	alert("videoTracks:  "+v.videoTracks+ " length ("+v.videoTracks.length+")");
-	print_tracks(v.videoTracks);
-	alert("textTracks:   "+v.textTracks+ " length ("+v.textTracks.length+")");
-	print_tracks(v.textTracks);
-	alert("");
-	alert("HTMLVideoElement specific properties: ");
-	alert("width:        "+v.width);
-	alert("height:       "+v.height);
-	alert("wideoWidth:   "+v.videoWidth);
-	alert("videoHeight:  "+v.videoHeight);
-	alert("poster:       "+v.poster);
-	alert("");
-}
-
-function init()
-{	
-	var v = document.getElementById("v");
-	v.src = "media/counter-10mn_I25_640x360_160kbps_openGOP_dash.mp4";
-	v.addEventListener("click", print_media_info);
-	enumerate(v);
-}
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/basic_video.svg Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/bind.js Deleted

@@ -1,26 +0,0 @@
-/* Replacement for the bind function if not supported
- adopted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FFunction%2Fbind
-*/
-if (!Function.prototype.bind) {
-  Function.prototype.bind = function (oThis) {
-    if (typeof this !== "function") {
-      // closest thing possible to the ECMAScript 5 internal IsCallable function
-      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
-    }
-
-    var aArgs = Array.prototype.slice.call(arguments, 1), 
-        fToBind = this, 
-        fNOP = function () {},
-        fBound = function () {
-          return fToBind.apply(this instanceof fNOP && oThis
-                                 ? this
-                                 : oThis,
-                               aArgs.concat(Array.prototype.slice.call(arguments)));
-        };
-
-    fNOP.prototype = this.prototype;
-    fBound.prototype = new fNOP();
-
-    return fBound;
-  };
-}
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/counter-mp4-audio-segments-http.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/counter-mp4-av-segments-http.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/counter-mp4-video-segments-http.js Deleted

@@ -1,36 +0,0 @@
-/* Array representing the different files to download per quality */
-var counterVideoHTTPSegments = 
-	[ 
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_low-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_mid-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_hd-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_full-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		}
-	];

gpac-0.8.0.tar.gz/tests/media/html5_video/counter-mp4-video-segments-live-nobs-http.js Deleted

@@ -1,36 +0,0 @@
-/* Array representing the different files to download per quality */
-var counterLiveNoBSVideoHTTPSegments = 
-	[ 
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
-		  initName: "mp4-live-h264bl_low-.mp4",
-		  segmentPrefix: "mp4-live-h264bl_low-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
-		  initName: "mp4-live-h264bl_mid-.mp4",
-		  segmentPrefix: "mp4-live-h264bl_mid-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
-		  initName: "mp4-live-h264bl_hd-.mp4",
-		  segmentPrefix: "mp4-live-h264bl_hd-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
-		  initName: "mp4-live-h264bl_full-.mp4",
-		  segmentPrefix: "mp4-live-h264bl_full-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		}
-	];

gpac-0.8.0.tar.gz/tests/media/html5_video/counter-mp4-video-segments-local.js Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/file.json Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/file.txt Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/file.xml Deleted

gpac-0.8.0.tar.gz/tests/media/html5_video/gpac-mse-spatial.js Deleted

@@ -1,55 +0,0 @@
-function displaySpatialSets() {
-	var v = document.getElementById('v_thumb');
-	var vx = parseFloat(v.getAttribute("x"));
-	var vy = parseFloat(v.getAttribute("y"));
-	var vw = parseFloat(v.getAttribute("width"));
-	var vh = parseFloat(v.getAttribute("height"));
-	var g = document.getElementById('g_thumb');
-	var r;
-	var as;
-	for (var spatialIndex in spatialInfo.sets) {
-		as = spatialInfo.sets[spatialIndex];
-		r = document.createElement('rect');
-		g.appendChild(r);
-		r.setAttribute("fill", "none");
-		r.setAttribute("stroke", "red");
-		r.setAttribute("pointer-events", "all");
-		r.setAttribute("onclick", "changeVideo("+spatialIndex+")");
-		r.setAttribute("stroke-width", 1);
-		r.setAttribute("x", vx+vw*(as.x/spatialInfo.global.w));
-		r.setAttribute("y", vy+vh*(as.y/spatialInfo.global.h));
-		r.setAttribute("width", vw*(as.w/spatialInfo.global.w));
-		r.setAttribute("height", vh*(as.h/spatialInfo.global.h));
-	}		
-}
-
-function changeVideo(index) {
-	alert("Request to change main video to spatial region #"+index);
-	p1.changeSegmentList(spatialInfo.sets[index].representations);
-}
-
-// var spatialInfo = {
-	// global: { x: 0, y: 0, w: 800, h: 600 },
-	// sets: [
-		// { x:   0, y:   0, w: 400, h: 300, representations: redBullVideoHTTPSegments },
-		// { x: 400, y:   0, w: 400, h: 300, representations: redBullVideoHTTPSegments },
-		// { x:   0, y: 300, w: 400, h: 300, representations: redBullVideoHTTPSegments },
-		// { x: 400, y: 300, w: 400, h: 150, representations: redBullVideoHTTPSegments },
-		// { x: 400, y: 450, w: 400, h: 150, representations: redBullVideoHTTPSegments },		
-	// ]
-// }
-var spatialInfo = myanmarSpatialRepresentations;
-
-var p1 = new Player('v_main', 'info_main', 'timer_anim', myanmarTile1VideoSegmentsLocal);
-var p2 = new Player('v_thumb', 'info_thumb', 'timer_anim', myanmarFullVideoSegmentsLocal);	
-
-function wheelHandler(evt) {
-	alert("Wheel event: "+ evt.wheelDelta);
-	(evt.wheelDelta > 0 ? p1.switchUp() : p1.switchDown());
-}
-document.documentElement.addEventListener("wheel", wheelHandler);
-p1.play();
-p2.play();
-
-displaySpatialSets();
-

gpac-0.8.0.tar.gz/tests/media/html5_video/gpac-mse.js Deleted

@@ -1,358 +0,0 @@
-'use strict';
-/*****************************************************************************************
- *
- * Example code using the Media Source Extension API with GPAC
- *
- *****************************************************************************************/
-alert("Media Source Script loaded");
-
-var DEBUG = true;
-var UPDATE_TEXT_INFO = true;
-
-function reportMessage(msg) {
-	if (DEBUG) {
-		alert(msg);
-	}
-}
-
-function createLabel(x, y, fill, textContent)
-{
-    var label = document.createElement("text");
-	label.setAttribute("x", x);
-	label.setAttribute("y", y);
-	label.setAttribute("fill", fill);
-	label.textContent = textContent;
-	return label;
-}
-
-function createBar(x, y, w, h, fill) {
-    var bar = document.createElement("rect");
-	bar.setAttribute("x", x);
-	bar.setAttribute("y", y);
-	bar.setAttribute("width", w);
-	bar.setAttribute("height", h);
-	bar.setAttribute("rx", h/2);
-	bar.setAttribute("ry", h/2);
-	bar.setAttribute("fill", fill);
-	return bar;
-}
-
-Player.prototype.createInfoStructure = function(id) {
-	this.info = {};
-	var width = 330;
-    var ta;
-	var g = document.getElementById(id);
-    ta = document.createElement("textArea");
-    ta.setAttribute("x", 100);
-    ta.setAttribute("y", -50);
-	ta.setAttribute("width", width);
-    g.appendChild(ta);
-	/* status info */
-    this.info.se = document.createElement("tspan");
-    ta.appendChild(this.info.se);
-    ta.appendChild(document.createElement("tbreak"));
-	/* Quality info */
-    this.info.qe = document.createElement("tspan");
-    ta.appendChild(this.info.qe);
-    ta.appendChild(document.createElement("tbreak"));
-	/* Document time info */
-    this.info.dte = document.createElement("tspan");
-    //ta.appendChild(this.info.dte);
-    //ta.appendChild(document.createElement("tbreak"));
-	/* Video time info */
-    this.info.vte = document.createElement("tspan");
-    //ta.appendChild(this.info.vte);
-    //ta.appendChild(document.createElement("tbreak"));
-	/* Buffer info */
-    this.info.be = document.createElement("tspan");
-    //ta.appendChild(this.info.be);
-    //ta.appendChild(document.createElement("tbreak"));
-	/* URL info */
-    this.info.ue = document.createElement("tspan");
-    ta.appendChild(this.info.ue);
-
-	this.ui = {};
-    this.ui.playbackRect = createBar(10, 5, width-10, 5, "black");
-	g.appendChild(this.ui.playbackRect);
-	
-    this.ui.bufferedRect = createBar(10, 5, 0, 5, "url(#backColor)");
-	g.appendChild(this.ui.bufferedRect);
-	this.ui.bufferedRect.max = width;
-	
-    this.ui.zeroLabel = createLabel(0, 10, "black", '0');
-	g.appendChild(this.ui.zeroLabel);
-	
-    this.ui.playLabel = createLabel(0, 20, "black", '');
-	g.appendChild(this.ui.playLabel);
-
-    this.ui.playBar = createBar(0, 5, 1, 5, "black");
-	g.appendChild(this.ui.playBar);
-	
-    this.ui.startLabel = createLabel(0, 0, "black", '');
-	g.appendChild(this.ui.startLabel);
-
-    this.ui.endLabel = createLabel(width+5, 10, "black", 'end');
-	g.appendChild(this.ui.endLabel);
-}
-
-Player.prototype.updateInfo = function() {
-	if (!UPDATE_TEXT_INFO) return;
-	var start = 0;
-	var end = 1;
-	var nowVideo = this.v.currentTime.toFixed(3);
-//    this.info.dte.textContent = "Document time:" + document.documentElement.getCurrentTime();
-//    this.info.vte.textContent = "Video time: " + nowVideo;
-	if (this.qualityChangeRequested) {
-		this.info.qe.textContent = "Quality : " + (this.qualityIndex - this.qualityChangeRequested) + "/"+(this.segmentFiles.length-1)+", requested: "+this.qualityIndex;
-	} else {
-		this.info.qe.textContent = "Quality : " + this.qualityIndex + "/"+(this.segmentFiles.length-1);
-	}
-    if (this.sb != null && this.sb.buffered.length > 0) {
-		start = this.sb.buffered.start(0).toFixed(3);
-		end = this.sb.buffered.end(0).toFixed(3);
-        //this.info.be.textContent = "Media Data Buffered: (" + start + "," + end + ")";
-    } else {
-        //this.info.be.textContent = "empty buffer";
-    }
-	this.ui.playLabel.textContent = nowVideo;
-	this.ui.playLabel.setAttribute("x", nowVideo/end*this.ui.bufferedRect.max);
-	this.ui.playBar.setAttribute("x", 10+nowVideo/end*this.ui.bufferedRect.max);
-	this.ui.startLabel.textContent = start;
-	this.ui.endLabel.textContent = end;
-	this.ui.startLabel.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
-	this.ui.bufferedRect.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
-	this.ui.bufferedRect.setAttribute("width", (end - start)/end*this.ui.bufferedRect.max-10);
-}
-
-Player.prototype.updateDownloadInfo = function(index, url, done) {
-	if (!UPDATE_TEXT_INFO) return;
-    this.info.ue.textContent = "Segment #" + index + " ..." + url.slice(-30);
-	this.info.se.textContent = "Download Status:"+ (done ?" done" : " in progress");
-}
-
-Player.prototype.toggleQuality = function() {
-    reportMessage("[video "+this.v.getAttribute("id")+"] Toggling quality");
-	var newQuality = (this.qualityIndex + 1) % this.segmentFiles.length;
-	this.qualityChangeRequested = (newQuality - this.qualityIndex);
-    this.qualityIndex = newQuality;
-    this.updateInfo();
-}
-
-Player.prototype.switchUp = function() {
-    reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality up");
-	if (this.qualityIndex < this.segmentFiles.length - 1) {
-		this.qualityIndex++;
-		this.qualityChangeRequested++;
-	}
-    this.updateInfo();
-}
-
-Player.prototype.switchDown = function() {
-    reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality down");
-	if (this.qualityIndex > 0) {
-		this.qualityIndex--;
-		this.qualityChangeRequested--;
-	}
-    this.updateInfo();
-}
-
-Player.prototype.getNextSegment = function () {
-    /* apply the limit (if any) to the number of segments to download */
-    if (this.maxSeg > 0 && this.fileIndex >= this.maxSeg && this.playing) return;
-
-	if (!this.qualityChangeRequested) {
-		/* we increment the segment index only when we need a media segment (not an init segment) */
-		this.fileIndex++;
-	} 
-
-    /* apply the segment reordering pattern (if any) */
-    if (this.appendOrder != null && this.fileIndex < this.appendOrder.length) {
-        this.fileIndexReordered = this.appendOrder[this.fileIndex];
-        reportMessage("[video "+this.v.getAttribute("id")+"] Changing file index from: " + this.fileIndex + "to : " + this.fileIndexReordered);
-    } else {
-        this.fileIndexReordered = this.fileIndex;
-        reportMessage("[video "+this.v.getAttribute("id")+"] Using file index: " + this.fileIndex);
-    }
-
-    /* determine the url to use */
-    if (this.qualityChangeRequested || this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segStartIndex) {
-        /* Setting the url with the initialization segment */
-        this.url = this.segmentFiles[this.qualityIndex].baseURL + this.segmentFiles[this.qualityIndex].initName;
-    }
-    else if (this.fileIndexReordered >= this.segmentFiles[this.qualityIndex].segStartIndex 
-	         && this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segEndIndex) {
-        /* Setting the url with a regular media segment */
-        this.url = this.segmentFiles[this.qualityIndex].baseURL 
-		         + this.segmentFiles[this.qualityIndex].segmentPrefix 
-				 + this.fileIndexReordered 
-				 + this.segmentFiles[this.qualityIndex].segmentSuffix;
-    }
-
-    reportMessage("[video "+this.v.getAttribute("id")+"] Downloading resource from url: " + this.url);
-    /* starting the download */
-    if (this.url) {
-        this.updateDownloadInfo(this.fileIndexReordered, this.url);
-        this.xhr.url = this.url;
-		this.xhr.qualityChangeRequested = this.qualityChangeRequested;
-        this.xhr.open("GET", this.url);
-        this.xhr.responseType = "arraybuffer";
-        this.xhr.onreadystatechange = onDone;
-        this.xhr.send();
-    }
-
-    this.updateInfo();
-}
-
-function onDone(e) {
-    if (this.readyState == 4/*this.DONE*/) {
-        this.player.updateDownloadInfo(this.player.fileIndexReordered, this.url, true);
-        var arraybuffer = this.response;
-        reportMessage("[video "+this.player.v.getAttribute("id")+"] Received ArrayBuffer (size: " + arraybuffer.byteLength + ")");
-        /* Appending the downloaded segment to the SourceBuffer */
-        if (this.player.sb) {
-            /* if there is a discontinuity in the file index, we need to inform the SourceBuffer */
-            if (this.player.prevFileIndex != 0 && this.player.fileIndexReordered != this.player.prevFileIndex + 1) {
-                this.player.sb.abort("continuation");
-				reportMessage("[video "+this.player.v.getAttribute("id")+"] Changing append mode");
-            }
-            this.player.prevFileIndex = this.player.fileIndexReordered;
-            /* we assume everything will be fine with this append */
-            this.player.sb.appendBuffer(arraybuffer);
-			reportMessage("[video "+this.player.v.getAttribute("id")+"] Appending Buffer ArrayBuffer (size: " + arraybuffer.byteLength + ")");
-        }
-        this.player.url = null;
-		if (this.qualityChangeRequested != 0) {
-			this.player.qualityChangeRequested = 0;
-		}		
-		if (!this.player.use_regulation) {
-            this.player.getNextSegment();
-        }
-    }
-}
-
-Player.prototype.onSourceOpen = function (event) {
-    reportMessage("[video "+this.v.getAttribute("id")+"] MediaSource opened");
-    var ms = event.target;
-
-    reportMessage("[video "+this.v.getAttribute("id")+"] Adding Source Buffer of type video/mp4 to the MediaSource");
-    ms.player.sb = ms.addSourceBuffer("video/mp4");
-	ms.player.sb.id = ms.sourceBuffers.length;
-    ms.player.getNextSegment();
-}
-
-Player.prototype.checkBufferLevel = function() {
-    /* don't download a new segment if:
-    - the SourceBuffer is not created
-    - there is already a download going on */
-	reportMessage("[video "+this.v.getAttribute("id")+"] Checking buffer level on SourceBuffer "+this.sb+" "+this.url);
-    if (this.sb != null && this.url == null) {
-        if (this.sb.buffered.length > 0) {
-			if (this.v.currentTime >= this.sb.buffered.end(0)) {
-				this.pause();
-			} else {
-				reportMessage("[video "+this.v.getAttribute("id")+"] Video time "+this.v.currentTime + ", Source Buffer #"+this.sb.id+" buffered data range: (" + this.sb.buffered.start(0) + "," + this.sb.buffered.end(0) + ")");
-				if (this.sb.updating == false && this.sb.buffered.end(0) - this.v.currentTime < this.TIME_THRESOLD) {
-					reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has not enough data, downloading new segment");
-					this.getNextSegment();
-				}
-			}
-        }
-        else {
-            if (!this.sb.updating) {
-                reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has no data, downloading new segment");
-                this.getNextSegment();
-            } else {
-                reportMessage("[video "+this.v.getAttribute("id")+"] Source Buffer still updating");
-			}
-        }
-    }
-}
-
-/* Function called repeatedly to monitor the playback time versus download time difference 
-and to trigger a new download if needed */
-Player.prototype.repeatFunc = function() {
-	if (!this.playing) return;
-    this.updateInfo();
-	this.checkBufferLevel();
-}
-
-Player.prototype.play = function() {
-  reportMessage("[video "+this.v.getAttribute("id")+"] Starting video playback");
-  this.playing = true;
-  this.v.play();
-}
-
-Player.prototype.pause = function() {
-  reportMessage("[video "+this.v.getAttribute("id")+"] Pausing video playback");
-  this.playing = false;
-  this.v.pause();
-}
-
-Player.prototype.changeSegmentList = function(newSegments) {
-  this.segmentFiles = newSegments;
-  this.qualityChangeRequested++;
-}
-
-/* 
-   vId: id of the video element
-   iId: id of a group where debug info will be displayed 
-   aId: id of a animation used to refresh downloads
-*/
-function Player(vId, iId, aId, segmentFiles, segmentOrder) {
-	reportMessage("[video "+vId+"] Creating Player");
-	/* Boolean to define the download policy: 
-		- depending on the buffer occupancy (true) (see TIME_THRESOLD below), 
-		- as fast as possible (false) */
-	this.use_regulation = true;
-	/* difference in seconds between the latest media time downloaded and the media time being played, 
-	used to trigger a new download when the regulation mode is on */
-	this.TIME_THRESOLD = 2;
-	/* Current file being downloaded */
-	this.fileIndex = -1;
-	/* URL of the segment being downloaded */
-	this.url = null;
-	/* Current quality being downloaded */
-	this.qualityIndex = 0;
-	this.qualityChangeRequested = 0;
-	/* using 1 XHR for all downloads */
-	this.xhr = new XMLHttpRequest();
-	this.xhr.player = this;
-	/* The source buffer used by the player (only one at the moment) */
-	this.sb = null;
-	/* maximum number of segments to download */
-	this.maxSeg = Infinity;
-	this.playing = false;
-	/* Array representing the download order of each segments (for out-of-order append), 
-	  segments not listed are downloaded in the right order */
-	this.appendOrder = segmentOrder; 
-	this.fileIndexReordered = 0;
-	this.prevFileIndex =  0;
-	/* references to objects used to display information regarding this player */
-	this.info = null;
-
-	this.segmentFiles = segmentFiles;
-	
-    if (this.use_regulation) {
-        /* GPAC workaround: adding the event listener on the repeatEvent of a dummy animation to simulate window.setInterval */
-		var animation = document.getElementById(aId);
-        animation.addEventListener("repeatEvent", this.repeatFunc.bind(this));
-        reportMessage("[video "+vId+"] Using buffer regulation to download segments ");
-    } else {
-        reportMessage("[video "+vId+"] Not using any regulation - downloading segments as fast as possible");
-    }
-
-    this.createInfoStructure(iId);
-
-    reportMessage("[video "+vId+"] Creating new MediaSource");
-    this.ms = new MediaSource();
-	this.ms.player = this;
-
-    var bloburl = URL.createObjectURL(this.ms);
-    reportMessage("[video "+vId+"] Attaching Media Source " + bloburl + " to video element");
-
-    this.v = document.getElementById(vId);
-    this.ms.addEventListener("sourceopen", this.onSourceOpen.bind(this));
-    this.v.src = bloburl;
-
-	return this;
-}

gpac-0.8.0.tar.gz/tests/media/html5_video/implementation_notes.txt Deleted

@@ -1,36 +0,0 @@
-Media Source Extension Remarks:
-- changed appending to updating (and related events)
-- Needs to know if a segment is a media segment or an initialization segment in advance
-- asynchronous parsing of the media segments
-- needs a parsing before playback
-- segment manipulation as a playback/playlist controller: entirely in JS (seamless ???)
-- implement MSE on top of DASH ?
-
-TODO:
- - out-of-order append
- - out-of-order erroneous append (media segment before init segment)
- - check updating status: append before updating is back to 0 (too many downloads at the same time)
- - muxed audio/video in one sourcebuffer
- - multiple sourcebuffers
- - MPEG-2 TS
- - timestampOffset
- - multiple audio
- - multiple video
- - text tracks
- - append with complete overlap
- - append with start overlap
- - append with end overlap
- - append with middle overlap
- - append with network error
- - append with decode error
- - removeSourceBuffer
- - endOfStream
- - appendStream
- - memory leaks (finalize JS objects)
- - appending multiple media fragments 
- - SVC ?
- - HEVC ?
- - EventTarget
- - GetSLP return Buffer too small & ch_buffer_off / ch_buffer_on
- - Continuity in merge process
- - detect/react when first append is not an init segment.
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/mediaevents.js Deleted

@@ -1,348 +0,0 @@
-/* code retrieved and adapted from http://www.w3.org/2010/05/video/mediaevents.html */
-var svgNS = "http://www.w3.org/2000/svg";
-
-var interaction_buttons = [ 
-	{ text: "load()", action: load },
-	{ text: "play()", action: function() { document._video.play(); } },
-	{ text: "pause()", action: function() { document._video.pause(); } },
-	{ text: "currentTime+=10", action: function() { document._video.currentTime+=10; } },
-	{ text: "currentTime-=10", action: function() { document._video.currentTime-=10; } },
-	{ text: "playbackRate++", action: function() { document._video.playbackRate++; } },
-	{ text: "playbackRate--", action: function() { document._video.playbackRate--; } },
-	{ text: "playbackRate+=0.1", action: function() { document._video.playbackRate+=0.1; } },
-	{ text: "playbackRate-=0.1", action: function() { document._video.playbackRate-=0.1; } },
-	{ text: "volume+=0.1", action: function() { document._video.volume+=0.1; } },
-	{ text: "volume-=0.1", action: function() { document._video.volume-=0.1; } },
-	{ text: "muted=true", action: function() { document._video.muted=true; } },
-	{ text: "muted=false", action: function() { document._video.muted=false; } },
-	{ text: "Update", action: function() { update_properties(); } },
-	{ text: "Add Listeners", action: function() { init_events(); } },
-	{ text: "Remove Listeners", action: function() { remove_events(); } }
-];
-
-var movie_buttons = [ 
-	{ text: "Sintel Teaser", action: function() { switchVideo(0); } },
-	{ text: "Bunny trailer", action: function() { switchVideo(1); } },
-	{ text: "Bunny movie", action: function() { switchVideo(2); } },
-	{ text: "Test movie", action: function() { switchVideo(3); } },
-	{ text: "Local movie", action: function() { switchVideo(4); } }
-];
-
-var media_events = new Array();
-media_events["loadstart"] = 0;
-media_events["progress"] = 0;
-media_events["suspend"] = 0;
-media_events["abort"] = 0;
-media_events["error"] = 0;
-media_events["emptied"] = 0;
-media_events["stalled"] = 0;
-media_events["loadedmetadata"] = 0;
-media_events["loadeddata"] = 0;
-media_events["canplay"] = 0;
-media_events["canplaythrough"] = 0;
-media_events["playing"] = 0;
-media_events["waiting"] = 0;
-media_events["seeking"] = 0;
-media_events["seeked"] = 0;
-media_events["ended"] = 0;
-media_events["durationchange"] = 0;
-media_events["timeupdate"] = 0;
-media_events["play"] = 0;
-media_events["pause"] = 0;
-media_events["ratechange"] = 0;
-media_events["volumechange"] = 0;
-
-var media_controller_events = new Array();
-
-// was extracted from the spec in January 2013
-media_controller_events["emptied"] = 0;
-media_controller_events["loadedmetadata"] = 0;
-media_controller_events["loadeddata"] = 0;
-media_controller_events["canplay"] = 0;
-media_controller_events["canplaythrough"] = 0;
-media_controller_events["playing"] = 0;
-media_controller_events["ended"] = 0;
-media_controller_events["waiting"] = 0;
-media_controller_events["ended"] = 0;
-media_controller_events["durationchange"] = 0;
-media_controller_events["timeupdate"] = 0;
-media_controller_events["play"] = 0;
-media_controller_events["pause"] = 0;
-media_controller_events["ratechange"] = 0;
-media_controller_events["volumechange"] = 0;
-
-// was extracted from the spec in January 2013
-var media_properties = [ "error", "src", "currentSrc", "crossOrigin", "networkState", "preload", "buffered", "readyState", "seeking", "currentTime", "duration", "startDate", "paused", "defaultPlaybackRate", "playbackRate", "played", "seekable", "ended", "autoplay", "loop", "mediaGroup", "controller", "controls", "volume", "muted", "defaultMuted", "audioTracks", "videoTracks", "textTracks", "width", "height", "videoWidth", "videoHeight", "poster" ];
-
-var media_properties_elts = new Array();
-
-function init() {
-    document._video = document.getElementById("video");
-
-	createInteractionButtons();
-	createMovieButtons();
-	createEventTable();
-	createMediaProperties();
-
-    init_properties();
-}
-
-function createButtons(buttons, offset) {
-	var buttonsG = document.getElementById("buttons");
-	for (var i = 0; i < buttons.length; i++) {
-	   var g = document.createElementNS(svgNS, "g");
-	   g.setAttributeNS(svgNS, "transform", "translate(0, "+(offset+i*21)+")");
-	   buttonsG.appendChild(g);
-	
-	   var rect = document.createElementNS(svgNS, "rect");
-	   rect.setAttributeNS(svgNS, "width", "120");
-	   rect.setAttributeNS(svgNS, "height", "20");
-	   rect.setAttributeNS(svgNS, "fill", "lightgrey");
-	   rect.addEventListener("click", buttons[i].action, false);
-	   g.appendChild(rect);
-
-	   var text = document.createElementNS(svgNS, "text");
-	   text.setAttributeNS(svgNS, "x", "60");
-	   text.setAttributeNS(svgNS, "y", "15");
-	   text.setAttributeNS(svgNS, "text-align", "middle");
-	   text.setAttributeNS(svgNS, "text-anchor", "middle");
-	   text.textContent = buttons[i].text;
-	   g.appendChild(text);
-	}
-}
-
-function createInteractionButtons() {
-	createButtons(interaction_buttons, 0);
-}
-
-function createMovieButtons() {
-	createButtons(movie_buttons, 500);
-}
-
-function createMediaProperties() {
-	var propertiesG = document.getElementById("properties_table");
-	var title = document.createElementNS(svgNS, "text");
-	title.setAttributeNS(svgNS, "font-weight", "bold");
-	title.textContent = "Media Properties";
-	propertiesG.appendChild(title);
-	for (var i = 0; i < media_properties.length; i++) {
-	   var g = document.createElementNS(svgNS, "g");
-	   g.setAttributeNS(svgNS, "transform", "translate(0, "+((i+1)*21-10)+")");
-	   propertiesG.appendChild(g);
-	
-	   var rect = document.createElementNS(svgNS, "rect");
-	   rect.setAttributeNS(svgNS, "width", "120");
-	   rect.setAttributeNS(svgNS, "height", "20");
-	   rect.setAttributeNS(svgNS, "fill", "lightgrey");
-	   g.appendChild(rect);
-
-	   var label = document.createElementNS(svgNS, "text");
-	   label.setAttributeNS(svgNS, "x", "60");
-	   label.setAttributeNS(svgNS, "y", "15");
-	   label.setAttributeNS(svgNS, "text-align", "middle");
-	   label.setAttributeNS(svgNS, "text-anchor", "middle");
-	   label.textContent = media_properties[i];
-	   g.appendChild(label);
-	   
-	   var text = document.createElementNS(svgNS, "text");
-	   text.setAttributeNS(svgNS, "x", "130");
-	   text.setAttributeNS(svgNS, "y", "15");
-	   text.textContent = "?";
-	   g.appendChild(text);
-	   media_properties_elts[i] = text;
-	}
-}
-
-function createEventTableRow(event_name, yOffset) {
-	var table = document.getElementById("event_table");
-	var length = table.childNodes.length;
-
-	var row = document.createElementNS(svgNS, "g");
-	row.setAttributeNS(svgNS, "transform", "translate(0,"+(yOffset+length*21)+")");
-	table.appendChild(row);
-
-	var rect = document.createElementNS(svgNS, "rect");
-	rect.setAttributeNS(svgNS, "width", "120");
-	rect.setAttributeNS(svgNS, "height", "20");
-	rect.setAttributeNS(svgNS, "fill", "lightgrey");
-	row.appendChild(rect);
-
-	var label = document.createElementNS(svgNS, "text");
-	label.setAttributeNS(svgNS, "x", "60");
-	label.setAttributeNS(svgNS, "y", "15");
-	label.setAttributeNS(svgNS, "text-align", "middle");
-	label.setAttributeNS(svgNS, "text-anchor", "middle");
-	label.textContent = event_name;
-	row.appendChild(label);
-
-	var status = document.createElementNS(svgNS, "text");
-	status.setAttributeNS(svgNS, "x", "130");
-	status.setAttributeNS(svgNS, "y", "15");
-	status.textContent = "no event yet";
-	status.setAttributeNS(svgNS, "id", "e_"+event_name);
-	row.appendChild(status);
-}
-
-function createEventTable() {
-	var table = document.getElementById("event_table");
-	var title = document.createElementNS(svgNS, "text");
-	title.setAttributeNS(svgNS, "transform", "translate(0,0)");
-	title.setAttributeNS(svgNS, "font-weight", "bold");
-	title.textContent = "Media Events";
-	table.appendChild(title);
-	for (key in media_events) {	
-		createEventTableRow(key, -10);
-	}
-}
-
-function init_events() {
-    for (key in media_events) {	
-		document._video.addEventListener(key, capture, false);
-		alert("Added event '"+key+"' to the video element");
-    }
-}
-
-function remove_events() {
-    for (key in media_events) {	
-		document._video.removeEventListener(key, capture, false);
-		alert("Removed event '"+key+"' to the video element");
-    }
-}
-
-function init_properties() {
-	update_properties();
-}
-
-function pad(n, width, z) {
-	z = z || '0';
-	n = n + '';
-	return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
-}
-
-function time() {
-	var d = new Date();
-	var t = (pad(d.getHours(), 2)+':'+pad(d.getMinutes(), 2)+':'+pad(d.getSeconds(),2)+'.'+pad(d.getMilliseconds(), 3))
-	return t;
-}
-
-function readyStateString(i) {
-	switch (i) {
-		case 0: return "HAVE_NOTHING";
-		case 1: return "HAVE_METADATA";
-		case 2: return "HAVE_CURRENT_DATA";
-		case 3: return "HAVE_FUTURE_DATA";
-		case 4: return "HAVE_ENOUGH_DATA";
-		default: return "PROBLEM";
-	}
-}
-
-function networkStateString(i) {
-	switch (i) {
-		case 0: return "NETWORK_EMPTY";
-		case 1: return "NETWORK_IDLE";
-		case 2: return "NETWORK_LOADING";
-		case 3: return "NETWORK_NO_SOURCE";
-		default: return "PROBLEM";
-	}
-}
-
-function reportVideoStates() {
-	alert("Time "+time()+" networkState: "+networkStateString(document._video.networkState)+" readyState: "+readyStateString(document._video.readyState));
-}
-
-function capture(event) {
-	alert("Time "+time()+" event "+event.type);
-	reportVideoStates();
-    media_events[event.type] ++;
-    for (key in media_events) {	
-		var e = document.getElementById("e_" + key);
-		if (e) {
-			e.textContent = ""+media_events[key];
-			//if (media_events[key] > 0) e.className = "true";
-		}
-    }
-    update_properties();
-}
-
-function update_properties() {
-    var i = 0;
-	var j;
-    for (key in media_properties) {
-		var prop = document._video[media_properties[key]];
-		var val = prop;
-		if (prop == "[object TimeRanges]") {
-			val = "TimeRanges - length:"+prop.length;
-			for (j = 0; j < prop.length; j++) {
-			 val += ",("+prop.start(j)+";"+prop.end(j)+")";
-			}
-		}
-		if (prop == "[object VideoTrackList]") {
-			val = "VideoTrackList - length:"+prop.length;
-		}
-		if (prop == "[object AudioTrackList]") {
-			val = "AudioTrackList - length:"+prop.length;
-		}
-		if (prop == "[object TextTrackList]") {
-			val = "TextTrackList - length:"+prop.length;
-		}
-		media_properties_elts[i++].textContent = ""+val;
-    }
-    if (!!document._video.audioTracks) {
-		var td = document.getElementById("m_audiotracks");
-		td.textContent = ""+document._video.audioTracks.length;
-    }
-    if (!!document._video.videoTracks) {
-		var td = document.getElementById("m_videotracks");
-		td.textContent = ""+document._video.audioTracks.length;
-    }
-    if (!!document._video.textTracks) {
-		var td = document.getElementById("m_texttracks");
-		td.textContent = ""+document._video.audioTracks.length;
-    }
-}
-
-var videos = new Array();
-
-videos[0] = [
-	     "http://media.w3.org/2010/05/sintel/poster.png",
-	     "http://media.w3.org/2010/05/sintel/trailer.mp4",
-	     "http://media.w3.org/2010/05/sintel/trailer.ogv",
-	     "http://media.w3.org/2010/05/sintel/trailer.webm"
-	     ];
-videos[1] = [
-	     "http://media.w3.org/2010/05/bunny/poster.png",
-	     "http://media.w3.org/2010/05/bunny/trailer.mp4",
-	     "http://media.w3.org/2010/05/bunny/trailer.ogv"
-	     ];
-videos[2] = [
-	     "http://media.w3.org/2010/05/bunny/poster.png",
-	     "http://media.w3.org/2010/05/bunny/movie.mp4",
-	     "http://media.w3.org/2010/05/bunny/movie.ogv"
-	     ];
-videos[3] = [
-	     "http://media.w3.org/2010/05/video/poster.png",
-	     "http://media.w3.org/2010/05/video/movie_300.mp4",
-	     "http://media.w3.org/2010/05/video/movie_300.ogv",
-	     "http://media.w3.org/2010/05/video/movie_300.webm"
-	     ];
-videos[4] = [
-	     "http://media.w3.org/2010/05/bunny/poster.png",
-	     "http://127.0.0.1:8020/file.mp4",
-	     ];
-
-function switchVideo(n) {
-	reportVideoStates();
-	alert("Time "+time()+" switching video to "+videos[n][1]);
-
-    if (n >= videos.length) n = 0;
-
-    document._video.src = videos[n][1];
-}
-
-function load() {
-    document._video.load();
-	reportVideoStates();
-}
-
-init();
-//document.addEventListener("DOMContentLoaded", init, false);
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/mediaevents.svg Deleted

@@ -1,29 +0,0 @@
-
-<svg width="800" height="800" viewBox="0 0 800 800" 
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-	 
-	
-    <g id="buttons" transform="translate(10,10)">
-    </g>
-	
-	<g id="properties_table" transform="translate(400, 20)">
-	</g>
-
-	<g transform="translate(160,0)">
-		<video id="video" controls="" preload="none" poster="http://media.w3.org/2010/05/sintel/poster.png" 
-		       width="200" height="200"/>
-	</g>
-	
-	<g id="tracksTable" transform="translate(160, 200)" onclick="alert('clicked');">
-		<text font-weight="bold">Number of tracks</text>
-		<text x="0" y="20" >Audio</text><text id="m_audiotracks" x="130" y="20">?</text>
-		<text x="0" y="40" >Video</text><text id="m_videotracks" x="130" y="40">?</text>
-		<text x="0" y="60" >Text </text><text id="m_texttracks"  x="130" y="60">?</text>
-		<text x="0" y="80" >Other</text><text id="m_othertracks" x="130" y="80">?</text>
-	</g>
-
-	<g id="event_table" transform="translate(160, 300)">
-	</g>
-
-	<script xlink:href="mediaevents.js"/>
-</svg>

gpac-0.8.0.tar.gz/tests/media/html5_video/mse-overlap.js Deleted

@@ -1,71 +0,0 @@
-'use strict';
-/*****************************************************************************************
- *
- * Example code using the Media Source Extension API with GPAC
- *
- *****************************************************************************************/
-alert("Media Source Script loaded");
-
-var baseURL = "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/"
-var medias = [
-    { url: "mp4-main-multi-mpd-V-BS_init.mp4", offset: 0 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 0 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 10 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 15 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 20 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 25 },
-    { url: "mp4-main-multi-h264bl_low-1.m4s", offset: 30 }
-];
-
-function addMediaToTimelineAndPlay(sb, i)
-{
-    var xhr = new XMLHttpRequest();
-    xhr.sb = sb;
-    xhr.index = (i == undefined ? 0 : i);
-    xhr.timeOffset = medias[xhr.index].offset;
-    xhr.open("GET", baseURL+medias[xhr.index].url);
-    xhr.responseType = "arraybuffer";
-    xhr.onreadystatechange = function () {
-        if (this.readyState == this.DONE) {
-            if (this.sb.updating == false) {
-                this.sb.timestampOffset = this.timeOffset;
-                this.sb.appendBuffer(this.response);
-                if (this.index < medias.length) {
-                    addMediaToTimelineAndPlay(this.sb, this.index+1);
-                } else {
-                    this.sb.v.play();
-                }
-            } else {
-                alert("two appends at the same time");
-            }
-        }
-    };
-    xhr.send(); 
-}
-
-function onSourceOpen(event) {
-    var sb;
-    alert("MediaSource opened");
-    /* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
-    var v = event.target;
-    var ms = v.ms;
-    sb = ms.addSourceBuffer("video/mp4");
-    sb.v = v;
-    addMediaToTimelineAndPlay(sb);
-}
-
-function init() {
-
-    var v = document.getElementById("v");
-    /* GPAC Hack: the event should be dispatched to the MediaSource object not to the video */
-    v.addEventListener("sourceopen", onSourceOpen);
-
-    alert("Creating new MediaSource");
-    var ms = new MediaSource();
-    v.src = URL.createObjectURL(ms);
-
-    /* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched to the video */
-    v.ms = ms;
-
-}
-

gpac-0.8.0.tar.gz/tests/media/html5_video/mse.svg Deleted

@@ -1,58 +0,0 @@
-<svg width="800" height="800" viewBox="0 0 400 400" 
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 >
-
-  <defs>
-    <solidColor id="backColor" solid-color="blue"/>
-  </defs>
-  
-  
-
-  <g id="up_button" transform="translate(10,10)" onclick="p1.switchUp()">
-	  <rect id="r" fill="url(#backColor)" width="40" height="40" rx="5"/>
-	  <textArea text-align="center" width="40" height="40" font-size="30" font-weight="bold">+</textArea>
-  </g>
-  
-  <g id="up_button" transform="translate(60,10)" onclick="p1.switchDown()">
-	  <rect id="r" fill="url(#backColor)" width="40" height="40" rx="5"/>
-	  <textArea text-align="center" width="40" height="40" font-size="30" font-weight="bold">-</textArea>
-  </g>
-
-  
-  <g id="info_main"  transform="translate( 10, 60)"/>
- 
-  <g transform="translate(10, 60)">
-    <video id="v_main"  x="0"   width="380" height="400"/>
-  </g>
- 
- 
-  <g>
-    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
-  </g>	 
-	 
-  <script type="application/ecmascript" xlink:href="bind.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-local.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-audio-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-av-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-live-nobs-http.js"/>
-  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>  
-  <script type="application/ecmascript" xlink:href="redbull-mp4-audio-segments-http.js"/>  
-  <script type="application/ecmascript" xlink:href="myanmar-tiles.js"/>  
-  <script type="application/ecmascript" xlink:href="gpac-mse.js"/>
-  
-  <script type="application/ecmascript">
-    /* choose one of the segment source: 
-	    - counterAudioHTTPSegments, 
-		- counterAudioVideoHTTPSegments, 
-		- counterVideoHTTPSegments ,
-		- counterLiveNoBSVideoHTTPSegments,
-		- redBullAudioHTTPSegments
-		- or redBullVideoHTTPSegments */
-	var p1 = new Player('v_main', 'info_main', 'timer_anim', myanmarTile1VideoSegmentsLocal); 
-	p1.play();
-  </script>
-</svg>

gpac-0.8.0.tar.gz/tests/media/html5_video/myanmar-tiles.js Deleted

@@ -1,135 +0,0 @@
-/* Array representing the different files to download per quality */
-var myanmarFullVideoSegmentsLocal = 
-	[ 
-		{ 
-		  baseURL: "dash/full/",
-		  initName: "myanmar_360_60s_dashinit.mp4",
-		  segmentPrefix: "myanmar_360_60s_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 17
-		}
-	];
-
-var myanmarTile1VideoSegmentsLocal = 
-	[ 
-		{ 
-		  baseURL: "dash/t1/",
-		  initName: "myanmar_360_t1_dashinit.mp4",
-		  segmentPrefix: "myanmar_360_t1_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t1/",
-		  initName: "myanmar_720_t1_dashinit.mp4",
-		  segmentPrefix: "myanmar_720_t1_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t1/",
-		  initName: "myanmar_1080_t1_dashinit.mp4",
-		  segmentPrefix: "myanmar_1080_t1_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		}
-	];
-
-var myanmarTile2VideoSegmentsLocal = 
-	[ 
-		{ 
-		  baseURL: "dash/t2/",
-		  initName: "myanmar_360_t2_dashinit.mp4",
-		  segmentPrefix: "myanmar_360_t2_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t2/",
-		  initName: "myanmar_720_t2_dashinit.mp4",
-		  segmentPrefix: "myanmar_720_t2_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t2/",
-		  initName: "myanmar_1080_t2_dashinit.mp4",
-		  segmentPrefix: "myanmar_1080_t2_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		}
-	];
-
-var myanmarTile3VideoSegmentsLocal = 
-	[ 
-		{ 
-		  baseURL: "dash/t3/",
-		  initName: "myanmar_360_t3_dashinit.mp4",
-		  segmentPrefix: "myanmar_360_t3_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t3/",
-		  initName: "myanmar_720_t3_dashinit.mp4",
-		  segmentPrefix: "myanmar_720_t3_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t3/",
-		  initName: "myanmar_1080_t3_dashinit.mp4",
-		  segmentPrefix: "myanmar_1080_t3_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		}
-	];
-
-var myanmarTile4VideoSegmentsLocal = 
-	[ 
-		{ 
-		  baseURL: "dash/t4/",
-		  initName: "myanmar_360_t4_dashinit.mp4",
-		  segmentPrefix: "myanmar_360_t4_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t4/",
-		  initName: "myanmar_720_t4_dashinit.mp4",
-		  segmentPrefix: "myanmar_720_t4_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		},
-		{ 
-		  baseURL: "dash/t4/",
-		  initName: "myanmar_1080_t4_dashinit.mp4",
-		  segmentPrefix: "myanmar_1080_t4_dash",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 39
-		}
-	];
-	
-var myanmarSpatialRepresentations = {
-	global: { x: 0, y: 0, w: 1280, h: 720 },
-	sets: [
-		{ x:   0, y:   0, w: 640, h: 360, representations: myanmarTile1VideoSegmentsLocal },
-		{ x: 640, y:   0, w: 640, h: 360, representations: myanmarTile2VideoSegmentsLocal },
-		{ x:   0, y: 360, w: 640, h: 360, representations: myanmarTile3VideoSegmentsLocal },
-		{ x: 640, y: 360, w: 640, h: 360, representations: myanmarTile4VideoSegmentsLocal }
-	]
-}
-

gpac-0.8.0.tar.gz/tests/media/html5_video/nodejs-byte-server.js Deleted

@@ -1,71 +0,0 @@
-var fs = require('fs')
-var http = require('http')
-var url_parser = require('url');
-
-var BUFFER_LENGTH = 2;
-var paused = true;
-var pausedAfterSend = false;
-
-function sendBytes(file) {
-	var length = BUFFER_LENGTH;
-	var buffer = new Buffer(length);
-	var offset = 0;
-	var bytesRead;
-
-	if (!paused) {
-		bytesRead = fs.readSync(file.fd, buffer, offset, length, file.position);
-		file.position += bytesRead;
-		
-		if (bytesRead == 0) {
-			file.res.end();
-			clearInterval(file.id);
-			console.log("Ending request "+file.position+"/"+file.size);
-		} else {
-			console.log("Sending byte "+file.position+"/"+file.size);
-			file.res.write(buffer);
-			if (pausedAfterSend) paused = true;
-		}
-	}
-}
-
-var app = function(req,res)
-{
-	console.log("Received request for file "+req.url);
-	var parsed_url = url_parser.parse(req.url, true);
-	var filename = '.'+parsed_url.pathname;
-	if (fs.existsSync(filename)) {	
-		var head = {};
-		var file = {};
-		file.position = 0;
-		file.fd = fs.openSync(filename, 'r');
-		file.res = res;
-		file.size = fs.statSync(filename).size;
-		if (filename.slice(-3) === "mp4") {
-			head['Content-Type'] = 'video/mp4';
-		}
-		head['Content-Length'] = file.size;
-		res.writeHead(200, head);
-		file.id = setInterval(sendBytes, 300, file);
-	}
-}
-
-http.createServer(app).listen(8020,"127.0.0.1")
-
-process.stdin.on('data', function(chunk) {
-	if (chunk.toString() == "b\r\n") {
-		BUFFER_LENGTH = 2;
-		console.log("New buffer size "+BUFFER_LENGTH);
-	} else if (chunk.toString() == "k\r\n") {
-		BUFFER_LENGTH = 1000;	
-		console.log("New buffer size "+BUFFER_LENGTH);
-	} else if (chunk.toString() == "M\r\n") {
-		BUFFER_LENGTH = 1000000;	
-		console.log("New buffer size "+BUFFER_LENGTH);
-	} else if (chunk.toString() == "p\r\n") {
-		paused = !paused;	
-	} else if (chunk.toString() == "P\r\n") {
-		pausedAfterSend = !pausedAfterSend;	
-	} else if (chunk.toString() == "q\r\n") {
-		process.exit();
-	}
-});
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/redbull-mp4-audio-segments-http.js Deleted

@@ -1,36 +0,0 @@
-/* Array representing the different files to download per quality */
-var redBullAudioHTTPSegments = 
-	[ 
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
-		  initName: "redbull_audio_10sec_init.mp4",
-		  segmentPrefix: "64kbps/redbull_audio_64kbps_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
-		  initName: "redbull_audio_10sec_init.mp4",
-		  segmentPrefix: "96kbps/redbull_audio_96kbps_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
-		  initName: "redbull_audio_10sec_init.mp4",
-		  segmentPrefix: "128kbps/redbull_audio_128kbps_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
-		  initName: "redbull_audio_10sec_init.mp4",
-		  segmentPrefix: "165kbps/redbull_audio_165kbps_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		}
-	];

gpac-0.8.0.tar.gz/tests/media/html5_video/redbull-mp4-video-segments-http.js Deleted

@@ -1,140 +0,0 @@
-/* Array representing the different files to download per quality */
-var redBullVideoHTTPSegments = 
-	[ 
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/100kbps/",
-		  initName: "redbull_240p_100kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_240p_100kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/150kbps/",
-		  initName: "redbull_240p_150kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_240p_150kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/200kbps/",
-		  initName: "redbull_360p_200kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_360p_200kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/250kbps/",
-		  initName: "redbull_360p_250kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_360p_250kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/300kbps/",
-		  initName: "redbull_360p_300kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_360p_300kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/400kbps/",
-		  initName: "redbull_360p_400kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_360p_400kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/500kbps/",
-		  initName: "redbull_10sec_set2_init.mp4",
-		  segmentPrefix: "redbull_480p_500kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/700kbps/",
-		  initName: "redbull_10sec_set2_init.mp4",
-		  segmentPrefix: "redbull_480p_700kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/900kbps/",
-		  initName: "redbull_10sec_set2_init.mp4",
-		  segmentPrefix: "redbull_480p_900kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/1200kbps/",
-		  initName: "redbull_10sec_set2_init.mp4",
-		  segmentPrefix: "redbull_480p_1200kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/1500kbps/",
-		  initName: "redbull_720p_1500kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_720p_1500kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/2000kbps/",
-		  initName: "redbull_720p_2000kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_720p_2000kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/2500kbps/",
-		  initName: "redbull_720p_2500kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_720p_2500kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/3000kbps/",
-		  initName: "redbull_1080p_3000kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_1080p_3000kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/4000kbps/",
-		  initName: "redbull_1080p_4000kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_1080p_4000kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/5000kbps/",
-		  initName: "redbull_1080p_5000kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_1080p_5000kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/6000kbps/",
-		  initName: "redbull_1080p_6000kbps_10sec_segmentinit.mp4",
-		  segmentPrefix: "redbull_1080p_6000kbps_10sec_segment",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 2,
-		  segEndIndex: 525
-		}
-	];

gpac-0.8.0.tar.gz/tests/media/html5_video/spatial-mse.svg Deleted

@@ -1,28 +0,0 @@
-<svg width="800" height="800" viewBox="0 0 800 450" 
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <defs>
-    <solidColor id="backColor" solid-color="blue"/>
-  </defs>
-
-  
-  <g id="info_main"  transform="translate( 10, 60)"/>
-  <g id="info_thumb" transform="translate(410, 60)"/>
-
-  <g id="g_thumb">
-    <video id="v_main"  x="0"   y="160" width="380" height="180"/>
-    <video id="v_thumb" x="410" y="160" width="160" height="120"/>
-  </g>
-
-	
-  <g>
-    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
-  </g>	 
-	 
-  <script type="application/ecmascript" xlink:href="bind.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="myanmar-tiles.js"/>
-  <script type="application/ecmascript" xlink:href="gpac-mse.js"/>
-  <script type="application/ecmascript" xlink:href="gpac-mse-spatial.js"/>
-</svg>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/two-videos.svg Deleted

@@ -1,33 +0,0 @@
-<svg width="800" height="800" viewBox="0 0 800 600" 
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 onwheel="(evt.wheelDelta > 0 ? p1.switchUp() : p1.switchDown());">
-
-  <defs>
-    <solidColor id="backColor" solid-color="blue"/>
-  </defs>
-
-  
-  <g id="info_main"  transform="translate( 10, 60)"/>
-  <g id="info_thumb" transform="translate(410, 60)"/>
-
-  <g transform="translate(0, 160)">
-    <video id="v_main"  x="0"   width="380" height="400"/>
-    <video id="v_thumb" x="410" width="380" height="400"/>
-  </g>
-  
-  <g>
-    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
-  </g>	 
-	 
-  <script type="application/ecmascript" xlink:href="bind.js"/>
-  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>
-  <script type="application/ecmascript" xlink:href="video_html5_mse.js"/>
-  
-  <script type="application/ecmascript">
-	var p1 = new Player('v_main', 'info_main', 'timer_anim', counterVideoHTTPSegments);
-	var p2 = new Player('v_thumb', 'info_thumb', 'timer_anim', redBullVideoHTTPSegments);	
-	p1.play();
-	p2.play();
-  </script>
-</svg>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/video.svg Deleted

@@ -1,30 +0,0 @@
-<svg width="800" height="800" viewBox="0 0 800 800" 
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" onload="init()">
-
-  
-  <rect id="r" fill="orange" x="10" y="10" width="180" height="40" rx="5"/>
-  <text x="30" y="30">Click to toggle quality</text>
-
-  
-  <g id="t" transform="translate(10, 60)"/>
-
-  <video id="v" y="100" width="800" height="600"/>
-
-  
-  <g>
-    <animate id="a" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
-  </g>
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  <script type="application/ecmascript" xlink:href="mse-events.js"/>
-</svg>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/html5_video/xhr.js Deleted

@@ -1,147 +0,0 @@
-/*****************************************************************************************
- * Testing XHR objects 
- *****************************************************************************************/
-
-/* TextArea element to report debug messages */
-var tA = null;
-
-function report(msg) {
-	tA.appendChild(document.createElement('tbreak'));
-	tA.appendChild(document.createTextNode(msg));
-}
-
-function getResource(url, async, responseType, mime, doneCallback, xhr_reused)
-{
-  var xhr;
-  if (!xhr_reused) xhr = new XMLHttpRequest();
-  else xhr = xhr_reused;  
-  xhr.url = url;
-  xhr.open("GET", xhr.url, async);
-  xhr.responseType = responseType;
-  if (mime !== "") {
-	xhr.overrideMimeType(mime);
-  }
-  if (async) xhr.onreadystatechange = doneCallback;
-  report((async ? "Asynchronous" : "Synchronous" )+ " download of " + xhr.url + "," +
-         " expecting responseType \'" + responseType +"\'"+ ((mime !== "")?", with forced MIME type: '" + mime +"'":""));
-  xhr.send();
-  if (!async) doneCallback.call(xhr);
-  return xhr;
-}
-
-function onDone(e)
-{ 
-  if (this.readyState == this.DONE)
-  {
-	report("Download done: "+this.url);
-	report("responseType: "+this.responseType);
-	report("typeof(response): "+typeof(this.response));
-	report("responseText: "+this.responseText);
-	report("responseXML: "+this.responseXML);
-	report("response: "+this.response);
-	switch(this.responseType) {
-		case "":
-			break;
-		case "text":
-			break;
-		case "arraybuffer":
-			report("ArrayBuffer length:"+this.response.byteLength);
-			break;
-		case "json":
-			break;
-		case "document":
-			break;
-		case "blob":
-			break;
-		case "stream":
-			break;
-	}
-	report("");
-  }
-}
-
-function getResourceSimple(url, async, responseType, mime)
-{
-	getResource(url, async, (responseType == undefined ? "" : responseType), (mime == undefined ? "" : mime), onDone);
-}
-
-function getResourceAllWays(url, async)
-{
-  getResource(url, async, "",            "", onDone);
-  getResource(url, async, "text",        "", onDone);
-  getResource(url, async, "arraybuffer", "", onDone);
-  getResource(url, async, "json",        "", onDone);
-  getResource(url, async, "document",    "", onDone);
-  getResource(url, async, "blob",        "", onDone);
-  getResource(url, async, "stream",      "", onDone);
-
-  getResource(url, async, "",            "text/plain", onDone);
-  getResource(url, async, "text",        "text/plain", onDone);
-  getResource(url, async, "arraybuffer", "text/plain", onDone);
-  getResource(url, async, "json",        "text/plain", onDone);
-  getResource(url, async, "document",    "text/plain", onDone);
-  getResource(url, async, "blob",        "text/plain", onDone);
-  getResource(url, async, "stream",      "text/plain", onDone);
-
-  getResource(url, async, "",            "application/xml", onDone);
-  getResource(url, async, "text",        "application/xml", onDone);
-  getResource(url, async, "arraybuffer", "application/xml", onDone);
-  getResource(url, async, "json",        "application/xml", onDone);
-  getResource(url, async, "document",    "application/xml", onDone);
-  getResource(url, async, "blob",        "application/xml", onDone);
-  getResource(url, async, "stream",      "application/xml", onDone);
-
-  getResource(url, async, "",            "application/octet-stream", onDone);
-  getResource(url, async, "text",        "application/octet-stream", onDone);
-  getResource(url, async, "arraybuffer", "application/octet-stream", onDone);
-  getResource(url, async, "json",        "application/octet-stream", onDone);
-  getResource(url, async, "document",    "application/octet-stream", onDone);
-  getResource(url, async, "blob",        "application/octet-stream", onDone);
-  getResource(url, async, "stream",      "application/octet-stream", onDone);
-}
-
-function testAllLocal(filename, asyncDownload, getMethod, responseType, mime) {
-	getMethod(filename, asyncDownload, responseType, mime);
-//	getMethod("file://"+filename, asyncDownload, responseType, mime);
-//	getMethod("file://localhost/"+filename, asyncDownload, responseType, mime);
-}
-
-function test1() 
-{
-  var baseURL = "";"http://perso.telecom-paristech.fr/~concolat/html5_tests/";
-  var asyncDownload = false;
-  var testFunc = getResourceSimple; //getResourceAllWays;
-  report("Starting tests 1...");
-  testFunc(baseURL+"file.txt", asyncDownload);
-  testFunc(baseURL+"file.xml", asyncDownload, "document");
-  testFunc(baseURL+"file.mp4", asyncDownload, "arraybuffer");
-  testFunc(baseURL+"file.json", asyncDownload);
-/*  testAllLocal("file.txt", asyncDownload, testFunc);
-  testAllLocal("file.xml", asyncDownload, testFunc, "document");
-  testAllLocal("file.mp4", asyncDownload, testFunc, "arraybuffer");
-  testAllLocal("file.json", asyncDownload, testFunc);*/
-  report("end of tests 1.");
-}
-
-function test2() 
-{
-  var res;
-
-  report("Starting tests 2...");
-  var xhr = getResource("file.mp4", false, "arraybuffer", "application/octet-stream", onDone);
-  var res = xhr.response;
-  alert("Resource: "+res);
-  getResource("file.json", false, "arraybuffer", "application/octet-stream", onDone, xhr);
-  report("end of tests 2");
-}
-
-function init()
-{ 
-  tA = document.createElement('textArea');
-  document.documentElement.appendChild(tA);
-}
-
-alert("Script loaded"); 
-init();
-test1();
-

gpac-0.8.0.tar.gz/tests/media/html5_video/xhr.svg Deleted

gpac-0.8.0.tar.gz/tests/media/index.css Deleted

@@ -1,134 +0,0 @@
-body {
-  background-color:#E8E5E5;
-	border: 0; margin: 0; padding: 0;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 12px; 	
-  margin-top: 15px;
-  margin-left: 15px;
-  margin-right: 15px;
-}
-
-a {	text-decoration:none; }
-
-#title {
-  font-size: 16px; 
-  font-weight:bold;
-  text-align: left;
-  margin: 0;
-  padding: 0;
-  color: #D50751;
-}
-
-#nav {
-	text-align: left;
-	
-}
-
-#nav ul {
-  margin: 0;
-  padding: 0;
-  border-bottom: 1px solid black;	
-  margin-bottom: 15px;
-}
-
-#nav li {
-	display: inline;
-	list-style-type: none;
-  font-size: 14px; 
-  font-weight:bold;
-	text-align: center;
-}
-
-#content {
-	width: 95%;
-}
-
-a {	text-decoration:none; }
-
-h2 {
-	color:#000000; 
-  font-weight:bold;
-	margin-left: 23px;
-	width: 95%;
-  font-size: 14px; 
-  font-weight:bold;
-}
-
-div#description h2, div#contentview h2, div#codeview h2 {
-	border-bottom: 1px solid black;
-}
-
-div#content h3 {
-	border-bottom: 1px solid black;
-}
-
-#left {
-  width: 49%;
-  float: left;
-	border-right: 1px solid black;
-}
-
-#right {
-  width: 50%;
-  float: right;
-}
-
-#description {
-  width: 95%;
-	text-align: left;
-}
-
-#downloadbar, #downloadbar h2 {
-  color:#FFFFFF; 
-  margin: 0;
-  padding: 0; 
-  background-color:#A51129; 
-  text-align: center; 
-  position: relative;
-  width: 95%;
-}
-
-#downloadbar ul
-{
-	text-align: center;
-}
-
-#downloadbar li
-{
-	display: inline;
-	list-style-type: none;
-	padding-right: 20px;
-}
-
-#downloadbar a:link, #downloadbar a:visited {
-  display:inline;  
-  padding:0; 
-  color:#FFFFFF;
-	background-color: transparent;
-}
-
-#contentview {
-    text-align: left;
-}
-
-#snapshotview {
-    clear: both;
-}
-
-#codeview {
-    clear: both;
-    width: 100%;
-    height: 100%;
-}
-
-#codeview object {
-    width: 100%;
-    height: 100%;
-}
-
-#category li {
-	display: inline;
-	list-style-type: none;
-	margin-right: 20px;
-}
-

gpac-0.8.0.tar.gz/tests/media/index.xml Deleted

@@ -1,373 +0,0 @@
-<testsuitelist> 
-<format name="BIFS">
-<category name="2D Shapes">
-<file name="bifs-2D-shapes-all" title="All Possible Shapes" type="bt"/>
-<file name="bifs-2D-shapes-indexfaceset2D" title="Drawing Polygons" type="bt" /> 
-<file name="bifs-2D-shapes-indexlineset2D" title="Drawing Polylines" type="bt" /> 
-<file name="bifs-2D-shapes-pointset2D" title="Drawing Points" type="bt" /> 
-<file name="bifs-2D-shapes-xcurve2D" title="Drawing Bezier Curves" type="bt" /> 
-</category>
-<category name="2D Painting">
-<file name="bifs-2D-painting-material2D" title="Simple Filling and Stroking" type="bt" /> 
-<file name="bifs-2D-painting-lineproperties" title="Simple Stroke Properties" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-cap" title="Line Caps" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-join" title="Line Joins" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-dash" title="Dashing" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-transparent" title="Line Positioning &amp; Transparency" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-scalable" title="Line Scalablility" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-imagetexture" title="Texturing Line With Images" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-lineargradient" title="Texturing Line With Linear Gradients" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-radialgradient" title="Texturing Line With Radial Gradients" type="bt" /> 
-<file name="bifs-2D-painting-xlineproperties-compositetexture2D"  title="Texturing Line With Patterns" type="bt" /> 
-<file name="bifs-2D-painting-colortransform-color" title="Color changes on a subtree" type="bt" /> 
-<file name="bifs-2D-painting-colortransform-alpha" title="Transparency changes on a subtree" type="bt" /> 
-<file name="bifs-2D-painting-colortransform-bitmap" title="Colors changes on bitmaps" type="bt" /> 
-</category>
-<category name="2D Texturing">
-<file name="bifs-2D-texturing-imagetexture-shapes" title="Arbitrary-Shape Image Texture Clipping" type="bt" /> 
-<file name="bifs-2D-texturing-movietexture-shapes" title="Arbitrary-Shape Video Texture Clipping" type="bt" /> 
-<file name="bifs-2D-texturing-texturetransform-base" title="Texture Transforming" type="bt" /> 
-<file name="bifs-2D-texturing-texturetransform-interact" title="Texture Transforming Interactively" type="bt" /> 
-<file name="bifs-2D-texturing-texturetransform-transformmatrix2D" title="Texture Skewing" type="bt" /> 
-<file name="bifs-2D-texturing-lineargradient-simple" title="Linear Gradient Texturing" type="bt" /> 
-<file name="bifs-2D-texturing-lineargradient-spread" title="Linear Gradient Spreading" type="bt" /> 
-<file name="bifs-2D-texturing-radialgradient-simple" title="Radial Gradient Texturing" type="bt" /> 
-<file name="bifs-2D-texturing-radialgradient-spread" title="Radial Gradient Spreading" type="bt" /> 
-<file name="bifs-2D-texturing-gradients-transparent" title="Gradient &amp; Transparency" type="bt" /> 
-<file name="bifs-2D-texturing-gradients-text" title="Gradients on Text" type="bt" /> 
-<file name="bifs-2D-texturing-pixeltexture" title="Synthetic textures" type="bt" /> 
-<file name="bifs-bitmap-image-pixel-metrics" title="Efficient Image Display" type="bt" /> 
-<file name="bifs-bitmap-image-resizing" title="Efficient Image Resizing" type="bt" /> 
-<file name="bifs-bitmap-movie" title="Efficient Video Display" type="bt" /> 
-<file name="bifs-bitmap-video-resizing" title="Efficient Video Resizing" type="bt" /> 
-<file name="bifs-bitmap-movie-materialkey" title="Color Keying on Video" type="bt" /> 
-<file name="bifs-bitmap-image-meter-metrics" type="bt" generate-html="false"/> 
-<file name="bifs-2D-texturing-compositetexture2D-bitmap" title="Composite Textures" type="bt" /> 
-<file name="bifs-2D-texturing-compositetexture2D-background" title="Composite Textures &amp; Background" type="bt" /> 
-<file name="bifs-2D-texturing-compositetexture2D-transparent" title="Composite Textures &amp; Transparency" type="bt" /> 
-</category>
-<category name="2D Positioning &amp; Layout">
-<file name="bifs-2D-positioning-orderedgroup" title="Display order (a.k.a. z-index)" type="bt" /> 
-<file name="bifs-2D-positioning-transform2D" title="Positioning graphical objects" type="bt" /> 
-<file name="bifs-2D-positioning-transformmatrix2D" title="Positioning graphical objects (2)" type="bt" /> 
-<file name="bifs-2D-positioning-layer2D" title="Rectangular axis-aligned clipping" type="bt" /> 
-<file name="bifs-2D-positioning-layer2d-in-layer2d" title="Nested Clipping" type="bt" /> 
-<file name="bifs-2D-positioning-layout-scroll-full" title="Scrolling" type="bt" /> 
-<file name="bifs-2D-positioning-pathlayout" title="Layout along a Path" type="bt" /> 
- 
-</category>
-<category name="2D Interactivity and Sensors">
-<file name="bifs-2D-interactivity-touchsensor-isover" title="Detecting Mouse Over" type="bt" /> 
-<file name="bifs-2D-interactivity-touchsensor-isactive" title="Detecting Mouse Click" type="bt" /> 
-<file name="bifs-2D-interactivity-touchsensor-4states" title="4 States Button" type="bt" /> 
-<file name="bifs-2D-interactivity-touchsensor-isactive-exposedfield" title="Event Propagation" type="bt" /> 
-<file name="bifs-2D-interactivity-touchsensor-hitpoint" title="Using Mouse Click Point" type="bt" /> 
-<file name="bifs-2D-interactivity-planesensor2D" title="Dragging objects" type="bt" /> 
-<file name="bifs-2D-interactivity-nested-sensors" title="Nested Sensors" type="bt" /> 
-<file name="bifs-2D-interactivity-mousesensor" title="Other Mouse Events" type="bt" /> 
-<file name="bifs-2D-interactivity-discsensor" title="Rotating Objects Interactively" type="bt" /> 
-<file name="bifs-2D-interactivity-proximitysensor2D" title="Detecting Mouse Proximity" type="bt" /> 
-<file name="bifs-2D-interactivity-keysensor" title="Detecting Keys" type="bt" /> 
-<file name="bifs-2D-interactivity-stringsensor" title="String Input" type="bt" /> 
-<file name="bifs-2D-interactivity-htk-sensor" type="bt" generate-html="false" /> 
-</category>
-<category name="Text">
-<file name="bifs-text-vrml-alignment" title="Simple Text" type="bt" /> 
-<file name="bifs-text-style" title="Text Styling" type="bt" /> 
-<file name="bifs-text-maxextend" title="Limiting the text width" type="bt" /> 
-<file name="bifs-text-length" title="Limiting the line width" type="bt" /> 
-<file name="bifs-2D-positioning-layout-horiz-text" title="Text Paragraph" type="bt" /> 
- 
-</category>
-<category name="2D Background &amp; Viewports">
-<file name="bifs-2D-background-background2D-bind" type="bt" /> 
-<file name="bifs-2D-background-background2D-image" type="bt" /> 
-<file name="bifs-2D-background-background2D-layer2D" type="bt" /> 
-<file name="bifs-2D-background-background2D-movie" type="bt" /> 
-<file name="bifs-2D-background-background2D-url-change" type="bt" /> 
-<file name="bifs-2D-viewport-simple" type="bt" /> 
-<file name="bifs-2D-viewport-complete" type="bt" /> 
-</category>
-<category name="Interpolation">
-<file name="bifs-interpolation-timesensor-enabled" type="bt" /> 
-<file name="bifs-interpolation-timesensor-starttime_norestart" type="bt" /> 
-<file name="bifs-interpolation-timesensor-starttime_restart" type="bt" /> 
-<file name="bifs-interpolation-valuator-sftime" type="bt" /> 
-<file name="bifs-interpolation-scalaranimator" type="bt" /> 
-<file name="bifs-interpolation-scalarinterpolator" type="bt" /> 
-<file name="bifs-interpolation-coordinateinterpolator2D" type="bt" /> 
-<file name="bifs-interpolation-positionanimator2D" type="bt" /> 
-<file name="bifs-interpolation-positioninterpolator2D-position" type="bt" /> 
-<file name="bifs-interpolation-positioninterpolator2D-size" type="bt" /> 
-<file name="bifs-interpolation-colorinterpolator" type="bt" /> 
-<file name="bifs-interpolation-positionanimator" type="bt" /> 
-<file name="bifs-interpolation-positioninterpolator-position" type="bt" /> 
-<file name="bifs-interpolation-positioninterpolator-size" type="bt" /> 
-</category>
-<category name="Audio, Video and Image: Media Managment">
-<file name="bifs-media-sound" title="Playing Sound" type="bt" /> 
-<file name="bifs-media-audioclip" type="bt" /> 
-<file name="bifs-media-audiosource" type="bt" /> 
-<file name="bifs-media-imagetexture-no-od" title="URL &amp; Image" type="bt" /> 
-<file name="bifs-media-movietexture-no-od" title="URL &amp; video" type="bt" /> 
-<file name="bifs-media-movietexture-control" title="Video Start &amp; Stop" type="bt" /> 
-<file name="bifs-media-movietexture-od-joinsession" title="2 Videos and 1 OD" type="bt" /> 
-<file name="bifs-media-movietexture-od-leave-session" type="bt" /> 
-<file name="bifs-media-imagetexture-url-change" title="Changing Image URL" type="bt" /> 
-<file name="bifs-media-movietexture-url-change" title="Changing Video URL" type="bt" /> 
-<file name="bifs-media-audiosource-urlchanged" title="Changing Sound URL" type="bt" /> 
-<file name="bifs-media-audioclip-urlchanged" title="Changing Sound URL (2)" type="bt" /> 
-
-<file name="bifs-media-imagetexture-object-scale" type="bt" /> 
-<file name="bifs-media-imagetexture-OD-reuse" type="bt" /> 
-<file name="bifs-media-imagetexture-transparent" type="bt" /> 
-<file name="bifs-media-movietexture-owns-OCR" type="bt" /> 
-<file name="bifs-media-movietexture-shares-OCR" type="bt" /> 
-<file name="bifs-media-sound-spatialize" type="bt" /> 
-<file name="bifs-media-audiobuffer" type="bt" /> 
-<file name="bifs-media-audiosource-mixing" type="bt" /> 
-</category>
-<category name="Audio, Video : Timeline Management">
-<file name="bifs-timeline-mediacontrol-audio" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-audio-speed" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-complete" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-deactivation" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-inline-av" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-inline-segments" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-inline" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-OCR" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-rtsp" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-seg-inline" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-segments" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-video" type="bt" /> 
-<file name="bifs-timeline-mediacontrol-videospeed" type="bt" /> 
-<file name="bifs-timeline-mediasensor-segment-switch" type="bt" /> 
-<file name="bifs-timeline-mediasensor-segment" type="bt" /> 
-<file name="bifs-timeline-mediasensor" type="bt" /> 
-</category>
-<category name="Navigation">
-<file name="bifs-linking-anchor-mp4-next" title="Navigating to another scene" type="bt" /> 
-<file name="bifs-linking-anchor-mp4-prev" type="bt" generate-html="false"/> 
-<file name="bifs-linking-anchor-www" title="Navigating to a Web link" type="bt" /> 
-<file name="bifs-linking-anchor-viewpoint" type="bt" /> 
-<file name="bifs-linking-inline-direct" type="bt" /> 
-<file name="bifs-linking-inline-direct-inline" type="bt" /> 
-<file name="bifs-linking-inline-od" type="bt" /> 
-<file name="bifs-linking-inline-rtsp" type="bt" /> 
-<file name="bifs-linking-inline-rtsp-no-od" type="bt" /> 
-<file name="bifs-linking-inline-segment-inline" type="bt" /> 
-<file name="bifs-linking-inline-segment" type="bt" /> 
-<file name="bifs-linking-animationstream" type="bt" /> 
-</category>
-<category name="Stream Selection">
-<file name="bifs-stream-text-switch" type="bt" /> 
-</category>
-<category name="BIFS Commands">
-<file name="bifs-command-replace-scene" title="Scene Replacement" type="bt" /> 
-<file name="bifs-command-replace-field" title="Field Replacement" type="bt" /> 
-<file name="bifs-command-replace-index" title="Indexed Replacement" type="bt" /> 
-<file name="bifs-command-multiple-replace-field" title="Multiple Field Replacement" type="bt" /> 
-<file name="bifs-command-multiple-replace-index" title="Multiple Values Replacement" type="bt" /> 
-<file name="bifs-command-replace-node-null" title="Node Deletion by Replacement" type="bt" /> 
-<file name="bifs-command-replace-node" title="Node Replacement" type="bt" /> 
-<file name="bifs-command-replace-route" title="Route Replacement" type="bt" /> 
-<file name="bifs-command-replace-scene-null" title="Scene Deletion" type="bt" /> 
-<file name="bifs-command-insert-index" title="Insertion of point" type="bt" /> 
-<file name="bifs-command-insert-node" title="Node Insertion" type="bt" /> 
-<file name="bifs-command-insert-nodedef" title="Node Insertion (with a name)" type="bt" /> 
-<file name="bifs-command-insert-route" title="Route Insertion" type="bt" /> 
-<file name="bifs-command-delete-node" title="Delete Node" type="bt" /> 
-<file name="bifs-command-node-delete-ex" title="Delete Node in OrderedGroup" type="bt" /> 
-<file name="bifs-command-delete-index" title="Delete by index" type="bt" /> 
-<file name="bifs-command-delete-route" title="Delete Route" type="bt" /> 
-<file name="bifs-command-animated-osmo4logo" title="Complete Animation Using BIFS Commands" type="bt" /> 
-<file name="bifs-command-global-qp" type="bt" /> 
-<file name="bifs-command-proto-delete" type="bt" /> 
-<file name="bifs-command-proto-insert" type="bt" /> 
-<file name="bifs-command-protolist-delete" type="bt" /> 
-<file name="bifs-command-quantification" type="bt" /> 
-<file name="bifs-command-route-add-children" type="bt" /> 
-<file name="bifs-command-route-children" type="bt" /> 
-<file name="bifs-command-route-node-exposedfield" type="bt" /> 
-<file name="bifs-command-route-node" type="bt" /> 
-<file name="bifs-command-route-remove-children" type="bt" /> 
-</category>
-<category name="Script">
-<file name="bifs-script-char-to-int" type="bt" /> 
-<file name="bifs-script-child-create" type="bt" /> 
-<file name="bifs-script-date" type="bt" /> 
-<file name="bifs-script-event-out" type="bt" /> 
-<file name="bifs-script-initialize" type="bt" /> 
-<file name="bifs-script-load-url" type="bt" /> 
-<file name="bifs-script-node-access" type="bt" /> 
-<file name="bifs-script-node-create" type="bt" /> 
-<file name="bifs-script-proto" type="bt" /> 
-<file name="bifs-script-timestamp" type="bt" /> 
-</category>
-<category name="Games">
-<file name="bifs-game-arrange" title="Arrange" type="bt" /> 
-<file name="bifs-game-breakout" title="BreakOut" type="bt" /> 
-<file name="bifs-game-minesweeper" title="MineSweeper" type="bt" /> 
-<file name="bifs-game-othello" title="Othello" type="bt" /> 
-</category>
-<category name="PROTO and EXTERNPROTO">
-<file name="bifs-externproto-forestgump-lib" type="bt" generate-html="false"/> 
-<file name="bifs-externproto-forestgump" type="bt" /> 
-<file name="bifs-externproto-mfurl-lib" type="bt" generate-html="false"/> 
-<file name="bifs-externproto-mfurl" type="bt" /> 
-<file name="bifs-externproto-nood-lib" type="bt" generate-html="false"/> 
-<file name="bifs-externproto-nood" type="bt" /> 
-<file name="bifs-externproto-simple-lib" type="bt" generate-html="false"/> 
-<file name="bifs-externproto-simple" type="bt" /> 
-<file name="bifs-proto-conditional" type="bt" /> 
-<file name="bifs-proto-delete-def" type="bt" /> 
-<file name="bifs-proto-delete-index" type="bt" /> 
-<file name="bifs-proto-forestgump" type="bt" /> 
-<file name="bifs-proto-mfurl" type="bt" /> 
-<file name="bifs-proto-multiple" type="bt" /> 
-<file name="bifs-proto-nested" type="bt" /> 
-<file name="bifs-proto-route" type="bt" /> 
-<file name="bifs-proto-sftime-protocode" type="bt" /> 
-<file name="bifs-proto-sftime-protointerface" type="bt" /> 
-<file name="bifs-proto-simple" type="bt" /> 
-<file name="bifs-proto-use" type="bt" /> 
-</category>
-<category name="3D Shapes">
-<file name="bifs-3D-shapes-box" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-box-transparent" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-cone" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-cylinder" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-elevationgrid" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-extrusion" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-indexedfaceset" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-indexedlineset" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-nonlineardeformer" type="bt" use3d="true" /> 
-<file name="bifs-3D-shapes-pointset" type="bt" use3d="true" /> 
-</category>
-<category name="3D Background &amp; Viewpoints">
-<file name="bifs-3D-background-images" type="bt" use3d="true" /> 
-<file name="bifs-3D-background" type="bt" use3d="true" /> 
-<file name="bifs-3D-viewpoint-anim" type="bt" use3d="true" /> 
-<file name="bifs-3D-viewpoint-bind-jump" type="bt" use3d="true" /> 
-<file name="bifs-3D-viewpoint-bind" type="bt" use3d="true" /> 
-<file name="bifs-3D-viewpoint-ortho-bind" type="bt" use3d="true" /> 
-</category>
-<category name="3D Texturing">
-<file name="bifs-3D-texturing-box" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-box-transparent" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-box-video" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-cone" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-cone-transparent" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-cylinder" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-cylinder-transparent" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-transform-box" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-transform-matrix-box" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-compositetexture3D-box" type="bt" use3d="true" /> 
-<file name="bifs-3D-texturing-compositetexture3D-bitmap" type="bt" use3d="true" /> 
-</category>
-<category name="3D Lighting">
-<file name="bifs-3D-lighting-fog" type="bt" use3d="true" /> 
-<file name="bifs-3D-lighting-directionalLight" type="bt" use3d="true" /> 
-<file name="bifs-3D-lighting-pointlight" type="bt" use3d="true" /> 
-<file name="bifs-3D-lighting-spotlight" type="bt" use3d="true" /> 
-</category>
-<category name="3D Interactivity and Sensors">
-<file name="bifs-3D-interactivity-cylindersensor" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-planesensor" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-proximitysensor" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-spheresensor" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-visibilitysensor" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-collision-proxy" type="bt" use3d="true" /> 
-<file name="bifs-3D-interactivity-collision" type="bt" use3d="true" /> 
-</category>
-<category name="3D Positioning &amp; Layout">
-<file name="bifs-3D-positioning-transform" type="bt" /> 
-<file name="bifs-3D-positioning-layer3D-views" type="bt" use3d="true" /> 
-<file name="bifs-3D-positioning-layer3D" type="bt" use3d="true" /> 
-<file name="bifs-3D-positioning-lod" type="bt" use3d="true" /> 
-<file name="bifs-3D-positioning-billboard-viewer-alignment" type="bt" use3d="true" /> 
-<file name="bifs-3D-positioning-billboard" type="bt" use3d="true" /> 
-<file name="bifs-3D-positioning-gravity" type="bt" use3d="true" /> 
-</category>
-<category name="Miscellaneous tests">
-<file name="bifs-misc-cyclic-graph" type="bt" /> 
-<file name="bifs-misc-non-linear-parsing-conditional" type="bt" /> 
-<file name="bifs-misc-non-linear-parsing-use" type="bt" /> 
-<file name="bifs-misc-srt-import-3gpp" type="bt" /> 
-<file name="bifs-misc-srt-import-3gpp-control" type="bt" /> 
-<file name="bifs-misc-srt-import-3gpp-control-share-ocr" type="bt" /> 
-<file name="bifs-misc-srt-import" type="bt" /> 
-<file name="bifs-misc-UTF16-input" type="bt" /> 
-<file name="bifs-misc-hc-proto-pathextrusion" type="bt" use3d="true"/> 
-<file name="bifs-misc-hc-proto-planarextrusion" type="bt" use3d="true"/> 
-<file name="bifs-misc-hc-proto-planeclipper" type="bt" use3d="true"/> 
-</category>
-<category name="OD Commands">
-<file name="bifs-od-remove-esd" type="bt" /> 
-<file name="bifs-od-remove-od" type="bt" /> 
-<file name="bifs-od-update-od" type="bt" /> 
-</category>
-</format>
-
-<format name="X3D">
-<category name="2D tools">
-<file name="x3d-2D-Arc2d" type="x3dv" use3d="true" /> 
-<file name="x3d-2D-ArcClose2d" type="x3dv" use3d="true" /> 
-<file name="x3d-2D-Polyline2d" type="x3dv" use3d="true" /> 
-<file name="x3d-2D-Polypoint2d" type="x3dv" use3d="true" /> 
-<file name="x3d-2D-TriangleSet2d" type="x3dv" use3d="true" /> 
-<file name="x3d-2D-Disk2d" type="x3dv" use3d="true" /> 
-</category>
-<category name="3D tools">
-<file name="x3d-3D-IndexedTriangleFanSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-IndexedTriangleSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-IndexedTriangleStripSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-LineSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-TriangleFanSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-TriangleSet" type="x3dv" use3d="true" /> 
-<file name="x3d-3D-TriangleStripSet" type="x3dv" use3d="true" /> 
-</category>
-<category name="Miscellaneous primitives">
-<file name="x3d-misc-HatchStyle" type="x3dv" use3d="true" /> 
-<file name="x3d-misc-ColorRGBA" type="x3dv" use3d="true" /> 
-<file name="x3d-misc-KeySensor" type="x3dv" use3d="true" /> 
-<file name="x3d-misc-StringSensor" type="x3dv" use3d="true" /> 
-</category>
-</format>
-</testsuitelist>

gpac-0.8.0.tar.gz/tests/media/laser Deleted

gpac-0.8.0.tar.gz/tests/media/laser/enst_2laser3.xml Deleted

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession     xmlns:ev="http://www.w3.org/2001/xml-events"
-xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="620" height="120" viewBox="-1 -1 62 12">
-<path d="M 19 9 L -1 -1 -1 11 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 -0.5 -1 10.5 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 0 -1 10 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 0.5 -1 9.5 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 1 -1 9 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 1.5 -1 8.5 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 2 -1 8 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 2.5 -1 7.5 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 3 -1 7 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L -1 3.5 -1 6.5 19 9" fill="#0000FF" fill-opacity="0.03"/>
-<path d="M 19 9 L 12 -1 28 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 12.5 -1 27.5 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 13 -1 27 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 13.5 -1 26.5 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 14 -1 26 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 14.5 -1 25.5 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 15 -1 25 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 15.5 -1 24.5 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 16 -1 24 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 16.5 -1 23.5 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 17 -1 23 -1 19 9" fill="#00FF00" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 -1 62 11 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 -0.5 62 10.5 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 0 62 10 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 0.5 62 9.5 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 1 62 9 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 1.5 62 8.5 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 2 62 8 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 2.5 62 7.5 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 3 62 7 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<path d="M 19 9 L 62 3.5 62 6.5 19 9" fill="#FF0000" fill-opacity="0.03"/>
-<circle fill="#0000FF" cx="19" cy="9" r="2"/>
-<circle fill="#00FF00" cx="19" cy="9" r="1.5"/>
-<circle fill="#FF0000" cx="19" cy="9" r="1"/>
-<g stroke="#555555" stroke-width="2" stroke-opacity="0.1">
-        <path id="p1" d="M 0 -1 Q 0 10 10 10 10 1 19 1 28 1 28 10 L 37.5 10 Q 40 10 40 7.5 40 5 37.5 5 L 32.5 5 Q 30 5 30 2.5 30 0 32.5 0 L 57.5 0 Q 60 0 60 2.5 60 5 57.5 5 L 53 5 Q 53 10 58 10 L 61 10" fill="none"/>    
-        <path id="p2" d="M 50 10 L 47 10 Q 44 10 44 7 44 4 46.5 4 49 4 49 7" fill="none"/>
-    </g>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.9" stroke-opacity="0.2"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.9" stroke-opacity="0.2"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.8" stroke-opacity="0.3"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.8" stroke-opacity="0.3"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.7" stroke-opacity="0.4"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.7" stroke-opacity="0.4"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.6" stroke-opacity="0.5"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.6" stroke-opacity="0.5"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.5" stroke-opacity="0.6"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.5" stroke-opacity="0.6"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.4" stroke-opacity="0.7"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.4" stroke-opacity="0.7"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.3" stroke-opacity="0.8"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.3" stroke-opacity="0.8"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.2" stroke-opacity="0.9"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.2" stroke-opacity="0.9"/>
-<use xlink:href="#p1" stroke="#555555" stroke-width="1.1"/>
-<use xlink:href="#p2" stroke="#555555" stroke-width="1.1"/>
-<use xlink:href="#p1" stroke="#666666" stroke-width="1"/>
-<use xlink:href="#p2" stroke="#666666" stroke-width="1"/>
-<use xlink:href="#p1" stroke="#777777" stroke-width="0.9"/>
-<use xlink:href="#p2" stroke="#777777" stroke-width="0.9"/>
-<use xlink:href="#p1" stroke="#888888" stroke-width="0.8"/>
-<use xlink:href="#p2" stroke="#888888" stroke-width="0.8"/>
-<use xlink:href="#p1" stroke="#999999" stroke-width="0.7"/>
-<use xlink:href="#p2" stroke="#999999" stroke-width="0.7"/>
-<use xlink:href="#p1" stroke="#AAAAAA" stroke-width="0.6"/>
-<use xlink:href="#p2" stroke="#AAAAAA" stroke-width="0.6"/>
-<use xlink:href="#p1" stroke="#BBBBBB" stroke-width="0.5"/>
-<use xlink:href="#p2" stroke="#BBBBBB" stroke-width="0.5"/>
-<use xlink:href="#p1" stroke="#CCCCCC" stroke-width="0.4"/>
-<use xlink:href="#p2" stroke="#CCCCCC" stroke-width="0.4"/>
-<use xlink:href="#p1" stroke="#DDDDDD" stroke-width="0.3"/>
-<use xlink:href="#p2" stroke="#DDDDDD" stroke-width="0.3"/>
-<use xlink:href="#p1" stroke="#EEEEEE" stroke-width="0.2"/>
-<use xlink:href="#p2" stroke="#EEEEEE" stroke-width="0.2"/>
-<use xlink:href="#p1" stroke="#FFFFFF" stroke-width="0.1"/>
-<use xlink:href="#p2" stroke="#FFFFFF" stroke-width="0.1"/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_3laser.xml Deleted

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="600" height="300" viewBox="0 0 600 300">
-<defs>
-        <radialGradient id="grad" gradientUnits="userSpaceOnUse" cx="300" cy="300" r="300">
-            <stop offset="0" stop-color="#FF0000"/>
-            <stop offset="0.02" stop-color="#FF0000"/>
-            <stop offset="0.05" stop-color="#FF4444"/>
-            <stop offset="1" stop-color="#FFBBBB"/>
-        </radialGradient>
-        <radialGradient id="green" gradientUnits="userSpaceOnUse" cx="170" cy="380" r="100">
-            <stop offset="0" stop-color="#0000FF" stop-opacity="1"/>
-            <stop offset="0.08" stop-color="#0000FF" stop-opacity="1"/>
-            <stop offset="0.13" stop-color="#0000FF" stop-opacity="0.6"/>
-            <stop offset="1" stop-color="#0000FF" stop-opacity="0"/>
-        </radialGradient>
-        <radialGradient id="blue" gradientUnits="userSpaceOnUse" cx="460" cy="200" r="80">
-            <stop offset="0" stop-color="#00FF00" stop-opacity="1"/>
-            <stop offset="0.08" stop-color="#00FF00" stop-opacity="1"/>
-            <stop offset="0.13" stop-color="#00FF00" stop-opacity="0.6"/>
-            <stop offset="1" stop-color="#00FF00" stop-opacity="0"/>
-        </radialGradient>
-    </defs>
-<g transform="matrix(1.0,0.0,0.0,0.5,0.0,0.0)">
-        <circle cx="300" cy="300" r="300" fill="url(#grad)"/>
-        <circle cx="300" cy="300" r="300" fill="url(#green)"/>
-        <circle cx="300" cy="300" r="300" fill="url(#blue)"/>
-    </g>
-<g fill="none" stroke="black" stroke-width="50" stroke-opacity="0.05">
-    <g id="p" stroke-linecap="round" stroke-linejoin="round">
-    <path d="M 91 55 q -81 45 -81 95 0 50 81 95 20 -200 70 -215 70 -20 100 260 130 10 130 -80 0 -50 -80 -90 -80 -40 -50 -85 30 -35 120 -20 t 150 50 50 70 q -10 30 -80 30 0 90 65 40"/>
-    <path d="M 490 70 q -60 -30 -80 10 -20 65 60 60 -60 20 -60 65 0 85 95 40"/>
-    </g>
-    </g>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="45" stroke-opacity="0.1"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="40" stroke-opacity="0.15"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="35" stroke-opacity="0.2"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="30" stroke-opacity="0.25"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="25" stroke-opacity="0.3"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="20" stroke-opacity="0.4"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="15" stroke-opacity="0.55"/>
-<use xlink:href="#p" fill="none" stroke="black" stroke-width="10" stroke-opacity="0.7"/>
-<use xlink:href="#p" fill="none" stroke="white" stroke-width="1" stroke-opacity="1"/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_afrique.xml Deleted

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8" resolution="-2"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="221" height="242" viewBox="0 0 5957 6524">
-<g fill="white" stroke="#131516" stroke-width="30" stroke-linejoin="round" transform="matrix(1.0,0.0,0.0,1.0,2945.0,0.0)">
-		<rect id="reg00" x="-2945" y="0" width="5957" height="6524" fill="#EEEEEE"/>
-		<path id="reg14" d="M 1183 749 l 0 -2 -2 -2 0 -2 -2 0 -2 -2 -4 0 -2 2 -2 0 0 2 -2 2 0 73 33 86 2 2 0 2 2 2 6 0 3 -2 2 0 2 -2 0 -6 -34 -86 0 2 0 -69 z M 631 1564 l 742 -4 23 -31 19 0 6 -42 33 -6 15 -23 -2 -34 25 -27 -67 -73 -62 -120 -30 -50 0 -40 -16 -6 -7 -29 -43 -67 -11 -27 -33 -27 -21 -61 67 84 23 14 18 54 23 17 19 -10 0 -25 17 -19 0 -44 19 -75 -78 -116 -16 -11 -38 2 -21 19 -39 -25 -27 10 -25 -29 -25 0 -25 15 -88 0 -73 37 -14 21 -27 -14 -13 -15 -23 0 -31 -10 -25 -19 -60 -11 -42 7 -67 -7 -25 42 0 17 19 23 -23 25 0 18 27 44 2 648 z"/>
-		<path id="reg25" d="M -246 1506 l 156 -59 630 355 2 -40 89 0 -2 -846 -27 -44 0 -18 23 -25 -19 -23 0 -17 25 -42 -29 -23 -48 9 -48 -27 -27 12 -21 -8 9 -44 -19 -14 -81 -9 -27 19 -44 4 -19 13 -10 18 -23 0 -31 32 2 56 31 23 0 29 -25 27 -25 13 -44 -9 -121 -79 -39 4 -42 -8 -50 -40 -2 -52 -36 -19 -18 5 -40 -23 -58 -17 -92 0 -27 -27 -21 0 -4 40 -17 22 -43 13 -27 19 -27 8 -19 19 21 21 4 27 -21 35 -50 29 8 27 -12 92 25 40 6 23 -12 22 -9 57 -23 18 0 32 -43 31 0 17 37 14 13 31 16 75 21 9 19 -13 56 4 21 25 8 55 111 23 39 29 50 50 z"/>
-		<path id="reg50" d="M -394 612 l -4 40 -17 22 -43 13 -27 19 -27 8 -19 19 21 21 4 27 -21 35 -50 29 -4 -39 -52 -125 -52 -44 -9 -63 -10 -22 4 -23 23 -13 6 -14 36 -9 0 -27 16 -27 17 -158 42 -19 60 -4 29 14 17 21 37 0 11 19 -11 21 -16 4 -9 31 25 23 21 36 -10 18 -21 9 2 20 -6 15 -59 17 -6 35 52 19 -4 33 38 -8 16 27 z"/>
-		<path id="reg02" d="M -602 281 l -98 -19 -60 31 -80 -8 -27 -15 -83 2 -60 36 -23 0 -36 -19 -37 0 -21 13 -38 0 -27 27 -50 4 -52 19 -58 52 8 41 -29 21 0 83 29 40 -31 48 -37 -13 -80 25 -31 5 4 50 38 16 4 11 -8 12 -171 75 -96 31 -240 111 713 648 2 31 17 17 20 4 19 31 19 -4 25 23 2 27 -27 29 4 11 246 -11 146 -142 360 -220 -8 -55 -21 -25 -56 -4 -19 13 -21 -9 -29 -106 -37 -14 0 -17 43 -31 0 -32 23 -18 9 -57 12 -22 -31 -63 12 -92 -12 -66 -52 -125 -52 -44 -9 -63 -10 -22 4 -23 23 -13 6 -14 36 -9 0 -27 16 -27 17 -158 z"/>
-		<path id="reg30" d="M -2346 933 l 354 27 -10 148 -275 -17 -58 211 -59 -3 -16 7 -17 16 -13 25 0 130 -322 -11 2 -39 2 -17 18 -36 9 -14 46 -27 23 -36 50 -27 47 -89 28 -15 25 -56 27 -36 4 -35 19 -6 39 -6 36 -23 35 -55 6 -16 z M -1352 404 l -29 -21 -44 -6 -10 -21 -42 0 -13 -15 -37 -12 -33 14 -42 -62 -33 0 -59 123 -23 18 -31 13 -119 42 -58 41 -67 67 -27 50 -2 56 19 19 -6 25 -34 25 -45 0 -78 85 -83 36 -64 12 -34 40 354 27 240 -111 96 -31 171 -75 8 -12 -4 -11 -38 -16 -6 -36 2 -14 31 -5 27 -4 28 -16 25 -5 37 13 31 -48 -29 -40 -2 -60 2 -23 21 -12 8 -9 -8 -41 z"/>
-		<path id="reg41" d="M 2775 3859 l -34 28 7 23 18 19 9 -21 -11 -14 21 -7 -10 -28 z"/>
-		<path id="reg32" d="M -2762 1466 l 322 11 0 -130 30 -41 16 -7 59 3 58 -211 275 17 10 -148 275 250 -193 0 0 685 35 48 -31 92 -315 0 -31 -17 -21 17 -35 6 -54 -14 -15 -19 -19 -9 -21 9 -10 25 0 52 -13 6 -31 -2 -35 -33 -23 -59 -25 -16 -6 -57 -46 -2 -11 -31 -10 -6 -17 17 -10 -28 -27 -8 -23 4 -21 27 -52 11 -23 23 -21 2 13 -40 58 -81 -6 -29 21 -42 -2 -98 -17 -31 19 -48 -27 -98 z"/>
-		<path id="reg29" d="M -1910 1210 l 193 0 438 398 2 31 17 17 20 4 19 31 19 -4 25 23 2 27 -27 29 4 11 125 -5 -31 207 -56 79 -52 29 -94 0 -59 -4 -56 23 -16 -9 -32 0 -37 -14 -29 0 -27 21 -57 2 -39 18 -11 40 -48 19 -31 0 -14 8 -13 33 -54 30 -17 23 -21 2 -16 16 0 32 -44 31 -2 44 -21 4 -10 16 -5 61 -20 -2 -40 21 -8 -9 0 -21 -17 -27 -17 7 -12 39 -50 8 -11 -10 -39 10 -13 -35 -31 -19 -6 -18 29 -21 4 -23 -8 -19 -33 -29 -13 -56 -17 -7 -45 36 -34 8 -23 -4 -12 17 -15 0 -10 -21 -11 0 -16 14 -19 -4 -6 -16 6 -28 8 -4 2 -68 -25 -17 0 -50 -16 -42 43 -2 13 -6 0 -52 10 -25 21 -9 19 9 15 19 54 14 35 -6 21 -17 31 17 315 0 31 -92 -35 -48 0 -685 z"/>
-		<path id="reg36" d="M -1469 2097 l 65 7 12 -17 27 -4 59 4 94 0 52 -29 56 -79 31 -207 121 -6 146 -142 360 -220 111 23 39 29 50 50 79 -32 7 105 54 98 0 10 -34 29 -10 42 -8 256 -152 146 -9 46 15 46 -52 2 -17 14 -31 4 -13 17 -37 8 -31 -6 -11 -21 -83 -8 -19 27 -37 4 -23 34 -25 4 -88 -21 -10 -27 -19 -15 -15 0 -41 29 -11 -8 -18 4 -59 -58 -29 -11 -56 0 -27 -8 -11 23 -29 -6 -31 23 -10 41 -46 21 -7 15 0 54 -10 15 -21 -11 -33 -52 -15 -2 -18 27 -34 -73 -37 6 -23 -6 -17 -77 -10 0 -19 -10 -6 -19 -23 -8 -17 -21 4 -59 z"/>
-		<path id="reg42" d="M -2821 1933 l 21 -2 23 -23 21 -6 31 -5 21 -27 23 -4 27 8 2 19 8 9 17 -17 10 6 11 31 21 2 25 0 0 30 6 27 0 4 25 12 14 32 9 27 19 18 16 15 -12 4 6 25 10 17 2 14 -2 36 25 17 -2 68 -8 4 -35 -12 -28 6 -16 -6 -31 -8 -15 -21 -63 8 -58 -2 -48 -4 -12 17 -23 8 -31 2 -19 -13 -29 17 -9 -31 7 -31 83 -7 17 -6 39 -6 27 6 31 -14 -4 -11 -39 2 -15 -6 -44 4 -16 -6 -46 0 -31 -2 -2 -36 -28 -23 -31 -12 -23 -25 36 -31 43 -46 44 -52 z"/>
-		<path id="reg06" d="M -1746 2599 l -50 -37 -35 -2 -54 21 -21 -4 -36 -84 -23 -10 5 -61 10 -16 21 -4 2 -44 44 -31 0 -32 16 -16 21 -2 29 -36 25 -4 17 -13 13 -33 14 -8 31 0 48 -19 11 -40 39 -18 57 -2 27 -21 29 0 37 14 -4 59 17 21 23 8 6 19 29 10 17 77 23 6 37 -6 25 67 0 48 -12 10 -75 -6 -4 27 -13 12 -27 0 -15 25 -18 -14 -50 -6 -30 -17 -10 2 -15 19 -191 -11 -6 23 18 54 -6 17 4 58 z"/>
-		<path id="reg43" d="M -2627 2556 l 21 0 16 -4 9 -15 14 -33 44 -30 77 5 9 10 0 25 12 4 13 9 2 16 -2 21 18 10 7 15 -11 23 -21 15 2 10 23 -15 17 7 6 16 -10 25 -23 13 -17 14 -4 15 -2 21 -15 8 -16 0 -15 4 -14 27 -32 -2 -35 -25 -8 -31 -23 -12 -11 -28 9 -29 -5 -16 -23 -17 -4 -29 -8 -27 z"/>
-		<path id="reg24" d="M -2487 2772 l 14 -27 15 -4 16 0 15 -8 2 -21 4 -15 17 -14 23 -13 10 -25 15 -12 23 0 21 8 4 13 -7 31 5 39 14 3 29 -11 23 6 11 27 4 28 -6 10 -13 17 -4 16 10 7 25 -5 11 9 0 21 8 8 27 12 9 17 4 21 -7 17 -6 22 4 25 0 21 2 11 -39 -4 -52 -23 -88 -61 -39 -48 -29 -35 -61 -38 -14 -25 z"/>
-		<path id="reg19" d="M -2733 2399 l 14 -37 38 -17 33 0 21 -16 0 -17 -8 -17 31 -23 -8 -35 35 -4 15 21 47 14 28 -6 35 12 -6 28 6 16 19 4 16 -14 11 0 10 21 15 0 12 -17 23 4 34 -8 45 -36 17 7 13 56 33 29 8 19 -4 23 -29 21 6 18 31 19 13 35 -17 40 2 21 32 29 -9 31 -35 17 -4 29 8 19 0 23 -31 41 -11 -27 -23 -6 -43 8 -5 -39 7 -31 -4 -13 -44 -8 -15 12 -6 -16 -17 -7 -23 15 -2 -10 21 -15 11 -23 -7 -15 -18 -10 0 -37 -25 -13 0 -25 -9 -10 -77 -5 -44 30 -23 48 -37 4 -10 -40 -67 -44 0 -33 -29 -40 z"/>
-		<path id="reg17" d="M -2860 2158 l 31 2 46 0 16 6 44 -4 15 6 39 -2 4 11 -31 14 -27 -6 -39 6 -17 6 -83 7 10 -13 12 -2 17 -2 25 0 -2 -6 -17 -2 -23 0 -20 -7 0 -14 z"/>
-		<path id="reg20" d="M -2860 2266 l 29 -17 19 13 31 -2 23 -8 12 -17 48 4 58 2 28 -4 8 35 -25 13 -6 10 8 17 0 17 -8 2 -13 14 -33 0 -17 4 -21 13 -4 21 -10 16 -2 19 -13 4 -17 -16 -14 -19 0 -21 -17 -14 -12 -13 6 -25 -6 -4 -19 2 -15 -4 -12 -19 -6 -23 z"/>
-		<path id="reg12" d="M -1965 2483 l 23 10 15 23 21 61 21 4 54 -21 35 2 50 37 0 13 -19 15 17 18 6 27 -8 30 -15 14 -8 52 -31 25 4 40 -10 19 50 47 4 61 -140 -13 -85 2 -50 11 -71 35 -63 11 -6 -57 13 -39 -13 -38 -35 -20 0 -21 -11 -9 -25 5 -10 -7 23 -43 -4 -28 31 -41 -8 -61 20 -16 19 -11 9 -31 -32 -29 0 -36 15 -25 39 -10 11 10 50 -8 12 -39 17 -7 17 27 0 21 8 9 40 -21 20 2 z"/>
-		<path id="reg18" d="M -1756 2960 l -4 -61 -50 -47 12 -32 -6 -27 31 -25 8 -52 15 -14 8 -30 -6 -27 -17 -18 19 -15 -4 -71 6 -17 -18 -54 6 -23 191 11 15 -19 10 -2 30 17 2 27 33 23 2 37 -14 31 12 32 -8 112 -13 21 6 17 17 10 4 23 -8 33 42 67 -42 33 -46 -2 -23 -50 29 -48 -2 -79 9 -6 -9 -17 9 -21 -5 -8 -14 29 4 17 -8 33 -13 -19 11 -20 -5 -2 -10 8 -37 -69 -15 -4 -8 -17 -19 4 33 69 -12 9 4 8 17 -4 14 29 19 14 -2 9 -31 -4 -25 6 2 8 45 2 19 34 -23 -7 19 11 -17 35 -50 -10 -16 4 98 40 6 18 -17 15 -50 8 -96 48 -64 -31 z"/>
-		<path id="reg37" d="M -1290 2860 l 17 -61 -8 -58 10 -23 -8 -33 4 -61 25 -6 6 -27 19 -29 25 -13 19 -64 -31 -56 22 -42 0 -54 7 -15 46 -21 10 -41 31 -23 29 6 17 -25 21 10 56 0 29 11 59 58 18 -4 11 8 41 -29 15 0 19 15 10 27 88 21 25 -4 23 -34 37 -4 19 -27 83 8 11 21 31 6 37 -8 13 -17 31 -4 17 -14 52 -2 10 52 15 27 33 16 38 46 -44 17 4 33 -31 23 -23 2 -46 65 -10 48 -34 25 9 6 -2 12 -69 55 -13 77 -8 12 -15 2 -12 61 -21 12 -10 31 -17 5 -25 -5 -21 -29 -54 -27 -8 19 -34 -2 -10 48 -65 31 -14 19 -11 85 -14 11 -27 -7 -11 27 -14 9 -34 -2 -33 -17 -23 -25 -31 4 -15 29 -16 2 -52 -20 -30 -71 -4 -25 -14 0 -25 -50 -27 -11 -17 11 -69 -21 -42 -2 z"/>
-		<path id="reg48" d="M -167 1474 l 77 -27 634 357 2 241 -23 7 -52 -7 -25 38 21 33 -21 31 0 32 -33 6 -13 19 6 18 -39 32 0 18 21 13 -36 56 4 21 50 -6 -16 23 0 25 41 14 -6 38 21 25 -36 21 -39 -3 -33 25 -5 32 -14 12 -31 9 -36 58 -23 23 -89 33 -27 38 -32 14 -87 11 -48 33 -21 0 -8 -17 -71 17 -29 -4 -9 -19 0 -31 -12 -21 -25 -13 -61 -62 -18 -38 18 -25 27 -2 61 17 23 -10 4 -25 -44 -82 0 -18 11 -23 0 -38 -38 -46 -33 -16 -15 -27 -25 -119 9 -25 152 -146 10 -279 8 -19 34 -29 0 -10 -54 -98 -7 -105 z"/>
-		<path id="reg45" d="M 1363 3122 l 12 -2 40 -50 70 -12 44 -19 13 -40 -46 7 -11 -25 -20 -21 20 -54 -45 -15 -21 -27 -23 -12 -56 -44 -40 -15 -15 -16 19 -21 61 0 35 -32 4 -125 0 -45 21 -13 25 13 21 -32 -11 -81 40 -19 15 -37 29 -25 39 -15 7 -93 -11 -19 31 -113 0 -58 15 -31 35 -7 21 -39 36 0 8 -31 33 6 -10 -25 -25 -17 -8 -37 -48 -15 -17 -19 0 -139 -8 -52 -32 -23 -6 -56 -44 -65 -29 -4 -62 -50 -15 23 -33 6 -6 42 -19 0 -23 31 -742 4 0 198 -89 0 4 283 -23 7 -52 -7 -25 38 21 33 -21 31 0 32 -33 6 -13 19 6 18 -39 32 0 18 21 13 -36 56 4 21 50 -6 -16 23 0 25 41 14 -6 38 21 25 -11 31 0 31 17 34 0 25 8 10 21 83 29 25 25 0 17 38 36 21 33 -21 14 6 0 31 21 0 11 25 0 27 50 38 10 39 40 15 14 31 36 19 10 40 29 16 21 32 71 -11 8 17 29 0 17 -13 23 7 46 52 17 37 25 19 35 -31 29 -7 29 23 36 0 14 -23 32 7 29 -25 46 -7 z"/>
-		<path id="reg15" d="M 2107 2436 l -26 -41 -52 -27 -63 -65 -61 -35 -56 -16 -16 -47 -42 4 -54 -15 -47 31 -22 -13 -29 24 -27 -12 -33 9 11 19 -7 93 -39 15 -29 25 -15 37 -40 19 11 81 -21 32 -25 -13 -21 13 0 45 -4 125 -35 32 -61 0 -19 21 15 16 40 15 56 44 23 12 21 27 45 15 -20 54 20 21 11 25 46 -7 -13 40 15 31 85 44 61 40 50 54 106 14 23 -6 0 -31 12 -8 40 -7 25 -25 14 0 55 25 25 -4 39 -21 46 -10 29 -36 56 -10 50 -21 59 9 87 -103 23 -31 71 -44 46 -77 0 -10 -100 -15 -65 -25 -62 -23 -113 -27 -27 -25 -58 -100 0 -45 -21 -19 -25 31 -25 0 -25 -44 15 -31 67 -53 z"/>
-		<path id="reg09" d="M -140 3202 l -20 -11 -15 -27 -27 -29 -6 -17 0 -16 -61 -59 -6 -16 0 -57 -4 -18 -23 -21 4 -13 33 -21 21 -33 9 -25 27 -17 18 -14 7 -25 29 4 29 -4 27 -13 15 0 8 17 21 0 23 -15 25 -18 87 -11 32 -14 27 -38 14 -6 75 -27 23 -23 36 -58 31 -9 14 -12 5 -32 33 -25 39 3 36 -21 -11 31 0 31 17 34 0 25 8 10 21 83 29 25 25 0 17 38 36 21 33 -21 14 6 0 31 21 0 11 25 0 27 50 38 10 39 40 15 14 31 36 19 10 40 -87 12 -27 -8 -15 -19 -56 -10 -11 31 -16 8 -67 -12 -17 18 -66 19 -11 -12 -33 -7 -21 5 -15 27 3 27 -11 19 -29 2 -50 -30 -29 -8 -59 -60 -79 -21 -31 6 -4 38 -21 18 -2 21 12 42 -6 25 -114 -13 -36 2 -39 38 -13 44 -12 -7 -3 -22 -2 0 z"/>
-		<path id="reg08" d="M -806 3029 l 14 -11 0 -35 11 -50 14 -19 32 -21 20 -2 13 -8 2 -36 8 -12 5 0 18 4 11 -2 8 -19 8 0 25 17 21 10 21 29 25 5 17 -5 10 -31 21 -12 12 -61 15 -2 8 -12 13 -77 10 -17 34 -17 25 -21 2 -12 -9 -6 2 -9 21 -8 11 -8 10 -48 0 -13 46 -52 23 -2 23 -10 8 -13 -4 -33 44 -17 0 38 -11 23 0 18 44 82 -4 25 -23 10 -61 -17 -27 2 -18 25 18 38 36 29 25 33 25 13 12 21 0 31 9 19 -7 25 -18 14 -27 17 -9 25 -21 33 -33 21 -4 13 23 21 4 18 0 57 6 16 61 59 0 16 6 17 27 29 15 27 20 11 2 22 13 7 31 6 27 12 32 25 8 23 -2 44 8 23 13 29 -2 17 -13 14 -23 -16 -27 -21 -21 6 -16 -2 -42 -25 -29 -12 -32 2 -50 14 -41 -4 -67 -10 -148 -2 -27 -30 -4 -56 -42 -29 -10 -31 -19 -6 -48 -7 -31 -18 -15 -36 5 -42 -9 -12 -27 -6 -29 -2 -15 -25 -14 -23 -2 -2 z"/>
-		<path id="reg49" d="M -1435 2887 l -17 -33 -19 -15 -6 -19 8 -33 -4 -23 -17 -10 -6 -17 13 -21 8 -112 -4 -17 -8 -15 14 -31 -2 -37 -33 -23 -2 -27 27 6 23 0 18 14 7 -14 8 -11 17 23 -5 27 23 42 11 19 -2 58 12 13 2 27 -16 139 -9 23 -2 13 9 29 -28 12 -20 13 z"/>
-		<path id="reg04" d="M -1387 2862 l -9 -29 2 -13 9 -23 16 -139 -2 -27 -12 -13 2 -58 -11 -19 -23 -42 5 -27 -17 -23 27 0 13 -12 4 -27 18 -2 28 8 29 0 12 -10 -2 -23 2 -25 9 6 18 -27 15 2 33 52 21 11 -12 27 16 16 4 13 2 16 9 11 -2 21 -13 21 -4 22 -10 9 -15 4 -4 17 -15 12 -6 27 -25 6 -4 61 4 14 4 19 -10 23 8 58 -17 61 -56 10 -41 -8 z"/>
-		<path id="reg27" d="M -840 3131 l -8 4 -4 12 0 13 -6 10 -11 7 0 12 9 8 25 9 10 -7 6 -12 -2 -17 9 -31 -7 -17 -14 -2 -7 11 z"/>
-		<path id="reg22" d="M 1833 3933 l 32 -42 27 -19 33 -75 44 -33 6 -42 46 -31 -42 -71 -4 -304 65 -56 27 -40 29 -16 29 -69 -110 35 -69 -25 -25 25 -52 15 0 31 -23 6 -106 -14 -50 -54 -146 -84 -15 -31 -44 19 -70 12 -40 50 44 15 48 96 18 8 7 13 -13 45 27 46 0 29 9 27 -21 59 -23 8 -21 29 4 17 -21 37 13 3 14 31 -10 10 -4 27 -8 4 233 142 46 42 -2 35 118 90 z"/>
-		<path id="reg38" d="M 1490 3462 l 20 -31 5 -32 -9 -27 0 -29 -27 -46 6 -31 9 -19 -4 -8 -23 -6 -27 -63 -21 -35 -44 -15 -12 2 -46 7 -17 18 -12 7 -32 -7 -14 23 -36 0 -29 -23 -29 7 -13 16 -22 15 -3 52 13 15 -4 35 41 40 -6 25 21 12 29 2 4 13 15 -34 17 -8 -17 35 4 30 -6 20 -40 59 -43 4 -7 -11 -21 0 -25 92 38 38 0 14 -23 19 -15 0 -10 46 -17 19 42 -9 21 -25 31 2 17 -25 27 -4 19 15 25 0 12 -32 -29 -10 17 -12 12 0 2 -36 31 -14 15 -21 10 23 19 -27 11 0 23 -11 10 8 23 0 12 23 25 -2 21 -31 -4 -17 21 -31 23 -10 -4 6 z"/>
-		<path id="reg51" d="M -323 4033 l -8 -15 21 -16 18 -59 23 -16 27 4 38 -4 12 -19 17 -2 31 29 -35 23 -29 14 -17 13 -25 19 -29 10 -31 8 -13 11 z M 79 3160 l 6 -25 -4 -21 -8 -21 2 -21 21 -18 4 -38 31 -6 38 6 19 6 22 9 32 37 27 23 29 8 50 30 29 -2 11 -19 -3 -27 15 -27 21 -5 33 7 11 12 66 -19 17 -18 15 0 16 10 36 2 16 -8 2 -21 9 -10 12 4 23 6 21 0 15 19 27 8 20 -2 15 -6 21 -2 31 -2 29 16 21 32 71 -11 8 17 29 0 17 -13 23 7 46 52 17 37 25 19 -3 52 13 15 -4 35 41 40 -6 25 21 12 29 2 4 13 -35 45 0 25 -13 36 -22 0 -7 -11 -21 0 -25 92 25 27 -12 29 -15 0 -8 61 -42 50 -8 27 -2 131 17 113 -17 33 31 50 67 75 2 27 17 21 -127 37 -25 -4 -23 27 -5 36 28 25 14 54 -17 4 -12 21 10 21 -6 46 17 50 25 14 37 0 21 13 0 91 -37 -35 -21 19 -21 -11 -29 -50 -29 -23 -30 -2 -22 -39 -23 -9 -25 27 -80 -16 -20 -17 -17 -40 -27 28 -50 -11 -15 -29 -14 -6 -29 10 -25 -6 -30 17 -18 -7 -21 7 -4 -63 -36 -37 -21 -71 0 -104 -75 -9 2 -41 -16 -30 -29 0 -9 13 -37 8 -13 56 -18 9 -3 23 -91 -4 -29 14 -9 -54 -37 -38 0 -25 -19 -12 -21 -63 -250 7 -50 -7 52 -20 29 -32 100 -33 86 -90 12 -33 2 -37 -10 -32 0 -25 8 -29 107 -106 14 -40 4 -35 11 -17 2 -25 -4 -37 6 -34 8 -20 21 -40 0 -17 0 -23 8 -22 -4 -17 -18 -21 -17 -33 -23 -19 -21 -6 -23 -23 0 2 z"/>
-		<path id="reg11" d="M -92 3162 l -18 25 -13 44 56 18 32 25 8 23 -2 44 21 52 -15 31 -50 -37 -37 4 -71 -37 -82 16 -2 38 7 33 14 13 73 -13 19 13 0 27 -25 4 -27 39 33 30 21 48 -23 64 4 71 -16 6 -17 -25 -13 -2 -50 11 -25 -38 -37 -12 -8 12 6 27 -11 13 -31 -5 -25 9 -2 21 13 20 29 15 0 33 -46 7 -31 39 43 48 25 8 19 17 36 -12 18 14 23 -16 27 4 38 -4 12 -19 17 -2 31 29 34 2 18 -19 19 -27 19 -23 27 -19 21 -22 6 -38 -13 -40 -12 -18 0 -19 6 -23 19 -19 15 -10 12 -19 13 -10 27 -13 10 -12 21 -13 17 -6 14 -40 4 -35 11 -17 2 -25 -4 -37 6 -34 8 -20 21 -40 0 -17 0 -23 8 -22 -4 -17 -18 -21 -17 -33 -23 -19 -21 -6 -23 -23 -114 -13 -36 2 -21 13 0 2 z"/>
-		<path id="reg16" d="M -433 3868 l 31 -39 46 -7 0 -33 -29 -15 -13 -20 2 -21 25 -9 31 5 11 -13 -6 -27 8 -12 15 0 10 12 12 0 13 25 12 13 50 -11 13 2 17 25 16 -6 2 -8 -4 -36 -2 -27 8 -27 15 -37 -4 -19 -17 -29 -33 -30 27 -39 25 -4 0 -27 -19 -13 -39 4 -34 9 -14 -13 -7 -33 2 -38 -41 -4 -67 -10 -41 2 -3 104 -127 4 -10 13 -8 23 -13 29 -4 23 -4 12 -9 38 -6 -5 -12 -4 -4 4 6 13 27 15 0 33 19 58 70 65 57 85 z"/>
-		<path id="reg21" d="M -546 3324 l -6 28 0 27 4 20 -10 15 0 31 16 21 127 -4 3 -104 -107 -4 -27 -30 z"/>
-		<path id="reg03" d="M -331 4018 l 21 -16 18 -59 -18 -14 -15 4 -21 8 9 23 0 10 -3 17 9 27 z M -325 4045 l 10 2 44 -23 102 7 198 -7 21 63 19 12 0 25 37 38 9 54 29 -14 46 -3 45 7 3 -23 18 -9 13 -56 37 -8 9 -13 29 0 16 30 -2 41 75 9 0 104 21 71 36 37 4 63 21 -7 18 7 30 -17 25 6 29 -10 14 6 4 19 -35 64 13 29 -9 30 9 23 -157 2 0 245 23 17 17 31 27 19 23 42 37 0 -229 41 -31 -12 -56 -4 -44 8 -48 -54 -317 0 -35 23 -11 -23 -58 -33 -33 14 -13 23 -37 -10 -15 6 -8 -71 4 -35 31 -46 0 -52 11 -31 -2 -38 58 -87 37 -38 9 -25 8 -73 -37 -89 -21 -23 -6 -27 16 -55 -2 -33 -21 -27 -2 -38 -46 -70 -2 -17 -8 -17 z"/>
-		<path id="reg35" d="M 56 5824 l 17 -18 0 -17 4 -6 19 -2 12 6 7 10 -9 11 11 16 10 13 23 6 29 0 21 13 15 0 16 -4 2 -15 11 4 14 -6 9 -11 12 -8 6 0 0 -521 86 0 0 -264 58 0 102 -17 17 6 15 19 12 0 17 -10 8 -17 23 -4 21 -9 21 -2 4 -14 -17 -34 -33 3 -36 6 -229 41 -31 -12 -35 0 -21 -4 -23 4 -21 4 -19 -17 -10 -16 -19 -21 -317 0 -6 8 -29 15 -11 -23 -20 -8 -21 -21 -17 -4 -25 6 -8 8 -13 23 -14 0 -13 -6 -10 -4 -15 6 4 27 7 56 45 65 23 50 42 44 19 62 21 58 39 32 15 43 0 53 16 22 11 40 0 44 12 46 7 41 25 32 4 52 21 37 39 56 50 27 z"/>
-		<path id="reg47" d="M 1833 3933 l -118 -90 2 -35 -46 -42 -233 -142 -13 32 -12 2 -9 23 -14 10 4 6 -13 15 17 10 21 0 -34 30 -18 -15 -32 4 5 19 -15 17 4 25 -10 -13 -11 0 11 -23 -9 -6 -12 4 -17 -19 -12 19 2 13 -15 8 -10 -6 6 -19 -8 -15 8 -16 -14 -32 6 -29 -4 -12 -25 0 -19 -15 -6 15 12 35 -6 54 -23 15 4 12 -10 15 27 10 6 13 -4 14 -46 28 -19 37 -52 46 23 60 -8 36 29 25 -10 25 6 16 33 11 36 39 12 100 29 7 36 37 43 8 13 25 21 -8 25 19 37 6 4 -21 11 -2 44 48 10 31 -8 57 6 29 12 14 92 2 48 11 40 -6 47 -38 28 -4 47 15 42 -28 36 -6 35 -31 21 -2 12 -13 -14 -18 -21 -7 -31 -43 2 -44 -17 -6 -10 -25 14 -34 -23 -25 2 -25 25 -29 0 -19 -60 -79 0 -25 27 -23 8 -62 z M 1840 4027 l 0 20 10 15 10 2 17 10 6 -2 -2 -14 0 -13 -10 -12 -11 -21 -12 2 -8 13 z M 1898 3962 l 0 15 -4 10 -6 0 -15 8 -4 -2 2 -10 0 -9 6 -8 8 -14 11 2 2 8 z"/>
-		<path id="reg52" d="M 631 4437 l 15 29 50 11 27 -28 17 40 20 17 80 16 25 -27 23 9 22 39 30 2 29 23 29 50 21 11 21 -19 37 35 0 -91 -14 -2 -7 -11 -37 0 -25 -14 -17 -50 6 -46 -10 -21 12 -21 17 -4 -14 -54 -28 -25 5 -36 33 -29 15 6 127 -37 -9 29 32 40 14 6 23 -38 29 7 36 37 43 8 30 46 0 15 35 33 -29 52 19 36 -7 29 4 29 -6 15 -48 20 -4 21 6 15 -8 31 -19 17 23 33 -210 83 6 30 -50 23 -44 22 -46 3 -12 12 0 15 -38 25 -12 33 -40 40 -10 18 -13 7 -29 -11 -56 0 -81 -8 -17 -34 -106 9 -67 -92 -23 -17 0 -245 157 -2 -9 -40 6 -21 -10 -21 27 -43 4 -40 z"/>
-		<path id="reg53" d="M 1100 4804 l 10 14 9 29 35 2 9 9 18 0 38 23 29 4 29 10 23 9 0 29 10 35 -4 61 -16 20 -5 30 9 33 -2 33 4 34 -11 20 -22 28 -19 14 -9 19 0 29 -16 13 -59 56 -35 -4 -29 2 -25 -4 -31 -15 -42 -2 -6 -27 -15 -2 -14 -2 -13 -5 -21 3 -19 -13 -6 -23 6 -23 0 -25 5 -23 -11 -2 -25 2 -14 15 -17 0 -6 -25 -15 -21 -21 -17 -10 -18 -29 -13 -13 -25 -2 -19 -12 -16 -15 -11 -15 -14 -22 -15 -23 -19 4 -14 33 0 48 8 56 0 29 11 13 -7 10 -18 25 -11 17 -2 17 -10 6 -21 8 -6 7 -3 16 -4 6 -12 13 -11 15 -10 20 -6 7 -11 -9 -21 17 -14 27 -8 15 -3 23 -10 12 -10 z"/>
-		<path id="reg05" d="M 371 5031 l 58 0 102 -17 17 6 15 19 12 0 25 -27 65 -15 87 75 15 44 29 13 46 56 6 25 17 0 14 -15 36 0 -11 71 6 23 19 13 21 -3 42 9 6 27 -46 19 -12 25 -23 10 -44 67 -52 25 -19 21 -10 31 -59 23 -25 54 -25 10 -33 2 -31 -6 -48 -23 -17 2 -69 86 -25 2 -8 19 -54 18 -19 0 -16 -10 -23 -46 -2 -19 16 -27 -8 -35 -29 -19 -7 -27 -25 -21 0 -221 86 0 0 -264 z"/>
-		<path id="reg01" d="M 844 6189 l -67 48 -81 6 -33 36 -19 2 -52 -25 -21 12 -25 0 -19 -14 -12 14 -25 -16 -19 0 -25 10 -4 21 -15 8 -77 -8 -31 6 -27 27 -17 -2 -44 -46 -10 -27 -15 -6 -12 10 -9 -2 13 -27 -31 -29 -13 -27 9 -13 12 2 10 -10 7 -25 -29 -58 -25 -38 -44 -127 -34 -48 -4 -19 17 -18 0 -17 23 -8 19 16 -9 11 21 29 52 6 36 13 16 -4 2 -15 11 4 41 -25 0 -300 25 21 7 27 29 19 8 35 -16 27 2 19 23 46 16 10 19 0 54 -18 8 -19 25 -2 69 -86 17 -2 48 23 64 4 25 -10 25 -54 59 -23 10 -31 88 -63 27 -50 31 -21 12 -21 38 -12 42 2 56 19 64 2 34 89 -2 23 16 27 -8 57 -10 10 6 77 -17 -4 -14 -15 -32 -2 -18 21 -13 44 -14 12 2 19 12 15 13 14 45 2 23 -6 11 -35 87 -2 -14 39 -17 25 -21 21 -12 35 -17 32 -19 12 -25 15 -29 12 -17 25 -8 23 -27 63 -33 35 -23 29 -34 23 -29 21 -27 19 -19 18 -29 23 -25 11 -12 4 z"/>
-		<path id="reg34" d="M 1931 4397 l -79 48 -44 13 -23 19 -47 -15 -50 17 -25 25 -63 6 -25 -11 -92 -2 5 34 -15 18 0 17 6 11 -4 29 19 58 60 81 -23 46 -4 75 -37 23 10 27 -6 38 -19 4 0 -23 -40 -21 -6 -27 -16 -4 -7 -23 9 -13 -2 -20 14 -11 8 -35 -4 -54 -12 -13 -54 19 -42 -46 -229 87 25 73 62 11 38 23 81 23 0 29 10 35 -4 61 -16 20 -5 30 9 33 2 67 -61 81 0 29 -75 69 34 89 -2 23 16 27 -8 57 -10 10 10 125 -6 17 87 -2 7 -67 -21 6 -2 -16 43 -46 96 -15 71 -69 15 -35 4 -42 12 -14 2 -19 -37 -60 4 -17 0 -44 -8 -27 -34 -37 7 -50 110 -88 27 -8 31 -54 77 -46 111 -21 52 -40 71 -77 16 -33 -10 -56 -6 -67 -13 -23 25 -90 0 -39 -8 -27 12 -71 -4 -15 z"/>
-		<path id="reg23" d="M 998 5868 l -15 -6 -16 4 -13 11 -10 0 -21 8 -10 14 -25 21 -5 11 7 4 16 25 11 16 33 -4 23 -8 4 -21 17 -8 16 -23 -4 -17 11 -6 -13 -21 -6 0 z"/>
-		<path id="reg46" d="M 1196 5641 l 6 33 -2 15 -6 17 -11 35 -23 6 -45 -2 -13 -14 -12 -15 -2 -19 14 -12 13 -44 18 -21 32 2 14 15 17 4 z"/>
-		<path id="reg28" d="M 1321 4324 l 39 61 13 8 -29 52 19 36 -7 29 4 29 -6 15 -48 20 -4 21 6 15 -8 31 -19 17 23 33 19 -4 42 46 54 -19 12 13 4 54 -8 35 -14 11 2 20 -9 13 7 23 16 4 6 27 40 21 0 23 19 -4 6 -38 -10 -27 37 -23 4 -75 23 -46 -71 -106 0 15 17 27 0 48 -10 8 -15 -52 0 12 -17 -2 -16 -25 0 -29 -17 -4 -8 -15 8 -18 -19 -67 2 -21 19 -19 -10 -83 2 -19 -17 -31 2 -23 -37 -6 -25 -19 -21 8 z"/>
-		<path id="reg40" d="M 1058 3702 l 9 16 2 17 -4 10 2 7 -7 8 -10 4 -8 0 -17 -4 0 23 23 2 27 -17 17 17 18 4 11 -10 6 -2 2 -19 15 0 16 -9 13 11 15 -2 8 -13 0 -35 6 -19 -4 -19 -8 -16 -5 -15 -16 4 -11 15 -6 10 -17 0 -14 -2 -21 25 -12 4 -15 -4 -15 9 z"/>
-		<path id="reg07" d="M 1027 3837 l 19 2 8 10 2 19 2 21 13 25 8 21 17 -19 35 -27 19 -37 21 -19 25 -9 4 -14 -6 -13 -15 -2 -12 -8 10 -15 -4 -12 -13 -11 -16 9 -15 0 -2 19 -6 2 -11 10 -18 -4 -17 -17 -27 17 -23 -2 2 54 z"/>
-		<path id="reg26" d="M 2577 4533 l -58 69 0 16 25 21 -9 17 -72 25 4 39 -4 21 -17 11 -4 31 -34 6 -25 44 -31 0 -17 14 -72 11 -42 23 -33 -4 -17 14 -8 61 -19 31 -6 85 14 44 19 19 -8 71 -25 22 -28 53 -35 27 -10 27 0 33 -15 25 -4 33 14 25 21 7 0 31 -10 27 -2 50 16 48 48 58 44 0 81 -25 40 -29 33 -35 69 -140 38 -60 14 -59 33 -71 7 -41 39 -44 29 -133 5 -48 48 -31 4 -55 -29 -43 10 -21 15 0 12 44 17 -7 12 -16 -4 -188 -25 -27 -19 -33 7 -25 -21 -48 -15 0 z"/>
-		<path id="reg44" d="M 2021 3691 l 64 -71 25 -58 150 -146 57 -17 89 -108 46 -25 23 -58 46 -42 50 -27 21 -62 75 -125 43 -46 0 -69 69 -100 36 -248 -9 -17 -35 -20 -25 0 -65 56 -50 27 -81 -6 -23 16 -56 0 -46 40 -29 0 -50 -13 -29 5 -32 27 -35 -7 -60 -37 -19 -46 -56 6 -15 13 21 19 0 45 58 100 27 25 113 27 127 48 100 15 0 10 -46 77 -71 44 -110 134 -59 -9 -106 31 -29 36 -29 69 -29 16 -27 40 -65 56 4 304 42 71 z"/>
-		<path id="reg33" d="M 2323 4531 l 15 18 0 38 -21 23 -13 -19 4 -23 -10 -25 12 -14 13 2 z"/>
-		<path id="reg10" d="M 2121 4456 l 19 4 2 8 0 13 6 18 0 9 -8 2 -13 -4 -19 -9 -14 0 -4 -10 4 -21 14 -12 13 2 z M 2210 4535 c 0 -4 -7 -6 -16 -6 -9 0 -17 2 -17 6 0 3 8 6 17 6 9 0 16 -3 16 -6 z M 2127 4545 c 0 -3 -5 -6 -10 -6 -6 0 -11 3 -11 6 0 4 5 6 11 6 5 0 10 -2 10 -6 z M 2106 4458 c 0 -3 -2 -4 -4 -4 -2 0 -4 1 -4 4 0 2 2 4 4 4 2 0 4 -2 4 -4 z"/>
-		<path id="reg31" d="M 2858 5289 l -23 8 -16 15 6 29 10 8 23 5 23 -13 17 -23 0 -12 -17 -30 -23 13 z"/>
-		<path id="reg39" d="M 2721 5341 l -29 13 0 37 6 15 23 16 35 -8 11 -29 -7 -23 -16 -21 -23 0 z"/>
-		<path id="reg13" d="M 2144 2402 l -104 87 -15 31 25 44 25 0 25 -31 15 -13 29 0 27 -6 -17 -17 -14 -2 -21 0 0 -14 21 -4 16 -7 4 -29 -4 -25 -12 -14 z"/>
-		<path id="reg54" d="M 1758 1957 l -32 -2 -12 33 -32 -3 -21 42 -35 2 -19 35 5 54 -35 114 40 -3 25 12 23 -30 26 16 46 -37 28 16 35 5 37 -5 14 46 49 10 21 18 46 26 38 32 23 31 37 18 21 14 18 35 38 -33 -56 -58 -70 -34 -30 -42 -23 -26 -26 -28 -42 -25 -34 -3 -21 -25 -14 -42 -17 -42 -18 -35 -19 -41 -14 -45 z"/>
-	</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_amerique_centrale.xml Deleted

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="234" height="189" viewBox="0 0 7974 6518">
-<g fill="white" stroke="#131516" stroke-width="30" stroke-linejoin="round" transform="matrix(1.0,0.0,0.0,1.0,4118.0,200.0)">
-		<rect id="reg00" fill="#EEEEEE" x="-4118" y="-200" width="7974" height="6518"/>
-		<path id="reg03" d="M 565 1991 l -132 115 29 40 40 37 13 165 -82 89 0 44 -64 25 -13 -33 -41 41 0 27 66 -12 -21 71 -4 93 -56 -20 8 64 15 25 -31 63 20 131 -39 77 35 38 4 131 11 83 -19 44 -67 12 21 -52 4 -50 17 -52 -29 -62 -27 50 8 41 -46 28 -12 41 37 75 -41 19 -40 -13 -64 50 50 7 35 -19 23 35 -31 65 16 81 65 -33 8 -44 -8 -33 35 -73 46 -31 8 18 -43 38 -38 127 -8 92 -27 89 -84 48 -20 69 20 131 84 79 23 46 18 79 -89 -6 -42 -29 -33 35 -100 -2 -27 -33 -54 10 -82 -116 -100 -25 -70 -38 -59 19 -48 44 -48 -30 -14 -27 -117 -6 -69 -67 -85 11 -19 -36 -135 42 -4 -60 -163 -173 -52 -82 -108 -89 -59 -23 -60 -125 2 -71 -110 -19 -5 -72 -58 -23 -27 -21 4 -46 -56 -54 -48 -4 -60 -80 -90 -64 -25 -46 73 -90 50 -31 79 96 46 -21 42 46 56 25 73 -25 8 -81 36 -52 35 16 35 -54 0 -96 30 -62 -65 0 6 -71 48 0 81 -31 155 10 50 -25 16 -35 0 -71 46 -29 27 75 46 4 25 56 56 46 52 0 46 -67 61 -4 0 -67 35 -6 102 -66 -29 -15 10 -81 52 0 46 -36 -16 -64 41 -7 11 -54 35 25 38 -25 60 -18 46 18 -17 36 27 62 36 -8 27 35 35 19 96 -35 46 -48 73 37 27 -37 54 0 35 -36 65 -14 35 -57 36 36 44 -36 100 0 75 23 z"/>
-		<path id="reg02" d="M -954 3933 l 135 -42 19 36 85 -11 69 67 117 6 14 27 48 30 48 -44 59 -19 70 38 100 25 82 116 54 -10 27 33 100 2 33 -35 42 29 89 6 17 67 54 42 4 89 57 96 158 115 8 62 19 38 46 4 -21 41 13 13 81 -4 31 43 -4 61 -48 4 -54 -44 -50 -6 -58 31 0 54 27 25 0 30 -30 27 13 62 77 50 8 67 -75 50 13 50 25 19 0 98 -67 35 -48 8 -27 42 -21 -2 -41 -46 12 -83 23 -29 -39 -17 -67 -4 -21 -32 -44 -31 -12 44 62 44 0 56 36 8 8 42 -27 2 -44 -31 -91 14 -46 -23 0 -62 -44 -2 0 -52 37 -61 36 -14 0 -84 -48 -54 -8 -46 -57 -18 -16 -29 -48 10 -79 -90 -7 -35 -87 2 -36 -25 -77 0 -62 -33 -19 -57 33 -47 -20 -15 -13 -63 -58 -12 -31 -58 -13 -50 -87 -65 -38 25 -35 0 31 48 48 23 33 71 48 0 23 33 -10 29 -50 21 0 38 -21 31 -34 8 5 54 -42 -18 0 -15 -17 -38 0 -41 -60 -67 -67 11 -75 -40 -73 -2 -29 -98 -48 -88 -19 -60 36 -102 116 -21 0 -67 -14 -18 0 -21 -58 -33 -38 20 -2 -39 -58 -36 -2 -33 43 13 4 -15 36 15 27 -7 -4 -56 z"/>
-		<path id="reg04" d="M -2042 1446 l 32 -11 0 -39 33 6 29 37 15 -43 73 -28 33 -39 106 -6 38 -17 14 21 48 0 -23 35 23 6 -27 34 31 25 38 -31 27 14 37 -10 48 23 79 12 221 0 29 -17 73 17 73 -39 102 18 11 -39 -48 -29 33 -13 52 13 65 -9 81 46 75 56 175 -21 36 -47 41 -5 52 48 69 34 85 73 44 -15 34 -29 116 0 98 129 129 117 -16 29 -69 -69 -58 0 -11 -56 -31 19 -27 -28 -27 28 31 33 -27 58 -19 11 31 31 57 -15 20 11 -4 54 129 46 59 -29 -23 -59 64 4 23 61 109 -6 18 47 63 30 15 68 -75 -23 -100 0 -44 36 -36 -36 -35 57 -65 14 -35 36 -54 0 -27 37 -73 -37 -46 48 -96 35 -35 -19 -27 -35 -36 8 -27 -62 17 -36 -46 -18 -60 18 -38 25 -35 -25 -11 54 -41 7 16 64 -46 36 -52 0 -10 81 29 15 -102 66 -35 6 0 67 -61 4 -46 67 -52 0 -56 -46 -25 -56 -46 -4 -27 -75 -46 29 0 71 -16 35 -50 25 -155 -10 -81 31 -48 0 -6 71 65 0 -30 62 0 96 -35 54 -35 -16 -36 52 -8 81 -73 25 -56 -25 -42 -46 -46 21 -29 -42 4 -77 -46 0 0 -37 36 -25 -27 -23 -63 -9 -17 -10 -14 -131 35 -21 0 -46 -64 -50 -19 25 -71 6 25 -35 -17 -42 -39 -23 -65 -2 -71 38 -50 10 17 -16 4 -36 -10 -39 -42 -15 -48 6 0 -46 -18 -20 -55 -11 -75 -4 -52 -15 -25 -45 -121 -69 -27 -42 46 -39 71 4 0 -63 -54 -27 8 -60 50 -9 -19 -104 219 -85 175 -96 77 -85 z"/>
-		<path id="reg07" d="M -1983 91 l -61 -77 61 -12 66 71 17 -2 29 20 11 13 20 -13 25 -14 9 8 -4 23 -65 117 0 60 10 27 0 46 -68 42 -5 -4 -18 29 -4 68 22 15 32 -4 14 12 -23 59 -29 14 -21 -4 -23 38 -6 62 21 36 52 37 0 44 -44 83 -23 0 -18 23 16 46 -4 25 -8 6 -31 0 -23 40 -7 31 -8 17 -31 60 -136 0 -45 85 -27 21 -19 0 -4 88 -36 -29 -21 8 -20 -54 -40 54 -67 0 96 -510 19 -523 39 -40 67 48 50 -19 -2 -75 77 -16 79 -119 109 39 z"/>
-		<path id="reg06" d="M -2402 273 l -990 -11 -10 248 -250 0 29 44 48 0 75 92 60 8 19 67 59 43 31 57 48 10 29 62 48 11 27 81 87 25 -48 63 9 39 0 71 -40 -29 -629 29 -250 331 29 29 0 63 29 96 -79 31 11 92 29 21 -86 79 190 150 92 96 145 35 100 73 188 21 62 -21 157 31 131 69 73 -77 35 -61 82 0 35 13 44 -29 -17 -59 83 5 -48 -71 25 -21 96 -11 56 -16 -27 -42 46 -39 71 4 0 -63 -54 -27 8 -60 50 -9 -19 -104 219 -85 175 -96 77 -85 -48 -67 -29 -77 -56 -11 37 63 -75 64 -52 -41 0 -17 -68 -33 -36 -29 -21 8 -20 -54 -40 54 -67 0 96 -510 19 -523 z"/>
-		<path id="reg05" d="M -3052 2379 l 137 127 96 -19 19 31 96 48 71 -14 8 37 208 123 86 0 4 21 54 0 -4 -46 50 25 62 59 236 -13 41 -10 23 -48 -39 -21 14 -27 48 25 21 -2 25 -32 -17 -10 -14 -131 35 -21 0 -46 -64 -50 -19 25 -71 6 25 -35 -17 -42 -39 -23 -65 -2 -71 38 -50 10 17 -16 4 -36 -10 -39 -42 -15 -48 6 0 -46 -18 -20 -55 -11 -75 -4 -52 -15 -25 -45 -114 -67 -159 25 -25 21 48 71 -83 -5 17 59 -44 29 -35 -13 -82 0 -35 61 -73 77 z"/>
-		<path id="reg01" d="M 1106 5821 l -23 20 -21 2 -64 17 19 42 -40 14 0 46 27 0 13 31 12 7 36 37 39 0 21 38 62 -40 -12 -64 -38 20 -35 -27 35 -48 -31 -25 9 -39 -9 -31 z M 700 4854 l 123 8 0 65 -36 21 15 52 60 -57 46 50 15 42 -58 19 -34 52 61 0 20 52 34 -15 54 28 46 -48 73 8 -63 -50 11 -77 62 -36 8 67 50 104 111 84 227 -19 131 -73 190 -77 216 23 67 -69 11 65 -65 50 23 43 52 -43 29 62 175 -92 17 -77 -38 -64 -16 60 -42 65 -50 0 -13 -56 -54 -32 59 -66 35 -92 60 48 32 -40 85 0 29 40 86 -48 141 12 32 32 -109 12 -77 36 13 41 96 0 91 -56 154 -4 32 60 54 -21 52 53 85 -15 54 23 7 94 54 -32 89 61 -31 52 34 48 16 -36 38 5 52 60 -9 44 61 -23 54 16 -37 25 25 30 -30 41 -43 0 -11 40 34 4 50 25 -11 92 48 0 44 33 19 77 39 23 -48 29 -71 11 -20 70 60 50 -60 19 -73 11 -30 31 -41 0 -40 -71 -39 0 -11 60 61 61 -71 10 -40 42 40 69 -54 2 -13 -59 -27 9 -37 0 -5 -73 -31 12 -37 -33 10 -52 -65 -8 -12 -142 -69 -25 -23 -79 42 -59 8 48 54 34 9 -52 -44 -61 46 -46 48 19 19 -29 33 0 27 71 60 0 32 71 68 20 -43 -97 -65 -42 -40 -58 -50 -17 17 -86 -31 -22 -27 93 -79 29 -34 -29 0 54 -50 23 -39 -73 14 -108 -164 -44 -71 -85 -113 -44 -131 31 -71 44 -91 17 -13 81 -27 21 54 37 63 -31 0 54 -132 27 -108 123 -77 -23 -90 9 -43 71 39 95 63 11 41 52 50 37 17 80 61 27 10 83 -56 0 -42 54 -90 -21 5 61 -27 8 -53 -8 -22 23 -55 12 -56 -35 -54 35 -38 4 -62 -37 -35 33 -75 -16 4 -34 -32 -58 0 -48 32 -73 -50 -29 0 -123 -38 35 -25 0 13 88 -50 19 -40 -44 -35 14 -84 -31 -31 -33 6 -40 -50 -10 -10 -138 -38 9 -2 -15 -110 -33 -46 6 -50 -21 -10 -87 -48 0 -69 35 -44 -25 -91 44 -73 -23 10 56 -54 36 4 -36 -37 -46 10 -4 -19 -73 48 -8 67 -35 0 -98 -25 -19 -13 -50 75 -50 -8 -67 -77 -50 -13 -62 30 -27 0 -30 -27 -25 0 -54 58 -31 50 6 54 44 48 -4 z"/>
-	</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_amerique_sud.xml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="168" height="252" viewBox="0 0 5585 8428">
-<g fill="white" stroke="#131516" stroke-width="3" stroke-linejoin="round" transform="matrix(1.0,0.0,0.0,1.0,2754.0,200.0)">
-		<rect id="reg00" x="-2754" y="-200" width="5585" height="8428" fill="#EEEEEE"/>
-		<path id="reg01" d="M -1056 1183 l 10 -71 21 -18 23 -46 -38 -42 -27 -54 -18 -65 6 -52 21 -25 18 0 19 -29 0 -58 -60 12 -46 -2 -19 15 -33 0 -73 25 -15 10 -29 -87 -52 -48 -54 2 -113 -8 -47 -17 -36 -27 -19 -63 5 -60 -38 -67 -29 -29 23 -29 0 -50 -15 -8 38 -40 18 -44 42 -39 2 -27 46 -36 50 -2 40 -35 -11 -40 -66 -27 -28 15 0 31 -14 0 -21 -15 -23 0 21 29 2 59 -52 -7 -52 34 -8 29 -96 -8 -23 16 6 19 -58 -8 -19 8 -6 17 -46 14 -23 75 -6 52 -15 0 -52 25 0 61 -31 14 -31 44 6 61 -21 18 -13 -27 -4 -50 -52 -64 -10 18 4 46 23 40 6 33 -37 52 -48 19 0 15 37 27 0 27 56 14 -27 102 0 36 17 27 15 4 -32 58 13 57 39 23 -20 29 -30 77 -47 41 -28 0 0 -8 -18 0 -19 19 6 23 -31 10 -19 48 52 56 -56 11 69 29 91 25 9 40 129 18 4 -37 23 10 15 34 39 35 42 15 42 -15 50 21 77 71 14 35 59 42 68 0 42 12 77 -2 56 17 46 0 31 54 36 10 -88 184 42 -9 29 9 58 41 11 -343 31 -102 -14 -36 -32 -4 -10 -69 14 -23 32 17 64 0 21 -35 -54 -50 -27 4 -31 18 -13 -8 0 -83 81 -4 50 18 9 -18 -36 -32 19 -37 35 23 38 8 12 -23 23 15 55 100 14 41 40 19 29 -33 -56 -44 -27 -37 -9 -63 -60 -23 z"/>
-		<path id="reg03" d="M -1904 1517 l -42 -15 -39 -35 -15 -34 -23 -10 -4 37 -129 -18 -9 -40 -91 -25 -69 -29 -90 66 -14 65 8 50 -41 44 4 48 -32 8 -6 25 6 71 -25 75 48 29 38 6 19 -25 0 -23 25 -20 23 22 8 63 -8 40 -34 22 -25 -10 -56 25 52 17 -2 21 -56 35 18 10 25 -4 -4 31 13 11 29 -13 52 40 42 19 50 -9 41 -170 27 -19 19 -40 100 -44 65 -52 58 -95 29 -17 23 -83 -8 -48 0 -2 z"/>
-		<path id="reg07" d="M -1394 1946 l 88 -184 -36 -10 -31 -54 -46 0 -56 -17 -77 2 -42 -12 -68 0 -59 -42 -14 -35 -77 -71 -50 -21 -42 15 8 50 -23 83 -29 17 -58 95 -65 52 -100 44 -19 40 -27 19 -41 170 -50 9 -42 -19 -52 -40 -29 13 -13 -11 4 -31 -25 4 -18 -10 56 -35 2 -21 -52 -17 -65 85 5 115 33 38 -11 33 -37 27 17 40 50 18 41 0 63 29 37 59 15 52 100 89 37 109 19 81 58 92 69 68 -8 25 60 96 69 67 -10 23 0 81 45 33 48 53 100 54 98 77 204 66 148 138 57 8 27 -43 23 -69 18 37 0 -75 50 -43 -41 -46 -65 -61 -12 -56 56 17 27 -88 4 -75 -25 -87 31 -100 34 -21 -40 -50 -31 -31 -23 -82 -71 0 -56 7 -13 -50 7 -144 -38 0 -25 50 -31 29 -63 8 -27 -31 -4 -33 -77 -13 -19 -66 -66 -52 -34 -119 77 -88 13 -89 23 -73 31 6 40 -65 62 -6 79 -37 z"/>
-		<path id="reg08" d="M -1202 2712 l 23 82 71 81 -34 21 -31 100 25 87 -4 75 -27 88 14 29 53 23 20 23 0 23 -20 8 -5 40 -50 43 0 75 69 88 -14 25 18 31 46 10 -4 63 -31 56 4 65 92 160 16 73 67 4 33 -46 19 -62 37 -29 40 14 6 36 42 -4 17 -21 85 46 29 -2 21 -50 73 -19 50 29 23 23 25 -202 62 -98 152 -38 134 0 54 34 33 37 15 59 19 -28 -7 -68 5 -57 22 -27 5 -73 -13 -54 -46 -52 -46 -19 0 -68 19 -42 -181 0 -63 -142 32 5 35 -19 -50 -121 -31 -40 -27 -14 -88 8 -35 -21 -29 -31 -32 -6 -10 -27 -46 -4 -27 -34 -33 -12 -46 16 -27 -29 -111 -46 -6 -52 19 -73 -8 -56 10 -42 -19 -31 -37 19 -31 -10 -50 43 -38 -10 -19 31 -50 29 -23 32 -41 4 -50 27 -11 25 -83 -11 z"/>
-		<path id="reg02" d="M -1446 29 l 11 40 -30 56 -52 6 -29 17 38 62 14 32 -23 10 -14 -13 -9 19 17 34 -17 18 -6 46 29 48 57 0 18 -37 -31 -115 4 -42 86 -52 10 -21 42 11 23 -15 -23 -23 -38 0 -10 -48 33 -25 67 40 4 44 58 4 52 19 42 41 21 50 52 -6 56 -19 65 -6 58 21 23 33 73 9 52 -9 52 -54 0 -27 -71 -4 -31 16 -54 -6 -10 -31 62 6 65 -14 214 8 40 25 -77 8 -15 40 4 37 36 -14 41 -6 17 31 40 -15 23 23 39 6 54 65 6 35 -79 17 -10 29 56 29 67 -62 37 4 38 21 14 27 -2 42 -106 60 33 27 17 56 -65 23 -22 -12 -21 4 27 42 0 25 -19 20 13 61 18 17 27 -3 15 13 2 62 13 21 -5 15 -56 -8 -41 22 -15 32 -88 -2 -33 -13 -29 19 -19 17 -33 2 -40 -15 -121 -6 -22 -9 0 30 29 12 12 27 -8 77 46 48 96 19 31 23 8 17 -52 2 -40 -17 -37 10 -69 88 -116 46 -67 4 -56 -44 -27 -37 -9 -63 -60 -23 10 -71 21 -18 23 -46 -38 -42 -27 -54 -18 -65 6 -52 21 -25 18 0 19 -29 0 -58 -60 12 -46 -2 -19 15 -33 0 -73 25 -15 10 -29 -87 -52 -48 -54 2 -113 -8 -47 -17 -36 -27 -19 -63 5 -60 -38 -67 -29 -29 23 -29 0 -50 -15 -8 38 -40 18 -44 42 -39 2 -27 46 -36 50 -2 40 -35 -11 -40 z"/>
-		<path id="reg11" d="M 808 942 l -56 52 -25 16 -4 25 -21 4 -64 140 -53 21 -31 29 -14 35 -23 0 2 -31 -81 -33 -42 -8 -13 -30 0 -23 -41 -10 0 19 -17 8 -29 -8 -8 -21 -21 4 -11 67 -23 10 -179 -10 -4 25 -50 33 -21 38 -35 6 -34 -23 -35 -8 -17 -17 -46 -152 28 -61 8 -33 19 -21 -11 -33 -31 -15 -25 -35 -6 -38 16 -25 -6 -27 -27 -2 -19 -14 -23 18 15 13 2 62 13 21 -5 15 -56 -8 -41 22 -15 32 -88 -2 -33 -13 -48 36 -33 2 -40 -15 -121 -6 -22 -9 0 30 29 12 12 27 -8 77 46 48 96 19 31 23 8 17 -52 2 -40 -17 -37 10 -69 88 -116 46 -67 4 -29 33 -40 -19 -42 -91 -27 -50 -23 -15 -12 23 -38 -8 -35 -23 -19 37 36 32 -9 18 -50 -18 -81 4 0 83 13 8 31 -18 27 -4 54 50 -21 35 -64 0 -32 -17 -14 23 10 69 32 4 14 36 -31 102 -11 343 -58 -41 -29 -9 -42 9 -79 37 -62 6 -40 65 -31 -6 -23 73 -13 89 -77 88 34 119 66 52 19 66 77 13 4 33 27 31 63 -8 31 -29 25 -50 38 0 -7 144 13 50 127 -7 83 11 11 -25 50 -27 41 -4 23 -32 50 -29 19 -31 38 10 50 -43 31 10 37 -19 19 31 -10 42 8 56 -19 73 6 52 111 46 27 29 46 -16 33 12 27 34 46 4 10 27 32 6 64 52 88 -8 27 14 31 40 50 121 -35 19 -32 -5 63 142 181 0 -19 42 0 68 46 19 46 52 13 54 -5 73 -22 27 -5 57 7 68 -19 28 25 43 -21 67 -4 60 48 38 79 12 19 -31 64 -10 25 54 4 67 25 45 21 57 40 20 52 -12 37 17 -10 56 -23 4 -25 63 25 60 86 21 12 75 -4 44 12 47 -37 9 -48 37 -60 23 -92 92 -71 92 -83 68 -13 59 25 -7 31 -20 25 4 21 25 11 35 41 19 15 27 29 -15 21 11 73 75 25 33 27 0 33 15 9 46 37 14 13 29 20 -6 173 -250 0 -56 15 -19 23 71 48 -8 -23 12 -92 125 29 25 100 -146 27 -16 50 -11 -4 -25 -31 15 -27 -4 52 -78 -4 -37 62 -42 59 -125 0 -252 23 -27 -15 -35 35 10 69 -67 92 -58 110 -10 17 -27 100 -25 15 -38 70 21 48 -10 4 -48 21 -9 9 42 29 19 46 6 20 -15 -10 -43 -19 -30 77 -16 21 -44 -4 -71 40 -16 4 -34 19 -29 47 -6 30 -84 23 -25 0 -41 22 -71 0 -52 44 -29 15 -52 4 -57 19 -41 18 -71 0 -221 73 -135 23 -15 29 15 61 -90 33 -25 11 -52 79 -81 48 -9 98 -120 41 -59 29 -66 0 -86 19 -29 -10 -69 -27 -77 0 -75 -57 -62 -143 -15 -65 -85 -39 -19 -15 -52 -81 -38 -94 -87 -63 4 -104 -4 -14 -19 -52 6 -52 38 10 -21 -15 -15 -37 -2 -21 -29 -83 -23 -90 61 0 -42 19 -27 -31 -52 -73 -63 -63 -29 -69 -6 -62 -42 -92 -12 -37 12 4 59 -31 14 -40 31 -19 44 -41 0 -63 48 -8 60 8 63 -4 52 -37 -65 2 -114 45 -36 7 -31 -32 -14 -37 0 -48 23 -15 -23 63 -19 104 12 48 -23 60 -77 19 -52 -4 -18 -37 -13 -53 0 -43 -15 -25 -20 -7 -27 -45 -5 -32 19 5 33 27 19 -17 34 -115 81 -14 -15 48 -48 8 -29 -27 -4 -40 19 11 41 -34 32 -56 12 34 -19 66 -120 52 4 19 -32 44 -35 19 -27 -11 -15 19 -48 -13 -33 -58 -14 -52 14 42 -37 -5 -55 -18 -45 0 -59 -23 -52 4 -41 -15 -25 z M 538 5373 l 72 -115 69 -81 13 -10 29 -19 0 23 -40 14 -12 34 -25 29 -19 52 -12 52 -50 37 -32 21 7 -37 z"/>
-		<path id="reg09" d="M 46 3792 l -15 -59 -33 -37 -54 -34 -134 0 -152 38 -62 98 -25 202 77 117 194 150 48 0 22 25 53 8 31 37 31 13 48 -4 15 35 -27 52 -21 71 -34 31 -33 90 63 -21 143 38 61 4 93 -54 57 -80 8 -75 27 -35 -25 -60 25 -63 23 -4 10 -56 -37 -17 -52 12 -40 -20 -21 -57 -25 -45 -4 -67 -25 -54 -64 10 -19 31 -79 -12 -48 -38 4 -60 21 -67 -25 -43 z"/>
-		<path id="reg10" d="M 81 5248 l 13 23 -25 41 6 55 6 64 54 36 78 18 66 29 127 15 29 -35 73 -23 23 -61 7 -37 -11 -27 38 -86 -13 -29 -37 -14 -9 -46 -33 -15 -27 0 -25 -33 -29 -36 -29 -14 -15 -25 -21 -11 -17 5 -12 10 -15 -27 -41 -19 -11 -35 -21 -25 -25 -4 -16 6 -15 14 -25 7 -29 23 -21 22 0 44 -19 29 0 30 7 25 4 31 -23 25 0 31 33 19 z"/>
-		<path id="reg12" d="M -712 7533 l -111 21 -39 19 -67 6 -63 -52 -16 -40 18 -54 -39 -79 -21 -67 8 -48 -37 -81 -11 -127 7 -108 -11 -11 -29 11 -23 23 -10 -44 27 -40 50 0 -4 -70 21 -34 4 -29 -59 -40 25 -20 27 0 17 -25 -50 -7 2 -81 -60 -96 6 -60 25 -65 -37 -25 -13 -189 29 -38 0 -77 40 4 12 -16 -31 -42 -23 -100 -14 -142 56 -21 14 -58 15 -206 -15 -119 -70 -142 25 -145 35 4 10 -38 -33 -35 -17 -67 32 -81 45 -69 53 -133 16 -111 -31 -129 6 -66 106 -44 32 -4 2 -40 -13 -14 0 -40 25 -17 0 -43 -35 -7 33 -46 19 -62 37 -29 40 14 6 36 42 -4 17 -21 85 46 29 -2 21 -50 73 -19 50 29 100 140 194 150 48 0 22 25 53 8 31 37 31 13 48 -4 15 35 -27 52 -21 71 -34 31 -33 90 63 -21 143 38 61 4 93 -54 57 -80 8 -75 27 -35 86 21 12 75 -4 44 12 47 -37 9 -48 37 -60 23 -92 92 -71 92 -83 68 -13 59 -50 45 0 44 -19 29 11 86 -23 25 0 31 33 19 -50 119 -27 8 -48 -13 79 61 7 25 -23 19 114 33 23 46 -16 58 6 38 52 14 4 48 -17 38 5 25 -42 54 0 46 -85 29 -19 33 -42 4 -37 21 -73 8 -105 -6 -56 -23 -33 -29 -15 10 19 36 0 42 29 37 -21 10 5 38 16 29 -21 31 15 38 -10 21 -61 41 -123 -14 -62 -52 -23 14 8 52 25 75 -14 27 81 5 -40 43 -4 25 36 19 64 -15 15 -37 0 -44 -44 -6 37 -12 32 27 -7 68 11 42 -15 19 -48 6 -18 -15 25 -29 -36 4 -16 19 -55 6 -8 46 15 21 52 31 -67 21 -15 42 0 48 -29 33 -18 0 -21 -37 -52 37 -21 52 -25 34 4 52 25 33 48 39 60 3 19 25 2 54 -17 43 -39 0 25 19 4 23 -4 19 -29 -15 -34 0 -18 25 -7 86 7 41 -23 25 -48 15 -29 33 0 63 25 52 -21 25 6 12 33 2 21 50 -83 0 -23 -10 -17 19 107 8 z"/>
-		<path id="reg13" d="M -1300 6810 l -25 4 -21 -31 27 -52 19 15 0 58 0 6 z M -1119 7456 l -33 15 -19 25 -52 8 11 37 27 11 14 -36 42 -8 14 -48 -4 -4 z M -687 7600 l -30 166 -31 0 -104 -18 17 -36 0 -41 66 0 0 -23 -8 -7 -2 -8 8 -6 -8 -11 29 -8 -6 -12 10 -13 2 6 23 -4 21 -21 13 36 z M -721 7844 l -58 -21 -148 -34 46 -27 135 32 38 -3 -13 53 z M -958 7712 l 14 17 -6 23 -27 14 -117 0 -27 -4 -25 -43 48 -17 23 31 60 -14 46 -3 11 -4 z M -1110 7648 l -23 -19 -40 -29 -58 6 29 27 46 21 14 27 44 0 -6 -27 -6 -6 z M -1312 6550 l -50 -25 0 31 -21 21 -15 -13 -12 25 6 34 21 18 -7 19 0 34 28 10 31 -17 0 -46 -21 -18 27 6 6 -15 -21 -16 15 -27 25 6 -12 -27 z M -1221 7106 l -41 31 -5 42 -23 42 5 35 18 -42 21 -43 6 58 -27 42 -4 73 13 72 12 -31 0 -96 34 -25 35 -54 -13 -31 -12 23 -29 -56 25 -25 -15 -21 0 6 z M -1340 7144 l -12 -17 -19 -15 0 -18 -27 12 15 31 21 21 22 -14 z M -1377 6937 l 15 27 -28 25 -31 0 0 21 23 13 -17 4 -33 -17 0 -39 44 -7 27 -20 0 -7 z M -1358 7189 l 18 7 9 33 -15 25 -16 -6 4 -32 0 -27 z M -1362 7289 l 4 -14 29 10 4 15 21 6 -21 17 -4 25 -19 -15 -14 0 0 15 14 6 -35 -6 0 -19 21 -19 0 -21 z M -1342 7429 l 7 -15 39 27 19 -6 6 25 -33 13 33 52 25 37 -16 27 -42 -31 -11 -33 -27 -52 0 -44 z M -775 7883 l -27 -21 -60 -16 -44 4 10 37 61 -4 -23 17 23 27 33 0 -13 -17 -6 -16 29 0 38 10 -11 23 40 -4 -19 -29 -31 -11 z M -687 7879 l 25 -29 33 -4 27 10 23 -10 31 4 0 23 -25 27 -29 4 0 -17 -21 -4 -10 27 -38 -6 -16 -21 0 -4 z M -944 7812 l -50 -27 -54 4 44 23 -17 21 27 13 7 -34 20 15 23 23 15 -11 -15 -27 z M -904 4085 l -67 -4 -16 -73 -92 -160 -4 -65 31 -56 4 -63 -46 -10 -18 -31 14 -25 -69 -88 -18 -37 -23 69 -27 43 -15 75 10 177 38 136 -33 148 -11 41 11 38 -15 25 4 96 25 23 11 37 -36 152 21 38 4 35 -19 17 -14 114 -29 73 0 63 29 27 -23 167 23 104 8 187 -4 117 -56 177 -29 146 -46 -9 -6 23 62 136 -10 83 33 38 -27 45 -11 65 0 100 15 50 33 8 -33 15 -15 77 0 90 30 10 52 15 0 -46 12 -32 15 -47 -9 -38 -18 -35 18 -17 38 2 29 21 15 37 -29 19 -28 33 13 53 4 81 -17 23 -43 21 -9 60 13 58 14 -25 25 -33 0 -29 38 -17 29 -6 6 33 -20 36 -44 16 -4 30 8 43 -23 38 23 29 -19 17 -14 -17 -27 -36 -25 0 -42 46 -38 59 13 31 14 -25 28 4 4 23 48 -19 14 25 -35 29 -2 48 16 11 -29 8 -35 35 6 73 65 -81 70 -8 61 41 6 63 -23 0 4 52 -16 -4 -2 31 20 17 11 71 -33 6 -5 -42 -31 9 -27 52 -4 48 27 10 10 46 15 4 2 -110 29 4 -8 50 17 -4 31 -38 0 113 -25 68 29 -4 37 29 7 -29 -25 -12 21 -13 43 17 21 33 -35 56 31 2 23 15 44 -19 14 19 25 -23 -2 -17 25 -4 6 59 17 0 0 -61 44 -19 21 -31 81 -8 -8 -19 -111 21 -39 19 -67 6 -63 -52 -16 -40 18 -54 -39 -79 -21 -67 8 -48 -37 -81 -11 -127 7 -108 -11 -11 -29 11 -23 23 -10 -44 27 -40 50 0 -4 -70 21 -34 4 -29 -59 -40 25 -20 27 0 17 -25 -50 -7 2 -81 -60 -96 6 -60 21 -44 4 -21 -37 -25 0 -60 -13 -129 29 -38 0 -77 40 4 12 -16 -31 -42 -23 -100 -14 -142 56 -21 14 -58 15 -206 -15 -119 -70 -142 16 -118 9 -27 35 4 10 -38 -33 -35 -17 -67 32 -81 45 -69 53 -133 16 -111 -31 -129 6 -66 106 -44 32 -4 2 -40 -13 -14 0 -40 25 -17 0 -43 -35 -7 z"/>
-		<path id="reg14" d="M 29 7339 l 17 7 -4 14 -27 6 6 19 29 6 0 -16 31 -6 17 10 -23 12 0 13 17 15 -11 10 -35 -4 2 14 -6 5 -19 -3 0 19 -19 2 -23 -10 0 8 9 23 -9 11 -29 -15 -4 8 12 17 -23 -2 0 -38 25 -25 7 -33 8 -4 8 14 5 -8 -9 -42 9 -6 6 -12 33 -9 z M -29 7358 l -9 15 -22 4 0 19 -7 4 -6 29 -19 15 -4 14 -17 8 -16 -6 2 13 -4 14 -9 -6 -10 -21 -19 -2 -16 -14 35 0 -4 -13 12 -4 13 0 27 -23 -21 0 -15 8 -14 -14 17 -17 35 2 -2 -25 17 -14 14 8 8 10 17 -2 17 -2 z"/>
-		<path id="reg04" d="M -265 814 l -27 3 -18 -17 -13 -61 19 -20 0 -25 -27 -42 21 -4 22 12 65 -23 -17 -56 -33 -27 106 -60 2 -42 73 19 17 35 6 31 40 11 23 27 8 44 -27 14 -15 25 -4 31 -48 25 52 -10 34 -29 -11 -27 30 -11 52 0 23 52 47 0 30 25 -13 34 17 52 -29 10 -9 7 4 27 15 16 -6 11 -13 -9 -18 5 -34 -13 -6 63 4 70 2 27 11 23 33 0 27 15 -6 21 6 33 48 42 0 29 17 0 18 31 -179 -10 -4 25 -50 33 -21 38 -35 6 -34 -23 -35 -8 -17 -17 -46 -152 28 -61 8 -33 19 -21 -11 -33 -31 -15 -25 -35 -6 -38 16 -25 -6 -27 -27 -2 -19 -14 -23 18 z"/>
-		<path id="reg05" d="M 471 758 l -4 -21 -34 -14 -218 10 -63 15 17 52 -29 10 -9 7 4 27 15 16 -6 11 -13 -9 -18 5 -34 -13 -6 63 4 70 2 27 11 23 33 0 27 15 -6 21 6 33 48 42 0 29 17 0 18 31 23 -10 11 -67 21 -4 8 21 29 8 17 -8 0 -19 77 0 -17 19 -2 16 10 9 36 -11 27 -23 10 -75 23 -27 -10 -27 -54 -58 -4 -33 -13 -25 35 -75 11 -61 z"/>
-		<path id="reg06" d="M 342 1129 l 31 -2 46 2 -17 19 -2 16 10 9 36 -11 27 -23 6 -31 4 -44 23 -27 -10 -27 -23 -21 -31 -37 -4 -33 -13 -25 2 -15 19 -15 14 -45 11 -61 29 -6 33 6 84 46 62 44 36 52 56 8 0 44 -19 42 -25 16 -4 25 -21 4 -17 30 -25 70 -22 40 -53 21 -31 29 -6 17 -8 18 -23 0 0 -12 2 -19 -34 -12 -47 -21 -42 -8 -13 -30 0 -23 -14 -2 -27 -8 z"/>
-	</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_canvas.xml Deleted

@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="332" height="167" viewBox="0 0 4625 2336" xml:space="preserve">
-<g transform="matrix(1.0,0.0,0.0,1.0,2376.0,0.0)">
- <g id="relief" visibility="visible">
-  <image transform="matrix(0.876704,0.0,0.0,0.8767,-2357.76,1302.27)" x="0" y="-1472" width="5258" height="2642" xlink:href="x_austria_relief.png"/>
- </g>
- <g id="bundesland">
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 93 1085 l -21 -1"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M -273 913 c 8 -1 17 2 23 -2 7 -4 8 -16 14 -20 7 -4 18 -4 24 -3 6 1 -1 10 7 10 9 -1 29 -12 35 -14 6 -3 17 14 26 25 10 10 18 14 20 14 2 -1 6 -7 11 -3 5 3 7 16 13 20 6 3 11 2 18 -1 6 -3 17 -14 21 -16 3 -3 21 -11 25 -12 4 -1 11 -2 13 -3 2 -1 11 -5 13 -6 3 -1 -3 14 1 17 5 3 28 13 27 17 0 4 0 17 -3 23 -3 5 -6 5 -12 4 -7 -1 -16 -14 -24 -12 -7 3 -5 12 -7 22 -2 10 -6 28 -5 39 1 10 8 12 11 23 3 10 0 30 7 39 6 9 15 5 24 7 8 2 17 5 26 7"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 113 1084 c 2 9 14 23 4 29 -10 5 -28 -14 -39 -9 -11 5 -8 21 -12 31"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 113 1157 c 4 6 16 5 13 18 -4 13 -27 27 -32 38 -5 11 2 20 5 23 2 3 8 0 9 6 2 6 3 14 -1 27 -3 13 -24 32 -22 50 3 18 22 32 34 42 13 9 24 9 39 14 14 4 34 11 48 12 14 1 26 -3 32 -7 6 -4 -5 -5 -3 -12 2 -7 12 -14 15 -26 2 -12 6 -32 0 -43 -7 -12 -27 -13 -33 -16 -5 -2 -3 -56 -3 -59 0 -4 15 -27 21 -33 5 -5 24 -28 34 -34 9 -6 10 3 20 2 9 -1 24 -9 35 -7 11 1 14 10 28 14 14 3 38 -5 53 8 15 14 11 37 18 49 6 12 10 21 28 18 18 -3 46 -23 68 -23 21 0 23 24 38 28 16 4 48 -4 57 -5 9 0 24 -27 28 -27 4 0 21 -7 32 -12 12 -6 24 -13 31 -29 7 -16 50 -23 64 -28 15 -5 13 5 23 -6 11 -12 9 -21 16 -23 6 -2 12 6 19 9"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 687 709 c -1 7 -16 35 -16 35 0 0 -2 36 -3 54 -1 17 12 7 8 14 -4 6 -12 33 -26 43 -15 10 5 17 3 17 -1 1 13 12 16 18 4 5 24 28 37 35 12 7 56 35 74 43 18 7 20 -7 32 1 12 7 24 11 31 41 6 31 -27 18 -32 37 -2 7 5 6 4 32 -1 13 3 25 5 34 5 15 13 18 19 24 6 5 7 7 16 7 9 -1 22 -13 36 -10 15 3 17 24 31 25 14 0 26 -17 37 -22 11 -6 34 -9 40 -11 6 -2 30 19 50 -3 21 -23 52 -8 51 -13 0 -5 -3 -23 4 -30 8 -7 23 5 30 4 8 -1 10 -7 14 -8 4 -2 4 3 7 0 3 -4 3 -14 10 -19 8 -4 20 -10 30 -4 10 5 26 17 27 28 2 11 25 4 47 15 23 12 13 23 25 27 11 4 22 -14 37 -7 16 7 27 35 41 41 14 7 24 -17 34 -5 10 11 -10 38 15 57 25 20 46 1 58 9 11 9 2 39 9 49 7 9 21 -5 30 4 8 9 5 27 17 35 13 7 35 1 48 5 14 5 22 24 33 23 12 -1 10 -33 24 -27 13 6 11 33 18 47 7 14 17 23 23 34"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 794 397 c 8 8 13 25 23 29 11 4 24 -5 36 -2 11 3 19 12 29 18 11 6 35 3 36 17 2 13 -25 24 -22 41 4 17 24 24 34 39 10 14 3 22 11 35 7 12 5 19 1 37 -4 17 18 9 23 21 5 12 3 31 0 45 -3 13 -10 20 -17 28"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M -446 1235 c 3 6 -7 19 3 25 10 7 33 2 42 13 8 10 -6 21 -7 29 -1 8 6 12 9 19 4 7 7 23 10 32 4 8 14 8 13 16 -1 8 -11 8 -18 11 -7 2 -14 -1 -19 4 -5 4 5 11 1 19 -3 9 -13 19 -22 24 -9 5 -2 11 -9 13 -7 2 -18 -2 -29 0 -11 3 -23 7 -29 17 -5 9 6 16 4 25 -1 9 -14 13 -22 16 -9 4 -14 -1 -22 1 -8 2 -1 13 -20 14 -20 2 -31 -16 -45 -15 -14 0 -22 15 -31 18 -9 3 -15 1 -22 0 -8 0 -15 -6 -24 -3 -10 3 -15 13 -24 14 -9 1 -7 -7 -14 -7 -8 1 -9 7 -13 13 -4 6 -8 10 -5 16 2 6 17 20 8 32 -9 13 -6 20 -8 35 -1 15 6 20 4 32 -1 12 13 18 17 39 3 20 3 4 8 26"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M -641 1712 c 11 -7 17 -15 26 -19 9 -5 22 -3 26 -8 5 -5 -5 -11 3 -17 7 -7 27 -15 38 -17 11 -1 12 4 22 4 11 0 17 -9 40 -5 23 5 15 21 22 24 7 4 18 -3 30 2 13 5 23 15 38 28 15 13 16 33 25 43 10 9 22 0 27 3 6 2 6 2 4 10 -3 7 -18 20 -18 33 1 14 10 31 18 40 7 10 18 12 25 16 8 5 15 4 21 15 6 12 5 35 12 48 7 14 25 9 28 23 3 13 16 10 22 16 6 6 14 5 15 12 1 8 -2 23 -10 24 -19 2 -42 -8 -61 19 -6 8 -19 -6 -32 -4 -14 2 -37 6 -46 14 -9 8 2 18 -1 26 -3 7 -14 7 -18 15 -3 8 0 18 0 28"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M -399 1699 c 4 -7 5 -16 12 -20 7 -5 16 -8 26 -4 10 5 4 22 25 29 21 7 22 -5 33 -3 11 3 18 15 30 18 12 3 27 -6 38 0 12 7 0 24 16 33 17 8 19 -3 29 1 10 3 12 17 25 19 13 1 20 -11 46 -11 26 -1 50 -11 62 -16 13 -4 9 -4 10 -9 1 -6 -7 -17 0 -24 6 -7 24 -9 32 -9 8 0 5 7 11 6 7 0 14 -9 24 -6 10 3 9 19 28 22 19 3 17 -10 31 -8 14 1 41 12 52 17 12 5 6 10 16 11 9 0 27 -8 36 -6 10 2 7 13 13 15 7 3 17 -8 23 0 6 7 -2 24 3 32 6 9 14 6 21 8 6 2 15 -4 21 7 6 11 7 35 14 47 8 12 10 17 27 19 16 2 26 -14 44 -19 18 -5 30 -24 40 -29 10 -6 15 2 19 -5 5 -7 -2 -24 18 -30 20 -5 22 -24 37 -29 14 -4 8 -18 15 -23 8 -4 11 5 19 4 8 -2 15 -17 25 -12 11 6 7 30 22 37 14 7 42 0 56 1 14 2 22 2 28 9 7 7 -1 22 7 27 8 6 18 2 28 -4 9 -5 16 -22 24 -27 8 -4 15 9 25 10 11 2 30 -3 40 -1 10 2 13 10 18 4 5 -7 12 -15 37 -10 24 4 33 -10 49 -14 15 -5 31 -19 44 -13 13 6 26 29 39 38 12 9 21 0 34 14 13 14 35 48 41 69 3 10 -8 18 -9 27 -1 9 8 19 6 27 -4 17 -29 23 -21 45 6 16 23 -6 28 33 2 10 8 18 8 30 0 11 -10 20 -7 30 2 10 14 15 21 23"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 153 1376 c -1 10 -1 21 -3 28 -2 7 -8 8 -7 17 1 8 3 11 12 29 9 18 9 70 14 79 4 10 15 12 24 16 10 4 18 16 31 10 12 -6 8 -8 18 -12 11 -4 8 7 16 5 8 -3 20 -16 28 -19 7 -2 10 0 12 4 3 4 -4 7 0 14 3 7 20 18 23 26 3 8 -8 8 -9 13 0 5 2 12 13 18 12 6 8 18 19 26 10 8 23 6 33 14 9 9 19 18 20 26 2 8 -2 13 -8 12 -7 -1 -17 -11 -28 -8 -11 3 -22 13 -26 25 -3 11 9 23 9 33 -1 10 -9 11 -13 20 -4 10 0 22 -10 37 -11 15 -33 32 -49 48"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M -1853 1519 c 0 6 20 8 2 17 -19 9 4 16 0 31 -5 15 -9 18 -10 22 -2 3 12 21 9 35 -3 15 -53 36 -52 58 2 22 12 10 11 25 0 2 -10 11 -14 20 -2 7 20 18 11 30 -9 13 -9 31 -13 35 -4 5 -19 18 -22 28 -3 10 5 14 11 24 6 9 12 20 20 30"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 1611 1906 c 0 -13 -5 -30 2 -45 8 -16 11 -46 30 -47 19 0 16 -26 22 -36 6 -10 18 -5 21 -20 2 -15 -14 -23 -23 -35 -8 -12 -17 -16 -18 -32 0 -15 15 -40 15 -61 -1 -21 -16 -48 -21 -63 -4 -15 -2 -19 -5 -26 -4 -7 -6 -9 -9 -18 -3 -9 -4 -20 -8 -34 -4 -14 -11 -28 -13 -38 -3 -11 -8 -19 -4 -23 5 -4 13 -1 19 -6 5 -4 5 -18 13 -20 7 -3 10 5 17 2 7 -3 14 -8 23 -13 9 -5 25 2 37 -4 11 -6 17 -16 28 -23 11 -7 22 -11 30 -34 8 -23 14 -16 14 -27 -1 -12 -17 -12 -19 -22 -3 -9 -4 -12 1 -26 6 -14 27 -40 30 -57 3 -17 -7 -26 -15 -35 -8 -10 -24 -2 -29 -17 -6 -15 4 -48 0 -63 -4 -15 -19 -15 -23 -22 -3 -8 -2 -17 6 -17 8 0 15 18 26 17 11 -2 20 -15 26 -23 5 -8 7 -17 5 -24 -1 -6 -11 -8 -8 -17 2 -9 12 -16 20 -25 7 -10 11 -18 22 -25 11 -6 28 -19 42 -16 15 3 11 21 18 28 8 7 18 15 27 11 8 -4 20 -19 24 -28 4 -9 0 -15 8 -24 8 -9 22 -14 30 -26 8 -11 -7 -23 1 -32 8 -8 20 5 37 -5 16 -10 21 -4 32 -13 11 -9 18 -38 40 -36 21 2 3 19 23 19 20 1 22 16 32 15 10 -1 15 -21 15 -33 0 -11 -24 -6 -25 -17 -1 -11 5 -24 15 -24 9 0 5 21 13 24 8 2 12 -8 18 -15 7 -7 13 -17 19 -26"/>
-  <path fill="none" stroke="#BB90BB" stroke-width="14" d="M 1892 751 c 0 -4 4 -6 0 -11 -3 -6 -17 -18 -20 -21 -4 -4 2 -47 1 -51 -1 -4 -20 -20 -21 -23 0 -2 1 -12 -3 -17 -3 -4 -8 -4 -13 -2 -6 2 -10 16 -18 14 -7 -2 -9 1 -14 -12 -5 -12 -2 -30 -18 -29 -16 1 -17 26 -20 30 -3 4 -12 9 -21 11 -9 2 -20 5 -24 7 -4 1 -7 12 -7 16 0 3 -11 12 -15 9 -4 -2 -16 -9 -21 -12 -4 -3 -14 24 -14 27 0 4 11 14 10 29 -1 15 -14 14 -10 24 5 11 21 11 23 20 3 9 -13 14 -12 20 2 6 12 -4 19 -6 7 -2 16 -3 26 -4 9 0 8 7 15 6 7 -1 23 -9 26 -11 2 -1 24 12 47 9 23 -4 12 -16 15 -17 3 -1 6 0 11 -3 5 -4 7 -13 13 -16 6 -3 14 -1 20 -1"/>
- </g>
- <g id="staatsgr">
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M 2196 757 c -18 -18 -50 -33 -57 -56 -7 -19 -15 -65 -25 -77 -22 -9 -24 -16 -24 -39 -17 -24 -53 -33 -30 -65 l 0 -50 c 14 -25 29 -48 47 -70 4 -39 -15 -75 -17 -114 -4 -86 -48 -25 -94 -49 -21 -11 -23 -17 -48 -7 -4 -24 0 -43 -30 -43 -38 0 -39 -27 -78 -14 -35 -8 -32 12 -40 38 -9 9 -15 16 -23 26 -47 0 -96 -9 -146 -9 -52 0 -101 -24 -123 -73 -33 -3 -41 -32 -71 -31 -28 1 -25 25 -59 16 -22 -6 -34 -25 -58 -32 -36 -9 -48 -7 -71 -41 -15 -4 -36 -3 -49 -12 -17 -13 -12 -27 -41 -14 -42 -4 -17 -21 -40 21 -28 -7 -38 13 -59 7 15 -50 -15 -42 -47 -42 -30 -29 -46 -18 -56 17 -8 31 14 53 5 84 -6 26 -12 57 -15 85 42 32 -30 18 -45 12 -63 -23 -25 31 -56 52 -46 32 -30 41 -33 89 -2 46 -34 11 -57 7 l -5 -16 c -38 23 -55 15 -86 -16 -25 16 6 33 -31 51 -18 8 -29 19 -49 27 -38 -21 -71 -29 -114 -29 -40 0 -43 -17 -66 -43 38 -26 8 -33 -14 -60 -35 -6 -44 -25 -68 -48 -63 -13 -27 96 -35 132"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M 288 371 c -8 26 -3 44 -34 50 -17 81 -55 4 -98 -3 -20 -4 -26 -13 -45 -19 -29 34 -40 8 -35 57 3 28 -16 37 -12 66 7 47 -31 82 -64 111 -39 34 -58 12 -96 26 -35 14 -64 9 -90 42 -26 32 -35 29 -73 33 -4 5 -9 9 -12 14 -12 19 -38 51 -59 55 -20 61 47 62 59 112 8 30 26 38 50 59 18 60 52 61 0 121 -10 13 -8 13 -3 28 -34 45 -5 52 36 37 39 -15 45 47 54 69 -16 43 -44 69 -28 118 -40 65 -91 -14 -132 -36 -58 -33 12 -52 -20 -78 -5 -4 -10 -7 -14 -11 10 -45 -91 -38 -105 -12 -14 27 -2 21 -31 23 -59 2 -39 -64 -83 -53 -20 6 -17 2 -33 -3 -27 -7 -39 21 -58 -5 24 -60 -5 -15 -31 -5 -35 13 7 39 9 67 2 37 -111 -2 -137 4 -32 6 -54 3 -79 28 -25 3 -53 -5 -81 -2 -30 3 -58 -16 -70 28 -5 19 2 31 -24 36 -40 9 -88 -20 -94 37 34 25 -15 13 -29 17 -37 10 -26 44 -68 40 5 -43 -5 -30 -44 -21"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M -1286 1401 c -11 6 -17 11 -27 19 -6 0 -12 0 -18 0 -24 1 -44 3 -68 -7 13 -20 8 -25 -6 -41 -12 -14 -13 -12 -13 -30 l -34 0 0 -16 c 21 -8 26 -14 7 -31 -6 1 -12 0 -18 2 -11 3 -20 11 -33 12 -5 1 -10 -1 -15 -2 -16 -15 -22 -15 -42 -22 l -12 -14 c -18 0 -33 -4 -51 -4 -12 20 -15 24 -40 21 -23 -2 -26 -4 -41 -22 16 -14 17 -11 0 -21 -17 11 -7 7 -6 24 2 13 -4 21 -7 33 -5 27 18 36 18 63 0 18 -8 15 -18 26 -7 7 -11 20 -15 29 -5 3 -10 5 -14 9 -16 14 -27 38 -40 55 -6 2 -12 2 -17 4 -6 2 -9 7 -14 10 -9 6 -20 10 -30 14 -16 -5 -16 -5 -33 0"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M 1609 1905 l 33 -4 c 27 -26 67 -48 80 -85 14 -7 42 -22 48 -38 6 -16 -3 -42 25 -21 23 -14 54 -5 81 -5 58 0 6 -18 -5 -33 20 -15 56 -13 23 -31 -42 -22 56 -67 3 -70 -23 -1 -27 10 -21 -22 -41 -18 -19 -13 -17 -44 1 -29 3 -19 26 -36 0 -19 0 -34 -10 -51 -3 -4 -9 -7 -11 -12 -8 -18 4 -27 -3 -48 7 -20 17 -18 29 -2 19 -17 11 -8 31 -11 9 -1 60 -41 63 -50 3 -9 -2 -24 -3 -33 31 -22 42 -36 3 -57 2 -25 -3 -47 -28 -54 -25 11 -23 10 -45 -4 -15 -9 -93 -11 -64 -36 2 -19 -1 -17 15 -9 15 -15 22 -19 42 -26 -4 -36 24 -49 56 -35 19 9 29 8 48 14 9 42 26 63 68 37 6 -21 11 -38 23 -7 18 10 107 -10 125 -23 -14 -22 -11 -39 -21 -62 17 -39 -23 -40 -23 -72 66 -6 38 -42 49 -85 -16 -24 56 -40 7 -55 -9 -3 -21 1 -30 3 -2 -21 -9 -43 6 -57 l -16 -24"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M -1873 1512 c 4 -21 1 -19 19 -29 -3 -34 7 -34 19 -63 -25 -25 -40 6 -66 4 -28 15 -20 -15 -29 -39 41 -15 -3 -41 -11 -59 -32 -10 -29 -7 -46 -38 -14 -24 -14 -6 -37 -16 -25 -10 -16 10 -38 -6 -22 -16 -5 -16 -12 -42 -40 -18 -41 17 -51 45 -33 10 -68 14 -101 24 7 33 18 32 46 47 0 31 0 34 10 63 -25 19 -32 10 -49 41 -14 27 -48 37 -24 70 -3 26 12 30 5 63 11 14 22 23 32 38 -3 28 13 41 -16 59 19 30 33 1 59 15 20 12 19 15 45 18 26 22 29 14 58 22 8 40 -26 62 24 86 33 15 46 12 71 41 30 35 59 27 99 12 30 -11 -14 -74 54 -47 20 -28 15 -67 63 -62 12 17 10 28 29 38 59 30 -43 84 43 94 24 3 18 9 40 -5 32 -20 51 -14 72 14 59 23 -28 60 41 45 19 18 38 11 61 26 28 -12 38 -10 66 0 20 -9 27 -30 47 -45 3 -32 9 -69 28 -96 23 0 26 -3 31 -26 25 -8 57 -12 84 -19 25 -7 24 -7 45 10 39 34 43 -51 81 -20 38 30 36 -19 72 -2 27 13 34 4 57 29 23 0 20 -13 42 -15 36 -4 55 -33 92 -40 24 -5 61 -11 76 -26 l 18 -4"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M -724 1717 c 35 -12 49 -23 78 5 -24 15 -9 42 -45 42 -55 0 1 63 -7 91 28 23 23 37 59 26 42 42 7 50 21 90 55 12 30 11 48 52 12 26 110 66 134 64 33 -1 57 -9 82 19 41 -31 52 26 81 26 31 0 53 2 84 6 49 5 101 1 139 40 25 -9 40 5 66 -9 23 -12 25 -18 45 5 17 2 35 -4 50 0 22 6 43 19 63 11 46 20 94 36 146 26 43 -10 58 5 93 27 37 -8 68 -13 82 30 24 18 65 4 96 9 27 4 40 2 66 -9 37 18 28 28 74 19 16 24 33 69 33 9 0 -30 68 -24 77 -70 23 -11 39 -8 62 -15 6 -30 16 -101 56 -87 18 -23 27 -28 47 -2 15 -45 40 -41 82 -45 32 -3 51 19 83 10 42 -11 94 -30 120 18 28 0 36 -3 54 -26 -12 -53 45 -14 59 -54 30 0 50 15 80 -4 5 -3 10 -8 15 -10 34 -15 101 22 122 42 25 23 22 -24 9 -39 -36 -38 -21 -44 -26 -92"/>
-  <path fill="none" stroke="#DA251D" stroke-width="21" d="M 1604 1922 l 5 -17"/>
- </g>
- <g id="fluss" visibility="visible">
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 233 459 l 10 11 5 14 13 12 5 7 33 24 19 11 0 -14 0 -7 9 3 8 -1 7 -4 5 5 6 14 3 14 7 5 7 -3 4 -5 12 -4 8 5 9 12 7 18 2 7 1 3 -3 14 -2 7 2 7 16 9 14 5 13 3 11 6 7 -6 3 0 4 -5 5 -3 10 -5 11 0 7 8 7 9 10 5 14 -2 2 0 7 4 12 -4 9 -8 8 -4 5 4 -3 1 19 37 7 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 697 703 l 1 0 4 -6 2 0 7 2 22 4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 608 671 l 2 -1 12 3 9 7 5 12 26 7 7 0 28 4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 1449 555 l 16 -2 12 -1 10 5 4 10 10 12 17 7 23 2 14 -2 17 2 12 2 18 -2 12 2 23 -2 20 -3 14 -6 11 -3 12 0 3 0 9 -4 2 0 15 -7 11 6 14 10 8 17 2 6 4 8 1 4 6 12 3 9 14 20 12 18 21 22 30 25 20 15 14 11 4 2 3 1 23 6 28 1 20 5 13 2 10 -2 16 -6 15 3 18 3 24 -3 5 -2 21 -10 7 -7 5 -5 12 -2 9 -5 7 -14 10 0 14 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 733 703 l 7 5 11 21 12 5 7 14 20 15 14 4 7 -5 4 -9 7 -3 26 -4 22 -7 16 -3 9 -19 0 -14 15 -4 14 0 21 4 7 10 9 12 7 5 3 2 18 0 19 -3 17 7 9 8 5 6 7 0 3 -6 -1 -14 -2 -6 10 -7 16 -6 23 0 1 0 18 -5 20 -5 20 -4 17 -6 17 -13 11 -12 5 -5 7 -9 9 -15 1 -13 0 -8 -1 -18 0 -13 5 -9 15 -9 11 -14 7 -14 7 -3 8 0 6 10 5 6 3 3 7 0 7 -5 4 -2 1 -2 13 -7 12 -1 5 0 5 0 11 0 8 10 9 7 10 -3 4 0 7 -4 10 5 2 0 12 9 12 -2 2 0 9 -3 10 -2 2 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 233 459 l -4 2 -17 -7 -12 -12 -12 -10 -16 -11 -16 -3 -17 -2 -12 -12 -16 -4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="8" d="M 2179 739 l -6 -3 -15 -7 -11 -11"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 311 838 l 19 -5 9 3 7 0 8 -8 13 -9 7 -3 6 -7 6 -14 8 -9 19 -9 20 -7 5 -3 5 -5 3 -2 4 0 2 0 10 -2 16 -8 14 -6 7 -3 8 -7 25 -9 10 -5 14 -9 9 -8 1 -2 13 -4 6 -8 13 -9 5 -5 5 -4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -191 1040 l 17 17 2 4 3 5 2 12 2 7 10 3 6 14 5 16 -2 5 -2 5 6 14 0 4 0 12 -7 19 1 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -2173 1304 l -4 19 -5 17"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -884 1425 l 8 -12 14 -8 7 -13 2 0 7 -3 7 2 5 -4 4 -15 3 -6 10 -1 6 -6 10 -8 14 0 19 -4 14 -3 10 -9 2 -9 7 -3 11 -9 10 -8 3 -13 18 -10 7 -11 8 -10 7 -3 6 -6"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -2182 1340 l 0 2 -9 12 0 16 2 10 -4 14 -8 12 -7 19"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -1136 1533 l 10 4 7 0 12 1 23 -5 12 -3 12 -4 14 -2 12 -5 19 -7 11 -1 2 0 7 -7 19 -13 10 -10 5 -9 9 -3 12 -11 9 -8 10 -4 9 -5 16 -10 5 -2 7 -4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -1478 1557 l 6 -5 7 -7 9 -3 5 -2 21 -10 16 -2 19 -9 19 -7 16 -3 5 0 26 -4 14 0 9 7 8 9 12 3 11 6 7 0 10 -2 11 7 3 5 9 4 12 -4 16 4 12 5 8 3 4 2 10 -4 12 -3 13 -10 12 -4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -2246 1479 l 5 9 3 10 2 16 7 10 10 11 16 3 9 4 5 7 3 3 7 9 9 3 11 4 3 2 7 8 12 9 11 2 8 3 9 11 12 12 14 8"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -1652 1632 l 2 0 8 -9 14 -7 12 -8 11 -7 7 -4 1 -7 11 -5 3 -2 12 -5 9 -7 9 -1 17 0 16 7 0 1 12 2 12 -5 4 -7 5 -4 2 -1 7 -6"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -1652 1632 l 3 11 2 8 7 5 26 4 16 5 7 7 1 9 0 2 -5 10 -2 14 -8 9 -5 12 -13 12 -8 9 -4 10 -7 7 -14 10 -17 16"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 719 2138 l 7 -7 2 -2 7 -9 14 -5 5 -3 5 -9 9 -2 9 2 10 -5 9 -5 10 0 0 8 2 11 9 0 13 -4 14 -3 16 -4 14 4 16 -2 8 -9 7 -5 7 2 7 -5 5 -9 5 0 2 3 5 6 4 5 7 2 14 -7 8 5 4 5 2 2 5 7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 339 2138 l 0 1 8 2 9 -3 4 -7 5 -2 5 9 4 7 10 5 9 -2 1 0 6 5 7 2 10 -5 9 0 0 7 -4 10 5 2 7 -4 7 6 4 7 1 5 13 2 1 8 2 5 2 4 15 -2 7 2 14 3 13 -1 17 -12 14 -4 26 2 10 -5 12 1 11 7 28 -5 17 -7 19 0 12 -3 7 -6 2 0 3 0 7 2 6 -5 5 -14 5 -10 5 -7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 1810 178 l -1 2 -4 15 -7 16 -10 12 -11 14 -15 2 -14 -7 -2 2 -2 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 2147 718 l -1 -1 -7 -16 -4 -17 -7 -14 -5 -16 0 -19 -9 -9 -15 -8 -9 -14 0 -18 -9 -14 -15 -8 -12 -12 -4 -16 10 -16 0 -15 0 -18 0 -17 9 -14 11 -14 5 -16 12 -12 10 -14 2 -15 -7 -18 -2 -15 2 -18 -9 -14 -3 -17 -2 -16 0 -17 -5 -16 -7 -15"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 111 400 l -2 0 -8 11 -14 10 -18 5 4 14 3 18 0 17 -7 16 -6 15 1 16 4 17 -7 16 -5 17 -7 16 -14 9 -12 12 -11 14 -12 10 -14 11 -16 8 -15 5 -18 -1 -17 -2 -16 7 -15 7 -18 0 -17 5 -14 9 -15 7 -11 12 -10 14 -14 12 -16 5 -17 2 -18 2 -10 12 -7 15 -14 13 -12 10 -9 14 -17 3 -5 18 1 15 9 16 12 12 12 11 14 12 11 12 5 16 3 17 7 16 18 1 10 14 12 12 6 16 8 16 7 15 9 14 0 4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -686 1173 l 5 16 9 14 7 16 5 17 -4 14 0 2 -1 0 0 1"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M -2208 1425 l -4 4 -7 17 -8 14 -12 12 -7 7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="6" d="M 1402 2032 l 2 -7 15 0 16 7 17 -2 18 0 14 -9 15 -8 16 -6 17 0 16 6 16 7 13 12 16 5 16 3 12 13 14 10 0 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 1744 234 l -7 7 -10 5 -14 0 -14 -2 -14 0 -10 2 -12 7 -11 3 -10 0 -11 -2 -10 2 -11 4 -8 -4 -11 0 -10 2 -17 7 -30 5 -12 2 -14 0 -9 -2 -14 -2 -8 -1 -12 -6 -7 -1 -11 -2 -10 2 -11 1 -10 4 -5 3 -9 -1"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 1449 555 l -11 -7 -12 -5 -8 -7 -4 -4 -3 0 -6 0 -8 -1 -5 -7 1 -7 2 -12 5 -13 -3 -8 -9 -9 -5 -14 -2 -7 0 -17 -3 -7 -4 -7 0 -7 -3 -5 0 -7 -7 -7 -2 -2 -9 -5 0 -7 2 -14 -2 -16 -7 -13 -7 -4 -6 2 -7 2 -7 -4 -7 2 -9 2 -7 1 -10 -5 -16 9 -9 10 -10 9 -7 5 -9 0 -8 2 -7 3 -7 0 -7 -1 -11 -2 -7 3 -8 0 -6 -3 -10 0 -9 3 -10 -5 -16 -14 -10 -3 -11 0 -13 1 -11 6 -16 7 -17 0 -23 -2 -12 -7 -10 -10 -9 -2 -8 0 -7 2 -7 1 -2 4 -2 7 -5 5 -5 2 -9 3 -2 4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 733 703 l 2 -12 7 -7 -4 -6 -1 -7 5 -14 0 -10 -4 -5 -1 -4 -6 -10 2 -26 7 -21 9 -21 12 0 9 -5 0 -16 12 -5 14 -7 14 -2 8 -6 2 -13 -2 -17 -3 -12 -4 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 653 861 l 4 -9 8 -7 2 -10 5 -16 7 -5 0 -11 -3 -8 -2 -11 4 -17 0 -12 0 -19 1 -16 7 -12 11 -5"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 653 862 l 0 -1"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 311 838 l -10 2 -14 10 -25 30 -10 12 -5 10 -14 11 -12 2 -13 -4 -1 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 207 909 l -11 7 -7 2 -5 -2 -7 0 -2 11 0 8 -3 6 -3 7 -7 3 -9 5"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 153 956 l -2 2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 311 838 l -9 18 -5 17 -10 17 -9 11 -4 10 2 16 4 15 0 23 -2 17"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 175 1160 l -8 -2 -14 0 -12 0 -12 -2 -20 0 -15 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 262 1074 l -10 16 -12 14 -16 23 -19 15 -17 12 -13 6"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 175 1160 l -1 12 1 12 -1 9 -4 7 -3 6 -4 9 2 12 7 7 2 12 3 9"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 177 1255 l 2 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 64 1451 l 4 0 10 0 21 -1 31 -9 23 0 21 3 21 0 15 -1 16 -7 14 -4 14 -5 15 -2 18 -3 15 -2 11 0 15 -2 14 -3 25 -12 12 -9 14 -9 12 -8 3 -11 11 -5 10 -7 7 -7 12 -5 11 -5 10 -9 12 -10 9 -7 9 -2 12 0 12 -9 12 -1 23 0 14 -4 12 -3 12 -6 2 -1 17 -9 12 -5 12 3 12 2 11 -2 12 0 16 -2 10 -6 11 -4 8 2 12 7 14 3 14 0 9 -8 16 -2 10 5 12 -5 11 -4 6 0 2 0 9 -7 7 -12 5 -10 0 -2 -2 -21 -10 -14 -9 -7 -5 -3 -7 -7 -5 -4 -4 -5 -1 -7 -2 -3 -2 -4 -7 0 -7 2 -3 0 -4 -5 0 -5 2 -6 2 -3 0 -5 -2 -5 -2 -6 0 -3 2 -7 2 -7 3 -7 -1 -5 -4 -11 0 -10 0 -9 0 -10 -3 -11 -4 -8 -3 -4 -6 -3 -7 -5 -3 -7 -5 -6 -9 0 -14 -5 -8 -2 -9 -5 -11 -1 -8 -2 -9 2 -9 0 -7 -4 -5 -3 0 -7 -3 -7 -7 -4 -11 -3 -7 0 -7 0 -7 0 -8 -2 0 -2 -2 -3 0 -9 2 -10 -2 -9 0 -10 5 -9 4 2 8 0 7 -4 6 -7 1 -5 -1 -9 5 -3 0 -2 2 -10 1 -4 2 -3 5 -6"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -686 1601 l 0 -2 3 -14 11 -10 15 -5 19 -4 26 -3 20 -9 22 -9 26 -3 31 0 32 -2 43 4 37 0 33 3 15 2 12 -7 13 -2 7 4 10 0 12 -2 11 0 10 3 10 2 16 -3 9 -2 10 0 19 -2 11 -3 10 -9 11 -7 8 2 9 7 7 0 2 0 8 -6 7 -1 7 1 11 -1 17 -11 14 0 5 -3 9 -11 2 -8 3 -14 5 -11 2 -12 7 -5 0 -21 -4 -7 -5 -7 2 -12 -3 -7 -4 -10 -5 -18 -7 -5 -4 -10 -3 -11 -5 -8 -4 -7 4 -9 0 -10 0 -2 3 -11 9 -5 -2 -7 -10 -3 0 -11 -6 -7 -8 -14 -5 -13 -6 -20 -7 -8 -3 -4 0 -8 -2 -6 -12 0 -2 -7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -2083 1623 l 2 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -2083 1623 l 12 -3 26 3 31 4 23 10 28 -1 24 0 16 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -1136 1533 l -7 9 2 8 -6 13 -5 3 -3 12 1 7 6 9 8 16 9 12 10 17 4 12 2 18 3 20 5 14 4 13 0 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -884 1425 l 1 9 2 5 7 9 4 7 1 10 0 19 2 16 5 19 7 16 7 14 0 10 -2 11 -12 12 -8 15 -2 19 -5 16 -9 11 -10 12 -7 14 -4 14 -9 10 -12 9 -8 5 -6 10 -7 12 -10 4 -2 2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -2083 1623 l 7 7 0 11 5 12 14 17 17 13 16 15 5 16 7 10 11 5 8 9 11 12 7 12 10 9 7 7 4 9 -2 7 -2 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -1911 1802 l 21 -22 8 -5 14 -4 32 -21 19 -10 14 -14 12 -12 14 -9 17 -7 21 -7 19 -5 14 -9 9 -8 3 -7 2 -9 7 -10 12 -4 14 -3 7 -4"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M -1478 1557 l 0 2 3 7 5 5 5 11 6 7 10 0 5 8 5 13 -1 19 1 17 4 3 3 11 9 12 4 16 3 17 4 16 5 12 2 14 3 15 3 21 0 25 -1 17 -12 23 -14 15 -13 16 -10 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 1402 2032 l -9 -2 -7 -5 -1 -9 -9 -7 -10 -2 -7 -3 -4 -9 0 -2 -2 -10 7 -16 2 -15 -3 -14 -9 -12 -7 -9 -4 -9 -10 -12 -2 -10 -5 -12 -5 -7 -12 -7 -4 -4 -1 -3 3 -7 5 -12 -2 -14 -6 -16 -9 -14 -7 -12 -7 -17 -5 -14 -4 -16 -5 -26 -7 -16 -7 -10 -10 0 -7 -5 -7 -5 -11 0 -8 -7 -11 -13 -3 -15 3 -11 9 -7 0 -10 -4 -10 -1 -16 -7 -9 -4 -8 0 -11 7 -12 -1 -3 -7 -6 -2 -7 7 -5 17 -2 12 -3 4 -7 -2 -9 -10 -8 -7 -11 -4 -12 -3 -9 -7 -1 -2 -2 -5 -5 -4 -11 -1 -1 -9 -9 -7 -9 -12 2 -14 0 -9 -7 -12 -2 -10 9 -2 2 -16 7 -19 10 -12 2 -5 7 2 12 -4 7 -10 2 -9 3 -5 9 -9 8 -12 2 -12 4 -16 7 -3 12 -6 8 0 4 -8 5 -7 7 0 10 -7 6 -14 3 -7 5 -9 7 -8 0 -4 6 4 10 0 10 -7 11 -16 8 -14 4 -3 2 -13 5 -8 9 -9 0 -5 -7 -7 -4 -10 2 -7 5 -9 0 -12 -3 -14 1 -14 -7 -5 -10 -11 -7 -10 -5 -12 3 -11 2 -8 -5 -18 -2 -17 11 -7 8 -7 21 0 2 -10 14 -16 10 -16 5 -10 -5 -12 4 -18 -2 -12 0 -14 9 -10 7 -4 10 -14 2 -15 -2 -16 0 -15 5 -13 -2 -12 -3 -15 -2 -11 2 -14 5 -7 5 -8 2 -11 0 -12 5 -7 6 -7 5 -9 3 -8 2 -12 -2 -19 -3 -9 -5 0 -16 -4 -12 -10 -11 -11 0 -13 2 -11 9 -10 12 -4 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 339 2138 l -2 -6 -9 2 -12 0 -10 -12 -9 -14 -7 -3 -5 -2 -19 -5 -25 -16 -13 -7 -6 -9 -10 -8 -12 -12 -14 -9 -7 -12 -10 -2 -11 -2 -2 0 -8 -7 -6 -7 -3 -3 -9 -7 -15 -4 -9 -8 -7 -4 -10 -3 -4 -9 -3 -10 -11 -5 -17 -2 -18 -2 -13 -7 -11 0 0 4 5 8 4 7 0 16 -7 15 -11 13 -19 5 -15 0 -11 3 -10 2 -12 0 -21 9 -11 -2 -13 3 -11 -3 -9 -2 -3 5 -9 4 -10 -2 -21 -2 -16 -3 -12 0 -5 -5 -7 -2 -10 0 -7 -5 -6 -7 -6 -2 -9 -5 -7 -5 -5 -5 -14 -14 -16 -11 -12 -12 -10 -2 -9 -3 -2 0 -7 -5 -14 -4 -8 -2 -9 -10 -12 -2 -5 -7 -4 -5 -9 -12 -14 -17 -5 -4 -10 -7 -5 -9 -13 -6 -27 -2 -26 3 -32 0 -21 2 -27 3 -32 -1 -24 0 -10 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 719 2138 l -7 -2 -7 -2 -8 4 -7 0 -12 -2 -13 -2 -7 -7 -5 -10 0 -2 5 -10 7 -7 4 -9 -4 -7 0 -9 11 -5 19 -2 10 -3 2 0 7 -14 7 -10 3 -13 2 -8 0 -2 4 -14 0 -19 5 -14 5 -9 -2 -10 -5 -10 -3 -19 5 -25 5 -19 -2 -22 -7 -25 -3 -14 0 -5"/>
-  <path fill="none" stroke="#0093DD" stroke-width="5" d="M 339 2138 l -12 7 -11 15 0 9 -7 3 -15 2 -9 2 -2 0 -10 5 -11 0 -15 -7 -9 -3 -12 0 -16 3 -15 -2 -20 -7 -5 -6 -8 -2 -11 5 -7 0 -3 -2 -5 -5 -16 -7 -12 -7 -12 -7 -18 7 -10 0 -18 -2 -19 -3 -24 -5 -17 0 -14 -4 -19 -7 -13 0 -15 -3 -5 -4 -27 -1 -12 -2 -17 -5 -14 -6 -16 -5 -12 -8 -17 -6 -19 -3 -21 -2 -40 -7 -33 -7 -21 -5 -17 -5 -7 0"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 1402 267 l -16 -14 -12 -12 -8 -11 -7 -3 -11 1"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 950 373 l -3 7 2 6 3 6 2 8 -4 4 -8 5 -7 -2 -7 -5 -9 -7 -5 -2 -7 2 -4 4 -8 7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 811 475 l -5 -7 -7 -12 4 -10 8 -7 4 -13"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 207 909 l -9 -7 -7 -5 -10 0 -9 5 -9 -1 -12 -5 -10 -7 -18 -4 -15 5 -28 12 -11 7 -17 9 -10 7 -2 2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 40 927 l -7 7 -3 12 -4 19 0 19 2 12 5 14"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 47 1552 l -4 -12 -5 -16 -3 -20 1 -16 2 -23 9 -10 10 -2 7 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1923 1636 l 19 -2 10 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -672 1696 l -4 -13 -3 -13 1 -12 -3 -21 -7 -17 2 -19"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 236 1700 l -8 5 -14 2 -28 -2 -26 9 -14 0 -10 0 -7 -4 -11 -3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1103 1719 l 2 9 0 10 3 9"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -961 1735 l -12 10 -9 14"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M 728 1811 l 0 -10 -4 -13 -8 -10 -7 -21 -2 -12 2 -7"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1673 1792 l -2 2 -8 8 -4 6 -12 10"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1958 1797 l -2 5 0 11 7 8 7 2 5 4 2 3"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1925 1837 l 0 -10 2 -11 12 -12 0 -2"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -639 1858 l -7 -3 -18 -18 -10 -16 -14 -10"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -1449 1882 l -7 2 -14 10 -12 13"/>
-  <path fill="none" stroke="#0093DD" stroke-width="3" d="M -349 2051 l -7 -2 -14 -2 -12 2 -12 0 -14 0 -18 -3 -20 -6"/>
- </g>
- <g id="seen">
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 1983 1099 l 0 0 2 -11 3 -14 2 -12 2 -3 -2 -18 0 -5 2 -5 5 -16 5 -14 2 -20 0 -13 2 -10 6 -12 14 -7 4 -2 5 -2 12 -12 11 -1 10 3 4 14 3 16 0 13 -9 16 -14 19 -8 21 -14 16 -7 12 -2 10 4 12 -4 11 -3 7 1 7 13 10 7 4 8 3 7 14 7 7 0 9 0 3 -2 4 -7 5 -6 -4 -7 4 -4 5 -9 -2 -7 -3 -7 -4 -1 -10 -2 -9 -5 -1 -2 10 0 9 -5 3 -5 -7 3 -10 -2 -4 -8 -5 -4 -16 0 -12 2 -3 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 279 982 l 0 0 5 6 2 8 -2 12 3 14 2 9 -3 10 -2 9 -2 14 -3 9 -7 5 -9 -4 7 -8 7 -7 0 -9 -5 -7 -4 -7 0 -10 0 -11 -3 -5 -4 -9 2 -6 9 -4 3 -5 4 -4 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 74 1083 l 0 0 -16 5 -17 0 -2 0 -5 -10 -7 -5 -2 -9 -2 -9 -8 -3 -2 -7 10 -2 9 4 7 7 2 10 -2 7 5 3 9 0 9 6 12 3 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 93 1156 l 0 0 2 5 -13 2 -12 -2 -8 -10 -9 -7 -18 -5 -8 -16 0 -9 5 -5 9 5 7 11 8 2 7 8 7 7 11 2 12 7 0 5 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M -2133 1272 l 0 0 2 6 -5 7 -12 1 -9 2 -2 0 -7 11 -7 5 -12 -2 -10 -7 -7 2 -14 9 -9 -2 -5 -2 -2 -2 -1 -10 -6 -2 -7 7 -5 7 -17 7 -23 -9 -8 -10 -7 -11 -6 -7 -13 -5 -14 -12 -14 -2 -5 -116 20 5 11 -3 9 0 8 7 16 10 19 2 12 9 9 13 5 11 2 12 7 9 12 3 10 -2 9 6 5 10 18 9 13 5 9 7 4 5 8 -2 11 6 7 12 1 1 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M -960 1340 l 0 0 5 7 2 18 2 12 5 12 3 9 -1 7 -7 0 -5 -11 -7 -14 -2 -15 0 -14 5 -11 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 188 1993 l 0 0 0 2 6 2 -4 7 -9 0 -5 -5 -3 -2 -9 -4 -3 -8 -6 -5 -19 -6 -12 -12 -9 -3 -3 -2 5 -2 11 2 12 7 14 5 8 7 11 2 7 12 8 3 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 392 2089 l 0 0 -2 5 -9 2 -5 -2 -2 0 -5 2 -9 7 -7 -2 -7 2 -5 -4 2 -5 2 0 7 -3 10 -2 7 -3 7 -4 5 0 5 -3 6 -9 15 -9 7 -2 4 4 -4 7 -10 2 -7 5 -5 9 0 3 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 551 2113 l 0 0 7 0 6 9 -4 9 -3 3 -4 4 -8 -2 -16 3 -11 0 -5 -5 -10 -5 -14 0 -14 -2 -7 5 -12 6 -9 3 -8 -2 -4 -5 5 -9 9 -3 2 0 14 -5 12 -5 10 -4 11 5 12 0 7 6 5 5 9 0 7 -7 8 -4 5 0 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 177 1255 l 7 -3 7 5 7 10 6 8 0 10 1 9 5 4 6 2 2 5 -2 8 -9 -1 -8 -4 -4 -7 -5 -13 -1 -12 -8 -11 -4 -10 z"/>
-  <path fill="#C4E5FA" stroke="#0093DD" stroke-width="4" d="M 151 959 l -7 0 -7 5 -1 6 -6 6 -7 -1 -6 5 1 5 3 9 -3 11 -3 12 -3 16 -1 12 -2 8 -2 10 -5 7 -5 4 -3 7 3 5 9 -1 7 -3 10 -8 4 -13 3 -21 0 -20 3 -14 3 -7 3 -10 1 -7 6 -5 6 -5 2 -6 -3 -7 z"/>
- </g>
-  <g id="signaturen" visibility="visible">
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="-160" cy="1078" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="-160" cy="1078" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="592" cy="639" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="592" cy="639" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="1326" cy="653" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="1326" cy="653" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="1868" cy="1033" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="1868" cy="1033" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="603" cy="2108" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="603" cy="2108" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="1272" cy="1719" r="39"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="1272" cy="1719" r="28"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="-1142" cy="1537" r="45"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="-1142" cy="1537" r="32"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="-2110" cy="1315" r="45"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="-2110" cy="1315" r="32"/>
-   </g>
-   <g>
-    <circle fill="#1F1A17" stroke="#1F1A17" stroke-width="3" cx="1797" cy="689" r="59"/>
-    <circle fill="#FFFFFF" stroke="#1F1A17" stroke-width="3" cx="1797" cy="689" r="41"/>
-   </g>
-  </g>
- <g id="schrift" visibility="visible">
-  <text x="1716" y="562" fill="#1F1A17" font-weight="normal" font-size="140">
-Wien
-</text>
-  <text x="1020" y="600" fill="#1F1A17" font-weight="normal" font-size="140">
-St. Pölten
-</text>
-  <text x="1301" y="1680" fill="#1F1A17" font-weight="normal" font-size="140">
-Graz
-</text>
-  <text x="361" y="2028" fill="#1F1A17" font-weight="normal" font-size="140">
-Klagenfurt
-</text>
-  <text x="-143" y="1027" fill="#1F1A17" font-weight="normal" font-size="140">
-Salzburg
-</text>
-  <text x="484" y="574" fill="#1F1A17" font-weight="normal" font-size="140">
-Linz
-</text>
-  <text x="1356" y="975" fill="#1F1A17" font-weight="normal" font-size="140">
-Eisenstadt
-</text>
-  <text x="-1419" y="1702" fill="#1F1A17" font-weight="normal" font-size="140">
-Innsbruck
-</text>
-  <text x="-2222" y="1404" fill="#1F1A17" font-weight="normal" font-size="140">
-Bregenz
-</text>
- </g>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_cee.xml Deleted

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="150" height="164" viewBox="0 0 3756 4095">
-<g fill="#B7DDC8" stroke="#131516" stroke-width="3" stroke-linejoin="round" transform="matrix(1.0,0.0,0.0,1.0,2590.0,0.0)">
-		<g id="reg00" fill="none">
-			<rect id="reg00a" x="-2690" y="-100" width="4056" height="4395" fill="#EEEEEE"/>
-			<path id="reg00b" d="M -150 3333 c 0 0 6 -20 10 -22 2 -5 13 -28 13 -36 0 -10 -4 -25 0 -29 6 -2 21 -10 21 -17 0 -6 4 -23 10 -25 6 -2 29 -10 27 -14 -2 -2 -10 -27 -2 -23 6 2 29 2 29 -2 0 -4 -16 -19 -18 -23 -5 -4 -11 -9 -17 -9 -6 0 -2 -16 -2 -20 0 -5 8 -34 8 -40 0 -8 -6 -8 -8 -8 -4 0 -15 2 -15 2 0 0 -12 6 -14 0 -5 -2 -7 -13 -9 -15 -4 -4 -12 -10 -12 -8 0 4 -11 2 -19 0 -4 -2 -12 -4 -12 -2 0 2 -7 4 -11 0 -2 -4 -10 0 -10 0 0 2 -9 6 -13 2 -4 -4 -16 -2 -21 -2 -2 0 -14 -11 -16 -11 -4 0 -15 5 -19 0 -2 -4 -13 -8 -15 -4 0 0 -8 4 -10 4 -2 -2 -19 -4 -19 -4 0 4 -23 27 -31 27 -6 -2 -21 -10 -21 -14 0 -4 -4 -9 -10 -4 -6 4 -13 6 -11 10 0 2 -4 8 -6 8 -2 0 -8 0 -8 7 2 6 8 22 10 22 4 3 19 11 19 13 2 4 17 17 19 21 2 4 6 12 6 16 0 3 -2 13 0 15 0 2 2 19 10 19 7 0 15 6 19 14 0 9 15 17 21 19 6 4 17 6 17 13 0 6 4 12 8 12 6 0 14 8 17 13 2 2 18 2 18 6 0 8 11 21 9 21 -2 0 -13 2 -11 2 0 4 11 12 11 12 2 0 8 0 12 4 2 3 6 11 8 11 3 0 11 4 11 10 0 2 10 7 14 11 5 2 9 6 9 10 0 4 0 6 0 6 l 4 2 z"/>
-			<path id="reg00c" d="M -592 886 c 0 0 -27 4 -29 2 -4 -2 -2 -7 0 -11 2 -4 15 -2 17 -6 0 -2 10 -6 14 -2 5 0 0 4 3 4 2 0 8 2 8 6 0 4 -8 4 -8 4 l -5 3 z"/>
-			<path id="reg00d" d="M 0 294 l 29 -17 c 0 0 6 0 9 0 2 4 8 13 8 19 2 6 6 10 12 17 7 8 15 23 15 23 0 0 2 -3 6 -3 4 0 11 5 15 11 6 4 8 -8 8 -8 0 -3 6 -3 11 -5 2 -4 10 -12 10 -12 0 -2 10 -4 15 0 2 2 29 21 35 23 6 0 12 -21 12 -25 0 -2 7 -11 11 -11 6 0 10 -16 10 -23 0 -6 -4 -43 -4 -54 0 -8 4 -16 6 -16 2 0 13 -17 13 -21 0 -2 12 -9 21 -9 8 0 12 -4 12 -8 0 -6 21 -14 21 -14 0 0 4 25 4 27 0 4 27 2 31 2 5 0 19 23 21 25 4 4 4 10 4 14 0 7 -8 40 -8 40 0 0 4 2 8 2 3 0 11 -15 11 -19 0 -2 -2 -10 -2 -12 -2 -2 14 -15 14 -15 0 -4 13 -8 19 -8 2 -2 2 -11 -2 -13 -4 0 -2 -12 -2 -12 l 0 -2 c 0 0 2 -2 2 -4 0 -5 -19 4 -23 4 -2 0 6 -9 6 -15 0 -6 -6 -6 -10 -4 -4 0 0 -6 0 -10 0 -3 -15 -3 -19 -5 -4 0 -16 -4 -19 -8 -4 -4 9 -2 11 0 2 2 10 0 12 0 5 0 23 4 23 4 2 0 7 -8 11 -10 2 -2 8 -6 8 -11 2 -4 10 -12 17 -12 6 0 12 -8 12 -11 0 -4 -19 -8 -25 -12 -4 -2 -23 4 -23 4 0 0 9 -6 9 -8 0 -2 -5 -9 -7 -11 -4 -2 -10 5 -14 9 -4 2 0 -9 -2 -11 -2 -2 -15 9 -15 9 0 0 -4 -15 -10 -17 -7 -4 -23 17 -23 21 0 4 2 19 0 27 -4 4 -6 8 -6 4 0 -4 -7 -4 -7 -4 0 -2 -8 -6 -8 -6 0 0 12 -13 12 -15 0 -2 0 -4 0 -6 -2 -4 -20 8 -20 8 0 0 8 -10 10 -12 2 -5 -2 -7 -2 -7 0 0 12 -4 15 -6 0 0 4 -10 2 -14 0 -5 -5 0 -11 0 -6 0 -2 -7 0 -7 4 -2 0 -6 -4 -6 -4 0 -4 2 -8 6 -4 4 -9 2 -9 0 0 -4 -6 -6 -12 -2 -4 2 0 6 2 6 2 0 2 5 2 5 0 0 -4 -2 -10 -2 -2 2 2 10 2 10 0 0 -9 -4 -11 0 0 4 11 8 13 4 2 0 8 4 8 4 2 2 -8 4 -8 9 0 2 -2 6 -4 8 -2 2 2 10 2 10 -2 2 -4 7 -4 11 0 4 -7 2 -9 2 -2 -2 -2 8 -6 8 -4 0 0 -23 0 -27 0 -4 -4 -4 -6 -6 -4 -2 4 -6 6 -11 0 0 2 -6 0 -8 -2 -2 -2 -12 -4 -12 0 0 -9 12 -13 20 -4 7 -8 21 -8 23 -2 0 -8 11 -10 15 0 4 -7 6 -9 8 -2 2 -2 7 0 11 2 2 -2 8 -4 14 -2 4 -8 7 -10 7 -5 0 -2 -17 2 -21 2 0 0 -2 -2 -4 0 -3 2 -11 4 -13 0 0 0 -4 -2 -6 -2 -4 6 -17 8 -21 2 0 8 -4 8 -6 0 -2 5 -9 5 -9 0 0 0 -4 0 -6 0 0 -9 4 -9 4 0 0 -6 -4 -8 -4 -2 0 -2 11 -4 13 -2 0 -2 -9 -4 -11 -3 -2 -7 4 -9 4 -4 -2 -8 -10 -12 -10 -4 0 0 10 0 12 0 3 -7 0 -7 0 0 0 -2 0 -4 5 -2 4 4 4 7 6 6 0 8 10 8 10 0 0 -6 -2 -8 -4 -3 0 -5 2 -9 6 -2 7 0 13 0 17 2 2 -4 0 -8 0 -4 0 -15 13 -19 17 -2 4 0 6 2 6 2 0 -8 6 -10 8 -2 0 2 9 2 11 0 0 -2 2 -4 2 -2 0 2 6 4 8 0 0 4 4 0 8 -6 3 -11 -4 -11 -8 0 -6 -2 -8 -4 -8 -2 0 -10 6 -12 6 0 0 -9 2 -11 2 0 0 5 -2 5 -4 2 -2 10 -8 10 -10 0 -3 -10 -5 -13 -5 -4 -2 -8 0 -4 5 4 4 0 6 -2 6 -2 0 -4 -6 -4 -13 -2 -6 -10 -6 -15 -6 0 0 0 13 -2 13 0 2 -4 -5 -4 -5 l -2 30 c 0 0 -4 0 -8 0 -4 0 0 6 0 10 0 4 -9 4 -9 2 0 -4 -4 -6 -6 -2 -2 2 -2 4 -4 8 -2 2 -2 -10 -4 -8 -4 2 -6 10 -4 12 0 3 2 7 0 11 -2 6 8 14 8 19 0 2 -8 -2 -13 -2 -2 0 -2 4 -2 10 0 4 -14 15 -14 15 0 0 6 -9 6 -11 2 0 6 -37 6 -37 0 -2 4 -21 2 -23 -4 0 -10 12 -14 16 -4 2 -4 11 -4 19 0 4 -9 25 -9 25 0 0 4 -25 4 -29 0 -2 -6 -13 -8 -13 -4 0 -14 9 -19 13 -2 4 2 12 5 15 0 2 -5 6 -5 10 0 4 11 8 13 10 2 2 8 15 4 15 -2 2 -15 -13 -15 -13 -2 0 -8 -4 -8 -8 0 -2 -6 -17 -12 -12 -5 4 -5 10 -2 12 2 4 16 17 16 17 0 0 -10 -4 -14 -2 -2 4 -2 16 -2 14 0 -2 -3 -14 -5 -16 -2 -5 -6 -15 -8 -15 -4 0 -10 15 -10 19 2 6 4 12 0 12 -2 0 -5 -14 -5 -16 0 -2 7 -9 7 -13 0 -4 -2 -6 -4 -6 -5 0 -5 -4 -5 -6 0 -5 -6 -2 -8 -7 -6 -2 -6 2 -6 7 0 2 -4 2 -9 2 -6 2 0 6 3 8 2 2 -13 2 -15 2 -4 2 -2 6 -6 8 -4 0 -2 5 0 5 4 0 8 6 6 8 -4 2 2 2 2 6 0 2 -10 6 -10 11 0 4 2 2 6 2 2 0 6 0 6 4 0 4 8 2 8 0 0 -2 7 -13 7 -13 2 0 8 0 8 2 2 3 -2 7 -6 11 -2 4 -2 10 -2 10 l 0 2 c 0 0 14 -2 14 2 0 5 -6 3 -10 5 -2 2 8 8 8 8 -2 2 -8 -2 -12 0 -4 0 4 4 2 6 -2 4 -9 -2 -11 0 -4 4 -8 6 -8 4 -2 0 -10 -4 -17 0 -4 5 -6 23 -6 23 2 2 23 -4 23 -4 0 0 4 6 6 8 2 0 11 -8 11 -8 0 0 4 4 2 8 0 5 -6 7 -9 7 -2 0 -10 -2 -12 2 -4 4 -15 -4 -17 -6 -2 -3 -8 0 -12 2 -2 2 2 4 2 6 0 2 14 17 14 17 0 0 -18 -13 -20 -15 -2 0 -5 4 0 6 2 2 2 9 0 15 0 6 6 4 6 6 0 6 -4 6 -4 6 -2 0 0 17 0 17 0 0 -2 -6 -4 -10 -3 -3 -7 -13 -7 -17 0 -4 -2 -19 -4 -19 -4 0 -6 11 -6 13 0 4 -6 0 -6 -2 0 -3 -17 2 -17 4 -2 4 6 8 10 8 5 0 -2 2 -2 6 0 0 9 0 9 0 0 0 6 2 6 4 0 0 -8 0 -15 3 -4 0 -18 0 -25 0 -4 2 0 6 -4 10 -6 2 2 10 2 15 0 2 -10 2 -10 6 0 4 6 2 10 2 6 0 21 -8 21 -11 0 -2 13 7 13 7 0 0 0 4 -3 4 -4 0 5 -2 -4 -4 -4 0 -8 4 -4 4 4 4 -6 0 -10 0 -2 0 0 4 0 8 2 2 -4 4 -2 6 2 3 18 -2 20 -2 3 0 -2 5 -4 9 -4 4 0 16 -2 18 -2 3 -10 -10 -12 -14 -2 -2 -11 -6 -11 -8 0 -5 -6 -3 -10 0 -2 0 -8 4 -4 8 2 2 0 4 -4 4 -5 0 -15 15 -17 19 0 2 8 2 8 2 2 0 21 -4 21 -4 2 0 6 -2 6 2 0 2 7 0 9 0 2 2 4 10 4 12 -2 4 -4 -2 -4 -4 0 -2 -7 -4 -11 -4 -4 2 -2 12 -6 12 -4 0 -2 -10 -2 -12 0 -2 -21 4 -25 4 -4 2 2 11 4 13 0 0 -8 0 -10 2 -5 2 -9 2 -11 0 -2 -2 -8 6 -10 6 -4 0 -11 2 -13 4 0 0 15 11 19 13 4 4 -14 0 -19 0 -4 2 9 8 9 8 2 0 -13 2 -15 2 -2 -2 -4 2 -2 4 2 2 -8 2 -8 2 -4 0 2 4 2 7 0 2 10 2 14 2 2 0 0 8 -4 6 -6 0 -8 0 -12 4 -7 4 -9 -4 -11 -4 -2 0 -2 6 -2 8 0 2 0 9 0 11 -2 0 21 2 21 4 0 2 -21 6 -21 10 0 2 15 -4 19 -4 4 0 29 0 29 0 0 0 -17 4 -19 4 -4 0 0 6 -2 6 0 3 -6 3 -6 0 0 -2 -8 -4 -10 -4 -2 0 -27 7 -27 11 0 4 8 2 10 2 2 0 -2 10 0 12 2 2 8 2 6 7 -2 2 -12 -5 -14 -7 -2 0 -9 4 -9 9 -2 6 2 25 2 25 0 2 -6 2 -8 0 0 -5 -6 0 -8 0 -4 0 2 10 6 10 4 0 4 6 2 6 -2 0 8 0 8 2 0 5 -14 2 -16 2 0 -2 -4 -12 -9 -14 -2 0 0 10 0 12 0 5 -8 13 -12 15 -2 2 -6 8 -6 12 0 5 12 -4 12 -4 0 -2 4 0 2 2 0 5 2 9 4 13 0 4 15 -6 17 -6 0 -2 0 2 0 2 l -2 0 c 0 0 -27 18 -29 18 -2 0 4 -10 2 -12 -2 -2 -17 10 -19 12 -4 5 -21 11 -23 15 -4 2 -8 8 -4 13 4 4 10 -3 13 -5 2 -2 14 -12 18 -12 4 -2 23 0 25 2 2 2 -6 2 -8 0 -2 0 -19 2 -23 4 -2 2 -6 6 -6 8 0 3 -9 7 -11 9 -2 2 -8 8 -8 12 0 2 2 2 6 4 4 3 0 5 -2 5 -2 0 -8 0 -10 -2 0 -5 -4 -9 -6 -9 -3 2 2 6 2 11 0 2 6 4 8 4 4 4 4 12 -2 14 -4 2 -2 -8 -2 -8 0 0 -4 -6 -9 -6 -2 -2 -4 -11 -6 -13 -2 0 -2 7 -2 9 0 2 -4 2 -6 2 -4 0 -6 0 -4 6 0 4 -2 2 -4 0 -3 0 -9 0 -9 2 -2 2 0 4 -2 8 -6 5 -8 5 -8 11 0 4 -2 2 -2 2 -4 0 -7 2 -9 6 -2 0 -14 8 -14 15 0 2 6 -2 10 0 4 4 -6 8 -8 8 -4 0 -8 0 -11 4 0 2 -8 2 -10 4 -4 2 4 2 4 5 4 2 -12 6 -12 8 0 2 25 -6 27 -4 2 0 -6 6 -11 6 -4 2 -4 8 0 12 2 3 2 11 5 15 0 4 14 -6 16 -8 4 0 17 -2 17 -4 0 -3 4 -9 10 -9 7 0 13 -14 13 -16 0 -3 -6 -3 -9 -3 -4 0 5 -4 9 -6 4 0 14 -6 14 -10 0 -2 7 0 7 2 -5 2 2 2 4 4 2 2 -13 10 -17 13 -4 2 -4 8 0 4 6 0 13 4 13 6 0 2 -11 6 -15 6 -4 2 -25 13 -27 13 -2 2 4 10 4 14 0 4 -8 2 -10 0 -2 -2 -4 0 -11 0 -4 0 -6 -4 -8 -4 -2 0 -4 4 -6 6 -4 2 0 7 -4 7 0 0 -9 6 -11 2 0 -2 6 -9 6 -13 0 -4 -4 -6 -6 -8 -2 -2 0 -6 0 -11 0 -6 -8 -2 -10 -2 -2 2 -7 5 -15 5 -8 0 -6 6 -2 6 4 0 2 4 -2 4 -2 0 0 4 2 8 2 2 -10 2 -10 2 -2 0 0 -12 -2 -12 -5 0 -13 -2 -15 -2 -2 2 4 8 2 10 -4 2 -10 -2 -12 4 -5 7 4 11 6 13 2 0 -4 2 -4 2 0 0 -5 2 -5 4 -2 2 -12 -6 -16 -6 -2 0 -4 4 -4 8 0 4 4 11 6 11 2 2 8 4 8 4 0 0 -6 2 -6 4 0 4 6 10 0 6 -8 -4 -13 -14 -13 -16 0 -3 -4 -9 -4 -11 0 -2 -6 -6 -10 -6 0 0 -4 -4 -4 0 0 0 0 6 2 6 2 0 6 11 8 13 2 2 2 12 4 16 0 2 13 13 13 13 -2 2 -17 -11 -17 -13 0 -6 -2 -10 -6 -14 -2 -4 -13 -2 -13 -2 -4 0 2 -7 0 -7 0 0 -10 5 -14 5 -4 0 -4 -7 -6 -11 0 -2 -9 -2 -11 0 -6 0 -6 2 -8 8 0 5 10 9 12 13 2 2 -6 0 -10 0 -2 0 -2 2 4 6 4 4 13 4 13 2 0 -2 14 -2 16 0 4 0 -10 4 -12 7 -2 2 16 0 18 0 3 0 11 -5 13 0 2 2 -10 4 -13 4 -4 0 -20 2 -20 6 0 2 14 6 14 6 0 2 -14 0 -16 -2 -3 0 -11 -8 -11 -8 -2 4 -8 4 -8 2 0 -2 -2 -6 -4 -6 -5 0 -13 -2 -15 0 -2 2 -10 -2 -10 0 -2 0 -9 -5 -11 0 -2 4 4 8 4 8 15 0 5 4 -2 4 -6 0 0 4 7 4 6 0 18 2 20 4 2 0 7 11 7 13 0 4 14 8 16 10 2 2 0 5 -6 2 -4 -2 -10 -2 -10 3 -2 4 0 8 6 12 4 4 -6 2 -11 2 -4 0 -6 2 -8 2 -4 0 6 -14 6 -16 0 -3 -2 -11 -2 -15 0 -4 -2 -10 -4 -10 -4 0 -8 -3 -12 -3 -7 3 -2 25 -5 25 -4 0 -8 -18 -8 -20 -2 -2 -12 8 -17 8 -4 0 -4 4 -4 8 0 4 13 15 13 15 0 0 -13 0 -21 0 -8 0 4 -8 4 -13 0 -2 -8 -2 -10 -2 -4 0 -7 -4 -11 -4 -6 0 2 11 0 13 -4 4 -8 -7 -10 -9 0 -4 -4 -10 -8 -10 -3 0 -3 6 -5 10 0 2 9 7 11 9 2 4 -11 4 -13 8 -2 4 4 6 7 6 2 0 10 -4 12 0 2 2 10 4 17 4 4 0 2 5 10 7 6 2 25 4 29 4 4 2 7 2 4 4 -4 2 -14 2 -16 2 -4 -2 -13 2 -15 2 -2 -2 -4 -6 -10 -8 -4 0 -13 -6 -17 -9 -4 -2 -12 3 -17 5 -4 4 -8 12 -8 12 0 0 -6 -8 -6 -6 -4 0 -4 10 -4 12 0 5 4 5 12 5 6 0 9 8 9 8 0 0 -9 -2 -11 -2 -4 2 6 8 8 8 3 2 11 6 11 6 2 -2 10 0 10 0 2 2 7 2 7 5 0 4 -7 2 -7 0 -2 0 -8 -3 -12 -3 -2 0 -15 -4 -17 -4 -2 -2 -14 -2 -14 4 -3 5 10 5 14 7 4 4 -6 4 -8 4 -4 0 -13 2 -13 6 0 4 15 6 15 6 0 2 -2 9 0 11 0 4 10 4 12 2 2 -2 13 0 15 0 2 0 17 4 21 4 2 0 8 6 12 4 4 -2 21 -27 23 -27 2 2 -10 17 -10 19 0 2 6 6 12 6 9 2 9 2 4 4 -4 4 0 4 3 4 2 0 10 -4 14 -4 4 0 2 -6 2 -12 0 -4 15 -17 15 -17 0 0 -2 4 -4 8 -5 7 -5 17 -5 19 3 2 17 6 13 6 -4 0 -13 0 -13 3 0 4 -4 8 -6 6 0 -4 -10 -4 -14 -2 -2 0 2 8 2 10 0 4 4 15 4 15 0 0 -11 -7 -13 -9 -2 -2 -6 -2 -6 -2 0 0 4 -8 4 -12 0 -4 -2 -9 -4 -13 -2 -2 -12 -4 -17 0 -4 4 -8 4 -10 4 0 0 -8 -4 -10 -6 -5 -2 -23 -6 -27 -6 -3 0 -11 2 -13 6 -4 4 -8 -4 -8 -6 0 0 -4 0 -9 0 -2 0 -6 -6 -6 -13 0 -2 -4 -2 -6 0 -4 5 0 7 0 7 2 2 4 8 4 10 0 4 2 8 0 8 -2 0 2 3 4 9 0 6 21 0 21 2 0 0 -8 2 -10 4 -2 4 2 15 0 17 -2 0 -9 -9 -9 -11 0 -2 -6 -8 -8 -8 -2 2 0 10 0 15 0 2 6 12 8 14 2 2 17 -8 19 -8 0 -2 6 -2 6 0 0 0 -10 6 -10 6 0 0 0 4 -4 4 -4 0 -7 4 -7 9 0 2 7 8 11 4 4 0 8 -15 12 -15 5 0 0 6 -4 13 -2 6 -14 8 -16 8 -3 -2 -7 -15 -9 -10 -2 4 0 14 -4 16 -4 0 0 4 0 4 0 0 -4 5 -4 7 0 2 8 8 10 8 0 2 9 -6 11 -8 4 -2 6 -2 4 -2 0 2 0 6 4 6 0 0 0 4 -4 6 -2 0 -6 2 -6 4 0 2 10 -2 10 0 0 2 0 11 -4 11 -2 2 -13 0 -15 2 0 2 -6 4 -4 10 0 4 8 0 8 0 0 -2 11 -6 13 -4 2 0 8 -8 8 -13 0 -4 7 -10 11 -10 4 0 8 -8 8 -12 2 -5 17 -5 19 -5 2 0 10 0 14 0 5 0 9 -8 11 -6 4 0 8 8 8 8 0 0 -8 -2 -14 3 -7 4 -17 25 -17 25 0 0 -4 -5 -4 -7 0 -2 8 -16 8 -18 0 -3 -10 4 -15 4 -2 0 -4 0 -4 4 -2 2 -8 8 -10 10 -2 2 -2 9 2 9 6 0 -6 0 -6 2 0 2 -2 8 -7 8 -2 0 -2 4 -4 6 0 2 -10 4 -12 4 -4 0 -6 5 -6 5 2 0 12 6 14 8 2 2 15 0 15 0 4 0 6 0 6 0 0 0 -10 6 -13 6 -2 2 -6 2 -10 2 -4 0 -12 2 -12 4 2 5 4 7 0 7 -7 2 -7 -2 -11 -2 -2 0 -2 4 -4 8 -2 4 -6 0 -6 -2 0 -2 -7 -6 -7 -6 -2 0 -8 6 -10 10 0 4 0 8 2 10 0 3 0 9 2 13 2 2 6 2 6 2 0 -2 7 2 7 4 0 0 2 -12 4 -14 4 -5 2 14 4 18 0 2 13 -6 13 -8 0 -2 -5 -6 -5 -6 -2 0 -4 -4 -2 -4 2 0 2 -7 7 -7 2 0 -3 7 2 7 4 0 4 2 2 2 -2 0 0 6 4 6 4 0 14 -15 14 -17 0 0 7 -8 7 -2 0 4 6 4 6 4 0 0 -10 5 -13 9 -2 2 -10 10 -14 12 0 0 6 4 8 6 2 5 -8 9 -10 13 -2 4 -11 2 -13 6 -2 2 2 13 2 15 5 4 19 2 19 2 0 0 -6 4 -8 4 -4 0 -6 10 -6 10 0 0 -11 -10 -13 -14 -2 -4 -10 4 -12 4 -3 0 -3 -10 -5 -12 -2 0 -4 12 -8 16 -2 6 0 29 2 34 4 4 13 14 19 22 4 7 21 21 25 21 6 4 17 0 21 0 0 4 -13 9 -17 11 -4 6 2 12 4 14 2 2 11 -8 11 -10 0 0 4 -2 8 2 4 2 -8 10 -6 10 2 0 10 -2 14 0 4 0 -2 7 -4 9 -2 0 15 2 17 2 2 2 16 0 21 0 4 0 16 -4 16 -6 0 0 7 -3 11 -3 2 3 37 -25 41 -25 7 -4 11 -10 11 -12 0 -2 6 -6 14 -10 7 -5 2 -11 2 -11 0 0 7 2 11 2 4 0 8 -8 4 -10 0 -4 10 -6 17 -6 6 0 8 -15 8 -15 0 0 6 4 6 6 0 4 4 6 4 6 3 0 13 -6 15 -6 2 2 8 -6 8 -6 0 0 7 -15 7 -10 0 4 6 -5 8 -13 2 -10 -4 -17 -6 -21 -2 -2 2 -12 2 -16 0 -3 2 -11 4 -9 0 4 2 13 2 17 0 2 4 -4 6 -8 4 -3 0 -9 -2 -15 0 -8 11 -15 11 -17 2 0 10 11 8 13 -4 0 -6 -9 -8 -4 -5 2 -5 16 -2 18 2 0 2 13 0 17 -5 4 -5 23 -3 25 3 0 3 4 3 4 -3 0 2 4 2 11 0 6 10 10 14 10 4 0 4 8 4 8 0 0 5 2 5 2 0 0 8 9 10 15 6 6 12 -2 15 -6 2 -2 8 -19 8 -21 0 -4 0 -25 0 -31 0 -4 2 -13 4 -17 2 -2 6 -10 6 -15 0 -2 0 -14 0 -18 0 -4 15 -13 17 -13 2 0 21 -8 21 -14 2 -5 6 -17 8 -25 4 -5 0 -40 -6 -46 -4 -4 -4 -15 -4 -15 0 -2 6 -29 6 -35 0 -6 19 -17 25 -17 4 0 2 -14 2 -21 0 -4 -19 -12 -21 -16 -4 -5 6 -27 6 -27 0 0 13 -23 13 -30 0 -6 -4 -20 -6 -23 0 -2 -7 -6 -7 -12 0 -2 5 -15 3 -17 -3 -4 -9 -21 -7 -21 4 0 13 -10 11 -12 -2 -4 -4 -17 -2 -21 0 -4 -5 -17 -5 -17 0 -2 5 -14 9 -14 6 -4 6 -8 6 -17 0 -4 6 -21 15 -29 8 -8 18 -21 23 -25 4 -6 25 -12 27 -10 6 2 12 8 12 8 0 0 11 8 13 6 2 -4 14 -41 14 -46 0 -6 -16 -18 -16 -18 0 0 37 -32 39 -36 0 -4 4 -27 6 -31 4 -4 4 -40 4 -44 0 -4 11 -14 11 -19 -2 -4 -4 -35 0 -35 4 0 14 -12 21 -15 4 -4 21 -6 23 -12 0 -6 -5 -23 0 -29 6 -4 23 -17 23 -21 0 -2 10 -15 14 -17 4 -2 8 -16 8 -25 0 -8 -8 -37 -4 -41 0 -7 15 -11 15 -11 0 0 8 -29 10 -33 0 -2 23 -25 27 -25 2 0 17 12 21 10 4 0 15 -12 15 -12 0 0 -4 -9 -4 -15 2 -2 12 -39 16 -37 4 2 23 10 25 10 4 0 17 2 21 6 2 7 21 11 27 9 4 -7 11 -15 11 -15 0 0 -11 -4 -11 -4 0 0 4 -19 4 -19 0 0 15 4 15 0 0 -2 -13 -6 -13 -6 0 0 -2 -23 -2 -23 0 0 15 -4 17 -2 2 2 25 29 25 29 l -27 -31 z"/>
-			<path id="reg00e" fill="#DDDDDD" d="M 106 1567 c 0 0 -10 -4 -6 -9 0 -4 8 -16 8 -18 -2 -2 -6 -13 -8 -13 0 0 -21 -10 -21 -10 -2 0 15 -2 15 -6 0 -5 0 -13 0 -13 2 0 12 10 12 6 0 -6 4 -6 7 -6 2 0 8 -15 14 -15 6 0 8 3 17 3 6 0 14 -3 16 2 5 6 15 6 15 10 2 4 -15 10 -17 13 -2 4 -8 12 -14 14 -4 0 -6 6 -11 4 -6 -2 -16 7 -16 9 0 2 -4 16 -4 18 0 2 -9 11 -9 11 l 2 0 z"/>
-			<path id="reg00f" fill="#DDDDDD" d="M 423 1581 c 0 0 -10 7 -13 7 -4 0 -18 -2 -22 -2 -7 0 -13 4 -17 -3 -4 -4 -19 -16 -23 -20 -6 -5 -13 -5 -17 -2 -6 2 -23 2 -29 -3 -4 -2 -12 -6 -19 -2 -6 7 -12 7 -14 7 -2 0 -9 8 -11 10 -4 2 -16 6 -16 6 0 0 -4 -14 -2 -21 4 -8 6 -14 2 -20 -2 -7 2 -13 4 -17 0 -2 4 -10 -2 -10 -4 0 -9 -3 -9 0 0 4 -8 14 -14 14 -6 0 -2 -8 -8 -10 -3 0 -13 -4 -13 -4 0 0 -6 -17 -6 -19 0 -2 -13 -15 -9 -21 0 -4 15 0 15 -2 0 -4 -4 -4 -8 -4 -4 0 -9 0 -9 -4 0 -5 -4 -15 -2 -17 4 -2 11 -6 2 -6 -8 -2 -4 -11 -2 -13 4 0 0 -6 0 -8 0 -4 -2 -9 0 -9 4 0 13 -2 17 -4 2 -4 10 -2 12 -4 3 -2 -2 -4 0 -6 3 -2 15 -6 15 -11 4 -4 8 -6 10 -6 3 0 9 2 13 0 4 -2 8 -10 10 -10 0 0 9 6 13 4 6 -4 8 -6 12 -2 2 2 11 0 11 -8 0 -9 0 -15 2 -13 2 2 8 10 10 6 2 -2 -4 -10 2 -10 5 -2 2 8 7 8 4 0 8 -4 10 0 4 0 2 -4 6 -2 4 2 9 11 13 11 4 0 21 2 23 6 2 2 10 4 14 4 4 0 25 0 29 -2 7 0 11 0 15 0 4 0 8 0 10 -2 5 -2 7 -9 7 -9 l 0 3 c 0 0 8 14 8 14 0 0 -6 11 -8 13 -2 2 -7 12 -7 16 0 4 -6 15 -6 15 0 0 4 10 6 14 3 9 0 17 0 17 0 2 7 15 9 19 2 0 0 10 -4 12 -2 0 -11 13 -11 17 0 4 2 17 9 19 6 2 12 -9 18 -2 7 6 17 23 17 23 0 0 -15 8 -19 6 -4 -4 -19 -21 -19 -21 0 0 0 10 3 17 2 8 -5 14 -7 16 -2 0 -6 11 -6 13 0 2 0 12 0 12 l -2 0 z"/>
-			<path id="reg00g" fill="#DDDDDD" d="M 133 1471 c 0 0 -10 -2 -10 -6 0 -7 0 -13 -2 -13 -4 0 -15 4 -17 2 0 -2 -8 -10 -4 -10 4 0 19 2 19 -2 0 -2 10 -15 14 -11 5 7 9 11 13 11 4 0 12 4 12 8 2 2 -2 4 -6 4 -4 0 -12 4 -12 9 0 4 -2 8 -7 8 z"/>
-			<path id="reg00h" fill="#DDDDDD" d="M 423 1581 c 0 0 -10 7 -13 7 -4 0 -18 -2 -22 -2 -7 0 -13 4 -17 -3 -4 -4 -19 -16 -23 -20 -6 -5 -13 -5 -17 -2 -6 2 -23 2 -29 -3 -4 -2 -12 -6 -19 -2 -6 7 -12 7 -14 7 -2 0 -9 8 -11 10 -4 2 -16 6 -16 6 0 0 2 25 2 29 0 5 2 40 2 40 0 0 -13 6 -13 8 0 5 0 9 0 7 0 0 -12 -2 -12 -2 0 0 -19 8 -21 8 -4 -4 -10 -8 -15 -8 -6 0 -8 -7 -8 -15 0 -6 -12 -23 -25 -33 -8 -9 -19 -15 -19 -17 0 -4 5 -15 2 -15 0 0 -10 7 -16 11 -6 4 -19 6 -25 6 -4 -2 -13 10 -13 13 0 6 -10 20 -10 20 -2 0 -8 7 -8 11 2 4 2 35 -9 39 -10 5 -14 27 -14 30 0 2 0 56 0 56 0 0 35 -25 39 -29 4 -7 25 -25 34 -21 8 6 39 4 39 6 0 2 6 8 8 8 5 0 19 5 19 7 2 4 11 8 15 4 6 -6 21 -4 25 -2 6 2 27 0 29 -4 4 -7 23 -3 23 -3 0 0 12 3 17 3 4 0 39 4 43 10 9 4 36 12 38 17 4 4 8 20 12 23 7 0 32 10 32 10 0 0 20 -17 20 -17 0 0 19 2 19 2 0 0 23 -23 27 -27 4 -6 17 -16 17 -16 0 0 -4 -23 -4 -32 0 -4 -7 -14 -9 -18 -4 -2 -8 -13 -8 -17 0 -6 -8 -10 -8 -10 -2 0 -15 0 -13 -5 0 -8 23 -37 23 -39 0 -6 -52 -36 -52 -36 l -2 0 z"/>
-			<path id="reg00i" fill="#DDDDDD" d="M 413 1796 c 0 0 -9 25 -7 27 2 4 11 2 4 21 -10 19 -16 17 -20 17 -5 2 -5 12 -7 16 -4 4 -16 23 -20 29 -3 7 -5 36 -7 40 0 6 11 6 13 8 0 2 0 21 0 25 0 7 -2 9 -9 7 -6 0 3 -13 -8 -13 -6 -2 -17 19 -17 19 0 0 -12 -11 -20 -6 -9 4 4 12 4 16 -2 6 -13 0 -17 0 -6 0 -6 9 -6 13 0 2 -4 8 -8 6 -3 -2 -11 -4 -15 -4 -6 0 -15 -4 -21 -6 -4 -3 -6 14 -10 14 -2 0 -11 0 -11 -2 0 -2 -12 -4 -12 -4 0 0 -2 -21 -2 -25 0 -4 -38 -29 -44 -33 -2 -3 -15 -3 -15 -3 0 0 -2 -14 -2 -16 0 -4 13 -21 13 -23 0 -2 0 -15 -4 -25 -7 -8 -21 -4 -30 -4 -8 0 -35 2 -41 -2 -9 -2 -31 -19 -31 -19 0 0 0 -6 -3 -8 -6 -3 -6 -5 -4 -7 0 -2 -2 -14 -2 -18 0 -5 -2 -15 -6 -21 -4 -7 -2 -15 -2 -19 0 -6 -6 -29 -6 -29 0 0 35 -25 39 -29 4 -7 25 -25 34 -21 8 6 39 4 39 6 0 2 6 8 8 8 5 0 19 5 19 7 2 4 11 8 15 4 6 -6 21 -4 25 -2 6 2 27 0 29 -4 4 -7 23 -3 23 -3 0 0 12 3 17 3 4 0 39 4 43 10 9 4 36 12 38 17 4 4 8 20 12 23 7 0 32 10 32 10 z"/>
-			<path id="reg00j" d="M 23 1904 l 12 9 0 -2 c 0 0 5 0 15 0 8 0 8 -11 8 -15 0 -4 -4 -13 -4 -15 0 -2 9 -12 9 -12 0 0 22 17 31 19 6 4 33 2 41 2 9 0 23 -4 30 4 4 10 4 23 4 25 0 2 -13 19 -13 23 0 2 2 16 2 16 0 0 0 5 0 5 0 0 -12 8 -12 8 -2 0 -15 4 -19 2 -4 0 -29 8 -35 4 -9 -4 -29 -2 -32 -2 -4 0 -25 -2 -25 -2 l -8 0 c 0 0 -25 -4 -27 -6 -4 0 -29 -2 -29 -2 0 0 4 -13 6 -13 2 0 13 0 17 -4 4 -2 6 -10 2 -8 -6 0 -4 6 -9 4 -6 -2 -10 -4 -12 -6 0 -2 -2 -30 2 -30 4 0 23 0 29 -2 7 -2 19 -18 19 -18 l -2 16 z"/>
-			<path id="reg00k" fill="#DDDDDD" d="M -404 2013 c 0 0 6 4 10 4 4 0 15 -9 19 -9 6 0 21 -6 25 -6 2 0 19 -6 29 -6 11 2 25 -10 31 -10 5 0 15 -3 17 -7 4 -2 27 -27 35 -27 7 -2 23 -6 30 -12 2 -7 39 -13 48 -15 8 -2 33 2 39 4 6 4 21 15 21 17 0 0 -23 -17 -23 -10 0 6 6 6 8 22 0 15 13 21 19 21 6 0 27 0 38 -6 14 -8 14 -6 14 -4 0 4 -27 10 -27 17 0 4 6 6 13 2 8 -2 16 -9 20 -15 3 -4 9 -8 9 -8 0 0 25 2 29 2 2 2 27 6 27 6 l 8 0 c 0 0 21 2 25 2 3 0 23 -2 32 2 6 4 31 -4 35 -4 4 2 17 -2 19 -2 0 0 12 -8 12 -8 0 0 0 -5 0 -5 0 0 13 0 15 3 6 4 44 29 44 33 0 4 2 25 2 25 0 0 0 21 2 23 2 4 25 41 25 39 0 0 10 19 10 19 l 2 -2 -4 46 c 0 0 -2 23 -4 25 0 4 -8 6 -12 8 -5 0 -13 6 -15 11 0 4 -4 16 -4 16 0 0 -6 9 -9 13 0 4 28 16 32 16 4 3 4 11 4 17 -2 4 -6 11 -4 13 4 4 4 14 4 14 0 0 -4 0 -6 0 -2 0 2 9 2 13 0 2 -2 8 0 12 4 2 10 11 10 17 0 6 27 31 31 37 2 7 -4 7 -8 11 -2 4 17 16 19 21 4 4 -4 18 -4 23 0 6 -17 10 -27 16 -11 4 -28 27 -28 27 -2 2 -35 46 -41 52 -9 5 -6 15 -6 19 0 2 -3 8 -9 8 -6 0 -2 5 2 5 4 2 7 12 7 18 0 2 6 9 8 11 0 2 -2 4 -11 2 -6 -2 -16 -2 -16 -2 0 0 -13 -2 -19 -6 -4 -3 -15 -11 -17 -13 -4 0 -20 -4 -25 -2 -4 0 -8 -8 -12 -8 -4 -2 -15 -2 -15 0 0 2 -6 4 -10 2 -6 -2 -11 -4 -15 -4 -4 0 -8 -3 -12 -3 -4 0 -11 9 -11 9 0 0 -4 -4 -6 -4 -4 -2 -8 0 -12 2 0 6 -15 8 -23 8 -9 2 -15 -10 -15 -12 0 -3 -6 -11 -10 -15 -5 -6 -9 -6 -11 -4 -2 0 -12 10 -12 14 0 5 -15 13 -17 13 -2 0 -6 -4 -6 -4 0 -2 -13 -7 -13 -7 0 0 -2 -12 -4 -16 -2 -2 -10 -11 -12 -15 0 -2 -9 -4 -9 -8 -2 -2 -10 -8 -14 -8 -4 -3 -15 -3 -15 -7 0 -4 -6 -6 -10 -4 -4 2 -11 -4 -13 -10 -4 -4 0 -13 0 -17 0 -4 -10 -2 -12 -2 -4 0 -11 -4 -15 -6 -6 -4 -21 -17 -25 -17 -2 -2 2 21 2 25 0 4 -6 6 -10 6 -4 0 -9 7 -11 9 -4 2 -12 2 -16 2 -7 0 -9 -2 -9 -9 0 -2 -4 -8 -8 -12 -4 0 0 -4 -8 -8 -9 -5 -2 -13 -2 -13 0 -2 12 -8 12 -12 0 -5 -4 -9 -10 -9 -7 0 -15 -2 -19 -6 -2 -4 -10 -15 -15 -15 -2 0 -10 0 -10 -2 0 -2 -6 -4 -12 -8 -5 -2 -3 -15 -3 -19 0 -4 -20 -4 -22 -4 -5 0 2 10 0 15 -3 0 -17 2 -17 2 0 0 0 -19 4 -25 4 -7 4 -25 0 -34 -4 -4 -10 -25 -12 -31 -5 -6 -7 -14 -5 -21 5 -4 5 -29 0 -33 -2 -8 -8 -21 -8 -25 0 -6 10 -19 6 -25 -4 -4 -27 -25 -27 -31 -2 -21 19 -27 23 -29 0 0 2 -11 0 -15 -2 -2 -4 -27 -4 -31 0 -4 4 -9 0 -11 -2 -2 -2 -10 -2 -12 0 -2 0 -9 0 -9 l 0 -20 z"/>
-			<path id="reg00l" d="M 1255 2261 c 0 0 -47 12 -53 12 -4 2 -14 8 -19 13 -4 8 -12 6 -16 0 -2 -5 -13 0 -17 4 -4 4 -12 -4 -15 -9 -2 -4 -12 -8 -16 0 -4 9 -15 5 -17 5 -2 0 -21 -19 -21 -21 0 -2 0 -17 0 -21 0 -4 -8 0 -12 -2 -4 -2 -11 -15 -11 -15 0 0 5 -6 5 -10 0 -4 -13 -2 -17 -4 -2 -2 -17 -2 -21 -5 -4 -2 -25 5 -29 5 -4 0 -4 -5 -6 -9 0 -2 -2 -16 -2 -21 0 -6 -9 -10 -11 -14 -2 -2 11 -6 11 -11 0 -4 -11 -14 -11 -14 0 0 0 0 0 0 0 0 0 -13 -4 -13 -2 0 -6 -8 -6 -14 -2 -6 -13 -19 -13 -19 0 0 -4 -4 -14 -6 -11 -2 -25 6 -25 6 0 0 -2 0 -2 0 0 0 -15 6 -17 6 -4 0 -44 -18 -50 -23 -8 -4 -27 17 -33 19 -7 2 -40 -2 -40 -2 0 0 0 0 0 0 0 0 4 -17 -2 -21 -2 -2 -6 -10 -4 -14 4 -5 12 -9 16 -7 5 2 11 -2 15 -6 2 -4 8 -10 12 -10 3 0 7 -15 9 -19 0 -6 0 -10 4 -10 2 0 8 2 8 -3 0 -2 -2 -20 -4 -20 -2 0 -12 -5 -12 -9 0 -4 -5 -10 -9 -10 -4 0 -27 -2 -33 -2 -4 0 -8 -2 -8 -9 0 -6 10 -33 14 -35 4 -2 -10 0 -16 0 -7 0 -13 2 -17 -2 -4 -6 -25 -27 -25 -29 0 -4 -2 -23 -4 -23 -2 0 -27 -2 -29 -6 0 -2 -9 -23 -9 -27 0 -5 2 -15 -4 -17 -4 -4 -10 -21 -15 -25 -4 0 -18 -13 -18 -13 -2 -2 -11 -6 -19 -8 -8 0 -17 2 -17 2 0 0 -10 6 -14 4 -2 -4 -17 -18 -15 -23 0 -4 -6 -12 -10 -12 -2 -2 -17 -2 -19 -2 -4 0 -19 0 -19 0 0 -2 -10 -6 -10 -4 0 0 -6 4 -11 4 -2 0 -12 -4 -12 -4 0 0 0 0 0 0 0 0 -4 -23 -4 -32 0 -4 -7 -14 -9 -18 -4 -2 -8 -13 -8 -17 0 -6 -8 -10 -8 -10 -2 0 -15 0 -13 -5 0 -8 23 -37 23 -39 0 -6 -52 -36 -52 -36 0 0 0 0 0 0 0 0 0 -10 0 -12 0 -2 4 -13 6 -13 2 -2 9 -8 7 -16 -3 -7 -3 -17 -3 -17 0 0 15 17 19 21 4 2 19 -6 19 -6 0 0 -10 -17 -17 -23 -6 -7 -12 4 -18 2 -7 -2 -9 -15 -9 -19 0 -4 9 -17 11 -17 4 -2 6 -12 4 -12 -1 -2 -3 -6 -5 -10 -2 -4 -4 -8 -4 -9 0 0 3 -8 0 -17 -2 -4 -6 -14 -6 -14 0 0 6 -11 6 -15 0 -4 5 -14 7 -16 2 -2 8 -13 8 -13 0 0 -8 -14 -8 -14 0 0 0 -3 0 -3 0 0 -2 -10 -2 -12 0 -2 -5 -8 -2 -8 2 -2 2 -13 2 -13 0 0 12 8 14 11 4 4 9 -11 9 -15 0 -4 6 -2 12 -2 6 0 17 -11 17 -13 0 0 4 -14 4 -18 0 -2 14 4 23 6 8 0 23 2 27 2 4 0 14 -2 14 -8 0 -7 -6 -7 -12 -7 -8 -2 -17 -14 -23 -14 -6 0 -15 4 -21 6 -6 2 -14 0 -16 -6 -5 -4 -15 -11 -19 -11 -6 0 -17 -4 -19 -6 -2 0 -4 -12 -4 -12 0 -2 10 4 14 8 3 4 5 2 5 -4 0 -4 -5 -21 -5 -25 0 -2 -2 -13 -2 -13 0 0 -8 21 -14 23 -6 2 -2 13 -6 13 -5 0 -17 2 -17 2 -2 2 -8 -2 -8 -2 0 0 0 0 0 0 0 0 31 -57 31 -57 0 0 6 -2 6 -2 0 0 27 -31 27 -31 0 0 13 -10 15 -14 2 -3 25 -65 25 -65 0 0 43 -108 43 -108 0 0 11 -30 11 -30 0 0 -44 -39 -44 -39 0 0 -25 -2 -25 -2 0 0 0 0 0 0 0 0 -21 -27 -21 -27 0 0 15 -11 15 -13 0 -2 -6 -14 -2 -19 4 -2 10 -8 10 -16 0 -6 -19 -25 -21 -27 -2 0 -14 -2 -14 -2 0 0 -6 -23 -2 -30 2 -2 6 -14 2 -18 0 -2 -4 -4 -13 -2 -6 0 -14 -7 -16 -13 -2 -8 -2 -17 4 -21 4 -4 6 -12 2 -14 -4 0 -17 -2 -17 -2 0 0 6 -9 6 -9 0 0 -4 -35 0 -37 5 0 11 0 11 -2 0 -7 -15 -48 -17 -54 -6 -9 -16 -30 -16 -30 0 0 -17 -20 -17 -27 0 -4 -6 -21 -8 -27 -5 -6 2 -29 6 -41 4 -15 12 -36 10 -40 0 -4 -25 -8 -27 -15 -2 -6 -19 -31 -25 -31 -6 0 -19 -6 -21 -12 -2 -9 -12 -30 -8 -36 0 -6 8 -27 8 -33 0 -4 -12 -13 -12 -15 0 -2 8 -8 8 -8 0 0 0 -2 0 -2 0 0 4 2 8 2 3 0 11 -15 11 -19 0 -2 -2 -10 -2 -12 -2 -2 14 -15 14 -15 0 -4 13 -8 19 -8 2 -2 2 -11 -2 -13 -4 0 -2 -12 -2 -12 0 0 0 -2 0 -2 0 0 2 -2 2 -4 0 0 2 2 2 2 0 0 8 8 13 8 2 0 14 4 14 -8 0 -15 0 -9 4 -9 5 0 7 13 7 13 0 0 2 -2 6 -9 4 -4 12 0 12 0 0 0 -8 -12 -4 -16 2 -4 15 2 15 2 0 0 -13 -13 -9 -15 5 -2 15 2 21 2 7 0 9 11 9 11 0 0 18 -2 20 2 3 6 -2 14 -8 14 -4 0 -27 -4 -27 -4 0 0 -8 13 -4 11 6 0 17 0 17 6 0 4 -9 12 -9 12 0 0 23 -16 29 -12 7 4 7 12 13 4 8 -8 12 -2 12 4 0 9 -2 9 0 13 5 2 5 4 5 8 0 4 -13 11 -13 11 0 0 13 0 17 -5 2 -2 -2 -23 2 -25 4 0 33 -6 39 -6 5 0 21 6 25 4 5 -2 27 -10 36 -6 8 4 69 29 75 31 6 2 35 17 41 21 3 4 13 17 17 15 4 -2 0 -11 4 -9 7 2 21 11 27 15 7 2 27 10 27 8 3 -2 -6 -14 -4 -14 4 0 13 12 17 14 6 4 17 4 17 9 0 4 2 10 8 10 6 2 4 -4 4 -8 2 -2 11 2 11 4 0 4 12 4 12 12 0 11 6 17 10 19 5 2 7 13 9 17 0 0 2 0 2 0 0 0 10 8 10 23 0 14 0 39 -14 66 -17 25 -21 44 -36 44 -16 0 -41 33 -66 33 -27 0 -63 -8 -65 -6 0 0 -50 2 -62 0 -13 -2 -21 -10 -28 -6 -4 4 -12 4 -12 0 0 -2 2 -4 -15 -4 -16 0 -18 -9 -20 -9 -5 -2 -7 9 -9 7 -4 -2 -31 -9 -33 -19 -4 -13 4 -10 -11 -10 -16 0 -18 -9 -20 -9 -2 0 -7 6 0 9 2 4 12 12 12 14 0 4 4 13 11 15 6 2 18 10 25 10 6 0 6 6 0 6 -7 0 -7 5 0 5 6 0 16 -3 16 2 2 4 -2 8 9 8 8 0 12 2 12 8 0 4 -12 9 -12 9 0 0 0 6 4 4 6 -2 31 2 35 6 6 6 27 8 29 17 0 8 11 10 11 10 0 0 -7 4 -4 11 0 4 4 20 4 25 0 0 2 2 2 2 0 0 0 8 -2 8 -2 0 -7 4 -7 4 0 0 -8 6 -6 8 2 3 13 9 13 13 0 2 10 8 10 15 0 4 6 8 6 14 0 4 11 13 11 19 0 8 -4 6 2 12 6 7 8 13 4 15 -6 2 -4 10 0 10 6 0 13 5 13 9 2 2 8 4 12 4 2 0 10 4 13 0 0 -4 -5 -15 -3 -13 5 0 15 5 15 9 2 0 6 6 10 6 5 0 13 4 15 8 2 4 4 9 10 9 5 2 13 2 17 4 4 2 15 -4 19 -2 4 2 21 2 23 2 2 0 0 -9 8 -11 6 -4 19 -6 15 -12 -2 -4 -11 -15 -13 -17 0 -2 0 -14 -4 -16 -6 -3 -6 -11 -12 -11 -5 0 -15 11 -21 8 -7 0 -23 -6 -27 -12 -5 -8 -5 -15 -13 -17 -8 0 -19 -16 -17 -18 5 -3 17 0 17 -15 0 -15 -6 -17 0 -23 8 -4 19 4 23 6 6 4 17 4 21 11 6 4 10 6 14 6 7 0 19 -2 19 2 0 4 0 4 -8 4 -8 0 -2 11 -2 11 2 2 0 10 2 8 4 0 4 -10 6 -13 6 -2 11 -16 19 -12 6 2 54 10 54 8 0 0 6 -10 10 -8 3 0 17 4 23 4 5 -2 2 -12 2 -17 0 -2 -2 -10 -4 -12 -4 -2 -6 -6 -6 -10 0 -5 -4 -7 -10 -9 -5 -4 -38 -27 -40 -37 0 -9 0 -23 4 -29 4 -5 15 -25 19 -34 2 -6 15 -25 21 -29 2 -4 25 -42 25 -50 0 -8 10 -17 12 -15 4 3 13 9 19 5 2 -5 25 -15 31 -7 4 5 13 11 13 13 0 4 -2 17 0 14 0 -2 6 -14 10 -14 2 -2 15 12 17 12 2 0 -2 -10 -4 -14 0 -2 -13 -31 -11 -38 2 -8 2 -29 2 -29 0 0 -6 -8 -6 -17 0 -6 -2 -12 -8 -16 -9 -2 -31 -11 -31 -17 -3 -6 -13 -42 -11 -48 2 -6 -2 -14 -2 -19 0 -4 -2 -10 -4 -14 -4 -2 -2 -21 -4 -23 -2 -4 -40 -31 -42 -33 -2 0 -10 -7 -10 -7 0 0 0 -8 4 -6 4 2 39 0 48 -6 8 -6 29 -8 33 -8 6 0 19 2 23 6 2 4 10 16 17 16 6 0 12 0 12 7 0 2 11 10 13 12 4 0 10 11 10 13 0 4 -44 29 -44 33 0 4 0 17 -2 17 -2 0 -4 21 -2 23 2 4 4 14 17 14 12 0 16 6 21 9 4 4 12 22 29 18 16 -2 14 -6 16 -6 3 0 7 2 7 0 0 -4 14 -12 18 -15 7 -4 7 -6 11 -6 8 0 4 -10 4 -14 0 -5 -8 -15 -8 -19 0 -4 6 -29 0 -33 -9 -7 -9 -15 -4 -19 4 -4 4 -6 6 -6 2 0 6 -3 6 -9 2 -4 21 -4 21 -6 0 -4 -15 -2 -15 -6 -2 -2 -18 -11 -16 -15 2 -4 23 4 25 -2 4 -4 16 -33 23 -35 6 0 4 -5 2 -7 0 -2 4 -14 4 -16 2 -4 31 -32 37 -34 7 692 1 1486 -1 2205 z"/>
-			<path id="reg00m" d="M 256 2100 c 0 0 -10 -19 -10 -19 0 2 -23 -35 -25 -39 -2 -2 -2 -23 -2 -23 0 0 12 2 12 4 0 2 9 2 11 2 4 0 6 -17 10 -14 6 2 15 6 21 6 4 0 12 2 15 4 4 2 8 -4 8 -6 0 -4 0 -13 6 -13 4 0 15 6 17 0 0 -4 -13 -12 -4 -16 8 -5 20 6 20 6 0 0 11 -21 17 -19 11 0 2 13 8 13 7 2 9 0 9 -7 0 -4 0 -23 0 -25 -2 -2 -13 -2 -13 -8 2 -4 4 -33 7 -40 4 -6 16 -27 20 -29 2 -4 2 -14 7 -16 4 0 10 2 20 -17 7 -19 -2 -17 -4 -21 -2 -2 7 -27 7 -27 0 0 20 -17 20 -17 0 0 19 2 19 2 0 0 23 -23 27 -27 4 -6 17 -16 17 -16 0 0 10 4 12 4 5 0 11 -4 11 -4 0 -2 10 2 10 4 0 0 15 0 19 0 2 0 17 0 19 2 4 0 10 8 10 12 -2 7 13 19 15 23 4 2 14 -4 14 -4 0 0 9 -2 17 -2 8 2 17 6 19 8 0 0 14 13 18 13 5 4 11 21 15 25 6 2 4 12 4 17 0 4 9 25 9 27 2 4 27 6 29 6 2 0 2 19 2 23 0 2 23 23 27 29 4 4 10 2 17 2 6 0 20 -2 16 0 -4 2 -14 29 -14 35 0 7 4 9 8 9 6 0 29 2 33 2 4 0 9 6 9 10 0 4 10 9 12 9 2 0 4 18 4 20 0 5 -6 3 -8 3 -4 0 -4 4 -4 10 -2 4 -6 19 -9 19 -4 0 -10 6 -12 10 -4 4 -10 8 -15 6 -4 -2 -12 2 -16 7 -2 4 2 12 4 14 6 4 2 21 2 21 -4 13 0 35 15 46 0 0 2 8 2 12 0 2 -5 7 -7 7 -4 -2 -18 6 -23 8 -2 4 -8 4 -8 4 0 0 -6 0 -14 13 -9 10 -7 48 -7 56 0 6 2 19 -4 23 -4 4 -6 -2 -6 -4 -4 -2 -17 -19 -23 -21 -4 -6 -17 -4 -23 4 -4 6 -12 4 -15 2 -4 -4 -12 6 -16 13 -2 8 -9 -3 -11 -5 -4 -2 -12 0 -14 -6 -4 -4 -11 0 -15 4 -4 4 -12 2 -12 0 -2 -4 -4 -10 -9 -10 -4 0 -4 6 -6 6 -4 0 -14 -6 -19 -6 -4 0 -8 8 -12 8 -6 0 -2 15 -8 15 -5 2 -11 -11 -11 -17 0 -4 -10 -8 -14 -6 -5 0 -11 -2 -11 -8 -2 -3 -110 4 -110 4 0 0 -40 4 -54 8 -15 2 -36 21 -42 23 -6 4 -31 12 -33 10 -5 -4 -17 -4 -17 -4 0 0 0 -10 -4 -14 -2 -2 2 -9 4 -13 0 -6 0 -14 -4 -17 -4 0 -32 -12 -32 -16 3 -4 9 -13 9 -13 0 0 4 -12 4 -16 2 -5 10 -11 15 -11 4 -2 12 -4 12 -8 2 -2 4 -25 4 -25 l 2 -44 z"/>
-			<path id="reg00n" fill="#DDDDDD" d="M -246 2625 c 0 -2 -10 -6 -14 -6 0 0 -17 -4 -19 -4 -2 0 -11 6 -15 6 -4 0 -14 -2 -16 -2 -5 0 -9 -4 -11 -6 0 -2 -6 -7 -10 -9 -6 -2 -13 -4 -13 -6 -2 -6 -4 -10 -10 -10 -4 0 -13 -2 -15 -7 -2 -4 -14 -8 -14 -8 0 0 -4 4 -4 8 -3 5 -3 11 0 13 0 4 -3 17 -7 14 -2 -4 -12 -4 -16 0 -5 3 -9 5 -11 13 0 4 -4 4 -10 4 -2 0 -6 8 -6 11 -3 2 -9 -3 -11 -3 -2 -2 -6 -2 -6 -6 0 -2 -4 -6 -6 -8 -5 -2 -17 -8 -17 -8 0 0 -2 -25 -8 -25 -5 0 -15 -9 -19 -13 -2 -4 -17 -23 -21 -25 -2 -4 -15 -10 -23 -12 -4 -3 -14 -17 -19 -21 -4 -2 -4 -11 -4 -15 0 -6 -10 -17 -6 -19 4 -4 0 -14 -4 -18 -4 -7 -6 -15 -9 -21 -2 -6 -8 -23 -2 -23 7 0 7 14 13 10 8 -2 8 -16 14 -16 9 -2 25 -13 28 -13 4 2 25 6 29 0 4 -6 8 -10 12 -10 2 0 9 -9 11 -11 2 -4 16 4 20 4 3 -2 17 -16 25 -18 9 -2 25 -2 28 -2 2 0 0 -9 -7 -11 -4 -2 -12 0 -12 -4 0 -2 4 -8 10 -8 9 0 15 2 15 8 0 6 2 8 4 10 2 3 10 5 10 7 0 4 0 10 7 10 6 -2 6 -10 6 -10 0 0 14 -2 17 -2 2 -5 -5 -15 0 -15 2 0 22 0 22 4 0 4 -2 17 3 19 6 4 12 6 12 8 0 2 8 2 10 2 5 0 13 11 15 15 4 4 12 6 19 6 6 0 10 4 10 9 0 4 -12 10 -12 12 0 0 -7 8 2 13 8 4 4 8 8 8 4 4 8 10 8 12 0 7 2 9 9 9 4 0 12 0 16 -2 2 -2 7 -9 11 -9 4 0 10 -2 10 -6 0 -4 -4 -27 -2 -25 4 0 19 13 25 17 4 2 11 6 15 6 2 0 12 -2 12 2 0 4 -4 13 0 17 2 6 9 12 13 10 4 -2 10 0 10 4 0 4 11 4 15 7 4 0 12 6 14 8 0 4 9 6 9 8 2 4 10 13 12 15 2 4 4 16 4 16 0 0 -12 3 -16 3 -2 0 -17 -5 -17 0 -2 4 -6 12 -10 12 -3 0 -9 0 -9 4 0 4 -8 4 -8 13 0 6 -8 16 -8 18 0 0 -19 15 -19 15 0 2 -17 13 -17 15 0 2 -8 2 -12 0 -2 -2 -17 -7 -19 -7 0 0 -8 5 -8 7 0 4 -11 12 -11 12 z"/>
-			<path id="reg00o" d="M -981 2673 c 0 0 -2 2 -2 8 0 7 -9 11 -11 11 -4 2 -21 0 -23 2 -4 2 2 8 5 10 4 2 -5 9 -7 11 -2 0 -21 18 -25 21 -2 0 -12 10 -14 12 -4 0 -21 13 -27 17 -7 2 -2 8 0 10 2 0 -9 13 -11 15 -4 2 -6 8 -4 10 2 4 0 8 0 13 0 4 4 0 6 -5 2 -4 21 -8 29 -10 9 0 17 6 21 10 4 3 0 9 0 11 -2 0 0 12 -2 14 -2 3 -14 17 -19 19 -2 2 13 2 17 2 2 -2 6 7 8 9 0 2 7 8 7 8 0 0 16 2 18 -2 3 -4 13 2 15 2 2 0 6 -10 8 -10 5 0 19 14 21 12 4 -4 36 -31 38 -33 2 -2 10 -4 10 0 0 2 -4 16 0 21 4 2 13 12 13 12 2 2 8 10 8 13 0 4 10 20 12 18 3 -2 9 -10 11 -14 2 -4 0 -15 2 -17 2 0 15 -10 19 -17 2 -6 2 -20 4 -20 2 0 10 0 10 6 0 6 2 23 7 23 8 0 10 -13 14 -11 4 2 15 15 15 17 2 2 6 4 10 2 4 -4 -2 -15 0 -21 2 -4 -6 -12 -4 -14 0 -2 15 -13 17 -13 2 2 14 6 16 6 4 -2 9 -6 7 -10 -3 -2 8 -13 8 -13 0 0 6 -8 4 -12 -2 -4 -6 -10 -10 -8 0 2 -13 12 -19 12 -2 0 -6 -2 -6 -2 0 0 -2 -10 -2 -10 0 0 -11 0 -9 -5 0 -4 -4 -8 -8 -8 -4 0 -11 2 -15 0 -4 0 -8 -8 -8 -14 2 -3 2 -13 6 -15 2 -2 9 -8 9 -13 0 -4 0 -10 0 -10 0 0 -21 -12 -23 -17 -2 -2 -11 -10 -15 -10 -4 -2 -6 -4 -6 -8 0 -2 -6 -2 -9 -2 -4 0 -4 -11 -10 -11 -4 0 -12 0 -12 4 0 0 -3 13 -11 13 -8 0 -19 -2 -23 -2 -2 0 -12 4 -16 2 -7 -4 -15 -2 -21 -4 -4 -2 -15 -9 -15 -9 l -8 -6 z"/>
-			<path id="reg00p" d="M 83 3538 c 0 0 -2 10 0 10 2 2 -2 10 0 15 2 2 0 12 -4 14 -4 2 -6 6 -8 11 0 4 -8 12 -13 14 -6 2 -10 11 -10 11 0 2 -8 4 -10 4 -3 0 -5 6 -5 6 0 0 -10 -2 -8 4 0 4 4 9 -2 11 -4 4 -4 8 -4 14 0 4 -4 6 -4 4 -5 -2 -19 0 -19 0 0 0 2 -4 2 -8 0 -4 -11 -6 -11 -12 0 -5 -8 -9 -10 -15 -2 -2 -15 -10 -23 -17 -10 -4 -21 -16 -21 -23 0 -6 9 -2 11 2 4 5 2 -4 2 -8 0 -6 -6 -8 -11 -10 -4 -2 -6 -7 -4 -9 2 -2 2 -8 0 -14 -2 -4 6 -9 11 -9 2 0 10 -6 8 -10 -4 -4 -6 -12 -6 -21 0 -6 8 -12 8 -19 0 -6 -6 -8 -10 -14 -2 -6 0 -11 4 -11 2 0 4 -4 2 -10 -2 -4 2 -6 6 -4 2 4 8 -2 6 -4 -2 -4 -4 -11 -4 -17 0 -6 -14 -15 -14 -15 0 0 -7 -27 -5 -31 5 -4 5 -16 7 -21 2 -6 8 -6 12 -6 6 0 6 -14 6 -19 0 -4 9 -14 15 -8 4 8 -2 21 2 21 6 0 19 0 21 -4 0 -2 8 -2 8 4 0 6 7 17 11 19 2 0 14 4 14 4 0 0 7 4 7 10 0 6 2 17 2 19 2 0 8 15 8 15 0 0 -17 8 -19 8 0 0 -4 12 -4 14 0 0 4 5 6 3 0 0 -6 20 -4 25 4 4 0 12 0 16 0 4 4 17 4 17 0 0 9 4 11 8 0 2 6 4 6 9 0 6 -2 14 0 14 4 0 10 -6 10 -6 0 0 17 6 17 6 0 0 -2 13 2 13 4 0 2 2 2 2 l 2 -2 z"/>
-			<path id="reg00q" d="M 4 3338 c -2 0 -4 0 -4 2 -2 4 -15 4 -21 4 -4 0 2 -13 -2 -21 -6 -6 -15 4 -15 8 0 5 0 19 -6 19 -4 0 -10 0 -12 6 -2 5 -2 17 -7 21 -2 4 5 31 5 31 0 0 -9 -6 -13 -6 -4 0 -10 -4 -12 -8 -2 -4 -9 -15 -13 -17 -4 0 -6 -2 -6 -6 0 -4 -4 -10 -8 -10 -5 0 -9 -5 -13 -9 0 -2 -2 -6 0 -6 0 2 10 2 10 -4 0 -6 -8 -4 -8 -2 0 4 -4 0 -8 0 -2 -2 -9 4 -11 4 -2 0 -10 -11 -10 -11 0 0 6 -20 10 -22 2 -5 13 -28 13 -36 0 -10 -4 -25 0 -29 6 -2 21 -10 21 -17 0 -6 2 -16 6 -23 0 0 8 7 17 7 6 2 45 2 54 6 8 2 16 19 16 31 0 13 7 31 13 36 8 2 13 0 17 4 6 4 12 8 6 18 -6 11 -19 0 -21 9 0 8 4 23 4 23 l -2 -2 z"/>
-			<path id="reg00r" d="M 6 3340 c 0 0 -4 -15 -4 -23 2 -9 15 2 21 -9 6 -10 0 -14 -6 -18 -4 -4 -9 -2 -17 -4 -6 -5 -13 -23 -13 -36 0 -12 -8 -29 -16 -31 -9 -4 -48 -4 -54 -6 -9 0 -17 -7 -17 -7 2 -2 2 -2 4 -2 6 -2 29 -10 27 -14 -2 -2 -10 -27 -2 -23 6 2 29 2 29 -2 0 -4 -16 -19 -18 -23 -5 -4 -11 -9 -17 -9 -6 0 -2 -16 -2 -20 0 -5 8 -34 8 -40 0 -8 -6 -8 -8 -8 -4 0 -15 2 -15 2 0 0 0 0 0 0 0 0 0 -17 0 -19 0 -2 6 -8 6 -6 0 0 7 -6 7 -11 0 -4 4 -4 4 -8 0 -4 -6 -12 -15 -17 -6 -6 4 -12 4 -16 0 -4 -12 -9 -14 -9 -4 0 -2 -14 -2 -20 0 -7 -9 -21 -9 -21 0 0 23 -4 25 -7 5 -4 13 -8 17 -4 6 7 19 4 21 -2 0 -4 12 -14 19 -12 6 0 21 -2 25 0 6 0 25 4 25 4 0 0 27 -6 27 -6 0 0 -6 2 -8 2 0 0 -9 8 -17 10 -6 4 17 17 21 17 6 2 14 10 14 12 0 4 2 29 2 36 0 8 15 16 21 16 2 -2 4 2 4 7 0 2 19 10 21 10 2 0 6 10 6 15 3 4 -10 4 -10 4 0 2 0 14 0 19 0 2 13 6 17 8 6 0 8 8 8 8 0 2 4 2 8 4 5 2 25 15 34 17 8 2 12 -12 14 -15 0 -4 17 -8 21 -8 4 0 11 11 11 15 0 4 -7 6 -11 2 -4 -4 -12 4 -12 8 -2 0 12 21 18 27 5 9 11 11 11 11 0 0 0 0 0 0 0 0 -11 18 -13 20 -4 3 -8 11 -10 19 0 9 4 23 8 25 6 4 2 11 2 15 0 4 21 29 27 35 7 4 0 17 -4 25 -4 9 -25 11 -25 11 0 0 -6 25 -6 25 0 0 4 2 8 2 7 0 11 12 11 16 0 7 -17 27 -17 27 0 0 -6 -8 -15 -6 -8 0 -35 4 -35 6 0 3 -8 7 -15 7 -6 0 -22 0 -22 2 0 2 -9 12 -9 10 0 0 -12 -8 -12 -6 0 2 -25 12 -25 15 0 2 0 16 0 16 0 0 -9 2 -9 4 0 2 -8 2 -8 2 0 0 0 3 0 3 0 0 -6 -13 -8 -15 0 -2 -2 -13 -2 -19 0 -6 -7 -10 -7 -10 0 0 -12 -4 -14 -4 -4 -2 -11 -13 -11 -19 0 -2 -2 -4 -4 -6 l 2 2 z"/>
-			<path id="reg00s" d="M -531 2986 c 0 0 4 -3 6 -5 0 0 8 5 10 5 3 0 15 -3 17 -3 4 0 17 -2 21 -2 2 0 23 -8 23 -10 0 0 6 -13 10 -13 4 0 9 11 11 13 4 4 12 8 14 8 2 0 7 2 21 9 13 4 11 -19 11 -21 0 -4 4 -4 8 -4 2 0 4 -2 4 -5 0 -4 -6 -8 -8 -10 -4 -2 4 -2 6 -6 2 0 8 0 10 0 5 4 7 2 7 0 2 -2 10 -4 10 -6 0 -5 -4 -15 -4 -17 0 -2 6 -15 6 -19 0 -2 6 0 8 2 0 0 5 -2 7 -2 4 0 12 -6 12 -10 0 -4 4 -9 11 -9 6 0 14 -6 14 -8 0 -4 13 4 15 6 4 4 10 7 10 7 0 0 11 4 15 8 2 4 8 8 8 10 0 4 6 11 10 11 5 0 9 8 9 8 0 2 8 13 10 15 2 2 23 16 27 16 2 4 13 4 19 0 6 0 25 4 29 4 4 3 6 -10 13 -12 4 -2 18 -6 18 -6 0 0 9 14 9 21 0 6 -2 20 2 20 2 0 14 5 14 9 0 4 -10 10 -4 16 9 5 15 13 15 17 0 4 -4 4 -4 8 0 5 -7 11 -7 11 0 -2 -6 4 -6 6 0 2 0 19 0 19 0 0 -12 6 -14 0 -5 -2 -7 -13 -9 -15 -4 -4 -12 -10 -12 -8 0 4 -11 2 -19 0 -4 -2 -12 -4 -12 -2 0 2 -7 4 -11 0 -2 -4 -10 0 -10 0 0 2 -9 6 -13 2 -4 -4 -16 -2 -21 -2 -2 0 -14 -11 -16 -11 -4 0 -15 5 -19 0 -2 -4 -13 -8 -15 -4 0 0 -8 4 -10 4 -2 -2 -19 -4 -19 -4 0 4 -23 27 -31 27 -6 -2 -21 -10 -21 -14 0 -4 -4 -9 -10 -4 -6 4 -13 6 -11 10 0 2 -4 8 -8 8 0 0 -6 0 -6 7 2 6 6 22 10 22 4 3 19 11 19 13 2 4 17 17 19 21 2 4 6 12 6 16 0 3 -2 13 0 15 0 2 2 19 10 19 7 0 15 6 19 14 0 9 15 17 21 19 6 4 17 6 17 13 0 6 4 12 8 12 6 0 14 8 17 13 2 2 18 2 18 6 0 8 11 21 9 21 -2 0 -13 2 -11 2 0 4 11 12 11 12 2 0 8 0 12 4 2 3 6 11 8 11 3 0 11 4 11 10 0 2 10 7 14 11 5 2 9 6 9 10 0 4 0 6 0 6 0 0 -11 -4 -13 -6 -4 -2 -6 -14 -10 -14 -4 0 -19 -11 -23 -11 -4 0 -25 -10 -31 -14 -7 -5 -29 -13 -29 -15 0 -4 18 -2 22 2 5 4 15 13 21 10 4 -4 -12 -18 -18 -22 -7 -3 -17 -11 -21 -17 -7 -6 -34 -23 -38 -25 -4 0 -16 -4 -16 -6 -2 -5 -11 -7 -13 -2 -2 2 -23 8 -25 2 -2 -7 -2 -34 -6 -34 -4 0 -6 7 -13 2 -8 -6 -10 -6 -10 -8 0 -4 -8 -10 -13 -15 -4 -4 -16 -22 -16 -29 0 -6 0 -8 4 -8 4 0 15 4 17 6 2 2 4 6 8 6 2 0 2 -4 0 -6 -2 -4 -15 -6 -15 -6 -2 0 -12 -15 -14 -21 -6 -8 -11 -14 -15 -17 -2 -4 -6 -18 -4 -25 2 -6 0 -29 -2 -31 -2 -4 -19 -23 -25 -25 -6 -2 -19 -6 -19 -4 0 0 -6 15 -6 17 -2 0 -4 12 -4 18 0 9 -4 11 -6 7 -3 -7 -7 -13 -7 -7 0 7 -2 15 -4 15 0 0 -2 10 -2 15 0 2 -6 4 -6 0 -2 -7 -9 -23 -13 -32 -4 -10 -12 -45 -12 -45 z"/>
-			<path id="reg00t" fill="#DDDDDD" d="M -312 2831 c 0 0 -7 0 -9 0 -2 0 -6 2 -6 5 0 2 -4 6 -6 6 -2 0 -15 -2 -15 2 0 4 -4 8 -6 8 -4 0 -36 0 -38 0 0 0 -18 11 -20 11 -3 2 -13 6 -15 8 -2 2 -8 10 -13 8 -4 -2 -8 -6 -14 -6 -6 0 -13 0 -15 -2 -4 -2 -10 -6 -10 -6 -2 0 -15 -4 -15 -4 -2 0 -23 0 -23 0 0 0 -2 8 -4 12 -4 2 -16 2 -21 4 -4 0 2 13 5 13 4 0 6 0 12 0 6 4 -4 10 -8 14 -4 4 2 13 6 15 6 0 8 6 8 12 0 5 7 11 11 11 4 4 8 4 10 8 2 4 2 15 -2 17 -4 2 -15 0 -15 0 0 0 -4 2 -6 4 -4 4 -6 0 -10 4 -6 2 0 11 0 11 0 0 4 -3 6 -5 0 0 8 5 10 5 3 0 15 -3 17 -3 4 0 17 -2 21 -2 2 0 23 -8 23 -10 0 0 6 -13 10 -13 4 0 9 11 11 13 4 4 12 8 14 8 2 0 7 2 21 9 13 4 11 -19 11 -21 0 -4 4 -4 8 -4 2 0 4 -2 4 -5 0 -4 -6 -8 -8 -10 -4 -2 4 -2 6 -6 2 0 8 0 10 0 5 4 7 2 7 0 2 -2 10 -4 10 -6 0 -5 -4 -15 -4 -17 0 -2 6 -15 6 -19 0 -2 6 0 8 2 0 0 5 -2 7 -2 4 0 12 -6 12 -10 0 -4 4 -9 11 -9 6 0 14 -6 14 -8 0 -4 13 4 15 6 4 4 10 7 10 7 0 0 -4 -3 -4 -5 -2 -4 -6 -12 -6 -12 0 -4 -4 -6 -7 -8 -2 -3 0 -7 0 -7 3 0 3 -6 3 -10 0 -2 -13 -2 -13 -4 -4 0 -6 -9 -10 -9 -2 0 -2 -2 -2 -2 0 0 -5 2 -5 2 l 3 0 z"/>
-			<path id="reg00u" d="M 92 3529 c 0 0 4 0 8 -2 4 -4 8 0 10 0 3 0 15 0 17 -2 4 -4 13 0 17 0 2 2 14 0 14 -6 0 -4 9 -23 13 -23 4 0 17 -6 19 -8 2 -2 12 -2 14 -2 2 0 15 4 19 2 6 -2 12 -7 12 -11 0 -4 -2 -14 3 -14 2 0 6 0 6 0 0 0 -2 -21 -2 -23 0 -4 0 -15 2 -17 2 -2 10 -10 8 -12 -4 -3 -14 -21 -14 -21 0 -2 -15 -7 -17 -11 0 -2 -21 -21 -21 -21 0 0 -6 -6 -15 -6 -8 0 -35 4 -35 6 0 3 -8 7 -15 7 -6 0 -22 0 -22 2 0 2 -9 12 -9 10 0 0 -12 -8 -12 -6 0 2 -23 12 -23 15 0 2 -2 16 -2 16 0 0 -9 2 -9 4 0 2 -8 2 -8 2 l 0 3 c 0 0 -17 8 -19 8 0 0 -4 12 -4 14 0 0 4 5 6 3 0 0 -6 20 -4 25 4 4 0 12 0 16 0 4 4 17 4 17 0 0 9 4 11 8 0 2 6 4 6 9 0 6 -2 14 0 14 4 0 10 -6 10 -6 0 0 17 6 17 6 0 0 -2 13 2 13 4 0 2 2 2 2 l 11 -11 z"/>
-			<path id="reg00v" fill="#DDDDDD" d="M 46 2913 c 0 0 8 -2 10 -7 2 -2 7 -4 11 -4 4 0 6 -6 12 -12 2 -7 9 -38 21 -48 13 -11 33 -42 33 -52 0 -11 13 -25 13 -29 0 -7 -2 -19 2 -21 6 -2 37 -19 37 -17 3 0 15 0 15 -6 2 -6 2 -23 2 -23 0 0 -4 -8 -8 -11 0 -2 -15 -6 -15 -8 0 -4 0 -12 -4 -12 -4 0 -6 -5 -10 -9 -5 -2 -5 -6 -13 -6 -10 0 -12 2 -12 2 0 0 -7 -2 -11 2 0 2 -12 9 -12 6 0 -2 -17 -25 -19 -25 -2 0 -23 0 -23 5 0 4 4 6 -8 4 -13 -2 -21 -4 -23 -2 0 0 -9 6 -9 6 l -2 0 c 0 0 -2 0 -6 0 -4 0 -8 8 -8 15 0 6 -6 12 -13 12 -4 0 -10 6 -14 10 -2 7 -19 -2 -25 -2 -7 -2 -13 13 -17 17 -2 4 -15 -2 -17 -2 -6 0 -18 2 -25 2 -6 0 -12 10 -12 13 0 6 -15 14 -19 16 -4 4 -48 9 -56 9 -11 0 -31 -19 -34 -23 -4 -2 -16 -13 -16 -13 0 0 -15 6 -19 6 -4 0 -8 2 -6 5 6 4 21 14 19 16 -3 4 -15 11 -19 11 -2 0 -17 -13 -21 -15 -2 0 -19 4 -19 8 0 0 6 9 9 9 2 2 2 6 4 10 0 4 0 8 -2 11 -5 0 -15 4 -15 8 0 2 0 12 2 12 2 2 8 7 8 7 0 0 -2 10 -4 10 -2 0 2 6 2 6 2 4 -4 9 -6 9 -2 0 -10 0 -10 4 0 2 -6 14 -6 14 l -3 0 c 0 0 5 -2 5 -2 0 0 0 2 2 2 4 0 6 9 10 9 0 2 13 2 13 4 0 4 0 10 -3 10 0 0 -2 4 0 7 3 2 7 4 7 8 0 0 4 8 6 12 0 2 4 5 4 5 0 0 11 4 15 8 2 4 8 8 8 10 0 4 6 11 10 11 5 0 9 8 9 8 0 2 8 13 10 15 2 2 23 16 27 16 2 4 13 4 19 0 6 0 25 4 29 4 4 3 6 -10 13 -12 4 -2 18 -6 18 -6 0 0 23 -4 25 -7 5 -4 13 -8 17 -4 6 7 19 4 21 -2 0 -4 12 -14 19 -12 6 0 21 -2 25 0 6 0 25 4 25 4 l 27 -6 z"/>
-			<path id="reg00w" fill="#DDDDDD" d="M 146 2646 c 0 0 -6 -15 -4 -21 4 -6 12 -25 12 -31 0 -4 9 -25 15 -27 0 0 -13 -2 -19 -6 -4 -3 -15 -11 -17 -13 -4 0 -20 -4 -25 -2 -4 0 -8 -8 -12 -8 -4 -2 -15 -2 -15 0 0 2 -6 4 -10 2 -6 -2 -11 -4 -15 -4 -4 0 -8 -3 -12 -3 -4 0 -11 9 -11 9 0 0 -4 -4 -6 -4 -4 -2 -8 0 -12 2 0 6 -15 8 -23 8 -9 2 -15 -10 -15 -12 0 -3 -6 -11 -10 -15 -5 -6 -9 -6 -11 -4 -2 0 -12 10 -12 14 0 5 -15 13 -17 13 -2 0 -6 -4 -6 -4 0 -2 -11 -7 -11 -7 l -2 0 c 0 0 -12 3 -16 3 -2 0 -17 -5 -17 0 -2 4 -4 12 -10 12 -3 0 -9 0 -9 4 0 4 -8 4 -8 13 0 6 -8 16 -8 18 0 0 -19 15 -19 15 0 2 -17 13 -17 15 0 2 -8 2 -12 0 -2 -2 -17 -7 -19 -7 0 0 -8 5 -8 7 0 4 -11 12 -11 12 0 0 4 6 2 13 0 4 -6 16 -6 20 -2 3 4 13 4 17 0 4 -2 11 0 11 2 0 13 2 15 8 0 4 2 6 2 6 0 0 12 11 16 13 5 4 23 23 34 23 8 0 52 -5 56 -9 4 -2 19 -10 19 -16 0 -3 6 -13 12 -13 7 0 19 -2 25 -2 2 0 15 6 17 2 4 -4 10 -19 17 -17 6 0 23 9 25 2 4 -6 10 -10 14 -10 7 0 13 -6 13 -12 0 -7 4 -15 8 -15 4 0 6 0 6 0 l 2 0 c 0 0 9 -6 9 -6 2 -2 10 0 23 2 12 2 8 0 8 -4 0 -5 21 -5 23 -5 2 0 19 23 19 25 0 3 12 -4 12 -6 4 -4 11 -2 11 -2 l 6 -4 z"/>
-			<path id="reg00x" fill="#DDDDDD" d="M 648 2942 c 0 0 -8 -27 -8 -31 -2 -5 -7 -9 -7 -13 0 -2 5 -19 2 -21 -2 -2 -6 -19 0 -23 5 -2 7 -10 7 -14 -2 -4 2 -17 -2 -21 -5 -4 -17 -36 -17 -36 -2 -2 -44 -47 -44 -50 0 -2 -21 -22 -25 -27 l 0 -2 c 0 0 -6 -10 -6 -12 0 0 -6 -15 -6 -19 -2 -6 -27 -23 -29 -27 -3 -2 -15 -2 -15 -2 l 2 2 c 0 0 -10 6 -15 6 -4 0 -16 9 -22 13 -7 6 -17 14 -21 14 -4 0 -42 7 -42 7 -4 2 -15 20 -17 22 -4 3 -23 0 -25 -4 -4 -2 -27 -16 -29 -18 -2 -3 -23 16 -25 16 -4 0 -33 -6 -44 -4 -8 4 -16 -10 -20 -12 -7 -5 -15 2 -15 4 -2 4 -23 4 -23 4 0 0 0 17 -2 23 0 6 -12 6 -15 6 0 -2 -31 15 -37 17 -4 2 -2 14 -2 21 0 4 -13 18 -13 29 0 10 -20 41 -33 52 -12 10 -19 41 -21 48 -6 6 -8 12 -12 12 -4 0 -9 2 -11 4 -2 5 -10 7 -10 7 0 0 -6 2 -8 2 0 0 -9 8 -17 10 -6 4 17 17 21 17 6 2 14 10 14 12 0 4 2 29 2 36 0 8 15 16 21 16 2 -2 4 2 4 7 0 2 19 10 21 10 2 0 6 10 6 15 3 4 -10 4 -10 4 0 2 0 14 0 19 0 2 13 6 17 8 6 0 8 8 8 8 0 2 4 2 8 4 5 2 25 15 34 17 8 2 12 -12 14 -15 0 -4 17 -8 21 -8 4 0 11 11 11 15 0 4 -7 6 -11 2 -4 -4 -12 4 -12 8 -2 0 12 21 18 27 5 9 11 11 11 11 0 0 0 0 0 0 0 0 21 8 21 12 0 4 -17 25 -9 27 9 0 54 -4 57 -4 4 0 64 10 70 8 7 0 59 -2 63 -2 4 0 29 9 35 7 7 -3 27 -19 32 -25 2 -7 31 -32 43 -32 11 0 40 -12 46 -12 4 0 25 10 29 10 4 0 17 -8 21 -6 4 0 17 0 17 6 2 9 23 17 27 17 2 0 12 4 14 4 5 0 15 -4 15 -4 0 0 4 -19 4 -27 0 -9 0 -21 -4 -25 -2 -4 0 -11 0 -15 0 -4 15 -29 13 -31 0 -4 -7 4 -9 4 0 0 0 -10 0 -14 -2 -5 -8 -9 -8 -9 l 4 0 c 0 0 8 -4 8 -4 2 0 5 -10 2 -15 0 -2 -2 -4 -2 -8 0 -4 17 -4 19 -4 0 0 -4 4 -6 6 -4 0 4 9 4 11 0 0 -4 10 -4 10 0 4 17 -4 17 -4 2 0 22 -17 27 -19 4 -6 2 -31 2 -33 0 -4 6 -4 6 -13 0 -4 0 -6 0 -6 0 0 -31 -19 -33 -10 0 8 -32 20 -36 20 -4 0 -8 9 -12 9 -7 0 -29 -2 -32 -4 0 -2 -12 -15 -12 -21 -4 -6 -8 -25 -8 -29 l 8 29 z"/>
-			<path id="reg00y" fill="#DDDDDD" d="M 529 3398 c 0 0 -19 -8 -19 -2 0 4 17 17 17 21 2 4 8 16 4 16 -4 0 -8 11 -12 11 0 0 -19 10 -29 10 -9 0 -21 0 -23 0 0 0 -13 -4 -13 -4 -2 -4 -19 -6 -33 -4 -13 2 -17 -10 -17 -15 0 -4 -10 -6 -14 -6 -7 0 -34 0 -36 0 -4 0 -4 17 -4 19 0 2 -12 4 -17 6 -2 2 -16 11 -23 11 -4 0 -16 -7 -18 -7 -4 0 -34 11 -38 11 -2 0 -10 -2 -10 -2 0 0 -2 -21 -2 -23 0 -4 0 -15 2 -17 2 -2 10 -10 8 -12 -4 -3 -14 -21 -14 -21 0 -2 -15 -7 -17 -11 0 -2 -21 -21 -21 -21 0 0 17 -20 17 -27 0 -4 -4 -16 -11 -16 -4 0 -8 -2 -8 -2 0 0 6 -25 6 -25 0 0 21 -2 25 -11 4 -8 11 -21 4 -25 -6 -6 -27 -31 -27 -35 0 -4 4 -11 -2 -15 -4 -2 -8 -16 -8 -25 2 -8 6 -16 10 -19 2 -2 13 -20 13 -20 0 0 21 8 21 12 0 4 -17 25 -9 27 9 0 54 -4 57 -4 4 0 64 10 70 8 7 0 59 -2 63 -2 4 0 29 9 35 7 7 -3 27 -19 32 -25 2 -7 31 -32 43 -32 11 0 40 -12 46 -12 4 0 25 10 29 10 4 0 17 -8 21 -6 4 0 17 0 17 6 2 9 23 17 27 17 2 0 12 4 14 4 5 0 15 -4 15 -4 0 0 0 21 2 23 2 2 2 14 -2 14 -2 2 -8 15 -12 13 -3 -2 -21 -2 -21 0 0 4 -7 19 -13 19 -6 0 0 4 0 10 0 6 -6 15 -6 15 0 0 0 29 0 29 0 2 -4 25 -8 25 -5 0 -15 4 -15 6 0 2 -4 6 0 6 4 0 19 -2 21 2 2 5 2 13 2 17 0 4 -2 2 -2 2 0 0 8 13 12 13 5 2 11 14 11 14 l 2 0 c 0 0 -11 -2 -15 0 -4 4 -8 4 -12 0 -2 0 -15 -2 -19 -2 -6 2 -17 -2 -23 -2 -4 -2 -14 6 -14 10 0 7 -11 3 -15 3 -4 -3 -8 4 -8 4 0 0 -11 0 -11 0 0 0 -6 16 -6 16 0 0 -6 0 -8 0 -5 0 -11 15 -11 15 l 0 2 z"/>
-			<path id="reg00z" d="M 554 2706 c 4 5 25 25 25 27 0 3 42 48 44 50 0 0 12 32 17 36 4 4 0 17 2 21 0 4 -2 12 -7 14 -6 4 -2 21 0 23 3 2 -2 19 -2 21 0 4 5 8 7 13 0 4 8 31 8 31 0 0 17 -9 17 -17 0 -6 0 -23 10 -29 10 -4 19 -29 19 -33 0 -7 -6 -21 -4 -25 2 -5 -2 -15 2 -19 2 -6 12 -6 14 2 2 6 0 17 7 17 2 0 6 -17 8 -21 4 -4 12 2 12 4 2 4 9 4 9 2 4 -2 4 -10 8 -6 2 2 8 4 13 4 4 0 18 -2 18 -2 0 0 -12 -11 -14 -11 -4 0 -15 -4 -13 -8 2 -4 6 -4 6 -4 0 0 -6 -8 -8 -13 -2 -4 -4 -8 -2 -14 2 -4 8 -8 0 -15 -10 -4 -19 7 -19 7 0 0 -6 -3 -6 -9 2 -4 -6 -16 -8 -21 -2 -4 0 -8 2 -12 2 -2 0 -13 -2 -15 0 0 -11 -4 -15 -4 -2 0 -14 0 -14 -4 0 -4 -5 -23 -5 -29 2 -4 0 -15 -4 -17 -4 -4 -14 2 -16 0 0 0 -11 -19 -21 -21 -11 0 -19 9 -19 4 -2 -2 0 -6 -10 -4 -11 0 -13 0 -15 -2 0 -2 -15 -14 -21 -16 -4 -3 -17 -3 -17 -3 0 0 -10 11 -14 11 -4 0 -17 6 -17 6 0 0 -6 8 -12 4 -7 -4 -15 -4 -17 0 0 2 -2 15 -2 15 0 0 12 0 15 2 2 4 27 21 29 27 0 6 6 19 6 19 0 2 6 12 6 12 l 0 2 z"/>
-			<path id="reg001" d="M 1259 2678 c -6 2 -63 53 -69 53 -7 0 -7 -8 -7 -14 0 -4 -4 -6 -8 -6 -4 4 4 25 4 29 2 4 2 0 9 2 4 0 0 4 -5 10 -2 6 -16 31 -20 31 -3 0 8 -22 12 -22 0 0 2 -9 0 -13 -2 -6 -4 0 -6 0 -2 0 -4 0 -6 0 -3 0 -3 10 -3 17 0 4 -18 14 -20 16 -5 0 -5 9 -5 11 -2 4 -4 8 -8 8 -4 0 -6 -4 -8 -6 0 -4 -2 -6 -6 -8 -5 -3 -3 6 -5 6 -4 0 -6 -4 -6 -6 0 -3 -2 -5 -4 -5 -2 -2 0 7 0 7 -4 4 -6 10 -8 8 -2 -2 -23 -6 -27 -4 -5 0 0 4 4 4 2 0 10 8 10 10 0 5 8 0 8 -2 0 0 9 0 11 7 6 2 2 -7 2 -7 2 0 8 2 17 2 10 2 10 5 12 7 4 0 13 -5 11 0 -7 6 -7 14 -7 14 0 0 15 -10 15 -10 0 0 4 12 4 12 0 0 13 2 19 13 6 8 6 23 6 23 0 0 15 2 17 2 4 0 14 4 14 4 0 0 -27 -27 -35 -38 -8 -12 -17 -12 -17 -20 -4 -9 -14 -21 -14 -21 0 0 14 -11 14 -11 0 0 2 23 6 30 3 4 21 31 38 41 31 26 49 -14 57 42 1 6 -47 16 -47 17 -4 2 -8 6 -8 8 0 4 -4 10 -6 12 -4 2 -17 5 -23 7 -4 2 -15 8 -17 16 -4 11 -29 34 -35 38 -4 6 -21 12 -23 10 -2 -4 -13 -6 -19 -8 -8 -2 -6 -13 -4 -13 2 0 8 -10 4 -14 -2 -4 4 -19 4 -25 0 -4 -14 -13 -16 -17 -2 -6 -9 -8 -19 -8 -8 0 -15 -2 -17 -9 -4 -4 -14 -6 -21 -2 -2 2 -18 9 -25 0 -4 -6 17 -25 17 -25 0 0 25 -27 25 -29 0 -4 8 0 8 0 0 0 11 -8 11 -10 0 0 12 -9 16 -9 5 0 9 -4 9 -8 0 -2 -6 -2 -11 -2 -2 -2 -2 -15 -2 -19 -2 -4 -8 4 -8 7 0 2 -13 2 -13 2 -2 -2 -18 -5 -20 -5 -5 0 -5 9 -5 11 -2 2 -20 -2 -27 2 -2 2 -25 4 -31 4 -8 0 -2 -6 -4 -10 0 -2 -4 4 -13 2 -10 0 -4 -13 -12 -9 -8 5 -13 0 -13 -2 0 -2 17 -6 17 -10 0 -2 -8 -4 -10 -4 -2 0 -11 0 -17 0 -6 0 -6 -9 -6 -9 0 0 41 -2 50 -2 8 2 6 0 4 -4 -2 -2 -10 -6 -17 -4 -4 2 -2 -2 -8 -6 -4 -6 -10 -19 -10 -21 0 -4 -3 -10 -5 -15 -2 -4 -14 -16 -14 -16 l 0 -2 c 0 0 6 23 6 25 2 2 6 0 6 6 0 4 -4 8 0 12 2 5 7 11 0 15 -6 2 -14 2 -14 2 0 0 -11 8 -11 4 0 -6 2 -21 0 -21 -2 0 -10 21 -12 21 -2 0 -17 6 -23 9 -4 4 -8 6 -15 2 -6 -5 -14 -13 -12 -13 0 0 10 15 10 15 0 0 -8 -2 -10 -4 -4 -3 -13 -9 -13 -9 0 0 0 4 0 6 4 3 23 13 23 21 2 4 -2 25 -4 25 -2 0 -4 15 -6 15 -2 -2 -11 -6 -13 -11 0 -2 -4 -6 -8 -8 -6 -4 -13 -6 -13 -6 l -4 0 c 0 0 -12 -11 -14 -11 -4 0 -15 -4 -13 -8 2 -4 6 -4 6 -4 0 0 -6 -8 -8 -13 -2 -4 -4 -8 -2 -14 2 -4 8 -8 0 -15 -10 -4 -19 7 -19 7 0 0 -6 -3 -6 -9 2 -4 -6 -16 -8 -21 -2 -4 0 -8 2 -12 2 -2 0 -13 -2 -15 0 0 -11 -4 -15 -4 -2 0 -14 0 -14 -4 0 -4 -5 -23 -5 -29 2 -4 0 -15 -4 -17 -4 -4 -14 2 -16 0 0 0 -11 -19 -21 -21 -11 0 -19 9 -19 4 -2 -2 0 -6 -10 -4 -11 0 -13 0 -15 -2 0 -2 -15 -14 -21 -16 -4 -3 -17 -3 -17 -3 0 0 -10 11 -14 11 -4 0 -17 6 -17 6 0 0 -6 8 -12 4 -7 -4 -15 -4 -17 0 0 2 -2 15 -2 15 l 2 2 c 0 0 -10 6 -15 6 -4 0 -16 9 -22 13 -7 6 -17 14 -21 14 -4 0 -42 7 -42 7 -4 2 -15 20 -17 22 -4 3 -23 0 -25 -4 -4 -2 -27 -16 -29 -18 -2 -3 -23 16 -25 16 -4 0 -33 -6 -44 -4 -8 4 -16 -10 -20 -12 -7 -5 -15 2 -15 4 -2 4 -23 4 -23 4 0 0 -4 -8 -8 -11 0 -2 -15 -6 -15 -8 0 -4 0 -12 -4 -12 -4 0 -6 -5 -10 -9 -5 -2 -5 -6 -13 -6 -10 0 -12 2 -12 2 l 6 -4 c 0 0 -6 -15 -4 -21 4 -6 12 -25 12 -31 0 -4 9 -25 15 -27 0 0 10 0 16 2 9 2 11 0 11 -2 -2 -2 -8 -9 -8 -11 0 -6 -3 -16 -7 -18 -4 0 -8 -5 -2 -5 6 0 9 -6 9 -8 0 -4 -3 -14 6 -19 6 -6 39 -50 41 -52 0 0 17 -23 28 -27 10 -6 27 -10 27 -16 0 -5 8 -19 4 -23 -2 -5 -21 -17 -19 -21 4 -4 10 -4 8 -11 -4 -6 -31 -31 -31 -37 0 -6 -6 -15 -10 -17 -2 -4 0 -10 0 -12 0 -4 -4 -13 -2 -13 2 0 6 0 6 0 0 0 12 0 17 4 2 2 27 -6 33 -10 6 -2 27 -21 42 -23 14 -4 54 -8 54 -8 0 0 108 -7 110 -4 0 6 6 8 11 8 4 -2 14 2 14 6 0 6 6 19 11 17 6 0 2 -15 8 -15 4 0 8 -8 12 -8 5 0 15 6 19 6 2 0 2 -6 6 -6 5 0 7 6 9 10 0 2 8 4 12 0 4 -4 11 -8 15 -4 2 6 10 4 14 6 2 2 9 13 11 5 4 -7 12 -17 16 -13 3 2 11 4 15 -2 6 -8 19 -10 23 -4 6 2 19 19 23 21 0 2 2 8 6 4 6 -4 4 -17 4 -23 0 -8 -2 -46 7 -56 8 -13 14 -13 14 -13 0 0 6 0 8 -4 5 -2 19 -10 23 -8 2 0 7 -5 7 -7 0 -4 -2 -12 -2 -12 -15 -11 -19 -33 -15 -46 0 0 33 4 40 2 6 -2 25 -21 33 -19 6 5 46 23 50 23 2 0 17 -6 17 -6 l 2 0 c 0 0 14 -8 25 -6 10 2 14 6 14 6 0 0 11 13 13 19 0 6 4 14 6 14 4 0 4 13 4 13 0 0 11 10 11 14 0 5 -13 9 -11 11 2 4 11 8 11 14 0 5 2 19 2 21 2 4 2 9 6 9 4 0 25 -7 29 -5 4 3 19 3 21 5 4 2 17 0 17 4 0 4 -5 10 -5 10 0 0 7 13 11 15 4 2 12 -2 12 2 0 4 0 19 0 21 0 2 19 21 21 21 2 0 13 4 17 -5 4 -8 14 -4 16 0 3 5 11 13 15 9 4 -4 15 -9 17 -4 4 6 12 8 16 0 5 -5 15 -11 19 -13 6 0 58 -12 58 -12 -8 137 0 279 -1 417 z"/>
-			<path id="reg002" d="M 648 2942 c 0 0 17 -9 17 -17 0 -6 0 -23 10 -29 10 -4 19 -29 19 -33 0 -7 -6 -21 -4 -25 2 -5 -2 -15 2 -19 2 -6 12 -6 14 2 2 6 0 17 7 17 2 0 6 -17 8 -21 4 -4 12 2 12 4 2 4 9 4 9 2 4 -2 4 -10 8 -6 2 2 8 4 13 4 4 0 18 -2 18 -2 l 4 0 c 0 0 -4 10 3 12 6 5 12 11 14 11 4 0 8 2 8 8 0 6 -10 27 -10 27 0 0 -8 4 -10 9 0 4 -11 6 -11 6 0 0 0 8 0 8 0 0 -2 6 -2 6 0 0 0 7 0 7 -2 0 -10 2 -10 0 0 -2 -9 -17 -9 -9 0 7 -4 27 0 27 5 0 13 -4 13 2 2 7 2 15 2 15 0 0 -31 -19 -33 -10 0 8 -32 20 -36 20 -4 0 -8 9 -12 9 -7 0 -29 -2 -32 -4 0 -2 -12 -15 -12 -21 -4 -6 -8 -25 -8 -29 l 8 29 z"/>
-			<path id="reg003" fill="#DDDDDD" d="M 1258 3935 c -4 0 -68 26 -70 30 -5 2 -34 -4 -38 -4 -4 0 -23 -17 -29 -25 -4 -9 -27 -17 -27 -17 0 0 -65 -19 -71 -21 -6 0 -46 0 -50 4 -4 4 0 29 0 34 0 2 -6 20 -4 22 0 7 2 21 0 25 -2 3 -15 -2 -23 -2 -8 0 -27 13 -29 17 0 4 -21 2 -21 2 -2 -2 -29 -8 -31 -8 -5 0 -19 -11 -21 -13 -4 -2 -9 -33 -9 -33 0 -2 -12 -2 -12 -2 -2 0 -4 8 -4 12 0 2 0 9 -4 2 -5 -6 -9 -10 -15 -10 -4 0 -6 -4 -8 -8 -2 -4 -7 -2 -9 -2 -4 0 -6 -2 -10 -5 -2 -2 0 9 -4 9 -2 0 -4 -4 -9 -4 -4 2 -2 6 3 8 4 2 2 2 0 4 -3 2 -13 4 -13 8 -2 7 -4 19 -10 11 -7 -11 4 -8 4 -11 0 -2 -4 0 -6 -2 -3 -4 4 -8 4 -12 0 -2 -9 0 -15 4 -4 4 -12 2 -14 2 -3 0 -7 8 -11 11 -2 2 -6 0 -10 4 -7 2 -11 0 -11 -7 0 -6 15 -8 15 -8 0 0 12 -8 17 -6 8 0 20 -8 25 -8 2 0 0 -5 -3 -7 -2 -2 7 -4 11 -4 4 0 12 -12 12 -12 0 0 -43 10 -48 8 -4 0 -27 4 -31 2 -2 -4 -8 6 -8 6 0 0 -11 -4 -11 -10 0 -8 9 -8 13 -8 4 2 19 4 19 -3 0 -4 2 -12 -2 -12 -5 0 -11 4 -11 0 0 -4 4 -8 2 -8 -2 0 -6 0 -6 0 -2 -2 4 -7 -2 -7 -4 0 -17 11 -17 7 -2 -5 0 -11 -2 -13 -2 -4 -6 -10 -4 -12 4 -5 2 -7 -2 -9 -6 0 -17 -4 -8 -4 6 0 16 0 16 -8 0 -9 -4 -13 -2 -13 0 -4 2 -10 -8 -14 -11 -2 -19 -9 -23 -9 -4 0 -10 -10 -21 -10 -10 0 -8 10 -12 10 -7 -4 -11 -12 -17 -12 -6 0 -13 0 -13 -4 0 -4 3 -9 5 -11 4 -2 10 7 10 2 0 -4 4 -6 4 -8 0 -2 -8 -2 -8 -6 0 -4 -2 -11 -4 -17 -4 -4 4 -4 6 -4 4 -2 8 4 8 6 0 2 11 6 11 9 0 4 -2 10 0 10 0 2 6 8 6 4 0 -4 10 -2 12 -2 3 0 13 0 15 -2 2 -2 10 -8 10 -8 0 -2 -16 4 -18 0 -4 -5 -4 -13 -9 -13 -2 -2 -8 -6 -8 -10 0 -4 17 -7 17 -7 0 -2 -4 -8 0 -12 4 0 12 -4 4 -6 -6 -2 -19 -7 -19 -11 0 -4 6 -8 4 -10 -4 0 -14 -13 -16 -13 0 0 -11 -2 -9 -6 2 -6 32 -31 27 -33 -6 -2 -60 12 -62 14 -4 2 -13 7 -13 -2 0 -6 2 -23 2 -31 0 -8 0 -12 0 -12 0 0 3 -11 5 -13 2 0 10 -6 10 -10 0 -7 25 -25 29 -32 4 -6 21 -10 23 -12 4 -2 11 -4 17 -4 4 0 4 -4 6 -4 2 0 6 10 10 10 7 0 40 0 40 -4 0 -2 -8 -9 -8 -9 0 0 -2 -6 2 -6 4 0 23 0 23 2 0 4 -7 11 -4 9 4 0 20 -5 33 -2 8 2 25 -7 31 -7 6 0 33 0 33 -8 0 -8 -33 -4 -31 -10 2 -3 31 -21 48 -25 19 -3 52 -13 52 -13 0 0 4 -4 -10 -4 -13 0 -50 8 -54 4 -5 -4 -13 -17 -15 -21 -2 -4 -2 -21 4 -25 6 -4 46 2 50 4 4 2 38 -4 38 -4 0 0 6 -10 10 -10 2 0 31 2 33 4 3 4 34 2 40 0 2 -4 27 -19 27 -31 0 -15 17 -15 17 -15 0 0 31 -23 33 -29 2 -8 17 -19 23 -19 4 0 15 -14 19 -14 6 0 33 -19 37 -23 4 -4 21 -9 27 -9 7 2 25 -2 30 -4 6 -2 25 -2 29 -4 6 0 67 -15 73 -15 0 198 -6 458 -7 677 z"/>
-			<path id="reg004" fill="#DDDDDD" d="M 515 3519 c 0 0 4 0 8 -4 4 -4 4 -9 6 -13 4 -4 13 -19 11 -21 0 -6 -7 -18 -2 -20 4 -3 20 -15 18 -21 0 -7 2 -17 -2 -21 -2 -4 -2 -13 -4 -13 -2 -2 -21 -8 -21 -8 l 0 -2 c 0 0 6 -15 11 -15 2 0 8 0 8 0 0 0 6 -16 6 -16 0 0 11 0 11 0 0 0 4 -7 8 -4 4 0 15 4 15 -3 0 -4 10 -12 14 -10 6 0 17 4 23 2 4 0 17 2 19 2 4 4 8 4 12 0 4 -2 15 0 15 0 l -4 0 c 0 0 6 6 6 6 0 3 0 7 0 11 0 6 4 8 6 10 2 4 4 13 4 17 0 2 7 6 13 12 8 7 25 13 29 13 4 0 27 8 31 8 2 0 15 0 15 0 0 0 -2 21 -11 27 -10 9 -39 0 -47 0 -7 0 -25 11 -32 13 -8 0 -10 2 -21 4 -10 0 -27 17 -33 31 -8 11 -50 36 -50 42 0 4 -23 23 -27 29 -4 6 -12 15 -12 15 l 0 2 c 0 0 -3 -4 0 -6 2 -3 2 -15 2 -17 0 -2 -5 -8 0 -11 6 -4 29 -18 33 -22 4 -3 12 -11 10 -13 -2 -6 -16 0 -20 0 -3 0 -42 4 -44 2 -2 -2 -9 -4 -9 -4 l 5 -2 z"/>
-			<path id="reg000" d="M -1860 169 c 0 0 2 -11 4 -15 2 -4 2 -14 0 -14 -2 0 0 -7 4 -7 2 -2 2 -12 0 -14 -2 -4 -2 -13 0 -13 2 0 6 9 10 5 7 -5 13 -5 13 -5 2 -2 6 -10 4 -10 -2 0 -8 -6 -6 -6 4 0 8 0 8 -9 0 -8 -4 -8 -4 -10 2 -4 4 -10 2 -17 -4 -4 -8 -10 -8 -14 0 -2 2 -23 -2 -25 -2 -4 -17 -15 -23 -13 -4 0 -13 4 -2 9 8 8 10 10 10 14 0 2 4 8 2 8 -2 0 -12 -12 -14 -12 -3 0 -9 4 -7 10 2 7 11 15 11 17 0 2 -4 15 -4 15 0 0 -3 10 -5 10 -2 0 -12 0 -12 0 0 0 10 -8 10 -12 0 -3 -10 6 -8 2 2 -5 8 -13 6 -17 -4 -2 -10 8 -10 8 0 0 2 -12 0 -12 0 -2 2 -4 4 -4 2 -5 0 -7 -2 -11 -2 -2 -8 -19 -13 -16 -6 4 -4 6 -6 6 -2 0 -14 0 -14 4 0 4 8 21 8 25 0 2 -2 4 -4 -2 0 -6 -9 -23 -13 -17 -4 4 -2 13 0 15 0 6 6 8 11 8 2 0 2 6 0 6 -2 0 -7 -2 -9 0 0 5 -6 5 -10 2 -2 -4 0 -12 -2 -16 0 -2 -4 -13 -9 -11 -4 5 -4 9 -4 13 0 4 -2 4 -2 4 0 0 0 10 -4 6 -2 0 -8 -16 -8 -16 0 0 -15 2 -15 4 0 4 4 8 6 8 2 0 7 17 11 17 4 4 14 2 14 4 2 0 11 8 13 8 4 -2 6 -6 8 -6 0 2 4 8 9 6 2 0 4 4 4 9 -2 2 0 4 4 4 2 0 10 2 10 2 0 0 -2 6 2 8 2 0 2 4 -2 4 -2 0 -4 7 0 9 4 2 9 -2 11 -2 2 0 6 0 6 0 0 0 -4 6 -4 6 0 0 6 12 6 10 0 0 -4 2 -6 2 0 -4 -9 -4 -11 -4 -4 2 -20 0 -23 0 -2 0 -6 4 -4 6 2 7 9 19 11 19 4 0 18 -4 18 0 0 2 -12 4 -12 9 -2 2 -8 0 -10 -3 -5 -2 -11 -12 -13 -12 -4 0 -8 -2 -8 -6 0 0 0 -4 -7 -4 -4 0 -4 -5 -6 -5 -2 0 -8 0 -8 -2 -2 -2 0 -6 -6 -4 -5 2 -9 4 -13 2 -2 -4 -14 -12 -19 -12 -4 0 -10 -2 -10 0 0 2 0 12 4 16 2 0 11 2 13 5 2 4 10 4 12 4 4 4 15 14 17 16 0 2 4 5 6 9 2 0 8 4 8 8 0 4 -8 10 -8 13 0 2 -4 8 -2 10 2 2 0 6 4 8 6 0 17 -4 17 0 0 4 -11 4 -13 4 0 0 -10 5 -8 7 4 4 0 6 -2 6 -2 0 -11 4 -8 4 4 4 25 0 27 0 2 4 4 11 2 11 -2 0 -7 -5 -11 -5 -8 0 -12 2 -12 7 0 4 4 8 2 8 -4 0 -8 -6 -15 -6 -4 2 -8 6 -12 2 -6 -2 -15 -2 -15 -6 0 -5 -2 -15 -6 -11 -6 2 -6 8 -6 11 -2 2 -13 6 -9 12 2 6 15 8 17 13 2 4 10 10 13 10 2 0 10 6 12 10 2 2 13 2 15 5 4 4 10 12 10 16 2 2 8 2 10 2 7 -2 5 2 0 7 -2 2 -4 4 0 10 3 4 9 31 15 35 6 7 19 15 21 21 2 9 8 19 12 21 5 4 11 8 13 8 4 0 17 9 19 7 2 -2 0 -7 2 -11 0 -2 2 -16 2 -16 0 0 4 6 4 10 0 4 2 8 0 12 -6 3 0 7 6 5 6 -2 19 -7 23 -7 4 0 13 0 17 0 4 0 14 7 19 9 2 2 6 2 10 0 2 0 12 0 15 0 2 0 8 0 8 0 0 0 -8 4 -11 4 -2 0 -12 4 -12 6 0 2 -2 6 2 4 2 -2 13 -6 15 -6 2 0 8 -4 10 -6 4 -4 6 -4 10 -4 3 0 23 -2 30 -5 6 0 23 0 25 3 4 4 10 6 10 8 0 2 0 6 2 6 6 0 6 -6 13 -6 4 0 12 2 14 4 2 2 13 -8 15 -10 4 -2 2 -5 0 -5 -2 0 -6 -4 -4 -6 l 0 2 c 0 0 10 0 10 -2 2 -2 6 2 8 2 0 2 0 -16 0 -16 0 0 11 12 13 12 2 0 4 -8 4 -6 4 2 8 2 8 0 0 -4 13 -4 13 -6 0 -2 -13 -17 -8 -17 2 0 14 17 18 15 4 -5 9 -15 9 -15 0 0 -9 0 -7 -2 2 -2 0 -8 -2 -8 -2 0 -8 -3 -6 -5 2 0 15 5 13 -2 0 -4 -11 -4 -11 -4 0 0 19 -4 21 -6 4 -2 12 -11 10 -13 -2 -2 -6 -4 -6 -4 0 0 0 -6 -4 -10 -4 0 -10 -13 -8 -15 2 -2 2 -12 -2 -14 -3 -2 -11 -5 -13 -5 -4 0 -8 0 -4 -2 2 -2 8 -8 8 -8 4 0 17 -2 17 -8 0 -4 -4 -11 -8 -13 -3 0 -7 -4 -9 -4 0 0 0 -10 2 -10 2 0 13 0 13 -5 0 -4 2 -8 6 -6 4 4 6 2 10 2 5 0 11 -2 11 -2 0 0 -13 -10 -19 -8 -6 0 -14 6 -17 6 0 -2 -8 0 -8 0 -2 4 -6 4 -6 2 0 -2 0 -10 -2 -14 -4 -2 -4 -7 0 -9 2 -2 2 -8 -2 -12 -2 -2 0 -15 -2 -17 -5 -4 -13 -6 -15 -6 0 -2 -8 -2 -8 2 -2 4 -4 23 -11 23 -8 0 -21 0 -21 -4 0 -4 -4 -11 -8 -11 -4 4 -8 9 -8 9 -2 0 -9 0 -11 0 -2 2 -6 4 -6 0 -2 -7 -4 -19 -8 -23 -4 -4 -13 -11 -15 -9 -2 5 -4 19 -6 21 0 2 4 6 2 11 -2 2 -8 10 -8 12 -2 4 -7 11 -7 11 0 0 0 -11 3 -15 0 -6 4 -10 2 -17 0 -6 2 -29 0 -33 0 -4 -2 -6 -5 -6 -2 0 -6 -9 -10 -4 -4 4 -4 4 -8 4 -2 -2 -11 -4 -15 0 -4 6 -4 18 -6 21 -4 4 -11 6 -11 4 0 -4 -4 -11 -4 -13 0 -2 4 -8 4 -12 -2 -4 0 -13 3 -17 0 -2 0 -12 -7 -12 -6 0 -12 -3 -14 2 0 2 -2 14 -7 16 -4 2 -14 21 -16 21 -4 0 -6 -2 -11 0 -2 4 -10 6 -8 0 2 -6 10 -10 8 -10 -2 0 -8 -4 -12 0 -6 0 -13 8 -15 10 -2 4 -2 8 -2 6 -2 0 -4 -2 -6 0 -4 5 -8 13 -8 13 z"/>
-			<path id="reg005" fill="#DDDDDD" d="M 1259 4017 c -84 13 -84 13 -84 13 l -46 21 5 15 -42 0 9 18 9 14 42 2 14 -11 23 -18 33 -5 4 -15 33 -34 z"/>
-			<path id="reg006" fill="#DDDDDD" d="M -524 4067 l 10 18 29 8 30 5 -7 26 -32 -6 -33 -10 -10 -18 13 -23 z"/>
-			<path id="reg007" fill="#DDDDDD" d="M -579 4054 l -6 20 39 -2 3 -18 -36 0 z"/>
-		</g>
-		<path id="reg14" d="M -2394 2956 c 0 0 11 -2 13 -2 2 -4 8 -12 10 -12 2 0 9 6 13 6 2 -2 10 -2 12 -2 0 0 15 -2 17 -4 4 0 19 -13 25 -4 4 8 -4 14 -4 16 0 0 -2 9 0 13 2 2 2 10 4 10 2 -2 10 -8 14 -2 5 6 5 8 5 8 2 0 14 3 14 7 0 2 6 10 11 10 2 -2 12 -2 12 -6 0 -2 6 -4 11 0 6 4 20 17 25 19 2 0 16 0 16 6 0 4 -8 10 -8 12 0 2 0 13 4 13 2 0 13 -2 13 2 2 2 6 15 6 15 0 2 -13 4 -15 4 -2 0 -21 16 -21 16 0 0 -18 0 -20 2 0 5 -13 11 -19 17 -4 6 6 0 6 0 0 0 0 15 0 21 -2 4 -6 17 -6 17 -2 0 -6 8 -6 10 0 4 -9 13 -11 13 0 0 0 12 -8 12 -9 0 -15 6 -15 10 0 3 -4 9 -4 9 0 0 15 2 15 6 0 4 0 17 -5 17 -4 0 -8 14 -14 18 -8 3 -11 11 -17 9 -8 -2 -41 -13 -41 -13 0 0 4 7 4 9 0 2 2 20 2 25 0 4 -2 14 -2 14 0 2 6 17 6 17 0 2 2 17 2 17 0 2 4 6 2 8 -2 6 2 19 -2 19 0 0 -19 6 -21 6 -4 0 0 6 0 8 -2 2 -8 11 -8 15 0 2 2 39 2 39 0 0 15 2 15 2 0 0 -3 17 -3 17 -2 0 -14 0 -16 2 -2 4 -23 27 -25 27 -4 0 -34 19 -34 19 0 0 -4 15 -4 17 0 0 -2 18 -2 18 0 0 -19 0 -25 3 -4 0 -25 8 -27 6 -4 -2 -10 -17 -17 -19 -2 0 -22 -8 -25 -8 -4 -2 -14 -11 -18 -9 -4 2 -15 -2 -19 -2 -4 0 -15 2 -10 -6 2 -8 14 -12 18 -23 4 -10 13 -19 13 -23 0 -6 8 -21 10 -23 0 -4 4 -14 2 -21 0 -6 2 -8 4 -10 3 -2 15 -17 15 -29 0 -13 2 -13 2 -17 -2 -4 -2 -14 0 -12 0 2 8 8 11 10 0 0 4 6 4 6 0 0 2 -6 0 -10 -7 -4 -13 -8 -13 -8 -2 0 -10 0 -10 0 0 0 -23 0 -25 -5 -2 -2 8 -14 8 -18 0 -4 4 -4 6 -2 5 2 2 4 9 4 8 0 2 -9 4 -9 4 0 12 -6 12 -10 0 -6 -4 -6 -6 -2 -6 4 -12 10 -19 8 -6 0 -12 0 -18 -4 -5 -2 -2 -8 2 -12 2 -5 10 -13 10 -19 0 -4 2 -13 8 -15 5 -4 7 -8 7 -14 0 -4 2 -11 2 -11 0 0 14 2 16 0 3 -2 7 -8 11 -8 4 0 6 -4 6 -10 0 -5 23 -28 27 -30 2 -6 13 -12 13 -16 0 -4 4 -17 8 -19 2 -4 19 -31 21 -29 2 0 6 2 6 -2 0 -4 4 -7 6 -9 2 -2 2 -6 2 -8 0 -2 0 -8 -2 -4 -4 4 -6 10 -10 10 -2 0 4 -12 8 -16 2 -2 11 -19 11 -21 0 0 0 -13 0 -19 0 -4 8 -29 8 -35 0 -7 0 -15 0 -19 0 -4 6 -13 6 -13 z"/>
-		<path id="reg13" d="M -894 2036 c 0 0 0 4 0 6 0 2 -4 8 -4 10 0 2 -4 15 -8 19 -2 4 -2 21 -2 23 0 4 -13 0 -17 0 -4 0 -6 17 -6 17 0 0 12 8 12 8 0 0 11 6 13 12 4 5 -6 13 -13 15 -4 2 -4 6 -2 10 2 2 -2 9 -6 11 -2 0 -10 0 -15 0 -6 0 -10 4 -16 4 -4 0 -4 -2 -7 2 -2 4 -10 4 -12 4 -2 -2 -23 6 -23 6 0 0 13 28 13 30 4 4 -5 8 -5 12 0 4 0 15 -2 19 -4 6 -14 12 -18 17 -3 4 0 41 0 41 0 0 -11 -2 -15 -4 -6 0 -13 -8 -10 -12 2 -5 12 -30 10 -32 0 -4 -15 -16 -17 -18 -2 -3 -8 -13 -8 -15 0 -2 -8 0 -10 -4 -3 -4 -13 -13 -13 -13 -2 2 -17 0 -19 0 -2 0 -14 -4 -14 -4 0 0 -13 4 -15 6 -2 5 -10 11 -19 9 -10 0 -23 -4 -27 -9 -4 -2 -14 -10 -14 -10 0 0 12 -2 12 0 0 4 11 8 13 8 4 0 21 0 23 2 2 2 10 2 8 -2 -2 -4 -10 -8 -15 -8 -6 0 -18 2 -20 0 -3 -4 -9 -10 -9 -13 -2 0 0 -8 2 -8 4 0 13 8 17 8 4 0 15 5 17 7 2 2 10 6 10 2 0 -2 -12 -9 -6 -13 4 -2 10 -2 10 -4 0 -2 -8 -6 -8 -8 -2 -4 -6 -9 -11 -13 -2 -4 -2 -10 3 -10 6 0 10 8 12 12 4 5 15 15 15 17 0 4 6 10 10 4 2 -6 -8 -8 -8 -10 0 -4 -17 -15 -15 -21 2 -8 33 -35 33 -35 0 0 5 -19 9 -28 2 -6 16 -27 16 -33 3 -8 13 -19 21 -14 7 6 11 4 11 10 0 4 2 10 4 12 2 3 6 9 4 9 0 0 -6 6 -10 6 -9 0 -17 23 -13 23 4 2 21 6 25 2 4 -4 23 -17 27 -8 2 6 -4 14 2 12 7 -4 7 -8 9 -10 2 -2 10 -6 4 -9 -4 -2 -21 -2 -21 -6 0 -4 0 -10 2 -12 0 -2 -4 -4 -8 -4 -2 -3 -7 -15 -4 -19 4 -2 4 -9 4 -13 0 -4 -2 -10 2 -10 4 0 8 -13 12 -17 7 0 23 -6 27 -2 7 2 9 8 13 8 2 0 10 -8 12 -6 2 0 23 0 27 6 0 5 7 13 9 13 4 2 4 4 4 8 0 4 8 4 8 4 l 0 3 z"/>
-		<g id="reg07">
-			<path id="reg07a" d="M -942 3398 c 0 0 -2 -4 -2 -4 2 -2 -4 -11 -8 -11 -4 -2 -17 -14 -15 -16 5 0 17 -9 9 -11 -9 0 -17 -6 -15 -10 4 -2 13 -6 11 -8 -3 -5 -9 -7 -11 -7 -2 0 -8 0 -2 -4 4 -4 8 -8 8 -10 0 -2 -2 -6 -4 -9 -4 -2 -6 -10 -4 -14 2 -2 8 2 13 -4 2 -7 -11 -7 -13 -7 0 0 8 -10 13 -14 2 -4 8 -15 14 -15 6 0 13 2 17 -2 2 -4 12 -6 16 -6 0 0 9 6 9 4 0 -6 -2 -10 0 -12 2 -5 10 -19 8 -19 -2 0 -6 -6 -2 -8 4 0 8 2 8 10 0 4 2 17 0 19 -2 4 -6 10 -6 14 0 4 6 17 6 21 0 2 -2 42 -6 46 -4 4 -12 23 -12 27 0 4 0 23 -5 25 0 0 -4 6 -4 6 -2 2 -12 11 -12 11 0 2 0 10 -2 10 -4 0 -9 0 -9 0 l 0 -2 z"/>
-			<path id="reg07b" d="M -1358 2304 c 0 0 -34 11 -48 11 -15 0 -48 10 -48 12 0 6 -8 15 0 21 8 4 17 4 17 4 0 0 -7 6 -11 6 -6 -2 -12 -2 -17 -2 -4 0 -20 7 -27 2 -6 -4 -10 -12 -16 -12 -9 -4 -19 -8 -21 -8 0 -2 -11 -7 -15 -5 -2 0 -8 3 -8 -4 0 -4 0 -12 -2 -14 0 -2 0 -9 2 -9 2 0 10 0 6 -6 -6 -6 -6 -10 -12 -10 -7 0 -13 0 -15 -2 0 -2 -6 -5 -10 -5 -4 0 -4 -6 -11 -6 -4 2 2 17 2 17 -2 2 -8 6 -4 14 4 9 4 13 4 15 0 4 0 10 2 10 3 3 3 9 -2 9 -2 0 -4 12 0 12 2 2 0 7 2 9 3 0 3 6 0 6 -2 0 -6 8 -6 10 0 0 -2 15 -2 17 0 4 4 10 4 10 0 2 -6 2 -10 2 -4 -2 -17 0 -17 -6 -2 -4 6 -8 -2 -12 -6 -2 -10 10 -12 10 0 0 -2 15 -2 15 0 0 -3 2 -3 -4 0 -7 0 -13 -4 -13 -4 0 -8 0 -8 0 0 -4 -6 -2 -6 -6 0 -2 2 -6 -4 -9 -7 -2 -17 9 -23 7 -5 -2 -11 -7 -9 -11 2 -2 0 -12 -2 -14 -2 -2 2 -4 -2 -7 0 -2 -4 -4 -4 -4 0 -2 -2 -6 -6 -8 -2 0 -11 0 -13 0 -2 2 -8 -2 -14 -2 -7 0 -11 14 -15 10 -4 -2 -6 -4 -10 -4 -5 0 -11 -4 -11 -6 0 -2 -4 -2 -10 -2 -6 0 -15 0 -19 0 -6 0 -10 0 -12 0 -3 0 -9 4 -13 2 -6 -2 -10 2 -10 2 0 0 -9 0 -9 2 0 2 4 4 4 8 0 2 -6 5 -4 7 4 4 9 4 13 4 4 0 12 0 14 2 2 2 0 6 7 6 2 2 6 6 4 6 -4 0 -9 2 -9 0 -2 0 -8 -8 -8 -8 0 0 -8 -2 -8 2 0 0 0 2 2 4 2 2 -4 7 -2 7 2 0 14 4 14 6 0 2 2 8 -6 8 -8 0 -23 -2 -23 -2 0 0 0 6 0 8 2 0 9 9 11 9 4 0 8 6 8 6 0 2 -8 12 -6 15 2 0 10 4 12 4 2 -2 6 -7 9 -7 2 3 8 5 10 7 4 0 21 14 25 16 2 2 4 7 6 7 0 2 -2 4 2 6 7 0 7 2 11 4 0 4 2 2 6 2 4 -2 6 2 2 4 -2 0 -4 9 -4 9 0 4 -4 12 0 12 2 4 8 -4 8 -8 0 -4 9 -9 9 -6 0 2 -5 6 2 6 4 -2 12 2 14 2 0 2 -14 4 -12 6 0 2 2 4 8 4 4 0 8 0 8 2 2 0 9 -2 9 2 2 5 0 9 -2 9 0 4 -9 6 -2 12 4 9 8 11 12 11 2 0 10 -2 13 0 0 0 12 8 14 10 4 6 8 11 8 11 0 0 -8 -3 -14 -11 -6 -6 -23 -6 -21 0 2 8 -2 8 8 17 11 8 2 14 -2 19 -4 2 -12 4 -8 12 4 6 10 21 12 25 0 4 0 19 5 23 4 2 16 8 16 12 0 3 7 7 9 7 2 2 4 8 8 8 2 0 6 4 4 6 -2 4 -6 9 -4 11 0 4 4 12 2 14 -2 7 -4 13 -6 13 -2 0 -9 -6 -9 -6 3 -3 -2 -9 -2 -13 0 -2 7 -12 7 -15 0 -4 -7 -8 -11 -10 -2 -2 -12 -10 -10 -8 0 2 -2 8 4 10 6 6 10 8 8 11 0 2 -8 10 -6 12 2 4 6 13 6 17 0 4 -4 21 -4 21 0 2 4 4 8 8 5 2 9 6 11 8 2 4 8 21 10 23 4 2 4 44 0 44 -4 -2 -4 -8 -2 -11 0 -4 0 -25 -2 -29 -4 -4 -8 -14 -8 -18 0 -3 -6 -9 -9 -9 -2 2 -8 27 -8 29 0 5 -8 15 -8 15 0 2 -6 23 -9 23 -2 2 -10 29 -6 29 4 0 9 -6 11 -4 4 4 0 10 -2 10 -3 0 -7 2 -7 4 0 0 -6 0 -8 -2 -2 0 -2 13 -2 17 -2 4 -19 38 -19 40 0 2 -21 37 -21 37 0 2 -14 27 -21 27 -6 0 -8 2 -8 2 0 0 0 11 2 11 0 2 0 12 6 12 7 0 15 0 15 4 0 2 -6 21 -2 21 2 0 15 -4 15 0 4 2 2 4 10 4 8 -2 12 -2 17 2 2 7 10 15 10 15 0 0 10 13 10 15 3 2 5 10 11 10 4 -2 12 0 14 4 0 6 13 19 17 19 4 0 19 0 21 6 4 6 15 15 19 15 2 0 12 -2 16 -2 5 0 7 -11 13 -11 4 0 14 4 17 9 0 2 14 8 18 8 0 0 9 0 13 0 6 0 10 6 10 10 2 5 0 13 0 13 0 0 2 4 6 4 3 0 9 -4 9 -4 4 2 8 4 8 6 0 2 4 8 6 8 5 3 7 -4 11 -2 4 2 14 5 16 5 5 2 9 6 9 12 0 4 -2 8 4 8 4 0 6 5 10 9 0 2 7 -4 11 -4 4 0 2 4 6 4 4 0 13 -2 13 -2 0 0 4 -9 4 -13 -2 -4 0 -4 2 -6 2 -2 -2 -8 -2 -11 0 0 2 -6 4 -8 0 0 -2 -6 0 -8 2 -4 4 -11 2 -13 0 -2 -2 -12 0 -12 4 0 8 -6 8 -11 2 -4 9 -6 19 -6 10 0 19 0 19 0 0 0 2 -4 2 -6 0 -2 6 -2 8 -2 2 0 17 -6 19 -9 2 0 -2 -6 0 -6 0 -2 10 -2 10 2 0 4 -8 4 -6 4 2 3 4 7 4 9 0 2 7 2 9 2 2 0 8 0 8 2 2 0 12 4 15 6 0 4 6 2 6 -2 -2 0 -6 -4 -6 -4 0 -2 2 -6 4 -6 2 0 6 4 6 8 0 4 -4 6 -6 6 -2 0 0 4 0 4 2 5 4 7 6 5 0 0 4 2 6 2 0 2 6 6 9 4 2 0 2 -11 6 -11 2 0 8 7 10 7 0 2 0 -2 0 -7 -2 -2 0 -8 2 -8 4 0 15 8 13 11 -2 2 -9 4 -9 4 -2 0 -4 2 0 6 3 0 5 4 9 2 4 0 6 2 6 4 0 2 0 11 0 13 0 0 6 4 6 6 0 2 9 6 11 6 4 0 16 11 18 13 0 2 7 4 9 2 6 -2 8 2 10 6 2 0 9 0 11 -4 2 -2 10 4 10 4 2 0 4 0 8 -4 2 -2 17 0 19 -2 2 0 2 -4 4 -9 0 -2 0 -6 7 -6 4 0 2 -2 2 -4 2 -4 6 -8 8 -8 4 0 6 2 10 0 2 -4 13 -11 17 -11 2 0 6 0 6 -4 0 -2 7 -8 13 -8 4 0 16 2 19 2 4 0 12 -4 12 -4 0 0 -2 -11 0 -15 4 0 10 -10 10 -12 0 -5 11 -9 13 -11 4 -2 0 -6 -2 -10 0 -2 -2 -6 -4 -4 -4 2 -9 10 -15 10 -6 0 -10 -4 -12 -4 -5 0 -13 -2 -13 -6 -2 -9 -6 -11 -10 -11 -7 0 -17 -4 -17 -6 0 -4 -2 -10 0 -10 2 0 10 -3 4 -7 -4 -4 -10 -10 -8 -12 4 -4 8 -9 8 -11 0 -2 4 -8 6 -8 3 0 5 -4 5 -6 2 -2 2 -9 -5 -11 -4 -2 -4 -6 -4 -8 2 -2 0 -8 0 -12 -2 -3 -6 -13 -4 -13 4 0 13 2 13 0 2 -2 6 -4 8 -4 4 0 6 -11 10 -11 5 -2 9 -6 7 -8 -5 -4 -13 -8 -11 -10 2 -4 2 -13 0 -13 -2 -2 -6 -12 -6 -14 4 -5 19 -17 19 -17 0 0 -7 -6 -7 -8 -2 -2 -6 -11 -8 -9 -4 0 -19 0 -17 -2 5 -2 17 -16 19 -19 2 -2 0 -14 2 -14 0 -2 4 -8 0 -11 -4 -4 -12 -10 -21 -10 -8 2 -27 6 -29 10 -2 5 -6 9 -6 5 0 -5 2 -9 0 -13 -2 -2 0 -8 4 -10 2 -2 13 -15 11 -15 -2 -2 -7 -8 0 -10 6 -4 23 -17 25 -17 4 -2 14 -12 16 -12 4 -3 23 -21 25 -21 2 -2 11 -9 7 -11 -3 -2 -9 -8 -5 -10 2 -2 19 0 23 -2 2 0 11 -4 11 -11 0 -6 2 -8 2 -8 0 0 10 -4 10 -8 0 -7 9 -19 9 -23 2 -4 4 -17 6 -21 2 -2 14 -19 14 -23 0 -4 7 -27 11 -33 4 -4 33 -34 33 -34 0 0 -10 -4 -12 -6 -5 -4 -11 -4 -13 -2 -4 2 -14 -4 -17 -8 -2 -2 -12 -4 -12 -7 -2 0 -8 -8 -10 -12 -3 -2 -15 -4 -19 -2 -2 0 -15 6 -17 0 -2 -4 -8 -19 -10 -19 0 -2 -7 -6 -7 -10 0 -4 -4 -11 -6 -13 -2 0 -4 -14 -6 -14 -4 0 -19 -2 -19 -5 0 -2 -8 -10 -12 -12 0 0 -9 0 -11 0 -4 0 -21 -4 -23 -6 -4 -4 -10 -13 -14 -15 -4 0 -15 -10 -15 -12 0 -7 4 -13 6 -17 3 -2 7 -8 5 -10 0 -5 -7 -7 -7 -9 0 -2 -12 9 -12 13 -2 4 -2 10 -8 12 -5 0 -9 6 -13 4 -4 -2 -12 -10 -15 -10 -4 -2 -4 -8 0 -8 5 -2 7 -7 7 -9 0 -4 -2 -10 -4 -12 -3 0 -3 -9 2 -9 4 -4 6 -8 2 -12 -2 -4 -2 -8 -7 -8 -6 2 -20 0 -20 -7 0 -4 0 -14 -2 -14 -3 0 -23 -2 -23 -6 0 -3 0 -30 -2 -30 -3 0 -19 5 -21 0 -2 -2 -4 -12 -4 -14 0 -4 -3 -13 -3 -17 -2 -2 -8 -14 -8 -14 0 0 -21 2 -23 0 -4 -3 -16 0 -21 0 -4 2 -33 10 -33 14 -2 2 -6 25 -8 27 0 2 -4 4 -4 9 0 4 -3 16 -5 16 -2 4 -2 9 -2 13 2 0 7 12 0 10 -8 -2 -10 0 -12 2 l -2 2 z"/>
-		</g>
-		<g id="reg11">
-			<path id="reg11a" d="M -460 3992 c 0 0 -7 -2 -7 -4 -2 -2 -16 -5 -23 -5 -8 0 -27 -6 -29 -12 0 -2 -10 -25 -12 -27 -4 -4 -19 -8 -27 -6 -11 0 -13 0 -15 -2 -2 -5 -8 -7 -14 -11 -7 -2 -28 -17 -32 -21 -4 -4 -8 -16 -14 -18 -4 0 -13 0 -15 -7 -2 -4 -6 -8 -10 -6 -9 2 -13 2 -17 -2 -4 -4 -10 -6 -12 -8 -3 -5 -9 -15 -9 -19 0 -2 4 -8 4 -13 0 -2 5 -8 5 -12 0 -4 8 -4 12 -4 4 0 2 -4 4 -7 2 -2 6 -2 6 -2 0 -4 3 -6 7 -4 4 2 2 11 8 13 2 2 13 6 13 -2 0 -7 2 -7 6 -7 4 0 10 0 12 -4 4 -2 15 4 15 9 0 2 4 4 6 4 4 0 6 6 8 8 3 2 13 8 19 6 6 0 23 -6 27 -4 2 0 17 11 36 6 21 -6 29 -12 35 -12 8 0 29 2 31 0 2 -2 5 -6 11 -4 6 0 8 0 12 -2 4 -5 15 -5 15 2 0 4 -8 10 -8 12 0 2 -21 29 -25 38 -3 10 -15 33 -15 37 0 4 -4 15 0 17 4 2 6 0 8 6 0 4 4 8 4 8 0 0 -8 -2 -8 -2 0 0 4 7 6 9 2 0 9 10 7 14 -5 4 -11 4 -15 7 -4 4 -8 10 -8 18 0 9 -2 11 -2 11 l 0 2 z"/>
-			<path id="reg11b" d="M -940 3411 c 0 0 -2 4 -2 6 0 4 -8 6 -12 8 -4 4 -13 11 -15 13 -2 4 -10 6 -12 6 -4 0 -13 0 -13 4 0 2 -10 6 -14 4 -7 0 -9 -4 -9 -6 -2 0 -8 -15 -10 -15 0 0 -4 9 -4 13 0 2 -6 12 -6 17 0 4 4 4 2 6 0 2 -2 6 2 8 2 2 2 2 6 2 2 0 2 6 2 9 0 4 2 8 6 10 2 2 -2 8 -2 8 0 0 4 7 6 11 3 2 0 12 -2 14 -2 4 -2 9 -2 11 0 4 -2 10 -4 10 -4 0 -6 4 -6 6 0 2 0 15 2 11 4 -4 8 0 8 2 0 4 2 6 0 8 -2 2 -2 13 -4 13 -2 0 -2 -11 -4 -9 -4 2 0 11 0 15 0 4 -4 12 -6 15 -2 0 -4 10 -4 14 0 2 -3 15 -3 17 -2 2 -2 8 3 8 2 2 2 6 6 11 4 2 2 6 2 8 0 0 4 8 4 8 2 0 4 9 8 4 5 -2 13 5 17 2 2 -2 10 -2 13 -8 4 -4 4 -17 8 -21 2 -2 12 -6 14 -6 5 4 15 15 17 17 4 2 8 8 11 2 6 -6 4 -11 6 -13 0 -4 0 -12 2 -14 2 -2 14 -48 14 -57 0 -8 0 -22 0 -27 0 -4 0 -23 5 -27 2 -2 12 -6 14 -4 2 0 2 -12 2 -17 -2 -4 -8 -18 -6 -20 2 -2 0 -9 -2 -11 0 -2 2 -12 0 -14 0 -2 -2 -9 -4 -9 -2 0 -9 -4 -4 -6 6 -2 12 -4 8 -6 -4 -2 -17 2 -8 -6 8 -7 0 -7 -5 -7 -6 0 -4 -8 -8 -8 -4 0 -10 0 -10 -4 0 -4 0 -6 -4 -6 l -3 0 z"/>
-			<path id="reg11c" d="M -752 2806 c 0 0 8 5 12 7 5 2 15 2 23 2 11 0 27 -17 30 -19 4 -4 10 -2 16 0 4 2 15 8 21 12 4 3 13 -2 17 -4 4 -2 12 0 12 0 0 0 0 19 2 25 4 4 25 11 29 11 5 0 13 2 15 4 4 2 10 0 17 0 6 0 18 6 25 6 6 2 16 11 16 11 0 0 -2 8 -4 12 -4 2 -16 2 -21 4 -4 0 2 13 5 13 4 0 6 0 12 0 6 4 -4 10 -8 14 -4 4 2 13 6 15 6 0 8 6 8 12 0 5 7 11 11 11 4 4 8 4 10 8 2 4 2 15 -2 17 -4 2 -15 0 -15 0 0 0 3 -9 0 -13 -4 -4 -4 -8 -10 -8 -6 0 -8 4 -12 4 -3 0 -15 -6 -19 -6 -2 -2 -6 2 -2 4 2 2 -7 6 -11 6 -2 0 -12 2 -16 4 -2 0 -17 11 -17 11 -2 0 -13 6 -13 2 0 -2 9 -8 7 -10 -2 -3 -17 8 -19 8 -4 2 -15 12 -13 14 3 7 3 13 5 15 2 2 6 4 6 8 0 5 0 9 4 9 6 4 6 12 6 14 0 4 -2 11 -6 7 -2 -3 -2 4 -2 6 0 2 0 6 -4 4 -4 -2 -11 -2 -11 2 0 2 2 17 5 21 0 4 -3 14 -3 17 0 2 11 20 11 27 0 2 14 29 17 31 2 2 22 6 25 12 2 7 18 21 22 23 5 2 11 7 17 7 8 0 13 14 15 20 0 5 8 34 10 40 2 6 8 48 11 52 4 6 10 25 16 25 6 2 2 6 6 8 5 5 11 15 13 17 2 2 23 15 25 19 4 2 21 19 27 21 4 0 21 2 33 2 13 -2 48 0 55 8 4 10 0 19 -5 19 -4 0 -20 4 -20 12 2 7 4 19 12 23 0 0 19 13 21 13 2 2 14 12 19 16 4 0 39 13 43 17 4 4 29 17 32 23 4 6 27 19 27 19 2 0 27 14 29 18 2 5 14 13 14 13 0 0 21 25 21 35 0 9 -4 21 -4 21 0 2 -2 21 -2 21 0 0 -6 6 -10 0 -7 -4 -21 -15 -21 -17 0 -4 -9 -23 -9 -25 -2 -2 -6 -10 -6 -10 -2 0 -12 -6 -17 -6 -4 0 -18 -2 -25 -7 -4 -2 -14 -4 -16 -8 -2 -2 -2 -8 -9 -8 -4 2 -14 6 -18 8 -4 2 -15 17 -15 23 0 4 -8 15 -8 17 0 2 -6 18 -6 25 0 4 -9 14 0 21 8 6 12 6 16 6 6 0 13 14 19 19 10 8 15 10 15 18 0 9 -7 15 -5 21 0 4 11 13 5 19 -7 6 -7 10 -9 6 -2 -2 -8 -4 -12 -2 -7 0 -15 8 -21 10 -4 0 -13 17 -13 42 0 2 -12 11 -14 11 -2 0 -19 16 -21 20 -4 2 -12 21 -21 21 -8 0 -25 0 -27 -2 -2 -4 -6 -23 -4 -29 2 -6 8 -6 12 -6 7 0 9 -9 11 -15 0 -6 4 -12 2 -14 -2 -5 -4 -15 2 -15 6 -2 29 -8 29 -15 0 -6 -6 -10 -8 -14 0 -2 -4 -17 -4 -23 0 -6 -2 -31 -4 -33 -7 -5 -13 -19 -15 -25 -2 -7 0 -25 -4 -30 -6 -8 -11 -23 -17 -23 -6 0 -14 7 -14 7 0 0 -11 -2 -11 -4 -2 -3 -4 -9 -6 -9 -2 0 -6 -8 -8 -8 -3 -2 -7 -4 -11 -6 -2 0 -6 -13 -4 -13 2 -4 4 -17 0 -21 -2 -2 -4 -8 -8 -12 0 -2 -7 -4 -13 -4 -4 0 -27 4 -27 2 0 -4 2 -7 4 -11 2 -2 4 -6 -2 -8 -4 -2 -10 -8 -14 -6 -5 0 -3 6 -7 6 -2 0 -6 -8 -8 -13 -2 -2 -2 -10 -2 -14 0 -4 -4 -8 -8 -11 -3 -2 -11 -18 -13 -18 -2 0 -19 -2 -21 -4 -4 0 -14 -9 -19 -7 -2 2 -16 2 -18 0 -2 -4 -9 -14 -13 -16 -4 -2 -25 -17 -29 -21 -2 -6 -17 -29 -21 -34 -4 -2 -8 -16 -12 -18 -4 -4 -15 -15 -21 -15 -4 -2 -11 -12 -11 -17 -2 -6 -12 -16 -16 -18 -4 -2 -13 -7 -17 -7 -2 0 -8 5 -10 0 -2 -2 2 -12 2 -12 0 0 -4 -19 -9 -23 -6 -4 -18 -10 -18 -15 0 -4 0 -12 -7 -14 -4 0 -16 -4 -16 -8 0 -5 -6 -11 -2 -11 4 0 6 -8 6 -12 0 -7 -2 -27 -6 -34 -7 -4 -7 -16 -7 -23 0 -4 3 -23 -2 -27 -6 -4 -10 -14 -14 -16 -4 -5 -15 0 -15 -5 0 0 -12 -8 -14 -10 -2 -2 -19 -21 -19 -21 -2 0 -8 0 -8 0 0 0 -9 -4 -11 -8 -2 -4 -8 -8 -12 -8 -5 0 -17 -5 -19 0 -4 0 -23 12 -25 12 0 0 -13 10 -15 13 0 0 -12 14 -12 14 0 0 -15 6 -19 8 -2 3 -8 7 -15 7 -4 0 -10 0 -10 0 0 0 -2 -11 0 -15 4 0 10 -10 10 -12 0 -5 11 -9 13 -11 4 -2 0 -6 -2 -10 0 -2 -2 -6 -4 -4 -4 2 -9 10 -15 10 -6 0 -10 -4 -12 -4 -5 0 -13 -2 -13 -6 -2 -9 -6 -11 -10 -11 -7 0 -17 -4 -17 -6 0 -4 -2 -10 0 -10 2 0 10 -3 4 -7 -4 -4 -10 -10 -8 -12 4 -4 8 -9 8 -11 0 -2 4 -8 6 -8 3 0 5 -2 5 -6 2 -2 2 -9 -5 -11 -4 -2 -4 -6 -4 -8 2 -2 0 -8 0 -10 -2 -5 -6 -15 -4 -15 4 0 13 2 13 0 2 -2 6 -4 8 -4 4 0 6 -11 10 -11 5 -2 9 -6 7 -8 -5 -4 -13 -8 -11 -10 2 -4 2 -13 0 -13 -2 -2 -6 -12 -6 -14 4 -5 19 -17 19 -17 0 0 16 2 18 -2 3 -4 13 2 15 2 2 0 6 -10 8 -10 5 0 19 14 21 12 4 -4 36 -31 38 -33 2 -2 10 -4 10 0 0 2 -4 16 0 21 4 2 13 12 13 12 2 2 8 10 8 13 0 4 10 20 12 18 3 -2 9 -10 11 -14 2 -4 0 -15 2 -17 2 0 15 -10 19 -17 2 -6 2 -20 4 -20 2 0 10 0 10 6 0 6 2 23 7 23 8 0 10 -13 14 -11 4 2 15 15 15 17 2 2 6 4 10 2 4 -4 -2 -15 0 -21 2 -4 -6 -12 -4 -14 0 -2 15 -13 17 -13 2 2 14 6 16 6 4 -2 9 -6 7 -10 -3 -2 8 -13 8 -13 l 2 -2 z"/>
-		</g>
-		<path id="reg02" d="M -754 2808 c 0 0 6 -8 4 -12 -2 -4 -6 -10 -10 -8 0 2 -13 12 -19 12 -2 0 -6 -2 -6 -2 0 0 -2 -10 -2 -10 0 0 -11 0 -9 -5 0 -4 -4 -8 -8 -8 -4 0 -11 2 -15 0 -4 0 -8 -8 -8 -14 2 -3 2 -13 6 -15 2 -2 9 -8 9 -13 0 -4 0 -10 0 -10 0 0 -3 -4 -3 -4 0 0 7 0 7 -4 0 -2 0 -4 0 -4 0 0 10 0 12 2 0 2 2 6 6 6 5 0 9 6 11 10 0 2 6 2 8 2 2 0 4 7 4 11 -2 4 2 8 5 6 2 0 29 -27 31 -27 2 0 8 6 10 4 4 0 11 0 13 4 0 4 8 9 12 9 6 0 11 -5 13 -2 2 0 10 2 14 0 4 -3 13 -5 15 -7 4 0 19 2 23 2 4 0 19 -6 21 -6 2 0 12 11 12 13 4 0 13 -5 13 -2 4 0 14 4 14 8 0 2 -6 6 -4 6 2 0 17 6 19 8 4 0 8 5 10 0 4 -2 9 5 9 3 2 -5 -3 -11 -3 -13 0 -2 -6 -12 -6 -12 -2 0 -8 -7 -6 -9 2 0 10 -2 8 -6 -2 -4 2 -13 -2 -15 -4 -2 -19 -23 -16 -25 4 -6 20 -16 25 -18 6 -5 22 -5 25 -11 0 -6 6 -27 6 -27 0 0 16 8 19 8 2 0 4 -6 6 -8 2 -4 6 -2 6 -4 -2 -2 -2 -10 -2 -10 0 0 12 6 17 8 2 2 6 6 6 8 0 4 4 4 6 6 2 0 8 5 11 3 0 -3 4 -11 6 -11 6 0 10 0 10 -4 2 -8 6 -10 11 -13 4 -4 14 -4 16 0 4 3 7 -10 7 -14 -3 -2 -3 -8 0 -13 0 -4 4 -8 4 -8 0 0 12 4 14 8 2 5 11 7 15 7 6 0 8 4 10 10 0 2 7 4 13 6 4 2 10 7 10 9 2 2 6 6 11 6 2 0 12 2 16 2 4 0 13 -6 15 -6 2 0 19 4 19 4 4 0 14 4 14 6 0 0 4 6 2 13 0 4 -6 16 -6 20 -2 3 4 13 4 17 0 4 -2 11 0 11 2 0 13 2 15 8 0 4 2 6 2 6 0 0 -15 6 -19 6 -4 0 -8 2 -6 5 6 4 21 14 19 16 -3 4 -15 11 -19 11 -2 0 -17 -13 -21 -15 -2 0 -19 4 -19 8 0 0 6 9 9 9 2 2 2 6 4 10 0 4 0 8 -2 11 -5 0 -15 4 -15 8 0 2 0 12 2 12 2 2 8 7 8 7 0 0 -2 10 -4 10 -2 0 2 6 2 6 2 4 -4 9 -6 9 -2 0 -10 0 -10 4 0 2 -6 14 -6 14 0 0 -7 0 -9 0 -2 0 -6 2 -6 5 0 2 -4 6 -6 6 -2 0 -15 -2 -15 2 0 4 -4 8 -6 8 -4 0 -36 0 -38 0 0 0 -18 11 -20 11 -3 2 -13 6 -15 8 -2 2 -8 10 -13 8 -4 -2 -8 -6 -14 -6 -6 0 -13 0 -15 -2 -4 -2 -10 -6 -10 -6 -2 0 -15 -4 -15 -4 -2 0 -23 0 -23 0 0 0 -10 -9 -16 -11 -7 0 -19 -6 -25 -6 -7 0 -13 2 -17 0 -2 -2 -10 -4 -15 -4 -4 0 -25 -7 -29 -11 -2 -6 -2 -25 -2 -25 0 0 -8 -2 -12 0 -4 2 -13 7 -17 4 -6 -4 -17 -10 -21 -12 -6 -2 -12 -4 -16 0 -3 2 -19 19 -30 19 -8 0 -18 0 -23 -2 -4 -2 -12 -7 -12 -7 l -2 2 z"/>
-		<path id="reg06" d="M 27 325 l 4 13 c 0 0 25 20 32 23 6 2 37 10 37 16 0 9 6 21 13 23 4 6 14 13 14 15 0 2 -6 48 -2 50 2 4 13 6 13 16 0 9 -13 19 -13 19 0 0 15 13 19 21 2 10 8 35 0 48 -11 17 -2 37 2 42 6 6 14 27 14 31 0 6 0 10 0 10 l 0 -2 c 0 0 9 0 9 2 0 0 6 2 8 2 2 -2 6 7 11 11 2 2 20 2 22 2 3 0 11 8 11 14 0 5 0 11 0 13 2 4 4 10 4 14 0 5 -2 5 -2 11 0 6 0 8 6 12 4 5 11 5 11 9 0 6 -7 4 -9 4 0 0 -4 2 -4 4 0 4 8 10 2 10 -6 0 -8 -6 -8 -6 0 0 -15 6 -19 9 -4 0 -14 22 -14 27 0 4 -7 12 -7 14 0 2 -8 9 -10 9 -2 0 -6 8 -6 10 0 2 -9 19 -13 19 -2 2 0 10 0 12 0 2 -14 6 -14 9 0 4 -7 14 -9 14 0 0 -2 6 -2 11 l 0 -3 c 0 0 -2 15 -4 17 -2 2 -10 2 -15 -2 -4 -2 -4 4 -4 8 0 5 -4 9 -4 9 0 0 6 0 6 6 0 4 -14 4 -14 10 0 7 4 9 0 13 -4 4 -21 17 -21 17 0 0 2 -11 -2 -11 -4 0 -11 2 -11 6 0 2 -4 11 0 17 5 6 -4 6 -4 6 -2 0 -4 13 -4 17 0 4 -10 0 -10 2 0 2 -7 8 -7 13 0 4 0 16 0 16 0 0 7 0 7 2 0 4 -5 11 -5 15 3 8 5 12 5 12 0 0 8 -4 8 2 0 5 -4 9 -4 9 0 0 6 4 6 4 l 2 0 c 0 0 -2 8 -2 8 -2 0 -6 11 -6 15 0 2 6 12 8 14 0 0 8 7 8 9 3 4 -8 2 -2 6 5 2 9 21 5 21 -3 0 -5 -2 -5 2 0 4 2 23 2 25 0 2 0 12 0 15 -2 4 -8 6 -8 10 2 2 2 4 0 4 -2 0 -2 6 0 8 4 3 4 7 4 9 -2 2 -4 6 -2 10 0 2 2 15 0 15 0 0 -4 6 0 8 6 2 9 17 13 17 4 0 8 -17 12 -13 0 4 -6 13 -4 13 6 2 10 -6 10 -4 3 4 9 4 15 4 2 0 0 8 4 10 4 4 9 2 11 0 4 -2 10 0 10 2 0 2 -10 9 -8 9 4 2 2 8 4 8 2 2 10 0 12 -4 0 -4 0 -9 7 -9 4 0 8 -4 8 -2 0 2 -6 15 -6 21 2 4 10 11 10 15 0 4 -8 6 -10 6 -2 0 -4 6 -2 8 4 0 10 0 12 -4 0 -4 4 0 4 4 0 2 -10 7 -8 9 4 4 10 2 12 0 5 -2 11 -13 11 -15 2 -2 2 -8 2 -4 0 4 0 8 4 8 4 0 8 0 13 -4 2 -4 6 -8 10 -8 6 0 19 -2 21 0 2 0 21 -4 21 -9 0 -4 8 -8 12 -12 4 -2 9 0 13 -2 4 -2 8 -13 12 -13 4 0 9 -6 9 -8 2 -6 8 -6 10 -4 2 4 -4 4 -2 6 4 0 10 6 10 4 0 -2 0 -12 0 -12 4 0 11 2 11 0 0 -4 -11 -13 -7 -13 5 0 9 9 17 7 8 0 11 8 13 0 0 -7 -5 -11 0 -13 4 0 4 8 8 8 4 0 8 -4 12 -4 5 -2 11 -8 17 -8 2 0 13 0 15 4 4 2 12 -2 16 -4 5 -2 5 -6 5 -6 0 0 31 -57 31 -57 0 0 6 -2 6 -2 0 0 27 -31 27 -31 0 0 13 -10 15 -12 2 -5 25 -67 25 -67 0 0 46 -108 46 -108 0 0 8 -30 8 -30 0 0 -44 -37 -44 -37 0 0 -25 -4 -25 -4 0 0 -21 -27 -21 -27 0 0 15 -9 15 -13 0 -2 -6 -14 -2 -19 4 -2 10 -10 10 -14 0 -9 -19 -27 -21 -29 -2 0 -14 -2 -14 -2 0 0 -6 -25 -2 -28 2 -4 6 -16 2 -18 0 -4 -4 -4 -13 -4 -6 0 -14 -5 -16 -13 -2 -8 -2 -17 4 -21 4 -4 6 -14 2 -14 -4 0 -17 -2 -17 -2 0 0 6 -9 6 -9 0 0 -4 -35 0 -35 5 -2 11 0 11 -4 0 -5 -15 -48 -17 -57 -6 -6 -16 -27 -16 -27 0 0 -17 -21 -17 -25 0 -4 -6 -23 -8 -29 -5 -6 2 -29 6 -44 4 -12 12 -33 10 -35 0 -4 -25 -10 -27 -17 -2 -6 -19 -33 -25 -33 -6 0 -19 -4 -21 -10 -2 -7 -12 -28 -8 -36 0 -6 8 -27 8 -31 0 -4 -12 -13 -12 -17 0 0 8 -8 8 -8 0 0 8 -33 8 -40 0 -4 0 -10 -4 -14 -2 -2 -16 -25 -21 -25 -4 0 -31 2 -31 -2 0 -2 -4 -27 -4 -27 0 0 -21 8 -21 14 0 4 -4 8 -12 8 -9 0 -21 7 -21 9 0 4 -11 21 -13 21 -2 0 -6 8 -6 16 0 11 4 48 4 54 0 7 -4 23 -10 23 -4 0 -11 9 -11 11 0 4 -6 25 -12 25 -6 -2 -33 -21 -35 -23 -5 -4 -15 -2 -15 0 0 0 -8 8 -10 12 -5 2 -11 2 -11 5 0 0 -2 12 -8 8 -4 -6 -11 -11 -15 -11 -4 0 -6 3 -6 3 0 0 -8 -15 -15 -23 -6 -7 -10 -11 -12 -17 0 -6 -6 -15 -8 -19 -3 0 -9 0 -9 0 l -29 17 27 31 z"/>
-		<g id="reg15">
-			<path id="reg15a" d="M -202 1629 c 0 0 -15 32 -19 36 -2 4 -4 12 -4 16 0 5 -8 5 -8 9 0 4 -15 35 -15 39 0 7 0 32 2 29 4 0 15 -31 15 -39 2 -11 21 -48 21 -54 2 -7 8 -32 8 -36 z"/>
-			<path id="reg15b" d="M -138 1681 c 0 0 -2 -4 3 -6 4 -2 2 -19 0 -23 -5 -4 0 -16 2 -21 2 -6 -5 -14 -2 -18 4 -5 18 -34 25 -38 2 -4 12 -8 12 -6 0 2 4 8 6 8 4 -2 0 -10 4 -10 3 -2 9 0 9 8 0 8 -6 8 -6 15 0 4 -7 0 -7 6 0 4 -2 15 -2 17 0 2 6 8 6 14 0 4 -10 2 -10 6 0 7 -4 15 -10 15 -7 2 -9 6 -9 10 0 5 -6 7 -6 11 0 4 -4 12 -12 12 l -3 0 z"/>
-			<path id="reg15c" d="M 31 338 c 0 0 25 20 32 23 6 2 37 10 37 16 0 9 6 21 13 23 4 6 14 13 14 15 0 2 -6 48 -2 50 2 4 13 6 13 16 0 9 -13 19 -13 19 0 0 15 13 19 21 2 10 8 35 0 48 -11 17 -2 37 2 42 6 6 14 27 14 31 0 6 0 10 0 10 0 0 -8 6 -8 6 0 0 -6 -6 -12 -4 -2 4 -9 11 -13 7 -2 -3 -6 -3 -6 -3 0 0 0 13 -4 11 -7 -2 -21 -17 -21 -17 0 0 -4 9 -8 9 -5 0 -5 -7 -7 -5 0 2 -4 17 -4 17 0 0 6 6 6 6 0 2 -4 9 -8 9 -2 0 -6 0 -6 0 0 0 -11 4 -11 4 0 0 7 4 7 4 -2 2 -11 8 -15 8 -6 0 -10 0 -8 7 2 2 8 6 8 12 0 4 -4 4 -4 2 -2 0 -6 -6 -6 -6 0 0 2 12 4 14 0 3 -2 13 -2 15 0 2 -2 10 -2 10 0 0 -11 7 -11 7 0 0 6 12 11 12 2 0 2 6 -2 6 -5 0 -19 7 -9 15 11 6 2 4 2 4 l 2 0 c 0 0 13 4 13 6 0 3 0 9 0 11 2 0 6 2 4 4 -4 2 -8 10 -8 10 0 3 -9 7 -9 7 0 0 -4 14 -4 21 0 8 -2 18 -2 18 l -2 0 c 0 0 -19 23 -25 25 -8 2 -15 7 -17 9 -2 0 -10 10 -10 10 0 0 -15 13 -17 15 0 4 -4 -13 -8 -9 -4 4 -2 9 -6 9 0 0 -5 6 -5 8 0 2 -6 4 -8 4 -2 0 -2 13 -4 13 -2 -2 -10 -9 -10 -7 0 2 -3 7 -7 7 -2 0 -6 4 -6 8 0 4 -6 6 -6 8 0 4 -11 2 -11 7 0 4 13 4 13 6 0 4 -4 10 -6 10 -2 2 -9 2 -9 6 0 3 -6 3 -8 0 -2 -2 -6 -8 -10 -8 -3 0 4 8 4 11 0 2 -7 6 -4 10 2 2 6 6 4 8 -2 2 -7 11 -11 13 -2 2 -6 2 -6 6 0 4 -4 -2 -8 -6 -4 -2 -4 2 0 8 6 6 2 6 -2 6 -2 0 0 7 2 9 2 2 6 4 2 8 -4 4 -9 -4 -9 -2 0 2 0 15 0 19 -2 2 -6 16 -6 16 0 0 4 17 4 21 0 2 -4 11 -8 6 -6 -4 -8 0 -8 5 0 2 0 10 0 12 0 4 -7 11 -2 13 2 2 4 12 4 16 0 2 -4 17 -4 19 0 2 2 8 2 10 0 3 -2 7 -2 9 0 4 4 4 4 6 0 4 6 10 6 15 0 2 -8 4 -8 4 0 0 4 6 10 6 6 0 13 0 13 2 0 4 0 13 2 13 4 2 16 -13 18 -9 3 7 7 19 9 21 2 2 19 13 19 15 0 2 0 6 -3 6 -2 0 7 8 9 8 4 2 10 7 10 11 0 2 -2 10 0 12 0 0 15 11 15 13 0 2 2 12 2 12 0 0 -17 6 -17 9 0 2 -16 18 -16 18 0 0 -11 9 -11 11 0 0 -10 0 -10 0 0 0 -7 8 -7 8 0 0 15 6 15 10 0 5 4 19 -2 19 -6 0 -10 15 -10 15 0 0 -5 -9 -5 -9 -4 0 -8 28 -12 25 -4 -4 -4 -14 -4 -18 2 -2 4 -13 -2 -15 -9 0 -13 11 -13 13 0 4 2 16 0 18 -4 2 -10 13 -17 13 -4 0 -8 -2 -8 -2 0 0 -8 14 -12 10 -5 0 -15 0 -13 0 2 2 8 15 8 17 0 2 -6 6 -6 8 0 2 2 4 2 6 -4 0 -8 3 -4 7 4 4 13 0 13 4 0 4 -5 8 -2 12 2 2 -13 19 -13 23 0 2 2 11 2 11 0 0 -12 -11 -12 -9 2 2 2 15 4 19 4 4 0 8 0 13 0 2 0 8 0 8 0 0 -4 -4 -4 4 0 11 10 21 2 29 -11 11 -7 19 -4 23 2 4 0 13 -5 13 -4 4 -4 21 -4 21 0 2 -8 20 -8 20 0 2 -13 30 -13 30 0 0 -10 29 -12 29 0 0 -8 12 -17 6 -6 -4 -14 -4 -14 -4 -2 0 -11 2 -17 0 -4 -6 -10 2 -15 2 -6 0 -18 -4 -18 -2 0 2 8 6 4 8 -4 4 -13 0 -21 2 -4 4 -17 19 -17 29 0 9 9 15 9 15 0 0 -9 27 -13 27 -4 0 -23 -6 -25 -6 -4 2 -21 10 -27 10 -8 -2 -35 -12 -35 -16 0 -3 6 0 6 -7 -2 -8 0 -14 2 -14 4 4 10 -7 6 -11 -6 -4 -6 -14 -6 -18 0 -7 -8 -11 -8 -17 0 -8 -2 -17 -7 -23 -2 -6 -2 -13 0 -10 3 2 15 12 15 2 0 -11 -12 -13 -8 -21 0 -2 14 -2 16 2 2 4 2 -17 2 -21 0 -4 -8 -6 -10 -6 -2 -2 -8 -17 -10 -21 0 -4 -7 -10 -11 -17 -2 -6 -8 -41 -8 -46 0 -4 -8 -4 -8 -4 -3 0 -3 -4 -3 -6 0 -2 -2 -8 -4 -10 -6 -5 -2 -13 -2 -17 0 -4 -2 4 -6 -2 -2 -4 6 -11 0 -15 -2 -6 6 -18 6 -21 0 -2 4 -27 9 -29 2 -6 0 -16 -5 -10 -2 4 -4 0 -10 0 -2 0 -10 6 -17 0 -6 -4 0 -36 0 -40 0 -4 -2 -14 -2 -16 0 -5 6 -17 4 -19 -2 -2 -4 -6 -4 -11 0 -4 4 -4 4 -4 l 0 2 c 0 0 5 2 5 2 0 0 8 9 10 15 6 6 12 -2 15 -6 2 -2 8 -19 8 -21 0 -4 0 -25 0 -31 0 -4 2 -13 4 -17 2 -2 6 -10 6 -15 0 -2 0 -14 0 -18 0 -4 15 -13 17 -13 2 0 21 -8 21 -14 2 -5 6 -17 8 -25 4 -5 0 -40 -6 -46 -4 -4 -4 -15 -4 -15 0 -2 6 -29 6 -35 0 -6 19 -17 25 -17 4 0 2 -14 2 -21 0 -4 -19 -12 -21 -16 -4 -5 6 -27 6 -27 0 0 13 -23 13 -30 0 -6 -4 -20 -6 -23 0 -2 -7 -6 -7 -12 0 -2 5 -15 3 -17 -3 -4 -9 -21 -7 -21 4 0 13 -10 11 -12 -2 -4 -4 -17 -2 -21 0 -4 -5 -17 -5 -17 0 -2 5 -14 9 -14 6 -4 6 -8 6 -17 0 -4 6 -21 15 -29 8 -8 18 -21 23 -25 4 -6 25 -12 27 -10 6 2 12 8 12 8 0 0 11 8 13 6 2 -4 14 -41 14 -46 0 -6 -16 -18 -16 -18 0 0 37 -32 39 -36 0 -4 4 -27 6 -31 4 -4 4 -40 4 -44 0 -4 11 -14 11 -19 -2 -4 -4 -35 0 -35 4 0 14 -12 21 -15 4 -4 21 -6 23 -12 0 -6 -5 -23 0 -29 6 -4 23 -17 23 -21 0 -2 10 -15 14 -17 4 -2 8 -16 8 -25 0 -8 -8 -37 -4 -41 0 -7 15 -11 15 -11 0 0 8 -29 10 -33 0 -2 23 -25 27 -25 2 0 17 12 21 10 4 -2 15 -12 15 -12 0 0 -4 -9 -4 -15 2 -2 12 -39 16 -37 4 2 23 10 25 10 4 0 17 2 21 6 2 7 21 11 27 9 4 -7 11 -15 11 -15 0 0 -11 -4 -11 -4 0 0 4 -19 4 -19 0 0 15 4 15 0 0 -2 -13 -6 -13 -6 0 0 -2 -23 -2 -23 0 0 15 -4 17 -2 2 2 25 29 25 29 l 4 13 z"/>
-		</g>
-		<path id="reg12" d="M -1027 2438 c -4 0 -19 -2 -19 -5 0 -2 -8 -10 -12 -12 0 0 6 -15 6 -19 -4 -4 -4 -16 0 -21 4 -2 23 -23 27 -23 4 0 10 -2 10 -2 0 0 0 11 0 15 0 4 -2 8 0 10 3 5 0 17 0 21 0 6 9 0 11 4 0 2 0 11 -2 15 -2 2 -19 15 -19 15 l -2 2 z"/>
-		<g id="reg04">
-			<path id="reg04a" d="M -700 1875 c 0 0 0 -2 0 -6 2 -4 6 2 8 2 2 2 5 -4 2 -6 0 -2 -8 -9 -8 -11 0 0 -6 0 -6 -4 0 -6 4 -6 6 -10 0 -4 6 0 8 0 3 -4 5 -9 5 -11 -2 0 -7 -8 -7 -10 0 -4 7 -6 7 -11 0 -2 -7 -8 -7 -8 0 0 7 -2 9 -2 6 0 12 -6 12 -8 0 -2 -6 -2 -6 -4 -2 0 -13 -9 -10 -9 4 0 16 4 18 4 2 0 7 -2 7 -4 0 -4 8 -6 8 -6 0 -2 -8 -8 -8 -8 0 0 8 -2 12 0 4 0 6 -5 6 -7 2 -4 2 -14 2 -18 0 -5 5 -11 5 -11 0 0 8 -6 12 -6 2 0 0 6 -2 6 -2 0 4 6 4 4 0 -2 -2 7 2 9 2 2 6 -4 6 -9 0 -4 5 5 5 7 4 0 6 -9 6 -11 0 -2 4 -6 6 -10 2 -2 6 -6 6 -11 0 -4 -6 -10 -8 -10 -2 -2 -19 0 -21 0 -2 0 -4 -10 -4 -10 0 0 -12 6 -12 6 0 0 4 -2 4 -6 0 -3 8 -5 8 -5 0 0 0 -6 0 -6 0 -2 -21 -4 -21 -4 0 0 9 0 9 -2 2 0 10 -2 10 -2 0 0 0 -17 0 -23 0 -4 0 -8 -4 -11 -2 -2 -13 -6 -17 -6 -4 0 -12 2 -17 4 -4 5 0 -4 -2 -2 -2 2 -4 -2 -8 -2 -4 0 -12 6 -17 13 -2 4 0 16 0 18 2 5 2 11 2 13 -2 4 -8 -2 -8 -4 0 -2 -4 2 -6 2 -2 0 4 -13 4 -13 2 -4 0 -10 -4 -10 -4 2 -11 10 -11 10 0 2 -2 5 -6 7 -4 2 0 12 -6 12 -8 2 -6 -6 -4 -10 0 -2 -4 -4 -6 -4 -5 0 0 4 -3 8 -4 2 -10 -6 -12 -8 -4 0 -4 -9 0 -13 4 -2 8 4 8 8 0 0 4 -4 9 -4 4 0 0 -8 0 -8 -2 0 6 -8 8 -11 4 -4 17 -8 21 -10 4 -2 10 -2 12 0 4 4 7 6 9 2 4 -4 14 -4 16 -4 4 0 11 0 15 0 6 0 17 4 19 6 2 2 10 4 14 4 4 0 6 -8 11 -12 4 -6 8 -11 8 -15 0 -4 0 -8 0 -23 0 -14 4 -14 4 -18 2 -5 13 -13 13 -15 -2 0 -19 10 -21 15 -6 4 -19 0 -25 0 -2 0 -23 20 -27 29 -7 8 -27 16 -29 16 -5 -2 -17 -4 -21 -4 -7 0 -13 0 -15 0 -4 0 -27 27 -29 34 -2 4 -2 14 -4 18 -2 5 -6 21 -9 27 -4 7 -8 28 -8 32 0 4 0 21 -2 25 0 4 -8 29 -8 31 -2 6 0 10 2 15 4 2 6 -5 10 -7 2 -4 2 11 6 15 5 4 11 10 11 12 0 5 -4 9 -4 11 0 4 2 14 -2 19 0 4 -2 16 -2 16 l 0 2 c 0 0 16 11 18 11 2 0 13 6 17 8 4 2 8 2 12 0 7 -2 13 0 13 0 l 2 2 z"/>
-			<path id="reg04b" d="M -558 1919 c 0 0 -11 -4 -13 -4 -2 0 -6 6 -10 6 -2 0 -13 -10 -15 -15 -2 -2 -14 -10 -14 -12 0 -4 6 0 6 -2 0 -4 -4 -11 0 -13 2 -2 14 -4 17 2 2 5 6 11 10 11 6 0 8 -4 12 -4 0 2 0 8 5 10 2 2 4 8 4 13 l -2 8 z"/>
-			<path id="reg04c" d="M -342 1900 c 0 0 -16 -12 -16 -17 -2 -4 -2 -16 4 -20 8 -2 19 12 23 16 2 4 2 11 0 15 l -11 6 z"/>
-			<path id="reg04d" d="M -540 1888 c 0 0 -10 -7 -10 -9 0 -4 -8 -8 -6 -14 4 -2 -4 -7 -9 -9 -6 -2 -25 -10 -25 -14 3 -6 0 -21 0 -27 -2 -4 -2 -21 -4 -25 0 -4 4 -4 7 -4 2 0 12 0 12 -7 0 -4 13 0 13 -4 0 -4 -3 -12 -11 -17 -6 -4 15 0 17 5 4 2 14 -2 14 2 0 2 2 12 -2 14 -4 2 -2 7 -2 9 2 4 9 0 9 -7 2 -4 6 -6 8 -4 2 4 -2 17 -2 17 0 0 4 8 4 6 0 -2 2 -14 2 -23 0 -6 -6 -6 -8 -8 -4 -4 2 -8 6 -11 6 0 15 -10 21 -6 4 4 12 15 12 17 0 6 0 31 -4 33 -6 4 -19 13 -21 17 -2 4 2 14 7 17 2 4 4 8 0 14 -5 4 -21 11 -21 13 2 2 4 6 2 10 0 2 -9 13 -9 13 l 0 2 z"/>
-			<path id="reg04e" d="M -631 1861 c 0 0 -15 2 -19 0 0 0 -12 -7 -12 -7 -3 0 -9 -2 -9 -4 0 -2 0 -8 0 -10 -4 0 -6 -11 -6 -15 0 -4 -2 -8 -4 -8 -2 0 2 -11 2 -11 0 -4 2 -8 4 -8 4 0 10 8 10 4 0 -2 3 -8 9 -8 6 0 14 -2 14 0 2 4 9 12 9 14 0 3 6 3 6 0 0 -6 2 -14 6 -8 2 6 6 11 4 15 -2 0 -4 0 -4 4 0 2 4 4 4 6 0 4 2 11 2 15 -4 2 -6 2 -6 6 0 4 2 12 -4 15 -6 2 -8 0 -8 0 l 2 0 z"/>
-		</g>
-		<g id="reg01">
-			<path id="reg01a" d="M -981 2673 c 0 0 10 -4 10 -8 0 -7 9 -19 9 -23 2 -4 4 -17 6 -21 2 -2 14 -19 14 -23 0 -4 7 -27 11 -33 4 -4 33 -34 33 -34 0 0 -10 -4 -12 -6 -5 -4 -11 -4 -13 -2 -4 2 -14 -4 -17 -8 -2 -2 -12 -4 -12 -7 -2 0 -8 -8 -10 -12 -3 -2 -15 -4 -19 -2 -2 0 -15 6 -17 0 -2 -4 -8 -19 -10 -19 0 -2 -7 -6 -7 -10 0 -4 -4 -11 -6 -13 -2 0 -4 -14 -6 -14 l 2 -2 c 0 0 17 -13 19 -15 2 -4 2 -13 2 -15 -2 -4 -11 2 -11 -4 0 -4 3 -16 0 -21 -2 -2 0 -6 0 -10 0 -4 0 -15 0 -15 0 0 15 -16 19 -20 2 -7 -2 -19 -4 -19 -2 0 -10 -9 -10 -11 0 0 -2 -4 -2 -4 0 0 -3 -37 0 -41 4 -5 14 -11 18 -17 2 -4 2 -15 2 -19 0 -4 9 -8 5 -12 0 -2 -13 -30 -13 -30 0 0 21 -8 23 -6 2 0 10 0 12 -4 3 -4 3 -2 7 -2 6 0 10 -4 16 -4 5 0 13 0 15 0 4 -2 8 -9 6 -11 -2 -4 -2 -8 2 -10 7 -2 17 -10 13 -15 -2 -6 -13 -12 -13 -12 0 0 -12 -8 -12 -8 0 0 2 -17 6 -17 4 0 17 4 17 0 0 -2 0 -19 2 -23 4 -4 8 -17 8 -19 0 -2 4 -8 4 -10 0 -2 0 -6 0 -6 0 0 0 -11 4 -11 3 0 11 0 7 -4 -4 -2 -19 -4 -17 -10 0 -7 4 -11 6 -13 7 -2 2 -12 7 -12 6 -5 10 -7 14 -5 6 0 31 0 38 0 6 2 8 9 8 15 0 6 -4 12 0 17 4 2 12 10 17 8 4 0 0 -8 -5 -13 -6 -2 0 -8 5 -8 4 0 8 8 8 13 0 4 -6 35 -4 37 0 2 10 -33 12 -37 0 -5 -2 -9 -2 -11 0 -4 9 -25 17 -23 8 2 19 7 23 7 4 0 16 4 19 12 2 8 16 27 18 27 2 2 15 4 15 4 0 0 -13 -6 -15 -10 0 -2 -8 -21 -10 -25 -2 -4 -8 -8 -15 -13 -6 -2 -16 -2 -18 -8 -3 -6 -7 -12 -3 -12 5 0 11 2 9 -5 -2 -8 -13 -8 -9 -12 5 -4 9 -6 3 -8 -7 -3 -13 0 -13 -9 0 -8 0 -12 10 -10 11 2 15 0 17 -9 0 -8 -4 -8 -8 -10 -4 -4 -4 -10 -4 -12 0 -5 -5 -11 -5 -15 0 -4 3 -17 3 -17 0 0 16 11 18 11 2 0 13 6 17 8 4 2 8 2 12 0 7 -2 13 0 13 0 0 0 2 8 6 8 2 0 9 5 11 7 2 0 8 0 8 6 0 6 -23 19 -21 19 6 0 21 -9 23 -5 0 7 -17 17 -10 17 6 0 14 0 14 2 4 0 11 6 15 6 4 0 12 5 12 7 0 4 2 8 11 6 8 0 12 -4 16 -4 5 0 5 8 5 12 0 4 -7 15 -9 15 -4 4 -14 4 -14 8 0 4 0 9 2 9 2 0 -9 10 -9 10 0 0 21 -13 23 -10 2 4 9 12 13 12 2 0 14 0 14 -2 2 -4 15 -15 11 -17 -2 0 -9 2 -4 -2 8 -4 23 -4 27 -4 4 0 18 -2 25 -10 6 -7 21 -19 23 -19 4 0 18 0 20 0 3 2 -8 2 -10 2 -4 0 -17 10 -17 10 0 2 -4 9 0 9 5 0 7 -9 13 -11 6 -2 14 0 19 0 4 0 10 -2 10 2 0 2 2 17 4 17 4 2 9 6 11 8 0 5 2 11 12 9 8 0 15 0 15 6 0 4 -2 6 0 8 2 2 8 4 6 7 0 2 -4 14 2 18 2 2 21 7 21 7 l 0 -3 c 0 0 0 7 0 9 0 2 0 10 2 12 4 2 0 7 0 11 0 4 2 29 4 31 2 4 0 15 0 15 -4 2 -25 8 -23 29 0 6 23 27 27 31 4 6 -6 19 -6 25 0 4 6 17 8 25 5 4 5 29 0 33 -2 7 0 15 5 21 2 6 8 27 12 31 4 9 4 27 0 34 -4 6 -4 25 -4 25 0 0 0 8 -6 10 -7 0 -7 -6 -7 -10 0 -4 -8 -4 -10 -7 -2 -2 -4 -4 -4 -10 0 -6 -6 -8 -15 -8 -6 0 -10 6 -10 8 0 4 8 2 12 4 7 2 9 11 7 11 -3 0 -19 0 -28 2 -8 2 -22 16 -25 18 -4 0 -18 -8 -20 -4 -2 2 -9 11 -11 11 -4 0 -8 4 -12 10 -4 6 -25 2 -29 0 -3 0 -19 11 -28 13 -6 0 -6 14 -14 16 -6 4 -6 -10 -13 -10 -6 0 0 17 2 23 3 6 5 14 9 21 4 4 8 14 4 16 -4 4 6 15 6 21 0 4 0 13 4 15 5 4 15 18 19 21 8 2 21 8 23 12 4 2 19 21 21 25 4 4 14 13 19 13 6 0 8 25 8 25 0 0 0 8 2 10 0 2 -4 0 -6 4 -2 2 -4 8 -6 8 -3 0 -19 -8 -19 -8 0 0 -6 21 -6 27 -3 6 -19 6 -25 11 -5 2 -21 12 -25 18 -3 2 12 23 16 25 4 2 0 11 2 15 2 4 -6 6 -8 6 -2 2 4 9 6 9 0 0 6 10 6 12 0 2 5 8 3 13 0 2 -5 -5 -9 -3 -2 5 -6 0 -10 0 -2 -2 -17 -8 -19 -8 -2 0 4 -4 4 -6 0 -4 -10 -8 -14 -8 0 -3 -9 2 -13 2 0 -2 -10 -13 -12 -13 -2 0 -17 6 -21 6 -4 0 -19 -2 -23 -2 -2 2 -11 4 -15 7 -4 2 -12 0 -14 0 -2 -3 -7 2 -13 2 -4 0 -12 -5 -12 -9 -2 -4 -9 -4 -13 -4 -2 2 -8 -4 -10 -4 -2 0 -29 27 -31 27 -3 2 -7 -2 -5 -6 0 -4 -2 -11 -4 -11 -2 0 -8 0 -8 -2 -2 -4 -6 -10 -11 -10 -4 0 -6 -4 -6 -6 -2 -2 -12 -2 -12 -2 0 0 0 2 0 4 0 4 -7 4 -7 4 0 0 3 4 3 4 0 0 -21 -12 -23 -17 -2 -2 -11 -10 -15 -10 -4 -2 -6 -4 -6 -8 0 -2 -6 -2 -9 -2 -4 0 -4 -11 -10 -11 -4 0 -12 0 -12 2 0 2 -3 15 -11 15 -8 0 -19 -2 -23 -2 -2 0 -12 4 -16 2 -7 -4 -15 -2 -21 -4 -4 -2 -15 -11 -15 -11 l -8 -4 z"/>
-			<path id="reg01b" d="M -433 1973 c 0 0 -4 0 -4 -4 0 -4 -7 -4 -7 -4 0 0 -6 8 -8 8 -4 0 -15 0 -15 -4 0 -6 -2 -15 0 -17 0 0 7 0 2 -4 -4 -4 5 -2 0 -4 -2 -2 0 -4 5 -4 6 0 12 6 16 4 4 -2 0 -2 -4 -6 -6 -2 -12 -2 -12 -5 0 -2 6 -12 12 -10 4 0 0 13 8 15 7 2 5 8 3 10 -3 2 -5 4 2 10 8 7 8 7 8 9 -4 2 -4 6 -4 6 l -2 0 z"/>
-		</g>
-		<g id="reg08">
-			<path id="reg08a" d="M -1633 1458 c 0 0 14 3 18 3 7 0 25 2 25 -7 -2 -6 -14 -16 -14 -16 0 -5 -2 -15 -8 -15 -5 0 -11 2 -11 6 0 4 8 7 11 9 2 2 8 6 4 6 -4 0 -7 0 -9 2 0 0 -4 0 -2 2 2 2 7 6 2 6 -4 -2 -12 -4 -16 -2 -2 2 2 6 2 6 l -2 0 z"/>
-			<path id="reg08b" d="M -1602 1729 c 0 0 -6 0 -6 0 -2 2 -9 9 -11 7 -4 -3 -10 0 -10 -5 2 -4 10 -12 14 -16 3 -2 9 -4 11 -9 4 -2 8 -4 12 -2 2 2 0 9 -2 11 -2 0 0 4 -2 8 0 2 -4 6 -6 6 z"/>
-			<path id="reg08c" d="M -1575 1381 c 0 0 -6 0 -4 -2 0 -2 6 -10 0 -10 -4 0 -6 4 -6 0 0 -2 -7 -4 -11 -8 -2 -5 2 -15 0 -17 -2 -2 -12 -13 -12 -17 0 -4 4 -10 8 -6 2 2 6 -4 8 0 5 2 9 6 9 2 0 -4 4 -15 8 -17 2 -4 4 -2 4 0 0 5 2 7 4 9 0 2 0 8 -4 12 -4 4 -6 9 -6 11 0 2 2 10 2 14 0 2 -4 9 0 9 2 2 15 4 15 6 0 4 -5 6 -7 6 -4 2 -8 8 -8 8 z"/>
-			<path id="reg08d" d="M -1606 1286 c 0 0 -6 -3 -6 -9 0 -6 12 -6 12 -10 0 -4 -8 -6 -6 -11 2 -4 10 -6 10 -6 0 0 -4 -12 2 -17 7 0 9 13 9 13 0 0 2 -2 4 -2 2 0 6 -2 4 -6 -2 -7 2 -9 8 -9 7 0 13 0 15 -2 4 -4 12 -8 14 -6 3 4 5 6 0 12 -2 5 -6 7 -4 11 2 2 -2 10 -6 10 -4 0 -4 2 -10 7 -5 2 -9 -3 -9 -3 0 0 9 7 7 9 0 4 -9 2 -9 2 0 0 0 6 -2 6 -10 2 -6 -12 -8 -10 -2 2 -2 10 -6 10 -5 0 -5 2 -5 6 0 2 -4 2 -6 2 -2 0 -2 -4 -6 -2 l -2 5 z"/>
-			<path id="reg08e" d="M -1612 1836 c 0 0 -7 4 -9 4 -2 0 -6 2 -6 2 -2 0 -10 2 -13 2 -4 0 -6 -4 -6 -13 0 -8 2 -10 2 -12 0 -2 4 -4 7 -4 4 0 12 6 12 10 2 2 8 6 10 6 3 0 7 5 3 5 z"/>
-			<path id="reg08f" d="M -1704 1708 c 0 0 -8 -2 -8 -2 0 0 -13 -14 -19 -16 -6 0 -13 -4 -13 -9 -2 -4 -2 -10 -6 -12 -4 -4 -6 -19 -12 -17 -5 0 -13 11 -15 17 -4 2 -27 2 -27 2 0 0 -2 -23 -4 -27 -2 -4 -7 -11 -7 -13 0 -4 -4 -10 -8 -12 -2 0 8 -13 13 -15 0 0 8 9 12 4 4 -4 -4 -14 -2 -14 2 -2 13 -2 15 -4 0 -2 8 10 8 8 2 -2 19 -17 19 -19 0 -2 12 -10 12 -10 0 0 13 2 13 2 2 0 8 2 10 -2 2 -2 6 -4 11 -2 4 2 8 4 12 2 2 -2 10 -4 13 -2 4 4 12 10 14 10 4 0 8 6 8 9 0 4 0 22 0 25 0 6 7 16 7 20 0 5 -9 9 -11 9 -2 0 -8 2 -4 4 0 4 2 4 4 2 0 -2 11 -2 13 2 2 4 4 15 4 21 0 4 -6 12 -8 12 -5 -4 0 -12 0 -16 0 -2 -7 -4 -9 -4 0 0 2 16 0 16 -4 2 0 6 0 13 0 2 -4 6 -8 4 -4 0 -13 0 -13 0 0 2 -8 10 -10 12 -2 2 -4 2 -4 2 z"/>
-			<path id="reg08g" d="M -1358 1771 c 0 0 -21 -19 -23 -21 -11 -4 -11 -17 -11 -19 0 -2 2 -16 2 -23 0 -4 0 -14 0 -18 0 -4 3 -32 7 -46 4 -15 -4 -21 -7 -21 0 -2 0 -8 0 -12 0 -7 -8 -11 -8 -13 0 -4 -4 -10 -8 -10 -2 -2 -31 -30 -31 -30 -5 -2 -9 0 -9 5 -2 4 -21 -5 -25 -5 -4 -2 -16 -10 -16 -14 0 -4 8 -4 10 0 0 0 15 2 19 2 4 0 16 -6 16 -8 2 -2 15 6 17 8 2 0 8 -4 8 -8 0 -2 -4 -9 -8 -11 -2 -2 2 -4 2 -8 0 0 -10 0 -10 -4 0 -4 14 -4 18 -4 7 4 17 -9 19 -13 0 -4 15 -15 19 -15 2 0 19 -22 19 -22 0 0 14 0 16 -32 2 -29 -16 -41 -16 -41 0 0 -36 -15 -36 -15 0 0 -8 -4 -10 -6 -4 -2 -13 -4 -17 0 -4 2 -6 0 -8 0 0 0 -19 0 -23 0 -4 0 -19 10 -23 14 -2 7 -17 11 -17 11 0 0 9 -6 9 -6 2 0 12 -13 12 -15 0 -2 9 -4 9 -4 0 0 8 -4 10 -4 2 0 2 -7 -2 -7 -4 0 -11 -4 -11 -4 0 0 11 -2 15 -2 2 0 8 2 8 2 5 2 15 -12 15 -12 0 0 -15 0 -19 -2 -2 -2 -10 -9 -10 -11 2 -4 14 6 19 6 2 0 4 -6 4 -6 2 0 16 -8 18 -8 0 0 13 -6 17 -8 4 -3 13 -9 17 -9 4 0 12 -2 16 -8 3 -6 3 -6 0 -11 0 -4 9 -6 9 -6 l 0 -2 c 0 0 4 0 4 -2 0 -2 -6 -6 -6 -6 0 0 -4 0 -7 0 0 0 -6 -4 -10 -4 -2 0 -6 4 -6 4 -2 -4 -13 -4 -17 -4 -6 0 -8 0 -10 -2 -2 -5 -9 -5 -13 -3 -2 0 -4 0 -8 -2 -4 -2 -8 5 -8 5 0 0 0 -5 0 -11 -5 -8 -13 2 -13 2 0 0 0 -2 0 -4 0 -6 -8 -4 -8 -4 0 0 -4 -4 -4 -6 0 -5 -9 4 -11 6 -2 0 6 10 6 10 0 0 -6 0 -10 0 -6 -2 -10 7 -4 13 2 6 0 6 -6 6 -7 0 -9 -15 -13 -15 -2 0 -2 13 0 17 2 6 0 13 -2 13 -4 -2 -6 0 -4 4 2 4 8 19 6 21 -2 2 -8 -2 -8 -5 0 -4 -7 -4 -11 -4 -2 2 -2 -6 -6 -6 -2 0 -6 6 -6 8 -2 5 -4 -10 -9 -6 -2 2 0 8 0 11 0 2 -2 8 -4 12 0 2 9 13 9 15 -2 2 -15 -7 -17 -7 0 0 -6 15 -6 21 0 4 10 0 14 0 4 2 -4 9 -6 9 -4 0 2 6 6 10 2 2 -4 2 -8 2 -4 0 0 6 0 13 0 2 -10 -5 -13 -5 -2 2 -6 7 -2 9 0 2 -6 2 -8 2 -4 0 -6 8 -6 8 -2 2 8 0 10 2 2 4 -8 6 -10 6 -4 0 -4 9 -6 7 -5 -2 -13 -4 -17 -4 -4 2 -2 8 2 10 4 0 6 4 12 2 5 -2 15 -2 15 2 0 6 -10 -2 -10 0 -2 2 -7 0 -11 2 -2 2 6 13 11 17 4 2 39 -19 39 -17 0 4 -14 13 -16 15 -5 0 -9 12 -9 16 0 3 -4 0 -8 3 -2 0 -13 10 -13 12 0 2 2 8 -2 10 -2 5 0 11 0 13 0 2 -4 2 -6 2 -4 2 -6 8 -4 10 2 3 -8 11 -11 17 -2 6 9 0 11 2 0 0 -11 9 -13 11 -2 2 -8 12 -8 16 0 2 -6 9 -10 11 -2 2 -7 12 -7 14 0 4 15 -4 17 -4 0 0 13 -25 13 -25 4 -2 18 -27 18 -29 0 -2 0 -10 7 -10 4 -5 20 -23 22 -19 3 2 -12 12 -14 16 -2 3 -6 11 -6 11 0 0 0 4 2 8 0 6 0 19 4 19 2 0 2 -19 4 -19 2 0 13 -8 17 -6 6 2 14 10 14 15 0 2 -10 -5 -12 -5 -6 -2 -9 0 -9 5 0 4 -6 14 -6 18 0 4 9 17 9 21 0 2 -5 11 -9 11 -4 0 -8 4 -12 8 -2 2 -2 8 -4 8 -3 0 -7 4 -11 4 -2 0 -4 2 -4 7 0 4 -6 18 -6 18 -4 0 -7 -4 -9 -4 -4 0 -4 13 0 15 2 0 2 4 0 6 0 4 -2 19 -2 19 0 0 7 -4 7 -9 0 -2 0 -6 4 -8 4 -2 8 -2 10 0 4 0 15 19 19 21 0 2 2 0 4 -4 0 -4 -4 -11 0 -11 2 -4 10 9 13 13 2 4 22 0 29 0 4 0 12 -11 12 -11 0 0 4 5 9 5 4 0 16 8 18 10 0 2 -10 2 -14 2 -2 0 -25 21 -29 23 -5 4 -3 40 -3 44 0 6 9 8 9 8 2 0 0 13 2 15 4 2 8 -7 8 -7 0 0 2 5 6 5 0 0 7 -7 9 -5 0 0 0 9 0 9 0 0 0 6 -4 6 -5 2 -5 13 -7 15 0 0 -4 2 -10 6 -4 4 -2 14 2 14 6 0 -2 7 -6 7 -4 4 -13 12 -13 16 -2 5 2 9 4 13 0 4 7 14 5 14 -5 0 -9 -14 -15 -14 -4 0 -2 14 -4 14 -2 0 -4 -6 -8 -10 -3 -6 -13 -4 -17 -4 -2 0 -8 -2 -13 -4 -2 -4 -8 0 -8 0 -4 0 -8 0 -12 2 -3 0 -13 4 -15 4 -2 0 -10 8 -13 12 0 0 -8 3 -12 3 -2 0 -17 10 -19 12 -2 4 4 6 6 8 3 2 13 -6 17 -8 2 -2 11 2 13 2 4 0 2 4 0 6 0 2 -2 17 -2 19 0 4 -13 33 -15 38 0 2 -15 10 -19 10 -4 0 -31 8 -33 8 -4 0 -33 0 -38 0 -4 2 -2 13 5 13 2 0 4 4 4 4 0 2 -9 6 -9 6 0 2 5 7 9 7 4 0 12 0 12 4 0 2 -10 2 -12 0 -4 0 -4 2 -2 8 2 4 12 2 14 4 4 0 6 0 9 -2 2 -2 6 -4 8 -2 2 2 6 0 12 -2 5 0 2 6 2 10 0 2 3 7 5 7 4 0 8 4 8 4 0 0 -8 0 -10 0 -5 0 -3 6 -3 8 3 4 15 4 19 4 6 0 11 4 13 7 0 4 6 14 10 16 2 4 13 9 15 11 2 2 8 0 10 -2 0 0 8 -7 11 -7 2 -2 12 -2 16 2 2 5 4 5 9 0 2 -2 12 -8 16 -10 2 -2 17 -8 19 -8 0 0 -6 8 -8 10 0 2 -15 8 -19 10 -2 3 -21 7 -27 11 -6 4 -9 17 -11 19 -4 2 -10 -5 -14 -5 -4 0 -13 0 -15 -2 -2 -4 -10 -6 -12 -6 -2 0 -9 -2 -11 -4 -4 -2 -18 -4 -18 -4 -3 0 -9 0 -11 0 -4 0 -4 6 -2 8 0 2 -8 6 -10 8 -2 3 -13 -2 -15 -2 0 -2 -6 9 -8 11 -2 4 0 10 0 10 0 0 -21 15 -25 15 -4 0 -17 0 -19 4 -2 4 -15 15 -23 17 -10 0 -8 6 -10 4 -7 -2 -13 0 -17 2 -2 2 -13 6 -8 10 4 4 8 0 12 0 0 2 8 0 11 4 2 5 2 9 2 11 0 2 0 8 4 8 6 -2 8 -8 8 -10 -2 -4 4 -17 11 -17 6 2 2 8 6 6 6 -2 16 -2 16 -6 0 -4 9 -4 13 0 4 4 8 6 10 6 5 0 11 0 13 2 0 3 4 -2 4 -8 0 -4 4 -4 4 0 0 6 0 19 4 19 7 0 11 6 13 10 0 4 2 4 6 4 6 0 13 -10 19 -12 4 -2 0 -6 0 -10 0 -5 10 -7 10 -11 0 -4 7 -6 7 -4 2 2 8 2 10 -2 4 -4 31 4 35 10 5 4 17 23 17 23 0 0 4 -10 6 -8 7 0 11 8 15 8 4 -2 14 2 14 0 0 -4 -2 -14 0 -12 5 2 13 4 17 4 6 0 6 2 13 0 6 -2 14 0 14 -2 2 -4 6 -11 6 -6 5 4 5 10 9 10 4 0 14 -2 16 0 3 4 11 8 11 8 0 0 -13 0 -8 4 8 3 10 5 20 0 9 -4 23 0 27 5 5 2 21 10 28 10 6 0 29 -2 39 -2 8 0 17 0 17 0 l 0 2 c 0 0 2 -10 4 -10 0 0 10 0 10 0 2 0 13 -5 13 -9 0 -4 2 -12 4 -12 4 -2 6 -9 2 -11 -4 -4 -19 -4 -23 -8 -4 -2 -10 -8 -10 -8 0 0 -15 -11 -17 -13 -2 -2 -12 -4 -12 -4 0 0 29 2 29 2 0 0 4 0 6 0 2 -2 6 -10 4 -12 -2 -2 -6 -2 -6 -2 l -4 -3 c -4 -2 0 -10 4 -12 4 -2 12 -2 17 0 4 2 10 2 14 0 2 -2 4 -10 0 -13 -6 0 -8 -2 -4 -2 4 0 4 -4 6 -4 2 0 7 0 7 4 0 2 6 0 8 -2 4 0 17 -16 17 -18 0 -7 8 -9 18 -25 9 -17 2 -30 -2 -44 -6 -13 -27 -21 -31 -25 -4 -2 -31 -9 -38 -9 -4 0 -8 15 -16 11 -17 -6 -2 -15 -2 -15 0 0 2 -10 6 -10 2 0 8 -11 10 -15 2 -4 0 -23 -2 -29 -4 -4 -12 -25 -12 -25 0 0 -11 -10 -13 -12 -4 -2 -16 -5 -16 -5 0 0 16 0 16 0 2 3 13 9 13 9 0 0 6 14 12 14 7 -2 2 -14 -2 -23 -4 -8 -14 -25 -14 -33 0 -8 4 -10 6 -6 2 4 12 -2 10 -6 -2 -5 -12 -11 -12 -15 -2 -2 0 -23 0 -25 l -2 -2 z"/>
-		</g>
-		<path id="reg10" d="M -1704 1708 c 0 0 -8 -2 -8 -2 0 0 -13 -14 -19 -16 -6 0 -13 -4 -13 -9 -2 -4 -2 -10 -6 -12 -4 -4 -6 -19 -12 -17 -5 0 -13 11 -15 17 -4 2 -27 2 -27 2 0 0 -2 -23 -4 -27 -2 -4 -7 -11 -7 -13 0 -4 -4 -10 -8 -12 -2 0 8 -13 13 -15 0 0 8 9 12 4 4 -4 -4 -14 -2 -14 2 -2 13 -2 15 -4 0 -2 8 10 8 8 2 -2 19 -17 19 -19 0 -2 12 -10 12 -10 0 0 9 -4 13 -6 2 0 14 0 16 -5 2 -4 -8 -12 -8 -12 -2 -2 0 -10 -6 -10 -4 0 -6 -3 -2 2 4 6 0 6 -4 2 -3 0 -9 -2 -11 0 0 4 -4 18 -4 21 -2 2 -10 6 -10 6 0 -2 4 -6 4 -9 2 -2 0 -8 0 -10 0 -2 2 -10 0 -10 -4 0 -4 2 -4 6 0 4 -3 8 -5 6 0 -2 -2 -12 -4 -12 -2 0 -2 8 -4 6 0 0 -2 -6 -6 -6 0 0 -6 2 -11 0 -2 0 -12 2 -12 6 0 4 -8 2 -11 2 -2 0 3 6 0 6 0 0 -4 2 -4 6 0 7 9 7 7 7 -3 2 -11 0 -13 0 -2 0 -6 2 -2 4 4 2 -2 4 -4 2 -4 0 -17 -4 -17 -4 0 2 -6 8 0 12 6 4 11 9 13 9 4 0 4 4 8 4 4 0 17 0 17 0 0 0 -5 6 -9 8 -4 2 -8 4 -12 4 -4 0 -9 0 -11 0 -2 2 -6 4 -8 4 -2 0 -6 0 -6 0 0 0 -2 5 4 7 2 2 4 4 4 4 0 0 -4 4 -8 4 -2 2 -4 -4 -9 -6 -4 -2 -10 -4 -10 -6 -2 -3 -8 0 -8 0 -4 0 -11 8 -11 6 0 0 2 -15 -2 -17 -2 -2 -6 -2 -8 -2 -4 0 -11 -4 -15 -6 -4 -2 -10 -4 -10 -2 0 0 4 6 4 6 0 0 -6 -4 -8 -4 -2 0 -7 -9 -7 -9 0 0 -10 9 -8 13 0 2 4 2 4 4 0 0 0 6 0 6 0 0 4 0 4 0 0 0 -2 9 -2 11 0 0 0 4 0 4 0 0 -10 6 -10 8 -2 0 6 2 8 4 4 3 9 5 9 9 0 4 0 8 -7 8 -6 -2 -12 -6 -16 -2 -4 6 -2 13 -2 13 0 0 -2 4 -7 2 -2 -2 -6 -2 -8 0 -2 2 -4 0 -6 -2 0 0 -4 2 -4 4 2 4 4 6 0 6 -2 0 -5 2 -2 6 4 4 4 11 6 9 6 -3 6 -5 8 -5 2 0 6 0 6 0 0 0 -6 2 -2 5 0 2 -12 6 -8 10 2 4 17 -6 17 -6 0 0 -2 4 2 4 4 0 -4 8 -4 8 0 0 4 2 4 2 0 2 -4 9 2 9 4 0 12 4 14 6 2 2 13 2 13 -2 0 -4 0 -17 -4 -21 -4 -4 -7 -13 -4 -13 4 0 10 3 10 9 0 4 2 16 2 21 0 4 2 18 0 18 -4 0 -10 -2 -15 -2 -2 0 -6 -6 -8 -4 -4 2 -21 13 -19 17 2 4 11 4 9 6 -2 2 -15 6 -17 6 -2 2 -10 4 -12 7 -3 4 -9 6 -11 6 -4 0 -8 4 -8 4 0 0 10 0 12 0 4 0 11 0 13 4 2 2 12 6 19 6 8 -2 14 -4 14 -4 0 0 4 6 6 9 7 4 7 6 7 6 0 0 -11 -4 -13 -2 -4 2 -14 -2 -19 -4 -2 0 -6 2 -8 2 -2 -2 -15 -7 -19 -7 -4 0 -8 0 -10 5 0 2 -4 2 -6 0 -5 0 -9 2 -9 4 0 4 -2 6 -2 8 -4 0 -2 4 -2 4 0 0 -6 4 -8 0 -2 -2 0 -6 -4 -6 -5 0 -7 -2 -13 -2 -4 0 -6 0 -10 2 -2 2 -11 4 -9 10 5 9 9 2 13 5 2 4 6 6 6 4 2 -2 11 0 13 0 0 2 6 4 6 4 0 0 -11 4 -17 4 -4 0 -12 0 -14 4 0 2 -7 6 -7 6 -2 0 -6 3 -6 3 0 0 2 8 2 8 0 0 9 -2 9 0 0 4 -5 8 0 8 2 0 18 -2 20 0 5 0 13 0 13 2 0 2 -8 2 -8 2 -3 2 -7 5 -11 5 -2 0 -14 -3 -17 2 0 4 -4 8 -2 8 5 0 13 -4 15 -2 2 2 12 4 17 4 2 0 12 -2 12 0 0 2 -8 6 -12 6 -5 0 -13 2 -13 2 0 0 15 2 15 2 0 0 -13 5 -17 5 -4 2 -10 4 -8 6 4 2 33 0 33 0 0 0 0 6 -4 6 -4 2 -2 4 0 4 2 0 14 0 19 -2 4 -2 8 0 8 2 4 2 6 2 8 0 2 -2 7 -4 9 0 0 2 4 4 4 2 4 0 8 0 8 2 0 0 6 -2 6 -6 -2 -4 2 -2 7 -2 2 4 8 4 12 0 4 -2 8 -4 4 -6 -2 -2 -2 -11 -2 -11 0 0 6 5 11 5 0 0 2 4 2 6 -2 0 -4 6 0 6 2 0 12 0 16 -2 0 -2 5 2 5 -2 0 -4 2 -4 6 -4 l -2 0 c 0 0 12 4 14 2 2 -2 7 -11 11 -11 2 0 12 3 14 3 4 0 11 6 15 6 4 -2 12 -6 14 -6 3 0 5 8 9 6 2 -2 6 -4 8 2 4 6 13 6 13 6 4 0 6 4 6 2 2 0 8 -2 8 -6 0 0 0 -4 -2 -8 -4 0 -8 -2 -8 -5 0 -2 12 0 14 -4 5 -2 5 -8 7 -8 4 0 10 -4 10 -10 0 -7 8 -13 15 -17 6 -2 10 -11 10 -15 0 -6 4 -10 4 -14 0 0 0 -7 0 -13 0 -4 4 -2 4 -6 0 -4 -4 -6 -4 -8 0 -2 0 -7 0 -7 l 2 0 c 0 0 11 5 9 -2 0 -6 -2 -12 2 -14 2 -2 8 -9 2 -15 -6 -4 -2 -12 0 -17 0 -4 6 -6 2 -8 -2 -4 0 -19 0 -19 0 0 12 11 14 9 3 -2 0 -9 0 -9 l 11 2 z"/>
-		<g id="reg09">
-			<path id="reg09a" d="M 350 4129 c 0 0 -6 0 -6 -2 0 -4 -9 -4 -9 -2 0 2 3 11 3 15 0 6 -3 18 0 21 2 0 27 0 31 2 2 0 19 4 23 4 6 0 23 0 25 0 0 0 16 6 18 6 5 0 15 2 15 6 2 4 -4 15 0 15 4 0 21 -4 27 -4 8 0 36 -7 40 -7 2 0 37 -4 41 -4 7 0 32 -4 34 -6 0 -4 6 -19 6 -23 0 -4 4 -10 2 -10 0 0 -15 12 -19 12 -4 0 -14 2 -18 6 0 0 -17 7 -17 3 0 -5 4 -19 4 -19 0 -2 -2 -2 -12 0 -11 0 -21 6 -21 6 0 0 -27 -2 -32 -6 -2 0 -8 -6 -14 -6 -4 0 -31 4 -36 4 -2 0 -22 6 -27 4 -4 -2 -12 -6 -14 -6 -2 0 -13 -2 -9 -7 5 -2 11 -4 7 -4 -4 -2 -13 0 -15 0 -2 0 -17 4 -17 0 -2 -2 -2 -12 -4 -12 -4 0 -6 14 -8 14 l 2 0 z"/>
-			<path id="reg09b" d="M 406 3836 c 0 0 -10 -3 -10 -3 0 -2 -8 7 -15 0 -4 -6 -27 -43 -29 -43 -2 0 -35 0 -35 -4 0 -7 -11 -15 -15 -17 -6 -4 -25 -19 -31 -21 -6 -2 -13 0 -15 0 -2 0 -14 2 -10 0 0 0 17 -10 19 -15 2 -4 20 -12 25 -8 4 4 12 25 23 25 10 0 18 2 25 4 4 2 27 4 27 13 2 8 12 41 14 44 4 2 27 2 27 4 2 4 2 18 0 18 l 0 3 z"/>
-			<path id="reg09c" d="M 92 3529 c 0 0 4 0 8 -2 4 -4 8 0 10 0 3 0 15 0 17 -2 4 -4 13 0 17 0 2 2 14 0 14 -6 0 -4 9 -23 13 -23 4 0 17 -6 19 -8 2 -2 12 -2 14 -2 2 0 15 4 19 2 6 -2 12 -7 12 -11 0 -4 -2 -14 3 -14 2 0 6 0 6 0 0 0 8 2 10 2 4 0 34 -11 38 -11 2 0 14 7 18 7 7 0 21 -9 23 -11 5 -2 17 -4 17 -6 0 -2 0 -19 4 -19 2 0 29 0 36 0 4 0 14 2 14 6 0 5 4 17 17 15 14 -2 31 0 33 4 0 0 13 4 13 4 2 0 14 0 23 0 10 0 29 -10 29 -10 4 0 8 -11 12 -11 4 0 -2 -12 -4 -16 0 -4 -17 -17 -17 -21 0 -6 19 2 19 2 0 0 19 6 21 8 2 0 2 9 4 13 4 4 2 14 2 21 2 6 -14 18 -18 21 -5 2 2 14 2 20 2 2 -7 17 -11 21 -2 4 -2 9 -6 13 -4 4 -8 4 -8 4 l -5 0 c 0 0 -6 -8 -16 -11 -11 0 -31 -4 -31 -4 0 0 -25 0 -28 0 -2 0 -18 9 -25 7 -4 0 -33 -5 -33 -3 0 3 -8 17 -14 17 -7 0 -19 8 -23 4 -5 -2 -19 -2 -19 -2 0 2 -6 13 4 21 10 10 -2 15 6 19 13 2 25 6 29 8 5 4 17 19 17 23 0 2 -6 0 -10 -4 -4 -4 -15 -11 -17 -11 -2 0 -33 -10 -33 -4 0 4 10 13 14 15 4 0 13 4 13 8 2 4 10 17 10 21 0 4 -8 4 -8 2 0 -2 -17 -21 -21 -21 -6 -2 -21 -14 -27 -14 -4 0 -13 4 -2 18 10 13 35 23 35 25 0 3 -25 3 -29 0 -4 -4 -8 -10 -8 -14 -2 -4 -13 -6 -13 -11 0 -4 2 -16 -2 -16 -4 -2 -21 -9 -23 -11 -4 -6 -16 -10 -16 -14 0 -6 10 -9 10 -13 0 -4 -12 -6 -21 4 -6 9 -8 17 -6 23 0 7 -4 19 -2 25 2 7 10 15 12 17 2 4 9 10 13 17 0 0 4 4 4 6 0 2 0 4 0 8 0 4 13 13 17 15 6 4 14 17 21 27 6 8 -7 15 -9 17 -6 2 -16 2 -19 0 -2 -2 13 -7 15 -7 4 0 -4 -10 -10 -12 -7 -2 -19 4 -19 10 2 2 10 9 10 11 0 6 7 6 9 6 2 4 -9 8 -13 12 -6 5 -23 9 -29 9 -4 0 0 4 10 8 9 2 15 6 25 8 13 5 11 11 19 11 8 0 17 12 19 12 0 2 14 0 14 0 0 0 7 13 7 15 2 2 14 2 23 6 8 4 18 19 14 19 -4 0 -2 4 -2 8 2 2 8 21 8 25 0 7 0 17 -6 17 -6 2 -19 -15 -23 -19 -4 -6 -27 -12 -35 -10 -8 2 -25 12 -25 16 0 5 10 13 10 17 0 4 2 11 4 11 0 2 13 0 13 0 0 0 4 8 4 8 0 0 2 2 4 2 0 2 4 4 4 8 0 2 -20 0 -20 4 0 7 -11 11 -15 11 -2 0 -2 -8 -2 -13 0 -6 -15 -8 -19 -8 -6 2 -6 17 -2 19 2 2 8 6 6 10 -2 4 7 11 7 15 2 2 4 10 4 12 0 2 4 13 4 15 0 4 6 8 6 10 2 2 -4 15 -4 17 0 2 10 8 10 10 3 2 9 7 7 11 -2 2 -11 -4 -17 -6 -4 0 -12 -7 -12 -9 0 -4 -7 -2 -11 -4 -2 0 -4 -8 -4 -12 0 -5 -6 -7 -10 -7 -5 0 -9 7 -9 11 0 2 -6 8 -8 10 -2 2 4 13 4 17 2 2 4 14 2 14 -2 2 -14 -10 -17 -12 0 -2 0 -19 0 -23 0 -6 -8 -10 -10 -17 0 -6 -6 -10 -10 -10 -5 2 -5 -2 -5 -11 0 -6 -8 -2 -12 0 -4 0 0 21 0 30 0 8 -13 2 -13 0 -2 -7 -10 -7 -12 -7 -2 -2 -2 -16 -8 -23 -7 -8 -2 -27 -2 -29 0 -4 2 -10 2 -14 -2 -4 -15 -21 -15 -21 0 0 -8 -4 -12 -4 -5 -2 -9 -9 -9 -13 0 -6 -4 -6 -10 -10 -6 -4 2 -13 4 -15 2 0 10 -21 10 -25 0 -4 17 -2 25 -2 7 0 9 -8 13 -12 6 -7 17 -2 21 -2 6 0 23 12 27 12 2 0 19 8 25 8 4 0 14 2 16 5 3 2 17 16 21 12 2 -4 -6 -6 -6 -10 0 -5 2 -7 4 -5 4 0 21 -2 21 -4 0 -4 -17 -8 -21 -8 -4 0 -19 -4 -19 -13 -2 -6 -16 0 -18 3 -2 2 -7 -5 -9 -9 -2 -4 -6 0 -8 2 -2 2 -21 2 -23 0 -4 -2 -19 2 -23 2 -6 0 -19 -4 -25 2 -8 5 -12 0 -12 -2 -2 -4 -17 0 -21 0 -4 5 -11 0 -11 -2 0 -4 -2 -10 -4 -14 -2 -4 -4 -15 -8 -17 -2 0 -4 -2 -6 -4 -2 -4 -2 -8 -7 -8 -6 0 -6 -3 -6 -9 0 -6 9 -6 13 -6 4 0 16 4 21 4 6 0 -3 -10 -5 -12 -2 -2 -14 0 -18 -2 -5 -5 -11 2 -15 2 -4 0 -6 -7 -6 -9 -2 -2 -9 -12 -9 -12 l -2 0 c 0 0 -18 -15 -18 -21 0 -4 0 -10 -5 -13 -2 -2 -4 -4 -4 -8 0 -4 -4 -8 -8 -10 -6 -4 -2 -9 -2 -9 0 0 14 -2 19 0 0 2 4 0 4 -4 0 -6 0 -10 4 -14 6 -2 2 -7 2 -11 -2 -6 8 -4 8 -4 0 0 2 -6 5 -6 2 0 10 -2 10 -4 0 0 4 -9 10 -11 5 -2 13 -10 13 -14 2 -5 4 -9 8 -11 4 -2 6 -12 4 -14 -2 -5 2 -13 0 -15 -2 0 0 -10 0 -10 l 9 -9 z"/>
-		</g>
-		<path id="reg03" d="M -1248 2208 c 0 0 21 -4 23 -4 6 -2 21 -10 25 -12 4 -2 17 4 17 4 0 0 10 8 14 10 4 5 17 9 27 9 9 2 17 -4 19 -9 2 -2 15 -6 15 -6 0 0 12 4 14 4 2 0 17 2 19 0 0 0 10 9 13 13 2 4 10 2 10 4 0 2 6 12 8 15 2 2 17 14 17 18 2 2 -8 27 -10 32 -3 4 4 12 10 12 4 2 15 4 15 4 0 0 2 4 2 4 0 2 8 11 10 11 2 0 6 12 4 19 -4 4 -19 20 -19 20 0 0 -6 2 -10 2 -4 0 -23 21 -27 23 -4 5 -4 17 0 21 0 4 -6 19 -6 19 0 0 -9 0 -11 0 -4 0 -21 -4 -23 -6 -4 -4 -10 -13 -14 -15 -4 0 -15 -10 -15 -12 0 -7 4 -13 6 -17 3 -2 7 -8 5 -10 0 -5 -7 -7 -7 -9 0 -2 -12 9 -12 13 -2 4 -2 10 -8 12 -5 0 -9 6 -13 4 -4 -2 -12 -10 -15 -10 -4 -2 -4 -8 0 -10 5 0 7 -5 7 -7 0 -4 -2 -10 -4 -12 -3 0 -3 -9 2 -9 4 -4 6 -8 2 -12 -2 -4 -2 -8 -7 -8 -6 2 -20 0 -20 -7 0 -4 0 -14 -2 -14 -3 0 -23 -2 -23 -6 0 -3 0 -30 -2 -30 -3 0 -19 5 -21 0 -2 -2 -4 -12 -4 -14 0 -4 -3 -13 -3 -17 -2 -2 -8 -14 -8 -14 l 0 -3 z"/>
-		<g id="reg05">
-			<path id="reg05a" d="M -1619 3533 c 0 0 -6 -4 -8 -4 -4 2 -15 0 -15 4 0 3 -4 5 -8 7 -2 0 -2 6 -2 10 0 4 4 0 6 0 2 0 4 2 4 4 0 0 5 2 7 0 2 -4 6 -6 8 -6 2 -2 8 -6 8 -8 0 -2 2 -7 0 -7 z"/>
-			<path id="reg05b" d="M -1523 3506 c 0 0 -6 0 -8 0 -2 2 -6 2 -6 -2 0 -2 -7 -4 -7 -6 0 -2 0 -6 4 -6 5 0 15 -6 19 -9 2 -2 21 -8 27 -8 7 0 13 0 17 0 2 0 10 -2 10 0 0 2 -6 6 -4 6 2 0 6 2 4 7 -4 2 -2 6 2 8 3 0 15 -2 15 6 0 9 -2 13 -8 17 -7 6 -11 8 -11 10 -2 4 -8 9 -12 9 -2 0 -6 2 -9 4 -2 0 -4 0 -4 -2 0 -2 -6 -4 -8 -4 -4 0 -13 -3 -13 -7 0 -2 0 -2 -6 -4 -2 -4 2 -14 2 -17 l -4 -2 z"/>
-			<path id="reg05c" d="M -1381 3500 c 0 0 -9 -4 -11 -6 0 -4 -8 -8 -12 -8 -2 0 -8 0 -8 -3 0 -2 -3 -8 0 -10 4 -2 20 -2 20 -2 0 0 5 -6 7 -2 2 0 2 4 4 4 2 0 4 4 4 8 0 2 4 0 2 7 0 6 0 10 -2 10 l -4 2 z"/>
-			<path id="reg05d" d="M -2444 3490 c 0 -2 4 -17 4 -17 0 0 30 -19 34 -19 2 0 23 -23 25 -27 2 -2 14 -2 16 -2 0 0 3 -17 3 -17 0 0 -15 -2 -15 -2 0 0 -2 -37 -2 -39 0 -4 6 -13 8 -15 0 -2 -4 -8 0 -8 2 0 21 -6 21 -6 4 0 0 -13 2 -19 2 -2 -2 -6 -2 -8 0 0 -2 -15 -2 -17 0 0 -6 -15 -6 -17 0 0 2 -10 2 -14 0 -5 -2 -23 -2 -25 0 -2 -4 -9 -4 -9 0 0 33 11 41 13 6 2 9 -6 17 -9 6 -4 10 -18 14 -18 5 0 5 -13 5 -17 0 -4 -15 -6 -15 -6 0 0 4 -6 4 -9 0 -4 6 -10 15 -10 8 0 8 -12 8 -12 2 0 11 -9 11 -13 0 -2 4 -10 6 -10 0 0 4 -13 6 -17 0 -6 0 -21 0 -21 0 0 -10 6 -6 0 6 -6 19 -12 19 -17 2 -2 20 -2 20 -2 0 0 19 -16 21 -16 2 0 15 -2 15 -4 0 0 -4 -13 -6 -15 0 -4 -11 -2 -13 -2 -4 0 -4 -11 -4 -13 0 -2 8 -8 8 -12 0 -6 -14 -6 -16 -6 -5 -2 -19 -15 -25 -19 -5 -4 -11 -2 -11 0 0 4 -10 4 -12 6 -5 0 -11 -8 -11 -10 0 -4 -12 -7 -14 -7 0 0 0 -2 -5 -8 -4 -6 -12 0 -14 2 -2 0 -2 -8 -4 -10 -2 -4 0 -13 0 -13 0 -2 8 -8 4 -16 -6 -9 -21 4 -25 4 -2 2 -17 4 -17 4 -2 0 -10 0 -12 2 -4 0 -11 -6 -13 -6 -2 0 -8 8 -10 12 -2 0 -13 2 -13 2 7 -6 2 -2 0 -6 -2 -2 7 -12 7 -14 0 0 6 -9 8 -9 0 0 12 -8 14 -8 0 0 11 -6 11 -6 0 -2 -8 0 -11 2 -2 0 -6 2 -6 0 -4 -2 0 -9 0 -9 0 0 13 0 13 -4 0 -4 -7 0 -9 -2 -4 -2 -2 -8 -4 -10 0 -4 4 -7 6 -7 0 0 7 -6 7 -8 0 -2 -9 -2 -13 0 0 0 0 4 -4 6 -4 0 -6 -4 -6 -8 0 -4 6 -8 6 -10 2 0 13 -5 17 -7 4 -2 -2 -4 -4 -4 -3 0 -9 4 -13 2 -4 -2 0 -10 0 -12 0 -2 4 -11 -2 -11 -8 0 -6 -4 -6 -8 0 -4 4 -4 4 -6 0 -2 8 -4 8 -4 4 0 0 -5 0 -5 0 -4 6 0 13 0 4 0 12 -6 16 -8 9 -2 11 0 19 4 8 7 15 2 17 0 2 0 12 0 12 0 0 0 4 2 7 4 2 3 8 3 6 0 -4 -4 -2 -4 0 -6 2 -2 -11 -4 -9 -6 5 0 5 -6 5 -6 2 0 12 2 14 0 6 -2 13 -7 13 -7 2 0 8 -4 10 -2 2 0 -2 9 0 9 2 0 4 -2 6 -2 2 0 7 -2 9 -5 2 -2 4 -2 4 0 0 5 2 7 2 7 2 2 2 6 6 6 2 0 13 0 13 4 2 4 2 8 8 13 6 4 13 6 15 10 0 4 6 4 10 6 4 0 8 0 10 2 3 2 7 5 13 5 4 0 15 4 17 4 2 2 8 2 14 4 2 2 2 4 6 4 0 0 7 2 9 4 2 0 8 0 8 0 2 0 11 -8 13 -6 2 2 6 10 8 12 2 3 8 3 10 5 0 0 13 0 13 2 2 2 2 8 6 10 2 0 29 15 33 15 3 2 13 14 19 14 2 2 13 4 15 7 2 2 6 4 16 2 7 -2 15 4 15 4 2 0 10 -4 13 -2 2 2 6 6 12 6 8 -2 17 4 17 6 0 2 -2 9 0 9 0 0 16 4 18 6 3 4 7 6 9 6 4 0 25 -2 29 2 4 4 23 17 27 19 4 2 27 8 29 8 4 0 19 0 21 0 l 2 2 c 0 0 0 11 2 11 0 2 0 12 6 12 7 0 15 0 15 4 0 2 -6 21 -2 21 2 0 15 -4 15 0 4 2 2 4 10 4 8 -2 12 -2 17 2 2 7 10 15 10 15 0 0 10 13 10 15 3 2 5 10 11 10 4 -2 12 0 14 4 0 6 13 19 17 19 4 0 19 0 21 6 4 6 15 15 19 15 2 0 12 -2 16 -2 5 0 7 -11 13 -11 4 0 14 4 17 9 0 2 14 8 18 8 0 0 -8 10 -6 15 2 2 8 12 10 12 3 0 17 0 19 -4 0 0 2 4 6 4 3 0 9 -4 9 -4 4 2 8 4 8 6 0 2 4 8 6 8 5 3 7 -4 11 -2 4 2 14 5 16 5 5 2 9 6 9 12 0 4 -2 8 4 8 4 0 6 5 10 9 0 2 7 -4 11 -4 4 0 2 4 6 4 4 0 13 -2 13 -2 0 0 10 6 10 12 0 6 -2 6 -4 4 -2 -2 -6 2 -6 7 0 4 2 10 2 12 0 2 2 19 2 21 0 2 -7 6 -11 6 -2 0 -14 2 -18 4 -5 2 -30 11 -34 11 -4 0 -33 12 -39 18 -5 7 -17 7 -19 7 -4 0 -50 2 -56 4 -7 0 -15 4 -15 4 -4 2 -12 0 -15 0 -2 0 -31 17 -29 21 2 4 13 8 4 14 -8 7 -14 9 -14 7 -2 -4 -4 -4 -6 -2 -5 2 -32 25 -34 27 -4 2 -18 16 -23 18 -2 5 -6 5 -8 5 -2 2 -10 12 -17 12 -4 0 -12 13 -16 17 -2 4 -4 12 -4 12 0 2 -9 9 -11 13 0 2 8 19 -10 8 -2 0 6 13 2 13 -4 0 12 -2 12 10 0 10 -2 10 -4 10 -2 0 11 32 15 34 2 2 12 12 12 16 0 0 4 5 2 7 -2 0 -12 4 -14 6 0 0 -9 6 -13 8 -4 0 -12 4 -14 4 0 3 -13 3 -17 5 -2 0 -6 6 -8 6 -7 0 -13 4 -15 6 -2 2 -6 13 -8 13 -2 2 -11 16 -13 18 0 2 -4 9 -8 9 -2 0 -8 2 -8 6 2 6 2 8 4 6 2 0 8 -6 8 -4 0 2 2 15 2 17 -2 0 -17 0 -21 2 -2 2 -6 6 -8 0 -4 -2 -8 0 -10 0 0 0 -7 0 -9 -4 -2 -2 -25 2 -27 4 -4 4 -17 6 -17 6 -2 0 -27 13 -29 15 0 2 -10 23 -14 23 -7 0 -13 10 -15 12 -4 0 -8 4 -10 2 -2 -4 -15 -12 -21 -12 -8 0 -17 0 -19 2 -4 4 -12 6 -19 2 -4 -6 -18 -11 -20 -11 0 0 -23 0 -25 0 -3 -2 -15 -12 -19 -12 -4 0 -15 -4 -21 -4 -4 0 -15 -2 -17 -2 -2 2 -16 -7 -18 -9 -5 0 -13 7 -17 7 -4 0 -19 4 -23 4 -4 0 -15 0 -19 -2 -4 -2 -19 0 -23 0 -2 0 -16 2 -21 4 -2 4 -16 14 -20 16 -5 3 -9 7 -15 5 -6 -2 -21 -7 -21 -11 0 -4 2 -10 -4 -12 -4 0 -12 -9 -12 -11 -3 -4 -9 -18 -9 -21 0 -2 -6 -10 -6 -12 0 -2 12 -2 8 -8 -2 -5 -10 -15 -8 -17 2 -2 8 -13 6 -13 0 -2 -4 -16 -4 -18 0 -2 -10 -17 -12 -21 -3 -4 -11 -6 -11 -11 0 -2 0 -8 -4 -8 -4 0 -17 -4 -21 -8 -2 -4 -12 -9 -14 -9 -3 0 -3 -2 -3 -4 0 -4 0 -14 0 -16 0 -5 -2 -7 -2 -7 l -2 9 z"/>
-		</g>
-	</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_europe.xml Deleted

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="161" height="132" viewBox="0 0 5375 4421">
-<g fill="#B7DDC8" stroke="#131516" stroke-width="3" stroke-linejoin="round" transform="matrix(1.0,0.0,0.0,1.0,2690.0,100.0)">
-		<rect id="reg00" x="-2690" y="-100" width="5375" height="4421" fill="#EEEEEE"/>
-		<path id="reg20" d="M -1704 1734 c 0 0 -8 -2 -8 -2 0 0 -13 -14 -19 -16 -6 0 -13 -4 -13 -9 -2 -4 -2 -10 -6 -12 -4 -4 -6 -19 -12 -17 -5 0 -13 11 -15 17 -4 2 -27 2 -27 2 0 0 -2 -23 -4 -27 -2 -4 -7 -11 -7 -13 0 -4 -4 -10 -8 -12 -2 0 8 -13 13 -15 0 0 8 9 12 4 4 -4 -4 -14 -2 -14 2 -2 13 -2 15 -4 0 -2 8 10 8 8 2 -2 19 -17 19 -19 0 -2 12 -10 12 -10 0 0 9 -4 13 -6 2 0 14 0 16 -5 2 -4 -8 -12 -8 -12 -2 -2 0 -10 -6 -10 -4 0 -6 -3 -2 2 4 6 0 6 -4 2 -3 0 -9 -2 -11 0 0 4 -4 18 -4 21 -2 2 -10 6 -10 6 0 -2 4 -6 4 -9 2 -2 0 -8 0 -10 0 -2 2 -10 0 -10 -4 0 -4 2 -4 6 0 4 -3 8 -5 6 0 -2 -2 -12 -4 -12 -2 0 -2 8 -4 6 0 0 -2 -6 -6 -6 0 0 -6 2 -11 0 -2 0 -12 2 -12 6 0 4 -8 2 -11 2 -2 0 3 6 0 6 0 0 -4 2 -4 6 0 7 9 7 7 7 -3 2 -11 0 -13 0 -2 0 -6 2 -2 4 4 2 -2 4 -4 2 -4 0 -17 -4 -17 -4 0 2 -6 8 0 12 6 4 11 9 13 9 4 0 4 4 8 4 4 0 17 0 17 0 0 0 -5 6 -9 8 -4 2 -8 4 -12 4 -4 0 -9 0 -11 0 -2 2 -6 4 -8 4 -2 0 -6 0 -6 0 0 0 -2 5 4 7 2 2 4 4 4 4 0 0 -4 4 -8 4 -2 2 -4 -4 -9 -6 -4 -2 -10 -4 -10 -6 -2 -3 -8 0 -8 0 -4 0 -11 8 -11 6 0 0 2 -15 -2 -17 -2 -2 -6 -2 -8 -2 -4 0 -11 -4 -15 -6 -4 -2 -10 -4 -10 -2 0 0 4 6 4 6 0 0 -6 -4 -8 -4 -2 0 -7 -9 -7 -9 0 0 -10 9 -8 13 0 2 4 2 4 4 0 0 0 6 0 6 0 0 4 0 4 0 0 0 -2 9 -2 11 0 0 0 4 0 4 0 0 -10 6 -10 8 -2 0 6 2 8 4 4 3 9 5 9 9 0 4 0 8 -7 8 -6 -2 -12 -6 -16 -2 -4 6 -2 13 -2 13 0 0 -2 4 -7 2 -2 -2 -6 -2 -8 0 -2 2 -4 0 -6 -2 0 0 -4 2 -4 4 2 4 4 6 0 6 -2 0 -5 2 -2 6 4 4 4 11 6 9 6 -3 6 -5 8 -5 2 0 6 0 6 0 0 0 -6 2 -2 5 0 2 -12 6 -8 10 2 4 17 -6 17 -6 0 0 -2 4 2 4 4 0 -4 8 -4 8 0 0 4 2 4 2 0 2 -4 9 2 9 4 0 12 4 14 6 2 2 13 2 13 -2 0 -4 0 -17 -4 -21 -4 -4 -7 -13 -4 -13 4 0 10 3 10 9 0 4 2 16 2 21 0 4 2 18 0 18 -4 0 -10 -2 -15 -2 -2 0 -6 -6 -8 -4 -4 2 -21 13 -19 17 2 4 11 4 9 6 -2 2 -15 6 -17 6 -2 2 -10 4 -12 7 -3 4 -9 6 -11 6 -4 0 -8 4 -8 4 0 0 10 0 12 0 4 0 11 0 13 4 2 2 12 6 19 6 8 -2 14 -4 14 -4 0 0 4 6 6 9 7 4 7 6 7 6 0 0 -11 -4 -13 -2 -4 2 -14 -2 -19 -4 -2 0 -6 2 -8 2 -2 -2 -15 -7 -19 -7 -4 0 -8 0 -10 5 0 2 -4 2 -6 0 -5 0 -9 2 -9 4 0 4 -2 6 -2 8 -4 0 -2 4 -2 4 0 0 -6 4 -8 0 -2 -2 0 -6 -4 -6 -5 0 -7 -2 -13 -2 -4 0 -6 0 -10 2 -2 2 -11 4 -9 10 5 9 9 2 13 5 2 4 6 6 6 4 2 -2 11 0 13 0 0 2 6 4 6 4 0 0 -11 4 -17 4 -4 0 -12 0 -14 4 0 2 -7 6 -7 6 -2 0 -6 3 -6 3 0 0 2 8 2 8 0 0 9 -2 9 0 0 4 -5 8 0 8 2 0 18 -2 20 0 5 0 13 0 13 2 0 2 -8 2 -8 2 -3 2 -7 5 -11 5 -2 0 -14 -3 -17 2 0 4 -4 8 -2 8 5 0 13 -4 15 -2 2 2 12 4 17 4 2 0 12 -2 12 0 0 2 -8 6 -12 6 -5 0 -13 2 -13 2 0 0 15 2 15 2 0 0 -13 5 -17 5 -4 2 -10 4 -8 6 4 2 33 0 33 0 0 0 0 6 -4 6 -4 2 -2 4 0 4 2 0 14 0 19 -2 4 -2 8 0 8 2 4 2 6 2 8 0 2 -2 7 -4 9 0 0 2 4 4 4 2 4 0 8 0 8 2 0 0 6 -2 6 -6 -2 -4 2 -2 7 -2 2 4 8 4 12 0 4 -2 8 -4 4 -6 -2 -2 -2 -11 -2 -11 0 0 6 5 11 5 0 0 2 4 2 6 -2 0 -4 6 0 6 2 0 12 0 16 -2 0 -2 5 2 5 -2 0 -4 2 -4 6 -4 l -2 0 c 0 0 12 4 14 2 2 -2 7 -11 11 -11 2 0 12 3 14 3 4 0 11 6 15 6 4 -2 12 -6 14 -6 3 0 5 8 9 6 2 -2 6 -4 8 2 4 6 13 6 13 6 4 0 6 4 6 2 2 0 8 -2 8 -6 0 0 0 -4 -2 -8 -4 0 -8 -2 -8 -5 0 -2 12 0 14 -4 5 -2 5 -8 7 -8 4 0 10 -4 10 -10 0 -7 8 -13 15 -17 6 -2 10 -11 10 -15 0 -6 4 -10 4 -14 0 0 0 -7 0 -13 0 -4 4 -2 4 -6 0 -4 -4 -6 -4 -8 0 -2 0 -7 0 -7 l 2 0 c 0 0 11 5 9 -2 0 -6 -2 -12 2 -14 2 -2 8 -9 2 -15 -6 -4 -2 -12 0 -17 0 -4 6 -6 2 -8 -2 -4 0 -19 0 -19 0 0 12 11 14 9 3 -2 0 -9 0 -9 l 11 2 z"/>
-		<g id="reg17">
-			<path id="reg17a" d="M -1633 1484 c 0 0 14 3 18 3 7 0 25 2 25 -7 -2 -6 -14 -16 -14 -16 0 -5 -2 -15 -8 -15 -5 0 -11 2 -11 6 0 4 8 7 11 9 2 2 8 6 4 6 -4 0 -7 0 -9 2 0 0 -4 0 -2 2 2 2 7 6 2 6 -4 -2 -12 -4 -16 -2 -2 2 2 6 2 6 l -2 0 z"/>
-			<path id="reg17b" d="M -1602 1755 c 0 0 -6 0 -6 0 -2 2 -9 9 -11 7 -4 -3 -10 0 -10 -5 2 -4 10 -12 14 -16 3 -2 9 -4 11 -9 4 -2 8 -4 12 -2 2 2 0 9 -2 11 -2 0 0 4 -2 8 0 2 -4 6 -6 6 z"/>
-			<path id="reg17c" d="M -1575 1407 c 0 0 -6 0 -4 -2 0 -2 6 -10 0 -10 -4 0 -6 4 -6 0 0 -2 -7 -4 -11 -8 -2 -5 2 -15 0 -17 -2 -2 -12 -13 -12 -17 0 -4 4 -10 8 -6 2 2 6 -4 8 0 5 2 9 6 9 2 0 -4 4 -15 8 -17 2 -4 4 -2 4 0 0 5 2 7 4 9 0 2 0 8 -4 12 -4 4 -6 9 -6 11 0 2 2 10 2 14 0 2 -4 9 0 9 2 2 15 4 15 6 0 4 -5 6 -7 6 -4 2 -8 8 -8 8 z"/>
-			<path id="reg17d" d="M -1606 1312 c 0 0 -6 -3 -6 -9 0 -6 12 -6 12 -10 0 -4 -8 -6 -6 -11 2 -4 10 -6 10 -6 0 0 -4 -12 2 -17 7 0 9 13 9 13 0 0 2 -2 4 -2 2 0 6 -2 4 -6 -2 -7 2 -9 8 -9 7 0 13 0 15 -2 4 -4 12 -8 14 -6 3 4 5 6 0 12 -2 5 -6 7 -4 11 2 2 -2 10 -6 10 -4 0 -4 2 -10 7 -5 2 -9 -3 -9 -3 0 0 9 7 7 9 0 4 -9 2 -9 2 0 0 0 6 -2 6 -10 2 -6 -12 -8 -10 -2 2 -2 10 -6 10 -5 0 -5 2 -5 6 0 2 -4 2 -6 2 -2 0 -2 -4 -6 -2 l -2 5 z"/>
-			<path id="reg17e" d="M -1612 1862 c 0 0 -7 4 -9 4 -2 0 -6 2 -6 2 -2 0 -10 2 -13 2 -4 0 -6 -4 -6 -13 0 -8 2 -10 2 -12 0 -2 4 -4 7 -4 4 0 12 6 12 10 2 2 8 6 10 6 3 0 7 5 3 5 z"/>
-			<path id="reg17f" d="M -1704 1734 c 0 0 -8 -2 -8 -2 0 0 -13 -14 -19 -16 -6 0 -13 -4 -13 -9 -2 -4 -2 -10 -6 -12 -4 -4 -6 -19 -12 -17 -5 0 -13 11 -15 17 -4 2 -27 2 -27 2 0 0 -2 -23 -4 -27 -2 -4 -7 -11 -7 -13 0 -4 -4 -10 -8 -12 -2 0 8 -13 13 -15 0 0 8 9 12 4 4 -4 -4 -14 -2 -14 2 -2 13 -2 15 -4 0 -2 8 10 8 8 2 -2 19 -17 19 -19 0 -2 12 -10 12 -10 0 0 13 2 13 2 2 0 8 2 10 -2 2 -2 6 -4 11 -2 4 2 8 4 12 2 2 -2 10 -4 13 -2 4 4 12 10 14 10 4 0 8 6 8 9 0 4 0 22 0 25 0 6 7 16 7 20 0 5 -9 9 -11 9 -2 0 -8 2 -4 4 0 4 2 4 4 2 0 -2 11 -2 13 2 2 4 4 15 4 21 0 4 -6 12 -8 12 -5 -4 0 -12 0 -16 0 -2 -7 -4 -9 -4 0 0 2 16 0 16 -4 2 0 6 0 13 0 2 -4 6 -8 4 -4 0 -13 0 -13 0 0 2 -8 10 -10 12 -2 2 -4 2 -4 2 z"/>
-			<path id="reg17g" d="M -1358 1797 c 0 0 -21 -19 -23 -21 -11 -4 -11 -17 -11 -19 0 -2 2 -16 2 -23 0 -4 0 -14 0 -18 0 -4 3 -32 7 -46 4 -15 -4 -21 -7 -21 0 -2 0 -8 0 -12 0 -7 -8 -11 -8 -13 0 -4 -4 -10 -8 -10 -2 -2 -31 -30 -31 -30 -5 -2 -9 0 -9 5 -2 4 -21 -5 -25 -5 -4 -2 -16 -10 -16 -14 0 -4 8 -4 10 0 0 0 15 2 19 2 4 0 16 -6 16 -8 2 -2 15 6 17 8 2 0 8 -4 8 -8 0 -2 -4 -9 -8 -11 -2 -2 2 -4 2 -8 0 0 -10 0 -10 -4 0 -4 14 -4 18 -4 7 4 17 -9 19 -13 0 -4 15 -15 19 -15 2 0 19 -22 19 -22 0 0 14 0 16 -32 2 -29 -16 -41 -16 -41 0 0 -36 -15 -36 -15 0 0 -8 -4 -10 -6 -4 -2 -13 -4 -17 0 -4 2 -6 0 -8 0 0 0 -19 0 -23 0 -4 0 -19 10 -23 14 -2 7 -17 11 -17 11 0 0 9 -6 9 -6 2 0 12 -13 12 -15 0 -2 9 -4 9 -4 0 0 8 -4 10 -4 2 0 2 -7 -2 -7 -4 0 -11 -4 -11 -4 0 0 11 -2 15 -2 2 0 8 2 8 2 5 2 15 -12 15 -12 0 0 -15 0 -19 -2 -2 -2 -10 -9 -10 -11 2 -4 14 6 19 6 2 0 4 -6 4 -6 2 0 16 -8 18 -8 0 0 13 -6 17 -8 4 -3 13 -9 17 -9 4 0 12 -2 16 -8 3 -6 3 -6 0 -11 0 -4 9 -6 9 -6 l 0 -2 c 0 0 4 0 4 -2 0 -2 -6 -6 -6 -6 0 0 -4 0 -7 0 0 0 -6 -4 -10 -4 -2 0 -6 4 -6 4 -2 -4 -13 -4 -17 -4 -6 0 -8 0 -10 -2 -2 -5 -9 -5 -13 -3 -2 0 -4 0 -8 -2 -4 -2 -8 5 -8 5 0 0 0 -5 0 -11 -5 -8 -13 2 -13 2 0 0 0 -2 0 -4 0 -6 -8 -4 -8 -4 0 0 -4 -4 -4 -6 0 -5 -9 4 -11 6 -2 0 6 10 6 10 0 0 -6 0 -10 0 -6 -2 -10 7 -4 13 2 6 0 6 -6 6 -7 0 -9 -15 -13 -15 -2 0 -2 13 0 17 2 6 0 13 -2 13 -4 -2 -6 0 -4 4 2 4 8 19 6 21 -2 2 -8 -2 -8 -5 0 -4 -7 -4 -11 -4 -2 2 -2 -6 -6 -6 -2 0 -6 6 -6 8 -2 5 -4 -10 -9 -6 -2 2 0 8 0 11 0 2 -2 8 -4 12 0 2 9 13 9 15 -2 2 -15 -7 -17 -7 0 0 -6 15 -6 21 0 4 10 0 14 0 4 2 -4 9 -6 9 -4 0 2 6 6 10 2 2 -4 2 -8 2 -4 0 0 6 0 13 0 2 -10 -5 -13 -5 -2 2 -6 7 -2 9 0 2 -6 2 -8 2 -4 0 -6 8 -6 8 -2 2 8 0 10 2 2 4 -8 6 -10 6 -4 0 -4 9 -6 7 -5 -2 -13 -4 -17 -4 -4 2 -2 8 2 10 4 0 6 4 12 2 5 -2 15 -2 15 2 0 6 -10 -2 -10 0 -2 2 -7 0 -11 2 -2 2 6 13 11 17 4 2 39 -19 39 -17 0 4 -14 13 -16 15 -5 0 -9 12 -9 16 0 3 -4 0 -8 3 -2 0 -13 10 -13 12 0 2 2 8 -2 10 -2 5 0 11 0 13 0 2 -4 2 -6 2 -4 2 -6 8 -4 10 2 3 -8 11 -11 17 -2 6 9 0 11 2 0 0 -11 9 -13 11 -2 2 -8 12 -8 16 0 2 -6 9 -10 11 -2 2 -7 12 -7 14 0 4 15 -4 17 -4 0 0 13 -25 13 -25 4 -2 18 -27 18 -29 0 -2 0 -10 7 -10 4 -5 20 -23 22 -19 3 2 -12 12 -14 16 -2 3 -6 11 -6 11 0 0 0 4 2 8 0 6 0 19 4 19 2 0 2 -19 4 -19 2 0 13 -8 17 -6 6 2 14 10 14 15 0 2 -10 -5 -12 -5 -6 -2 -9 0 -9 5 0 4 -6 14 -6 18 0 4 9 17 9 21 0 2 -5 11 -9 11 -4 0 -8 4 -12 8 -2 2 -2 8 -4 8 -3 0 -7 4 -11 4 -2 0 -4 2 -4 7 0 4 -6 18 -6 18 -4 0 -7 -4 -9 -4 -4 0 -4 13 0 15 2 0 2 4 0 6 0 4 -2 19 -2 19 0 0 7 -4 7 -9 0 -2 0 -6 4 -8 4 -2 8 -2 10 0 4 0 15 19 19 21 0 2 2 0 4 -4 0 -4 -4 -11 0 -11 2 -4 10 9 13 13 2 4 22 0 29 0 4 0 12 -11 12 -11 0 0 4 5 9 5 4 0 16 8 18 10 0 2 -10 2 -14 2 -2 0 -25 21 -29 23 -5 4 -3 40 -3 44 0 6 9 8 9 8 2 0 0 13 2 15 4 2 8 -7 8 -7 0 0 2 5 6 5 0 0 7 -7 9 -5 0 0 0 9 0 9 0 0 0 6 -4 6 -5 2 -5 13 -7 15 0 0 -4 2 -10 6 -4 4 -2 14 2 14 6 0 -2 7 -6 7 -4 4 -13 12 -13 16 -2 5 2 9 4 13 0 4 7 14 5 14 -5 0 -9 -14 -15 -14 -4 0 -2 14 -4 14 -2 0 -4 -6 -8 -10 -3 -6 -13 -4 -17 -4 -2 0 -8 -2 -13 -4 -2 -4 -8 0 -8 0 -4 0 -8 0 -12 2 -3 0 -13 4 -15 4 -2 0 -10 8 -13 12 0 0 -8 3 -12 3 -2 0 -17 10 -19 12 -2 4 4 6 6 8 3 2 13 -6 17 -8 2 -2 11 2 13 2 4 0 2 4 0 6 0 2 -2 17 -2 19 0 4 -13 33 -15 38 0 2 -15 10 -19 10 -4 0 -31 8 -33 8 -4 0 -33 0 -38 0 -4 2 -2 13 5 13 2 0 4 4 4 4 0 2 -9 6 -9 6 0 2 5 7 9 7 4 0 12 0 12 4 0 2 -10 2 -12 0 -4 0 -4 2 -2 8 2 4 12 2 14 4 4 0 6 0 9 -2 2 -2 6 -4 8 -2 2 2 6 0 12 -2 5 0 2 6 2 10 0 2 3 7 5 7 4 0 8 4 8 4 0 0 -8 0 -10 0 -5 0 -3 6 -3 8 3 4 15 4 19 4 6 0 11 4 13 7 0 4 6 14 10 16 2 4 13 9 15 11 2 2 8 0 10 -2 0 0 8 -7 11 -7 2 -2 12 -2 16 2 2 5 4 5 9 0 2 -2 12 -8 16 -10 2 -2 17 -8 19 -8 0 0 -6 8 -8 10 0 2 -15 8 -19 10 -2 3 -21 7 -27 11 -6 4 -9 17 -11 19 -4 2 -10 -5 -14 -5 -4 0 -13 0 -15 -2 -2 -4 -10 -6 -12 -6 -2 0 -9 -2 -11 -4 -4 -2 -18 -4 -18 -4 -3 0 -9 0 -11 0 -4 0 -4 6 -2 8 0 2 -8 6 -10 8 -2 3 -13 -2 -15 -2 0 -2 -6 9 -8 11 -2 4 0 10 0 10 0 0 -21 15 -25 15 -4 0 -17 0 -19 4 -2 4 -15 15 -23 17 -10 0 -8 6 -10 4 -7 -2 -13 0 -17 2 -2 2 -13 6 -8 10 4 4 8 0 12 0 0 2 8 0 11 4 2 5 2 9 2 11 0 2 0 8 4 8 6 -2 8 -8 8 -10 -2 -4 4 -17 11 -17 6 2 2 8 6 6 6 -2 16 -2 16 -6 0 -4 9 -4 13 0 4 4 8 6 10 6 5 0 11 0 13 2 0 3 4 -2 4 -8 0 -4 4 -4 4 0 0 6 0 19 4 19 7 0 11 6 13 10 0 4 2 4 6 4 6 0 13 -10 19 -12 4 -2 0 -6 0 -10 0 -5 10 -7 10 -11 0 -4 7 -6 7 -4 2 2 8 2 10 -2 4 -4 31 4 35 10 5 4 17 23 17 23 0 0 4 -10 6 -8 7 0 11 8 15 8 4 -2 14 2 14 0 0 -4 -2 -14 0 -12 5 2 13 4 17 4 6 0 6 2 13 0 6 -2 14 0 14 -2 2 -4 6 -11 6 -6 5 4 5 10 9 10 4 0 14 -2 16 0 3 4 11 8 11 8 0 0 -13 0 -8 4 8 3 10 5 20 0 9 -4 23 0 27 5 5 2 21 10 28 10 6 0 29 -2 39 -2 8 0 17 0 17 0 l 0 2 c 0 0 2 -10 4 -10 0 0 10 0 10 0 2 0 13 -5 13 -9 0 -4 2 -12 4 -12 4 -2 6 -9 2 -11 -4 -4 -19 -4 -23 -8 -4 -2 -10 -8 -10 -8 0 0 -15 -11 -17 -13 -2 -2 -12 -4 -12 -4 0 0 29 2 29 2 0 0 4 0 6 0 2 -2 6 -10 4 -12 -2 -2 -6 -2 -6 -2 l -4 -3 c -4 -2 0 -10 4 -12 4 -2 12 -2 17 0 4 2 10 2 14 0 2 -2 4 -10 0 -13 -6 0 -8 -2 -4 -2 4 0 4 -4 6 -4 2 0 7 0 7 4 0 2 6 0 8 -2 4 0 17 -16 17 -18 0 -7 8 -9 18 -25 9 -17 2 -30 -2 -44 -6 -13 -27 -21 -31 -25 -4 -2 -31 -9 -38 -9 -4 0 -8 15 -16 11 -17 -6 -2 -15 -2 -15 0 0 2 -10 6 -10 2 0 8 -11 10 -15 2 -4 0 -23 -2 -29 -4 -4 -12 -25 -12 -25 0 0 -11 -10 -13 -12 -4 -2 -16 -5 -16 -5 0 0 16 0 16 0 2 3 13 9 13 9 0 0 6 14 12 14 7 -2 2 -14 -2 -23 -4 -8 -14 -25 -14 -33 0 -8 4 -10 6 -6 2 4 12 -2 10 -6 -2 -5 -12 -11 -12 -15 -2 -2 0 -23 0 -25 l -2 -2 z"/>
-		</g>
-		<g id="reg28">
-			<path id="reg28a" d="M -592 912 c 0 0 -27 4 -29 2 -4 -2 -2 -7 0 -11 2 -4 15 -2 17 -6 0 -2 10 -6 14 -2 5 0 0 4 3 4 2 0 8 2 8 6 0 4 -8 4 -8 4 l -5 3 z"/>
-			<path id="reg28b" d="M 0 320 l 29 -17 c 0 0 6 0 9 0 2 4 8 13 8 19 2 6 6 10 12 17 7 8 15 23 15 23 0 0 2 -3 6 -3 4 0 11 5 15 11 6 4 8 -8 8 -8 0 -3 6 -3 11 -5 2 -4 10 -12 10 -12 0 -2 10 -4 15 0 2 2 29 21 35 23 6 0 12 -21 12 -25 0 -2 7 -11 11 -11 6 0 10 -16 10 -23 0 -6 -4 -43 -4 -54 0 -8 4 -16 6 -16 2 0 13 -17 13 -21 0 -2 12 -9 21 -9 8 0 12 -4 12 -8 0 -6 21 -14 21 -14 0 0 4 25 4 27 0 4 27 2 31 2 5 0 19 23 21 25 4 4 4 10 4 14 0 7 -8 40 -8 40 0 0 4 2 8 2 3 0 11 -15 11 -19 0 -2 -2 -10 -2 -12 -2 -2 14 -15 14 -15 0 -4 13 -8 19 -8 2 -2 2 -11 -2 -13 -4 0 -2 -12 -2 -12 l 0 -2 c 0 0 2 -2 2 -4 0 -5 -19 4 -23 4 -2 0 6 -9 6 -15 0 -6 -6 -6 -10 -4 -4 0 0 -6 0 -10 0 -3 -15 -3 -19 -5 -4 0 -16 -4 -19 -8 -4 -4 9 -2 11 0 2 2 10 0 12 0 5 0 23 4 23 4 2 0 7 -8 11 -10 2 -2 8 -6 8 -11 2 -4 10 -12 17 -12 6 0 12 -8 12 -11 0 -4 -19 -8 -25 -12 -4 -2 -23 4 -23 4 0 0 9 -6 9 -8 0 -2 -5 -9 -7 -11 -4 -2 -10 5 -14 9 -4 2 0 -9 -2 -11 -2 -2 -15 9 -15 9 0 0 -4 -15 -10 -17 -7 -4 -23 17 -23 21 0 4 2 19 0 27 -4 4 -6 8 -6 4 0 -4 -7 -4 -7 -4 0 -2 -8 -6 -8 -6 0 0 12 -13 12 -15 0 -2 0 -4 0 -6 -2 -4 -20 8 -20 8 0 0 8 -10 10 -12 2 -5 -2 -7 -2 -7 0 0 12 -4 15 -6 0 0 4 -10 2 -14 0 -5 -5 0 -11 0 -6 0 -2 -7 0 -7 4 -2 0 -6 -4 -6 -4 0 -4 2 -8 6 -4 4 -9 2 -9 0 0 -4 -6 -6 -12 -2 -4 2 0 6 2 6 2 0 2 5 2 5 0 0 -4 -2 -10 -2 -2 2 2 10 2 10 0 0 -9 -4 -11 0 0 4 11 8 13 4 2 0 8 4 8 4 2 2 -8 4 -8 9 0 2 -2 6 -4 8 -2 2 2 10 2 10 -2 2 -4 7 -4 11 0 4 -7 2 -9 2 -2 -2 -2 8 -6 8 -4 0 0 -23 0 -27 0 -4 -4 -4 -6 -6 -4 -2 4 -6 6 -11 0 0 2 -6 0 -8 -2 -2 -2 -12 -4 -12 0 0 -9 12 -13 20 -4 7 -8 21 -8 23 -2 0 -8 11 -10 15 0 4 -7 6 -9 8 -2 2 -2 7 0 11 2 2 -2 8 -4 14 -2 4 -8 7 -10 7 -5 0 -2 -17 2 -21 2 0 0 -2 -2 -4 0 -3 2 -11 4 -13 0 0 0 -4 -2 -6 -2 -4 6 -17 8 -21 2 0 8 -4 8 -6 0 -2 5 -9 5 -9 0 0 0 -4 0 -6 0 0 -9 4 -9 4 0 0 -6 -4 -8 -4 -2 0 -2 11 -4 13 -2 0 -2 -9 -4 -11 -3 -2 -7 4 -9 4 -4 -2 -8 -10 -12 -10 -4 0 0 10 0 12 0 3 -7 0 -7 0 0 0 -2 0 -4 5 -2 4 4 4 7 6 6 0 8 10 8 10 0 0 -6 -2 -8 -4 -3 0 -5 2 -9 6 -2 7 0 13 0 17 2 2 -4 0 -8 0 -4 0 -15 13 -19 17 -2 4 0 6 2 6 2 0 -8 6 -10 8 -2 0 2 9 2 11 0 0 -2 2 -4 2 -2 0 2 6 4 8 0 0 4 4 0 8 -6 3 -11 -4 -11 -8 0 -6 -2 -8 -4 -8 -2 0 -10 6 -12 6 0 0 -9 2 -11 2 0 0 5 -2 5 -4 2 -2 10 -8 10 -10 0 -3 -10 -5 -13 -5 -4 -2 -8 0 -4 5 4 4 0 6 -2 6 -2 0 -4 -6 -4 -13 -2 -6 -10 -6 -15 -6 0 0 0 13 -2 13 0 2 -4 -5 -4 -5 l -2 30 c 0 0 -4 0 -8 0 -4 0 0 6 0 10 0 4 -9 4 -9 2 0 -4 -4 -6 -6 -2 -2 2 -2 4 -4 8 -2 2 -2 -10 -4 -8 -4 2 -6 10 -4 12 0 3 2 7 0 11 -2 6 8 14 8 19 0 2 -8 -2 -13 -2 -2 0 -2 4 -2 10 0 4 -14 15 -14 15 0 0 6 -9 6 -11 2 0 6 -37 6 -37 0 -2 4 -21 2 -23 -4 0 -10 12 -14 16 -4 2 -4 11 -4 19 0 4 -9 25 -9 25 0 0 4 -25 4 -29 0 -2 -6 -13 -8 -13 -4 0 -14 9 -19 13 -2 4 2 12 5 15 0 2 -5 6 -5 10 0 4 11 8 13 10 2 2 8 15 4 15 -2 2 -15 -13 -15 -13 -2 0 -8 -4 -8 -8 0 -2 -6 -17 -12 -12 -5 4 -5 10 -2 12 2 4 16 17 16 17 0 0 -10 -4 -14 -2 -2 4 -2 16 -2 14 0 -2 -3 -14 -5 -16 -2 -5 -6 -15 -8 -15 -4 0 -10 15 -10 19 2 6 4 12 0 12 -2 0 -5 -14 -5 -16 0 -2 7 -9 7 -13 0 -4 -2 -6 -4 -6 -5 0 -5 -4 -5 -6 0 -5 -6 -2 -8 -7 -6 -2 -6 2 -6 7 0 2 -4 2 -9 2 -6 2 0 6 3 8 2 2 -13 2 -15 2 -4 2 -2 6 -6 8 -4 0 -2 5 0 5 4 0 8 6 6 8 -4 2 2 2 2 6 0 2 -10 6 -10 11 0 4 2 2 6 2 2 0 6 0 6 4 0 4 8 2 8 0 0 -2 7 -13 7 -13 2 0 8 0 8 2 2 3 -2 7 -6 11 -2 4 -2 10 -2 10 l 0 2 c 0 0 14 -2 14 2 0 5 -6 3 -10 5 -2 2 8 8 8 8 -2 2 -8 -2 -12 0 -4 0 4 4 2 6 -2 4 -9 -2 -11 0 -4 4 -8 6 -8 4 -2 0 -10 -4 -17 0 -4 5 -6 23 -6 23 2 2 23 -4 23 -4 0 0 4 6 6 8 2 0 11 -8 11 -8 0 0 4 4 2 8 0 5 -6 7 -9 7 -2 0 -10 -2 -12 2 -4 4 -15 -4 -17 -6 -2 -3 -8 0 -12 2 -2 2 2 4 2 6 0 2 14 17 14 17 0 0 -18 -13 -20 -15 -2 0 -5 4 0 6 2 2 2 9 0 15 0 6 6 4 6 6 0 6 -4 6 -4 6 -2 0 0 17 0 17 0 0 -2 -6 -4 -10 -3 -3 -7 -13 -7 -17 0 -4 -2 -19 -4 -19 -4 0 -6 11 -6 13 0 4 -6 0 -6 -2 0 -3 -17 2 -17 4 -2 4 6 8 10 8 5 0 -2 2 -2 6 0 0 9 0 9 0 0 0 6 2 6 4 0 0 -8 0 -15 3 -4 0 -18 0 -25 0 -4 2 0 6 -4 10 -6 2 2 10 2 15 0 2 -10 2 -10 6 0 4 6 2 10 2 6 0 21 -8 21 -11 0 -2 13 7 13 7 0 0 0 4 -3 4 -4 0 5 -2 -4 -4 -4 0 -8 4 -4 4 4 4 -6 0 -10 0 -2 0 0 4 0 8 2 2 -4 4 -2 6 2 3 18 -2 20 -2 3 0 -2 5 -4 9 -4 4 0 16 -2 18 -2 3 -10 -10 -12 -14 -2 -2 -11 -6 -11 -8 0 -5 -6 -3 -10 0 -2 0 -8 4 -4 8 2 2 0 4 -4 4 -5 0 -15 15 -17 19 0 2 8 2 8 2 2 0 21 -4 21 -4 2 0 6 -2 6 2 0 2 7 0 9 0 2 2 4 10 4 12 -2 4 -4 -2 -4 -4 0 -2 -7 -4 -11 -4 -4 2 -2 12 -6 12 -4 0 -2 -10 -2 -12 0 -2 -21 4 -25 4 -4 2 2 11 4 13 0 0 -8 0 -10 2 -5 2 -9 2 -11 0 -2 -2 -8 6 -10 6 -4 0 -11 2 -13 4 0 0 15 11 19 13 4 4 -14 0 -19 0 -4 2 9 8 9 8 2 0 -13 2 -15 2 -2 -2 -4 2 -2 4 2 2 -8 2 -8 2 -4 0 2 4 2 7 0 2 10 2 14 2 2 0 0 8 -4 6 -6 0 -8 0 -12 4 -7 4 -9 -4 -11 -4 -2 0 -2 6 -2 8 0 2 0 9 0 11 -2 0 21 2 21 4 0 2 -21 6 -21 10 0 2 15 -4 19 -4 4 0 29 0 29 0 0 0 -17 4 -19 4 -4 0 0 6 -2 6 0 3 -6 3 -6 0 0 -2 -8 -4 -10 -4 -2 0 -27 7 -27 11 0 4 8 2 10 2 2 0 -2 10 0 12 2 2 8 2 6 7 -2 2 -12 -5 -14 -7 -2 0 -9 4 -9 9 -2 6 2 25 2 25 0 2 -6 2 -8 0 0 -5 -6 0 -8 0 -4 0 2 10 6 10 4 0 4 6 2 6 -2 0 8 0 8 2 0 5 -14 2 -16 2 0 -2 -4 -12 -9 -14 -2 0 0 10 0 12 0 5 -8 13 -12 15 -2 2 -6 8 -6 12 0 5 12 -4 12 -4 0 -2 4 0 2 2 0 5 2 9 4 13 0 4 15 -6 17 -6 0 -2 0 2 0 2 l -2 0 c 0 0 -27 18 -29 18 -2 0 4 -10 2 -12 -2 -2 -17 10 -19 12 -4 5 -21 11 -23 15 -4 2 -8 8 -4 13 4 4 10 -3 13 -5 2 -2 14 -12 18 -12 4 -2 23 0 25 2 2 2 -6 2 -8 0 -2 0 -19 2 -23 4 -2 2 -6 6 -6 8 0 3 -9 7 -11 9 -2 2 -8 8 -8 12 0 2 2 2 6 4 4 3 0 5 -2 5 -2 0 -8 0 -10 -2 0 -5 -4 -9 -6 -9 -3 2 2 6 2 11 0 2 6 4 8 4 4 4 4 12 -2 14 -4 2 -2 -8 -2 -8 0 0 -4 -6 -9 -6 -2 -2 -4 -11 -6 -13 -2 0 -2 7 -2 9 0 2 -4 2 -6 2 -4 0 -6 0 -4 6 0 4 -2 2 -4 0 -3 0 -9 0 -9 2 -2 2 0 4 -2 8 -6 5 -8 5 -8 11 0 4 -2 2 -2 2 -4 0 -7 2 -9 6 -2 0 -14 8 -14 15 0 2 6 -2 10 0 4 4 -6 8 -8 8 -4 0 -8 0 -11 4 0 2 -8 2 -10 4 -4 2 4 2 4 5 4 2 -12 6 -12 8 0 2 25 -6 27 -4 2 0 -6 6 -11 6 -4 2 -4 8 0 12 2 3 2 11 5 15 0 4 14 -6 16 -8 4 0 17 -2 17 -4 0 -3 4 -9 10 -9 7 0 13 -14 13 -16 0 -3 -6 -3 -9 -3 -4 0 5 -4 9 -6 4 0 14 -6 14 -10 0 -2 7 0 7 2 -5 2 2 2 4 4 2 2 -13 10 -17 13 -4 2 -4 8 0 4 6 0 13 4 13 6 0 2 -11 6 -15 6 -4 2 -25 13 -27 13 -2 2 4 10 4 14 0 4 -8 2 -10 0 -2 -2 -4 0 -11 0 -4 0 -6 -4 -8 -4 -2 0 -4 4 -6 6 -4 2 0 7 -4 7 0 0 -9 6 -11 2 0 -2 6 -9 6 -13 0 -4 -4 -6 -6 -8 -2 -2 0 -6 0 -11 0 -6 -8 -2 -10 -2 -2 2 -7 5 -15 5 -8 0 -6 6 -2 6 4 0 2 4 -2 4 -2 0 0 4 2 8 2 2 -10 2 -10 2 -2 0 0 -12 -2 -12 -5 0 -13 -2 -15 -2 -2 2 4 8 2 10 -4 2 -10 -2 -12 4 -5 7 4 11 6 13 2 0 -4 2 -4 2 0 0 -5 2 -5 4 -2 2 -12 -6 -16 -6 -2 0 -4 4 -4 8 0 4 4 11 6 11 2 2 8 4 8 4 0 0 -6 2 -6 4 0 4 6 10 0 6 -8 -4 -13 -14 -13 -16 0 -3 -4 -9 -4 -11 0 -2 -6 -6 -10 -6 0 0 -4 -4 -4 0 0 0 0 6 2 6 2 0 6 11 8 13 2 2 2 12 4 16 0 2 13 13 13 13 -2 2 -17 -11 -17 -13 0 -6 -2 -10 -6 -14 -2 -4 -13 -2 -13 -2 -4 0 2 -7 0 -7 0 0 -10 5 -14 5 -4 0 -4 -7 -6 -11 0 -2 -9 -2 -11 0 -6 0 -6 2 -8 8 0 5 10 9 12 13 2 2 -6 0 -10 0 -2 0 -2 2 4 6 4 4 13 4 13 2 0 -2 14 -2 16 0 4 0 -10 4 -12 7 -2 2 16 0 18 0 3 0 11 -5 13 0 2 2 -10 4 -13 4 -4 0 -20 2 -20 6 0 2 14 6 14 6 0 2 -14 0 -16 -2 -3 0 -11 -8 -11 -8 -2 4 -8 4 -8 2 0 -2 -2 -6 -4 -6 -5 0 -13 -2 -15 0 -2 2 -10 -2 -10 0 -2 0 -9 -5 -11 0 -2 4 4 8 4 8 15 0 5 4 -2 4 -6 0 0 4 7 4 6 0 18 2 20 4 2 0 7 11 7 13 0 4 14 8 16 10 2 2 0 5 -6 2 -4 -2 -10 -2 -10 3 -2 4 0 8 6 12 4 4 -6 2 -11 2 -4 0 -6 2 -8 2 -4 0 6 -14 6 -16 0 -3 -2 -11 -2 -15 0 -4 -2 -10 -4 -10 -4 0 -8 -3 -12 -3 -7 3 -2 25 -5 25 -4 0 -8 -18 -8 -20 -2 -2 -12 8 -17 8 -4 0 -4 4 -4 8 0 4 13 15 13 15 0 0 -13 0 -21 0 -8 0 4 -8 4 -13 0 -2 -8 -2 -10 -2 -4 0 -7 -4 -11 -4 -6 0 2 11 0 13 -4 4 -8 -7 -10 -9 0 -4 -4 -10 -8 -10 -3 0 -3 6 -5 10 0 2 9 7 11 9 2 4 -11 4 -13 8 -2 4 4 6 7 6 2 0 10 -4 12 0 2 2 10 4 17 4 4 0 2 5 10 7 6 2 25 4 29 4 4 2 7 2 4 4 -4 2 -14 2 -16 2 -4 -2 -13 2 -15 2 -2 -2 -4 -6 -10 -8 -4 0 -13 -6 -17 -9 -4 -2 -12 3 -17 5 -4 4 -8 12 -8 12 0 0 -6 -8 -6 -6 -4 0 -4 10 -4 12 0 5 4 5 12 5 6 0 9 8 9 8 0 0 -9 -2 -11 -2 -4 2 6 8 8 8 3 2 11 6 11 6 2 -2 10 0 10 0 2 2 7 2 7 5 0 4 -7 2 -7 0 -2 0 -8 -3 -12 -3 -2 0 -15 -4 -17 -4 -2 -2 -14 -2 -14 4 -3 5 10 5 14 7 4 4 -6 4 -8 4 -4 0 -13 2 -13 6 0 4 15 6 15 6 0 2 -2 9 0 11 0 4 10 4 12 2 2 -2 13 0 15 0 2 0 17 4 21 4 2 0 8 6 12 4 4 -2 21 -27 23 -27 2 2 -10 17 -10 19 0 2 6 6 12 6 9 2 9 2 4 4 -4 4 0 4 3 4 2 0 10 -4 14 -4 4 0 2 -6 2 -12 0 -4 15 -17 15 -17 0 0 -2 4 -4 8 -5 7 -5 17 -5 19 3 2 17 6 13 6 -4 0 -13 0 -13 3 0 4 -4 8 -6 6 0 -4 -10 -4 -14 -2 -2 0 2 8 2 10 0 4 4 15 4 15 0 0 -11 -7 -13 -9 -2 -2 -6 -2 -6 -2 0 0 4 -8 4 -12 0 -4 -2 -9 -4 -13 -2 -2 -12 -4 -17 0 -4 4 -8 4 -10 4 0 0 -8 -4 -10 -6 -5 -2 -23 -6 -27 -6 -3 0 -11 2 -13 6 -4 4 -8 -4 -8 -6 0 0 -4 0 -9 0 -2 0 -6 -6 -6 -13 0 -2 -4 -2 -6 0 -4 5 0 7 0 7 2 2 4 8 4 10 0 4 2 8 0 8 -2 0 2 3 4 9 0 6 21 0 21 2 0 0 -8 2 -10 4 -2 4 2 15 0 17 -2 0 -9 -9 -9 -11 0 -2 -6 -8 -8 -8 -2 2 0 10 0 15 0 2 6 12 8 14 2 2 17 -8 19 -8 0 -2 6 -2 6 0 0 0 -10 6 -10 6 0 0 0 4 -4 4 -4 0 -7 4 -7 9 0 2 7 8 11 4 4 0 8 -15 12 -15 5 0 0 6 -4 13 -2 6 -14 8 -16 8 -3 -2 -7 -15 -9 -10 -2 4 0 14 -4 16 -4 0 0 4 0 4 0 0 -4 5 -4 7 0 2 8 8 10 8 0 2 9 -6 11 -8 4 -2 6 -2 4 -2 0 2 0 6 4 6 0 0 0 4 -4 6 -2 0 -6 2 -6 4 0 2 10 -2 10 0 0 2 0 11 -4 11 -2 2 -13 0 -15 2 0 2 -6 4 -4 10 0 4 8 0 8 0 0 -2 11 -6 13 -4 2 0 8 -8 8 -13 0 -4 7 -10 11 -10 4 0 8 -8 8 -12 2 -5 17 -5 19 -5 2 0 10 0 14 0 5 0 9 -8 11 -6 4 0 8 8 8 8 0 0 -8 -2 -14 3 -7 4 -17 25 -17 25 0 0 -4 -5 -4 -7 0 -2 8 -16 8 -18 0 -3 -10 4 -15 4 -2 0 -4 0 -4 4 -2 2 -8 8 -10 10 -2 2 -2 9 2 9 6 0 -6 0 -6 2 0 2 -2 8 -7 8 -2 0 -2 4 -4 6 0 2 -10 4 -12 4 -4 0 -6 5 -6 5 2 0 12 6 14 8 2 2 15 0 15 0 4 0 6 0 6 0 0 0 -10 6 -13 6 -2 2 -6 2 -10 2 -4 0 -12 2 -12 4 2 5 4 7 0 7 -7 2 -7 -2 -11 -2 -2 0 -2 4 -4 8 -2 4 -6 0 -6 -2 0 -2 -7 -6 -7 -6 -2 0 -8 6 -10 10 0 4 0 8 2 10 0 3 0 9 2 13 2 2 6 2 6 2 0 -2 7 2 7 4 0 0 2 -12 4 -14 4 -5 2 14 4 18 0 2 13 -6 13 -8 0 -2 -5 -6 -5 -6 -2 0 -4 -4 -2 -4 2 0 2 -7 7 -7 2 0 -3 7 2 7 4 0 4 2 2 2 -2 0 0 6 4 6 4 0 14 -15 14 -17 0 0 7 -8 7 -2 0 4 6 4 6 4 0 0 -10 5 -13 9 -2 2 -10 10 -14 12 0 0 6 4 8 6 2 5 -8 9 -10 13 -2 4 -11 2 -13 6 -2 2 2 13 2 15 5 4 19 2 19 2 0 0 -6 4 -8 4 -4 0 -6 10 -6 10 0 0 -11 -10 -13 -14 -2 -4 -10 4 -12 4 -3 0 -3 -10 -5 -12 -2 0 -4 12 -8 16 -2 6 0 29 2 34 4 4 13 14 19 22 4 7 21 21 25 21 6 4 17 0 21 0 0 4 -13 9 -17 11 -4 6 2 12 4 14 2 2 11 -8 11 -10 0 0 4 -2 8 2 4 2 -8 10 -6 10 2 0 10 -2 14 0 4 0 -2 7 -4 9 -2 0 15 2 17 2 2 2 16 0 21 0 4 0 16 -4 16 -6 0 0 7 -3 11 -3 2 3 37 -25 41 -25 7 -4 11 -10 11 -12 0 -2 6 -6 14 -10 7 -5 2 -11 2 -11 0 0 7 2 11 2 4 0 8 -8 4 -10 0 -4 10 -6 17 -6 6 0 8 -15 8 -15 0 0 6 4 6 6 0 4 4 6 4 6 3 0 13 -6 15 -6 2 2 8 -6 8 -6 0 0 7 -15 7 -10 0 4 6 -5 8 -13 2 -10 -4 -17 -6 -21 -2 -2 2 -12 2 -16 0 -3 2 -11 4 -9 0 4 2 13 2 17 0 2 4 -4 6 -8 4 -3 0 -9 -2 -15 0 -8 11 -15 11 -17 2 0 10 11 8 13 -4 0 -6 -9 -8 -4 -5 2 -5 16 -2 18 2 0 2 13 0 17 -5 4 -5 23 -3 25 3 0 3 4 3 4 -3 0 2 4 2 11 0 6 10 10 14 10 4 0 4 8 4 8 0 0 5 2 5 2 0 0 8 9 10 15 6 6 12 -2 15 -6 2 -2 8 -19 8 -21 0 -4 0 -25 0 -31 0 -4 2 -13 4 -17 2 -2 6 -10 6 -15 0 -2 0 -14 0 -18 0 -4 15 -13 17 -13 2 0 21 -8 21 -14 2 -5 6 -17 8 -25 4 -5 0 -40 -6 -46 -4 -4 -4 -15 -4 -15 0 -2 6 -29 6 -35 0 -6 19 -17 25 -17 4 0 2 -14 2 -21 0 -4 -19 -12 -21 -16 -4 -5 6 -27 6 -27 0 0 13 -23 13 -30 0 -6 -4 -20 -6 -23 0 -2 -7 -6 -7 -12 0 -2 5 -15 3 -17 -3 -4 -9 -21 -7 -21 4 0 13 -10 11 -12 -2 -4 -4 -17 -2 -21 0 -4 -5 -17 -5 -17 0 -2 5 -14 9 -14 6 -4 6 -8 6 -17 0 -4 6 -21 15 -29 8 -8 18 -21 23 -25 4 -6 25 -12 27 -10 6 2 12 8 12 8 0 0 11 8 13 6 2 -4 14 -41 14 -46 0 -6 -16 -18 -16 -18 0 0 37 -32 39 -36 0 -4 4 -27 6 -31 4 -4 4 -40 4 -44 0 -4 11 -14 11 -19 -2 -4 -4 -35 0 -35 4 0 14 -12 21 -15 4 -4 21 -6 23 -12 0 -6 -5 -23 0 -29 6 -4 23 -17 23 -21 0 -2 10 -15 14 -17 4 -2 8 -16 8 -25 0 -8 -8 -37 -4 -41 0 -7 15 -11 15 -11 0 0 8 -29 10 -33 0 -2 23 -25 27 -25 2 0 17 12 21 10 4 0 15 -12 15 -12 0 0 -4 -9 -4 -15 2 -2 12 -39 16 -37 4 2 23 10 25 10 4 0 17 2 21 6 2 7 21 11 27 9 4 -7 11 -15 11 -15 0 0 -11 -4 -11 -4 0 0 4 -19 4 -19 0 0 15 4 15 0 0 -2 -13 -6 -13 -6 0 0 -2 -23 -2 -23 0 0 15 -4 17 -2 2 2 25 29 25 29 l -27 -31 z"/>
-		</g>
-		<g id="reg36">
-			<path id="reg36a" d="M -202 1655 c 0 0 -15 32 -19 36 -2 4 -4 12 -4 16 0 5 -8 5 -8 9 0 4 -15 35 -15 39 0 7 0 32 2 29 4 0 15 -31 15 -39 2 -11 21 -48 21 -54 2 -7 8 -32 8 -36 z"/>
-			<path id="reg36b" d="M -138 1707 c 0 0 -2 -4 3 -6 4 -2 2 -19 0 -23 -5 -4 0 -16 2 -21 2 -6 -5 -14 -2 -18 4 -5 18 -34 25 -38 2 -4 12 -8 12 -6 0 2 4 8 6 8 4 -2 0 -10 4 -10 3 -2 9 0 9 8 0 8 -6 8 -6 15 0 4 -7 0 -7 6 0 4 -2 15 -2 17 0 2 6 8 6 14 0 4 -10 2 -10 6 0 7 -4 15 -10 15 -7 2 -9 6 -9 10 0 5 -6 7 -6 11 0 4 -4 12 -12 12 l -3 0 z"/>
-			<path id="reg36c" d="M 31 364 c 0 0 25 20 32 23 6 2 37 10 37 16 0 9 6 21 13 23 4 6 14 13 14 15 0 2 -6 48 -2 50 2 4 13 6 13 16 0 9 -13 19 -13 19 0 0 15 13 19 21 2 10 8 35 0 48 -11 17 -2 37 2 42 6 6 14 27 14 31 0 6 0 10 0 10 0 0 -8 6 -8 6 0 0 -6 -6 -12 -4 -2 4 -9 11 -13 7 -2 -3 -6 -3 -6 -3 0 0 0 13 -4 11 -7 -2 -21 -17 -21 -17 0 0 -4 9 -8 9 -5 0 -5 -7 -7 -5 0 2 -4 17 -4 17 0 0 6 6 6 6 0 2 -4 9 -8 9 -2 0 -6 0 -6 0 0 0 -11 4 -11 4 0 0 7 4 7 4 -2 2 -11 8 -15 8 -6 0 -10 0 -8 7 2 2 8 6 8 12 0 4 -4 4 -4 2 -2 0 -6 -6 -6 -6 0 0 2 12 4 14 0 3 -2 13 -2 15 0 2 -2 10 -2 10 0 0 -11 7 -11 7 0 0 6 12 11 12 2 0 2 6 -2 6 -5 0 -19 7 -9 15 11 6 2 4 2 4 l 2 0 c 0 0 13 4 13 6 0 3 0 9 0 11 2 0 6 2 4 4 -4 2 -8 10 -8 10 0 3 -9 7 -9 7 0 0 -4 14 -4 21 0 8 -2 18 -2 18 l -2 0 c 0 0 -19 23 -25 25 -8 2 -15 7 -17 9 -2 0 -10 10 -10 10 0 0 -15 13 -17 15 0 4 -4 -13 -8 -9 -4 4 -2 9 -6 9 0 0 -5 6 -5 8 0 2 -6 4 -8 4 -2 0 -2 13 -4 13 -2 -2 -10 -9 -10 -7 0 2 -3 7 -7 7 -2 0 -6 4 -6 8 0 4 -6 6 -6 8 0 4 -11 2 -11 7 0 4 13 4 13 6 0 4 -4 10 -6 10 -2 2 -9 2 -9 6 0 3 -6 3 -8 0 -2 -2 -6 -8 -10 -8 -3 0 4 8 4 11 0 2 -7 6 -4 10 2 2 6 6 4 8 -2 2 -7 11 -11 13 -2 2 -6 2 -6 6 0 4 -4 -2 -8 -6 -4 -2 -4 2 0 8 6 6 2 6 -2 6 -2 0 0 7 2 9 2 2 6 4 2 8 -4 4 -9 -4 -9 -2 0 2 0 15 0 19 -2 2 -6 16 -6 16 0 0 4 17 4 21 0 2 -4 11 -8 6 -6 -4 -8 0 -8 5 0 2 0 10 0 12 0 4 -7 11 -2 13 2 2 4 12 4 16 0 2 -4 17 -4 19 0 2 2 8 2 10 0 3 -2 7 -2 9 0 4 4 4 4 6 0 4 6 10 6 15 0 2 -8 4 -8 4 0 0 4 6 10 6 6 0 13 0 13 2 0 4 0 13 2 13 4 2 16 -13 18 -9 3 7 7 19 9 21 2 2 19 13 19 15 0 2 0 6 -3 6 -2 0 7 8 9 8 4 2 10 7 10 11 0 2 -2 10 0 12 0 0 15 11 15 13 0 2 2 12 2 12 0 0 -17 6 -17 9 0 2 -16 18 -16 18 0 0 -11 9 -11 11 0 0 -10 0 -10 0 0 0 -7 8 -7 8 0 0 15 6 15 10 0 5 4 19 -2 19 -6 0 -10 15 -10 15 0 0 -5 -9 -5 -9 -4 0 -8 28 -12 25 -4 -4 -4 -14 -4 -18 2 -2 4 -13 -2 -15 -9 0 -13 11 -13 13 0 4 2 16 0 18 -4 2 -10 13 -17 13 -4 0 -8 -2 -8 -2 0 0 -8 14 -12 10 -5 0 -15 0 -13 0 2 2 8 15 8 17 0 2 -6 6 -6 8 0 2 2 4 2 6 -4 0 -8 3 -4 7 4 4 13 0 13 4 0 4 -5 8 -2 12 2 2 -13 19 -13 23 0 2 2 11 2 11 0 0 -12 -11 -12 -9 2 2 2 15 4 19 4 4 0 8 0 13 0 2 0 8 0 8 0 0 -4 -4 -4 4 0 11 10 21 2 29 -11 11 -7 19 -4 23 2 4 0 13 -5 13 -4 4 -4 21 -4 21 0 2 -8 20 -8 20 0 2 -13 30 -13 30 0 0 -10 29 -12 29 0 0 -8 12 -17 6 -6 -4 -14 -4 -14 -4 -2 0 -11 2 -17 0 -4 -6 -10 2 -15 2 -6 0 -18 -4 -18 -2 0 2 8 6 4 8 -4 4 -13 0 -21 2 -4 4 -17 19 -17 29 0 9 9 15 9 15 0 0 -9 27 -13 27 -4 0 -23 -6 -25 -6 -4 2 -21 10 -27 10 -8 -2 -35 -12 -35 -16 0 -3 6 0 6 -7 -2 -8 0 -14 2 -14 4 4 10 -7 6 -11 -6 -4 -6 -14 -6 -18 0 -7 -8 -11 -8 -17 0 -8 -2 -17 -7 -23 -2 -6 -2 -13 0 -10 3 2 15 12 15 2 0 -11 -12 -13 -8 -21 0 -2 14 -2 16 2 2 4 2 -17 2 -21 0 -4 -8 -6 -10 -6 -2 -2 -8 -17 -10 -21 0 -4 -7 -10 -11 -17 -2 -6 -8 -41 -8 -46 0 -4 -8 -4 -8 -4 -3 0 -3 -4 -3 -6 0 -2 -2 -8 -4 -10 -6 -5 -2 -13 -2 -17 0 -4 -2 4 -6 -2 -2 -4 6 -11 0 -15 -2 -6 6 -18 6 -21 0 -2 4 -27 9 -29 2 -6 0 -16 -5 -10 -2 4 -4 0 -10 0 -2 0 -10 6 -17 0 -6 -4 0 -36 0 -40 0 -4 -2 -14 -2 -16 0 -5 6 -17 4 -19 -2 -2 -4 -6 -4 -11 0 -4 4 -4 4 -4 l 0 2 c 0 0 5 2 5 2 0 0 8 9 10 15 6 6 12 -2 15 -6 2 -2 8 -19 8 -21 0 -4 0 -25 0 -31 0 -4 2 -13 4 -17 2 -2 6 -10 6 -15 0 -2 0 -14 0 -18 0 -4 15 -13 17 -13 2 0 21 -8 21 -14 2 -5 6 -17 8 -25 4 -5 0 -40 -6 -46 -4 -4 -4 -15 -4 -15 0 -2 6 -29 6 -35 0 -6 19 -17 25 -17 4 0 2 -14 2 -21 0 -4 -19 -12 -21 -16 -4 -5 6 -27 6 -27 0 0 13 -23 13 -30 0 -6 -4 -20 -6 -23 0 -2 -7 -6 -7 -12 0 -2 5 -15 3 -17 -3 -4 -9 -21 -7 -21 4 0 13 -10 11 -12 -2 -4 -4 -17 -2 -21 0 -4 -5 -17 -5 -17 0 -2 5 -14 9 -14 6 -4 6 -8 6 -17 0 -4 6 -21 15 -29 8 -8 18 -21 23 -25 4 -6 25 -12 27 -10 6 2 12 8 12 8 0 0 11 8 13 6 2 -4 14 -41 14 -46 0 -6 -16 -18 -16 -18 0 0 37 -32 39 -36 0 -4 4 -27 6 -31 4 -4 4 -40 4 -44 0 -4 11 -14 11 -19 -2 -4 -4 -35 0 -35 4 0 14 -12 21 -15 4 -4 21 -6 23 -12 0 -6 -5 -23 0 -29 6 -4 23 -17 23 -21 0 -2 10 -15 14 -17 4 -2 8 -16 8 -25 0 -8 -8 -37 -4 -41 0 -7 15 -11 15 -11 0 0 8 -29 10 -33 0 -2 23 -25 27 -25 2 0 17 12 21 10 4 -2 15 -12 15 -12 0 0 -4 -9 -4 -15 2 -2 12 -39 16 -37 4 2 23 10 25 10 4 0 17 2 21 6 2 7 21 11 27 9 4 -7 11 -15 11 -15 0 0 -11 -4 -11 -4 0 0 4 -19 4 -19 0 0 15 4 15 0 0 -2 -13 -6 -13 -6 0 0 -2 -23 -2 -23 0 0 15 -4 17 -2 2 2 25 29 25 29 l 4 13 z"/>
-		</g>
-		<path id="reg14" d="M 27 351 l 4 13 c 0 0 25 20 32 23 6 2 37 10 37 16 0 9 6 21 13 23 4 6 14 13 14 15 0 2 -6 48 -2 50 2 4 13 6 13 16 0 9 -13 19 -13 19 0 0 15 13 19 21 2 10 8 35 0 48 -11 17 -2 37 2 42 6 6 14 27 14 31 0 6 0 10 0 10 l 0 -2 c 0 0 9 0 9 2 0 0 6 2 8 2 2 -2 6 7 11 11 2 2 20 2 22 2 3 0 11 8 11 14 0 5 0 11 0 13 2 4 4 10 4 14 0 5 -2 5 -2 11 0 6 0 8 6 12 4 5 11 5 11 9 0 6 -7 4 -9 4 0 0 -4 2 -4 4 0 4 8 10 2 10 -6 0 -8 -6 -8 -6 0 0 -15 6 -19 9 -4 0 -14 22 -14 27 0 4 -7 12 -7 14 0 2 -8 9 -10 9 -2 0 -6 8 -6 10 0 2 -9 19 -13 19 -2 2 0 10 0 12 0 2 -14 6 -14 9 0 4 -7 14 -9 14 0 0 -2 6 -2 11 l 0 -3 c 0 0 -2 15 -4 17 -2 2 -10 2 -15 -2 -4 -2 -4 4 -4 8 0 5 -4 9 -4 9 0 0 6 0 6 6 0 4 -14 4 -14 10 0 7 4 9 0 13 -4 4 -21 17 -21 17 0 0 2 -11 -2 -11 -4 0 -11 2 -11 6 0 2 -4 11 0 17 5 6 -4 6 -4 6 -2 0 -4 13 -4 17 0 4 -10 0 -10 2 0 2 -7 8 -7 13 0 4 0 16 0 16 0 0 7 0 7 2 0 4 -5 11 -5 15 3 8 5 12 5 12 0 0 8 -4 8 2 0 5 -4 9 -4 9 0 0 6 4 6 4 l 2 0 c 0 0 -2 8 -2 8 -2 0 -6 11 -6 15 0 2 6 12 8 14 0 0 8 7 8 9 3 4 -8 2 -2 6 5 2 9 21 5 21 -3 0 -5 -2 -5 2 0 4 2 23 2 25 0 2 0 12 0 15 -2 4 -8 6 -8 10 2 2 2 4 0 4 -2 0 -2 6 0 8 4 3 4 7 4 9 -2 2 -4 6 -2 10 0 2 2 15 0 15 0 0 -4 6 0 8 6 2 9 17 13 17 4 0 8 -17 12 -13 0 4 -6 13 -4 13 6 2 10 -6 10 -4 3 4 9 4 15 4 2 0 0 8 4 10 4 4 9 2 11 0 4 -2 10 0 10 2 0 2 -10 9 -8 9 4 2 2 8 4 8 2 2 10 0 12 -4 0 -4 0 -9 7 -9 4 0 8 -4 8 -2 0 2 -6 15 -6 21 2 4 10 11 10 15 0 4 -8 6 -10 6 -2 0 -4 6 -2 8 4 0 10 0 12 -4 0 -4 4 0 4 4 0 2 -10 7 -8 9 4 4 10 2 12 0 5 -2 11 -13 11 -15 2 -2 2 -8 2 -4 0 4 0 8 4 8 4 0 8 0 13 -4 2 -4 6 -8 10 -8 6 0 19 -2 21 0 2 0 21 -4 21 -9 0 -4 8 -8 12 -12 4 -2 9 0 13 -2 4 -2 8 -13 12 -13 4 0 9 -6 9 -8 2 -6 8 -6 10 -4 2 4 -4 4 -2 6 4 0 10 6 10 4 0 -2 0 -12 0 -12 4 0 11 2 11 0 0 -4 -11 -13 -7 -13 5 0 9 9 17 7 8 0 11 8 13 0 0 -7 -5 -11 0 -13 4 0 4 8 8 8 4 0 8 -4 12 -4 5 -2 11 -8 17 -8 2 0 13 0 15 4 4 2 12 -2 16 -4 5 -2 5 -6 5 -6 0 0 31 -57 31 -57 0 0 6 -2 6 -2 0 0 27 -31 27 -31 0 0 13 -10 15 -12 2 -5 25 -67 25 -67 0 0 46 -108 46 -108 0 0 8 -30 8 -30 0 0 -44 -37 -44 -37 0 0 -25 -4 -25 -4 0 0 -21 -27 -21 -27 0 0 15 -9 15 -13 0 -2 -6 -14 -2 -19 4 -2 10 -10 10 -14 0 -9 -19 -27 -21 -29 -2 0 -14 -2 -14 -2 0 0 -6 -25 -2 -28 2 -4 6 -16 2 -18 0 -4 -4 -4 -13 -4 -6 0 -14 -5 -16 -13 -2 -8 -2 -17 4 -21 4 -4 6 -14 2 -14 -4 0 -17 -2 -17 -2 0 0 6 -9 6 -9 0 0 -4 -35 0 -35 5 -2 11 0 11 -4 0 -5 -15 -48 -17 -57 -6 -6 -16 -27 -16 -27 0 0 -17 -21 -17 -25 0 -4 -6 -23 -8 -29 -5 -6 2 -29 6 -44 4 -12 12 -33 10 -35 0 -4 -25 -10 -27 -17 -2 -6 -19 -33 -25 -33 -6 0 -19 -4 -21 -10 -2 -7 -12 -28 -8 -36 0 -6 8 -27 8 -31 0 -4 -12 -13 -12 -17 0 0 8 -8 8 -8 0 0 8 -33 8 -40 0 -4 0 -10 -4 -14 -2 -2 -16 -25 -21 -25 -4 0 -31 2 -31 -2 0 -2 -4 -27 -4 -27 0 0 -21 8 -21 14 0 4 -4 8 -12 8 -9 0 -21 7 -21 9 0 4 -11 21 -13 21 -2 0 -6 8 -6 16 0 11 4 48 4 54 0 7 -4 23 -10 23 -4 0 -11 9 -11 11 0 4 -6 25 -12 25 -6 -2 -33 -21 -35 -23 -5 -4 -15 -2 -15 0 0 0 -8 8 -10 12 -5 2 -11 2 -11 5 0 0 -2 12 -8 8 -4 -6 -11 -11 -15 -11 -4 0 -6 3 -6 3 0 0 -8 -15 -15 -23 -6 -7 -10 -11 -12 -17 0 -6 -6 -15 -8 -19 -3 0 -9 0 -9 0 l -29 17 27 31 z"/>
-		<g id="reg13">
-			<path id="reg13a" d="M 133 1497 c 0 0 -10 -2 -10 -6 0 -7 0 -13 -2 -13 -4 0 -15 4 -17 2 0 -2 -8 -10 -4 -10 4 0 19 2 19 -2 0 -2 10 -15 14 -11 5 7 9 11 13 11 4 0 12 4 12 8 2 2 -2 4 -6 4 -4 0 -12 4 -12 9 0 4 -2 8 -7 8 z"/>
-			<path id="reg13b" d="M 106 1593 c 0 0 -10 -4 -6 -9 0 -4 8 -16 8 -18 -2 -2 -6 -13 -8 -13 0 0 -21 -10 -21 -10 -2 0 15 -2 15 -6 0 -5 0 -13 0 -13 2 0 12 10 12 6 0 -6 4 -6 7 -6 2 0 8 -15 14 -15 6 0 8 3 17 3 6 0 14 -3 16 2 5 6 15 6 15 10 2 4 -15 10 -17 13 -2 4 -8 12 -14 14 -4 0 -6 6 -11 4 -6 -2 -16 7 -16 9 0 2 -4 16 -4 18 0 2 -9 11 -9 11 l 2 0 z"/>
-			<path id="reg13c" d="M 423 1607 c 0 0 -10 7 -13 7 -4 0 -18 -2 -22 -2 -7 0 -13 4 -17 -3 -4 -4 -19 -16 -23 -20 -6 -5 -13 -5 -17 -2 -6 2 -23 2 -29 -3 -4 -2 -12 -6 -19 -2 -6 7 -12 7 -14 7 -2 0 -9 8 -11 10 -4 2 -16 6 -16 6 0 0 -4 -14 -2 -21 4 -8 6 -14 2 -20 -2 -7 2 -13 4 -17 0 -2 4 -10 -2 -10 -4 0 -9 -3 -9 0 0 4 -8 14 -14 14 -6 0 -2 -8 -8 -10 -3 0 -13 -4 -13 -4 0 0 -6 -17 -6 -19 0 -2 -13 -15 -9 -21 0 -4 15 0 15 -2 0 -4 -4 -4 -8 -4 -4 0 -9 0 -9 -4 0 -5 -4 -15 -2 -17 4 -2 11 -6 2 -6 -8 -2 -4 -11 -2 -13 4 0 0 -6 0 -8 0 -4 -2 -9 0 -9 4 0 13 -2 17 -4 2 -4 10 -2 12 -4 3 -2 -2 -4 0 -6 3 -2 15 -6 15 -11 4 -4 8 -6 10 -6 3 0 9 2 13 0 4 -2 8 -10 10 -10 0 0 9 6 13 4 6 -4 8 -6 12 -2 2 2 11 0 11 -8 0 -9 0 -15 2 -13 2 2 8 10 10 6 2 -2 -4 -10 2 -10 5 -2 2 8 7 8 4 0 8 -4 10 0 4 0 2 -4 6 -2 4 2 9 11 13 11 4 0 21 2 23 6 2 2 10 4 14 4 4 0 25 0 29 -2 7 0 11 0 15 0 4 0 8 0 10 -2 5 -2 7 -9 7 -9 l 0 3 c 0 0 8 14 8 14 0 0 -6 11 -8 13 -2 2 -7 12 -7 16 0 4 -6 15 -6 15 0 0 4 10 6 14 3 9 0 17 0 17 0 2 7 15 9 19 2 0 0 10 -4 12 -2 0 -11 13 -11 17 0 4 2 17 9 19 6 2 12 -9 18 -2 7 6 17 23 17 23 0 0 -15 8 -19 6 -4 -4 -19 -21 -19 -21 0 0 0 10 3 17 2 8 -5 14 -7 16 -2 0 -6 11 -6 13 0 2 0 12 0 12 l -2 0 z"/>
-		</g>
-		<path id="reg23" d="M 423 1607 c 0 0 -10 7 -13 7 -4 0 -18 -2 -22 -2 -7 0 -13 4 -17 -3 -4 -4 -19 -16 -23 -20 -6 -5 -13 -5 -17 -2 -6 2 -23 2 -29 -3 -4 -2 -12 -6 -19 -2 -6 7 -12 7 -14 7 -2 0 -9 8 -11 10 -4 2 -16 6 -16 6 0 0 2 25 2 29 0 5 2 40 2 40 0 0 -13 6 -13 8 0 5 0 9 0 7 0 0 -12 -2 -12 -2 0 0 -19 8 -21 8 -4 -4 -10 -8 -15 -8 -6 0 -8 -7 -8 -15 0 -6 -12 -23 -25 -33 -8 -9 -19 -15 -19 -17 0 -4 5 -15 2 -15 0 0 -10 7 -16 11 -6 4 -19 6 -25 6 -4 -2 -13 10 -13 13 0 6 -10 20 -10 20 -2 0 -8 7 -8 11 2 4 2 35 -9 39 -10 5 -14 27 -14 30 0 2 0 56 0 56 0 0 35 -25 39 -29 4 -7 25 -25 34 -21 8 6 39 4 39 6 0 2 6 8 8 8 5 0 19 5 19 7 2 4 11 8 15 4 6 -6 21 -4 25 -2 6 2 27 0 29 -4 4 -7 23 -3 23 -3 0 0 12 3 17 3 4 0 39 4 43 10 9 4 36 12 38 17 4 4 8 20 12 23 7 0 32 10 32 10 0 0 20 -17 20 -17 0 0 19 2 19 2 0 0 23 -23 27 -27 4 -6 17 -16 17 -16 0 0 -4 -23 -4 -32 0 -4 -7 -14 -9 -18 -4 -2 -8 -13 -8 -17 0 -6 -8 -10 -8 -10 -2 0 -15 0 -13 -5 0 -8 23 -37 23 -39 0 -6 -52 -36 -52 -36 l -2 0 z"/>
-		<path id="reg24" d="M 413 1822 c 0 0 -9 25 -7 27 2 4 11 2 4 21 -10 19 -16 17 -20 17 -5 2 -5 12 -7 16 -4 4 -16 23 -20 29 -3 7 -5 36 -7 40 0 6 11 6 13 8 0 2 0 21 0 25 0 7 -2 9 -9 7 -6 0 3 -13 -8 -13 -6 -2 -17 19 -17 19 0 0 -12 -11 -20 -6 -9 4 4 12 4 16 -2 6 -13 0 -17 0 -6 0 -6 9 -6 13 0 2 -4 8 -8 6 -3 -2 -11 -4 -15 -4 -6 0 -15 -4 -21 -6 -4 -3 -6 14 -10 14 -2 0 -11 0 -11 -2 0 -2 -12 -4 -12 -4 0 0 -2 -21 -2 -25 0 -4 -38 -29 -44 -33 -2 -3 -15 -3 -15 -3 0 0 -2 -14 -2 -16 0 -4 13 -21 13 -23 0 -2 0 -15 -4 -25 -7 -8 -21 -4 -30 -4 -8 0 -35 2 -41 -2 -9 -2 -31 -19 -31 -19 0 0 0 -6 -3 -8 -6 -3 -6 -5 -4 -7 0 -2 -2 -14 -2 -18 0 -5 -2 -15 -6 -21 -4 -7 -2 -15 -2 -19 0 -6 -6 -29 -6 -29 0 0 35 -25 39 -29 4 -7 25 -25 34 -21 8 6 39 4 39 6 0 2 6 8 8 8 5 0 19 5 19 7 2 4 11 8 15 4 6 -6 21 -4 25 -2 6 2 27 0 29 -4 4 -7 23 -3 23 -3 0 0 12 3 17 3 4 0 39 4 43 10 9 4 36 12 38 17 4 4 8 20 12 23 7 0 32 10 32 10 z"/>
-		<g id="reg33">
-			<path id="reg33a" d="M 23 1930 l 12 9 0 -2 c 0 0 5 0 15 0 8 0 8 -11 8 -15 0 -4 -4 -13 -4 -15 0 -2 9 -12 9 -12 0 0 22 17 31 19 6 4 33 2 41 2 9 0 23 -4 30 4 4 10 4 23 4 25 0 2 -13 19 -13 23 0 2 2 16 2 16 0 0 0 5 0 5 0 0 -12 8 -12 8 -2 0 -15 4 -19 2 -4 0 -29 8 -35 4 -9 -4 -29 -2 -32 -2 -4 0 -25 -2 -25 -2 l -8 0 c 0 0 -25 -4 -27 -6 -4 0 -29 -2 -29 -2 0 0 4 -13 6 -13 2 0 13 0 17 -4 4 -2 6 -10 2 -8 -6 0 -4 6 -9 4 -6 -2 -10 -4 -12 -6 0 -2 -2 -30 2 -30 4 0 23 0 29 -2 7 -2 19 -18 19 -18 l -2 16 z"/>
-			<path id="reg33b" d="M 1417 1 c 0 0 1158 0 1158 0 0 0 0 1644 0 1644 0 0 0 8 0 8 0 0 -65 25 -71 31 -6 7 -31 71 -37 78 -7 2 -57 10 -63 10 -4 0 -8 -10 -16 -10 -9 0 12 27 4 37 -11 10 -25 -2 -34 -6 -8 -6 -39 -11 -48 -11 -6 0 -10 -8 -20 -8 -11 0 -23 -2 -27 -6 -7 -6 -17 4 -21 8 -7 4 -13 4 -15 4 -4 0 2 15 -21 9 -21 -7 -25 -23 -33 -11 -10 13 -2 36 -6 40 -4 2 -17 -4 -19 -2 -4 4 -13 8 -13 0 0 -7 -12 -13 -12 -7 0 7 -10 5 -13 5 -4 0 -10 -2 -10 6 0 6 -8 4 -17 4 -6 2 5 21 7 23 0 4 -15 21 -19 29 -2 6 -31 36 -33 38 -3 4 -13 10 -15 12 -4 0 6 17 6 29 0 11 -14 29 -21 32 -6 2 2 18 7 27 6 6 23 20 25 31 4 10 -34 21 -40 25 -6 2 -19 -6 -23 -13 -2 -4 -17 -12 -21 -8 -4 2 -18 -15 -25 -15 -4 0 -6 21 -6 21 0 2 -8 13 -4 19 6 6 17 19 12 25 -4 8 -2 17 -2 17 0 0 2 2 2 2 0 0 -12 33 -12 54 0 19 12 29 19 29 2 -2 6 2 12 8 6 5 8 15 2 17 -6 4 -16 23 -16 33 0 11 -3 36 -3 36 0 0 32 0 36 0 4 0 21 17 21 23 0 4 6 23 12 29 6 4 15 -2 15 -10 0 -7 12 -7 14 -7 5 0 13 -8 17 -12 6 -2 15 8 21 12 6 7 25 15 29 17 6 2 25 23 27 27 4 6 21 15 25 19 4 4 4 10 0 12 -4 4 -14 -6 -21 -6 -8 0 -2 8 -2 15 0 6 13 12 19 12 2 0 12 6 21 11 8 4 27 -3 27 -3 0 0 0 3 0 3 0 0 2 8 4 10 4 0 4 12 0 15 -4 4 -4 12 -4 20 0 11 -13 9 -13 13 0 4 -8 10 -10 12 -4 2 -4 23 -10 25 -3 2 -21 9 -21 11 0 4 -9 4 -11 4 -6 0 -4 19 -2 23 2 2 2 8 -4 6 -4 0 0 19 2 23 2 4 2 13 -2 15 -4 4 4 31 4 37 0 6 0 13 -8 13 -6 0 -8 18 -8 23 0 6 -11 16 -13 22 -2 5 23 13 29 13 4 0 13 6 13 8 0 0 8 4 12 4 6 0 19 13 19 17 0 6 15 13 17 15 2 2 -5 10 0 12 2 0 6 11 6 15 0 2 0 -40 2 -40 4 0 6 36 6 40 0 4 9 33 11 39 2 9 25 25 27 25 4 0 16 11 16 13 0 2 9 19 9 21 2 0 25 12 25 14 0 2 18 13 23 15 6 0 27 21 27 23 0 2 14 4 14 4 0 0 0 0 0 0 0 0 -4 37 -8 42 -4 6 -10 14 -10 14 0 0 2 0 2 0 0 0 -13 15 -13 23 0 8 -12 19 -21 19 -6 0 -12 2 -12 12 0 9 0 15 -6 19 -9 4 -25 -6 -34 -10 -8 -7 -21 4 -21 4 0 -4 -6 -6 -10 -6 -6 0 -13 6 -17 10 -2 2 -6 -6 -6 -12 0 -5 -19 -23 -21 -25 -2 -3 15 -34 13 -36 0 -2 -36 2 -44 2 -8 0 -23 0 -38 -10 -14 -13 7 -25 7 -31 0 -7 -29 2 -34 4 -6 2 -31 -11 -33 -11 -2 0 -73 13 -77 13 -2 0 12 27 -15 27 -29 0 -27 -15 -27 -17 0 -4 -18 -6 -18 -6 0 0 -19 0 -32 0 -10 2 -25 -13 -35 -13 -8 0 -19 13 -25 13 -6 0 -33 10 -50 21 -17 8 -65 -13 -71 -17 -6 -2 -33 8 -37 13 -5 0 -25 0 -34 -5 -6 -2 -12 9 -12 11 0 2 -15 6 -15 6 0 0 -2 0 -2 0 0 0 -6 -4 -10 -4 -5 0 -19 -17 -25 -19 -5 -4 -34 -10 -34 -16 0 -7 -18 -13 -23 -17 -2 -4 -16 -6 -20 -8 -3 -3 -23 -3 -32 -3 -8 0 -12 -6 -16 -10 -5 -2 -21 -2 -21 -2 0 0 -6 -6 -6 -4 0 2 -21 10 -25 10 -5 0 -32 -29 -36 -31 -4 0 -46 -6 -46 -10 2 -7 23 -17 21 -21 -2 -4 -21 0 -19 -4 2 -5 11 -11 17 -11 4 0 13 0 13 0 0 2 -5 6 0 6 2 0 4 0 4 -2 0 -4 10 -4 14 -4 7 0 13 -12 13 -17 0 -6 -2 -16 0 -22 2 -5 21 -21 19 -25 -3 -5 2 -15 2 -19 2 -4 8 -4 8 2 2 6 4 6 6 2 0 -4 0 -33 4 -31 5 2 13 8 13 8 0 0 -2 -10 -2 -10 0 0 -13 -9 -19 -9 -6 -2 -29 -10 -31 -12 -2 -6 -19 -21 -19 -25 2 -2 23 0 29 -2 6 -2 15 -11 19 -9 0 2 6 5 12 2 7 -4 3 -8 -4 -10 -8 -2 -6 -6 -2 -10 6 -5 15 -9 15 -9 0 0 6 -16 6 -16 0 0 19 -15 25 -15 8 0 2 -19 -4 -25 -4 -6 -19 8 -19 8 0 0 -6 13 -6 13 0 0 -11 8 -13 8 -2 2 -14 2 -16 2 -2 2 -7 4 -9 7 -4 4 -10 6 -10 6 0 0 4 -2 4 -2 0 0 -4 -25 0 -29 0 -7 -2 -13 -4 -19 0 -2 0 -15 4 -17 2 -2 21 -17 21 -21 2 -4 8 -8 12 -8 3 0 11 0 11 0 0 0 2 -4 2 -4 0 0 31 -19 33 -19 4 0 7 -25 7 -35 0 -9 -7 -19 -9 -25 -4 -7 -12 -17 -12 -19 0 -2 6 -13 2 -25 -6 -11 12 0 12 -11 0 -12 -12 -12 -18 -16 -5 -6 6 -17 8 -17 4 0 10 -10 10 -17 0 -6 -12 -14 -12 -25 0 -10 -17 -6 -17 -6 0 0 -6 2 -6 2 0 0 -8 -10 -13 -12 -2 -2 -16 -2 -18 2 -5 2 -9 2 -13 -2 -6 -4 -14 4 -17 6 0 4 -8 -2 -10 -6 -4 -4 -31 -11 -31 -11 0 -4 -19 2 -23 2 -2 0 -4 13 -6 15 0 2 -23 -8 -25 -12 -5 -3 -17 -11 -21 -13 -4 -4 -17 -17 -17 -17 0 0 -19 17 -25 17 -4 2 -14 8 -19 13 -4 8 -12 6 -16 0 -2 -5 -13 0 -17 4 -4 4 -12 -4 -15 -9 -2 -4 -12 -8 -16 0 -4 9 -15 5 -17 5 -2 0 -21 -19 -21 -21 0 -2 0 -17 0 -21 0 -4 -8 0 -12 -2 -4 -2 -11 -15 -11 -15 0 0 5 -6 5 -10 0 -4 -13 -2 -17 -4 -2 -2 -17 -2 -21 -5 -4 -2 -25 5 -29 5 -4 0 -4 -5 -6 -9 0 -2 -2 -16 -2 -21 0 -6 -9 -10 -11 -14 -2 -2 11 -6 11 -11 0 -4 -11 -14 -11 -14 0 0 0 0 0 0 0 0 0 -13 -4 -13 -2 0 -6 -8 -6 -14 -2 -6 -13 -19 -13 -19 0 0 -4 -4 -14 -6 -11 -2 -25 6 -25 6 0 0 -2 0 -2 0 0 0 -15 6 -17 6 -4 0 -44 -18 -50 -23 -8 -4 -27 17 -33 19 -7 2 -40 -2 -40 -2 0 0 0 0 0 0 0 0 4 -17 -2 -21 -2 -2 -6 -10 -4 -14 4 -5 12 -9 16 -7 5 2 11 -2 15 -6 2 -4 8 -10 12 -10 3 0 7 -15 9 -19 0 -6 0 -10 4 -10 2 0 8 2 8 -3 0 -2 -2 -20 -4 -20 -2 0 -12 -5 -12 -9 0 -4 -5 -10 -9 -10 -4 0 -27 -2 -33 -2 -4 0 -8 -2 -8 -9 0 -6 10 -33 14 -35 4 -2 -10 0 -16 0 -7 0 -13 2 -17 -2 -4 -6 -25 -27 -25 -29 0 -4 -2 -23 -4 -23 -2 0 -27 -2 -29 -6 0 -2 -9 -23 -9 -27 0 -5 2 -15 -4 -17 -4 -4 -10 -21 -15 -25 -4 0 -18 -13 -18 -13 -2 -2 -11 -6 -19 -8 -8 0 -17 2 -17 2 0 0 -10 6 -14 4 -2 -4 -17 -18 -15 -23 0 -4 -6 -12 -10 -12 -2 -2 -17 -2 -19 -2 -4 0 -19 0 -19 0 0 -2 -10 -6 -10 -4 0 0 -6 4 -11 4 -2 0 -12 -4 -12 -4 0 0 0 0 0 0 0 0 -4 -23 -4 -32 0 -4 -7 -14 -9 -18 -4 -2 -8 -13 -8 -17 0 -6 -8 -10 -8 -10 -2 0 -15 0 -13 -5 0 -8 23 -37 23 -39 0 -6 -52 -36 -52 -36 0 0 0 0 0 0 0 0 0 -10 0 -12 0 -2 4 -13 6 -13 2 -2 9 -8 7 -16 -3 -7 -3 -17 -3 -17 0 0 15 17 19 21 4 2 19 -6 19 -6 0 0 -10 -17 -17 -23 -6 -7 -12 4 -18 2 -7 -2 -9 -15 -9 -19 0 -4 9 -17 11 -17 4 -2 6 -12 4 -12 -2 -4 -9 -17 -9 -19 0 0 3 -8 0 -17 -2 -4 -6 -14 -6 -14 0 0 6 -11 6 -15 0 -4 5 -14 7 -16 2 -2 8 -13 8 -13 0 0 -8 -14 -8 -14 0 0 0 -3 0 -3 0 0 -2 -10 -2 -12 0 -2 -5 -8 -2 -8 2 -2 2 -13 2 -13 0 0 12 8 14 11 4 4 9 -11 9 -15 0 -4 6 -2 12 -2 6 0 17 -11 17 -13 0 0 4 -14 4 -18 0 -2 14 4 23 6 8 0 23 2 27 2 4 0 14 -2 14 -8 0 -7 -6 -7 -12 -7 -8 -2 -17 -14 -23 -14 -6 0 -15 4 -21 6 -6 2 -14 0 -16 -6 -5 -4 -15 -11 -19 -11 -6 0 -17 -4 -19 -6 -2 0 -4 -12 -4 -12 0 -2 10 4 14 8 3 4 5 2 5 -4 0 -4 -5 -21 -5 -25 0 -2 -2 -13 -2 -13 0 0 -8 21 -14 23 -6 2 -2 13 -6 13 -5 0 -17 2 -17 2 -2 2 -8 -2 -8 -2 0 0 0 0 0 0 0 0 31 -57 31 -57 0 0 6 -2 6 -2 0 0 27 -31 27 -31 0 0 13 -10 15 -14 2 -3 25 -65 25 -65 0 0 43 -108 43 -108 0 0 11 -30 11 -30 0 0 -44 -39 -44 -39 0 0 -25 -2 -25 -2 0 0 0 0 0 0 0 0 -21 -27 -21 -27 0 0 15 -11 15 -13 0 -2 -6 -14 -2 -19 4 -2 10 -8 10 -16 0 -6 -19 -25 -21 -27 -2 0 -14 -2 -14 -2 0 0 -6 -23 -2 -30 2 -2 6 -14 2 -18 0 -2 -4 -4 -13 -2 -6 0 -14 -7 -16 -13 -2 -8 -2 -17 4 -21 4 -4 6 -12 2 -14 -4 0 -17 -2 -17 -2 0 0 6 -9 6 -9 0 0 -4 -35 0 -37 5 0 11 0 11 -2 0 -7 -15 -48 -17 -54 -6 -9 -16 -30 -16 -30 0 0 -17 -20 -17 -27 0 -4 -6 -21 -8 -27 -5 -6 2 -29 6 -41 4 -15 12 -36 10 -40 0 -4 -25 -8 -27 -15 -2 -6 -19 -31 -25 -31 -6 0 -19 -6 -21 -12 -2 -9 -12 -30 -8 -36 0 -6 8 -27 8 -33 0 -4 -12 -13 -12 -15 0 -2 8 -8 8 -8 0 0 0 -2 0 -2 0 0 4 2 8 2 3 0 11 -15 11 -19 0 -2 -2 -10 -2 -12 -2 -2 14 -15 14 -15 0 -4 13 -8 19 -8 2 -2 2 -11 -2 -13 -4 0 -2 -12 -2 -12 0 0 0 -2 0 -2 0 0 2 -2 2 -4 0 0 2 2 2 2 0 0 8 8 13 8 2 0 14 4 14 -8 0 -15 0 -9 4 -9 5 0 7 13 7 13 0 0 2 -2 6 -9 4 -4 12 0 12 0 0 0 -8 -12 -4 -16 2 -4 15 2 15 2 0 0 -13 -13 -9 -15 5 -2 15 2 21 2 7 0 9 11 9 11 0 0 18 -2 20 2 3 6 -2 14 -8 14 -4 0 -27 -4 -27 -4 0 0 -8 13 -4 11 6 0 17 0 17 6 0 4 -9 12 -9 12 0 0 23 -16 29 -12 7 4 7 12 13 4 8 -8 12 -2 12 4 0 9 -2 9 0 13 5 2 5 4 5 8 0 4 -13 11 -13 11 0 0 13 0 17 -5 2 -2 -2 -23 2 -25 4 0 33 -6 39 -6 5 0 21 6 25 4 5 -2 27 -10 36 -6 8 4 69 29 75 31 6 2 35 17 41 21 3 4 13 17 17 15 4 -2 0 -11 4 -9 7 2 21 11 27 15 7 2 27 10 27 8 3 -2 -6 -14 -4 -14 4 0 13 12 17 14 6 4 17 4 17 9 0 4 2 10 8 10 6 2 4 -4 4 -8 2 -2 11 2 11 4 0 4 12 4 12 12 0 11 6 17 10 19 5 2 7 13 9 17 0 0 2 0 2 0 0 0 10 8 10 23 0 14 0 39 -14 66 -17 25 -21 44 -36 44 -16 0 -41 33 -66 33 -27 0 -63 -8 -65 -6 0 0 -50 2 -62 0 -13 -2 -21 -10 -28 -6 -4 4 -12 4 -12 0 0 -2 2 -4 -15 -4 -16 0 -18 -9 -20 -9 -5 -2 -7 9 -9 7 -4 -2 -31 -9 -33 -19 -4 -13 4 -10 -11 -10 -16 0 -18 -9 -20 -9 -2 0 -7 6 0 9 2 4 12 12 12 14 0 4 4 13 11 15 6 2 18 10 25 10 6 0 6 6 0 6 -7 0 -7 5 0 5 6 0 16 -3 16 2 2 4 -2 8 9 8 8 0 12 2 12 8 0 4 -12 9 -12 9 0 0 0 6 4 4 6 -2 31 2 35 6 6 6 27 8 29 17 0 8 11 10 11 10 0 0 -7 4 -4 11 0 4 4 20 4 25 0 0 2 2 2 2 0 0 0 8 -2 8 -2 0 -7 4 -7 4 0 0 -8 6 -6 8 2 3 13 9 13 13 0 2 10 8 10 15 0 4 6 8 6 14 0 4 11 13 11 19 0 8 -4 6 2 12 6 7 8 13 4 15 -6 2 -4 10 0 10 6 0 13 5 13 9 2 2 8 4 12 4 2 0 10 4 13 0 0 -4 -5 -15 -3 -13 5 0 15 5 15 9 2 0 6 6 10 6 5 0 13 4 15 8 2 4 4 9 10 9 5 2 13 2 17 4 4 2 15 -4 19 -2 4 2 21 2 23 2 2 0 0 -9 8 -11 6 -4 19 -6 15 -12 -2 -4 -11 -15 -13 -17 0 -2 0 -14 -4 -16 -6 -3 -6 -11 -12 -11 -5 0 -15 11 -21 8 -7 0 -23 -6 -27 -12 -5 -8 -5 -15 -13 -17 -8 0 -19 -16 -17 -18 5 -3 17 0 17 -15 0 -15 -6 -17 0 -23 8 -4 19 4 23 6 6 4 17 4 21 11 6 4 10 6 14 6 7 0 19 -2 19 2 0 4 0 4 -8 4 -8 0 -2 11 -2 11 2 2 0 10 2 8 4 0 4 -10 6 -13 6 -2 11 -16 19 -12 6 2 54 10 54 8 0 0 6 -10 10 -8 3 0 17 4 23 4 5 -2 2 -12 2 -17 0 -2 -2 -10 -4 -12 -4 -2 -6 -6 -6 -10 0 -5 -4 -7 -10 -9 -5 -4 -38 -27 -40 -37 0 -9 0 -23 4 -29 4 -5 15 -25 19 -34 2 -6 15 -25 21 -29 2 -4 25 -42 25 -50 0 -8 10 -17 12 -15 4 3 13 9 19 5 2 -5 25 -15 31 -7 4 5 13 11 13 13 0 4 -2 17 0 14 0 -2 6 -14 10 -14 2 -2 15 12 17 12 2 0 -2 -10 -4 -14 0 -2 -13 -31 -11 -38 2 -8 2 -29 2 -29 0 0 -6 -8 -6 -17 0 -6 -2 -12 -8 -16 -9 -2 -31 -11 -31 -17 -3 -6 -13 -42 -11 -48 2 -6 -2 -14 -2 -19 0 -4 -2 -10 -4 -14 -4 -2 -2 -21 -4 -23 -2 -4 -40 -31 -42 -33 -2 0 -10 -7 -10 -7 0 0 0 -8 4 -6 4 2 39 0 48 -6 8 -6 29 -8 33 -8 6 0 19 2 23 6 2 4 10 16 17 16 6 0 12 0 12 7 0 2 11 10 13 12 4 0 10 11 10 13 0 4 -44 29 -44 33 0 4 0 17 -2 17 -2 0 -4 21 -2 23 2 4 4 14 17 14 12 0 16 6 21 9 4 4 12 22 29 18 16 -2 14 -6 16 -6 3 0 7 2 7 0 0 -4 14 -12 18 -15 7 -4 7 -6 11 -6 8 0 4 -10 4 -14 0 -5 -8 -15 -8 -19 0 -4 6 -29 0 -33 -9 -7 -9 -15 -4 -19 4 -4 4 -6 6 -6 2 0 6 -3 6 -9 2 -4 21 -4 21 -6 0 -4 -15 -2 -15 -6 -2 -2 -18 -11 -16 -15 2 -4 23 4 25 -2 4 -4 16 -33 23 -35 6 0 4 -5 2 -7 0 -2 4 -14 4 -16 2 -4 12 -27 19 -29 6 0 14 -19 16 -23 2 -7 13 -21 15 -21 2 0 10 6 12 10 2 2 4 13 7 13 6 0 2 -11 2 -15 0 -6 -2 -14 -7 -14 -6 -3 -10 -5 -6 -9 2 -4 44 -23 48 -21 2 0 15 13 15 19 0 4 -17 17 -17 27 0 0 94 -52 94 -52 z"/>
-		</g>
-		<path id="reg07" d="M 256 2126 c 0 0 -10 -19 -10 -19 0 2 -23 -35 -25 -39 -2 -2 -2 -23 -2 -23 0 0 12 2 12 4 0 2 9 2 11 2 4 0 6 -17 10 -14 6 2 15 6 21 6 4 0 12 2 15 4 4 2 8 -4 8 -6 0 -4 0 -13 6 -13 4 0 15 6 17 0 0 -4 -13 -12 -4 -16 8 -5 20 6 20 6 0 0 11 -21 17 -19 11 0 2 13 8 13 7 2 9 0 9 -7 0 -4 0 -23 0 -25 -2 -2 -13 -2 -13 -8 2 -4 4 -33 7 -40 4 -6 16 -27 20 -29 2 -4 2 -14 7 -16 4 0 10 2 20 -17 7 -19 -2 -17 -4 -21 -2 -2 7 -27 7 -27 0 0 20 -17 20 -17 0 0 19 2 19 2 0 0 23 -23 27 -27 4 -6 17 -16 17 -16 0 0 10 4 12 4 5 0 11 -4 11 -4 0 -2 10 2 10 4 0 0 15 0 19 0 2 0 17 0 19 2 4 0 10 8 10 12 -2 7 13 19 15 23 4 2 14 -4 14 -4 0 0 9 -2 17 -2 8 2 17 6 19 8 0 0 14 13 18 13 5 4 11 21 15 25 6 2 4 12 4 17 0 4 9 25 9 27 2 4 27 6 29 6 2 0 2 19 2 23 0 2 23 23 27 29 4 4 10 2 17 2 6 0 20 -2 16 0 -4 2 -14 29 -14 35 0 7 4 9 8 9 6 0 29 2 33 2 4 0 9 6 9 10 0 4 10 9 12 9 2 0 4 18 4 20 0 5 -6 3 -8 3 -4 0 -4 4 -4 10 -2 4 -6 19 -9 19 -4 0 -10 6 -12 10 -4 4 -10 8 -15 6 -4 -2 -12 2 -16 7 -2 4 2 12 4 14 6 4 2 21 2 21 -4 13 0 35 15 46 0 0 2 8 2 12 0 2 -5 7 -7 7 -4 -2 -18 6 -23 8 -2 4 -8 4 -8 4 0 0 -6 0 -14 13 -9 10 -7 48 -7 56 0 6 2 19 -4 23 -4 4 -6 -2 -6 -4 -4 -2 -17 -19 -23 -21 -4 -6 -17 -4 -23 4 -4 6 -12 4 -15 2 -4 -4 -12 6 -16 13 -2 8 -9 -3 -11 -5 -4 -2 -12 0 -14 -6 -4 -4 -11 0 -15 4 -4 4 -12 2 -12 0 -2 -4 -4 -10 -9 -10 -4 0 -4 6 -6 6 -4 0 -14 -6 -19 -6 -4 0 -8 8 -12 8 -6 0 -2 15 -8 15 -5 2 -11 -11 -11 -17 0 -4 -10 -8 -14 -6 -5 0 -11 -2 -11 -8 -2 -3 -110 4 -110 4 0 0 -40 4 -54 8 -15 2 -36 21 -42 23 -6 4 -31 12 -33 10 -5 -4 -17 -4 -17 -4 0 0 0 -10 -4 -14 -2 -2 2 -9 4 -13 0 -6 0 -14 -4 -17 -4 0 -32 -12 -32 -16 3 -4 9 -13 9 -13 0 0 4 -12 4 -16 2 -5 10 -11 15 -11 4 -2 12 -4 12 -8 2 -2 4 -25 4 -25 l 2 -44 z"/>
-		<path id="reg30" d="M -404 2039 c 0 0 6 4 10 4 4 0 15 -9 19 -9 6 0 21 -6 25 -6 2 0 19 -6 29 -6 11 2 25 -10 31 -10 5 0 15 -3 17 -7 4 -2 27 -27 35 -27 7 -2 23 -6 30 -12 2 -7 39 -13 48 -15 8 -2 33 2 39 4 6 4 21 15 21 17 0 0 -23 -17 -23 -10 0 6 6 6 8 22 0 15 13 21 19 21 6 0 27 0 38 -6 14 -8 14 -6 14 -4 0 4 -27 10 -27 17 0 4 6 6 13 2 8 -2 16 -9 20 -15 3 -4 9 -8 9 -8 0 0 25 2 29 2 2 2 27 6 27 6 l 8 0 c 0 0 21 2 25 2 3 0 23 -2 32 2 6 4 31 -4 35 -4 4 2 17 -2 19 -2 0 0 12 -8 12 -8 0 0 0 -5 0 -5 0 0 13 0 15 3 6 4 44 29 44 33 0 4 2 25 2 25 0 0 0 21 2 23 2 4 25 41 25 39 0 0 10 19 10 19 l 2 -2 -4 46 c 0 0 -2 23 -4 25 0 4 -8 6 -12 8 -5 0 -13 6 -15 11 0 4 -4 16 -4 16 0 0 -6 9 -9 13 0 4 28 16 32 16 4 3 4 11 4 17 -2 4 -6 11 -4 13 4 4 4 14 4 14 0 0 -4 0 -6 0 -2 0 2 9 2 13 0 2 -2 8 0 12 4 2 10 11 10 17 0 6 27 31 31 37 2 7 -4 7 -8 11 -2 4 17 16 19 21 4 4 -4 18 -4 23 0 6 -17 10 -27 16 -11 4 -28 27 -28 27 -2 2 -35 46 -41 52 -9 5 -6 15 -6 19 0 2 -3 8 -9 8 -6 0 -2 5 2 5 4 2 7 12 7 18 0 2 6 9 8 11 0 2 -2 4 -11 2 -6 -2 -16 -2 -16 -2 0 0 -13 -2 -19 -6 -4 -3 -15 -11 -17 -13 -4 0 -20 -4 -25 -2 -4 0 -8 -8 -12 -8 -4 -2 -15 -2 -15 0 0 2 -6 4 -10 2 -6 -2 -11 -4 -15 -4 -4 0 -8 -3 -12 -3 -4 0 -11 9 -11 9 0 0 -4 -4 -6 -4 -4 -2 -8 0 -12 2 0 6 -15 8 -23 8 -9 2 -15 -10 -15 -12 0 -3 -6 -11 -10 -15 -5 -6 -9 -6 -11 -4 -2 0 -12 10 -12 14 0 5 -15 13 -17 13 -2 0 -6 -4 -6 -4 0 -2 -13 -7 -13 -7 0 0 -2 -12 -4 -16 -2 -2 -10 -11 -12 -15 0 -2 -9 -4 -9 -8 -2 -2 -10 -8 -14 -8 -4 -3 -15 -3 -15 -7 0 -4 -6 -6 -10 -4 -4 2 -11 -4 -13 -10 -4 -4 0 -13 0 -17 0 -4 -10 -2 -12 -2 -4 0 -11 -4 -15 -6 -6 -4 -21 -17 -25 -17 -2 -2 2 21 2 25 0 4 -6 6 -10 6 -4 0 -9 7 -11 9 -4 2 -12 2 -16 2 -7 0 -9 -2 -9 -9 0 -2 -4 -8 -8 -12 -4 0 0 -4 -8 -8 -9 -5 -2 -13 -2 -13 0 -2 12 -8 12 -12 0 -5 -4 -9 -10 -9 -7 0 -15 -2 -19 -6 -2 -4 -10 -15 -15 -15 -2 0 -10 0 -10 -2 0 -2 -6 -4 -12 -8 -5 -2 -3 -15 -3 -19 0 -4 -20 -4 -22 -4 -5 0 2 10 0 15 -3 0 -17 2 -17 2 0 0 0 -19 4 -25 4 -7 4 -25 0 -34 -4 -4 -10 -25 -12 -31 -5 -6 -7 -14 -5 -21 5 -4 5 -29 0 -33 -2 -8 -8 -21 -8 -25 0 -6 10 -19 6 -25 -4 -4 -27 -25 -27 -31 -2 -21 19 -27 23 -29 0 0 2 -11 0 -15 -2 -2 -4 -27 -4 -31 0 -4 4 -9 0 -11 -2 -2 -2 -10 -2 -12 0 -2 0 -9 0 -9 l 0 -20 z"/>
-		<g id="reg11">
-			<path id="reg11a" d="M -700 1901 c 0 0 0 -2 0 -6 2 -4 6 2 8 2 2 2 5 -4 2 -6 0 -2 -8 -9 -8 -11 0 0 -6 0 -6 -4 0 -6 4 -6 6 -10 0 -4 6 0 8 0 3 -4 5 -9 5 -11 -2 0 -7 -8 -7 -10 0 -4 7 -6 7 -11 0 -2 -7 -8 -7 -8 0 0 7 -2 9 -2 6 0 12 -6 12 -8 0 -2 -6 -2 -6 -4 -2 0 -13 -9 -10 -9 4 0 16 4 18 4 2 0 7 -2 7 -4 0 -4 8 -6 8 -6 0 -2 -8 -8 -8 -8 0 0 8 -2 12 0 4 0 6 -5 6 -7 2 -4 2 -14 2 -18 0 -5 5 -11 5 -11 0 0 8 -6 12 -6 2 0 0 6 -2 6 -2 0 4 6 4 4 0 -2 -2 7 2 9 2 2 6 -4 6 -9 0 -4 5 5 5 7 4 0 6 -9 6 -11 0 -2 4 -6 6 -10 2 -2 6 -6 6 -11 0 -4 -6 -10 -8 -10 -2 -2 -19 0 -21 0 -2 0 -4 -10 -4 -10 0 0 -12 6 -12 6 0 0 4 -2 4 -6 0 -3 8 -5 8 -5 0 0 0 -6 0 -6 0 -2 -21 -4 -21 -4 0 0 9 0 9 -2 2 0 10 -2 10 -2 0 0 0 -17 0 -23 0 -4 0 -8 -4 -11 -2 -2 -13 -6 -17 -6 -4 0 -12 2 -17 4 -4 5 0 -4 -2 -2 -2 2 -4 -2 -8 -2 -4 0 -12 6 -17 13 -2 4 0 16 0 18 2 5 2 11 2 13 -2 4 -8 -2 -8 -4 0 -2 -4 2 -6 2 -2 0 4 -13 4 -13 2 -4 0 -10 -4 -10 -4 2 -11 10 -11 10 0 2 -2 5 -6 7 -4 2 0 12 -6 12 -8 2 -6 -6 -4 -10 0 -2 -4 -4 -6 -4 -5 0 0 4 -3 8 -4 2 -10 -6 -12 -8 -4 0 -4 -9 0 -13 4 -2 8 4 8 8 0 0 4 -4 9 -4 4 0 0 -8 0 -8 -2 0 6 -8 8 -11 4 -4 17 -8 21 -10 4 -2 10 -2 12 0 4 4 7 6 9 2 4 -4 14 -4 16 -4 4 0 11 0 15 0 6 0 17 4 19 6 2 2 10 4 14 4 4 0 6 -8 11 -12 4 -6 8 -11 8 -15 0 -4 0 -8 0 -23 0 -14 4 -14 4 -18 2 -5 13 -13 13 -15 -2 0 -19 10 -21 15 -6 4 -19 0 -25 0 -2 0 -23 20 -27 29 -7 8 -27 16 -29 16 -5 -2 -17 -4 -21 -4 -7 0 -13 0 -15 0 -4 0 -27 27 -29 34 -2 4 -2 14 -4 18 -2 5 -6 21 -9 27 -4 7 -8 28 -8 32 0 4 0 21 -2 25 0 4 -8 29 -8 31 -2 6 0 10 2 15 4 2 6 -5 10 -7 2 -4 2 11 6 15 5 4 11 10 11 12 0 5 -4 9 -4 11 0 4 2 14 -2 19 0 4 -2 16 -2 16 l 0 2 c 0 0 16 11 18 11 2 0 13 6 17 8 4 2 8 2 12 0 7 -2 13 0 13 0 l 2 2 z"/>
-			<path id="reg11b" d="M -558 1945 c 0 0 -11 -4 -13 -4 -2 0 -6 6 -10 6 -2 0 -13 -10 -15 -15 -2 -2 -14 -10 -14 -12 0 -4 6 0 6 -2 0 -4 -4 -11 0 -13 2 -2 14 -4 17 2 2 5 6 11 10 11 6 0 8 -4 12 -4 0 2 0 8 5 10 2 2 4 8 4 13 l -2 8 z"/>
-			<path id="reg11c" d="M -342 1926 c 0 0 -16 -12 -16 -17 -2 -4 -2 -16 4 -20 8 -2 19 12 23 16 2 4 2 11 0 15 l -11 6 z"/>
-			<path id="reg11d" d="M -540 1914 c 0 0 -10 -7 -10 -9 0 -4 -8 -8 -6 -14 4 -2 -4 -7 -9 -9 -6 -2 -25 -10 -25 -14 3 -6 0 -21 0 -27 -2 -4 -2 -21 -4 -25 0 -4 4 -4 7 -4 2 0 12 0 12 -7 0 -4 13 0 13 -4 0 -4 -3 -12 -11 -17 -6 -4 15 0 17 5 4 2 14 -2 14 2 0 2 2 12 -2 14 -4 2 -2 7 -2 9 2 4 9 0 9 -7 2 -4 6 -6 8 -4 2 4 -2 17 -2 17 0 0 4 8 4 6 0 -2 2 -14 2 -23 0 -6 -6 -6 -8 -8 -4 -4 2 -8 6 -11 6 0 15 -10 21 -6 4 4 12 15 12 17 0 6 0 31 -4 33 -6 4 -19 13 -21 17 -2 4 2 14 7 17 2 4 4 8 0 14 -5 4 -21 11 -21 13 2 2 4 6 2 10 0 2 -9 13 -9 13 l 0 2 z"/>
-			<path id="reg11e" d="M -631 1887 c 0 0 -15 2 -19 0 0 0 -12 -7 -12 -7 -3 0 -9 -2 -9 -4 0 -2 0 -8 0 -10 -4 0 -6 -11 -6 -15 0 -4 -2 -8 -4 -8 -2 0 2 -11 2 -11 0 -4 2 -8 4 -8 4 0 10 8 10 4 0 -2 3 -8 9 -8 6 0 14 -2 14 0 2 4 9 12 9 14 0 3 6 3 6 0 0 -6 2 -14 6 -8 2 6 6 11 4 15 -2 0 -4 0 -4 4 0 2 4 4 4 6 0 4 2 11 2 15 -4 2 -6 2 -6 6 0 4 2 12 -4 15 -6 2 -8 0 -8 0 l 2 0 z"/>
-		</g>
-		<g id="reg02">
-			<path id="reg02a" d="M -981 2699 c 0 0 10 -4 10 -8 0 -7 9 -19 9 -23 2 -4 4 -17 6 -21 2 -2 14 -19 14 -23 0 -4 7 -27 11 -33 4 -4 33 -34 33 -34 0 0 -10 -4 -12 -6 -5 -4 -11 -4 -13 -2 -4 2 -14 -4 -17 -8 -2 -2 -12 -4 -12 -7 -2 0 -8 -8 -10 -12 -3 -2 -15 -4 -19 -2 -2 0 -15 6 -17 0 -2 -4 -8 -19 -10 -19 0 -2 -7 -6 -7 -10 0 -4 -4 -11 -6 -13 -2 0 -4 -14 -6 -14 l 2 -2 c 0 0 17 -13 19 -15 2 -4 2 -13 2 -15 -2 -4 -11 2 -11 -4 0 -4 3 -16 0 -21 -2 -2 0 -6 0 -10 0 -4 0 -15 0 -15 0 0 15 -16 19 -20 2 -7 -2 -19 -4 -19 -2 0 -10 -9 -10 -11 0 0 -2 -4 -2 -4 0 0 -3 -37 0 -41 4 -5 14 -11 18 -17 2 -4 2 -15 2 -19 0 -4 9 -8 5 -12 0 -2 -13 -30 -13 -30 0 0 21 -8 23 -6 2 0 10 0 12 -4 3 -4 3 -2 7 -2 6 0 10 -4 16 -4 5 0 13 0 15 0 4 -2 8 -9 6 -11 -2 -4 -2 -8 2 -10 7 -2 17 -10 13 -15 -2 -6 -13 -12 -13 -12 0 0 -12 -8 -12 -8 0 0 2 -17 6 -17 4 0 17 4 17 0 0 -2 0 -19 2 -23 4 -4 8 -17 8 -19 0 -2 4 -8 4 -10 0 -2 0 -6 0 -6 0 0 0 -11 4 -11 3 0 11 0 7 -4 -4 -2 -19 -4 -17 -10 0 -7 4 -11 6 -13 7 -2 2 -12 7 -12 6 -5 10 -7 14 -5 6 0 31 0 38 0 6 2 8 9 8 15 0 6 -4 12 0 17 4 2 12 10 17 8 4 0 0 -8 -5 -13 -6 -2 0 -8 5 -8 4 0 8 8 8 13 0 4 -6 35 -4 37 0 2 10 -33 12 -37 0 -5 -2 -9 -2 -11 0 -4 9 -25 17 -23 8 2 19 7 23 7 4 0 16 4 19 12 2 8 16 27 18 27 2 2 15 4 15 4 0 0 -13 -6 -15 -10 0 -2 -8 -21 -10 -25 -2 -4 -8 -8 -15 -13 -6 -2 -16 -2 -18 -8 -3 -6 -7 -12 -3 -12 5 0 11 2 9 -5 -2 -8 -13 -8 -9 -12 5 -4 9 -6 3 -8 -7 -3 -13 0 -13 -9 0 -8 0 -12 10 -10 11 2 15 0 17 -9 0 -8 -4 -8 -8 -10 -4 -4 -4 -10 -4 -12 0 -5 -5 -11 -5 -15 0 -4 3 -17 3 -17 0 0 16 11 18 11 2 0 13 6 17 8 4 2 8 2 12 0 7 -2 13 0 13 0 0 0 2 8 6 8 2 0 9 5 11 7 2 0 8 0 8 6 0 6 -23 19 -21 19 6 0 21 -9 23 -5 0 7 -17 17 -10 17 6 0 14 0 14 2 4 0 11 6 15 6 4 0 12 5 12 7 0 4 2 8 11 6 8 0 12 -4 16 -4 5 0 5 8 5 12 0 4 -7 15 -9 15 -4 4 -14 4 -14 8 0 4 0 9 2 9 2 0 -9 10 -9 10 0 0 21 -13 23 -10 2 4 9 12 13 12 2 0 14 0 14 -2 2 -4 15 -15 11 -17 -2 0 -9 2 -4 -2 8 -4 23 -4 27 -4 4 0 18 -2 25 -10 6 -7 21 -19 23 -19 4 0 18 0 20 0 3 2 -8 2 -10 2 -4 0 -17 10 -17 10 0 2 -4 9 0 9 5 0 7 -9 13 -11 6 -2 14 0 19 0 4 0 10 -2 10 2 0 2 2 17 4 17 4 2 9 6 11 8 0 5 2 11 12 9 8 0 15 0 15 6 0 4 -2 6 0 8 2 2 8 4 6 7 0 2 -4 14 2 18 2 2 21 7 21 7 l 0 -3 c 0 0 0 7 0 9 0 2 0 10 2 12 4 2 0 7 0 11 0 4 2 29 4 31 2 4 0 15 0 15 -4 2 -25 8 -23 29 0 6 23 27 27 31 4 6 -6 19 -6 25 0 4 6 17 8 25 5 4 5 29 0 33 -2 7 0 15 5 21 2 6 8 27 12 31 4 9 4 27 0 34 -4 6 -4 25 -4 25 0 0 0 8 -6 10 -7 0 -7 -6 -7 -10 0 -4 -8 -4 -10 -7 -2 -2 -4 -4 -4 -10 0 -6 -6 -8 -15 -8 -6 0 -10 6 -10 8 0 4 8 2 12 4 7 2 9 11 7 11 -3 0 -19 0 -28 2 -8 2 -22 16 -25 18 -4 0 -18 -8 -20 -4 -2 2 -9 11 -11 11 -4 0 -8 4 -12 10 -4 6 -25 2 -29 0 -3 0 -19 11 -28 13 -6 0 -6 14 -14 16 -6 4 -6 -10 -13 -10 -6 0 0 17 2 23 3 6 5 14 9 21 4 4 8 14 4 16 -4 4 6 15 6 21 0 4 0 13 4 15 5 4 15 18 19 21 8 2 21 8 23 12 4 2 19 21 21 25 4 4 14 13 19 13 6 0 8 25 8 25 0 0 0 8 2 10 0 2 -4 0 -6 4 -2 2 -4 8 -6 8 -3 0 -19 -8 -19 -8 0 0 -6 21 -6 27 -3 6 -19 6 -25 11 -5 2 -21 12 -25 18 -3 2 12 23 16 25 4 2 0 11 2 15 2 4 -6 6 -8 6 -2 2 4 9 6 9 0 0 6 10 6 12 0 2 5 8 3 13 0 2 -5 -5 -9 -3 -2 5 -6 0 -10 0 -2 -2 -17 -8 -19 -8 -2 0 4 -4 4 -6 0 -4 -10 -8 -14 -8 0 -3 -9 2 -13 2 0 -2 -10 -13 -12 -13 -2 0 -17 6 -21 6 -4 0 -19 -2 -23 -2 -2 2 -11 4 -15 7 -4 2 -12 0 -14 0 -2 -3 -7 2 -13 2 -4 0 -12 -5 -12 -9 -2 -4 -9 -4 -13 -4 -2 2 -8 -4 -10 -4 -2 0 -29 27 -31 27 -3 2 -7 -2 -5 -6 0 -4 -2 -11 -4 -11 -2 0 -8 0 -8 -2 -2 -4 -6 -10 -11 -10 -4 0 -6 -4 -6 -6 -2 -2 -12 -2 -12 -2 0 0 0 2 0 4 0 4 -7 4 -7 4 0 0 3 4 3 4 0 0 -21 -12 -23 -17 -2 -2 -11 -10 -15 -10 -4 -2 -6 -4 -6 -8 0 -2 -6 -2 -9 -2 -4 0 -4 -11 -10 -11 -4 0 -12 0 -12 2 0 2 -3 15 -11 15 -8 0 -19 -2 -23 -2 -2 0 -12 4 -16 2 -7 -4 -15 -2 -21 -4 -4 -2 -15 -11 -15 -11 l -8 -4 z"/>
-			<path id="reg02b" d="M -433 1999 c 0 0 -4 0 -4 -4 0 -4 -7 -4 -7 -4 0 0 -6 8 -8 8 -4 0 -15 0 -15 -4 0 -6 -2 -15 0 -17 0 0 7 0 2 -4 -4 -4 5 -2 0 -4 -2 -2 0 -4 5 -4 6 0 12 6 16 4 4 -2 0 -2 -4 -6 -6 -2 -12 -2 -12 -5 0 -2 6 -12 12 -10 4 0 0 13 8 15 7 2 5 8 3 10 -3 2 -5 4 2 10 8 7 8 7 8 9 -4 2 -4 6 -4 6 l -2 0 z"/>
-		</g>
-		<path id="reg29" d="M -894 2062 c 0 0 0 4 0 6 0 2 -4 8 -4 10 0 2 -4 15 -8 19 -2 4 -2 21 -2 23 0 4 -13 0 -17 0 -4 0 -6 17 -6 17 0 0 12 8 12 8 0 0 11 6 13 12 4 5 -6 13 -13 15 -4 2 -4 6 -2 10 2 2 -2 9 -6 11 -2 0 -10 0 -15 0 -6 0 -10 4 -16 4 -4 0 -4 -2 -7 2 -2 4 -10 4 -12 4 -2 -2 -23 6 -23 6 0 0 13 28 13 30 4 4 -5 8 -5 12 0 4 0 15 -2 19 -4 6 -14 12 -18 17 -3 4 0 41 0 41 0 0 -11 -2 -15 -4 -6 0 -13 -8 -10 -12 2 -5 12 -30 10 -32 0 -4 -15 -16 -17 -18 -2 -3 -8 -13 -8 -15 0 -2 -8 0 -10 -4 -3 -4 -13 -13 -13 -13 -2 2 -17 0 -19 0 -2 0 -14 -4 -14 -4 0 0 -13 4 -15 6 -2 5 -10 11 -19 9 -10 0 -23 -4 -27 -9 -4 -2 -14 -10 -14 -10 0 0 12 -2 12 0 0 4 11 8 13 8 4 0 21 0 23 2 2 2 10 2 8 -2 -2 -4 -10 -8 -15 -8 -6 0 -18 2 -20 0 -3 -4 -9 -10 -9 -13 -2 0 0 -8 2 -8 4 0 13 8 17 8 4 0 15 5 17 7 2 2 10 6 10 2 0 -2 -12 -9 -6 -13 4 -2 10 -2 10 -4 0 -2 -8 -6 -8 -8 -2 -4 -6 -9 -11 -13 -2 -4 -2 -10 3 -10 6 0 10 8 12 12 4 5 15 15 15 17 0 4 6 10 10 4 2 -6 -8 -8 -8 -10 0 -4 -17 -15 -15 -21 2 -8 33 -35 33 -35 0 0 5 -19 9 -28 2 -6 16 -27 16 -33 3 -8 13 -19 21 -14 7 6 11 4 11 10 0 4 2 10 4 12 2 3 6 9 4 9 0 0 -6 6 -10 6 -9 0 -17 23 -13 23 4 2 21 6 25 2 4 -4 23 -17 27 -8 2 6 -4 14 2 12 7 -4 7 -8 9 -10 2 -2 10 -6 4 -9 -4 -2 -21 -2 -21 -6 0 -4 0 -10 2 -12 0 -2 -4 -4 -8 -4 -2 -3 -7 -15 -4 -19 4 -2 4 -9 4 -13 0 -4 -2 -10 2 -10 4 0 8 -13 12 -17 7 0 23 -6 27 -2 7 2 9 8 13 8 2 0 10 -8 12 -6 2 0 23 0 27 6 0 5 7 13 9 13 4 2 4 4 4 8 0 4 8 4 8 4 l 0 3 z"/>
-		<path id="reg06" d="M -1248 2234 c 0 0 21 -4 23 -4 6 -2 21 -10 25 -12 4 -2 17 4 17 4 0 0 10 8 14 10 4 5 17 9 27 9 9 2 17 -4 19 -9 2 -2 15 -6 15 -6 0 0 12 4 14 4 2 0 17 2 19 0 0 0 10 9 13 13 2 4 10 2 10 4 0 2 6 12 8 15 2 2 17 14 17 18 2 2 -8 27 -10 32 -3 4 4 12 10 12 4 2 15 4 15 4 0 0 2 4 2 4 0 2 8 11 10 11 2 0 6 12 4 19 -4 4 -19 20 -19 20 0 0 -6 2 -10 2 -4 0 -23 21 -27 23 -4 5 -4 17 0 21 0 4 -6 19 -6 19 0 0 -9 0 -11 0 -4 0 -21 -4 -23 -6 -4 -4 -10 -13 -14 -15 -4 0 -15 -10 -15 -12 0 -7 4 -13 6 -17 3 -2 7 -8 5 -10 0 -5 -7 -7 -7 -9 0 -2 -12 9 -12 13 -2 4 -2 10 -8 12 -5 0 -9 6 -13 4 -4 -2 -12 -10 -15 -10 -4 -2 -4 -8 0 -10 5 0 7 -5 7 -7 0 -4 -2 -10 -4 -12 -3 0 -3 -9 2 -9 4 -4 6 -8 2 -12 -2 -4 -2 -8 -7 -8 -6 2 -20 0 -20 -7 0 -4 0 -14 -2 -14 -3 0 -23 -2 -23 -6 0 -3 0 -30 -2 -30 -3 0 -19 5 -21 0 -2 -2 -4 -12 -4 -14 0 -4 -3 -13 -3 -17 -2 -2 -8 -14 -8 -14 l 0 -3 z"/>
-		<path id="reg25" d="M -1027 2464 c -4 0 -19 -2 -19 -5 0 -2 -8 -10 -12 -12 0 0 6 -15 6 -19 -4 -4 -4 -16 0 -21 4 -2 23 -23 27 -23 4 0 10 -2 10 -2 0 0 0 11 0 15 0 4 -2 8 0 10 3 5 0 17 0 21 0 6 9 0 11 4 0 2 0 11 -2 15 -2 2 -19 15 -19 15 l -2 2 z"/>
-		<g id="reg15">
-			<path id="reg15a" d="M -942 3424 c 0 0 -2 -4 -2 -4 2 -2 -4 -11 -8 -11 -4 -2 -17 -14 -15 -16 5 0 17 -9 9 -11 -9 0 -17 -6 -15 -10 4 -2 13 -6 11 -8 -3 -5 -9 -7 -11 -7 -2 0 -8 0 -2 -4 4 -4 8 -8 8 -10 0 -2 -2 -6 -4 -9 -4 -2 -6 -10 -4 -14 2 -2 8 2 13 -4 2 -7 -11 -7 -13 -7 0 0 8 -10 13 -14 2 -4 8 -15 14 -15 6 0 13 2 17 -2 2 -4 12 -6 16 -6 0 0 9 6 9 4 0 -6 -2 -10 0 -12 2 -5 10 -19 8 -19 -2 0 -6 -6 -2 -8 4 0 8 2 8 10 0 4 2 17 0 19 -2 4 -6 10 -6 14 0 4 6 17 6 21 0 2 -2 42 -6 46 -4 4 -12 23 -12 27 0 4 0 23 -5 25 0 0 -4 6 -4 6 -2 2 -12 11 -12 11 0 2 0 10 -2 10 -4 0 -9 0 -9 0 l 0 -2 z"/>
-			<path id="reg15b" d="M -1358 2330 c 0 0 -34 11 -48 11 -15 0 -48 10 -48 12 0 6 -8 15 0 21 8 4 17 4 17 4 0 0 -7 6 -11 6 -6 -2 -12 -2 -17 -2 -4 0 -20 7 -27 2 -6 -4 -10 -12 -16 -12 -9 -4 -19 -8 -21 -8 0 -2 -11 -7 -15 -5 -2 0 -8 3 -8 -4 0 -4 0 -12 -2 -14 0 -2 0 -9 2 -9 2 0 10 0 6 -6 -6 -6 -6 -10 -12 -10 -7 0 -13 0 -15 -2 0 -2 -6 -5 -10 -5 -4 0 -4 -6 -11 -6 -4 2 2 17 2 17 -2 2 -8 6 -4 14 4 9 4 13 4 15 0 4 0 10 2 10 3 3 3 9 -2 9 -2 0 -4 12 0 12 2 2 0 7 2 9 3 0 3 6 0 6 -2 0 -6 8 -6 10 0 0 -2 15 -2 17 0 4 4 10 4 10 0 2 -6 2 -10 2 -4 -2 -17 0 -17 -6 -2 -4 6 -8 -2 -12 -6 -2 -10 10 -12 10 0 0 -2 15 -2 15 0 0 -3 2 -3 -4 0 -7 0 -13 -4 -13 -4 0 -8 0 -8 0 0 -4 -6 -2 -6 -6 0 -2 2 -6 -4 -9 -7 -2 -17 9 -23 7 -5 -2 -11 -7 -9 -11 2 -2 0 -12 -2 -14 -2 -2 2 -4 -2 -7 0 -2 -4 -4 -4 -4 0 -2 -2 -6 -6 -8 -2 0 -11 0 -13 0 -2 2 -8 -2 -14 -2 -7 0 -11 14 -15 10 -4 -2 -6 -4 -10 -4 -5 0 -11 -4 -11 -6 0 -2 -4 -2 -10 -2 -6 0 -15 0 -19 0 -6 0 -10 0 -12 0 -3 0 -9 4 -13 2 -6 -2 -10 2 -10 2 0 0 -9 0 -9 2 0 2 4 4 4 8 0 2 -6 5 -4 7 4 4 9 4 13 4 4 0 12 0 14 2 2 2 0 6 7 6 2 2 6 6 4 6 -4 0 -9 2 -9 0 -2 0 -8 -8 -8 -8 0 0 -8 -2 -8 2 0 0 0 2 2 4 2 2 -4 7 -2 7 2 0 14 4 14 6 0 2 2 8 -6 8 -8 0 -23 -2 -23 -2 0 0 0 6 0 8 2 0 9 9 11 9 4 0 8 6 8 6 0 2 -8 12 -6 15 2 0 10 4 12 4 2 -2 6 -7 9 -7 2 3 8 5 10 7 4 0 21 14 25 16 2 2 4 7 6 7 0 2 -2 4 2 6 7 0 7 2 11 4 0 4 2 2 6 2 4 -2 6 2 2 4 -2 0 -4 9 -4 9 0 4 -4 12 0 12 2 4 8 -4 8 -8 0 -4 9 -9 9 -6 0 2 -5 6 2 6 4 -2 12 2 14 2 0 2 -14 4 -12 6 0 2 2 4 8 4 4 0 8 0 8 2 2 0 9 -2 9 2 2 5 0 9 -2 9 0 4 -9 6 -2 12 4 9 8 11 12 11 2 0 10 -2 13 0 0 0 12 8 14 10 4 6 8 11 8 11 0 0 -8 -3 -14 -11 -6 -6 -23 -6 -21 0 2 8 -2 8 8 17 11 8 2 14 -2 19 -4 2 -12 4 -8 12 4 6 10 21 12 25 0 4 0 19 5 23 4 2 16 8 16 12 0 3 7 7 9 7 2 2 4 8 8 8 2 0 6 4 4 6 -2 4 -6 9 -4 11 0 4 4 12 2 14 -2 7 -4 13 -6 13 -2 0 -9 -6 -9 -6 3 -3 -2 -9 -2 -13 0 -2 7 -12 7 -15 0 -4 -7 -8 -11 -10 -2 -2 -12 -10 -10 -8 0 2 -2 8 4 10 6 6 10 8 8 11 0 2 -8 10 -6 12 2 4 6 13 6 17 0 4 -4 21 -4 21 0 2 4 4 8 8 5 2 9 6 11 8 2 4 8 21 10 23 4 2 4 44 0 44 -4 -2 -4 -8 -2 -11 0 -4 0 -25 -2 -29 -4 -4 -8 -14 -8 -18 0 -3 -6 -9 -9 -9 -2 2 -8 27 -8 29 0 5 -8 15 -8 15 0 2 -6 23 -9 23 -2 2 -10 29 -6 29 4 0 9 -6 11 -4 4 4 0 10 -2 10 -3 0 -7 2 -7 4 0 0 -6 0 -8 -2 -2 0 -2 13 -2 17 -2 4 -19 38 -19 40 0 2 -21 37 -21 37 0 2 -14 27 -21 27 -6 0 -8 2 -8 2 0 0 0 11 2 11 0 2 0 12 6 12 7 0 15 0 15 4 0 2 -6 21 -2 21 2 0 15 -4 15 0 4 2 2 4 10 4 8 -2 12 -2 17 2 2 7 10 15 10 15 0 0 10 13 10 15 3 2 5 10 11 10 4 -2 12 0 14 4 0 6 13 19 17 19 4 0 19 0 21 6 4 6 15 15 19 15 2 0 12 -2 16 -2 5 0 7 -11 13 -11 4 0 14 4 17 9 0 2 14 8 18 8 0 0 9 0 13 0 6 0 10 6 10 10 2 5 0 13 0 13 0 0 2 4 6 4 3 0 9 -4 9 -4 4 2 8 4 8 6 0 2 4 8 6 8 5 3 7 -4 11 -2 4 2 14 5 16 5 5 2 9 6 9 12 0 4 -2 8 4 8 4 0 6 5 10 9 0 2 7 -4 11 -4 4 0 2 4 6 4 4 0 13 -2 13 -2 0 0 4 -9 4 -13 -2 -4 0 -4 2 -6 2 -2 -2 -8 -2 -11 0 0 2 -6 4 -8 0 0 -2 -6 0 -8 2 -4 4 -11 2 -13 0 -2 -2 -12 0 -12 4 0 8 -6 8 -11 2 -4 9 -6 19 -6 10 0 19 0 19 0 0 0 2 -4 2 -6 0 -2 6 -2 8 -2 2 0 17 -6 19 -9 2 0 -2 -6 0 -6 0 -2 10 -2 10 2 0 4 -8 4 -6 4 2 3 4 7 4 9 0 2 7 2 9 2 2 0 8 0 8 2 2 0 12 4 15 6 0 4 6 2 6 -2 -2 0 -6 -4 -6 -4 0 -2 2 -6 4 -6 2 0 6 4 6 8 0 4 -4 6 -6 6 -2 0 0 4 0 4 2 5 4 7 6 5 0 0 4 2 6 2 0 2 6 6 9 4 2 0 2 -11 6 -11 2 0 8 7 10 7 0 2 0 -2 0 -7 -2 -2 0 -8 2 -8 4 0 15 8 13 11 -2 2 -9 4 -9 4 -2 0 -4 2 0 6 3 0 5 4 9 2 4 0 6 2 6 4 0 2 0 11 0 13 0 0 6 4 6 6 0 2 9 6 11 6 4 0 16 11 18 13 0 2 7 4 9 2 6 -2 8 2 10 6 2 0 9 0 11 -4 2 -2 10 4 10 4 2 0 4 0 8 -4 2 -2 17 0 19 -2 2 0 2 -4 4 -9 0 -2 0 -6 7 -6 4 0 2 -2 2 -4 2 -4 6 -8 8 -8 4 0 6 2 10 0 2 -4 13 -11 17 -11 2 0 6 0 6 -4 0 -2 7 -8 13 -8 4 0 16 2 19 2 4 0 12 -4 12 -4 0 0 -2 -11 0 -15 4 0 10 -10 10 -12 0 -5 11 -9 13 -11 4 -2 0 -6 -2 -10 0 -2 -2 -6 -4 -4 -4 2 -9 10 -15 10 -6 0 -10 -4 -12 -4 -5 0 -13 -2 -13 -6 -2 -9 -6 -11 -10 -11 -7 0 -17 -4 -17 -6 0 -4 -2 -10 0 -10 2 0 10 -3 4 -7 -4 -4 -10 -10 -8 -12 4 -4 8 -9 8 -11 0 -2 4 -8 6 -8 3 0 5 -4 5 -6 2 -2 2 -9 -5 -11 -4 -2 -4 -6 -4 -8 2 -2 0 -8 0 -12 -2 -3 -6 -13 -4 -13 4 0 13 2 13 0 2 -2 6 -4 8 -4 4 0 6 -11 10 -11 5 -2 9 -6 7 -8 -5 -4 -13 -8 -11 -10 2 -4 2 -13 0 -13 -2 -2 -6 -12 -6 -14 4 -5 19 -17 19 -17 0 0 -7 -6 -7 -8 -2 -2 -6 -11 -8 -9 -4 0 -19 0 -17 -2 5 -2 17 -16 19 -19 2 -2 0 -14 2 -14 0 -2 4 -8 0 -11 -4 -4 -12 -10 -21 -10 -8 2 -27 6 -29 10 -2 5 -6 9 -6 5 0 -5 2 -9 0 -13 -2 -2 0 -8 4 -10 2 -2 13 -15 11 -15 -2 -2 -7 -8 0 -10 6 -4 23 -17 25 -17 4 -2 14 -12 16 -12 4 -3 23 -21 25 -21 2 -2 11 -9 7 -11 -3 -2 -9 -8 -5 -10 2 -2 19 0 23 -2 2 0 11 -4 11 -11 0 -6 2 -8 2 -8 0 0 10 -4 10 -8 0 -7 9 -19 9 -23 2 -4 4 -17 6 -21 2 -2 14 -19 14 -23 0 -4 7 -27 11 -33 4 -4 33 -34 33 -34 0 0 -10 -4 -12 -6 -5 -4 -11 -4 -13 -2 -4 2 -14 -4 -17 -8 -2 -2 -12 -4 -12 -7 -2 0 -8 -8 -10 -12 -3 -2 -15 -4 -19 -2 -2 0 -15 6 -17 0 -2 -4 -8 -19 -10 -19 0 -2 -7 -6 -7 -10 0 -4 -4 -11 -6 -13 -2 0 -4 -14 -6 -14 -4 0 -19 -2 -19 -5 0 -2 -8 -10 -12 -12 0 0 -9 0 -11 0 -4 0 -21 -4 -23 -6 -4 -4 -10 -13 -14 -15 -4 0 -15 -10 -15 -12 0 -7 4 -13 6 -17 3 -2 7 -8 5 -10 0 -5 -7 -7 -7 -9 0 -2 -12 9 -12 13 -2 4 -2 10 -8 12 -5 0 -9 6 -13 4 -4 -2 -12 -10 -15 -10 -4 -2 -4 -8 0 -8 5 -2 7 -7 7 -9 0 -4 -2 -10 -4 -12 -3 0 -3 -9 2 -9 4 -4 6 -8 2 -12 -2 -4 -2 -8 -7 -8 -6 2 -20 0 -20 -7 0 -4 0 -14 -2 -14 -3 0 -23 -2 -23 -6 0 -3 0 -30 -2 -30 -3 0 -19 5 -21 0 -2 -2 -4 -12 -4 -14 0 -4 -3 -13 -3 -17 -2 -2 -8 -14 -8 -14 0 0 -21 2 -23 0 -4 -3 -16 0 -21 0 -4 2 -33 10 -33 14 -2 2 -6 25 -8 27 0 2 -4 4 -4 9 0 4 -3 16 -5 16 -2 4 -2 9 -2 13 2 0 7 12 0 10 -8 -2 -10 0 -12 2 l -2 2 z"/>
-		</g>
-		<g id="reg12">
-			<path id="reg12a" d="M -1619 3559 c 0 0 -6 -4 -8 -4 -4 2 -15 0 -15 4 0 3 -4 5 -8 7 -2 0 -2 6 -2 10 0 4 4 0 6 0 2 0 4 2 4 4 0 0 5 2 7 0 2 -4 6 -6 8 -6 2 -2 8 -6 8 -8 0 -2 2 -7 0 -7 z"/>
-			<path id="reg12b" d="M -1523 3532 c 0 0 -6 0 -8 0 -2 2 -6 2 -6 -2 0 -2 -7 -4 -7 -6 0 -2 0 -6 4 -6 5 0 15 -6 19 -9 2 -2 21 -8 27 -8 7 0 13 0 17 0 2 0 10 -2 10 0 0 2 -6 6 -4 6 2 0 6 2 4 7 -4 2 -2 6 2 8 3 0 15 -2 15 6 0 9 -2 13 -8 17 -7 6 -11 8 -11 10 -2 4 -8 9 -12 9 -2 0 -6 2 -9 4 -2 0 -4 0 -4 -2 0 -2 -6 -4 -8 -4 -4 0 -13 -3 -13 -7 0 -2 0 -2 -6 -4 -2 -4 2 -14 2 -17 l -4 -2 z"/>
-			<path id="reg12c" d="M -1381 3526 c 0 0 -9 -4 -11 -6 0 -4 -8 -8 -12 -8 -2 0 -8 0 -8 -3 0 -2 -3 -8 0 -10 4 -2 20 -2 20 -2 0 0 5 -6 7 -2 2 0 2 4 4 4 2 0 4 4 4 8 0 2 4 0 2 7 0 6 0 10 -2 10 l -4 2 z"/>
-			<path id="reg12d" d="M -2444 3516 c 0 -2 4 -17 4 -17 0 0 30 -19 34 -19 2 0 23 -23 25 -27 2 -2 14 -2 16 -2 0 0 3 -17 3 -17 0 0 -15 -2 -15 -2 0 0 -2 -37 -2 -39 0 -4 6 -13 8 -15 0 -2 -4 -8 0 -8 2 0 21 -6 21 -6 4 0 0 -13 2 -19 2 -2 -2 -6 -2 -8 0 0 -2 -15 -2 -17 0 0 -6 -15 -6 -17 0 0 2 -10 2 -14 0 -5 -2 -23 -2 -25 0 -2 -4 -9 -4 -9 0 0 33 11 41 13 6 2 9 -6 17 -9 6 -4 10 -18 14 -18 5 0 5 -13 5 -17 0 -4 -15 -6 -15 -6 0 0 4 -6 4 -9 0 -4 6 -10 15 -10 8 0 8 -12 8 -12 2 0 11 -9 11 -13 0 -2 4 -10 6 -10 0 0 4 -13 6 -17 0 -6 0 -21 0 -21 0 0 -10 6 -6 0 6 -6 19 -12 19 -17 2 -2 20 -2 20 -2 0 0 19 -16 21 -16 2 0 15 -2 15 -4 0 0 -4 -13 -6 -15 0 -4 -11 -2 -13 -2 -4 0 -4 -11 -4 -13 0 -2 8 -8 8 -12 0 -6 -14 -6 -16 -6 -5 -2 -19 -15 -25 -19 -5 -4 -11 -2 -11 0 0 4 -10 4 -12 6 -5 0 -11 -8 -11 -10 0 -4 -12 -7 -14 -7 0 0 0 -2 -5 -8 -4 -6 -12 0 -14 2 -2 0 -2 -8 -4 -10 -2 -4 0 -13 0 -13 0 -2 8 -8 4 -16 -6 -9 -21 4 -25 4 -2 2 -17 4 -17 4 -2 0 -10 0 -12 2 -4 0 -11 -6 -13 -6 -2 0 -8 8 -10 12 -2 0 -13 2 -13 2 7 -6 2 -2 0 -6 -2 -2 7 -12 7 -14 0 0 6 -9 8 -9 0 0 12 -8 14 -8 0 0 11 -6 11 -6 0 -2 -8 0 -11 2 -2 0 -6 2 -6 0 -4 -2 0 -9 0 -9 0 0 13 0 13 -4 0 -4 -7 0 -9 -2 -4 -2 -2 -8 -4 -10 0 -4 4 -7 6 -7 0 0 7 -6 7 -8 0 -2 -9 -2 -13 0 0 0 0 4 -4 6 -4 0 -6 -4 -6 -8 0 -4 6 -8 6 -10 2 0 13 -5 17 -7 4 -2 -2 -4 -4 -4 -3 0 -9 4 -13 2 -4 -2 0 -10 0 -12 0 -2 4 -11 -2 -11 -8 0 -6 -4 -6 -8 0 -4 4 -4 4 -6 0 -2 8 -4 8 -4 4 0 0 -5 0 -5 0 -4 6 0 13 0 4 0 12 -6 16 -8 9 -2 11 0 19 4 8 7 15 2 17 0 2 0 12 0 12 0 0 0 4 2 7 4 2 3 8 3 6 0 -4 -4 -2 -4 0 -6 2 -2 -11 -4 -9 -6 5 0 5 -6 5 -6 2 0 12 2 14 0 6 -2 13 -7 13 -7 2 0 8 -4 10 -2 2 0 -2 9 0 9 2 0 4 -2 6 -2 2 0 7 -2 9 -5 2 -2 4 -2 4 0 0 5 2 7 2 7 2 2 2 6 6 6 2 0 13 0 13 4 2 4 2 8 8 13 6 4 13 6 15 10 0 4 6 4 10 6 4 0 8 0 10 2 3 2 7 5 13 5 4 0 15 4 17 4 2 2 8 2 14 4 2 2 2 4 6 4 0 0 7 2 9 4 2 0 8 0 8 0 2 0 11 -8 13 -6 2 2 6 10 8 12 2 3 8 3 10 5 0 0 13 0 13 2 2 2 2 8 6 10 2 0 29 15 33 15 3 2 13 14 19 14 2 2 13 4 15 7 2 2 6 4 16 2 7 -2 15 4 15 4 2 0 10 -4 13 -2 2 2 6 6 12 6 8 -2 17 4 17 6 0 2 -2 9 0 9 0 0 16 4 18 6 3 4 7 6 9 6 4 0 25 -2 29 2 4 4 23 17 27 19 4 2 27 8 29 8 4 0 19 0 21 0 l 2 2 c 0 0 0 11 2 11 0 2 0 12 6 12 7 0 15 0 15 4 0 2 -6 21 -2 21 2 0 15 -4 15 0 4 2 2 4 10 4 8 -2 12 -2 17 2 2 7 10 15 10 15 0 0 10 13 10 15 3 2 5 10 11 10 4 -2 12 0 14 4 0 6 13 19 17 19 4 0 19 0 21 6 4 6 15 15 19 15 2 0 12 -2 16 -2 5 0 7 -11 13 -11 4 0 14 4 17 9 0 2 14 8 18 8 0 0 -8 10 -6 15 2 2 8 12 10 12 3 0 17 0 19 -4 0 0 2 4 6 4 3 0 9 -4 9 -4 4 2 8 4 8 6 0 2 4 8 6 8 5 3 7 -4 11 -2 4 2 14 5 16 5 5 2 9 6 9 12 0 4 -2 8 4 8 4 0 6 5 10 9 0 2 7 -4 11 -4 4 0 2 4 6 4 4 0 13 -2 13 -2 0 0 10 6 10 12 0 6 -2 6 -4 4 -2 -2 -6 2 -6 7 0 4 2 10 2 12 0 2 2 19 2 21 0 2 -7 6 -11 6 -2 0 -14 2 -18 4 -5 2 -30 11 -34 11 -4 0 -33 12 -39 18 -5 7 -17 7 -19 7 -4 0 -50 2 -56 4 -7 0 -15 4 -15 4 -4 2 -12 0 -15 0 -2 0 -31 17 -29 21 2 4 13 8 4 14 -8 7 -14 9 -14 7 -2 -4 -4 -4 -6 -2 -5 2 -32 25 -34 27 -4 2 -18 16 -23 18 -2 5 -6 5 -8 5 -2 2 -10 12 -17 12 -4 0 -12 13 -16 17 -2 4 -4 12 -4 12 0 2 -9 9 -11 13 0 2 8 19 -10 8 -2 0 6 13 2 13 -4 0 12 -2 12 10 0 10 -2 10 -4 10 -2 0 11 32 15 34 2 2 12 12 12 16 0 0 4 5 2 7 -2 0 -12 4 -14 6 0 0 -9 6 -13 8 -4 0 -12 4 -14 4 0 3 -13 3 -17 5 -2 0 -6 6 -8 6 -7 0 -13 4 -15 6 -2 2 -6 13 -8 13 -2 2 -11 16 -13 18 0 2 -4 9 -8 9 -2 0 -8 2 -8 6 2 6 2 8 4 6 2 0 8 -6 8 -4 0 2 2 15 2 17 -2 0 -17 0 -21 2 -2 2 -6 6 -8 0 -4 -2 -8 0 -10 0 0 0 -7 0 -9 -4 -2 -2 -25 2 -27 4 -4 4 -17 6 -17 6 -2 0 -27 13 -29 15 0 2 -10 23 -14 23 -7 0 -13 10 -15 12 -4 0 -8 4 -10 2 -2 -4 -15 -12 -21 -12 -8 0 -17 0 -19 2 -4 4 -12 6 -19 2 -4 -6 -18 -11 -20 -11 0 0 -23 0 -25 0 -3 -2 -15 -12 -19 -12 -4 0 -15 -4 -21 -4 -4 0 -15 -2 -17 -2 -2 2 -16 -7 -18 -9 -5 0 -13 7 -17 7 -4 0 -19 4 -23 4 -4 0 -15 0 -19 -2 -4 -2 -19 0 -23 0 -2 0 -16 2 -21 4 -2 4 -16 14 -20 16 -5 3 -9 7 -15 5 -6 -2 -21 -7 -21 -11 0 -4 2 -10 -4 -12 -4 0 -12 -9 -12 -11 -3 -4 -9 -18 -9 -21 0 -2 -6 -10 -6 -12 0 -2 12 -2 8 -8 -2 -5 -10 -15 -8 -17 2 -2 8 -13 6 -13 0 -2 -4 -16 -4 -18 0 -2 -10 -17 -12 -21 -3 -4 -11 -6 -11 -11 0 -2 0 -8 -4 -8 -4 0 -17 -4 -21 -8 -2 -4 -12 -9 -14 -9 -3 0 -3 -2 -3 -4 0 -4 0 -14 0 -16 0 -5 -2 -7 -2 -7 l -2 9 z"/>
-		</g>
-		<path id="reg31" d="M -2394 2982 c 0 0 11 -2 13 -2 2 -4 8 -12 10 -12 2 0 9 6 13 6 2 -2 10 -2 12 -2 0 0 15 -2 17 -4 4 0 19 -13 25 -4 4 8 -4 14 -4 16 0 0 -2 9 0 13 2 2 2 10 4 10 2 -2 10 -8 14 -2 5 6 5 8 5 8 2 0 14 3 14 7 0 2 6 10 11 10 2 -2 12 -2 12 -6 0 -2 6 -4 11 0 6 4 20 17 25 19 2 0 16 0 16 6 0 4 -8 10 -8 12 0 2 0 13 4 13 2 0 13 -2 13 2 2 2 6 15 6 15 0 2 -13 4 -15 4 -2 0 -21 16 -21 16 0 0 -18 0 -20 2 0 5 -13 11 -19 17 -4 6 6 0 6 0 0 0 0 15 0 21 -2 4 -6 17 -6 17 -2 0 -6 8 -6 10 0 4 -9 13 -11 13 0 0 0 12 -8 12 -9 0 -15 6 -15 10 0 3 -4 9 -4 9 0 0 15 2 15 6 0 4 0 17 -5 17 -4 0 -8 14 -14 18 -8 3 -11 11 -17 9 -8 -2 -41 -13 -41 -13 0 0 4 7 4 9 0 2 2 20 2 25 0 4 -2 14 -2 14 0 2 6 17 6 17 0 2 2 17 2 17 0 2 4 6 2 8 -2 6 2 19 -2 19 0 0 -19 6 -21 6 -4 0 0 6 0 8 -2 2 -8 11 -8 15 0 2 2 39 2 39 0 0 15 2 15 2 0 0 -3 17 -3 17 -2 0 -14 0 -16 2 -2 4 -23 27 -25 27 -4 0 -34 19 -34 19 0 0 -4 15 -4 17 0 0 -2 18 -2 18 0 0 -19 0 -25 3 -4 0 -25 8 -27 6 -4 -2 -10 -17 -17 -19 -2 0 -22 -8 -25 -8 -4 -2 -14 -11 -18 -9 -4 2 -15 -2 -19 -2 -4 0 -15 2 -10 -6 2 -8 14 -12 18 -23 4 -10 13 -19 13 -23 0 -6 8 -21 10 -23 0 -4 4 -14 2 -21 0 -6 2 -8 4 -10 3 -2 15 -17 15 -29 0 -13 2 -13 2 -17 -2 -4 -2 -14 0 -12 0 2 8 8 11 10 0 0 4 6 4 6 0 0 2 -6 0 -10 -7 -4 -13 -8 -13 -8 -2 0 -10 0 -10 0 0 0 -23 0 -25 -5 -2 -2 8 -14 8 -18 0 -4 4 -4 6 -2 5 2 2 4 9 4 8 0 2 -9 4 -9 4 0 12 -6 12 -10 0 -6 -4 -6 -6 -2 -6 4 -12 10 -19 8 -6 0 -12 0 -18 -4 -5 -2 -2 -8 2 -12 2 -5 10 -13 10 -19 0 -4 2 -13 8 -15 5 -4 7 -8 7 -14 0 -4 2 -11 2 -11 0 0 14 2 16 0 3 -2 7 -8 11 -8 4 0 6 -4 6 -10 0 -5 23 -28 27 -30 2 -6 13 -12 13 -16 0 -4 4 -17 8 -19 2 -4 19 -31 21 -29 2 0 6 2 6 -2 0 -4 4 -7 6 -9 2 -2 2 -6 2 -8 0 -2 0 -8 -2 -4 -4 4 -6 10 -10 10 -2 0 4 -12 8 -16 2 -2 11 -19 11 -21 0 0 0 -13 0 -19 0 -4 8 -29 8 -35 0 -7 0 -15 0 -19 0 -4 6 -13 6 -13 z"/>
-		<path id="reg38" d="M -246 2651 c 0 -2 -10 -6 -14 -6 0 0 -17 -4 -19 -4 -2 0 -11 6 -15 6 -4 0 -14 -2 -16 -2 -5 0 -9 -4 -11 -6 0 -2 -6 -7 -10 -9 -6 -2 -13 -4 -13 -6 -2 -6 -4 -10 -10 -10 -4 0 -13 -2 -15 -7 -2 -4 -14 -8 -14 -8 0 0 -4 4 -4 8 -3 5 -3 11 0 13 0 4 -3 17 -7 14 -2 -4 -12 -4 -16 0 -5 3 -9 5 -11 13 0 4 -4 4 -10 4 -2 0 -6 8 -6 11 -3 2 -9 -3 -11 -3 -2 -2 -6 -2 -6 -6 0 -2 -4 -6 -6 -8 -5 -2 -17 -8 -17 -8 0 0 -2 -25 -8 -25 -5 0 -15 -9 -19 -13 -2 -4 -17 -23 -21 -25 -2 -4 -15 -10 -23 -12 -4 -3 -14 -17 -19 -21 -4 -2 -4 -11 -4 -15 0 -6 -10 -17 -6 -19 4 -4 0 -14 -4 -18 -4 -7 -6 -15 -9 -21 -2 -6 -8 -23 -2 -23 7 0 7 14 13 10 8 -2 8 -16 14 -16 9 -2 25 -13 28 -13 4 2 25 6 29 0 4 -6 8 -10 12 -10 2 0 9 -9 11 -11 2 -4 16 4 20 4 3 -2 17 -16 25 -18 9 -2 25 -2 28 -2 2 0 0 -9 -7 -11 -4 -2 -12 0 -12 -4 0 -2 4 -8 10 -8 9 0 15 2 15 8 0 6 2 8 4 10 2 3 10 5 10 7 0 4 0 10 7 10 6 -2 6 -10 6 -10 0 0 14 -2 17 -2 2 -5 -5 -15 0 -15 2 0 22 0 22 4 0 4 -2 17 3 19 6 4 12 6 12 8 0 2 8 2 10 2 5 0 13 11 15 15 4 4 12 6 19 6 6 0 10 4 10 9 0 4 -12 10 -12 12 0 0 -7 8 2 13 8 4 4 8 8 8 4 4 8 10 8 12 0 7 2 9 9 9 4 0 12 0 16 -2 2 -2 7 -9 11 -9 4 0 10 -2 10 -6 0 -4 -4 -27 -2 -25 4 0 19 13 25 17 4 2 11 6 15 6 2 0 12 -2 12 2 0 4 -4 13 0 17 2 6 9 12 13 10 4 -2 10 0 10 4 0 4 11 4 15 7 4 0 12 6 14 8 0 4 9 6 9 8 2 4 10 13 12 15 2 4 4 16 4 16 0 0 -12 3 -16 3 -2 0 -17 -5 -17 0 -2 4 -6 12 -10 12 -3 0 -9 0 -9 4 0 4 -8 4 -8 13 0 6 -8 16 -8 18 0 0 -19 15 -19 15 0 2 -17 13 -17 15 0 2 -8 2 -12 0 -2 -2 -17 -7 -19 -7 0 0 -8 5 -8 7 0 4 -11 12 -11 12 z"/>
-		<path id="reg04" d="M -754 2834 c 0 0 6 -8 4 -12 -2 -4 -6 -10 -10 -8 0 2 -13 12 -19 12 -2 0 -6 -2 -6 -2 0 0 -2 -10 -2 -10 0 0 -11 0 -9 -5 0 -4 -4 -8 -8 -8 -4 0 -11 2 -15 0 -4 0 -8 -8 -8 -14 2 -3 2 -13 6 -15 2 -2 9 -8 9 -13 0 -4 0 -10 0 -10 0 0 -3 -4 -3 -4 0 0 7 0 7 -4 0 -2 0 -4 0 -4 0 0 10 0 12 2 0 2 2 6 6 6 5 0 9 6 11 10 0 2 6 2 8 2 2 0 4 7 4 11 -2 4 2 8 5 6 2 0 29 -27 31 -27 2 0 8 6 10 4 4 0 11 0 13 4 0 4 8 9 12 9 6 0 11 -5 13 -2 2 0 10 2 14 0 4 -3 13 -5 15 -7 4 0 19 2 23 2 4 0 19 -6 21 -6 2 0 12 11 12 13 4 0 13 -5 13 -2 4 0 14 4 14 8 0 2 -6 6 -4 6 2 0 17 6 19 8 4 0 8 5 10 0 4 -2 9 5 9 3 2 -5 -3 -11 -3 -13 0 -2 -6 -12 -6 -12 -2 0 -8 -7 -6 -9 2 0 10 -2 8 -6 -2 -4 2 -13 -2 -15 -4 -2 -19 -23 -16 -25 4 -6 20 -16 25 -18 6 -5 22 -5 25 -11 0 -6 6 -27 6 -27 0 0 16 8 19 8 2 0 4 -6 6 -8 2 -4 6 -2 6 -4 -2 -2 -2 -10 -2 -10 0 0 12 6 17 8 2 2 6 6 6 8 0 4 4 4 6 6 2 0 8 5 11 3 0 -3 4 -11 6 -11 6 0 10 0 10 -4 2 -8 6 -10 11 -13 4 -4 14 -4 16 0 4 3 7 -10 7 -14 -3 -2 -3 -8 0 -13 0 -4 4 -8 4 -8 0 0 12 4 14 8 2 5 11 7 15 7 6 0 8 4 10 10 0 2 7 4 13 6 4 2 10 7 10 9 2 2 6 6 11 6 2 0 12 2 16 2 4 0 13 -6 15 -6 2 0 19 4 19 4 4 0 14 4 14 6 0 0 4 6 2 13 0 4 -6 16 -6 20 -2 3 4 13 4 17 0 4 -2 11 0 11 2 0 13 2 15 8 0 4 2 6 2 6 0 0 -15 6 -19 6 -4 0 -8 2 -6 5 6 4 21 14 19 16 -3 4 -15 11 -19 11 -2 0 -17 -13 -21 -15 -2 0 -19 4 -19 8 0 0 6 9 9 9 2 2 2 6 4 10 0 4 0 8 -2 11 -5 0 -15 4 -15 8 0 2 0 12 2 12 2 2 8 7 8 7 0 0 -2 10 -4 10 -2 0 2 6 2 6 2 4 -4 9 -6 9 -2 0 -10 0 -10 4 0 2 -6 14 -6 14 0 0 -7 0 -9 0 -2 0 -6 2 -6 5 0 2 -4 6 -6 6 -2 0 -15 -2 -15 2 0 4 -4 8 -6 8 -4 0 -36 0 -38 0 0 0 -18 11 -20 11 -3 2 -13 6 -15 8 -2 2 -8 10 -13 8 -4 -2 -8 -6 -14 -6 -6 0 -13 0 -15 -2 -4 -2 -10 -6 -10 -6 -2 0 -15 -4 -15 -4 -2 0 -23 0 -23 0 0 0 -10 -9 -16 -11 -7 0 -19 -6 -25 -6 -7 0 -13 2 -17 0 -2 -2 -10 -4 -15 -4 -4 0 -25 -7 -29 -11 -2 -6 -2 -25 -2 -25 0 0 -8 -2 -12 0 -4 2 -13 7 -17 4 -6 -4 -17 -10 -21 -12 -6 -2 -12 -4 -16 0 -3 2 -19 19 -30 19 -8 0 -18 0 -23 -2 -4 -2 -12 -7 -12 -7 l -2 2 z"/>
-		<path id="reg37" d="M -981 2699 c 0 0 -2 2 -2 8 0 7 -9 11 -11 11 -4 2 -21 0 -23 2 -4 2 2 8 5 10 4 2 -5 9 -7 11 -2 0 -21 18 -25 21 -2 0 -12 10 -14 12 -4 0 -21 13 -27 17 -7 2 -2 8 0 10 2 0 -9 13 -11 15 -4 2 -6 8 -4 10 2 4 0 8 0 13 0 4 4 0 6 -5 2 -4 21 -8 29 -10 9 0 17 6 21 10 4 3 0 9 0 11 -2 0 0 12 -2 14 -2 3 -14 17 -19 19 -2 2 13 2 17 2 2 -2 6 7 8 9 0 2 7 8 7 8 0 0 16 2 18 -2 3 -4 13 2 15 2 2 0 6 -10 8 -10 5 0 19 14 21 12 4 -4 36 -31 38 -33 2 -2 10 -4 10 0 0 2 -4 16 0 21 4 2 13 12 13 12 2 2 8 10 8 13 0 4 10 20 12 18 3 -2 9 -10 11 -14 2 -4 0 -15 2 -17 2 0 15 -10 19 -17 2 -6 2 -20 4 -20 2 0 10 0 10 6 0 6 2 23 7 23 8 0 10 -13 14 -11 4 2 15 15 15 17 2 2 6 4 10 2 4 -4 -2 -15 0 -21 2 -4 -6 -12 -4 -14 0 -2 15 -13 17 -13 2 2 14 6 16 6 4 -2 9 -6 7 -10 -3 -2 8 -13 8 -13 0 0 6 -8 4 -12 -2 -4 -6 -10 -10 -8 0 2 -13 12 -19 12 -2 0 -6 -2 -6 -2 0 0 -2 -10 -2 -10 0 0 -11 0 -9 -5 0 -4 -4 -8 -8 -8 -4 0 -11 2 -15 0 -4 0 -8 -8 -8 -14 2 -3 2 -13 6 -15 2 -2 9 -8 9 -13 0 -4 0 -10 0 -10 0 0 -21 -12 -23 -17 -2 -2 -11 -10 -15 -10 -4 -2 -6 -4 -6 -8 0 -2 -6 -2 -9 -2 -4 0 -4 -11 -10 -11 -4 0 -12 0 -12 4 0 0 -3 13 -11 13 -8 0 -19 -2 -23 -2 -2 0 -12 4 -16 2 -7 -4 -15 -2 -21 -4 -4 -2 -15 -9 -15 -9 l -8 -6 z"/>
-		<g id="reg22">
-			<path id="reg22a" d="M -460 4018 c 0 0 -7 -2 -7 -4 -2 -2 -16 -5 -23 -5 -8 0 -27 -6 -29 -12 0 -2 -10 -25 -12 -27 -4 -4 -19 -8 -27 -6 -11 0 -13 0 -15 -2 -2 -5 -8 -7 -14 -11 -7 -2 -28 -17 -32 -21 -4 -4 -8 -16 -14 -18 -4 0 -13 0 -15 -7 -2 -4 -6 -8 -10 -6 -9 2 -13 2 -17 -2 -4 -4 -10 -6 -12 -8 -3 -5 -9 -15 -9 -19 0 -2 4 -8 4 -13 0 -2 5 -8 5 -12 0 -4 8 -4 12 -4 4 0 2 -4 4 -7 2 -2 6 -2 6 -2 0 -4 3 -6 7 -4 4 2 2 11 8 13 2 2 13 6 13 -2 0 -7 2 -7 6 -7 4 0 10 0 12 -4 4 -2 15 4 15 9 0 2 4 4 6 4 4 0 6 6 8 8 3 2 13 8 19 6 6 0 23 -6 27 -4 2 0 17 11 36 6 21 -6 29 -12 35 -12 8 0 29 2 31 0 2 -2 5 -6 11 -4 6 0 8 0 12 -2 4 -5 15 -5 15 2 0 4 -8 10 -8 12 0 2 -21 29 -25 38 -3 10 -15 33 -15 37 0 4 -4 15 0 17 4 2 6 0 8 6 0 4 4 8 4 8 0 0 -8 -2 -8 -2 0 0 4 7 6 9 2 0 9 10 7 14 -5 4 -11 4 -15 7 -4 4 -8 10 -8 18 0 9 -2 11 -2 11 l 0 2 z"/>
-			<path id="reg22b" d="M -940 3437 c 0 0 -2 4 -2 6 0 4 -8 6 -12 8 -4 4 -13 11 -15 13 -2 4 -10 6 -12 6 -4 0 -13 0 -13 4 0 2 -10 6 -14 4 -7 0 -9 -4 -9 -6 -2 0 -8 -15 -10 -15 0 0 -4 9 -4 13 0 2 -6 12 -6 17 0 4 4 4 2 6 0 2 -2 6 2 8 2 2 2 2 6 2 2 0 2 6 2 9 0 4 2 8 6 10 2 2 -2 8 -2 8 0 0 4 7 6 11 3 2 0 12 -2 14 -2 4 -2 9 -2 11 0 4 -2 10 -4 10 -4 0 -6 4 -6 6 0 2 0 15 2 11 4 -4 8 0 8 2 0 4 2 6 0 8 -2 2 -2 13 -4 13 -2 0 -2 -11 -4 -9 -4 2 0 11 0 15 0 4 -4 12 -6 15 -2 0 -4 10 -4 14 0 2 -3 15 -3 17 -2 2 -2 8 3 8 2 2 2 6 6 11 4 2 2 6 2 8 0 0 4 8 4 8 2 0 4 9 8 4 5 -2 13 5 17 2 2 -2 10 -2 13 -8 4 -4 4 -17 8 -21 2 -2 12 -6 14 -6 5 4 15 15 17 17 4 2 8 8 11 2 6 -6 4 -11 6 -13 0 -4 0 -12 2 -14 2 -2 14 -48 14 -57 0 -8 0 -22 0 -27 0 -4 0 -23 5 -27 2 -2 12 -6 14 -4 2 0 2 -12 2 -17 -2 -4 -8 -18 -6 -20 2 -2 0 -9 -2 -11 0 -2 2 -12 0 -14 0 -2 -2 -9 -4 -9 -2 0 -9 -4 -4 -6 6 -2 12 -4 8 -6 -4 -2 -17 2 -8 -6 8 -7 0 -7 -5 -7 -6 0 -4 -8 -8 -8 -4 0 -10 0 -10 -4 0 -4 0 -6 -4 -6 l -3 0 z"/>
-			<path id="reg22c" d="M -752 2832 c 0 0 8 5 12 7 5 2 15 2 23 2 11 0 27 -17 30 -19 4 -4 10 -2 16 0 4 2 15 8 21 12 4 3 13 -2 17 -4 4 -2 12 0 12 0 0 0 0 19 2 25 4 4 25 11 29 11 5 0 13 2 15 4 4 2 10 0 17 0 6 0 18 6 25 6 6 2 16 11 16 11 0 0 -2 8 -4 12 -4 2 -16 2 -21 4 -4 0 2 13 5 13 4 0 6 0 12 0 6 4 -4 10 -8 14 -4 4 2 13 6 15 6 0 8 6 8 12 0 5 7 11 11 11 4 4 8 4 10 8 2 4 2 15 -2 17 -4 2 -15 0 -15 0 0 0 3 -9 0 -13 -4 -4 -4 -8 -10 -8 -6 0 -8 4 -12 4 -3 0 -15 -6 -19 -6 -2 -2 -6 2 -2 4 2 2 -7 6 -11 6 -2 0 -12 2 -16 4 -2 0 -17 11 -17 11 -2 0 -13 6 -13 2 0 -2 9 -8 7 -10 -2 -3 -17 8 -19 8 -4 2 -15 12 -13 14 3 7 3 13 5 15 2 2 6 4 6 8 0 5 0 9 4 9 6 4 6 12 6 14 0 4 -2 11 -6 7 -2 -3 -2 4 -2 6 0 2 0 6 -4 4 -4 -2 -11 -2 -11 2 0 2 2 17 5 21 0 4 -3 14 -3 17 0 2 11 20 11 27 0 2 14 29 17 31 2 2 22 6 25 12 2 7 18 21 22 23 5 2 11 7 17 7 8 0 13 14 15 20 0 5 8 34 10 40 2 6 8 48 11 52 4 6 10 25 16 25 6 2 2 6 6 8 5 5 11 15 13 17 2 2 23 15 25 19 4 2 21 19 27 21 4 0 21 2 33 2 13 -2 48 0 55 8 4 10 0 19 -5 19 -4 0 -20 4 -20 12 2 7 4 19 12 23 0 0 19 13 21 13 2 2 14 12 19 16 4 0 39 13 43 17 4 4 29 17 32 23 4 6 27 19 27 19 2 0 27 14 29 18 2 5 14 13 14 13 0 0 21 25 21 35 0 9 -4 21 -4 21 0 2 -2 21 -2 21 0 0 -6 6 -10 0 -7 -4 -21 -15 -21 -17 0 -4 -9 -23 -9 -25 -2 -2 -6 -10 -6 -10 -2 0 -12 -6 -17 -6 -4 0 -18 -2 -25 -7 -4 -2 -14 -4 -16 -8 -2 -2 -2 -8 -9 -8 -4 2 -14 6 -18 8 -4 2 -15 17 -15 23 0 4 -8 15 -8 17 0 2 -6 18 -6 25 0 4 -9 14 0 21 8 6 12 6 16 6 6 0 13 14 19 19 10 8 15 10 15 18 0 9 -7 15 -5 21 0 4 11 13 5 19 -7 6 -7 10 -9 6 -2 -2 -8 -4 -12 -2 -7 0 -15 8 -21 10 -4 0 -13 17 -13 42 0 2 -12 11 -14 11 -2 0 -19 16 -21 20 -4 2 -12 21 -21 21 -8 0 -25 0 -27 -2 -2 -4 -6 -23 -4 -29 2 -6 8 -6 12 -6 7 0 9 -9 11 -15 0 -6 4 -12 2 -14 -2 -5 -4 -15 2 -15 6 -2 29 -8 29 -15 0 -6 -6 -10 -8 -14 0 -2 -4 -17 -4 -23 0 -6 -2 -31 -4 -33 -7 -5 -13 -19 -15 -25 -2 -7 0 -25 -4 -30 -6 -8 -11 -23 -17 -23 -6 0 -14 7 -14 7 0 0 -11 -2 -11 -4 -2 -3 -4 -9 -6 -9 -2 0 -6 -8 -8 -8 -3 -2 -7 -4 -11 -6 -2 0 -6 -13 -4 -13 2 -4 4 -17 0 -21 -2 -2 -4 -8 -8 -12 0 -2 -7 -4 -13 -4 -4 0 -27 4 -27 2 0 -4 2 -7 4 -11 2 -2 4 -6 -2 -8 -4 -2 -10 -8 -14 -6 -5 0 -3 6 -7 6 -2 0 -6 -8 -8 -13 -2 -2 -2 -10 -2 -14 0 -4 -4 -8 -8 -11 -3 -2 -11 -18 -13 -18 -2 0 -19 -2 -21 -4 -4 0 -14 -9 -19 -7 -2 2 -16 2 -18 0 -2 -4 -9 -14 -13 -16 -4 -2 -25 -17 -29 -21 -2 -6 -17 -29 -21 -34 -4 -2 -8 -16 -12 -18 -4 -4 -15 -15 -21 -15 -4 -2 -11 -12 -11 -17 -2 -6 -12 -16 -16 -18 -4 -2 -13 -7 -17 -7 -2 0 -8 5 -10 0 -2 -2 2 -12 2 -12 0 0 -4 -19 -9 -23 -6 -4 -18 -10 -18 -15 0 -4 0 -12 -7 -14 -4 0 -16 -4 -16 -8 0 -5 -6 -11 -2 -11 4 0 6 -8 6 -12 0 -7 -2 -27 -6 -34 -7 -4 -7 -16 -7 -23 0 -4 3 -23 -2 -27 -6 -4 -10 -14 -14 -16 -4 -5 -15 0 -15 -5 0 0 -12 -8 -14 -10 -2 -2 -19 -21 -19 -21 -2 0 -8 0 -8 0 0 0 -9 -4 -11 -8 -2 -4 -8 -8 -12 -8 -5 0 -17 -5 -19 0 -4 0 -23 12 -25 12 0 0 -13 10 -15 13 0 0 -12 14 -12 14 0 0 -15 6 -19 8 -2 3 -8 7 -15 7 -4 0 -10 0 -10 0 0 0 -2 -11 0 -15 4 0 10 -10 10 -12 0 -5 11 -9 13 -11 4 -2 0 -6 -2 -10 0 -2 -2 -6 -4 -4 -4 2 -9 10 -15 10 -6 0 -10 -4 -12 -4 -5 0 -13 -2 -13 -6 -2 -9 -6 -11 -10 -11 -7 0 -17 -4 -17 -6 0 -4 -2 -10 0 -10 2 0 10 -3 4 -7 -4 -4 -10 -10 -8 -12 4 -4 8 -9 8 -11 0 -2 4 -8 6 -8 3 0 5 -2 5 -6 2 -2 2 -9 -5 -11 -4 -2 -4 -6 -4 -8 2 -2 0 -8 0 -10 -2 -5 -6 -15 -4 -15 4 0 13 2 13 0 2 -2 6 -4 8 -4 4 0 6 -11 10 -11 5 -2 9 -6 7 -8 -5 -4 -13 -8 -11 -10 2 -4 2 -13 0 -13 -2 -2 -6 -12 -6 -14 4 -5 19 -17 19 -17 0 0 16 2 18 -2 3 -4 13 2 15 2 2 0 6 -10 8 -10 5 0 19 14 21 12 4 -4 36 -31 38 -33 2 -2 10 -4 10 0 0 2 -4 16 0 21 4 2 13 12 13 12 2 2 8 10 8 13 0 4 10 20 12 18 3 -2 9 -10 11 -14 2 -4 0 -15 2 -17 2 0 15 -10 19 -17 2 -6 2 -20 4 -20 2 0 10 0 10 6 0 6 2 23 7 23 8 0 10 -13 14 -11 4 2 15 15 15 17 2 2 6 4 10 2 4 -4 -2 -15 0 -21 2 -4 -6 -12 -4 -14 0 -2 15 -13 17 -13 2 2 14 6 16 6 4 -2 9 -6 7 -10 -3 -2 8 -13 8 -13 l 2 -2 z"/>
-		</g>
-		<path id="reg01" d="M 83 3564 c 0 0 -2 10 0 10 2 2 -2 10 0 15 2 2 0 12 -4 14 -4 2 -6 6 -8 11 0 4 -8 12 -13 14 -6 2 -10 11 -10 11 0 2 -8 4 -10 4 -3 0 -5 6 -5 6 0 0 -10 -2 -8 4 0 4 4 9 -2 11 -4 4 -4 8 -4 14 0 4 -4 6 -4 4 -5 -2 -19 0 -19 0 0 0 2 -4 2 -8 0 -4 -11 -6 -11 -12 0 -5 -8 -9 -10 -15 -2 -2 -15 -10 -23 -17 -10 -4 -21 -16 -21 -23 0 -6 9 -2 11 2 4 5 2 -4 2 -8 0 -6 -6 -8 -11 -10 -4 -2 -6 -7 -4 -9 2 -2 2 -8 0 -14 -2 -4 6 -9 11 -9 2 0 10 -6 8 -10 -4 -4 -6 -12 -6 -21 0 -6 8 -12 8 -19 0 -6 -6 -8 -10 -14 -2 -6 0 -11 4 -11 2 0 4 -4 2 -10 -2 -4 2 -6 6 -4 2 4 8 -2 6 -4 -2 -4 -4 -11 -4 -17 0 -6 -14 -15 -14 -15 0 0 -7 -27 -5 -31 5 -4 5 -16 7 -21 2 -6 8 -6 12 -6 6 0 6 -14 6 -19 0 -4 9 -14 15 -8 4 8 -2 21 2 21 6 0 19 0 21 -4 0 -2 8 -2 8 4 0 6 7 17 11 19 2 0 14 4 14 4 0 0 7 4 7 10 0 6 2 17 2 19 2 0 8 15 8 15 0 0 -17 8 -19 8 0 0 -4 12 -4 14 0 0 4 5 6 3 0 0 -6 20 -4 25 4 4 0 12 0 16 0 4 4 17 4 17 0 0 9 4 11 8 0 2 6 4 6 9 0 6 -2 14 0 14 4 0 10 -6 10 -6 0 0 17 6 17 6 0 0 -2 13 2 13 4 0 2 2 2 2 l 2 -2 z"/>
-		<g id="reg40">
-			<path id="reg40a" d="M 4 3364 c -2 0 -4 0 -4 2 -2 4 -15 4 -21 4 -4 0 2 -13 -2 -21 -6 -6 -15 4 -15 8 0 5 0 19 -6 19 -4 0 -10 0 -12 6 -2 5 -2 17 -7 21 -2 4 5 31 5 31 0 0 -9 -6 -13 -6 -4 0 -10 -4 -12 -8 -2 -4 -9 -15 -13 -17 -4 0 -6 -2 -6 -6 0 -4 -4 -10 -8 -10 -5 0 -9 -5 -13 -9 0 -2 -2 -6 0 -6 0 2 10 2 10 -4 0 -6 -8 -4 -8 -2 0 4 -4 0 -8 0 -2 -2 -9 4 -11 4 -2 0 -10 -11 -10 -11 0 0 6 -20 10 -22 2 -5 13 -28 13 -36 0 -10 -4 -25 0 -29 6 -2 21 -10 21 -17 0 -6 2 -16 6 -23 0 0 8 7 17 7 6 2 45 2 54 6 8 2 16 19 16 31 0 13 7 31 13 36 8 2 13 0 17 4 6 4 12 8 6 18 -6 11 -19 0 -21 9 0 8 4 23 4 23 l -2 -2 z"/>
-			<path id="reg40b" d="M 6 3366 c 0 0 -4 -15 -4 -23 2 -9 15 2 21 -9 6 -10 0 -14 -6 -18 -4 -4 -9 -2 -17 -4 -6 -5 -13 -23 -13 -36 0 -12 -8 -29 -16 -31 -9 -4 -48 -4 -54 -6 -9 0 -17 -7 -17 -7 2 -2 2 -2 4 -2 6 -2 29 -10 27 -14 -2 -2 -10 -27 -2 -23 6 2 29 2 29 -2 0 -4 -16 -19 -18 -23 -5 -4 -11 -9 -17 -9 -6 0 -2 -16 -2 -20 0 -5 8 -34 8 -40 0 -8 -6 -8 -8 -8 -4 0 -15 2 -15 2 0 0 0 0 0 0 0 0 0 -17 0 -19 0 -2 6 -8 6 -6 0 0 7 -6 7 -11 0 -4 4 -4 4 -8 0 -4 -6 -12 -15 -17 -6 -6 4 -12 4 -16 0 -4 -12 -9 -14 -9 -4 0 -2 -14 -2 -20 0 -7 -9 -21 -9 -21 0 0 23 -4 25 -7 5 -4 13 -8 17 -4 6 7 19 4 21 -2 0 -4 12 -14 19 -12 6 0 21 -2 25 0 6 0 25 4 25 4 0 0 27 -6 27 -6 0 0 -6 2 -8 2 0 0 -9 8 -17 10 -6 4 17 17 21 17 6 2 14 10 14 12 0 4 2 29 2 36 0 8 15 16 21 16 2 -2 4 2 4 7 0 2 19 10 21 10 2 0 6 10 6 15 3 4 -10 4 -10 4 0 2 0 14 0 19 0 2 13 6 17 8 6 0 8 8 8 8 0 2 4 2 8 4 5 2 25 15 34 17 8 2 12 -12 14 -15 0 -4 17 -8 21 -8 4 0 11 11 11 15 0 4 -7 6 -11 2 -4 -4 -12 4 -12 8 -2 0 12 21 18 27 5 9 11 11 11 11 0 0 0 0 0 0 0 0 -11 18 -13 20 -4 3 -8 11 -10 19 0 9 4 23 8 25 6 4 2 11 2 15 0 4 21 29 27 35 7 4 0 17 -4 25 -4 9 -25 11 -25 11 0 0 -6 25 -6 25 0 0 4 2 8 2 7 0 11 12 11 16 0 7 -17 27 -17 27 0 0 -6 -8 -15 -6 -8 0 -35 4 -35 6 0 3 -8 7 -15 7 -6 0 -22 0 -22 2 0 2 -9 12 -9 10 0 0 -12 -8 -12 -6 0 2 -25 12 -25 15 0 2 0 16 0 16 0 0 -9 2 -9 4 0 2 -8 2 -8 2 0 0 0 3 0 3 0 0 -6 -13 -8 -15 0 -2 -2 -13 -2 -19 0 -6 -7 -10 -7 -10 0 0 -12 -4 -14 -4 -4 -2 -11 -13 -11 -19 0 -2 -2 -4 -4 -6 l 2 2 z"/>
-		</g>
-		<path id="reg08" d="M -150 3359 c 0 0 6 -20 10 -22 2 -5 13 -28 13 -36 0 -10 -4 -25 0 -29 6 -2 21 -10 21 -17 0 -6 4 -23 10 -25 6 -2 29 -10 27 -14 -2 -2 -10 -27 -2 -23 6 2 29 2 29 -2 0 -4 -16 -19 -18 -23 -5 -4 -11 -9 -17 -9 -6 0 -2 -16 -2 -20 0 -5 8 -34 8 -40 0 -8 -6 -8 -8 -8 -4 0 -15 2 -15 2 0 0 -12 6 -14 0 -5 -2 -7 -13 -9 -15 -4 -4 -12 -10 -12 -8 0 4 -11 2 -19 0 -4 -2 -12 -4 -12 -2 0 2 -7 4 -11 0 -2 -4 -10 0 -10 0 0 2 -9 6 -13 2 -4 -4 -16 -2 -21 -2 -2 0 -14 -11 -16 -11 -4 0 -15 5 -19 0 -2 -4 -13 -8 -15 -4 0 0 -8 4 -10 4 -2 -2 -19 -4 -19 -4 0 4 -23 27 -31 27 -6 -2 -21 -10 -21 -14 0 -4 -4 -9 -10 -4 -6 4 -13 6 -11 10 0 2 -4 8 -6 8 -2 0 -8 0 -8 7 2 6 8 22 10 22 4 3 19 11 19 13 2 4 17 17 19 21 2 4 6 12 6 16 0 3 -2 13 0 15 0 2 2 19 10 19 7 0 15 6 19 14 0 9 15 17 21 19 6 4 17 6 17 13 0 6 4 12 8 12 6 0 14 8 17 13 2 2 18 2 18 6 0 8 11 21 9 21 -2 0 -13 2 -11 2 0 4 11 12 11 12 2 0 8 0 12 4 2 3 6 11 8 11 3 0 11 4 11 10 0 2 10 7 14 11 5 2 9 6 9 10 0 4 0 6 0 6 l 4 2 z"/>
-		<path id="reg10" d="M -531 3012 c 0 0 4 -3 6 -5 0 0 8 5 10 5 3 0 15 -3 17 -3 4 0 17 -2 21 -2 2 0 23 -8 23 -10 0 0 6 -13 10 -13 4 0 9 11 11 13 4 4 12 8 14 8 2 0 7 2 21 9 13 4 11 -19 11 -21 0 -4 4 -4 8 -4 2 0 4 -2 4 -5 0 -4 -6 -8 -8 -10 -4 -2 4 -2 6 -6 2 0 8 0 10 0 5 4 7 2 7 0 2 -2 10 -4 10 -6 0 -5 -4 -15 -4 -17 0 -2 6 -15 6 -19 0 -2 6 0 8 2 0 0 5 -2 7 -2 4 0 12 -6 12 -10 0 -4 4 -9 11 -9 6 0 14 -6 14 -8 0 -4 13 4 15 6 4 4 10 7 10 7 0 0 11 4 15 8 2 4 8 8 8 10 0 4 6 11 10 11 5 0 9 8 9 8 0 2 8 13 10 15 2 2 23 16 27 16 2 4 13 4 19 0 6 0 25 4 29 4 4 3 6 -10 13 -12 4 -2 18 -6 18 -6 0 0 9 14 9 21 0 6 -2 20 2 20 2 0 14 5 14 9 0 4 -10 10 -4 16 9 5 15 13 15 17 0 4 -4 4 -4 8 0 5 -7 11 -7 11 0 -2 -6 4 -6 6 0 2 0 19 0 19 0 0 -12 6 -14 0 -5 -2 -7 -13 -9 -15 -4 -4 -12 -10 -12 -8 0 4 -11 2 -19 0 -4 -2 -12 -4 -12 -2 0 2 -7 4 -11 0 -2 -4 -10 0 -10 0 0 2 -9 6 -13 2 -4 -4 -16 -2 -21 -2 -2 0 -14 -11 -16 -11 -4 0 -15 5 -19 0 -2 -4 -13 -8 -15 -4 0 0 -8 4 -10 4 -2 -2 -19 -4 -19 -4 0 4 -23 27 -31 27 -6 -2 -21 -10 -21 -14 0 -4 -4 -9 -10 -4 -6 4 -13 6 -11 10 0 2 -4 8 -8 8 0 0 -6 0 -6 7 2 6 6 22 10 22 4 3 19 11 19 13 2 4 17 17 19 21 2 4 6 12 6 16 0 3 -2 13 0 15 0 2 2 19 10 19 7 0 15 6 19 14 0 9 15 17 21 19 6 4 17 6 17 13 0 6 4 12 8 12 6 0 14 8 17 13 2 2 18 2 18 6 0 8 11 21 9 21 -2 0 -13 2 -11 2 0 4 11 12 11 12 2 0 8 0 12 4 2 3 6 11 8 11 3 0 11 4 11 10 0 2 10 7 14 11 5 2 9 6 9 10 0 4 0 6 0 6 0 0 -11 -4 -13 -6 -4 -2 -6 -14 -10 -14 -4 0 -19 -11 -23 -11 -4 0 -25 -10 -31 -14 -7 -5 -29 -13 -29 -15 0 -4 18 -2 22 2 5 4 15 13 21 10 4 -4 -12 -18 -18 -22 -7 -3 -17 -11 -21 -17 -7 -6 -34 -23 -38 -25 -4 0 -16 -4 -16 -6 -2 -5 -11 -7 -13 -2 -2 2 -23 8 -25 2 -2 -7 -2 -34 -6 -34 -4 0 -6 7 -13 2 -8 -6 -10 -6 -10 -8 0 -4 -8 -10 -13 -15 -4 -4 -16 -22 -16 -29 0 -6 0 -8 4 -8 4 0 15 4 17 6 2 2 4 6 8 6 2 0 2 -4 0 -6 -2 -4 -15 -6 -15 -6 -2 0 -12 -15 -14 -21 -6 -8 -11 -14 -15 -17 -2 -4 -6 -18 -4 -25 2 -6 0 -29 -2 -31 -2 -4 -19 -23 -25 -25 -6 -2 -19 -6 -19 -4 0 0 -6 15 -6 17 -2 0 -4 12 -4 18 0 9 -4 11 -6 7 -3 -7 -7 -13 -7 -7 0 7 -2 15 -4 15 0 0 -2 10 -2 15 0 2 -6 4 -6 0 -2 -7 -9 -23 -13 -32 -4 -10 -12 -45 -12 -45 z"/>
-		<path id="reg35" d="M -312 2857 c 0 0 -7 0 -9 0 -2 0 -6 2 -6 5 0 2 -4 6 -6 6 -2 0 -15 -2 -15 2 0 4 -4 8 -6 8 -4 0 -36 0 -38 0 0 0 -18 11 -20 11 -3 2 -13 6 -15 8 -2 2 -8 10 -13 8 -4 -2 -8 -6 -14 -6 -6 0 -13 0 -15 -2 -4 -2 -10 -6 -10 -6 -2 0 -15 -4 -15 -4 -2 0 -23 0 -23 0 0 0 -2 8 -4 12 -4 2 -16 2 -21 4 -4 0 2 13 5 13 4 0 6 0 12 0 6 4 -4 10 -8 14 -4 4 2 13 6 15 6 0 8 6 8 12 0 5 7 11 11 11 4 4 8 4 10 8 2 4 2 15 -2 17 -4 2 -15 0 -15 0 0 0 -4 2 -6 4 -4 4 -6 0 -10 4 -6 2 0 11 0 11 0 0 4 -3 6 -5 0 0 8 5 10 5 3 0 15 -3 17 -3 4 0 17 -2 21 -2 2 0 23 -8 23 -10 0 0 6 -13 10 -13 4 0 9 11 11 13 4 4 12 8 14 8 2 0 7 2 21 9 13 4 11 -19 11 -21 0 -4 4 -4 8 -4 2 0 4 -2 4 -5 0 -4 -6 -8 -8 -10 -4 -2 4 -2 6 -6 2 0 8 0 10 0 5 4 7 2 7 0 2 -2 10 -4 10 -6 0 -5 -4 -15 -4 -17 0 -2 6 -15 6 -19 0 -2 6 0 8 2 0 0 5 -2 7 -2 4 0 12 -6 12 -10 0 -4 4 -9 11 -9 6 0 14 -6 14 -8 0 -4 13 4 15 6 4 4 10 7 10 7 0 0 -4 -3 -4 -5 -2 -4 -6 -12 -6 -12 0 -4 -4 -6 -7 -8 -2 -3 0 -7 0 -7 3 0 3 -6 3 -10 0 -2 -13 -2 -13 -4 -4 0 -6 -9 -10 -9 -2 0 -2 -2 -2 -2 0 0 -5 2 -5 2 l 3 0 z"/>
-		<path id="reg26" d="M 92 3555 c 0 0 4 0 8 -2 4 -4 8 0 10 0 3 0 15 0 17 -2 4 -4 13 0 17 0 2 2 14 0 14 -6 0 -4 9 -23 13 -23 4 0 17 -6 19 -8 2 -2 12 -2 14 -2 2 0 15 4 19 2 6 -2 12 -7 12 -11 0 -4 -2 -14 3 -14 2 0 6 0 6 0 0 0 -2 -21 -2 -23 0 -4 0 -15 2 -17 2 -2 10 -10 8 -12 -4 -3 -14 -21 -14 -21 0 -2 -15 -7 -17 -11 0 -2 -21 -21 -21 -21 0 0 -6 -6 -15 -6 -8 0 -35 4 -35 6 0 3 -8 7 -15 7 -6 0 -22 0 -22 2 0 2 -9 12 -9 10 0 0 -12 -8 -12 -6 0 2 -23 12 -23 15 0 2 -2 16 -2 16 0 0 -9 2 -9 4 0 2 -8 2 -8 2 l 0 3 c 0 0 -17 8 -19 8 0 0 -4 12 -4 14 0 0 4 5 6 3 0 0 -6 20 -4 25 4 4 0 12 0 16 0 4 4 17 4 17 0 0 9 4 11 8 0 2 6 4 6 9 0 6 -2 14 0 14 4 0 10 -6 10 -6 0 0 17 6 17 6 0 0 -2 13 2 13 4 0 2 2 2 2 l 11 -11 z"/>
-		<path id="reg19" d="M 46 2939 c 0 0 8 -2 10 -7 2 -2 7 -4 11 -4 4 0 6 -6 12 -12 2 -7 9 -38 21 -48 13 -11 33 -42 33 -52 0 -11 13 -25 13 -29 0 -7 -2 -19 2 -21 6 -2 37 -19 37 -17 3 0 15 0 15 -6 2 -6 2 -23 2 -23 0 0 -4 -8 -8 -11 0 -2 -15 -6 -15 -8 0 -4 0 -12 -4 -12 -4 0 -6 -5 -10 -9 -5 -2 -5 -6 -13 -6 -10 0 -12 2 -12 2 0 0 -7 -2 -11 2 0 2 -12 9 -12 6 0 -2 -17 -25 -19 -25 -2 0 -23 0 -23 5 0 4 4 6 -8 4 -13 -2 -21 -4 -23 -2 0 0 -9 6 -9 6 l -2 0 c 0 0 -2 0 -6 0 -4 0 -8 8 -8 15 0 6 -6 12 -13 12 -4 0 -10 6 -14 10 -2 7 -19 -2 -25 -2 -7 -2 -13 13 -17 17 -2 4 -15 -2 -17 -2 -6 0 -18 2 -25 2 -6 0 -12 10 -12 13 0 6 -15 14 -19 16 -4 4 -48 9 -56 9 -11 0 -31 -19 -34 -23 -4 -2 -16 -13 -16 -13 0 0 -15 6 -19 6 -4 0 -8 2 -6 5 6 4 21 14 19 16 -3 4 -15 11 -19 11 -2 0 -17 -13 -21 -15 -2 0 -19 4 -19 8 0 0 6 9 9 9 2 2 2 6 4 10 0 4 0 8 -2 11 -5 0 -15 4 -15 8 0 2 0 12 2 12 2 2 8 7 8 7 0 0 -2 10 -4 10 -2 0 2 6 2 6 2 4 -4 9 -6 9 -2 0 -10 0 -10 4 0 2 -6 14 -6 14 l -3 0 c 0 0 5 -2 5 -2 0 0 0 2 2 2 4 0 6 9 10 9 0 2 13 2 13 4 0 4 0 10 -3 10 0 0 -2 4 0 7 3 2 7 4 7 8 0 0 4 8 6 12 0 2 4 5 4 5 0 0 11 4 15 8 2 4 8 8 8 10 0 4 6 11 10 11 5 0 9 8 9 8 0 2 8 13 10 15 2 2 23 16 27 16 2 4 13 4 19 0 6 0 25 4 29 4 4 3 6 -10 13 -12 4 -2 18 -6 18 -6 0 0 23 -4 25 -7 5 -4 13 -8 17 -4 6 7 19 4 21 -2 0 -4 12 -14 19 -12 6 0 21 -2 25 0 6 0 25 4 25 4 l 27 -6 z"/>
-		<path id="reg34" d="M 146 2672 c 0 0 -6 -15 -4 -21 4 -6 12 -25 12 -31 0 -4 9 -25 15 -27 0 0 -13 -2 -19 -6 -4 -3 -15 -11 -17 -13 -4 0 -20 -4 -25 -2 -4 0 -8 -8 -12 -8 -4 -2 -15 -2 -15 0 0 2 -6 4 -10 2 -6 -2 -11 -4 -15 -4 -4 0 -8 -3 -12 -3 -4 0 -11 9 -11 9 0 0 -4 -4 -6 -4 -4 -2 -8 0 -12 2 0 6 -15 8 -23 8 -9 2 -15 -10 -15 -12 0 -3 -6 -11 -10 -15 -5 -6 -9 -6 -11 -4 -2 0 -12 10 -12 14 0 5 -15 13 -17 13 -2 0 -6 -4 -6 -4 0 -2 -11 -7 -11 -7 l -2 0 c 0 0 -12 3 -16 3 -2 0 -17 -5 -17 0 -2 4 -4 12 -10 12 -3 0 -9 0 -9 4 0 4 -8 4 -8 13 0 6 -8 16 -8 18 0 0 -19 15 -19 15 0 2 -17 13 -17 15 0 2 -8 2 -12 0 -2 -2 -17 -7 -19 -7 0 0 -8 5 -8 7 0 4 -11 12 -11 12 0 0 4 6 2 13 0 4 -6 16 -6 20 -2 3 4 13 4 17 0 4 -2 11 0 11 2 0 13 2 15 8 0 4 2 6 2 6 0 0 12 11 16 13 5 4 23 23 34 23 8 0 52 -5 56 -9 4 -2 19 -10 19 -16 0 -3 6 -13 12 -13 7 0 19 -2 25 -2 2 0 15 6 17 2 4 -4 10 -19 17 -17 6 0 23 9 25 2 4 -6 10 -10 14 -10 7 0 13 -6 13 -12 0 -7 4 -15 8 -15 4 0 6 0 6 0 l 2 0 c 0 0 9 -6 9 -6 2 -2 10 0 23 2 12 2 8 0 8 -4 0 -5 21 -5 23 -5 2 0 19 23 19 25 0 3 12 -4 12 -6 4 -4 11 -2 11 -2 l 6 -4 z"/>
-		<path id="reg32" d="M 648 2968 c 0 0 -8 -27 -8 -31 -2 -5 -7 -9 -7 -13 0 -2 5 -19 2 -21 -2 -2 -6 -19 0 -23 5 -2 7 -10 7 -14 -2 -4 2 -17 -2 -21 -5 -4 -17 -36 -17 -36 -2 -2 -44 -47 -44 -50 0 -2 -21 -22 -25 -27 l 0 -2 c 0 0 -6 -10 -6 -12 0 0 -6 -15 -6 -19 -2 -6 -27 -23 -29 -27 -3 -2 -15 -2 -15 -2 l 2 2 c 0 0 -10 6 -15 6 -4 0 -16 9 -22 13 -7 6 -17 14 -21 14 -4 0 -42 7 -42 7 -4 2 -15 20 -17 22 -4 3 -23 0 -25 -4 -4 -2 -27 -16 -29 -18 -2 -3 -23 16 -25 16 -4 0 -33 -6 -44 -4 -8 4 -16 -10 -20 -12 -7 -5 -15 2 -15 4 -2 4 -23 4 -23 4 0 0 0 17 -2 23 0 6 -12 6 -15 6 0 -2 -31 15 -37 17 -4 2 -2 14 -2 21 0 4 -13 18 -13 29 0 10 -20 41 -33 52 -12 10 -19 41 -21 48 -6 6 -8 12 -12 12 -4 0 -9 2 -11 4 -2 5 -10 7 -10 7 0 0 -6 2 -8 2 0 0 -9 8 -17 10 -6 4 17 17 21 17 6 2 14 10 14 12 0 4 2 29 2 36 0 8 15 16 21 16 2 -2 4 2 4 7 0 2 19 10 21 10 2 0 6 10 6 15 3 4 -10 4 -10 4 0 2 0 14 0 19 0 2 13 6 17 8 6 0 8 8 8 8 0 2 4 2 8 4 5 2 25 15 34 17 8 2 12 -12 14 -15 0 -4 17 -8 21 -8 4 0 11 11 11 15 0 4 -7 6 -11 2 -4 -4 -12 4 -12 8 -2 0 12 21 18 27 5 9 11 11 11 11 0 0 0 0 0 0 0 0 21 8 21 12 0 4 -17 25 -9 27 9 0 54 -4 57 -4 4 0 64 10 70 8 7 0 59 -2 63 -2 4 0 29 9 35 7 7 -3 27 -19 32 -25 2 -7 31 -32 43 -32 11 0 40 -12 46 -12 4 0 25 10 29 10 4 0 17 -8 21 -6 4 0 17 0 17 6 2 9 23 17 27 17 2 0 12 4 14 4 5 0 15 -4 15 -4 0 0 4 -19 4 -27 0 -9 0 -21 -4 -25 -2 -4 0 -11 0 -15 0 -4 15 -29 13 -31 0 -4 -7 4 -9 4 0 0 0 -10 0 -14 -2 -5 -8 -9 -8 -9 l 4 0 c 0 0 8 -4 8 -4 2 0 5 -10 2 -15 0 -2 -2 -4 -2 -8 0 -4 17 -4 19 -4 0 0 -4 4 -6 6 -4 0 4 9 4 11 0 0 -4 10 -4 10 0 4 17 -4 17 -4 2 0 22 -17 27 -19 4 -6 2 -31 2 -33 0 -4 6 -4 6 -13 0 -4 0 -6 0 -6 0 0 -31 -19 -33 -10 0 8 -32 20 -36 20 -4 0 -8 9 -12 9 -7 0 -29 -2 -32 -4 0 -2 -12 -15 -12 -21 -4 -6 -8 -25 -8 -29 l 8 29 z"/>
-		<path id="reg09" d="M 529 3424 c 0 0 -19 -8 -19 -2 0 4 17 17 17 21 2 4 8 16 4 16 -4 0 -8 11 -12 11 0 0 -19 10 -29 10 -9 0 -21 0 -23 0 0 0 -13 -4 -13 -4 -2 -4 -19 -6 -33 -4 -13 2 -17 -10 -17 -15 0 -4 -10 -6 -14 -6 -7 0 -34 0 -36 0 -4 0 -4 17 -4 19 0 2 -12 4 -17 6 -2 2 -16 11 -23 11 -4 0 -16 -7 -18 -7 -4 0 -34 11 -38 11 -2 0 -10 -2 -10 -2 0 0 -2 -21 -2 -23 0 -4 0 -15 2 -17 2 -2 10 -10 8 -12 -4 -3 -14 -21 -14 -21 0 -2 -15 -7 -17 -11 0 -2 -21 -21 -21 -21 0 0 17 -20 17 -27 0 -4 -4 -16 -11 -16 -4 0 -8 -2 -8 -2 0 0 6 -25 6 -25 0 0 21 -2 25 -11 4 -8 11 -21 4 -25 -6 -6 -27 -31 -27 -35 0 -4 4 -11 -2 -15 -4 -2 -8 -16 -8 -25 2 -8 6 -16 10 -19 2 -2 13 -20 13 -20 0 0 21 8 21 12 0 4 -17 25 -9 27 9 0 54 -4 57 -4 4 0 64 10 70 8 7 0 59 -2 63 -2 4 0 29 9 35 7 7 -3 27 -19 32 -25 2 -7 31 -32 43 -32 11 0 40 -12 46 -12 4 0 25 10 29 10 4 0 17 -8 21 -6 4 0 17 0 17 6 2 9 23 17 27 17 2 0 12 4 14 4 5 0 15 -4 15 -4 0 0 0 21 2 23 2 2 2 14 -2 14 -2 2 -8 15 -12 13 -3 -2 -21 -2 -21 0 0 4 -7 19 -13 19 -6 0 0 4 0 10 0 6 -6 15 -6 15 0 0 0 29 0 29 0 2 -4 25 -8 25 -5 0 -15 4 -15 6 0 2 -4 6 0 6 4 0 19 -2 21 2 2 5 2 13 2 17 0 4 -2 2 -2 2 0 0 8 13 12 13 5 2 11 14 11 14 l 2 0 c 0 0 -11 -2 -15 0 -4 4 -8 4 -12 0 -2 0 -15 -2 -19 -2 -6 2 -17 -2 -23 -2 -4 -2 -14 6 -14 10 0 7 -11 3 -15 3 -4 -3 -8 4 -8 4 0 0 -11 0 -11 0 0 0 -6 16 -6 16 0 0 -6 0 -8 0 -5 0 -11 15 -11 15 l 0 2 z"/>
-		<g id="reg18">
-			<path id="reg18a" d="M 350 4155 c 0 0 -6 0 -6 -2 0 -4 -9 -4 -9 -2 0 2 3 11 3 15 0 6 -3 18 0 21 2 0 27 0 31 2 2 0 19 4 23 4 6 0 23 0 25 0 0 0 16 6 18 6 5 0 15 2 15 6 2 4 -4 15 0 15 4 0 21 -4 27 -4 8 0 36 -7 40 -7 2 0 37 -4 41 -4 7 0 32 -4 34 -6 0 -4 6 -19 6 -23 0 -4 4 -10 2 -10 0 0 -15 12 -19 12 -4 0 -14 2 -18 6 0 0 -17 7 -17 3 0 -5 4 -19 4 -19 0 -2 -2 -2 -12 0 -11 0 -21 6 -21 6 0 0 -27 -2 -32 -6 -2 0 -8 -6 -14 -6 -4 0 -31 4 -36 4 -2 0 -22 6 -27 4 -4 -2 -12 -6 -14 -6 -2 0 -13 -2 -9 -7 5 -2 11 -4 7 -4 -4 -2 -13 0 -15 0 -2 0 -17 4 -17 0 -2 -2 -2 -12 -4 -12 -4 0 -6 14 -8 14 l 2 0 z"/>
-			<path id="reg18b" d="M 406 3862 c 0 0 -10 -3 -10 -3 0 -2 -8 7 -15 0 -4 -6 -27 -43 -29 -43 -2 0 -35 0 -35 -4 0 -7 -11 -15 -15 -17 -6 -4 -25 -19 -31 -21 -6 -2 -13 0 -15 0 -2 0 -14 2 -10 0 0 0 17 -10 19 -15 2 -4 20 -12 25 -8 4 4 12 25 23 25 10 0 18 2 25 4 4 2 27 4 27 13 2 8 12 41 14 44 4 2 27 2 27 4 2 4 2 18 0 18 l 0 3 z"/>
-			<path id="reg18c" d="M 92 3555 c 0 0 4 0 8 -2 4 -4 8 0 10 0 3 0 15 0 17 -2 4 -4 13 0 17 0 2 2 14 0 14 -6 0 -4 9 -23 13 -23 4 0 17 -6 19 -8 2 -2 12 -2 14 -2 2 0 15 4 19 2 6 -2 12 -7 12 -11 0 -4 -2 -14 3 -14 2 0 6 0 6 0 0 0 8 2 10 2 4 0 34 -11 38 -11 2 0 14 7 18 7 7 0 21 -9 23 -11 5 -2 17 -4 17 -6 0 -2 0 -19 4 -19 2 0 29 0 36 0 4 0 14 2 14 6 0 5 4 17 17 15 14 -2 31 0 33 4 0 0 13 4 13 4 2 0 14 0 23 0 10 0 29 -10 29 -10 4 0 8 -11 12 -11 4 0 -2 -12 -4 -16 0 -4 -17 -17 -17 -21 0 -6 19 2 19 2 0 0 19 6 21 8 2 0 2 9 4 13 4 4 2 14 2 21 2 6 -14 18 -18 21 -5 2 2 14 2 20 2 2 -7 17 -11 21 -2 4 -2 9 -6 13 -4 4 -8 4 -8 4 l -5 0 c 0 0 -6 -8 -16 -11 -11 0 -31 -4 -31 -4 0 0 -25 0 -28 0 -2 0 -18 9 -25 7 -4 0 -33 -5 -33 -3 0 3 -8 17 -14 17 -7 0 -19 8 -23 4 -5 -2 -19 -2 -19 -2 0 2 -6 13 4 21 10 10 -2 15 6 19 13 2 25 6 29 8 5 4 17 19 17 23 0 2 -6 0 -10 -4 -4 -4 -15 -11 -17 -11 -2 0 -33 -10 -33 -4 0 4 10 13 14 15 4 0 13 4 13 8 2 4 10 17 10 21 0 4 -8 4 -8 2 0 -2 -17 -21 -21 -21 -6 -2 -21 -14 -27 -14 -4 0 -13 4 -2 18 10 13 35 23 35 25 0 3 -25 3 -29 0 -4 -4 -8 -10 -8 -14 -2 -4 -13 -6 -13 -11 0 -4 2 -16 -2 -16 -4 -2 -21 -9 -23 -11 -4 -6 -16 -10 -16 -14 0 -6 10 -9 10 -13 0 -4 -12 -6 -21 4 -6 9 -8 17 -6 23 0 7 -4 19 -2 25 2 7 10 15 12 17 2 4 9 10 13 17 0 0 4 4 4 6 0 2 0 4 0 8 0 4 13 13 17 15 6 4 14 17 21 27 6 8 -7 15 -9 17 -6 2 -16 2 -19 0 -2 -2 13 -7 15 -7 4 0 -4 -10 -10 -12 -7 -2 -19 4 -19 10 2 2 10 9 10 11 0 6 7 6 9 6 2 4 -9 8 -13 12 -6 5 -23 9 -29 9 -4 0 0 4 10 8 9 2 15 6 25 8 13 5 11 11 19 11 8 0 17 12 19 12 0 2 14 0 14 0 0 0 7 13 7 15 2 2 14 2 23 6 8 4 18 19 14 19 -4 0 -2 4 -2 8 2 2 8 21 8 25 0 7 0 17 -6 17 -6 2 -19 -15 -23 -19 -4 -6 -27 -12 -35 -10 -8 2 -25 12 -25 16 0 5 10 13 10 17 0 4 2 11 4 11 0 2 13 0 13 0 0 0 4 8 4 8 0 0 2 2 4 2 0 2 4 4 4 8 0 2 -20 0 -20 4 0 7 -11 11 -15 11 -2 0 -2 -8 -2 -13 0 -6 -15 -8 -19 -8 -6 2 -6 17 -2 19 2 2 8 6 6 10 -2 4 7 11 7 15 2 2 4 10 4 12 0 2 4 13 4 15 0 4 6 8 6 10 2 2 -4 15 -4 17 0 2 10 8 10 10 3 2 9 7 7 11 -2 2 -11 -4 -17 -6 -4 0 -12 -7 -12 -9 0 -4 -7 -2 -11 -4 -2 0 -4 -8 -4 -12 0 -5 -6 -7 -10 -7 -5 0 -9 7 -9 11 0 2 -6 8 -8 10 -2 2 4 13 4 17 2 2 4 14 2 14 -2 2 -14 -10 -17 -12 0 -2 0 -19 0 -23 0 -6 -8 -10 -10 -17 0 -6 -6 -10 -10 -10 -5 2 -5 -2 -5 -11 0 -6 -8 -2 -12 0 -4 0 0 21 0 30 0 8 -13 2 -13 0 -2 -7 -10 -7 -12 -7 -2 -2 -2 -16 -8 -23 -7 -8 -2 -27 -2 -29 0 -4 2 -10 2 -14 -2 -4 -15 -21 -15 -21 0 0 -8 -4 -12 -4 -5 -2 -9 -9 -9 -13 0 -6 -4 -6 -10 -10 -6 -4 2 -13 4 -15 2 0 10 -21 10 -25 0 -4 17 -2 25 -2 7 0 9 -8 13 -12 6 -7 17 -2 21 -2 6 0 23 12 27 12 2 0 19 8 25 8 4 0 14 2 16 5 3 2 17 16 21 12 2 -4 -6 -6 -6 -10 0 -5 2 -7 4 -5 4 0 21 -2 21 -4 0 -4 -17 -8 -21 -8 -4 0 -19 -4 -19 -13 -2 -6 -16 0 -18 3 -2 2 -7 -5 -9 -9 -2 -4 -6 0 -8 2 -2 2 -21 2 -23 0 -4 -2 -19 2 -23 2 -6 0 -19 -4 -25 2 -8 5 -12 0 -12 -2 -2 -4 -17 0 -21 0 -4 5 -11 0 -11 -2 0 -4 -2 -10 -4 -14 -2 -4 -4 -15 -8 -17 -2 0 -4 -2 -6 -4 -2 -4 -2 -8 -7 -8 -6 0 -6 -3 -6 -9 0 -6 9 -6 13 -6 4 0 16 4 21 4 6 0 -3 -10 -5 -12 -2 -2 -14 0 -18 -2 -5 -5 -11 2 -15 2 -4 0 -6 -7 -6 -9 -2 -2 -9 -12 -9 -12 l -2 0 c 0 0 -18 -15 -18 -21 0 -4 0 -10 -5 -13 -2 -2 -4 -4 -4 -8 0 -4 -4 -8 -8 -10 -6 -4 -2 -9 -2 -9 0 0 14 -2 19 0 0 2 4 0 4 -4 0 -6 0 -10 4 -14 6 -2 2 -7 2 -11 -2 -6 8 -4 8 -4 0 0 2 -6 5 -6 2 0 10 -2 10 -4 0 0 4 -9 10 -11 5 -2 13 -10 13 -14 2 -5 4 -9 8 -11 4 -2 6 -12 4 -14 -2 -5 2 -13 0 -15 -2 0 0 -10 0 -10 l 9 -9 z"/>
-		</g>
-		<path id="reg27" d="M 554 2732 c 4 5 25 25 25 27 0 3 42 48 44 50 0 0 12 32 17 36 4 4 0 17 2 21 0 4 -2 12 -7 14 -6 4 -2 21 0 23 3 2 -2 19 -2 21 0 4 5 8 7 13 0 4 8 31 8 31 0 0 17 -9 17 -17 0 -6 0 -23 10 -29 10 -4 19 -29 19 -33 0 -7 -6 -21 -4 -25 2 -5 -2 -15 2 -19 2 -6 12 -6 14 2 2 6 0 17 7 17 2 0 6 -17 8 -21 4 -4 12 2 12 4 2 4 9 4 9 2 4 -2 4 -10 8 -6 2 2 8 4 13 4 4 0 18 -2 18 -2 0 0 -12 -11 -14 -11 -4 0 -15 -4 -13 -8 2 -4 6 -4 6 -4 0 0 -6 -8 -8 -13 -2 -4 -4 -8 -2 -14 2 -4 8 -8 0 -15 -10 -4 -19 7 -19 7 0 0 -6 -3 -6 -9 2 -4 -6 -16 -8 -21 -2 -4 0 -8 2 -12 2 -2 0 -13 -2 -15 0 0 -11 -4 -15 -4 -2 0 -14 0 -14 -4 0 -4 -5 -23 -5 -29 2 -4 0 -15 -4 -17 -4 -4 -14 2 -16 0 0 0 -11 -19 -21 -21 -11 0 -19 9 -19 4 -2 -2 0 -6 -10 -4 -11 0 -13 0 -15 -2 0 -2 -15 -14 -21 -16 -4 -3 -17 -3 -17 -3 0 0 -10 11 -14 11 -4 0 -17 6 -17 6 0 0 -6 8 -12 4 -7 -4 -15 -4 -17 0 0 2 -2 15 -2 15 0 0 12 0 15 2 2 4 27 21 29 27 0 6 6 19 6 19 0 2 6 12 6 12 l 0 2 z"/>
-		<g id="reg39">
-			<path id="reg39a" d="M 648 2968 c 0 0 17 -9 17 -17 0 -6 0 -23 10 -29 10 -4 19 -29 19 -33 0 -7 -6 -21 -4 -25 2 -5 -2 -15 2 -19 2 -6 12 -6 14 2 2 6 0 17 7 17 2 0 6 -17 8 -21 4 -4 12 2 12 4 2 4 9 4 9 2 4 -2 4 -10 8 -6 2 2 8 4 13 4 4 0 18 -2 18 -2 l 4 0 c 0 0 -4 10 3 12 6 5 12 11 14 11 4 0 8 2 8 8 0 6 -10 27 -10 27 0 0 -8 4 -10 9 0 4 -11 6 -11 6 0 0 0 8 0 8 0 0 -2 6 -2 6 0 0 0 7 0 7 -2 0 -10 2 -10 0 0 -2 -9 -17 -9 -9 0 7 -4 27 0 27 5 0 13 -4 13 2 2 7 2 15 2 15 0 0 -31 -19 -33 -10 0 8 -32 20 -36 20 -4 0 -8 9 -12 9 -7 0 -29 -2 -32 -4 0 -2 -12 -15 -12 -21 -4 -6 -8 -25 -8 -29 l 8 29 z"/>
-			<path id="reg39b" d="M 1427 2318 c 0 0 17 6 17 16 0 11 12 19 12 25 0 7 -6 17 -10 17 -2 0 -13 11 -8 17 6 4 18 4 18 16 0 11 -18 0 -12 11 4 12 -2 23 -2 25 0 2 8 12 12 19 2 6 9 16 9 25 0 10 -3 35 -7 35 -2 0 -29 23 -29 23 l -6 0 c 0 0 -8 0 -11 0 -4 0 -10 4 -12 8 0 4 -19 19 -21 21 -4 2 -4 15 -4 17 2 6 4 12 4 19 -4 4 0 29 0 29 l -4 2 c 0 0 -6 0 -13 2 -6 2 -14 6 -18 6 -4 0 -9 4 -9 4 -4 4 -12 23 -18 23 -7 0 -30 29 -30 31 -2 3 -4 -4 -8 -4 -6 0 -35 29 -37 32 -2 0 2 -7 0 -9 -5 -4 -17 2 -23 4 -7 2 -21 25 -27 25 -7 0 -7 -8 -7 -14 0 -4 -4 -6 -8 -6 -4 4 4 25 4 29 2 4 2 0 9 2 4 0 0 4 -5 10 -2 6 -16 31 -20 31 -3 0 8 -22 12 -22 0 0 2 -9 0 -13 -2 -6 -4 0 -6 0 -2 0 -4 0 -6 0 -3 0 -3 10 -3 17 0 4 -18 14 -20 16 -5 0 -5 9 -5 11 -2 4 -4 8 -8 8 -4 0 -6 -4 -8 -6 0 -4 -2 -6 -6 -8 -5 -3 -3 6 -5 6 -4 0 -6 -4 -6 -6 0 -3 -2 -5 -4 -5 -2 -2 0 7 0 7 -4 4 -6 10 -8 8 -2 -2 -23 -6 -27 -4 -5 0 0 4 4 4 2 0 10 8 10 10 0 5 8 0 8 -2 0 0 9 0 11 7 6 2 2 -7 2 -7 2 0 8 2 17 2 10 2 10 5 12 7 4 0 13 -5 11 0 -7 6 -7 14 -7 14 0 0 15 -10 15 -10 0 0 4 12 4 12 0 0 13 2 19 13 6 8 6 23 6 23 0 0 15 2 17 2 4 0 14 4 14 4 0 0 -27 -27 -35 -38 -8 -12 -17 -12 -17 -20 -4 -9 -14 -21 -14 -21 0 0 14 -11 14 -11 0 0 2 23 6 30 3 4 21 31 38 41 17 13 27 11 27 11 0 0 13 -9 15 -13 0 -6 4 -6 4 -2 0 4 8 6 10 2 4 -6 4 -12 6 -14 5 -5 38 -5 38 -5 0 0 4 11 0 11 -4 0 -10 -4 -10 0 0 2 6 8 6 14 0 7 -2 21 -11 27 -8 7 -14 3 -16 7 -2 0 -13 8 -17 2 -4 -4 -6 -9 -10 -9 -5 0 -7 3 -7 3 l -2 0 c 0 0 -10 4 -10 10 -2 6 -8 10 -13 15 -4 2 -8 6 -8 8 0 4 -4 10 -6 12 -4 2 -17 5 -23 7 -4 2 -15 8 -17 16 -4 11 -29 34 -35 38 -4 6 -21 12 -23 10 -2 -4 -13 -6 -19 -8 -8 -2 -6 -13 -4 -13 2 0 8 -10 4 -14 -2 -4 4 -19 4 -25 0 -4 -14 -13 -16 -17 -2 -6 -9 -8 -19 -8 -8 0 -15 -2 -17 -9 -4 -4 -14 -6 -21 -2 -2 2 -18 9 -25 0 -4 -6 17 -25 17 -25 0 0 25 -27 25 -29 0 -4 8 0 8 0 0 0 11 -8 11 -10 0 0 12 -9 16 -9 5 0 9 -4 9 -8 0 -2 -6 -2 -11 -2 -2 -2 -2 -15 -2 -19 -2 -4 -8 4 -8 7 0 2 -13 2 -13 2 -2 -2 -18 -5 -20 -5 -5 0 -5 9 -5 11 -2 2 -20 -2 -27 2 -2 2 -25 4 -31 4 -8 0 -2 -6 -4 -10 0 -2 -4 4 -13 2 -10 0 -4 -13 -12 -9 -8 5 -13 0 -13 -2 0 -2 17 -6 17 -10 0 -2 -8 -4 -10 -4 -2 0 -11 0 -17 0 -6 0 -6 -9 -6 -9 0 0 41 -2 50 -2 8 2 6 0 4 -4 -2 -2 -10 -6 -17 -4 -4 2 -2 -2 -8 -6 -4 -6 -10 -19 -10 -21 0 -4 -3 -10 -5 -15 -2 -4 -14 -16 -14 -16 l 0 -2 c 0 0 6 23 6 25 2 2 6 0 6 6 0 4 -4 8 0 12 2 5 7 11 0 15 -6 2 -14 2 -14 2 0 0 -11 8 -11 4 0 -6 2 -21 0 -21 -2 0 -10 21 -12 21 -2 0 -17 6 -23 9 -4 4 -8 6 -15 2 -6 -5 -14 -13 -12 -13 0 0 10 15 10 15 0 0 -8 -2 -10 -4 -4 -3 -13 -9 -13 -9 0 0 0 4 0 6 4 3 23 13 23 21 2 4 -2 25 -4 25 -2 0 -4 15 -6 15 -2 -2 -11 -6 -13 -11 0 -2 -4 -6 -8 -8 -6 -4 -13 -6 -13 -6 l -4 0 c 0 0 -12 -11 -14 -11 -4 0 -15 -4 -13 -8 2 -4 6 -4 6 -4 0 0 -6 -8 -8 -13 -2 -4 -4 -8 -2 -14 2 -4 8 -8 0 -15 -10 -4 -19 7 -19 7 0 0 -6 -3 -6 -9 2 -4 -6 -16 -8 -21 -2 -4 0 -8 2 -12 2 -2 0 -13 -2 -15 0 0 -11 -4 -15 -4 -2 0 -14 0 -14 -4 0 -4 -5 -23 -5 -29 2 -4 0 -15 -4 -17 -4 -4 -14 2 -16 0 0 0 -11 -19 -21 -21 -11 0 -19 9 -19 4 -2 -2 0 -6 -10 -4 -11 0 -13 0 -15 -2 0 -2 -15 -14 -21 -16 -4 -3 -17 -3 -17 -3 0 0 -10 11 -14 11 -4 0 -17 6 -17 6 0 0 -6 8 -12 4 -7 -4 -15 -4 -17 0 0 2 -2 15 -2 15 l 2 2 c 0 0 -10 6 -15 6 -4 0 -16 9 -22 13 -7 6 -17 14 -21 14 -4 0 -42 7 -42 7 -4 2 -15 20 -17 22 -4 3 -23 0 -25 -4 -4 -2 -27 -16 -29 -18 -2 -3 -23 16 -25 16 -4 0 -33 -6 -44 -4 -8 4 -16 -10 -20 -12 -7 -5 -15 2 -15 4 -2 4 -23 4 -23 4 0 0 -4 -8 -8 -11 0 -2 -15 -6 -15 -8 0 -4 0 -12 -4 -12 -4 0 -6 -5 -10 -9 -5 -2 -5 -6 -13 -6 -10 0 -12 2 -12 2 l 6 -4 c 0 0 -6 -15 -4 -21 4 -6 12 -25 12 -31 0 -4 9 -25 15 -27 0 0 10 0 16 2 9 2 11 0 11 -2 -2 -2 -8 -9 -8 -11 0 -6 -3 -16 -7 -18 -4 0 -8 -5 -2 -5 6 0 9 -6 9 -8 0 -4 -3 -14 6 -19 6 -6 39 -50 41 -52 0 0 17 -23 28 -27 10 -6 27 -10 27 -16 0 -5 8 -19 4 -23 -2 -5 -21 -17 -19 -21 4 -4 10 -4 8 -11 -4 -6 -31 -31 -31 -37 0 -6 -6 -15 -10 -17 -2 -4 0 -10 0 -12 0 -4 -4 -13 -2 -13 2 0 6 0 6 0 0 0 12 0 17 4 2 2 27 -6 33 -10 6 -2 27 -21 42 -23 14 -4 54 -8 54 -8 0 0 108 -7 110 -4 0 6 6 8 11 8 4 -2 14 2 14 6 0 6 6 19 11 17 6 0 2 -15 8 -15 4 0 8 -8 12 -8 5 0 15 6 19 6 2 0 2 -6 6 -6 5 0 7 6 9 10 0 2 8 4 12 0 4 -4 11 -8 15 -4 2 6 10 4 14 6 2 2 9 13 11 5 4 -7 12 -17 16 -13 3 2 11 4 15 -2 6 -8 19 -10 23 -4 6 2 19 19 23 21 0 2 2 8 6 4 6 -4 4 -17 4 -23 0 -8 -2 -46 7 -56 8 -13 14 -13 14 -13 0 0 6 0 8 -4 5 -2 19 -10 23 -8 2 0 7 -5 7 -7 0 -4 -2 -12 -2 -12 -15 -11 -19 -33 -15 -46 0 0 33 4 40 2 6 -2 25 -21 33 -19 6 5 46 23 50 23 2 0 17 -6 17 -6 l 2 0 c 0 0 14 -8 25 -6 10 2 14 6 14 6 0 0 11 13 13 19 0 6 4 14 6 14 4 0 4 13 4 13 0 0 11 10 11 14 0 5 -13 9 -11 11 2 4 11 8 11 14 0 5 2 19 2 21 2 4 2 9 6 9 4 0 25 -7 29 -5 4 3 19 3 21 5 4 2 17 0 17 4 0 4 -5 10 -5 10 0 0 7 13 11 15 4 2 12 -2 12 2 0 4 0 19 0 21 0 2 19 21 21 21 2 0 13 4 17 -5 4 -8 14 -4 16 0 3 5 11 13 15 9 4 -4 15 -9 17 -4 4 6 12 8 16 0 5 -5 15 -11 19 -13 6 0 25 -17 25 -17 0 0 15 13 17 17 4 4 16 10 21 13 2 4 25 14 25 12 2 -2 4 -15 6 -15 4 0 23 -6 23 -2 0 0 27 7 31 11 2 4 10 10 10 6 3 -2 11 -10 17 -6 4 4 8 4 13 2 2 -4 16 -4 18 -2 5 2 13 12 13 12 l 6 -12 z"/>
-		</g>
-		<g id="reg41">
-			<path id="reg41a" d="M 515 3545 c 0 0 4 0 8 -4 4 -4 4 -9 6 -13 4 -4 13 -19 11 -21 0 -6 -7 -18 -2 -20 4 -3 20 -15 18 -21 0 -7 2 -17 -2 -21 -2 -4 -2 -13 -4 -13 -2 -2 -21 -8 -21 -8 l 0 -2 c 0 0 6 -15 11 -15 2 0 8 0 8 0 0 0 6 -16 6 -16 0 0 11 0 11 0 0 0 4 -7 8 -4 4 0 15 4 15 -3 0 -4 10 -12 14 -10 6 0 17 4 23 2 4 0 17 2 19 2 4 4 8 4 12 0 4 -2 15 0 15 0 l -4 0 c 0 0 6 6 6 6 0 3 0 7 0 11 0 6 4 8 6 10 2 4 4 13 4 17 0 2 7 6 13 12 8 7 25 13 29 13 4 0 27 8 31 8 2 0 15 0 15 0 0 0 -2 21 -11 27 -10 9 -39 0 -47 0 -7 0 -25 11 -32 13 -8 0 -10 2 -21 4 -10 0 -27 17 -33 31 -8 11 -50 36 -50 42 0 4 -23 23 -27 29 -4 6 -12 15 -12 15 l 0 2 c 0 0 -3 -4 0 -6 2 -3 2 -15 2 -17 0 -2 -5 -8 0 -11 6 -4 29 -18 33 -22 4 -3 12 -11 10 -13 -2 -6 -16 0 -20 0 -3 0 -42 4 -44 2 -2 -2 -9 -4 -9 -4 l 5 -2 z"/>
-			<path id="reg41b" d="M 1410 3884 c -8 9 -25 -6 -31 -6 -6 0 11 11 6 13 -2 2 -31 -7 -37 -11 -8 -4 -23 11 -40 29 -16 21 -10 36 -12 40 -2 4 -21 -2 -23 2 -2 4 -4 11 -8 11 -5 0 -15 6 -19 8 -6 4 -36 10 -40 10 -4 0 -16 7 -18 11 -5 2 -34 -4 -38 -4 -4 0 -23 -17 -29 -25 -4 -9 -27 -17 -27 -17 0 0 -65 -19 -71 -21 -6 0 -46 0 -50 4 -4 4 0 29 0 34 0 2 -6 20 -4 22 0 7 2 21 0 25 -2 3 -15 -2 -23 -2 -8 0 -27 13 -29 17 0 4 -21 2 -21 2 -2 -2 -29 -8 -31 -8 -5 0 -19 -11 -21 -13 -4 -2 -9 -33 -9 -33 0 -2 -12 -2 -12 -2 -2 0 -4 8 -4 12 0 2 0 9 -4 2 -5 -6 -9 -10 -15 -10 -4 0 -6 -4 -8 -8 -2 -4 -7 -2 -9 -2 -4 0 -6 -2 -10 -5 -2 -2 0 9 -4 9 -2 0 -4 -4 -9 -4 -4 2 -2 6 3 8 4 2 2 2 0 4 -3 2 -13 4 -13 8 -2 7 -4 19 -10 11 -7 -11 4 -8 4 -11 0 -2 -4 0 -6 -2 -3 -4 4 -8 4 -12 0 -2 -9 0 -15 4 -4 4 -12 2 -14 2 -3 0 -7 8 -11 11 -2 2 -6 0 -10 4 -7 2 -11 0 -11 -7 0 -6 15 -8 15 -8 0 0 12 -8 17 -6 8 0 20 -8 25 -8 2 0 0 -5 -3 -7 -2 -2 7 -4 11 -4 4 0 12 -12 12 -12 0 0 -43 10 -48 8 -4 0 -27 4 -31 2 -2 -4 -8 6 -8 6 0 0 -11 -4 -11 -10 0 -8 9 -8 13 -8 4 2 19 4 19 -3 0 -4 2 -12 -2 -12 -5 0 -11 4 -11 0 0 -4 4 -8 2 -8 -2 0 -6 0 -6 0 -2 -2 4 -7 -2 -7 -4 0 -17 11 -17 7 -2 -5 0 -11 -2 -13 -2 -4 -6 -10 -4 -12 4 -5 2 -7 -2 -9 -6 0 -17 -4 -8 -4 6 0 16 0 16 -8 0 -9 -4 -13 -2 -13 0 -4 2 -10 -8 -14 -11 -2 -19 -9 -23 -9 -4 0 -10 -10 -21 -10 -10 0 -8 10 -12 10 -7 -4 -11 -12 -17 -12 -6 0 -13 0 -13 -4 0 -4 3 -9 5 -11 4 -2 10 7 10 2 0 -4 4 -6 4 -8 0 -2 -8 -2 -8 -6 0 -4 -2 -11 -4 -17 -4 -4 4 -4 6 -4 4 -2 8 4 8 6 0 2 11 6 11 9 0 4 -2 10 0 10 0 2 6 8 6 4 0 -4 10 -2 12 -2 3 0 13 0 15 -2 2 -2 10 -8 10 -8 0 -2 -16 4 -18 0 -4 -5 -4 -13 -9 -13 -2 -2 -8 -6 -8 -10 0 -4 17 -7 17 -7 0 -2 -4 -8 0 -12 4 0 12 -4 4 -6 -6 -2 -19 -7 -19 -11 0 -4 6 -8 4 -10 -4 0 -14 -13 -16 -13 0 0 -11 -2 -9 -6 2 -6 32 -31 27 -33 -6 -2 -60 12 -62 14 -4 2 -13 7 -13 -2 0 -6 2 -23 2 -31 0 -8 0 -12 0 -12 0 0 3 -11 5 -13 2 0 10 -6 10 -10 0 -7 25 -25 29 -32 4 -6 21 -10 23 -12 4 -2 11 -4 17 -4 4 0 4 -4 6 -4 2 0 6 10 10 10 7 0 40 0 40 -4 0 -2 -8 -9 -8 -9 0 0 -2 -6 2 -6 4 0 23 0 23 2 0 4 -7 11 -4 9 4 0 20 -5 33 -2 8 2 25 -7 31 -7 6 0 33 0 33 -8 0 -8 -33 -4 -31 -10 2 -3 31 -21 48 -25 19 -3 52 -13 52 -13 0 0 4 -4 -10 -4 -13 0 -50 8 -54 4 -5 -4 -13 -17 -15 -21 -2 -4 -2 -21 4 -25 6 -4 46 2 50 4 4 2 38 -4 38 -4 0 0 6 -10 10 -10 2 0 31 2 33 4 3 4 34 2 40 0 2 -4 27 -19 27 -31 0 -15 17 -15 17 -15 0 0 31 -23 33 -29 2 -8 17 -19 23 -19 4 0 15 -14 19 -14 6 0 33 -19 37 -23 4 -4 21 -9 27 -9 7 2 25 -2 30 -4 6 -2 25 -2 29 -4 6 0 29 -10 35 -10 6 0 15 -7 21 -13 4 -4 10 -6 12 -2 5 4 0 13 7 19 6 4 21 23 29 23 8 0 25 -7 31 -11 4 -6 31 -6 31 0 0 2 -16 0 -12 7 4 4 12 8 14 12 3 6 23 10 28 13 4 2 10 -7 14 -9 2 -4 19 -8 19 -8 l 2 2 c 0 0 12 0 19 0 4 0 10 10 18 8 7 -4 23 0 28 2 4 2 8 -12 16 -12 6 -2 9 10 17 10 6 0 27 0 33 -2 6 -2 17 -8 27 -8 9 0 15 -15 23 -17 9 -2 25 -6 27 -12 4 -7 23 -11 25 -7 4 3 17 0 23 0 6 -2 29 -2 36 -4 6 -2 33 -23 35 -31 2 -8 8 -12 10 -12 5 0 17 -5 21 -13 4 -6 19 -19 21 -23 2 -2 4 -23 4 -23 l -2 4 c 0 0 21 5 27 2 7 0 17 -18 34 -18 14 0 23 -4 23 -11 0 -6 14 -16 20 -16 0 0 7 4 7 8 0 2 -2 8 6 8 10 0 19 7 21 11 4 6 10 12 16 12 5 0 23 0 23 0 0 0 23 21 25 34 2 12 -4 33 2 35 7 4 19 25 19 33 0 9 6 11 15 11 8 0 27 -15 31 -15 4 0 44 19 44 19 0 0 -13 4 -9 17 5 10 27 33 0 33 -25 0 -10 17 -4 23 9 6 9 14 9 25 0 8 12 29 20 41 l 2 3 c 0 0 0 6 5 12 4 6 14 0 20 4 7 4 -14 50 -14 61 0 8 29 14 37 14 11 0 11 9 15 17 6 6 29 19 29 27 0 8 -17 12 -21 12 -4 0 -21 30 -27 32 -6 2 -4 -15 -4 -19 -2 -8 -21 -2 -25 4 -6 4 -31 0 -50 0 -17 0 -65 13 -69 19 -4 6 -21 19 -21 19 0 0 -12 -13 -16 -15 -6 -2 -29 29 -36 38 -10 8 -45 33 -56 35 -6 4 -56 23 -69 37 -12 13 -62 34 -70 42 -11 6 -42 13 -48 8 -7 -2 -30 -4 -38 -6 -8 -2 -56 17 -67 25 -8 9 -10 34 -25 34 -14 0 -20 0 -25 -9 -4 -10 -25 -12 -33 -8 -8 6 -2 29 -8 35 -6 2 -6 11 -6 17 0 8 12 4 14 12 0 11 -4 19 -14 19 -9 0 -3 6 -3 23 0 17 -18 4 -18 13 0 10 -7 6 -13 6 -4 0 -12 -8 -12 -8 0 0 4 -11 -7 -17 -8 -6 -4 -27 -4 -29 0 -2 7 -13 15 -19 6 -6 0 -33 -8 -40 -9 -10 -28 23 -30 30 0 8 -8 16 -8 16 l -15 6 z"/>
-		</g>
-		<path id="reg16" d="M 2223 3101 c 0 0 -31 -10 -33 -10 -5 0 -13 10 -17 8 -4 -2 -13 -6 -17 -6 -4 0 -25 31 -25 33 -2 2 -10 0 -14 0 -7 0 -11 4 -11 8 0 7 -14 7 -23 7 -8 0 -6 0 -16 0 -11 0 -25 8 -36 10 -8 2 -31 13 -33 19 -2 2 -17 8 -17 8 0 0 -18 0 -23 0 -6 0 -12 -6 -16 -12 -2 -4 -11 -11 -21 -11 -8 0 -6 -6 -6 -8 0 -4 -7 -8 -7 -8 -6 0 -20 10 -20 16 0 7 -9 11 -23 11 -17 0 -27 18 -34 18 -6 3 -27 -2 -27 -2 0 0 2 -12 4 -12 5 -2 9 -19 9 -23 0 -6 -2 -23 -9 -27 -6 -6 -8 -23 -14 -29 -6 -4 -15 -21 -19 -25 -2 -7 -15 -17 -21 -19 -6 -2 -21 4 -23 -4 -4 -9 -14 -6 -18 -9 -5 -2 -11 -8 -17 -8 -6 0 -23 0 -27 0 -4 0 -29 -6 -34 -8 -6 0 -33 -17 -33 -17 0 0 15 -4 15 -6 0 -2 6 -13 12 -11 9 5 29 5 34 5 4 -5 31 -15 37 -13 6 4 54 25 71 17 17 -11 44 -21 50 -21 6 0 17 -13 25 -13 10 0 25 15 35 13 13 0 32 0 32 0 0 0 18 2 18 6 0 2 -2 17 27 17 27 0 13 -27 15 -27 4 0 75 -13 77 -13 2 0 27 13 33 11 5 -2 34 -11 34 -4 0 6 -21 18 -7 31 15 10 30 10 38 10 8 0 44 -4 44 -2 2 2 -15 33 -13 36 2 2 21 20 21 25 0 6 4 14 6 12 4 -4 11 -10 17 -10 4 0 10 2 10 6 0 0 2 23 2 23 0 0 -10 8 -10 8 l -2 0 z"/>
-		<path id="reg03" d="M 2300 3330 c -2 7 -54 19 -56 21 -2 2 -48 0 -61 -4 -10 -4 -43 -29 -43 -35 -5 -7 -23 -17 -23 -17 0 0 -40 -19 -44 -19 -4 0 -23 15 -31 15 -9 0 -15 -2 -15 -11 0 -8 -12 -29 -19 -33 -6 -2 0 -23 -2 -35 -2 -13 -25 -34 -25 -34 0 0 15 -6 17 -8 2 -6 25 -17 33 -19 11 -2 25 -10 36 -10 10 0 8 0 16 0 9 0 23 0 23 -7 0 -4 4 -8 11 -8 4 0 12 2 14 0 0 0 21 33 19 44 -2 8 25 12 25 12 0 0 29 38 27 46 -2 9 -19 9 -19 9 0 0 21 25 34 29 10 2 41 -11 50 0 6 10 33 64 33 64 z"/>
-		<path id="reg05" d="M 2131 3126 c 0 -2 21 -33 25 -33 4 0 13 4 17 6 4 2 12 -8 17 -8 2 0 33 10 33 10 0 0 2 0 2 0 0 0 10 -8 10 -8 0 0 -2 -23 -2 -23 0 0 13 -11 21 -4 9 4 25 14 34 10 6 -4 8 -10 8 -19 0 -10 4 -12 10 -12 9 0 21 -11 21 -19 0 -8 13 -23 13 -23 0 0 -2 0 -2 0 0 0 6 -8 10 -14 4 -5 8 -42 8 -42 0 0 -2 -2 -2 -2 0 0 27 14 34 17 6 4 27 18 37 27 10 8 44 37 48 37 6 0 12 8 15 13 4 2 16 8 20 2 2 -4 32 -4 36 -4 6 0 14 16 10 27 -4 10 -16 16 -21 18 -4 5 -14 -8 -23 -6 -8 4 -12 17 -14 23 -2 6 6 65 6 71 0 6 17 12 19 14 2 7 -6 11 -6 21 0 7 -2 36 -2 36 0 0 -13 -17 -13 -19 0 0 -6 -2 -10 -2 -5 2 10 12 10 25 0 12 -6 0 -8 2 -2 2 10 31 16 33 5 2 5 17 5 17 0 0 0 0 0 0 0 0 -7 21 -11 12 -4 -6 -17 -16 -23 -14 -6 2 -14 -2 -16 -4 -3 -2 -15 -7 -19 -9 -4 -2 -6 -6 -2 -6 4 -4 10 -10 8 -14 -2 -5 -27 -32 -23 -34 2 0 8 -6 2 -10 -4 -6 -37 -23 -37 -19 0 0 -11 23 -17 27 -8 6 -21 21 -23 25 -2 6 -10 25 -10 25 0 0 -2 0 -2 0 0 0 -36 48 -40 54 0 0 -27 -54 -33 -64 -9 -11 -40 2 -50 0 -13 -4 -34 -29 -34 -29 0 0 17 0 19 -9 2 -8 -27 -46 -27 -46 0 0 -27 -4 -25 -12 2 -11 -19 -44 -19 -44 z"/>
-		<path id="reg42" d="M 2560 1643 c 0 0 -50 35 -56 41 -6 7 -31 71 -37 78 -7 2 -57 10 -63 10 -4 0 -8 -10 -16 -10 -9 0 12 27 4 37 -11 10 -25 -2 -34 -6 -8 -6 -39 -11 -48 -11 -6 0 -10 -8 -20 -8 -11 0 -23 -2 -27 -6 -7 -6 -17 4 -21 8 -7 4 -13 4 -15 4 -4 0 2 15 -21 9 -21 -7 -25 -23 -33 -11 -10 13 -2 36 -6 40 -4 2 -17 -4 -19 -2 -4 4 -10 8 -10 0 0 -7 -15 -13 -15 -7 0 7 -10 5 -13 5 -4 0 -10 -2 -10 6 0 6 -8 4 -17 4 -6 2 5 21 7 23 0 4 -15 21 -19 29 -2 6 -31 36 -33 38 -3 4 -13 10 -15 12 -4 0 6 17 6 29 0 11 -14 29 -21 32 -6 2 2 18 7 27 6 6 23 20 25 31 4 10 -34 21 -40 25 -6 2 -19 -6 -23 -13 -2 -4 -17 -12 -21 -8 -4 2 -18 -15 -25 -15 -4 0 -6 21 -6 21 0 2 -8 13 -4 19 6 6 17 19 12 25 -4 8 -2 17 -2 17 l -10 8 c 0 0 0 27 0 48 0 19 12 29 19 29 2 -2 6 2 12 8 6 5 8 15 2 17 -6 4 -16 23 -16 33 0 11 -3 36 -3 36 0 0 32 0 36 0 4 0 21 17 21 23 0 4 6 23 12 29 6 4 15 -2 15 -10 0 -7 12 -7 14 -7 5 0 13 -8 19 -12 4 -2 13 8 19 12 6 7 25 15 29 17 6 2 25 23 27 27 4 6 21 15 25 19 4 4 4 10 0 12 -4 4 -14 -6 -21 -6 -8 0 -2 8 -2 15 0 6 13 12 19 12 2 0 12 6 21 11 8 4 27 -3 27 -3 0 0 6 -14 12 -14 7 -2 9 -8 15 -8 4 0 15 0 12 -7 0 -2 13 -6 15 -8 4 -2 8 -21 10 -27 0 -8 5 -8 7 -8 4 2 8 -21 12 -19 6 2 6 -13 9 -15 4 -4 18 -19 20 -25 2 -6 13 -14 19 -14 4 2 21 -13 23 -9 2 2 15 11 21 9 8 0 35 -2 35 -7 0 -2 11 -20 19 -23 4 -4 8 11 15 3 6 -5 25 -3 25 6 0 8 6 14 4 16 -2 3 0 11 4 11 2 0 21 17 21 27 2 8 12 27 12 29 2 4 2 29 2 31 0 5 -4 30 2 30 5 0 13 2 19 2 4 0 13 0 13 0 l 0 8 c 0 0 -11 4 -9 6 0 2 -14 6 -18 4 -5 0 -21 -4 -21 -4 0 0 -29 21 -34 21 -2 0 -10 8 -14 8 -6 0 -19 5 -19 7 -2 2 -14 18 -12 27 0 10 6 10 6 14 0 4 -13 13 -13 17 0 4 -4 19 0 19 7 0 15 2 21 6 6 6 19 6 21 6 6 0 13 2 13 6 0 5 -11 5 -13 3 -2 -3 -8 4 -8 6 0 2 -11 8 -19 8 -6 0 -17 -4 -17 -2 0 2 -14 2 -18 4 -3 4 -7 11 -9 13 -4 2 -19 6 -14 10 6 4 6 19 20 19 15 -2 36 -2 38 0 4 4 17 8 17 14 4 9 16 5 25 11 6 4 8 12 12 12 8 2 13 15 17 23 4 11 8 17 8 23 0 4 6 13 13 9 6 -5 6 -11 14 -13 4 -2 15 -2 15 -2 l 39 -17 -8 0 0 -1035 -15 -2 z"/>
-		<path id="reg21" d="M -1860 195 c 0 0 2 -11 4 -15 2 -4 2 -14 0 -14 -2 0 0 -7 4 -7 2 -2 2 -12 0 -14 -2 -4 -2 -13 0 -13 2 0 6 9 10 5 7 -5 13 -5 13 -5 2 -2 6 -10 4 -10 -2 0 -8 -6 -6 -6 4 0 8 0 8 -9 0 -8 -4 -8 -4 -10 2 -4 4 -10 2 -17 -4 -4 -8 -10 -8 -14 0 -2 2 -23 -2 -25 -2 -4 -17 -15 -23 -13 -4 0 -13 4 -2 9 8 8 10 10 10 14 0 2 4 8 2 8 -2 0 -12 -12 -14 -12 -3 0 -9 4 -7 10 2 7 11 15 11 17 0 2 -4 15 -4 15 0 0 -3 10 -5 10 -2 0 -12 0 -12 0 0 0 10 -8 10 -12 0 -3 -10 6 -8 2 2 -5 8 -13 6 -17 -4 -2 -10 8 -10 8 0 0 2 -12 0 -12 0 -2 2 -4 4 -4 2 -5 0 -7 -2 -11 -2 -2 -8 -19 -13 -16 -6 4 -4 6 -6 6 -2 0 -14 0 -14 4 0 4 8 21 8 25 0 2 -2 4 -4 -2 0 -6 -9 -23 -13 -17 -4 4 -2 13 0 15 0 6 6 8 11 8 2 0 2 6 0 6 -2 0 -7 -2 -9 0 0 5 -6 5 -10 2 -2 -4 0 -12 -2 -16 0 -2 -4 -13 -9 -11 -4 5 -4 9 -4 13 0 4 -2 4 -2 4 0 0 0 10 -4 6 -2 0 -8 -16 -8 -16 0 0 -15 2 -15 4 0 4 4 8 6 8 2 0 7 17 11 17 4 4 14 2 14 4 2 0 11 8 13 8 4 -2 6 -6 8 -6 0 2 4 8 9 6 2 0 4 4 4 9 -2 2 0 4 4 4 2 0 10 2 10 2 0 0 -2 6 2 8 2 0 2 4 -2 4 -2 0 -4 7 0 9 4 2 9 -2 11 -2 2 0 6 0 6 0 0 0 -4 6 -4 6 0 0 6 12 6 10 0 0 -4 2 -6 2 0 -4 -9 -4 -11 -4 -4 2 -20 0 -23 0 -2 0 -6 4 -4 6 2 7 9 19 11 19 4 0 18 -4 18 0 0 2 -12 4 -12 9 -2 2 -8 0 -10 -3 -5 -2 -11 -12 -13 -12 -4 0 -8 -2 -8 -6 0 0 0 -4 -7 -4 -4 0 -4 -5 -6 -5 -2 0 -8 0 -8 -2 -2 -2 0 -6 -6 -4 -5 2 -9 4 -13 2 -2 -4 -14 -12 -19 -12 -4 0 -10 -2 -10 0 0 2 0 12 4 16 2 0 11 2 13 5 2 4 10 4 12 4 4 4 15 14 17 16 0 2 4 5 6 9 2 0 8 4 8 8 0 4 -8 10 -8 13 0 2 -4 8 -2 10 2 2 0 6 4 8 6 0 17 -4 17 0 0 4 -11 4 -13 4 0 0 -10 5 -8 7 4 4 0 6 -2 6 -2 0 -11 4 -8 4 4 4 25 0 27 0 2 4 4 11 2 11 -2 0 -7 -5 -11 -5 -8 0 -12 2 -12 7 0 4 4 8 2 8 -4 0 -8 -6 -15 -6 -4 2 -8 6 -12 2 -6 -2 -15 -2 -15 -6 0 -5 -2 -15 -6 -11 -6 2 -6 8 -6 11 -2 2 -13 6 -9 12 2 6 15 8 17 13 2 4 10 10 13 10 2 0 10 6 12 10 2 2 13 2 15 5 4 4 10 12 10 16 2 2 8 2 10 2 7 -2 5 2 0 7 -2 2 -4 4 0 10 3 4 9 31 15 35 6 7 19 15 21 21 2 9 8 19 12 21 5 4 11 8 13 8 4 0 17 9 19 7 2 -2 0 -7 2 -11 0 -2 2 -16 2 -16 0 0 4 6 4 10 0 4 2 8 0 12 -6 3 0 7 6 5 6 -2 19 -7 23 -7 4 0 13 0 17 0 4 0 14 7 19 9 2 2 6 2 10 0 2 0 12 0 15 0 2 0 8 0 8 0 0 0 -8 4 -11 4 -2 0 -12 4 -12 6 0 2 -2 6 2 4 2 -2 13 -6 15 -6 2 0 8 -4 10 -6 4 -4 6 -4 10 -4 3 0 23 -2 30 -5 6 0 23 0 25 3 4 4 10 6 10 8 0 2 0 6 2 6 6 0 6 -6 13 -6 4 0 12 2 14 4 2 2 13 -8 15 -10 4 -2 2 -5 0 -5 -2 0 -6 -4 -4 -6 l 0 2 c 0 0 10 0 10 -2 2 -2 6 2 8 2 0 2 0 -16 0 -16 0 0 11 12 13 12 2 0 4 -8 4 -6 4 2 8 2 8 0 0 -4 13 -4 13 -6 0 -2 -13 -17 -8 -17 2 0 14 17 18 15 4 -5 9 -15 9 -15 0 0 -9 0 -7 -2 2 -2 0 -8 -2 -8 -2 0 -8 -3 -6 -5 2 0 15 5 13 -2 0 -4 -11 -4 -11 -4 0 0 19 -4 21 -6 4 -2 12 -11 10 -13 -2 -2 -6 -4 -6 -4 0 0 0 -6 -4 -10 -4 0 -10 -13 -8 -15 2 -2 2 -12 -2 -14 -3 -2 -11 -5 -13 -5 -4 0 -8 0 -4 -2 2 -2 8 -8 8 -8 4 0 17 -2 17 -8 0 -4 -4 -11 -8 -13 -3 0 -7 -4 -9 -4 0 0 0 -10 2 -10 2 0 13 0 13 -5 0 -4 2 -8 6 -6 4 4 6 2 10 2 5 0 11 -2 11 -2 0 0 -13 -10 -19 -8 -6 0 -14 6 -17 6 0 -2 -8 0 -8 0 -2 4 -6 4 -6 2 0 -2 0 -10 -2 -14 -4 -2 -4 -7 0 -9 2 -2 2 -8 -2 -12 -2 -2 0 -15 -2 -17 -5 -4 -13 -6 -15 -6 0 -2 -8 -2 -8 2 -2 4 -4 23 -11 23 -8 0 -21 0 -21 -4 0 -4 -4 -11 -8 -11 -4 4 -8 9 -8 9 -2 0 -9 0 -11 0 -2 2 -6 4 -6 0 -2 -7 -4 -19 -8 -23 -4 -4 -13 -11 -15 -9 -2 5 -4 19 -6 21 0 2 4 6 2 11 -2 2 -8 10 -8 12 -2 4 -7 11 -7 11 0 0 0 -11 3 -15 0 -6 4 -10 2 -17 0 -6 2 -29 0 -33 0 -4 -2 -6 -5 -6 -2 0 -6 -9 -10 -4 -4 4 -4 4 -8 4 -2 -2 -11 -4 -15 0 -4 6 -4 18 -6 21 -4 4 -11 6 -11 4 0 -4 -4 -11 -4 -13 0 -2 4 -8 4 -12 -2 -4 0 -13 3 -17 0 -2 0 -12 -7 -12 -6 0 -12 -3 -14 2 0 2 -2 14 -7 16 -4 2 -14 21 -16 21 -4 0 -6 -2 -11 0 -2 4 -10 6 -8 0 2 -6 10 -10 8 -10 -2 0 -8 -4 -12 0 -6 0 -13 8 -15 10 -2 4 -2 8 -2 6 -2 0 -4 -2 -6 0 -4 5 -8 13 -8 13 z"/>
-	</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_flow.xml Deleted

@@ -1,1161 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" viewBox="0 0 240 180" width="240" height="180" preserveAspectRatio="xMidYMid meet" contentScriptType="text/ecmascript">
-<g stroke="none" fill="#474832">
-<path d="M 0 0 L 0 19 L 4 16 L 5 16 L 5 40 L 7 40 L 11 0 z"/>
-</g>
-<g stroke="none" fill="#20221b">
-<path d="M 11 0 L 7 32 L 9 31 L 10 42 L 14 38 L 20 40 L 20 46 L 24 45 L 21 44 L 21 40 L 24 43 L 25 43 C 25 38.836 26.2197 34.3049 29 35 C 27.8118 23.868 33.3488 23.1145 37.919 14.6111 C 39.4547 11.7537 38.5633 7.39034 40 4 L 31 4 L 35 1 z"/>
-</g>
-<g stroke="none" fill="#41411e">
-<path d="M 31 4 L 40 4 C 37.6234 7.86362 37.5288 9.7612 39 14 L 43 12 L 41 7 L 45 7 L 45 4 L 49 4 C 44.7 -1.1624 35.17 -1.86163 31 4 z"/>
-</g>
-<g stroke="none" fill="#4a4838">
-<path d="M 46 0 L 50 6 C 36.9876 13.5937 15.7588 33.9728 37 47 L 31 30 L 46 34 L 32 28 C 33.2481 20.0668 48.1502 8.64999 56 9 L 56 5 L 55 5 L 54 7 L 52 3 L 57 1 z"/>
-</g>
-<g stroke="none" fill="#7b7965">
-<path d="M 52 3 L 55 7 L 62 1 z"/>
-</g>
-<g stroke="none" fill="#2e2e1d">
-<path d="M 61 1 L 61 2 L 70 2 L 68 9 L 76 25 L 80 25 L 78 30 L 102 24 L 101 20 C 94.8497 22.606 86.9445 23.1072 82 18 L 74 8 C 78.2096 7.08414 79.094 5.05374 80 1 C 86.9327 3.18695 95.2632 4.25182 100 10 L 107 10 L 106 3 L 114 4 L 109 22 L 123 20 L 119 28 C 122.486 27.2824 132.891 20.6997 125 19 L 126 7 C 131.976 6.73947 138.054 5.66542 141 0 L 127 4 L 128 0 C 107.691 0 80.4348 -4.74455 61 1 z"/>
-</g>
-<g stroke="none" fill="#131412">
-<path d="M 127 4 L 138 1 C 133.716 -0.797653 128.868 -0.64621 127 4 z"/>
-</g>
-<g stroke="none" fill="#171813">
-<path d="M 126 7 C 127.884 13.8803 129.846 15.9746 137 16 L 132 19 L 132 21 C 135.908 20.5957 138.664 19.8986 140 16 L 144 16 L 144 12 L 148 12 L 148 8 C 157.736 14.9719 157.307 7.29507 154 0 z"/>
-<path d="M 186 12 L 186 13 L 199 16 L 199 5 z"/>
-</g>
-<g stroke="none" fill="#444429">
-<path d="M 154 0 L 156 10 L 156 11 L 160 14 C 155.85 14.0147 152.456 13.6134 151 18 L 162 15 L 162 20 L 165 20 L 165 24 L 168 23 L 166 18 L 163 18 L 163 14 L 171 13 L 164 3 L 161 0 z"/>
-</g>
-<g stroke="none" fill="#675e3e">
-<path d="M 161 0 L 161 3 L 165 3 L 165 0 z"/>
-</g>
-<g stroke="none" fill="#333028">
-<path d="M 165 0 L 163 6 L 175 9 L 170 20 L 174 20 L 174 24 L 175 24 L 180 6 L 177 0 z"/>
-</g>
-<g stroke="none" fill="#898261">
-<path d="M 171 0 L 171 2 L 175 2 L 175 0 z"/>
-</g>
-<g stroke="none" fill="#a1996f">
-<path d="M 177 0 C 178.768 2.74974 180.102 2.57475 182 0 z"/>
-</g>
-<g stroke="none" fill="#696553">
-<path d="M 181 3 L 177 2 L 180 6 L 176 18 L 178 11 L 185 0 z"/>
-</g>
-<g stroke="none" fill="#928c8e">
-<path d="M 187 11 C 185.428 6.56383 185.675 3.46461 190 1 C 183.065 -1.6216 177.28 10.2425 187 11 z"/>
-</g>
-<g stroke="none" fill="#66634d">
-<path d="M 190 0 L 186 12 L 199 5 C 197.47 11.8883 197.842 15.65 205 19 L 203 7 L 213 18 L 212 14 C 220.45 15.4159 224.988 0.778259 215 0 L 216 6 L 216 13 L 214 13 L 213 10 L 209 12 L 211 5 L 200 4 L 200 0 z"/>
-</g>
-<g stroke="none" fill="#383b33">
-<path d="M 200 0 L 200 4 L 209 4 z"/>
-</g>
-<g stroke="none" fill="#202318">
-<path d="M 204 0 L 209 5 L 219 6 C 215.848 -0.53923 210.456 0 204 0 z"/>
-</g>
-<g stroke="none" fill="#322e22">
-<path d="M 220 0 C 222.177 5.12727 225.71 12.8345 223 18 L 224 24 L 229 20 L 228 0 z"/>
-</g>
-<g stroke="none" fill="#0c0c0c">
-<path d="M 228 0 L 230 24 L 233 24 C 233.48 31.9913 225.169 40.8589 237 41 L 237 44 L 229 44 C 229.563 48.7526 231.339 52.0133 226 54 L 228 50 L 226 43 L 218 43 L 219 54 L 218 55 L 216 55 L 215 54 L 216 50 L 214 46 L 213 46 L 209 49 L 208 43 L 206 43 L 207 52 L 212 54 C 209.487 57.9165 211.686 60.4585 214 64 L 198 66 C 200.105 70.3524 202.383 71.6097 207 70 L 207 74 L 213 75 L 214 74 L 214 73 L 214 72 L 211 67 L 215 70 C 223.558 69.6626 226.669 66.2647 234 62 C 231.826 67.8227 234.457 68.9339 240 69 L 240 0 z"/>
-</g>
-<g stroke="none" fill="#1c1f16">
-<path d="M 80 1 L 74 8 C 78.8448 20.112 88.244 17.9922 100 18 L 99 14 L 106 20 L 107 13 z"/>
-</g>
-<g stroke="none" fill="#b5a68c">
-<path d="M 185 9 C 189.126 7.49637 190.318 5.252 191 1 C 186.406 1.79033 185.452 4.63054 185 9 z"/>
-</g>
-<g stroke="none" fill="#191a15">
-<path d="M 64 13 C 61.9871 17.4544 59.9949 20.9598 55 22 L 56 17 C 48.3909 12.4933 41.8799 15.3539 48.7894 23.8673 C 52.8788 28.906 61.7314 32.8826 68 34 L 63 27 L 69 33 L 74 32 C 73.7633 25.5013 74.5865 21.7575 69 17 L 69 23 C 62.3553 19.2062 69.9301 8.21481 70 2 C 66.8928 2 62.1265 1.16161 59.4344 3.02779 C 53.8902 6.87103 59.8626 12.1445 64 13 z"/>
-</g>
-<g stroke="none" fill="#434329">
-<path d="M 221 2 C 220.481 7.77452 218.708 14.2166 212 14 L 213 18 L 203 7 L 205 19 L 191 15 L 185 18 L 185 14 L 189 14 L 189 13 C 179.609 11.757 180.157 21.0876 178 28 L 179 29 C 184.955 27.6898 186.198 31.6743 187 37 L 190 36 C 188.784 29.8374 187.25 26.0486 181 24 L 182 17 C 191.858 22.1295 208.952 16.4656 202 32 L 211 39 L 212 34 L 212 33 L 206 27 L 224 27 L 223 31 L 234 30 L 233 24 L 230 24 L 230 20 L 227 20 L 227 24 L 216 18 L 216 16 L 219 15 L 223 18 L 223 17 L 220 17 L 224 12 z"/>
-</g>
-<g stroke="none" fill="#3a380e">
-<path d="M 106 3 L 107 10 L 101 8 L 107 13 C 105.96 16.9426 104.127 21.6156 109 23 L 108 27 L 107 27 L 105 23 L 104 23 L 109 50 L 105 50 L 105 51 L 117 58 L 112 58 L 112 59 L 122 59 L 121 56 L 117 47 L 124 45 L 130 51 L 129 47 L 131 47 C 127.589 40.8134 119.983 42.8772 114 43 L 114 37 L 117 41 L 118 38 L 122 39 L 119 26 L 123 20 L 121 25 L 111 25 L 109 22 L 114 4 z"/>
-</g>
-<g stroke="none" fill="#202218">
-<path d="M 45 4 L 45 7 L 41 7 C 43.1527 13.4107 48.1624 7.77623 50 4 z"/>
-</g>
-<g stroke="none" fill="#3c3a1b">
-<path d="M 56 4 L 56 9 C 47.2206 7.35846 40.1199 18.0591 33 22 L 33 23 L 49 25 C 45.7225 15.9579 46.1929 12.9981 56 17 L 55 22 C 60.2537 21.3958 62.5982 17.9145 64 13 L 56 12 L 56 11 L 58 4 z"/>
-</g>
-<g stroke="none" fill="#878063">
-<path d="M 211 4 L 209 12 L 213 10 L 214 13 L 216 13 C 217.261 8.21323 215.8 5.39258 211 4 z"/>
-</g>
-<g stroke="none" fill="#55542f">
-<path d="M 117 5 L 117 7 L 122 7 L 122 5 z"/>
-</g>
-<g stroke="none" fill="#69695c">
-<path d="M 167 7 L 171 13 L 163 14 L 163 18 L 166 18 L 169 22 L 169 21 C 167.336 18.502 168.463 14.6901 171 18 L 172 18 L 175 9 z"/>
-</g>
-<g stroke="none" fill="#4b4e3d">
-<path d="M 148 8 L 148 12 L 144 12 L 144 16 L 140 16 L 132 21 L 132 19 L 137 16 L 126 14 L 125 19 C 127.71 20.996 126.886 22.933 126 26 L 143 31 L 138 22 L 144 21 L 144 20 L 142 17 C 146.368 15.8015 149.19 13.1344 151 9 L 150 8 z"/>
-</g>
-<g stroke="none" fill="#7f7a72">
-<path d="M 178 11 L 175 28 L 186 12 z"/>
-</g>
-<g stroke="none" fill="#69654a">
-<path d="M 56 11 L 62 15 z"/>
-</g>
-<g stroke="none" fill="#444622">
-<path d="M 67 11 C 66.7053 15.6358 63.3203 21.1072 69 23 L 69 17 L 74 32 L 69 33 L 63 27 L 67 35 L 71 38 L 66 37 L 58 41 L 54 38 L 55 43 L 64 43 L 62 49 L 65 45 C 68.644 48.3472 69.9728 51.4093 65 54 L 64 60 L 76 59 C 74.4086 67.7134 77.9506 67.987 85 65 L 81 60 L 87 57 L 87 61 L 98 53 L 98 52 L 95 47 L 101 49 L 101 48 L 99 47 C 103.264 44.0556 106.899 42.3928 108 37 C 101.395 39.7293 93.8675 48.455 89 39 C 84.4194 39.5873 82.9175 38.026 81 34 L 94 31 L 91 30 C 96.2918 25.97 98.9799 27.2079 105 28 L 104 23 L 105 23 L 107 27 L 108 27 L 109 23 L 99 14 L 99 21 L 102 24 L 78 30 L 80 25 L 76 25 L 69 11 z"/>
-</g>
-<g stroke="none" fill="#736f67">
-<path d="M 149 11 L 142 20 L 151 18 C 153.112 14.17 155.839 14.0492 160 14 z"/>
-</g>
-<g stroke="none" fill="#6b6855">
-<path d="M 221 11 L 220 17 L 225 17 z"/>
-</g>
-<g stroke="none" fill="#7f7a6b">
-<path d="M 185 14 L 185 18 L 191 18 z"/>
-</g>
-<g stroke="none" fill="#212216">
-<path d="M 161 15 C 156.54 16.8851 148.902 16.3156 145.361 19.5995 C 140.828 23.8031 146.527 32.543 151 34 L 151 28 L 154 28 L 154 40 L 147 38 L 149 60 L 154 56 C 153.267 51.5491 154.526 49.714 159 49 C 153.821 38.4322 159.88 33.7412 160 23 L 162 23 L 165 27 L 158 43 L 159 43 L 166 35 L 162 47 C 167.678 41.6542 172.9 27.7134 174 20 L 165 24 L 165 20 L 162 20 z"/>
-</g>
-<g stroke="none" fill="#958d87">
-<path d="M 167 21 L 171 15 C 167.679 16.0989 167.263 17.5902 167 21 z"/>
-</g>
-<g stroke="none" fill="#141412">
-<path d="M 218 15 L 216 18 L 226 22 z"/>
-</g>
-<g stroke="none" fill="#0e0f0f">
-<path d="M 4 16 L 0 19 L 0 61 L 1 61 L 5 49 L 4 44 L 18 51 L 15 53 C 16.7817 62.734 24.0236 64.1143 32 61 L 27 65 L 27 72 L 23 70 C 18.2648 74.2117 19.0342 76.4069 21 82 L 54 69 L 54 68 L 45 62 L 57 66 C 55.3822 56.4522 50.1794 50.1203 40 50 L 43 55 L 27 34 L 20 46 L 20 40 L 14 38 L 10 42 L 9 31 L 8 31 L 7 40 L 5 40 z"/>
-</g>
-<g stroke="none" fill="#48473b">
-<path d="M 82 18 L 82 20 L 99 22 L 99 21 L 85 20 L 85 18 L 91 18 z"/>
-</g>
-<g stroke="none" fill="#262619">
-<path d="M 182 17 L 181 24 C 186.13 26.4132 191.57 31.5379 187 37 C 186.186 27.7556 182.015 28.1177 174 28 L 168 50 L 159 51 L 159 53 L 170 52 L 169 65 L 169 66 L 174 73 L 186 64 L 189 67 L 193 55 L 188 55 C 186.52 60.5839 184.333 60.925 179 60 C 179.936 64.7273 179.422 66.6145 175 69 L 173 50 L 182 48 L 180 43 L 189 40 C 189.369 45.2621 191.879 48.5456 197 50 L 194 44 C 197.716 43.2037 197 40.3627 197 37 L 194 40 L 192 40 L 191 36 L 201 30 L 200 33 L 203 38 L 208 38 C 206.985 34.2363 205.922 32.6478 202 32 C 211.185 17.4128 191.234 20.5382 182 17 z"/>
-</g>
-<g stroke="none" fill="#6a5e43">
-<path d="M 194 17 L 200 20 L 200 17 z"/>
-</g>
-<g stroke="none" fill="#64605f">
-<path d="M 85 18 L 85 20 L 99 21 L 99 18 z"/>
-</g>
-<g stroke="none" fill="#56423a">
-<path d="M 111 25 C 115.094 25.4722 119.592 26.813 121 22 L 117 23 L 121 20 C 116.335 18.18 111.839 19.9587 111 25 z"/>
-</g>
-<g stroke="none" fill="#635b54">
-<path d="M 210 26 L 211 20 C 205.471 18.7744 205.307 24.627 210 26 z"/>
-</g>
-<g stroke="none" fill="#776e5b">
-<path d="M 117 23 L 121 20 z"/>
-</g>
-<g stroke="none" fill="#3b381c">
-<path d="M 138 22 L 141 30 L 143 34 L 138 36 L 138 37 C 152.735 37.3109 140.49 58.9621 150 61 L 147 38 L 154 40 L 155 35 L 154 35 C 150.247 37.2121 145.158 36.1245 147 31 L 143 21 z"/>
-</g>
-<g stroke="none" fill="#625e55">
-<path d="M 179 22 L 177 28 L 178 28 z"/>
-</g>
-<g stroke="none" fill="#1b1d16">
-<path d="M 32 23 L 32 28 L 46 34 L 31 30 C 32.5792 44.6298 48.7184 53.9603 62 51 L 65 59 L 65 54 C 70.8674 52.2122 69.4754 47.7626 65 45 L 62 49 L 64 43 L 55 43 L 54 38 L 58 41 L 66 39 C 61.0439 30.0298 41.7549 23.0065 32 23 z"/>
-</g>
-<g stroke="none" fill="#58503e">
-<path d="M 43 23 C 45.0597 26.6294 50.6123 31.0284 54 27 z"/>
-</g>
-<g stroke="none" fill="#393935">
-<path d="M 160 23 L 155 41 L 158 41 L 165 27 L 162 23 z"/>
-</g>
-<g stroke="none" fill="#595952">
-<path d="M 167 39 L 168 39 C 169.561 35.7882 170.514 35.4946 173 38 L 175 24 C 170.259 26.5889 167.983 33.8419 167 39 z"/>
-</g>
-<g stroke="none" fill="#1a1d14">
-<path d="M 122 39 C 119.109 38.0884 118.68 38.4604 117 41 L 114 37 L 114 43 C 120.266 42.9529 126.529 41.8352 131 47 L 129 47 L 130 51 L 124 45 L 117 47 C 117.669 52.8162 120.732 52.9813 126 53 L 126 56 L 120 57 L 120 58 L 131 59 L 130 62 L 138 56 C 139.126 58.3358 142.925 63.9669 145.972 60.3773 C 151.115 54.3185 145.929 37.2635 138 37 L 138 36 L 143 34 C 136.118 22.1292 122.05 24.9823 122 39 z"/>
-</g>
-<g stroke="none" fill="#7c734c">
-<path d="M 91 30 C 95.2008 29.91 98.6832 29.787 101 26 z"/>
-</g>
-<g stroke="none" fill="#6e635b">
-<path d="M 121 27 L 121 31 L 129 26 z"/>
-</g>
-<g stroke="none" fill="#7a626b">
-<path d="M 211 26 L 211 27 L 217 27 L 217 30 L 224 29 L 224 27 z"/>
-</g>
-<g stroke="none" fill="#756260">
-<path d="M 206 27 L 206 31 L 207 31 L 207 28 L 211 28 z"/>
-</g>
-<g stroke="none" fill="#a1868e">
-<path d="M 207 28 L 207 32 C 211.272 31.4567 215.507 31.5028 217 27 z"/>
-</g>
-<g stroke="none" fill="#8a7d7d">
-<path d="M 53 28 C 55.0451 33.9865 65.1751 37.1237 71 38 C 67.5426 33.0737 58.7694 29.3201 53 28 z"/>
-</g>
-<g stroke="none" fill="#1d1f12">
-<path d="M 81 34 C 82.4851 38.4784 84.2237 40.1639 89 39 C 91.7183 47.8048 103.212 42.9725 106.628 36.7261 C 108.093 34.0466 106.554 30.7452 106 28 z"/>
-</g>
-<g stroke="none" fill="#494d39">
-<path d="M 151 28 L 151 34 L 145 32 C 146.461 36.8108 149.515 36.6541 154 37 L 154 28 z"/>
-</g>
-<g stroke="none" fill="#5f4444">
-<path d="M 213 34 L 213 35 L 221 31 L 221 35 L 234 34 L 235 30 C 227.941 28.8936 218.312 29.1428 213 34 z"/>
-</g>
-<g stroke="none" fill="#111211">
-<path d="M 191 36 L 192 40 L 194 40 L 197 37 L 194 44 L 197 50 C 192.507 47.897 189.697 44.9905 189 40 L 180 43 L 182 48 L 173 50 L 175 69 C 180.132 67.1988 180.673 64.8634 179 60 C 184.591 61.6843 187.013 61.142 188 55 L 184 52 C 195.732 52.2838 189.094 59.0296 189 67 L 186 64 L 176 72 L 185 77 L 183 73 L 198 77 L 198 64 C 196.506 55.41 202.206 53.1824 210 53 L 210 52 L 207 52 L 206 43 L 208 43 L 209 49 L 213 46 L 214 46 L 214 50 L 215 50 L 214 39 L 230 40 L 232 34 L 232 33 L 221 35 L 221 31 L 216 35 L 210 34 L 211 39 L 203 38 C 202.936 35.0066 203.054 33.6544 200 33 L 201 30 z"/>
-</g>
-<g stroke="none" fill="#5f5752">
-<path d="M 112 35 L 117 31 z"/>
-</g>
-<g stroke="none" fill="#746565">
-<path d="M 208 32 L 208 33 L 215 34 C 214.159 30.0753 211.292 31.1147 208 32 z"/>
-</g>
-<g stroke="none" fill="#635d5a">
-<path d="M 159 43 L 157 40 L 156 40 L 159 49 C 155.377 49.2823 151.121 51.5598 155 55 L 158 50 L 158 54 L 159 54 L 159 51 L 163 51 L 163 50 L 160 48 L 167 50 L 168 50 L 169 44 L 167 40 L 166 40 L 162 47 L 166 35 C 161.834 36.285 160.476 39.0442 159 43 z"/>
-</g>
-<g stroke="none" fill="#8a8383">
-<path d="M 169 35 L 167 44 C 171.298 42.5873 171.654 39.1871 172 35 z"/>
-</g>
-<g stroke="none" fill="#8d817a">
-<path d="M 74 37 C 74.7963 40.7159 77.6373 40 81 40 z"/>
-</g>
-<g stroke="none" fill="#3b383a">
-<path d="M 214 39 L 215 54 L 216 55 L 218 55 L 219 54 L 217 39 z"/>
-</g>
-<g stroke="none" fill="#5e310f">
-<path d="M 21 40 L 21 44 L 24 44 L 24 40 z"/>
-</g>
-<g stroke="none" fill="#1d1f17">
-<path d="M 68 40 C 68.7443 44.9719 72.0515 51.4121 77 53 L 75 46 L 86 50 L 86 51 L 79 51 C 82.9229 55.4263 86.0551 54.1783 91 52 L 91 50 z"/>
-</g>
-<g stroke="none" fill="#171812">
-<path d="M 107 40 L 99 47 L 109 50 L 109 40 z"/>
-</g>
-<g stroke="none" fill="#2e2e16">
-<path d="M 217 40 L 217 44 L 226 43 C 225.373 46.317 224.064 49.1565 228 50 L 226 54 C 233.454 52.372 228.877 46.8099 227 42 L 237 44 C 235.678 37.8295 222.037 41.3715 217 40 z"/>
-</g>
-<g stroke="none" fill="#423d3e">
-<path d="M 227 45 L 235 44 L 235 42 C 231.489 42 227.854 41.0129 227 45 z"/>
-</g>
-<g stroke="none" fill="#1d1d17">
-<path d="M 4 44 L 5 49 C 2.8932 50.9989 3.88132 53.2935 2.99228 56.0008 C -0.36849 66.2348 -1.64388 71.2609 10 75 L 8 82 L 17 78 L 19 73 L 22 69 L 24 70 L 27 72 L 27 65 L 32 61 C 24.4467 62.3012 12.5743 62.2532 18 51 z"/>
-</g>
-<g stroke="none" fill="#2f2b20">
-<path d="M 37 45 L 35 48 L 43 55 L 40 50 C 50.9047 50.3527 57.5572 61.3641 65 68 L 66 68 L 67 63 L 56 57 L 56 56 L 64 59 L 62 51 z"/>
-</g>
-<g stroke="none" fill="#827059">
-<path d="M 95 47 C 97.0342 53.134 102.326 53.9571 108 56 L 103 62 L 107 63 L 117 58 C 113.718 52.7917 101.04 48.4766 95 47 z"/>
-</g>
-<g stroke="none" fill="#7f7471">
-<path d="M 160 48 C 162.256 51.4308 165.889 50.9539 167 47 z"/>
-</g>
-<g stroke="none" fill="#928161">
-<path d="M 159 57 L 158 50 C 152.904 51.7057 154.904 55.4323 159 57 z"/>
-</g>
-<g stroke="none" fill="#443832">
-<path d="M 235 50 L 233 56 L 238 50 z"/>
-</g>
-<g stroke="none" fill="#101010">
-<path d="M 158 54 L 165 62 L 166 59 L 167 59 L 167 64 L 167 65 L 171 65 L 170 52 z"/>
-</g>
-<g stroke="none" fill="#5f5c46">
-<path d="M 184 52 L 193 55 z"/>
-</g>
-<g stroke="none" fill="#2a261a">
-<path d="M 90 58 C 98.4494 57.3234 101.082 65.5019 108 56 C 102.752 53.3714 91.4585 49.6005 90 58 z"/>
-</g>
-<g stroke="none" fill="#655f3d">
-<path d="M 118 56 L 126 56 L 126 53 z"/>
-</g>
-<g stroke="none" fill="#3a3a0a">
-<path d="M 202 56 L 206 60 L 207 60 L 212 54 C 208.082 52.8449 204.405 52.29 202 56 z"/>
-</g>
-<g stroke="none" fill="#23261b">
-<path d="M 198 64 L 196 70 L 197 70 C 200.458 64.3392 207.845 63.4912 214 64 L 210 56 L 208 56 L 207 60 L 206 60 L 202 54 C 197.021 56.1128 196.834 59.0317 198 64 z"/>
-</g>
-<g stroke="none" fill="#dd880c">
-<path d="M 152 56 L 153 60 L 147 64 L 143 62 L 144 71 L 144 65 L 148 68 L 149 68 L 149 62 L 150 62 L 151 64 L 156 59 L 157 62 L 163 61 C 159.965 57.3707 156.764 55.6878 152 56 z"/>
-</g>
-<g stroke="none" fill="#594f36">
-<path d="M 56 56 L 56 57 L 71 65 C 67.8917 60.292 61.466 57.054 56 56 z"/>
-</g>
-<g stroke="none" fill="#df7e17">
-<path d="M 136 56 L 130 62 L 131 59 L 130 58 L 127 59 C 124.018 55.9325 119.548 59.5991 117 62 L 120 62 L 120 67 L 121 67 L 121 62 L 132 67 L 137 61 L 140 62 z"/>
-</g>
-<g stroke="none" fill="#5f400a">
-<path d="M 137 56 L 139 59 z"/>
-</g>
-<g stroke="none" fill="#594836">
-<path d="M 34 57 L 40 60 z"/>
-</g>
-<g stroke="none" fill="#c66602">
-<path d="M 81 60 L 85 63 L 87 57 z"/>
-</g>
-<g stroke="none" fill="#fdb219">
-<path d="M 91 57 L 90 61 L 86 60 C 85.1773 63.6318 85.8292 65.0524 89 67 L 84 71 L 84 65 L 82 65 L 82 69 L 79 68 L 81 76 L 77 75 C 77.6916 78.2276 79.1009 78.0203 82 77 L 82 86 L 76 84 L 86 89 L 86 82 L 93 83 L 92 80 L 94 81 L 89 79 L 89 75 L 97 79 L 99 73 C 99.1436 76.0394 100.026 76.4942 103 77 L 102 71 L 105 76 L 106 76 L 110 71 C 109.596 73.7457 111.565 89.6836 113 83 L 122 91 L 122 84 L 129 86 L 131 79 L 117 82 L 113 74 L 122 70 L 126 71 L 127 76 L 131 75 L 134 83 L 134 84 L 131 88 C 124.674 89.0884 123.652 95.717 129 99 L 128 103 L 131 101 L 133 108 L 132 102 C 135.878 101.368 138.737 100.225 139 96 L 142 95 L 142 94 L 135 95 L 134 92 L 144 90 C 145.005 93.0156 145.821 94.7053 143 94 L 150 97 L 152 101 L 143 85 C 137.44 83.8164 135.611 80.4137 136 75 L 132 72 L 142 79 L 141 63 L 132 67 L 123 63 L 123 68 L 122 68 L 120 67 L 119 64 L 118 64 L 112 72 C 108.869 63.7013 99.7783 58.4267 91 57 z"/>
-</g>
-<g stroke="none" fill="#6e3a03">
-<path d="M 127 57 L 127 59 L 129 59 z"/>
-</g>
-<g stroke="none" fill="#554e29">
-<path d="M 151 57 L 153 60 z"/>
-</g>
-<g stroke="none" fill="#3a381e">
-<path d="M 215 58 L 215 61 L 219 61 C 220.113 67.4081 224.916 65.1949 226 60 L 220 62 z"/>
-</g>
-<g stroke="none" fill="#474029">
-<path d="M 55 59 L 57 66 L 45 62 L 54 68 L 54 69 C 47.3125 71.4668 29.633 76.3316 26 82 L 52.9992 72.3519 L 65 66 z"/>
-</g>
-<g stroke="none" fill="#f77b00">
-<path d="M 72 60 C 71.9351 63.9487 70.9318 65.3534 67 66 L 66 71 L 77 71 L 74 82 L 66 87 C 67.207 82.4297 66.0603 79.5619 61 80 L 61 82 L 64 83 L 63 87 C 70.0838 89.9841 73.2771 97.3473 81 96 L 78 90 L 84 89 L 85 92 L 88 90 L 76 84 L 82 86 L 82 77 L 77 75 L 81 76 L 76 59 z"/>
-</g>
-<g stroke="none" fill="#3c382a">
-<path d="M 107 64 L 108 64 L 111 59 z"/>
-</g>
-<g stroke="none" fill="#19190f">
-<path d="M 110 67 L 113 65 L 117 66 L 118 59 C 112.193 59.0686 107.699 60.4182 110 67 z"/>
-</g>
-<g stroke="none" fill="#f99f1a">
-<path d="M 155 59 L 150 62 L 149 62 L 149 68 L 148 68 L 144 65 L 144 71 C 146.759 74.4797 146.674 78.796 152 78 L 155 82 L 155 83 L 151 82 C 152.287 87.8856 162.458 83.13 164 79 L 171 79 L 172 80 L 170 85 L 172 83 L 177 84 L 177 83 L 174 77 L 177 80 L 185 80 L 176.479 74.4861 L 167 65 L 166 59 L 161 64 L 160 61 L 157 62 z"/>
-</g>
-<g stroke="none" fill="#9e6416">
-<path d="M 71 60 L 71 65 L 66 65 L 66 69 L 67 69 L 67 66 C 71.0761 65.6747 73.4482 63.9759 71 60 z"/>
-</g>
-<g stroke="none" fill="#5e4f40">
-<path d="M 140 60 L 139 63 C 141.566 62.4493 141.86 61.8602 140 60 z"/>
-</g>
-<g stroke="none" fill="#4e230b">
-<path d="M 160 60 L 163 64 z"/>
-</g>
-<g stroke="none" fill="#91540d">
-<path d="M 167.333 60.6667 L 167.667 61.3333 L 167.333 60.6667 z"/>
-</g>
-<g stroke="none" fill="#592e04">
-<path d="M 137 61 L 140 64 z"/>
-</g>
-<g stroke="none" fill="#6f471c">
-<path d="M 144 62 L 144 63 L 147 64 L 147 61 z"/>
-</g>
-<g stroke="none" fill="#ee7000">
-<path d="M 93 62 L 91 65 L 93 65 L 91 68 L 96 69 z"/>
-</g>
-<g stroke="none" fill="#8a582e">
-<path d="M 117 65 L 120 62 L 118 62 z"/>
-</g>
-<g stroke="none" fill="#fcac54">
-<path d="M 121 62 L 122 68 L 123 68 z"/>
-</g>
-<g stroke="none" fill="#753702">
-<path d="M 142 62 L 142 66 L 143 66 z"/>
-</g>
-<g stroke="none" fill="#a1621e">
-<path d="M 168 62 L 167 64 L 169 64 z"/>
-</g>
-<g stroke="none" fill="#312d1a">
-<path d="M 215 70 L 211 67 L 211 72 L 217 71 L 216 77 L 224 81 L 223 72 C 228.264 72 236.485 73.6171 240 69 C 234.658 68.8249 232.903 67.4046 234 62 z"/>
-</g>
-<g stroke="none" fill="#c35200">
-<path d="M 84 65 L 84 71 L 89 67 z"/>
-</g>
-<g stroke="none" fill="#70411d">
-<path d="M 113 65 L 117 67 z"/>
-</g>
-<g stroke="none" fill="#884905">
-<path d="M 137 65 L 137 66 L 140 66 z"/>
-</g>
-<g stroke="none" fill="#ba5802">
-<path d="M 81 66 L 80 69 z"/>
-</g>
-<g stroke="none" fill="#e3a15a">
-<path d="M 112 67 L 115 69 L 114 66 z"/>
-</g>
-<g stroke="none" fill="#89480a">
-<path d="M 70 68 L 73 70 L 72 67 z"/>
-</g>
-<g stroke="none" fill="#c0700f">
-<path d="M 110 67 L 112 72 L 117 67 z"/>
-</g>
-<g stroke="none" fill="#9b540b">
-<path d="M 62 68 C 60.4461 70.2102 60.7262 70.5858 63 72 z"/>
-</g>
-<g stroke="none" fill="#fe9b0f">
-<path d="M 63 68 L 66 87 L 74 82 L 77 71 C 72.6874 70.2936 68.612 72.2268 66 68 z"/>
-</g>
-<g stroke="none" fill="#574b3f">
-<path d="M 197 68 L 198 74 L 204 73 z"/>
-</g>
-<g stroke="none" fill="#4c4a36">
-<path d="M 17 73 L 22 69 z"/>
-</g>
-<g stroke="none" fill="#e47303">
-<path d="M 121 70 L 113 74 L 117 82 L 121 80 L 117 78 L 117 77 L 131 79 L 131 83 L 132 83 L 131 75 L 127 76 L 126 71 z"/>
-</g>
-<g stroke="none" fill="#a85f09">
-<path d="M 173.333 70.6667 L 173.667 71.3333 L 173.333 70.6667 z"/>
-</g>
-<g stroke="none" fill="#ff9a12">
-<path d="M 205 70 L 201 74 L 206 87 C 203.595 89.8163 210.351 94.0082 211 90 L 223 91 L 224 101 C 220.474 102.909 219.301 105.036 219 109 L 217 109 C 215.936 101.736 209.469 101.077 204 98 L 200 102 L 205 109 L 208 122 L 207 122 L 206 120 L 204 122 L 204 118 C 198.69 124.903 202.291 130.235 210 131 L 214 127 L 213 132 L 214 132 L 224 127 L 224 126 L 222 119 L 230 114 L 230 113 L 226 102 L 231 103 L 234 98 C 232.266 94.6461 225.625 91.1077 230 88 L 229 78 L 225 77 L 224 81 L 218 79 L 219 77 L 216 77 L 217 71 L 213 75 L 206 74 z"/>
-</g>
-<g stroke="none" fill="#963f0e">
-<path d="M 206 70 L 206 74 L 207 74 z"/>
-</g>
-<g stroke="none" fill="#181a11">
-<path d="M 0 71 L 3 88 L 6 88 L 6 95 L 16.3897 101.397 L 29 104 L 29 105 L 15 106 L 21 116 L 13 117 L 15 115 L 15 114 L 8 105 L 0 105 L 0 113 L 9 114 L 9 116 L 0 115 C 0 123.547 -4.36789 153.459 12 145 C 11.2078 151.448 11.9561 156.933 19 159 C 20.916 155.98 30.4891 147.605 23 146 L 25 141 L 11 138 L 11 136 L 20 138 L 12 134 L 31 130 L 30 134 C 33.6145 131.787 33.764 128.984 33 125 L 36 124 L 31 120 L 33 118 L 33 117 L 26 116 L 34 107 L 30 114 C 36.9405 113.917 37.4817 111.265 39 105 L 35 105 C 37.7222 95.9575 29.9601 92.6815 25 86 L 44 89 L 43 86 L 54 89 L 57 91 L 60 81 L 57 81 L 60 77 L 59 74 L 62 71 L 21 82 L 18 74 L 17 74 L 17 78 L 8 82 L 10 75 z"/>
-</g>
-<g stroke="none" fill="#f48405">
-<path d="M 102 71 L 103 77 L 99 73 C 95.5326 73.7585 96.688 75.9192 97 79 L 89 75 L 89 79 C 94.3207 79.5996 95.8873 81.9444 97 87 L 92 86 L 92 87 L 98 94 L 102 93 C 99.6297 98.197 95.2363 98.9804 90 100 L 90 101 L 96 103 L 96 104 C 88.4364 106.382 90.0139 113.788 96 117 L 95 120 L 99 122 L 100 122 L 103 115 L 99 116 L 100 113 L 95 112 L 94 105 C 95.2407 105.541 96.4868 106.143 97.7593 106.612 C 108.517 110.576 98.9397 97.8793 106 97 L 105 94 L 109 95 L 109 94 L 103 94 L 103 90 L 113 93 L 115 97 L 114 91 L 117 92 L 115 83 L 113 86 L 110 85 L 110 71 L 106 76 L 105 76 z"/>
-</g>
-<g stroke="none" fill="#ffba31">
-<path d="M 144 71 L 142 79 L 132 72 L 136 75 C 135.157 80.1993 136.36 81.5867 140 85 L 141 85 C 144.875 81.349 150.084 82.3923 155 83 L 155 82 L 152 78 C 147.767 80.1315 144.66 81.4612 143 76 L 147 77 L 146 71 z"/>
-</g>
-<g stroke="none" fill="#070707">
-<path d="M 223 72 L 224 77 L 228 76 L 230 78 L 230 79 L 230 80 L 228 89 L 240 92 L 240 71 z"/>
-<path d="M 145 164 C 142.743 167.768 142.167 169.944 144 174 C 149.11 171.568 148.793 168.954 147 164 z"/>
-</g>
-<g stroke="none" fill="#62411e">
-<path d="M 61 73 L 63 79 L 64 79 L 63 72 z"/>
-</g>
-<g stroke="none" fill="#3f1d07">
-<path d="M 168 74 L 171 72 z"/>
-</g>
-<g stroke="none" fill="#d96a03">
-<path d="M 184 72 L 184 77 L 183 81 L 188 82 L 191 73 z"/>
-</g>
-<g stroke="none" fill="#ae5e0f">
-<path d="M 175 73 L 178 76 z"/>
-</g>
-<g stroke="none" fill="#783c0a">
-<path d="M 183 73 L 185 77 L 186 77 z"/>
-</g>
-<g stroke="none" fill="#cc7104">
-<path d="M 59 74 L 59 79 C 61.0339 77.2315 61.0339 75.7685 59 74 z"/>
-</g>
-<g stroke="none" fill="#fea81c">
-<path d="M 61 74 L 61 79 L 58 77 L 57 77 L 57 81 L 63 80 z"/>
-</g>
-<g stroke="none" fill="#aa6a13">
-<path d="M 62 74 L 62 79 L 63 79 z"/>
-</g>
-<g stroke="none" fill="#ffca2a">
-<path d="M 190 74 L 188 82 L 183 81 L 184 86 L 197 80 L 193 92 L 196 93 C 194.851 98.0779 195.841 100.831 200 104 L 204 98 L 214 99 L 213 103 L 217 109 L 219 109 L 222 101 L 218 104 L 217 104 L 220 98 L 219 91 L 211 90 C 211 94.9439 203.42 88.7741 206 87 L 200 78 z"/>
-</g>
-<g stroke="none" fill="#cc7100">
-<path d="M 198 74 L 203 84 C 202.482 79.3063 203.146 75.5667 198 74 z"/>
-</g>
-<g stroke="none" fill="#ffd559">
-<path d="M 143 76 C 143.652 79.9108 145.136 80.6998 149 81 z"/>
-</g>
-<g stroke="none" fill="#ac771d">
-<path d="M 179 76 L 179 77 L 183 77 z"/>
-</g>
-<g stroke="none" fill="#6f420a">
-<path d="M 198 76 L 194 77 L 194 78 z"/>
-</g>
-<g stroke="none" fill="#9d5718">
-<path d="M 226.667 76.3333 L 227.333 76.6667 L 226.667 76.3333 z"/>
-</g>
-<g stroke="none" fill="#754d1c">
-<path d="M 58 77 L 58 79 L 60 77 z"/>
-</g>
-<g stroke="none" fill="#ffc85f">
-<path d="M 117 77 L 117 78 L 125 78 z"/>
-</g>
-<g stroke="none" fill="#ff9700">
-<path d="M 126 77 L 121 80 L 121 81 L 128 81 z"/>
-</g>
-<g stroke="none" fill="#ff9903">
-<path d="M 174 77 L 177 83 L 177 84 L 172 83 C 170.494 85.6779 169.469 87.2577 173 88 L 173 95 L 169 96 L 169 92 C 158.43 99.4695 177.144 109.783 184 110 L 183 107 L 175 100 L 177 102 L 178 102 L 175 95 L 178 94 L 176 89 L 182 90 L 180 98 L 186 96 L 185 92 L 187 95 L 191 96 L 190 93 L 198 103 L 196 93 L 193 92 L 197 80 L 184 86 L 184 79 L 177 80 z"/>
-</g>
-<g stroke="none" fill="#b86319">
-<path d="M 219 77 L 218 79 L 220 79 z"/>
-</g>
-<g stroke="none" fill="#6b3109">
-<path d="M 229.333 78.6667 L 229.667 79.3333 L 229.333 78.6667 z"/>
-</g>
-<g stroke="none" fill="#b74f00">
-<path d="M 164 79 C 160.889 83.0831 158.021 83.9407 153 84 L 153 85 L 158 88 L 151 82 L 146 82 L 150 95 L 156 92 L 158 98 L 166 98 L 172 80 L 171 79 z"/>
-</g>
-<g stroke="none" fill="#cc6c00">
-<path d="M 92 80 L 92 85 L 97 87 L 96 80 z"/>
-</g>
-<g stroke="none" fill="#302f1d">
-<path d="M 0 81 L 0 102 L 7 103 L 7 98 C 13.7203 102.124 18.1778 103 26 103 L 26 102 L 6 95 L 6 88 L 3 88 z"/>
-</g>
-<g stroke="none" fill="#6d3600">
-<path d="M 60 81 L 57 91 L 63 89 L 64 83 z"/>
-</g>
-<g stroke="none" fill="#ffc534">
-<path d="M 86 82 C 86.1105 91.3435 91.3101 89.051 97 94 C 78.2356 94.8203 98.367 105.98 102 93 L 98 94 C 97.1879 90.0682 95.7858 88.3607 92 87 L 94 85 z"/>
-</g>
-<g stroke="none" fill="#ffd54b">
-<path d="M 141 86 L 148 89 C 147.777 84.3693 142.828 79.5637 141 86 z"/>
-</g>
-<g stroke="none" fill="#cf5200">
-<path d="M 71 83 L 70 88 C 73.0359 86.9996 73.4943 86.1372 73 83 z"/>
-</g>
-<g stroke="none" fill="#ffbd23">
-<path d="M 129 86 L 122 84 L 122 91 L 117 85 L 115 85 L 117 92 L 114 91 L 115 97 L 112 96 L 113 93 L 103 90 L 103 94 L 109 94 L 109 95 L 105 94 L 106 97 C 99.2122 97.311 104.283 103.489 103 108 L 115 106 L 109 113 L 113 112 L 115 117 L 112 120 L 115 119 L 116 122 L 117 122 L 116 116 L 119 113 L 125 115 L 125 119 L 121 118 L 119 125 L 123 125 L 120 130 L 124 130 C 125.27 125.623 127.546 124.337 132 124 L 130 119 L 146 107 L 146 112 L 153 112 L 150 104 L 154 105 L 154 101 L 143 94 C 145.626 94 144.791 92.2371 144 90 L 134 92 L 135 95 C 136.869 94.3404 143.348 93.7132 139 96 C 139.144 100.028 135.511 101.353 132 102 L 133 108 L 131 101 L 126 109 L 114 103 L 115 99 L 116 99 C 118.097 105.639 124.153 103.715 129 101 L 129 99 C 124.614 95.0066 124.934 89.8985 131 88 L 134 84 C 131.387 82.502 129.646 82.9876 129 86 z"/>
-</g>
-<g stroke="none" fill="#ca5102">
-<path d="M 105 84 L 104 88 L 109 86 z"/>
-</g>
-<g stroke="none" fill="#fdbf2e">
-<path d="M 152 85 L 152 86 L 158 88 z"/>
-</g>
-<g stroke="none" fill="#453c13">
-<path d="M 25 88 L 30 87 L 27 89 L 27 90 L 37 100 L 40 97 L 31 90 L 51 90 L 43 86 L 44 89 C 38.6316 87.6076 29.6475 82.6814 25 88 z"/>
-</g>
-<g stroke="none" fill="#725a22">
-<path d="M 26 87 L 26 89 L 30 89 L 30 87 z"/>
-</g>
-<g stroke="none" fill="#a14600">
-<path d="M 63 87 L 58 90 L 58 91 L 68 91 L 69 94 L 72 90 z"/>
-</g>
-<g stroke="none" fill="#ffaf17">
-<path d="M 170 88 L 169 96 L 173 95 L 173 88 z"/>
-</g>
-<g stroke="none" fill="#a2702c">
-<path d="M 227 88 L 229 91 z"/>
-</g>
-<g stroke="none" fill="#c86100">
-<path d="M 52 89 L 43 95 L 50 99 L 50 100 C 46.9317 102.782 49.8492 104.484 53 104 L 54 93 L 52 93 z"/>
-</g>
-<g stroke="none" fill="#723d02">
-<path d="M 53 89 L 52 93 L 56 92 z"/>
-</g>
-<g stroke="none" fill="#f7b449">
-<path d="M 78 90 C 79.1009 92.696 80.8376 94.3097 78 96 L 78 97 L 85 100 L 86 96 L 84 89 z"/>
-</g>
-<g stroke="none" fill="#ffc428">
-<path d="M 176 89 L 175 95 L 178 96 L 187 111 L 196 113 C 196.675 107.313 196.721 94.9076 190 93 L 191 96 L 187 95 C 187.575 92.6038 187.475 92.513 185 92 L 186 96 L 180 98 L 182 90 z"/>
-</g>
-<g stroke="none" fill="#242216">
-<path d="M 31 90 C 35.5551 96.3102 40.5671 98.4149 45 91 z"/>
-</g>
-<g stroke="none" fill="#423a1c">
-<path d="M 227 90 C 229.836 95.0597 237.358 101.682 226 102 C 228.628 107.162 231.867 109.066 229 115 C 232.051 117.628 232.325 119.218 231 123 L 232 124 L 237 117 L 238 117 L 239 120 L 240 120 L 240 109 L 236 109 L 235 95 L 239 99 L 240 99 L 240 92 z"/>
-</g>
-<g stroke="none" fill="#fba61a">
-<path d="M 53 104 C 49.9168 103.868 48.2921 102.981 50 100 L 50 99 L 45 94 L 41 96 L 48 107 L 41 114 L 42 118 L 47 118 L 47 123 L 51 120 L 52 123 L 57 124 L 54 120 C 56.0559 116.386 57.6496 114.033 56 110 C 61.2633 108.236 59.3171 102.335 58 98 L 63 97 L 61 105 L 64 104 L 69 105 L 67 99 L 70 97 L 71 97 L 70 109 L 74 107 L 75 107 L 76 112 L 77 109 L 81 114 L 77 114 L 82 129 L 72 125 L 73 130 L 64 128 L 63 125 L 60 127 L 60 128 C 62.0583 131.576 69.2194 139.309 71 131 L 75 132 L 74 128 L 77 139 C 82.7324 138.279 87.6991 137.482 92 142 L 93 142 L 94 139 L 102 136 L 98 130 L 100 127 L 94 127 L 92 116 L 88 115 L 88 119 L 90 118 L 87 124 L 86 118 L 85 118 L 85 124 L 84 119 L 83 115 L 86 117 L 84 108 L 87 110 L 88 110 L 89 105 L 90 105 L 91 108 L 96 104 L 96 103 C 89.4858 100.35 75.2189 99.3093 73 92 L 68 91 C 58.408 91.5029 51.0814 91.8953 53 104 z"/>
-</g>
-<g stroke="none" fill="#a95b00">
-<path d="M 86 96 L 85 100 L 90 102 C 87.8714 97.1647 89.1721 95.2801 92 91 C 89.0096 91.0126 78.8184 94.49 86 96 z"/>
-</g>
-<g stroke="none" fill="#ed8301">
-<path d="M 89 95 L 97 94 C 94.3021 90.5236 91.4987 92.0729 89 95 z"/>
-</g>
-<g stroke="none" fill="#f28502">
-<path d="M 219 91 L 220 98 L 217 104 L 218 104 L 218 101 C 223.808 99.9905 221.738 95.5326 223 91 z"/>
-</g>
-<g stroke="none" fill="#802500">
-<path d="M 154 92 C 151.542 95.6431 149.871 99.2968 155 101 L 158 111 L 154 111 L 152 119 L 152 122 L 156 123 L 161 112 L 156 102 C 161.257 100.873 157.576 95.3185 156 92 z"/>
-</g>
-<g stroke="none" fill="#ea9744">
-<path d="M 48 94 L 52 96 z"/>
-</g>
-<g stroke="none" fill="#151610">
-<path d="M 235 95 L 236 109 L 240 109 C 239.999 103.391 240.644 97.8786 235 95 z"/>
-</g>
-<g stroke="none" fill="#9e4804">
-<path d="M 40 97 L 41 102 L 42 102 z"/>
-</g>
-<g stroke="none" fill="#c56a0f">
-<path d="M 42 97 L 45 108 L 48 107 z"/>
-</g>
-<g stroke="none" fill="#882900">
-<path d="M 58 98 L 58 99 L 63 97 z"/>
-</g>
-<g stroke="none" fill="#f57800">
-<path d="M 70 97 L 67 99 L 69 105 L 61 105 L 62 100 L 56 112 C 65.629 111.22 68.349 115.61 77 119 L 77 114 L 81 114 L 77 109 L 77 112 L 76 112 L 75 107 L 74 107 L 70 109 z"/>
-</g>
-<g stroke="none" fill="#dc7a08">
-<path d="M 147 97 L 150 100 z"/>
-</g>
-<g stroke="none" fill="#47400b">
-<path d="M 7 98 L 7 103 L 0 102 L 0 105 L 29 105 L 29 104 z"/>
-</g>
-<g stroke="none" fill="#756162">
-<path d="M 39 98 L 36 104 C 39.4467 103.025 41.2919 101.232 39 98 z"/>
-</g>
-<g stroke="none" fill="#ffd37a">
-<path d="M 117 99 L 124 103 C 122.454 99.3095 120.978 98.0805 117 99 z"/>
-</g>
-<g stroke="none" fill="#4e2300">
-<path d="M 159 98 L 156 102 C 158.227 106.584 161.022 117.019 166 118 L 166 122 L 172 121 L 166 115 L 172 116 L 170 110 L 162 106 L 167 105 C 166.678 99.1964 164.584 98.0666 159 98 z"/>
-</g>
-<g stroke="none" fill="#cb8215">
-<path d="M 232 98 L 232 101 L 234 98 z"/>
-</g>
-<g stroke="none" fill="#e67a01">
-<path d="M 115 99 L 114 103 L 121 105 z"/>
-</g>
-<g stroke="none" fill="#dd6000">
-<path d="M 211 102 L 214 99 z"/>
-</g>
-<g stroke="none" fill="#7a3506">
-<path d="M 222 99 L 222 101 L 224 101 z"/>
-</g>
-<g stroke="none" fill="#ea8300">
-<path d="M 175 100 C 176.672 103.935 178.491 107.07 183 107 L 184 110 L 187 110 C 187.877 103.168 180.13 103.018 175 100 z"/>
-</g>
-<g stroke="none" fill="#cc5800">
-<path d="M 154 101 L 154 105 L 150 104 L 153 115 C 148.013 114.156 141.14 110.551 139 117 L 147 122 L 147 116 C 151.248 116.426 154.748 115.91 154 111 L 158 111 z"/>
-</g>
-<g stroke="none" fill="#d36602">
-<path d="M 167 101 L 166 107 L 169 109 L 176 108 L 176 107 z"/>
-</g>
-<g stroke="none" fill="#4f3f31">
-<path d="M 35 102 L 43 108 L 42 102 z"/>
-</g>
-<g stroke="none" fill="#954c00">
-<path d="M 120 105 L 126 109 L 128 102 z"/>
-</g>
-<g stroke="none" fill="#dd6400">
-<path d="M 203 104 L 203 105 L 208 109 L 206 106 L 208 102 z"/>
-</g>
-<g stroke="none" fill="#652c04">
-<path d="M 42 103 L 42 109 C 45.8872 108.163 44.9912 104.597 42 103 z"/>
-</g>
-<g stroke="none" fill="#c6640e">
-<path d="M 197 103 C 196.822 107.08 196.63 110.713 193 113 L 193 114 L 198 114 L 198 116 L 194 116 L 194 117 L 201 125 L 202 125 L 204 118 L 204 122 L 207 122 L 208 122 L 205 109 z"/>
-</g>
-<g stroke="none" fill="#ffbf3c">
-<path d="M 226 104 L 228 113 C 234.009 110.979 229.764 106.148 226 104 z"/>
-</g>
-<g stroke="none" fill="#37342f">
-<path d="M 7 106 L 15 114 L 15 115 L 13 117 L 21 116 L 16 105 z"/>
-</g>
-<g stroke="none" fill="#ffbe2f">
-<path d="M 89 105 L 88 110 L 87 110 L 84 108 L 86 117 L 83 115 L 84 119 L 88 119 L 88 115 L 92 116 L 94 127 L 100 127 L 98 130 L 101 132 L 108 126 L 108 120 C 104.507 119.598 102.08 118.883 100 122 L 99 122 L 99 119 L 95 120 L 96 117 z"/>
-</g>
-<g stroke="none" fill="#c74f00">
-<path d="M 94 105 L 96 107 L 95 112 L 101 112 L 103 108 z"/>
-</g>
-<g stroke="none" fill="#f3ad37">
-<path d="M 162 106 L 162 108 L 169 109 C 167.281 106.024 165.294 105.199 162 106 z"/>
-</g>
-<g stroke="none" fill="#fda216">
-<path d="M 113 106 L 103 108 L 101 112 L 97 110 L 100 113 L 99 116 L 103 115 L 102 119 L 108 120 C 107.453 123.56 108.51 124.419 112 125 L 109 128 L 109 129 L 117 138 L 124 135 C 125.3 140.306 139.876 146.261 142 139 C 138.508 137.943 137.568 136.582 137 133 L 141 134 C 138.711 129.849 135.421 130.016 131 130 L 131 129 C 141.127 125.809 140.178 131.571 149 133 C 148.477 135.54 148.405 135.685 151 136 L 151 137 L 148 137 L 148 138 L 154 139 L 152 135 L 156 134 L 156 133 L 149 131 L 149 130 L 150 122 L 142 117 L 130 119 L 132 124 C 127.275 124.154 124.785 125.077 124 130 L 120 130 L 123 125 L 119 125 L 121 118 L 115 119 L 112 120 L 115 117 L 113 112 L 109 113 L 115 106 z"/>
-</g>
-<g stroke="none" fill="#5f4f41">
-<path d="M 31 107 L 26 116 L 35 118 L 36 114 L 30 114 L 34 107 z"/>
-</g>
-<g stroke="none" fill="#f2810f">
-<path d="M 37 108 L 36 123 L 37 123 L 41 120 L 43 126 L 40 125 L 57 142 L 53 125 L 55 123 L 52 123 L 51 120 L 47 123 L 47 118 L 42 118 L 41 114 C 47.579 111.807 41.5831 107.255 37 108 z"/>
-</g>
-<g stroke="none" fill="#e37501">
-<path d="M 134 117 L 139 118 C 141.18 110.818 147.405 114.443 153 115 L 146 112 L 146 107 C 140.435 108.41 135.637 111.266 134 117 z"/>
-</g>
-<g stroke="none" fill="#754e05">
-<path d="M 164 109 L 164 110 L 170 110 C 171.32 117.43 174.68 120.437 181 124 L 174 118 L 178 114 L 184 117 L 191 114 L 192 118 L 198 116 L 198 114 C 190.612 113.335 187.204 109.555 180 113 C 177.681 106.054 169.731 108.766 164 109 z"/>
-</g>
-<g stroke="none" fill="#f3980b">
-<path d="M 199 109 L 199 115 L 206 118 L 206 114 L 200 113 L 201 109 z"/>
-</g>
-<g stroke="none" fill="#ffc231">
-<path d="M 54 120 L 68 120 L 68 119 L 61 116 L 66 111 C 59.4053 110.434 56.3328 114.225 54 120 z"/>
-</g>
-<g stroke="none" fill="#ffd777">
-<path d="M 122 110 L 122 114 L 125 114 L 125 110 z"/>
-</g>
-<g stroke="none" fill="#b08f51">
-<path d="M 180 113 L 184 110 z"/>
-</g>
-<g stroke="none" fill="#ffbc35">
-<path d="M 49 112 L 50 116 L 54 115 z"/>
-</g>
-<g stroke="none" fill="#c35700">
-<path d="M 64 112 L 61 116 L 74 121 L 72 125 L 82 129 C 79.737 120.723 72.3236 114.286 64 112 z"/>
-</g>
-<g stroke="none" fill="#291f0f">
-<path d="M 158 112 C 157.989 115.293 156.181 119.976 156.848 123 C 157.823 127.421 162.785 129.942 162.922 134.985 C 163.072 140.492 156.9 141.585 161 147 L 150 146 L 147 153 L 146 153 L 147 143 L 146 143 L 145 147 L 144 147 L 143 145 L 138 150 L 141 142 L 124 141 C 123.026 145.829 121.88 148.523 126 152 L 129 149 C 129.038 153.571 128.827 158.37 133 161 L 131 159 L 138 153 C 137.541 155.722 138.885 161.194 140 156 L 141 156 L 138 165 L 144 162 L 145 164 L 146 164 L 151 157 L 148 166 C 148.476 170.211 147.436 171.618 144 174 L 139 169 C 139.153 174.164 140.676 178.506 146 180 L 146 177 L 149 177 L 149 180 L 152 180 C 155.338 174.412 158.842 174.005 165 174 L 163 170 L 171 163 L 167 155 L 173 151 L 173 150 C 171.997 147.635 176.11 141.12 178 145 L 183 142 L 179 151 L 194 153 L 195 142 L 200 142 L 200 140 C 195.606 139.665 193.709 138.444 193 134 L 199 136 L 207 137 L 208 131 C 198.01 129.379 191.698 133.068 190 120 L 185 127 L 166 115 L 172 121 L 166 122 L 166 118 L 161 112 z"/>
-</g>
-<g stroke="none" fill="#3a331a">
-<path d="M 0 113 L 9 116 L 9 114 z"/>
-</g>
-<g stroke="none" fill="#e96f02">
-<path d="M 119 113 L 116 116 L 117 119 L 122 118 z"/>
-</g>
-<g stroke="none" fill="#a74c01">
-<path d="M 36 114 L 31 118 L 35 123 L 36 123 z"/>
-</g>
-<g stroke="none" fill="#b3986b">
-<path d="M 176 114 L 183 124 z"/>
-</g>
-<g stroke="none" fill="#5c2e00">
-<path d="M 179 117 L 183 124 L 175 121 L 185 127 L 191 121 L 191 114 L 184 117 C 183.192 113.157 180.978 114.535 179 117 z"/>
-</g>
-<g stroke="none" fill="#0d0d0c">
-<path d="M 227 114 C 227.308 118.089 228.3 120.135 232 122 C 233.007 117.47 231.259 115.497 227 114 z"/>
-</g>
-<g stroke="none" fill="#6b2e00">
-<path d="M 121 115 L 125 119 L 125 115 z"/>
-</g>
-<g stroke="none" fill="#a93e00">
-<path d="M 154 115 L 147 116 L 147 120 C 150.356 119.616 154.935 119.286 154 115 z"/>
-</g>
-<g stroke="none" fill="#95642a">
-<path d="M 175 115 L 174 118 L 178 120 z"/>
-</g>
-<g stroke="none" fill="#ffd167">
-<path d="M 133 117 L 133 121 L 137 120 L 137 118 z"/>
-</g>
-<g stroke="none" fill="#ffc329">
-<path d="M 190 124 C 192.895 125.766 192.816 129.214 195.457 130.957 C 205.767 137.76 199.801 108.366 191.178 120.104 C 190.336 121.251 190.271 122.673 190 124 z"/>
-</g>
-<g stroke="none" fill="#ffc028">
-<path d="M 225 117 L 222 119 L 224 126 L 224 127 L 214 132 L 213 132 L 214 127 C 199.152 132.323 223.054 152.658 222.947 136.024 C 222.935 134.194 222.512 132.731 222 131 L 232 131 C 233.183 124.194 230.286 121.014 225 117 z"/>
-</g>
-<g stroke="none" fill="#984604">
-<path d="M 226.333 117.667 L 226.667 118.333 L 226.333 117.667 z"/>
-</g>
-<g stroke="none" fill="#10100e">
-<path d="M 237 117 C 231.019 126.193 225.364 138.464 239 143 C 239.066 135.023 243.021 123.426 237 117 z"/>
-</g>
-<g stroke="none" fill="#ff8100">
-<path d="M 89 118 L 86 120 L 87 124 C 89.5545 122.35 90.098 120.88 89 118 z"/>
-</g>
-<g stroke="none" fill="#e88604">
-<path d="M 61 123 L 74 123 L 70 119 z"/>
-</g>
-<g stroke="none" fill="#d65900">
-<path d="M 82 119 L 85 124 L 85 119 z"/>
-</g>
-<g stroke="none" fill="#de7507">
-<path d="M 147 122 C 150.104 123.991 150.847 126.782 149 130 L 149 131 L 158 133 L 158 132 L 155 132 L 153 129 L 153 128 L 162 131 L 151 119 z"/>
-</g>
-<g stroke="none" fill="#934000">
-<path d="M 38 120 L 34 124 L 34 126 L 39 127 L 42 135 L 34 134 L 32 136 L 32 137 L 33 139 C 38.458 136.23 41.6268 135.454 47 139 L 50 137 L 54 141 L 40 125 L 43 126 L 41 120 z"/>
-</g>
-<g stroke="none" fill="#b95000">
-<path d="M 56 120 L 57 124 L 53 125 L 53 126 L 57 125 L 54 128 L 59 130 L 60 136 L 61 136 L 61 121 z"/>
-</g>
-<g stroke="none" fill="#ffbc29">
-<path d="M 60 127 L 63 125 L 64 128 L 73 130 L 72 122 C 66.7948 122.001 61.7608 121.2 60 127 z"/>
-</g>
-<g stroke="none" fill="#dc6100">
-<path d="M 216 123 L 216 125 L 217 126 L 221 122 z"/>
-</g>
-<g stroke="none" fill="#b74700">
-<path d="M 205 123 L 207 126 L 207 123 z"/>
-</g>
-<g stroke="none" fill="#ce8405">
-<path d="M 191 124 L 194 130 z"/>
-</g>
-<g stroke="none" fill="#672b00">
-<path d="M 33 125 C 33.5812 129.533 33.3151 133.156 38 135 L 40 133 L 39 127 z"/>
-</g>
-<g stroke="none" fill="#ffb01d">
-<path d="M 55 125 L 55 128 L 57 128 L 57 125 z"/>
-</g>
-<g stroke="none" fill="#8c2700">
-<path d="M 105 128 L 112 126 z"/>
-</g>
-<g stroke="none" fill="#bd5a0b">
-<path d="M 111 126 L 109 127 L 109 128 z"/>
-</g>
-<g stroke="none" fill="#e38509">
-<path d="M 131 129 L 131 130 C 139.623 130.102 143.261 134.623 141 143 L 148 141 C 146.267 130.329 141.583 124.384 131 129 z"/>
-</g>
-<g stroke="none" fill="#3e2c15">
-<path d="M 103 127 C 98.7248 135.944 106.443 135.433 109.978 142.043 C 111.694 145.253 109.95 148.816 109 152 L 115 157 L 116 157 L 118 155 L 115 162 L 115 158 L 114 158 L 106 157 L 107 153 L 97 146 C 87.3804 149.868 81.4201 163.006 91 170 C 84.6005 150.279 107.922 167.423 115 170 L 113 173 C 115.231 172.814 122.433 172.456 121 176 L 121 177 C 129.009 174.527 124.864 166.394 126 160 L 129 164 L 138 166 C 136.866 172.11 135.152 179.097 143 180 L 139 169 C 142.901 167.843 144.196 165.941 145 162 L 144 162 L 138 165 L 141 156 L 140 156 L 140 159 L 137 158 L 136 163 C 130.677 159.218 128.791 155.597 129 149 L 126 152 L 122 146 C 117.546 145.663 115.27 144.377 114 140 L 111 140 L 108 130 L 105 131 L 106 128 z"/>
-</g>
-<g stroke="none" fill="#b05900">
-<path d="M 74 128 L 75 132 L 71 131 L 65 135 L 65 136 L 72 143 C 74.2984 142.536 77.4257 141.089 79.7014 142.152 C 81.7415 143.105 82.851 147.167 85.6242 146.248 C 88.3881 145.333 88.2136 140.609 86.2569 139.029 C 83.8804 137.109 79.6552 138.507 77 139 L 77 128 z"/>
-</g>
-<g stroke="none" fill="#af5002">
-<path d="M 105 131 L 108 130 L 110 136 C 111.765 131.761 108.915 126.022 105 131 z"/>
-</g>
-<g stroke="none" fill="#f7a319">
-<path d="M 153 128 L 153 129 L 158 132 L 159 136 C 159.496 130.987 158.108 128.588 153 128 z"/>
-</g>
-<g stroke="none" fill="#6e3c05">
-<path d="M 165 131 L 166 135 L 170 133 L 170 129 z"/>
-</g>
-<g stroke="none" fill="#4c3d1c">
-<path d="M 12 134 L 20 138 L 11 136 L 11 138 L 26 143 L 27 139 L 33 139 L 33 133 L 28 134 L 31 130 z"/>
-</g>
-<g stroke="none" fill="#e4a129">
-<path d="M 55 130 C 53.1831 139.948 61.2299 139.48 59 130 z"/>
-</g>
-<g stroke="none" fill="#fec964">
-<path d="M 159 130 L 163 137 z"/>
-</g>
-<g stroke="none" fill="#3e3b22">
-<path d="M 207 130 L 207 137 L 200 134 L 203 148 L 208 143 L 210 137 z"/>
-</g>
-<g stroke="none" fill="#c3882c">
-<path d="M 33 131 L 33 136 L 34 136 z"/>
-</g>
-<g stroke="none" fill="#d3890e">
-<path d="M 222 131 L 222 132 L 230 132 z"/>
-</g>
-<g stroke="none" fill="#522a00">
-<path d="M 61 132 L 57 139 L 57 140 L 66 137 z"/>
-</g>
-<g stroke="none" fill="#454020">
-<path d="M 223 132 L 223 140 L 230 144 L 238 145 L 237 155 L 232 155 L 232 147 L 229 147 L 226 157 C 227.082 160.467 229.252 165.231 226.972 168.683 C 223.851 173.41 204.315 178.113 201 173 L 200 173 L 197 174 C 193.26 177.82 187.101 177.812 182 177 C 183.064 181.963 191.811 180 196 180 L 240 180 L 240 179 L 230 177 C 231.286 171.563 234.579 168.985 240 168 L 240 162 L 231 167 C 231.195 161.028 233.12 159.446 239 160 L 240 135 L 239 135 L 239 143 C 233.952 140.478 230.641 137.48 229 132 z"/>
-</g>
-<g stroke="none" fill="#8f702c">
-<path d="M 28 133 L 31 135 z"/>
-</g>
-<g stroke="none" fill="#2a200a">
-<path d="M 38 133 L 42 135 z"/>
-</g>
-<g stroke="none" fill="#ffd153">
-<path d="M 137 133 C 137.707 142.074 146.397 135.536 137 133 z"/>
-</g>
-<g stroke="none" fill="#cd5804">
-<path d="M 147 133 L 147 138 L 151 137 L 151 136 L 148 136 L 149 133 z"/>
-</g>
-<g stroke="none" fill="#ffc331">
-<path d="M 156 133 L 152 135 L 154 139 L 147 139 C 150.683 149.416 156.787 144.354 163 139 L 163 137 L 158 136 z"/>
-</g>
-<g stroke="none" fill="#9d7b4b">
-<path d="M 167 133 L 167 135 L 170 135 L 170 133 z"/>
-</g>
-<g stroke="none" fill="#3e3c3b">
-<path d="M 184 140 L 187 137 L 192 138 C 190.735 130.714 184.786 134.601 184 140 z"/>
-</g>
-<g stroke="none" fill="#c57f1a">
-<path d="M 223 133 L 223 139 L 224 139 z"/>
-</g>
-<g stroke="none" fill="#0c0c0a">
-<path d="M 193 134 C 193.381 138.89 195.276 139.845 200 140 L 200 142 L 195 142 C 194.879 144.825 193.214 149.839 195.042 152.262 C 200.194 159.086 213.286 154.786 206 145 L 203 148 C 203.551 140.121 201.883 134.597 193 134 z"/>
-</g>
-<g stroke="none" fill="#d26d00">
-<path d="M 118 135 L 119 142 L 123 139 L 126 140 L 124 135 z"/>
-</g>
-<g stroke="none" fill="#bd8134">
-<path d="M 163 135 L 163 138 L 164 138 z"/>
-</g>
-<g stroke="none" fill="#d38903">
-<path d="M 36 136 L 36 137 L 42 141 L 42 146 L 37 146 L 42 150 L 42 147 L 48 148 L 50 144 L 47 142 L 43 143 L 43 137 L 40 138 z"/>
-</g>
-<g stroke="none" fill="#ffb419">
-<path d="M 40 138 L 43 137 L 43 143 L 49 144 C 48.6637 139.744 44.1331 133.483 40 138 z"/>
-</g>
-<g stroke="none" fill="#ffbb2f">
-<path d="M 94 139 C 93.1439 144.565 99.1328 146.875 103 150 L 98 148 C 103.891 158.084 111.953 148.498 110 140 L 105 141 L 106 137 z"/>
-</g>
-<g stroke="none" fill="#a13f00">
-<path d="M 111 136 L 111 140 L 114 140 C 114.636 143.993 116.007 145.364 120 146 L 120 145 L 117 145 L 119 136 L 117 138 z"/>
-</g>
-<g stroke="none" fill="#f09216">
-<path d="M 36 137 L 37 141 L 28 140 L 24 143 L 24 145 L 32 145 L 32 146 L 28 146 C 29.7161 150.982 27.129 152.679 25 157 C 37.8968 154.13 37.9661 149.779 38 137 z"/>
-</g>
-<g stroke="none" fill="#3f2401">
-<path d="M 48 137 L 52 149 C 59.7908 144.192 53.6837 140.034 48 137 z"/>
-</g>
-<g stroke="none" fill="#fca01b">
-<path d="M 57 142 L 64 142 L 67 146 L 67 147 C 64.4686 149.929 68.2249 152.145 71 153 L 69 137 C 64.4333 137.374 59.6628 137.982 57 142 z"/>
-</g>
-<g stroke="none" fill="#272518">
-<path d="M 208 137 L 207 148 C 209.81 151.308 208.679 153.133 205 155 L 205 156 L 224 160 L 224 161 L 217 161 L 218 165 L 206 159 C 208.221 165.199 229.677 177.456 227.866 163.001 C 226.997 156.067 222.69 158.168 218.39 155.228 C 214.489 152.562 211.377 146.366 210 142 L 214 142 z"/>
-</g>
-<g stroke="none" fill="#af6e17">
-<path d="M 29 140 L 29 141 L 37 141 L 36 138 z"/>
-</g>
-<g stroke="none" fill="#da7200">
-<path d="M 105 141 L 109 140 z"/>
-</g>
-<g stroke="none" fill="#a66925">
-<path d="M 27 139 L 26 143 z"/>
-</g>
-<g stroke="none" fill="#d86900">
-<path d="M 87 139 C 87.7687 143.178 87.2474 145.657 83 147 L 83 148 L 88 149 L 93 143 z"/>
-</g>
-<g stroke="none" fill="#a94d00">
-<path d="M 123 139 L 135 143 z"/>
-</g>
-<g stroke="none" fill="#bf6200">
-<path d="M 38 140 L 37 146 L 42 146 L 42 141 z"/>
-</g>
-<g stroke="none" fill="#ffbd4a">
-<path d="M 68 140 L 69 150 L 70 150 L 72 140 z"/>
-</g>
-<g stroke="none" fill="#131311">
-<path d="M 210 142 C 212.507 153.406 228.986 165.028 229 147 L 232 147 L 232 155 L 237 155 L 238 145 L 230 144 C 226.665 138.297 216.144 142.263 210 142 z"/>
-</g>
-<g stroke="none" fill="#da900d">
-<path d="M 58 141 L 59 153 L 64 153 L 67 151 L 67 147 L 67 146 L 64 142 L 62 144 z"/>
-</g>
-<g stroke="none" fill="#d28408">
-<path d="M 72 146 C 76.8488 144.371 78.6845 144.487 83 147 C 81.0604 141.013 74.487 139.063 72 146 z"/>
-</g>
-<g stroke="none" fill="#f09b02">
-<path d="M 117 142 C 118.513 147.173 123.399 145.986 124 141 z"/>
-</g>
-<g stroke="none" fill="#4f2a03">
-<path d="M 144 147 L 145 147 L 147 145 L 148 145 L 148 141 C 144.479 142.075 143.68 143.339 144 147 z"/>
-</g>
-<g stroke="none" fill="#4f4438">
-<path d="M 176 142 L 171 150 L 174 151 L 171 160 L 172 160 C 177.46 150.238 182.397 153.236 192 154 L 192 155 L 190 159 L 196 162 L 193 155 L 224 161 L 224 160 C 210.68 155.216 193.18 151.119 179 151 L 183 142 L 178 145 z"/>
-</g>
-<g stroke="none" fill="#635053">
-<path d="M 206 142 L 209 147 z"/>
-</g>
-<g stroke="none" fill="#635352">
-<path d="M 0 143 L 3 146 L 3 145 z"/>
-</g>
-<g stroke="none" fill="#6e3300">
-<path d="M 73 145 L 73 146 L 79 143 z"/>
-</g>
-<g stroke="none" fill="#b34900">
-<path d="M 90 144 L 90 150 L 91 150 L 95 148 L 95 147 L 94 143 z"/>
-</g>
-<g stroke="none" fill="#b67215">
-<path d="M 111 143 L 111 146 L 112 146 z"/>
-</g>
-<g stroke="none" fill="#7c603e">
-<path d="M 141 143 L 138 150 L 143 143 z"/>
-</g>
-<g stroke="none" fill="#5a5847">
-<path d="M 148 143 L 146 153 L 147 153 C 149.462 149.456 150.571 146.775 148 143 z"/>
-</g>
-<g stroke="none" fill="#5a4d1f">
-<path d="M 23 144 L 26 146 C 25.1368 151.594 20.9267 156.37 16 159 L 16 160 L 18 163 L 19 163 C 23.5628 155.885 27.6835 154.067 27 145 z"/>
-</g>
-<g stroke="none" fill="#ce7109">
-<path d="M 29 153 L 28 146 L 32 146 C 26.6136 142.615 27.0654 149.768 29 153 z"/>
-</g>
-<g stroke="none" fill="#ffb523">
-<path d="M 91 146 L 88 149 L 81 144 C 68.5484 147.933 82.0661 166.025 88.686 153.941 C 89.98 151.579 90.3291 148.585 91 146 z"/>
-</g>
-<g stroke="none" fill="#e99008">
-<path d="M 93 147 L 97 144 z"/>
-</g>
-<g stroke="none" fill="#5e4f3e">
-<path d="M 152 148 L 161 147 C 158.358 143.662 154.336 144.842 152 148 z"/>
-</g>
-<g stroke="none" fill="#343231">
-<path d="M 10 145 L 3 146 L 3 147 L 9 148 L 9 153 L 11 153 L 12 145 z"/>
-</g>
-<g stroke="none" fill="#8d7645">
-<path d="M 49 145 L 46 152 L 52 149 L 51 145 z"/>
-</g>
-<g stroke="none" fill="#9e805a">
-<path d="M 56 145 L 56 150 L 57 150 z"/>
-</g>
-<g stroke="none" fill="#f2c392">
-<path d="M 71 145 L 70 150 L 71 151 L 73 151 z"/>
-</g>
-<g stroke="none" fill="#987b85">
-<path d="M 0 146 L 0 153 L 7 153 C 6.294 148.637 4.22469 147.016 0 146 z"/>
-</g>
-<g stroke="none" fill="#f4a710">
-<path d="M 46 146 L 42 147 L 42 151 C 44.8853 150.132 46.6725 149.179 46 146 z"/>
-</g>
-<g stroke="none" fill="#a35600">
-<path d="M 57 146 L 55 152 L 59 153 z"/>
-</g>
-<g stroke="none" fill="#ad9067">
-<path d="M 73 146 C 72.859 152.118 68.9806 151.882 64 151 C 64.4896 162.087 79.5559 151.819 73 146 z"/>
-</g>
-<g stroke="none" fill="#ce8208">
-<path d="M 75 146 L 74 153 L 77 146 z"/>
-</g>
-<g stroke="none" fill="#eb8d02">
-<path d="M 97 146 L 103 150 z"/>
-</g>
-<g stroke="none" fill="#7e643a">
-<path d="M 118 147 L 118 152 L 119 152 z"/>
-</g>
-<g stroke="none" fill="#574e49">
-<path d="M 6 148 L 7 153 L 0 153 L 11 169 C 17.9134 168.795 20.3297 166.576 18 160 L 17 160 C 11.7088 166.23 6.60313 162.218 9 155 L 11 155 L 16 159 L 9 153 L 9 148 z"/>
-</g>
-<g stroke="none" fill="#101110">
-<path d="M 44 156 C 43.9786 162.066 43.0161 166.932 36 164 L 35 167 L 34 167 L 34 157 L 30 158 L 32 160 L 32 161 L 29 157 C 20.2988 157.104 20.0952 161.511 19 169 C 23.9226 169.769 25.6309 172.122 26 177 L 15 179 L 15 180 L 31 180 L 34 173 L 33 180 L 56 174 C 56.1039 168.966 55.5291 159.899 60 157 L 59 173 L 69 171 L 65 159 C 70.4449 160.409 75.2821 161.747 80 158 L 72 155 L 71 159 L 55 152 L 56 148 z"/>
-</g>
-<g stroke="none" fill="#4b2702">
-<path d="M 35 160 L 34 160 L 34 167 L 35 167 L 36 164 C 43.2173 168.724 43.9954 161.946 44 156 C 48.0299 155.146 50.7396 152.964 52 149 C 45.905 150.61 39.8436 166.252 35 160 z"/>
-</g>
-<g stroke="none" fill="#8e4c00">
-<path d="M 27 156 L 32 161 L 32 160 L 30 158 L 34 160 L 35 160 L 37 157 L 35 163 L 39 157 L 40 157 L 40 159 L 41 159 L 42 150 z"/>
-</g>
-<g stroke="none" fill="#82654d">
-<path d="M 128.333 150.667 L 128.667 151.333 L 128.333 150.667 z"/>
-</g>
-<g stroke="none" fill="#ac8e69">
-<path d="M 41 151 L 42 155 L 46 151 z"/>
-</g>
-<g stroke="none" fill="#7c6255">
-<path d="M 96.3333 151.667 L 96.6667 152.333 L 96.3333 151.667 z"/>
-</g>
-<g stroke="none" fill="#786256">
-<path d="M 122 151 L 122 153 L 124 153 L 124 151 z"/>
-</g>
-<g stroke="none" fill="#0a0b0b">
-<path d="M 169 157 L 174 151 C 170.186 151.661 169.43 153.259 169 157 z"/>
-</g>
-<g stroke="none" fill="#954c01">
-<path d="M 59 153 L 59 154 L 63 152 z"/>
-</g>
-<g stroke="none" fill="#b8700f">
-<path d="M 105 152 L 105 153 L 108 153 z"/>
-</g>
-<g stroke="none" fill="#060807">
-<path d="M 106 157 L 114 160 L 115 155 C 110.691 152.674 107.909 151.828 106 157 z"/>
-</g>
-<g stroke="none" fill="#090909">
-<path d="M 179 166 L 182.101 159.995 C 188.614 147.05 165.878 153.683 175.108 163.684 C 176.225 164.894 177.565 165.323 179 166 z"/>
-</g>
-<g stroke="none" fill="#5a431f">
-<path d="M 71 154 L 71 158 L 72 158 L 72 155 L 76 153 z"/>
-</g>
-<g stroke="none" fill="#070807">
-<path d="M 131 159 L 136 163 L 138 153 z"/>
-</g>
-<g stroke="none" fill="#252611">
-<path d="M 184 153 L 178 167 L 182 171 C 179.474 173.24 180.38 175.307 183 177 L 181 172 C 185.59 170.538 193.342 167.736 195 163 L 206 158 L 206 157 L 193 155 L 196 162 L 190 159 L 192 155 z"/>
-</g>
-<g stroke="none" fill="#b7770a">
-<path d="M 41 154 L 41 159 L 40 159 L 40 157 L 39 157 L 39 163 C 42.9019 160.848 43.7135 157.605 41 154 z"/>
-</g>
-<g stroke="none" fill="#947c83">
-<path d="M 9 155 C 5.60129 162.239 10.3664 165.953 17 162 L 17 160 L 11 155 z"/>
-</g>
-<g stroke="none" fill="#625b3a">
-<path d="M 116 155 L 115 162 L 118 155 z"/>
-</g>
-<g stroke="none" fill="#5f5258">
-<path d="M 167 155 L 175 166 L 176 165 z"/>
-</g>
-<g stroke="none" fill="#12130e">
-<path d="M 0 156 C 0 163.923 -0.194427 168.891 9 169 C 8.20465 163.755 4.41021 158.892 0 156 z"/>
-</g>
-<g stroke="none" fill="#3d3e36">
-<path d="M 47 156 L 47 161 L 52 157 z"/>
-</g>
-<g stroke="none" fill="#85673c">
-<path d="M 67 157 L 71 159 C 70.386 156.149 69.6973 156.146 67 157 z"/>
-</g>
-<g stroke="none" fill="#db9a0f">
-<path d="M 35 157 L 35 161 L 37 161 L 37 157 z"/>
-</g>
-<g stroke="none" fill="#544037">
-<path d="M 57 157 L 56 174 C 60.3444 170.693 59.3523 162.125 60 157 z"/>
-</g>
-<g stroke="none" fill="#6c694f">
-<path d="M 151 166 L 151 157 C 145.667 158.728 144.932 164.946 151 166 z"/>
-</g>
-<g stroke="none" fill="#8e7682">
-<path d="M 78 159 C 79.6526 163.915 83.615 162.148 85 158 z"/>
-</g>
-<g stroke="none" fill="#614b54">
-<path d="M 85 158 C 83.1344 161.324 81.0989 162.59 78 160 L 65 159 C 65.7697 168.335 70.1099 170.993 79 171 L 79 170 L 75 170 L 75 163 C 80.3272 165.581 86.1019 170.981 87 177 L 93 177 L 93 172 L 93 171 z"/>
-</g>
-<g stroke="none" fill="#0e0e0e">
-<path d="M 101 173 L 99 180 L 116 180 L 115 176 L 117 178 L 118 178 L 123 176 C 119.964 172.572 117.418 172.287 113 173 L 115 170 L 111 171 C 109.62 166.578 97.3198 156.831 92.3796 159.16 C 81.5792 164.253 95.5025 172.52 101 173 z"/>
-</g>
-<g stroke="none" fill="#0a0a0a">
-<path d="M 203 158 C 198.623 165.653 198.059 167.161 201 176 L 222 171 L 222 169 L 206 159 L 218 165 L 217 160 z"/>
-</g>
-<g stroke="none" fill="#0b0b0b">
-<path d="M 239 158 C 233.703 161.093 231.09 159.391 231 167 C 235.089 165.923 240.685 162.858 239 158 z"/>
-</g>
-<g stroke="none" fill="#a89a7e">
-<path d="M 126 160 C 124.06 166.392 129.795 176.346 119 176 C 122.565 180.08 127.249 177.178 129 173 L 134 175 C 134.322 169.399 134.491 165.504 128 165 L 128 160 z"/>
-</g>
-<g stroke="none" fill="#897b86">
-<path d="M 75 163 L 75 170 L 82 169 z"/>
-</g>
-<g stroke="none" fill="#7b6850">
-<path d="M 128 163 L 133 165 L 133 164 z"/>
-</g>
-<g stroke="none" fill="#080808">
-<path d="M 163 170 C 166.912 176.975 175.469 174.344 177 167 C 169.837 162.559 168.71 165.221 163 170 z"/>
-</g>
-<g stroke="none" fill="#675e5d">
-<path d="M 195 163 L 196 171 L 197 171 L 197 163 z"/>
-</g>
-<g stroke="none" fill="#978662">
-<path d="M 133 165 L 134 175 L 129 173 L 131 180 L 139 180 L 139 179 L 138 166 z"/>
-</g>
-<g stroke="none" fill="#7d7558">
-<path d="M 153 165 L 150 173 z"/>
-</g>
-<g stroke="none" fill="#98808a">
-<path d="M 175 165 L 180 169 z"/>
-</g>
-<g stroke="none" fill="#44332a">
-<path d="M 9 166 L 2 169 C 4.19574 176.73 13.0677 168.88 8 180 L 17 179 L 21 176 L 20 170 L 24 170 L 24 169 L 18 167 C 13.704 169.708 12.8527 167.88 9 166 z"/>
-</g>
-<g stroke="none" fill="#111311">
-<path d="M 181 172 C 182.349 177.488 191.975 180.689 195.958 175.397 C 197.886 172.834 195.96 168.563 195 166 z"/>
-</g>
-<g stroke="none" fill="#6e612e">
-<path d="M 0 167 L 0 180 C 2.54747 179.991 14.0483 178.964 10.8248 173.565 C 9.537 171.408 2.59146 169.922 0 167 z"/>
-</g>
-<g stroke="none" fill="#574e4f">
-<path d="M 111 168 L 113 171 z"/>
-</g>
-<g stroke="none" fill="#433f22">
-<path d="M 177 168 L 176 172 L 179 171 L 179 175 L 180 175 L 182 169 z"/>
-</g>
-<g stroke="none" fill="#867f7b">
-<path d="M 197 168 L 200 175 z"/>
-</g>
-<g stroke="none" fill="#0d0d0d">
-<path d="M 230 177 L 240 179 L 240 168 C 234.243 168.596 230.803 171.121 230 177 z"/>
-</g>
-<g stroke="none" fill="#302b16">
-<path d="M 59 171 L 58 171 C 54.4721 176.504 42.9976 176.966 37 179 L 37 180 L 56 177 L 56 180 L 76 180 C 76.2333 172.836 80.444 173.699 84 169 C 77.4857 169.794 64.4112 174.935 59 171 z"/>
-</g>
-<g stroke="none" fill="#7f6e4f">
-<path d="M 126 169 L 127 172 L 128 172 L 128 169 z"/>
-</g>
-<g stroke="none" fill="#594249">
-<path d="M 20 170 C 20.4818 174.275 21.6369 176.288 26 177 C 25.8449 172.276 24.8896 170.381 20 170 z"/>
-</g>
-<g stroke="none" fill="#907f8a">
-<path d="M 93 180 L 92 176 L 87 177 C 85.9879 164.011 70.6255 179.701 86.0023 179.995 C 88.3331 180.04 90.6687 180 93 180 z"/>
-</g>
-<g stroke="none" fill="#413a34">
-<path d="M 90 172 L 93 180 C 98.3386 179.825 99.8649 178.143 101 173 z"/>
-</g>
-<g stroke="none" fill="#797059">
-<path d="M 160 175 L 160 176 L 182 180 L 179 171 z"/>
-</g>
-<g stroke="none" fill="#43364a">
-<path d="M 77 172 L 76 180 L 80 180 L 79 172 z"/>
-</g>
-<g stroke="none" fill="#3d3a0b">
-<path d="M 32 173 L 31 180 L 34 173 z"/>
-</g>
-<g stroke="none" fill="#736555">
-<path d="M 146 175 L 149 173 z"/>
-</g>
-<g stroke="none" fill="#0c0d0c">
-<path d="M 94 174 L 95 178 L 97 178 L 98 177 L 98 175 z"/>
-</g>
-<g stroke="none" fill="#5e5426">
-<path d="M 155 174 L 157 180 L 170 180 L 170 178 L 160 176 L 160 175 L 166 175 z"/>
-</g>
-<g stroke="none" fill="#12130f">
-<path d="M 215 178 C 219.15 177.985 222.544 178.387 224 174 z"/>
-</g>
-<g stroke="none" fill="#3c2e15">
-<path d="M 128 175 C 123.567 179.628 120.359 178.188 115 176 C 117.024 182.099 126.929 180.499 132 179 z"/>
-</g>
-<g stroke="none" fill="#9b8c70">
-<path d="M 154 175 L 152 180 L 157 180 L 156 175 z"/>
-</g>
-<g stroke="none" fill="#6d4f46">
-<path d="M 118.333 176.667 L 118.667 177.333 L 118.333 176.667 z"/>
-</g>
-<g stroke="none" fill="#7b6630">
-<path d="M 11 180 L 16 177 z"/>
-</g>
-<g stroke="none" fill="#0b0c0a">
-<path d="M 42 179 L 42 180 L 56 180 L 56 177 z"/>
-</g>
-<g stroke="none" fill="#857f6b">
-<path d="M 146 177 L 146 180 L 149 180 L 149 177 z"/>
-</g>
-<g stroke="none" fill="#7a5d57">
-<path d="M 120 178 L 120 179 L 125 179 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_gold.xml Deleted

@@ -1,637 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" viewBox="0 0 180 240"  width="240" height="180" preserveAspectRatio="xMidYMid meet" contentScriptType="text/ecmascript">
-<g stroke="none" fill="#889bed">
-<path d="M 0 0 L 0 20 L 4 19 L 5 16 L 13 17 C 12.4436 15.0833 11.0685 11.9479 14 14 L 15 11 L 16 11 L 15 14 L 26 15 L 25 9 L 31 8 L 32 11 L 33 11 C 35.3979 7.47743 37.5908 5.22249 42 5 L 43 0 z"/>
-</g>
-<g stroke="none" fill="#8b9cee">
-<path d="M 42 5 C 37.3065 4.90906 34.9677 6.82362 33 11 L 32 11 L 31 8 L 25 9 C 26.3437 15.5317 38.0673 19.4222 39 12 L 45 13 C 46.582 10.6485 47.4749 10.7787 50 12 C 55.3048 6.35297 64.6926 4.22183 72 7 L 73 7 L 76 3 L 77 8 L 83 8 L 84 3 C 86.9502 5.54463 89.6332 6.61002 92 3 L 102 6 L 103 3 L 106 5 L 107 1 L 110 2 L 109 5 L 121 5 L 122 10 L 126 7 L 145 8 L 150 8 C 152.9 16.6991 155.964 13.9909 160 15 L 160 13 C 164.343 14.4557 171.19 18.1864 173 12 L 178 13 L 178 17 L 179 17 L 180 0 L 75 0 C 67.3878 0 43.9591 -3.97758 42 5 z"/>
-</g>
-<g stroke="none" fill="#8c9def">
-<path d="M 107 1 L 106 5 L 103 3 L 102 6 L 92 3 C 89.0936 5.75687 87.232 5.08513 84 3 L 84 12 L 90 8 L 94 10 L 94 14 L 102 13 L 102 10 L 103 10 L 109 16 L 112 11 L 113 11 L 114 16 L 115 16 L 120 15 L 119 13 L 121 16 L 122 16 C 124.652 14.0772 126.194 14.2363 128 17 L 129 17 L 130 15 L 131 18 L 137 20 L 137 14 L 143 14 L 147 15 C 148.693 17.6197 150.76 18.5265 153 16 L 154 16 L 156 17 L 161 22 L 160 24 L 164 28 L 160 25 L 165 31 L 166 24 L 176 23 L 177 23 L 180 25 L 180 14 L 179 14 L 179 17 L 178 17 L 178 13 L 173 12 C 169.806 17.1581 164.877 13.7595 160 13 L 160 15 L 158 14 C 153.871 16.0292 152.008 11.1078 150 8 L 145 8 L 143 10 L 142 10 L 126 7 L 122 10 L 121 5 L 109 5 L 109 1 z"/>
-</g>
-<g stroke="none" fill="#90a1f3">
-<path d="M 75 3 L 73 7 L 72 7 C 65.8068 2.84752 53.9382 6.09308 50 12 C 47.5745 9.89697 45.7455 9.52103 45 13 L 39 12 L 37 19 L 43 22 L 39 21 L 39 22 L 41 27 L 49 27 L 50 27 L 50 24 L 51 24 L 52 28 L 57 29 L 58 29 L 56 23 L 56 22 L 66 25 L 68 19 L 67 24 C 69.793 24.4529 70.6363 25.0008 71 22 L 72 22 L 72 25 L 73 25 L 79 23 L 78 17 C 82.7537 16.2922 92.1784 14.5315 94 10 L 90 8 L 84 12 L 84 9 L 77 8 z"/>
-</g>
-<g stroke="none" fill="#90a2f4">
-<path d="M 102 10 L 102 13 L 101 13 C 98.4496 11.3657 96.8696 11.5701 95 14 L 78 17 L 82 27 L 83 27 L 84 23 L 90 26 L 90 27 L 86 29 L 86 30 L 90 31 L 95 28 L 96 29 L 98 36 L 99 36 L 102 26 L 104 29 L 110 23 L 119 27 L 119 26 L 114 26 L 114 22 L 125 22 L 124 26 L 130 26 L 128 24 L 128 23 L 131 20 L 135 21 L 134 24 L 142 22 L 141 25 C 146.077 25.0976 145.294 28.8688 146 33 L 152 34 L 151 30 L 157 39 L 161 38 L 163 42 L 162 45 L 164 47 L 165 47 L 165 44 L 171 45 L 171 50 L 179 51 C 181.093 43.9204 182.275 28.5877 177 23 L 176 23 L 166 24 L 165 31 L 160 25 L 164 28 L 160 24 L 161 22 L 156 17 L 153 16 C 150.338 17.7783 149.22 17.2146 147 15 L 143 14 L 137 14 L 137 20 L 131 18 C 130.421 16.0897 130.015 14.6663 129 17 L 128 17 C 127.265 13.5707 123.759 12.9464 122 16 L 121 16 L 119 13 L 120 15 L 119 15 L 115 16 L 114 16 L 113 11 L 112 11 L 109 16 z"/>
-</g>
-<g stroke="none" fill="#8ea0f4">
-<path d="M 15 11 L 14 14 L 12 12 L 13 17 L 5 16 L 4 19 C -1.54166 20.1189 0 27.4284 0 32 L 8 29 L 9 33 L 11 31 L 12 31 L 17 33 L 17 29 C 18.8129 27.4444 18.8129 26.5556 17 25 L 17 24 L 18 22 L 19 22 L 22 30 L 26 29 L 27 26 L 31 30 L 35 30 L 33 27 L 38 21 L 41 25 L 39 22 L 39 21 L 43 22 L 37 19 L 37 15 L 15 14 z"/>
-</g>
-<g stroke="none" fill="#92a4f7">
-<path d="M 66 19 L 66 25 L 56 22 L 56 23 L 58 29 L 57 29 C 55.3611 26.652 54.4437 26.5707 52 28 L 51 24 L 50 24 L 50 27 L 49 27 L 41 27 L 40 23 L 41 25 L 40 25 L 38 21 L 33 27 L 35 30 L 31 30 L 27 26 L 26 29 L 22 30 L 19 22 L 18 22 L 17 24 L 17 25 L 17 29 L 17 33 L 12 31 L 11 31 L 9 33 L 8 29 C -1.295 30.6434 -4.49522 48.5945 3 54 L 10 43 C 11.0146 45.3337 11.4211 43.9103 12 42 L 14 44 L 19 42 L 22 45 L 21 42 L 25 39 L 26 39 L 28 41 L 29 37 L 38 39 L 37 32 L 41 36 L 42 36 C 45.0697 33.3777 47.309 33.6057 51 35 L 51 29 C 55.0217 34.9767 60.3579 34.146 67 35 L 68 31 L 65 31 L 73 26 L 81 33 L 90 27 L 90 26 L 84 23 L 83 27 L 82 27 C 80.9066 23.0967 75.4892 21.439 73 25 L 72 25 L 72 22 L 71 22 L 71 25 L 67 24 L 68 19 z"/>
-</g>
-<g stroke="none" fill="#92a3f7">
-<path d="M 114 22 L 114 26 L 119 26 L 119 27 L 110 23 L 104 29 L 104 26 L 102 26 L 98.7539 36.0895 L 101 47 C 107.504 46.9762 121.037 50.184 125 44 L 126 46 L 127 46 L 127 43 L 128 43 L 128 48 L 129 48 L 129 45 L 130 45 L 136 49 L 139 43 L 138 47 L 139 47 L 141 43 L 142 43 L 142 48 L 150 45 C 149.699 46.5924 149.647 50.1126 151 47 L 152 47 L 154 49 L 153 54 L 157 53 L 157 57 L 158 57 L 162 58 L 164 56 L 176 55 L 176 54 L 174 52 L 178 52 L 177 57 L 179 59 L 180 59 L 180 50 L 171 50 L 171 45 C 167.949 45.1146 165.756 43.4788 165 47 L 164 47 L 162 45 L 163 42 L 161 38 L 157 39 L 151 30 L 152 34 L 150 32 L 146 33 C 145.723 28.5979 146.388 24.7883 141 25 L 142 22 L 134 24 L 135 21 L 131 20 L 128 23 L 128 24 L 130 26 L 124 26 L 125 22 z"/>
-</g>
-<g stroke="none" fill="#93a3f9">
-<path d="M 65 31 L 68 31 L 67 35 C 60.5818 33.5749 55.6833 33.9875 51 29 L 51 35 C 47.5381 33.2253 44.5453 32.6606 42 36 L 41 36 L 37 32 L 37 42 L 41 43 C 46.2865 40.2403 56.0843 39.5029 61 43 L 67 44 L 72 35 C 73.2295 42.3889 89.3128 43.6713 94.3958 39.0617 C 96.8128 36.8699 95.6704 31.9478 96 29 L 95 28 L 90 31 C 86.1489 29.5528 83.3044 29.2748 81 33 L 73 26 z"/>
-</g>
-<g stroke="none" fill="#8970b6">
-<path d="M 96 34 L 96 39 L 97 39 L 98 34 z"/>
-</g>
-<g stroke="none" fill="#807ec8">
-<path d="M 70 35 L 72 38 L 72 35 z"/>
-</g>
-<g stroke="none" fill="#97a9f9">
-<path d="M 29 37 L 28 41 L 26 39 L 25 39 L 22 45 L 19 42 L 14 44 L 13 44 L 13 42 L 12 42 L 10 43 L 5 53 L 11 56 L 12 53 L 15 54 L 21 53 L 22 56 L 23 56 L 25 51 L 23 50 L 24 49 L 31 53 L 34 52 L 33 54 L 34 54 L 36 50 L 42 50 C 44.5373 53.1716 49.5633 51.1835 50 49 L 52 51 L 66 49 L 68 53 L 69 53 L 69 41 L 68 41 L 67 44 C 64.6925 41.8741 63.656 41.1905 61 43 C 57.1063 39.2276 44.818 39.0221 41 43 L 37 42 L 38 39 z"/>
-</g>
-<g stroke="none" fill="#a46a9a">
-<path d="M 70 37 L 69 93 L 70 93 C 70.0164 87.0564 68.847 72.3407 74 69 L 74 68 L 71 68 z"/>
-</g>
-<g stroke="none" fill="#867fc4">
-<path d="M 69 38 L 69 68 L 70 68 z"/>
-</g>
-<g stroke="none" fill="#664d8b">
-<path d="M 71 38 C 71 44.7675 67.8255 63.4783 73 68 C 71.8844 63.3118 71.0983 56.306 74.5887 52.3179 C 78.1483 48.2509 90.9835 48.6746 94.0116 53.2284 C 99.5621 61.5756 95.7526 78.6281 95.1883 87.9853 C 94.1889 104.555 100.183 120.858 97 138 L 102 139 L 99 38 L 98 38 L 98 47 L 97 47 L 96 39 C 87.9244 41.2694 78.2969 42.9292 71 38 z"/>
-</g>
-<g stroke="none" fill="#b36a97">
-<path d="M 97 38 L 97 47 L 98 47 z"/>
-</g>
-<g stroke="none" fill="#646db8">
-<path d="M 73 40 L 73 41 L 77 41 z"/>
-</g>
-<g stroke="none" fill="#97a8fa">
-<path d="M 99 41 L 99 59 L 100 59 L 106 55 L 109 58 L 121 57 L 121 59 L 125 59 L 124 62 L 126 59 C 129.315 59.2617 136.567 59.6414 137 63 L 138 63 L 139 61 L 141 65 L 142 65 L 146 66 L 150 65 L 151 71 L 152 71 L 152 68 L 164 68 L 166 70 C 167.066 68.313 170.356 61.1681 171 66 L 172 66 L 177 65 L 177 63 L 180 64 C 179.907 61.0863 180.193 57.4767 177 57 L 178 52 L 174 52 L 176 54 L 176 55 L 162 58 C 161.391 55.1591 159.572 54.258 158 57 L 157 57 L 157 53 L 153 54 L 154 49 L 152 47 L 151 47 L 150 49 L 150 45 L 142 48 L 142 43 L 141 43 L 139 47 L 138 47 L 139 43 L 136 49 L 130 45 L 129 45 L 129 48 L 128 48 L 128 43 L 127 43 L 127 46 L 126 46 L 125 44 C 119.604 49.5537 108.34 46.2243 101 47 z"/>
-</g>
-<g stroke="none" fill="#9badf9">
-<path d="M 52 51 L 51 49 L 50 49 L 42 50 L 36 50 L 33 54 L 34 52 L 31 53 C 29.8554 49.0903 26.5739 48.9272 23 50 L 25 51 L 25 52 L 23 56 L 22 56 L 21 53 L 15 54 L 12 53 L 11 56 L 3 52 L 3 54 L 0 53 L 1.33333 64.5 L 7 65 L 7 60 L 9 63 L 26 62 C 28.3541 56.1931 33.3927 60.5476 30 61 L 30 62 L 36 63 C 38.1467 65.2717 39.2125 63.445 40 61 L 46 63 L 53 65 L 54 65 C 57.9988 62.4763 60.9049 63.0308 65 65 L 65 63 L 68 64 C 69.6215 58.5142 69.1614 53.7896 66 49 z"/>
-</g>
-<g stroke="none" fill="#8b8dda">
-<path d="M 75 50 L 75 51 L 92 51 z"/>
-</g>
-<g stroke="none" fill="#a382ab">
-<path d="M 98 50 L 109 158 L 110 158 L 102.285 85 z"/>
-</g>
-<g stroke="none" fill="#9dadfb">
-<path d="M 74.6034 52.0278 C 72.4379 53.7429 73.0009 57.582 73 60 C 72.999 62.5359 72.4853 66.2581 74.179 68.3966 C 76.7813 71.6823 91.5464 71.0479 94.3966 68.2577 C 105.71 57.1829 84.2379 44.3972 74.6034 52.0278 z"/>
-</g>
-<g stroke="none" fill="#9aadfb">
-<path d="M 106 55 L 100 57 L 101 67 L 103 65 L 104 65 C 104.787 67.047 105.213 67.047 106 65 L 107 65 L 106 71 L 107 71 L 108 68 L 110 67 L 114 68 L 114 69 L 112 71 L 115 70 L 122 72 L 124 68 L 128 73 L 129 73 L 130 68 C 136.104 71.3747 141.898 73.6302 149 73 L 154 78 L 158 74 L 159 74 L 159 77 L 171 79 C 177 73.2821 181.917 72.8696 179 63 L 177 65 L 172 66 L 171 66 L 170 63 L 166 70 L 164 68 C 160.004 68.2518 152.88 65.4868 152 71 L 151 71 L 150 65 L 146 66 C 145.391 63.1591 143.572 62.258 142 65 L 141 65 C 141 61.5586 138.545 60.2754 138 63 L 137 63 L 136 60 L 124 62 L 125 59 L 121 59 L 121 57 L 109 58 z"/>
-</g>
-<g stroke="none" fill="#756cb0">
-<path d="M 72 57 L 72 67 L 73 67 z"/>
-</g>
-<g stroke="none" fill="#9eaffc">
-<path d="M 26 62 L 7 60 L 7 65 L 5 63 L 1 63 L 0 63 L 0 75 L 3 73 L 13 77 L 14 77 L 15 73 C 22.5222 77.2483 21.3553 70.8217 27 70 L 34 66 L 34 68 L 35 68 L 35 66 C 37.7104 67.3561 40.5289 68.6862 41 65 C 44.4843 66.5338 47.5194 68.669 50 65 L 54 70 L 55 70 L 55 66 L 56 66 L 57 71 L 65 66 L 66 66 L 68 96 L 69 96 L 69 63 L 65 63 L 65 65 C 61.8935 62.7102 56.2361 60.7365 54 65 L 53 65 L 46 63 C 45.2415 59.5326 43.0808 60.688 40 61 L 36 63 L 30 62 L 30 61 L 33 61 C 30.0596 58.0082 27.6482 57.9156 26 62 z"/>
-</g>
-<g stroke="none" fill="#a1b2fc">
-<path d="M 41 65 L 35 68 L 34 68 L 34 66 L 33 66 L 27 70 C 21.4931 71.1896 21.7206 75.548 15 73 L 14 77 L 13 77 L 3 73 L 0 86 L 1 86 L 2 84 L 3 84 L 5 86 L 4 80 L 5 80 L 7 81 L 13 82 L 15 86 L 16 84 L 13 79 L 21 78 L 20 82 L 27 86 L 26 80 L 31 81 L 31 85 C 41.7098 81.6189 43.0489 85.886 53 88 L 53 87 L 51 86 L 61 87 L 61 82 L 62 82 L 67 88 L 68 88 L 66 66 L 65 66 L 57 71 L 56 66 L 55 66 L 55 70 L 54 70 L 50 65 z"/>
-</g>
-<g stroke="none" fill="#9eb0fb">
-<path d="M 103 65 L 101 78 L 106 76 L 114 80 L 115 80 L 127 77 L 128 77 L 130 79 L 131 75 L 132 75 L 137 82 L 138 79 L 140 83 C 145.304 82.0264 149.461 84.2518 152 89 L 156 86 L 156 90 L 163 91 L 164 95 L 165 95 L 166 92 L 167 92 L 166 95 L 172 91 L 175 88 L 177 94 L 178 94 L 176 87 L 179 89 L 180 74 L 171 79 C 167.541 78.2719 159.658 79.0996 159 74 L 158 74 L 154 78 L 149 73 L 130 68 L 129 73 L 128 73 L 124 68 L 122 72 L 112 71 L 114 69 L 114 68 L 110 67 L 108 68 L 107 71 L 106 71 L 107 65 L 106 65 z"/>
-</g>
-<g stroke="none" fill="#5b498c">
-<path d="M 71 69 L 69 149 L 70 149 L 70 138 L 74 138 L 73 127 L 74 127 L 74 129 L 75 129 C 75.0052 121.186 81.7523 101.913 92.4005 114.318 C 96.0126 118.526 95 126.857 95 132 L 96 132 L 97 93 L 95 93 C 94.2419 103.02 75.7391 105.036 74.1481 94.9954 C 73.5375 91.1416 73.3569 84.4515 76.5139 81.6034 C 81.6552 76.9653 93.1685 79.6867 95 86 L 96 86 L 96 68 C 87.8254 70.9793 79.4715 70.0706 71 69 z"/>
-</g>
-<g stroke="none" fill="#a1b3fd">
-<path d="M 131 75 L 130 79 L 128 77 L 127 77 L 126 79 L 125 79 C 123.104 75.165 115.889 75.9349 115 80 L 114 80 L 106 76 C 100.152 81.8901 101.5 85.0655 108 89 L 109 89 L 111 88 L 111 83 C 114.148 85.9321 119.312 91.9689 123 87 L 124 87 L 129 90 L 127 91 L 127 92 L 132 96 C 135.343 96 145.733 91.0691 144 98 L 161 100 L 160 106 C 163.39 106.436 163.205 108.954 163 112 L 171 110 L 169 114 L 173 113 L 172 107 L 178 109 L 180 88 L 176 87 L 178 94 L 177 94 L 175 88 L 172 91 L 170 89 L 166 95 L 167 92 L 166 92 L 165 95 L 164 95 L 163 91 L 156 90 L 156 86 L 152 89 C 150.243 83.6489 145.23 81.5795 140 83 L 138 79 L 137 82 z"/>
-</g>
-<g stroke="none" fill="#a5b6fd">
-<path d="M 13 79 L 16 84 L 15 86 L 13 82 C 9.9094 83.2043 6.83196 82.98 5 80 L 4 80 L 5 86 L 1 84 L 2 97 L 14 96 L 13 92 L 16 95 L 20 94 L 19 91 L 23 90 L 24 94 L 29 95 L 32 95 L 33 95 L 32 91 L 34 94 L 36 91 L 39 92 L 38 95 L 40 91 L 41 91 C 43.0488 94.4664 45.2409 94.2458 49 94 L 47 96 L 52 99 L 53 99 L 54 97 L 58 99 L 66 97 L 66 98 L 64 104 L 65 104 C 68.1559 96.8311 68.4885 93.013 67 85 L 62 82 L 61 82 L 61 87 L 53 87 L 53 88 C 43.4628 84.6309 41.1349 79.9086 31 85 L 31 81 L 29 83 L 26 80 L 27 86 L 20 82 L 21 78 z"/>
-</g>
-<g stroke="none" fill="#898ccf">
-<path d="M 100 79 L 101 99 L 102 99 z"/>
-</g>
-<g stroke="none" fill="#a4b5fd">
-<path d="M 95 99 C 95 94.4632 96.5793 86.2249 93.9722 82.3179 C 91.592 78.7509 78.7192 78.5685 75.858 81.6034 C 72.6537 85.0023 72.3783 98.314 77.1481 100.397 C 82.457 102.714 89.7847 100.38 95 99 z"/>
-</g>
-<g stroke="none" fill="#a5b6fc">
-<path d="M 111 83 L 112 86 L 111 88 L 108 89 L 103 88 L 105 113 L 106 113 L 107 105 L 110 107 C 112.621 103.203 116.272 105.137 119 108 L 123 108 L 120 110 L 126 108 L 127 110 L 130 108 L 129 111 L 132 110 C 134.268 113.495 137.732 113.495 140 110 L 134 111 L 136 104 L 130 103 L 131 101 L 131 100 L 126 102 L 126 101 L 129 91 L 129 90 L 124 87 L 123 87 C 118.366 90.3996 114.895 85.4765 111 83 z"/>
-</g>
-<g stroke="none" fill="#a9b8fb">
-<path d="M 19 91 L 20 94 L 16 95 L 13 92 L 14 96 L 2 97 L 1 92 L 0 92 L 2 113 C 7.54909 109.532 5.37135 108.658 6 103 L 10 110 L 18 113 L 25 108 L 28 112 C 31.1329 110.956 34.8045 109.782 34 113 L 37 112 L 41 115 L 40 113 L 49 116 L 49 113 L 54 113 L 52 115 L 52 116 L 56 116 L 56 120 L 57 120 L 57 117 L 67 117 L 67 101 L 65 104 L 64 104 L 66 98 L 66 97 L 58 99 L 53 99 L 52 99 L 49 94 L 41 91 L 40 91 L 38 95 L 36 91 L 34 94 C 34.5746 91.6038 34.4751 91.513 32 91 L 33 95 L 32 95 L 29 95 C 28.2577 91.4694 26.6779 92.4937 24 94 L 23 90 z"/>
-</g>
-<g stroke="none" fill="#a3b5fb">
-<path d="M 126 91 L 126 101 L 126 102 L 131 100 L 130 103 L 136 104 L 134 106 L 134 111 L 138 111 L 138 107 L 139 107 L 142 118 L 143 118 L 142 113 L 148 113 C 149.303 117.112 151.816 118.019 155 115 L 152 114 L 154 112 L 155 112 L 164 119 L 165 119 L 166 116 C 170.156 116.839 172.632 116.735 175 113 L 169 114 L 171 110 L 163 112 C 163.56 108.698 163.582 106.416 160 106 L 161 100 L 144 98 C 143.237 91.8593 135.941 94.5925 132 96 z"/>
-</g>
-<g stroke="none" fill="#c3799f">
-<path d="M 69 93 L 69 125 L 70 125 z"/>
-</g>
-<g stroke="none" fill="#afbbfa">
-<path d="M 67 99 L 67 117 L 57 117 L 57 120 L 56 120 L 56 116 L 52 116 L 52 115 L 54 113 L 49 113 L 49 116 L 40 113 L 41 115 L 37 112 L 34 113 C 33.5103 110.065 30.3755 111.232 28 112 L 25 108 L 18 113 C 15.2326 110.326 13.8236 109.116 10 110 L 6 103 L 7 109 L 2 113 L 1 110 L 0 110 L 0 122 L 4 125 L 5 122 L 7 124 L 8 124 L 15 123 L 14 121 L 16 124 L 19 124 L 19 121 L 20 121 L 24 125 L 31 124 L 31 130 L 32 130 L 33 124 L 34 124 L 38 125 L 37 128 C 39.7667 128.9 41.307 130.483 42 127 L 43 127 L 44 131 L 47 129 L 47 137 L 48 137 C 51.9753 132.932 61.3936 128.781 66 133 L 67 133 C 69.4035 124.869 70.2966 106.856 67 99 z"/>
-</g>
-<g stroke="none" fill="#8367a0">
-<path d="M 68 99 L 68 126 L 69 126 z"/>
-</g>
-<g stroke="none" fill="#7d88c9">
-<path d="M 90 100 L 90 101 L 94 100 z"/>
-</g>
-<g stroke="none" fill="#7b77ad">
-<path d="M 101 99 L 101 117 L 102 117 z"/>
-</g>
-<g stroke="none" fill="#a6a7e2">
-<path d="M 102 100 L 103 172 L 104 172 L 104 170 L 105 170 L 106 173 L 107 167 L 111 167 L 111 159 L 112 159 L 112 168 L 116 168 L 113 173 C 128.983 180.49 137.824 164.282 150 156 L 150 155 L 143 153 L 142 156 L 139 154 L 138 154 L 135 157 L 134 154 L 131 154 L 129 158 L 128 155 L 121 157 L 121 155 L 118 158 L 115 159 L 114 159 C 112.533 156.539 111.533 156.857 109 158 L 105.166 123 z"/>
-</g>
-<g stroke="none" fill="#a8b7f9">
-<path d="M 179 102 L 178 109 L 172 107 L 175 113 L 166 116 L 165 119 L 164 119 L 155 112 L 154 112 C 152.253 114.046 152.355 114.474 155 115 C 151.488 116.842 149.924 116.543 148 113 L 142 113 L 143 118 L 142 118 L 139 107 L 138 107 L 140 112 L 134 114 L 134 115 L 138 114 L 141 120 L 147 120 L 146 126 L 140 126 L 137 130 L 135 124 L 134 135 L 135 135 L 135 131 L 136 131 L 138 137 L 147 140 L 148 135 L 152 137 L 153 133 L 156 134 L 160 130 L 163 133 L 164 133 L 165 128 L 163 129 L 166 129 L 168 128 L 169 131 L 171 129 L 176 129 L 174 127 L 174 126 L 175 122 L 177 123 L 175 121 L 176 115 L 178 122 C 181.76 118.714 180.845 106.396 179 102 z"/>
-</g>
-<g stroke="none" fill="#aab9fc">
-<path d="M 110 107 L 107 105 C 105.971 108.826 104.056 115.941 109 117 L 110 120 L 110 128 L 111 128 L 126 125 L 124 128 L 126 132 L 128 133 L 129 133 L 131 129 L 132 129 L 134 131 L 135 124 L 137 130 L 140 126 L 146 126 L 147 120 L 141 120 L 138 114 L 134 115 L 136 114 L 136 113 L 132 110 L 129 111 L 130 108 L 127 110 L 126 108 L 125 108 L 120 110 L 123 108 L 119 108 C 117.443 104.474 111.07 102.008 110 107 z"/>
-</g>
-<g stroke="none" fill="#acbaf8">
-<path d="M 85 126 L 86 126 L 86 138 L 93 138 C 93 131.802 95.7872 120.698 93.3958 115.148 C 91.4679 110.674 79.631 110.417 77.0278 114.318 C 72.9632 120.409 79.0301 135.469 85 126 z"/>
-</g>
-<g stroke="none" fill="#acb5f2">
-<path d="M 176 115 L 177 123 L 175 122 L 175 123 L 176 129 L 169 131 L 168 128 L 166 129 C 164.873 126.994 164.127 126.994 163 129 L 165 128 L 165 129 L 164 133 L 163 133 L 162 131 L 160 130 L 156 134 L 153 133 L 152 137 L 148 135 L 147 140 L 138 137 L 136 131 L 135 131 L 135 135 L 134 135 L 132 129 L 131 129 L 129 133 L 128 133 L 126 132 L 124 128 L 126 125 L 111 128 L 110 128 L 110 120 L 109 117 C 103.295 118.229 109.423 142.508 110 148 L 113 151 L 116 149 L 119 150 L 119 148 L 121 148 L 122 151 L 126 151 L 132 150 L 146 142 L 151 142 L 148 141 L 148 140 L 159 138 L 160 135 L 164 138 L 168 136 L 168 140 L 169 140 L 169 135 L 174 136 C 175.869 133.977 177.021 132.728 179 135 L 180 135 L 178 122 L 179 115 z"/>
-</g>
-<g stroke="none" fill="#4f3f76">
-<path d="M 96 116 C 96.3722 121.731 97.5496 130.663 94.0147 135.606 C 90.9332 139.914 80.2694 140.54 76.7338 136.436 C 74.8225 134.218 74.76 129.779 74 127 L 73 127 L 74 138 L 72 149 L 72 176 L 65 175 L 65 179 L 72 189 L 73 188 L 76 183 C 76.0642 185.993 75.9461 187.346 79 188 L 79 187 L 79 182 C 72.0658 175.209 76.8963 159.547 78 151 C 81.7201 151 87.3742 149.968 90.6559 152.028 C 97.6321 156.407 95.7884 175.941 95 183 L 104 186 C 103.898 173.66 102.001 161.447 102 149 C 102 143.956 102.959 138.995 97 138 L 98 116 z"/>
-</g>
-<g stroke="none" fill="#7f7bb6">
-<path d="M 75 119 L 76 138 L 77 138 L 77 132 C 81.7253 132.154 84.2149 133.077 85 138 L 80 138 L 80 139 L 91 139 L 91 138 L 86 138 L 86 126 L 85 126 C 77.9301 132.6 77.0321 123.83 75 119 z"/>
-</g>
-<g stroke="none" fill="#8d89c7">
-<path d="M 94 120 L 93 137 L 95 137 z"/>
-</g>
-<g stroke="none" fill="#b1baf7">
-<path d="M 8 124 L 7 124 L 5 122 L 4 125 L 0 122 L 3 131 L 1 136 L 11 130 L 14 134 L 14 135 L 12 137 L 16 137 L 16 133 L 17 133 L 16 139 L 16 140 L 18 143 L 23 144 L 29 142 C 30.6643 147.01 35.7582 146.246 36 141 L 48 142 L 50 144 L 53 138 L 54 138 L 62 142 L 62 141 C 59.2154 136.792 63.0776 135.299 67 135 C 63.8515 127.487 51.5865 131.461 48 137 L 47 137 L 47 129 L 44 131 L 43 127 L 42 127 L 42 130 L 37 128 L 38 125 L 34 124 L 33 124 L 32 130 L 31 130 L 31 124 L 28 125 L 24 125 L 20 121 L 19 121 C 17.5318 124.205 16.5045 122.208 14 121 L 15 123 C 11.9146 121.845 10.0673 121.197 8 124 z"/>
-</g>
-<g stroke="none" fill="#c594bd">
-<path d="M 68 126 L 68 156 L 69 156 z"/>
-</g>
-<g stroke="none" fill="#b0b8f5">
-<path d="M 0 128 L 0 144 L 3 141 L 4 141 L 4 145 L 11 143 L 13 149 L 14 149 L 13 145 L 17 144 L 18 147 L 20 145 L 21 145 L 21 148 L 22 148 L 22 145 L 23 145 L 27 147 C 28.0358 151.809 32.694 148.111 36 147 L 35 151 L 41 149 L 48 147 C 50.7062 147.994 59.1709 153.975 60 149 L 63 150 L 64 146 L 65 146 L 65 149 L 68 149 L 68 132 L 67 132 L 67 135 C 63.3927 135.118 57.5769 137.077 62 141 L 62 142 L 54 138 L 53 138 L 50 144 L 48 142 L 36 141 C 35.4286 146.053 31.2927 146.105 29 142 L 23 144 L 18 143 C 18.5746 140.604 18.4751 140.513 16 140 L 16 139 L 17 133 L 16 133 L 16 137 L 12 137 L 14 135 L 14 134 L 11 130 L 1 136 L 3 131 z"/>
-</g>
-<g stroke="none" fill="#adb7f4">
-<path d="M 77 132 L 77 138 L 85 138 C 84.5784 132.589 82.0168 132.059 77 132 z"/>
-</g>
-<g stroke="none" fill="#abb3ef">
-<path d="M 174 136 L 169 135 L 169 140 L 168 140 L 168 136 L 164 138 L 160 135 L 159 138 C 154.751 135.194 152.249 138.76 148 140 L 148 141 L 151 142 L 146 142 L 132 150 C 129.156 148.668 126.803 147.327 126 151 L 122 151 L 121 148 L 119 150 L 116 149 L 113 151 L 112 147 L 111 147 C 109.554 152.047 111.017 154.904 114 159 L 115 159 L 118 158 L 121 155 L 121 157 L 128 155 L 129 158 L 131 154 L 134 154 L 135 157 L 138 154 L 139 154 L 142 156 L 143 153 L 144 156 L 180 146 L 179 132 z"/>
-</g>
-<g stroke="none" fill="#773f70">
-<path d="M 70 138 C 69.9991 145.855 62.7981 172.946 72 176 L 72 138 z"/>
-</g>
-<g stroke="none" fill="#afb5ed">
-<path d="M 3 141 L 0 144 L 0 173 L 67 169 L 68 151 L 65 146 L 64 146 L 63 150 L 60 149 C 60 154.188 50.7754 147.511 48 147 L 41 149 L 35 151 L 36 147 C 32.6847 147.815 29.3455 149.991 27 147 L 23 145 L 22 145 L 22 148 L 21 148 L 21 145 L 20 145 L 18 147 L 17 144 L 13 145 L 14 149 L 13 149 L 11 143 L 4 145 z"/>
-</g>
-<g stroke="none" fill="#725c64">
-<path d="M 125 178 C 131.151 179.443 136.336 177.452 142 175 L 143 178 L 148 174 L 147 171 L 152 172 L 147 180 C 152.101 180.777 153.012 176.298 154 172 L 150 170 L 151 167 L 143 170 L 143 171 L 146 171 L 146 172 L 140 172 L 133 175 L 148 165 C 147.855 159.65 149.967 157.512 155 156 C 155.454 161.212 156.402 167.022 161 170 L 158 171 L 158 172 L 162 175 L 161 179 L 159 186 L 164 185 L 164 189 L 160 188 L 159 191 L 164 195 L 168 187 C 171.956 191.19 171 196.546 171 202 L 170 202 L 170 196 L 166 200 L 167 208 L 172 207 C 172.544 200.103 169.435 185.62 176 182 L 176 186 C 180.825 184.303 179.998 179.437 180 175 L 180 146 C 157.239 148.942 139.507 160.776 125 178 z"/>
-</g>
-<g stroke="none" fill="#887991">
-<path d="M 78 151 L 77 156 C 84.1412 154.526 84.9782 158.821 85 165 L 77 165 L 77 159 L 76 159 C 76 165.096 73.4141 178.379 79 182 C 76.2607 186.023 78.9602 190.035 81 194 L 76 194 L 79 196 L 79 197 L 76 198 L 91 201 L 91 202 L 85 202 L 85 203 L 88 204 L 87 208 L 90 208 L 90 213 L 86 213 L 86 214 L 105 213 L 102 202 C 109.204 195.705 98.9465 187.766 96.4128 182.424 C 94.6944 178.802 95.0108 173.907 95 170 L 92 170 L 92 161 L 91 161 L 91 170 L 88 170 L 87 151 z"/>
-</g>
-<g stroke="none" fill="#aab0e7">
-<path d="M 87 151 L 88 170 L 91 170 L 92 151 z"/>
-</g>
-<g stroke="none" fill="#352d51">
-<path d="M 168 152 L 165 159 L 171 153 z"/>
-</g>
-<g stroke="none" fill="#9894cd">
-<path d="M 92 153 L 92 170 L 95 170 z"/>
-</g>
-<g stroke="none" fill="#827cac">
-<path d="M 102 154 L 102 172 L 103 172 z"/>
-</g>
-<g stroke="none" fill="#aa688b">
-<path d="M 110 154 L 110 158 L 111 158 z"/>
-</g>
-<g stroke="none" fill="#aaafe6">
-<path d="M 78 155 L 78 164 L 84 164 L 84 155 z"/>
-</g>
-<g stroke="none" fill="#9292c9">
-<path d="M 77 156 L 77 165 L 85 165 L 85 156 L 84 156 L 84 164 L 78 164 z"/>
-</g>
-<g stroke="none" fill="#664e5a">
-<path d="M 148 165 C 142.417 166.227 135.742 169.884 133 175 C 136.313 174.689 139.191 175.773 140 172 L 146 172 L 146 171 L 143 171 L 143 170 L 151 167 L 150 170 L 154 172 C 152.516 176.066 151.842 179.781 147 180 L 152 172 L 147 171 L 148 174 L 142 175 L 117 182 L 119 184 L 118 190 L 118 191 L 122 191 L 120 196 L 120 197 L 124 197 L 123 200 L 127 203 L 128 203 L 131 193 L 129 200 L 132 207 L 133 207 L 133 199 L 139 201 L 139 192 L 140 192 L 140 198 L 142 198 L 142 193 L 145 193 L 145 188 L 144 188 L 144 192 L 142 192 L 142 187 C 147.318 187.173 149.88 188.549 148 194 L 151 193 L 152 207 L 153 207 L 153 202 L 168 202 L 168 201 L 153 197 C 153.624 193.007 154.856 191.182 159 191 L 160 188 L 164 189 L 164 185 L 159 186 L 161 179 L 162 175 L 159 174 L 158 172 L 158 171 L 161 170 L 155 156 C 149.565 156.996 147.164 159.378 148 165 z"/>
-</g>
-<g stroke="none" fill="#7c5992">
-<path d="M 111 159 L 111 167 L 107 167 L 109 171 L 110 168 L 116 169 L 116 168 L 112 168 z"/>
-</g>
-<g stroke="none" fill="#342e49">
-<path d="M 163 164 L 164 168 L 172 165 L 171 163 L 174 160 z"/>
-</g>
-<g stroke="none" fill="#cc82a0">
-<path d="M 67 164 L 67 175 L 68 175 z"/>
-</g>
-<g stroke="none" fill="#8581b5">
-<path d="M 0 173 L 0 180 C 7.64623 180.638 17.7697 183.904 25 183.185 C 34.8656 182.204 53.4293 174.466 62 182 L 56 184 L 57 201 L 58 201 L 58 186 C 62.83 185.266 62.952 181.268 63 177 L 64 177 L 65 179 L 65 175 L 67 169 z"/>
-</g>
-<g stroke="none" fill="#583a39">
-<path d="M 110 168 C 110.729 171.403 112.806 170.987 116 171 L 116 169 z"/>
-</g>
-<g stroke="none" fill="#b35877">
-<path d="M 104 170 C 101.805 179.245 107.823 194.313 102 202 L 103 210 L 105 200 z"/>
-</g>
-<g stroke="none" fill="#4d4067">
-<path d="M 105 175 L 110 172 z"/>
-</g>
-<g stroke="none" fill="#756ca5">
-<path d="M 112 187 L 112 171 C 103.06 174.143 107.488 181.712 112 187 z"/>
-</g>
-<g stroke="none" fill="#ce6e8f">
-<path d="M 112 171 L 113 185 L 114 185 C 114 181.41 112.179 172.493 116 172 z"/>
-</g>
-<g stroke="none" fill="#7b79b2">
-<path d="M 114 174 L 115 184 L 127 177 z"/>
-</g>
-<g stroke="none" fill="#291521">
-<path d="M 105 175 L 105 205 L 107 205 z"/>
-</g>
-<g stroke="none" fill="#3c284e">
-<path d="M 63 177 L 61 184 L 61 185 L 61 186 L 63 199 L 56 202 L 56 184 L 55 184 L 55 203 L 73 201 L 69 202 L 72 189 z"/>
-</g>
-<g stroke="none" fill="#725e76">
-<path d="M 106 177 L 106 201 L 107 201 L 107 192 C 110.349 195.449 116.47 200.927 114 206 L 114 207 L 119 202 L 116 202 L 115 189 L 113 186 L 111 187 z"/>
-</g>
-<g stroke="none" fill="#615681">
-<path d="M 90 178 L 88 183 L 87 180 L 86 180 L 84 185 L 87 184 L 91 189 L 93 183 L 93 182 L 93 181 z"/>
-</g>
-<g stroke="none" fill="#7b77a9">
-<path d="M 0 180 L 0 192 L 13 192 L 13 193 L 6 200 C 11.1565 199.893 17.8788 199.557 21 195 L 17 195 L 17 191 L 20 194 L 52 188 L 47 193 L 47 194 L 53 194 L 54 208 L 55 208 L 56 180 L 24.4244 183.042 z"/>
-</g>
-<g stroke="none" fill="#5e5389">
-<path d="M 55 184 L 59 183 L 60 180 C 56.8211 179.327 55.8676 181.115 55 184 z"/>
-</g>
-<g stroke="none" fill="#b35470">
-<path d="M 65 179 L 68 187 L 68 179 z"/>
-</g>
-<g stroke="none" fill="#61444c">
-<path d="M 58 180 L 58 182 L 62 182 L 62 180 z"/>
-</g>
-<g stroke="none" fill="#906c85">
-<path d="M 114 180 L 113 188 L 119 184 L 115 184 z"/>
-</g>
-<g stroke="none" fill="#361a2c">
-<path d="M 165 182 L 165 183 L 170 184 L 169 181 z"/>
-</g>
-<g stroke="none" fill="#9a6d71">
-<path d="M 173 202 L 174 202 L 180 199 L 180 184 L 179 184 L 176 186 L 176 182 C 168.845 184.375 172.951 196.138 173 202 z"/>
-</g>
-<g stroke="none" fill="#756284">
-<path d="M 73 183 L 69 202 L 73 201 L 55 203 C 55.2325 209.992 69.2837 215.314 74 210 L 75 210 L 76 210 C 77.1266 212.006 77.8734 212.006 79 210 L 80 210 C 80.7292 213.403 82.8058 212.987 86 213 L 88 204 L 75 204 L 74 185 L 75 185 C 75.0466 190.141 75.2479 193.541 81 194 L 76 188 L 76 183 z"/>
-</g>
-<g stroke="none" fill="#bba1b0">
-<path d="M 96 183 L 104 191 C 102.752 186.292 100.708 184.248 96 183 z"/>
-</g>
-<g stroke="none" fill="#b6a3b3">
-<path d="M 74 185 L 72 200 L 74 200 z"/>
-</g>
-<g stroke="none" fill="#645788">
-<path d="M 56 186 L 56 202 C 61.827 200.295 60.5126 190.645 59 186 L 58 186 L 58 201 L 57 201 z"/>
-</g>
-<g stroke="none" fill="#635681">
-<path d="M 60 186 L 61 199 L 63 199 L 63 186 z"/>
-</g>
-<g stroke="none" fill="#7b77a1">
-<path d="M 20 194 L 17 191 L 17 195 L 21 195 L 6 200 L 13 193 L 13 192 L 1 191 L 1 205 L 14 204 C 18.9594 209.705 32.35 206.525 39 206 L 39 211 L 40 211 L 40 194 L 44 194 L 44 189 L 52 189 C 44.5073 184.014 27.8966 191.322 20 194 z"/>
-</g>
-<g stroke="none" fill="#8379a0">
-<path d="M 60 187 L 60 199 L 61 199 z"/>
-</g>
-<g stroke="none" fill="#2d2650">
-<path d="M 113 188 L 116 202 L 124 197 L 120 199 L 122 191 L 118 191 L 118 190 L 121 190 z"/>
-</g>
-<g stroke="none" fill="#8c7389">
-<path d="M 142 187 L 142 192 L 144 192 L 144 188 L 149 188 z"/>
-</g>
-<g stroke="none" fill="#ab7f80">
-<path d="M 168 187 L 164 195 L 170 196 L 170 202 L 171 202 C 171 196.954 172.49 190.238 168 187 z"/>
-</g>
-<g stroke="none" fill="#1d1b2d">
-<path d="M 145 188 L 145 193 L 142 193 C 142.306 199.557 144.415 201.84 151 202 L 151 193 L 148 194 L 150 188 z"/>
-</g>
-<g stroke="none" fill="#2a233d">
-<path d="M 44 189 L 44 194 L 40 194 L 39 240 L 72 240 L 72 235 L 73 235 L 73 240 L 75 240 C 74.9139 229.735 71.8712 228.07 65 222 C 49.958 221.155 52.0073 205.022 52 194 L 47 194 L 47 193 L 50 193 L 50 189 z"/>
-</g>
-<g stroke="none" fill="#534566">
-<path d="M 98 189 L 98 191 L 100 191 L 100 189 z"/>
-</g>
-<g stroke="none" fill="#a47977">
-<path d="M 154 191 L 163 194 C 160.69 190.864 157.714 190.274 154 191 z"/>
-</g>
-<g stroke="none" fill="#3b2f55">
-<path d="M 90.6667 191.333 L 91.3333 191.667 L 90.6667 191.333 z"/>
-</g>
-<g stroke="none" fill="#373363">
-<path d="M 75 192 L 75 204 L 91 202 L 91 201 L 76 198 L 79 197 L 79 196 L 76 196 z"/>
-</g>
-<g stroke="none" fill="#594f6d">
-<path d="M 95 194 L 98 193 z"/>
-</g>
-<g stroke="none" fill="#574961">
-<path d="M 100 192 L 100 194 L 102 194 L 102 192 z"/>
-</g>
-<g stroke="none" fill="#ad909d">
-<path d="M 107 192 C 107.001 199.37 107.448 205.047 116 206 C 114.88 200.129 111.818 195.496 107 192 z"/>
-</g>
-<g stroke="none" fill="#7e6879">
-<path d="M 139 192 L 139 201 L 133 199 L 133 207 L 163 212 L 163 208 L 164 208 L 164 213 L 172 214 L 171 206 L 167 208 L 167 203 L 153 202 L 153 207 L 152 207 C 151.194 202.168 144.46 199.44 140 198 z"/>
-</g>
-<g stroke="none" fill="#eae0f0">
-<path d="M 153 192 L 155 196 z"/>
-</g>
-<g stroke="none" fill="#c7b5cb">
-<path d="M 154 192 L 153 196 L 153 197 L 162 198 L 163 194 z"/>
-</g>
-<g stroke="none" fill="#48406c">
-<path d="M 90 193 L 94 197 L 93 193 z"/>
-</g>
-<g stroke="none" fill="#896d85">
-<path d="M 130 193 L 126 202 L 132 207 C 132 203.637 132.716 200.796 129 200 z"/>
-</g>
-<g stroke="none" fill="#594c75">
-<path d="M 52 194 L 52 204 L 53 204 z"/>
-</g>
-<g stroke="none" fill="#635b89">
-<path d="M 115 195 L 115 198 L 118 198 L 118 195 z"/>
-</g>
-<g stroke="none" fill="#f4e8fa">
-<path d="M 162 195 L 162 198 L 166 198 L 166 195 z"/>
-</g>
-<g stroke="none" fill="#ae9ebc">
-<path d="M 166 195 L 166 199 L 168 199 L 168 195 z"/>
-</g>
-<g stroke="none" fill="#6c6394">
-<path d="M 120 197 L 120 199 L 122 199 L 122 197 z"/>
-</g>
-<g stroke="none" fill="#90727a">
-<path d="M 156 197 L 156 198 L 166 200 L 166 198 z"/>
-</g>
-<g stroke="none" fill="#dfcdd6">
-<path d="M 175 200 L 178 198 z"/>
-</g>
-<g stroke="none" fill="#795361">
-<path d="M 174 199 L 173 203 L 176 201 L 180 203 L 180 199 z"/>
-</g>
-<g stroke="none" fill="#a798a5">
-<path d="M 118 200 L 119 204 C 116.728 206.147 118.555 207.212 121 208 L 120 201 L 126 201 z"/>
-</g>
-<g stroke="none" fill="#26243d">
-<path d="M 120 201 L 120 204 L 126 204 L 126 201 z"/>
-</g>
-<g stroke="none" fill="#5c3650">
-<path d="M 140 201 L 140 208 L 141 208 z"/>
-</g>
-<g stroke="none" fill="#493945">
-<path d="M 176 201 L 172 202 L 172 214 L 173 214 L 173 204 L 180 204 L 180 203 z"/>
-</g>
-<g stroke="none" fill="#8e7990">
-<path d="M 107 202 L 106 215 L 106 216 L 135 217 L 135 213 L 120 213 L 121 208 z"/>
-</g>
-<g stroke="none" fill="#757cb0">
-<path d="M 0 204 L 0 224 L 2 222 L 3 222 L 4 222 L 4 224 L 27 223 L 32 222 L 37.973 215.302 L 39 206 C 31.1972 206.335 20.7496 209.14 14 204 z"/>
-</g>
-<g stroke="none" fill="#a44a68">
-<path d="M 53 204 C 53.0008 211.645 55.0862 213.847 59 220 C 62.7927 218.6 64.8847 218.191 67 222 L 68 222 L 68 218 L 77 219 L 77 225 L 81 225 L 81 221 L 82 221 L 83 223 L 86 213 L 80 210 L 79 210 C 72.3302 215.052 57.2176 210.377 53 204 z"/>
-</g>
-<g stroke="none" fill="#574970">
-<path d="M 120 204 L 120 213 L 127 213 L 127 205 z"/>
-</g>
-<g stroke="none" fill="#705e70">
-<path d="M 173 204 L 172 215 L 176 215 L 175 209 L 180 210 L 180 204 z"/>
-</g>
-<g stroke="none" fill="#614f6e">
-<path d="M 105 205 L 105 213 L 101 213 L 101 215 L 108 215 L 107 205 z"/>
-</g>
-<g stroke="none" fill="#79647f">
-<path d="M 126 206 L 127 213 L 121 212 L 121 213 L 135 213 L 135 217 L 146 218 L 146 217 L 144 212 L 148 212 L 148 211 C 140.602 210.06 134.184 206.961 127 210 z"/>
-</g>
-<g stroke="none" fill="#a57f96">
-<path d="M 127 206 L 127 207 L 152 214 L 159 215 L 172 215 L 172 214 L 164 213 L 164 208 L 163 208 L 163 212 z"/>
-</g>
-<g stroke="none" fill="#49435e">
-<path d="M 127 207 L 127 210 L 130 209 L 130 208 z"/>
-</g>
-<g stroke="none" fill="#4e192e">
-<path d="M 52 208 C 52.0759 216.387 55.953 220.632 64 223 z"/>
-</g>
-<g stroke="none" fill="#4b4669">
-<path d="M 86 208 L 86 213 L 90 213 L 90 208 z"/>
-</g>
-<g stroke="none" fill="#926b82">
-<path d="M 175 209 L 176 215 L 160 214 L 161 219 L 180 221 C 180 215.718 181.187 210.35 175 209 z"/>
-</g>
-<g stroke="none" fill="#c099ab">
-<path d="M 74 210 L 74 212 L 76 212 L 76 210 z"/>
-</g>
-<g stroke="none" fill="#c1b3cc">
-<path d="M 115.333 210.667 L 115.667 211.333 L 115.333 210.667 z"/>
-</g>
-<g stroke="none" fill="#595a83">
-<path d="M 39 211 L 39 236 L 40 236 z"/>
-</g>
-<g stroke="none" fill="#6d557b">
-<path d="M 111 212 L 111 215 L 118 215 z"/>
-</g>
-<g stroke="none" fill="#3f3d5b">
-<path d="M 144 212 C 144.459 217.752 147.859 217.953 153 218 L 152 212 z"/>
-</g>
-<g stroke="none" fill="#675c7b">
-<path d="M 153 213 L 153 214 L 159 214 z"/>
-</g>
-<g stroke="none" fill="#a23c56">
-<path d="M 85 214 C 85.0744 220.284 86.6972 222.322 93 223 L 94 220 L 105 222 L 105 223 L 100 224 L 100 225 L 105 230 L 106 230 L 112 222 L 111 226 L 113 223 L 119 222 L 122 224 L 122 217 L 118 219 C 113.986 212.809 92.2233 214.06 85 214 z"/>
-</g>
-<g stroke="none" fill="#b9afd0">
-<path d="M 152 216 L 159 215 z"/>
-</g>
-<g stroke="none" fill="#656088">
-<path d="M 153 215 L 153 218 L 161 219 L 161 215 z"/>
-</g>
-<g stroke="none" fill="#6b74a8">
-<path d="M 32 222 L 27 223 L 4 222 L 3 222 L 2 222 L 0 240 L 39 240 L 39 216 C 35.1593 216.932 32.2124 217.733 32 222 z"/>
-</g>
-<g stroke="none" fill="#bb637e">
-<path d="M 117 216 L 118 219 L 122 217 L 122 224 L 119 222 L 113 223 L 113 224 L 123 228 L 121 231 L 121 232 C 124.925 231.159 123.885 228.292 123 225 L 125 232 L 127 229 L 132 229 L 135 226 L 135 220 L 135 219 L 133 217 L 132 217 L 132 225 L 127 223 L 123 224 L 125 217 z"/>
-</g>
-<g stroke="none" fill="#9f3d58">
-<path d="M 133 216 L 135 219 C 131.542 227.212 140.004 225.394 145 227 L 145 223 L 146 223 L 146 227 L 153 226 C 155.247 228.585 160.532 229.597 163 227 L 164 227 C 166.882 230.349 172.512 230.405 176 228 L 180 230 L 180 222 L 175 224 L 174 220 L 162 223 C 161.142 218.995 154.907 218.69 153 222 L 152 222 C 151.142 217.995 144.907 217.69 143 221 L 142 221 z"/>
-</g>
-<g stroke="none" fill="#8d82ab">
-<path d="M 154 216 L 154 217 L 158 217 z"/>
-</g>
-<g stroke="none" fill="#ab435a">
-<path d="M 123 217 L 123 224 L 127 223 L 132 225 L 132 217 z"/>
-</g>
-<g stroke="none" fill="#b35072">
-<path d="M 134 217 L 134 218 L 142 221 L 143 221 C 146.228 218.558 149.702 218.457 152 222 L 153 222 C 156.228 219.558 159.702 219.457 162 223 L 173 221 C 162.163 216.41 145.683 217.008 134 217 z"/>
-</g>
-<g stroke="none" fill="#813851">
-<path d="M 61 218 L 67 222 C 65.9011 218.679 64.4098 218.263 61 218 z"/>
-</g>
-<g stroke="none" fill="#0f0e13">
-<path d="M 68 218 L 65 223 C 69.8612 226.082 72.6613 226.917 74 233 L 80 234 L 81 229 L 82 229 C 82.6982 231.66 84.2338 239.903 88 236 L 89 236 C 90.999 242.023 99.7382 240 105 240 L 108 236 L 108 240 C 124.223 240 145.458 243.594 161 239 L 161 233 L 161 232 L 159 229 L 158 229 L 158 237 L 147 235 L 147 232 L 151 231 L 151 230 L 147 228 L 146 228 L 146 235 L 125 232 L 126 227 L 124 232 C 118.038 230.872 115.202 230.351 114 224 L 113 224 L 113 230 L 93 227 L 94 223 L 92 227 C 86.3541 225.936 75.708 226.482 74 220 L 69 223 z"/>
-</g>
-<g stroke="none" fill="#82364d">
-<path d="M 75 219 L 77 224 L 77 219 z"/>
-</g>
-<g stroke="none" fill="#d9708c">
-<path d="M 69 220 L 69 223 L 72 223 L 72 220 z"/>
-</g>
-<g stroke="none" fill="#ad5672">
-<path d="M 94 220 L 93 223 L 97 224 L 97 227 L 94 227 L 94 228 L 98 228 L 98 224 L 105 223 z"/>
-</g>
-<g stroke="none" fill="#712233">
-<path d="M 133 220 L 133 224 L 134 224 z"/>
-</g>
-<g stroke="none" fill="#d86b7f">
-<path d="M 73 221 L 75 224 L 75 221 z"/>
-</g>
-<g stroke="none" fill="#672a38">
-<path d="M 81 221 L 81 225 L 82 225 z"/>
-</g>
-<g stroke="none" fill="#6e2f43">
-<path d="M 85 221 L 83 225 L 83 226 L 87 226 z"/>
-</g>
-<g stroke="none" fill="#b7516c">
-<path d="M 174 221 L 175 224 L 180 222 z"/>
-</g>
-<g stroke="none" fill="#da6c83">
-<path d="M 83 222 L 82 223 L 82 224 L 82 225 L 85 222 z"/>
-</g>
-<g stroke="none" fill="#e27289">
-<path d="M 87 223 L 92 227 L 92 222 z"/>
-</g>
-<g stroke="none" fill="#987b88">
-<path d="M 111 222 L 107 224 L 107 225 C 109.45 224.88 112.095 224.905 111 222 z"/>
-</g>
-<g stroke="none" fill="#b85d70">
-<path d="M 145 223 L 143 228 L 145 231 L 146 231 L 146 228 L 157 231 L 158 231 L 160 229 L 160 228 L 153 226 L 146 227 z"/>
-</g>
-<g stroke="none" fill="#e17087">
-<path d="M 93 227 L 97 224 z"/>
-</g>
-<g stroke="none" fill="#4e202a">
-<path d="M 98 224 L 98 228 L 99 228 L 100 224 z"/>
-</g>
-<g stroke="none" fill="#e17285">
-<path d="M 99 225 L 100 230 L 105 229 C 103.901 225.679 102.41 225.263 99 225 z"/>
-</g>
-<g stroke="none" fill="#3d1321">
-<path d="M 106 225 L 106 229 L 107 229 L 107 226 L 111 226 z"/>
-</g>
-<g stroke="none" fill="#b79caa">
-<path d="M 114 225 L 114 226 L 118 226 z"/>
-</g>
-<g stroke="none" fill="#6b4d57">
-<path d="M 123 225 L 123 227 L 125 227 L 125 225 z"/>
-</g>
-<g stroke="none" fill="#b66e83">
-<path d="M 142 225 L 134 227 L 134 228 z"/>
-</g>
-<g stroke="none" fill="#e56e81">
-<path d="M 107 226 C 108.099 229.321 109.59 229.737 113 230 L 113 226 z"/>
-</g>
-<g stroke="none" fill="#81293f">
-<path d="M 115 226 L 115 227 L 120 227 z"/>
-</g>
-<g stroke="none" fill="#5e222e">
-<path d="M 133 226 L 132 234 L 137 228 L 135 226 z"/>
-</g>
-<g stroke="none" fill="#b14b61">
-<path d="M 114 227 L 117 231 z"/>
-</g>
-<g stroke="none" fill="#e46d85">
-<path d="M 116 227 C 117.223 230.687 119.308 230.88 123 231 C 121.961 227.449 119.47 227.248 116 227 z"/>
-</g>
-<g stroke="none" fill="#e46e81">
-<path d="M 131 227 L 127 229 L 127 233 L 133 233 z"/>
-</g>
-<g stroke="none" fill="#82526b">
-<path d="M 136 230 L 143 228 z"/>
-</g>
-<g stroke="none" fill="#bd6c84">
-<path d="M 163 227 L 160 229 L 160 230 L 174 234 L 176 231 L 180 234 L 180 230 L 176 228 C 171.615 230.32 167.211 229.357 163 227 z"/>
-</g>
-<g stroke="none" fill="#b69ba7">
-<path d="M 139 228 L 139 229 L 144 229 z"/>
-</g>
-<g stroke="none" fill="#775267">
-<path d="M 147 228 L 147 229 L 151 229 z"/>
-</g>
-<g stroke="none" fill="#272135">
-<path d="M 81 229 L 80 235 L 82 240 L 83 240 z"/>
-</g>
-<g stroke="none" fill="#6f2540">
-<path d="M 139 229 L 139 230 L 144 230 z"/>
-</g>
-<g stroke="none" fill="#e76e83">
-<path d="M 135 230 L 135 234 L 146 235 L 145 229 z"/>
-</g>
-<g stroke="none" fill="#ae8d9e">
-<path d="M 147 229 L 147 230 L 151 230 z"/>
-</g>
-<g stroke="none" fill="#816876">
-<path d="M 151 229 L 151 231 L 157 231 L 157 229 z"/>
-</g>
-<g stroke="none" fill="#826b76">
-<path d="M 159 229 C 159.978 233.562 164.375 231.381 168 231 L 168 230 z"/>
-</g>
-<g stroke="none" fill="#e26c7d">
-<path d="M 149 231 L 149 236 L 158 237 L 158 231 z"/>
-</g>
-<g stroke="none" fill="#903745">
-<path d="M 151 231 L 151 232 L 157 232 z"/>
-</g>
-<g stroke="none" fill="#b295a0">
-<path d="M 164 231 L 164 232 L 168 232 z"/>
-</g>
-<g stroke="none" fill="#451b27">
-<path d="M 174 231 L 173 240 L 177 240 L 176 231 z"/>
-</g>
-<g stroke="none" fill="#624959">
-<path d="M 75 232 L 76 240 L 82 240 C 81.6219 235.215 79.4691 233.444 75 232 z"/>
-</g>
-<g stroke="none" fill="#873743">
-<path d="M 147 232 L 147 235 L 149 235 L 149 232 z"/>
-</g>
-<g stroke="none" fill="#6c1b33">
-<path d="M 161 232 L 161 233 L 169 233 z"/>
-</g>
-<g stroke="none" fill="#873956">
-<path d="M 159 233 C 159.577 236.474 160.526 237.423 164 238 L 164 237 L 161 237 L 161 233 z"/>
-</g>
-<g stroke="none" fill="#e56b7e">
-<path d="M 161 233 L 161 237 L 174 239 L 174 234 z"/>
-</g>
-<g stroke="none" fill="#6e1c36">
-<path d="M 169 233 L 169 234 L 173 234 z"/>
-</g>
-<g stroke="none" fill="#913c46">
-<path d="M 176 233 C 176.312 236.637 176.328 238.774 180 240 L 180 239 L 180 234 z"/>
-</g>
-<g stroke="none" fill="#863350">
-<path d="M 141 234 L 141 235 L 144 235 z"/>
-</g>
-<g stroke="none" fill="#8c5d78">
-<path d="M 72 235 L 72 240 L 73 240 z"/>
-</g>
-<g stroke="none" fill="#927b8f">
-<path d="M 75 235 L 75 240 L 76 240 z"/>
-</g>
-<g stroke="none" fill="#de687c">
-<path d="M 178 235 L 178 239 L 180 239 L 180 235 z"/>
-</g>
-<g stroke="none" fill="#9e8796">
-<path d="M 83 236 L 83 240 L 84 240 z"/>
-</g>
-<g stroke="none" fill="#4c3b43">
-<path d="M 88 236 L 84 237 C 84.7292 240.403 86.8058 239.987 90 240 z"/>
-</g>
-<g stroke="none" fill="#252232">
-<path d="M 106 236 L 105 240 L 108 236 z"/>
-</g>
-<g stroke="none" fill="#983e57">
-<path d="M 153 236 L 153 237 L 157 237 z"/>
-</g>
-<g stroke="none" fill="#532130">
-<path d="M 160 240 L 163 238 z"/>
-</g>
-<g stroke="none" fill="#0e0d0e">
-<path d="M 163 238 L 163 240 L 173 240 z"/>
-</g>
-<g stroke="none" fill="#74293f">
-<path d="M 168 238 L 168 239 L 171 239 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_hame.xml Deleted

@@ -1,1505 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="180" height="240" viewBox="0 0 240 320" preserveAspectRatio="xMidYMid meet" contentScriptType="text/ecmascript">
-<g stroke="none" fill="#0e0b0d">
-<path d="M 0 0 L 0 1 C 7.26834 3.66556 15.2767 5.77484 23 4 C 17.4329 -0.426971 6.94081 0.0574951 0 0 z"/>
-<path d="M 13 29 L 43 32 L 43 31 C 35.8776 30.8522 22.6245 30.4259 17 26 z"/>
-<path d="M 58 35 L 58 36 L 65 42 C 64.7117 36.7963 63.2228 35.1737 58 35 z"/>
-<path d="M 217 36 L 217 40 L 218 40 L 219 36 z"/>
-<path d="M 70 39 C 67.2809 42.0894 67.0923 44.0263 68 48 L 71 48 z"/>
-<path d="M 23 57 L 23 59 L 31 58 z"/>
-<path d="M 228 60 L 228 61 L 240 61 L 240 59 z"/>
-<path d="M 214 63 L 208 66 L 213 69 L 210 74 L 211 79 L 197 81 L 197 82 L 209 81 L 208 85 L 220 77 L 221 74 L 223 76 L 235 75 L 240 73 L 240 68 L 215 67 L 215 66 L 221 65 z"/>
-<path d="M 225 64 L 225 65 L 240 65 z"/>
-<path d="M 46 70 L 49 73 L 43 72 L 43 79 L 44 79 L 45 75 L 51 72 L 53 73 L 54 69 z"/>
-<path d="M 159 76 L 159 81 L 170 78 L 170 76 z"/>
-<path d="M 164 82 C 164.609 84.5029 165.895 85.614 163 86 L 163 87 C 167.457 86.6566 169.343 85.1394 171 81 z"/>
-<path d="M 0 87 L 0 103 L 10 103 L 7 99 L 12 97 C 16.0941 101.435 17.0021 93.7256 20.233 92.6219 C 23.1178 91.6365 27.8905 92.9911 31 93 L 31 88 L 23 90 L 24 87 L 14 84 z"/>
-<path d="M 62 88 C 60.7908 90.0153 53.9854 95.0585 55 91 C 52.3925 92.1194 51.9321 93.3414 55 94 L 58 98 L 51 113 C 57.5962 113 67.463 114.848 73.6111 112.389 C 77.5227 110.824 82.4874 104.39 76 103 L 76 96 L 69 95 C 70.2803 104.686 69.2414 106.02 59 106 L 66 89 z"/>
-<path d="M 210 88 L 205 89 L 205 90 L 209 90 L 208 93 z"/>
-<path d="M 160 89 L 160 90 L 166 90 z"/>
-<path d="M 189 93 C 191.712 97.3036 196.432 97.0497 201 96 z"/>
-<path d="M 207 95 L 199 99 L 199 100 L 208 103 L 209 95 z"/>
-<path d="M 171 104 L 176 110 L 181 109 L 181 108 L 179 107 L 195 100 L 180.926 98.6034 z"/>
-<path d="M 218 99 L 217 106 L 209 106 C 214.124 117.336 228.971 114.606 240 116 L 240 99 z"/>
-<path d="M 183 109 L 183 110 C 188.325 111.253 196.528 111.389 201 108 L 183 109 M 206 107 L 205 118 L 206 118 L 209 111 L 209 110 z"/>
-<path d="M 0 111 C 0.979342 115.57 5.30177 113.517 9 113.611 C 18.8371 113.862 29.006 115.686 38 111 z"/>
-<path d="M 46 110 L 49 113 L 48 110 z"/>
-<path d="M 172 128 L 172 131 L 181 129 L 172 128 M 18 132 L 23 129 L 18 132 M 27 132 L 27 135 C 33.2229 135 47.6819 135.985 50 129 z"/>
-<path d="M 232 130 L 240 133 L 240 130 z"/>
-<path d="M 15 152 L 15 153 L 24 154 L 24 153 z"/>
-<path d="M 238 164 L 240 166 L 240 164 z"/>
-<path d="M 3 166 L 3 168 L 5 168 L 5 166 z"/>
-<path d="M 9 171 L 10 175 L 20 176 z"/>
-<path d="M 115 172 C 115.822 182.861 125.408 177.435 129 171 z"/>
-<path d="M 225 178 L 225 179 L 232 179 z"/>
-<path d="M 213 182 L 221 184 z"/>
-<path d="M 6 185 L 6 188 L 8 188 L 8 185 z"/>
-<path d="M 219 191 L 235 191 L 235 186 C 230.309 186.298 221.614 186.968 219 191 z"/>
-<path d="M 113 188 L 113 191 L 116 191 L 116 188 z"/>
-<path d="M 132 191 L 131 197 L 143 199 L 143 200 L 137 200 L 138 208 L 135 206 L 132 209 L 142 211 L 143 205 C 147.809 204.029 146.997 199.152 147 195 z"/>
-<path d="M 159 198 L 159 199 L 166 199 z"/>
-<path d="M 115 200 L 113 204 L 114 205 L 115 205 L 116 205 z"/>
-<path d="M 120 201 L 117 206 L 117 207 L 124 209 L 120 211 L 120 213 L 123 214 L 122 218 L 130 211 L 130 210 L 126 209 L 125 201 z"/>
-<path d="M 221 206 L 224 205 L 229 210 L 235 209 C 233.677 204.477 223.893 202.042 221 206 z"/>
-<path d="M 115.667 208.333 L 116.333 208.667 L 115.667 208.333 z"/>
-<path d="M 45 217 L 45 220 L 55 217 C 51.5068 214.631 48.7385 215.426 45 217 z"/>
-<path d="M 133 215 L 133 216 L 138 216 z"/>
-<path d="M 112 217 L 109 227 L 113 226 C 113.558 229.587 114.366 231.332 118 232 L 117 235 C 119.946 234.399 124.033 231.946 122 229 L 126 224 z"/>
-<path d="M 132 217 L 132 218 L 135 222 L 139 221 L 138 224 L 144 221 L 144 220 L 138 220 L 138 217 z"/>
-<path d="M 17 220 L 17 222 L 44 222 L 44 221 L 40 219 z"/>
-<path d="M 125 220 L 128 222 z"/>
-<path d="M 79 221 L 79 226 L 84 225 L 84 224 L 81 221 z"/>
-<path d="M 131 226 L 136 226 z"/>
-<path d="M 221 225 L 222 228 C 226.555 227.619 231.056 228.822 233 224 z"/>
-<path d="M 90 237 L 90 240 L 92 237 z"/>
-<path d="M 50 252 L 63 251 L 61 257 L 62 257 L 74.9954 257.566 L 86 250 C 79.5567 246.574 74.575 249.916 68.0147 249.777 C 60.7131 249.623 55.6478 243.189 50 252 z"/>
-<path d="M 27 255 C 32.2366 254.013 37.9571 253.876 41 249 z"/>
-<path d="M 234 251 L 234 252 L 240 253 L 240 251 z"/>
-<path d="M 0 254 L 0 257 C 4.82394 256.659 12.1587 258.379 15 254 z"/>
-<path d="M 46 257 C 49.7913 260.93 54.2643 259.253 57 255 z"/>
-<path d="M 18 258 L 18 259 L 20 259 L 20 260 L 14 260 L 14 262 L 25 259 L 25 260 L 22 261 L 22 262 L 28 261 L 25 266 L 37 263 L 37 257 L 26 260 L 28 257 z"/>
-<path d="M 120 260 L 119 265 L 125 269 L 143 273 C 140.636 265.908 126.44 262.909 120 260 z"/>
-<path d="M 65 264 C 68.1466 268.71 78.214 264.993 81 261 z"/>
-<path d="M 206 264 L 206 265 L 211 265 z"/>
-<path d="M 69 276 C 75.636 274.905 83.6097 278.24 86 270 L 82 267 C 75.6702 269.007 69.2644 268.05 69 276 z"/>
-<path d="M 236 267 L 236 268 L 240 269 L 240 268 z"/>
-<path d="M 27 278 L 26 278 L 25 278 L 21 280 L 21 283 L 55 285 L 55 284 L 41 277 z"/>
-<path d="M 138 293 L 141 292 L 144 295 L 143 283 C 138.468 284.499 138.345 288.666 138 293 z"/>
-<path d="M 12 287 L 12 288 L 19 286 L 12 287 M 60 288 L 65 291 L 65 292 L 61 292 L 61 293 L 65 299 C 71.158 296.612 74.4028 292.583 75 286 z"/>
-<path d="M 197 287 L 197 288 L 203 289 z"/>
-<path d="M 207 291 L 207 292 L 209 294 L 192 292 L 192 297 L 195 296 L 196 303 C 200.734 301.249 210.383 298.401 214 303 L 215 303 L 215 300 C 220.319 300 228.881 302.474 228 306 L 240 307 L 240 297 C 233.133 296.458 223.574 295.646 220 289 z"/>
-<path d="M 111 296 C 111.102 305.074 115.632 307.272 124 308 L 123 313 L 139 303 L 143 305 L 143 298 L 137 298 L 135 305 z"/>
-<path d="M 32 300 L 32 301 L 44 299 z"/>
-<path d="M 89 302 L 93 306 z"/>
-<path d="M 70 304 L 70 307 L 73 306 L 73 305 z"/>
-<path d="M 37 308 L 37 309 L 45 309 z"/>
-<path d="M 139 309 L 142 315 C 143.241 311.736 142.231 310.07 139 309 z"/>
-<path d="M 43 312 L 43 315 L 46 315 L 46 312 z"/>
-<path d="M 31 319 L 31 320 L 42 316 L 31 319 M 100 315 L 97 319 z"/>
-</g>
-<g stroke="none" fill="#963b65">
-<path d="M 7 0 L 7 1 L 16 1 z"/>
-<path d="M 85 6 L 87 5 L 87 6 L 86 13 L 92 11 L 91 6 L 96 6 L 95 0 C 89.8209 0.0582275 86.8146 0.832916 85 6 z"/>
-<path d="M 201 2 L 208 1 z"/>
-<path d="M 158 11 L 157 14 L 159 17 L 160 17 z"/>
-<path d="M 86 21 L 86 28 L 90 27 L 88 21 z"/>
-<path d="M 80 30 L 83 28 z"/>
-<path d="M 64 36 L 69 41 L 69 40 L 66 39 L 69 34 z"/>
-<path d="M 216 37 L 216 47 L 217 47 z"/>
-<path d="M 21 52 L 19 64 L 12 65 L 12 66 L 19 65 L 23 68 L 21 66 C 23.0451 61.5014 25.0819 60.1611 30 60 L 30 59 L 22 58 z"/>
-<path d="M 8 68 L 8 69 L 10 71 L 14 68 z"/>
-<path d="M 10 73 L 11 76 L 5 76 L 5 85 L 13 85 L 13 84 L 9 83 L 10 81 L 6 78 L 20 77 L 20 76 L 16 76 L 16 75 L 18 74 L 18 69 z"/>
-<path d="M 0 79 L 0 87 L 3 87 L 3 79 z"/>
-<path d="M 153 82 L 153 87 L 154 87 z"/>
-<path d="M 235 88 L 240 86 L 240 82 C 236.266 83.007 234.387 83.9566 235 88 M 26 83 L 25 87 L 31 87 z"/>
-<path d="M 130 96 L 129 104 L 135 103 L 135 102 L 131 102 L 134 97 z"/>
-<path d="M 84 97 L 83 105 L 84 105 z"/>
-<path d="M 34 100 L 35 103 L 23 107 L 23 109 C 27.3457 110.273 31.2116 110.387 31 105 L 36 105 z"/>
-<path d="M 156 114 L 158 118 L 155 118 L 155 146 L 154 146 L 155 141 C 150.361 141.994 152.022 147.362 153 151 L 154 151 L 155 147 L 163 143 L 164 134 L 155 129 L 163 117 z"/>
-<path d="M 0 115 L 0 116 L 20 118 L 22 116 z"/>
-<path d="M 146 124 L 146 125 L 150 125 z"/>
-<path d="M 94 129 L 94 130 L 118 130 C 110.637 126.824 101.718 128.025 94 129 z"/>
-<path d="M 148 141 L 144 144 L 144 145 L 149 145 z"/>
-<path d="M 216 141 L 225 148 L 224 141 L 223 141 L 223 144 L 222 144 L 222 141 z"/>
-<path d="M 237 144 C 237 147.304 239.788 152.511 236 153 L 236 154 L 240 156 L 240 144 z"/>
-<path d="M 142 145 L 145 147 L 145 146 z"/>
-<path d="M 50 149 L 50 150 L 53 150 L 53 151 L 35 152 L 35 153 L 61 152 z"/>
-<path d="M 176 152 L 176 154 L 178 154 L 178 152 z"/>
-<path d="M 16 154 L 16 155 L 23 155 z"/>
-<path d="M 52 158 L 52 159 L 58 159 z"/>
-<path d="M 232 161 L 232 162 C 235.467 162.655 239.088 164.255 240 160 z"/>
-<path d="M 11 162 C 12.6539 166.983 17.4755 165.999 22 166 L 22 165 C 18.8869 165 14.5498 165.753 14 162 z"/>
-<path d="M 38 167 L 38 168 L 48 169 L 48 168 C 46.0399 167.347 45.446 167 48 167 z"/>
-<path d="M 239 173 L 236 174 L 238 179 L 238 189 L 235 194 L 240 192 C 240 186.734 241.834 179.182 237 176 z"/>
-<path d="M 77 174 L 80 176 z"/>
-<path d="M 57 178 L 57 179 L 74 179 L 80 180 L 79 177 z"/>
-<path d="M 39 180 L 39 181 L 50 182 z"/>
-<path d="M 54 181 L 54 182 L 65 182 z"/>
-<path d="M 74 184 L 72 187 L 75 189 z"/>
-<path d="M 217 191 L 217 193 L 222 192 z"/>
-<path d="M 77 193 L 81 195 L 81 194 z"/>
-<path d="M 80 201 L 83 201 L 82 199 z"/>
-<path d="M 225 201 C 225.876 205.09 231.287 204.813 235 205 L 235 202 L 225 201 M 239 201 L 237 207 L 240 207 z"/>
-<path d="M 4 204 L 6 208 L 11 204 z"/>
-<path d="M 178 206 L 171 209 L 171 210 L 179 211 L 186 209 z"/>
-<path d="M 189 209 L 189 210 L 194 210 z"/>
-<path d="M 200 218 L 200 219 L 204 220 z"/>
-<path d="M 62.6667 222.333 L 63.3333 222.667 L 62.6667 222.333 z"/>
-<path d="M 0 227 L 5 231 L 5 230 L 0 227 M 33 228 L 33 229 L 59 229 C 52.213 226.152 40.1884 226.665 33 228 z"/>
-<path d="M 236 234 L 240 238 z"/>
-<path d="M 235 239 L 235 245 L 240 246 L 240 239 z"/>
-<path d="M 203 243 L 203 244 L 205 245 L 193 245 L 193 246 C 202.172 246.19 219.008 246.235 224 255 L 220 255 L 220 256 L 229 258 L 229 257 L 226 254 C 233.455 252.403 225.856 246.794 222 246 L 221 249 L 219 244 z"/>
-<path d="M 35 246 L 35 248 L 41 248 L 41 246 z"/>
-<path d="M 13 262 L 14 262 L 16 260 C 13.8603 258.882 13.4732 259.749 13 262 z"/>
-<path d="M 23 267 L 23 268 L 32 269 L 58 266 L 56 270 L 81 268 L 81 265 L 68.0394 266.053 L 58.9853 262.978 L 47 265.945 z"/>
-<path d="M 186 284 C 188.285 287.679 192.911 290.032 197 288 z"/>
-<path d="M 199 309 C 201.542 315.479 211.796 316.199 218 317 C 215.785 309.518 205.685 309.884 199 309 z"/>
-</g>
-<g stroke="none" fill="#ad6d9f">
-<path d="M 16 0 L 16 1 L 21 1 z"/>
-<path d="M 47 13 L 44 12 L 29 13 L 30 18 L 23 17 L 23 24 L 20 22 L 19 22 C 19.841 25.9247 22.7078 24.8853 26 24 L 26 26 L 36 26 L 36 29 L 40 27 L 43 28 L 44 25 L 49 26 L 47 22 L 47 21 L 51 19 L 51 23 L 52 23 L 52 20 L 57 20 C 56.9811 14.6782 52.7016 6.69522 47 13 z"/>
-<path d="M 0 19 C 1.06531 25.1114 6.13065 23.1191 7 18 z"/>
-<path d="M 4 44 C 18.1649 46.3615 6.06908 28.0201 4.28704 39.034 C 4.02714 40.6403 4.08277 42.3781 4 44 z"/>
-<path d="M 30 40 L 29 48 L 40 51 L 40 50 L 38 50 C 40.642 49.1279 52.3646 44.4763 45.5617 40.5633 C 41.1167 38.0065 34.7913 39.9011 30 40 z"/>
-<path d="M 0 52 C 0 62.1505 0.938807 68.5651 13 65 L 12 61 L 6 64 C 6.14385 59.1958 7.08952 56.284 12 55 L 12 54 z"/>
-<path d="M 36 61 L 34 67 L 38 67 L 38 64 L 46 64 L 44 62 C 54.4828 55.0652 29.7597 56.7195 36 61 z"/>
-<path d="M 94 121 L 94 122 L 102 121 z"/>
-<path d="M 128 121 L 131 123 L 131 124 L 118 123 L 116 128 C 119.999 129.966 125.991 129.501 129 126 L 130 126 L 131 129 L 131 130 L 136 130 L 136 134 L 132 134 L 132 135 L 146 133 L 143 129 L 143 128 L 149 120 z"/>
-<path d="M 109 125 L 109 126 C 111.633 127.34 112.398 127.556 114 125 z"/>
-<path d="M 155 127 L 163 130 L 163 129 L 161 128 L 163 126 z"/>
-<path d="M 182 128 L 182 129 L 192 129 z"/>
-<path d="M 70 132 L 70 133 C 76.1915 134.83 84.1504 134.815 90 132 L 70 132 M 113 134 L 111 132 L 113 137 L 101 139 L 101 140 L 104 142 L 95 142 L 95 138 L 94 138 L 94 142 L 87 144 L 93 137 L 93 136 L 85 136 L 87 141 L 82 141 L 82 142 L 86 142 L 84 144 L 84 145 L 87 145 L 87 146 L 85 148 C 94.1862 146.101 99.361 143.249 107 151 L 108 146 L 116 146 L 113 152 L 120 157 C 116.806 157.013 114.729 156.597 114 160 L 110 162 L 126 159 L 126 158 L 121 152 C 125.937 151.398 131.815 147.327 136 151 L 139 150 C 141.659 152.996 145.639 151.259 149 150 L 149 146 L 149 145 L 144 145 L 145 147 L 139 147 L 139 148 L 134 148 L 134 147 L 136 147 L 136 146 C 132.367 144.9 131.96 143.343 135 141 L 133 145 L 139 144 L 139 143 L 136 143 L 136 142 C 139.816 141.048 144.547 138.36 140 135 L 142 138 L 128 136 L 129 138 L 122 137 L 127 140 L 123 141 L 122 141 L 125 144 L 125 145 L 117 145 L 119 142 L 115 141 L 115 140 L 122 135 L 122 132 z"/>
-<path d="M 150 132 L 152 137 C 148.55 136.06 146.159 135.946 144 139 L 150 142 L 151 139 L 154 141 C 154.419 136.925 154.195 133.47 150 132 z"/>
-<path d="M 10 147 L 12 153 L 10 157 L 20 156 L 20 155 C 14.6804 153.914 12.9057 151.306 14 146 z"/>
-<path d="M 30 149 C 32.2029 155.829 37.1056 155.189 43 154 L 43 153 L 35 153 L 35 152 L 43 151 z"/>
-<path d="M 138 157 L 138 158 L 141 159 L 136 160 L 136 161 L 141 163 L 138 164 L 138 165 L 144 166 L 144 167 L 140 166 L 143 172 C 146.129 170.169 146.661 168.527 146 165 C 148.475 164.487 148.575 164.396 148 162 L 151 161 L 152 157 z"/>
-<path d="M 51 157 L 51 160 L 78 164 L 78 163 L 73 163 L 73 162 L 81 160 L 81 159 L 52 159 L 52 158 L 62 157 z"/>
-<path d="M 117 160 L 117 162 L 119 162 L 119 160 z"/>
-<path d="M 191 165 L 191 166 L 202 170 L 202 166 L 218 170 L 218 169 L 213 165 z"/>
-<path d="M 234 166 L 240 173 L 240 167 z"/>
-<path d="M 79 167 L 79 169 L 84 169 z"/>
-<path d="M 10 170 L 16 169 z"/>
-<path d="M 45 175 L 67 171 L 65 170 L 65 169 L 68 169 C 62.4991 166.858 48.6655 170.599 45 175 z"/>
-<path d="M 185 169 L 185 170 L 192 173 C 190.563 169.424 188.714 169.123 185 169 z"/>
-<path d="M 189 174 L 188 176 L 188 177 L 196 174 z"/>
-<path d="M 28 177 L 28 178 L 35 180 L 38 178 z"/>
-<path d="M 47 182 L 47 183 L 57 183 z"/>
-<path d="M 198 182 L 202 186 z"/>
-<path d="M 202 182 L 202 183 L 212 185 L 212 186 L 206 187 L 206 188 C 211.258 188 219.643 189.751 223 185 z"/>
-<path d="M 81 187 L 81 188 L 86 188 z"/>
-<path d="M 33 189 L 46 194 z"/>
-<path d="M 204 189 L 204 190 L 207 190 z"/>
-<path d="M 73 195 L 78 196 L 77 192 z"/>
-<path d="M 138 192 L 138 194 L 142 194 L 142 192 z"/>
-<path d="M 58 196 L 58 197 L 74 197 z"/>
-<path d="M 11 200 L 11 201 L 17 202 L 17 203 L 14 206 L 26 201 z"/>
-<path d="M 65 200 L 66 203 L 70 200 z"/>
-<path d="M 79 201 L 79 202 L 83 202 z"/>
-<path d="M 198 213 L 198 214 L 206 214 L 206 213 C 204.04 212.347 203.446 212 206 212 z"/>
-<path d="M 40 229 L 40 230 L 50 230 z"/>
-<path d="M 52 236 L 52 237 L 60 237 z"/>
-<path d="M 152 239 L 155 241 z"/>
-<path d="M 188 245 C 191.386 249.186 217.016 253.31 220 249 z"/>
-<path d="M 183.667 251.333 L 184.333 251.667 L 183.667 251.333 z"/>
-<path d="M 154 253 C 156.422 256.966 159.423 258.503 164 259 L 164 260 L 162 260 L 162 261 L 177 261 L 178 257 L 172 257 C 167.886 251.726 159.997 251.573 154 253 z"/>
-<path d="M 221 256 L 231 260 L 231 259 z"/>
-<path d="M 8 261 L 8 262 L 12 261 z"/>
-<path d="M 41 269 L 48 268 z"/>
-<path d="M 153 311 L 158 315 z"/>
-</g>
-<g stroke="none" fill="#92253c">
-<path d="M 19 1 L 19 2 L 27 3 L 27 4 L 14 6 L 12 13 L 16 8 L 36 6 L 35 3 L 47 3 C 43.1478 -2.94196 25.2856 -0.49649 19 1 z"/>
-<path d="M 67 1 L 77 4 L 77 5 L 75 7 L 78 6 C 78.3084 10.0887 79.3002 12.1349 83 14 L 81 16 L 82 18 L 84 18 L 82 7 L 87 5 L 85 6 L 85 5 L 88 0 z"/>
-<path d="M 216 3 L 216 4 L 227 3 z"/>
-<path d="M 52 5 L 52 7 L 45 7 C 48.137 12.7446 54.587 12.7714 56 6 z"/>
-<path d="M 25 10 L 25 12 L 38 13 z"/>
-<path d="M 54 22 L 54 23 L 56 24 L 56 25 L 50 33 L 50 34 L 53 34 L 52 36 L 61 39 L 58 36 L 58 35 L 63 35 L 63 33 L 54 35 L 55 26 L 57 31 L 58 31 L 58 23 z"/>
-<path d="M 44 25 L 40 27 L 36 30 L 36 31 C 39.3627 31 42.2038 31.7159 43 28 L 46 29 L 44 32 C 49.7071 31.0468 49.1213 26.5554 44 25 z"/>
-<path d="M 13 29 L 13 33 L 22 32 z"/>
-<path d="M 211 36 L 214 36 L 213 34 z"/>
-<path d="M 29 39 L 28 46 L 30 46 z"/>
-<path d="M 47 40 C 47.2396 45.9203 43.6493 48.5862 38 49 L 38 50 C 39.9601 50.6534 40.554 51 38 51 L 38 52 L 44 50 L 40 54 L 40 55 L 48 56 L 47 51 L 54 41 z"/>
-<path d="M 211 41 L 211 42 L 215 42 z"/>
-<path d="M 76 46 L 74 50 L 74 51 L 80 56 L 82 46 z"/>
-<path d="M 69 48 L 72 58 C 71.9969 54.0129 72.5976 50.3323 69 48 z"/>
-<path d="M 195 49 L 195 50 L 204 49 L 195 49 M 2 49 L 7 51 z"/>
-<path d="M 210 50 L 210 51 L 215 51 z"/>
-<path d="M 24 53 L 25 57 L 31 56 L 31 54 z"/>
-<path d="M 67 61 L 70 66 L 72 64 L 73 64 L 77 69 C 78.1508 63.9114 71.006 61.6358 67 61 z"/>
-<path d="M 55 67 L 53 73 L 51 72 L 45 75 L 44 80 L 48 80 L 48 79 L 46 78 L 56 76 L 56 75 L 54 74 L 54 73 C 56.4152 71.1808 56.3966 69.6278 55 67 M 71 67 L 69 69 L 70 73 L 75 68 z"/>
-<path d="M 38 80 L 38 81 L 39 88 L 42 80 z"/>
-<path d="M 56 90 L 62 90 L 62 89 L 57 87 z"/>
-<path d="M 148 91 L 151 90 z"/>
-<path d="M 172 92 C 172.137 103.48 181.94 98.9252 190 97 L 190 96 L 179 94 L 182 90 z"/>
-<path d="M 158 92 C 158.51 102.242 158.165 106.401 170 106 C 170.341 96.8972 169.676 89.5064 158 92 z"/>
-<path d="M 95 94 L 95 95 L 104 96 z"/>
-<path d="M 22 96 L 21 100 L 30 100 L 18 104 L 18 110 L 24 110 L 23 107 L 35 103 C 33.1377 98.4034 29.8258 94.4101 25 98 L 24 98 z"/>
-<path d="M 209 104 L 209 105 L 222.054 98.3179 L 240 99 L 240 97 L 218.144 97.588 z"/>
-<path d="M 119 105 L 119 106 L 125 106 z"/>
-<path d="M 38 113 L 45 113 C 42.3158 110.68 40.2909 110.023 38 113 z"/>
-<path d="M 113 111 L 114 115 L 110 115 L 110 116 L 119 117 L 119 116 L 115 116 L 115 115 L 123 115 z"/>
-<path d="M 178 113 L 178 114 L 184 120 L 184 121 L 180 121 L 180 123 C 185.42 123.525 190.155 125.363 195 122 L 196 122 L 199 124 L 199 129 L 190 130 L 190 131 L 204 130 L 208 115 L 206 118 L 205 118 C 203.44 113.3 199.346 114.003 195 114 L 195 115 L 202 116 L 202 117 L 197 119 C 193.131 116.395 189.843 117.903 186 120 L 188 115 z"/>
-<path d="M 75 135 L 76 140 L 76 141 L 76 142 L 74 144 L 83 144 L 83 145 L 79 145 C 81.3974 148.326 83.5824 147.77 87 146 L 87 145 L 84 145 L 84 144 L 86 142 L 82 142 L 86 138 z"/>
-<path d="M 184 140 L 187 138 z"/>
-<path d="M 155 141 L 154 144 z"/>
-<path d="M 38 155 L 38 156 L 43 157 z"/>
-<path d="M 167 159 L 167 160 L 170 160 z"/>
-<path d="M 211 160 L 211 161 L 215 161 z"/>
-<path d="M 9 162 L 9 170 L 10 170 L 22 167 L 22 166 z"/>
-<path d="M 34 166 L 31 169 L 31 170 L 36 170 L 36 171 L 24 172 L 24 177 L 41 176 L 41 175 L 36 175 L 36 171 L 46 172 L 46 170 L 41 171 L 36 166 z"/>
-<path d="M 50 167 L 57 169 L 57 168 z"/>
-<path d="M 171 168 L 171 169 L 190 172 L 171 168 M 230 167 L 233 173 L 233 193 L 238 189 L 238 179 L 238 172 z"/>
-<path d="M 150 173 L 150 177 L 151 177 z"/>
-<path d="M 11 176 L 7 178 L 7 179 C 9.52819 179.24 12.117 179.024 11 176 z"/>
-<path d="M 144 178 L 148 180 L 149 178 z"/>
-<path d="M 193 181 L 176 180 L 176 181 C 180.398 181.013 184.692 182.431 189 182.352 C 195.184 182.238 202.957 176.104 207 183 L 213 184 L 221 183 L 221 182 L 210 181 L 212 178 C 207.496 178.315 193.68 175.586 193 181 z"/>
-<path d="M 166 182 L 166 183 L 179 184 L 179 185 L 161 184 L 161 185 L 191 185 z"/>
-<path d="M 142 192 L 148 186 z"/>
-<path d="M 189 188 L 192 190 z"/>
-<path d="M 181 191 L 188 194 z"/>
-<path d="M 65 195 L 65 196 L 76 196 C 72.1839 192.965 69.4597 194.097 65 195 z"/>
-<path d="M 60 198 L 60 199 L 78 200 z"/>
-<path d="M 194 199 L 194 200 L 203 203 L 204 199 z"/>
-<path d="M 21 201 L 21 202 L 26 202 z"/>
-<path d="M 67 202 L 67 203 L 78 209 L 75 202 z"/>
-<path d="M 190 202 L 190 203 L 220 206 L 220 204 z"/>
-<path d="M 60.6667 206.333 L 61.3333 206.667 L 60.6667 206.333 z"/>
-<path d="M 181 212 L 179 219 L 176 216 L 173 219 L 169 221 L 176 221 L 176 222 L 172 222 L 172 223 L 184 221 L 190 224 L 195 228 L 192 230 L 194 234 L 189 235 L 189 236 L 210 242 L 204 235 L 212 233 L 209 234 L 198 228 L 198 227 L 209 225 L 205 220 L 212 221 L 206 219 L 201 214 L 181 212 M 222 213 L 224 224 L 232 225 L 233 224 L 233 222 L 229 218 L 233 214 z"/>
-<path d="M 37 217 L 37 218 L 40 218 L 40 219 L 38 220 L 45 222 C 46.0934 216.145 41.5563 216.477 37 217 z"/>
-<path d="M 214 218 L 213 222 L 216 225 L 217 225 L 223 221 L 222 217 z"/>
-<path d="M 11 220 L 11 221 L 23 223 z"/>
-<path d="M 59.6667 221.333 L 60.3333 221.667 L 59.6667 221.333 z"/>
-<path d="M 223 235 L 222 241 L 229 241 z"/>
-<path d="M 154 238 L 155 241 L 151 244 C 155.776 244.502 172.876 248.593 174 253 L 192 254 L 192 253 L 187 252 C 193.189 246.202 204.601 251.474 212 253 C 207.8 248.588 186.332 243.043 184 250 L 177 249 C 174.196 239.242 162.028 240.798 154 238 z"/>
-<path d="M 53 251 L 53 252 L 58 252 L 58 250 z"/>
-<path d="M 16 254 L 16 255 L 20 254 L 20 258 C 23.6628 258 33.0666 254.734 32 259 L 36 257 z"/>
-<path d="M 62 255 L 63 262 L 68 260 z"/>
-<path d="M 20 280 L 20 284 L 41 285 L 41 283 C 34.3311 283 25.1532 284.919 20 280 z"/>
-<path d="M 199 308 L 199 309 L 214.972 312.472 L 222 320 L 222 316 C 213.46 308.125 210.758 308.209 199 308 z"/>
-</g>
-<g stroke="none" fill="#9a1b26">
-<path d="M 46 0 L 47 3 L 39 3 L 41 5 L 41 6 L 37 7 L 37 8 L 46 10 L 45 7 L 51 7 L 48 5 L 50 0 z"/>
-<path d="M 208 0 L 208 7 L 209 7 L 214 2 L 214 0 z"/>
-<path d="M 176 5 L 176 6 L 189 3 z"/>
-<path d="M 0 3 L 0 7 L 10 8 L 10 6 z"/>
-<path d="M 230.667 7.33334 L 231.333 7.66666 L 230.667 7.33334 z"/>
-<path d="M 59 13 L 63 16 z"/>
-<path d="M 66 25 L 66 21 L 60 21 L 60 20 L 64 19 C 56.9565 16.3241 58.422 24.4896 66 25 z"/>
-<path d="M 196 26 L 196 27 L 211 29 L 211 24 L 210 24 L 207 26 C 204.02 21.4951 200.23 24.4003 196 26 z"/>
-<path d="M 225 26 L 225 27 L 234 26 z"/>
-<path d="M 198 28 L 198 29 L 202 29 L 198 28 M 3 31 L 3 32 L 11 32 C 8.58355 28.6473 6.53197 29.7487 3 31 z"/>
-<path d="M 166 33 L 167 36 z"/>
-<path d="M 232 33 L 232 34 L 239 34 z"/>
-<path d="M 219 34 L 217 35 L 217 36 z"/>
-<path d="M 168.333 38.6667 L 168.667 39.3333 L 168.333 38.6667 z"/>
-<path d="M 167 41 L 167 45 L 173 44 L 173 43 z"/>
-<path d="M 208 45 L 208 46 L 216 45 z"/>
-<path d="M 50 44 C 49.1387 50.4281 46.7394 57.2785 55 59 L 50 54 L 57 55 z"/>
-<path d="M 183 47 L 183 48 L 189 48 z"/>
-<path d="M 159 49 L 154 84 L 156 86 L 166 86 L 164 82 L 171 81 L 169 84 L 170 88 L 175 88 L 175 89 L 172 91 L 195 88 L 195 86 L 191 83 L 198 83 L 203 77 L 189 78 L 194 76 L 194 75 L 188 73 L 196 68 C 192.318 68.5105 182.708 70.8321 182 66 L 173.92 63.3071 L 163 65 L 160 67 L 160 61 L 161 61 L 161 64 L 174 61 L 170 56 L 172 58 L 172 59 L 164 57 L 166 58 L 166 57 L 162 55 L 164 51 z"/>
-<path d="M 176 50 L 176 51 L 183 51 z"/>
-<path d="M 222 59 L 222 62 L 240 63 L 240 61 z"/>
-<path d="M 110 62 L 110 63 L 114 63 z"/>
-<path d="M 207 65 L 214 66 C 212.591 61.7697 209.885 62.0874 207 65 z"/>
-<path d="M 195 66 L 195 67 L 204 67 z"/>
-<path d="M 36 71 L 25 83 L 24 83 L 21 79 L 21 80 C 22.781 83.0548 20.6149 84.1909 18 86 L 18 87 C 21.9346 86.9534 24.6571 87.046 26 83 L 31 84 L 37 79 L 37 83 L 33 88 C 37.0517 87.8652 42.596 85.0787 38 81 L 38 80 L 40 77 L 36 78 L 45 71 z"/>
-<path d="M 227 80 L 227 81 L 232 81 L 232 82 L 215 85 L 215 89 L 220 87 L 221 90 L 210 91 L 210 94 L 221 92 L 221 93 L 216 94 L 216 95 L 220 95 L 220 96 L 218 96 L 218 97 L 237 90 L 232 89 L 240 78 z"/>
-<path d="M 43 82 L 42 91 C 44.6406 88.6925 44.2959 85.0891 43 82 z"/>
-<path d="M 239 87 L 238 89 L 240 89 z"/>
-<path d="M 40 90 L 37 96 L 31 95 L 38 111 L 33 113 L 33 114 L 43 114 L 43 113 L 38 113 L 39 110 L 46 112 L 47 108 L 39 108 L 39 106 L 43 106 L 43 105 L 40 95 L 45 95 L 45 94 L 41 93 z"/>
-<path d="M 92 97 L 92 98 L 102 98 z"/>
-<path d="M 170 97 L 170 106 L 164 106 L 166 112 L 174 111 L 174 114 L 178 116 L 177 108 L 171 104 L 175 104 L 175 103 L 172 103 z"/>
-<path d="M 59 105 L 59 106 L 65 106 L 65 103 z"/>
-<path d="M 99 107 L 99 108 L 109 108 z"/>
-<path d="M 92 109 L 92 110 L 99 113 L 95 113 L 95 114 C 99.3221 114.329 101.079 113.301 102 109 z"/>
-<path d="M 218 115 L 219 134 L 225 135 L 225 134 L 220 133 L 220 129 L 234 133 L 232 129 L 240 130 L 240 116 L 231 118 C 228.121 113.925 222.545 115 218 115 z"/>
-<path d="M 167 117 L 167 125 L 164 124 L 161 128 L 161 129 L 168 132 L 167 129 L 171 133 L 184 133 L 184 132 L 177 132 L 177 131 L 192 130 L 192 129 L 182 129 L 183 127 L 171 127 L 172 117 z"/>
-<path d="M 235 144 L 238 150 L 237 144 z"/>
-<path d="M 172 150 L 161 153 L 161 157 L 162 158 L 177 158 L 177 157 L 177 150 z"/>
-<path d="M 180 152 C 181.685 155.543 183.07 156.688 187 157 L 187 153 z"/>
-<path d="M 156 164 L 156 165 L 160 166 z"/>
-<path d="M 157 169 L 165 169 z"/>
-<path d="M 204 186 L 200 188 L 200 189 C 202.297 189.246 207.779 188.75 204 186 z"/>
-<path d="M 190 192 L 190 193 C 193.77 193.285 196.572 194.271 199 191 z"/>
-<path d="M 152 192 L 152 209 C 155.475 209.81 155.737 212.717 156 216 L 153 212 L 152 212 C 152.016 216.487 151.944 219.512 156 222 L 156 218 L 162 220 L 156 223 L 156 224 L 162 226 L 165 220 L 164 217 L 176 216 L 179 219 L 181 212 C 178.482 211.831 161.995 210.562 168 207 L 168 206 L 164 203 L 167 203 L 165 201 L 165 200 L 168 198 L 155 198 z"/>
-<path d="M 56 257 L 56 262 L 61 257 z"/>
-<path d="M 182 296 L 191 301 z"/>
-</g>
-<g stroke="none" fill="#711a2a">
-<path d="M 50 0 L 48 5 L 51 7 L 52 7 L 57 6 C 56.9865 2.80585 57.4028 0.729187 54 0 L 54 3 z"/>
-<path d="M 169 0 L 167 2 C 167.421 7.27463 170.102 7.8812 175 8 L 173 6 L 175 0 z"/>
-<path d="M 0 1 L 10 6 L 10 9 L 14 9 L 14 6 L 27 4 L 27 3 L 21 2 L 21 3 L 23 4 z"/>
-<path d="M 188 14 L 195 17 z"/>
-<path d="M 162 15 L 161 22 L 162 22 z"/>
-<path d="M 0 17 L 0 19 L 3 19 L 3 17 z"/>
-<path d="M 190 21 L 190 22 L 194 22 z"/>
-<path d="M 15 22 C 17.2144 29.2144 23.3629 28.9817 30 29 L 30 27 z"/>
-<path d="M 32 29 L 32 30 L 36 30 z"/>
-<path d="M 72 43 L 71 47 L 74 50 L 74 43 z"/>
-<path d="M 20 51 L 20 52 L 23 52 L 22 58 L 25 57 L 24 53 L 34 52 z"/>
-<path d="M 31 54 L 27 56 L 27 57 C 31.7592 57.9634 35.8742 59.7069 39 55 z"/>
-<path d="M 217 55 L 216 64 L 217 64 L 220 57 L 217 55 M 52 56 L 52 57 L 55 57 L 55 61 L 62 59 L 56 60 L 56 56 L 52 56 M 166 56 L 166 58 L 170 58 L 170 56 z"/>
-<path d="M 215 66 L 215 67 L 240 68 L 240 65 z"/>
-<path d="M 188 73 L 203 77 L 201 79 L 201 80 L 210 77 L 208 75 L 202 76 L 212 73 L 212 72 L 197 74 L 202 70 C 197.546 68.6299 191.254 69.6776 188 73 z"/>
-<path d="M 0 76 L 4 76 L 4 78 L 0 78 L 0 79 L 3 79 L 3 87 L 5 87 L 5 76 L 11 76 C 7.74648 72.6782 2.92158 71.8649 0 76 z"/>
-<path d="M 198 82 L 198 84 L 206 84 L 206 82 z"/>
-<path d="M 51 91 L 50 95 L 55 95 L 52 94 L 53 91 z"/>
-<path d="M 22 95 L 24 98 L 25 98 L 27 95 z"/>
-<path d="M 212 97 L 212 103 L 209 99 L 208 99 L 207 106 C 210.767 106 216.054 107.413 217 103 L 209 105 L 209 104 C 213.832 103.444 215.029 101.216 217 97 z"/>
-<path d="M 184 98 L 184 100 L 195 100 z"/>
-<path d="M 154 99 L 156 109 L 158 104 L 155 105 L 156 99 z"/>
-<path d="M 49 100 L 48 107 C 50.5803 104.969 50.5095 102.816 49 100 z"/>
-<path d="M 143 100 L 128 104 L 131 107 L 130 110 C 135.235 110.971 138.528 111.111 143 108 L 131 107 L 131 106 L 148 103 z"/>
-<path d="M 106 101 L 110 103 L 110 102 z"/>
-<path d="M 31 105 L 31 106 L 36 106 z"/>
-<path d="M 146 107 L 146 108 L 150 108 z"/>
-<path d="M 107 111 L 110 109 z"/>
-<path d="M 91 113 L 94 111 z"/>
-<path d="M 206 115 L 211 111 z"/>
-<path d="M 103 114 L 106 112 z"/>
-<path d="M 106 114 L 106 115 L 112 114 L 106 114 M 141 113 L 141 114 L 156 115 z"/>
-<path d="M 133 118 L 133 119 L 139 120 L 133 118 M 140 119 L 140 120 L 154 121 L 154 119 z"/>
-<path d="M 232 129 L 232 130 L 236 130 z"/>
-<path d="M 75 143 L 75 144 L 83 145 L 83 144 z"/>
-<path d="M 26 147 C 26.4043 152.248 28.8553 154.31 34 155 L 30 149 L 44 149 L 44 147 z"/>
-<path d="M 45 156 L 45 157 L 50 157 z"/>
-<path d="M 6 159 L 6 160 L 9 160 z"/>
-<path d="M 232 162 L 232 163 L 236 167 L 240 167 L 240 164 L 240 163 z"/>
-<path d="M 5 166 L 0 168 L 10 175 L 9 171 L 20 176 L 11 174 L 11 175 L 21 177 L 23 182 L 15 185 L 15 187 L 41.9105 191.274 L 55 196 L 53 191 L 68 191 L 70 184 L 37 183 L 39 186 L 19 173 L 20 170 L 9 170 z"/>
-<path d="M 192 169 L 192 173 L 208 173 L 208 172 L 195 171 L 195 170 L 201 170 z"/>
-<path d="M 36 171 L 36 175 L 41 175 L 41 176 L 36 176 L 36 177 L 57 179 C 54.3407 174.448 49.8013 175.003 45 175 L 48 171 z"/>
-<path d="M 158 174 L 163 180 L 163 178 L 177 179 L 175 177 L 178 175 z"/>
-<path d="M 186 180 L 193 181 L 196 175 z"/>
-<path d="M 134 182 L 138 183 L 138 184 L 134 187 L 137 186 L 135 192 L 137 194 L 138 194 L 142 192 L 139 195 L 147 195 L 148 190 L 140 191 L 140 188 L 143 183 L 148 183 L 145 177 z"/>
-<path d="M 12 179 L 16 182 z"/>
-<path d="M 207 189 L 207 190 L 209 190 L 209 191 L 202 191 L 202 192 L 219 191 L 219 190 z"/>
-<path d="M 161 192 L 161 193 L 172 192 z"/>
-<path d="M 238 198 L 240 193 C 236.032 191.953 234.65 195.839 238 198 z"/>
-<path d="M 171 193 L 171 194 L 177 195 z"/>
-<path d="M 208 197 L 211 199 L 211 198 z"/>
-<path d="M 216 199 L 216 200 L 221 201 L 220 198 z"/>
-<path d="M 168.667 200.333 L 169.333 200.667 L 168.667 200.333 M 222 204 L 225 201 L 229 202 C 225.769 199.93 223.813 200.74 222 204 z"/>
-<path d="M 175 201 L 175 202 L 183 202 z"/>
-<path d="M 59 203 L 63 205 L 63 204 z"/>
-<path d="M 0 204 C 0 211.709 -3.1163 225.979 5 230 L 5 231 L 1 229 L 0 229 C 0.216715 237.235 16.7017 240.279 23 236.5 C 25.8522 234.789 23.5123 232.45 27 232 L 27 231 L 23 231 L 31 229 L 26 236 L 26 237 L 44 238 L 44 237 L 30 234 L 30 231 L 36 230 L 36 229 L 6 224 L 6 219 L 17 218 L 17 216 L 13 216 C 13.5147 208.895 6.66185 205.049 0 204 z"/>
-<path d="M 184 205 L 184 206 L 188 207 z"/>
-<path d="M 28 215 L 30 220 L 35 218 z"/>
-<path d="M 212 223 L 204 226 L 204 227 L 213 229 L 211 232 L 217 230 L 214 231 L 216 226 z"/>
-<path d="M 217 225 L 217 227 L 221 227 L 221 225 z"/>
-<path d="M 158 229 L 158 231 L 154 230 L 155 235 L 152 234 C 154.391 241.745 162.344 239.583 168.576 241.243 C 176.478 243.348 177.991 248.324 187 246 L 187 245 L 177 243 L 177 242 L 186 243 L 186 242 L 183 242 L 185 239 L 181 238 L 181 237 L 186 238 L 182 234 L 182 236 L 177 237 C 176.144 232.895 172.815 232.265 169 233 L 169 235 L 177 241 z"/>
-<path d="M 204 235 L 210 242 C 206.393 239.391 195.033 232.685 194 241 L 186 239 L 187 243 L 187 244 L 203 244 L 203 243 L 219 244 L 219 240 L 214 241 C 212.291 236.516 208.712 234.617 204 235 z"/>
-<path d="M 19 254 C 15.8003 258.935 9.02836 256.397 4 256 L 4 257 L 9 258 L 8 260 L 20 260 L 20 259 L 18 258 z"/>
-<path d="M 190 255 L 193 257 L 191 260 L 196 261 L 194 263 C 198.093 266.879 202.228 266.694 207 264 L 195 256 L 195 255 L 203 260 L 209 259 C 203.271 253.349 197.407 254.064 190 255 z"/>
-<path d="M 26 260 L 33 258 z"/>
-<path d="M 0 259 C 0.654412 262.054 2.00659 261.936 5 262 z"/>
-<path d="M 156 261 L 160 264 z"/>
-<path d="M 6 268 L 3 272 L 12 272 L 12 271 L 9 271 L 9 270 L 12 270 z"/>
-<path d="M 229 268 L 240 278 L 240 273 z"/>
-<path d="M 152 277 C 152.741 280.457 155.259 280.457 156 277 L 152 277 M 178 280 L 175 279 C 176.935 284.805 178.652 286.695 176 292 L 178 292 L 178 293 L 148 287 L 148 298 L 150 301 L 185 312 L 175 306 L 173 308 C 171.67 304.206 168.714 303.782 165 303 L 165 302 L 175 305 L 176 305 L 190 308 L 190 310 L 187 311 L 187 313 L 188 314 L 205 318 L 205 317 L 201 316 L 203 314 L 203 313 L 191 311 L 191 310 L 193 306 L 194 306 L 200 306 L 200 305 L 195 300 L 187 297 L 191 300 L 191 301 L 188 301 L 188 302 L 193 303 L 193 304 C 184.774 302.938 166.871 303.602 162 296 L 185 300 L 185 299 L 170 295 L 170 294 L 184 296 L 186 293 L 180 291 C 187.011 283.221 191.988 287.677 201 287 L 201 284 L 194 280 L 186 279 L 187 277 L 186 277 L 180 280 L 181 277 z"/>
-<path d="M 220 304 L 217 308 L 222 310 L 219 312 L 240 320 L 237 311 L 238 314 L 224 312 L 224 310 L 234 311 L 234 309 L 229 309 L 230 307 L 222 304 z"/>
-<path d="M 38 309 L 38 310 L 43 310 z"/>
-</g>
-<g stroke="none" fill="#30131e">
-<path d="M 51 0 L 55 2 z"/>
-<path d="M 74 4 L 74 12 L 75 12 L 77 5 z"/>
-<path d="M 84 7 L 86 18 L 90 12 L 86 13 z"/>
-<path d="M 58 10 L 57 20 L 53 20 L 53 22 L 58 23 C 59.3965 18.3966 62.5956 17.8704 67 17 L 66 14 L 70 13 C 67.7022 7.14426 63.073 8.43106 58 10 z"/>
-<path d="M 71 13 C 70.1439 16.2864 70.2996 19.2111 74 20 z"/>
-<path d="M 55 26 L 54 35 L 63 33 L 63 32 L 57 31 L 57 26 z"/>
-<path d="M 66 30 L 69 34 L 68 30 z"/>
-<path d="M 217 35 L 221 32 z"/>
-<path d="M 168 44 L 167 45 L 167 46 L 167 47 L 170 44 z"/>
-<path d="M 27 53 L 27 54 C 32.8714 54.2521 41.5192 57.2375 44 50 z"/>
-<path d="M 50 54 L 50 55 L 56 56 L 56 60 L 64 60 C 61.1806 55.124 55.2183 54.6739 50 54 z"/>
-<path d="M 204 67 L 196 70 L 202 69 L 202 70 L 197 74 L 212 72 L 212 73 C 207.94 73.0031 204.529 72.4932 202 76 L 208 75 L 210 79 L 211 79 L 210 74 L 213 69 L 208 66 L 212 66 L 212 65 L 207 65 L 209 62 z"/>
-<path d="M 0 65 C 1.06372 69.964 9.79457 68 14 68 L 8 70 L 9 74 C 13.3076 72.2493 17.5578 69.5564 19 65 z"/>
-<path d="M 56 71 L 54 75 z"/>
-<path d="M 235 75 L 223 76 L 223 74 L 220 75 L 223 79 L 240 78 L 240 73 z"/>
-<path d="M 0 76 L 0 78 L 4 78 L 4 76 z"/>
-<path d="M 189 78 L 195 77 L 189 78 M 24 77 L 24 83 L 25 83 L 34 78 z"/>
-<path d="M 31 87 L 23 90 L 31 88 L 31 93 C 27.6998 92.9705 23.2609 91.3059 20.1582 91.9784 C 16.0579 92.867 17.0446 99.796 12 97 L 7 99 L 10 103 L 0 103 L 0 104 L 17 108 L 30 100 L 21 100 L 22 95 L 37 96 L 36 93 L 40 88 L 33 88 L 37 81 C 32.6353 81.3401 31.3401 82.6353 31 87 z"/>
-<path d="M 179 81 L 180 84 L 173 85 L 173 86 L 192 82 L 179 81 M 207 81 C 202.423 85.3172 196.803 83.048 191 83 L 191 85 L 202 86 L 199 90 L 203 93 L 197 92 L 201 95 L 201 96 L 188 97 L 188 98 L 195 101 L 198 100 L 204 102 L 204 101 L 199 100 L 199 99 C 203.164 98.899 205.502 98.4605 208 95 L 209 98 L 220 96 L 220 95 L 216 95 L 216 94 L 221 93 L 221 92 L 208 93 L 209 90 L 205 90 L 205 89 L 211 88 L 213 91 L 212 83 L 211 83 L 208 85 L 209 81 z"/>
-<path d="M 155 83 C 153.98 85.8991 153.772 87.3084 157 88 z"/>
-<path d="M 69 84 L 74 89 z"/>
-<path d="M 232 89 L 237 90 L 235 92 L 240 93 L 240 86 z"/>
-<path d="M 169 88 L 171 90 L 171 91 L 168 92 L 171 98 L 172 98 L 172 92 L 182 90 L 181 92 L 182 92 L 189 89 L 189 88 L 172 91 L 175 89 z"/>
-<path d="M 57 89 L 54 92 L 54 93 z"/>
-<path d="M 155 96 L 155 99 L 156 99 z"/>
-<path d="M 219 98 L 219 99 L 232 99 z"/>
-<path d="M 158 104 L 156 109 L 155 106 L 154 106 L 153 114 L 160 116 L 166 108 L 158 104 M 180 109 L 180 110 L 199 105 C 192.324 102.205 186.127 106.701 180 109 z"/>
-<path d="M 36 105 L 31 106 L 31 110 L 37 110 z"/>
-<path d="M 86 107 L 88 112 L 89 112 L 91 107 z"/>
-<path d="M 104 109 L 104 110 L 108 110 z"/>
-<path d="M 213 114 L 213 115 L 216 115 L 215 132 L 219 133 L 217 114 z"/>
-<path d="M 112 117 L 112 118 L 136 120 L 136 119 L 133 119 L 133 118 L 140 117 z"/>
-<path d="M 128 123 L 128 124 L 131 124 z"/>
-<path d="M 129 126 L 116 130 L 116 131 C 120.192 131 124.52 130.175 127 134 L 132 132 L 133 128 z"/>
-<path d="M 7 134 L 7 135 L 15 135 z"/>
-<path d="M 154.333 144.667 L 154.667 145.333 L 154.333 144.667 z"/>
-<path d="M 164 151 L 164 152 L 173 152 z"/>
-<path d="M 97.6667 158.333 L 98.3333 158.667 L 97.6667 158.333 z"/>
-<path d="M 65 169 L 65 170 L 76 169 z"/>
-<path d="M 24 169 L 23 173 L 27 171 z"/>
-<path d="M 195 170 L 195 171 L 212 172 z"/>
-<path d="M 236 173 L 236 174 L 239 174 z"/>
-<path d="M 126 175 L 122 178 z"/>
-<path d="M 200 177 L 200 178 L 209 178 z"/>
-<path d="M 73 179 L 73 181 L 75 181 z"/>
-<path d="M 176 179 L 176 180 L 186 180 z"/>
-<path d="M 197 180 L 197 181 L 207 182 L 207 180 z"/>
-<path d="M 106 184 L 107 189 L 110 188 C 109.644 194.519 99.3414 206.657 107 211 L 107 207 L 114 193 L 110 183 z"/>
-<path d="M 178 186 L 178 187 L 192 189 L 190 192 L 209 191 L 209 190 L 200 189 L 200 188 L 205 188 L 205 187 L 196 186 L 196 187 L 198 187 L 198 188 L 192 185 z"/>
-<path d="M 206 188 L 206 189 L 220 189 z"/>
-<path d="M 67 189 L 67 190 L 71 190 z"/>
-<path d="M 156 190 L 162 192 L 162 191 z"/>
-<path d="M 169 192 L 169 193 L 182 193 z"/>
-<path d="M 222 196 L 220 198 L 221 203 L 215 203 L 215 204 C 220.662 203.933 235.056 202.658 236 197 L 235 197 L 226 199 L 226 198 L 230 198 z"/>
-<path d="M 168 199 L 175 198 z"/>
-<path d="M 212 198 L 212 199 L 218 199 z"/>
-<path d="M 84 207 L 87 205 z"/>
-<path d="M 225 207 L 222 213 L 233 214 L 229 218 C 232.288 224.663 230.633 231.092 222 226 L 221 226 L 221 231 L 217 231 L 217 232 L 222 233 L 233 229 L 232 232 C 237.651 227.864 233.958 215.314 235 209 L 229 210 z"/>
-<path d="M 81 210 L 81 212 L 83 212 L 83 210 z"/>
-<path d="M 129 215 L 128 220 L 135 220 L 131 215 z"/>
-<path d="M 86.6667 216.333 L 87.3333 216.667 L 86.6667 216.333 z"/>
-<path d="M 144 216 L 145 220 L 139 225 L 143 229 L 144 229 L 146 216 z"/>
-<path d="M 12 219 L 12 220 L 17 220 L 17 218 z"/>
-<path d="M 206 218 L 206 219 L 215 220 L 206 218 M 221 219 L 223 221 L 221 225 L 224 218 z"/>
-<path d="M 23 231 L 27 231 L 23 237 L 29 236 L 31 229 L 23 231 M 73 228 L 73 231 L 81 229 z"/>
-<path d="M 62 234 L 62 236 L 68 235 z"/>
-<path d="M 220 234 L 221 249 L 225 246 L 225 245 L 222 244 L 222 234 z"/>
-<path d="M 119 239 L 118 245 L 118 246 L 121 247 L 118 249 L 128 253 L 123 247 L 127 245 L 133 245 L 124 238 z"/>
-<path d="M 42 250 L 54 246 C 49.4173 244.591 44.9681 246.434 42 250 z"/>
-<path d="M 95 246 L 99 251 z"/>
-<path d="M 79 247 L 79 248 L 86 249 z"/>
-<path d="M 14 253 L 14 257 C 16.9934 256.936 18.3456 257.054 19 254 L 16 255 L 16 254 L 25.7539 254.476 L 38 250 C 29.3159 245.827 21.7293 248.623 14 253 z"/>
-<path d="M 183 252 L 183 253 L 186 253 z"/>
-<path d="M 116 263 L 119 266 L 120 260 C 126.45 263.784 129.42 259.477 136 259 C 133.104 257.351 115.435 254.705 112.322 256.313 C 107.286 258.914 112.618 263.124 116 263 z"/>
-<path d="M 83 258 L 82 260 L 84 260 L 83 258 M 142 258 L 142 268 L 143 268 L 144 258 z"/>
-<path d="M 210 263 L 210 264 L 214 264 z"/>
-<path d="M 14 267 L 17 265 z"/>
-<path d="M 14 270 L 22 268 C 18.8264 266.763 16.0826 267.264 14 270 z"/>
-<path d="M 9 270 L 9 271 L 13 271 z"/>
-<path d="M 150 271 C 150.002 289.867 161.173 292.653 178 293 L 178 292 L 159 286 L 159 284 L 163 284 L 163 283 L 152 280 L 156 276 L 156 274 L 153 271 L 150 271 M 155 271 L 155 272 L 158 273 z"/>
-<path d="M 52 276 L 52 277 L 63 280 L 66 279 L 65 276 L 68 273 z"/>
-<path d="M 178 274 L 181 277 L 180 280 L 185 276 z"/>
-<path d="M 69 276 L 69 277 L 74 276 L 81 277 z"/>
-<path d="M 188 275 L 186 278 L 186 279 L 194 280 L 198 284 C 195.915 279.351 193.219 275.828 188 275 z"/>
-<path d="M 21 279 L 21 280 L 25 278 z"/>
-<path d="M 185 285 L 180 291 L 186 293 L 183 294 L 195 300 C 194.885 306.979 211.858 307.114 214 300 L 196 303 L 195 296 L 192 297 L 192 292 L 196 290 L 192 291 L 191 291 z"/>
-<path d="M 222 288 L 221 293 L 234 296 L 233 294 L 240 295 z"/>
-<path d="M 151 291 L 150 296 L 153 294 L 162 296 z"/>
-<path d="M 162 296 C 163.516 303.074 186.621 303.678 193 304 L 193 303 z"/>
-<path d="M 48 300 L 50 308 L 49 304 L 51 304 z"/>
-<path d="M 69 310 L 69 315 L 70 315 L 72 310 z"/>
-<path d="M 16 315 L 19 313 L 16 315 M 160 315 C 162.528 322.804 176.379 320 183 320 L 174 314 L 171 316 C 168.344 312.025 164.093 314.399 160 315 z"/>
-<path d="M 201 314 C 205.383 320.303 212.07 320 219 320 L 219 316 L 201 314 M 24 317 L 24 319 L 35 318 C 31.1508 315.267 28.3028 315.224 24 317 z"/>
-</g>
-<g stroke="none" fill="#c52d34">
-<path d="M 57 0 L 57 16 L 58 16 L 58 10 L 64 8 L 60 0 z"/>
-<path d="M 165 6 L 165 7 L 161 10 L 160 18 L 162 15 L 163 15 L 162 31 L 161 31 L 161 29 L 160 29 L 158 33 C 163.122 38.0164 158.197 41.2624 159.371 46.8549 C 159.933 49.5297 162.73 51.6159 164 54 L 167 50 L 179 48 L 179 47 L 171 46 L 171 45 L 179 44 L 179 43 L 167 47 L 168 32 L 193 27 C 189.939 20.9498 182.946 22.3614 177 23 L 175 18 L 174 18 L 175 23 L 170 26 L 169 26 C 169.118 21.1146 169.74 17.8587 175 17 L 175 16 L 170 14 L 175 9 L 175 8 C 170.126 7.73224 165.575 5.71332 170 1 C 166.982 0.10791 161.374 -1.22061 158.608 1.02777 C 153.106 5.49982 162.034 6.83221 165 6 z"/>
-<path d="M 195 5 L 202 3 L 201 1 L 204 1 C 199.609 -0.837891 195.826 0.0536499 195 5 z"/>
-<path d="M 209 14 L 213 7 C 209.313 8.22263 209.12 10.3084 209 14 z"/>
-<path d="M 197 11 L 197 12 L 206 12 z"/>
-<path d="M 143 19 L 143 20 L 160 19 z"/>
-<path d="M 226 22 L 226 23 L 232 23 z"/>
-<path d="M 220 33 C 218.303 38.1016 214.507 45.1192 220 49 L 220 50 L 218 52 L 226 51 L 238 47 L 237 51 C 241.581 50.0184 240 43.8839 240 40 L 220 42 L 220 41 L 224 40 L 224 39 L 220 39 L 222 37 z"/>
-<path d="M 191 34 L 191 35 L 198 35 z"/>
-<path d="M 226 55 L 235 54 C 231.911 52.704 228.308 52.3593 226 55 z"/>
-<path d="M 175 57 L 175 58 L 184 59 L 184 58 L 182 55 z"/>
-<path d="M 120 59 L 120 60 L 126 60 z"/>
-<path d="M 104 70 L 104 71 L 107 71 z"/>
-<path d="M 107 72 L 107 73 L 110 73 z"/>
-<path d="M 169 73 L 174 79 L 173 84 L 180 84 L 180 83 L 176 81 L 176 80 L 187 80 L 187 79 L 184 79 L 184 78 L 187 78 L 187 77 z"/>
-<path d="M 110 83 L 115 82 z"/>
-<path d="M 105 87 L 105 88 L 116 85 z"/>
-<path d="M 97 86 L 95 89 L 95 90 L 101 87 z"/>
-<path d="M 113 95 L 113 96 L 130 96 z"/>
-<path d="M 102 97 L 105 99 z"/>
-<path d="M 209 98 L 212 103 L 212 98 z"/>
-<path d="M 148 101 L 148 103 L 152 103 L 152 101 z"/>
-<path d="M 115 107 L 113 110 L 118 106 z"/>
-<path d="M 110.667 106.333 L 111.333 106.667 L 110.667 106.333 z"/>
-<path d="M 125 107 L 119 109 L 119 110 L 123 113 L 120 112 L 127 115 L 127 114 L 125 112 L 129 108 z"/>
-<path d="M 87 109 L 87 116 L 86 116 L 84 114 L 84 117 L 86 119 L 91 118 L 99 113 L 93 110 L 91 113 L 90 109 L 89 109 L 89 112 L 88 112 z"/>
-<path d="M 167 129 L 168 132 L 165 136 C 169.555 136.094 175.021 138.198 178 134 L 171 133 L 167 129 M 220 129 L 220 133 L 228 137 C 228 133.641 233.203 135 236 135 z"/>
-<path d="M 224 151 L 223 160 L 229 160 L 229 161 C 225.764 164.389 231.243 165.754 234 164 L 234 163 L 235 159 L 235 158 L 232 155 L 229 156 L 228 152 L 227 152 L 227 158 L 226 158 z"/>
-<path d="M 238 156 L 237 160 L 240 156 z"/>
-<path d="M 73 182 L 73 183 L 75 188 L 80 188 C 80.1634 182.955 77.6569 182.152 73 182 z"/>
-</g>
-<g stroke="none" fill="#c35684">
-<path d="M 60 0 C 61.4698 5.01712 64.7506 8.39856 70 9 L 70 5 L 64 4 L 68 0 z"/>
-<path d="M 153 7 L 153 8 L 158 7 z"/>
-<path d="M 0 11 L 0 16 L 4 16 L 2 11 z"/>
-<path d="M 18 33 L 21 36 L 21 37 L 15 39 L 19 41 L 21 38 L 54 40 L 54 41 L 51 41 C 52.1998 45.2549 57.264 61.6684 64 54 L 59 43 L 62 42 L 62 40 L 53 34 z"/>
-<path d="M 50 60 L 54 65 L 52 62 L 52 61 L 54 59 z"/>
-<path d="M 183 63 L 178 63 L 178 62 L 181 61 L 181 60 L 161 61 L 160 61 L 160 67 L 163 65 L 174.294 63.7045 L 192 67 L 191 65 C 195.715 64.3317 202.19 66.3301 205 62 L 188 62 L 189 59 z"/>
-<path d="M 20 69 L 20 70 L 30 73 L 38 69 z"/>
-<path d="M 33 80 L 33 81 L 37 80 z"/>
-<path d="M 128 96 L 125 101 L 126 103 L 116 106 C 124.111 104.975 129.229 105.348 130 96 z"/>
-<path d="M 112 106 L 107 108 L 107 109 L 110 109 L 108 112 L 108 113 L 114 115 L 115 107 z"/>
-<path d="M 80 200 L 85 201 C 83.6248 198.302 80.9299 195.749 80 200 z"/>
-<path d="M 158 202 L 159 206 L 157 206 L 158 209 C 163.094 207.559 163.592 202.968 158 202 z"/>
-<path d="M 156 218 L 156 223 L 162 220 z"/>
-<path d="M 177 224 L 186 225 C 185.328 229.301 187.447 229.733 191 228 L 190 224 L 184 221 z"/>
-<path d="M 64 222 L 64 224 L 73 224 z"/>
-<path d="M 177 247 L 184 250 C 183.197 246.254 180.342 247.267 177 247 z"/>
-<path d="M 190 313 L 196 316 L 196 315 z"/>
-</g>
-<g stroke="none" fill="#c69bd0">
-<path d="M 95 0 L 95 5 L 96 5 z"/>
-<path d="M 159.333 36.6667 L 159.667 37.3333 L 159.333 36.6667 z"/>
-<path d="M 32 121 L 32 122 L 39 122 L 40 125 L 44 125 L 44 121 z"/>
-<path d="M 154 139 L 154 141 L 156 141 L 156 139 z"/>
-<path d="M 68 140 L 68 142 L 70 142 L 70 140 z"/>
-<path d="M 27 142 L 27 146 L 49 146 z"/>
-<path d="M 63 145 L 54 147 L 54 148 L 63 148 L 63 151 L 67 151 L 67 150 L 64 150 z"/>
-<path d="M 138 152 L 140 155 L 140 156 L 130 156 L 128 163 L 134 162 L 133 165 L 124 168 L 125 165 L 119 166 L 119 168 L 131 171 L 138 165 L 136 160 L 141 159 L 138 158 L 138 157 L 149 157 C 148.021 150.339 143.426 151.771 138 152 z"/>
-<path d="M 96 152 L 94 153 L 94 154 z"/>
-<path d="M 39 154 L 39 155 L 52 156 C 48.2404 152.048 43.9404 153.376 39 154 z"/>
-<path d="M 17 159 L 21 159 L 21 160 L 16 160 L 16 161 L 29 162 L 28 159 L 47 159 C 39.9713 155.563 22.0577 150.246 17 159 z"/>
-<path d="M 98 155 L 99 159 L 94 160 L 94 161 L 98 161 L 100 167 L 99 163 L 103 164 L 101 155 z"/>
-<path d="M 83 157 L 80 160 L 80 161 L 89 158 z"/>
-<path d="M 119 158 L 112 161 L 112 165 L 115 167 C 117.767 166.395 117.577 165.711 117 163 C 120.012 162.354 120.498 160.613 119 158 z"/>
-<path d="M 31 162 L 31 163 L 40 163 z"/>
-<path d="M 25 168 L 28 166 z"/>
-<path d="M 28 169 L 36 171 z"/>
-<path d="M 3 178 L 10 177 C 7.16499 174.032 4.90442 174.358 3 178 z"/>
-<path d="M 88 175 L 94 178 L 94 177 z"/>
-<path d="M 28 179 L 36 185 L 49 184 z"/>
-<path d="M 0 181 L 0 182 L 8 181 L 7 183 L 15 184 C 10.428 180.305 5.60971 179.962 0 181 z"/>
-<path d="M 99 190 L 99 191 C 95.127 192.164 94.0118 194.167 93 198 L 96 195 L 98 197 L 99 197 L 98 192 L 100 191 L 103 193 L 102 187 L 105 188 L 106 184 L 100 186 L 100 181 C 95.3767 181.879 93.9124 188.91 99 190 z"/>
-<path d="M 61 192 L 61 193 C 68.2174 193 76.8419 191.064 82 197 L 87 198 L 89 193 L 79 192 L 81 189 z"/>
-<path d="M 148 191 L 148 194 L 149 194 z"/>
-<path d="M 70 202 L 76 201 z"/>
-<path d="M 100 206 L 101 210 L 100 210 L 97 208 L 98 211 L 102 217 C 102.326 212.835 103.82 208.71 100 206 z"/>
-<path d="M 20 211 L 20 212 L 45 215 L 52 212 C 46.088 204.234 28.1524 210.932 20 211 z"/>
-<path d="M 58 216 L 64 215 C 62.2758 221.322 57.9307 221.98 52 222 L 52 221 L 55 220 L 55 219 L 47 222 L 47 223 L 51 226 L 51 227 L 46 227 L 46 228 L 60 228 L 60 227 L 57 226 L 64 224 L 62 223 L 62 222 L 67 222 L 66 219 L 68 220 L 68 219 L 62 214 L 62 213 L 69 213 L 69 212 L 65 212 L 65 211 L 67 211 C 62.7659 209.531 59.8316 212.325 58 216 z"/>
-<path d="M 30 234 L 66 230 L 66 231 L 64 234 L 73 230 C 70.9627 225.434 67.0308 228.851 63 229 C 56.6733 229.234 31.4862 227.029 30 234 z"/>
-<path d="M 136 232 L 134 235 L 140 238 L 140 241 L 145 236 z"/>
-<path d="M 104 245 L 103 249 L 104 249 z"/>
-<path d="M 119 274 L 119 275 L 124 275 C 124.153 279.674 125.163 282.358 130 280 L 128 288 L 127 289 C 124.763 288.209 123 287.374 123 290 L 120 289 L 118 298 L 118 299 L 123 298 C 125.406 300.75 129.81 300.211 132.697 297.991 C 136.556 295.022 134.566 290.54 136.487 286.847 C 137.853 284.221 141.21 283.532 142.396 280.776 C 145.986 272.436 136.435 271.856 131 272.015 C 126.878 272.136 123.076 273.594 119 274 z"/>
-</g>
-<g stroke="none" fill="#ebdef6">
-<path d="M 96 0 L 96 6 L 100 6 L 124 1 L 124 2 L 123 6 L 118 6 L 118 7 C 123.316 9.76184 128.816 8.71469 134 6 C 135.514 13.0303 138.525 3.51123 139 1 L 143 4 L 144 3 C 141.011 -1.14474 135.687 0 131 0 z"/>
-<path d="M 147 6 L 148 12 L 149 12 L 149 6 z"/>
-<path d="M 116 7 L 113 17 C 118.347 15.1201 119.572 11.5191 116 7 M 157 7 L 150 8 L 150 9 L 152 10 L 150 12 L 157 13 z"/>
-<path d="M 94 21 L 98 20 L 98 19 L 96 19 L 96 18 L 101 17 C 97.0086 15.3839 94.6905 16.8627 94 21 z"/>
-<path d="M 109 27 L 108 32 L 109 32 z"/>
-<path d="M 87 39 L 87 43 L 88 43 z"/>
-<path d="M 96 41 C 86.7884 44.3886 97.2852 51.0217 96 41 z"/>
-<path d="M 52.6667 115.333 L 53.3333 115.667 L 52.6667 115.333 z"/>
-<path d="M 76 130 L 76 131 L 82 131 z"/>
-<path d="M 91 132 L 91 133 L 94 133 z"/>
-<path d="M 95 137 L 95 142 L 104 139 z"/>
-<path d="M 87 147 L 87 148 L 98 147 C 94.2771 143.429 91.3973 145.981 87 147 z"/>
-<path d="M 99.6667 148.333 L 100.333 148.667 L 99.6667 148.333 z"/>
-<path d="M 64 158 L 64 160 L 69 160 z"/>
-<path d="M 119 163 L 119 164 L 125 165 L 125 164 z"/>
-<path d="M 82 175 L 82 176 L 86 176 z"/>
-<path d="M 14.6667 177.333 L 15.3333 177.667 L 14.6667 177.333 z"/>
-<path d="M 89.6667 178.333 L 90.3333 178.667 L 89.6667 178.333 z"/>
-<path d="M 120 180 L 112 199 C 117.229 195.137 122.303 186.661 122 180 z"/>
-<path d="M 111 203 L 111 206 L 112 206 z"/>
-<path d="M 89 208 L 89 212 L 93 212 L 92 207 z"/>
-<path d="M 85 228 L 77 245 L 81 244 L 86 246 C 84.8203 238.531 94.0254 233.566 85 228 z"/>
-<path d="M 21 308 L 22 309 z"/>
-<path d="M 126 314 L 125 316 L 127 316 z"/>
-</g>
-<g stroke="none" fill="#f8bdd5">
-<path d="M 143 0 L 144 3 L 143 4 L 139 1 C 138.3 3.57697 137.011 9.92014 134 6 C 128.277 8.19769 123.852 9.22235 118 7 L 118 6 L 123 6 L 124 2 L 124 1 C 117.983 1.47485 103.922 1.33887 100 6 C 94.6543 5.45761 95.0154 9.66339 95 14 L 114 13 L 114 14 L 102 16 L 105 18 L 103 20 L 103 21 L 108 21 L 108 23 L 103 24 C 97.2895 17.4703 89.5911 24.4905 89 31 L 95 29 L 96 29 L 99 27 L 99 28 L 97 28 L 97 29 L 104 29 L 104 30 L 99 30 L 99 31 L 104 31 L 104 33 C 96.6912 33.2756 91.6318 34.5982 91 43 L 96 41 C 95.8928 47.5958 92.8557 45.671 88 46 L 88 47 L 93 50 L 93 51 C 86.0238 54.7215 84.6407 60.5677 86 68 L 89 68 L 89 59 L 92 58 L 92 53 L 93 53 L 93 58 L 100 50 L 104 51 L 106 48 L 106 47 L 102 47 L 102 46 C 105.194 45.9865 107.271 46.4028 108 43 L 110 45 L 111 45 L 114 41 L 110 41 L 110 40 L 113 40 L 113 39 L 110 39 L 111 33 L 119 31 L 119 32 L 117 37 L 118 37 L 123 36 L 129 23 C 125.347 23 117.618 21.529 117 26 L 114 24 L 113 24 L 112 24 L 109 25 L 109 32 L 108 32 C 107.601 15.517 125.813 26.2268 133 18 L 141 18 L 137 16 L 137 15 L 145 16 L 145 17 L 143 17 L 143 18 L 160 18 L 160 20 L 142 21 L 142 25 L 141 25 L 140 21 L 136 22 L 136 23 L 143 27 L 138 30 L 138 31 L 145 29 L 144 34 L 144 35 L 157 35 L 156 29 C 165.486 23.027 158.86 12.8831 150 12 C 151.39 9.68375 153.128 9.62555 150 9 L 150 8 C 155.198 7.04718 156.636 4.92413 158 0 z"/>
-<path d="M 97 66 L 99 68 L 97 73 L 102 70 L 101 67 L 105 64 z"/>
-<path d="M 64 147 L 67 150 L 67 151 L 50 153 L 50 155 L 92 152 L 92 153 L 70 156 L 70 160 L 84 159 L 83 157 L 92 157 L 91 154 L 96 151 L 85 150 L 85 149 L 87 149 z"/>
-<path d="M 159.667 157.333 L 160.333 157.667 L 159.667 157.333 z"/>
-<path d="M 108 285 L 108 290 L 109 290 z"/>
-</g>
-<g stroke="none" fill="#bb3e5a">
-<path d="M 173 6 L 196 6 L 195 9 L 196 0 C 187.918 0 176.268 -3.04929 173 6 z"/>
-<path d="M 35 3 L 36 6 L 16 8 L 15 19 L 22 17 L 21 23 L 23 17 L 30 18 L 29 13 L 34 13 L 34 12 L 25 12 L 25 10 L 44 12 L 47 13 C 46.0458 8.52457 41.0286 8.017 37 8 L 37 7 L 41 6 L 41 5 z"/>
-<path d="M 210 13 L 209 17 L 200 16 L 200 17 L 207 17 L 208 26 L 210 24 L 211 24 L 208 29 L 208 30 L 212 31 L 223 28 L 223 27 L 212 28 L 212 24 L 218 23 L 218 22 L 211 23 L 210 13 M 179 15 L 179 16 L 188 17 z"/>
-<path d="M 49 19 L 47 21 L 47 22 L 48 27 L 52 26 L 53 31 L 54 31 L 56 23 L 53 20 L 52 20 L 52 23 L 51 23 L 51 19 z"/>
-<path d="M 194 24 L 193 27 L 205 29 L 205 28 L 196 27 L 196 26 L 198 26 z"/>
-<path d="M 186 32 L 186 33 L 203 33 L 203 32 C 201.04 31.3466 200.446 31 203 31 z"/>
-<path d="M 223 31 L 223 32 L 228 32 z"/>
-<path d="M 235 32 L 235 33 L 239 33 L 239 34 L 231 33 L 234 36 L 231 39 L 237 37 L 235 36 L 235 35 L 240 35 L 240 32 z"/>
-<path d="M 199 53 C 193.803 57.3857 188.203 55.7881 182 55 L 184 58 L 184 59 L 173 56 L 174 61 L 181 60 L 181 61 L 178 62 L 178 63 L 183 63 L 189 59 L 188 62 L 216 63 L 215 59 C 208.781 61.2666 203.869 62.0565 199 57 L 204 56 L 204 55 L 201 53 z"/>
-<path d="M 191 65 L 192 67 L 189 67 L 189 68 L 200 68 L 200 67 L 195 67 L 195 66 L 199 66 z"/>
-<path d="M 36 78 L 42 80 L 43 73 C 38.8763 72.3881 37.4866 74.2874 36 78 z"/>
-<path d="M 144 74 L 144 75 L 154 76 z"/>
-<path d="M 131 90 L 138 89 z"/>
-<path d="M 131 99 L 144 97 L 144 96 L 140 94 z"/>
-<path d="M 105 97 L 108 96 z"/>
-<path d="M 120 98 L 120 99 L 123 99 z"/>
-<path d="M 172 99 L 172 103 L 176 102 z"/>
-<path d="M 106 100 L 106 101 L 110 102 L 110 101 z"/>
-<path d="M 85 105 L 85 108 L 86 108 L 102 109 L 102 112 L 106 112 L 104 117 L 114 119 L 114 118 C 112.04 117.347 111.446 117 114 117 L 114 116 L 110 116 L 110 115 L 112 115 L 112 114 L 106 115 L 106 114 L 110 112 L 110 111 L 104 110 L 104 109 L 106 109 L 106 108 L 92 107 L 92 106 L 93 104 L 98 103 z"/>
-<path d="M 114 110 L 114 111 L 123 113 C 120.235 109.898 118.073 109.465 114 110 z"/>
-<path d="M 129 115 L 138 116 L 138 115 L 135 114 L 135 113 L 140 113 C 136.121 110.061 130.946 110.16 129 115 M 147 111 C 148.947 113.231 151.053 113.231 153 111 L 147 111 M 171 127 L 199 129 L 199 124 L 196 122 L 195 122 L 180 123 L 180 121 L 184 121 L 184 120 L 180 114 L 178 116 L 177 116 L 174 111 C 168.955 114.136 171.69 121.504 171 127 z"/>
-<path d="M 209 113 L 207 121 L 214 124 L 206 123 L 206 124 L 209 124 L 209 125 L 205 123 L 204 123 C 204.019 128.294 204.498 130.906 209 134 L 210 134 L 215 132 L 216 115 z"/>
-<path d="M 115 115 L 115 116 L 119 116 L 119 117 L 115 117 L 115 118 L 124 115 z"/>
-<path d="M 103 121 L 103 122 L 107 123 z"/>
-<path d="M 212 136 L 212 137 L 219 138 z"/>
-<path d="M 218 151 L 218 153 L 223 152 z"/>
-<path d="M 215 161 L 215 162 L 226 162 L 225 165 L 228 165 L 229 161 z"/>
-<path d="M 62 165 L 50 169 L 50 170 L 79 169 L 83 164 z"/>
-<path d="M 173 176 L 178 174 L 178 175 L 175 178 C 179.501 179.072 185.174 180.36 188 176 C 182.754 175.615 176.717 170.268 173 176 z"/>
-<path d="M 158 178 L 158 182 L 155 181 C 150.731 199.657 180.725 186.656 188 194 L 175 193 L 175 194 L 177 195 L 171 198 L 171 199 L 178 199 L 178 200 L 173 200 L 174 203 C 181.657 198.749 193.484 202.976 202 203 L 202 202 L 194 200 L 194 199 L 199 200 L 199 196 L 190 193 C 188.514 184.089 168.297 185.576 161 185 L 161 184 L 179 185 L 179 184 L 166 183 L 166 182 C 170.86 182 190.197 181.516 191 187 L 198 188 L 198 187 L 196 187 L 196 186 L 200 186 L 198 181 C 186.152 181.942 174.592 181.067 163 178 L 163 180 z"/>
-<path d="M 199 190 L 198 194 L 203 195 z"/>
-<path d="M 156 192 L 156 196 C 160.429 198.132 166.771 199.571 170 195 L 167 196 z"/>
-<path d="M 224 235 L 230 238 L 230 235 z"/>
-</g>
-<g stroke="none" fill="#d15266">
-<path d="M 209 7 L 208 7 L 208 1 C 203.258 2.33707 198.485 2.74271 197 8 L 216 7 C 219.189 11.4046 225.13 9.04034 230 9 L 230 8 L 217 6 L 216 3 L 221 1 C 215.755 -1.18402 210.198 1.47217 209 7 z"/>
-<path d="M 228 5 L 237 4 L 237 6 L 231 6 L 232 9 L 240 8 L 240 0 z"/>
-<path d="M 171 10 L 170 14 L 175 16 L 175 17 C 169.248 17.4588 169.047 20.8587 169 26 L 170 26 L 175 23 L 174 18 L 175 18 L 177 23 L 200 25 L 200 24 L 196 24 C 197.788 19.1927 199.713 16.5952 205 16 L 205 15 L 198 15 L 199 11 L 199 10 L 190 10 L 190 11 L 194 12 L 195 17 C 193.009 16.8912 186.913 15.964 191 14 L 191 13 C 183.494 12.4916 181.05 9.39508 174 14 L 174 10 z"/>
-<path d="M 224 15 L 219 20 L 230 20 L 230 21 L 212 24 L 212 28 L 219 27 C 218.169 22.8448 225.76 22.958 225 26 L 240 26 L 240 21 L 231 20 L 231 19 L 233 19 L 233 18 z"/>
-<path d="M 163 19 L 162 27 L 163 27 z"/>
-<path d="M 168 32 C 167.269 41.345 169.602 42.9927 179 43 L 179 44 L 171 45 L 171 46 C 174.546 47.2963 182.327 46.4041 183 51 L 204 48 L 204 49 L 200 50 L 204 55 L 204 56 L 199 57 C 206.922 68.5901 215.01 55.654 220 50 L 220 49 L 208 46 L 208 45 L 216 44 L 216 43 L 211 42 L 211 37 C 209.009 36.8912 202.913 35.964 207 34 L 207 33 L 186 34 L 186 32 L 203 30 L 203 31 L 201 31 L 201 32 L 206 30 C 192.744 24.3856 180.877 31.5886 168 32 z"/>
-<path d="M 92 28 L 90 43 L 91 43 L 94 28 z"/>
-<path d="M 236 38 L 236 40 L 240 40 L 240 38 z"/>
-<path d="M 101.667 44.3333 L 102.333 44.6667 L 101.667 44.3333 z"/>
-<path d="M 217 57 L 217 61 L 240 59 C 233.875 55.0038 223.938 55.7502 217 57 z"/>
-<path d="M 164 57 L 172 59 L 172 58 z"/>
-<path d="M 114 59 L 111 61 L 111 62 L 114 62 L 114 63 L 112 64 L 114 67 L 115 67 L 121 64 L 121 63 L 120 61 z"/>
-<path d="M 200.667 66.3333 L 201.333 66.6667 L 200.667 66.3333 z"/>
-<path d="M 164 74 L 187 74 L 187 73 L 174 73 C 172.139 67.4115 165.618 69.0759 164 74 z"/>
-<path d="M 96 73 L 96 74 L 102 75 L 96 73 M 104.667 73.3333 L 105.333 73.6667 L 104.667 73.3333 z"/>
-<path d="M 46 78 L 48 79 L 48 80 L 44 80 L 41 92 L 45 94 L 45 95 L 41 96 L 41 97 L 45 97 L 45 98 L 41 101 C 46.5917 100.953 51.1788 100.375 55 96 L 50 95 L 54 91 L 54 90 L 51 90 L 51 89 L 53 88 L 50 81 L 55 76 z"/>
-<path d="M 102 84 L 100 88 L 109 87 L 109 85 z"/>
-<path d="M 117 97 L 118 99 L 119 99 L 120 97 z"/>
-<path d="M 88 102 L 88 104 L 90 104 L 90 102 z"/>
-<path d="M 106 103 L 106 104 L 110 104 z"/>
-<path d="M 140 113 L 135 113 L 135 114 L 140 116 L 139 120 C 144.455 118.119 152.487 121.251 155 115 L 141 114 L 141 113 L 147 111 L 153 111 L 152 103 C 145.788 103.07 140.248 106.146 140 113 z"/>
-<path d="M 134 105 L 134 106 L 140 105 z"/>
-<path d="M 85 108 L 86 116 L 87 116 z"/>
-<path d="M 101 112 L 96 115 L 96 116 L 105 115 L 103 112 z"/>
-<path d="M 227 135 C 227.098 137.75 225.388 138.575 229 139 L 229 140 L 226 146 L 233 145 L 235 146 L 240 144 L 240 134 z"/>
-<path d="M 181 155 C 179.357 161.025 174.87 162.728 169 163 L 191 171 L 192 171 L 197 169 L 185 163 L 187 160 L 183 160 L 183 159 L 190 159 L 190 158 L 188 158 L 188 157 L 191 160 L 203 160 L 203 159 L 199 159 C 198.064 151.924 185.716 157.704 181 155 z"/>
-<path d="M 202 166 C 202.937 171.396 209.011 172.609 212 168 z"/>
-<path d="M 164 193 L 164 194 L 167 196 L 170 195 L 176 196 z"/>
-<path d="M 165 200 L 165 201 C 168.598 202.963 173.829 205.61 177 202 L 173 200 L 178 200 z"/>
-</g>
-<g stroke="none" fill="#e46c7c">
-<path d="M 217 2 L 217 3 L 227 2 L 227 3 L 217 5 C 223.203 10.3502 229.884 6.45242 237 6 L 237 4 L 228 5 L 238 1 C 231.887 -1.56522 223.059 -0.20813 217 2 z"/>
-<path d="M 200 9 L 200 10 L 206 11 L 206 10 L 204 8 z"/>
-<path d="M 128 10 L 128 11 L 133 11 z"/>
-<path d="M 106 14 L 106 15 L 114 14 z"/>
-<path d="M 142 16 L 142 17 L 145 17 z"/>
-<path d="M 198 17 L 196 24 L 207 23 L 207 17 z"/>
-<path d="M 144 20 L 144 21 L 151 20 z"/>
-<path d="M 133 26 L 133 27 L 141 27 z"/>
-<path d="M 88 28 L 88 37 L 89 37 z"/>
-<path d="M 142 29 L 142 30 L 145 30 z"/>
-<path d="M 222 32 L 220 39 L 234 36 L 231 33 L 240 32 z"/>
-<path d="M 186 33 L 186 34 L 203 34 z"/>
-<path d="M 235 35 L 235 36 L 240 37 z"/>
-<path d="M 116 43 L 116 44 L 133 46 L 133 45 L 129 42 C 125.522 42 117.847 46.6123 119 42 z"/>
-<path d="M 226 51 C 223.238 48.6541 219.707 51.3336 217 53 L 217 55 L 240 58 C 240 54.6373 240.716 51.7963 237 51 L 238 47 z"/>
-<path d="M 167 50 L 166 54 L 163 52 L 162 55 C 171.841 56.827 194.849 60.1171 201 51 L 176 51 L 176 50 L 184 50 C 178.979 46.1962 172.784 49.936 167 50 z"/>
-<path d="M 89 53 L 92 51 z"/>
-<path d="M 217 64 L 224 63 L 224 62 L 223 60 z"/>
-<path d="M 90 64 L 89 68 L 85 69 L 85 70 C 88.9988 69.3538 90.5124 67.7172 92 64 z"/>
-<path d="M 89 79 L 92 91 L 91 96 C 87.1863 96.6613 86.4297 98.2594 86 102 L 87 102 L 89 99 L 91 103 L 91 96 L 95 95 L 95 89 L 97 86 L 102 84 L 110 86 C 109.71 83.0731 110.105 81.6114 107 81 L 97 83 L 97 82 L 102 82 L 102 81 z"/>
-<path d="M 85 88 L 84 97 L 86 97 z"/>
-<path d="M 91 118 L 91 119 L 107 119 z"/>
-<path d="M 106 122 L 113 120 z"/>
-<path d="M 164 145 L 164 150 L 175 147 z"/>
-<path d="M 227 151 L 229 156 L 232 155 L 235 158 L 235 159 L 232 161 L 238 161 L 236 154 L 236 153 L 239 152 C 234.781 148.351 231.962 150.369 227 151 z"/>
-</g>
-<g stroke="none" fill="#f37b8a">
-<path d="M 148 1 L 151 3 z"/>
-<path d="M 211 23 L 230 21 L 230 20 L 219 20 L 224 15 L 225 15 C 225.842 18.9293 229.555 17.7898 233 18 L 233 19 L 231 19 L 231 20 L 240 21 L 240 8 C 233.059 8.24139 221.352 11.9078 216 7 C 209.533 9.57446 211.315 17.2062 211 23 z"/>
-<path d="M 119 13 L 126 12 z"/>
-<path d="M 198 15 L 208 16 L 208 11 z"/>
-<path d="M 151 19 L 151 20 L 160 20 z"/>
-<path d="M 107 28 L 109 25 L 112 24 L 113 24 L 114 24 L 117 26 C 117 21.6175 124.704 23 128 23 L 128 21 C 120.811 21.0199 109.829 20.1347 107 28 z"/>
-<path d="M 103 25 L 103 26 L 107 26 z"/>
-<path d="M 131 42 L 131 43 L 149 45 z"/>
-<path d="M 151 55 L 150 55 C 147.594 50.5724 136.202 54.2056 132 55 L 132 56 L 140 57 L 140 58 L 128 58 L 129 56 L 125 56 L 126 60 L 120 60 L 121 57 L 114 54 L 121 54 L 121 53 L 105 55 L 103 64 L 110 63 L 110 62 L 106 63 L 113 59 L 112 57 L 113 57 L 119 63 L 123 64 L 127 62 L 130 65 L 130 63 C 134.034 64.6555 140.516 66.2225 142 61 L 135 61 L 135 60 L 147 59 L 143 62 C 143.82 65.8245 152.779 66.8121 155.278 63.6667 C 158.064 60.16 156.739 53.9087 156 50 z"/>
-<path d="M 99 58 L 100 65 L 96 65 L 96 66 L 102 66 L 101 58 z"/>
-<path d="M 116 66 L 114 71 L 108 75 L 108 76 C 112.251 75.6485 115.329 75.1984 117 71 L 130 72 L 129 69 C 125.738 69.5437 123.196 71.2169 124 68 L 121 69 z"/>
-<path d="M 102 74 L 102 77 L 108 71 L 104 69 C 101.072 69.8068 97.142 72.9373 102 74 z"/>
-<path d="M 91 73 L 94 76 L 92 79 L 97 80 L 97 79 L 95 79 L 95 78 L 98 77 L 98 71 z"/>
-<path d="M 116 75 L 116 81 L 109 83 L 109 84 L 116 85 C 108.748 90.2163 98.465 84.891 94 94 L 104 94 L 105 99 L 92 98 L 98 102 L 98 103 L 92 106 L 92 107 L 112 108 L 112 107 L 110 107 L 110 106 L 126 103 L 125 101 L 128 96 L 113 96 L 113 95 L 121 95 L 121 94 L 116 94 L 116 93 L 122 87 L 119 88 L 118 84 L 123 81 L 119 81 L 121 77 z"/>
-<path d="M 83 91 C 83 95.3979 82.7694 98.6924 80 98 C 79.9994 103.671 80.4154 107.962 75 111 L 76 117 L 84 117 z"/>
-<path d="M 131 106 L 131 107 L 143 107 L 145 103 z"/>
-<path d="M 90 108 L 90 111 L 93 111 L 93 108 z"/>
-<path d="M 165 159 L 170 159 L 170 160 L 164 160 L 164 161 L 180 160 L 180 159 L 179 157 z"/>
-</g>
-<g stroke="none" fill="#b24e6f">
-<path d="M 64 4 L 70 5 L 70 13 L 67 17 L 60 20 L 60 21 L 66 21 L 66 25 L 57 24 L 58 31 L 66 36 L 68 27 L 71 43 L 82 48 L 83 48 L 84 43 C 81.8414 40.1028 82.2913 38.0934 84 35 L 77 27 L 84 28 L 79 18 L 85 21 L 86 17 L 82 18 L 81 16 L 83 14 L 78 6 L 75 12 C 73.3428 6.65353 70.845 -0.562561 64 4 z"/>
-<path d="M 4 16 L 0 16 L 0 17 L 3 19 L 7 18 L 5 23 L 16 25 L 15 22 L 20 22 L 23 24 L 23 23 L 22 17 C 17.5151 18.4605 12.8452 22.0671 11 16 L 15 13 L 13 9 C 3.53722 7.02179 -1.49825 5.17697 4 16 z"/>
-<path d="M 82 7 L 84 12 L 85 12 z"/>
-<path d="M 160 21 L 159 27 L 161 31 L 162 31 z"/>
-<path d="M 20 25 L 20 26 L 40 30 L 40 29 L 36 29 L 36 26 L 26 26 L 26 24 z"/>
-<path d="M 51 26 L 48 32 L 53 32 z"/>
-<path d="M 10 29 L 11 32 L 0 31 C 0 36.6492 -2.12743 47.7595 1.17515 52.5617 C 3.40204 55.7998 7.11673 53.5423 10.0394 52.8434 C 17.0155 51.1751 25.7593 52.7384 32 49 L 29 48 L 28 42 L 27 42 L 24 46 L 24 47 L 27 50 C 16.869 49.9989 14.438 47.2006 14 37 L 21 37 L 21 36 L 18 33 L 24 31 L 13 33 L 13 29 z"/>
-<path d="M 158 33 C 156.059 42.6592 161.404 64.5635 148 65 L 152 69 L 151 66 L 156 66 L 156 71 L 151 71 L 151 72 L 155 72 L 154 82 C 157.495 78.5381 156.273 74.5971 156.935 70 C 158.465 59.3794 163.028 43.2456 160 33 z"/>
-<path d="M 51 89 L 51 90 L 57 91 L 56 86 z"/>
-<path d="M 79 104 L 79 109 L 80 109 z"/>
-<path d="M 206 120 L 205 125 L 209 125 L 209 124 L 206 124 L 206 123 L 214 124 z"/>
-<path d="M 33 123 L 33 124 L 33 128 L 33 129 L 38 130 z"/>
-<path d="M 175 133 L 175 134 L 178 134 L 165 136 L 166 131 L 164 131 L 163 143 L 155 147 L 154 151 L 153 151 L 152 149 L 150 148 L 149 148 L 147 153 L 154 152 L 154 155 L 155 155 L 155 152 L 160 153 L 157 155 L 154 157 L 154 161 C 157.977 159.756 160.808 157.252 161 153 C 167.081 151.552 173.808 147.167 178 154 L 175 157 L 178 159 C 181.867 158.171 181.165 155.187 180 152 L 187 153 L 186 156 L 211 156 L 211 157 L 207 157 L 202 163 L 209 163 L 209 162 L 207 162 L 207 161 C 215.36 162.529 225.031 161.053 224 151 L 225 151 L 226 158 L 227 158 L 227 151 L 235 149 L 234 145 L 233 145 L 226 146 L 229 140 L 229 139 C 224.179 136.466 214.929 127.751 210 134 C 198.331 126.968 187.409 132.957 175 133 z"/>
-<path d="M 125 139 L 123 143 z"/>
-<path d="M 226 166 L 226 167 L 236 167 C 235.119 162.811 229.494 165.222 226 166 z"/>
-<path d="M 156 165 L 158 173 C 160.906 172.231 164.454 171.272 165 175 L 182 173 L 182 172 L 171 169 L 171 168 L 173 168 z"/>
-<path d="M 211 170 L 203 173 L 203 174 L 210 178 L 211 175 C 213.979 175.516 216.565 176.404 217 173 L 226 173 L 225 176 L 226 176 L 230 172 L 230 168 z"/>
-<path d="M 142 181 L 142 182 L 146 182 z"/>
-<path d="M 184 185 L 184 186 L 188 186 z"/>
-<path d="M 203 192 L 205 196 L 205 197 L 199 196 L 204 198 L 204 199 L 201 199 L 202 204 L 216 205 L 215 203 L 221 203 L 220 200 L 212 199 L 212 198 L 222 196 L 232 197 L 232 196 L 223 195 L 223 194 L 235 192 z"/>
-<path d="M 226 198 L 226 199 L 234 199 z"/>
-<path d="M 217 222 L 217 225 L 222 222 z"/>
-<path d="M 202 227 L 202 228 L 213 230 z"/>
-<path d="M 39 235 L 39 236 L 47 238 L 49 234 z"/>
-<path d="M 177 242 L 177 243 L 193 246 z"/>
-<path d="M 40 254 L 40 255 L 47 255 z"/>
-<path d="M 48 260 L 48 261 L 57 258 z"/>
-<path d="M 162 305 L 167 310 L 172 309 L 172 308 z"/>
-<path d="M 196 316 L 196 317 L 207 320 z"/>
-</g>
-<g stroke="none" fill="#531526">
-<path d="M 91 6 L 89 11 L 85 21 L 79 18 L 83 30 L 77 27 L 85 36 L 86 36 L 86 28 L 86 21 L 88 21 L 88 25 C 90.9534 23.5117 94.1117 20.8904 91 18 L 91 17 L 91 16 L 95 6 z"/>
-<path d="M 158 7 L 160 17 L 161 17 L 161 10 L 165 7 z"/>
-<path d="M 68 16 L 72 21 L 74 24 L 73 33 L 74 33 C 77.8949 25.5127 73.8334 20.7135 68 16 z"/>
-<path d="M 207 21 L 206 26 L 207 26 z"/>
-<path d="M 0 24 L 0 31 C 5.61014 30.8343 12.3473 29.3859 16 25 z"/>
-<path d="M 171 25 L 180 28 z"/>
-<path d="M 43 28 L 43 32 L 24 31 C 27.6938 36.0656 46.1874 34.38 52 33 L 52 32 L 44 32 L 46 29 z"/>
-<path d="M 203 32 L 203 33 L 211 34 z"/>
-<path d="M 66 39 L 71 39 z"/>
-<path d="M 223 40 L 223 41 L 240 38 z"/>
-<path d="M 60 42 L 60 44 L 62 44 L 62 42 z"/>
-<path d="M 232 43 L 232 44 L 237 44 z"/>
-<path d="M 220 63 L 220 64 L 240 64 L 220 63 M 66 64 C 66.2025 67.9069 65.9061 69.7881 62 71 L 65 74 L 65 78 L 66 78 C 66 73.7328 67.4321 71.358 70 72 L 69 69 C 71.6485 66.4459 68.575 64.9403 66 64 z"/>
-<path d="M 34 67 L 49 73 L 46 70 L 49 69 L 47 68 L 47 67 L 53 67 z"/>
-<path d="M 0 68 L 0 74 L 9 73 L 10 69 z"/>
-<path d="M 182 68 L 182 69 L 189 69 z"/>
-<path d="M 159 72 L 158 80 L 159 80 L 159 76 L 169 74 z"/>
-<path d="M 42 75 L 41 91 C 43.7608 86.3983 44.5404 79.8139 42 75 z"/>
-<path d="M 218 75 C 211.542 80.7227 208.68 92.8917 221 90 L 220 87 L 215 89 L 215 85 C 222.163 85.5653 225.924 86.3749 232 82 L 232 81 L 227 81 L 227 80 L 229 79 L 223 79 L 222 76 L 219 77 z"/>
-<path d="M 176 80 L 176 81 L 191 81 z"/>
-<path d="M 160 86 L 159 92 L 169 93 L 171 91 L 171 90 L 171 85 L 160 86 M 193 85 L 193 86 L 195 88 L 179 94 L 190 96 L 189 93 L 203 93 L 199 90 L 202 86 z"/>
-<path d="M 221 97 L 240 97 L 240 93 C 233.95 92.2361 224.782 91.0988 221 97 M 130 93 C 130.654 96.0539 132.007 95.9358 135 96 L 135 95 z"/>
-<path d="M 91 96 L 91 97 L 103 97 L 103 95 z"/>
-<path d="M 62 97 L 60 105 L 61 105 L 66 103 L 66 102 L 65 99 z"/>
-<path d="M 50 100 L 47 108 L 49 113 L 54 111 L 56 103 z"/>
-<path d="M 179 108 L 199 104 L 199 105 L 196 108 L 201 108 L 176 110 L 177 114 L 188 115 L 186 120 L 197 119 L 202 117 L 202 116 L 195 115 L 195 114 C 201.567 113.995 204.175 113.665 206 107 L 213 114 L 207 106 L 208 103 L 198 100 C 191.515 102.173 183.243 102.431 179 108 z"/>
-<path d="M 0 104 C 0.140129 115.823 13.2521 110.624 22 111 L 22 110 L 18 110 L 18 106 z"/>
-<path d="M 114 109 L 114 110 L 125 107 L 129 108 L 125 112 L 127 114 L 127 115 L 121 117 L 121 118 L 133 116 L 133 115 L 129 115 L 133 111 L 133 110 L 130 110 L 131 107 C 124.994 104.926 119.419 105.659 114 109 z"/>
-<path d="M 164 110 C 162.807 112.788 157.808 115.882 163 117 L 162 120 L 163 123 L 168 123 L 167 117 L 171 117 L 170 112 z"/>
-<path d="M 91 118 L 111 119 L 111 118 L 105 115 L 96 116 L 98 115 C 94.5979 113.683 92.2158 114.542 91 118 z"/>
-<path d="M 217 114 L 217 120 L 218 120 L 218 115 L 228 115 z"/>
-<path d="M 83.6667 115.333 L 84.3333 115.667 L 83.6667 115.333 z"/>
-<path d="M 229 115 L 229 116 L 231 118 L 237 116 z"/>
-<path d="M 82 117 L 82 118 L 86 119 z"/>
-<path d="M 23 127 L 23 132 L 26 132 L 26 127 z"/>
-<path d="M 12 131 L 12 132 L 18 132 L 18 130 z"/>
-<path d="M 234 133 L 234 134 L 240 134 z"/>
-<path d="M 9 139 L 9 140 L 14 140 L 9 139 M 21 139 L 24 141 L 24 140 z"/>
-<path d="M 74 140 L 74 142 L 76 142 L 76 140 z"/>
-<path d="M 54 147 L 63 143 C 58.7206 141.221 54.8355 142.188 54 147 z"/>
-<path d="M 55 149 L 55 150 L 62 151 L 62 150 L 61 148 z"/>
-<path d="M 156.333 155.667 L 156.667 156.333 L 156.333 155.667 z"/>
-<path d="M 87.3333 159.667 L 87.6667 160.333 L 87.3333 159.667 z"/>
-<path d="M 5 162 L 5 163 L 8 163 z"/>
-<path d="M 25 164 L 25 165 L 28 169 L 34 169 C 33.105 163.404 29.9588 163.667 25 164 z"/>
-<path d="M 79.6667 166.333 L 80.3333 166.667 L 79.6667 166.333 z"/>
-<path d="M 100.667 169.333 L 101.333 169.667 L 100.667 169.333 z"/>
-<path d="M 130 177 L 130 194 C 133.881 191.758 133.983 188.172 134 184 L 138 184 L 138 183 L 134 182 L 140 176 z"/>
-<path d="M 210 180 L 210 181 L 221 180 z"/>
-<path d="M 216 184 L 216 185 L 227 186 L 227 181 z"/>
-<path d="M 6 184 L 6 189 L 12 190 C 11.3808 186.031 10.1643 183.935 6 184 z"/>
-<path d="M 223 191 L 223 192 L 233 191 z"/>
-<path d="M 230 197 L 230 198 L 235 199 z"/>
-<path d="M 132 200 L 137 203 L 127 205 C 129.286 208.193 131.682 207.523 135 206 L 138 208 C 138 204.637 138.716 201.796 135 201 L 135 200 L 139 200 z"/>
-<path d="M 236 199 L 232 205 L 232 206 L 235 206 C 234.459 212.869 237.076 226.998 232 232 L 233 229 L 223 230 C 224.912 233.053 230.286 234.084 228 238 L 229 241 L 222 242 L 222 244 L 224 247 C 227.841 248.413 230.118 251.303 226 254 C 228.918 259.414 233.998 261.822 240 262 L 234 258 L 234 254 L 240 254 L 240 253 L 234 252 L 234 251 L 240 251 C 239.696 247.171 238.795 245.827 235 245 L 235 239 L 240 239 L 240 238 L 236 234 L 240 236 L 237 225 L 239 225 L 238 222 C 242.079 218.434 236.342 213.482 236 209 L 240 209 L 237 207 L 240 201 z"/>
-<path d="M 156 200 L 156 202 L 158 202 L 158 200 z"/>
-<path d="M 11 204 L 11 206 L 14 206 L 14 204 z"/>
-<path d="M 142 207 L 139 212 L 139 213 L 148 213 L 144 207 L 142 207 M 165 207 C 166.502 211.273 169.966 210.787 174 211.285 C 182.839 212.375 191.225 214.866 200 216 L 199 211 C 193.371 210.95 183.182 206.214 179 211 L 171 210 L 171 209 L 173 209 z"/>
-<path d="M 153 208 L 156 216 z"/>
-<path d="M 80 220 L 81 223 L 85 220 z"/>
-<path d="M 72 222 L 69 227 L 77 228 L 75 225 L 78 224 C 78.6916 227.228 80.1009 227.02 83 226 L 83 225 L 79 226 C 77.7774 222.313 75.6916 222.12 72 222 z"/>
-<path d="M 152 224 L 158 231 L 158 229 L 177 241 L 169 235 L 169 233 C 172.567 232.794 175.738 233.361 177 237 L 179 235 L 182 236 L 182 234 L 186 238 L 181 237 L 181 238 L 185 239 L 183 242 L 189 243 L 186 239 L 194 241 L 195 237 L 189 236 L 189 235 L 194 234 L 186 229 L 185 229 L 184 229 L 169 229 L 166 223 L 163 223 L 162 226 z"/>
-<path d="M 33 233 L 33 234 L 47 234 z"/>
-<path d="M 109 240 L 109 244 L 113 244 L 113 248 C 115.021 243.993 113.026 241.247 109 240 z"/>
-<path d="M 42 250 L 45 247 L 45 246 L 40 244 L 41 248 L 33 248 L 33 249 L 41 249 L 26 255 L 26 256 L 37 257 L 37 263 L 31 264 L 31 265 C 37.3001 265.004 43.7364 266.6 50 265.815 C 55.6485 265.107 59.3881 261.084 64 266 L 65 266 L 63 251 L 58 250 L 54 254 L 54 255 L 56 257 L 61 257 C 57.0555 262.092 48.9643 266.189 45 259 L 48 260 L 40 255 L 40 254 L 57.9861 247.233 L 70 250 L 70 248 C 58.6928 241.573 53.1836 246.848 42 250 z"/>
-<path d="M 189 254 L 179 255 C 182.758 259.512 187.595 259.598 193 258 z"/>
-<path d="M 15 262 L 15 263 L 21 263 L 21 264 L 16 264 L 16 267 L 22 265 L 22 268 L 28 261 L 22 262 L 22 261 L 25 260 z"/>
-<path d="M 206 259 L 206 261 L 210 261 L 210 259 z"/>
-<path d="M 162 261 L 162 262 L 167 263 z"/>
-<path d="M 0 263 L 0 264 L 3 265 L 0 266 C 0.00534745 272.92 0.477381 275.911 8 276 L 8 277 L 6 277 L 6 278 L 12 277 L 12 276 L 3 272 L 6 268 L 12 269 C 9.26099 264.931 4.70307 263.704 0 263 z"/>
-<path d="M 234 265 C 235.057 268.492 236.418 269.432 240 270 L 240 269 z"/>
-<path d="M 183 266 C 180.084 270.623 175.619 269.184 171 268 L 170 270 L 177 274 L 177 275 L 174 277 L 178 274 L 189 277 L 190 275 L 189 273 L 191 272 z"/>
-<path d="M 163 268 L 166 271 L 166 268 z"/>
-<path d="M 225 269 L 225 273 L 221 273 L 221 274 C 228.376 278.353 230.934 282.465 240 283 L 240 281 C 231.705 280.437 230.155 274.22 225 269 z"/>
-<path d="M 160 277 L 153 277 L 153 278 L 156 277 L 155 281 L 166 281 L 169 285 L 171 278 z"/>
-<path d="M 215 276 L 215 277 L 221 287 C 217.886 287.545 220.146 290.788 222 292 L 222 288 L 225 290 L 226 285 C 222.633 280.528 220.959 276.671 215 276 z"/>
-<path d="M 43 289 L 50.2994 296.968 L 63 295 L 63 301 L 67 300 L 67 299 L 61 293 L 61 292 L 65 292 L 65 291 C 59.0547 288.867 52.9902 294.484 49 288 L 53 285 C 48.7452 285.047 45.4025 285.193 43 289 z"/>
-<path d="M 188 287 L 192 291 z"/>
-<path d="M 203 288 L 203 291 L 207 291 L 206 289 L 211 289 z"/>
-<path d="M 0 298 L 0 299 L 4 299 z"/>
-<path d="M 215 300 C 210.677 307.828 203.994 303.146 197 304 L 197 305 L 200 306 L 197 307 L 197 308 L 213.985 308.557 L 222 316 L 219 311 L 222 311 L 222 310 L 217 308 L 220 304 L 230 307 L 229 309 L 234 309 L 234 311 L 224 310 L 224 312 L 238 314 L 237 311 L 240 312 L 240 307 L 228 306 C 228.032 300.639 219.226 300.018 215 300 M 50 301 L 51 304 L 49 304 L 48 308 L 48 309 L 59 309 z"/>
-<path d="M 147 301 L 147 308 L 157 308 z"/>
-<path d="M 0 308 L 0 315 C 4.20163 313.783 7.21685 312.555 8 308 z"/>
-<path d="M 147 309 L 143 315 L 142 315 L 140 313 L 142 320 L 146 320 L 146 314 L 147 314 L 153 319 L 149 314 z"/>
-</g>
-<g stroke="none" fill="#cd759b">
-<path d="M 174 14 C 181.963 10.3671 185.607 12.9321 194 14 L 190 11 L 190 10 L 202 11 L 202 10 L 200 9 L 204 8 L 209 10 C 205.69 5.31543 199.706 7.67761 195 9 L 196 6 C 188.785 6 174.743 4.45984 174 14 z"/>
-<path d="M 218 25 L 218 26 L 223 27 L 223 28 L 212 31 L 204 30 L 204 32 L 211 33 L 211 34 L 204 34 L 211 37 L 211 41 L 216 41 L 217 32 L 222 34 C 226.451 29.4546 234.03 31 240 31 L 240 26 L 225 27 L 226 24 z"/>
-<path d="M 160 26 L 156 29 L 157 35 L 158 35 z"/>
-<path d="M 220 41 L 220 42 L 224 42 z"/>
-<path d="M 143 66 L 144 69 L 139 75 L 136 69 L 133 68 L 131 72 L 134 72 L 134 73 L 123 74 L 123 75 L 131 75 L 131 83 L 125 86 L 126 90 L 130 90 L 130 91 L 128 94 L 123 94 L 123 95 L 131 93 L 140 94 L 144 96 L 144 97 C 138.909 97.0034 132.932 96.3648 131 102 L 143 100 L 153 99 L 155 72 L 151 72 L 151 71 L 156 71 L 156 66 L 151 66 L 152 69 L 148 65 z"/>
-<path d="M 157 73 L 157 76 L 159 73 z"/>
-<path d="M 50 81 L 52 87 L 58 87 L 59 86 L 57 76 z"/>
-<path d="M 100 127 L 100 128 L 106 127 z"/>
-<path d="M 177 131 L 177 132 L 184 132 z"/>
-<path d="M 62 134 L 62 135 L 66 135 z"/>
-<path d="M 194 151 L 194 152 L 221 154 C 213.522 148.682 202.652 150.994 194 151 z"/>
-<path d="M 196 154 L 199 159 L 203 159 L 203 160 L 188 157 L 188 158 L 190 158 L 190 159 L 183 159 L 183 160 L 187 160 L 185 163 L 203 164.104 L 220.945 166.471 L 226 162 L 207 161 L 207 162 L 209 162 L 209 163 L 202 163 L 207 157 L 211 157 L 211 156 z"/>
-<path d="M 173 167 L 173 166 L 169 163 L 178 160 L 164 161 L 164 160 L 168 159 L 168 158 L 165 159 L 165 157 C 148.891 159.313 165.058 166.765 173 167 z"/>
-<path d="M 206 166 L 211 169 z"/>
-<path d="M 16 168 L 16 169 L 22 169 z"/>
-<path d="M 179 168 L 182 170 z"/>
-<path d="M 195 174 L 195 175 L 202 176 L 202 174 z"/>
-<path d="M 237 175 L 237 177 L 240 177 L 240 175 z"/>
-<path d="M 208.667 178.333 L 209.333 178.667 L 208.667 178.333 z"/>
-<path d="M 143 183 L 143 184 L 148 186 L 148 183 z"/>
-<path d="M 156 184 L 161 186 L 161 185 z"/>
-<path d="M 195 194 L 195 195 L 205 197 z"/>
-<path d="M 46 212 L 46 213 L 50 211 z"/>
-<path d="M 68 221 L 68 222 L 80 221 z"/>
-<path d="M 178 312 L 178 313 L 183 313 z"/>
-</g>
-<g stroke="none" fill="#f599ae">
-<path d="M 127 9 C 126.477 11.5401 126.405 11.6855 129 12 L 129 13 L 126 13 L 126 14 L 133 11 z"/>
-<path d="M 95 16 L 101 16 L 101 17 L 96 18 L 96 19 L 98 19 L 98 20 L 93 20 L 103 24 L 108 23 L 108 21 L 103 21 L 103 20 L 105 18 L 102 18 L 102 16 L 107 16 C 103.624 12.5522 97.8937 11.5365 95 16 z"/>
-<path d="M 137 15 L 137 16 L 141 18 L 133 18 L 124 20 L 124 21 C 132.936 23.8269 122.666 30.4106 123 36 L 118 37 L 117 37 L 119 32 L 119 31 L 111 33 C 110.418 36.1332 109.441 38.2336 113 39 L 113 40 L 110 40 L 110 41 L 114 41 L 111 45 L 110 45 L 108 43 L 102 46 L 102 47 L 106 47 L 106 48 L 103 48 L 104 51 L 100 50 L 93 58 L 93 53 L 92 53 L 92 58 L 89 59 C 90.7213 64.2918 91.125 68.1916 85 70 L 85 69 C 89.3591 63.7439 83.8511 55.5599 93 51 L 88 47 L 88 46 L 91 45 L 90 34 L 89 34 L 79.0764 58 L 82.9066 75 L 81 99 L 82 99 L 85 88 L 86 88 L 84 109 L 85 109 L 85 105 C 89.4349 106.177 91.4375 104.565 95 102 L 95 101 L 92 98 L 91 98 L 88 104 L 89 99 L 87 102 L 86 102 L 91 96 L 92 91 L 89 79 L 102 81 L 102 82 L 97 82 L 97 83 L 108 83 L 107 81 L 116 81 L 116 80 L 117 75 L 121 77 L 119 81 L 123 81 L 118 84 L 119 88 L 122 87 L 116 93 L 116 94 L 128 94 L 130 91 L 130 90 L 126 90 L 125 86 L 131 83 L 131 75 L 123 75 L 123 74 L 134 73 L 131 72 L 133 68 L 136 69 L 139 75 L 144 69 L 145 66 L 145 65 L 143 62 L 146 63 L 147 59 L 135 60 L 135 61 L 142 61 C 139.672 65.7808 134.411 64.0592 130 63 L 130 65 L 127 62 L 115 67 L 114 67 C 111.668 60.3744 104.55 64.4982 101 68 L 110 72 L 110 73 L 98 75 L 95 78 L 95 79 L 97 79 L 97 80 L 92 79 L 94 76 L 91 75 L 91 73 L 99 69 L 99 68 L 96 65 L 100 65 L 99 58 L 102 65 L 103 65 L 105 62 L 105 55 L 121 53 L 121 54 L 114 54 L 121 57 L 125 59 L 125 56 L 129 56 L 128 58 L 140 58 L 140 57 L 132 56 L 132 55 C 137.095 54.3555 145.835 51.1934 150 55 L 151 55 L 157 50 L 158 36 L 144 35 L 144 34 L 146 31 L 138 31 L 138 30 L 143 28 L 143 27 L 133 27 L 133 26 L 139 26 L 136 23 L 136 22 L 140 21 L 141 25 L 142 25 L 145 18 z"/>
-<path d="M 93 27 L 94 34 L 104 33 L 104 31 L 99 31 L 99 30 L 104 30 L 104 29 L 97 29 L 97 28 L 99 28 L 99 27 L 96 29 L 95 29 z"/>
-<path d="M 112 57 L 113 59 L 112 59 L 106 63 L 114 59 L 118 60 L 118 59 z"/>
-<path d="M 110 86 L 115 85 z"/>
-<path d="M 106 98 L 109 96 z"/>
-<path d="M 87 118 L 85 124 L 90 126 L 92 125 C 91.8629 120.824 91.3619 118.728 87 118 z"/>
-<path d="M 94 122 L 94 123 L 94 128 L 106 126 C 106.593 129.579 114.781 128.989 118 129 L 118 128 L 127 119 L 105.09 119.13 z"/>
-</g>
-<g stroke="none" fill="#914e8e">
-<path d="M 94 10 L 91 16 L 91 17 L 91 18 L 93 20 L 94 20 z"/>
-<path d="M 16 11 L 11 16 L 15 21 z"/>
-<path d="M 158 80 L 158 84 L 161 81 z"/>
-<path d="M 158 85 L 154 88 L 153 99 L 150 100 L 152 109 L 153 109 L 156 90 L 158 92 L 159 92 L 161 88 L 161 87 L 160 85 z"/>
-<path d="M 37 115 L 38 119 L 31 120 L 31 115 C 26.8631 115.003 22.582 114.346 20 118 L 0 116 L 0 122 L 25 122 L 23 127 L 26 132 L 12 132 L 12 129 L 11 132 L 8 131 L 1 134 L 3 137 L 15 134 L 15 135 L 5 138 L 5 139 L 14 139 L 14 140 L 11 140 L 11 141 L 15 145 L 16 145 L 29 138 L 17 137 L 17 136 L 25 134 L 27 136 L 27 132 L 50 129 L 48 134 L 48 135 L 54 135 L 54 134 L 51 133 L 51 131 L 58 126 L 69 125 L 74 120 L 71 117 L 73 115 L 73 114 L 54 113 L 54 114 L 61 116 L 62 119 L 59 120 L 56 117 L 56 118 L 58 120 L 46 118 L 48 116 L 45 115 L 45 114 L 53 114 z"/>
-<path d="M 58 128 L 57 132 L 70 132 L 70 129 z"/>
-<path d="M 73 129 L 73 130 L 85 130 L 85 128 z"/>
-<path d="M 100 135 L 100 136 L 104 137 L 105 133 z"/>
-<path d="M 108 146 L 107 151 L 106 148 L 103 150 L 85 149 L 85 150 L 97 154 L 91 154 L 92 157 L 88 161 L 86 159 L 73 162 L 73 163 L 83 163 L 83 164 L 80 166 L 85 168 L 85 166 L 88 167 L 93 164 L 93 163 L 89 163 L 89 162 L 102 154 L 105 164 L 99 163 L 97 174 L 94 173 L 97 175 L 93 181 L 95 183 L 95 189 L 96 189 C 96.1254 185.122 96.5017 182.928 100 181 L 100 186 L 110 183 L 111 187 L 112 187 L 110 179 L 108 181 L 107 181 L 107 177 L 106 177 L 103 180 L 105 176 L 103 178 L 102 178 L 102 173 L 101 173 L 100 176 L 99 176 L 98 171 L 100 169 L 105 174 L 106 174 L 109 165 L 107 154 C 111.578 157.659 114.392 157.237 120 157 L 113 152 L 116 146 z"/>
-<path d="M 120 146 L 120 147 L 131 148 z"/>
-<path d="M 60 149 L 63 151 L 62 148 z"/>
-<path d="M 0 155 L 0 159 L 3 158 z"/>
-<path d="M 46 167 L 46 168 L 50 167 C 53.9988 168.149 59.1345 168.406 62 165 L 71 164 C 63.737 161.766 52.8594 164.205 46 167 z"/>
-<path d="M 211 175 L 221 179 L 221 180 L 215 180 L 215 181 L 225 182 L 225 181 L 222 180 L 224 177 z"/>
-<path d="M 33.6667 182.333 L 34.3333 182.667 L 33.6667 182.333 z"/>
-<path d="M 82 184 L 82 186 L 84 186 L 84 184 z"/>
-<path d="M 223 184 L 221 187 L 221 188 L 229 188 L 229 187 z"/>
-<path d="M 105 185 L 101 188 C 103.913 189.604 106.153 188.386 105 185 z"/>
-<path d="M 86 188 L 86 189 L 90 189 z"/>
-<path d="M 58 200 L 58 202 L 60 202 z"/>
-<path d="M 85 204 L 85 205 L 87 206 L 77 206 L 77 207 L 93 210 L 99 205 L 99 204 L 90 205 L 91 200 z"/>
-<path d="M 26 201 L 23 202 L 23 203 z"/>
-<path d="M 58 203 L 51 213 L 58 210 L 56 213 L 63 211 L 63 210 L 59 207 L 63 206 L 73 207 L 67 203 C 67 206.567 63.4764 203.283 61 203 L 61 204 L 63 204 L 63 205 z"/>
-<path d="M 146 206 L 148 213 L 139 213 L 140 211 L 139 211 L 133 213 L 133 214 L 152 214 C 151.054 210.859 150.292 209.931 147 210 L 148 206 z"/>
-<path d="M 13 209 L 13 216 L 17 216 C 18.2872 219.651 20.4181 219.665 24 219 L 24 218 L 14 215 L 14 213 L 30 220 L 29 213 C 25.8869 213 21.5498 213.753 21 210 z"/>
-<path d="M 236 209 C 236.123 212.714 236.424 214.563 240 216 L 240 209 z"/>
-<path d="M 77.6667 213.333 L 78.3333 213.667 L 77.6667 213.333 z"/>
-<path d="M 92 215 L 90 220 L 91 220 z"/>
-<path d="M 41 226 L 41 227 L 51 227 z"/>
-<path d="M 63 227 L 63 228 L 66 228 z"/>
-<path d="M 198 227 L 198 228 L 209 234 L 215 235 L 211 232 L 212 230 z"/>
-<path d="M 42 231 L 42 232 L 52 232 L 55 235 L 66 231 z"/>
-<path d="M 34 232 L 34 233 L 38 233 z"/>
-<path d="M 28 238 L 28 239 L 36 239 z"/>
-<path d="M 56.3333 241.667 L 56.6667 242.333 L 56.3333 241.667 z"/>
-<path d="M 165 249 L 170 251 L 177 255 L 177 254 L 174 253 C 173.071 248.614 168.956 248.406 165 249 z"/>
-<path d="M 49 249 L 44 251 L 44 252 C 46.3258 251.872 50.047 251.815 49 249 z"/>
-<path d="M 187 252 L 190 254 L 190 255 C 199.166 254.277 206.514 254.086 215 258 L 220 251 L 210 250 L 212 253 C 205.702 251.23 191.554 245.554 187 252 z"/>
-<path d="M 150 254 L 151 269 L 158 267 L 156 265 L 157 262 z"/>
-<path d="M 220 256 L 220 261 C 224.435 260.816 230.24 264.086 233 260 z"/>
-<path d="M 65 264 C 69.2077 263.95 71.7095 263.734 74 260 z"/>
-<path d="M 150 263 L 150 266 L 151 266 z"/>
-<path d="M 156 269 L 156 270 C 160.43 274.053 163.772 276.603 170 277 L 170 276 L 167 276 L 167 275 L 173 275 L 172 270 L 172 269 L 165 269 L 160 272 z"/>
-<path d="M 54 295 L 54 296 L 59 295 z"/>
-<path d="M 173 295 L 173 296 L 178 297 z"/>
-<path d="M 168 296 L 179 300 z"/>
-<path d="M 55 300 L 57 302 L 55 302 L 57 305 L 61 303 L 60 299 z"/>
-<path d="M 148 303 C 154.417 303.362 161.318 309.012 165 314 L 171 316 L 174 314 L 190 317 L 190 316 L 178 313 L 178 312 L 182 312 L 182 311 L 167 310 C 163.982 305.729 152.508 298.067 148 303 z"/>
-<path d="M 39 314 L 39 315 L 42 316 L 34 319 L 34 320 L 45 318 L 43 314 z"/>
-</g>
-<g stroke="none" fill="#934a7a">
-<path d="M 206 10 L 206 11 L 208 13 L 209 13 z"/>
-<path d="M 59 43 L 64 54 L 61 56 L 61 57 L 64 60 L 55 59 L 54 59 L 52 61 L 52 62 L 54 65 C 50.973 63.0785 51.0981 61.3533 52 58 L 48 51 L 47 51 L 48 56 L 39 55 C 40.5535 57.5226 48.4934 58.2272 44 61 L 44 62 L 46 64 L 38 64 L 35 67 L 35 68 L 53 66 L 53 67 L 47 67 L 47 68 L 55 67 L 56 67 L 58 88 L 63 88 L 66 89 L 63 96 L 65 99 L 64 102 L 66 102 L 65 106 C 71.3924 105.705 69.5946 99.7088 69 95 L 74 95 L 73 92 L 77 91 L 80 98 L 81 98 L 81 90 L 80 90 L 80 93 L 79 93 L 69 84 L 78 87 L 81 83 L 81 88 L 82 88 C 83.528 75.91 82.8716 54.3042 71 47 L 72 58 L 69.463 49.0548 z"/>
-<path d="M 15 48 L 15 49 L 27 50 L 27 47 z"/>
-<path d="M 30 58 C 25.7817 61.2301 19.8265 61.0546 23 68 C 14.8804 68 18.0151 74.4962 16 75 L 16 76 L 20 76 L 20 77 L 6 78 L 10 81 L 9 83 C 11.6598 84.0003 28.0059 86.1898 21 80 L 21 79 C 26.4402 77.7216 35.8194 77.9213 36 71 L 30 73 C 27.6677 69.4024 23.9871 70.0031 20 70 L 20 69 L 34 69 L 36 61 L 35 59 z"/>
-<path d="M 181 67 L 181 68 L 187 68 z"/>
-<path d="M 156 90 L 155 105 L 158 104 L 158 90 z"/>
-<path d="M 40 95 L 43 105 L 43 106 L 39 106 L 39 108 C 45.834 107.995 48.8194 107.445 49 100 L 41 101 L 45 98 L 45 97 L 41 97 L 41 96 L 44 96 z"/>
-<path d="M 74.3333 111.667 L 74.6667 112.333 L 74.3333 111.667 z"/>
-<path d="M 127 119 L 125 122 L 125 123 L 130 120 z"/>
-<path d="M 85 124 L 85 125 L 86 128 L 90 128 z"/>
-<path d="M 49 132 L 35 136 C 37.5138 139.423 49.7503 136.231 49 132 M 89 132 L 87 134 L 93 136 L 93 137 L 87 144 L 94 142 L 95 135 z"/>
-<path d="M 145.667 134.333 L 146.333 134.667 L 145.667 134.333 z"/>
-<path d="M 137 135 C 137.866 137.967 138.992 138.287 142 138 z"/>
-<path d="M 139 140 L 136 142 L 136 143 L 139 143 L 139 144 L 133 145 L 135 141 C 131.355 143.094 131.975 145.295 136 146 L 136 147 L 134 147 L 134 148 L 139 148 L 139 147 L 137 146 L 140 147 L 141 147 L 141 140 z"/>
-<path d="M 121 152 L 126 158 L 126 159 L 120 159 C 120.588 162.403 121.649 163.272 125 164 L 124 168 L 134 162 L 128 163 L 131 158 L 130 156 L 132 154 L 121 152 M 153 152 L 149 154 L 152 157 L 151 161 L 148 162 L 146 165 L 143 172 L 137 166 L 138 172 L 149 177 L 147 185 L 150 185 L 150 189 L 151 189 L 152 177 L 158 180 L 158 174 L 164 175 C 160.197 170.531 153.765 170.671 158 163 L 154 157 L 157 158 L 157 154 z"/>
-<path d="M 145 154 L 146 156 L 147 156 L 148 154 z"/>
-<path d="M 63 156 L 63 157 L 66 157 z"/>
-<path d="M 132.667 157.333 L 133.333 157.667 L 132.667 157.333 z"/>
-<path d="M 0 162 L 3 169 L 10 167 L 9 162 C 6.05015 162.983 5.37827 163.487 6 161 z"/>
-<path d="M 89 170 L 82 173 L 82 174 L 86 177 L 92 171 z"/>
-<path d="M 21 171 L 21 176 L 22 176 L 25 176 L 26 173 z"/>
-<path d="M 181 173 L 190 176 z"/>
-<path d="M 36 178 L 36 179 L 38 180 L 39 180 L 47 178 z"/>
-<path d="M 10 180 L 13 182 z"/>
-<path d="M 15 184 L 9 183 L 12 190 L 15 185 L 23 182 C 20.1199 180.612 15.5122 180.296 15 184 z"/>
-<path d="M 144 184 L 140 191 C 143.065 189.471 145.775 187.447 144 184 z"/>
-<path d="M 18 188 L 18 189 L 25 189 z"/>
-<path d="M 238 193 L 236 198 L 236 199 L 240 200 L 240 193 z"/>
-<path d="M 177 202 C 180.008 206.912 191.394 206.845 197 208 L 197 209 L 194 209 L 194 210 L 204 210 C 195.85 204.108 186.799 202 177 202 z"/>
-<path d="M 135 203 L 137 205 L 137 203 z"/>
-<path d="M 214 209 C 214.14 212.908 210.18 213 207 213 L 207 212 L 210 212 L 210 211 L 204 212 L 206 213 L 206 214 L 201 214 L 201 215 C 208.729 219.051 214.884 217.453 223 216 L 223 209 z"/>
-<path d="M 164 217 L 165 220 L 164 224 L 184 231 L 184 226 L 169 224 L 176 222 L 176 221 L 169 221 L 173 219 L 173 218 z"/>
-<path d="M 80 219 L 80 220 L 85 219 z"/>
-<path d="M 6 219 L 6 224 L 21 227 L 21 223 z"/>
-<path d="M 205 220 C 207.214 223.405 209.243 225.388 213 223 L 216 226 L 214 231 L 221 231 L 221 227 L 214 220 z"/>
-<path d="M 26 222 L 26 223 L 35 224 z"/>
-<path d="M 24 232 L 27 234 z"/>
-<path d="M 215 235 L 211 234 L 214 241 L 220 240 L 220 239 C 215.984 236.742 217.058 234.465 221 233 C 218.238 231.409 215.714 231.669 215 235 z"/>
-<path d="M 5 236 C 8.51422 240.022 18.9092 238 24 238 L 24 237 z"/>
-<path d="M 152 244 L 153 252 L 153 253 L 162 252 L 162 251 L 159 250 L 159 249 L 164 249 L 152 244 M 18 245 L 18 246 L 20 249 L 21 249 L 21 245 z"/>
-<path d="M 49 252 L 49 253 L 57 254 z"/>
-<path d="M 195 255 L 195 256 L 199 260 L 203 258 z"/>
-<path d="M 195 278 L 195 279 L 211 280 L 212 285 L 208 286 L 208 284 L 203 286 L 203 287 L 211 288 L 211 289 L 206 289 L 206 290 C 213.198 293.599 218.471 286.368 221 287 L 219 278 z"/>
-<path d="M 20 284 L 20 285 L 42 286 z"/>
-<path d="M 149 307 L 149 314 L 154 316 L 153 311 L 158 315 L 163 314 L 163 313 L 151 307 z"/>
-<path d="M 146 314 L 146 320 L 153 320 L 153 319 z"/>
-<path d="M 223 319 L 223 320 L 229 320 z"/>
-</g>
-<g stroke="none" fill="#61264f">
-<path d="M 208 13 L 208 17 L 209 17 z"/>
-<path d="M 0.666667 23.3333 L 1.33333 23.6667 L 0.666667 23.3333 z"/>
-<path d="M 66 27 L 66 30 L 67 30 L 68 27 z"/>
-<path d="M 86 31 L 86 36 L 85 36 L 81 33 L 84 35 L 82 43 C 87.46 41.2477 87.9432 36.1474 88 31 z"/>
-<path d="M 65 40 L 63 42 L 63 43 L 67 45 z"/>
-<path d="M 66 77 L 66 78 L 73 81 L 76 85 L 75 81 L 78 83 L 72 77 L 73 79 L 72 79 z"/>
-<path d="M 73 92 L 73 96 L 76 103 L 80 104 L 77 91 z"/>
-<path d="M 51 99 C 53.8682 101.96 56.0404 101.571 58 98 z"/>
-<path d="M 70 99 L 70 105 L 71 105 z"/>
-<path d="M 221 102 L 223 106 L 222 109 L 228 109 L 227 106 L 231 106 L 230 104 L 236 104 L 236 102 z"/>
-<path d="M 153 107 L 153 111 L 154 111 z"/>
-<path d="M 0 114 L 0 115 L 31 115 L 31 120 L 38 119 L 37 115 L 43 115 C 31.8725 110.331 12.0397 113.753 0 114 z"/>
-<path d="M 128 120 L 128 121 L 134 121 z"/>
-<path d="M 163 120 L 157 127 L 168 124 L 168 123 L 163 123 z"/>
-<path d="M 119 123 L 119 124 L 128 124 z"/>
-<path d="M 6 128 L 0 130 L 0 137 L 4 136 L 1 134 L 8 133 L 8 128 z"/>
-<path d="M 160 130 L 163 135 C 163.494 131.863 163.036 131 160 130 z"/>
-<path d="M 120 132 L 120 133 L 125 132 L 127 134 C 126.159 130.075 123.292 131.115 120 132 z"/>
-<path d="M 6 134 L 11 136 L 11 135 z"/>
-<path d="M 34 135 L 34 136 L 41 135 z"/>
-<path d="M 82 138 L 86 138 L 84 141 C 90.4694 141 83.9825 136.754 87 136 z"/>
-<path d="M 124 137 L 124 138 L 129 138 L 124 137 M 106 141 L 110 138 z"/>
-<path d="M 34 140 L 34 144 L 54 144 L 54 143 L 40 143 L 41 140 z"/>
-<path d="M 99.6667 146.333 L 100.333 146.667 L 99.6667 146.333 z"/>
-<path d="M 13 147 L 16 154 L 15 152 L 16 152 L 24 153 L 26 147 z"/>
-<path d="M 9 160 L 9 161 L 14 161 z"/>
-<path d="M 89 163 L 92 163 L 91 161 z"/>
-<path d="M 0.666667 175.333 L 1.33333 175.667 L 0.666667 175.333 z"/>
-<path d="M 130 176 L 130 177 L 135 177 z"/>
-<path d="M 152 177 L 151 201 L 152 201 L 152 192 L 155 198 L 159 198 L 159 197 L 156 196 L 155 181 L 157 182 L 158 182 z"/>
-<path d="M 53 193 C 57.5273 197.623 64.4258 196.088 70 194 z"/>
-<path d="M 220 204 L 214 206 L 214 207 L 225 209 L 224 205 z"/>
-<path d="M 227 204 L 227 205 L 231 205 L 227 204 M 33 205 L 33 206 L 37 206 z"/>
-<path d="M 81 209 L 81 210 L 83 212 L 84 212 L 88 209 z"/>
-<path d="M 125 214 L 128 215 L 129 215 L 138 212 C 134.049 208.614 127.841 209.591 125 214 z"/>
-<path d="M 191 210 L 191 211 C 194.821 211 198.756 209.977 198 213 L 207 211 z"/>
-<path d="M 135 214 L 135 215 L 144 217 C 143.096 212.783 138.644 214 135 214 z"/>
-<path d="M 146 221 L 145 231 L 149 232 L 149 234 L 146 235 C 147.958 240.066 151.059 246.982 148 252 C 149.203 257.053 149.886 263.485 147 268 L 147 269 L 147 270 L 149 274 L 150 274 L 150 271 L 153 271 L 150 254 L 151 254 L 157 260 L 158 257 L 153 252 L 155 252 L 150 238 L 150 228 L 151 228 L 154 230 L 152 224 L 156 222 L 152 214 z"/>
-<path d="M 24 218 L 24 219 L 29 221 z"/>
-<path d="M 59 228 L 59 229 L 69 228 z"/>
-<path d="M 45 232 L 45 233 L 49 234 L 47 237 L 64 234 L 64 233 L 55 235 L 52 232 z"/>
-<path d="M 216 236 L 222 234 L 222 238 L 223 238 L 223 235 L 230 235 C 225.73 231.961 219.261 231.327 216 236 z"/>
-<path d="M 140 243 L 140 244 L 145 243 z"/>
-<path d="M 0 252 L 0 254 L 16 253 z"/>
-<path d="M 220 251 L 215 255 L 218 258 L 218 259 L 207 261 L 207 262 L 218 266 L 213 264 L 206 265 L 206 266 L 213 267 L 213 268 L 205 269 L 204 266 L 198 266 L 198 267 L 203 270 L 189 274 L 192 277 L 193 277 L 208 275 L 207 273 L 215 273 L 212 269 L 217 269 L 218 273 L 219 273 L 219 263 L 225 267 L 233 267 L 234 267 L 234 261 L 220 261 L 220 255 L 224 255 L 223 251 z"/>
-<path d="M 68 258 L 68 259 L 76 259 z"/>
-<path d="M 46 262 L 46 263 C 49.7675 263 55.0544 264.413 56 260 z"/>
-<path d="M 3 263 L 3 264 L 8 265 z"/>
-<path d="M 183.667 263.333 L 184.333 263.667 L 183.667 263.333 z"/>
-<path d="M 32 269 L 21 268 L 21 269 L 22 272 C 27.4512 272 35.778 269.791 39 275 L 40 275 L 40 272 L 48 269 C 43.6169 267.924 35.2991 265.225 32 269 z"/>
-<path d="M 68 272 L 65 276 L 63 280 C 62.1969 275.182 53.7142 279.033 52 282 L 57 281 L 73 280 L 79 279 L 79 278 L 74 276 L 69 277 z"/>
-<path d="M 155 272 L 156 276 L 160 275 L 159 272 z"/>
-<path d="M 31 277 L 31 278 L 49 277 z"/>
-<path d="M 144 280 L 145 284 L 144 284 L 142 282 L 153 289 C 152.863 286.084 152.983 284.37 150 284 C 149.809 279.876 147.814 279.572 144 280 M 196 279 L 197 283 L 203 280 z"/>
-<path d="M 234 280 L 234 281 L 239 281 z"/>
-<path d="M 10 286 C 10.2027 290.498 12.7935 291.53 17 292 z"/>
-<path d="M 20 288 L 20 290 L 24 290 L 24 288 z"/>
-<path d="M 195 289 L 195 293 L 209 294 L 203 291 L 204 289 z"/>
-<path d="M 20 298 L 21 306 L 37 303 L 37 302 L 32 301 L 33 298 z"/>
-<path d="M 50 300 L 50 301 L 57 302 L 57 301 z"/>
-<path d="M 221 313 L 222 320 L 238 320 L 238 319 L 224 313 z"/>
-</g>
-<g stroke="none" fill="#936ca7">
-<path d="M 14 37 L 15 48 L 27 46 L 28 39 L 21 38 L 19 41 L 16 37 z"/>
-<path d="M 60 127 L 60 128 L 70 128 z"/>
-<path d="M 34 136 L 28 141 L 28 142 L 34 144 L 34 140 L 42 140 L 42 139 L 34 136 M 60 141 L 60 142 L 63 142 L 62 145 L 64 147 L 80 147 C 70.9892 138.609 71.2495 135.177 60 141 z"/>
-<path d="M 49 142 L 49 143 L 56 143 z"/>
-<path d="M 47 144 L 47 145 L 49 145 L 49 146 L 38 146 L 38 147 L 53 151 L 53 150 L 50 150 L 50 149 L 59 149 L 59 148 L 54 148 L 54 144 z"/>
-<path d="M 24 151 L 23 155 L 29 154 L 29 153 z"/>
-<path d="M 40 157 L 40 158 L 47 158 L 47 159 L 28 159 L 29 162 L 18 167 L 18 168 C 21.6522 168.399 26.9684 171.79 28 167 L 25 168 L 25 164 L 40 162 L 40 161 L 32 161 L 32 160 L 51 160 L 51 157 L 60 158 L 62 156 z"/>
-<path d="M 117 163 L 118 167 L 121 166 L 121 164 z"/>
-<path d="M 137 167 L 134 168 L 138 172 z"/>
-<path d="M 202 174 L 196 176 L 196 178 L 207 177 z"/>
-<path d="M 229 182 L 229 183 L 233 181 z"/>
-<path d="M 39 183 L 39 184 L 44 184 L 39 183 M 52 183 L 52 184 L 70 184 L 69 187 L 75 183 z"/>
-<path d="M 93 193 L 89 195 C 92.0594 198.894 91.8903 200.538 90 205 L 96 204 L 103 201 L 100 210 L 101 210 L 100 206 L 102 208 L 103 208 L 104 197 L 100 199 L 96 195 L 93 198 L 99 191 C 96.3977 189.482 91.3977 188.669 93 193 z"/>
-<path d="M 135.667 200.333 L 136.333 200.667 L 135.667 200.333 z"/>
-<path d="M 111 206 L 116 219 L 126 223 L 114 210 L 119 213 z"/>
-<path d="M 83 213 L 88 212 C 85.6008 210.292 84.7195 210.656 83 213 z"/>
-<path d="M 144 214 L 147 217 L 148 221 z"/>
-<path d="M 137 216 L 137 217 L 141 217 z"/>
-<path d="M 97 217 L 96 223 L 97 223 L 100 221 z"/>
-<path d="M 52 221 L 52 222 L 61 221 z"/>
-<path d="M 98 223 L 96 228 L 95 228 L 88 227 L 88 228 L 95 229 L 95 230 L 92 232 L 96 233 L 97 230 L 98 233 C 101.575 230.614 100.164 226.897 100 223 z"/>
-<path d="M 62 224 L 62 225 L 70 225 z"/>
-<path d="M 86 226 L 87 229 z"/>
-<path d="M 0 233 C 2.35763 238.388 5.45486 238.98 11 239 L 11 240 L 9 240 L 9 241 L 14 242 L 16 238 z"/>
-<path d="M 86 244 L 84 256 C 79.099 257.187 75.6519 257.312 73 262 L 81 261 L 88 252 L 87 247 L 90 246 z"/>
-<path d="M 0 247 L 0 252 L 11 252 L 12 250 L 12 249 L 5 247 z"/>
-<path d="M 42 255 L 42 256 L 56 254 z"/>
-<path d="M 0 258 L 0 259 C 3.8778 260.37 5.92634 261.127 9 258 z"/>
-<path d="M 176 262 C 178.594 265.579 181.262 264.575 185 263 L 189 268 L 196 270 L 196 271 L 203 270 C 198.89 265.505 193.835 265.017 188 265 L 189 262 z"/>
-<path d="M 219 263 L 218 275 L 203 275 L 202 277 L 202 278 L 218 278 L 218 277 L 215 277 L 215 276 L 238 288 L 238 286 L 221 274 L 221 273 L 225 273 L 225 269 L 226 269 C 227.906 273.393 230.201 275.454 235 276 L 235 277 L 232 277 L 240 281 L 229 268 L 240 273 L 233 264 L 225 267 z"/>
-<path d="M 204 265 L 205 269 L 213 268 z"/>
-<path d="M 174 269 L 183 269 L 183 266 z"/>
-<path d="M 7 272 L 7 273 L 21 270 z"/>
-<path d="M 49 271 L 49 272 C 55.7371 273.307 64.8825 277.421 69 270 z"/>
-<path d="M 8 278 L 8 279 L 16 279 L 16 280 L 14 282 L 9 284 L 34 277 L 34 276 L 32 275 L 39 274 C 32.9606 266.102 14.844 274.908 8 278 z"/>
-<path d="M 57 283 L 57 284 C 64.7059 284.939 76.0061 288.384 81 280 L 72 282 C 70.6968 275.918 61.1618 282.143 57 283 z"/>
-<path d="M 46 280 L 46 281 L 56 283 L 46 280 M 59 280 L 59 281 L 62 281 z"/>
-<path d="M 198 282 L 198 283 L 211 282 L 211 280 z"/>
-<path d="M 20 285 L 24 290 L 20 290 L 20 291 L 31 291 C 33.8711 286.444 38.5108 287.135 43 289 C 41.7933 283.369 25.1082 285 20 285 z"/>
-<path d="M 49 290 L 56 289 z"/>
-<path d="M 10 298 L 8 305 L 12 305 L 12 304 L 9 303 L 9 302 L 20 301 L 20 308 L 23 307 L 21 299 z"/>
-<path d="M 45 301 L 28 303 L 28 304 L 47 304 L 48 304 L 48 299 z"/>
-<path d="M 156 319 L 156 320 L 160 320 z"/>
-</g>
-<g stroke="none" fill="#713b69">
-<path d="M 77 38 L 79 44 L 80 44 z"/>
-<path d="M 62 41 L 61 45 L 65 45 z"/>
-<path d="M 60 70 C 59.107 74.8137 60.4501 76.491 65 78 L 65 74 L 62 70 z"/>
-<path d="M 79 83 L 78 87 L 74 87 L 74 88 L 79 93 L 80 93 L 81 83 z"/>
-<path d="M 71 117 L 74 120 L 67.7778 124.389 L 51 131 L 51 133 L 71 134 L 71 133 L 57 132 C 61.7484 122.952 74.7953 129.306 83 128 L 83 127 L 77 122 L 74 123 L 77 118 L 76 114 z"/>
-<path d="M 162 114 L 162 116 L 164 116 L 164 114 z"/>
-<path d="M 14 122 L 15 126 L 10 124 C 10.8824 128.118 14.7029 127.205 18 126 L 17 122 z"/>
-<path d="M 123 132 C 121.185 134.371 116.217 137.973 121 139 L 121 140 L 119 140 L 119 141 L 125 141 L 122 139 L 127 135 L 127 134 L 125 132 z"/>
-<path d="M 106 135 L 106 136 L 113 137 z"/>
-<path d="M 59 147 L 63 146 z"/>
-<path d="M 125 154 L 140 156 L 140 155 L 139 150 L 136 151 C 132.779 146.969 126.444 149.633 125 154 z"/>
-<path d="M 168 150 L 168 151 L 172 151 z"/>
-<path d="M 72 152 L 72 153 L 76 153 z"/>
-<path d="M 19.6667 159.333 L 20.3333 159.667 L 19.6667 159.333 z"/>
-<path d="M 137 162 L 141 164 z"/>
-<path d="M 95 166 L 99 169 L 98 165 z"/>
-<path d="M 127.667 168.333 L 128.333 168.667 L 127.667 168.333 z"/>
-<path d="M 19 173 L 24 170 z"/>
-<path d="M 232 173 L 225 176 L 225 174 L 217 175 L 224 176 L 222 180 L 227 181 L 226 184 L 235 184 z"/>
-<path d="M 141 174 L 136 175 L 136 176 L 142 178 z"/>
-<path d="M 113 175 L 112 181 L 117 181 L 117 180 L 115 175 z"/>
-<path d="M 0 181 L 8 180 L 7 177 C 3.47634 177.372 1.03694 177.335 0 181 z"/>
-<path d="M 200 182 L 201 187 L 212 186 L 212 185 z"/>
-<path d="M 0 183 L 0 191 C 3.6298 189.887 5.34202 188.83 6 185 L 3 183 z"/>
-<path d="M 81 184 L 79 189 C 82.7043 189.98 87.1149 192.284 90 189 L 81 188 z"/>
-<path d="M 135 186 L 136 191 L 137 186 z"/>
-<path d="M 69 188 L 69 189 L 73 189 z"/>
-<path d="M 152 198 L 151 208 L 152 208 z"/>
-<path d="M 63 206 L 59 207 C 60.3122 213.124 69.7365 208.466 74 208 z"/>
-<path d="M 31 214 L 31 215 C 38.3039 218.866 49.9006 216.563 58 216 L 58 214 z"/>
-<path d="M 87 215 L 85 217 L 85 218 C 88.9733 218.338 90.6048 217.119 93 214 z"/>
-<path d="M 138 217 L 138 220 L 145 220 z"/>
-<path d="M 31 222 L 31 223 L 43 223 z"/>
-<path d="M 238 222 L 239 225 L 237 225 L 239 230 L 240 230 z"/>
-<path d="M 168 226 L 169 229 L 171 229 L 172 226 z"/>
-<path d="M 150 228 L 150 238 L 154 239 L 150 228 M 186 230 L 186 231 L 193 233 L 192 230 L 195 230 L 195 228 z"/>
-<path d="M 16 246 L 16 248 L 18 246 z"/>
-<path d="M 69 248 L 79 248 C 75.741 245.534 72.3494 245.712 69 248 z"/>
-<path d="M 144 246 L 144 284 L 145 284 L 144 280 C 148.98 278.916 151.373 273.588 147 270 L 147 269 L 147 268 C 152.423 263.273 146.274 253.113 148 247 z"/>
-<path d="M 159 249 L 159 250 L 173 255 L 170 251 L 165 248 z"/>
-<path d="M 157 253 L 157 254 L 168 258 L 168 257 z"/>
-<path d="M 234 254 L 234 258 L 240 259 L 240 254 z"/>
-<path d="M 0 257 L 0 258 L 5 258 z"/>
-<path d="M 157 258 L 160 265 L 171 266 L 171 267 L 158 267 L 158 268 L 160 272 L 163 268 L 183 266 L 183 265 L 176 262 C 180.234 261.162 186.626 260.029 188 265 L 195 265 L 196 261 L 166 260 L 167 263 L 162 262 L 164 260 z"/>
-<path d="M 45 259 L 45 262 L 48 261 L 48 260 L 45 259 M 64 263 L 74 260 C 70.1015 258.414 66.3228 259.499 64 263 z"/>
-<path d="M 0 264 L 3 266 z"/>
-<path d="M 212 269 L 215 273 L 207 273 L 207 274 L 218 275 L 217 269 z"/>
-<path d="M 173 273 L 173 275 L 167 275 L 167 276 L 170 276 L 170 277 L 167 278 L 171 278 L 175 280 L 175 282 L 169 281 L 169 285 L 166 281 L 157 279 L 157 281 L 163 283 L 163 284 L 159 284 L 159 286 L 178 291 L 175 279 L 178 280 L 174 277 L 177 275 z"/>
-<path d="M 0 275 L 4 286 L 9 285 L 7 287 L 7 288 C 10.5761 286.98 10.1695 285.218 9 282 L 14 282 L 16 280 L 16 279 L 6 278 L 8 277 L 8 276 z"/>
-<path d="M 158 275 L 158 277 L 160 277 L 160 275 z"/>
-<path d="M 229 275 L 230 278 L 235 277 L 235 276 z"/>
-<path d="M 41 277 L 41 280 L 52 281 L 50 279 L 50 278 L 53 277 z"/>
-<path d="M 199 283 L 204 288 L 208 284 L 208 286 L 212 285 L 211 282 L 199 283 M 232 283 L 232 285 L 238 286 L 238 288 L 224 286 C 225.654 290.983 230.475 290 235 290 L 234 292 L 240 292 L 240 283 z"/>
-<path d="M 53 285 L 52 288 L 59 288 L 59 291 L 60 291 L 61 287 z"/>
-<path d="M 144 286 L 144 295 L 145 295 L 146 290 L 147 290 L 148 296 L 149 296 L 148 286 z"/>
-<path d="M 30 295 L 38 296 L 38 297 L 36 298 L 41 298 L 42 296 C 38.0766 293.508 33.3059 290.469 30 295 z"/>
-<path d="M 170 294 L 170 295 L 183 299 C 180.456 293.238 175.587 294.001 170 294 M 233 294 L 233 295 L 238 296 z"/>
-<path d="M 58 296 L 61 303 L 55 303 L 57 307 L 63 306 L 67 301 L 65 306 L 69 306 L 70 302 L 70 301 L 68 299 L 63 301 L 63 295 z"/>
-<path d="M 44 296 L 44 297 L 45 299 L 50 300 L 49 296 z"/>
-<path d="M 165 302 L 165 303 L 175 306 L 183 312 L 183 313 L 188 314 L 187 311 L 190 310 L 190 308 C 186.125 306.872 178.9 301.813 176 305 z"/>
-<path d="M 47 304 L 45 308 L 47 310 L 56 308 L 48 309 z"/>
-<path d="M 91 305 C 93.0109 307.047 94.1599 305.893 96 304 z"/>
-<path d="M 193 306 L 191 310 L 191 311 L 200 313 z"/>
-<path d="M 188 314 L 190 316 L 190 317 L 181 317 C 186.257 322.368 197.91 320 205 320 L 205 319 z"/>
-<path d="M 46 319 L 46 320 L 49 320 z"/>
-</g>
-<g stroke="none" fill="#907ac5">
-<path d="M 6 53 L 6 54 L 12 54 L 12 55 C 6.56889 55.7984 6.05615 59.0058 6 64 L 12 61 L 12 64 L 19 64 L 22 53 z"/>
-<path d="M 38 120 L 38 121 L 44 121 L 44 125 L 40 125 L 39 122 L 37 122 L 37 128 L 48 128 L 54 122 z"/>
-<path d="M 100 154 L 105 164 C 104.764 159.638 103.841 156.358 100 154 z"/>
-<path d="M 129 176 L 136 176 L 135 173 C 133.168 174.374 131.184 176.264 132 173 z"/>
-<path d="M 119.333 180.667 L 119.667 181.333 L 119.333 180.667 z"/>
-<path d="M 0 182 L 0 183 L 2 185 L 7 182 z"/>
-<path d="M 128 227 L 125 230 L 127 234 L 123 234 L 124 237 L 130 235 L 127 238 L 127 239 L 133 239 L 133 240 L 131 240 L 131 241 L 141 242 L 140 238 C 136.06 238 134.494 236.024 135 234 L 131 235 L 128 233 L 131 230 L 131 229 C 129.04 228.347 128.446 228 131 228 z"/>
-<path d="M 145 228 L 142 229 L 143 234 L 144 234 z"/>
-<path d="M 143 240 L 143 241 L 148 241 z"/>
-<path d="M 134 251 L 138 253 C 136.544 255.767 137.322 256.555 140 258 L 143 250 z"/>
-<path d="M 105 252 L 102 269 L 107 270 L 109 268 L 106 263 L 110 264 L 109 252 L 108 252 L 108 260 L 107 260 z"/>
-<path d="M 200 259 L 200 260 L 214 263 L 214 262 z"/>
-<path d="M 138 267 L 138 268 L 143 270 z"/>
-<path d="M 149 275 L 149 280 L 150 280 z"/>
-<path d="M 0 277 L 0 297 L 5 297 L 5 298 L 0 299 L 0 307 L 9 306 L 9 308 C 14.5052 306.689 19.4682 307.825 20 301 L 9 302 L 9 303 L 12 304 L 12 305 L 8 305 L 10 298 L 33.1698 292.885 L 48 295 C 46.9172 288.247 32.799 282.562 31 291 L 20 291 L 20 281 L 10 284 C 12.4595 287.397 15.1475 286.704 19 286 L 15 288 L 17 292 L 7 288 L 9 285 L 4 286 C 4.31246 281.531 5.24442 277.913 0 277 z"/>
-<path d="M 108 281 L 107 286 L 109 290 L 111 290 z"/>
-<path d="M 150.333 282.667 L 150.667 283.333 L 150.333 282.667 z"/>
-<path d="M 137 284 C 134.827 289.692 133.255 305.639 123 298 L 118 299 L 118 300 L 134 305 L 134 300 C 139.25 299.366 138.86 288.474 139 284 z"/>
-<path d="M 140 294 L 139 297 L 139 298 C 141.841 297.391 142.742 295.572 140 294 z"/>
-<path d="M 95 296 L 91 302 L 95 303 z"/>
-<path d="M 86 320 L 109 320 L 112 308 L 109 313 L 108 313 L 108 307 L 104 310 L 105 313 L 103 313 L 103 306 L 102 306 L 100 308 L 99 304 C 89.4959 306.368 86.0063 310.449 86 320 z"/>
-<path d="M 111 318 L 111 320 L 113 318 z"/>
-</g>
-<g stroke="none" fill="#d1b3ed">
-<path d="M 152 90 L 152 95 L 153 95 L 154 90 z"/>
-<path d="M 59 128 L 59 129 L 78 129 z"/>
-<path d="M 107 132 L 99 137 L 99 138 L 105 139 L 107 137 L 106 135 z"/>
-<path d="M 36 138 L 36 139 L 42 139 L 40 143 C 46.0963 142.996 53.0154 142.925 58.9815 141.656 C 65.3765 140.295 66.9544 133.317 73 140 L 75 135 L 88 135 C 73.5866 128.952 50.6233 135.514 36 138 z"/>
-<path d="M 123 135 L 123 137 L 137 136 z"/>
-<path d="M 99 139 L 104 142 z"/>
-<path d="M 0 143 L 0 144 L 5 144 z"/>
-<path d="M 36 149 L 36 150 L 45 150 z"/>
-<path d="M 60 156 L 62 159 L 57 159 L 57 160 L 70 160 L 67 156 L 67 155 L 78 154 C 72.0548 150.535 64.9417 152.706 60 156 z"/>
-<path d="M 155 152 L 159 156 L 160 153 z"/>
-<path d="M 103.333 153.667 L 103.667 154.333 L 103.333 153.667 z"/>
-<path d="M 107 154 L 111 157 L 111 156 z"/>
-<path d="M 107 159 L 107 164 C 109.57 162.191 109.451 160.867 107 159 z"/>
-<path d="M 32 160 L 32 161 L 70 163 C 61.9193 156.878 41.9212 160 32 160 z"/>
-<path d="M 92 161 L 93 164 L 89 164 L 89 167 C 93.7307 166.74 96.3494 165.589 98 161 z"/>
-<path d="M 53 163 L 53 164 L 64 164 z"/>
-<path d="M 130 178 L 131 172 L 132 172 L 131 175 L 135 173 C 137.848 175.125 140.074 174.988 143 173 L 134 168 L 144 167 C 135.605 158.605 123.258 176.555 130 178 z"/>
-<path d="M 48 174 L 48 175 C 53.6638 175 77.3727 175.928 80 180 L 45 179 L 45 180 L 65 181 L 65 182 L 57 182 L 57 183 L 73 184 L 82 182 L 82 178 L 77 175 L 89 168 z"/>
-<path d="M 93 169 L 93 170 L 95 171 L 89 176 C 91.9934 175.936 93.3456 176.054 94 173 L 97 174 L 96 169 z"/>
-<path d="M 50 170 L 50 171 L 53 171 z"/>
-<path d="M 102 172 L 102 178 L 103 178 L 105 172 z"/>
-<path d="M 147.667 178.333 L 148.333 178.667 L 147.667 178.333 z"/>
-<path d="M 87 179 L 81 183 L 81 184 L 88 183 L 81 186 L 81 187 L 89 188 L 92 183 z"/>
-<path d="M 67 186 L 67 189 L 73 188 z"/>
-<path d="M 123 186 L 125 189 L 125 186 z"/>
-<path d="M 79 192 L 84 192 C 82.2202 189.626 80.7798 189.626 79 192 z"/>
-<path d="M 100 194 L 100 199 L 102 194 z"/>
-<path d="M 69 197 L 69 198 C 73.0936 198.757 76.3502 199.671 79 196 z"/>
-<path d="M 78 204 L 78 205 L 85 206 L 87 204 L 90 198 L 78 204 M 91 198 L 91 203 L 92 203 L 93 198 z"/>
-<path d="M 79 199 L 73 201 L 73 202 C 75.5754 201.958 79.5416 202.285 79 199 z"/>
-<path d="M 96 203 L 100 205 L 103 201 z"/>
-<path d="M 93 212 L 89 212 L 91 209 L 87 209 L 88 212 L 78 212 L 78 211 L 84 209 L 84 208 C 78.0743 206.734 70.234 208.001 65 211 L 65 212 L 69 212 L 69 213 L 62 213 L 62 214 L 68 220 L 66 219 L 66 220 C 71.8365 223.375 80.606 220.558 84 215 L 93 214 C 93 219.195 86.7206 220.721 91 225 L 89 225 L 89 226 C 94.7029 224.611 101.629 214.337 97 209 L 99 205 C 95.1221 206.141 93.3747 207.958 93 212 z"/>
-<path d="M 54 217 L 54 219 C 58.7332 220.396 63.0646 220.605 64 215 z"/>
-<path d="M 85 218 L 82 223 L 89 220 z"/>
-<path d="M 57 226 L 69 227 L 69 225 z"/>
-<path d="M 57 240 C 55.0239 236.364 46.394 237.759 43 239 L 44 244 C 47.9949 244 54.9872 245.726 56 241 L 57 241 C 62.5579 248.126 74.0193 246.371 82 247 L 82 246 L 81 244 L 77 245 L 84 230 L 68.9105 237.276 z"/>
-<path d="M 91 253 L 89 257 C 91.6489 256.432 92.3548 255.412 91 253 z"/>
-<path d="M 86 261 L 83 269 L 87 270 L 91 260 z"/>
-<path d="M 28 277 L 31 275 z"/>
-<path d="M 101 276 L 101 279 L 102 279 z"/>
-</g>
-<g stroke="none" fill="#bd8ab7">
-<path d="M 45 114 L 45 115 L 46 118 L 58 120 L 56 118 L 56 117 L 59 120 L 62 119 L 61 116 z"/>
-<path d="M 83 119 L 82 130 L 82 131 L 90 131 L 90 135 L 102 137 L 102 136 L 100 135 L 108 132 L 112 135 C 111.403 131.416 113.655 131.381 113 134 L 119 132 L 119 131 L 94 130 L 94 129 L 96 128 L 94 128 L 96 120 L 92 119 L 92 125 L 90 124 L 90 128 L 86 128 L 87 125 L 85 125 L 87 119 z"/>
-<path d="M 150 124 L 150 125 L 143 128 L 143 129 L 146 133 L 137 134 L 137 135 L 143 136 L 141 147 L 142 147 L 144 146 L 148 142 L 144 139 L 152 137 L 150 132 L 153 134 L 154 134 L 154 121 C 151.698 121.039 144.207 122.848 150 124 z"/>
-<path d="M 38 127 L 45 128 z"/>
-<path d="M 70 129 C 70.8544 132.987 74.4895 132 78 132 z"/>
-<path d="M 131 130 L 130 135 L 136 134 L 136 130 z"/>
-<path d="M 150 139 L 147 148 L 152 151 L 152 139 z"/>
-<path d="M 15 141 L 15 142 L 20 142 L 20 140 z"/>
-<path d="M 97 145 L 96 149 L 103 150 L 102 146 L 99 147 L 99 145 z"/>
-<path d="M 65 146 L 65 147 L 74 147 z"/>
-<path d="M 32 163 L 41 171 L 50 171 L 50 169 L 38 168 L 38 167 L 68 164 C 58.8984 157.105 42.3523 162.914 32 163 z"/>
-<path d="M 88 165 L 85 166 L 91 173 L 93 169 L 96 169 L 96 173 L 97 173 C 96.7684 166.041 93.0667 167.7 88 165 z"/>
-<path d="M 212 166 C 216.754 170.971 223.724 168.005 230 168 L 230 167 L 226 167 L 226 166 L 228 166 z"/>
-<path d="M 167 168 L 167 169 L 171 170 z"/>
-<path d="M 159 172 L 159 173 L 165 175 C 164.586 171.703 162.078 172.05 159 172 M 182 172 L 182 173 L 194 174 L 182 172 M 227 175 L 232 172 C 229.007 172.064 227.654 171.946 227 175 z"/>
-<path d="M 143 173 L 142 177 L 147 177 z"/>
-<path d="M 217 173 L 217 174 L 226 174 z"/>
-<path d="M 220 176 L 220 177 L 224 177 L 220 176 M 226 176 L 226 177 L 232 177 z"/>
-<path d="M 210 177 L 210 178 L 217 179 L 217 178 L 210 177 M 39 178 L 39 180 L 54 179 z"/>
-<path d="M 200 179 L 200 180 L 205 180 z"/>
-<path d="M 219 194 L 219 195 L 222 196 z"/>
-<path d="M 221 216 L 222 218 L 223 218 L 224 216 z"/>
-<path d="M 21 227 L 49 225 L 47 223 L 47 222 L 54 219 L 41 222.628 L 24.1481 222.606 z"/>
-<path d="M 216 236 L 220 239 z"/>
-<path d="M 205 255 C 208.798 259.535 212.379 260.024 218 259 z"/>
-<path d="M 46 261 L 46 262 L 51 262 z"/>
-<path d="M 50 310 C 50.4482 323.687 61.1049 314.268 64 307 z"/>
-</g>
-<g stroke="none" fill="#3a2556">
-<path d="M 60 113 L 60 114 L 76 114 z"/>
-<path d="M 108.667 158.333 L 109.333 158.667 L 108.667 158.333 z"/>
-<path d="M 111 161 C 105.757 167.07 106.999 173.494 107 181 L 108 181 L 110 179 C 110.433 181.251 113.714 190.989 115 185 C 117.608 185.421 120.708 181.78 117.833 179.167 C 116.749 178.181 114.384 178.862 117 180 L 117 181 L 112 181 L 117 172 L 117 171 L 111 166 z"/>
-<path d="M 132 171 L 132 172 L 135 172 z"/>
-<path d="M 131 172 L 132 173 z"/>
-<path d="M 81 177 L 82 182 L 86 180 L 86 179 L 81 177 M 121 178 L 121 179 L 127 177 z"/>
-<path d="M 149 185 L 145 189 L 145 190 L 149 191 z"/>
-<path d="M 118 196 L 118 200 L 123 201 L 123 200 L 122 196 z"/>
-<path d="M 125 197 L 126 199 L 127 199 L 128 197 z"/>
-<path d="M 97.6667 199.333 L 98.3333 199.667 L 97.6667 199.333 z"/>
-<path d="M 118 202 L 117 206 L 118 206 L 118 202 M 125 202 L 126 209 L 132 211 L 127 205 L 130 206 L 130 203 z"/>
-<path d="M 117 207 L 119 213 L 120 213 L 124 209 z"/>
-<path d="M 109 209 L 106 237 L 107 237 L 111 232 L 110 228 L 113 227 L 113 226 L 109 227 C 109.428 223.087 115.505 215.896 111 215 L 111 214 L 113 213 z"/>
-<path d="M 53 212 L 58 214 L 58 213 L 56 212 L 58 210 z"/>
-<path d="M 87 226 C 87.8038 229.941 89.0994 231.843 93 233 L 93 232 L 89 226 z"/>
-<path d="M 122 229 L 122 230 L 126 230 z"/>
-<path d="M 91 240 L 94 237 L 91 240 M 99 237 L 99 239 L 101 239 L 101 237 L 99 237 M 143 237 L 145 239 L 145 237 z"/>
-<path d="M 133 248 L 136 246 z"/>
-<path d="M 81 251 L 78 257 C 81.2305 255.93 82.241 254.264 81 251 z"/>
-<path d="M 73 262 L 73 263 L 77 263 z"/>
-<path d="M 111 263 C 112.877 273.27 123.585 273.003 132 271 L 132 269 L 125 269 C 122.82 265.655 120.855 265.286 117 266 L 116 263 z"/>
-<path d="M 47 268 L 46 270 L 46 271 C 51.5485 270.999 55.3813 271.505 58 266 z"/>
-<path d="M 9 273 L 9 276 C 14.5234 275.518 20.1851 274.094 23 269 z"/>
-<path d="M 102.667 270.333 L 103.333 270.667 L 102.667 270.333 z"/>
-<path d="M 102 272 L 102 273 L 105 273 z"/>
-<path d="M 68 286 L 68 287 L 75 286 C 74.1188 291.548 71.372 294.631 67 298 L 70 301 L 70 302 C 67.758 304.821 68.1249 309.17 72 310 L 68 314 L 69 317 L 71 317 L 74 313 L 72 319 L 77 316 L 75 314 L 80 305 L 76 305 L 83 300 C 82.3084 296.772 80.8991 296.98 78 298 C 79.2035 294.951 81.219 287.164 85 290 C 86.336 287.068 87.8136 284.821 84 284 L 86 278 z"/>
-<path d="M 52 283 L 52 284 L 56 285 z"/>
-<path d="M 50 290 L 59 291 L 59 290 z"/>
-<path d="M 210 291 L 210 292 L 214 292 z"/>
-<path d="M 99 292 L 99 296 L 101 292 z"/>
-<path d="M 138 293 L 137 298 L 142 299 L 142 298 L 139 298 z"/>
-<path d="M 237 294 L 235 296 L 235 297 L 240 297 z"/>
-<path d="M 40 296 L 40 297 L 44 298 L 44 299 L 38 302 L 45 301 L 46 297 z"/>
-<path d="M 0 297 L 0 298 L 5 298 z"/>
-<path d="M 111 303 C 111.313 305.975 116.945 318.556 112 314 L 112 320 L 121 314 L 118 314 L 116 309 L 120 309 L 121 313 L 124 308 z"/>
-<path d="M 0 318 L 0 320 L 26 320 C 18.2996 314.873 8.49401 317.265 0 318 z"/>
-</g>
-<g stroke="none" fill="#aa7abe">
-<path d="M 155 115 L 154 121 L 155 121 L 155 118 L 158 118 L 157 115 z"/>
-<path d="M 0 122 C 0.0186613 127.268 0.183792 130.331 6 131 L 6 128 L 10 130 L 23 129 L 25 122 z"/>
-<path d="M 76 152 L 78 154 L 67 155 L 67 156 L 92 153 z"/>
-<path d="M 108 157 L 108 158 C 109.96 158.653 110.554 159 108 159 L 108 160 L 114 160 z"/>
-<path d="M 0 170 L 2 175 L 2 176 L 0 178 L 6 172 z"/>
-<path d="M 98 171 L 99 176 L 100 176 L 105 171 L 98 171 M 106 170 L 106 174 L 103 176 L 105 176 L 103 180 C 106.666 177.686 107.658 173.997 106 170 z"/>
-<path d="M 22 174 C 24.2202 180.169 29.2275 179.66 35 180 L 35 179 z"/>
-<path d="M 8 175 L 8 176 C 9.96007 176.653 10.554 177 8 177 L 8 178 L 11 176 L 12 176 C 10.9806 178.499 7.96687 180.296 11 182 C 11 177.44 19.5529 181 23 181 L 23 180 L 21 177 L 8 175 M 87 175 C 85.4467 176.76 81.528 178.11 86 179 L 86 180 L 80 184 L 88 179 L 92 184 L 93 184 L 95 183 L 93 181 L 97 179 L 92 176 L 92 177 L 94 178 L 89 179 z"/>
-<path d="M 57 177 L 57 178 L 64 178 z"/>
-<path d="M 226 184 L 225 186 L 225 187 L 235 185 z"/>
-<path d="M 53 191 L 53 193 L 66 192 z"/>
-<path d="M 223 194 L 223 195 L 234 197 L 234 193 z"/>
-<path d="M 78 195 L 78 200 L 79 200 L 82 195 z"/>
-<path d="M 164 203 C 166.734 207.061 174.227 210.317 178 206 L 197 209 C 189.784 203.87 172.939 203.074 164 203 M 191 203 C 194.63 207.833 204.24 209.807 210 211 L 210 212 L 207 212 L 207 213 C 210.447 212.895 213.521 212.855 214 209 L 221 210 C 219.909 204.907 196.586 203.587 191 203 z"/>
-<path d="M 133 204 L 133 205 L 136 205 z"/>
-<path d="M 14 209 L 14 210 L 30 210 L 30 208 z"/>
-<path d="M 84 215 L 83 218 L 86 216 z"/>
-<path d="M 169 223 L 169 224 L 185 228 L 186 225 z"/>
-<path d="M 82 227 L 85 225 z"/>
-<path d="M 153 230 L 153 235 L 155 235 z"/>
-<path d="M 0 235 L 0 247 L 12 249 L 12 250 L 10 251 C 13.2693 251.937 23.2234 250.766 18 246 L 18 245 L 21 248 L 28 248 L 28 247 L 22 247 C 21.8515 237.226 36.466 239.156 44 239 L 44 238 C 36.3687 238.021 18.1359 234.5 14 242 L 9 241 L 9 240 L 11 240 L 11 239 z"/>
-<path d="M 57 243 L 57 244 L 61 244 z"/>
-<path d="M 151 250 L 151 252 L 153 252 z"/>
-<path d="M 156 264 C 160.104 268.441 165.45 267.015 171 267 z"/>
-<path d="M 182 264 C 186.498 270.505 190.411 272.745 198 270 C 195.205 267.066 192.83 267.124 189 268 z"/>
-<path d="M 40 275 L 32 275 L 32 276 L 62 275 C 57.7249 272.424 41.5134 267.938 40 275 z"/>
-<path d="M 193 278 L 204 277 C 201.254 274.254 194.003 273.321 193 278 z"/>
-<path d="M 49 297 C 51.6235 301.272 56.2518 301.126 59 297 z"/>
-<path d="M 66 301 L 63 306 L 58 306 L 59 310 L 64 307 C 60.604 312.945 51.0295 323.531 50 310 L 47 307 C 43.0343 308.98 40.4135 310.369 37 307 C 41.7258 306.986 46.0542 307.447 47 302 C 39.174 302.498 25.7346 302.38 21 309 L 20 306 C 12.9169 307.687 2.70913 310.069 0 318 L 19 313 L 19 314 L 16 315 L 17 318 L 36 310 L 33 316 L 47 311 L 43 315 L 43 320 C 55.5614 318.952 68.9408 323.31 69 306 L 65 306 z"/>
-<path d="M 138 309 L 132 320 L 143 319 z"/>
-</g>
-<g stroke="none" fill="#7465a8">
-<path d="M 74 123 L 77 122 C 78.2949 124.749 81.9122 128.973 83 124 L 80 125 L 83 118 C 77.8419 117.471 75.7089 117.85 74 123 z"/>
-<path d="M 8 128 L 7 131 L 11 132 L 10 128 z"/>
-<path d="M 122 187 L 129 184 L 130 178 C 124.949 178.741 122.67 182.092 122 187 z"/>
-<path d="M 112.333 187.667 L 112.667 188.333 L 112.333 187.667 z"/>
-<path d="M 80 210 L 78 211 L 78 212 z"/>
-<path d="M 46 220 L 46 221 L 51 218 z"/>
-<path d="M 145 222 L 146 228 L 147 228 z"/>
-<path d="M 136 224 L 138 227 L 134 229 L 129 228 L 129 229 L 142 228 z"/>
-<path d="M 121 232 L 122 235 L 127 234 z"/>
-<path d="M 116 236 L 117 239 L 115 237 L 114 237 L 115 246 L 120 245 L 120 237 z"/>
-<path d="M 111 253 L 114 253 L 113 256 L 124 256 L 130 257 L 130 256 L 123 254 C 122.048 251.268 120.322 249.552 118 252 L 117 252 C 114.317 250.284 112.87 250.344 111 253 z"/>
-<path d="M 235 264 L 240 267 C 239.346 263.946 237.993 264.064 235 264 z"/>
-<path d="M 79 317 L 85 315 L 85 320 L 86 320 C 86.0131 315.432 85.7307 311.494 90 309 C 84.715 305.59 80.392 312.282 79 317 z"/>
-<path d="M 115 319 L 115 320 L 120 320 z"/>
-</g>
-<g stroke="none" fill="#533466">
-<path d="M 80 125 L 83 122 z"/>
-<path d="M 66 143 L 66 145 L 69 145 L 69 143 z"/>
-<path d="M 84.6667 153.333 L 85.3333 153.667 L 84.6667 153.333 z"/>
-<path d="M 128.667 170.333 L 129.333 170.667 L 128.667 170.333 z"/>
-<path d="M 94 175 L 97 178 z"/>
-<path d="M 84 184 L 84 185 L 88 183 z"/>
-<path d="M 106 186 L 101 189 L 102 195 L 102 196 L 102 197 L 103 207 L 104 207 L 110 188 z"/>
-<path d="M 149 189 L 149 194 L 148 194 L 148 192 L 147 192 C 147 196.537 148.218 203.265 143 205 L 144 208 L 148 206 L 147 210 L 153 212 z"/>
-<path d="M 90 194 L 93 192 z"/>
-<path d="M 125.667 194.333 L 126.333 194.667 L 125.667 194.333 z"/>
-<path d="M 75 205 L 80 203 C 77.3872 201.502 75.6455 201.988 75 205 z"/>
-<path d="M 110 204 L 107 207 L 107 211 L 103 209 L 105 217 L 108 216 L 107 213 L 109 209 L 113 213 z"/>
-<path d="M 116 219 L 122 222 L 122 221 z"/>
-<path d="M 68 235 L 76 232 C 72.1186 229.685 68.4901 230.069 68 235 z"/>
-<path d="M 108 232 L 108 243 L 109 243 L 109 240 L 113 243 C 115.164 237.84 113.82 232.928 108 232 z"/>
-<path d="M 123 251 C 124.048 255.914 129.347 255.179 131 251 z"/>
-<path d="M 88 265 L 86 273 C 87.9471 271.884 89.9608 270.835 88 269 L 91 265 z"/>
-<path d="M 153 267 L 153 273 L 158 271 z"/>
-<path d="M 110 269 L 110 273 C 114.462 275.208 111.003 282.41 111 287 L 112 287 L 112 283 L 115 284 C 114.499 280.449 113.105 278.439 117 277 L 116 272 z"/>
-<path d="M 91 270 L 90 274 z"/>
-<path d="M 83 275 L 81 278 z"/>
-<path d="M 102 279 L 102 281 L 104 281 L 104 279 z"/>
-<path d="M 146 290 L 142 295 L 142 308 L 136 307 L 136 308 L 143 312 C 148.166 309.698 147.089 306.004 147 301 L 151 300 L 151 299 z"/>
-<path d="M 151 307 L 163 313 L 163 314 C 158.167 314.385 153.898 314.616 153 320 L 164 320 L 164 319 L 160 315 L 165 314 C 161.923 307.709 157.209 307.907 151 307 z"/>
-<path d="M 129 308 L 129 309 L 134 309 z"/>
-<path d="M 44 311 L 44 312 L 46 314 L 47 314 z"/>
-</g>
-<g stroke="none" fill="#b092cd">
-<path d="M 17 136 L 17 137 L 29 138 L 16 145 L 15 145 C 12.2899 141.145 9.72282 139.489 5 139 L 5 138 L 10 138 L 10 136 L 0 137 L 0 143 L 5 143 L 5 144 L 0 144 L 3 158 L 0 162 L 14 162 C 14.7089 167.641 23.1554 164.87 25 161 L 16 161 L 16 160 L 19 160 L 19 159 L 20 157 L 20 156 L 10 157 L 12 153 L 10 147 L 29 147 L 29 146 L 27 142 L 34 135 L 25 134 z"/>
-<path d="M 12 136 L 12 137 L 15 137 z"/>
-<path d="M 80 178 L 85 177 L 85 176 L 82 176 L 82 173 L 88 173 C 83.1901 171.004 80.3892 173.005 80 178 z"/>
-<path d="M 139.667 177.333 L 140.333 177.667 L 139.667 177.333 z"/>
-<path d="M 89 184 L 90 191 L 84 191 L 84 192 L 89 193 L 87 198 L 82 197 L 82 198 L 85 201 L 90 200 L 91 200 L 89 196 L 95 189 C 94.1728 185.205 92.8285 184.304 89 184 z"/>
-<path d="M 125 184 L 125 186 L 127 186 L 127 184 z"/>
-<path d="M 16 187 C 11.4254 190.278 6.5786 187.768 2.3179 190.471 C -1.44633 192.86 0 200.199 0 204 L 17 203 L 17 202 L 11 201 L 11 200 C 16.4507 200.189 22.9864 198.905 27 203 L 8 207 L 8 208 L 30 210 C 38.3824 208.004 57.0924 214.488 58 203 L 68 205 L 60 199 L 60 198 L 69 198 L 69 197 L 31.7145 189.459 z"/>
-<path d="M 14 213 L 14 215 L 28 218 C 24.2944 213.618 19.5127 213.114 14 213 z"/>
-<path d="M 89 218 L 88 224 L 89 224 z"/>
-<path d="M 75 226 C 77.3962 226.575 77.487 226.475 78 224 L 75 226 M 93.6667 224.333 L 94.3333 224.667 L 93.6667 224.333 z"/>
-<path d="M 47 237 L 47 238 L 57 240 L 85 229 L 65.9105 235.306 z"/>
-<path d="M 22 247 C 25.8714 247 39.2583 248.476 40 244 L 50 245 L 50 244 L 44 244 L 45 241 C 38.4993 237.623 20.6985 237.175 22 247 z"/>
-<path d="M 141 244 L 139 249 L 142 250 L 143 244 z"/>
-<path d="M 151 256 C 152.057 259.492 153.418 260.432 157 261 z"/>
-<path d="M 154 266 L 160 269 z"/>
-<path d="M 108 274 C 106.558 279.854 104.725 286.533 108 292 L 108 281 L 111 282 z"/>
-<path d="M 30 295 L 37 299 L 38 297 L 38 296 z"/>
-<path d="M 105 304 L 104 309 L 107 304 z"/>
-</g>
-<g stroke="none" fill="#71539a">
-<path d="M 115 140 L 115 141 L 119 142 L 117 145 L 125 145 L 125 144 L 119 141 L 119 140 L 121 140 z"/>
-<path d="M 22 144 L 22 145 L 26 145 z"/>
-<path d="M 93.6667 170.333 L 94.3333 170.667 L 93.6667 170.333 z"/>
-<path d="M 4 183 L 8 182 z"/>
-<path d="M 37 184 L 37 186 L 39 186 z"/>
-<path d="M 98.6667 187.333 L 99.3333 187.667 L 98.6667 187.333 z"/>
-<path d="M 114 210 L 122 218 L 123 214 L 114 210 M 133 210 L 133 212 L 135 210 z"/>
-<path d="M 101 221 C 100.839 224.196 101.52 234.131 97 230 L 90 233 L 90 237 L 94 237 L 87 242 L 96 242 L 95 246 L 100 245 L 102 254 L 104 255 L 105 255 L 106 252 L 107 260 L 108 260 L 108 252 L 109 252 L 109 255 L 110 255 L 109 244 L 103 244 L 106 240 L 106 239 L 105 225 L 104 223 z"/>
-<path d="M 90 231 L 95 230 C 92.6377 228.5 91.6404 228.72 90 231 z"/>
-<path d="M 128 230 L 128 233 L 131 235 L 137 234 z"/>
-<path d="M 144 232 L 145 239 L 142 237 L 140 243 L 131 242 L 133 245 L 127 245 L 123 247 L 123 248 L 127 248 L 134 256 L 138 253 L 134 251 L 139 250 L 141 246 L 140 243 L 145 242 L 142 250 C 144.851 249.386 144.854 248.697 144 246 L 148 247 L 146 249 L 149 255 L 148 252 C 152.76 247.846 148.251 241.409 143 241 L 143 240 L 148 240 L 146 235 L 149 234 L 149 232 z"/>
-<path d="M 86 251 L 86 256 L 92 253 L 92 252 z"/>
-<path d="M 177 253 L 172 257 L 178 260 L 187 260 L 187 259 L 179 255 L 189 256 L 189 254 z"/>
-<path d="M 94 257 L 89 264 L 91 266 L 88 269 L 83 278 L 73 280 L 69 278 L 69 279 L 72 282 L 86 278 L 89 282 L 88 292 L 89 292 L 99 282 L 96 283 L 96 278 L 95 278 L 94 281 L 93 281 L 90.8927 270.996 z"/>
-<path d="M 234 262 L 234 264 L 240 264 L 240 262 z"/>
-<path d="M 213 266 L 218 266 C 216.188 263.495 214.744 263.446 213 266 z"/>
-<path d="M 18 266 L 18 267 L 22 266 z"/>
-<path d="M 83.6667 269.333 L 84.3333 269.667 L 83.6667 269.333 z"/>
-<path d="M 50 278 L 50 279 L 55 280 z"/>
-<path d="M 169 280 L 169 281 L 175 282 L 175 280 z"/>
-<path d="M 110 282 L 110 286 L 111 286 z"/>
-<path d="M 230 290 L 230 291 L 235 291 z"/>
-<path d="M 140 292 L 140 297 L 141 297 z"/>
-<path d="M 110 294 L 106 302 L 109 301 L 108 313 L 109 313 L 112 308 L 111 296 L 114 298 z"/>
-</g>
-<g stroke="none" fill="#653a89">
-<path d="M 111 164 C 114.18 171.964 119.126 171.999 127 172 L 127 170 L 115 167 L 116 165 z"/>
-<path d="M 129 180 L 125.277 189.054 L 128 199 L 130 199 L 130 200 L 128 200 L 128 204 L 133 206 L 132 200 L 143 200 L 143 199 L 131 197 L 132 194 z"/>
-<path d="M 232 185 L 232 186 L 235 186 z"/>
-<path d="M 122 194 L 122 196 L 124 196 L 124 194 z"/>
-<path d="M 233 194 L 234 197 L 235 197 L 235 194 z"/>
-<path d="M 111 214 L 111 215 L 117 218 L 114 213 z"/>
-<path d="M 82 223 L 82 224 L 85 225 L 85 226 L 77 227 L 77 228 L 91 225 L 91 224 L 88 221 z"/>
-<path d="M 44 245 L 44 246 L 55 245 z"/>
-<path d="M 97 246 L 97 256 L 96 256 L 97 260 L 100 259 L 98 261 L 98 262 L 98 263 L 100 270 L 101 270 L 104 253 L 100 245 z"/>
-<path d="M 114 245 L 112 248 L 112 249 L 121 248 L 121 247 z"/>
-<path d="M 82 246 L 82 247 L 86 248 z"/>
-<path d="M 123 248 L 128 251 L 128 250 L 127 248 z"/>
-<path d="M 110 253 L 110 257 L 114 253 z"/>
-<path d="M 85 256 L 81 262 C 83.7145 260.483 85.6789 259.249 85 256 z"/>
-<path d="M 14 262 L 8 265 L 8 266 L 12 270 L 17 268 L 17 267 L 14 267 L 21 264 L 21 263 z"/>
-<path d="M 106 273 L 105 280 C 107.55 277.929 107.745 275.709 106 273 z"/>
-<path d="M 27 278 L 27 280 L 30 280 L 30 278 z"/>
-<path d="M 55 281 L 54 287 L 68 287 L 68 286 z"/>
-<path d="M 48 282 L 48 283 L 52 283 z"/>
-<path d="M 35 291 L 35 292 L 42 292 z"/>
-<path d="M 7 293 L 7 296 L 9 296 L 9 293 z"/>
-<path d="M 28 295 L 31 297 z"/>
-<path d="M 33 299 L 33 300 L 37 300 z"/>
-<path d="M 134 300 L 134 305 L 135 305 z"/>
-<path d="M 8 306 L 0 307 L 0 308 L 8 311 L 9 311 z"/>
-<path d="M 37 307 L 37 308 L 45 308 z"/>
-<path d="M 96 317 L 102 316 C 99.7604 313.474 97.6933 314.38 96 317 z"/>
-<path d="M 110 316 L 109 320 z"/>
-</g>
-<g stroke="none" fill="#9d8fd9">
-<path d="M 120 179 L 120 180 L 122 183 L 125 179 z"/>
-<path d="M 120 185 L 122 189 L 114 198 L 118 196 L 121 197 L 122 194 L 128 197 L 125 202 L 130 202 L 130 201 L 128 200 L 130 200 L 130 199 L 128 199 L 130 197 L 130 196 z"/>
-<path d="M 100 191 L 98 192 L 99 197 L 100 197 L 100 194 C 102.711 194.577 103.395 194.767 104 192 z"/>
-<path d="M 76 205 L 76 206 L 82 204 z"/>
-<path d="M 121 208 L 122 209 z"/>
-<path d="M 126.667 217.333 L 127.333 217.667 L 126.667 217.333 z"/>
-<path d="M 130 221 L 130 223 L 132 223 z"/>
-<path d="M 84 243 L 90 246 L 87 247 L 88 252 L 93 253 L 96 242 L 93 243 L 87 242 L 90 237 z"/>
-<path d="M 104 240 L 103 244 z"/>
-<path d="M 118 246 L 118 247 L 121 247 z"/>
-<path d="M 131 253 L 131 256 L 135 255 z"/>
-<path d="M 0 262 L 0 263 L 14 265 L 13 260 L 8 262 L 9 260 z"/>
-<path d="M 116 273 L 115 278 L 122 282 L 119 285 L 119 290 L 123 290 C 123 287.146 124.686 288.33 127 289 L 128 288 L 130 280 C 125.478 281.333 124.336 279.422 124 275 L 119 275 L 119 274 L 124 274 z"/>
-<path d="M 93 286 L 95 293 L 97 287 z"/>
-<path d="M 50 289 L 50 290 L 59 289 z"/>
-<path d="M 139 303 L 138 307 L 142 308 z"/>
-<path d="M 124 315 L 127 314 L 116 318 L 116 319 L 132 320 L 138 308 C 131.821 308.488 126.525 308.694 124 315 z"/>
-</g>
-<g stroke="none" fill="#574ea0">
-<path d="M 117 184 L 115 185 L 114 191 L 114 192 C 116.997 190.111 118.04 187.435 117 184 z"/>
-<path d="M 119 190 L 122 188 C 119.604 187.425 119.513 187.525 119 190 z"/>
-<path d="M 111 196 C 111.044 201.31 110.821 206.972 117 208 L 118 202 L 121 203 L 119 198 z"/>
-<path d="M 98 211 L 97 217 L 100 221 L 95 222 L 92 225 L 92 226 L 95 228 L 96 228 L 99 223 L 100 226 L 101 226 L 101 221 L 102 221 L 104 223 L 103 225 L 105 225 L 104 239 L 104 244 L 109 244 L 107.002 223 L 107 213 L 105 217 L 102 212 L 102 217 L 100 211 z"/>
-<path d="M 126 213 L 123 219 L 129 221 L 126 218 L 126 217 L 129 215 L 130 215 L 131 215 L 137 217 L 137 216 L 133 216 L 133 215 L 135 214 L 129 215 z"/>
-<path d="M 123 223 L 123 224 L 126 224 L 126 230 L 128 227 L 133 229 L 134 229 L 138 227 L 138 226 L 131 226 C 128.978 222.73 126.692 222.648 123 223 z"/>
-<path d="M 94 246 L 92 255 L 97 251 z"/>
-<path d="M 82 250 L 81 257 L 84 256 L 85 250 z"/>
-<path d="M 102 269 L 102 271 L 102 272 L 106 272 L 105 268 z"/>
-<path d="M 111 274 L 110 281 L 111 281 L 114 275 z"/>
-<path d="M 114 277 L 115 284 L 112 283 L 111 289 L 115 289 C 116.169 283.944 118.46 281.04 114 277 z"/>
-<path d="M 96 286 C 96.4494 290.783 94.5439 292.197 90 291 L 90 296 L 91 296 L 92 294 L 93 298 C 90.2888 297.423 89.6054 297.233 89 300 L 95 296 L 96 296 L 97 303 L 98 303 L 99 297 L 101 299 L 102 296 L 98 295 L 98 293 L 102 293 C 102.679 287.861 101.398 285.589 96 286 z"/>
-<path d="M 83 288 L 78 298 L 83 300 C 79.0356 299.998 77.1802 301.185 76 305 L 80 305 L 75 314 L 77 314 L 77 316 L 72 319 L 74 313 L 71 317 L 68 315 L 64 320 L 85 320 L 85 315 L 79 317 C 81.2604 312.3 84.4477 307.821 90 308 L 91 307 L 90 303 L 85 305 C 84.7126 303.332 84.2798 295.647 87 298 L 88 298 L 86 288 L 85 288 L 84 290 z"/>
-<path d="M 116 309 L 119 311 L 118 314 L 125 317 L 123 312 L 121 313 L 120 309 z"/>
-</g>
-<g stroke="none" fill="#47308a">
-<path d="M 112.333 193.667 L 112.667 194.333 L 112.333 193.667 z"/>
-<path d="M 17.6667 219.333 L 18.3333 219.667 L 17.6667 219.333 z"/>
-<path d="M 127 223 C 131.732 223.914 135.975 225.534 139 221 L 135 222 L 136 220 z"/>
-<path d="M 142 226 L 131 232 L 145 235 L 145 234 L 142 226 M 145 226 L 144 229 z"/>
-<path d="M 120 232 L 120 243 L 119 239 L 124 238 L 131 243 L 133 240 L 133 239 L 127 239 L 127 238 L 130 235 C 125.45 235.864 123.546 234.824 120 232 z"/>
-<path d="M 110 253 L 118 252 L 117 248 L 112 249 L 113 244 C 107.695 244.93 108.829 248.699 110 253 z"/>
-<path d="M 143 250 L 140 258 L 130 253 L 130 257 L 124 256 L 122 258 L 122 259 L 136 258 L 136 259 L 133 259 L 133 260 L 137 260 L 135 264 L 138 265 L 136 268 L 142 267 L 144 258 L 145 250 z"/>
-<path d="M 127.667 263.333 L 128.333 263.667 L 127.667 263.333 z"/>
-<path d="M 82 266 L 82 269 L 84 268 L 84 267 z"/>
-<path d="M 238.667 267.333 L 239.333 267.667 L 238.667 267.333 z"/>
-<path d="M 57 275 L 57 276 L 64 276 z"/>
-<path d="M 86 296 L 85 305 L 93 299 L 89 300 z"/>
-<path d="M 34 310 L 19 319 L 35 317 L 35 316 L 36 310 z"/>
-<path d="M 112 311 L 113 317 L 116 316 L 114 311 z"/>
-<path d="M 15 313 L 2 317 L 2 318 L 18 317 z"/>
-<path d="M 36 315 L 36 316 L 39 316 z"/>
-<path d="M 105 315 L 106 318 L 107 318 L 108 315 z"/>
-<path d="M 210 316 L 210 317 L 215 317 z"/>
-</g>
-<g stroke="none" fill="#796eba">
-<path d="M 121 200 L 125 201 L 126 200 L 127 197 C 123.741 195.738 122.248 196.891 121 200 z"/>
-<path d="M 112 227 C 109.478 231.186 113.3 236.508 117 239 L 116 236 L 120 237 L 117 235 L 118 232 z"/>
-<path d="M 94 251 C 92.8985 255.209 91.1333 256.277 87 255 L 77 264 L 77 265 L 80 267 C 84.2458 266.552 86.6974 265.675 86 261 C 88.8053 260.679 90.5901 259.823 91 263 L 92 263 L 94 257 L 95 257 C 92.1658 265.845 91.0015 271.912 93 281 L 94 281 L 95 278 L 96 278 L 96 283 L 99 282 L 94 287 C 95.5903 286.707 98.0963 285.438 99.6667 285.667 C 103.634 286.244 101.567 298.797 99 297 L 98 303 L 97 303 L 96 301 L 95 301 L 92 303 L 92 304 L 99 304 L 100 308 L 102 306 L 103 306 L 103 313 L 105 313 L 106 311 L 106 310 C 103.968 306.242 107.213 304.253 109 301 L 106 302 L 110 294 C 120.276 299.722 121.246 295.71 119 285 L 122 282 L 118 281 L 115 289 L 107 292 L 107 280 L 106 273 L 113 274 L 113 273 L 110 273 L 110 269 L 111 269 C 114.107 273.93 120.767 272.999 126 273 L 126 272 C 115.915 271.915 112.482 268.489 110 259 L 109 259 L 110 264 L 106 263 L 109 268 L 105 270 L 106 272 L 102 273 L 103 264 L 101 270 L 100 270 L 98 263 L 98 262 L 98 261 L 100 259 L 97 260 L 96 256 L 97 256 L 98 258 L 98 250 z"/>
-<path d="M 126 262 L 126 263 L 138 266 L 135 264 L 137 260 z"/>
-<path d="M 130 271 L 130 272 L 135 272 z"/>
-<path d="M 86 280 L 84 284 C 89.4106 287.94 83.9854 295.512 93 298 C 92.8047 296.194 92.2735 293.071 91 296 L 90 296 L 90 291 L 94 292 L 94 291 L 92 288 L 89 292 L 88 292 L 89 282 z"/>
-</g>
-<g stroke="none" fill="#3d1db3">
-<path d="M 2.66667 247.333 L 3.33333 247.667 L 2.66667 247.333 M 28 247 L 28 248 L 34 248 z"/>
-<path d="M 38 294 L 38 295 L 48 296 z"/>
-<path d="M 114 298 L 114 299 L 117 299 z"/>
-<path d="M 119 300 L 119 301 L 122 301 z"/>
-<path d="M 122 301 L 122 302 L 125 302 z"/>
-<path d="M 125.667 302.333 L 126.333 302.667 L 125.667 302.333 z"/>
-<path d="M 127.667 303.333 L 128.333 303.667 L 127.667 303.333 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_sydn.xml Deleted

@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" viewBox="0 0 203 120" width="203" height="120" preserveAspectRatio="xMidYMid meet">
-<g stroke="none" fill="#daddf9">
-<path d="M 0 0 L 0 10 L 61.9954 10.9907 L 78 9 L 78 10 L 74 10 L 74 11 L 83 11 L 83 8 C 91.4302 7.7655 99.4851 10.7967 106 4 L 99 2 L 95 8 L 96 1 L 101 1 L 91 0 L 71 0 z"/>
-</g>
-<g stroke="none" fill="#e0e0fb">
-<path d="M 96 1 L 95 8 L 99 2 L 106 4 C 98.1059 9.55374 92.0651 7.39729 83 8 L 83 11 L 74 11 L 74 10 L 78 10 L 78 9 L 67 9 L 67 11 C 89.276 12.4962 111.633 14 134 14 C 138.478 14 154.271 16.2746 155 11 L 173 11 L 174 7 L 146 4 L 146 2 L 161 3.78703 L 177 1 L 153 0 z"/>
-</g>
-<g stroke="none" fill="#e4e2fc">
-<path d="M 146 2 L 146 4 L 174 7 L 173 11 L 163.019 12.787 L 155 11 C 155 15.383 147.282 14 144 14 C 132.613 14 121.252 13 110 13 L 110 15 L 140 17 C 140 12.5981 151.81 15.6898 155 16 C 164.497 16.9233 174.453 15.8674 184 16 C 190.299 16.0875 196.582 17 203 17 L 203 0 L 179 0.134262 L 161 3.5463 z"/>
-</g>
-<g stroke="none" fill="#eae1f4">
-<path d="M 0 10 L 0 21 L 14 19 L 24 22.1945 L 36 24 L 36 25 L 33 25 L 33 28 L 79 37 L 84 34.5 L 90 30 L 90 29 L 81 29 L 83 27 L 82 23 L 78 23 L 78 22 L 82 22 L 82 21 L 47 16 L 47 14 L 60 14 L 60 13 L 55 13 L 57 10 L 20 11 z"/>
-</g>
-<g stroke="none" fill="#f2e7f9">
-<path d="M 55 12 L 55 13 L 60 13 L 60 14 L 47 14 L 47 16 L 82 21 L 82 22 L 78 22 L 78 23 L 82 23 L 81 29 L 91 28.3333 L 120 17 L 119 25 L 134 20 L 137 24 L 137 25 L 133 25 C 134.595 30.6996 143.973 28.4919 149 29 L 149 30 L 144 30 L 144 31 L 163 31 L 163 30 L 161 30 L 161 29 L 174 29 L 174 30 L 166 30 L 166 31 L 183 31 L 183 32 L 181 32 L 181 33 L 203 31 L 203 17 C 196.274 17 189.679 16.0464 183 16 C 173.804 15.9361 164.127 16.9028 155 15.7407 C 151.688 15.3191 140.672 12.9658 140 17 C 123.875 12.8757 106.512 14.4838 90 12.8657 C 79.3794 11.825 65.2998 8.64594 55 12 z"/>
-</g>
-<g stroke="none" fill="#9d96cb">
-<path d="M 102 22 L 102 23 L 113.139 27.4769 L 120 26 L 120 17 z"/>
-</g>
-<g stroke="none" fill="#e1d6ed">
-<path d="M 12 19 L 0 21 L 0 68 L 21 68 L 15 51 L 37 53 L 36 56 L 39 59 L 56 56 C 50.3541 51.4049 37.2092 47.0414 30 48 L 27 45 L 29 38 L 22 39 L 29 36 L 29 35 C 23.4068 35.3757 19.3122 36.3252 15 32 L 26 32 L 26 31 L 9 31 L 9 28 L 2 28 L 2 27 L 36 25 L 36 24 L 25 22.1945 L 14 19 z"/>
-</g>
-<g stroke="none" fill="#565bad">
-<path d="M 84 64 L 88 68 L 91 66 L 92 69 L 94 69 L 94 64 L 98 66 L 103 66 L 112 62 L 117 65 L 118 65 C 119.984 48.7569 127.865 34.7771 134 20 C 117.62 22.1559 100.778 35.9966 91.5926 49 C 88.3241 53.627 84.875 58.318 84 64 z"/>
-</g>
-<g stroke="none" fill="#f0e6f8">
-<path d="M 133 21 L 128 38 L 129 38 C 131.805 35.5955 137.234 35.0068 140.681 36.8657 C 142.308 37.7435 143.217 39.3792 145.153 39.7222 C 147.881 40.2056 151.206 39.0872 154 39 L 151 49 L 163 51 C 173.582 50.1609 183.198 44.8045 193 40.588 C 198.057 38.4125 202.704 37.0132 203 31 L 181 33 L 181 32 L 183 32 L 183 31 L 166 31 L 166 30 L 174 30 L 174 29 L 161 29 L 161 30 L 163 30 L 163 31 L 144 31 L 144 30 L 149 30 L 149 29 C 143.663 27.8077 135.736 30.3833 133 25 L 137 25 L 137 24 z"/>
-</g>
-<g stroke="none" fill="#776eb4">
-<path d="M 62 58 L 62 59 L 68 59 C 69.6468 65.4559 76.8701 69.2263 82.4352 64.2639 C 87.1115 60.094 89.9007 52.098 93.7222 47 C 99.2442 39.6335 106.46 34.1255 114 29 C 100.986 13.5734 81.0967 34.6178 72.7269 46 C 69.5034 50.3836 67.6277 56.5869 62 58 z"/>
-</g>
-<g stroke="none" fill="#e4daf0">
-<path d="M 2 27 L 2 28 L 9 28 L 9 31 L 26 31 L 26 32 L 15 32 C 18.1992 37.1279 23.8669 35.6094 29 35 L 29 36 L 22 39 L 29 38 L 27 45 L 30 48 L 53 54.412 L 64.7222 57.5185 L 70 50 L 44 45 L 44 44 L 49 43 L 49 42 L 36 40 L 39 36 L 39 35 L 29 34 L 29 33 L 40 33 L 40 32 L 32 31 L 32 30 L 37 30 L 37 29 L 34 26 z"/>
-</g>
-<g stroke="none" fill="#e6ddf2">
-<path d="M 32 30 L 32 31 L 40 32 L 40 33 L 29 33 L 29 34 L 39 35 L 39 36 L 36 40 L 49 42 L 49 43 L 44 44 L 44 45 L 60.9398 47.1945 L 71 50 L 83 36 L 83 35 L 79 37 L 47 31.4352 L 39.8657 29.2546 z"/>
-</g>
-<g stroke="none" fill="#aa8aa0">
-<path d="M 128 31 L 123 45 C 126.487 42.7311 129.489 34.9359 128 31 z"/>
-</g>
-<g stroke="none" fill="#d2c0de">
-<path d="M 127 37 L 126 42 L 133.019 43.9167 L 146 41 L 143 39 L 142 36 L 139 36 L 129 36 L 128 38 z"/>
-</g>
-<g stroke="none" fill="#5b53a4">
-<path d="M 172 51 L 186 46 L 186 63 L 174 63 L 174 67 L 186 66 L 184 79 C 191.269 76.8203 202.866 70.1297 203 62 L 187 62 C 187 57.4944 185.925 51.2275 188.218 47.1528 C 190.92 42.3497 198.349 39.6401 202 44 L 203 44 L 203 36 L 182 44.8009 z"/>
-</g>
-<g stroke="none" fill="#575caf">
-<path d="M 141 42 L 133 60 L 132 60 L 131 58 L 123 67 C 123.099 72.9975 126.366 74.8072 132 76 L 136 84 L 139 84 L 140 80 L 141 80 L 141 83 L 144 83 C 145.462 78.2545 148.191 76.6497 153 76 L 153 74 L 146 76 L 145 72 L 142 75 L 141 75 L 154 39 z"/>
-</g>
-<g stroke="none" fill="#d7d6ed">
-<path d="M 202.333 39.6667 L 202.667 40.3333 L 202.333 39.6667 z"/>
-</g>
-<g stroke="none" fill="#b2afcf">
-<path d="M 198 40 L 199 62 L 203 62 L 203 61 C 198.104 55.2884 205.117 43.5159 198 40 z"/>
-</g>
-<g stroke="none" fill="#b5a2c9">
-<path d="M 123 46 L 134 45 L 134 44 L 128 41 z"/>
-</g>
-<g stroke="none" fill="#e7dff3">
-<path d="M 188 45 C 189.234 50.596 193.87 59.2231 199 62 L 199 41 z"/>
-</g>
-<g stroke="none" fill="#7169a9">
-<path d="M 119 57 L 122 73 L 123 73 L 123 67 L 127.667 65.5833 L 132 60 L 133 60 C 135.787 53.0918 143.017 50.4152 141 42 L 126.139 49.1528 z"/>
-</g>
-<g stroke="none" fill="#e8def3">
-<path d="M 201 43 L 201 61 L 203 61 z"/>
-</g>
-<g stroke="none" fill="#ddcae0">
-<path d="M 123 46 L 120 57 L 121 57 L 127 47 z"/>
-</g>
-<g stroke="none" fill="#aa9ece">
-<path d="M 184 46 L 185 62 C 176.151 61.5742 179.625 56.1332 183 51 L 172 49 L 171 49 C 168.908 52.8004 164.972 52 161 52 L 161 53 C 168.361 53.025 173.902 55.7705 178 62 L 173 61 L 186 63 C 186 58.4533 187.866 48.8221 184 46 z"/>
-</g>
-<g stroke="none" fill="#ddcce3">
-<path d="M 150 47 L 148.954 53.5185 L 155 54 L 171 52 L 171 51 L 163 51 z"/>
-</g>
-<g stroke="none" fill="#e9ddf2">
-<path d="M 176 50 L 176 51 L 183 51 C 178.191 56.0486 176.128 61.8537 185 62 L 185 47 z"/>
-</g>
-<g stroke="none" fill="#e6dbef">
-<path d="M 187 48 L 187 62 L 196 62 z"/>
-</g>
-<g stroke="none" fill="#9489b8">
-<path d="M 188 48 L 192 56 L 193 56 z"/>
-</g>
-<g stroke="none" fill="#cebbd7">
-<path d="M 18 50 L 18 51 C 25.5245 54.2798 34.6545 66.1004 37 74 C 45.26 71.926 43.6181 64.3266 42 58 L 39 59 L 36 56 L 37 53 z"/>
-</g>
-<g stroke="none" fill="#a997c1">
-<path d="M 15 51 L 16 55 L 22.3333 61 L 33 78 L 39 75 C 33.5608 66.5003 26.243 51.1832 15 51 z"/>
-</g>
-<g stroke="none" fill="#8e83b9">
-<path d="M 150 56 C 154.276 60.1798 156.531 67.0969 157 73 L 156 73 L 154 65 L 149 66 L 146 63 L 146 76 C 151.373 73.6964 154.704 75.3544 160 77 C 159.789 72.3028 154.355 64.3242 156.755 60.1019 C 159 56.1505 167.165 58 171 58 L 170 61 L 175 61 L 176 57 C 173.369 56.2113 171.403 54.5289 168.866 53.6111 C 163.347 51.615 154.756 52.7799 150 56 z"/>
-</g>
-<g stroke="none" fill="#554d70">
-<path d="M 17 54 L 20 66 L 21 66 z"/>
-</g>
-<g stroke="none" fill="#fae7f0">
-<path d="M 147 54 L 142 73 L 143 73 C 145.961 67.9077 150.505 59.834 149 54 z"/>
-</g>
-<g stroke="none" fill="#525caf">
-<path d="M 42 58 C 42.9862 64.4321 47.8364 69.7458 48.8889 76 C 49.3839 78.9418 47.2008 82.2701 44.0417 82.4444 C 40.8227 82.6221 37.5485 79.2971 34 79 C 36.303 84.1011 38.7481 88.3749 44.9398 85.9167 C 46.7584 85.1946 48.8266 82.9148 50.9074 83.3426 C 53.8009 83.9375 56.701 87.1021 60 88 C 64.7592 81.2778 72.5806 83 80 83 L 81 66 C 74.83 66.7079 70.708 64.9684 68 59 L 57 56.4583 z"/>
-</g>
-<g stroke="none" fill="#a292c0">
-<path d="M 193 56 L 197 61 z"/>
-</g>
-<g stroke="none" fill="#1c2263">
-<path d="M 19 57 L 25.8009 81 L 29.6111 89.1111 L 50 90 L 106 89 C 104.226 86.2504 102.168 82.8603 98.9398 81.6343 C 95.1006 80.1759 89.8428 82.2394 86 83 C 78.0949 84.5646 63.9469 79.0908 60 88 L 50.0694 82.6759 L 39.3194 86.0509 L 33.1574 77 z"/>
-</g>
-<g stroke="none" fill="#baa4c6">
-<path d="M 147 62 L 147 63 L 149 66 L 153 65 L 153 57 z"/>
-</g>
-<g stroke="none" fill="#7672b6">
-<path d="M 158 77 L 158 78 C 163.004 77.4191 165.001 74.3947 167 70 L 181 68 L 181 67 L 174 67 L 174 60 L 170 61 L 171 58 C 166.875 58 156.871 55.3332 155.755 61.0231 C 154.675 66.5224 161.918 72.1467 158 77 z"/>
-</g>
-<g stroke="none" fill="#a291b8">
-<path d="M 119 58 L 117 68 L 118 68 z"/>
-</g>
-<g stroke="none" fill="#dbcfe6">
-<path d="M 174 62 L 178 62 L 177 59 z"/>
-</g>
-<g stroke="none" fill="#4953a6">
-<path d="M 103 66 L 98 66 L 94 64 L 94 69 L 92 69 L 91 66 L 88 68 L 84 63 L 83 63 L 80 65 L 80 83 L 75 83 L 75 84 C 82.0962 84 89.0651 81.2695 96 81.4167 C 101.122 81.5253 104.152 86.6605 108.995 87.4444 C 116.435 88.6485 116.675 74.8331 117 70 L 118 70 L 116 87 L 122.065 81.8287 L 132 79 L 132 76 L 122 73 L 122 60 L 118 68 L 117 68 C 116.933 63.9188 116.66 60.9679 112 62 C 109.494 59.1762 104.611 63.4017 103 66 z"/>
-</g>
-<g stroke="none" fill="#f3e0ed">
-<path d="M 152 60 L 156 73 L 157 73 C 156.847 68.5864 155.87 62.518 152 60 z"/>
-</g>
-<g stroke="none" fill="#9183b3">
-<path d="M 44 65 L 34 78 L 34 79 C 37.4745 79.5771 40.638 82.9118 44.0417 82.7593 C 54.154 82.306 46.8892 69.0679 44 65 z"/>
-</g>
-<g stroke="none" fill="#32368c">
-<path d="M 21 66 C 16.3161 70.0148 6.00644 68 0 68 L 0 74 L 10 72.6806 L 22 70 z"/>
-</g>
-<g stroke="none" fill="#776eae">
-<path d="M 182 70 L 186 66 z"/>
-</g>
-<g stroke="none" fill="#bda0c3">
-<path d="M 169 67 L 168 70 z"/>
-</g>
-<g stroke="none" fill="#bbafd7">
-<path d="M 168 74 L 168 75 L 178 75 L 175 69 L 181 69 C 174.848 66.0322 172.851 71.7937 168 74 z"/>
-</g>
-<g stroke="none" fill="#e7d7ed">
-<path d="M 183 70 L 175 69 C 175.708 72.0349 180.186 80.1686 184.245 76.3472 C 186.313 74.4009 185.969 70.5598 186 68 z"/>
-</g>
-<g stroke="none" fill="#e5d9ec">
-<path d="M 187 68 L 187 74 L 196 69 z"/>
-</g>
-<g stroke="none" fill="#e4d5eb">
-<path d="M 178 83 L 178 84 C 184.893 87.2782 188.615 87.3457 196 85.912 C 198.159 85.4929 200.711 85.6897 202.111 83.6528 C 204.536 80.1239 203 72.145 203 68 z"/>
-</g>
-<g stroke="none" fill="#6c619f">
-<path d="M 18 70 L 18 71 L 22 71 z"/>
-</g>
-<g stroke="none" fill="#272869">
-<path d="M 117 70 C 116.485 74.3358 116.199 87.1262 109.977 87.088 C 107.305 87.0715 104.489 84.8713 102 84 L 106 89 L 53 90 L 53 92 L 60 93 L 60 94 L 55 97 L 59 99 L 59 100 L 56 100 L 56 101 L 89 101.671 L 104 101 L 93 105 L 76 104 L 76 105 L 115 106 L 115 104 L 110 104 L 110 102 L 114 102 L 114 94 L 81 94 L 81 92 L 114.588 91.8241 L 137 91 L 135 87 L 143 85 L 143 84 L 141 80 L 140 80 L 139 84 L 136 84 C 132.594 73.3031 120.739 82.7316 116 87 z"/>
-</g>
-<g stroke="none" fill="#b292b3">
-<path d="M 167 70 L 162 79 L 165 75 L 171 76 L 171 75 L 168 75 z"/>
-</g>
-<g stroke="none" fill="#9a89b0">
-<path d="M 183.333 70.6667 L 183.667 71.3333 L 183.333 70.6667 z"/>
-</g>
-<g stroke="none" fill="#615ba0">
-<path d="M 8 85 L 8 81 L 14 82 L 18 71 C 14.4945 71.1213 11.4302 72.4819 8 72.7917 C 5.93244 72.9784 3.21165 72.0858 1.5 73.6852 C -1.57534 76.5589 5.23623 84.195 8 85 z"/>
-</g>
-<g stroke="none" fill="#a79ac7">
-<path d="M 18 71 L 16 79 L 19 76 L 20 79 L 25 79 C 23.8594 74.7571 22.6491 71.5794 18 71 z"/>
-</g>
-<g stroke="none" fill="#e1d0e4">
-<path d="M 168 74 L 172 71 z"/>
-</g>
-<g stroke="none" fill="#c2b6cf">
-<path d="M 141 72 L 141 75 L 143 74 L 143 73 z"/>
-</g>
-<g stroke="none" fill="#2b286f">
-<path d="M 141 83 L 141 84 L 143 84 L 143 85 L 135 87 L 136 92 L 148 92 L 148 94 L 116 94 L 118 97 L 118 98 L 116 102 L 131 101.963 L 145.94 100.606 L 163 102 L 163 98 L 167 104 L 152 105 L 152 107 L 181 107 L 181 108 L 156 108 L 156 109 L 193 108 L 193 103 L 185 103 C 183.861 98.9305 180.838 99.0495 177 99 L 177 98 C 181.777 94.5129 177.479 86.7141 177 82 L 181 79 L 165 75 C 160.92 80.4926 156.787 74.4599 151 75.8796 C 146.085 77.0853 144.992 80.9025 141 83 z"/>
-</g>
-<g stroke="none" fill="#8c7cb3">
-<path d="M 169 76 L 169 77 C 172.93 77.4639 176.67 78.8426 179 75 z"/>
-</g>
-<g stroke="none" fill="#5a539b">
-<path d="M 19 76 L 16 81 L 25 80 L 25 79 z"/>
-</g>
-<g stroke="none" fill="#b9a9c9">
-<path d="M 140 76 L 140 79 L 141 79 z"/>
-</g>
-<g stroke="none" fill="#c6acc8">
-<path d="M 177 77 L 177 78 L 183 79 z"/>
-</g>
-<g stroke="none" fill="#d7c2d7">
-<path d="M 0 77 L 0 86 L 5 86 C 4.66722 81.8459 3.68217 79.1142 0 77 z"/>
-</g>
-<g stroke="none" fill="#845e86">
-<path d="M 183 77 L 180 82 C 182.956 81.2223 184.266 79.9957 183 77 z"/>
-</g>
-<g stroke="none" fill="#cfbfdd">
-<path d="M 15 79 C 15.7963 82.7158 18.6373 82 22 82 L 22 81 z"/>
-</g>
-<g stroke="none" fill="#8276ac">
-<path d="M 18 80 L 18 81 L 26 82 L 26 80 z"/>
-</g>
-<g stroke="none" fill="#494498">
-<path d="M 8 81 L 9 90 L 10 90 L 13 81 z"/>
-</g>
-<g stroke="none" fill="#a18cb3">
-<path d="M 14 81 L 13 84 z"/>
-</g>
-<g stroke="none" fill="#6e60a7">
-<path d="M 13 85 L 22 88 L 17 82 z"/>
-</g>
-<g stroke="none" fill="#222264">
-<path d="M 17 82 L 23 90 L 15 91 L 22 97 L 24 92 L 51 93 L 45 97 L 45 98 L 46 100 L 52 99 L 52 101 L 41 101 L 41 102 L 45 102 L 45 103 L 42 105 L 29 105 L 29 107 L 62.9954 107.023 L 73.0046 108.995 L 181 108 L 181 107 L 152 107 L 152 105 L 167 104 L 163 98 L 163 102 L 146.866 100.324 L 131 101.88 L 116 102 L 118 98 L 118 97 L 116 94 L 148 94 L 148 92 L 81 92 L 81 94 L 114 94 L 114 102 L 110 102 L 110 104 L 115 104 L 115 106 L 89 106.935 L 76 105 L 76 104 L 93 105 L 104 101 L 89 101.394 L 56 101 L 56 100 L 59 100 L 59 99 L 55 97 L 60 94 L 60 93 C 56.5886 92.301 53.3628 90.4559 49.9398 90.0787 C 40.5834 89.0477 29.6455 93.8085 27 82 z"/>
-</g>
-<g stroke="none" fill="#ae8aa3">
-<path d="M 177 82 L 177 85 L 180 85 L 180 84 C 178.04 83.3466 177.446 83 180 83 z"/>
-</g>
-<g stroke="none" fill="#a08aa2">
-<path d="M 12 84 L 10 89 L 11 89 z"/>
-</g>
-<g stroke="none" fill="#8281c4">
-<path d="M 202 84 L 186.889 89.2176 L 186 98 L 191 100 L 203 99 z"/>
-</g>
-<g stroke="none" fill="#94739c">
-<path d="M 0 86 L 0 87 L 7 89 L 7 85 z"/>
-</g>
-<g stroke="none" fill="#4f3162">
-<path d="M 12 88 L 21 88 C 17.7905 85.9819 14.16 84.1558 12 88 z"/>
-</g>
-<g stroke="none" fill="#814e87">
-<path d="M 177 85 C 178.68 89.4346 180.395 94.0392 177 98 L 177 99 C 180.792 99.1339 183.225 99.4933 185 103 L 193 103 L 193 107 L 203 107 L 203 99 L 194.06 99.213 L 186 102 L 186 98 L 180 98 L 181 85 z"/>
-</g>
-<g stroke="none" fill="#d6a7b9">
-<path d="M 180 98 L 186 98 L 187 88 C 178.914 83.9573 180 92.1871 180 98 z"/>
-</g>
-<g stroke="none" fill="#201e5d">
-<path d="M 0 87 L 3 109 L 7 109 L 6 104 L 8 109 L 68 109 L 68 107 L 29 107 L 29 105 L 42 105 L 45 103 L 45 102 L 41 102 L 41 101 L 52 101 L 52 99 L 46 100 L 45 98 L 45 97 C 48.4835 96.8285 49.8466 96.3672 51 93 L 24 92 L 22 97 L 15 91 L 23 90 L 23 89 C 18.8183 87.6382 13.4706 87.0252 10 90 z"/>
-</g>
-<g stroke="none" fill="#dfc9dd">
-<path d="M 186 98 L 186 100 L 191 100 L 191 98 z"/>
-</g>
-<g stroke="none" fill="#a082ab">
-<path d="M 186 100 L 186 102 L 191 102 L 191 100 z"/>
-</g>
-<g stroke="none" fill="#29387f">
-<path d="M 0 104 L 0 110 L 178 110 L 178 109 L 56 109 L 23 109 L 7 107 C 3.96591 109.591 1.9677 106.408 0 104 z"/>
-</g>
-<g stroke="none" fill="#9286b9">
-<path d="M 1 104 L 1 107 L 2 107 z"/>
-</g>
-<g stroke="none" fill="#5a5a85">
-<path d="M 3 104 L 3 107 L 5 107 L 5 104 z"/>
-</g>
-<g stroke="none" fill="#7263a0">
-<path d="M 6 104 L 6 107 L 8 107 L 8 104 z"/>
-</g>
-<g stroke="none" fill="#553c6b">
-<path d="M 193 107 L 193 108 L 203 108 z"/>
-</g>
-<g stroke="none" fill="#7673ae">
-<path d="M 186 108 L 186 109 L 203 109 z"/>
-</g>
-<g stroke="none" fill="#7886c8">
-<path d="M 126 116 L 126 117 L 135 117 L 135 118 L 128 118 L 128 119 L 149 120 L 190 120 L 203 119 L 203 114 L 177.94 116.745 L 155 116 L 155 115 L 182 110 L 167 110.981 L 145.588 111.347 z"/>
-</g>
-<g stroke="none" fill="#9c9ad3">
-<path d="M 155 115 L 155 116 L 177.94 116.903 L 184.884 114.954 L 203 114 L 203 109 L 183.019 109.282 L 175.94 111.806 z"/>
-</g>
-<g stroke="none" fill="#737fc4">
-<path d="M 0 110 L 0 120 L 130 120 L 130 119 L 128 119 L 128 118 L 135 118 L 135 117 L 126 117 L 126 116 L 135 114 L 135 113 L 120 114 L 120 115 L 122 115 L 122 116 L 120 118 L 115 118 L 115 117 L 117 116 L 116 114 L 101 114.935 L 69.9954 111.065 z"/>
-</g>
-<g stroke="none" fill="#4a63b7">
-<path d="M 46 110 L 46 111 L 69 111.065 L 116 114 L 115 117 L 115 118 L 120 118 L 122 116 L 122 115 L 120 115 L 120 114 L 172 111 L 160 110 L 133 110.981 z"/>
-</g>
-<g stroke="none" fill="#404e97">
-<path d="M 83 110 L 83 111 L 138 111 L 121 110 z"/>
-</g>
-<g stroke="none" fill="#5a69ba">
-<path d="M 196 119 L 196 120 L 203 120 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_topk.xml Deleted

@@ -1,1240 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" viewBox="0 0 227 170" width="227" height="170" preserveAspectRatio="xMidYMid meet">
-<rect fill="#FFFFFF" width="227.0" height="170.0"/>
-<g stroke="none" fill="#040500">
-<path d="M 0 0 L 0 46 L 3 46 L 3 42 L 4 42 L 5 48 L 6 45 L 9 46 L 8 43 C 12.8544 41.5788 10.3064 38.253 11.2176 34.4167 C 11.9723 31.2393 14.146 29.906 17 29 L 14 32 L 15 36 L 13 36 C 14.7432 43.1669 17.2195 46.8118 25 47 L 25 51 L 34 43 L 39 43 L 39 42 L 22 46 L 16 37 L 16 36 L 33 35 L 35 32 L 35 31 L 30 26 L 25 27 L 27 21 C 23.4216 17.5634 20.1207 12.627 15 16 C 13.8717 6.01578 20.9485 12.7673 25.9606 13.625 C 28.6805 14.0904 30.8419 12.3587 33 11 L 42 3 L 33 4 L 19 0 L 19 4 L 18 4 L 17 0 z"/>
-</g>
-<g stroke="none" fill="#25303d">
-<path d="M 17 0 L 18 4 L 19 4 L 19 0 z"/>
-</g>
-<g stroke="none" fill="#2a4152">
-<path d="M 22.6667 0.333328 L 23.3333 0.666672 L 22.6667 0.333328 z"/>
-</g>
-<g stroke="none" fill="#5476a9">
-<path d="M 29 0 L 33 4 L 35 0 z"/>
-</g>
-<g stroke="none" fill="#12171d">
-<path d="M 31 0 L 32 1 z"/>
-</g>
-<g stroke="none" fill="#0b0e0c">
-<path d="M 35 0 L 35 1 L 38 1 z"/>
-</g>
-<g stroke="none" fill="#6d8dc8">
-<path d="M 38 0 L 36 3 L 43 2 C 41.5968 6.44583 38.2778 7.10172 34 8 L 35 12 L 27 16 L 26 16 L 18 11 C 20.2605 15.6987 26.0615 20.3976 31 22 C 29.6893 27.5721 30.5063 30.0159 36 32 L 52 0 z"/>
-</g>
-<g stroke="none" fill="#25303c">
-<path d="M 39 2 L 44 1 z"/>
-</g>
-<g stroke="none" fill="#2f334a">
-<path d="M 48.6667 0.333328 L 49.3333 0.666672 L 48.6667 0.333328 z"/>
-</g>
-<g stroke="none" fill="#8b8b85">
-<path d="M 52 0 L 44 26 L 48 26 L 48 32 C 51.9657 33.1496 53.3668 34.939 54 39 L 55 39 L 55 21 L 50 21 L 54 16 L 51 13 L 55 11 L 55 10 L 52 10 L 55 0 z"/>
-</g>
-<g stroke="none" fill="#a4a79d">
-<path d="M 55 0 C 54.9193 3.82457 50.2121 8.96873 55 10 L 55 11 L 51 13 L 54 16 L 50 21 L 55 18 L 59 21 L 60 21 z"/>
-</g>
-<g stroke="none" fill="#7290c9">
-<path d="M 56 0 L 60 20 L 63.3171 27.527 L 74 27 L 73 14 L 77 17 L 83 16 L 80 22 L 83 22 L 83 23 L 82 29 L 93 30 L 102 18 L 96 17 L 96 16 L 110 3 L 101 5 L 102 2 L 85 0 z"/>
-</g>
-<g stroke="none" fill="#7b9cd6">
-<path d="M 100 0 L 102 2 L 101 5 L 110 3 L 104 8 L 105 16 L 109 19 L 116 18 L 114 24 L 110 24 C 110.849 29.9288 113.971 36.3178 120 38 L 121 35 C 124.639 37.0362 131.988 36.7227 133 32 L 137 33 L 129 32 L 127 25 L 129 27 L 134 28 L 133 21 L 136 17 C 133.107 15.2998 134.714 13.6741 136 11 L 130 4 L 124 4 L 126 1 z"/>
-</g>
-<g stroke="none" fill="#3c5c75">
-<path d="M 126 2 L 131 2 C 129.231 -0.0339203 127.769 -0.0339203 126 2 z"/>
-</g>
-<g stroke="none" fill="#0b1107">
-<path d="M 128 2 L 130 6 L 135 4 L 136 1 z"/>
-</g>
-<g stroke="none" fill="#536788">
-<path d="M 136 0 L 137 3 L 138 3 L 138 0 z"/>
-</g>
-<g stroke="none" fill="#0d130d">
-<path d="M 138 0 L 137 4 L 142 0 z"/>
-</g>
-<g stroke="none" fill="#6989b8">
-<path d="M 142 0 L 135 4 L 137 7 L 142 7 L 148 5 L 152 0 z"/>
-</g>
-<g stroke="none" fill="#080b03">
-<path d="M 148 5 C 143.13 4.48007 140.712 7.34641 140 12 L 144 12 L 144 13 L 138 12 L 135 15 L 137 28 L 133 29 L 133 30 L 137 31 L 134 38 L 139 37 L 146 32 L 143 35 L 143 36 L 147 36 L 146 39 L 148 44 L 149 44 L 149 41 L 153 37 L 160 41 L 161 30 L 163 32 L 171 32 L 177 27 C 174.289 26.4234 173.605 26.2325 173 29 L 167 27 L 162 19 L 167 19 L 170 11 L 167 10 L 165 15 L 163 13 L 157 15 L 154 12 L 154 10 L 161 7 L 161 8 L 156 12 L 166 11 L 166 10 L 163 6 L 157 6 L 164 3 L 167 1 C 160.938 -1.54364 151.807 -0.775223 148 5 z"/>
-</g>
-<g stroke="none" fill="#080b02">
-<path d="M 164 3 L 161 2 L 160 6 L 167 7 L 170 11 C 167.549 14.4574 167.079 16.1776 169 20 C 164.514 20.7155 160.88 25.7599 167 27 L 173 29 L 177 27 L 176 31 L 179 26 L 180 26 L 187 29 L 185 17 L 189 18 L 187 23 L 190 18 L 193 21 L 190 22 L 191 24 L 190 27 L 192 23 L 194 23 L 195 24 L 193 28 L 198 28 L 199 28 L 199 23 L 204 23 L 203 20 L 211 12 L 199 15 L 194 13 C 195.128 10.8213 196.181 8.48503 198 11 L 199 11 C 200.842 5.65083 200.236 0.916748 194 0 L 197 2 L 190 4 L 190 0 C 183.292 0 168.416 -2.80031 164 3 z"/>
-</g>
-<g stroke="none" fill="#698bc3">
-<path d="M 190 0 L 197 3 z"/>
-</g>
-<g stroke="none" fill="#070a02">
-<path d="M 198 0 L 203 4 L 199 11 L 195 9 L 194 13 L 201 10 L 211 12 L 203 20 L 204 24 L 199 29 L 198 26 L 194 27 L 198 32 L 194 34 L 202 34 L 202 37 L 206 37 L 206 38 L 203 39 L 204 43 L 208 42 L 213 35 L 212 27 L 215 23 L 212 23 L 212 21 L 219 19 L 217 25 L 225 24 L 223 19 L 226 20 C 227.418 16.1211 229.053 6.08276 224 5 L 226 1 z"/>
-</g>
-<g stroke="none" fill="#3b3e66">
-<path d="M 224 0 L 224 1 L 226 2 L 226 3 L 224 3 L 224 5 C 227.054 4.34558 226.936 2.99341 227 0 z"/>
-</g>
-<g stroke="none" fill="#3d3f63">
-<path d="M 35.6667 1.33333 L 36.3333 1.66667 L 35.6667 1.33333 z"/>
-</g>
-<g stroke="none" fill="#2f3c4d">
-<path d="M 124 1 C 124.654 4.05391 126.007 3.93576 129 4 z"/>
-</g>
-<g stroke="none" fill="#324053">
-<path d="M 134 1 L 135 4 L 136 4 L 137 1 z"/>
-</g>
-<g stroke="none" fill="#415583">
-<path d="M 210 5 L 215 2 C 212.012 1.01682 210.937 2.14995 210 5 z"/>
-</g>
-<g stroke="none" fill="#223b4f">
-<path d="M 24 2 L 24 8 L 27 4 L 25 3 L 27 3 z"/>
-</g>
-<g stroke="none" fill="#393f5f">
-<path d="M 42 2 L 42 6 L 43 6 z"/>
-</g>
-<g stroke="none" fill="#465681">
-<path d="M 185 2 L 185 4 L 187 2 z"/>
-</g>
-<g stroke="none" fill="#294155">
-<path d="M 190 2 L 197 4 L 197 3 z"/>
-</g>
-<g stroke="none" fill="#516c9b">
-<path d="M 25.6667 3.33333 L 26.3333 3.66667 L 25.6667 3.33333 z"/>
-</g>
-<g stroke="none" fill="#1e2335">
-<path d="M 212 3 C 212.958 6.30704 214.988 6.90497 217 4 z"/>
-</g>
-<g stroke="none" fill="#456083">
-<path d="M 218 6 L 221 3 z"/>
-</g>
-<g stroke="none" fill="#505564">
-<path d="M 50.3333 4.66667 L 50.6667 5.33333 L 50.3333 4.66667 z"/>
-</g>
-<g stroke="none" fill="#2a4050">
-<path d="M 130 7 L 136 5 z"/>
-</g>
-<g stroke="none" fill="#3c4f6f">
-<path d="M 142 7 L 143 7 L 145 5 C 142.86 3.88226 142.473 4.74921 142 7 z"/>
-</g>
-<g stroke="none" fill="#213144">
-<path d="M 157 6 L 160 4 z"/>
-</g>
-<g stroke="none" fill="#304457">
-<path d="M 189.333 4.66667 L 189.667 5.33333 L 189.333 4.66667 z"/>
-</g>
-<g stroke="none" fill="#516a9d">
-<path d="M 197 4 L 197 6 L 199 6 z"/>
-</g>
-<g stroke="none" fill="#4b5786">
-<path d="M 200 4 L 201 8 L 203 4 z"/>
-</g>
-<g stroke="none" fill="#070f0e">
-<path d="M 136 5 L 133 7 L 133 8 L 136 9 z"/>
-</g>
-<g stroke="none" fill="#25314c">
-<path d="M 205 5 L 206 9 L 207 9 z"/>
-</g>
-<g stroke="none" fill="#393d43">
-<path d="M 49 6 C 45.4451 13.614 40.5967 28.0531 33 32 L 33 33 L 31 42 C 38.5362 41.4178 40.2517 33.3922 42 27 L 47 29 L 48 29 L 44 26 z"/>
-</g>
-<g stroke="none" fill="#1c3345">
-<path d="M 133 8 L 140 11 L 141 6 z"/>
-</g>
-<g stroke="none" fill="#354459">
-<path d="M 154 10 L 154 12 L 158 13 L 158 12 L 156 11 L 161 8 z"/>
-</g>
-<g stroke="none" fill="#47537b">
-<path d="M 162 7 L 162 8 L 166 10 L 166 11 L 159 14 L 167 12 L 167 7 z"/>
-</g>
-<g stroke="none" fill="#658dbe">
-<path d="M 179.333 7.66667 L 179.667 8.33333 L 179.333 7.66667 z"/>
-</g>
-<g stroke="none" fill="#5b6e9c">
-<path d="M 188 7 L 190 9 L 190 7 z"/>
-</g>
-<g stroke="none" fill="#526a9c">
-<path d="M 24 8 L 25 12 L 26 12 L 26 8 z"/>
-</g>
-<g stroke="none" fill="#333959">
-<path d="M 33 8 L 31 11 L 31 12 L 35 12 z"/>
-</g>
-<g stroke="none" fill="#243441">
-<path d="M 143 8 L 143 9 L 152 11 z"/>
-</g>
-<g stroke="none" fill="#3f4a67">
-<path d="M 148 8 L 148 10 L 150 10 L 150 8 z"/>
-</g>
-<g stroke="none" fill="#2a395d">
-<path d="M 179 9 L 183 10 z"/>
-</g>
-<g stroke="none" fill="#2f4566">
-<path d="M 196 8 L 196 10 L 198 10 L 198 8 z"/>
-</g>
-<g stroke="none" fill="#556c9a">
-<path d="M 221 9 L 221 14 L 225 8 z"/>
-</g>
-<g stroke="none" fill="#5570a6">
-<path d="M 15 16 L 20 14 L 20 13 L 20 9 C 15.1861 9.55415 14.0063 11.2841 15 16 z"/>
-</g>
-<g stroke="none" fill="#274355">
-<path d="M 217 9 L 217 13 L 225 15 L 225 14 L 221 14 L 222 11 L 221 10 z"/>
-</g>
-<g stroke="none" fill="#5773a7">
-<path d="M 218 9 L 218 11 L 220 11 L 220 9 z"/>
-</g>
-<g stroke="none" fill="#7396d4">
-<path d="M 102 10 L 96 16 L 96 17 L 102 18 L 93 30 L 82 29 L 83 22 L 80 22 L 80 21 L 83 16 L 77 17 L 73 14 L 74 27 L 62 28 C 62.4426 36.1142 67.2138 35.3919 72 40 L 90 42 L 90 41 L 85 37 L 90 38 L 89 40 C 96.4162 42.1488 101.902 42.2996 109 39 L 106 36 L 111 37 C 110.472 29.3388 107.265 28.9229 100 28 L 105 24 L 104 27 L 114 24 L 116 18 L 109 19 L 105 16 C 105.803 12.5655 105.302 11.3279 102 10 z"/>
-</g>
-<g stroke="none" fill="#546e98">
-<path d="M 135 10 L 136 13 L 144 13 z"/>
-</g>
-<g stroke="none" fill="#253c5c">
-<path d="M 169 15 L 169 16 C 173.596 15.6337 177.65 15.2751 180 11 z"/>
-</g>
-<g stroke="none" fill="#242824">
-<path d="M 182 10 L 185 15 L 186 15 z"/>
-</g>
-<g stroke="none" fill="#5f7db5">
-<path d="M 201 10 L 202 14 L 203 14 L 203 10 z"/>
-</g>
-<g stroke="none" fill="#294a59">
-<path d="M 200 11 L 199 15 L 202 14 z"/>
-</g>
-<g stroke="none" fill="#3b4c6d">
-<path d="M 204 11 L 203 14 z"/>
-</g>
-<g stroke="none" fill="#32394b">
-<path d="M 135 12 L 133 17 L 138 14 L 138 13 z"/>
-</g>
-<g stroke="none" fill="#5979a3">
-<path d="M 158 12 L 157 15 z"/>
-</g>
-<g stroke="none" fill="#222a3f">
-<path d="M 164 12 L 163 15 z"/>
-</g>
-<g stroke="none" fill="#475573">
-<path d="M 24 14 L 24 15 L 27 16 z"/>
-</g>
-<g stroke="none" fill="#496b99">
-<path d="M 212 17 L 216 15 z"/>
-</g>
-<g stroke="none" fill="#688ac3">
-<path d="M 214 15 L 215 18 L 225 16 z"/>
-</g>
-<g stroke="none" fill="#474868">
-<path d="M 4 18 L 7 15 z"/>
-</g>
-<g stroke="none" fill="#445575">
-<path d="M 137 15 L 145 20 L 145 19 L 140 18 L 140 15 z"/>
-</g>
-<g stroke="none" fill="#5e76a1">
-<path d="M 147 21 L 151 19 L 151 15 C 147.723 15.6707 143.007 17.8771 147 21 z"/>
-</g>
-<g stroke="none" fill="#212c38">
-<path d="M 6 16 L 5 21 L 6 21 L 8 16 z"/>
-</g>
-<g stroke="none" fill="#3f537d">
-<path d="M 192 16 L 191 18 L 193 18 z"/>
-</g>
-<g stroke="none" fill="#47597c">
-<path d="M 201 16 L 200 19 z"/>
-</g>
-<g stroke="none" fill="#0f1309">
-<path d="M 185 17 L 185 20 L 185.837 27.0941 L 183 31 L 183 39 L 182 39 L 181 36 L 178 37 L 179 34 L 173 31 L 173 37 C 174.662 39.413 174.444 40.3925 172 42 L 173 38 L 170 41 L 165 41 L 164 37 C 167.483 36.2498 166.898 34.2783 164 33 C 162.03 37.8858 160.668 41.317 164 46 L 165 43 L 169 46 L 169 47 L 167 52 L 176 52 C 172.668 51.6438 170.967 51.5962 170 55 L 175 56 L 168 59 L 168 61 L 171 66 L 179.491 59.1945 L 192 52 L 188 53 L 188 49 L 185 50 L 186 54 L 185 54 L 180 48 L 183 45 L 180 41 L 185 41 L 189 49 L 195 48 L 193 46 L 193 45 L 207 45 L 205 52 L 199 51 L 199 64 L 203 64 L 200 55 L 207 56 L 211 58 L 213 49 L 218 38 L 218 37 L 215 38 L 214 34 L 216 34 L 212 28 L 213 35 C 209.457 36.6846 208.312 38.0695 208 42 L 204 43 L 203 39 L 206 38 L 206 37 L 202 37 L 202 34 L 196 33 L 195 34 L 196 37 L 191 35 L 191 34 L 193 30 L 198 32 L 195 28 L 192 26 L 188 24 L 191 23 L 190 20 L 187 23 L 189 18 z"/>
-</g>
-<g stroke="none" fill="#56699d">
-<path d="M 6 21 L 12 20 C 9.30334 18.2177 7.92081 18.4053 6 21 z"/>
-</g>
-<g stroke="none" fill="#394870">
-<path d="M 14.3333 18.6667 L 14.6667 19.3333 L 14.3333 18.6667 z"/>
-</g>
-<g stroke="none" fill="#416286">
-<path d="M 25 18 L 28 21 z"/>
-</g>
-<g stroke="none" fill="#bbbdb5">
-<path d="M 55 18 L 54 21 L 58 23 L 60 30 L 59 19 z"/>
-</g>
-<g stroke="none" fill="#3b5062">
-<path d="M 135 18 L 133 21 L 134 25 L 135 25 z"/>
-</g>
-<g stroke="none" fill="#213446">
-<path d="M 148 22 L 153 22 L 155 18 z"/>
-</g>
-<g stroke="none" fill="#273444">
-<path d="M 162 19 L 163 22 L 169 20 z"/>
-</g>
-<g stroke="none" fill="#293f59">
-<path d="M 175 18 L 174 23 C 177.03 22.1442 177.283 21.0805 177 18 z"/>
-</g>
-<g stroke="none" fill="#355777">
-<path d="M 180 18 L 182 21 L 182 18 z"/>
-</g>
-<g stroke="none" fill="#384339">
-<path d="M 190 18 L 193 21 z"/>
-</g>
-<g stroke="none" fill="#6c88bf">
-<path d="M 9 20 L 9 23 L 15 25 L 15 22 L 16 22 L 19 23 L 19 22 L 16 19 z"/>
-</g>
-<g stroke="none" fill="#3c5472">
-<path d="M 16 19 L 16 21 L 18 21 z"/>
-</g>
-<g stroke="none" fill="#5d79a8">
-<path d="M 142 19 L 141 24 L 139 26 C 142.478 24.6023 143.439 22.5257 142 19 z"/>
-</g>
-<g stroke="none" fill="#678cc4">
-<path d="M 218 19 L 215 23 z"/>
-</g>
-<g stroke="none" fill="#223848">
-<path d="M 223 19 L 223 22 L 225 19 z"/>
-</g>
-<g stroke="none" fill="#39637c">
-<path d="M 226 19 L 227 24 z"/>
-</g>
-<g stroke="none" fill="#1b2f37">
-<path d="M 27 21 L 29 25 z"/>
-</g>
-<g stroke="none" fill="#a4a49a">
-<path d="M 60 21 L 60 30 L 58 23 L 54 22 L 54 33 L 55 33 L 55 29 L 56 29 L 55 35 C 58.4562 41.4884 56.5445 45.5502 65 48 z"/>
-</g>
-<g stroke="none" fill="#3b4f6f">
-<path d="M 154 21 L 156 25 z"/>
-</g>
-<g stroke="none" fill="#5973a4">
-<path d="M 177.333 21.6667 L 177.667 22.3333 L 177.333 21.6667 z"/>
-<path d="M 22 25 L 21 29 L 25 29 L 24 25 z"/>
-</g>
-<g stroke="none" fill="#54658d">
-<path d="M 212 23 L 216 22 z"/>
-</g>
-<g stroke="none" fill="#393f22">
-<path d="M 15 22 L 17 28 L 21 24 z"/>
-</g>
-<g stroke="none" fill="#335c76">
-<path d="M 21 22 L 21 26 L 22 26 z"/>
-</g>
-<g stroke="none" fill="#565782">
-<path d="M 30.3333 22.6667 L 30.6667 23.3333 L 30.3333 22.6667 z"/>
-</g>
-<g stroke="none" fill="#3d5e7a">
-<path d="M 9.66667 23.3333 L 10.3333 23.6667 L 9.66667 23.3333 z"/>
-</g>
-<g stroke="none" fill="#474f7f">
-<path d="M 12 23 L 12 26 L 13 26 z"/>
-</g>
-<g stroke="none" fill="#5a77a2">
-<path d="M 26 23 L 25 27 L 30 24 z"/>
-</g>
-<g stroke="none" fill="#414b78">
-<path d="M 171 26 L 174 23 z"/>
-</g>
-<g stroke="none" fill="#56474b">
-<path d="M 192.667 23.3333 L 193.333 23.6667 L 192.667 23.3333 z"/>
-</g>
-<g stroke="none" fill="#475e83">
-<path d="M 199 23 L 199 29 L 200 29 L 204 24 z"/>
-</g>
-<g stroke="none" fill="#3b4849">
-<path d="M 215 23 L 215 26 L 218 26 L 218 23 z"/>
-</g>
-<g stroke="none" fill="#7399d6">
-<path d="M 100 28 C 106.91 29.3026 109.94 29.6255 111 37 L 106 36 L 109 39 C 101.382 41.572 96.7863 41.3959 89 40 L 90 38 L 85 37 L 90 41 L 90 42 L 72 40 L 63 35 L 68 52 L 69 52 L 69 49 C 72.348 48.7173 75.6279 47.8683 79 47.9028 C 83.4012 47.9478 88.2549 50.1855 91 46 L 110 46 L 111 43 L 115 45 L 114 48 C 118.36 48.0361 122.658 49.0153 127 48.9097 C 133.685 48.7472 143.638 45.124 149 50 L 150 50 L 151 45 L 146 37 L 139 36 L 134 38 L 134 34 L 121 35 L 120 38 C 114.423 35.6611 111.432 29.6918 110 24 L 104 27 L 105 24 z"/>
-</g>
-<g stroke="none" fill="#565d7f">
-<path d="M 150.667 24.3333 L 151.333 24.6667 L 150.667 24.3333 z"/>
-</g>
-<g stroke="none" fill="#7f887b">
-<path d="M 188.333 24.6667 L 188.667 25.3333 L 188.333 24.6667 z"/>
-</g>
-<g stroke="none" fill="#acadad">
-<path d="M 192.667 24.3333 L 193.333 24.6667 L 192.667 24.3333 z"/>
-</g>
-<g stroke="none" fill="#5a605b">
-<path d="M 194 24 L 191 25 L 194 29 z"/>
-</g>
-<g stroke="none" fill="#789bd4">
-<path d="M 214 24 L 216 34 L 214 34 L 215 38 L 218 37 L 218 38 L 213 47 L 218 51 L 214 52 L 216 56 L 213 57 L 215 59 L 215 60 C 213.144 63.3822 215.055 66.3166 215.366 70 C 215.978 77.2644 211.773 86.5107 221 89 L 222 83 L 220 80 C 223.265 78.2255 220.944 73.957 220 71 C 229.791 65.9786 227 51.1091 227 42 C 227 36.6993 228.19 31.3508 222 30 L 223 25 L 227 26 z"/>
-</g>
-<g stroke="none" fill="#637ba2">
-<path d="M 127 25 L 128 30 L 129 30 z"/>
-</g>
-<g stroke="none" fill="#1e2622">
-<path d="M 128.333 25.6667 L 128.667 26.3333 L 128.333 25.6667 z"/>
-</g>
-<g stroke="none" fill="#2a465e">
-<path d="M 135 25 L 134 28 L 137 28 z"/>
-</g>
-<g stroke="none" fill="#5c76a3">
-<path d="M 154 27 L 157 26 z"/>
-</g>
-<g stroke="none" fill="#10101c">
-<path d="M 223 25 L 225 31 L 227 31 L 227 26 z"/>
-</g>
-<g stroke="none" fill="#4f527e">
-<path d="M 19 26 L 18 33 L 20 30 L 21 30 L 21 32 L 22 32 z"/>
-</g>
-<g stroke="none" fill="#55719b">
-<path d="M 130 26 L 134 31 L 133 26 z"/>
-</g>
-<g stroke="none" fill="#4e5d84">
-<path d="M 148.667 26.3333 L 149.333 26.6667 L 148.667 26.3333 z"/>
-</g>
-<g stroke="none" fill="#474f55">
-<path d="M 179 26 L 181 33 L 176 32 L 176 33 L 179 34 L 178 37 L 181 36 L 182 39 L 183 39 L 183 31 L 186 30 L 186 29 z"/>
-</g>
-<g stroke="none" fill="#6b80bd">
-<path d="M 208 26 L 208 28 L 210 28 L 210 26 z"/>
-</g>
-<g stroke="none" fill="#516485">
-<path d="M 222 26 L 224 30 L 225 30 z"/>
-</g>
-<g stroke="none" fill="#95938b">
-<path d="M 42 27 L 39 36 L 41 39 L 51 39 L 51 40 L 46 41 L 46 42 L 53 42 L 53 34 L 48 33 L 46 38 L 45 33 L 41 34 L 46 32 L 46 27 z"/>
-</g>
-<g stroke="none" fill="#676260">
-<path d="M 46 27 L 46 32 L 41 34 L 45 33 L 46 38 L 48 33 L 53 34 L 53 33 L 48 32 z"/>
-</g>
-<g stroke="none" fill="#191d15">
-<path d="M 129 27 L 129 30 L 130 30 z"/>
-</g>
-<g stroke="none" fill="#515c80">
-<path d="M 142 27 L 142 30 L 144 27 z"/>
-</g>
-<g stroke="none" fill="#2f405f">
-<path d="M 152 27 L 154 32 L 155 32 z"/>
-</g>
-<g stroke="none" fill="#3a5274">
-<path d="M 207 27 L 210 29 L 210 28 z"/>
-</g>
-<g stroke="none" fill="#324962">
-<path d="M 212.667 27.3333 L 213.333 27.6667 L 212.667 27.3333 z"/>
-</g>
-<g stroke="none" fill="#253439">
-<path d="M 222 28 L 222 30 L 224 30 L 224 28 z"/>
-</g>
-<g stroke="none" fill="#46718f">
-<path d="M 12 32 L 17 29 z"/>
-</g>
-<g stroke="none" fill="#385267">
-<path d="M 26 29 L 26 31 L 28 31 L 28 29 z"/>
-</g>
-<g stroke="none" fill="#c7cac5">
-<path d="M 55 29 L 57 34 z"/>
-</g>
-<g stroke="none" fill="#7393ca">
-<path d="M 20.3333 30.6667 L 20.6667 31.3333 L 20.3333 30.6667 z"/>
-</g>
-<g stroke="none" fill="#515e7e">
-<path d="M 129.333 30.6667 L 129.667 31.3333 L 129.333 30.6667 z"/>
-</g>
-<g stroke="none" fill="#2c3134">
-<path d="M 130 30 L 130 32 L 132 32 L 132 30 z"/>
-</g>
-<g stroke="none" fill="#203037">
-<path d="M 161 30 L 161 37 L 162 37 z"/>
-</g>
-<g stroke="none" fill="#526891">
-<path d="M 162 30 L 164 36 L 168 34 L 170 30 z"/>
-</g>
-<g stroke="none" fill="#1d272c">
-<path d="M 171 31 L 172 35 L 173 35 L 173 31 L 181 33 C 178.533 29.6259 174.767 29.9813 171 31 z"/>
-</g>
-<g stroke="none" fill="#51504a">
-<path d="M 193 30 L 191 34 L 191 35 L 196 37 z"/>
-</g>
-<g stroke="none" fill="#6b79af">
-<path d="M 13 31 L 12 35 L 15 31 z"/>
-</g>
-<g stroke="none" fill="#2d3044">
-<path d="M 169 31 L 168 34 z"/>
-</g>
-<g stroke="none" fill="#4e6996">
-<path d="M 133 32 L 134 36 L 135 36 z"/>
-</g>
-<g stroke="none" fill="#5a7ba8">
-<path d="M 139 35 L 140 38 L 146 32 z"/>
-</g>
-<g stroke="none" fill="#506491">
-<path d="M 170 32 L 170 34 L 172 34 L 172 32 z"/>
-</g>
-<g stroke="none" fill="#7b9bd6">
-<path d="M 33 33 L 22 34 L 22 46 C 29.9838 45.2672 32.4172 40.108 35 33 z"/>
-</g>
-<g stroke="none" fill="#5f80b6">
-<path d="M 149 34 L 149 35 L 153 34 z"/>
-</g>
-<g stroke="none" fill="#698ac2">
-<path d="M 167 34 L 172 36 L 172 34 z"/>
-</g>
-<g stroke="none" fill="#3f5263">
-<path d="M 10 34 L 11 38 L 15 34 z"/>
-</g>
-<g stroke="none" fill="#434c61">
-<path d="M 23 34 L 23 35 L 27 35 z"/>
-</g>
-<g stroke="none" fill="#babbb0">
-<path d="M 53 34 C 53.0034 38.4428 52.3984 42.1502 57 44 L 57 36 L 55 39 L 54 39 z"/>
-</g>
-<g stroke="none" fill="#7da1dd">
-<path d="M 160 35 L 160 41 L 151.025 48.902 L 142.996 47.2724 L 126.996 48.794 L 114 48 L 115 45 L 111 43 L 110 46 L 91 46 L 78 47.6088 L 69 49 L 70 59 L 71 59 L 71 56 L 90.9606 54.3927 L 97.1698 55.7716 L 109 54.4205 L 122 54 C 125.29 55.2028 132.071 57.2466 133 53 C 137.614 55.57 142.794 57.4169 148 56 L 145 61 L 146 64 L 144 67 L 148 67 L 147 70 L 151 68 L 163 65 L 163 68 L 164 68 L 171 66 L 168 61 L 172 56 L 166 54 L 162 56 L 167 52 L 169 47 L 169 46 L 165 43 L 164 46 z"/>
-</g>
-<g stroke="none" fill="#355062">
-<path d="M 167 35 L 164 37 L 165 41 L 166 41 L 167 38 L 175 40 L 174 35 z"/>
-</g>
-<g stroke="none" fill="#7989b4">
-<path d="M 199 35 L 199 37 L 201 37 L 201 35 z"/>
-</g>
-<g stroke="none" fill="#4a483e">
-<path d="M 3 36 L 3 39 L 4 39 L 5 36 z"/>
-</g>
-<g stroke="none" fill="#3f4c66">
-<path d="M 16 36 L 16 37 L 20 38 L 20 37 z"/>
-</g>
-<g stroke="none" fill="#515772">
-<path d="M 20.6667 36.3333 L 21.3333 36.6667 L 20.6667 36.3333 z"/>
-</g>
-<g stroke="none" fill="#77746c">
-<path d="M 38 36 L 37 40 L 45 41 L 45 42 L 41 42 L 41 43 L 53 43 L 53 42 L 46 42 L 46 41 L 51 40 L 51 39 C 47.0129 38.9969 43.3323 39.5976 41 36 z"/>
-<path d="M 90 100 L 90 102 L 93 102 L 93 100 z"/>
-</g>
-<g stroke="none" fill="#5d7295">
-<path d="M 135 38 L 138 38 L 137 36 z"/>
-</g>
-<g stroke="none" fill="#3f4d64">
-<path d="M 141 38 L 147 38 C 145.053 35.7691 142.947 35.7691 141 38 z"/>
-</g>
-<g stroke="none" fill="#98b9ec">
-<path d="M 12 37 L 9 48 C 11.5599 49.7951 11.0749 50.8499 9 53 C 10.1014 57.2762 10.3303 60.683 15 62 L 15 75 L 18 74 L 15 81 L 17 83 L 10 90 L 7 88 L 9 95 L 5 94 L 6 98 L 11 96 L 10 100 L 10 101 L 12 105 L 9 104 L 9 105 L 12 106 L 9.66667 112.5 L 4 117 L 16 118 L 23.6991 73 L 23.179 62 L 25 47 C 17.1337 46.5691 16.705 41.8118 12 37 z"/>
-</g>
-<g stroke="none" fill="#3a5a7d">
-<path d="M 153 37 L 152 42 L 156 42 L 156 41 z"/>
-</g>
-<g stroke="none" fill="#2f3b45">
-<path d="M 154 37 L 157 41 z"/>
-</g>
-<g stroke="none" fill="#4f709e">
-<path d="M 166 41 L 170 41 L 169 38 z"/>
-</g>
-<g stroke="none" fill="#323d56">
-<path d="M 146 39 L 147 44 L 148 44 z"/>
-</g>
-<g stroke="none" fill="#4e709e">
-<path d="M 172 39 L 175 42 L 174 39 z"/>
-</g>
-<g stroke="none" fill="#7b7374">
-<path d="M 198 39 L 197 41 L 199 41 z"/>
-</g>
-<g stroke="none" fill="#3f466f">
-<path d="M 11 40 L 11 44 L 12 44 z"/>
-</g>
-<g stroke="none" fill="#262d31">
-<path d="M 22 40 L 22 43 L 25 43 L 25 40 z"/>
-</g>
-<g stroke="none" fill="#a1a39c">
-<path d="M 36 41 L 36 42 L 45 42 z"/>
-</g>
-<g stroke="none" fill="#192737">
-<path d="M 149 41 L 155 45 L 156 42 L 152 40 z"/>
-</g>
-<g stroke="none" fill="#33456a">
-<path d="M 161.333 40.6667 L 161.667 41.3333 L 161.333 40.6667 z"/>
-</g>
-<g stroke="none" fill="#31393f">
-<path d="M 180 41 L 180 45 L 185 54 L 186 54 L 188 49 L 188 53 L 192 49 L 185 41 z"/>
-</g>
-<g stroke="none" fill="#2c2310">
-<path d="M 3 42 L 3 46 L 0 46 L 0 88 C 2.62023 89.4336 9.98833 95.4703 7 88 L 10 85 L 6 86 L 6 82 L 12 83 L 11 80 L 14 79 L 14 78 L 7 79 L 13 63 L 9 63 C 11.4397 54.5934 6.78282 49.1851 3 42 z"/>
-</g>
-<g stroke="none" fill="#272725">
-<path d="M 34 43 L 34 45 L 53 45 L 53 43 z"/>
-</g>
-<g stroke="none" fill="#2b2f1e">
-<path d="M 8 43 L 9 46 L 6 45 L 10 47 L 11 43 z"/>
-</g>
-<g stroke="none" fill="#4f5049">
-<path d="M 53 43 L 49 45 L 49 46 L 64.5818 52.5532 L 70 59 C 69.146 49.2936 61.7254 45.5136 53 43 z"/>
-</g>
-<g stroke="none" fill="#53678f">
-<path d="M 148 45 L 151 43 z"/>
-</g>
-<g stroke="none" fill="#11150e">
-<path d="M 150 44 L 150 49 L 154 43 z"/>
-</g>
-<g stroke="none" fill="#3c4948">
-<path d="M 193 45 L 193 46 L 197 52 L 192 52 L 192 55 L 197 56 L 199 45 L 198 44 z"/>
-</g>
-<g stroke="none" fill="#8f908a">
-<path d="M 198 51 L 201 50 L 205 52 L 204 49 L 207 45 L 201 47 L 203 45 C 198.738 43.5556 198.192 47.5339 198 51 z"/>
-</g>
-<g stroke="none" fill="#474a3f">
-<path d="M 201 47 L 205 44 z"/>
-</g>
-<g stroke="none" fill="#a09b92">
-<path d="M 34 45 L 33 60 L 34 60 L 35 56 L 37 56 L 38 60 L 40 60 C 40.485 56.9526 39.4265 52.9823 40.6173 50.1674 C 41.8492 47.2553 45.1233 47.9926 45.3426 51.0486 C 45.5303 53.664 43.6143 56.4873 43 59 L 51 62 L 40 61 L 39 61 L 33.027 64.7377 L 31.4205 73 L 28 95 L 45.2577 93.9722 L 47.169 86 L 49 65 L 61 67 L 64 71 L 61 63 L 58 66 L 57 66 L 57 62 L 53 64 L 52 47 L 57 48 C 50.7824 43.728 41.2311 45 34 45 z"/>
-</g>
-<g stroke="none" fill="#3b3d3d">
-<path d="M 23 66 L 24 66 L 24 62 L 27 63 L 27 59 L 29 61 L 34 46 C 24.0415 48.9582 23.0256 56.7241 23 66 z"/>
-</g>
-<g stroke="none" fill="#4e555e">
-<path d="M 183 46 L 180 48 L 184 51 z"/>
-</g>
-<g stroke="none" fill="#313644">
-<path d="M 212 46 L 214 48 C 213.08 51.422 211.792 55.0983 216 56 L 214 52 L 218 51 z"/>
-</g>
-<g stroke="none" fill="#55697b">
-<path d="M 6 47 L 9 53 L 11 53 L 12 48 z"/>
-</g>
-<g stroke="none" fill="#4b5951">
-<path d="M 41 47 L 41 48 L 45 48 z"/>
-</g>
-<g stroke="none" fill="#d7d3cb">
-<path d="M 52 47 L 51 59 L 54 58 L 56 63 L 59 60 C 59.614 62.8508 60.3027 62.8544 63 62 L 67 72 L 68 72 L 68 61 L 67 61 L 67 65 C 66.0312 61.4762 67.5073 57.4955 66.2184 54.1883 C 64.2323 49.0923 56.6594 47.9165 52 47 z"/>
-</g>
-<g stroke="none" fill="#466787">
-<path d="M 153.333 47.6667 L 153.667 48.3333 L 153.333 47.6667 z"/>
-</g>
-<g stroke="none" fill="#3e5878">
-<path d="M 175 47 L 177 50 L 177 47 z"/>
-</g>
-<g stroke="none" fill="#a39f9b">
-<path d="M 195 47 L 192 52 L 197 52 z"/>
-</g>
-<g stroke="none" fill="#3e493e">
-<path d="M 40 48 L 40 53 L 41 53 z"/>
-</g>
-<g stroke="none" fill="#060805">
-<path d="M 41 48 L 40 55 L 45 55 L 45 48 z"/>
-</g>
-<g stroke="none" fill="#6d6058">
-<path d="M 45 48 L 45 53 L 46 53 z"/>
-</g>
-<g stroke="none" fill="#444a6a">
-<path d="M 213 48 C 210.062 52.1943 210.332 57.4078 214 61 L 215 60 L 215 57 z"/>
-</g>
-<g stroke="none" fill="#49505c">
-<path d="M 150 49 L 150 50 L 153 50 z"/>
-</g>
-<g stroke="none" fill="#020503">
-<path d="M 29 50 L 28 57 L 30 57 z"/>
-</g>
-<g stroke="none" fill="#434f69">
-<path d="M 170 50 L 166 52 L 170 55 z"/>
-</g>
-<g stroke="none" fill="#2a3743">
-<path d="M 171 52 L 176 52 C 174.231 49.9661 172.769 49.9661 171 52 z"/>
-</g>
-<g stroke="none" fill="#495747">
-<path d="M 200 50 L 202 53 z"/>
-</g>
-<g stroke="none" fill="#0b110d">
-<path d="M 57 51 L 57 59 L 60 59 L 60 51 z"/>
-</g>
-<g stroke="none" fill="#4e3e35">
-<path d="M 60 52 L 60 55 L 61 55 z"/>
-</g>
-<g stroke="none" fill="#5c7caf">
-<path d="M 163 52 L 162 56 L 166 57 L 167 53 z"/>
-</g>
-<g stroke="none" fill="#42524c">
-<path d="M 56 53 L 56 58 L 57 58 z"/>
-</g>
-<g stroke="none" fill="#82a5e0">
-<path d="M 133 53 C 130.403 56.3024 125.721 54.888 122 54 L 105 54.0995 L 97.5139 55.4367 L 89.9853 54.2785 L 71 56 L 68 67 L 100 64 L 99 66 C 105.395 65.1341 110.974 59.1441 117 64 L 118 64 L 118 60 L 131 62 L 131 66 C 127.59 66.2626 126.099 66.6787 125 70 L 130 70 L 130 71 L 128 73 C 132.058 70.9579 140.023 65.2201 142 73 L 151 71 L 151 70 L 147 70 L 148 67 L 144 67 L 146 64 L 145 61 L 148 56 z"/>
-</g>
-<g stroke="none" fill="#1c2525">
-<path d="M 162 53 L 162 55 L 164 55 L 164 53 z"/>
-</g>
-<g stroke="none" fill="#7d766e">
-<path d="M 40 55 L 41 58 L 45 56 z"/>
-</g>
-<g stroke="none" fill="#ad9d95">
-<path d="M 60 55 L 60 59 L 61 59 z"/>
-</g>
-<g stroke="none" fill="#315470">
-<path d="M 171 55 L 170 57 L 170 58 L 175 56 z"/>
-</g>
-<g stroke="none" fill="#404448">
-<path d="M 175 63 L 175 64 L 175 65 L 177 72 L 175 72 L 175 66 L 173 66 L 177 87 C 172.654 87.6495 174.895 94.6231 175 98 L 173 98 L 171 84 L 170 84 C 167.304 86.6447 165.696 86.6447 163 84 L 162 84 L 161 99 L 162 101 L 167 103 L 180 103 L 180 107 L 202 102 L 202 101 C 197.215 99.5473 197.281 96.5272 196.715 92 C 195.835 84.9504 196.162 77.8354 194 71 L 196 71 L 192 55 C 185.035 56.1839 180.107 58.3027 175 63 z"/>
-</g>
-<g stroke="none" fill="#8e8d85">
-<path d="M 192 55 L 193 64 L 194 64 L 197 58 L 197 56 z"/>
-</g>
-<g stroke="none" fill="#50524a">
-<path d="M 200 55 L 203 57 z"/>
-</g>
-<g stroke="none" fill="#766567">
-<path d="M 32 56 L 32 60 L 33 60 z"/>
-</g>
-<g stroke="none" fill="#686c63">
-<path d="M 35 56 L 35 58 L 37 58 L 37 56 z"/>
-</g>
-<g stroke="none" fill="#857571">
-<path d="M 205 56 L 205 58 L 207 58 L 207 56 z"/>
-</g>
-<g stroke="none" fill="#87847a">
-<path d="M 67 57 L 66 65 L 67 65 z"/>
-</g>
-<g stroke="none" fill="#a4a39e">
-<path d="M 202 57 L 204 65 L 199 65 L 198 58 C 193.398 59.8498 194.003 63.5572 194 68 L 195 68 L 196 65 L 204 69 L 205 69 L 212 68 L 209 61 L 205 61 L 205 60 L 211 59 z"/>
-</g>
-<g stroke="none" fill="#2f2823">
-<path d="M 34 58 L 38 63 L 38 58 z"/>
-</g>
-<g stroke="none" fill="#0d0f0c">
-<path d="M 40 58 L 40 61 L 43 61 L 43 58 z"/>
-</g>
-<g stroke="none" fill="#131612">
-<path d="M 46 58 L 49 62 L 50 59 z"/>
-</g>
-<g stroke="none" fill="#1c201c">
-<path d="M 53 58 L 54 64 z"/>
-</g>
-<g stroke="none" fill="#766467">
-<path d="M 198 58 L 198 61 L 199 61 z"/>
-</g>
-<g stroke="none" fill="#262722">
-<path d="M 27 59 L 27 63 L 24 62 L 20.4236 94 L 17 105 C 17.5448 108.93 15.3012 114.993 20 116 L 17 122 L 22 120 L 16 129 L 22 127 L 23 130 L 20 131 L 22 140 L 23 140 L 26.9198 108 L 30.4336 97.0278 L 46 96 L 46 95 L 28 95 C 30.4939 84.8769 34.5689 69.1678 32 59 z"/>
-</g>
-<g stroke="none" fill="#5a584f">
-<path d="M 43 59 L 43 63 L 47 63 L 46 59 z"/>
-</g>
-<g stroke="none" fill="#010302">
-<path d="M 184 59 L 184 67 C 188.773 65.4155 188.773 60.5845 184 59 z"/>
-<path d="M 164 164 L 161 169 L 161 170 L 167 170 L 166 164 z"/>
-</g>
-<g stroke="none" fill="#c5cac5">
-<path d="M 205 60 L 205 61 L 209 61 L 210 67 L 211 67 L 211 61 L 212 61 L 211 68 L 211 69 L 213 73 L 216 73 C 215.369 65.2709 213.954 58.439 205 60 z"/>
-</g>
-<g stroke="none" fill="#5a6385">
-<path d="M 9 60 L 9 63 L 13 63 L 13 68 L 14 68 L 15 62 z"/>
-</g>
-<g stroke="none" fill="#6c5e52">
-<path d="M 33 60 L 33 64 L 34 64 L 35 60 z"/>
-</g>
-<g stroke="none" fill="#666c5f">
-<path d="M 38 60 L 38 63 L 39 63 L 40 60 z"/>
-</g>
-<g stroke="none" fill="#31342f">
-<path d="M 50 60 L 46 61 L 46 62 C 48.2622 62.5122 50.4739 62.8194 50 60 z"/>
-</g>
-<g stroke="none" fill="#a79992">
-<path d="M 57 60 L 59 62 L 59 60 z"/>
-</g>
-<g stroke="none" fill="#83a7e3">
-<path d="M 118 60 L 118 64 L 117 64 C 112.17 58.0354 104.623 64.6921 99 66 L 100 64 L 68 67 L 66 72 L 66 94 L 67 94 L 70 92 L 70 80 C 73.1488 81.6382 76.4075 82.9667 79 80 L 80 80 L 79 94 L 84 94 L 84 80 L 86 83 C 89.1942 82.9865 91.2708 83.4028 92 80 L 93 80 L 93 96 L 97 96 L 98 81 L 99 81 L 99 84 L 107 83 L 107 95 L 110 95 L 111 82 C 113.945 83.5312 116.595 84.7504 119 82 L 120 82 L 120 96 L 121 96 L 122 75 L 117 76 L 122 64 L 123 64 L 123 77 L 132 74 L 133 74 L 134 74 L 134 76 L 142 75 C 146.089 76.1994 149.719 75.9482 152 72 L 169 69 L 164 75 L 164 76 L 170 76 L 170 77 L 166 77 L 175 81 L 173 66 L 163 68 L 163 65 L 162 65 L 151 68 L 142 73 C 140.383 65.3694 131.919 70.0675 128 73 L 130 71 L 130 70 L 125 70 L 131 66 L 131 62 z"/>
-</g>
-<g stroke="none" fill="#313231">
-<path d="M 40 63 L 44 62 z"/>
-</g>
-<g stroke="none" fill="#332421">
-<path d="M 57 61 L 57 66 L 58 66 z"/>
-</g>
-<g stroke="none" fill="#20211b">
-<path d="M 211 61 L 211 64 L 212 64 z"/>
-</g>
-<g stroke="none" fill="#867c70">
-<path d="M 62.3333 62.6667 L 62.6667 63.3333 L 62.3333 62.6667 z"/>
-</g>
-<g stroke="none" fill="#574f4d">
-<path d="M 203 62 L 199 64 L 199 65 C 201.45 64.8795 204.095 64.9051 203 62 z"/>
-</g>
-<g stroke="none" fill="#647381">
-<path d="M 226 62 C 225.225 65.5284 223.725 67.6369 227 70 z"/>
-</g>
-<g stroke="none" fill="#5b4c44">
-<path d="M 61 63 L 64 73 L 65 73 C 65.9996 68.6222 64.104 66.0366 61 63 z"/>
-</g>
-<g stroke="none" fill="#7e656f">
-<path d="M 212 63 L 212 68 L 213 68 z"/>
-</g>
-<g stroke="none" fill="#8e7b77">
-<path d="M 63 64 L 65 67 z"/>
-</g>
-<g stroke="none" fill="#605266">
-<path d="M 122 64 L 121 75 L 122 75 z"/>
-</g>
-<g stroke="none" fill="#1e2229">
-<path d="M 174 64 L 175 72 L 177 72 z"/>
-</g>
-<g stroke="none" fill="#cec5b9">
-<path d="M 49 65 L 47 86 C 52.9135 87.3545 62.2218 83.3221 61.5316 92.9761 L 61 98 C 56.9436 94.3816 54.5708 92.7357 49 94 L 48 92 L 50 89 L 46 95 L 62 101 L 68 95 L 64 85 L 64 84 L 67 73 L 64 73 L 61 67 z"/>
-</g>
-<g stroke="none" fill="#4d4845">
-<path d="M 196 65 L 196 67 L 198 67 z"/>
-</g>
-<g stroke="none" fill="#556987">
-<path d="M 16 67 L 16 69 L 18 69 z"/>
-</g>
-<g stroke="none" fill="#080e08">
-<path d="M 195 67 L 199 72 L 199 67 z"/>
-</g>
-<g stroke="none" fill="#050b07">
-<path d="M 201 67 L 201 71 L 203 71 L 203 67 z"/>
-</g>
-<g stroke="none" fill="#111615">
-<path d="M 206 67 L 205 71 L 208 67 z"/>
-</g>
-<g stroke="none" fill="#313446">
-<path d="M 12 68 L 8 73 L 7 75 L 6 75 L 7 79 L 16 79 L 16 69 z"/>
-</g>
-<g stroke="none" fill="#1c2220">
-<path d="M 189 70 C 186.303 69.1456 185.614 69.1492 185 72 C 182.054 71.254 180.689 70.8029 180 74 L 178 73 L 178 76 L 175 79 L 180 75 L 182 76 L 189 71 L 191 72 L 193 68 z"/>
-</g>
-<g stroke="none" fill="#3b3c37">
-<path d="M 199 68 C 200.739 72.4291 203.589 72.6157 208 72 L 208 71 L 204 68 L 202 71 z"/>
-</g>
-<g stroke="none" fill="#574945">
-<path d="M 208 68 L 215 76 L 215 72 z"/>
-</g>
-<g stroke="none" fill="#480314">
-<path d="M 120 69 L 117 76 L 121 75 z"/>
-</g>
-<g stroke="none" fill="#85abe7">
-<path d="M 152 72 C 148.966 75.1425 146.245 75.438 142 75 L 134 74 L 133 74 L 132 74 L 132 76 C 125.3 74.9564 123.077 77.527 123 84 L 124 84 L 124 82 L 125 82 L 132.5 86.3333 L 134 96 L 136 96 L 137 83 L 146 84 L 147 97 L 149 97 L 150 83 L 151 83 L 151 86 L 158 84 L 159 84 L 160 97 L 162 97 L 162 84 L 163 84 C 165.1 86.4034 167.9 86.4034 170 84 L 171 84 L 173 98 L 175 98 L 176 81 L 166 77 L 170 77 L 170 76 L 164 76 L 164 75 L 169 69 z"/>
-</g>
-<g stroke="none" fill="#6e89b9">
-<path d="M 220 71 L 220 80 L 222 83 L 219 84 L 220 90 C 223.811 87.2109 226.783 82.8031 226.981 78 C 227.213 72.3582 226.208 67.8464 220 71 z"/>
-</g>
-<g stroke="none" fill="#897e76">
-<path d="M 66.3333 70.6667 L 66.6667 71.3333 L 66.3333 70.6667 z"/>
-</g>
-<g stroke="none" fill="#8b8985">
-<path d="M 199 70 L 194 71 L 196.576 92 L 198.603 100.062 L 210 102.133 L 218 105 L 220 98 L 219 96 L 214.683 78.1042 L 210 72 z"/>
-</g>
-<g stroke="none" fill="#676d67">
-<path d="M 205 72 L 205 73 L 210 72 z"/>
-</g>
-<g stroke="none" fill="#637baf">
-<path d="M 122 73 L 122 95 L 124 95 z"/>
-</g>
-<g stroke="none" fill="#4b5c70">
-<path d="M 7 74 L 7 77 L 9 74 z"/>
-</g>
-<g stroke="none" fill="#6d8ab4">
-<path d="M 14 74 C 15.5802 76.1459 16.4623 76.1704 18 74 z"/>
-</g>
-<g stroke="none" fill="#adaeac">
-<path d="M 200 76 L 199 80 L 205 80 z"/>
-</g>
-<g stroke="none" fill="#436576">
-<path d="M 22 78 L 22 83 L 23 83 z"/>
-</g>
-<g stroke="none" fill="#3f3d2e">
-<path d="M 13 79 L 12 83 L 8 86 L 13 88 z"/>
-</g>
-<g stroke="none" fill="#8090ba">
-<path d="M 14 79 L 13 88 L 9 87 L 9 88 L 10 90 L 17 83 L 16 79 z"/>
-</g>
-<g stroke="none" fill="#aeada8">
-<path d="M 70 80 L 70 84 L 78 84 L 78 85 L 70 85 L 67 92 L 71 100 L 69 100 L 69 101 L 76 97 L 76 101 L 80 97 L 83 99 L 88 98 L 93 100 L 95 98 L 100 100 L 102 98 L 104 100 L 109 99 L 114 101 L 115 99 L 118 101 L 122 99 L 126 102 L 125 103 L 134 101 L 133 98 C 137.727 99.0283 142.362 97.2628 145 102 L 153 102 L 151 103 L 151 104 L 155 99 C 151.3 97.1349 150.308 95.0887 150 91 L 149 91 L 149 97 L 147 97 L 147 87 L 146 87 L 138 88 L 138 97 L 134 97 L 134 87 L 124 88 L 124 95 L 120 96 L 120 87 L 113 87 L 113 86 L 120 86 L 120 82 L 119 82 L 111 82 L 111 96 L 107 96 L 107 87 L 98 86 L 98 85 L 107 83 C 103.464 83.6176 101.09 84.1886 99 81 L 98 81 L 97 96 L 93 96 L 93 86 L 84 86 L 84 94 L 79 94 L 80 80 L 79 80 z"/>
-</g>
-<g stroke="none" fill="#9ca3b3">
-<path d="M 84 80 L 84 84 L 92 84 L 92 83 z"/>
-</g>
-<g stroke="none" fill="#898b8a">
-<path d="M 92 80 L 92 84 L 87 84 L 87 85 L 93 85 z"/>
-</g>
-<g stroke="none" fill="#64514f">
-<path d="M 39 81 L 38 84 z"/>
-</g>
-<g stroke="none" fill="#585f74">
-<path d="M 6 82 L 6 86 L 8 86 L 8 82 z"/>
-</g>
-<g stroke="none" fill="#999d9d">
-<path d="M 124 82 L 124 87 L 133 87 L 133 85 z"/>
-</g>
-<g stroke="none" fill="#66729e">
-<path d="M 176 82 L 176 87 L 177 87 z"/>
-</g>
-<g stroke="none" fill="#9d9e9d">
-<path d="M 137 83 C 138.456 87.3866 141.85 86.9853 146 87 L 146 86 z"/>
-</g>
-<g stroke="none" fill="#565a66">
-<path d="M 150 83 L 149 91 L 150 91 L 150 87 L 159 90 L 151 89 L 152 98 L 152 99 L 158 104 L 163 99 L 159 84 L 158 84 C 154.861 86.337 152.737 85.6093 150 83 z"/>
-</g>
-<g stroke="none" fill="#4c5e73">
-<path d="M 226 83 L 222 86 L 223 90 L 224 90 L 227 87 z"/>
-</g>
-<g stroke="none" fill="#426478">
-<path d="M 21 84 L 21 88 L 22 88 z"/>
-</g>
-<g stroke="none" fill="#786d63">
-<path d="M 64.6667 84.3333 L 65.3333 84.6667 L 64.6667 84.3333 z"/>
-</g>
-<g stroke="none" fill="#666764">
-<path d="M 70 84 L 70 85 L 78 85 z"/>
-</g>
-<g stroke="none" fill="#4b504d">
-<path d="M 84 84 L 93 86 z"/>
-</g>
-<g stroke="none" fill="#4e5965">
-<path d="M 145.333 84.6667 L 145.667 85.3333 L 145.333 84.6667 z"/>
-</g>
-<g stroke="none" fill="#99887d">
-<path d="M 54.3333 85.6667 L 54.6667 86.3333 L 54.3333 85.6667 z"/>
-</g>
-<g stroke="none" fill="#e1e0d8">
-<path d="M 55 85 L 47 86 L 50 89 L 48 91 L 48 92 L 49 94 L 61 98 C 61.8589 91.1976 62.7421 86.7304 55 85 z"/>
-</g>
-<g stroke="none" fill="#646564">
-<path d="M 98 85 L 98 86 L 107 87 L 107 85 z"/>
-</g>
-<g stroke="none" fill="#6f85af">
-<path d="M 136 85 L 134 96 L 134 97 C 138.247 96.09 138.326 87.7872 136 85 z"/>
-</g>
-<g stroke="none" fill="#7a93be">
-<path d="M 110 86 L 107 95 L 107 96 L 111 96 z"/>
-</g>
-<g stroke="none" fill="#5c605e">
-<path d="M 113 86 L 113 87 L 120 87 z"/>
-</g>
-<g stroke="none" fill="#55709b">
-<path d="M 164 86 L 164 87 L 169 87 z"/>
-</g>
-<g stroke="none" fill="#5f79a2">
-<path d="M 225 86 L 224 90 L 223 90 L 222 88 L 216 88 L 216 95 L 220 95 L 222 93 L 223 97 L 224 97 L 226 95 z"/>
-</g>
-<g stroke="none" fill="#565954">
-<path d="M 124 87 L 124 88 L 133 88 z"/>
-</g>
-<g stroke="none" fill="#797a77">
-<path d="M 137 87 L 137 97 L 138 97 L 138 88 L 146 89 z"/>
-</g>
-<g stroke="none" fill="#3c464e">
-<path d="M 150 87 C 150.001 91.5245 149.017 96.3461 154 98 L 154 97 L 151 89 L 159 90 z"/>
-</g>
-<g stroke="none" fill="#2f3841">
-<path d="M 0 88 L 0 95 L 7 94 L 7 93 L 2 91 L 3 88 z"/>
-</g>
-<g stroke="none" fill="#5d7c9f">
-<path d="M 172 88 L 172 92 L 173 92 z"/>
-</g>
-<g stroke="none" fill="#69769e">
-<path d="M 2.33333 89.6667 L 2.66667 90.3333 L 2.33333 89.6667 z"/>
-</g>
-<g stroke="none" fill="#6b709d">
-<path d="M 8 91 L 6 95 C 8.64888 94.4324 9.3548 93.4122 8 91 z"/>
-</g>
-<g stroke="none" fill="#416577">
-<path d="M 20 91 L 20 95 L 21 95 z"/>
-</g>
-<g stroke="none" fill="#606b95">
-<path d="M 162 92 L 160 97 L 160 98 C 163.331 97.2861 163.591 94.7622 162 92 z"/>
-</g>
-<g stroke="none" fill="#4c6178">
-<path d="M 226 92 L 226 95 L 223 100 L 227 100 z"/>
-</g>
-<g stroke="none" fill="#6a6e6b">
-<path d="M 65.3333 93.6667 L 65.6667 94.3333 L 65.3333 93.6667 z"/>
-</g>
-<g stroke="none" fill="#789ed0">
-<path d="M 220 95 L 217 94 L 218 98 L 223 100 L 222 93 z"/>
-</g>
-<g stroke="none" fill="#7490b9">
-<path d="M 4 94 L 2 98 L 5 101 L 11 96 L 6 98 z"/>
-</g>
-<g stroke="none" fill="#2c334a">
-<path d="M 66.6667 94.3333 L 67.3333 94.6667 L 66.6667 94.3333 z"/>
-</g>
-<g stroke="none" fill="#465775">
-<path d="M 0 95 L 3 99 L 0 106 C 3.08574 105.961 9.02074 107.547 9 104 L 12 105 L 10 101 L 10 100 L 12 98 L 5 101 z"/>
-</g>
-<g stroke="none" fill="#b5ad9a">
-<path d="M 46 95 L 55 99 L 55 98 z"/>
-</g>
-<g stroke="none" fill="#7f7668">
-<path d="M 29 96 L 29 98 L 46 97 z"/>
-</g>
-<g stroke="none" fill="#222128">
-<path d="M 0 97 L 0 104 L 3 99 z"/>
-</g>
-<g stroke="none" fill="#9c988e">
-<path d="M 28 98 L 28 105 L 29 105 L 29 101 L 30 101 L 30 105 L 31 105 L 31 101 L 36 103 L 36 104 L 36 105 L 32 114 L 44 112 L 46 97 z"/>
-</g>
-<g stroke="none" fill="#d5cebe">
-<path d="M 46 97 L 43.1698 121 L 40 166 L 43 168 L 44 168 L 48 161 C 48.8587 165.007 52.4226 164.191 54 161 L 58 162 L 60 156 L 60.1667 137 L 60 130 C 63.1172 127.276 61.8784 122.69 61 119 L 60 119 L 60 123 L 59 123 L 60 114 L 62 116 C 63.5457 112.038 62.2323 103.654 58.686 100.857 C 55.5973 98.4213 49.8027 97.6443 46 97 z"/>
-</g>
-<g stroke="none" fill="#262717">
-<path d="M 66 97 L 66 101 L 69 97 z"/>
-</g>
-<g stroke="none" fill="#1e211c">
-<path d="M 72 106 L 77 104 L 76 97 C 71.6134 98.4559 72.0147 101.85 72 106 z"/>
-</g>
-<g stroke="none" fill="#737169">
-<path d="M 80.6667 97.3333 L 81.3333 97.6667 L 80.6667 97.3333 z"/>
-</g>
-<g stroke="none" fill="#999380">
-<path d="M 55 98 L 55 99 L 61 107 L 62 107 C 62.4055 101.559 60.1395 99.354 55 98 z"/>
-</g>
-<g stroke="none" fill="#a59b8e">
-<path d="M 62 101 L 63 101 L 65 99 C 62.8603 97.8822 62.4732 98.7492 62 101 z"/>
-</g>
-<g stroke="none" fill="#4b4944">
-<path d="M 65 98 L 62 103 L 65 104 L 63 105 L 63 106 L 71 106 L 71 105 L 67 105 L 67 104 L 72 101 L 66 101 z"/>
-</g>
-<g stroke="none" fill="#292824">
-<path d="M 79 98 L 79 104 L 84 103 C 85.8418 106.513 88.193 106.884 92 107 L 89 98 L 87 98 L 83 102 L 83 98 z"/>
-</g>
-<g stroke="none" fill="#1a1c17">
-<path d="M 94 98 C 93.2855 102.992 96.7097 105.919 101 108 L 106 106 L 104 99 L 100 102 L 97 102 L 96 98 z"/>
-</g>
-<g stroke="none" fill="#5d564f">
-<path d="M 101.667 98.3333 L 102.333 98.6667 L 101.667 98.3333 z"/>
-</g>
-<g stroke="none" fill="#8f8e87">
-<path d="M 133 98 L 133 99 L 141 104 L 141 100 L 145 101 z"/>
-</g>
-<g stroke="none" fill="#6b5e59">
-<path d="M 69.6667 99.3333 L 70.3333 99.6667 L 69.6667 99.3333 z"/>
-</g>
-<g stroke="none" fill="#8a8d83">
-<path d="M 83 99 L 83 102 L 86 102 L 86 99 z"/>
-</g>
-<g stroke="none" fill="#1f241f">
-<path d="M 107 99 L 108 106 L 112 108 L 113 108 L 120 106 L 120 105 L 117 99 L 114 99 L 114 103 z"/>
-</g>
-<g stroke="none" fill="#4c4944">
-<path d="M 121 99 L 121 100 L 124 100 z"/>
-</g>
-<g stroke="none" fill="#48463a">
-<path d="M 219 99 L 218 105 L 215 104 L 218 108 L 227 101 z"/>
-</g>
-<g stroke="none" fill="#6d6a64">
-<path d="M 97 100 L 97 101 L 100 102 z"/>
-</g>
-<g stroke="none" fill="#767870">
-<path d="M 104 100 L 104 102 L 107 102 L 107 100 z"/>
-</g>
-<g stroke="none" fill="#393c3b">
-<path d="M 117 100 L 120 105 L 120 106 L 113 107 L 113 108 L 125 109 z"/>
-</g>
-<g stroke="none" fill="#1f1f1c">
-<path d="M 121 100 L 125 109 L 126 109 L 124 100 z"/>
-</g>
-<g stroke="none" fill="#0e100d">
-<path d="M 128 100 L 133 107 L 131 100 z"/>
-</g>
-<g stroke="none" fill="#282c26">
-<path d="M 134 100 C 135.482 110.172 148.173 106.048 154 112 L 164 110 L 161 102 L 160 102 L 158 104 L 158 105 L 159 108 C 156.531 106.503 155.667 105.966 155 109 L 154 109 L 148 101 L 141 100 L 141 104 z"/>
-</g>
-<g stroke="none" fill="#0b110e">
-<path d="M 148 100 C 148.176 105.28 150.318 105.872 154 109 L 155 109 L 156 106 L 159 108 L 160 105 L 158 101 L 154 104 L 151 104 L 150 100 z"/>
-</g>
-<g stroke="none" fill="#676055">
-<path d="M 29 101 L 27 104 L 28 108 L 33 107 L 30 105 z"/>
-</g>
-<g stroke="none" fill="#7d776b">
-<path d="M 31 101 L 33 107 L 27 107 L 24 133 L 25 133 L 25 130 L 33 133 L 34 133 L 32 126 L 37 126 L 36 130 C 43.6925 132.048 42.6857 125.71 43.4244 120 C 43.7603 117.403 44.8333 112.992 41.6829 111.644 C 38.584 110.317 34.8062 112.931 32 114 L 36 105 L 36 104 z"/>
-</g>
-<g stroke="none" fill="#625d53">
-<path d="M 76 101 L 77 104 L 72 106 L 72 102 L 71 102 L 67 104 L 67 105 L 71 105 L 70 107 L 86 107 L 84 103 L 79 101 z"/>
-</g>
-<g stroke="none" fill="#a4a296">
-<path d="M 97.6667 101.333 L 98.3333 101.667 L 97.6667 101.333 z"/>
-</g>
-<g stroke="none" fill="#65635e">
-<path d="M 111 101 L 111 103 L 114 103 L 114 101 z"/>
-</g>
-<g stroke="none" fill="#3a4442">
-<path d="M 124 101 L 126 109 L 131 107 L 128 101 L 127 101 L 125 103 L 126 101 z"/>
-</g>
-<g stroke="none" fill="#69665f">
-<path d="M 131 101 L 131 104 L 134 104 L 134 101 z"/>
-</g>
-<g stroke="none" fill="#101510">
-<path d="M 161 101 C 161.544 106.011 166.693 117.362 172 110 L 180 110 L 180 103 C 176.281 101.934 169.929 99.9784 167 103 z"/>
-</g>
-<g stroke="none" fill="#0f150a">
-<path d="M 225 101 L 219 106 L 220 130 L 227 129 L 227 101 z"/>
-</g>
-<g stroke="none" fill="#4e493e">
-<path d="M 92 102 L 92 107 L 99 108 z"/>
-</g>
-<g stroke="none" fill="#3f4140">
-<path d="M 104 102 L 104 103 L 106 106 L 101 105 C 101.982 109.581 108.116 108 112 108 L 112 106 L 108 106 L 108 102 z"/>
-</g>
-<g stroke="none" fill="#908f89">
-<path d="M 118.667 102.333 L 119.333 102.667 L 118.667 102.333 z"/>
-</g>
-<g stroke="none" fill="#545145">
-<path d="M 151.667 102.333 L 152.333 102.667 L 151.667 102.333 z"/>
-</g>
-<g stroke="none" fill="#353a38">
-<path d="M 179 107 C 180.09 114.608 178.425 122.34 179.17 130 C 179.567 134.087 179.849 137.623 184 139 L 184 152 L 185 152 L 185 149 C 188.453 149.882 190.925 149.674 192 146 L 193 146 L 194 148 L 195 144 L 199 144 L 200 140 L 203 141 L 209 137 L 210 137 L 211 134 L 213 141 L 214 141 L 216 128 L 214 128 L 215 117 L 207 118 L 207 123 L 201 126 L 200 126 L 199 106 L 208 105 L 206 108 L 215 103 C 203.852 99.7048 189.217 101.836 179 107 z"/>
-</g>
-<g stroke="none" fill="#908b85">
-<path d="M 145.667 103.333 L 146.333 103.667 L 145.667 103.333 z"/>
-</g>
-<g stroke="none" fill="#717064">
-<path d="M 62 104 L 65 107 L 65 112 L 66 112 C 65.9865 108.806 66.4028 106.729 63 106 L 63 105 L 65 105 z"/>
-</g>
-<g stroke="none" fill="#3c3d3b">
-<path d="M 133 104 L 131 110 L 145 110 L 136 104 z"/>
-</g>
-<g stroke="none" fill="#6e6e66">
-<path d="M 199 106 L 200 126 L 201 126 L 207 123 L 207 118 L 215 117 L 214 128 L 216 128 L 215 132 L 219 127 C 214.615 126.427 216.412 121.488 220 121 C 219.847 117.432 220.199 106.084 215 108 L 215 104 L 206 108 L 208 105 z"/>
-</g>
-<g stroke="none" fill="#283243">
-<path d="M 0 106 L 3 111 L 1 113 L 1 114 C 2.83456 115.717 4.14227 119.308 6 116 C 2.60551 116 5.4809 113.983 7 113 L 9 108 z"/>
-</g>
-<g stroke="none" fill="#b5afa7">
-<path d="M 214 105 L 216 108 L 216 105 z"/>
-</g>
-<g stroke="none" fill="#7a92b7">
-<path d="M 8 106 L 8 113 L 11 113 L 12 106 z"/>
-</g>
-<g stroke="none" fill="#a3a092">
-<path d="M 66 106 L 69 111 L 68 114 L 73 118 L 72 113 C 75.6515 117.818 72.9506 123.066 81 122 C 80.2016 126.423 79.5088 132.395 81.5895 136.621 C 82.8645 139.211 85.833 140.875 88 139 L 91 140 L 93 135 L 92 142 L 93 142 C 94.1407 136.546 96.014 127.892 99.267 123.374 C 103.112 118.034 111.802 114.595 118 113 L 118 110 L 101 110 L 104 113 L 104 115 L 99 116 L 99 108 z"/>
-</g>
-<g stroke="none" fill="#6c7994">
-<path d="M 4.66667 107.333 L 5.33333 107.667 L 4.66667 107.333 z"/>
-</g>
-<g stroke="none" fill="#456d7b">
-<path d="M 17 107 L 17 110 L 18 110 z"/>
-</g>
-<g stroke="none" fill="#aea69a">
-<path d="M 62 107 L 63 116 L 62 116 L 60 114 L 59 123 L 60 123 L 60 119 L 61 119 L 60 130 L 59 161 L 60 161 L 63 160 L 62 157 L 65 157 L 64 165 L 73 161 C 74.6062 154.324 81.9361 152.787 88 152 L 88 144 L 91 155 L 93 155 L 93 135 L 91 140 L 88 139 C 79.1729 141.102 80.4329 127.245 81 122 C 72.8255 122.124 76.4505 116.888 72 113 L 73 118 L 68 114 L 68 110 L 66 112 L 65 112 L 65 107 z"/>
-</g>
-<g stroke="none" fill="#67685e">
-<path d="M 125 109 L 125 110 L 131 107 z"/>
-</g>
-<g stroke="none" fill="#868579">
-<path d="M 99 114 L 102 113 L 101 110 L 118 110 L 118 113 L 112 114 L 112 115 L 132 116 L 132 115 L 121 113 L 123 110 C 116.916 107.269 98.2536 104.278 99 114 z"/>
-</g>
-<g stroke="none" fill="#5a667e">
-<path d="M 7 109 L 5 113 L 5 114 L 9 114 z"/>
-</g>
-<g stroke="none" fill="#a29c98">
-<path d="M 121 113 C 132.862 113.518 142.65 120.547 148 131 L 149 131 L 148.995 116.001 L 147.397 110.121 L 134 112 C 132.941 107.014 121.968 108.209 121 113 z"/>
-</g>
-<g stroke="none" fill="#878778">
-<path d="M 134 112 L 144 110 C 140.873 108.198 134.895 107.825 134 112 z"/>
-</g>
-<g stroke="none" fill="#3d4346">
-<path d="M 148 109 L 149 131 L 148 131 L 146 126 L 145 126 L 150 145 L 151 145 C 154.516 141.352 158.327 143.207 162 145 L 162 139 L 172 136 L 168 131 L 175 130 L 173 126 L 175 126 L 171 121 L 172 117 C 174.826 117 174.791 115.858 175 113 C 167.819 112.975 160.538 107.421 154 112 z"/>
-</g>
-<g stroke="none" fill="#0f1016">
-<path d="M 0 110 L 3 113 z"/>
-</g>
-<g stroke="none" fill="#2a3031">
-<path d="M 171 113 L 175 113 L 172 117 L 171 121 L 175 126 L 173 126 L 175 130 L 168 131 L 172 136 L 162 139 L 162 145 L 160 142 L 151 145 L 150 145 C 149.995 137.462 148.558 130.499 143 125 L 144 133 L 146 132 L 147 137 L 149 139 L 147 143 L 148 149 L 149 150 L 148 155 L 149 166 L 146 169 L 145 168 C 147.735 171.13 157.96 171.191 161.454 168.826 C 163.195 167.647 164.427 165.423 166 164 C 166.422 169.411 168.983 169.941 174 170 L 178 153 L 182 153 L 184 139 C 175.676 134.413 179.318 117.909 180 110 z"/>
-</g>
-<g stroke="none" fill="#413b34">
-<path d="M 82 111 L 82 114 L 85 113 L 85 112 z"/>
-</g>
-<g stroke="none" fill="#3b3a31">
-<path d="M 102 112 L 99 116 C 101.749 115.403 103.791 114.794 102 112 z"/>
-</g>
-<g stroke="none" fill="#6e739f">
-<path d="M 0 113 L 3 118 z"/>
-</g>
-<g stroke="none" fill="#588392">
-<path d="M 16.3333 114.667 L 16.6667 115.333 L 16.3333 114.667 z"/>
-</g>
-<g stroke="none" fill="#a3988d">
-<path d="M 51 114 L 51 119 L 52 119 z"/>
-</g>
-<g stroke="none" fill="#10120b">
-<path d="M 97 132 C 100.129 131.706 102.275 132.447 103 129 L 104 129 L 105 135 L 116 135 L 116 136 L 106 136 L 106 140 L 107 140 L 107 137 C 112.858 137.069 114.243 139.814 119.104 142.151 C 122.783 143.92 127.431 144.514 128.682 149.093 C 130.208 154.679 126.93 162.27 129.858 167.427 C 132.169 171.499 142.325 171.061 145 168 L 147 169 L 148.416 153 L 146 132 L 144 133 C 143.273 129.361 143.152 124.996 140.657 122.066 C 128.719 108.042 100.595 113.42 97 132 z"/>
-</g>
-<g stroke="none" fill="#4b4e4f">
-<path d="M 137 117 L 141 114 z"/>
-</g>
-<g stroke="none" fill="#0b0e09">
-<path d="M 0 117 L 0 170 L 19 170 L 27.2577 168.972 L 29 161 C 17.8728 159.756 23.2362 150.708 22.8565 143 C 22.6594 138.999 21.0113 134.867 20 131 L 23 130 L 22 127 L 16 129 L 19 127 L 22 120 L 17 122 L 20 116 z"/>
-</g>
-<g stroke="none" fill="#5d5a51">
-<path d="M 132 116 L 132 117 L 138 119 L 138 118 z"/>
-</g>
-<g stroke="none" fill="#8992b0">
-<path d="M 6 117 L 6 118 L 14 118 z"/>
-</g>
-<g stroke="none" fill="#7f7c72">
-<path d="M 97 127 L 108 118 C 102.697 116.873 98.7745 122.617 97 127 z"/>
-</g>
-<g stroke="none" fill="#585650">
-<path d="M 138 119 L 144 125 z"/>
-</g>
-<g stroke="none" fill="#949084">
-<path d="M 218 120 C 214.939 124.825 216.885 126.316 220 130 C 221.162 125.946 220.93 123.128 218 120 z"/>
-</g>
-<g stroke="none" fill="#5b574e">
-<path d="M 33 121 L 33 123 L 37 123 L 37 121 z"/>
-</g>
-<g stroke="none" fill="#574a47">
-<path d="M 220.333 121.667 L 220.667 122.333 L 220.333 121.667 z"/>
-</g>
-<g stroke="none" fill="#605c4f">
-<path d="M 205 125 L 207 127 L 204 130 L 212 125 z"/>
-</g>
-<g stroke="none" fill="#979287">
-<path d="M 32 126 L 34 133 L 33 133 L 33 130 L 25 130 C 23.5104 138.028 24.4534 142.972 32 147 L 35 143 L 34 146 C 37.0734 147.729 37.9716 148.09 40 145 L 41 148 L 42 148 L 42 131 L 36 130 L 37 126 z"/>
-</g>
-<g stroke="none" fill="#373630">
-<path d="M 103 129 L 96 131 L 92 156 L 99 166 L 98 170 L 105 167 L 108 168 C 108 158.685 104.699 144.645 117 143 C 115.884 138.438 108.489 133.05 107 140 L 106 140 L 106 136 L 116 136 L 116 135 L 105 135 z"/>
-</g>
-<g stroke="none" fill="#000000">
-<path d="M 215 149 C 211.86 151.272 211.668 153.842 215 156 L 212 161 L 211 161 L 207 159 L 198 170 L 227 170 L 227 129 C 215.541 129.531 210.596 138.539 215 149 z"/>
-<path d="M 108 168 L 104 170 L 125 170 L 124 166 L 126 170 L 131 170 C 129.053 164.918 129.002 160.409 129 155 C 128.999 152.351 129.511 148.868 127.972 146.533 C 124.459 141.204 112.513 140.792 109.028 146.344 C 105.896 151.333 108 162.24 108 168 z"/>
-<path d="M 174 170 L 185 170 L 182 166 L 183 161 C 175.77 160.515 172.667 162.333 174 170 z"/>
-</g>
-<g stroke="none" fill="#5e5b54">
-<path d="M 201 130 L 201 137 L 206 131 z"/>
-</g>
-<g stroke="none" fill="#67675a">
-<path d="M 210 137 L 209 137 L 208 135 C 200.364 142.44 202.799 148.27 203 158 L 204 158 C 206.917 156.195 208.959 158.844 211 161 L 212 161 L 215 156 C 212.305 153.277 212.453 151.809 215 149 L 211 134 z"/>
-</g>
-<g stroke="none" fill="#8a8276">
-<path d="M 23 138 L 22.3179 157.772 L 28.4082 162.588 L 30 170 L 37 170 C 37 166.952 38.8424 167.801 41 169 L 41 145 L 39 148 L 35 143 L 32 147 z"/>
-</g>
-<g stroke="none" fill="#1a1d18">
-<path d="M 200 140 L 199 144 L 195 144 L 193 146 L 192 146 L 185 152 L 184 152 L 183 148 L 182 148 L 182 153 L 178 153 L 177 160 L 183 161 L 182 166 L 185 170 C 188.478 170 192.428 170.508 195.83 169.701 C 207.978 166.818 202.001 148.889 202 140 z"/>
-</g>
-<g stroke="none" fill="#888075">
-<path d="M 88 144 L 88 152 L 84 152 L 84 153 L 91 154 z"/>
-</g>
-<g stroke="none" fill="#12190d">
-<path d="M 73 161 L 72 170 L 98 170 L 99 166 C 95.8333 162.839 95.2085 157.789 91.7222 155.032 C 86.2117 150.675 72.8731 152.923 73 161 z"/>
-</g>
-<g stroke="none" fill="#594a46">
-<path d="M 21 154 L 21 159 L 22 159 z"/>
-</g>
-<g stroke="none" fill="#34372a">
-<path d="M 204 156 C 203.115 159.292 202.075 162.159 206 163 L 206 162 L 204 160 L 207 161 L 209 157 z"/>
-</g>
-<g stroke="none" fill="#746252">
-<path d="M 62 157 L 63 160 L 60 159 L 60 161 L 57 160 L 58 167 L 72 170 L 71 162 L 64 165 L 65 157 z"/>
-</g>
-<g stroke="none" fill="#6c6e5f">
-<path d="M 204 160 L 204 162 L 206 162 z"/>
-</g>
-<g stroke="none" fill="#9f9486">
-<path d="M 46 161 L 44 168 L 43 168 L 42 165 L 41 165 L 42 168 L 39 169 L 39 170 L 56 170 L 59 166 L 54 161 C 51.5922 163.185 49.9746 163.839 48 161 z"/>
-</g>
-<g stroke="none" fill="#4f4f40">
-<path d="M 29 162 L 28 170 L 31 169 z"/>
-</g>
-<g stroke="none" fill="#000100">
-<path d="M 190 164 L 194 169 z"/>
-</g>
-<g stroke="none" fill="#3f413d">
-<path d="M 124 166 L 126 170 z"/>
-</g>
-<g stroke="none" fill="#6d625a">
-<path d="M 36 169 L 40 167 z"/>
-</g>
-<g stroke="none" fill="#46493f">
-<path d="M 56.3333 167.667 L 56.6667 168.333 L 56.3333 167.667 z"/>
-</g>
-<g stroke="none" fill="#040504">
-<path d="M 56 170 L 61 170 L 60 167 z"/>
-</g>
-<g stroke="none" fill="#020401">
-<path d="M 66 168 L 66 170 L 71 170 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/enst_tram.xml Deleted

@@ -1,784 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-<saf:sceneHeader>
-<lsr:LASeRHeader profile="full"  colorComponentBits="8"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-<lsr:NewScene>
-<svg zoomAndPan="magnify" width="265" height="314" viewBox="0 0 265 314" preserveAspectRatio="xMidYMid meet">
-<rect fill="#FFFFFF" width="265.0" height="314.0"/>
-<g stroke="none" fill="#a5a26c">
-<path d="M 22 3 L 22 4 L 25 5 L 19 13 L 34 14 L 34 12 L 40 12 L 35 8 L 37 6 L 37 5 C 32.735 4.86108 30.3029 4.29196 29 0 z"/>
-<path d="M 71 0 L 71 1 C 72.3741 4.48795 70.2636 6.01727 67 7 L 68 11 L 74 10 L 73 13 L 76 8 L 79 13 L 83 7 L 78 6 L 81 4 L 81 2 z"/>
-<path d="M 190 9 L 187 10 L 185 14 L 190 15 z"/>
-<path d="M 160 14 L 163 16 L 162 13 z"/>
-<path d="M 254 13 L 248 18 L 251 20 L 255 21 L 259 19 L 262 25 L 260 21 L 265 21 L 264 14 L 255 17 z"/>
-<path d="M 16 21 L 14 25 L 18 21 z"/>
-<path d="M 230 27 L 230 28 L 235 32 L 237 30 L 242 31 L 243 36 L 251 37 L 254 35 L 252 38 L 253 46 C 262.596 45.325 264.999 33.9758 265 26 L 264 26 L 248 31 C 245.583 26.6929 241.373 24.3279 238 29 z"/>
-<path d="M 65 29 L 67 31 L 66 34 C 69.8826 34.8349 73.6031 35.5819 76 32 z"/>
-<path d="M 97 30 L 99 36 L 102 35 L 101 31 L 97 30 M 219 31 L 219 32 C 219.84 34.6682 218.511 35.2149 216 36 L 219 41 L 221 38 L 223 43 C 219.259 43.4297 217.661 44.1863 217 48 L 213 48 L 213 49 C 218.262 49.0035 224.458 48.9652 228.686 52.6991 C 232.624 56.1767 233.691 63.2284 229 66 L 233.736 73.2739 L 233 83 L 232 83 L 231 78 L 230 78 L 229 99 L 231 107 L 231 108 L 231 109 L 229 116 L 232 116 L 232 111 L 233 111 L 235 115 L 235 116 L 236 121 L 237 115 L 242 116 L 242 115 L 237 111 C 242.132 107.619 244.211 101.656 246 96 L 247 96 L 247 101 L 250 98 L 251 98 L 252 101 L 262 89 L 265 91 L 262 83 C 265.403 82.2708 264.987 80.1942 265 77 C 258.839 75.4779 262.22 70.5195 260 66 L 264 65 L 262 60 L 264 62 L 265 62 L 265 56 L 261 57 C 257.851 58.7776 256.476 58.6278 254 56 L 251 56 L 250 60 L 257 64 L 253 65 L 252 65 L 248 62 L 248 56 L 246 56 L 244 64 L 243 64 L 242 60 L 241 60 L 240 67 C 237.458 64.6051 236.866 63.0044 240 61 L 240 53 L 237 54 L 234 50 L 234 47 L 232 48 L 234 42 L 231 42 L 232 37 C 225.79 38.9706 225.642 35.3159 226 30 z"/>
-<path d="M 233 35 L 236 39 L 236 37 L 240 38 z"/>
-<path d="M 210 42 L 214 45 z"/>
-<path d="M 70 50 C 68.3479 52.2867 59.3168 56.8693 65 58 L 65 59 L 61 59 L 63 64 L 64 64 C 65.8235 60.98 67.3465 60.6674 70 63 L 72 61 L 73 61 L 74 61 C 76.7668 64.1332 79.936 60.3493 83 59 L 83 55 L 78 56 L 79 60 L 73 58 L 68 59 L 67 55 L 73 55 L 71 56 L 71 57 L 77 55 L 77 53 z"/>
-<path d="M 85.6667 50.3333 L 86.3333 50.6667 L 85.6667 50.3333 z"/>
-<path d="M 55 51 L 53 56 L 58 59 L 57 62 L 61 64 L 56 57 z"/>
-<path d="M 90 73 L 94 71 z"/>
-<path d="M 43 85 L 41 90 L 40 87 L 35 89 L 31 85 L 24 88 L 24 89 L 33 88 L 45 91 L 45 92 L 41 93 L 41 94 L 47 96 L 49 90 L 45 90 L 53 85 z"/>
-<path d="M 244 118 L 250 119 z"/>
-<path d="M 237 119 L 239 123 L 241 124 L 242 124 L 242 118 z"/>
-<path d="M 249 121 L 243 127 L 251 125 z"/>
-<path d="M 248.667 131.333 L 249.333 131.667 L 248.667 131.333 z"/>
-<path d="M 241 134 L 246 136 z"/>
-<path d="M 258 134 L 258 135 L 262 139 C 262.673 135.821 260.885 134.868 258 134 z"/>
-<path d="M 232 171 L 233 171 L 234 137 L 240 137 L 240 135 L 234.026 136.603 L 232.424 145 z"/>
-<path d="M 259 151 L 260 151 L 260 148 L 264 146 C 260.649 146.728 259.588 147.597 259 151 z"/>
-</g>
-<g stroke="none" fill="#9ea09a">
-<path d="M 61 0 L 61 2 L 63 2 L 63 0 z"/>
-<path d="M 89 0 L 90 3 L 85 2 L 88 4 L 88 5 L 85 5 L 83 13 L 89 8 L 90 8 L 90 11 L 91 11 L 91 7 L 92 7 L 92 11 L 93 11 L 95 2 L 91 3 L 92 0 z"/>
-<path d="M 212 0 C 211.292 3.48956 209.842 6.69061 213 9 L 212 5 L 218 8 L 219 8 L 226 0 z"/>
-<path d="M 236 2 L 239 6 z"/>
-<path d="M 7 18 L 8 21 L 3 19 L 6 22 L 7 24 L 5 27 L 11 23 L 12 17 z"/>
-<path d="M 245 16 L 244 19 L 247 19 z"/>
-<path d="M 39 21 L 39 22 L 43 22 z"/>
-<path d="M 49 27 L 52 32 L 52 31 L 50 31 L 50 30 L 54 30 L 52 34 L 58 34 L 59 29 L 54 27 L 54 26 L 59 22 z"/>
-<path d="M 59 34 L 59 35 L 64 35 z"/>
-<path d="M 60 36 L 53 47 L 61 47 L 61 38 L 64 38 L 64 36 z"/>
-<path d="M 195 47 L 195 48 L 199 48 L 195 47 M 203 48 L 203 49 L 213 49 z"/>
-<path d="M 213 49 L 213 50 C 216.803 50.2683 221.935 50.8243 223 55 L 231 57 C 229.641 48.6692 219.745 49.0007 213 49 z"/>
-<path d="M 141 56 L 141 58 L 146 58 L 146 127 L 141 128 L 141 129 L 161 130 L 161 129 L 154 128 L 154 127 L 157 127 L 157 126 L 151 124 L 150 124 L 150 129 L 149 129 L 147 103 L 147 57 L 160 57 L 160 58 L 151 58 L 151 59 L 170 58 L 170 59 L 162 59 L 162 60 L 186 58 L 186 59 L 183 61 L 211 60 L 211 59 L 154 56 L 155 54 z"/>
-<path d="M 101 66 L 101 67 L 110 64 z"/>
-<path d="M 47 70 L 52 76 L 53 71 z"/>
-<path d="M 179 74 L 179 97 L 171 101 L 179 101 L 179 127 L 180 127 L 180 91 L 179 74 M 92 75 L 92 108 L 94 108 L 94 75 z"/>
-<path d="M 210 79 L 210 109 L 211 109 z"/>
-<path d="M 23 87 L 26 86 z"/>
-<path d="M 34.6667 93.3333 L 35.3333 93.6667 L 34.6667 93.3333 z"/>
-<path d="M 37 96 L 37 97 L 41 97 z"/>
-<path d="M 110 105 C 110 113.246 108.632 121.854 109.093 130 C 109.969 145.467 112.624 163.78 109 179 C 113.145 178.093 111 171.671 111 168 L 111 132 L 123 131 L 123 130 L 111 131 z"/>
-<path d="M 34 110 L 37 113 z"/>
-<path d="M 28 116 L 32 118 L 33 113 z"/>
-<path d="M 62 115 L 66 117 z"/>
-<path d="M 5 118 L 5 119 L 13 122 L 12 117 z"/>
-<path d="M 18 118 L 19 122 L 20 122 L 18 118 M 34 118 L 35 152 L 36 152 L 36 134 L 37 134 L 37 152 L 38 152 L 36 118 z"/>
-<path d="M 119 120 L 119 121 L 126 121 z"/>
-<path d="M 26 127 C 21.7321 132.096 23.201 135.813 22.9599 142 C 22.7898 146.365 22.0121 150.608 22 155 L 23 155 L 24 132 L 25 132 L 25 153 L 27 153 z"/>
-<path d="M 215 128 L 215 131 L 207 131 L 207 132 L 224 132 z"/>
-<path d="M 174 134 L 174 135 L 190 135 z"/>
-<path d="M 15 137 L 15 143 L 16 143 L 18 141 L 17 147 L 19 140 z"/>
-<path d="M 253 144 L 252 148 L 248 148 L 247 162 L 247 168 L 251 168 L 249 164 L 253 163 L 253 166 L 256 165 L 259 169 L 258 166 L 265 169 L 265 165 L 264 165 L 264 167 L 263 167 L 264 158 L 253 153 z"/>
-<path d="M 260 177 L 260 181 L 264 178 z"/>
-<path d="M 223 178 L 223 181 L 227 181 L 227 178 z"/>
-<path d="M 133 183 L 137 183 L 137 179 z"/>
-<path d="M 132 184 L 132 188 L 138 188 L 138 184 z"/>
-<path d="M 226 200 L 226 201 C 232.023 201.844 235.264 207.543 229 211 L 229 212 L 242.09 215.946 L 265 218 L 265 202 z"/>
-</g>
-<g stroke="none" fill="#b2afb3">
-<path d="M 67.6667 0.333344 L 68.3333 0.666656 L 67.6667 0.333344 z"/>
-<path d="M 237 3 L 240 0 z"/>
-<path d="M 262.667 0.333344 L 263.333 0.666656 L 262.667 0.333344 z"/>
-<path d="M 116 5 L 123 4 C 120.135 1.866 117.986 1.94534 116 5 z"/>
-<path d="M 251 10 L 247 13 L 247 14 L 253 15 L 251 10 M 0 11 L 0 18 L 10 14 L 10 13 z"/>
-<path d="M 247 22 L 260 28 L 260 27 C 257.085 24.6465 256.468 22.916 259 20 L 259 19 L 255 21 C 251.896 18.8542 249.119 18.6379 247 22 z"/>
-<path d="M 47.3333 27.6667 L 47.6667 28.3333 L 47.3333 27.6667 z"/>
-<path d="M 0 33 L 3 31 L 0 33 M 28 33 L 31 31 z"/>
-<path d="M 101 39 L 91 48 L 92 52 C 95.8599 49.281 103.429 44.2328 101 39 z"/>
-<path d="M 67 43 L 69 47 L 64 47 L 64 48 L 70 50 L 70 49 L 68 49 L 68 48 L 78 48 L 78 49 C 75.2132 50.7958 75.6042 52.1436 77 55 L 71 57 L 71 58 L 79 60 L 79 52 L 76 51 L 76 50 L 81 50 L 80 46 z"/>
-<path d="M 250.667 45.3333 L 251.333 45.6667 L 250.667 45.3333 z"/>
-<path d="M 51 51 L 54 49 L 51 51 M 57 49 L 56 57 L 59 51 L 66 54 L 70 52 z"/>
-<path d="M 177 50 L 174 58 C 179.727 57.548 192.124 58.4589 196 54 L 189 55 L 189 53 L 203 52 L 203 51 L 187 52.3333 L 181 55.5 L 180 50 z"/>
-<path d="M 87 54 L 86 58 L 83 56 L 70 72 L 71 73 L 81 68 L 76 74 L 89 62 L 90 62 L 90 69 L 91 69 L 94 60 L 94 59 L 88 61 C 89.332 57.7914 89.4174 56.5287 87 54 z"/>
-<path d="M 212 54 L 212 55 L 223 57 L 223 58 L 220 58 L 220 59 L 230 63 L 231 59 z"/>
-<path d="M 150 57 L 150 64 L 151 64 L 151 58 L 160 58 z"/>
-<path d="M 161 58 L 161 59 L 170 59 L 161 58 M 177 59 L 179 74 L 180 74 L 180 60 L 186 59 z"/>
-<path d="M 222 64 L 222 65 L 224.17 81 L 225 128 L 227 128 L 227 80 C 227 74.1474 229.157 65.5618 222 64 z"/>
-<path d="M 43.6667 66.3333 L 44.3333 66.6667 L 43.6667 66.3333 z"/>
-<path d="M 59 78 L 59 80 L 61 78 z"/>
-<path d="M 228 83 L 228 125 L 229 125 L 231 109 L 231 108 L 231 107 z"/>
-<path d="M 214 87 L 214 115 L 215 115 z"/>
-<path d="M 33 93 C 32.0572 96.9347 33.0608 98.8865 37 100 L 38 104 L 36 109 L 45 107 L 45 106 L 39 107 L 43 103 L 43 102 L 38 101 L 41 98 L 41 97 C 38.0253 96.7652 36.412 95.6013 36 99 L 35 99 L 36 94 z"/>
-<path d="M 18.3333 94.6667 L 18.6667 95.3333 L 18.3333 94.6667 z"/>
-<path d="M 26 103 L 26 104 L 33 108 L 34 108 L 34 103 z"/>
-<path d="M 109 105 L 109 124 L 110 124 z"/>
-<path d="M 104.667 107.333 L 105.333 107.667 L 104.667 107.333 z"/>
-<path d="M 90 110 L 90 134 C 96.4112 131.423 96.4112 112.577 90 110 z"/>
-<path d="M 6 112 L 5 116 L 8 112 z"/>
-<path d="M 5 119 L 6 152 L 7 152 L 7 141 L 8 141 L 8 152 L 9 152 L 9 140 L 10 140 L 10 145 L 14 144 C 11.8796 135.094 18.6935 120.016 5 119 z"/>
-<path d="M 101 123 L 101 124 L 107 124 L 101 123 M 133 123 L 133 124 L 137 124 z"/>
-<path d="M 131 124 L 128 127 C 124.881 124.295 119.186 127.032 117 130 L 146 127 L 146 126 z"/>
-<path d="M 128 138 L 128 147 L 130 138 z"/>
-<path d="M 248 147 L 248 148 L 252 146 z"/>
-<path d="M 0 170 L 0 175 L 4 172 z"/>
-<path d="M 174 172 L 174 173 L 185 172 z"/>
-<path d="M 236 172 L 235 177 L 242 178 L 243 177 L 243 175 z"/>
-<path d="M 263 172 L 264 176 L 265 176 z"/>
-<path d="M 263.667 181.333 L 264.333 181.667 L 263.667 181.333 z"/>
-<path d="M 261 183 L 261 186 L 262 186 z"/>
-<path d="M 125 185 L 125 188 L 127 188 L 127 185 z"/>
-<path d="M 198.667 293.333 L 199.333 293.667 L 198.667 293.333 z"/>
-</g>
-<g stroke="none" fill="#ece1d4">
-<path d="M 78.6667 0.333344 L 79.3333 0.666656 L 78.6667 0.333344 z"/>
-<path d="M 222.667 0.333344 L 223.333 0.666656 L 222.667 0.333344 z"/>
-<path d="M 232 3 L 232 12 C 235.38 13.1787 242.64 10.2108 237 9 L 238 7 L 233 6 L 232 3 M 118 4 L 118 5 L 123 5 z"/>
-<path d="M 83 8 L 80 14 L 86 14 L 86 13 L 83 13 L 85 8 z"/>
-<path d="M 246 11 L 248 13 L 248 11 z"/>
-<path d="M 30 22 L 34 26 L 34 22 z"/>
-<path d="M 0 24 L 0 28 L 5 27 L 0 24 M 46 24 L 46 29 L 49 27 L 49 26 z"/>
-<path d="M 248 26 L 248 27 L 256 28 C 253.452 25.3234 251.521 25.0425 248 26 z"/>
-<path d="M 50 30 L 50 31 L 54 31 z"/>
-<path d="M 58 36 L 58 41 L 60 41 L 60 36 z"/>
-<path d="M 112 49 L 119 44 C 115.166 44.4368 113.398 45.3426 112 49 z"/>
-<path d="M 83 50 L 85 58 L 86 58 L 87 54 L 90 55 L 92 50 z"/>
-<path d="M 62 51 L 64 55 L 65 55 L 66 52 z"/>
-<path d="M 91 69 L 90 69 L 90 62 L 89 62 L 64 86.0039 L 55 98 L 72 87 L 72 126 L 73 126 L 73 99 L 74.0278 86.0394 L 89 73 L 89 108 L 90 108 L 90 84 C 90 80.6724 89.2818 76.2661 90.6034 73.1327 C 93.8127 65.5237 112.263 67.4572 110.721 57.179 C 110.49 55.6385 109.705 54.3544 109 53 C 99.8369 55.6195 91.0372 58.4914 91 69 z"/>
-<path d="M 249 71 L 249 73 L 251 73 L 251 71 z"/>
-<path d="M 34 91 L 36 95 L 35 99 L 36 99 L 36 96 L 47 99 L 47 98 L 42 96 L 44 95 L 44 94 L 41 94 L 41 93 L 45 92 z"/>
-<path d="M 264.333 91.6667 L 264.667 92.3333 L 264.333 91.6667 z"/>
-<path d="M 31 93 L 31 98 L 32 98 L 33 93 z"/>
-<path d="M 262 94 L 264 98 L 260 98 L 257 103 L 257 104 L 260 105 L 258 107 L 263 107 L 264 104 L 261 103 L 264 102 L 265 94 z"/>
-<path d="M 251 95 L 251 98 L 252 98 z"/>
-<path d="M 111 105 L 111 131 L 112 131 z"/>
-<path d="M 89 110 L 89 134 L 90 134 z"/>
-<path d="M 91 111 L 91 133 L 92 133 z"/>
-<path d="M 32 118 L 28 116 L 28 117 L 31 118 L 27 123 L 27 124 L 43 113 z"/>
-<path d="M 63 120 L 67 117 z"/>
-<path d="M 250 118 L 251 122 L 255 121 z"/>
-<path d="M 62 123 L 66 125 L 66 124 z"/>
-<path d="M 22 126 L 23 129 L 19 129 L 19 130 C 23.2737 130.136 24.996 128.707 27 125 z"/>
-<path d="M 249 126 L 248 129 L 248 130 L 254.375 134.367 L 263 138 L 264 138 L 265 134 L 254.222 131.583 z"/>
-<path d="M 46 128 L 46 135 L 47 135 L 48 128 z"/>
-<path d="M 234 134 L 234 135 L 240 135 L 240 137 L 234 137 L 234 145 C 241.717 145 256.171 148.671 257 138 L 252 140 L 253 136 L 240 133 z"/>
-<path d="M 36 134 L 36 159 L 37 159 z"/>
-<path d="M 123 138 L 123 148 L 124 148 z"/>
-<path d="M 74 142 L 77 163 L 81 162 L 85.4151 148.741 L 86 140 z"/>
-<path d="M 44 151 L 44 154 L 47 154 L 47 151 z"/>
-<path d="M 44 155 L 44 161 L 45 161 L 45 156 L 46 156 L 46 177 L 47 177 L 47 155 z"/>
-<path d="M 18 157 L 18 161 L 20 161 L 20 157 z"/>
-<path d="M 253 168 L 253 169 L 259 175 L 260 175 L 260 171 L 265 172 C 264 167.335 257.043 168.136 253 168 z"/>
-<path d="M 240 172 L 243 175 L 244 178 L 244 179 L 237 179 L 237 180 L 252 180 L 252 172 z"/>
-<path d="M 230 181 L 230 188 L 236 190 L 241 186 L 241 185 L 233 182 L 234 181 z"/>
-<path d="M 246 200 L 246 201 L 259 201 z"/>
-</g>
-<g stroke="none" fill="#c7cbd4">
-<path d="M 80 0 L 83 4 L 83 0 L 80 0 M 85 0 L 90 3 z"/>
-<path d="M 229 3 L 234 4 L 234 0 z"/>
-<path d="M 29 1 C 30.487 5.48016 33.9283 5.19009 38 4 L 38 3 L 34 4 z"/>
-<path d="M 124.333 1.66666 L 124.667 2.33334 L 124.333 1.66666 z"/>
-<path d="M 256 8 L 265 13 L 265 6 z"/>
-<path d="M 37 8 L 38 11 L 39 11 L 39 8 z"/>
-<path d="M 5 11 L 5 12 L 14 20 L 17 19 L 16 15 L 14 16 L 14 10 z"/>
-<path d="M 244 14 L 244 15 L 247 18 L 251 13 z"/>
-<path d="M 0 20 L 2 24 z"/>
-<path d="M 247 22 L 248 26 L 253 25 z"/>
-<path d="M 118 43 L 119 47 L 186 47 L 186 50 L 224 54 C 217.31 47.5356 204.718 48.7771 196 47.5764 C 169.857 43.9758 144.302 41.8705 118 43 z"/>
-<path d="M 113 59 L 112 59 L 112 57 L 111 57 L 109 62 L 110 64 L 92.1481 71.5293 L 90 84 L 89 109 C 93.2209 108.096 92 103.654 92 100 C 92 92.9757 89.807 81.6344 92.3333 75.0833 C 94.2123 70.2109 106.378 67.4954 111 66 L 111 103 L 112 103 L 112 69 C 112.009 64.577 112.051 58.8534 116.299 56.1497 C 119.615 54.0399 124.241 54.2365 128 53.8341 C 139.105 52.6452 149.888 54.4167 161 55.0355 C 167.452 55.3948 175.988 58.792 177 50 C 161.663 49.8729 146.434 46.9752 131 47 C 121.406 47.0154 113.325 47.8156 113 59 z"/>
-<path d="M 189 53 L 189 55 L 196 54 L 189 56 L 189 58 L 224 61 L 224 60 L 220 59 L 220 58 L 223 58 C 213.879 51.5012 199.62 53 189 53 z"/>
-<path d="M 78 54 L 78 55 L 82 55 z"/>
-<path d="M 147 57 L 147 105 L 149 129 L 150 129 L 150 57 z"/>
-<path d="M 180 60 L 180 127 L 183 127 L 183 60 z"/>
-<path d="M 115 62 L 114 129 L 116 129 L 116 83 z"/>
-<path d="M 86 110 C 86 116.061 87.3828 124.33 83 129 L 82 131 L 84 135 L 85 135 L 85 131 L 86 131 L 86 168 L 87 168 L 87 129 z"/>
-<path d="M 98 114 L 98 115 L 107 115 z"/>
-<path d="M 126 138 L 126 148 L 127 148 z"/>
-<path d="M 14 145 L 12 152 C 14.8236 150.171 15.2631 148.117 14 145 z"/>
-<path d="M 119 158 L 120 162 L 125 158 z"/>
-<path d="M 234 172 L 234 177 L 235 177 L 237 173 z"/>
-<path d="M 12 191 L 12 192 L 22 192 z"/>
-<path d="M 258 202 L 265 202 L 260 199 L 260 196 C 262.993 195.936 264.346 196.054 265 193 C 259.072 194.305 257.982 196.179 258 202 z"/>
-</g>
-<g stroke="none" fill="#dcd593">
-<path d="M 91 3 L 98 3 C 97.0743 -1.3201 92.5614 -0.517578 91 3 z"/>
-<path d="M 30 13 L 32 18 L 30 17 C 31.873 23.0903 37.1013 23.3734 42 26 L 43 26 L 43 22 L 34 21 L 34 20 C 36.667 16.9725 32.8982 14.1263 30 13 z"/>
-<path d="M 100 23 C 98.0842 26.545 96.3027 29.4669 101 31 L 100 34 L 104 35 L 107 30 L 103 28 L 102 28 L 100 30 z"/>
-<path d="M 229 27 L 231 30 z"/>
-<path d="M 244 59 L 243 64 L 244 64 z"/>
-<path d="M 264 64 L 260 66 C 261.524 70.8312 258.81 75.1398 264 78 z"/>
-<path d="M 244 74 L 244 75 L 247 75 L 247 80 L 250 82 L 251 82 L 251 79 L 252 79 L 255 82 L 254 85 L 256 85 L 254 90 C 258.523 87.4416 260.332 83.0408 261 78 L 258 82 L 257 82 C 255.637 78.099 251.835 76.914 248 76 L 248 73 z"/>
-<path d="M 246 96 L 244 104 L 252 110 L 249 110 L 247 114 L 247 115 L 251 117 L 253 115 L 254 115 L 258 120 L 264 121 L 260 111 L 254 113 L 253 112 L 255 110 L 255 109 L 253 107 L 256 108 L 251 98 L 250 98 L 247 101 z"/>
-<path d="M 250 121 L 251 125 L 246 125 L 246 130 L 250 129 L 249 127 L 249 126 L 252 127 C 252.337 130.584 253.557 131.938 257 133 L 257 127 L 261 128 L 263 125 L 261 125 L 261 124 L 263 124 L 263 123 z"/>
-<path d="M 259 142 L 262 140 z"/>
-</g>
-<g stroke="none" fill="#898553">
-<path d="M 98 3 L 95 1 L 93 11 L 90 8 L 89 8 L 84 17 C 88.0592 20.9941 86.4331 24.2367 82 27 L 84 30 L 85 38 L 78 37 L 79 32 L 76 32 L 75 35 C 69.934 34.0891 59.3882 32.5116 56 37 L 64 36 L 61 38 L 61 47 L 53 48 L 52 56 L 53 56 L 55 51 L 58 53 L 57 49 L 65 49 L 64 47 L 69 47 L 67 43 L 80 46 C 81.0726 50.5281 86.6565 50.8691 90.5355 49.2492 C 96.7508 46.6537 101.658 39.3931 106.614 34.963 C 108.69 33.108 111.279 32.1015 113 30 L 134 30 L 134 29 L 129 29 L 128 26 L 129 23 L 125 25 L 130 13 C 124.4 10.0376 122.369 11.6736 117 14 L 117 20 L 112 20 L 112 19 L 118 11 L 117 7 L 124 6 L 127 10 L 131 9 L 132 12 L 133 12 L 133 7 L 134 7 L 134 11 L 138 11 L 138 7 L 148 8 L 153 0 L 111 0 C 106.912 0 99.0399 -1.85297 98 3 z"/>
-<path d="M 178 0 L 181 12 L 184 11 L 181 14 L 183 19 L 187 24 L 188 24 L 188 21 L 190 22 L 192 18 L 193 18 L 195 27 L 198 32 L 199 32 L 201 20 L 198 20 L 199 17 L 193 17 L 195 13 L 185 14 L 190 11 L 190 7 C 194.166 8.28497 195.524 11.0442 197 15 L 201 14 C 201.497 18.3176 202.933 19.6512 207 21 L 207 17 L 204 18 C 203.391 14.3689 203.85 12.9481 207 11 L 207 16 L 212 16 L 220 13 L 218 18 L 226 17 L 224 20 L 228 21 L 227 18 C 232.493 15.9797 237.121 4.00021 229 3 L 230 0 C 224.681 0.704315 220.165 2.41455 219 8 L 218 8 L 212 5 L 213 9 L 210 8 L 212 0 z"/>
-<path d="M 76 8 L 73 13 L 74 10 L 69 9 L 70 18 L 73 17 L 73 23 L 71 23 L 71 25 C 80.4525 26.7621 80.2119 14.3579 79 8 z"/>
-<path d="M 240 14 L 235 23 L 236 24 L 239 23 L 246 25 L 251 17 C 245.859 18.2001 243.968 17.2732 240 14 z"/>
-<path d="M 12 16 L 11 23 L 8 27 L 0 28 L 3 31 L 3 37 L 6 36 L 5 32 L 9 37 C 2.69589 38.9907 4.07299 44.2125 9 47 L 10 38 L 13 39 L 17 37 L 10 31 L 13 33 L 14 33 L 20 32 L 12 26 L 15 21 z"/>
-<path d="M 204 28 L 204 29 L 207 32 L 209 32 L 210 29 L 208 30 L 208 29 L 210 25 L 211 25 L 212 30 L 218 30 L 216 26 L 220 25 L 219 21 L 209.588 21.1605 z"/>
-<path d="M 260 21 L 262 28 C 265.054 25.8412 264.94 23.4501 264 20 z"/>
-<path d="M 34 23 L 36 27 L 36 28 L 34 30 L 38 26 L 44 27 L 43 31 L 47 32 L 47 23 L 44 26 L 42 24 z"/>
-<path d="M 168 23 L 167 28 L 168 28 L 168 26 L 169 26 L 167 31 L 167 32 L 175 32 L 177 30 L 177 29 L 170 29 z"/>
-<path d="M 232 29 L 231 34 C 223.619 33.0325 225.388 40.2581 232 37 L 231 42 L 234 42 L 232 48 L 234 50 L 239 51 L 238 46 L 242 51 L 239 52 L 240 61 C 235.683 62.2141 236.366 65.2452 240 67 L 246 56 L 248 56 L 248 62 L 252 65 L 253 65 L 257 64 L 250 60 L 251 56 L 254 56 C 256.011 59.566 257.936 59.5363 261 57 L 265 56 L 265 55 C 261.42 52.9068 260.182 49.5062 264 47 L 262 52 C 267.151 50.8963 265 40.4055 265 36 L 253 46 L 252 38 L 254 35 L 251 37 L 243 36 L 242 31 L 237 30 L 235 32 z"/>
-<path d="M 188 31 L 186 34 L 186 35 L 195 37 L 191 31 L 191 35 L 190 35 z"/>
-<path d="M 53 60 L 53 68 L 57 65 L 53 65 L 53 64 L 56 64 L 55 60 L 53 60 M 64 64 L 65 64 L 66 62 L 70 64 C 68.6297 59.9041 65.4276 59.947 64 64 z"/>
-<path d="M 262 60 L 265 64 z"/>
-<path d="M 229 70 L 229 79 L 232 83 C 235.971 77.954 235.609 71.8251 229 70 z"/>
-<path d="M 75 90 L 88 74 C 82.788 76.2068 70.3615 83.4871 75 90 z"/>
-<path d="M 218 77 C 214.327 81.1585 215 85.7024 215 91 L 216 91 L 220 88 z"/>
-<path d="M 221 92 L 221 98 L 217 97 L 217 100 L 222 100 z"/>
-<path d="M 244 104 L 248 110 L 247 107 L 250 108 L 250 107 z"/>
-<path d="M 246 120 L 246 122 L 247 123 L 251 120 z"/>
-<path d="M 242 125 L 233 133 L 245 135 L 246 126 L 243 127 z"/>
-<path d="M 246 133 L 246 135 L 250 135 L 250 133 z"/>
-<path d="M 258 140 L 261 146 L 262 143 L 262 142 L 260 140 z"/>
-</g>
-<g stroke="none" fill="#6e6e69">
-<path d="M 148 8 L 138 7 L 138 11 L 134 11 L 134 7 L 133 7 L 133 12 L 132 12 L 131 9 L 127 10 L 124 6 L 117 7 L 118 11 L 116 13 L 124.085 11.419 L 130 13 L 125 25 L 129 23 L 128 26 L 129 29 L 154.039 29.0293 L 169 31 L 169 26 L 168 26 L 168 28 L 167 28 L 168 23 L 170 29 L 177 29 L 173 26 L 171 22 L 173 18 L 181 28 L 184 27 L 186 29 L 185 31 L 187 34 L 188 34 L 188 31 L 189 31 L 190 35 L 191 35 L 191 31 C 195.14 34.5824 200.581 41.911 206 35 L 203 35 L 204 28 L 210.314 21.5224 L 219 21 L 227 27 L 226 17 L 218 18 L 220 13 L 212 16 L 207 16 L 207 11 C 203.219 12.5207 201.825 17.0953 207 17 L 207 21 L 201 14 L 197 15 C 195.902 10.6705 194.638 7.7865 190 7 L 191 14 L 195 13 L 193 17 L 199 17 L 198 20 L 201 20 L 201 21 L 199 30 L 202 28 L 201 36 L 195 27 L 193 18 L 192 18 L 190 22 L 188 21 L 188 24 L 181 14 L 184 11 L 181 12 L 177 9 C 176.677 6.51331 176.608 2.70129 174.411 1.02777 C 172.27 -0.603149 168.51 0.00112915 166 0 C 158.911 -0.00320435 149.512 -0.983429 148 8 z"/>
-<path d="M 234 0 L 234 4 L 238 0 z"/>
-<path d="M 14 10 L 14 16 L 16 15 L 17 19 L 12 26 L 20 32 L 14 33 L 13 33 L 10 31 L 20 37 C 25.4894 34.6996 29.7277 28.5777 23 25 L 27 23 L 28 23 L 29 18 L 26 19 L 25 19 L 30 15 L 30 14 L 19 10 L 18 10 L 17 12 L 16 12 L 16 10 z"/>
-<path d="M 0 18 C 1.05282 21.9891 2.49656 25.3019 7 25 L 6 22 L 2 21 L 12 15 z"/>
-<path d="M 232 23 L 230 27 C 234.602 27.085 237.169 27.9704 239 23 z"/>
-<path d="M 214 38 L 209 38 C 204.958 45.3141 191.89 48.374 186 42 L 180 44 L 180 45 L 217 48 L 223 43 L 221 38 L 219 41 L 216 36 L 221 32 z"/>
-<path d="M 169.667 42.3333 L 170.333 42.6667 L 169.667 42.3333 z"/>
-<path d="M 68 48 L 68 49 L 74 53 L 78 49 z"/>
-<path d="M 177 49 L 177 50 L 180 50 L 178 52 L 178 53 L 184 56 L 184 55 L 181 55 L 181 49 z"/>
-<path d="M 193 51 L 193 52 L 201 52 z"/>
-<path d="M 67 55 L 68 59 L 72 59 L 73 55 z"/>
-<path d="M 132 57 L 132 67 L 133 67 L 136 58 z"/>
-<path d="M 183 61 L 183 65 L 184 65 L 184 62 L 189 62 L 183 61 M 40 62 L 40 66 L 52 65 z"/>
-<path d="M 68 73 L 75 64 C 69.5781 64.8575 68.5178 67.9474 68 73 z"/>
-<path d="M 55 71 L 59 70 L 56.2315 81.5255 L 45 90 L 49 90 C 46.5218 94.1868 45.4998 99.1802 51 101 L 53 97 L 49 99 L 50 91 L 51 91 L 51 94 C 53.6873 91.9297 55.2274 88.9059 51 88 L 51 87 L 58 87 C 59.52 82.2257 65.2022 78.7807 65.588 73.9892 C 66.2283 66.0362 58.5339 65.3455 55 71 M 109 66 L 110 102 L 111 102 L 111 76 L 109 66 M 135 66 L 136 72 L 133 70 L 135 99 L 134 99 L 133 94 L 132 94 L 132 108 L 137 108 L 137 109 C 134.603 111.504 136.48 114.275 139 116 L 138 110 L 144 108 L 145 113 L 146 113 L 145 106 L 142 107 L 136.617 89.0895 L 133 79 L 141 86 L 133 73 L 142 77 C 140.67 71.4978 140.433 68.5235 135 66 z"/>
-<path d="M 46 67 L 46 73 L 47 73 L 48 67 z"/>
-<path d="M 44.3333 74.6667 L 44.6667 75.3333 L 44.3333 74.6667 z"/>
-<path d="M 88 79 L 88 108 L 85 108 L 85 120 L 83 117 L 82 117 L 81 120 L 85 124 L 86 124 L 86 109 L 89 109 z"/>
-<path d="M 55.3333 80.6667 L 55.6667 81.3333 L 55.3333 80.6667 z"/>
-<path d="M 117 94 C 117.946 98.4128 123.233 97 127 97 z"/>
-<path d="M 21.6667 95.3333 L 22.3333 95.6667 L 21.6667 95.3333 z"/>
-<path d="M 75 101 L 75 111 L 76 111 z"/>
-<path d="M 178 101 L 175 116 L 172 126 L 180 128 z"/>
-<path d="M 39 107 L 45 104 z"/>
-<path d="M 112 106 L 115 104 z"/>
-<path d="M 98 106 L 104 108 L 104 107 z"/>
-<path d="M 18 108 L 20 111 L 20 108 z"/>
-<path d="M 70 108 L 70 112 L 72 112 L 72 108 z"/>
-<path d="M 6 111 L 5 116 L 5 117 L 12 117 L 12 111 z"/>
-<path d="M 65 115 L 64 123 L 68 123 L 67 126 L 68 127 L 72 126 L 72 120 L 69 122 L 67 119 z"/>
-<path d="M 138 117 L 139 122 L 135 122 L 135 123 L 146 126 L 146 118 L 144 116 z"/>
-<path d="M 27 118 L 29 122 L 30 122 L 31 118 z"/>
-<path d="M 36 120 L 36 133 L 37 133 z"/>
-<path d="M 18 128 L 18 129 L 23 129 L 25 126 z"/>
-<path d="M 191 131 L 191 132 L 207 132 z"/>
-<path d="M 31 137 L 30 151 C 33.2589 148.152 32.5804 140.766 31 137 z"/>
-<path d="M 16 141 L 15 151 L 17 151 L 18 141 z"/>
-<path d="M 16 152 L 16 157 L 17 157 L 18 152 z"/>
-<path d="M 259 156 L 259 157 L 264 158 L 263 167 C 266.115 162.44 266.112 154.646 259 156 z"/>
-<path d="M 15 165 L 15 190 L 17 190 L 17 183 L 18 183 L 19 190 L 23 190 C 22.526 182.955 13.0221 176.607 18 170 L 18 169 z"/>
-<path d="M 258 166 L 262 169 L 261 166 z"/>
-<path d="M 260 171 L 264 178 L 263 181 C 266.655 177.752 263.498 172.992 260 171 z"/>
-<path d="M 233 173 C 228.846 177.834 226.145 180.251 226 187 L 230 187 L 230 181 L 235 181 z"/>
-<path d="M 44 191 L 44 196 L 48 197 L 48 191 z"/>
-<path d="M 22 220 L 0 221 L 0 224 L 17 224 L 21 221 L 32 223 L 40 232 L 44 232 L 47 236 L 52 239 L 48 238 L 56 247.5 L 54 248 L 54 249 L 57 249 L 55 251 L 55 252 L 59 258 C 61.5863 257.679 71.855 260.636 67 263 L 67 264 L 74 264 L 74 268 L 80 269 L 79 270 L 86 270 C 83.9262 273.393 85.4465 274.929 89 276 L 88 272 L 96 281 L 100 281 L 105 286 L 96 288 C 102.317 289.267 107.965 286.58 111 294 L 109 297 L 116 297 L 129 294 L 125 300 L 132 305 L 118 301 L 130 313 L 130 314 L 257 314 L 257 313 L 224 298 L 224 299 L 227 302 L 207 295 C 205.833 289.637 193.831 284.832 189 282.373 C 178.04 276.795 167.136 271.156 156 265.916 C 147.278 261.812 138.935 257.717 129 260 L 129 258 L 123 259 L 123 262 L 130 265 L 119 265 L 119 264 L 121 264 L 121 263 L 109 261 L 109 263 L 113 263 L 118 269 L 118 270 L 115 271 L 107 264 L 107 260 L 102 259 L 103 262 C 101.04 260.728 95.6697 256.176 95 260 C 88.1266 256.15 82.2487 250.401 75.9823 245.64 C 68.343 239.837 60.2729 234.646 52.5756 228.965 C 46.7824 224.69 39.6068 225.087 40 216 L 37 215 L 25 202 L 34 201 C 29.5305 200.594 19.3291 198.37 16.0285 202.603 C 12.7906 206.757 19.7779 216.366 22 220 M 38 200 C 40.2292 203.158 42.7602 203.071 45 200 z"/>
-<path d="M 110 206 L 110 214 L 113 214 C 113.6 208.674 115.77 207.171 121 207 L 121 206 L 116 206 L 116 205 L 138 205 C 130.554 201.876 117.432 203.346 110 206 z"/>
-<path d="M 229 212 L 231 225 L 218 226 C 217.662 230.929 216 233.299 211 234 L 211 235 L 228.015 234.054 L 259 236 L 261 218 L 244.015 216.097 L 229 212 M 199 213 L 195 219 L 208 223 L 208 222 C 201.246 221.485 202.376 217.426 199 213 z"/>
-<path d="M 65 216 C 65.2812 224.479 75.4633 228.657 83 230 C 82.8906 220.82 73.2552 217.242 65 216 z"/>
-<path d="M 90 224 C 93.6498 229.503 103.869 229.873 110 230 L 110 224 z"/>
-<path d="M 233 241 L 233 242 L 238 245 L 231 244 L 231 245 L 234 248 L 247 256 L 239 253 C 238.108 248.829 233.783 248.737 230 248 L 231 251 L 225 253 C 228.981 253.702 232.66 253.555 235 250 C 239.628 258.514 247.441 259.957 256 262 L 256 263 L 247 261.548 L 239 257.68 L 231 258 L 231 259 L 261 268 L 258 265 L 258 264 L 265 264 L 265 246 L 259 246 L 259 237 z"/>
-<path d="M 205 254 C 200.091 258.412 195.985 255.859 190.09 256.114 C 186.606 256.265 183.479 257.8 180 258 L 181 260 L 180 260 C 171.964 256.133 161.638 257.629 153 258 L 153 259 C 160.094 263.053 171.757 271.068 180 270 L 191 277.001 L 210 284 C 210.707 289.883 222.154 289.941 227 290 L 227 291 L 225 293 L 241 298 L 240 303 L 250 307 C 254.39 304.595 260.704 308.088 265 310 L 265 285 C 265 281.89 265.819 277.296 264.397 274.429 C 262.022 269.643 251.596 268.699 247.015 267.792 C 243.787 267.153 241.045 265.269 237.961 264.19 C 227.196 260.422 216.175 256.305 205 254 z"/>
-</g>
-<g stroke="none" fill="#494938">
-<path d="M 175 0 L 178 9 L 178 0 z"/>
-<path d="M 240 13 L 246 8 C 242.304 8.16614 241.046 9.47696 240 13 z"/>
-<path d="M 157 34 L 157 35 L 162 35 z"/>
-<path d="M 89 56 L 99 52 L 112 36 C 103.663 37.2864 93.2009 48.9256 89 56 z"/>
-<path d="M 43 39 L 42 45 L 49 45 C 48.1988 48.3828 47.8306 51.0791 51 53 C 47.0058 54.7296 42.5083 62.2832 39 57 C 33.8568 58.1352 32.1753 59.6614 32 65 L 38 65 L 27.1651 75.7593 L 14 73 L 13 78 L 17 78 L 28 86 C 29.9115 82.6431 32.617 82.3885 35.4552 80.0818 C 38.6908 77.4522 39.288 74.3541 44 76 L 46 66 L 40 66 L 40 62 C 44.6971 62.872 49.875 64.333 53 60 L 58 60 L 58 59 L 52 56 L 54 52 L 54 51 L 51 50 L 54 47 L 50 47 C 49.5091 42.4705 47.3554 40.2143 43 39 z"/>
-<path d="M 176 45 L 180 45 L 179 42 z"/>
-<path d="M 182 47 L 181 48 L 181 49 L 181 50 L 186 50 L 186 49 L 184 47 z"/>
-<path d="M 12 52 L 12 57 L 0 60 C 0 66.1309 -0.938001 72.4585 5 76 C 4.82039 70.3653 4.89352 66.6665 11 65 L 8 71 L 12 72 L 13 72 L 15 71 L 14 66 L 28 75 L 29 72 L 24 71 L 26 69 L 26 68 L 23 64 L 28 63 L 28 59 L 20 61 L 18 55 L 21 54 L 21 53 L 12 52 M 181 55 L 186 52 z"/>
-<path d="M 220 84 L 220 98 L 221 98 L 222 84 z"/>
-<path d="M 120 93 L 127 96 L 127 93 z"/>
-<path d="M 58 106 L 58 109 L 59 109 z"/>
-<path d="M 143 108 L 138 110 L 138 115 L 144 117 L 143 118 C 148.021 116.924 145.509 110.785 143 108 z"/>
-<path d="M 12 114 L 13 124 L 23 125 L 24 119 L 24 118 L 13 118 z"/>
-<path d="M 119 124 L 119 125 C 122.807 124.884 125.158 124.513 127 121 z"/>
-<path d="M 122 132 L 122 133 L 142 133 z"/>
-<path d="M 1 140 L 0 170 C 4.15527 171.291 4.15527 173.709 0 175 C 0.0546307 179.909 0.789228 185.025 5 188 L 5 185 L 6 185 L 7 188 L 8 188 L 8.30247 174 L 12 165 L 4 168 L 5 140 L 2 142 z"/>
-<path d="M 257 142 L 253 153 L 259 156 L 265 156 L 265 146 L 264 146 L 260 151 L 259 151 L 261 147 L 261 146 z"/>
-<path d="M 192 144 L 192 146 L 194 146 L 194 144 z"/>
-<path d="M 37 152 L 36 188 L 25 186 C 27.9248 190.27 35.0531 191.507 40 192 L 43 188 L 43 187 L 37 189 L 37 183 L 43 183 L 43 181 L 39 181 L 38 155 L 42 155 L 42 154 z"/>
-<path d="M 23 186 L 22 194 L 27 196 L 28 196 L 24 193 L 23 186 M 239 195 L 239 190 L 241 190 L 240 197 C 240.873 196.221 241.904 195.531 242.441 194.437 C 242.836 193.634 243.263 192.837 243.278 191.91 C 243.439 181.908 231.182 189.926 239 195 z"/>
-<path d="M 230 193 L 230 198 L 231 198 L 234 194 z"/>
-<path d="M 260 196 L 260 199 L 265 200 L 265 196 z"/>
-<path d="M 119 207 L 119 208 C 130.644 208 143.498 209.595 155 208.085 C 161.671 207.209 172.264 204.655 178 209 L 189 209 C 191.686 204.857 196.555 206.215 201 205.91 C 211.529 205.189 222.625 205.926 233 204 C 227.404 198.118 212.635 201.913 205 202.004 C 187.731 202.209 170.258 203.205 153 203.961 C 141.646 204.458 130.144 204.339 119 207 z"/>
-<path d="M 103 217 C 100.996 221.01 98.3584 222.307 94 223 L 94 224 L 110 224 L 110 230 L 83 224 L 81 231 L 97 240 L 97 231 L 111 233 L 111 223 L 105 222 L 105 217 z"/>
-<path d="M 194 217 L 190 223 L 198 220 L 198 219 z"/>
-</g>
-<g stroke="none" fill="#5e6839">
-<path d="M 237 9 L 245 7 C 247.544 10.5246 251.449 10.6107 254 7 L 250 8 L 253 1 C 249.749 -0.364258 242.688 -1.25137 239.94 1.60339 C 238.186 3.42474 237.736 6.66571 237 9 z"/>
-<path d="M 242 6.33334 C 242.773 6.33334 242.16 6.83115 241.667 6.66666 L 242 6.33334 z"/>
-<path d="M 5 32 L 3 37 L 0 33 L 0 60 L 12 57 L 12 52 C 16.2003 54.171 19.299 54.1564 22 50 L 16 49 L 10 51 C 13.191 47.4937 13.7108 46.0836 11 42 L 20 43 L 16 45 L 20 48 L 28 44 C 28.0432 47.6415 27.7118 51.0756 32 51 L 29 47 L 31 49 L 35 48 C 31.4529 42.0574 27.3853 44.6265 22.233 42.115 C 18.753 40.4186 17.3161 33.764 13 39 L 10 38 L 9 47 C 4.71145 43.5059 3.43706 39.9264 9 37 z"/>
-<path d="M 39 82 L 35 89 L 37 86 L 42 85 L 42 83 L 41 82 z"/>
-<path d="M 262 83 L 265 86 z"/>
-<path d="M 217 88 L 215 104 L 216 104 L 219 101 L 219 108 L 220 108 L 221 101 L 222 102 L 217 100 L 217 97 L 220 98 L 220 88 z"/>
-<path d="M 86 98 L 83 99 L 83 100 z"/>
-<path d="M 261 102 L 262 104 L 263 104 L 264 102 z"/>
-<path d="M 256.667 109.333 L 257.333 109.667 L 256.667 109.333 z"/>
-<path d="M 264 116 L 262 117 L 262 118 z"/>
-<path d="M 234 122 L 233 126 L 236 127 L 236 128 L 233 132 L 234 132 L 240 125 z"/>
-<path d="M 257 136 L 260 143 L 260 144 L 264 146 L 265 137 L 262 139 z"/>
-</g>
-<g stroke="none" fill="#c8c5ad">
-<path d="M 253 0 L 252 4 L 256 0 z"/>
-<path d="M 0 4 L 3 2 z"/>
-<path d="M 91 7 L 91 11 L 92 11 z"/>
-<path d="M 70 12 L 67 14 L 71 16 z"/>
-<path d="M 258 13 L 258 14 L 264 17 L 265 17 L 264 12 z"/>
-<path d="M 81 27 L 84 26 L 84 21 C 81.1707 19.5853 76.802 20.6041 79 25 C 78.6313 24.2625 82.3597 26.2158 82 26 z"/>
-<path d="M 47 24 L 49 21 L 47 24 M 232 21 L 231 24 z"/>
-<path d="M 27 28 L 33 27 C 30.4306 25.548 28.8487 25.6461 27 28 z"/>
-<path d="M 114 56 L 112 103 L 113 103 L 113.34 66.0147 z"/>
-<path d="M 60 59 L 63 64 z"/>
-<path d="M 205 62 L 205 63 L 210 63 L 211 128 L 154 127 L 154 128 C 173.576 132.038 195.008 131 215 131 L 214 84 L 213.397 64.3179 z"/>
-<path d="M 58 87 L 56 85 L 55 85 L 51 87 L 51 88 L 54 88 L 56 94 L 57 94 L 81 68 C 72.4767 67.284 59.1904 78.6302 58 87 z"/>
-<path d="M 52 69 L 57 75 L 59 70 L 55 71 L 56 68 z"/>
-<path d="M 127 69 L 127 88 L 117 88 L 117 93 L 127 93 L 127 97 L 128 97 z"/>
-<path d="M 45 73 L 42 76 L 43 79 L 48 77 L 47 73 z"/>
-<path d="M 53 80 L 56 82 L 50 82 L 50 83 L 53 85 L 58 77 z"/>
-<path d="M 37 80 L 41 79 z"/>
-<path d="M 32 81 L 32 86 L 33 86 L 35 81 z"/>
-<path d="M 24 88 L 28 87 z"/>
-<path d="M 54 96 L 51 104 L 59 98 L 59 101 L 60 101 L 61 96 z"/>
-<path d="M 112 106 L 112 131 L 116 130 L 116 129 C 111.878 123.559 114 112.647 114 106 z"/>
-<path d="M 232.667 107.333 L 233.333 107.667 L 232.667 107.333 z"/>
-<path d="M 59 112 C 54.4653 117.467 55.9814 122.278 56 129 L 53 131 L 58 133 L 58 120 L 59 120 L 59 122 L 60 122 z"/>
-<path d="M 62 117 L 64 121 L 64 117 z"/>
-<path d="M 76 122 L 75 126 C 78.5349 126.951 83.048 128.443 84 124 z"/>
-<path d="M 88 123 L 88 138 L 89 138 z"/>
-<path d="M 34 124 L 34 152 L 35 152 z"/>
-<path d="M 43 128 L 43 154 L 44 154 L 45 128 z"/>
-<path d="M 247 133 L 252 135 C 251.822 131.245 249.386 129.415 247 133 z"/>
-<path d="M 120 133 L 120 134 L 124 134 z"/>
-<path d="M 231.333 136.667 L 231.667 137.333 L 231.333 136.667 z"/>
-<path d="M 243 157 C 237.916 157.796 236.585 160.123 238 165 L 234 166 L 234 169 L 252 174 L 253 174 L 250 171 L 250 170 L 256 170 L 256 169 L 253 169 L 253 168 L 257 168 L 256 165 L 253 166 L 253 163 L 252 163 L 249 164 L 251 168 L 247 168 L 247 162 L 246.674 154.951 L 248 149 C 244.207 150.829 242.392 152.719 243 157 z"/>
-<path d="M 36 159 L 36 180 L 37 180 z"/>
-<path d="M 254.333 182.667 L 254.667 183.333 L 254.333 182.667 z"/>
-<path d="M 0 192 L 0 193 L 4 193 z"/>
-<path d="M 245 194 L 245 195 L 251 195 z"/>
-</g>
-<g stroke="none" fill="#898175">
-<path d="M 256 0 L 252 4 L 253 1 L 250 1 L 250 2 L 250 8 L 254 7 L 252 13 L 253 13 L 260 4 L 265 6 L 265 0 L 261 0 z"/>
-<path d="M 245 10 L 246 14 L 247 14 L 246 11 L 251 11 z"/>
-<path d="M 134 29 L 134 30 L 152 30 z"/>
-<path d="M 112 45 L 108 48 L 108 49 z"/>
-<path d="M 104 51 L 107 49 z"/>
-<path d="M 186 53 L 193 52 L 193 50 C 189.637 50 186.796 49.2842 186 53 z"/>
-<path d="M 89 58 L 89 59 L 104 52 z"/>
-<path d="M 116 130 L 117 130 L 120 128 L 120 127 L 117 127 L 117 104 C 117.002 99.9953 116.4 96.3341 120 94 L 120 93 L 117 93 L 117 88 L 127 88 L 127 58 L 116.603 61.4298 L 116 81 z"/>
-<path d="M 46.6667 65.3333 L 47.3333 65.6667 L 46.6667 65.3333 z"/>
-<path d="M 57 73 L 52 76 L 46 74 C 48.57 77.8741 59.3654 79.9788 57 73 z"/>
-<path d="M 37 78 L 44 81 L 43 74 z"/>
-<path d="M 28 85 L 32 83 z"/>
-<path d="M 224 83 L 223 100 L 224 100 z"/>
-<path d="M 26 95 L 26 99 L 31 98 L 34 91 L 26 95 M 50 91 L 49 99 L 56 93 L 55 92 z"/>
-<path d="M 61 137 L 62 137 L 62 123 L 67 126 L 68 123 C 60.7356 121.101 62.4774 115.92 66 111 L 63 106 L 67 106 L 67 105 L 64 105 L 64 100 L 69 101 L 70 97 C 64.2674 94.0877 61.4692 98.2639 61.054 104.039 C 60.2723 114.913 61 126.097 61 137 z"/>
-<path d="M 38 101 L 42 101 L 42 104 L 43 110 L 51 108 C 51.6544 101.182 42.7089 93.7746 38 101 z"/>
-<path d="M 163 126 L 157 126 L 157 127 L 173 127 L 174 125 L 175 116 L 178 101 C 175.515 101.009 172.548 100.672 170.329 102.028 C 163.609 106.133 163.005 119.094 163 126 z"/>
-<path d="M 26.6667 102.333 L 27.3333 102.667 L 26.6667 102.333 z"/>
-<path d="M 29 109 L 32 112 L 34 110 z"/>
-<path d="M 88 110 L 88 123 L 89 123 z"/>
-<path d="M 118 110 L 118 120 L 119 120 z"/>
-<path d="M 232 111 L 232 116 L 229 116 L 227 128 L 219 128 L 219 129 L 224 132 L 220 132 L 220 133 L 232 134 L 230 130 L 236 128 L 236 127 L 233 126 L 234 122 L 240 125 L 236 119 L 236 121 L 235 116 L 235 115 z"/>
-<path d="M 45 117 C 44.9814 122.251 44.8717 126.064 39 127 L 39 128 L 42 128 L 42 139 L 43 139 L 43 128 L 45 128 L 45 150 L 47 150 L 46 128 L 48 128 L 48 133 L 49 133 L 49 126 L 46 126 z"/>
-<path d="M 4 119 L 4 131 L 5 131 z"/>
-<path d="M 28 125 L 28 122 C 25.3925 123.119 24.9321 124.341 28 125 z"/>
-<path d="M 31 124 L 29 151 L 30 151 C 31.7313 143.728 33.9403 131.007 31 124 z"/>
-<path d="M 151 130 L 151 131 L 188 131 L 175 130 z"/>
-<path d="M 109 133 L 109 143 L 110 143 z"/>
-<path d="M 190 134 L 190 135 L 223 136 L 208 135 z"/>
-<path d="M 5 135 L 4 168 L 12 165 L 13 160 L 6 160 C 7.05665 156.508 8.41764 155.568 12 155 C 12 152.229 9.66901 146.481 9 152 L 8 152 L 8 141 L 7 141 L 7 152 L 6 152 z"/>
-<path d="M 11 139 L 11 144 L 12 144 z"/>
-<path d="M 9 140 L 9 146 L 10 146 z"/>
-<path d="M 74 141 L 74 142 L 77 142 z"/>
-<path d="M 228 141 L 229 149 L 230 149 z"/>
-<path d="M 222 183 L 224 186 L 224 183 z"/>
-<path d="M 127 188 L 130 188 C 131.622 184.895 127.763 184.439 127 188 z"/>
-<path d="M 243 191 L 252 190 C 249.211 187.562 243.952 186.558 243 191 z"/>
-<path d="M 246 199 L 246 200 L 256 200 z"/>
-<path d="M 182 201 L 182 202 L 226 201 L 210 200.961 z"/>
-<path d="M 149 202 L 149 203 L 178 203 z"/>
-</g>
-<g stroke="none" fill="#98a1b3">
-<path d="M 258 0 L 261 2 z"/>
-<path d="M 233 5 L 238 7 L 238 6 L 236 4 L 233 5 M 259 5 L 259 6 L 263 6 z"/>
-<path d="M 16 7 L 16 12 L 17 12 z"/>
-<path d="M 113 30 L 108 32 L 109 36 L 154 33.1705 L 205 43 C 202.877 36.9405 189.777 35.2415 184 33.7593 C 178.039 32.23 172.032 32.1327 166 31.2631 C 162.332 30.7343 158.709 29.1428 155 29.1435 C 145.114 29.1454 134.941 29.7717 125 30.0147 C 120.825 30.1167 117.136 30.8994 113 30 z"/>
-<path d="M 183 65 L 183 128 L 184 128 L 184 85 z"/>
-<path d="M 251 175 L 251 179 L 252 179 z"/>
-</g>
-<g stroke="none" fill="#c9dadc">
-<path d="M 1 1 L 1 2 L 4 3 z"/>
-<path d="M 70 1 L 68 7 L 73 1 z"/>
-<path d="M 12 4 L 14 10 L 15 10 L 16 7 L 17 7 L 17 12 C 20.1138 6.81281 18.6765 0.96759 12 4 z"/>
-<path d="M 21 6 L 21 7 L 25 5 z"/>
-<path d="M 257 11 L 257 12 L 262 13 z"/>
-<path d="M 10 17 L 10 19 L 12 19 L 12 17 z"/>
-<path d="M 257 20 L 256 24 L 259 20 z"/>
-<path d="M 258 26 L 262 28 C 261.386 25.1492 260.697 25.1456 258 26 z"/>
-<path d="M 54.3333 37.6667 L 54.6667 38.3333 L 54.3333 37.6667 z"/>
-<path d="M 55 43 L 55 45 L 57 45 L 57 43 z"/>
-<path d="M 61 55 L 61 59 L 65 59 L 65 58 L 62 58 L 64 56 z"/>
-<path d="M 128 57 L 128 97 L 117 97 L 119 120 L 127 121 L 125 124 L 128 127 C 133.413 122.442 132 115.478 132 109 L 137 109 L 137 108 L 132 108 L 132 57 z"/>
-<path d="M 43 65 L 48 69 L 49 69 L 51 68 L 50 64 z"/>
-<path d="M 66 96 L 64 99 z"/>
-<path d="M 60 100 L 60 122 L 59 122 L 59 120 L 58 120 L 57 137 L 60 143 L 61 143 L 61 114 z"/>
-<path d="M 63 106 L 63 107 L 67 107 z"/>
-<path d="M 54 110 L 53 130 L 54 130 L 56 129 z"/>
-<path d="M 64 126 L 68 131 L 71 126 z"/>
-<path d="M 230 140 L 230 159 L 231 159 L 232 140 z"/>
-<path d="M 17 147 L 17 151 L 18 151 L 19 147 z"/>
-<path d="M 257 171 L 261 177 L 261 172 L 260 172 L 260 175 L 259 175 z"/>
-<path d="M 231 172 L 230 175 z"/>
-<path d="M 254 172 L 253 176 z"/>
-</g>
-<g stroke="none" fill="#c0be73">
-<path d="M 111 2 L 110 8 L 114 10 L 114 2 z"/>
-<path d="M 156.333 2.66666 L 156.667 3.33334 L 156.333 2.66666 z"/>
-<path d="M 165 11 L 165 13 L 167 13 z"/>
-<path d="M 66 17 L 66 18 L 70 18 z"/>
-<path d="M 53 22 L 57 18 z"/>
-<path d="M 237 29 L 238 29 C 242.089 25.2025 244.772 27.0852 248 31 L 256 29 L 256 28 L 249 28 L 247 24 C 242.595 24.5824 238.803 24.4997 237 29 z"/>
-<path d="M 73 28 L 74 32 C 77.361 32.5444 79.0784 33.4596 78 37 L 85 38 C 84.0961 31.3165 79.0752 29.331 73 28 z"/>
-<path d="M 177 28 L 175 32 L 181 33 z"/>
-<path d="M 238 46 L 239 50 L 239 51 L 237 54 L 242 51 z"/>
-<path d="M 244 47 L 246 51 L 244 47 M 261 47 C 261.093 50.8163 261.116 53.6343 265 55 L 262 52 L 264 47 z"/>
-<path d="M 262 89 L 253 103 C 257.123 102.671 259.054 102.348 260 98 L 264 98 L 262 94 L 265 94 L 265 93 z"/>
-<path d="M 241 91 L 240 95 L 243 97 L 247 91 z"/>
-<path d="M 242 104 L 237 111 L 242 115 L 242 116 L 237 115 L 236 119 L 242 118 L 242 124 L 241 124 L 241 122 L 240 122 L 240 126 C 244.395 124.458 246.121 122.399 244 118 L 263 122 L 261 125 L 263 125 L 262 129 L 262 130 L 258 129 L 257 132 L 265 134 L 263 118 L 264 121 L 258 120 C 256.15 117.091 254.258 115.044 251 117 L 247 115 L 247 114 L 250 114 L 249 110 L 252 110 L 247 107 L 248 110 L 244 104 z"/>
-<path d="M 246 130 L 245 135 L 246 135 L 248 130 z"/>
-<path d="M 264.333 135.667 L 264.667 136.333 L 264.333 135.667 z"/>
-<path d="M 264 141 L 264 146 L 265 146 z"/>
-</g>
-<g stroke="none" fill="#b5a792">
-<path d="M 203 2 L 205 6 L 207 2 z"/>
-<path d="M 255 8 L 253 15 L 254 15 L 255 13 L 255 17 C 257.953 15.2856 258.093 14.1906 257 11 L 262 12 z"/>
-<path d="M 227 18 L 228 21 L 224 20 L 227 27 L 216 26 L 218 30 L 212 30 L 211 25 L 210 25 L 208 30 L 210 29 L 210 30 L 207 32 L 204 29 L 203 35 L 206 35 L 199 37 L 205 43 L 209 38 L 214 38 L 219 31 L 226 30 L 226 34 L 231 34 L 233 28 L 230 30 C 230.078 26.8909 230.485 22.5149 234 22 C 235.493 19.3392 237.941 16.8667 234 16 L 234 15 L 239 12 z"/>
-<path d="M 80 14 L 77.0309 22.8156 L 72 29 L 84 30 L 82 25 C 78.7728 22.7367 80.7631 21.1385 84 21 L 82 23 L 84 26 L 86 26 C 87.0904 22.2692 87.4811 19.2572 84 17 L 85 14 z"/>
-<path d="M 25 19 L 26 19 L 29 18 L 28 23 L 27 23 L 26 21 L 23 25 L 31 25 L 33 22 L 33 21 L 30 17 L 32 18 L 32 15 C 28.6358 15.3534 25.7636 15.4185 25 19 z"/>
-<path d="M 71 17 L 68 20 L 68 21 L 72 21 L 73 17 z"/>
-<path d="M 94 18 L 93 24 C 97.0697 23.5723 99.1251 22.762 101 19 L 94 18 M 172 18 L 174 21 L 172 18 M 184 18 L 186 24 L 187 24 L 184 18 M 135 19 L 139 23 z"/>
-<path d="M 167 43 L 167 44 C 171.002 45.1805 174.398 45.6073 177 42 z"/>
-<path d="M 81 45 L 86 47 z"/>
-<path d="M 107 48 L 108 52 L 100 55 L 100 56 L 109 53 L 112 59 L 113 59 L 115 50 L 110 51 L 112 48 z"/>
-<path d="M 115 62 L 116 62 C 117.39 59.6838 119.128 59.6255 116 59 L 116 58 L 127 58 L 127 69 L 128 69 L 128 57 L 132 57 C 125.67 52.6697 115.296 53.0005 115 62 z"/>
-<path d="M 50 64 L 54 69 z"/>
-<path d="M 42 95 L 42 96 L 47 98 L 45 94 z"/>
-<path d="M 29 102 L 32 100 z"/>
-<path d="M 109 102 C 110.819 104.415 112.372 104.397 115 103 z"/>
-<path d="M 118 105 L 118 110 L 119 110 z"/>
-<path d="M 256 106 L 256 108 L 253 107 L 255 109 L 255 110 L 253 112 L 254 113 L 260 109 L 265 107 z"/>
-<path d="M 43 110 L 49.821 114.303 L 51 124 L 51 146 L 56 145 L 56 144 L 54 133 L 55 133 L 55 137 L 59 132 C 50.4079 131.369 52.1365 114.615 52 108 z"/>
-<path d="M 27 109 L 30 112 z"/>
-<path d="M 11.3333 114.667 L 11.6667 115.333 L 11.3333 114.667 z"/>
-<path d="M 31 122 C 23.7242 128.554 27 143.741 27 153 L 25 153 L 25 132 L 24 132 L 23 155 L 22 155 L 22 131 L 21 131 L 21 157 L 34 153 z"/>
-<path d="M 216.333 123.667 L 216.667 124.333 L 216.333 123.667 z"/>
-<path d="M 62 127 L 68 127 C 65.6637 125.414 63.9919 124.803 62 127 z"/>
-<path d="M 85 131 L 85 135 L 79 136 L 79 137 L 85 136 L 85 140 L 86 140 z"/>
-<path d="M 250 135 L 250 136 L 253 136 L 252 140 L 257 138 L 257 142 L 258 142 L 261 139 L 258 135 z"/>
-<path d="M 47 146 L 47 150 L 45 148 L 44 148 L 47 154 L 43 156 L 47 155 L 48 177 L 49 177 C 49 166.372 51.3995 156.068 47 146 z"/>
-<path d="M 246 151 L 249 158 z"/>
-<path d="M 74 168 L 74 169 L 86 170 L 86 173 L 74 173 L 74 174 C 80.1315 174.004 85.4363 173.703 86 181 L 87 181 L 87 168 z"/>
-<path d="M 21 170 L 21 172 L 34 172 z"/>
-<path d="M 61 172 L 61 174 L 71 174 L 71 172 z"/>
-<path d="M 116 180 C 116.904 184.217 121.356 183 125 183 L 125 180 L 120 182 z"/>
-<path d="M 121 185 L 121 188 L 123 188 L 123 185 z"/>
-<path d="M 230 188 L 230 193 L 236 194 C 235.358 190.059 233.873 188.807 230 188 z"/>
-<path d="M 73 190 L 88 192 z"/>
-<path d="M 114 202 L 114 204 L 154 204 L 139 203 z"/>
-</g>
-<g stroke="none" fill="#55524f">
-<path d="M 244 10 L 240 11 L 239 11 L 233 24 L 240 14 L 245 18 L 244 15 L 244 14 z"/>
-<path d="M 116 13 L 112 19 L 112 20 L 117 20 z"/>
-<path d="M 171 20 L 173 26 L 187 34 L 185 31 L 186 29 L 184 27 L 181 28 C 179.543 23.6066 175.231 21.4282 171 20 z"/>
-<path d="M 34 26 L 31 29 L 33 34 L 26 31 L 25 35 L 30 34 L 33 39 L 40 37 L 41 42 L 40 42 L 37 39 L 42 45 L 43 39 L 50 47 L 55 42 L 53 42 L 52 37 L 58 35 L 58 34 L 52 34 L 53 31 L 49 32 L 51 26 L 47 32 L 43 31 L 44 27 L 38 26 L 34 30 z"/>
-<path d="M 201 28 L 201 36 C 202.685 33.1321 203.187 30.6447 201 28 z"/>
-<path d="M 111 44 L 111 45 L 124 43 C 119.187 40.6876 115.542 41.5139 111 44 M 129 41 L 129 42 L 142 42 L 129 41 M 173.667 41.3333 L 174.333 41.6667 L 173.667 41.3333 z"/>
-<path d="M 147 42 L 147 43 L 156 43 z"/>
-<path d="M 161 43 L 161 44 L 167 44 z"/>
-<path d="M 153 59 C 153 62.9149 152.597 67.08 153.144 70.9606 C 153.493 73.438 155.106 75.5523 154.992 78.0895 C 154.746 83.5522 151.293 93.8871 156 98 L 155 102 C 163.91 102 169.167 101.421 177 97 L 177 96 L 161 98 C 160.504 91.7139 160.452 85.2486 159.715 79 C 158.971 72.6967 157.527 65.1435 162 60 z"/>
-<path d="M 171 60 L 171 61 L 179 61 z"/>
-<path d="M 215 64 L 215 74 L 222 72 L 218 75 L 222 84 L 221.896 98 L 223 107 C 221.696 112.491 219.882 124.384 225 128 L 225 96 L 224 96 L 224 100 L 223 100 L 224 65 z"/>
-<path d="M 94 75 L 94 97 L 92.9722 106.566 L 86 109 L 87 123 L 88 123 L 88 110 C 96.1154 111.692 96.3245 127.292 92 133 L 92 134 C 96.853 132.96 95 125.088 95 121 L 95 89 C 95 84.7507 96.0934 78.6333 94 75 z"/>
-<path d="M 151 79 L 151 109 L 152 109 z"/>
-<path d="M 203 80 L 203 84 L 191 85 C 190.627 89.8916 188.892 91.6268 184 92 L 184 93 L 203 101 L 201 98 C 207.78 94.5873 207.096 85.5046 203 80 M 0 85 L 13 83 C 7.77843 81.4642 3.45334 79.9516 0 85 z"/>
-<path d="M 25 103 C 24.151 106.704 23.6813 109.653 27 112 L 27 113 L 25 117 L 33 113 L 33 112 L 27 109 C 32.7887 109.183 39.012 114.005 43 108 L 25 103 M 117 103 L 117 127 L 127 124 L 119 125 L 119 124 L 122 121 C 114.86 117.063 120.36 108.812 117 103 z"/>
-<path d="M 52 104 L 52 115 L 53 115 z"/>
-<path d="M 202 112 L 202 125 L 198 125 L 198 128 L 207 128 L 208 124 L 204 123 L 206 119 L 206 118 L 204 112 z"/>
-<path d="M 36 117 L 37 134 C 39.6131 132.402 41.7195 130.48 39 128 L 39 127 L 44 127 C 43.3641 123.007 41.9932 121.636 38 121 L 44 116 z"/>
-<path d="M 156 115 L 156 116 C 159.717 117.488 161.354 119.001 162 123 L 158 123 L 163 126 L 164 115 z"/>
-<path d="M 132 117 L 132 126 L 142 126 L 142 125 L 133 124 z"/>
-<path d="M 220 122 L 220 126 L 221 126 z"/>
-<path d="M 3 123 L 5 132 z"/>
-<path d="M 170 133 L 170 134 L 191 134 L 191 131 z"/>
-<path d="M 3 135 L 2 142 C 4.4771 139.549 5.08679 137.913 3 135 z"/>
-<path d="M 186 142 L 187 142 L 191 139 L 191 140 L 188 141 L 188 143 L 190 144 L 191 144 L 197 143 C 194.375 138.599 188.059 135.798 186 142 z"/>
-<path d="M 170 140 L 170 144 L 175 141 z"/>
-<path d="M 11 167 L 8 188 L 7 188 L 6 185 L 5 188 L 2 182 L 0 182 L 0 191 L 12 190 L 12 189 z"/>
-<path d="M 19 168 C 18.997 172.489 17.0455 179.116 21 182 z"/>
-<path d="M 10 192 L 0 195 L 0 207 L 1 207 L 1 198 L 3 198 C 3.00491 204.353 3.33878 207.38 10 209 L 13 195 L 14 198 L 15 198 L 16 194 z"/>
-<path d="M 252 195 L 247 197 L 247 198 L 258 200 z"/>
-<path d="M 105 199 L 111 202 L 111 199 z"/>
-<path d="M 25 202 L 37 215 L 40 216 C 39.1907 225.209 45.7896 224.657 51.7145 228.965 C 60.0842 235.051 68.8292 240.666 76.946 247.127 C 82.4361 251.497 88.4097 257.572 95 260 C 95 255.792 100.901 261.34 103 262 L 102 259 L 104 261 L 107 260 L 107 264 L 115 271 L 118 270 L 118 269 L 113 263 L 109 263 L 109 261 L 121 263 L 121 264 L 119 264 L 119 265 L 130 265 C 129.204 261.284 126.363 262 123 262 L 123 259 L 129 258 L 129 260 L 143 260 L 143 259 C 136.012 255.902 128.584 254.199 121 256 C 119.204 252.679 114.949 251.571 114 256 L 113 256 C 110.647 253.2 106.526 253.073 103.594 250.715 C 99.4495 247.381 94.6831 245.032 90.4491 241.795 C 83.7854 236.7 78.9357 230.965 70 230 L 66 225 L 67 222 L 67 216 L 46.2855 208.333 z"/>
-<path d="M 178 202 L 178 203 L 199 203 z"/>
-<path d="M 48 206 L 51 203 z"/>
-<path d="M 186 217 L 184 220 C 186.251 219.527 187.118 219.14 186 217 z"/>
-<path d="M 259 218 L 259 236 L 227.039 234.054 L 211 235 L 211 234 L 216 234 L 216 233 L 209 233 L 209 230 L 205 230 C 203.84 232.112 201.027 234.362 201.005 236.906 C 200.967 241.502 212.811 239.924 216 240 L 215 243 L 225 246 L 225 247 L 222 247 L 222 252 L 222 253 L 231 251 L 230 248 L 239 253 L 247 256 C 244.042 251.256 239.531 248.503 234 248 L 231 245 L 231 244 L 238 245 L 233 242 L 233 241 L 246 240.53 L 259 237 L 259 246 L 265 246 L 265 245 L 260 245 z"/>
-<path d="M 205 226 L 205 229 L 208 229 L 208 226 z"/>
-<path d="M 234 250 C 230.019 256.147 221.776 253.229 216 252 L 216 253 L 227 257 L 226 259 L 249 266 L 249 267 L 244 267 L 244 268 L 265 273 L 265 264 L 258 264 L 258 265 L 261 268 L 231 259 L 231 258 L 256 263 L 256 262 L 247 259.861 z"/>
-<path d="M 155 262 L 167 270 L 171 274 L 195 287 L 208 294 L 207 295 L 227 302 L 224 299 L 224 298 C 237.589 302.863 250.237 313.958 265 314 C 264.169 308.789 254.314 302.486 250 307 L 240 303 L 241 298 L 225 293 L 227 291 L 227 290 C 222.514 289.925 210.798 289.479 210 284 L 194 277.861 L 180 270 z"/>
-<path d="M 150 297 L 164 302 L 164 303 L 158 303 L 162 306 L 170 306 L 169 303 L 177 303 L 173 305 L 174 308 L 170 309 L 170 310 L 175 308 L 179 309 L 177 305 L 181 305 C 178.731 299.355 173.319 301.527 168.285 300.965 C 162.344 300.301 155.993 298.113 150 297 z"/>
-</g>
-<g stroke="none" fill="#e4cdb4">
-<path d="M 34 12 C 36.3904 14.6916 39.0386 13.4203 42 12 z"/>
-<path d="M 104 12 L 100 30 L 102 26 L 107 27 L 107 26 L 106 12 z"/>
-<path d="M 181 22 L 181 24 L 183 24 z"/>
-<path d="M 62 32 L 57 31 C 59.6015 34.6073 62.9984 34.1805 67 33 L 65 29 L 70 31 C 66.9636 26.555 64.0401 27.1267 62 32 z"/>
-<path d="M 107 33 L 102 41 L 109 33 z"/>
-<path d="M 90 56 L 90 57 L 104 51 L 104 52 L 88 60 L 88 61 C 94.7522 59.1942 104.019 56.0797 108 50 L 104 51 L 104 50 L 112 46 C 105.695 44.9509 95.4636 52.8111 90 56 z"/>
-<path d="M 116 58 L 116 59 L 120 59 z"/>
-<path d="M 31 110 C 34.3767 116.39 36.9323 114.489 43 113 L 44 126 L 45 126 L 45 117 L 49 117 L 49 133 L 48 133 L 48 131 L 47 131 L 48 153 L 50 153 C 50.1996 143.328 51.0006 133.728 51 124 C 50.9998 120.736 51.9116 115.425 49.2577 112.934 C 44.836 108.785 38.7906 111.637 34 113 L 34 110 z"/>
-<path d="M 33 120 L 33 152 L 34 152 L 34 132 z"/>
-<path d="M 15 128 L 13 143 L 15 143 L 15 137 L 16 137 L 16 140 L 17 140 L 17 128 z"/>
-<path d="M 79 140 L 85 136 z"/>
-<path d="M 62 139 C 64.3219 142.111 67.3065 142.895 71 142 L 71 140 L 70 139 z"/>
-<path d="M 119 141 L 120 148 L 121 148 z"/>
-<path d="M 63 145 L 63 146 L 61 146 L 61 147 L 65 147 L 65 158 L 71 159 L 71 144 L 64 142 C 61.3755 142.728 59.1167 144.227 63 145 z"/>
-<path d="M 64 162 L 64 165 L 68 165 L 68 162 z"/>
-<path d="M 74 167 L 74 168 L 86 168 z"/>
-<path d="M 46 178 L 46 188 L 47 188 L 48 178 z"/>
-</g>
-<g stroke="none" fill="#848188">
-<path d="M 234 15 L 234 16 L 238 15 z"/>
-<path d="M 175 41 L 175 42 L 185 44 L 185 41 z"/>
-<path d="M 110 50 L 110 51 L 128 47.0394 L 177 50 C 172.152 46.327 162.969 47.3289 157 46.9105 C 140.832 45.7773 125.352 42.8612 110 50 M 177 45 L 177 46 L 181 46 z"/>
-<path d="M 184 47 L 184 49 L 186 49 L 186 47 z"/>
-<path d="M 202 52 L 202 53 L 231 59 L 230 63 C 217.343 58.9864 206.796 61.9915 194 62 L 194 63 L 211.682 63.0316 L 213.995 70 L 214 87 L 215 87 L 219 76 L 215 77 L 215 64 L 225.972 66.473 L 227 83 L 227 125 L 228 125 L 229 66 C 234.588 64.0335 232.656 57.9972 227.956 55.8542 C 220.326 52.375 210.246 52.0055 202 52 z"/>
-<path d="M 123 54 L 123 55 L 137.91 57.6975 L 151 55 z"/>
-<path d="M 154 55 L 154 56 L 162 56 z"/>
-<path d="M 132 67 L 132 72 L 133 72 z"/>
-<path d="M 132 88 L 134 99 L 135 99 z"/>
-<path d="M 184 93 L 184 129 L 198 128 L 198 125 L 202 125 L 202 112 L 204 112 L 206 118 L 206 119 L 204 123 L 208 124 L 207 128 L 211 128 L 211 109 L 210 109 L 210 117 L 209 117 L 206 95 L 201 98 L 203 101 z"/>
-<path d="M 58 98 C 53.4855 102.883 53.0007 106.554 53 113 L 54 113 L 54 110 L 55 110 L 59 114 C 60.2495 108.752 60.8635 102.78 58 98 z"/>
-<path d="M 132 109 L 132 117 L 141 117 L 141 116 L 133 115 z"/>
-<path d="M 66 111 L 64 112 L 64 113 z"/>
-<path d="M 215 113 L 217 116 z"/>
-<path d="M 16.3333 120.667 L 16.6667 121.333 L 16.3333 120.667 z"/>
-<path d="M 98 122 L 101 124 z"/>
-<path d="M 137 123 L 137 124 L 144 126 z"/>
-<path d="M 127 129 L 127 130 L 145 130 L 145 129 L 141 129 L 142 127 z"/>
-<path d="M 12 155 C 8.13563 155.3 6.65172 156.089 6 160 L 13 160 L 12 190 L 0 191 L 0 192 L 4 192 L 4 193 L 0 193 L 0 195 C 3.92901 194.852 7.71168 195.566 10 192 L 16 194 C 15.0286 199.236 19.097 203.727 24.436 199.823 C 26.2602 198.489 26.5457 196.033 27 194 L 22 194 L 23 190 L 19 190 L 18 183 L 17 183 L 17 190 L 15 190 L 15 165 L 16 165 L 18 169 L 18 170 L 16 178 L 19 178 L 18 156 L 16 157 L 18 152 C 14.8281 150.896 13.0909 151.891 12 155 z"/>
-<path d="M 233 161 L 230 173 L 232 175 L 233 175 z"/>
-<path d="M 250 170 L 250 171 L 254 171 z"/>
-<path d="M 236 176 L 236 179 L 244 179 z"/>
-<path d="M 7 197 L 8 207 L 10 207 L 10 197 L 7 197 M 1 198 L 1 207 L 3 207 L 3 198 z"/>
-<path d="M 0 224 L 0 314 L 87 314 L 132 313 L 118 301 L 132 305 L 125 300 L 129 294 L 116 297 L 109 297 L 111 294 C 108.862 286.081 102.485 288.254 96 288 L 105 286 L 99 282 L 100 281 L 96 281 L 97 278 L 88 272 L 89 276 C 86.0109 274.474 84.8071 273.31 86 270 L 79 270 L 74 268 L 74 264 L 67 264 L 67 263 L 70 263 C 67.4841 258.93 63.6918 257.148 59 258 L 55 252 L 55 251 C 57.7639 249.937 56.2109 249.26 54 249 L 54 248 L 57 248 L 48 238 L 52 239 L 47 236 L 39.4637 230.056 L 29.9097 222.388 L 14 223.726 z"/>
-</g>
-<g stroke="none" fill="#6b9d93">
-<path d="M 33 26 L 27 28 L 27 32 L 31 31 L 33 34 L 31 29 z"/>
-<path d="M 57 36 L 55 39 L 54 39 L 52 37 L 53 42 L 58 42 z"/>
-<path d="M 1 170 L 2 173 L 4 174 z"/>
-</g>
-<g stroke="none" fill="#2c3849">
-<path d="M 112 35 L 112 36 L 157 34 L 143 33 z"/>
-<path d="M 182 38 L 182 39 L 186 40 C 186.326 46.8571 191.392 43.9709 195.998 43.3843 C 198.296 43.0917 200.725 43.7142 203 44 L 203 43 z"/>
-<path d="M 133 58 C 133 63.122 132.122 68.2027 136 72 L 135 66 L 138 68 L 138 59 L 145 59 L 145 74 L 146 74 L 146 58 z"/>
-<path d="M 188 62 C 189.682 67.0177 193.817 64.9531 198 64 L 189 68 L 189 70 L 198.567 69.1319 L 202.764 79.5756 L 209 117 L 210 117 L 210 63 z"/>
-<path d="M 151 126 L 159 126 L 158 123 L 162 123 C 161.659 118.683 160.207 117.034 156 116 L 156 115 C 165.02 114.968 166.186 109.868 169 102 L 155 102 L 156 98 C 152.137 92.9007 153.639 83.572 156 78 C 150.614 80.1651 152 86.002 152 91 C 152 102.718 151 114.282 151 126 M 75 115 L 77 112 L 85 120 L 85 108 L 88 108 L 88 79 C 72.1229 84.0698 76.0627 101.534 75 115 z"/>
-<path d="M 69 92 L 70 97 L 69 101 L 64 100 L 64 105 L 67 105 L 67 109 L 63 108 L 67 113 L 63 114 L 63 115 L 68 116 L 67 119 L 69 122 C 73.1601 117.926 70.9105 115.016 70.9105 110 C 70.9105 103.755 72.8718 98.3325 71 92 z"/>
-<path d="M 264 108 L 260 109 L 261 117 C 265.245 115.591 265.625 111.883 264 108 z"/>
-<path d="M 190 212 L 197 212 C 194.932 208.283 191.568 207.559 190 212 z"/>
-<path d="M 187 219 L 188 219 L 192 215 C 188.639 213.86 187.672 215.911 187 219 z"/>
-<path d="M 229 217 L 229 222 L 230 222 z"/>
-</g>
-<g stroke="none" fill="#292c1d">
-<path d="M 20 37 L 17 35 L 21.3495 42.2963 L 28.9838 43.4938 L 35 48 L 29 47 L 32 51 L 29 52 L 28 44 L 20 48 L 16 45 L 20 43 L 11 42 C 12.8338 46.1469 12.2808 47.2869 10 51 L 16 49 L 22 50 L 18 55 L 20 61 L 28 59 L 28 63 L 23 64 L 24 71 L 29 72 L 29 74 L 28 75 L 14 66 L 13 72 L 12 72 L 8 71 L 11 65 C 4.20934 66.0399 4.56072 70.1975 5 76 L 0 72 L 0 84 L 1 84 C 4.81486 80.5051 8.31372 82.1412 13 83 L 0 85 L 0 141 L 1 141 L 3 135 L 5 136 L 6 135 C 2.85725 127.977 2.81084 121.51 5.85802 114.124 C 8.55731 107.582 12.4413 114.516 13 118 L 24 118 L 24 119 C 20.5279 121.244 21.4346 123.564 25 125 L 29 122 L 28 117 L 27 113 L 27 112 C 21.4043 105.945 27.8792 101.33 34 100 L 34 98 L 26 99 L 26 95 L 35 91 L 33 88 C 25.2278 92.2869 21.5052 83.2424 17 78 L 13 78 L 14 73 L 27.1651 76.2917 L 38 65 L 32 65 C 32.3807 60.0086 34.3589 58.4722 39 57 C 40.5938 64.4378 47.9803 54.7313 51 53 L 48 52 L 49 45 C 43.2393 44.9835 39.3945 44.7684 37 39 L 40 42 L 41 42 L 40 37 L 33 39 L 30 34 z"/>
-<path d="M 98 51 L 117 41.8488 L 126 41.9097 L 160 42.9606 L 186 41 C 179.102 35.3125 168.488 35.6413 160 34.8302 C 148.938 33.7733 138.062 33.7733 127 34.8302 C 122.239 35.2851 116.859 34.6516 112.424 36.8434 C 106.799 39.6237 101.543 45.9696 98 51 z"/>
-<path d="M 191 46 L 200 44 C 196.378 42.4979 193.689 43.2538 191 46 z"/>
-<path d="M 151 59 L 151 79 L 156 78 L 156 75 C 151.771 70.859 153 64.5605 153 59 z"/>
-<path d="M 215 77 L 222 72 C 218.393 72.7954 216.196 73.3571 215 77 z"/>
-<path d="M 133 79 C 133.201 85.3014 136.234 90.3199 142 93 C 141.804 87.0084 137.884 82.3057 133 79 z"/>
-<path d="M 263 100 L 262 106 L 265 107 z"/>
-<path d="M 133 117 L 133 123 L 139 122 L 138 117 z"/>
-<path d="M 175 149 L 176 140 L 170 144 L 173 140 C 168.534 138.303 165.442 142.511 168.18 146.682 C 169.726 149.037 172.512 148.919 175 149 z"/>
-<path d="M 95 201 L 106 201 L 105 199 L 111 199 C 106.529 197.124 97.8443 196.613 95 201 z"/>
-<path d="M 222 202 L 222 203 L 230 203 z"/>
-<path d="M 116 205 L 116 206 L 128 206 L 116 205 M 110 214 C 109.935 218.033 108.911 219.829 105 221 L 105 222 L 111 223 L 111 233 L 124 231 L 122.822 223.429 L 117 218 L 114 219 L 112 215 L 156 214.17 L 176 210 L 179 213 L 178 210 L 185 210 L 185 209 L 178 209 C 174.259 204.719 161.346 206.764 156.09 207.656 C 146.532 209.277 135.702 208.112 126 207.996 C 122.956 207.96 118.258 206.399 115.433 207.643 C 112.89 208.763 112.451 212.433 110 214 z"/>
-<path d="M 152 216 L 151 229 L 154 233 L 175 232 L 175 231 L 155 232 L 155 229 L 168 228 L 168 226 L 155 225 L 155 216 z"/>
-</g>
-<g stroke="none" fill="#566e99">
-<path d="M 173 36 L 173 37 L 177 37 z"/>
-<path d="M 63 107 L 63 108 L 67 109 z"/>
-<path d="M 252 174 C 252.163 179.365 254.419 183.294 260 180 L 253 179 z"/>
-</g>
-<g stroke="none" fill="#935b65">
-<path d="M 102 49 L 103 50 z"/>
-<path d="M 61 100 L 63 100 C 64.3104 95.6238 67.608 93.7459 72 93 L 72 87 C 66.5369 89.544 61.4821 93.7369 61 100 z"/>
-<path d="M 14 124 L 16 128 L 18 124 z"/>
-<path d="M 154 131 L 154 132 L 187 132 L 175 131 z"/>
-<path d="M 124 133 L 124 134 L 174 135 L 157 133 z"/>
-<path d="M 124 138 L 124 148 L 126 148 L 126 138 z"/>
-<path d="M 78 140 L 78 141 L 85 140 z"/>
-<path d="M 177 152 C 172.162 158.855 172.37 164.016 173 172 L 176 171 L 174.478 161 z"/>
-<path d="M 120 185 L 120 189 L 138 189 L 138 188 L 130 186 C 127.221 187.497 126.221 187.175 124 185 L 122 188 z"/>
-<path d="M 239 190 L 239 197 L 240 197 L 241 190 z"/>
-</g>
-<g stroke="none" fill="#2c2e2b">
-<path d="M 181 53 L 186 50 C 183.007 50.0642 181.654 49.9461 181 53 z"/>
-<path d="M 184 62 C 184.334 66.9738 184.457 75.3856 190 77 C 188.925 80.5214 187.661 81.3203 184 81 L 184 92 C 195.923 91.6084 191.169 75.7171 189 68 L 198 64 C 193.782 64.6054 190.439 66.1833 188 62 z"/>
-<path d="M 92 75 L 109 68 C 104.069 66.6324 94.7755 70.799 92 75 z"/>
-<path d="M 162 75 L 161 98 L 177 96 L 177 81 L 167 80 L 167 77 z"/>
-<path d="M 106 107 L 106 108 L 99 108 C 97.9661 116.682 96.0293 122.901 107 123 L 107 124 L 100 124 L 100 132 L 109 132 C 109 124.55 106.405 111.065 111 105 L 111 104 L 110 85 C 107.289 84.497 103.044 83.1134 100.603 85.0286 C 98.4319 86.7322 99.005 90.5903 99 93 C 98.9858 99.9054 97.3613 106.716 106 107 z"/>
-<path d="M 218 101 C 214.519 105.019 213.946 110.53 217 115 L 217 116 L 215 128 L 223 128 L 223 107 L 221 101 L 220 101 L 220 108 L 219 108 z"/>
-<path d="M 133 109 L 133 115 L 137 116 z"/>
-<path d="M 41 128 L 38.2986 135.17 L 38 152 L 42 152 z"/>
-<path d="M 243 193 L 235 198 L 235 199 L 249 199 L 249 198 L 247 198 L 247 197 L 253 197 L 253 196 z"/>
-<path d="M 13 195 L 10 209 L 0 207 L 0 221 L 22 220 L 15.6235 206.961 z"/>
-<path d="M 63 196 C 64.2152 202.685 69.2572 205.803 72 198 L 67 200 z"/>
-<path d="M 60 206 L 59 213 L 63 214 L 62 207 L 66 204 z"/>
-<path d="M 201 239 L 201 236 C 199.768 235.323 198.343 234.32 196.971 233.909 C 193.3 232.808 190.444 235.421 194.191 238.259 C 196.422 239.949 198.523 239.597 201 239 z"/>
-<path d="M 88 239 C 92.5824 247.85 105.823 250.346 113 256 L 114 256 C 116.207 252.629 118.297 253.478 121 256 C 139.33 252.648 151.103 267.988 168 271 L 168 270 C 165.822 269.197 151.773 262.803 158 262 L 158 261 L 153 259 L 153 258 L 181 260 L 180 258 L 181 258 C 184.322 258.221 186.805 256.579 190.09 256.294 C 195.734 255.805 200.856 259.551 205 254 L 234.999 263.559 L 249 267 L 249 266 L 226 259 L 227 257 L 216 253 L 216 252 L 226 255 L 222 253 L 222 252 L 225 247 L 225 246 L 215 243 L 216 240 L 201 240 L 201 241 C 203.741 241 207.234 240.485 209.807 241.603 C 212.649 242.839 214.121 246.8 210.753 248.397 C 208.53 249.45 205.389 248.998 203 249 L 203 250 L 206 252 L 206 253 L 194 252.093 L 172 254.956 L 157 254.005 L 136 253 L 136.167 254.5 L 124 252.667 L 99 245.5 z"/>
-</g>
-<g stroke="none" fill="#10100d">
-<path d="M 138 59 L 142 77 L 133 73 L 140.401 80.5247 L 144 86 L 143 89 L 145 91 L 146 91 L 145 59 z"/>
-<path d="M 160 60 C 158.991 65.4348 156.7 75.5637 162 79 L 162 75 L 163 75 L 167 77 L 167 80 L 177 81 L 177 85 L 178 85 L 179 61 z"/>
-<path d="M 184 66 C 184 69.9832 183.178 75.0125 184.318 78.8511 C 185.829 83.9396 189.468 80.1857 190 77 z"/>
-<path d="M 109 67 C 105.267 69.1705 98.4172 70.6847 96.0278 74.3935 C 94.4663 76.8172 94.3883 81.9535 97.3179 83.3966 C 100.584 85.0053 106.339 84.5373 110 85 z"/>
-<path d="M 190 70 L 192 85 L 203 84 C 202.708 80.3355 202.499 70.3307 198.567 68.6466 C 196.043 67.5653 192.462 69.3488 190 70 z"/>
-<path d="M 38 121 L 43 122 L 43 118 z"/>
-<path d="M 95 136 C 95 143.388 94.0912 150.657 94.0039 158 C 93.9021 166.558 95.178 173.809 90 181 C 97.0449 184.885 95.4963 200.208 89 204 L 88 198 C 79.1647 195.096 70.0814 193.11 61 190.861 C 57.5529 190.007 52.967 187.51 52 192 L 48 191 L 48 197 L 44 196 C 43.8821 192.304 43.8823 189.136 40 188 L 40 199 L 45 199 L 39 203 L 39 207 L 60 212 L 60 206 L 66 204 L 62 207 C 62.1779 209.32 61.8245 212.423 63.6343 214.19 C 65.4585 215.971 70.4721 218.082 71 215 L 81 219 L 85 211 L 82 209 L 83 202 L 92 207 L 83 220 L 78 220 L 78 221 L 90 227 L 98.946 222.147 L 105 217 L 105 221 C 112.676 219.746 110.5 208.338 111 202 L 95 201 C 99.141 196.771 105.439 198 111 198 L 111 190 L 97 190 L 96.0895 152 z"/>
-<path d="M 187 142 L 185 140 C 184.252 142.749 183.91 145.226 185.458 147.852 C 187.646 151.567 192.723 151.568 194.972 147.856 C 196.042 146.092 195.936 143.974 196 142 L 191 144 L 190 144 L 188 143 L 188 141 L 191 140 z"/>
-<path d="M 37 183 L 37 189 L 43 187 L 43 183 z"/>
-<path d="M 36 194 L 34 201 L 37 201 L 36 194 M 231 194 L 231 198 L 239 198 C 237.634 194.116 234.816 194.093 231 194 z"/>
-<path d="M 189 209 L 178 210 L 179 213 L 176 210 C 156.244 217.519 133.085 215 112 215 L 117 218 L 122.5 223.25 L 124 231 L 97 231 L 97 240 L 66 223 L 70 230 C 76.4698 231.233 83.0693 234.658 87 240 L 100.06 246.106 L 124 252.741 L 136 253 L 158 254.019 L 173 254.957 L 194 252.184 L 206 253 L 206 252 L 203 250 L 203 249 C 205.552 249 209.224 249.611 211.562 248.397 C 214.161 247.046 213.543 243.538 211.424 242.028 C 208.325 239.821 204.214 241.435 201 239 C 198.81 239.278 197.091 239.51 195.098 238.258 C 191.284 235.862 192.965 233.087 196.971 234.342 C 198.306 234.76 199.696 235.495 201 236 L 205 230 L 209 233 C 213.046 231.657 212.953 228.935 213 225 L 231 225 L 229 211 C 232.687 209.777 232.88 207.692 233 204 C 222.085 205.147 210.96 205.338 200 205.972 C 196.085 206.199 190.009 204.29 189 209 z"/>
-</g>
-<g stroke="none" fill="#eaa99c">
-<path d="M 56 61 L 53 64 L 53 65 L 57 65 L 56 69 L 69 65 L 69 64 L 66 62 C 62.1357 64.027 59.7394 62.868 56 61 z"/>
-<path d="M 54 133 C 53.6673 137.221 51.9936 141.393 56 144 L 56 145 L 50 146 L 53 148 L 53 164 L 58 165 L 59.0895 150 L 58.9684 140.209 z"/>
-<path d="M 113 134 L 114 177 C 117.942 167.605 117.001 155.091 117 145 C 117 140.46 117.987 135.655 113 134 z"/>
-<path d="M 78 136 L 77 142 L 78 142 z"/>
-<path d="M 61 137 L 61 143 L 64 142 L 71 144 L 71 157 L 72 157 C 72 152.07 73.9056 142.413 70 139 L 71 142 L 62 141 z"/>
-<path d="M 61 147 L 62 162 L 63 162 L 63 159 L 70 161 L 65 158 L 65 147 z"/>
-<path d="M 85 150 C 80.8356 153.148 81.0136 157.085 81 162 L 77 163 L 76 154 L 75 154 L 75 164 C 83.9352 163.925 88.8818 159.251 85 150 z"/>
-<path d="M 31 155 L 26 157 L 26 158 z"/>
-<path d="M 45 156 C 44.5677 164.574 43.135 173.368 43.6944 182 C 43.9213 185.501 43.1216 189.169 47 190 L 45.179 166 z"/>
-<path d="M 62 167 L 62 168 L 71 168 z"/>
-</g>
-<g stroke="none" fill="#86524a">
-<path d="M 72 61 L 72 63 L 74 63 L 74 61 z"/>
-<path d="M 178 84 L 177 97 L 179 97 z"/>
-<path d="M 230 130 L 232 134 L 216 136 L 216 137 L 230 137 L 228 139 L 229 144 L 230 144 L 230 140 L 232 140 L 232 145 L 233 145 L 235 134 L 235 133 L 233 130 z"/>
-<path d="M 124 134 L 124 135 L 147 135 z"/>
-<path d="M 199 134 L 199 135 L 210 135 z"/>
-<path d="M 43 139 L 43 145 L 44 145 z"/>
-<path d="M 109 143 L 109 178 L 110 178 L 110 155 z"/>
-<path d="M 42 146 L 42 155 L 38 155 L 39 181 L 43 181 L 43 180 L 40 180 L 40 156 L 43 156 z"/>
-<path d="M 179 153 L 179 154 L 184 154 L 185 157 C 185.867 153.14 182.061 153.1 179 153 z"/>
-<path d="M 256 192 L 250 192 L 257 198 L 263 194 L 263 193 L 261 181 C 253.952 181.811 255.757 186.333 256 192 z"/>
-<path d="M 49 188 L 52 192 L 54 189 z"/>
-</g>
-<g stroke="none" fill="#ba7769">
-<path d="M 62 65 L 66 75 L 67 75 C 69.5875 68.5826 70.0688 64.2576 78 64 z"/>
-<path d="M 87 73 L 75 88 L 89 79 z"/>
-<path d="M 73 89 L 73 139 L 78 138 L 78 137 L 74 137 L 78 118 L 85 122 L 85 121 L 81 120 C 81.6519 116.016 80.4006 114.098 77 112 L 77 115 L 75 115 L 76 89 z"/>
-<path d="M 87 123 L 88 158 L 89 158 L 88.0895 134 z"/>
-<path d="M 126 137 C 127.035 140.847 125.573 147.051 130 148 L 130 147 L 129 137 z"/>
-<path d="M 64.6667 144.333 L 65.3333 144.667 L 64.6667 144.333 z"/>
-<path d="M 179 154 L 175 158 L 175 170 L 179 169 L 177 166 L 180 165 L 180 169 L 185 169 L 185 163 L 183 163 L 181 154 z"/>
-<path d="M 186 156 L 186 171 L 187 171 C 188.197 165.973 188.741 160.575 186 156 z"/>
-<path d="M 47 166 L 47 178 L 48 178 z"/>
-<path d="M 115 178 L 113 204 L 114 204 L 116 180 L 119 182 L 120 182 L 125 180 z"/>
-<path d="M 127 179 L 127 183 L 133 183 L 135 180 z"/>
-<path d="M 65 183 L 60 187 C 57.4761 184.068 53.1708 184.027 50 186 L 72 190 L 66 187 L 66 186 L 68 183 z"/>
-</g>
-<g stroke="none" fill="#463226">
-<path d="M 141 80 L 142 93 L 137 91 L 142 107 L 145 108 L 146 108 C 146 102.42 148.033 92.5559 143 89 L 144 86 z"/>
-<path d="M 95 83 L 94 152 L 95 152 L 95 136 L 96 136 L 97 190 L 111 190 L 111 189 L 99 189 L 99 161 L 101 162 L 99.1289 152.961 L 99 137 L 109 137 L 109 132 L 100 132 L 98.0185 118.985 L 98.8434 108 L 100 84 z"/>
-<path d="M 10 175 L 10 189 L 12 189 L 12 175 z"/>
-<path d="M 23 185 L 24 193 L 28 193 L 26 200 L 39 205 L 38 200 L 45 200 L 45 199 L 40 199 L 40 192 z"/>
-<path d="M 74 202 L 79 214 L 74 202 M 83 202 L 82 209 L 85 211 L 81 219 L 71 215 L 71 218 L 83 220 L 92 207 z"/>
-<path d="M 213 225 L 212 233 C 218.244 232.281 219.77 226.477 213 225 z"/>
-</g>
-<g stroke="none" fill="#a0ad4d">
-<path d="M 254 102 L 257 107 L 258 107 L 260 104 z"/>
-<path d="M 260 121 L 263 123 L 263 122 z"/>
-</g>
-<g stroke="none" fill="#c54247">
-<path d="M 15 126 L 15 127 L 20 128 L 20 126 z"/>
-<path d="M 118 135 L 118 143 L 119 143 L 124 136 z"/>
-<path d="M 122 138 L 121 148 C 123.789 145.563 123.361 141.244 122 138 z"/>
-<path d="M 12 150 L 16 143 C 12.5097 144.217 7.19065 146.812 12 150 z"/>
-<path d="M 117 152 L 117 165 L 118 165 L 118 161 L 119 161 L 122 163 L 122 162 L 122 158 L 122 157 L 118 157 z"/>
-<path d="M 33 153 L 34 188 C 36.6042 185.724 35.9985 182.317 36 179 C 36.0035 171.235 37.5485 159.656 33 153 z"/>
-<path d="M 118 184 L 118 188 L 120 185 L 131 185 z"/>
-<path d="M 118 202 L 118 203 L 149 203 z"/>
-</g>
-<g stroke="none" fill="#cd5f60">
-<path d="M 123 130 L 123 131 L 151 131 z"/>
-<path d="M 73 143 L 73 168 C 65.9361 168.167 51.7405 174.914 50 164 L 49 164 L 49 175 L 50 175 L 53 171 C 50.7807 178.508 51.1935 184.786 60 185 L 60 172 L 71 172 L 71 174 L 61 174 L 61 186 L 68 183 L 66 186 L 66 187 L 72 188 L 72 172 L 73 172 L 73 189 L 88 191 L 88 192 L 79 191 L 79 192 L 89 195 C 89 191.01 90.8376 181.608 86 181 C 85.7422 173.248 80.4524 174.001 74 174 L 74 173 L 86 173 L 86 170 L 74 169 z"/>
-<path d="M 50 148 L 51 168 L 53 168 L 53 148 z"/>
-<path d="M 113 150 L 112 179 L 115 178 z"/>
-<path d="M 20 157 L 21 185 L 35 187 L 34 172 L 21 172 L 21 170 L 34 171 L 33 154 z"/>
-<path d="M 45 162 L 45 170 L 46 170 z"/>
-<path d="M 115 166 L 115 177 L 116 177 z"/>
-<path d="M 48 178 C 47.987 182.695 48.3612 187.332 44 190 L 44 181 L 43 181 L 43 191 L 49 191 L 49 188 L 73 191 L 73 190 C 67.6343 189.889 55.5508 189.407 51.6034 185.4 C 49.7285 183.498 50.0289 180.443 50 178 z"/>
-</g>
-<g stroke="none" fill="#a51015">
-<path d="M 112 177 L 113 177 L 113 146 L 114.603 134.742 L 130 132 C 126.174 130.395 114.825 129.773 112.603 134.317 C 110.957 137.684 112 143.34 112 147 z"/>
-<path d="M 210 133 L 210 134 L 231 134 z"/>
-<path d="M 90 134 L 90 179 L 91 179 L 91 149 L 90 134 M 92 134 L 92 178 L 94 178 L 94 134 z"/>
-<path d="M 121 136 L 121 142 L 122 142 L 122 138 C 129.653 137.643 129.995 141.1 130 148 L 118 146 L 118 157 L 125 158 C 123.47 160.744 122.056 162.309 119 161 L 118 161 L 115 178 L 138 179 L 138 189 L 115 189 L 115 202 L 230 200 L 230 187 L 226 187 L 226 182 L 225 182 L 225 187 L 221 187 C 221.503 181.458 223.199 178.442 229 178 L 228.961 154 L 230 137 L 154 135 z"/>
-<path d="M 34 152 L 35 163 L 36 163 L 36 152 z"/>
-<path d="M 178 153 L 176 159 L 177 159 z"/>
-<path d="M 182 154 L 183 163 L 185 163 L 184 168 C 189.034 164.736 186.309 158.405 184 154 z"/>
-<path d="M 40 156 L 40 180 L 44 180 L 42 165 L 43 156 z"/>
-<path d="M 174 159 L 174 168 L 175 168 z"/>
-<path d="M 176 161 L 176 163 L 178 163 z"/>
-<path d="M 181 165 L 181 168 L 183 168 L 183 165 z"/>
-<path d="M 111 180 L 111 206 L 113 206 L 113 180 z"/>
-</g>
-<g stroke="none" fill="#4e190e">
-<path d="M 130 131 L 130 132 L 185 133 L 165 132 z"/>
-<path d="M 191 133 L 191 134 L 231 135 L 216 133.985 z"/>
-<path d="M 99 137 L 101 162 L 99 161 L 99 189 L 111 189 L 111 180 L 115 178 L 109 179 L 109 137 z"/>
-<path d="M 38 152 L 38 154 L 42 154 L 42 152 z"/>
-<path d="M 90 181 L 89 204 C 95.7183 201.43 97.1967 183.389 90 181 z"/>
-</g>
-<g stroke="none" fill="#a64848">
-<path d="M 111 132 L 111 177 L 112 177 L 113 132 z"/>
-<path d="M 191 132 L 191 133 L 220 133 z"/>
-<path d="M 89 134 L 88 166 L 89 195 C 82.8686 192.362 75.6103 190.563 69 192 L 69 193 L 88 198 L 88 203 L 90 203 L 90.1289 184 L 91.946 175 L 92 134 L 91 134 L 91 179 L 90 179 L 90 149 z"/>
-<path d="M 59 146 L 60 168 L 61 168 C 61 161.557 58.9988 151.281 63 146 z"/>
-<path d="M 43 156 L 42 165 C 44.6406 162.693 44.2959 159.089 43 156 z"/>
-<path d="M 177 166 L 176 169 L 176 170 L 185 171 L 185 172 L 174 173 C 179.632 179.376 185.747 175.769 186 168 L 180 169 L 180 165 z"/>
-<path d="M 50 171 L 48 177 L 48 178 L 50 185 L 52 185 L 53 171 z"/>
-<path d="M 125 179 L 125 183 L 116 183 L 115 188 L 115 189 L 120 189 L 120 188 L 118 184 C 122.57 184 128.261 182.776 131 187 L 132 187 L 132 184 L 138 184 L 138 179 L 137 179 L 137 183 L 127 183 L 127 179 z"/>
-<path d="M 222 179 L 221 187 L 225 187 L 226 181 z"/>
-<path d="M 198 200 L 198 201 L 215 201 z"/>
-<path d="M 165 201 L 165 202 L 182 202 z"/>
-</g>
-<g stroke="none" fill="#db8479">
-<path d="M 115 133 L 117 152 L 118 152 L 120 146 L 120 145 L 118 135 L 124 135 z"/>
-<path d="M 120 138 L 120 142 L 121 142 z"/>
-<path d="M 59 147 L 58 165 C 53.8887 162.622 52.4307 166.442 51 170 L 71 169 L 71 168 L 62 168 L 62 167 L 72 167 L 72 157 L 71 157 C 70.3949 158.493 69.944 160.469 68 160.833 C 64.9972 161.396 63.5287 157.639 63 162 L 62 162 L 62 148 L 61 148 L 61 168 L 60 168 z"/>
-<path d="M 178 152 L 178 153 L 183 153 z"/>
-<path d="M 74 154 L 74 167 L 86 167 L 86 162 L 75 164 z"/>
-<path d="M 18 161 L 19 168 L 20 168 z"/>
-<path d="M 176 170 L 176 171 L 184 171 z"/>
-<path d="M 65 175 L 65 182 L 68 182 L 67 175 z"/>
-<path d="M 235.667 185.333 L 236.333 185.667 L 235.667 185.333 z"/>
-</g>
-<g stroke="none" fill="#8b4c1c">
-<path d="M 72 142 L 72 168 L 73 168 L 74 142 z"/>
-<path d="M 228 147 L 229 178 L 230 178 C 230 169.445 232.921 154.204 228 147 z"/>
-<path d="M 50 149 L 50 169 L 51 169 z"/>
-<path d="M 87 154 L 87 179 L 88 179 z"/>
-<path d="M 60 172 L 60 187 L 61 187 z"/>
-<path d="M 72 172 C 72 176.93 70.0944 186.587 74 190 z"/>
-<path d="M 260 218 L 260 245 L 265 245 L 265 218 z"/>
-</g>
-<g stroke="none" fill="#597dcb">
-<path d="M 253 173 C 256.567 173 253.283 176.524 253 179 L 260 179 L 257 170 z"/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_Navigation_simple.xml Deleted

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19" scaleBits_minus_coordBits="0"
-                    colorComponentBits="8"  useFullRequestHost="true" pathComponents="15"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg width="176" height="208" viewBox="0 0 176 208" fill="blue" stroke="red">
-
-         <rect id="second" x="55" y="100" width="30" height="30" fill="lime" focusable="true" nav-prev="#first" nav-next="#third"/>
-         <rect id="first" x="5" y="100" width="30" height="30" fill="blue" focusable="true" nav-prev="#third" nav-next="#second"/>
-         <rect id="third" x="105" y="100" width="30" height="30" fill="red" focusable="true" nav-prev="#second" nav-next="#first"/>
-
-         <animate id="anim1" xlink:href="#first" begin="first.focusin" end="first.focusout" attributeName="fill" from="black" to="black"/>
-         <animate id="anim2" xlink:href="#second" begin="second.focusin" end="second.focusout" attributeName="fill" from="black" to="black"/>
-         <animate id="anim3" xlink:href="#third" begin="third.focusin" end="third.focusout" attributeName="fill" from="black" to="black"/>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_a_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_a_parsing2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<a xlink:actuate='onRequest' xlink:arcrole='http://www.yahoo.com' xlink:href='..\path\parsing.lsr' xlink:role='http://www.google.com' xlink:show='new' xlink:title='Click to view path element' xlink:type='simple' target='_self'>
-<path fill='rgb(255,255,0)' stroke='rgb(0,0,255)' d='M 120 124 h 25 v -3 l 11 9 l -11 9 v -3 h -25 z'/>
-</a>
-<a fill-opacity='0.22729492' stroke='rgb(0,128,0)' stroke-width='3' xlink:href='#my_anim_on_y'>
-<circle id='Clircle' fill='rgb(0,0,255)' cx='50' cy='124' r='35'/>
-</a>
-<animate id='my_anim_on_y' values='0;25.5;30.25;35.75;40;100' attributeName='y' begin='indefinite' dur='3' lsr:enabled='true' xlink:href='#my_rect'/>
-<rect id='my_rect' fill='rgb(255,0,0)' stroke='rgb(128,20,98)' height='10' width='50' x='10' y='10'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateMotion_mpath.xml Deleted

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 500 300" width="100%" height="100%">
-
-				   <g>
-				      <path id="path1" d="M 100,250 C 100,50 400,50 400,250" fill="none" stroke="blue" stroke-width="7.06">
-				         <animate dur="5s" repeatCount="indefinite" attributeName="d"
-				                  from="M 100,250 C 100,50 400,50 400,250"
-				                  to="M 50,50 C 50,70 25,100 10,350"/>
-				      </path>
-				   </g>
-				   <path d="M -25,-12.5 L 25,-12.5 L 0,-87.5 Z" fill="yellow" stroke="red" stroke-width="7.06">
-				      <animateMotion dur="5s" repeatCount="indefinite" rotate="auto" >
-				         <mpath xlink:href="#path1"/>
-				      </animateMotion>
-				   </path>			
-	
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateMotion_parsing.xml Deleted

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-						
-						<path d="
-									M 53   54
-									C 53   54   51   54   51   54
-									C 51   59   53   64   56   64
-									C 64   64   71   59   71   54
-									C 71   42   64   34   56   34
-									C 42   34   31   42   31   54
-									C 31   70   42   84   56   84
-									C 75   84   91   70   91   54
-									C 91   31   75   14   56   14
-									C 31   14   11   31   11   54
-									C 11   81   31  104   56  104
-									C 86  104  111   81  111   54
-									C 111  20  186   94  156   94 Z"
-									fill="none" stroke="red"/>
-
-						
-						<path d="M -10 -10 L 3 0 L -3 0 Z" fill="yellow" stroke="red" stroke-width="1">
-									<animateMotion begin="0" dur="6" repeatCount="1" rotate="auto-reverse"
-												path="
-															M 53   54
-															C 53   54   51   54   51   54
-															C 51   59   53   64   56   64
-															C 64   64   71   59   71   54
-															C 71   42   64   34   56   34
-															C 42   34   31   42   31   54
-															C 31   70   42   84   56   84
-															C 75   84   91   70   91   54
-															C 91   31   75   14   56   14
-															C 31   14   11   31   11   54
-															C 11   81   31  104   56  104
-															C 86  104  111   81  111   54
-															C 111  20  186   94  156   94 Z"/>
-						</path>
-
-						
-						<path d="M -10 -10 L 3 0 L -3 0 Z" fill="yellow" stroke="red" stroke-width="1">
-									<animateMotion calcMode="linear" begin="6" dur="6" repeatCount="1" rotate="45" keyPoints="0 0.2 1" keyTimes="0 0.8 1"
-												path="
-															M 53   54
-															C 53   54   51   54   51   54
-															C 51   59   53   64   56   64
-															C 64   64   71   59   71   54
-															C 71   42   64   34   56   34
-															C 42   34   31   42   31   54
-															C 31   70   42   84   56   84
-															C 75   84   91   70   91   54
-															C 91   31   75   14   56   14
-															C 31   14   11   31   11   54
-															C 11   81   31  104   56  104
-															C 86  104  111   81  111   54
-															C 111  20  186   94  156   94 Z"/>
-						</path>
-
-						
-						<path id="path" d="M -10 -10 L 3 0 L -3 0 Z" fill="yellow" stroke="red" stroke-width="1"/>
-						<animateMotion xlink:href="#path"  begin="12" dur="4" repeatCount="indefinite" rotate="auto"
-									path="
-												M 53   54
-												C 53   54   51   54   51   54
-												C 51   59   53   64   56   64
-												C 64   64   71   59   71   54
-												C 71   42   64   34   56   34
-												C 42   34   31   42   31   54
-												C 31   70   42   84   56   84
-												C 75   84   91   70   91   54
-												C 91   31   75   14   56   14
-												C 31   14   11   31   11   54
-												C 11   81   31  104   56  104
-												C 86  104  111   81  111   54
-												C 111  20  186   94  156   94 Z"/>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateMotion_parsing2.xml Deleted

@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<path fill='none' stroke='rgb(255,0,0)' d='M 53 54 C 53 54 51 54 51 54 C 51 59 53 64 56 64 C 64 64 71 59 71 54 C 71 42 64 34 56 34 C 42 34 31 42 31 54 C 31 70 42 84 56 84 C 75 84 91 70 91 54 C 91 31 75 14 56 14 C 31 14 11 31 11 54 C 11 81 31 104 56 104 C 86 104 111 81 111 54 C 111 20 186 94 156 94 Z'/>
-<path fill='rgb(255,255,0)' stroke='rgb(255,0,0)' stroke-width='1' d='M -10 -10 L 3 0 L -3 0 Z'>
-<animateMotion begin='9.765625E-4' dur='6' lsr:enabled='true' repeatCount='1' path='M 53 54 C 53 54 51 54 51 54 C 51 59 53 64 56 64 C 64 64 71 59 71 54 C 71 42 64 34 56 34 C 42 34 31 42 31 54 C 31 70 42 84 56 84 C 75 84 91 70 91 54 C 91 31 75 14 56 14 C 31 14 11 31 11 54 C 11 81 31 104 56 104 C 86 104 111 81 111 54 C 111 20 186 94 156 94 Z' rotate='auto-reverse'/>
-</path>
-<path fill='rgb(255,255,0)' stroke='rgb(255,0,0)' stroke-width='1' d='M -10 -10 L 3 0 L -3 0 Z'>
-<animateMotion calcMode='linear' keyTimes='0 0.7998047 1' begin='6.0009766' dur='6' lsr:enabled='true' repeatCount='1' keyPoints='0 0.19921875 1' path='M 53 54 C 53 54 51 54 51 54 C 51 59 53 64 56 64 C 64 64 71 59 71 54 C 71 42 64 34 56 34 C 42 34 31 42 31 54 C 31 70 42 84 56 84 C 75 84 91 70 91 54 C 91 31 75 14 56 14 C 31 14 11 31 11 54 C 11 81 31 104 56 104 C 86 104 111 81 111 54 C 111 20 186 94 156 94 Z' rotate='184320'/>
-</path>
-<path id='path' fill='rgb(255,255,0)' stroke='rgb(255,0,0)' stroke-width='1' d='M -10 -10 L 3 0 L -3 0 Z'/>
-<animateMotion begin='12.000977' dur='4' lsr:enabled='true' repeatCount='indefinite' xlink:href='#path' path='M 53 54 C 53 54 51 54 51 54 C 51 59 53 64 56 64 C 64 64 71 59 71 54 C 71 42 64 34 56 34 C 42 34 31 42 31 54 C 31 70 42 84 56 84 C 75 84 91 70 91 54 C 91 31 75 14 56 14 C 31 14 11 31 11 54 C 11 81 31 104 56 104 C 86 104 111 81 111 54 C 111 20 186 94 156 94 Z' rotate='auto'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_rotate.xml Deleted

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-		   <g id="root_group" transform="translate(50,50) rotate(20,70,70)" fill="#2288AA" stroke="#AA8822" color="#999999">
-		      <polyline id="my_polyline" stroke-width="5" points="10 120 130 120 70 20"/>
-		      <polyline stroke="red" points="69 70 71 70"/>
-		      <polyline stroke="red" points="70 69 70 71"/>
-
-          
-		      <animateTransform xlink:href="#root group" begin="1" dur="3" additive="sum" calcMode="linear" fill="freeze" attributeName="transform" type="rotate" 
-		       from="0 70 70" to="180 70 70" repeatCount="2" />
-
-          
-		      <animateTransform xlink:href="#root group" begin="10" dur="2" fill="freeze" calcMode="linear" attributeName="transform" type="rotate"
-		       by="90 40 40"/>
-
-          
-		      <animateTransform xlink:href="#root group" begin="13" dur="10" calcMode="linear" attributeName="transform" type="rotate" 
-		       from="0 70 70" to="360 70 70"/>
-		   </g>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_rotate2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='root_group' color='rgb(153,153,153)' fill='rgb(34,136,170)' stroke='rgb(170,136,34)' lsr:translation='50 50'>
-<polyline id='my_polyline' stroke-width='5' points='10 120 130 120 70 20'/>
-<polyline stroke='rgb(255,0,0)' points='69 70 71 70'/>
-<polyline stroke='rgb(255,0,0)' points='70 69 70 71'/>
-<animateTransform additive='sum' calcMode='linear' from='0 70 70' attributeName='transform' begin='1.0009766' dur='3' lsr:enabled='true' fill='freeze' repeatCount='2' to='180 70 70' xlink:href='#root group' type='rotate'/>
-<animateTransform by='90 40 40' calcMode='linear' attributeName='transform' begin='10.000977' dur='2' lsr:enabled='true' fill='freeze' xlink:href='#root group' type='rotate'/>
-<animateTransform calcMode='linear' from='0 70 70' attributeName='transform' begin='13.000977' dur='10' lsr:enabled='true' to='360 70 70' xlink:href='#root group' type='rotate'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_scale.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-			    <g id="g1">
-			       <path id="path" d="M 40,50 C 10 10 140 10 110 50" fill-rule="evenodd" fill="none" stroke="black"/>
-
-					    	 
-					       <animateTransform xlink:href="#path" begin="0" dur="2" calcMode="linear" attributeName="transform" type="scale" 
-					        from="0 0" to="3 3" additive="sum" />
-
-			    </g>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_scale2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='g1'>
-<path id='path' fill='none' fill-rule='evenodd' stroke='rgb(0,0,0)' d='M 40 50 C 10 10 140 10 110 50'/>
-<animateTransform additive='sum' calcMode='linear' from='0 0' attributeName='transform' begin='9.765625E-4' dur='2' lsr:enabled='true' to='3 3' xlink:href='#path' type='scale'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_skew.xml Deleted

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-			    <g id="g1">
-							<path id="path" d="M 40,50 C 10 10 140 10 110 50" fill-rule="evenodd" fill="none" stroke="black">
-								 
-							   <animateTransform begin="1" dur="2" attributeName="transform" type="skewY" values="0;45;90;70;50;30;10;0"/>
-							</path>
-	
-				      <rect id="my_rect" x="50" y="30" width="100.5" height="50.3" rx="1.5" ry="2.8">
-								 
-				         <animateTransform begin="4" dur="2" attributeName="transform" type="skewX" from="0" to="360"/>
-				      </rect>
-	
-	            
-							<animateTransform xlink:href="#path" begin="7" dur="2" attributeName="transform" type="skewX" values="0;45;90;70;50;30;10;0"/>
-
-			    </g>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_skew2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_translate.xml Deleted

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-			    <g id="g1">
-			       <path id="path" d="M 40,50 C 10 10 140 10 110 50" fill-rule="evenodd" fill="none" stroke="black"/>
-
-					    	 
-					       <animateTransform xlink:href="#path" begin="0" dur="3" calcMode="linear" attributeName="transform" type="translate" 
-					       from="0 0" to="0 200"/>
-
-					    	 
-         				 <animateTransform xlink:href="#path"  attributeName="transform" type="translate" begin="3.4" dur="2" fill="freeze" calcMode="linear" values="0 0;19.479 28.3895" keyTimes="0;1" additive="sum"/>
-
-					    	 
-					      <animateTransform xlink:href="#path" begin="5.1" dur="2" calcMode="linear" repeatCount="1.5" attributeName="transform" type="translate" 
-					       from="-50,-50" by="50,50"/>
-
-			    </g>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animateTransform_translate2.xml Deleted

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='f1'>
-<path id='path' fill='none' fill-rule='evenodd' stroke='rgb(0,0,0)' d='M 40 50 C 10 10 140 10 110 50'/>
-<animateTransform calcMode='linear' from='0 0' attributeName='transform' begin='9.765625E-4' dur='3' lsr:enabled='true' to='0 200' xlink:href='#path' type='translate'/>
-<animateTransform additive='sum' calcMode='linear' keyTimes='0 1' values='0 0;19.476562 28.386719' attributeName='transform' begin='3.3999023' dur='2' lsr:enabled='true' fill='freeze' xlink:href='#path' type='translate'/>
-<animateTransform by='50 50' calcMode='linear' from='-50 -50' attributeName='transform' begin='5.0998535' dur='2' lsr:enabled='true' repeatCount='1.5' xlink:href='#path' type='translate'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_choice.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg width="176" height="208" viewBox="0 0 176 208" zoomAndPan="disable" fill="blue" stroke="red">
-      
-         <g id="root_group">
-            <rect x="20" y="10" width="30" height="30"/>
-            <rect x="20" y="50" width="30" height="30"/>
-            <rect x="20" y="90" width="30" height="30"/>
-            <rect x="20" y="130" width="30" height="30"/>
-            <rect x="20" y="170" width="30" height="30"/>
-            <animate attributeName="choice" values="none;0;1;2;3;4;10;all" begin="0" dur="16s"/>
-         </g>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_choice2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg fill='rgb(0,0,255)' stroke='rgb(255,0,0)' height='208' viewBox='0 0 176 208' width='176' zoomAndPan='disable'>
-<g id='root_group'>
-<rect height='30' width='30' x='20' y='10'/>
-<rect height='30' width='30' x='20' y='50'/>
-<rect height='30' width='30' x='20' y='90'/>
-<rect height='30' width='30' x='20' y='130'/>
-<rect height='30' width='30' x='20' y='170'/>
-<animate values='none;0;1;2;3;4;10;all' attributeName='choice' begin='9.765625E-4' dur='16' lsr:enabled='true'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_colorrendering.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_colorrendering2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_display-align.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_display-align2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_display.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_display2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_editable.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_editable2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fill-rule.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg width="176" height="208" viewBox="0 0 176 208" fill="blue" stroke="red">
-      
-         <g id="root_group" fill="#2288AA" stroke="#AA8822">
-            <polyline id="my_polyline" fill-rule="evenodd" points="50 10 50 150  160 150  160 50 10 50 10 70 130 70 130 100 70 100 70 10 50 10">
-               <animate xlink:href="#my_polyline" begin="1" dur="5" calcMode="linear" attributeName="fill-rule" values="nonzero;evenodd;inherit;evenodd"/>
-            </polyline>
-         </g>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fill-rule2.xml Deleted

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg fill='rgb(0,0,255)' stroke='rgb(255,0,0)' height='208' viewBox='0 0 176 208' width='176'>
-<g id='root_group' fill='rgb(34,136,170)' stroke='rgb(170,136,34)'>
-<polyline id='my_polyline' fill-rule='evenodd' points='50 10 50 150 160 150 160 50 10 50 10 70 130 70 130 100 70 100 70 10 50 10'>
-<animate calcMode='linear' values='nonzero;evenodd;inherit;evenodd' attributeName='fill-rule' begin='1.0009766' dur='5'
-         lsr:enabled='true' xlink:href='#my_polyline'/>
-</polyline>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fill.xml Deleted

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" color="aqua" fill="lime">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" x="10" y="10" width="50" height="50">
-            <animate attributeName="fill" dur="6" calcMode="discrete" values="none;inherit;currentColor;rgb(0,0,255)"/>
-         </rect>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fill2.xml Deleted

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' color='rgb(0,255,255)' fill='rgb(0,255,0)' height='100%' viewBox='0 0 176 208' width='176'>
-<rect id='my_rect' fill='rgb(255,0,0)' stroke='rgb(128,20,98)' height='50' width='50' x='10' y='10'>
-<animate calcMode='discrete' values='none;inherit;currentColor;rgb(0,0,255)' attributeName='fill' dur='6' lsr:enabled='true'/>
-</rect>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fillstroke-opacity.xml Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" fill="#2288AA" stroke="#AA8822">
-
-         <polygon id="my_poly" stroke-width="5" points="10 120 10 120 130 120 130 120 70 20 70 20">
-            <animate begin="1" dur="3" fill="freeze" attributeName="fill-opacity"
-                     from="0.0" to="inherit"/>
-            <animate begin="1" dur="3" fill="freeze" attributeName="stroke-opacity"
-                     from="0.0" to="1.0"/>
-         </polygon>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_fillstroke-opacity2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' fill='rgb(34,136,170)' stroke='rgb(170,136,34)' height='100%' viewBox='0 0 176 208' width='176'>
-<polygon id='my_poly' stroke-width='5' points='10 120 10 120 130 120 130 120 70 20 70 20'>
-<animate from='0.0' attributeName='fill-opacity' begin='1.0009766' dur='3' lsr:enabled='true' fill='freeze' to='inherit'/>
-<animate from='0.0' attributeName='stroke-opacity' begin='1.0009766' dur='3' lsr:enabled='true' fill='freeze' to='1.0'/>
-</polygon>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-family.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-family2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-style.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-style2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-weight.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_font-weight2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_gradientUnits.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_gradientUnits2.xml Deleted

@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg fill='rgb(0,0,255)' stroke='rgb(255,0,0)' height='208' viewBox='0 0 176 208' width='176'>
-<line stroke-opacity='0.49780273' stroke-width='10' x1='175' x2='0' y1='0' y2='207'/>
-<animate values='userSpaceOnUse;objectBoundingBox' attributeName='gradientUnits' dur='4' lsr:enabled='true' repeatCount='5' xlink:href='#MyGradient'/>
-<linearGradient id='MyGradient' stop-opacity='1'>
-<stop stop-color='rgb(255,0,0)' stop-opacity='1' offset='0'/>
-<stop stop-color='rgb(0,255,0)' stop-opacity='1' offset='0.5'/>
-<stop stop-color='rgb(0,0,255)' stop-opacity='1' offset='1'/>
-</linearGradient>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_gsize.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg width="176" height="208" viewBox="0 0 176 208" zoomAndPan="disable" fill="blue" stroke="red">
-      
-         <lsr:rectClip id="root_group" lsr:size="0 0" transform="translate(40 40)">
-            <rect transform="translate(-40 -40)" x="0" y="0" width="40" height="40"/>
-            <rect transform="translate(-40 -40)" x="40" y="0" width="40" height="40"/>
-            <rect transform="translate(-40 -40)" x="0" y="40" width="40" height="40"/>
-            <rect transform="translate(-40 -40)" x="40" y="40" width="40" height="40"/>
-            <animate id="increaseClip" attributeName="size" from="0 0" to="81 81" begin="0" dur="2"/>
-            <animate id="decreaseClip" attributeName="size" from="81 81" to="0 0" begin="4" dur="2"/>
-         </lsr:rectClip>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_gsize2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg fill='rgb(0,0,255)' stroke='rgb(255,0,0)' height='208' viewBox='0 0 176 208' width='176' zoomAndPan='disable'>
-<lsr:rectClip id='root_group' lsr:translation='40 40' lsr:size='0 0'>
-<rect lsr:translation='-40 -40' height='40' width='40' x='0' y='0'/>
-<rect lsr:translation='-40 -40' height='40' width='40' x='40' y='0'/>
-<rect lsr:translation='-40 -40' height='40' width='40' x='0' y='40'/>
-<rect lsr:translation='-40 -40' height='40' width='40' x='40' y='40'/>
-<animate id='increaseClip' from='0 0' attributeName='size' begin='9.765625E-4' dur='2' lsr:enabled='true' to='81 81'/>
-<animate id='decreaseClip' from='81 81' attributeName='size' begin='4.0009766' dur='2' lsr:enabled='true' to='0 0'/>
-</lsr:rectClip>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefa.xml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"
-           xml:lang="us" xml:space="preserve"
-           width="100%" height="100%" viewBox="0 0 176 208">
-         
-         <a id="A1" xlink:href="next1.svg">
-            <g id="shapes_group" fill="red" stroke="blue">
-               <rect id="Rect" x="10" y="104" width="50" height="60"/>
-               <circle id="Clircle" cx="110" cy="124" r="35"/>
-            </g>
-            <animate attributeName="xlink:href" begin="0" dur="6" repeatCount="indefinite"
-             values="next1.lsr;next2.lsr;next3.lsr"/>
-         </a>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefa2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefstreamid.xml Deleted

@@ -1,757 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader streamID="main">
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:imageHeader streamID="img1" objectTypeIndication="109"/>
-<saf:imageUnit ref="img1" source="data:image/png;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4ADkFkb2JlAGTAAAAAAf/b
-            AIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxsc
-            Hx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f
-            Hx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBkAGQAwERAAIRAQMRAf/EAIIAAAIDAQEBAQEAAAAAAAAA
-            AAECAAMEBQYHCAkBAQAAAAAAAAAAAAAAAAAAAAAQAAIBAgMEBQkFBwIHAQAAAAABAhEDIQQFMRJV
-            BkGT1AcYUWGyc9M0tHU3cSJyEwiBkbHBMlKSIyTwoUIzFBVHRREBAAAAAAAAAAAAAAAAAAAAAP/a
-            AAwDAQACEQMRAD8AzW/1ac/S5XyOr/8AqtJ/PzWezuUnD8vM7ihlbOUuRa/161bzUq49C/aGVfrB
-            7w3/APk6R1eZ7QAfGB3h8J0jq8z2gCeMDvD4VpHV5ntADeL/ALw+FaR1eZ7QAV+r7vC6dK0jq8z7
-            cA+L3vC4TpPV5n24B8XneDwrSerzPtwCv1d94HCtJ6vM+3APi57wOFaT1eZ9uAV+rnvA4VpPV5n2
-            4DeLjn/hWk9XmfbgHxb8/wDCtJ6vM+3Ani25/wCFaT1eZ9uAfFrz/wAK0nq8z7cCeLTn/hek9Xmf
-            bgFfqz5/4XpXV5n24B8WXP8AwvSv8Mz7cCeLLn/helf4Zn24E8WXP/C9K6vM+3Aniz5/4VpXV5n2
-            4E8WXP8AwrSurzPtwD4sefuF6V1eZ9uBPFjz9wvSurzPtwD4sOfeF6V1eZ9uAV+q/n3heldXmfbg
-            Ffqu594XpXV5n24B8VvPvC9L6vM+3Anis594XpfV5j24DeKvnvhel9XmPbAHxVc98M0v/DMe2Ani
-            q574Xpf+GY9sA3ip574ZpfV5j2wAX6qOe+GaX/hmPbAHxUc98M0vq8x7YCeKjnvhml9XmPbAB/qp
-            574ZpfV5j2wA8VXPfC9L/wAMx7YAP9VfPfC9L6vMe2AV/qt594XpXV5n24Af6rufeF6V1eZ9uAH+
-            q/n3heldXmfbgL4sefuF6V1eZ9uBPFlz9wvSurzPtwB4suf+F6V1eZ9uAPFnz/wvSurzPtwJ4tOf
-            +F6T1eZ9uAPFrz/wvSerzPtwB4tef+FaT1eZ9uBj1T9YPeHlLEblvSdIblLdalbzNNjfRmPMB8bs
-            fTzR/m+q/DaaBzUAyAgDIBkAUAyxAZAMgGSAKXSAyAIDAFIAgECUAIEoAaAQAgGgDJAMkAUgGSAN
-            ACkAyQBoAUgDQCUAVrABWAjxAWW0BWArQCtALQAMAUADAAAA5XMPucPWL0ZAdOz9PdH+b6r8LpoH
-            NQBqAUAyAZAFAMsAGQDIBkwGXkAZAGgDUAKAKQEoAUAQIAaAFICUAKQDJAMAUsAGSAZIAgFIBqAH
-            dAlGAAAAlAFYCPaAr2gKwAwFYCsCAKAGgAwOVzD7nD1i9GQHTs/T3R/m+q/C6aBzUAQCgGAIBQDr
-            YAy2IBgGXQAwDIBkAQGQBAIEoAUAaASgBAKAKQBiA1AGSxAagDJAGgBWwBqARVAIAYCvaAgCS2AJ
-            IBWArADAVgAAMAABgADk8xe6Q9YvRkB07P090f5vqvwumgc1AEAoAgFAMgGQDJoBkA6YDIBkAyQD
-            JAMkAUAaAGgEoAQJQA0AKVAGSAiAsWwApAMkAyQBowDQAraA1AA0AskAstoCMBJALLEBWgFYCtAA
-            BWAGgAAGAAOTzF7pD1i9GQHTs/T3R/m+q/C6aBzQIgGAKAKAZAMAyQDIBo7QHQDpAMgCgGQDUANA
-            CAaASgBoBKANEAgFLABorAB6AFIBkgGSAZbAIAaABoBZAK1iAjArYCsBWArQAYCgCgAADAFAAwOT
-            zEv9nb9YvRkB0bP090j5vqvw2mgc1AFAEBkAUAyAYBkAyAZAOtgDgMtoDoAgMlUAgFbACgJQA0AK
-            SANPIAyiAUsAGUQHSYDIBqMAqoDAGgEoAGkAkgEe0BGAjWACMBWAGArAUCMBWAAAwAByuY/c7frF
-            6MgOhZ+nmkfN9V+G00DmoAoAgMgCgGWwBgGWwBogMgHWwBwGAeIDIBkgDugNQCJAGgEoAyQDJARR
-            AaKqA9AG3asBkAyANKgMlRAHdAlAFYCSQFckAjAR7AFYCtAAAMBWArADQAAVgADlcx+52/WL0WB0
-            LP080j5vqvw2mgc1AEAoBkBAGTAaoDIB0wGjtAdbAHQDxAdIBgGAKxAagBSANAJQApAMgCgGigGS
-            AdLEB0gGUQCogMkAaLyABrABHsASQFcgK2ArQCMAMBWAGgFoAAAwFaAFAAwOTzH7nb9YvRkB0LP0
-            80j5vqvw2mgc1AEAoAgFAMgGW0Bk8QGW0B4gOtgD+QB0A6AdIBkgGSQDIApASgEoAyQDIBqMBooB
-            kgHSxAajAaKdAGSYBpQA0QCtAJJAJJAVPaAjAVgJQANAK0AGAoCsAMAAKwAByeY/c7frF6MgOhZ+
-            nmkfN9V+G00DmoAgEAoAoBkAQHQDLaAy2gWRAfyAOtoFkQHiAyQDRAZIApAGgEowGSAZIApMBlsQ
-            DqIDpYgOogMogFRYDboB3WAjW0CuQFcgK5AVsBXtAVgKwAwFYCgBgBgKwAAGByOZPc7frF6MgOhZ
-            +nmkfN9V+G00DmAFAMBAGAZAFAN0IB4gNHaA6AsQFkQLIgOtgDpbAGSxAKAZKoBoAQCkAUgHWwBo
-            pAOkgHSVQHSQDJYAMooApICMCt4qqArkBVJAJLaBWwFewBQFYAYCsBQAwFaAAAYAA5HMvudv1i9F
-            gb7P080j5vqvw2mgcwAoBgIgGQDIAgMAyYDxAdbALEBZECyIDxAsXQA6WIBSoAyQBoAQGQDUAZLp
-            AMUBYkBYkAyQDJYAPQCUAEl5gK5ICqSAqkBXJYgIwFawAWgCtAK0AGgFoAtAAwAwFaAAHI5l9zt+
-            sXosDfZ+nmkfN9V+G00DmAFAMBEAyAZAFMAraA62gPEBk8ALIgWR2gWxAsigLEtgDxWADRjUBt1g
-            FJ0AZIAtANFOgDJMB4pgOogWJAOogMogNugRp0AWQFUgKpAVSArkAjAVrABaAK9gCsAMBWAoAaAD
-            QCsAMDj8y+52/WL0WBvs/TzSPm+q/DaaBzACgCAUAyAIBQDR2gOtoDLaA62AOgLYgWxAtiBYugCy
-            IDxAZKoBSQB3QGSAZIBlHEB4xAsjECxRxAeMQHUQGUQA4gVSAqkBTNAVyArltARgK9oCsBWArADA
-            VgKwAwFADADA4/M3udv1i9FgbrP080f5vqvw2mgcwAoA0AKAZAEAoBkA0WA6AdbAHQFkWBdEC2IF
-            sQLIoCxLABkgGoAVEBt0BlEB4oB4xAsjECxRxAdRAdRAagCyQFM0BTNAUyQFcgEaxARoBKABoBWg
-            FaAWQCsAMBWAoCsAMDj8ze5W/WL0WBus/TzR/m+q/DaaBzACgGAiAZAEAoBkAUA8QLFsAeIFi2gW
-            xYF0EBdFAWxQDxTAsSYDUAZLEA0YDxQDxiBZGIFkYgWKFQHUQHUQJugJNAUzQFEgKpICqSAR7QFa
-            ARroAVqgCsBWArVQFaAVoBXtAFAFYAaA43M3uVv1i9GQG6z9PNH+b6r8NpoHMAKAYCIBkAQCgGQB
-            QDxAdbALIgWLaBbEC6AF0QLoAWxAsSAfdAKiAd0B1ECyMQLIxAtjEC2MQHjAB9ygAcQKpxwAzzAo
-            mBVKoFckAjjiAj8wCtYALIBGArADAQBWArADAUBQOPzN7lb9YvRkBstfTzR/m+rfDaaBzUAUAQCg
-            GQBAZAFAFAPEBlsAsQFkQLogXQAvh0AXwQFsQLUkA6jiA26A0Y4gPGIFkYAWQiBbGIFsYgPGCAfd
-            AWcQKJgZ5pgUTAqkgK5IBGkAjQCtYAJJIBGAHsAR4gK9gCyAVrABWmArAVgcfmb3K36xejIDZa+n
-            mj/N9W+G00DmoAoAgFAMgGQBWABQBW0BwGWwCxAWReIFsWBdADRDoA0QAvigLYoCxIB1EAqIFkYg
-            WRiBbbh5gLowAtjACyMAC4+YCu5EDNcQGe4gKJICqSASSARrEBGBXIBZIBXgAjWACtAI/IArAVgK
-            ArVWAjA4/M3uVv1i9GQGy19PNH+b6t8NpoHNQBqAUAUAyAYBgCkAUgGQDLYBYgHW0C2IF8ANFvoA
-            02wNMNgF0IgWqIDqIDKIFkYAWxgBbbgwL4wYFkYMC2MGBHDzAUXVQDJcAzXEwKZJgVyTASQFbTAR
-            gI1gAkkBXJAK1gAkgFkgEYCvaArAVgLIDjcze5W/WL0ZAbLX080f5vq3w2mgc1AQBkAUAyAYBkAU
-            AyAKAdbAHQDraBbEC+AGi30AabYGq3EDTCIFsYgWRgA6gBZGGOwC6MKsC6FvBAXxtgWxtgWK2As4
-            UAy3Y7QMdyKAz3IgVSiBVKIFcogJJAVuICSWACSQFckAr2MBJAIwK2AHsARgKwFYHG5n9zt+sXos
-            DZa+nmj/ADfVvhtNA5gBQDIApgMgCmAyAZbEAyAZIBkA6AsisQLIgXwA0W+gDVaA2WlgBqtxA0Ri
-            BZGDAdQAsjBAX27YF9u2BfG1gBdGAD/l4AVXY0AxXUsQMdyIFE0BVJAVSiBXKIFcogVNAI0AkkBX
-            JAVy6QEkAjVAEYCsBGgFYAYHF5n9zt+sXosDXb+nmj/N9W+G00DmIBkAagFbQGqAQHTAZAMgHiAy
-            2AOgLI7QHiBfADRb6ANVoDbZA22ogaYQAvjACxWwLIW8QNFu2BohbA0Qt4AXQteYBnbogMl+O0DD
-            ejtAxzQFE44gVSiBVKIFUkBXJAVSiBXJYAVyQFcgK5LaAkkAkgK2AvQArAVoBGBxuZ/c7frF6LA1
-            2/p7o3zfVvhtNA5gBTAKAZAMgCAy2gOgGQDxAZbAHQFi2gWRQF0AL7YGu0BtsAdCyqgbbUFUDTG2
-            BarQFkLOIGm3ZA027LoBphZAvjZAWdqkagc/MRAwXYgZZwQFE4AUyiBVKIFUogUyQFUkwKpoCqQF
-            cgK30gVyASQCeUBHsAVgL0gJ0MDjcze52/WL0WBrh9PdH+b6t8NpoHLQBQDJgEBogMmAyAaO0B1t
-            AeIDrYA6AsiBZFAWxAvh0AarIG6wB07CrQDo2YbANdu0BfGyBbCziBqs2gNdqxgsOgDTDL4bAL1Y
-            w2AZ8xbogOZmY4gYLsKsDNOGAFFyIFE49HSBROIFMogUyVAKZgUyApknUCuQFcukCuQCSArYCgKw
-            E6QFA43M/udv1i9FgaofT3Rvm+rfDaaBzEAUwCAyAKAZAPFgMtoDLaBZEB1sAsQDraBbEC2IF1sD
-            XaA25cDqZXoA62XhUDoWbeGwDTCzhsAvhYx2AbLFh1/5AbLWWwWHQBqt5ZgXSy7SA52bt0qBycxD
-            7wGGdutQM9y2BnuQAzTggKJxAomgM9xAUSApkgKZpVArkgKpAVyASSARgI8AFYCMBWBxuZ/c7frF
-            6LA1Q+nujfN9W+G00DloA1AKYDJgFMB0A0QGTAdbQHiwHTwAsiBbFAWxQFsUBdADVaA25cDq5ToA
-            7eTi3iB18vZbVQNtvLtrYBot5bHYBuy+VfkA32co91YdAGu1lH0oA38vuxYHFztvb5wORetOrAx3
-            LW0DLctAZbkAM1yAGW4gMtxAZ57QKJoCmeCApkgKpAVyW0CqQCSYCtAVvYArASQAYHF5m9zt+sXo
-            sDTH6e6N831b4bTQOWAUAUAwBTAdPEAp4AOmA6AeIFi2AWRAtiBbEC2AF8OgDTbA22AOrlNqA7+Q
-            VaAegyVrBL9oHUtZb7taAarWVowOllspswA6NjI1Sw6ANtrIUWwDLnsvSOwDzmdsurA5d6ztwAxX
-            bO0DHdtAY7kMAMd2OLAxXVgwMtxAZrgGeYFMwKZAVSArfSBVIBHtAVgI9gCSAR7QFA43M/udv1i9
-            FgaY/TzRvm+rfDaaBykAUwCAyAKYDJgMgHrggGiwLIsB47ALIgWxYF0QL4AXw6ANNtAbbKA6mU2o
-            D0GnqrX2ger022pJAegy2Tb6OgDfayOOwDrZPT3hgB1ctpcmk1HBYN+dgb//AFM42VNx+606P7MA
-            OBqmX3ar7QPNZzKqVaqvSgObey9K4Ac+9YpXADBetIDnX4LowAwXliwMN5YAY7gGaaxAzzAplsAo
-            kBVICuXSBXIBJAVtgI9gCMBJAK2BxuZfc7frF6LA1L6eaN831b4bTQOSAagMmAagFAMgGTAZPoAd
-            APFgWRYFkWBbEC6DA0QA0W8aAaraA12QOnlP6kB6HTabyA9posN5xA9pp+T3orD9oHby+lOTj93F
-            16Hgl+wD0GlaRGCU7kFVbdvSB1LOXt27cIKKSS8nl2/vAtccGvKB5HXslu35pRpHo+ym394Hmc1k
-            /MByszladAHKzNilQOTmoJJgcnMraBzbyxYGG8sGBjuIDNcAzzAomBTNAUyArl0gVyYFcmBW2BXI
-            BGwEbxARsDkcxuuTt+sXosDX/wDPdG+b6t8NpoHIAKAYApgFMBkwGTAaO0BltAeLAdbALYgWwkBf
-            CQF8JVA02mBrtYgbLKA6OWwaA72mSo0B7zQMXH9gH1LlvTlfimpbtPIq084HrLWUtW93BOUa/ee3
-            EC9JAECAYtQyMMyo/wB0cE15HUDzGe02UG1KNGuhgcHO5XdrgB5/O26VA8/nI7QOPmViBzb6xAwX
-            tjAx3EBludIGaYFUgKJvECmbQFMpAVSkBXJoCtyArcgEk8QFcsQEcgOTzF7pb9YvRYGv/wCeaN83
-            1b4bTQOQgCAyAIBQBQDIBltAdbQGjIB4yAsUgLYyAuhIC+3IDTaligN1mQG2yB0cv0AdvT396IHu
-            uXLlZR8wH2vlCP8Asd6lehSx2baLyYsD0AEAgEAgGbO5SGYtNPBpVTQHi9XsK3KcaYoDyGoRxYHn
-            c7GjbA42ZA5l7awOfe6QMdwDJdYGa5LaBnnLADPOWIFMpYgVSkBVKQFTkBW5AI5AK5AI5AK5Acnm
-            F/7WHrF6MgNr+nmjfN9W+G00DjoApgGrAKYDJgGoDVQBToA6eADRAdPAB0wLIsC6DAuhMDTaliBs
-            s3AN+XubKgdLLzToB2sjcpJAey5fv7s44gfdeSrynp7VV5UummzygejAgEAgEAgHkOYbdL0vOqpL
-            YvMB4fUoYsDzedjtA4uaW2oHLvtVYHMzElUDDdn5wMd6YGW5c84Ga5MCiUgKZSArlICqUgK5MBGw
-            EbdAEkwFdfKArb8oHL5gxykPWL0WBtl9PNF+b6t8NpoHHqAUwJUBkwDUApgMmgCmgGTAZSAdSwAZ
-            MCyMgLYyAtjIC+3MDXaugbbN1AdLL3lhQDsZO/RoD1eiZtK5F1A+393GoKSlYrXejh9qxA94gCBA
-            IBAIB5jmK3Sc6v72DWG1AeC1SUU3jiB5fP3kq4gefzmYTriBx8xfVdoHNv3toGG9d84GS7dqBluX
-            NuIFE7gFMpgVSmBVKQFcpAI5YgK2AlQEbAVyVHXGoAcgOXrzrlbfrF/Bgbp/TzRfm+rfC6aBxgCg
-            DUA7wBUgCpAFMAqQDKQDKQDKQDqQDKQFkbgFsbgFsbuKAvt3UBrtX8AN+XzGwDqZbNAd7TNQcZLE
-            D6pyLzLbymYt3Z3IwjHbKVKeTpA+2abrGm6jbc8lmbeYUf6lbkpNfakBuAgEAgAbSTbwS2sDw3Mu
-            tW5XJbv9Kql/xQD55qmp70pYgeXz+dbbowOFmc030gcvMX2BgvXgMly4BmuTAzzuAUymgKpSArcg
-            K3IBJSARyxARyAXeAVtAK3gAtcAObrnu1v8AGv4MDdc+nmi/N9W+G00DjJgGoEANQCmBKsBqsCJs
-            Bk2AU2A1WAykAVIB4yAdTAsjNgWQuOoF8LzQGyzmHgB0stfk6UYE1DmaOmRptuPoA89qHPmt5n7l
-            u9K1b8kdoFWk86czaZmFmMhqeZy19Yq5auyi8PsYH1vkL9TfP+l3lZ1TMLWsrJ/ejm/64p7d25Gk
-            v31A/W3LHMmmcx6NltW064p2MxFScU6uEqYwl50wOtUBbl23ag53JKMVtbA8fzLzVYUZWrFxflra
-            1g2B821bXVNy+9WvnA8nntUTbxA4eaz6fnA5eYzXnAwXsxXpAx3L4Ga5eAondqBTO4BTKbASUgKn
-            IBHMBXIBHJgK5MANsBW2ArbADbA5utv/AG9v8a/gwN936eaL831b4bTQOMBKgQA1ANQJUAp4gH9o
-            EqAyYBUgDvAMmA0ZAOp1AeMwLI3EA6uoC23mN17QNkNXt5e27knilgB5bUc/czmZldm612AZ6gPG
-            tUBuyEMzdvKzZVZTdEvKB+zP0raHrWm8l5y/qKlCzm8wnlLcv7YJqUkvO2B3uf8AvL1Tl7V7uQhG
-            EIqMZ2p0q3GS24gfN9T72dTzTbuXm69FQPOZvnq/dbcrm0Dk5jmec3jMDnXdccq/eAx3NUb6QMt3
-            UK9IGeecqBRPM+cCmeY84FUr3nAR3fOBW7q8oCSuAI5+cBXNAK5gK54ALvAByADkArYEqBz9Zf8A
-            t4fjX8GB0Lv080X5vq3wumgcSoBQBqBKgSoBTAlQIgDVAGqAK2gGqAKaAKkAykAd8Aq55wG/MAP5
-            r8oGHOZhylup4LagMlQGjtAtiwPYd2mQyuf5lytnMXFbjKSUZPy1A/oJy7p9jT9CyOSspfl2bMIx
-            ps2VA+S/qV0yNvStN1yOFyE3lLz8sZJzh+5qX7wPzbe1Jtv7wGWeoS/uAqln5eUCt56QCvOY7QF/
-            8t02gK8z5wEeYT6QFd5eUBXdXlAV3QFdzEAO4AruABzQC74AcgBvAByAG8gBvARyQGDV3XLw/Gv4
-            MDp3vp5ovzfVvhtNA4gEAgBQEAgBAIEAIEqAUwJUCbwDbwEUgDvMA7wAnKkW/IBzpybk2AACmBYp
-            AdnlfNTy+tZS9FtOFyLw+0D+ivJl+9e5T0q9fTVy5loSkntxWH/ID5V+qjmHK5XlLIaNvJ5vO5n8
-            9R/6o27MZLe/bKdAPyldzDbdGBU77AV3wA7zAH5wA/OYAd1gD85gT8wAfmAT8wAO4wJ+YAN8AOYA
-            3gI5ADeADkwJvMCbwAcgMWqOuXj+NfwYHUvfTzRPm+rfC6aBxAImAagQCAGoEqBKgQA1AlQCmBKg
-            SoBTANQDUCVYC3G9xgYAIAyAaKxA+5/pr7q7HNHMcdS1OG9p2QX5zh/fJOkYtgfrbnDnLl3kzQp6
-            jql6NmxbjuZfLxpv3JJfdhbiB+Je8XvA1LnTmTMavnaQ3/uZfLp/dtWY/wBEF9nT5WB5KU9oFbmA
-            u+wB+YAN8Cb4E3wI5sAbzAO8AN5gTeYE3wI5gDeAm8BN4AbwE3gJvARsAVAyak/9CP4v5MDrX/p5
-            onzfVvhdNA4gEAgEqAVJrYwIBAIBKgGoEAIEqAQIBKgHeYEqBNqaAyXbUovDFALGEpNJJtvoA9Fk
-            +S8/cy0M3mJxsWJ+V1dP5AWZvl/TrNY2b7uSX/VWoH0Xu774NS5C0+5ltLswuTuqk3dVVhigPMc5
-            8+8w83arLUNazUr91qluGyFuP9tuKwigPMynj/x0gJv+cAb/AJwA5ADe84A3gBvATeAm8BN4CbwE
-            3gJvATe84A3gCpecCV84EqBK+cCV84Er5wJXzgRsDJqL/wBGP4v5Adi/9PNE+b6v8NpoHDQBAgEA
-            gEAlQJUAoCASoEqAQDUCVAiAIEAKAaibxQFltRTrRVQG96jmrsYwuXZShHZFvBfsAH57ASdyoFbk
-            AHIBXIBd4COQA3gA5ADeAm8BN4CbwE3gCpASoAqBKgSoBqBN4AbwE3gJvAGoE3qAZc+62o/i/kB2
-            r/090T5vq/w2mAcICAQCAQCAGoEqAQIBAIgDUCVAgBQEqAQCmAU8QLIsB1JgNvgHfYC7wE3gA2wA
-            AAIAGwJUCVAG9QCbwBqBKgSoA3gDUAMA1AlQJUCVAlQJUCVAz51/6UfxfyA6NzP5WfJul5CM65vL
-            ajqN+7bpst37GRhbdfPKxP8AcByqgSoBqBKgQCAQCAGoEqBKgQAgQCVAlQCAagRMBkwGTAZMA1AO
-            8BP2gCoEqBKgCoEAFQJUCVAgAANQJUCVAABqBKgSoEqBKgSoEqBKgSoGfO/9uP4v5ALb93j+OX8I
-            gQCAQCASoEqAagQCAQCAECVAlQImAQJUAgQApgMmAQCmukCAGqAGAEAgBqBKgAAVAlQJUCVAlQJU
-            CVAlQJUCVAlQJUCVAlQJUCVAKAozj/04/b/IBLfu8fxy/hECIAgQCAQCAQCAQAgAAgQCAQCAEAgR
-            AMgJUBqgSoEr5wDUCVAlQJUCVAlQJUCABgQCAQCAQCAQCAQCARgECAQCVAozf9C+3+QC2/do/jl/
-            CIEAgEAlQJUCVAIEAgEAgEAgBqBKgQCAGoBAlQCAagSoEANQJUCVAIEQEYEAgEAgAqBKgSoEqBKg
-            SoEqBKgSoEqBKgECAQCnNv7i+3+QCwkv/HjCuycm8PKo+fzAQCAQCAQCASoEqBKgECAQCAQCAGoE
-            AgBqBADUA1AgEqAagQCAGoEqBKgSoEqBKgSoAAgEAgEAgEAgEAgEANQJUCVAozL3oJ9G9h+4D9Be
-            DTvGeUt5dapoilC5O47yuZzfkpxglGVbFN2G5VYV+869ACeC7vI4xo/WZrs4B8F3eRxjR+szXZwJ
-            4Le8jjGj9ZmuzgTwW95HGNH6zNdnAngu7yOMaP1ma7OBPBd3kcY0frM12cCeC7vH4xo/WZrs4E8F
-            3ePxjR+szXZwJ4Lu8fjGj9ZmuzgHwX94/GNH6zNdnAngv7x+MaP1ma7OAPBf3kcY0frM12cA+C/v
-            I4xo/WZrs4E8F/ePxjR+szXZwJ4L+8fjGj9ZmuzgTwX94/GNH6zNdnAngv7yOMaP1ma7OBPBh3j8
-            Y0frM12cA+DDvH4xo/WZrs4E8GHePxjR+szXZwJ4MO8fjGj9ZmuzgTwY95HGNH6zNdnAngx7yOMa
-            P1ma7OBPBl3j8Y0frM12cA+DLvH4xo/WZrs4E8GXePxjR+szXZwD4Mu8fjGj9ZmuzgTwZd4/GNH6
-            zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cCeDLvH4xo/WZrs4B8GXePxjR+szXZwB4Mu8fjGj9Zm
-            uzgHwZd4/GNH6zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cA+DLvH4xo/WZrs4A8GXePxjR+szXZ
-            wJ4Mu8fjGj9ZmuzgTwZd4/GNH6zNdnAngy7x+MaP1ma7OBPBl3j8Y0frM12cA+DLvH4xo/WZrs4A
-            8GXePxjR+szXZwJ4Mu8fjGj9ZmuzgHwZd4/GNH6zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cBL3
-            6L+8icUlrGjqjrjczXZwP//Z"/>
-<saf:endOfStream ref="img1"/>
-
-<saf:imageHeader streamID="img2" objectTypeIndication="109"/>
-<saf:imageUnit ref="img2" source="data:image/png;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4ADkFkb2JlAGTAAAAAAf/b
-            AIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxsc
-            Hx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f
-            Hx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBkAGQAwERAAIRAQMRAf/EAKsAAAIDAQEBAQAAAAAAAAAA
-            AAECAAMEBQYHCAEAAgMBAQEBAAAAAAAAAAAAAQIAAwQFBgcIEAABAwMDAQYEBAYBBAEDBQABABEC
-            IRIDMUEEUWFxgSITBZGhMgaxwUIU8NHhUiMH8WIzFQgkcoIWokNTgxgRAAICAgEDAwIFAwIFBAMB
-            AAABEQIhAwQxQRJREwVhgXGRIhQG8KGxwTLRQiMzFVJicoLxJAcW/9oADAMBAAIRAxEAPwD842Rt
-            YBn2XShHXhBEYA0AZkySGhDCGPoEVVBSRBHH0DI+KJ4oYQgBoE3igwg2Y3ZkfFB8UNGMTsmSQySG
-            tDBwmgMDAR6BMoCG0NpRN4hgZqpghCYIYgIpEHiQaKyuQotDM3YtlYiPoQg2UqEIVyAN0VnoQgVl
-            F/kDCjRZRGRPHQAVdrWRbdAKa1kjCrq9PuIyJ0l5AnBFVHYYiL6IiIndUCSI+KBJE3igSyIuiIrE
-            UVSSRRJEImdUCSKKqSgksifxUSLLIlSnDC2RMAiKqiSRCtVJGyKVqiNsiPglgEsiCplBbIiqrqCS
-            JlRInkyJlVCtkTJdwSBTxRJZFGkkSckTOq7glnEjoK11K+V1LUGLs2zfmmQyCNddKUUQUFgUyQRg
-            BTsTBGb4JghGpCKCh+icYiJAowENUSB7EwRhp0ToI0VZQhdt4Lcun2IQAKVqghCsSAFWxMACFZrQ
-            GRGnVEZFZGEAKu1/7vzEt0IjSv6pI3gitSxn1FnJFZWmYEbwRIqjSRN4YQPIiZfUDIoliURkTVr3
-            A2RTxJJEfH6AkiiUsjeCJvFklESpYCyKx9BF1IlVfQMkRgkkRABGPoCQoJBAmS9ANkKlVkjeCJow
-            CSVRVSeRFIBJN00YBOSIWTkK6ETOoskCFshRxAHiD0XylLBoQ8QWKaqGROqIRqgVOqISAeKKIhnG
-            qYIQ+iKCh9g6sGINAyhBn/qnkJEYCEIog4AZWJBHGjbq5BLB+S2VWPsAO6CWQhCtqAKugBFZSRWR
-            NrWUBsKvSwhe5FZRTb8xX0ImprbgFrEV9UVsiZL9QG8EVfiPJE9unQVdSIpEbImS7AAi1IJgKirB
-            GyI+IJAj4wgeQUiXqORFVYGwKzqhCFJVMazImz1BgiPjn6AkiEZD2InjuLJFEkRkSQ5GlEdWeMie
-            REfEDsRCAg/hk8YwLOSIqoJIl8cDSRGGkA4oAAffZfJINcDRFDXwTIZDDsTIJO4qEGfrROMFqdUY
-            IGPTdMgofonGD/ARCFEhKIhGHxTIg4rpqrVkI4CuSCWbeC31WM+gpGSJBCFekAKtawAKupWRGyJt
-            dZaJZwiK1VFbIra1/UI3gis1VyLdgVla/wCRGyFW1WRW8EVfjnA04IntV9+4qZEaqII3JEVXOWB2
-            9CIpYBOSIKqYXZkRgEkRaAmRCcBgiLf1IRke0MHeSJatMLwBOm+wrSC6Do3lhVl0QN0VhAZKKNN9
-            CSRNAJJsiuoH0I6njDJMoiZLOQNkQXqR+hE0YBIEWoB1I6ir6EkjoeIZOPEG0OvkK6G9DRH4fJMg
-            oI7CiEgOqMhGGxem7oogxonGDt2owEajBOEsyxxRkBjmZgxiSWtaRiDKP/2mj7ooFG2sqBd0Rg08
-            EwRhpROgjxFexW0WSFgHRaKrOAjjTwW6qwKRLUIVdVCsiuzCFCrqUEsyK2lVKA2RWVS6isiuosyv
-            qV26AKfVWWLseCK7xUfcSWBPGci9gqtVhjSAKyy9RKv0I6irCkLtJFLa5IrQRHxBJEXVATZFEEiE
-            S3JJhERjAJIh4oMsm6ddBe5EniusDSRHxJJHUdfQHkRGASRSCSB08QLJHqh4YD5ZIilAGyOmVIYH
-            aSbqduhO4Hqm8RfIjoquZA3ggKZoCZHKHgokPk5g5IqKr42jqIMWIoKHqigoI3RCEU18UyCEB9kU
-            EarvsnCMO3VFBC1BROgjaohCEyCEAdUUEaIDdysoiIsAHgr6pBGCuqQfbwW+tZqIFCqCRaK0bEbC
-            rlSV0Fki069aX5ldrERpX9SBZ4Irq1UCNgOivpRKxVa0ohKOqssl7YFP5LQq/wCSlv8AwQp6rIlu
-            gdlWqqSyXAA9U16rAtbMiEdwyR/mmrVgbREEiNkUIR03ioBOSKRgk5Ih4wGSIRJJJVM0gJsiHjgk
-            5I5U8VJPJwRk0pdQRJHR8e5JBVF1QE2SqmETJEWgIhUqiMDhOqsRtEemqDr9Aq31IS0k1VNcitxY
-            hUVSNgdkyrIHaCOQj4pg8oOWLrXA7l8UR2kMPmmQwQ2wRCgh+vyRggQCdPBMgjeNE4wwTIIeiYIQ
-            igjAFNBAj4smQR4g6/JW1q+oRwFekyDBX60RjjRb6V/TJW3kiNakbCtNaFbZFp8ehXICtGuv+Sq9
-            v8EOiOumUS9sEdWVphCO2RSafBatVf1fmUXePyITupSuYJa2JFdXOmMFXnkLs6ZUyB3gj/BVtQPV
-            yC5We2IrkevQKe3gnnkhO6Kp2A7dyOiqSgeUBBSuoysB2H4qOssitCC6nhGSeUkcBDxbD5JEdTxg
-            kgMuxMqCu/0I48eing+4fJEf5Ke2DzI6nhBPMjhN4vqB2QH/AJKeIHcjnY+CatV3Qrs+zAS9EypG
-            QO84I+yioB2JcmVQO4Lm0U8Z6g8o6EcOUVXoTyyyXBn2UdSeagBIr0GlUYaFdlkN1TWiniTyOaC4
-            7D8V8OR6JDDtKZBQQz9UUEYHZNIZDXQJghevQIhGTBGfRPISIkGFSnQTucn7S9143sOD3yXpy4GZ
-            hdCYlKJkSIicdiWXQtxFVNN/rrlr6fQ4ej+QcfZy3xV5e5X6Y+xyBqs66neHH8BX1IOAtNUgBW+q
-            /T9ip9QqytZgDZFpSgSSK9rCK0Aq+lMIqtYh0KfXXKFu8CkmqvqkkVWeQSNAr9dUrFN23UBKeqkW
-            zAZN4BPWkorteBSZa9uitVUiq1nEjA0ASeJYrAchGJBMBeiCqF2A6bxBJHDoQyJojv2KJQFtsNUG
-            FEKXqFk3+aOIwDM5JU0+anTIcsihCdoRj1An3QNPijEoEwQmtPBRVxkjecAJKdVEdmRzuol6Ct4y
-            CrUTQgS4wQkjRGE+oHZroQE77VUaIn6gJ7GfZRIDsRy7alHsCcgJIkTu2iiWBbWaeSXFxRkYB5/Q
-            l3l07FIyHzwBza4RBLMIpHxXwldD1IQzH4IogR2bJkEb5IhG30TjB100RIMEyGDqyYIUxBg6dBN2
-            X3b3LNwcXBycrLLg4HOLjGR9OJkXJEdNVqe+zM1ODprse1VXm+5niK9iFUaxwtNEiDBaaIDGXSpR
-            R9ihvJFZWqA2RaVQqbAtCpMFfkA/ktNKtGe7QJFgU+pS0LtcJik0JV9adEVWv1YsybQ2rrRRKWZt
-            lv0oBLDXdGqyDZbDEcHRWpGe1iO/ea9KIwK74GfY0HVLBc74gUSIJqH/AIqmdUxK3aC/w/JCBvKQ
-            guAfgUO4eqAJMNfBRoitA1zb6JXUs84Jc5DFDwSB5yC59EVX1I7T0Ddqg6dAq/WSCTV2UdJIrwRy
-            yPiKrguL/wAfFHwUE83ICdWKiQtrd5I+u3emgnlBCfNTvUgV2yHXu6qQHyTEfomK284C5Z9TsFIF
-            d5A8g3ZvopCJ7hHJNS/aokR3nqCrEM3jsiK7DAeUVZzpqgBWyAAjqygHYIBoNH2P4qB8wUO9dgiT
-            zMIrGo0XwjqeuGCZDII1LooKGD9UyCGvj0TBGGvRMghHRMgjNongIQEUgjAdfinSCOK13ViyQcfw
-            VfUI4C166gYy01nuKFdTVXBns8kV1KiWYFqVSl2BdqrvamGVe51ElKq2atcIy7LywSkACnpryhL7
-            ITEMhdrr+a0Vrgz2upF/UwBPSO9E6WDPe/6UAF37OxEF74GECZUdhJmamraKSVu8iiN0q1AAJPgp
-            OBXbACXJI0BYIlvkhi8Q+lK9UOoPLItWpqaokVg/AtsFCeRNWff8kIGmEQka9PyUgPnLCaCigfIl
-            wo+qkDeSAC7A10UgXz9ehH1Or1AUgHkAEkvsKKRAPOX1I9AHqiDyIBXtJ1UB5EEQz1pqoDyQbSCw
-            Fx7FCK/cIB+rYaO6EityExkxu738EExfJdiWRAFfMddm7Cykg8pIIlgZD/H1Un8yT6dSemYwJBeL
-            bMdaIyR3TwSMXkA9DqdQg2FsIgRF2Yk7UH81JF8skOMiIJcAPU7n8FJJ5SNZqdmFTr2oSCSGLmsY
-            sdDtUPRRMMnNY2inivhkYPbQGIYURSCkMB0TJBCIkJoDAwi6ZIaBt+9MEITBG2ThIEUQcCvVOkEs
-            GqvqgjRCuopZBwFspUAQtVF6CMi7Gun6fsY7Wz9yEq2muRLXgBLLVTXJRa8Fd+pWz2ehl92JEnOg
-            C0U1pGXbtwKa02ViUFW22CWyNHo9R3N/NEovsHx4QcjMTFjUauAUtrYKbXwNixuDCnlBOvQfiha3
-            cW9u5bHHEiVCCJkE13IYOl8sg8wRwGMnkDaYj46DwUd8Ad8YEMIhohtS57dfwTJyGWKcbwjqzN8S
-            UVbI3kJIMSCP+UUMngkYOHJZhX8aItwFskoi5i8idG/NRMPm2sCAV7BWqMjeUoaMCwAd6lBsXz/I
-            lkjQBmoetSpJPOCCHmbqaxHX+ajZHYJgxNXA1I1KEg8pGGOTyAFo3OwJCnkgeSBGG8dJBg43CjYG
-            xjAzLFoiP6q1ohIPKAjEQAQNakdR4oeQPJB9IlnBAuLOwDAsTRSQeQ4xAyP6YjUkfBu8JfIXygMc
-            YuFpDv0qAOoUkDt6hjhu8saA6ABz/FUPIjt6jRwAQJIAEiGAfQbOg7Ad5YDhYG36T+kh0fInkOcE
-            ix0MKyap0Q8hfMWOO2BmPLESr1D6dFJyM3Lgls7rosCQKgDTQlSUSSDEDC1rddPjup5ZB5ZBaQKW
-            mLPMPV9NkZGk40T5X69NF8QXQ94ugRv0KdDIYanoigoLOmiQjDVMgoZt06QQhkUELMyaAhARRB4j
-            dXVQR4srqBHC0URBwtlEhWFbdNMlV3gUmq7eun6Tn3tkBO60U1lV7iGX/K1V1QZrbEVSlqXc6Afz
-            WqtTHbZljYx5ogFy4cd6LZlvcbjwuywBBBkad6W7wVXtjBojxYAYyQ8JE+YA60fwdVu7yU22GnFx
-            oesSQa3FjXY/JV2u4KLbMExcOBlMOw+o7hh/aB0UtswG21mjDilAXChuFN5AEVl8FW3JW7z1K48c
-            zmASQLQwLkaPQo+cIZ3hYK83FmJGRO5iQCB2Fk9boauxFUsGU2xLyhEPKIOvYU/kh1dFU8MwWYgk
-            FpOavs6ZWQ6uQYzaQYF9KHTv22UbI7CzgbmFDoBuw7WRTCmCOMxDB6/V27ujIXaQ/tpG616AO7+K
-            HmDzCOPdHy1nrIClBQBTyJ5wH0BSN3mfyk9qHkDzLBxzEeUB9DKJ0JS+ciefqNHE8ZRYgmYL6oNg
-            dgnE0vC6ROpOmqkk8gS41sRKMSYUJdhUn+iiv6kVywcWM4v/AHOzs4bq6HnAnuQNHiuYknXd9GFE
-            r2EewkePAxlQiTiMZHoddFPMDuH9vjEWkJGUqFgXi2lUPJk832FOCQvckV8sRQsKaMmVg+ReOOWj
-            I0IYxJYtt1VfkVu5WePCAEpHV3iTdQ6HTom82xvcb6BligR6gfV+gD9FE30ArPoSOERtEgDkjQv+
-            rtoFPL06B8yuyFzEC6X0tQhqB6ppGkaeMxgZDQDfR9D/AFQTyBWyJ6USQZAyagAZgCHRkbyPOh7V
-            8WXQ+h9ho/knQyGACaAk1CJBhqigjKwYIRQRqsBsmCFMQeOtfmrakQ8arRTIRwtepQBjBa9dRGwr
-            oadbkovbAkj+K7mmmDmbLZK5FnW3XWUZNloKZZHLfNaFWDJfZkt9J4ip+B8dkvkZPLJt4nFYgEAy
-            jONA7hwev5KjZsM23ZP5GzjcK3JE2uBKJ8ta/noqb7JRRfdKNWLiEiLAykSxOrmm4VVtmSi2wuxc
-            e/JIAWuJONBp26VSu0IrteEHB7fMS3AAIke3aiFtqgF9xb6Qv3HmDjUEuAKimqXyArFEuOI5oiZs
-            lKAIA1fQ/gnV8Dq8rBllxjCMoigvo4Y1/mrfOS5bJYhwPGImKyrV3p0KPlkPl6FIwBg4NamNXAHe
-            +jp/Is8yS4Zk4iDEVNsjoNR/VFbCLZABgeEjCBAjr/cRoCo7ZyTzzkI4xsa3YW66mmvah5E9wnoZ
-            CD+l5MDoxqNSp5IPmhv2xmfK5kwqXoY0qp5wL5wWQ4/nBxtKhJlJ6eBSu4r2YyNHiTkQDEGUTWT7
-            9aJfcQHtH/agxufz3VcFzrV/5Ie5kX3Bjw44iYvdGTgx1eUXYILZIvutjftA39rEiUB2oeYPcHjx
-            ZkkkAiIrF3IfvQdxXsRP2+QyEJBgQxmCSDpJjv4oeSgPuIOTBI5DIxiQas7kt3I1tgCuo6hhxJ2m
-            YAjIR0c7h3QezsB7UIcGSOSXmILM9RXdFWUDeaaJHi/UfpiTa76dB8VHcnuEngvsgRFhWR1L9vVR
-            WgCvGSr0yITjJxj3rsP5sm8iyenqPPFP0oC17akO+z6BBPLBWykQ44gD1AIk/UxBHTZNPoGX2EMb
-            ZNcTJwRJzsKFGZGFnE2Sj9JOjEnUJkFPJ5QFgG23XxxOD6UNGgRQUEJkELURCMnCFMgjJgh2ATBC
-            GcJlghZEDorqJELAtNEEYLZqFYy3aqlVmArpaambYyjKa00B2Xf49YRxORf9WCo17a6LUY72NXHw
-            Gfm0YUloxbVVXvBk2bDoY+HOcMUQ8XE2H0k+bx8FmexJsyW2Q2dTg8H9RBAjkEoy1IFaLLs2mPdt
-            /wAGrjcLKDi8glMSYgeG471XfaslF9iyaY8WZjC0CF8if+kGlQqndFPuKS/FxP8AJJqEXRLvUsXS
-            PZgrttwVQ9vlC6JJtmDK53JG7hM9sjvfJcePGFJAHGZsHrSJD/BIrz+Iqv8AmZzxxGQDAyZosNKb
-            v06qzywWe5gyyw5JAy/USZC5w1paoVytBb5IGTDKQESGMQDawHUEIKwVZIq/by1OwLSkQaue5P5l
-            nmVQ4sTMyctJzEFxXtO4TvYM9mBzxSDjYvEGjRO4CVX6g9zqXS4tIlvKakFnbtJpRJ5iLYir0LsT
-            0YmgAZztUJvPIfPJpjxJiccZasfpHxqkezuVvYuoJcCJaUiTMaiQJ6UU91kW4tjxDHETkqaPJxce
-            oCR7JeBHtzgMOPkjjMQ7XAyjaWjGrDqo75I9ikg4wi0b3k4mTa7nSvQqO8g9ycjT40q2RfzEiQAF
-            BpWqCuLXZ9RxxYREIyDNUSo1NPgldwe42LPELCHcgCRBDkbhvBFWCrE/ai4yEhaakAb7fzR8ye4D
-            HC0RMT6kYEUk+uhCjYW/sL6Yn/kMa/qDnQIz2D5RgWQjLFk8zxkzxCMw0FPKKBgiJiD2AeU+Vzud
-            nT+WJLPPBJQd4hpAlwLaE67bUUTCmCWPH6GMCoeXmDsCwqH76IpuWRNyyoY421ttehH5HtZN5Fnk
-            JlEYgvC20hnItEn0fdMmGssqmYnzwYuem+rMnXoOvqeODMNi/cvj6PpyGA3TIKCN0UEI1RQRh8k6
-            CMmCFMEI2RCN/AVhBwraoJYFroQcLbrUiMK6uik5M+ywsjRdHRTJk23wU23Xb+V2AfdmXbWEjz2/
-            b+otw4DIxDOJFjR2Hhoha5jvsOzxeKQHYeoRV9GGqx7LnP2bTs8f2gzhhjIXFyZPTyvssduRDZz7
-            8mJg7PB9rjKF9CROAowDCmyxbdxh28jMF/H9vIkIGMTjjKwlwHajkfyVdtpXs3/maIe3mWPGQWMJ
-            EORVgRs1Er25KnuhsfBwssszEEhpgvuGLdHS22KBLbVH5FcOHECkBISjdGUiwJ3oemiL2SO9ok+I
-            WyRJNon9Ogckfj2J1syOthQePeYWGrACL6U3I/Sm84RYrx1MkuGbiJkRnMyEwA7jQN/RXLYXe7jA
-            k+HA0YiMov8A3E16DZMtjCtrKzxCTIGDjQuGNo7Am8x/cgtjwZhpfUT5WHlaI7a0Se4hPdJH25ya
-            O4cAjTbUqPaR7gx4RY3NbGLFq9rb6KPaB7fQtlwcYAsLBvMBUV0FHSe6xVub6kh7fESJLAlriXMq
-            6B1HuA90jx4cjCPlulJiJ2k0rTwS+5kV7Sw8PS4XRlWDaBqVLIe4KtpIcOZiI2sxuYUi5DsaBR7C
-            PYuoI8SJeZAIkLfHR7vFR7OwXtDk4ZhGIi9ALjGrR6qV2T1BXZIg4wsEYGko6yo5idgj55G833Fy
-            4yZOJCRIAoKu2m5RrYNbEjxImPlaM5jQi64gvUkqPZn6EewznEK3ACr0Ntev8aqzyLfIS2Qn/lFr
-            0L0JGgKacYDOMEaLAiIEQzQZh33D6vgpIZZTCDSEQQDIOAAzEbJ2x3YrEBExjJpAHT6SzV+SMj+U
-            iNEYrA5iJSsAFAwoAj3kMvqLPEAGem5JOoqE6sMrlMsc7hFoV/S2jvumVixNFJhKJBiAbS4mzEv/
-            AMJ05G8jw4dmZfI0fU0MGRQQjsr0TIIapgjAEbowEZOghGhToIwi+7MmSCMOzROkQeICvoglgWrW
-            uxGMF0NNOxVZkJXa068GPZbJXlkW711eNqSf4HO5OxwauBx7sd9fPj2rS7daNt8nmt+zJ1uNwcpg
-            LA4FccRUvTu6rLfajn7Nyk9FwPahM2wF0wPpbufXVc7bvg5m7kR16HoeF7XIeaQj5nZ6FwW+lc/Z
-            vOVt3o6nD9pgAQSHuDtQAD+OizbN7Me3kMvj7aJZYzIaOxAc1r00Vb3YK3vhF/8A4oGyMsbSBo9A
-            xIoHVfvfUT9x9SrHwhLPKUoPSTxls4LFqJnswNbbFSiHByWXCEbiCGl00dgexWW2roWPavsVS4ZM
-            9ADGX1RGtX0T+Y63QJDggTHqQIkYgUq7UZF7cBe5xhmWXBjfd6YjkjIxGg1LNpTRW+5jrgvW4Wft
-            sSYkylGRcAGhDnXXoitzD+4ZWOAAY1oWGOQ1IDu5YI+6M9w8eA2cGWNotaCxNOhdB7cdQPd+nqWf
-            sYiIJxxEqgA1DDTTVL7hX731IOEfqZjE21AtlUP8UfcG94s/8bOwXwAALsOxmS+6J769Qx4NpvlR
-            3DFwSf6Og9kg94EeBKpkGFral2fsGyL2Ee5EycQESgCA0nuarDYlRbO5K7O4/wC1gAMjuZ/pI81H
-            FfFL5g9x9CqfDcUB8rBqMDuO3tdOrj+6VTwBqMAYjqQ3emVh1cXNw4QuMvMY6SEerbaFka7JDXbJ
-            mlhkCTEATkGuDEFuwBh4KzyLldAlgJqJkMACCKAOelPBFXIrlOXj4YzYRuJaj0ftT1sx63cFJx4/
-            UMWuBYliC4111TpuCyXAs8eMVM2iXIZg7oqzCrMonickW1Lmcm3ZgnViytiowlZqLgKHUPrsE8qR
-            5yLONwDF2L+UbU20KKYycFE8ZsLF60LhvDoE6eR08iHEIRmCAZS+mL1TTI/lJQccAXkKakP2VTyW
-            Kx4OINv4hfJ0fV0ECvamSDARqighATIIw7UyCMyYJB2pkQcd6dBHAOxV1UEeOivqiDxdatafUDGX
-            T41ZZRscIQyC9Dr1dDmX2FQEskxCAeR0jRdOlfFSzj8rckj1HtHt0/RjExeXpXSlFiXMn0XO37s/
-            c81yt6n7nqPZvawYAeZhU+UAPtRly+RuhnF5XJyes4XsZlOIAiBbbEhxU6n49i5Wzkwji7eXCPQ4
-            PZox4uHGYCRiJETD0cjqudbkp2bk5d+XNmzfh4GKERAwiZAguItTpRZrcjJlvvbzIYcKEDFxR9PF
-            F75QHtbBHgYhNwHkSXn2k9CenRH3mF7nAg4MbgYBgQQCKsw3J3dN7vqN7z7mMe1RlEtIzJDxB0fw
-            Vr3l/wC4D/4sEtEgeeparOCAyPvk/cdymHtkxzHYmFKksaCjasme9eJY+QvEzH2k3mUhKQ8zE0YC
-            R6P8Vb7+C39yPP2uJtNjhrdaMSa7pVuFXJYx9rAjKQxyuFZhvKZGlOlVFu7SD9zPcJ9lnEfRfJgA
-            DQUoXIQ/cJk/dpkl7JK8Ctr0kQ+tSC+in7nAFy0P/wCKkcYIFSSwYkSd/gEv7gH7nIT7MSQzU2/6
-            tLXL7IfuQfugHggsCGOR8cnizEb7Mitv9graZz7ddIM8izAAuzmtKPVW+9gtW8WfCzWtkrcdmG9X
-            /wCFFsXYK2rsVDjiEaxeDi2TAka7bhtnT+csfykplxomQjG3SMgWAi5601ZOrli2epTm4hiLTASi
-            JBgHDB9KdWT12SPTZ3KcmCbUBETIkAB66kHVOrIsrdFEsbnzAgwYRla3jVtXTp+harehknETr/8A
-            uGX9zAMakVKtTguTa/AWePPKsQbH8sAxP9zu3VFNBVq9zPPCQJRiIggXC7UFw/YFarFqtJV6ZMZT
-            hHzRpEOTTuTeXZjK3qVZcAIjfMiQ+uhcb169qatiyt/Qrzxj5CxjNvKACzdp2TUbyPV9SjJgF0mN
-            huaTNQN46qxWLK3M9pAkL3lE2mGwr5tFZPcskpniFRUybykAUtH8OmTHVhZ+sWAkRbVm1p3VTKBq
-            tHzwVivlSyj62NEU/FOkFB7d0wQhFIId+qIRgE8BCB8EUQfYK3sEeIp4K2iCMAtFK5IOFs1IVjHR
-            dbhpSZt/QonNu9eo1a8HC37Y/E0e28WeXPCQGkgRq9aBPuukjh8reoZ9P9j9syHjY7IEWY3yOKA3
-            N00XmOTuUs8by96lntvbPZSYQmJNGBFQNR/AXG3cjqjzvI5cOD0ODi4sEQBEeUNWpXG38xKTlbNr
-            sWepEeUU7FyL89S1PUTxYDlqCqL82WmTxG9TUrR+7w2DxCJRLndW05Scggl0WfdM+UvHqHIZGJdW
-            /uVHUCFePjqeqX95VsOQkxtoabo35SwyZBGGKIFo0fWuqe/LlTJHZshGMkAh208Uv73IVZoIMQAN
-            O7VT96u4Mk8jg9NAo+XWCSyG00bVFcoClBtBL6Oa+GitruxLD5CmDv2b6J/3CJ5Ay4I5IxEtqxPQ
-            9VZTZA1dkPBX6DGO5iSQSNB2UKs9xMb3JKJYMhPlBEaSiG1rvVWK6LvNFWfjQMTYIgBoxkDsQXDM
-            d09b5Hpsa6nPy8fSOSpib8Ydz0uqtCt6Gqt+6KZ8cwa7IZQkAYt9RbbZOrz2LFeenUz5o3TjOBqZ
-            kM9OoPVWVcYZZV4M+TDP6iXMzqWqXoPgrKtFtbrsZ5wYeS0kFyBqG6hWJllX6meeI42hKRAcF33N
-            XYbKxOS6tpyZ5YHxWg3Zf0S6M7Pd3qxWz9CxXz9DOYSM55DbfA2nW2O7kqycQXTiBJY8khGJabRA
-            mLmEQTRkU0MmkZ8kDCAyEAsSzv3aVTpzgtTlwUsIh5Qja9S7vFqdutVYvoP9zNOeKGYiP6i5dyey
-            o+SsSbRak2slEpmN8BFzKsWJI08x6p0pyWJdGV5Gozv2mpp8NE6HR87iaBwvlqeD66hgDV0yQQgJ
-            kghGqKCMnCRkYIMAdGTJBGIo/wAE7WCDhX1CONaLTTqB9BgFq11AwyNF3OBQxcm2CmEDmyNHapde
-            mqvCuTzHM3I9h9r+25J5wQDIMKk0H/AXK5u5JHl/kN6SPsX2/wC0CGCEiwAgwkHci4luxeM5nJSe
-            TwfO5UuDvW4sIIgABqy87zPkPHBym3bqUT5FexeR5PyeYLFQq9Y1q65q57zmcj+JPWUXPRPEY5gA
-            W1Wi/PSTS6g8Q+uA5HxVq+RSlp/cHgQ5wYu6R/JVdevoTwD69KJ38l+nBPAX1y4rskt8k/Lr/wAo
-            fAP7giOvVT/ybVZknhkYZ9For8lMC+BBl7d1Kc369yOofVrrVWLm5w8k8RvVGyv/AHi6r1F8RhMb
-            69VqrvXfqCBhNX15CTgWBxNlrW6MAgIkFctlWCBgBVh2rXXYSQMSdWOzOyuVpZJKJQAxyJaNXMdn
-            072dXJtsuTyYuRgkwhjmY5CHjE+Vq1BbsWilvXoaaX7voZ82E3eYA5Ix10d9CSrK3LaW/Ixzx3Si
-            cZajSkHuG2quT9S+r9TNn48BibJPy9AC4t3GnwCet3OC2l84MmbCRkkIERIDkh3NOzo+6vrbGS+l
-            sFOasoMAQBWVRV3t7k9R69zPMQlAxiBWNrCpIf5J0XKUzPkxSMCCWhd5jW49sdtlYrZLa2KJnSMp
-            W2hrqgfBk6HS7wUZJZYStB8gJvkwf+CrEky2qTyU5MmQkwDxtJaj7aj8UySHrVdTNOQkbpEEhn23
-            rQUVqUFywUygDISMS40JqCAPyViHVih4N5QBX4D+KJ8lkHzqIAHRfL6rB9fQwToZBFEyCgsEYCMA
-            6ZIgWTBGAqrKogZyjAXGia9lXLI3Bjye64MZYFz2LBb5CtXgz25NUTH71gMmkGT6vlknlAXLqzdh
-            5WHKHhIFdnj8/XfuXKyfQtyFokr1fxkWaOfzLeNWzu/bnsWTMIZSCJHcmneulzOSlg+fc/mJNo+q
-            faP21AZSZ4rIgECT1iOoI6uvK/I82F1PF/Jc9x1PcSlDBjjjjpGi8D8p8iqvqebzdyzFm5JMmBcr
-            578l8znHU069U4E9PNOoBd2t7V5/d8k7M2U4dmg/ts7OBqPzZUfv7SXfsLQEcXMzkEAlhrqkXNcj
-            /wDj7RkaHB5RkYWseiL58LHQlPi9jtEE/Y8gkajqW0bVK+dZ9xl8ZYJ4HJuaIcAa1ZR8+zXUb/xV
-            5xkWHD5MmoxIdj2Jn8hZdxKfGXt2J+zzOxLMWPgo+fZ5J/42wksOYMWJBD0TfvbPuU34Vk+gjyEl
-            pXNjMmZ6XMAE5A6t3q7XzG31EtraLY5D1fquno5bnqVupYMnbTddGvK+ojqWRnutmrkTlCNDgvv/
-            AAFupsldf6QrLIycLbq3eSFaGEjsdFqrtfZ9BYLAei3Vvma9hRqVC2VuvL6gFkGLxFdj/NaKWl/Q
-            dZK5wEnkGJ0f8RqrqserjBkyYWEhEVDPHQbksX71arGitzn5YW42JBjMAEyBAcy+p+/4LRV5NNXL
-            M+UAxlIxD/TKNQdlai2nWDHKY9S4xIBFt71Y02OqujBelgy5MF8Yx2iTJmDhjSqsVoZdW8FBZ4xI
-            eIItlFwzllYW/UpN0pzIjZjIJA7S3bqmLE4S9TIMgtPqPEw/VE6uGevUK6PQtjODMTCdpiwyipbQ
-            ADqVZlfgXKV+BXlnHyxpIiTPE00HVNVMeqM04ymYiJaDkVNdaaV+KtTgtrgoyExjbAE2hriKEnqn
-            qWVU5KspIdwBAt5QO6g03TVLKwfNwHAXzNI+wjDSidDBH8FMiIKYI0RuEyQRwP6KxVIOI0WiusJy
-            vecsomMAaHZcX5K7VoMPLu1g5BBp0/muSYAgV/FRESLcczEvEkHYhPW0dCyrjodTg+5EgYs5odJf
-            zXpfhPm7cfYvLNS3Z/1aOlj9Df65/wDxz3T2LCOPkjHlQFnI49Lxa1R1B6hdn5Ll3WzyX6tdujPi
-            P8j08ni72rp+PZ9j28MGHiYzHHv173XlflPkvGjPK22PY8mT/LyMhhjDnVfI/lflm7P8To8Th22O
-            Edr2/wC3Mkok5I+YsBIkNVeP3czJ7j43+O3alrLOri9kwQtuIFxrKRBFP6LI+RZ9D0uj+NNf8v8A
-            gksHsMJgT5EIEMDcdHLAOmT3Pojq1/iycPxM590+2MUDMZxK0GTmmkrWr2lP7G94g6Gr+INNYHHu
-            n25GOKUslzxJtAJIanRT9vvc4Hr/ABSGsdC4+4fb/wDkuzxGPC0nEhW7+Sr9nb6ZYr/jUpYJj5Ps
-            kpkiZI2IBqZB6UrRB02pZK//APMxlo0Yfb/b8r+jMSkGbc+avwVdtt11MVv49WvYXJ7QBCUgzkuD
-            Fm18Uy5GTnbfh/FPEfgc7P7ZIEPG2LEk6q+m44+741p9MQcvPwhe040egbUBaq7PQ4G/h5yjnZeN
-            bH6a7haaXznocfdxYXTJQYkE9QtWrc0c/ZqgMJdTrqV1uPt+r+pmsi2M3B6rp698qCtouiaV3XU0
-            3lZEaLIyW/VsbFaHiarbptnAjLIn/lb9d8YFY4IehoVso847isYdVqpZ9QFdtTEh3clqADZiticl
-            k9yjMJEf5Bfbq34U3Cur9C7X9DG2OeOYFIkimocbkdyuWDQm5MGSBaAo8QCXDMJVavVX1saKsy8i
-            wjILTIvZa1QW6nuVtexdScGeUcVtrG4V7HFPgrE2WJvqY5DHL9NpI7aaEfJXKTQm0Z8glMCRAb6a
-            EHd7ZFPXBbVpGbKInzRx1lWI17NTtura/iXL8SjLdJxENEaSoH7Kp1jqWVaRnyYh6Jc+WBHR+ter
-            qytslqeSqoeUjY7mFHdj2bJxzPkiTGblzESIiQ0Q3b1qrEWVKY4fUhe/UgnoKfF0/lBY7w4Pmwb+
-            i+ao+yDAJkEI7kyCMBRPASwRCuVUEcRDrRXXkg4ituvSK7HM994HJjDFyJY5DDkcQmYkRPcSGPgu
-            F838ffU1ZxD/AAOXs5GvbZ1rZO1eqOIY6Lz0FLQwidnLByikGBrGPZ0TQNBZEbnZOkWVR2vYPfvc
-            faeXi5XCzTw5sZ8s4/geo6hdn475G2r9L/VrfVf13K+XwdXL1vXtXkmfpL7O+5M33P7Dx+UAP3V0
-            sPIEaC+ABJA/6gXXk/8A+g3/AGiq6f7NilfTp/xPiPyP8ftx+a9FcrqvwyetyT9l+3+JDle5TjKR
-            eMsZMbovV5B3+C+N/wDV5N4r+Z9S/i/8Jd0navbujiD74+6fepgfbXtHJ5nDAb/4+I20kzjKRbQ/
-            Bdvh/wAYvdZUs+pU+I4XEoltvWv9/wCyOh/+C/7h9xzRyZ4cT2/DkyWyxyzxyShERcZGxiQIoI0k
-            77Mu7o/iyqsldvl/jdWK+WyF1iJfplG3F/oj7gnGB5f3MTJzLLHFikNY0tmZ3Ukdei6mv+P66vMf
-            kVX/AJdqz4aUsYlp5/Io4/8A67+5vdy/uWWW0xtxwwmMZD9QkTORDtFiNFbT4Si6v+w+7+aVf/b0
-            qv4uf9EZ/wD/AD79zDyw+4IRxnHBx6ZMxkmSMgu3EKEGl2nl1Sv4SszIy/mWqM6f1T64/KDzPP8A
-            9c/7K9u9wyRzZ+OOJllYfcs+cYMEbZmAH+WydzC5oxk40dY9nwmUoUep1dP8i+P2a5dbK6/5Upb+
-            6UfnB5vH90+++3yhi5Zy4rZzjhJEoExBsmKtKmlR2Llb/jKT0/pHaXA07lNIcpN9/qvoe39h+680
-            sWM4skQ8owE4xYudy+rHYLgcjgqco8/zfjUn0Z732v3ociA0sEYm8kEEkPIyqvP7+NB5nk8NV6o6
-            GfFHJH6WDEEigA371mq4Z5vl8dNtQcTk8MsWJ31LsdltpsPJ8ni4cHI5uAwDP5ifMNSA3VbNdpPP
-            czR4/wBf6nLzRa6hroSFqozgb69SkE6Ci6HHu1hHPuiyDrr6JcMpZdCR31K6mja+r6iNFse1dPVn
-            qIywEj+a30s0hCyJPguhqu1l9BWONO5a9alQ+wrHBK2a7vuhYFnKUYuA7moHwottIY1UmzMaC4u2
-            0D3sRrqr1kv64M3Iw+pItEB6EOAHGzd6traC6loRzuQJgEQAJJuEJbsP7uv4rRR+pqpDMufHIxM7
-            pG4hgxABAr41V1WXUsinNB75AXABy+trOap6voWUZibK3qDysKHqx7qK3HQ0SuhRbCUoSIIDkvUg
-            ntqrJLXaJM2URfGIHqIu/j3KxfUtpMZKZGZdjESk1w1Lg+a0jSidQWIzZJ0EAa3DUV0ZjSqtqu5a
-            kZjCdwB8sCaA+U9/QAKxMuTUFcxMQJZoEXCJYttqmTGrBlyiQhFos0iNzoW+DK2sSXV6nzgaL5ql
-            g+xoIToYeIdPVSEYAqxVbIWRHYtNKhLAFt10FbG0C6/E0y0Z9t4R9C4EI/c/+qed7d6Rzc72UPgj
-            0FxmJR//AK7gQuB8z8PevPezz/6e6kKj6eSSU9Y6/Q+XbNv7L5mt24puw/7dT4rlxWTMSGI6ryWz
-            X4tpn0V1FEZaJVIILIY5Fk1assrUsGKfxTqjGVGX4oF3emyv11LqVPsn+gfduYPdOZ7Tx8kBy+Vj
-            u4Azf9sZ/wDtgnf9QNOi538w4VeV8dXyWdeyqn6XtVf6HB+T4tK87RyLqaryVl9sf3P0t7D/AKm9
-            i40p8v3+3373PNKOTLl5MAcMJxJJ9LETIREn8zkuy5HD+K08eqVUeg5Xz268V1P2tamFXDj/ANzU
-            Se4xYsWKAx4oRxwGkYgAB66BdI4jbbljKAIoQihCKEEy4cOYCOWEcgBEgJASYjQh1ICrNdD4J/tj
-            /Wv277Rj5nuHt8eR+5afNPGOHJPBDDaRlEeSxjCQkDk/ymRJ8sQHXL5nGrmyWT3f8c+b3NrVeyWv
-            FfrPb9PVz0xGMvofKfZefyYTjGDiMLpQAMtdTo40C8zv1Jo+g8zTXqfT/Y+dI2QE5SNpYyEWDCos
-            8fFeZ5WtHjebpw39T6L7fnjnxXXExe2LAAMOz+i87up4s8ly9KKuUwjIFokHVqo0PIcpJJ9jic7A
-            bS8RXZbddjzPN1OMo4vJh5hGthqQ+i20Z5rkUlx2MRBBI0C2abOTjbFA0JEGui6vG2tPPQz2RdEm
-            hXY1WeGVsuiafkurS0orZZHQH5Loa2sMVlkXI1ot+qbL6CMeLLZqhIVjx+Wq26renQDJOQgLpFoj
-            c6B1s11ZEpKcmK6h81HJls/QbLQrQW1tBmzxm8ZSpEhrYuSW/mVbVl9Guxh5t0nYEaCY1ZzSvcr9
-            Zo1YM+aEoicXM8cnYEnt670VtXMFtXn6mTLrF5ERDakkasxVqLqmTMDeACXm5d3HTQK2pfXKM2fF
-            KN1hJYACpZ30A7lZWxdRz1MpLCOScfq111iaOrfoXJdkZ5YjLIBH9LgCNfmR2snThFqtgqkJSpuK
-            CY0Bd6t+adDrBWcULiDIylQMaPb/AC3TJjKzMeUyAIiWERQjr47K2sF9TOZSBMYeWMusmd6UBCtX
-            1LYXc+ageVfOksH2caI1+aZII0XOieoR4gj8ldVBLIrVREHC3UaEYTouxw7Q0ZN6wdf7V+6eV7FD
-            3OHHNeZxzjET/c9C3iurzeBTcqXt/wAjk8P8t8YuTtovSyPHc7GZ8rJIbn8dV8l59E91vHpJ7b24
-            SX0RnGIkkLKqEVTRhhIAOVfrqy6lSwYyys8B/Esx4iKK3XrGrU+q/wDrx7Fn9y/2RwTikYftIT5E
-            yAHtDRP1Aj9af5bWlwrUfW9qR/8AWybOX8q03Sj7t/2z/c/ay84YyKEIoQihCKEIoQihDF73DJk9
-            n5uPGCZ5MM4BgJEXRIMhEvda7276JbqUy7j2VdlW+zR+M/csB4XvOWGPJkliwZBjhmnD0pSOOIiT
-            aYxtNNPmdV5Xk0htH3P4/at2hPHk8tT5ROVJ7P7Y5tmLDOYsMoCwEmlgfyli5NV5rma5wjjfIak2
-            4Pp/sHusrJSykyMjIxOziWmzMvNcvRnB4/nceOh3OTjgzkO501qzrn0Z47laarLycTnYZSBFzAGg
-            3ZbdVjy/N1No4vIwRJLbjputtbHm+ToTZzM0IxLNXcLXSxwd9En9SoGtV0NV1Jz7IthIrrcfayto
-            vjJ6/BdjVsnJW0WRk3euhr3NYEaLIybXxW/TtjDFaLIy26bLdr2dl2FaHidB8ls1bBWhtRUUW/Xt
-            cAmBZRupod5buC6tps9eoauBJ43F7C+JoSW7HWlWLFaMGLPij6vqiQk7mRLEMzMAe9ldW3Y0UtiD
-            LlwxAl6vkiwYRLgNqequrb0L62fYyCE7xEiMQSDEAEtbturZRe3KMNkQA0b9SX1BfUK+ZL5ZTkwB
-            ySQZu70YgfHud01bFisZbbI3RDiLjTUAVBforpLpnqZ448bR8shkYvAPunbZa2yiWGHosJWvK2g1
-            ADsK0qrFZyWK7kzZschNmOPG5DRrTfwVlXgvq8FRxyyRLeaBFo3AI/Bk/lA3lBnyYhUydoEG8+b+
-            mysVi1WPlg00Xz5dD7YhgDXZOkMMA3XwT1RCyIAqtFEkEsDLVSAMYLZSEKyHRdjiXRk3VZ2Psjie
-            28r7s4PE9yjfxOVI4pQJMRKUomwEiv1Mr/nedt0fHbd2lTfXV2S/+KZ5D56t66naj8bLv6H3fk/+
-            svt3uvso5HAxYeDyeRGM8JGbJkMHBJvrPHIOAPJ8V8f4/wA3zbRbkKmytuqhVa/Dxqpa9DZq18nT
-            Fqbnsx/ttWqT/wDtl/2Pz/779h+/+0e5ZODyOHllOM5Y4zxwmYzMSxamoOoNQvQcbRr5K8tNpXdP
-            Fq/SyzH0+kHZp8po8f8AqNa7elnH9I2ez/6y+7fcp24/b8mIF2nnBxRJAciNwukQB+kFJt38LR/3
-            t1E//TVp2/LBRs+f48f9Gd79Na8v8C+9/YH3H7RGRz8SWXBGPqT5OAHJiiP+qQHl8Vq4V+LzK/8A
-            6+ytvo2vL8si8b+ScXZf2rt6tsx4X/Tafwk4OPAbgBEymSwAFV2fjvhntTbceJ0+XzaaEnbofp//
-            ANZv9d8r231fubmxiMnJxenhxziRPGDUGP8A9QJu8F5v+Sc2ttq49I8dXV+rf/CDzWj5B8zbbYv+
-            3V+K+r7/AOh+gF5w3EUIRQhFCEUIRQhFCEUIfKP9z/YEvecWHncciOL27g5/T4mGUMeU5MZj6Ixx
-            mbLDeRMRY/Tr5QMHM43mp9Ez1X8a+Y/a2dX1vemX0Sn9U/bpP1PgnB5fI4vLHE5TgYY2ZcYlRgXk
-            Hi/manyXluRoifU+o7dddlPOv/N0x/WD6P8AbXu2OeNxDISCBAykRbF6sI6vT4LzfM0NdzynP4zT
-            6o+le28vHycch9OUAS9Ml2BFG6UXmd+t1f0PFc7jwpjAOXgFhMoxA71KWyeZ5fHw20kcPm4C/lIO
-            4AOy267HluZo9IOVycIAkbbZbA6t2OtdLSef5OlKXEM5uSNSRTs3WujhwcTbVdQQlsurx93r1MTR
-            bCW7sV1dGyc9GVtFsZLpatvqxGiwSDro02CQWwNV0dF8qRGh4mrLZpvNoFY4K2Vv1WQDgutlL+oo
-            JiJiYuz/AJrVrlINWyiQEf8AGB5GERR2r0Kuq5yXJt5M+TDhlGcW+hwSY/IdVbVstVmnJgzxjM3e
-            YiVBIMWYaa79VfRwaqNoy5+KxAlFzb5H3ajVParq3LqXkx5o2GIDF/MYuWqGtL1cK2rkvq5KDjtZ
-            yHLARDFi1R3KyZLEzPOGMSMmBmQ0bfq/+qn5KxMuTZRIQ9IPbaZecM2zEp+5YpkzyiJlwYmbBz0M
-            aC5WJwWJwY8kZXNKTiItJjUMNW01VqiDRVlRhjcynKx5MJBiNH210TyyyX2Pkw0Xg0fcBhWqdBLB
-            81cgjBXVIOFoqyDBadbFYV0NN/QpuiRy5sM4ZsEjjzYpCePJGhjKJcHwXc4rrb9Nuj7epyedoV9b
-            q1KZ+t/9Bf7bw/c/tmL2PmQx4Of7fghANJjkMS1It0qvlXz/AMG/j92P+zd/pfo//T+PWPocbi8l
-            1t7Wz/d/yv1Xp+K/wfT/AHb7a9l92A/e8e6QIlfjnkwzJAIDzxShI69V5zbxqbP93+Wv8M6WPRfk
-            h+B9v+y8DJLLxeJjx5ZiAnla6cvTiYwMpyeRIBNTVHXx6UUJf19wt/1EHM+5PsX2f3rFneJ43Jzx
-            EJ5oOxjUEGD2+aJa4V0rRJ+1qti20/Tsr0a/4dH90ZuXxdfIp4XSeZnvP49f9D5n9rf+sftXsvve
-            L3LN7ieWMOQSx4pQpCDG6Id3J0EpaDtXouf/ACLlcnV7SVdat/vdW5ffusfaBNvHtuiu63lrr0XT
-            y/8AlER64/DofZfbfa+B7bxhxuDhGDCC5iHJJYReRJJJaIqVwteqtFCNaSXQ1KwhFCEUIRQhFCEU
-            IRQhFCGX3PgcfncLkcfNgxZxmxTxennjdjkJisZjW0kB0GpQ+u7rZNOGmfmf/cP+vcX237yOT7Xg
-            hw/bM8ScGH1QQRihj9QwgQGAlNrTIyOvUrhc/iqrldD6r/FfnHv1vXtbtefT1n+umDzPsXvk8WbC
-            R9Z8pF8nZmuozdV53kcdNHd5vDlM+rewe9ynhEWEZAVjE67alqnVeW5XGhni+ZxEme242XFnx23G
-            Uy5lEhgN91w9lXVnluXonqsGTlcSj2G2oBPRjRW69h5Xk8SMxg43LwhiDEEl3P8AJbNdjzfK1KHJ
-            x+RxoxiCHZgX/ALZS55vkcdJT2gxTixY/F9Vr13ORt1wCMmH4LpcfZiTJZFsZmnZ+K6uvkOE/wCp
-            K2i6MiwXW1bHCEaHiTutmu7ayK0WxJoulqs5QjHiSTUrXrs7WyxWWRW/W5yhGFtD4rbS2MgkhqW3
-            6t2LQrdxlgonCERIECIjWJcfAlXpyW1cmTJDCRLz3SAc9Q3QaK5Nl6b9CjNghPEIyAMSQZDy+UdY
-            n5J62hltLNMw8o4xO9gTURh1JG+6vpMGiicQZGxwjkBe22plWrgq6XgvltoyyhGABlHzR0Bdyw10
-            2VqbZarT0K4iJueNsT9LjykdhTDGWcISyC2M4ykXJDl/jVWVeDQmzOYtjIJEQCDcdPAKxMdMy5TG
-            RmIRLkGMSRSp1prora/U0VUHx8aVC8Mj7qONdNVYuoR46D8VdV4COGV1SDBX1ZAhXVAxgtmkrsQr
-            q6bpfiZNlZNPs/vHP9j90we58DIcXIwyBEgSHG4LbLo7OPr5mm2nYvKrOB8pwlevo/8AH4H6z/1z
-            /v72L3zh4OP7rP0Od9E8ri0sPqlo3h4r5P8AJ/xvlcO0JPZr7Ndfv0Ry9Hy/tvw3rx/93/L9+8/Y
-            +kS+6vt2OEZjz8XpkOCDqO7VeZvzdNHFrJM2v5fi+Pn7lfH1OLk/2Lw88bPauP8AuOSbZY8XIn6A
-            lExuNRHLISBoxiuHzf5Pp0OPG7+uI/yXcT5Lh7tq1121s36f0jufbfv3F9+9l43unGFsM8T6mIlz
-            jyRNuTHIjeEwYleh07VsorLozqcvjW0bHrfb+/1OmrTMRQhFCEUIRQhFCEUIRQhFCEUIcP719q9n
-            9y+3eZh90jgGKOMyw5+Tj9aGLMP+1Oyhk028oPm+ndV7aK1cmzg8jZq2q1G5+jiV6H5G5/tWb2P3
-            rNwM+T/5XEyShKbC21gcU4kSJeQLmJAI3q7eV5Orxbqz7fxOUuVoV6/7LL7+lp/Bnrftr3aMYYY5
-            JRsh58Yi4iZCpDMKlz8F57maJlnF5/G6x3PqPsvuV04xnMQMota5tZ/06VqvL8nT6Hj+Xx4TO9Kz
-            JjoYmJpE9mg7lgymeb5XHnEdTm8zCACDjtrqtGu31PNczTHVQcfl8c3HyXjcE16LZSx5vlcfLxJy
-            eRi6QFSwAqfmtVLHn+RqjsYZRIJGh6brbr2NLqcfZrhhiWdyuhx9mHLM9kWxmXDldfVvtKTZW0Wx
-            LtVdHTduGI0Wg9V0abIcMRoeMhodFt07ksMVosjKulF0dW1T0wI0WXbLZXdOBYCDtV+xbNOxPtkg
-            s4GUCCKbLVS/cZOGL6RERYAHAc9j170/mu43n6mfNA3t6XkkQXDMKVf4K6rUFtHjqYcuOMMQJxAw
-            kDT+1zpr2FX1tL6mmtpfXoYJYSYTMIW0I8x7Ror1bKk0q2TOcbSN8Bpa53rtvqrZ9C2cYKThgZWx
-            DGAMgS+qZWH8mZjglOQul6g6A/0Ct8oLVeEZsuIzlKTGDEeamnYP6KyrgvraDMceO6MMhAtGlN6V
-            ZumysTfYtTfVHxULxiPvg4DlvgnSkI8QraoI4HVaEvUgw+SuTIEK6oGMFr1uCtoi3aG30KdgmQOG
-            Xa4toyc7kVnAeDy5cXODFw5BcFmK6N6K6PO83jpn1n7E+5uR68McsplEyF0CaWlu7qvJfKcGsTB4
-            P5fgVh4Pp0ZDFzePmi0QZiutCa6L4D/NeDWibSOF8JvevkUc9z6N/rPIP/E+5cQY7I8L3Pl4o1+o
-            TkM7tt/3mbsWr+O7fPha39D9D/L0/XS0z5662/0/0PXLtnKIoQihCKEIoQihCKEIoQihCKEJRQh+
-            dv8Adf2zD95h5n7jjwGWeXFxuLwhly5MlvIN08+Myl5sfqG/INZSEWo55HP1TGT6F/EvkPDyXjOF
-            NrRjH+2v49k+yk+cfb/LMMsKMQHDOZEh6/xqvNcnXKPc83Wmj6P9v8nFn42Oc5CWQ1gXAiC9sgS4
-            Z30XneVRp/Q8lzaOtmkfQPbuacmOJxxAxCPkEWLFwGudmPcvP7tcPPU8xyNCnPU3cnHGUSWcfgdl
-            no4PNczRhyjkcvDaDAB+oFW6rXrtJ5rlaoTqcnk4ycbRcR3l0Za6PJwORrmuOhyeRjAmCwMep37V
-            rpY87yNSmTMRUPQbrXqvnPQ52yoYksujp2tr+vsUNFsZNourq2x0K2i6Mt/gF1dexOWhGh4liQ61
-            67w2pEaLInbRdDVddIgVoeMtVs1beorRZGQW/VtXcVocFbKWbw2KRnjXTwWmrkMleQFndq+QdSrq
-            serMOfDExl6hLCkAQBGg1V9b+hppb0MYxxM5QtYQi7iry0BpX4K52xJo8jPkwwjGQpKG76RfQ03V
-            isy1WbMso2ZgADaItI7aU21Vsyi5OUZc+MCZfUaRrv8AyVtWXUtgyZcTz87BwLA5IrqDpurq2L62
-            xgoyRNQ7W/SwrXVinTLKs+IRpqF5GuD9AhiP+EyRB9B3q7ogjurk8ECFdUgysTAFaKisK36b+hTe
-            oCKLp6L5Rk21wZ8ooSD3ru6rSjicjX3Pa/Y3KsxCZGkquQ5aq5HyVJcHjvl9cuD7hjy+p7dx8rgs
-            Il2LU718P/nOidTk+fa34b8ep73/AF1MYfuP33jGUpfu8PD50P8A+MXieObV+omIelV5L+Ib1bju
-            netj9G7G9vC0bf8A2+P5Q/8AU+gL1pziKEIoQihCKEIoQihCvPyMHHgJ58kccJThjjKRYGeSQhCP
-            fKUgB2qNhSkslIRBlIgAByToAoA4fu33p9t+24pzz87GZY+RDh5IYz6k4Z8kb4wOOPnMrDdbEE21
-            ZJbZVdWatPD27HFa9p+yPE+7f7z9k4+PNj9tnHm8rjcHJyZSyQlgwZMmPLGAEZvOX+SN0oCIkC8f
-            MKrLfm0UpZaUnb4/8X5N1W1l41tetfV57/bvMHxn7z+98/3GZHlcjN7iZSJ4082LDgGKEoQcRaMz
-            FssfpE9HrV1yuTyq3+v+h734X4a/FaeKR1y35Zf19PVf4POe28bPPIIQx3N5jIbM7E+PVcrbdJSe
-            g5Gyvdnuvt/HkweiJm4XaRBEQ1Q5PVcTlNWmDzfNsrTGD6B7WbMdttuKXlqKka0t7dV5/flz3PMc
-            hS/qenxyv4+OUtbQz1P/ANzUdctqG4PO8zUnODLyMNHsAeh+XRW1seb36ZUwcnl8eInaAHAcv2V6
-            rVruef5fHXlCORycAiaF7S5Aqw7AtdLHn+Tqg5ueDE9/jVaqWOHyNZVp/JaqbGoMdqjxJ0anRdTV
-            Z9EsFDLYnwXU1W+wjLYybuW/XtjDFaLInd1v1WnMiMcFbaWgVlgkaLfXY8CQOCWC2UvaECBnK1V2
-            MBGLnt2K21eCSVZwA1orIsHeh1qyuqy3WzI2MXGYtIgbxVnJq7K7PYvz29TLPi2kmVtjAChIoase
-            qtVy9bDFMRMDANEQ1yEhzVjp1VyfcuTzJllHFcRE/qAtkDawdmGrq1SXpsyTxxhG4TYOSXckGuu1
-            Famy5OexnlHHG4kPjZjMC6ulVZJcm3+J8IA/4Xk0j9CDg1qrUEcVAKuSkIw6K1LsQYK5IhE8gGCv
-            1gYVr1MrsQrqamzLdFGXQ9CF2+K5RyeUok9F9qXSlijfaAXLnWmlVRzujPH/ACWJZ969qGSXseIy
-            lfQEE7hgvjf8z1u2myriD5ryWlv6G/3T7hP217n7B91RxZMvG42DLg9w4+CQgcuOULQJE0lZKUZg
-            Hovjv8Z5ns7rVfRs/TP8O1V5/wAY9OFaF4t5hqJj0lKD7Z7b7jxfcuBx+dxJX8fkwjkxndpB2I2I
-            0I2K+mVsmpRxduq2uzrZQ04NKJWRQhFCEUIRQhFCCzhjmLZxEgCCxD1iXB8CoE/P3+xf9s8yXvXK
-            wcVvcft+UeOcXEMc2HFIAvMci6GMzjmickJQeUWANCCuTyeb42hZR774X+MrdqVrvwvNs4b+2ceP
-            U+Wcnle6+7csZuVnnPPmkDOYYH6RB5yizyEPL5qtRcbbym5bPc8fiaOPWKrp6+v0++To4PtPNkjE
-            QgAJREr5VN2raih0/Nc181Iqv8mk8s7eD7M5RwykcF8He2OovYsP6rHb5Cs9TnbPlaz1ydrgfa0s
-            MoTxYhOLeTGW1a6p76P2rFt5yfVwc/d8j5dWei4/2xyfNIAmcjqZCj1oO/eq51+cuhy7/IVO/wAP
-            23LGAIYF4GIkDQ3DUmmi599qk5e7kJs7QtAeRNRUPvqSsJxt2yrUGXOYCc7SwG5PT59itqcXc0rO
-            DlcoOSzAmsjrv3LVQ4XKrLx1OZygAGapFZDsWqjOLyUkjl5oSZiaUAotNWcHdVsxsHLadVqpaDlX
-            r+RIk7Lfp22M7RZAkCmp1XT0XaWCtlkJHVbtG1zLFaLYy+K6evZ9xGiwFbqXkQcFbNd2LA8ZbfBa
-            9exoDQ4O3itKv2FgcOdTRdClm+ooDB6EO+r7rT5vshlYpljDSiB5CCSGLEnenYFcmWJ/mU5MJMTF
-            rIyoQC8QKnQ6OysViyt/uYuRxMJLESiJEUDfVUaK6t2aabbGTPxoxiRGP6ixLv5S1Nwrq3ZfTZLM
-            XIGOLRxxuLEzYsBLQjRldRsvo31ZkzNCMjCRHUanow6K6uS+jnsfAQvMI/RQw/4TpkHBor0wjAqx
-            MgQrEyBTpkCrkAYLXqtkrsiLp6rZM10U5vpPcu1xGcvl9DrfbeS3OD5QIyFD3v2J+YsHk+fXB99+
-            15HJ7IIlmiBTU/8AC+T/AMs0q+uyPmHyKjdJ6HD7fD3n7a5PAmAckHON6dKDvAX5w23/AG/J8ux9
-            m/8A5x8t7dYk4P2F97Z/sL3Lle1e5yMvZss3x5jG+WIwlcYCMTFhISlVyxalSvoXxHytbVSsfWfm
-            vif31Vu0r/qd16/X8fU/QHt3uXB9y4eLmcHPDkcbNGM4ZIFw0oiQfoWkKFelrZWUo+e7tN9dnW6i
-            yNKYqIoQihCKEOb739w+1ezceWbnciGIjHkyxxykIylDDG+cg+0RqdAltZLqW6tNruKo+Bf7U/2X
-            zo+683277emOFxuXGOLmcjj/AOPJKcSMpHqQySeuUuRGLuQbtuRzuW1+mrPoX8X+ApZLbvUxlJ5T
-            TUdGv+P2PngxZ/cuUZwjkiTHDDJGWQ5DPJCEYyldL++bybZ2XF5HI/wexrWmirWOtmoUQn2+y7nr
-            /Z/YTdDN5jiMpRjRhFpi76ujB2XB38rqvocXlc1dO57fg+wD1CR5jcJYyYhwCACXfXs8VxdvJwee
-            3c1o9RD2XjCdwlIBgCXqwi1QGdcp8pnE2c11WS/HxONhpCg3DtozV6Uqq3sszHu+Qx9QjlQxhmjE
-            j6h0Hch4Sc2/yPqVfvR6cRI+Y1J7GTe3kx/v2qrOSifOFTGWjWiVW+HYrFrMeznJ9H+HcyZuWCbS
-            CZVdg3xKtrr7nP28xNx3MuXkxIiCbdArVQw7d6f0MXIyxZ/1OQG1+SuqjmcjYo/MwZTAw1JLl+3w
-            V9Zk5OxqDJNgdx1Dtqr6nN2YK6fFaNduzMlkPGngunx7NV+v5ldokeJOmgW3TdvDwhGXRkXXW07Y
-            ZW0WCm/et9HHcQaJ7Fq13+gGO+i1eUwKWAggLerJpCjxbfVb9OxfcUYntYrRW7iQIQkR1FN6rT5I
-            dKSrLAS8oBJFQHZnpQq2jgsq4M0sBkwDXxBkYsASGPzVitBcr/kZsmEGIIBMZgje4XM6trbJdWxi
-            ywGMSEv8sD+mRYM9OquraTQrT9DFnxwJAkAZEF46AVener6svpZn53Fdl5xZP0gON1akQb81YgjO
-            ysmCDKySETwQYK6oGELRrcCsK6emuUZ7sryaFd3iM5XK6Gz2An9zRybhTq22/wCC08roeX5/Q/QH
-            2aZy9vmJs7AltqBfNP5BROjPl3y0eZ6X7f5Q4/LnAloSNR/Rfmv5/jpbXB6P+K8z27xJb93/AGhx
-            feOJkz4oQ80WkIwbcEyeLFywXO+P+Qeqyqz9AfAfONJZ/ueE+0PvH3v/AF77n+y9HHP2zlZpT5OS
-            cJzlCM7MZyRjCcYmz0gbd6hxqvonxvyq8V6HqPkvhtPySeytvHaq4XrE4+/r2PtWL/b/ANpZMeUQ
-            zxyciGH9zi48MuAyyYrBN3vEIyDm6BldFi4aq9EuVrfc8Ds+B5dXmlv93j0fWY9M/R9zVn/2d9sY
-            uBxOYeVD0uZ6RhO4nGI5ZiIuyANCVpuabdrJnvqlM4M+v4vfe7oqvyrOO+Pp1f2PL8n/AHr7P/5P
-            D7f7bkHuRzZc1/Jx4ZY44sccMp442TyPkkJ2iUgQDVgKFUPnU8vFZOtX+L8haXt2LwSrMP8AGPse
-            P+5f/YP3nB7pycfsMY+hDOQZ8mMc0Jxg8f8AEcco2wNtw1Jc+ZZN/wAlDip3vi/4WtmtW3tqa9Oj
-            X4ngvub72+5PuHLPDl5mXLxckzllhBmYXxyzmJQjOU5REL2hobWcUWHk8x374PS/FfCaOLVO1V5r
-            v9kZvbfZ+Vkyyy5hOZnK66YIMpO5lITDyNdFyd3JXrk27+VWq8awkvTt/wAD1fs/sX/xpciYxzF4
-            tiWhQyBtBFT4Cq5G/lZhSji8vmLy8VPQ9/7d7bkuslIXNJrYeQigMQC9e1cLduS//J5jfvUSemwc
-            LFEAs0o0MgAKjckLl22uTi7uS0wTz2REYhgKPqKHtQVJODu5TRhz8t6RZ411d92KvrrORv5fp2MW
-            bkmIumKuxB0BV1aT0Obt5LWWZjzsg1Na9QFZ7SMT5tjOedNyGBYagsrPaRjfOeUZ58yRJlGVSdO6
-            uqsWsx35beUyufLe4GR8weRJ1Kdaym/LmVJRPkmREh+kMW8E6oZb8lvK7FJzn+7UuafgrFrMr5H1
-            K5zuZ9lZWkGfZs8hRotFKpoobGHRbNScQ+olnkaPatWqrTyKy2PyC6mv07IRlsCF0NN0mIywHott
-            begsDPRa1eULA8fgtmt/YUsia7rdqspFYzCldCtlLw+sACWOz/8ASr62ALLHGlKfLx7FdW05GViq
-            QmQBQSBLMdafmrMFiaRkyeWNwAizgfqAJoz6iquWTRXJgzQ/xs94EovGIuL9dAr6mmryZ8nmMzkh
-            6gFAWbQCtA6tX4lq7Qz82DRcFH6WGi7nt3T1IMOqsTCMNaJ11IMArUiBViIEK2qAMFpopFYV1NBn
-            2FeTTtXd4py+QavZYA5y5106Byz9i1ch/pPL89n3v7DyE8OxyXiB5tRQL5585SUz5l8zX9Unbyyn
-            hziY3NV8D/knFdby4M/A5D12lHpvafdTKJhM+SQrjkHBiQzLwe/RmT6d8N8vZRmDH9z/AGpx+dCe
-            XAAMWSIuiDEVDkCL6O7K/hc90hPqj638T8x+lOZPkXuv2ZzOHyeRxwJREj/2rdWJIahoF6/R8irV
-            Pfcf5SmxVt6fU5+PB73i4Evao8nLDg8jJ62XgXEQlkhcIyMSQH8u/Yt37v8ATE/pL3bQ9vu+K86q
-            PL8Ykuj9tcrHEZMJBnHyCeKRe7fucFllXNSfoS3yFbYfT6o2cH7ayzxRw+lIxzQEpRMCDEGL/E9i
-            p28tJzPQzbfkF1T6fU7Xt32tERJzPkgZCOHykOYmrb7iu9Vj3c2enU5+/wCSc4PVcD7cOCWLNKF+
-            Nr5+o5cVZ4xOvyXK2cyZRxuRzfJNTDPQ8L2aRjLJOl85WY7XdplmbQMNlz9vI7fQ5mzlf4PQYMGH
-            DijZHzN9UepYHWuy5trts4vI5Dabkpz8qXnjRwCxFaJ66zg7+ZZyvxOXmzzujAFqHcFhstVaLqcD
-            dvtKUmDNyAJNQg/VJXVocrbyIZhy55CXmJOrgHXvWitTl7N7nOTHl5E55KFw1Crq0hHN2chuxR68
-            3JB+rVW11yY3yX27iGcurAaB1atWCl7mQ3E12V9OK11K7bpAz6KyvHwI7uQ26qxcZRnAvkG2ivXH
-            SQvkG0Pp2K6upN9ASNEAmgWjVRN4QGMI17ldTSnb8ANjiNVrrQWR4jtWrXUVjx0W3WsCscarWmpF
-            GBqFo13UoDLARtst9Lr1EgYVWrXZNgCWZXyv7kABrqzLXW2MBEnGRezXaT9qtT9R6v1M2WE2xwxE
-            GTWkncE7AurKtdWW1t1bMmTHdKRkLo4zbaDWho3irk8GmtsGXPCcozyA+YnZ9dafIKyrUwW0tmD8
-            zjRcZH6aG+aZEGagVqWCBDOnUBGCsqyBViZAq2rAMFr1isK6WjJm2Fc13OK8HN5CyaPZRL92WJAc
-            V2Pe62cn/aeY52Efb/sXlxBxxgGE4iJAqV4j5XVKcnzj5fU3MnreZjerGvyXx3+QcLys3EnB1Wgp
-            43JlhkBIlhovm/L4vizucLmumH2PW+0e8D9vEZGdy4Oz6Lhb+PnB9I+I+ZjWpwyzm+z8L3HHMxDm
-            YL3PqRq7u6XXyLa3k9/8b8x5RD6QeXy/ao/cCIhEQgSIkDcAnsNAG17l1lzsSejXyX6euWdbk/aH
-            GjinIeYTc3ZGdqUAI3IeqyV+QbZkp8lZvJq4f25DFxRGJGT1IgQAZhSoH/SqdvMbtkz7edLnodDF
-            7Fx4zeLBoh2dwX6aMyz25Tgyvnt9TVDgcfEQzGgYbm3R+5Uvc2ZdvMffqMJYcItDATJlU6EkvVDN
-            jDyOd2nsZc/LIxyi7AsHNW/BWV15OJv5cVaOdLleeb1BHw2BWlUwce3Jy/wOXLkyFzvGQLRB7yy0
-            +Bw7chqZ69jHn5BiSbnMwx2Y7q6tZOZv5HjmepjnnlInY6A9Oq0KhzNnIdvxKhOWmjadFetWMmX3
-            X0QACXJW3XpZndpHEK6LZq42cIR2GEN1pro7gkYYy+ivrxXPT+uwPIIxlu16q2vFxC9QeQwx/FW0
-            4v5gdiDHsnXF7E8hhjqwVi4uYQPIggQXT00NNsDYwjXTxV9dWQNjsGb5rYqqIFklroLXPQkjjZaq
-            9QDeC0rKyKMKbq+iSAN/BWpVyKP8hstUZXSAEZxTwKuq8k6CGLkhtBWQ17ldVOrlDJlUrrpirxFA
-            Wq+uiuRaogokHeUoCUSRoWLdrqxFqf1MeQmMbZXXH6fL5RQvXU9qtrnoX1yfl4F91yUz9PDB06CM
-            ++qaSBB0T1chGHara46kGVq6ECFdQAwWrUhLMK6mm2DPdCT0XX4qyYOQ8FvtZbNWsSWGuoqOi6O/
-            oeW5mZg+yfZ+e3LGJiBG2Jlb5bWHavHc+sqTwHylMSfQcjZccZg0kHC+c/McWWeUWG0YM+NjTVfO
-            /k+L4s1UsXcLlHGIxBrEnXt6LyW/S04O9weZ4pfQ9L7b7oREGOpp4P2dFyd2k9x8d8m0sHWjyMOR
-            qVxvNtjKQLj/APUs3i0ev0/J1f4wEc/HMjHIxY/U5+RS+01kzV+T/X1RJ82AlbEXAONWruBootTB
-            t5ynGSvLz7KXGpYF2o6auqTLs53iZ5c+IjWQkW8p8VYtRltzkq5fYrlzjKoYuHfvCZa4KLc2c/Q5
-            +blTjcZTcSYxJZx0jT8VoVE+xzOTzF+GEYsnJMxJ6MPrNFdWkHK2cnymfzMWXNJi9dKjYBX1ocvd
-            uZlyT6EEb1JVtK5Odtv6FVHWnWo7mS1pGAO1Vtrqa6FUlgidTr1XTpqbUsSRgNnV9adpBI4joVtr
-            reGLI4B8FqrV/YUa1tFetEPAshtPgE/tv8iSEA+Curqf2BJBEbIV1pdCSGMao69WcEbGtJWn2rMW
-            QiJD00T00tTjCJJLSSnWltpkkNve+ydaX0yCRgD0orq67R0ANGPyWnVq7AbG2qtKq2hSMH7U3gGQ
-            hvDp3rRRAFJlEMH0L9XbbRXJDYZXk+kEmrOfAOxVlR11MuQUkZBpZRoKg/0ZXIvq/wCxRlP+MxER
-            EsLC+7EAElPXqW16zJ+WguUj9QjDp1TIgx2TtBCP+FYiDDXvVi6kGVqZAhXUIxgtOtCMK6eqe5ns
-            JPRdni9Tn8joN7cH5IJBPWuwXS3f7TzXM6M+o/auaUcmE4wwxD6X1BbR2deY51cOe54n5Gkpz3Pq
-            ft+UZ+NEigA8Oyi8V8jxvI8Xvr42JmxP2rxXP4cyLWxiyQkJHs0Xi+Zwn5OUaqXH43JlikSd6MF5
-            7doawdbi8x0Z3uLz/wDEACKgGlD0XNvqyeu43O/SkPHnNUPaKylvp0SvUWLnR+ABzrpEXNFy1Xcq
-            PUK+dLanBRPlSeMnBOpajbsnVDNblOZkGTmiMYua1L96K1yJs5iSWSvJzHyRbpoNdNky1lOzmTZG
-            XNzAYyBcuzl6U6q2usxbeWmn9jNkzSJIJaLUA7OitrT0MGze5y4RnlN5EhXUr2Zivsl4AxZaaa21
-            KKLMYRei3a9SeIyVtltvlFe9dBaf09RJHjEFbdOpPArY8Y07Vspr/MVscRK0rU1juCRgOq0Up6iy
-            MIjR1qrqUQBscR+K0V0/mK2RqpvBySQmJ03TPVZY7kkgixJTa9MNuSNjCJ7+xaaarLPUWQ2n+ada
-            mSSWVR9mGSQ2nVM9b6gkNHZOqroQLDxCvpRJKQSE7Myd19CCuzv89U7pnoGCSLEVqdB1KeCJAYat
-            pUP81YgplGWkwTUM9xbQdw6p6l1OhVlrsDEszUJA8enRWVHoY8ueEmhCpFdn0cfBW1q+pfWkZZ+X
-            RouQj9PhFe5MgjDRWIg8VbVhGCtqQKsT9CBdW1YBgtWtisK6GnqUXEnouzxXk5+9YE4JP7oRBJMj
-            9IXX2/7TzXKXU+i/bed/SBi0QAI95DOvO8yvU8lzqdfU+rew8t8PmBNzVcy1Gq8py9WTxXN1Zwde
-            YBDjQ6dy83zOPg56Zky4nJ7GXlOZw02/oX1sZcmJjR15fmcKHK7l1bBxZjA9gDFec3aoZ1ePyYLI
-            8y8AOQe3RUe1BprzfKFIuTk5Y5JRJqDrumrqlSJt5dq2aFPJkNJPSoIdFa5K3ymu4hzzIAejM3cU
-            3tQyl8ltEnmJkDswfwCi1hvvl/YW82EElzoVd7OSj3n4tPqKHcNTora6ZZX5jRid9Vs1aHhf1+JW
-            2NGHY606uOlmBXYsjEMF0NepQI2MwYddFf4KFEgLQPgt9KR+AjYwiFppqXUDY0YjTotOvVWI9ANj
-            iK011LqLI1od/wAVoWpTIJCAFcqdmCRxHotNdWcCyG1irFoySSAVTUomyB/KquVGAEepNOiauvxI
-            wgh2BdOtchggLk7dEHTOSAMg4eooOwunprJALwJUIY69pVlaQHxxkSM47u7BzXU7UTOuB3UAlN7W
-            20P8VR8VJIQ0sgiZSJ0ozsykAVZK7gICUjcOlOtH/qmgeM4K82b0xZq+1C9dC/YmrWcjUrOSg5ck
-            mkGjMfUNCw2JKs8Ui7xSx2KZicmjKvWew3o4/BOsFicH5cBouQmfp5BTBGkeqssyDBtNjsnr6BGi
-            raIgwVyIMArqIDCFp1iMK6WgouJPT8l2eLCZz+RLRTh/78QdDKr/ANF1rP8ASef5KPd+xch/RAMp
-            Bg0CzANs64XKr1PLcynWT6Z9v8ucMRlGTE2yiAGBi5oPFea5VJZ5Hm6k2ep4/KjkjEPUgGvQhcbk
-            aG+hxNmuMjzgHNF5/kcZS5WREzPkxA7P1Xn+Tw03ktVjHPGQeoXkuTw2njoaK3FMWKxbeLCY9bZB
-            a6SnHbqG9sgsbRG3GjoKrBsVq4/Vk8iWmqR6JT/EPkEwKsfG6C+QwhUNRa68fK7CyWCG6210dxZC
-            IB6juVtOOpyCRxBitVdEMEjgFa60cCjCDmqvppTcMWRxEsy101uIgEhA7FfWvaADiJWha2LI1tFp
-            WrpIJGAWitMfQAagUHcFo11wuwCMW6nZky1EFkbdnMtuxPq1Q2MlIDkYgs8WcmiuVQqoJZA8uh0o
-            m8ZCqiynZIQkWFCHq/cX26I+MjKsqQetGQIBdq1oCX0qj4QTwgr/AHUROMX+twIsdRTVN4SP7RXL
-            kxiTYdCNHe46UTKg61z1E/dQiJAAiVK1FHZ9Ufbkb2iyOc3SjKcb4kgQ1bq9ErqK9eMFWXkCMWIF
-            p/U1CBWqdVkatBRnxTxepjEgzCNWrudEfFpwwujThjZM7ScUEQJCQJoDQv3IKpK0M3qY4xeBEjWl
-            XfUkeKsh9y3xfcry8qMhKbyHmFwJIiQAzF3TKj6D11w+x+Yu9cU/TQabIkH1YbKzqEaLFWVaCOGd
-            1dSOpAq5EGVqAEK/WKwrpcco2CyXZ48mDcZ4SlDNdXXqy7MSjgciszJ672fkC7HKMjbKOtTRu5cj
-            fTqec5VOsnvvYuT/AI3jktBIMTIOXLhtad64PKpnoeZ5dMxB7D23mB4xkS5cCI1p12IXI3azg8jV
-            3O1GYlrv9K4+3S3ZnOagWcRsuPyNCkiZly4n2+K8xyuJPYvrYryYwBoy5/J4qVekDKwggWAWauhw
-            l/oNIfTLfkmXHcAkIxlOuMyeQBjeJS14jdWTyCI9lU9dLx6kkawPVaVoS6iyOI79VqrpXUWQiFX/
-            AIKtppzIJGEHV9dMgkNp30Vvtv7EkcRK000tZFkcR/qFq165/wBRWw21Vy1ZBIbSrXqcwySMGWnX
-            rAQtX8lorT8yEMgCPzpqr1XEBSwIMlBd5SXYSOrJvEbxFjMs5DOQA5D6FNGRmkUnJEm4E2/SQ7VB
-            1ATpFir2KvXMR6heoI8pDk06Ap/CXAypOCk8kGbbkO1ZABgaHwTeGCzwwH91CUTVncyGwo4i25U9
-            tk9soycgRxztiLTQE1GhBAO2qsVJZbWmSk5JkCGI+Rg05Emm/lPanjux1VdX1Jk5mIGpJJFRIg03
-            qEFrZK6mE58UWMSXEXMBqSS+rqKjB4NlePlxaUIl8cZasWYV+SZ6+/cd6+/cGTlemTHG5OwBYeJ6
-            MiqT1JXXOWVZOZJxsCOunVky1j11kHMxwh5QYgObHoJA7bgHdR62w+02yo8yEiZSMmOztcSGqmWu
-            Og3tM/Ogbx6rzyP0iMw12TQELA71ZPCIOI/JWqgRhorl0IEJ0iDBXpACFfrQrCulogouJPRdjivM
-            HP5CwZyP8gJZ3etF2aqEcXem2eg9pzGNjuwFXLCgO6wb69Tg8mvU9v7HniMUJXNEiNZVch6B9CuJ
-            yq5PO8uuT1XtvM8kZepKEsZ8oH/V1b5rl7tfaDi8jXk9RweQ8ItJmu+o02aq5WymWcfdTJuhOM4i
-            QLg7rnb9Usy2TTKpw+NWXnORoffqMmJPHRtVh38bEdcDJiRgzNXo6za9MRHYLZLR+antrpAZIIUQ
-            WiESSWgA95ZMtSXX1ZJDbUU6pvZynHr2BITHSlHqntq6OO6JIWP/AArfCGLIW6Kz2/QkjiNVrrpy
-            LIbQzOnepNQn2BI1v9FpWqASM1Oi0V1ygBYAVHirlrXRoASwPbsForqCLeLmJEengra1xAYBcXYb
-            61Dg7BO6jQUTnK2QkLSTQT6sNKJ6osSK82UerjFwMw0n1pRk6WB6Vww5MsbfM4nTtFxdh2KJErTJ
-            hy8ucZGBq30zBeh100V9dc5NNdc5KBygAJgg4wfpfxNKtWqd6/zH8O3cB5Erbsc3Nx8wH1An8VPD
-            1D4eok8uTEZyjO2UhKpANXfdN4p9Rkk+xTmyymJRJBkCIkEhh3ANRPWsFlapMplkN3pnKA9YyNKs
-            KBu9M04lKWOq4mBBllKQjIMQXcmlaM6aA+IYZ/qi0bhEhnJBbuUdSOvcWU8sYgOSAxArSvQ6opIa
-            EKc2SR2JmS7gFxtpsyPig+CRVLJ5ZG7sjXVzo5CaB0sknlsHpmQkLogSNSXpr+KKrOSKs5KzUioE
-            YlyCxN2mqMDHwV9F5eT9EBd9USDD5qxBHCuqQYK5ECEyTIEK+oAhX0FYV0dDKLiyXX42DBuM2Skn
-            avxXZp0OLv6nc9tkB6ZJAthERlSh7/6LHuRwuQup632rkQPGE5yNDFnAcFjX50XI30/VBxOTR+WD
-            0ntfIj6ULJgkuC5BdhSh6rnbq+pyeRryz03B5WWPHxXNGEzIAuQKCOg1XM2UTbg5G3Wm2dnj8iRZ
-            jUnoz7DYUWO9Dn7NaNdJMfguLyNOTN0FnGj7LFyNLiQpiWhh1ZYVrUJ9xpJa6i1N9iSQBGtG3BAE
-            U8VXakr7hkLBw3wVjplQAlpYdHR9lx9ySNar/ZXQEksb+aL0R+AJGEVorqkEjN5Vb7cUJIQFfSn5
-            ihPUDTUq9aiCkufKdfzV/h6jJFd8dRRyW6v1dWKsD+LEcwkJUtNWZ9aM6fqN1RRORjACFgiH8zva
-            SHTpFyXqVzzmOEGMrsgDASJbrp2plWWNWmfoU+pli0oFmIBiHuAPYd+ifxXQshPqDkco/twQ4Lis
-            6SAIJZtkaa/1Bpr/AFGLLkc6gCRDSOlv/Kuqi+tSgZDDKxMTGOtXFS3arGpRb4ygZ53AiI84YAFo
-            ilSaKVRKqASySnGUSbpDY0Z9e9MlAVXJTPMTEiLQFNOwMa/NFVHVSmWW6OSESB0m21A6dKCxV6Mr
-            yZQQSMhA0Aj30L7J0hq1z0GxSNh3lONZu9RqELdQWWRBkxkvKVoJeLF336oww+LGEx5xCIFrC1tz
-            R3GyEA8eki5OTvTEAGqzEUoNkVQatPuUGQakgxLQNAwfdk8DwI7SERWMaUGm7umgaMHw8LyCP0CM
-            LXTqAjaJ4jqEcBXJECFbUgU5BnVqYAhaa5FYV09EdTPcWS6nHMW4z5AdR3vuuzRo42+rOjwcjCIe
-            0EUHzqqNqONur3PUcHILHAjc4E2o3R9GXM2rJx91cne4XItsB8kASxIADkMBXVnWDZQ5m2kyeo4P
-            Ih6WK8+U5JRjozNHQ9VzNlcs5G3XltHQ4PPthKBk0IljJwxDtRqrPs1Zky7dM5R6PDNwCJUlGJr3
-            Ab9i5O2kyoORepZeCG6UKzcjV+nBW0SwAaLA+OqroSQW769iRaZUkkNvwR9ldOxJBbTs2Q9mV9JJ
-            ITByPmVL6JsiJhtP9Vc9TjAJIIugtJJCx8FatTZJDuzq5UaygAD6HrVP4qAgMy9Gp+fTqr1SFHcP
-            iSRo5IiAKuf5J0gpFWSQJNoIqACKux+QBTpD1rBlOQym1zCJ03DaHTdlalgvVUkU/u4taIGMQaz1
-            auvRMqDvV3M5zXAxahkZNHWvcO1W+JcqdxTP/JIF2ZiJHoGpqdO5GMDRgoOVoRlEigN2MPq51fsT
-            quYHVcj8jkgQFWILsQJfUKMPzS0pkFKZOffMGJl+kuHZq76LTCNGBZZI+pIEuTUQr5hs7fNGMDJY
-            FlIy8xkccWZwXYPUvsjEDIq9TEZvjJkQ7Rq2wfR00PuN4uMglI+pO0nSglSj1FXRDGDPKb5DIgM7
-            RIOx6p4wWKuCr9xG1hQxj5S4k5G0in8SzwyTHPCfUgJmRZy2oLsGHRB1eGRp4cEznGACJAebyxHm
-            DtXXojWSVkGSUJRMoEyjIAkMxHb4bKJeoapzkr9WAgCZVAjUs/m/5qm8RvFyIZQuha4iS90SKnX8
-            90YYymGJ6gjIhnMaFzqB2DsTeOBvGT40F4pH3kMfxT1CPUqxJsIwr3qxZIMHVtZIFWKSBCsqAYLV
-            rSQrCujoRRsFkurpnoYthTkqWPguxq6HK35ZbxJmOWNpJEQCSw0btTbFg5G5Jo9F7fzICF8mMbod
-            4Ac1XO3a23g5O7VmDucTlS9KNjycmbdd+vRYb0zk52zXk7/D5kDx4ATthKUwRqS4BavwWDZr/U8H
-            N26snV4uY4xIkCMCYgh3DfBZL1kxbKz+J6niZZjHEyLQMY2sQQR5aB1yr1WYORson+Jp4XK9Sb3g
-            4zWILPUP/NV7aY+pn3aoXTJqOTzsGu0PZXdZ1qUFHjgsDMG7lW9WRGShaQqEq1+oPoBqHUKr2204
-            xkhAQ5eh0rumeqHIQ7tuEz1NQADsW37U9dSWQwRnGpoU/j0JIgyB2+obEEa66FOqQP4kjORasTIP
-            UdEbrAHUSRnZdEgxDsxqAd6JklOR0lOSi+VsJSyCJMQTKW5PSitj6FsZagpyciEKCRjEG0vrQbjt
-            TVpJaqP0M2XlTEoiE4gfQG1qA5CtrT1LVrXcpy8k+mRjAiz3Sozy+VU9aZyPWmclE85vvpKEvK9T
-            /D9ydVLVTEAy5cnqPDyxFbiTd5di6NUoJWqgzyyGJE6AyJABeo71ZElirJRkyTyYosR5TEy1FCNP
-            5p0kmW1qkxDmlGMZyIiSKjo+4fYdqZV7DRLK5ZHMSCZQtDTBb4tT4JkhlUUzlKoFoP1Vao+KKQYS
-            BLJK4EG3JVrS4D7t/JSBkvyKDPJjuOlxAA6/gnhMsSTKMk4QsuP6vNc9xJDGlU6q2WVlyDJK2JOO
-            si3pxAe4ClSRsjVeoUp6iC/HGYIFxhQCjP2I4Y2GySnIgGRjAPsfnTQIpASjBVKQeIk0gXBtarlx
-            ToikWJegmTISYCdTUykdCG0HwTJdQ1XoSc8kRKAi0Q1rFzc+rkIpIiSmSuUxCcIYwwa4nWp1dGJy
-            x0pUs+SgFh0XhoPuY0Q+yeqkg4BpRlYkEYVViyQIViIFWogwVtUAIWrWhGFdHSUXAdF0tPYybCmY
-            cdWXX1s5m1SDFcLmegBYMrrHK21O77flEccnDmVtolpR3/FYdtZaOXurLOtwM0xiEj5hpboQT/bs
-            zLJtrkw7qJs7eDkwHHxiJYXSja7bR6rDan6mc++vLOjg5cccYlzcC5I1DAMC1fFZ7a5Mt9cnq/bO
-            bM44EkvO0E0bQMKbLlbdXX6HF36lJfwuSJciMpeUVETox1o3wKr2V/SVbdf6TpnkxvkfUEZVMoVY
-            kFu91mVDH7eIjBrhmutBeJDXXVod6Kq1DO6QPOY1vESaAoJAVSSyQjaLrXIYHeir8P8AJFVvsQzN
-            hYE6dmven8VJFXJJZIShMgkyjGo7dVHXoRVcopOY+oZMJSpEf10VnjgsVMeg0cjS8xkKVp27dEHU
-            HjJX6ojQnUakivcB803iN4SCGQjNCGsGLUodS/UlR1ww2UpvuUR5UjkDeaJcBxb5RWklY6YLXrUF
-            Ec5lAiEgDpE1oDtV/wCCn8Y6ljpDKuXzIjKBf54gOY7sWYt02on168D69baMk8plP62kQZSIqa6/
-            9KtVcFyrCFnmjdKQDyL3jQCjA/8ACKqMqsqOaEMptIjGLiLih0L7p/GVkfxcFUs4rEkmWjkUJL7O
-            mVRlQrnMTEMnqGUo+VmDP17KJkoxA6UYgqlKVsZBmLAWux8p1cp0h4UwVylARmwkRI1JRQ8TBVI2
-            3Bg1ZHpXQMEyGWSTyAxGTrUTIYWmuoRS7BVcwU+sDCRlH6yBbsA7XO/RN4+g/hnAseRFroBw7gDY
-            nyvUouozo+5ngYG71ZECJYM4J00d+qsafYtcroAZJiRL3ElwGO/Y/ejCDCgS8j1BEAiYFGdxcOtd
-            kUugY6CTzSOS6EjaSGhKuv8Awiq4yMq4DkzgkmUmasZMa7qKpFUzxaUpPJwKAMQWPYXVnYsaAckp
-            Y2a2UPpD7SqwRjMhSyKZ4schElskXM2aQ+H4ow2gpNny4DuXgUfbRg/inqwj3SVvkwjOWVibggwK
-            sq2QKtRAhW1AwhaNakRhXQ00RTdgK6WuqMt7FU3qRqutpiIObunr3KmiS8nAAGgDn4rVk5dzq8DI
-            Y4JScaxFzbf0WXasnN3VlnV4nJg0YW+VjXZ+wd6y7KPqY9tGdvDklHBD1Npkv0YDXxCxWWWc69c4
-            NmHMYtOIaTsST4bKm1TPanY9T7dmlLFjtyWGyEbgW8vlrofBcnZX6HJ30SbxJfwc+U8qOOErZ2SD
-            bu1LjTVLtSVZZTtovGWdIZ8t2QxnMsSIxLh66inUrMqKDI6LGDbDLmpGM2bTJLcbaB1S6ozOq9B5
-            ZMuUQEyIh7QXo/5DZBJICol0Lg8ssIl74iPld9tR3Kp9CvpkGKf1eaRtkBbX6g+h0CeyJZdMAhlI
-            jkMmLjQ0LOxDnvQsugXT0FwzlAemSbXNg2IJJP8ADprKchtVPJlll5Bhkf6AXE4kvdIM1VaqpNF6
-            rXAByJjMY3xnKYYu7N41CDooD4KOhZDLkEhZGMY4xIiQchhGp7qoNLuK6qM9zN68pTkHEoAEsAQJ
-            Udqq3xwW+EIry8m+U/IDlpbIh9D9WupTVpH4DVpC64KJ5CJT8lpBFoAq7eZyE6RZWuCvJKJNwHnM
-            axAA1231TVkZIqlGBeIi0yGdnIfx/BMmyxP8iuQwRmZRdma4NSXb2J1Iy8miozxiEgIylE/20Ibt
-            LJocjpMySMRAC5gCSCXubowVqLl1LM0skoY7ZmDW0LjWJGiWqUsFapN4KZnIZNCbiQBixOg1dxqn
-            RYojKFnKcRIXPcB9VC47BWjuioDVJlI9bJjMccgIlhQuWGrbJsId+KeRZ+sTLDjIEwGkWoTo7Gr/
-            ACRUdWFR1YhnOYl6kvOQzksAa2s6ZQug0JdDNKWSLCUo3V8+vgOitSRbCZWZRjIAxudjEyJFQG2K
-            aJQ3UIlCRmZOYxFJGm9fxUgDTBKOAltTGhgxYhtXcKSxk2iqcYhr9BEECIIZ+qZDpiGOOxx+phEC
-            ld/CiaWGXIJSxxFomYnaNGfxqjkiT6i3AjQkEM8WAAfd0YGiD5wNO9fPUfaQgJoIP0fRWII1KK1E
-            CFbVkGCsqQIVlQBC1a3kRhXR1Vkos4AdFv12hme6wVSf+Oq6utpnOumUyBEi7Lang5t6uTbxJxjj
-            mWoTGj1avcqNilowba5OjjzyEJGJYswtLalZ7VMVqZO1xckvQxyjOhkdKtSPw8VhslLMWxKWbMeb
-            IQLSGuFxD08VW6ma1Uei4GfJLGJQMYRsgTKuoMRuuZsql1Odtql1L/beTIZroh4ykYkEAP5TuW2S
-            7qLxKN1MHUhyZHLIAMJOwBNA/hQusvhgx21pI2xzkEiEmH6KkFvFVOhmdPUux5zRwIwcigo/Z8d0
-            lqlbqaPXJyiJmRMCNdS1uuqq8cFfgox0K8eWc8chLI8LhVjXUl+uie1UmsDOqT6EhmIlkrpjcGUg
-            RX8ELVx9yOuF+IBkGWQE5mMiPK0gA2pJLItQGIWEVQyyF2OPnyCjA00q9zbp3Xux3Xv2KzyCARIh
-            /wBRZ5FyPDwR8R1QfBOHrWD6y4o4AAiTvXwQvVxItk4kzxynzAF5442knTXdjXVW+JY6/wBysylG
-            IlYICRLSAqBo1Uw3jJXLMGmXDHysQ+uqPiOqlc4wAYu4BboT/IDR0ykZSL6kDItICQBD7VDaHvRg
-            aGZyAclsPMGaUo6E6h+qs7SW9hPW7Xc/UB+PVHxD4g9WIjISItBqAdyjAfASU4HBHNENKRFt7ufJ
-            Q67KKr8oHh+TRTlljMo6SuIMrQz60A08VYkx6plMxhkBC3yz0Jd5Gv4nqmUjqQC71IQyS0F3lDAE
-            1R7Sgt4kry8jJESxlrYkkwBZz8k1adxq0XUrnnNYxIAIaIrtXegqmVe46qUkzEgZ2ysHcAX0Lmqf
-            A8ISObGJCNrRIrEFwHNQxTeL6jOrAJAXzj+mLmO+qMdiNdmJLIKnFK01BlH8j1RS9RvH1FnkiAKa
-            gAS1OwOiKqFVkEpxjliJBg9HIb4IpSgqraKD5wRaHqX1kKaBOsFiwVlwRG6NuoGgHh3phzwdPzXz
-            g+xDAnT5J16EHYdFbCCFtk8diBZWpECnIMFdUAQtNBGFbtTKrEK362Z7FU3ZdXQ0c/amUzANVvqz
-            mXXVlnGYxIlViKagiqGwybZN0HMQYuI6RAP9vXqqGZGdjj5CONA3u8jG4ijERo/Y6xXU2ZivXLN2
-            HJj9P0wbgD9WldQ5PeqLLuZL1cyeh42T/GAR5LYuQd/LoO1c6yyc69ZDxOWTkjbIkz2egDNUbo7N
-            eBL68HS/dWSMoFiJvcXfubos/tz1Mntz1N+PkiWMGIc0ELgPLs1O5Z3TJmtTJfizzeQiGu8xAej1
-            FO8JLVK7UNXqieQS39MGZYlhb8lVGPuU+LX5lccxOHIDI+m8YippQt2VTOufqM6RHqC+mcRAk4Ym
-            JqzufmpHQLXSRDljjZntiBGREQ4BPcmVZG8W+pX+5M8hjjeJo0avLvKbwxkbwhZJ6sxJ4MKUJFSQ
-            W0JU8fUniiYp273EGRL0kfKzP0UssAdZKoZ4GNbgCd3ANE7rksdGJLMSCZeaRLt3tVFVCqElI3sA
-            dCXYODqT/GqnYKRTKVgDkyixFrEAkmm6eJHSkpnOZjMRqTUk0cbgEtVMkWJFYzY4UNK1s/OjJvFs
-            bwbFJgwjGLaAy0rozBHIynqUwyRHkMRZKokdpA/yTtDur6hzTjAgA3RhCLACgDEN80KKfxYa1kpl
-            yIGHlibtccox2JZWeLkdUclN8RjcxMgPKY9W3rtRPGR4yA5cbOYGLu5IJLjTTbZTxYVVinPAi25i
-            aaGjb/OoRVQ+JXORjlEWYs5fQnV27k6ypGSwZpznK0FrdgAdG8FYki5JEiIiAu8rEmTjTbaqjAxY
-            5JmEhCgJqaO1EYG8VORfUAMQKWAP5abk6owHxF9QvQUl1NfMWNOxTxD4gGSImRGpFZO48UYDDjJW
-            MkWcvSj0Nenimhh8RHxk5DJ2jChDFiaxe7Z9UXOIHXY8ONHC+b/gfYBgFYkQYAp0mEbuViIMFbVE
-            CrCBCtrgDCFr1yIwrZoyU3AVu19Si/QSRXT0LJh2spnUroUeDnXUtkxyIjJpMHD9E1jHdS4NeGUp
-            WFtX8x66t2KqyMt1EnTxy/8AjYgwIJn3uIx6grI1+p/YyNZZsx8qIhG24aWvFgDsN6Kp0yZ7Ulno
-            OLkHoREjW2Nm7XW/FnXOus4Odsrkbh5Cc0ZAgyiTfFtaMjsX6YK7rBsyTJy5Lbg8yDVyOvTtVFVh
-            FCULJ0IcmUIxnWyZYM1G1J/u8VQ6TgyvXJqGU+UxJcx0qQ2taaKp1KXQ1nLI8iJlkHpyiDKMdCBA
-            t+Cp8cfUp8V49O4kcsZ4ckzI1Y494lrnYBvimayhnVppBwci+RF7E4+jirUJUtTH3BakL7meXLNw
-            lKQujIPEsXAqdDVk6oWrWNDlEwIDEXeQnUgvoSg6C21ZK5ZTLyScyJLSqNemr6J1UZKB8OacpxnM
-            /wBzzFAGizdqFqwsAtRJQiqUwJG6jg3fB9kYHSKzmgLyKkfTWj9B4J/FjKgpzziasxcs5DbV3qp4
-            oPghRlmZkSkSXLxJNB/0+G4RaQfFQJlm0osDKESDOIAMi9SdDojVSh61Kp8iQkZPazmMhVmPQ6p1
-            UdURVkyS9W6JMjBiWqTLvZkyrgeqUCyMpeQ0BJid6do/UmRPqTJOV0TE1kI3OHFY7u3RCqQUjLjM
-            owk5LEvdoxqKb7K1pNlzBK8fTMi/zASLs9U2PQiB6k4GdwJmGcu8m2IPgpCYYTBPLMMC5YU7pDoU
-            VUiqUiUwL2JuAaXXuqE0IshdCs0kZGTVcAV/IphkJIsDObjYSJLkHrXbZGOw69EAZIiOSbAm1hdW
-            rjRFrKRImEQGFpDFx9RJL9T8lGSARl+mUSIyAZtX1qi0FoSRmYi94gkxJ0cPSqZQMo7FLWEiLvQA
-            F2pXVN1H6iZTaDK9wB5onXRNUaqk8dEUXzWqPrgwFNU6QRu5WR6ECAnSIMrCBVpAhW1cCsIWmmBW
-            FbdLyU3RFtoU2EO66OrCRj2dWUyGveukmc+y9BQw3ZqsrDJaqkvxZTHQhmo+2qrsjJspJtxTHowM
-            i105GhbaOioa/UzNZZNuHLKl2lzAdDTvejKm1Si1Du8DkRHGGIxOSwRu1fWLGnR1z9lMyc/bTMlv
-            Dk+SEYUE38xIIfUkv0Q2dCnZXGTTPk5ZZcryct/9LVVaooRStahGrj5gAIyIalxFGIclVXqVXr3N
-            eKV4gXaYFpnEmmjU6KqygosoNgyH1ccakCIsOuke89FS1ifqUQobCZE45wI80rAYjQRtLkg6bIRk
-            kExyjCVbibCKihqDVi1BspbKI02UeqSbYiruIlqF2rurIgfxCM7m2NvmLyakXf8AuBqo6k8fUEOS
-            0ZCRLA+UuQQ+zdQo6SF0DGc4ZJGAEQQWen6amqDSjIPFNAvySJrGOzdSRsEYRISKxOBkQfKCD2yD
-            agItDw0KZnSExdHzkW1IJa2p1TJeoUvoCGWLiUXe02gVZ/hVR1I69ikZs05nzgkR8xNAKMx71Z4p
-            Is8EkVjklzEsTqRowoGA3R8BvAEsmSNItKca2O4AG9AxUSTGVUxTyMhiBIA29oJatS2/Ym8EFURM
-            kmEJH6qEk7i2joVXUiXUzzyg0veIdiQWAO7hnVqqWKpSDWUIk+bzRkA5dqpvqWRgb1YyAuNQ8rhQ
-            1G1dlPEXxhiXyEKkEEEXEG4s7ih7dEYyNBXcDG2JeAam1a0CdIfxZUJAwiRO6Iqf1dhPVk0DtQ+h
-            XdKUwYnza9AabAI9BoSRCWGRsgrFpRZwfNt3IrsRLpgSWZ8hjGVQXIA2RVcDKuBpMROUpPGJ66Hb
-            56IARXIx9S0mTjzMd2Z2Z0yGSwLMwYNrsH0r2aURSCkJOROPJLUBi4NX0qiusDpdDyXmADAns3Xz
-            PJ9YkaJJYsfHVW1CnI1U+QjB1YpIFWIgap1JAq+uRWFaaL1FYVu1lNiLVRspshJLo6WjJtRWdDut
-            6ZiawIwCvTMlq5RGf6fq8BoOqhRZJGzHkfDj/ueVSewUVLWWY71yy/BmIBLAeYvFw7GnwSWrJVeh
-            6Dj5mwhybWiTMVkD5W73XOvU51qSxOFmxnNjneBIUlJ6EEaM7aI7KuCbKOHg6GTODkmHAaXmehD9
-            m1VRWuDJWmC7HOQEQav+rSoPYyRordTXgzNjIEiCQ7EaEKq1clN65NmPNGE8ZAa6ES7/AE+Wo10q
-            qXWU/wASh1mfxGxZoelKYFpLAPUt5upQdcwLajmCGZxxmZVvjTV3pXVSJDElcMoiZMWIDgEk0NXp
-            0OyZ1GaFOeEMcxQRL0BqddBTqj4yw+DbQseQRMTDM30kjzMaDsRdew3tyoLceYRyG3JESeR6xZqh
-            LauOgjpjoKc0qvMOAzO511ruyKqF0KfWxGIMpj+5gd+6m5YpocjrW+yElycABY2lmlHYkUBc96bw
-            Y3t2IMkm8hFkgSQ51AYdNVII0hYzEbpeWUQxmS8QIyoQyPUZoRwQIGkyfNIfT2B9NEQw+ok5444x
-            HzABxKJBBB2/BMk5Ck5F9WMhERoaC7Ste7ZN4jeJPWjCMAPLBwHBOrHqEPGSKjllU5CQg3Xw76bp
-            0OlBTGQjK4O+jl31TMfIZZwZNkDCAJD0Pm7AoqgVPQrlk8sgC9xa2gahdgmSHVegs8sIxBlGNoFD
-            V3FQ2qPjLCqtlGTPivixe4gksxLDsbuT1qy2tHBMnIxkmBMXiHDSbUbIqj6gVH1EjPHGNol9USO8
-            A7OpDY7TYMmXy1kCNAIFte6qatQ1qVxyQMRE1J0joHA7+uiLTGayE8jKXjI1ciUKufDwU8UDwXUQ
-            yzlxGJiQKzIbv+CKgaEK5EDKQJizaEmh1HzU7hjJ/9k="/>
-<saf:endOfStream ref="img2"/>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"
-           xml:lang="us" xml:space="preserve"
-           width="100%" height="100%" viewBox="0 0 176 208">
-
-         <image x="10" y="10" width="120" height="150" xlink:href="stream:img1">
-            <animate attributeName="xlink:href" dur="4" repeatCount="indefinite" values="stream:img2;stream:img1"/>
-         </image>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefstreamid2.xml Deleted

@@ -1,746 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:imageHeader objectTypeIndication='109' streamID='Stream1'/>
-<saf:imageUnit ref='Stream1' source='data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4ADkFkb2JlAGTAAAAAAf/b
-AIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxsc
-Hx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f
-Hx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBkAGQAwERAAIRAQMRAf/EAIIAAAIDAQEBAQEAAAAAAAAA
-AAECAAMEBQYHCAkBAQAAAAAAAAAAAAAAAAAAAAAQAAIBAgMEBQkFBwIHAQAAAAABAhEDIQQFMRJV
-BkGT1AcYUWGyc9M0tHU3cSJyEwiBkbHBMlKSIyTwoUIzFBVHRREBAAAAAAAAAAAAAAAAAAAAAP/a
-AAwDAQACEQMRAD8AzW/1ac/S5XyOr/8AqtJ/PzWezuUnD8vM7ihlbOUuRa/161bzUq49C/aGVfrB
-7w3/APk6R1eZ7QAfGB3h8J0jq8z2gCeMDvD4VpHV5ntADeL/ALw+FaR1eZ7QAV+r7vC6dK0jq8z7
-cA+L3vC4TpPV5n24B8XneDwrSerzPtwCv1d94HCtJ6vM+3APi57wOFaT1eZ9uAV+rnvA4VpPV5n2
-4DeLjn/hWk9XmfbgHxb8/wDCtJ6vM+3Ani25/wCFaT1eZ9uAfFrz/wAK0nq8z7cCeLTn/hek9Xmf
-bgFfqz5/4XpXV5n24B8WXP8AwvSv8Mz7cCeLLn/helf4Zn24E8WXP/C9K6vM+3Aniz5/4VpXV5n2
-4E8WXP8AwrSurzPtwD4sefuF6V1eZ9uBPFjz9wvSurzPtwD4sOfeF6V1eZ9uAV+q/n3heldXmfbg
-Ffqu594XpXV5n24B8VvPvC9L6vM+3Anis594XpfV5j24DeKvnvhel9XmPbAHxVc98M0v/DMe2Ani
-q574Xpf+GY9sA3ip574ZpfV5j2wAX6qOe+GaX/hmPbAHxUc98M0vq8x7YCeKjnvhml9XmPbAB/qp
-574ZpfV5j2wA8VXPfC9L/wAMx7YAP9VfPfC9L6vMe2AV/qt594XpXV5n24Af6rufeF6V1eZ9uAH+
-q/n3heldXmfbgL4sefuF6V1eZ9uBPFlz9wvSurzPtwB4suf+F6V1eZ9uAPFnz/wvSurzPtwJ4tOf
-+F6T1eZ9uAPFrz/wvSerzPtwB4tef+FaT1eZ9uBj1T9YPeHlLEblvSdIblLdalbzNNjfRmPMB8bs
-fTzR/m+q/DaaBzUAyAgDIBkAUAyxAZAMgGSAKXSAyAIDAFIAgECUAIEoAaAQAgGgDJAMkAUgGSAN
-ACkAyQBoAUgDQCUAVrABWAjxAWW0BWArQCtALQAMAUADAAAA5XMPucPWL0ZAdOz9PdH+b6r8LpoH
-NQBqAUAyAZAFAMsAGQDIBkwGXkAZAGgDUAKAKQEoAUAQIAaAFICUAKQDJAMAUsAGSAZIAgFIBqAH
-dAlGAAAAlAFYCPaAr2gKwAwFYCsCAKAGgAwOVzD7nD1i9GQHTs/T3R/m+q/C6aBzUAQCgGAIBQDr
-YAy2IBgGXQAwDIBkAQGQBAIEoAUAaASgBAKAKQBiA1AGSxAagDJAGgBWwBqARVAIAYCvaAgCS2AJ
-IBWArADAVgAAMAABgADk8xe6Q9YvRkB07P090f5vqvwumgc1AEAoAgFAMgGQDJoBkA6YDIBkAyQD
-JAMkAUAaAGgEoAQJQA0AKVAGSAiAsWwApAMkAyQBowDQAraA1AA0AskAstoCMBJALLEBWgFYCtAA
-BWAGgAAGAAOTzF7pD1i9GQHTs/T3R/m+q/C6aBzQIgGAKAKAZAMAyQDIBo7QHQDpAMgCgGQDUANA
-CAaASgBoBKANEAgFLABorAB6AFIBkgGSAZbAIAaABoBZAK1iAjArYCsBWArQAYCgCgAADAFAAwOT
-zEv9nb9YvRkB0bP090j5vqvw2mgc1AFAEBkAUAyAYBkAyAZAOtgDgMtoDoAgMlUAgFbACgJQA0AK
-SANPIAyiAUsAGUQHSYDIBqMAqoDAGgEoAGkAkgEe0BGAjWACMBWAGArAUCMBWAAAwAByuY/c7frF
-6MgOhZ+nmkfN9V+G00DmoAoAgMgCgGWwBgGWwBogMgHWwBwGAeIDIBkgDugNQCJAGgEoAyQDJARR
-AaKqA9AG3asBkAyANKgMlRAHdAlAFYCSQFckAjAR7AFYCtAAAMBWArADQAAVgADlcx+52/WL0WB0
-LP080j5vqvw2mgc1AEAoBkBAGTAaoDIB0wGjtAdbAHQDxAdIBgGAKxAagBSANAJQApAMgCgGigGS
-AdLEB0gGUQCogMkAaLyABrABHsASQFcgK2ArQCMAMBWAGgFoAAAwFaAFAAwOTzH7nb9YvRkB0LP0
-80j5vqvw2mgc1AEAoAgFAMgGW0Bk8QGW0B4gOtgD+QB0A6AdIBkgGSQDIApASgEoAyQDIBqMBooB
-kgHSxAajAaKdAGSYBpQA0QCtAJJAJJAVPaAjAVgJQANAK0AGAoCsAMAAKwAByeY/c7frF6MgOhZ+
-nmkfN9V+G00DmoAgEAoAoBkAQHQDLaAy2gWRAfyAOtoFkQHiAyQDRAZIApAGgEowGSAZIApMBlsQ
-DqIDpYgOogMogFRYDboB3WAjW0CuQFcgK5AVsBXtAVgKwAwFYCgBgBgKwAAGByOZPc7frF6MgOhZ
-+nmkfN9V+G00DmAFAMBAGAZAFAN0IB4gNHaA6AsQFkQLIgOtgDpbAGSxAKAZKoBoAQCkAUgHWwBo
-pAOkgHSVQHSQDJYAMooApICMCt4qqArkBVJAJLaBWwFewBQFYAYCsBQAwFaAAAYAA5HMvudv1i9F
-gb7P080j5vqvw2mgcwAoBgIgGQDIAgMAyYDxAdbALEBZECyIDxAsXQA6WIBSoAyQBoAQGQDUAZLp
-AMUBYkBYkAyQDJYAPQCUAEl5gK5ICqSAqkBXJYgIwFawAWgCtAK0AGgFoAtAAwAwFaAAHI5l9zt+
-sXosDfZ+nmkfN9V+G00DmAFAMBEAyAZAFMAraA62gPEBk8ALIgWR2gWxAsigLEtgDxWADRjUBt1g
-FJ0AZIAtANFOgDJMB4pgOogWJAOogMogNugRp0AWQFUgKpAVSArkAjAVrABaAK9gCsAMBWAoAaAD
-QCsAMDj8y+52/WL0WBvs/TzSPm+q/DaaBzACgCAUAyAIBQDR2gOtoDLaA62AOgLYgWxAtiBYugCy
-IDxAZKoBSQB3QGSAZIBlHEB4xAsjECxRxAeMQHUQGUQA4gVSAqkBTNAVyArltARgK9oCsBWArADA
-VgKwAwFADADA4/M3udv1i9FgbrP080f5vqvw2mgcwAoA0AKAZAEAoBkA0WA6AdbAHQFkWBdEC2IF
-sQLIoCxLABkgGoAVEBt0BlEB4oB4xAsjECxRxAdRAdRAagCyQFM0BTNAUyQFcgEaxARoBKABoBWg
-FaAWQCsAMBWAoCsAMDj8ze5W/WL0WBus/TzR/m+q/DaaBzACgGAiAZAEAoBkAUA8QLFsAeIFi2gW
-xYF0EBdFAWxQDxTAsSYDUAZLEA0YDxQDxiBZGIFkYgWKFQHUQHUQJugJNAUzQFEgKpICqSAR7QFa
-ARroAVqgCsBWArVQFaAVoBXtAFAFYAaA43M3uVv1i9GQG6z9PNH+b6r8NpoHMAKAYCIBkAQCgGQB
-QDxAdbALIgWLaBbEC6AF0QLoAWxAsSAfdAKiAd0B1ECyMQLIxAtjEC2MQHjAB9ygAcQKpxwAzzAo
-mBVKoFckAjjiAj8wCtYALIBGArADAQBWArADAUBQOPzN7lb9YvRkBstfTzR/m+rfDaaBzUAUAQCg
-GQBAZAFAFAPEBlsAsQFkQLogXQAvh0AXwQFsQLUkA6jiA26A0Y4gPGIFkYAWQiBbGIFsYgPGCAfd
-AWcQKJgZ5pgUTAqkgK5IBGkAjQCtYAJJIBGAHsAR4gK9gCyAVrABWmArAVgcfmb3K36xejIDZa+n
-mj/N9W+G00DmoAoAgFAMgGQBWABQBW0BwGWwCxAWReIFsWBdADRDoA0QAvigLYoCxIB1EAqIFkYg
-WRiBbbh5gLowAtjACyMAC4+YCu5EDNcQGe4gKJICqSASSARrEBGBXIBZIBXgAjWACtAI/IArAVgK
-ArVWAjA4/M3uVv1i9GQGy19PNH+b6t8NpoHNQBqAUAUAyAYBgCkAUgGQDLYBYgHW0C2IF8ANFvoA
-02wNMNgF0IgWqIDqIDKIFkYAWxgBbbgwL4wYFkYMC2MGBHDzAUXVQDJcAzXEwKZJgVyTASQFbTAR
-gI1gAkkBXJAK1gAkgFkgEYCvaArAVgLIDjcze5W/WL0ZAbLX080f5vq3w2mgc1AQBkAUAyAYBkAU
-AyAKAdbAHQDraBbEC+AGi30AabYGq3EDTCIFsYgWRgA6gBZGGOwC6MKsC6FvBAXxtgWxtgWK2As4
-UAy3Y7QMdyKAz3IgVSiBVKIFcogJJAVuICSWACSQFckAr2MBJAIwK2AHsARgKwFYHG5n9zt+sXos
-DZa+nmj/ADfVvhtNA5gBQDIApgMgCmAyAZbEAyAZIBkA6AsisQLIgXwA0W+gDVaA2WlgBqtxA0Ri
-BZGDAdQAsjBAX27YF9u2BfG1gBdGAD/l4AVXY0AxXUsQMdyIFE0BVJAVSiBXKIFcogVNAI0AkkBX
-JAVy6QEkAjVAEYCsBGgFYAYHF5n9zt+sXosDXb+nmj/N9W+G00DmIBkAagFbQGqAQHTAZAMgHiAy
-2AOgLI7QHiBfADRb6ANVoDbZA22ogaYQAvjACxWwLIW8QNFu2BohbA0Qt4AXQteYBnbogMl+O0DD
-ejtAxzQFE44gVSiBVKIFUkBXJAVSiBXJYAVyQFcgK5LaAkkAkgK2AvQArAVoBGBxuZ/c7frF6LA1
-2/p7o3zfVvhtNA5gBTAKAZAMgCAy2gOgGQDxAZbAHQFi2gWRQF0AL7YGu0BtsAdCyqgbbUFUDTG2
-BarQFkLOIGm3ZA027LoBphZAvjZAWdqkagc/MRAwXYgZZwQFE4AUyiBVKIFUogUyQFUkwKpoCqQF
-cgK30gVyASQCeUBHsAVgL0gJ0MDjcze52/WL0WBrh9PdH+b6t8NpoHLQBQDJgEBogMmAyAaO0B1t
-AeIDrYA6AsiBZFAWxAvh0AarIG6wB07CrQDo2YbANdu0BfGyBbCziBqs2gNdqxgsOgDTDL4bAL1Y
-w2AZ8xbogOZmY4gYLsKsDNOGAFFyIFE49HSBROIFMogUyVAKZgUyApknUCuQFcukCuQCSArYCgKw
-E6QFA43M/udv1i9FgaofT3Rvm+rfDaaBzEAUwCAyAKAZAPFgMtoDLaBZEB1sAsQDraBbEC2IF1sD
-XaA25cDqZXoA62XhUDoWbeGwDTCzhsAvhYx2AbLFh1/5AbLWWwWHQBqt5ZgXSy7SA52bt0qBycxD
-7wGGdutQM9y2BnuQAzTggKJxAomgM9xAUSApkgKZpVArkgKpAVyASSARgI8AFYCMBWBxuZ/c7frF
-6LA1Q+nujfN9W+G00DloA1AKYDJgFMB0A0QGTAdbQHiwHTwAsiBbFAWxQFsUBdADVaA25cDq5ToA
-7eTi3iB18vZbVQNtvLtrYBot5bHYBuy+VfkA32co91YdAGu1lH0oA38vuxYHFztvb5wORetOrAx3
-LW0DLctAZbkAM1yAGW4gMtxAZ57QKJoCmeCApkgKpAVyW0CqQCSYCtAVvYArASQAYHF5m9zt+sXo
-sDTH6e6N831b4bTQOWAUAUAwBTAdPEAp4AOmA6AeIFi2AWRAtiBbEC2AF8OgDTbA22AOrlNqA7+Q
-VaAegyVrBL9oHUtZb7taAarWVowOllspswA6NjI1Sw6ANtrIUWwDLnsvSOwDzmdsurA5d6ztwAxX
-bO0DHdtAY7kMAMd2OLAxXVgwMtxAZrgGeYFMwKZAVSArfSBVIBHtAVgI9gCSAR7QFA43M/udv1i9
-FgaY/TzRvm+rfDaaBykAUwCAyAKYDJgMgHrggGiwLIsB47ALIgWxYF0QL4AXw6ANNtAbbKA6mU2o
-D0GnqrX2ger022pJAegy2Tb6OgDfayOOwDrZPT3hgB1ctpcmk1HBYN+dgb//AFM42VNx+606P7MA
-OBqmX3ar7QPNZzKqVaqvSgObey9K4Ac+9YpXADBetIDnX4LowAwXliwMN5YAY7gGaaxAzzAplsAo
-kBVICuXSBXIBJAVtgI9gCMBJAK2BxuZfc7frF6LA1L6eaN831b4bTQOSAagMmAagFAMgGTAZPoAd
-APFgWRYFkWBbEC6DA0QA0W8aAaraA12QOnlP6kB6HTabyA9posN5xA9pp+T3orD9oHby+lOTj93F
-16Hgl+wD0GlaRGCU7kFVbdvSB1LOXt27cIKKSS8nl2/vAtccGvKB5HXslu35pRpHo+ym394Hmc1k
-/MByszladAHKzNilQOTmoJJgcnMraBzbyxYGG8sGBjuIDNcAzzAomBTNAUyArl0gVyYFcmBW2BXI
-BGwEbxARsDkcxuuTt+sXosDX/wDPdG+b6t8NpoHIAKAYApgFMBkwGTAaO0BltAeLAdbALYgWwkBf
-CQF8JVA02mBrtYgbLKA6OWwaA72mSo0B7zQMXH9gH1LlvTlfimpbtPIq084HrLWUtW93BOUa/ee3
-EC9JAECAYtQyMMyo/wB0cE15HUDzGe02UG1KNGuhgcHO5XdrgB5/O26VA8/nI7QOPmViBzb6xAwX
-tjAx3EBludIGaYFUgKJvECmbQFMpAVSkBXJoCtyArcgEk8QFcsQEcgOTzF7pb9YvRYGv/wCeaN83
-1b4bTQOQgCAyAIBQBQDIBltAdbQGjIB4yAsUgLYyAuhIC+3IDTaligN1mQG2yB0cv0AdvT396IHu
-uXLlZR8wH2vlCP8Asd6lehSx2baLyYsD0AEAgEAgGbO5SGYtNPBpVTQHi9XsK3KcaYoDyGoRxYHn
-c7GjbA42ZA5l7awOfe6QMdwDJdYGa5LaBnnLADPOWIFMpYgVSkBVKQFTkBW5AI5AK5AI5AK5Acnm
-F/7WHrF6MgNr+nmjfN9W+G00DjoApgGrAKYDJgGoDVQBToA6eADRAdPAB0wLIsC6DAuhMDTaliBs
-s3AN+XubKgdLLzToB2sjcpJAey5fv7s44gfdeSrynp7VV5UummzygejAgEAgEAgHkOYbdL0vOqpL
-YvMB4fUoYsDzedjtA4uaW2oHLvtVYHMzElUDDdn5wMd6YGW5c84Ga5MCiUgKZSArlICqUgK5MBGw
-EbdAEkwFdfKArb8oHL5gxykPWL0WBtl9PNF+b6t8NpoHHqAUwJUBkwDUApgMmgCmgGTAZSAdSwAZ
-MCyMgLYyAtjIC+3MDXaugbbN1AdLL3lhQDsZO/RoD1eiZtK5F1A+393GoKSlYrXejh9qxA94gCBA
-IBAIB5jmK3Sc6v72DWG1AeC1SUU3jiB5fP3kq4gefzmYTriBx8xfVdoHNv3toGG9d84GS7dqBluX
-NuIFE7gFMpgVSmBVKQFcpAI5YgK2AlQEbAVyVHXGoAcgOXrzrlbfrF/Bgbp/TzRfm+rfC6aBxgCg
-DUA7wBUgCpAFMAqQDKQDKQDKQDqQDKQFkbgFsbgFsbuKAvt3UBrtX8AN+XzGwDqZbNAd7TNQcZLE
-D6pyLzLbymYt3Z3IwjHbKVKeTpA+2abrGm6jbc8lmbeYUf6lbkpNfakBuAgEAgAbSTbwS2sDw3Mu
-tW5XJbv9Kql/xQD55qmp70pYgeXz+dbbowOFmc030gcvMX2BgvXgMly4BmuTAzzuAUymgKpSArcg
-K3IBJSARyxARyAXeAVtAK3gAtcAObrnu1v8AGv4MDdc+nmi/N9W+G00DjJgGoEANQCmBKsBqsCJs
-Bk2AU2A1WAykAVIB4yAdTAsjNgWQuOoF8LzQGyzmHgB0stfk6UYE1DmaOmRptuPoA89qHPmt5n7l
-u9K1b8kdoFWk86czaZmFmMhqeZy19Yq5auyi8PsYH1vkL9TfP+l3lZ1TMLWsrJ/ejm/64p7d25Gk
-v31A/W3LHMmmcx6NltW064p2MxFScU6uEqYwl50wOtUBbl23ag53JKMVtbA8fzLzVYUZWrFxflra
-1g2B821bXVNy+9WvnA8nntUTbxA4eaz6fnA5eYzXnAwXsxXpAx3L4Ga5eAondqBTO4BTKbASUgKn
-IBHMBXIBHJgK5MANsBW2ArbADbA5utv/AG9v8a/gwN936eaL831b4bTQOMBKgQA1ANQJUAp4gH9o
-EqAyYBUgDvAMmA0ZAOp1AeMwLI3EA6uoC23mN17QNkNXt5e27knilgB5bUc/czmZldm612AZ6gPG
-tUBuyEMzdvKzZVZTdEvKB+zP0raHrWm8l5y/qKlCzm8wnlLcv7YJqUkvO2B3uf8AvL1Tl7V7uQhG
-EIqMZ2p0q3GS24gfN9T72dTzTbuXm69FQPOZvnq/dbcrm0Dk5jmec3jMDnXdccq/eAx3NUb6QMt3
-UK9IGeecqBRPM+cCmeY84FUr3nAR3fOBW7q8oCSuAI5+cBXNAK5gK54ALvAByADkArYEqBz9Zf8A
-t4fjX8GB0Lv080X5vq3wumgcSoBQBqBKgSoBTAlQIgDVAGqAK2gGqAKaAKkAykAd8Aq55wG/MAP5
-r8oGHOZhylup4LagMlQGjtAtiwPYd2mQyuf5lytnMXFbjKSUZPy1A/oJy7p9jT9CyOSspfl2bMIx
-ps2VA+S/qV0yNvStN1yOFyE3lLz8sZJzh+5qX7wPzbe1Jtv7wGWeoS/uAqln5eUCt56QCvOY7QF/
-8t02gK8z5wEeYT6QFd5eUBXdXlAV3QFdzEAO4AruABzQC74AcgBvAByAG8gBvARyQGDV3XLw/Gv4
-MDp3vp5ovzfVvhtNA4gEAgBQEAgBAIEAIEqAUwJUCbwDbwEUgDvMA7wAnKkW/IBzpybk2AACmBYp
-AdnlfNTy+tZS9FtOFyLw+0D+ivJl+9e5T0q9fTVy5loSkntxWH/ID5V+qjmHK5XlLIaNvJ5vO5n8
-9R/6o27MZLe/bKdAPyldzDbdGBU77AV3wA7zAH5wA/OYAd1gD85gT8wAfmAT8wAO4wJ+YAN8AOYA
-3gI5ADeADkwJvMCbwAcgMWqOuXj+NfwYHUvfTzRPm+rfC6aBxAImAagQCAGoEqBKgQA1AlQCmBKg
-SoBTANQDUCVYC3G9xgYAIAyAaKxA+5/pr7q7HNHMcdS1OG9p2QX5zh/fJOkYtgfrbnDnLl3kzQp6
-jql6NmxbjuZfLxpv3JJfdhbiB+Je8XvA1LnTmTMavnaQ3/uZfLp/dtWY/wBEF9nT5WB5KU9oFbmA
-u+wB+YAN8Cb4E3wI5sAbzAO8AN5gTeYE3wI5gDeAm8BN4AbwE3gJvARsAVAyak/9CP4v5MDrX/p5
-onzfVvhdNA4gEAgEqAVJrYwIBAIBKgGoEAIEqAQIBKgHeYEqBNqaAyXbUovDFALGEpNJJtvoA9Fk
-+S8/cy0M3mJxsWJ+V1dP5AWZvl/TrNY2b7uSX/VWoH0Xu774NS5C0+5ltLswuTuqk3dVVhigPMc5
-8+8w83arLUNazUr91qluGyFuP9tuKwigPMynj/x0gJv+cAb/AJwA5ADe84A3gBvATeAm8BN4CbwE
-3gJvATe84A3gCpecCV84EqBK+cCV84Er5wJXzgRsDJqL/wBGP4v5Adi/9PNE+b6v8NpoHDQBAgEA
-gEAlQJUAoCASoEqAQDUCVAiAIEAKAaibxQFltRTrRVQG96jmrsYwuXZShHZFvBfsAH57ASdyoFbk
-AHIBXIBd4COQA3gA5ADeAm8BN4CbwE3gCpASoAqBKgSoBqBN4AbwE3gJvAGoE3qAZc+62o/i/kB2
-r/090T5vq/w2mAcICAQCAQCAGoEqAQIBAIgDUCVAgBQEqAQCmAU8QLIsB1JgNvgHfYC7wE3gA2wA
-AAIAGwJUCVAG9QCbwBqBKgSoA3gDUAMA1AlQJUCVAlQJUCVAz51/6UfxfyA6NzP5WfJul5CM65vL
-ajqN+7bpst37GRhbdfPKxP8AcByqgSoBqBKgQCAQCAGoEqBKgQAgQCVAlQCAagRMBkwGTAZMA1AO
-8BP2gCoEqBKgCoEAFQJUCVAgAANQJUCVAABqBKgSoEqBKgSoEqBKgSoGfO/9uP4v5ALb93j+OX8I
-gQCAQCASoEqAagQCAQCAECVAlQImAQJUAgQApgMmAQCmukCAGqAGAEAgBqBKgAAVAlQJUCVAlQJU
-CVAlQJUCVAlQJUCVAlQJUCVAKAozj/04/b/IBLfu8fxy/hECIAgQCAQCAQCAQAgAAgQCAQCAEAgR
-AMgJUBqgSoEr5wDUCVAlQJUCVAlQJUCABgQCAQCAQCAQCAQCARgECAQCVAozf9C+3+QC2/do/jl/
-CIEAgEAlQJUCVAIEAgEAgEAgBqBKgQCAGoBAlQCAagSoEANQJUCVAIEQEYEAgEAgAqBKgSoEqBKg
-SoEqBKgSoEqBKgECAQCnNv7i+3+QCwkv/HjCuycm8PKo+fzAQCAQCAQCASoEqBKgECAQCAQCAGoE
-AgBqBADUA1AgEqAagQCAGoEqBKgSoEqBKgSoAAgEAgEAgEAgEAgEANQJUCVAozL3oJ9G9h+4D9Be
-DTvGeUt5dapoilC5O47yuZzfkpxglGVbFN2G5VYV+869ACeC7vI4xo/WZrs4B8F3eRxjR+szXZwJ
-4Le8jjGj9ZmuzgTwW95HGNH6zNdnAngu7yOMaP1ma7OBPBd3kcY0frM12cCeC7vH4xo/WZrs4E8F
-3ePxjR+szXZwJ4Lu8fjGj9ZmuzgHwX94/GNH6zNdnAngv7x+MaP1ma7OAPBf3kcY0frM12cA+C/v
-I4xo/WZrs4E8F/ePxjR+szXZwJ4L+8fjGj9ZmuzgTwX94/GNH6zNdnAngv7yOMaP1ma7OBPBh3j8
-Y0frM12cA+DDvH4xo/WZrs4E8GHePxjR+szXZwJ4MO8fjGj9ZmuzgTwY95HGNH6zNdnAngx7yOMa
-P1ma7OBPBl3j8Y0frM12cA+DLvH4xo/WZrs4E8GXePxjR+szXZwD4Mu8fjGj9ZmuzgTwZd4/GNH6
-zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cCeDLvH4xo/WZrs4B8GXePxjR+szXZwB4Mu8fjGj9Zm
-uzgHwZd4/GNH6zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cA+DLvH4xo/WZrs4A8GXePxjR+szXZ
-wJ4Mu8fjGj9ZmuzgTwZd4/GNH6zNdnAngy7x+MaP1ma7OBPBl3j8Y0frM12cA+DLvH4xo/WZrs4A
-8GXePxjR+szXZwJ4Mu8fjGj9ZmuzgHwZd4/GNH6zNdnAngy7x+MaP1ma7OAPBl3j8Y0frM12cBL3
-6L+8icUlrGjqjrjczXZwP//Z'/>
-<saf:endOfStream ref='Stream1'/>
-<saf:imageHeader objectTypeIndication='109' streamID='Stream2'/>
-<saf:imageUnit ref='Stream2' source='data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPAAA/+4ADkFkb2JlAGTAAAAAAf/b
-AIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoKDBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxsc
-Hx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f
-Hx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBkAGQAwERAAIRAQMRAf/EAKsAAAIDAQEBAQAAAAAAAAAA
-AAECAAMEBQYHCAEAAgMBAQEBAAAAAAAAAAAAAQIAAwQFBgcIEAABAwMDAQYEBAYBBAEDBQABABEC
-IRIDMUEEUWFxgSITBZGhMgaxwUIU8NHhUiMH8WIzFQgkcoIWokNTgxgRAAICAgEDAwIFAwIFBAMB
-AAABEQIhAwQxQRJREwVhgXGRIhQG8KGxwTLRQiMzFVJicoLxJAcW/9oADAMBAAIRAxEAPwD842Rt
-YBn2XShHXhBEYA0AZkySGhDCGPoEVVBSRBHH0DI+KJ4oYQgBoE3igwg2Y3ZkfFB8UNGMTsmSQySG
-tDBwmgMDAR6BMoCG0NpRN4hgZqpghCYIYgIpEHiQaKyuQotDM3YtlYiPoQg2UqEIVyAN0VnoQgVl
-F/kDCjRZRGRPHQAVdrWRbdAKa1kjCrq9PuIyJ0l5AnBFVHYYiL6IiIndUCSI+KBJE3igSyIuiIrE
-UVSSRRJEImdUCSKKqSgksifxUSLLIlSnDC2RMAiKqiSRCtVJGyKVqiNsiPglgEsiCplBbIiqrqCS
-JlRInkyJlVCtkTJdwSBTxRJZFGkkSckTOq7glnEjoK11K+V1LUGLs2zfmmQyCNddKUUQUFgUyQRg
-BTsTBGb4JghGpCKCh+icYiJAowENUSB7EwRhp0ToI0VZQhdt4Lcun2IQAKVqghCsSAFWxMACFZrQ
-GRGnVEZFZGEAKu1/7vzEt0IjSv6pI3gitSxn1FnJFZWmYEbwRIqjSRN4YQPIiZfUDIoliURkTVr3
-A2RTxJJEfH6AkiiUsjeCJvFklESpYCyKx9BF1IlVfQMkRgkkRABGPoCQoJBAmS9ANkKlVkjeCJow
-CSVRVSeRFIBJN00YBOSIWTkK6ETOoskCFshRxAHiD0XylLBoQ8QWKaqGROqIRqgVOqISAeKKIhnG
-qYIQ+iKCh9g6sGINAyhBn/qnkJEYCEIog4AZWJBHGjbq5BLB+S2VWPsAO6CWQhCtqAKugBFZSRWR
-NrWUBsKvSwhe5FZRTb8xX0ImprbgFrEV9UVsiZL9QG8EVfiPJE9unQVdSIpEbImS7AAi1IJgKirB
-GyI+IJAj4wgeQUiXqORFVYGwKzqhCFJVMazImz1BgiPjn6AkiEZD2InjuLJFEkRkSQ5GlEdWeMie
-REfEDsRCAg/hk8YwLOSIqoJIl8cDSRGGkA4oAAffZfJINcDRFDXwTIZDDsTIJO4qEGfrROMFqdUY
-IGPTdMgofonGD/ARCFEhKIhGHxTIg4rpqrVkI4CuSCWbeC31WM+gpGSJBCFekAKtawAKupWRGyJt
-dZaJZwiK1VFbIra1/UI3gis1VyLdgVla/wCRGyFW1WRW8EVfjnA04IntV9+4qZEaqII3JEVXOWB2
-9CIpYBOSIKqYXZkRgEkRaAmRCcBgiLf1IRke0MHeSJatMLwBOm+wrSC6Do3lhVl0QN0VhAZKKNN9
-CSRNAJJsiuoH0I6njDJMoiZLOQNkQXqR+hE0YBIEWoB1I6ir6EkjoeIZOPEG0OvkK6G9DRH4fJMg
-oI7CiEgOqMhGGxem7oogxonGDt2owEajBOEsyxxRkBjmZgxiSWtaRiDKP/2mj7ooFG2sqBd0Rg08
-EwRhpROgjxFexW0WSFgHRaKrOAjjTwW6qwKRLUIVdVCsiuzCFCrqUEsyK2lVKA2RWVS6isiuosyv
-qV26AKfVWWLseCK7xUfcSWBPGci9gqtVhjSAKyy9RKv0I6irCkLtJFLa5IrQRHxBJEXVATZFEEiE
-S3JJhERjAJIh4oMsm6ddBe5EniusDSRHxJJHUdfQHkRGASRSCSB08QLJHqh4YD5ZIilAGyOmVIYH
-aSbqduhO4Hqm8RfIjoquZA3ggKZoCZHKHgokPk5g5IqKr42jqIMWIoKHqigoI3RCEU18UyCEB9kU
-EarvsnCMO3VFBC1BROgjaohCEyCEAdUUEaIDdysoiIsAHgr6pBGCuqQfbwW+tZqIFCqCRaK0bEbC
-rlSV0Fki069aX5ldrERpX9SBZ4Irq1UCNgOivpRKxVa0ohKOqssl7YFP5LQq/wCSlv8AwQp6rIlu
-gdlWqqSyXAA9U16rAtbMiEdwyR/mmrVgbREEiNkUIR03ioBOSKRgk5Ih4wGSIRJJJVM0gJsiHjgk
-5I5U8VJPJwRk0pdQRJHR8e5JBVF1QE2SqmETJEWgIhUqiMDhOqsRtEemqDr9Aq31IS0k1VNcitxY
-hUVSNgdkyrIHaCOQj4pg8oOWLrXA7l8UR2kMPmmQwQ2wRCgh+vyRggQCdPBMgjeNE4wwTIIeiYIQ
-igjAFNBAj4smQR4g6/JW1q+oRwFekyDBX60RjjRb6V/TJW3kiNakbCtNaFbZFp8ehXICtGuv+Sq9
-v8EOiOumUS9sEdWVphCO2RSafBatVf1fmUXePyITupSuYJa2JFdXOmMFXnkLs6ZUyB3gj/BVtQPV
-yC5We2IrkevQKe3gnnkhO6Kp2A7dyOiqSgeUBBSuoysB2H4qOssitCC6nhGSeUkcBDxbD5JEdTxg
-kgMuxMqCu/0I48eing+4fJEf5Ke2DzI6nhBPMjhN4vqB2QH/AJKeIHcjnY+CatV3Qrs+zAS9EypG
-QO84I+yioB2JcmVQO4Lm0U8Z6g8o6EcOUVXoTyyyXBn2UdSeagBIr0GlUYaFdlkN1TWiniTyOaC4
-7D8V8OR6JDDtKZBQQz9UUEYHZNIZDXQJghevQIhGTBGfRPISIkGFSnQTucn7S9143sOD3yXpy4GZ
-hdCYlKJkSIicdiWXQtxFVNN/rrlr6fQ4ej+QcfZy3xV5e5X6Y+xyBqs66neHH8BX1IOAtNUgBW+q
-/T9ip9QqytZgDZFpSgSSK9rCK0Aq+lMIqtYh0KfXXKFu8CkmqvqkkVWeQSNAr9dUrFN23UBKeqkW
-zAZN4BPWkorteBSZa9uitVUiq1nEjA0ASeJYrAchGJBMBeiCqF2A6bxBJHDoQyJojv2KJQFtsNUG
-FEKXqFk3+aOIwDM5JU0+anTIcsihCdoRj1An3QNPijEoEwQmtPBRVxkjecAJKdVEdmRzuol6Ct4y
-CrUTQgS4wQkjRGE+oHZroQE77VUaIn6gJ7GfZRIDsRy7alHsCcgJIkTu2iiWBbWaeSXFxRkYB5/Q
-l3l07FIyHzwBza4RBLMIpHxXwldD1IQzH4IogR2bJkEb5IhG30TjB100RIMEyGDqyYIUxBg6dBN2
-X3b3LNwcXBycrLLg4HOLjGR9OJkXJEdNVqe+zM1ODprse1VXm+5niK9iFUaxwtNEiDBaaIDGXSpR
-R9ihvJFZWqA2RaVQqbAtCpMFfkA/ktNKtGe7QJFgU+pS0LtcJik0JV9adEVWv1YsybQ2rrRRKWZt
-lv0oBLDXdGqyDZbDEcHRWpGe1iO/ea9KIwK74GfY0HVLBc74gUSIJqH/AIqmdUxK3aC/w/JCBvKQ
-guAfgUO4eqAJMNfBRoitA1zb6JXUs84Jc5DFDwSB5yC59EVX1I7T0Ddqg6dAq/WSCTV2UdJIrwRy
-yPiKrguL/wAfFHwUE83ICdWKiQtrd5I+u3emgnlBCfNTvUgV2yHXu6qQHyTEfomK284C5Z9TsFIF
-d5A8g3ZvopCJ7hHJNS/aokR3nqCrEM3jsiK7DAeUVZzpqgBWyAAjqygHYIBoNH2P4qB8wUO9dgiT
-zMIrGo0XwjqeuGCZDII1LooKGD9UyCGvj0TBGGvRMghHRMgjNongIQEUgjAdfinSCOK13ViyQcfw
-VfUI4C166gYy01nuKFdTVXBns8kV1KiWYFqVSl2BdqrvamGVe51ElKq2atcIy7LywSkACnpryhL7
-ITEMhdrr+a0Vrgz2upF/UwBPSO9E6WDPe/6UAF37OxEF74GECZUdhJmamraKSVu8iiN0q1AAJPgp
-OBXbACXJI0BYIlvkhi8Q+lK9UOoPLItWpqaokVg/AtsFCeRNWff8kIGmEQka9PyUgPnLCaCigfIl
-wo+qkDeSAC7A10UgXz9ehH1Or1AUgHkAEkvsKKRAPOX1I9AHqiDyIBXtJ1UB5EEQz1pqoDyQbSCw
-Fx7FCK/cIB+rYaO6EityExkxu738EExfJdiWRAFfMddm7Cykg8pIIlgZD/H1Un8yT6dSemYwJBeL
-bMdaIyR3TwSMXkA9DqdQg2FsIgRF2Yk7UH81JF8skOMiIJcAPU7n8FJJ5SNZqdmFTr2oSCSGLmsY
-sdDtUPRRMMnNY2inivhkYPbQGIYURSCkMB0TJBCIkJoDAwi6ZIaBt+9MEITBG2ThIEUQcCvVOkEs
-GqvqgjRCuopZBwFspUAQtVF6CMi7Gun6fsY7Wz9yEq2muRLXgBLLVTXJRa8Fd+pWz2ehl92JEnOg
-C0U1pGXbtwKa02ViUFW22CWyNHo9R3N/NEovsHx4QcjMTFjUauAUtrYKbXwNixuDCnlBOvQfiha3
-cW9u5bHHEiVCCJkE13IYOl8sg8wRwGMnkDaYj46DwUd8Ad8YEMIhohtS57dfwTJyGWKcbwjqzN8S
-UVbI3kJIMSCP+UUMngkYOHJZhX8aItwFskoi5i8idG/NRMPm2sCAV7BWqMjeUoaMCwAd6lBsXz/I
-lkjQBmoetSpJPOCCHmbqaxHX+ajZHYJgxNXA1I1KEg8pGGOTyAFo3OwJCnkgeSBGG8dJBg43CjYG
-xjAzLFoiP6q1ohIPKAjEQAQNakdR4oeQPJB9IlnBAuLOwDAsTRSQeQ4xAyP6YjUkfBu8JfIXygMc
-YuFpDv0qAOoUkDt6hjhu8saA6ABz/FUPIjt6jRwAQJIAEiGAfQbOg7Ad5YDhYG36T+kh0fInkOcE
-ix0MKyap0Q8hfMWOO2BmPLESr1D6dFJyM3Lgls7rosCQKgDTQlSUSSDEDC1rddPjup5ZB5ZBaQKW
-mLPMPV9NkZGk40T5X69NF8QXQ94ugRv0KdDIYanoigoLOmiQjDVMgoZt06QQhkUELMyaAhARRB4j
-dXVQR4srqBHC0URBwtlEhWFbdNMlV3gUmq7eun6Tn3tkBO60U1lV7iGX/K1V1QZrbEVSlqXc6Afz
-WqtTHbZljYx5ogFy4cd6LZlvcbjwuywBBBkad6W7wVXtjBojxYAYyQ8JE+YA60fwdVu7yU22GnFx
-oesSQa3FjXY/JV2u4KLbMExcOBlMOw+o7hh/aB0UtswG21mjDilAXChuFN5AEVl8FW3JW7z1K48c
-zmASQLQwLkaPQo+cIZ3hYK83FmJGRO5iQCB2Fk9boauxFUsGU2xLyhEPKIOvYU/kh1dFU8MwWYgk
-FpOavs6ZWQ6uQYzaQYF9KHTv22UbI7CzgbmFDoBuw7WRTCmCOMxDB6/V27ujIXaQ/tpG616AO7+K
-HmDzCOPdHy1nrIClBQBTyJ5wH0BSN3mfyk9qHkDzLBxzEeUB9DKJ0JS+ciefqNHE8ZRYgmYL6oNg
-dgnE0vC6ROpOmqkk8gS41sRKMSYUJdhUn+iiv6kVywcWM4v/AHOzs4bq6HnAnuQNHiuYknXd9GFE
-r2EewkePAxlQiTiMZHoddFPMDuH9vjEWkJGUqFgXi2lUPJk832FOCQvckV8sRQsKaMmVg+ReOOWj
-I0IYxJYtt1VfkVu5WePCAEpHV3iTdQ6HTom82xvcb6BligR6gfV+gD9FE30ArPoSOERtEgDkjQv+
-rtoFPL06B8yuyFzEC6X0tQhqB6ppGkaeMxgZDQDfR9D/AFQTyBWyJ6USQZAyagAZgCHRkbyPOh7V
-8WXQ+h9ho/knQyGACaAk1CJBhqigjKwYIRQRqsBsmCFMQeOtfmrakQ8arRTIRwtepQBjBa9dRGwr
-oadbkovbAkj+K7mmmDmbLZK5FnW3XWUZNloKZZHLfNaFWDJfZkt9J4ip+B8dkvkZPLJt4nFYgEAy
-jONA7hwev5KjZsM23ZP5GzjcK3JE2uBKJ8ta/noqb7JRRfdKNWLiEiLAykSxOrmm4VVtmSi2wuxc
-e/JIAWuJONBp26VSu0IrteEHB7fMS3AAIke3aiFtqgF9xb6Qv3HmDjUEuAKimqXyArFEuOI5oiZs
-lKAIA1fQ/gnV8Dq8rBllxjCMoigvo4Y1/mrfOS5bJYhwPGImKyrV3p0KPlkPl6FIwBg4NamNXAHe
-+jp/Is8yS4Zk4iDEVNsjoNR/VFbCLZABgeEjCBAjr/cRoCo7ZyTzzkI4xsa3YW66mmvah5E9wnoZ
-CD+l5MDoxqNSp5IPmhv2xmfK5kwqXoY0qp5wL5wWQ4/nBxtKhJlJ6eBSu4r2YyNHiTkQDEGUTWT7
-9aJfcQHtH/agxufz3VcFzrV/5Ie5kX3Bjw44iYvdGTgx1eUXYILZIvutjftA39rEiUB2oeYPcHjx
-ZkkkAiIrF3IfvQdxXsRP2+QyEJBgQxmCSDpJjv4oeSgPuIOTBI5DIxiQas7kt3I1tgCuo6hhxJ2m
-YAjIR0c7h3QezsB7UIcGSOSXmILM9RXdFWUDeaaJHi/UfpiTa76dB8VHcnuEngvsgRFhWR1L9vVR
-WgCvGSr0yITjJxj3rsP5sm8iyenqPPFP0oC17akO+z6BBPLBWykQ44gD1AIk/UxBHTZNPoGX2EMb
-ZNcTJwRJzsKFGZGFnE2Sj9JOjEnUJkFPJ5QFgG23XxxOD6UNGgRQUEJkELURCMnCFMgjJgh2ATBC
-GcJlghZEDorqJELAtNEEYLZqFYy3aqlVmArpaambYyjKa00B2Xf49YRxORf9WCo17a6LUY72NXHw
-Gfm0YUloxbVVXvBk2bDoY+HOcMUQ8XE2H0k+bx8FmexJsyW2Q2dTg8H9RBAjkEoy1IFaLLs2mPdt
-/wAGrjcLKDi8glMSYgeG471XfaslF9iyaY8WZjC0CF8if+kGlQqndFPuKS/FxP8AJJqEXRLvUsXS
-PZgrttwVQ9vlC6JJtmDK53JG7hM9sjvfJcePGFJAHGZsHrSJD/BIrz+Iqv8AmZzxxGQDAyZosNKb
-v06qzywWe5gyyw5JAy/USZC5w1paoVytBb5IGTDKQESGMQDawHUEIKwVZIq/by1OwLSkQaue5P5l
-nmVQ4sTMyctJzEFxXtO4TvYM9mBzxSDjYvEGjRO4CVX6g9zqXS4tIlvKakFnbtJpRJ5iLYir0LsT
-0YmgAZztUJvPIfPJpjxJiccZasfpHxqkezuVvYuoJcCJaUiTMaiQJ6UU91kW4tjxDHETkqaPJxce
-oCR7JeBHtzgMOPkjjMQ7XAyjaWjGrDqo75I9ikg4wi0b3k4mTa7nSvQqO8g9ycjT40q2RfzEiQAF
-BpWqCuLXZ9RxxYREIyDNUSo1NPgldwe42LPELCHcgCRBDkbhvBFWCrE/ai4yEhaakAb7fzR8ye4D
-HC0RMT6kYEUk+uhCjYW/sL6Yn/kMa/qDnQIz2D5RgWQjLFk8zxkzxCMw0FPKKBgiJiD2AeU+Vzud
-nT+WJLPPBJQd4hpAlwLaE67bUUTCmCWPH6GMCoeXmDsCwqH76IpuWRNyyoY421ttehH5HtZN5Fnk
-JlEYgvC20hnItEn0fdMmGssqmYnzwYuem+rMnXoOvqeODMNi/cvj6PpyGA3TIKCN0UEI1RQRh8k6
-CMmCFMEI2RCN/AVhBwraoJYFroQcLbrUiMK6uik5M+ywsjRdHRTJk23wU23Xb+V2AfdmXbWEjz2/
-b+otw4DIxDOJFjR2Hhoha5jvsOzxeKQHYeoRV9GGqx7LnP2bTs8f2gzhhjIXFyZPTyvssduRDZz7
-8mJg7PB9rjKF9CROAowDCmyxbdxh28jMF/H9vIkIGMTjjKwlwHajkfyVdtpXs3/maIe3mWPGQWMJ
-EORVgRs1Er25KnuhsfBwssszEEhpgvuGLdHS22KBLbVH5FcOHECkBISjdGUiwJ3oemiL2SO9ok+I
-WyRJNon9Ogckfj2J1syOthQePeYWGrACL6U3I/Sm84RYrx1MkuGbiJkRnMyEwA7jQN/RXLYXe7jA
-k+HA0YiMov8A3E16DZMtjCtrKzxCTIGDjQuGNo7Am8x/cgtjwZhpfUT5WHlaI7a0Se4hPdJH25ya
-O4cAjTbUqPaR7gx4RY3NbGLFq9rb6KPaB7fQtlwcYAsLBvMBUV0FHSe6xVub6kh7fESJLAlriXMq
-6B1HuA90jx4cjCPlulJiJ2k0rTwS+5kV7Sw8PS4XRlWDaBqVLIe4KtpIcOZiI2sxuYUi5DsaBR7C
-PYuoI8SJeZAIkLfHR7vFR7OwXtDk4ZhGIi9ALjGrR6qV2T1BXZIg4wsEYGko6yo5idgj55G833Fy
-4yZOJCRIAoKu2m5RrYNbEjxImPlaM5jQi64gvUkqPZn6EewznEK3ACr0Ntev8aqzyLfIS2Qn/lFr
-0L0JGgKacYDOMEaLAiIEQzQZh33D6vgpIZZTCDSEQQDIOAAzEbJ2x3YrEBExjJpAHT6SzV+SMj+U
-iNEYrA5iJSsAFAwoAj3kMvqLPEAGem5JOoqE6sMrlMsc7hFoV/S2jvumVixNFJhKJBiAbS4mzEv/
-AMJ05G8jw4dmZfI0fU0MGRQQjsr0TIIapgjAEbowEZOghGhToIwi+7MmSCMOzROkQeICvoglgWrW
-uxGMF0NNOxVZkJXa068GPZbJXlkW711eNqSf4HO5OxwauBx7sd9fPj2rS7daNt8nmt+zJ1uNwcpg
-LA4FccRUvTu6rLfajn7Nyk9FwPahM2wF0wPpbufXVc7bvg5m7kR16HoeF7XIeaQj5nZ6FwW+lc/Z
-vOVt3o6nD9pgAQSHuDtQAD+OizbN7Me3kMvj7aJZYzIaOxAc1r00Vb3YK3vhF/8A4oGyMsbSBo9A
-xIoHVfvfUT9x9SrHwhLPKUoPSTxls4LFqJnswNbbFSiHByWXCEbiCGl00dgexWW2roWPavsVS4ZM
-9ADGX1RGtX0T+Y63QJDggTHqQIkYgUq7UZF7cBe5xhmWXBjfd6YjkjIxGg1LNpTRW+5jrgvW4Wft
-sSYkylGRcAGhDnXXoitzD+4ZWOAAY1oWGOQ1IDu5YI+6M9w8eA2cGWNotaCxNOhdB7cdQPd+nqWf
-sYiIJxxEqgA1DDTTVL7hX731IOEfqZjE21AtlUP8UfcG94s/8bOwXwAALsOxmS+6J769Qx4NpvlR
-3DFwSf6Og9kg94EeBKpkGFral2fsGyL2Ee5EycQESgCA0nuarDYlRbO5K7O4/wC1gAMjuZ/pI81H
-FfFL5g9x9CqfDcUB8rBqMDuO3tdOrj+6VTwBqMAYjqQ3emVh1cXNw4QuMvMY6SEerbaFka7JDXbJ
-mlhkCTEATkGuDEFuwBh4KzyLldAlgJqJkMACCKAOelPBFXIrlOXj4YzYRuJaj0ftT1sx63cFJx4/
-UMWuBYliC4111TpuCyXAs8eMVM2iXIZg7oqzCrMonickW1Lmcm3ZgnViytiowlZqLgKHUPrsE8qR
-5yLONwDF2L+UbU20KKYycFE8ZsLF60LhvDoE6eR08iHEIRmCAZS+mL1TTI/lJQccAXkKakP2VTyW
-Kx4OINv4hfJ0fV0ECvamSDARqighATIIw7UyCMyYJB2pkQcd6dBHAOxV1UEeOivqiDxdatafUDGX
-T41ZZRscIQyC9Dr1dDmX2FQEskxCAeR0jRdOlfFSzj8rckj1HtHt0/RjExeXpXSlFiXMn0XO37s/
-c81yt6n7nqPZvawYAeZhU+UAPtRly+RuhnF5XJyes4XsZlOIAiBbbEhxU6n49i5Wzkwji7eXCPQ4
-PZox4uHGYCRiJETD0cjqudbkp2bk5d+XNmzfh4GKERAwiZAguItTpRZrcjJlvvbzIYcKEDFxR9PF
-F75QHtbBHgYhNwHkSXn2k9CenRH3mF7nAg4MbgYBgQQCKsw3J3dN7vqN7z7mMe1RlEtIzJDxB0fw
-Vr3l/wC4D/4sEtEgeeparOCAyPvk/cdymHtkxzHYmFKksaCjasme9eJY+QvEzH2k3mUhKQ8zE0YC
-R6P8Vb7+C39yPP2uJtNjhrdaMSa7pVuFXJYx9rAjKQxyuFZhvKZGlOlVFu7SD9zPcJ9lnEfRfJgA
-DQUoXIQ/cJk/dpkl7JK8Ctr0kQ+tSC+in7nAFy0P/wCKkcYIFSSwYkSd/gEv7gH7nIT7MSQzU2/6
-tLXL7IfuQfugHggsCGOR8cnizEb7Mitv9graZz7ddIM8izAAuzmtKPVW+9gtW8WfCzWtkrcdmG9X
-/wCFFsXYK2rsVDjiEaxeDi2TAka7bhtnT+csfykplxomQjG3SMgWAi5601ZOrli2epTm4hiLTASi
-JBgHDB9KdWT12SPTZ3KcmCbUBETIkAB66kHVOrIsrdFEsbnzAgwYRla3jVtXTp+harehknETr/8A
-uGX9zAMakVKtTguTa/AWePPKsQbH8sAxP9zu3VFNBVq9zPPCQJRiIggXC7UFw/YFarFqtJV6ZMZT
-hHzRpEOTTuTeXZjK3qVZcAIjfMiQ+uhcb169qatiyt/Qrzxj5CxjNvKACzdp2TUbyPV9SjJgF0mN
-huaTNQN46qxWLK3M9pAkL3lE2mGwr5tFZPcskpniFRUybykAUtH8OmTHVhZ+sWAkRbVm1p3VTKBq
-tHzwVivlSyj62NEU/FOkFB7d0wQhFIId+qIRgE8BCB8EUQfYK3sEeIp4K2iCMAtFK5IOFs1IVjHR
-dbhpSZt/QonNu9eo1a8HC37Y/E0e28WeXPCQGkgRq9aBPuukjh8reoZ9P9j9syHjY7IEWY3yOKA3
-N00XmOTuUs8by96lntvbPZSYQmJNGBFQNR/AXG3cjqjzvI5cOD0ODi4sEQBEeUNWpXG38xKTlbNr
-sWepEeUU7FyL89S1PUTxYDlqCqL82WmTxG9TUrR+7w2DxCJRLndW05Scggl0WfdM+UvHqHIZGJdW
-/uVHUCFePjqeqX95VsOQkxtoabo35SwyZBGGKIFo0fWuqe/LlTJHZshGMkAh208Uv73IVZoIMQAN
-O7VT96u4Mk8jg9NAo+XWCSyG00bVFcoClBtBL6Oa+GitruxLD5CmDv2b6J/3CJ5Ay4I5IxEtqxPQ
-9VZTZA1dkPBX6DGO5iSQSNB2UKs9xMb3JKJYMhPlBEaSiG1rvVWK6LvNFWfjQMTYIgBoxkDsQXDM
-d09b5Hpsa6nPy8fSOSpib8Ydz0uqtCt6Gqt+6KZ8cwa7IZQkAYt9RbbZOrz2LFeenUz5o3TjOBqZ
-kM9OoPVWVcYZZV4M+TDP6iXMzqWqXoPgrKtFtbrsZ5wYeS0kFyBqG6hWJllX6meeI42hKRAcF33N
-XYbKxOS6tpyZ5YHxWg3Zf0S6M7Pd3qxWz9CxXz9DOYSM55DbfA2nW2O7kqycQXTiBJY8khGJabRA
-mLmEQTRkU0MmkZ8kDCAyEAsSzv3aVTpzgtTlwUsIh5Qja9S7vFqdutVYvoP9zNOeKGYiP6i5dyey
-o+SsSbRak2slEpmN8BFzKsWJI08x6p0pyWJdGV5Gozv2mpp8NE6HR87iaBwvlqeD66hgDV0yQQgJ
-kghGqKCMnCRkYIMAdGTJBGIo/wAE7WCDhX1CONaLTTqB9BgFq11AwyNF3OBQxcm2CmEDmyNHapde
-mqvCuTzHM3I9h9r+25J5wQDIMKk0H/AXK5u5JHl/kN6SPsX2/wC0CGCEiwAgwkHci4luxeM5nJSe
-TwfO5UuDvW4sIIgABqy87zPkPHBym3bqUT5FexeR5PyeYLFQq9Y1q65q57zmcj+JPWUXPRPEY5gA
-W1Wi/PSTS6g8Q+uA5HxVq+RSlp/cHgQ5wYu6R/JVdevoTwD69KJ38l+nBPAX1y4rskt8k/Lr/wAo
-fAP7giOvVT/ybVZknhkYZ9For8lMC+BBl7d1Kc369yOofVrrVWLm5w8k8RvVGyv/AHi6r1F8RhMb
-69VqrvXfqCBhNX15CTgWBxNlrW6MAgIkFctlWCBgBVh2rXXYSQMSdWOzOyuVpZJKJQAxyJaNXMdn
-072dXJtsuTyYuRgkwhjmY5CHjE+Vq1BbsWilvXoaaX7voZ82E3eYA5Ix10d9CSrK3LaW/Ixzx3Si
-cZajSkHuG2quT9S+r9TNn48BibJPy9AC4t3GnwCet3OC2l84MmbCRkkIERIDkh3NOzo+6vrbGS+l
-sFOasoMAQBWVRV3t7k9R69zPMQlAxiBWNrCpIf5J0XKUzPkxSMCCWhd5jW49sdtlYrZLa2KJnSMp
-W2hrqgfBk6HS7wUZJZYStB8gJvkwf+CrEky2qTyU5MmQkwDxtJaj7aj8UySHrVdTNOQkbpEEhn23
-rQUVqUFywUygDISMS40JqCAPyViHVih4N5QBX4D+KJ8lkHzqIAHRfL6rB9fQwToZBFEyCgsEYCMA
-6ZIgWTBGAqrKogZyjAXGia9lXLI3Bjye64MZYFz2LBb5CtXgz25NUTH71gMmkGT6vlknlAXLqzdh
-5WHKHhIFdnj8/XfuXKyfQtyFokr1fxkWaOfzLeNWzu/bnsWTMIZSCJHcmneulzOSlg+fc/mJNo+q
-faP21AZSZ4rIgECT1iOoI6uvK/I82F1PF/Jc9x1PcSlDBjjjjpGi8D8p8iqvqebzdyzFm5JMmBcr
-578l8znHU069U4E9PNOoBd2t7V5/d8k7M2U4dmg/ts7OBqPzZUfv7SXfsLQEcXMzkEAlhrqkXNcj
-/wDj7RkaHB5RkYWseiL58LHQlPi9jtEE/Y8gkajqW0bVK+dZ9xl8ZYJ4HJuaIcAa1ZR8+zXUb/xV
-5xkWHD5MmoxIdj2Jn8hZdxKfGXt2J+zzOxLMWPgo+fZ5J/42wksOYMWJBD0TfvbPuU34Vk+gjyEl
-pXNjMmZ6XMAE5A6t3q7XzG31EtraLY5D1fquno5bnqVupYMnbTddGvK+ojqWRnutmrkTlCNDgvv/
-AAFupsldf6QrLIycLbq3eSFaGEjsdFqrtfZ9BYLAei3Vvma9hRqVC2VuvL6gFkGLxFdj/NaKWl/Q
-dZK5wEnkGJ0f8RqrqserjBkyYWEhEVDPHQbksX71arGitzn5YW42JBjMAEyBAcy+p+/4LRV5NNXL
-M+UAxlIxD/TKNQdlai2nWDHKY9S4xIBFt71Y02OqujBelgy5MF8Yx2iTJmDhjSqsVoZdW8FBZ4xI
-eIItlFwzllYW/UpN0pzIjZjIJA7S3bqmLE4S9TIMgtPqPEw/VE6uGevUK6PQtjODMTCdpiwyipbQ
-ADqVZlfgXKV+BXlnHyxpIiTPE00HVNVMeqM04ymYiJaDkVNdaaV+KtTgtrgoyExjbAE2hriKEnqn
-qWVU5KspIdwBAt5QO6g03TVLKwfNwHAXzNI+wjDSidDBH8FMiIKYI0RuEyQRwP6KxVIOI0WiusJy
-vecsomMAaHZcX5K7VoMPLu1g5BBp0/muSYAgV/FRESLcczEvEkHYhPW0dCyrjodTg+5EgYs5odJf
-zXpfhPm7cfYvLNS3Z/1aOlj9Df65/wDxz3T2LCOPkjHlQFnI49Lxa1R1B6hdn5Ll3WzyX6tdujPi
-P8j08ni72rp+PZ9j28MGHiYzHHv173XlflPkvGjPK22PY8mT/LyMhhjDnVfI/lflm7P8To8Th22O
-Edr2/wC3Mkok5I+YsBIkNVeP3czJ7j43+O3alrLOri9kwQtuIFxrKRBFP6LI+RZ9D0uj+NNf8v8A
-gksHsMJgT5EIEMDcdHLAOmT3Pojq1/iycPxM590+2MUDMZxK0GTmmkrWr2lP7G94g6Gr+INNYHHu
-n25GOKUslzxJtAJIanRT9vvc4Hr/ABSGsdC4+4fb/wDkuzxGPC0nEhW7+Sr9nb6ZYr/jUpYJj5Ps
-kpkiZI2IBqZB6UrRB02pZK//APMxlo0Yfb/b8r+jMSkGbc+avwVdtt11MVv49WvYXJ7QBCUgzkuD
-Fm18Uy5GTnbfh/FPEfgc7P7ZIEPG2LEk6q+m44+741p9MQcvPwhe040egbUBaq7PQ4G/h5yjnZeN
-bH6a7haaXznocfdxYXTJQYkE9QtWrc0c/ZqgMJdTrqV1uPt+r+pmsi2M3B6rp698qCtouiaV3XU0
-3lZEaLIyW/VsbFaHiarbptnAjLIn/lb9d8YFY4IehoVso847isYdVqpZ9QFdtTEh3clqADZiticl
-k9yjMJEf5Bfbq34U3Cur9C7X9DG2OeOYFIkimocbkdyuWDQm5MGSBaAo8QCXDMJVavVX1saKsy8i
-wjILTIvZa1QW6nuVtexdScGeUcVtrG4V7HFPgrE2WJvqY5DHL9NpI7aaEfJXKTQm0Z8glMCRAb6a
-EHd7ZFPXBbVpGbKInzRx1lWI17NTtura/iXL8SjLdJxENEaSoH7Kp1jqWVaRnyYh6Jc+WBHR+ter
-qytslqeSqoeUjY7mFHdj2bJxzPkiTGblzESIiQ0Q3b1qrEWVKY4fUhe/UgnoKfF0/lBY7w4Pmwb+
-i+ao+yDAJkEI7kyCMBRPASwRCuVUEcRDrRXXkg4ituvSK7HM994HJjDFyJY5DDkcQmYkRPcSGPgu
-F838ffU1ZxD/AAOXs5GvbZ1rZO1eqOIY6Lz0FLQwidnLByikGBrGPZ0TQNBZEbnZOkWVR2vYPfvc
-faeXi5XCzTw5sZ8s4/geo6hdn475G2r9L/VrfVf13K+XwdXL1vXtXkmfpL7O+5M33P7Dx+UAP3V0
-sPIEaC+ABJA/6gXXk/8A+g3/AGiq6f7NilfTp/xPiPyP8ftx+a9FcrqvwyetyT9l+3+JDle5TjKR
-eMsZMbovV5B3+C+N/wDV5N4r+Z9S/i/8Jd0navbujiD74+6fepgfbXtHJ5nDAb/4+I20kzjKRbQ/
-Bdvh/wAYvdZUs+pU+I4XEoltvWv9/wCyOh/+C/7h9xzRyZ4cT2/DkyWyxyzxyShERcZGxiQIoI0k
-77Mu7o/iyqsldvl/jdWK+WyF1iJfplG3F/oj7gnGB5f3MTJzLLHFikNY0tmZ3Ukdei6mv+P66vMf
-kVX/AJdqz4aUsYlp5/Io4/8A67+5vdy/uWWW0xtxwwmMZD9QkTORDtFiNFbT4Si6v+w+7+aVf/b0
-qv4uf9EZ/wD/AD79zDyw+4IRxnHBx6ZMxkmSMgu3EKEGl2nl1Sv4SszIy/mWqM6f1T64/KDzPP8A
-9c/7K9u9wyRzZ+OOJllYfcs+cYMEbZmAH+WydzC5oxk40dY9nwmUoUep1dP8i+P2a5dbK6/5Upb+
-6UfnB5vH90+++3yhi5Zy4rZzjhJEoExBsmKtKmlR2Llb/jKT0/pHaXA07lNIcpN9/qvoe39h+680
-sWM4skQ8owE4xYudy+rHYLgcjgqco8/zfjUn0Z732v3ociA0sEYm8kEEkPIyqvP7+NB5nk8NV6o6
-GfFHJH6WDEEigA371mq4Z5vl8dNtQcTk8MsWJ31LsdltpsPJ8ni4cHI5uAwDP5ifMNSA3VbNdpPP
-czR4/wBf6nLzRa6hroSFqozgb69SkE6Ci6HHu1hHPuiyDrr6JcMpZdCR31K6mja+r6iNFse1dPVn
-qIywEj+a30s0hCyJPguhqu1l9BWONO5a9alQ+wrHBK2a7vuhYFnKUYuA7moHwottIY1UmzMaC4u2
-0D3sRrqr1kv64M3Iw+pItEB6EOAHGzd6traC6loRzuQJgEQAJJuEJbsP7uv4rRR+pqpDMufHIxM7
-pG4hgxABAr41V1WXUsinNB75AXABy+trOap6voWUZibK3qDysKHqx7qK3HQ0SuhRbCUoSIIDkvUg
-ntqrJLXaJM2URfGIHqIu/j3KxfUtpMZKZGZdjESk1w1Lg+a0jSidQWIzZJ0EAa3DUV0ZjSqtqu5a
-kZjCdwB8sCaA+U9/QAKxMuTUFcxMQJZoEXCJYttqmTGrBlyiQhFos0iNzoW+DK2sSXV6nzgaL5ql
-g+xoIToYeIdPVSEYAqxVbIWRHYtNKhLAFt10FbG0C6/E0y0Z9t4R9C4EI/c/+qed7d6Rzc72UPgj
-0FxmJR//AK7gQuB8z8PevPezz/6e6kKj6eSSU9Y6/Q+XbNv7L5mt24puw/7dT4rlxWTMSGI6ryWz
-X4tpn0V1FEZaJVIILIY5Fk1assrUsGKfxTqjGVGX4oF3emyv11LqVPsn+gfduYPdOZ7Tx8kBy+Vj
-u4Azf9sZ/wDtgnf9QNOi538w4VeV8dXyWdeyqn6XtVf6HB+T4tK87RyLqaryVl9sf3P0t7D/AKm9
-i40p8v3+3373PNKOTLl5MAcMJxJJ9LETIREn8zkuy5HD+K08eqVUeg5Xz268V1P2tamFXDj/ANzU
-Se4xYsWKAx4oRxwGkYgAB66BdI4jbbljKAIoQihCKEEy4cOYCOWEcgBEgJASYjQh1ICrNdD4J/tj
-/Wv277Rj5nuHt8eR+5afNPGOHJPBDDaRlEeSxjCQkDk/ymRJ8sQHXL5nGrmyWT3f8c+b3NrVeyWv
-FfrPb9PVz0xGMvofKfZefyYTjGDiMLpQAMtdTo40C8zv1Jo+g8zTXqfT/Y+dI2QE5SNpYyEWDCos
-8fFeZ5WtHjebpw39T6L7fnjnxXXExe2LAAMOz+i87up4s8ly9KKuUwjIFokHVqo0PIcpJJ9jic7A
-bS8RXZbddjzPN1OMo4vJh5hGthqQ+i20Z5rkUlx2MRBBI0C2abOTjbFA0JEGui6vG2tPPQz2RdEm
-hXY1WeGVsuiafkurS0orZZHQH5Loa2sMVlkXI1ot+qbL6CMeLLZqhIVjx+Wq26renQDJOQgLpFoj
-c6B1s11ZEpKcmK6h81HJls/QbLQrQW1tBmzxm8ZSpEhrYuSW/mVbVl9Guxh5t0nYEaCY1ZzSvcr9
-Zo1YM+aEoicXM8cnYEnt670VtXMFtXn6mTLrF5ERDakkasxVqLqmTMDeACXm5d3HTQK2pfXKM2fF
-KN1hJYACpZ30A7lZWxdRz1MpLCOScfq111iaOrfoXJdkZ5YjLIBH9LgCNfmR2snThFqtgqkJSpuK
-CY0Bd6t+adDrBWcULiDIylQMaPb/AC3TJjKzMeUyAIiWERQjr47K2sF9TOZSBMYeWMusmd6UBCtX
-1LYXc+ageVfOksH2caI1+aZII0XOieoR4gj8ldVBLIrVREHC3UaEYTouxw7Q0ZN6wdf7V+6eV7FD
-3OHHNeZxzjET/c9C3iurzeBTcqXt/wAjk8P8t8YuTtovSyPHc7GZ8rJIbn8dV8l59E91vHpJ7b24
-SX0RnGIkkLKqEVTRhhIAOVfrqy6lSwYyys8B/Esx4iKK3XrGrU+q/wDrx7Fn9y/2RwTikYftIT5E
-yAHtDRP1Aj9af5bWlwrUfW9qR/8AWybOX8q03Sj7t/2z/c/ay84YyKEIoQihCKEIoQihDF73DJk9
-n5uPGCZ5MM4BgJEXRIMhEvda7276JbqUy7j2VdlW+zR+M/csB4XvOWGPJkliwZBjhmnD0pSOOIiT
-aYxtNNPmdV5Xk0htH3P4/at2hPHk8tT5ROVJ7P7Y5tmLDOYsMoCwEmlgfyli5NV5rma5wjjfIak2
-4Pp/sHusrJSykyMjIxOziWmzMvNcvRnB4/nceOh3OTjgzkO501qzrn0Z47laarLycTnYZSBFzAGg
-3ZbdVjy/N1No4vIwRJLbjputtbHm+ToTZzM0IxLNXcLXSxwd9En9SoGtV0NV1Jz7IthIrrcfayto
-vjJ6/BdjVsnJW0WRk3euhr3NYEaLIybXxW/TtjDFaLIy26bLdr2dl2FaHidB8ls1bBWhtRUUW/Xt
-cAmBZRupod5buC6tps9eoauBJ43F7C+JoSW7HWlWLFaMGLPij6vqiQk7mRLEMzMAe9ldW3Y0UtiD
-LlwxAl6vkiwYRLgNqequrb0L62fYyCE7xEiMQSDEAEtbturZRe3KMNkQA0b9SX1BfUK+ZL5ZTkwB
-ySQZu70YgfHud01bFisZbbI3RDiLjTUAVBforpLpnqZ448bR8shkYvAPunbZa2yiWGHosJWvK2g1
-ADsK0qrFZyWK7kzZschNmOPG5DRrTfwVlXgvq8FRxyyRLeaBFo3AI/Bk/lA3lBnyYhUydoEG8+b+
-mysVi1WPlg00Xz5dD7YhgDXZOkMMA3XwT1RCyIAqtFEkEsDLVSAMYLZSEKyHRdjiXRk3VZ2Psjie
-28r7s4PE9yjfxOVI4pQJMRKUomwEiv1Mr/nedt0fHbd2lTfXV2S/+KZ5D56t66naj8bLv6H3fk/+
-svt3uvso5HAxYeDyeRGM8JGbJkMHBJvrPHIOAPJ8V8f4/wA3zbRbkKmytuqhVa/Dxqpa9DZq18nT
-Fqbnsx/ttWqT/wDtl/2Pz/779h+/+0e5ZODyOHllOM5Y4zxwmYzMSxamoOoNQvQcbRr5K8tNpXdP
-Fq/SyzH0+kHZp8po8f8AqNa7elnH9I2ez/6y+7fcp24/b8mIF2nnBxRJAciNwukQB+kFJt38LR/3
-t1E//TVp2/LBRs+f48f9Gd79Na8v8C+9/YH3H7RGRz8SWXBGPqT5OAHJiiP+qQHl8Vq4V+LzK/8A
-6+ytvo2vL8si8b+ScXZf2rt6tsx4X/Tafwk4OPAbgBEymSwAFV2fjvhntTbceJ0+XzaaEnbofp//
-ANZv9d8r231fubmxiMnJxenhxziRPGDUGP8A9QJu8F5v+Sc2ttq49I8dXV+rf/CDzWj5B8zbbYv+
-3V+K+r7/AOh+gF5w3EUIRQhFCEUIRQhFCEUIfKP9z/YEvecWHncciOL27g5/T4mGUMeU5MZj6Ixx
-mbLDeRMRY/Tr5QMHM43mp9Ez1X8a+Y/a2dX1vemX0Sn9U/bpP1PgnB5fI4vLHE5TgYY2ZcYlRgXk
-Hi/manyXluRoifU+o7dddlPOv/N0x/WD6P8AbXu2OeNxDISCBAykRbF6sI6vT4LzfM0NdzynP4zT
-6o+le28vHycch9OUAS9Ml2BFG6UXmd+t1f0PFc7jwpjAOXgFhMoxA71KWyeZ5fHw20kcPm4C/lIO
-4AOy267HluZo9IOVycIAkbbZbA6t2OtdLSef5OlKXEM5uSNSRTs3WujhwcTbVdQQlsurx93r1MTR
-bCW7sV1dGyc9GVtFsZLpatvqxGiwSDro02CQWwNV0dF8qRGh4mrLZpvNoFY4K2Vv1WQDgutlL+oo
-JiJiYuz/AJrVrlINWyiQEf8AGB5GERR2r0Kuq5yXJt5M+TDhlGcW+hwSY/IdVbVstVmnJgzxjM3e
-YiVBIMWYaa79VfRwaqNoy5+KxAlFzb5H3ajVParq3LqXkx5o2GIDF/MYuWqGtL1cK2rkvq5KDjtZ
-yHLARDFi1R3KyZLEzPOGMSMmBmQ0bfq/+qn5KxMuTZRIQ9IPbaZecM2zEp+5YpkzyiJlwYmbBz0M
-aC5WJwWJwY8kZXNKTiItJjUMNW01VqiDRVlRhjcynKx5MJBiNH210TyyyX2Pkw0Xg0fcBhWqdBLB
-81cgjBXVIOFoqyDBadbFYV0NN/QpuiRy5sM4ZsEjjzYpCePJGhjKJcHwXc4rrb9Nuj7epyedoV9b
-q1KZ+t/9Bf7bw/c/tmL2PmQx4Of7fghANJjkMS1It0qvlXz/AMG/j92P+zd/pfo//T+PWPocbi8l
-1t7Wz/d/yv1Xp+K/wfT/AHb7a9l92A/e8e6QIlfjnkwzJAIDzxShI69V5zbxqbP93+Wv8M6WPRfk
-h+B9v+y8DJLLxeJjx5ZiAnla6cvTiYwMpyeRIBNTVHXx6UUJf19wt/1EHM+5PsX2f3rFneJ43Jzx
-EJ5oOxjUEGD2+aJa4V0rRJ+1qti20/Tsr0a/4dH90ZuXxdfIp4XSeZnvP49f9D5n9rf+sftXsvve
-L3LN7ieWMOQSx4pQpCDG6Id3J0EpaDtXouf/ACLlcnV7SVdat/vdW5ffusfaBNvHtuiu63lrr0XT
-y/8AlER64/DofZfbfa+B7bxhxuDhGDCC5iHJJYReRJJJaIqVwteqtFCNaSXQ1KwhFCEUIRQhFCEU
-IRQhFCGX3PgcfncLkcfNgxZxmxTxennjdjkJisZjW0kB0GpQ+u7rZNOGmfmf/cP+vcX237yOT7Xg
-hw/bM8ScGH1QQRihj9QwgQGAlNrTIyOvUrhc/iqrldD6r/FfnHv1vXtbtefT1n+umDzPsXvk8WbC
-R9Z8pF8nZmuozdV53kcdNHd5vDlM+rewe9ynhEWEZAVjE67alqnVeW5XGhni+ZxEme242XFnx23G
-Uy5lEhgN91w9lXVnluXonqsGTlcSj2G2oBPRjRW69h5Xk8SMxg43LwhiDEEl3P8AJbNdjzfK1KHJ
-x+RxoxiCHZgX/ALZS55vkcdJT2gxTixY/F9Vr13ORt1wCMmH4LpcfZiTJZFsZmnZ+K6uvkOE/wCp
-K2i6MiwXW1bHCEaHiTutmu7ayK0WxJoulqs5QjHiSTUrXrs7WyxWWRW/W5yhGFtD4rbS2MgkhqW3
-6t2LQrdxlgonCERIECIjWJcfAlXpyW1cmTJDCRLz3SAc9Q3QaK5Nl6b9CjNghPEIyAMSQZDy+UdY
-n5J62hltLNMw8o4xO9gTURh1JG+6vpMGiicQZGxwjkBe22plWrgq6XgvltoyyhGABlHzR0Bdyw10
-2VqbZarT0K4iJueNsT9LjykdhTDGWcISyC2M4ykXJDl/jVWVeDQmzOYtjIJEQCDcdPAKxMdMy5TG
-RmIRLkGMSRSp1prora/U0VUHx8aVC8Mj7qONdNVYuoR46D8VdV4COGV1SDBX1ZAhXVAxgtmkrsQr
-q6bpfiZNlZNPs/vHP9j90we58DIcXIwyBEgSHG4LbLo7OPr5mm2nYvKrOB8pwlevo/8AH4H6z/1z
-/v72L3zh4OP7rP0Od9E8ri0sPqlo3h4r5P8AJ/xvlcO0JPZr7Ndfv0Ry9Hy/tvw3rx/93/L9+8/Y
-+kS+6vt2OEZjz8XpkOCDqO7VeZvzdNHFrJM2v5fi+Pn7lfH1OLk/2Lw88bPauP8AuOSbZY8XIn6A
-lExuNRHLISBoxiuHzf5Pp0OPG7+uI/yXcT5Lh7tq1121s36f0jufbfv3F9+9l43unGFsM8T6mIlz
-jyRNuTHIjeEwYleh07VsorLozqcvjW0bHrfb+/1OmrTMRQhFCEUIRQhFCEUIRQhFCEUIcP719q9n
-9y+3eZh90jgGKOMyw5+Tj9aGLMP+1Oyhk028oPm+ndV7aK1cmzg8jZq2q1G5+jiV6H5G5/tWb2P3
-rNwM+T/5XEyShKbC21gcU4kSJeQLmJAI3q7eV5Orxbqz7fxOUuVoV6/7LL7+lp/Bnrftr3aMYYY5
-JRsh58Yi4iZCpDMKlz8F57maJlnF5/G6x3PqPsvuV04xnMQMota5tZ/06VqvL8nT6Hj+Xx4TO9Kz
-JjoYmJpE9mg7lgymeb5XHnEdTm8zCACDjtrqtGu31PNczTHVQcfl8c3HyXjcE16LZSx5vlcfLxJy
-eRi6QFSwAqfmtVLHn+RqjsYZRIJGh6brbr2NLqcfZrhhiWdyuhx9mHLM9kWxmXDldfVvtKTZW0Wx
-LtVdHTduGI0Wg9V0abIcMRoeMhodFt07ksMVosjKulF0dW1T0wI0WXbLZXdOBYCDtV+xbNOxPtkg
-s4GUCCKbLVS/cZOGL6RERYAHAc9j170/mu43n6mfNA3t6XkkQXDMKVf4K6rUFtHjqYcuOMMQJxAw
-kDT+1zpr2FX1tL6mmtpfXoYJYSYTMIW0I8x7Ror1bKk0q2TOcbSN8Bpa53rtvqrZ9C2cYKThgZWx
-DGAMgS+qZWH8mZjglOQul6g6A/0Ct8oLVeEZsuIzlKTGDEeamnYP6KyrgvraDMceO6MMhAtGlN6V
-ZumysTfYtTfVHxULxiPvg4DlvgnSkI8QraoI4HVaEvUgw+SuTIEK6oGMFr1uCtoi3aG30KdgmQOG
-Xa4toyc7kVnAeDy5cXODFw5BcFmK6N6K6PO83jpn1n7E+5uR68McsplEyF0CaWlu7qvJfKcGsTB4
-P5fgVh4Pp0ZDFzePmi0QZiutCa6L4D/NeDWibSOF8JvevkUc9z6N/rPIP/E+5cQY7I8L3Pl4o1+o
-TkM7tt/3mbsWr+O7fPha39D9D/L0/XS0z5662/0/0PXLtnKIoQihCKEIoQihCKEIoQihCKEJRQh+
-dv8Adf2zD95h5n7jjwGWeXFxuLwhly5MlvIN08+Myl5sfqG/INZSEWo55HP1TGT6F/EvkPDyXjOF
-NrRjH+2v49k+yk+cfb/LMMsKMQHDOZEh6/xqvNcnXKPc83Wmj6P9v8nFn42Oc5CWQ1gXAiC9sgS4
-Z30XneVRp/Q8lzaOtmkfQPbuacmOJxxAxCPkEWLFwGudmPcvP7tcPPU8xyNCnPU3cnHGUSWcfgdl
-no4PNczRhyjkcvDaDAB+oFW6rXrtJ5rlaoTqcnk4ycbRcR3l0Za6PJwORrmuOhyeRjAmCwMep37V
-rpY87yNSmTMRUPQbrXqvnPQ52yoYksujp2tr+vsUNFsZNourq2x0K2i6Mt/gF1dexOWhGh4liQ61
-67w2pEaLInbRdDVddIgVoeMtVs1beorRZGQW/VtXcVocFbKWbw2KRnjXTwWmrkMleQFndq+QdSrq
-serMOfDExl6hLCkAQBGg1V9b+hppb0MYxxM5QtYQi7iry0BpX4K52xJo8jPkwwjGQpKG76RfQ03V
-isy1WbMso2ZgADaItI7aU21Vsyi5OUZc+MCZfUaRrv8AyVtWXUtgyZcTz87BwLA5IrqDpurq2L62
-xgoyRNQ7W/SwrXVinTLKs+IRpqF5GuD9AhiP+EyRB9B3q7ogjurk8ECFdUgysTAFaKisK36b+hTe
-oCKLp6L5Rk21wZ8ooSD3ru6rSjicjX3Pa/Y3KsxCZGkquQ5aq5HyVJcHjvl9cuD7hjy+p7dx8rgs
-Il2LU718P/nOidTk+fa34b8ep73/AF1MYfuP33jGUpfu8PD50P8A+MXieObV+omIelV5L+Ib1bju
-netj9G7G9vC0bf8A2+P5Q/8AU+gL1pziKEIoQihCKEIoQihCvPyMHHgJ58kccJThjjKRYGeSQhCP
-fKUgB2qNhSkslIRBlIgAByToAoA4fu33p9t+24pzz87GZY+RDh5IYz6k4Z8kb4wOOPnMrDdbEE21
-ZJbZVdWatPD27HFa9p+yPE+7f7z9k4+PNj9tnHm8rjcHJyZSyQlgwZMmPLGAEZvOX+SN0oCIkC8f
-MKrLfm0UpZaUnb4/8X5N1W1l41tetfV57/bvMHxn7z+98/3GZHlcjN7iZSJ4082LDgGKEoQcRaMz
-FssfpE9HrV1yuTyq3+v+h734X4a/FaeKR1y35Zf19PVf4POe28bPPIIQx3N5jIbM7E+PVcrbdJSe
-g5Gyvdnuvt/HkweiJm4XaRBEQ1Q5PVcTlNWmDzfNsrTGD6B7WbMdttuKXlqKka0t7dV5/flz3PMc
-hS/qenxyv4+OUtbQz1P/ANzUdctqG4PO8zUnODLyMNHsAeh+XRW1seb36ZUwcnl8eInaAHAcv2V6
-rVruef5fHXlCORycAiaF7S5Aqw7AtdLHn+Tqg5ueDE9/jVaqWOHyNZVp/JaqbGoMdqjxJ0anRdTV
-Z9EsFDLYnwXU1W+wjLYybuW/XtjDFaLInd1v1WnMiMcFbaWgVlgkaLfXY8CQOCWC2UvaECBnK1V2
-MBGLnt2K21eCSVZwA1orIsHeh1qyuqy3WzI2MXGYtIgbxVnJq7K7PYvz29TLPi2kmVtjAChIoase
-qtVy9bDFMRMDANEQ1yEhzVjp1VyfcuTzJllHFcRE/qAtkDawdmGrq1SXpsyTxxhG4TYOSXckGuu1
-Famy5OexnlHHG4kPjZjMC6ulVZJcm3+J8IA/4Xk0j9CDg1qrUEcVAKuSkIw6K1LsQYK5IhE8gGCv
-1gYVr1MrsQrqamzLdFGXQ9CF2+K5RyeUok9F9qXSlijfaAXLnWmlVRzujPH/ACWJZ969qGSXseIy
-lfQEE7hgvjf8z1u2myriD5ryWlv6G/3T7hP217n7B91RxZMvG42DLg9w4+CQgcuOULQJE0lZKUZg
-Hovjv8Z5ns7rVfRs/TP8O1V5/wAY9OFaF4t5hqJj0lKD7Z7b7jxfcuBx+dxJX8fkwjkxndpB2I2I
-0I2K+mVsmpRxduq2uzrZQ04NKJWRQhFCEUIRQhFCCzhjmLZxEgCCxD1iXB8CoE/P3+xf9s8yXvXK
-wcVvcft+UeOcXEMc2HFIAvMci6GMzjmickJQeUWANCCuTyeb42hZR774X+MrdqVrvwvNs4b+2ceP
-U+Wcnle6+7csZuVnnPPmkDOYYH6RB5yizyEPL5qtRcbbym5bPc8fiaOPWKrp6+v0++To4PtPNkjE
-QgAJREr5VN2raih0/Nc181Iqv8mk8s7eD7M5RwykcF8He2OovYsP6rHb5Cs9TnbPlaz1ydrgfa0s
-MoTxYhOLeTGW1a6p76P2rFt5yfVwc/d8j5dWei4/2xyfNIAmcjqZCj1oO/eq51+cuhy7/IVO/wAP
-23LGAIYF4GIkDQ3DUmmi599qk5e7kJs7QtAeRNRUPvqSsJxt2yrUGXOYCc7SwG5PT59itqcXc0rO
-DlcoOSzAmsjrv3LVQ4XKrLx1OZygAGapFZDsWqjOLyUkjl5oSZiaUAotNWcHdVsxsHLadVqpaDlX
-r+RIk7Lfp22M7RZAkCmp1XT0XaWCtlkJHVbtG1zLFaLYy+K6evZ9xGiwFbqXkQcFbNd2LA8ZbfBa
-9exoDQ4O3itKv2FgcOdTRdClm+ooDB6EO+r7rT5vshlYpljDSiB5CCSGLEnenYFcmWJ/mU5MJMTF
-rIyoQC8QKnQ6OysViyt/uYuRxMJLESiJEUDfVUaK6t2aabbGTPxoxiRGP6ixLv5S1Nwrq3ZfTZLM
-XIGOLRxxuLEzYsBLQjRldRsvo31ZkzNCMjCRHUanow6K6uS+jnsfAQvMI/RQw/4TpkHBor0wjAqx
-MgQrEyBTpkCrkAYLXqtkrsiLp6rZM10U5vpPcu1xGcvl9DrfbeS3OD5QIyFD3v2J+YsHk+fXB99+
-15HJ7IIlmiBTU/8AC+T/AMs0q+uyPmHyKjdJ6HD7fD3n7a5PAmAckHON6dKDvAX5w23/AG/J8ux9
-m/8A5x8t7dYk4P2F97Z/sL3Lle1e5yMvZss3x5jG+WIwlcYCMTFhISlVyxalSvoXxHytbVSsfWfm
-vif31Vu0r/qd16/X8fU/QHt3uXB9y4eLmcHPDkcbNGM4ZIFw0oiQfoWkKFelrZWUo+e7tN9dnW6i
-yNKYqIoQihCKEOb739w+1ezceWbnciGIjHkyxxykIylDDG+cg+0RqdAltZLqW6tNruKo+Bf7U/2X
-zo+683277emOFxuXGOLmcjj/AOPJKcSMpHqQySeuUuRGLuQbtuRzuW1+mrPoX8X+ApZLbvUxlJ5T
-TUdGv+P2PngxZ/cuUZwjkiTHDDJGWQ5DPJCEYyldL++bybZ2XF5HI/wexrWmirWOtmoUQn2+y7nr
-/Z/YTdDN5jiMpRjRhFpi76ujB2XB38rqvocXlc1dO57fg+wD1CR5jcJYyYhwCACXfXs8VxdvJwee
-3c1o9RD2XjCdwlIBgCXqwi1QGdcp8pnE2c11WS/HxONhpCg3DtozV6Uqq3sszHu+Qx9QjlQxhmjE
-j6h0Hch4Sc2/yPqVfvR6cRI+Y1J7GTe3kx/v2qrOSifOFTGWjWiVW+HYrFrMeznJ9H+HcyZuWCbS
-CZVdg3xKtrr7nP28xNx3MuXkxIiCbdArVQw7d6f0MXIyxZ/1OQG1+SuqjmcjYo/MwZTAw1JLl+3w
-V9Zk5OxqDJNgdx1Dtqr6nN2YK6fFaNduzMlkPGngunx7NV+v5ldokeJOmgW3TdvDwhGXRkXXW07Y
-ZW0WCm/et9HHcQaJ7Fq13+gGO+i1eUwKWAggLerJpCjxbfVb9OxfcUYntYrRW7iQIQkR1FN6rT5I
-dKSrLAS8oBJFQHZnpQq2jgsq4M0sBkwDXxBkYsASGPzVitBcr/kZsmEGIIBMZgje4XM6trbJdWxi
-ywGMSEv8sD+mRYM9OquraTQrT9DFnxwJAkAZEF46AVener6svpZn53Fdl5xZP0gON1akQb81YgjO
-ysmCDKySETwQYK6oGELRrcCsK6emuUZ7sryaFd3iM5XK6Gz2An9zRybhTq22/wCC08roeX5/Q/QH
-2aZy9vmJs7AltqBfNP5BROjPl3y0eZ6X7f5Q4/LnAloSNR/Rfmv5/jpbXB6P+K8z27xJb93/AGhx
-feOJkz4oQ80WkIwbcEyeLFywXO+P+Qeqyqz9AfAfONJZ/ueE+0PvH3v/AF77n+y9HHP2zlZpT5OS
-cJzlCM7MZyRjCcYmz0gbd6hxqvonxvyq8V6HqPkvhtPySeytvHaq4XrE4+/r2PtWL/b/ANpZMeUQ
-zxyciGH9zi48MuAyyYrBN3vEIyDm6BldFi4aq9EuVrfc8Ds+B5dXmlv93j0fWY9M/R9zVn/2d9sY
-uBxOYeVD0uZ6RhO4nGI5ZiIuyANCVpuabdrJnvqlM4M+v4vfe7oqvyrOO+Pp1f2PL8n/AHr7P/5P
-D7f7bkHuRzZc1/Jx4ZY44sccMp442TyPkkJ2iUgQDVgKFUPnU8vFZOtX+L8haXt2LwSrMP8AGPse
-P+5f/YP3nB7pycfsMY+hDOQZ8mMc0Jxg8f8AEcco2wNtw1Jc+ZZN/wAlDip3vi/4WtmtW3tqa9Oj
-X4ngvub72+5PuHLPDl5mXLxckzllhBmYXxyzmJQjOU5REL2hobWcUWHk8x374PS/FfCaOLVO1V5r
-v9kZvbfZ+Vkyyy5hOZnK66YIMpO5lITDyNdFyd3JXrk27+VWq8awkvTt/wAD1fs/sX/xpciYxzF4
-tiWhQyBtBFT4Cq5G/lZhSji8vmLy8VPQ9/7d7bkuslIXNJrYeQigMQC9e1cLduS//J5jfvUSemwc
-LFEAs0o0MgAKjckLl22uTi7uS0wTz2REYhgKPqKHtQVJODu5TRhz8t6RZ411d92KvrrORv5fp2MW
-bkmIumKuxB0BV1aT0Obt5LWWZjzsg1Na9QFZ7SMT5tjOedNyGBYagsrPaRjfOeUZ58yRJlGVSdO6
-uqsWsx35beUyufLe4GR8weRJ1Kdaym/LmVJRPkmREh+kMW8E6oZb8lvK7FJzn+7UuafgrFrMr5H1
-K5zuZ9lZWkGfZs8hRotFKpoobGHRbNScQ+olnkaPatWqrTyKy2PyC6mv07IRlsCF0NN0mIywHott
-begsDPRa1eULA8fgtmt/YUsia7rdqspFYzCldCtlLw+sACWOz/8ASr62ALLHGlKfLx7FdW05GViq
-QmQBQSBLMdafmrMFiaRkyeWNwAizgfqAJoz6iquWTRXJgzQ/xs94EovGIuL9dAr6mmryZ8nmMzkh
-6gFAWbQCtA6tX4lq7Qz82DRcFH6WGi7nt3T1IMOqsTCMNaJ11IMArUiBViIEK2qAMFpopFYV1NBn
-2FeTTtXd4py+QavZYA5y5106Byz9i1ch/pPL89n3v7DyE8OxyXiB5tRQL5585SUz5l8zX9Unbyyn
-hziY3NV8D/knFdby4M/A5D12lHpvafdTKJhM+SQrjkHBiQzLwe/RmT6d8N8vZRmDH9z/AGpx+dCe
-XAAMWSIuiDEVDkCL6O7K/hc90hPqj638T8x+lOZPkXuv2ZzOHyeRxwJREj/2rdWJIahoF6/R8irV
-Pfcf5SmxVt6fU5+PB73i4Evao8nLDg8jJ62XgXEQlkhcIyMSQH8u/Yt37v8ATE/pL3bQ9vu+K86q
-PL8Ykuj9tcrHEZMJBnHyCeKRe7fucFllXNSfoS3yFbYfT6o2cH7ayzxRw+lIxzQEpRMCDEGL/E9i
-p28tJzPQzbfkF1T6fU7Xt32tERJzPkgZCOHykOYmrb7iu9Vj3c2enU5+/wCSc4PVcD7cOCWLNKF+
-Nr5+o5cVZ4xOvyXK2cyZRxuRzfJNTDPQ8L2aRjLJOl85WY7XdplmbQMNlz9vI7fQ5mzlf4PQYMGH
-DijZHzN9UepYHWuy5trts4vI5Dabkpz8qXnjRwCxFaJ66zg7+ZZyvxOXmzzujAFqHcFhstVaLqcD
-dvtKUmDNyAJNQg/VJXVocrbyIZhy55CXmJOrgHXvWitTl7N7nOTHl5E55KFw1Crq0hHN2chuxR68
-3JB+rVW11yY3yX27iGcurAaB1atWCl7mQ3E12V9OK11K7bpAz6KyvHwI7uQ26qxcZRnAvkG2ivXH
-SQvkG0Pp2K6upN9ASNEAmgWjVRN4QGMI17ldTSnb8ANjiNVrrQWR4jtWrXUVjx0W3WsCscarWmpF
-GBqFo13UoDLARtst9Lr1EgYVWrXZNgCWZXyv7kABrqzLXW2MBEnGRezXaT9qtT9R6v1M2WE2xwxE
-GTWkncE7AurKtdWW1t1bMmTHdKRkLo4zbaDWho3irk8GmtsGXPCcozyA+YnZ9dafIKyrUwW0tmD8
-zjRcZH6aG+aZEGagVqWCBDOnUBGCsqyBViZAq2rAMFr1isK6WjJm2Fc13OK8HN5CyaPZRL92WJAc
-V2Pe62cn/aeY52Efb/sXlxBxxgGE4iJAqV4j5XVKcnzj5fU3MnreZjerGvyXx3+QcLys3EnB1Wgp
-43JlhkBIlhovm/L4vizucLmumH2PW+0e8D9vEZGdy4Oz6Lhb+PnB9I+I+ZjWpwyzm+z8L3HHMxDm
-YL3PqRq7u6XXyLa3k9/8b8x5RD6QeXy/ao/cCIhEQgSIkDcAnsNAG17l1lzsSejXyX6euWdbk/aH
-GjinIeYTc3ZGdqUAI3IeqyV+QbZkp8lZvJq4f25DFxRGJGT1IgQAZhSoH/SqdvMbtkz7edLnodDF
-7Fx4zeLBoh2dwX6aMyz25Tgyvnt9TVDgcfEQzGgYbm3R+5Uvc2ZdvMffqMJYcItDATJlU6EkvVDN
-jDyOd2nsZc/LIxyi7AsHNW/BWV15OJv5cVaOdLleeb1BHw2BWlUwce3Jy/wOXLkyFzvGQLRB7yy0
-+Bw7chqZ69jHn5BiSbnMwx2Y7q6tZOZv5HjmepjnnlInY6A9Oq0KhzNnIdvxKhOWmjadFetWMmX3
-X0QACXJW3XpZndpHEK6LZq42cIR2GEN1pro7gkYYy+ivrxXPT+uwPIIxlu16q2vFxC9QeQwx/FW0
-4v5gdiDHsnXF7E8hhjqwVi4uYQPIggQXT00NNsDYwjXTxV9dWQNjsGb5rYqqIFklroLXPQkjjZaq
-9QDeC0rKyKMKbq+iSAN/BWpVyKP8hstUZXSAEZxTwKuq8k6CGLkhtBWQ17ldVOrlDJlUrrpirxFA
-Wq+uiuRaogokHeUoCUSRoWLdrqxFqf1MeQmMbZXXH6fL5RQvXU9qtrnoX1yfl4F91yUz9PDB06CM
-++qaSBB0T1chGHara46kGVq6ECFdQAwWrUhLMK6mm2DPdCT0XX4qyYOQ8FvtZbNWsSWGuoqOi6O/
-oeW5mZg+yfZ+e3LGJiBG2Jlb5bWHavHc+sqTwHylMSfQcjZccZg0kHC+c/McWWeUWG0YM+NjTVfO
-/k+L4s1UsXcLlHGIxBrEnXt6LyW/S04O9weZ4pfQ9L7b7oREGOpp4P2dFyd2k9x8d8m0sHWjyMOR
-qVxvNtjKQLj/APUs3i0ev0/J1f4wEc/HMjHIxY/U5+RS+01kzV+T/X1RJ82AlbEXAONWruBootTB
-t5ynGSvLz7KXGpYF2o6auqTLs53iZ5c+IjWQkW8p8VYtRltzkq5fYrlzjKoYuHfvCZa4KLc2c/Q5
-+blTjcZTcSYxJZx0jT8VoVE+xzOTzF+GEYsnJMxJ6MPrNFdWkHK2cnymfzMWXNJi9dKjYBX1ocvd
-uZlyT6EEb1JVtK5Odtv6FVHWnWo7mS1pGAO1Vtrqa6FUlgidTr1XTpqbUsSRgNnV9adpBI4joVtr
-reGLI4B8FqrV/YUa1tFetEPAshtPgE/tv8iSEA+Curqf2BJBEbIV1pdCSGMao69WcEbGtJWn2rMW
-QiJD00T00tTjCJJLSSnWltpkkNve+ydaX0yCRgD0orq67R0ANGPyWnVq7AbG2qtKq2hSMH7U3gGQ
-hvDp3rRRAFJlEMH0L9XbbRXJDYZXk+kEmrOfAOxVlR11MuQUkZBpZRoKg/0ZXIvq/wCxRlP+MxER
-EsLC+7EAElPXqW16zJ+WguUj9QjDp1TIgx2TtBCP+FYiDDXvVi6kGVqZAhXUIxgtOtCMK6eqe5ns
-JPRdni9Tn8joN7cH5IJBPWuwXS3f7TzXM6M+o/auaUcmE4wwxD6X1BbR2deY51cOe54n5Gkpz3Pq
-ft+UZ+NEigA8Oyi8V8jxvI8Xvr42JmxP2rxXP4cyLWxiyQkJHs0Xi+Zwn5OUaqXH43JlikSd6MF5
-7doawdbi8x0Z3uLz/wDEACKgGlD0XNvqyeu43O/SkPHnNUPaKylvp0SvUWLnR+ABzrpEXNFy1Xcq
-PUK+dLanBRPlSeMnBOpajbsnVDNblOZkGTmiMYua1L96K1yJs5iSWSvJzHyRbpoNdNky1lOzmTZG
-XNzAYyBcuzl6U6q2usxbeWmn9jNkzSJIJaLUA7OitrT0MGze5y4RnlN5EhXUr2Zivsl4AxZaaa21
-KKLMYRei3a9SeIyVtltvlFe9dBaf09RJHjEFbdOpPArY8Y07Vspr/MVscRK0rU1juCRgOq0Up6iy
-MIjR1qrqUQBscR+K0V0/mK2RqpvBySQmJ03TPVZY7kkgixJTa9MNuSNjCJ7+xaaarLPUWQ2n+ada
-mSSWVR9mGSQ2nVM9b6gkNHZOqroQLDxCvpRJKQSE7Myd19CCuzv89U7pnoGCSLEVqdB1KeCJAYat
-pUP81YgplGWkwTUM9xbQdw6p6l1OhVlrsDEszUJA8enRWVHoY8ueEmhCpFdn0cfBW1q+pfWkZZ+X
-RouQj9PhFe5MgjDRWIg8VbVhGCtqQKsT9CBdW1YBgtWtisK6GnqUXEnouzxXk5+9YE4JP7oRBJMj
-9IXX2/7TzXKXU+i/bed/SBi0QAI95DOvO8yvU8lzqdfU+rew8t8PmBNzVcy1Gq8py9WTxXN1Zwde
-YBDjQ6dy83zOPg56Zky4nJ7GXlOZw02/oX1sZcmJjR15fmcKHK7l1bBxZjA9gDFec3aoZ1ePyYLI
-8y8AOQe3RUe1BprzfKFIuTk5Y5JRJqDrumrqlSJt5dq2aFPJkNJPSoIdFa5K3ymu4hzzIAejM3cU
-3tQyl8ltEnmJkDswfwCi1hvvl/YW82EElzoVd7OSj3n4tPqKHcNTora6ZZX5jRid9Vs1aHhf1+JW
-2NGHY606uOlmBXYsjEMF0NepQI2MwYddFf4KFEgLQPgt9KR+AjYwiFppqXUDY0YjTotOvVWI9ANj
-iK011LqLI1od/wAVoWpTIJCAFcqdmCRxHotNdWcCyG1irFoySSAVTUomyB/KquVGAEepNOiauvxI
-wgh2BdOtchggLk7dEHTOSAMg4eooOwunprJALwJUIY69pVlaQHxxkSM47u7BzXU7UTOuB3UAlN7W
-20P8VR8VJIQ0sgiZSJ0ozsykAVZK7gICUjcOlOtH/qmgeM4K82b0xZq+1C9dC/YmrWcjUrOSg5ck
-mkGjMfUNCw2JKs8Ui7xSx2KZicmjKvWew3o4/BOsFicH5cBouQmfp5BTBGkeqssyDBtNjsnr6BGi
-raIgwVyIMArqIDCFp1iMK6WgouJPT8l2eLCZz+RLRTh/78QdDKr/ANF1rP8ASef5KPd+xch/RAMp
-Bg0CzANs64XKr1PLcynWT6Z9v8ucMRlGTE2yiAGBi5oPFea5VJZ5Hm6k2ep4/KjkjEPUgGvQhcbk
-aG+hxNmuMjzgHNF5/kcZS5WREzPkxA7P1Xn+Tw03ktVjHPGQeoXkuTw2njoaK3FMWKxbeLCY9bZB
-a6SnHbqG9sgsbRG3GjoKrBsVq4/Vk8iWmqR6JT/EPkEwKsfG6C+QwhUNRa68fK7CyWCG6210dxZC
-IB6juVtOOpyCRxBitVdEMEjgFa60cCjCDmqvppTcMWRxEsy101uIgEhA7FfWvaADiJWha2LI1tFp
-WrpIJGAWitMfQAagUHcFo11wuwCMW6nZky1EFkbdnMtuxPq1Q2MlIDkYgs8WcmiuVQqoJZA8uh0o
-m8ZCqiynZIQkWFCHq/cX26I+MjKsqQetGQIBdq1oCX0qj4QTwgr/AHUROMX+twIsdRTVN4SP7RXL
-kxiTYdCNHe46UTKg61z1E/dQiJAAiVK1FHZ9Ufbkb2iyOc3SjKcb4kgQ1bq9ErqK9eMFWXkCMWIF
-p/U1CBWqdVkatBRnxTxepjEgzCNWrudEfFpwwujThjZM7ScUEQJCQJoDQv3IKpK0M3qY4xeBEjWl
-XfUkeKsh9y3xfcry8qMhKbyHmFwJIiQAzF3TKj6D11w+x+Yu9cU/TQabIkH1YbKzqEaLFWVaCOGd
-1dSOpAq5EGVqAEK/WKwrpcco2CyXZ48mDcZ4SlDNdXXqy7MSjgciszJ672fkC7HKMjbKOtTRu5cj
-fTqec5VOsnvvYuT/AI3jktBIMTIOXLhtad64PKpnoeZ5dMxB7D23mB4xkS5cCI1p12IXI3azg8jV
-3O1GYlrv9K4+3S3ZnOagWcRsuPyNCkiZly4n2+K8xyuJPYvrYryYwBoy5/J4qVekDKwggWAWauhw
-l/oNIfTLfkmXHcAkIxlOuMyeQBjeJS14jdWTyCI9lU9dLx6kkawPVaVoS6iyOI79VqrpXUWQiFX/
-AIKtppzIJGEHV9dMgkNp30Vvtv7EkcRK000tZFkcR/qFq165/wBRWw21Vy1ZBIbSrXqcwySMGWnX
-rAQtX8lorT8yEMgCPzpqr1XEBSwIMlBd5SXYSOrJvEbxFjMs5DOQA5D6FNGRmkUnJEm4E2/SQ7VB
-1ATpFir2KvXMR6heoI8pDk06Ap/CXAypOCk8kGbbkO1ZABgaHwTeGCzwwH91CUTVncyGwo4i25U9
-tk9soycgRxztiLTQE1GhBAO2qsVJZbWmSk5JkCGI+Rg05Emm/lPanjux1VdX1Jk5mIGpJJFRIg03
-qEFrZK6mE58UWMSXEXMBqSS+rqKjB4NlePlxaUIl8cZasWYV+SZ6+/cd6+/cGTlemTHG5OwBYeJ6
-MiqT1JXXOWVZOZJxsCOunVky1j11kHMxwh5QYgObHoJA7bgHdR62w+02yo8yEiZSMmOztcSGqmWu
-Og3tM/Ogbx6rzyP0iMw12TQELA71ZPCIOI/JWqgRhorl0IEJ0iDBXpACFfrQrCulogouJPRdjivM
-HP5CwZyP8gJZ3etF2aqEcXem2eg9pzGNjuwFXLCgO6wb69Tg8mvU9v7HniMUJXNEiNZVch6B9CuJ
-yq5PO8uuT1XtvM8kZepKEsZ8oH/V1b5rl7tfaDi8jXk9RweQ8ItJmu+o02aq5WymWcfdTJuhOM4i
-QLg7rnb9Usy2TTKpw+NWXnORoffqMmJPHRtVh38bEdcDJiRgzNXo6za9MRHYLZLR+antrpAZIIUQ
-WiESSWgA95ZMtSXX1ZJDbUU6pvZynHr2BITHSlHqntq6OO6JIWP/AArfCGLIW6Kz2/QkjiNVrrpy
-LIbQzOnepNQn2BI1v9FpWqASM1Oi0V1ygBYAVHirlrXRoASwPbsForqCLeLmJEengra1xAYBcXYb
-61Dg7BO6jQUTnK2QkLSTQT6sNKJ6osSK82UerjFwMw0n1pRk6WB6Vww5MsbfM4nTtFxdh2KJErTJ
-hy8ucZGBq30zBeh100V9dc5NNdc5KBygAJgg4wfpfxNKtWqd6/zH8O3cB5Erbsc3Nx8wH1An8VPD
-1D4eok8uTEZyjO2UhKpANXfdN4p9Rkk+xTmyymJRJBkCIkEhh3ANRPWsFlapMplkN3pnKA9YyNKs
-KBu9M04lKWOq4mBBllKQjIMQXcmlaM6aA+IYZ/qi0bhEhnJBbuUdSOvcWU8sYgOSAxArSvQ6opIa
-EKc2SR2JmS7gFxtpsyPig+CRVLJ5ZG7sjXVzo5CaB0sknlsHpmQkLogSNSXpr+KKrOSKs5KzUioE
-YlyCxN2mqMDHwV9F5eT9EBd9USDD5qxBHCuqQYK5ECEyTIEK+oAhX0FYV0dDKLiyXX42DBuM2Skn
-avxXZp0OLv6nc9tkB6ZJAthERlSh7/6LHuRwuQup632rkQPGE5yNDFnAcFjX50XI30/VBxOTR+WD
-0ntfIj6ULJgkuC5BdhSh6rnbq+pyeRryz03B5WWPHxXNGEzIAuQKCOg1XM2UTbg5G3Wm2dnj8iRZ
-jUnoz7DYUWO9Dn7NaNdJMfguLyNOTN0FnGj7LFyNLiQpiWhh1ZYVrUJ9xpJa6i1N9iSQBGtG3BAE
-U8VXakr7hkLBw3wVjplQAlpYdHR9lx9ySNar/ZXQEksb+aL0R+AJGEVorqkEjN5Vb7cUJIQFfSn5
-ihPUDTUq9aiCkufKdfzV/h6jJFd8dRRyW6v1dWKsD+LEcwkJUtNWZ9aM6fqN1RRORjACFgiH8zva
-SHTpFyXqVzzmOEGMrsgDASJbrp2plWWNWmfoU+pli0oFmIBiHuAPYd+ifxXQshPqDkco/twQ4Lis
-6SAIJZtkaa/1Bpr/AFGLLkc6gCRDSOlv/Kuqi+tSgZDDKxMTGOtXFS3arGpRb4ygZ53AiI84YAFo
-ilSaKVRKqASySnGUSbpDY0Z9e9MlAVXJTPMTEiLQFNOwMa/NFVHVSmWW6OSESB0m21A6dKCxV6Mr
-yZQQSMhA0Aj30L7J0hq1z0GxSNh3lONZu9RqELdQWWRBkxkvKVoJeLF336oww+LGEx5xCIFrC1tz
-R3GyEA8eki5OTvTEAGqzEUoNkVQatPuUGQakgxLQNAwfdk8DwI7SERWMaUGm7umgaMHw8LyCP0CM
-LXTqAjaJ4jqEcBXJECFbUgU5BnVqYAhaa5FYV09EdTPcWS6nHMW4z5AdR3vuuzRo42+rOjwcjCIe
-0EUHzqqNqONur3PUcHILHAjc4E2o3R9GXM2rJx91cne4XItsB8kASxIADkMBXVnWDZQ5m2kyeo4P
-Ih6WK8+U5JRjozNHQ9VzNlcs5G3XltHQ4PPthKBk0IljJwxDtRqrPs1Zky7dM5R6PDNwCJUlGJr3
-Ab9i5O2kyoORepZeCG6UKzcjV+nBW0SwAaLA+OqroSQW769iRaZUkkNvwR9ldOxJBbTs2Q9mV9JJ
-ITByPmVL6JsiJhtP9Vc9TjAJIIugtJJCx8FatTZJDuzq5UaygAD6HrVP4qAgMy9Gp+fTqr1SFHcP
-iSRo5IiAKuf5J0gpFWSQJNoIqACKux+QBTpD1rBlOQym1zCJ03DaHTdlalgvVUkU/u4taIGMQaz1
-auvRMqDvV3M5zXAxahkZNHWvcO1W+JcqdxTP/JIF2ZiJHoGpqdO5GMDRgoOVoRlEigN2MPq51fsT
-quYHVcj8jkgQFWILsQJfUKMPzS0pkFKZOffMGJl+kuHZq76LTCNGBZZI+pIEuTUQr5hs7fNGMDJY
-FlIy8xkccWZwXYPUvsjEDIq9TEZvjJkQ7Rq2wfR00PuN4uMglI+pO0nSglSj1FXRDGDPKb5DIgM7
-RIOx6p4wWKuCr9xG1hQxj5S4k5G0in8SzwyTHPCfUgJmRZy2oLsGHRB1eGRp4cEznGACJAebyxHm
-DtXXojWSVkGSUJRMoEyjIAkMxHb4bKJeoapzkr9WAgCZVAjUs/m/5qm8RvFyIZQuha4iS90SKnX8
-90YYymGJ6gjIhnMaFzqB2DsTeOBvGT40F4pH3kMfxT1CPUqxJsIwr3qxZIMHVtZIFWKSBCsqAYLV
-rSQrCujoRRsFkurpnoYthTkqWPguxq6HK35ZbxJmOWNpJEQCSw0btTbFg5G5Jo9F7fzICF8mMbod
-4Ac1XO3a23g5O7VmDucTlS9KNjycmbdd+vRYb0zk52zXk7/D5kDx4ATthKUwRqS4BavwWDZr/U8H
-N26snV4uY4xIkCMCYgh3DfBZL1kxbKz+J6niZZjHEyLQMY2sQQR5aB1yr1WYORson+Jp4XK9Sb3g
-4zWILPUP/NV7aY+pn3aoXTJqOTzsGu0PZXdZ1qUFHjgsDMG7lW9WRGShaQqEq1+oPoBqHUKr2204
-xkhAQ5eh0rumeqHIQ7tuEz1NQADsW37U9dSWQwRnGpoU/j0JIgyB2+obEEa66FOqQP4kjORasTIP
-UdEbrAHUSRnZdEgxDsxqAd6JklOR0lOSi+VsJSyCJMQTKW5PSitj6FsZagpyciEKCRjEG0vrQbjt
-TVpJaqP0M2XlTEoiE4gfQG1qA5CtrT1LVrXcpy8k+mRjAiz3Sozy+VU9aZyPWmclE85vvpKEvK9T
-/D9ydVLVTEAy5cnqPDyxFbiTd5di6NUoJWqgzyyGJE6AyJABeo71ZElirJRkyTyYosR5TEy1FCNP
-5p0kmW1qkxDmlGMZyIiSKjo+4fYdqZV7DRLK5ZHMSCZQtDTBb4tT4JkhlUUzlKoFoP1Vao+KKQYS
-BLJK4EG3JVrS4D7t/JSBkvyKDPJjuOlxAA6/gnhMsSTKMk4QsuP6vNc9xJDGlU6q2WVlyDJK2JOO
-si3pxAe4ClSRsjVeoUp6iC/HGYIFxhQCjP2I4Y2GySnIgGRjAPsfnTQIpASjBVKQeIk0gXBtarlx
-ToikWJegmTISYCdTUykdCG0HwTJdQ1XoSc8kRKAi0Q1rFzc+rkIpIiSmSuUxCcIYwwa4nWp1dGJy
-x0pUs+SgFh0XhoPuY0Q+yeqkg4BpRlYkEYVViyQIViIFWogwVtUAIWrWhGFdHSUXAdF0tPYybCmY
-cdWXX1s5m1SDFcLmegBYMrrHK21O77flEccnDmVtolpR3/FYdtZaOXurLOtwM0xiEj5hpboQT/bs
-zLJtrkw7qJs7eDkwHHxiJYXSja7bR6rDan6mc++vLOjg5cccYlzcC5I1DAMC1fFZ7a5Mt9cnq/bO
-bM44EkvO0E0bQMKbLlbdXX6HF36lJfwuSJciMpeUVETox1o3wKr2V/SVbdf6TpnkxvkfUEZVMoVY
-kFu91mVDH7eIjBrhmutBeJDXXVod6Kq1DO6QPOY1vESaAoJAVSSyQjaLrXIYHeir8P8AJFVvsQzN
-hYE6dmven8VJFXJJZIShMgkyjGo7dVHXoRVcopOY+oZMJSpEf10VnjgsVMeg0cjS8xkKVp27dEHU
-HjJX6ojQnUakivcB803iN4SCGQjNCGsGLUodS/UlR1ww2UpvuUR5UjkDeaJcBxb5RWklY6YLXrUF
-Ec5lAiEgDpE1oDtV/wCCn8Y6ljpDKuXzIjKBf54gOY7sWYt02on168D69baMk8plP62kQZSIqa6/
-9KtVcFyrCFnmjdKQDyL3jQCjA/8ACKqMqsqOaEMptIjGLiLih0L7p/GVkfxcFUs4rEkmWjkUJL7O
-mVRlQrnMTEMnqGUo+VmDP17KJkoxA6UYgqlKVsZBmLAWux8p1cp0h4UwVylARmwkRI1JRQ8TBVI2
-3Bg1ZHpXQMEyGWSTyAxGTrUTIYWmuoRS7BVcwU+sDCRlH6yBbsA7XO/RN4+g/hnAseRFroBw7gDY
-nyvUouozo+5ngYG71ZECJYM4J00d+qsafYtcroAZJiRL3ElwGO/Y/ejCDCgS8j1BEAiYFGdxcOtd
-kUugY6CTzSOS6EjaSGhKuv8Awiq4yMq4DkzgkmUmasZMa7qKpFUzxaUpPJwKAMQWPYXVnYsaAckp
-Y2a2UPpD7SqwRjMhSyKZ4schElskXM2aQ+H4ow2gpNny4DuXgUfbRg/inqwj3SVvkwjOWVibggwK
-sq2QKtRAhW1AwhaNakRhXQ00RTdgK6WuqMt7FU3qRqutpiIObunr3KmiS8nAAGgDn4rVk5dzq8DI
-Y4JScaxFzbf0WXasnN3VlnV4nJg0YW+VjXZ+wd6y7KPqY9tGdvDklHBD1Npkv0YDXxCxWWWc69c4
-NmHMYtOIaTsST4bKm1TPanY9T7dmlLFjtyWGyEbgW8vlrofBcnZX6HJ30SbxJfwc+U8qOOErZ2SD
-bu1LjTVLtSVZZTtovGWdIZ8t2QxnMsSIxLh66inUrMqKDI6LGDbDLmpGM2bTJLcbaB1S6ozOq9B5
-ZMuUQEyIh7QXo/5DZBJICol0Lg8ssIl74iPld9tR3Kp9CvpkGKf1eaRtkBbX6g+h0CeyJZdMAhlI
-jkMmLjQ0LOxDnvQsugXT0FwzlAemSbXNg2IJJP8ADprKchtVPJlll5Bhkf6AXE4kvdIM1VaqpNF6
-rXAByJjMY3xnKYYu7N41CDooD4KOhZDLkEhZGMY4xIiQchhGp7qoNLuK6qM9zN68pTkHEoAEsAQJ
-Udqq3xwW+EIry8m+U/IDlpbIh9D9WupTVpH4DVpC64KJ5CJT8lpBFoAq7eZyE6RZWuCvJKJNwHnM
-axAA1231TVkZIqlGBeIi0yGdnIfx/BMmyxP8iuQwRmZRdma4NSXb2J1Iy8miozxiEgIylE/20Ibt
-LJocjpMySMRAC5gCSCXubowVqLl1LM0skoY7ZmDW0LjWJGiWqUsFapN4KZnIZNCbiQBixOg1dxqn
-RYojKFnKcRIXPcB9VC47BWjuioDVJlI9bJjMccgIlhQuWGrbJsId+KeRZ+sTLDjIEwGkWoTo7Gr/
-ACRUdWFR1YhnOYl6kvOQzksAa2s6ZQug0JdDNKWSLCUo3V8+vgOitSRbCZWZRjIAxudjEyJFQG2K
-aJQ3UIlCRmZOYxFJGm9fxUgDTBKOAltTGhgxYhtXcKSxk2iqcYhr9BEECIIZ+qZDpiGOOxx+phEC
-ld/CiaWGXIJSxxFomYnaNGfxqjkiT6i3AjQkEM8WAAfd0YGiD5wNO9fPUfaQgJoIP0fRWII1KK1E
-CFbVkGCsqQIVlQBC1a3kRhXR1Vkos4AdFv12hme6wVSf+Oq6utpnOumUyBEi7Lang5t6uTbxJxjj
-mWoTGj1avcqNilowba5OjjzyEJGJYswtLalZ7VMVqZO1xckvQxyjOhkdKtSPw8VhslLMWxKWbMeb
-IQLSGuFxD08VW6ma1Uei4GfJLGJQMYRsgTKuoMRuuZsql1Odtql1L/beTIZroh4ykYkEAP5TuW2S
-7qLxKN1MHUhyZHLIAMJOwBNA/hQusvhgx21pI2xzkEiEmH6KkFvFVOhmdPUux5zRwIwcigo/Z8d0
-lqlbqaPXJyiJmRMCNdS1uuqq8cFfgox0K8eWc8chLI8LhVjXUl+uie1UmsDOqT6EhmIlkrpjcGUg
-RX8ELVx9yOuF+IBkGWQE5mMiPK0gA2pJLItQGIWEVQyyF2OPnyCjA00q9zbp3Xux3Xv2KzyCARIh
-/wBRZ5FyPDwR8R1QfBOHrWD6y4o4AAiTvXwQvVxItk4kzxynzAF5442knTXdjXVW+JY6/wBysylG
-IlYICRLSAqBo1Uw3jJXLMGmXDHysQ+uqPiOqlc4wAYu4BboT/IDR0ykZSL6kDItICQBD7VDaHvRg
-aGZyAclsPMGaUo6E6h+qs7SW9hPW7Xc/UB+PVHxD4g9WIjISItBqAdyjAfASU4HBHNENKRFt7ufJ
-Q67KKr8oHh+TRTlljMo6SuIMrQz60A08VYkx6plMxhkBC3yz0Jd5Gv4nqmUjqQC71IQyS0F3lDAE
-1R7Sgt4kry8jJESxlrYkkwBZz8k1adxq0XUrnnNYxIAIaIrtXegqmVe46qUkzEgZ2ysHcAX0Lmqf
-A8ISObGJCNrRIrEFwHNQxTeL6jOrAJAXzj+mLmO+qMdiNdmJLIKnFK01BlH8j1RS9RvH1FnkiAKa
-gAS1OwOiKqFVkEpxjliJBg9HIb4IpSgqraKD5wRaHqX1kKaBOsFiwVlwRG6NuoGgHh3phzwdPzXz
-g+xDAnT5J16EHYdFbCCFtk8diBZWpECnIMFdUAQtNBGFbtTKrEK362Z7FU3ZdXQ0c/amUzANVvqz
-mXXVlnGYxIlViKagiqGwybZN0HMQYuI6RAP9vXqqGZGdjj5CONA3u8jG4ijERo/Y6xXU2ZivXLN2
-HJj9P0wbgD9WldQ5PeqLLuZL1cyeh42T/GAR5LYuQd/LoO1c6yyc69ZDxOWTkjbIkz2egDNUbo7N
-eBL68HS/dWSMoFiJvcXfubos/tz1Mntz1N+PkiWMGIc0ELgPLs1O5Z3TJmtTJfizzeQiGu8xAej1
-FO8JLVK7UNXqieQS39MGZYlhb8lVGPuU+LX5lccxOHIDI+m8YippQt2VTOufqM6RHqC+mcRAk4Ym
-JqzufmpHQLXSRDljjZntiBGREQ4BPcmVZG8W+pX+5M8hjjeJo0avLvKbwxkbwhZJ6sxJ4MKUJFSQ
-W0JU8fUniiYp273EGRL0kfKzP0UssAdZKoZ4GNbgCd3ANE7rksdGJLMSCZeaRLt3tVFVCqElI3sA
-dCXYODqT/GqnYKRTKVgDkyixFrEAkmm6eJHSkpnOZjMRqTUk0cbgEtVMkWJFYzY4UNK1s/OjJvFs
-bwbFJgwjGLaAy0rozBHIynqUwyRHkMRZKokdpA/yTtDur6hzTjAgA3RhCLACgDEN80KKfxYa1kpl
-yIGHlibtccox2JZWeLkdUclN8RjcxMgPKY9W3rtRPGR4yA5cbOYGLu5IJLjTTbZTxYVVinPAi25i
-aaGjb/OoRVQ+JXORjlEWYs5fQnV27k6ypGSwZpznK0FrdgAdG8FYki5JEiIiAu8rEmTjTbaqjAxY
-5JmEhCgJqaO1EYG8VORfUAMQKWAP5abk6owHxF9QvQUl1NfMWNOxTxD4gGSImRGpFZO48UYDDjJW
-MkWcvSj0Nenimhh8RHxk5DJ2jChDFiaxe7Z9UXOIHXY8ONHC+b/gfYBgFYkQYAp0mEbuViIMFbVE
-CrCBCtrgDCFr1yIwrZoyU3AVu19Si/QSRXT0LJh2spnUroUeDnXUtkxyIjJpMHD9E1jHdS4NeGUp
-WFtX8x66t2KqyMt1EnTxy/8AjYgwIJn3uIx6grI1+p/YyNZZsx8qIhG24aWvFgDsN6Kp0yZ7Ulno
-OLkHoREjW2Nm7XW/FnXOus4Odsrkbh5Cc0ZAgyiTfFtaMjsX6YK7rBsyTJy5Lbg8yDVyOvTtVFVh
-FCULJ0IcmUIxnWyZYM1G1J/u8VQ6TgyvXJqGU+UxJcx0qQ2taaKp1KXQ1nLI8iJlkHpyiDKMdCBA
-t+Cp8cfUp8V49O4kcsZ4ckzI1Y494lrnYBvimayhnVppBwci+RF7E4+jirUJUtTH3BakL7meXLNw
-lKQujIPEsXAqdDVk6oWrWNDlEwIDEXeQnUgvoSg6C21ZK5ZTLyScyJLSqNemr6J1UZKB8OacpxnM
-/wBzzFAGizdqFqwsAtRJQiqUwJG6jg3fB9kYHSKzmgLyKkfTWj9B4J/FjKgpzziasxcs5DbV3qp4
-oPghRlmZkSkSXLxJNB/0+G4RaQfFQJlm0osDKESDOIAMi9SdDojVSh61Kp8iQkZPazmMhVmPQ6p1
-UdURVkyS9W6JMjBiWqTLvZkyrgeqUCyMpeQ0BJid6do/UmRPqTJOV0TE1kI3OHFY7u3RCqQUjLjM
-owk5LEvdoxqKb7K1pNlzBK8fTMi/zASLs9U2PQiB6k4GdwJmGcu8m2IPgpCYYTBPLMMC5YU7pDoU
-VUiqUiUwL2JuAaXXuqE0IshdCs0kZGTVcAV/IphkJIsDObjYSJLkHrXbZGOw69EAZIiOSbAm1hdW
-rjRFrKRImEQGFpDFx9RJL9T8lGSARl+mUSIyAZtX1qi0FoSRmYi94gkxJ0cPSqZQMo7FLWEiLvQA
-F2pXVN1H6iZTaDK9wB5onXRNUaqk8dEUXzWqPrgwFNU6QRu5WR6ECAnSIMrCBVpAhW1cCsIWmmBW
-FbdLyU3RFtoU2EO66OrCRj2dWUyGveukmc+y9BQw3ZqsrDJaqkvxZTHQhmo+2qrsjJspJtxTHowM
-i105GhbaOioa/UzNZZNuHLKl2lzAdDTvejKm1Si1Du8DkRHGGIxOSwRu1fWLGnR1z9lMyc/bTMlv
-Dk+SEYUE38xIIfUkv0Q2dCnZXGTTPk5ZZcryct/9LVVaooRStahGrj5gAIyIalxFGIclVXqVXr3N
-eKV4gXaYFpnEmmjU6KqygosoNgyH1ccakCIsOuke89FS1ifqUQobCZE45wI80rAYjQRtLkg6bIRk
-kExyjCVbibCKihqDVi1BspbKI02UeqSbYiruIlqF2rurIgfxCM7m2NvmLyakXf8AuBqo6k8fUEOS
-0ZCRLA+UuQQ+zdQo6SF0DGc4ZJGAEQQWen6amqDSjIPFNAvySJrGOzdSRsEYRISKxOBkQfKCD2yD
-agItDw0KZnSExdHzkW1IJa2p1TJeoUvoCGWLiUXe02gVZ/hVR1I69ikZs05nzgkR8xNAKMx71Z4p
-Is8EkVjklzEsTqRowoGA3R8BvAEsmSNItKca2O4AG9AxUSTGVUxTyMhiBIA29oJatS2/Ym8EFURM
-kmEJH6qEk7i2joVXUiXUzzyg0veIdiQWAO7hnVqqWKpSDWUIk+bzRkA5dqpvqWRgb1YyAuNQ8rhQ
-1G1dlPEXxhiXyEKkEEEXEG4s7ih7dEYyNBXcDG2JeAam1a0CdIfxZUJAwiRO6Iqf1dhPVk0DtQ+h
-XdKUwYnza9AabAI9BoSRCWGRsgrFpRZwfNt3IrsRLpgSWZ8hjGVQXIA2RVcDKuBpMROUpPGJ66Hb
-56IARXIx9S0mTjzMd2Z2Z0yGSwLMwYNrsH0r2aURSCkJOROPJLUBi4NX0qiusDpdDyXmADAns3Xz
-PJ9YkaJJYsfHVW1CnI1U+QjB1YpIFWIgap1JAq+uRWFaaL1FYVu1lNiLVRspshJLo6WjJtRWdDut
-6ZiawIwCvTMlq5RGf6fq8BoOqhRZJGzHkfDj/ueVSewUVLWWY71yy/BmIBLAeYvFw7GnwSWrJVeh
-6Dj5mwhybWiTMVkD5W73XOvU51qSxOFmxnNjneBIUlJ6EEaM7aI7KuCbKOHg6GTODkmHAaXmehD9
-m1VRWuDJWmC7HOQEQav+rSoPYyRordTXgzNjIEiCQ7EaEKq1clN65NmPNGE8ZAa6ES7/AE+Wo10q
-qXWU/wASh1mfxGxZoelKYFpLAPUt5upQdcwLajmCGZxxmZVvjTV3pXVSJDElcMoiZMWIDgEk0NXp
-0OyZ1GaFOeEMcxQRL0BqddBTqj4yw+DbQseQRMTDM30kjzMaDsRdew3tyoLceYRyG3JESeR6xZqh
-LauOgjpjoKc0qvMOAzO511ruyKqF0KfWxGIMpj+5gd+6m5YpocjrW+yElycABY2lmlHYkUBc96bw
-Y3t2IMkm8hFkgSQ51AYdNVII0hYzEbpeWUQxmS8QIyoQyPUZoRwQIGkyfNIfT2B9NEQw+ok5444x
-HzABxKJBBB2/BMk5Ck5F9WMhERoaC7Ste7ZN4jeJPWjCMAPLBwHBOrHqEPGSKjllU5CQg3Xw76bp
-0OlBTGQjK4O+jl31TMfIZZwZNkDCAJD0Pm7AoqgVPQrlk8sgC9xa2gahdgmSHVegs8sIxBlGNoFD
-V3FQ2qPjLCqtlGTPivixe4gksxLDsbuT1qy2tHBMnIxkmBMXiHDSbUbIqj6gVH1EjPHGNol9USO8
-A7OpDY7TYMmXy1kCNAIFte6qatQ1qVxyQMRE1J0joHA7+uiLTGayE8jKXjI1ciUKufDwU8UDwXUQ
-yzlxGJiQKzIbv+CKgaEK5EDKQJizaEmh1HzU7hjJ/9k='/>
-<saf:endOfStream ref='Stream2'/>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='100%' viewBox='0 0 176 208' width='100%' xml:lang='us' xml:space='preserve'>
-<image xlink:href='stream:Stream1' height='150' width='120' x='10' y='10'>
-<animate values='stream:Stream2;stream:Stream1' attributeName='xlink:href' dur='4' lsr:enabled='true' repeatCount='indefinite'/>
-</image>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefuse.xml Deleted

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.2" baseProfile="tiny"
-           xml:lang="us" xml:space="preserve"
-           width="100%" height="100%" viewBox="0 0 176 208">
-         
-         <g display="none">
-            <rect id="rect" x="5" y="0" width="50" height="75" fill="rgb(44,45,46)" stroke="inherit"/>
-            <circle id="circle" cx="80" cy="0" r="20" fill="rgb(100,80,40)" stroke="rgb(40,80,100)"/>
-            <polygon id="polygon" points="120 0 130 30 80 50 100 35" fill="none" stroke="rgb(240,180,90)"/>
-         </g>
-      
-         <use xlink:href="#rect" y="50" stroke="red">
-            <animate attributeName="xlink:href" begin="0" dur="3" repeatCount="indefinite" values="#rect;#circle;#polygon;#circle"/>
-         </use>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_hrefuse2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='100%' viewBox='0 0 176 208' width='100%' xml:lang='us' xml:space='preserve'>
-<g display='none'>
-<rect id='rect' fill='rgb(44,45,46)' stroke='inherit' height='75' width='50' x='5' y='0'/>
-<circle id='circle' fill='rgb(100,80,40)' stroke='rgb(40,80,100)' cx='80' cy='0' r='20'/>
-<polygon id='polygon' fill='none' stroke='rgb(240,180,90)' points='120 0 130 30 80 50 100 35'/>
-</g>
-<use stroke='rgb(255,0,0)' xlink:href='#rect' y='50'>
-<animate values='#rect;#circle;#polygon;#circle' attributeName='xlink:href' begin='9.765625E-4' dur='3' lsr:enabled='true' repeatCount='indefinite'/>
-</use>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_image-rendering.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_image-rendering2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_paintserver.xml Deleted

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-         <g id="defs" display="none">
-            <linearGradient id="MyGradient" stop-color="lime" stop-opacity="0.8" gradientUnits="objectBoundingBox" x1="0.2" y1="0.2" x2="0.9" y2="0.9">
-              <stop offset="0" stop-opacity="1" stop-color="#FF0000" />
-              <stop offset="0.5" stop-opacity="1" stop-color="#00FF00" />
-              <stop offset="1" stop-opacity="1" stop-color="#0000FF" />
-            </linearGradient>
-         </g>
-
-         <rect fill="url(#MyGradient)" stroke="url(#MyGradient)" stroke-width="5" x="10" y="10" width="150" height="100">
-            <animate attributeName="fill" dur="6" calcMode="discrete" values="inherit;url(#MyGradient);lime"/>
-         </rect>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_paintserver2.xml Deleted

@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='defs' display='none'>
-<linearGradient id='MyGradient' stop-color='rgb(0,255,0)' stop-opacity='0.79589844' gradientUnits='objectBoundingBox' x1='0.1953125' x2='0.8984375' y1='0.1953125' y2='0.8984375'>
-<stop stop-color='rgb(255,0,0)' stop-opacity='1' offset='0'/>
-<stop stop-color='rgb(0,255,0)' stop-opacity='1' offset='0.5'/>
-<stop stop-color='rgb(0,0,255)' stop-opacity='1' offset='1'/>
-</linearGradient>
-</g>
-<rect fill='url(#MyGradient)' stroke='url(#MyGradient)' stroke-width='5' height='100' width='150' x='10' y='10'>
-<animate calcMode='discrete' values='inherit;url(#MyGradient);rgb(0,255,0)' attributeName='fill' dur='6' lsr:enabled='true'/>
-</rect>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_parsing2.xml Deleted

@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<rect id='my_rect' fill='rgb(255,0,0)' stroke='rgb(128,20,98)' height='75' width='50' x='10' y='10'>
-<animate id='my_anim_on_x' accumulate='sum' additive='sum' calcMode='paced' from='10.25' max='30' min='1' attributeName='x' begin='1.5009766' dur='3' lsr:enabled='true' end='5.5009766;10.000977' fill='freeze' repeatCount='2.5' repeatDur='20.25' restart='never' to='100.75'/>
-</rect>
-<animate id='my_anim_on_y' values='0;25.5;30.25;35.75;40;100' attributeName='y' begin='1.0009766' dur='3' lsr:enabled='true' xlink:href='#5'/>
-<animate id='my_anim_on_width' by='-30.5' attributeName='width' begin='1.0009766' dur='3' lsr:enabled='true' xlink:href='#5'/>
-<animate calcMode='spline' keySplines='0 0 1 1 0 0 1 1 0.75 0 0 0.75' keyTimes='0 0.32983398 0.6699219 1' values='100;80;65;0' attributeName='height' begin='9.765625E-4' dur='6' lsr:enabled='true' fill='freeze'/>
-<animate calcMode='discrete' attributeName='width' begin='indefinite' dur='1' lsr:enabled='true' fill='freeze' to='100' xlink:href='#5'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_path.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                    />
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg width="300" height="500" viewBox="0 0 300 500">      
-          <g>
-             <path fill-rule="evenodd" fill="none" stroke="black" d="">
-               <animate begin="1" dur="4" repeatCount="indefinite"
-                        attributeName="d"
-                        values="M 40 50 C 10 10 140 10 110 50;M 30 30 C 20 20 100 70 150 30;M 50 50 C 20 20 130 20 20 70;M 40 50 C 10 10 140 10 110 50"/>
-             </path>
-          </g>
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_path2.xml Deleted

@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='500' viewBox='0 0 300 500' width='300'>
-<g>
-<path fill='none' fill-rule='evenodd' stroke='rgb(0,0,0)' d="">
-<animate values='M 40 50 C 10 10 140 10 110 50;M 30 30 C 20 20 100 70 150 30;M 50 50 C 20 20 130 20 20 70;M 40 50 C 10 10 140 10 110 50' attributeName='d' begin='1.0009766' dur='4' lsr:enabled='true' repeatCount='indefinite'/>
-</path>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_pointer-events.xml Deleted

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" x="10" y="10" width="50" height="50">
-            <animate attributeName="pointer-events" dur="3" values="visiblePainted;inherit;none;all;stroke"/>
-         </rect>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_pointer-events2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_points.xml Deleted

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" fill="#2288AA" stroke="#AA8822">
-
-         <polygon id="my_poly" stroke-width="5" points="10 120 10 120 130 120 130 120 70 20 70 20">
-            <animate begin="1" dur="3" fill="freeze" attributeName="points"
-                     from="10 120 10 120 130 120 130 120 70 20 70 20" to="0 120 55 180 95 180 160 120 95 60 55 60"/>
-         </polygon>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_points2.xml Deleted

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' fill='rgb(34,136,170)' stroke='rgb(170,136,34)' height='100%' viewBox='0 0 176 208' width='176'>
-<polygon id='my_poly' stroke-width='5' points='10 120 10 120 130 120 130 120 70 20 70 20'>
-<animate from='10 120 10 120 130 120 130 120 70 20 70 20' attributeName='points' begin='1.0009766' dur='3' lsr:enabled='true' fill='freeze' to='0 120 55 180 95 180 160 120 95 60 55 60'/>
-</polygon>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_preserveAspectRatio.xml Deleted

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader streamID="main">
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:imageHeader streamID="N1005A" objectTypeIndication="109"/>
-<saf:imageUnit ref="N1005A" source="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAACWCAMAAADXJvXnAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRF///////3///v9//+//bv/Pjm9Pfv7/fm9u/e+O/U7+7m5u/e5uzm8+XT4uXe4t7R7dq+1NjQ5smn0s+9z87IxcrH0cOtx8W9vcbFvcO9tcW9vsC12riPwr6rtb29w7SjtbWwya6LrbWlrbKwta+graylpK2pxqR7wKSIraicpaSfpKWUsZ+Ku51znKWcmqOltZt7pZyUnJycn52MnJyUkpyclJyUsZNznJSUjJyUnZSMsJBplJSUlJSMjZScnJB/jJSUi5SMhJSUo4xpjIyNm4lzjIyEgoyUpYRfhIyMiIx7goyEe4yMmINrhISMhISEiYRzmH9ehIN7e4SMe4SEmnxSe4R7c4SMc4SEc4R7h3xme3uEfntze3t7c3uEc3t7cntza3uEc3tra3t7fnNmc3N7c3NzgnBac3Nrim1La3N7a3Nza3NrY3N7Y3Nzc2trY3Nra2tzcmtaa2trbWtje2dMY2tzY2trYWtiWmtzWmtrb2RSbGNecWNJY2NrY2NjWmNrY2FaWmNjWmNaUmNrUmNhbllCZlpMWlpjWlpacVQzWlpQUlpjUlpaUlpSSlpjUlpKSlpaXlNCSlpSWlJNUlJaUlJSSlJjUlJKSlJaUVJCSlJSSlJKQlJaXUsyQlJSUEpSUkpKQlJKUkpCSkpKSkpCQkpSQkpKTUc6QkpCOkpSQko6OkpKSkJCOkpCQkJKQkJCQkI6OkJKTT4oOkJCOkI6Qj8xMUJKOkIxMUJCQjo6MUI6OjpCOjo6PTopOjoxMTpCMTo6MToxKTpCKTo6KToxOjExMTE6MTExMjEpKTE6KTExKTEpITExLiwhITEpKSkpMicUISkxISkpISkhISkZGSkpISkQGSkhISEhISEZISEQGSEhGSEZGSEQECEhGSEIECEZIRkQGRkhIRkIGRkZGRkQGRkIEBkZEBkQEBkICBkZGRAZEBkAGRAQGRAIEBAZEBAQEBAICBAQDRAACBAIEAgJEAgACAgQCAgICAgAAAgIAAgACAAAAAAIAAAAoYb3nAAAAAlwSFlzAAALEQAACxEBf2RfkQAAPyZJREFUeF61nQ1clWWe949OWVmKr5mpoyjKi2FICJNASiDhGhEETGsyOpuBjO7shJJORIZMkBLMDjJ8SM7SjkDA1DiwgjuzDhJ8djYYyDCpHfFln3wGlD77mR5obQZrH5/f739d133uc8CX3e35K+c+b9j53v/3/3XdJ8fjjz/11FOPU3B0k6e/853vPCuy+TvJTyXjTevXr8fP448nJ+O1zc9+b/v2733vr78HUW/ju/noBvLXlO9TXvCQH9pEvWR/5pVXzKMXtbieUa+of9T+O+r+K1p+pOR1hxtocnKyjVmINxP4aT5NXpHHnwLx0yQGqov3FoBdvJ7AN+bFx74Z8AsvjMvrDvz66woYnJY8/fTThpnAm7+zeTMUnPy4UrACxu8AebOcC61caFfZwy2p18L94Q9dujR6HaNfoyS3449eedFDne42oV588UX1S6JcEQc/vyGG2kQALdTyUAFrsxfbF/unWeOlzeo3RMbhFZXaBXpwmbOnAQq8NnU3e7ShatPEwVL6WDvWz8D6Da3g/hjiePTRx8RGITRTC0CAIfLU02Lq2gqUAcj79QmyeD3US2+1aMXJbkArH9IAu/uf9aldtLx3Y2JNK8q1cAH88FoSw2JJALpntLqIQ+Fj8MKmbXYPXnOOHtfUz2hrNjaNI3hfeGG75pQjtGes2RgkjwRyPVbx6kXjfRpSfXBQuo7yO/Z/R4xY2/IPtTHz/WLLVO+ Pf/ITx1oCG7e0aVhZ9lPkFlIDrB65XN5Y/ljvFV4xYQ/d2iLwixYXmN1M0z24ulSrPBFCeNBZUdvNpe2+a1OvG7B2S5tPgtilVuPpHsA0dTFsAsN8bUb916LMm/AaPQifndgVbJSKDLI7sMEloI3YzZz526JereFHjX7FpscIFcw8DbvH6yptmaytHV/jgpVK/b5A031dmXZM3lURlGIPvZ7A7noV7h8DXT4+T4Hrd133bf+kzrw2XtHwo7RnlY2vR+wCFvvWaUuZtY7PClIQxye21xkmZXgCWyp2U69JKMoTjTu6AdO8LXGPbOb9P/nJGyIOCVn2XDNWx3BgFlhSbrhbtI7Tyn81r0FmRWVRjpeK7Ap2+8Qe7msZ8VhgW9pxx3QpV8xBwf4dxQKWgkKVUK6s+qxkYdRZJvU+jZRsq1GstxrgH76olCyP7cQWuq4HVLhxR3MvLFy1go1YbNll0vgHxgPVNYbxXMEVWgHWClbASDcqBpky+lkQewDrfCXa1Xlbq9ilUPqxBbx7926XQRvvtaqgsZ/YozaycoqKOzoCGZO+PrAJUy7tCvDax7QLa0cGtCgZeVU1DrrQekryEuK25lWmoPM2gGnVVp5FvfGs5sVzAN69+wdyu3u3xFJasyn7rptnlWJfM4A6zioTVUHLIy+7HtvOkVGvUbE2aQYse9tg65TEpunGilhVWCICbFKSjtE6Eb3wgitMa1J9cEXisQ7oyrBWoDL5RFIKOI3aqGo35drSs6vOwO+465capk3rstEgEwqatTSsga3awwZs41WVFRMvVe0KU+7Arg5OgK0P7RaarAd23jfeuBVg86tuBm15MIBXPbyWEZjas/FKhpXGATaNmgsmzteTTeHpHsqlUfze97ZbUfn7z28Xr939wu4X6cA2ZimzbAHaFk/HZbaQla5+8oYKWzRqUzSO83saV2UiF+5bb73lWLbswVVrUV9K48eiQhdX0jZooe2SWGfdMYmLb3MBb99OWjdGD2B7ySHA46vXVAywZZLycxP55sDG8D15/47A98395hIwr1r1CLChbGqb+hYHVRqGit3aQA1smkN1VqBgrWECuwi/b0dX8VoUbJtE3ECz4NMFgwImMnT74x8rRV9Xt67ka9Mved9yTJ0+fdZsMC97kNTAVqqWIGypWN0R63aJ7VWaNDjtYwxFzW7J3Yd3i0W7Uu51P7NWjzFJA/x34sm0bEVs83K3u27Jl2eKtAS+Z/Lke6ZOnz2XyDTvVWsfg6YfEy0/o11WZygONSjCbT8ZhKXQbZ8n3/Pbn9u+/XkKnvUARmYyuPsgr44hhgWLEbv5H00aKn7zTehYvWoL2h7Q1m+bYsPACvDdinjW/SBeAuMOXfUIZO1jT6xf/4QYty5CGLNx9+lndF3yjCZOU9a8PV0Dkw+8m9O3Ax3A6dq+TR7GUYBxQ959yLMm377+enFx8WuvK15PYgP8Bv0Y7PI63liszs9PjKqLLRdQuHQEgr5pNDxVZDp1vGTRoiUPUpRDPyby1LdB+N3vfvfZZ7/7XRkFmDGQTcdCrBT8wu6dvJuejhOwU+5CDKwuPbSGieumXuAWF+MZu4JVjH2TmqWoO5Zf2sze466lXM37c80LH9YyffY3IVDxg/RmallBP/XUt6HY737nWeB+5+lvWz2kPYpT2ZqXwOlbQLt5i4DLrTuysWhPYOElsBsxlA1OaIikb775liYnOs17fLHjin5/7gK+Z+pUL6XkWbNnz77vvmXLlgUjeDFkS/x67DEkKtEqWyXUnXBt8D2DlGy58XPPPbf5edovzBhqTU9/7jmoWLRsxHJku//ue+01WrGbuHmwNtc3AEdkHuTWJSpwKzvwLKpckUqQIRK0jIph1gzY9933zWWrIh5RxDGEVj2Ufa4zDvBzKkA9v5N2rGjdkK8DLG47BthSmw1YM9IbxxAbhboVGTouC6gROzA17eVF6NlLgtdGRKyKiIgwWtaVmMVM1SYnpyoNp6Vtpj61Kkm8wwasn9+5k8R79+7dbdcwApaC1WDu8VlHJYZkMWClYar J0jefcDPfMXHZjZcPHPdQLC1PnQ7bvm9JwIrg4NDQUCJHRcXQsjckJCdsWI8/GzaAO3VzqgZOgwgwkfmzY1xiC/jll4XYBGgL9zrOKAlIRVsdZoXXEEskkpctbhOcxpDqJxx33z158uS7LWL6Myx77qJlASsUNbAjomJi1kZJRbJh/foErWmyKgEx8pCmJrG7Ue+Q06BU/PLLLwusZKTX9isFA6pyfMELWrWVb771zjt1LosWPde9844KYgZTBSi7/IMl6lkLGMyi6btxwJ3p989bBFmydNESyrJliwJWgD0q5glqODktDY6dloZ7m595BqkYlq2JUXFIWtJhK/257Tt27ADwDhLDppVy9+3D8TUSk5m8BzWxOr755sE338TRDgw64JgTIGo2wFaehcFr2rc06Dv6+Gt9dEy9G6IUrKz7btygFJEYBl2rA1173pKlSwNWIIzBvJPJKoKe4hnRsgY2wcoVtgArhg5iAFv6FRVrHXto2DgsiYVLrBgK9ojSBFa6pWfb9Gq0+o9jBXnYAlbMsHD+TJrMu/dMxV2Re6bOmjMXWpfqE9BklQZK9J2GVGUPVemuwEUN7xDgneB1J96/Xxm1m027gjCBoVFiAVXd2oL0WzgTdUw14xvxOLR4ioWHaPhuL6+7J8Oh7yDsxEl3TKJMnDhpwqRJEybgZjIS9X1z585ldQILXxYcEbM+JmZ9wvonNDK1TOZt27alb9PwW7ZsUc9A/uZvdu3a9ZIgKzXnA9cQK7OmKHZCq8fGO60w/eYbPAvqadHwz3/+Duz2Hd5Ymv21lnff9bynKy1ELrBOAit+5GbSbRMnTbptwoTbJntBy5MmSYcB2vvvv58lGfurgIDg4AiU3Ci7ExISqGebkkkKXkG2EYuSKXl5ilfr2FKyC1gxjwG2x6df/vIfNK8LFvf+UVG+O0bwpMNrqoRpiNwC7Y47Jt0BfOqWyp08fdas6VNh4iSeOxfAhhkxbVkwqhPKeig7ScVskG7SooiVnsEtdr1798vKsvO1ig0yM5COXGCtq1Mh2c7neR+81KxNtaQF7lhU6xnHdCYipWDxVfDK8W7CTpg4aSJteZbX5AlKxwQWDYuA+MHgVcjWSFsxMbEJhjktzSBvsiOjnQDwTsYuInsAo/wwyAxUWq4PTFzIGEu+AS1egoZRXlGBQqsOFDrxxAmT7sC5QMCeapyYJm0jVsgRqMwiIqHnWDCDWsmTTz5p1zQSFXtkYdZm7dKyRz6Gd95A5FU3G252t+F2kX8eR9rbHbOmIgUhHsOQKXK8AzcT7pg89W6Y9tSpk+/xmu51D/IT9Kuc2E58P7w5GMUJ/oaEkprMwE0AL8XoOi1N2bXEawCLXUOKtRvvL/6p6Jd5mESHNTGOtNp3zON3fvnLujoo1ygWR8H9R7Hj9vZfK9Tftf9OyXvux392zJmO3HvPVC9oF1Z7D4jFg3F7N9ooKa6BOgtmjV5KRWlPoZIhK1CQhkbQoWNF1qxZB9HcSaJsCdkA3mXFrr0mcv20uLj8p9qFDRyZPV3UTbN80Cy8YsdEFdobiGM2WyRW0PyZi3t333P31OleXozZ0jMCcvZs4rJ5NEGLShZV37+ErrwM8TogYGlAQAhtO5LEa0SIbEELMxMU8pOFLMAlxcU//Wl5uSkv7easmJqbx4DqJzx4f+fG2+0mchocS755HxKrrh8DHlyxbPGSRfPmzp0za/o9d+AMsLLEsGvJN+feBzVPnz3bBGkVrbV1owhdSoGOvxUC+dbq1WvW8GdNkOaOF+yNW7cKsjCLlvORnYpAXC6iiGss4MZGsrqJ5reeM+pVXvu73xnE9z3EPO8IXsKUyqEl7HLVKjQLK1bw8ZK5UPksFFZ4ftUqIC+C+vEU1Hyf0q0NmFqWypupOXglxH/lQw+IBAWFhYVpTcfHx6s4tlWQJRsrYMWrgGvswGOIlb5dItZsohQ0eFPgVctkrqNntGwH1z7MHin4wSX3zZ67bNXDMv5YtSoYzHORkGHms0lMR1Yahs2LzJvHfiMgYGUIeP39Aeu30NvPz4/ QEFKT+MmNGzdt3bp1m9g1gPP2FxUVGeC/B64BbmhohIxRsX7iXXV04Yp+bx1YzaQteRicIFyCVQk13Fq7NmJV8Ipl37xP+bWKWwJseOEGc+bMnbNokQ9o/X0oC5WA+oEgYIdZHg3TFuKXNHCZAv570ireBoV7A+B3gaxDlU5BLtrubk+Lft8y6UcedC08PKoWXB4lH88A9a52+axfD2KkWyDPhU0jeCnc++934wXyrJlz5ixYcO+9+EuZCbn33oU+VLTYtwQyaHnr1qxdWS+RGBouK6tw8SqL9uRtbbXr2lVc2FKuFaHG0OIJC/hhYAkY9Eg0FMaC/MSjax+B0h95WPGufwLF1NqI4BWLGL+sEtPwzplzH6L4HPydRURE+alTRO686847p0yZNhMnALqGpgNJHM/wtTUrK+ulvL1i0mXlCFuiYKdW8WGN3KCN+ojmxVFoYcty77iKVt2dmqhTK9fo2PPoeARY2oMfATEEg8rHHnt0/WMgxkl4BM8RGAOemLWrggOWLLIZMZVNfQN2lhbyenlNmXK7yMSJEyfcBiG11zRwL6Sq18CZRccgho4Rtspo1BXapJVha9Ouc7fqVqXb9nbygvjXErAArGU85bo95yATNckfjKFlDxP2sDxGeCiapwDPJSeDOSYiOADhW4ipZNziADM2uKxRMAn08rrz9okGmBW5VOWU2++cAvuGooFM4q3ixgIM5Iqf/exnBtYGbSNuNbzvtpug9WsprX5niN93abQb98f+cax6RP2RwAS8x9WCgz4AGrxcQaUbM1RzQQbIWrew4TlQ6azpuiSjbqdMYaulMSdMcFAM9oQJYPaaudAvTOn4b5ibAEw3LiurhlQ4nU4o21lZKWnKWakKZ8uBqV78gU2LhnVKes9SsdH0h+9/aPmtvfyASSt5VAR7mDQw9SzaxaIxW3w6No2fwKiuoF3WXqJbUesUUa3XlLvgtKjEJ3zjG98QSgfu2AWqvv2uaTMWBgH5yU0gRm4ywGVlpRWMXiIlJaxGkJcZwlzEVutHYGXQ7e3vWenXYvvwww/d6yz9CLtpXQLFCiU1rPeqWVtoGadV5JayZIkBhkXP1IbsNeVO8dqJ4BRGUa4nMK379inToGQEL3Hkl/IKIdAyg9d+gJoOmT2UAq6rMyo2wIpXAY/hBe11eLsdik+J8l/NKxsguJakREI3c3LoKjYKDzJYMzuh1piHOlS8d8qdpAWvxhwH2CF6p5Lv9QtSnpyRlZWTw4RszUA4GjDLETLFRDeho/S7KkZLyHIVHWiJ7Oq8Pm53NzaIK7G245ldecLrAmYgoy2sRym2FtSoP2V8yxIaxPBiiVYMyeK3Wr+eGtYOPXEiiKHk6Ojo+MSNGRmAhm1jGPLy3rz8/DwbMHWsymsdvFzApqQULbvZ73X1C2B1gQc3TNtJudeDvN9+mvuoKeYqD8nTgA5FJcaS1D8AshT9BrQ8a+b0qYhPKkzJLY7apLVp8/lvSAyjkr0hqLWp6G2orzEg2L5DBl6qg6JQ1XDlGraMTMlHtIqP6HgleZhmbeVhdUfl5Q8Ru5SYPO2wbJZ7kdw2axFXFtHkFWubJdYepPCiQwc/iNWJ4JAQNIdgRik9b87UySDW0OP5sPZqvAXxetq0aTPmezMzr5H5iAwIELihYmPScqek0umEkhvEka0qS6Oqg7tRa3oNazdxh2sjodzDgihAv81ba/eZLJXqXZc8PxsMszQVEDTBREavBG4gm6Q0XpT+hhXFmJoZsJGYfR54aM2aWCCzdZSmQs9BXtsn3lxSLsSq6jLAdt73PLz4JsBc+tXb0HhXNnLYca2NLLbdtK6qm1W2CBUdEOC/dB7GJwxdSjyitOshzB0Of7sXa07/h9Y8tHoNamzpl0msJvavcgIEXhg1ak7omNH6N7/5jZtyYc8U1Srp6GUPYh9+ePr0aauW1iv5uArJXJAzZhuW3smitvDISqmI0rMMaTmqJTaQQ0KWL5030+tOZCjKpOsDS1iDZU9BseI1DY2GXxCdGb2jah1lliuaVglZEYuSxyC/9x6 hiSyqxijLFsQkhBlih95hKLS8xAzbObi5QfZ1cGuHwTf7EGVNWF33oYKZajcUOwc8IPb3mQPiO6eAeuJNgFURNvG22++CcUsAoy8rZjPKlQoExRfKTWkaBbkV4qFnpWiZ2r1nB1bhize/w9TS2pL07Pfk8gR1YR03sVi7adUmLZforQ6yI9Go+wnOZ6luAIN4wXTQTmFN7QlsLF0HcVWOofK+k+7s7cf2UZCVL7PuRClCXgLXuoYCBB5DLEWI0rBtFkDS97rl7LzbbANWl2PoCzWsi65soOrSO/fzsNnaDJGAfmp9TFQUhnghy30WoApBh3T7GB8WdYogYTN7qc6CT0yZsdAvCEMwNsxKyRKv1cQLNTaBXUOB34yrZB2tQa3HH8L/nrCKOHDBpDJmXliEPbA88OIq0vEoN/qxXGe4fbubdZvtH09xhwBU/HDEWih5pf8Cr9tJNtEEZZOHHbfdfuedd9015S70yjgdAJ54m5SjAEYt4r0SKYpaTmMrRRVr4hJt0samUXkJcbMup00+VoNoGDYhIer5d5vf0ZNBB7VqLqayb/o1V4Fal+EobrPpDmfJbOJxhW7mq7WPIEcBeOHMKbDnMc2D47bJaKcEeNo0IKNjhCFIhMMRkwI0j8zLMGsz9gIxjVrZNOLWL63BD4l/owsQ1SW7iy5Bm7FMVfmGJPbX9zncr6Ry7XI292xXWVH3cn4obsQ6gImOkaVCvrXS32cBQjWrTHseguNOuhNB+S4Kqg6gosuazpGBtmpUIuiY0S8bYhlsFmk3VmOBBgtZA6uBgCeysmEotrKyuHjfK9j4yc/twMZW2dStb+xX26idddjzLH/cLjL7/vct3zaK/ktTk8TEREVycLlwzqw7TcxiPSnl5gQMPyjQ8bSZM6exq7x3AcZeM6FsaBvpicCYECjgl17Sk030zHRkGRBgwGdGfPahpqVhaZbbDW5NZXnxvu1bsGUhjZvlCPxDBSyXBZqLO9U2bjySvc2yy0qdC6NxezDT5o2dPcnw5A0bYhGrQQwlT7ndUrAkIKznsNiAeGG2p2Z8C3wWLFx4L1sPTL4W4kkUImLUEqllzsfCi7Pcip9VmFFILSK2hDCPObVuI/EsFmnq3qRy9+5MT16Pj0benQ7u8ySy0JDRuhRV9hdxn6Awq23POGpic9GdtdduC7dsJadCkhJiEalXPwTkmV66b9LZCJEZoYzeCjgl9y7kVHcBRp0LfTDh9fGW0a7P6jVSaGJAYAM20doaBNVaixSmXz7yzjtHjiBCYYn58GEYM3C3b05NiMGCPTa87tjpePXVV/cRSfNaF/O5XURkqOUKPw/bNk69fTuQwUzi2NjI1atX06xnqbxjCc3WC2rlLJey0AdzbFQqiwhL4TSXZ8B/5epYrMBh8U2MWmlYhAmKOcoa9An0kSOKXY6HoVgt2Au5I31LWip23cjyJYC5h0hbrfulgNhZ5MI2u9jlnTZPxwU6P8DfH8hOUtm/pFUcuRqfe+FMdhLYKYJUi+wDY/aaKaA+GNiL4E3C67885CGu0TzEW/z4Y7EmMpLMUlrTqF3AmHsZ4BqP1RnQOitLivP37MHn3LNvH4B3Yt/UNrX/AsAvisWq64rAu8/sdcVdkRf1VX2u59XJse1/FmPH7jMgAxhnk0YdEwmL9lk4Z/ZUJCfJsyw2vbxmLfDhsoQ/miv/paANWI4Wa968pSEhqyP5B87/0OrVcAnc4hCbIGpmCaLiVgk1TFHEzoNq2MdKWwa7h/ESgbk7jIhYnd2xA0d8rrQtW3bscNj2q5PXLrJZfZ/7pV/YUGbMgSdIW4b8I3pXKf5hAscC2N9n4YJ5Mzn30WmWGWge12KWA1OWWLHCSuA5i4NDIkVQmZIzUq0xx8b+BRbX0+DN7lWms0JP+zAmUPtizFKr04mZWH7+Hu6V2gL32oJAsCU1KSk1NW3Tlm0AVqlHBSQ34FfVxk+1hVtfePKjH8EBtEkoXhXAlXA/OLbuKA3HovigKhciVEvrxEgF78VYZN7i5cvRVX1L2uhgtliL5i4NDkUdziY zNCQUtEBXwLJ7InVTOucCbJ3MUJNjTT7O11ug2DWzBC0pgTWDFWw7QJqKjQdb0pKwKQHA3E7kkKtOGHoBIFu2X9MbIXHXBfwq8bH39fVXX5R3gVq9Hz90Fm7O2bkTG4jTgUwVJ+ETr1wOVfr4YJVppteU29XKi+zYnbPIPyQkEr0V/mKfRMTSgLnBIVGI7dgzwc0TSOQxCQkhoI0U3rSktC3bdu3chq0Ssnyupri4p7tm1UWW42Tsc5bs4RlPS0iFM8SmbtnAICqRFNtr0nEOHNYXceCiFNGT2gdZvFt4cUfLqwJczKAuOt7HH9wDMIkFmirmxqVUtk4wTsQt5tgFkm6lwpjidYcXBn6z4LPUJrqrhEgwRy4NjaJ6o2JiN2xQWyZCYiITaOWiY+oHeyX27t2JFXRIfn5+DfgammrL92PiRauuxJ/98N79W/B2sEamJmzYlBSVlBSbgKyRsGXTtj27duzaX4N+WEqkZDSA5goFHImtSF999bVXX8ef4p+oh8WM6hhF2J2dvbog45oObiqlCfGzom1CBKZZS0GxAObtNX3O4sXz5iwKCA6JiFH9ZExwZGRobKzijNmAQ0RkVGRSbGjI0sjIgBVAToAP682MO9PTAV3irOns7KH0VrSeGervrCmv2VtTs7/Gmb8zNQEOBWuJhesnJWyKiNyUl7dtW15bW2dXV8/AVWuIR2DdD8heaOaZHyCs5+e79lMxOoiK98kND7ABJUrHzz+fnr45LQEuDK3Erl6+fPVyn4U+/iDWMm/OvEWLMctejJjFgUFMaGjMiijaN0BjoOGkDUmpsbEbImNDI6MCIpPwuf8iNmnbttQ0bP/ZC6veuXe/s6XzzMDA8OjIwJmB4aHh0SvDAwMDrfvLa5zl+fm0h9hNeUW1m9J3xW5raapo7B0ZHRwYHuhp6+0fGBhxcKu30rAoeEt6WsJ6TJ4jokKx/yomKiI5ldUTEnfa5u079+7bzzmTXb0KXfZrvEyrfh4uLDu1EHdYf8CJlz+EG/8FC2SuCdalSxcvDQjlOAiUEVFRAA4NxjmKiopNYtGCsxUbEpVU0ZAOxcOiU/c6S9J3lTd29vW0NHZ09gJzFJTDw1dGR4a/Gh0eHMK9gZ7yvbWNO7fFbNm1Ka38zPBAU9/V/sFr5wcG8caR0dFrA70Do6PDw440DfxUqiJOT9sQhXVg7G7B+j/WFxYtxa5hiH9AcGRCWvrOdKidtv0KnFqil9Yw912R+AfPo9pKQx5O3SQFVwDmc9D0ym3bNq1evmkT8+/iRfMWLfUPJjFC8qbU0BVLQ0JxbiOjokJXpCWFhiRtS4qM2VTbUY549Zd/tauia7Cv6W+bWjv7ent6R0aujEKujAxfERkBD0FGrnbk9Q7lx24uamtp6MUbBnv7wApSvIg3jMAmKMqk0dZt0DrenLphfVREaPAKbrsCtdBCuFEHu5JwPUDyZlyMtYdVjLuQeCd8DE62d0fatoqmvE1QdFFpff2hsqKiY11tu/6q5WQeBrk8e4hojGoxIUm7kiJXhCQkIVpzvh1S+7dJsRVttYe2bcl3djQ0Nfyqq+ejodGhvuErQwNDw8NfXQEvQYdHr31FzGtXR4Zw+Groq6GuK9da8xu7hr/A84Oj10aGr10bBu2fcX6GB/48+n9HR/88es2B5kbmzBv0RRukXxsRGroKf3gFQPBKTp5RHPCDApqXBfBygOQ0dYGD2TWprJr5aX/z6f7e1p3OpoqKtpNdJykfnWxrw1LZtv1dfbuSYv+qoqmpqahoV1LSLlTGeQHBCXl7k1BQJUQm5LWdbNuU1HV1cHBocOj8V1dGhoaoRAAOXhn+fPRzmPGVEaVk3L16DZY9+tVXsGzqGU/jNFCfo/959eoXeAseKf3+Gayjfya6A6Mo8EZZEvowcGjUWAsOCMaAavXqb30LRQIG7UuobqRQqCcAroc9wzA5JHa1S5bo23bu31nb29vb01TU1NXXB9J+I3LP9bC//0xvT09f/+BgV2tX/+DAwODgQP+ZM/3nB5VAmRTAAQ8kgvmFWLO7XFU P9WHs6/LMF1/wLIg4UlPRv7p41+K7eWQlJZhrCkiULPdAzIJI1Iy6f/Hi5StgfXgVCWMTY/+uvQhV21DtVjR1nunv7T3T39fVB76Pzp61iM+KDJ4/399/HlEVfP39iCgj/YhBggjkQUYYu5D3iy+grFFzvA7SzZ7mP6GAsXAiE3VoTC0MyuUrSBCYrGPrZHAA6nukkBDUgiErA/x9lvs89NDykJAViLJ4/lvIdmnpFWeGzvSfgbb6B0YQGvjBB/HoQv+FCwpTsY4rgB3BbwwplYLPdhAFK14oyfrMN4O74evKhwkt4FS1mqqjVopB7ApY6oOYiu1m3G+GUhHZxWfxUv/FISsQYpYGRG7CaDGvaXAEeiMljRMfE3rEIzJeDxj6NDIE4MFh6BawitcSF+//CNL+y67Vww1q7UTdsDZkHYRad6X/Uh9uo1zOoQ3qxOU+8xYvmhuF6igkJKkM8air7wK12d9/4Wz/WXxyfHRojfh83mDhJZtohZJM3BXnyBNWe/DXpFiL2ZGmS8un1FIRFk6g5Jj1G55IhopjMIBEW0pbXoLaAX3AzFnoBnzmzQqJ2LQfsbbt5EcffQS0jy78K9wV9wkvBIbU46if1zEJ77MFJ2POYtQqXo0wC4lc72hIxoln4/4eVh5UNa2/8g67saJQxEeh10iIjYILoxGXLhXRCvOnmRg1+nMSsaul6e2mfzl58T+gwwv9TDyg7YcBw6pBAzceotXaLFf0ewl5BgIiHvAeIVc6pv8qSvNQFxlfmzlL0MI6AsYUf/l0snzH3+MwbMbsWBo1itsI1AerHwoB9UP+rP9nzlw408d/UcimPU21b3cNfnbp7NlLg4CFMQssoAfO958fglHzZxzR/jmiEg9OiJiyArVwLeLr6e2/fw4cHKujqMQiKCaZ65NT01DIspmMQhmbxiIoYHkIFCzE/n4L7+X4LeltRqjBwc8+u2SPShKg4MwIWKLBMbh0bo+8I9p143UFauG/Htot5d9xftmx/Qfbf7CZvFs2I0MlJ6cDOCIWPXkIerTI0BWYwaDOgKJlj7vPwpV5qBO0fHbp4kVRrV0EeAjAY3ntMVhMW5v3eMRG3187cCrGIOtTE5LX79iditQEQ+awgls20LcuXoHGJiQydlMJKc+ePVFaeOLSn0YuUQtDQ59+NnjRKixszIxT4wKPp2G3oGW3bH3/v2+84/+mY0NqctSG2PWxUTt2x6JXQHpF0bxoXshSdDRLN+TtaegavDoyMDg6fPVPf/rTZxcv/ulPg/0jV6+IJf5x8GK/h4b7z164oIHHqpg69zRp49M2D3bD/tqBQ4MjApLYqsUmBaNaTitaiZ3tS2PzUFv8RarzwkhZU//IFZYFKO4gV8+OXEWHoj4mgD0NWrItiA0XH/5Ri9i4ecE9RLm82NOlv3Zgf1yZsQMmjI4Nk4ilRZ2LZi2ak9TWFRy5bdeOkp5+lShHv8QfVAcoHK+O/JFP8HkCo1wWYV8gQUu5ruWuI8N//KM8gbfzF61SyiMoW8g6ht1qHvbMz5552fN1Bxx2T1MewlNkLHfgFDUtD4iNLEKj0z8ydP7CyNXBP0p//X+GP/+cHeW1/7z6xchVPGGZtNUd8A6qyUufXhJgV4QSYCVjDdq98rBKaX06rLrja1O0A/PBhpNNGLgl7d1VVJI3NHhx8OLISD9Lwwufjgzpj/hnCIihWbbXcjQ+7A58cfDTkU8Rpe05VYDRILEHRNp1KVmZr5wEPutRdKBvuLU0fOPW0ONUOdLS9zb2ojfFp5GyR38AW7ErHwjA8pvAVR9wdIQcUmug2tACBQ99qpINkRGqGZjRU0C0jkdGhj4V9QveZyil5Y7+d1127vE5r49+Fb0w/hi5nin8pxbHGRmJuUwNVSvmCmMFPTTlC+oardoX+LCDF5GV3HDPXmS1qLKr0hcshYHtInD5o/3bVUQqQv7D6h/lbI78t27CFqrcue7vWcAYEHFywr/6LI4F/gKKVecEH0QBI4IB2GbOVsNrqya+AMlFnJWLYL0E8IvwboRxEmmbt8yY/zI +ijkT+C9quXXyG7zT0OLoULqEewrvGNghzHzhsQCmhhUv3Fj0QoO25WGjQCQhyzOGYQUig5egaADjHJ1nRDNtghXbcA45xrF8/2sB1f8IeTHnEnGA8XNt0jZTVg3N5csINLB5IOOvGjwwemngz6hho1lXu8usCwuVE/nvAxf/oIj/QGDc4FfOi47dW31Omkf+4z/+/wCTFZ9dAYsxfz50Rv/3MX7QUYkHmOcnYMa9y3hebP+KDl/8zHRPGeIwpGsFX2CdgbNzZfTPSGb/PnDh0h9QccOu6cl8P+MXBqvWf0dNHNHvKtgL4v6YYWmTNu58s774Fl4H7rVrAIaKYcm4cTNoq0XHS/oc4C1XwHuFvyDmhwjcr+yasw1VU6KwGv4jR/0w/uH/c3lg8NIleC5yHcxa/FkCtmdQhPXg/OGtTGnDHMO63vFfCGA384NrAL48/PnQAKuKUdRSVKGWyxBCXzZOTky853MKQ6n46UA/hlns/AmsyyxJbowJnw/jnyAFkVGR8BZaRgRDRrMhqyWB4UH8A/9LDUww6LBe//pmPF+OfgXglu7u1u7hL6m80S+/pJLpv59/LrhDQ5eVxV9WT0LArZHBPDTAUaUSPVE+j9UcvBkf+MoVpuN+WCktnqfkLMxBMhSIlUnr9Q/a9MiwNNcX4OBcWYAC+F+7tdLD0uyX18xdsNiFj7788quvvnLUNTc669o72zs6Ort7Tved6YPgcO7cOXx0yvkBxi4XscKmCqS+GDDAGhs90tCnKD5GsGQAI/8IE5Gz1C2NgDXnxT/QmS99ZmI6qy8ueME/LnyERYp+LKjAW0TDPMs0NMu9bGahp0N8RvkjLVSw9B8kOZgiPqn6vOotGPFgORRfMJGPNXRsHsgvLsbVBriXj20S6tISbBLBPnTsBuJGqJaWFrObsaMd+/7aOjo7tHRBZMUW6wkfSfn10b9i1PXRqVMnT546eaLrFFddTpw4cRJPdOEun4f09vbJST5zBuV729tvN7V1YNFXnlBPn+GPu5yjOvCUHJX8b+ueuaOVdV4yjdKZiAOYZOWegX179+zVy+D6K1RKKisBL5dZcAvFwYP8MdtHZOOMk9tLnNgWV1tbi/0zuPM2hplNb9cfq8ciGhbSSksLC0tzc0tzs7Jyc3NwzC2tglTjZQgHn20dHW0iv3r70KG3m1o61Fq33tKOex988AH28GuRx66H1r1zcu/3PNBILeGZsZ8cR/GePbKzIV+4IFAtbqB0HksOVoIQFwIeNsIdQ7yvtkfVVCrgppaWpoZa3q+orT1UlJeTU5iTlZ0RH78uOjoMV4pji6y3Ny4Z93sA2yixzx+XKmXlFBaWVRw6VIsz1NjQ0NTUcuxtPmhphXd19qjLbsitkG0iaOaxB/vHfX2/dxOb6s9Dzjn27+Purd17sM4ryPr6GXMdDS6Mg0oBrRR78CAvg8QlJk5s/8L2qJqa6lps6oUhdnd1tDYBeW9ZBVizsrZuTMxIjA7yvneGiLc3LtfxxWVK4UFh0bjQMgMXpOGsFBaVHIJtQKobYRe1tW9jDzgcp7W9u1NfaaTJDLTRtzkabXdCu+d+f/r9Hv2Exa2J8Sp5zznMJr3Kg9QnVYsfYQcrbg8S2CUHjabr6vQFvtzlCQWLhrGzBtcRvpSTk5ORnQgJD/T2DfSdPx/E02bMmD/f19c3LCiIl6NtzC0oKCwE8d9WkBgbobHdncD4p1qh4w5GUUi3u3LHPDr9gb46+OOP/+3y5X87Z2n3448/lvuezg0f5kYOXAoFuyZr/kFnZX5+SR2BaeAleIkiGxkPI4SJMcs3quCJmkpsaaU9NzXAi50V5WXVpYU5ObnZGVWZcXHRYb7ewMS1WMLq7esbHh4enZiZnZ1dUFAqUl16iAI/qKhpwGy/6W2cO2qYvObKlHGgLZMG2Mc0a819+n3t8Z6wtGcxaTjwnvy6OuxfAx93sPAysLqWdsBgD59cLwQjrsFXxTRgp3Xl4SOHK/GNBHWHGyrxPkDjhvsAaxtqxH9rD4EX9gz3TYxLjPP2DYeCKYEp4aQ ODAMvjB2XG2ZkIZzVg7a6vqm+Wn4ZMayVuIhjkieVvG8gLEpbGHOLaBr+NJQrGh4Tu2HSxZUlEqUkXgGWnLxCqBGBpAFmi7gkmxnxkrrGU+1ZbT588CBOQUMLshbc2UlFN9VWFOW9VFqalZGbszE3MyP7wIGUlJRw38A4/PgGBuLWOzyaF1hGr4tXwIXV1HJ9fXU1Y/s/IdMhaDFuQ6hhK1h3u0UqO6U9ZBvg07//PSL2+MD7iisBmr9PuSqUB7U5hZrRqbKyEcBUpexH1lt0DztxgRgvEwMp2Buc5QBuqK2p+NkvjlWIpRbkZmQkZiYGBYZ7zw+Mg137hoeFhc8PnO8dGJSSmR2fkZuRzZgFFdfXH1OiclMTkzuzu/B+oK+v0pnIM1R7pic78Pi8CFosK3hdAD47LBVXopeUy4ZkAlPZkn7grFAw9yKzDuFJgRM7efnjkZaWZnw1Q0NTW1dXW21RXjUgSpGSsjPgrHFxYSkpCFze3nHe86FlKDwuMTMzMzG7CkELqq2GhpmSqV9kZOgWfxGrJGIJsJu42e84ydgAq9A1jkGfPw8flrJiH/EaGiqxKxX797BNU12D73QW80au7QTvEbiy83BDM3QL7cLEcVddgYAgXVHxM3xmRK2crNycjMR4P34pDQI0eH19Z+BPYHggw3RYYiIyNDVcimv+tYbbRMP/0tnZZWo3Rfw/AB6X97yDyqo7UudETjkIAhBzu3FJOWsr7k8tASrKi7pftx+HRR+urEWwovP+FldRwCKcFU6EM9ScdOJf/Gz/LkStwsLc3Ox1SMJ+APX2nT/DNzww0HsGjNs70NvbLygxsSA7Y2t2ThZsobQMPxWHKip+BV54bxu0S0V3/FaCVs8HuBF7Fl3TpPUpGPcIDeN5N/1qPZ/nkWHaIZUUwk4dMOnGkn8BakJ0o0SuujoGbxg1HJbvgjWrq9SPwMTxBlg5q6zq2vp6cBQibGXHR4eFJ4bN90VK8g4MnOEbBwf2jguLTkyMjs7ILS2oKhAHrmaUNkat7VpHrQ5qWOK04bwFkzaJ2F2/LDmE97yDe8hRb6gojZ1mJdiayi3Wsj0X8M11CFoAZpw6cqSl3Xg8Xb65QeUomIOzxMkwXUunhBcX5OYmZieGBXqLehGnM+MyUYHMCAz384uGRWdszICScyTAceuaDVmSEtSLHwK7Mf53gaXG0sByPQRqaRZXJagx9jsbasp5N3+/04kNudiZXFxewxwMBcsOexzQN3W041SI38ME6mrKGypqGyuKyvLKELUyMnI3xieGBUG3LCt9A+fPmDZtflyKr+9837jExBSoPwydRBaAC6nfpmP1hyRu/RMtuqMTbRerLPSrMFCJzLgc1pjyeJ2Deo01iBQhSpQxk9TAst91HCw+iOLJyQ8vgsvOoURsTEWsQvSqRG1dgifl8ntm3BZpE48fxyXIHYhYRxpg2C0drKOh3tpfoNDKytm4ZiNKi+gwpN5wmDT/hgMd1QdSMmJWdPbRo0ercnPow4XoqyqwS6+CJSaIuwDaJZFLhWkt44TkcXKSBiaqAZZO0tg3TZotbgvzq1P1By3NDbj2vMHZgDgk7snCAxd3qeISeLhtRlNMB+Y39eH8NLS0t7Y0tdSWs1JCoVVamJFbkJgYFpaZmZIZDd+d4R0dGBgYFgjmuDA8V3W0oKAgO6e0/ujRE/Unz/Z3nUCDjKzW1vpPaEMkLbGcFmB68C3Qav1KAS14p09bqsUQQw8z0BM7VAV1+PDxZsBAfUyyTqSd8po67DZHvcnspFiZpZGWKgF8vJnfQECfRhSTzNzUUVtU2wQXVh6cnZ17ALl3frjvDF5kiOQEbARpWDmah/iMjfjWkizUoFtzCotKDyE9MQA0NjWi0aQLtxtgtsW3BCz2bKpJqbM0sDT+mNvIGADAEnCpLqQa3qisW1PD73uCH1O7ChgBGp1SHd4Ciz5S13y8HaenvQO3Lah7O5o6Git+UVtUBIsurYLBolsK9A2Pi0sJhCnP9/MNjA4P9w6MjoNro2GKz5DmgYUlslgZAnxTvQA 3qJhlB74lXuXARr0ANlYMc2bEMlaNwgPX+LDb12ONfa9Aq7zqvhbVUwN+oFLmZERstg51RzjyQQFSqfriugYMQaR/qObMo2J/XhmAC7Lj41MSs1MC41LiwsLRI2Vmh/uFB4Z5B4aHBQZ5hxXkJuauk344JweJrBpfO9TUCYuGTbf8FqVHZ0d7u8nDpti6bv61Ggb3ftDUWX0a2MrDUmlV1qEXoCA4C11JiSgaps1rSKDxSsQrpGzkbCZeEYna8h05sGrA1qB3gIa35uSgkEKDEA6doqxkJzxtGq6evQsuzEyMfJWBajojoxABbivtGcBt0i01Yhc4IlanSkzj1JZjvdmEZtP/2oKVcWL68DmZcdGH0eygdkLVAVA0ECib8PGRZ5BvnHWtzZU18r0KdbTqBpgxbJim3Nzc3dF+HJ7MPMxUXdNSUdtUsb+sOicj4wG/+PjoIAStQERn5qVp07zDUqLROsyHYUcHhWXmblyTHb9uKyYjiHCFpWVlyErH2o4xL3EuqALXLfGKKeucdJ12wT0vOWCdYqsIRfBi6kz1v9Ag0jE9XF3ihszEk3AYrMeRg42aGbFbGtBr7M1nkD5UVpqF76ZggM5k1wCBhjHfQesgbTEmAn7zo8MysquOVpWWolE6wb/V9SfYOuCHIzzBbUfZIdn0ZiH6YxWf3HoFmw/bcZmTHQy9knLFaC1xQuuqMWajhFaCFRV/mllztRyHlnkS2tsZ4ivrGls6W9u6jhUV1WMmWYpK+t7EuDB2C94zfKO9p+ELHGZMwzAANWZgWHTm0QOnjh49dTQro7Qa8y8E6rw8JGLMijjfEWtWnf/NWHWBMRZ4/L5BzbSYgNEs7UYhfZDDHDFnHNkviQBaNUuYCbCPhPHDGo4foX03o9egTQC4Jn9vEUY1TfXUHEJ0bmZieDjrZ+n/MeaZMW0+iktfdIyJ2dEHkIYz1q3LQLVVWHqMpYc0iE24BBojrVY93vkAA6ubJiVtyON2gxa4HvBwxCMzHQIiJrGcxpVeaInl4kV2xnRS9A/w0xrEJ9RfTF7MQ6gsZXQJYrxcU1HkrK2ordi2+skns7auyShYh9YwDHUW53e+0XEpmXFoDNkqZmYeQB8VvTE3G1E6K4uFForR6mOc8TRhPIaCR7Qss50P8B0rplCUsMtJhowzdEt0vb7XrmIFK9UHKy0WS/wyKnR4zMLFlTWNzfxGELlGFffpvByASPcgRq9iNDN2A5R8pJ0fqaejtrWpKK+svqk0a2NOKeYZ+N6ouOwDmXGBKSkos+JSDmSmpKCgPICxQHRYGPJwbkFp1pMIXLzqBdEddUcT5jtwYsuk3RMwVWih2oHHsV/bU1aRpYkdTEVcUniF7S/aJl7Lx6JjP7/SCYJ6UzrFCsRrxjT9zWUt4EfEZnUJBWO8U40PXA1frC0t3bout2DdyqAgP3wNSSAG8KiufH2DcDMfSvbGnaCw7I2rN+YUlB49cepfT508dfbiZ3/qxbpLV0dHV3cPLhIx/e+4R2rVlXxMvnU/ugK2XGAhS2SK2MFBO78YVTqfluPNtG5evMighRKagioTIZvlBVWLaovUaB1YSjN4l5dUwh7zdhVV5L2Ul1WYk5sbH5ZYVXUgJcjbjz0h0tIMNBAI1tFBQd5Bfhh2wcnNpBY+3IVQXY+JR2tbTy+WlnoI7CFqKKdsWTR9Y726XjUGrag1MCAPSjpmpSyUOmIxgvFEwNhxAtD11sgoS5WVR+jax9EcOp1wc4RZtDvV9cjDBbnrUC8nZqZwpIN8BBUzGQN5Gpk5tgyKD1qzMZcjbPwtK8orqq9FVqptpEkjJ6mFJZtJu+ZT/1VgV/WhgfG5aakNzZKI6pppwJha4lBejBLL6Wzu7GzGSAPlB6Y4rawG8F//AHNjfCRwo0yBfTS1bUMSbSp6KQuTjLDs3Gg/b+Qgtv9xcXEYXWZmhs8PwhQTagavXxD6w6qM0owMRPTC6sKi+op6uATSeUObRKzO7l5VUn74volZur2VNbPxxnNGp57RWhm0mLQMARwy1IE/thxB+EURAlZ qsmZfiUy7GpCKmjs6WxCziOwspz0jHzUwjsKHG9q5ytIIWtTC9UWFhQVBmZlhGFuFoe4IPBAXjrk02kGmXcwrEzMPVB04cCA7MR6lR3ZB9saMwnqqGENaWTvt6T0jK4e9p8/0KaoxDb2r/bvOYNLD1m3AsOiByw7MpUnqZAWFUtHZ2iKjdoxsUDCqL+5CocGhAImRingWOMuS0R37Ky6xICOh6KgvO1RalXu0KhNmm4nWH86bwuoKo51sgLL6Olp1oOoU5eip3I0FBUdPHTuG1ZbqtjbwcqFYFuRxzVrveGuiN9Ls9XzaAJ/TDaJDl8ZCJKSsLFBXtzTW1DS2NDLzIqY1chyL/AsR+MNO0B5nvdXYyFW02tqTbce6UCIWZmOUUZXpHZQZzlWHwOwDGOlkh6NL8p6BiBUuPhzk90D0QnRUGQ9gOI2F5EOF9VxRa+ISOxXM6lKZMutkWRUUS/4fA1PD0KWM8AQVOQgTrfLKhpYOBC9nc3sr41UzgkhHJ/ZDYKqDNSfdPstXELa01HHFgXKoouglGGjGOqwchfkFFSDfIm6hyogOCo/OPpAdGI3aer53IgqtggPsmBMTM4IwnS7FeLqsOq8ea66yiQB7AriCbZvXScWhfzwUefNzYDSs5gCYadVKYj3ScBgTDck6qBObsa50BD6KvrQVY/fWjm4kijN9Pe1waDxHo0dygsoBDLW0dfV0dZXUVuTt2pWzMf6BjblrHgiK37oOPaD3jLDAMD+stMyY4cUF4vnhmeHeSNBBfuiLE2UOUIQxAMbx1QhaLWyVWE7DjhgdrVCtaVWtpZFv8fiJTsMDn6j9IpcdHccZqY53qIqCi7Oou1rhq7RnxOo6zicbW7vbW1FdYtpViTPQ8cG586JuNo4NtQ2tnW1N1SfaurCZ41jO0VMnUE8fpZdCjUcLDmQm+mEakIiKOjwlDmVWRiJWWw5A5xkFR6uqCg+htsT60smuti5clsp9Irw8VXVK58wUUpBvHJ71iZCNHJ988ol6+An31elWGFuSCCzLCRhPQl2HOd1CvSxTLA5fm7vPnDvdA4eCatEZ9Z67fPk8MNkPH5fFtfb2zlY0hw2NFXlNx4oOoc9Dy1dfWliVlYG5c1VGxjr4rd/8+UFB4YlxKSkYY94b5IcJfWLYuuyjD+RWYa6VtZUrakVFXawtsf7IzqG3DzNRrrLQg3Ve4liOg5ub+bHaujKggF24AwhayqR///u+07/FF6C2IzU1QNNQXEc348Ppc93tHTKglAUewPKfOI2BooyykD46O3tP98K1EVt7O/n10FhFy6nP2bpxzZO5pRvj4/28sRgcl3kgPHAammJYtN+9C6PXPRC0DhtbskurCgsKc+M3rvPfWl3GNguJjVdX45/FyLLn9Lm+08hOvb2duntQW1OuK1qj584x20ratbcMGHWoBgLA3NWA2TQmAMc/6D59+fNP+ro5iaxsroPBtiN6ocJg4cMeoQcvtXPixPKjt7uTQbsTKseqbm15UZlsz6kqLD1ayE0rGZnZLDe8vcPC0TeEYT0cX0UblFG1zm8NBnhYKsXSUn3p0SfXVWMDU9uv2Pw3YebR2NIBUEyizkDN3DN2GqD8uTGwdSZU1ewSs2FJ2/VlpCUskmE4d7y5/bfHj2OUwdXB9uMtdZxtIAbzfxMj87ojSNOoTBpaYdPIT8RE8GpEAEfp0Vhbi+lO4dasjHVPFqIjrjq6EfknLIz9Aia1GFweQGSmX586dQJbmDKeXL2xsOvUicKsevjwoYqyWpSnCNMnu3p6z+FiYpiT3qZl7cm6oYJdmtfAFrUycWDrowNroJRmbGY4/lt4DBMtFhMrVV6WhXAsEhKb29PwEh/ze9rg7vDs1vaWRn5xGTp/TC/wZfeFOVufzCgogIYT41BrcVdLeFjmAdRahD31hxOn/sCyoxQ3Z9EonTpxFlvz+nE5+fnzfX3959VOQJgyj4AVxULLN+oVJEThRgQmrdoEE6tce9LUxjRMmlFiHT/+2+4OKBhaRG2NZ9phqVK/m40lzawyjrd3QK88F2y ccC5au1FXckbRWvtPtSfq608A4Gw9Q1ZiPDbxhGdCsVVV2PtwICUxAyXWiaNHS0txm0XgU8cKj57IOtbVBc4z0GpfD2osJEOsKfUwbsj+PMaPG+IyNkk81sAAvSzx2E2x1hOYWiKnVh58FU58EBrswLqv9BJ4jKKjo7sJpwHoHcdBzgl5N4NWS3MjsxjG5p3dSCZ9uOq/p7/2GMZTVbXVhaVVpVhZCEvJzYyePyOc/W/4/Bl+M+7l/8Zkzeo1G0u3bl1TuAurDuv8MwrLuo4dehtdP054SwsiFoIDNHumD0dxYfQQwuuZd2ERIub5TzQS9hpyGyx3+3LTL/Z/q4swzOv/D3mjupvCJFLWAAAAAElFTkSuQmCC"/>
-<saf:endOfStream ref="N1005A"/>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208">
-
-         <image x="10" y="10" width="120" height="150" xlink:href="stream:N1005A">
-            <animate dur="3" attributeName="preserveAspectRatio" values="none;xMidYMid meet"/>
-         </image>
-
-         <rect x="10" y="10" width="120" height="150" stroke="red" stroke-opacity="0.5" fill="aqua" fill-opacity="0.2" rx="5" ry="5"/>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_preserveAspectRatio2.xml Deleted

@@ -1,319 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:imageHeader objectTypeIndication='109' streamID='Stream1'/>
-<saf:imageUnit ref='Stream1' source='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAACWCAMAAADXJvXnAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
-jwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRF
-///////3///v9//+//bv/Pjm9Pfv7/fm9u/e+O/U7+7m5u/e5uzm8+XT4uXe4t7R7dq+1NjQ5smn
-0s+9z87IxcrH0cOtx8W9vcbFvcO9tcW9vsC12riPwr6rtb29w7SjtbWwya6LrbWlrbKwta+grayl
-pK2pxqR7wKSIraicpaSfpKWUsZ+Ku51znKWcmqOltZt7pZyUnJycn52MnJyUkpyclJyUsZNznJSU
-jJyUnZSMsJBplJSUlJSMjZScnJB/jJSUi5SMhJSUo4xpjIyNm4lzjIyEgoyUpYRfhIyMiIx7goyE
-e4yMmINrhISMhISEiYRzmH9ehIN7e4SMe4SEmnxSe4R7c4SMc4SEc4R7h3xme3uEfntze3t7c3uE
-c3t7cntza3uEc3tra3t7fnNmc3N7c3NzgnBac3Nrim1La3N7a3Nza3NrY3N7Y3Nzc2trY3Nra2tz
-cmtaa2trbWtje2dMY2tzY2trYWtiWmtzWmtrb2RSbGNecWNJY2NrY2NjWmNrY2FaWmNjWmNaUmNr
-UmNhbllCZlpMWlpjWlpacVQzWlpQUlpjUlpaUlpSSlpjUlpKSlpaXlNCSlpSWlJNUlJaUlJSSlJj
-UlJKSlJaUVJCSlJSSlJKQlJaXUsyQlJSUEpSUkpKQlJKUkpCSkpKSkpCQkpSQkpKTUc6QkpCOkpS
-Qko6OkpKSkJCOkpCQkJKQkJCQkI6OkJKTT4oOkJCOkI6Qj8xMUJKOkIxMUJCQjo6MUI6OjpCOjo6
-PTopOjoxMTpCMTo6MToxKTpCKTo6KToxOjExMTE6MTExMjEpKTE6KTExKTEpITExLiwhITEpKSkp
-MicUISkxISkpISkhISkZGSkpISkQGSkhISEhISEZISEQGSEhGSEZGSEQECEhGSEIECEZIRkQGRkh
-IRkIGRkZGRkQGRkIEBkZEBkQEBkICBkZGRAZEBkAGRAQGRAIEBAZEBAQEBAICBAQDRAACBAIEAgJ
-EAgACAgQCAgICAgAAAgIAAgACAAAAAAIAAAAoYb3nAAAAAlwSFlzAAALEQAACxEBf2RfkQAAPyZJ
-REFUeF61nQ1clWWe949OWVmKr5mpoyjKi2FICJNASiDhGhEETGsyOpuBjO7shJJORIZMkBLMDjJ8
-SM7SjkDA1DiwgjuzDhJ8djYYyDCpHfFln3wGlD77mR5obQZrH5/f739d133uc8CX3e35K+c+b9j5
-3v/3/3XdJ8fjjz/11FOPU3B0k6e/853vPCuy+TvJTyXjTevXr8fP448nJ+O1zc9+b/v2733vr78H
-UW/ju/noBvLXlO9TXvCQH9pEvWR/5pVXzKMXtbieUa+of9T+O+r+K1p+pOR1hxtocnKyjVmINxP4
-aT5NXpHHnwLx0yQGqov3FoBdvJ7AN+bFx74Z8AsvjMvrDvz66woYnJY8/fTThpnAm7+zeTMUnPy4
-UrACxu8AebOcC61caFfZwy2p18L94Q9dujR6HaNfoyS3449eedFDne42oV588UX1S6JcEQc/vyGG
-2kQALdTyUAFrsxfbF/unWeOlzeo3RMbhFZXaBXpwmbOnAQq8NnU3e7ShatPEwVL6WDvWz8D6Da3g
-/hjiePTRx8RGITRTC0CAIfLU02Lq2gqUAcj79QmyeD3US2+1aMXJbkArH9IAu/uf9aldtLx3Y2JN
-K8q1cAH88FoSw2JJALpntLqIQ+Fj8MKmbXYPXnOOHtfUz2hrNjaNI3hfeGG75pQjtGes2RgkjwRy
-PVbx6kXjfRpSfXBQuo7yO/Z/R4xY2/IPtTHz/WLLVO+Pf/ITx1oCG7e0aVhZ9lPkFlIDrB65XN5Y
-/ljvFV4xYQ/d2iLwixYXmN1M0z24ulSrPBFCeNBZUdvNpe2+a1OvG7B2S5tPgtilVuPpHsA0dTFs
-AsN8bUb916LMm/AaPQifndgVbJSKDLI7sMEloI3YzZz526JereFHjX7FpscIFcw8DbvH6yptmayt
-HV/jgpVK/b5A031dmXZM3lURlGIPvZ7A7noV7h8DXT4+T4Hrd133bf+kzrw2XtHwo7RnlY2vR+wC
-FvvWaUuZtY7PClIQxye21xkmZXgCWyp2U69JKMoTjTu6AdO8LXGPbOb9P/nJGyIOCVn2XDNWx3Bg
-FlhSbrhbtI7Tyn81r0FmRWVRjpeK7Ap2+8Qe7msZ8VhgW9pxx3QpV8xBwf4dxQKWgkKVUK6s+qxk
-YdRZJvU+jZRsq1GstxrgH76olCyP7cQWuq4HVLhxR3MvLFy1go1YbNll0vgHxgPVNYbxXMEVWgHW
-ClbASDcqBpky+lkQewDrfCXa1Xlbq9ilUPqxBbx7926XQRvvtaqgsZ/YozaycoqKOzoCGZO+PrAJ
-Uy7tCvDax7QLa0cGtCgZeVU1DrrQekryEuK25lWmoPM2gGnVVp5FvfGs5sVzAN69+wdyu3u3xFJa
-syn7rptnlWJfM4A6zioTVUHLIy+7HtvOkVGvUbE2aQYse9tg65TEpunGilhVWCICbFKSjtE6Eb3w
-gitMa1J9cEXisQ7oyrBWoDL5RFIKOI3aqGo35drSs6vOwO+465capk3rstEgEwqatTSsga3awwZs
-41WVFRMvVe0KU+7Arg5OgK0P7RaarAd23jfeuBVg86tuBm15MIBXPbyWEZjas/FKhpXGATaNmgsm
-zteTTeHpHsqlUfze97ZbUfn7z28Xr939wu4X6cA2ZimzbAHaFk/HZbaQla5+8oYKWzRqUzSO83sa
-V2UiF+5bb73lWLbswVVrUV9K48eiQhdX0jZooe2SWGfdMYmLb3MBb99OWjdGD2B7ySHA46vXVAyw
-ZZLycxP55sDG8D15/47A98395hIwr1r1CLChbGqb+hYHVRqGit3aQA1smkN1VqBgrWECuwi/b0dX
-8VoUbJtE3ECz4NMFgwImMnT74x8rRV9Xt67ka9Mved9yTJ0+fdZsMC97kNTAVqqWIGypWN0R63aJ
-7VWaNDjtYwxFzW7J3Yd3i0W7Uu51P7NWjzFJA/x34sm0bEVs83K3u27Jl2eKtAS+Z/Lke6ZOnz2X
-yDTvVWsfg6YfEy0/o11WZygONSjCbT8ZhKXQbZ8n3/Pbn9u+/XkKnvUARmYyuPsgr44hhgWLEbv5
-H00aKn7zTehYvWoL2h7Q1m+bYsPACvDdinjW/SBeAuMOXfUIZO1jT6xf/4QYty5CGLNx9+lndF3y
-jCZOU9a8PV0Dkw+8m9O3Ax3A6dq+TR7GUYBxQ959yLMm377+enFx8WuvK15PYgP8Bv0Y7PI63lis
-zs9PjKqLLRdQuHQEgr5pNDxVZDp1vGTRoiUPUpRDPyby1LdB+N3vfvfZZ7/7XRkFmDGQTcdCrBT8
-wu6dvJuejhOwU+5CDKwuPbSGieumXuAWF+MZu4JVjH2TmqWoO5Zf2sze466lXM37c80LH9YyffY3
-IVDxg/RmallBP/XUt6HY737nWeB+5+lvWz2kPYpT2ZqXwOlbQLt5i4DLrTuysWhPYOElsBsxlA1O
-aIikb775liYnOs17fLHjin5/7gK+Z+pUL6XkWbNnz77vvmXLlgUjeDFkS/x67DEkKtEqWyXUnXBt
-8D2DlGy58XPPPbf5edovzBhqTU9/7jmoWLRsxHJku//ue+01WrGbuHmwNtc3AEdkHuTWJSpwKzvw
-LKpckUqQIRK0jIph1gzY9933zWWrIh5RxDGEVj2Ufa4zDvBzKkA9v5N2rGjdkK8DLG47BthSmw1Y
-M9IbxxAbhboVGTouC6gROzA17eVF6NlLgtdGRKyKiIgwWtaVmMVM1SYnpyoNp6Vtpj61Kkm8wwas
-n9+5k8R79+7dbdcwApaC1WDu8VlHJYZkMWClYarJ0jefcDPfMXHZjZcPHPdQLC1PnQ7bvm9JwIrg
-4NDQUCJHRcXQsjckJCdsWI8/GzaAO3VzqgZOgwgwkfmzY1xiC/jll4XYBGgL9zrOKAlIRVsdZoXX
-EEskkpctbhOcxpDqJxx33z158uS7LWL6Myx77qJlASsUNbAjomJi1kZJRbJh/foErWmyKgEx8pCm
-JrG7Ue+Q06BU/PLLLwusZKTX9isFA6pyfMELWrWVb771zjt1LosWPde9844KYgZTBSi7/IMl6lkL
-GMyi6btxwJ3p989bBFmydNESyrJliwJWgD0q5glqODktDY6dloZ7m595BqkYlq2JUXFIWtJhK/25
-7Tt27ADwDhLDppVy9+3D8TUSk5m8BzWxOr755sE338TRDgw64JgTIGo2wFaehcFr2rc06Dv6+Gt9
-dEy9G6IUrKz7btygFJEYBl2rA1173pKlSwNWIIzBvJPJKoKe4hnRsgY2wcoVtgArhg5iAFv6FRVr
-HXto2DgsiYVLrBgK9ojSBFa6pWfb9Gq0+o9jBXnYAlbMsHD+TJrMu/dMxV2Re6bOmjMXWpfqE9Bk
-lQZK9J2GVGUPVemuwEUN7xDgneB1J96/Xxm1m027gjCBoVFiAVXd2oL0WzgTdUw14xvxOLR4ioWH
-aPhuL6+7J8Oh7yDsxEl3TKJMnDhpwqRJEybgZjIS9X1z585ldQILXxYcEbM+JmZ9wvonNDK1TOZt
-27alb9PwW7ZsUc9A/uZvdu3a9ZIgKzXnA9cQK7OmKHZCq8fGO60w/eYbPAvqadHwz3/+Duz2Hd5Y
-mv21lnff9bynKy1ELrBOAit+5GbSbRMnTbptwoTbJntBy5MmSYcB2vvvv58lGfurgIDg4AiU3Ci7
-ExISqGebkkkKXkG2EYuSKXl5ilfr2FKyC1gxjwG2x6df/vIfNK8LFvf+UVG+O0bwpMNrqoRpiNwC
-7Y47Jt0BfOqWyp08fdas6VNh4iSeOxfAhhkxbVkwqhPKeig7ScVskG7SooiVnsEtdr1798vKsvO1
-ig0yM5COXGCtq1Mh2c7neR+81KxNtaQF7lhU6xnHdCYipWDxVfDK8W7CTpg4aSJteZbX5AlKxwQW
-DYuA+MHgVcjWSFsxMbEJhjktzSBvsiOjnQDwTsYuInsAo/wwyAxUWq4PTFzIGEu+AS1egoZRXlGB
-QqsOFDrxxAmT7sC5QMCeapyYJm0jVsgRqMwiIqHnWDCDWsmTTz5p1zQSFXtkYdZm7dKyRz6Gd95A
-5FU3G252t+F2kX8eR9rbHbOmIgUhHsOQKXK8AzcT7pg89W6Y9tSpk+/xmu51D/IT9Kuc2E58P7w5
-GMUJ/oaEkprMwE0AL8XoOi1N2bXEawCLXUOKtRvvL/6p6Jd5mESHNTGOtNp3zON3fvnLujoo1ygW
-R8H9R7Hj9vZfK9Tftf9OyXvux392zJmO3HvPVC9oF1Z7D4jFg3F7N9ooKa6BOgtmjV5KRWlPoZIh
-K1CQhkbQoWNF1qxZB9HcSaJsCdkA3mXFrr0mcv20uLj8p9qFDRyZPV3UTbN80Cy8YsdEFdobiGM2
-WyRW0PyZi3t333P31OleXozZ0jMCcvZs4rJ5NEGLShZV37+ErrwM8TogYGlAQAhtO5LEa0SIbEEL
-MxMU8pOFLMAlxcU//Wl5uSkv7easmJqbx4DqJzx4f+fG2+0mchocS755HxKrrh8DHlyxbPGSRfPm
-zp0za/o9d+AMsLLEsGvJN+feBzVPnz3bBGkVrbV1owhdSoGOvxUC+dbq1WvW8GdNkOaOF+yNW7cK
-sjCLlvORnYpAXC6iiGss4MZGsrqJ5reeM+pVXvu73xnE9z3EPO8IXsKUyqEl7HLVKjQLK1bw8ZK5
-UPksFFZ4ftUqIC+C+vEU1Hyf0q0NmFqWypupOXglxH/lQw+IBAWFhYVpTcfHx6s4tlWQJRsrYMWr
-gGvswGOIlb5dItZsohQ0eFPgVctkrqNntGwH1z7MHin4wSX3zZ67bNXDMv5YtSoYzHORkGHms0lM
-R1Yahs2LzJvHfiMgYGUIeP39Aeu30NvPz4/QEFKT+MmNGzdt3bp1m9g1gPP2FxUVGeC/B64Bbmho
-hIxRsX7iXXV04Yp+bx1YzaQteRicIFyCVQk13Fq7NmJV8Ipl37xP+bWKWwJseOEGc+bMnbNokQ9o
-/X0oC5WA+oEgYIdZHg3TFuKXNHCZAv570ireBoV7A+B3gaxDlU5BLtrubk+Lft8y6UcedC08PKoW
-XB4lH88A9a52+axfD2KkWyDPhU0jeCnc++934wXyrJlz5ixYcO+9+EuZCbn33oU+VLTYtwQyaHnr
-1qxdWS+RGBouK6tw8SqL9uRtbbXr2lVc2FKuFaHG0OIJC/hhYAkY9Eg0FMaC/MSjax+B0h95WPGu
-fwLF1NqI4BWLGL+sEtPwzplzH6L4HPydRURE+alTRO686847p0yZNhMnALqGpgNJHM/wtTUrK+ul
-vL1i0mXlCFuiYKdW8WGN3KCN+ojmxVFoYcty77iKVt2dmqhTK9fo2PPoeARY2oMfATEEg8rHHnt0
-/WMgxkl4BM8RGAOemLWrggOWLLIZMZVNfQN2lhbyenlNmXK7yMSJEyfcBiG11zRwL6Sq18CZRccg
-ho4Rtspo1BXapJVha9Ouc7fqVqXb9nbygvjXErAArGU85bo95yATNckfjKFlDxP2sDxGeCiapwDP
-JSeDOSYiOADhW4ipZNziADM2uKxRMAn08rrz9okGmBW5VOWU2++cAvuGooFM4q3ixgIM5Iqf/exn
-BtYGbSNuNbzvtpug9WsprX5niN93abQb98f+cax6RP2RwAS8x9WCgz4AGrxcQaUbM1RzQQbIWrew
-4TlQ6azpuiSjbqdMYaulMSdMcFAM9oQJYPaaudAvTOn4b5ibAEw3LiurhlQ4nU4o21lZKWnKWakK
-Z8uBqV78gU2LhnVKes9SsdH0h+9/aPmtvfyASSt5VAR7mDQw9SzaxaIxW3w6No2fwKiuoF3WXqJb
-UesUUa3XlLvgtKjEJ3zjG98QSgfu2AWqvv2uaTMWBgH5yU0gRm4ywGVlpRWMXiIlJaxGkJcZwlzE
-VutHYGXQ7e3vWenXYvvwww/d6yz9CLtpXQLFCiU1rPeqWVtoGadV5JayZIkBhkXP1IbsNeVO8dqJ
-4BRGUa4nMK379inToGQEL3Hkl/IKIdAyg9d+gJoOmT2UAq6rMyo2wIpXAY/hBe11eLsdik+J8l/N
-KxsguJakREI3c3LoKjYKDzJYMzuh1piHOlS8d8qdpAWvxhwH2CF6p5Lv9QtSnpyRlZWTw4RszUA4
-GjDLETLFRDeho/S7KkZLyHIVHWiJ7Oq8Pm53NzaIK7G245ldecLrAmYgoy2sRym2FtSoP2V8yxIa
-xPBiiVYMyeK3Wr+eGtYOPXEiiKHk6Ojo+MSNGRmAhm1jGPLy3rz8/DwbMHWsymsdvFzApqQULbvZ
-73X1C2B1gQc3TNtJudeDvN9+mvuoKeYqD8nTgA5FJcaS1D8AshT9BrQ8a+b0qYhPKkzJLY7apLVp
-8/lvSAyjkr0hqLWp6G2orzEg2L5DBl6qg6JQ1XDlGraMTMlHtIqP6HgleZhmbeVhdUfl5Q8Ru5SY
-PO2wbJZ7kdw2axFXFtHkFWubJdYepPCiQwc/iNWJ4JAQNIdgRik9b87UySDW0OP5sPZqvAXxetq0
-aTPmezMzr5H5iAwIELihYmPScqek0umEkhvEka0qS6Oqg7tRa3oNazdxh2sjodzDgihAv81ba/eZ
-LJXqXZc8PxsMszQVEDTBREavBG4gm6Q0XpT+hhXFmJoZsJGYfR54aM2aWCCzdZSmQs9BXtsn3lxS
-LsSq6jLAdt73PLz4JsBc+tXb0HhXNnLYca2NLLbdtK6qm1W2CBUdEOC/dB7GJwxdSjyitOshzB0O
-f7sXa07/h9Y8tHoNamzpl0msJvavcgIEXhg1ak7omNH6N7/5jZtyYc8U1Srp6GUPYh9+ePr0aauW
-1iv5uArJXJAzZhuW3smitvDISqmI0rMMaTmqJTaQQ0KWL5030+tOZCjKpOsDS1iDZU9BseI1DY2G
-XxCdGb2jah1lliuaVglZEYuSxyC/9x6hiSyqxijLFsQkhBlih95hKLS8xAzbObi5QfZ1cGuHwTf7
-EGVNWF33oYKZajcUOwc8IPb3mQPiO6eAeuJNgFURNvG22++CcUsAoy8rZjPKlQoExRfKTWkaBbkV
-4qFnpWiZ2r1nB1bhize/w9TS2pL07Pfk8gR1YR03sVi7adUmLZforQ6yI9Go+wnOZ6luAIN4wXTQ
-TmFN7QlsLF0HcVWOofK+k+7s7cf2UZCVL7PuRClCXgLXuoYCBB5DLEWI0rBtFkDS97rl7LzbbANW
-l2PoCzWsi65soOrSO/fzsNnaDJGAfmp9TFQUhnghy30WoApBh3T7GB8WdYogYTN7qc6CT0yZsdAv
-CEMwNsxKyRKv1cQLNTaBXUOB34yrZB2tQa3HH8L/nrCKOHDBpDJmXliEPbA88OIq0vEoN/qxXGe4
-fbubdZvtH09xhwBU/HDEWih5pf8Cr9tJNtEEZZOHHbfdfuedd9015S70yjgdAJ54m5SjAEYt4r0S
-KYpaTmMrRRVr4hJt0samUXkJcbMup00+VoNoGDYhIer5d5vf0ZNBB7VqLqayb/o1V4Fal+EobrPp
-DmfJbOJxhW7mq7WPIEcBeOHMKbDnMc2D47bJaKcEeNo0IKNjhCFIhMMRkwI0j8zLMGsz9gIxjVrZ
-NOLWL63BD4l/owsQ1SW7iy5Bm7FMVfmGJPbX9zncr6Ry7XI292xXWVH3cn4obsQ6gImOkaVCvrXS
-32cBQjWrTHseguNOuhNB+S4Kqg6gosuazpGBtmpUIuiY0S8bYhlsFmk3VmOBBgtZA6uBgCeysmEo
-trKyuHjfK9j4yc/twMZW2dStb+xX26idddjzLH/cLjL7/vct3zaK/ktTk8TEREVycLlwzqw7Tcxi
-PSnl5gQMPyjQ8bSZM6exq7x3AcZeM6FsaBvpicCYECjgl17Sk030zHRkGRBgwGdGfPahpqVhaZbb
-DW5NZXnxvu1bsGUhjZvlCPxDBSyXBZqLO9U2bjySvc2yy0qdC6NxezDT5o2dPcnw5A0bYhGrQQwl
-T7ndUrAkIKznsNiAeGG2p2Z8C3wWLFx4L1sPTL4W4kkUImLUEqllzsfCi7Pcip9VmFFILSK2hDCP
-ObVuI/EsFmnq3qRy9+5MT16Pj0benQ7u8ySy0JDRuhRV9hdxn6Awq23POGpic9GdtdduC7dsJadC
-khJiEalXPwTkmV66b9LZCJEZoYzeCjgl9y7kVHcBRp0LfTDh9fGW0a7P6jVSaGJAYAM20doaBNVa
-ixSmXz7yzjtHjiBCYYn58GEYM3C3b05NiMGCPTa87tjpePXVV/cRSfNaF/O5XURkqOUKPw/bNk69
-fTuQwUzi2NjI1atX06xnqbxjCc3WC2rlLJey0AdzbFQqiwhL4TSXZ8B/5epYrMBh8U2MWmlYhAmK
-Ocoa9An0kSOKXY6HoVgt2Au5I31LWip23cjyJYC5h0hbrfulgNhZ5MI2u9jlnTZPxwU6P8DfH8hO
-Utm/pFUcuRqfe+FMdhLYKYJUi+wDY/aaKaA+GNiL4E3C67885CGu0TzEW/z4Y7EmMpLMUlrTqF3A
-mHsZ4BqP1RnQOitLivP37MHn3LNvH4B3Yt/UNrX/AsAvisWq64rAu8/sdcVdkRf1VX2u59XJse1/
-FmPH7jMgAxhnk0YdEwmL9lk4Z/ZUJCfJsyw2vbxmLfDhsoQ/miv/paANWI4Wa968pSEhqyP5B87/
-0OrVcAnc4hCbIGpmCaLiVgk1TFHEzoNq2MdKWwa7h/ESgbk7jIhYnd2xA0d8rrQtW3bscNj2q5PX
-LrJZfZ/7pV/YUGbMgSdIW4b8I3pXKf5hAscC2N9n4YJ5Mzn30WmWGWge12KWA1OWWLHCSuA5i4ND
-IkVQmZIzUq0xx8b+BRbX0+DN7lWms0JP+zAmUPtizFKr04mZWH7+Hu6V2gL32oJAsCU1KSk1NW3T
-lm0AVqlHBSQ34FfVxk+1hVtfePKjH8EBtEkoXhXAlXA/OLbuKA3HovigKhciVEvrxEgF78VYZN7i
-5cvRVX1L2uhgtliL5i4NDkUdziYzNCQUtEBXwLJ7InVTOucCbJ3MUJNjTT7O11ug2DWzBC0pgTWD
-FWw7QJqKjQdb0pKwKQHA3E7kkKtOGHoBIFu2X9MbIXHXBfwq8bH39fVXX5R3gVq9Hz90Fm7O2bkT
-G4jTgUwVJ+ETr1wOVfr4YJVppteU29XKi+zYnbPIPyQkEr0V/mKfRMTSgLnBIVGI7dgzwc0TSOQx
-CQkhoI0U3rSktC3bdu3chq0Ssnyupri4p7tm1UWW42Tsc5bs4RlPS0iFM8SmbtnAICqRFNtr0nEO
-HNYXceCiFNGT2gdZvFt4cUfLqwJczKAuOt7HH9wDMIkFmirmxqVUtk4wTsQt5tgFkm6lwpjidYcX
-Bn6z4LPUJrqrhEgwRy4NjaJ6o2JiN2xQWyZCYiITaOWiY+oHeyX27t2JFXRIfn5+DfgammrL92Pi
-RauuxJ/98N79W/B2sEamJmzYlBSVlBSbgKyRsGXTtj27duzaX4N+WEqkZDSA5goFHImtSF999bVX
-X8ef4p+oh8WM6hhF2J2dvbog45oObiqlCfGzom1CBKZZS0GxAObtNX3O4sXz5iwKCA6JiFH9ZExw
-ZGRobKzijNmAQ0RkVGRSbGjI0sjIgBVAToAP682MO9PTAV3irOns7KH0VrSeGervrCmv2VtTs7/G
-mb8zNQEOBWuJhesnJWyKiNyUl7dtW15bW2dXV8/AVWuIR2DdD8heaOaZHyCs5+e79lMxOoiK98kN
-D7ABJUrHzz+fnr45LQEuDK3Erl6+fPVyn4U+/iDWMm/OvEWLMctejJjFgUFMaGjMiijaN0BjoOGk
-DUmpsbEbImNDI6MCIpPwuf8iNmnbttQ0bP/ZC6veuXe/s6XzzMDA8OjIwJmB4aHh0SvDAwMDrfvL
-a5zl+fm0h9hNeUW1m9J3xW5raapo7B0ZHRwYHuhp6+0fGBhxcKu30rAoeEt6WsJ6TJ4jokKx/yom
-KiI5ldUTEnfa5u079+7bzzmTXb0KXfZrvEyrfh4uLDu1EHdYf8CJlz+EG/8FC2SuCdalSxcvDQjl
-OAiUEVFRAA4NxjmKiopNYtGCsxUbEpVU0ZAOxcOiU/c6S9J3lTd29vW0NHZ09gJzFJTDw1dGR4a/
-Gh0eHMK9gZ7yvbWNO7fFbNm1Ka38zPBAU9/V/sFr5wcG8caR0dFrA70Do6PDw440DfxUqiJOT9sQ
-hXVg7G7B+j/WFxYtxa5hiH9AcGRCWvrOdKidtv0KnFqil9Yw912R+AfPo9pKQx5O3SQFVwDmc9D0
-ym3bNq1evmkT8+/iRfMWLfUPJjFC8qbU0BVLQ0JxbiOjokJXpCWFhiRtS4qM2VTbUY549Zd/taui
-a7Cv6W+bWjv7ent6R0aujEKujAxfERkBD0FGrnbk9Q7lx24uamtp6MUbBnv7wApSvIg3jMAmKMqk
-0dZt0DrenLphfVREaPAKbrsCtdBCuFEHu5JwPUDyZlyMtYdVjLuQeCd8DE62d0fatoqmvE1QdFFp
-ff2hsqKiY11tu/6q5WQeBrk8e4hojGoxIUm7kiJXhCQkIVpzvh1S+7dJsRVttYe2bcl3djQ0Nfyq
-q+ejodGhvuErQwNDw8NfXQEvQYdHr31FzGtXR4Zw+Groq6GuK9da8xu7hr/A84Oj10aGr10bBu2f
-cX6GB/48+n9HR/88es2B5kbmzBv0RRukXxsRGroKf3gFQPBKTp5RHPCDApqXBfBygOQ0dYGD2TWp
-rJr5aX/z6f7e1p3OpoqKtpNdJykfnWxrw1LZtv1dfbuSYv+qoqmpqahoV1LSLlTGeQHBCXl7k1BQ
-JUQm5LWdbNuU1HV1cHBocOj8V1dGhoaoRAAOXhn+fPRzmPGVEaVk3L16DZY9+tVXsGzqGU/jNFCf
-o/959eoXeAseKf3+Gayjfya6A6Mo8EZZEvowcGjUWAsOCMaAavXqb30LRQIG7UuobqRQqCcAroc9
-wzA5JHa1S5bo23bu31nb29vb01TU1NXXB9J+I3LP9bC//0xvT09f/+BgV2tX/+DAwODgQP+ZM/3n
-B5VAmRTAAQ8kgvmFWLO7XFUP9WHs6/LMF1/wLIg4UlPRv7p41+K7eWQlJZhrCkiULPdAzIJI1Iy6
-f/Hi5StgfXgVCWMTY/+uvQhV21DtVjR1nunv7T3T39fVB76Pzp61iM+KDJ4/399/HlEVfP39iCgj
-/YhBggjkQUYYu5D3iy+grFFzvA7SzZ7mP6GAsXAiE3VoTC0MyuUrSBCYrGPrZHAA6nukkBDUgiEr
-A/x9lvs89NDykJAViLJ4/lvIdmnpFWeGzvSfgbb6B0YQGvjBB/HoQv+FCwpTsY4rgB3BbwwplYLP
-dhAFK14oyfrMN4O74evKhwkt4FS1mqqjVopB7ApY6oOYiu1m3G+GUhHZxWfxUv/FISsQYpYGRG7C
-aDGvaXAEeiMljRMfE3rEIzJeDxj6NDIE4MFh6BawitcSF+//CNL+y67Vww1q7UTdsDZkHYRad6X/
-Uh9uo1zOoQ3qxOU+8xYvmhuF6igkJKkM8air7wK12d9/4Wz/WXxyfHRojfh83mDhJZtohZJM3BXn
-yBNWe/DXpFiL2ZGmS8un1FIRFk6g5Jj1G55IhopjMIBEW0pbXoLaAX3AzFnoBnzmzQqJ2LQfsbbt
-5EcffQS0jy78K9wV9wkvBIbU46if1zEJ77MFJ2POYtQqXo0wC4lc72hIxoln4/4eVh5UNa2/8g67
-saJQxEeh10iIjYILoxGXLhXRCvOnmRg1+nMSsaul6e2mfzl58T+gwwv9TDyg7YcBw6pBAzceotXa
-LFf0ewl5BgIiHvAeIVc6pv8qSvNQFxlfmzlL0MI6AsYUf/l0snzH3+MwbMbsWBo1itsI1AerHwoB
-9UP+rP9nzlw408d/UcimPU21b3cNfnbp7NlLg4CFMQssoAfO958fglHzZxzR/jmiEg9OiJiyArVw
-LeLr6e2/fw4cHKujqMQiKCaZ65NT01DIspmMQhmbxiIoYHkIFCzE/n4L7+X4LeltRqjBwc8+u2SP
-ShKg4MwIWKLBMbh0bo+8I9p143UFauG/Htot5d9xftmx/Qfbf7CZvFs2I0MlJ6cDOCIWPXkIerTI
-0BWYwaDOgKJlj7vPwpV5qBO0fHbp4kVRrV0EeAjAY3ntMVhMW5v3eMRG3187cCrGIOtTE5LX79id
-itQEQ+awgls20LcuXoHGJiQydlMJKc+ePVFaeOLSn0YuUQtDQ59+NnjRKixszIxT4wKPp2G3oGW3
-bH3/v2+84/+mY0NqctSG2PWxUTt2x6JXQHpF0bxoXshSdDRLN+TtaegavDoyMDg6fPVPf/rTZxcv
-/ulPg/0jV6+IJf5x8GK/h4b7z164oIHHqpg69zRp49M2D3bD/tqBQ4MjApLYqsUmBaNaTitaiZ3t
-S2PzUFv8RarzwkhZU//IFZYFKO4gV8+OXEWHoj4mgD0NWrItiA0XH/5Ri9i4ecE9RLm82NOlv3Zg
-f1yZsQMmjI4Nk4ilRZ2LZi2ak9TWFRy5bdeOkp5+lShHv8QfVAcoHK+O/JFP8HkCo1wWYV8gQUu5
-ruWuI8N//KM8gbfzF61SyiMoW8g6ht1qHvbMz5552fN1Bxx2T1MewlNkLHfgFDUtD4iNLEKj0z8y
-dP7CyNXBP0p//X+GP/+cHeW1/7z6xchVPGGZtNUd8A6qyUufXhJgV4QSYCVjDdq98rBKaX06rLrj
-a1O0A/PBhpNNGLgl7d1VVJI3NHhx8OLISD9Lwwufjgzpj/hnCIihWbbXcjQ+7A58cfDTkU8Rpe05
-VYDRILEHRNp1KVmZr5wEPutRdKBvuLU0fOPW0ONUOdLS9zb2ojfFp5GyR38AW7ErHwjA8pvAVR9w
-dIQcUmug2tACBQ99qpINkRGqGZjRU0C0jkdGhj4V9QveZyil5Y7+d1127vE5r49+Fb0w/hi5nin8
-pxbHGRmJuUwNVSvmCmMFPTTlC+oardoX+LCDF5GV3HDPXmS1qLKr0hcshYHtInD5o/3bVUQqQv7D
-6h/lbI78t27CFqrcue7vWcAYEHFywr/6LI4F/gKKVecEH0QBI4IB2GbOVsNrqya+AMlFnJWLYL0E
-8IvwboRxEmmbt8yY/zI+ijkT+C9quXXyG7zT0OLoULqEewrvGNghzHzhsQCmhhUv3Fj0QoO25WGj
-QCQhyzOGYQUig5egaADjHJ1nRDNtghXbcA45xrF8/2sB1f8IeTHnEnGA8XNt0jZTVg3N5csINLB5
-IOOvGjwwemngz6hho1lXu8usCwuVE/nvAxf/oIj/QGDc4FfOi47dW31Omkf+4z/+/wCTFZ9dAYsx
-fz50Rv/3MX7QUYkHmOcnYMa9y3hebP+KDl/8zHRPGeIwpGsFX2CdgbNzZfTPSGb/PnDh0h9QccOu
-6cl8P+MXBqvWf0dNHNHvKtgL4v6YYWmTNu58s774Fl4H7rVrAIaKYcm4cTNoq0XHS/oc4C1XwHuF
-vyDmhwjcr+yasw1VU6KwGv4jR/0w/uH/c3lg8NIleC5yHcxa/FkCtmdQhPXg/OGtTGnDHMO63vFf
-CGA384NrAL48/PnQAKuKUdRSVKGWyxBCXzZOTky853MKQ6n46UA/hlns/AmsyyxJbowJnw/jnyAF
-kVGR8BZaRgRDRrMhqyWB4UH8A/9LDUww6LBe//pmPF+OfgXglu7u1u7hL6m80S+/pJLpv59/LrhD
-Q5eVxV9WT0LArZHBPDTAUaUSPVE+j9UcvBkf+MoVpuN+WCktnqfkLMxBMhSIlUnr9Q/a9MiwNNcX
-4OBcWYAC+F+7tdLD0uyX18xdsNiFj7788quvvnLUNTc669o72zs6Ort7Tved6YPgcO7cOXx0yvkB
-xi4XscKmCqS+GDDAGhs90tCnKD5GsGQAI/8IE5Gz1C2NgDXnxT/QmS99ZmI6qy8ueME/LnyERYp+
-LKjAW0TDPMs0NMu9bGahp0N8RvkjLVSw9B8kOZgiPqn6vOotGPFgORRfMJGPNXRsHsgvLsbVBriX
-j20S6tISbBLBPnTsBuJGqJaWFrObsaMd+/7aOjo7tHRBZMUW6wkfSfn10b9i1PXRqVMnT546eaLr
-FFddTpw4cRJPdOEun4f09vbJST5zBuV729tvN7V1YNFXnlBPn+GPu5yjOvCUHJX8b+ueuaOVdV4y
-jdKZiAOYZOWegX179+zVy+D6K1RKKisBL5dZcAvFwYP8MdtHZOOMk9tLnNgWV1tbi/0zuPM2hplN
-b9cfq8ciGhbSSksLC0tzc0tzs7Jyc3NwzC2tglTjZQgHn20dHW0iv3r70KG3m1o61Fq33tKOex98
-8AH28GuRx66H1r1zcu/3PNBILeGZsZ8cR/GePbKzIV+4IFAtbqB0HksOVoIQFwIeNsIdQ7yvtkfV
-VCrgppaWpoZa3q+orT1UlJeTU5iTlZ0RH78uOjoMV4pji6y3Ny4Z93sA2yixzx+XKmXlFBaWVRw6
-VIsz1NjQ0NTUcuxtPmhphXd19qjLbsitkG0iaOaxB/vHfX2/dxOb6s9Dzjn27+Purd17sM4ryPr6
-GXMdDS6Mg0oBrRR78CAvg8QlJk5s/8L2qJqa6lps6oUhdnd1tDYBeW9ZBVizsrZuTMxIjA7yvneG
-iLc3LtfxxWVK4UFh0bjQMgMXpOGsFBaVHIJtQKobYRe1tW9jDzgcp7W9u1NfaaTJDLTRtzkabXdC
-u+d+f/r9Hv2Exa2J8Sp5zznMJr3Kg9QnVYsfYQcrbg8S2CUHjabr6vQFvtzlCQWLhrGzBtcRvpST
-k5ORnQgJD/T2DfSdPx/E02bMmD/f19c3LCiIl6NtzC0oKCwE8d9WkBgbobHdncD4p1qh4w5GUUi3
-u3LHPDr9gb46+OOP/+3y5X87Z2n3448/lvuezg0f5kYOXAoFuyZr/kFnZX5+SR2BaeAleIkiGxkP
-I4SJMcs3quCJmkpsaaU9NzXAi50V5WXVpYU5ObnZGVWZcXHRYb7ewMS1WMLq7esbHh4enZiZnZ1d
-UFAqUl16iAI/qKhpwGy/6W2cO2qYvObKlHGgLZMG2Mc0a819+n3t8Z6wtGcxaTjwnvy6OuxfAx93
-sPAysLqWdsBgD59cLwQjrsFXxTRgp3Xl4SOHK/GNBHWHGyrxPkDjhvsAaxtqxH9rD4EX9gz3TYxL
-jPP2DYeCKYEp4aQODAMvjB2XG2ZkIZzVg7a6vqm+Wn4ZMayVuIhjkieVvG8gLEpbGHOLaBr+NJQr
-Gh4Tu2HSxZUlEqUkXgGWnLxCqBGBpAFmi7gkmxnxkrrGU+1ZbT588CBOQUMLshbc2UlFN9VWFOW9
-VFqalZGbszE3MyP7wIGUlJRw38A4/PgGBuLWOzyaF1hGr4tXwIXV1HJ9fXU1Y/s/IdMhaDFuQ6hh
-K1h3u0UqO6U9ZBvg07//PSL2+MD7iisBmr9PuSqUB7U5hZrRqbKyEcBUpexH1lt0DztxgRgvEwMp
-2Buc5QBuqK2p+NkvjlWIpRbkZmQkZiYGBYZ7zw+Mg137hoeFhc8PnO8dGJSSmR2fkZuRzZgFFdfX
-H1OiclMTkzuzu/B+oK+v0pnIM1R7pic78Pi8CFosK3hdAD47LBVXopeUy4ZkAlPZkn7grFAw9yKz
-DuFJgRM7efnjkZaWZnw1Q0NTW1dXW21RXjUgSpGSsjPgrHFxYSkpCFze3nHe86FlKDwuMTMzMzG7
-CkELqq2GhpmSqV9kZOgWfxGrJGIJsJu42e84ydgAq9A1jkGfPw8flrJiH/EaGiqxKxX797BNU12D
-73QW80au7QTvEbiy83BDM3QL7cLEcVddgYAgXVHxM3xmRK2crNycjMR4P34pDQI0eH19Z+BPYHgg
-w3RYYiIyNDVcimv+tYbbRMP/0tnZZWo3Rfw/AB6X97yDyqo7UudETjkIAhBzu3FJOWsr7k8tASrK
-i7pftx+HRR+urEWwovP+FldRwCKcFU6EM9ScdOJf/Gz/LkStwsLc3Ox1SMJ+APX2nT/DNzww0HsG
-jNs70NvbLygxsSA7Y2t2ThZsobQMPxWHKip+BV54bxu0S0V3/FaCVs8HuBF7Fl3TpPUpGPcIDeN5
-N/1qPZ/nkWHaIZUUwk4dMOnGkn8BakJ0o0SuujoGbxg1HJbvgjWrq9SPwMTxBlg5q6zq2vp6cBQi
-bGXHR4eFJ4bN90VK8g4MnOEbBwf2jguLTkyMjs7ILS2oKhAHrmaUNkat7VpHrQ5qWOK04bwFkzaJ
-2F2/LDmE97yDe8hRb6gojZ1mJdiayi3Wsj0X8M11CFoAZpw6cqSl3Xg8Xb65QeUomIOzxMkwXUun
-hBcX5OYmZieGBXqLehGnM+MyUYHMCAz384uGRWdszICScyTAceuaDVmSEtSLHwK7Mf53gaXG0sBy
-PQRqaRZXJagx9jsbasp5N3+/04kNudiZXFxewxwMBcsOexzQN3W041SI38ME6mrKGypqGyuKyvLK
-ELUyMnI3xieGBUG3LCt9A+fPmDZtflyKr+9837jExBSoPwydRBaAC6nfpmP1hyRu/RMtuqMTbRer
-LPSrMFCJzLgc1pjyeJ2Deo01iBQhSpQxk9TAst91HCw+iOLJyQ8vgsvOoURsTEWsQvSqRG1dgifl
-8ntm3BZpE48fxyXIHYhYRxpg2C0drKOh3tpfoNDKytm4ZiNKi+gwpN5wmDT/hgMd1QdSMmJWdPbR
-o0ercnPow4XoqyqwS6+CJSaIuwDaJZFLhWkt44TkcXKSBiaqAZZO0tg3TZotbgvzq1P1By3NDbj2
-vMHZgDgk7snCAxd3qeISeLhtRlNMB+Y39eH8NLS0t7Y0tdSWs1JCoVVamJFbkJgYFpaZmZIZDd+d
-4R0dGBgYFgjmuDA8V3W0oKAgO6e0/ujRE/Unz/Z3nUCDjKzW1vpPaEMkLbGcFmB68C3Qav1KAS14
-p09bqsUQQw8z0BM7VAV1+PDxZsBAfUyyTqSd8po67DZHvcnspFiZpZGWKgF8vJnfQECfRhSTzNzU
-UVtU2wQXVh6cnZ17ALl3frjvDF5kiOQEbARpWDmah/iMjfjWkizUoFtzCotKDyE9MQA0NjWi0aQL
-txtgtsW3BCz2bKpJqbM0sDT+mNvIGADAEnCpLqQa3qisW1PD73uCH1O7ChgBGp1SHd4Ciz5S13y8
-HaenvQO3Lah7O5o6Git+UVtUBIsurYLBolsK9A2Pi0sJhCnP9/MNjA4P9w6MjoNro2GKz5DmgYUl
-slgZAnxTvQA3qJhlB74lXuXARr0ANlYMc2bEMlaNwgPX+LDb12ONfa9Aq7zqvhbVUwN+oFLmZERs
-tg51RzjyQQFSqfriugYMQaR/qObMo2J/XhmAC7Lj41MSs1MC41LiwsLRI2Vmh/uFB4Z5B4aHBQZ5
-hxXkJuauk344JweJrBpfO9TUCYuGTbf8FqVHZ0d7u8nDpti6bv61Ggb3ftDUWX0a2MrDUmlV1qEX
-oCA4C11JiSgaps1rSKDxSsQrpGzkbCZeEYna8h05sGrA1qB3gIa35uSgkEKDEA6doqxkJzxtGq6e
-vQsuzEyMfJWBajojoxABbivtGcBt0i01Yhc4IlanSkzj1JZjvdmEZtP/2oKVcWL68DmZcdGH0eyg
-dkLVAVA0ECib8PGRZ5BvnHWtzZU18r0KdbTqBpgxbJim3Nzc3dF+HJ7MPMxUXdNSUdtUsb+sOicj
-4wG/+PjoIAStQERn5qVp07zDUqLROsyHYUcHhWXmblyTHb9uKyYjiHCFpWVlyErH2o4xL3EuqALX
-LfGKKeucdJ12wT0vOWCdYqsIRfBi6kz1v9Ag0jE9XF3ihszEk3AYrMeRg42aGbFbGtBr7M1nkD5U
-VpqF76ZggM5k1wCBhjHfQesgbTEmAn7zo8MysquOVpWWolE6wb/V9SfYOuCHIzzBbUfZIdn0ZiH6
-YxWf3HoFmw/bcZmTHQy9knLFaC1xQuuqMWajhFaCFRV/mllztRyHlnkS2tsZ4ivrGls6W9u6jhUV
-1WMmWYpK+t7EuDB2C94zfKO9p+ELHGZMwzAANWZgWHTm0QOnjh49dTQro7Qa8y8E6rw8JGLMijjf
-EWtWnf/NWHWBMRZ4/L5BzbSYgNEs7UYhfZDDHDFnHNkviQBaNUuYCbCPhPHDGo4foX03o9egTQC4
-Jn9vEUY1TfXUHEJ0bmZieDjrZ+n/MeaZMW0+iktfdIyJ2dEHkIYz1q3LQLVVWHqMpYc0iE24BBoj
-rVY93vkAA6ubJiVtyON2gxa4HvBwxCMzHQIiJrGcxpVeaInl4kV2xnRS9A/w0xrEJ9RfTF7MQ6gs
-ZXQJYrxcU1HkrK2ordi2+skns7auyShYh9YwDHUW53e+0XEpmXFoDNkqZmYeQB8VvTE3G1E6K4uF
-ForR6mOc8TRhPIaCR7Qss50P8B0rplCUsMtJhowzdEt0vb7XrmIFK9UHKy0WS/wyKnR4zMLFlTWN
-zfxGELlGFffpvByASPcgRq9iNDN2A5R8pJ0fqaejtrWpKK+svqk0a2NOKeYZ+N6ouOwDmXGBKSko
-s+JSDmSmpKCgPICxQHRYGPJwbkFp1pMIXLzqBdEddUcT5jtwYsuk3RMwVWih2oHHsV/bU1aRpYkd
-TEVcUniF7S/aJl7Lx6JjP7/SCYJ6UzrFCsRrxjT9zWUt4EfEZnUJBWO8U40PXA1frC0t3bout2Dd
-yqAgP3wNSSAG8KiufH2DcDMfSvbGnaCw7I2rN+YUlB49cepfT508dfbiZ3/qxbpLV0dHV3cPLhIx
-/e+4R2rVlXxMvnU/ugK2XGAhS2SK2MFBO78YVTqfluPNtG5evMighRKagioTIZvlBVWLaovUaB1Y
-SjN4l5dUwh7zdhVV5L2Ul1WYk5sbH5ZYVXUgJcjbjz0h0tIMNBAI1tFBQd5Bfhh2wcnNpBY+3IVQ
-XY+JR2tbTy+WlnoI7CFqKKdsWTR9Y726XjUGrag1MCAPSjpmpSyUOmIxgvFEwNhxAtD11sgoS5WV
-R+jax9EcOp1wc4RZtDvV9cjDBbnrUC8nZqZwpIN8BBUzGQN5Gpk5tgyKD1qzMZcjbPwtK8orqq9F
-VqptpEkjJ6mFJZtJu+ZT/1VgV/WhgfG5aakNzZKI6pppwJha4lBejBLL6Wzu7GzGSAPlB6Y4rawG
-8F//AHNjfCRwo0yBfTS1bUMSbSp6KQuTjLDs3Gg/b+Qgtv9xcXEYXWZmhs8PwhQTagavXxD6w6qM
-0owMRPTC6sKi+op6uATSeUObRKzO7l5VUn74volZur2VNbPxxnNGp57RWhm0mLQMARwy1IE/thxB
-+EURAlZqsmZfiUy7GpCKmjs6WxCziOwspz0jHzUwjsKHG9q5ytIIWtTC9UWFhQVBmZlhGFuFoe4I
-PBAXjrk02kGmXcwrEzMPVB04cCA7MR6lR3ZB9saMwnqqGENaWTvt6T0jK4e9p8/0KaoxDb2r/bvO
-YNLD1m3AsOiByw7MpUnqZAWFUtHZ2iKjdoxsUDCqL+5CocGhAImRingWOMuS0R37Ky6xICOh6Kgv
-O1RalXu0KhNmm4nWH86bwuoKo51sgLL6Olp1oOoU5eip3I0FBUdPHTuG1ZbqtjbwcqFYFuRxzVrv
-eGuiN9Ls9XzaAJ/TDaJDl8ZCJKSsLFBXtzTW1DS2NDLzIqY1chyL/AsR+MNO0B5nvdXYyFW02tqT
-bce6UCIWZmOUUZXpHZQZzlWHwOwDGOlkh6NL8p6BiBUuPhzk90D0QnRUGQ9gOI2F5EOF9VxRa+IS
-OxXM6lKZMutkWRUUS/4fA1PD0KWM8AQVOQgTrfLKhpYOBC9nc3sr41UzgkhHJ/ZDYKqDNSfdPstX
-ELa01HHFgXKoouglGGjGOqwchfkFFSDfIm6hyogOCo/OPpAdGI3aer53IgqtggPsmBMTM4IwnS7F
-eLqsOq8ea66yiQB7AriCbZvXScWhfzwUefNzYDSs5gCYadVKYj3ScBgTDck6qBObsa50BD6KvrQV
-Y/fWjm4kijN9Pe1waDxHo0dygsoBDLW0dfV0dZXUVuTt2pWzMf6BjblrHgiK37oOPaD3jLDAMD+s
-tMyY4cUF4vnhmeHeSNBBfuiLE2UOUIQxAMbx1QhaLWyVWE7DjhgdrVCtaVWtpZFv8fiJTsMDn6j9
-IpcdHccZqY53qIqCi7Oou1rhq7RnxOo6zicbW7vbW1FdYtpViTPQ8cG586JuNo4NtQ2tnW1N1Sfa
-urCZ41jO0VMnUE8fpZdCjUcLDmQm+mEakIiKOjwlDmVWRiJWWw5A5xkFR6uqCg+htsT60smuti5c
-lsp9Irw8VXVK58wUUpBvHJ71iZCNHJ988ol6+An31elWGFuSCCzLCRhPQl2HOd1CvSxTLA5fm7vP
-nDvdA4eCatEZ9Z67fPk8MNkPH5fFtfb2zlY0hw2NFXlNx4oOoc9Dy1dfWliVlYG5c1VGxjr4rd/8
-+UFB4YlxKSkYY94b5IcJfWLYuuyjD+RWYa6VtZUrakVFXawtsf7IzqG3DzNRrrLQg3Ve4liOg5ub
-+bHaujKggF24AwhayqR///u+07/FF6C2IzU1QNNQXEc348Ppc93tHTKglAUewPKfOI2BooyykD46
-O3tP98K1EVt7O/n10FhFy6nP2bpxzZO5pRvj4/28sRgcl3kgPHAammJYtN+9C6PXPRC0Dhtbskur
-CgsKc+M3rvPfWl3GNguJjVdX45/FyLLn9Lm+08hOvb2duntQW1OuK1qj584x20ratbcMGHWoBgLA
-3NWA2TQmAMc/6D59+fNP+ro5iaxsroPBtiN6ocJg4cMeoQcvtXPixPKjt7uTQbsTKseqbm15UZls
-z6kqLD1ayE0rGZnZLDe8vcPC0TeEYT0cX0UblFG1zm8NBnhYKsXSUn3p0SfXVWMDU9uv2Pw3YebR
-2NIBUEyizkDN3DN2GqD8uTGwdSZU1ewSs2FJ2/VlpCUskmE4d7y5/bfHj2OUwdXB9uMtdZxtIAbz
-fxMj87ojSNOoTBpaYdPIT8RE8GpEAEfp0Vhbi+lO4dasjHVPFqIjrjq6EfknLIz9Aia1GFweQGSm
-X586dQJbmDKeXL2xsOvUicKsevjwoYqyWpSnCNMnu3p6z+FiYpiT3qZl7cm6oYJdmtfAFrUycWDr
-owNroJRmbGY4/lt4DBMtFhMrVV6WhXAsEhKb29PwEh/ze9rg7vDs1vaWRn5xGTp/TC/wZfeFOVuf
-zCgogIYT41BrcVdLeFjmAdRahD31hxOn/sCyoxQ3Z9EonTpxFlvz+nE5+fnzfX3959VOQJgyj4AV
-xULLN+oVJEThRgQmrdoEE6tce9LUxjRMmlFiHT/+2+4OKBhaRG2NZ9phqVK/m40lzawyjrd3QK88
-F2yccC5au1FXckbRWvtPtSfq608A4Gw9Q1ZiPDbxhGdCsVVV2PtwICUxAyXWiaNHS0txm0XgU8cK
-j57IOtbVBc4z0GpfD2osJEOsKfUwbsj+PMaPG+IyNkk81sAAvSzx2E2x1hOYWiKnVh58FU58EBrs
-wLqv9BJ4jKKjo7sJpwHoHcdBzgl5N4NWS3MjsxjG5p3dSCZ9uOq/p7/2GMZTVbXVhaVVpVhZCEvJ
-zYyePyOc/W/4/Bl+M+7l/8Zkzeo1G0u3bl1TuAurDuv8MwrLuo4dehtdP054SwsiFoIDNHumD0dx
-YfQQwuuZd2ERIub5TzQS9hpyGyx3+3LTL/Z/q4swzOv/D3mjupvCJFLWAAAAAElFTkSuQmCC'/>
-<saf:endOfStream ref='Stream1'/>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<image xlink:href='stream:Stream1' height='150' width='120' x='10' y='10'>
-<animate values='none;xMidYMid' attributeName='preserveAspectRatio' dur='3' lsr:enabled='true'/>
-</image>
-<rect fill='rgb(0,255,255)' fill-opacity='0.19604492' stroke='rgb(255,0,0)' stroke-opacity='0.49780273' height='150' rx='5' ry='5' width='120' x='10' y='10'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_shaperendering.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_shaperendering2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-linecap.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-linecap2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-linejoin.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-linejoin2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-width.xml Deleted

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" stroke-width="10">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" stroke-width="1" x="10" y="10" width="50" height="50">
-            <animate attributeName="stroke-width" dur="5" calcMode="discrete" values="5;inherit;1"/>
-         </rect>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_stroke-width2.xml Deleted

@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' stroke-width='10' height='100%' viewBox='0 0 176 208' width='176'>
-<rect id='my_rect' fill='rgb(255,0,0)' stroke='rgb(128,20,98)' stroke-width='1' height='50' width='50' x='10' y='10'>
-<animate calcMode='discrete' values='5;inherit;1' attributeName='stroke-width' dur='5' lsr:enabled='true'/>
-</rect>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_text-anchor.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_text-anchor2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_vector-effect.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_vector-effect2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_viewBox.xml Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="svg_root" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-           width="100%" height="100%" viewBox="0 0 320 500">
-      
-       <animate begin="1" dur="3" repeatCount="1" fill="freeze" calcMode="linear" attributeName="viewBox" to="0 0 50 50"/>
-         
-       <g id="root_group" fill="#2288AA" stroke="#AA8822" color="#999999">
-          <polyline id="my_polyline" stroke-dasharray="4 2.5 0" stroke-width="5" points="10 120 130 120 70 20"/>
-       </g>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_viewBox2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='svg_root' height='100%' viewBox='0 0 320 500' width='100%'>
-<animate calcMode='linear' attributeName='viewBox' begin='1.0009766' dur='3' lsr:enabled='true' fill='freeze' repeatCount='1' to='0 0 50 50'/>
-<g id='root_group' color='rgb(153,153,153)' fill='rgb(34,136,170)' stroke='rgb(170,136,34)'>
-<polyline id='my_polyline' stroke-dasharray='4 2.5 0' stroke-width='5' points='10 120 130 120 70 20'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_visibility.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                    />
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg fill="black" width="176" height="208" viewBox="0 0 176 208" zoomAndPan="disable">
-         
-         <g transform="translate(10,50)">
-            <line x1="0" y1="20" x2="100" y2="20" stroke="black"/>
-            <text id="text" stroke="red" y="20" x="78" font-size="8" text-anchor="middle">A<tspan id="tspan1" font-size="12" stroke="blue"> simple <tspan id="tspan2" font-size="20" stroke="green">text</tspan></tspan>.</text>
-            <animate id="my_animation1" xlink:href="#tspan2" begin="1" dur="5" attributeName="visibility" values="hidden;inherit;hidden;visible;hidden"/>
-         </g>
-      
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_visibility2.xml Deleted

@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg fill='rgb(0,0,0)' height='208' viewBox='0 0 176 208' width='176' zoomAndPan='disable'>
-<g lsr:translation='10 50'>
-<line stroke='rgb(0,0,0)' x1='0' x2='100' y1='20' y2='20'/>
-<text id='t1' font-size='8' stroke='rgb(255,0,0)' text-anchor='middle' x='78' y='20'>A<tspan id='t2' font-size='12' stroke='rgb(0,0,255)'> simple <tspan id='t3' font-size='20' stroke='rgb(0,128,0)'>text</tspan></tspan>.</text>
-<animate id='a4' values='hidden;inherit;hidden;visible;hidden' attributeName='visibility' begin='1.0009766' dur='5' lsr:enabled='true' xlink:href='#3'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_xy.xml Deleted

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" x="10" y="10" width="50" height="50">
-            <animate id="my_anim_on_x"
-                     attributeName="x"
-                     from="10.25" to="100.75" 
-                     begin="1.5;10" dur="3" end="5.5"
-                     repeatCount="2.5" repeatDur="20.25"
-                     fill="freeze"/>
-            <animate id="my_anim_on_y"
-                     attributeName="y"
-                     from="10.25" to="100.75" 
-                     begin="1.5;10" dur="3" end="5.5"
-                     repeatCount="2.5" repeatDur="20.25"
-                     fill="freeze"/>
-         </rect>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_animate_xy2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<rect id='my_rect' fill='rgb(255,0,0)' stroke='rgb(128,20,98)' height='50' width='50' x='10' y='10'>
-<animate id='my_anim_on_x' from='10.25' attributeName='x' begin='1.5009766;10.000977' dur='3' lsr:enabled='true' end='5.5009766' fill='freeze' repeatCount='2.5' repeatDur='20.25' to='100.75'/>
-<animate id='my_anim_on_y' from='10.25' attributeName='y' begin='1.5009766;10.000977' dur='3' lsr:enabled='true' end='5.5009766' fill='freeze' repeatCount='2.5' repeatDur='20.25' to='100.75'/>
-</rect>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_anyXML_replace.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_circle_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_circle_parsing2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_defs_parsing.xml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-			<g>
-
-				   <use xlink:href="#my_ellipse" x="60" y="60" lsr:scale="0.5 1" stroke="red" stroke-width="2" overflow="visible"/>
-				   <g stroke="blue">
-							<defs>    
-				     			<ellipse id="my_ellipse" cx="40" cy="20" rx="20" ry="10" fill="none" />
-							</defs>
-				   </g>
-
-			</g>
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_defs_parsing2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_desc_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_desc_parsing2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_ellipse_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_ellipse_parsing2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_foreignObject_parsing.xml Deleted

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-
-				   <foreignObject id="foreign_object" requiredExtensions="http://www.stz.com/SVGExtensions/EmbeddedXHTML"
-                              xlink:href="#rect"
-				                  stroke-width="5" fill="aqua" font-size="14" text-anchor="start" x="100" y="10" width="100" height="50">
-								Children are yet encoded by the encoder
-				   </foreignObject>
-					 <defs>
-         				<rect id="rect" fill="purple" stroke="none" x="0" y="-10" width="50" height="100"/>
-					 </defs>
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_g_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_g_parsing2.xml Deleted

@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' height='100%' viewBox='0 0 176 208' width='176'>
-<lsr:selector font-family='courier' scale='0.33203125 0.5' choice='2'>
-<rect height='30' width='30' x='400' y='10'/>
-<rect height='30' width='30' x='400' y='50'/>
-<rect height='60' width='90' x='400' y='90'/>
-<rect height='30' width='30' x='400' y='130'/>
-<rect height='30' width='30' x='400' y='170'/>
-</lsr:selector>
-<lsr:rectClip translation='88 102' size='48.117188 35.203125'>
-<rect lsr:translation='-20 -20' height='40' width='40' x='0' y='0'/>
-<rect lsr:translation='-20 -20' height='40' width='40' x='40' y='0'/>
-<rect lsr:translation='-20 -20' height='40' width='40' x='0' y='40'/>
-<rect lsr:translation='-20 -20' height='40' width='40' x='40' y='40'/>
-</lsr:rectClip>
-<lsr:rowLayout delta='5.25 20.328125'>
-<rect height='30' width='30' x='20' y='10'/>
-<rect height='30' width='30' x='20' y='10'/>
-<rect height='30' width='30' x='20' y='10'/>
-<rect height='30' width='30' x='20' y='10'/>
-<rect height='30' width='30' x='20' y='10'/>
-</lsr:rowLayout>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_image_parsing.xml Deleted

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:imageHeader streamID="N1005A" objectTypeIndication="109"/>
-			
-					
-<saf:imageUnit ref="N1005A" source="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAACWCAMAAADXJvXnAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRF///////3///v9//+//bv/Pjm9Pfv7/fm9u/e+O/U7+7m5u/e5uzm8+XT4uXe4t7R7dq+1NjQ5smn0s+9z87IxcrH0cOtx8W9vcbFvcO9tcW9vsC12riPwr6rtb29w7SjtbWwya6LrbWlrbKwta+graylpK2pxqR7wKSIraicpaSfpKWUsZ+Ku51znKWcmqOltZt7pZyUnJycn52MnJyUkpyclJyUsZNznJSUjJyUnZSMsJBplJSUlJSMjZScnJB/jJSUi5SMhJSUo4xpjIyNm4lzjIyEgoyUpYRfhIyMiIx7goyEe4yMmINrhISMhISEiYRzmH9ehIN7e4SMe4SEmnxSe4R7c4SMc4SEc4R7h3xme3uEfntze3t7c3uEc3t7cntza3uEc3tra3t7fnNmc3N7c3NzgnBac3Nrim1La3N7a3Nza3NrY3N7Y3Nzc2trY3Nra2tzcmtaa2trbWtje2dMY2tzY2trYWtiWmtzWmtrb2RSbGNecWNJY2NrY2NjWmNrY2FaWmNjWmNaUmNrUmNhbllCZlpMWlpjWlpacVQzWlpQUlpjUlpaUlpSSlpjUlpKSlpaXlNCSlpSWlJNUlJaUlJSSlJjUlJKSlJaUVJCSlJSSlJKQlJaXUsyQlJSUEpSUkpKQlJKUkpCSkpKSkpCQkpSQkpKTUc6QkpCOkpSQko6OkpKSkJCOkpCQkJKQkJCQkI6OkJKTT4oOkJCOkI6Qj8xMUJKOkIxMUJCQjo6MUI6OjpCOjo6PTopOjoxMTpCMTo6MToxKTpCKTo6KToxOjExMTE6MTExMjEpKTE6KTExKTEpITExLiwhITEpKSkpMicUISkxISkpISkhISkZGSkpISkQGSkhISEhISEZISEQGSEhGSEZGSEQECEhGSEIECEZIRkQGRkhIRkIGRkZGRkQGRkIEBkZEBkQEBkICBkZGRAZEBkAGRAQGRAIEBAZEBAQEBAICBAQDRAACBAIEAgJEAgACAgQCAgICAgAAAgIAAgACAAAAAAIAAAAoYb3nAAAAAlwSFlzAAALEQAACxEBf2RfkQAAPyZJREFUeF61nQ1clWWe949OWVmKr5mpoyjKi2FICJNASiDhGhEETGsyOpuBjO7shJJORIZMkBLMDjJ8SM7SjkDA1DiwgjuzDhJ8djYYyDCpHfFln3wGlD77mR5obQZrH5/f739d133uc8CX3e35K+c+b9j53v/3/3XdJ8fjjz/11FOPU3B0k6e/853vPCuy+TvJTyXjTevXr8fP448nJ+O1zc9+b/v2733vr78HUW/ju/noBvLXlO9TXvCQH9pEvWR/5pVXzKMXtbieUa+of9T+O+r+K1p+pOR1hxtocnKyjVmINxP4aT5NXpHHnwLx0yQGqov3FoBdvJ7AN+bFx74Z8AsvjMvrDvz66woYnJY8/fTThpnAm7+zeTMUnPy4UrACxu8AebOcC61caFfZwy2p18L94Q9dujR6HaNfoyS3449eedFDne42oV588UX1S6JcEQc/vyGG2kQALdTyUAFrsxfbF/unWeOlzeo3RMbhFZXaBXpwmbOnAQq8NnU3e7ShatPEwVL6WDvWz8D6Da3g/hjiePTRx8RGITRTC0CAIfLU02Lq2gqUAcj79QmyeD3US2+1aMXJbkArH9IAu/uf9aldtLx3Y2JNK8q1cAH88FoSw2JJALpntLqIQ+Fj8MKmbXYPXnOOHtfUz2hrNjaNI3hfeGG75pQjtGes2RgkjwRyPVbx6kXjfRpSfXBQuo7yO/Z/R4xY2/IPtTHz/WLLVO+ Pf/ITx1oCG7e0aVhZ9lPkFlIDrB65XN5Y/ljvFV4xYQ/d2iLwixYXmN1M0z24ulSrPBFCeNBZUdvNpe2+a1OvG7B2S5tPgtilVuPpHsA0dTFsAsN8bUb916LMm/AaPQifndgVbJSKDLI7sMEloI3YzZz526JereFHjX7FpscIFcw8DbvH6yptmaytHV/jgpVK/b5A031dmXZM3lURlGIPvZ7A7noV7h8DXT4+T4Hrd133bf+kzrw2XtHwo7RnlY2vR+wCFvvWaUuZtY7PClIQxye21xkmZXgCWyp2U69JKMoTjTu6AdO8LXGPbOb9P/nJGyIOCVn2XDNWx3BgFlhSbrhbtI7Tyn81r0FmRWVRjpeK7Ap2+8Qe7msZ8VhgW9pxx3QpV8xBwf4dxQKWgkKVUK6s+qxkYdRZJvU+jZRsq1GstxrgH76olCyP7cQWuq4HVLhxR3MvLFy1go1YbNll0vgHxgPVNYbxXMEVWgHWClbASDcqBpky+lkQewDrfCXa1Xlbq9ilUPqxBbx7926XQRvvtaqgsZ/YozaycoqKOzoCGZO+PrAJUy7tCvDax7QLa0cGtCgZeVU1DrrQekryEuK25lWmoPM2gGnVVp5FvfGs5sVzAN69+wdyu3u3xFJasyn7rptnlWJfM4A6zioTVUHLIy+7HtvOkVGvUbE2aQYse9tg65TEpunGilhVWCICbFKSjtE6Eb3wgitMa1J9cEXisQ7oyrBWoDL5RFIKOI3aqGo35drSs6vOwO+465capk3rstEgEwqatTSsga3awwZs41WVFRMvVe0KU+7Arg5OgK0P7RaarAd23jfeuBVg86tuBm15MIBXPbyWEZjas/FKhpXGATaNmgsmzteTTeHpHsqlUfze97ZbUfn7z28Xr939wu4X6cA2ZimzbAHaFk/HZbaQla5+8oYKWzRqUzSO83saV2UiF+5bb73lWLbswVVrUV9K48eiQhdX0jZooe2SWGfdMYmLb3MBb99OWjdGD2B7ySHA46vXVAywZZLycxP55sDG8D15/47A98395hIwr1r1CLChbGqb+hYHVRqGit3aQA1smkN1VqBgrWECuwi/b0dX8VoUbJtE3ECz4NMFgwImMnT74x8rRV9Xt67ka9Mved9yTJ0+fdZsMC97kNTAVqqWIGypWN0R63aJ7VWaNDjtYwxFzW7J3Yd3i0W7Uu51P7NWjzFJA/x34sm0bEVs83K3u27Jl2eKtAS+Z/Lke6ZOnz2XyDTvVWsfg6YfEy0/o11WZygONSjCbT8ZhKXQbZ8n3/Pbn9u+/XkKnvUARmYyuPsgr44hhgWLEbv5H00aKn7zTehYvWoL2h7Q1m+bYsPACvDdinjW/SBeAuMOXfUIZO1jT6xf/4QYty5CGLNx9+lndF3yjCZOU9a8PV0Dkw+8m9O3Ax3A6dq+TR7GUYBxQ959yLMm377+enFx8WuvK15PYgP8Bv0Y7PI63liszs9PjKqLLRdQuHQEgr5pNDxVZDp1vGTRoiUPUpRDPyby1LdB+N3vfvfZZ7/7XRkFmDGQTcdCrBT8wu6dvJuejhOwU+5CDKwuPbSGieumXuAWF+MZu4JVjH2TmqWoO5Zf2sze466lXM37c80LH9YyffY3IVDxg/RmallBP/XUt6HY737nWeB+5+lvWz2kPYpT2ZqXwOlbQLt5i4DLrTuysWhPYOElsBsxlA1OaIikb775liYnOs17fLHjin5/7gK+Z+pUL6XkWbNnz77vvmXLlgUjeDFkS/x67DEkKtEqWyXUnXBt8D2DlGy58XPPPbf5edovzBhqTU9/7jmoWLRsxHJku//ue+01WrGbuHmwNtc3AEdkHuTWJSpwKzvwLKpckUqQIRK0jIph1gzY9933zWWrIh5RxDGEVj2Ufa4zDvBzKkA9v5N2rGjdkK8DLG47BthSmw1YM9IbxxAbhboVGTouC6gROzA17eVF6NlLgtdGRKyKiIgwWtaVmMVM1SYnpyoNp6Vtpj61Kkm8wwasn9+5k8R79+7dbdcwApaC1WDu8VlHJYZkMWClYar J0jefcDPfMXHZjZcPHPdQLC1PnQ7bvm9JwIrg4NDQUCJHRcXQsjckJCdsWI8/GzaAO3VzqgZOgwgwkfmzY1xiC/jll4XYBGgL9zrOKAlIRVsdZoXXEEskkpctbhOcxpDqJxx33z158uS7LWL6Myx77qJlASsUNbAjomJi1kZJRbJh/foErWmyKgEx8pCmJrG7Ue+Q06BU/PLLLwusZKTX9isFA6pyfMELWrWVb771zjt1LosWPde9844KYgZTBSi7/IMl6lkLGMyi6btxwJ3p989bBFmydNESyrJliwJWgD0q5glqODktDY6dloZ7m595BqkYlq2JUXFIWtJhK/257Tt27ADwDhLDppVy9+3D8TUSk5m8BzWxOr755sE338TRDgw64JgTIGo2wFaehcFr2rc06Dv6+Gt9dEy9G6IUrKz7btygFJEYBl2rA1173pKlSwNWIIzBvJPJKoKe4hnRsgY2wcoVtgArhg5iAFv6FRVrHXto2DgsiYVLrBgK9ojSBFa6pWfb9Gq0+o9jBXnYAlbMsHD+TJrMu/dMxV2Re6bOmjMXWpfqE9BklQZK9J2GVGUPVemuwEUN7xDgneB1J96/Xxm1m027gjCBoVFiAVXd2oL0WzgTdUw14xvxOLR4ioWHaPhuL6+7J8Oh7yDsxEl3TKJMnDhpwqRJEybgZjIS9X1z585ldQILXxYcEbM+JmZ9wvonNDK1TOZt27alb9PwW7ZsUc9A/uZvdu3a9ZIgKzXnA9cQK7OmKHZCq8fGO60w/eYbPAvqadHwz3/+Duz2Hd5Ymv21lnff9bynKy1ELrBOAit+5GbSbRMnTbptwoTbJntBy5MmSYcB2vvvv58lGfurgIDg4AiU3Ci7ExISqGebkkkKXkG2EYuSKXl5ilfr2FKyC1gxjwG2x6df/vIfNK8LFvf+UVG+O0bwpMNrqoRpiNwC7Y47Jt0BfOqWyp08fdas6VNh4iSeOxfAhhkxbVkwqhPKeig7ScVskG7SooiVnsEtdr1798vKsvO1ig0yM5COXGCtq1Mh2c7neR+81KxNtaQF7lhU6xnHdCYipWDxVfDK8W7CTpg4aSJteZbX5AlKxwQWDYuA+MHgVcjWSFsxMbEJhjktzSBvsiOjnQDwTsYuInsAo/wwyAxUWq4PTFzIGEu+AS1egoZRXlGBQqsOFDrxxAmT7sC5QMCeapyYJm0jVsgRqMwiIqHnWDCDWsmTTz5p1zQSFXtkYdZm7dKyRz6Gd95A5FU3G252t+F2kX8eR9rbHbOmIgUhHsOQKXK8AzcT7pg89W6Y9tSpk+/xmu51D/IT9Kuc2E58P7w5GMUJ/oaEkprMwE0AL8XoOi1N2bXEawCLXUOKtRvvL/6p6Jd5mESHNTGOtNp3zON3fvnLujoo1ygWR8H9R7Hj9vZfK9Tftf9OyXvux392zJmO3HvPVC9oF1Z7D4jFg3F7N9ooKa6BOgtmjV5KRWlPoZIhK1CQhkbQoWNF1qxZB9HcSaJsCdkA3mXFrr0mcv20uLj8p9qFDRyZPV3UTbN80Cy8YsdEFdobiGM2WyRW0PyZi3t333P31OleXozZ0jMCcvZs4rJ5NEGLShZV37+ErrwM8TogYGlAQAhtO5LEa0SIbEELMxMU8pOFLMAlxcU//Wl5uSkv7easmJqbx4DqJzx4f+fG2+0mchocS755HxKrrh8DHlyxbPGSRfPmzp0za/o9d+AMsLLEsGvJN+feBzVPnz3bBGkVrbV1owhdSoGOvxUC+dbq1WvW8GdNkOaOF+yNW7cKsjCLlvORnYpAXC6iiGss4MZGsrqJ5reeM+pVXvu73xnE9z3EPO8IXsKUyqEl7HLVKjQLK1bw8ZK5UPksFFZ4ftUqIC+C+vEU1Hyf0q0NmFqWypupOXglxH/lQw+IBAWFhYVpTcfHx6s4tlWQJRsrYMWrgGvswGOIlb5dItZsohQ0eFPgVctkrqNntGwH1z7MHin4wSX3zZ67bNXDMv5YtSoYzHORkGHms0lMR1Yahs2LzJvHfiMgYGUIeP39Aeu30NvPz4/ QEFKT+MmNGzdt3bp1m9g1gPP2FxUVGeC/B64BbmhohIxRsX7iXXV04Yp+bx1YzaQteRicIFyCVQk13Fq7NmJV8Ipl37xP+bWKWwJseOEGc+bMnbNokQ9o/X0oC5WA+oEgYIdZHg3TFuKXNHCZAv570ireBoV7A+B3gaxDlU5BLtrubk+Lft8y6UcedC08PKoWXB4lH88A9a52+axfD2KkWyDPhU0jeCnc++934wXyrJlz5ixYcO+9+EuZCbn33oU+VLTYtwQyaHnr1qxdWS+RGBouK6tw8SqL9uRtbbXr2lVc2FKuFaHG0OIJC/hhYAkY9Eg0FMaC/MSjax+B0h95WPGufwLF1NqI4BWLGL+sEtPwzplzH6L4HPydRURE+alTRO686847p0yZNhMnALqGpgNJHM/wtTUrK+ulvL1i0mXlCFuiYKdW8WGN3KCN+ojmxVFoYcty77iKVt2dmqhTK9fo2PPoeARY2oMfATEEg8rHHnt0/WMgxkl4BM8RGAOemLWrggOWLLIZMZVNfQN2lhbyenlNmXK7yMSJEyfcBiG11zRwL6Sq18CZRccgho4Rtspo1BXapJVha9Ouc7fqVqXb9nbygvjXErAArGU85bo95yATNckfjKFlDxP2sDxGeCiapwDPJSeDOSYiOADhW4ipZNziADM2uKxRMAn08rrz9okGmBW5VOWU2++cAvuGooFM4q3ixgIM5Iqf/exnBtYGbSNuNbzvtpug9WsprX5niN93abQb98f+cax6RP2RwAS8x9WCgz4AGrxcQaUbM1RzQQbIWrew4TlQ6azpuiSjbqdMYaulMSdMcFAM9oQJYPaaudAvTOn4b5ibAEw3LiurhlQ4nU4o21lZKWnKWakKZ8uBqV78gU2LhnVKes9SsdH0h+9/aPmtvfyASSt5VAR7mDQw9SzaxaIxW3w6No2fwKiuoF3WXqJbUesUUa3XlLvgtKjEJ3zjG98QSgfu2AWqvv2uaTMWBgH5yU0gRm4ywGVlpRWMXiIlJaxGkJcZwlzEVutHYGXQ7e3vWenXYvvwww/d6yz9CLtpXQLFCiU1rPeqWVtoGadV5JayZIkBhkXP1IbsNeVO8dqJ4BRGUa4nMK379inToGQEL3Hkl/IKIdAyg9d+gJoOmT2UAq6rMyo2wIpXAY/hBe11eLsdik+J8l/NKxsguJakREI3c3LoKjYKDzJYMzuh1piHOlS8d8qdpAWvxhwH2CF6p5Lv9QtSnpyRlZWTw4RszUA4GjDLETLFRDeho/S7KkZLyHIVHWiJ7Oq8Pm53NzaIK7G245ldecLrAmYgoy2sRym2FtSoP2V8yxIaxPBiiVYMyeK3Wr+eGtYOPXEiiKHk6Ojo+MSNGRmAhm1jGPLy3rz8/DwbMHWsymsdvFzApqQULbvZ73X1C2B1gQc3TNtJudeDvN9+mvuoKeYqD8nTgA5FJcaS1D8AshT9BrQ8a+b0qYhPKkzJLY7apLVp8/lvSAyjkr0hqLWp6G2orzEg2L5DBl6qg6JQ1XDlGraMTMlHtIqP6HgleZhmbeVhdUfl5Q8Ru5SYPO2wbJZ7kdw2axFXFtHkFWubJdYepPCiQwc/iNWJ4JAQNIdgRik9b87UySDW0OP5sPZqvAXxetq0aTPmezMzr5H5iAwIELihYmPScqek0umEkhvEka0qS6Oqg7tRa3oNazdxh2sjodzDgihAv81ba/eZLJXqXZc8PxsMszQVEDTBREavBG4gm6Q0XpT+hhXFmJoZsJGYfR54aM2aWCCzdZSmQs9BXtsn3lxSLsSq6jLAdt73PLz4JsBc+tXb0HhXNnLYca2NLLbdtK6qm1W2CBUdEOC/dB7GJwxdSjyitOshzB0Of7sXa07/h9Y8tHoNamzpl0msJvavcgIEXhg1ak7omNH6N7/5jZtyYc8U1Srp6GUPYh9+ePr0aauW1iv5uArJXJAzZhuW3smitvDISqmI0rMMaTmqJTaQQ0KWL5030+tOZCjKpOsDS1iDZU9BseI1DY2GXxCdGb2jah1lliuaVglZEYuSxyC/9x6 hiSyqxijLFsQkhBlih95hKLS8xAzbObi5QfZ1cGuHwTf7EGVNWF33oYKZajcUOwc8IPb3mQPiO6eAeuJNgFURNvG22++CcUsAoy8rZjPKlQoExRfKTWkaBbkV4qFnpWiZ2r1nB1bhize/w9TS2pL07Pfk8gR1YR03sVi7adUmLZforQ6yI9Go+wnOZ6luAIN4wXTQTmFN7QlsLF0HcVWOofK+k+7s7cf2UZCVL7PuRClCXgLXuoYCBB5DLEWI0rBtFkDS97rl7LzbbANWl2PoCzWsi65soOrSO/fzsNnaDJGAfmp9TFQUhnghy30WoApBh3T7GB8WdYogYTN7qc6CT0yZsdAvCEMwNsxKyRKv1cQLNTaBXUOB34yrZB2tQa3HH8L/nrCKOHDBpDJmXliEPbA88OIq0vEoN/qxXGe4fbubdZvtH09xhwBU/HDEWih5pf8Cr9tJNtEEZZOHHbfdfuedd9015S70yjgdAJ54m5SjAEYt4r0SKYpaTmMrRRVr4hJt0samUXkJcbMup00+VoNoGDYhIer5d5vf0ZNBB7VqLqayb/o1V4Fal+EobrPpDmfJbOJxhW7mq7WPIEcBeOHMKbDnMc2D47bJaKcEeNo0IKNjhCFIhMMRkwI0j8zLMGsz9gIxjVrZNOLWL63BD4l/owsQ1SW7iy5Bm7FMVfmGJPbX9zncr6Ry7XI292xXWVH3cn4obsQ6gImOkaVCvrXS32cBQjWrTHseguNOuhNB+S4Kqg6gosuazpGBtmpUIuiY0S8bYhlsFmk3VmOBBgtZA6uBgCeysmEotrKyuHjfK9j4yc/twMZW2dStb+xX26idddjzLH/cLjL7/vct3zaK/ktTk8TEREVycLlwzqw7TcxiPSnl5gQMPyjQ8bSZM6exq7x3AcZeM6FsaBvpicCYECjgl17Sk030zHRkGRBgwGdGfPahpqVhaZbbDW5NZXnxvu1bsGUhjZvlCPxDBSyXBZqLO9U2bjySvc2yy0qdC6NxezDT5o2dPcnw5A0bYhGrQQwlT7ndUrAkIKznsNiAeGG2p2Z8C3wWLFx4L1sPTL4W4kkUImLUEqllzsfCi7Pcip9VmFFILSK2hDCPObVuI/EsFmnq3qRy9+5MT16Pj0benQ7u8ySy0JDRuhRV9hdxn6Awq23POGpic9GdtdduC7dsJadCkhJiEalXPwTkmV66b9LZCJEZoYzeCjgl9y7kVHcBRp0LfTDh9fGW0a7P6jVSaGJAYAM20doaBNVaixSmXz7yzjtHjiBCYYn58GEYM3C3b05NiMGCPTa87tjpePXVV/cRSfNaF/O5XURkqOUKPw/bNk69fTuQwUzi2NjI1atX06xnqbxjCc3WC2rlLJey0AdzbFQqiwhL4TSXZ8B/5epYrMBh8U2MWmlYhAmKOcoa9An0kSOKXY6HoVgt2Au5I31LWip23cjyJYC5h0hbrfulgNhZ5MI2u9jlnTZPxwU6P8DfH8hOUtm/pFUcuRqfe+FMdhLYKYJUi+wDY/aaKaA+GNiL4E3C67885CGu0TzEW/z4Y7EmMpLMUlrTqF3AmHsZ4BqP1RnQOitLivP37MHn3LNvH4B3Yt/UNrX/AsAvisWq64rAu8/sdcVdkRf1VX2u59XJse1/FmPH7jMgAxhnk0YdEwmL9lk4Z/ZUJCfJsyw2vbxmLfDhsoQ/miv/paANWI4Wa968pSEhqyP5B87/0OrVcAnc4hCbIGpmCaLiVgk1TFHEzoNq2MdKWwa7h/ESgbk7jIhYnd2xA0d8rrQtW3bscNj2q5PXLrJZfZ/7pV/YUGbMgSdIW4b8I3pXKf5hAscC2N9n4YJ5Mzn30WmWGWge12KWA1OWWLHCSuA5i4NDIkVQmZIzUq0xx8b+BRbX0+DN7lWms0JP+zAmUPtizFKr04mZWH7+Hu6V2gL32oJAsCU1KSk1NW3Tlm0AVqlHBSQ34FfVxk+1hVtfePKjH8EBtEkoXhXAlXA/OLbuKA3HovigKhciVEvrxEgF78VYZN7i5cvRVX1L2uhgtliL5i4NDkUdziY zNCQUtEBXwLJ7InVTOucCbJ3MUJNjTT7O11ug2DWzBC0pgTWDFWw7QJqKjQdb0pKwKQHA3E7kkKtOGHoBIFu2X9MbIXHXBfwq8bH39fVXX5R3gVq9Hz90Fm7O2bkTG4jTgUwVJ+ETr1wOVfr4YJVppteU29XKi+zYnbPIPyQkEr0V/mKfRMTSgLnBIVGI7dgzwc0TSOQxCQkhoI0U3rSktC3bdu3chq0Ssnyupri4p7tm1UWW42Tsc5bs4RlPS0iFM8SmbtnAICqRFNtr0nEOHNYXceCiFNGT2gdZvFt4cUfLqwJczKAuOt7HH9wDMIkFmirmxqVUtk4wTsQt5tgFkm6lwpjidYcXBn6z4LPUJrqrhEgwRy4NjaJ6o2JiN2xQWyZCYiITaOWiY+oHeyX27t2JFXRIfn5+DfgammrL92PiRauuxJ/98N79W/B2sEamJmzYlBSVlBSbgKyRsGXTtj27duzaX4N+WEqkZDSA5goFHImtSF999bVXX8ef4p+oh8WM6hhF2J2dvbog45oObiqlCfGzom1CBKZZS0GxAObtNX3O4sXz5iwKCA6JiFH9ZExwZGRobKzijNmAQ0RkVGRSbGjI0sjIgBVAToAP682MO9PTAV3irOns7KH0VrSeGervrCmv2VtTs7/Gmb8zNQEOBWuJhesnJWyKiNyUl7dtW15bW2dXV8/AVWuIR2DdD8heaOaZHyCs5+e79lMxOoiK98kND7ABJUrHzz+fnr45LQEuDK3Erl6+fPVyn4U+/iDWMm/OvEWLMctejJjFgUFMaGjMiijaN0BjoOGkDUmpsbEbImNDI6MCIpPwuf8iNmnbttQ0bP/ZC6veuXe/s6XzzMDA8OjIwJmB4aHh0SvDAwMDrfvLa5zl+fm0h9hNeUW1m9J3xW5raapo7B0ZHRwYHuhp6+0fGBhxcKu30rAoeEt6WsJ6TJ4jokKx/yomKiI5ldUTEnfa5u079+7bzzmTXb0KXfZrvEyrfh4uLDu1EHdYf8CJlz+EG/8FC2SuCdalSxcvDQjlOAiUEVFRAA4NxjmKiopNYtGCsxUbEpVU0ZAOxcOiU/c6S9J3lTd29vW0NHZ09gJzFJTDw1dGR4a/Gh0eHMK9gZ7yvbWNO7fFbNm1Ka38zPBAU9/V/sFr5wcG8caR0dFrA70Do6PDw440DfxUqiJOT9sQhXVg7G7B+j/WFxYtxa5hiH9AcGRCWvrOdKidtv0KnFqil9Yw912R+AfPo9pKQx5O3SQFVwDmc9D0ym3bNq1evmkT8+/iRfMWLfUPJjFC8qbU0BVLQ0JxbiOjokJXpCWFhiRtS4qM2VTbUY549Zd/tauia7Cv6W+bWjv7ent6R0aujEKujAxfERkBD0FGrnbk9Q7lx24uamtp6MUbBnv7wApSvIg3jMAmKMqk0dZt0DrenLphfVREaPAKbrsCtdBCuFEHu5JwPUDyZlyMtYdVjLuQeCd8DE62d0fatoqmvE1QdFFpff2hsqKiY11tu/6q5WQeBrk8e4hojGoxIUm7kiJXhCQkIVpzvh1S+7dJsRVttYe2bcl3djQ0Nfyqq+ejodGhvuErQwNDw8NfXQEvQYdHr31FzGtXR4Zw+Groq6GuK9da8xu7hr/A84Oj10aGr10bBu2fcX6GB/48+n9HR/88es2B5kbmzBv0RRukXxsRGroKf3gFQPBKTp5RHPCDApqXBfBygOQ0dYGD2TWprJr5aX/z6f7e1p3OpoqKtpNdJykfnWxrw1LZtv1dfbuSYv+qoqmpqahoV1LSLlTGeQHBCXl7k1BQJUQm5LWdbNuU1HV1cHBocOj8V1dGhoaoRAAOXhn+fPRzmPGVEaVk3L16DZY9+tVXsGzqGU/jNFCfo/959eoXeAseKf3+Gayjfya6A6Mo8EZZEvowcGjUWAsOCMaAavXqb30LRQIG7UuobqRQqCcAroc9wzA5JHa1S5bo23bu31nb29vb01TU1NXXB9J+I3LP9bC//0xvT09f/+BgV2tX/+DAwODgQP+ZM/3nB5VAmRTAAQ8kgvmFWLO7XFU P9WHs6/LMF1/wLIg4UlPRv7p41+K7eWQlJZhrCkiULPdAzIJI1Iy6f/Hi5StgfXgVCWMTY/+uvQhV21DtVjR1nunv7T3T39fVB76Pzp61iM+KDJ4/399/HlEVfP39iCgj/YhBggjkQUYYu5D3iy+grFFzvA7SzZ7mP6GAsXAiE3VoTC0MyuUrSBCYrGPrZHAA6nukkBDUgiErA/x9lvs89NDykJAViLJ4/lvIdmnpFWeGzvSfgbb6B0YQGvjBB/HoQv+FCwpTsY4rgB3BbwwplYLPdhAFK14oyfrMN4O74evKhwkt4FS1mqqjVopB7ApY6oOYiu1m3G+GUhHZxWfxUv/FISsQYpYGRG7CaDGvaXAEeiMljRMfE3rEIzJeDxj6NDIE4MFh6BawitcSF+//CNL+y67Vww1q7UTdsDZkHYRad6X/Uh9uo1zOoQ3qxOU+8xYvmhuF6igkJKkM8air7wK12d9/4Wz/WXxyfHRojfh83mDhJZtohZJM3BXnyBNWe/DXpFiL2ZGmS8un1FIRFk6g5Jj1G55IhopjMIBEW0pbXoLaAX3AzFnoBnzmzQqJ2LQfsbbt5EcffQS0jy78K9wV9wkvBIbU46if1zEJ77MFJ2POYtQqXo0wC4lc72hIxoln4/4eVh5UNa2/8g67saJQxEeh10iIjYILoxGXLhXRCvOnmRg1+nMSsaul6e2mfzl58T+gwwv9TDyg7YcBw6pBAzceotXaLFf0ewl5BgIiHvAeIVc6pv8qSvNQFxlfmzlL0MI6AsYUf/l0snzH3+MwbMbsWBo1itsI1AerHwoB9UP+rP9nzlw408d/UcimPU21b3cNfnbp7NlLg4CFMQssoAfO958fglHzZxzR/jmiEg9OiJiyArVwLeLr6e2/fw4cHKujqMQiKCaZ65NT01DIspmMQhmbxiIoYHkIFCzE/n4L7+X4LeltRqjBwc8+u2SPShKg4MwIWKLBMbh0bo+8I9p143UFauG/Htot5d9xftmx/Qfbf7CZvFs2I0MlJ6cDOCIWPXkIerTI0BWYwaDOgKJlj7vPwpV5qBO0fHbp4kVRrV0EeAjAY3ntMVhMW5v3eMRG3187cCrGIOtTE5LX79iditQEQ+awgls20LcuXoHGJiQydlMJKc+ePVFaeOLSn0YuUQtDQ59+NnjRKixszIxT4wKPp2G3oGW3bH3/v2+84/+mY0NqctSG2PWxUTt2x6JXQHpF0bxoXshSdDRLN+TtaegavDoyMDg6fPVPf/rTZxcv/ulPg/0jV6+IJf5x8GK/h4b7z164oIHHqpg69zRp49M2D3bD/tqBQ4MjApLYqsUmBaNaTitaiZ3tS2PzUFv8RarzwkhZU//IFZYFKO4gV8+OXEWHoj4mgD0NWrItiA0XH/5Ri9i4ecE9RLm82NOlv3Zgf1yZsQMmjI4Nk4ilRZ2LZi2ak9TWFRy5bdeOkp5+lShHv8QfVAcoHK+O/JFP8HkCo1wWYV8gQUu5ruWuI8N//KM8gbfzF61SyiMoW8g6ht1qHvbMz5552fN1Bxx2T1MewlNkLHfgFDUtD4iNLEKj0z8ydP7CyNXBP0p//X+GP/+cHeW1/7z6xchVPGGZtNUd8A6qyUufXhJgV4QSYCVjDdq98rBKaX06rLrja1O0A/PBhpNNGLgl7d1VVJI3NHhx8OLISD9Lwwufjgzpj/hnCIihWbbXcjQ+7A58cfDTkU8Rpe05VYDRILEHRNp1KVmZr5wEPutRdKBvuLU0fOPW0ONUOdLS9zb2ojfFp5GyR38AW7ErHwjA8pvAVR9wdIQcUmug2tACBQ99qpINkRGqGZjRU0C0jkdGhj4V9QveZyil5Y7+d1127vE5r49+Fb0w/hi5nin8pxbHGRmJuUwNVSvmCmMFPTTlC+oardoX+LCDF5GV3HDPXmS1qLKr0hcshYHtInD5o/3bVUQqQv7D6h/lbI78t27CFqrcue7vWcAYEHFywr/6LI4F/gKKVecEH0QBI4IB2GbOVsNrqya+AMlFnJWLYL0E8IvwboRxEmmbt8yY/zI +ijkT+C9quXXyG7zT0OLoULqEewrvGNghzHzhsQCmhhUv3Fj0QoO25WGjQCQhyzOGYQUig5egaADjHJ1nRDNtghXbcA45xrF8/2sB1f8IeTHnEnGA8XNt0jZTVg3N5csINLB5IOOvGjwwemngz6hho1lXu8usCwuVE/nvAxf/oIj/QGDc4FfOi47dW31Omkf+4z/+/wCTFZ9dAYsxfz50Rv/3MX7QUYkHmOcnYMa9y3hebP+KDl/8zHRPGeIwpGsFX2CdgbNzZfTPSGb/PnDh0h9QccOu6cl8P+MXBqvWf0dNHNHvKtgL4v6YYWmTNu58s774Fl4H7rVrAIaKYcm4cTNoq0XHS/oc4C1XwHuFvyDmhwjcr+yasw1VU6KwGv4jR/0w/uH/c3lg8NIleC5yHcxa/FkCtmdQhPXg/OGtTGnDHMO63vFfCGA384NrAL48/PnQAKuKUdRSVKGWyxBCXzZOTky853MKQ6n46UA/hlns/AmsyyxJbowJnw/jnyAFkVGR8BZaRgRDRrMhqyWB4UH8A/9LDUww6LBe//pmPF+OfgXglu7u1u7hL6m80S+/pJLpv59/LrhDQ5eVxV9WT0LArZHBPDTAUaUSPVE+j9UcvBkf+MoVpuN+WCktnqfkLMxBMhSIlUnr9Q/a9MiwNNcX4OBcWYAC+F+7tdLD0uyX18xdsNiFj7788quvvnLUNTc669o72zs6Ort7Tved6YPgcO7cOXx0yvkBxi4XscKmCqS+GDDAGhs90tCnKD5GsGQAI/8IE5Gz1C2NgDXnxT/QmS99ZmI6qy8ueME/LnyERYp+LKjAW0TDPMs0NMu9bGahp0N8RvkjLVSw9B8kOZgiPqn6vOotGPFgORRfMJGPNXRsHsgvLsbVBriXj20S6tISbBLBPnTsBuJGqJaWFrObsaMd+/7aOjo7tHRBZMUW6wkfSfn10b9i1PXRqVMnT546eaLrFFddTpw4cRJPdOEun4f09vbJST5zBuV729tvN7V1YNFXnlBPn+GPu5yjOvCUHJX8b+ueuaOVdV4yjdKZiAOYZOWegX179+zVy+D6K1RKKisBL5dZcAvFwYP8MdtHZOOMk9tLnNgWV1tbi/0zuPM2hplNb9cfq8ciGhbSSksLC0tzc0tzs7Jyc3NwzC2tglTjZQgHn20dHW0iv3r70KG3m1o61Fq33tKOex988AH28GuRx66H1r1zcu/3PNBILeGZsZ8cR/GePbKzIV+4IFAtbqB0HksOVoIQFwIeNsIdQ7yvtkfVVCrgppaWpoZa3q+orT1UlJeTU5iTlZ0RH78uOjoMV4pji6y3Ny4Z93sA2yixzx+XKmXlFBaWVRw6VIsz1NjQ0NTUcuxtPmhphXd19qjLbsitkG0iaOaxB/vHfX2/dxOb6s9Dzjn27+Purd17sM4ryPr6GXMdDS6Mg0oBrRR78CAvg8QlJk5s/8L2qJqa6lps6oUhdnd1tDYBeW9ZBVizsrZuTMxIjA7yvneGiLc3LtfxxWVK4UFh0bjQMgMXpOGsFBaVHIJtQKobYRe1tW9jDzgcp7W9u1NfaaTJDLTRtzkabXdCu+d+f/r9Hv2Exa2J8Sp5zznMJr3Kg9QnVYsfYQcrbg8S2CUHjabr6vQFvtzlCQWLhrGzBtcRvpSTk5ORnQgJD/T2DfSdPx/E02bMmD/f19c3LCiIl6NtzC0oKCwE8d9WkBgbobHdncD4p1qh4w5GUUi3u3LHPDr9gb46+OOP/+3y5X87Z2n3448/lvuezg0f5kYOXAoFuyZr/kFnZX5+SR2BaeAleIkiGxkPI4SJMcs3quCJmkpsaaU9NzXAi50V5WXVpYU5ObnZGVWZcXHRYb7ewMS1WMLq7esbHh4enZiZnZ1dUFAqUl16iAI/qKhpwGy/6W2cO2qYvObKlHGgLZMG2Mc0a819+n3t8Z6wtGcxaTjwnvy6OuxfAx93sPAysLqWdsBgD59cLwQjrsFXxTRgp3Xl4SOHK/GNBHWHGyrxPkDjhvsAaxtqxH9rD4EX9gz3TYxLjPP2DYeCKYEp4aQ ODAMvjB2XG2ZkIZzVg7a6vqm+Wn4ZMayVuIhjkieVvG8gLEpbGHOLaBr+NJQrGh4Tu2HSxZUlEqUkXgGWnLxCqBGBpAFmi7gkmxnxkrrGU+1ZbT588CBOQUMLshbc2UlFN9VWFOW9VFqalZGbszE3MyP7wIGUlJRw38A4/PgGBuLWOzyaF1hGr4tXwIXV1HJ9fXU1Y/s/IdMhaDFuQ6hhK1h3u0UqO6U9ZBvg07//PSL2+MD7iisBmr9PuSqUB7U5hZrRqbKyEcBUpexH1lt0DztxgRgvEwMp2Buc5QBuqK2p+NkvjlWIpRbkZmQkZiYGBYZ7zw+Mg137hoeFhc8PnO8dGJSSmR2fkZuRzZgFFdfXH1OiclMTkzuzu/B+oK+v0pnIM1R7pic78Pi8CFosK3hdAD47LBVXopeUy4ZkAlPZkn7grFAw9yKzDuFJgRM7efnjkZaWZnw1Q0NTW1dXW21RXjUgSpGSsjPgrHFxYSkpCFze3nHe86FlKDwuMTMzMzG7CkELqq2GhpmSqV9kZOgWfxGrJGIJsJu42e84ydgAq9A1jkGfPw8flrJiH/EaGiqxKxX797BNU12D73QW80au7QTvEbiy83BDM3QL7cLEcVddgYAgXVHxM3xmRK2crNycjMR4P34pDQI0eH19Z+BPYHggw3RYYiIyNDVcimv+tYbbRMP/0tnZZWo3Rfw/AB6X97yDyqo7UudETjkIAhBzu3FJOWsr7k8tASrKi7pftx+HRR+urEWwovP+FldRwCKcFU6EM9ScdOJf/Gz/LkStwsLc3Ox1SMJ+APX2nT/DNzww0HsGjNs70NvbLygxsSA7Y2t2ThZsobQMPxWHKip+BV54bxu0S0V3/FaCVs8HuBF7Fl3TpPUpGPcIDeN5N/1qPZ/nkWHaIZUUwk4dMOnGkn8BakJ0o0SuujoGbxg1HJbvgjWrq9SPwMTxBlg5q6zq2vp6cBQibGXHR4eFJ4bN90VK8g4MnOEbBwf2jguLTkyMjs7ILS2oKhAHrmaUNkat7VpHrQ5qWOK04bwFkzaJ2F2/LDmE97yDe8hRb6gojZ1mJdiayi3Wsj0X8M11CFoAZpw6cqSl3Xg8Xb65QeUomIOzxMkwXUunhBcX5OYmZieGBXqLehGnM+MyUYHMCAz384uGRWdszICScyTAceuaDVmSEtSLHwK7Mf53gaXG0sByPQRqaRZXJagx9jsbasp5N3+/04kNudiZXFxewxwMBcsOexzQN3W041SI38ME6mrKGypqGyuKyvLKELUyMnI3xieGBUG3LCt9A+fPmDZtflyKr+9837jExBSoPwydRBaAC6nfpmP1hyRu/RMtuqMTbRerLPSrMFCJzLgc1pjyeJ2Deo01iBQhSpQxk9TAst91HCw+iOLJyQ8vgsvOoURsTEWsQvSqRG1dgifl8ntm3BZpE48fxyXIHYhYRxpg2C0drKOh3tpfoNDKytm4ZiNKi+gwpN5wmDT/hgMd1QdSMmJWdPbRo0ercnPow4XoqyqwS6+CJSaIuwDaJZFLhWkt44TkcXKSBiaqAZZO0tg3TZotbgvzq1P1By3NDbj2vMHZgDgk7snCAxd3qeISeLhtRlNMB+Y39eH8NLS0t7Y0tdSWs1JCoVVamJFbkJgYFpaZmZIZDd+d4R0dGBgYFgjmuDA8V3W0oKAgO6e0/ujRE/Unz/Z3nUCDjKzW1vpPaEMkLbGcFmB68C3Qav1KAS14p09bqsUQQw8z0BM7VAV1+PDxZsBAfUyyTqSd8po67DZHvcnspFiZpZGWKgF8vJnfQECfRhSTzNzUUVtU2wQXVh6cnZ17ALl3frjvDF5kiOQEbARpWDmah/iMjfjWkizUoFtzCotKDyE9MQA0NjWi0aQLtxtgtsW3BCz2bKpJqbM0sDT+mNvIGADAEnCpLqQa3qisW1PD73uCH1O7ChgBGp1SHd4Ciz5S13y8HaenvQO3Lah7O5o6Git+UVtUBIsurYLBolsK9A2Pi0sJhCnP9/MNjA4P9w6MjoNro2GKz5DmgYUlslgZAnxTvQA 3qJhlB74lXuXARr0ANlYMc2bEMlaNwgPX+LDb12ONfa9Aq7zqvhbVUwN+oFLmZERstg51RzjyQQFSqfriugYMQaR/qObMo2J/XhmAC7Lj41MSs1MC41LiwsLRI2Vmh/uFB4Z5B4aHBQZ5hxXkJuauk344JweJrBpfO9TUCYuGTbf8FqVHZ0d7u8nDpti6bv61Ggb3ftDUWX0a2MrDUmlV1qEXoCA4C11JiSgaps1rSKDxSsQrpGzkbCZeEYna8h05sGrA1qB3gIa35uSgkEKDEA6doqxkJzxtGq6evQsuzEyMfJWBajojoxABbivtGcBt0i01Yhc4IlanSkzj1JZjvdmEZtP/2oKVcWL68DmZcdGH0eygdkLVAVA0ECib8PGRZ5BvnHWtzZU18r0KdbTqBpgxbJim3Nzc3dF+HJ7MPMxUXdNSUdtUsb+sOicj4wG/+PjoIAStQERn5qVp07zDUqLROsyHYUcHhWXmblyTHb9uKyYjiHCFpWVlyErH2o4xL3EuqALXLfGKKeucdJ12wT0vOWCdYqsIRfBi6kz1v9Ag0jE9XF3ihszEk3AYrMeRg42aGbFbGtBr7M1nkD5UVpqF76ZggM5k1wCBhjHfQesgbTEmAn7zo8MysquOVpWWolE6wb/V9SfYOuCHIzzBbUfZIdn0ZiH6YxWf3HoFmw/bcZmTHQy9knLFaC1xQuuqMWajhFaCFRV/mllztRyHlnkS2tsZ4ivrGls6W9u6jhUV1WMmWYpK+t7EuDB2C94zfKO9p+ELHGZMwzAANWZgWHTm0QOnjh49dTQro7Qa8y8E6rw8JGLMijjfEWtWnf/NWHWBMRZ4/L5BzbSYgNEs7UYhfZDDHDFnHNkviQBaNUuYCbCPhPHDGo4foX03o9egTQC4Jn9vEUY1TfXUHEJ0bmZieDjrZ+n/MeaZMW0+iktfdIyJ2dEHkIYz1q3LQLVVWHqMpYc0iE24BBojrVY93vkAA6ubJiVtyON2gxa4HvBwxCMzHQIiJrGcxpVeaInl4kV2xnRS9A/w0xrEJ9RfTF7MQ6gsZXQJYrxcU1HkrK2ordi2+skns7auyShYh9YwDHUW53e+0XEpmXFoDNkqZmYeQB8VvTE3G1E6K4uFForR6mOc8TRhPIaCR7Qss50P8B0rplCUsMtJhowzdEt0vb7XrmIFK9UHKy0WS/wyKnR4zMLFlTWNzfxGELlGFffpvByASPcgRq9iNDN2A5R8pJ0fqaejtrWpKK+svqk0a2NOKeYZ+N6ouOwDmXGBKSkos+JSDmSmpKCgPICxQHRYGPJwbkFp1pMIXLzqBdEddUcT5jtwYsuk3RMwVWih2oHHsV/bU1aRpYkdTEVcUniF7S/aJl7Lx6JjP7/SCYJ6UzrFCsRrxjT9zWUt4EfEZnUJBWO8U40PXA1frC0t3bout2DdyqAgP3wNSSAG8KiufH2DcDMfSvbGnaCw7I2rN+YUlB49cepfT508dfbiZ3/qxbpLV0dHV3cPLhIx/e+4R2rVlXxMvnU/ugK2XGAhS2SK2MFBO78YVTqfluPNtG5evMighRKagioTIZvlBVWLaovUaB1YSjN4l5dUwh7zdhVV5L2Ul1WYk5sbH5ZYVXUgJcjbjz0h0tIMNBAI1tFBQd5Bfhh2wcnNpBY+3IVQXY+JR2tbTy+WlnoI7CFqKKdsWTR9Y726XjUGrag1MCAPSjpmpSyUOmIxgvFEwNhxAtD11sgoS5WVR+jax9EcOp1wc4RZtDvV9cjDBbnrUC8nZqZwpIN8BBUzGQN5Gpk5tgyKD1qzMZcjbPwtK8orqq9FVqptpEkjJ6mFJZtJu+ZT/1VgV/WhgfG5aakNzZKI6pppwJha4lBejBLL6Wzu7GzGSAPlB6Y4rawG8F//AHNjfCRwo0yBfTS1bUMSbSp6KQuTjLDs3Gg/b+Qgtv9xcXEYXWZmhs8PwhQTagavXxD6w6qM0owMRPTC6sKi+op6uATSeUObRKzO7l5VUn74volZur2VNbPxxnNGp57RWhm0mLQMARwy1IE/thxB+EURAlZ qsmZfiUy7GpCKmjs6WxCziOwspz0jHzUwjsKHG9q5ytIIWtTC9UWFhQVBmZlhGFuFoe4IPBAXjrk02kGmXcwrEzMPVB04cCA7MR6lR3ZB9saMwnqqGENaWTvt6T0jK4e9p8/0KaoxDb2r/bvOYNLD1m3AsOiByw7MpUnqZAWFUtHZ2iKjdoxsUDCqL+5CocGhAImRingWOMuS0R37Ky6xICOh6KgvO1RalXu0KhNmm4nWH86bwuoKo51sgLL6Olp1oOoU5eip3I0FBUdPHTuG1ZbqtjbwcqFYFuRxzVrveGuiN9Ls9XzaAJ/TDaJDl8ZCJKSsLFBXtzTW1DS2NDLzIqY1chyL/AsR+MNO0B5nvdXYyFW02tqTbce6UCIWZmOUUZXpHZQZzlWHwOwDGOlkh6NL8p6BiBUuPhzk90D0QnRUGQ9gOI2F5EOF9VxRa+ISOxXM6lKZMutkWRUUS/4fA1PD0KWM8AQVOQgTrfLKhpYOBC9nc3sr41UzgkhHJ/ZDYKqDNSfdPstXELa01HHFgXKoouglGGjGOqwchfkFFSDfIm6hyogOCo/OPpAdGI3aer53IgqtggPsmBMTM4IwnS7FeLqsOq8ea66yiQB7AriCbZvXScWhfzwUefNzYDSs5gCYadVKYj3ScBgTDck6qBObsa50BD6KvrQVY/fWjm4kijN9Pe1waDxHo0dygsoBDLW0dfV0dZXUVuTt2pWzMf6BjblrHgiK37oOPaD3jLDAMD+stMyY4cUF4vnhmeHeSNBBfuiLE2UOUIQxAMbx1QhaLWyVWE7DjhgdrVCtaVWtpZFv8fiJTsMDn6j9IpcdHccZqY53qIqCi7Oou1rhq7RnxOo6zicbW7vbW1FdYtpViTPQ8cG586JuNo4NtQ2tnW1N1SfaurCZ41jO0VMnUE8fpZdCjUcLDmQm+mEakIiKOjwlDmVWRiJWWw5A5xkFR6uqCg+htsT60smuti5clsp9Irw8VXVK58wUUpBvHJ71iZCNHJ988ol6+An31elWGFuSCCzLCRhPQl2HOd1CvSxTLA5fm7vPnDvdA4eCatEZ9Z67fPk8MNkPH5fFtfb2zlY0hw2NFXlNx4oOoc9Dy1dfWliVlYG5c1VGxjr4rd/8+UFB4YlxKSkYY94b5IcJfWLYuuyjD+RWYa6VtZUrakVFXawtsf7IzqG3DzNRrrLQg3Ve4liOg5ub+bHaujKggF24AwhayqR///u+07/FF6C2IzU1QNNQXEc348Ppc93tHTKglAUewPKfOI2BooyykD46O3tP98K1EVt7O/n10FhFy6nP2bpxzZO5pRvj4/28sRgcl3kgPHAammJYtN+9C6PXPRC0DhtbskurCgsKc+M3rvPfWl3GNguJjVdX45/FyLLn9Lm+08hOvb2duntQW1OuK1qj584x20ratbcMGHWoBgLA3NWA2TQmAMc/6D59+fNP+ro5iaxsroPBtiN6ocJg4cMeoQcvtXPixPKjt7uTQbsTKseqbm15UZlsz6kqLD1ayE0rGZnZLDe8vcPC0TeEYT0cX0UblFG1zm8NBnhYKsXSUn3p0SfXVWMDU9uv2Pw3YebR2NIBUEyizkDN3DN2GqD8uTGwdSZU1ewSs2FJ2/VlpCUskmE4d7y5/bfHj2OUwdXB9uMtdZxtIAbzfxMj87ojSNOoTBpaYdPIT8RE8GpEAEfp0Vhbi+lO4dasjHVPFqIjrjq6EfknLIz9Aia1GFweQGSmX586dQJbmDKeXL2xsOvUicKsevjwoYqyWpSnCNMnu3p6z+FiYpiT3qZl7cm6oYJdmtfAFrUycWDrowNroJRmbGY4/lt4DBMtFhMrVV6WhXAsEhKb29PwEh/ze9rg7vDs1vaWRn5xGTp/TC/wZfeFOVufzCgogIYT41BrcVdLeFjmAdRahD31hxOn/sCyoxQ3Z9EonTpxFlvz+nE5+fnzfX3959VOQJgyj4AVxULLN+oVJEThRgQmrdoEE6tce9LUxjRMmlFiHT/+2+4OKBhaRG2NZ9phqVK/m40lzawyjrd3QK88F2y ccC5au1FXckbRWvtPtSfq608A4Gw9Q1ZiPDbxhGdCsVVV2PtwICUxAyXWiaNHS0txm0XgU8cKj57IOtbVBc4z0GpfD2osJEOsKfUwbsj+PMaPG+IyNkk81sAAvSzx2E2x1hOYWiKnVh58FU58EBrswLqv9BJ4jKKjo7sJpwHoHcdBzgl5N4NWS3MjsxjG5p3dSCZ9uOq/p7/2GMZTVbXVhaVVpVhZCEvJzYyePyOc/W/4/Bl+M+7l/8Zkzeo1G0u3bl1TuAurDuv8MwrLuo4dehtdP054SwsiFoIDNHumD0dxYfQQwuuZd2ERIub5TzQS9hpyGyx3+3LTL/Z/q4swzOv/D3mjupvCJFLWAAAAAElFTkSuQmCC"/>
-<saf:endOfStream ref="N1005A"/>
-
-<saf:sceneUnit>
-		<lsr:NewScene>
-				<svg id="svg-root" width="100%" height="100%" viewBox="0 0 480 360" viewport-fill="purple" preserveAspectRatio="none">
-
-					
-						
-
-					
-						
-
-					
-						<image id="image1PNG" x="120" y="75" width="240" height="150" xlink:href="stream:N1005A" lsr:transformBehavior="pinned" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-						<image id="image2PNG" x="120" y="226" width="120" height="75" opacity="0.43" type ="image/png" xlink:href="stream:N1005A" lsr:transformBehavior="pinned_180"/>
-
-					
-                  <path fill="green" stroke="green" d="M 250 130 l 100 200 l 100 -200 z"/>
-						<image id="image3PNG" x="275" y="200" width="120" height="150" type ="image/png" xlink:href="stream:N1005A"/>
-
-				</svg>
-		</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_image_parsing2.xml Deleted

@@ -1,319 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:imageHeader objectTypeIndication='109' streamID='Stream1'/>
-<saf:imageUnit ref='Stream1' source='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAACWCAMAAADXJvXnAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
-jwv8YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAwBQTFRF
-///////3///v9//+//bv/Pjm9Pfv7/fm9u/e+O/U7+7m5u/e5uzm8+XT4uXe4t7R7dq+1NjQ5smn
-0s+9z87IxcrH0cOtx8W9vcbFvcO9tcW9vsC12riPwr6rtb29w7SjtbWwya6LrbWlrbKwta+grayl
-pK2pxqR7wKSIraicpaSfpKWUsZ+Ku51znKWcmqOltZt7pZyUnJycn52MnJyUkpyclJyUsZNznJSU
-jJyUnZSMsJBplJSUlJSMjZScnJB/jJSUi5SMhJSUo4xpjIyNm4lzjIyEgoyUpYRfhIyMiIx7goyE
-e4yMmINrhISMhISEiYRzmH9ehIN7e4SMe4SEmnxSe4R7c4SMc4SEc4R7h3xme3uEfntze3t7c3uE
-c3t7cntza3uEc3tra3t7fnNmc3N7c3NzgnBac3Nrim1La3N7a3Nza3NrY3N7Y3Nzc2trY3Nra2tz
-cmtaa2trbWtje2dMY2tzY2trYWtiWmtzWmtrb2RSbGNecWNJY2NrY2NjWmNrY2FaWmNjWmNaUmNr
-UmNhbllCZlpMWlpjWlpacVQzWlpQUlpjUlpaUlpSSlpjUlpKSlpaXlNCSlpSWlJNUlJaUlJSSlJj
-UlJKSlJaUVJCSlJSSlJKQlJaXUsyQlJSUEpSUkpKQlJKUkpCSkpKSkpCQkpSQkpKTUc6QkpCOkpS
-Qko6OkpKSkJCOkpCQkJKQkJCQkI6OkJKTT4oOkJCOkI6Qj8xMUJKOkIxMUJCQjo6MUI6OjpCOjo6
-PTopOjoxMTpCMTo6MToxKTpCKTo6KToxOjExMTE6MTExMjEpKTE6KTExKTEpITExLiwhITEpKSkp
-MicUISkxISkpISkhISkZGSkpISkQGSkhISEhISEZISEQGSEhGSEZGSEQECEhGSEIECEZIRkQGRkh
-IRkIGRkZGRkQGRkIEBkZEBkQEBkICBkZGRAZEBkAGRAQGRAIEBAZEBAQEBAICBAQDRAACBAIEAgJ
-EAgACAgQCAgICAgAAAgIAAgACAAAAAAIAAAAoYb3nAAAAAlwSFlzAAALEQAACxEBf2RfkQAAPyZJ
-REFUeF61nQ1clWWe949OWVmKr5mpoyjKi2FICJNASiDhGhEETGsyOpuBjO7shJJORIZMkBLMDjJ8
-SM7SjkDA1DiwgjuzDhJ8djYYyDCpHfFln3wGlD77mR5obQZrH5/f739d133uc8CX3e35K+c+b9j5
-3v/3/3XdJ8fjjz/11FOPU3B0k6e/853vPCuy+TvJTyXjTevXr8fP448nJ+O1zc9+b/v2733vr78H
-UW/ju/noBvLXlO9TXvCQH9pEvWR/5pVXzKMXtbieUa+of9T+O+r+K1p+pOR1hxtocnKyjVmINxP4
-aT5NXpHHnwLx0yQGqov3FoBdvJ7AN+bFx74Z8AsvjMvrDvz66woYnJY8/fTThpnAm7+zeTMUnPy4
-UrACxu8AebOcC61caFfZwy2p18L94Q9dujR6HaNfoyS3449eedFDne42oV588UX1S6JcEQc/vyGG
-2kQALdTyUAFrsxfbF/unWeOlzeo3RMbhFZXaBXpwmbOnAQq8NnU3e7ShatPEwVL6WDvWz8D6Da3g
-/hjiePTRx8RGITRTC0CAIfLU02Lq2gqUAcj79QmyeD3US2+1aMXJbkArH9IAu/uf9aldtLx3Y2JN
-K8q1cAH88FoSw2JJALpntLqIQ+Fj8MKmbXYPXnOOHtfUz2hrNjaNI3hfeGG75pQjtGes2RgkjwRy
-PVbx6kXjfRpSfXBQuo7yO/Z/R4xY2/IPtTHz/WLLVO+Pf/ITx1oCG7e0aVhZ9lPkFlIDrB65XN5Y
-/ljvFV4xYQ/d2iLwixYXmN1M0z24ulSrPBFCeNBZUdvNpe2+a1OvG7B2S5tPgtilVuPpHsA0dTFs
-AsN8bUb916LMm/AaPQifndgVbJSKDLI7sMEloI3YzZz526JereFHjX7FpscIFcw8DbvH6yptmayt
-HV/jgpVK/b5A031dmXZM3lURlGIPvZ7A7noV7h8DXT4+T4Hrd133bf+kzrw2XtHwo7RnlY2vR+wC
-FvvWaUuZtY7PClIQxye21xkmZXgCWyp2U69JKMoTjTu6AdO8LXGPbOb9P/nJGyIOCVn2XDNWx3Bg
-FlhSbrhbtI7Tyn81r0FmRWVRjpeK7Ap2+8Qe7msZ8VhgW9pxx3QpV8xBwf4dxQKWgkKVUK6s+qxk
-YdRZJvU+jZRsq1GstxrgH76olCyP7cQWuq4HVLhxR3MvLFy1go1YbNll0vgHxgPVNYbxXMEVWgHW
-ClbASDcqBpky+lkQewDrfCXa1Xlbq9ilUPqxBbx7926XQRvvtaqgsZ/YozaycoqKOzoCGZO+PrAJ
-Uy7tCvDax7QLa0cGtCgZeVU1DrrQekryEuK25lWmoPM2gGnVVp5FvfGs5sVzAN69+wdyu3u3xFJa
-syn7rptnlWJfM4A6zioTVUHLIy+7HtvOkVGvUbE2aQYse9tg65TEpunGilhVWCICbFKSjtE6Eb3w
-gitMa1J9cEXisQ7oyrBWoDL5RFIKOI3aqGo35drSs6vOwO+465capk3rstEgEwqatTSsga3awwZs
-41WVFRMvVe0KU+7Arg5OgK0P7RaarAd23jfeuBVg86tuBm15MIBXPbyWEZjas/FKhpXGATaNmgsm
-zteTTeHpHsqlUfze97ZbUfn7z28Xr939wu4X6cA2ZimzbAHaFk/HZbaQla5+8oYKWzRqUzSO83sa
-V2UiF+5bb73lWLbswVVrUV9K48eiQhdX0jZooe2SWGfdMYmLb3MBb99OWjdGD2B7ySHA46vXVAyw
-ZZLycxP55sDG8D15/47A98395hIwr1r1CLChbGqb+hYHVRqGit3aQA1smkN1VqBgrWECuwi/b0dX
-8VoUbJtE3ECz4NMFgwImMnT74x8rRV9Xt67ka9Mved9yTJ0+fdZsMC97kNTAVqqWIGypWN0R63aJ
-7VWaNDjtYwxFzW7J3Yd3i0W7Uu51P7NWjzFJA/x34sm0bEVs83K3u27Jl2eKtAS+Z/Lke6ZOnz2X
-yDTvVWsfg6YfEy0/o11WZygONSjCbT8ZhKXQbZ8n3/Pbn9u+/XkKnvUARmYyuPsgr44hhgWLEbv5
-H00aKn7zTehYvWoL2h7Q1m+bYsPACvDdinjW/SBeAuMOXfUIZO1jT6xf/4QYty5CGLNx9+lndF3y
-jCZOU9a8PV0Dkw+8m9O3Ax3A6dq+TR7GUYBxQ959yLMm377+enFx8WuvK15PYgP8Bv0Y7PI63lis
-zs9PjKqLLRdQuHQEgr5pNDxVZDp1vGTRoiUPUpRDPyby1LdB+N3vfvfZZ7/7XRkFmDGQTcdCrBT8
-wu6dvJuejhOwU+5CDKwuPbSGieumXuAWF+MZu4JVjH2TmqWoO5Zf2sze466lXM37c80LH9YyffY3
-IVDxg/RmallBP/XUt6HY737nWeB+5+lvWz2kPYpT2ZqXwOlbQLt5i4DLrTuysWhPYOElsBsxlA1O
-aIikb775liYnOs17fLHjin5/7gK+Z+pUL6XkWbNnz77vvmXLlgUjeDFkS/x67DEkKtEqWyXUnXBt
-8D2DlGy58XPPPbf5edovzBhqTU9/7jmoWLRsxHJku//ue+01WrGbuHmwNtc3AEdkHuTWJSpwKzvw
-LKpckUqQIRK0jIph1gzY9933zWWrIh5RxDGEVj2Ufa4zDvBzKkA9v5N2rGjdkK8DLG47BthSmw1Y
-M9IbxxAbhboVGTouC6gROzA17eVF6NlLgtdGRKyKiIgwWtaVmMVM1SYnpyoNp6Vtpj61Kkm8wwas
-n9+5k8R79+7dbdcwApaC1WDu8VlHJYZkMWClYarJ0jefcDPfMXHZjZcPHPdQLC1PnQ7bvm9JwIrg
-4NDQUCJHRcXQsjckJCdsWI8/GzaAO3VzqgZOgwgwkfmzY1xiC/jll4XYBGgL9zrOKAlIRVsdZoXX
-EEskkpctbhOcxpDqJxx33z158uS7LWL6Myx77qJlASsUNbAjomJi1kZJRbJh/foErWmyKgEx8pCm
-JrG7Ue+Q06BU/PLLLwusZKTX9isFA6pyfMELWrWVb771zjt1LosWPde9844KYgZTBSi7/IMl6lkL
-GMyi6btxwJ3p989bBFmydNESyrJliwJWgD0q5glqODktDY6dloZ7m595BqkYlq2JUXFIWtJhK/25
-7Tt27ADwDhLDppVy9+3D8TUSk5m8BzWxOr755sE338TRDgw64JgTIGo2wFaehcFr2rc06Dv6+Gt9
-dEy9G6IUrKz7btygFJEYBl2rA1173pKlSwNWIIzBvJPJKoKe4hnRsgY2wcoVtgArhg5iAFv6FRVr
-HXto2DgsiYVLrBgK9ojSBFa6pWfb9Gq0+o9jBXnYAlbMsHD+TJrMu/dMxV2Re6bOmjMXWpfqE9Bk
-lQZK9J2GVGUPVemuwEUN7xDgneB1J96/Xxm1m027gjCBoVFiAVXd2oL0WzgTdUw14xvxOLR4ioWH
-aPhuL6+7J8Oh7yDsxEl3TKJMnDhpwqRJEybgZjIS9X1z585ldQILXxYcEbM+JmZ9wvonNDK1TOZt
-27alb9PwW7ZsUc9A/uZvdu3a9ZIgKzXnA9cQK7OmKHZCq8fGO60w/eYbPAvqadHwz3/+Duz2Hd5Y
-mv21lnff9bynKy1ELrBOAit+5GbSbRMnTbptwoTbJntBy5MmSYcB2vvvv58lGfurgIDg4AiU3Ci7
-ExISqGebkkkKXkG2EYuSKXl5ilfr2FKyC1gxjwG2x6df/vIfNK8LFvf+UVG+O0bwpMNrqoRpiNwC
-7Y47Jt0BfOqWyp08fdas6VNh4iSeOxfAhhkxbVkwqhPKeig7ScVskG7SooiVnsEtdr1798vKsvO1
-ig0yM5COXGCtq1Mh2c7neR+81KxNtaQF7lhU6xnHdCYipWDxVfDK8W7CTpg4aSJteZbX5AlKxwQW
-DYuA+MHgVcjWSFsxMbEJhjktzSBvsiOjnQDwTsYuInsAo/wwyAxUWq4PTFzIGEu+AS1egoZRXlGB
-QqsOFDrxxAmT7sC5QMCeapyYJm0jVsgRqMwiIqHnWDCDWsmTTz5p1zQSFXtkYdZm7dKyRz6Gd95A
-5FU3G252t+F2kX8eR9rbHbOmIgUhHsOQKXK8AzcT7pg89W6Y9tSpk+/xmu51D/IT9Kuc2E58P7w5
-GMUJ/oaEkprMwE0AL8XoOi1N2bXEawCLXUOKtRvvL/6p6Jd5mESHNTGOtNp3zON3fvnLujoo1ygW
-R8H9R7Hj9vZfK9Tftf9OyXvux392zJmO3HvPVC9oF1Z7D4jFg3F7N9ooKa6BOgtmjV5KRWlPoZIh
-K1CQhkbQoWNF1qxZB9HcSaJsCdkA3mXFrr0mcv20uLj8p9qFDRyZPV3UTbN80Cy8YsdEFdobiGM2
-WyRW0PyZi3t333P31OleXozZ0jMCcvZs4rJ5NEGLShZV37+ErrwM8TogYGlAQAhtO5LEa0SIbEEL
-MxMU8pOFLMAlxcU//Wl5uSkv7easmJqbx4DqJzx4f+fG2+0mchocS755HxKrrh8DHlyxbPGSRfPm
-zp0za/o9d+AMsLLEsGvJN+feBzVPnz3bBGkVrbV1owhdSoGOvxUC+dbq1WvW8GdNkOaOF+yNW7cK
-sjCLlvORnYpAXC6iiGss4MZGsrqJ5reeM+pVXvu73xnE9z3EPO8IXsKUyqEl7HLVKjQLK1bw8ZK5
-UPksFFZ4ftUqIC+C+vEU1Hyf0q0NmFqWypupOXglxH/lQw+IBAWFhYVpTcfHx6s4tlWQJRsrYMWr
-gGvswGOIlb5dItZsohQ0eFPgVctkrqNntGwH1z7MHin4wSX3zZ67bNXDMv5YtSoYzHORkGHms0lM
-R1Yahs2LzJvHfiMgYGUIeP39Aeu30NvPz4/QEFKT+MmNGzdt3bp1m9g1gPP2FxUVGeC/B64Bbmho
-hIxRsX7iXXV04Yp+bx1YzaQteRicIFyCVQk13Fq7NmJV8Ipl37xP+bWKWwJseOEGc+bMnbNokQ9o
-/X0oC5WA+oEgYIdZHg3TFuKXNHCZAv570ireBoV7A+B3gaxDlU5BLtrubk+Lft8y6UcedC08PKoW
-XB4lH88A9a52+axfD2KkWyDPhU0jeCnc++934wXyrJlz5ixYcO+9+EuZCbn33oU+VLTYtwQyaHnr
-1qxdWS+RGBouK6tw8SqL9uRtbbXr2lVc2FKuFaHG0OIJC/hhYAkY9Eg0FMaC/MSjax+B0h95WPGu
-fwLF1NqI4BWLGL+sEtPwzplzH6L4HPydRURE+alTRO686847p0yZNhMnALqGpgNJHM/wtTUrK+ul
-vL1i0mXlCFuiYKdW8WGN3KCN+ojmxVFoYcty77iKVt2dmqhTK9fo2PPoeARY2oMfATEEg8rHHnt0
-/WMgxkl4BM8RGAOemLWrggOWLLIZMZVNfQN2lhbyenlNmXK7yMSJEyfcBiG11zRwL6Sq18CZRccg
-ho4Rtspo1BXapJVha9Ouc7fqVqXb9nbygvjXErAArGU85bo95yATNckfjKFlDxP2sDxGeCiapwDP
-JSeDOSYiOADhW4ipZNziADM2uKxRMAn08rrz9okGmBW5VOWU2++cAvuGooFM4q3ixgIM5Iqf/exn
-BtYGbSNuNbzvtpug9WsprX5niN93abQb98f+cax6RP2RwAS8x9WCgz4AGrxcQaUbM1RzQQbIWrew
-4TlQ6azpuiSjbqdMYaulMSdMcFAM9oQJYPaaudAvTOn4b5ibAEw3LiurhlQ4nU4o21lZKWnKWakK
-Z8uBqV78gU2LhnVKes9SsdH0h+9/aPmtvfyASSt5VAR7mDQw9SzaxaIxW3w6No2fwKiuoF3WXqJb
-UesUUa3XlLvgtKjEJ3zjG98QSgfu2AWqvv2uaTMWBgH5yU0gRm4ywGVlpRWMXiIlJaxGkJcZwlzE
-VutHYGXQ7e3vWenXYvvwww/d6yz9CLtpXQLFCiU1rPeqWVtoGadV5JayZIkBhkXP1IbsNeVO8dqJ
-4BRGUa4nMK379inToGQEL3Hkl/IKIdAyg9d+gJoOmT2UAq6rMyo2wIpXAY/hBe11eLsdik+J8l/N
-KxsguJakREI3c3LoKjYKDzJYMzuh1piHOlS8d8qdpAWvxhwH2CF6p5Lv9QtSnpyRlZWTw4RszUA4
-GjDLETLFRDeho/S7KkZLyHIVHWiJ7Oq8Pm53NzaIK7G245ldecLrAmYgoy2sRym2FtSoP2V8yxIa
-xPBiiVYMyeK3Wr+eGtYOPXEiiKHk6Ojo+MSNGRmAhm1jGPLy3rz8/DwbMHWsymsdvFzApqQULbvZ
-73X1C2B1gQc3TNtJudeDvN9+mvuoKeYqD8nTgA5FJcaS1D8AshT9BrQ8a+b0qYhPKkzJLY7apLVp
-8/lvSAyjkr0hqLWp6G2orzEg2L5DBl6qg6JQ1XDlGraMTMlHtIqP6HgleZhmbeVhdUfl5Q8Ru5SY
-PO2wbJZ7kdw2axFXFtHkFWubJdYepPCiQwc/iNWJ4JAQNIdgRik9b87UySDW0OP5sPZqvAXxetq0
-aTPmezMzr5H5iAwIELihYmPScqek0umEkhvEka0qS6Oqg7tRa3oNazdxh2sjodzDgihAv81ba/eZ
-LJXqXZc8PxsMszQVEDTBREavBG4gm6Q0XpT+hhXFmJoZsJGYfR54aM2aWCCzdZSmQs9BXtsn3lxS
-LsSq6jLAdt73PLz4JsBc+tXb0HhXNnLYca2NLLbdtK6qm1W2CBUdEOC/dB7GJwxdSjyitOshzB0O
-f7sXa07/h9Y8tHoNamzpl0msJvavcgIEXhg1ak7omNH6N7/5jZtyYc8U1Srp6GUPYh9+ePr0aauW
-1iv5uArJXJAzZhuW3smitvDISqmI0rMMaTmqJTaQQ0KWL5030+tOZCjKpOsDS1iDZU9BseI1DY2G
-XxCdGb2jah1lliuaVglZEYuSxyC/9x6hiSyqxijLFsQkhBlih95hKLS8xAzbObi5QfZ1cGuHwTf7
-EGVNWF33oYKZajcUOwc8IPb3mQPiO6eAeuJNgFURNvG22++CcUsAoy8rZjPKlQoExRfKTWkaBbkV
-4qFnpWiZ2r1nB1bhize/w9TS2pL07Pfk8gR1YR03sVi7adUmLZforQ6yI9Go+wnOZ6luAIN4wXTQ
-TmFN7QlsLF0HcVWOofK+k+7s7cf2UZCVL7PuRClCXgLXuoYCBB5DLEWI0rBtFkDS97rl7LzbbANW
-l2PoCzWsi65soOrSO/fzsNnaDJGAfmp9TFQUhnghy30WoApBh3T7GB8WdYogYTN7qc6CT0yZsdAv
-CEMwNsxKyRKv1cQLNTaBXUOB34yrZB2tQa3HH8L/nrCKOHDBpDJmXliEPbA88OIq0vEoN/qxXGe4
-fbubdZvtH09xhwBU/HDEWih5pf8Cr9tJNtEEZZOHHbfdfuedd9015S70yjgdAJ54m5SjAEYt4r0S
-KYpaTmMrRRVr4hJt0samUXkJcbMup00+VoNoGDYhIer5d5vf0ZNBB7VqLqayb/o1V4Fal+EobrPp
-DmfJbOJxhW7mq7WPIEcBeOHMKbDnMc2D47bJaKcEeNo0IKNjhCFIhMMRkwI0j8zLMGsz9gIxjVrZ
-NOLWL63BD4l/owsQ1SW7iy5Bm7FMVfmGJPbX9zncr6Ry7XI292xXWVH3cn4obsQ6gImOkaVCvrXS
-32cBQjWrTHseguNOuhNB+S4Kqg6gosuazpGBtmpUIuiY0S8bYhlsFmk3VmOBBgtZA6uBgCeysmEo
-trKyuHjfK9j4yc/twMZW2dStb+xX26idddjzLH/cLjL7/vct3zaK/ktTk8TEREVycLlwzqw7Tcxi
-PSnl5gQMPyjQ8bSZM6exq7x3AcZeM6FsaBvpicCYECjgl17Sk030zHRkGRBgwGdGfPahpqVhaZbb
-DW5NZXnxvu1bsGUhjZvlCPxDBSyXBZqLO9U2bjySvc2yy0qdC6NxezDT5o2dPcnw5A0bYhGrQQwl
-T7ndUrAkIKznsNiAeGG2p2Z8C3wWLFx4L1sPTL4W4kkUImLUEqllzsfCi7Pcip9VmFFILSK2hDCP
-ObVuI/EsFmnq3qRy9+5MT16Pj0benQ7u8ySy0JDRuhRV9hdxn6Awq23POGpic9GdtdduC7dsJadC
-khJiEalXPwTkmV66b9LZCJEZoYzeCjgl9y7kVHcBRp0LfTDh9fGW0a7P6jVSaGJAYAM20doaBNVa
-ixSmXz7yzjtHjiBCYYn58GEYM3C3b05NiMGCPTa87tjpePXVV/cRSfNaF/O5XURkqOUKPw/bNk69
-fTuQwUzi2NjI1atX06xnqbxjCc3WC2rlLJey0AdzbFQqiwhL4TSXZ8B/5epYrMBh8U2MWmlYhAmK
-Ocoa9An0kSOKXY6HoVgt2Au5I31LWip23cjyJYC5h0hbrfulgNhZ5MI2u9jlnTZPxwU6P8DfH8hO
-Utm/pFUcuRqfe+FMdhLYKYJUi+wDY/aaKaA+GNiL4E3C67885CGu0TzEW/z4Y7EmMpLMUlrTqF3A
-mHsZ4BqP1RnQOitLivP37MHn3LNvH4B3Yt/UNrX/AsAvisWq64rAu8/sdcVdkRf1VX2u59XJse1/
-FmPH7jMgAxhnk0YdEwmL9lk4Z/ZUJCfJsyw2vbxmLfDhsoQ/miv/paANWI4Wa968pSEhqyP5B87/
-0OrVcAnc4hCbIGpmCaLiVgk1TFHEzoNq2MdKWwa7h/ESgbk7jIhYnd2xA0d8rrQtW3bscNj2q5PX
-LrJZfZ/7pV/YUGbMgSdIW4b8I3pXKf5hAscC2N9n4YJ5Mzn30WmWGWge12KWA1OWWLHCSuA5i4ND
-IkVQmZIzUq0xx8b+BRbX0+DN7lWms0JP+zAmUPtizFKr04mZWH7+Hu6V2gL32oJAsCU1KSk1NW3T
-lm0AVqlHBSQ34FfVxk+1hVtfePKjH8EBtEkoXhXAlXA/OLbuKA3HovigKhciVEvrxEgF78VYZN7i
-5cvRVX1L2uhgtliL5i4NDkUdziYzNCQUtEBXwLJ7InVTOucCbJ3MUJNjTT7O11ug2DWzBC0pgTWD
-FWw7QJqKjQdb0pKwKQHA3E7kkKtOGHoBIFu2X9MbIXHXBfwq8bH39fVXX5R3gVq9Hz90Fm7O2bkT
-G4jTgUwVJ+ETr1wOVfr4YJVppteU29XKi+zYnbPIPyQkEr0V/mKfRMTSgLnBIVGI7dgzwc0TSOQx
-CQkhoI0U3rSktC3bdu3chq0Ssnyupri4p7tm1UWW42Tsc5bs4RlPS0iFM8SmbtnAICqRFNtr0nEO
-HNYXceCiFNGT2gdZvFt4cUfLqwJczKAuOt7HH9wDMIkFmirmxqVUtk4wTsQt5tgFkm6lwpjidYcX
-Bn6z4LPUJrqrhEgwRy4NjaJ6o2JiN2xQWyZCYiITaOWiY+oHeyX27t2JFXRIfn5+DfgammrL92Pi
-RauuxJ/98N79W/B2sEamJmzYlBSVlBSbgKyRsGXTtj27duzaX4N+WEqkZDSA5goFHImtSF999bVX
-X8ef4p+oh8WM6hhF2J2dvbog45oObiqlCfGzom1CBKZZS0GxAObtNX3O4sXz5iwKCA6JiFH9ZExw
-ZGRobKzijNmAQ0RkVGRSbGjI0sjIgBVAToAP682MO9PTAV3irOns7KH0VrSeGervrCmv2VtTs7/G
-mb8zNQEOBWuJhesnJWyKiNyUl7dtW15bW2dXV8/AVWuIR2DdD8heaOaZHyCs5+e79lMxOoiK98kN
-D7ABJUrHzz+fnr45LQEuDK3Erl6+fPVyn4U+/iDWMm/OvEWLMctejJjFgUFMaGjMiijaN0BjoOGk
-DUmpsbEbImNDI6MCIpPwuf8iNmnbttQ0bP/ZC6veuXe/s6XzzMDA8OjIwJmB4aHh0SvDAwMDrfvL
-a5zl+fm0h9hNeUW1m9J3xW5raapo7B0ZHRwYHuhp6+0fGBhxcKu30rAoeEt6WsJ6TJ4jokKx/yom
-KiI5ldUTEnfa5u079+7bzzmTXb0KXfZrvEyrfh4uLDu1EHdYf8CJlz+EG/8FC2SuCdalSxcvDQjl
-OAiUEVFRAA4NxjmKiopNYtGCsxUbEpVU0ZAOxcOiU/c6S9J3lTd29vW0NHZ09gJzFJTDw1dGR4a/
-Gh0eHMK9gZ7yvbWNO7fFbNm1Ka38zPBAU9/V/sFr5wcG8caR0dFrA70Do6PDw440DfxUqiJOT9sQ
-hXVg7G7B+j/WFxYtxa5hiH9AcGRCWvrOdKidtv0KnFqil9Yw912R+AfPo9pKQx5O3SQFVwDmc9D0
-ym3bNq1evmkT8+/iRfMWLfUPJjFC8qbU0BVLQ0JxbiOjokJXpCWFhiRtS4qM2VTbUY549Zd/taui
-a7Cv6W+bWjv7ent6R0aujEKujAxfERkBD0FGrnbk9Q7lx24uamtp6MUbBnv7wApSvIg3jMAmKMqk
-0dZt0DrenLphfVREaPAKbrsCtdBCuFEHu5JwPUDyZlyMtYdVjLuQeCd8DE62d0fatoqmvE1QdFFp
-ff2hsqKiY11tu/6q5WQeBrk8e4hojGoxIUm7kiJXhCQkIVpzvh1S+7dJsRVttYe2bcl3djQ0Nfyq
-q+ejodGhvuErQwNDw8NfXQEvQYdHr31FzGtXR4Zw+Groq6GuK9da8xu7hr/A84Oj10aGr10bBu2f
-cX6GB/48+n9HR/88es2B5kbmzBv0RRukXxsRGroKf3gFQPBKTp5RHPCDApqXBfBygOQ0dYGD2TWp
-rJr5aX/z6f7e1p3OpoqKtpNdJykfnWxrw1LZtv1dfbuSYv+qoqmpqahoV1LSLlTGeQHBCXl7k1BQ
-JUQm5LWdbNuU1HV1cHBocOj8V1dGhoaoRAAOXhn+fPRzmPGVEaVk3L16DZY9+tVXsGzqGU/jNFCf
-o/959eoXeAseKf3+Gayjfya6A6Mo8EZZEvowcGjUWAsOCMaAavXqb30LRQIG7UuobqRQqCcAroc9
-wzA5JHa1S5bo23bu31nb29vb01TU1NXXB9J+I3LP9bC//0xvT09f/+BgV2tX/+DAwODgQP+ZM/3n
-B5VAmRTAAQ8kgvmFWLO7XFUP9WHs6/LMF1/wLIg4UlPRv7p41+K7eWQlJZhrCkiULPdAzIJI1Iy6
-f/Hi5StgfXgVCWMTY/+uvQhV21DtVjR1nunv7T3T39fVB76Pzp61iM+KDJ4/399/HlEVfP39iCgj
-/YhBggjkQUYYu5D3iy+grFFzvA7SzZ7mP6GAsXAiE3VoTC0MyuUrSBCYrGPrZHAA6nukkBDUgiEr
-A/x9lvs89NDykJAViLJ4/lvIdmnpFWeGzvSfgbb6B0YQGvjBB/HoQv+FCwpTsY4rgB3BbwwplYLP
-dhAFK14oyfrMN4O74evKhwkt4FS1mqqjVopB7ApY6oOYiu1m3G+GUhHZxWfxUv/FISsQYpYGRG7C
-aDGvaXAEeiMljRMfE3rEIzJeDxj6NDIE4MFh6BawitcSF+//CNL+y67Vww1q7UTdsDZkHYRad6X/
-Uh9uo1zOoQ3qxOU+8xYvmhuF6igkJKkM8air7wK12d9/4Wz/WXxyfHRojfh83mDhJZtohZJM3BXn
-yBNWe/DXpFiL2ZGmS8un1FIRFk6g5Jj1G55IhopjMIBEW0pbXoLaAX3AzFnoBnzmzQqJ2LQfsbbt
-5EcffQS0jy78K9wV9wkvBIbU46if1zEJ77MFJ2POYtQqXo0wC4lc72hIxoln4/4eVh5UNa2/8g67
-saJQxEeh10iIjYILoxGXLhXRCvOnmRg1+nMSsaul6e2mfzl58T+gwwv9TDyg7YcBw6pBAzceotXa
-LFf0ewl5BgIiHvAeIVc6pv8qSvNQFxlfmzlL0MI6AsYUf/l0snzH3+MwbMbsWBo1itsI1AerHwoB
-9UP+rP9nzlw408d/UcimPU21b3cNfnbp7NlLg4CFMQssoAfO958fglHzZxzR/jmiEg9OiJiyArVw
-LeLr6e2/fw4cHKujqMQiKCaZ65NT01DIspmMQhmbxiIoYHkIFCzE/n4L7+X4LeltRqjBwc8+u2SP
-ShKg4MwIWKLBMbh0bo+8I9p143UFauG/Htot5d9xftmx/Qfbf7CZvFs2I0MlJ6cDOCIWPXkIerTI
-0BWYwaDOgKJlj7vPwpV5qBO0fHbp4kVRrV0EeAjAY3ntMVhMW5v3eMRG3187cCrGIOtTE5LX79id
-itQEQ+awgls20LcuXoHGJiQydlMJKc+ePVFaeOLSn0YuUQtDQ59+NnjRKixszIxT4wKPp2G3oGW3
-bH3/v2+84/+mY0NqctSG2PWxUTt2x6JXQHpF0bxoXshSdDRLN+TtaegavDoyMDg6fPVPf/rTZxcv
-/ulPg/0jV6+IJf5x8GK/h4b7z164oIHHqpg69zRp49M2D3bD/tqBQ4MjApLYqsUmBaNaTitaiZ3t
-S2PzUFv8RarzwkhZU//IFZYFKO4gV8+OXEWHoj4mgD0NWrItiA0XH/5Ri9i4ecE9RLm82NOlv3Zg
-f1yZsQMmjI4Nk4ilRZ2LZi2ak9TWFRy5bdeOkp5+lShHv8QfVAcoHK+O/JFP8HkCo1wWYV8gQUu5
-ruWuI8N//KM8gbfzF61SyiMoW8g6ht1qHvbMz5552fN1Bxx2T1MewlNkLHfgFDUtD4iNLEKj0z8y
-dP7CyNXBP0p//X+GP/+cHeW1/7z6xchVPGGZtNUd8A6qyUufXhJgV4QSYCVjDdq98rBKaX06rLrj
-a1O0A/PBhpNNGLgl7d1VVJI3NHhx8OLISD9Lwwufjgzpj/hnCIihWbbXcjQ+7A58cfDTkU8Rpe05
-VYDRILEHRNp1KVmZr5wEPutRdKBvuLU0fOPW0ONUOdLS9zb2ojfFp5GyR38AW7ErHwjA8pvAVR9w
-dIQcUmug2tACBQ99qpINkRGqGZjRU0C0jkdGhj4V9QveZyil5Y7+d1127vE5r49+Fb0w/hi5nin8
-pxbHGRmJuUwNVSvmCmMFPTTlC+oardoX+LCDF5GV3HDPXmS1qLKr0hcshYHtInD5o/3bVUQqQv7D
-6h/lbI78t27CFqrcue7vWcAYEHFywr/6LI4F/gKKVecEH0QBI4IB2GbOVsNrqya+AMlFnJWLYL0E
-8IvwboRxEmmbt8yY/zI+ijkT+C9quXXyG7zT0OLoULqEewrvGNghzHzhsQCmhhUv3Fj0QoO25WGj
-QCQhyzOGYQUig5egaADjHJ1nRDNtghXbcA45xrF8/2sB1f8IeTHnEnGA8XNt0jZTVg3N5csINLB5
-IOOvGjwwemngz6hho1lXu8usCwuVE/nvAxf/oIj/QGDc4FfOi47dW31Omkf+4z/+/wCTFZ9dAYsx
-fz50Rv/3MX7QUYkHmOcnYMa9y3hebP+KDl/8zHRPGeIwpGsFX2CdgbNzZfTPSGb/PnDh0h9QccOu
-6cl8P+MXBqvWf0dNHNHvKtgL4v6YYWmTNu58s774Fl4H7rVrAIaKYcm4cTNoq0XHS/oc4C1XwHuF
-vyDmhwjcr+yasw1VU6KwGv4jR/0w/uH/c3lg8NIleC5yHcxa/FkCtmdQhPXg/OGtTGnDHMO63vFf
-CGA384NrAL48/PnQAKuKUdRSVKGWyxBCXzZOTky853MKQ6n46UA/hlns/AmsyyxJbowJnw/jnyAF
-kVGR8BZaRgRDRrMhqyWB4UH8A/9LDUww6LBe//pmPF+OfgXglu7u1u7hL6m80S+/pJLpv59/LrhD
-Q5eVxV9WT0LArZHBPDTAUaUSPVE+j9UcvBkf+MoVpuN+WCktnqfkLMxBMhSIlUnr9Q/a9MiwNNcX
-4OBcWYAC+F+7tdLD0uyX18xdsNiFj7788quvvnLUNTc669o72zs6Ort7Tved6YPgcO7cOXx0yvkB
-xi4XscKmCqS+GDDAGhs90tCnKD5GsGQAI/8IE5Gz1C2NgDXnxT/QmS99ZmI6qy8ueME/LnyERYp+
-LKjAW0TDPMs0NMu9bGahp0N8RvkjLVSw9B8kOZgiPqn6vOotGPFgORRfMJGPNXRsHsgvLsbVBriX
-j20S6tISbBLBPnTsBuJGqJaWFrObsaMd+/7aOjo7tHRBZMUW6wkfSfn10b9i1PXRqVMnT546eaLr
-FFddTpw4cRJPdOEun4f09vbJST5zBuV729tvN7V1YNFXnlBPn+GPu5yjOvCUHJX8b+ueuaOVdV4y
-jdKZiAOYZOWegX179+zVy+D6K1RKKisBL5dZcAvFwYP8MdtHZOOMk9tLnNgWV1tbi/0zuPM2hplN
-b9cfq8ciGhbSSksLC0tzc0tzs7Jyc3NwzC2tglTjZQgHn20dHW0iv3r70KG3m1o61Fq33tKOex98
-8AH28GuRx66H1r1zcu/3PNBILeGZsZ8cR/GePbKzIV+4IFAtbqB0HksOVoIQFwIeNsIdQ7yvtkfV
-VCrgppaWpoZa3q+orT1UlJeTU5iTlZ0RH78uOjoMV4pji6y3Ny4Z93sA2yixzx+XKmXlFBaWVRw6
-VIsz1NjQ0NTUcuxtPmhphXd19qjLbsitkG0iaOaxB/vHfX2/dxOb6s9Dzjn27+Purd17sM4ryPr6
-GXMdDS6Mg0oBrRR78CAvg8QlJk5s/8L2qJqa6lps6oUhdnd1tDYBeW9ZBVizsrZuTMxIjA7yvneG
-iLc3LtfxxWVK4UFh0bjQMgMXpOGsFBaVHIJtQKobYRe1tW9jDzgcp7W9u1NfaaTJDLTRtzkabXdC
-u+d+f/r9Hv2Exa2J8Sp5zznMJr3Kg9QnVYsfYQcrbg8S2CUHjabr6vQFvtzlCQWLhrGzBtcRvpST
-k5ORnQgJD/T2DfSdPx/E02bMmD/f19c3LCiIl6NtzC0oKCwE8d9WkBgbobHdncD4p1qh4w5GUUi3
-u3LHPDr9gb46+OOP/+3y5X87Z2n3448/lvuezg0f5kYOXAoFuyZr/kFnZX5+SR2BaeAleIkiGxkP
-I4SJMcs3quCJmkpsaaU9NzXAi50V5WXVpYU5ObnZGVWZcXHRYb7ewMS1WMLq7esbHh4enZiZnZ1d
-UFAqUl16iAI/qKhpwGy/6W2cO2qYvObKlHGgLZMG2Mc0a819+n3t8Z6wtGcxaTjwnvy6OuxfAx93
-sPAysLqWdsBgD59cLwQjrsFXxTRgp3Xl4SOHK/GNBHWHGyrxPkDjhvsAaxtqxH9rD4EX9gz3TYxL
-jPP2DYeCKYEp4aQODAMvjB2XG2ZkIZzVg7a6vqm+Wn4ZMayVuIhjkieVvG8gLEpbGHOLaBr+NJQr
-Gh4Tu2HSxZUlEqUkXgGWnLxCqBGBpAFmi7gkmxnxkrrGU+1ZbT588CBOQUMLshbc2UlFN9VWFOW9
-VFqalZGbszE3MyP7wIGUlJRw38A4/PgGBuLWOzyaF1hGr4tXwIXV1HJ9fXU1Y/s/IdMhaDFuQ6hh
-K1h3u0UqO6U9ZBvg07//PSL2+MD7iisBmr9PuSqUB7U5hZrRqbKyEcBUpexH1lt0DztxgRgvEwMp
-2Buc5QBuqK2p+NkvjlWIpRbkZmQkZiYGBYZ7zw+Mg137hoeFhc8PnO8dGJSSmR2fkZuRzZgFFdfX
-H1OiclMTkzuzu/B+oK+v0pnIM1R7pic78Pi8CFosK3hdAD47LBVXopeUy4ZkAlPZkn7grFAw9yKz
-DuFJgRM7efnjkZaWZnw1Q0NTW1dXW21RXjUgSpGSsjPgrHFxYSkpCFze3nHe86FlKDwuMTMzMzG7
-CkELqq2GhpmSqV9kZOgWfxGrJGIJsJu42e84ydgAq9A1jkGfPw8flrJiH/EaGiqxKxX797BNU12D
-73QW80au7QTvEbiy83BDM3QL7cLEcVddgYAgXVHxM3xmRK2crNycjMR4P34pDQI0eH19Z+BPYHgg
-w3RYYiIyNDVcimv+tYbbRMP/0tnZZWo3Rfw/AB6X97yDyqo7UudETjkIAhBzu3FJOWsr7k8tASrK
-i7pftx+HRR+urEWwovP+FldRwCKcFU6EM9ScdOJf/Gz/LkStwsLc3Ox1SMJ+APX2nT/DNzww0HsG
-jNs70NvbLygxsSA7Y2t2ThZsobQMPxWHKip+BV54bxu0S0V3/FaCVs8HuBF7Fl3TpPUpGPcIDeN5
-N/1qPZ/nkWHaIZUUwk4dMOnGkn8BakJ0o0SuujoGbxg1HJbvgjWrq9SPwMTxBlg5q6zq2vp6cBQi
-bGXHR4eFJ4bN90VK8g4MnOEbBwf2jguLTkyMjs7ILS2oKhAHrmaUNkat7VpHrQ5qWOK04bwFkzaJ
-2F2/LDmE97yDe8hRb6gojZ1mJdiayi3Wsj0X8M11CFoAZpw6cqSl3Xg8Xb65QeUomIOzxMkwXUun
-hBcX5OYmZieGBXqLehGnM+MyUYHMCAz384uGRWdszICScyTAceuaDVmSEtSLHwK7Mf53gaXG0sBy
-PQRqaRZXJagx9jsbasp5N3+/04kNudiZXFxewxwMBcsOexzQN3W041SI38ME6mrKGypqGyuKyvLK
-ELUyMnI3xieGBUG3LCt9A+fPmDZtflyKr+9837jExBSoPwydRBaAC6nfpmP1hyRu/RMtuqMTbRer
-LPSrMFCJzLgc1pjyeJ2Deo01iBQhSpQxk9TAst91HCw+iOLJyQ8vgsvOoURsTEWsQvSqRG1dgifl
-8ntm3BZpE48fxyXIHYhYRxpg2C0drKOh3tpfoNDKytm4ZiNKi+gwpN5wmDT/hgMd1QdSMmJWdPbR
-o0ercnPow4XoqyqwS6+CJSaIuwDaJZFLhWkt44TkcXKSBiaqAZZO0tg3TZotbgvzq1P1By3NDbj2
-vMHZgDgk7snCAxd3qeISeLhtRlNMB+Y39eH8NLS0t7Y0tdSWs1JCoVVamJFbkJgYFpaZmZIZDd+d
-4R0dGBgYFgjmuDA8V3W0oKAgO6e0/ujRE/Unz/Z3nUCDjKzW1vpPaEMkLbGcFmB68C3Qav1KAS14
-p09bqsUQQw8z0BM7VAV1+PDxZsBAfUyyTqSd8po67DZHvcnspFiZpZGWKgF8vJnfQECfRhSTzNzU
-UVtU2wQXVh6cnZ17ALl3frjvDF5kiOQEbARpWDmah/iMjfjWkizUoFtzCotKDyE9MQA0NjWi0aQL
-txtgtsW3BCz2bKpJqbM0sDT+mNvIGADAEnCpLqQa3qisW1PD73uCH1O7ChgBGp1SHd4Ciz5S13y8
-HaenvQO3Lah7O5o6Git+UVtUBIsurYLBolsK9A2Pi0sJhCnP9/MNjA4P9w6MjoNro2GKz5DmgYUl
-slgZAnxTvQA3qJhlB74lXuXARr0ANlYMc2bEMlaNwgPX+LDb12ONfa9Aq7zqvhbVUwN+oFLmZERs
-tg51RzjyQQFSqfriugYMQaR/qObMo2J/XhmAC7Lj41MSs1MC41LiwsLRI2Vmh/uFB4Z5B4aHBQZ5
-hxXkJuauk344JweJrBpfO9TUCYuGTbf8FqVHZ0d7u8nDpti6bv61Ggb3ftDUWX0a2MrDUmlV1qEX
-oCA4C11JiSgaps1rSKDxSsQrpGzkbCZeEYna8h05sGrA1qB3gIa35uSgkEKDEA6doqxkJzxtGq6e
-vQsuzEyMfJWBajojoxABbivtGcBt0i01Yhc4IlanSkzj1JZjvdmEZtP/2oKVcWL68DmZcdGH0eyg
-dkLVAVA0ECib8PGRZ5BvnHWtzZU18r0KdbTqBpgxbJim3Nzc3dF+HJ7MPMxUXdNSUdtUsb+sOicj
-4wG/+PjoIAStQERn5qVp07zDUqLROsyHYUcHhWXmblyTHb9uKyYjiHCFpWVlyErH2o4xL3EuqALX
-LfGKKeucdJ12wT0vOWCdYqsIRfBi6kz1v9Ag0jE9XF3ihszEk3AYrMeRg42aGbFbGtBr7M1nkD5U
-VpqF76ZggM5k1wCBhjHfQesgbTEmAn7zo8MysquOVpWWolE6wb/V9SfYOuCHIzzBbUfZIdn0ZiH6
-YxWf3HoFmw/bcZmTHQy9knLFaC1xQuuqMWajhFaCFRV/mllztRyHlnkS2tsZ4ivrGls6W9u6jhUV
-1WMmWYpK+t7EuDB2C94zfKO9p+ELHGZMwzAANWZgWHTm0QOnjh49dTQro7Qa8y8E6rw8JGLMijjf
-EWtWnf/NWHWBMRZ4/L5BzbSYgNEs7UYhfZDDHDFnHNkviQBaNUuYCbCPhPHDGo4foX03o9egTQC4
-Jn9vEUY1TfXUHEJ0bmZieDjrZ+n/MeaZMW0+iktfdIyJ2dEHkIYz1q3LQLVVWHqMpYc0iE24BBoj
-rVY93vkAA6ubJiVtyON2gxa4HvBwxCMzHQIiJrGcxpVeaInl4kV2xnRS9A/w0xrEJ9RfTF7MQ6gs
-ZXQJYrxcU1HkrK2ordi2+skns7auyShYh9YwDHUW53e+0XEpmXFoDNkqZmYeQB8VvTE3G1E6K4uF
-ForR6mOc8TRhPIaCR7Qss50P8B0rplCUsMtJhowzdEt0vb7XrmIFK9UHKy0WS/wyKnR4zMLFlTWN
-zfxGELlGFffpvByASPcgRq9iNDN2A5R8pJ0fqaejtrWpKK+svqk0a2NOKeYZ+N6ouOwDmXGBKSko
-s+JSDmSmpKCgPICxQHRYGPJwbkFp1pMIXLzqBdEddUcT5jtwYsuk3RMwVWih2oHHsV/bU1aRpYkd
-TEVcUniF7S/aJl7Lx6JjP7/SCYJ6UzrFCsRrxjT9zWUt4EfEZnUJBWO8U40PXA1frC0t3bout2Dd
-yqAgP3wNSSAG8KiufH2DcDMfSvbGnaCw7I2rN+YUlB49cepfT508dfbiZ3/qxbpLV0dHV3cPLhIx
-/e+4R2rVlXxMvnU/ugK2XGAhS2SK2MFBO78YVTqfluPNtG5evMighRKagioTIZvlBVWLaovUaB1Y
-SjN4l5dUwh7zdhVV5L2Ul1WYk5sbH5ZYVXUgJcjbjz0h0tIMNBAI1tFBQd5Bfhh2wcnNpBY+3IVQ
-XY+JR2tbTy+WlnoI7CFqKKdsWTR9Y726XjUGrag1MCAPSjpmpSyUOmIxgvFEwNhxAtD11sgoS5WV
-R+jax9EcOp1wc4RZtDvV9cjDBbnrUC8nZqZwpIN8BBUzGQN5Gpk5tgyKD1qzMZcjbPwtK8orqq9F
-VqptpEkjJ6mFJZtJu+ZT/1VgV/WhgfG5aakNzZKI6pppwJha4lBejBLL6Wzu7GzGSAPlB6Y4rawG
-8F//AHNjfCRwo0yBfTS1bUMSbSp6KQuTjLDs3Gg/b+Qgtv9xcXEYXWZmhs8PwhQTagavXxD6w6qM
-0owMRPTC6sKi+op6uATSeUObRKzO7l5VUn74volZur2VNbPxxnNGp57RWhm0mLQMARwy1IE/thxB
-+EURAlZqsmZfiUy7GpCKmjs6WxCziOwspz0jHzUwjsKHG9q5ytIIWtTC9UWFhQVBmZlhGFuFoe4I
-PBAXjrk02kGmXcwrEzMPVB04cCA7MR6lR3ZB9saMwnqqGENaWTvt6T0jK4e9p8/0KaoxDb2r/bvO
-YNLD1m3AsOiByw7MpUnqZAWFUtHZ2iKjdoxsUDCqL+5CocGhAImRingWOMuS0R37Ky6xICOh6Kgv
-O1RalXu0KhNmm4nWH86bwuoKo51sgLL6Olp1oOoU5eip3I0FBUdPHTuG1ZbqtjbwcqFYFuRxzVrv
-eGuiN9Ls9XzaAJ/TDaJDl8ZCJKSsLFBXtzTW1DS2NDLzIqY1chyL/AsR+MNO0B5nvdXYyFW02tqT
-bce6UCIWZmOUUZXpHZQZzlWHwOwDGOlkh6NL8p6BiBUuPhzk90D0QnRUGQ9gOI2F5EOF9VxRa+IS
-OxXM6lKZMutkWRUUS/4fA1PD0KWM8AQVOQgTrfLKhpYOBC9nc3sr41UzgkhHJ/ZDYKqDNSfdPstX
-ELa01HHFgXKoouglGGjGOqwchfkFFSDfIm6hyogOCo/OPpAdGI3aer53IgqtggPsmBMTM4IwnS7F
-eLqsOq8ea66yiQB7AriCbZvXScWhfzwUefNzYDSs5gCYadVKYj3ScBgTDck6qBObsa50BD6KvrQV
-Y/fWjm4kijN9Pe1waDxHo0dygsoBDLW0dfV0dZXUVuTt2pWzMf6BjblrHgiK37oOPaD3jLDAMD+s
-tMyY4cUF4vnhmeHeSNBBfuiLE2UOUIQxAMbx1QhaLWyVWE7DjhgdrVCtaVWtpZFv8fiJTsMDn6j9
-IpcdHccZqY53qIqCi7Oou1rhq7RnxOo6zicbW7vbW1FdYtpViTPQ8cG586JuNo4NtQ2tnW1N1Sfa
-urCZ41jO0VMnUE8fpZdCjUcLDmQm+mEakIiKOjwlDmVWRiJWWw5A5xkFR6uqCg+htsT60smuti5c
-lsp9Irw8VXVK58wUUpBvHJ71iZCNHJ988ol6+An31elWGFuSCCzLCRhPQl2HOd1CvSxTLA5fm7vP
-nDvdA4eCatEZ9Z67fPk8MNkPH5fFtfb2zlY0hw2NFXlNx4oOoc9Dy1dfWliVlYG5c1VGxjr4rd/8
-+UFB4YlxKSkYY94b5IcJfWLYuuyjD+RWYa6VtZUrakVFXawtsf7IzqG3DzNRrrLQg3Ve4liOg5ub
-+bHaujKggF24AwhayqR///u+07/FF6C2IzU1QNNQXEc348Ppc93tHTKglAUewPKfOI2BooyykD46
-O3tP98K1EVt7O/n10FhFy6nP2bpxzZO5pRvj4/28sRgcl3kgPHAammJYtN+9C6PXPRC0Dhtbskur
-CgsKc+M3rvPfWl3GNguJjVdX45/FyLLn9Lm+08hOvb2duntQW1OuK1qj584x20ratbcMGHWoBgLA
-3NWA2TQmAMc/6D59+fNP+ro5iaxsroPBtiN6ocJg4cMeoQcvtXPixPKjt7uTQbsTKseqbm15UZls
-z6kqLD1ayE0rGZnZLDe8vcPC0TeEYT0cX0UblFG1zm8NBnhYKsXSUn3p0SfXVWMDU9uv2Pw3YebR
-2NIBUEyizkDN3DN2GqD8uTGwdSZU1ewSs2FJ2/VlpCUskmE4d7y5/bfHj2OUwdXB9uMtdZxtIAbz
-fxMj87ojSNOoTBpaYdPIT8RE8GpEAEfp0Vhbi+lO4dasjHVPFqIjrjq6EfknLIz9Aia1GFweQGSm
-X586dQJbmDKeXL2xsOvUicKsevjwoYqyWpSnCNMnu3p6z+FiYpiT3qZl7cm6oYJdmtfAFrUycWDr
-owNroJRmbGY4/lt4DBMtFhMrVV6WhXAsEhKb29PwEh/ze9rg7vDs1vaWRn5xGTp/TC/wZfeFOVuf
-zCgogIYT41BrcVdLeFjmAdRahD31hxOn/sCyoxQ3Z9EonTpxFlvz+nE5+fnzfX3959VOQJgyj4AV
-xULLN+oVJEThRgQmrdoEE6tce9LUxjRMmlFiHT/+2+4OKBhaRG2NZ9phqVK/m40lzawyjrd3QK88
-F2yccC5au1FXckbRWvtPtSfq608A4Gw9Q1ZiPDbxhGdCsVVV2PtwICUxAyXWiaNHS0txm0XgU8cK
-j57IOtbVBc4z0GpfD2osJEOsKfUwbsj+PMaPG+IyNkk81sAAvSzx2E2x1hOYWiKnVh58FU58EBrs
-wLqv9BJ4jKKjo7sJpwHoHcdBzgl5N4NWS3MjsxjG5p3dSCZ9uOq/p7/2GMZTVbXVhaVVpVhZCEvJ
-zYyePyOc/W/4/Bl+M+7l/8Zkzeo1G0u3bl1TuAurDuv8MwrLuo4dehtdP054SwsiFoIDNHumD0dx
-YfQQwuuZd2ERIub5TzQS9hpyGyx3+3LTL/Z/q4swzOv/D3mjupvCJFLWAAAAAElFTkSuQmCC'/>
-<saf:endOfStream ref='Stream1'/>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='svg-root' viewport-fill='rgb(128,0,128)' height='100%' preserveAspectRatio='none' viewBox='0 0 480 360' width='100%'>
-<image id='image1PNG' xlink:actuate='onLoad' xlink:href='stream:Stream1' xlink:show='embed' xlink:type='simple' height='150' lsr:transformBehavior='pinned' width='240' x='120' y='75'/>
-<image id='image2PNG' xlink:href='stream:Stream1' height='75' opacity='0.4272461' lsr:transformBehavior='pinned_180' type='image/png' width='120' x='120' y='226'/>
-<path fill='rgb(0,128,0)' stroke='rgb(0,128,0)' d='M 250 130 l 100 200 l 100 -200 z'/>
-<image id='image3PNG' xlink:href='stream:Stream1' height='150' type='image/png' width='120' x='275' y='200'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_line_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_line_parsing2.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_linearGradient_bbox.xml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-         <g id="defs" display="none">
-	          <radialGradient id="MyGradient" stop-color="lime" stop-opacity="0.8" gradientUnits="objectBoundingBox" cx="12.2" cy="20.32" r ="15.2">
-              <stop offset="0" stop-opacity="1" stop-color="#FF0000" />
-              <stop offset="0.5" stop-opacity="1" stop-color="#00FF00" />
-              <stop offset="1" stop-opacity="1" stop-color="#0000FF" />
-            </radialGradient>
-         </g>
-
-         <rect fill="url(#MyGradient)" stroke="red" stroke-opacity="0.5" stroke-width="5"  
-               x="10" y="10" width="150" height="100"/>            
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_linearGradient_bbox2.xml Deleted

@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='defs' display='none'>
-<radialGradient id='MyGradient' stop-color='rgb(0,255,0)' stop-opacity='0.79589844' cx='12.1953125' cy='20.3125' gradientUnits='objectBoundingBox' r='15.1953125'>
-<stop stop-color='rgb(255,0,0)' stop-opacity='1' offset='0'/>
-<stop stop-color='rgb(0,255,0)' stop-opacity='1' offset='0.5'/>
-<stop stop-color='rgb(0,0,255)' stop-opacity='1' offset='1'/>
-</radialGradient>
-</g>
-<rect fill='url(#MyGradient)' stroke='rgb(255,0,0)' stroke-opacity='0.49780273' stroke-width='5' height='100' width='150' x='10' y='10'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_linearGradient_userSpace.xml Deleted

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 800 400" width="100%" height="100%">
-
-         <g stop-color="#0000FF" stroke="red">
-        
-            <rect fill="url(#MyGradient)" stroke="black" stroke-width="5" x="100" y="100" width="600" height="100"/>
-            
-            <use xlink:href="#group" x="50" y="200" stop-color="#FF0000" stroke="blue"/>
-            
-            <g id="group" display="inline" stop-color="inherit">
-               <g transform="translate(500, 0)" stop-color="inherit">
-                  <radialGradient id="MyGradient" stop-color="inherit" gradientUnits="userSpaceOnUse" cx="12.2" cy="20.32" r ="15.2">
-                  <stop offset="0" stop-color="inherit" />
-                  <stop offset="1" stop-color="#00FF00" />
-                  </radialGradient>
-               </g>
-                  <rect fill="url(#MyGradient)" stroke-width="5" x="100" y="0" width="600" height="100"/>
-            </g>
-
-        </g>
-        
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_linearGradient_userSpace2.xml Deleted

@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='100%' viewBox='0 0 800 400' width='100%'>
-<g stop-color='rgb(0,0,255)' stroke='rgb(255,0,0)'>
-<rect fill='url(#MyGradient)' stroke='rgb(0,0,0)' stroke-width='5' height='100' width='600' x='100' y='100'/>
-<use stop-color='rgb(255,0,0)' stroke='rgb(0,0,255)' xlink:href='#group' x='50' y='200'/>
-<g id='group' display='inline' stop-color='inherit'>
-<g stop-color='inherit' lsr:translation='500 0'>
-<radialGradient id='MyGradient' stop-color='inherit' cx='12.1953125' cy='20.3125' gradientUnits='userSpaceOnUse' r='15.1953125'>
-<stop stop-color='inherit' offset='0'/>
-<stop stop-color='rgb(0,255,0)' offset='1'/>
-</radialGradient>
-</g>
-<rect fill='url(#MyGradient)' stroke-width='5' height='100' width='600' x='100' y='0'/>
-</g>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_metadata_parsing.xml Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-
-				    <metadata>Metadata taratata!</metadata>
-
-						
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_path_parsing.xml Deleted

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-		<lsr:NewScene>
-				<svg zoomAndPan="magnify" id="svg-root" width="100%" height="100%" viewBox="0 0 480 360" preserveAspectRatio="xMidYMid meet">
-						<g id="test-body-content">
-
-								
-						    <path d="M 10,5.2 L 399.23,5.8 V 30.23 v -20.23 L 450,100 H 500 h -40 v -50" fill-rule="evenodd" fill="none" stroke="black"/>
-
-								
-								<path fill="#ff0" stroke="black" d="M 74.9,86.1 c 7.4 -4.2,13.4 -10,17.8 -17.3 c -8,4.9 -16.7,7.4 -26.2,7.4
-																c -3.1,0 -6.4 -0.4 -9.7 -1.1 c -3.4,3.2 -8.2,4.9 -14.4,5.1 c -0.9,0 -1.4 -0.3 -1.6 -0.8
-                                c -0.1 -0.6,0.3 -0.9,1.3 -1 c 4.2 -0.3,7.3 -2,9.1 -4.9 c -2.7 -1.1 -5.5 -2.3 -8.2 -3.9
-  															c -1.4 -1 -2.3 -1.7 -2.6 -2.2 c -0.5 -0.8 -0.3 -1.6,0.4 -2.6 c 1.4 -1.9,2.4 -3.4,2.9 -4.7
-                                c 0.4 -1.3,0.4 -1.9 -0.2 -1.8 c -2.5,0.8 -4.7,1.3 -6.4,1.4 c -2.9,0.2 -5.9 -0.6 -8.8 -2.6
-                                C 20.8,48,17,38.2,17,27.7 c 0 -11,2.3 -20.3,6.9 -27.7 C 16.6,4.5,10.8,10.5,6.6,17.9
-                                C 2.2,25.5,0,33.8,0,42.7 C 0,56.5,4.9,68.3,14.7,78 c 9.7,9.8,21.5,14.7,35.3,14.7
-                                c 8.9,0,17.2 -2.2,24.9 -6.6 z"/>
-
-								
-						    <path id="X_curve_MCSmcs" fill="rgb(255,0,0)" stroke="rgb(0,192,0)" d="M 210 130 C 145 130 110 80 110 80 S 75 25 10 25 m 0 105 c 65 0 100 -50 100 -50 s 35 -55 100 -55"/>
-						    <path id="Infinity_McccCz" fill="none" stroke="rgb(0,0,0)" d="M 240 90 c 0 30 7 50 50 0 c 43 -50 50 -30 50 0 c 0 83 -68 -34 -90 -30 C 240 60 240 90 240 90 z"/>
-						    <path id="Line_MCZ" fill="none" stroke="rgb(0,0,0)" d="M 80 170 C 100 170 160 170 180 170 Z"/>
-						    <path id="Inv_V_MCcZ" fill="rgb(0,192,0)" stroke="none" d="M 5 260 C 40 260 60 175 55 160 c -5 15 15 100 50 100 Z"/>
-						    <path id="Rem_Rib_mcs" fill="none" stroke="rgb(0,0,0)" d="m 200 260 c 50 -40 50 -100 25 -100 s -25 60 25 100"/>
-						    <path id="Arc_MC" fill="rgb(0,0,255)" stroke="rgb(0,0,0)" d="M 360 100 C 420 90 460 140 450 190"/>
-						    <path id="Circle_Mcssz" fill="rgb(255,255,0)" stroke="rgb(0,0,0)" d="M 360 210 c 0 20 -16 36 -36 36 s -36 -16 -36 -36 s 16 -36 36 -36 s 36 16 36 36 z"/>
-						    <path id="Horseshoe_Mcs" fill="rgb(240,240,240)" stroke="rgb(255,0,0)" d="m 360 325 c -40 -60 95 -100 80 0 z"/>
-					  </g>
-				</svg>
-		</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_path_parsing2.xml Deleted

@@ -1,25 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='svg-root' height='100%' preserveAspectRatio='xMidYMid' viewBox='0 0 480 360' width='100%'>
-<g id='test-body-content'>
-<path fill='none' fill-rule='evenodd' stroke='rgb(0,0,0)' d='M 10 5.203125 L 399.22656 5.796875 V 30.226562 v -20.226562 L 450 100 H 500 h -40 v -50'/>
-<path fill='rgb(240,240,0)' stroke='rgb(0,0,0)' d='M 74.89844 86.10156 c 7.3984375 -4.203125 13.3984375 -10 17.796875 -17.296875 c -8 4.8984375 -16.703125 7.3984375 -26.203125 7.3984375 c -3.1015625 0 -6.3984375 -0.3984375 -9.703125 -1.1015625 c -3.3984375 3.203125 -8.203125 4.8984375 -14.3984375 5.1015625 c -0.8984375 0 -1.3984375 -0.296875 -1.6015625 -0.796875 c -0.1015625 -0.6015625 0.296875 -0.8984375 1.296875 -1 c 4.203125 -0.296875 7.296875 -2 9.1015625 -4.8984375 c -2.703125 -1.1015625 -5.5 -2.296875 -8.203125 -3.8984375 c -1.3984375 -1 -2.296875 -1.703125 -2.6015625 -2.203125 c -0.5 -0.796875 -0.296875 -1.6015625 0.3984375 -2.6015625 c 1.3984375 -1.8984375 2.3984375 -3.3984375 2.8984375 -4.703125 c 0.3984375 -1.296875 0.3984375 -1.8984375 -0.203125 -1.796875 c -2.5 0.796875 -4.703125 1.296875 -6.3984375 1.3984375 c -2.8984375 0.203125 -5.8984375 -0.6015625 -8.796875 -2.6015625 C 20.796875 48 17 38.203125 17 27.703125 c 0 -11 2.296875 -20.296875 6.8984375 -27.703125 C 16.601562 4.5 10.796875 10.5 6.6015625 17.898438 C 2.203125 25.5 0 33.796875 0 42.703125 C 0 56.5 4.8984375 68.296875 14.703125 78 c 9.703125 9.796875 21.5 14.703125 35.296875 14.703125 c 8.8984375 0 17.203125 -2.203125 24.898438 -6.6015625 z'/>
-<path id='X_curve_MCSmcs' fill='rgb(255,0,0)' stroke='rgb(0,192,0)' d='M 210 130 C 145 130 110 80 110 80 S 75 25 10 25 m 0 105 c 65 0 100 -50 100 -50 s 35 -55 100 -55'/>
-<path id='Infinity_McccCz' fill='none' stroke='rgb(0,0,0)' d='M 240 90 c 0 30 7 50 50 0 c 43 -50 50 -30 50 0 c 0 83 -68 -34 -90 -30 C 240 60 240 90 240 90 z'/>
-<path id='Line_MCZ' fill='none' stroke='rgb(0,0,0)' d='M 80 170 C 100 170 160 170 180 170 Z'/>
-<path id='Inv_V_MCcZ' fill='rgb(0,192,0)' stroke='none' d='M 5 260 C 40 260 60 175 55 160 c -5 15 15 100 50 100 Z'/>
-<path id='Rem_Rib_mcs' fill='none' stroke='rgb(0,0,0)' d='M 200 260 c 50 -40 50 -100 25 -100 s -25 60 25 100'/>
-<path id='Arc_MC' fill='rgb(0,0,255)' stroke='rgb(0,0,0)' d='M 360 100 C 420 90 460 140 450 190'/>
-<path id='Circle_Mcssz' fill='rgb(255,255,0)' stroke='rgb(0,0,0)' d='M 360 210 c 0 20 -16 36 -36 36 s -36 -16 -36 -36 s 16 -36 36 -36 s 36 16 36 36 z'/>
-<path id='Horseshoe_Mcs' fill='rgb(240,240,240)' stroke='rgb(255,0,0)' d='M 360 325 c -40 -60 95 -100 80 0 z'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_polygon_parsing.xml Deleted

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208">
-
-          
-     			<polygon id="my_polygon1a" stroke-width="3"  fill="red" stroke="blue" points="9.8111 109.8111  133.333 109.8111"/>
-
-          
-     			<polygon id="my_polygon1b" stroke-width="1"  fill="red" stroke="blue" points="-9.8111 129.8111  60 160  133.333 129.8111"/>
-
-          
-     			<polygon id="my_polygon1b0" stroke-width="0.5"  fill="none" stroke="green" points="-9.8111 199.8111  60 140  133.333 199.8111"/>
-
-          
-					<polygon   points="0.821 17.944 18.144 26.249 4.411 35.786 25.135 53.277 12.816 37.687 30.72 26.208 14.481 16.742 35.137 0.702 16.646 0.502 " id="Polygon_34" fill="rgb(255  238  0)" stroke="rgb(247  193  63)" display="inline">
-					</polygon> 
-
-          
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_polygon_parsing2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<polygon id='my_polygon1a' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' stroke-width='3' points='9.8125 109.8125 133.33594 109.8125'/>
-<polygon id='my_polygon1b' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' stroke-width='1' points='-9.8125 129.8125 60 160 133.33594 129.8125'/>
-<polygon id='my_polygon1b0' fill='none' stroke='rgb(0,128,0)' stroke-width='0.5' points='-9.8125 199.8125 60 140 133.33594 199.8125'/>
-<polygon id='Polygon_34' display='inline' fill='rgb(255,238,0)' stroke='rgb(247,193,63)' points='0.8203125 17.945312 18.140625 26.25 4.4140625 35.789062 25.132812 53.273438 12.8125 37.6875 30.71875 26.210938 14.484375 16.742188 35.140625 0.703125 16.648438 0.5'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_polyline_parsing.xml Deleted

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208">
-
-          
-     			<polyline id="my_polyline1a" stroke-width="3"  fill="red" stroke="blue" points="9.8111 109.8111  133.333 109.8111"/>
-
-          
-     			<polyline id="my_polyline1b" stroke-width="1"  fill="red" stroke="blue" points="-9.8111 129.8111  60 160  133.333 129.8111"/>
-
-          
-     			<polyline id="my_polyline1b0" stroke-width="0.5"  fill="none" stroke="green" points="-9.8111 199.8111  60 140  133.333 199.8111"/>
-
-          
-					<polyline   points="0.821 17.944 18.144 26.249 4.411 35.786 25.135 53.277 12.816 37.687 30.72 26.208 14.481 16.742 35.137 0.702 16.646 0.502 " id="Polyline_34" stroke="rgb(247  193  63)" fill="none" display="inline">
-					</polyline> 
-
-          
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_polyline_parsing2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' height='100%' viewBox='0 0 176 208' width='176'>
-<polyline id='my_polyline1a' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' stroke-width='3' points='9.8125 109.8125 133.33594 109.8125'/>
-<polyline id='my_polyline1b' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' stroke-width='1' points='-9.8125 129.8125 60 160 133.33594 129.8125'/>
-<polyline id='my_polyline1b0' fill='none' stroke='rgb(0,128,0)' stroke-width='0.5' points='-9.8125 199.8125 60 140 133.33594 199.8125'/>
-<polyline id='Polyline_34' display='inline' fill='none' stroke='rgb(247,193,63)' points='0.8203125 17.945312 18.140625 26.25 4.4140625 35.789062 25.132812 53.273438 12.8125 37.6875 30.71875 26.210938 14.484375 16.742188 35.140625 0.703125 16.648438 0.5'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_rect_parsing.xml Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19" 
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" preserveAspectRatio="xMinYMax meet" baseProfile="tiny" version="1.2"
-           fill="purple" stroke="none"  contentScriptType="application/ecmascript" externalResourcesRequired="false" playbackOrder="forwardOnly"
-           snapshotTime="1000" syncBehaviorDefault="locked" syncToleranceDefault="500" timelineBegin="onStart" zoomAndPan="disable"
-           audio-level="0.5" color="none" color-rendering="optimizeQuality" display="inline" display-align="center" fill-opacity="0.8"
-           fill-rule="nonzero" image-rendering="optimizeSpeed" line-increment="2" pointer-events="visiblePainted" shape-rendering="optimizeSpeed"
-           solid-color="blue" solid-opacity="0.5" stop-color="aqua" stop-opacity="0.6"           
-           stroke-dasharray="0.2 -1 3" stroke-dashoffset="0.5" stroke-linecap="butt"
-           stroke-linejoin="bevel" stroke-miterlimit="2" stroke-opacity="0.9" stroke-width="1" text-anchor="middle" text-rendering="optimizeLegibility"
-           viewport-fill="rgb(200,200,200)" viewport-fill-opacity="1" vector-effect="non-scaling-stroke" visibility="visible"
-           xml:base="http://www.streamezzo.com" xml:lang="fr" xml:space="preserve"     
-           font-variant="small-caps" font-family="Arial" font-size="12" font-style="italic" font-weight="bold">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" x="10.5" y="-1" width="100" height="140.5" rx="10.23" ry="12"
-               requiredExtensions="http://www.streamezzo.com/extensions/stz4AC http://www.streamezzo.com/extensions/stz4AD"
-               requiredFeatures="http://www.w3.org/TR/SVGTiny12/feature#Shape"
-               requiredFormats="image/png script(application/laserscript)"
-               systemLanguage="en,it,fr-CA"
-               solid-color="currentColor" solid-opacity="0.5"
-               focusable="true"
-               nav-next="#my_group"
-               nav-prev="#my_rect"
-               nav-up="#my_rect"
-               nav-up-right="#my_group"
-               nav-up-left="#my_rect"
-               nav-down="#root_node"
-               nav-down-right="#my_rect"
-               nav-down-left="#my_group"
-               nav-left="#my_rect"
-               nav-right="#my_group"
-               transform="matrix(2, -1.3, 2, 7.1, 10, -5.123)"/>
-
-         <rect id="my_rect2" fill="purple" stroke="none" x="0" y="-10" width="50" height="100"/>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_rect_parsing2.xml Deleted

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg contentScriptType='application/ecmascript' id='root_node' audio-level='0.49780273' color='none' color-rendering='optimizeQuality' display='inline' display-align='center' fill='rgb(128,0,128)' fill-opacity='0.79589844' fill-rule='nonzero' font-family='Arial' font-size='12' font-style='italic' font-weight='bold' image-rendering='optimizeSpeed' pointer-events='visiblePainted' shape-rendering='optimizeSpeed' stop-color='rgb(0,255,255)' stop-opacity='0.59594727' stroke='none' stroke-dasharray='0.19921875 -1 3' stroke-dashoffset='0.5' stroke-linecap='butt' stroke-linejoin='bevel' stroke-miterlimit='2' stroke-opacity='0.8979492' stroke-width='1' text-anchor='middle' text-rendering='optimizeLegibility' vector-effect='non-scaling-stroke' visibility='visible' height='100%' preserveAspectRatio='xMinYMax' syncBehaviorDefault='locked' syncToleranceDefault='500.00098' viewBox='0 0 176 208' viewport-fill='rgb(200,200,200)' viewport-fill-opacity='1' width='176' zoomAndPan='disable' xml:base='http://www.streamezzo.com' xml:lang='fr' xml:space='preserve'>
-<rect id='my_rect' fill='rgb(255,0,0)' focusable='true' nav-next='#3' nav-prev='#my_rect' nav-up='#my_rect' nav-down='#root_node' nav-up-right='#3' nav-down-right='#my_rect' nav-up-left='#my_rect' nav-down-left='#3' nav-right='#3' nav-left='#my_rect' stroke='rgb(128,20,98)' requiredExtensions='http://www.streamezzo.com/extensions/stz4AC http://www.streamezzo.com/extensions/stz4AD' requiredFeatures='http://www.w3.org/TR/SVGTiny12/feature#OpacityAttribute' requiredFormats='image/png script(application/laserscript)' systemLanguage='en,it,fr-CA' transform='matrix(2,-1.3007812,2,7.0976562,10,-5.125)' height='140.5' rx='10.2265625' ry='12' width='100' x='10.5' y='-1'/>
-<rect id='my_rect2' fill='rgb(128,0,128)' stroke='none' height='100' width='50' x='0' y='-10'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_set_color.xml Deleted

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg viewBox="0 0 176 208" width="176" height="208">
-
-			   <g id="root_group" fill="#2288AA" stroke="#AA8822" color="#999999">
-			      <polyline id="my_polyline" stroke-width="4" fill="currentColor" points="10 120 130 120 70 20"/>
-			      <set id="animation" xlink:href="#my_polyline" begin="2" dur="2" restart="never" attributeName="fill" to="#AABBCC"/>
-			   </g>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_set_color2.xml Deleted

@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg height='208' viewBox='0 0 176 208' width='176'>
-<g id='root_group' color='rgb(153,153,153)' fill='rgb(34,136,170)' stroke='rgb(170,136,34)'>
-<polyline id='my_polyline' fill='currentColor' stroke-width='4' points='10 120 130 120 70 20'/>
-<set id='animation' attributeName='fill' begin='2.0009766' dur='2' lsr:enabled='true' restart='never' to='rgb(170,187,204)' xlink:href='#my_polyline'/>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_svg_parsing.xml Deleted

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="0" timeResolution="1000" coordBits="12"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208" preserveAspectRatio="xMinYMax meet" baseProfile="tiny" version="1.2"
-           fill="purple" stroke="none"  contentScriptType="application/ecmascript" externalResourcesRequired="false" playbackOrder="forwardOnly"
-           snapshotTime="1000" syncBehaviorDefault="locked" syncToleranceDefault="0.5" timelineBegin="onStart" zoomAndPan="disable"
-           audio-level="0.5" color="none" color-rendering="optimizeQuality" display="inline" display-align="center" fill-opacity="0.8"
-           fill-rule="nonzero" image-rendering="optimizeSpeed" line-increment="2" pointer-events="visiblePainted" shape-rendering="optimizeSpeed"
-           solid-color="blue" solid-opacity="0.5" stop-color="aqua" stop-opacity="0.6"           
-           stroke-dasharray="0.2 -1 3" stroke-dashoffset="0.5" stroke-linecap="butt"
-           stroke-linejoin="bevel" stroke-miterlimit="2" stroke-opacity="0.9" stroke-width="1" text-anchor="middle" text-rendering="optimizeLegibility"
-           viewport-fill="rgb(200,200,200)" viewport-fill-opacity="1" vector-effect="non-scaling-stroke" visibility="visible"
-           xml:base="http://www.streamezzo.com" xml:lang="fr" xml:space="preserve"     
-           font-variant="small-caps" font-family="Arial" font-size="12" font-style="italic" font-weight="bold">
-
-         <rect id="my_rect" fill="rgb(255,0,0)" stroke="rgb(128,20,98)" x="10" y="20" width="100" height="140"
-               requiredExtensions="http://www.streamezzo.com/extension#stz"
-               requiredFeatures="http://www.w3.org/TR/SVGTiny12/feature#Shape"
-               requiredFormats="image/png"
-               systemLanguage="fr"
-               solid-color="currentColor" solid-opacity="0.5"
-               focusable="true"
-               nav-next="my_rect" nav-up="my_rect" nav-up-right="my_rect" nav-up-left="my_rect" nav-prev="my_rect" nav-down="my_rect"
-               nav-down-right="my_rect" nav-down-left="my_rect" nav-right="my_rect"
-               transform="translate(10,20)"/>
-
-         <g font-family="courier"/>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/laser/stz_svg_parsing2.xml Deleted

@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' coordBits='12' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg contentScriptType='application/ecmascript' id='root_node' audio-level='0.49780273' color='none' color-rendering='optimizeQuality' display='inline' display-align='center' fill='rgb(128,0,128)' fill-opacity='0.79589844' fill-rule='nonzero' font-family='Arial' font-size='12' font-style='italic' font-weight='bold' image-rendering='optimizeSpeed' pointer-events='visiblePainted' shape-rendering='optimizeSpeed' stop-color='rgb(0,255,255)' stop-opacity='0.59594727' stroke='none' stroke-dasharray='0.19921875 -1 3' stroke-dashoffset='0.5' stroke-linecap='butt' stroke-linejoin='bevel' stroke-miterlimit='2' stroke-opacity='0.8979492' stroke-width='1' text-anchor='middle' text-rendering='optimizeLegibility' vector-effect='non-scaling-stroke' visibility='visible' height='100%' preserveAspectRatio='xMinYMax' syncBehaviorDefault='locked' syncToleranceDefault='0.50097656' viewBox='0 0 176 208' viewport-fill='rgb(200,200,200)' viewport-fill-opacity='1' width='176' zoomAndPan='disable' xml:base='http://www.streamezzo.com' xml:lang='fr' xml:space='preserve'>
-<rect id='my_rect' fill='rgb(255,0,0)' focusable='true' nav-next='#my_rect' nav-prev='#my_rect' nav-up='#my_rect' nav-down='#my_rect' nav-up-right='#my_rect' nav-down-right='#my_rect' nav-up-left='#my_rect' nav-down-left='#my_rect' nav-right='#my_rect' stroke='rgb(128,20,98)' requiredFeatures='http://www.w3.org/TR/SVGTiny12/feature#OpacityAttribute' requiredFormats='image/png' systemLanguage='fr' lsr:translation='10 20' height='140' width='100' x='10' y='20'/>
-<g font-family='courier'/>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_switch_parsing.xml Deleted

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-
-				   <switch font-size="12" display-align="after" text-anchor="start" fill="red" transform="translate(50 20)">
-				      <text y="100" systemLanguage="fr">French</text>
-				      <text y="100" systemLanguage="fr-CA">Canadian French</text>
-				      <text y="100" systemLanguage="fr-CH">Swiss French</text>
-				      <text y="100" systemLanguage="en">English</text>
-				      <text y="100" systemLanguage="en-GB">UK English</text>
-				      <text y="100" systemLanguage="en-US">USA english</text>
-				      <text y="100" systemLanguage="en,fr">English or French</text>
-				      <text y="100" systemLanguage="en,es">English or Spain</text>
-				      <text y="100" systemLanguage="fr,it">French or Italian</text>
-				      <text y="100" systemLanguage="de,it">German or Italian</text>
-				   </switch>
-
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_text_parsing.xml Deleted

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-			<g>
-				  <line x1="0" y1="20" x2="200" y2="20" stroke="black"/>
-				  <line x1="20" y1="00" x2="20" y2="200" stroke="black"/>
-
-			
-				  <text id="text0" stroke="red" x="5" y="5" visibility="hidden">A dummy text</text>
-
-			
-				  <text id="text1" stroke="red" x="20 12 13 14" y="20 21 22 23 24" rotate="45 90 135" display-align="center"
-							font-family="Arial" font-size="12" font-style="normal" font-weight="normal" >A dummy text</text>
-
- 			
- 			  <text id="text2" stroke="blue" x="20" y="40" editable="true" text-anchor="start" 
-							font-family="sans-serif" font-size="24" font-style="italic" font-weight="bold" >Click Here</text> 
-
-			
-	     	<text id="text3" stroke="red" y="60" x="40" font-size="8">A <tspan id="tspan" font-size="12" stroke="blue">du<tspan id="tspan2" font-size="20" stroke="green">m</tspan>my</tspan> text.</text>
-      	<text id="text4" text-anchor="middle" editable="true" stroke="black" x="88" y="100" font-size="7">-- Login : <tspan id="tspan3" stroke="red">Click here to edit</tspan> --</text>
-
-			</g>
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_text_parsing2.xml Deleted

@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' height='100%' viewBox='0 0 176 208' width='176'>
-<g>
-<line stroke='rgb(0,0,0)' x1='0' x2='200' y1='20' y2='20'/>
-<line stroke='rgb(0,0,0)' x1='20' x2='20' y1='0' y2='200'/>
-<text id='text0' stroke='rgb(255,0,0)' visibility='hidden' x='5' y='5'>A dummy text</text>
-<text id='text1' display-align='center' font-family='Arial' font-size='12' font-style='normal' font-weight='normal' stroke='rgb(255,0,0)' rotate='45 90 135' x='20 12 13 14' y='20 21 22 23 24'>A dummy text</text>
-<text id='text2' font-family='sans-serif' font-size='24' font-style='italic' font-weight='bold' stroke='rgb(0,0,255)' text-anchor='start' editable='true' x='20' y='40'>Click Here</text>
-<text id='text3' font-size='8' stroke='rgb(255,0,0)' x='40' y='60'>A <tspan id='tspan' font-size='12' stroke='rgb(0,0,255)'>du<tspan id='tspan2' font-size='20' stroke='rgb(0,128,0)'>m</tspan>my</tspan> text.</text>
-<text id='text4' font-size='7' stroke='rgb(0,0,0)' text-anchor='middle' editable='true' x='88' y='100'>-- Login : <tspan id='tspan3' stroke='rgb(255,0,0)'>Click here to edit</tspan> --</text>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_title_parsing.xml Deleted

gpac-0.8.0.tar.gz/tests/media/laser/stz_use_parsing.xml Deleted

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<saf:SAFSession xmlns:saf="urn:mpeg:mpeg4:SAF:2005"  xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:lsr="urn:mpeg:mpeg4:LASeR:2005" xmlns="http://www.w3.org/2000/svg">
-
-<saf:sceneHeader>
-   <lsr:LASeRHeader profile="full" resolution="7" timeResolution="1000" coordBits="19"
-                    colorComponentBits="8"  useFullRequestHost="true"
-                     hasStringIDs="true"/>
-</saf:sceneHeader>
-
-<saf:sceneUnit>
-   <lsr:NewScene>
-      <svg id="root_node" width="176" height="100%" viewBox="0 0 176 208"  fill="red" stroke="blue">
-			<g>
-
-				   <use xlink:href="#my_ellipse" x="60" y="60" lsr:scale="0.5 1" stroke="red" stroke-width="2" overflow="visible"/>
-				   <g stroke="blue">    
-				     <ellipse id="my_ellipse" cx="40" cy="20" rx="20" ry="10" fill="none" />
-				   </g>
-
-			</g>
-      </svg>
-   </lsr:NewScene>
-</saf:sceneUnit>
-
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/stz_use_parsing2.xml Deleted

@@ -1,19 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<saf:SAFSession xmlns:saf='urn:mpeg:mpeg4:SAF:2005' xmlns:lsr='urn:mpeg:mpeg4:LASeR:2005' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:ev='http://www.w3.org/2001/xml-events'>
-<saf:sceneHeader objectTypeIndication='9' streamID='Stream0' streamType='3'>
-<lsr:LASeRHeader colorComponentBits='8' hasStringIDs='true' pointsCodec='ExpGolombPointsCodec' profile='full' timeResolution='1000' resolution='7' coordBits='19' useFullRequestHost='true'/>
-</saf:sceneHeader>
-<saf:sceneUnit ref='Stream0'>
-<lsr:NewScene>
-<svg id='root_node' fill='rgb(255,0,0)' stroke='rgb(0,0,255)' height='100%' viewBox='0 0 176 208' width='176'>
-<g>
-<use stroke='rgb(255,0,0)' stroke-width='2' lsr:scale='0.5 1' xlink:href='#my_ellipse' overflow='visible' x='60' y='60'/>
-<g stroke='rgb(0,0,255)'>
-<ellipse id='my_ellipse' fill='none' cx='40' cy='20' rx='20' ry='10'/>
-</g>
-</g>
-</svg>
-</lsr:NewScene>
-</saf:sceneUnit>
-<saf:endOfSAFSession/>
-</saf:SAFSession>

gpac-0.8.0.tar.gz/tests/media/laser/x_austria_relief.png Deleted

gpac-0.8.0.tar.gz/tests/media/svg Deleted

gpac-0.8.0.tar.gz/tests/media/svg/all_syntaxes_1.1F2.svg Deleted

@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.2" baseProfile="test" 
-     xmlns="http://www.w3.org/2000/svg" 
-     xmlns:ev="http://www.w3.org/2001/xml-events" 
-     xmlns:xlink="http://www.w3.org/1999/xlink" 
-     width="100%" 
-     height="100%" 
-     viewBox="0 0 800 600" 
-     contentScriptType="application/x-myscripttype"
-     contentStyleType="text/x-mystyletype"
-     preserveAspectRatio="none"
-     >
-     
-    <g id="MyId"
-       class="toto" 
-       externalResourcesRequired="true"
-       requiredExtensions="http://example.org/SomeSVGextensions"
-       requiredFeatures="SomeSVGFeatureString"
-       style="aStyle"
-       xml:base="someurl"
-       xml:lang="ita"
-       xml:space="default"
-       
-       alignment-baseline="baseline"
-       baseline-shift="sub"
-       clip-path="none"
-       clip-rule="evenodd"
-       clip="auto"
-       color-interpolation-filters="sRGB"
-       color-interpolation="linearRGB"
-       color-profile="inherit"
-       color-rendering="optimizeSpeed"
-       color="inherit"
-       cursor="crosshair"
-       direction="ltr"
-       display="block"
-       dominant-baseline="use-script"
-       enable-background="accumulate"
-       fill-opacity="0.467"
-       fill-rule="nonzero"
-       fill="red"
-       filter="none"
-       flood-color="currentColor"
-       flood-opacity="0.5"
-       font-family="monospace, Times New Roman"
-       font-size-adjust="none"
-       font-size="10%"
-       font-stretch="condensed"
-       font-style="italic"
-       font-variant="small-caps"
-       font-weight="600"
-       glyph-orientation-horizontal="45"
-       glyph-orientation-vertical="auto"
-       image-rendering="optimizeQuality"
-       kerning="2em"
-       letter-spacing="2cm"
-       lighting-color="inherit"
-       marker-end="none"
-       marker-mid="inherit"
-       marker-start="none"
-       mask="none"
-       opacity="inherit"
-       overflow="hidden"
-       pointer-events="visiblePainted"
-       shape-rendering="crispEdges"
-       stop-color="currentColor"
-       stop-opacity=".9"
-       stroke-dasharray="30 45 5"
-       stroke-dashoffset="34%"
-       stroke-linecap="butt"
-       stroke-linejoin="miter"
-       stroke-miterlimit="4"
-       stroke-opacity="1"
-       stroke-width="34mm"
-       stroke="#000"
-       text-anchor="middle"
-       text-decoration="line-through"
-       text-rendering="optimizeLegibility"
-       unicode-bidi="embed"
-       visibility="collapse"
-       word-spacing="34pt"
-       writing-mode="rl-tb"              
-       />
-    
-    <clipPath clipPathUnits="objectBoundingBox"
-              />
-
-    <set to="34"
-         />
-    
-    <circle cx="4" 
-            cy="1.5"
-            r="1234.5667"
-            />    
-     
-    <ellipse cx="4" 
-             cy="1.5"
-             rx="34.5e-34"
-             rx="-345"
-             />    
-             
-    <marker markerHeight="1234"
-            markerWidth="6789"
-            markerUnits="strokeWidth"
-            orient="auto"
-            refX=".654654"
-            refY="12e4"
-            viewBox="0 0 2 2"
-            />
-            
-    <view viewTarget="aTargetObject"
-          zoomAndPan="disable"
-          />
-
-    <radialGradient cx="4" 
-                    cy="1.5" 
-                    fx="0" 
-                    fy="0"
-                    r="000.0002"
-                    gradientTransform="translate(0, 0)"
-                    gradientUnits="userSpaceOnUse"
-                    spreadMethod="repeat"
-                    xlink:href="Somref"              
-                    />
-    
-    <line x1="45.6" 
-          x2="000" 
-          y1="345" 
-          y2="556"
-          />
-          
-    <linearGradient gradientTransform="scale(0, 0)"
-                    gradientUnits="objectBoudingBox"
-                    spreadMethod="pad"
-                    xlink:href="Somref"              
-                    x1="45.6" 
-                    x2="000" 
-                    y1="345" 
-                    y2="556"
-                    />
-                    
-    <hkern g1="name1, name2 , name3"
-           k="123" 
-           u1="U+0045, U+0067, U+0-7FFFFFFF"
-           />
-    
-    <vkern g2="name1, name2 , name3"
-           u2="U+0-7FFFFFFF, U+0045, U+0067"
-           />
-    
-    <path d="M100,0L300,5z"
-          pathLength="34.56"
-          />
-    
-    <font horiz-adv-x="323"
-          horiz-orig-x="456"
-          horiz-orig-y="789"
-          vert-adv-y="323"
-          vert-orig-x="456"
-          vert-orig-y="789"
-          
-          />
-          
-    <font-face-name name="MyFont"
-                    />
-
-    <font-face-uri xlink:href="Someref"
-                   />
-                    
-    <font-face-format string="aFontFormat"
-                      />
-                          
-    <font-face accent-height="100"
-               font-family="Arial, serif"
-               font-style="all"
-               font-variant="normal"
-               font-weight="all"
-               font-stretch="all"
-               font-size="12"
-               unicode-range="U+0-7FFFFFFF, U+0-7FFFFFFF"
-               units-per-em="2048"
-               panose-1="0 1 2 3 4 5 6 7 8 9"
-               stemv="100"
-               stemh="100"
-               slope="50"
-               cap-height="20"
-               x-height="60"
-               ascent="50"
-               descent="100"
-               alphabetic="0" 
-               bbox="10, 0, 30, 100"
-               hanging="450"
-               ideographic="123"
-               mathematical="456"
-               overline-position="123"
-               overline-thickness="6578"
-               strikethrough-position="345"
-               strikethrough-thickness="900"
-               underline-position="12"
-               underline-thickness="9840"
-               v-alphabetic="42"
-               v-hanging="342"
-               v-ideographic="890"
-               v-mathematical="54657"
-               widths="U+0-7FFFFFFF 0 0 0, U+0-7FFFFFFF 0 0 0"
-               />
-               
-    <animate xlink:href="Somref"
-             attributeName="width" 
-             begin="2" 
-             by="10" 
-             calcMode="discrete" 
-             attributeType="XML" 
-             accumulate="none" 
-             additive="replace"
-             dur="indefinite" 
-             end="indefinite"
-             fill="freeze"
-             from="0" 
-             keySplines="0 0 0 0 0"            
-             keyTimes="0 0 0 0 0" 
-             max="10"
-             min="12"
-             repeatCount="indefinite"
-             repeatDur="124"     
-             restart="always"   
-             to="345"                
-             />
-             
-    <animateTransform type="translate"
-                      values="0,0 34.56 78 4535 677"
-                      />
-             
-    <style media="print"
-           title="aTitle"
-           type="text/css"
-           />
-           
-    <textPath method="align"
-              spacing="exact"
-              startOffset="432"
-              textLength="-0"
-              xlink:href="Somref"
-              />
-             
-    <animateMotion keyPoints="0,0 0"
-                   origin="default"
-                   path="z"
-                   rotate="auto-reverse"
-                   />
-
-    <glyph glyph-name="name1, name2, name3" 
-           arabic-form="initial" 
-           d="M100,0L300,5z"
-           horiz-adv-x="340"
-           lang="fre"
-           orientation="h"
-           unicode="ffl"
-           vert-adv-y="323"
-           vert-orig-x="456"
-           vert-orig-y="789"
-           />
-           
-    <missing-glyph d="M100,0L300,5z"
-                   />
-                   
-    <altGlyph xlink:actuate="onRequest"
-              xlink:show="SomeWord"
-              xlink:href="someref"
-              string="ttttt" 
-              dx="100 0 0 0 0 0" 
-              dy="-2 4" 
-              format="MyFormat"
-              rotate="0 0 0 0 34.5"
-              x="213"            
-              y="213"            
-              />
-
-    <cursor x="213" 
-            y="213" 
-            xlink:href="someref"
-            />
-              
-    <glyphRef x="0.0"
-              y="0.0"
-              string="xxxxxx" 
-              dx="100" 
-              format="embedded-opentype"
-              xlink:href="Somref"
-              />
-    
-    <text lengthAdjust="spacing"
-          dx="100 4 5 6" 
-          dy="0 0 3"
-          rotate="0 0 0 "
-          textLength="2134"
-          x="0 0 0 0"
-          y="0 0"
-          />
-    
-    <tspan dx="100 4 5 6"
-           />
-    
-    <tref xlink:href="Somref"
-          x="45"
-          y="5"
-          dy="4 5 6 7"
-          rotate="324 54356 6757.78 21"
-          />
-    
-    <filter filterRes="40 0" 
-            filterUnits="userSpaceOnUse"
-            height="300"
-            primitiveUnits="objectBoundingBox"
-            width="345"
-            x="0987654.76543e2"
-            y="76543e2"
-            xlink:href="someref"
-            />
-    
-    <foreignObject height="30"
-                   width="345"
-                   x="456.654e-2"
-                   y="-2"
-                   />
-
-    <image x="345"
-           y="134"
-           height="100"
-           width="345"
-           xlink:href="Somref"
-           />
-           
-    <use height="50"
-         width="345"
-         x="0.0"
-         y="0.0"
-         xlink:href="Somref"              
-         />
-                    
-    <rect height="30"
-          rx="3432.67"
-          ry="0"
-          width="345"
-          x="34"
-          y="45"
-          />
-                     
-    <pattern x="1234567"
-             x="23234567"
-             height="100"
-             patternUnits="objectBoundingBox"
-             patternContentUnits="userSpaceOnUse"
-             patternTransform="skewX(50)"
-             />       
-             
-    <polygon points="0 0 0 0"
-             />
-                              
-    <polyline points=".0 0. 0.0 0000.00000"
-              />
-
-    <feFuncA amplitude="100"
-             slope="000"
-             tableValues="4 5 6 7 8"
-             />    
-    
-    <feFuncB exponent="100"
-             type="identity"
-             />    
-
-    <feFuncG intercept="100"
-             />    
-    
-    <feFuncR offset="14"
-             />    
-
-    <feDistantLight azimuth="100"
-                    />    
-    
-    <feTurbulence baseFrequency="100 ,  100"
-                  numOctaves="3"
-                  seed="546788"
-                  stitchTiles="noStitch"
-                  type="fractalNoise"
-                  />
-    
-    <script type="application/ecmascript"
-            xlink:href="Somref"              
-            />
-    
-    <stop offset="2%"
-          />
-          
-    <feConvolveMatrix bias="100" 
-                      divisor="3" 
-                      edgeMode="duplicate"
-                      kernelMatrix="123 54356 76576 879"
-                      kernelUnitLength="12 434"
-                      order="12 0"
-                      preserveAlpha="false"
-                      targetX="0"
-                      targetY="1"
-                      />
-    
-    <feDiffuseLighting diffuseConstant="1e2"
-                       kernelUnitLength="0 0"
-                       surfaceScale="4536.788"
-                       />
-
-    <feSpecularLighting kernelUnitLength="0 0"
-                        specularConstant="3.14"
-                        specularExponent="0.1235689"
-                        surfaceScale="+0.0"
-                        />
-                        
-    <a xlink:actuate="onRequest"
-       xlink:arcrole="SomeRole"
-       xlink:role="SomeRole"
-       xlink:title="SomeTitle"
-       xlink:type="SomeType"
-       xlink:show="SomeWord"
-       xlink:href="someref"
-       systemLanguage="eng"
-       target="_replace"        
-       transform="matrix(0,0,0,0,0,0)"
-       />
-    
-    <feOffset dx="5"
-              />
-        
-    <feBlend x="456.789"
-             y="456.789"
-             height="400"
-             width="345"
-             in="SourceGraphic"
-             in2="SourceAlpha"
-             mode="normal"
-             result="AFilterReference"             
-             />
-             
-    <feComposite in2="BackgroundImage"
-                 k1="25"
-                 k2="54647"
-                 k3="1.34325"
-                 k4="-1245.0987E12"
-                 operator="over"
-                 />
-    
-    <feImage xlink:href="someref"
-             />
-                 
-    <feDisplacementMap in2="BackgroundAlpha"
-                       scale="4324234"
-                       xChannelSelector="R"
-                       yChannelSelector="G"
-                       />
-                       
-    <feMorphology operator="erode"
-                  radius="2313.5567"
-                  />
-
-    <feSpotLight limitingConeAngle="1234"
-                 pointsAtX="324.566"
-                 pointsAtY="1324.566"
-                 pointsAtZ="3524.566"
-                 specularExponent="0.1235689"
-                 x="345.678932"
-                 y="678932"
-                 z="434"
-                 />
-                 
-    <fePointLight x="043245"
-                  y="245"
-                  z="5"
-                  />
-
-    <feGaussianBlur stdDeviation="344 5566"
-                    />
-
-    <feColorMatrix type="saturate"
-                   values="0 345.56 -34.667"
-                    />
-
-    <color-profile local="AnICCUniqueID"
-                   xlink:href="someref"
-                   name="aColorName"
-                   rendering-intent="auto"
-                   />
-                   
-    <mask x="3456"
-          x="7890"
-          height="340"
-          width="345"
-          maskContentUnits="userSpaceOnUse"
-          maskUnits="objectBoundingBox"
-          />
-</svg>

gpac-0.8.0.tar.gz/tests/media/svg/createanim-by-script.svg Deleted

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.2" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xlink="http://www.w3.org/1999/xlink" 
-     width="100%" height="100%" viewBox="0 0 800 600" >
-     <rect id="Ranimate"          x="100" y="100" width="100" height="50" fill="blue"/>
-     <rect id="Rset"              x="100" y="160" width="100" height="50" fill="blue"/>
-     <rect id="RanimateTransform" x="100" y="220" width="100" height="50" fill="blue"/>
-     <rect id="RanimateMotion"    x="100" y="280" width="100" height="50" fill="blue"/>
-     <rect id="RanimateColor"     x="100" y="340" width="100" height="50" fill="blue"/>
-     
- <script>
-<![CDATA[
-    var svgNS = "http://www.w3.org/2000/svg";
-    var xlinkNS = "http://www.w3.org/1999/xlink";
-
-    var rect = document.getElementById("Ranimate");
-    var animate = document.createElementNS(svgNS, "animate");
-    animate.setAttribute("begin", "2");
-    animate.setAttribute("attributeName", "width");
-    animate.setAttribute("from", "100");
-    animate.setAttribute("to", "500");
-    animate.setAttribute("dur", "2");
-    animate.setAttribute("fill", "freeze");
-    rect.appendChild(animate);
-    
-    var rect = document.getElementById("Rset");
-    var set = document.createElementNS(svgNS, "set");
-    set.setAttribute("begin", "2");
-    set.setAttribute("attributeName", "width");
-    set.setAttribute("to", "500");
-    set.setAttribute("dur", "2");
-    set.setAttribute("fill", "freeze");
-    rect.appendChild(set);
-    
-    var rect = document.getElementById("RanimateTransform");
-    var aT = document.createElementNS(svgNS, "animateTransform");
-    aT.setAttribute("begin", "2");
-    aT.setAttribute("attributeName", "transform");
-    aT.setAttribute("type", "translate");
-    aT.setAttribute("from", "0,0");
-    aT.setAttribute("to", "400,0");
-    aT.setAttribute("dur", "2");
-    aT.setAttribute("fill", "freeze");
-    rect.appendChild(aT);
-    
-    var rect = document.getElementById("RanimateMotion");
-    var aM = document.createElementNS(svgNS, "animateMotion");
-    aM.setAttribute("begin", "2");
-    aM.setAttribute("dur", "2");
-    aM.setAttribute("fill", "freeze");
-    
-    var path = document.createElementNS(svgNS, "path");
-    path.setAttribute("d","M0,0L400,0");
-    path.setAttribute("id", "aMotionPath");
-    document.documentElement.appendChild(path);
-    
-    var mpath = document.createElementNS(svgNS, "mpath");
-    mpath.setAttributeNS(xlinkNS, "href", "#aMotionPath");
-    aM.appendChild(mpath);
-     
-    rect.appendChild(aM);
-    
-    var rect = document.getElementById("RanimateColor");
-    var aC = document.createElementNS(svgNS, "animateColor");
-    aC.setAttribute("begin", "2");
-    aC.setAttribute("attributeName", "fill");
-    aC.setAttribute("dur", "2");
-    aC.setAttribute("fill", "freeze");
-    aC.setAttribute("to", "red");
-    rect.appendChild(aC);
-    
-  ]]>
- </script>
-</svg>

gpac-0.8.0.tar.gz/tests/media/svg/createimage-by-script.svg Deleted

gpac-0.8.0.tar.gz/tests/media/svg/opacity.svg Deleted

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-
-
-<svg width="62pt" height="260pt"
- viewBox="0.00 0.00 62.00 260.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 256)">
-<title>G</title>
-
-
-<polygon fill="white" stroke="none" points="-4,4 -4,-256 58,-256 58,4 -4,4"/>
-
-
-<g id="node1" class="node"><title>n2</title>
-<ellipse fill="none" stroke="red" cx="27" cy="-18" rx="27" ry="18"/>
-<text text-anchor="middle" x="27" y="-14.3" font-family="Times,serif" font-size="14.00">all</text>
-</g>
-
-
-
-<g id="node2" class="node" style="opacity:0.1">><title>n5</title>
-<ellipse fill="none" stroke="red" cx="27" cy="-234" rx="27" ry="18"/>
-<text text-anchor="middle" x="27" y="-230.3" font-family="Times,serif" font-size="14.00">x.a</text>
-<animate attributeName="opacity" from=".1" to="1" begin="0s" dur="1s" fill="freeze"/>
-</g>
-
-<g id="node3" class="node" style="opacity:0.1"><title>n4</title>
-<ellipse fill="none" stroke="red" cx="27" cy="-162" rx="27" ry="18"/>
-<text text-anchor="middle" x="27" y="-158.3" font-family="Times,serif" font-size="14.00">x.b</text>
-<animate attributeName="opacity" from=".1" to="1" begin="1s" dur="3s" fill="freeze"/>
-</g>
-
-
-<g id="edge2" class="edge"><title>n5&#45;&gt;n4</title>
-<path fill="none" stroke="black" d="M27,-215.697C27,-207.983 27,-198.712 27,-190.112"/>
-<polygon fill="black" stroke="black" points="30.5001,-190.104 27,-180.104 23.5001,-190.104 30.5001,-190.104"/>
-</g>
-
-
-<g id="node4" class="node" style="opacity:0.1"><title>n3</title>
-<ellipse fill="none" stroke="red" cx="27" cy="-90" rx="27" ry="18"/>
-<text text-anchor="middle" x="27" y="-86.3" font-family="Times,serif" font-size="14.00">x.z</text>
-<animate attributeName="opacity" from=".1" to="1" begin="2s" dur="3s" fill="freeze"/>
-</g>
-
-
-<g id="edge3" class="edge"><title>n4&#45;&gt;n3</title>
-<path fill="none" stroke="black" d="M27,-143.697C27,-135.983 27,-126.712 27,-118.112"/>
-<polygon fill="black" stroke="black" points="30.5001,-118.104 27,-108.104 23.5001,-118.104 30.5001,-118.104"/>
-</g>
-
-
-<g id="edge1" class="edge"><title>n3&#45;&gt;n2</title>
-<path fill="none" stroke="black" d="M27,-71.6966C27,-63.9827 27,-54.7125 27,-46.1124"/>
-<polygon fill="black" stroke="black" points="30.5001,-46.1043 27,-36.1043 23.5001,-46.1044 30.5001,-46.1043"/>
-</g>
-
-</g>
-</svg>

gpac-0.8.0.tar.gz/tests/media/svg/utfscript.svg Deleted

gpac-0.8.0.tar.gz/tests/media/swf Deleted

gpac-0.8.0.tar.gz/tests/media/swf/cuisine.swf Deleted

gpac-0.8.0.tar.gz/tests/media/ttml Deleted

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_prefix.ttml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt:tt xml:lang="de" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ttp="http://www.w3.org/ns/ttml#parameter" xmlns:tts="http://www.w3.org/ns/ttml#styling" xmlns:tt="http://www.w3.org/ns/ttml" xmlns:ebuttm="urn:ebu:tt:metadata" ttp:timeBase="media" ttp:cellResolution="50 30">
-    <tt:head>
-        <tt:metadata>
-            <ebuttm:documentMetadata>
-                <ebuttm:documentEbuttVersion>v1.0</ebuttm:documentEbuttVersion>
-            </ebuttm:documentMetadata>
-        </tt:metadata>
-        <tt:styling>
-            <tt:style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial" tts:fontSize="100%" tts:lineHeight="normal"/>
-            <tt:style xml:id="textWhite" tts:color="#ffffff" tts:backgroundColor="#000000c2" tts:fontSize="160%"/>
-            <tt:style xml:id="textCenter" tts:textAlign="center" />
-            <tt:style xml:id="textLeft" tts:textAlign="left" />
-            <tt:style xml:id="textRight" tts:textAlign="right" />
-        </tt:styling>
-        <tt:layout>
-            <tt:region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%" tts:displayAlign="after"/>
-        </tt:layout>
-    </tt:head>
-    <tt:body>
-        <tt:div style="defaultStyle">
-            <tt:p xml:id="subtitle1" region="bottom" begin="00:00:02.000" end="00:00:03.000" style="textLeft">
-                <tt:span style="textWhite">second text</tt:span>
-            </tt:p>
-            <tt:p xml:id="subtitle1" region="bottom" begin="00:00:03.040" end="00:00:04.000" style="textLeft">
-                <tt:span style="textWhite">second text</tt:span>
-            </tt:p>
-        </tt:div>
-    </tt:body>
-</tt:tt>

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_sample.ttml Deleted

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</p>
-			      <p begin="00:00:22.720" end="00:00:25.840" region="bottom" xml:id="sub3">00:00:22.720<br/>00:00:25.840</p>
-			      <p begin="00:00:26.080" end="00:00:29.120" region="bottom" xml:id="sub4">00:00:26.080<br/>00:00:29.120</p>
-			      <p begin="00:00:29.120" end="00:00:30.640" region="bottom" xml:id="sub5">00:00:29.120<br/>00:00:30.640</p>
-			      <p begin="00:00:30.960" end="00:00:33.200" region="bottom" xml:id="sub6">00:00:30.960<br/>00:00:33.200</p>
-			      <p begin="00:00:33.200" end="00:00:36.320" region="bottom" xml:id="sub7">00:00:33.200<br/>00:00:36.320</p>
-			      <p begin="00:00:36.320" end="00:00:40.040" region="bottom" xml:id="sub8">00:00:36.320<br/>00:00:40.040</p>
-			      <p begin="00:00:40.040" end="00:00:43.520" region="bottom" xml:id="sub9">00:00:40.040<br/>00:00:43.520</p>
-			      <p begin="00:00:43.520" end="00:00:46.920" region="bottom" xml:id="sub10">00:00:43.520<br/>00:00:46.920</p>
-			      <p begin="00:00:46.920" end="00:00:51.040" region="bottom" xml:id="sub11">00:00:46.920<br/>00:00:51.040</p>
-			      <p begin="00:00:51.080" end="00:00:54.160" region="bottom" xml:id="sub12">00:00:51.080<br/>00:00:54.160</p>
-			      <p begin="00:00:54.480" end="00:00:58.240" region="bottom" xml:id="sub13">00:00:54.480<br/>00:00:58.240</p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_sample_invalid_mixed_namespaces.ttml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml" xmlns:tt="http://www.w3.org/ns/invalidttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <tt:p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</tt:p>
-			      <tt:p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</tt:p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_sample_invalid_ns.ttml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/invalidttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_sample_invalid_root.ttml Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ttxxx xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</p>
-		    </div>
-	  </body>
-</ttxxx>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_sample_span.ttml Deleted

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p><span begin="00:00:00.000" end="00:00:01.400" xml:id="sub1">00:00:00.000<br/>00:00:01.400</span></p>
-			      <p><span begin="00:00:02.120" end="00:00:03.800" xml:id="sub2">00:00:02.120<br/>00:00:03.800</span></p>
-			      <p><span begin="00:00:22.720" end="00:00:25.840" xml:id="sub3">00:00:22.720<br/>00:00:25.840</span></p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_timing_contiguous.ttml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:01.400" end="00:00:02.120" region="bottom" xml:id="sub1">00:00:01.400<br/>00:00:02.120</p>
-			      <p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</p>
-			      <p begin="00:00:03.800" end="00:00:25.840" region="bottom" xml:id="sub3">00:00:03.800<br/>00:00:25.840</p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_timing_non-contiguous.ttml Deleted

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:02.120" end="00:00:03.800" region="bottom" xml:id="sub2">00:00:02.120<br/>00:00:03.800</p>
-			      <p begin="00:00:22.720" end="00:00:25.840" region="bottom" xml:id="sub3">00:00:22.720<br/>00:00:25.840</p>
-			      <p begin="00:00:26.080" end="00:00:29.120" region="bottom" xml:id="sub4">00:00:26.080<br/>00:00:29.120</p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ebu-ttd_timing_overlapping_fail.ttml Deleted

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tt xmlns:ttp="http://www.w3.org/ns/ttml#parameter"
-    xmlns:tts="http://www.w3.org/ns/ttml#styling"
-    ttp:timeBase="media"
-    ttp:cellResolution="50 30"
-    xml:lang="de" xmlns="http://www.w3.org/ns/ttml">
-	  <head>
-		    <styling>
-			      <style xml:id="defaultStyle" tts:fontFamily="Verdana, Arial, Tiresias"
-                tts:fontSize="160%"
-                tts:lineHeight="125%"
-                tts:color="#ffffff"
-                tts:backgroundColor="#000000c2"
-                tts:textAlign="center"/>
-		    </styling>
-		    <layout>
-			      <region xml:id="bottom" tts:origin="10% 10%" tts:extent="80% 80%"
-                 tts:displayAlign="after"/>
-		    </layout>
-	  </head>
-	  <body>
-		    <div style="defaultStyle">
-			      <p begin="00:00:00.000" end="00:00:01.400" region="bottom" xml:id="sub1">00:00:00.000<br/>00:00:01.400</p>
-			      <p begin="00:00:01.120" end="00:00:23.800" region="bottom" xml:id="sub2">00:00:01.120<br/>00:00:23.800</p>
-			      <p begin="00:00:22.720" end="00:00:25.840" region="bottom" xml:id="sub3">00:00:22.720<br/>00:00:25.840</p>
-		    </div>
-	  </body>
-</tt>
-

gpac-0.8.0.tar.gz/tests/media/ttml/ttml.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/comments.vtt Deleted

@@ -1,45 +0,0 @@
-WEBVTT - Example with comments
-
-00:11.000 --> 00:13.000
-<v Roger Bingham>We are in New York City
-NOTE comment just after a cue
-
-00:13.000 --> 00:16.000
-<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
-
-NOTE comment just before a cue identifier
-some id
-00:16.000 --> 00:18.000
-<v Roger Bingham>from the American Museum of Natural History
-
-NOTE in between cues
-
-00:18.000 --> 00:20.000
-<v Roger Bingham>And with me is Neil deGrasse Tyson
-
-00:20.000 --> 00:22.000
-<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
-
-00:22.000 --> 00:24.000
-<v Roger Bingham>at the AMNH.
-
-00:24.000 --> 00:26.000
-<v Roger Bingham>Thank you for walking down here.
-
-00:27.000 --> 00:30.000
-<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
-
-00:30.000 --> 00:31.500 align:end size:50%
-<v Roger Bingham>When we e-mailed-
-
-00:30.500 --> 00:32.500 align:start size:50%
-<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
-
-00:32.000 --> 00:35.500 align:end size:50%
-<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
-
-00:32.500 --> 00:33.500 align:start size:50%
-<v Neil deGrasse Tyson><i>Laughs</i>
-
-00:35.500 --> 00:38.000
-<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/webvtt/concatenation.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/counter.srt Deleted

@@ -1,2400 +0,0 @@
-1
-00:00,000 --> 00:01,000
-Cue 	1	Start Time	00:00,000
-
-2
-00:01,000 --> 00:02,000
-Cue 	2	Start Time	00:01,000
-
-3
-00:02,000 --> 00:03,000
-Cue 	3	Start Time	00:02,000
-
-4
-00:03,000 --> 00:04,000
-Cue 	4	Start Time	00:03,000
-
-5
-00:04,000 --> 00:05,000
-Cue 	5	Start Time	00:04,000
-
-6
-00:05,000 --> 00:06,000
-Cue 	6	Start Time	00:05,000
-
-7
-00:06,000 --> 00:07,000
-Cue 	7	Start Time	00:06,000
-
-8
-00:07,000 --> 00:08,000
-Cue 	8	Start Time	00:07,000
-
-9
-00:08,000 --> 00:09,000
-Cue 	9	Start Time	00:08,000
-
-10
-00:09,000 --> 00:10,000
-Cue 	10	Start Time	00:09,000
-
-11
-00:10,000 --> 00:11,000
-Cue 	11	Start Time	00:10,000
-
-12
-00:11,000 --> 00:12,000
-Cue 	12	Start Time	00:11,000
-
-13
-00:12,000 --> 00:13,000
-Cue 	13	Start Time	00:12,000
-
-14
-00:13,000 --> 00:14,000
-Cue 	14	Start Time	00:13,000
-
-15
-00:14,000 --> 00:15,000
-Cue 	15	Start Time	00:14,000
-
-16
-00:15,000 --> 00:16,000
-Cue 	16	Start Time	00:15,000
-
-17
-00:16,000 --> 00:17,000
-Cue 	17	Start Time	00:16,000
-
-18
-00:17,000 --> 00:18,000
-Cue 	18	Start Time	00:17,000
-
-19
-00:18,000 --> 00:19,000
-Cue 	19	Start Time	00:18,000
-
-20
-00:19,000 --> 00:20,000
-Cue 	20	Start Time	00:19,000
-
-21
-00:20,000 --> 00:21,000
-Cue 	21	Start Time	00:20,000
-
-22
-00:21,000 --> 00:22,000
-Cue 	22	Start Time	00:21,000
-
-23
-00:22,000 --> 00:23,000
-Cue 	23	Start Time	00:22,000
-
-24
-00:23,000 --> 00:24,000
-Cue 	24	Start Time	00:23,000
-
-25
-00:24,000 --> 00:25,000
-Cue 	25	Start Time	00:24,000
-
-26
-00:25,000 --> 00:26,000
-Cue 	26	Start Time	00:25,000
-
-27
-00:26,000 --> 00:27,000
-Cue 	27	Start Time	00:26,000
-
-28
-00:27,000 --> 00:28,000
-Cue 	28	Start Time	00:27,000
-
-29
-00:28,000 --> 00:29,000
-Cue 	29	Start Time	00:28,000
-
-30
-00:29,000 --> 00:30,000
-Cue 	30	Start Time	00:29,000
-
-31
-00:30,000 --> 00:31,000
-Cue 	31	Start Time	00:30,000
-
-32
-00:31,000 --> 00:32,000
-Cue 	32	Start Time	00:31,000
-
-33
-00:32,000 --> 00:33,000
-Cue 	33	Start Time	00:32,000
-
-34
-00:33,000 --> 00:34,000
-Cue 	34	Start Time	00:33,000
-
-35
-00:34,000 --> 00:35,000
-Cue 	35	Start Time	00:34,000
-
-36
-00:35,000 --> 00:36,000
-Cue 	36	Start Time	00:35,000
-
-37
-00:36,000 --> 00:37,000
-Cue 	37	Start Time	00:36,000
-
-38
-00:37,000 --> 00:38,000
-Cue 	38	Start Time	00:37,000
-
-39
-00:38,000 --> 00:39,000
-Cue 	39	Start Time	00:38,000
-
-40
-00:39,000 --> 00:40,000
-Cue 	40	Start Time	00:39,000
-
-41
-00:40,000 --> 00:41,000
-Cue 	41	Start Time	00:40,000
-
-42
-00:41,000 --> 00:42,000
-Cue 	42	Start Time	00:41,000
-
-43
-00:42,000 --> 00:43,000
-Cue 	43	Start Time	00:42,000
-
-44
-00:43,000 --> 00:44,000
-Cue 	44	Start Time	00:43,000
-
-45
-00:44,000 --> 00:45,000
-Cue 	45	Start Time	00:44,000
-
-46
-00:45,000 --> 00:46,000
-Cue 	46	Start Time	00:45,000
-
-47
-00:46,000 --> 00:47,000
-Cue 	47	Start Time	00:46,000
-
-48
-00:47,000 --> 00:48,000
-Cue 	48	Start Time	00:47,000
-
-49
-00:48,000 --> 00:49,000
-Cue 	49	Start Time	00:48,000
-
-50
-00:49,000 --> 00:50,000
-Cue 	50	Start Time	00:49,000
-
-51
-00:50,000 --> 00:51,000
-Cue 	51	Start Time	00:50,000
-
-52
-00:51,000 --> 00:52,000
-Cue 	52	Start Time	00:51,000
-
-53
-00:52,000 --> 00:53,000
-Cue 	53	Start Time	00:52,000
-
-54
-00:53,000 --> 00:54,000
-Cue 	54	Start Time	00:53,000
-
-55
-00:54,000 --> 00:55,000
-Cue 	55	Start Time	00:54,000
-
-56
-00:55,000 --> 00:56,000
-Cue 	56	Start Time	00:55,000
-
-57
-00:56,000 --> 00:57,000
-Cue 	57	Start Time	00:56,000
-
-58
-00:57,000 --> 00:58,000
-Cue 	58	Start Time	00:57,000
-
-59
-00:58,000 --> 00:59,000
-Cue 	59	Start Time	00:58,000
-
-60
-00:59,000 --> 01:00,000
-Cue 	60	Start Time	00:59,000
-
-61
-01:00,000 --> 01:01,000
-Cue 	61	Start Time	01:00,000
-
-62
-01:01,000 --> 01:02,000
-Cue 	62	Start Time	01:01,000
-
-63
-01:02,000 --> 01:03,000
-Cue 	63	Start Time	01:02,000
-
-64
-01:03,000 --> 01:04,000
-Cue 	64	Start Time	01:03,000
-
-65
-01:04,000 --> 01:05,000
-Cue 	65	Start Time	01:04,000
-
-66
-01:05,000 --> 01:06,000
-Cue 	66	Start Time	01:05,000
-
-67
-01:06,000 --> 01:07,000
-Cue 	67	Start Time	01:06,000
-
-68
-01:07,000 --> 01:08,000
-Cue 	68	Start Time	01:07,000
-
-69
-01:08,000 --> 01:09,000
-Cue 	69	Start Time	01:08,000
-
-70
-01:09,000 --> 01:10,000
-Cue 	70	Start Time	01:09,000
-
-71
-01:10,000 --> 01:11,000
-Cue 	71	Start Time	01:10,000
-
-72
-01:11,000 --> 01:12,000
-Cue 	72	Start Time	01:11,000
-
-73
-01:12,000 --> 01:13,000
-Cue 	73	Start Time	01:12,000
-
-74
-01:13,000 --> 01:14,000
-Cue 	74	Start Time	01:13,000
-
-75
-01:14,000 --> 01:15,000
-Cue 	75	Start Time	01:14,000
-
-76
-01:15,000 --> 01:16,000
-Cue 	76	Start Time	01:15,000
-
-77
-01:16,000 --> 01:17,000
-Cue 	77	Start Time	01:16,000
-
-78
-01:17,000 --> 01:18,000
-Cue 	78	Start Time	01:17,000
-
-79
-01:18,000 --> 01:19,000
-Cue 	79	Start Time	01:18,000
-
-80
-01:19,000 --> 01:20,000
-Cue 	80	Start Time	01:19,000
-
-81
-01:20,000 --> 01:21,000
-Cue 	81	Start Time	01:20,000
-
-82
-01:21,000 --> 01:22,000
-Cue 	82	Start Time	01:21,000
-
-83
-01:22,000 --> 01:23,000
-Cue 	83	Start Time	01:22,000
-
-84
-01:23,000 --> 01:24,000
-Cue 	84	Start Time	01:23,000
-
-85
-01:24,000 --> 01:25,000
-Cue 	85	Start Time	01:24,000
-
-86
-01:25,000 --> 01:26,000
-Cue 	86	Start Time	01:25,000
-
-87
-01:26,000 --> 01:27,000
-Cue 	87	Start Time	01:26,000
-
-88
-01:27,000 --> 01:28,000
-Cue 	88	Start Time	01:27,000
-
-89
-01:28,000 --> 01:29,000
-Cue 	89	Start Time	01:28,000
-
-90
-01:29,000 --> 01:30,000
-Cue 	90	Start Time	01:29,000
-
-91
-01:30,000 --> 01:31,000
-Cue 	91	Start Time	01:30,000
-
-92
-01:31,000 --> 01:32,000
-Cue 	92	Start Time	01:31,000
-
-93
-01:32,000 --> 01:33,000
-Cue 	93	Start Time	01:32,000
-
-94
-01:33,000 --> 01:34,000
-Cue 	94	Start Time	01:33,000
-
-95
-01:34,000 --> 01:35,000
-Cue 	95	Start Time	01:34,000
-
-96
-01:35,000 --> 01:36,000
-Cue 	96	Start Time	01:35,000
-
-97
-01:36,000 --> 01:37,000
-Cue 	97	Start Time	01:36,000
-
-98
-01:37,000 --> 01:38,000
-Cue 	98	Start Time	01:37,000
-
-99
-01:38,000 --> 01:39,000
-Cue 	99	Start Time	01:38,000
-
-100
-01:39,000 --> 01:40,000
-Cue 	100	Start Time	01:39,000
-
-101
-01:40,000 --> 01:41,000
-Cue 	101	Start Time	01:40,000
-
-102
-01:41,000 --> 01:42,000
-Cue 	102	Start Time	01:41,000
-
-103
-01:42,000 --> 01:43,000
-Cue 	103	Start Time	01:42,000
-
-104
-01:43,000 --> 01:44,000
-Cue 	104	Start Time	01:43,000
-
-105
-01:44,000 --> 01:45,000
-Cue 	105	Start Time	01:44,000
-
-106
-01:45,000 --> 01:46,000
-Cue 	106	Start Time	01:45,000
-
-107
-01:46,000 --> 01:47,000
-Cue 	107	Start Time	01:46,000
-
-108
-01:47,000 --> 01:48,000
-Cue 	108	Start Time	01:47,000
-
-109
-01:48,000 --> 01:49,000
-Cue 	109	Start Time	01:48,000
-
-110
-01:49,000 --> 01:50,000
-Cue 	110	Start Time	01:49,000
-
-111
-01:50,000 --> 01:51,000
-Cue 	111	Start Time	01:50,000
-
-112
-01:51,000 --> 01:52,000
-Cue 	112	Start Time	01:51,000
-
-113
-01:52,000 --> 01:53,000
-Cue 	113	Start Time	01:52,000
-
-114
-01:53,000 --> 01:54,000
-Cue 	114	Start Time	01:53,000
-
-115
-01:54,000 --> 01:55,000
-Cue 	115	Start Time	01:54,000
-
-116
-01:55,000 --> 01:56,000
-Cue 	116	Start Time	01:55,000
-
-117
-01:56,000 --> 01:57,000
-Cue 	117	Start Time	01:56,000
-
-118
-01:57,000 --> 01:58,000
-Cue 	118	Start Time	01:57,000
-
-119
-01:58,000 --> 01:59,000
-Cue 	119	Start Time	01:58,000
-
-120
-01:59,000 --> 02:00,000
-Cue 	120	Start Time	01:59,000
-
-121
-02:00,000 --> 02:01,000
-Cue 	121	Start Time	02:00,000
-
-122
-02:01,000 --> 02:02,000
-Cue 	122	Start Time	02:01,000
-
-123
-02:02,000 --> 02:03,000
-Cue 	123	Start Time	02:02,000
-
-124
-02:03,000 --> 02:04,000
-Cue 	124	Start Time	02:03,000
-
-125
-02:04,000 --> 02:05,000
-Cue 	125	Start Time	02:04,000
-
-126
-02:05,000 --> 02:06,000
-Cue 	126	Start Time	02:05,000
-
-127
-02:06,000 --> 02:07,000
-Cue 	127	Start Time	02:06,000
-
-128
-02:07,000 --> 02:08,000
-Cue 	128	Start Time	02:07,000
-
-129
-02:08,000 --> 02:09,000
-Cue 	129	Start Time	02:08,000
-
-130
-02:09,000 --> 02:10,000
-Cue 	130	Start Time	02:09,000
-
-131
-02:10,000 --> 02:11,000
-Cue 	131	Start Time	02:10,000
-
-132
-02:11,000 --> 02:12,000
-Cue 	132	Start Time	02:11,000
-
-133
-02:12,000 --> 02:13,000
-Cue 	133	Start Time	02:12,000
-
-134
-02:13,000 --> 02:14,000
-Cue 	134	Start Time	02:13,000
-
-135
-02:14,000 --> 02:15,000
-Cue 	135	Start Time	02:14,000
-
-136
-02:15,000 --> 02:16,000
-Cue 	136	Start Time	02:15,000
-
-137
-02:16,000 --> 02:17,000
-Cue 	137	Start Time	02:16,000
-
-138
-02:17,000 --> 02:18,000
-Cue 	138	Start Time	02:17,000
-
-139
-02:18,000 --> 02:19,000
-Cue 	139	Start Time	02:18,000
-
-140
-02:19,000 --> 02:20,000
-Cue 	140	Start Time	02:19,000
-
-141
-02:20,000 --> 02:21,000
-Cue 	141	Start Time	02:20,000
-
-142
-02:21,000 --> 02:22,000
-Cue 	142	Start Time	02:21,000
-
-143
-02:22,000 --> 02:23,000
-Cue 	143	Start Time	02:22,000
-
-144
-02:23,000 --> 02:24,000
-Cue 	144	Start Time	02:23,000
-
-145
-02:24,000 --> 02:25,000
-Cue 	145	Start Time	02:24,000
-
-146
-02:25,000 --> 02:26,000
-Cue 	146	Start Time	02:25,000
-
-147
-02:26,000 --> 02:27,000
-Cue 	147	Start Time	02:26,000
-
-148
-02:27,000 --> 02:28,000
-Cue 	148	Start Time	02:27,000
-
-149
-02:28,000 --> 02:29,000
-Cue 	149	Start Time	02:28,000
-
-150
-02:29,000 --> 02:30,000
-Cue 	150	Start Time	02:29,000
-
-151
-02:30,000 --> 02:31,000
-Cue 	151	Start Time	02:30,000
-
-152
-02:31,000 --> 02:32,000
-Cue 	152	Start Time	02:31,000
-
-153
-02:32,000 --> 02:33,000
-Cue 	153	Start Time	02:32,000
-
-154
-02:33,000 --> 02:34,000
-Cue 	154	Start Time	02:33,000
-
-155
-02:34,000 --> 02:35,000
-Cue 	155	Start Time	02:34,000
-
-156
-02:35,000 --> 02:36,000
-Cue 	156	Start Time	02:35,000
-
-157
-02:36,000 --> 02:37,000
-Cue 	157	Start Time	02:36,000
-
-158
-02:37,000 --> 02:38,000
-Cue 	158	Start Time	02:37,000
-
-159
-02:38,000 --> 02:39,000
-Cue 	159	Start Time	02:38,000
-
-160
-02:39,000 --> 02:40,000
-Cue 	160	Start Time	02:39,000
-
-161
-02:40,000 --> 02:41,000
-Cue 	161	Start Time	02:40,000
-
-162
-02:41,000 --> 02:42,000
-Cue 	162	Start Time	02:41,000
-
-163
-02:42,000 --> 02:43,000
-Cue 	163	Start Time	02:42,000
-
-164
-02:43,000 --> 02:44,000
-Cue 	164	Start Time	02:43,000
-
-165
-02:44,000 --> 02:45,000
-Cue 	165	Start Time	02:44,000
-
-166
-02:45,000 --> 02:46,000
-Cue 	166	Start Time	02:45,000
-
-167
-02:46,000 --> 02:47,000
-Cue 	167	Start Time	02:46,000
-
-168
-02:47,000 --> 02:48,000
-Cue 	168	Start Time	02:47,000
-
-169
-02:48,000 --> 02:49,000
-Cue 	169	Start Time	02:48,000
-
-170
-02:49,000 --> 02:50,000
-Cue 	170	Start Time	02:49,000
-
-171
-02:50,000 --> 02:51,000
-Cue 	171	Start Time	02:50,000
-
-172
-02:51,000 --> 02:52,000
-Cue 	172	Start Time	02:51,000
-
-173
-02:52,000 --> 02:53,000
-Cue 	173	Start Time	02:52,000
-
-174
-02:53,000 --> 02:54,000
-Cue 	174	Start Time	02:53,000
-
-175
-02:54,000 --> 02:55,000
-Cue 	175	Start Time	02:54,000
-
-176
-02:55,000 --> 02:56,000
-Cue 	176	Start Time	02:55,000
-
-177
-02:56,000 --> 02:57,000
-Cue 	177	Start Time	02:56,000
-
-178
-02:57,000 --> 02:58,000
-Cue 	178	Start Time	02:57,000
-
-179
-02:58,000 --> 02:59,000
-Cue 	179	Start Time	02:58,000
-
-180
-02:59,000 --> 03:00,000
-Cue 	180	Start Time	02:59,000
-
-181
-03:00,000 --> 03:01,000
-Cue 	181	Start Time	03:00,000
-
-182
-03:01,000 --> 03:02,000
-Cue 	182	Start Time	03:01,000
-
-183
-03:02,000 --> 03:03,000
-Cue 	183	Start Time	03:02,000
-
-184
-03:03,000 --> 03:04,000
-Cue 	184	Start Time	03:03,000
-
-185
-03:04,000 --> 03:05,000
-Cue 	185	Start Time	03:04,000
-
-186
-03:05,000 --> 03:06,000
-Cue 	186	Start Time	03:05,000
-
-187
-03:06,000 --> 03:07,000
-Cue 	187	Start Time	03:06,000
-
-188
-03:07,000 --> 03:08,000
-Cue 	188	Start Time	03:07,000
-
-189
-03:08,000 --> 03:09,000
-Cue 	189	Start Time	03:08,000
-
-190
-03:09,000 --> 03:10,000
-Cue 	190	Start Time	03:09,000
-
-191
-03:10,000 --> 03:11,000
-Cue 	191	Start Time	03:10,000
-
-192
-03:11,000 --> 03:12,000
-Cue 	192	Start Time	03:11,000
-
-193
-03:12,000 --> 03:13,000
-Cue 	193	Start Time	03:12,000
-
-194
-03:13,000 --> 03:14,000
-Cue 	194	Start Time	03:13,000
-
-195
-03:14,000 --> 03:15,000
-Cue 	195	Start Time	03:14,000
-
-196
-03:15,000 --> 03:16,000
-Cue 	196	Start Time	03:15,000
-
-197
-03:16,000 --> 03:17,000
-Cue 	197	Start Time	03:16,000
-
-198
-03:17,000 --> 03:18,000
-Cue 	198	Start Time	03:17,000
-
-199
-03:18,000 --> 03:19,000
-Cue 	199	Start Time	03:18,000
-
-200
-03:19,000 --> 03:20,000
-Cue 	200	Start Time	03:19,000
-
-201
-03:20,000 --> 03:21,000
-Cue 	201	Start Time	03:20,000
-
-202
-03:21,000 --> 03:22,000
-Cue 	202	Start Time	03:21,000
-
-203
-03:22,000 --> 03:23,000
-Cue 	203	Start Time	03:22,000
-
-204
-03:23,000 --> 03:24,000
-Cue 	204	Start Time	03:23,000
-
-205
-03:24,000 --> 03:25,000
-Cue 	205	Start Time	03:24,000
-
-206
-03:25,000 --> 03:26,000
-Cue 	206	Start Time	03:25,000
-
-207
-03:26,000 --> 03:27,000
-Cue 	207	Start Time	03:26,000
-
-208
-03:27,000 --> 03:28,000
-Cue 	208	Start Time	03:27,000
-
-209
-03:28,000 --> 03:29,000
-Cue 	209	Start Time	03:28,000
-
-210
-03:29,000 --> 03:30,000
-Cue 	210	Start Time	03:29,000
-
-211
-03:30,000 --> 03:31,000
-Cue 	211	Start Time	03:30,000
-
-212
-03:31,000 --> 03:32,000
-Cue 	212	Start Time	03:31,000
-
-213
-03:32,000 --> 03:33,000
-Cue 	213	Start Time	03:32,000
-
-214
-03:33,000 --> 03:34,000
-Cue 	214	Start Time	03:33,000
-
-215
-03:34,000 --> 03:35,000
-Cue 	215	Start Time	03:34,000
-
-216
-03:35,000 --> 03:36,000
-Cue 	216	Start Time	03:35,000
-
-217
-03:36,000 --> 03:37,000
-Cue 	217	Start Time	03:36,000
-
-218
-03:37,000 --> 03:38,000
-Cue 	218	Start Time	03:37,000
-
-219
-03:38,000 --> 03:39,000
-Cue 	219	Start Time	03:38,000
-
-220
-03:39,000 --> 03:40,000
-Cue 	220	Start Time	03:39,000
-
-221
-03:40,000 --> 03:41,000
-Cue 	221	Start Time	03:40,000
-
-222
-03:41,000 --> 03:42,000
-Cue 	222	Start Time	03:41,000
-
-223
-03:42,000 --> 03:43,000
-Cue 	223	Start Time	03:42,000
-
-224
-03:43,000 --> 03:44,000
-Cue 	224	Start Time	03:43,000
-
-225
-03:44,000 --> 03:45,000
-Cue 	225	Start Time	03:44,000
-
-226
-03:45,000 --> 03:46,000
-Cue 	226	Start Time	03:45,000
-
-227
-03:46,000 --> 03:47,000
-Cue 	227	Start Time	03:46,000
-
-228
-03:47,000 --> 03:48,000
-Cue 	228	Start Time	03:47,000
-
-229
-03:48,000 --> 03:49,000
-Cue 	229	Start Time	03:48,000
-
-230
-03:49,000 --> 03:50,000
-Cue 	230	Start Time	03:49,000
-
-231
-03:50,000 --> 03:51,000
-Cue 	231	Start Time	03:50,000
-
-232
-03:51,000 --> 03:52,000
-Cue 	232	Start Time	03:51,000
-
-233
-03:52,000 --> 03:53,000
-Cue 	233	Start Time	03:52,000
-
-234
-03:53,000 --> 03:54,000
-Cue 	234	Start Time	03:53,000
-
-235
-03:54,000 --> 03:55,000
-Cue 	235	Start Time	03:54,000
-
-236
-03:55,000 --> 03:56,000
-Cue 	236	Start Time	03:55,000
-
-237
-03:56,000 --> 03:57,000
-Cue 	237	Start Time	03:56,000
-
-238
-03:57,000 --> 03:58,000
-Cue 	238	Start Time	03:57,000
-
-239
-03:58,000 --> 03:59,000
-Cue 	239	Start Time	03:58,000
-
-240
-03:59,000 --> 04:00,000
-Cue 	240	Start Time	03:59,000
-
-241
-04:00,000 --> 04:01,000
-Cue 	241	Start Time	04:00,000
-
-242
-04:01,000 --> 04:02,000
-Cue 	242	Start Time	04:01,000
-
-243
-04:02,000 --> 04:03,000
-Cue 	243	Start Time	04:02,000
-
-244
-04:03,000 --> 04:04,000
-Cue 	244	Start Time	04:03,000
-
-245
-04:04,000 --> 04:05,000
-Cue 	245	Start Time	04:04,000
-
-246
-04:05,000 --> 04:06,000
-Cue 	246	Start Time	04:05,000
-
-247
-04:06,000 --> 04:07,000
-Cue 	247	Start Time	04:06,000
-
-248
-04:07,000 --> 04:08,000
-Cue 	248	Start Time	04:07,000
-
-249
-04:08,000 --> 04:09,000
-Cue 	249	Start Time	04:08,000
-
-250
-04:09,000 --> 04:10,000
-Cue 	250	Start Time	04:09,000
-
-251
-04:10,000 --> 04:11,000
-Cue 	251	Start Time	04:10,000
-
-252
-04:11,000 --> 04:12,000
-Cue 	252	Start Time	04:11,000
-
-253
-04:12,000 --> 04:13,000
-Cue 	253	Start Time	04:12,000
-
-254
-04:13,000 --> 04:14,000
-Cue 	254	Start Time	04:13,000
-
-255
-04:14,000 --> 04:15,000
-Cue 	255	Start Time	04:14,000
-
-256
-04:15,000 --> 04:16,000
-Cue 	256	Start Time	04:15,000
-
-257
-04:16,000 --> 04:17,000
-Cue 	257	Start Time	04:16,000
-
-258
-04:17,000 --> 04:18,000
-Cue 	258	Start Time	04:17,000
-
-259
-04:18,000 --> 04:19,000
-Cue 	259	Start Time	04:18,000
-
-260
-04:19,000 --> 04:20,000
-Cue 	260	Start Time	04:19,000
-
-261
-04:20,000 --> 04:21,000
-Cue 	261	Start Time	04:20,000
-
-262
-04:21,000 --> 04:22,000
-Cue 	262	Start Time	04:21,000
-
-263
-04:22,000 --> 04:23,000
-Cue 	263	Start Time	04:22,000
-
-264
-04:23,000 --> 04:24,000
-Cue 	264	Start Time	04:23,000
-
-265
-04:24,000 --> 04:25,000
-Cue 	265	Start Time	04:24,000
-
-266
-04:25,000 --> 04:26,000
-Cue 	266	Start Time	04:25,000
-
-267
-04:26,000 --> 04:27,000
-Cue 	267	Start Time	04:26,000
-
-268
-04:27,000 --> 04:28,000
-Cue 	268	Start Time	04:27,000
-
-269
-04:28,000 --> 04:29,000
-Cue 	269	Start Time	04:28,000
-
-270
-04:29,000 --> 04:30,000
-Cue 	270	Start Time	04:29,000
-
-271
-04:30,000 --> 04:31,000
-Cue 	271	Start Time	04:30,000
-
-272
-04:31,000 --> 04:32,000
-Cue 	272	Start Time	04:31,000
-
-273
-04:32,000 --> 04:33,000
-Cue 	273	Start Time	04:32,000
-
-274
-04:33,000 --> 04:34,000
-Cue 	274	Start Time	04:33,000
-
-275
-04:34,000 --> 04:35,000
-Cue 	275	Start Time	04:34,000
-
-276
-04:35,000 --> 04:36,000
-Cue 	276	Start Time	04:35,000
-
-277
-04:36,000 --> 04:37,000
-Cue 	277	Start Time	04:36,000
-
-278
-04:37,000 --> 04:38,000
-Cue 	278	Start Time	04:37,000
-
-279
-04:38,000 --> 04:39,000
-Cue 	279	Start Time	04:38,000
-
-280
-04:39,000 --> 04:40,000
-Cue 	280	Start Time	04:39,000
-
-281
-04:40,000 --> 04:41,000
-Cue 	281	Start Time	04:40,000
-
-282
-04:41,000 --> 04:42,000
-Cue 	282	Start Time	04:41,000
-
-283
-04:42,000 --> 04:43,000
-Cue 	283	Start Time	04:42,000
-
-284
-04:43,000 --> 04:44,000
-Cue 	284	Start Time	04:43,000
-
-285
-04:44,000 --> 04:45,000
-Cue 	285	Start Time	04:44,000
-
-286
-04:45,000 --> 04:46,000
-Cue 	286	Start Time	04:45,000
-
-287
-04:46,000 --> 04:47,000
-Cue 	287	Start Time	04:46,000
-
-288
-04:47,000 --> 04:48,000
-Cue 	288	Start Time	04:47,000
-
-289
-04:48,000 --> 04:49,000
-Cue 	289	Start Time	04:48,000
-
-290
-04:49,000 --> 04:50,000
-Cue 	290	Start Time	04:49,000
-
-291
-04:50,000 --> 04:51,000
-Cue 	291	Start Time	04:50,000
-
-292
-04:51,000 --> 04:52,000
-Cue 	292	Start Time	04:51,000
-
-293
-04:52,000 --> 04:53,000
-Cue 	293	Start Time	04:52,000
-
-294
-04:53,000 --> 04:54,000
-Cue 	294	Start Time	04:53,000
-
-295
-04:54,000 --> 04:55,000
-Cue 	295	Start Time	04:54,000
-
-296
-04:55,000 --> 04:56,000
-Cue 	296	Start Time	04:55,000
-
-297
-04:56,000 --> 04:57,000
-Cue 	297	Start Time	04:56,000
-
-298
-04:57,000 --> 04:58,000
-Cue 	298	Start Time	04:57,000
-
-299
-04:58,000 --> 04:59,000
-Cue 	299	Start Time	04:58,000
-
-300
-04:59,000 --> 05:00,000
-Cue 	300	Start Time	04:59,000
-
-301
-05:00,000 --> 05:01,000
-Cue 	301	Start Time	05:00,000
-
-302
-05:01,000 --> 05:02,000
-Cue 	302	Start Time	05:01,000
-
-303
-05:02,000 --> 05:03,000
-Cue 	303	Start Time	05:02,000
-
-304
-05:03,000 --> 05:04,000
-Cue 	304	Start Time	05:03,000
-
-305
-05:04,000 --> 05:05,000
-Cue 	305	Start Time	05:04,000
-
-306
-05:05,000 --> 05:06,000
-Cue 	306	Start Time	05:05,000
-
-307
-05:06,000 --> 05:07,000
-Cue 	307	Start Time	05:06,000
-
-308
-05:07,000 --> 05:08,000
-Cue 	308	Start Time	05:07,000
-
-309
-05:08,000 --> 05:09,000
-Cue 	309	Start Time	05:08,000
-
-310
-05:09,000 --> 05:10,000
-Cue 	310	Start Time	05:09,000
-
-311
-05:10,000 --> 05:11,000
-Cue 	311	Start Time	05:10,000
-
-312
-05:11,000 --> 05:12,000
-Cue 	312	Start Time	05:11,000
-
-313
-05:12,000 --> 05:13,000
-Cue 	313	Start Time	05:12,000
-
-314
-05:13,000 --> 05:14,000
-Cue 	314	Start Time	05:13,000
-
-315
-05:14,000 --> 05:15,000
-Cue 	315	Start Time	05:14,000
-
-316
-05:15,000 --> 05:16,000
-Cue 	316	Start Time	05:15,000
-
-317
-05:16,000 --> 05:17,000
-Cue 	317	Start Time	05:16,000
-
-318
-05:17,000 --> 05:18,000
-Cue 	318	Start Time	05:17,000
-
-319
-05:18,000 --> 05:19,000
-Cue 	319	Start Time	05:18,000
-
-320
-05:19,000 --> 05:20,000
-Cue 	320	Start Time	05:19,000
-
-321
-05:20,000 --> 05:21,000
-Cue 	321	Start Time	05:20,000
-
-322
-05:21,000 --> 05:22,000
-Cue 	322	Start Time	05:21,000
-
-323
-05:22,000 --> 05:23,000
-Cue 	323	Start Time	05:22,000
-
-324
-05:23,000 --> 05:24,000
-Cue 	324	Start Time	05:23,000
-
-325
-05:24,000 --> 05:25,000
-Cue 	325	Start Time	05:24,000
-
-326
-05:25,000 --> 05:26,000
-Cue 	326	Start Time	05:25,000
-
-327
-05:26,000 --> 05:27,000
-Cue 	327	Start Time	05:26,000
-
-328
-05:27,000 --> 05:28,000
-Cue 	328	Start Time	05:27,000
-
-329
-05:28,000 --> 05:29,000
-Cue 	329	Start Time	05:28,000
-
-330
-05:29,000 --> 05:30,000
-Cue 	330	Start Time	05:29,000
-
-331
-05:30,000 --> 05:31,000
-Cue 	331	Start Time	05:30,000
-
-332
-05:31,000 --> 05:32,000
-Cue 	332	Start Time	05:31,000
-
-333
-05:32,000 --> 05:33,000
-Cue 	333	Start Time	05:32,000
-
-334
-05:33,000 --> 05:34,000
-Cue 	334	Start Time	05:33,000
-
-335
-05:34,000 --> 05:35,000
-Cue 	335	Start Time	05:34,000
-
-336
-05:35,000 --> 05:36,000
-Cue 	336	Start Time	05:35,000
-
-337
-05:36,000 --> 05:37,000
-Cue 	337	Start Time	05:36,000
-
-338
-05:37,000 --> 05:38,000
-Cue 	338	Start Time	05:37,000
-
-339
-05:38,000 --> 05:39,000
-Cue 	339	Start Time	05:38,000
-
-340
-05:39,000 --> 05:40,000
-Cue 	340	Start Time	05:39,000
-
-341
-05:40,000 --> 05:41,000
-Cue 	341	Start Time	05:40,000
-
-342
-05:41,000 --> 05:42,000
-Cue 	342	Start Time	05:41,000
-
-343
-05:42,000 --> 05:43,000
-Cue 	343	Start Time	05:42,000
-
-344
-05:43,000 --> 05:44,000
-Cue 	344	Start Time	05:43,000
-
-345
-05:44,000 --> 05:45,000
-Cue 	345	Start Time	05:44,000
-
-346
-05:45,000 --> 05:46,000
-Cue 	346	Start Time	05:45,000
-
-347
-05:46,000 --> 05:47,000
-Cue 	347	Start Time	05:46,000
-
-348
-05:47,000 --> 05:48,000
-Cue 	348	Start Time	05:47,000
-
-349
-05:48,000 --> 05:49,000
-Cue 	349	Start Time	05:48,000
-
-350
-05:49,000 --> 05:50,000
-Cue 	350	Start Time	05:49,000
-
-351
-05:50,000 --> 05:51,000
-Cue 	351	Start Time	05:50,000
-
-352
-05:51,000 --> 05:52,000
-Cue 	352	Start Time	05:51,000
-
-353
-05:52,000 --> 05:53,000
-Cue 	353	Start Time	05:52,000
-
-354
-05:53,000 --> 05:54,000
-Cue 	354	Start Time	05:53,000
-
-355
-05:54,000 --> 05:55,000
-Cue 	355	Start Time	05:54,000
-
-356
-05:55,000 --> 05:56,000
-Cue 	356	Start Time	05:55,000
-
-357
-05:56,000 --> 05:57,000
-Cue 	357	Start Time	05:56,000
-
-358
-05:57,000 --> 05:58,000
-Cue 	358	Start Time	05:57,000
-
-359
-05:58,000 --> 05:59,000
-Cue 	359	Start Time	05:58,000
-
-360
-05:59,000 --> 06:00,000
-Cue 	360	Start Time	05:59,000
-
-361
-06:00,000 --> 06:01,000
-Cue 	361	Start Time	06:00,000
-
-362
-06:01,000 --> 06:02,000
-Cue 	362	Start Time	06:01,000
-
-363
-06:02,000 --> 06:03,000
-Cue 	363	Start Time	06:02,000
-
-364
-06:03,000 --> 06:04,000
-Cue 	364	Start Time	06:03,000
-
-365
-06:04,000 --> 06:05,000
-Cue 	365	Start Time	06:04,000
-
-366
-06:05,000 --> 06:06,000
-Cue 	366	Start Time	06:05,000
-
-367
-06:06,000 --> 06:07,000
-Cue 	367	Start Time	06:06,000
-
-368
-06:07,000 --> 06:08,000
-Cue 	368	Start Time	06:07,000
-
-369
-06:08,000 --> 06:09,000
-Cue 	369	Start Time	06:08,000
-
-370
-06:09,000 --> 06:10,000
-Cue 	370	Start Time	06:09,000
-
-371
-06:10,000 --> 06:11,000
-Cue 	371	Start Time	06:10,000
-
-372
-06:11,000 --> 06:12,000
-Cue 	372	Start Time	06:11,000
-
-373
-06:12,000 --> 06:13,000
-Cue 	373	Start Time	06:12,000
-
-374
-06:13,000 --> 06:14,000
-Cue 	374	Start Time	06:13,000
-
-375
-06:14,000 --> 06:15,000
-Cue 	375	Start Time	06:14,000
-
-376
-06:15,000 --> 06:16,000
-Cue 	376	Start Time	06:15,000
-
-377
-06:16,000 --> 06:17,000
-Cue 	377	Start Time	06:16,000
-
-378
-06:17,000 --> 06:18,000
-Cue 	378	Start Time	06:17,000
-
-379
-06:18,000 --> 06:19,000
-Cue 	379	Start Time	06:18,000
-
-380
-06:19,000 --> 06:20,000
-Cue 	380	Start Time	06:19,000
-
-381
-06:20,000 --> 06:21,000
-Cue 	381	Start Time	06:20,000
-
-382
-06:21,000 --> 06:22,000
-Cue 	382	Start Time	06:21,000
-
-383
-06:22,000 --> 06:23,000
-Cue 	383	Start Time	06:22,000
-
-384
-06:23,000 --> 06:24,000
-Cue 	384	Start Time	06:23,000
-
-385
-06:24,000 --> 06:25,000
-Cue 	385	Start Time	06:24,000
-
-386
-06:25,000 --> 06:26,000
-Cue 	386	Start Time	06:25,000
-
-387
-06:26,000 --> 06:27,000
-Cue 	387	Start Time	06:26,000
-
-388
-06:27,000 --> 06:28,000
-Cue 	388	Start Time	06:27,000
-
-389
-06:28,000 --> 06:29,000
-Cue 	389	Start Time	06:28,000
-
-390
-06:29,000 --> 06:30,000
-Cue 	390	Start Time	06:29,000
-
-391
-06:30,000 --> 06:31,000
-Cue 	391	Start Time	06:30,000
-
-392
-06:31,000 --> 06:32,000
-Cue 	392	Start Time	06:31,000
-
-393
-06:32,000 --> 06:33,000
-Cue 	393	Start Time	06:32,000
-
-394
-06:33,000 --> 06:34,000
-Cue 	394	Start Time	06:33,000
-
-395
-06:34,000 --> 06:35,000
-Cue 	395	Start Time	06:34,000
-
-396
-06:35,000 --> 06:36,000
-Cue 	396	Start Time	06:35,000
-
-397
-06:36,000 --> 06:37,000
-Cue 	397	Start Time	06:36,000
-
-398
-06:37,000 --> 06:38,000
-Cue 	398	Start Time	06:37,000
-
-399
-06:38,000 --> 06:39,000
-Cue 	399	Start Time	06:38,000
-
-400
-06:39,000 --> 06:40,000
-Cue 	400	Start Time	06:39,000
-
-401
-06:40,000 --> 06:41,000
-Cue 	401	Start Time	06:40,000
-
-402
-06:41,000 --> 06:42,000
-Cue 	402	Start Time	06:41,000
-
-403
-06:42,000 --> 06:43,000
-Cue 	403	Start Time	06:42,000
-
-404
-06:43,000 --> 06:44,000
-Cue 	404	Start Time	06:43,000
-
-405
-06:44,000 --> 06:45,000
-Cue 	405	Start Time	06:44,000
-
-406
-06:45,000 --> 06:46,000
-Cue 	406	Start Time	06:45,000
-
-407
-06:46,000 --> 06:47,000
-Cue 	407	Start Time	06:46,000
-
-408
-06:47,000 --> 06:48,000
-Cue 	408	Start Time	06:47,000
-
-409
-06:48,000 --> 06:49,000
-Cue 	409	Start Time	06:48,000
-
-410
-06:49,000 --> 06:50,000
-Cue 	410	Start Time	06:49,000
-
-411
-06:50,000 --> 06:51,000
-Cue 	411	Start Time	06:50,000
-
-412
-06:51,000 --> 06:52,000
-Cue 	412	Start Time	06:51,000
-
-413
-06:52,000 --> 06:53,000
-Cue 	413	Start Time	06:52,000
-
-414
-06:53,000 --> 06:54,000
-Cue 	414	Start Time	06:53,000
-
-415
-06:54,000 --> 06:55,000
-Cue 	415	Start Time	06:54,000
-
-416
-06:55,000 --> 06:56,000
-Cue 	416	Start Time	06:55,000
-
-417
-06:56,000 --> 06:57,000
-Cue 	417	Start Time	06:56,000
-
-418
-06:57,000 --> 06:58,000
-Cue 	418	Start Time	06:57,000
-
-419
-06:58,000 --> 06:59,000
-Cue 	419	Start Time	06:58,000
-
-420
-06:59,000 --> 07:00,000
-Cue 	420	Start Time	06:59,000
-
-421
-07:00,000 --> 07:01,000
-Cue 	421	Start Time	07:00,000
-
-422
-07:01,000 --> 07:02,000
-Cue 	422	Start Time	07:01,000
-
-423
-07:02,000 --> 07:03,000
-Cue 	423	Start Time	07:02,000
-
-424
-07:03,000 --> 07:04,000
-Cue 	424	Start Time	07:03,000
-
-425
-07:04,000 --> 07:05,000
-Cue 	425	Start Time	07:04,000
-
-426
-07:05,000 --> 07:06,000
-Cue 	426	Start Time	07:05,000
-
-427
-07:06,000 --> 07:07,000
-Cue 	427	Start Time	07:06,000
-
-428
-07:07,000 --> 07:08,000
-Cue 	428	Start Time	07:07,000
-
-429
-07:08,000 --> 07:09,000
-Cue 	429	Start Time	07:08,000
-
-430
-07:09,000 --> 07:10,000
-Cue 	430	Start Time	07:09,000
-
-431
-07:10,000 --> 07:11,000
-Cue 	431	Start Time	07:10,000
-
-432
-07:11,000 --> 07:12,000
-Cue 	432	Start Time	07:11,000
-
-433
-07:12,000 --> 07:13,000
-Cue 	433	Start Time	07:12,000
-
-434
-07:13,000 --> 07:14,000
-Cue 	434	Start Time	07:13,000
-
-435
-07:14,000 --> 07:15,000
-Cue 	435	Start Time	07:14,000
-
-436
-07:15,000 --> 07:16,000
-Cue 	436	Start Time	07:15,000
-
-437
-07:16,000 --> 07:17,000
-Cue 	437	Start Time	07:16,000
-
-438
-07:17,000 --> 07:18,000
-Cue 	438	Start Time	07:17,000
-
-439
-07:18,000 --> 07:19,000
-Cue 	439	Start Time	07:18,000
-
-440
-07:19,000 --> 07:20,000
-Cue 	440	Start Time	07:19,000
-
-441
-07:20,000 --> 07:21,000
-Cue 	441	Start Time	07:20,000
-
-442
-07:21,000 --> 07:22,000
-Cue 	442	Start Time	07:21,000
-
-443
-07:22,000 --> 07:23,000
-Cue 	443	Start Time	07:22,000
-
-444
-07:23,000 --> 07:24,000
-Cue 	444	Start Time	07:23,000
-
-445
-07:24,000 --> 07:25,000
-Cue 	445	Start Time	07:24,000
-
-446
-07:25,000 --> 07:26,000
-Cue 	446	Start Time	07:25,000
-
-447
-07:26,000 --> 07:27,000
-Cue 	447	Start Time	07:26,000
-
-448
-07:27,000 --> 07:28,000
-Cue 	448	Start Time	07:27,000
-
-449
-07:28,000 --> 07:29,000
-Cue 	449	Start Time	07:28,000
-
-450
-07:29,000 --> 07:30,000
-Cue 	450	Start Time	07:29,000
-
-451
-07:30,000 --> 07:31,000
-Cue 	451	Start Time	07:30,000
-
-452
-07:31,000 --> 07:32,000
-Cue 	452	Start Time	07:31,000
-
-453
-07:32,000 --> 07:33,000
-Cue 	453	Start Time	07:32,000
-
-454
-07:33,000 --> 07:34,000
-Cue 	454	Start Time	07:33,000
-
-455
-07:34,000 --> 07:35,000
-Cue 	455	Start Time	07:34,000
-
-456
-07:35,000 --> 07:36,000
-Cue 	456	Start Time	07:35,000
-
-457
-07:36,000 --> 07:37,000
-Cue 	457	Start Time	07:36,000
-
-458
-07:37,000 --> 07:38,000
-Cue 	458	Start Time	07:37,000
-
-459
-07:38,000 --> 07:39,000
-Cue 	459	Start Time	07:38,000
-
-460
-07:39,000 --> 07:40,000
-Cue 	460	Start Time	07:39,000
-
-461
-07:40,000 --> 07:41,000
-Cue 	461	Start Time	07:40,000
-
-462
-07:41,000 --> 07:42,000
-Cue 	462	Start Time	07:41,000
-
-463
-07:42,000 --> 07:43,000
-Cue 	463	Start Time	07:42,000
-
-464
-07:43,000 --> 07:44,000
-Cue 	464	Start Time	07:43,000
-
-465
-07:44,000 --> 07:45,000
-Cue 	465	Start Time	07:44,000
-
-466
-07:45,000 --> 07:46,000
-Cue 	466	Start Time	07:45,000
-
-467
-07:46,000 --> 07:47,000
-Cue 	467	Start Time	07:46,000
-
-468
-07:47,000 --> 07:48,000
-Cue 	468	Start Time	07:47,000
-
-469
-07:48,000 --> 07:49,000
-Cue 	469	Start Time	07:48,000
-
-470
-07:49,000 --> 07:50,000
-Cue 	470	Start Time	07:49,000
-
-471
-07:50,000 --> 07:51,000
-Cue 	471	Start Time	07:50,000
-
-472
-07:51,000 --> 07:52,000
-Cue 	472	Start Time	07:51,000
-
-473
-07:52,000 --> 07:53,000
-Cue 	473	Start Time	07:52,000
-
-474
-07:53,000 --> 07:54,000
-Cue 	474	Start Time	07:53,000
-
-475
-07:54,000 --> 07:55,000
-Cue 	475	Start Time	07:54,000
-
-476
-07:55,000 --> 07:56,000
-Cue 	476	Start Time	07:55,000
-
-477
-07:56,000 --> 07:57,000
-Cue 	477	Start Time	07:56,000
-
-478
-07:57,000 --> 07:58,000
-Cue 	478	Start Time	07:57,000
-
-479
-07:58,000 --> 07:59,000
-Cue 	479	Start Time	07:58,000
-
-480
-07:59,000 --> 08:00,000
-Cue 	480	Start Time	07:59,000
-
-481
-08:00,000 --> 08:01,000
-Cue 	481	Start Time	08:00,000
-
-482
-08:01,000 --> 08:02,000
-Cue 	482	Start Time	08:01,000
-
-483
-08:02,000 --> 08:03,000
-Cue 	483	Start Time	08:02,000
-
-484
-08:03,000 --> 08:04,000
-Cue 	484	Start Time	08:03,000
-
-485
-08:04,000 --> 08:05,000
-Cue 	485	Start Time	08:04,000
-
-486
-08:05,000 --> 08:06,000
-Cue 	486	Start Time	08:05,000
-
-487
-08:06,000 --> 08:07,000
-Cue 	487	Start Time	08:06,000
-
-488
-08:07,000 --> 08:08,000
-Cue 	488	Start Time	08:07,000
-
-489
-08:08,000 --> 08:09,000
-Cue 	489	Start Time	08:08,000
-
-490
-08:09,000 --> 08:10,000
-Cue 	490	Start Time	08:09,000
-
-491
-08:10,000 --> 08:11,000
-Cue 	491	Start Time	08:10,000
-
-492
-08:11,000 --> 08:12,000
-Cue 	492	Start Time	08:11,000
-
-493
-08:12,000 --> 08:13,000
-Cue 	493	Start Time	08:12,000
-
-494
-08:13,000 --> 08:14,000
-Cue 	494	Start Time	08:13,000
-
-495
-08:14,000 --> 08:15,000
-Cue 	495	Start Time	08:14,000
-
-496
-08:15,000 --> 08:16,000
-Cue 	496	Start Time	08:15,000
-
-497
-08:16,000 --> 08:17,000
-Cue 	497	Start Time	08:16,000
-
-498
-08:17,000 --> 08:18,000
-Cue 	498	Start Time	08:17,000
-
-499
-08:18,000 --> 08:19,000
-Cue 	499	Start Time	08:18,000
-
-500
-08:19,000 --> 08:20,000
-Cue 	500	Start Time	08:19,000
-
-501
-08:20,000 --> 08:21,000
-Cue 	501	Start Time	08:20,000
-
-502
-08:21,000 --> 08:22,000
-Cue 	502	Start Time	08:21,000
-
-503
-08:22,000 --> 08:23,000
-Cue 	503	Start Time	08:22,000
-
-504
-08:23,000 --> 08:24,000
-Cue 	504	Start Time	08:23,000
-
-505
-08:24,000 --> 08:25,000
-Cue 	505	Start Time	08:24,000
-
-506
-08:25,000 --> 08:26,000
-Cue 	506	Start Time	08:25,000
-
-507
-08:26,000 --> 08:27,000
-Cue 	507	Start Time	08:26,000
-
-508
-08:27,000 --> 08:28,000
-Cue 	508	Start Time	08:27,000
-
-509
-08:28,000 --> 08:29,000
-Cue 	509	Start Time	08:28,000
-
-510
-08:29,000 --> 08:30,000
-Cue 	510	Start Time	08:29,000
-
-511
-08:30,000 --> 08:31,000
-Cue 	511	Start Time	08:30,000
-
-512
-08:31,000 --> 08:32,000
-Cue 	512	Start Time	08:31,000
-
-513
-08:32,000 --> 08:33,000
-Cue 	513	Start Time	08:32,000
-
-514
-08:33,000 --> 08:34,000
-Cue 	514	Start Time	08:33,000
-
-515
-08:34,000 --> 08:35,000
-Cue 	515	Start Time	08:34,000
-
-516
-08:35,000 --> 08:36,000
-Cue 	516	Start Time	08:35,000
-
-517
-08:36,000 --> 08:37,000
-Cue 	517	Start Time	08:36,000
-
-518
-08:37,000 --> 08:38,000
-Cue 	518	Start Time	08:37,000
-
-519
-08:38,000 --> 08:39,000
-Cue 	519	Start Time	08:38,000
-
-520
-08:39,000 --> 08:40,000
-Cue 	520	Start Time	08:39,000
-
-521
-08:40,000 --> 08:41,000
-Cue 	521	Start Time	08:40,000
-
-522
-08:41,000 --> 08:42,000
-Cue 	522	Start Time	08:41,000
-
-523
-08:42,000 --> 08:43,000
-Cue 	523	Start Time	08:42,000
-
-524
-08:43,000 --> 08:44,000
-Cue 	524	Start Time	08:43,000
-
-525
-08:44,000 --> 08:45,000
-Cue 	525	Start Time	08:44,000
-
-526
-08:45,000 --> 08:46,000
-Cue 	526	Start Time	08:45,000
-
-527
-08:46,000 --> 08:47,000
-Cue 	527	Start Time	08:46,000
-
-528
-08:47,000 --> 08:48,000
-Cue 	528	Start Time	08:47,000
-
-529
-08:48,000 --> 08:49,000
-Cue 	529	Start Time	08:48,000
-
-530
-08:49,000 --> 08:50,000
-Cue 	530	Start Time	08:49,000
-
-531
-08:50,000 --> 08:51,000
-Cue 	531	Start Time	08:50,000
-
-532
-08:51,000 --> 08:52,000
-Cue 	532	Start Time	08:51,000
-
-533
-08:52,000 --> 08:53,000
-Cue 	533	Start Time	08:52,000
-
-534
-08:53,000 --> 08:54,000
-Cue 	534	Start Time	08:53,000
-
-535
-08:54,000 --> 08:55,000
-Cue 	535	Start Time	08:54,000
-
-536
-08:55,000 --> 08:56,000
-Cue 	536	Start Time	08:55,000
-
-537
-08:56,000 --> 08:57,000
-Cue 	537	Start Time	08:56,000
-
-538
-08:57,000 --> 08:58,000
-Cue 	538	Start Time	08:57,000
-
-539
-08:58,000 --> 08:59,000
-Cue 	539	Start Time	08:58,000
-
-540
-08:59,000 --> 09:00,000
-Cue 	540	Start Time	08:59,000
-
-541
-09:00,000 --> 09:01,000
-Cue 	541	Start Time	09:00,000
-
-542
-09:01,000 --> 09:02,000
-Cue 	542	Start Time	09:01,000
-
-543
-09:02,000 --> 09:03,000
-Cue 	543	Start Time	09:02,000
-
-544
-09:03,000 --> 09:04,000
-Cue 	544	Start Time	09:03,000
-
-545
-09:04,000 --> 09:05,000
-Cue 	545	Start Time	09:04,000
-
-546
-09:05,000 --> 09:06,000
-Cue 	546	Start Time	09:05,000
-
-547
-09:06,000 --> 09:07,000
-Cue 	547	Start Time	09:06,000
-
-548
-09:07,000 --> 09:08,000
-Cue 	548	Start Time	09:07,000
-
-549
-09:08,000 --> 09:09,000
-Cue 	549	Start Time	09:08,000
-
-550
-09:09,000 --> 09:10,000
-Cue 	550	Start Time	09:09,000
-
-551
-09:10,000 --> 09:11,000
-Cue 	551	Start Time	09:10,000
-
-552
-09:11,000 --> 09:12,000
-Cue 	552	Start Time	09:11,000
-
-553
-09:12,000 --> 09:13,000
-Cue 	553	Start Time	09:12,000
-
-554
-09:13,000 --> 09:14,000
-Cue 	554	Start Time	09:13,000
-
-555
-09:14,000 --> 09:15,000
-Cue 	555	Start Time	09:14,000
-
-556
-09:15,000 --> 09:16,000
-Cue 	556	Start Time	09:15,000
-
-557
-09:16,000 --> 09:17,000
-Cue 	557	Start Time	09:16,000
-
-558
-09:17,000 --> 09:18,000
-Cue 	558	Start Time	09:17,000
-
-559
-09:18,000 --> 09:19,000
-Cue 	559	Start Time	09:18,000
-
-560
-09:19,000 --> 09:20,000
-Cue 	560	Start Time	09:19,000
-
-561
-09:20,000 --> 09:21,000
-Cue 	561	Start Time	09:20,000
-
-562
-09:21,000 --> 09:22,000
-Cue 	562	Start Time	09:21,000
-
-563
-09:22,000 --> 09:23,000
-Cue 	563	Start Time	09:22,000
-
-564
-09:23,000 --> 09:24,000
-Cue 	564	Start Time	09:23,000
-
-565
-09:24,000 --> 09:25,000
-Cue 	565	Start Time	09:24,000
-
-566
-09:25,000 --> 09:26,000
-Cue 	566	Start Time	09:25,000
-
-567
-09:26,000 --> 09:27,000
-Cue 	567	Start Time	09:26,000
-
-568
-09:27,000 --> 09:28,000
-Cue 	568	Start Time	09:27,000
-
-569
-09:28,000 --> 09:29,000
-Cue 	569	Start Time	09:28,000
-
-570
-09:29,000 --> 09:30,000
-Cue 	570	Start Time	09:29,000
-
-571
-09:30,000 --> 09:31,000
-Cue 	571	Start Time	09:30,000
-
-572
-09:31,000 --> 09:32,000
-Cue 	572	Start Time	09:31,000
-
-573
-09:32,000 --> 09:33,000
-Cue 	573	Start Time	09:32,000
-
-574
-09:33,000 --> 09:34,000
-Cue 	574	Start Time	09:33,000
-
-575
-09:34,000 --> 09:35,000
-Cue 	575	Start Time	09:34,000
-
-576
-09:35,000 --> 09:36,000
-Cue 	576	Start Time	09:35,000
-
-577
-09:36,000 --> 09:37,000
-Cue 	577	Start Time	09:36,000
-
-578
-09:37,000 --> 09:38,000
-Cue 	578	Start Time	09:37,000
-
-579
-09:38,000 --> 09:39,000
-Cue 	579	Start Time	09:38,000
-
-580
-09:39,000 --> 09:40,000
-Cue 	580	Start Time	09:39,000
-
-581
-09:40,000 --> 09:41,000
-Cue 	581	Start Time	09:40,000
-
-582
-09:41,000 --> 09:42,000
-Cue 	582	Start Time	09:41,000
-
-583
-09:42,000 --> 09:43,000
-Cue 	583	Start Time	09:42,000
-
-584
-09:43,000 --> 09:44,000
-Cue 	584	Start Time	09:43,000
-
-585
-09:44,000 --> 09:45,000
-Cue 	585	Start Time	09:44,000
-
-586
-09:45,000 --> 09:46,000
-Cue 	586	Start Time	09:45,000
-
-587
-09:46,000 --> 09:47,000
-Cue 	587	Start Time	09:46,000
-
-588
-09:47,000 --> 09:48,000
-Cue 	588	Start Time	09:47,000
-
-589
-09:48,000 --> 09:49,000
-Cue 	589	Start Time	09:48,000
-
-590
-09:49,000 --> 09:50,000
-Cue 	590	Start Time	09:49,000
-
-591
-09:50,000 --> 09:51,000
-Cue 	591	Start Time	09:50,000
-
-592
-09:51,000 --> 09:52,000
-Cue 	592	Start Time	09:51,000
-
-593
-09:52,000 --> 09:53,000
-Cue 	593	Start Time	09:52,000
-
-594
-09:53,000 --> 09:54,000
-Cue 	594	Start Time	09:53,000
-
-595
-09:54,000 --> 09:55,000
-Cue 	595	Start Time	09:54,000
-
-596
-09:55,000 --> 09:56,000
-Cue 	596	Start Time	09:55,000
-
-597
-09:56,000 --> 09:57,000
-Cue 	597	Start Time	09:56,000
-
-598
-09:57,000 --> 09:58,000
-Cue 	598	Start Time	09:57,000
-
-599
-09:58,000 --> 09:59,000
-Cue 	599	Start Time	09:58,000
-
-600
-09:59,000 --> 10:00,000
-Cue 	600	Start Time	09:59,000
-

gpac-0.8.0.tar.gz/tests/media/webvtt/counter.vtt Deleted

@@ -1,4502 +0,0 @@
-WEBVTT
-
-00:00.000	--> 	00:00.040	
-0	-	00:00.000	
-
-00:00.040	--> 	00:00.080	
-1	-	00:00.040	
-
-00:00.080	--> 	00:00.120	
-2	-	00:00.080	
-
-00:00.120	--> 	00:00.160	
-3	-	00:00.120	
-
-00:00.160	--> 	00:00.200	
-4	-	00:00.160	
-
-00:00.200	--> 	00:00.240	
-5	-	00:00.200	
-
-00:00.240	--> 	00:00.280	
-6	-	00:00.240	
-
-00:00.280	--> 	00:00.320	
-7	-	00:00.280	
-
-00:00.320	--> 	00:00.360	
-8	-	00:00.320	
-
-00:00.360	--> 	00:00.400	
-9	-	00:00.360	
-
-00:00.400	--> 	00:00.440	
-10	-	00:00.400	
-
-00:00.440	--> 	00:00.480	
-11	-	00:00.440	
-
-00:00.480	--> 	00:00.520	
-12	-	00:00.480	
-
-00:00.520	--> 	00:00.560	
-13	-	00:00.520	
-
-00:00.560	--> 	00:00.600	
-14	-	00:00.560	
-
-00:00.600	--> 	00:00.640	
-15	-	00:00.600	
-
-00:00.640	--> 	00:00.680	
-16	-	00:00.640	
-
-00:00.680	--> 	00:00.720	
-17	-	00:00.680	
-
-00:00.720	--> 	00:00.760	
-18	-	00:00.720	
-
-00:00.760	--> 	00:00.800	
-19	-	00:00.760	
-
-00:00.800	--> 	00:00.840	
-20	-	00:00.800	
-
-00:00.840	--> 	00:00.880	
-21	-	00:00.840	
-
-00:00.880	--> 	00:00.920	
-22	-	00:00.880	
-
-00:00.920	--> 	00:00.960	
-23	-	00:00.920	
-
-00:00.960	--> 	00:01.000	
-24	-	00:00.960	
-
-00:01.000	--> 	00:01.040	
-25	-	00:01.000	
-
-00:01.040	--> 	00:01.080	
-26	-	00:01.040	
-
-00:01.080	--> 	00:01.120	
-27	-	00:01.080	
-
-00:01.120	--> 	00:01.160	
-28	-	00:01.120	
-
-00:01.160	--> 	00:01.200	
-29	-	00:01.160	
-
-00:01.200	--> 	00:01.240	
-30	-	00:01.200	
-
-00:01.240	--> 	00:01.280	
-31	-	00:01.240	
-
-00:01.280	--> 	00:01.320	
-32	-	00:01.280	
-
-00:01.320	--> 	00:01.360	
-33	-	00:01.320	
-
-00:01.360	--> 	00:01.400	
-34	-	00:01.360	
-
-00:01.400	--> 	00:01.440	
-35	-	00:01.400	
-
-00:01.440	--> 	00:01.480	
-36	-	00:01.440	
-
-00:01.480	--> 	00:01.520	
-37	-	00:01.480	
-
-00:01.520	--> 	00:01.560	
-38	-	00:01.520	
-
-00:01.560	--> 	00:01.600	
-39	-	00:01.560	
-
-00:01.600	--> 	00:01.640	
-40	-	00:01.600	
-
-00:01.640	--> 	00:01.680	
-41	-	00:01.640	
-
-00:01.680	--> 	00:01.720	
-42	-	00:01.680	
-
-00:01.720	--> 	00:01.760	
-43	-	00:01.720	
-
-00:01.760	--> 	00:01.800	
-44	-	00:01.760	
-
-00:01.800	--> 	00:01.840	
-45	-	00:01.800	
-
-00:01.840	--> 	00:01.880	
-46	-	00:01.840	
-
-00:01.880	--> 	00:01.920	
-47	-	00:01.880	
-
-00:01.920	--> 	00:01.960	
-48	-	00:01.920	
-
-00:01.960	--> 	00:02.000	
-49	-	00:01.960	
-
-00:02.000	--> 	00:02.040	
-50	-	00:02.000	
-
-00:02.040	--> 	00:02.080	
-51	-	00:02.040	
-
-00:02.080	--> 	00:02.120	
-52	-	00:02.080	
-
-00:02.120	--> 	00:02.160	
-53	-	00:02.120	
-
-00:02.160	--> 	00:02.200	
-54	-	00:02.160	
-
-00:02.200	--> 	00:02.240	
-55	-	00:02.200	
-
-00:02.240	--> 	00:02.280	
-56	-	00:02.240	
-
-00:02.280	--> 	00:02.320	
-57	-	00:02.280	
-
-00:02.320	--> 	00:02.360	
-58	-	00:02.320	
-
-00:02.360	--> 	00:02.400	
-59	-	00:02.360	
-
-00:02.400	--> 	00:02.440	
-60	-	00:02.400	
-
-00:02.440	--> 	00:02.480	
-61	-	00:02.440	
-
-00:02.480	--> 	00:02.520	
-62	-	00:02.480	
-
-00:02.520	--> 	00:02.560	
-63	-	00:02.520	
-
-00:02.560	--> 	00:02.600	
-64	-	00:02.560	
-
-00:02.600	--> 	00:02.640	
-65	-	00:02.600	
-
-00:02.640	--> 	00:02.680	
-66	-	00:02.640	
-
-00:02.680	--> 	00:02.720	
-67	-	00:02.680	
-
-00:02.720	--> 	00:02.760	
-68	-	00:02.720	
-
-00:02.760	--> 	00:02.800	
-69	-	00:02.760	
-
-00:02.800	--> 	00:02.840	
-70	-	00:02.800	
-
-00:02.840	--> 	00:02.880	
-71	-	00:02.840	
-
-00:02.880	--> 	00:02.920	
-72	-	00:02.880	
-
-00:02.920	--> 	00:02.960	
-73	-	00:02.920	
-
-00:02.960	--> 	00:03.000	
-74	-	00:02.960	
-
-00:03.000	--> 	00:03.040	
-75	-	00:03.000	
-
-00:03.040	--> 	00:03.080	
-76	-	00:03.040	
-
-00:03.080	--> 	00:03.120	
-77	-	00:03.080	
-
-00:03.120	--> 	00:03.160	
-78	-	00:03.120	
-
-00:03.160	--> 	00:03.200	
-79	-	00:03.160	
-
-00:03.200	--> 	00:03.240	
-80	-	00:03.200	
-
-00:03.240	--> 	00:03.280	
-81	-	00:03.240	
-
-00:03.280	--> 	00:03.320	
-82	-	00:03.280	
-
-00:03.320	--> 	00:03.360	
-83	-	00:03.320	
-
-00:03.360	--> 	00:03.400	
-84	-	00:03.360	
-
-00:03.400	--> 	00:03.440	
-85	-	00:03.400	
-
-00:03.440	--> 	00:03.480	
-86	-	00:03.440	
-
-00:03.480	--> 	00:03.520	
-87	-	00:03.480	
-
-00:03.520	--> 	00:03.560	
-88	-	00:03.520	
-
-00:03.560	--> 	00:03.600	
-89	-	00:03.560	
-
-00:03.600	--> 	00:03.640	
-90	-	00:03.600	
-
-00:03.640	--> 	00:03.680	
-91	-	00:03.640	
-
-00:03.680	--> 	00:03.720	
-92	-	00:03.680	
-
-00:03.720	--> 	00:03.760	
-93	-	00:03.720	
-
-00:03.760	--> 	00:03.800	
-94	-	00:03.760	
-
-00:03.800	--> 	00:03.840	
-95	-	00:03.800	
-
-00:03.840	--> 	00:03.880	
-96	-	00:03.840	
-
-00:03.880	--> 	00:03.920	
-97	-	00:03.880	
-
-00:03.920	--> 	00:03.960	
-98	-	00:03.920	
-
-00:03.960	--> 	00:04.000	
-99	-	00:03.960	
-
-00:04.000	--> 	00:04.040	
-100	-	00:04.000	
-
-00:04.040	--> 	00:04.080	
-101	-	00:04.040	
-
-00:04.080	--> 	00:04.120	
-102	-	00:04.080	
-
-00:04.120	--> 	00:04.160	
-103	-	00:04.120	
-
-00:04.160	--> 	00:04.200	
-104	-	00:04.160	
-
-00:04.200	--> 	00:04.240	
-105	-	00:04.200	
-
-00:04.240	--> 	00:04.280	
-106	-	00:04.240	
-
-00:04.280	--> 	00:04.320	
-107	-	00:04.280	
-
-00:04.320	--> 	00:04.360	
-108	-	00:04.320	
-
-00:04.360	--> 	00:04.400	
-109	-	00:04.360	
-
-00:04.400	--> 	00:04.440	
-110	-	00:04.400	
-
-00:04.440	--> 	00:04.480	
-111	-	00:04.440	
-
-00:04.480	--> 	00:04.520	
-112	-	00:04.480	
-
-00:04.520	--> 	00:04.560	
-113	-	00:04.520	
-
-00:04.560	--> 	00:04.600	
-114	-	00:04.560	
-
-00:04.600	--> 	00:04.640	
-115	-	00:04.600	
-
-00:04.640	--> 	00:04.680	
-116	-	00:04.640	
-
-00:04.680	--> 	00:04.720	
-117	-	00:04.680	
-
-00:04.720	--> 	00:04.760	
-118	-	00:04.720	
-
-00:04.760	--> 	00:04.800	
-119	-	00:04.760	
-
-00:04.800	--> 	00:04.840	
-120	-	00:04.800	
-
-00:04.840	--> 	00:04.880	
-121	-	00:04.840	
-
-00:04.880	--> 	00:04.920	
-122	-	00:04.880	
-
-00:04.920	--> 	00:04.960	
-123	-	00:04.920	
-
-00:04.960	--> 	00:05.000	
-124	-	00:04.960	
-
-00:05.000	--> 	00:05.040	
-125	-	00:05.000	
-
-00:05.040	--> 	00:05.080	
-126	-	00:05.040	
-
-00:05.080	--> 	00:05.120	
-127	-	00:05.080	
-
-00:05.120	--> 	00:05.160	
-128	-	00:05.120	
-
-00:05.160	--> 	00:05.200	
-129	-	00:05.160	
-
-00:05.200	--> 	00:05.240	
-130	-	00:05.200	
-
-00:05.240	--> 	00:05.280	
-131	-	00:05.240	
-
-00:05.280	--> 	00:05.320	
-132	-	00:05.280	
-
-00:05.320	--> 	00:05.360	
-133	-	00:05.320	
-
-00:05.360	--> 	00:05.400	
-134	-	00:05.360	
-
-00:05.400	--> 	00:05.440	
-135	-	00:05.400	
-
-00:05.440	--> 	00:05.480	
-136	-	00:05.440	
-
-00:05.480	--> 	00:05.520	
-137	-	00:05.480	
-
-00:05.520	--> 	00:05.560	
-138	-	00:05.520	
-
-00:05.560	--> 	00:05.600	
-139	-	00:05.560	
-
-00:05.600	--> 	00:05.640	
-140	-	00:05.600	
-
-00:05.640	--> 	00:05.680	
-141	-	00:05.640	
-
-00:05.680	--> 	00:05.720	
-142	-	00:05.680	
-
-00:05.720	--> 	00:05.760	
-143	-	00:05.720	
-
-00:05.760	--> 	00:05.800	
-144	-	00:05.760	
-
-00:05.800	--> 	00:05.840	
-145	-	00:05.800	
-
-00:05.840	--> 	00:05.880	
-146	-	00:05.840	
-
-00:05.880	--> 	00:05.920	
-147	-	00:05.880	
-
-00:05.920	--> 	00:05.960	
-148	-	00:05.920	
-
-00:05.960	--> 	00:06.000	
-149	-	00:05.960	
-
-00:06.000	--> 	00:06.040	
-150	-	00:06.000	
-
-00:06.040	--> 	00:06.080	
-151	-	00:06.040	
-
-00:06.080	--> 	00:06.120	
-152	-	00:06.080	
-
-00:06.120	--> 	00:06.160	
-153	-	00:06.120	
-
-00:06.160	--> 	00:06.200	
-154	-	00:06.160	
-
-00:06.200	--> 	00:06.240	
-155	-	00:06.200	
-
-00:06.240	--> 	00:06.280	
-156	-	00:06.240	
-
-00:06.280	--> 	00:06.320	
-157	-	00:06.280	
-
-00:06.320	--> 	00:06.360	
-158	-	00:06.320	
-
-00:06.360	--> 	00:06.400	
-159	-	00:06.360	
-
-00:06.400	--> 	00:06.440	
-160	-	00:06.400	
-
-00:06.440	--> 	00:06.480	
-161	-	00:06.440	
-
-00:06.480	--> 	00:06.520	
-162	-	00:06.480	
-
-00:06.520	--> 	00:06.560	
-163	-	00:06.520	
-
-00:06.560	--> 	00:06.600	
-164	-	00:06.560	
-
-00:06.600	--> 	00:06.640	
-165	-	00:06.600	
-
-00:06.640	--> 	00:06.680	
-166	-	00:06.640	
-
-00:06.680	--> 	00:06.720	
-167	-	00:06.680	
-
-00:06.720	--> 	00:06.760	
-168	-	00:06.720	
-
-00:06.760	--> 	00:06.800	
-169	-	00:06.760	
-
-00:06.800	--> 	00:06.840	
-170	-	00:06.800	
-
-00:06.840	--> 	00:06.880	
-171	-	00:06.840	
-
-00:06.880	--> 	00:06.920	
-172	-	00:06.880	
-
-00:06.920	--> 	00:06.960	
-173	-	00:06.920	
-
-00:06.960	--> 	00:07.000	
-174	-	00:06.960	
-
-00:07.000	--> 	00:07.040	
-175	-	00:07.000	
-
-00:07.040	--> 	00:07.080	
-176	-	00:07.040	
-
-00:07.080	--> 	00:07.120	
-177	-	00:07.080	
-
-00:07.120	--> 	00:07.160	
-178	-	00:07.120	
-
-00:07.160	--> 	00:07.200	
-179	-	00:07.160	
-
-00:07.200	--> 	00:07.240	
-180	-	00:07.200	
-
-00:07.240	--> 	00:07.280	
-181	-	00:07.240	
-
-00:07.280	--> 	00:07.320	
-182	-	00:07.280	
-
-00:07.320	--> 	00:07.360	
-183	-	00:07.320	
-
-00:07.360	--> 	00:07.400	
-184	-	00:07.360	
-
-00:07.400	--> 	00:07.440	
-185	-	00:07.400	
-
-00:07.440	--> 	00:07.480	
-186	-	00:07.440	
-
-00:07.480	--> 	00:07.520	
-187	-	00:07.480	
-
-00:07.520	--> 	00:07.560	
-188	-	00:07.520	
-
-00:07.560	--> 	00:07.600	
-189	-	00:07.560	
-
-00:07.600	--> 	00:07.640	
-190	-	00:07.600	
-
-00:07.640	--> 	00:07.680	
-191	-	00:07.640	
-
-00:07.680	--> 	00:07.720	
-192	-	00:07.680	
-
-00:07.720	--> 	00:07.760	
-193	-	00:07.720	
-
-00:07.760	--> 	00:07.800	
-194	-	00:07.760	
-
-00:07.800	--> 	00:07.840	
-195	-	00:07.800	
-
-00:07.840	--> 	00:07.880	
-196	-	00:07.840	
-
-00:07.880	--> 	00:07.920	
-197	-	00:07.880	
-
-00:07.920	--> 	00:07.960	
-198	-	00:07.920	
-
-00:07.960	--> 	00:08.000	
-199	-	00:07.960	
-
-00:08.000	--> 	00:08.040	
-200	-	00:08.000	
-
-00:08.040	--> 	00:08.080	
-201	-	00:08.040	
-
-00:08.080	--> 	00:08.120	
-202	-	00:08.080	
-
-00:08.120	--> 	00:08.160	
-203	-	00:08.120	
-
-00:08.160	--> 	00:08.200	
-204	-	00:08.160	
-
-00:08.200	--> 	00:08.240	
-205	-	00:08.200	
-
-00:08.240	--> 	00:08.280	
-206	-	00:08.240	
-
-00:08.280	--> 	00:08.320	
-207	-	00:08.280	
-
-00:08.320	--> 	00:08.360	
-208	-	00:08.320	
-
-00:08.360	--> 	00:08.400	
-209	-	00:08.360	
-
-00:08.400	--> 	00:08.440	
-210	-	00:08.400	
-
-00:08.440	--> 	00:08.480	
-211	-	00:08.440	
-
-00:08.480	--> 	00:08.520	
-212	-	00:08.480	
-
-00:08.520	--> 	00:08.560	
-213	-	00:08.520	
-
-00:08.560	--> 	00:08.600	
-214	-	00:08.560	
-
-00:08.600	--> 	00:08.640	
-215	-	00:08.600	
-
-00:08.640	--> 	00:08.680	
-216	-	00:08.640	
-
-00:08.680	--> 	00:08.720	
-217	-	00:08.680	
-
-00:08.720	--> 	00:08.760	
-218	-	00:08.720	
-
-00:08.760	--> 	00:08.800	
-219	-	00:08.760	
-
-00:08.800	--> 	00:08.840	
-220	-	00:08.800	
-
-00:08.840	--> 	00:08.880	
-221	-	00:08.840	
-
-00:08.880	--> 	00:08.920	
-222	-	00:08.880	
-
-00:08.920	--> 	00:08.960	
-223	-	00:08.920	
-
-00:08.960	--> 	00:09.000	
-224	-	00:08.960	
-
-00:09.000	--> 	00:09.040	
-225	-	00:09.000	
-
-00:09.040	--> 	00:09.080	
-226	-	00:09.040	
-
-00:09.080	--> 	00:09.120	
-227	-	00:09.080	
-
-00:09.120	--> 	00:09.160	
-228	-	00:09.120	
-
-00:09.160	--> 	00:09.200	
-229	-	00:09.160	
-
-00:09.200	--> 	00:09.240	
-230	-	00:09.200	
-
-00:09.240	--> 	00:09.280	
-231	-	00:09.240	
-
-00:09.280	--> 	00:09.320	
-232	-	00:09.280	
-
-00:09.320	--> 	00:09.360	
-233	-	00:09.320	
-
-00:09.360	--> 	00:09.400	
-234	-	00:09.360	
-
-00:09.400	--> 	00:09.440	
-235	-	00:09.400	
-
-00:09.440	--> 	00:09.480	
-236	-	00:09.440	
-
-00:09.480	--> 	00:09.520	
-237	-	00:09.480	
-
-00:09.520	--> 	00:09.560	
-238	-	00:09.520	
-
-00:09.560	--> 	00:09.600	
-239	-	00:09.560	
-
-00:09.600	--> 	00:09.640	
-240	-	00:09.600	
-
-00:09.640	--> 	00:09.680	
-241	-	00:09.640	
-
-00:09.680	--> 	00:09.720	
-242	-	00:09.680	
-
-00:09.720	--> 	00:09.760	
-243	-	00:09.720	
-
-00:09.760	--> 	00:09.800	
-244	-	00:09.760	
-
-00:09.800	--> 	00:09.840	
-245	-	00:09.800	
-
-00:09.840	--> 	00:09.880	
-246	-	00:09.840	
-
-00:09.880	--> 	00:09.920	
-247	-	00:09.880	
-
-00:09.920	--> 	00:09.960	
-248	-	00:09.920	
-
-00:09.960	--> 	00:10.000	
-249	-	00:09.960	
-
-00:10.000	--> 	00:10.040	
-250	-	00:10.000	
-
-00:10.040	--> 	00:10.080	
-251	-	00:10.040	
-
-00:10.080	--> 	00:10.120	
-252	-	00:10.080	
-
-00:10.120	--> 	00:10.160	
-253	-	00:10.120	
-
-00:10.160	--> 	00:10.200	
-254	-	00:10.160	
-
-00:10.200	--> 	00:10.240	
-255	-	00:10.200	
-
-00:10.240	--> 	00:10.280	
-256	-	00:10.240	
-
-00:10.280	--> 	00:10.320	
-257	-	00:10.280	
-
-00:10.320	--> 	00:10.360	
-258	-	00:10.320	
-
-00:10.360	--> 	00:10.400	
-259	-	00:10.360	
-
-00:10.400	--> 	00:10.440	
-260	-	00:10.400	
-
-00:10.440	--> 	00:10.480	
-261	-	00:10.440	
-
-00:10.480	--> 	00:10.520	
-262	-	00:10.480	
-
-00:10.520	--> 	00:10.560	
-263	-	00:10.520	
-
-00:10.560	--> 	00:10.600	
-264	-	00:10.560	
-
-00:10.600	--> 	00:10.640	
-265	-	00:10.600	
-
-00:10.640	--> 	00:10.680	
-266	-	00:10.640	
-
-00:10.680	--> 	00:10.720	
-267	-	00:10.680	
-
-00:10.720	--> 	00:10.760	
-268	-	00:10.720	
-
-00:10.760	--> 	00:10.800	
-269	-	00:10.760	
-
-00:10.800	--> 	00:10.840	
-270	-	00:10.800	
-
-00:10.840	--> 	00:10.880	
-271	-	00:10.840	
-
-00:10.880	--> 	00:10.920	
-272	-	00:10.880	
-
-00:10.920	--> 	00:10.960	
-273	-	00:10.920	
-
-00:10.960	--> 	00:11.000	
-274	-	00:10.960	
-
-00:11.000	--> 	00:11.040	
-275	-	00:11.000	
-
-00:11.040	--> 	00:11.080	
-276	-	00:11.040	
-
-00:11.080	--> 	00:11.120	
-277	-	00:11.080	
-
-00:11.120	--> 	00:11.160	
-278	-	00:11.120	
-
-00:11.160	--> 	00:11.200	
-279	-	00:11.160	
-
-00:11.200	--> 	00:11.240	
-280	-	00:11.200	
-
-00:11.240	--> 	00:11.280	
-281	-	00:11.240	
-
-00:11.280	--> 	00:11.320	
-282	-	00:11.280	
-
-00:11.320	--> 	00:11.360	
-283	-	00:11.320	
-
-00:11.360	--> 	00:11.400	
-284	-	00:11.360	
-
-00:11.400	--> 	00:11.440	
-285	-	00:11.400	
-
-00:11.440	--> 	00:11.480	
-286	-	00:11.440	
-
-00:11.480	--> 	00:11.520	
-287	-	00:11.480	
-
-00:11.520	--> 	00:11.560	
-288	-	00:11.520	
-
-00:11.560	--> 	00:11.600	
-289	-	00:11.560	
-
-00:11.600	--> 	00:11.640	
-290	-	00:11.600	
-
-00:11.640	--> 	00:11.680	
-291	-	00:11.640	
-
-00:11.680	--> 	00:11.720	
-292	-	00:11.680	
-
-00:11.720	--> 	00:11.760	
-293	-	00:11.720	
-
-00:11.760	--> 	00:11.800	
-294	-	00:11.760	
-
-00:11.800	--> 	00:11.840	
-295	-	00:11.800	
-
-00:11.840	--> 	00:11.880	
-296	-	00:11.840	
-
-00:11.880	--> 	00:11.920	
-297	-	00:11.880	
-
-00:11.920	--> 	00:11.960	
-298	-	00:11.920	
-
-00:11.960	--> 	00:12.000	
-299	-	00:11.960	
-
-00:12.000	--> 	00:12.040	
-300	-	00:12.000	
-
-00:12.040	--> 	00:12.080	
-301	-	00:12.040	
-
-00:12.080	--> 	00:12.120	
-302	-	00:12.080	
-
-00:12.120	--> 	00:12.160	
-303	-	00:12.120	
-
-00:12.160	--> 	00:12.200	
-304	-	00:12.160	
-
-00:12.200	--> 	00:12.240	
-305	-	00:12.200	
-
-00:12.240	--> 	00:12.280	
-306	-	00:12.240	
-
-00:12.280	--> 	00:12.320	
-307	-	00:12.280	
-
-00:12.320	--> 	00:12.360	
-308	-	00:12.320	
-
-00:12.360	--> 	00:12.400	
-309	-	00:12.360	
-
-00:12.400	--> 	00:12.440	
-310	-	00:12.400	
-
-00:12.440	--> 	00:12.480	
-311	-	00:12.440	
-
-00:12.480	--> 	00:12.520	
-312	-	00:12.480	
-
-00:12.520	--> 	00:12.560	
-313	-	00:12.520	
-
-00:12.560	--> 	00:12.600	
-314	-	00:12.560	
-
-00:12.600	--> 	00:12.640	
-315	-	00:12.600	
-
-00:12.640	--> 	00:12.680	
-316	-	00:12.640	
-
-00:12.680	--> 	00:12.720	
-317	-	00:12.680	
-
-00:12.720	--> 	00:12.760	
-318	-	00:12.720	
-
-00:12.760	--> 	00:12.800	
-319	-	00:12.760	
-
-00:12.800	--> 	00:12.840	
-320	-	00:12.800	
-
-00:12.840	--> 	00:12.880	
-321	-	00:12.840	
-
-00:12.880	--> 	00:12.920	
-322	-	00:12.880	
-
-00:12.920	--> 	00:12.960	
-323	-	00:12.920	
-
-00:12.960	--> 	00:13.000	
-324	-	00:12.960	
-
-00:13.000	--> 	00:13.040	
-325	-	00:13.000	
-
-00:13.040	--> 	00:13.080	
-326	-	00:13.040	
-
-00:13.080	--> 	00:13.120	
-327	-	00:13.080	
-
-00:13.120	--> 	00:13.160	
-328	-	00:13.120	
-
-00:13.160	--> 	00:13.200	
-329	-	00:13.160	
-
-00:13.200	--> 	00:13.240	
-330	-	00:13.200	
-
-00:13.240	--> 	00:13.280	
-331	-	00:13.240	
-
-00:13.280	--> 	00:13.320	
-332	-	00:13.280	
-
-00:13.320	--> 	00:13.360	
-333	-	00:13.320	
-
-00:13.360	--> 	00:13.400	
-334	-	00:13.360	
-
-00:13.400	--> 	00:13.440	
-335	-	00:13.400	
-
-00:13.440	--> 	00:13.480	
-336	-	00:13.440	
-
-00:13.480	--> 	00:13.520	
-337	-	00:13.480	
-
-00:13.520	--> 	00:13.560	
-338	-	00:13.520	
-
-00:13.560	--> 	00:13.600	
-339	-	00:13.560	
-
-00:13.600	--> 	00:13.640	
-340	-	00:13.600	
-
-00:13.640	--> 	00:13.680	
-341	-	00:13.640	
-
-00:13.680	--> 	00:13.720	
-342	-	00:13.680	
-
-00:13.720	--> 	00:13.760	
-343	-	00:13.720	
-
-00:13.760	--> 	00:13.800	
-344	-	00:13.760	
-
-00:13.800	--> 	00:13.840	
-345	-	00:13.800	
-
-00:13.840	--> 	00:13.880	
-346	-	00:13.840	
-
-00:13.880	--> 	00:13.920	
-347	-	00:13.880	
-
-00:13.920	--> 	00:13.960	
-348	-	00:13.920	
-
-00:13.960	--> 	00:14.000	
-349	-	00:13.960	
-
-00:14.000	--> 	00:14.040	
-350	-	00:14.000	
-
-00:14.040	--> 	00:14.080	
-351	-	00:14.040	
-
-00:14.080	--> 	00:14.120	
-352	-	00:14.080	
-
-00:14.120	--> 	00:14.160	
-353	-	00:14.120	
-
-00:14.160	--> 	00:14.200	
-354	-	00:14.160	
-
-00:14.200	--> 	00:14.240	
-355	-	00:14.200	
-
-00:14.240	--> 	00:14.280	
-356	-	00:14.240	
-
-00:14.280	--> 	00:14.320	
-357	-	00:14.280	
-
-00:14.320	--> 	00:14.360	
-358	-	00:14.320	
-
-00:14.360	--> 	00:14.400	
-359	-	00:14.360	
-
-00:14.400	--> 	00:14.440	
-360	-	00:14.400	
-
-00:14.440	--> 	00:14.480	
-361	-	00:14.440	
-
-00:14.480	--> 	00:14.520	
-362	-	00:14.480	
-
-00:14.520	--> 	00:14.560	
-363	-	00:14.520	
-
-00:14.560	--> 	00:14.600	
-364	-	00:14.560	
-
-00:14.600	--> 	00:14.640	
-365	-	00:14.600	
-
-00:14.640	--> 	00:14.680	
-366	-	00:14.640	
-
-00:14.680	--> 	00:14.720	
-367	-	00:14.680	
-
-00:14.720	--> 	00:14.760	
-368	-	00:14.720	
-
-00:14.760	--> 	00:14.800	
-369	-	00:14.760	
-
-00:14.800	--> 	00:14.840	
-370	-	00:14.800	
-
-00:14.840	--> 	00:14.880	
-371	-	00:14.840	
-
-00:14.880	--> 	00:14.920	
-372	-	00:14.880	
-
-00:14.920	--> 	00:14.960	
-373	-	00:14.920	
-
-00:14.960	--> 	00:15.000	
-374	-	00:14.960	
-
-00:15.000	--> 	00:15.040	
-375	-	00:15.000	
-
-00:15.040	--> 	00:15.080	
-376	-	00:15.040	
-
-00:15.080	--> 	00:15.120	
-377	-	00:15.080	
-
-00:15.120	--> 	00:15.160	
-378	-	00:15.120	
-
-00:15.160	--> 	00:15.200	
-379	-	00:15.160	
-
-00:15.200	--> 	00:15.240	
-380	-	00:15.200	
-
-00:15.240	--> 	00:15.280	
-381	-	00:15.240	
-
-00:15.280	--> 	00:15.320	
-382	-	00:15.280	
-
-00:15.320	--> 	00:15.360	
-383	-	00:15.320	
-
-00:15.360	--> 	00:15.400	
-384	-	00:15.360	
-
-00:15.400	--> 	00:15.440	
-385	-	00:15.400	
-
-00:15.440	--> 	00:15.480	
-386	-	00:15.440	
-
-00:15.480	--> 	00:15.520	
-387	-	00:15.480	
-
-00:15.520	--> 	00:15.560	
-388	-	00:15.520	
-
-00:15.560	--> 	00:15.600	
-389	-	00:15.560	
-
-00:15.600	--> 	00:15.640	
-390	-	00:15.600	
-
-00:15.640	--> 	00:15.680	
-391	-	00:15.640	
-
-00:15.680	--> 	00:15.720	
-392	-	00:15.680	
-
-00:15.720	--> 	00:15.760	
-393	-	00:15.720	
-
-00:15.760	--> 	00:15.800	
-394	-	00:15.760	
-
-00:15.800	--> 	00:15.840	
-395	-	00:15.800	
-
-00:15.840	--> 	00:15.880	
-396	-	00:15.840	
-
-00:15.880	--> 	00:15.920	
-397	-	00:15.880	
-
-00:15.920	--> 	00:15.960	
-398	-	00:15.920	
-
-00:15.960	--> 	00:16.000	
-399	-	00:15.960	
-
-00:16.000	--> 	00:16.040	
-400	-	00:16.000	
-
-00:16.040	--> 	00:16.080	
-401	-	00:16.040	
-
-00:16.080	--> 	00:16.120	
-402	-	00:16.080	
-
-00:16.120	--> 	00:16.160	
-403	-	00:16.120	
-
-00:16.160	--> 	00:16.200	
-404	-	00:16.160	
-
-00:16.200	--> 	00:16.240	
-405	-	00:16.200	
-
-00:16.240	--> 	00:16.280	
-406	-	00:16.240	
-
-00:16.280	--> 	00:16.320	
-407	-	00:16.280	
-
-00:16.320	--> 	00:16.360	
-408	-	00:16.320	
-
-00:16.360	--> 	00:16.400	
-409	-	00:16.360	
-
-00:16.400	--> 	00:16.440	
-410	-	00:16.400	
-
-00:16.440	--> 	00:16.480	
-411	-	00:16.440	
-
-00:16.480	--> 	00:16.520	
-412	-	00:16.480	
-
-00:16.520	--> 	00:16.560	
-413	-	00:16.520	
-
-00:16.560	--> 	00:16.600	
-414	-	00:16.560	
-
-00:16.600	--> 	00:16.640	
-415	-	00:16.600	
-
-00:16.640	--> 	00:16.680	
-416	-	00:16.640	
-
-00:16.680	--> 	00:16.720	
-417	-	00:16.680	
-
-00:16.720	--> 	00:16.760	
-418	-	00:16.720	
-
-00:16.760	--> 	00:16.800	
-419	-	00:16.760	
-
-00:16.800	--> 	00:16.840	
-420	-	00:16.800	
-
-00:16.840	--> 	00:16.880	
-421	-	00:16.840	
-
-00:16.880	--> 	00:16.920	
-422	-	00:16.880	
-
-00:16.920	--> 	00:16.960	
-423	-	00:16.920	
-
-00:16.960	--> 	00:17.000	
-424	-	00:16.960	
-
-00:17.000	--> 	00:17.040	
-425	-	00:17.000	
-
-00:17.040	--> 	00:17.080	
-426	-	00:17.040	
-
-00:17.080	--> 	00:17.120	
-427	-	00:17.080	
-
-00:17.120	--> 	00:17.160	
-428	-	00:17.120	
-
-00:17.160	--> 	00:17.200	
-429	-	00:17.160	
-
-00:17.200	--> 	00:17.240	
-430	-	00:17.200	
-
-00:17.240	--> 	00:17.280	
-431	-	00:17.240	
-
-00:17.280	--> 	00:17.320	
-432	-	00:17.280	
-
-00:17.320	--> 	00:17.360	
-433	-	00:17.320	
-
-00:17.360	--> 	00:17.400	
-434	-	00:17.360	
-
-00:17.400	--> 	00:17.440	
-435	-	00:17.400	
-
-00:17.440	--> 	00:17.480	
-436	-	00:17.440	
-
-00:17.480	--> 	00:17.520	
-437	-	00:17.480	
-
-00:17.520	--> 	00:17.560	
-438	-	00:17.520	
-
-00:17.560	--> 	00:17.600	
-439	-	00:17.560	
-
-00:17.600	--> 	00:17.640	
-440	-	00:17.600	
-
-00:17.640	--> 	00:17.680	
-441	-	00:17.640	
-
-00:17.680	--> 	00:17.720	
-442	-	00:17.680	
-
-00:17.720	--> 	00:17.760	
-443	-	00:17.720	
-
-00:17.760	--> 	00:17.800	
-444	-	00:17.760	
-
-00:17.800	--> 	00:17.840	
-445	-	00:17.800	
-
-00:17.840	--> 	00:17.880	
-446	-	00:17.840	
-
-00:17.880	--> 	00:17.920	
-447	-	00:17.880	
-
-00:17.920	--> 	00:17.960	
-448	-	00:17.920	
-
-00:17.960	--> 	00:18.000	
-449	-	00:17.960	
-
-00:18.000	--> 	00:18.040	
-450	-	00:18.000	
-
-00:18.040	--> 	00:18.080	
-451	-	00:18.040	
-
-00:18.080	--> 	00:18.120	
-452	-	00:18.080	
-
-00:18.120	--> 	00:18.160	
-453	-	00:18.120	
-
-00:18.160	--> 	00:18.200	
-454	-	00:18.160	
-
-00:18.200	--> 	00:18.240	
-455	-	00:18.200	
-
-00:18.240	--> 	00:18.280	
-456	-	00:18.240	
-
-00:18.280	--> 	00:18.320	
-457	-	00:18.280	
-
-00:18.320	--> 	00:18.360	
-458	-	00:18.320	
-
-00:18.360	--> 	00:18.400	
-459	-	00:18.360	
-
-00:18.400	--> 	00:18.440	
-460	-	00:18.400	
-
-00:18.440	--> 	00:18.480	
-461	-	00:18.440	
-
-00:18.480	--> 	00:18.520	
-462	-	00:18.480	
-
-00:18.520	--> 	00:18.560	
-463	-	00:18.520	
-
-00:18.560	--> 	00:18.600	
-464	-	00:18.560	
-
-00:18.600	--> 	00:18.640	
-465	-	00:18.600	
-
-00:18.640	--> 	00:18.680	
-466	-	00:18.640	
-
-00:18.680	--> 	00:18.720	
-467	-	00:18.680	
-
-00:18.720	--> 	00:18.760	
-468	-	00:18.720	
-
-00:18.760	--> 	00:18.800	
-469	-	00:18.760	
-
-00:18.800	--> 	00:18.840	
-470	-	00:18.800	
-
-00:18.840	--> 	00:18.880	
-471	-	00:18.840	
-
-00:18.880	--> 	00:18.920	
-472	-	00:18.880	
-
-00:18.920	--> 	00:18.960	
-473	-	00:18.920	
-
-00:18.960	--> 	00:19.000	
-474	-	00:18.960	
-
-00:19.000	--> 	00:19.040	
-475	-	00:19.000	
-
-00:19.040	--> 	00:19.080	
-476	-	00:19.040	
-
-00:19.080	--> 	00:19.120	
-477	-	00:19.080	
-
-00:19.120	--> 	00:19.160	
-478	-	00:19.120	
-
-00:19.160	--> 	00:19.200	
-479	-	00:19.160	
-
-00:19.200	--> 	00:19.240	
-480	-	00:19.200	
-
-00:19.240	--> 	00:19.280	
-481	-	00:19.240	
-
-00:19.280	--> 	00:19.320	
-482	-	00:19.280	
-
-00:19.320	--> 	00:19.360	
-483	-	00:19.320	
-
-00:19.360	--> 	00:19.400	
-484	-	00:19.360	
-
-00:19.400	--> 	00:19.440	
-485	-	00:19.400	
-
-00:19.440	--> 	00:19.480	
-486	-	00:19.440	
-
-00:19.480	--> 	00:19.520	
-487	-	00:19.480	
-
-00:19.520	--> 	00:19.560	
-488	-	00:19.520	
-
-00:19.560	--> 	00:19.600	
-489	-	00:19.560	
-
-00:19.600	--> 	00:19.640	
-490	-	00:19.600	
-
-00:19.640	--> 	00:19.680	
-491	-	00:19.640	
-
-00:19.680	--> 	00:19.720	
-492	-	00:19.680	
-
-00:19.720	--> 	00:19.760	
-493	-	00:19.720	
-
-00:19.760	--> 	00:19.800	
-494	-	00:19.760	
-
-00:19.800	--> 	00:19.840	
-495	-	00:19.800	
-
-00:19.840	--> 	00:19.880	
-496	-	00:19.840	
-
-00:19.880	--> 	00:19.920	
-497	-	00:19.880	
-
-00:19.920	--> 	00:19.960	
-498	-	00:19.920	
-
-00:19.960	--> 	00:20.000	
-499	-	00:19.960	
-
-00:20.000	--> 	00:20.040	
-500	-	00:20.000	
-
-00:20.040	--> 	00:20.080	
-501	-	00:20.040	
-
-00:20.080	--> 	00:20.120	
-502	-	00:20.080	
-
-00:20.120	--> 	00:20.160	
-503	-	00:20.120	
-
-00:20.160	--> 	00:20.200	
-504	-	00:20.160	
-
-00:20.200	--> 	00:20.240	
-505	-	00:20.200	
-
-00:20.240	--> 	00:20.280	
-506	-	00:20.240	
-
-00:20.280	--> 	00:20.320	
-507	-	00:20.280	
-
-00:20.320	--> 	00:20.360	
-508	-	00:20.320	
-
-00:20.360	--> 	00:20.400	
-509	-	00:20.360	
-
-00:20.400	--> 	00:20.440	
-510	-	00:20.400	
-
-00:20.440	--> 	00:20.480	
-511	-	00:20.440	
-
-00:20.480	--> 	00:20.520	
-512	-	00:20.480	
-
-00:20.520	--> 	00:20.560	
-513	-	00:20.520	
-
-00:20.560	--> 	00:20.600	
-514	-	00:20.560	
-
-00:20.600	--> 	00:20.640	
-515	-	00:20.600	
-
-00:20.640	--> 	00:20.680	
-516	-	00:20.640	
-
-00:20.680	--> 	00:20.720	
-517	-	00:20.680	
-
-00:20.720	--> 	00:20.760	
-518	-	00:20.720	
-
-00:20.760	--> 	00:20.800	
-519	-	00:20.760	
-
-00:20.800	--> 	00:20.840	
-520	-	00:20.800	
-
-00:20.840	--> 	00:20.880	
-521	-	00:20.840	
-
-00:20.880	--> 	00:20.920	
-522	-	00:20.880	
-
-00:20.920	--> 	00:20.960	
-523	-	00:20.920	
-
-00:20.960	--> 	00:21.000	
-524	-	00:20.960	
-
-00:21.000	--> 	00:21.040	
-525	-	00:21.000	
-
-00:21.040	--> 	00:21.080	
-526	-	00:21.040	
-
-00:21.080	--> 	00:21.120	
-527	-	00:21.080	
-
-00:21.120	--> 	00:21.160	
-528	-	00:21.120	
-
-00:21.160	--> 	00:21.200	
-529	-	00:21.160	
-
-00:21.200	--> 	00:21.240	
-530	-	00:21.200	
-
-00:21.240	--> 	00:21.280	
-531	-	00:21.240	
-
-00:21.280	--> 	00:21.320	
-532	-	00:21.280	
-
-00:21.320	--> 	00:21.360	
-533	-	00:21.320	
-
-00:21.360	--> 	00:21.400	
-534	-	00:21.360	
-
-00:21.400	--> 	00:21.440	
-535	-	00:21.400	
-
-00:21.440	--> 	00:21.480	
-536	-	00:21.440	
-
-00:21.480	--> 	00:21.520	
-537	-	00:21.480	
-
-00:21.520	--> 	00:21.560	
-538	-	00:21.520	
-
-00:21.560	--> 	00:21.600	
-539	-	00:21.560	
-
-00:21.600	--> 	00:21.640	
-540	-	00:21.600	
-
-00:21.640	--> 	00:21.680	
-541	-	00:21.640	
-
-00:21.680	--> 	00:21.720	
-542	-	00:21.680	
-
-00:21.720	--> 	00:21.760	
-543	-	00:21.720	
-
-00:21.760	--> 	00:21.800	
-544	-	00:21.760	
-
-00:21.800	--> 	00:21.840	
-545	-	00:21.800	
-
-00:21.840	--> 	00:21.880	
-546	-	00:21.840	
-
-00:21.880	--> 	00:21.920	
-547	-	00:21.880	
-
-00:21.920	--> 	00:21.960	
-548	-	00:21.920	
-
-00:21.960	--> 	00:22.000	
-549	-	00:21.960	
-
-00:22.000	--> 	00:22.040	
-550	-	00:22.000	
-
-00:22.040	--> 	00:22.080	
-551	-	00:22.040	
-
-00:22.080	--> 	00:22.120	
-552	-	00:22.080	
-
-00:22.120	--> 	00:22.160	
-553	-	00:22.120	
-
-00:22.160	--> 	00:22.200	
-554	-	00:22.160	
-
-00:22.200	--> 	00:22.240	
-555	-	00:22.200	
-
-00:22.240	--> 	00:22.280	
-556	-	00:22.240	
-
-00:22.280	--> 	00:22.320	
-557	-	00:22.280	
-
-00:22.320	--> 	00:22.360	
-558	-	00:22.320	
-
-00:22.360	--> 	00:22.400	
-559	-	00:22.360	
-
-00:22.400	--> 	00:22.440	
-560	-	00:22.400	
-
-00:22.440	--> 	00:22.480	
-561	-	00:22.440	
-
-00:22.480	--> 	00:22.520	
-562	-	00:22.480	
-
-00:22.520	--> 	00:22.560	
-563	-	00:22.520	
-
-00:22.560	--> 	00:22.600	
-564	-	00:22.560	
-
-00:22.600	--> 	00:22.640	
-565	-	00:22.600	
-
-00:22.640	--> 	00:22.680	
-566	-	00:22.640	
-
-00:22.680	--> 	00:22.720	
-567	-	00:22.680	
-
-00:22.720	--> 	00:22.760	
-568	-	00:22.720	
-
-00:22.760	--> 	00:22.800	
-569	-	00:22.760	
-
-00:22.800	--> 	00:22.840	
-570	-	00:22.800	
-
-00:22.840	--> 	00:22.880	
-571	-	00:22.840	
-
-00:22.880	--> 	00:22.920	
-572	-	00:22.880	
-
-00:22.920	--> 	00:22.960	
-573	-	00:22.920	
-
-00:22.960	--> 	00:23.000	
-574	-	00:22.960	
-
-00:23.000	--> 	00:23.040	
-575	-	00:23.000	
-
-00:23.040	--> 	00:23.080	
-576	-	00:23.040	
-
-00:23.080	--> 	00:23.120	
-577	-	00:23.080	
-
-00:23.120	--> 	00:23.160	
-578	-	00:23.120	
-
-00:23.160	--> 	00:23.200	
-579	-	00:23.160	
-
-00:23.200	--> 	00:23.240	
-580	-	00:23.200	
-
-00:23.240	--> 	00:23.280	
-581	-	00:23.240	
-
-00:23.280	--> 	00:23.320	
-582	-	00:23.280	
-
-00:23.320	--> 	00:23.360	
-583	-	00:23.320	
-
-00:23.360	--> 	00:23.400	
-584	-	00:23.360	
-
-00:23.400	--> 	00:23.440	
-585	-	00:23.400	
-
-00:23.440	--> 	00:23.480	
-586	-	00:23.440	
-
-00:23.480	--> 	00:23.520	
-587	-	00:23.480	
-
-00:23.520	--> 	00:23.560	
-588	-	00:23.520	
-
-00:23.560	--> 	00:23.600	
-589	-	00:23.560	
-
-00:23.600	--> 	00:23.640	
-590	-	00:23.600	
-
-00:23.640	--> 	00:23.680	
-591	-	00:23.640	
-
-00:23.680	--> 	00:23.720	
-592	-	00:23.680	
-
-00:23.720	--> 	00:23.760	
-593	-	00:23.720	
-
-00:23.760	--> 	00:23.800	
-594	-	00:23.760	
-
-00:23.800	--> 	00:23.840	
-595	-	00:23.800	
-
-00:23.840	--> 	00:23.880	
-596	-	00:23.840	
-
-00:23.880	--> 	00:23.920	
-597	-	00:23.880	
-
-00:23.920	--> 	00:23.960	
-598	-	00:23.920	
-
-00:23.960	--> 	00:24.000	
-599	-	00:23.960	
-
-00:24.000	--> 	00:24.040	
-600	-	00:24.000	
-
-00:24.040	--> 	00:24.080	
-601	-	00:24.040	
-
-00:24.080	--> 	00:24.120	
-602	-	00:24.080	
-
-00:24.120	--> 	00:24.160	
-603	-	00:24.120	
-
-00:24.160	--> 	00:24.200	
-604	-	00:24.160	
-
-00:24.200	--> 	00:24.240	
-605	-	00:24.200	
-
-00:24.240	--> 	00:24.280	
-606	-	00:24.240	
-
-00:24.280	--> 	00:24.320	
-607	-	00:24.280	
-
-00:24.320	--> 	00:24.360	
-608	-	00:24.320	
-
-00:24.360	--> 	00:24.400	
-609	-	00:24.360	
-
-00:24.400	--> 	00:24.440	
-610	-	00:24.400	
-
-00:24.440	--> 	00:24.480	
-611	-	00:24.440	
-
-00:24.480	--> 	00:24.520	
-612	-	00:24.480	
-
-00:24.520	--> 	00:24.560	
-613	-	00:24.520	
-
-00:24.560	--> 	00:24.600	
-614	-	00:24.560	
-
-00:24.600	--> 	00:24.640	
-615	-	00:24.600	
-
-00:24.640	--> 	00:24.680	
-616	-	00:24.640	
-
-00:24.680	--> 	00:24.720	
-617	-	00:24.680	
-
-00:24.720	--> 	00:24.760	
-618	-	00:24.720	
-
-00:24.760	--> 	00:24.800	
-619	-	00:24.760	
-
-00:24.800	--> 	00:24.840	
-620	-	00:24.800	
-
-00:24.840	--> 	00:24.880	
-621	-	00:24.840	
-
-00:24.880	--> 	00:24.920	
-622	-	00:24.880	
-
-00:24.920	--> 	00:24.960	
-623	-	00:24.920	
-
-00:24.960	--> 	00:25.000	
-624	-	00:24.960	
-
-00:25.000	--> 	00:25.040	
-625	-	00:25.000	
-
-00:25.040	--> 	00:25.080	
-626	-	00:25.040	
-
-00:25.080	--> 	00:25.120	
-627	-	00:25.080	
-
-00:25.120	--> 	00:25.160	
-628	-	00:25.120	
-
-00:25.160	--> 	00:25.200	
-629	-	00:25.160	
-
-00:25.200	--> 	00:25.240	
-630	-	00:25.200	
-
-00:25.240	--> 	00:25.280	
-631	-	00:25.240	
-
-00:25.280	--> 	00:25.320	
-632	-	00:25.280	
-
-00:25.320	--> 	00:25.360	
-633	-	00:25.320	
-
-00:25.360	--> 	00:25.400	
-634	-	00:25.360	
-
-00:25.400	--> 	00:25.440	
-635	-	00:25.400	
-
-00:25.440	--> 	00:25.480	
-636	-	00:25.440	
-
-00:25.480	--> 	00:25.520	
-637	-	00:25.480	
-
-00:25.520	--> 	00:25.560	
-638	-	00:25.520	
-
-00:25.560	--> 	00:25.600	
-639	-	00:25.560	
-
-00:25.600	--> 	00:25.640	
-640	-	00:25.600	
-
-00:25.640	--> 	00:25.680	
-641	-	00:25.640	
-
-00:25.680	--> 	00:25.720	
-642	-	00:25.680	
-
-00:25.720	--> 	00:25.760	
-643	-	00:25.720	
-
-00:25.760	--> 	00:25.800	
-644	-	00:25.760	
-
-00:25.800	--> 	00:25.840	
-645	-	00:25.800	
-
-00:25.840	--> 	00:25.880	
-646	-	00:25.840	
-
-00:25.880	--> 	00:25.920	
-647	-	00:25.880	
-
-00:25.920	--> 	00:25.960	
-648	-	00:25.920	
-
-00:25.960	--> 	00:26.000	
-649	-	00:25.960	
-
-00:26.000	--> 	00:26.040	
-650	-	00:26.000	
-
-00:26.040	--> 	00:26.080	
-651	-	00:26.040	
-
-00:26.080	--> 	00:26.120	
-652	-	00:26.080	
-
-00:26.120	--> 	00:26.160	
-653	-	00:26.120	
-
-00:26.160	--> 	00:26.200	
-654	-	00:26.160	
-
-00:26.200	--> 	00:26.240	
-655	-	00:26.200	
-
-00:26.240	--> 	00:26.280	
-656	-	00:26.240	
-
-00:26.280	--> 	00:26.320	
-657	-	00:26.280	
-
-00:26.320	--> 	00:26.360	
-658	-	00:26.320	
-
-00:26.360	--> 	00:26.400	
-659	-	00:26.360	
-
-00:26.400	--> 	00:26.440	
-660	-	00:26.400	
-
-00:26.440	--> 	00:26.480	
-661	-	00:26.440	
-
-00:26.480	--> 	00:26.520	
-662	-	00:26.480	
-
-00:26.520	--> 	00:26.560	
-663	-	00:26.520	
-
-00:26.560	--> 	00:26.600	
-664	-	00:26.560	
-
-00:26.600	--> 	00:26.640	
-665	-	00:26.600	
-
-00:26.640	--> 	00:26.680	
-666	-	00:26.640	
-
-00:26.680	--> 	00:26.720	
-667	-	00:26.680	
-
-00:26.720	--> 	00:26.760	
-668	-	00:26.720	
-
-00:26.760	--> 	00:26.800	
-669	-	00:26.760	
-
-00:26.800	--> 	00:26.840	
-670	-	00:26.800	
-
-00:26.840	--> 	00:26.880	
-671	-	00:26.840	
-
-00:26.880	--> 	00:26.920	
-672	-	00:26.880	
-
-00:26.920	--> 	00:26.960	
-673	-	00:26.920	
-
-00:26.960	--> 	00:27.000	
-674	-	00:26.960	
-
-00:27.000	--> 	00:27.040	
-675	-	00:27.000	
-
-00:27.040	--> 	00:27.080	
-676	-	00:27.040	
-
-00:27.080	--> 	00:27.120	
-677	-	00:27.080	
-
-00:27.120	--> 	00:27.160	
-678	-	00:27.120	
-
-00:27.160	--> 	00:27.200	
-679	-	00:27.160	
-
-00:27.200	--> 	00:27.240	
-680	-	00:27.200	
-
-00:27.240	--> 	00:27.280	
-681	-	00:27.240	
-
-00:27.280	--> 	00:27.320	
-682	-	00:27.280	
-
-00:27.320	--> 	00:27.360	
-683	-	00:27.320	
-
-00:27.360	--> 	00:27.400	
-684	-	00:27.360	
-
-00:27.400	--> 	00:27.440	
-685	-	00:27.400	
-
-00:27.440	--> 	00:27.480	
-686	-	00:27.440	
-
-00:27.480	--> 	00:27.520	
-687	-	00:27.480	
-
-00:27.520	--> 	00:27.560	
-688	-	00:27.520	
-
-00:27.560	--> 	00:27.600	
-689	-	00:27.560	
-
-00:27.600	--> 	00:27.640	
-690	-	00:27.600	
-
-00:27.640	--> 	00:27.680	
-691	-	00:27.640	
-
-00:27.680	--> 	00:27.720	
-692	-	00:27.680	
-
-00:27.720	--> 	00:27.760	
-693	-	00:27.720	
-
-00:27.760	--> 	00:27.800	
-694	-	00:27.760	
-
-00:27.800	--> 	00:27.840	
-695	-	00:27.800	
-
-00:27.840	--> 	00:27.880	
-696	-	00:27.840	
-
-00:27.880	--> 	00:27.920	
-697	-	00:27.880	
-
-00:27.920	--> 	00:27.960	
-698	-	00:27.920	
-
-00:27.960	--> 	00:28.000	
-699	-	00:27.960	
-
-00:28.000	--> 	00:28.040	
-700	-	00:28.000	
-
-00:28.040	--> 	00:28.080	
-701	-	00:28.040	
-
-00:28.080	--> 	00:28.120	
-702	-	00:28.080	
-
-00:28.120	--> 	00:28.160	
-703	-	00:28.120	
-
-00:28.160	--> 	00:28.200	
-704	-	00:28.160	
-
-00:28.200	--> 	00:28.240	
-705	-	00:28.200	
-
-00:28.240	--> 	00:28.280	
-706	-	00:28.240	
-
-00:28.280	--> 	00:28.320	
-707	-	00:28.280	
-
-00:28.320	--> 	00:28.360	
-708	-	00:28.320	
-
-00:28.360	--> 	00:28.400	
-709	-	00:28.360	
-
-00:28.400	--> 	00:28.440	
-710	-	00:28.400	
-
-00:28.440	--> 	00:28.480	
-711	-	00:28.440	
-
-00:28.480	--> 	00:28.520	
-712	-	00:28.480	
-
-00:28.520	--> 	00:28.560	
-713	-	00:28.520	
-
-00:28.560	--> 	00:28.600	
-714	-	00:28.560	
-
-00:28.600	--> 	00:28.640	
-715	-	00:28.600	
-
-00:28.640	--> 	00:28.680	
-716	-	00:28.640	
-
-00:28.680	--> 	00:28.720	
-717	-	00:28.680	
-
-00:28.720	--> 	00:28.760	
-718	-	00:28.720	
-
-00:28.760	--> 	00:28.800	
-719	-	00:28.760	
-
-00:28.800	--> 	00:28.840	
-720	-	00:28.800	
-
-00:28.840	--> 	00:28.880	
-721	-	00:28.840	
-
-00:28.880	--> 	00:28.920	
-722	-	00:28.880	
-
-00:28.920	--> 	00:28.960	
-723	-	00:28.920	
-
-00:28.960	--> 	00:29.000	
-724	-	00:28.960	
-
-00:29.000	--> 	00:29.040	
-725	-	00:29.000	
-
-00:29.040	--> 	00:29.080	
-726	-	00:29.040	
-
-00:29.080	--> 	00:29.120	
-727	-	00:29.080	
-
-00:29.120	--> 	00:29.160	
-728	-	00:29.120	
-
-00:29.160	--> 	00:29.200	
-729	-	00:29.160	
-
-00:29.200	--> 	00:29.240	
-730	-	00:29.200	
-
-00:29.240	--> 	00:29.280	
-731	-	00:29.240	
-
-00:29.280	--> 	00:29.320	
-732	-	00:29.280	
-
-00:29.320	--> 	00:29.360	
-733	-	00:29.320	
-
-00:29.360	--> 	00:29.400	
-734	-	00:29.360	
-
-00:29.400	--> 	00:29.440	
-735	-	00:29.400	
-
-00:29.440	--> 	00:29.480	
-736	-	00:29.440	
-
-00:29.480	--> 	00:29.520	
-737	-	00:29.480	
-
-00:29.520	--> 	00:29.560	
-738	-	00:29.520	
-
-00:29.560	--> 	00:29.600	
-739	-	00:29.560	
-
-00:29.600	--> 	00:29.640	
-740	-	00:29.600	
-
-00:29.640	--> 	00:29.680	
-741	-	00:29.640	
-
-00:29.680	--> 	00:29.720	
-742	-	00:29.680	
-
-00:29.720	--> 	00:29.760	
-743	-	00:29.720	
-
-00:29.760	--> 	00:29.800	
-744	-	00:29.760	
-
-00:29.800	--> 	00:29.840	
-745	-	00:29.800	
-
-00:29.840	--> 	00:29.880	
-746	-	00:29.840	
-
-00:29.880	--> 	00:29.920	
-747	-	00:29.880	
-
-00:29.920	--> 	00:29.960	
-748	-	00:29.920	
-
-00:29.960	--> 	00:30.000	
-749	-	00:29.960	
-
-00:30.000	--> 	00:30.040	
-750	-	00:30.000	
-
-00:30.040	--> 	00:30.080	
-751	-	00:30.040	
-
-00:30.080	--> 	00:30.120	
-752	-	00:30.080	
-
-00:30.120	--> 	00:30.160	
-753	-	00:30.120	
-
-00:30.160	--> 	00:30.200	
-754	-	00:30.160	
-
-00:30.200	--> 	00:30.240	
-755	-	00:30.200	
-
-00:30.240	--> 	00:30.280	
-756	-	00:30.240	
-
-00:30.280	--> 	00:30.320	
-757	-	00:30.280	
-
-00:30.320	--> 	00:30.360	
-758	-	00:30.320	
-
-00:30.360	--> 	00:30.400	
-759	-	00:30.360	
-
-00:30.400	--> 	00:30.440	
-760	-	00:30.400	
-
-00:30.440	--> 	00:30.480	
-761	-	00:30.440	
-
-00:30.480	--> 	00:30.520	
-762	-	00:30.480	
-
-00:30.520	--> 	00:30.560	
-763	-	00:30.520	
-
-00:30.560	--> 	00:30.600	
-764	-	00:30.560	
-
-00:30.600	--> 	00:30.640	
-765	-	00:30.600	
-
-00:30.640	--> 	00:30.680	
-766	-	00:30.640	
-
-00:30.680	--> 	00:30.720	
-767	-	00:30.680	
-
-00:30.720	--> 	00:30.760	
-768	-	00:30.720	
-
-00:30.760	--> 	00:30.800	
-769	-	00:30.760	
-
-00:30.800	--> 	00:30.840	
-770	-	00:30.800	
-
-00:30.840	--> 	00:30.880	
-771	-	00:30.840	
-
-00:30.880	--> 	00:30.920	
-772	-	00:30.880	
-
-00:30.920	--> 	00:30.960	
-773	-	00:30.920	
-
-00:30.960	--> 	00:31.000	
-774	-	00:30.960	
-
-00:31.000	--> 	00:31.040	
-775	-	00:31.000	
-
-00:31.040	--> 	00:31.080	
-776	-	00:31.040	
-
-00:31.080	--> 	00:31.120	
-777	-	00:31.080	
-
-00:31.120	--> 	00:31.160	
-778	-	00:31.120	
-
-00:31.160	--> 	00:31.200	
-779	-	00:31.160	
-
-00:31.200	--> 	00:31.240	
-780	-	00:31.200	
-
-00:31.240	--> 	00:31.280	
-781	-	00:31.240	
-
-00:31.280	--> 	00:31.320	
-782	-	00:31.280	
-
-00:31.320	--> 	00:31.360	
-783	-	00:31.320	
-
-00:31.360	--> 	00:31.400	
-784	-	00:31.360	
-
-00:31.400	--> 	00:31.440	
-785	-	00:31.400	
-
-00:31.440	--> 	00:31.480	
-786	-	00:31.440	
-
-00:31.480	--> 	00:31.520	
-787	-	00:31.480	
-
-00:31.520	--> 	00:31.560	
-788	-	00:31.520	
-
-00:31.560	--> 	00:31.600	
-789	-	00:31.560	
-
-00:31.600	--> 	00:31.640	
-790	-	00:31.600	
-
-00:31.640	--> 	00:31.680	
-791	-	00:31.640	
-
-00:31.680	--> 	00:31.720	
-792	-	00:31.680	
-
-00:31.720	--> 	00:31.760	
-793	-	00:31.720	
-
-00:31.760	--> 	00:31.800	
-794	-	00:31.760	
-
-00:31.800	--> 	00:31.840	
-795	-	00:31.800	
-
-00:31.840	--> 	00:31.880	
-796	-	00:31.840	
-
-00:31.880	--> 	00:31.920	
-797	-	00:31.880	
-
-00:31.920	--> 	00:31.960	
-798	-	00:31.920	
-
-00:31.960	--> 	00:32.000	
-799	-	00:31.960	
-
-00:32.000	--> 	00:32.040	
-800	-	00:32.000	
-
-00:32.040	--> 	00:32.080	
-801	-	00:32.040	
-
-00:32.080	--> 	00:32.120	
-802	-	00:32.080	
-
-00:32.120	--> 	00:32.160	
-803	-	00:32.120	
-
-00:32.160	--> 	00:32.200	
-804	-	00:32.160	
-
-00:32.200	--> 	00:32.240	
-805	-	00:32.200	
-
-00:32.240	--> 	00:32.280	
-806	-	00:32.240	
-
-00:32.280	--> 	00:32.320	
-807	-	00:32.280	
-
-00:32.320	--> 	00:32.360	
-808	-	00:32.320	
-
-00:32.360	--> 	00:32.400	
-809	-	00:32.360	
-
-00:32.400	--> 	00:32.440	
-810	-	00:32.400	
-
-00:32.440	--> 	00:32.480	
-811	-	00:32.440	
-
-00:32.480	--> 	00:32.520	
-812	-	00:32.480	
-
-00:32.520	--> 	00:32.560	
-813	-	00:32.520	
-
-00:32.560	--> 	00:32.600	
-814	-	00:32.560	
-
-00:32.600	--> 	00:32.640	
-815	-	00:32.600	
-
-00:32.640	--> 	00:32.680	
-816	-	00:32.640	
-
-00:32.680	--> 	00:32.720	
-817	-	00:32.680	
-
-00:32.720	--> 	00:32.760	
-818	-	00:32.720	
-
-00:32.760	--> 	00:32.800	
-819	-	00:32.760	
-
-00:32.800	--> 	00:32.840	
-820	-	00:32.800	
-
-00:32.840	--> 	00:32.880	
-821	-	00:32.840	
-
-00:32.880	--> 	00:32.920	
-822	-	00:32.880	
-
-00:32.920	--> 	00:32.960	
-823	-	00:32.920	
-
-00:32.960	--> 	00:33.000	
-824	-	00:32.960	
-
-00:33.000	--> 	00:33.040	
-825	-	00:33.000	
-
-00:33.040	--> 	00:33.080	
-826	-	00:33.040	
-
-00:33.080	--> 	00:33.120	
-827	-	00:33.080	
-
-00:33.120	--> 	00:33.160	
-828	-	00:33.120	
-
-00:33.160	--> 	00:33.200	
-829	-	00:33.160	
-
-00:33.200	--> 	00:33.240	
-830	-	00:33.200	
-
-00:33.240	--> 	00:33.280	
-831	-	00:33.240	
-
-00:33.280	--> 	00:33.320	
-832	-	00:33.280	
-
-00:33.320	--> 	00:33.360	
-833	-	00:33.320	
-
-00:33.360	--> 	00:33.400	
-834	-	00:33.360	
-
-00:33.400	--> 	00:33.440	
-835	-	00:33.400	
-
-00:33.440	--> 	00:33.480	
-836	-	00:33.440	
-
-00:33.480	--> 	00:33.520	
-837	-	00:33.480	
-
-00:33.520	--> 	00:33.560	
-838	-	00:33.520	
-
-00:33.560	--> 	00:33.600	
-839	-	00:33.560	
-
-00:33.600	--> 	00:33.640	
-840	-	00:33.600	
-
-00:33.640	--> 	00:33.680	
-841	-	00:33.640	
-
-00:33.680	--> 	00:33.720	
-842	-	00:33.680	
-
-00:33.720	--> 	00:33.760	
-843	-	00:33.720	
-
-00:33.760	--> 	00:33.800	
-844	-	00:33.760	
-
-00:33.800	--> 	00:33.840	
-845	-	00:33.800	
-
-00:33.840	--> 	00:33.880	
-846	-	00:33.840	
-
-00:33.880	--> 	00:33.920	
-847	-	00:33.880	
-
-00:33.920	--> 	00:33.960	
-848	-	00:33.920	
-
-00:33.960	--> 	00:34.000	
-849	-	00:33.960	
-
-00:34.000	--> 	00:34.040	
-850	-	00:34.000	
-
-00:34.040	--> 	00:34.080	
-851	-	00:34.040	
-
-00:34.080	--> 	00:34.120	
-852	-	00:34.080	
-
-00:34.120	--> 	00:34.160	
-853	-	00:34.120	
-
-00:34.160	--> 	00:34.200	
-854	-	00:34.160	
-
-00:34.200	--> 	00:34.240	
-855	-	00:34.200	
-
-00:34.240	--> 	00:34.280	
-856	-	00:34.240	
-
-00:34.280	--> 	00:34.320	
-857	-	00:34.280	
-
-00:34.320	--> 	00:34.360	
-858	-	00:34.320	
-
-00:34.360	--> 	00:34.400	
-859	-	00:34.360	
-
-00:34.400	--> 	00:34.440	
-860	-	00:34.400	
-
-00:34.440	--> 	00:34.480	
-861	-	00:34.440	
-
-00:34.480	--> 	00:34.520	
-862	-	00:34.480	
-
-00:34.520	--> 	00:34.560	
-863	-	00:34.520	
-
-00:34.560	--> 	00:34.600	
-864	-	00:34.560	
-
-00:34.600	--> 	00:34.640	
-865	-	00:34.600	
-
-00:34.640	--> 	00:34.680	
-866	-	00:34.640	
-
-00:34.680	--> 	00:34.720	
-867	-	00:34.680	
-
-00:34.720	--> 	00:34.760	
-868	-	00:34.720	
-
-00:34.760	--> 	00:34.800	
-869	-	00:34.760	
-
-00:34.800	--> 	00:34.840	
-870	-	00:34.800	
-
-00:34.840	--> 	00:34.880	
-871	-	00:34.840	
-
-00:34.880	--> 	00:34.920	
-872	-	00:34.880	
-
-00:34.920	--> 	00:34.960	
-873	-	00:34.920	
-
-00:34.960	--> 	00:35.000	
-874	-	00:34.960	
-
-00:35.000	--> 	00:35.040	
-875	-	00:35.000	
-
-00:35.040	--> 	00:35.080	
-876	-	00:35.040	
-
-00:35.080	--> 	00:35.120	
-877	-	00:35.080	
-
-00:35.120	--> 	00:35.160	
-878	-	00:35.120	
-
-00:35.160	--> 	00:35.200	
-879	-	00:35.160	
-
-00:35.200	--> 	00:35.240	
-880	-	00:35.200	
-
-00:35.240	--> 	00:35.280	
-881	-	00:35.240	
-
-00:35.280	--> 	00:35.320	
-882	-	00:35.280	
-
-00:35.320	--> 	00:35.360	
-883	-	00:35.320	
-
-00:35.360	--> 	00:35.400	
-884	-	00:35.360	
-
-00:35.400	--> 	00:35.440	
-885	-	00:35.400	
-
-00:35.440	--> 	00:35.480	
-886	-	00:35.440	
-
-00:35.480	--> 	00:35.520	
-887	-	00:35.480	
-
-00:35.520	--> 	00:35.560	
-888	-	00:35.520	
-
-00:35.560	--> 	00:35.600	
-889	-	00:35.560	
-
-00:35.600	--> 	00:35.640	
-890	-	00:35.600	
-
-00:35.640	--> 	00:35.680	
-891	-	00:35.640	
-
-00:35.680	--> 	00:35.720	
-892	-	00:35.680	
-
-00:35.720	--> 	00:35.760	
-893	-	00:35.720	
-
-00:35.760	--> 	00:35.800	
-894	-	00:35.760	
-
-00:35.800	--> 	00:35.840	
-895	-	00:35.800	
-
-00:35.840	--> 	00:35.880	
-896	-	00:35.840	
-
-00:35.880	--> 	00:35.920	
-897	-	00:35.880	
-
-00:35.920	--> 	00:35.960	
-898	-	00:35.920	
-
-00:35.960	--> 	00:36.000	
-899	-	00:35.960	
-
-00:36.000	--> 	00:36.040	
-900	-	00:36.000	
-
-00:36.040	--> 	00:36.080	
-901	-	00:36.040	
-
-00:36.080	--> 	00:36.120	
-902	-	00:36.080	
-
-00:36.120	--> 	00:36.160	
-903	-	00:36.120	
-
-00:36.160	--> 	00:36.200	
-904	-	00:36.160	
-
-00:36.200	--> 	00:36.240	
-905	-	00:36.200	
-
-00:36.240	--> 	00:36.280	
-906	-	00:36.240	
-
-00:36.280	--> 	00:36.320	
-907	-	00:36.280	
-
-00:36.320	--> 	00:36.360	
-908	-	00:36.320	
-
-00:36.360	--> 	00:36.400	
-909	-	00:36.360	
-
-00:36.400	--> 	00:36.440	
-910	-	00:36.400	
-
-00:36.440	--> 	00:36.480	
-911	-	00:36.440	
-
-00:36.480	--> 	00:36.520	
-912	-	00:36.480	
-
-00:36.520	--> 	00:36.560	
-913	-	00:36.520	
-
-00:36.560	--> 	00:36.600	
-914	-	00:36.560	
-
-00:36.600	--> 	00:36.640	
-915	-	00:36.600	
-
-00:36.640	--> 	00:36.680	
-916	-	00:36.640	
-
-00:36.680	--> 	00:36.720	
-917	-	00:36.680	
-
-00:36.720	--> 	00:36.760	
-918	-	00:36.720	
-
-00:36.760	--> 	00:36.800	
-919	-	00:36.760	
-
-00:36.800	--> 	00:36.840	
-920	-	00:36.800	
-
-00:36.840	--> 	00:36.880	
-921	-	00:36.840	
-
-00:36.880	--> 	00:36.920	
-922	-	00:36.880	
-
-00:36.920	--> 	00:36.960	
-923	-	00:36.920	
-
-00:36.960	--> 	00:37.000	
-924	-	00:36.960	
-
-00:37.000	--> 	00:37.040	
-925	-	00:37.000	
-
-00:37.040	--> 	00:37.080	
-926	-	00:37.040	
-
-00:37.080	--> 	00:37.120	
-927	-	00:37.080	
-
-00:37.120	--> 	00:37.160	
-928	-	00:37.120	
-
-00:37.160	--> 	00:37.200	
-929	-	00:37.160	
-
-00:37.200	--> 	00:37.240	
-930	-	00:37.200	
-
-00:37.240	--> 	00:37.280	
-931	-	00:37.240	
-
-00:37.280	--> 	00:37.320	
-932	-	00:37.280	
-
-00:37.320	--> 	00:37.360	
-933	-	00:37.320	
-
-00:37.360	--> 	00:37.400	
-934	-	00:37.360	
-
-00:37.400	--> 	00:37.440	
-935	-	00:37.400	
-
-00:37.440	--> 	00:37.480	
-936	-	00:37.440	
-
-00:37.480	--> 	00:37.520	
-937	-	00:37.480	
-
-00:37.520	--> 	00:37.560	
-938	-	00:37.520	
-
-00:37.560	--> 	00:37.600	
-939	-	00:37.560	
-
-00:37.600	--> 	00:37.640	
-940	-	00:37.600	
-
-00:37.640	--> 	00:37.680	
-941	-	00:37.640	
-
-00:37.680	--> 	00:37.720	
-942	-	00:37.680	
-
-00:37.720	--> 	00:37.760	
-943	-	00:37.720	
-
-00:37.760	--> 	00:37.800	
-944	-	00:37.760	
-
-00:37.800	--> 	00:37.840	
-945	-	00:37.800	
-
-00:37.840	--> 	00:37.880	
-946	-	00:37.840	
-
-00:37.880	--> 	00:37.920	
-947	-	00:37.880	
-
-00:37.920	--> 	00:37.960	
-948	-	00:37.920	
-
-00:37.960	--> 	00:38.000	
-949	-	00:37.960	
-
-00:38.000	--> 	00:38.040	
-950	-	00:38.000	
-
-00:38.040	--> 	00:38.080	
-951	-	00:38.040	
-
-00:38.080	--> 	00:38.120	
-952	-	00:38.080	
-
-00:38.120	--> 	00:38.160	
-953	-	00:38.120	
-
-00:38.160	--> 	00:38.200	
-954	-	00:38.160	
-
-00:38.200	--> 	00:38.240	
-955	-	00:38.200	
-
-00:38.240	--> 	00:38.280	
-956	-	00:38.240	
-
-00:38.280	--> 	00:38.320	
-957	-	00:38.280	
-
-00:38.320	--> 	00:38.360	
-958	-	00:38.320	
-
-00:38.360	--> 	00:38.400	
-959	-	00:38.360	
-
-00:38.400	--> 	00:38.440	
-960	-	00:38.400	
-
-00:38.440	--> 	00:38.480	
-961	-	00:38.440	
-
-00:38.480	--> 	00:38.520	
-962	-	00:38.480	
-
-00:38.520	--> 	00:38.560	
-963	-	00:38.520	
-
-00:38.560	--> 	00:38.600	
-964	-	00:38.560	
-
-00:38.600	--> 	00:38.640	
-965	-	00:38.600	
-
-00:38.640	--> 	00:38.680	
-966	-	00:38.640	
-
-00:38.680	--> 	00:38.720	
-967	-	00:38.680	
-
-00:38.720	--> 	00:38.760	
-968	-	00:38.720	
-
-00:38.760	--> 	00:38.800	
-969	-	00:38.760	
-
-00:38.800	--> 	00:38.840	
-970	-	00:38.800	
-
-00:38.840	--> 	00:38.880	
-971	-	00:38.840	
-
-00:38.880	--> 	00:38.920	
-972	-	00:38.880	
-
-00:38.920	--> 	00:38.960	
-973	-	00:38.920	
-
-00:38.960	--> 	00:39.000	
-974	-	00:38.960	
-
-00:39.000	--> 	00:39.040	
-975	-	00:39.000	
-
-00:39.040	--> 	00:39.080	
-976	-	00:39.040	
-
-00:39.080	--> 	00:39.120	
-977	-	00:39.080	
-
-00:39.120	--> 	00:39.160	
-978	-	00:39.120	
-
-00:39.160	--> 	00:39.200	
-979	-	00:39.160	
-
-00:39.200	--> 	00:39.240	
-980	-	00:39.200	
-
-00:39.240	--> 	00:39.280	
-981	-	00:39.240	
-
-00:39.280	--> 	00:39.320	
-982	-	00:39.280	
-
-00:39.320	--> 	00:39.360	
-983	-	00:39.320	
-
-00:39.360	--> 	00:39.400	
-984	-	00:39.360	
-
-00:39.400	--> 	00:39.440	
-985	-	00:39.400	
-
-00:39.440	--> 	00:39.480	
-986	-	00:39.440	
-
-00:39.480	--> 	00:39.520	
-987	-	00:39.480	
-
-00:39.520	--> 	00:39.560	
-988	-	00:39.520	
-
-00:39.560	--> 	00:39.600	
-989	-	00:39.560	
-
-00:39.600	--> 	00:39.640	
-990	-	00:39.600	
-
-00:39.640	--> 	00:39.680	
-991	-	00:39.640	
-
-00:39.680	--> 	00:39.720	
-992	-	00:39.680	
-
-00:39.720	--> 	00:39.760	
-993	-	00:39.720	
-
-00:39.760	--> 	00:39.800	
-994	-	00:39.760	
-
-00:39.800	--> 	00:39.840	
-995	-	00:39.800	
-
-00:39.840	--> 	00:39.880	
-996	-	00:39.840	
-
-00:39.880	--> 	00:39.920	
-997	-	00:39.880	
-
-00:39.920	--> 	00:39.960	
-998	-	00:39.920	
-
-00:39.960	--> 	00:40.000	
-999	-	00:39.960	
-
-00:40.000	--> 	00:40.040	
-1000	-	00:40.000	
-
-00:40.040	--> 	00:40.080	
-1001	-	00:40.040	
-
-00:40.080	--> 	00:40.120	
-1002	-	00:40.080	
-
-00:40.120	--> 	00:40.160	
-1003	-	00:40.120	
-
-00:40.160	--> 	00:40.200	
-1004	-	00:40.160	
-
-00:40.200	--> 	00:40.240	
-1005	-	00:40.200	
-
-00:40.240	--> 	00:40.280	
-1006	-	00:40.240	
-
-00:40.280	--> 	00:40.320	
-1007	-	00:40.280	
-
-00:40.320	--> 	00:40.360	
-1008	-	00:40.320	
-
-00:40.360	--> 	00:40.400	
-1009	-	00:40.360	
-
-00:40.400	--> 	00:40.440	
-1010	-	00:40.400	
-
-00:40.440	--> 	00:40.480	
-1011	-	00:40.440	
-
-00:40.480	--> 	00:40.520	
-1012	-	00:40.480	
-
-00:40.520	--> 	00:40.560	
-1013	-	00:40.520	
-
-00:40.560	--> 	00:40.600	
-1014	-	00:40.560	
-
-00:40.600	--> 	00:40.640	
-1015	-	00:40.600	
-
-00:40.640	--> 	00:40.680	
-1016	-	00:40.640	
-
-00:40.680	--> 	00:40.720	
-1017	-	00:40.680	
-
-00:40.720	--> 	00:40.760	
-1018	-	00:40.720	
-
-00:40.760	--> 	00:40.800	
-1019	-	00:40.760	
-
-00:40.800	--> 	00:40.840	
-1020	-	00:40.800	
-
-00:40.840	--> 	00:40.880	
-1021	-	00:40.840	
-
-00:40.880	--> 	00:40.920	
-1022	-	00:40.880	
-
-00:40.920	--> 	00:40.960	
-1023	-	00:40.920	
-
-00:40.960	--> 	00:41.000	
-1024	-	00:40.960	
-
-00:41.000	--> 	00:41.040	
-1025	-	00:41.000	
-
-00:41.040	--> 	00:41.080	
-1026	-	00:41.040	
-
-00:41.080	--> 	00:41.120	
-1027	-	00:41.080	
-
-00:41.120	--> 	00:41.160	
-1028	-	00:41.120	
-
-00:41.160	--> 	00:41.200	
-1029	-	00:41.160	
-
-00:41.200	--> 	00:41.240	
-1030	-	00:41.200	
-
-00:41.240	--> 	00:41.280	
-1031	-	00:41.240	
-
-00:41.280	--> 	00:41.320	
-1032	-	00:41.280	
-
-00:41.320	--> 	00:41.360	
-1033	-	00:41.320	
-
-00:41.360	--> 	00:41.400	
-1034	-	00:41.360	
-
-00:41.400	--> 	00:41.440	
-1035	-	00:41.400	
-
-00:41.440	--> 	00:41.480	
-1036	-	00:41.440	
-
-00:41.480	--> 	00:41.520	
-1037	-	00:41.480	
-
-00:41.520	--> 	00:41.560	
-1038	-	00:41.520	
-
-00:41.560	--> 	00:41.600	
-1039	-	00:41.560	
-
-00:41.600	--> 	00:41.640	
-1040	-	00:41.600	
-
-00:41.640	--> 	00:41.680	
-1041	-	00:41.640	
-
-00:41.680	--> 	00:41.720	
-1042	-	00:41.680	
-
-00:41.720	--> 	00:41.760	
-1043	-	00:41.720	
-
-00:41.760	--> 	00:41.800	
-1044	-	00:41.760	
-
-00:41.800	--> 	00:41.840	
-1045	-	00:41.800	
-
-00:41.840	--> 	00:41.880	
-1046	-	00:41.840	
-
-00:41.880	--> 	00:41.920	
-1047	-	00:41.880	
-
-00:41.920	--> 	00:41.960	
-1048	-	00:41.920	
-
-00:41.960	--> 	00:42.000	
-1049	-	00:41.960	
-
-00:42.000	--> 	00:42.040	
-1050	-	00:42.000	
-
-00:42.040	--> 	00:42.080	
-1051	-	00:42.040	
-
-00:42.080	--> 	00:42.120	
-1052	-	00:42.080	
-
-00:42.120	--> 	00:42.160	
-1053	-	00:42.120	
-
-00:42.160	--> 	00:42.200	
-1054	-	00:42.160	
-
-00:42.200	--> 	00:42.240	
-1055	-	00:42.200	
-
-00:42.240	--> 	00:42.280	
-1056	-	00:42.240	
-
-00:42.280	--> 	00:42.320	
-1057	-	00:42.280	
-
-00:42.320	--> 	00:42.360	
-1058	-	00:42.320	
-
-00:42.360	--> 	00:42.400	
-1059	-	00:42.360	
-
-00:42.400	--> 	00:42.440	
-1060	-	00:42.400	
-
-00:42.440	--> 	00:42.480	
-1061	-	00:42.440	
-
-00:42.480	--> 	00:42.520	
-1062	-	00:42.480	
-
-00:42.520	--> 	00:42.560	
-1063	-	00:42.520	
-
-00:42.560	--> 	00:42.600	
-1064	-	00:42.560	
-
-00:42.600	--> 	00:42.640	
-1065	-	00:42.600	
-
-00:42.640	--> 	00:42.680	
-1066	-	00:42.640	
-
-00:42.680	--> 	00:42.720	
-1067	-	00:42.680	
-
-00:42.720	--> 	00:42.760	
-1068	-	00:42.720	
-
-00:42.760	--> 	00:42.800	
-1069	-	00:42.760	
-
-00:42.800	--> 	00:42.840	
-1070	-	00:42.800	
-
-00:42.840	--> 	00:42.880	
-1071	-	00:42.840	
-
-00:42.880	--> 	00:42.920	
-1072	-	00:42.880	
-
-00:42.920	--> 	00:42.960	
-1073	-	00:42.920	
-
-00:42.960	--> 	00:43.000	
-1074	-	00:42.960	
-
-00:43.000	--> 	00:43.040	
-1075	-	00:43.000	
-
-00:43.040	--> 	00:43.080	
-1076	-	00:43.040	
-
-00:43.080	--> 	00:43.120	
-1077	-	00:43.080	
-
-00:43.120	--> 	00:43.160	
-1078	-	00:43.120	
-
-00:43.160	--> 	00:43.200	
-1079	-	00:43.160	
-
-00:43.200	--> 	00:43.240	
-1080	-	00:43.200	
-
-00:43.240	--> 	00:43.280	
-1081	-	00:43.240	
-
-00:43.280	--> 	00:43.320	
-1082	-	00:43.280	
-
-00:43.320	--> 	00:43.360	
-1083	-	00:43.320	
-
-00:43.360	--> 	00:43.400	
-1084	-	00:43.360	
-
-00:43.400	--> 	00:43.440	
-1085	-	00:43.400	
-
-00:43.440	--> 	00:43.480	
-1086	-	00:43.440	
-
-00:43.480	--> 	00:43.520	
-1087	-	00:43.480	
-
-00:43.520	--> 	00:43.560	
-1088	-	00:43.520	
-
-00:43.560	--> 	00:43.600	
-1089	-	00:43.560	
-
-00:43.600	--> 	00:43.640	
-1090	-	00:43.600	
-
-00:43.640	--> 	00:43.680	
-1091	-	00:43.640	
-
-00:43.680	--> 	00:43.720	
-1092	-	00:43.680	
-
-00:43.720	--> 	00:43.760	
-1093	-	00:43.720	
-
-00:43.760	--> 	00:43.800	
-1094	-	00:43.760	
-
-00:43.800	--> 	00:43.840	
-1095	-	00:43.800	
-
-00:43.840	--> 	00:43.880	
-1096	-	00:43.840	
-
-00:43.880	--> 	00:43.920	
-1097	-	00:43.880	
-
-00:43.920	--> 	00:43.960	
-1098	-	00:43.920	
-
-00:43.960	--> 	00:44.000	
-1099	-	00:43.960	
-
-00:44.000	--> 	00:44.040	
-1100	-	00:44.000	
-
-00:44.040	--> 	00:44.080	
-1101	-	00:44.040	
-
-00:44.080	--> 	00:44.120	
-1102	-	00:44.080	
-
-00:44.120	--> 	00:44.160	
-1103	-	00:44.120	
-
-00:44.160	--> 	00:44.200	
-1104	-	00:44.160	
-
-00:44.200	--> 	00:44.240	
-1105	-	00:44.200	
-
-00:44.240	--> 	00:44.280	
-1106	-	00:44.240	
-
-00:44.280	--> 	00:44.320	
-1107	-	00:44.280	
-
-00:44.320	--> 	00:44.360	
-1108	-	00:44.320	
-
-00:44.360	--> 	00:44.400	
-1109	-	00:44.360	
-
-00:44.400	--> 	00:44.440	
-1110	-	00:44.400	
-
-00:44.440	--> 	00:44.480	
-1111	-	00:44.440	
-
-00:44.480	--> 	00:44.520	
-1112	-	00:44.480	
-
-00:44.520	--> 	00:44.560	
-1113	-	00:44.520	
-
-00:44.560	--> 	00:44.600	
-1114	-	00:44.560	
-
-00:44.600	--> 	00:44.640	
-1115	-	00:44.600	
-
-00:44.640	--> 	00:44.680	
-1116	-	00:44.640	
-
-00:44.680	--> 	00:44.720	
-1117	-	00:44.680	
-
-00:44.720	--> 	00:44.760	
-1118	-	00:44.720	
-
-00:44.760	--> 	00:44.800	
-1119	-	00:44.760	
-
-00:44.800	--> 	00:44.840	
-1120	-	00:44.800	
-
-00:44.840	--> 	00:44.880	
-1121	-	00:44.840	
-
-00:44.880	--> 	00:44.920	
-1122	-	00:44.880	
-
-00:44.920	--> 	00:44.960	
-1123	-	00:44.920	
-
-00:44.960	--> 	00:45.000	
-1124	-	00:44.960	
-
-00:45.000	--> 	00:45.040	
-1125	-	00:45.000	
-
-00:45.040	--> 	00:45.080	
-1126	-	00:45.040	
-
-00:45.080	--> 	00:45.120	
-1127	-	00:45.080	
-
-00:45.120	--> 	00:45.160	
-1128	-	00:45.120	
-
-00:45.160	--> 	00:45.200	
-1129	-	00:45.160	
-
-00:45.200	--> 	00:45.240	
-1130	-	00:45.200	
-
-00:45.240	--> 	00:45.280	
-1131	-	00:45.240	
-
-00:45.280	--> 	00:45.320	
-1132	-	00:45.280	
-
-00:45.320	--> 	00:45.360	
-1133	-	00:45.320	
-
-00:45.360	--> 	00:45.400	
-1134	-	00:45.360	
-
-00:45.400	--> 	00:45.440	
-1135	-	00:45.400	
-
-00:45.440	--> 	00:45.480	
-1136	-	00:45.440	
-
-00:45.480	--> 	00:45.520	
-1137	-	00:45.480	
-
-00:45.520	--> 	00:45.560	
-1138	-	00:45.520	
-
-00:45.560	--> 	00:45.600	
-1139	-	00:45.560	
-
-00:45.600	--> 	00:45.640	
-1140	-	00:45.600	
-
-00:45.640	--> 	00:45.680	
-1141	-	00:45.640	
-
-00:45.680	--> 	00:45.720	
-1142	-	00:45.680	
-
-00:45.720	--> 	00:45.760	
-1143	-	00:45.720	
-
-00:45.760	--> 	00:45.800	
-1144	-	00:45.760	
-
-00:45.800	--> 	00:45.840	
-1145	-	00:45.800	
-
-00:45.840	--> 	00:45.880	
-1146	-	00:45.840	
-
-00:45.880	--> 	00:45.920	
-1147	-	00:45.880	
-
-00:45.920	--> 	00:45.960	
-1148	-	00:45.920	
-
-00:45.960	--> 	00:46.000	
-1149	-	00:45.960	
-
-00:46.000	--> 	00:46.040	
-1150	-	00:46.000	
-
-00:46.040	--> 	00:46.080	
-1151	-	00:46.040	
-
-00:46.080	--> 	00:46.120	
-1152	-	00:46.080	
-
-00:46.120	--> 	00:46.160	
-1153	-	00:46.120	
-
-00:46.160	--> 	00:46.200	
-1154	-	00:46.160	
-
-00:46.200	--> 	00:46.240	
-1155	-	00:46.200	
-
-00:46.240	--> 	00:46.280	
-1156	-	00:46.240	
-
-00:46.280	--> 	00:46.320	
-1157	-	00:46.280	
-
-00:46.320	--> 	00:46.360	
-1158	-	00:46.320	
-
-00:46.360	--> 	00:46.400	
-1159	-	00:46.360	
-
-00:46.400	--> 	00:46.440	
-1160	-	00:46.400	
-
-00:46.440	--> 	00:46.480	
-1161	-	00:46.440	
-
-00:46.480	--> 	00:46.520	
-1162	-	00:46.480	
-
-00:46.520	--> 	00:46.560	
-1163	-	00:46.520	
-
-00:46.560	--> 	00:46.600	
-1164	-	00:46.560	
-
-00:46.600	--> 	00:46.640	
-1165	-	00:46.600	
-
-00:46.640	--> 	00:46.680	
-1166	-	00:46.640	
-
-00:46.680	--> 	00:46.720	
-1167	-	00:46.680	
-
-00:46.720	--> 	00:46.760	
-1168	-	00:46.720	
-
-00:46.760	--> 	00:46.800	
-1169	-	00:46.760	
-
-00:46.800	--> 	00:46.840	
-1170	-	00:46.800	
-
-00:46.840	--> 	00:46.880	
-1171	-	00:46.840	
-
-00:46.880	--> 	00:46.920	
-1172	-	00:46.880	
-
-00:46.920	--> 	00:46.960	
-1173	-	00:46.920	
-
-00:46.960	--> 	00:47.000	
-1174	-	00:46.960	
-
-00:47.000	--> 	00:47.040	
-1175	-	00:47.000	
-
-00:47.040	--> 	00:47.080	
-1176	-	00:47.040	
-
-00:47.080	--> 	00:47.120	
-1177	-	00:47.080	
-
-00:47.120	--> 	00:47.160	
-1178	-	00:47.120	
-
-00:47.160	--> 	00:47.200	
-1179	-	00:47.160	
-
-00:47.200	--> 	00:47.240	
-1180	-	00:47.200	
-
-00:47.240	--> 	00:47.280	
-1181	-	00:47.240	
-
-00:47.280	--> 	00:47.320	
-1182	-	00:47.280	
-
-00:47.320	--> 	00:47.360	
-1183	-	00:47.320	
-
-00:47.360	--> 	00:47.400	
-1184	-	00:47.360	
-
-00:47.400	--> 	00:47.440	
-1185	-	00:47.400	
-
-00:47.440	--> 	00:47.480	
-1186	-	00:47.440	
-
-00:47.480	--> 	00:47.520	
-1187	-	00:47.480	
-
-00:47.520	--> 	00:47.560	
-1188	-	00:47.520	
-
-00:47.560	--> 	00:47.600	
-1189	-	00:47.560	
-
-00:47.600	--> 	00:47.640	
-1190	-	00:47.600	
-
-00:47.640	--> 	00:47.680	
-1191	-	00:47.640	
-
-00:47.680	--> 	00:47.720	
-1192	-	00:47.680	
-
-00:47.720	--> 	00:47.760	
-1193	-	00:47.720	
-
-00:47.760	--> 	00:47.800	
-1194	-	00:47.760	
-
-00:47.800	--> 	00:47.840	
-1195	-	00:47.800	
-
-00:47.840	--> 	00:47.880	
-1196	-	00:47.840	
-
-00:47.880	--> 	00:47.920	
-1197	-	00:47.880	
-
-00:47.920	--> 	00:47.960	
-1198	-	00:47.920	
-
-00:47.960	--> 	00:48.000	
-1199	-	00:47.960	
-
-00:48.000	--> 	00:48.040	
-1200	-	00:48.000	
-
-00:48.040	--> 	00:48.080	
-1201	-	00:48.040	
-
-00:48.080	--> 	00:48.120	
-1202	-	00:48.080	
-
-00:48.120	--> 	00:48.160	
-1203	-	00:48.120	
-
-00:48.160	--> 	00:48.200	
-1204	-	00:48.160	
-
-00:48.200	--> 	00:48.240	
-1205	-	00:48.200	
-
-00:48.240	--> 	00:48.280	
-1206	-	00:48.240	
-
-00:48.280	--> 	00:48.320	
-1207	-	00:48.280	
-
-00:48.320	--> 	00:48.360	
-1208	-	00:48.320	
-
-00:48.360	--> 	00:48.400	
-1209	-	00:48.360	
-
-00:48.400	--> 	00:48.440	
-1210	-	00:48.400	
-
-00:48.440	--> 	00:48.480	
-1211	-	00:48.440	
-
-00:48.480	--> 	00:48.520	
-1212	-	00:48.480	
-
-00:48.520	--> 	00:48.560	
-1213	-	00:48.520	
-
-00:48.560	--> 	00:48.600	
-1214	-	00:48.560	
-
-00:48.600	--> 	00:48.640	
-1215	-	00:48.600	
-
-00:48.640	--> 	00:48.680	
-1216	-	00:48.640	
-
-00:48.680	--> 	00:48.720	
-1217	-	00:48.680	
-
-00:48.720	--> 	00:48.760	
-1218	-	00:48.720	
-
-00:48.760	--> 	00:48.800	
-1219	-	00:48.760	
-
-00:48.800	--> 	00:48.840	
-1220	-	00:48.800	
-
-00:48.840	--> 	00:48.880	
-1221	-	00:48.840	
-
-00:48.880	--> 	00:48.920	
-1222	-	00:48.880	
-
-00:48.920	--> 	00:48.960	
-1223	-	00:48.920	
-
-00:48.960	--> 	00:49.000	
-1224	-	00:48.960	
-
-00:49.000	--> 	00:49.040	
-1225	-	00:49.000	
-
-00:49.040	--> 	00:49.080	
-1226	-	00:49.040	
-
-00:49.080	--> 	00:49.120	
-1227	-	00:49.080	
-
-00:49.120	--> 	00:49.160	
-1228	-	00:49.120	
-
-00:49.160	--> 	00:49.200	
-1229	-	00:49.160	
-
-00:49.200	--> 	00:49.240	
-1230	-	00:49.200	
-
-00:49.240	--> 	00:49.280	
-1231	-	00:49.240	
-
-00:49.280	--> 	00:49.320	
-1232	-	00:49.280	
-
-00:49.320	--> 	00:49.360	
-1233	-	00:49.320	
-
-00:49.360	--> 	00:49.400	
-1234	-	00:49.360	
-
-00:49.400	--> 	00:49.440	
-1235	-	00:49.400	
-
-00:49.440	--> 	00:49.480	
-1236	-	00:49.440	
-
-00:49.480	--> 	00:49.520	
-1237	-	00:49.480	
-
-00:49.520	--> 	00:49.560	
-1238	-	00:49.520	
-
-00:49.560	--> 	00:49.600	
-1239	-	00:49.560	
-
-00:49.600	--> 	00:49.640	
-1240	-	00:49.600	
-
-00:49.640	--> 	00:49.680	
-1241	-	00:49.640	
-
-00:49.680	--> 	00:49.720	
-1242	-	00:49.680	
-
-00:49.720	--> 	00:49.760	
-1243	-	00:49.720	
-
-00:49.760	--> 	00:49.800	
-1244	-	00:49.760	
-
-00:49.800	--> 	00:49.840	
-1245	-	00:49.800	
-
-00:49.840	--> 	00:49.880	
-1246	-	00:49.840	
-
-00:49.880	--> 	00:49.920	
-1247	-	00:49.880	
-
-00:49.920	--> 	00:49.960	
-1248	-	00:49.920	
-
-00:49.960	--> 	00:50.000	
-1249	-	00:49.960	
-
-00:50.000	--> 	00:50.040	
-1250	-	00:50.000	
-
-00:50.040	--> 	00:50.080	
-1251	-	00:50.040	
-
-00:50.080	--> 	00:50.120	
-1252	-	00:50.080	
-
-00:50.120	--> 	00:50.160	
-1253	-	00:50.120	
-
-00:50.160	--> 	00:50.200	
-1254	-	00:50.160	
-
-00:50.200	--> 	00:50.240	
-1255	-	00:50.200	
-
-00:50.240	--> 	00:50.280	
-1256	-	00:50.240	
-
-00:50.280	--> 	00:50.320	
-1257	-	00:50.280	
-
-00:50.320	--> 	00:50.360	
-1258	-	00:50.320	
-
-00:50.360	--> 	00:50.400	
-1259	-	00:50.360	
-
-00:50.400	--> 	00:50.440	
-1260	-	00:50.400	
-
-00:50.440	--> 	00:50.480	
-1261	-	00:50.440	
-
-00:50.480	--> 	00:50.520	
-1262	-	00:50.480	
-
-00:50.520	--> 	00:50.560	
-1263	-	00:50.520	
-
-00:50.560	--> 	00:50.600	
-1264	-	00:50.560	
-
-00:50.600	--> 	00:50.640	
-1265	-	00:50.600	
-
-00:50.640	--> 	00:50.680	
-1266	-	00:50.640	
-
-00:50.680	--> 	00:50.720	
-1267	-	00:50.680	
-
-00:50.720	--> 	00:50.760	
-1268	-	00:50.720	
-
-00:50.760	--> 	00:50.800	
-1269	-	00:50.760	
-
-00:50.800	--> 	00:50.840	
-1270	-	00:50.800	
-
-00:50.840	--> 	00:50.880	
-1271	-	00:50.840	
-
-00:50.880	--> 	00:50.920	
-1272	-	00:50.880	
-
-00:50.920	--> 	00:50.960	
-1273	-	00:50.920	
-
-00:50.960	--> 	00:51.000	
-1274	-	00:50.960	
-
-00:51.000	--> 	00:51.040	
-1275	-	00:51.000	
-
-00:51.040	--> 	00:51.080	
-1276	-	00:51.040	
-
-00:51.080	--> 	00:51.120	
-1277	-	00:51.080	
-
-00:51.120	--> 	00:51.160	
-1278	-	00:51.120	
-
-00:51.160	--> 	00:51.200	
-1279	-	00:51.160	
-
-00:51.200	--> 	00:51.240	
-1280	-	00:51.200	
-
-00:51.240	--> 	00:51.280	
-1281	-	00:51.240	
-
-00:51.280	--> 	00:51.320	
-1282	-	00:51.280	
-
-00:51.320	--> 	00:51.360	
-1283	-	00:51.320	
-
-00:51.360	--> 	00:51.400	
-1284	-	00:51.360	
-
-00:51.400	--> 	00:51.440	
-1285	-	00:51.400	
-
-00:51.440	--> 	00:51.480	
-1286	-	00:51.440	
-
-00:51.480	--> 	00:51.520	
-1287	-	00:51.480	
-
-00:51.520	--> 	00:51.560	
-1288	-	00:51.520	
-
-00:51.560	--> 	00:51.600	
-1289	-	00:51.560	
-
-00:51.600	--> 	00:51.640	
-1290	-	00:51.600	
-
-00:51.640	--> 	00:51.680	
-1291	-	00:51.640	
-
-00:51.680	--> 	00:51.720	
-1292	-	00:51.680	
-
-00:51.720	--> 	00:51.760	
-1293	-	00:51.720	
-
-00:51.760	--> 	00:51.800	
-1294	-	00:51.760	
-
-00:51.800	--> 	00:51.840	
-1295	-	00:51.800	
-
-00:51.840	--> 	00:51.880	
-1296	-	00:51.840	
-
-00:51.880	--> 	00:51.920	
-1297	-	00:51.880	
-
-00:51.920	--> 	00:51.960	
-1298	-	00:51.920	
-
-00:51.960	--> 	00:52.000	
-1299	-	00:51.960	
-
-00:52.000	--> 	00:52.040	
-1300	-	00:52.000	
-
-00:52.040	--> 	00:52.080	
-1301	-	00:52.040	
-
-00:52.080	--> 	00:52.120	
-1302	-	00:52.080	
-
-00:52.120	--> 	00:52.160	
-1303	-	00:52.120	
-
-00:52.160	--> 	00:52.200	
-1304	-	00:52.160	
-
-00:52.200	--> 	00:52.240	
-1305	-	00:52.200	
-
-00:52.240	--> 	00:52.280	
-1306	-	00:52.240	
-
-00:52.280	--> 	00:52.320	
-1307	-	00:52.280	
-
-00:52.320	--> 	00:52.360	
-1308	-	00:52.320	
-
-00:52.360	--> 	00:52.400	
-1309	-	00:52.360	
-
-00:52.400	--> 	00:52.440	
-1310	-	00:52.400	
-
-00:52.440	--> 	00:52.480	
-1311	-	00:52.440	
-
-00:52.480	--> 	00:52.520	
-1312	-	00:52.480	
-
-00:52.520	--> 	00:52.560	
-1313	-	00:52.520	
-
-00:52.560	--> 	00:52.600	
-1314	-	00:52.560	
-
-00:52.600	--> 	00:52.640	
-1315	-	00:52.600	
-
-00:52.640	--> 	00:52.680	
-1316	-	00:52.640	
-
-00:52.680	--> 	00:52.720	
-1317	-	00:52.680	
-
-00:52.720	--> 	00:52.760	
-1318	-	00:52.720	
-
-00:52.760	--> 	00:52.800	
-1319	-	00:52.760	
-
-00:52.800	--> 	00:52.840	
-1320	-	00:52.800	
-
-00:52.840	--> 	00:52.880	
-1321	-	00:52.840	
-
-00:52.880	--> 	00:52.920	
-1322	-	00:52.880	
-
-00:52.920	--> 	00:52.960	
-1323	-	00:52.920	
-
-00:52.960	--> 	00:53.000	
-1324	-	00:52.960	
-
-00:53.000	--> 	00:53.040	
-1325	-	00:53.000	
-
-00:53.040	--> 	00:53.080	
-1326	-	00:53.040	
-
-00:53.080	--> 	00:53.120	
-1327	-	00:53.080	
-
-00:53.120	--> 	00:53.160	
-1328	-	00:53.120	
-
-00:53.160	--> 	00:53.200	
-1329	-	00:53.160	
-
-00:53.200	--> 	00:53.240	
-1330	-	00:53.200	
-
-00:53.240	--> 	00:53.280	
-1331	-	00:53.240	
-
-00:53.280	--> 	00:53.320	
-1332	-	00:53.280	
-
-00:53.320	--> 	00:53.360	
-1333	-	00:53.320	
-
-00:53.360	--> 	00:53.400	
-1334	-	00:53.360	
-
-00:53.400	--> 	00:53.440	
-1335	-	00:53.400	
-
-00:53.440	--> 	00:53.480	
-1336	-	00:53.440	
-
-00:53.480	--> 	00:53.520	
-1337	-	00:53.480	
-
-00:53.520	--> 	00:53.560	
-1338	-	00:53.520	
-
-00:53.560	--> 	00:53.600	
-1339	-	00:53.560	
-
-00:53.600	--> 	00:53.640	
-1340	-	00:53.600	
-
-00:53.640	--> 	00:53.680	
-1341	-	00:53.640	
-
-00:53.680	--> 	00:53.720	
-1342	-	00:53.680	
-
-00:53.720	--> 	00:53.760	
-1343	-	00:53.720	
-
-00:53.760	--> 	00:53.800	
-1344	-	00:53.760	
-
-00:53.800	--> 	00:53.840	
-1345	-	00:53.800	
-
-00:53.840	--> 	00:53.880	
-1346	-	00:53.840	
-
-00:53.880	--> 	00:53.920	
-1347	-	00:53.880	
-
-00:53.920	--> 	00:53.960	
-1348	-	00:53.920	
-
-00:53.960	--> 	00:54.000	
-1349	-	00:53.960	
-
-00:54.000	--> 	00:54.040	
-1350	-	00:54.000	
-
-00:54.040	--> 	00:54.080	
-1351	-	00:54.040	
-
-00:54.080	--> 	00:54.120	
-1352	-	00:54.080	
-
-00:54.120	--> 	00:54.160	
-1353	-	00:54.120	
-
-00:54.160	--> 	00:54.200	
-1354	-	00:54.160	
-
-00:54.200	--> 	00:54.240	
-1355	-	00:54.200	
-
-00:54.240	--> 	00:54.280	
-1356	-	00:54.240	
-
-00:54.280	--> 	00:54.320	
-1357	-	00:54.280	
-
-00:54.320	--> 	00:54.360	
-1358	-	00:54.320	
-
-00:54.360	--> 	00:54.400	
-1359	-	00:54.360	
-
-00:54.400	--> 	00:54.440	
-1360	-	00:54.400	
-
-00:54.440	--> 	00:54.480	
-1361	-	00:54.440	
-
-00:54.480	--> 	00:54.520	
-1362	-	00:54.480	
-
-00:54.520	--> 	00:54.560	
-1363	-	00:54.520	
-
-00:54.560	--> 	00:54.600	
-1364	-	00:54.560	
-
-00:54.600	--> 	00:54.640	
-1365	-	00:54.600	
-
-00:54.640	--> 	00:54.680	
-1366	-	00:54.640	
-
-00:54.680	--> 	00:54.720	
-1367	-	00:54.680	
-
-00:54.720	--> 	00:54.760	
-1368	-	00:54.720	
-
-00:54.760	--> 	00:54.800	
-1369	-	00:54.760	
-
-00:54.800	--> 	00:54.840	
-1370	-	00:54.800	
-
-00:54.840	--> 	00:54.880	
-1371	-	00:54.840	
-
-00:54.880	--> 	00:54.920	
-1372	-	00:54.880	
-
-00:54.920	--> 	00:54.960	
-1373	-	00:54.920	
-
-00:54.960	--> 	00:55.000	
-1374	-	00:54.960	
-
-00:55.000	--> 	00:55.040	
-1375	-	00:55.000	
-
-00:55.040	--> 	00:55.080	
-1376	-	00:55.040	
-
-00:55.080	--> 	00:55.120	
-1377	-	00:55.080	
-
-00:55.120	--> 	00:55.160	
-1378	-	00:55.120	
-
-00:55.160	--> 	00:55.200	
-1379	-	00:55.160	
-
-00:55.200	--> 	00:55.240	
-1380	-	00:55.200	
-
-00:55.240	--> 	00:55.280	
-1381	-	00:55.240	
-
-00:55.280	--> 	00:55.320	
-1382	-	00:55.280	
-
-00:55.320	--> 	00:55.360	
-1383	-	00:55.320	
-
-00:55.360	--> 	00:55.400	
-1384	-	00:55.360	
-
-00:55.400	--> 	00:55.440	
-1385	-	00:55.400	
-
-00:55.440	--> 	00:55.480	
-1386	-	00:55.440	
-
-00:55.480	--> 	00:55.520	
-1387	-	00:55.480	
-
-00:55.520	--> 	00:55.560	
-1388	-	00:55.520	
-
-00:55.560	--> 	00:55.600	
-1389	-	00:55.560	
-
-00:55.600	--> 	00:55.640	
-1390	-	00:55.600	
-
-00:55.640	--> 	00:55.680	
-1391	-	00:55.640	
-
-00:55.680	--> 	00:55.720	
-1392	-	00:55.680	
-
-00:55.720	--> 	00:55.760	
-1393	-	00:55.720	
-
-00:55.760	--> 	00:55.800	
-1394	-	00:55.760	
-
-00:55.800	--> 	00:55.840	
-1395	-	00:55.800	
-
-00:55.840	--> 	00:55.880	
-1396	-	00:55.840	
-
-00:55.880	--> 	00:55.920	
-1397	-	00:55.880	
-
-00:55.920	--> 	00:55.960	
-1398	-	00:55.920	
-
-00:55.960	--> 	00:56.000	
-1399	-	00:55.960	
-
-00:56.000	--> 	00:56.040	
-1400	-	00:56.000	
-
-00:56.040	--> 	00:56.080	
-1401	-	00:56.040	
-
-00:56.080	--> 	00:56.120	
-1402	-	00:56.080	
-
-00:56.120	--> 	00:56.160	
-1403	-	00:56.120	
-
-00:56.160	--> 	00:56.200	
-1404	-	00:56.160	
-
-00:56.200	--> 	00:56.240	
-1405	-	00:56.200	
-
-00:56.240	--> 	00:56.280	
-1406	-	00:56.240	
-
-00:56.280	--> 	00:56.320	
-1407	-	00:56.280	
-
-00:56.320	--> 	00:56.360	
-1408	-	00:56.320	
-
-00:56.360	--> 	00:56.400	
-1409	-	00:56.360	
-
-00:56.400	--> 	00:56.440	
-1410	-	00:56.400	
-
-00:56.440	--> 	00:56.480	
-1411	-	00:56.440	
-
-00:56.480	--> 	00:56.520	
-1412	-	00:56.480	
-
-00:56.520	--> 	00:56.560	
-1413	-	00:56.520	
-
-00:56.560	--> 	00:56.600	
-1414	-	00:56.560	
-
-00:56.600	--> 	00:56.640	
-1415	-	00:56.600	
-
-00:56.640	--> 	00:56.680	
-1416	-	00:56.640	
-
-00:56.680	--> 	00:56.720	
-1417	-	00:56.680	
-
-00:56.720	--> 	00:56.760	
-1418	-	00:56.720	
-
-00:56.760	--> 	00:56.800	
-1419	-	00:56.760	
-
-00:56.800	--> 	00:56.840	
-1420	-	00:56.800	
-
-00:56.840	--> 	00:56.880	
-1421	-	00:56.840	
-
-00:56.880	--> 	00:56.920	
-1422	-	00:56.880	
-
-00:56.920	--> 	00:56.960	
-1423	-	00:56.920	
-
-00:56.960	--> 	00:57.000	
-1424	-	00:56.960	
-
-00:57.000	--> 	00:57.040	
-1425	-	00:57.000	
-
-00:57.040	--> 	00:57.080	
-1426	-	00:57.040	
-
-00:57.080	--> 	00:57.120	
-1427	-	00:57.080	
-
-00:57.120	--> 	00:57.160	
-1428	-	00:57.120	
-
-00:57.160	--> 	00:57.200	
-1429	-	00:57.160	
-
-00:57.200	--> 	00:57.240	
-1430	-	00:57.200	
-
-00:57.240	--> 	00:57.280	
-1431	-	00:57.240	
-
-00:57.280	--> 	00:57.320	
-1432	-	00:57.280	
-
-00:57.320	--> 	00:57.360	
-1433	-	00:57.320	
-
-00:57.360	--> 	00:57.400	
-1434	-	00:57.360	
-
-00:57.400	--> 	00:57.440	
-1435	-	00:57.400	
-
-00:57.440	--> 	00:57.480	
-1436	-	00:57.440	
-
-00:57.480	--> 	00:57.520	
-1437	-	00:57.480	
-
-00:57.520	--> 	00:57.560	
-1438	-	00:57.520	
-
-00:57.560	--> 	00:57.600	
-1439	-	00:57.560	
-
-00:57.600	--> 	00:57.640	
-1440	-	00:57.600	
-
-00:57.640	--> 	00:57.680	
-1441	-	00:57.640	
-
-00:57.680	--> 	00:57.720	
-1442	-	00:57.680	
-
-00:57.720	--> 	00:57.760	
-1443	-	00:57.720	
-
-00:57.760	--> 	00:57.800	
-1444	-	00:57.760	
-
-00:57.800	--> 	00:57.840	
-1445	-	00:57.800	
-
-00:57.840	--> 	00:57.880	
-1446	-	00:57.840	
-
-00:57.880	--> 	00:57.920	
-1447	-	00:57.880	
-
-00:57.920	--> 	00:57.960	
-1448	-	00:57.920	
-
-00:57.960	--> 	00:58.000	
-1449	-	00:57.960	
-
-00:58.000	--> 	00:58.040	
-1450	-	00:58.000	
-
-00:58.040	--> 	00:58.080	
-1451	-	00:58.040	
-
-00:58.080	--> 	00:58.120	
-1452	-	00:58.080	
-
-00:58.120	--> 	00:58.160	
-1453	-	00:58.120	
-
-00:58.160	--> 	00:58.200	
-1454	-	00:58.160	
-
-00:58.200	--> 	00:58.240	
-1455	-	00:58.200	
-
-00:58.240	--> 	00:58.280	
-1456	-	00:58.240	
-
-00:58.280	--> 	00:58.320	
-1457	-	00:58.280	
-
-00:58.320	--> 	00:58.360	
-1458	-	00:58.320	
-
-00:58.360	--> 	00:58.400	
-1459	-	00:58.360	
-
-00:58.400	--> 	00:58.440	
-1460	-	00:58.400	
-
-00:58.440	--> 	00:58.480	
-1461	-	00:58.440	
-
-00:58.480	--> 	00:58.520	
-1462	-	00:58.480	
-
-00:58.520	--> 	00:58.560	
-1463	-	00:58.520	
-
-00:58.560	--> 	00:58.600	
-1464	-	00:58.560	
-
-00:58.600	--> 	00:58.640	
-1465	-	00:58.600	
-
-00:58.640	--> 	00:58.680	
-1466	-	00:58.640	
-
-00:58.680	--> 	00:58.720	
-1467	-	00:58.680	
-
-00:58.720	--> 	00:58.760	
-1468	-	00:58.720	
-
-00:58.760	--> 	00:58.800	
-1469	-	00:58.760	
-
-00:58.800	--> 	00:58.840	
-1470	-	00:58.800	
-
-00:58.840	--> 	00:58.880	
-1471	-	00:58.840	
-
-00:58.880	--> 	00:58.920	
-1472	-	00:58.880	
-
-00:58.920	--> 	00:58.960	
-1473	-	00:58.920	
-
-00:58.960	--> 	00:59.000	
-1474	-	00:58.960	
-
-00:59.000	--> 	00:59.040	
-1475	-	00:59.000	
-
-00:59.040	--> 	00:59.080	
-1476	-	00:59.040	
-
-00:59.080	--> 	00:59.120	
-1477	-	00:59.080	
-
-00:59.120	--> 	00:59.160	
-1478	-	00:59.120	
-
-00:59.160	--> 	00:59.200	
-1479	-	00:59.160	
-
-00:59.200	--> 	00:59.240	
-1480	-	00:59.200	
-
-00:59.240	--> 	00:59.280	
-1481	-	00:59.240	
-
-00:59.280	--> 	00:59.320	
-1482	-	00:59.280	
-
-00:59.320	--> 	00:59.360	
-1483	-	00:59.320	
-
-00:59.360	--> 	00:59.400	
-1484	-	00:59.360	
-
-00:59.400	--> 	00:59.440	
-1485	-	00:59.400	
-
-00:59.440	--> 	00:59.480	
-1486	-	00:59.440	
-
-00:59.480	--> 	00:59.520	
-1487	-	00:59.480	
-
-00:59.520	--> 	00:59.560	
-1488	-	00:59.520	
-
-00:59.560	--> 	00:59.600	
-1489	-	00:59.560	
-
-00:59.600	--> 	00:59.640	
-1490	-	00:59.600	
-
-00:59.640	--> 	00:59.680	
-1491	-	00:59.640	
-
-00:59.680	--> 	00:59.720	
-1492	-	00:59.680	
-
-00:59.720	--> 	00:59.760	
-1493	-	00:59.720	
-
-00:59.760	--> 	00:59.800	
-1494	-	00:59.760	
-
-00:59.800	--> 	00:59.840	
-1495	-	00:59.800	
-
-00:59.840	--> 	00:59.880	
-1496	-	00:59.840	
-
-00:59.880	--> 	00:59.920	
-1497	-	00:59.880	
-
-00:59.920	--> 	00:59.960	
-1498	-	00:59.920	
-
-00:59.960	--> 	01:00.000	
-1499	-	00:59.960	
-

gpac-0.8.0.tar.gz/tests/media/webvtt/elephants-dream-chapters-en.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/elephants-dream-subtitles-de.vtt Deleted

@@ -1,309 +0,0 @@
-WEBVTT
-
-1
-00:00:15.042 --> 00:00:18.042 align:start
-<v Proog>Auf der linken Seite sehen wir...</v>
-
-2
-00:00:18.750 --> 00:00:20.333 align:middle
-<v Proog>Auf der rechten Seite sehen wir die...</v>
-
-3
-00:00:20.417 --> 00:00:21.917
-<v Proog>...die <c.highlight>Enthaupter</c>.</v>
-
-4
-00:00:22.000 --> 00:00:24.625 align:end
-<v Proog>Alles ist sicher. Vollkommen sicher.</v>
-
-5
-00:00:26.333 --> 00:00:27.333
-<v Proog>Emo?</v>
-
-6
-00:00:28.875 --> 00:00:30.250 line:6% size:110%
-<v Proog>Pass auf!</v>
-
-7
-00:00:47.125 --> 00:00:48.250
-<v Proog>Bist du verletzt?</v>
-
-8
-00:00:51.917 --> 00:00:53.917
-<v Emo>Ich glaube nicht. Und du?</v>
-
-9
-00:00:55.625 --> 00:00:57.125
-<v Proog>Mir fehlt nichts.</v>
-
-10
-00:00:57.583 --> 00:01:01.667
-<v Proog>Steh auf! Emo, es ist gefährlich hier.</v>
-
-11
-00:01:02.208 --> 00:01:03.667
-<v Proog>Weiter!</v>
-
-12
-00:01:03.750 --> 00:01:05.750
-<v Emo>Was jetzt?</v>
-
-13
-00:01:05.875 --> 00:01:07.875
-<v Proog>Du wirst es sehen.</v>
-
-14
-00:01:16.167 --> 00:01:18.375
-<v Proog>Emo, hier lang.</v>
-
-15
-00:01:34.958 --> 00:01:35.792
-<v Proog>Mir nach!</v>
-
-16
-00:02:11.583 --> 00:02:12.792
-<v Proog>Schneller, Emo!</v>
-
-17
-00:02:48.375 --> 00:02:50.083
-<v Proog>Du bist unaufmerksam!</v>
-
-18
-00:02:50.750 --> 00:02:54.500
-<v Emo>Ich wollte doch nur an... ...ans Telefon gehen.</v>
-
-19
-00:02:55.000 --> 00:02:58.208
-<v Proog>Emo, schau, ich meine, hör zu.</v>
-
-20
-00:02:59.750 --> 00:03:02.292
-<v Proog>Du musst lernen zuzuhören.</v>
-
-21
-00:03:03.625 --> 00:03:05.125
-<v Proog>Das hier ist kein Spiel.</v>
-
-22
-00:03:06.167 --> 00:03:08.750
-<v Proog>u, wir, könnten hier draußen leicht sterben.</v>
-
-23
-00:03:10.208 --> 00:03:14.125
-<v Proog>Hör zu... Hör dem Klang der Maschine zu.</v>
-
-24
-00:03:18.333 --> 00:03:20.417
-<v Proog>Hör auf deinen Atem.</v>
-
-25
-00:04:27.208 --> 00:04:29.250
-<v Emo>Hast du nie genug davon?</v>
-
-26
-00:04:29.583 --> 00:04:31.083
-<v Proog>Genug?!?</v>
-
-27
-00:04:31.750 --> 00:04:34.667
-<v Proog>Die Maschine ist wie ein Uhrwerk.</v>
-
-28
-00:04:35.500 --> 00:04:37.708
-<v Proog>Ein falscher Schritt...</v>
-
-29
-00:04:37.833 --> 00:04:39.792
-<v Proog>...und du wirst zerquetscht.</v>
-
-30
-00:04:41.042 --> 00:04:42.375
-<v Emo>Aber ist es nicht...</v>
-
-31
-00:04:42.417 --> 00:04:46.542
-<v Proog>Zerquetscht, Emo! Willst du das? Zerquetscht werden?</v>
-
-32
-00:04:48.083 --> 00:04:50.000
-<v Proog>Dein Lebensziel?</v>
-
-33
-00:04:50.583 --> 00:04:52.250
-<v Proog>Zerquetscht!</v>
-
-34
-00:05:41.833 --> 00:05:43.458
-<v Proog>Emo, schließ die Augen.</v>
-
-35
-00:05:44.917 --> 00:05:46.583
-<v Emo>Warum? - </v><v Proog>Sofort!</v>
-
-36
-00:05:53.750 --> 00:05:56.042
-<v Emo>Gut.</v>
-
-37
-00:05:59.542 --> 00:06:02.792
-<v Proog>Was siehst du zu deiner Linken, Emo?</v>
-
-38
-00:06:04.417 --> 00:06:06.000
-<v Emo>Nichts. - </v><v Proog>Wirklich?</v>
-
-39
-00:06:06.333 --> 00:06:07.917
-<v Emo>Überhaupt nichts.</v>
-
-40
-00:06:08.042 --> 00:06:12.417
-<v Proog>Und zu deiner Rechten, was siehst du zu deiner Rechten, Emo?</v>
-
-41
-00:06:13.875 --> 00:06:16.917
-<v Proog>Dasselbe, Proog, genau dasselbe...</v>
-
-42
-00:06:17.083 --> 00:06:18.583
-<v Emo>Nichts!</v>
-
-43
-00:06:40.625 --> 00:06:42.958
-<v Emo>Hör mal, Proog! Hörst du das?</v>
-
-44
-00:06:43.625 --> 00:06:45.042
-<v Emo>Können wir hier hingehen?</v>
-
-45
-00:06:45.208 --> 00:06:48.042
-<v Proog>Dorthin? Das ist gefährlich.</v>
-
-46
-00:06:49.917 --> 00:06:52.500
-<v Emo>Aber... - </v><v Proog>Vertrau mir, es ist gefährlich.</v>
-
-47
-00:06:53.292 --> 00:06:54.792
-<v Emo>Vielleicht könnte ich...</v>
-
-48
-00:06:54.833 --> 00:06:56.333
-<v Proog>Nein.</v>
-
-49
-00:06:57.667 --> 00:07:00.167
-<v Proog>NEIN!</v>
-
-50
-00:07:00.875 --> 00:07:03.750
-<v Proog>Sonst noch Fragen, Emo?</v>
-
-51
-00:07:04.250 --> 00:07:05.917
-<v Emo>Nein.</v>
-
-52
-00:07:09.458 --> 00:07:10.833
-<v Proog>Emo.</v>
-
-53
-00:07:11.875 --> 00:07:13.542
-<v Proog>Emo, warum...</v>
-
-54
-00:07:13.583 --> 00:07:14.458
-<v Proog>Emo...</v>
-
-55
-00:07:14.500 --> 00:07:18.500
-<v Proog>...warum erkennst du nicht die Schönheit dieses Ortes?</v>
-
-56
-00:07:18.833 --> 00:07:20.750
-<v Proog>ie alles funktioniert.</v>
-
-57
-00:07:20.875 --> 00:07:24.000
-<v Proog>Wie vollkommen es ist.</v>
-
-58
-00:07:24.083 --> 00:07:27.417
-<v Emo>Nein, Proog, ich erkenne nichts.</v>
-
-59
-00:07:27.542 --> 00:07:30.333
-<v Emo>Ich erkenne nichts, weil da nichts ist.</v>
-
-60
-00:07:31.500 --> 00:07:35.333
-<v Emo>Und warum sollte ich mein Leben etwas anvertrauen, das gar nicht da ist?</v>
-
-61
-00:07:35.583 --> 00:07:37.042
-<v Emo>Kannst du mir das sagen? - </v><v Proog>Emo...</v>
-
-62
-00:07:37.500 --> 00:07:39.167
-<v Emo>Antworte mir!</v>
-
-63
-00:07:43.208 --> 00:07:44.583
-<v Emo>Proog...</v>
-
-64
-00:07:45.500 --> 00:07:47.333
-<v Emo>Du bist krank, Mann!</v>
-
-65
-00:07:47.375 --> 00:07:49.208
-<v Emo>Bleib weg von mir!</v>
-
-66
-00:07:52.583 --> 00:07:55.083
-<v Proog>Nein! Emo! Das ist eine Falle!</v>
-
-67
-00:07:55.833 --> 00:07:57.167
-<v Emo>Haha, eine Falle.</v>
-
-68
-00:07:57.208 --> 00:08:01.750
-<v Emo>Auf der linken Seite sieht man die Hängenden Gärten von Babylon.</v>
-
-69
-00:08:02.250 --> 00:08:04.292
-<v Emo>Wie wär das als Falle?</v>
-
-70
-00:08:05.458 --> 00:08:07.125
-<v Proog>Nein, Emo.</v>
-
-71
-00:08:09.417 --> 00:08:12.792
-<v Emo>Auf der rechten Seite sieht man... ...rate mal...</v>
-
-72
-00:08:13.000 --> 00:08:14.750
-<v Emo>...den Koloss von Rhodos!</v>
-
-73
-00:08:15.833 --> 00:08:16.708
-<v Proog>Nein!</v>
-
-74
-00:08:16.750 --> 00:08:22.167
-<v Emo>Den Koloss von Rhodos und er ist nur für dich hier, Proog.</v>
-
-75
-00:08:51.333 --> 00:08:53.167
-<v Proog>Es ist da...</v>
-
-76
-00:08:53.208 --> 00:08:55.500
-<v Proog>Wenn ich es dir doch sage, Emo...</v>
-
-77
-00:08:57.333 --> 00:09:00.000
-<v Proog>...es ist da.</v>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/webvtt/elephants-dream-subtitles-en.vtt Deleted

@@ -1,357 +0,0 @@
-WEBVTT
-
-1
-00:00:15.000 --> 00:00:18.000 align:start
-<v Proog>At the left we can see...</v>
-
-2
-00:00:18.167 --> 00:00:20.083 align:middle
-<v Proog>At the right we can see the...</v>
-
-3
-00:00:20.083 --> 00:00:22.000
-<v Proog>...the <c.highlight>head-snarlers</c></v>
-
-4
-00:00:22.000 --> 00:00:24.417 align:end
-<v Proog>Everything is safe. Perfectly safe.</v>
-
-5
-00:00:24.583 --> 00:00:27.083
-<v Proog>Emo?</v>
-
-6
-00:00:28.208 --> 00:00:30.042 line:6% size:110%
-<v Proog><b>Watch out!</b></v>
-
-7
-00:00:47.042 --> 00:00:48.542
-<v Proog>Are you hurt?</v>
-
-8
-00:00:52.000 --> 00:00:54.000
-<v Emo>I don't think so. You?</v>
-
-9
-00:00:55.167 --> 00:00:57.042
-<v Proog>I'm Ok.</v>
-
-10
-00:00:57.125 --> 00:01:01.167
-<v Proog>Get up. Emo, it's not safe here.</v>
-
-11
-00:01:02.042 --> 00:01:03.167
-<v Proog>Let's go.</v>
-
-12
-00:01:03.167 --> 00:01:05.167
-<v Emo>What's next?</v>
-
-13
-00:01:05.208 --> 00:01:09.208
-<v Proog>You'll see!</v>
-
-14
-00:01:12.000 --> 00:01:14.000
-(howling wind)
-
-15
-00:01:16.042 --> 00:01:18.083
-<v Proog>Emo. This way.</v>
-
-16
-00:01:34.250 --> 00:01:35.542
-<v Proog>Follow me!</v>
-
-17
-00:01:39.000 --> 00:01:42.000
-(buzzing wires and chattery conversations)
-
-18
-00:02:11.125 --> 00:02:12.542
-<v Proog>Hurry Emo!</v>
-
-19
-00:02:20.292 --> 00:02:22.792
-(louder telephone voices)
-
-20
-00:02:32.000 --> 00:02:34.500
-(phone ringing)
-
-21
-00:02:48.083 --> 00:02:50.000
-<v Proog>You're not paying attention!</v>
-
-22
-00:02:50.167 --> 00:02:54.125
-<v Emo>I just want to answer the... ...phone.</v>
-
-23
-00:02:55.000 --> 00:02:58.042
-<v Proog>Emo, look, I mean listen.</v>
-
-24
-00:02:59.167 --> 00:03:02.083
-<v Proog>You have to learn to listen.</v>
-
-25
-00:03:03.167 --> 00:03:05.042
-<v Proog>This is not some game.</v>
-
-26
-00:03:05.083 --> 00:03:09.417
-<v Proog>You, I mean we, we could easily die out here.</v>
-
-27
-00:03:10.042 --> 00:03:14.042
-<v Proog>Listen, listen to the sounds of the machine.</v>
-
-28
-00:03:18.083 --> 00:03:20.083
-<v Proog>Listen to your breathing.</v>
-
-29
-00:03:27.000 --> 00:03:29.000
-(Buzzing wires)
-
-30
-00:03:34.500 --> 00:03:36.500
-(laughing)
-
-31
-00:04:13.417 --> 00:04:15.417
-(oriental dance music)
-
-32
-00:04:27.042 --> 00:04:29.042
-<v Emo>Well, don't you ever get tired of this?</v>
-
-33
-00:04:29.125 --> 00:04:31.000
-<v Proog>Tired?!?</v>
-
-34
-00:04:31.167 --> 00:04:34.583
-<v Proog>Emo, the machine is like clockwork.</v>
-
-35
-00:04:35.125 --> 00:04:37.167
-<v Proog>One move out of place...</v>
-
-36
-00:04:37.208 --> 00:04:39.208
-<v Proog>...and you're ground to a pulp.</v>
-
-37
-00:04:41.000 --> 00:04:42.083
-<v Emo>But isn't it -</v>
-
-38
-00:04:42.083 --> 00:04:46.125
-<v Proog>Pulp, Emo! Is that what you want, pulp?</v>
-
-39
-00:04:47.083 --> 00:04:49.083
-<v Proog>Emo, your goal in life...</v>
-
-40
-00:04:50.125 --> 00:04:52.042
-<v Proog>...pulp?</v>
-
-41
-00:05:08.000 --> 00:05:10.500
-(loud metal sounds)
-
-42
-00:05:41.208 --> 00:05:43.125
-<v Proog>Emo, close your eyes.</v>
-
-43
-00:05:44.208 --> 00:05:46.125
-<v Emo>Why?</v> - <v Proog>Now!</v>
-
-44
-00:05:51.208 --> 00:05:52.208
-<v Emo>Ok.</v>
-
-45
-00:05:53.167 --> 00:05:54.792
-<v Proog>Good.</v>
-
-46
-00:05:59.125 --> 00:06:02.208
-<v Proog>What do you see at your left side, Emo?</v>
-
-47
-00:06:04.083 --> 00:06:06.000
-<v Emo>Nothing.</v> - <v Proog>Really?</v>
-
-48
-00:06:06.083 --> 00:06:07.208
-<v Emo>No, nothing at all.</v>
-
-49
-00:06:08.000 --> 00:06:12.083
-<v Proog>And at your right, what do you see at your right side, Emo?</v>
-
-50
-00:06:13.208 --> 00:06:16.208
-<v Emo>The same Proog, exactly the same...</v>
-
-51
-00:06:17.000 --> 00:06:19.208
-<v Emo>...nothing!</v> - <v Proog>Great.</v>
-
-52
-00:06:25.208 --> 00:06:27.208
-(sound of camera flash)
-
-53
-00:06:29.792 --> 00:06:31.792
-(engine drone)
-
-54
-00:06:40.167 --> 00:06:42.833
-<v Emo>Listen Proog! Do you hear that!</v> (amusement park music)
-
-55
-00:06:43.167 --> 00:06:45.000
-<v Emo>Can we go here?</v>
-
-56
-00:06:45.042 --> 00:06:48.000
-<v Proog>There? It isn't safe, Emo.</v>
-
-57
-00:06:49.208 --> 00:06:52.125
-<v Emo>But...</v> - <v Proog>Trust me, it's not.</v>
-
-58
-00:06:53.083 --> 00:06:54.208
-<v Emo>Maybe I could...</v>
-
-59
-00:06:54.208 --> 00:06:56.083
-<v Proog>No.</v>
-
-60
-00:06:57.167 --> 00:07:00.042
-<v Proog>NO!</v>
-
-61
-00:07:00.208 --> 00:07:03.167
-<v Proog>Any further questions, Emo?</v>
-
-62
-00:07:04.042 --> 00:07:05.208
-<v Emo>No.</v>
-
-63
-00:07:09.125 --> 00:07:10.208
-<v Proog>Emo?</v>
-
-64
-00:07:11.208 --> 00:07:13.125
-<v Proog>Emo, why...</v>
-
-65
-00:07:13.125 --> 00:07:14.125
-<v Proog>Emo...</v>
-
-66
-00:07:14.125 --> 00:07:18.125
-<v Proog>...why can't you see the beauty of this place?</v>
-
-67
-00:07:18.208 --> 00:07:20.167
-<v Proog>The way it works.</v>
-
-68
-00:07:20.208 --> 00:07:24.000
-<v Proog>How perfect it is.</v>
-
-69
-00:07:24.000 --> 00:07:27.083
-<v Emo>No, Proog, I don't see.</v>
-
-70
-00:07:27.125 --> 00:07:30.083
-<v Emo>I don't see because there's nothing there.</v>
-
-71
-00:07:31.125 --> 00:07:35.083
-<v Emo>And why should I trust my life to something that isn't there?</v>
-
-72
-00:07:35.125 --> 00:07:37.042
-<v Emo>Well can you tell me that?</v> - <v Proog>Emo...</v>
-
-73
-00:07:37.125 --> 00:07:39.042
-<v Emo>Answer me!</v>
-
-74
-00:07:43.042 --> 00:07:44.125
-<v Emo>Proog...</v>
-
-75
-00:07:45.125 --> 00:07:47.083
-<v Emo>...you're a sick man!</v>
-
-76
-00:07:47.083 --> 00:07:49.042
-<v Emo>Stay away from me!</v>
-
-77
-00:07:52.125 --> 00:07:55.000
-<v Proog>No! Emo! It's a trap!</v>
-
-78
-00:07:55.208 --> 00:07:57.042
-<v Emo>Hah, it's a trap.</v>
-
-79
-00:07:57.042 --> 00:08:01.167
-<v Emo>At the left side you can see the hanging gardens of Babylon!</v>
-
-80
-00:08:02.042 --> 00:08:04.083
-<v Emo>How's that for a trap?</v>
-
-81
-00:08:05.125 --> 00:08:07.042
-<v Proog>No, Emo.</v>
-
-82
-00:08:09.083 --> 00:08:12.208
-<v Emo>At the right side you can see... ...well guess what...</v>
-
-83
-00:08:13.000 --> 00:08:14.792
-<v Emo>...the colossus of Rhodes!</v>
-
-84
-00:08:15.208 --> 00:08:16.167
-<v Proog>No!</v>
-
-85
-00:08:16.167 --> 00:08:22.042
-<v Emo>The colossus of Rhodes and it is here just for you Proog.</v>
-
-86
-00:08:51.083 --> 00:08:53.042
-<v Proog>It is there...</v>
-
-87
-00:08:53.042 --> 00:08:56.167
-<v Proog>I'm telling you, Emo...</v>
-
-88
-00:08:57.083 --> 00:09:00.000
-<v Proog>...it is, it is.</v>
-
-89
-00:09:05.000 --> 00:09:07.500
-(howling wind)
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/webvtt/empty.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/empty2.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/empty3.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/empty4.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/header.vtt Deleted

@@ -1,42 +0,0 @@
-WEBVTT
-This is a header
-with an empty line
-
-00:11.000 --> 00:13.000
-<v Roger Bingham>We are in New York City
-
-00:13.000 --> 00:16.000
-<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
-
-00:16.000 --> 00:18.000
-<v Roger Bingham>from the American Museum of Natural History
-
-00:18.000 --> 00:20.000
-<v Roger Bingham>And with me is Neil deGrasse Tyson
-
-00:20.000 --> 00:22.000
-<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
-
-00:22.000 --> 00:24.000
-<v Roger Bingham>at the AMNH.
-
-00:24.000 --> 00:26.000
-<v Roger Bingham>Thank you for walking down here.
-
-00:27.000 --> 00:30.000
-<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
-
-00:30.000 --> 00:31.500 align:end size:50%
-<v Roger Bingham>When we e-mailed-
-
-00:30.500 --> 00:32.500 align:start size:50%
-<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
-
-00:32.000 --> 00:35.500 align:end size:50%
-<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
-
-00:32.500 --> 00:33.500 align:start size:50%
-<v Neil deGrasse Tyson><i>Laughs</i>
-
-00:35.500 --> 00:38.000
-<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/webvtt/invalid1.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/invalid2.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/invalid3.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/invalid4.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/invalid5.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/long-duration.vtt Deleted

@@ -1,43814 +0,0 @@
-WEBVTT long duration file
-
-0
-00:00:00.000 --> 00:00:02.000
-This is cue #0
-
-1
-00:00:01.000 --> 00:00:02.000
-This is cue #1
-
-2
-00:00:02.000 --> 00:00:03.000
-This is cue #2
-
-3
-00:00:03.000 --> 00:00:04.000
-This is cue #3
-
-4
-00:00:04.000 --> 00:00:05.000
-This is cue #4
-
-5
-00:00:05.000 --> 00:00:06.000
-This is cue #5
-
-6
-00:00:06.000 --> 00:00:07.000
-This is cue #6
-
-7
-00:00:07.000 --> 00:00:08.000
-This is cue #7
-
-8
-00:00:08.000 --> 00:00:09.000
-This is cue #8
-
-9
-00:00:09.000 --> 00:00:10.000
-This is cue #9
-
-10
-00:00:10.000 --> 00:00:11.000
-This is cue #10
-
-11
-00:00:11.000 --> 00:00:12.000
-This is cue #11
-
-12
-00:00:12.000 --> 00:00:13.000
-This is cue #12
-
-13
-00:00:13.000 --> 00:00:14.000
-This is cue #13
-
-14
-00:00:14.000 --> 00:00:15.000
-This is cue #14
-
-15
-00:00:15.000 --> 00:00:16.000
-This is cue #15
-
-16
-00:00:16.000 --> 00:00:17.000
-This is cue #16
-
-17
-00:00:17.000 --> 00:00:18.000
-This is cue #17
-
-18
-00:00:18.000 --> 00:00:19.000
-This is cue #18
-
-19
-00:00:19.000 --> 00:00:20.000
-This is cue #19
-
-20
-00:00:20.000 --> 00:00:21.000
-This is cue #20
-
-21
-00:00:21.000 --> 00:00:22.000
-This is cue #21
-
-22
-00:00:22.000 --> 00:00:23.000
-This is cue #22
-
-23
-00:00:23.000 --> 00:00:24.000
-This is cue #23
-
-24
-00:00:24.000 --> 00:00:25.000
-This is cue #24
-
-25
-00:00:25.000 --> 00:00:26.000
-This is cue #25
-
-26
-00:00:26.000 --> 00:00:27.000
-This is cue #26
-
-27
-00:00:27.000 --> 00:00:28.000
-This is cue #27
-
-28
-00:00:28.000 --> 00:00:29.000
-This is cue #28
-
-29
-00:00:29.000 --> 00:00:30.000
-This is cue #29
-
-30
-00:00:30.000 --> 00:00:31.000
-This is cue #30
-
-31
-00:00:31.000 --> 00:00:32.000
-This is cue #31
-
-32
-00:00:32.000 --> 00:00:33.000
-This is cue #32
-
-33
-00:00:33.000 --> 00:00:34.000
-This is cue #33
-
-34
-00:00:34.000 --> 00:00:35.000
-This is cue #34
-
-35
-00:00:35.000 --> 00:00:36.000
-This is cue #35
-
-36
-00:00:36.000 --> 00:00:37.000
-This is cue #36
-
-37
-00:00:37.000 --> 00:00:38.000
-This is cue #37
-
-38
-00:00:38.000 --> 00:00:39.000
-This is cue #38
-
-39
-00:00:39.000 --> 00:00:40.000
-This is cue #39
-
-40
-00:00:40.000 --> 00:00:41.000
-This is cue #40
-
-41
-00:00:41.000 --> 00:00:42.000
-This is cue #41
-
-42
-00:00:42.000 --> 00:00:43.000
-This is cue #42
-
-43
-00:00:43.000 --> 00:00:44.000
-This is cue #43
-
-44
-00:00:44.000 --> 00:00:45.000
-This is cue #44
-
-45
-00:00:45.000 --> 00:00:46.000
-This is cue #45
-
-46
-00:00:46.000 --> 00:00:47.000
-This is cue #46
-
-47
-00:00:47.000 --> 00:00:48.000
-This is cue #47
-
-48
-00:00:48.000 --> 00:00:49.000
-This is cue #48
-
-49
-00:00:49.000 --> 00:00:50.000
-This is cue #49
-
-50
-00:00:50.000 --> 00:00:51.000
-This is cue #50
-
-51
-00:00:51.000 --> 00:00:52.000
-This is cue #51
-
-52
-00:00:52.000 --> 00:00:53.000
-This is cue #52
-
-53
-00:00:53.000 --> 00:00:54.000
-This is cue #53
-
-54
-00:00:54.000 --> 00:00:55.000
-This is cue #54
-
-55
-00:00:55.000 --> 00:00:56.000
-This is cue #55
-
-56
-00:00:56.000 --> 00:00:57.000
-This is cue #56
-
-57
-00:00:57.000 --> 00:00:58.000
-This is cue #57
-
-58
-00:00:58.000 --> 00:00:59.000
-This is cue #58
-
-59
-00:00:59.000 --> 00:01:00.000
-This is cue #59
-
-60
-00:01:00.000 --> 00:01:01.000
-This is cue #60
-
-61
-00:01:01.000 --> 00:01:02.000
-This is cue #61
-
-62
-00:01:02.000 --> 00:01:03.000
-This is cue #62
-
-63
-00:01:03.000 --> 00:01:04.000
-This is cue #63
-
-64
-00:01:04.000 --> 00:01:05.000
-This is cue #64
-
-65
-00:01:05.000 --> 00:01:06.000
-This is cue #65
-
-66
-00:01:06.000 --> 00:01:07.000
-This is cue #66
-
-67
-00:01:07.000 --> 00:01:08.000
-This is cue #67
-
-68
-00:01:08.000 --> 00:01:09.000
-This is cue #68
-
-69
-00:01:09.000 --> 00:01:10.000
-This is cue #69
-
-70
-00:01:10.000 --> 00:01:11.000
-This is cue #70
-
-71
-00:01:11.000 --> 00:01:12.000
-This is cue #71
-
-72
-00:01:12.000 --> 00:01:13.000
-This is cue #72
-
-73
-00:01:13.000 --> 00:01:14.000
-This is cue #73
-
-74
-00:01:14.000 --> 00:01:15.000
-This is cue #74
-
-75
-00:01:15.000 --> 00:01:16.000
-This is cue #75
-
-76
-00:01:16.000 --> 00:01:17.000
-This is cue #76
-
-77
-00:01:17.000 --> 00:01:18.000
-This is cue #77
-
-78
-00:01:18.000 --> 00:01:19.000
-This is cue #78
-
-79
-00:01:19.000 --> 00:01:20.000
-This is cue #79
-
-80
-00:01:20.000 --> 00:01:21.000
-This is cue #80
-
-81
-00:01:21.000 --> 00:01:22.000
-This is cue #81
-
-82
-00:01:22.000 --> 00:01:23.000
-This is cue #82
-
-83
-00:01:23.000 --> 00:01:24.000
-This is cue #83
-
-84
-00:01:24.000 --> 00:01:25.000
-This is cue #84
-
-85
-00:01:25.000 --> 00:01:26.000
-This is cue #85
-
-86
-00:01:26.000 --> 00:01:27.000
-This is cue #86
-
-87
-00:01:27.000 --> 00:01:28.000
-This is cue #87
-
-88
-00:01:28.000 --> 00:01:29.000
-This is cue #88
-
-89
-00:01:29.000 --> 00:01:30.000
-This is cue #89
-
-90
-00:01:30.000 --> 00:01:31.000
-This is cue #90
-
-91
-00:01:31.000 --> 00:01:32.000
-This is cue #91
-
-92
-00:01:32.000 --> 00:01:33.000
-This is cue #92
-
-93
-00:01:33.000 --> 00:01:34.000
-This is cue #93
-
-94
-00:01:34.000 --> 00:01:35.000
-This is cue #94
-
-95
-00:01:35.000 --> 00:01:36.000
-This is cue #95
-
-96
-00:01:36.000 --> 00:01:37.000
-This is cue #96
-
-97
-00:01:37.000 --> 00:01:38.000
-This is cue #97
-
-98
-00:01:38.000 --> 00:01:39.000
-This is cue #98
-
-99
-00:01:39.000 --> 00:01:40.000
-This is cue #99
-
-100
-00:01:40.000 --> 00:01:41.000
-This is cue #100
-
-101
-00:01:41.000 --> 00:01:42.000
-This is cue #101
-
-102
-00:01:42.000 --> 00:01:43.000
-This is cue #102
-
-103
-00:01:43.000 --> 00:01:44.000
-This is cue #103
-
-104
-00:01:44.000 --> 00:01:45.000
-This is cue #104
-
-105
-00:01:45.000 --> 00:01:46.000
-This is cue #105
-
-106
-00:01:46.000 --> 00:01:47.000
-This is cue #106
-
-107
-00:01:47.000 --> 00:01:48.000
-This is cue #107
-
-108
-00:01:48.000 --> 00:01:49.000
-This is cue #108
-
-109
-00:01:49.000 --> 00:01:50.000
-This is cue #109
-
-110
-00:01:50.000 --> 00:01:51.000
-This is cue #110
-
-111
-00:01:51.000 --> 00:01:52.000
-This is cue #111
-
-112
-00:01:52.000 --> 00:01:53.000
-This is cue #112
-
-113
-00:01:53.000 --> 00:01:54.000
-This is cue #113
-
-114
-00:01:54.000 --> 00:01:55.000
-This is cue #114
-
-115
-00:01:55.000 --> 00:01:56.000
-This is cue #115
-
-116
-00:01:56.000 --> 00:01:57.000
-This is cue #116
-
-117
-00:01:57.000 --> 00:01:58.000
-This is cue #117
-
-118
-00:01:58.000 --> 00:01:59.000
-This is cue #118
-
-119
-00:01:59.000 --> 00:02:00.000
-This is cue #119
-
-120
-00:02:00.000 --> 00:02:01.000
-This is cue #120
-
-121
-00:02:01.000 --> 00:02:02.000
-This is cue #121
-
-122
-00:02:02.000 --> 00:02:03.000
-This is cue #122
-
-123
-00:02:03.000 --> 00:02:04.000
-This is cue #123
-
-124
-00:02:04.000 --> 00:02:05.000
-This is cue #124
-
-125
-00:02:05.000 --> 00:02:06.000
-This is cue #125
-
-126
-00:02:06.000 --> 00:02:07.000
-This is cue #126
-
-127
-00:02:07.000 --> 00:02:08.000
-This is cue #127
-
-128
-00:02:08.000 --> 00:02:09.000
-This is cue #128
-
-129
-00:02:09.000 --> 00:02:10.000
-This is cue #129
-
-130
-00:02:10.000 --> 00:02:11.000
-This is cue #130
-
-131
-00:02:11.000 --> 00:02:12.000
-This is cue #131
-
-132
-00:02:12.000 --> 00:02:13.000
-This is cue #132
-
-133
-00:02:13.000 --> 00:02:14.000
-This is cue #133
-
-134
-00:02:14.000 --> 00:02:15.000
-This is cue #134
-
-135
-00:02:15.000 --> 00:02:16.000
-This is cue #135
-
-136
-00:02:16.000 --> 00:02:17.000
-This is cue #136
-
-137
-00:02:17.000 --> 00:02:18.000
-This is cue #137
-
-138
-00:02:18.000 --> 00:02:19.000
-This is cue #138
-
-139
-00:02:19.000 --> 00:02:20.000
-This is cue #139
-
-140
-00:02:20.000 --> 00:02:21.000
-This is cue #140
-
-141
-00:02:21.000 --> 00:02:22.000
-This is cue #141
-
-142
-00:02:22.000 --> 00:02:23.000
-This is cue #142
-
-143
-00:02:23.000 --> 00:02:24.000
-This is cue #143
-
-144
-00:02:24.000 --> 00:02:25.000
-This is cue #144
-
-145
-00:02:25.000 --> 00:02:26.000
-This is cue #145
-
-146
-00:02:26.000 --> 00:02:27.000
-This is cue #146
-
-147
-00:02:27.000 --> 00:02:28.000
-This is cue #147
-
-148
-00:02:28.000 --> 00:02:29.000
-This is cue #148
-
-149
-00:02:29.000 --> 00:02:30.000
-This is cue #149
-
-150
-00:02:30.000 --> 00:02:31.000
-This is cue #150
-
-151
-00:02:31.000 --> 00:02:32.000
-This is cue #151
-
-152
-00:02:32.000 --> 00:02:33.000
-This is cue #152
-
-153
-00:02:33.000 --> 00:02:34.000
-This is cue #153
-
-154
-00:02:34.000 --> 00:02:35.000
-This is cue #154
-
-155
-00:02:35.000 --> 00:02:36.000
-This is cue #155
-
-156
-00:02:36.000 --> 00:02:37.000
-This is cue #156
-
-157
-00:02:37.000 --> 00:02:38.000
-This is cue #157
-
-158
-00:02:38.000 --> 00:02:39.000
-This is cue #158
-
-159
-00:02:39.000 --> 00:02:40.000
-This is cue #159
-
-160
-00:02:40.000 --> 00:02:41.000
-This is cue #160
-
-161
-00:02:41.000 --> 00:02:42.000
-This is cue #161
-
-162
-00:02:42.000 --> 00:02:43.000
-This is cue #162
-
-163
-00:02:43.000 --> 00:02:44.000
-This is cue #163
-
-164
-00:02:44.000 --> 00:02:45.000
-This is cue #164
-
-165
-00:02:45.000 --> 00:02:46.000
-This is cue #165
-
-166
-00:02:46.000 --> 00:02:47.000
-This is cue #166
-
-167
-00:02:47.000 --> 00:02:48.000
-This is cue #167
-
-168
-00:02:48.000 --> 00:02:49.000
-This is cue #168
-
-169
-00:02:49.000 --> 00:02:50.000
-This is cue #169
-
-170
-00:02:50.000 --> 00:02:51.000
-This is cue #170
-
-171
-00:02:51.000 --> 00:02:52.000
-This is cue #171
-
-172
-00:02:52.000 --> 00:02:53.000
-This is cue #172
-
-173
-00:02:53.000 --> 00:02:54.000
-This is cue #173
-
-174
-00:02:54.000 --> 00:02:55.000
-This is cue #174
-
-175
-00:02:55.000 --> 00:02:56.000
-This is cue #175
-
-176
-00:02:56.000 --> 00:02:57.000
-This is cue #176
-
-177
-00:02:57.000 --> 00:02:58.000
-This is cue #177
-
-178
-00:02:58.000 --> 00:02:59.000
-This is cue #178
-
-179
-00:02:59.000 --> 00:03:00.000
-This is cue #179
-
-180
-00:03:00.000 --> 00:03:01.000
-This is cue #180
-
-181
-00:03:01.000 --> 00:03:02.000
-This is cue #181
-
-182
-00:03:02.000 --> 00:03:03.000
-This is cue #182
-
-183
-00:03:03.000 --> 00:03:04.000
-This is cue #183
-
-184
-00:03:04.000 --> 00:03:05.000
-This is cue #184
-
-185
-00:03:05.000 --> 00:03:06.000
-This is cue #185
-
-186
-00:03:06.000 --> 00:03:07.000
-This is cue #186
-
-187
-00:03:07.000 --> 00:03:08.000
-This is cue #187
-
-188
-00:03:08.000 --> 00:03:09.000
-This is cue #188
-
-189
-00:03:09.000 --> 00:03:10.000
-This is cue #189
-
-190
-00:03:10.000 --> 00:03:11.000
-This is cue #190
-
-191
-00:03:11.000 --> 00:03:12.000
-This is cue #191
-
-192
-00:03:12.000 --> 00:03:13.000
-This is cue #192
-
-193
-00:03:13.000 --> 00:03:14.000
-This is cue #193
-
-194
-00:03:14.000 --> 00:03:15.000
-This is cue #194
-
-195
-00:03:15.000 --> 00:03:16.000
-This is cue #195
-
-196
-00:03:16.000 --> 00:03:17.000
-This is cue #196
-
-197
-00:03:17.000 --> 00:03:18.000
-This is cue #197
-
-198
-00:03:18.000 --> 00:03:19.000
-This is cue #198
-
-199
-00:03:19.000 --> 00:03:20.000
-This is cue #199
-
-200
-00:03:20.000 --> 00:03:21.000
-This is cue #200
-
-201
-00:03:21.000 --> 00:03:22.000
-This is cue #201
-
-202
-00:03:22.000 --> 00:03:23.000
-This is cue #202
-
-203
-00:03:23.000 --> 00:03:24.000
-This is cue #203
-
-204
-00:03:24.000 --> 00:03:25.000
-This is cue #204
-
-205
-00:03:25.000 --> 00:03:26.000
-This is cue #205
-
-206
-00:03:26.000 --> 00:03:27.000
-This is cue #206
-
-207
-00:03:27.000 --> 00:03:28.000
-This is cue #207
-
-208
-00:03:28.000 --> 00:03:29.000
-This is cue #208
-
-209
-00:03:29.000 --> 00:03:30.000
-This is cue #209
-
-210
-00:03:30.000 --> 00:03:31.000
-This is cue #210
-
-211
-00:03:31.000 --> 00:03:32.000
-This is cue #211
-
-212
-00:03:32.000 --> 00:03:33.000
-This is cue #212
-
-213
-00:03:33.000 --> 00:03:34.000
-This is cue #213
-
-214
-00:03:34.000 --> 00:03:35.000
-This is cue #214
-
-215
-00:03:35.000 --> 00:03:36.000
-This is cue #215
-
-216
-00:03:36.000 --> 00:03:37.000
-This is cue #216
-
-217
-00:03:37.000 --> 00:03:38.000
-This is cue #217
-
-218
-00:03:38.000 --> 00:03:39.000
-This is cue #218
-
-219
-00:03:39.000 --> 00:03:40.000
-This is cue #219
-
-220
-00:03:40.000 --> 00:03:41.000
-This is cue #220
-
-221
-00:03:41.000 --> 00:03:42.000
-This is cue #221
-
-222
-00:03:42.000 --> 00:03:43.000
-This is cue #222
-
-223
-00:03:43.000 --> 00:03:44.000
-This is cue #223
-
-224
-00:03:44.000 --> 00:03:45.000
-This is cue #224
-
-225
-00:03:45.000 --> 00:03:46.000
-This is cue #225
-
-226
-00:03:46.000 --> 00:03:47.000
-This is cue #226
-
-227
-00:03:47.000 --> 00:03:48.000
-This is cue #227
-
-228
-00:03:48.000 --> 00:03:49.000
-This is cue #228
-
-229
-00:03:49.000 --> 00:03:50.000
-This is cue #229
-
-230
-00:03:50.000 --> 00:03:51.000
-This is cue #230
-
-231
-00:03:51.000 --> 00:03:52.000
-This is cue #231
-
-232
-00:03:52.000 --> 00:03:53.000
-This is cue #232
-
-233
-00:03:53.000 --> 00:03:54.000
-This is cue #233
-
-234
-00:03:54.000 --> 00:03:55.000
-This is cue #234
-
-235
-00:03:55.000 --> 00:03:56.000
-This is cue #235
-
-236
-00:03:56.000 --> 00:03:57.000
-This is cue #236
-
-237
-00:03:57.000 --> 00:03:58.000
-This is cue #237
-
-238
-00:03:58.000 --> 00:03:59.000
-This is cue #238
-
-239
-00:03:59.000 --> 00:04:00.000
-This is cue #239
-
-240
-00:04:00.000 --> 00:04:01.000
-This is cue #240
-
-241
-00:04:01.000 --> 00:04:02.000
-This is cue #241
-
-242
-00:04:02.000 --> 00:04:03.000
-This is cue #242
-
-243
-00:04:03.000 --> 00:04:04.000
-This is cue #243
-
-244
-00:04:04.000 --> 00:04:05.000
-This is cue #244
-
-245
-00:04:05.000 --> 00:04:06.000
-This is cue #245
-
-246
-00:04:06.000 --> 00:04:07.000
-This is cue #246
-
-247
-00:04:07.000 --> 00:04:08.000
-This is cue #247
-
-248
-00:04:08.000 --> 00:04:09.000
-This is cue #248
-
-249
-00:04:09.000 --> 00:04:10.000
-This is cue #249
-
-250
-00:04:10.000 --> 00:04:11.000
-This is cue #250
-
-251
-00:04:11.000 --> 00:04:12.000
-This is cue #251
-
-252
-00:04:12.000 --> 00:04:13.000
-This is cue #252
-
-253
-00:04:13.000 --> 00:04:14.000
-This is cue #253
-
-254
-00:04:14.000 --> 00:04:15.000
-This is cue #254
-
-255
-00:04:15.000 --> 00:04:16.000
-This is cue #255
-
-256
-00:04:16.000 --> 00:04:17.000
-This is cue #256
-
-257
-00:04:17.000 --> 00:04:18.000
-This is cue #257
-
-258
-00:04:18.000 --> 00:04:19.000
-This is cue #258
-
-259
-00:04:19.000 --> 00:04:20.000
-This is cue #259
-
-260
-00:04:20.000 --> 00:04:21.000
-This is cue #260
-
-261
-00:04:21.000 --> 00:04:22.000
-This is cue #261
-
-262
-00:04:22.000 --> 00:04:23.000
-This is cue #262
-
-263
-00:04:23.000 --> 00:04:24.000
-This is cue #263
-
-264
-00:04:24.000 --> 00:04:25.000
-This is cue #264
-
-265
-00:04:25.000 --> 00:04:26.000
-This is cue #265
-
-266
-00:04:26.000 --> 00:04:27.000
-This is cue #266
-
-267
-00:04:27.000 --> 00:04:28.000
-This is cue #267
-
-268
-00:04:28.000 --> 00:04:29.000
-This is cue #268
-
-269
-00:04:29.000 --> 00:04:30.000
-This is cue #269
-
-270
-00:04:30.000 --> 00:04:31.000
-This is cue #270
-
-271
-00:04:31.000 --> 00:04:32.000
-This is cue #271
-
-272
-00:04:32.000 --> 00:04:33.000
-This is cue #272
-
-273
-00:04:33.000 --> 00:04:34.000
-This is cue #273
-
-274
-00:04:34.000 --> 00:04:35.000
-This is cue #274
-
-275
-00:04:35.000 --> 00:04:36.000
-This is cue #275
-
-276
-00:04:36.000 --> 00:04:37.000
-This is cue #276
-
-277
-00:04:37.000 --> 00:04:38.000
-This is cue #277
-
-278
-00:04:38.000 --> 00:04:39.000
-This is cue #278
-
-279
-00:04:39.000 --> 00:04:40.000
-This is cue #279
-
-280
-00:04:40.000 --> 00:04:41.000
-This is cue #280
-
-281
-00:04:41.000 --> 00:04:42.000
-This is cue #281
-
-282
-00:04:42.000 --> 00:04:43.000
-This is cue #282
-
-283
-00:04:43.000 --> 00:04:44.000
-This is cue #283
-
-284
-00:04:44.000 --> 00:04:45.000
-This is cue #284
-
-285
-00:04:45.000 --> 00:04:46.000
-This is cue #285
-
-286
-00:04:46.000 --> 00:04:47.000
-This is cue #286
-
-287
-00:04:47.000 --> 00:04:48.000
-This is cue #287
-
-288
-00:04:48.000 --> 00:04:49.000
-This is cue #288
-
-289
-00:04:49.000 --> 00:04:50.000
-This is cue #289
-
-290
-00:04:50.000 --> 00:04:51.000
-This is cue #290
-
-291
-00:04:51.000 --> 00:04:52.000
-This is cue #291
-
-292
-00:04:52.000 --> 00:04:53.000
-This is cue #292
-
-293
-00:04:53.000 --> 00:04:54.000
-This is cue #293
-
-294
-00:04:54.000 --> 00:04:55.000
-This is cue #294
-
-295
-00:04:55.000 --> 00:04:56.000
-This is cue #295
-
-296
-00:04:56.000 --> 00:04:57.000
-This is cue #296
-
-297
-00:04:57.000 --> 00:04:58.000
-This is cue #297
-
-298
-00:04:58.000 --> 00:04:59.000
-This is cue #298
-
-299
-00:04:59.000 --> 00:05:00.000
-This is cue #299
-
-300
-00:05:00.000 --> 00:05:01.000
-This is cue #300
-
-301
-00:05:01.000 --> 00:05:02.000
-This is cue #301
-
-302
-00:05:02.000 --> 00:05:03.000
-This is cue #302
-
-303
-00:05:03.000 --> 00:05:04.000
-This is cue #303
-
-304
-00:05:04.000 --> 00:05:05.000
-This is cue #304
-
-305
-00:05:05.000 --> 00:05:06.000
-This is cue #305
-
-306
-00:05:06.000 --> 00:05:07.000
-This is cue #306
-
-307
-00:05:07.000 --> 00:05:08.000
-This is cue #307
-
-308
-00:05:08.000 --> 00:05:09.000
-This is cue #308
-
-309
-00:05:09.000 --> 00:05:10.000
-This is cue #309
-
-310
-00:05:10.000 --> 00:05:11.000
-This is cue #310
-
-311
-00:05:11.000 --> 00:05:12.000
-This is cue #311
-
-312
-00:05:12.000 --> 00:05:13.000
-This is cue #312
-
-313
-00:05:13.000 --> 00:05:14.000
-This is cue #313
-
-314
-00:05:14.000 --> 00:05:15.000
-This is cue #314
-
-315
-00:05:15.000 --> 00:05:16.000
-This is cue #315
-
-316
-00:05:16.000 --> 00:05:17.000
-This is cue #316
-
-317
-00:05:17.000 --> 00:05:18.000
-This is cue #317
-
-318
-00:05:18.000 --> 00:05:19.000
-This is cue #318
-
-319
-00:05:19.000 --> 00:05:20.000
-This is cue #319
-
-320
-00:05:20.000 --> 00:05:21.000
-This is cue #320
-
-321
-00:05:21.000 --> 00:05:22.000
-This is cue #321
-
-322
-00:05:22.000 --> 00:05:23.000
-This is cue #322
-
-323
-00:05:23.000 --> 00:05:24.000
-This is cue #323
-
-324
-00:05:24.000 --> 00:05:25.000
-This is cue #324
-
-325
-00:05:25.000 --> 00:05:26.000
-This is cue #325
-
-326
-00:05:26.000 --> 00:05:27.000
-This is cue #326
-
-327
-00:05:27.000 --> 00:05:28.000
-This is cue #327
-
-328
-00:05:28.000 --> 00:05:29.000
-This is cue #328
-
-329
-00:05:29.000 --> 00:05:30.000
-This is cue #329
-
-330
-00:05:30.000 --> 00:05:31.000
-This is cue #330
-
-331
-00:05:31.000 --> 00:05:32.000
-This is cue #331
-
-332
-00:05:32.000 --> 00:05:33.000
-This is cue #332
-
-333
-00:05:33.000 --> 00:05:34.000
-This is cue #333
-
-334
-00:05:34.000 --> 00:05:35.000
-This is cue #334
-
-335
-00:05:35.000 --> 00:05:36.000
-This is cue #335
-
-336
-00:05:36.000 --> 00:05:37.000
-This is cue #336
-
-337
-00:05:37.000 --> 00:05:38.000
-This is cue #337
-
-338
-00:05:38.000 --> 00:05:39.000
-This is cue #338
-
-339
-00:05:39.000 --> 00:05:40.000
-This is cue #339
-
-340
-00:05:40.000 --> 00:05:41.000
-This is cue #340
-
-341
-00:05:41.000 --> 00:05:42.000
-This is cue #341
-
-342
-00:05:42.000 --> 00:05:43.000
-This is cue #342
-
-343
-00:05:43.000 --> 00:05:44.000
-This is cue #343
-
-344
-00:05:44.000 --> 00:05:45.000
-This is cue #344
-
-345
-00:05:45.000 --> 00:05:46.000
-This is cue #345
-
-346
-00:05:46.000 --> 00:05:47.000
-This is cue #346
-
-347
-00:05:47.000 --> 00:05:48.000
-This is cue #347
-
-348
-00:05:48.000 --> 00:05:49.000
-This is cue #348
-
-349
-00:05:49.000 --> 00:05:50.000
-This is cue #349
-
-350
-00:05:50.000 --> 00:05:51.000
-This is cue #350
-
-351
-00:05:51.000 --> 00:05:52.000
-This is cue #351
-
-352
-00:05:52.000 --> 00:05:53.000
-This is cue #352
-
-353
-00:05:53.000 --> 00:05:54.000
-This is cue #353
-
-354
-00:05:54.000 --> 00:05:55.000
-This is cue #354
-
-355
-00:05:55.000 --> 00:05:56.000
-This is cue #355
-
-356
-00:05:56.000 --> 00:05:57.000
-This is cue #356
-
-357
-00:05:57.000 --> 00:05:58.000
-This is cue #357
-
-358
-00:05:58.000 --> 00:05:59.000
-This is cue #358
-
-359
-00:05:59.000 --> 00:06:00.000
-This is cue #359
-
-360
-00:06:00.000 --> 00:06:01.000
-This is cue #360
-
-361
-00:06:01.000 --> 00:06:02.000
-This is cue #361
-
-362
-00:06:02.000 --> 00:06:03.000
-This is cue #362
-
-363
-00:06:03.000 --> 00:06:04.000
-This is cue #363
-
-364
-00:06:04.000 --> 00:06:05.000
-This is cue #364
-
-365
-00:06:05.000 --> 00:06:06.000
-This is cue #365
-
-366
-00:06:06.000 --> 00:06:07.000
-This is cue #366
-
-367
-00:06:07.000 --> 00:06:08.000
-This is cue #367
-
-368
-00:06:08.000 --> 00:06:09.000
-This is cue #368
-
-369
-00:06:09.000 --> 00:06:10.000
-This is cue #369
-
-370
-00:06:10.000 --> 00:06:11.000
-This is cue #370
-
-371
-00:06:11.000 --> 00:06:12.000
-This is cue #371
-
-372
-00:06:12.000 --> 00:06:13.000
-This is cue #372
-
-373
-00:06:13.000 --> 00:06:14.000
-This is cue #373
-
-374
-00:06:14.000 --> 00:06:15.000
-This is cue #374
-
-375
-00:06:15.000 --> 00:06:16.000
-This is cue #375
-
-376
-00:06:16.000 --> 00:06:17.000
-This is cue #376
-
-377
-00:06:17.000 --> 00:06:18.000
-This is cue #377
-
-378
-00:06:18.000 --> 00:06:19.000
-This is cue #378
-
-379
-00:06:19.000 --> 00:06:20.000
-This is cue #379
-
-380
-00:06:20.000 --> 00:06:21.000
-This is cue #380
-
-381
-00:06:21.000 --> 00:06:22.000
-This is cue #381
-
-382
-00:06:22.000 --> 00:06:23.000
-This is cue #382
-
-383
-00:06:23.000 --> 00:06:24.000
-This is cue #383
-
-384
-00:06:24.000 --> 00:06:25.000
-This is cue #384
-
-385
-00:06:25.000 --> 00:06:26.000
-This is cue #385
-
-386
-00:06:26.000 --> 00:06:27.000
-This is cue #386
-
-387
-00:06:27.000 --> 00:06:28.000
-This is cue #387
-
-388
-00:06:28.000 --> 00:06:29.000
-This is cue #388
-
-389
-00:06:29.000 --> 00:06:30.000
-This is cue #389
-
-390
-00:06:30.000 --> 00:06:31.000
-This is cue #390
-
-391
-00:06:31.000 --> 00:06:32.000
-This is cue #391
-
-392
-00:06:32.000 --> 00:06:33.000
-This is cue #392
-
-393
-00:06:33.000 --> 00:06:34.000
-This is cue #393
-
-394
-00:06:34.000 --> 00:06:35.000
-This is cue #394
-
-395
-00:06:35.000 --> 00:06:36.000
-This is cue #395
-
-396
-00:06:36.000 --> 00:06:37.000
-This is cue #396
-
-397
-00:06:37.000 --> 00:06:38.000
-This is cue #397
-
-398
-00:06:38.000 --> 00:06:39.000
-This is cue #398
-
-399
-00:06:39.000 --> 00:06:40.000
-This is cue #399
-
-400
-00:06:40.000 --> 00:06:41.000
-This is cue #400
-
-401
-00:06:41.000 --> 00:06:42.000
-This is cue #401
-
-402
-00:06:42.000 --> 00:06:43.000
-This is cue #402
-
-403
-00:06:43.000 --> 00:06:44.000
-This is cue #403
-
-404
-00:06:44.000 --> 00:06:45.000
-This is cue #404
-
-405
-00:06:45.000 --> 00:06:46.000
-This is cue #405
-
-406
-00:06:46.000 --> 00:06:47.000
-This is cue #406
-
-407
-00:06:47.000 --> 00:06:48.000
-This is cue #407
-
-408
-00:06:48.000 --> 00:06:49.000
-This is cue #408
-
-409
-00:06:49.000 --> 00:06:50.000
-This is cue #409
-
-410
-00:06:50.000 --> 00:06:51.000
-This is cue #410
-
-411
-00:06:51.000 --> 00:06:52.000
-This is cue #411
-
-412
-00:06:52.000 --> 00:06:53.000
-This is cue #412
-
-413
-00:06:53.000 --> 00:06:54.000
-This is cue #413
-
-414
-00:06:54.000 --> 00:06:55.000
-This is cue #414
-
-415
-00:06:55.000 --> 00:06:56.000
-This is cue #415
-
-416
-00:06:56.000 --> 00:06:57.000
-This is cue #416
-
-417
-00:06:57.000 --> 00:06:58.000
-This is cue #417
-
-418
-00:06:58.000 --> 00:06:59.000
-This is cue #418
-
-419
-00:06:59.000 --> 00:07:00.000
-This is cue #419
-
-420
-00:07:00.000 --> 00:07:01.000
-This is cue #420
-
-421
-00:07:01.000 --> 00:07:02.000
-This is cue #421
-
-422
-00:07:02.000 --> 00:07:03.000
-This is cue #422
-
-423
-00:07:03.000 --> 00:07:04.000
-This is cue #423
-
-424
-00:07:04.000 --> 00:07:05.000
-This is cue #424
-
-425
-00:07:05.000 --> 00:07:06.000
-This is cue #425
-
-426
-00:07:06.000 --> 00:07:07.000
-This is cue #426
-
-427
-00:07:07.000 --> 00:07:08.000
-This is cue #427
-
-428
-00:07:08.000 --> 00:07:09.000
-This is cue #428
-
-429
-00:07:09.000 --> 00:07:10.000
-This is cue #429
-
-430
-00:07:10.000 --> 00:07:11.000
-This is cue #430
-
-431
-00:07:11.000 --> 00:07:12.000
-This is cue #431
-
-432
-00:07:12.000 --> 00:07:13.000
-This is cue #432
-
-433
-00:07:13.000 --> 00:07:14.000
-This is cue #433
-
-434
-00:07:14.000 --> 00:07:15.000
-This is cue #434
-
-435
-00:07:15.000 --> 00:07:16.000
-This is cue #435
-
-436
-00:07:16.000 --> 00:07:17.000
-This is cue #436
-
-437
-00:07:17.000 --> 00:07:18.000
-This is cue #437
-
-438
-00:07:18.000 --> 00:07:19.000
-This is cue #438
-
-439
-00:07:19.000 --> 00:07:20.000
-This is cue #439
-
-440
-00:07:20.000 --> 00:07:21.000
-This is cue #440
-
-441
-00:07:21.000 --> 00:07:22.000
-This is cue #441
-
-442
-00:07:22.000 --> 00:07:23.000
-This is cue #442
-
-443
-00:07:23.000 --> 00:07:24.000
-This is cue #443
-
-444
-00:07:24.000 --> 00:07:25.000
-This is cue #444
-
-445
-00:07:25.000 --> 00:07:26.000
-This is cue #445
-
-446
-00:07:26.000 --> 00:07:27.000
-This is cue #446
-
-447
-00:07:27.000 --> 00:07:28.000
-This is cue #447
-
-448
-00:07:28.000 --> 00:07:29.000
-This is cue #448
-
-449
-00:07:29.000 --> 00:07:30.000
-This is cue #449
-
-450
-00:07:30.000 --> 00:07:31.000
-This is cue #450
-
-451
-00:07:31.000 --> 00:07:32.000
-This is cue #451
-
-452
-00:07:32.000 --> 00:07:33.000
-This is cue #452
-
-453
-00:07:33.000 --> 00:07:34.000
-This is cue #453
-
-454
-00:07:34.000 --> 00:07:35.000
-This is cue #454
-
-455
-00:07:35.000 --> 00:07:36.000
-This is cue #455
-
-456
-00:07:36.000 --> 00:07:37.000
-This is cue #456
-
-457
-00:07:37.000 --> 00:07:38.000
-This is cue #457
-
-458
-00:07:38.000 --> 00:07:39.000
-This is cue #458
-
-459
-00:07:39.000 --> 00:07:40.000
-This is cue #459
-
-460
-00:07:40.000 --> 00:07:41.000
-This is cue #460
-
-461
-00:07:41.000 --> 00:07:42.000
-This is cue #461
-
-462
-00:07:42.000 --> 00:07:43.000
-This is cue #462
-
-463
-00:07:43.000 --> 00:07:44.000
-This is cue #463
-
-464
-00:07:44.000 --> 00:07:45.000
-This is cue #464
-
-465
-00:07:45.000 --> 00:07:46.000
-This is cue #465
-
-466
-00:07:46.000 --> 00:07:47.000
-This is cue #466
-
-467
-00:07:47.000 --> 00:07:48.000
-This is cue #467
-
-468
-00:07:48.000 --> 00:07:49.000
-This is cue #468
-
-469
-00:07:49.000 --> 00:07:50.000
-This is cue #469
-
-470
-00:07:50.000 --> 00:07:51.000
-This is cue #470
-
-471
-00:07:51.000 --> 00:07:52.000
-This is cue #471
-
-472
-00:07:52.000 --> 00:07:53.000
-This is cue #472
-
-473
-00:07:53.000 --> 00:07:54.000
-This is cue #473
-
-474
-00:07:54.000 --> 00:07:55.000
-This is cue #474
-
-475
-00:07:55.000 --> 00:07:56.000
-This is cue #475
-
-476
-00:07:56.000 --> 00:07:57.000
-This is cue #476
-
-477
-00:07:57.000 --> 00:07:58.000
-This is cue #477
-
-478
-00:07:58.000 --> 00:07:59.000
-This is cue #478
-
-479
-00:07:59.000 --> 00:08:00.000
-This is cue #479
-
-480
-00:08:00.000 --> 00:08:01.000
-This is cue #480
-
-481
-00:08:01.000 --> 00:08:02.000
-This is cue #481
-
-482
-00:08:02.000 --> 00:08:03.000
-This is cue #482
-
-483
-00:08:03.000 --> 00:08:04.000
-This is cue #483
-
-484
-00:08:04.000 --> 00:08:05.000
-This is cue #484
-
-485
-00:08:05.000 --> 00:08:06.000
-This is cue #485
-
-486
-00:08:06.000 --> 00:08:07.000
-This is cue #486
-
-487
-00:08:07.000 --> 00:08:08.000
-This is cue #487
-
-488
-00:08:08.000 --> 00:08:09.000
-This is cue #488
-
-489
-00:08:09.000 --> 00:08:10.000
-This is cue #489
-
-490
-00:08:10.000 --> 00:08:11.000
-This is cue #490
-
-491
-00:08:11.000 --> 00:08:12.000
-This is cue #491
-
-492
-00:08:12.000 --> 00:08:13.000
-This is cue #492
-
-493
-00:08:13.000 --> 00:08:14.000
-This is cue #493
-
-494
-00:08:14.000 --> 00:08:15.000
-This is cue #494
-
-495
-00:08:15.000 --> 00:08:16.000
-This is cue #495
-
-496
-00:08:16.000 --> 00:08:17.000
-This is cue #496
-
-497
-00:08:17.000 --> 00:08:18.000
-This is cue #497
-
-498
-00:08:18.000 --> 00:08:19.000
-This is cue #498
-
-499
-00:08:19.000 --> 00:08:20.000
-This is cue #499
-
-500
-00:08:20.000 --> 00:08:21.000
-This is cue #500
-
-501
-00:08:21.000 --> 00:08:22.000
-This is cue #501
-
-502
-00:08:22.000 --> 00:08:23.000
-This is cue #502
-
-503
-00:08:23.000 --> 00:08:24.000
-This is cue #503
-
-504
-00:08:24.000 --> 00:08:25.000
-This is cue #504
-
-505
-00:08:25.000 --> 00:08:26.000
-This is cue #505
-
-506
-00:08:26.000 --> 00:08:27.000
-This is cue #506
-
-507
-00:08:27.000 --> 00:08:28.000
-This is cue #507
-
-508
-00:08:28.000 --> 00:08:29.000
-This is cue #508
-
-509
-00:08:29.000 --> 00:08:30.000
-This is cue #509
-
-510
-00:08:30.000 --> 00:08:31.000
-This is cue #510
-
-511
-00:08:31.000 --> 00:08:32.000
-This is cue #511
-
-512
-00:08:32.000 --> 00:08:33.000
-This is cue #512
-
-513
-00:08:33.000 --> 00:08:34.000
-This is cue #513
-
-514
-00:08:34.000 --> 00:08:35.000
-This is cue #514
-
-515
-00:08:35.000 --> 00:08:36.000
-This is cue #515
-
-516
-00:08:36.000 --> 00:08:37.000
-This is cue #516
-
-517
-00:08:37.000 --> 00:08:38.000
-This is cue #517
-
-518
-00:08:38.000 --> 00:08:39.000
-This is cue #518
-
-519
-00:08:39.000 --> 00:08:40.000
-This is cue #519
-
-520
-00:08:40.000 --> 00:08:41.000
-This is cue #520
-
-521
-00:08:41.000 --> 00:08:42.000
-This is cue #521
-
-522
-00:08:42.000 --> 00:08:43.000
-This is cue #522
-
-523
-00:08:43.000 --> 00:08:44.000
-This is cue #523
-
-524
-00:08:44.000 --> 00:08:45.000
-This is cue #524
-
-525
-00:08:45.000 --> 00:08:46.000
-This is cue #525
-
-526
-00:08:46.000 --> 00:08:47.000
-This is cue #526
-
-527
-00:08:47.000 --> 00:08:48.000
-This is cue #527
-
-528
-00:08:48.000 --> 00:08:49.000
-This is cue #528
-
-529
-00:08:49.000 --> 00:08:50.000
-This is cue #529
-
-530
-00:08:50.000 --> 00:08:51.000
-This is cue #530
-
-531
-00:08:51.000 --> 00:08:52.000
-This is cue #531
-
-532
-00:08:52.000 --> 00:08:53.000
-This is cue #532
-
-533
-00:08:53.000 --> 00:08:54.000
-This is cue #533
-
-534
-00:08:54.000 --> 00:08:55.000
-This is cue #534
-
-535
-00:08:55.000 --> 00:08:56.000
-This is cue #535
-
-536
-00:08:56.000 --> 00:08:57.000
-This is cue #536
-
-537
-00:08:57.000 --> 00:08:58.000
-This is cue #537
-
-538
-00:08:58.000 --> 00:08:59.000
-This is cue #538
-
-539
-00:08:59.000 --> 00:09:00.000
-This is cue #539
-
-540
-00:09:00.000 --> 00:09:01.000
-This is cue #540
-
-541
-00:09:01.000 --> 00:09:02.000
-This is cue #541
-
-542
-00:09:02.000 --> 00:09:03.000
-This is cue #542
-
-543
-00:09:03.000 --> 00:09:04.000
-This is cue #543
-
-544
-00:09:04.000 --> 00:09:05.000
-This is cue #544
-
-545
-00:09:05.000 --> 00:09:06.000
-This is cue #545
-
-546
-00:09:06.000 --> 00:09:07.000
-This is cue #546
-
-547
-00:09:07.000 --> 00:09:08.000
-This is cue #547
-
-548
-00:09:08.000 --> 00:09:09.000
-This is cue #548
-
-549
-00:09:09.000 --> 00:09:10.000
-This is cue #549
-
-550
-00:09:10.000 --> 00:09:11.000
-This is cue #550
-
-551
-00:09:11.000 --> 00:09:12.000
-This is cue #551
-
-552
-00:09:12.000 --> 00:09:13.000
-This is cue #552
-
-553
-00:09:13.000 --> 00:09:14.000
-This is cue #553
-
-554
-00:09:14.000 --> 00:09:15.000
-This is cue #554
-
-555
-00:09:15.000 --> 00:09:16.000
-This is cue #555
-
-556
-00:09:16.000 --> 00:09:17.000
-This is cue #556
-
-557
-00:09:17.000 --> 00:09:18.000
-This is cue #557
-
-558
-00:09:18.000 --> 00:09:19.000
-This is cue #558
-
-559
-00:09:19.000 --> 00:09:20.000
-This is cue #559
-
-560
-00:09:20.000 --> 00:09:21.000
-This is cue #560
-
-561
-00:09:21.000 --> 00:09:22.000
-This is cue #561
-
-562
-00:09:22.000 --> 00:09:23.000
-This is cue #562
-
-563
-00:09:23.000 --> 00:09:24.000
-This is cue #563
-
-564
-00:09:24.000 --> 00:09:25.000
-This is cue #564
-
-565
-00:09:25.000 --> 00:09:26.000
-This is cue #565
-
-566
-00:09:26.000 --> 00:09:27.000
-This is cue #566
-
-567
-00:09:27.000 --> 00:09:28.000
-This is cue #567
-
-568
-00:09:28.000 --> 00:09:29.000
-This is cue #568
-
-569
-00:09:29.000 --> 00:09:30.000
-This is cue #569
-
-570
-00:09:30.000 --> 00:09:31.000
-This is cue #570
-
-571
-00:09:31.000 --> 00:09:32.000
-This is cue #571
-
-572
-00:09:32.000 --> 00:09:33.000
-This is cue #572
-
-573
-00:09:33.000 --> 00:09:34.000
-This is cue #573
-
-574
-00:09:34.000 --> 00:09:35.000
-This is cue #574
-
-575
-00:09:35.000 --> 00:09:36.000
-This is cue #575
-
-576
-00:09:36.000 --> 00:09:37.000
-This is cue #576
-
-577
-00:09:37.000 --> 00:09:38.000
-This is cue #577
-
-578
-00:09:38.000 --> 00:09:39.000
-This is cue #578
-
-579
-00:09:39.000 --> 00:09:40.000
-This is cue #579
-
-580
-00:09:40.000 --> 00:09:41.000
-This is cue #580
-
-581
-00:09:41.000 --> 00:09:42.000
-This is cue #581
-
-582
-00:09:42.000 --> 00:09:43.000
-This is cue #582
-
-583
-00:09:43.000 --> 00:09:44.000
-This is cue #583
-
-584
-00:09:44.000 --> 00:09:45.000
-This is cue #584
-
-585
-00:09:45.000 --> 00:09:46.000
-This is cue #585
-
-586
-00:09:46.000 --> 00:09:47.000
-This is cue #586
-
-587
-00:09:47.000 --> 00:09:48.000
-This is cue #587
-
-588
-00:09:48.000 --> 00:09:49.000
-This is cue #588
-
-589
-00:09:49.000 --> 00:09:50.000
-This is cue #589
-
-590
-00:09:50.000 --> 00:09:51.000
-This is cue #590
-
-591
-00:09:51.000 --> 00:09:52.000
-This is cue #591
-
-592
-00:09:52.000 --> 00:09:53.000
-This is cue #592
-
-593
-00:09:53.000 --> 00:09:54.000
-This is cue #593
-
-594
-00:09:54.000 --> 00:09:55.000
-This is cue #594
-
-595
-00:09:55.000 --> 00:09:56.000
-This is cue #595
-
-596
-00:09:56.000 --> 00:09:57.000
-This is cue #596
-
-597
-00:09:57.000 --> 00:09:58.000
-This is cue #597
-
-598
-00:09:58.000 --> 00:09:59.000
-This is cue #598
-
-599
-00:09:59.000 --> 00:10:00.000
-This is cue #599
-
-600
-00:10:00.000 --> 00:10:01.000
-This is cue #600
-
-601
-00:10:01.000 --> 00:10:02.000
-This is cue #601
-
-602
-00:10:02.000 --> 00:10:03.000
-This is cue #602
-
-603
-00:10:03.000 --> 00:10:04.000
-This is cue #603
-
-604
-00:10:04.000 --> 00:10:05.000
-This is cue #604
-
-605
-00:10:05.000 --> 00:10:06.000
-This is cue #605
-
-606
-00:10:06.000 --> 00:10:07.000
-This is cue #606
-
-607
-00:10:07.000 --> 00:10:08.000
-This is cue #607
-
-608
-00:10:08.000 --> 00:10:09.000
-This is cue #608
-
-609
-00:10:09.000 --> 00:10:10.000
-This is cue #609
-
-610
-00:10:10.000 --> 00:10:11.000
-This is cue #610
-
-611
-00:10:11.000 --> 00:10:12.000
-This is cue #611
-
-612
-00:10:12.000 --> 00:10:13.000
-This is cue #612
-
-613
-00:10:13.000 --> 00:10:14.000
-This is cue #613
-
-614
-00:10:14.000 --> 00:10:15.000
-This is cue #614
-
-615
-00:10:15.000 --> 00:10:16.000
-This is cue #615
-
-616
-00:10:16.000 --> 00:10:17.000
-This is cue #616
-
-617
-00:10:17.000 --> 00:10:18.000
-This is cue #617
-
-618
-00:10:18.000 --> 00:10:19.000
-This is cue #618
-
-619
-00:10:19.000 --> 00:10:20.000
-This is cue #619
-
-620
-00:10:20.000 --> 00:10:21.000
-This is cue #620
-
-621
-00:10:21.000 --> 00:10:22.000
-This is cue #621
-
-622
-00:10:22.000 --> 00:10:23.000
-This is cue #622
-
-623
-00:10:23.000 --> 00:10:24.000
-This is cue #623
-
-624
-00:10:24.000 --> 00:10:25.000
-This is cue #624
-
-625
-00:10:25.000 --> 00:10:26.000
-This is cue #625
-
-626
-00:10:26.000 --> 00:10:27.000
-This is cue #626
-
-627
-00:10:27.000 --> 00:10:28.000
-This is cue #627
-
-628
-00:10:28.000 --> 00:10:29.000
-This is cue #628
-
-629
-00:10:29.000 --> 00:10:30.000
-This is cue #629
-
-630
-00:10:30.000 --> 00:10:31.000
-This is cue #630
-
-631
-00:10:31.000 --> 00:10:32.000
-This is cue #631
-
-632
-00:10:32.000 --> 00:10:33.000
-This is cue #632
-
-633
-00:10:33.000 --> 00:10:34.000
-This is cue #633
-
-634
-00:10:34.000 --> 00:10:35.000
-This is cue #634
-
-635
-00:10:35.000 --> 00:10:36.000
-This is cue #635
-
-636
-00:10:36.000 --> 00:10:37.000
-This is cue #636
-
-637
-00:10:37.000 --> 00:10:38.000
-This is cue #637
-
-638
-00:10:38.000 --> 00:10:39.000
-This is cue #638
-
-639
-00:10:39.000 --> 00:10:40.000
-This is cue #639
-
-640
-00:10:40.000 --> 00:10:41.000
-This is cue #640
-
-641
-00:10:41.000 --> 00:10:42.000
-This is cue #641
-
-642
-00:10:42.000 --> 00:10:43.000
-This is cue #642
-
-643
-00:10:43.000 --> 00:10:44.000
-This is cue #643
-
-644
-00:10:44.000 --> 00:10:45.000
-This is cue #644
-
-645
-00:10:45.000 --> 00:10:46.000
-This is cue #645
-
-646
-00:10:46.000 --> 00:10:47.000
-This is cue #646
-
-647
-00:10:47.000 --> 00:10:48.000
-This is cue #647
-
-648
-00:10:48.000 --> 00:10:49.000
-This is cue #648
-
-649
-00:10:49.000 --> 00:10:50.000
-This is cue #649
-
-650
-00:10:50.000 --> 00:10:51.000
-This is cue #650
-
-651
-00:10:51.000 --> 00:10:52.000
-This is cue #651
-
-652
-00:10:52.000 --> 00:10:53.000
-This is cue #652
-
-653
-00:10:53.000 --> 00:10:54.000
-This is cue #653
-
-654
-00:10:54.000 --> 00:10:55.000
-This is cue #654
-
-655
-00:10:55.000 --> 00:10:56.000
-This is cue #655
-
-656
-00:10:56.000 --> 00:10:57.000
-This is cue #656
-
-657
-00:10:57.000 --> 00:10:58.000
-This is cue #657
-
-658
-00:10:58.000 --> 00:10:59.000
-This is cue #658
-
-659
-00:10:59.000 --> 00:11:00.000
-This is cue #659
-
-660
-00:11:00.000 --> 00:11:01.000
-This is cue #660
-
-661
-00:11:01.000 --> 00:11:02.000
-This is cue #661
-
-662
-00:11:02.000 --> 00:11:03.000
-This is cue #662
-
-663
-00:11:03.000 --> 00:11:04.000
-This is cue #663
-
-664
-00:11:04.000 --> 00:11:05.000
-This is cue #664
-
-665
-00:11:05.000 --> 00:11:06.000
-This is cue #665
-
-666
-00:11:06.000 --> 00:11:07.000
-This is cue #666
-
-667
-00:11:07.000 --> 00:11:08.000
-This is cue #667
-
-668
-00:11:08.000 --> 00:11:09.000
-This is cue #668
-
-669
-00:11:09.000 --> 00:11:10.000
-This is cue #669
-
-670
-00:11:10.000 --> 00:11:11.000
-This is cue #670
-
-671
-00:11:11.000 --> 00:11:12.000
-This is cue #671
-
-672
-00:11:12.000 --> 00:11:13.000
-This is cue #672
-
-673
-00:11:13.000 --> 00:11:14.000
-This is cue #673
-
-674
-00:11:14.000 --> 00:11:15.000
-This is cue #674
-
-675
-00:11:15.000 --> 00:11:16.000
-This is cue #675
-
-676
-00:11:16.000 --> 00:11:17.000
-This is cue #676
-
-677
-00:11:17.000 --> 00:11:18.000
-This is cue #677
-
-678
-00:11:18.000 --> 00:11:19.000
-This is cue #678
-
-679
-00:11:19.000 --> 00:11:20.000
-This is cue #679
-
-680
-00:11:20.000 --> 00:11:21.000
-This is cue #680
-
-681
-00:11:21.000 --> 00:11:22.000
-This is cue #681
-
-682
-00:11:22.000 --> 00:11:23.000
-This is cue #682
-
-683
-00:11:23.000 --> 00:11:24.000
-This is cue #683
-
-684
-00:11:24.000 --> 00:11:25.000
-This is cue #684
-
-685
-00:11:25.000 --> 00:11:26.000
-This is cue #685
-
-686
-00:11:26.000 --> 00:11:27.000
-This is cue #686
-
-687
-00:11:27.000 --> 00:11:28.000
-This is cue #687
-
-688
-00:11:28.000 --> 00:11:29.000
-This is cue #688
-
-689
-00:11:29.000 --> 00:11:30.000
-This is cue #689
-
-690
-00:11:30.000 --> 00:11:31.000
-This is cue #690
-
-691
-00:11:31.000 --> 00:11:32.000
-This is cue #691
-
-692
-00:11:32.000 --> 00:11:33.000
-This is cue #692
-
-693
-00:11:33.000 --> 00:11:34.000
-This is cue #693
-
-694
-00:11:34.000 --> 00:11:35.000
-This is cue #694
-
-695
-00:11:35.000 --> 00:11:36.000
-This is cue #695
-
-696
-00:11:36.000 --> 00:11:37.000
-This is cue #696
-
-697
-00:11:37.000 --> 00:11:38.000
-This is cue #697
-
-698
-00:11:38.000 --> 00:11:39.000
-This is cue #698
-
-699
-00:11:39.000 --> 00:11:40.000
-This is cue #699
-
-700
-00:11:40.000 --> 00:11:41.000
-This is cue #700
-
-701
-00:11:41.000 --> 00:11:42.000
-This is cue #701
-
-702
-00:11:42.000 --> 00:11:43.000
-This is cue #702
-
-703
-00:11:43.000 --> 00:11:44.000
-This is cue #703
-
-704
-00:11:44.000 --> 00:11:45.000
-This is cue #704
-
-705
-00:11:45.000 --> 00:11:46.000
-This is cue #705
-
-706
-00:11:46.000 --> 00:11:47.000
-This is cue #706
-
-707
-00:11:47.000 --> 00:11:48.000
-This is cue #707
-
-708
-00:11:48.000 --> 00:11:49.000
-This is cue #708
-
-709
-00:11:49.000 --> 00:11:50.000
-This is cue #709
-
-710
-00:11:50.000 --> 00:11:51.000
-This is cue #710
-
-711
-00:11:51.000 --> 00:11:52.000
-This is cue #711
-
-712
-00:11:52.000 --> 00:11:53.000
-This is cue #712
-
-713
-00:11:53.000 --> 00:11:54.000
-This is cue #713
-
-714
-00:11:54.000 --> 00:11:55.000
-This is cue #714
-
-715
-00:11:55.000 --> 00:11:56.000
-This is cue #715
-
-716
-00:11:56.000 --> 00:11:57.000
-This is cue #716
-
-717
-00:11:57.000 --> 00:11:58.000
-This is cue #717
-
-718
-00:11:58.000 --> 00:11:59.000
-This is cue #718
-
-719
-00:11:59.000 --> 00:12:00.000
-This is cue #719
-
-720
-00:12:00.000 --> 00:12:01.000
-This is cue #720
-
-721
-00:12:01.000 --> 00:12:02.000
-This is cue #721
-
-722
-00:12:02.000 --> 00:12:03.000
-This is cue #722
-
-723
-00:12:03.000 --> 00:12:04.000
-This is cue #723
-
-724
-00:12:04.000 --> 00:12:05.000
-This is cue #724
-
-725
-00:12:05.000 --> 00:12:06.000
-This is cue #725
-
-726
-00:12:06.000 --> 00:12:07.000
-This is cue #726
-
-727
-00:12:07.000 --> 00:12:08.000
-This is cue #727
-
-728
-00:12:08.000 --> 00:12:09.000
-This is cue #728
-
-729
-00:12:09.000 --> 00:12:10.000
-This is cue #729
-
-730
-00:12:10.000 --> 00:12:11.000
-This is cue #730
-
-731
-00:12:11.000 --> 00:12:12.000
-This is cue #731
-
-732
-00:12:12.000 --> 00:12:13.000
-This is cue #732
-
-733
-00:12:13.000 --> 00:12:14.000
-This is cue #733
-
-734
-00:12:14.000 --> 00:12:15.000
-This is cue #734
-
-735
-00:12:15.000 --> 00:12:16.000
-This is cue #735
-
-736
-00:12:16.000 --> 00:12:17.000
-This is cue #736
-
-737
-00:12:17.000 --> 00:12:18.000
-This is cue #737
-
-738
-00:12:18.000 --> 00:12:19.000
-This is cue #738
-
-739
-00:12:19.000 --> 00:12:20.000
-This is cue #739
-
-740
-00:12:20.000 --> 00:12:21.000
-This is cue #740
-
-741
-00:12:21.000 --> 00:12:22.000
-This is cue #741
-
-742
-00:12:22.000 --> 00:12:23.000
-This is cue #742
-
-743
-00:12:23.000 --> 00:12:24.000
-This is cue #743
-
-744
-00:12:24.000 --> 00:12:25.000
-This is cue #744
-
-745
-00:12:25.000 --> 00:12:26.000
-This is cue #745
-
-746
-00:12:26.000 --> 00:12:27.000
-This is cue #746
-
-747
-00:12:27.000 --> 00:12:28.000
-This is cue #747
-
-748
-00:12:28.000 --> 00:12:29.000
-This is cue #748
-
-749
-00:12:29.000 --> 00:12:30.000
-This is cue #749
-
-750
-00:12:30.000 --> 00:12:31.000
-This is cue #750
-
-751
-00:12:31.000 --> 00:12:32.000
-This is cue #751
-
-752
-00:12:32.000 --> 00:12:33.000
-This is cue #752
-
-753
-00:12:33.000 --> 00:12:34.000
-This is cue #753
-
-754
-00:12:34.000 --> 00:12:35.000
-This is cue #754
-
-755
-00:12:35.000 --> 00:12:36.000
-This is cue #755
-
-756
-00:12:36.000 --> 00:12:37.000
-This is cue #756
-
-757
-00:12:37.000 --> 00:12:38.000
-This is cue #757
-
-758
-00:12:38.000 --> 00:12:39.000
-This is cue #758
-
-759
-00:12:39.000 --> 00:12:40.000
-This is cue #759
-
-760
-00:12:40.000 --> 00:12:41.000
-This is cue #760
-
-761
-00:12:41.000 --> 00:12:42.000
-This is cue #761
-
-762
-00:12:42.000 --> 00:12:43.000
-This is cue #762
-
-763
-00:12:43.000 --> 00:12:44.000
-This is cue #763
-
-764
-00:12:44.000 --> 00:12:45.000
-This is cue #764
-
-765
-00:12:45.000 --> 00:12:46.000
-This is cue #765
-
-766
-00:12:46.000 --> 00:12:47.000
-This is cue #766
-
-767
-00:12:47.000 --> 00:12:48.000
-This is cue #767
-
-768
-00:12:48.000 --> 00:12:49.000
-This is cue #768
-
-769
-00:12:49.000 --> 00:12:50.000
-This is cue #769
-
-770
-00:12:50.000 --> 00:12:51.000
-This is cue #770
-
-771
-00:12:51.000 --> 00:12:52.000
-This is cue #771
-
-772
-00:12:52.000 --> 00:12:53.000
-This is cue #772
-
-773
-00:12:53.000 --> 00:12:54.000
-This is cue #773
-
-774
-00:12:54.000 --> 00:12:55.000
-This is cue #774
-
-775
-00:12:55.000 --> 00:12:56.000
-This is cue #775
-
-776
-00:12:56.000 --> 00:12:57.000
-This is cue #776
-
-777
-00:12:57.000 --> 00:12:58.000
-This is cue #777
-
-778
-00:12:58.000 --> 00:12:59.000
-This is cue #778
-
-779
-00:12:59.000 --> 00:13:00.000
-This is cue #779
-
-780
-00:13:00.000 --> 00:13:01.000
-This is cue #780
-
-781
-00:13:01.000 --> 00:13:02.000
-This is cue #781
-
-782
-00:13:02.000 --> 00:13:03.000
-This is cue #782
-
-783
-00:13:03.000 --> 00:13:04.000
-This is cue #783
-
-784
-00:13:04.000 --> 00:13:05.000
-This is cue #784
-
-785
-00:13:05.000 --> 00:13:06.000
-This is cue #785
-
-786
-00:13:06.000 --> 00:13:07.000
-This is cue #786
-
-787
-00:13:07.000 --> 00:13:08.000
-This is cue #787
-
-788
-00:13:08.000 --> 00:13:09.000
-This is cue #788
-
-789
-00:13:09.000 --> 00:13:10.000
-This is cue #789
-
-790
-00:13:10.000 --> 00:13:11.000
-This is cue #790
-
-791
-00:13:11.000 --> 00:13:12.000
-This is cue #791
-
-792
-00:13:12.000 --> 00:13:13.000
-This is cue #792
-
-793
-00:13:13.000 --> 00:13:14.000
-This is cue #793
-
-794
-00:13:14.000 --> 00:13:15.000
-This is cue #794
-
-795
-00:13:15.000 --> 00:13:16.000
-This is cue #795
-
-796
-00:13:16.000 --> 00:13:17.000
-This is cue #796
-
-797
-00:13:17.000 --> 00:13:18.000
-This is cue #797
-
-798
-00:13:18.000 --> 00:13:19.000
-This is cue #798
-
-799
-00:13:19.000 --> 00:13:20.000
-This is cue #799
-
-800
-00:13:20.000 --> 00:13:21.000
-This is cue #800
-
-801
-00:13:21.000 --> 00:13:22.000
-This is cue #801
-
-802
-00:13:22.000 --> 00:13:23.000
-This is cue #802
-
-803
-00:13:23.000 --> 00:13:24.000
-This is cue #803
-
-804
-00:13:24.000 --> 00:13:25.000
-This is cue #804
-
-805
-00:13:25.000 --> 00:13:26.000
-This is cue #805
-
-806
-00:13:26.000 --> 00:13:27.000
-This is cue #806
-
-807
-00:13:27.000 --> 00:13:28.000
-This is cue #807
-
-808
-00:13:28.000 --> 00:13:29.000
-This is cue #808
-
-809
-00:13:29.000 --> 00:13:30.000
-This is cue #809
-
-810
-00:13:30.000 --> 00:13:31.000
-This is cue #810
-
-811
-00:13:31.000 --> 00:13:32.000
-This is cue #811
-
-812
-00:13:32.000 --> 00:13:33.000
-This is cue #812
-
-813
-00:13:33.000 --> 00:13:34.000
-This is cue #813
-
-814
-00:13:34.000 --> 00:13:35.000
-This is cue #814
-
-815
-00:13:35.000 --> 00:13:36.000
-This is cue #815
-
-816
-00:13:36.000 --> 00:13:37.000
-This is cue #816
-
-817
-00:13:37.000 --> 00:13:38.000
-This is cue #817
-
-818
-00:13:38.000 --> 00:13:39.000
-This is cue #818
-
-819
-00:13:39.000 --> 00:13:40.000
-This is cue #819
-
-820
-00:13:40.000 --> 00:13:41.000
-This is cue #820
-
-821
-00:13:41.000 --> 00:13:42.000
-This is cue #821
-
-822
-00:13:42.000 --> 00:13:43.000
-This is cue #822
-
-823
-00:13:43.000 --> 00:13:44.000
-This is cue #823
-
-824
-00:13:44.000 --> 00:13:45.000
-This is cue #824
-
-825
-00:13:45.000 --> 00:13:46.000
-This is cue #825
-
-826
-00:13:46.000 --> 00:13:47.000
-This is cue #826
-
-827
-00:13:47.000 --> 00:13:48.000
-This is cue #827
-
-828
-00:13:48.000 --> 00:13:49.000
-This is cue #828
-
-829
-00:13:49.000 --> 00:13:50.000
-This is cue #829
-
-830
-00:13:50.000 --> 00:13:51.000
-This is cue #830
-
-831
-00:13:51.000 --> 00:13:52.000
-This is cue #831
-
-832
-00:13:52.000 --> 00:13:53.000
-This is cue #832
-
-833
-00:13:53.000 --> 00:13:54.000
-This is cue #833
-
-834
-00:13:54.000 --> 00:13:55.000
-This is cue #834
-
-835
-00:13:55.000 --> 00:13:56.000
-This is cue #835
-
-836
-00:13:56.000 --> 00:13:57.000
-This is cue #836
-
-837
-00:13:57.000 --> 00:13:58.000
-This is cue #837
-
-838
-00:13:58.000 --> 00:13:59.000
-This is cue #838
-
-839
-00:13:59.000 --> 00:14:00.000
-This is cue #839
-
-840
-00:14:00.000 --> 00:14:01.000
-This is cue #840
-
-841
-00:14:01.000 --> 00:14:02.000
-This is cue #841
-
-842
-00:14:02.000 --> 00:14:03.000
-This is cue #842
-
-843
-00:14:03.000 --> 00:14:04.000
-This is cue #843
-
-844
-00:14:04.000 --> 00:14:05.000
-This is cue #844
-
-845
-00:14:05.000 --> 00:14:06.000
-This is cue #845
-
-846
-00:14:06.000 --> 00:14:07.000
-This is cue #846
-
-847
-00:14:07.000 --> 00:14:08.000
-This is cue #847
-
-848
-00:14:08.000 --> 00:14:09.000
-This is cue #848
-
-849
-00:14:09.000 --> 00:14:10.000
-This is cue #849
-
-850
-00:14:10.000 --> 00:14:11.000
-This is cue #850
-
-851
-00:14:11.000 --> 00:14:12.000
-This is cue #851
-
-852
-00:14:12.000 --> 00:14:13.000
-This is cue #852
-
-853
-00:14:13.000 --> 00:14:14.000
-This is cue #853
-
-854
-00:14:14.000 --> 00:14:15.000
-This is cue #854
-
-855
-00:14:15.000 --> 00:14:16.000
-This is cue #855
-
-856
-00:14:16.000 --> 00:14:17.000
-This is cue #856
-
-857
-00:14:17.000 --> 00:14:18.000
-This is cue #857
-
-858
-00:14:18.000 --> 00:14:19.000
-This is cue #858
-
-859
-00:14:19.000 --> 00:14:20.000
-This is cue #859
-
-860
-00:14:20.000 --> 00:14:21.000
-This is cue #860
-
-861
-00:14:21.000 --> 00:14:22.000
-This is cue #861
-
-862
-00:14:22.000 --> 00:14:23.000
-This is cue #862
-
-863
-00:14:23.000 --> 00:14:24.000
-This is cue #863
-
-864
-00:14:24.000 --> 00:14:25.000
-This is cue #864
-
-865
-00:14:25.000 --> 00:14:26.000
-This is cue #865
-
-866
-00:14:26.000 --> 00:14:27.000
-This is cue #866
-
-867
-00:14:27.000 --> 00:14:28.000
-This is cue #867
-
-868
-00:14:28.000 --> 00:14:29.000
-This is cue #868
-
-869
-00:14:29.000 --> 00:14:30.000
-This is cue #869
-
-870
-00:14:30.000 --> 00:14:31.000
-This is cue #870
-
-871
-00:14:31.000 --> 00:14:32.000
-This is cue #871
-
-872
-00:14:32.000 --> 00:14:33.000
-This is cue #872
-
-873
-00:14:33.000 --> 00:14:34.000
-This is cue #873
-
-874
-00:14:34.000 --> 00:14:35.000
-This is cue #874
-
-875
-00:14:35.000 --> 00:14:36.000
-This is cue #875
-
-876
-00:14:36.000 --> 00:14:37.000
-This is cue #876
-
-877
-00:14:37.000 --> 00:14:38.000
-This is cue #877
-
-878
-00:14:38.000 --> 00:14:39.000
-This is cue #878
-
-879
-00:14:39.000 --> 00:14:40.000
-This is cue #879
-
-880
-00:14:40.000 --> 00:14:41.000
-This is cue #880
-
-881
-00:14:41.000 --> 00:14:42.000
-This is cue #881
-
-882
-00:14:42.000 --> 00:14:43.000
-This is cue #882
-
-883
-00:14:43.000 --> 00:14:44.000
-This is cue #883
-
-884
-00:14:44.000 --> 00:14:45.000
-This is cue #884
-
-885
-00:14:45.000 --> 00:14:46.000
-This is cue #885
-
-886
-00:14:46.000 --> 00:14:47.000
-This is cue #886
-
-887
-00:14:47.000 --> 00:14:48.000
-This is cue #887
-
-888
-00:14:48.000 --> 00:14:49.000
-This is cue #888
-
-889
-00:14:49.000 --> 00:14:50.000
-This is cue #889
-
-890
-00:14:50.000 --> 00:14:51.000
-This is cue #890
-
-891
-00:14:51.000 --> 00:14:52.000
-This is cue #891
-
-892
-00:14:52.000 --> 00:14:53.000
-This is cue #892
-
-893
-00:14:53.000 --> 00:14:54.000
-This is cue #893
-
-894
-00:14:54.000 --> 00:14:55.000
-This is cue #894
-
-895
-00:14:55.000 --> 00:14:56.000
-This is cue #895
-
-896
-00:14:56.000 --> 00:14:57.000
-This is cue #896
-
-897
-00:14:57.000 --> 00:14:58.000
-This is cue #897
-
-898
-00:14:58.000 --> 00:14:59.000
-This is cue #898
-
-899
-00:14:59.000 --> 00:15:00.000
-This is cue #899
-
-900
-00:15:00.000 --> 00:15:01.000
-This is cue #900
-
-901
-00:15:01.000 --> 00:15:02.000
-This is cue #901
-
-902
-00:15:02.000 --> 00:15:03.000
-This is cue #902
-
-903
-00:15:03.000 --> 00:15:04.000
-This is cue #903
-
-904
-00:15:04.000 --> 00:15:05.000
-This is cue #904
-
-905
-00:15:05.000 --> 00:15:06.000
-This is cue #905
-
-906
-00:15:06.000 --> 00:15:07.000
-This is cue #906
-
-907
-00:15:07.000 --> 00:15:08.000
-This is cue #907
-
-908
-00:15:08.000 --> 00:15:09.000
-This is cue #908
-
-909
-00:15:09.000 --> 00:15:10.000
-This is cue #909
-
-910
-00:15:10.000 --> 00:15:11.000
-This is cue #910
-
-911
-00:15:11.000 --> 00:15:12.000
-This is cue #911
-
-912
-00:15:12.000 --> 00:15:13.000
-This is cue #912
-
-913
-00:15:13.000 --> 00:15:14.000
-This is cue #913
-
-914
-00:15:14.000 --> 00:15:15.000
-This is cue #914
-
-915
-00:15:15.000 --> 00:15:16.000
-This is cue #915
-
-916
-00:15:16.000 --> 00:15:17.000
-This is cue #916
-
-917
-00:15:17.000 --> 00:15:18.000
-This is cue #917
-
-918
-00:15:18.000 --> 00:15:19.000
-This is cue #918
-
-919
-00:15:19.000 --> 00:15:20.000
-This is cue #919
-
-920
-00:15:20.000 --> 00:15:21.000
-This is cue #920
-
-921
-00:15:21.000 --> 00:15:22.000
-This is cue #921
-
-922
-00:15:22.000 --> 00:15:23.000
-This is cue #922
-
-923
-00:15:23.000 --> 00:15:24.000
-This is cue #923
-
-924
-00:15:24.000 --> 00:15:25.000
-This is cue #924
-
-925
-00:15:25.000 --> 00:15:26.000
-This is cue #925
-
-926
-00:15:26.000 --> 00:15:27.000
-This is cue #926
-
-927
-00:15:27.000 --> 00:15:28.000
-This is cue #927
-
-928
-00:15:28.000 --> 00:15:29.000
-This is cue #928
-
-929
-00:15:29.000 --> 00:15:30.000
-This is cue #929
-
-930
-00:15:30.000 --> 00:15:31.000
-This is cue #930
-
-931
-00:15:31.000 --> 00:15:32.000
-This is cue #931
-
-932
-00:15:32.000 --> 00:15:33.000
-This is cue #932
-
-933
-00:15:33.000 --> 00:15:34.000
-This is cue #933
-
-934
-00:15:34.000 --> 00:15:35.000
-This is cue #934
-
-935
-00:15:35.000 --> 00:15:36.000
-This is cue #935
-
-936
-00:15:36.000 --> 00:15:37.000
-This is cue #936
-
-937
-00:15:37.000 --> 00:15:38.000
-This is cue #937
-
-938
-00:15:38.000 --> 00:15:39.000
-This is cue #938
-
-939
-00:15:39.000 --> 00:15:40.000
-This is cue #939
-
-940
-00:15:40.000 --> 00:15:41.000
-This is cue #940
-
-941
-00:15:41.000 --> 00:15:42.000
-This is cue #941
-
-942
-00:15:42.000 --> 00:15:43.000
-This is cue #942
-
-943
-00:15:43.000 --> 00:15:44.000
-This is cue #943
-
-944
-00:15:44.000 --> 00:15:45.000
-This is cue #944
-
-945
-00:15:45.000 --> 00:15:46.000
-This is cue #945
-
-946
-00:15:46.000 --> 00:15:47.000
-This is cue #946
-
-947
-00:15:47.000 --> 00:15:48.000
-This is cue #947
-
-948
-00:15:48.000 --> 00:15:49.000
-This is cue #948
-
-949
-00:15:49.000 --> 00:15:50.000
-This is cue #949
-
-950
-00:15:50.000 --> 00:15:51.000
-This is cue #950
-
-951
-00:15:51.000 --> 00:15:52.000
-This is cue #951
-
-952
-00:15:52.000 --> 00:15:53.000
-This is cue #952
-
-953
-00:15:53.000 --> 00:15:54.000
-This is cue #953
-
-954
-00:15:54.000 --> 00:15:55.000
-This is cue #954
-
-955
-00:15:55.000 --> 00:15:56.000
-This is cue #955
-
-956
-00:15:56.000 --> 00:15:57.000
-This is cue #956
-
-957
-00:15:57.000 --> 00:15:58.000
-This is cue #957
-
-958
-00:15:58.000 --> 00:15:59.000
-This is cue #958
-
-959
-00:15:59.000 --> 00:16:00.000
-This is cue #959
-
-960
-00:16:00.000 --> 00:16:01.000
-This is cue #960
-
-961
-00:16:01.000 --> 00:16:02.000
-This is cue #961
-
-962
-00:16:02.000 --> 00:16:03.000
-This is cue #962
-
-963
-00:16:03.000 --> 00:16:04.000
-This is cue #963
-
-964
-00:16:04.000 --> 00:16:05.000
-This is cue #964
-
-965
-00:16:05.000 --> 00:16:06.000
-This is cue #965
-
-966
-00:16:06.000 --> 00:16:07.000
-This is cue #966
-
-967
-00:16:07.000 --> 00:16:08.000
-This is cue #967
-
-968
-00:16:08.000 --> 00:16:09.000
-This is cue #968
-
-969
-00:16:09.000 --> 00:16:10.000
-This is cue #969
-
-970
-00:16:10.000 --> 00:16:11.000
-This is cue #970
-
-971
-00:16:11.000 --> 00:16:12.000
-This is cue #971
-
-972
-00:16:12.000 --> 00:16:13.000
-This is cue #972
-
-973
-00:16:13.000 --> 00:16:14.000
-This is cue #973
-
-974
-00:16:14.000 --> 00:16:15.000
-This is cue #974
-
-975
-00:16:15.000 --> 00:16:16.000
-This is cue #975
-
-976
-00:16:16.000 --> 00:16:17.000
-This is cue #976
-
-977
-00:16:17.000 --> 00:16:18.000
-This is cue #977
-
-978
-00:16:18.000 --> 00:16:19.000
-This is cue #978
-
-979
-00:16:19.000 --> 00:16:20.000
-This is cue #979
-
-980
-00:16:20.000 --> 00:16:21.000
-This is cue #980
-
-981
-00:16:21.000 --> 00:16:22.000
-This is cue #981
-
-982
-00:16:22.000 --> 00:16:23.000
-This is cue #982
-
-983
-00:16:23.000 --> 00:16:24.000
-This is cue #983
-
-984
-00:16:24.000 --> 00:16:25.000
-This is cue #984
-
-985
-00:16:25.000 --> 00:16:26.000
-This is cue #985
-
-986
-00:16:26.000 --> 00:16:27.000
-This is cue #986
-
-987
-00:16:27.000 --> 00:16:28.000
-This is cue #987
-
-988
-00:16:28.000 --> 00:16:29.000
-This is cue #988
-
-989
-00:16:29.000 --> 00:16:30.000
-This is cue #989
-
-990
-00:16:30.000 --> 00:16:31.000
-This is cue #990
-
-991
-00:16:31.000 --> 00:16:32.000
-This is cue #991
-
-992
-00:16:32.000 --> 00:16:33.000
-This is cue #992
-
-993
-00:16:33.000 --> 00:16:34.000
-This is cue #993
-
-994
-00:16:34.000 --> 00:16:35.000
-This is cue #994
-
-995
-00:16:35.000 --> 00:16:36.000
-This is cue #995
-
-996
-00:16:36.000 --> 00:16:37.000
-This is cue #996
-
-997
-00:16:37.000 --> 00:16:38.000
-This is cue #997
-
-998
-00:16:38.000 --> 00:16:39.000
-This is cue #998
-
-999
-00:16:39.000 --> 00:16:40.000
-This is cue #999
-
-1000
-00:16:40.000 --> 00:16:41.000
-This is cue #1000
-
-1001
-00:16:41.000 --> 00:16:42.000
-This is cue #1001
-
-1002
-00:16:42.000 --> 00:16:43.000
-This is cue #1002
-
-1003
-00:16:43.000 --> 00:16:44.000
-This is cue #1003
-
-1004
-00:16:44.000 --> 00:16:45.000
-This is cue #1004
-
-1005
-00:16:45.000 --> 00:16:46.000
-This is cue #1005
-
-1006
-00:16:46.000 --> 00:16:47.000
-This is cue #1006
-
-1007
-00:16:47.000 --> 00:16:48.000
-This is cue #1007
-
-1008
-00:16:48.000 --> 00:16:49.000
-This is cue #1008
-
-1009
-00:16:49.000 --> 00:16:50.000
-This is cue #1009
-
-1010
-00:16:50.000 --> 00:16:51.000
-This is cue #1010
-
-1011
-00:16:51.000 --> 00:16:52.000
-This is cue #1011
-
-1012
-00:16:52.000 --> 00:16:53.000
-This is cue #1012
-
-1013
-00:16:53.000 --> 00:16:54.000
-This is cue #1013
-
-1014
-00:16:54.000 --> 00:16:55.000
-This is cue #1014
-
-1015
-00:16:55.000 --> 00:16:56.000
-This is cue #1015
-
-1016
-00:16:56.000 --> 00:16:57.000
-This is cue #1016
-
-1017
-00:16:57.000 --> 00:16:58.000
-This is cue #1017
-
-1018
-00:16:58.000 --> 00:16:59.000
-This is cue #1018
-
-1019
-00:16:59.000 --> 00:17:00.000
-This is cue #1019
-
-1020
-00:17:00.000 --> 00:17:01.000
-This is cue #1020
-
-1021
-00:17:01.000 --> 00:17:02.000
-This is cue #1021
-
-1022
-00:17:02.000 --> 00:17:03.000
-This is cue #1022
-
-1023
-00:17:03.000 --> 00:17:04.000
-This is cue #1023
-
-1024
-00:17:04.000 --> 00:17:05.000
-This is cue #1024
-
-1025
-00:17:05.000 --> 00:17:06.000
-This is cue #1025
-
-1026
-00:17:06.000 --> 00:17:07.000
-This is cue #1026
-
-1027
-00:17:07.000 --> 00:17:08.000
-This is cue #1027
-
-1028
-00:17:08.000 --> 00:17:09.000
-This is cue #1028
-
-1029
-00:17:09.000 --> 00:17:10.000
-This is cue #1029
-
-1030
-00:17:10.000 --> 00:17:11.000
-This is cue #1030
-
-1031
-00:17:11.000 --> 00:17:12.000
-This is cue #1031
-
-1032
-00:17:12.000 --> 00:17:13.000
-This is cue #1032
-
-1033
-00:17:13.000 --> 00:17:14.000
-This is cue #1033
-
-1034
-00:17:14.000 --> 00:17:15.000
-This is cue #1034
-
-1035
-00:17:15.000 --> 00:17:16.000
-This is cue #1035
-
-1036
-00:17:16.000 --> 00:17:17.000
-This is cue #1036
-
-1037
-00:17:17.000 --> 00:17:18.000
-This is cue #1037
-
-1038
-00:17:18.000 --> 00:17:19.000
-This is cue #1038
-
-1039
-00:17:19.000 --> 00:17:20.000
-This is cue #1039
-
-1040
-00:17:20.000 --> 00:17:21.000
-This is cue #1040
-
-1041
-00:17:21.000 --> 00:17:22.000
-This is cue #1041
-
-1042
-00:17:22.000 --> 00:17:23.000
-This is cue #1042
-
-1043
-00:17:23.000 --> 00:17:24.000
-This is cue #1043
-
-1044
-00:17:24.000 --> 00:17:25.000
-This is cue #1044
-
-1045
-00:17:25.000 --> 00:17:26.000
-This is cue #1045
-
-1046
-00:17:26.000 --> 00:17:27.000
-This is cue #1046
-
-1047
-00:17:27.000 --> 00:17:28.000
-This is cue #1047
-
-1048
-00:17:28.000 --> 00:17:29.000
-This is cue #1048
-
-1049
-00:17:29.000 --> 00:17:30.000
-This is cue #1049
-
-1050
-00:17:30.000 --> 00:17:31.000
-This is cue #1050
-
-1051
-00:17:31.000 --> 00:17:32.000
-This is cue #1051
-
-1052
-00:17:32.000 --> 00:17:33.000
-This is cue #1052
-
-1053
-00:17:33.000 --> 00:17:34.000
-This is cue #1053
-
-1054
-00:17:34.000 --> 00:17:35.000
-This is cue #1054
-
-1055
-00:17:35.000 --> 00:17:36.000
-This is cue #1055
-
-1056
-00:17:36.000 --> 00:17:37.000
-This is cue #1056
-
-1057
-00:17:37.000 --> 00:17:38.000
-This is cue #1057
-
-1058
-00:17:38.000 --> 00:17:39.000
-This is cue #1058
-
-1059
-00:17:39.000 --> 00:17:40.000
-This is cue #1059
-
-1060
-00:17:40.000 --> 00:17:41.000
-This is cue #1060
-
-1061
-00:17:41.000 --> 00:17:42.000
-This is cue #1061
-
-1062
-00:17:42.000 --> 00:17:43.000
-This is cue #1062
-
-1063
-00:17:43.000 --> 00:17:44.000
-This is cue #1063
-
-1064
-00:17:44.000 --> 00:17:45.000
-This is cue #1064
-
-1065
-00:17:45.000 --> 00:17:46.000
-This is cue #1065
-
-1066
-00:17:46.000 --> 00:17:47.000
-This is cue #1066
-
-1067
-00:17:47.000 --> 00:17:48.000
-This is cue #1067
-
-1068
-00:17:48.000 --> 00:17:49.000
-This is cue #1068
-
-1069
-00:17:49.000 --> 00:17:50.000
-This is cue #1069
-
-1070
-00:17:50.000 --> 00:17:51.000
-This is cue #1070
-
-1071
-00:17:51.000 --> 00:17:52.000
-This is cue #1071
-
-1072
-00:17:52.000 --> 00:17:53.000
-This is cue #1072
-
-1073
-00:17:53.000 --> 00:17:54.000
-This is cue #1073
-
-1074
-00:17:54.000 --> 00:17:55.000
-This is cue #1074
-
-1075
-00:17:55.000 --> 00:17:56.000
-This is cue #1075
-
-1076
-00:17:56.000 --> 00:17:57.000
-This is cue #1076
-
-1077
-00:17:57.000 --> 00:17:58.000
-This is cue #1077
-
-1078
-00:17:58.000 --> 00:17:59.000
-This is cue #1078
-
-1079
-00:17:59.000 --> 00:18:00.000
-This is cue #1079
-
-1080
-00:18:00.000 --> 00:18:01.000
-This is cue #1080
-
-1081
-00:18:01.000 --> 00:18:02.000
-This is cue #1081
-
-1082
-00:18:02.000 --> 00:18:03.000
-This is cue #1082
-
-1083
-00:18:03.000 --> 00:18:04.000
-This is cue #1083
-
-1084
-00:18:04.000 --> 00:18:05.000
-This is cue #1084
-
-1085
-00:18:05.000 --> 00:18:06.000
-This is cue #1085
-
-1086
-00:18:06.000 --> 00:18:07.000
-This is cue #1086
-
-1087
-00:18:07.000 --> 00:18:08.000
-This is cue #1087
-
-1088
-00:18:08.000 --> 00:18:09.000
-This is cue #1088
-
-1089
-00:18:09.000 --> 00:18:10.000
-This is cue #1089
-
-1090
-00:18:10.000 --> 00:18:11.000
-This is cue #1090
-
-1091
-00:18:11.000 --> 00:18:12.000
-This is cue #1091
-
-1092
-00:18:12.000 --> 00:18:13.000
-This is cue #1092
-
-1093
-00:18:13.000 --> 00:18:14.000
-This is cue #1093
-
-1094
-00:18:14.000 --> 00:18:15.000
-This is cue #1094
-
-1095
-00:18:15.000 --> 00:18:16.000
-This is cue #1095
-
-1096
-00:18:16.000 --> 00:18:17.000
-This is cue #1096
-
-1097
-00:18:17.000 --> 00:18:18.000
-This is cue #1097
-
-1098
-00:18:18.000 --> 00:18:19.000
-This is cue #1098
-
-1099
-00:18:19.000 --> 00:18:20.000
-This is cue #1099
-
-1100
-00:18:20.000 --> 00:18:21.000
-This is cue #1100
-
-1101
-00:18:21.000 --> 00:18:22.000
-This is cue #1101
-
-1102
-00:18:22.000 --> 00:18:23.000
-This is cue #1102
-
-1103
-00:18:23.000 --> 00:18:24.000
-This is cue #1103
-
-1104
-00:18:24.000 --> 00:18:25.000
-This is cue #1104
-
-1105
-00:18:25.000 --> 00:18:26.000
-This is cue #1105
-
-1106
-00:18:26.000 --> 00:18:27.000
-This is cue #1106
-
-1107
-00:18:27.000 --> 00:18:28.000
-This is cue #1107
-
-1108
-00:18:28.000 --> 00:18:29.000
-This is cue #1108
-
-1109
-00:18:29.000 --> 00:18:30.000
-This is cue #1109
-
-1110
-00:18:30.000 --> 00:18:31.000
-This is cue #1110
-
-1111
-00:18:31.000 --> 00:18:32.000
-This is cue #1111
-
-1112
-00:18:32.000 --> 00:18:33.000
-This is cue #1112
-
-1113
-00:18:33.000 --> 00:18:34.000
-This is cue #1113
-
-1114
-00:18:34.000 --> 00:18:35.000
-This is cue #1114
-
-1115
-00:18:35.000 --> 00:18:36.000
-This is cue #1115
-
-1116
-00:18:36.000 --> 00:18:37.000
-This is cue #1116
-
-1117
-00:18:37.000 --> 00:18:38.000
-This is cue #1117
-
-1118
-00:18:38.000 --> 00:18:39.000
-This is cue #1118
-
-1119
-00:18:39.000 --> 00:18:40.000
-This is cue #1119
-
-1120
-00:18:40.000 --> 00:18:41.000
-This is cue #1120
-
-1121
-00:18:41.000 --> 00:18:42.000
-This is cue #1121
-
-1122
-00:18:42.000 --> 00:18:43.000
-This is cue #1122
-
-1123
-00:18:43.000 --> 00:18:44.000
-This is cue #1123
-
-1124
-00:18:44.000 --> 00:18:45.000
-This is cue #1124
-
-1125
-00:18:45.000 --> 00:18:46.000
-This is cue #1125
-
-1126
-00:18:46.000 --> 00:18:47.000
-This is cue #1126
-
-1127
-00:18:47.000 --> 00:18:48.000
-This is cue #1127
-
-1128
-00:18:48.000 --> 00:18:49.000
-This is cue #1128
-
-1129
-00:18:49.000 --> 00:18:50.000
-This is cue #1129
-
-1130
-00:18:50.000 --> 00:18:51.000
-This is cue #1130
-
-1131
-00:18:51.000 --> 00:18:52.000
-This is cue #1131
-
-1132
-00:18:52.000 --> 00:18:53.000
-This is cue #1132
-
-1133
-00:18:53.000 --> 00:18:54.000
-This is cue #1133
-
-1134
-00:18:54.000 --> 00:18:55.000
-This is cue #1134
-
-1135
-00:18:55.000 --> 00:18:56.000
-This is cue #1135
-
-1136
-00:18:56.000 --> 00:18:57.000
-This is cue #1136
-
-1137
-00:18:57.000 --> 00:18:58.000
-This is cue #1137
-
-1138
-00:18:58.000 --> 00:18:59.000
-This is cue #1138
-
-1139
-00:18:59.000 --> 00:19:00.000
-This is cue #1139
-
-1140
-00:19:00.000 --> 00:19:01.000
-This is cue #1140
-
-1141
-00:19:01.000 --> 00:19:02.000
-This is cue #1141
-
-1142
-00:19:02.000 --> 00:19:03.000
-This is cue #1142
-
-1143
-00:19:03.000 --> 00:19:04.000
-This is cue #1143
-
-1144
-00:19:04.000 --> 00:19:05.000
-This is cue #1144
-
-1145
-00:19:05.000 --> 00:19:06.000
-This is cue #1145
-
-1146
-00:19:06.000 --> 00:19:07.000
-This is cue #1146
-
-1147
-00:19:07.000 --> 00:19:08.000
-This is cue #1147
-
-1148
-00:19:08.000 --> 00:19:09.000
-This is cue #1148
-
-1149
-00:19:09.000 --> 00:19:10.000
-This is cue #1149
-
-1150
-00:19:10.000 --> 00:19:11.000
-This is cue #1150
-
-1151
-00:19:11.000 --> 00:19:12.000
-This is cue #1151
-
-1152
-00:19:12.000 --> 00:19:13.000
-This is cue #1152
-
-1153
-00:19:13.000 --> 00:19:14.000
-This is cue #1153
-
-1154
-00:19:14.000 --> 00:19:15.000
-This is cue #1154
-
-1155
-00:19:15.000 --> 00:19:16.000
-This is cue #1155
-
-1156
-00:19:16.000 --> 00:19:17.000
-This is cue #1156
-
-1157
-00:19:17.000 --> 00:19:18.000
-This is cue #1157
-
-1158
-00:19:18.000 --> 00:19:19.000
-This is cue #1158
-
-1159
-00:19:19.000 --> 00:19:20.000
-This is cue #1159
-
-1160
-00:19:20.000 --> 00:19:21.000
-This is cue #1160
-
-1161
-00:19:21.000 --> 00:19:22.000
-This is cue #1161
-
-1162
-00:19:22.000 --> 00:19:23.000
-This is cue #1162
-
-1163
-00:19:23.000 --> 00:19:24.000
-This is cue #1163
-
-1164
-00:19:24.000 --> 00:19:25.000
-This is cue #1164
-
-1165
-00:19:25.000 --> 00:19:26.000
-This is cue #1165
-
-1166
-00:19:26.000 --> 00:19:27.000
-This is cue #1166
-
-1167
-00:19:27.000 --> 00:19:28.000
-This is cue #1167
-
-1168
-00:19:28.000 --> 00:19:29.000
-This is cue #1168
-
-1169
-00:19:29.000 --> 00:19:30.000
-This is cue #1169
-
-1170
-00:19:30.000 --> 00:19:31.000
-This is cue #1170
-
-1171
-00:19:31.000 --> 00:19:32.000
-This is cue #1171
-
-1172
-00:19:32.000 --> 00:19:33.000
-This is cue #1172
-
-1173
-00:19:33.000 --> 00:19:34.000
-This is cue #1173
-
-1174
-00:19:34.000 --> 00:19:35.000
-This is cue #1174
-
-1175
-00:19:35.000 --> 00:19:36.000
-This is cue #1175
-
-1176
-00:19:36.000 --> 00:19:37.000
-This is cue #1176
-
-1177
-00:19:37.000 --> 00:19:38.000
-This is cue #1177
-
-1178
-00:19:38.000 --> 00:19:39.000
-This is cue #1178
-
-1179
-00:19:39.000 --> 00:19:40.000
-This is cue #1179
-
-1180
-00:19:40.000 --> 00:19:41.000
-This is cue #1180
-
-1181
-00:19:41.000 --> 00:19:42.000
-This is cue #1181
-
-1182
-00:19:42.000 --> 00:19:43.000
-This is cue #1182
-
-1183
-00:19:43.000 --> 00:19:44.000
-This is cue #1183
-
-1184
-00:19:44.000 --> 00:19:45.000
-This is cue #1184
-
-1185
-00:19:45.000 --> 00:19:46.000
-This is cue #1185
-
-1186
-00:19:46.000 --> 00:19:47.000
-This is cue #1186
-
-1187
-00:19:47.000 --> 00:19:48.000
-This is cue #1187
-
-1188
-00:19:48.000 --> 00:19:49.000
-This is cue #1188
-
-1189
-00:19:49.000 --> 00:19:50.000
-This is cue #1189
-
-1190
-00:19:50.000 --> 00:19:51.000
-This is cue #1190
-
-1191
-00:19:51.000 --> 00:19:52.000
-This is cue #1191
-
-1192
-00:19:52.000 --> 00:19:53.000
-This is cue #1192
-
-1193
-00:19:53.000 --> 00:19:54.000
-This is cue #1193
-
-1194
-00:19:54.000 --> 00:19:55.000
-This is cue #1194
-
-1195
-00:19:55.000 --> 00:19:56.000
-This is cue #1195
-
-1196
-00:19:56.000 --> 00:19:57.000
-This is cue #1196
-
-1197
-00:19:57.000 --> 00:19:58.000
-This is cue #1197
-
-1198
-00:19:58.000 --> 00:19:59.000
-This is cue #1198
-
-1199
-00:19:59.000 --> 00:20:00.000
-This is cue #1199
-
-1200
-00:20:00.000 --> 00:20:01.000
-This is cue #1200
-
-1201
-00:20:01.000 --> 00:20:02.000
-This is cue #1201
-
-1202
-00:20:02.000 --> 00:20:03.000
-This is cue #1202
-
-1203
-00:20:03.000 --> 00:20:04.000
-This is cue #1203
-
-1204
-00:20:04.000 --> 00:20:05.000
-This is cue #1204
-
-1205
-00:20:05.000 --> 00:20:06.000
-This is cue #1205
-
-1206
-00:20:06.000 --> 00:20:07.000
-This is cue #1206
-
-1207
-00:20:07.000 --> 00:20:08.000
-This is cue #1207
-
-1208
-00:20:08.000 --> 00:20:09.000
-This is cue #1208
-
-1209
-00:20:09.000 --> 00:20:10.000
-This is cue #1209
-
-1210
-00:20:10.000 --> 00:20:11.000
-This is cue #1210
-
-1211
-00:20:11.000 --> 00:20:12.000
-This is cue #1211
-
-1212
-00:20:12.000 --> 00:20:13.000
-This is cue #1212
-
-1213
-00:20:13.000 --> 00:20:14.000
-This is cue #1213
-
-1214
-00:20:14.000 --> 00:20:15.000
-This is cue #1214
-
-1215
-00:20:15.000 --> 00:20:16.000
-This is cue #1215
-
-1216
-00:20:16.000 --> 00:20:17.000
-This is cue #1216
-
-1217
-00:20:17.000 --> 00:20:18.000
-This is cue #1217
-
-1218
-00:20:18.000 --> 00:20:19.000
-This is cue #1218
-
-1219
-00:20:19.000 --> 00:20:20.000
-This is cue #1219
-
-1220
-00:20:20.000 --> 00:20:21.000
-This is cue #1220
-
-1221
-00:20:21.000 --> 00:20:22.000
-This is cue #1221
-
-1222
-00:20:22.000 --> 00:20:23.000
-This is cue #1222
-
-1223
-00:20:23.000 --> 00:20:24.000
-This is cue #1223
-
-1224
-00:20:24.000 --> 00:20:25.000
-This is cue #1224
-
-1225
-00:20:25.000 --> 00:20:26.000
-This is cue #1225
-
-1226
-00:20:26.000 --> 00:20:27.000
-This is cue #1226
-
-1227
-00:20:27.000 --> 00:20:28.000
-This is cue #1227
-
-1228
-00:20:28.000 --> 00:20:29.000
-This is cue #1228
-
-1229
-00:20:29.000 --> 00:20:30.000
-This is cue #1229
-
-1230
-00:20:30.000 --> 00:20:31.000
-This is cue #1230
-
-1231
-00:20:31.000 --> 00:20:32.000
-This is cue #1231
-
-1232
-00:20:32.000 --> 00:20:33.000
-This is cue #1232
-
-1233
-00:20:33.000 --> 00:20:34.000
-This is cue #1233
-
-1234
-00:20:34.000 --> 00:20:35.000
-This is cue #1234
-
-1235
-00:20:35.000 --> 00:20:36.000
-This is cue #1235
-
-1236
-00:20:36.000 --> 00:20:37.000
-This is cue #1236
-
-1237
-00:20:37.000 --> 00:20:38.000
-This is cue #1237
-
-1238
-00:20:38.000 --> 00:20:39.000
-This is cue #1238
-
-1239
-00:20:39.000 --> 00:20:40.000
-This is cue #1239
-
-1240
-00:20:40.000 --> 00:20:41.000
-This is cue #1240
-
-1241
-00:20:41.000 --> 00:20:42.000
-This is cue #1241
-
-1242
-00:20:42.000 --> 00:20:43.000
-This is cue #1242
-
-1243
-00:20:43.000 --> 00:20:44.000
-This is cue #1243
-
-1244
-00:20:44.000 --> 00:20:45.000
-This is cue #1244
-
-1245
-00:20:45.000 --> 00:20:46.000
-This is cue #1245
-
-1246
-00:20:46.000 --> 00:20:47.000
-This is cue #1246
-
-1247
-00:20:47.000 --> 00:20:48.000
-This is cue #1247
-
-1248
-00:20:48.000 --> 00:20:49.000
-This is cue #1248
-
-1249
-00:20:49.000 --> 00:20:50.000
-This is cue #1249
-
-1250
-00:20:50.000 --> 00:20:51.000
-This is cue #1250
-
-1251
-00:20:51.000 --> 00:20:52.000
-This is cue #1251
-
-1252
-00:20:52.000 --> 00:20:53.000
-This is cue #1252
-
-1253
-00:20:53.000 --> 00:20:54.000
-This is cue #1253
-
-1254
-00:20:54.000 --> 00:20:55.000
-This is cue #1254
-
-1255
-00:20:55.000 --> 00:20:56.000
-This is cue #1255
-
-1256
-00:20:56.000 --> 00:20:57.000
-This is cue #1256
-
-1257
-00:20:57.000 --> 00:20:58.000
-This is cue #1257
-
-1258
-00:20:58.000 --> 00:20:59.000
-This is cue #1258
-
-1259
-00:20:59.000 --> 00:21:00.000
-This is cue #1259
-
-1260
-00:21:00.000 --> 00:21:01.000
-This is cue #1260
-
-1261
-00:21:01.000 --> 00:21:02.000
-This is cue #1261
-
-1262
-00:21:02.000 --> 00:21:03.000
-This is cue #1262
-
-1263
-00:21:03.000 --> 00:21:04.000
-This is cue #1263
-
-1264
-00:21:04.000 --> 00:21:05.000
-This is cue #1264
-
-1265
-00:21:05.000 --> 00:21:06.000
-This is cue #1265
-
-1266
-00:21:06.000 --> 00:21:07.000
-This is cue #1266
-
-1267
-00:21:07.000 --> 00:21:08.000
-This is cue #1267
-
-1268
-00:21:08.000 --> 00:21:09.000
-This is cue #1268
-
-1269
-00:21:09.000 --> 00:21:10.000
-This is cue #1269
-
-1270
-00:21:10.000 --> 00:21:11.000
-This is cue #1270
-
-1271
-00:21:11.000 --> 00:21:12.000
-This is cue #1271
-
-1272
-00:21:12.000 --> 00:21:13.000
-This is cue #1272
-
-1273
-00:21:13.000 --> 00:21:14.000
-This is cue #1273
-
-1274
-00:21:14.000 --> 00:21:15.000
-This is cue #1274
-
-1275
-00:21:15.000 --> 00:21:16.000
-This is cue #1275
-
-1276
-00:21:16.000 --> 00:21:17.000
-This is cue #1276
-
-1277
-00:21:17.000 --> 00:21:18.000
-This is cue #1277
-
-1278
-00:21:18.000 --> 00:21:19.000
-This is cue #1278
-
-1279
-00:21:19.000 --> 00:21:20.000
-This is cue #1279
-
-1280
-00:21:20.000 --> 00:21:21.000
-This is cue #1280
-
-1281
-00:21:21.000 --> 00:21:22.000
-This is cue #1281
-
-1282
-00:21:22.000 --> 00:21:23.000
-This is cue #1282
-
-1283
-00:21:23.000 --> 00:21:24.000
-This is cue #1283
-
-1284
-00:21:24.000 --> 00:21:25.000
-This is cue #1284
-
-1285
-00:21:25.000 --> 00:21:26.000
-This is cue #1285
-
-1286
-00:21:26.000 --> 00:21:27.000
-This is cue #1286
-
-1287
-00:21:27.000 --> 00:21:28.000
-This is cue #1287
-
-1288
-00:21:28.000 --> 00:21:29.000
-This is cue #1288
-
-1289
-00:21:29.000 --> 00:21:30.000
-This is cue #1289
-
-1290
-00:21:30.000 --> 00:21:31.000
-This is cue #1290
-
-1291
-00:21:31.000 --> 00:21:32.000
-This is cue #1291
-
-1292
-00:21:32.000 --> 00:21:33.000
-This is cue #1292
-
-1293
-00:21:33.000 --> 00:21:34.000
-This is cue #1293
-
-1294
-00:21:34.000 --> 00:21:35.000
-This is cue #1294
-
-1295
-00:21:35.000 --> 00:21:36.000
-This is cue #1295
-
-1296
-00:21:36.000 --> 00:21:37.000
-This is cue #1296
-
-1297
-00:21:37.000 --> 00:21:38.000
-This is cue #1297
-
-1298
-00:21:38.000 --> 00:21:39.000
-This is cue #1298
-
-1299
-00:21:39.000 --> 00:21:40.000
-This is cue #1299
-
-1300
-00:21:40.000 --> 00:21:41.000
-This is cue #1300
-
-1301
-00:21:41.000 --> 00:21:42.000
-This is cue #1301
-
-1302
-00:21:42.000 --> 00:21:43.000
-This is cue #1302
-
-1303
-00:21:43.000 --> 00:21:44.000
-This is cue #1303
-
-1304
-00:21:44.000 --> 00:21:45.000
-This is cue #1304
-
-1305
-00:21:45.000 --> 00:21:46.000
-This is cue #1305
-
-1306
-00:21:46.000 --> 00:21:47.000
-This is cue #1306
-
-1307
-00:21:47.000 --> 00:21:48.000
-This is cue #1307
-
-1308
-00:21:48.000 --> 00:21:49.000
-This is cue #1308
-
-1309
-00:21:49.000 --> 00:21:50.000
-This is cue #1309
-
-1310
-00:21:50.000 --> 00:21:51.000
-This is cue #1310
-
-1311
-00:21:51.000 --> 00:21:52.000
-This is cue #1311
-
-1312
-00:21:52.000 --> 00:21:53.000
-This is cue #1312
-
-1313
-00:21:53.000 --> 00:21:54.000
-This is cue #1313
-
-1314
-00:21:54.000 --> 00:21:55.000
-This is cue #1314
-
-1315
-00:21:55.000 --> 00:21:56.000
-This is cue #1315
-
-1316
-00:21:56.000 --> 00:21:57.000
-This is cue #1316
-
-1317
-00:21:57.000 --> 00:21:58.000
-This is cue #1317
-
-1318
-00:21:58.000 --> 00:21:59.000
-This is cue #1318
-
-1319
-00:21:59.000 --> 00:22:00.000
-This is cue #1319
-
-1320
-00:22:00.000 --> 00:22:01.000
-This is cue #1320
-
-1321
-00:22:01.000 --> 00:22:02.000
-This is cue #1321
-
-1322
-00:22:02.000 --> 00:22:03.000
-This is cue #1322
-
-1323
-00:22:03.000 --> 00:22:04.000
-This is cue #1323
-
-1324
-00:22:04.000 --> 00:22:05.000
-This is cue #1324
-
-1325
-00:22:05.000 --> 00:22:06.000
-This is cue #1325
-
-1326
-00:22:06.000 --> 00:22:07.000
-This is cue #1326
-
-1327
-00:22:07.000 --> 00:22:08.000
-This is cue #1327
-
-1328
-00:22:08.000 --> 00:22:09.000
-This is cue #1328
-
-1329
-00:22:09.000 --> 00:22:10.000
-This is cue #1329
-
-1330
-00:22:10.000 --> 00:22:11.000
-This is cue #1330
-
-1331
-00:22:11.000 --> 00:22:12.000
-This is cue #1331
-
-1332
-00:22:12.000 --> 00:22:13.000
-This is cue #1332
-
-1333
-00:22:13.000 --> 00:22:14.000
-This is cue #1333
-
-1334
-00:22:14.000 --> 00:22:15.000
-This is cue #1334
-
-1335
-00:22:15.000 --> 00:22:16.000
-This is cue #1335
-
-1336
-00:22:16.000 --> 00:22:17.000
-This is cue #1336
-
-1337
-00:22:17.000 --> 00:22:18.000
-This is cue #1337
-
-1338
-00:22:18.000 --> 00:22:19.000
-This is cue #1338
-
-1339
-00:22:19.000 --> 00:22:20.000
-This is cue #1339
-
-1340
-00:22:20.000 --> 00:22:21.000
-This is cue #1340
-
-1341
-00:22:21.000 --> 00:22:22.000
-This is cue #1341
-
-1342
-00:22:22.000 --> 00:22:23.000
-This is cue #1342
-
-1343
-00:22:23.000 --> 00:22:24.000
-This is cue #1343
-
-1344
-00:22:24.000 --> 00:22:25.000
-This is cue #1344
-
-1345
-00:22:25.000 --> 00:22:26.000
-This is cue #1345
-
-1346
-00:22:26.000 --> 00:22:27.000
-This is cue #1346
-
-1347
-00:22:27.000 --> 00:22:28.000
-This is cue #1347
-
-1348
-00:22:28.000 --> 00:22:29.000
-This is cue #1348
-
-1349
-00:22:29.000 --> 00:22:30.000
-This is cue #1349
-
-1350
-00:22:30.000 --> 00:22:31.000
-This is cue #1350
-
-1351
-00:22:31.000 --> 00:22:32.000
-This is cue #1351
-
-1352
-00:22:32.000 --> 00:22:33.000
-This is cue #1352
-
-1353
-00:22:33.000 --> 00:22:34.000
-This is cue #1353
-
-1354
-00:22:34.000 --> 00:22:35.000
-This is cue #1354
-
-1355
-00:22:35.000 --> 00:22:36.000
-This is cue #1355
-
-1356
-00:22:36.000 --> 00:22:37.000
-This is cue #1356
-
-1357
-00:22:37.000 --> 00:22:38.000
-This is cue #1357
-
-1358
-00:22:38.000 --> 00:22:39.000
-This is cue #1358
-
-1359
-00:22:39.000 --> 00:22:40.000
-This is cue #1359
-
-1360
-00:22:40.000 --> 00:22:41.000
-This is cue #1360
-
-1361
-00:22:41.000 --> 00:22:42.000
-This is cue #1361
-
-1362
-00:22:42.000 --> 00:22:43.000
-This is cue #1362
-
-1363
-00:22:43.000 --> 00:22:44.000
-This is cue #1363
-
-1364
-00:22:44.000 --> 00:22:45.000
-This is cue #1364
-
-1365
-00:22:45.000 --> 00:22:46.000
-This is cue #1365
-
-1366
-00:22:46.000 --> 00:22:47.000
-This is cue #1366
-
-1367
-00:22:47.000 --> 00:22:48.000
-This is cue #1367
-
-1368
-00:22:48.000 --> 00:22:49.000
-This is cue #1368
-
-1369
-00:22:49.000 --> 00:22:50.000
-This is cue #1369
-
-1370
-00:22:50.000 --> 00:22:51.000
-This is cue #1370
-
-1371
-00:22:51.000 --> 00:22:52.000
-This is cue #1371
-
-1372
-00:22:52.000 --> 00:22:53.000
-This is cue #1372
-
-1373
-00:22:53.000 --> 00:22:54.000
-This is cue #1373
-
-1374
-00:22:54.000 --> 00:22:55.000
-This is cue #1374
-
-1375
-00:22:55.000 --> 00:22:56.000
-This is cue #1375
-
-1376
-00:22:56.000 --> 00:22:57.000
-This is cue #1376
-
-1377
-00:22:57.000 --> 00:22:58.000
-This is cue #1377
-
-1378
-00:22:58.000 --> 00:22:59.000
-This is cue #1378
-
-1379
-00:22:59.000 --> 00:23:00.000
-This is cue #1379
-
-1380
-00:23:00.000 --> 00:23:01.000
-This is cue #1380
-
-1381
-00:23:01.000 --> 00:23:02.000
-This is cue #1381
-
-1382
-00:23:02.000 --> 00:23:03.000
-This is cue #1382
-
-1383
-00:23:03.000 --> 00:23:04.000
-This is cue #1383
-
-1384
-00:23:04.000 --> 00:23:05.000
-This is cue #1384
-
-1385
-00:23:05.000 --> 00:23:06.000
-This is cue #1385
-
-1386
-00:23:06.000 --> 00:23:07.000
-This is cue #1386
-
-1387
-00:23:07.000 --> 00:23:08.000
-This is cue #1387
-
-1388
-00:23:08.000 --> 00:23:09.000
-This is cue #1388
-
-1389
-00:23:09.000 --> 00:23:10.000
-This is cue #1389
-
-1390
-00:23:10.000 --> 00:23:11.000
-This is cue #1390
-
-1391
-00:23:11.000 --> 00:23:12.000
-This is cue #1391
-
-1392
-00:23:12.000 --> 00:23:13.000
-This is cue #1392
-
-1393
-00:23:13.000 --> 00:23:14.000
-This is cue #1393
-
-1394
-00:23:14.000 --> 00:23:15.000
-This is cue #1394
-
-1395
-00:23:15.000 --> 00:23:16.000
-This is cue #1395
-
-1396
-00:23:16.000 --> 00:23:17.000
-This is cue #1396
-
-1397
-00:23:17.000 --> 00:23:18.000
-This is cue #1397
-
-1398
-00:23:18.000 --> 00:23:19.000
-This is cue #1398
-
-1399
-00:23:19.000 --> 00:23:20.000
-This is cue #1399
-
-1400
-00:23:20.000 --> 00:23:21.000
-This is cue #1400
-
-1401
-00:23:21.000 --> 00:23:22.000
-This is cue #1401
-
-1402
-00:23:22.000 --> 00:23:23.000
-This is cue #1402
-
-1403
-00:23:23.000 --> 00:23:24.000
-This is cue #1403
-
-1404
-00:23:24.000 --> 00:23:25.000
-This is cue #1404
-
-1405
-00:23:25.000 --> 00:23:26.000
-This is cue #1405
-
-1406
-00:23:26.000 --> 00:23:27.000
-This is cue #1406
-
-1407
-00:23:27.000 --> 00:23:28.000
-This is cue #1407
-
-1408
-00:23:28.000 --> 00:23:29.000
-This is cue #1408
-
-1409
-00:23:29.000 --> 00:23:30.000
-This is cue #1409
-
-1410
-00:23:30.000 --> 00:23:31.000
-This is cue #1410
-
-1411
-00:23:31.000 --> 00:23:32.000
-This is cue #1411
-
-1412
-00:23:32.000 --> 00:23:33.000
-This is cue #1412
-
-1413
-00:23:33.000 --> 00:23:34.000
-This is cue #1413
-
-1414
-00:23:34.000 --> 00:23:35.000
-This is cue #1414
-
-1415
-00:23:35.000 --> 00:23:36.000
-This is cue #1415
-
-1416
-00:23:36.000 --> 00:23:37.000
-This is cue #1416
-
-1417
-00:23:37.000 --> 00:23:38.000
-This is cue #1417
-
-1418
-00:23:38.000 --> 00:23:39.000
-This is cue #1418
-
-1419
-00:23:39.000 --> 00:23:40.000
-This is cue #1419
-
-1420
-00:23:40.000 --> 00:23:41.000
-This is cue #1420
-
-1421
-00:23:41.000 --> 00:23:42.000
-This is cue #1421
-
-1422
-00:23:42.000 --> 00:23:43.000
-This is cue #1422
-
-1423
-00:23:43.000 --> 00:23:44.000
-This is cue #1423
-
-1424
-00:23:44.000 --> 00:23:45.000
-This is cue #1424
-
-1425
-00:23:45.000 --> 00:23:46.000
-This is cue #1425
-
-1426
-00:23:46.000 --> 00:23:47.000
-This is cue #1426
-
-1427
-00:23:47.000 --> 00:23:48.000
-This is cue #1427
-
-1428
-00:23:48.000 --> 00:23:49.000
-This is cue #1428
-
-1429
-00:23:49.000 --> 00:23:50.000
-This is cue #1429
-
-1430
-00:23:50.000 --> 00:23:51.000
-This is cue #1430
-
-1431
-00:23:51.000 --> 00:23:52.000
-This is cue #1431
-
-1432
-00:23:52.000 --> 00:23:53.000
-This is cue #1432
-
-1433
-00:23:53.000 --> 00:23:54.000
-This is cue #1433
-
-1434
-00:23:54.000 --> 00:23:55.000
-This is cue #1434
-
-1435
-00:23:55.000 --> 00:23:56.000
-This is cue #1435
-
-1436
-00:23:56.000 --> 00:23:57.000
-This is cue #1436
-
-1437
-00:23:57.000 --> 00:23:58.000
-This is cue #1437
-
-1438
-00:23:58.000 --> 00:23:59.000
-This is cue #1438
-
-1439
-00:23:59.000 --> 00:24:00.000
-This is cue #1439
-
-1440
-00:24:00.000 --> 00:24:01.000
-This is cue #1440
-
-1441
-00:24:01.000 --> 00:24:02.000
-This is cue #1441
-
-1442
-00:24:02.000 --> 00:24:03.000
-This is cue #1442
-
-1443
-00:24:03.000 --> 00:24:04.000
-This is cue #1443
-
-1444
-00:24:04.000 --> 00:24:05.000
-This is cue #1444
-
-1445
-00:24:05.000 --> 00:24:06.000
-This is cue #1445
-
-1446
-00:24:06.000 --> 00:24:07.000
-This is cue #1446
-
-1447
-00:24:07.000 --> 00:24:08.000
-This is cue #1447
-
-1448
-00:24:08.000 --> 00:24:09.000
-This is cue #1448
-
-1449
-00:24:09.000 --> 00:24:10.000
-This is cue #1449
-
-1450
-00:24:10.000 --> 00:24:11.000
-This is cue #1450
-
-1451
-00:24:11.000 --> 00:24:12.000
-This is cue #1451
-
-1452
-00:24:12.000 --> 00:24:13.000
-This is cue #1452
-
-1453
-00:24:13.000 --> 00:24:14.000
-This is cue #1453
-
-1454
-00:24:14.000 --> 00:24:15.000
-This is cue #1454
-
-1455
-00:24:15.000 --> 00:24:16.000
-This is cue #1455
-
-1456
-00:24:16.000 --> 00:24:17.000
-This is cue #1456
-
-1457
-00:24:17.000 --> 00:24:18.000
-This is cue #1457
-
-1458
-00:24:18.000 --> 00:24:19.000
-This is cue #1458
-
-1459
-00:24:19.000 --> 00:24:20.000
-This is cue #1459
-
-1460
-00:24:20.000 --> 00:24:21.000
-This is cue #1460
-
-1461
-00:24:21.000 --> 00:24:22.000
-This is cue #1461
-
-1462
-00:24:22.000 --> 00:24:23.000
-This is cue #1462
-
-1463
-00:24:23.000 --> 00:24:24.000
-This is cue #1463
-
-1464
-00:24:24.000 --> 00:24:25.000
-This is cue #1464
-
-1465
-00:24:25.000 --> 00:24:26.000
-This is cue #1465
-
-1466
-00:24:26.000 --> 00:24:27.000
-This is cue #1466
-
-1467
-00:24:27.000 --> 00:24:28.000
-This is cue #1467
-
-1468
-00:24:28.000 --> 00:24:29.000
-This is cue #1468
-
-1469
-00:24:29.000 --> 00:24:30.000
-This is cue #1469
-
-1470
-00:24:30.000 --> 00:24:31.000
-This is cue #1470
-
-1471
-00:24:31.000 --> 00:24:32.000
-This is cue #1471
-
-1472
-00:24:32.000 --> 00:24:33.000
-This is cue #1472
-
-1473
-00:24:33.000 --> 00:24:34.000
-This is cue #1473
-
-1474
-00:24:34.000 --> 00:24:35.000
-This is cue #1474
-
-1475
-00:24:35.000 --> 00:24:36.000
-This is cue #1475
-
-1476
-00:24:36.000 --> 00:24:37.000
-This is cue #1476
-
-1477
-00:24:37.000 --> 00:24:38.000
-This is cue #1477
-
-1478
-00:24:38.000 --> 00:24:39.000
-This is cue #1478
-
-1479
-00:24:39.000 --> 00:24:40.000
-This is cue #1479
-
-1480
-00:24:40.000 --> 00:24:41.000
-This is cue #1480
-
-1481
-00:24:41.000 --> 00:24:42.000
-This is cue #1481
-
-1482
-00:24:42.000 --> 00:24:43.000
-This is cue #1482
-
-1483
-00:24:43.000 --> 00:24:44.000
-This is cue #1483
-
-1484
-00:24:44.000 --> 00:24:45.000
-This is cue #1484
-
-1485
-00:24:45.000 --> 00:24:46.000
-This is cue #1485
-
-1486
-00:24:46.000 --> 00:24:47.000
-This is cue #1486
-
-1487
-00:24:47.000 --> 00:24:48.000
-This is cue #1487
-
-1488
-00:24:48.000 --> 00:24:49.000
-This is cue #1488
-
-1489
-00:24:49.000 --> 00:24:50.000
-This is cue #1489
-
-1490
-00:24:50.000 --> 00:24:51.000
-This is cue #1490
-
-1491
-00:24:51.000 --> 00:24:52.000
-This is cue #1491
-
-1492
-00:24:52.000 --> 00:24:53.000
-This is cue #1492
-
-1493
-00:24:53.000 --> 00:24:54.000
-This is cue #1493
-
-1494
-00:24:54.000 --> 00:24:55.000
-This is cue #1494
-
-1495
-00:24:55.000 --> 00:24:56.000
-This is cue #1495
-
-1496
-00:24:56.000 --> 00:24:57.000
-This is cue #1496
-
-1497
-00:24:57.000 --> 00:24:58.000
-This is cue #1497
-
-1498
-00:24:58.000 --> 00:24:59.000
-This is cue #1498
-
-1499
-00:24:59.000 --> 00:25:00.000
-This is cue #1499
-
-1500
-00:25:00.000 --> 00:25:01.000
-This is cue #1500
-
-1501
-00:25:01.000 --> 00:25:02.000
-This is cue #1501
-
-1502
-00:25:02.000 --> 00:25:03.000
-This is cue #1502
-
-1503
-00:25:03.000 --> 00:25:04.000
-This is cue #1503
-
-1504
-00:25:04.000 --> 00:25:05.000
-This is cue #1504
-
-1505
-00:25:05.000 --> 00:25:06.000
-This is cue #1505
-
-1506
-00:25:06.000 --> 00:25:07.000
-This is cue #1506
-
-1507
-00:25:07.000 --> 00:25:08.000
-This is cue #1507
-
-1508
-00:25:08.000 --> 00:25:09.000
-This is cue #1508
-
-1509
-00:25:09.000 --> 00:25:10.000
-This is cue #1509
-
-1510
-00:25:10.000 --> 00:25:11.000
-This is cue #1510
-
-1511
-00:25:11.000 --> 00:25:12.000
-This is cue #1511
-
-1512
-00:25:12.000 --> 00:25:13.000
-This is cue #1512
-
-1513
-00:25:13.000 --> 00:25:14.000
-This is cue #1513
-
-1514
-00:25:14.000 --> 00:25:15.000
-This is cue #1514
-
-1515
-00:25:15.000 --> 00:25:16.000
-This is cue #1515
-
-1516
-00:25:16.000 --> 00:25:17.000
-This is cue #1516
-
-1517
-00:25:17.000 --> 00:25:18.000
-This is cue #1517
-
-1518
-00:25:18.000 --> 00:25:19.000
-This is cue #1518
-
-1519
-00:25:19.000 --> 00:25:20.000
-This is cue #1519
-
-1520
-00:25:20.000 --> 00:25:21.000
-This is cue #1520
-
-1521
-00:25:21.000 --> 00:25:22.000
-This is cue #1521
-
-1522
-00:25:22.000 --> 00:25:23.000
-This is cue #1522
-
-1523
-00:25:23.000 --> 00:25:24.000
-This is cue #1523
-
-1524
-00:25:24.000 --> 00:25:25.000
-This is cue #1524
-
-1525
-00:25:25.000 --> 00:25:26.000
-This is cue #1525
-
-1526
-00:25:26.000 --> 00:25:27.000
-This is cue #1526
-
-1527
-00:25:27.000 --> 00:25:28.000
-This is cue #1527
-
-1528
-00:25:28.000 --> 00:25:29.000
-This is cue #1528
-
-1529
-00:25:29.000 --> 00:25:30.000
-This is cue #1529
-
-1530
-00:25:30.000 --> 00:25:31.000
-This is cue #1530
-
-1531
-00:25:31.000 --> 00:25:32.000
-This is cue #1531
-
-1532
-00:25:32.000 --> 00:25:33.000
-This is cue #1532
-
-1533
-00:25:33.000 --> 00:25:34.000
-This is cue #1533
-
-1534
-00:25:34.000 --> 00:25:35.000
-This is cue #1534
-
-1535
-00:25:35.000 --> 00:25:36.000
-This is cue #1535
-
-1536
-00:25:36.000 --> 00:25:37.000
-This is cue #1536
-
-1537
-00:25:37.000 --> 00:25:38.000
-This is cue #1537
-
-1538
-00:25:38.000 --> 00:25:39.000
-This is cue #1538
-
-1539
-00:25:39.000 --> 00:25:40.000
-This is cue #1539
-
-1540
-00:25:40.000 --> 00:25:41.000
-This is cue #1540
-
-1541
-00:25:41.000 --> 00:25:42.000
-This is cue #1541
-
-1542
-00:25:42.000 --> 00:25:43.000
-This is cue #1542
-
-1543
-00:25:43.000 --> 00:25:44.000
-This is cue #1543
-
-1544
-00:25:44.000 --> 00:25:45.000
-This is cue #1544
-
-1545
-00:25:45.000 --> 00:25:46.000
-This is cue #1545
-
-1546
-00:25:46.000 --> 00:25:47.000
-This is cue #1546
-
-1547
-00:25:47.000 --> 00:25:48.000
-This is cue #1547
-
-1548
-00:25:48.000 --> 00:25:49.000
-This is cue #1548
-
-1549
-00:25:49.000 --> 00:25:50.000
-This is cue #1549
-
-1550
-00:25:50.000 --> 00:25:51.000
-This is cue #1550
-
-1551
-00:25:51.000 --> 00:25:52.000
-This is cue #1551
-
-1552
-00:25:52.000 --> 00:25:53.000
-This is cue #1552
-
-1553
-00:25:53.000 --> 00:25:54.000
-This is cue #1553
-
-1554
-00:25:54.000 --> 00:25:55.000
-This is cue #1554
-
-1555
-00:25:55.000 --> 00:25:56.000
-This is cue #1555
-
-1556
-00:25:56.000 --> 00:25:57.000
-This is cue #1556
-
-1557
-00:25:57.000 --> 00:25:58.000
-This is cue #1557
-
-1558
-00:25:58.000 --> 00:25:59.000
-This is cue #1558
-
-1559
-00:25:59.000 --> 00:26:00.000
-This is cue #1559
-
-1560
-00:26:00.000 --> 00:26:01.000
-This is cue #1560
-
-1561
-00:26:01.000 --> 00:26:02.000
-This is cue #1561
-
-1562
-00:26:02.000 --> 00:26:03.000
-This is cue #1562
-
-1563
-00:26:03.000 --> 00:26:04.000
-This is cue #1563
-
-1564
-00:26:04.000 --> 00:26:05.000
-This is cue #1564
-
-1565
-00:26:05.000 --> 00:26:06.000
-This is cue #1565
-
-1566
-00:26:06.000 --> 00:26:07.000
-This is cue #1566
-
-1567
-00:26:07.000 --> 00:26:08.000
-This is cue #1567
-
-1568
-00:26:08.000 --> 00:26:09.000
-This is cue #1568
-
-1569
-00:26:09.000 --> 00:26:10.000
-This is cue #1569
-
-1570
-00:26:10.000 --> 00:26:11.000
-This is cue #1570
-
-1571
-00:26:11.000 --> 00:26:12.000
-This is cue #1571
-
-1572
-00:26:12.000 --> 00:26:13.000
-This is cue #1572
-
-1573
-00:26:13.000 --> 00:26:14.000
-This is cue #1573
-
-1574
-00:26:14.000 --> 00:26:15.000
-This is cue #1574
-
-1575
-00:26:15.000 --> 00:26:16.000
-This is cue #1575
-
-1576
-00:26:16.000 --> 00:26:17.000
-This is cue #1576
-
-1577
-00:26:17.000 --> 00:26:18.000
-This is cue #1577
-
-1578
-00:26:18.000 --> 00:26:19.000
-This is cue #1578
-
-1579
-00:26:19.000 --> 00:26:20.000
-This is cue #1579
-
-1580
-00:26:20.000 --> 00:26:21.000
-This is cue #1580
-
-1581
-00:26:21.000 --> 00:26:22.000
-This is cue #1581
-
-1582
-00:26:22.000 --> 00:26:23.000
-This is cue #1582
-
-1583
-00:26:23.000 --> 00:26:24.000
-This is cue #1583
-
-1584
-00:26:24.000 --> 00:26:25.000
-This is cue #1584
-
-1585
-00:26:25.000 --> 00:26:26.000
-This is cue #1585
-
-1586
-00:26:26.000 --> 00:26:27.000
-This is cue #1586
-
-1587
-00:26:27.000 --> 00:26:28.000
-This is cue #1587
-
-1588
-00:26:28.000 --> 00:26:29.000
-This is cue #1588
-
-1589
-00:26:29.000 --> 00:26:30.000
-This is cue #1589
-
-1590
-00:26:30.000 --> 00:26:31.000
-This is cue #1590
-
-1591
-00:26:31.000 --> 00:26:32.000
-This is cue #1591
-
-1592
-00:26:32.000 --> 00:26:33.000
-This is cue #1592
-
-1593
-00:26:33.000 --> 00:26:34.000
-This is cue #1593
-
-1594
-00:26:34.000 --> 00:26:35.000
-This is cue #1594
-
-1595
-00:26:35.000 --> 00:26:36.000
-This is cue #1595
-
-1596
-00:26:36.000 --> 00:26:37.000
-This is cue #1596
-
-1597
-00:26:37.000 --> 00:26:38.000
-This is cue #1597
-
-1598
-00:26:38.000 --> 00:26:39.000
-This is cue #1598
-
-1599
-00:26:39.000 --> 00:26:40.000
-This is cue #1599
-
-1600
-00:26:40.000 --> 00:26:41.000
-This is cue #1600
-
-1601
-00:26:41.000 --> 00:26:42.000
-This is cue #1601
-
-1602
-00:26:42.000 --> 00:26:43.000
-This is cue #1602
-
-1603
-00:26:43.000 --> 00:26:44.000
-This is cue #1603
-
-1604
-00:26:44.000 --> 00:26:45.000
-This is cue #1604
-
-1605
-00:26:45.000 --> 00:26:46.000
-This is cue #1605
-
-1606
-00:26:46.000 --> 00:26:47.000
-This is cue #1606
-
-1607
-00:26:47.000 --> 00:26:48.000
-This is cue #1607
-
-1608
-00:26:48.000 --> 00:26:49.000
-This is cue #1608
-
-1609
-00:26:49.000 --> 00:26:50.000
-This is cue #1609
-
-1610
-00:26:50.000 --> 00:26:51.000
-This is cue #1610
-
-1611
-00:26:51.000 --> 00:26:52.000
-This is cue #1611
-
-1612
-00:26:52.000 --> 00:26:53.000
-This is cue #1612
-
-1613
-00:26:53.000 --> 00:26:54.000
-This is cue #1613
-
-1614
-00:26:54.000 --> 00:26:55.000
-This is cue #1614
-
-1615
-00:26:55.000 --> 00:26:56.000
-This is cue #1615
-
-1616
-00:26:56.000 --> 00:26:57.000
-This is cue #1616
-
-1617
-00:26:57.000 --> 00:26:58.000
-This is cue #1617
-
-1618
-00:26:58.000 --> 00:26:59.000
-This is cue #1618
-
-1619
-00:26:59.000 --> 00:27:00.000
-This is cue #1619
-
-1620
-00:27:00.000 --> 00:27:01.000
-This is cue #1620
-
-1621
-00:27:01.000 --> 00:27:02.000
-This is cue #1621
-
-1622
-00:27:02.000 --> 00:27:03.000
-This is cue #1622
-
-1623
-00:27:03.000 --> 00:27:04.000
-This is cue #1623
-
-1624
-00:27:04.000 --> 00:27:05.000
-This is cue #1624
-
-1625
-00:27:05.000 --> 00:27:06.000
-This is cue #1625
-
-1626
-00:27:06.000 --> 00:27:07.000
-This is cue #1626
-
-1627
-00:27:07.000 --> 00:27:08.000
-This is cue #1627
-
-1628
-00:27:08.000 --> 00:27:09.000
-This is cue #1628
-
-1629
-00:27:09.000 --> 00:27:10.000
-This is cue #1629
-
-1630
-00:27:10.000 --> 00:27:11.000
-This is cue #1630
-
-1631
-00:27:11.000 --> 00:27:12.000
-This is cue #1631
-
-1632
-00:27:12.000 --> 00:27:13.000
-This is cue #1632
-
-1633
-00:27:13.000 --> 00:27:14.000
-This is cue #1633
-
-1634
-00:27:14.000 --> 00:27:15.000
-This is cue #1634
-
-1635
-00:27:15.000 --> 00:27:16.000
-This is cue #1635
-
-1636
-00:27:16.000 --> 00:27:17.000
-This is cue #1636
-
-1637
-00:27:17.000 --> 00:27:18.000
-This is cue #1637
-
-1638
-00:27:18.000 --> 00:27:19.000
-This is cue #1638
-
-1639
-00:27:19.000 --> 00:27:20.000
-This is cue #1639
-
-1640
-00:27:20.000 --> 00:27:21.000
-This is cue #1640
-
-1641
-00:27:21.000 --> 00:27:22.000
-This is cue #1641
-
-1642
-00:27:22.000 --> 00:27:23.000
-This is cue #1642
-
-1643
-00:27:23.000 --> 00:27:24.000
-This is cue #1643
-
-1644
-00:27:24.000 --> 00:27:25.000
-This is cue #1644
-
-1645
-00:27:25.000 --> 00:27:26.000
-This is cue #1645
-
-1646
-00:27:26.000 --> 00:27:27.000
-This is cue #1646
-
-1647
-00:27:27.000 --> 00:27:28.000
-This is cue #1647
-
-1648
-00:27:28.000 --> 00:27:29.000
-This is cue #1648
-
-1649
-00:27:29.000 --> 00:27:30.000
-This is cue #1649
-
-1650
-00:27:30.000 --> 00:27:31.000
-This is cue #1650
-
-1651
-00:27:31.000 --> 00:27:32.000
-This is cue #1651
-
-1652
-00:27:32.000 --> 00:27:33.000
-This is cue #1652
-
-1653
-00:27:33.000 --> 00:27:34.000
-This is cue #1653
-
-1654
-00:27:34.000 --> 00:27:35.000
-This is cue #1654
-
-1655
-00:27:35.000 --> 00:27:36.000
-This is cue #1655
-
-1656
-00:27:36.000 --> 00:27:37.000
-This is cue #1656
-
-1657
-00:27:37.000 --> 00:27:38.000
-This is cue #1657
-
-1658
-00:27:38.000 --> 00:27:39.000
-This is cue #1658
-
-1659
-00:27:39.000 --> 00:27:40.000
-This is cue #1659
-
-1660
-00:27:40.000 --> 00:27:41.000
-This is cue #1660
-
-1661
-00:27:41.000 --> 00:27:42.000
-This is cue #1661
-
-1662
-00:27:42.000 --> 00:27:43.000
-This is cue #1662
-
-1663
-00:27:43.000 --> 00:27:44.000
-This is cue #1663
-
-1664
-00:27:44.000 --> 00:27:45.000
-This is cue #1664
-
-1665
-00:27:45.000 --> 00:27:46.000
-This is cue #1665
-
-1666
-00:27:46.000 --> 00:27:47.000
-This is cue #1666
-
-1667
-00:27:47.000 --> 00:27:48.000
-This is cue #1667
-
-1668
-00:27:48.000 --> 00:27:49.000
-This is cue #1668
-
-1669
-00:27:49.000 --> 00:27:50.000
-This is cue #1669
-
-1670
-00:27:50.000 --> 00:27:51.000
-This is cue #1670
-
-1671
-00:27:51.000 --> 00:27:52.000
-This is cue #1671
-
-1672
-00:27:52.000 --> 00:27:53.000
-This is cue #1672
-
-1673
-00:27:53.000 --> 00:27:54.000
-This is cue #1673
-
-1674
-00:27:54.000 --> 00:27:55.000
-This is cue #1674
-
-1675
-00:27:55.000 --> 00:27:56.000
-This is cue #1675
-
-1676
-00:27:56.000 --> 00:27:57.000
-This is cue #1676
-
-1677
-00:27:57.000 --> 00:27:58.000
-This is cue #1677
-
-1678
-00:27:58.000 --> 00:27:59.000
-This is cue #1678
-
-1679
-00:27:59.000 --> 00:28:00.000
-This is cue #1679
-
-1680
-00:28:00.000 --> 00:28:01.000
-This is cue #1680
-
-1681
-00:28:01.000 --> 00:28:02.000
-This is cue #1681
-
-1682
-00:28:02.000 --> 00:28:03.000
-This is cue #1682
-
-1683
-00:28:03.000 --> 00:28:04.000
-This is cue #1683
-
-1684
-00:28:04.000 --> 00:28:05.000
-This is cue #1684
-
-1685
-00:28:05.000 --> 00:28:06.000
-This is cue #1685
-
-1686
-00:28:06.000 --> 00:28:07.000
-This is cue #1686
-
-1687
-00:28:07.000 --> 00:28:08.000
-This is cue #1687
-
-1688
-00:28:08.000 --> 00:28:09.000
-This is cue #1688
-
-1689
-00:28:09.000 --> 00:28:10.000
-This is cue #1689
-
-1690
-00:28:10.000 --> 00:28:11.000
-This is cue #1690
-
-1691
-00:28:11.000 --> 00:28:12.000
-This is cue #1691
-
-1692
-00:28:12.000 --> 00:28:13.000
-This is cue #1692
-
-1693
-00:28:13.000 --> 00:28:14.000
-This is cue #1693
-
-1694
-00:28:14.000 --> 00:28:15.000
-This is cue #1694
-
-1695
-00:28:15.000 --> 00:28:16.000
-This is cue #1695
-
-1696
-00:28:16.000 --> 00:28:17.000
-This is cue #1696
-
-1697
-00:28:17.000 --> 00:28:18.000
-This is cue #1697
-
-1698
-00:28:18.000 --> 00:28:19.000
-This is cue #1698
-
-1699
-00:28:19.000 --> 00:28:20.000
-This is cue #1699
-
-1700
-00:28:20.000 --> 00:28:21.000
-This is cue #1700
-
-1701
-00:28:21.000 --> 00:28:22.000
-This is cue #1701
-
-1702
-00:28:22.000 --> 00:28:23.000
-This is cue #1702
-
-1703
-00:28:23.000 --> 00:28:24.000
-This is cue #1703
-
-1704
-00:28:24.000 --> 00:28:25.000
-This is cue #1704
-
-1705
-00:28:25.000 --> 00:28:26.000
-This is cue #1705
-
-1706
-00:28:26.000 --> 00:28:27.000
-This is cue #1706
-
-1707
-00:28:27.000 --> 00:28:28.000
-This is cue #1707
-
-1708
-00:28:28.000 --> 00:28:29.000
-This is cue #1708
-
-1709
-00:28:29.000 --> 00:28:30.000
-This is cue #1709
-
-1710
-00:28:30.000 --> 00:28:31.000
-This is cue #1710
-
-1711
-00:28:31.000 --> 00:28:32.000
-This is cue #1711
-
-1712
-00:28:32.000 --> 00:28:33.000
-This is cue #1712
-
-1713
-00:28:33.000 --> 00:28:34.000
-This is cue #1713
-
-1714
-00:28:34.000 --> 00:28:35.000
-This is cue #1714
-
-1715
-00:28:35.000 --> 00:28:36.000
-This is cue #1715
-
-1716
-00:28:36.000 --> 00:28:37.000
-This is cue #1716
-
-1717
-00:28:37.000 --> 00:28:38.000
-This is cue #1717
-
-1718
-00:28:38.000 --> 00:28:39.000
-This is cue #1718
-
-1719
-00:28:39.000 --> 00:28:40.000
-This is cue #1719
-
-1720
-00:28:40.000 --> 00:28:41.000
-This is cue #1720
-
-1721
-00:28:41.000 --> 00:28:42.000
-This is cue #1721
-
-1722
-00:28:42.000 --> 00:28:43.000
-This is cue #1722
-
-1723
-00:28:43.000 --> 00:28:44.000
-This is cue #1723
-
-1724
-00:28:44.000 --> 00:28:45.000
-This is cue #1724
-
-1725
-00:28:45.000 --> 00:28:46.000
-This is cue #1725
-
-1726
-00:28:46.000 --> 00:28:47.000
-This is cue #1726
-
-1727
-00:28:47.000 --> 00:28:48.000
-This is cue #1727
-
-1728
-00:28:48.000 --> 00:28:49.000
-This is cue #1728
-
-1729
-00:28:49.000 --> 00:28:50.000
-This is cue #1729
-
-1730
-00:28:50.000 --> 00:28:51.000
-This is cue #1730
-
-1731
-00:28:51.000 --> 00:28:52.000
-This is cue #1731
-
-1732
-00:28:52.000 --> 00:28:53.000
-This is cue #1732
-
-1733
-00:28:53.000 --> 00:28:54.000
-This is cue #1733
-
-1734
-00:28:54.000 --> 00:28:55.000
-This is cue #1734
-
-1735
-00:28:55.000 --> 00:28:56.000
-This is cue #1735
-
-1736
-00:28:56.000 --> 00:28:57.000
-This is cue #1736
-
-1737
-00:28:57.000 --> 00:28:58.000
-This is cue #1737
-
-1738
-00:28:58.000 --> 00:28:59.000
-This is cue #1738
-
-1739
-00:28:59.000 --> 00:29:00.000
-This is cue #1739
-
-1740
-00:29:00.000 --> 00:29:01.000
-This is cue #1740
-
-1741
-00:29:01.000 --> 00:29:02.000
-This is cue #1741
-
-1742
-00:29:02.000 --> 00:29:03.000
-This is cue #1742
-
-1743
-00:29:03.000 --> 00:29:04.000
-This is cue #1743
-
-1744
-00:29:04.000 --> 00:29:05.000
-This is cue #1744
-
-1745
-00:29:05.000 --> 00:29:06.000
-This is cue #1745
-
-1746
-00:29:06.000 --> 00:29:07.000
-This is cue #1746
-
-1747
-00:29:07.000 --> 00:29:08.000
-This is cue #1747
-
-1748
-00:29:08.000 --> 00:29:09.000
-This is cue #1748
-
-1749
-00:29:09.000 --> 00:29:10.000
-This is cue #1749
-
-1750
-00:29:10.000 --> 00:29:11.000
-This is cue #1750
-
-1751
-00:29:11.000 --> 00:29:12.000
-This is cue #1751
-
-1752
-00:29:12.000 --> 00:29:13.000
-This is cue #1752
-
-1753
-00:29:13.000 --> 00:29:14.000
-This is cue #1753
-
-1754
-00:29:14.000 --> 00:29:15.000
-This is cue #1754
-
-1755
-00:29:15.000 --> 00:29:16.000
-This is cue #1755
-
-1756
-00:29:16.000 --> 00:29:17.000
-This is cue #1756
-
-1757
-00:29:17.000 --> 00:29:18.000
-This is cue #1757
-
-1758
-00:29:18.000 --> 00:29:19.000
-This is cue #1758
-
-1759
-00:29:19.000 --> 00:29:20.000
-This is cue #1759
-
-1760
-00:29:20.000 --> 00:29:21.000
-This is cue #1760
-
-1761
-00:29:21.000 --> 00:29:22.000
-This is cue #1761
-
-1762
-00:29:22.000 --> 00:29:23.000
-This is cue #1762
-
-1763
-00:29:23.000 --> 00:29:24.000
-This is cue #1763
-
-1764
-00:29:24.000 --> 00:29:25.000
-This is cue #1764
-
-1765
-00:29:25.000 --> 00:29:26.000
-This is cue #1765
-
-1766
-00:29:26.000 --> 00:29:27.000
-This is cue #1766
-
-1767
-00:29:27.000 --> 00:29:28.000
-This is cue #1767
-
-1768
-00:29:28.000 --> 00:29:29.000
-This is cue #1768
-
-1769
-00:29:29.000 --> 00:29:30.000
-This is cue #1769
-
-1770
-00:29:30.000 --> 00:29:31.000
-This is cue #1770
-
-1771
-00:29:31.000 --> 00:29:32.000
-This is cue #1771
-
-1772
-00:29:32.000 --> 00:29:33.000
-This is cue #1772
-
-1773
-00:29:33.000 --> 00:29:34.000
-This is cue #1773
-
-1774
-00:29:34.000 --> 00:29:35.000
-This is cue #1774
-
-1775
-00:29:35.000 --> 00:29:36.000
-This is cue #1775
-
-1776
-00:29:36.000 --> 00:29:37.000
-This is cue #1776
-
-1777
-00:29:37.000 --> 00:29:38.000
-This is cue #1777
-
-1778
-00:29:38.000 --> 00:29:39.000
-This is cue #1778
-
-1779
-00:29:39.000 --> 00:29:40.000
-This is cue #1779
-
-1780
-00:29:40.000 --> 00:29:41.000
-This is cue #1780
-
-1781
-00:29:41.000 --> 00:29:42.000
-This is cue #1781
-
-1782
-00:29:42.000 --> 00:29:43.000
-This is cue #1782
-
-1783
-00:29:43.000 --> 00:29:44.000
-This is cue #1783
-
-1784
-00:29:44.000 --> 00:29:45.000
-This is cue #1784
-
-1785
-00:29:45.000 --> 00:29:46.000
-This is cue #1785
-
-1786
-00:29:46.000 --> 00:29:47.000
-This is cue #1786
-
-1787
-00:29:47.000 --> 00:29:48.000
-This is cue #1787
-
-1788
-00:29:48.000 --> 00:29:49.000
-This is cue #1788
-
-1789
-00:29:49.000 --> 00:29:50.000
-This is cue #1789
-
-1790
-00:29:50.000 --> 00:29:51.000
-This is cue #1790
-
-1791
-00:29:51.000 --> 00:29:52.000
-This is cue #1791
-
-1792
-00:29:52.000 --> 00:29:53.000
-This is cue #1792
-
-1793
-00:29:53.000 --> 00:29:54.000
-This is cue #1793
-
-1794
-00:29:54.000 --> 00:29:55.000
-This is cue #1794
-
-1795
-00:29:55.000 --> 00:29:56.000
-This is cue #1795
-
-1796
-00:29:56.000 --> 00:29:57.000
-This is cue #1796
-
-1797
-00:29:57.000 --> 00:29:58.000
-This is cue #1797
-
-1798
-00:29:58.000 --> 00:29:59.000
-This is cue #1798
-
-1799
-00:29:59.000 --> 00:30:00.000
-This is cue #1799
-
-1800
-00:30:00.000 --> 00:30:01.000
-This is cue #1800
-
-1801
-00:30:01.000 --> 00:30:02.000
-This is cue #1801
-
-1802
-00:30:02.000 --> 00:30:03.000
-This is cue #1802
-
-1803
-00:30:03.000 --> 00:30:04.000
-This is cue #1803
-
-1804
-00:30:04.000 --> 00:30:05.000
-This is cue #1804
-
-1805
-00:30:05.000 --> 00:30:06.000
-This is cue #1805
-
-1806
-00:30:06.000 --> 00:30:07.000
-This is cue #1806
-
-1807
-00:30:07.000 --> 00:30:08.000
-This is cue #1807
-
-1808
-00:30:08.000 --> 00:30:09.000
-This is cue #1808
-
-1809
-00:30:09.000 --> 00:30:10.000
-This is cue #1809
-
-1810
-00:30:10.000 --> 00:30:11.000
-This is cue #1810
-
-1811
-00:30:11.000 --> 00:30:12.000
-This is cue #1811
-
-1812
-00:30:12.000 --> 00:30:13.000
-This is cue #1812
-
-1813
-00:30:13.000 --> 00:30:14.000
-This is cue #1813
-
-1814
-00:30:14.000 --> 00:30:15.000
-This is cue #1814
-
-1815
-00:30:15.000 --> 00:30:16.000
-This is cue #1815
-
-1816
-00:30:16.000 --> 00:30:17.000
-This is cue #1816
-
-1817
-00:30:17.000 --> 00:30:18.000
-This is cue #1817
-
-1818
-00:30:18.000 --> 00:30:19.000
-This is cue #1818
-
-1819
-00:30:19.000 --> 00:30:20.000
-This is cue #1819
-
-1820
-00:30:20.000 --> 00:30:21.000
-This is cue #1820
-
-1821
-00:30:21.000 --> 00:30:22.000
-This is cue #1821
-
-1822
-00:30:22.000 --> 00:30:23.000
-This is cue #1822
-
-1823
-00:30:23.000 --> 00:30:24.000
-This is cue #1823
-
-1824
-00:30:24.000 --> 00:30:25.000
-This is cue #1824
-
-1825
-00:30:25.000 --> 00:30:26.000
-This is cue #1825
-
-1826
-00:30:26.000 --> 00:30:27.000
-This is cue #1826
-
-1827
-00:30:27.000 --> 00:30:28.000
-This is cue #1827
-
-1828
-00:30:28.000 --> 00:30:29.000
-This is cue #1828
-
-1829
-00:30:29.000 --> 00:30:30.000
-This is cue #1829
-
-1830
-00:30:30.000 --> 00:30:31.000
-This is cue #1830
-
-1831
-00:30:31.000 --> 00:30:32.000
-This is cue #1831
-
-1832
-00:30:32.000 --> 00:30:33.000
-This is cue #1832
-
-1833
-00:30:33.000 --> 00:30:34.000
-This is cue #1833
-
-1834
-00:30:34.000 --> 00:30:35.000
-This is cue #1834
-
-1835
-00:30:35.000 --> 00:30:36.000
-This is cue #1835
-
-1836
-00:30:36.000 --> 00:30:37.000
-This is cue #1836
-
-1837
-00:30:37.000 --> 00:30:38.000
-This is cue #1837
-
-1838
-00:30:38.000 --> 00:30:39.000
-This is cue #1838
-
-1839
-00:30:39.000 --> 00:30:40.000
-This is cue #1839
-
-1840
-00:30:40.000 --> 00:30:41.000
-This is cue #1840
-
-1841
-00:30:41.000 --> 00:30:42.000
-This is cue #1841
-
-1842
-00:30:42.000 --> 00:30:43.000
-This is cue #1842
-
-1843
-00:30:43.000 --> 00:30:44.000
-This is cue #1843
-
-1844
-00:30:44.000 --> 00:30:45.000
-This is cue #1844
-
-1845
-00:30:45.000 --> 00:30:46.000
-This is cue #1845
-
-1846
-00:30:46.000 --> 00:30:47.000
-This is cue #1846
-
-1847
-00:30:47.000 --> 00:30:48.000
-This is cue #1847
-
-1848
-00:30:48.000 --> 00:30:49.000
-This is cue #1848
-
-1849
-00:30:49.000 --> 00:30:50.000
-This is cue #1849
-
-1850
-00:30:50.000 --> 00:30:51.000
-This is cue #1850
-
-1851
-00:30:51.000 --> 00:30:52.000
-This is cue #1851
-
-1852
-00:30:52.000 --> 00:30:53.000
-This is cue #1852
-
-1853
-00:30:53.000 --> 00:30:54.000
-This is cue #1853
-
-1854
-00:30:54.000 --> 00:30:55.000
-This is cue #1854
-
-1855
-00:30:55.000 --> 00:30:56.000
-This is cue #1855
-
-1856
-00:30:56.000 --> 00:30:57.000
-This is cue #1856
-
-1857
-00:30:57.000 --> 00:30:58.000
-This is cue #1857
-
-1858
-00:30:58.000 --> 00:30:59.000
-This is cue #1858
-
-1859
-00:30:59.000 --> 00:31:00.000
-This is cue #1859
-
-1860
-00:31:00.000 --> 00:31:01.000
-This is cue #1860
-
-1861
-00:31:01.000 --> 00:31:02.000
-This is cue #1861
-
-1862
-00:31:02.000 --> 00:31:03.000
-This is cue #1862
-
-1863
-00:31:03.000 --> 00:31:04.000
-This is cue #1863
-
-1864
-00:31:04.000 --> 00:31:05.000
-This is cue #1864
-
-1865
-00:31:05.000 --> 00:31:06.000
-This is cue #1865
-
-1866
-00:31:06.000 --> 00:31:07.000
-This is cue #1866
-
-1867
-00:31:07.000 --> 00:31:08.000
-This is cue #1867
-
-1868
-00:31:08.000 --> 00:31:09.000
-This is cue #1868
-
-1869
-00:31:09.000 --> 00:31:10.000
-This is cue #1869
-
-1870
-00:31:10.000 --> 00:31:11.000
-This is cue #1870
-
-1871
-00:31:11.000 --> 00:31:12.000
-This is cue #1871
-
-1872
-00:31:12.000 --> 00:31:13.000
-This is cue #1872
-
-1873
-00:31:13.000 --> 00:31:14.000
-This is cue #1873
-
-1874
-00:31:14.000 --> 00:31:15.000
-This is cue #1874
-
-1875
-00:31:15.000 --> 00:31:16.000
-This is cue #1875
-
-1876
-00:31:16.000 --> 00:31:17.000
-This is cue #1876
-
-1877
-00:31:17.000 --> 00:31:18.000
-This is cue #1877
-
-1878
-00:31:18.000 --> 00:31:19.000
-This is cue #1878
-
-1879
-00:31:19.000 --> 00:31:20.000
-This is cue #1879
-
-1880
-00:31:20.000 --> 00:31:21.000
-This is cue #1880
-
-1881
-00:31:21.000 --> 00:31:22.000
-This is cue #1881
-
-1882
-00:31:22.000 --> 00:31:23.000
-This is cue #1882
-
-1883
-00:31:23.000 --> 00:31:24.000
-This is cue #1883
-
-1884
-00:31:24.000 --> 00:31:25.000
-This is cue #1884
-
-1885
-00:31:25.000 --> 00:31:26.000
-This is cue #1885
-
-1886
-00:31:26.000 --> 00:31:27.000
-This is cue #1886
-
-1887
-00:31:27.000 --> 00:31:28.000
-This is cue #1887
-
-1888
-00:31:28.000 --> 00:31:29.000
-This is cue #1888
-
-1889
-00:31:29.000 --> 00:31:30.000
-This is cue #1889
-
-1890
-00:31:30.000 --> 00:31:31.000
-This is cue #1890
-
-1891
-00:31:31.000 --> 00:31:32.000
-This is cue #1891
-
-1892
-00:31:32.000 --> 00:31:33.000
-This is cue #1892
-
-1893
-00:31:33.000 --> 00:31:34.000
-This is cue #1893
-
-1894
-00:31:34.000 --> 00:31:35.000
-This is cue #1894
-
-1895
-00:31:35.000 --> 00:31:36.000
-This is cue #1895
-
-1896
-00:31:36.000 --> 00:31:37.000
-This is cue #1896
-
-1897
-00:31:37.000 --> 00:31:38.000
-This is cue #1897
-
-1898
-00:31:38.000 --> 00:31:39.000
-This is cue #1898
-
-1899
-00:31:39.000 --> 00:31:40.000
-This is cue #1899
-
-1900
-00:31:40.000 --> 00:31:41.000
-This is cue #1900
-
-1901
-00:31:41.000 --> 00:31:42.000
-This is cue #1901
-
-1902
-00:31:42.000 --> 00:31:43.000
-This is cue #1902
-
-1903
-00:31:43.000 --> 00:31:44.000
-This is cue #1903
-
-1904
-00:31:44.000 --> 00:31:45.000
-This is cue #1904
-
-1905
-00:31:45.000 --> 00:31:46.000
-This is cue #1905
-
-1906
-00:31:46.000 --> 00:31:47.000
-This is cue #1906
-
-1907
-00:31:47.000 --> 00:31:48.000
-This is cue #1907
-
-1908
-00:31:48.000 --> 00:31:49.000
-This is cue #1908
-
-1909
-00:31:49.000 --> 00:31:50.000
-This is cue #1909
-
-1910
-00:31:50.000 --> 00:31:51.000
-This is cue #1910
-
-1911
-00:31:51.000 --> 00:31:52.000
-This is cue #1911
-
-1912
-00:31:52.000 --> 00:31:53.000
-This is cue #1912
-
-1913
-00:31:53.000 --> 00:31:54.000
-This is cue #1913
-
-1914
-00:31:54.000 --> 00:31:55.000
-This is cue #1914
-
-1915
-00:31:55.000 --> 00:31:56.000
-This is cue #1915
-
-1916
-00:31:56.000 --> 00:31:57.000
-This is cue #1916
-
-1917
-00:31:57.000 --> 00:31:58.000
-This is cue #1917
-
-1918
-00:31:58.000 --> 00:31:59.000
-This is cue #1918
-
-1919
-00:31:59.000 --> 00:32:00.000
-This is cue #1919
-
-1920
-00:32:00.000 --> 00:32:01.000
-This is cue #1920
-
-1921
-00:32:01.000 --> 00:32:02.000
-This is cue #1921
-
-1922
-00:32:02.000 --> 00:32:03.000
-This is cue #1922
-
-1923
-00:32:03.000 --> 00:32:04.000
-This is cue #1923
-
-1924
-00:32:04.000 --> 00:32:05.000
-This is cue #1924
-
-1925
-00:32:05.000 --> 00:32:06.000
-This is cue #1925
-
-1926
-00:32:06.000 --> 00:32:07.000
-This is cue #1926
-
-1927
-00:32:07.000 --> 00:32:08.000
-This is cue #1927
-
-1928
-00:32:08.000 --> 00:32:09.000
-This is cue #1928
-
-1929
-00:32:09.000 --> 00:32:10.000
-This is cue #1929
-
-1930
-00:32:10.000 --> 00:32:11.000
-This is cue #1930
-
-1931
-00:32:11.000 --> 00:32:12.000
-This is cue #1931
-
-1932
-00:32:12.000 --> 00:32:13.000
-This is cue #1932
-
-1933
-00:32:13.000 --> 00:32:14.000
-This is cue #1933
-
-1934
-00:32:14.000 --> 00:32:15.000
-This is cue #1934
-
-1935
-00:32:15.000 --> 00:32:16.000
-This is cue #1935
-
-1936
-00:32:16.000 --> 00:32:17.000
-This is cue #1936
-
-1937
-00:32:17.000 --> 00:32:18.000
-This is cue #1937
-
-1938
-00:32:18.000 --> 00:32:19.000
-This is cue #1938
-
-1939
-00:32:19.000 --> 00:32:20.000
-This is cue #1939
-
-1940
-00:32:20.000 --> 00:32:21.000
-This is cue #1940
-
-1941
-00:32:21.000 --> 00:32:22.000
-This is cue #1941
-
-1942
-00:32:22.000 --> 00:32:23.000
-This is cue #1942
-
-1943
-00:32:23.000 --> 00:32:24.000
-This is cue #1943
-
-1944
-00:32:24.000 --> 00:32:25.000
-This is cue #1944
-
-1945
-00:32:25.000 --> 00:32:26.000
-This is cue #1945
-
-1946
-00:32:26.000 --> 00:32:27.000
-This is cue #1946
-
-1947
-00:32:27.000 --> 00:32:28.000
-This is cue #1947
-
-1948
-00:32:28.000 --> 00:32:29.000
-This is cue #1948
-
-1949
-00:32:29.000 --> 00:32:30.000
-This is cue #1949
-
-1950
-00:32:30.000 --> 00:32:31.000
-This is cue #1950
-
-1951
-00:32:31.000 --> 00:32:32.000
-This is cue #1951
-
-1952
-00:32:32.000 --> 00:32:33.000
-This is cue #1952
-
-1953
-00:32:33.000 --> 00:32:34.000
-This is cue #1953
-
-1954
-00:32:34.000 --> 00:32:35.000
-This is cue #1954
-
-1955
-00:32:35.000 --> 00:32:36.000
-This is cue #1955
-
-1956
-00:32:36.000 --> 00:32:37.000
-This is cue #1956
-
-1957
-00:32:37.000 --> 00:32:38.000
-This is cue #1957
-
-1958
-00:32:38.000 --> 00:32:39.000
-This is cue #1958
-
-1959
-00:32:39.000 --> 00:32:40.000
-This is cue #1959
-
-1960
-00:32:40.000 --> 00:32:41.000
-This is cue #1960
-
-1961
-00:32:41.000 --> 00:32:42.000
-This is cue #1961
-
-1962
-00:32:42.000 --> 00:32:43.000
-This is cue #1962
-
-1963
-00:32:43.000 --> 00:32:44.000
-This is cue #1963
-
-1964
-00:32:44.000 --> 00:32:45.000
-This is cue #1964
-
-1965
-00:32:45.000 --> 00:32:46.000
-This is cue #1965
-
-1966
-00:32:46.000 --> 00:32:47.000
-This is cue #1966
-
-1967
-00:32:47.000 --> 00:32:48.000
-This is cue #1967
-
-1968
-00:32:48.000 --> 00:32:49.000
-This is cue #1968
-
-1969
-00:32:49.000 --> 00:32:50.000
-This is cue #1969
-
-1970
-00:32:50.000 --> 00:32:51.000
-This is cue #1970
-
-1971
-00:32:51.000 --> 00:32:52.000
-This is cue #1971
-
-1972
-00:32:52.000 --> 00:32:53.000
-This is cue #1972
-
-1973
-00:32:53.000 --> 00:32:54.000
-This is cue #1973
-
-1974
-00:32:54.000 --> 00:32:55.000
-This is cue #1974
-
-1975
-00:32:55.000 --> 00:32:56.000
-This is cue #1975
-
-1976
-00:32:56.000 --> 00:32:57.000
-This is cue #1976
-
-1977
-00:32:57.000 --> 00:32:58.000
-This is cue #1977
-
-1978
-00:32:58.000 --> 00:32:59.000
-This is cue #1978
-
-1979
-00:32:59.000 --> 00:33:00.000
-This is cue #1979
-
-1980
-00:33:00.000 --> 00:33:01.000
-This is cue #1980
-
-1981
-00:33:01.000 --> 00:33:02.000
-This is cue #1981
-
-1982
-00:33:02.000 --> 00:33:03.000
-This is cue #1982
-
-1983
-00:33:03.000 --> 00:33:04.000
-This is cue #1983
-
-1984
-00:33:04.000 --> 00:33:05.000
-This is cue #1984
-
-1985
-00:33:05.000 --> 00:33:06.000
-This is cue #1985
-
-1986
-00:33:06.000 --> 00:33:07.000
-This is cue #1986
-
-1987
-00:33:07.000 --> 00:33:08.000
-This is cue #1987
-
-1988
-00:33:08.000 --> 00:33:09.000
-This is cue #1988
-
-1989
-00:33:09.000 --> 00:33:10.000
-This is cue #1989
-
-1990
-00:33:10.000 --> 00:33:11.000
-This is cue #1990
-
-1991
-00:33:11.000 --> 00:33:12.000
-This is cue #1991
-
-1992
-00:33:12.000 --> 00:33:13.000
-This is cue #1992
-
-1993
-00:33:13.000 --> 00:33:14.000
-This is cue #1993
-
-1994
-00:33:14.000 --> 00:33:15.000
-This is cue #1994
-
-1995
-00:33:15.000 --> 00:33:16.000
-This is cue #1995
-
-1996
-00:33:16.000 --> 00:33:17.000
-This is cue #1996
-
-1997
-00:33:17.000 --> 00:33:18.000
-This is cue #1997
-
-1998
-00:33:18.000 --> 00:33:19.000
-This is cue #1998
-
-1999
-00:33:19.000 --> 00:33:20.000
-This is cue #1999
-
-2000
-00:33:20.000 --> 00:33:21.000
-This is cue #2000
-
-2001
-00:33:21.000 --> 00:33:22.000
-This is cue #2001
-
-2002
-00:33:22.000 --> 00:33:23.000
-This is cue #2002
-
-2003
-00:33:23.000 --> 00:33:24.000
-This is cue #2003
-
-2004
-00:33:24.000 --> 00:33:25.000
-This is cue #2004
-
-2005
-00:33:25.000 --> 00:33:26.000
-This is cue #2005
-
-2006
-00:33:26.000 --> 00:33:27.000
-This is cue #2006
-
-2007
-00:33:27.000 --> 00:33:28.000
-This is cue #2007
-
-2008
-00:33:28.000 --> 00:33:29.000
-This is cue #2008
-
-2009
-00:33:29.000 --> 00:33:30.000
-This is cue #2009
-
-2010
-00:33:30.000 --> 00:33:31.000
-This is cue #2010
-
-2011
-00:33:31.000 --> 00:33:32.000
-This is cue #2011
-
-2012
-00:33:32.000 --> 00:33:33.000
-This is cue #2012
-
-2013
-00:33:33.000 --> 00:33:34.000
-This is cue #2013
-
-2014
-00:33:34.000 --> 00:33:35.000
-This is cue #2014
-
-2015
-00:33:35.000 --> 00:33:36.000
-This is cue #2015
-
-2016
-00:33:36.000 --> 00:33:37.000
-This is cue #2016
-
-2017
-00:33:37.000 --> 00:33:38.000
-This is cue #2017
-
-2018
-00:33:38.000 --> 00:33:39.000
-This is cue #2018
-
-2019
-00:33:39.000 --> 00:33:40.000
-This is cue #2019
-
-2020
-00:33:40.000 --> 00:33:41.000
-This is cue #2020
-
-2021
-00:33:41.000 --> 00:33:42.000
-This is cue #2021
-
-2022
-00:33:42.000 --> 00:33:43.000
-This is cue #2022
-
-2023
-00:33:43.000 --> 00:33:44.000
-This is cue #2023
-
-2024
-00:33:44.000 --> 00:33:45.000
-This is cue #2024
-
-2025
-00:33:45.000 --> 00:33:46.000
-This is cue #2025
-
-2026
-00:33:46.000 --> 00:33:47.000
-This is cue #2026
-
-2027
-00:33:47.000 --> 00:33:48.000
-This is cue #2027
-
-2028
-00:33:48.000 --> 00:33:49.000
-This is cue #2028
-
-2029
-00:33:49.000 --> 00:33:50.000
-This is cue #2029
-
-2030
-00:33:50.000 --> 00:33:51.000
-This is cue #2030
-
-2031
-00:33:51.000 --> 00:33:52.000
-This is cue #2031
-
-2032
-00:33:52.000 --> 00:33:53.000
-This is cue #2032
-
-2033
-00:33:53.000 --> 00:33:54.000
-This is cue #2033
-
-2034
-00:33:54.000 --> 00:33:55.000
-This is cue #2034
-
-2035
-00:33:55.000 --> 00:33:56.000
-This is cue #2035
-
-2036
-00:33:56.000 --> 00:33:57.000
-This is cue #2036
-
-2037
-00:33:57.000 --> 00:33:58.000
-This is cue #2037
-
-2038
-00:33:58.000 --> 00:33:59.000
-This is cue #2038
-
-2039
-00:33:59.000 --> 00:34:00.000
-This is cue #2039
-
-2040
-00:34:00.000 --> 00:34:01.000
-This is cue #2040
-
-2041
-00:34:01.000 --> 00:34:02.000
-This is cue #2041
-
-2042
-00:34:02.000 --> 00:34:03.000
-This is cue #2042
-
-2043
-00:34:03.000 --> 00:34:04.000
-This is cue #2043
-
-2044
-00:34:04.000 --> 00:34:05.000
-This is cue #2044
-
-2045
-00:34:05.000 --> 00:34:06.000
-This is cue #2045
-
-2046
-00:34:06.000 --> 00:34:07.000
-This is cue #2046
-
-2047
-00:34:07.000 --> 00:34:08.000
-This is cue #2047
-
-2048
-00:34:08.000 --> 00:34:09.000
-This is cue #2048
-
-2049
-00:34:09.000 --> 00:34:10.000
-This is cue #2049
-
-2050
-00:34:10.000 --> 00:34:11.000
-This is cue #2050
-
-2051
-00:34:11.000 --> 00:34:12.000
-This is cue #2051
-
-2052
-00:34:12.000 --> 00:34:13.000
-This is cue #2052
-
-2053
-00:34:13.000 --> 00:34:14.000
-This is cue #2053
-
-2054
-00:34:14.000 --> 00:34:15.000
-This is cue #2054
-
-2055
-00:34:15.000 --> 00:34:16.000
-This is cue #2055
-
-2056
-00:34:16.000 --> 00:34:17.000
-This is cue #2056
-
-2057
-00:34:17.000 --> 00:34:18.000
-This is cue #2057
-
-2058
-00:34:18.000 --> 00:34:19.000
-This is cue #2058
-
-2059
-00:34:19.000 --> 00:34:20.000
-This is cue #2059
-
-2060
-00:34:20.000 --> 00:34:21.000
-This is cue #2060
-
-2061
-00:34:21.000 --> 00:34:22.000
-This is cue #2061
-
-2062
-00:34:22.000 --> 00:34:23.000
-This is cue #2062
-
-2063
-00:34:23.000 --> 00:34:24.000
-This is cue #2063
-
-2064
-00:34:24.000 --> 00:34:25.000
-This is cue #2064
-
-2065
-00:34:25.000 --> 00:34:26.000
-This is cue #2065
-
-2066
-00:34:26.000 --> 00:34:27.000
-This is cue #2066
-
-2067
-00:34:27.000 --> 00:34:28.000
-This is cue #2067
-
-2068
-00:34:28.000 --> 00:34:29.000
-This is cue #2068
-
-2069
-00:34:29.000 --> 00:34:30.000
-This is cue #2069
-
-2070
-00:34:30.000 --> 00:34:31.000
-This is cue #2070
-
-2071
-00:34:31.000 --> 00:34:32.000
-This is cue #2071
-
-2072
-00:34:32.000 --> 00:34:33.000
-This is cue #2072
-
-2073
-00:34:33.000 --> 00:34:34.000
-This is cue #2073
-
-2074
-00:34:34.000 --> 00:34:35.000
-This is cue #2074
-
-2075
-00:34:35.000 --> 00:34:36.000
-This is cue #2075
-
-2076
-00:34:36.000 --> 00:34:37.000
-This is cue #2076
-
-2077
-00:34:37.000 --> 00:34:38.000
-This is cue #2077
-
-2078
-00:34:38.000 --> 00:34:39.000
-This is cue #2078
-
-2079
-00:34:39.000 --> 00:34:40.000
-This is cue #2079
-
-2080
-00:34:40.000 --> 00:34:41.000
-This is cue #2080
-
-2081
-00:34:41.000 --> 00:34:42.000
-This is cue #2081
-
-2082
-00:34:42.000 --> 00:34:43.000
-This is cue #2082
-
-2083
-00:34:43.000 --> 00:34:44.000
-This is cue #2083
-
-2084
-00:34:44.000 --> 00:34:45.000
-This is cue #2084
-
-2085
-00:34:45.000 --> 00:34:46.000
-This is cue #2085
-
-2086
-00:34:46.000 --> 00:34:47.000
-This is cue #2086
-
-2087
-00:34:47.000 --> 00:34:48.000
-This is cue #2087
-
-2088
-00:34:48.000 --> 00:34:49.000
-This is cue #2088
-
-2089
-00:34:49.000 --> 00:34:50.000
-This is cue #2089
-
-2090
-00:34:50.000 --> 00:34:51.000
-This is cue #2090
-
-2091
-00:34:51.000 --> 00:34:52.000
-This is cue #2091
-
-2092
-00:34:52.000 --> 00:34:53.000
-This is cue #2092
-
-2093
-00:34:53.000 --> 00:34:54.000
-This is cue #2093
-
-2094
-00:34:54.000 --> 00:34:55.000
-This is cue #2094
-
-2095
-00:34:55.000 --> 00:34:56.000
-This is cue #2095
-
-2096
-00:34:56.000 --> 00:34:57.000
-This is cue #2096
-
-2097
-00:34:57.000 --> 00:34:58.000
-This is cue #2097
-
-2098
-00:34:58.000 --> 00:34:59.000
-This is cue #2098
-
-2099
-00:34:59.000 --> 00:35:00.000
-This is cue #2099
-
-2100
-00:35:00.000 --> 00:35:01.000
-This is cue #2100
-
-2101
-00:35:01.000 --> 00:35:02.000
-This is cue #2101
-
-2102
-00:35:02.000 --> 00:35:03.000
-This is cue #2102
-
-2103
-00:35:03.000 --> 00:35:04.000
-This is cue #2103
-
-2104
-00:35:04.000 --> 00:35:05.000
-This is cue #2104
-
-2105
-00:35:05.000 --> 00:35:06.000
-This is cue #2105
-
-2106
-00:35:06.000 --> 00:35:07.000
-This is cue #2106
-
-2107
-00:35:07.000 --> 00:35:08.000
-This is cue #2107
-
-2108
-00:35:08.000 --> 00:35:09.000
-This is cue #2108
-
-2109
-00:35:09.000 --> 00:35:10.000
-This is cue #2109
-
-2110
-00:35:10.000 --> 00:35:11.000
-This is cue #2110
-
-2111
-00:35:11.000 --> 00:35:12.000
-This is cue #2111
-
-2112
-00:35:12.000 --> 00:35:13.000
-This is cue #2112
-
-2113
-00:35:13.000 --> 00:35:14.000
-This is cue #2113
-
-2114
-00:35:14.000 --> 00:35:15.000
-This is cue #2114
-
-2115
-00:35:15.000 --> 00:35:16.000
-This is cue #2115
-
-2116
-00:35:16.000 --> 00:35:17.000
-This is cue #2116
-
-2117
-00:35:17.000 --> 00:35:18.000
-This is cue #2117
-
-2118
-00:35:18.000 --> 00:35:19.000
-This is cue #2118
-
-2119
-00:35:19.000 --> 00:35:20.000
-This is cue #2119
-
-2120
-00:35:20.000 --> 00:35:21.000
-This is cue #2120
-
-2121
-00:35:21.000 --> 00:35:22.000
-This is cue #2121
-
-2122
-00:35:22.000 --> 00:35:23.000
-This is cue #2122
-
-2123
-00:35:23.000 --> 00:35:24.000
-This is cue #2123
-
-2124
-00:35:24.000 --> 00:35:25.000
-This is cue #2124
-
-2125
-00:35:25.000 --> 00:35:26.000
-This is cue #2125
-
-2126
-00:35:26.000 --> 00:35:27.000
-This is cue #2126
-
-2127
-00:35:27.000 --> 00:35:28.000
-This is cue #2127
-
-2128
-00:35:28.000 --> 00:35:29.000
-This is cue #2128
-
-2129
-00:35:29.000 --> 00:35:30.000
-This is cue #2129
-
-2130
-00:35:30.000 --> 00:35:31.000
-This is cue #2130
-
-2131
-00:35:31.000 --> 00:35:32.000
-This is cue #2131
-
-2132
-00:35:32.000 --> 00:35:33.000
-This is cue #2132
-
-2133
-00:35:33.000 --> 00:35:34.000
-This is cue #2133
-
-2134
-00:35:34.000 --> 00:35:35.000
-This is cue #2134
-
-2135
-00:35:35.000 --> 00:35:36.000
-This is cue #2135
-
-2136
-00:35:36.000 --> 00:35:37.000
-This is cue #2136
-
-2137
-00:35:37.000 --> 00:35:38.000
-This is cue #2137
-
-2138
-00:35:38.000 --> 00:35:39.000
-This is cue #2138
-
-2139
-00:35:39.000 --> 00:35:40.000
-This is cue #2139
-
-2140
-00:35:40.000 --> 00:35:41.000
-This is cue #2140
-
-2141
-00:35:41.000 --> 00:35:42.000
-This is cue #2141
-
-2142
-00:35:42.000 --> 00:35:43.000
-This is cue #2142
-
-2143
-00:35:43.000 --> 00:35:44.000
-This is cue #2143
-
-2144
-00:35:44.000 --> 00:35:45.000
-This is cue #2144
-
-2145
-00:35:45.000 --> 00:35:46.000
-This is cue #2145
-
-2146
-00:35:46.000 --> 00:35:47.000
-This is cue #2146
-
-2147
-00:35:47.000 --> 00:35:48.000
-This is cue #2147
-
-2148
-00:35:48.000 --> 00:35:49.000
-This is cue #2148
-
-2149
-00:35:49.000 --> 00:35:50.000
-This is cue #2149
-
-2150
-00:35:50.000 --> 00:35:51.000
-This is cue #2150
-
-2151
-00:35:51.000 --> 00:35:52.000
-This is cue #2151
-
-2152
-00:35:52.000 --> 00:35:53.000
-This is cue #2152
-
-2153
-00:35:53.000 --> 00:35:54.000
-This is cue #2153
-
-2154
-00:35:54.000 --> 00:35:55.000
-This is cue #2154
-
-2155
-00:35:55.000 --> 00:35:56.000
-This is cue #2155
-
-2156
-00:35:56.000 --> 00:35:57.000
-This is cue #2156
-
-2157
-00:35:57.000 --> 00:35:58.000
-This is cue #2157
-
-2158
-00:35:58.000 --> 00:35:59.000
-This is cue #2158
-
-2159
-00:35:59.000 --> 00:36:00.000
-This is cue #2159
-
-2160
-00:36:00.000 --> 00:36:01.000
-This is cue #2160
-
-2161
-00:36:01.000 --> 00:36:02.000
-This is cue #2161
-
-2162
-00:36:02.000 --> 00:36:03.000
-This is cue #2162
-
-2163
-00:36:03.000 --> 00:36:04.000
-This is cue #2163
-
-2164
-00:36:04.000 --> 00:36:05.000
-This is cue #2164
-
-2165
-00:36:05.000 --> 00:36:06.000
-This is cue #2165
-
-2166
-00:36:06.000 --> 00:36:07.000
-This is cue #2166
-
-2167
-00:36:07.000 --> 00:36:08.000
-This is cue #2167
-
-2168
-00:36:08.000 --> 00:36:09.000
-This is cue #2168
-
-2169
-00:36:09.000 --> 00:36:10.000
-This is cue #2169
-
-2170
-00:36:10.000 --> 00:36:11.000
-This is cue #2170
-
-2171
-00:36:11.000 --> 00:36:12.000
-This is cue #2171
-
-2172
-00:36:12.000 --> 00:36:13.000
-This is cue #2172
-
-2173
-00:36:13.000 --> 00:36:14.000
-This is cue #2173
-
-2174
-00:36:14.000 --> 00:36:15.000
-This is cue #2174
-
-2175
-00:36:15.000 --> 00:36:16.000
-This is cue #2175
-
-2176
-00:36:16.000 --> 00:36:17.000
-This is cue #2176
-
-2177
-00:36:17.000 --> 00:36:18.000
-This is cue #2177
-
-2178
-00:36:18.000 --> 00:36:19.000
-This is cue #2178
-
-2179
-00:36:19.000 --> 00:36:20.000
-This is cue #2179
-
-2180
-00:36:20.000 --> 00:36:21.000
-This is cue #2180
-
-2181
-00:36:21.000 --> 00:36:22.000
-This is cue #2181
-
-2182
-00:36:22.000 --> 00:36:23.000
-This is cue #2182
-
-2183
-00:36:23.000 --> 00:36:24.000
-This is cue #2183
-
-2184
-00:36:24.000 --> 00:36:25.000
-This is cue #2184
-
-2185
-00:36:25.000 --> 00:36:26.000
-This is cue #2185
-
-2186
-00:36:26.000 --> 00:36:27.000
-This is cue #2186
-
-2187
-00:36:27.000 --> 00:36:28.000
-This is cue #2187
-
-2188
-00:36:28.000 --> 00:36:29.000
-This is cue #2188
-
-2189
-00:36:29.000 --> 00:36:30.000
-This is cue #2189
-
-2190
-00:36:30.000 --> 00:36:31.000
-This is cue #2190
-
-2191
-00:36:31.000 --> 00:36:32.000
-This is cue #2191
-
-2192
-00:36:32.000 --> 00:36:33.000
-This is cue #2192
-
-2193
-00:36:33.000 --> 00:36:34.000
-This is cue #2193
-
-2194
-00:36:34.000 --> 00:36:35.000
-This is cue #2194
-
-2195
-00:36:35.000 --> 00:36:36.000
-This is cue #2195
-
-2196
-00:36:36.000 --> 00:36:37.000
-This is cue #2196
-
-2197
-00:36:37.000 --> 00:36:38.000
-This is cue #2197
-
-2198
-00:36:38.000 --> 00:36:39.000
-This is cue #2198
-
-2199
-00:36:39.000 --> 00:36:40.000
-This is cue #2199
-
-2200
-00:36:40.000 --> 00:36:41.000
-This is cue #2200
-
-2201
-00:36:41.000 --> 00:36:42.000
-This is cue #2201
-
-2202
-00:36:42.000 --> 00:36:43.000
-This is cue #2202
-
-2203
-00:36:43.000 --> 00:36:44.000
-This is cue #2203
-
-2204
-00:36:44.000 --> 00:36:45.000
-This is cue #2204
-
-2205
-00:36:45.000 --> 00:36:46.000
-This is cue #2205
-
-2206
-00:36:46.000 --> 00:36:47.000
-This is cue #2206
-
-2207
-00:36:47.000 --> 00:36:48.000
-This is cue #2207
-
-2208
-00:36:48.000 --> 00:36:49.000
-This is cue #2208
-
-2209
-00:36:49.000 --> 00:36:50.000
-This is cue #2209
-
-2210
-00:36:50.000 --> 00:36:51.000
-This is cue #2210
-
-2211
-00:36:51.000 --> 00:36:52.000
-This is cue #2211
-
-2212
-00:36:52.000 --> 00:36:53.000
-This is cue #2212
-
-2213
-00:36:53.000 --> 00:36:54.000
-This is cue #2213
-
-2214
-00:36:54.000 --> 00:36:55.000
-This is cue #2214
-
-2215
-00:36:55.000 --> 00:36:56.000
-This is cue #2215
-
-2216
-00:36:56.000 --> 00:36:57.000
-This is cue #2216
-
-2217
-00:36:57.000 --> 00:36:58.000
-This is cue #2217
-
-2218
-00:36:58.000 --> 00:36:59.000
-This is cue #2218
-
-2219
-00:36:59.000 --> 00:37:00.000
-This is cue #2219
-
-2220
-00:37:00.000 --> 00:37:01.000
-This is cue #2220
-
-2221
-00:37:01.000 --> 00:37:02.000
-This is cue #2221
-
-2222
-00:37:02.000 --> 00:37:03.000
-This is cue #2222
-
-2223
-00:37:03.000 --> 00:37:04.000
-This is cue #2223
-
-2224
-00:37:04.000 --> 00:37:05.000
-This is cue #2224
-
-2225
-00:37:05.000 --> 00:37:06.000
-This is cue #2225
-
-2226
-00:37:06.000 --> 00:37:07.000
-This is cue #2226
-
-2227
-00:37:07.000 --> 00:37:08.000
-This is cue #2227
-
-2228
-00:37:08.000 --> 00:37:09.000
-This is cue #2228
-
-2229
-00:37:09.000 --> 00:37:10.000
-This is cue #2229
-
-2230
-00:37:10.000 --> 00:37:11.000
-This is cue #2230
-
-2231
-00:37:11.000 --> 00:37:12.000
-This is cue #2231
-
-2232
-00:37:12.000 --> 00:37:13.000
-This is cue #2232
-
-2233
-00:37:13.000 --> 00:37:14.000
-This is cue #2233
-
-2234
-00:37:14.000 --> 00:37:15.000
-This is cue #2234
-
-2235
-00:37:15.000 --> 00:37:16.000
-This is cue #2235
-
-2236
-00:37:16.000 --> 00:37:17.000
-This is cue #2236
-
-2237
-00:37:17.000 --> 00:37:18.000
-This is cue #2237
-
-2238
-00:37:18.000 --> 00:37:19.000
-This is cue #2238
-
-2239
-00:37:19.000 --> 00:37:20.000
-This is cue #2239
-
-2240
-00:37:20.000 --> 00:37:21.000
-This is cue #2240
-
-2241
-00:37:21.000 --> 00:37:22.000
-This is cue #2241
-
-2242
-00:37:22.000 --> 00:37:23.000
-This is cue #2242
-
-2243
-00:37:23.000 --> 00:37:24.000
-This is cue #2243
-
-2244
-00:37:24.000 --> 00:37:25.000
-This is cue #2244
-
-2245
-00:37:25.000 --> 00:37:26.000
-This is cue #2245
-
-2246
-00:37:26.000 --> 00:37:27.000
-This is cue #2246
-
-2247
-00:37:27.000 --> 00:37:28.000
-This is cue #2247
-
-2248
-00:37:28.000 --> 00:37:29.000
-This is cue #2248
-
-2249
-00:37:29.000 --> 00:37:30.000
-This is cue #2249
-
-2250
-00:37:30.000 --> 00:37:31.000
-This is cue #2250
-
-2251
-00:37:31.000 --> 00:37:32.000
-This is cue #2251
-
-2252
-00:37:32.000 --> 00:37:33.000
-This is cue #2252
-
-2253
-00:37:33.000 --> 00:37:34.000
-This is cue #2253
-
-2254
-00:37:34.000 --> 00:37:35.000
-This is cue #2254
-
-2255
-00:37:35.000 --> 00:37:36.000
-This is cue #2255
-
-2256
-00:37:36.000 --> 00:37:37.000
-This is cue #2256
-
-2257
-00:37:37.000 --> 00:37:38.000
-This is cue #2257
-
-2258
-00:37:38.000 --> 00:37:39.000
-This is cue #2258
-
-2259
-00:37:39.000 --> 00:37:40.000
-This is cue #2259
-
-2260
-00:37:40.000 --> 00:37:41.000
-This is cue #2260
-
-2261
-00:37:41.000 --> 00:37:42.000
-This is cue #2261
-
-2262
-00:37:42.000 --> 00:37:43.000
-This is cue #2262
-
-2263
-00:37:43.000 --> 00:37:44.000
-This is cue #2263
-
-2264
-00:37:44.000 --> 00:37:45.000
-This is cue #2264
-
-2265
-00:37:45.000 --> 00:37:46.000
-This is cue #2265
-
-2266
-00:37:46.000 --> 00:37:47.000
-This is cue #2266
-
-2267
-00:37:47.000 --> 00:37:48.000
-This is cue #2267
-
-2268
-00:37:48.000 --> 00:37:49.000
-This is cue #2268
-
-2269
-00:37:49.000 --> 00:37:50.000
-This is cue #2269
-
-2270
-00:37:50.000 --> 00:37:51.000
-This is cue #2270
-
-2271
-00:37:51.000 --> 00:37:52.000
-This is cue #2271
-
-2272
-00:37:52.000 --> 00:37:53.000
-This is cue #2272
-
-2273
-00:37:53.000 --> 00:37:54.000
-This is cue #2273
-
-2274
-00:37:54.000 --> 00:37:55.000
-This is cue #2274
-
-2275
-00:37:55.000 --> 00:37:56.000
-This is cue #2275
-
-2276
-00:37:56.000 --> 00:37:57.000
-This is cue #2276
-
-2277
-00:37:57.000 --> 00:37:58.000
-This is cue #2277
-
-2278
-00:37:58.000 --> 00:37:59.000
-This is cue #2278
-
-2279
-00:37:59.000 --> 00:38:00.000
-This is cue #2279
-
-2280
-00:38:00.000 --> 00:38:01.000
-This is cue #2280
-
-2281
-00:38:01.000 --> 00:38:02.000
-This is cue #2281
-
-2282
-00:38:02.000 --> 00:38:03.000
-This is cue #2282
-
-2283
-00:38:03.000 --> 00:38:04.000
-This is cue #2283
-
-2284
-00:38:04.000 --> 00:38:05.000
-This is cue #2284
-
-2285
-00:38:05.000 --> 00:38:06.000
-This is cue #2285
-
-2286
-00:38:06.000 --> 00:38:07.000
-This is cue #2286
-
-2287
-00:38:07.000 --> 00:38:08.000
-This is cue #2287
-
-2288
-00:38:08.000 --> 00:38:09.000
-This is cue #2288
-
-2289
-00:38:09.000 --> 00:38:10.000
-This is cue #2289
-
-2290
-00:38:10.000 --> 00:38:11.000
-This is cue #2290
-
-2291
-00:38:11.000 --> 00:38:12.000
-This is cue #2291
-
-2292
-00:38:12.000 --> 00:38:13.000
-This is cue #2292
-
-2293
-00:38:13.000 --> 00:38:14.000
-This is cue #2293
-
-2294
-00:38:14.000 --> 00:38:15.000
-This is cue #2294
-
-2295
-00:38:15.000 --> 00:38:16.000
-This is cue #2295
-
-2296
-00:38:16.000 --> 00:38:17.000
-This is cue #2296
-
-2297
-00:38:17.000 --> 00:38:18.000
-This is cue #2297
-
-2298
-00:38:18.000 --> 00:38:19.000
-This is cue #2298
-
-2299
-00:38:19.000 --> 00:38:20.000
-This is cue #2299
-
-2300
-00:38:20.000 --> 00:38:21.000
-This is cue #2300
-
-2301
-00:38:21.000 --> 00:38:22.000
-This is cue #2301
-
-2302
-00:38:22.000 --> 00:38:23.000
-This is cue #2302
-
-2303
-00:38:23.000 --> 00:38:24.000
-This is cue #2303
-
-2304
-00:38:24.000 --> 00:38:25.000
-This is cue #2304
-
-2305
-00:38:25.000 --> 00:38:26.000
-This is cue #2305
-
-2306
-00:38:26.000 --> 00:38:27.000
-This is cue #2306
-
-2307
-00:38:27.000 --> 00:38:28.000
-This is cue #2307
-
-2308
-00:38:28.000 --> 00:38:29.000
-This is cue #2308
-
-2309
-00:38:29.000 --> 00:38:30.000
-This is cue #2309
-
-2310
-00:38:30.000 --> 00:38:31.000
-This is cue #2310
-
-2311
-00:38:31.000 --> 00:38:32.000
-This is cue #2311
-
-2312
-00:38:32.000 --> 00:38:33.000
-This is cue #2312
-
-2313
-00:38:33.000 --> 00:38:34.000
-This is cue #2313
-
-2314
-00:38:34.000 --> 00:38:35.000
-This is cue #2314
-
-2315
-00:38:35.000 --> 00:38:36.000
-This is cue #2315
-
-2316
-00:38:36.000 --> 00:38:37.000
-This is cue #2316
-
-2317
-00:38:37.000 --> 00:38:38.000
-This is cue #2317
-
-2318
-00:38:38.000 --> 00:38:39.000
-This is cue #2318
-
-2319
-00:38:39.000 --> 00:38:40.000
-This is cue #2319
-
-2320
-00:38:40.000 --> 00:38:41.000
-This is cue #2320
-
-2321
-00:38:41.000 --> 00:38:42.000
-This is cue #2321
-
-2322
-00:38:42.000 --> 00:38:43.000
-This is cue #2322
-
-2323
-00:38:43.000 --> 00:38:44.000
-This is cue #2323
-
-2324
-00:38:44.000 --> 00:38:45.000
-This is cue #2324
-
-2325
-00:38:45.000 --> 00:38:46.000
-This is cue #2325
-
-2326
-00:38:46.000 --> 00:38:47.000
-This is cue #2326
-
-2327
-00:38:47.000 --> 00:38:48.000
-This is cue #2327
-
-2328
-00:38:48.000 --> 00:38:49.000
-This is cue #2328
-
-2329
-00:38:49.000 --> 00:38:50.000
-This is cue #2329
-
-2330
-00:38:50.000 --> 00:38:51.000
-This is cue #2330
-
-2331
-00:38:51.000 --> 00:38:52.000
-This is cue #2331
-
-2332
-00:38:52.000 --> 00:38:53.000
-This is cue #2332
-
-2333
-00:38:53.000 --> 00:38:54.000
-This is cue #2333
-
-2334
-00:38:54.000 --> 00:38:55.000
-This is cue #2334
-
-2335
-00:38:55.000 --> 00:38:56.000
-This is cue #2335
-
-2336
-00:38:56.000 --> 00:38:57.000
-This is cue #2336
-
-2337
-00:38:57.000 --> 00:38:58.000
-This is cue #2337
-
-2338
-00:38:58.000 --> 00:38:59.000
-This is cue #2338
-
-2339
-00:38:59.000 --> 00:39:00.000
-This is cue #2339
-
-2340
-00:39:00.000 --> 00:39:01.000
-This is cue #2340
-
-2341
-00:39:01.000 --> 00:39:02.000
-This is cue #2341
-
-2342
-00:39:02.000 --> 00:39:03.000
-This is cue #2342
-
-2343
-00:39:03.000 --> 00:39:04.000
-This is cue #2343
-
-2344
-00:39:04.000 --> 00:39:05.000
-This is cue #2344
-
-2345
-00:39:05.000 --> 00:39:06.000
-This is cue #2345
-
-2346
-00:39:06.000 --> 00:39:07.000
-This is cue #2346
-
-2347
-00:39:07.000 --> 00:39:08.000
-This is cue #2347
-
-2348
-00:39:08.000 --> 00:39:09.000
-This is cue #2348
-
-2349
-00:39:09.000 --> 00:39:10.000
-This is cue #2349
-
-2350
-00:39:10.000 --> 00:39:11.000
-This is cue #2350
-
-2351
-00:39:11.000 --> 00:39:12.000
-This is cue #2351
-
-2352
-00:39:12.000 --> 00:39:13.000
-This is cue #2352
-
-2353
-00:39:13.000 --> 00:39:14.000
-This is cue #2353
-
-2354
-00:39:14.000 --> 00:39:15.000
-This is cue #2354
-
-2355
-00:39:15.000 --> 00:39:16.000
-This is cue #2355
-
-2356
-00:39:16.000 --> 00:39:17.000
-This is cue #2356
-
-2357
-00:39:17.000 --> 00:39:18.000
-This is cue #2357
-
-2358
-00:39:18.000 --> 00:39:19.000
-This is cue #2358
-
-2359
-00:39:19.000 --> 00:39:20.000
-This is cue #2359
-
-2360
-00:39:20.000 --> 00:39:21.000
-This is cue #2360
-
-2361
-00:39:21.000 --> 00:39:22.000
-This is cue #2361
-
-2362
-00:39:22.000 --> 00:39:23.000
-This is cue #2362
-
-2363
-00:39:23.000 --> 00:39:24.000
-This is cue #2363
-
-2364
-00:39:24.000 --> 00:39:25.000
-This is cue #2364
-
-2365
-00:39:25.000 --> 00:39:26.000
-This is cue #2365
-
-2366
-00:39:26.000 --> 00:39:27.000
-This is cue #2366
-
-2367
-00:39:27.000 --> 00:39:28.000
-This is cue #2367
-
-2368
-00:39:28.000 --> 00:39:29.000
-This is cue #2368
-
-2369
-00:39:29.000 --> 00:39:30.000
-This is cue #2369
-
-2370
-00:39:30.000 --> 00:39:31.000
-This is cue #2370
-
-2371
-00:39:31.000 --> 00:39:32.000
-This is cue #2371
-
-2372
-00:39:32.000 --> 00:39:33.000
-This is cue #2372
-
-2373
-00:39:33.000 --> 00:39:34.000
-This is cue #2373
-
-2374
-00:39:34.000 --> 00:39:35.000
-This is cue #2374
-
-2375
-00:39:35.000 --> 00:39:36.000
-This is cue #2375
-
-2376
-00:39:36.000 --> 00:39:37.000
-This is cue #2376
-
-2377
-00:39:37.000 --> 00:39:38.000
-This is cue #2377
-
-2378
-00:39:38.000 --> 00:39:39.000
-This is cue #2378
-
-2379
-00:39:39.000 --> 00:39:40.000
-This is cue #2379
-
-2380
-00:39:40.000 --> 00:39:41.000
-This is cue #2380
-
-2381
-00:39:41.000 --> 00:39:42.000
-This is cue #2381
-
-2382
-00:39:42.000 --> 00:39:43.000
-This is cue #2382
-
-2383
-00:39:43.000 --> 00:39:44.000
-This is cue #2383
-
-2384
-00:39:44.000 --> 00:39:45.000
-This is cue #2384
-
-2385
-00:39:45.000 --> 00:39:46.000
-This is cue #2385
-
-2386
-00:39:46.000 --> 00:39:47.000
-This is cue #2386
-
-2387
-00:39:47.000 --> 00:39:48.000
-This is cue #2387
-
-2388
-00:39:48.000 --> 00:39:49.000
-This is cue #2388
-
-2389
-00:39:49.000 --> 00:39:50.000
-This is cue #2389
-
-2390
-00:39:50.000 --> 00:39:51.000
-This is cue #2390
-
-2391
-00:39:51.000 --> 00:39:52.000
-This is cue #2391
-
-2392
-00:39:52.000 --> 00:39:53.000
-This is cue #2392
-
-2393
-00:39:53.000 --> 00:39:54.000
-This is cue #2393
-
-2394
-00:39:54.000 --> 00:39:55.000
-This is cue #2394
-
-2395
-00:39:55.000 --> 00:39:56.000
-This is cue #2395
-
-2396
-00:39:56.000 --> 00:39:57.000
-This is cue #2396
-
-2397
-00:39:57.000 --> 00:39:58.000
-This is cue #2397
-
-2398
-00:39:58.000 --> 00:39:59.000
-This is cue #2398
-
-2399
-00:39:59.000 --> 00:40:00.000
-This is cue #2399
-
-2400
-00:40:00.000 --> 00:40:01.000
-This is cue #2400
-
-2401
-00:40:01.000 --> 00:40:02.000
-This is cue #2401
-
-2402
-00:40:02.000 --> 00:40:03.000
-This is cue #2402
-
-2403
-00:40:03.000 --> 00:40:04.000
-This is cue #2403
-
-2404
-00:40:04.000 --> 00:40:05.000
-This is cue #2404
-
-2405
-00:40:05.000 --> 00:40:06.000
-This is cue #2405
-
-2406
-00:40:06.000 --> 00:40:07.000
-This is cue #2406
-
-2407
-00:40:07.000 --> 00:40:08.000
-This is cue #2407
-
-2408
-00:40:08.000 --> 00:40:09.000
-This is cue #2408
-
-2409
-00:40:09.000 --> 00:40:10.000
-This is cue #2409
-
-2410
-00:40:10.000 --> 00:40:11.000
-This is cue #2410
-
-2411
-00:40:11.000 --> 00:40:12.000
-This is cue #2411
-
-2412
-00:40:12.000 --> 00:40:13.000
-This is cue #2412
-
-2413
-00:40:13.000 --> 00:40:14.000
-This is cue #2413
-
-2414
-00:40:14.000 --> 00:40:15.000
-This is cue #2414
-
-2415
-00:40:15.000 --> 00:40:16.000
-This is cue #2415
-
-2416
-00:40:16.000 --> 00:40:17.000
-This is cue #2416
-
-2417
-00:40:17.000 --> 00:40:18.000
-This is cue #2417
-
-2418
-00:40:18.000 --> 00:40:19.000
-This is cue #2418
-
-2419
-00:40:19.000 --> 00:40:20.000
-This is cue #2419
-
-2420
-00:40:20.000 --> 00:40:21.000
-This is cue #2420
-
-2421
-00:40:21.000 --> 00:40:22.000
-This is cue #2421
-
-2422
-00:40:22.000 --> 00:40:23.000
-This is cue #2422
-
-2423
-00:40:23.000 --> 00:40:24.000
-This is cue #2423
-
-2424
-00:40:24.000 --> 00:40:25.000
-This is cue #2424
-
-2425
-00:40:25.000 --> 00:40:26.000
-This is cue #2425
-
-2426
-00:40:26.000 --> 00:40:27.000
-This is cue #2426
-
-2427
-00:40:27.000 --> 00:40:28.000
-This is cue #2427
-
-2428
-00:40:28.000 --> 00:40:29.000
-This is cue #2428
-
-2429
-00:40:29.000 --> 00:40:30.000
-This is cue #2429
-
-2430
-00:40:30.000 --> 00:40:31.000
-This is cue #2430
-
-2431
-00:40:31.000 --> 00:40:32.000
-This is cue #2431
-
-2432
-00:40:32.000 --> 00:40:33.000
-This is cue #2432
-
-2433
-00:40:33.000 --> 00:40:34.000
-This is cue #2433
-
-2434
-00:40:34.000 --> 00:40:35.000
-This is cue #2434
-
-2435
-00:40:35.000 --> 00:40:36.000
-This is cue #2435
-
-2436
-00:40:36.000 --> 00:40:37.000
-This is cue #2436
-
-2437
-00:40:37.000 --> 00:40:38.000
-This is cue #2437
-
-2438
-00:40:38.000 --> 00:40:39.000
-This is cue #2438
-
-2439
-00:40:39.000 --> 00:40:40.000
-This is cue #2439
-
-2440
-00:40:40.000 --> 00:40:41.000
-This is cue #2440
-
-2441
-00:40:41.000 --> 00:40:42.000
-This is cue #2441
-
-2442
-00:40:42.000 --> 00:40:43.000
-This is cue #2442
-
-2443
-00:40:43.000 --> 00:40:44.000
-This is cue #2443
-
-2444
-00:40:44.000 --> 00:40:45.000
-This is cue #2444
-
-2445
-00:40:45.000 --> 00:40:46.000
-This is cue #2445
-
-2446
-00:40:46.000 --> 00:40:47.000
-This is cue #2446
-
-2447
-00:40:47.000 --> 00:40:48.000
-This is cue #2447
-
-2448
-00:40:48.000 --> 00:40:49.000
-This is cue #2448
-
-2449
-00:40:49.000 --> 00:40:50.000
-This is cue #2449
-
-2450
-00:40:50.000 --> 00:40:51.000
-This is cue #2450
-
-2451
-00:40:51.000 --> 00:40:52.000
-This is cue #2451
-
-2452
-00:40:52.000 --> 00:40:53.000
-This is cue #2452
-
-2453
-00:40:53.000 --> 00:40:54.000
-This is cue #2453
-
-2454
-00:40:54.000 --> 00:40:55.000
-This is cue #2454
-
-2455
-00:40:55.000 --> 00:40:56.000
-This is cue #2455
-
-2456
-00:40:56.000 --> 00:40:57.000
-This is cue #2456
-
-2457
-00:40:57.000 --> 00:40:58.000
-This is cue #2457
-
-2458
-00:40:58.000 --> 00:40:59.000
-This is cue #2458
-
-2459
-00:40:59.000 --> 00:41:00.000
-This is cue #2459
-
-2460
-00:41:00.000 --> 00:41:01.000
-This is cue #2460
-
-2461
-00:41:01.000 --> 00:41:02.000
-This is cue #2461
-
-2462
-00:41:02.000 --> 00:41:03.000
-This is cue #2462
-
-2463
-00:41:03.000 --> 00:41:04.000
-This is cue #2463
-
-2464
-00:41:04.000 --> 00:41:05.000
-This is cue #2464
-
-2465
-00:41:05.000 --> 00:41:06.000
-This is cue #2465
-
-2466
-00:41:06.000 --> 00:41:07.000
-This is cue #2466
-
-2467
-00:41:07.000 --> 00:41:08.000
-This is cue #2467
-
-2468
-00:41:08.000 --> 00:41:09.000
-This is cue #2468
-
-2469
-00:41:09.000 --> 00:41:10.000
-This is cue #2469
-
-2470
-00:41:10.000 --> 00:41:11.000
-This is cue #2470
-
-2471
-00:41:11.000 --> 00:41:12.000
-This is cue #2471
-
-2472
-00:41:12.000 --> 00:41:13.000
-This is cue #2472
-
-2473
-00:41:13.000 --> 00:41:14.000
-This is cue #2473
-
-2474
-00:41:14.000 --> 00:41:15.000
-This is cue #2474
-
-2475
-00:41:15.000 --> 00:41:16.000
-This is cue #2475
-
-2476
-00:41:16.000 --> 00:41:17.000
-This is cue #2476
-
-2477
-00:41:17.000 --> 00:41:18.000
-This is cue #2477
-
-2478
-00:41:18.000 --> 00:41:19.000
-This is cue #2478
-
-2479
-00:41:19.000 --> 00:41:20.000
-This is cue #2479
-
-2480
-00:41:20.000 --> 00:41:21.000
-This is cue #2480
-
-2481
-00:41:21.000 --> 00:41:22.000
-This is cue #2481
-
-2482
-00:41:22.000 --> 00:41:23.000
-This is cue #2482
-
-2483
-00:41:23.000 --> 00:41:24.000
-This is cue #2483
-
-2484
-00:41:24.000 --> 00:41:25.000
-This is cue #2484
-
-2485
-00:41:25.000 --> 00:41:26.000
-This is cue #2485
-
-2486
-00:41:26.000 --> 00:41:27.000
-This is cue #2486
-
-2487
-00:41:27.000 --> 00:41:28.000
-This is cue #2487
-
-2488
-00:41:28.000 --> 00:41:29.000
-This is cue #2488
-
-2489
-00:41:29.000 --> 00:41:30.000
-This is cue #2489
-
-2490
-00:41:30.000 --> 00:41:31.000
-This is cue #2490
-
-2491
-00:41:31.000 --> 00:41:32.000
-This is cue #2491
-
-2492
-00:41:32.000 --> 00:41:33.000
-This is cue #2492
-
-2493
-00:41:33.000 --> 00:41:34.000
-This is cue #2493
-
-2494
-00:41:34.000 --> 00:41:35.000
-This is cue #2494
-
-2495
-00:41:35.000 --> 00:41:36.000
-This is cue #2495
-
-2496
-00:41:36.000 --> 00:41:37.000
-This is cue #2496
-
-2497
-00:41:37.000 --> 00:41:38.000
-This is cue #2497
-
-2498
-00:41:38.000 --> 00:41:39.000
-This is cue #2498
-
-2499
-00:41:39.000 --> 00:41:40.000
-This is cue #2499
-
-2500
-00:41:40.000 --> 00:41:41.000
-This is cue #2500
-
-2501
-00:41:41.000 --> 00:41:42.000
-This is cue #2501
-
-2502
-00:41:42.000 --> 00:41:43.000
-This is cue #2502
-
-2503
-00:41:43.000 --> 00:41:44.000
-This is cue #2503
-
-2504
-00:41:44.000 --> 00:41:45.000
-This is cue #2504
-
-2505
-00:41:45.000 --> 00:41:46.000
-This is cue #2505
-
-2506
-00:41:46.000 --> 00:41:47.000
-This is cue #2506
-
-2507
-00:41:47.000 --> 00:41:48.000
-This is cue #2507
-
-2508
-00:41:48.000 --> 00:41:49.000
-This is cue #2508
-
-2509
-00:41:49.000 --> 00:41:50.000
-This is cue #2509
-
-2510
-00:41:50.000 --> 00:41:51.000
-This is cue #2510
-
-2511
-00:41:51.000 --> 00:41:52.000
-This is cue #2511
-
-2512
-00:41:52.000 --> 00:41:53.000
-This is cue #2512
-
-2513
-00:41:53.000 --> 00:41:54.000
-This is cue #2513
-
-2514
-00:41:54.000 --> 00:41:55.000
-This is cue #2514
-
-2515
-00:41:55.000 --> 00:41:56.000
-This is cue #2515
-
-2516
-00:41:56.000 --> 00:41:57.000
-This is cue #2516
-
-2517
-00:41:57.000 --> 00:41:58.000
-This is cue #2517
-
-2518
-00:41:58.000 --> 00:41:59.000
-This is cue #2518
-
-2519
-00:41:59.000 --> 00:42:00.000
-This is cue #2519
-
-2520
-00:42:00.000 --> 00:42:01.000
-This is cue #2520
-
-2521
-00:42:01.000 --> 00:42:02.000
-This is cue #2521
-
-2522
-00:42:02.000 --> 00:42:03.000
-This is cue #2522
-
-2523
-00:42:03.000 --> 00:42:04.000
-This is cue #2523
-
-2524
-00:42:04.000 --> 00:42:05.000
-This is cue #2524
-
-2525
-00:42:05.000 --> 00:42:06.000
-This is cue #2525
-
-2526
-00:42:06.000 --> 00:42:07.000
-This is cue #2526
-
-2527
-00:42:07.000 --> 00:42:08.000
-This is cue #2527
-
-2528
-00:42:08.000 --> 00:42:09.000
-This is cue #2528
-
-2529
-00:42:09.000 --> 00:42:10.000
-This is cue #2529
-
-2530
-00:42:10.000 --> 00:42:11.000
-This is cue #2530
-
-2531
-00:42:11.000 --> 00:42:12.000
-This is cue #2531
-
-2532
-00:42:12.000 --> 00:42:13.000
-This is cue #2532
-
-2533
-00:42:13.000 --> 00:42:14.000
-This is cue #2533
-
-2534
-00:42:14.000 --> 00:42:15.000
-This is cue #2534
-
-2535
-00:42:15.000 --> 00:42:16.000
-This is cue #2535
-
-2536
-00:42:16.000 --> 00:42:17.000
-This is cue #2536
-
-2537
-00:42:17.000 --> 00:42:18.000
-This is cue #2537
-
-2538
-00:42:18.000 --> 00:42:19.000
-This is cue #2538
-
-2539
-00:42:19.000 --> 00:42:20.000
-This is cue #2539
-
-2540
-00:42:20.000 --> 00:42:21.000
-This is cue #2540
-
-2541
-00:42:21.000 --> 00:42:22.000
-This is cue #2541
-
-2542
-00:42:22.000 --> 00:42:23.000
-This is cue #2542
-
-2543
-00:42:23.000 --> 00:42:24.000
-This is cue #2543
-
-2544
-00:42:24.000 --> 00:42:25.000
-This is cue #2544
-
-2545
-00:42:25.000 --> 00:42:26.000
-This is cue #2545
-
-2546
-00:42:26.000 --> 00:42:27.000
-This is cue #2546
-
-2547
-00:42:27.000 --> 00:42:28.000
-This is cue #2547
-
-2548
-00:42:28.000 --> 00:42:29.000
-This is cue #2548
-
-2549
-00:42:29.000 --> 00:42:30.000
-This is cue #2549
-
-2550
-00:42:30.000 --> 00:42:31.000
-This is cue #2550
-
-2551
-00:42:31.000 --> 00:42:32.000
-This is cue #2551
-
-2552
-00:42:32.000 --> 00:42:33.000
-This is cue #2552
-
-2553
-00:42:33.000 --> 00:42:34.000
-This is cue #2553
-
-2554
-00:42:34.000 --> 00:42:35.000
-This is cue #2554
-
-2555
-00:42:35.000 --> 00:42:36.000
-This is cue #2555
-
-2556
-00:42:36.000 --> 00:42:37.000
-This is cue #2556
-
-2557
-00:42:37.000 --> 00:42:38.000
-This is cue #2557
-
-2558
-00:42:38.000 --> 00:42:39.000
-This is cue #2558
-
-2559
-00:42:39.000 --> 00:42:40.000
-This is cue #2559
-
-2560
-00:42:40.000 --> 00:42:41.000
-This is cue #2560
-
-2561
-00:42:41.000 --> 00:42:42.000
-This is cue #2561
-
-2562
-00:42:42.000 --> 00:42:43.000
-This is cue #2562
-
-2563
-00:42:43.000 --> 00:42:44.000
-This is cue #2563
-
-2564
-00:42:44.000 --> 00:42:45.000
-This is cue #2564
-
-2565
-00:42:45.000 --> 00:42:46.000
-This is cue #2565
-
-2566
-00:42:46.000 --> 00:42:47.000
-This is cue #2566
-
-2567
-00:42:47.000 --> 00:42:48.000
-This is cue #2567
-
-2568
-00:42:48.000 --> 00:42:49.000
-This is cue #2568
-
-2569
-00:42:49.000 --> 00:42:50.000
-This is cue #2569
-
-2570
-00:42:50.000 --> 00:42:51.000
-This is cue #2570
-
-2571
-00:42:51.000 --> 00:42:52.000
-This is cue #2571
-
-2572
-00:42:52.000 --> 00:42:53.000
-This is cue #2572
-
-2573
-00:42:53.000 --> 00:42:54.000
-This is cue #2573
-
-2574
-00:42:54.000 --> 00:42:55.000
-This is cue #2574
-
-2575
-00:42:55.000 --> 00:42:56.000
-This is cue #2575
-
-2576
-00:42:56.000 --> 00:42:57.000
-This is cue #2576
-
-2577
-00:42:57.000 --> 00:42:58.000
-This is cue #2577
-
-2578
-00:42:58.000 --> 00:42:59.000
-This is cue #2578
-
-2579
-00:42:59.000 --> 00:43:00.000
-This is cue #2579
-
-2580
-00:43:00.000 --> 00:43:01.000
-This is cue #2580
-
-2581
-00:43:01.000 --> 00:43:02.000
-This is cue #2581
-
-2582
-00:43:02.000 --> 00:43:03.000
-This is cue #2582
-
-2583
-00:43:03.000 --> 00:43:04.000
-This is cue #2583
-
-2584
-00:43:04.000 --> 00:43:05.000
-This is cue #2584
-
-2585
-00:43:05.000 --> 00:43:06.000
-This is cue #2585
-
-2586
-00:43:06.000 --> 00:43:07.000
-This is cue #2586
-
-2587
-00:43:07.000 --> 00:43:08.000
-This is cue #2587
-
-2588
-00:43:08.000 --> 00:43:09.000
-This is cue #2588
-
-2589
-00:43:09.000 --> 00:43:10.000
-This is cue #2589
-
-2590
-00:43:10.000 --> 00:43:11.000
-This is cue #2590
-
-2591
-00:43:11.000 --> 00:43:12.000
-This is cue #2591
-
-2592
-00:43:12.000 --> 00:43:13.000
-This is cue #2592
-
-2593
-00:43:13.000 --> 00:43:14.000
-This is cue #2593
-
-2594
-00:43:14.000 --> 00:43:15.000
-This is cue #2594
-
-2595
-00:43:15.000 --> 00:43:16.000
-This is cue #2595
-
-2596
-00:43:16.000 --> 00:43:17.000
-This is cue #2596
-
-2597
-00:43:17.000 --> 00:43:18.000
-This is cue #2597
-
-2598
-00:43:18.000 --> 00:43:19.000
-This is cue #2598
-
-2599
-00:43:19.000 --> 00:43:20.000
-This is cue #2599
-
-2600
-00:43:20.000 --> 00:43:21.000
-This is cue #2600
-
-2601
-00:43:21.000 --> 00:43:22.000
-This is cue #2601
-
-2602
-00:43:22.000 --> 00:43:23.000
-This is cue #2602
-
-2603
-00:43:23.000 --> 00:43:24.000
-This is cue #2603
-
-2604
-00:43:24.000 --> 00:43:25.000
-This is cue #2604
-
-2605
-00:43:25.000 --> 00:43:26.000
-This is cue #2605
-
-2606
-00:43:26.000 --> 00:43:27.000
-This is cue #2606
-
-2607
-00:43:27.000 --> 00:43:28.000
-This is cue #2607
-
-2608
-00:43:28.000 --> 00:43:29.000
-This is cue #2608
-
-2609
-00:43:29.000 --> 00:43:30.000
-This is cue #2609
-
-2610
-00:43:30.000 --> 00:43:31.000
-This is cue #2610
-
-2611
-00:43:31.000 --> 00:43:32.000
-This is cue #2611
-
-2612
-00:43:32.000 --> 00:43:33.000
-This is cue #2612
-
-2613
-00:43:33.000 --> 00:43:34.000
-This is cue #2613
-
-2614
-00:43:34.000 --> 00:43:35.000
-This is cue #2614
-
-2615
-00:43:35.000 --> 00:43:36.000
-This is cue #2615
-
-2616
-00:43:36.000 --> 00:43:37.000
-This is cue #2616
-
-2617
-00:43:37.000 --> 00:43:38.000
-This is cue #2617
-
-2618
-00:43:38.000 --> 00:43:39.000
-This is cue #2618
-
-2619
-00:43:39.000 --> 00:43:40.000
-This is cue #2619
-
-2620
-00:43:40.000 --> 00:43:41.000
-This is cue #2620
-
-2621
-00:43:41.000 --> 00:43:42.000
-This is cue #2621
-
-2622
-00:43:42.000 --> 00:43:43.000
-This is cue #2622
-
-2623
-00:43:43.000 --> 00:43:44.000
-This is cue #2623
-
-2624
-00:43:44.000 --> 00:43:45.000
-This is cue #2624
-
-2625
-00:43:45.000 --> 00:43:46.000
-This is cue #2625
-
-2626
-00:43:46.000 --> 00:43:47.000
-This is cue #2626
-
-2627
-00:43:47.000 --> 00:43:48.000
-This is cue #2627
-
-2628
-00:43:48.000 --> 00:43:49.000
-This is cue #2628
-
-2629
-00:43:49.000 --> 00:43:50.000
-This is cue #2629
-
-2630
-00:43:50.000 --> 00:43:51.000
-This is cue #2630
-
-2631
-00:43:51.000 --> 00:43:52.000
-This is cue #2631
-
-2632
-00:43:52.000 --> 00:43:53.000
-This is cue #2632
-
-2633
-00:43:53.000 --> 00:43:54.000
-This is cue #2633
-
-2634
-00:43:54.000 --> 00:43:55.000
-This is cue #2634
-
-2635
-00:43:55.000 --> 00:43:56.000
-This is cue #2635
-
-2636
-00:43:56.000 --> 00:43:57.000
-This is cue #2636
-
-2637
-00:43:57.000 --> 00:43:58.000
-This is cue #2637
-
-2638
-00:43:58.000 --> 00:43:59.000
-This is cue #2638
-
-2639
-00:43:59.000 --> 00:44:00.000
-This is cue #2639
-
-2640
-00:44:00.000 --> 00:44:01.000
-This is cue #2640
-
-2641
-00:44:01.000 --> 00:44:02.000
-This is cue #2641
-
-2642
-00:44:02.000 --> 00:44:03.000
-This is cue #2642
-
-2643
-00:44:03.000 --> 00:44:04.000
-This is cue #2643
-
-2644
-00:44:04.000 --> 00:44:05.000
-This is cue #2644
-
-2645
-00:44:05.000 --> 00:44:06.000
-This is cue #2645
-
-2646
-00:44:06.000 --> 00:44:07.000
-This is cue #2646
-
-2647
-00:44:07.000 --> 00:44:08.000
-This is cue #2647
-
-2648
-00:44:08.000 --> 00:44:09.000
-This is cue #2648
-
-2649
-00:44:09.000 --> 00:44:10.000
-This is cue #2649
-
-2650
-00:44:10.000 --> 00:44:11.000
-This is cue #2650
-
-2651
-00:44:11.000 --> 00:44:12.000
-This is cue #2651
-
-2652
-00:44:12.000 --> 00:44:13.000
-This is cue #2652
-
-2653
-00:44:13.000 --> 00:44:14.000
-This is cue #2653
-
-2654
-00:44:14.000 --> 00:44:15.000
-This is cue #2654
-
-2655
-00:44:15.000 --> 00:44:16.000
-This is cue #2655
-
-2656
-00:44:16.000 --> 00:44:17.000
-This is cue #2656
-
-2657
-00:44:17.000 --> 00:44:18.000
-This is cue #2657
-
-2658
-00:44:18.000 --> 00:44:19.000
-This is cue #2658
-
-2659
-00:44:19.000 --> 00:44:20.000
-This is cue #2659
-
-2660
-00:44:20.000 --> 00:44:21.000
-This is cue #2660
-
-2661
-00:44:21.000 --> 00:44:22.000
-This is cue #2661
-
-2662
-00:44:22.000 --> 00:44:23.000
-This is cue #2662
-
-2663
-00:44:23.000 --> 00:44:24.000
-This is cue #2663
-
-2664
-00:44:24.000 --> 00:44:25.000
-This is cue #2664
-
-2665
-00:44:25.000 --> 00:44:26.000
-This is cue #2665
-
-2666
-00:44:26.000 --> 00:44:27.000
-This is cue #2666
-
-2667
-00:44:27.000 --> 00:44:28.000
-This is cue #2667
-
-2668
-00:44:28.000 --> 00:44:29.000
-This is cue #2668
-
-2669
-00:44:29.000 --> 00:44:30.000
-This is cue #2669
-
-2670
-00:44:30.000 --> 00:44:31.000
-This is cue #2670
-
-2671
-00:44:31.000 --> 00:44:32.000
-This is cue #2671
-
-2672
-00:44:32.000 --> 00:44:33.000
-This is cue #2672
-
-2673
-00:44:33.000 --> 00:44:34.000
-This is cue #2673
-
-2674
-00:44:34.000 --> 00:44:35.000
-This is cue #2674
-
-2675
-00:44:35.000 --> 00:44:36.000
-This is cue #2675
-
-2676
-00:44:36.000 --> 00:44:37.000
-This is cue #2676
-
-2677
-00:44:37.000 --> 00:44:38.000
-This is cue #2677
-
-2678
-00:44:38.000 --> 00:44:39.000
-This is cue #2678
-
-2679
-00:44:39.000 --> 00:44:40.000
-This is cue #2679
-
-2680
-00:44:40.000 --> 00:44:41.000
-This is cue #2680
-
-2681
-00:44:41.000 --> 00:44:42.000
-This is cue #2681
-
-2682
-00:44:42.000 --> 00:44:43.000
-This is cue #2682
-
-2683
-00:44:43.000 --> 00:44:44.000
-This is cue #2683
-
-2684
-00:44:44.000 --> 00:44:45.000
-This is cue #2684
-
-2685
-00:44:45.000 --> 00:44:46.000
-This is cue #2685
-
-2686
-00:44:46.000 --> 00:44:47.000
-This is cue #2686
-
-2687
-00:44:47.000 --> 00:44:48.000
-This is cue #2687
-
-2688
-00:44:48.000 --> 00:44:49.000
-This is cue #2688
-
-2689
-00:44:49.000 --> 00:44:50.000
-This is cue #2689
-
-2690
-00:44:50.000 --> 00:44:51.000
-This is cue #2690
-
-2691
-00:44:51.000 --> 00:44:52.000
-This is cue #2691
-
-2692
-00:44:52.000 --> 00:44:53.000
-This is cue #2692
-
-2693
-00:44:53.000 --> 00:44:54.000
-This is cue #2693
-
-2694
-00:44:54.000 --> 00:44:55.000
-This is cue #2694
-
-2695
-00:44:55.000 --> 00:44:56.000
-This is cue #2695
-
-2696
-00:44:56.000 --> 00:44:57.000
-This is cue #2696
-
-2697
-00:44:57.000 --> 00:44:58.000
-This is cue #2697
-
-2698
-00:44:58.000 --> 00:44:59.000
-This is cue #2698
-
-2699
-00:44:59.000 --> 00:45:00.000
-This is cue #2699
-
-2700
-00:45:00.000 --> 00:45:01.000
-This is cue #2700
-
-2701
-00:45:01.000 --> 00:45:02.000
-This is cue #2701
-
-2702
-00:45:02.000 --> 00:45:03.000
-This is cue #2702
-
-2703
-00:45:03.000 --> 00:45:04.000
-This is cue #2703
-
-2704
-00:45:04.000 --> 00:45:05.000
-This is cue #2704
-
-2705
-00:45:05.000 --> 00:45:06.000
-This is cue #2705
-
-2706
-00:45:06.000 --> 00:45:07.000
-This is cue #2706
-
-2707
-00:45:07.000 --> 00:45:08.000
-This is cue #2707
-
-2708
-00:45:08.000 --> 00:45:09.000
-This is cue #2708
-
-2709
-00:45:09.000 --> 00:45:10.000
-This is cue #2709
-
-2710
-00:45:10.000 --> 00:45:11.000
-This is cue #2710
-
-2711
-00:45:11.000 --> 00:45:12.000
-This is cue #2711
-
-2712
-00:45:12.000 --> 00:45:13.000
-This is cue #2712
-
-2713
-00:45:13.000 --> 00:45:14.000
-This is cue #2713
-
-2714
-00:45:14.000 --> 00:45:15.000
-This is cue #2714
-
-2715
-00:45:15.000 --> 00:45:16.000
-This is cue #2715
-
-2716
-00:45:16.000 --> 00:45:17.000
-This is cue #2716
-
-2717
-00:45:17.000 --> 00:45:18.000
-This is cue #2717
-
-2718
-00:45:18.000 --> 00:45:19.000
-This is cue #2718
-
-2719
-00:45:19.000 --> 00:45:20.000
-This is cue #2719
-
-2720
-00:45:20.000 --> 00:45:21.000
-This is cue #2720
-
-2721
-00:45:21.000 --> 00:45:22.000
-This is cue #2721
-
-2722
-00:45:22.000 --> 00:45:23.000
-This is cue #2722
-
-2723
-00:45:23.000 --> 00:45:24.000
-This is cue #2723
-
-2724
-00:45:24.000 --> 00:45:25.000
-This is cue #2724
-
-2725
-00:45:25.000 --> 00:45:26.000
-This is cue #2725
-
-2726
-00:45:26.000 --> 00:45:27.000
-This is cue #2726
-
-2727
-00:45:27.000 --> 00:45:28.000
-This is cue #2727
-
-2728
-00:45:28.000 --> 00:45:29.000
-This is cue #2728
-
-2729
-00:45:29.000 --> 00:45:30.000
-This is cue #2729
-
-2730
-00:45:30.000 --> 00:45:31.000
-This is cue #2730
-
-2731
-00:45:31.000 --> 00:45:32.000
-This is cue #2731
-
-2732
-00:45:32.000 --> 00:45:33.000
-This is cue #2732
-
-2733
-00:45:33.000 --> 00:45:34.000
-This is cue #2733
-
-2734
-00:45:34.000 --> 00:45:35.000
-This is cue #2734
-
-2735
-00:45:35.000 --> 00:45:36.000
-This is cue #2735
-
-2736
-00:45:36.000 --> 00:45:37.000
-This is cue #2736
-
-2737
-00:45:37.000 --> 00:45:38.000
-This is cue #2737
-
-2738
-00:45:38.000 --> 00:45:39.000
-This is cue #2738
-
-2739
-00:45:39.000 --> 00:45:40.000
-This is cue #2739
-
-2740
-00:45:40.000 --> 00:45:41.000
-This is cue #2740
-
-2741
-00:45:41.000 --> 00:45:42.000
-This is cue #2741
-
-2742
-00:45:42.000 --> 00:45:43.000
-This is cue #2742
-
-2743
-00:45:43.000 --> 00:45:44.000
-This is cue #2743
-
-2744
-00:45:44.000 --> 00:45:45.000
-This is cue #2744
-
-2745
-00:45:45.000 --> 00:45:46.000
-This is cue #2745
-
-2746
-00:45:46.000 --> 00:45:47.000
-This is cue #2746
-
-2747
-00:45:47.000 --> 00:45:48.000
-This is cue #2747
-
-2748
-00:45:48.000 --> 00:45:49.000
-This is cue #2748
-
-2749
-00:45:49.000 --> 00:45:50.000
-This is cue #2749
-
-2750
-00:45:50.000 --> 00:45:51.000
-This is cue #2750
-
-2751
-00:45:51.000 --> 00:45:52.000
-This is cue #2751
-
-2752
-00:45:52.000 --> 00:45:53.000
-This is cue #2752
-
-2753
-00:45:53.000 --> 00:45:54.000
-This is cue #2753
-
-2754
-00:45:54.000 --> 00:45:55.000
-This is cue #2754
-
-2755
-00:45:55.000 --> 00:45:56.000
-This is cue #2755
-
-2756
-00:45:56.000 --> 00:45:57.000
-This is cue #2756
-
-2757
-00:45:57.000 --> 00:45:58.000
-This is cue #2757
-
-2758
-00:45:58.000 --> 00:45:59.000
-This is cue #2758
-
-2759
-00:45:59.000 --> 00:46:00.000
-This is cue #2759
-
-2760
-00:46:00.000 --> 00:46:01.000
-This is cue #2760
-
-2761
-00:46:01.000 --> 00:46:02.000
-This is cue #2761
-
-2762
-00:46:02.000 --> 00:46:03.000
-This is cue #2762
-
-2763
-00:46:03.000 --> 00:46:04.000
-This is cue #2763
-
-2764
-00:46:04.000 --> 00:46:05.000
-This is cue #2764
-
-2765
-00:46:05.000 --> 00:46:06.000
-This is cue #2765
-
-2766
-00:46:06.000 --> 00:46:07.000
-This is cue #2766
-
-2767
-00:46:07.000 --> 00:46:08.000
-This is cue #2767
-
-2768
-00:46:08.000 --> 00:46:09.000
-This is cue #2768
-
-2769
-00:46:09.000 --> 00:46:10.000
-This is cue #2769
-
-2770
-00:46:10.000 --> 00:46:11.000
-This is cue #2770
-
-2771
-00:46:11.000 --> 00:46:12.000
-This is cue #2771
-
-2772
-00:46:12.000 --> 00:46:13.000
-This is cue #2772
-
-2773
-00:46:13.000 --> 00:46:14.000
-This is cue #2773
-
-2774
-00:46:14.000 --> 00:46:15.000
-This is cue #2774
-
-2775
-00:46:15.000 --> 00:46:16.000
-This is cue #2775
-
-2776
-00:46:16.000 --> 00:46:17.000
-This is cue #2776
-
-2777
-00:46:17.000 --> 00:46:18.000
-This is cue #2777
-
-2778
-00:46:18.000 --> 00:46:19.000
-This is cue #2778
-
-2779
-00:46:19.000 --> 00:46:20.000
-This is cue #2779
-
-2780
-00:46:20.000 --> 00:46:21.000
-This is cue #2780
-
-2781
-00:46:21.000 --> 00:46:22.000
-This is cue #2781
-
-2782
-00:46:22.000 --> 00:46:23.000
-This is cue #2782
-
-2783
-00:46:23.000 --> 00:46:24.000
-This is cue #2783
-
-2784
-00:46:24.000 --> 00:46:25.000
-This is cue #2784
-
-2785
-00:46:25.000 --> 00:46:26.000
-This is cue #2785
-
-2786
-00:46:26.000 --> 00:46:27.000
-This is cue #2786
-
-2787
-00:46:27.000 --> 00:46:28.000
-This is cue #2787
-
-2788
-00:46:28.000 --> 00:46:29.000
-This is cue #2788
-
-2789
-00:46:29.000 --> 00:46:30.000
-This is cue #2789
-
-2790
-00:46:30.000 --> 00:46:31.000
-This is cue #2790
-
-2791
-00:46:31.000 --> 00:46:32.000
-This is cue #2791
-
-2792
-00:46:32.000 --> 00:46:33.000
-This is cue #2792
-
-2793
-00:46:33.000 --> 00:46:34.000
-This is cue #2793
-
-2794
-00:46:34.000 --> 00:46:35.000
-This is cue #2794
-
-2795
-00:46:35.000 --> 00:46:36.000
-This is cue #2795
-
-2796
-00:46:36.000 --> 00:46:37.000
-This is cue #2796
-
-2797
-00:46:37.000 --> 00:46:38.000
-This is cue #2797
-
-2798
-00:46:38.000 --> 00:46:39.000
-This is cue #2798
-
-2799
-00:46:39.000 --> 00:46:40.000
-This is cue #2799
-
-2800
-00:46:40.000 --> 00:46:41.000
-This is cue #2800
-
-2801
-00:46:41.000 --> 00:46:42.000
-This is cue #2801
-
-2802
-00:46:42.000 --> 00:46:43.000
-This is cue #2802
-
-2803
-00:46:43.000 --> 00:46:44.000
-This is cue #2803
-
-2804
-00:46:44.000 --> 00:46:45.000
-This is cue #2804
-
-2805
-00:46:45.000 --> 00:46:46.000
-This is cue #2805
-
-2806
-00:46:46.000 --> 00:46:47.000
-This is cue #2806
-
-2807
-00:46:47.000 --> 00:46:48.000
-This is cue #2807
-
-2808
-00:46:48.000 --> 00:46:49.000
-This is cue #2808
-
-2809
-00:46:49.000 --> 00:46:50.000
-This is cue #2809
-
-2810
-00:46:50.000 --> 00:46:51.000
-This is cue #2810
-
-2811
-00:46:51.000 --> 00:46:52.000
-This is cue #2811
-
-2812
-00:46:52.000 --> 00:46:53.000
-This is cue #2812
-
-2813
-00:46:53.000 --> 00:46:54.000
-This is cue #2813
-
-2814
-00:46:54.000 --> 00:46:55.000
-This is cue #2814
-
-2815
-00:46:55.000 --> 00:46:56.000
-This is cue #2815
-
-2816
-00:46:56.000 --> 00:46:57.000
-This is cue #2816
-
-2817
-00:46:57.000 --> 00:46:58.000
-This is cue #2817
-
-2818
-00:46:58.000 --> 00:46:59.000
-This is cue #2818
-
-2819
-00:46:59.000 --> 00:47:00.000
-This is cue #2819
-
-2820
-00:47:00.000 --> 00:47:01.000
-This is cue #2820
-
-2821
-00:47:01.000 --> 00:47:02.000
-This is cue #2821
-
-2822
-00:47:02.000 --> 00:47:03.000
-This is cue #2822
-
-2823
-00:47:03.000 --> 00:47:04.000
-This is cue #2823
-
-2824
-00:47:04.000 --> 00:47:05.000
-This is cue #2824
-
-2825
-00:47:05.000 --> 00:47:06.000
-This is cue #2825
-
-2826
-00:47:06.000 --> 00:47:07.000
-This is cue #2826
-
-2827
-00:47:07.000 --> 00:47:08.000
-This is cue #2827
-
-2828
-00:47:08.000 --> 00:47:09.000
-This is cue #2828
-
-2829
-00:47:09.000 --> 00:47:10.000
-This is cue #2829
-
-2830
-00:47:10.000 --> 00:47:11.000
-This is cue #2830
-
-2831
-00:47:11.000 --> 00:47:12.000
-This is cue #2831
-
-2832
-00:47:12.000 --> 00:47:13.000
-This is cue #2832
-
-2833
-00:47:13.000 --> 00:47:14.000
-This is cue #2833
-
-2834
-00:47:14.000 --> 00:47:15.000
-This is cue #2834
-
-2835
-00:47:15.000 --> 00:47:16.000
-This is cue #2835
-
-2836
-00:47:16.000 --> 00:47:17.000
-This is cue #2836
-
-2837
-00:47:17.000 --> 00:47:18.000
-This is cue #2837
-
-2838
-00:47:18.000 --> 00:47:19.000
-This is cue #2838
-
-2839
-00:47:19.000 --> 00:47:20.000
-This is cue #2839
-
-2840
-00:47:20.000 --> 00:47:21.000
-This is cue #2840
-
-2841
-00:47:21.000 --> 00:47:22.000
-This is cue #2841
-
-2842
-00:47:22.000 --> 00:47:23.000
-This is cue #2842
-
-2843
-00:47:23.000 --> 00:47:24.000
-This is cue #2843
-
-2844
-00:47:24.000 --> 00:47:25.000
-This is cue #2844
-
-2845
-00:47:25.000 --> 00:47:26.000
-This is cue #2845
-
-2846
-00:47:26.000 --> 00:47:27.000
-This is cue #2846
-
-2847
-00:47:27.000 --> 00:47:28.000
-This is cue #2847
-
-2848
-00:47:28.000 --> 00:47:29.000
-This is cue #2848
-
-2849
-00:47:29.000 --> 00:47:30.000
-This is cue #2849
-
-2850
-00:47:30.000 --> 00:47:31.000
-This is cue #2850
-
-2851
-00:47:31.000 --> 00:47:32.000
-This is cue #2851
-
-2852
-00:47:32.000 --> 00:47:33.000
-This is cue #2852
-
-2853
-00:47:33.000 --> 00:47:34.000
-This is cue #2853
-
-2854
-00:47:34.000 --> 00:47:35.000
-This is cue #2854
-
-2855
-00:47:35.000 --> 00:47:36.000
-This is cue #2855
-
-2856
-00:47:36.000 --> 00:47:37.000
-This is cue #2856
-
-2857
-00:47:37.000 --> 00:47:38.000
-This is cue #2857
-
-2858
-00:47:38.000 --> 00:47:39.000
-This is cue #2858
-
-2859
-00:47:39.000 --> 00:47:40.000
-This is cue #2859
-
-2860
-00:47:40.000 --> 00:47:41.000
-This is cue #2860
-
-2861
-00:47:41.000 --> 00:47:42.000
-This is cue #2861
-
-2862
-00:47:42.000 --> 00:47:43.000
-This is cue #2862
-
-2863
-00:47:43.000 --> 00:47:44.000
-This is cue #2863
-
-2864
-00:47:44.000 --> 00:47:45.000
-This is cue #2864
-
-2865
-00:47:45.000 --> 00:47:46.000
-This is cue #2865
-
-2866
-00:47:46.000 --> 00:47:47.000
-This is cue #2866
-
-2867
-00:47:47.000 --> 00:47:48.000
-This is cue #2867
-
-2868
-00:47:48.000 --> 00:47:49.000
-This is cue #2868
-
-2869
-00:47:49.000 --> 00:47:50.000
-This is cue #2869
-
-2870
-00:47:50.000 --> 00:47:51.000
-This is cue #2870
-
-2871
-00:47:51.000 --> 00:47:52.000
-This is cue #2871
-
-2872
-00:47:52.000 --> 00:47:53.000
-This is cue #2872
-
-2873
-00:47:53.000 --> 00:47:54.000
-This is cue #2873
-
-2874
-00:47:54.000 --> 00:47:55.000
-This is cue #2874
-
-2875
-00:47:55.000 --> 00:47:56.000
-This is cue #2875
-
-2876
-00:47:56.000 --> 00:47:57.000
-This is cue #2876
-
-2877
-00:47:57.000 --> 00:47:58.000
-This is cue #2877
-
-2878
-00:47:58.000 --> 00:47:59.000
-This is cue #2878
-
-2879
-00:47:59.000 --> 00:48:00.000
-This is cue #2879
-
-2880
-00:48:00.000 --> 00:48:01.000
-This is cue #2880
-
-2881
-00:48:01.000 --> 00:48:02.000
-This is cue #2881
-
-2882
-00:48:02.000 --> 00:48:03.000
-This is cue #2882
-
-2883
-00:48:03.000 --> 00:48:04.000
-This is cue #2883
-
-2884
-00:48:04.000 --> 00:48:05.000
-This is cue #2884
-
-2885
-00:48:05.000 --> 00:48:06.000
-This is cue #2885
-
-2886
-00:48:06.000 --> 00:48:07.000
-This is cue #2886
-
-2887
-00:48:07.000 --> 00:48:08.000
-This is cue #2887
-
-2888
-00:48:08.000 --> 00:48:09.000
-This is cue #2888
-
-2889
-00:48:09.000 --> 00:48:10.000
-This is cue #2889
-
-2890
-00:48:10.000 --> 00:48:11.000
-This is cue #2890
-
-2891
-00:48:11.000 --> 00:48:12.000
-This is cue #2891
-
-2892
-00:48:12.000 --> 00:48:13.000
-This is cue #2892
-
-2893
-00:48:13.000 --> 00:48:14.000
-This is cue #2893
-
-2894
-00:48:14.000 --> 00:48:15.000
-This is cue #2894
-
-2895
-00:48:15.000 --> 00:48:16.000
-This is cue #2895
-
-2896
-00:48:16.000 --> 00:48:17.000
-This is cue #2896
-
-2897
-00:48:17.000 --> 00:48:18.000
-This is cue #2897
-
-2898
-00:48:18.000 --> 00:48:19.000
-This is cue #2898
-
-2899
-00:48:19.000 --> 00:48:20.000
-This is cue #2899
-
-2900
-00:48:20.000 --> 00:48:21.000
-This is cue #2900
-
-2901
-00:48:21.000 --> 00:48:22.000
-This is cue #2901
-
-2902
-00:48:22.000 --> 00:48:23.000
-This is cue #2902
-
-2903
-00:48:23.000 --> 00:48:24.000
-This is cue #2903
-
-2904
-00:48:24.000 --> 00:48:25.000
-This is cue #2904
-
-2905
-00:48:25.000 --> 00:48:26.000
-This is cue #2905
-
-2906
-00:48:26.000 --> 00:48:27.000
-This is cue #2906
-
-2907
-00:48:27.000 --> 00:48:28.000
-This is cue #2907
-
-2908
-00:48:28.000 --> 00:48:29.000
-This is cue #2908
-
-2909
-00:48:29.000 --> 00:48:30.000
-This is cue #2909
-
-2910
-00:48:30.000 --> 00:48:31.000
-This is cue #2910
-
-2911
-00:48:31.000 --> 00:48:32.000
-This is cue #2911
-
-2912
-00:48:32.000 --> 00:48:33.000
-This is cue #2912
-
-2913
-00:48:33.000 --> 00:48:34.000
-This is cue #2913
-
-2914
-00:48:34.000 --> 00:48:35.000
-This is cue #2914
-
-2915
-00:48:35.000 --> 00:48:36.000
-This is cue #2915
-
-2916
-00:48:36.000 --> 00:48:37.000
-This is cue #2916
-
-2917
-00:48:37.000 --> 00:48:38.000
-This is cue #2917
-
-2918
-00:48:38.000 --> 00:48:39.000
-This is cue #2918
-
-2919
-00:48:39.000 --> 00:48:40.000
-This is cue #2919
-
-2920
-00:48:40.000 --> 00:48:41.000
-This is cue #2920
-
-2921
-00:48:41.000 --> 00:48:42.000
-This is cue #2921
-
-2922
-00:48:42.000 --> 00:48:43.000
-This is cue #2922
-
-2923
-00:48:43.000 --> 00:48:44.000
-This is cue #2923
-
-2924
-00:48:44.000 --> 00:48:45.000
-This is cue #2924
-
-2925
-00:48:45.000 --> 00:48:46.000
-This is cue #2925
-
-2926
-00:48:46.000 --> 00:48:47.000
-This is cue #2926
-
-2927
-00:48:47.000 --> 00:48:48.000
-This is cue #2927
-
-2928
-00:48:48.000 --> 00:48:49.000
-This is cue #2928
-
-2929
-00:48:49.000 --> 00:48:50.000
-This is cue #2929
-
-2930
-00:48:50.000 --> 00:48:51.000
-This is cue #2930
-
-2931
-00:48:51.000 --> 00:48:52.000
-This is cue #2931
-
-2932
-00:48:52.000 --> 00:48:53.000
-This is cue #2932
-
-2933
-00:48:53.000 --> 00:48:54.000
-This is cue #2933
-
-2934
-00:48:54.000 --> 00:48:55.000
-This is cue #2934
-
-2935
-00:48:55.000 --> 00:48:56.000
-This is cue #2935
-
-2936
-00:48:56.000 --> 00:48:57.000
-This is cue #2936
-
-2937
-00:48:57.000 --> 00:48:58.000
-This is cue #2937
-
-2938
-00:48:58.000 --> 00:48:59.000
-This is cue #2938
-
-2939
-00:48:59.000 --> 00:49:00.000
-This is cue #2939
-
-2940
-00:49:00.000 --> 00:49:01.000
-This is cue #2940
-
-2941
-00:49:01.000 --> 00:49:02.000
-This is cue #2941
-
-2942
-00:49:02.000 --> 00:49:03.000
-This is cue #2942
-
-2943
-00:49:03.000 --> 00:49:04.000
-This is cue #2943
-
-2944
-00:49:04.000 --> 00:49:05.000
-This is cue #2944
-
-2945
-00:49:05.000 --> 00:49:06.000
-This is cue #2945
-
-2946
-00:49:06.000 --> 00:49:07.000
-This is cue #2946
-
-2947
-00:49:07.000 --> 00:49:08.000
-This is cue #2947
-
-2948
-00:49:08.000 --> 00:49:09.000
-This is cue #2948
-
-2949
-00:49:09.000 --> 00:49:10.000
-This is cue #2949
-
-2950
-00:49:10.000 --> 00:49:11.000
-This is cue #2950
-
-2951
-00:49:11.000 --> 00:49:12.000
-This is cue #2951
-
-2952
-00:49:12.000 --> 00:49:13.000
-This is cue #2952
-
-2953
-00:49:13.000 --> 00:49:14.000
-This is cue #2953
-
-2954
-00:49:14.000 --> 00:49:15.000
-This is cue #2954
-
-2955
-00:49:15.000 --> 00:49:16.000
-This is cue #2955
-
-2956
-00:49:16.000 --> 00:49:17.000
-This is cue #2956
-
-2957
-00:49:17.000 --> 00:49:18.000
-This is cue #2957
-
-2958
-00:49:18.000 --> 00:49:19.000
-This is cue #2958
-
-2959
-00:49:19.000 --> 00:49:20.000
-This is cue #2959
-
-2960
-00:49:20.000 --> 00:49:21.000
-This is cue #2960
-
-2961
-00:49:21.000 --> 00:49:22.000
-This is cue #2961
-
-2962
-00:49:22.000 --> 00:49:23.000
-This is cue #2962
-
-2963
-00:49:23.000 --> 00:49:24.000
-This is cue #2963
-
-2964
-00:49:24.000 --> 00:49:25.000
-This is cue #2964
-
-2965
-00:49:25.000 --> 00:49:26.000
-This is cue #2965
-
-2966
-00:49:26.000 --> 00:49:27.000
-This is cue #2966
-
-2967
-00:49:27.000 --> 00:49:28.000
-This is cue #2967
-
-2968
-00:49:28.000 --> 00:49:29.000
-This is cue #2968
-
-2969
-00:49:29.000 --> 00:49:30.000
-This is cue #2969
-
-2970
-00:49:30.000 --> 00:49:31.000
-This is cue #2970
-
-2971
-00:49:31.000 --> 00:49:32.000
-This is cue #2971
-
-2972
-00:49:32.000 --> 00:49:33.000
-This is cue #2972
-
-2973
-00:49:33.000 --> 00:49:34.000
-This is cue #2973
-
-2974
-00:49:34.000 --> 00:49:35.000
-This is cue #2974
-
-2975
-00:49:35.000 --> 00:49:36.000
-This is cue #2975
-
-2976
-00:49:36.000 --> 00:49:37.000
-This is cue #2976
-
-2977
-00:49:37.000 --> 00:49:38.000
-This is cue #2977
-
-2978
-00:49:38.000 --> 00:49:39.000
-This is cue #2978
-
-2979
-00:49:39.000 --> 00:49:40.000
-This is cue #2979
-
-2980
-00:49:40.000 --> 00:49:41.000
-This is cue #2980
-
-2981
-00:49:41.000 --> 00:49:42.000
-This is cue #2981
-
-2982
-00:49:42.000 --> 00:49:43.000
-This is cue #2982
-
-2983
-00:49:43.000 --> 00:49:44.000
-This is cue #2983
-
-2984
-00:49:44.000 --> 00:49:45.000
-This is cue #2984
-
-2985
-00:49:45.000 --> 00:49:46.000
-This is cue #2985
-
-2986
-00:49:46.000 --> 00:49:47.000
-This is cue #2986
-
-2987
-00:49:47.000 --> 00:49:48.000
-This is cue #2987
-
-2988
-00:49:48.000 --> 00:49:49.000
-This is cue #2988
-
-2989
-00:49:49.000 --> 00:49:50.000
-This is cue #2989
-
-2990
-00:49:50.000 --> 00:49:51.000
-This is cue #2990
-
-2991
-00:49:51.000 --> 00:49:52.000
-This is cue #2991
-
-2992
-00:49:52.000 --> 00:49:53.000
-This is cue #2992
-
-2993
-00:49:53.000 --> 00:49:54.000
-This is cue #2993
-
-2994
-00:49:54.000 --> 00:49:55.000
-This is cue #2994
-
-2995
-00:49:55.000 --> 00:49:56.000
-This is cue #2995
-
-2996
-00:49:56.000 --> 00:49:57.000
-This is cue #2996
-
-2997
-00:49:57.000 --> 00:49:58.000
-This is cue #2997
-
-2998
-00:49:58.000 --> 00:49:59.000
-This is cue #2998
-
-2999
-00:49:59.000 --> 00:50:00.000
-This is cue #2999
-
-3000
-00:50:00.000 --> 00:50:01.000
-This is cue #3000
-
-3001
-00:50:01.000 --> 00:50:02.000
-This is cue #3001
-
-3002
-00:50:02.000 --> 00:50:03.000
-This is cue #3002
-
-3003
-00:50:03.000 --> 00:50:04.000
-This is cue #3003
-
-3004
-00:50:04.000 --> 00:50:05.000
-This is cue #3004
-
-3005
-00:50:05.000 --> 00:50:06.000
-This is cue #3005
-
-3006
-00:50:06.000 --> 00:50:07.000
-This is cue #3006
-
-3007
-00:50:07.000 --> 00:50:08.000
-This is cue #3007
-
-3008
-00:50:08.000 --> 00:50:09.000
-This is cue #3008
-
-3009
-00:50:09.000 --> 00:50:10.000
-This is cue #3009
-
-3010
-00:50:10.000 --> 00:50:11.000
-This is cue #3010
-
-3011
-00:50:11.000 --> 00:50:12.000
-This is cue #3011
-
-3012
-00:50:12.000 --> 00:50:13.000
-This is cue #3012
-
-3013
-00:50:13.000 --> 00:50:14.000
-This is cue #3013
-
-3014
-00:50:14.000 --> 00:50:15.000
-This is cue #3014
-
-3015
-00:50:15.000 --> 00:50:16.000
-This is cue #3015
-
-3016
-00:50:16.000 --> 00:50:17.000
-This is cue #3016
-
-3017
-00:50:17.000 --> 00:50:18.000
-This is cue #3017
-
-3018
-00:50:18.000 --> 00:50:19.000
-This is cue #3018
-
-3019
-00:50:19.000 --> 00:50:20.000
-This is cue #3019
-
-3020
-00:50:20.000 --> 00:50:21.000
-This is cue #3020
-
-3021
-00:50:21.000 --> 00:50:22.000
-This is cue #3021
-
-3022
-00:50:22.000 --> 00:50:23.000
-This is cue #3022
-
-3023
-00:50:23.000 --> 00:50:24.000
-This is cue #3023
-
-3024
-00:50:24.000 --> 00:50:25.000
-This is cue #3024
-
-3025
-00:50:25.000 --> 00:50:26.000
-This is cue #3025
-
-3026
-00:50:26.000 --> 00:50:27.000
-This is cue #3026
-
-3027
-00:50:27.000 --> 00:50:28.000
-This is cue #3027
-
-3028
-00:50:28.000 --> 00:50:29.000
-This is cue #3028
-
-3029
-00:50:29.000 --> 00:50:30.000
-This is cue #3029
-
-3030
-00:50:30.000 --> 00:50:31.000
-This is cue #3030
-
-3031
-00:50:31.000 --> 00:50:32.000
-This is cue #3031
-
-3032
-00:50:32.000 --> 00:50:33.000
-This is cue #3032
-
-3033
-00:50:33.000 --> 00:50:34.000
-This is cue #3033
-
-3034
-00:50:34.000 --> 00:50:35.000
-This is cue #3034
-
-3035
-00:50:35.000 --> 00:50:36.000
-This is cue #3035
-
-3036
-00:50:36.000 --> 00:50:37.000
-This is cue #3036
-
-3037
-00:50:37.000 --> 00:50:38.000
-This is cue #3037
-
-3038
-00:50:38.000 --> 00:50:39.000
-This is cue #3038
-
-3039
-00:50:39.000 --> 00:50:40.000
-This is cue #3039
-
-3040
-00:50:40.000 --> 00:50:41.000
-This is cue #3040
-
-3041
-00:50:41.000 --> 00:50:42.000
-This is cue #3041
-
-3042
-00:50:42.000 --> 00:50:43.000
-This is cue #3042
-
-3043
-00:50:43.000 --> 00:50:44.000
-This is cue #3043
-
-3044
-00:50:44.000 --> 00:50:45.000
-This is cue #3044
-
-3045
-00:50:45.000 --> 00:50:46.000
-This is cue #3045
-
-3046
-00:50:46.000 --> 00:50:47.000
-This is cue #3046
-
-3047
-00:50:47.000 --> 00:50:48.000
-This is cue #3047
-
-3048
-00:50:48.000 --> 00:50:49.000
-This is cue #3048
-
-3049
-00:50:49.000 --> 00:50:50.000
-This is cue #3049
-
-3050
-00:50:50.000 --> 00:50:51.000
-This is cue #3050
-
-3051
-00:50:51.000 --> 00:50:52.000
-This is cue #3051
-
-3052
-00:50:52.000 --> 00:50:53.000
-This is cue #3052
-
-3053
-00:50:53.000 --> 00:50:54.000
-This is cue #3053
-
-3054
-00:50:54.000 --> 00:50:55.000
-This is cue #3054
-
-3055
-00:50:55.000 --> 00:50:56.000
-This is cue #3055
-
-3056
-00:50:56.000 --> 00:50:57.000
-This is cue #3056
-
-3057
-00:50:57.000 --> 00:50:58.000
-This is cue #3057
-
-3058
-00:50:58.000 --> 00:50:59.000
-This is cue #3058
-
-3059
-00:50:59.000 --> 00:51:00.000
-This is cue #3059
-
-3060
-00:51:00.000 --> 00:51:01.000
-This is cue #3060
-
-3061
-00:51:01.000 --> 00:51:02.000
-This is cue #3061
-
-3062
-00:51:02.000 --> 00:51:03.000
-This is cue #3062
-
-3063
-00:51:03.000 --> 00:51:04.000
-This is cue #3063
-
-3064
-00:51:04.000 --> 00:51:05.000
-This is cue #3064
-
-3065
-00:51:05.000 --> 00:51:06.000
-This is cue #3065
-
-3066
-00:51:06.000 --> 00:51:07.000
-This is cue #3066
-
-3067
-00:51:07.000 --> 00:51:08.000
-This is cue #3067
-
-3068
-00:51:08.000 --> 00:51:09.000
-This is cue #3068
-
-3069
-00:51:09.000 --> 00:51:10.000
-This is cue #3069
-
-3070
-00:51:10.000 --> 00:51:11.000
-This is cue #3070
-
-3071
-00:51:11.000 --> 00:51:12.000
-This is cue #3071
-
-3072
-00:51:12.000 --> 00:51:13.000
-This is cue #3072
-
-3073
-00:51:13.000 --> 00:51:14.000
-This is cue #3073
-
-3074
-00:51:14.000 --> 00:51:15.000
-This is cue #3074
-
-3075
-00:51:15.000 --> 00:51:16.000
-This is cue #3075
-
-3076
-00:51:16.000 --> 00:51:17.000
-This is cue #3076
-
-3077
-00:51:17.000 --> 00:51:18.000
-This is cue #3077
-
-3078
-00:51:18.000 --> 00:51:19.000
-This is cue #3078
-
-3079
-00:51:19.000 --> 00:51:20.000
-This is cue #3079
-
-3080
-00:51:20.000 --> 00:51:21.000
-This is cue #3080
-
-3081
-00:51:21.000 --> 00:51:22.000
-This is cue #3081
-
-3082
-00:51:22.000 --> 00:51:23.000
-This is cue #3082
-
-3083
-00:51:23.000 --> 00:51:24.000
-This is cue #3083
-
-3084
-00:51:24.000 --> 00:51:25.000
-This is cue #3084
-
-3085
-00:51:25.000 --> 00:51:26.000
-This is cue #3085
-
-3086
-00:51:26.000 --> 00:51:27.000
-This is cue #3086
-
-3087
-00:51:27.000 --> 00:51:28.000
-This is cue #3087
-
-3088
-00:51:28.000 --> 00:51:29.000
-This is cue #3088
-
-3089
-00:51:29.000 --> 00:51:30.000
-This is cue #3089
-
-3090
-00:51:30.000 --> 00:51:31.000
-This is cue #3090
-
-3091
-00:51:31.000 --> 00:51:32.000
-This is cue #3091
-
-3092
-00:51:32.000 --> 00:51:33.000
-This is cue #3092
-
-3093
-00:51:33.000 --> 00:51:34.000
-This is cue #3093
-
-3094
-00:51:34.000 --> 00:51:35.000
-This is cue #3094
-
-3095
-00:51:35.000 --> 00:51:36.000
-This is cue #3095
-
-3096
-00:51:36.000 --> 00:51:37.000
-This is cue #3096
-
-3097
-00:51:37.000 --> 00:51:38.000
-This is cue #3097
-
-3098
-00:51:38.000 --> 00:51:39.000
-This is cue #3098
-
-3099
-00:51:39.000 --> 00:51:40.000
-This is cue #3099
-
-3100
-00:51:40.000 --> 00:51:41.000
-This is cue #3100
-
-3101
-00:51:41.000 --> 00:51:42.000
-This is cue #3101
-
-3102
-00:51:42.000 --> 00:51:43.000
-This is cue #3102
-
-3103
-00:51:43.000 --> 00:51:44.000
-This is cue #3103
-
-3104
-00:51:44.000 --> 00:51:45.000
-This is cue #3104
-
-3105
-00:51:45.000 --> 00:51:46.000
-This is cue #3105
-
-3106
-00:51:46.000 --> 00:51:47.000
-This is cue #3106
-
-3107
-00:51:47.000 --> 00:51:48.000
-This is cue #3107
-
-3108
-00:51:48.000 --> 00:51:49.000
-This is cue #3108
-
-3109
-00:51:49.000 --> 00:51:50.000
-This is cue #3109
-
-3110
-00:51:50.000 --> 00:51:51.000
-This is cue #3110
-
-3111
-00:51:51.000 --> 00:51:52.000
-This is cue #3111
-
-3112
-00:51:52.000 --> 00:51:53.000
-This is cue #3112
-
-3113
-00:51:53.000 --> 00:51:54.000
-This is cue #3113
-
-3114
-00:51:54.000 --> 00:51:55.000
-This is cue #3114
-
-3115
-00:51:55.000 --> 00:51:56.000
-This is cue #3115
-
-3116
-00:51:56.000 --> 00:51:57.000
-This is cue #3116
-
-3117
-00:51:57.000 --> 00:51:58.000
-This is cue #3117
-
-3118
-00:51:58.000 --> 00:51:59.000
-This is cue #3118
-
-3119
-00:51:59.000 --> 00:52:00.000
-This is cue #3119
-
-3120
-00:52:00.000 --> 00:52:01.000
-This is cue #3120
-
-3121
-00:52:01.000 --> 00:52:02.000
-This is cue #3121
-
-3122
-00:52:02.000 --> 00:52:03.000
-This is cue #3122
-
-3123
-00:52:03.000 --> 00:52:04.000
-This is cue #3123
-
-3124
-00:52:04.000 --> 00:52:05.000
-This is cue #3124
-
-3125
-00:52:05.000 --> 00:52:06.000
-This is cue #3125
-
-3126
-00:52:06.000 --> 00:52:07.000
-This is cue #3126
-
-3127
-00:52:07.000 --> 00:52:08.000
-This is cue #3127
-
-3128
-00:52:08.000 --> 00:52:09.000
-This is cue #3128
-
-3129
-00:52:09.000 --> 00:52:10.000
-This is cue #3129
-
-3130
-00:52:10.000 --> 00:52:11.000
-This is cue #3130
-
-3131
-00:52:11.000 --> 00:52:12.000
-This is cue #3131
-
-3132
-00:52:12.000 --> 00:52:13.000
-This is cue #3132
-
-3133
-00:52:13.000 --> 00:52:14.000
-This is cue #3133
-
-3134
-00:52:14.000 --> 00:52:15.000
-This is cue #3134
-
-3135
-00:52:15.000 --> 00:52:16.000
-This is cue #3135
-
-3136
-00:52:16.000 --> 00:52:17.000
-This is cue #3136
-
-3137
-00:52:17.000 --> 00:52:18.000
-This is cue #3137
-
-3138
-00:52:18.000 --> 00:52:19.000
-This is cue #3138
-
-3139
-00:52:19.000 --> 00:52:20.000
-This is cue #3139
-
-3140
-00:52:20.000 --> 00:52:21.000
-This is cue #3140
-
-3141
-00:52:21.000 --> 00:52:22.000
-This is cue #3141
-
-3142
-00:52:22.000 --> 00:52:23.000
-This is cue #3142
-
-3143
-00:52:23.000 --> 00:52:24.000
-This is cue #3143
-
-3144
-00:52:24.000 --> 00:52:25.000
-This is cue #3144
-
-3145
-00:52:25.000 --> 00:52:26.000
-This is cue #3145
-
-3146
-00:52:26.000 --> 00:52:27.000
-This is cue #3146
-
-3147
-00:52:27.000 --> 00:52:28.000
-This is cue #3147
-
-3148
-00:52:28.000 --> 00:52:29.000
-This is cue #3148
-
-3149
-00:52:29.000 --> 00:52:30.000
-This is cue #3149
-
-3150
-00:52:30.000 --> 00:52:31.000
-This is cue #3150
-
-3151
-00:52:31.000 --> 00:52:32.000
-This is cue #3151
-
-3152
-00:52:32.000 --> 00:52:33.000
-This is cue #3152
-
-3153
-00:52:33.000 --> 00:52:34.000
-This is cue #3153
-
-3154
-00:52:34.000 --> 00:52:35.000
-This is cue #3154
-
-3155
-00:52:35.000 --> 00:52:36.000
-This is cue #3155
-
-3156
-00:52:36.000 --> 00:52:37.000
-This is cue #3156
-
-3157
-00:52:37.000 --> 00:52:38.000
-This is cue #3157
-
-3158
-00:52:38.000 --> 00:52:39.000
-This is cue #3158
-
-3159
-00:52:39.000 --> 00:52:40.000
-This is cue #3159
-
-3160
-00:52:40.000 --> 00:52:41.000
-This is cue #3160
-
-3161
-00:52:41.000 --> 00:52:42.000
-This is cue #3161
-
-3162
-00:52:42.000 --> 00:52:43.000
-This is cue #3162
-
-3163
-00:52:43.000 --> 00:52:44.000
-This is cue #3163
-
-3164
-00:52:44.000 --> 00:52:45.000
-This is cue #3164
-
-3165
-00:52:45.000 --> 00:52:46.000
-This is cue #3165
-
-3166
-00:52:46.000 --> 00:52:47.000
-This is cue #3166
-
-3167
-00:52:47.000 --> 00:52:48.000
-This is cue #3167
-
-3168
-00:52:48.000 --> 00:52:49.000
-This is cue #3168
-
-3169
-00:52:49.000 --> 00:52:50.000
-This is cue #3169
-
-3170
-00:52:50.000 --> 00:52:51.000
-This is cue #3170
-
-3171
-00:52:51.000 --> 00:52:52.000
-This is cue #3171
-
-3172
-00:52:52.000 --> 00:52:53.000
-This is cue #3172
-
-3173
-00:52:53.000 --> 00:52:54.000
-This is cue #3173
-
-3174
-00:52:54.000 --> 00:52:55.000
-This is cue #3174
-
-3175
-00:52:55.000 --> 00:52:56.000
-This is cue #3175
-
-3176
-00:52:56.000 --> 00:52:57.000
-This is cue #3176
-
-3177
-00:52:57.000 --> 00:52:58.000
-This is cue #3177
-
-3178
-00:52:58.000 --> 00:52:59.000
-This is cue #3178
-
-3179
-00:52:59.000 --> 00:53:00.000
-This is cue #3179
-
-3180
-00:53:00.000 --> 00:53:01.000
-This is cue #3180
-
-3181
-00:53:01.000 --> 00:53:02.000
-This is cue #3181
-
-3182
-00:53:02.000 --> 00:53:03.000
-This is cue #3182
-
-3183
-00:53:03.000 --> 00:53:04.000
-This is cue #3183
-
-3184
-00:53:04.000 --> 00:53:05.000
-This is cue #3184
-
-3185
-00:53:05.000 --> 00:53:06.000
-This is cue #3185
-
-3186
-00:53:06.000 --> 00:53:07.000
-This is cue #3186
-
-3187
-00:53:07.000 --> 00:53:08.000
-This is cue #3187
-
-3188
-00:53:08.000 --> 00:53:09.000
-This is cue #3188
-
-3189
-00:53:09.000 --> 00:53:10.000
-This is cue #3189
-
-3190
-00:53:10.000 --> 00:53:11.000
-This is cue #3190
-
-3191
-00:53:11.000 --> 00:53:12.000
-This is cue #3191
-
-3192
-00:53:12.000 --> 00:53:13.000
-This is cue #3192
-
-3193
-00:53:13.000 --> 00:53:14.000
-This is cue #3193
-
-3194
-00:53:14.000 --> 00:53:15.000
-This is cue #3194
-
-3195
-00:53:15.000 --> 00:53:16.000
-This is cue #3195
-
-3196
-00:53:16.000 --> 00:53:17.000
-This is cue #3196
-
-3197
-00:53:17.000 --> 00:53:18.000
-This is cue #3197
-
-3198
-00:53:18.000 --> 00:53:19.000
-This is cue #3198
-
-3199
-00:53:19.000 --> 00:53:20.000
-This is cue #3199
-
-3200
-00:53:20.000 --> 00:53:21.000
-This is cue #3200
-
-3201
-00:53:21.000 --> 00:53:22.000
-This is cue #3201
-
-3202
-00:53:22.000 --> 00:53:23.000
-This is cue #3202
-
-3203
-00:53:23.000 --> 00:53:24.000
-This is cue #3203
-
-3204
-00:53:24.000 --> 00:53:25.000
-This is cue #3204
-
-3205
-00:53:25.000 --> 00:53:26.000
-This is cue #3205
-
-3206
-00:53:26.000 --> 00:53:27.000
-This is cue #3206
-
-3207
-00:53:27.000 --> 00:53:28.000
-This is cue #3207
-
-3208
-00:53:28.000 --> 00:53:29.000
-This is cue #3208
-
-3209
-00:53:29.000 --> 00:53:30.000
-This is cue #3209
-
-3210
-00:53:30.000 --> 00:53:31.000
-This is cue #3210
-
-3211
-00:53:31.000 --> 00:53:32.000
-This is cue #3211
-
-3212
-00:53:32.000 --> 00:53:33.000
-This is cue #3212
-
-3213
-00:53:33.000 --> 00:53:34.000
-This is cue #3213
-
-3214
-00:53:34.000 --> 00:53:35.000
-This is cue #3214
-
-3215
-00:53:35.000 --> 00:53:36.000
-This is cue #3215
-
-3216
-00:53:36.000 --> 00:53:37.000
-This is cue #3216
-
-3217
-00:53:37.000 --> 00:53:38.000
-This is cue #3217
-
-3218
-00:53:38.000 --> 00:53:39.000
-This is cue #3218
-
-3219
-00:53:39.000 --> 00:53:40.000
-This is cue #3219
-
-3220
-00:53:40.000 --> 00:53:41.000
-This is cue #3220
-
-3221
-00:53:41.000 --> 00:53:42.000
-This is cue #3221
-
-3222
-00:53:42.000 --> 00:53:43.000
-This is cue #3222
-
-3223
-00:53:43.000 --> 00:53:44.000
-This is cue #3223
-
-3224
-00:53:44.000 --> 00:53:45.000
-This is cue #3224
-
-3225
-00:53:45.000 --> 00:53:46.000
-This is cue #3225
-
-3226
-00:53:46.000 --> 00:53:47.000
-This is cue #3226
-
-3227
-00:53:47.000 --> 00:53:48.000
-This is cue #3227
-
-3228
-00:53:48.000 --> 00:53:49.000
-This is cue #3228
-
-3229
-00:53:49.000 --> 00:53:50.000
-This is cue #3229
-
-3230
-00:53:50.000 --> 00:53:51.000
-This is cue #3230
-
-3231
-00:53:51.000 --> 00:53:52.000
-This is cue #3231
-
-3232
-00:53:52.000 --> 00:53:53.000
-This is cue #3232
-
-3233
-00:53:53.000 --> 00:53:54.000
-This is cue #3233
-
-3234
-00:53:54.000 --> 00:53:55.000
-This is cue #3234
-
-3235
-00:53:55.000 --> 00:53:56.000
-This is cue #3235
-
-3236
-00:53:56.000 --> 00:53:57.000
-This is cue #3236
-
-3237
-00:53:57.000 --> 00:53:58.000
-This is cue #3237
-
-3238
-00:53:58.000 --> 00:53:59.000
-This is cue #3238
-
-3239
-00:53:59.000 --> 00:54:00.000
-This is cue #3239
-
-3240
-00:54:00.000 --> 00:54:01.000
-This is cue #3240
-
-3241
-00:54:01.000 --> 00:54:02.000
-This is cue #3241
-
-3242
-00:54:02.000 --> 00:54:03.000
-This is cue #3242
-
-3243
-00:54:03.000 --> 00:54:04.000
-This is cue #3243
-
-3244
-00:54:04.000 --> 00:54:05.000
-This is cue #3244
-
-3245
-00:54:05.000 --> 00:54:06.000
-This is cue #3245
-
-3246
-00:54:06.000 --> 00:54:07.000
-This is cue #3246
-
-3247
-00:54:07.000 --> 00:54:08.000
-This is cue #3247
-
-3248
-00:54:08.000 --> 00:54:09.000
-This is cue #3248
-
-3249
-00:54:09.000 --> 00:54:10.000
-This is cue #3249
-
-3250
-00:54:10.000 --> 00:54:11.000
-This is cue #3250
-
-3251
-00:54:11.000 --> 00:54:12.000
-This is cue #3251
-
-3252
-00:54:12.000 --> 00:54:13.000
-This is cue #3252
-
-3253
-00:54:13.000 --> 00:54:14.000
-This is cue #3253
-
-3254
-00:54:14.000 --> 00:54:15.000
-This is cue #3254
-
-3255
-00:54:15.000 --> 00:54:16.000
-This is cue #3255
-
-3256
-00:54:16.000 --> 00:54:17.000
-This is cue #3256
-
-3257
-00:54:17.000 --> 00:54:18.000
-This is cue #3257
-
-3258
-00:54:18.000 --> 00:54:19.000
-This is cue #3258
-
-3259
-00:54:19.000 --> 00:54:20.000
-This is cue #3259
-
-3260
-00:54:20.000 --> 00:54:21.000
-This is cue #3260
-
-3261
-00:54:21.000 --> 00:54:22.000
-This is cue #3261
-
-3262
-00:54:22.000 --> 00:54:23.000
-This is cue #3262
-
-3263
-00:54:23.000 --> 00:54:24.000
-This is cue #3263
-
-3264
-00:54:24.000 --> 00:54:25.000
-This is cue #3264
-
-3265
-00:54:25.000 --> 00:54:26.000
-This is cue #3265
-
-3266
-00:54:26.000 --> 00:54:27.000
-This is cue #3266
-
-3267
-00:54:27.000 --> 00:54:28.000
-This is cue #3267
-
-3268
-00:54:28.000 --> 00:54:29.000
-This is cue #3268
-
-3269
-00:54:29.000 --> 00:54:30.000
-This is cue #3269
-
-3270
-00:54:30.000 --> 00:54:31.000
-This is cue #3270
-
-3271
-00:54:31.000 --> 00:54:32.000
-This is cue #3271
-
-3272
-00:54:32.000 --> 00:54:33.000
-This is cue #3272
-
-3273
-00:54:33.000 --> 00:54:34.000
-This is cue #3273
-
-3274
-00:54:34.000 --> 00:54:35.000
-This is cue #3274
-
-3275
-00:54:35.000 --> 00:54:36.000
-This is cue #3275
-
-3276
-00:54:36.000 --> 00:54:37.000
-This is cue #3276
-
-3277
-00:54:37.000 --> 00:54:38.000
-This is cue #3277
-
-3278
-00:54:38.000 --> 00:54:39.000
-This is cue #3278
-
-3279
-00:54:39.000 --> 00:54:40.000
-This is cue #3279
-
-3280
-00:54:40.000 --> 00:54:41.000
-This is cue #3280
-
-3281
-00:54:41.000 --> 00:54:42.000
-This is cue #3281
-
-3282
-00:54:42.000 --> 00:54:43.000
-This is cue #3282
-
-3283
-00:54:43.000 --> 00:54:44.000
-This is cue #3283
-
-3284
-00:54:44.000 --> 00:54:45.000
-This is cue #3284
-
-3285
-00:54:45.000 --> 00:54:46.000
-This is cue #3285
-
-3286
-00:54:46.000 --> 00:54:47.000
-This is cue #3286
-
-3287
-00:54:47.000 --> 00:54:48.000
-This is cue #3287
-
-3288
-00:54:48.000 --> 00:54:49.000
-This is cue #3288
-
-3289
-00:54:49.000 --> 00:54:50.000
-This is cue #3289
-
-3290
-00:54:50.000 --> 00:54:51.000
-This is cue #3290
-
-3291
-00:54:51.000 --> 00:54:52.000
-This is cue #3291
-
-3292
-00:54:52.000 --> 00:54:53.000
-This is cue #3292
-
-3293
-00:54:53.000 --> 00:54:54.000
-This is cue #3293
-
-3294
-00:54:54.000 --> 00:54:55.000
-This is cue #3294
-
-3295
-00:54:55.000 --> 00:54:56.000
-This is cue #3295
-
-3296
-00:54:56.000 --> 00:54:57.000
-This is cue #3296
-
-3297
-00:54:57.000 --> 00:54:58.000
-This is cue #3297
-
-3298
-00:54:58.000 --> 00:54:59.000
-This is cue #3298
-
-3299
-00:54:59.000 --> 00:55:00.000
-This is cue #3299
-
-3300
-00:55:00.000 --> 00:55:01.000
-This is cue #3300
-
-3301
-00:55:01.000 --> 00:55:02.000
-This is cue #3301
-
-3302
-00:55:02.000 --> 00:55:03.000
-This is cue #3302
-
-3303
-00:55:03.000 --> 00:55:04.000
-This is cue #3303
-
-3304
-00:55:04.000 --> 00:55:05.000
-This is cue #3304
-
-3305
-00:55:05.000 --> 00:55:06.000
-This is cue #3305
-
-3306
-00:55:06.000 --> 00:55:07.000
-This is cue #3306
-
-3307
-00:55:07.000 --> 00:55:08.000
-This is cue #3307
-
-3308
-00:55:08.000 --> 00:55:09.000
-This is cue #3308
-
-3309
-00:55:09.000 --> 00:55:10.000
-This is cue #3309
-
-3310
-00:55:10.000 --> 00:55:11.000
-This is cue #3310
-
-3311
-00:55:11.000 --> 00:55:12.000
-This is cue #3311
-
-3312
-00:55:12.000 --> 00:55:13.000
-This is cue #3312
-
-3313
-00:55:13.000 --> 00:55:14.000
-This is cue #3313
-
-3314
-00:55:14.000 --> 00:55:15.000
-This is cue #3314
-
-3315
-00:55:15.000 --> 00:55:16.000
-This is cue #3315
-
-3316
-00:55:16.000 --> 00:55:17.000
-This is cue #3316
-
-3317
-00:55:17.000 --> 00:55:18.000
-This is cue #3317
-
-3318
-00:55:18.000 --> 00:55:19.000
-This is cue #3318
-
-3319
-00:55:19.000 --> 00:55:20.000
-This is cue #3319
-
-3320
-00:55:20.000 --> 00:55:21.000
-This is cue #3320
-
-3321
-00:55:21.000 --> 00:55:22.000
-This is cue #3321
-
-3322
-00:55:22.000 --> 00:55:23.000
-This is cue #3322
-
-3323
-00:55:23.000 --> 00:55:24.000
-This is cue #3323
-
-3324
-00:55:24.000 --> 00:55:25.000
-This is cue #3324
-
-3325
-00:55:25.000 --> 00:55:26.000
-This is cue #3325
-
-3326
-00:55:26.000 --> 00:55:27.000
-This is cue #3326
-
-3327
-00:55:27.000 --> 00:55:28.000
-This is cue #3327
-
-3328
-00:55:28.000 --> 00:55:29.000
-This is cue #3328
-
-3329
-00:55:29.000 --> 00:55:30.000
-This is cue #3329
-
-3330
-00:55:30.000 --> 00:55:31.000
-This is cue #3330
-
-3331
-00:55:31.000 --> 00:55:32.000
-This is cue #3331
-
-3332
-00:55:32.000 --> 00:55:33.000
-This is cue #3332
-
-3333
-00:55:33.000 --> 00:55:34.000
-This is cue #3333
-
-3334
-00:55:34.000 --> 00:55:35.000
-This is cue #3334
-
-3335
-00:55:35.000 --> 00:55:36.000
-This is cue #3335
-
-3336
-00:55:36.000 --> 00:55:37.000
-This is cue #3336
-
-3337
-00:55:37.000 --> 00:55:38.000
-This is cue #3337
-
-3338
-00:55:38.000 --> 00:55:39.000
-This is cue #3338
-
-3339
-00:55:39.000 --> 00:55:40.000
-This is cue #3339
-
-3340
-00:55:40.000 --> 00:55:41.000
-This is cue #3340
-
-3341
-00:55:41.000 --> 00:55:42.000
-This is cue #3341
-
-3342
-00:55:42.000 --> 00:55:43.000
-This is cue #3342
-
-3343
-00:55:43.000 --> 00:55:44.000
-This is cue #3343
-
-3344
-00:55:44.000 --> 00:55:45.000
-This is cue #3344
-
-3345
-00:55:45.000 --> 00:55:46.000
-This is cue #3345
-
-3346
-00:55:46.000 --> 00:55:47.000
-This is cue #3346
-
-3347
-00:55:47.000 --> 00:55:48.000
-This is cue #3347
-
-3348
-00:55:48.000 --> 00:55:49.000
-This is cue #3348
-
-3349
-00:55:49.000 --> 00:55:50.000
-This is cue #3349
-
-3350
-00:55:50.000 --> 00:55:51.000
-This is cue #3350
-
-3351
-00:55:51.000 --> 00:55:52.000
-This is cue #3351
-
-3352
-00:55:52.000 --> 00:55:53.000
-This is cue #3352
-
-3353
-00:55:53.000 --> 00:55:54.000
-This is cue #3353
-
-3354
-00:55:54.000 --> 00:55:55.000
-This is cue #3354
-
-3355
-00:55:55.000 --> 00:55:56.000
-This is cue #3355
-
-3356
-00:55:56.000 --> 00:55:57.000
-This is cue #3356
-
-3357
-00:55:57.000 --> 00:55:58.000
-This is cue #3357
-
-3358
-00:55:58.000 --> 00:55:59.000
-This is cue #3358
-
-3359
-00:55:59.000 --> 00:56:00.000
-This is cue #3359
-
-3360
-00:56:00.000 --> 00:56:01.000
-This is cue #3360
-
-3361
-00:56:01.000 --> 00:56:02.000
-This is cue #3361
-
-3362
-00:56:02.000 --> 00:56:03.000
-This is cue #3362
-
-3363
-00:56:03.000 --> 00:56:04.000
-This is cue #3363
-
-3364
-00:56:04.000 --> 00:56:05.000
-This is cue #3364
-
-3365
-00:56:05.000 --> 00:56:06.000
-This is cue #3365
-
-3366
-00:56:06.000 --> 00:56:07.000
-This is cue #3366
-
-3367
-00:56:07.000 --> 00:56:08.000
-This is cue #3367
-
-3368
-00:56:08.000 --> 00:56:09.000
-This is cue #3368
-
-3369
-00:56:09.000 --> 00:56:10.000
-This is cue #3369
-
-3370
-00:56:10.000 --> 00:56:11.000
-This is cue #3370
-
-3371
-00:56:11.000 --> 00:56:12.000
-This is cue #3371
-
-3372
-00:56:12.000 --> 00:56:13.000
-This is cue #3372
-
-3373
-00:56:13.000 --> 00:56:14.000
-This is cue #3373
-
-3374
-00:56:14.000 --> 00:56:15.000
-This is cue #3374
-
-3375
-00:56:15.000 --> 00:56:16.000
-This is cue #3375
-
-3376
-00:56:16.000 --> 00:56:17.000
-This is cue #3376
-
-3377
-00:56:17.000 --> 00:56:18.000
-This is cue #3377
-
-3378
-00:56:18.000 --> 00:56:19.000
-This is cue #3378
-
-3379
-00:56:19.000 --> 00:56:20.000
-This is cue #3379
-
-3380
-00:56:20.000 --> 00:56:21.000
-This is cue #3380
-
-3381
-00:56:21.000 --> 00:56:22.000
-This is cue #3381
-
-3382
-00:56:22.000 --> 00:56:23.000
-This is cue #3382
-
-3383
-00:56:23.000 --> 00:56:24.000
-This is cue #3383
-
-3384
-00:56:24.000 --> 00:56:25.000
-This is cue #3384
-
-3385
-00:56:25.000 --> 00:56:26.000
-This is cue #3385
-
-3386
-00:56:26.000 --> 00:56:27.000
-This is cue #3386
-
-3387
-00:56:27.000 --> 00:56:28.000
-This is cue #3387
-
-3388
-00:56:28.000 --> 00:56:29.000
-This is cue #3388
-
-3389
-00:56:29.000 --> 00:56:30.000
-This is cue #3389
-
-3390
-00:56:30.000 --> 00:56:31.000
-This is cue #3390
-
-3391
-00:56:31.000 --> 00:56:32.000
-This is cue #3391
-
-3392
-00:56:32.000 --> 00:56:33.000
-This is cue #3392
-
-3393
-00:56:33.000 --> 00:56:34.000
-This is cue #3393
-
-3394
-00:56:34.000 --> 00:56:35.000
-This is cue #3394
-
-3395
-00:56:35.000 --> 00:56:36.000
-This is cue #3395
-
-3396
-00:56:36.000 --> 00:56:37.000
-This is cue #3396
-
-3397
-00:56:37.000 --> 00:56:38.000
-This is cue #3397
-
-3398
-00:56:38.000 --> 00:56:39.000
-This is cue #3398
-
-3399
-00:56:39.000 --> 00:56:40.000
-This is cue #3399
-
-3400
-00:56:40.000 --> 00:56:41.000
-This is cue #3400
-
-3401
-00:56:41.000 --> 00:56:42.000
-This is cue #3401
-
-3402
-00:56:42.000 --> 00:56:43.000
-This is cue #3402
-
-3403
-00:56:43.000 --> 00:56:44.000
-This is cue #3403
-
-3404
-00:56:44.000 --> 00:56:45.000
-This is cue #3404
-
-3405
-00:56:45.000 --> 00:56:46.000
-This is cue #3405
-
-3406
-00:56:46.000 --> 00:56:47.000
-This is cue #3406
-
-3407
-00:56:47.000 --> 00:56:48.000
-This is cue #3407
-
-3408
-00:56:48.000 --> 00:56:49.000
-This is cue #3408
-
-3409
-00:56:49.000 --> 00:56:50.000
-This is cue #3409
-
-3410
-00:56:50.000 --> 00:56:51.000
-This is cue #3410
-
-3411
-00:56:51.000 --> 00:56:52.000
-This is cue #3411
-
-3412
-00:56:52.000 --> 00:56:53.000
-This is cue #3412
-
-3413
-00:56:53.000 --> 00:56:54.000
-This is cue #3413
-
-3414
-00:56:54.000 --> 00:56:55.000
-This is cue #3414
-
-3415
-00:56:55.000 --> 00:56:56.000
-This is cue #3415
-
-3416
-00:56:56.000 --> 00:56:57.000
-This is cue #3416
-
-3417
-00:56:57.000 --> 00:56:58.000
-This is cue #3417
-
-3418
-00:56:58.000 --> 00:56:59.000
-This is cue #3418
-
-3419
-00:56:59.000 --> 00:57:00.000
-This is cue #3419
-
-3420
-00:57:00.000 --> 00:57:01.000
-This is cue #3420
-
-3421
-00:57:01.000 --> 00:57:02.000
-This is cue #3421
-
-3422
-00:57:02.000 --> 00:57:03.000
-This is cue #3422
-
-3423
-00:57:03.000 --> 00:57:04.000
-This is cue #3423
-
-3424
-00:57:04.000 --> 00:57:05.000
-This is cue #3424
-
-3425
-00:57:05.000 --> 00:57:06.000
-This is cue #3425
-
-3426
-00:57:06.000 --> 00:57:07.000
-This is cue #3426
-
-3427
-00:57:07.000 --> 00:57:08.000
-This is cue #3427
-
-3428
-00:57:08.000 --> 00:57:09.000
-This is cue #3428
-
-3429
-00:57:09.000 --> 00:57:10.000
-This is cue #3429
-
-3430
-00:57:10.000 --> 00:57:11.000
-This is cue #3430
-
-3431
-00:57:11.000 --> 00:57:12.000
-This is cue #3431
-
-3432
-00:57:12.000 --> 00:57:13.000
-This is cue #3432
-
-3433
-00:57:13.000 --> 00:57:14.000
-This is cue #3433
-
-3434
-00:57:14.000 --> 00:57:15.000
-This is cue #3434
-
-3435
-00:57:15.000 --> 00:57:16.000
-This is cue #3435
-
-3436
-00:57:16.000 --> 00:57:17.000
-This is cue #3436
-
-3437
-00:57:17.000 --> 00:57:18.000
-This is cue #3437
-
-3438
-00:57:18.000 --> 00:57:19.000
-This is cue #3438
-
-3439
-00:57:19.000 --> 00:57:20.000
-This is cue #3439
-
-3440
-00:57:20.000 --> 00:57:21.000
-This is cue #3440
-
-3441
-00:57:21.000 --> 00:57:22.000
-This is cue #3441
-
-3442
-00:57:22.000 --> 00:57:23.000
-This is cue #3442
-
-3443
-00:57:23.000 --> 00:57:24.000
-This is cue #3443
-
-3444
-00:57:24.000 --> 00:57:25.000
-This is cue #3444
-
-3445
-00:57:25.000 --> 00:57:26.000
-This is cue #3445
-
-3446
-00:57:26.000 --> 00:57:27.000
-This is cue #3446
-
-3447
-00:57:27.000 --> 00:57:28.000
-This is cue #3447
-
-3448
-00:57:28.000 --> 00:57:29.000
-This is cue #3448
-
-3449
-00:57:29.000 --> 00:57:30.000
-This is cue #3449
-
-3450
-00:57:30.000 --> 00:57:31.000
-This is cue #3450
-
-3451
-00:57:31.000 --> 00:57:32.000
-This is cue #3451
-
-3452
-00:57:32.000 --> 00:57:33.000
-This is cue #3452
-
-3453
-00:57:33.000 --> 00:57:34.000
-This is cue #3453
-
-3454
-00:57:34.000 --> 00:57:35.000
-This is cue #3454
-
-3455
-00:57:35.000 --> 00:57:36.000
-This is cue #3455
-
-3456
-00:57:36.000 --> 00:57:37.000
-This is cue #3456
-
-3457
-00:57:37.000 --> 00:57:38.000
-This is cue #3457
-
-3458
-00:57:38.000 --> 00:57:39.000
-This is cue #3458
-
-3459
-00:57:39.000 --> 00:57:40.000
-This is cue #3459
-
-3460
-00:57:40.000 --> 00:57:41.000
-This is cue #3460
-
-3461
-00:57:41.000 --> 00:57:42.000
-This is cue #3461
-
-3462
-00:57:42.000 --> 00:57:43.000
-This is cue #3462
-
-3463
-00:57:43.000 --> 00:57:44.000
-This is cue #3463
-
-3464
-00:57:44.000 --> 00:57:45.000
-This is cue #3464
-
-3465
-00:57:45.000 --> 00:57:46.000
-This is cue #3465
-
-3466
-00:57:46.000 --> 00:57:47.000
-This is cue #3466
-
-3467
-00:57:47.000 --> 00:57:48.000
-This is cue #3467
-
-3468
-00:57:48.000 --> 00:57:49.000
-This is cue #3468
-
-3469
-00:57:49.000 --> 00:57:50.000
-This is cue #3469
-
-3470
-00:57:50.000 --> 00:57:51.000
-This is cue #3470
-
-3471
-00:57:51.000 --> 00:57:52.000
-This is cue #3471
-
-3472
-00:57:52.000 --> 00:57:53.000
-This is cue #3472
-
-3473
-00:57:53.000 --> 00:57:54.000
-This is cue #3473
-
-3474
-00:57:54.000 --> 00:57:55.000
-This is cue #3474
-
-3475
-00:57:55.000 --> 00:57:56.000
-This is cue #3475
-
-3476
-00:57:56.000 --> 00:57:57.000
-This is cue #3476
-
-3477
-00:57:57.000 --> 00:57:58.000
-This is cue #3477
-
-3478
-00:57:58.000 --> 00:57:59.000
-This is cue #3478
-
-3479
-00:57:59.000 --> 00:58:00.000
-This is cue #3479
-
-3480
-00:58:00.000 --> 00:58:01.000
-This is cue #3480
-
-3481
-00:58:01.000 --> 00:58:02.000
-This is cue #3481
-
-3482
-00:58:02.000 --> 00:58:03.000
-This is cue #3482
-
-3483
-00:58:03.000 --> 00:58:04.000
-This is cue #3483
-
-3484
-00:58:04.000 --> 00:58:05.000
-This is cue #3484
-
-3485
-00:58:05.000 --> 00:58:06.000
-This is cue #3485
-
-3486
-00:58:06.000 --> 00:58:07.000
-This is cue #3486
-
-3487
-00:58:07.000 --> 00:58:08.000
-This is cue #3487
-
-3488
-00:58:08.000 --> 00:58:09.000
-This is cue #3488
-
-3489
-00:58:09.000 --> 00:58:10.000
-This is cue #3489
-
-3490
-00:58:10.000 --> 00:58:11.000
-This is cue #3490
-
-3491
-00:58:11.000 --> 00:58:12.000
-This is cue #3491
-
-3492
-00:58:12.000 --> 00:58:13.000
-This is cue #3492
-
-3493
-00:58:13.000 --> 00:58:14.000
-This is cue #3493
-
-3494
-00:58:14.000 --> 00:58:15.000
-This is cue #3494
-
-3495
-00:58:15.000 --> 00:58:16.000
-This is cue #3495
-
-3496
-00:58:16.000 --> 00:58:17.000
-This is cue #3496
-
-3497
-00:58:17.000 --> 00:58:18.000
-This is cue #3497
-
-3498
-00:58:18.000 --> 00:58:19.000
-This is cue #3498
-
-3499
-00:58:19.000 --> 00:58:20.000
-This is cue #3499
-
-3500
-00:58:20.000 --> 00:58:21.000
-This is cue #3500
-
-3501
-00:58:21.000 --> 00:58:22.000
-This is cue #3501
-
-3502
-00:58:22.000 --> 00:58:23.000
-This is cue #3502
-
-3503
-00:58:23.000 --> 00:58:24.000
-This is cue #3503
-
-3504
-00:58:24.000 --> 00:58:25.000
-This is cue #3504
-
-3505
-00:58:25.000 --> 00:58:26.000
-This is cue #3505
-
-3506
-00:58:26.000 --> 00:58:27.000
-This is cue #3506
-
-3507
-00:58:27.000 --> 00:58:28.000
-This is cue #3507
-
-3508
-00:58:28.000 --> 00:58:29.000
-This is cue #3508
-
-3509
-00:58:29.000 --> 00:58:30.000
-This is cue #3509
-
-3510
-00:58:30.000 --> 00:58:31.000
-This is cue #3510
-
-3511
-00:58:31.000 --> 00:58:32.000
-This is cue #3511
-
-3512
-00:58:32.000 --> 00:58:33.000
-This is cue #3512
-
-3513
-00:58:33.000 --> 00:58:34.000
-This is cue #3513
-
-3514
-00:58:34.000 --> 00:58:35.000
-This is cue #3514
-
-3515
-00:58:35.000 --> 00:58:36.000
-This is cue #3515
-
-3516
-00:58:36.000 --> 00:58:37.000
-This is cue #3516
-
-3517
-00:58:37.000 --> 00:58:38.000
-This is cue #3517
-
-3518
-00:58:38.000 --> 00:58:39.000
-This is cue #3518
-
-3519
-00:58:39.000 --> 00:58:40.000
-This is cue #3519
-
-3520
-00:58:40.000 --> 00:58:41.000
-This is cue #3520
-
-3521
-00:58:41.000 --> 00:58:42.000
-This is cue #3521
-
-3522
-00:58:42.000 --> 00:58:43.000
-This is cue #3522
-
-3523
-00:58:43.000 --> 00:58:44.000
-This is cue #3523
-
-3524
-00:58:44.000 --> 00:58:45.000
-This is cue #3524
-
-3525
-00:58:45.000 --> 00:58:46.000
-This is cue #3525
-
-3526
-00:58:46.000 --> 00:58:47.000
-This is cue #3526
-
-3527
-00:58:47.000 --> 00:58:48.000
-This is cue #3527
-
-3528
-00:58:48.000 --> 00:58:49.000
-This is cue #3528
-
-3529
-00:58:49.000 --> 00:58:50.000
-This is cue #3529
-
-3530
-00:58:50.000 --> 00:58:51.000
-This is cue #3530
-
-3531
-00:58:51.000 --> 00:58:52.000
-This is cue #3531
-
-3532
-00:58:52.000 --> 00:58:53.000
-This is cue #3532
-
-3533
-00:58:53.000 --> 00:58:54.000
-This is cue #3533
-
-3534
-00:58:54.000 --> 00:58:55.000
-This is cue #3534
-
-3535
-00:58:55.000 --> 00:58:56.000
-This is cue #3535
-
-3536
-00:58:56.000 --> 00:58:57.000
-This is cue #3536
-
-3537
-00:58:57.000 --> 00:58:58.000
-This is cue #3537
-
-3538
-00:58:58.000 --> 00:58:59.000
-This is cue #3538
-
-3539
-00:58:59.000 --> 00:59:00.000
-This is cue #3539
-
-3540
-00:59:00.000 --> 00:59:01.000
-This is cue #3540
-
-3541
-00:59:01.000 --> 00:59:02.000
-This is cue #3541
-
-3542
-00:59:02.000 --> 00:59:03.000
-This is cue #3542
-
-3543
-00:59:03.000 --> 00:59:04.000
-This is cue #3543
-
-3544
-00:59:04.000 --> 00:59:05.000
-This is cue #3544
-
-3545
-00:59:05.000 --> 00:59:06.000
-This is cue #3545
-
-3546
-00:59:06.000 --> 00:59:07.000
-This is cue #3546
-
-3547
-00:59:07.000 --> 00:59:08.000
-This is cue #3547
-
-3548
-00:59:08.000 --> 00:59:09.000
-This is cue #3548
-
-3549
-00:59:09.000 --> 00:59:10.000
-This is cue #3549
-
-3550
-00:59:10.000 --> 00:59:11.000
-This is cue #3550
-
-3551
-00:59:11.000 --> 00:59:12.000
-This is cue #3551
-
-3552
-00:59:12.000 --> 00:59:13.000
-This is cue #3552
-
-3553
-00:59:13.000 --> 00:59:14.000
-This is cue #3553
-
-3554
-00:59:14.000 --> 00:59:15.000
-This is cue #3554
-
-3555
-00:59:15.000 --> 00:59:16.000
-This is cue #3555
-
-3556
-00:59:16.000 --> 00:59:17.000
-This is cue #3556
-
-3557
-00:59:17.000 --> 00:59:18.000
-This is cue #3557
-
-3558
-00:59:18.000 --> 00:59:19.000
-This is cue #3558
-
-3559
-00:59:19.000 --> 00:59:20.000
-This is cue #3559
-
-3560
-00:59:20.000 --> 00:59:21.000
-This is cue #3560
-
-3561
-00:59:21.000 --> 00:59:22.000
-This is cue #3561
-
-3562
-00:59:22.000 --> 00:59:23.000
-This is cue #3562
-
-3563
-00:59:23.000 --> 00:59:24.000
-This is cue #3563
-
-3564
-00:59:24.000 --> 00:59:25.000
-This is cue #3564
-
-3565
-00:59:25.000 --> 00:59:26.000
-This is cue #3565
-
-3566
-00:59:26.000 --> 00:59:27.000
-This is cue #3566
-
-3567
-00:59:27.000 --> 00:59:28.000
-This is cue #3567
-
-3568
-00:59:28.000 --> 00:59:29.000
-This is cue #3568
-
-3569
-00:59:29.000 --> 00:59:30.000
-This is cue #3569
-
-3570
-00:59:30.000 --> 00:59:31.000
-This is cue #3570
-
-3571
-00:59:31.000 --> 00:59:32.000
-This is cue #3571
-
-3572
-00:59:32.000 --> 00:59:33.000
-This is cue #3572
-
-3573
-00:59:33.000 --> 00:59:34.000
-This is cue #3573
-
-3574
-00:59:34.000 --> 00:59:35.000
-This is cue #3574
-
-3575
-00:59:35.000 --> 00:59:36.000
-This is cue #3575
-
-3576
-00:59:36.000 --> 00:59:37.000
-This is cue #3576
-
-3577
-00:59:37.000 --> 00:59:38.000
-This is cue #3577
-
-3578
-00:59:38.000 --> 00:59:39.000
-This is cue #3578
-
-3579
-00:59:39.000 --> 00:59:40.000
-This is cue #3579
-
-3580
-00:59:40.000 --> 00:59:41.000
-This is cue #3580
-
-3581
-00:59:41.000 --> 00:59:42.000
-This is cue #3581
-
-3582
-00:59:42.000 --> 00:59:43.000
-This is cue #3582
-
-3583
-00:59:43.000 --> 00:59:44.000
-This is cue #3583
-
-3584
-00:59:44.000 --> 00:59:45.000
-This is cue #3584
-
-3585
-00:59:45.000 --> 00:59:46.000
-This is cue #3585
-
-3586
-00:59:46.000 --> 00:59:47.000
-This is cue #3586
-
-3587
-00:59:47.000 --> 00:59:48.000
-This is cue #3587
-
-3588
-00:59:48.000 --> 00:59:49.000
-This is cue #3588
-
-3589
-00:59:49.000 --> 00:59:50.000
-This is cue #3589
-
-3590
-00:59:50.000 --> 00:59:51.000
-This is cue #3590
-
-3591
-00:59:51.000 --> 00:59:52.000
-This is cue #3591
-
-3592
-00:59:52.000 --> 00:59:53.000
-This is cue #3592
-
-3593
-00:59:53.000 --> 00:59:54.000
-This is cue #3593
-
-3594
-00:59:54.000 --> 00:59:55.000
-This is cue #3594
-
-3595
-00:59:55.000 --> 00:59:56.000
-This is cue #3595
-
-3596
-00:59:56.000 --> 00:59:57.000
-This is cue #3596
-
-3597
-00:59:57.000 --> 00:59:58.000
-This is cue #3597
-
-3598
-00:59:58.000 --> 00:59:59.000
-This is cue #3598
-
-3599
-00:59:59.000 --> 01:00:00.000
-This is cue #3599
-
-3600
-01:00:00.000 --> 01:00:01.000
-This is cue #3600
-
-3601
-01:00:01.000 --> 01:00:02.000
-This is cue #3601
-
-3602
-01:00:02.000 --> 01:00:03.000
-This is cue #3602
-
-3603
-01:00:03.000 --> 01:00:04.000
-This is cue #3603
-
-3604
-01:00:04.000 --> 01:00:05.000
-This is cue #3604
-
-3605
-01:00:05.000 --> 01:00:06.000
-This is cue #3605
-
-3606
-01:00:06.000 --> 01:00:07.000
-This is cue #3606
-
-3607
-01:00:07.000 --> 01:00:08.000
-This is cue #3607
-
-3608
-01:00:08.000 --> 01:00:09.000
-This is cue #3608
-
-3609
-01:00:09.000 --> 01:00:10.000
-This is cue #3609
-
-3610
-01:00:10.000 --> 01:00:11.000
-This is cue #3610
-
-3611
-01:00:11.000 --> 01:00:12.000
-This is cue #3611
-
-3612
-01:00:12.000 --> 01:00:13.000
-This is cue #3612
-
-3613
-01:00:13.000 --> 01:00:14.000
-This is cue #3613
-
-3614
-01:00:14.000 --> 01:00:15.000
-This is cue #3614
-
-3615
-01:00:15.000 --> 01:00:16.000
-This is cue #3615
-
-3616
-01:00:16.000 --> 01:00:17.000
-This is cue #3616
-
-3617
-01:00:17.000 --> 01:00:18.000
-This is cue #3617
-
-3618
-01:00:18.000 --> 01:00:19.000
-This is cue #3618
-
-3619
-01:00:19.000 --> 01:00:20.000
-This is cue #3619
-
-3620
-01:00:20.000 --> 01:00:21.000
-This is cue #3620
-
-3621
-01:00:21.000 --> 01:00:22.000
-This is cue #3621
-
-3622
-01:00:22.000 --> 01:00:23.000
-This is cue #3622
-
-3623
-01:00:23.000 --> 01:00:24.000
-This is cue #3623
-
-3624
-01:00:24.000 --> 01:00:25.000
-This is cue #3624
-
-3625
-01:00:25.000 --> 01:00:26.000
-This is cue #3625
-
-3626
-01:00:26.000 --> 01:00:27.000
-This is cue #3626
-
-3627
-01:00:27.000 --> 01:00:28.000
-This is cue #3627
-
-3628
-01:00:28.000 --> 01:00:29.000
-This is cue #3628
-
-3629
-01:00:29.000 --> 01:00:30.000
-This is cue #3629
-
-3630
-01:00:30.000 --> 01:00:31.000
-This is cue #3630
-
-3631
-01:00:31.000 --> 01:00:32.000
-This is cue #3631
-
-3632
-01:00:32.000 --> 01:00:33.000
-This is cue #3632
-
-3633
-01:00:33.000 --> 01:00:34.000
-This is cue #3633
-
-3634
-01:00:34.000 --> 01:00:35.000
-This is cue #3634
-
-3635
-01:00:35.000 --> 01:00:36.000
-This is cue #3635
-
-3636
-01:00:36.000 --> 01:00:37.000
-This is cue #3636
-
-3637
-01:00:37.000 --> 01:00:38.000
-This is cue #3637
-
-3638
-01:00:38.000 --> 01:00:39.000
-This is cue #3638
-
-3639
-01:00:39.000 --> 01:00:40.000
-This is cue #3639
-
-3640
-01:00:40.000 --> 01:00:41.000
-This is cue #3640
-
-3641
-01:00:41.000 --> 01:00:42.000
-This is cue #3641
-
-3642
-01:00:42.000 --> 01:00:43.000
-This is cue #3642
-
-3643
-01:00:43.000 --> 01:00:44.000
-This is cue #3643
-
-3644
-01:00:44.000 --> 01:00:45.000
-This is cue #3644
-
-3645
-01:00:45.000 --> 01:00:46.000
-This is cue #3645
-
-3646
-01:00:46.000 --> 01:00:47.000
-This is cue #3646
-
-3647
-01:00:47.000 --> 01:00:48.000
-This is cue #3647
-
-3648
-01:00:48.000 --> 01:00:49.000
-This is cue #3648
-
-3649
-01:00:49.000 --> 01:00:50.000
-This is cue #3649
-
-3650
-01:00:50.000 --> 01:00:51.000
-This is cue #3650
-
-3651
-01:00:51.000 --> 01:00:52.000
-This is cue #3651
-
-3652
-01:00:52.000 --> 01:00:53.000
-This is cue #3652
-
-3653
-01:00:53.000 --> 01:00:54.000
-This is cue #3653
-
-3654
-01:00:54.000 --> 01:00:55.000
-This is cue #3654
-
-3655
-01:00:55.000 --> 01:00:56.000
-This is cue #3655
-
-3656
-01:00:56.000 --> 01:00:57.000
-This is cue #3656
-
-3657
-01:00:57.000 --> 01:00:58.000
-This is cue #3657
-
-3658
-01:00:58.000 --> 01:00:59.000
-This is cue #3658
-
-3659
-01:00:59.000 --> 01:01:00.000
-This is cue #3659
-
-3660
-01:01:00.000 --> 01:01:01.000
-This is cue #3660
-
-3661
-01:01:01.000 --> 01:01:02.000
-This is cue #3661
-
-3662
-01:01:02.000 --> 01:01:03.000
-This is cue #3662
-
-3663
-01:01:03.000 --> 01:01:04.000
-This is cue #3663
-
-3664
-01:01:04.000 --> 01:01:05.000
-This is cue #3664
-
-3665
-01:01:05.000 --> 01:01:06.000
-This is cue #3665
-
-3666
-01:01:06.000 --> 01:01:07.000
-This is cue #3666
-
-3667
-01:01:07.000 --> 01:01:08.000
-This is cue #3667
-
-3668
-01:01:08.000 --> 01:01:09.000
-This is cue #3668
-
-3669
-01:01:09.000 --> 01:01:10.000
-This is cue #3669
-
-3670
-01:01:10.000 --> 01:01:11.000
-This is cue #3670
-
-3671
-01:01:11.000 --> 01:01:12.000
-This is cue #3671
-
-3672
-01:01:12.000 --> 01:01:13.000
-This is cue #3672
-
-3673
-01:01:13.000 --> 01:01:14.000
-This is cue #3673
-
-3674
-01:01:14.000 --> 01:01:15.000
-This is cue #3674
-
-3675
-01:01:15.000 --> 01:01:16.000
-This is cue #3675
-
-3676
-01:01:16.000 --> 01:01:17.000
-This is cue #3676
-
-3677
-01:01:17.000 --> 01:01:18.000
-This is cue #3677
-
-3678
-01:01:18.000 --> 01:01:19.000
-This is cue #3678
-
-3679
-01:01:19.000 --> 01:01:20.000
-This is cue #3679
-
-3680
-01:01:20.000 --> 01:01:21.000
-This is cue #3680
-
-3681
-01:01:21.000 --> 01:01:22.000
-This is cue #3681
-
-3682
-01:01:22.000 --> 01:01:23.000
-This is cue #3682
-
-3683
-01:01:23.000 --> 01:01:24.000
-This is cue #3683
-
-3684
-01:01:24.000 --> 01:01:25.000
-This is cue #3684
-
-3685
-01:01:25.000 --> 01:01:26.000
-This is cue #3685
-
-3686
-01:01:26.000 --> 01:01:27.000
-This is cue #3686
-
-3687
-01:01:27.000 --> 01:01:28.000
-This is cue #3687
-
-3688
-01:01:28.000 --> 01:01:29.000
-This is cue #3688
-
-3689
-01:01:29.000 --> 01:01:30.000
-This is cue #3689
-
-3690
-01:01:30.000 --> 01:01:31.000
-This is cue #3690
-
-3691
-01:01:31.000 --> 01:01:32.000
-This is cue #3691
-
-3692
-01:01:32.000 --> 01:01:33.000
-This is cue #3692
-
-3693
-01:01:33.000 --> 01:01:34.000
-This is cue #3693
-
-3694
-01:01:34.000 --> 01:01:35.000
-This is cue #3694
-
-3695
-01:01:35.000 --> 01:01:36.000
-This is cue #3695
-
-3696
-01:01:36.000 --> 01:01:37.000
-This is cue #3696
-
-3697
-01:01:37.000 --> 01:01:38.000
-This is cue #3697
-
-3698
-01:01:38.000 --> 01:01:39.000
-This is cue #3698
-
-3699
-01:01:39.000 --> 01:01:40.000
-This is cue #3699
-
-3700
-01:01:40.000 --> 01:01:41.000
-This is cue #3700
-
-3701
-01:01:41.000 --> 01:01:42.000
-This is cue #3701
-
-3702
-01:01:42.000 --> 01:01:43.000
-This is cue #3702
-
-3703
-01:01:43.000 --> 01:01:44.000
-This is cue #3703
-
-3704
-01:01:44.000 --> 01:01:45.000
-This is cue #3704
-
-3705
-01:01:45.000 --> 01:01:46.000
-This is cue #3705
-
-3706
-01:01:46.000 --> 01:01:47.000
-This is cue #3706
-
-3707
-01:01:47.000 --> 01:01:48.000
-This is cue #3707
-
-3708
-01:01:48.000 --> 01:01:49.000
-This is cue #3708
-
-3709
-01:01:49.000 --> 01:01:50.000
-This is cue #3709
-
-3710
-01:01:50.000 --> 01:01:51.000
-This is cue #3710
-
-3711
-01:01:51.000 --> 01:01:52.000
-This is cue #3711
-
-3712
-01:01:52.000 --> 01:01:53.000
-This is cue #3712
-
-3713
-01:01:53.000 --> 01:01:54.000
-This is cue #3713
-
-3714
-01:01:54.000 --> 01:01:55.000
-This is cue #3714
-
-3715
-01:01:55.000 --> 01:01:56.000
-This is cue #3715
-
-3716
-01:01:56.000 --> 01:01:57.000
-This is cue #3716
-
-3717
-01:01:57.000 --> 01:01:58.000
-This is cue #3717
-
-3718
-01:01:58.000 --> 01:01:59.000
-This is cue #3718
-
-3719
-01:01:59.000 --> 01:02:00.000
-This is cue #3719
-
-3720
-01:02:00.000 --> 01:02:01.000
-This is cue #3720
-
-3721
-01:02:01.000 --> 01:02:02.000
-This is cue #3721
-
-3722
-01:02:02.000 --> 01:02:03.000
-This is cue #3722
-
-3723
-01:02:03.000 --> 01:02:04.000
-This is cue #3723
-
-3724
-01:02:04.000 --> 01:02:05.000
-This is cue #3724
-
-3725
-01:02:05.000 --> 01:02:06.000
-This is cue #3725
-
-3726
-01:02:06.000 --> 01:02:07.000
-This is cue #3726
-
-3727
-01:02:07.000 --> 01:02:08.000
-This is cue #3727
-
-3728
-01:02:08.000 --> 01:02:09.000
-This is cue #3728
-
-3729
-01:02:09.000 --> 01:02:10.000
-This is cue #3729
-
-3730
-01:02:10.000 --> 01:02:11.000
-This is cue #3730
-
-3731
-01:02:11.000 --> 01:02:12.000
-This is cue #3731
-
-3732
-01:02:12.000 --> 01:02:13.000
-This is cue #3732
-
-3733
-01:02:13.000 --> 01:02:14.000
-This is cue #3733
-
-3734
-01:02:14.000 --> 01:02:15.000
-This is cue #3734
-
-3735
-01:02:15.000 --> 01:02:16.000
-This is cue #3735
-
-3736
-01:02:16.000 --> 01:02:17.000
-This is cue #3736
-
-3737
-01:02:17.000 --> 01:02:18.000
-This is cue #3737
-
-3738
-01:02:18.000 --> 01:02:19.000
-This is cue #3738
-
-3739
-01:02:19.000 --> 01:02:20.000
-This is cue #3739
-
-3740
-01:02:20.000 --> 01:02:21.000
-This is cue #3740
-
-3741
-01:02:21.000 --> 01:02:22.000
-This is cue #3741
-
-3742
-01:02:22.000 --> 01:02:23.000
-This is cue #3742
-
-3743
-01:02:23.000 --> 01:02:24.000
-This is cue #3743
-
-3744
-01:02:24.000 --> 01:02:25.000
-This is cue #3744
-
-3745
-01:02:25.000 --> 01:02:26.000
-This is cue #3745
-
-3746
-01:02:26.000 --> 01:02:27.000
-This is cue #3746
-
-3747
-01:02:27.000 --> 01:02:28.000
-This is cue #3747
-
-3748
-01:02:28.000 --> 01:02:29.000
-This is cue #3748
-
-3749
-01:02:29.000 --> 01:02:30.000
-This is cue #3749
-
-3750
-01:02:30.000 --> 01:02:31.000
-This is cue #3750
-
-3751
-01:02:31.000 --> 01:02:32.000
-This is cue #3751
-
-3752
-01:02:32.000 --> 01:02:33.000
-This is cue #3752
-
-3753
-01:02:33.000 --> 01:02:34.000
-This is cue #3753
-
-3754
-01:02:34.000 --> 01:02:35.000
-This is cue #3754
-
-3755
-01:02:35.000 --> 01:02:36.000
-This is cue #3755
-
-3756
-01:02:36.000 --> 01:02:37.000
-This is cue #3756
-
-3757
-01:02:37.000 --> 01:02:38.000
-This is cue #3757
-
-3758
-01:02:38.000 --> 01:02:39.000
-This is cue #3758
-
-3759
-01:02:39.000 --> 01:02:40.000
-This is cue #3759
-
-3760
-01:02:40.000 --> 01:02:41.000
-This is cue #3760
-
-3761
-01:02:41.000 --> 01:02:42.000
-This is cue #3761
-
-3762
-01:02:42.000 --> 01:02:43.000
-This is cue #3762
-
-3763
-01:02:43.000 --> 01:02:44.000
-This is cue #3763
-
-3764
-01:02:44.000 --> 01:02:45.000
-This is cue #3764
-
-3765
-01:02:45.000 --> 01:02:46.000
-This is cue #3765
-
-3766
-01:02:46.000 --> 01:02:47.000
-This is cue #3766
-
-3767
-01:02:47.000 --> 01:02:48.000
-This is cue #3767
-
-3768
-01:02:48.000 --> 01:02:49.000
-This is cue #3768
-
-3769
-01:02:49.000 --> 01:02:50.000
-This is cue #3769
-
-3770
-01:02:50.000 --> 01:02:51.000
-This is cue #3770
-
-3771
-01:02:51.000 --> 01:02:52.000
-This is cue #3771
-
-3772
-01:02:52.000 --> 01:02:53.000
-This is cue #3772
-
-3773
-01:02:53.000 --> 01:02:54.000
-This is cue #3773
-
-3774
-01:02:54.000 --> 01:02:55.000
-This is cue #3774
-
-3775
-01:02:55.000 --> 01:02:56.000
-This is cue #3775
-
-3776
-01:02:56.000 --> 01:02:57.000
-This is cue #3776
-
-3777
-01:02:57.000 --> 01:02:58.000
-This is cue #3777
-
-3778
-01:02:58.000 --> 01:02:59.000
-This is cue #3778
-
-3779
-01:02:59.000 --> 01:03:00.000
-This is cue #3779
-
-3780
-01:03:00.000 --> 01:03:01.000
-This is cue #3780
-
-3781
-01:03:01.000 --> 01:03:02.000
-This is cue #3781
-
-3782
-01:03:02.000 --> 01:03:03.000
-This is cue #3782
-
-3783
-01:03:03.000 --> 01:03:04.000
-This is cue #3783
-
-3784
-01:03:04.000 --> 01:03:05.000
-This is cue #3784
-
-3785
-01:03:05.000 --> 01:03:06.000
-This is cue #3785
-
-3786
-01:03:06.000 --> 01:03:07.000
-This is cue #3786
-
-3787
-01:03:07.000 --> 01:03:08.000
-This is cue #3787
-
-3788
-01:03:08.000 --> 01:03:09.000
-This is cue #3788
-
-3789
-01:03:09.000 --> 01:03:10.000
-This is cue #3789
-
-3790
-01:03:10.000 --> 01:03:11.000
-This is cue #3790
-
-3791
-01:03:11.000 --> 01:03:12.000
-This is cue #3791
-
-3792
-01:03:12.000 --> 01:03:13.000
-This is cue #3792
-
-3793
-01:03:13.000 --> 01:03:14.000
-This is cue #3793
-
-3794
-01:03:14.000 --> 01:03:15.000
-This is cue #3794
-
-3795
-01:03:15.000 --> 01:03:16.000
-This is cue #3795
-
-3796
-01:03:16.000 --> 01:03:17.000
-This is cue #3796
-
-3797
-01:03:17.000 --> 01:03:18.000
-This is cue #3797
-
-3798
-01:03:18.000 --> 01:03:19.000
-This is cue #3798
-
-3799
-01:03:19.000 --> 01:03:20.000
-This is cue #3799
-
-3800
-01:03:20.000 --> 01:03:21.000
-This is cue #3800
-
-3801
-01:03:21.000 --> 01:03:22.000
-This is cue #3801
-
-3802
-01:03:22.000 --> 01:03:23.000
-This is cue #3802
-
-3803
-01:03:23.000 --> 01:03:24.000
-This is cue #3803
-
-3804
-01:03:24.000 --> 01:03:25.000
-This is cue #3804
-
-3805
-01:03:25.000 --> 01:03:26.000
-This is cue #3805
-
-3806
-01:03:26.000 --> 01:03:27.000
-This is cue #3806
-
-3807
-01:03:27.000 --> 01:03:28.000
-This is cue #3807
-
-3808
-01:03:28.000 --> 01:03:29.000
-This is cue #3808
-
-3809
-01:03:29.000 --> 01:03:30.000
-This is cue #3809
-
-3810
-01:03:30.000 --> 01:03:31.000
-This is cue #3810
-
-3811
-01:03:31.000 --> 01:03:32.000
-This is cue #3811
-
-3812
-01:03:32.000 --> 01:03:33.000
-This is cue #3812
-
-3813
-01:03:33.000 --> 01:03:34.000
-This is cue #3813
-
-3814
-01:03:34.000 --> 01:03:35.000
-This is cue #3814
-
-3815
-01:03:35.000 --> 01:03:36.000
-This is cue #3815
-
-3816
-01:03:36.000 --> 01:03:37.000
-This is cue #3816
-
-3817
-01:03:37.000 --> 01:03:38.000
-This is cue #3817
-
-3818
-01:03:38.000 --> 01:03:39.000
-This is cue #3818
-
-3819
-01:03:39.000 --> 01:03:40.000
-This is cue #3819
-
-3820
-01:03:40.000 --> 01:03:41.000
-This is cue #3820
-
-3821
-01:03:41.000 --> 01:03:42.000
-This is cue #3821
-
-3822
-01:03:42.000 --> 01:03:43.000
-This is cue #3822
-
-3823
-01:03:43.000 --> 01:03:44.000
-This is cue #3823
-
-3824
-01:03:44.000 --> 01:03:45.000
-This is cue #3824
-
-3825
-01:03:45.000 --> 01:03:46.000
-This is cue #3825
-
-3826
-01:03:46.000 --> 01:03:47.000
-This is cue #3826
-
-3827
-01:03:47.000 --> 01:03:48.000
-This is cue #3827
-
-3828
-01:03:48.000 --> 01:03:49.000
-This is cue #3828
-
-3829
-01:03:49.000 --> 01:03:50.000
-This is cue #3829
-
-3830
-01:03:50.000 --> 01:03:51.000
-This is cue #3830
-
-3831
-01:03:51.000 --> 01:03:52.000
-This is cue #3831
-
-3832
-01:03:52.000 --> 01:03:53.000
-This is cue #3832
-
-3833
-01:03:53.000 --> 01:03:54.000
-This is cue #3833
-
-3834
-01:03:54.000 --> 01:03:55.000
-This is cue #3834
-
-3835
-01:03:55.000 --> 01:03:56.000
-This is cue #3835
-
-3836
-01:03:56.000 --> 01:03:57.000
-This is cue #3836
-
-3837
-01:03:57.000 --> 01:03:58.000
-This is cue #3837
-
-3838
-01:03:58.000 --> 01:03:59.000
-This is cue #3838
-
-3839
-01:03:59.000 --> 01:04:00.000
-This is cue #3839
-
-3840
-01:04:00.000 --> 01:04:01.000
-This is cue #3840
-
-3841
-01:04:01.000 --> 01:04:02.000
-This is cue #3841
-
-3842
-01:04:02.000 --> 01:04:03.000
-This is cue #3842
-
-3843
-01:04:03.000 --> 01:04:04.000
-This is cue #3843
-
-3844
-01:04:04.000 --> 01:04:05.000
-This is cue #3844
-
-3845
-01:04:05.000 --> 01:04:06.000
-This is cue #3845
-
-3846
-01:04:06.000 --> 01:04:07.000
-This is cue #3846
-
-3847
-01:04:07.000 --> 01:04:08.000
-This is cue #3847
-
-3848
-01:04:08.000 --> 01:04:09.000
-This is cue #3848
-
-3849
-01:04:09.000 --> 01:04:10.000
-This is cue #3849
-
-3850
-01:04:10.000 --> 01:04:11.000
-This is cue #3850
-
-3851
-01:04:11.000 --> 01:04:12.000
-This is cue #3851
-
-3852
-01:04:12.000 --> 01:04:13.000
-This is cue #3852
-
-3853
-01:04:13.000 --> 01:04:14.000
-This is cue #3853
-
-3854
-01:04:14.000 --> 01:04:15.000
-This is cue #3854
-
-3855
-01:04:15.000 --> 01:04:16.000
-This is cue #3855
-
-3856
-01:04:16.000 --> 01:04:17.000
-This is cue #3856
-
-3857
-01:04:17.000 --> 01:04:18.000
-This is cue #3857
-
-3858
-01:04:18.000 --> 01:04:19.000
-This is cue #3858
-
-3859
-01:04:19.000 --> 01:04:20.000
-This is cue #3859
-
-3860
-01:04:20.000 --> 01:04:21.000
-This is cue #3860
-
-3861
-01:04:21.000 --> 01:04:22.000
-This is cue #3861
-
-3862
-01:04:22.000 --> 01:04:23.000
-This is cue #3862
-
-3863
-01:04:23.000 --> 01:04:24.000
-This is cue #3863
-
-3864
-01:04:24.000 --> 01:04:25.000
-This is cue #3864
-
-3865
-01:04:25.000 --> 01:04:26.000
-This is cue #3865
-
-3866
-01:04:26.000 --> 01:04:27.000
-This is cue #3866
-
-3867
-01:04:27.000 --> 01:04:28.000
-This is cue #3867
-
-3868
-01:04:28.000 --> 01:04:29.000
-This is cue #3868
-
-3869
-01:04:29.000 --> 01:04:30.000
-This is cue #3869
-
-3870
-01:04:30.000 --> 01:04:31.000
-This is cue #3870
-
-3871
-01:04:31.000 --> 01:04:32.000
-This is cue #3871
-
-3872
-01:04:32.000 --> 01:04:33.000
-This is cue #3872
-
-3873
-01:04:33.000 --> 01:04:34.000
-This is cue #3873
-
-3874
-01:04:34.000 --> 01:04:35.000
-This is cue #3874
-
-3875
-01:04:35.000 --> 01:04:36.000
-This is cue #3875
-
-3876
-01:04:36.000 --> 01:04:37.000
-This is cue #3876
-
-3877
-01:04:37.000 --> 01:04:38.000
-This is cue #3877
-
-3878
-01:04:38.000 --> 01:04:39.000
-This is cue #3878
-
-3879
-01:04:39.000 --> 01:04:40.000
-This is cue #3879
-
-3880
-01:04:40.000 --> 01:04:41.000
-This is cue #3880
-
-3881
-01:04:41.000 --> 01:04:42.000
-This is cue #3881
-
-3882
-01:04:42.000 --> 01:04:43.000
-This is cue #3882
-
-3883
-01:04:43.000 --> 01:04:44.000
-This is cue #3883
-
-3884
-01:04:44.000 --> 01:04:45.000
-This is cue #3884
-
-3885
-01:04:45.000 --> 01:04:46.000
-This is cue #3885
-
-3886
-01:04:46.000 --> 01:04:47.000
-This is cue #3886
-
-3887
-01:04:47.000 --> 01:04:48.000
-This is cue #3887
-
-3888
-01:04:48.000 --> 01:04:49.000
-This is cue #3888
-
-3889
-01:04:49.000 --> 01:04:50.000
-This is cue #3889
-
-3890
-01:04:50.000 --> 01:04:51.000
-This is cue #3890
-
-3891
-01:04:51.000 --> 01:04:52.000
-This is cue #3891
-
-3892
-01:04:52.000 --> 01:04:53.000
-This is cue #3892
-
-3893
-01:04:53.000 --> 01:04:54.000
-This is cue #3893
-
-3894
-01:04:54.000 --> 01:04:55.000
-This is cue #3894
-
-3895
-01:04:55.000 --> 01:04:56.000
-This is cue #3895
-
-3896
-01:04:56.000 --> 01:04:57.000
-This is cue #3896
-
-3897
-01:04:57.000 --> 01:04:58.000
-This is cue #3897
-
-3898
-01:04:58.000 --> 01:04:59.000
-This is cue #3898
-
-3899
-01:04:59.000 --> 01:05:00.000
-This is cue #3899
-
-3900
-01:05:00.000 --> 01:05:01.000
-This is cue #3900
-
-3901
-01:05:01.000 --> 01:05:02.000
-This is cue #3901
-
-3902
-01:05:02.000 --> 01:05:03.000
-This is cue #3902
-
-3903
-01:05:03.000 --> 01:05:04.000
-This is cue #3903
-
-3904
-01:05:04.000 --> 01:05:05.000
-This is cue #3904
-
-3905
-01:05:05.000 --> 01:05:06.000
-This is cue #3905
-
-3906
-01:05:06.000 --> 01:05:07.000
-This is cue #3906
-
-3907
-01:05:07.000 --> 01:05:08.000
-This is cue #3907
-
-3908
-01:05:08.000 --> 01:05:09.000
-This is cue #3908
-
-3909
-01:05:09.000 --> 01:05:10.000
-This is cue #3909
-
-3910
-01:05:10.000 --> 01:05:11.000
-This is cue #3910
-
-3911
-01:05:11.000 --> 01:05:12.000
-This is cue #3911
-
-3912
-01:05:12.000 --> 01:05:13.000
-This is cue #3912
-
-3913
-01:05:13.000 --> 01:05:14.000
-This is cue #3913
-
-3914
-01:05:14.000 --> 01:05:15.000
-This is cue #3914
-
-3915
-01:05:15.000 --> 01:05:16.000
-This is cue #3915
-
-3916
-01:05:16.000 --> 01:05:17.000
-This is cue #3916
-
-3917
-01:05:17.000 --> 01:05:18.000
-This is cue #3917
-
-3918
-01:05:18.000 --> 01:05:19.000
-This is cue #3918
-
-3919
-01:05:19.000 --> 01:05:20.000
-This is cue #3919
-
-3920
-01:05:20.000 --> 01:05:21.000
-This is cue #3920
-
-3921
-01:05:21.000 --> 01:05:22.000
-This is cue #3921
-
-3922
-01:05:22.000 --> 01:05:23.000
-This is cue #3922
-
-3923
-01:05:23.000 --> 01:05:24.000
-This is cue #3923
-
-3924
-01:05:24.000 --> 01:05:25.000
-This is cue #3924
-
-3925
-01:05:25.000 --> 01:05:26.000
-This is cue #3925
-
-3926
-01:05:26.000 --> 01:05:27.000
-This is cue #3926
-
-3927
-01:05:27.000 --> 01:05:28.000
-This is cue #3927
-
-3928
-01:05:28.000 --> 01:05:29.000
-This is cue #3928
-
-3929
-01:05:29.000 --> 01:05:30.000
-This is cue #3929
-
-3930
-01:05:30.000 --> 01:05:31.000
-This is cue #3930
-
-3931
-01:05:31.000 --> 01:05:32.000
-This is cue #3931
-
-3932
-01:05:32.000 --> 01:05:33.000
-This is cue #3932
-
-3933
-01:05:33.000 --> 01:05:34.000
-This is cue #3933
-
-3934
-01:05:34.000 --> 01:05:35.000
-This is cue #3934
-
-3935
-01:05:35.000 --> 01:05:36.000
-This is cue #3935
-
-3936
-01:05:36.000 --> 01:05:37.000
-This is cue #3936
-
-3937
-01:05:37.000 --> 01:05:38.000
-This is cue #3937
-
-3938
-01:05:38.000 --> 01:05:39.000
-This is cue #3938
-
-3939
-01:05:39.000 --> 01:05:40.000
-This is cue #3939
-
-3940
-01:05:40.000 --> 01:05:41.000
-This is cue #3940
-
-3941
-01:05:41.000 --> 01:05:42.000
-This is cue #3941
-
-3942
-01:05:42.000 --> 01:05:43.000
-This is cue #3942
-
-3943
-01:05:43.000 --> 01:05:44.000
-This is cue #3943
-
-3944
-01:05:44.000 --> 01:05:45.000
-This is cue #3944
-
-3945
-01:05:45.000 --> 01:05:46.000
-This is cue #3945
-
-3946
-01:05:46.000 --> 01:05:47.000
-This is cue #3946
-
-3947
-01:05:47.000 --> 01:05:48.000
-This is cue #3947
-
-3948
-01:05:48.000 --> 01:05:49.000
-This is cue #3948
-
-3949
-01:05:49.000 --> 01:05:50.000
-This is cue #3949
-
-3950
-01:05:50.000 --> 01:05:51.000
-This is cue #3950
-
-3951
-01:05:51.000 --> 01:05:52.000
-This is cue #3951
-
-3952
-01:05:52.000 --> 01:05:53.000
-This is cue #3952
-
-3953
-01:05:53.000 --> 01:05:54.000
-This is cue #3953
-
-3954
-01:05:54.000 --> 01:05:55.000
-This is cue #3954
-
-3955
-01:05:55.000 --> 01:05:56.000
-This is cue #3955
-
-3956
-01:05:56.000 --> 01:05:57.000
-This is cue #3956
-
-3957
-01:05:57.000 --> 01:05:58.000
-This is cue #3957
-
-3958
-01:05:58.000 --> 01:05:59.000
-This is cue #3958
-
-3959
-01:05:59.000 --> 01:06:00.000
-This is cue #3959
-
-3960
-01:06:00.000 --> 01:06:01.000
-This is cue #3960
-
-3961
-01:06:01.000 --> 01:06:02.000
-This is cue #3961
-
-3962
-01:06:02.000 --> 01:06:03.000
-This is cue #3962
-
-3963
-01:06:03.000 --> 01:06:04.000
-This is cue #3963
-
-3964
-01:06:04.000 --> 01:06:05.000
-This is cue #3964
-
-3965
-01:06:05.000 --> 01:06:06.000
-This is cue #3965
-
-3966
-01:06:06.000 --> 01:06:07.000
-This is cue #3966
-
-3967
-01:06:07.000 --> 01:06:08.000
-This is cue #3967
-
-3968
-01:06:08.000 --> 01:06:09.000
-This is cue #3968
-
-3969
-01:06:09.000 --> 01:06:10.000
-This is cue #3969
-
-3970
-01:06:10.000 --> 01:06:11.000
-This is cue #3970
-
-3971
-01:06:11.000 --> 01:06:12.000
-This is cue #3971
-
-3972
-01:06:12.000 --> 01:06:13.000
-This is cue #3972
-
-3973
-01:06:13.000 --> 01:06:14.000
-This is cue #3973
-
-3974
-01:06:14.000 --> 01:06:15.000
-This is cue #3974
-
-3975
-01:06:15.000 --> 01:06:16.000
-This is cue #3975
-
-3976
-01:06:16.000 --> 01:06:17.000
-This is cue #3976
-
-3977
-01:06:17.000 --> 01:06:18.000
-This is cue #3977
-
-3978
-01:06:18.000 --> 01:06:19.000
-This is cue #3978
-
-3979
-01:06:19.000 --> 01:06:20.000
-This is cue #3979
-
-3980
-01:06:20.000 --> 01:06:21.000
-This is cue #3980
-
-3981
-01:06:21.000 --> 01:06:22.000
-This is cue #3981
-
-3982
-01:06:22.000 --> 01:06:23.000
-This is cue #3982
-
-3983
-01:06:23.000 --> 01:06:24.000
-This is cue #3983
-
-3984
-01:06:24.000 --> 01:06:25.000
-This is cue #3984
-
-3985
-01:06:25.000 --> 01:06:26.000
-This is cue #3985
-
-3986
-01:06:26.000 --> 01:06:27.000
-This is cue #3986
-
-3987
-01:06:27.000 --> 01:06:28.000
-This is cue #3987
-
-3988
-01:06:28.000 --> 01:06:29.000
-This is cue #3988
-
-3989
-01:06:29.000 --> 01:06:30.000
-This is cue #3989
-
-3990
-01:06:30.000 --> 01:06:31.000
-This is cue #3990
-
-3991
-01:06:31.000 --> 01:06:32.000
-This is cue #3991
-
-3992
-01:06:32.000 --> 01:06:33.000
-This is cue #3992
-
-3993
-01:06:33.000 --> 01:06:34.000
-This is cue #3993
-
-3994
-01:06:34.000 --> 01:06:35.000
-This is cue #3994
-
-3995
-01:06:35.000 --> 01:06:36.000
-This is cue #3995
-
-3996
-01:06:36.000 --> 01:06:37.000
-This is cue #3996
-
-3997
-01:06:37.000 --> 01:06:38.000
-This is cue #3997
-
-3998
-01:06:38.000 --> 01:06:39.000
-This is cue #3998
-
-3999
-01:06:39.000 --> 01:06:40.000
-This is cue #3999
-
-4000
-01:06:40.000 --> 01:06:41.000
-This is cue #4000
-
-4001
-01:06:41.000 --> 01:06:42.000
-This is cue #4001
-
-4002
-01:06:42.000 --> 01:06:43.000
-This is cue #4002
-
-4003
-01:06:43.000 --> 01:06:44.000
-This is cue #4003
-
-4004
-01:06:44.000 --> 01:06:45.000
-This is cue #4004
-
-4005
-01:06:45.000 --> 01:06:46.000
-This is cue #4005
-
-4006
-01:06:46.000 --> 01:06:47.000
-This is cue #4006
-
-4007
-01:06:47.000 --> 01:06:48.000
-This is cue #4007
-
-4008
-01:06:48.000 --> 01:06:49.000
-This is cue #4008
-
-4009
-01:06:49.000 --> 01:06:50.000
-This is cue #4009
-
-4010
-01:06:50.000 --> 01:06:51.000
-This is cue #4010
-
-4011
-01:06:51.000 --> 01:06:52.000
-This is cue #4011
-
-4012
-01:06:52.000 --> 01:06:53.000
-This is cue #4012
-
-4013
-01:06:53.000 --> 01:06:54.000
-This is cue #4013
-
-4014
-01:06:54.000 --> 01:06:55.000
-This is cue #4014
-
-4015
-01:06:55.000 --> 01:06:56.000
-This is cue #4015
-
-4016
-01:06:56.000 --> 01:06:57.000
-This is cue #4016
-
-4017
-01:06:57.000 --> 01:06:58.000
-This is cue #4017
-
-4018
-01:06:58.000 --> 01:06:59.000
-This is cue #4018
-
-4019
-01:06:59.000 --> 01:07:00.000
-This is cue #4019
-
-4020
-01:07:00.000 --> 01:07:01.000
-This is cue #4020
-
-4021
-01:07:01.000 --> 01:07:02.000
-This is cue #4021
-
-4022
-01:07:02.000 --> 01:07:03.000
-This is cue #4022
-
-4023
-01:07:03.000 --> 01:07:04.000
-This is cue #4023
-
-4024
-01:07:04.000 --> 01:07:05.000
-This is cue #4024
-
-4025
-01:07:05.000 --> 01:07:06.000
-This is cue #4025
-
-4026
-01:07:06.000 --> 01:07:07.000
-This is cue #4026
-
-4027
-01:07:07.000 --> 01:07:08.000
-This is cue #4027
-
-4028
-01:07:08.000 --> 01:07:09.000
-This is cue #4028
-
-4029
-01:07:09.000 --> 01:07:10.000
-This is cue #4029
-
-4030
-01:07:10.000 --> 01:07:11.000
-This is cue #4030
-
-4031
-01:07:11.000 --> 01:07:12.000
-This is cue #4031
-
-4032
-01:07:12.000 --> 01:07:13.000
-This is cue #4032
-
-4033
-01:07:13.000 --> 01:07:14.000
-This is cue #4033
-
-4034
-01:07:14.000 --> 01:07:15.000
-This is cue #4034
-
-4035
-01:07:15.000 --> 01:07:16.000
-This is cue #4035
-
-4036
-01:07:16.000 --> 01:07:17.000
-This is cue #4036
-
-4037
-01:07:17.000 --> 01:07:18.000
-This is cue #4037
-
-4038
-01:07:18.000 --> 01:07:19.000
-This is cue #4038
-
-4039
-01:07:19.000 --> 01:07:20.000
-This is cue #4039
-
-4040
-01:07:20.000 --> 01:07:21.000
-This is cue #4040
-
-4041
-01:07:21.000 --> 01:07:22.000
-This is cue #4041
-
-4042
-01:07:22.000 --> 01:07:23.000
-This is cue #4042
-
-4043
-01:07:23.000 --> 01:07:24.000
-This is cue #4043
-
-4044
-01:07:24.000 --> 01:07:25.000
-This is cue #4044
-
-4045
-01:07:25.000 --> 01:07:26.000
-This is cue #4045
-
-4046
-01:07:26.000 --> 01:07:27.000
-This is cue #4046
-
-4047
-01:07:27.000 --> 01:07:28.000
-This is cue #4047
-
-4048
-01:07:28.000 --> 01:07:29.000
-This is cue #4048
-
-4049
-01:07:29.000 --> 01:07:30.000
-This is cue #4049
-
-4050
-01:07:30.000 --> 01:07:31.000
-This is cue #4050
-
-4051
-01:07:31.000 --> 01:07:32.000
-This is cue #4051
-
-4052
-01:07:32.000 --> 01:07:33.000
-This is cue #4052
-
-4053
-01:07:33.000 --> 01:07:34.000
-This is cue #4053
-
-4054
-01:07:34.000 --> 01:07:35.000
-This is cue #4054
-
-4055
-01:07:35.000 --> 01:07:36.000
-This is cue #4055
-
-4056
-01:07:36.000 --> 01:07:37.000
-This is cue #4056
-
-4057
-01:07:37.000 --> 01:07:38.000
-This is cue #4057
-
-4058
-01:07:38.000 --> 01:07:39.000
-This is cue #4058
-
-4059
-01:07:39.000 --> 01:07:40.000
-This is cue #4059
-
-4060
-01:07:40.000 --> 01:07:41.000
-This is cue #4060
-
-4061
-01:07:41.000 --> 01:07:42.000
-This is cue #4061
-
-4062
-01:07:42.000 --> 01:07:43.000
-This is cue #4062
-
-4063
-01:07:43.000 --> 01:07:44.000
-This is cue #4063
-
-4064
-01:07:44.000 --> 01:07:45.000
-This is cue #4064
-
-4065
-01:07:45.000 --> 01:07:46.000
-This is cue #4065
-
-4066
-01:07:46.000 --> 01:07:47.000
-This is cue #4066
-
-4067
-01:07:47.000 --> 01:07:48.000
-This is cue #4067
-
-4068
-01:07:48.000 --> 01:07:49.000
-This is cue #4068
-
-4069
-01:07:49.000 --> 01:07:50.000
-This is cue #4069
-
-4070
-01:07:50.000 --> 01:07:51.000
-This is cue #4070
-
-4071
-01:07:51.000 --> 01:07:52.000
-This is cue #4071
-
-4072
-01:07:52.000 --> 01:07:53.000
-This is cue #4072
-
-4073
-01:07:53.000 --> 01:07:54.000
-This is cue #4073
-
-4074
-01:07:54.000 --> 01:07:55.000
-This is cue #4074
-
-4075
-01:07:55.000 --> 01:07:56.000
-This is cue #4075
-
-4076
-01:07:56.000 --> 01:07:57.000
-This is cue #4076
-
-4077
-01:07:57.000 --> 01:07:58.000
-This is cue #4077
-
-4078
-01:07:58.000 --> 01:07:59.000
-This is cue #4078
-
-4079
-01:07:59.000 --> 01:08:00.000
-This is cue #4079
-
-4080
-01:08:00.000 --> 01:08:01.000
-This is cue #4080
-
-4081
-01:08:01.000 --> 01:08:02.000
-This is cue #4081
-
-4082
-01:08:02.000 --> 01:08:03.000
-This is cue #4082
-
-4083
-01:08:03.000 --> 01:08:04.000
-This is cue #4083
-
-4084
-01:08:04.000 --> 01:08:05.000
-This is cue #4084
-
-4085
-01:08:05.000 --> 01:08:06.000
-This is cue #4085
-
-4086
-01:08:06.000 --> 01:08:07.000
-This is cue #4086
-
-4087
-01:08:07.000 --> 01:08:08.000
-This is cue #4087
-
-4088
-01:08:08.000 --> 01:08:09.000
-This is cue #4088
-
-4089
-01:08:09.000 --> 01:08:10.000
-This is cue #4089
-
-4090
-01:08:10.000 --> 01:08:11.000
-This is cue #4090
-
-4091
-01:08:11.000 --> 01:08:12.000
-This is cue #4091
-
-4092
-01:08:12.000 --> 01:08:13.000
-This is cue #4092
-
-4093
-01:08:13.000 --> 01:08:14.000
-This is cue #4093
-
-4094
-01:08:14.000 --> 01:08:15.000
-This is cue #4094
-
-4095
-01:08:15.000 --> 01:08:16.000
-This is cue #4095
-
-4096
-01:08:16.000 --> 01:08:17.000
-This is cue #4096
-
-4097
-01:08:17.000 --> 01:08:18.000
-This is cue #4097
-
-4098
-01:08:18.000 --> 01:08:19.000
-This is cue #4098
-
-4099
-01:08:19.000 --> 01:08:20.000
-This is cue #4099
-
-4100
-01:08:20.000 --> 01:08:21.000
-This is cue #4100
-
-4101
-01:08:21.000 --> 01:08:22.000
-This is cue #4101
-
-4102
-01:08:22.000 --> 01:08:23.000
-This is cue #4102
-
-4103
-01:08:23.000 --> 01:08:24.000
-This is cue #4103
-
-4104
-01:08:24.000 --> 01:08:25.000
-This is cue #4104
-
-4105
-01:08:25.000 --> 01:08:26.000
-This is cue #4105
-
-4106
-01:08:26.000 --> 01:08:27.000
-This is cue #4106
-
-4107
-01:08:27.000 --> 01:08:28.000
-This is cue #4107
-
-4108
-01:08:28.000 --> 01:08:29.000
-This is cue #4108
-
-4109
-01:08:29.000 --> 01:08:30.000
-This is cue #4109
-
-4110
-01:08:30.000 --> 01:08:31.000
-This is cue #4110
-
-4111
-01:08:31.000 --> 01:08:32.000
-This is cue #4111
-
-4112
-01:08:32.000 --> 01:08:33.000
-This is cue #4112
-
-4113
-01:08:33.000 --> 01:08:34.000
-This is cue #4113
-
-4114
-01:08:34.000 --> 01:08:35.000
-This is cue #4114
-
-4115
-01:08:35.000 --> 01:08:36.000
-This is cue #4115
-
-4116
-01:08:36.000 --> 01:08:37.000
-This is cue #4116
-
-4117
-01:08:37.000 --> 01:08:38.000
-This is cue #4117
-
-4118
-01:08:38.000 --> 01:08:39.000
-This is cue #4118
-
-4119
-01:08:39.000 --> 01:08:40.000
-This is cue #4119
-
-4120
-01:08:40.000 --> 01:08:41.000
-This is cue #4120
-
-4121
-01:08:41.000 --> 01:08:42.000
-This is cue #4121
-
-4122
-01:08:42.000 --> 01:08:43.000
-This is cue #4122
-
-4123
-01:08:43.000 --> 01:08:44.000
-This is cue #4123
-
-4124
-01:08:44.000 --> 01:08:45.000
-This is cue #4124
-
-4125
-01:08:45.000 --> 01:08:46.000
-This is cue #4125
-
-4126
-01:08:46.000 --> 01:08:47.000
-This is cue #4126
-
-4127
-01:08:47.000 --> 01:08:48.000
-This is cue #4127
-
-4128
-01:08:48.000 --> 01:08:49.000
-This is cue #4128
-
-4129
-01:08:49.000 --> 01:08:50.000
-This is cue #4129
-
-4130
-01:08:50.000 --> 01:08:51.000
-This is cue #4130
-
-4131
-01:08:51.000 --> 01:08:52.000
-This is cue #4131
-
-4132
-01:08:52.000 --> 01:08:53.000
-This is cue #4132
-
-4133
-01:08:53.000 --> 01:08:54.000
-This is cue #4133
-
-4134
-01:08:54.000 --> 01:08:55.000
-This is cue #4134
-
-4135
-01:08:55.000 --> 01:08:56.000
-This is cue #4135
-
-4136
-01:08:56.000 --> 01:08:57.000
-This is cue #4136
-
-4137
-01:08:57.000 --> 01:08:58.000
-This is cue #4137
-
-4138
-01:08:58.000 --> 01:08:59.000
-This is cue #4138
-
-4139
-01:08:59.000 --> 01:09:00.000
-This is cue #4139
-
-4140
-01:09:00.000 --> 01:09:01.000
-This is cue #4140
-
-4141
-01:09:01.000 --> 01:09:02.000
-This is cue #4141
-
-4142
-01:09:02.000 --> 01:09:03.000
-This is cue #4142
-
-4143
-01:09:03.000 --> 01:09:04.000
-This is cue #4143
-
-4144
-01:09:04.000 --> 01:09:05.000
-This is cue #4144
-
-4145
-01:09:05.000 --> 01:09:06.000
-This is cue #4145
-
-4146
-01:09:06.000 --> 01:09:07.000
-This is cue #4146
-
-4147
-01:09:07.000 --> 01:09:08.000
-This is cue #4147
-
-4148
-01:09:08.000 --> 01:09:09.000
-This is cue #4148
-
-4149
-01:09:09.000 --> 01:09:10.000
-This is cue #4149
-
-4150
-01:09:10.000 --> 01:09:11.000
-This is cue #4150
-
-4151
-01:09:11.000 --> 01:09:12.000
-This is cue #4151
-
-4152
-01:09:12.000 --> 01:09:13.000
-This is cue #4152
-
-4153
-01:09:13.000 --> 01:09:14.000
-This is cue #4153
-
-4154
-01:09:14.000 --> 01:09:15.000
-This is cue #4154
-
-4155
-01:09:15.000 --> 01:09:16.000
-This is cue #4155
-
-4156
-01:09:16.000 --> 01:09:17.000
-This is cue #4156
-
-4157
-01:09:17.000 --> 01:09:18.000
-This is cue #4157
-
-4158
-01:09:18.000 --> 01:09:19.000
-This is cue #4158
-
-4159
-01:09:19.000 --> 01:09:20.000
-This is cue #4159
-
-4160
-01:09:20.000 --> 01:09:21.000
-This is cue #4160
-
-4161
-01:09:21.000 --> 01:09:22.000
-This is cue #4161
-
-4162
-01:09:22.000 --> 01:09:23.000
-This is cue #4162
-
-4163
-01:09:23.000 --> 01:09:24.000
-This is cue #4163
-
-4164
-01:09:24.000 --> 01:09:25.000
-This is cue #4164
-
-4165
-01:09:25.000 --> 01:09:26.000
-This is cue #4165
-
-4166
-01:09:26.000 --> 01:09:27.000
-This is cue #4166
-
-4167
-01:09:27.000 --> 01:09:28.000
-This is cue #4167
-
-4168
-01:09:28.000 --> 01:09:29.000
-This is cue #4168
-
-4169
-01:09:29.000 --> 01:09:30.000
-This is cue #4169
-
-4170
-01:09:30.000 --> 01:09:31.000
-This is cue #4170
-
-4171
-01:09:31.000 --> 01:09:32.000
-This is cue #4171
-
-4172
-01:09:32.000 --> 01:09:33.000
-This is cue #4172
-
-4173
-01:09:33.000 --> 01:09:34.000
-This is cue #4173
-
-4174
-01:09:34.000 --> 01:09:35.000
-This is cue #4174
-
-4175
-01:09:35.000 --> 01:09:36.000
-This is cue #4175
-
-4176
-01:09:36.000 --> 01:09:37.000
-This is cue #4176
-
-4177
-01:09:37.000 --> 01:09:38.000
-This is cue #4177
-
-4178
-01:09:38.000 --> 01:09:39.000
-This is cue #4178
-
-4179
-01:09:39.000 --> 01:09:40.000
-This is cue #4179
-
-4180
-01:09:40.000 --> 01:09:41.000
-This is cue #4180
-
-4181
-01:09:41.000 --> 01:09:42.000
-This is cue #4181
-
-4182
-01:09:42.000 --> 01:09:43.000
-This is cue #4182
-
-4183
-01:09:43.000 --> 01:09:44.000
-This is cue #4183
-
-4184
-01:09:44.000 --> 01:09:45.000
-This is cue #4184
-
-4185
-01:09:45.000 --> 01:09:46.000
-This is cue #4185
-
-4186
-01:09:46.000 --> 01:09:47.000
-This is cue #4186
-
-4187
-01:09:47.000 --> 01:09:48.000
-This is cue #4187
-
-4188
-01:09:48.000 --> 01:09:49.000
-This is cue #4188
-
-4189
-01:09:49.000 --> 01:09:50.000
-This is cue #4189
-
-4190
-01:09:50.000 --> 01:09:51.000
-This is cue #4190
-
-4191
-01:09:51.000 --> 01:09:52.000
-This is cue #4191
-
-4192
-01:09:52.000 --> 01:09:53.000
-This is cue #4192
-
-4193
-01:09:53.000 --> 01:09:54.000
-This is cue #4193
-
-4194
-01:09:54.000 --> 01:09:55.000
-This is cue #4194
-
-4195
-01:09:55.000 --> 01:09:56.000
-This is cue #4195
-
-4196
-01:09:56.000 --> 01:09:57.000
-This is cue #4196
-
-4197
-01:09:57.000 --> 01:09:58.000
-This is cue #4197
-
-4198
-01:09:58.000 --> 01:09:59.000
-This is cue #4198
-
-4199
-01:09:59.000 --> 01:10:00.000
-This is cue #4199
-
-4200
-01:10:00.000 --> 01:10:01.000
-This is cue #4200
-
-4201
-01:10:01.000 --> 01:10:02.000
-This is cue #4201
-
-4202
-01:10:02.000 --> 01:10:03.000
-This is cue #4202
-
-4203
-01:10:03.000 --> 01:10:04.000
-This is cue #4203
-
-4204
-01:10:04.000 --> 01:10:05.000
-This is cue #4204
-
-4205
-01:10:05.000 --> 01:10:06.000
-This is cue #4205
-
-4206
-01:10:06.000 --> 01:10:07.000
-This is cue #4206
-
-4207
-01:10:07.000 --> 01:10:08.000
-This is cue #4207
-
-4208
-01:10:08.000 --> 01:10:09.000
-This is cue #4208
-
-4209
-01:10:09.000 --> 01:10:10.000
-This is cue #4209
-
-4210
-01:10:10.000 --> 01:10:11.000
-This is cue #4210
-
-4211
-01:10:11.000 --> 01:10:12.000
-This is cue #4211
-
-4212
-01:10:12.000 --> 01:10:13.000
-This is cue #4212
-
-4213
-01:10:13.000 --> 01:10:14.000
-This is cue #4213
-
-4214
-01:10:14.000 --> 01:10:15.000
-This is cue #4214
-
-4215
-01:10:15.000 --> 01:10:16.000
-This is cue #4215
-
-4216
-01:10:16.000 --> 01:10:17.000
-This is cue #4216
-
-4217
-01:10:17.000 --> 01:10:18.000
-This is cue #4217
-
-4218
-01:10:18.000 --> 01:10:19.000
-This is cue #4218
-
-4219
-01:10:19.000 --> 01:10:20.000
-This is cue #4219
-
-4220
-01:10:20.000 --> 01:10:21.000
-This is cue #4220
-
-4221
-01:10:21.000 --> 01:10:22.000
-This is cue #4221
-
-4222
-01:10:22.000 --> 01:10:23.000
-This is cue #4222
-
-4223
-01:10:23.000 --> 01:10:24.000
-This is cue #4223
-
-4224
-01:10:24.000 --> 01:10:25.000
-This is cue #4224
-
-4225
-01:10:25.000 --> 01:10:26.000
-This is cue #4225
-
-4226
-01:10:26.000 --> 01:10:27.000
-This is cue #4226
-
-4227
-01:10:27.000 --> 01:10:28.000
-This is cue #4227
-
-4228
-01:10:28.000 --> 01:10:29.000
-This is cue #4228
-
-4229
-01:10:29.000 --> 01:10:30.000
-This is cue #4229
-
-4230
-01:10:30.000 --> 01:10:31.000
-This is cue #4230
-
-4231
-01:10:31.000 --> 01:10:32.000
-This is cue #4231
-
-4232
-01:10:32.000 --> 01:10:33.000
-This is cue #4232
-
-4233
-01:10:33.000 --> 01:10:34.000
-This is cue #4233
-
-4234
-01:10:34.000 --> 01:10:35.000
-This is cue #4234
-
-4235
-01:10:35.000 --> 01:10:36.000
-This is cue #4235
-
-4236
-01:10:36.000 --> 01:10:37.000
-This is cue #4236
-
-4237
-01:10:37.000 --> 01:10:38.000
-This is cue #4237
-
-4238
-01:10:38.000 --> 01:10:39.000
-This is cue #4238
-
-4239
-01:10:39.000 --> 01:10:40.000
-This is cue #4239
-
-4240
-01:10:40.000 --> 01:10:41.000
-This is cue #4240
-
-4241
-01:10:41.000 --> 01:10:42.000
-This is cue #4241
-
-4242
-01:10:42.000 --> 01:10:43.000
-This is cue #4242
-
-4243
-01:10:43.000 --> 01:10:44.000
-This is cue #4243
-
-4244
-01:10:44.000 --> 01:10:45.000
-This is cue #4244
-
-4245
-01:10:45.000 --> 01:10:46.000
-This is cue #4245
-
-4246
-01:10:46.000 --> 01:10:47.000
-This is cue #4246
-
-4247
-01:10:47.000 --> 01:10:48.000
-This is cue #4247
-
-4248
-01:10:48.000 --> 01:10:49.000
-This is cue #4248
-
-4249
-01:10:49.000 --> 01:10:50.000
-This is cue #4249
-
-4250
-01:10:50.000 --> 01:10:51.000
-This is cue #4250
-
-4251
-01:10:51.000 --> 01:10:52.000
-This is cue #4251
-
-4252
-01:10:52.000 --> 01:10:53.000
-This is cue #4252
-
-4253
-01:10:53.000 --> 01:10:54.000
-This is cue #4253
-
-4254
-01:10:54.000 --> 01:10:55.000
-This is cue #4254
-
-4255
-01:10:55.000 --> 01:10:56.000
-This is cue #4255
-
-4256
-01:10:56.000 --> 01:10:57.000
-This is cue #4256
-
-4257
-01:10:57.000 --> 01:10:58.000
-This is cue #4257
-
-4258
-01:10:58.000 --> 01:10:59.000
-This is cue #4258
-
-4259
-01:10:59.000 --> 01:11:00.000
-This is cue #4259
-
-4260
-01:11:00.000 --> 01:11:01.000
-This is cue #4260
-
-4261
-01:11:01.000 --> 01:11:02.000
-This is cue #4261
-
-4262
-01:11:02.000 --> 01:11:03.000
-This is cue #4262
-
-4263
-01:11:03.000 --> 01:11:04.000
-This is cue #4263
-
-4264
-01:11:04.000 --> 01:11:05.000
-This is cue #4264
-
-4265
-01:11:05.000 --> 01:11:06.000
-This is cue #4265
-
-4266
-01:11:06.000 --> 01:11:07.000
-This is cue #4266
-
-4267
-01:11:07.000 --> 01:11:08.000
-This is cue #4267
-
-4268
-01:11:08.000 --> 01:11:09.000
-This is cue #4268
-
-4269
-01:11:09.000 --> 01:11:10.000
-This is cue #4269
-
-4270
-01:11:10.000 --> 01:11:11.000
-This is cue #4270
-
-4271
-01:11:11.000 --> 01:11:12.000
-This is cue #4271
-
-4272
-01:11:12.000 --> 01:11:13.000
-This is cue #4272
-
-4273
-01:11:13.000 --> 01:11:14.000
-This is cue #4273
-
-4274
-01:11:14.000 --> 01:11:15.000
-This is cue #4274
-
-4275
-01:11:15.000 --> 01:11:16.000
-This is cue #4275
-
-4276
-01:11:16.000 --> 01:11:17.000
-This is cue #4276
-
-4277
-01:11:17.000 --> 01:11:18.000
-This is cue #4277
-
-4278
-01:11:18.000 --> 01:11:19.000
-This is cue #4278
-
-4279
-01:11:19.000 --> 01:11:20.000
-This is cue #4279
-
-4280
-01:11:20.000 --> 01:11:21.000
-This is cue #4280
-
-4281
-01:11:21.000 --> 01:11:22.000
-This is cue #4281
-
-4282
-01:11:22.000 --> 01:11:23.000
-This is cue #4282
-
-4283
-01:11:23.000 --> 01:11:24.000
-This is cue #4283
-
-4284
-01:11:24.000 --> 01:11:25.000
-This is cue #4284
-
-4285
-01:11:25.000 --> 01:11:26.000
-This is cue #4285
-
-4286
-01:11:26.000 --> 01:11:27.000
-This is cue #4286
-
-4287
-01:11:27.000 --> 01:11:28.000
-This is cue #4287
-
-4288
-01:11:28.000 --> 01:11:29.000
-This is cue #4288
-
-4289
-01:11:29.000 --> 01:11:30.000
-This is cue #4289
-
-4290
-01:11:30.000 --> 01:11:31.000
-This is cue #4290
-
-4291
-01:11:31.000 --> 01:11:32.000
-This is cue #4291
-
-4292
-01:11:32.000 --> 01:11:33.000
-This is cue #4292
-
-4293
-01:11:33.000 --> 01:11:34.000
-This is cue #4293
-
-4294
-01:11:34.000 --> 01:11:35.000
-This is cue #4294
-
-4295
-01:11:35.000 --> 01:11:36.000
-This is cue #4295
-
-4296
-01:11:36.000 --> 01:11:37.000
-This is cue #4296
-
-4297
-01:11:37.000 --> 01:11:38.000
-This is cue #4297
-
-4298
-01:11:38.000 --> 01:11:39.000
-This is cue #4298
-
-4299
-01:11:39.000 --> 01:11:40.000
-This is cue #4299
-
-4300
-01:11:40.000 --> 01:11:41.000
-This is cue #4300
-
-4301
-01:11:41.000 --> 01:11:42.000
-This is cue #4301
-
-4302
-01:11:42.000 --> 01:11:43.000
-This is cue #4302
-
-4303
-01:11:43.000 --> 01:11:44.000
-This is cue #4303
-
-4304
-01:11:44.000 --> 01:11:45.000
-This is cue #4304
-
-4305
-01:11:45.000 --> 01:11:46.000
-This is cue #4305
-
-4306
-01:11:46.000 --> 01:11:47.000
-This is cue #4306
-
-4307
-01:11:47.000 --> 01:11:48.000
-This is cue #4307
-
-4308
-01:11:48.000 --> 01:11:49.000
-This is cue #4308
-
-4309
-01:11:49.000 --> 01:11:50.000
-This is cue #4309
-
-4310
-01:11:50.000 --> 01:11:51.000
-This is cue #4310
-
-4311
-01:11:51.000 --> 01:11:52.000
-This is cue #4311
-
-4312
-01:11:52.000 --> 01:11:53.000
-This is cue #4312
-
-4313
-01:11:53.000 --> 01:11:54.000
-This is cue #4313
-
-4314
-01:11:54.000 --> 01:11:55.000
-This is cue #4314
-
-4315
-01:11:55.000 --> 01:11:56.000
-This is cue #4315
-
-4316
-01:11:56.000 --> 01:11:57.000
-This is cue #4316
-
-4317
-01:11:57.000 --> 01:11:58.000
-This is cue #4317
-
-4318
-01:11:58.000 --> 01:11:59.000
-This is cue #4318
-
-4319
-01:11:59.000 --> 01:12:00.000
-This is cue #4319
-
-4320
-01:12:00.000 --> 01:12:01.000
-This is cue #4320
-
-4321
-01:12:01.000 --> 01:12:02.000
-This is cue #4321
-
-4322
-01:12:02.000 --> 01:12:03.000
-This is cue #4322
-
-4323
-01:12:03.000 --> 01:12:04.000
-This is cue #4323
-
-4324
-01:12:04.000 --> 01:12:05.000
-This is cue #4324
-
-4325
-01:12:05.000 --> 01:12:06.000
-This is cue #4325
-
-4326
-01:12:06.000 --> 01:12:07.000
-This is cue #4326
-
-4327
-01:12:07.000 --> 01:12:08.000
-This is cue #4327
-
-4328
-01:12:08.000 --> 01:12:09.000
-This is cue #4328
-
-4329
-01:12:09.000 --> 01:12:10.000
-This is cue #4329
-
-4330
-01:12:10.000 --> 01:12:11.000
-This is cue #4330
-
-4331
-01:12:11.000 --> 01:12:12.000
-This is cue #4331
-
-4332
-01:12:12.000 --> 01:12:13.000
-This is cue #4332
-
-4333
-01:12:13.000 --> 01:12:14.000
-This is cue #4333
-
-4334
-01:12:14.000 --> 01:12:15.000
-This is cue #4334
-
-4335
-01:12:15.000 --> 01:12:16.000
-This is cue #4335
-
-4336
-01:12:16.000 --> 01:12:17.000
-This is cue #4336
-
-4337
-01:12:17.000 --> 01:12:18.000
-This is cue #4337
-
-4338
-01:12:18.000 --> 01:12:19.000
-This is cue #4338
-
-4339
-01:12:19.000 --> 01:12:20.000
-This is cue #4339
-
-4340
-01:12:20.000 --> 01:12:21.000
-This is cue #4340
-
-4341
-01:12:21.000 --> 01:12:22.000
-This is cue #4341
-
-4342
-01:12:22.000 --> 01:12:23.000
-This is cue #4342
-
-4343
-01:12:23.000 --> 01:12:24.000
-This is cue #4343
-
-4344
-01:12:24.000 --> 01:12:25.000
-This is cue #4344
-
-4345
-01:12:25.000 --> 01:12:26.000
-This is cue #4345
-
-4346
-01:12:26.000 --> 01:12:27.000
-This is cue #4346
-
-4347
-01:12:27.000 --> 01:12:28.000
-This is cue #4347
-
-4348
-01:12:28.000 --> 01:12:29.000
-This is cue #4348
-
-4349
-01:12:29.000 --> 01:12:30.000
-This is cue #4349
-
-4350
-01:12:30.000 --> 01:12:31.000
-This is cue #4350
-
-4351
-01:12:31.000 --> 01:12:32.000
-This is cue #4351
-
-4352
-01:12:32.000 --> 01:12:33.000
-This is cue #4352
-
-4353
-01:12:33.000 --> 01:12:34.000
-This is cue #4353
-
-4354
-01:12:34.000 --> 01:12:35.000
-This is cue #4354
-
-4355
-01:12:35.000 --> 01:12:36.000
-This is cue #4355
-
-4356
-01:12:36.000 --> 01:12:37.000
-This is cue #4356
-
-4357
-01:12:37.000 --> 01:12:38.000
-This is cue #4357
-
-4358
-01:12:38.000 --> 01:12:39.000
-This is cue #4358
-
-4359
-01:12:39.000 --> 01:12:40.000
-This is cue #4359
-
-4360
-01:12:40.000 --> 01:12:41.000
-This is cue #4360
-
-4361
-01:12:41.000 --> 01:12:42.000
-This is cue #4361
-
-4362
-01:12:42.000 --> 01:12:43.000
-This is cue #4362
-
-4363
-01:12:43.000 --> 01:12:44.000
-This is cue #4363
-
-4364
-01:12:44.000 --> 01:12:45.000
-This is cue #4364
-
-4365
-01:12:45.000 --> 01:12:46.000
-This is cue #4365
-
-4366
-01:12:46.000 --> 01:12:47.000
-This is cue #4366
-
-4367
-01:12:47.000 --> 01:12:48.000
-This is cue #4367
-
-4368
-01:12:48.000 --> 01:12:49.000
-This is cue #4368
-
-4369
-01:12:49.000 --> 01:12:50.000
-This is cue #4369
-
-4370
-01:12:50.000 --> 01:12:51.000
-This is cue #4370
-
-4371
-01:12:51.000 --> 01:12:52.000
-This is cue #4371
-
-4372
-01:12:52.000 --> 01:12:53.000
-This is cue #4372
-
-4373
-01:12:53.000 --> 01:12:54.000
-This is cue #4373
-
-4374
-01:12:54.000 --> 01:12:55.000
-This is cue #4374
-
-4375
-01:12:55.000 --> 01:12:56.000
-This is cue #4375
-
-4376
-01:12:56.000 --> 01:12:57.000
-This is cue #4376
-
-4377
-01:12:57.000 --> 01:12:58.000
-This is cue #4377
-
-4378
-01:12:58.000 --> 01:12:59.000
-This is cue #4378
-
-4379
-01:12:59.000 --> 01:13:00.000
-This is cue #4379
-
-4380
-01:13:00.000 --> 01:13:01.000
-This is cue #4380
-
-4381
-01:13:01.000 --> 01:13:02.000
-This is cue #4381
-
-4382
-01:13:02.000 --> 01:13:03.000
-This is cue #4382
-
-4383
-01:13:03.000 --> 01:13:04.000
-This is cue #4383
-
-4384
-01:13:04.000 --> 01:13:05.000
-This is cue #4384
-
-4385
-01:13:05.000 --> 01:13:06.000
-This is cue #4385
-
-4386
-01:13:06.000 --> 01:13:07.000
-This is cue #4386
-
-4387
-01:13:07.000 --> 01:13:08.000
-This is cue #4387
-
-4388
-01:13:08.000 --> 01:13:09.000
-This is cue #4388
-
-4389
-01:13:09.000 --> 01:13:10.000
-This is cue #4389
-
-4390
-01:13:10.000 --> 01:13:11.000
-This is cue #4390
-
-4391
-01:13:11.000 --> 01:13:12.000
-This is cue #4391
-
-4392
-01:13:12.000 --> 01:13:13.000
-This is cue #4392
-
-4393
-01:13:13.000 --> 01:13:14.000
-This is cue #4393
-
-4394
-01:13:14.000 --> 01:13:15.000
-This is cue #4394
-
-4395
-01:13:15.000 --> 01:13:16.000
-This is cue #4395
-
-4396
-01:13:16.000 --> 01:13:17.000
-This is cue #4396
-
-4397
-01:13:17.000 --> 01:13:18.000
-This is cue #4397
-
-4398
-01:13:18.000 --> 01:13:19.000
-This is cue #4398
-
-4399
-01:13:19.000 --> 01:13:20.000
-This is cue #4399
-
-4400
-01:13:20.000 --> 01:13:21.000
-This is cue #4400
-
-4401
-01:13:21.000 --> 01:13:22.000
-This is cue #4401
-
-4402
-01:13:22.000 --> 01:13:23.000
-This is cue #4402
-
-4403
-01:13:23.000 --> 01:13:24.000
-This is cue #4403
-
-4404
-01:13:24.000 --> 01:13:25.000
-This is cue #4404
-
-4405
-01:13:25.000 --> 01:13:26.000
-This is cue #4405
-
-4406
-01:13:26.000 --> 01:13:27.000
-This is cue #4406
-
-4407
-01:13:27.000 --> 01:13:28.000
-This is cue #4407
-
-4408
-01:13:28.000 --> 01:13:29.000
-This is cue #4408
-
-4409
-01:13:29.000 --> 01:13:30.000
-This is cue #4409
-
-4410
-01:13:30.000 --> 01:13:31.000
-This is cue #4410
-
-4411
-01:13:31.000 --> 01:13:32.000
-This is cue #4411
-
-4412
-01:13:32.000 --> 01:13:33.000
-This is cue #4412
-
-4413
-01:13:33.000 --> 01:13:34.000
-This is cue #4413
-
-4414
-01:13:34.000 --> 01:13:35.000
-This is cue #4414
-
-4415
-01:13:35.000 --> 01:13:36.000
-This is cue #4415
-
-4416
-01:13:36.000 --> 01:13:37.000
-This is cue #4416
-
-4417
-01:13:37.000 --> 01:13:38.000
-This is cue #4417
-
-4418
-01:13:38.000 --> 01:13:39.000
-This is cue #4418
-
-4419
-01:13:39.000 --> 01:13:40.000
-This is cue #4419
-
-4420
-01:13:40.000 --> 01:13:41.000
-This is cue #4420
-
-4421
-01:13:41.000 --> 01:13:42.000
-This is cue #4421
-
-4422
-01:13:42.000 --> 01:13:43.000
-This is cue #4422
-
-4423
-01:13:43.000 --> 01:13:44.000
-This is cue #4423
-
-4424
-01:13:44.000 --> 01:13:45.000
-This is cue #4424
-
-4425
-01:13:45.000 --> 01:13:46.000
-This is cue #4425
-
-4426
-01:13:46.000 --> 01:13:47.000
-This is cue #4426
-
-4427
-01:13:47.000 --> 01:13:48.000
-This is cue #4427
-
-4428
-01:13:48.000 --> 01:13:49.000
-This is cue #4428
-
-4429
-01:13:49.000 --> 01:13:50.000
-This is cue #4429
-
-4430
-01:13:50.000 --> 01:13:51.000
-This is cue #4430
-
-4431
-01:13:51.000 --> 01:13:52.000
-This is cue #4431
-
-4432
-01:13:52.000 --> 01:13:53.000
-This is cue #4432
-
-4433
-01:13:53.000 --> 01:13:54.000
-This is cue #4433
-
-4434
-01:13:54.000 --> 01:13:55.000
-This is cue #4434
-
-4435
-01:13:55.000 --> 01:13:56.000
-This is cue #4435
-
-4436
-01:13:56.000 --> 01:13:57.000
-This is cue #4436
-
-4437
-01:13:57.000 --> 01:13:58.000
-This is cue #4437
-
-4438
-01:13:58.000 --> 01:13:59.000
-This is cue #4438
-
-4439
-01:13:59.000 --> 01:14:00.000
-This is cue #4439
-
-4440
-01:14:00.000 --> 01:14:01.000
-This is cue #4440
-
-4441
-01:14:01.000 --> 01:14:02.000
-This is cue #4441
-
-4442
-01:14:02.000 --> 01:14:03.000
-This is cue #4442
-
-4443
-01:14:03.000 --> 01:14:04.000
-This is cue #4443
-
-4444
-01:14:04.000 --> 01:14:05.000
-This is cue #4444
-
-4445
-01:14:05.000 --> 01:14:06.000
-This is cue #4445
-
-4446
-01:14:06.000 --> 01:14:07.000
-This is cue #4446
-
-4447
-01:14:07.000 --> 01:14:08.000
-This is cue #4447
-
-4448
-01:14:08.000 --> 01:14:09.000
-This is cue #4448
-
-4449
-01:14:09.000 --> 01:14:10.000
-This is cue #4449
-
-4450
-01:14:10.000 --> 01:14:11.000
-This is cue #4450
-
-4451
-01:14:11.000 --> 01:14:12.000
-This is cue #4451
-
-4452
-01:14:12.000 --> 01:14:13.000
-This is cue #4452
-
-4453
-01:14:13.000 --> 01:14:14.000
-This is cue #4453
-
-4454
-01:14:14.000 --> 01:14:15.000
-This is cue #4454
-
-4455
-01:14:15.000 --> 01:14:16.000
-This is cue #4455
-
-4456
-01:14:16.000 --> 01:14:17.000
-This is cue #4456
-
-4457
-01:14:17.000 --> 01:14:18.000
-This is cue #4457
-
-4458
-01:14:18.000 --> 01:14:19.000
-This is cue #4458
-
-4459
-01:14:19.000 --> 01:14:20.000
-This is cue #4459
-
-4460
-01:14:20.000 --> 01:14:21.000
-This is cue #4460
-
-4461
-01:14:21.000 --> 01:14:22.000
-This is cue #4461
-
-4462
-01:14:22.000 --> 01:14:23.000
-This is cue #4462
-
-4463
-01:14:23.000 --> 01:14:24.000
-This is cue #4463
-
-4464
-01:14:24.000 --> 01:14:25.000
-This is cue #4464
-
-4465
-01:14:25.000 --> 01:14:26.000
-This is cue #4465
-
-4466
-01:14:26.000 --> 01:14:27.000
-This is cue #4466
-
-4467
-01:14:27.000 --> 01:14:28.000
-This is cue #4467
-
-4468
-01:14:28.000 --> 01:14:29.000
-This is cue #4468
-
-4469
-01:14:29.000 --> 01:14:30.000
-This is cue #4469
-
-4470
-01:14:30.000 --> 01:14:31.000
-This is cue #4470
-
-4471
-01:14:31.000 --> 01:14:32.000
-This is cue #4471
-
-4472
-01:14:32.000 --> 01:14:33.000
-This is cue #4472
-
-4473
-01:14:33.000 --> 01:14:34.000
-This is cue #4473
-
-4474
-01:14:34.000 --> 01:14:35.000
-This is cue #4474
-
-4475
-01:14:35.000 --> 01:14:36.000
-This is cue #4475
-
-4476
-01:14:36.000 --> 01:14:37.000
-This is cue #4476
-
-4477
-01:14:37.000 --> 01:14:38.000
-This is cue #4477
-
-4478
-01:14:38.000 --> 01:14:39.000
-This is cue #4478
-
-4479
-01:14:39.000 --> 01:14:40.000
-This is cue #4479
-
-4480
-01:14:40.000 --> 01:14:41.000
-This is cue #4480
-
-4481
-01:14:41.000 --> 01:14:42.000
-This is cue #4481
-
-4482
-01:14:42.000 --> 01:14:43.000
-This is cue #4482
-
-4483
-01:14:43.000 --> 01:14:44.000
-This is cue #4483
-
-4484
-01:14:44.000 --> 01:14:45.000
-This is cue #4484
-
-4485
-01:14:45.000 --> 01:14:46.000
-This is cue #4485
-
-4486
-01:14:46.000 --> 01:14:47.000
-This is cue #4486
-
-4487
-01:14:47.000 --> 01:14:48.000
-This is cue #4487
-
-4488
-01:14:48.000 --> 01:14:49.000
-This is cue #4488
-
-4489
-01:14:49.000 --> 01:14:50.000
-This is cue #4489
-
-4490
-01:14:50.000 --> 01:14:51.000
-This is cue #4490
-
-4491
-01:14:51.000 --> 01:14:52.000
-This is cue #4491
-
-4492
-01:14:52.000 --> 01:14:53.000
-This is cue #4492
-
-4493
-01:14:53.000 --> 01:14:54.000
-This is cue #4493
-
-4494
-01:14:54.000 --> 01:14:55.000
-This is cue #4494
-
-4495
-01:14:55.000 --> 01:14:56.000
-This is cue #4495
-
-4496
-01:14:56.000 --> 01:14:57.000
-This is cue #4496
-
-4497
-01:14:57.000 --> 01:14:58.000
-This is cue #4497
-
-4498
-01:14:58.000 --> 01:14:59.000
-This is cue #4498
-
-4499
-01:14:59.000 --> 01:15:00.000
-This is cue #4499
-
-4500
-01:15:00.000 --> 01:15:01.000
-This is cue #4500
-
-4501
-01:15:01.000 --> 01:15:02.000
-This is cue #4501
-
-4502
-01:15:02.000 --> 01:15:03.000
-This is cue #4502
-
-4503
-01:15:03.000 --> 01:15:04.000
-This is cue #4503
-
-4504
-01:15:04.000 --> 01:15:05.000
-This is cue #4504
-
-4505
-01:15:05.000 --> 01:15:06.000
-This is cue #4505
-
-4506
-01:15:06.000 --> 01:15:07.000
-This is cue #4506
-
-4507
-01:15:07.000 --> 01:15:08.000
-This is cue #4507
-
-4508
-01:15:08.000 --> 01:15:09.000
-This is cue #4508
-
-4509
-01:15:09.000 --> 01:15:10.000
-This is cue #4509
-
-4510
-01:15:10.000 --> 01:15:11.000
-This is cue #4510
-
-4511
-01:15:11.000 --> 01:15:12.000
-This is cue #4511
-
-4512
-01:15:12.000 --> 01:15:13.000
-This is cue #4512
-
-4513
-01:15:13.000 --> 01:15:14.000
-This is cue #4513
-
-4514
-01:15:14.000 --> 01:15:15.000
-This is cue #4514
-
-4515
-01:15:15.000 --> 01:15:16.000
-This is cue #4515
-
-4516
-01:15:16.000 --> 01:15:17.000
-This is cue #4516
-
-4517
-01:15:17.000 --> 01:15:18.000
-This is cue #4517
-
-4518
-01:15:18.000 --> 01:15:19.000
-This is cue #4518
-
-4519
-01:15:19.000 --> 01:15:20.000
-This is cue #4519
-
-4520
-01:15:20.000 --> 01:15:21.000
-This is cue #4520
-
-4521
-01:15:21.000 --> 01:15:22.000
-This is cue #4521
-
-4522
-01:15:22.000 --> 01:15:23.000
-This is cue #4522
-
-4523
-01:15:23.000 --> 01:15:24.000
-This is cue #4523
-
-4524
-01:15:24.000 --> 01:15:25.000
-This is cue #4524
-
-4525
-01:15:25.000 --> 01:15:26.000
-This is cue #4525
-
-4526
-01:15:26.000 --> 01:15:27.000
-This is cue #4526
-
-4527
-01:15:27.000 --> 01:15:28.000
-This is cue #4527
-
-4528
-01:15:28.000 --> 01:15:29.000
-This is cue #4528
-
-4529
-01:15:29.000 --> 01:15:30.000
-This is cue #4529
-
-4530
-01:15:30.000 --> 01:15:31.000
-This is cue #4530
-
-4531
-01:15:31.000 --> 01:15:32.000
-This is cue #4531
-
-4532
-01:15:32.000 --> 01:15:33.000
-This is cue #4532
-
-4533
-01:15:33.000 --> 01:15:34.000
-This is cue #4533
-
-4534
-01:15:34.000 --> 01:15:35.000
-This is cue #4534
-
-4535
-01:15:35.000 --> 01:15:36.000
-This is cue #4535
-
-4536
-01:15:36.000 --> 01:15:37.000
-This is cue #4536
-
-4537
-01:15:37.000 --> 01:15:38.000
-This is cue #4537
-
-4538
-01:15:38.000 --> 01:15:39.000
-This is cue #4538
-
-4539
-01:15:39.000 --> 01:15:40.000
-This is cue #4539
-
-4540
-01:15:40.000 --> 01:15:41.000
-This is cue #4540
-
-4541
-01:15:41.000 --> 01:15:42.000
-This is cue #4541
-
-4542
-01:15:42.000 --> 01:15:43.000
-This is cue #4542
-
-4543
-01:15:43.000 --> 01:15:44.000
-This is cue #4543
-
-4544
-01:15:44.000 --> 01:15:45.000
-This is cue #4544
-
-4545
-01:15:45.000 --> 01:15:46.000
-This is cue #4545
-
-4546
-01:15:46.000 --> 01:15:47.000
-This is cue #4546
-
-4547
-01:15:47.000 --> 01:15:48.000
-This is cue #4547
-
-4548
-01:15:48.000 --> 01:15:49.000
-This is cue #4548
-
-4549
-01:15:49.000 --> 01:15:50.000
-This is cue #4549
-
-4550
-01:15:50.000 --> 01:15:51.000
-This is cue #4550
-
-4551
-01:15:51.000 --> 01:15:52.000
-This is cue #4551
-
-4552
-01:15:52.000 --> 01:15:53.000
-This is cue #4552
-
-4553
-01:15:53.000 --> 01:15:54.000
-This is cue #4553
-
-4554
-01:15:54.000 --> 01:15:55.000
-This is cue #4554
-
-4555
-01:15:55.000 --> 01:15:56.000
-This is cue #4555
-
-4556
-01:15:56.000 --> 01:15:57.000
-This is cue #4556
-
-4557
-01:15:57.000 --> 01:15:58.000
-This is cue #4557
-
-4558
-01:15:58.000 --> 01:15:59.000
-This is cue #4558
-
-4559
-01:15:59.000 --> 01:16:00.000
-This is cue #4559
-
-4560
-01:16:00.000 --> 01:16:01.000
-This is cue #4560
-
-4561
-01:16:01.000 --> 01:16:02.000
-This is cue #4561
-
-4562
-01:16:02.000 --> 01:16:03.000
-This is cue #4562
-
-4563
-01:16:03.000 --> 01:16:04.000
-This is cue #4563
-
-4564
-01:16:04.000 --> 01:16:05.000
-This is cue #4564
-
-4565
-01:16:05.000 --> 01:16:06.000
-This is cue #4565
-
-4566
-01:16:06.000 --> 01:16:07.000
-This is cue #4566
-
-4567
-01:16:07.000 --> 01:16:08.000
-This is cue #4567
-
-4568
-01:16:08.000 --> 01:16:09.000
-This is cue #4568
-
-4569
-01:16:09.000 --> 01:16:10.000
-This is cue #4569
-
-4570
-01:16:10.000 --> 01:16:11.000
-This is cue #4570
-
-4571
-01:16:11.000 --> 01:16:12.000
-This is cue #4571
-
-4572
-01:16:12.000 --> 01:16:13.000
-This is cue #4572
-
-4573
-01:16:13.000 --> 01:16:14.000
-This is cue #4573
-
-4574
-01:16:14.000 --> 01:16:15.000
-This is cue #4574
-
-4575
-01:16:15.000 --> 01:16:16.000
-This is cue #4575
-
-4576
-01:16:16.000 --> 01:16:17.000
-This is cue #4576
-
-4577
-01:16:17.000 --> 01:16:18.000
-This is cue #4577
-
-4578
-01:16:18.000 --> 01:16:19.000
-This is cue #4578
-
-4579
-01:16:19.000 --> 01:16:20.000
-This is cue #4579
-
-4580
-01:16:20.000 --> 01:16:21.000
-This is cue #4580
-
-4581
-01:16:21.000 --> 01:16:22.000
-This is cue #4581
-
-4582
-01:16:22.000 --> 01:16:23.000
-This is cue #4582
-
-4583
-01:16:23.000 --> 01:16:24.000
-This is cue #4583
-
-4584
-01:16:24.000 --> 01:16:25.000
-This is cue #4584
-
-4585
-01:16:25.000 --> 01:16:26.000
-This is cue #4585
-
-4586
-01:16:26.000 --> 01:16:27.000
-This is cue #4586
-
-4587
-01:16:27.000 --> 01:16:28.000
-This is cue #4587
-
-4588
-01:16:28.000 --> 01:16:29.000
-This is cue #4588
-
-4589
-01:16:29.000 --> 01:16:30.000
-This is cue #4589
-
-4590
-01:16:30.000 --> 01:16:31.000
-This is cue #4590
-
-4591
-01:16:31.000 --> 01:16:32.000
-This is cue #4591
-
-4592
-01:16:32.000 --> 01:16:33.000
-This is cue #4592
-
-4593
-01:16:33.000 --> 01:16:34.000
-This is cue #4593
-
-4594
-01:16:34.000 --> 01:16:35.000
-This is cue #4594
-
-4595
-01:16:35.000 --> 01:16:36.000
-This is cue #4595
-
-4596
-01:16:36.000 --> 01:16:37.000
-This is cue #4596
-
-4597
-01:16:37.000 --> 01:16:38.000
-This is cue #4597
-
-4598
-01:16:38.000 --> 01:16:39.000
-This is cue #4598
-
-4599
-01:16:39.000 --> 01:16:40.000
-This is cue #4599
-
-4600
-01:16:40.000 --> 01:16:41.000
-This is cue #4600
-
-4601
-01:16:41.000 --> 01:16:42.000
-This is cue #4601
-
-4602
-01:16:42.000 --> 01:16:43.000
-This is cue #4602
-
-4603
-01:16:43.000 --> 01:16:44.000
-This is cue #4603
-
-4604
-01:16:44.000 --> 01:16:45.000
-This is cue #4604
-
-4605
-01:16:45.000 --> 01:16:46.000
-This is cue #4605
-
-4606
-01:16:46.000 --> 01:16:47.000
-This is cue #4606
-
-4607
-01:16:47.000 --> 01:16:48.000
-This is cue #4607
-
-4608
-01:16:48.000 --> 01:16:49.000
-This is cue #4608
-
-4609
-01:16:49.000 --> 01:16:50.000
-This is cue #4609
-
-4610
-01:16:50.000 --> 01:16:51.000
-This is cue #4610
-
-4611
-01:16:51.000 --> 01:16:52.000
-This is cue #4611
-
-4612
-01:16:52.000 --> 01:16:53.000
-This is cue #4612
-
-4613
-01:16:53.000 --> 01:16:54.000
-This is cue #4613
-
-4614
-01:16:54.000 --> 01:16:55.000
-This is cue #4614
-
-4615
-01:16:55.000 --> 01:16:56.000
-This is cue #4615
-
-4616
-01:16:56.000 --> 01:16:57.000
-This is cue #4616
-
-4617
-01:16:57.000 --> 01:16:58.000
-This is cue #4617
-
-4618
-01:16:58.000 --> 01:16:59.000
-This is cue #4618
-
-4619
-01:16:59.000 --> 01:17:00.000
-This is cue #4619
-
-4620
-01:17:00.000 --> 01:17:01.000
-This is cue #4620
-
-4621
-01:17:01.000 --> 01:17:02.000
-This is cue #4621
-
-4622
-01:17:02.000 --> 01:17:03.000
-This is cue #4622
-
-4623
-01:17:03.000 --> 01:17:04.000
-This is cue #4623
-
-4624
-01:17:04.000 --> 01:17:05.000
-This is cue #4624
-
-4625
-01:17:05.000 --> 01:17:06.000
-This is cue #4625
-
-4626
-01:17:06.000 --> 01:17:07.000
-This is cue #4626
-
-4627
-01:17:07.000 --> 01:17:08.000
-This is cue #4627
-
-4628
-01:17:08.000 --> 01:17:09.000
-This is cue #4628
-
-4629
-01:17:09.000 --> 01:17:10.000
-This is cue #4629
-
-4630
-01:17:10.000 --> 01:17:11.000
-This is cue #4630
-
-4631
-01:17:11.000 --> 01:17:12.000
-This is cue #4631
-
-4632
-01:17:12.000 --> 01:17:13.000
-This is cue #4632
-
-4633
-01:17:13.000 --> 01:17:14.000
-This is cue #4633
-
-4634
-01:17:14.000 --> 01:17:15.000
-This is cue #4634
-
-4635
-01:17:15.000 --> 01:17:16.000
-This is cue #4635
-
-4636
-01:17:16.000 --> 01:17:17.000
-This is cue #4636
-
-4637
-01:17:17.000 --> 01:17:18.000
-This is cue #4637
-
-4638
-01:17:18.000 --> 01:17:19.000
-This is cue #4638
-
-4639
-01:17:19.000 --> 01:17:20.000
-This is cue #4639
-
-4640
-01:17:20.000 --> 01:17:21.000
-This is cue #4640
-
-4641
-01:17:21.000 --> 01:17:22.000
-This is cue #4641
-
-4642
-01:17:22.000 --> 01:17:23.000
-This is cue #4642
-
-4643
-01:17:23.000 --> 01:17:24.000
-This is cue #4643
-
-4644
-01:17:24.000 --> 01:17:25.000
-This is cue #4644
-
-4645
-01:17:25.000 --> 01:17:26.000
-This is cue #4645
-
-4646
-01:17:26.000 --> 01:17:27.000
-This is cue #4646
-
-4647
-01:17:27.000 --> 01:17:28.000
-This is cue #4647
-
-4648
-01:17:28.000 --> 01:17:29.000
-This is cue #4648
-
-4649
-01:17:29.000 --> 01:17:30.000
-This is cue #4649
-
-4650
-01:17:30.000 --> 01:17:31.000
-This is cue #4650
-
-4651
-01:17:31.000 --> 01:17:32.000
-This is cue #4651
-
-4652
-01:17:32.000 --> 01:17:33.000
-This is cue #4652
-
-4653
-01:17:33.000 --> 01:17:34.000
-This is cue #4653
-
-4654
-01:17:34.000 --> 01:17:35.000
-This is cue #4654
-
-4655
-01:17:35.000 --> 01:17:36.000
-This is cue #4655
-
-4656
-01:17:36.000 --> 01:17:37.000
-This is cue #4656
-
-4657
-01:17:37.000 --> 01:17:38.000
-This is cue #4657
-
-4658
-01:17:38.000 --> 01:17:39.000
-This is cue #4658
-
-4659
-01:17:39.000 --> 01:17:40.000
-This is cue #4659
-
-4660
-01:17:40.000 --> 01:17:41.000
-This is cue #4660
-
-4661
-01:17:41.000 --> 01:17:42.000
-This is cue #4661
-
-4662
-01:17:42.000 --> 01:17:43.000
-This is cue #4662
-
-4663
-01:17:43.000 --> 01:17:44.000
-This is cue #4663
-
-4664
-01:17:44.000 --> 01:17:45.000
-This is cue #4664
-
-4665
-01:17:45.000 --> 01:17:46.000
-This is cue #4665
-
-4666
-01:17:46.000 --> 01:17:47.000
-This is cue #4666
-
-4667
-01:17:47.000 --> 01:17:48.000
-This is cue #4667
-
-4668
-01:17:48.000 --> 01:17:49.000
-This is cue #4668
-
-4669
-01:17:49.000 --> 01:17:50.000
-This is cue #4669
-
-4670
-01:17:50.000 --> 01:17:51.000
-This is cue #4670
-
-4671
-01:17:51.000 --> 01:17:52.000
-This is cue #4671
-
-4672
-01:17:52.000 --> 01:17:53.000
-This is cue #4672
-
-4673
-01:17:53.000 --> 01:17:54.000
-This is cue #4673
-
-4674
-01:17:54.000 --> 01:17:55.000
-This is cue #4674
-
-4675
-01:17:55.000 --> 01:17:56.000
-This is cue #4675
-
-4676
-01:17:56.000 --> 01:17:57.000
-This is cue #4676
-
-4677
-01:17:57.000 --> 01:17:58.000
-This is cue #4677
-
-4678
-01:17:58.000 --> 01:17:59.000
-This is cue #4678
-
-4679
-01:17:59.000 --> 01:18:00.000
-This is cue #4679
-
-4680
-01:18:00.000 --> 01:18:01.000
-This is cue #4680
-
-4681
-01:18:01.000 --> 01:18:02.000
-This is cue #4681
-
-4682
-01:18:02.000 --> 01:18:03.000
-This is cue #4682
-
-4683
-01:18:03.000 --> 01:18:04.000
-This is cue #4683
-
-4684
-01:18:04.000 --> 01:18:05.000
-This is cue #4684
-
-4685
-01:18:05.000 --> 01:18:06.000
-This is cue #4685
-
-4686
-01:18:06.000 --> 01:18:07.000
-This is cue #4686
-
-4687
-01:18:07.000 --> 01:18:08.000
-This is cue #4687
-
-4688
-01:18:08.000 --> 01:18:09.000
-This is cue #4688
-
-4689
-01:18:09.000 --> 01:18:10.000
-This is cue #4689
-
-4690
-01:18:10.000 --> 01:18:11.000
-This is cue #4690
-
-4691
-01:18:11.000 --> 01:18:12.000
-This is cue #4691
-
-4692
-01:18:12.000 --> 01:18:13.000
-This is cue #4692
-
-4693
-01:18:13.000 --> 01:18:14.000
-This is cue #4693
-
-4694
-01:18:14.000 --> 01:18:15.000
-This is cue #4694
-
-4695
-01:18:15.000 --> 01:18:16.000
-This is cue #4695
-
-4696
-01:18:16.000 --> 01:18:17.000
-This is cue #4696
-
-4697
-01:18:17.000 --> 01:18:18.000
-This is cue #4697
-
-4698
-01:18:18.000 --> 01:18:19.000
-This is cue #4698
-
-4699
-01:18:19.000 --> 01:18:20.000
-This is cue #4699
-
-4700
-01:18:20.000 --> 01:18:21.000
-This is cue #4700
-
-4701
-01:18:21.000 --> 01:18:22.000
-This is cue #4701
-
-4702
-01:18:22.000 --> 01:18:23.000
-This is cue #4702
-
-4703
-01:18:23.000 --> 01:18:24.000
-This is cue #4703
-
-4704
-01:18:24.000 --> 01:18:25.000
-This is cue #4704
-
-4705
-01:18:25.000 --> 01:18:26.000
-This is cue #4705
-
-4706
-01:18:26.000 --> 01:18:27.000
-This is cue #4706
-
-4707
-01:18:27.000 --> 01:18:28.000
-This is cue #4707
-
-4708
-01:18:28.000 --> 01:18:29.000
-This is cue #4708
-
-4709
-01:18:29.000 --> 01:18:30.000
-This is cue #4709
-
-4710
-01:18:30.000 --> 01:18:31.000
-This is cue #4710
-
-4711
-01:18:31.000 --> 01:18:32.000
-This is cue #4711
-
-4712
-01:18:32.000 --> 01:18:33.000
-This is cue #4712
-
-4713
-01:18:33.000 --> 01:18:34.000
-This is cue #4713
-
-4714
-01:18:34.000 --> 01:18:35.000
-This is cue #4714
-
-4715
-01:18:35.000 --> 01:18:36.000
-This is cue #4715
-
-4716
-01:18:36.000 --> 01:18:37.000
-This is cue #4716
-
-4717
-01:18:37.000 --> 01:18:38.000
-This is cue #4717
-
-4718
-01:18:38.000 --> 01:18:39.000
-This is cue #4718
-
-4719
-01:18:39.000 --> 01:18:40.000
-This is cue #4719
-
-4720
-01:18:40.000 --> 01:18:41.000
-This is cue #4720
-
-4721
-01:18:41.000 --> 01:18:42.000
-This is cue #4721
-
-4722
-01:18:42.000 --> 01:18:43.000
-This is cue #4722
-
-4723
-01:18:43.000 --> 01:18:44.000
-This is cue #4723
-
-4724
-01:18:44.000 --> 01:18:45.000
-This is cue #4724
-
-4725
-01:18:45.000 --> 01:18:46.000
-This is cue #4725
-
-4726
-01:18:46.000 --> 01:18:47.000
-This is cue #4726
-
-4727
-01:18:47.000 --> 01:18:48.000
-This is cue #4727
-
-4728
-01:18:48.000 --> 01:18:49.000
-This is cue #4728
-
-4729
-01:18:49.000 --> 01:18:50.000
-This is cue #4729
-
-4730
-01:18:50.000 --> 01:18:51.000
-This is cue #4730
-
-4731
-01:18:51.000 --> 01:18:52.000
-This is cue #4731
-
-4732
-01:18:52.000 --> 01:18:53.000
-This is cue #4732
-
-4733
-01:18:53.000 --> 01:18:54.000
-This is cue #4733
-
-4734
-01:18:54.000 --> 01:18:55.000
-This is cue #4734
-
-4735
-01:18:55.000 --> 01:18:56.000
-This is cue #4735
-
-4736
-01:18:56.000 --> 01:18:57.000
-This is cue #4736
-
-4737
-01:18:57.000 --> 01:18:58.000
-This is cue #4737
-
-4738
-01:18:58.000 --> 01:18:59.000
-This is cue #4738
-
-4739
-01:18:59.000 --> 01:19:00.000
-This is cue #4739
-
-4740
-01:19:00.000 --> 01:19:01.000
-This is cue #4740
-
-4741
-01:19:01.000 --> 01:19:02.000
-This is cue #4741
-
-4742
-01:19:02.000 --> 01:19:03.000
-This is cue #4742
-
-4743
-01:19:03.000 --> 01:19:04.000
-This is cue #4743
-
-4744
-01:19:04.000 --> 01:19:05.000
-This is cue #4744
-
-4745
-01:19:05.000 --> 01:19:06.000
-This is cue #4745
-
-4746
-01:19:06.000 --> 01:19:07.000
-This is cue #4746
-
-4747
-01:19:07.000 --> 01:19:08.000
-This is cue #4747
-
-4748
-01:19:08.000 --> 01:19:09.000
-This is cue #4748
-
-4749
-01:19:09.000 --> 01:19:10.000
-This is cue #4749
-
-4750
-01:19:10.000 --> 01:19:11.000
-This is cue #4750
-
-4751
-01:19:11.000 --> 01:19:12.000
-This is cue #4751
-
-4752
-01:19:12.000 --> 01:19:13.000
-This is cue #4752
-
-4753
-01:19:13.000 --> 01:19:14.000
-This is cue #4753
-
-4754
-01:19:14.000 --> 01:19:15.000
-This is cue #4754
-
-4755
-01:19:15.000 --> 01:19:16.000
-This is cue #4755
-
-4756
-01:19:16.000 --> 01:19:17.000
-This is cue #4756
-
-4757
-01:19:17.000 --> 01:19:18.000
-This is cue #4757
-
-4758
-01:19:18.000 --> 01:19:19.000
-This is cue #4758
-
-4759
-01:19:19.000 --> 01:19:20.000
-This is cue #4759
-
-4760
-01:19:20.000 --> 01:19:21.000
-This is cue #4760
-
-4761
-01:19:21.000 --> 01:19:22.000
-This is cue #4761
-
-4762
-01:19:22.000 --> 01:19:23.000
-This is cue #4762
-
-4763
-01:19:23.000 --> 01:19:24.000
-This is cue #4763
-
-4764
-01:19:24.000 --> 01:19:25.000
-This is cue #4764
-
-4765
-01:19:25.000 --> 01:19:26.000
-This is cue #4765
-
-4766
-01:19:26.000 --> 01:19:27.000
-This is cue #4766
-
-4767
-01:19:27.000 --> 01:19:28.000
-This is cue #4767
-
-4768
-01:19:28.000 --> 01:19:29.000
-This is cue #4768
-
-4769
-01:19:29.000 --> 01:19:30.000
-This is cue #4769
-
-4770
-01:19:30.000 --> 01:19:31.000
-This is cue #4770
-
-4771
-01:19:31.000 --> 01:19:32.000
-This is cue #4771
-
-4772
-01:19:32.000 --> 01:19:33.000
-This is cue #4772
-
-4773
-01:19:33.000 --> 01:19:34.000
-This is cue #4773
-
-4774
-01:19:34.000 --> 01:19:35.000
-This is cue #4774
-
-4775
-01:19:35.000 --> 01:19:36.000
-This is cue #4775
-
-4776
-01:19:36.000 --> 01:19:37.000
-This is cue #4776
-
-4777
-01:19:37.000 --> 01:19:38.000
-This is cue #4777
-
-4778
-01:19:38.000 --> 01:19:39.000
-This is cue #4778
-
-4779
-01:19:39.000 --> 01:19:40.000
-This is cue #4779
-
-4780
-01:19:40.000 --> 01:19:41.000
-This is cue #4780
-
-4781
-01:19:41.000 --> 01:19:42.000
-This is cue #4781
-
-4782
-01:19:42.000 --> 01:19:43.000
-This is cue #4782
-
-4783
-01:19:43.000 --> 01:19:44.000
-This is cue #4783
-
-4784
-01:19:44.000 --> 01:19:45.000
-This is cue #4784
-
-4785
-01:19:45.000 --> 01:19:46.000
-This is cue #4785
-
-4786
-01:19:46.000 --> 01:19:47.000
-This is cue #4786
-
-4787
-01:19:47.000 --> 01:19:48.000
-This is cue #4787
-
-4788
-01:19:48.000 --> 01:19:49.000
-This is cue #4788
-
-4789
-01:19:49.000 --> 01:19:50.000
-This is cue #4789
-
-4790
-01:19:50.000 --> 01:19:51.000
-This is cue #4790
-
-4791
-01:19:51.000 --> 01:19:52.000
-This is cue #4791
-
-4792
-01:19:52.000 --> 01:19:53.000
-This is cue #4792
-
-4793
-01:19:53.000 --> 01:19:54.000
-This is cue #4793
-
-4794
-01:19:54.000 --> 01:19:55.000
-This is cue #4794
-
-4795
-01:19:55.000 --> 01:19:56.000
-This is cue #4795
-
-4796
-01:19:56.000 --> 01:19:57.000
-This is cue #4796
-
-4797
-01:19:57.000 --> 01:19:58.000
-This is cue #4797
-
-4798
-01:19:58.000 --> 01:19:59.000
-This is cue #4798
-
-4799
-01:19:59.000 --> 01:20:00.000
-This is cue #4799
-
-4800
-01:20:00.000 --> 01:20:01.000
-This is cue #4800
-
-4801
-01:20:01.000 --> 01:20:02.000
-This is cue #4801
-
-4802
-01:20:02.000 --> 01:20:03.000
-This is cue #4802
-
-4803
-01:20:03.000 --> 01:20:04.000
-This is cue #4803
-
-4804
-01:20:04.000 --> 01:20:05.000
-This is cue #4804
-
-4805
-01:20:05.000 --> 01:20:06.000
-This is cue #4805
-
-4806
-01:20:06.000 --> 01:20:07.000
-This is cue #4806
-
-4807
-01:20:07.000 --> 01:20:08.000
-This is cue #4807
-
-4808
-01:20:08.000 --> 01:20:09.000
-This is cue #4808
-
-4809
-01:20:09.000 --> 01:20:10.000
-This is cue #4809
-
-4810
-01:20:10.000 --> 01:20:11.000
-This is cue #4810
-
-4811
-01:20:11.000 --> 01:20:12.000
-This is cue #4811
-
-4812
-01:20:12.000 --> 01:20:13.000
-This is cue #4812
-
-4813
-01:20:13.000 --> 01:20:14.000
-This is cue #4813
-
-4814
-01:20:14.000 --> 01:20:15.000
-This is cue #4814
-
-4815
-01:20:15.000 --> 01:20:16.000
-This is cue #4815
-
-4816
-01:20:16.000 --> 01:20:17.000
-This is cue #4816
-
-4817
-01:20:17.000 --> 01:20:18.000
-This is cue #4817
-
-4818
-01:20:18.000 --> 01:20:19.000
-This is cue #4818
-
-4819
-01:20:19.000 --> 01:20:20.000
-This is cue #4819
-
-4820
-01:20:20.000 --> 01:20:21.000
-This is cue #4820
-
-4821
-01:20:21.000 --> 01:20:22.000
-This is cue #4821
-
-4822
-01:20:22.000 --> 01:20:23.000
-This is cue #4822
-
-4823
-01:20:23.000 --> 01:20:24.000
-This is cue #4823
-
-4824
-01:20:24.000 --> 01:20:25.000
-This is cue #4824
-
-4825
-01:20:25.000 --> 01:20:26.000
-This is cue #4825
-
-4826
-01:20:26.000 --> 01:20:27.000
-This is cue #4826
-
-4827
-01:20:27.000 --> 01:20:28.000
-This is cue #4827
-
-4828
-01:20:28.000 --> 01:20:29.000
-This is cue #4828
-
-4829
-01:20:29.000 --> 01:20:30.000
-This is cue #4829
-
-4830
-01:20:30.000 --> 01:20:31.000
-This is cue #4830
-
-4831
-01:20:31.000 --> 01:20:32.000
-This is cue #4831
-
-4832
-01:20:32.000 --> 01:20:33.000
-This is cue #4832
-
-4833
-01:20:33.000 --> 01:20:34.000
-This is cue #4833
-
-4834
-01:20:34.000 --> 01:20:35.000
-This is cue #4834
-
-4835
-01:20:35.000 --> 01:20:36.000
-This is cue #4835
-
-4836
-01:20:36.000 --> 01:20:37.000
-This is cue #4836
-
-4837
-01:20:37.000 --> 01:20:38.000
-This is cue #4837
-
-4838
-01:20:38.000 --> 01:20:39.000
-This is cue #4838
-
-4839
-01:20:39.000 --> 01:20:40.000
-This is cue #4839
-
-4840
-01:20:40.000 --> 01:20:41.000
-This is cue #4840
-
-4841
-01:20:41.000 --> 01:20:42.000
-This is cue #4841
-
-4842
-01:20:42.000 --> 01:20:43.000
-This is cue #4842
-
-4843
-01:20:43.000 --> 01:20:44.000
-This is cue #4843
-
-4844
-01:20:44.000 --> 01:20:45.000
-This is cue #4844
-
-4845
-01:20:45.000 --> 01:20:46.000
-This is cue #4845
-
-4846
-01:20:46.000 --> 01:20:47.000
-This is cue #4846
-
-4847
-01:20:47.000 --> 01:20:48.000
-This is cue #4847
-
-4848
-01:20:48.000 --> 01:20:49.000
-This is cue #4848
-
-4849
-01:20:49.000 --> 01:20:50.000
-This is cue #4849
-
-4850
-01:20:50.000 --> 01:20:51.000
-This is cue #4850
-
-4851
-01:20:51.000 --> 01:20:52.000
-This is cue #4851
-
-4852
-01:20:52.000 --> 01:20:53.000
-This is cue #4852
-
-4853
-01:20:53.000 --> 01:20:54.000
-This is cue #4853
-
-4854
-01:20:54.000 --> 01:20:55.000
-This is cue #4854
-
-4855
-01:20:55.000 --> 01:20:56.000
-This is cue #4855
-
-4856
-01:20:56.000 --> 01:20:57.000
-This is cue #4856
-
-4857
-01:20:57.000 --> 01:20:58.000
-This is cue #4857
-
-4858
-01:20:58.000 --> 01:20:59.000
-This is cue #4858
-
-4859
-01:20:59.000 --> 01:21:00.000
-This is cue #4859
-
-4860
-01:21:00.000 --> 01:21:01.000
-This is cue #4860
-
-4861
-01:21:01.000 --> 01:21:02.000
-This is cue #4861
-
-4862
-01:21:02.000 --> 01:21:03.000
-This is cue #4862
-
-4863
-01:21:03.000 --> 01:21:04.000
-This is cue #4863
-
-4864
-01:21:04.000 --> 01:21:05.000
-This is cue #4864
-
-4865
-01:21:05.000 --> 01:21:06.000
-This is cue #4865
-
-4866
-01:21:06.000 --> 01:21:07.000
-This is cue #4866
-
-4867
-01:21:07.000 --> 01:21:08.000
-This is cue #4867
-
-4868
-01:21:08.000 --> 01:21:09.000
-This is cue #4868
-
-4869
-01:21:09.000 --> 01:21:10.000
-This is cue #4869
-
-4870
-01:21:10.000 --> 01:21:11.000
-This is cue #4870
-
-4871
-01:21:11.000 --> 01:21:12.000
-This is cue #4871
-
-4872
-01:21:12.000 --> 01:21:13.000
-This is cue #4872
-
-4873
-01:21:13.000 --> 01:21:14.000
-This is cue #4873
-
-4874
-01:21:14.000 --> 01:21:15.000
-This is cue #4874
-
-4875
-01:21:15.000 --> 01:21:16.000
-This is cue #4875
-
-4876
-01:21:16.000 --> 01:21:17.000
-This is cue #4876
-
-4877
-01:21:17.000 --> 01:21:18.000
-This is cue #4877
-
-4878
-01:21:18.000 --> 01:21:19.000
-This is cue #4878
-
-4879
-01:21:19.000 --> 01:21:20.000
-This is cue #4879
-
-4880
-01:21:20.000 --> 01:21:21.000
-This is cue #4880
-
-4881
-01:21:21.000 --> 01:21:22.000
-This is cue #4881
-
-4882
-01:21:22.000 --> 01:21:23.000
-This is cue #4882
-
-4883
-01:21:23.000 --> 01:21:24.000
-This is cue #4883
-
-4884
-01:21:24.000 --> 01:21:25.000
-This is cue #4884
-
-4885
-01:21:25.000 --> 01:21:26.000
-This is cue #4885
-
-4886
-01:21:26.000 --> 01:21:27.000
-This is cue #4886
-
-4887
-01:21:27.000 --> 01:21:28.000
-This is cue #4887
-
-4888
-01:21:28.000 --> 01:21:29.000
-This is cue #4888
-
-4889
-01:21:29.000 --> 01:21:30.000
-This is cue #4889
-
-4890
-01:21:30.000 --> 01:21:31.000
-This is cue #4890
-
-4891
-01:21:31.000 --> 01:21:32.000
-This is cue #4891
-
-4892
-01:21:32.000 --> 01:21:33.000
-This is cue #4892
-
-4893
-01:21:33.000 --> 01:21:34.000
-This is cue #4893
-
-4894
-01:21:34.000 --> 01:21:35.000
-This is cue #4894
-
-4895
-01:21:35.000 --> 01:21:36.000
-This is cue #4895
-
-4896
-01:21:36.000 --> 01:21:37.000
-This is cue #4896
-
-4897
-01:21:37.000 --> 01:21:38.000
-This is cue #4897
-
-4898
-01:21:38.000 --> 01:21:39.000
-This is cue #4898
-
-4899
-01:21:39.000 --> 01:21:40.000
-This is cue #4899
-
-4900
-01:21:40.000 --> 01:21:41.000
-This is cue #4900
-
-4901
-01:21:41.000 --> 01:21:42.000
-This is cue #4901
-
-4902
-01:21:42.000 --> 01:21:43.000
-This is cue #4902
-
-4903
-01:21:43.000 --> 01:21:44.000
-This is cue #4903
-
-4904
-01:21:44.000 --> 01:21:45.000
-This is cue #4904
-
-4905
-01:21:45.000 --> 01:21:46.000
-This is cue #4905
-
-4906
-01:21:46.000 --> 01:21:47.000
-This is cue #4906
-
-4907
-01:21:47.000 --> 01:21:48.000
-This is cue #4907
-
-4908
-01:21:48.000 --> 01:21:49.000
-This is cue #4908
-
-4909
-01:21:49.000 --> 01:21:50.000
-This is cue #4909
-
-4910
-01:21:50.000 --> 01:21:51.000
-This is cue #4910
-
-4911
-01:21:51.000 --> 01:21:52.000
-This is cue #4911
-
-4912
-01:21:52.000 --> 01:21:53.000
-This is cue #4912
-
-4913
-01:21:53.000 --> 01:21:54.000
-This is cue #4913
-
-4914
-01:21:54.000 --> 01:21:55.000
-This is cue #4914
-
-4915
-01:21:55.000 --> 01:21:56.000
-This is cue #4915
-
-4916
-01:21:56.000 --> 01:21:57.000
-This is cue #4916
-
-4917
-01:21:57.000 --> 01:21:58.000
-This is cue #4917
-
-4918
-01:21:58.000 --> 01:21:59.000
-This is cue #4918
-
-4919
-01:21:59.000 --> 01:22:00.000
-This is cue #4919
-
-4920
-01:22:00.000 --> 01:22:01.000
-This is cue #4920
-
-4921
-01:22:01.000 --> 01:22:02.000
-This is cue #4921
-
-4922
-01:22:02.000 --> 01:22:03.000
-This is cue #4922
-
-4923
-01:22:03.000 --> 01:22:04.000
-This is cue #4923
-
-4924
-01:22:04.000 --> 01:22:05.000
-This is cue #4924
-
-4925
-01:22:05.000 --> 01:22:06.000
-This is cue #4925
-
-4926
-01:22:06.000 --> 01:22:07.000
-This is cue #4926
-
-4927
-01:22:07.000 --> 01:22:08.000
-This is cue #4927
-
-4928
-01:22:08.000 --> 01:22:09.000
-This is cue #4928
-
-4929
-01:22:09.000 --> 01:22:10.000
-This is cue #4929
-
-4930
-01:22:10.000 --> 01:22:11.000
-This is cue #4930
-
-4931
-01:22:11.000 --> 01:22:12.000
-This is cue #4931
-
-4932
-01:22:12.000 --> 01:22:13.000
-This is cue #4932
-
-4933
-01:22:13.000 --> 01:22:14.000
-This is cue #4933
-
-4934
-01:22:14.000 --> 01:22:15.000
-This is cue #4934
-
-4935
-01:22:15.000 --> 01:22:16.000
-This is cue #4935
-
-4936
-01:22:16.000 --> 01:22:17.000
-This is cue #4936
-
-4937
-01:22:17.000 --> 01:22:18.000
-This is cue #4937
-
-4938
-01:22:18.000 --> 01:22:19.000
-This is cue #4938
-
-4939
-01:22:19.000 --> 01:22:20.000
-This is cue #4939
-
-4940
-01:22:20.000 --> 01:22:21.000
-This is cue #4940
-
-4941
-01:22:21.000 --> 01:22:22.000
-This is cue #4941
-
-4942
-01:22:22.000 --> 01:22:23.000
-This is cue #4942
-
-4943
-01:22:23.000 --> 01:22:24.000
-This is cue #4943
-
-4944
-01:22:24.000 --> 01:22:25.000
-This is cue #4944
-
-4945
-01:22:25.000 --> 01:22:26.000
-This is cue #4945
-
-4946
-01:22:26.000 --> 01:22:27.000
-This is cue #4946
-
-4947
-01:22:27.000 --> 01:22:28.000
-This is cue #4947
-
-4948
-01:22:28.000 --> 01:22:29.000
-This is cue #4948
-
-4949
-01:22:29.000 --> 01:22:30.000
-This is cue #4949
-
-4950
-01:22:30.000 --> 01:22:31.000
-This is cue #4950
-
-4951
-01:22:31.000 --> 01:22:32.000
-This is cue #4951
-
-4952
-01:22:32.000 --> 01:22:33.000
-This is cue #4952
-
-4953
-01:22:33.000 --> 01:22:34.000
-This is cue #4953
-
-4954
-01:22:34.000 --> 01:22:35.000
-This is cue #4954
-
-4955
-01:22:35.000 --> 01:22:36.000
-This is cue #4955
-
-4956
-01:22:36.000 --> 01:22:37.000
-This is cue #4956
-
-4957
-01:22:37.000 --> 01:22:38.000
-This is cue #4957
-
-4958
-01:22:38.000 --> 01:22:39.000
-This is cue #4958
-
-4959
-01:22:39.000 --> 01:22:40.000
-This is cue #4959
-
-4960
-01:22:40.000 --> 01:22:41.000
-This is cue #4960
-
-4961
-01:22:41.000 --> 01:22:42.000
-This is cue #4961
-
-4962
-01:22:42.000 --> 01:22:43.000
-This is cue #4962
-
-4963
-01:22:43.000 --> 01:22:44.000
-This is cue #4963
-
-4964
-01:22:44.000 --> 01:22:45.000
-This is cue #4964
-
-4965
-01:22:45.000 --> 01:22:46.000
-This is cue #4965
-
-4966
-01:22:46.000 --> 01:22:47.000
-This is cue #4966
-
-4967
-01:22:47.000 --> 01:22:48.000
-This is cue #4967
-
-4968
-01:22:48.000 --> 01:22:49.000
-This is cue #4968
-
-4969
-01:22:49.000 --> 01:22:50.000
-This is cue #4969
-
-4970
-01:22:50.000 --> 01:22:51.000
-This is cue #4970
-
-4971
-01:22:51.000 --> 01:22:52.000
-This is cue #4971
-
-4972
-01:22:52.000 --> 01:22:53.000
-This is cue #4972
-
-4973
-01:22:53.000 --> 01:22:54.000
-This is cue #4973
-
-4974
-01:22:54.000 --> 01:22:55.000
-This is cue #4974
-
-4975
-01:22:55.000 --> 01:22:56.000
-This is cue #4975
-
-4976
-01:22:56.000 --> 01:22:57.000
-This is cue #4976
-
-4977
-01:22:57.000 --> 01:22:58.000
-This is cue #4977
-
-4978
-01:22:58.000 --> 01:22:59.000
-This is cue #4978
-
-4979
-01:22:59.000 --> 01:23:00.000
-This is cue #4979
-
-4980
-01:23:00.000 --> 01:23:01.000
-This is cue #4980
-
-4981
-01:23:01.000 --> 01:23:02.000
-This is cue #4981
-
-4982
-01:23:02.000 --> 01:23:03.000
-This is cue #4982
-
-4983
-01:23:03.000 --> 01:23:04.000
-This is cue #4983
-
-4984
-01:23:04.000 --> 01:23:05.000
-This is cue #4984
-
-4985
-01:23:05.000 --> 01:23:06.000
-This is cue #4985
-
-4986
-01:23:06.000 --> 01:23:07.000
-This is cue #4986
-
-4987
-01:23:07.000 --> 01:23:08.000
-This is cue #4987
-
-4988
-01:23:08.000 --> 01:23:09.000
-This is cue #4988
-
-4989
-01:23:09.000 --> 01:23:10.000
-This is cue #4989
-
-4990
-01:23:10.000 --> 01:23:11.000
-This is cue #4990
-
-4991
-01:23:11.000 --> 01:23:12.000
-This is cue #4991
-
-4992
-01:23:12.000 --> 01:23:13.000
-This is cue #4992
-
-4993
-01:23:13.000 --> 01:23:14.000
-This is cue #4993
-
-4994
-01:23:14.000 --> 01:23:15.000
-This is cue #4994
-
-4995
-01:23:15.000 --> 01:23:16.000
-This is cue #4995
-
-4996
-01:23:16.000 --> 01:23:17.000
-This is cue #4996
-
-4997
-01:23:17.000 --> 01:23:18.000
-This is cue #4997
-
-4998
-01:23:18.000 --> 01:23:19.000
-This is cue #4998
-
-4999
-01:23:19.000 --> 01:23:20.000
-This is cue #4999
-
-5000
-01:23:20.000 --> 01:23:21.000
-This is cue #5000
-
-5001
-01:23:21.000 --> 01:23:22.000
-This is cue #5001
-
-5002
-01:23:22.000 --> 01:23:23.000
-This is cue #5002
-
-5003
-01:23:23.000 --> 01:23:24.000
-This is cue #5003
-
-5004
-01:23:24.000 --> 01:23:25.000
-This is cue #5004
-
-5005
-01:23:25.000 --> 01:23:26.000
-This is cue #5005
-
-5006
-01:23:26.000 --> 01:23:27.000
-This is cue #5006
-
-5007
-01:23:27.000 --> 01:23:28.000
-This is cue #5007
-
-5008
-01:23:28.000 --> 01:23:29.000
-This is cue #5008
-
-5009
-01:23:29.000 --> 01:23:30.000
-This is cue #5009
-
-5010
-01:23:30.000 --> 01:23:31.000
-This is cue #5010
-
-5011
-01:23:31.000 --> 01:23:32.000
-This is cue #5011
-
-5012
-01:23:32.000 --> 01:23:33.000
-This is cue #5012
-
-5013
-01:23:33.000 --> 01:23:34.000
-This is cue #5013
-
-5014
-01:23:34.000 --> 01:23:35.000
-This is cue #5014
-
-5015
-01:23:35.000 --> 01:23:36.000
-This is cue #5015
-
-5016
-01:23:36.000 --> 01:23:37.000
-This is cue #5016
-
-5017
-01:23:37.000 --> 01:23:38.000
-This is cue #5017
-
-5018
-01:23:38.000 --> 01:23:39.000
-This is cue #5018
-
-5019
-01:23:39.000 --> 01:23:40.000
-This is cue #5019
-
-5020
-01:23:40.000 --> 01:23:41.000
-This is cue #5020
-
-5021
-01:23:41.000 --> 01:23:42.000
-This is cue #5021
-
-5022
-01:23:42.000 --> 01:23:43.000
-This is cue #5022
-
-5023
-01:23:43.000 --> 01:23:44.000
-This is cue #5023
-
-5024
-01:23:44.000 --> 01:23:45.000
-This is cue #5024
-
-5025
-01:23:45.000 --> 01:23:46.000
-This is cue #5025
-
-5026
-01:23:46.000 --> 01:23:47.000
-This is cue #5026
-
-5027
-01:23:47.000 --> 01:23:48.000
-This is cue #5027
-
-5028
-01:23:48.000 --> 01:23:49.000
-This is cue #5028
-
-5029
-01:23:49.000 --> 01:23:50.000
-This is cue #5029
-
-5030
-01:23:50.000 --> 01:23:51.000
-This is cue #5030
-
-5031
-01:23:51.000 --> 01:23:52.000
-This is cue #5031
-
-5032
-01:23:52.000 --> 01:23:53.000
-This is cue #5032
-
-5033
-01:23:53.000 --> 01:23:54.000
-This is cue #5033
-
-5034
-01:23:54.000 --> 01:23:55.000
-This is cue #5034
-
-5035
-01:23:55.000 --> 01:23:56.000
-This is cue #5035
-
-5036
-01:23:56.000 --> 01:23:57.000
-This is cue #5036
-
-5037
-01:23:57.000 --> 01:23:58.000
-This is cue #5037
-
-5038
-01:23:58.000 --> 01:23:59.000
-This is cue #5038
-
-5039
-01:23:59.000 --> 01:24:00.000
-This is cue #5039
-
-5040
-01:24:00.000 --> 01:24:01.000
-This is cue #5040
-
-5041
-01:24:01.000 --> 01:24:02.000
-This is cue #5041
-
-5042
-01:24:02.000 --> 01:24:03.000
-This is cue #5042
-
-5043
-01:24:03.000 --> 01:24:04.000
-This is cue #5043
-
-5044
-01:24:04.000 --> 01:24:05.000
-This is cue #5044
-
-5045
-01:24:05.000 --> 01:24:06.000
-This is cue #5045
-
-5046
-01:24:06.000 --> 01:24:07.000
-This is cue #5046
-
-5047
-01:24:07.000 --> 01:24:08.000
-This is cue #5047
-
-5048
-01:24:08.000 --> 01:24:09.000
-This is cue #5048
-
-5049
-01:24:09.000 --> 01:24:10.000
-This is cue #5049
-
-5050
-01:24:10.000 --> 01:24:11.000
-This is cue #5050
-
-5051
-01:24:11.000 --> 01:24:12.000
-This is cue #5051
-
-5052
-01:24:12.000 --> 01:24:13.000
-This is cue #5052
-
-5053
-01:24:13.000 --> 01:24:14.000
-This is cue #5053
-
-5054
-01:24:14.000 --> 01:24:15.000
-This is cue #5054
-
-5055
-01:24:15.000 --> 01:24:16.000
-This is cue #5055
-
-5056
-01:24:16.000 --> 01:24:17.000
-This is cue #5056
-
-5057
-01:24:17.000 --> 01:24:18.000
-This is cue #5057
-
-5058
-01:24:18.000 --> 01:24:19.000
-This is cue #5058
-
-5059
-01:24:19.000 --> 01:24:20.000
-This is cue #5059
-
-5060
-01:24:20.000 --> 01:24:21.000
-This is cue #5060
-
-5061
-01:24:21.000 --> 01:24:22.000
-This is cue #5061
-
-5062
-01:24:22.000 --> 01:24:23.000
-This is cue #5062
-
-5063
-01:24:23.000 --> 01:24:24.000
-This is cue #5063
-
-5064
-01:24:24.000 --> 01:24:25.000
-This is cue #5064
-
-5065
-01:24:25.000 --> 01:24:26.000
-This is cue #5065
-
-5066
-01:24:26.000 --> 01:24:27.000
-This is cue #5066
-
-5067
-01:24:27.000 --> 01:24:28.000
-This is cue #5067
-
-5068
-01:24:28.000 --> 01:24:29.000
-This is cue #5068
-
-5069
-01:24:29.000 --> 01:24:30.000
-This is cue #5069
-
-5070
-01:24:30.000 --> 01:24:31.000
-This is cue #5070
-
-5071
-01:24:31.000 --> 01:24:32.000
-This is cue #5071
-
-5072
-01:24:32.000 --> 01:24:33.000
-This is cue #5072
-
-5073
-01:24:33.000 --> 01:24:34.000
-This is cue #5073
-
-5074
-01:24:34.000 --> 01:24:35.000
-This is cue #5074
-
-5075
-01:24:35.000 --> 01:24:36.000
-This is cue #5075
-
-5076
-01:24:36.000 --> 01:24:37.000
-This is cue #5076
-
-5077
-01:24:37.000 --> 01:24:38.000
-This is cue #5077
-
-5078
-01:24:38.000 --> 01:24:39.000
-This is cue #5078
-
-5079
-01:24:39.000 --> 01:24:40.000
-This is cue #5079
-
-5080
-01:24:40.000 --> 01:24:41.000
-This is cue #5080
-
-5081
-01:24:41.000 --> 01:24:42.000
-This is cue #5081
-
-5082
-01:24:42.000 --> 01:24:43.000
-This is cue #5082
-
-5083
-01:24:43.000 --> 01:24:44.000
-This is cue #5083
-
-5084
-01:24:44.000 --> 01:24:45.000
-This is cue #5084
-
-5085
-01:24:45.000 --> 01:24:46.000
-This is cue #5085
-
-5086
-01:24:46.000 --> 01:24:47.000
-This is cue #5086
-
-5087
-01:24:47.000 --> 01:24:48.000
-This is cue #5087
-
-5088
-01:24:48.000 --> 01:24:49.000
-This is cue #5088
-
-5089
-01:24:49.000 --> 01:24:50.000
-This is cue #5089
-
-5090
-01:24:50.000 --> 01:24:51.000
-This is cue #5090
-
-5091
-01:24:51.000 --> 01:24:52.000
-This is cue #5091
-
-5092
-01:24:52.000 --> 01:24:53.000
-This is cue #5092
-
-5093
-01:24:53.000 --> 01:24:54.000
-This is cue #5093
-
-5094
-01:24:54.000 --> 01:24:55.000
-This is cue #5094
-
-5095
-01:24:55.000 --> 01:24:56.000
-This is cue #5095
-
-5096
-01:24:56.000 --> 01:24:57.000
-This is cue #5096
-
-5097
-01:24:57.000 --> 01:24:58.000
-This is cue #5097
-
-5098
-01:24:58.000 --> 01:24:59.000
-This is cue #5098
-
-5099
-01:24:59.000 --> 01:25:00.000
-This is cue #5099
-
-5100
-01:25:00.000 --> 01:25:01.000
-This is cue #5100
-
-5101
-01:25:01.000 --> 01:25:02.000
-This is cue #5101
-
-5102
-01:25:02.000 --> 01:25:03.000
-This is cue #5102
-
-5103
-01:25:03.000 --> 01:25:04.000
-This is cue #5103
-
-5104
-01:25:04.000 --> 01:25:05.000
-This is cue #5104
-
-5105
-01:25:05.000 --> 01:25:06.000
-This is cue #5105
-
-5106
-01:25:06.000 --> 01:25:07.000
-This is cue #5106
-
-5107
-01:25:07.000 --> 01:25:08.000
-This is cue #5107
-
-5108
-01:25:08.000 --> 01:25:09.000
-This is cue #5108
-
-5109
-01:25:09.000 --> 01:25:10.000
-This is cue #5109
-
-5110
-01:25:10.000 --> 01:25:11.000
-This is cue #5110
-
-5111
-01:25:11.000 --> 01:25:12.000
-This is cue #5111
-
-5112
-01:25:12.000 --> 01:25:13.000
-This is cue #5112
-
-5113
-01:25:13.000 --> 01:25:14.000
-This is cue #5113
-
-5114
-01:25:14.000 --> 01:25:15.000
-This is cue #5114
-
-5115
-01:25:15.000 --> 01:25:16.000
-This is cue #5115
-
-5116
-01:25:16.000 --> 01:25:17.000
-This is cue #5116
-
-5117
-01:25:17.000 --> 01:25:18.000
-This is cue #5117
-
-5118
-01:25:18.000 --> 01:25:19.000
-This is cue #5118
-
-5119
-01:25:19.000 --> 01:25:20.000
-This is cue #5119
-
-5120
-01:25:20.000 --> 01:25:21.000
-This is cue #5120
-
-5121
-01:25:21.000 --> 01:25:22.000
-This is cue #5121
-
-5122
-01:25:22.000 --> 01:25:23.000
-This is cue #5122
-
-5123
-01:25:23.000 --> 01:25:24.000
-This is cue #5123
-
-5124
-01:25:24.000 --> 01:25:25.000
-This is cue #5124
-
-5125
-01:25:25.000 --> 01:25:26.000
-This is cue #5125
-
-5126
-01:25:26.000 --> 01:25:27.000
-This is cue #5126
-
-5127
-01:25:27.000 --> 01:25:28.000
-This is cue #5127
-
-5128
-01:25:28.000 --> 01:25:29.000
-This is cue #5128
-
-5129
-01:25:29.000 --> 01:25:30.000
-This is cue #5129
-
-5130
-01:25:30.000 --> 01:25:31.000
-This is cue #5130
-
-5131
-01:25:31.000 --> 01:25:32.000
-This is cue #5131
-
-5132
-01:25:32.000 --> 01:25:33.000
-This is cue #5132
-
-5133
-01:25:33.000 --> 01:25:34.000
-This is cue #5133
-
-5134
-01:25:34.000 --> 01:25:35.000
-This is cue #5134
-
-5135
-01:25:35.000 --> 01:25:36.000
-This is cue #5135
-
-5136
-01:25:36.000 --> 01:25:37.000
-This is cue #5136
-
-5137
-01:25:37.000 --> 01:25:38.000
-This is cue #5137
-
-5138
-01:25:38.000 --> 01:25:39.000
-This is cue #5138
-
-5139
-01:25:39.000 --> 01:25:40.000
-This is cue #5139
-
-5140
-01:25:40.000 --> 01:25:41.000
-This is cue #5140
-
-5141
-01:25:41.000 --> 01:25:42.000
-This is cue #5141
-
-5142
-01:25:42.000 --> 01:25:43.000
-This is cue #5142
-
-5143
-01:25:43.000 --> 01:25:44.000
-This is cue #5143
-
-5144
-01:25:44.000 --> 01:25:45.000
-This is cue #5144
-
-5145
-01:25:45.000 --> 01:25:46.000
-This is cue #5145
-
-5146
-01:25:46.000 --> 01:25:47.000
-This is cue #5146
-
-5147
-01:25:47.000 --> 01:25:48.000
-This is cue #5147
-
-5148
-01:25:48.000 --> 01:25:49.000
-This is cue #5148
-
-5149
-01:25:49.000 --> 01:25:50.000
-This is cue #5149
-
-5150
-01:25:50.000 --> 01:25:51.000
-This is cue #5150
-
-5151
-01:25:51.000 --> 01:25:52.000
-This is cue #5151
-
-5152
-01:25:52.000 --> 01:25:53.000
-This is cue #5152
-
-5153
-01:25:53.000 --> 01:25:54.000
-This is cue #5153
-
-5154
-01:25:54.000 --> 01:25:55.000
-This is cue #5154
-
-5155
-01:25:55.000 --> 01:25:56.000
-This is cue #5155
-
-5156
-01:25:56.000 --> 01:25:57.000
-This is cue #5156
-
-5157
-01:25:57.000 --> 01:25:58.000
-This is cue #5157
-
-5158
-01:25:58.000 --> 01:25:59.000
-This is cue #5158
-
-5159
-01:25:59.000 --> 01:26:00.000
-This is cue #5159
-
-5160
-01:26:00.000 --> 01:26:01.000
-This is cue #5160
-
-5161
-01:26:01.000 --> 01:26:02.000
-This is cue #5161
-
-5162
-01:26:02.000 --> 01:26:03.000
-This is cue #5162
-
-5163
-01:26:03.000 --> 01:26:04.000
-This is cue #5163
-
-5164
-01:26:04.000 --> 01:26:05.000
-This is cue #5164
-
-5165
-01:26:05.000 --> 01:26:06.000
-This is cue #5165
-
-5166
-01:26:06.000 --> 01:26:07.000
-This is cue #5166
-
-5167
-01:26:07.000 --> 01:26:08.000
-This is cue #5167
-
-5168
-01:26:08.000 --> 01:26:09.000
-This is cue #5168
-
-5169
-01:26:09.000 --> 01:26:10.000
-This is cue #5169
-
-5170
-01:26:10.000 --> 01:26:11.000
-This is cue #5170
-
-5171
-01:26:11.000 --> 01:26:12.000
-This is cue #5171
-
-5172
-01:26:12.000 --> 01:26:13.000
-This is cue #5172
-
-5173
-01:26:13.000 --> 01:26:14.000
-This is cue #5173
-
-5174
-01:26:14.000 --> 01:26:15.000
-This is cue #5174
-
-5175
-01:26:15.000 --> 01:26:16.000
-This is cue #5175
-
-5176
-01:26:16.000 --> 01:26:17.000
-This is cue #5176
-
-5177
-01:26:17.000 --> 01:26:18.000
-This is cue #5177
-
-5178
-01:26:18.000 --> 01:26:19.000
-This is cue #5178
-
-5179
-01:26:19.000 --> 01:26:20.000
-This is cue #5179
-
-5180
-01:26:20.000 --> 01:26:21.000
-This is cue #5180
-
-5181
-01:26:21.000 --> 01:26:22.000
-This is cue #5181
-
-5182
-01:26:22.000 --> 01:26:23.000
-This is cue #5182
-
-5183
-01:26:23.000 --> 01:26:24.000
-This is cue #5183
-
-5184
-01:26:24.000 --> 01:26:25.000
-This is cue #5184
-
-5185
-01:26:25.000 --> 01:26:26.000
-This is cue #5185
-
-5186
-01:26:26.000 --> 01:26:27.000
-This is cue #5186
-
-5187
-01:26:27.000 --> 01:26:28.000
-This is cue #5187
-
-5188
-01:26:28.000 --> 01:26:29.000
-This is cue #5188
-
-5189
-01:26:29.000 --> 01:26:30.000
-This is cue #5189
-
-5190
-01:26:30.000 --> 01:26:31.000
-This is cue #5190
-
-5191
-01:26:31.000 --> 01:26:32.000
-This is cue #5191
-
-5192
-01:26:32.000 --> 01:26:33.000
-This is cue #5192
-
-5193
-01:26:33.000 --> 01:26:34.000
-This is cue #5193
-
-5194
-01:26:34.000 --> 01:26:35.000
-This is cue #5194
-
-5195
-01:26:35.000 --> 01:26:36.000
-This is cue #5195
-
-5196
-01:26:36.000 --> 01:26:37.000
-This is cue #5196
-
-5197
-01:26:37.000 --> 01:26:38.000
-This is cue #5197
-
-5198
-01:26:38.000 --> 01:26:39.000
-This is cue #5198
-
-5199
-01:26:39.000 --> 01:26:40.000
-This is cue #5199
-
-5200
-01:26:40.000 --> 01:26:41.000
-This is cue #5200
-
-5201
-01:26:41.000 --> 01:26:42.000
-This is cue #5201
-
-5202
-01:26:42.000 --> 01:26:43.000
-This is cue #5202
-
-5203
-01:26:43.000 --> 01:26:44.000
-This is cue #5203
-
-5204
-01:26:44.000 --> 01:26:45.000
-This is cue #5204
-
-5205
-01:26:45.000 --> 01:26:46.000
-This is cue #5205
-
-5206
-01:26:46.000 --> 01:26:47.000
-This is cue #5206
-
-5207
-01:26:47.000 --> 01:26:48.000
-This is cue #5207
-
-5208
-01:26:48.000 --> 01:26:49.000
-This is cue #5208
-
-5209
-01:26:49.000 --> 01:26:50.000
-This is cue #5209
-
-5210
-01:26:50.000 --> 01:26:51.000
-This is cue #5210
-
-5211
-01:26:51.000 --> 01:26:52.000
-This is cue #5211
-
-5212
-01:26:52.000 --> 01:26:53.000
-This is cue #5212
-
-5213
-01:26:53.000 --> 01:26:54.000
-This is cue #5213
-
-5214
-01:26:54.000 --> 01:26:55.000
-This is cue #5214
-
-5215
-01:26:55.000 --> 01:26:56.000
-This is cue #5215
-
-5216
-01:26:56.000 --> 01:26:57.000
-This is cue #5216
-
-5217
-01:26:57.000 --> 01:26:58.000
-This is cue #5217
-
-5218
-01:26:58.000 --> 01:26:59.000
-This is cue #5218
-
-5219
-01:26:59.000 --> 01:27:00.000
-This is cue #5219
-
-5220
-01:27:00.000 --> 01:27:01.000
-This is cue #5220
-
-5221
-01:27:01.000 --> 01:27:02.000
-This is cue #5221
-
-5222
-01:27:02.000 --> 01:27:03.000
-This is cue #5222
-
-5223
-01:27:03.000 --> 01:27:04.000
-This is cue #5223
-
-5224
-01:27:04.000 --> 01:27:05.000
-This is cue #5224
-
-5225
-01:27:05.000 --> 01:27:06.000
-This is cue #5225
-
-5226
-01:27:06.000 --> 01:27:07.000
-This is cue #5226
-
-5227
-01:27:07.000 --> 01:27:08.000
-This is cue #5227
-
-5228
-01:27:08.000 --> 01:27:09.000
-This is cue #5228
-
-5229
-01:27:09.000 --> 01:27:10.000
-This is cue #5229
-
-5230
-01:27:10.000 --> 01:27:11.000
-This is cue #5230
-
-5231
-01:27:11.000 --> 01:27:12.000
-This is cue #5231
-
-5232
-01:27:12.000 --> 01:27:13.000
-This is cue #5232
-
-5233
-01:27:13.000 --> 01:27:14.000
-This is cue #5233
-
-5234
-01:27:14.000 --> 01:27:15.000
-This is cue #5234
-
-5235
-01:27:15.000 --> 01:27:16.000
-This is cue #5235
-
-5236
-01:27:16.000 --> 01:27:17.000
-This is cue #5236
-
-5237
-01:27:17.000 --> 01:27:18.000
-This is cue #5237
-
-5238
-01:27:18.000 --> 01:27:19.000
-This is cue #5238
-
-5239
-01:27:19.000 --> 01:27:20.000
-This is cue #5239
-
-5240
-01:27:20.000 --> 01:27:21.000
-This is cue #5240
-
-5241
-01:27:21.000 --> 01:27:22.000
-This is cue #5241
-
-5242
-01:27:22.000 --> 01:27:23.000
-This is cue #5242
-
-5243
-01:27:23.000 --> 01:27:24.000
-This is cue #5243
-
-5244
-01:27:24.000 --> 01:27:25.000
-This is cue #5244
-
-5245
-01:27:25.000 --> 01:27:26.000
-This is cue #5245
-
-5246
-01:27:26.000 --> 01:27:27.000
-This is cue #5246
-
-5247
-01:27:27.000 --> 01:27:28.000
-This is cue #5247
-
-5248
-01:27:28.000 --> 01:27:29.000
-This is cue #5248
-
-5249
-01:27:29.000 --> 01:27:30.000
-This is cue #5249
-
-5250
-01:27:30.000 --> 01:27:31.000
-This is cue #5250
-
-5251
-01:27:31.000 --> 01:27:32.000
-This is cue #5251
-
-5252
-01:27:32.000 --> 01:27:33.000
-This is cue #5252
-
-5253
-01:27:33.000 --> 01:27:34.000
-This is cue #5253
-
-5254
-01:27:34.000 --> 01:27:35.000
-This is cue #5254
-
-5255
-01:27:35.000 --> 01:27:36.000
-This is cue #5255
-
-5256
-01:27:36.000 --> 01:27:37.000
-This is cue #5256
-
-5257
-01:27:37.000 --> 01:27:38.000
-This is cue #5257
-
-5258
-01:27:38.000 --> 01:27:39.000
-This is cue #5258
-
-5259
-01:27:39.000 --> 01:27:40.000
-This is cue #5259
-
-5260
-01:27:40.000 --> 01:27:41.000
-This is cue #5260
-
-5261
-01:27:41.000 --> 01:27:42.000
-This is cue #5261
-
-5262
-01:27:42.000 --> 01:27:43.000
-This is cue #5262
-
-5263
-01:27:43.000 --> 01:27:44.000
-This is cue #5263
-
-5264
-01:27:44.000 --> 01:27:45.000
-This is cue #5264
-
-5265
-01:27:45.000 --> 01:27:46.000
-This is cue #5265
-
-5266
-01:27:46.000 --> 01:27:47.000
-This is cue #5266
-
-5267
-01:27:47.000 --> 01:27:48.000
-This is cue #5267
-
-5268
-01:27:48.000 --> 01:27:49.000
-This is cue #5268
-
-5269
-01:27:49.000 --> 01:27:50.000
-This is cue #5269
-
-5270
-01:27:50.000 --> 01:27:51.000
-This is cue #5270
-
-5271
-01:27:51.000 --> 01:27:52.000
-This is cue #5271
-
-5272
-01:27:52.000 --> 01:27:53.000
-This is cue #5272
-
-5273
-01:27:53.000 --> 01:27:54.000
-This is cue #5273
-
-5274
-01:27:54.000 --> 01:27:55.000
-This is cue #5274
-
-5275
-01:27:55.000 --> 01:27:56.000
-This is cue #5275
-
-5276
-01:27:56.000 --> 01:27:57.000
-This is cue #5276
-
-5277
-01:27:57.000 --> 01:27:58.000
-This is cue #5277
-
-5278
-01:27:58.000 --> 01:27:59.000
-This is cue #5278
-
-5279
-01:27:59.000 --> 01:28:00.000
-This is cue #5279
-
-5280
-01:28:00.000 --> 01:28:01.000
-This is cue #5280
-
-5281
-01:28:01.000 --> 01:28:02.000
-This is cue #5281
-
-5282
-01:28:02.000 --> 01:28:03.000
-This is cue #5282
-
-5283
-01:28:03.000 --> 01:28:04.000
-This is cue #5283
-
-5284
-01:28:04.000 --> 01:28:05.000
-This is cue #5284
-
-5285
-01:28:05.000 --> 01:28:06.000
-This is cue #5285
-
-5286
-01:28:06.000 --> 01:28:07.000
-This is cue #5286
-
-5287
-01:28:07.000 --> 01:28:08.000
-This is cue #5287
-
-5288
-01:28:08.000 --> 01:28:09.000
-This is cue #5288
-
-5289
-01:28:09.000 --> 01:28:10.000
-This is cue #5289
-
-5290
-01:28:10.000 --> 01:28:11.000
-This is cue #5290
-
-5291
-01:28:11.000 --> 01:28:12.000
-This is cue #5291
-
-5292
-01:28:12.000 --> 01:28:13.000
-This is cue #5292
-
-5293
-01:28:13.000 --> 01:28:14.000
-This is cue #5293
-
-5294
-01:28:14.000 --> 01:28:15.000
-This is cue #5294
-
-5295
-01:28:15.000 --> 01:28:16.000
-This is cue #5295
-
-5296
-01:28:16.000 --> 01:28:17.000
-This is cue #5296
-
-5297
-01:28:17.000 --> 01:28:18.000
-This is cue #5297
-
-5298
-01:28:18.000 --> 01:28:19.000
-This is cue #5298
-
-5299
-01:28:19.000 --> 01:28:20.000
-This is cue #5299
-
-5300
-01:28:20.000 --> 01:28:21.000
-This is cue #5300
-
-5301
-01:28:21.000 --> 01:28:22.000
-This is cue #5301
-
-5302
-01:28:22.000 --> 01:28:23.000
-This is cue #5302
-
-5303
-01:28:23.000 --> 01:28:24.000
-This is cue #5303
-
-5304
-01:28:24.000 --> 01:28:25.000
-This is cue #5304
-
-5305
-01:28:25.000 --> 01:28:26.000
-This is cue #5305
-
-5306
-01:28:26.000 --> 01:28:27.000
-This is cue #5306
-
-5307
-01:28:27.000 --> 01:28:28.000
-This is cue #5307
-
-5308
-01:28:28.000 --> 01:28:29.000
-This is cue #5308
-
-5309
-01:28:29.000 --> 01:28:30.000
-This is cue #5309
-
-5310
-01:28:30.000 --> 01:28:31.000
-This is cue #5310
-
-5311
-01:28:31.000 --> 01:28:32.000
-This is cue #5311
-
-5312
-01:28:32.000 --> 01:28:33.000
-This is cue #5312
-
-5313
-01:28:33.000 --> 01:28:34.000
-This is cue #5313
-
-5314
-01:28:34.000 --> 01:28:35.000
-This is cue #5314
-
-5315
-01:28:35.000 --> 01:28:36.000
-This is cue #5315
-
-5316
-01:28:36.000 --> 01:28:37.000
-This is cue #5316
-
-5317
-01:28:37.000 --> 01:28:38.000
-This is cue #5317
-
-5318
-01:28:38.000 --> 01:28:39.000
-This is cue #5318
-
-5319
-01:28:39.000 --> 01:28:40.000
-This is cue #5319
-
-5320
-01:28:40.000 --> 01:28:41.000
-This is cue #5320
-
-5321
-01:28:41.000 --> 01:28:42.000
-This is cue #5321
-
-5322
-01:28:42.000 --> 01:28:43.000
-This is cue #5322
-
-5323
-01:28:43.000 --> 01:28:44.000
-This is cue #5323
-
-5324
-01:28:44.000 --> 01:28:45.000
-This is cue #5324
-
-5325
-01:28:45.000 --> 01:28:46.000
-This is cue #5325
-
-5326
-01:28:46.000 --> 01:28:47.000
-This is cue #5326
-
-5327
-01:28:47.000 --> 01:28:48.000
-This is cue #5327
-
-5328
-01:28:48.000 --> 01:28:49.000
-This is cue #5328
-
-5329
-01:28:49.000 --> 01:28:50.000
-This is cue #5329
-
-5330
-01:28:50.000 --> 01:28:51.000
-This is cue #5330
-
-5331
-01:28:51.000 --> 01:28:52.000
-This is cue #5331
-
-5332
-01:28:52.000 --> 01:28:53.000
-This is cue #5332
-
-5333
-01:28:53.000 --> 01:28:54.000
-This is cue #5333
-
-5334
-01:28:54.000 --> 01:28:55.000
-This is cue #5334
-
-5335
-01:28:55.000 --> 01:28:56.000
-This is cue #5335
-
-5336
-01:28:56.000 --> 01:28:57.000
-This is cue #5336
-
-5337
-01:28:57.000 --> 01:28:58.000
-This is cue #5337
-
-5338
-01:28:58.000 --> 01:28:59.000
-This is cue #5338
-
-5339
-01:28:59.000 --> 01:29:00.000
-This is cue #5339
-
-5340
-01:29:00.000 --> 01:29:01.000
-This is cue #5340
-
-5341
-01:29:01.000 --> 01:29:02.000
-This is cue #5341
-
-5342
-01:29:02.000 --> 01:29:03.000
-This is cue #5342
-
-5343
-01:29:03.000 --> 01:29:04.000
-This is cue #5343
-
-5344
-01:29:04.000 --> 01:29:05.000
-This is cue #5344
-
-5345
-01:29:05.000 --> 01:29:06.000
-This is cue #5345
-
-5346
-01:29:06.000 --> 01:29:07.000
-This is cue #5346
-
-5347
-01:29:07.000 --> 01:29:08.000
-This is cue #5347
-
-5348
-01:29:08.000 --> 01:29:09.000
-This is cue #5348
-
-5349
-01:29:09.000 --> 01:29:10.000
-This is cue #5349
-
-5350
-01:29:10.000 --> 01:29:11.000
-This is cue #5350
-
-5351
-01:29:11.000 --> 01:29:12.000
-This is cue #5351
-
-5352
-01:29:12.000 --> 01:29:13.000
-This is cue #5352
-
-5353
-01:29:13.000 --> 01:29:14.000
-This is cue #5353
-
-5354
-01:29:14.000 --> 01:29:15.000
-This is cue #5354
-
-5355
-01:29:15.000 --> 01:29:16.000
-This is cue #5355
-
-5356
-01:29:16.000 --> 01:29:17.000
-This is cue #5356
-
-5357
-01:29:17.000 --> 01:29:18.000
-This is cue #5357
-
-5358
-01:29:18.000 --> 01:29:19.000
-This is cue #5358
-
-5359
-01:29:19.000 --> 01:29:20.000
-This is cue #5359
-
-5360
-01:29:20.000 --> 01:29:21.000
-This is cue #5360
-
-5361
-01:29:21.000 --> 01:29:22.000
-This is cue #5361
-
-5362
-01:29:22.000 --> 01:29:23.000
-This is cue #5362
-
-5363
-01:29:23.000 --> 01:29:24.000
-This is cue #5363
-
-5364
-01:29:24.000 --> 01:29:25.000
-This is cue #5364
-
-5365
-01:29:25.000 --> 01:29:26.000
-This is cue #5365
-
-5366
-01:29:26.000 --> 01:29:27.000
-This is cue #5366
-
-5367
-01:29:27.000 --> 01:29:28.000
-This is cue #5367
-
-5368
-01:29:28.000 --> 01:29:29.000
-This is cue #5368
-
-5369
-01:29:29.000 --> 01:29:30.000
-This is cue #5369
-
-5370
-01:29:30.000 --> 01:29:31.000
-This is cue #5370
-
-5371
-01:29:31.000 --> 01:29:32.000
-This is cue #5371
-
-5372
-01:29:32.000 --> 01:29:33.000
-This is cue #5372
-
-5373
-01:29:33.000 --> 01:29:34.000
-This is cue #5373
-
-5374
-01:29:34.000 --> 01:29:35.000
-This is cue #5374
-
-5375
-01:29:35.000 --> 01:29:36.000
-This is cue #5375
-
-5376
-01:29:36.000 --> 01:29:37.000
-This is cue #5376
-
-5377
-01:29:37.000 --> 01:29:38.000
-This is cue #5377
-
-5378
-01:29:38.000 --> 01:29:39.000
-This is cue #5378
-
-5379
-01:29:39.000 --> 01:29:40.000
-This is cue #5379
-
-5380
-01:29:40.000 --> 01:29:41.000
-This is cue #5380
-
-5381
-01:29:41.000 --> 01:29:42.000
-This is cue #5381
-
-5382
-01:29:42.000 --> 01:29:43.000
-This is cue #5382
-
-5383
-01:29:43.000 --> 01:29:44.000
-This is cue #5383
-
-5384
-01:29:44.000 --> 01:29:45.000
-This is cue #5384
-
-5385
-01:29:45.000 --> 01:29:46.000
-This is cue #5385
-
-5386
-01:29:46.000 --> 01:29:47.000
-This is cue #5386
-
-5387
-01:29:47.000 --> 01:29:48.000
-This is cue #5387
-
-5388
-01:29:48.000 --> 01:29:49.000
-This is cue #5388
-
-5389
-01:29:49.000 --> 01:29:50.000
-This is cue #5389
-
-5390
-01:29:50.000 --> 01:29:51.000
-This is cue #5390
-
-5391
-01:29:51.000 --> 01:29:52.000
-This is cue #5391
-
-5392
-01:29:52.000 --> 01:29:53.000
-This is cue #5392
-
-5393
-01:29:53.000 --> 01:29:54.000
-This is cue #5393
-
-5394
-01:29:54.000 --> 01:29:55.000
-This is cue #5394
-
-5395
-01:29:55.000 --> 01:29:56.000
-This is cue #5395
-
-5396
-01:29:56.000 --> 01:29:57.000
-This is cue #5396
-
-5397
-01:29:57.000 --> 01:29:58.000
-This is cue #5397
-
-5398
-01:29:58.000 --> 01:29:59.000
-This is cue #5398
-
-5399
-01:29:59.000 --> 01:30:00.000
-This is cue #5399
-
-5400
-01:30:00.000 --> 01:30:01.000
-This is cue #5400
-
-5401
-01:30:01.000 --> 01:30:02.000
-This is cue #5401
-
-5402
-01:30:02.000 --> 01:30:03.000
-This is cue #5402
-
-5403
-01:30:03.000 --> 01:30:04.000
-This is cue #5403
-
-5404
-01:30:04.000 --> 01:30:05.000
-This is cue #5404
-
-5405
-01:30:05.000 --> 01:30:06.000
-This is cue #5405
-
-5406
-01:30:06.000 --> 01:30:07.000
-This is cue #5406
-
-5407
-01:30:07.000 --> 01:30:08.000
-This is cue #5407
-
-5408
-01:30:08.000 --> 01:30:09.000
-This is cue #5408
-
-5409
-01:30:09.000 --> 01:30:10.000
-This is cue #5409
-
-5410
-01:30:10.000 --> 01:30:11.000
-This is cue #5410
-
-5411
-01:30:11.000 --> 01:30:12.000
-This is cue #5411
-
-5412
-01:30:12.000 --> 01:30:13.000
-This is cue #5412
-
-5413
-01:30:13.000 --> 01:30:14.000
-This is cue #5413
-
-5414
-01:30:14.000 --> 01:30:15.000
-This is cue #5414
-
-5415
-01:30:15.000 --> 01:30:16.000
-This is cue #5415
-
-5416
-01:30:16.000 --> 01:30:17.000
-This is cue #5416
-
-5417
-01:30:17.000 --> 01:30:18.000
-This is cue #5417
-
-5418
-01:30:18.000 --> 01:30:19.000
-This is cue #5418
-
-5419
-01:30:19.000 --> 01:30:20.000
-This is cue #5419
-
-5420
-01:30:20.000 --> 01:30:21.000
-This is cue #5420
-
-5421
-01:30:21.000 --> 01:30:22.000
-This is cue #5421
-
-5422
-01:30:22.000 --> 01:30:23.000
-This is cue #5422
-
-5423
-01:30:23.000 --> 01:30:24.000
-This is cue #5423
-
-5424
-01:30:24.000 --> 01:30:25.000
-This is cue #5424
-
-5425
-01:30:25.000 --> 01:30:26.000
-This is cue #5425
-
-5426
-01:30:26.000 --> 01:30:27.000
-This is cue #5426
-
-5427
-01:30:27.000 --> 01:30:28.000
-This is cue #5427
-
-5428
-01:30:28.000 --> 01:30:29.000
-This is cue #5428
-
-5429
-01:30:29.000 --> 01:30:30.000
-This is cue #5429
-
-5430
-01:30:30.000 --> 01:30:31.000
-This is cue #5430
-
-5431
-01:30:31.000 --> 01:30:32.000
-This is cue #5431
-
-5432
-01:30:32.000 --> 01:30:33.000
-This is cue #5432
-
-5433
-01:30:33.000 --> 01:30:34.000
-This is cue #5433
-
-5434
-01:30:34.000 --> 01:30:35.000
-This is cue #5434
-
-5435
-01:30:35.000 --> 01:30:36.000
-This is cue #5435
-
-5436
-01:30:36.000 --> 01:30:37.000
-This is cue #5436
-
-5437
-01:30:37.000 --> 01:30:38.000
-This is cue #5437
-
-5438
-01:30:38.000 --> 01:30:39.000
-This is cue #5438
-
-5439
-01:30:39.000 --> 01:30:40.000
-This is cue #5439
-
-5440
-01:30:40.000 --> 01:30:41.000
-This is cue #5440
-
-5441
-01:30:41.000 --> 01:30:42.000
-This is cue #5441
-
-5442
-01:30:42.000 --> 01:30:43.000
-This is cue #5442
-
-5443
-01:30:43.000 --> 01:30:44.000
-This is cue #5443
-
-5444
-01:30:44.000 --> 01:30:45.000
-This is cue #5444
-
-5445
-01:30:45.000 --> 01:30:46.000
-This is cue #5445
-
-5446
-01:30:46.000 --> 01:30:47.000
-This is cue #5446
-
-5447
-01:30:47.000 --> 01:30:48.000
-This is cue #5447
-
-5448
-01:30:48.000 --> 01:30:49.000
-This is cue #5448
-
-5449
-01:30:49.000 --> 01:30:50.000
-This is cue #5449
-
-5450
-01:30:50.000 --> 01:30:51.000
-This is cue #5450
-
-5451
-01:30:51.000 --> 01:30:52.000
-This is cue #5451
-
-5452
-01:30:52.000 --> 01:30:53.000
-This is cue #5452
-
-5453
-01:30:53.000 --> 01:30:54.000
-This is cue #5453
-
-5454
-01:30:54.000 --> 01:30:55.000
-This is cue #5454
-
-5455
-01:30:55.000 --> 01:30:56.000
-This is cue #5455
-
-5456
-01:30:56.000 --> 01:30:57.000
-This is cue #5456
-
-5457
-01:30:57.000 --> 01:30:58.000
-This is cue #5457
-
-5458
-01:30:58.000 --> 01:30:59.000
-This is cue #5458
-
-5459
-01:30:59.000 --> 01:31:00.000
-This is cue #5459
-
-5460
-01:31:00.000 --> 01:31:01.000
-This is cue #5460
-
-5461
-01:31:01.000 --> 01:31:02.000
-This is cue #5461
-
-5462
-01:31:02.000 --> 01:31:03.000
-This is cue #5462
-
-5463
-01:31:03.000 --> 01:31:04.000
-This is cue #5463
-
-5464
-01:31:04.000 --> 01:31:05.000
-This is cue #5464
-
-5465
-01:31:05.000 --> 01:31:06.000
-This is cue #5465
-
-5466
-01:31:06.000 --> 01:31:07.000
-This is cue #5466
-
-5467
-01:31:07.000 --> 01:31:08.000
-This is cue #5467
-
-5468
-01:31:08.000 --> 01:31:09.000
-This is cue #5468
-
-5469
-01:31:09.000 --> 01:31:10.000
-This is cue #5469
-
-5470
-01:31:10.000 --> 01:31:11.000
-This is cue #5470
-
-5471
-01:31:11.000 --> 01:31:12.000
-This is cue #5471
-
-5472
-01:31:12.000 --> 01:31:13.000
-This is cue #5472
-
-5473
-01:31:13.000 --> 01:31:14.000
-This is cue #5473
-
-5474
-01:31:14.000 --> 01:31:15.000
-This is cue #5474
-
-5475
-01:31:15.000 --> 01:31:16.000
-This is cue #5475
-
-5476
-01:31:16.000 --> 01:31:17.000
-This is cue #5476
-
-5477
-01:31:17.000 --> 01:31:18.000
-This is cue #5477
-
-5478
-01:31:18.000 --> 01:31:19.000
-This is cue #5478
-
-5479
-01:31:19.000 --> 01:31:20.000
-This is cue #5479
-
-5480
-01:31:20.000 --> 01:31:21.000
-This is cue #5480
-
-5481
-01:31:21.000 --> 01:31:22.000
-This is cue #5481
-
-5482
-01:31:22.000 --> 01:31:23.000
-This is cue #5482
-
-5483
-01:31:23.000 --> 01:31:24.000
-This is cue #5483
-
-5484
-01:31:24.000 --> 01:31:25.000
-This is cue #5484
-
-5485
-01:31:25.000 --> 01:31:26.000
-This is cue #5485
-
-5486
-01:31:26.000 --> 01:31:27.000
-This is cue #5486
-
-5487
-01:31:27.000 --> 01:31:28.000
-This is cue #5487
-
-5488
-01:31:28.000 --> 01:31:29.000
-This is cue #5488
-
-5489
-01:31:29.000 --> 01:31:30.000
-This is cue #5489
-
-5490
-01:31:30.000 --> 01:31:31.000
-This is cue #5490
-
-5491
-01:31:31.000 --> 01:31:32.000
-This is cue #5491
-
-5492
-01:31:32.000 --> 01:31:33.000
-This is cue #5492
-
-5493
-01:31:33.000 --> 01:31:34.000
-This is cue #5493
-
-5494
-01:31:34.000 --> 01:31:35.000
-This is cue #5494
-
-5495
-01:31:35.000 --> 01:31:36.000
-This is cue #5495
-
-5496
-01:31:36.000 --> 01:31:37.000
-This is cue #5496
-
-5497
-01:31:37.000 --> 01:31:38.000
-This is cue #5497
-
-5498
-01:31:38.000 --> 01:31:39.000
-This is cue #5498
-
-5499
-01:31:39.000 --> 01:31:40.000
-This is cue #5499
-
-5500
-01:31:40.000 --> 01:31:41.000
-This is cue #5500
-
-5501
-01:31:41.000 --> 01:31:42.000
-This is cue #5501
-
-5502
-01:31:42.000 --> 01:31:43.000
-This is cue #5502
-
-5503
-01:31:43.000 --> 01:31:44.000
-This is cue #5503
-
-5504
-01:31:44.000 --> 01:31:45.000
-This is cue #5504
-
-5505
-01:31:45.000 --> 01:31:46.000
-This is cue #5505
-
-5506
-01:31:46.000 --> 01:31:47.000
-This is cue #5506
-
-5507
-01:31:47.000 --> 01:31:48.000
-This is cue #5507
-
-5508
-01:31:48.000 --> 01:31:49.000
-This is cue #5508
-
-5509
-01:31:49.000 --> 01:31:50.000
-This is cue #5509
-
-5510
-01:31:50.000 --> 01:31:51.000
-This is cue #5510
-
-5511
-01:31:51.000 --> 01:31:52.000
-This is cue #5511
-
-5512
-01:31:52.000 --> 01:31:53.000
-This is cue #5512
-
-5513
-01:31:53.000 --> 01:31:54.000
-This is cue #5513
-
-5514
-01:31:54.000 --> 01:31:55.000
-This is cue #5514
-
-5515
-01:31:55.000 --> 01:31:56.000
-This is cue #5515
-
-5516
-01:31:56.000 --> 01:31:57.000
-This is cue #5516
-
-5517
-01:31:57.000 --> 01:31:58.000
-This is cue #5517
-
-5518
-01:31:58.000 --> 01:31:59.000
-This is cue #5518
-
-5519
-01:31:59.000 --> 01:32:00.000
-This is cue #5519
-
-5520
-01:32:00.000 --> 01:32:01.000
-This is cue #5520
-
-5521
-01:32:01.000 --> 01:32:02.000
-This is cue #5521
-
-5522
-01:32:02.000 --> 01:32:03.000
-This is cue #5522
-
-5523
-01:32:03.000 --> 01:32:04.000
-This is cue #5523
-
-5524
-01:32:04.000 --> 01:32:05.000
-This is cue #5524
-
-5525
-01:32:05.000 --> 01:32:06.000
-This is cue #5525
-
-5526
-01:32:06.000 --> 01:32:07.000
-This is cue #5526
-
-5527
-01:32:07.000 --> 01:32:08.000
-This is cue #5527
-
-5528
-01:32:08.000 --> 01:32:09.000
-This is cue #5528
-
-5529
-01:32:09.000 --> 01:32:10.000
-This is cue #5529
-
-5530
-01:32:10.000 --> 01:32:11.000
-This is cue #5530
-
-5531
-01:32:11.000 --> 01:32:12.000
-This is cue #5531
-
-5532
-01:32:12.000 --> 01:32:13.000
-This is cue #5532
-
-5533
-01:32:13.000 --> 01:32:14.000
-This is cue #5533
-
-5534
-01:32:14.000 --> 01:32:15.000
-This is cue #5534
-
-5535
-01:32:15.000 --> 01:32:16.000
-This is cue #5535
-
-5536
-01:32:16.000 --> 01:32:17.000
-This is cue #5536
-
-5537
-01:32:17.000 --> 01:32:18.000
-This is cue #5537
-
-5538
-01:32:18.000 --> 01:32:19.000
-This is cue #5538
-
-5539
-01:32:19.000 --> 01:32:20.000
-This is cue #5539
-
-5540
-01:32:20.000 --> 01:32:21.000
-This is cue #5540
-
-5541
-01:32:21.000 --> 01:32:22.000
-This is cue #5541
-
-5542
-01:32:22.000 --> 01:32:23.000
-This is cue #5542
-
-5543
-01:32:23.000 --> 01:32:24.000
-This is cue #5543
-
-5544
-01:32:24.000 --> 01:32:25.000
-This is cue #5544
-
-5545
-01:32:25.000 --> 01:32:26.000
-This is cue #5545
-
-5546
-01:32:26.000 --> 01:32:27.000
-This is cue #5546
-
-5547
-01:32:27.000 --> 01:32:28.000
-This is cue #5547
-
-5548
-01:32:28.000 --> 01:32:29.000
-This is cue #5548
-
-5549
-01:32:29.000 --> 01:32:30.000
-This is cue #5549
-
-5550
-01:32:30.000 --> 01:32:31.000
-This is cue #5550
-
-5551
-01:32:31.000 --> 01:32:32.000
-This is cue #5551
-
-5552
-01:32:32.000 --> 01:32:33.000
-This is cue #5552
-
-5553
-01:32:33.000 --> 01:32:34.000
-This is cue #5553
-
-5554
-01:32:34.000 --> 01:32:35.000
-This is cue #5554
-
-5555
-01:32:35.000 --> 01:32:36.000
-This is cue #5555
-
-5556
-01:32:36.000 --> 01:32:37.000
-This is cue #5556
-
-5557
-01:32:37.000 --> 01:32:38.000
-This is cue #5557
-
-5558
-01:32:38.000 --> 01:32:39.000
-This is cue #5558
-
-5559
-01:32:39.000 --> 01:32:40.000
-This is cue #5559
-
-5560
-01:32:40.000 --> 01:32:41.000
-This is cue #5560
-
-5561
-01:32:41.000 --> 01:32:42.000
-This is cue #5561
-
-5562
-01:32:42.000 --> 01:32:43.000
-This is cue #5562
-
-5563
-01:32:43.000 --> 01:32:44.000
-This is cue #5563
-
-5564
-01:32:44.000 --> 01:32:45.000
-This is cue #5564
-
-5565
-01:32:45.000 --> 01:32:46.000
-This is cue #5565
-
-5566
-01:32:46.000 --> 01:32:47.000
-This is cue #5566
-
-5567
-01:32:47.000 --> 01:32:48.000
-This is cue #5567
-
-5568
-01:32:48.000 --> 01:32:49.000
-This is cue #5568
-
-5569
-01:32:49.000 --> 01:32:50.000
-This is cue #5569
-
-5570
-01:32:50.000 --> 01:32:51.000
-This is cue #5570
-
-5571
-01:32:51.000 --> 01:32:52.000
-This is cue #5571
-
-5572
-01:32:52.000 --> 01:32:53.000
-This is cue #5572
-
-5573
-01:32:53.000 --> 01:32:54.000
-This is cue #5573
-
-5574
-01:32:54.000 --> 01:32:55.000
-This is cue #5574
-
-5575
-01:32:55.000 --> 01:32:56.000
-This is cue #5575
-
-5576
-01:32:56.000 --> 01:32:57.000
-This is cue #5576
-
-5577
-01:32:57.000 --> 01:32:58.000
-This is cue #5577
-
-5578
-01:32:58.000 --> 01:32:59.000
-This is cue #5578
-
-5579
-01:32:59.000 --> 01:33:00.000
-This is cue #5579
-
-5580
-01:33:00.000 --> 01:33:01.000
-This is cue #5580
-
-5581
-01:33:01.000 --> 01:33:02.000
-This is cue #5581
-
-5582
-01:33:02.000 --> 01:33:03.000
-This is cue #5582
-
-5583
-01:33:03.000 --> 01:33:04.000
-This is cue #5583
-
-5584
-01:33:04.000 --> 01:33:05.000
-This is cue #5584
-
-5585
-01:33:05.000 --> 01:33:06.000
-This is cue #5585
-
-5586
-01:33:06.000 --> 01:33:07.000
-This is cue #5586
-
-5587
-01:33:07.000 --> 01:33:08.000
-This is cue #5587
-
-5588
-01:33:08.000 --> 01:33:09.000
-This is cue #5588
-
-5589
-01:33:09.000 --> 01:33:10.000
-This is cue #5589
-
-5590
-01:33:10.000 --> 01:33:11.000
-This is cue #5590
-
-5591
-01:33:11.000 --> 01:33:12.000
-This is cue #5591
-
-5592
-01:33:12.000 --> 01:33:13.000
-This is cue #5592
-
-5593
-01:33:13.000 --> 01:33:14.000
-This is cue #5593
-
-5594
-01:33:14.000 --> 01:33:15.000
-This is cue #5594
-
-5595
-01:33:15.000 --> 01:33:16.000
-This is cue #5595
-
-5596
-01:33:16.000 --> 01:33:17.000
-This is cue #5596
-
-5597
-01:33:17.000 --> 01:33:18.000
-This is cue #5597
-
-5598
-01:33:18.000 --> 01:33:19.000
-This is cue #5598
-
-5599
-01:33:19.000 --> 01:33:20.000
-This is cue #5599
-
-5600
-01:33:20.000 --> 01:33:21.000
-This is cue #5600
-
-5601
-01:33:21.000 --> 01:33:22.000
-This is cue #5601
-
-5602
-01:33:22.000 --> 01:33:23.000
-This is cue #5602
-
-5603
-01:33:23.000 --> 01:33:24.000
-This is cue #5603
-
-5604
-01:33:24.000 --> 01:33:25.000
-This is cue #5604
-
-5605
-01:33:25.000 --> 01:33:26.000
-This is cue #5605
-
-5606
-01:33:26.000 --> 01:33:27.000
-This is cue #5606
-
-5607
-01:33:27.000 --> 01:33:28.000
-This is cue #5607
-
-5608
-01:33:28.000 --> 01:33:29.000
-This is cue #5608
-
-5609
-01:33:29.000 --> 01:33:30.000
-This is cue #5609
-
-5610
-01:33:30.000 --> 01:33:31.000
-This is cue #5610
-
-5611
-01:33:31.000 --> 01:33:32.000
-This is cue #5611
-
-5612
-01:33:32.000 --> 01:33:33.000
-This is cue #5612
-
-5613
-01:33:33.000 --> 01:33:34.000
-This is cue #5613
-
-5614
-01:33:34.000 --> 01:33:35.000
-This is cue #5614
-
-5615
-01:33:35.000 --> 01:33:36.000
-This is cue #5615
-
-5616
-01:33:36.000 --> 01:33:37.000
-This is cue #5616
-
-5617
-01:33:37.000 --> 01:33:38.000
-This is cue #5617
-
-5618
-01:33:38.000 --> 01:33:39.000
-This is cue #5618
-
-5619
-01:33:39.000 --> 01:33:40.000
-This is cue #5619
-
-5620
-01:33:40.000 --> 01:33:41.000
-This is cue #5620
-
-5621
-01:33:41.000 --> 01:33:42.000
-This is cue #5621
-
-5622
-01:33:42.000 --> 01:33:43.000
-This is cue #5622
-
-5623
-01:33:43.000 --> 01:33:44.000
-This is cue #5623
-
-5624
-01:33:44.000 --> 01:33:45.000
-This is cue #5624
-
-5625
-01:33:45.000 --> 01:33:46.000
-This is cue #5625
-
-5626
-01:33:46.000 --> 01:33:47.000
-This is cue #5626
-
-5627
-01:33:47.000 --> 01:33:48.000
-This is cue #5627
-
-5628
-01:33:48.000 --> 01:33:49.000
-This is cue #5628
-
-5629
-01:33:49.000 --> 01:33:50.000
-This is cue #5629
-
-5630
-01:33:50.000 --> 01:33:51.000
-This is cue #5630
-
-5631
-01:33:51.000 --> 01:33:52.000
-This is cue #5631
-
-5632
-01:33:52.000 --> 01:33:53.000
-This is cue #5632
-
-5633
-01:33:53.000 --> 01:33:54.000
-This is cue #5633
-
-5634
-01:33:54.000 --> 01:33:55.000
-This is cue #5634
-
-5635
-01:33:55.000 --> 01:33:56.000
-This is cue #5635
-
-5636
-01:33:56.000 --> 01:33:57.000
-This is cue #5636
-
-5637
-01:33:57.000 --> 01:33:58.000
-This is cue #5637
-
-5638
-01:33:58.000 --> 01:33:59.000
-This is cue #5638
-
-5639
-01:33:59.000 --> 01:34:00.000
-This is cue #5639
-
-5640
-01:34:00.000 --> 01:34:01.000
-This is cue #5640
-
-5641
-01:34:01.000 --> 01:34:02.000
-This is cue #5641
-
-5642
-01:34:02.000 --> 01:34:03.000
-This is cue #5642
-
-5643
-01:34:03.000 --> 01:34:04.000
-This is cue #5643
-
-5644
-01:34:04.000 --> 01:34:05.000
-This is cue #5644
-
-5645
-01:34:05.000 --> 01:34:06.000
-This is cue #5645
-
-5646
-01:34:06.000 --> 01:34:07.000
-This is cue #5646
-
-5647
-01:34:07.000 --> 01:34:08.000
-This is cue #5647
-
-5648
-01:34:08.000 --> 01:34:09.000
-This is cue #5648
-
-5649
-01:34:09.000 --> 01:34:10.000
-This is cue #5649
-
-5650
-01:34:10.000 --> 01:34:11.000
-This is cue #5650
-
-5651
-01:34:11.000 --> 01:34:12.000
-This is cue #5651
-
-5652
-01:34:12.000 --> 01:34:13.000
-This is cue #5652
-
-5653
-01:34:13.000 --> 01:34:14.000
-This is cue #5653
-
-5654
-01:34:14.000 --> 01:34:15.000
-This is cue #5654
-
-5655
-01:34:15.000 --> 01:34:16.000
-This is cue #5655
-
-5656
-01:34:16.000 --> 01:34:17.000
-This is cue #5656
-
-5657
-01:34:17.000 --> 01:34:18.000
-This is cue #5657
-
-5658
-01:34:18.000 --> 01:34:19.000
-This is cue #5658
-
-5659
-01:34:19.000 --> 01:34:20.000
-This is cue #5659
-
-5660
-01:34:20.000 --> 01:34:21.000
-This is cue #5660
-
-5661
-01:34:21.000 --> 01:34:22.000
-This is cue #5661
-
-5662
-01:34:22.000 --> 01:34:23.000
-This is cue #5662
-
-5663
-01:34:23.000 --> 01:34:24.000
-This is cue #5663
-
-5664
-01:34:24.000 --> 01:34:25.000
-This is cue #5664
-
-5665
-01:34:25.000 --> 01:34:26.000
-This is cue #5665
-
-5666
-01:34:26.000 --> 01:34:27.000
-This is cue #5666
-
-5667
-01:34:27.000 --> 01:34:28.000
-This is cue #5667
-
-5668
-01:34:28.000 --> 01:34:29.000
-This is cue #5668
-
-5669
-01:34:29.000 --> 01:34:30.000
-This is cue #5669
-
-5670
-01:34:30.000 --> 01:34:31.000
-This is cue #5670
-
-5671
-01:34:31.000 --> 01:34:32.000
-This is cue #5671
-
-5672
-01:34:32.000 --> 01:34:33.000
-This is cue #5672
-
-5673
-01:34:33.000 --> 01:34:34.000
-This is cue #5673
-
-5674
-01:34:34.000 --> 01:34:35.000
-This is cue #5674
-
-5675
-01:34:35.000 --> 01:34:36.000
-This is cue #5675
-
-5676
-01:34:36.000 --> 01:34:37.000
-This is cue #5676
-
-5677
-01:34:37.000 --> 01:34:38.000
-This is cue #5677
-
-5678
-01:34:38.000 --> 01:34:39.000
-This is cue #5678
-
-5679
-01:34:39.000 --> 01:34:40.000
-This is cue #5679
-
-5680
-01:34:40.000 --> 01:34:41.000
-This is cue #5680
-
-5681
-01:34:41.000 --> 01:34:42.000
-This is cue #5681
-
-5682
-01:34:42.000 --> 01:34:43.000
-This is cue #5682
-
-5683
-01:34:43.000 --> 01:34:44.000
-This is cue #5683
-
-5684
-01:34:44.000 --> 01:34:45.000
-This is cue #5684
-
-5685
-01:34:45.000 --> 01:34:46.000
-This is cue #5685
-
-5686
-01:34:46.000 --> 01:34:47.000
-This is cue #5686
-
-5687
-01:34:47.000 --> 01:34:48.000
-This is cue #5687
-
-5688
-01:34:48.000 --> 01:34:49.000
-This is cue #5688
-
-5689
-01:34:49.000 --> 01:34:50.000
-This is cue #5689
-
-5690
-01:34:50.000 --> 01:34:51.000
-This is cue #5690
-
-5691
-01:34:51.000 --> 01:34:52.000
-This is cue #5691
-
-5692
-01:34:52.000 --> 01:34:53.000
-This is cue #5692
-
-5693
-01:34:53.000 --> 01:34:54.000
-This is cue #5693
-
-5694
-01:34:54.000 --> 01:34:55.000
-This is cue #5694
-
-5695
-01:34:55.000 --> 01:34:56.000
-This is cue #5695
-
-5696
-01:34:56.000 --> 01:34:57.000
-This is cue #5696
-
-5697
-01:34:57.000 --> 01:34:58.000
-This is cue #5697
-
-5698
-01:34:58.000 --> 01:34:59.000
-This is cue #5698
-
-5699
-01:34:59.000 --> 01:35:00.000
-This is cue #5699
-
-5700
-01:35:00.000 --> 01:35:01.000
-This is cue #5700
-
-5701
-01:35:01.000 --> 01:35:02.000
-This is cue #5701
-
-5702
-01:35:02.000 --> 01:35:03.000
-This is cue #5702
-
-5703
-01:35:03.000 --> 01:35:04.000
-This is cue #5703
-
-5704
-01:35:04.000 --> 01:35:05.000
-This is cue #5704
-
-5705
-01:35:05.000 --> 01:35:06.000
-This is cue #5705
-
-5706
-01:35:06.000 --> 01:35:07.000
-This is cue #5706
-
-5707
-01:35:07.000 --> 01:35:08.000
-This is cue #5707
-
-5708
-01:35:08.000 --> 01:35:09.000
-This is cue #5708
-
-5709
-01:35:09.000 --> 01:35:10.000
-This is cue #5709
-
-5710
-01:35:10.000 --> 01:35:11.000
-This is cue #5710
-
-5711
-01:35:11.000 --> 01:35:12.000
-This is cue #5711
-
-5712
-01:35:12.000 --> 01:35:13.000
-This is cue #5712
-
-5713
-01:35:13.000 --> 01:35:14.000
-This is cue #5713
-
-5714
-01:35:14.000 --> 01:35:15.000
-This is cue #5714
-
-5715
-01:35:15.000 --> 01:35:16.000
-This is cue #5715
-
-5716
-01:35:16.000 --> 01:35:17.000
-This is cue #5716
-
-5717
-01:35:17.000 --> 01:35:18.000
-This is cue #5717
-
-5718
-01:35:18.000 --> 01:35:19.000
-This is cue #5718
-
-5719
-01:35:19.000 --> 01:35:20.000
-This is cue #5719
-
-5720
-01:35:20.000 --> 01:35:21.000
-This is cue #5720
-
-5721
-01:35:21.000 --> 01:35:22.000
-This is cue #5721
-
-5722
-01:35:22.000 --> 01:35:23.000
-This is cue #5722
-
-5723
-01:35:23.000 --> 01:35:24.000
-This is cue #5723
-
-5724
-01:35:24.000 --> 01:35:25.000
-This is cue #5724
-
-5725
-01:35:25.000 --> 01:35:26.000
-This is cue #5725
-
-5726
-01:35:26.000 --> 01:35:27.000
-This is cue #5726
-
-5727
-01:35:27.000 --> 01:35:28.000
-This is cue #5727
-
-5728
-01:35:28.000 --> 01:35:29.000
-This is cue #5728
-
-5729
-01:35:29.000 --> 01:35:30.000
-This is cue #5729
-
-5730
-01:35:30.000 --> 01:35:31.000
-This is cue #5730
-
-5731
-01:35:31.000 --> 01:35:32.000
-This is cue #5731
-
-5732
-01:35:32.000 --> 01:35:33.000
-This is cue #5732
-
-5733
-01:35:33.000 --> 01:35:34.000
-This is cue #5733
-
-5734
-01:35:34.000 --> 01:35:35.000
-This is cue #5734
-
-5735
-01:35:35.000 --> 01:35:36.000
-This is cue #5735
-
-5736
-01:35:36.000 --> 01:35:37.000
-This is cue #5736
-
-5737
-01:35:37.000 --> 01:35:38.000
-This is cue #5737
-
-5738
-01:35:38.000 --> 01:35:39.000
-This is cue #5738
-
-5739
-01:35:39.000 --> 01:35:40.000
-This is cue #5739
-
-5740
-01:35:40.000 --> 01:35:41.000
-This is cue #5740
-
-5741
-01:35:41.000 --> 01:35:42.000
-This is cue #5741
-
-5742
-01:35:42.000 --> 01:35:43.000
-This is cue #5742
-
-5743
-01:35:43.000 --> 01:35:44.000
-This is cue #5743
-
-5744
-01:35:44.000 --> 01:35:45.000
-This is cue #5744
-
-5745
-01:35:45.000 --> 01:35:46.000
-This is cue #5745
-
-5746
-01:35:46.000 --> 01:35:47.000
-This is cue #5746
-
-5747
-01:35:47.000 --> 01:35:48.000
-This is cue #5747
-
-5748
-01:35:48.000 --> 01:35:49.000
-This is cue #5748
-
-5749
-01:35:49.000 --> 01:35:50.000
-This is cue #5749
-
-5750
-01:35:50.000 --> 01:35:51.000
-This is cue #5750
-
-5751
-01:35:51.000 --> 01:35:52.000
-This is cue #5751
-
-5752
-01:35:52.000 --> 01:35:53.000
-This is cue #5752
-
-5753
-01:35:53.000 --> 01:35:54.000
-This is cue #5753
-
-5754
-01:35:54.000 --> 01:35:55.000
-This is cue #5754
-
-5755
-01:35:55.000 --> 01:35:56.000
-This is cue #5755
-
-5756
-01:35:56.000 --> 01:35:57.000
-This is cue #5756
-
-5757
-01:35:57.000 --> 01:35:58.000
-This is cue #5757
-
-5758
-01:35:58.000 --> 01:35:59.000
-This is cue #5758
-
-5759
-01:35:59.000 --> 01:36:00.000
-This is cue #5759
-
-5760
-01:36:00.000 --> 01:36:01.000
-This is cue #5760
-
-5761
-01:36:01.000 --> 01:36:02.000
-This is cue #5761
-
-5762
-01:36:02.000 --> 01:36:03.000
-This is cue #5762
-
-5763
-01:36:03.000 --> 01:36:04.000
-This is cue #5763
-
-5764
-01:36:04.000 --> 01:36:05.000
-This is cue #5764
-
-5765
-01:36:05.000 --> 01:36:06.000
-This is cue #5765
-
-5766
-01:36:06.000 --> 01:36:07.000
-This is cue #5766
-
-5767
-01:36:07.000 --> 01:36:08.000
-This is cue #5767
-
-5768
-01:36:08.000 --> 01:36:09.000
-This is cue #5768
-
-5769
-01:36:09.000 --> 01:36:10.000
-This is cue #5769
-
-5770
-01:36:10.000 --> 01:36:11.000
-This is cue #5770
-
-5771
-01:36:11.000 --> 01:36:12.000
-This is cue #5771
-
-5772
-01:36:12.000 --> 01:36:13.000
-This is cue #5772
-
-5773
-01:36:13.000 --> 01:36:14.000
-This is cue #5773
-
-5774
-01:36:14.000 --> 01:36:15.000
-This is cue #5774
-
-5775
-01:36:15.000 --> 01:36:16.000
-This is cue #5775
-
-5776
-01:36:16.000 --> 01:36:17.000
-This is cue #5776
-
-5777
-01:36:17.000 --> 01:36:18.000
-This is cue #5777
-
-5778
-01:36:18.000 --> 01:36:19.000
-This is cue #5778
-
-5779
-01:36:19.000 --> 01:36:20.000
-This is cue #5779
-
-5780
-01:36:20.000 --> 01:36:21.000
-This is cue #5780
-
-5781
-01:36:21.000 --> 01:36:22.000
-This is cue #5781
-
-5782
-01:36:22.000 --> 01:36:23.000
-This is cue #5782
-
-5783
-01:36:23.000 --> 01:36:24.000
-This is cue #5783
-
-5784
-01:36:24.000 --> 01:36:25.000
-This is cue #5784
-
-5785
-01:36:25.000 --> 01:36:26.000
-This is cue #5785
-
-5786
-01:36:26.000 --> 01:36:27.000
-This is cue #5786
-
-5787
-01:36:27.000 --> 01:36:28.000
-This is cue #5787
-
-5788
-01:36:28.000 --> 01:36:29.000
-This is cue #5788
-
-5789
-01:36:29.000 --> 01:36:30.000
-This is cue #5789
-
-5790
-01:36:30.000 --> 01:36:31.000
-This is cue #5790
-
-5791
-01:36:31.000 --> 01:36:32.000
-This is cue #5791
-
-5792
-01:36:32.000 --> 01:36:33.000
-This is cue #5792
-
-5793
-01:36:33.000 --> 01:36:34.000
-This is cue #5793
-
-5794
-01:36:34.000 --> 01:36:35.000
-This is cue #5794
-
-5795
-01:36:35.000 --> 01:36:36.000
-This is cue #5795
-
-5796
-01:36:36.000 --> 01:36:37.000
-This is cue #5796
-
-5797
-01:36:37.000 --> 01:36:38.000
-This is cue #5797
-
-5798
-01:36:38.000 --> 01:36:39.000
-This is cue #5798
-
-5799
-01:36:39.000 --> 01:36:40.000
-This is cue #5799
-
-5800
-01:36:40.000 --> 01:36:41.000
-This is cue #5800
-
-5801
-01:36:41.000 --> 01:36:42.000
-This is cue #5801
-
-5802
-01:36:42.000 --> 01:36:43.000
-This is cue #5802
-
-5803
-01:36:43.000 --> 01:36:44.000
-This is cue #5803
-
-5804
-01:36:44.000 --> 01:36:45.000
-This is cue #5804
-
-5805
-01:36:45.000 --> 01:36:46.000
-This is cue #5805
-
-5806
-01:36:46.000 --> 01:36:47.000
-This is cue #5806
-
-5807
-01:36:47.000 --> 01:36:48.000
-This is cue #5807
-
-5808
-01:36:48.000 --> 01:36:49.000
-This is cue #5808
-
-5809
-01:36:49.000 --> 01:36:50.000
-This is cue #5809
-
-5810
-01:36:50.000 --> 01:36:51.000
-This is cue #5810
-
-5811
-01:36:51.000 --> 01:36:52.000
-This is cue #5811
-
-5812
-01:36:52.000 --> 01:36:53.000
-This is cue #5812
-
-5813
-01:36:53.000 --> 01:36:54.000
-This is cue #5813
-
-5814
-01:36:54.000 --> 01:36:55.000
-This is cue #5814
-
-5815
-01:36:55.000 --> 01:36:56.000
-This is cue #5815
-
-5816
-01:36:56.000 --> 01:36:57.000
-This is cue #5816
-
-5817
-01:36:57.000 --> 01:36:58.000
-This is cue #5817
-
-5818
-01:36:58.000 --> 01:36:59.000
-This is cue #5818
-
-5819
-01:36:59.000 --> 01:37:00.000
-This is cue #5819
-
-5820
-01:37:00.000 --> 01:37:01.000
-This is cue #5820
-
-5821
-01:37:01.000 --> 01:37:02.000
-This is cue #5821
-
-5822
-01:37:02.000 --> 01:37:03.000
-This is cue #5822
-
-5823
-01:37:03.000 --> 01:37:04.000
-This is cue #5823
-
-5824
-01:37:04.000 --> 01:37:05.000
-This is cue #5824
-
-5825
-01:37:05.000 --> 01:37:06.000
-This is cue #5825
-
-5826
-01:37:06.000 --> 01:37:07.000
-This is cue #5826
-
-5827
-01:37:07.000 --> 01:37:08.000
-This is cue #5827
-
-5828
-01:37:08.000 --> 01:37:09.000
-This is cue #5828
-
-5829
-01:37:09.000 --> 01:37:10.000
-This is cue #5829
-
-5830
-01:37:10.000 --> 01:37:11.000
-This is cue #5830
-
-5831
-01:37:11.000 --> 01:37:12.000
-This is cue #5831
-
-5832
-01:37:12.000 --> 01:37:13.000
-This is cue #5832
-
-5833
-01:37:13.000 --> 01:37:14.000
-This is cue #5833
-
-5834
-01:37:14.000 --> 01:37:15.000
-This is cue #5834
-
-5835
-01:37:15.000 --> 01:37:16.000
-This is cue #5835
-
-5836
-01:37:16.000 --> 01:37:17.000
-This is cue #5836
-
-5837
-01:37:17.000 --> 01:37:18.000
-This is cue #5837
-
-5838
-01:37:18.000 --> 01:37:19.000
-This is cue #5838
-
-5839
-01:37:19.000 --> 01:37:20.000
-This is cue #5839
-
-5840
-01:37:20.000 --> 01:37:21.000
-This is cue #5840
-
-5841
-01:37:21.000 --> 01:37:22.000
-This is cue #5841
-
-5842
-01:37:22.000 --> 01:37:23.000
-This is cue #5842
-
-5843
-01:37:23.000 --> 01:37:24.000
-This is cue #5843
-
-5844
-01:37:24.000 --> 01:37:25.000
-This is cue #5844
-
-5845
-01:37:25.000 --> 01:37:26.000
-This is cue #5845
-
-5846
-01:37:26.000 --> 01:37:27.000
-This is cue #5846
-
-5847
-01:37:27.000 --> 01:37:28.000
-This is cue #5847
-
-5848
-01:37:28.000 --> 01:37:29.000
-This is cue #5848
-
-5849
-01:37:29.000 --> 01:37:30.000
-This is cue #5849
-
-5850
-01:37:30.000 --> 01:37:31.000
-This is cue #5850
-
-5851
-01:37:31.000 --> 01:37:32.000
-This is cue #5851
-
-5852
-01:37:32.000 --> 01:37:33.000
-This is cue #5852
-
-5853
-01:37:33.000 --> 01:37:34.000
-This is cue #5853
-
-5854
-01:37:34.000 --> 01:37:35.000
-This is cue #5854
-
-5855
-01:37:35.000 --> 01:37:36.000
-This is cue #5855
-
-5856
-01:37:36.000 --> 01:37:37.000
-This is cue #5856
-
-5857
-01:37:37.000 --> 01:37:38.000
-This is cue #5857
-
-5858
-01:37:38.000 --> 01:37:39.000
-This is cue #5858
-
-5859
-01:37:39.000 --> 01:37:40.000
-This is cue #5859
-
-5860
-01:37:40.000 --> 01:37:41.000
-This is cue #5860
-
-5861
-01:37:41.000 --> 01:37:42.000
-This is cue #5861
-
-5862
-01:37:42.000 --> 01:37:43.000
-This is cue #5862
-
-5863
-01:37:43.000 --> 01:37:44.000
-This is cue #5863
-
-5864
-01:37:44.000 --> 01:37:45.000
-This is cue #5864
-
-5865
-01:37:45.000 --> 01:37:46.000
-This is cue #5865
-
-5866
-01:37:46.000 --> 01:37:47.000
-This is cue #5866
-
-5867
-01:37:47.000 --> 01:37:48.000
-This is cue #5867
-
-5868
-01:37:48.000 --> 01:37:49.000
-This is cue #5868
-
-5869
-01:37:49.000 --> 01:37:50.000
-This is cue #5869
-
-5870
-01:37:50.000 --> 01:37:51.000
-This is cue #5870
-
-5871
-01:37:51.000 --> 01:37:52.000
-This is cue #5871
-
-5872
-01:37:52.000 --> 01:37:53.000
-This is cue #5872
-
-5873
-01:37:53.000 --> 01:37:54.000
-This is cue #5873
-
-5874
-01:37:54.000 --> 01:37:55.000
-This is cue #5874
-
-5875
-01:37:55.000 --> 01:37:56.000
-This is cue #5875
-
-5876
-01:37:56.000 --> 01:37:57.000
-This is cue #5876
-
-5877
-01:37:57.000 --> 01:37:58.000
-This is cue #5877
-
-5878
-01:37:58.000 --> 01:37:59.000
-This is cue #5878
-
-5879
-01:37:59.000 --> 01:38:00.000
-This is cue #5879
-
-5880
-01:38:00.000 --> 01:38:01.000
-This is cue #5880
-
-5881
-01:38:01.000 --> 01:38:02.000
-This is cue #5881
-
-5882
-01:38:02.000 --> 01:38:03.000
-This is cue #5882
-
-5883
-01:38:03.000 --> 01:38:04.000
-This is cue #5883
-
-5884
-01:38:04.000 --> 01:38:05.000
-This is cue #5884
-
-5885
-01:38:05.000 --> 01:38:06.000
-This is cue #5885
-
-5886
-01:38:06.000 --> 01:38:07.000
-This is cue #5886
-
-5887
-01:38:07.000 --> 01:38:08.000
-This is cue #5887
-
-5888
-01:38:08.000 --> 01:38:09.000
-This is cue #5888
-
-5889
-01:38:09.000 --> 01:38:10.000
-This is cue #5889
-
-5890
-01:38:10.000 --> 01:38:11.000
-This is cue #5890
-
-5891
-01:38:11.000 --> 01:38:12.000
-This is cue #5891
-
-5892
-01:38:12.000 --> 01:38:13.000
-This is cue #5892
-
-5893
-01:38:13.000 --> 01:38:14.000
-This is cue #5893
-
-5894
-01:38:14.000 --> 01:38:15.000
-This is cue #5894
-
-5895
-01:38:15.000 --> 01:38:16.000
-This is cue #5895
-
-5896
-01:38:16.000 --> 01:38:17.000
-This is cue #5896
-
-5897
-01:38:17.000 --> 01:38:18.000
-This is cue #5897
-
-5898
-01:38:18.000 --> 01:38:19.000
-This is cue #5898
-
-5899
-01:38:19.000 --> 01:38:20.000
-This is cue #5899
-
-5900
-01:38:20.000 --> 01:38:21.000
-This is cue #5900
-
-5901
-01:38:21.000 --> 01:38:22.000
-This is cue #5901
-
-5902
-01:38:22.000 --> 01:38:23.000
-This is cue #5902
-
-5903
-01:38:23.000 --> 01:38:24.000
-This is cue #5903
-
-5904
-01:38:24.000 --> 01:38:25.000
-This is cue #5904
-
-5905
-01:38:25.000 --> 01:38:26.000
-This is cue #5905
-
-5906
-01:38:26.000 --> 01:38:27.000
-This is cue #5906
-
-5907
-01:38:27.000 --> 01:38:28.000
-This is cue #5907
-
-5908
-01:38:28.000 --> 01:38:29.000
-This is cue #5908
-
-5909
-01:38:29.000 --> 01:38:30.000
-This is cue #5909
-
-5910
-01:38:30.000 --> 01:38:31.000
-This is cue #5910
-
-5911
-01:38:31.000 --> 01:38:32.000
-This is cue #5911
-
-5912
-01:38:32.000 --> 01:38:33.000
-This is cue #5912
-
-5913
-01:38:33.000 --> 01:38:34.000
-This is cue #5913
-
-5914
-01:38:34.000 --> 01:38:35.000
-This is cue #5914
-
-5915
-01:38:35.000 --> 01:38:36.000
-This is cue #5915
-
-5916
-01:38:36.000 --> 01:38:37.000
-This is cue #5916
-
-5917
-01:38:37.000 --> 01:38:38.000
-This is cue #5917
-
-5918
-01:38:38.000 --> 01:38:39.000
-This is cue #5918
-
-5919
-01:38:39.000 --> 01:38:40.000
-This is cue #5919
-
-5920
-01:38:40.000 --> 01:38:41.000
-This is cue #5920
-
-5921
-01:38:41.000 --> 01:38:42.000
-This is cue #5921
-
-5922
-01:38:42.000 --> 01:38:43.000
-This is cue #5922
-
-5923
-01:38:43.000 --> 01:38:44.000
-This is cue #5923
-
-5924
-01:38:44.000 --> 01:38:45.000
-This is cue #5924
-
-5925
-01:38:45.000 --> 01:38:46.000
-This is cue #5925
-
-5926
-01:38:46.000 --> 01:38:47.000
-This is cue #5926
-
-5927
-01:38:47.000 --> 01:38:48.000
-This is cue #5927
-
-5928
-01:38:48.000 --> 01:38:49.000
-This is cue #5928
-
-5929
-01:38:49.000 --> 01:38:50.000
-This is cue #5929
-
-5930
-01:38:50.000 --> 01:38:51.000
-This is cue #5930
-
-5931
-01:38:51.000 --> 01:38:52.000
-This is cue #5931
-
-5932
-01:38:52.000 --> 01:38:53.000
-This is cue #5932
-
-5933
-01:38:53.000 --> 01:38:54.000
-This is cue #5933
-
-5934
-01:38:54.000 --> 01:38:55.000
-This is cue #5934
-
-5935
-01:38:55.000 --> 01:38:56.000
-This is cue #5935
-
-5936
-01:38:56.000 --> 01:38:57.000
-This is cue #5936
-
-5937
-01:38:57.000 --> 01:38:58.000
-This is cue #5937
-
-5938
-01:38:58.000 --> 01:38:59.000
-This is cue #5938
-
-5939
-01:38:59.000 --> 01:39:00.000
-This is cue #5939
-
-5940
-01:39:00.000 --> 01:39:01.000
-This is cue #5940
-
-5941
-01:39:01.000 --> 01:39:02.000
-This is cue #5941
-
-5942
-01:39:02.000 --> 01:39:03.000
-This is cue #5942
-
-5943
-01:39:03.000 --> 01:39:04.000
-This is cue #5943
-
-5944
-01:39:04.000 --> 01:39:05.000
-This is cue #5944
-
-5945
-01:39:05.000 --> 01:39:06.000
-This is cue #5945
-
-5946
-01:39:06.000 --> 01:39:07.000
-This is cue #5946
-
-5947
-01:39:07.000 --> 01:39:08.000
-This is cue #5947
-
-5948
-01:39:08.000 --> 01:39:09.000
-This is cue #5948
-
-5949
-01:39:09.000 --> 01:39:10.000
-This is cue #5949
-
-5950
-01:39:10.000 --> 01:39:11.000
-This is cue #5950
-
-5951
-01:39:11.000 --> 01:39:12.000
-This is cue #5951
-
-5952
-01:39:12.000 --> 01:39:13.000
-This is cue #5952
-
-5953
-01:39:13.000 --> 01:39:14.000
-This is cue #5953
-
-5954
-01:39:14.000 --> 01:39:15.000
-This is cue #5954
-
-5955
-01:39:15.000 --> 01:39:16.000
-This is cue #5955
-
-5956
-01:39:16.000 --> 01:39:17.000
-This is cue #5956
-
-5957
-01:39:17.000 --> 01:39:18.000
-This is cue #5957
-
-5958
-01:39:18.000 --> 01:39:19.000
-This is cue #5958
-
-5959
-01:39:19.000 --> 01:39:20.000
-This is cue #5959
-
-5960
-01:39:20.000 --> 01:39:21.000
-This is cue #5960
-
-5961
-01:39:21.000 --> 01:39:22.000
-This is cue #5961
-
-5962
-01:39:22.000 --> 01:39:23.000
-This is cue #5962
-
-5963
-01:39:23.000 --> 01:39:24.000
-This is cue #5963
-
-5964
-01:39:24.000 --> 01:39:25.000
-This is cue #5964
-
-5965
-01:39:25.000 --> 01:39:26.000
-This is cue #5965
-
-5966
-01:39:26.000 --> 01:39:27.000
-This is cue #5966
-
-5967
-01:39:27.000 --> 01:39:28.000
-This is cue #5967
-
-5968
-01:39:28.000 --> 01:39:29.000
-This is cue #5968
-
-5969
-01:39:29.000 --> 01:39:30.000
-This is cue #5969
-
-5970
-01:39:30.000 --> 01:39:31.000
-This is cue #5970
-
-5971
-01:39:31.000 --> 01:39:32.000
-This is cue #5971
-
-5972
-01:39:32.000 --> 01:39:33.000
-This is cue #5972
-
-5973
-01:39:33.000 --> 01:39:34.000
-This is cue #5973
-
-5974
-01:39:34.000 --> 01:39:35.000
-This is cue #5974
-
-5975
-01:39:35.000 --> 01:39:36.000
-This is cue #5975
-
-5976
-01:39:36.000 --> 01:39:37.000
-This is cue #5976
-
-5977
-01:39:37.000 --> 01:39:38.000
-This is cue #5977
-
-5978
-01:39:38.000 --> 01:39:39.000
-This is cue #5978
-
-5979
-01:39:39.000 --> 01:39:40.000
-This is cue #5979
-
-5980
-01:39:40.000 --> 01:39:41.000
-This is cue #5980
-
-5981
-01:39:41.000 --> 01:39:42.000
-This is cue #5981
-
-5982
-01:39:42.000 --> 01:39:43.000
-This is cue #5982
-
-5983
-01:39:43.000 --> 01:39:44.000
-This is cue #5983
-
-5984
-01:39:44.000 --> 01:39:45.000
-This is cue #5984
-
-5985
-01:39:45.000 --> 01:39:46.000
-This is cue #5985
-
-5986
-01:39:46.000 --> 01:39:47.000
-This is cue #5986
-
-5987
-01:39:47.000 --> 01:39:48.000
-This is cue #5987
-
-5988
-01:39:48.000 --> 01:39:49.000
-This is cue #5988
-
-5989
-01:39:49.000 --> 01:39:50.000
-This is cue #5989
-
-5990
-01:39:50.000 --> 01:39:51.000
-This is cue #5990
-
-5991
-01:39:51.000 --> 01:39:52.000
-This is cue #5991
-
-5992
-01:39:52.000 --> 01:39:53.000
-This is cue #5992
-
-5993
-01:39:53.000 --> 01:39:54.000
-This is cue #5993
-
-5994
-01:39:54.000 --> 01:39:55.000
-This is cue #5994
-
-5995
-01:39:55.000 --> 01:39:56.000
-This is cue #5995
-
-5996
-01:39:56.000 --> 01:39:57.000
-This is cue #5996
-
-5997
-01:39:57.000 --> 01:39:58.000
-This is cue #5997
-
-5998
-01:39:58.000 --> 01:39:59.000
-This is cue #5998
-
-5999
-01:39:59.000 --> 01:40:00.000
-This is cue #5999
-
-6000
-01:40:00.000 --> 01:40:01.000
-This is cue #6000
-
-6001
-01:40:01.000 --> 01:40:02.000
-This is cue #6001
-
-6002
-01:40:02.000 --> 01:40:03.000
-This is cue #6002
-
-6003
-01:40:03.000 --> 01:40:04.000
-This is cue #6003
-
-6004
-01:40:04.000 --> 01:40:05.000
-This is cue #6004
-
-6005
-01:40:05.000 --> 01:40:06.000
-This is cue #6005
-
-6006
-01:40:06.000 --> 01:40:07.000
-This is cue #6006
-
-6007
-01:40:07.000 --> 01:40:08.000
-This is cue #6007
-
-6008
-01:40:08.000 --> 01:40:09.000
-This is cue #6008
-
-6009
-01:40:09.000 --> 01:40:10.000
-This is cue #6009
-
-6010
-01:40:10.000 --> 01:40:11.000
-This is cue #6010
-
-6011
-01:40:11.000 --> 01:40:12.000
-This is cue #6011
-
-6012
-01:40:12.000 --> 01:40:13.000
-This is cue #6012
-
-6013
-01:40:13.000 --> 01:40:14.000
-This is cue #6013
-
-6014
-01:40:14.000 --> 01:40:15.000
-This is cue #6014
-
-6015
-01:40:15.000 --> 01:40:16.000
-This is cue #6015
-
-6016
-01:40:16.000 --> 01:40:17.000
-This is cue #6016
-
-6017
-01:40:17.000 --> 01:40:18.000
-This is cue #6017
-
-6018
-01:40:18.000 --> 01:40:19.000
-This is cue #6018
-
-6019
-01:40:19.000 --> 01:40:20.000
-This is cue #6019
-
-6020
-01:40:20.000 --> 01:40:21.000
-This is cue #6020
-
-6021
-01:40:21.000 --> 01:40:22.000
-This is cue #6021
-
-6022
-01:40:22.000 --> 01:40:23.000
-This is cue #6022
-
-6023
-01:40:23.000 --> 01:40:24.000
-This is cue #6023
-
-6024
-01:40:24.000 --> 01:40:25.000
-This is cue #6024
-
-6025
-01:40:25.000 --> 01:40:26.000
-This is cue #6025
-
-6026
-01:40:26.000 --> 01:40:27.000
-This is cue #6026
-
-6027
-01:40:27.000 --> 01:40:28.000
-This is cue #6027
-
-6028
-01:40:28.000 --> 01:40:29.000
-This is cue #6028
-
-6029
-01:40:29.000 --> 01:40:30.000
-This is cue #6029
-
-6030
-01:40:30.000 --> 01:40:31.000
-This is cue #6030
-
-6031
-01:40:31.000 --> 01:40:32.000
-This is cue #6031
-
-6032
-01:40:32.000 --> 01:40:33.000
-This is cue #6032
-
-6033
-01:40:33.000 --> 01:40:34.000
-This is cue #6033
-
-6034
-01:40:34.000 --> 01:40:35.000
-This is cue #6034
-
-6035
-01:40:35.000 --> 01:40:36.000
-This is cue #6035
-
-6036
-01:40:36.000 --> 01:40:37.000
-This is cue #6036
-
-6037
-01:40:37.000 --> 01:40:38.000
-This is cue #6037
-
-6038
-01:40:38.000 --> 01:40:39.000
-This is cue #6038
-
-6039
-01:40:39.000 --> 01:40:40.000
-This is cue #6039
-
-6040
-01:40:40.000 --> 01:40:41.000
-This is cue #6040
-
-6041
-01:40:41.000 --> 01:40:42.000
-This is cue #6041
-
-6042
-01:40:42.000 --> 01:40:43.000
-This is cue #6042
-
-6043
-01:40:43.000 --> 01:40:44.000
-This is cue #6043
-
-6044
-01:40:44.000 --> 01:40:45.000
-This is cue #6044
-
-6045
-01:40:45.000 --> 01:40:46.000
-This is cue #6045
-
-6046
-01:40:46.000 --> 01:40:47.000
-This is cue #6046
-
-6047
-01:40:47.000 --> 01:40:48.000
-This is cue #6047
-
-6048
-01:40:48.000 --> 01:40:49.000
-This is cue #6048
-
-6049
-01:40:49.000 --> 01:40:50.000
-This is cue #6049
-
-6050
-01:40:50.000 --> 01:40:51.000
-This is cue #6050
-
-6051
-01:40:51.000 --> 01:40:52.000
-This is cue #6051
-
-6052
-01:40:52.000 --> 01:40:53.000
-This is cue #6052
-
-6053
-01:40:53.000 --> 01:40:54.000
-This is cue #6053
-
-6054
-01:40:54.000 --> 01:40:55.000
-This is cue #6054
-
-6055
-01:40:55.000 --> 01:40:56.000
-This is cue #6055
-
-6056
-01:40:56.000 --> 01:40:57.000
-This is cue #6056
-
-6057
-01:40:57.000 --> 01:40:58.000
-This is cue #6057
-
-6058
-01:40:58.000 --> 01:40:59.000
-This is cue #6058
-
-6059
-01:40:59.000 --> 01:41:00.000
-This is cue #6059
-
-6060
-01:41:00.000 --> 01:41:01.000
-This is cue #6060
-
-6061
-01:41:01.000 --> 01:41:02.000
-This is cue #6061
-
-6062
-01:41:02.000 --> 01:41:03.000
-This is cue #6062
-
-6063
-01:41:03.000 --> 01:41:04.000
-This is cue #6063
-
-6064
-01:41:04.000 --> 01:41:05.000
-This is cue #6064
-
-6065
-01:41:05.000 --> 01:41:06.000
-This is cue #6065
-
-6066
-01:41:06.000 --> 01:41:07.000
-This is cue #6066
-
-6067
-01:41:07.000 --> 01:41:08.000
-This is cue #6067
-
-6068
-01:41:08.000 --> 01:41:09.000
-This is cue #6068
-
-6069
-01:41:09.000 --> 01:41:10.000
-This is cue #6069
-
-6070
-01:41:10.000 --> 01:41:11.000
-This is cue #6070
-
-6071
-01:41:11.000 --> 01:41:12.000
-This is cue #6071
-
-6072
-01:41:12.000 --> 01:41:13.000
-This is cue #6072
-
-6073
-01:41:13.000 --> 01:41:14.000
-This is cue #6073
-
-6074
-01:41:14.000 --> 01:41:15.000
-This is cue #6074
-
-6075
-01:41:15.000 --> 01:41:16.000
-This is cue #6075
-
-6076
-01:41:16.000 --> 01:41:17.000
-This is cue #6076
-
-6077
-01:41:17.000 --> 01:41:18.000
-This is cue #6077
-
-6078
-01:41:18.000 --> 01:41:19.000
-This is cue #6078
-
-6079
-01:41:19.000 --> 01:41:20.000
-This is cue #6079
-
-6080
-01:41:20.000 --> 01:41:21.000
-This is cue #6080
-
-6081
-01:41:21.000 --> 01:41:22.000
-This is cue #6081
-
-6082
-01:41:22.000 --> 01:41:23.000
-This is cue #6082
-
-6083
-01:41:23.000 --> 01:41:24.000
-This is cue #6083
-
-6084
-01:41:24.000 --> 01:41:25.000
-This is cue #6084
-
-6085
-01:41:25.000 --> 01:41:26.000
-This is cue #6085
-
-6086
-01:41:26.000 --> 01:41:27.000
-This is cue #6086
-
-6087
-01:41:27.000 --> 01:41:28.000
-This is cue #6087
-
-6088
-01:41:28.000 --> 01:41:29.000
-This is cue #6088
-
-6089
-01:41:29.000 --> 01:41:30.000
-This is cue #6089
-
-6090
-01:41:30.000 --> 01:41:31.000
-This is cue #6090
-
-6091
-01:41:31.000 --> 01:41:32.000
-This is cue #6091
-
-6092
-01:41:32.000 --> 01:41:33.000
-This is cue #6092
-
-6093
-01:41:33.000 --> 01:41:34.000
-This is cue #6093
-
-6094
-01:41:34.000 --> 01:41:35.000
-This is cue #6094
-
-6095
-01:41:35.000 --> 01:41:36.000
-This is cue #6095
-
-6096
-01:41:36.000 --> 01:41:37.000
-This is cue #6096
-
-6097
-01:41:37.000 --> 01:41:38.000
-This is cue #6097
-
-6098
-01:41:38.000 --> 01:41:39.000
-This is cue #6098
-
-6099
-01:41:39.000 --> 01:41:40.000
-This is cue #6099
-
-6100
-01:41:40.000 --> 01:41:41.000
-This is cue #6100
-
-6101
-01:41:41.000 --> 01:41:42.000
-This is cue #6101
-
-6102
-01:41:42.000 --> 01:41:43.000
-This is cue #6102
-
-6103
-01:41:43.000 --> 01:41:44.000
-This is cue #6103
-
-6104
-01:41:44.000 --> 01:41:45.000
-This is cue #6104
-
-6105
-01:41:45.000 --> 01:41:46.000
-This is cue #6105
-
-6106
-01:41:46.000 --> 01:41:47.000
-This is cue #6106
-
-6107
-01:41:47.000 --> 01:41:48.000
-This is cue #6107
-
-6108
-01:41:48.000 --> 01:41:49.000
-This is cue #6108
-
-6109
-01:41:49.000 --> 01:41:50.000
-This is cue #6109
-
-6110
-01:41:50.000 --> 01:41:51.000
-This is cue #6110
-
-6111
-01:41:51.000 --> 01:41:52.000
-This is cue #6111
-
-6112
-01:41:52.000 --> 01:41:53.000
-This is cue #6112
-
-6113
-01:41:53.000 --> 01:41:54.000
-This is cue #6113
-
-6114
-01:41:54.000 --> 01:41:55.000
-This is cue #6114
-
-6115
-01:41:55.000 --> 01:41:56.000
-This is cue #6115
-
-6116
-01:41:56.000 --> 01:41:57.000
-This is cue #6116
-
-6117
-01:41:57.000 --> 01:41:58.000
-This is cue #6117
-
-6118
-01:41:58.000 --> 01:41:59.000
-This is cue #6118
-
-6119
-01:41:59.000 --> 01:42:00.000
-This is cue #6119
-
-6120
-01:42:00.000 --> 01:42:01.000
-This is cue #6120
-
-6121
-01:42:01.000 --> 01:42:02.000
-This is cue #6121
-
-6122
-01:42:02.000 --> 01:42:03.000
-This is cue #6122
-
-6123
-01:42:03.000 --> 01:42:04.000
-This is cue #6123
-
-6124
-01:42:04.000 --> 01:42:05.000
-This is cue #6124
-
-6125
-01:42:05.000 --> 01:42:06.000
-This is cue #6125
-
-6126
-01:42:06.000 --> 01:42:07.000
-This is cue #6126
-
-6127
-01:42:07.000 --> 01:42:08.000
-This is cue #6127
-
-6128
-01:42:08.000 --> 01:42:09.000
-This is cue #6128
-
-6129
-01:42:09.000 --> 01:42:10.000
-This is cue #6129
-
-6130
-01:42:10.000 --> 01:42:11.000
-This is cue #6130
-
-6131
-01:42:11.000 --> 01:42:12.000
-This is cue #6131
-
-6132
-01:42:12.000 --> 01:42:13.000
-This is cue #6132
-
-6133
-01:42:13.000 --> 01:42:14.000
-This is cue #6133
-
-6134
-01:42:14.000 --> 01:42:15.000
-This is cue #6134
-
-6135
-01:42:15.000 --> 01:42:16.000
-This is cue #6135
-
-6136
-01:42:16.000 --> 01:42:17.000
-This is cue #6136
-
-6137
-01:42:17.000 --> 01:42:18.000
-This is cue #6137
-
-6138
-01:42:18.000 --> 01:42:19.000
-This is cue #6138
-
-6139
-01:42:19.000 --> 01:42:20.000
-This is cue #6139
-
-6140
-01:42:20.000 --> 01:42:21.000
-This is cue #6140
-
-6141
-01:42:21.000 --> 01:42:22.000
-This is cue #6141
-
-6142
-01:42:22.000 --> 01:42:23.000
-This is cue #6142
-
-6143
-01:42:23.000 --> 01:42:24.000
-This is cue #6143
-
-6144
-01:42:24.000 --> 01:42:25.000
-This is cue #6144
-
-6145
-01:42:25.000 --> 01:42:26.000
-This is cue #6145
-
-6146
-01:42:26.000 --> 01:42:27.000
-This is cue #6146
-
-6147
-01:42:27.000 --> 01:42:28.000
-This is cue #6147
-
-6148
-01:42:28.000 --> 01:42:29.000
-This is cue #6148
-
-6149
-01:42:29.000 --> 01:42:30.000
-This is cue #6149
-
-6150
-01:42:30.000 --> 01:42:31.000
-This is cue #6150
-
-6151
-01:42:31.000 --> 01:42:32.000
-This is cue #6151
-
-6152
-01:42:32.000 --> 01:42:33.000
-This is cue #6152
-
-6153
-01:42:33.000 --> 01:42:34.000
-This is cue #6153
-
-6154
-01:42:34.000 --> 01:42:35.000
-This is cue #6154
-
-6155
-01:42:35.000 --> 01:42:36.000
-This is cue #6155
-
-6156
-01:42:36.000 --> 01:42:37.000
-This is cue #6156
-
-6157
-01:42:37.000 --> 01:42:38.000
-This is cue #6157
-
-6158
-01:42:38.000 --> 01:42:39.000
-This is cue #6158
-
-6159
-01:42:39.000 --> 01:42:40.000
-This is cue #6159
-
-6160
-01:42:40.000 --> 01:42:41.000
-This is cue #6160
-
-6161
-01:42:41.000 --> 01:42:42.000
-This is cue #6161
-
-6162
-01:42:42.000 --> 01:42:43.000
-This is cue #6162
-
-6163
-01:42:43.000 --> 01:42:44.000
-This is cue #6163
-
-6164
-01:42:44.000 --> 01:42:45.000
-This is cue #6164
-
-6165
-01:42:45.000 --> 01:42:46.000
-This is cue #6165
-
-6166
-01:42:46.000 --> 01:42:47.000
-This is cue #6166
-
-6167
-01:42:47.000 --> 01:42:48.000
-This is cue #6167
-
-6168
-01:42:48.000 --> 01:42:49.000
-This is cue #6168
-
-6169
-01:42:49.000 --> 01:42:50.000
-This is cue #6169
-
-6170
-01:42:50.000 --> 01:42:51.000
-This is cue #6170
-
-6171
-01:42:51.000 --> 01:42:52.000
-This is cue #6171
-
-6172
-01:42:52.000 --> 01:42:53.000
-This is cue #6172
-
-6173
-01:42:53.000 --> 01:42:54.000
-This is cue #6173
-
-6174
-01:42:54.000 --> 01:42:55.000
-This is cue #6174
-
-6175
-01:42:55.000 --> 01:42:56.000
-This is cue #6175
-
-6176
-01:42:56.000 --> 01:42:57.000
-This is cue #6176
-
-6177
-01:42:57.000 --> 01:42:58.000
-This is cue #6177
-
-6178
-01:42:58.000 --> 01:42:59.000
-This is cue #6178
-
-6179
-01:42:59.000 --> 01:43:00.000
-This is cue #6179
-
-6180
-01:43:00.000 --> 01:43:01.000
-This is cue #6180
-
-6181
-01:43:01.000 --> 01:43:02.000
-This is cue #6181
-
-6182
-01:43:02.000 --> 01:43:03.000
-This is cue #6182
-
-6183
-01:43:03.000 --> 01:43:04.000
-This is cue #6183
-
-6184
-01:43:04.000 --> 01:43:05.000
-This is cue #6184
-
-6185
-01:43:05.000 --> 01:43:06.000
-This is cue #6185
-
-6186
-01:43:06.000 --> 01:43:07.000
-This is cue #6186
-
-6187
-01:43:07.000 --> 01:43:08.000
-This is cue #6187
-
-6188
-01:43:08.000 --> 01:43:09.000
-This is cue #6188
-
-6189
-01:43:09.000 --> 01:43:10.000
-This is cue #6189
-
-6190
-01:43:10.000 --> 01:43:11.000
-This is cue #6190
-
-6191
-01:43:11.000 --> 01:43:12.000
-This is cue #6191
-
-6192
-01:43:12.000 --> 01:43:13.000
-This is cue #6192
-
-6193
-01:43:13.000 --> 01:43:14.000
-This is cue #6193
-
-6194
-01:43:14.000 --> 01:43:15.000
-This is cue #6194
-
-6195
-01:43:15.000 --> 01:43:16.000
-This is cue #6195
-
-6196
-01:43:16.000 --> 01:43:17.000
-This is cue #6196
-
-6197
-01:43:17.000 --> 01:43:18.000
-This is cue #6197
-
-6198
-01:43:18.000 --> 01:43:19.000
-This is cue #6198
-
-6199
-01:43:19.000 --> 01:43:20.000
-This is cue #6199
-
-6200
-01:43:20.000 --> 01:43:21.000
-This is cue #6200
-
-6201
-01:43:21.000 --> 01:43:22.000
-This is cue #6201
-
-6202
-01:43:22.000 --> 01:43:23.000
-This is cue #6202
-
-6203
-01:43:23.000 --> 01:43:24.000
-This is cue #6203
-
-6204
-01:43:24.000 --> 01:43:25.000
-This is cue #6204
-
-6205
-01:43:25.000 --> 01:43:26.000
-This is cue #6205
-
-6206
-01:43:26.000 --> 01:43:27.000
-This is cue #6206
-
-6207
-01:43:27.000 --> 01:43:28.000
-This is cue #6207
-
-6208
-01:43:28.000 --> 01:43:29.000
-This is cue #6208
-
-6209
-01:43:29.000 --> 01:43:30.000
-This is cue #6209
-
-6210
-01:43:30.000 --> 01:43:31.000
-This is cue #6210
-
-6211
-01:43:31.000 --> 01:43:32.000
-This is cue #6211
-
-6212
-01:43:32.000 --> 01:43:33.000
-This is cue #6212
-
-6213
-01:43:33.000 --> 01:43:34.000
-This is cue #6213
-
-6214
-01:43:34.000 --> 01:43:35.000
-This is cue #6214
-
-6215
-01:43:35.000 --> 01:43:36.000
-This is cue #6215
-
-6216
-01:43:36.000 --> 01:43:37.000
-This is cue #6216
-
-6217
-01:43:37.000 --> 01:43:38.000
-This is cue #6217
-
-6218
-01:43:38.000 --> 01:43:39.000
-This is cue #6218
-
-6219
-01:43:39.000 --> 01:43:40.000
-This is cue #6219
-
-6220
-01:43:40.000 --> 01:43:41.000
-This is cue #6220
-
-6221
-01:43:41.000 --> 01:43:42.000
-This is cue #6221
-
-6222
-01:43:42.000 --> 01:43:43.000
-This is cue #6222
-
-6223
-01:43:43.000 --> 01:43:44.000
-This is cue #6223
-
-6224
-01:43:44.000 --> 01:43:45.000
-This is cue #6224
-
-6225
-01:43:45.000 --> 01:43:46.000
-This is cue #6225
-
-6226
-01:43:46.000 --> 01:43:47.000
-This is cue #6226
-
-6227
-01:43:47.000 --> 01:43:48.000
-This is cue #6227
-
-6228
-01:43:48.000 --> 01:43:49.000
-This is cue #6228
-
-6229
-01:43:49.000 --> 01:43:50.000
-This is cue #6229
-
-6230
-01:43:50.000 --> 01:43:51.000
-This is cue #6230
-
-6231
-01:43:51.000 --> 01:43:52.000
-This is cue #6231
-
-6232
-01:43:52.000 --> 01:43:53.000
-This is cue #6232
-
-6233
-01:43:53.000 --> 01:43:54.000
-This is cue #6233
-
-6234
-01:43:54.000 --> 01:43:55.000
-This is cue #6234
-
-6235
-01:43:55.000 --> 01:43:56.000
-This is cue #6235
-
-6236
-01:43:56.000 --> 01:43:57.000
-This is cue #6236
-
-6237
-01:43:57.000 --> 01:43:58.000
-This is cue #6237
-
-6238
-01:43:58.000 --> 01:43:59.000
-This is cue #6238
-
-6239
-01:43:59.000 --> 01:44:00.000
-This is cue #6239
-
-6240
-01:44:00.000 --> 01:44:01.000
-This is cue #6240
-
-6241
-01:44:01.000 --> 01:44:02.000
-This is cue #6241
-
-6242
-01:44:02.000 --> 01:44:03.000
-This is cue #6242
-
-6243
-01:44:03.000 --> 01:44:04.000
-This is cue #6243
-
-6244
-01:44:04.000 --> 01:44:05.000
-This is cue #6244
-
-6245
-01:44:05.000 --> 01:44:06.000
-This is cue #6245
-
-6246
-01:44:06.000 --> 01:44:07.000
-This is cue #6246
-
-6247
-01:44:07.000 --> 01:44:08.000
-This is cue #6247
-
-6248
-01:44:08.000 --> 01:44:09.000
-This is cue #6248
-
-6249
-01:44:09.000 --> 01:44:10.000
-This is cue #6249
-
-6250
-01:44:10.000 --> 01:44:11.000
-This is cue #6250
-
-6251
-01:44:11.000 --> 01:44:12.000
-This is cue #6251
-
-6252
-01:44:12.000 --> 01:44:13.000
-This is cue #6252
-
-6253
-01:44:13.000 --> 01:44:14.000
-This is cue #6253
-
-6254
-01:44:14.000 --> 01:44:15.000
-This is cue #6254
-
-6255
-01:44:15.000 --> 01:44:16.000
-This is cue #6255
-
-6256
-01:44:16.000 --> 01:44:17.000
-This is cue #6256
-
-6257
-01:44:17.000 --> 01:44:18.000
-This is cue #6257
-
-6258
-01:44:18.000 --> 01:44:19.000
-This is cue #6258
-
-6259
-01:44:19.000 --> 01:44:20.000
-This is cue #6259
-
-6260
-01:44:20.000 --> 01:44:21.000
-This is cue #6260
-
-6261
-01:44:21.000 --> 01:44:22.000
-This is cue #6261
-
-6262
-01:44:22.000 --> 01:44:23.000
-This is cue #6262
-
-6263
-01:44:23.000 --> 01:44:24.000
-This is cue #6263
-
-6264
-01:44:24.000 --> 01:44:25.000
-This is cue #6264
-
-6265
-01:44:25.000 --> 01:44:26.000
-This is cue #6265
-
-6266
-01:44:26.000 --> 01:44:27.000
-This is cue #6266
-
-6267
-01:44:27.000 --> 01:44:28.000
-This is cue #6267
-
-6268
-01:44:28.000 --> 01:44:29.000
-This is cue #6268
-
-6269
-01:44:29.000 --> 01:44:30.000
-This is cue #6269
-
-6270
-01:44:30.000 --> 01:44:31.000
-This is cue #6270
-
-6271
-01:44:31.000 --> 01:44:32.000
-This is cue #6271
-
-6272
-01:44:32.000 --> 01:44:33.000
-This is cue #6272
-
-6273
-01:44:33.000 --> 01:44:34.000
-This is cue #6273
-
-6274
-01:44:34.000 --> 01:44:35.000
-This is cue #6274
-
-6275
-01:44:35.000 --> 01:44:36.000
-This is cue #6275
-
-6276
-01:44:36.000 --> 01:44:37.000
-This is cue #6276
-
-6277
-01:44:37.000 --> 01:44:38.000
-This is cue #6277
-
-6278
-01:44:38.000 --> 01:44:39.000
-This is cue #6278
-
-6279
-01:44:39.000 --> 01:44:40.000
-This is cue #6279
-
-6280
-01:44:40.000 --> 01:44:41.000
-This is cue #6280
-
-6281
-01:44:41.000 --> 01:44:42.000
-This is cue #6281
-
-6282
-01:44:42.000 --> 01:44:43.000
-This is cue #6282
-
-6283
-01:44:43.000 --> 01:44:44.000
-This is cue #6283
-
-6284
-01:44:44.000 --> 01:44:45.000
-This is cue #6284
-
-6285
-01:44:45.000 --> 01:44:46.000
-This is cue #6285
-
-6286
-01:44:46.000 --> 01:44:47.000
-This is cue #6286
-
-6287
-01:44:47.000 --> 01:44:48.000
-This is cue #6287
-
-6288
-01:44:48.000 --> 01:44:49.000
-This is cue #6288
-
-6289
-01:44:49.000 --> 01:44:50.000
-This is cue #6289
-
-6290
-01:44:50.000 --> 01:44:51.000
-This is cue #6290
-
-6291
-01:44:51.000 --> 01:44:52.000
-This is cue #6291
-
-6292
-01:44:52.000 --> 01:44:53.000
-This is cue #6292
-
-6293
-01:44:53.000 --> 01:44:54.000
-This is cue #6293
-
-6294
-01:44:54.000 --> 01:44:55.000
-This is cue #6294
-
-6295
-01:44:55.000 --> 01:44:56.000
-This is cue #6295
-
-6296
-01:44:56.000 --> 01:44:57.000
-This is cue #6296
-
-6297
-01:44:57.000 --> 01:44:58.000
-This is cue #6297
-
-6298
-01:44:58.000 --> 01:44:59.000
-This is cue #6298
-
-6299
-01:44:59.000 --> 01:45:00.000
-This is cue #6299
-
-6300
-01:45:00.000 --> 01:45:01.000
-This is cue #6300
-
-6301
-01:45:01.000 --> 01:45:02.000
-This is cue #6301
-
-6302
-01:45:02.000 --> 01:45:03.000
-This is cue #6302
-
-6303
-01:45:03.000 --> 01:45:04.000
-This is cue #6303
-
-6304
-01:45:04.000 --> 01:45:05.000
-This is cue #6304
-
-6305
-01:45:05.000 --> 01:45:06.000
-This is cue #6305
-
-6306
-01:45:06.000 --> 01:45:07.000
-This is cue #6306
-
-6307
-01:45:07.000 --> 01:45:08.000
-This is cue #6307
-
-6308
-01:45:08.000 --> 01:45:09.000
-This is cue #6308
-
-6309
-01:45:09.000 --> 01:45:10.000
-This is cue #6309
-
-6310
-01:45:10.000 --> 01:45:11.000
-This is cue #6310
-
-6311
-01:45:11.000 --> 01:45:12.000
-This is cue #6311
-
-6312
-01:45:12.000 --> 01:45:13.000
-This is cue #6312
-
-6313
-01:45:13.000 --> 01:45:14.000
-This is cue #6313
-
-6314
-01:45:14.000 --> 01:45:15.000
-This is cue #6314
-
-6315
-01:45:15.000 --> 01:45:16.000
-This is cue #6315
-
-6316
-01:45:16.000 --> 01:45:17.000
-This is cue #6316
-
-6317
-01:45:17.000 --> 01:45:18.000
-This is cue #6317
-
-6318
-01:45:18.000 --> 01:45:19.000
-This is cue #6318
-
-6319
-01:45:19.000 --> 01:45:20.000
-This is cue #6319
-
-6320
-01:45:20.000 --> 01:45:21.000
-This is cue #6320
-
-6321
-01:45:21.000 --> 01:45:22.000
-This is cue #6321
-
-6322
-01:45:22.000 --> 01:45:23.000
-This is cue #6322
-
-6323
-01:45:23.000 --> 01:45:24.000
-This is cue #6323
-
-6324
-01:45:24.000 --> 01:45:25.000
-This is cue #6324
-
-6325
-01:45:25.000 --> 01:45:26.000
-This is cue #6325
-
-6326
-01:45:26.000 --> 01:45:27.000
-This is cue #6326
-
-6327
-01:45:27.000 --> 01:45:28.000
-This is cue #6327
-
-6328
-01:45:28.000 --> 01:45:29.000
-This is cue #6328
-
-6329
-01:45:29.000 --> 01:45:30.000
-This is cue #6329
-
-6330
-01:45:30.000 --> 01:45:31.000
-This is cue #6330
-
-6331
-01:45:31.000 --> 01:45:32.000
-This is cue #6331
-
-6332
-01:45:32.000 --> 01:45:33.000
-This is cue #6332
-
-6333
-01:45:33.000 --> 01:45:34.000
-This is cue #6333
-
-6334
-01:45:34.000 --> 01:45:35.000
-This is cue #6334
-
-6335
-01:45:35.000 --> 01:45:36.000
-This is cue #6335
-
-6336
-01:45:36.000 --> 01:45:37.000
-This is cue #6336
-
-6337
-01:45:37.000 --> 01:45:38.000
-This is cue #6337
-
-6338
-01:45:38.000 --> 01:45:39.000
-This is cue #6338
-
-6339
-01:45:39.000 --> 01:45:40.000
-This is cue #6339
-
-6340
-01:45:40.000 --> 01:45:41.000
-This is cue #6340
-
-6341
-01:45:41.000 --> 01:45:42.000
-This is cue #6341
-
-6342
-01:45:42.000 --> 01:45:43.000
-This is cue #6342
-
-6343
-01:45:43.000 --> 01:45:44.000
-This is cue #6343
-
-6344
-01:45:44.000 --> 01:45:45.000
-This is cue #6344
-
-6345
-01:45:45.000 --> 01:45:46.000
-This is cue #6345
-
-6346
-01:45:46.000 --> 01:45:47.000
-This is cue #6346
-
-6347
-01:45:47.000 --> 01:45:48.000
-This is cue #6347
-
-6348
-01:45:48.000 --> 01:45:49.000
-This is cue #6348
-
-6349
-01:45:49.000 --> 01:45:50.000
-This is cue #6349
-
-6350
-01:45:50.000 --> 01:45:51.000
-This is cue #6350
-
-6351
-01:45:51.000 --> 01:45:52.000
-This is cue #6351
-
-6352
-01:45:52.000 --> 01:45:53.000
-This is cue #6352
-
-6353
-01:45:53.000 --> 01:45:54.000
-This is cue #6353
-
-6354
-01:45:54.000 --> 01:45:55.000
-This is cue #6354
-
-6355
-01:45:55.000 --> 01:45:56.000
-This is cue #6355
-
-6356
-01:45:56.000 --> 01:45:57.000
-This is cue #6356
-
-6357
-01:45:57.000 --> 01:45:58.000
-This is cue #6357
-
-6358
-01:45:58.000 --> 01:45:59.000
-This is cue #6358
-
-6359
-01:45:59.000 --> 01:46:00.000
-This is cue #6359
-
-6360
-01:46:00.000 --> 01:46:01.000
-This is cue #6360
-
-6361
-01:46:01.000 --> 01:46:02.000
-This is cue #6361
-
-6362
-01:46:02.000 --> 01:46:03.000
-This is cue #6362
-
-6363
-01:46:03.000 --> 01:46:04.000
-This is cue #6363
-
-6364
-01:46:04.000 --> 01:46:05.000
-This is cue #6364
-
-6365
-01:46:05.000 --> 01:46:06.000
-This is cue #6365
-
-6366
-01:46:06.000 --> 01:46:07.000
-This is cue #6366
-
-6367
-01:46:07.000 --> 01:46:08.000
-This is cue #6367
-
-6368
-01:46:08.000 --> 01:46:09.000
-This is cue #6368
-
-6369
-01:46:09.000 --> 01:46:10.000
-This is cue #6369
-
-6370
-01:46:10.000 --> 01:46:11.000
-This is cue #6370
-
-6371
-01:46:11.000 --> 01:46:12.000
-This is cue #6371
-
-6372
-01:46:12.000 --> 01:46:13.000
-This is cue #6372
-
-6373
-01:46:13.000 --> 01:46:14.000
-This is cue #6373
-
-6374
-01:46:14.000 --> 01:46:15.000
-This is cue #6374
-
-6375
-01:46:15.000 --> 01:46:16.000
-This is cue #6375
-
-6376
-01:46:16.000 --> 01:46:17.000
-This is cue #6376
-
-6377
-01:46:17.000 --> 01:46:18.000
-This is cue #6377
-
-6378
-01:46:18.000 --> 01:46:19.000
-This is cue #6378
-
-6379
-01:46:19.000 --> 01:46:20.000
-This is cue #6379
-
-6380
-01:46:20.000 --> 01:46:21.000
-This is cue #6380
-
-6381
-01:46:21.000 --> 01:46:22.000
-This is cue #6381
-
-6382
-01:46:22.000 --> 01:46:23.000
-This is cue #6382
-
-6383
-01:46:23.000 --> 01:46:24.000
-This is cue #6383
-
-6384
-01:46:24.000 --> 01:46:25.000
-This is cue #6384
-
-6385
-01:46:25.000 --> 01:46:26.000
-This is cue #6385
-
-6386
-01:46:26.000 --> 01:46:27.000
-This is cue #6386
-
-6387
-01:46:27.000 --> 01:46:28.000
-This is cue #6387
-
-6388
-01:46:28.000 --> 01:46:29.000
-This is cue #6388
-
-6389
-01:46:29.000 --> 01:46:30.000
-This is cue #6389
-
-6390
-01:46:30.000 --> 01:46:31.000
-This is cue #6390
-
-6391
-01:46:31.000 --> 01:46:32.000
-This is cue #6391
-
-6392
-01:46:32.000 --> 01:46:33.000
-This is cue #6392
-
-6393
-01:46:33.000 --> 01:46:34.000
-This is cue #6393
-
-6394
-01:46:34.000 --> 01:46:35.000
-This is cue #6394
-
-6395
-01:46:35.000 --> 01:46:36.000
-This is cue #6395
-
-6396
-01:46:36.000 --> 01:46:37.000
-This is cue #6396
-
-6397
-01:46:37.000 --> 01:46:38.000
-This is cue #6397
-
-6398
-01:46:38.000 --> 01:46:39.000
-This is cue #6398
-
-6399
-01:46:39.000 --> 01:46:40.000
-This is cue #6399
-
-6400
-01:46:40.000 --> 01:46:41.000
-This is cue #6400
-
-6401
-01:46:41.000 --> 01:46:42.000
-This is cue #6401
-
-6402
-01:46:42.000 --> 01:46:43.000
-This is cue #6402
-
-6403
-01:46:43.000 --> 01:46:44.000
-This is cue #6403
-
-6404
-01:46:44.000 --> 01:46:45.000
-This is cue #6404
-
-6405
-01:46:45.000 --> 01:46:46.000
-This is cue #6405
-
-6406
-01:46:46.000 --> 01:46:47.000
-This is cue #6406
-
-6407
-01:46:47.000 --> 01:46:48.000
-This is cue #6407
-
-6408
-01:46:48.000 --> 01:46:49.000
-This is cue #6408
-
-6409
-01:46:49.000 --> 01:46:50.000
-This is cue #6409
-
-6410
-01:46:50.000 --> 01:46:51.000
-This is cue #6410
-
-6411
-01:46:51.000 --> 01:46:52.000
-This is cue #6411
-
-6412
-01:46:52.000 --> 01:46:53.000
-This is cue #6412
-
-6413
-01:46:53.000 --> 01:46:54.000
-This is cue #6413
-
-6414
-01:46:54.000 --> 01:46:55.000
-This is cue #6414
-
-6415
-01:46:55.000 --> 01:46:56.000
-This is cue #6415
-
-6416
-01:46:56.000 --> 01:46:57.000
-This is cue #6416
-
-6417
-01:46:57.000 --> 01:46:58.000
-This is cue #6417
-
-6418
-01:46:58.000 --> 01:46:59.000
-This is cue #6418
-
-6419
-01:46:59.000 --> 01:47:00.000
-This is cue #6419
-
-6420
-01:47:00.000 --> 01:47:01.000
-This is cue #6420
-
-6421
-01:47:01.000 --> 01:47:02.000
-This is cue #6421
-
-6422
-01:47:02.000 --> 01:47:03.000
-This is cue #6422
-
-6423
-01:47:03.000 --> 01:47:04.000
-This is cue #6423
-
-6424
-01:47:04.000 --> 01:47:05.000
-This is cue #6424
-
-6425
-01:47:05.000 --> 01:47:06.000
-This is cue #6425
-
-6426
-01:47:06.000 --> 01:47:07.000
-This is cue #6426
-
-6427
-01:47:07.000 --> 01:47:08.000
-This is cue #6427
-
-6428
-01:47:08.000 --> 01:47:09.000
-This is cue #6428
-
-6429
-01:47:09.000 --> 01:47:10.000
-This is cue #6429
-
-6430
-01:47:10.000 --> 01:47:11.000
-This is cue #6430
-
-6431
-01:47:11.000 --> 01:47:12.000
-This is cue #6431
-
-6432
-01:47:12.000 --> 01:47:13.000
-This is cue #6432
-
-6433
-01:47:13.000 --> 01:47:14.000
-This is cue #6433
-
-6434
-01:47:14.000 --> 01:47:15.000
-This is cue #6434
-
-6435
-01:47:15.000 --> 01:47:16.000
-This is cue #6435
-
-6436
-01:47:16.000 --> 01:47:17.000
-This is cue #6436
-
-6437
-01:47:17.000 --> 01:47:18.000
-This is cue #6437
-
-6438
-01:47:18.000 --> 01:47:19.000
-This is cue #6438
-
-6439
-01:47:19.000 --> 01:47:20.000
-This is cue #6439
-
-6440
-01:47:20.000 --> 01:47:21.000
-This is cue #6440
-
-6441
-01:47:21.000 --> 01:47:22.000
-This is cue #6441
-
-6442
-01:47:22.000 --> 01:47:23.000
-This is cue #6442
-
-6443
-01:47:23.000 --> 01:47:24.000
-This is cue #6443
-
-6444
-01:47:24.000 --> 01:47:25.000
-This is cue #6444
-
-6445
-01:47:25.000 --> 01:47:26.000
-This is cue #6445
-
-6446
-01:47:26.000 --> 01:47:27.000
-This is cue #6446
-
-6447
-01:47:27.000 --> 01:47:28.000
-This is cue #6447
-
-6448
-01:47:28.000 --> 01:47:29.000
-This is cue #6448
-
-6449
-01:47:29.000 --> 01:47:30.000
-This is cue #6449
-
-6450
-01:47:30.000 --> 01:47:31.000
-This is cue #6450
-
-6451
-01:47:31.000 --> 01:47:32.000
-This is cue #6451
-
-6452
-01:47:32.000 --> 01:47:33.000
-This is cue #6452
-
-6453
-01:47:33.000 --> 01:47:34.000
-This is cue #6453
-
-6454
-01:47:34.000 --> 01:47:35.000
-This is cue #6454
-
-6455
-01:47:35.000 --> 01:47:36.000
-This is cue #6455
-
-6456
-01:47:36.000 --> 01:47:37.000
-This is cue #6456
-
-6457
-01:47:37.000 --> 01:47:38.000
-This is cue #6457
-
-6458
-01:47:38.000 --> 01:47:39.000
-This is cue #6458
-
-6459
-01:47:39.000 --> 01:47:40.000
-This is cue #6459
-
-6460
-01:47:40.000 --> 01:47:41.000
-This is cue #6460
-
-6461
-01:47:41.000 --> 01:47:42.000
-This is cue #6461
-
-6462
-01:47:42.000 --> 01:47:43.000
-This is cue #6462
-
-6463
-01:47:43.000 --> 01:47:44.000
-This is cue #6463
-
-6464
-01:47:44.000 --> 01:47:45.000
-This is cue #6464
-
-6465
-01:47:45.000 --> 01:47:46.000
-This is cue #6465
-
-6466
-01:47:46.000 --> 01:47:47.000
-This is cue #6466
-
-6467
-01:47:47.000 --> 01:47:48.000
-This is cue #6467
-
-6468
-01:47:48.000 --> 01:47:49.000
-This is cue #6468
-
-6469
-01:47:49.000 --> 01:47:50.000
-This is cue #6469
-
-6470
-01:47:50.000 --> 01:47:51.000
-This is cue #6470
-
-6471
-01:47:51.000 --> 01:47:52.000
-This is cue #6471
-
-6472
-01:47:52.000 --> 01:47:53.000
-This is cue #6472
-
-6473
-01:47:53.000 --> 01:47:54.000
-This is cue #6473
-
-6474
-01:47:54.000 --> 01:47:55.000
-This is cue #6474
-
-6475
-01:47:55.000 --> 01:47:56.000
-This is cue #6475
-
-6476
-01:47:56.000 --> 01:47:57.000
-This is cue #6476
-
-6477
-01:47:57.000 --> 01:47:58.000
-This is cue #6477
-
-6478
-01:47:58.000 --> 01:47:59.000
-This is cue #6478
-
-6479
-01:47:59.000 --> 01:48:00.000
-This is cue #6479
-
-6480
-01:48:00.000 --> 01:48:01.000
-This is cue #6480
-
-6481
-01:48:01.000 --> 01:48:02.000
-This is cue #6481
-
-6482
-01:48:02.000 --> 01:48:03.000
-This is cue #6482
-
-6483
-01:48:03.000 --> 01:48:04.000
-This is cue #6483
-
-6484
-01:48:04.000 --> 01:48:05.000
-This is cue #6484
-
-6485
-01:48:05.000 --> 01:48:06.000
-This is cue #6485
-
-6486
-01:48:06.000 --> 01:48:07.000
-This is cue #6486
-
-6487
-01:48:07.000 --> 01:48:08.000
-This is cue #6487
-
-6488
-01:48:08.000 --> 01:48:09.000
-This is cue #6488
-
-6489
-01:48:09.000 --> 01:48:10.000
-This is cue #6489
-
-6490
-01:48:10.000 --> 01:48:11.000
-This is cue #6490
-
-6491
-01:48:11.000 --> 01:48:12.000
-This is cue #6491
-
-6492
-01:48:12.000 --> 01:48:13.000
-This is cue #6492
-
-6493
-01:48:13.000 --> 01:48:14.000
-This is cue #6493
-
-6494
-01:48:14.000 --> 01:48:15.000
-This is cue #6494
-
-6495
-01:48:15.000 --> 01:48:16.000
-This is cue #6495
-
-6496
-01:48:16.000 --> 01:48:17.000
-This is cue #6496
-
-6497
-01:48:17.000 --> 01:48:18.000
-This is cue #6497
-
-6498
-01:48:18.000 --> 01:48:19.000
-This is cue #6498
-
-6499
-01:48:19.000 --> 01:48:20.000
-This is cue #6499
-
-6500
-01:48:20.000 --> 01:48:21.000
-This is cue #6500
-
-6501
-01:48:21.000 --> 01:48:22.000
-This is cue #6501
-
-6502
-01:48:22.000 --> 01:48:23.000
-This is cue #6502
-
-6503
-01:48:23.000 --> 01:48:24.000
-This is cue #6503
-
-6504
-01:48:24.000 --> 01:48:25.000
-This is cue #6504
-
-6505
-01:48:25.000 --> 01:48:26.000
-This is cue #6505
-
-6506
-01:48:26.000 --> 01:48:27.000
-This is cue #6506
-
-6507
-01:48:27.000 --> 01:48:28.000
-This is cue #6507
-
-6508
-01:48:28.000 --> 01:48:29.000
-This is cue #6508
-
-6509
-01:48:29.000 --> 01:48:30.000
-This is cue #6509
-
-6510
-01:48:30.000 --> 01:48:31.000
-This is cue #6510
-
-6511
-01:48:31.000 --> 01:48:32.000
-This is cue #6511
-
-6512
-01:48:32.000 --> 01:48:33.000
-This is cue #6512
-
-6513
-01:48:33.000 --> 01:48:34.000
-This is cue #6513
-
-6514
-01:48:34.000 --> 01:48:35.000
-This is cue #6514
-
-6515
-01:48:35.000 --> 01:48:36.000
-This is cue #6515
-
-6516
-01:48:36.000 --> 01:48:37.000
-This is cue #6516
-
-6517
-01:48:37.000 --> 01:48:38.000
-This is cue #6517
-
-6518
-01:48:38.000 --> 01:48:39.000
-This is cue #6518
-
-6519
-01:48:39.000 --> 01:48:40.000
-This is cue #6519
-
-6520
-01:48:40.000 --> 01:48:41.000
-This is cue #6520
-
-6521
-01:48:41.000 --> 01:48:42.000
-This is cue #6521
-
-6522
-01:48:42.000 --> 01:48:43.000
-This is cue #6522
-
-6523
-01:48:43.000 --> 01:48:44.000
-This is cue #6523
-
-6524
-01:48:44.000 --> 01:48:45.000
-This is cue #6524
-
-6525
-01:48:45.000 --> 01:48:46.000
-This is cue #6525
-
-6526
-01:48:46.000 --> 01:48:47.000
-This is cue #6526
-
-6527
-01:48:47.000 --> 01:48:48.000
-This is cue #6527
-
-6528
-01:48:48.000 --> 01:48:49.000
-This is cue #6528
-
-6529
-01:48:49.000 --> 01:48:50.000
-This is cue #6529
-
-6530
-01:48:50.000 --> 01:48:51.000
-This is cue #6530
-
-6531
-01:48:51.000 --> 01:48:52.000
-This is cue #6531
-
-6532
-01:48:52.000 --> 01:48:53.000
-This is cue #6532
-
-6533
-01:48:53.000 --> 01:48:54.000
-This is cue #6533
-
-6534
-01:48:54.000 --> 01:48:55.000
-This is cue #6534
-
-6535
-01:48:55.000 --> 01:48:56.000
-This is cue #6535
-
-6536
-01:48:56.000 --> 01:48:57.000
-This is cue #6536
-
-6537
-01:48:57.000 --> 01:48:58.000
-This is cue #6537
-
-6538
-01:48:58.000 --> 01:48:59.000
-This is cue #6538
-
-6539
-01:48:59.000 --> 01:49:00.000
-This is cue #6539
-
-6540
-01:49:00.000 --> 01:49:01.000
-This is cue #6540
-
-6541
-01:49:01.000 --> 01:49:02.000
-This is cue #6541
-
-6542
-01:49:02.000 --> 01:49:03.000
-This is cue #6542
-
-6543
-01:49:03.000 --> 01:49:04.000
-This is cue #6543
-
-6544
-01:49:04.000 --> 01:49:05.000
-This is cue #6544
-
-6545
-01:49:05.000 --> 01:49:06.000
-This is cue #6545
-
-6546
-01:49:06.000 --> 01:49:07.000
-This is cue #6546
-
-6547
-01:49:07.000 --> 01:49:08.000
-This is cue #6547
-
-6548
-01:49:08.000 --> 01:49:09.000
-This is cue #6548
-
-6549
-01:49:09.000 --> 01:49:10.000
-This is cue #6549
-
-6550
-01:49:10.000 --> 01:49:11.000
-This is cue #6550
-
-6551
-01:49:11.000 --> 01:49:12.000
-This is cue #6551
-
-6552
-01:49:12.000 --> 01:49:13.000
-This is cue #6552
-
-6553
-01:49:13.000 --> 01:49:14.000
-This is cue #6553
-
-6554
-01:49:14.000 --> 01:49:15.000
-This is cue #6554
-
-6555
-01:49:15.000 --> 01:49:16.000
-This is cue #6555
-
-6556
-01:49:16.000 --> 01:49:17.000
-This is cue #6556
-
-6557
-01:49:17.000 --> 01:49:18.000
-This is cue #6557
-
-6558
-01:49:18.000 --> 01:49:19.000
-This is cue #6558
-
-6559
-01:49:19.000 --> 01:49:20.000
-This is cue #6559
-
-6560
-01:49:20.000 --> 01:49:21.000
-This is cue #6560
-
-6561
-01:49:21.000 --> 01:49:22.000
-This is cue #6561
-
-6562
-01:49:22.000 --> 01:49:23.000
-This is cue #6562
-
-6563
-01:49:23.000 --> 01:49:24.000
-This is cue #6563
-
-6564
-01:49:24.000 --> 01:49:25.000
-This is cue #6564
-
-6565
-01:49:25.000 --> 01:49:26.000
-This is cue #6565
-
-6566
-01:49:26.000 --> 01:49:27.000
-This is cue #6566
-
-6567
-01:49:27.000 --> 01:49:28.000
-This is cue #6567
-
-6568
-01:49:28.000 --> 01:49:29.000
-This is cue #6568
-
-6569
-01:49:29.000 --> 01:49:30.000
-This is cue #6569
-
-6570
-01:49:30.000 --> 01:49:31.000
-This is cue #6570
-
-6571
-01:49:31.000 --> 01:49:32.000
-This is cue #6571
-
-6572
-01:49:32.000 --> 01:49:33.000
-This is cue #6572
-
-6573
-01:49:33.000 --> 01:49:34.000
-This is cue #6573
-
-6574
-01:49:34.000 --> 01:49:35.000
-This is cue #6574
-
-6575
-01:49:35.000 --> 01:49:36.000
-This is cue #6575
-
-6576
-01:49:36.000 --> 01:49:37.000
-This is cue #6576
-
-6577
-01:49:37.000 --> 01:49:38.000
-This is cue #6577
-
-6578
-01:49:38.000 --> 01:49:39.000
-This is cue #6578
-
-6579
-01:49:39.000 --> 01:49:40.000
-This is cue #6579
-
-6580
-01:49:40.000 --> 01:49:41.000
-This is cue #6580
-
-6581
-01:49:41.000 --> 01:49:42.000
-This is cue #6581
-
-6582
-01:49:42.000 --> 01:49:43.000
-This is cue #6582
-
-6583
-01:49:43.000 --> 01:49:44.000
-This is cue #6583
-
-6584
-01:49:44.000 --> 01:49:45.000
-This is cue #6584
-
-6585
-01:49:45.000 --> 01:49:46.000
-This is cue #6585
-
-6586
-01:49:46.000 --> 01:49:47.000
-This is cue #6586
-
-6587
-01:49:47.000 --> 01:49:48.000
-This is cue #6587
-
-6588
-01:49:48.000 --> 01:49:49.000
-This is cue #6588
-
-6589
-01:49:49.000 --> 01:49:50.000
-This is cue #6589
-
-6590
-01:49:50.000 --> 01:49:51.000
-This is cue #6590
-
-6591
-01:49:51.000 --> 01:49:52.000
-This is cue #6591
-
-6592
-01:49:52.000 --> 01:49:53.000
-This is cue #6592
-
-6593
-01:49:53.000 --> 01:49:54.000
-This is cue #6593
-
-6594
-01:49:54.000 --> 01:49:55.000
-This is cue #6594
-
-6595
-01:49:55.000 --> 01:49:56.000
-This is cue #6595
-
-6596
-01:49:56.000 --> 01:49:57.000
-This is cue #6596
-
-6597
-01:49:57.000 --> 01:49:58.000
-This is cue #6597
-
-6598
-01:49:58.000 --> 01:49:59.000
-This is cue #6598
-
-6599
-01:49:59.000 --> 01:50:00.000
-This is cue #6599
-
-6600
-01:50:00.000 --> 01:50:01.000
-This is cue #6600
-
-6601
-01:50:01.000 --> 01:50:02.000
-This is cue #6601
-
-6602
-01:50:02.000 --> 01:50:03.000
-This is cue #6602
-
-6603
-01:50:03.000 --> 01:50:04.000
-This is cue #6603
-
-6604
-01:50:04.000 --> 01:50:05.000
-This is cue #6604
-
-6605
-01:50:05.000 --> 01:50:06.000
-This is cue #6605
-
-6606
-01:50:06.000 --> 01:50:07.000
-This is cue #6606
-
-6607
-01:50:07.000 --> 01:50:08.000
-This is cue #6607
-
-6608
-01:50:08.000 --> 01:50:09.000
-This is cue #6608
-
-6609
-01:50:09.000 --> 01:50:10.000
-This is cue #6609
-
-6610
-01:50:10.000 --> 01:50:11.000
-This is cue #6610
-
-6611
-01:50:11.000 --> 01:50:12.000
-This is cue #6611
-
-6612
-01:50:12.000 --> 01:50:13.000
-This is cue #6612
-
-6613
-01:50:13.000 --> 01:50:14.000
-This is cue #6613
-
-6614
-01:50:14.000 --> 01:50:15.000
-This is cue #6614
-
-6615
-01:50:15.000 --> 01:50:16.000
-This is cue #6615
-
-6616
-01:50:16.000 --> 01:50:17.000
-This is cue #6616
-
-6617
-01:50:17.000 --> 01:50:18.000
-This is cue #6617
-
-6618
-01:50:18.000 --> 01:50:19.000
-This is cue #6618
-
-6619
-01:50:19.000 --> 01:50:20.000
-This is cue #6619
-
-6620
-01:50:20.000 --> 01:50:21.000
-This is cue #6620
-
-6621
-01:50:21.000 --> 01:50:22.000
-This is cue #6621
-
-6622
-01:50:22.000 --> 01:50:23.000
-This is cue #6622
-
-6623
-01:50:23.000 --> 01:50:24.000
-This is cue #6623
-
-6624
-01:50:24.000 --> 01:50:25.000
-This is cue #6624
-
-6625
-01:50:25.000 --> 01:50:26.000
-This is cue #6625
-
-6626
-01:50:26.000 --> 01:50:27.000
-This is cue #6626
-
-6627
-01:50:27.000 --> 01:50:28.000
-This is cue #6627
-
-6628
-01:50:28.000 --> 01:50:29.000
-This is cue #6628
-
-6629
-01:50:29.000 --> 01:50:30.000
-This is cue #6629
-
-6630
-01:50:30.000 --> 01:50:31.000
-This is cue #6630
-
-6631
-01:50:31.000 --> 01:50:32.000
-This is cue #6631
-
-6632
-01:50:32.000 --> 01:50:33.000
-This is cue #6632
-
-6633
-01:50:33.000 --> 01:50:34.000
-This is cue #6633
-
-6634
-01:50:34.000 --> 01:50:35.000
-This is cue #6634
-
-6635
-01:50:35.000 --> 01:50:36.000
-This is cue #6635
-
-6636
-01:50:36.000 --> 01:50:37.000
-This is cue #6636
-
-6637
-01:50:37.000 --> 01:50:38.000
-This is cue #6637
-
-6638
-01:50:38.000 --> 01:50:39.000
-This is cue #6638
-
-6639
-01:50:39.000 --> 01:50:40.000
-This is cue #6639
-
-6640
-01:50:40.000 --> 01:50:41.000
-This is cue #6640
-
-6641
-01:50:41.000 --> 01:50:42.000
-This is cue #6641
-
-6642
-01:50:42.000 --> 01:50:43.000
-This is cue #6642
-
-6643
-01:50:43.000 --> 01:50:44.000
-This is cue #6643
-
-6644
-01:50:44.000 --> 01:50:45.000
-This is cue #6644
-
-6645
-01:50:45.000 --> 01:50:46.000
-This is cue #6645
-
-6646
-01:50:46.000 --> 01:50:47.000
-This is cue #6646
-
-6647
-01:50:47.000 --> 01:50:48.000
-This is cue #6647
-
-6648
-01:50:48.000 --> 01:50:49.000
-This is cue #6648
-
-6649
-01:50:49.000 --> 01:50:50.000
-This is cue #6649
-
-6650
-01:50:50.000 --> 01:50:51.000
-This is cue #6650
-
-6651
-01:50:51.000 --> 01:50:52.000
-This is cue #6651
-
-6652
-01:50:52.000 --> 01:50:53.000
-This is cue #6652
-
-6653
-01:50:53.000 --> 01:50:54.000
-This is cue #6653
-
-6654
-01:50:54.000 --> 01:50:55.000
-This is cue #6654
-
-6655
-01:50:55.000 --> 01:50:56.000
-This is cue #6655
-
-6656
-01:50:56.000 --> 01:50:57.000
-This is cue #6656
-
-6657
-01:50:57.000 --> 01:50:58.000
-This is cue #6657
-
-6658
-01:50:58.000 --> 01:50:59.000
-This is cue #6658
-
-6659
-01:50:59.000 --> 01:51:00.000
-This is cue #6659
-
-6660
-01:51:00.000 --> 01:51:01.000
-This is cue #6660
-
-6661
-01:51:01.000 --> 01:51:02.000
-This is cue #6661
-
-6662
-01:51:02.000 --> 01:51:03.000
-This is cue #6662
-
-6663
-01:51:03.000 --> 01:51:04.000
-This is cue #6663
-
-6664
-01:51:04.000 --> 01:51:05.000
-This is cue #6664
-
-6665
-01:51:05.000 --> 01:51:06.000
-This is cue #6665
-
-6666
-01:51:06.000 --> 01:51:07.000
-This is cue #6666
-
-6667
-01:51:07.000 --> 01:51:08.000
-This is cue #6667
-
-6668
-01:51:08.000 --> 01:51:09.000
-This is cue #6668
-
-6669
-01:51:09.000 --> 01:51:10.000
-This is cue #6669
-
-6670
-01:51:10.000 --> 01:51:11.000
-This is cue #6670
-
-6671
-01:51:11.000 --> 01:51:12.000
-This is cue #6671
-
-6672
-01:51:12.000 --> 01:51:13.000
-This is cue #6672
-
-6673
-01:51:13.000 --> 01:51:14.000
-This is cue #6673
-
-6674
-01:51:14.000 --> 01:51:15.000
-This is cue #6674
-
-6675
-01:51:15.000 --> 01:51:16.000
-This is cue #6675
-
-6676
-01:51:16.000 --> 01:51:17.000
-This is cue #6676
-
-6677
-01:51:17.000 --> 01:51:18.000
-This is cue #6677
-
-6678
-01:51:18.000 --> 01:51:19.000
-This is cue #6678
-
-6679
-01:51:19.000 --> 01:51:20.000
-This is cue #6679
-
-6680
-01:51:20.000 --> 01:51:21.000
-This is cue #6680
-
-6681
-01:51:21.000 --> 01:51:22.000
-This is cue #6681
-
-6682
-01:51:22.000 --> 01:51:23.000
-This is cue #6682
-
-6683
-01:51:23.000 --> 01:51:24.000
-This is cue #6683
-
-6684
-01:51:24.000 --> 01:51:25.000
-This is cue #6684
-
-6685
-01:51:25.000 --> 01:51:26.000
-This is cue #6685
-
-6686
-01:51:26.000 --> 01:51:27.000
-This is cue #6686
-
-6687
-01:51:27.000 --> 01:51:28.000
-This is cue #6687
-
-6688
-01:51:28.000 --> 01:51:29.000
-This is cue #6688
-
-6689
-01:51:29.000 --> 01:51:30.000
-This is cue #6689
-
-6690
-01:51:30.000 --> 01:51:31.000
-This is cue #6690
-
-6691
-01:51:31.000 --> 01:51:32.000
-This is cue #6691
-
-6692
-01:51:32.000 --> 01:51:33.000
-This is cue #6692
-
-6693
-01:51:33.000 --> 01:51:34.000
-This is cue #6693
-
-6694
-01:51:34.000 --> 01:51:35.000
-This is cue #6694
-
-6695
-01:51:35.000 --> 01:51:36.000
-This is cue #6695
-
-6696
-01:51:36.000 --> 01:51:37.000
-This is cue #6696
-
-6697
-01:51:37.000 --> 01:51:38.000
-This is cue #6697
-
-6698
-01:51:38.000 --> 01:51:39.000
-This is cue #6698
-
-6699
-01:51:39.000 --> 01:51:40.000
-This is cue #6699
-
-6700
-01:51:40.000 --> 01:51:41.000
-This is cue #6700
-
-6701
-01:51:41.000 --> 01:51:42.000
-This is cue #6701
-
-6702
-01:51:42.000 --> 01:51:43.000
-This is cue #6702
-
-6703
-01:51:43.000 --> 01:51:44.000
-This is cue #6703
-
-6704
-01:51:44.000 --> 01:51:45.000
-This is cue #6704
-
-6705
-01:51:45.000 --> 01:51:46.000
-This is cue #6705
-
-6706
-01:51:46.000 --> 01:51:47.000
-This is cue #6706
-
-6707
-01:51:47.000 --> 01:51:48.000
-This is cue #6707
-
-6708
-01:51:48.000 --> 01:51:49.000
-This is cue #6708
-
-6709
-01:51:49.000 --> 01:51:50.000
-This is cue #6709
-
-6710
-01:51:50.000 --> 01:51:51.000
-This is cue #6710
-
-6711
-01:51:51.000 --> 01:51:52.000
-This is cue #6711
-
-6712
-01:51:52.000 --> 01:51:53.000
-This is cue #6712
-
-6713
-01:51:53.000 --> 01:51:54.000
-This is cue #6713
-
-6714
-01:51:54.000 --> 01:51:55.000
-This is cue #6714
-
-6715
-01:51:55.000 --> 01:51:56.000
-This is cue #6715
-
-6716
-01:51:56.000 --> 01:51:57.000
-This is cue #6716
-
-6717
-01:51:57.000 --> 01:51:58.000
-This is cue #6717
-
-6718
-01:51:58.000 --> 01:51:59.000
-This is cue #6718
-
-6719
-01:51:59.000 --> 01:52:00.000
-This is cue #6719
-
-6720
-01:52:00.000 --> 01:52:01.000
-This is cue #6720
-
-6721
-01:52:01.000 --> 01:52:02.000
-This is cue #6721
-
-6722
-01:52:02.000 --> 01:52:03.000
-This is cue #6722
-
-6723
-01:52:03.000 --> 01:52:04.000
-This is cue #6723
-
-6724
-01:52:04.000 --> 01:52:05.000
-This is cue #6724
-
-6725
-01:52:05.000 --> 01:52:06.000
-This is cue #6725
-
-6726
-01:52:06.000 --> 01:52:07.000
-This is cue #6726
-
-6727
-01:52:07.000 --> 01:52:08.000
-This is cue #6727
-
-6728
-01:52:08.000 --> 01:52:09.000
-This is cue #6728
-
-6729
-01:52:09.000 --> 01:52:10.000
-This is cue #6729
-
-6730
-01:52:10.000 --> 01:52:11.000
-This is cue #6730
-
-6731
-01:52:11.000 --> 01:52:12.000
-This is cue #6731
-
-6732
-01:52:12.000 --> 01:52:13.000
-This is cue #6732
-
-6733
-01:52:13.000 --> 01:52:14.000
-This is cue #6733
-
-6734
-01:52:14.000 --> 01:52:15.000
-This is cue #6734
-
-6735
-01:52:15.000 --> 01:52:16.000
-This is cue #6735
-
-6736
-01:52:16.000 --> 01:52:17.000
-This is cue #6736
-
-6737
-01:52:17.000 --> 01:52:18.000
-This is cue #6737
-
-6738
-01:52:18.000 --> 01:52:19.000
-This is cue #6738
-
-6739
-01:52:19.000 --> 01:52:20.000
-This is cue #6739
-
-6740
-01:52:20.000 --> 01:52:21.000
-This is cue #6740
-
-6741
-01:52:21.000 --> 01:52:22.000
-This is cue #6741
-
-6742
-01:52:22.000 --> 01:52:23.000
-This is cue #6742
-
-6743
-01:52:23.000 --> 01:52:24.000
-This is cue #6743
-
-6744
-01:52:24.000 --> 01:52:25.000
-This is cue #6744
-
-6745
-01:52:25.000 --> 01:52:26.000
-This is cue #6745
-
-6746
-01:52:26.000 --> 01:52:27.000
-This is cue #6746
-
-6747
-01:52:27.000 --> 01:52:28.000
-This is cue #6747
-
-6748
-01:52:28.000 --> 01:52:29.000
-This is cue #6748
-
-6749
-01:52:29.000 --> 01:52:30.000
-This is cue #6749
-
-6750
-01:52:30.000 --> 01:52:31.000
-This is cue #6750
-
-6751
-01:52:31.000 --> 01:52:32.000
-This is cue #6751
-
-6752
-01:52:32.000 --> 01:52:33.000
-This is cue #6752
-
-6753
-01:52:33.000 --> 01:52:34.000
-This is cue #6753
-
-6754
-01:52:34.000 --> 01:52:35.000
-This is cue #6754
-
-6755
-01:52:35.000 --> 01:52:36.000
-This is cue #6755
-
-6756
-01:52:36.000 --> 01:52:37.000
-This is cue #6756
-
-6757
-01:52:37.000 --> 01:52:38.000
-This is cue #6757
-
-6758
-01:52:38.000 --> 01:52:39.000
-This is cue #6758
-
-6759
-01:52:39.000 --> 01:52:40.000
-This is cue #6759
-
-6760
-01:52:40.000 --> 01:52:41.000
-This is cue #6760
-
-6761
-01:52:41.000 --> 01:52:42.000
-This is cue #6761
-
-6762
-01:52:42.000 --> 01:52:43.000
-This is cue #6762
-
-6763
-01:52:43.000 --> 01:52:44.000
-This is cue #6763
-
-6764
-01:52:44.000 --> 01:52:45.000
-This is cue #6764
-
-6765
-01:52:45.000 --> 01:52:46.000
-This is cue #6765
-
-6766
-01:52:46.000 --> 01:52:47.000
-This is cue #6766
-
-6767
-01:52:47.000 --> 01:52:48.000
-This is cue #6767
-
-6768
-01:52:48.000 --> 01:52:49.000
-This is cue #6768
-
-6769
-01:52:49.000 --> 01:52:50.000
-This is cue #6769
-
-6770
-01:52:50.000 --> 01:52:51.000
-This is cue #6770
-
-6771
-01:52:51.000 --> 01:52:52.000
-This is cue #6771
-
-6772
-01:52:52.000 --> 01:52:53.000
-This is cue #6772
-
-6773
-01:52:53.000 --> 01:52:54.000
-This is cue #6773
-
-6774
-01:52:54.000 --> 01:52:55.000
-This is cue #6774
-
-6775
-01:52:55.000 --> 01:52:56.000
-This is cue #6775
-
-6776
-01:52:56.000 --> 01:52:57.000
-This is cue #6776
-
-6777
-01:52:57.000 --> 01:52:58.000
-This is cue #6777
-
-6778
-01:52:58.000 --> 01:52:59.000
-This is cue #6778
-
-6779
-01:52:59.000 --> 01:53:00.000
-This is cue #6779
-
-6780
-01:53:00.000 --> 01:53:01.000
-This is cue #6780
-
-6781
-01:53:01.000 --> 01:53:02.000
-This is cue #6781
-
-6782
-01:53:02.000 --> 01:53:03.000
-This is cue #6782
-
-6783
-01:53:03.000 --> 01:53:04.000
-This is cue #6783
-
-6784
-01:53:04.000 --> 01:53:05.000
-This is cue #6784
-
-6785
-01:53:05.000 --> 01:53:06.000
-This is cue #6785
-
-6786
-01:53:06.000 --> 01:53:07.000
-This is cue #6786
-
-6787
-01:53:07.000 --> 01:53:08.000
-This is cue #6787
-
-6788
-01:53:08.000 --> 01:53:09.000
-This is cue #6788
-
-6789
-01:53:09.000 --> 01:53:10.000
-This is cue #6789
-
-6790
-01:53:10.000 --> 01:53:11.000
-This is cue #6790
-
-6791
-01:53:11.000 --> 01:53:12.000
-This is cue #6791
-
-6792
-01:53:12.000 --> 01:53:13.000
-This is cue #6792
-
-6793
-01:53:13.000 --> 01:53:14.000
-This is cue #6793
-
-6794
-01:53:14.000 --> 01:53:15.000
-This is cue #6794
-
-6795
-01:53:15.000 --> 01:53:16.000
-This is cue #6795
-
-6796
-01:53:16.000 --> 01:53:17.000
-This is cue #6796
-
-6797
-01:53:17.000 --> 01:53:18.000
-This is cue #6797
-
-6798
-01:53:18.000 --> 01:53:19.000
-This is cue #6798
-
-6799
-01:53:19.000 --> 01:53:20.000
-This is cue #6799
-
-6800
-01:53:20.000 --> 01:53:21.000
-This is cue #6800
-
-6801
-01:53:21.000 --> 01:53:22.000
-This is cue #6801
-
-6802
-01:53:22.000 --> 01:53:23.000
-This is cue #6802
-
-6803
-01:53:23.000 --> 01:53:24.000
-This is cue #6803
-
-6804
-01:53:24.000 --> 01:53:25.000
-This is cue #6804
-
-6805
-01:53:25.000 --> 01:53:26.000
-This is cue #6805
-
-6806
-01:53:26.000 --> 01:53:27.000
-This is cue #6806
-
-6807
-01:53:27.000 --> 01:53:28.000
-This is cue #6807
-
-6808
-01:53:28.000 --> 01:53:29.000
-This is cue #6808
-
-6809
-01:53:29.000 --> 01:53:30.000
-This is cue #6809
-
-6810
-01:53:30.000 --> 01:53:31.000
-This is cue #6810
-
-6811
-01:53:31.000 --> 01:53:32.000
-This is cue #6811
-
-6812
-01:53:32.000 --> 01:53:33.000
-This is cue #6812
-
-6813
-01:53:33.000 --> 01:53:34.000
-This is cue #6813
-
-6814
-01:53:34.000 --> 01:53:35.000
-This is cue #6814
-
-6815
-01:53:35.000 --> 01:53:36.000
-This is cue #6815
-
-6816
-01:53:36.000 --> 01:53:37.000
-This is cue #6816
-
-6817
-01:53:37.000 --> 01:53:38.000
-This is cue #6817
-
-6818
-01:53:38.000 --> 01:53:39.000
-This is cue #6818
-
-6819
-01:53:39.000 --> 01:53:40.000
-This is cue #6819
-
-6820
-01:53:40.000 --> 01:53:41.000
-This is cue #6820
-
-6821
-01:53:41.000 --> 01:53:42.000
-This is cue #6821
-
-6822
-01:53:42.000 --> 01:53:43.000
-This is cue #6822
-
-6823
-01:53:43.000 --> 01:53:44.000
-This is cue #6823
-
-6824
-01:53:44.000 --> 01:53:45.000
-This is cue #6824
-
-6825
-01:53:45.000 --> 01:53:46.000
-This is cue #6825
-
-6826
-01:53:46.000 --> 01:53:47.000
-This is cue #6826
-
-6827
-01:53:47.000 --> 01:53:48.000
-This is cue #6827
-
-6828
-01:53:48.000 --> 01:53:49.000
-This is cue #6828
-
-6829
-01:53:49.000 --> 01:53:50.000
-This is cue #6829
-
-6830
-01:53:50.000 --> 01:53:51.000
-This is cue #6830
-
-6831
-01:53:51.000 --> 01:53:52.000
-This is cue #6831
-
-6832
-01:53:52.000 --> 01:53:53.000
-This is cue #6832
-
-6833
-01:53:53.000 --> 01:53:54.000
-This is cue #6833
-
-6834
-01:53:54.000 --> 01:53:55.000
-This is cue #6834
-
-6835
-01:53:55.000 --> 01:53:56.000
-This is cue #6835
-
-6836
-01:53:56.000 --> 01:53:57.000
-This is cue #6836
-
-6837
-01:53:57.000 --> 01:53:58.000
-This is cue #6837
-
-6838
-01:53:58.000 --> 01:53:59.000
-This is cue #6838
-
-6839
-01:53:59.000 --> 01:54:00.000
-This is cue #6839
-
-6840
-01:54:00.000 --> 01:54:01.000
-This is cue #6840
-
-6841
-01:54:01.000 --> 01:54:02.000
-This is cue #6841
-
-6842
-01:54:02.000 --> 01:54:03.000
-This is cue #6842
-
-6843
-01:54:03.000 --> 01:54:04.000
-This is cue #6843
-
-6844
-01:54:04.000 --> 01:54:05.000
-This is cue #6844
-
-6845
-01:54:05.000 --> 01:54:06.000
-This is cue #6845
-
-6846
-01:54:06.000 --> 01:54:07.000
-This is cue #6846
-
-6847
-01:54:07.000 --> 01:54:08.000
-This is cue #6847
-
-6848
-01:54:08.000 --> 01:54:09.000
-This is cue #6848
-
-6849
-01:54:09.000 --> 01:54:10.000
-This is cue #6849
-
-6850
-01:54:10.000 --> 01:54:11.000
-This is cue #6850
-
-6851
-01:54:11.000 --> 01:54:12.000
-This is cue #6851
-
-6852
-01:54:12.000 --> 01:54:13.000
-This is cue #6852
-
-6853
-01:54:13.000 --> 01:54:14.000
-This is cue #6853
-
-6854
-01:54:14.000 --> 01:54:15.000
-This is cue #6854
-
-6855
-01:54:15.000 --> 01:54:16.000
-This is cue #6855
-
-6856
-01:54:16.000 --> 01:54:17.000
-This is cue #6856
-
-6857
-01:54:17.000 --> 01:54:18.000
-This is cue #6857
-
-6858
-01:54:18.000 --> 01:54:19.000
-This is cue #6858
-
-6859
-01:54:19.000 --> 01:54:20.000
-This is cue #6859
-
-6860
-01:54:20.000 --> 01:54:21.000
-This is cue #6860
-
-6861
-01:54:21.000 --> 01:54:22.000
-This is cue #6861
-
-6862
-01:54:22.000 --> 01:54:23.000
-This is cue #6862
-
-6863
-01:54:23.000 --> 01:54:24.000
-This is cue #6863
-
-6864
-01:54:24.000 --> 01:54:25.000
-This is cue #6864
-
-6865
-01:54:25.000 --> 01:54:26.000
-This is cue #6865
-
-6866
-01:54:26.000 --> 01:54:27.000
-This is cue #6866
-
-6867
-01:54:27.000 --> 01:54:28.000
-This is cue #6867
-
-6868
-01:54:28.000 --> 01:54:29.000
-This is cue #6868
-
-6869
-01:54:29.000 --> 01:54:30.000
-This is cue #6869
-
-6870
-01:54:30.000 --> 01:54:31.000
-This is cue #6870
-
-6871
-01:54:31.000 --> 01:54:32.000
-This is cue #6871
-
-6872
-01:54:32.000 --> 01:54:33.000
-This is cue #6872
-
-6873
-01:54:33.000 --> 01:54:34.000
-This is cue #6873
-
-6874
-01:54:34.000 --> 01:54:35.000
-This is cue #6874
-
-6875
-01:54:35.000 --> 01:54:36.000
-This is cue #6875
-
-6876
-01:54:36.000 --> 01:54:37.000
-This is cue #6876
-
-6877
-01:54:37.000 --> 01:54:38.000
-This is cue #6877
-
-6878
-01:54:38.000 --> 01:54:39.000
-This is cue #6878
-
-6879
-01:54:39.000 --> 01:54:40.000
-This is cue #6879
-
-6880
-01:54:40.000 --> 01:54:41.000
-This is cue #6880
-
-6881
-01:54:41.000 --> 01:54:42.000
-This is cue #6881
-
-6882
-01:54:42.000 --> 01:54:43.000
-This is cue #6882
-
-6883
-01:54:43.000 --> 01:54:44.000
-This is cue #6883
-
-6884
-01:54:44.000 --> 01:54:45.000
-This is cue #6884
-
-6885
-01:54:45.000 --> 01:54:46.000
-This is cue #6885
-
-6886
-01:54:46.000 --> 01:54:47.000
-This is cue #6886
-
-6887
-01:54:47.000 --> 01:54:48.000
-This is cue #6887
-
-6888
-01:54:48.000 --> 01:54:49.000
-This is cue #6888
-
-6889
-01:54:49.000 --> 01:54:50.000
-This is cue #6889
-
-6890
-01:54:50.000 --> 01:54:51.000
-This is cue #6890
-
-6891
-01:54:51.000 --> 01:54:52.000
-This is cue #6891
-
-6892
-01:54:52.000 --> 01:54:53.000
-This is cue #6892
-
-6893
-01:54:53.000 --> 01:54:54.000
-This is cue #6893
-
-6894
-01:54:54.000 --> 01:54:55.000
-This is cue #6894
-
-6895
-01:54:55.000 --> 01:54:56.000
-This is cue #6895
-
-6896
-01:54:56.000 --> 01:54:57.000
-This is cue #6896
-
-6897
-01:54:57.000 --> 01:54:58.000
-This is cue #6897
-
-6898
-01:54:58.000 --> 01:54:59.000
-This is cue #6898
-
-6899
-01:54:59.000 --> 01:55:00.000
-This is cue #6899
-
-6900
-01:55:00.000 --> 01:55:01.000
-This is cue #6900
-
-6901
-01:55:01.000 --> 01:55:02.000
-This is cue #6901
-
-6902
-01:55:02.000 --> 01:55:03.000
-This is cue #6902
-
-6903
-01:55:03.000 --> 01:55:04.000
-This is cue #6903
-
-6904
-01:55:04.000 --> 01:55:05.000
-This is cue #6904
-
-6905
-01:55:05.000 --> 01:55:06.000
-This is cue #6905
-
-6906
-01:55:06.000 --> 01:55:07.000
-This is cue #6906
-
-6907
-01:55:07.000 --> 01:55:08.000
-This is cue #6907
-
-6908
-01:55:08.000 --> 01:55:09.000
-This is cue #6908
-
-6909
-01:55:09.000 --> 01:55:10.000
-This is cue #6909
-
-6910
-01:55:10.000 --> 01:55:11.000
-This is cue #6910
-
-6911
-01:55:11.000 --> 01:55:12.000
-This is cue #6911
-
-6912
-01:55:12.000 --> 01:55:13.000
-This is cue #6912
-
-6913
-01:55:13.000 --> 01:55:14.000
-This is cue #6913
-
-6914
-01:55:14.000 --> 01:55:15.000
-This is cue #6914
-
-6915
-01:55:15.000 --> 01:55:16.000
-This is cue #6915
-
-6916
-01:55:16.000 --> 01:55:17.000
-This is cue #6916
-
-6917
-01:55:17.000 --> 01:55:18.000
-This is cue #6917
-
-6918
-01:55:18.000 --> 01:55:19.000
-This is cue #6918
-
-6919
-01:55:19.000 --> 01:55:20.000
-This is cue #6919
-
-6920
-01:55:20.000 --> 01:55:21.000
-This is cue #6920
-
-6921
-01:55:21.000 --> 01:55:22.000
-This is cue #6921
-
-6922
-01:55:22.000 --> 01:55:23.000
-This is cue #6922
-
-6923
-01:55:23.000 --> 01:55:24.000
-This is cue #6923
-
-6924
-01:55:24.000 --> 01:55:25.000
-This is cue #6924
-
-6925
-01:55:25.000 --> 01:55:26.000
-This is cue #6925
-
-6926
-01:55:26.000 --> 01:55:27.000
-This is cue #6926
-
-6927
-01:55:27.000 --> 01:55:28.000
-This is cue #6927
-
-6928
-01:55:28.000 --> 01:55:29.000
-This is cue #6928
-
-6929
-01:55:29.000 --> 01:55:30.000
-This is cue #6929
-
-6930
-01:55:30.000 --> 01:55:31.000
-This is cue #6930
-
-6931
-01:55:31.000 --> 01:55:32.000
-This is cue #6931
-
-6932
-01:55:32.000 --> 01:55:33.000
-This is cue #6932
-
-6933
-01:55:33.000 --> 01:55:34.000
-This is cue #6933
-
-6934
-01:55:34.000 --> 01:55:35.000
-This is cue #6934
-
-6935
-01:55:35.000 --> 01:55:36.000
-This is cue #6935
-
-6936
-01:55:36.000 --> 01:55:37.000
-This is cue #6936
-
-6937
-01:55:37.000 --> 01:55:38.000
-This is cue #6937
-
-6938
-01:55:38.000 --> 01:55:39.000
-This is cue #6938
-
-6939
-01:55:39.000 --> 01:55:40.000
-This is cue #6939
-
-6940
-01:55:40.000 --> 01:55:41.000
-This is cue #6940
-
-6941
-01:55:41.000 --> 01:55:42.000
-This is cue #6941
-
-6942
-01:55:42.000 --> 01:55:43.000
-This is cue #6942
-
-6943
-01:55:43.000 --> 01:55:44.000
-This is cue #6943
-
-6944
-01:55:44.000 --> 01:55:45.000
-This is cue #6944
-
-6945
-01:55:45.000 --> 01:55:46.000
-This is cue #6945
-
-6946
-01:55:46.000 --> 01:55:47.000
-This is cue #6946
-
-6947
-01:55:47.000 --> 01:55:48.000
-This is cue #6947
-
-6948
-01:55:48.000 --> 01:55:49.000
-This is cue #6948
-
-6949
-01:55:49.000 --> 01:55:50.000
-This is cue #6949
-
-6950
-01:55:50.000 --> 01:55:51.000
-This is cue #6950
-
-6951
-01:55:51.000 --> 01:55:52.000
-This is cue #6951
-
-6952
-01:55:52.000 --> 01:55:53.000
-This is cue #6952
-
-6953
-01:55:53.000 --> 01:55:54.000
-This is cue #6953
-
-6954
-01:55:54.000 --> 01:55:55.000
-This is cue #6954
-
-6955
-01:55:55.000 --> 01:55:56.000
-This is cue #6955
-
-6956
-01:55:56.000 --> 01:55:57.000
-This is cue #6956
-
-6957
-01:55:57.000 --> 01:55:58.000
-This is cue #6957
-
-6958
-01:55:58.000 --> 01:55:59.000
-This is cue #6958
-
-6959
-01:55:59.000 --> 01:56:00.000
-This is cue #6959
-
-6960
-01:56:00.000 --> 01:56:01.000
-This is cue #6960
-
-6961
-01:56:01.000 --> 01:56:02.000
-This is cue #6961
-
-6962
-01:56:02.000 --> 01:56:03.000
-This is cue #6962
-
-6963
-01:56:03.000 --> 01:56:04.000
-This is cue #6963
-
-6964
-01:56:04.000 --> 01:56:05.000
-This is cue #6964
-
-6965
-01:56:05.000 --> 01:56:06.000
-This is cue #6965
-
-6966
-01:56:06.000 --> 01:56:07.000
-This is cue #6966
-
-6967
-01:56:07.000 --> 01:56:08.000
-This is cue #6967
-
-6968
-01:56:08.000 --> 01:56:09.000
-This is cue #6968
-
-6969
-01:56:09.000 --> 01:56:10.000
-This is cue #6969
-
-6970
-01:56:10.000 --> 01:56:11.000
-This is cue #6970
-
-6971
-01:56:11.000 --> 01:56:12.000
-This is cue #6971
-
-6972
-01:56:12.000 --> 01:56:13.000
-This is cue #6972
-
-6973
-01:56:13.000 --> 01:56:14.000
-This is cue #6973
-
-6974
-01:56:14.000 --> 01:56:15.000
-This is cue #6974
-
-6975
-01:56:15.000 --> 01:56:16.000
-This is cue #6975
-
-6976
-01:56:16.000 --> 01:56:17.000
-This is cue #6976
-
-6977
-01:56:17.000 --> 01:56:18.000
-This is cue #6977
-
-6978
-01:56:18.000 --> 01:56:19.000
-This is cue #6978
-
-6979
-01:56:19.000 --> 01:56:20.000
-This is cue #6979
-
-6980
-01:56:20.000 --> 01:56:21.000
-This is cue #6980
-
-6981
-01:56:21.000 --> 01:56:22.000
-This is cue #6981
-
-6982
-01:56:22.000 --> 01:56:23.000
-This is cue #6982
-
-6983
-01:56:23.000 --> 01:56:24.000
-This is cue #6983
-
-6984
-01:56:24.000 --> 01:56:25.000
-This is cue #6984
-
-6985
-01:56:25.000 --> 01:56:26.000
-This is cue #6985
-
-6986
-01:56:26.000 --> 01:56:27.000
-This is cue #6986
-
-6987
-01:56:27.000 --> 01:56:28.000
-This is cue #6987
-
-6988
-01:56:28.000 --> 01:56:29.000
-This is cue #6988
-
-6989
-01:56:29.000 --> 01:56:30.000
-This is cue #6989
-
-6990
-01:56:30.000 --> 01:56:31.000
-This is cue #6990
-
-6991
-01:56:31.000 --> 01:56:32.000
-This is cue #6991
-
-6992
-01:56:32.000 --> 01:56:33.000
-This is cue #6992
-
-6993
-01:56:33.000 --> 01:56:34.000
-This is cue #6993
-
-6994
-01:56:34.000 --> 01:56:35.000
-This is cue #6994
-
-6995
-01:56:35.000 --> 01:56:36.000
-This is cue #6995
-
-6996
-01:56:36.000 --> 01:56:37.000
-This is cue #6996
-
-6997
-01:56:37.000 --> 01:56:38.000
-This is cue #6997
-
-6998
-01:56:38.000 --> 01:56:39.000
-This is cue #6998
-
-6999
-01:56:39.000 --> 01:56:40.000
-This is cue #6999
-
-7000
-01:56:40.000 --> 01:56:41.000
-This is cue #7000
-
-7001
-01:56:41.000 --> 01:56:42.000
-This is cue #7001
-
-7002
-01:56:42.000 --> 01:56:43.000
-This is cue #7002
-
-7003
-01:56:43.000 --> 01:56:44.000
-This is cue #7003
-
-7004
-01:56:44.000 --> 01:56:45.000
-This is cue #7004
-
-7005
-01:56:45.000 --> 01:56:46.000
-This is cue #7005
-
-7006
-01:56:46.000 --> 01:56:47.000
-This is cue #7006
-
-7007
-01:56:47.000 --> 01:56:48.000
-This is cue #7007
-
-7008
-01:56:48.000 --> 01:56:49.000
-This is cue #7008
-
-7009
-01:56:49.000 --> 01:56:50.000
-This is cue #7009
-
-7010
-01:56:50.000 --> 01:56:51.000
-This is cue #7010
-
-7011
-01:56:51.000 --> 01:56:52.000
-This is cue #7011
-
-7012
-01:56:52.000 --> 01:56:53.000
-This is cue #7012
-
-7013
-01:56:53.000 --> 01:56:54.000
-This is cue #7013
-
-7014
-01:56:54.000 --> 01:56:55.000
-This is cue #7014
-
-7015
-01:56:55.000 --> 01:56:56.000
-This is cue #7015
-
-7016
-01:56:56.000 --> 01:56:57.000
-This is cue #7016
-
-7017
-01:56:57.000 --> 01:56:58.000
-This is cue #7017
-
-7018
-01:56:58.000 --> 01:56:59.000
-This is cue #7018
-
-7019
-01:56:59.000 --> 01:57:00.000
-This is cue #7019
-
-7020
-01:57:00.000 --> 01:57:01.000
-This is cue #7020
-
-7021
-01:57:01.000 --> 01:57:02.000
-This is cue #7021
-
-7022
-01:57:02.000 --> 01:57:03.000
-This is cue #7022
-
-7023
-01:57:03.000 --> 01:57:04.000
-This is cue #7023
-
-7024
-01:57:04.000 --> 01:57:05.000
-This is cue #7024
-
-7025
-01:57:05.000 --> 01:57:06.000
-This is cue #7025
-
-7026
-01:57:06.000 --> 01:57:07.000
-This is cue #7026
-
-7027
-01:57:07.000 --> 01:57:08.000
-This is cue #7027
-
-7028
-01:57:08.000 --> 01:57:09.000
-This is cue #7028
-
-7029
-01:57:09.000 --> 01:57:10.000
-This is cue #7029
-
-7030
-01:57:10.000 --> 01:57:11.000
-This is cue #7030
-
-7031
-01:57:11.000 --> 01:57:12.000
-This is cue #7031
-
-7032
-01:57:12.000 --> 01:57:13.000
-This is cue #7032
-
-7033
-01:57:13.000 --> 01:57:14.000
-This is cue #7033
-
-7034
-01:57:14.000 --> 01:57:15.000
-This is cue #7034
-
-7035
-01:57:15.000 --> 01:57:16.000
-This is cue #7035
-
-7036
-01:57:16.000 --> 01:57:17.000
-This is cue #7036
-
-7037
-01:57:17.000 --> 01:57:18.000
-This is cue #7037
-
-7038
-01:57:18.000 --> 01:57:19.000
-This is cue #7038
-
-7039
-01:57:19.000 --> 01:57:20.000
-This is cue #7039
-
-7040
-01:57:20.000 --> 01:57:21.000
-This is cue #7040
-
-7041
-01:57:21.000 --> 01:57:22.000
-This is cue #7041
-
-7042
-01:57:22.000 --> 01:57:23.000
-This is cue #7042
-
-7043
-01:57:23.000 --> 01:57:24.000
-This is cue #7043
-
-7044
-01:57:24.000 --> 01:57:25.000
-This is cue #7044
-
-7045
-01:57:25.000 --> 01:57:26.000
-This is cue #7045
-
-7046
-01:57:26.000 --> 01:57:27.000
-This is cue #7046
-
-7047
-01:57:27.000 --> 01:57:28.000
-This is cue #7047
-
-7048
-01:57:28.000 --> 01:57:29.000
-This is cue #7048
-
-7049
-01:57:29.000 --> 01:57:30.000
-This is cue #7049
-
-7050
-01:57:30.000 --> 01:57:31.000
-This is cue #7050
-
-7051
-01:57:31.000 --> 01:57:32.000
-This is cue #7051
-
-7052
-01:57:32.000 --> 01:57:33.000
-This is cue #7052
-
-7053
-01:57:33.000 --> 01:57:34.000
-This is cue #7053
-
-7054
-01:57:34.000 --> 01:57:35.000
-This is cue #7054
-
-7055
-01:57:35.000 --> 01:57:36.000
-This is cue #7055
-
-7056
-01:57:36.000 --> 01:57:37.000
-This is cue #7056
-
-7057
-01:57:37.000 --> 01:57:38.000
-This is cue #7057
-
-7058
-01:57:38.000 --> 01:57:39.000
-This is cue #7058
-
-7059
-01:57:39.000 --> 01:57:40.000
-This is cue #7059
-
-7060
-01:57:40.000 --> 01:57:41.000
-This is cue #7060
-
-7061
-01:57:41.000 --> 01:57:42.000
-This is cue #7061
-
-7062
-01:57:42.000 --> 01:57:43.000
-This is cue #7062
-
-7063
-01:57:43.000 --> 01:57:44.000
-This is cue #7063
-
-7064
-01:57:44.000 --> 01:57:45.000
-This is cue #7064
-
-7065
-01:57:45.000 --> 01:57:46.000
-This is cue #7065
-
-7066
-01:57:46.000 --> 01:57:47.000
-This is cue #7066
-
-7067
-01:57:47.000 --> 01:57:48.000
-This is cue #7067
-
-7068
-01:57:48.000 --> 01:57:49.000
-This is cue #7068
-
-7069
-01:57:49.000 --> 01:57:50.000
-This is cue #7069
-
-7070
-01:57:50.000 --> 01:57:51.000
-This is cue #7070
-
-7071
-01:57:51.000 --> 01:57:52.000
-This is cue #7071
-
-7072
-01:57:52.000 --> 01:57:53.000
-This is cue #7072
-
-7073
-01:57:53.000 --> 01:57:54.000
-This is cue #7073
-
-7074
-01:57:54.000 --> 01:57:55.000
-This is cue #7074
-
-7075
-01:57:55.000 --> 01:57:56.000
-This is cue #7075
-
-7076
-01:57:56.000 --> 01:57:57.000
-This is cue #7076
-
-7077
-01:57:57.000 --> 01:57:58.000
-This is cue #7077
-
-7078
-01:57:58.000 --> 01:57:59.000
-This is cue #7078
-
-7079
-01:57:59.000 --> 01:58:00.000
-This is cue #7079
-
-7080
-01:58:00.000 --> 01:58:01.000
-This is cue #7080
-
-7081
-01:58:01.000 --> 01:58:02.000
-This is cue #7081
-
-7082
-01:58:02.000 --> 01:58:03.000
-This is cue #7082
-
-7083
-01:58:03.000 --> 01:58:04.000
-This is cue #7083
-
-7084
-01:58:04.000 --> 01:58:05.000
-This is cue #7084
-
-7085
-01:58:05.000 --> 01:58:06.000
-This is cue #7085
-
-7086
-01:58:06.000 --> 01:58:07.000
-This is cue #7086
-
-7087
-01:58:07.000 --> 01:58:08.000
-This is cue #7087
-
-7088
-01:58:08.000 --> 01:58:09.000
-This is cue #7088
-
-7089
-01:58:09.000 --> 01:58:10.000
-This is cue #7089
-
-7090
-01:58:10.000 --> 01:58:11.000
-This is cue #7090
-
-7091
-01:58:11.000 --> 01:58:12.000
-This is cue #7091
-
-7092
-01:58:12.000 --> 01:58:13.000
-This is cue #7092
-
-7093
-01:58:13.000 --> 01:58:14.000
-This is cue #7093
-
-7094
-01:58:14.000 --> 01:58:15.000
-This is cue #7094
-
-7095
-01:58:15.000 --> 01:58:16.000
-This is cue #7095
-
-7096
-01:58:16.000 --> 01:58:17.000
-This is cue #7096
-
-7097
-01:58:17.000 --> 01:58:18.000
-This is cue #7097
-
-7098
-01:58:18.000 --> 01:58:19.000
-This is cue #7098
-
-7099
-01:58:19.000 --> 01:58:20.000
-This is cue #7099
-
-7100
-01:58:20.000 --> 01:58:21.000
-This is cue #7100
-
-7101
-01:58:21.000 --> 01:58:22.000
-This is cue #7101
-
-7102
-01:58:22.000 --> 01:58:23.000
-This is cue #7102
-
-7103
-01:58:23.000 --> 01:58:24.000
-This is cue #7103
-
-7104
-01:58:24.000 --> 01:58:25.000
-This is cue #7104
-
-7105
-01:58:25.000 --> 01:58:26.000
-This is cue #7105
-
-7106
-01:58:26.000 --> 01:58:27.000
-This is cue #7106
-
-7107
-01:58:27.000 --> 01:58:28.000
-This is cue #7107
-
-7108
-01:58:28.000 --> 01:58:29.000
-This is cue #7108
-
-7109
-01:58:29.000 --> 01:58:30.000
-This is cue #7109
-
-7110
-01:58:30.000 --> 01:58:31.000
-This is cue #7110
-
-7111
-01:58:31.000 --> 01:58:32.000
-This is cue #7111
-
-7112
-01:58:32.000 --> 01:58:33.000
-This is cue #7112
-
-7113
-01:58:33.000 --> 01:58:34.000
-This is cue #7113
-
-7114
-01:58:34.000 --> 01:58:35.000
-This is cue #7114
-
-7115
-01:58:35.000 --> 01:58:36.000
-This is cue #7115
-
-7116
-01:58:36.000 --> 01:58:37.000
-This is cue #7116
-
-7117
-01:58:37.000 --> 01:58:38.000
-This is cue #7117
-
-7118
-01:58:38.000 --> 01:58:39.000
-This is cue #7118
-
-7119
-01:58:39.000 --> 01:58:40.000
-This is cue #7119
-
-7120
-01:58:40.000 --> 01:58:41.000
-This is cue #7120
-
-7121
-01:58:41.000 --> 01:58:42.000
-This is cue #7121
-
-7122
-01:58:42.000 --> 01:58:43.000
-This is cue #7122
-
-7123
-01:58:43.000 --> 01:58:44.000
-This is cue #7123
-
-7124
-01:58:44.000 --> 01:58:45.000
-This is cue #7124
-
-7125
-01:58:45.000 --> 01:58:46.000
-This is cue #7125
-
-7126
-01:58:46.000 --> 01:58:47.000
-This is cue #7126
-
-7127
-01:58:47.000 --> 01:58:48.000
-This is cue #7127
-
-7128
-01:58:48.000 --> 01:58:49.000
-This is cue #7128
-
-7129
-01:58:49.000 --> 01:58:50.000
-This is cue #7129
-
-7130
-01:58:50.000 --> 01:58:51.000
-This is cue #7130
-
-7131
-01:58:51.000 --> 01:58:52.000
-This is cue #7131
-
-7132
-01:58:52.000 --> 01:58:53.000
-This is cue #7132
-
-7133
-01:58:53.000 --> 01:58:54.000
-This is cue #7133
-
-7134
-01:58:54.000 --> 01:58:55.000
-This is cue #7134
-
-7135
-01:58:55.000 --> 01:58:56.000
-This is cue #7135
-
-7136
-01:58:56.000 --> 01:58:57.000
-This is cue #7136
-
-7137
-01:58:57.000 --> 01:58:58.000
-This is cue #7137
-
-7138
-01:58:58.000 --> 01:58:59.000
-This is cue #7138
-
-7139
-01:58:59.000 --> 01:59:00.000
-This is cue #7139
-
-7140
-01:59:00.000 --> 01:59:01.000
-This is cue #7140
-
-7141
-01:59:01.000 --> 01:59:02.000
-This is cue #7141
-
-7142
-01:59:02.000 --> 01:59:03.000
-This is cue #7142
-
-7143
-01:59:03.000 --> 01:59:04.000
-This is cue #7143
-
-7144
-01:59:04.000 --> 01:59:05.000
-This is cue #7144
-
-7145
-01:59:05.000 --> 01:59:06.000
-This is cue #7145
-
-7146
-01:59:06.000 --> 01:59:07.000
-This is cue #7146
-
-7147
-01:59:07.000 --> 01:59:08.000
-This is cue #7147
-
-7148
-01:59:08.000 --> 01:59:09.000
-This is cue #7148
-
-7149
-01:59:09.000 --> 01:59:10.000
-This is cue #7149
-
-7150
-01:59:10.000 --> 01:59:11.000
-This is cue #7150
-
-7151
-01:59:11.000 --> 01:59:12.000
-This is cue #7151
-
-7152
-01:59:12.000 --> 01:59:13.000
-This is cue #7152
-
-7153
-01:59:13.000 --> 01:59:14.000
-This is cue #7153
-
-7154
-01:59:14.000 --> 01:59:15.000
-This is cue #7154
-
-7155
-01:59:15.000 --> 01:59:16.000
-This is cue #7155
-
-7156
-01:59:16.000 --> 01:59:17.000
-This is cue #7156
-
-7157
-01:59:17.000 --> 01:59:18.000
-This is cue #7157
-
-7158
-01:59:18.000 --> 01:59:19.000
-This is cue #7158
-
-7159
-01:59:19.000 --> 01:59:20.000
-This is cue #7159
-
-7160
-01:59:20.000 --> 01:59:21.000
-This is cue #7160
-
-7161
-01:59:21.000 --> 01:59:22.000
-This is cue #7161
-
-7162
-01:59:22.000 --> 01:59:23.000
-This is cue #7162
-
-7163
-01:59:23.000 --> 01:59:24.000
-This is cue #7163
-
-7164
-01:59:24.000 --> 01:59:25.000
-This is cue #7164
-
-7165
-01:59:25.000 --> 01:59:26.000
-This is cue #7165
-
-7166
-01:59:26.000 --> 01:59:27.000
-This is cue #7166
-
-7167
-01:59:27.000 --> 01:59:28.000
-This is cue #7167
-
-7168
-01:59:28.000 --> 01:59:29.000
-This is cue #7168
-
-7169
-01:59:29.000 --> 01:59:30.000
-This is cue #7169
-
-7170
-01:59:30.000 --> 01:59:31.000
-This is cue #7170
-
-7171
-01:59:31.000 --> 01:59:32.000
-This is cue #7171
-
-7172
-01:59:32.000 --> 01:59:33.000
-This is cue #7172
-
-7173
-01:59:33.000 --> 01:59:34.000
-This is cue #7173
-
-7174
-01:59:34.000 --> 01:59:35.000
-This is cue #7174
-
-7175
-01:59:35.000 --> 01:59:36.000
-This is cue #7175
-
-7176
-01:59:36.000 --> 01:59:37.000
-This is cue #7176
-
-7177
-01:59:37.000 --> 01:59:38.000
-This is cue #7177
-
-7178
-01:59:38.000 --> 01:59:39.000
-This is cue #7178
-
-7179
-01:59:39.000 --> 01:59:40.000
-This is cue #7179
-
-7180
-01:59:40.000 --> 01:59:41.000
-This is cue #7180
-
-7181
-01:59:41.000 --> 01:59:42.000
-This is cue #7181
-
-7182
-01:59:42.000 --> 01:59:43.000
-This is cue #7182
-
-7183
-01:59:43.000 --> 01:59:44.000
-This is cue #7183
-
-7184
-01:59:44.000 --> 01:59:45.000
-This is cue #7184
-
-7185
-01:59:45.000 --> 01:59:46.000
-This is cue #7185
-
-7186
-01:59:46.000 --> 01:59:47.000
-This is cue #7186
-
-7187
-01:59:47.000 --> 01:59:48.000
-This is cue #7187
-
-7188
-01:59:48.000 --> 01:59:49.000
-This is cue #7188
-
-7189
-01:59:49.000 --> 01:59:50.000
-This is cue #7189
-
-7190
-01:59:50.000 --> 01:59:51.000
-This is cue #7190
-
-7191
-01:59:51.000 --> 01:59:52.000
-This is cue #7191
-
-7192
-01:59:52.000 --> 01:59:53.000
-This is cue #7192
-
-7193
-01:59:53.000 --> 01:59:54.000
-This is cue #7193
-
-7194
-01:59:54.000 --> 01:59:55.000
-This is cue #7194
-
-7195
-01:59:55.000 --> 01:59:56.000
-This is cue #7195
-
-7196
-01:59:56.000 --> 01:59:57.000
-This is cue #7196
-
-7197
-01:59:57.000 --> 01:59:58.000
-This is cue #7197
-
-7198
-01:59:58.000 --> 01:59:59.000
-This is cue #7198
-
-7199
-01:59:59.000 --> 02:00:00.000
-This is cue #7199
-
-7200
-02:00:00.000 --> 02:00:01.000
-This is cue #7200
-
-7201
-02:00:01.000 --> 02:00:02.000
-This is cue #7201
-
-7202
-02:00:02.000 --> 02:00:03.000
-This is cue #7202
-
-7203
-02:00:03.000 --> 02:00:04.000
-This is cue #7203
-
-7204
-02:00:04.000 --> 02:00:05.000
-This is cue #7204
-
-7205
-02:00:05.000 --> 02:00:06.000
-This is cue #7205
-
-7206
-02:00:06.000 --> 02:00:07.000
-This is cue #7206
-
-7207
-02:00:07.000 --> 02:00:08.000
-This is cue #7207
-
-7208
-02:00:08.000 --> 02:00:09.000
-This is cue #7208
-
-7209
-02:00:09.000 --> 02:00:10.000
-This is cue #7209
-
-7210
-02:00:10.000 --> 02:00:11.000
-This is cue #7210
-
-7211
-02:00:11.000 --> 02:00:12.000
-This is cue #7211
-
-7212
-02:00:12.000 --> 02:00:13.000
-This is cue #7212
-
-7213
-02:00:13.000 --> 02:00:14.000
-This is cue #7213
-
-7214
-02:00:14.000 --> 02:00:15.000
-This is cue #7214
-
-7215
-02:00:15.000 --> 02:00:16.000
-This is cue #7215
-
-7216
-02:00:16.000 --> 02:00:17.000
-This is cue #7216
-
-7217
-02:00:17.000 --> 02:00:18.000
-This is cue #7217
-
-7218
-02:00:18.000 --> 02:00:19.000
-This is cue #7218
-
-7219
-02:00:19.000 --> 02:00:20.000
-This is cue #7219
-
-7220
-02:00:20.000 --> 02:00:21.000
-This is cue #7220
-
-7221
-02:00:21.000 --> 02:00:22.000
-This is cue #7221
-
-7222
-02:00:22.000 --> 02:00:23.000
-This is cue #7222
-
-7223
-02:00:23.000 --> 02:00:24.000
-This is cue #7223
-
-7224
-02:00:24.000 --> 02:00:25.000
-This is cue #7224
-
-7225
-02:00:25.000 --> 02:00:26.000
-This is cue #7225
-
-7226
-02:00:26.000 --> 02:00:27.000
-This is cue #7226
-
-7227
-02:00:27.000 --> 02:00:28.000
-This is cue #7227
-
-7228
-02:00:28.000 --> 02:00:29.000
-This is cue #7228
-
-7229
-02:00:29.000 --> 02:00:30.000
-This is cue #7229
-
-7230
-02:00:30.000 --> 02:00:31.000
-This is cue #7230
-
-7231
-02:00:31.000 --> 02:00:32.000
-This is cue #7231
-
-7232
-02:00:32.000 --> 02:00:33.000
-This is cue #7232
-
-7233
-02:00:33.000 --> 02:00:34.000
-This is cue #7233
-
-7234
-02:00:34.000 --> 02:00:35.000
-This is cue #7234
-
-7235
-02:00:35.000 --> 02:00:36.000
-This is cue #7235
-
-7236
-02:00:36.000 --> 02:00:37.000
-This is cue #7236
-
-7237
-02:00:37.000 --> 02:00:38.000
-This is cue #7237
-
-7238
-02:00:38.000 --> 02:00:39.000
-This is cue #7238
-
-7239
-02:00:39.000 --> 02:00:40.000
-This is cue #7239
-
-7240
-02:00:40.000 --> 02:00:41.000
-This is cue #7240
-
-7241
-02:00:41.000 --> 02:00:42.000
-This is cue #7241
-
-7242
-02:00:42.000 --> 02:00:43.000
-This is cue #7242
-
-7243
-02:00:43.000 --> 02:00:44.000
-This is cue #7243
-
-7244
-02:00:44.000 --> 02:00:45.000
-This is cue #7244
-
-7245
-02:00:45.000 --> 02:00:46.000
-This is cue #7245
-
-7246
-02:00:46.000 --> 02:00:47.000
-This is cue #7246
-
-7247
-02:00:47.000 --> 02:00:48.000
-This is cue #7247
-
-7248
-02:00:48.000 --> 02:00:49.000
-This is cue #7248
-
-7249
-02:00:49.000 --> 02:00:50.000
-This is cue #7249
-
-7250
-02:00:50.000 --> 02:00:51.000
-This is cue #7250
-
-7251
-02:00:51.000 --> 02:00:52.000
-This is cue #7251
-
-7252
-02:00:52.000 --> 02:00:53.000
-This is cue #7252
-
-7253
-02:00:53.000 --> 02:00:54.000
-This is cue #7253
-
-7254
-02:00:54.000 --> 02:00:55.000
-This is cue #7254
-
-7255
-02:00:55.000 --> 02:00:56.000
-This is cue #7255
-
-7256
-02:00:56.000 --> 02:00:57.000
-This is cue #7256
-
-7257
-02:00:57.000 --> 02:00:58.000
-This is cue #7257
-
-7258
-02:00:58.000 --> 02:00:59.000
-This is cue #7258
-
-7259
-02:00:59.000 --> 02:01:00.000
-This is cue #7259
-
-7260
-02:01:00.000 --> 02:01:01.000
-This is cue #7260
-
-7261
-02:01:01.000 --> 02:01:02.000
-This is cue #7261
-
-7262
-02:01:02.000 --> 02:01:03.000
-This is cue #7262
-
-7263
-02:01:03.000 --> 02:01:04.000
-This is cue #7263
-
-7264
-02:01:04.000 --> 02:01:05.000
-This is cue #7264
-
-7265
-02:01:05.000 --> 02:01:06.000
-This is cue #7265
-
-7266
-02:01:06.000 --> 02:01:07.000
-This is cue #7266
-
-7267
-02:01:07.000 --> 02:01:08.000
-This is cue #7267
-
-7268
-02:01:08.000 --> 02:01:09.000
-This is cue #7268
-
-7269
-02:01:09.000 --> 02:01:10.000
-This is cue #7269
-
-7270
-02:01:10.000 --> 02:01:11.000
-This is cue #7270
-
-7271
-02:01:11.000 --> 02:01:12.000
-This is cue #7271
-
-7272
-02:01:12.000 --> 02:01:13.000
-This is cue #7272
-
-7273
-02:01:13.000 --> 02:01:14.000
-This is cue #7273
-
-7274
-02:01:14.000 --> 02:01:15.000
-This is cue #7274
-
-7275
-02:01:15.000 --> 02:01:16.000
-This is cue #7275
-
-7276
-02:01:16.000 --> 02:01:17.000
-This is cue #7276
-
-7277
-02:01:17.000 --> 02:01:18.000
-This is cue #7277
-
-7278
-02:01:18.000 --> 02:01:19.000
-This is cue #7278
-
-7279
-02:01:19.000 --> 02:01:20.000
-This is cue #7279
-
-7280
-02:01:20.000 --> 02:01:21.000
-This is cue #7280
-
-7281
-02:01:21.000 --> 02:01:22.000
-This is cue #7281
-
-7282
-02:01:22.000 --> 02:01:23.000
-This is cue #7282
-
-7283
-02:01:23.000 --> 02:01:24.000
-This is cue #7283
-
-7284
-02:01:24.000 --> 02:01:25.000
-This is cue #7284
-
-7285
-02:01:25.000 --> 02:01:26.000
-This is cue #7285
-
-7286
-02:01:26.000 --> 02:01:27.000
-This is cue #7286
-
-7287
-02:01:27.000 --> 02:01:28.000
-This is cue #7287
-
-7288
-02:01:28.000 --> 02:01:29.000
-This is cue #7288
-
-7289
-02:01:29.000 --> 02:01:30.000
-This is cue #7289
-
-7290
-02:01:30.000 --> 02:01:31.000
-This is cue #7290
-
-7291
-02:01:31.000 --> 02:01:32.000
-This is cue #7291
-
-7292
-02:01:32.000 --> 02:01:33.000
-This is cue #7292
-
-7293
-02:01:33.000 --> 02:01:34.000
-This is cue #7293
-
-7294
-02:01:34.000 --> 02:01:35.000
-This is cue #7294
-
-7295
-02:01:35.000 --> 02:01:36.000
-This is cue #7295
-
-7296
-02:01:36.000 --> 02:01:37.000
-This is cue #7296
-
-7297
-02:01:37.000 --> 02:01:38.000
-This is cue #7297
-
-7298
-02:01:38.000 --> 02:01:39.000
-This is cue #7298
-
-7299
-02:01:39.000 --> 02:01:40.000
-This is cue #7299
-
-7300
-02:01:40.000 --> 02:01:41.000
-This is cue #7300
-
-7301
-02:01:41.000 --> 02:01:42.000
-This is cue #7301
-
-7302
-02:01:42.000 --> 02:01:43.000
-This is cue #7302
-
-7303
-02:01:43.000 --> 02:01:44.000
-This is cue #7303
-
-7304
-02:01:44.000 --> 02:01:45.000
-This is cue #7304
-
-7305
-02:01:45.000 --> 02:01:46.000
-This is cue #7305
-
-7306
-02:01:46.000 --> 02:01:47.000
-This is cue #7306
-
-7307
-02:01:47.000 --> 02:01:48.000
-This is cue #7307
-
-7308
-02:01:48.000 --> 02:01:49.000
-This is cue #7308
-
-7309
-02:01:49.000 --> 02:01:50.000
-This is cue #7309
-
-7310
-02:01:50.000 --> 02:01:51.000
-This is cue #7310
-
-7311
-02:01:51.000 --> 02:01:52.000
-This is cue #7311
-
-7312
-02:01:52.000 --> 02:01:53.000
-This is cue #7312
-
-7313
-02:01:53.000 --> 02:01:54.000
-This is cue #7313
-
-7314
-02:01:54.000 --> 02:01:55.000
-This is cue #7314
-
-7315
-02:01:55.000 --> 02:01:56.000
-This is cue #7315
-
-7316
-02:01:56.000 --> 02:01:57.000
-This is cue #7316
-
-7317
-02:01:57.000 --> 02:01:58.000
-This is cue #7317
-
-7318
-02:01:58.000 --> 02:01:59.000
-This is cue #7318
-
-7319
-02:01:59.000 --> 02:02:00.000
-This is cue #7319
-
-7320
-02:02:00.000 --> 02:02:01.000
-This is cue #7320
-
-7321
-02:02:01.000 --> 02:02:02.000
-This is cue #7321
-
-7322
-02:02:02.000 --> 02:02:03.000
-This is cue #7322
-
-7323
-02:02:03.000 --> 02:02:04.000
-This is cue #7323
-
-7324
-02:02:04.000 --> 02:02:05.000
-This is cue #7324
-
-7325
-02:02:05.000 --> 02:02:06.000
-This is cue #7325
-
-7326
-02:02:06.000 --> 02:02:07.000
-This is cue #7326
-
-7327
-02:02:07.000 --> 02:02:08.000
-This is cue #7327
-
-7328
-02:02:08.000 --> 02:02:09.000
-This is cue #7328
-
-7329
-02:02:09.000 --> 02:02:10.000
-This is cue #7329
-
-7330
-02:02:10.000 --> 02:02:11.000
-This is cue #7330
-
-7331
-02:02:11.000 --> 02:02:12.000
-This is cue #7331
-
-7332
-02:02:12.000 --> 02:02:13.000
-This is cue #7332
-
-7333
-02:02:13.000 --> 02:02:14.000
-This is cue #7333
-
-7334
-02:02:14.000 --> 02:02:15.000
-This is cue #7334
-
-7335
-02:02:15.000 --> 02:02:16.000
-This is cue #7335
-
-7336
-02:02:16.000 --> 02:02:17.000
-This is cue #7336
-
-7337
-02:02:17.000 --> 02:02:18.000
-This is cue #7337
-
-7338
-02:02:18.000 --> 02:02:19.000
-This is cue #7338
-
-7339
-02:02:19.000 --> 02:02:20.000
-This is cue #7339
-
-7340
-02:02:20.000 --> 02:02:21.000
-This is cue #7340
-
-7341
-02:02:21.000 --> 02:02:22.000
-This is cue #7341
-
-7342
-02:02:22.000 --> 02:02:23.000
-This is cue #7342
-
-7343
-02:02:23.000 --> 02:02:24.000
-This is cue #7343
-
-7344
-02:02:24.000 --> 02:02:25.000
-This is cue #7344
-
-7345
-02:02:25.000 --> 02:02:26.000
-This is cue #7345
-
-7346
-02:02:26.000 --> 02:02:27.000
-This is cue #7346
-
-7347
-02:02:27.000 --> 02:02:28.000
-This is cue #7347
-
-7348
-02:02:28.000 --> 02:02:29.000
-This is cue #7348
-
-7349
-02:02:29.000 --> 02:02:30.000
-This is cue #7349
-
-7350
-02:02:30.000 --> 02:02:31.000
-This is cue #7350
-
-7351
-02:02:31.000 --> 02:02:32.000
-This is cue #7351
-
-7352
-02:02:32.000 --> 02:02:33.000
-This is cue #7352
-
-7353
-02:02:33.000 --> 02:02:34.000
-This is cue #7353
-
-7354
-02:02:34.000 --> 02:02:35.000
-This is cue #7354
-
-7355
-02:02:35.000 --> 02:02:36.000
-This is cue #7355
-
-7356
-02:02:36.000 --> 02:02:37.000
-This is cue #7356
-
-7357
-02:02:37.000 --> 02:02:38.000
-This is cue #7357
-
-7358
-02:02:38.000 --> 02:02:39.000
-This is cue #7358
-
-7359
-02:02:39.000 --> 02:02:40.000
-This is cue #7359
-
-7360
-02:02:40.000 --> 02:02:41.000
-This is cue #7360
-
-7361
-02:02:41.000 --> 02:02:42.000
-This is cue #7361
-
-7362
-02:02:42.000 --> 02:02:43.000
-This is cue #7362
-
-7363
-02:02:43.000 --> 02:02:44.000
-This is cue #7363
-
-7364
-02:02:44.000 --> 02:02:45.000
-This is cue #7364
-
-7365
-02:02:45.000 --> 02:02:46.000
-This is cue #7365
-
-7366
-02:02:46.000 --> 02:02:47.000
-This is cue #7366
-
-7367
-02:02:47.000 --> 02:02:48.000
-This is cue #7367
-
-7368
-02:02:48.000 --> 02:02:49.000
-This is cue #7368
-
-7369
-02:02:49.000 --> 02:02:50.000
-This is cue #7369
-
-7370
-02:02:50.000 --> 02:02:51.000
-This is cue #7370
-
-7371
-02:02:51.000 --> 02:02:52.000
-This is cue #7371
-
-7372
-02:02:52.000 --> 02:02:53.000
-This is cue #7372
-
-7373
-02:02:53.000 --> 02:02:54.000
-This is cue #7373
-
-7374
-02:02:54.000 --> 02:02:55.000
-This is cue #7374
-
-7375
-02:02:55.000 --> 02:02:56.000
-This is cue #7375
-
-7376
-02:02:56.000 --> 02:02:57.000
-This is cue #7376
-
-7377
-02:02:57.000 --> 02:02:58.000
-This is cue #7377
-
-7378
-02:02:58.000 --> 02:02:59.000
-This is cue #7378
-
-7379
-02:02:59.000 --> 02:03:00.000
-This is cue #7379
-
-7380
-02:03:00.000 --> 02:03:01.000
-This is cue #7380
-
-7381
-02:03:01.000 --> 02:03:02.000
-This is cue #7381
-
-7382
-02:03:02.000 --> 02:03:03.000
-This is cue #7382
-
-7383
-02:03:03.000 --> 02:03:04.000
-This is cue #7383
-
-7384
-02:03:04.000 --> 02:03:05.000
-This is cue #7384
-
-7385
-02:03:05.000 --> 02:03:06.000
-This is cue #7385
-
-7386
-02:03:06.000 --> 02:03:07.000
-This is cue #7386
-
-7387
-02:03:07.000 --> 02:03:08.000
-This is cue #7387
-
-7388
-02:03:08.000 --> 02:03:09.000
-This is cue #7388
-
-7389
-02:03:09.000 --> 02:03:10.000
-This is cue #7389
-
-7390
-02:03:10.000 --> 02:03:11.000
-This is cue #7390
-
-7391
-02:03:11.000 --> 02:03:12.000
-This is cue #7391
-
-7392
-02:03:12.000 --> 02:03:13.000
-This is cue #7392
-
-7393
-02:03:13.000 --> 02:03:14.000
-This is cue #7393
-
-7394
-02:03:14.000 --> 02:03:15.000
-This is cue #7394
-
-7395
-02:03:15.000 --> 02:03:16.000
-This is cue #7395
-
-7396
-02:03:16.000 --> 02:03:17.000
-This is cue #7396
-
-7397
-02:03:17.000 --> 02:03:18.000
-This is cue #7397
-
-7398
-02:03:18.000 --> 02:03:19.000
-This is cue #7398
-
-7399
-02:03:19.000 --> 02:03:20.000
-This is cue #7399
-
-7400
-02:03:20.000 --> 02:03:21.000
-This is cue #7400
-
-7401
-02:03:21.000 --> 02:03:22.000
-This is cue #7401
-
-7402
-02:03:22.000 --> 02:03:23.000
-This is cue #7402
-
-7403
-02:03:23.000 --> 02:03:24.000
-This is cue #7403
-
-7404
-02:03:24.000 --> 02:03:25.000
-This is cue #7404
-
-7405
-02:03:25.000 --> 02:03:26.000
-This is cue #7405
-
-7406
-02:03:26.000 --> 02:03:27.000
-This is cue #7406
-
-7407
-02:03:27.000 --> 02:03:28.000
-This is cue #7407
-
-7408
-02:03:28.000 --> 02:03:29.000
-This is cue #7408
-
-7409
-02:03:29.000 --> 02:03:30.000
-This is cue #7409
-
-7410
-02:03:30.000 --> 02:03:31.000
-This is cue #7410
-
-7411
-02:03:31.000 --> 02:03:32.000
-This is cue #7411
-
-7412
-02:03:32.000 --> 02:03:33.000
-This is cue #7412
-
-7413
-02:03:33.000 --> 02:03:34.000
-This is cue #7413
-
-7414
-02:03:34.000 --> 02:03:35.000
-This is cue #7414
-
-7415
-02:03:35.000 --> 02:03:36.000
-This is cue #7415
-
-7416
-02:03:36.000 --> 02:03:37.000
-This is cue #7416
-
-7417
-02:03:37.000 --> 02:03:38.000
-This is cue #7417
-
-7418
-02:03:38.000 --> 02:03:39.000
-This is cue #7418
-
-7419
-02:03:39.000 --> 02:03:40.000
-This is cue #7419
-
-7420
-02:03:40.000 --> 02:03:41.000
-This is cue #7420
-
-7421
-02:03:41.000 --> 02:03:42.000
-This is cue #7421
-
-7422
-02:03:42.000 --> 02:03:43.000
-This is cue #7422
-
-7423
-02:03:43.000 --> 02:03:44.000
-This is cue #7423
-
-7424
-02:03:44.000 --> 02:03:45.000
-This is cue #7424
-
-7425
-02:03:45.000 --> 02:03:46.000
-This is cue #7425
-
-7426
-02:03:46.000 --> 02:03:47.000
-This is cue #7426
-
-7427
-02:03:47.000 --> 02:03:48.000
-This is cue #7427
-
-7428
-02:03:48.000 --> 02:03:49.000
-This is cue #7428
-
-7429
-02:03:49.000 --> 02:03:50.000
-This is cue #7429
-
-7430
-02:03:50.000 --> 02:03:51.000
-This is cue #7430
-
-7431
-02:03:51.000 --> 02:03:52.000
-This is cue #7431
-
-7432
-02:03:52.000 --> 02:03:53.000
-This is cue #7432
-
-7433
-02:03:53.000 --> 02:03:54.000
-This is cue #7433
-
-7434
-02:03:54.000 --> 02:03:55.000
-This is cue #7434
-
-7435
-02:03:55.000 --> 02:03:56.000
-This is cue #7435
-
-7436
-02:03:56.000 --> 02:03:57.000
-This is cue #7436
-
-7437
-02:03:57.000 --> 02:03:58.000
-This is cue #7437
-
-7438
-02:03:58.000 --> 02:03:59.000
-This is cue #7438
-
-7439
-02:03:59.000 --> 02:04:00.000
-This is cue #7439
-
-7440
-02:04:00.000 --> 02:04:01.000
-This is cue #7440
-
-7441
-02:04:01.000 --> 02:04:02.000
-This is cue #7441
-
-7442
-02:04:02.000 --> 02:04:03.000
-This is cue #7442
-
-7443
-02:04:03.000 --> 02:04:04.000
-This is cue #7443
-
-7444
-02:04:04.000 --> 02:04:05.000
-This is cue #7444
-
-7445
-02:04:05.000 --> 02:04:06.000
-This is cue #7445
-
-7446
-02:04:06.000 --> 02:04:07.000
-This is cue #7446
-
-7447
-02:04:07.000 --> 02:04:08.000
-This is cue #7447
-
-7448
-02:04:08.000 --> 02:04:09.000
-This is cue #7448
-
-7449
-02:04:09.000 --> 02:04:10.000
-This is cue #7449
-
-7450
-02:04:10.000 --> 02:04:11.000
-This is cue #7450
-
-7451
-02:04:11.000 --> 02:04:12.000
-This is cue #7451
-
-7452
-02:04:12.000 --> 02:04:13.000
-This is cue #7452
-
-7453
-02:04:13.000 --> 02:04:14.000
-This is cue #7453
-
-7454
-02:04:14.000 --> 02:04:15.000
-This is cue #7454
-
-7455
-02:04:15.000 --> 02:04:16.000
-This is cue #7455
-
-7456
-02:04:16.000 --> 02:04:17.000
-This is cue #7456
-
-7457
-02:04:17.000 --> 02:04:18.000
-This is cue #7457
-
-7458
-02:04:18.000 --> 02:04:19.000
-This is cue #7458
-
-7459
-02:04:19.000 --> 02:04:20.000
-This is cue #7459
-
-7460
-02:04:20.000 --> 02:04:21.000
-This is cue #7460
-
-7461
-02:04:21.000 --> 02:04:22.000
-This is cue #7461
-
-7462
-02:04:22.000 --> 02:04:23.000
-This is cue #7462
-
-7463
-02:04:23.000 --> 02:04:24.000
-This is cue #7463
-
-7464
-02:04:24.000 --> 02:04:25.000
-This is cue #7464
-
-7465
-02:04:25.000 --> 02:04:26.000
-This is cue #7465
-
-7466
-02:04:26.000 --> 02:04:27.000
-This is cue #7466
-
-7467
-02:04:27.000 --> 02:04:28.000
-This is cue #7467
-
-7468
-02:04:28.000 --> 02:04:29.000
-This is cue #7468
-
-7469
-02:04:29.000 --> 02:04:30.000
-This is cue #7469
-
-7470
-02:04:30.000 --> 02:04:31.000
-This is cue #7470
-
-7471
-02:04:31.000 --> 02:04:32.000
-This is cue #7471
-
-7472
-02:04:32.000 --> 02:04:33.000
-This is cue #7472
-
-7473
-02:04:33.000 --> 02:04:34.000
-This is cue #7473
-
-7474
-02:04:34.000 --> 02:04:35.000
-This is cue #7474
-
-7475
-02:04:35.000 --> 02:04:36.000
-This is cue #7475
-
-7476
-02:04:36.000 --> 02:04:37.000
-This is cue #7476
-
-7477
-02:04:37.000 --> 02:04:38.000
-This is cue #7477
-
-7478
-02:04:38.000 --> 02:04:39.000
-This is cue #7478
-
-7479
-02:04:39.000 --> 02:04:40.000
-This is cue #7479
-
-7480
-02:04:40.000 --> 02:04:41.000
-This is cue #7480
-
-7481
-02:04:41.000 --> 02:04:42.000
-This is cue #7481
-
-7482
-02:04:42.000 --> 02:04:43.000
-This is cue #7482
-
-7483
-02:04:43.000 --> 02:04:44.000
-This is cue #7483
-
-7484
-02:04:44.000 --> 02:04:45.000
-This is cue #7484
-
-7485
-02:04:45.000 --> 02:04:46.000
-This is cue #7485
-
-7486
-02:04:46.000 --> 02:04:47.000
-This is cue #7486
-
-7487
-02:04:47.000 --> 02:04:48.000
-This is cue #7487
-
-7488
-02:04:48.000 --> 02:04:49.000
-This is cue #7488
-
-7489
-02:04:49.000 --> 02:04:50.000
-This is cue #7489
-
-7490
-02:04:50.000 --> 02:04:51.000
-This is cue #7490
-
-7491
-02:04:51.000 --> 02:04:52.000
-This is cue #7491
-
-7492
-02:04:52.000 --> 02:04:53.000
-This is cue #7492
-
-7493
-02:04:53.000 --> 02:04:54.000
-This is cue #7493
-
-7494
-02:04:54.000 --> 02:04:55.000
-This is cue #7494
-
-7495
-02:04:55.000 --> 02:04:56.000
-This is cue #7495
-
-7496
-02:04:56.000 --> 02:04:57.000
-This is cue #7496
-
-7497
-02:04:57.000 --> 02:04:58.000
-This is cue #7497
-
-7498
-02:04:58.000 --> 02:04:59.000
-This is cue #7498
-
-7499
-02:04:59.000 --> 02:05:00.000
-This is cue #7499
-
-7500
-02:05:00.000 --> 02:05:01.000
-This is cue #7500
-
-7501
-02:05:01.000 --> 02:05:02.000
-This is cue #7501
-
-7502
-02:05:02.000 --> 02:05:03.000
-This is cue #7502
-
-7503
-02:05:03.000 --> 02:05:04.000
-This is cue #7503
-
-7504
-02:05:04.000 --> 02:05:05.000
-This is cue #7504
-
-7505
-02:05:05.000 --> 02:05:06.000
-This is cue #7505
-
-7506
-02:05:06.000 --> 02:05:07.000
-This is cue #7506
-
-7507
-02:05:07.000 --> 02:05:08.000
-This is cue #7507
-
-7508
-02:05:08.000 --> 02:05:09.000
-This is cue #7508
-
-7509
-02:05:09.000 --> 02:05:10.000
-This is cue #7509
-
-7510
-02:05:10.000 --> 02:05:11.000
-This is cue #7510
-
-7511
-02:05:11.000 --> 02:05:12.000
-This is cue #7511
-
-7512
-02:05:12.000 --> 02:05:13.000
-This is cue #7512
-
-7513
-02:05:13.000 --> 02:05:14.000
-This is cue #7513
-
-7514
-02:05:14.000 --> 02:05:15.000
-This is cue #7514
-
-7515
-02:05:15.000 --> 02:05:16.000
-This is cue #7515
-
-7516
-02:05:16.000 --> 02:05:17.000
-This is cue #7516
-
-7517
-02:05:17.000 --> 02:05:18.000
-This is cue #7517
-
-7518
-02:05:18.000 --> 02:05:19.000
-This is cue #7518
-
-7519
-02:05:19.000 --> 02:05:20.000
-This is cue #7519
-
-7520
-02:05:20.000 --> 02:05:21.000
-This is cue #7520
-
-7521
-02:05:21.000 --> 02:05:22.000
-This is cue #7521
-
-7522
-02:05:22.000 --> 02:05:23.000
-This is cue #7522
-
-7523
-02:05:23.000 --> 02:05:24.000
-This is cue #7523
-
-7524
-02:05:24.000 --> 02:05:25.000
-This is cue #7524
-
-7525
-02:05:25.000 --> 02:05:26.000
-This is cue #7525
-
-7526
-02:05:26.000 --> 02:05:27.000
-This is cue #7526
-
-7527
-02:05:27.000 --> 02:05:28.000
-This is cue #7527
-
-7528
-02:05:28.000 --> 02:05:29.000
-This is cue #7528
-
-7529
-02:05:29.000 --> 02:05:30.000
-This is cue #7529
-
-7530
-02:05:30.000 --> 02:05:31.000
-This is cue #7530
-
-7531
-02:05:31.000 --> 02:05:32.000
-This is cue #7531
-
-7532
-02:05:32.000 --> 02:05:33.000
-This is cue #7532
-
-7533
-02:05:33.000 --> 02:05:34.000
-This is cue #7533
-
-7534
-02:05:34.000 --> 02:05:35.000
-This is cue #7534
-
-7535
-02:05:35.000 --> 02:05:36.000
-This is cue #7535
-
-7536
-02:05:36.000 --> 02:05:37.000
-This is cue #7536
-
-7537
-02:05:37.000 --> 02:05:38.000
-This is cue #7537
-
-7538
-02:05:38.000 --> 02:05:39.000
-This is cue #7538
-
-7539
-02:05:39.000 --> 02:05:40.000
-This is cue #7539
-
-7540
-02:05:40.000 --> 02:05:41.000
-This is cue #7540
-
-7541
-02:05:41.000 --> 02:05:42.000
-This is cue #7541
-
-7542
-02:05:42.000 --> 02:05:43.000
-This is cue #7542
-
-7543
-02:05:43.000 --> 02:05:44.000
-This is cue #7543
-
-7544
-02:05:44.000 --> 02:05:45.000
-This is cue #7544
-
-7545
-02:05:45.000 --> 02:05:46.000
-This is cue #7545
-
-7546
-02:05:46.000 --> 02:05:47.000
-This is cue #7546
-
-7547
-02:05:47.000 --> 02:05:48.000
-This is cue #7547
-
-7548
-02:05:48.000 --> 02:05:49.000
-This is cue #7548
-
-7549
-02:05:49.000 --> 02:05:50.000
-This is cue #7549
-
-7550
-02:05:50.000 --> 02:05:51.000
-This is cue #7550
-
-7551
-02:05:51.000 --> 02:05:52.000
-This is cue #7551
-
-7552
-02:05:52.000 --> 02:05:53.000
-This is cue #7552
-
-7553
-02:05:53.000 --> 02:05:54.000
-This is cue #7553
-
-7554
-02:05:54.000 --> 02:05:55.000
-This is cue #7554
-
-7555
-02:05:55.000 --> 02:05:56.000
-This is cue #7555
-
-7556
-02:05:56.000 --> 02:05:57.000
-This is cue #7556
-
-7557
-02:05:57.000 --> 02:05:58.000
-This is cue #7557
-
-7558
-02:05:58.000 --> 02:05:59.000
-This is cue #7558
-
-7559
-02:05:59.000 --> 02:06:00.000
-This is cue #7559
-
-7560
-02:06:00.000 --> 02:06:01.000
-This is cue #7560
-
-7561
-02:06:01.000 --> 02:06:02.000
-This is cue #7561
-
-7562
-02:06:02.000 --> 02:06:03.000
-This is cue #7562
-
-7563
-02:06:03.000 --> 02:06:04.000
-This is cue #7563
-
-7564
-02:06:04.000 --> 02:06:05.000
-This is cue #7564
-
-7565
-02:06:05.000 --> 02:06:06.000
-This is cue #7565
-
-7566
-02:06:06.000 --> 02:06:07.000
-This is cue #7566
-
-7567
-02:06:07.000 --> 02:06:08.000
-This is cue #7567
-
-7568
-02:06:08.000 --> 02:06:09.000
-This is cue #7568
-
-7569
-02:06:09.000 --> 02:06:10.000
-This is cue #7569
-
-7570
-02:06:10.000 --> 02:06:11.000
-This is cue #7570
-
-7571
-02:06:11.000 --> 02:06:12.000
-This is cue #7571
-
-7572
-02:06:12.000 --> 02:06:13.000
-This is cue #7572
-
-7573
-02:06:13.000 --> 02:06:14.000
-This is cue #7573
-
-7574
-02:06:14.000 --> 02:06:15.000
-This is cue #7574
-
-7575
-02:06:15.000 --> 02:06:16.000
-This is cue #7575
-
-7576
-02:06:16.000 --> 02:06:17.000
-This is cue #7576
-
-7577
-02:06:17.000 --> 02:06:18.000
-This is cue #7577
-
-7578
-02:06:18.000 --> 02:06:19.000
-This is cue #7578
-
-7579
-02:06:19.000 --> 02:06:20.000
-This is cue #7579
-
-7580
-02:06:20.000 --> 02:06:21.000
-This is cue #7580
-
-7581
-02:06:21.000 --> 02:06:22.000
-This is cue #7581
-
-7582
-02:06:22.000 --> 02:06:23.000
-This is cue #7582
-
-7583
-02:06:23.000 --> 02:06:24.000
-This is cue #7583
-
-7584
-02:06:24.000 --> 02:06:25.000
-This is cue #7584
-
-7585
-02:06:25.000 --> 02:06:26.000
-This is cue #7585
-
-7586
-02:06:26.000 --> 02:06:27.000
-This is cue #7586
-
-7587
-02:06:27.000 --> 02:06:28.000
-This is cue #7587
-
-7588
-02:06:28.000 --> 02:06:29.000
-This is cue #7588
-
-7589
-02:06:29.000 --> 02:06:30.000
-This is cue #7589
-
-7590
-02:06:30.000 --> 02:06:31.000
-This is cue #7590
-
-7591
-02:06:31.000 --> 02:06:32.000
-This is cue #7591
-
-7592
-02:06:32.000 --> 02:06:33.000
-This is cue #7592
-
-7593
-02:06:33.000 --> 02:06:34.000
-This is cue #7593
-
-7594
-02:06:34.000 --> 02:06:35.000
-This is cue #7594
-
-7595
-02:06:35.000 --> 02:06:36.000
-This is cue #7595
-
-7596
-02:06:36.000 --> 02:06:37.000
-This is cue #7596
-
-7597
-02:06:37.000 --> 02:06:38.000
-This is cue #7597
-
-7598
-02:06:38.000 --> 02:06:39.000
-This is cue #7598
-
-7599
-02:06:39.000 --> 02:06:40.000
-This is cue #7599
-
-7600
-02:06:40.000 --> 02:06:41.000
-This is cue #7600
-
-7601
-02:06:41.000 --> 02:06:42.000
-This is cue #7601
-
-7602
-02:06:42.000 --> 02:06:43.000
-This is cue #7602
-
-7603
-02:06:43.000 --> 02:06:44.000
-This is cue #7603
-
-7604
-02:06:44.000 --> 02:06:45.000
-This is cue #7604
-
-7605
-02:06:45.000 --> 02:06:46.000
-This is cue #7605
-
-7606
-02:06:46.000 --> 02:06:47.000
-This is cue #7606
-
-7607
-02:06:47.000 --> 02:06:48.000
-This is cue #7607
-
-7608
-02:06:48.000 --> 02:06:49.000
-This is cue #7608
-
-7609
-02:06:49.000 --> 02:06:50.000
-This is cue #7609
-
-7610
-02:06:50.000 --> 02:06:51.000
-This is cue #7610
-
-7611
-02:06:51.000 --> 02:06:52.000
-This is cue #7611
-
-7612
-02:06:52.000 --> 02:06:53.000
-This is cue #7612
-
-7613
-02:06:53.000 --> 02:06:54.000
-This is cue #7613
-
-7614
-02:06:54.000 --> 02:06:55.000
-This is cue #7614
-
-7615
-02:06:55.000 --> 02:06:56.000
-This is cue #7615
-
-7616
-02:06:56.000 --> 02:06:57.000
-This is cue #7616
-
-7617
-02:06:57.000 --> 02:06:58.000
-This is cue #7617
-
-7618
-02:06:58.000 --> 02:06:59.000
-This is cue #7618
-
-7619
-02:06:59.000 --> 02:07:00.000
-This is cue #7619
-
-7620
-02:07:00.000 --> 02:07:01.000
-This is cue #7620
-
-7621
-02:07:01.000 --> 02:07:02.000
-This is cue #7621
-
-7622
-02:07:02.000 --> 02:07:03.000
-This is cue #7622
-
-7623
-02:07:03.000 --> 02:07:04.000
-This is cue #7623
-
-7624
-02:07:04.000 --> 02:07:05.000
-This is cue #7624
-
-7625
-02:07:05.000 --> 02:07:06.000
-This is cue #7625
-
-7626
-02:07:06.000 --> 02:07:07.000
-This is cue #7626
-
-7627
-02:07:07.000 --> 02:07:08.000
-This is cue #7627
-
-7628
-02:07:08.000 --> 02:07:09.000
-This is cue #7628
-
-7629
-02:07:09.000 --> 02:07:10.000
-This is cue #7629
-
-7630
-02:07:10.000 --> 02:07:11.000
-This is cue #7630
-
-7631
-02:07:11.000 --> 02:07:12.000
-This is cue #7631
-
-7632
-02:07:12.000 --> 02:07:13.000
-This is cue #7632
-
-7633
-02:07:13.000 --> 02:07:14.000
-This is cue #7633
-
-7634
-02:07:14.000 --> 02:07:15.000
-This is cue #7634
-
-7635
-02:07:15.000 --> 02:07:16.000
-This is cue #7635
-
-7636
-02:07:16.000 --> 02:07:17.000
-This is cue #7636
-
-7637
-02:07:17.000 --> 02:07:18.000
-This is cue #7637
-
-7638
-02:07:18.000 --> 02:07:19.000
-This is cue #7638
-
-7639
-02:07:19.000 --> 02:07:20.000
-This is cue #7639
-
-7640
-02:07:20.000 --> 02:07:21.000
-This is cue #7640
-
-7641
-02:07:21.000 --> 02:07:22.000
-This is cue #7641
-
-7642
-02:07:22.000 --> 02:07:23.000
-This is cue #7642
-
-7643
-02:07:23.000 --> 02:07:24.000
-This is cue #7643
-
-7644
-02:07:24.000 --> 02:07:25.000
-This is cue #7644
-
-7645
-02:07:25.000 --> 02:07:26.000
-This is cue #7645
-
-7646
-02:07:26.000 --> 02:07:27.000
-This is cue #7646
-
-7647
-02:07:27.000 --> 02:07:28.000
-This is cue #7647
-
-7648
-02:07:28.000 --> 02:07:29.000
-This is cue #7648
-
-7649
-02:07:29.000 --> 02:07:30.000
-This is cue #7649
-
-7650
-02:07:30.000 --> 02:07:31.000
-This is cue #7650
-
-7651
-02:07:31.000 --> 02:07:32.000
-This is cue #7651
-
-7652
-02:07:32.000 --> 02:07:33.000
-This is cue #7652
-
-7653
-02:07:33.000 --> 02:07:34.000
-This is cue #7653
-
-7654
-02:07:34.000 --> 02:07:35.000
-This is cue #7654
-
-7655
-02:07:35.000 --> 02:07:36.000
-This is cue #7655
-
-7656
-02:07:36.000 --> 02:07:37.000
-This is cue #7656
-
-7657
-02:07:37.000 --> 02:07:38.000
-This is cue #7657
-
-7658
-02:07:38.000 --> 02:07:39.000
-This is cue #7658
-
-7659
-02:07:39.000 --> 02:07:40.000
-This is cue #7659
-
-7660
-02:07:40.000 --> 02:07:41.000
-This is cue #7660
-
-7661
-02:07:41.000 --> 02:07:42.000
-This is cue #7661
-
-7662
-02:07:42.000 --> 02:07:43.000
-This is cue #7662
-
-7663
-02:07:43.000 --> 02:07:44.000
-This is cue #7663
-
-7664
-02:07:44.000 --> 02:07:45.000
-This is cue #7664
-
-7665
-02:07:45.000 --> 02:07:46.000
-This is cue #7665
-
-7666
-02:07:46.000 --> 02:07:47.000
-This is cue #7666
-
-7667
-02:07:47.000 --> 02:07:48.000
-This is cue #7667
-
-7668
-02:07:48.000 --> 02:07:49.000
-This is cue #7668
-
-7669
-02:07:49.000 --> 02:07:50.000
-This is cue #7669
-
-7670
-02:07:50.000 --> 02:07:51.000
-This is cue #7670
-
-7671
-02:07:51.000 --> 02:07:52.000
-This is cue #7671
-
-7672
-02:07:52.000 --> 02:07:53.000
-This is cue #7672
-
-7673
-02:07:53.000 --> 02:07:54.000
-This is cue #7673
-
-7674
-02:07:54.000 --> 02:07:55.000
-This is cue #7674
-
-7675
-02:07:55.000 --> 02:07:56.000
-This is cue #7675
-
-7676
-02:07:56.000 --> 02:07:57.000
-This is cue #7676
-
-7677
-02:07:57.000 --> 02:07:58.000
-This is cue #7677
-
-7678
-02:07:58.000 --> 02:07:59.000
-This is cue #7678
-
-7679
-02:07:59.000 --> 02:08:00.000
-This is cue #7679
-
-7680
-02:08:00.000 --> 02:08:01.000
-This is cue #7680
-
-7681
-02:08:01.000 --> 02:08:02.000
-This is cue #7681
-
-7682
-02:08:02.000 --> 02:08:03.000
-This is cue #7682
-
-7683
-02:08:03.000 --> 02:08:04.000
-This is cue #7683
-
-7684
-02:08:04.000 --> 02:08:05.000
-This is cue #7684
-
-7685
-02:08:05.000 --> 02:08:06.000
-This is cue #7685
-
-7686
-02:08:06.000 --> 02:08:07.000
-This is cue #7686
-
-7687
-02:08:07.000 --> 02:08:08.000
-This is cue #7687
-
-7688
-02:08:08.000 --> 02:08:09.000
-This is cue #7688
-
-7689
-02:08:09.000 --> 02:08:10.000
-This is cue #7689
-
-7690
-02:08:10.000 --> 02:08:11.000
-This is cue #7690
-
-7691
-02:08:11.000 --> 02:08:12.000
-This is cue #7691
-
-7692
-02:08:12.000 --> 02:08:13.000
-This is cue #7692
-
-7693
-02:08:13.000 --> 02:08:14.000
-This is cue #7693
-
-7694
-02:08:14.000 --> 02:08:15.000
-This is cue #7694
-
-7695
-02:08:15.000 --> 02:08:16.000
-This is cue #7695
-
-7696
-02:08:16.000 --> 02:08:17.000
-This is cue #7696
-
-7697
-02:08:17.000 --> 02:08:18.000
-This is cue #7697
-
-7698
-02:08:18.000 --> 02:08:19.000
-This is cue #7698
-
-7699
-02:08:19.000 --> 02:08:20.000
-This is cue #7699
-
-7700
-02:08:20.000 --> 02:08:21.000
-This is cue #7700
-
-7701
-02:08:21.000 --> 02:08:22.000
-This is cue #7701
-
-7702
-02:08:22.000 --> 02:08:23.000
-This is cue #7702
-
-7703
-02:08:23.000 --> 02:08:24.000
-This is cue #7703
-
-7704
-02:08:24.000 --> 02:08:25.000
-This is cue #7704
-
-7705
-02:08:25.000 --> 02:08:26.000
-This is cue #7705
-
-7706
-02:08:26.000 --> 02:08:27.000
-This is cue #7706
-
-7707
-02:08:27.000 --> 02:08:28.000
-This is cue #7707
-
-7708
-02:08:28.000 --> 02:08:29.000
-This is cue #7708
-
-7709
-02:08:29.000 --> 02:08:30.000
-This is cue #7709
-
-7710
-02:08:30.000 --> 02:08:31.000
-This is cue #7710
-
-7711
-02:08:31.000 --> 02:08:32.000
-This is cue #7711
-
-7712
-02:08:32.000 --> 02:08:33.000
-This is cue #7712
-
-7713
-02:08:33.000 --> 02:08:34.000
-This is cue #7713
-
-7714
-02:08:34.000 --> 02:08:35.000
-This is cue #7714
-
-7715
-02:08:35.000 --> 02:08:36.000
-This is cue #7715
-
-7716
-02:08:36.000 --> 02:08:37.000
-This is cue #7716
-
-7717
-02:08:37.000 --> 02:08:38.000
-This is cue #7717
-
-7718
-02:08:38.000 --> 02:08:39.000
-This is cue #7718
-
-7719
-02:08:39.000 --> 02:08:40.000
-This is cue #7719
-
-7720
-02:08:40.000 --> 02:08:41.000
-This is cue #7720
-
-7721
-02:08:41.000 --> 02:08:42.000
-This is cue #7721
-
-7722
-02:08:42.000 --> 02:08:43.000
-This is cue #7722
-
-7723
-02:08:43.000 --> 02:08:44.000
-This is cue #7723
-
-7724
-02:08:44.000 --> 02:08:45.000
-This is cue #7724
-
-7725
-02:08:45.000 --> 02:08:46.000
-This is cue #7725
-
-7726
-02:08:46.000 --> 02:08:47.000
-This is cue #7726
-
-7727
-02:08:47.000 --> 02:08:48.000
-This is cue #7727
-
-7728
-02:08:48.000 --> 02:08:49.000
-This is cue #7728
-
-7729
-02:08:49.000 --> 02:08:50.000
-This is cue #7729
-
-7730
-02:08:50.000 --> 02:08:51.000
-This is cue #7730
-
-7731
-02:08:51.000 --> 02:08:52.000
-This is cue #7731
-
-7732
-02:08:52.000 --> 02:08:53.000
-This is cue #7732
-
-7733
-02:08:53.000 --> 02:08:54.000
-This is cue #7733
-
-7734
-02:08:54.000 --> 02:08:55.000
-This is cue #7734
-
-7735
-02:08:55.000 --> 02:08:56.000
-This is cue #7735
-
-7736
-02:08:56.000 --> 02:08:57.000
-This is cue #7736
-
-7737
-02:08:57.000 --> 02:08:58.000
-This is cue #7737
-
-7738
-02:08:58.000 --> 02:08:59.000
-This is cue #7738
-
-7739
-02:08:59.000 --> 02:09:00.000
-This is cue #7739
-
-7740
-02:09:00.000 --> 02:09:01.000
-This is cue #7740
-
-7741
-02:09:01.000 --> 02:09:02.000
-This is cue #7741
-
-7742
-02:09:02.000 --> 02:09:03.000
-This is cue #7742
-
-7743
-02:09:03.000 --> 02:09:04.000
-This is cue #7743
-
-7744
-02:09:04.000 --> 02:09:05.000
-This is cue #7744
-
-7745
-02:09:05.000 --> 02:09:06.000
-This is cue #7745
-
-7746
-02:09:06.000 --> 02:09:07.000
-This is cue #7746
-
-7747
-02:09:07.000 --> 02:09:08.000
-This is cue #7747
-
-7748
-02:09:08.000 --> 02:09:09.000
-This is cue #7748
-
-7749
-02:09:09.000 --> 02:09:10.000
-This is cue #7749
-
-7750
-02:09:10.000 --> 02:09:11.000
-This is cue #7750
-
-7751
-02:09:11.000 --> 02:09:12.000
-This is cue #7751
-
-7752
-02:09:12.000 --> 02:09:13.000
-This is cue #7752
-
-7753
-02:09:13.000 --> 02:09:14.000
-This is cue #7753
-
-7754
-02:09:14.000 --> 02:09:15.000
-This is cue #7754
-
-7755
-02:09:15.000 --> 02:09:16.000
-This is cue #7755
-
-7756
-02:09:16.000 --> 02:09:17.000
-This is cue #7756
-
-7757
-02:09:17.000 --> 02:09:18.000
-This is cue #7757
-
-7758
-02:09:18.000 --> 02:09:19.000
-This is cue #7758
-
-7759
-02:09:19.000 --> 02:09:20.000
-This is cue #7759
-
-7760
-02:09:20.000 --> 02:09:21.000
-This is cue #7760
-
-7761
-02:09:21.000 --> 02:09:22.000
-This is cue #7761
-
-7762
-02:09:22.000 --> 02:09:23.000
-This is cue #7762
-
-7763
-02:09:23.000 --> 02:09:24.000
-This is cue #7763
-
-7764
-02:09:24.000 --> 02:09:25.000
-This is cue #7764
-
-7765
-02:09:25.000 --> 02:09:26.000
-This is cue #7765
-
-7766
-02:09:26.000 --> 02:09:27.000
-This is cue #7766
-
-7767
-02:09:27.000 --> 02:09:28.000
-This is cue #7767
-
-7768
-02:09:28.000 --> 02:09:29.000
-This is cue #7768
-
-7769
-02:09:29.000 --> 02:09:30.000
-This is cue #7769
-
-7770
-02:09:30.000 --> 02:09:31.000
-This is cue #7770
-
-7771
-02:09:31.000 --> 02:09:32.000
-This is cue #7771
-
-7772
-02:09:32.000 --> 02:09:33.000
-This is cue #7772
-
-7773
-02:09:33.000 --> 02:09:34.000
-This is cue #7773
-
-7774
-02:09:34.000 --> 02:09:35.000
-This is cue #7774
-
-7775
-02:09:35.000 --> 02:09:36.000
-This is cue #7775
-
-7776
-02:09:36.000 --> 02:09:37.000
-This is cue #7776
-
-7777
-02:09:37.000 --> 02:09:38.000
-This is cue #7777
-
-7778
-02:09:38.000 --> 02:09:39.000
-This is cue #7778
-
-7779
-02:09:39.000 --> 02:09:40.000
-This is cue #7779
-
-7780
-02:09:40.000 --> 02:09:41.000
-This is cue #7780
-
-7781
-02:09:41.000 --> 02:09:42.000
-This is cue #7781
-
-7782
-02:09:42.000 --> 02:09:43.000
-This is cue #7782
-
-7783
-02:09:43.000 --> 02:09:44.000
-This is cue #7783
-
-7784
-02:09:44.000 --> 02:09:45.000
-This is cue #7784
-
-7785
-02:09:45.000 --> 02:09:46.000
-This is cue #7785
-
-7786
-02:09:46.000 --> 02:09:47.000
-This is cue #7786
-
-7787
-02:09:47.000 --> 02:09:48.000
-This is cue #7787
-
-7788
-02:09:48.000 --> 02:09:49.000
-This is cue #7788
-
-7789
-02:09:49.000 --> 02:09:50.000
-This is cue #7789
-
-7790
-02:09:50.000 --> 02:09:51.000
-This is cue #7790
-
-7791
-02:09:51.000 --> 02:09:52.000
-This is cue #7791
-
-7792
-02:09:52.000 --> 02:09:53.000
-This is cue #7792
-
-7793
-02:09:53.000 --> 02:09:54.000
-This is cue #7793
-
-7794
-02:09:54.000 --> 02:09:55.000
-This is cue #7794
-
-7795
-02:09:55.000 --> 02:09:56.000
-This is cue #7795
-
-7796
-02:09:56.000 --> 02:09:57.000
-This is cue #7796
-
-7797
-02:09:57.000 --> 02:09:58.000
-This is cue #7797
-
-7798
-02:09:58.000 --> 02:09:59.000
-This is cue #7798
-
-7799
-02:09:59.000 --> 02:10:00.000
-This is cue #7799
-
-7800
-02:10:00.000 --> 02:10:01.000
-This is cue #7800
-
-7801
-02:10:01.000 --> 02:10:02.000
-This is cue #7801
-
-7802
-02:10:02.000 --> 02:10:03.000
-This is cue #7802
-
-7803
-02:10:03.000 --> 02:10:04.000
-This is cue #7803
-
-7804
-02:10:04.000 --> 02:10:05.000
-This is cue #7804
-
-7805
-02:10:05.000 --> 02:10:06.000
-This is cue #7805
-
-7806
-02:10:06.000 --> 02:10:07.000
-This is cue #7806
-
-7807
-02:10:07.000 --> 02:10:08.000
-This is cue #7807
-
-7808
-02:10:08.000 --> 02:10:09.000
-This is cue #7808
-
-7809
-02:10:09.000 --> 02:10:10.000
-This is cue #7809
-
-7810
-02:10:10.000 --> 02:10:11.000
-This is cue #7810
-
-7811
-02:10:11.000 --> 02:10:12.000
-This is cue #7811
-
-7812
-02:10:12.000 --> 02:10:13.000
-This is cue #7812
-
-7813
-02:10:13.000 --> 02:10:14.000
-This is cue #7813
-
-7814
-02:10:14.000 --> 02:10:15.000
-This is cue #7814
-
-7815
-02:10:15.000 --> 02:10:16.000
-This is cue #7815
-
-7816
-02:10:16.000 --> 02:10:17.000
-This is cue #7816
-
-7817
-02:10:17.000 --> 02:10:18.000
-This is cue #7817
-
-7818
-02:10:18.000 --> 02:10:19.000
-This is cue #7818
-
-7819
-02:10:19.000 --> 02:10:20.000
-This is cue #7819
-
-7820
-02:10:20.000 --> 02:10:21.000
-This is cue #7820
-
-7821
-02:10:21.000 --> 02:10:22.000
-This is cue #7821
-
-7822
-02:10:22.000 --> 02:10:23.000
-This is cue #7822
-
-7823
-02:10:23.000 --> 02:10:24.000
-This is cue #7823
-
-7824
-02:10:24.000 --> 02:10:25.000
-This is cue #7824
-
-7825
-02:10:25.000 --> 02:10:26.000
-This is cue #7825
-
-7826
-02:10:26.000 --> 02:10:27.000
-This is cue #7826
-
-7827
-02:10:27.000 --> 02:10:28.000
-This is cue #7827
-
-7828
-02:10:28.000 --> 02:10:29.000
-This is cue #7828
-
-7829
-02:10:29.000 --> 02:10:30.000
-This is cue #7829
-
-7830
-02:10:30.000 --> 02:10:31.000
-This is cue #7830
-
-7831
-02:10:31.000 --> 02:10:32.000
-This is cue #7831
-
-7832
-02:10:32.000 --> 02:10:33.000
-This is cue #7832
-
-7833
-02:10:33.000 --> 02:10:34.000
-This is cue #7833
-
-7834
-02:10:34.000 --> 02:10:35.000
-This is cue #7834
-
-7835
-02:10:35.000 --> 02:10:36.000
-This is cue #7835
-
-7836
-02:10:36.000 --> 02:10:37.000
-This is cue #7836
-
-7837
-02:10:37.000 --> 02:10:38.000
-This is cue #7837
-
-7838
-02:10:38.000 --> 02:10:39.000
-This is cue #7838
-
-7839
-02:10:39.000 --> 02:10:40.000
-This is cue #7839
-
-7840
-02:10:40.000 --> 02:10:41.000
-This is cue #7840
-
-7841
-02:10:41.000 --> 02:10:42.000
-This is cue #7841
-
-7842
-02:10:42.000 --> 02:10:43.000
-This is cue #7842
-
-7843
-02:10:43.000 --> 02:10:44.000
-This is cue #7843
-
-7844
-02:10:44.000 --> 02:10:45.000
-This is cue #7844
-
-7845
-02:10:45.000 --> 02:10:46.000
-This is cue #7845
-
-7846
-02:10:46.000 --> 02:10:47.000
-This is cue #7846
-
-7847
-02:10:47.000 --> 02:10:48.000
-This is cue #7847
-
-7848
-02:10:48.000 --> 02:10:49.000
-This is cue #7848
-
-7849
-02:10:49.000 --> 02:10:50.000
-This is cue #7849
-
-7850
-02:10:50.000 --> 02:10:51.000
-This is cue #7850
-
-7851
-02:10:51.000 --> 02:10:52.000
-This is cue #7851
-
-7852
-02:10:52.000 --> 02:10:53.000
-This is cue #7852
-
-7853
-02:10:53.000 --> 02:10:54.000
-This is cue #7853
-
-7854
-02:10:54.000 --> 02:10:55.000
-This is cue #7854
-
-7855
-02:10:55.000 --> 02:10:56.000
-This is cue #7855
-
-7856
-02:10:56.000 --> 02:10:57.000
-This is cue #7856
-
-7857
-02:10:57.000 --> 02:10:58.000
-This is cue #7857
-
-7858
-02:10:58.000 --> 02:10:59.000
-This is cue #7858
-
-7859
-02:10:59.000 --> 02:11:00.000
-This is cue #7859
-
-7860
-02:11:00.000 --> 02:11:01.000
-This is cue #7860
-
-7861
-02:11:01.000 --> 02:11:02.000
-This is cue #7861
-
-7862
-02:11:02.000 --> 02:11:03.000
-This is cue #7862
-
-7863
-02:11:03.000 --> 02:11:04.000
-This is cue #7863
-
-7864
-02:11:04.000 --> 02:11:05.000
-This is cue #7864
-
-7865
-02:11:05.000 --> 02:11:06.000
-This is cue #7865
-
-7866
-02:11:06.000 --> 02:11:07.000
-This is cue #7866
-
-7867
-02:11:07.000 --> 02:11:08.000
-This is cue #7867
-
-7868
-02:11:08.000 --> 02:11:09.000
-This is cue #7868
-
-7869
-02:11:09.000 --> 02:11:10.000
-This is cue #7869
-
-7870
-02:11:10.000 --> 02:11:11.000
-This is cue #7870
-
-7871
-02:11:11.000 --> 02:11:12.000
-This is cue #7871
-
-7872
-02:11:12.000 --> 02:11:13.000
-This is cue #7872
-
-7873
-02:11:13.000 --> 02:11:14.000
-This is cue #7873
-
-7874
-02:11:14.000 --> 02:11:15.000
-This is cue #7874
-
-7875
-02:11:15.000 --> 02:11:16.000
-This is cue #7875
-
-7876
-02:11:16.000 --> 02:11:17.000
-This is cue #7876
-
-7877
-02:11:17.000 --> 02:11:18.000
-This is cue #7877
-
-7878
-02:11:18.000 --> 02:11:19.000
-This is cue #7878
-
-7879
-02:11:19.000 --> 02:11:20.000
-This is cue #7879
-
-7880
-02:11:20.000 --> 02:11:21.000
-This is cue #7880
-
-7881
-02:11:21.000 --> 02:11:22.000
-This is cue #7881
-
-7882
-02:11:22.000 --> 02:11:23.000
-This is cue #7882
-
-7883
-02:11:23.000 --> 02:11:24.000
-This is cue #7883
-
-7884
-02:11:24.000 --> 02:11:25.000
-This is cue #7884
-
-7885
-02:11:25.000 --> 02:11:26.000
-This is cue #7885
-
-7886
-02:11:26.000 --> 02:11:27.000
-This is cue #7886
-
-7887
-02:11:27.000 --> 02:11:28.000
-This is cue #7887
-
-7888
-02:11:28.000 --> 02:11:29.000
-This is cue #7888
-
-7889
-02:11:29.000 --> 02:11:30.000
-This is cue #7889
-
-7890
-02:11:30.000 --> 02:11:31.000
-This is cue #7890
-
-7891
-02:11:31.000 --> 02:11:32.000
-This is cue #7891
-
-7892
-02:11:32.000 --> 02:11:33.000
-This is cue #7892
-
-7893
-02:11:33.000 --> 02:11:34.000
-This is cue #7893
-
-7894
-02:11:34.000 --> 02:11:35.000
-This is cue #7894
-
-7895
-02:11:35.000 --> 02:11:36.000
-This is cue #7895
-
-7896
-02:11:36.000 --> 02:11:37.000
-This is cue #7896
-
-7897
-02:11:37.000 --> 02:11:38.000
-This is cue #7897
-
-7898
-02:11:38.000 --> 02:11:39.000
-This is cue #7898
-
-7899
-02:11:39.000 --> 02:11:40.000
-This is cue #7899
-
-7900
-02:11:40.000 --> 02:11:41.000
-This is cue #7900
-
-7901
-02:11:41.000 --> 02:11:42.000
-This is cue #7901
-
-7902
-02:11:42.000 --> 02:11:43.000
-This is cue #7902
-
-7903
-02:11:43.000 --> 02:11:44.000
-This is cue #7903
-
-7904
-02:11:44.000 --> 02:11:45.000
-This is cue #7904
-
-7905
-02:11:45.000 --> 02:11:46.000
-This is cue #7905
-
-7906
-02:11:46.000 --> 02:11:47.000
-This is cue #7906
-
-7907
-02:11:47.000 --> 02:11:48.000
-This is cue #7907
-
-7908
-02:11:48.000 --> 02:11:49.000
-This is cue #7908
-
-7909
-02:11:49.000 --> 02:11:50.000
-This is cue #7909
-
-7910
-02:11:50.000 --> 02:11:51.000
-This is cue #7910
-
-7911
-02:11:51.000 --> 02:11:52.000
-This is cue #7911
-
-7912
-02:11:52.000 --> 02:11:53.000
-This is cue #7912
-
-7913
-02:11:53.000 --> 02:11:54.000
-This is cue #7913
-
-7914
-02:11:54.000 --> 02:11:55.000
-This is cue #7914
-
-7915
-02:11:55.000 --> 02:11:56.000
-This is cue #7915
-
-7916
-02:11:56.000 --> 02:11:57.000
-This is cue #7916
-
-7917
-02:11:57.000 --> 02:11:58.000
-This is cue #7917
-
-7918
-02:11:58.000 --> 02:11:59.000
-This is cue #7918
-
-7919
-02:11:59.000 --> 02:12:00.000
-This is cue #7919
-
-7920
-02:12:00.000 --> 02:12:01.000
-This is cue #7920
-
-7921
-02:12:01.000 --> 02:12:02.000
-This is cue #7921
-
-7922
-02:12:02.000 --> 02:12:03.000
-This is cue #7922
-
-7923
-02:12:03.000 --> 02:12:04.000
-This is cue #7923
-
-7924
-02:12:04.000 --> 02:12:05.000
-This is cue #7924
-
-7925
-02:12:05.000 --> 02:12:06.000
-This is cue #7925
-
-7926
-02:12:06.000 --> 02:12:07.000
-This is cue #7926
-
-7927
-02:12:07.000 --> 02:12:08.000
-This is cue #7927
-
-7928
-02:12:08.000 --> 02:12:09.000
-This is cue #7928
-
-7929
-02:12:09.000 --> 02:12:10.000
-This is cue #7929
-
-7930
-02:12:10.000 --> 02:12:11.000
-This is cue #7930
-
-7931
-02:12:11.000 --> 02:12:12.000
-This is cue #7931
-
-7932
-02:12:12.000 --> 02:12:13.000
-This is cue #7932
-
-7933
-02:12:13.000 --> 02:12:14.000
-This is cue #7933
-
-7934
-02:12:14.000 --> 02:12:15.000
-This is cue #7934
-
-7935
-02:12:15.000 --> 02:12:16.000
-This is cue #7935
-
-7936
-02:12:16.000 --> 02:12:17.000
-This is cue #7936
-
-7937
-02:12:17.000 --> 02:12:18.000
-This is cue #7937
-
-7938
-02:12:18.000 --> 02:12:19.000
-This is cue #7938
-
-7939
-02:12:19.000 --> 02:12:20.000
-This is cue #7939
-
-7940
-02:12:20.000 --> 02:12:21.000
-This is cue #7940
-
-7941
-02:12:21.000 --> 02:12:22.000
-This is cue #7941
-
-7942
-02:12:22.000 --> 02:12:23.000
-This is cue #7942
-
-7943
-02:12:23.000 --> 02:12:24.000
-This is cue #7943
-
-7944
-02:12:24.000 --> 02:12:25.000
-This is cue #7944
-
-7945
-02:12:25.000 --> 02:12:26.000
-This is cue #7945
-
-7946
-02:12:26.000 --> 02:12:27.000
-This is cue #7946
-
-7947
-02:12:27.000 --> 02:12:28.000
-This is cue #7947
-
-7948
-02:12:28.000 --> 02:12:29.000
-This is cue #7948
-
-7949
-02:12:29.000 --> 02:12:30.000
-This is cue #7949
-
-7950
-02:12:30.000 --> 02:12:31.000
-This is cue #7950
-
-7951
-02:12:31.000 --> 02:12:32.000
-This is cue #7951
-
-7952
-02:12:32.000 --> 02:12:33.000
-This is cue #7952
-
-7953
-02:12:33.000 --> 02:12:34.000
-This is cue #7953
-
-7954
-02:12:34.000 --> 02:12:35.000
-This is cue #7954
-
-7955
-02:12:35.000 --> 02:12:36.000
-This is cue #7955
-
-7956
-02:12:36.000 --> 02:12:37.000
-This is cue #7956
-
-7957
-02:12:37.000 --> 02:12:38.000
-This is cue #7957
-
-7958
-02:12:38.000 --> 02:12:39.000
-This is cue #7958
-
-7959
-02:12:39.000 --> 02:12:40.000
-This is cue #7959
-
-7960
-02:12:40.000 --> 02:12:41.000
-This is cue #7960
-
-7961
-02:12:41.000 --> 02:12:42.000
-This is cue #7961
-
-7962
-02:12:42.000 --> 02:12:43.000
-This is cue #7962
-
-7963
-02:12:43.000 --> 02:12:44.000
-This is cue #7963
-
-7964
-02:12:44.000 --> 02:12:45.000
-This is cue #7964
-
-7965
-02:12:45.000 --> 02:12:46.000
-This is cue #7965
-
-7966
-02:12:46.000 --> 02:12:47.000
-This is cue #7966
-
-7967
-02:12:47.000 --> 02:12:48.000
-This is cue #7967
-
-7968
-02:12:48.000 --> 02:12:49.000
-This is cue #7968
-
-7969
-02:12:49.000 --> 02:12:50.000
-This is cue #7969
-
-7970
-02:12:50.000 --> 02:12:51.000
-This is cue #7970
-
-7971
-02:12:51.000 --> 02:12:52.000
-This is cue #7971
-
-7972
-02:12:52.000 --> 02:12:53.000
-This is cue #7972
-
-7973
-02:12:53.000 --> 02:12:54.000
-This is cue #7973
-
-7974
-02:12:54.000 --> 02:12:55.000
-This is cue #7974
-
-7975
-02:12:55.000 --> 02:12:56.000
-This is cue #7975
-
-7976
-02:12:56.000 --> 02:12:57.000
-This is cue #7976
-
-7977
-02:12:57.000 --> 02:12:58.000
-This is cue #7977
-
-7978
-02:12:58.000 --> 02:12:59.000
-This is cue #7978
-
-7979
-02:12:59.000 --> 02:13:00.000
-This is cue #7979
-
-7980
-02:13:00.000 --> 02:13:01.000
-This is cue #7980
-
-7981
-02:13:01.000 --> 02:13:02.000
-This is cue #7981
-
-7982
-02:13:02.000 --> 02:13:03.000
-This is cue #7982
-
-7983
-02:13:03.000 --> 02:13:04.000
-This is cue #7983
-
-7984
-02:13:04.000 --> 02:13:05.000
-This is cue #7984
-
-7985
-02:13:05.000 --> 02:13:06.000
-This is cue #7985
-
-7986
-02:13:06.000 --> 02:13:07.000
-This is cue #7986
-
-7987
-02:13:07.000 --> 02:13:08.000
-This is cue #7987
-
-7988
-02:13:08.000 --> 02:13:09.000
-This is cue #7988
-
-7989
-02:13:09.000 --> 02:13:10.000
-This is cue #7989
-
-7990
-02:13:10.000 --> 02:13:11.000
-This is cue #7990
-
-7991
-02:13:11.000 --> 02:13:12.000
-This is cue #7991
-
-7992
-02:13:12.000 --> 02:13:13.000
-This is cue #7992
-
-7993
-02:13:13.000 --> 02:13:14.000
-This is cue #7993
-
-7994
-02:13:14.000 --> 02:13:15.000
-This is cue #7994
-
-7995
-02:13:15.000 --> 02:13:16.000
-This is cue #7995
-
-7996
-02:13:16.000 --> 02:13:17.000
-This is cue #7996
-
-7997
-02:13:17.000 --> 02:13:18.000
-This is cue #7997
-
-7998
-02:13:18.000 --> 02:13:19.000
-This is cue #7998
-
-7999
-02:13:19.000 --> 02:13:20.000
-This is cue #7999
-
-8000
-02:13:20.000 --> 02:13:21.000
-This is cue #8000
-
-8001
-02:13:21.000 --> 02:13:22.000
-This is cue #8001
-
-8002
-02:13:22.000 --> 02:13:23.000
-This is cue #8002
-
-8003
-02:13:23.000 --> 02:13:24.000
-This is cue #8003
-
-8004
-02:13:24.000 --> 02:13:25.000
-This is cue #8004
-
-8005
-02:13:25.000 --> 02:13:26.000
-This is cue #8005
-
-8006
-02:13:26.000 --> 02:13:27.000
-This is cue #8006
-
-8007
-02:13:27.000 --> 02:13:28.000
-This is cue #8007
-
-8008
-02:13:28.000 --> 02:13:29.000
-This is cue #8008
-
-8009
-02:13:29.000 --> 02:13:30.000
-This is cue #8009
-
-8010
-02:13:30.000 --> 02:13:31.000
-This is cue #8010
-
-8011
-02:13:31.000 --> 02:13:32.000
-This is cue #8011
-
-8012
-02:13:32.000 --> 02:13:33.000
-This is cue #8012
-
-8013
-02:13:33.000 --> 02:13:34.000
-This is cue #8013
-
-8014
-02:13:34.000 --> 02:13:35.000
-This is cue #8014
-
-8015
-02:13:35.000 --> 02:13:36.000
-This is cue #8015
-
-8016
-02:13:36.000 --> 02:13:37.000
-This is cue #8016
-
-8017
-02:13:37.000 --> 02:13:38.000
-This is cue #8017
-
-8018
-02:13:38.000 --> 02:13:39.000
-This is cue #8018
-
-8019
-02:13:39.000 --> 02:13:40.000
-This is cue #8019
-
-8020
-02:13:40.000 --> 02:13:41.000
-This is cue #8020
-
-8021
-02:13:41.000 --> 02:13:42.000
-This is cue #8021
-
-8022
-02:13:42.000 --> 02:13:43.000
-This is cue #8022
-
-8023
-02:13:43.000 --> 02:13:44.000
-This is cue #8023
-
-8024
-02:13:44.000 --> 02:13:45.000
-This is cue #8024
-
-8025
-02:13:45.000 --> 02:13:46.000
-This is cue #8025
-
-8026
-02:13:46.000 --> 02:13:47.000
-This is cue #8026
-
-8027
-02:13:47.000 --> 02:13:48.000
-This is cue #8027
-
-8028
-02:13:48.000 --> 02:13:49.000
-This is cue #8028
-
-8029
-02:13:49.000 --> 02:13:50.000
-This is cue #8029
-
-8030
-02:13:50.000 --> 02:13:51.000
-This is cue #8030
-
-8031
-02:13:51.000 --> 02:13:52.000
-This is cue #8031
-
-8032
-02:13:52.000 --> 02:13:53.000
-This is cue #8032
-
-8033
-02:13:53.000 --> 02:13:54.000
-This is cue #8033
-
-8034
-02:13:54.000 --> 02:13:55.000
-This is cue #8034
-
-8035
-02:13:55.000 --> 02:13:56.000
-This is cue #8035
-
-8036
-02:13:56.000 --> 02:13:57.000
-This is cue #8036
-
-8037
-02:13:57.000 --> 02:13:58.000
-This is cue #8037
-
-8038
-02:13:58.000 --> 02:13:59.000
-This is cue #8038
-
-8039
-02:13:59.000 --> 02:14:00.000
-This is cue #8039
-
-8040
-02:14:00.000 --> 02:14:01.000
-This is cue #8040
-
-8041
-02:14:01.000 --> 02:14:02.000
-This is cue #8041
-
-8042
-02:14:02.000 --> 02:14:03.000
-This is cue #8042
-
-8043
-02:14:03.000 --> 02:14:04.000
-This is cue #8043
-
-8044
-02:14:04.000 --> 02:14:05.000
-This is cue #8044
-
-8045
-02:14:05.000 --> 02:14:06.000
-This is cue #8045
-
-8046
-02:14:06.000 --> 02:14:07.000
-This is cue #8046
-
-8047
-02:14:07.000 --> 02:14:08.000
-This is cue #8047
-
-8048
-02:14:08.000 --> 02:14:09.000
-This is cue #8048
-
-8049
-02:14:09.000 --> 02:14:10.000
-This is cue #8049
-
-8050
-02:14:10.000 --> 02:14:11.000
-This is cue #8050
-
-8051
-02:14:11.000 --> 02:14:12.000
-This is cue #8051
-
-8052
-02:14:12.000 --> 02:14:13.000
-This is cue #8052
-
-8053
-02:14:13.000 --> 02:14:14.000
-This is cue #8053
-
-8054
-02:14:14.000 --> 02:14:15.000
-This is cue #8054
-
-8055
-02:14:15.000 --> 02:14:16.000
-This is cue #8055
-
-8056
-02:14:16.000 --> 02:14:17.000
-This is cue #8056
-
-8057
-02:14:17.000 --> 02:14:18.000
-This is cue #8057
-
-8058
-02:14:18.000 --> 02:14:19.000
-This is cue #8058
-
-8059
-02:14:19.000 --> 02:14:20.000
-This is cue #8059
-
-8060
-02:14:20.000 --> 02:14:21.000
-This is cue #8060
-
-8061
-02:14:21.000 --> 02:14:22.000
-This is cue #8061
-
-8062
-02:14:22.000 --> 02:14:23.000
-This is cue #8062
-
-8063
-02:14:23.000 --> 02:14:24.000
-This is cue #8063
-
-8064
-02:14:24.000 --> 02:14:25.000
-This is cue #8064
-
-8065
-02:14:25.000 --> 02:14:26.000
-This is cue #8065
-
-8066
-02:14:26.000 --> 02:14:27.000
-This is cue #8066
-
-8067
-02:14:27.000 --> 02:14:28.000
-This is cue #8067
-
-8068
-02:14:28.000 --> 02:14:29.000
-This is cue #8068
-
-8069
-02:14:29.000 --> 02:14:30.000
-This is cue #8069
-
-8070
-02:14:30.000 --> 02:14:31.000
-This is cue #8070
-
-8071
-02:14:31.000 --> 02:14:32.000
-This is cue #8071
-
-8072
-02:14:32.000 --> 02:14:33.000
-This is cue #8072
-
-8073
-02:14:33.000 --> 02:14:34.000
-This is cue #8073
-
-8074
-02:14:34.000 --> 02:14:35.000
-This is cue #8074
-
-8075
-02:14:35.000 --> 02:14:36.000
-This is cue #8075
-
-8076
-02:14:36.000 --> 02:14:37.000
-This is cue #8076
-
-8077
-02:14:37.000 --> 02:14:38.000
-This is cue #8077
-
-8078
-02:14:38.000 --> 02:14:39.000
-This is cue #8078
-
-8079
-02:14:39.000 --> 02:14:40.000
-This is cue #8079
-
-8080
-02:14:40.000 --> 02:14:41.000
-This is cue #8080
-
-8081
-02:14:41.000 --> 02:14:42.000
-This is cue #8081
-
-8082
-02:14:42.000 --> 02:14:43.000
-This is cue #8082
-
-8083
-02:14:43.000 --> 02:14:44.000
-This is cue #8083
-
-8084
-02:14:44.000 --> 02:14:45.000
-This is cue #8084
-
-8085
-02:14:45.000 --> 02:14:46.000
-This is cue #8085
-
-8086
-02:14:46.000 --> 02:14:47.000
-This is cue #8086
-
-8087
-02:14:47.000 --> 02:14:48.000
-This is cue #8087
-
-8088
-02:14:48.000 --> 02:14:49.000
-This is cue #8088
-
-8089
-02:14:49.000 --> 02:14:50.000
-This is cue #8089
-
-8090
-02:14:50.000 --> 02:14:51.000
-This is cue #8090
-
-8091
-02:14:51.000 --> 02:14:52.000
-This is cue #8091
-
-8092
-02:14:52.000 --> 02:14:53.000
-This is cue #8092
-
-8093
-02:14:53.000 --> 02:14:54.000
-This is cue #8093
-
-8094
-02:14:54.000 --> 02:14:55.000
-This is cue #8094
-
-8095
-02:14:55.000 --> 02:14:56.000
-This is cue #8095
-
-8096
-02:14:56.000 --> 02:14:57.000
-This is cue #8096
-
-8097
-02:14:57.000 --> 02:14:58.000
-This is cue #8097
-
-8098
-02:14:58.000 --> 02:14:59.000
-This is cue #8098
-
-8099
-02:14:59.000 --> 02:15:00.000
-This is cue #8099
-
-8100
-02:15:00.000 --> 02:15:01.000
-This is cue #8100
-
-8101
-02:15:01.000 --> 02:15:02.000
-This is cue #8101
-
-8102
-02:15:02.000 --> 02:15:03.000
-This is cue #8102
-
-8103
-02:15:03.000 --> 02:15:04.000
-This is cue #8103
-
-8104
-02:15:04.000 --> 02:15:05.000
-This is cue #8104
-
-8105
-02:15:05.000 --> 02:15:06.000
-This is cue #8105
-
-8106
-02:15:06.000 --> 02:15:07.000
-This is cue #8106
-
-8107
-02:15:07.000 --> 02:15:08.000
-This is cue #8107
-
-8108
-02:15:08.000 --> 02:15:09.000
-This is cue #8108
-
-8109
-02:15:09.000 --> 02:15:10.000
-This is cue #8109
-
-8110
-02:15:10.000 --> 02:15:11.000
-This is cue #8110
-
-8111
-02:15:11.000 --> 02:15:12.000
-This is cue #8111
-
-8112
-02:15:12.000 --> 02:15:13.000
-This is cue #8112
-
-8113
-02:15:13.000 --> 02:15:14.000
-This is cue #8113
-
-8114
-02:15:14.000 --> 02:15:15.000
-This is cue #8114
-
-8115
-02:15:15.000 --> 02:15:16.000
-This is cue #8115
-
-8116
-02:15:16.000 --> 02:15:17.000
-This is cue #8116
-
-8117
-02:15:17.000 --> 02:15:18.000
-This is cue #8117
-
-8118
-02:15:18.000 --> 02:15:19.000
-This is cue #8118
-
-8119
-02:15:19.000 --> 02:15:20.000
-This is cue #8119
-
-8120
-02:15:20.000 --> 02:15:21.000
-This is cue #8120
-
-8121
-02:15:21.000 --> 02:15:22.000
-This is cue #8121
-
-8122
-02:15:22.000 --> 02:15:23.000
-This is cue #8122
-
-8123
-02:15:23.000 --> 02:15:24.000
-This is cue #8123
-
-8124
-02:15:24.000 --> 02:15:25.000
-This is cue #8124
-
-8125
-02:15:25.000 --> 02:15:26.000
-This is cue #8125
-
-8126
-02:15:26.000 --> 02:15:27.000
-This is cue #8126
-
-8127
-02:15:27.000 --> 02:15:28.000
-This is cue #8127
-
-8128
-02:15:28.000 --> 02:15:29.000
-This is cue #8128
-
-8129
-02:15:29.000 --> 02:15:30.000
-This is cue #8129
-
-8130
-02:15:30.000 --> 02:15:31.000
-This is cue #8130
-
-8131
-02:15:31.000 --> 02:15:32.000
-This is cue #8131
-
-8132
-02:15:32.000 --> 02:15:33.000
-This is cue #8132
-
-8133
-02:15:33.000 --> 02:15:34.000
-This is cue #8133
-
-8134
-02:15:34.000 --> 02:15:35.000
-This is cue #8134
-
-8135
-02:15:35.000 --> 02:15:36.000
-This is cue #8135
-
-8136
-02:15:36.000 --> 02:15:37.000
-This is cue #8136
-
-8137
-02:15:37.000 --> 02:15:38.000
-This is cue #8137
-
-8138
-02:15:38.000 --> 02:15:39.000
-This is cue #8138
-
-8139
-02:15:39.000 --> 02:15:40.000
-This is cue #8139
-
-8140
-02:15:40.000 --> 02:15:41.000
-This is cue #8140
-
-8141
-02:15:41.000 --> 02:15:42.000
-This is cue #8141
-
-8142
-02:15:42.000 --> 02:15:43.000
-This is cue #8142
-
-8143
-02:15:43.000 --> 02:15:44.000
-This is cue #8143
-
-8144
-02:15:44.000 --> 02:15:45.000
-This is cue #8144
-
-8145
-02:15:45.000 --> 02:15:46.000
-This is cue #8145
-
-8146
-02:15:46.000 --> 02:15:47.000
-This is cue #8146
-
-8147
-02:15:47.000 --> 02:15:48.000
-This is cue #8147
-
-8148
-02:15:48.000 --> 02:15:49.000
-This is cue #8148
-
-8149
-02:15:49.000 --> 02:15:50.000
-This is cue #8149
-
-8150
-02:15:50.000 --> 02:15:51.000
-This is cue #8150
-
-8151
-02:15:51.000 --> 02:15:52.000
-This is cue #8151
-
-8152
-02:15:52.000 --> 02:15:53.000
-This is cue #8152
-
-8153
-02:15:53.000 --> 02:15:54.000
-This is cue #8153
-
-8154
-02:15:54.000 --> 02:15:55.000
-This is cue #8154
-
-8155
-02:15:55.000 --> 02:15:56.000
-This is cue #8155
-
-8156
-02:15:56.000 --> 02:15:57.000
-This is cue #8156
-
-8157
-02:15:57.000 --> 02:15:58.000
-This is cue #8157
-
-8158
-02:15:58.000 --> 02:15:59.000
-This is cue #8158
-
-8159
-02:15:59.000 --> 02:16:00.000
-This is cue #8159
-
-8160
-02:16:00.000 --> 02:16:01.000
-This is cue #8160
-
-8161
-02:16:01.000 --> 02:16:02.000
-This is cue #8161
-
-8162
-02:16:02.000 --> 02:16:03.000
-This is cue #8162
-
-8163
-02:16:03.000 --> 02:16:04.000
-This is cue #8163
-
-8164
-02:16:04.000 --> 02:16:05.000
-This is cue #8164
-
-8165
-02:16:05.000 --> 02:16:06.000
-This is cue #8165
-
-8166
-02:16:06.000 --> 02:16:07.000
-This is cue #8166
-
-8167
-02:16:07.000 --> 02:16:08.000
-This is cue #8167
-
-8168
-02:16:08.000 --> 02:16:09.000
-This is cue #8168
-
-8169
-02:16:09.000 --> 02:16:10.000
-This is cue #8169
-
-8170
-02:16:10.000 --> 02:16:11.000
-This is cue #8170
-
-8171
-02:16:11.000 --> 02:16:12.000
-This is cue #8171
-
-8172
-02:16:12.000 --> 02:16:13.000
-This is cue #8172
-
-8173
-02:16:13.000 --> 02:16:14.000
-This is cue #8173
-
-8174
-02:16:14.000 --> 02:16:15.000
-This is cue #8174
-
-8175
-02:16:15.000 --> 02:16:16.000
-This is cue #8175
-
-8176
-02:16:16.000 --> 02:16:17.000
-This is cue #8176
-
-8177
-02:16:17.000 --> 02:16:18.000
-This is cue #8177
-
-8178
-02:16:18.000 --> 02:16:19.000
-This is cue #8178
-
-8179
-02:16:19.000 --> 02:16:20.000
-This is cue #8179
-
-8180
-02:16:20.000 --> 02:16:21.000
-This is cue #8180
-
-8181
-02:16:21.000 --> 02:16:22.000
-This is cue #8181
-
-8182
-02:16:22.000 --> 02:16:23.000
-This is cue #8182
-
-8183
-02:16:23.000 --> 02:16:24.000
-This is cue #8183
-
-8184
-02:16:24.000 --> 02:16:25.000
-This is cue #8184
-
-8185
-02:16:25.000 --> 02:16:26.000
-This is cue #8185
-
-8186
-02:16:26.000 --> 02:16:27.000
-This is cue #8186
-
-8187
-02:16:27.000 --> 02:16:28.000
-This is cue #8187
-
-8188
-02:16:28.000 --> 02:16:29.000
-This is cue #8188
-
-8189
-02:16:29.000 --> 02:16:30.000
-This is cue #8189
-
-8190
-02:16:30.000 --> 02:16:31.000
-This is cue #8190
-
-8191
-02:16:31.000 --> 02:16:32.000
-This is cue #8191
-
-8192
-02:16:32.000 --> 02:16:33.000
-This is cue #8192
-
-8193
-02:16:33.000 --> 02:16:34.000
-This is cue #8193
-
-8194
-02:16:34.000 --> 02:16:35.000
-This is cue #8194
-
-8195
-02:16:35.000 --> 02:16:36.000
-This is cue #8195
-
-8196
-02:16:36.000 --> 02:16:37.000
-This is cue #8196
-
-8197
-02:16:37.000 --> 02:16:38.000
-This is cue #8197
-
-8198
-02:16:38.000 --> 02:16:39.000
-This is cue #8198
-
-8199
-02:16:39.000 --> 02:16:40.000
-This is cue #8199
-
-8200
-02:16:40.000 --> 02:16:41.000
-This is cue #8200
-
-8201
-02:16:41.000 --> 02:16:42.000
-This is cue #8201
-
-8202
-02:16:42.000 --> 02:16:43.000
-This is cue #8202
-
-8203
-02:16:43.000 --> 02:16:44.000
-This is cue #8203
-
-8204
-02:16:44.000 --> 02:16:45.000
-This is cue #8204
-
-8205
-02:16:45.000 --> 02:16:46.000
-This is cue #8205
-
-8206
-02:16:46.000 --> 02:16:47.000
-This is cue #8206
-
-8207
-02:16:47.000 --> 02:16:48.000
-This is cue #8207
-
-8208
-02:16:48.000 --> 02:16:49.000
-This is cue #8208
-
-8209
-02:16:49.000 --> 02:16:50.000
-This is cue #8209
-
-8210
-02:16:50.000 --> 02:16:51.000
-This is cue #8210
-
-8211
-02:16:51.000 --> 02:16:52.000
-This is cue #8211
-
-8212
-02:16:52.000 --> 02:16:53.000
-This is cue #8212
-
-8213
-02:16:53.000 --> 02:16:54.000
-This is cue #8213
-
-8214
-02:16:54.000 --> 02:16:55.000
-This is cue #8214
-
-8215
-02:16:55.000 --> 02:16:56.000
-This is cue #8215
-
-8216
-02:16:56.000 --> 02:16:57.000
-This is cue #8216
-
-8217
-02:16:57.000 --> 02:16:58.000
-This is cue #8217
-
-8218
-02:16:58.000 --> 02:16:59.000
-This is cue #8218
-
-8219
-02:16:59.000 --> 02:17:00.000
-This is cue #8219
-
-8220
-02:17:00.000 --> 02:17:01.000
-This is cue #8220
-
-8221
-02:17:01.000 --> 02:17:02.000
-This is cue #8221
-
-8222
-02:17:02.000 --> 02:17:03.000
-This is cue #8222
-
-8223
-02:17:03.000 --> 02:17:04.000
-This is cue #8223
-
-8224
-02:17:04.000 --> 02:17:05.000
-This is cue #8224
-
-8225
-02:17:05.000 --> 02:17:06.000
-This is cue #8225
-
-8226
-02:17:06.000 --> 02:17:07.000
-This is cue #8226
-
-8227
-02:17:07.000 --> 02:17:08.000
-This is cue #8227
-
-8228
-02:17:08.000 --> 02:17:09.000
-This is cue #8228
-
-8229
-02:17:09.000 --> 02:17:10.000
-This is cue #8229
-
-8230
-02:17:10.000 --> 02:17:11.000
-This is cue #8230
-
-8231
-02:17:11.000 --> 02:17:12.000
-This is cue #8231
-
-8232
-02:17:12.000 --> 02:17:13.000
-This is cue #8232
-
-8233
-02:17:13.000 --> 02:17:14.000
-This is cue #8233
-
-8234
-02:17:14.000 --> 02:17:15.000
-This is cue #8234
-
-8235
-02:17:15.000 --> 02:17:16.000
-This is cue #8235
-
-8236
-02:17:16.000 --> 02:17:17.000
-This is cue #8236
-
-8237
-02:17:17.000 --> 02:17:18.000
-This is cue #8237
-
-8238
-02:17:18.000 --> 02:17:19.000
-This is cue #8238
-
-8239
-02:17:19.000 --> 02:17:20.000
-This is cue #8239
-
-8240
-02:17:20.000 --> 02:17:21.000
-This is cue #8240
-
-8241
-02:17:21.000 --> 02:17:22.000
-This is cue #8241
-
-8242
-02:17:22.000 --> 02:17:23.000
-This is cue #8242
-
-8243
-02:17:23.000 --> 02:17:24.000
-This is cue #8243
-
-8244
-02:17:24.000 --> 02:17:25.000
-This is cue #8244
-
-8245
-02:17:25.000 --> 02:17:26.000
-This is cue #8245
-
-8246
-02:17:26.000 --> 02:17:27.000
-This is cue #8246
-
-8247
-02:17:27.000 --> 02:17:28.000
-This is cue #8247
-
-8248
-02:17:28.000 --> 02:17:29.000
-This is cue #8248
-
-8249
-02:17:29.000 --> 02:17:30.000
-This is cue #8249
-
-8250
-02:17:30.000 --> 02:17:31.000
-This is cue #8250
-
-8251
-02:17:31.000 --> 02:17:32.000
-This is cue #8251
-
-8252
-02:17:32.000 --> 02:17:33.000
-This is cue #8252
-
-8253
-02:17:33.000 --> 02:17:34.000
-This is cue #8253
-
-8254
-02:17:34.000 --> 02:17:35.000
-This is cue #8254
-
-8255
-02:17:35.000 --> 02:17:36.000
-This is cue #8255
-
-8256
-02:17:36.000 --> 02:17:37.000
-This is cue #8256
-
-8257
-02:17:37.000 --> 02:17:38.000
-This is cue #8257
-
-8258
-02:17:38.000 --> 02:17:39.000
-This is cue #8258
-
-8259
-02:17:39.000 --> 02:17:40.000
-This is cue #8259
-
-8260
-02:17:40.000 --> 02:17:41.000
-This is cue #8260
-
-8261
-02:17:41.000 --> 02:17:42.000
-This is cue #8261
-
-8262
-02:17:42.000 --> 02:17:43.000
-This is cue #8262
-
-8263
-02:17:43.000 --> 02:17:44.000
-This is cue #8263
-
-8264
-02:17:44.000 --> 02:17:45.000
-This is cue #8264
-
-8265
-02:17:45.000 --> 02:17:46.000
-This is cue #8265
-
-8266
-02:17:46.000 --> 02:17:47.000
-This is cue #8266
-
-8267
-02:17:47.000 --> 02:17:48.000
-This is cue #8267
-
-8268
-02:17:48.000 --> 02:17:49.000
-This is cue #8268
-
-8269
-02:17:49.000 --> 02:17:50.000
-This is cue #8269
-
-8270
-02:17:50.000 --> 02:17:51.000
-This is cue #8270
-
-8271
-02:17:51.000 --> 02:17:52.000
-This is cue #8271
-
-8272
-02:17:52.000 --> 02:17:53.000
-This is cue #8272
-
-8273
-02:17:53.000 --> 02:17:54.000
-This is cue #8273
-
-8274
-02:17:54.000 --> 02:17:55.000
-This is cue #8274
-
-8275
-02:17:55.000 --> 02:17:56.000
-This is cue #8275
-
-8276
-02:17:56.000 --> 02:17:57.000
-This is cue #8276
-
-8277
-02:17:57.000 --> 02:17:58.000
-This is cue #8277
-
-8278
-02:17:58.000 --> 02:17:59.000
-This is cue #8278
-
-8279
-02:17:59.000 --> 02:18:00.000
-This is cue #8279
-
-8280
-02:18:00.000 --> 02:18:01.000
-This is cue #8280
-
-8281
-02:18:01.000 --> 02:18:02.000
-This is cue #8281
-
-8282
-02:18:02.000 --> 02:18:03.000
-This is cue #8282
-
-8283
-02:18:03.000 --> 02:18:04.000
-This is cue #8283
-
-8284
-02:18:04.000 --> 02:18:05.000
-This is cue #8284
-
-8285
-02:18:05.000 --> 02:18:06.000
-This is cue #8285
-
-8286
-02:18:06.000 --> 02:18:07.000
-This is cue #8286
-
-8287
-02:18:07.000 --> 02:18:08.000
-This is cue #8287
-
-8288
-02:18:08.000 --> 02:18:09.000
-This is cue #8288
-
-8289
-02:18:09.000 --> 02:18:10.000
-This is cue #8289
-
-8290
-02:18:10.000 --> 02:18:11.000
-This is cue #8290
-
-8291
-02:18:11.000 --> 02:18:12.000
-This is cue #8291
-
-8292
-02:18:12.000 --> 02:18:13.000
-This is cue #8292
-
-8293
-02:18:13.000 --> 02:18:14.000
-This is cue #8293
-
-8294
-02:18:14.000 --> 02:18:15.000
-This is cue #8294
-
-8295
-02:18:15.000 --> 02:18:16.000
-This is cue #8295
-
-8296
-02:18:16.000 --> 02:18:17.000
-This is cue #8296
-
-8297
-02:18:17.000 --> 02:18:18.000
-This is cue #8297
-
-8298
-02:18:18.000 --> 02:18:19.000
-This is cue #8298
-
-8299
-02:18:19.000 --> 02:18:20.000
-This is cue #8299
-
-8300
-02:18:20.000 --> 02:18:21.000
-This is cue #8300
-
-8301
-02:18:21.000 --> 02:18:22.000
-This is cue #8301
-
-8302
-02:18:22.000 --> 02:18:23.000
-This is cue #8302
-
-8303
-02:18:23.000 --> 02:18:24.000
-This is cue #8303
-
-8304
-02:18:24.000 --> 02:18:25.000
-This is cue #8304
-
-8305
-02:18:25.000 --> 02:18:26.000
-This is cue #8305
-
-8306
-02:18:26.000 --> 02:18:27.000
-This is cue #8306
-
-8307
-02:18:27.000 --> 02:18:28.000
-This is cue #8307
-
-8308
-02:18:28.000 --> 02:18:29.000
-This is cue #8308
-
-8309
-02:18:29.000 --> 02:18:30.000
-This is cue #8309
-
-8310
-02:18:30.000 --> 02:18:31.000
-This is cue #8310
-
-8311
-02:18:31.000 --> 02:18:32.000
-This is cue #8311
-
-8312
-02:18:32.000 --> 02:18:33.000
-This is cue #8312
-
-8313
-02:18:33.000 --> 02:18:34.000
-This is cue #8313
-
-8314
-02:18:34.000 --> 02:18:35.000
-This is cue #8314
-
-8315
-02:18:35.000 --> 02:18:36.000
-This is cue #8315
-
-8316
-02:18:36.000 --> 02:18:37.000
-This is cue #8316
-
-8317
-02:18:37.000 --> 02:18:38.000
-This is cue #8317
-
-8318
-02:18:38.000 --> 02:18:39.000
-This is cue #8318
-
-8319
-02:18:39.000 --> 02:18:40.000
-This is cue #8319
-
-8320
-02:18:40.000 --> 02:18:41.000
-This is cue #8320
-
-8321
-02:18:41.000 --> 02:18:42.000
-This is cue #8321
-
-8322
-02:18:42.000 --> 02:18:43.000
-This is cue #8322
-
-8323
-02:18:43.000 --> 02:18:44.000
-This is cue #8323
-
-8324
-02:18:44.000 --> 02:18:45.000
-This is cue #8324
-
-8325
-02:18:45.000 --> 02:18:46.000
-This is cue #8325
-
-8326
-02:18:46.000 --> 02:18:47.000
-This is cue #8326
-
-8327
-02:18:47.000 --> 02:18:48.000
-This is cue #8327
-
-8328
-02:18:48.000 --> 02:18:49.000
-This is cue #8328
-
-8329
-02:18:49.000 --> 02:18:50.000
-This is cue #8329
-
-8330
-02:18:50.000 --> 02:18:51.000
-This is cue #8330
-
-8331
-02:18:51.000 --> 02:18:52.000
-This is cue #8331
-
-8332
-02:18:52.000 --> 02:18:53.000
-This is cue #8332
-
-8333
-02:18:53.000 --> 02:18:54.000
-This is cue #8333
-
-8334
-02:18:54.000 --> 02:18:55.000
-This is cue #8334
-
-8335
-02:18:55.000 --> 02:18:56.000
-This is cue #8335
-
-8336
-02:18:56.000 --> 02:18:57.000
-This is cue #8336
-
-8337
-02:18:57.000 --> 02:18:58.000
-This is cue #8337
-
-8338
-02:18:58.000 --> 02:18:59.000
-This is cue #8338
-
-8339
-02:18:59.000 --> 02:19:00.000
-This is cue #8339
-
-8340
-02:19:00.000 --> 02:19:01.000
-This is cue #8340
-
-8341
-02:19:01.000 --> 02:19:02.000
-This is cue #8341
-
-8342
-02:19:02.000 --> 02:19:03.000
-This is cue #8342
-
-8343
-02:19:03.000 --> 02:19:04.000
-This is cue #8343
-
-8344
-02:19:04.000 --> 02:19:05.000
-This is cue #8344
-
-8345
-02:19:05.000 --> 02:19:06.000
-This is cue #8345
-
-8346
-02:19:06.000 --> 02:19:07.000
-This is cue #8346
-
-8347
-02:19:07.000 --> 02:19:08.000
-This is cue #8347
-
-8348
-02:19:08.000 --> 02:19:09.000
-This is cue #8348
-
-8349
-02:19:09.000 --> 02:19:10.000
-This is cue #8349
-
-8350
-02:19:10.000 --> 02:19:11.000
-This is cue #8350
-
-8351
-02:19:11.000 --> 02:19:12.000
-This is cue #8351
-
-8352
-02:19:12.000 --> 02:19:13.000
-This is cue #8352
-
-8353
-02:19:13.000 --> 02:19:14.000
-This is cue #8353
-
-8354
-02:19:14.000 --> 02:19:15.000
-This is cue #8354
-
-8355
-02:19:15.000 --> 02:19:16.000
-This is cue #8355
-
-8356
-02:19:16.000 --> 02:19:17.000
-This is cue #8356
-
-8357
-02:19:17.000 --> 02:19:18.000
-This is cue #8357
-
-8358
-02:19:18.000 --> 02:19:19.000
-This is cue #8358
-
-8359
-02:19:19.000 --> 02:19:20.000
-This is cue #8359
-
-8360
-02:19:20.000 --> 02:19:21.000
-This is cue #8360
-
-8361
-02:19:21.000 --> 02:19:22.000
-This is cue #8361
-
-8362
-02:19:22.000 --> 02:19:23.000
-This is cue #8362
-
-8363
-02:19:23.000 --> 02:19:24.000
-This is cue #8363
-
-8364
-02:19:24.000 --> 02:19:25.000
-This is cue #8364
-
-8365
-02:19:25.000 --> 02:19:26.000
-This is cue #8365
-
-8366
-02:19:26.000 --> 02:19:27.000
-This is cue #8366
-
-8367
-02:19:27.000 --> 02:19:28.000
-This is cue #8367
-
-8368
-02:19:28.000 --> 02:19:29.000
-This is cue #8368
-
-8369
-02:19:29.000 --> 02:19:30.000
-This is cue #8369
-
-8370
-02:19:30.000 --> 02:19:31.000
-This is cue #8370
-
-8371
-02:19:31.000 --> 02:19:32.000
-This is cue #8371
-
-8372
-02:19:32.000 --> 02:19:33.000
-This is cue #8372
-
-8373
-02:19:33.000 --> 02:19:34.000
-This is cue #8373
-
-8374
-02:19:34.000 --> 02:19:35.000
-This is cue #8374
-
-8375
-02:19:35.000 --> 02:19:36.000
-This is cue #8375
-
-8376
-02:19:36.000 --> 02:19:37.000
-This is cue #8376
-
-8377
-02:19:37.000 --> 02:19:38.000
-This is cue #8377
-
-8378
-02:19:38.000 --> 02:19:39.000
-This is cue #8378
-
-8379
-02:19:39.000 --> 02:19:40.000
-This is cue #8379
-
-8380
-02:19:40.000 --> 02:19:41.000
-This is cue #8380
-
-8381
-02:19:41.000 --> 02:19:42.000
-This is cue #8381
-
-8382
-02:19:42.000 --> 02:19:43.000
-This is cue #8382
-
-8383
-02:19:43.000 --> 02:19:44.000
-This is cue #8383
-
-8384
-02:19:44.000 --> 02:19:45.000
-This is cue #8384
-
-8385
-02:19:45.000 --> 02:19:46.000
-This is cue #8385
-
-8386
-02:19:46.000 --> 02:19:47.000
-This is cue #8386
-
-8387
-02:19:47.000 --> 02:19:48.000
-This is cue #8387
-
-8388
-02:19:48.000 --> 02:19:49.000
-This is cue #8388
-
-8389
-02:19:49.000 --> 02:19:50.000
-This is cue #8389
-
-8390
-02:19:50.000 --> 02:19:51.000
-This is cue #8390
-
-8391
-02:19:51.000 --> 02:19:52.000
-This is cue #8391
-
-8392
-02:19:52.000 --> 02:19:53.000
-This is cue #8392
-
-8393
-02:19:53.000 --> 02:19:54.000
-This is cue #8393
-
-8394
-02:19:54.000 --> 02:19:55.000
-This is cue #8394
-
-8395
-02:19:55.000 --> 02:19:56.000
-This is cue #8395
-
-8396
-02:19:56.000 --> 02:19:57.000
-This is cue #8396
-
-8397
-02:19:57.000 --> 02:19:58.000
-This is cue #8397
-
-8398
-02:19:58.000 --> 02:19:59.000
-This is cue #8398
-
-8399
-02:19:59.000 --> 02:20:00.000
-This is cue #8399
-
-8400
-02:20:00.000 --> 02:20:01.000
-This is cue #8400
-
-8401
-02:20:01.000 --> 02:20:02.000
-This is cue #8401
-
-8402
-02:20:02.000 --> 02:20:03.000
-This is cue #8402
-
-8403
-02:20:03.000 --> 02:20:04.000
-This is cue #8403
-
-8404
-02:20:04.000 --> 02:20:05.000
-This is cue #8404
-
-8405
-02:20:05.000 --> 02:20:06.000
-This is cue #8405
-
-8406
-02:20:06.000 --> 02:20:07.000
-This is cue #8406
-
-8407
-02:20:07.000 --> 02:20:08.000
-This is cue #8407
-
-8408
-02:20:08.000 --> 02:20:09.000
-This is cue #8408
-
-8409
-02:20:09.000 --> 02:20:10.000
-This is cue #8409
-
-8410
-02:20:10.000 --> 02:20:11.000
-This is cue #8410
-
-8411
-02:20:11.000 --> 02:20:12.000
-This is cue #8411
-
-8412
-02:20:12.000 --> 02:20:13.000
-This is cue #8412
-
-8413
-02:20:13.000 --> 02:20:14.000
-This is cue #8413
-
-8414
-02:20:14.000 --> 02:20:15.000
-This is cue #8414
-
-8415
-02:20:15.000 --> 02:20:16.000
-This is cue #8415
-
-8416
-02:20:16.000 --> 02:20:17.000
-This is cue #8416
-
-8417
-02:20:17.000 --> 02:20:18.000
-This is cue #8417
-
-8418
-02:20:18.000 --> 02:20:19.000
-This is cue #8418
-
-8419
-02:20:19.000 --> 02:20:20.000
-This is cue #8419
-
-8420
-02:20:20.000 --> 02:20:21.000
-This is cue #8420
-
-8421
-02:20:21.000 --> 02:20:22.000
-This is cue #8421
-
-8422
-02:20:22.000 --> 02:20:23.000
-This is cue #8422
-
-8423
-02:20:23.000 --> 02:20:24.000
-This is cue #8423
-
-8424
-02:20:24.000 --> 02:20:25.000
-This is cue #8424
-
-8425
-02:20:25.000 --> 02:20:26.000
-This is cue #8425
-
-8426
-02:20:26.000 --> 02:20:27.000
-This is cue #8426
-
-8427
-02:20:27.000 --> 02:20:28.000
-This is cue #8427
-
-8428
-02:20:28.000 --> 02:20:29.000
-This is cue #8428
-
-8429
-02:20:29.000 --> 02:20:30.000
-This is cue #8429
-
-8430
-02:20:30.000 --> 02:20:31.000
-This is cue #8430
-
-8431
-02:20:31.000 --> 02:20:32.000
-This is cue #8431
-
-8432
-02:20:32.000 --> 02:20:33.000
-This is cue #8432
-
-8433
-02:20:33.000 --> 02:20:34.000
-This is cue #8433
-
-8434
-02:20:34.000 --> 02:20:35.000
-This is cue #8434
-
-8435
-02:20:35.000 --> 02:20:36.000
-This is cue #8435
-
-8436
-02:20:36.000 --> 02:20:37.000
-This is cue #8436
-
-8437
-02:20:37.000 --> 02:20:38.000
-This is cue #8437
-
-8438
-02:20:38.000 --> 02:20:39.000
-This is cue #8438
-
-8439
-02:20:39.000 --> 02:20:40.000
-This is cue #8439
-
-8440
-02:20:40.000 --> 02:20:41.000
-This is cue #8440
-
-8441
-02:20:41.000 --> 02:20:42.000
-This is cue #8441
-
-8442
-02:20:42.000 --> 02:20:43.000
-This is cue #8442
-
-8443
-02:20:43.000 --> 02:20:44.000
-This is cue #8443
-
-8444
-02:20:44.000 --> 02:20:45.000
-This is cue #8444
-
-8445
-02:20:45.000 --> 02:20:46.000
-This is cue #8445
-
-8446
-02:20:46.000 --> 02:20:47.000
-This is cue #8446
-
-8447
-02:20:47.000 --> 02:20:48.000
-This is cue #8447
-
-8448
-02:20:48.000 --> 02:20:49.000
-This is cue #8448
-
-8449
-02:20:49.000 --> 02:20:50.000
-This is cue #8449
-
-8450
-02:20:50.000 --> 02:20:51.000
-This is cue #8450
-
-8451
-02:20:51.000 --> 02:20:52.000
-This is cue #8451
-
-8452
-02:20:52.000 --> 02:20:53.000
-This is cue #8452
-
-8453
-02:20:53.000 --> 02:20:54.000
-This is cue #8453
-
-8454
-02:20:54.000 --> 02:20:55.000
-This is cue #8454
-
-8455
-02:20:55.000 --> 02:20:56.000
-This is cue #8455
-
-8456
-02:20:56.000 --> 02:20:57.000
-This is cue #8456
-
-8457
-02:20:57.000 --> 02:20:58.000
-This is cue #8457
-
-8458
-02:20:58.000 --> 02:20:59.000
-This is cue #8458
-
-8459
-02:20:59.000 --> 02:21:00.000
-This is cue #8459
-
-8460
-02:21:00.000 --> 02:21:01.000
-This is cue #8460
-
-8461
-02:21:01.000 --> 02:21:02.000
-This is cue #8461
-
-8462
-02:21:02.000 --> 02:21:03.000
-This is cue #8462
-
-8463
-02:21:03.000 --> 02:21:04.000
-This is cue #8463
-
-8464
-02:21:04.000 --> 02:21:05.000
-This is cue #8464
-
-8465
-02:21:05.000 --> 02:21:06.000
-This is cue #8465
-
-8466
-02:21:06.000 --> 02:21:07.000
-This is cue #8466
-
-8467
-02:21:07.000 --> 02:21:08.000
-This is cue #8467
-
-8468
-02:21:08.000 --> 02:21:09.000
-This is cue #8468
-
-8469
-02:21:09.000 --> 02:21:10.000
-This is cue #8469
-
-8470
-02:21:10.000 --> 02:21:11.000
-This is cue #8470
-
-8471
-02:21:11.000 --> 02:21:12.000
-This is cue #8471
-
-8472
-02:21:12.000 --> 02:21:13.000
-This is cue #8472
-
-8473
-02:21:13.000 --> 02:21:14.000
-This is cue #8473
-
-8474
-02:21:14.000 --> 02:21:15.000
-This is cue #8474
-
-8475
-02:21:15.000 --> 02:21:16.000
-This is cue #8475
-
-8476
-02:21:16.000 --> 02:21:17.000
-This is cue #8476
-
-8477
-02:21:17.000 --> 02:21:18.000
-This is cue #8477
-
-8478
-02:21:18.000 --> 02:21:19.000
-This is cue #8478
-
-8479
-02:21:19.000 --> 02:21:20.000
-This is cue #8479
-
-8480
-02:21:20.000 --> 02:21:21.000
-This is cue #8480
-
-8481
-02:21:21.000 --> 02:21:22.000
-This is cue #8481
-
-8482
-02:21:22.000 --> 02:21:23.000
-This is cue #8482
-
-8483
-02:21:23.000 --> 02:21:24.000
-This is cue #8483
-
-8484
-02:21:24.000 --> 02:21:25.000
-This is cue #8484
-
-8485
-02:21:25.000 --> 02:21:26.000
-This is cue #8485
-
-8486
-02:21:26.000 --> 02:21:27.000
-This is cue #8486
-
-8487
-02:21:27.000 --> 02:21:28.000
-This is cue #8487
-
-8488
-02:21:28.000 --> 02:21:29.000
-This is cue #8488
-
-8489
-02:21:29.000 --> 02:21:30.000
-This is cue #8489
-
-8490
-02:21:30.000 --> 02:21:31.000
-This is cue #8490
-
-8491
-02:21:31.000 --> 02:21:32.000
-This is cue #8491
-
-8492
-02:21:32.000 --> 02:21:33.000
-This is cue #8492
-
-8493
-02:21:33.000 --> 02:21:34.000
-This is cue #8493
-
-8494
-02:21:34.000 --> 02:21:35.000
-This is cue #8494
-
-8495
-02:21:35.000 --> 02:21:36.000
-This is cue #8495
-
-8496
-02:21:36.000 --> 02:21:37.000
-This is cue #8496
-
-8497
-02:21:37.000 --> 02:21:38.000
-This is cue #8497
-
-8498
-02:21:38.000 --> 02:21:39.000
-This is cue #8498
-
-8499
-02:21:39.000 --> 02:21:40.000
-This is cue #8499
-
-8500
-02:21:40.000 --> 02:21:41.000
-This is cue #8500
-
-8501
-02:21:41.000 --> 02:21:42.000
-This is cue #8501
-
-8502
-02:21:42.000 --> 02:21:43.000
-This is cue #8502
-
-8503
-02:21:43.000 --> 02:21:44.000
-This is cue #8503
-
-8504
-02:21:44.000 --> 02:21:45.000
-This is cue #8504
-
-8505
-02:21:45.000 --> 02:21:46.000
-This is cue #8505
-
-8506
-02:21:46.000 --> 02:21:47.000
-This is cue #8506
-
-8507
-02:21:47.000 --> 02:21:48.000
-This is cue #8507
-
-8508
-02:21:48.000 --> 02:21:49.000
-This is cue #8508
-
-8509
-02:21:49.000 --> 02:21:50.000
-This is cue #8509
-
-8510
-02:21:50.000 --> 02:21:51.000
-This is cue #8510
-
-8511
-02:21:51.000 --> 02:21:52.000
-This is cue #8511
-
-8512
-02:21:52.000 --> 02:21:53.000
-This is cue #8512
-
-8513
-02:21:53.000 --> 02:21:54.000
-This is cue #8513
-
-8514
-02:21:54.000 --> 02:21:55.000
-This is cue #8514
-
-8515
-02:21:55.000 --> 02:21:56.000
-This is cue #8515
-
-8516
-02:21:56.000 --> 02:21:57.000
-This is cue #8516
-
-8517
-02:21:57.000 --> 02:21:58.000
-This is cue #8517
-
-8518
-02:21:58.000 --> 02:21:59.000
-This is cue #8518
-
-8519
-02:21:59.000 --> 02:22:00.000
-This is cue #8519
-
-8520
-02:22:00.000 --> 02:22:01.000
-This is cue #8520
-
-8521
-02:22:01.000 --> 02:22:02.000
-This is cue #8521
-
-8522
-02:22:02.000 --> 02:22:03.000
-This is cue #8522
-
-8523
-02:22:03.000 --> 02:22:04.000
-This is cue #8523
-
-8524
-02:22:04.000 --> 02:22:05.000
-This is cue #8524
-
-8525
-02:22:05.000 --> 02:22:06.000
-This is cue #8525
-
-8526
-02:22:06.000 --> 02:22:07.000
-This is cue #8526
-
-8527
-02:22:07.000 --> 02:22:08.000
-This is cue #8527
-
-8528
-02:22:08.000 --> 02:22:09.000
-This is cue #8528
-
-8529
-02:22:09.000 --> 02:22:10.000
-This is cue #8529
-
-8530
-02:22:10.000 --> 02:22:11.000
-This is cue #8530
-
-8531
-02:22:11.000 --> 02:22:12.000
-This is cue #8531
-
-8532
-02:22:12.000 --> 02:22:13.000
-This is cue #8532
-
-8533
-02:22:13.000 --> 02:22:14.000
-This is cue #8533
-
-8534
-02:22:14.000 --> 02:22:15.000
-This is cue #8534
-
-8535
-02:22:15.000 --> 02:22:16.000
-This is cue #8535
-
-8536
-02:22:16.000 --> 02:22:17.000
-This is cue #8536
-
-8537
-02:22:17.000 --> 02:22:18.000
-This is cue #8537
-
-8538
-02:22:18.000 --> 02:22:19.000
-This is cue #8538
-
-8539
-02:22:19.000 --> 02:22:20.000
-This is cue #8539
-
-8540
-02:22:20.000 --> 02:22:21.000
-This is cue #8540
-
-8541
-02:22:21.000 --> 02:22:22.000
-This is cue #8541
-
-8542
-02:22:22.000 --> 02:22:23.000
-This is cue #8542
-
-8543
-02:22:23.000 --> 02:22:24.000
-This is cue #8543
-
-8544
-02:22:24.000 --> 02:22:25.000
-This is cue #8544
-
-8545
-02:22:25.000 --> 02:22:26.000
-This is cue #8545
-
-8546
-02:22:26.000 --> 02:22:27.000
-This is cue #8546
-
-8547
-02:22:27.000 --> 02:22:28.000
-This is cue #8547
-
-8548
-02:22:28.000 --> 02:22:29.000
-This is cue #8548
-
-8549
-02:22:29.000 --> 02:22:30.000
-This is cue #8549
-
-8550
-02:22:30.000 --> 02:22:31.000
-This is cue #8550
-
-8551
-02:22:31.000 --> 02:22:32.000
-This is cue #8551
-
-8552
-02:22:32.000 --> 02:22:33.000
-This is cue #8552
-
-8553
-02:22:33.000 --> 02:22:34.000
-This is cue #8553
-
-8554
-02:22:34.000 --> 02:22:35.000
-This is cue #8554
-
-8555
-02:22:35.000 --> 02:22:36.000
-This is cue #8555
-
-8556
-02:22:36.000 --> 02:22:37.000
-This is cue #8556
-
-8557
-02:22:37.000 --> 02:22:38.000
-This is cue #8557
-
-8558
-02:22:38.000 --> 02:22:39.000
-This is cue #8558
-
-8559
-02:22:39.000 --> 02:22:40.000
-This is cue #8559
-
-8560
-02:22:40.000 --> 02:22:41.000
-This is cue #8560
-
-8561
-02:22:41.000 --> 02:22:42.000
-This is cue #8561
-
-8562
-02:22:42.000 --> 02:22:43.000
-This is cue #8562
-
-8563
-02:22:43.000 --> 02:22:44.000
-This is cue #8563
-
-8564
-02:22:44.000 --> 02:22:45.000
-This is cue #8564
-
-8565
-02:22:45.000 --> 02:22:46.000
-This is cue #8565
-
-8566
-02:22:46.000 --> 02:22:47.000
-This is cue #8566
-
-8567
-02:22:47.000 --> 02:22:48.000
-This is cue #8567
-
-8568
-02:22:48.000 --> 02:22:49.000
-This is cue #8568
-
-8569
-02:22:49.000 --> 02:22:50.000
-This is cue #8569
-
-8570
-02:22:50.000 --> 02:22:51.000
-This is cue #8570
-
-8571
-02:22:51.000 --> 02:22:52.000
-This is cue #8571
-
-8572
-02:22:52.000 --> 02:22:53.000
-This is cue #8572
-
-8573
-02:22:53.000 --> 02:22:54.000
-This is cue #8573
-
-8574
-02:22:54.000 --> 02:22:55.000
-This is cue #8574
-
-8575
-02:22:55.000 --> 02:22:56.000
-This is cue #8575
-
-8576
-02:22:56.000 --> 02:22:57.000
-This is cue #8576
-
-8577
-02:22:57.000 --> 02:22:58.000
-This is cue #8577
-
-8578
-02:22:58.000 --> 02:22:59.000
-This is cue #8578
-
-8579
-02:22:59.000 --> 02:23:00.000
-This is cue #8579
-
-8580
-02:23:00.000 --> 02:23:01.000
-This is cue #8580
-
-8581
-02:23:01.000 --> 02:23:02.000
-This is cue #8581
-
-8582
-02:23:02.000 --> 02:23:03.000
-This is cue #8582
-
-8583
-02:23:03.000 --> 02:23:04.000
-This is cue #8583
-
-8584
-02:23:04.000 --> 02:23:05.000
-This is cue #8584
-
-8585
-02:23:05.000 --> 02:23:06.000
-This is cue #8585
-
-8586
-02:23:06.000 --> 02:23:07.000
-This is cue #8586
-
-8587
-02:23:07.000 --> 02:23:08.000
-This is cue #8587
-
-8588
-02:23:08.000 --> 02:23:09.000
-This is cue #8588
-
-8589
-02:23:09.000 --> 02:23:10.000
-This is cue #8589
-
-8590
-02:23:10.000 --> 02:23:11.000
-This is cue #8590
-
-8591
-02:23:11.000 --> 02:23:12.000
-This is cue #8591
-
-8592
-02:23:12.000 --> 02:23:13.000
-This is cue #8592
-
-8593
-02:23:13.000 --> 02:23:14.000
-This is cue #8593
-
-8594
-02:23:14.000 --> 02:23:15.000
-This is cue #8594
-
-8595
-02:23:15.000 --> 02:23:16.000
-This is cue #8595
-
-8596
-02:23:16.000 --> 02:23:17.000
-This is cue #8596
-
-8597
-02:23:17.000 --> 02:23:18.000
-This is cue #8597
-
-8598
-02:23:18.000 --> 02:23:19.000
-This is cue #8598
-
-8599
-02:23:19.000 --> 02:23:20.000
-This is cue #8599
-
-8600
-02:23:20.000 --> 02:23:21.000
-This is cue #8600
-
-8601
-02:23:21.000 --> 02:23:22.000
-This is cue #8601
-
-8602
-02:23:22.000 --> 02:23:23.000
-This is cue #8602
-
-8603
-02:23:23.000 --> 02:23:24.000
-This is cue #8603
-
-8604
-02:23:24.000 --> 02:23:25.000
-This is cue #8604
-
-8605
-02:23:25.000 --> 02:23:26.000
-This is cue #8605
-
-8606
-02:23:26.000 --> 02:23:27.000
-This is cue #8606
-
-8607
-02:23:27.000 --> 02:23:28.000
-This is cue #8607
-
-8608
-02:23:28.000 --> 02:23:29.000
-This is cue #8608
-
-8609
-02:23:29.000 --> 02:23:30.000
-This is cue #8609
-
-8610
-02:23:30.000 --> 02:23:31.000
-This is cue #8610
-
-8611
-02:23:31.000 --> 02:23:32.000
-This is cue #8611
-
-8612
-02:23:32.000 --> 02:23:33.000
-This is cue #8612
-
-8613
-02:23:33.000 --> 02:23:34.000
-This is cue #8613
-
-8614
-02:23:34.000 --> 02:23:35.000
-This is cue #8614
-
-8615
-02:23:35.000 --> 02:23:36.000
-This is cue #8615
-
-8616
-02:23:36.000 --> 02:23:37.000
-This is cue #8616
-
-8617
-02:23:37.000 --> 02:23:38.000
-This is cue #8617
-
-8618
-02:23:38.000 --> 02:23:39.000
-This is cue #8618
-
-8619
-02:23:39.000 --> 02:23:40.000
-This is cue #8619
-
-8620
-02:23:40.000 --> 02:23:41.000
-This is cue #8620
-
-8621
-02:23:41.000 --> 02:23:42.000
-This is cue #8621
-
-8622
-02:23:42.000 --> 02:23:43.000
-This is cue #8622
-
-8623
-02:23:43.000 --> 02:23:44.000
-This is cue #8623
-
-8624
-02:23:44.000 --> 02:23:45.000
-This is cue #8624
-
-8625
-02:23:45.000 --> 02:23:46.000
-This is cue #8625
-
-8626
-02:23:46.000 --> 02:23:47.000
-This is cue #8626
-
-8627
-02:23:47.000 --> 02:23:48.000
-This is cue #8627
-
-8628
-02:23:48.000 --> 02:23:49.000
-This is cue #8628
-
-8629
-02:23:49.000 --> 02:23:50.000
-This is cue #8629
-
-8630
-02:23:50.000 --> 02:23:51.000
-This is cue #8630
-
-8631
-02:23:51.000 --> 02:23:52.000
-This is cue #8631
-
-8632
-02:23:52.000 --> 02:23:53.000
-This is cue #8632
-
-8633
-02:23:53.000 --> 02:23:54.000
-This is cue #8633
-
-8634
-02:23:54.000 --> 02:23:55.000
-This is cue #8634
-
-8635
-02:23:55.000 --> 02:23:56.000
-This is cue #8635
-
-8636
-02:23:56.000 --> 02:23:57.000
-This is cue #8636
-
-8637
-02:23:57.000 --> 02:23:58.000
-This is cue #8637
-
-8638
-02:23:58.000 --> 02:23:59.000
-This is cue #8638
-
-8639
-02:23:59.000 --> 02:24:00.000
-This is cue #8639
-
-8640
-02:24:00.000 --> 02:24:01.000
-This is cue #8640
-
-8641
-02:24:01.000 --> 02:24:02.000
-This is cue #8641
-
-8642
-02:24:02.000 --> 02:24:03.000
-This is cue #8642
-
-8643
-02:24:03.000 --> 02:24:04.000
-This is cue #8643
-
-8644
-02:24:04.000 --> 02:24:05.000
-This is cue #8644
-
-8645
-02:24:05.000 --> 02:24:06.000
-This is cue #8645
-
-8646
-02:24:06.000 --> 02:24:07.000
-This is cue #8646
-
-8647
-02:24:07.000 --> 02:24:08.000
-This is cue #8647
-
-8648
-02:24:08.000 --> 02:24:09.000
-This is cue #8648
-
-8649
-02:24:09.000 --> 02:24:10.000
-This is cue #8649
-
-8650
-02:24:10.000 --> 02:24:11.000
-This is cue #8650
-
-8651
-02:24:11.000 --> 02:24:12.000
-This is cue #8651
-
-8652
-02:24:12.000 --> 02:24:13.000
-This is cue #8652
-
-8653
-02:24:13.000 --> 02:24:14.000
-This is cue #8653
-
-8654
-02:24:14.000 --> 02:24:15.000
-This is cue #8654
-
-8655
-02:24:15.000 --> 02:24:16.000
-This is cue #8655
-
-8656
-02:24:16.000 --> 02:24:17.000
-This is cue #8656
-
-8657
-02:24:17.000 --> 02:24:18.000
-This is cue #8657
-
-8658
-02:24:18.000 --> 02:24:19.000
-This is cue #8658
-
-8659
-02:24:19.000 --> 02:24:20.000
-This is cue #8659
-
-8660
-02:24:20.000 --> 02:24:21.000
-This is cue #8660
-
-8661
-02:24:21.000 --> 02:24:22.000
-This is cue #8661
-
-8662
-02:24:22.000 --> 02:24:23.000
-This is cue #8662
-
-8663
-02:24:23.000 --> 02:24:24.000
-This is cue #8663
-
-8664
-02:24:24.000 --> 02:24:25.000
-This is cue #8664
-
-8665
-02:24:25.000 --> 02:24:26.000
-This is cue #8665
-
-8666
-02:24:26.000 --> 02:24:27.000
-This is cue #8666
-
-8667
-02:24:27.000 --> 02:24:28.000
-This is cue #8667
-
-8668
-02:24:28.000 --> 02:24:29.000
-This is cue #8668
-
-8669
-02:24:29.000 --> 02:24:30.000
-This is cue #8669
-
-8670
-02:24:30.000 --> 02:24:31.000
-This is cue #8670
-
-8671
-02:24:31.000 --> 02:24:32.000
-This is cue #8671
-
-8672
-02:24:32.000 --> 02:24:33.000
-This is cue #8672
-
-8673
-02:24:33.000 --> 02:24:34.000
-This is cue #8673
-
-8674
-02:24:34.000 --> 02:24:35.000
-This is cue #8674
-
-8675
-02:24:35.000 --> 02:24:36.000
-This is cue #8675
-
-8676
-02:24:36.000 --> 02:24:37.000
-This is cue #8676
-
-8677
-02:24:37.000 --> 02:24:38.000
-This is cue #8677
-
-8678
-02:24:38.000 --> 02:24:39.000
-This is cue #8678
-
-8679
-02:24:39.000 --> 02:24:40.000
-This is cue #8679
-
-8680
-02:24:40.000 --> 02:24:41.000
-This is cue #8680
-
-8681
-02:24:41.000 --> 02:24:42.000
-This is cue #8681
-
-8682
-02:24:42.000 --> 02:24:43.000
-This is cue #8682
-
-8683
-02:24:43.000 --> 02:24:44.000
-This is cue #8683
-
-8684
-02:24:44.000 --> 02:24:45.000
-This is cue #8684
-
-8685
-02:24:45.000 --> 02:24:46.000
-This is cue #8685
-
-8686
-02:24:46.000 --> 02:24:47.000
-This is cue #8686
-
-8687
-02:24:47.000 --> 02:24:48.000
-This is cue #8687
-
-8688
-02:24:48.000 --> 02:24:49.000
-This is cue #8688
-
-8689
-02:24:49.000 --> 02:24:50.000
-This is cue #8689
-
-8690
-02:24:50.000 --> 02:24:51.000
-This is cue #8690
-
-8691
-02:24:51.000 --> 02:24:52.000
-This is cue #8691
-
-8692
-02:24:52.000 --> 02:24:53.000
-This is cue #8692
-
-8693
-02:24:53.000 --> 02:24:54.000
-This is cue #8693
-
-8694
-02:24:54.000 --> 02:24:55.000
-This is cue #8694
-
-8695
-02:24:55.000 --> 02:24:56.000
-This is cue #8695
-
-8696
-02:24:56.000 --> 02:24:57.000
-This is cue #8696
-
-8697
-02:24:57.000 --> 02:24:58.000
-This is cue #8697
-
-8698
-02:24:58.000 --> 02:24:59.000
-This is cue #8698
-
-8699
-02:24:59.000 --> 02:25:00.000
-This is cue #8699
-
-8700
-02:25:00.000 --> 02:25:01.000
-This is cue #8700
-
-8701
-02:25:01.000 --> 02:25:02.000
-This is cue #8701
-
-8702
-02:25:02.000 --> 02:25:03.000
-This is cue #8702
-
-8703
-02:25:03.000 --> 02:25:04.000
-This is cue #8703
-
-8704
-02:25:04.000 --> 02:25:05.000
-This is cue #8704
-
-8705
-02:25:05.000 --> 02:25:06.000
-This is cue #8705
-
-8706
-02:25:06.000 --> 02:25:07.000
-This is cue #8706
-
-8707
-02:25:07.000 --> 02:25:08.000
-This is cue #8707
-
-8708
-02:25:08.000 --> 02:25:09.000
-This is cue #8708
-
-8709
-02:25:09.000 --> 02:25:10.000
-This is cue #8709
-
-8710
-02:25:10.000 --> 02:25:11.000
-This is cue #8710
-
-8711
-02:25:11.000 --> 02:25:12.000
-This is cue #8711
-
-8712
-02:25:12.000 --> 02:25:13.000
-This is cue #8712
-
-8713
-02:25:13.000 --> 02:25:14.000
-This is cue #8713
-
-8714
-02:25:14.000 --> 02:25:15.000
-This is cue #8714
-
-8715
-02:25:15.000 --> 02:25:16.000
-This is cue #8715
-
-8716
-02:25:16.000 --> 02:25:17.000
-This is cue #8716
-
-8717
-02:25:17.000 --> 02:25:18.000
-This is cue #8717
-
-8718
-02:25:18.000 --> 02:25:19.000
-This is cue #8718
-
-8719
-02:25:19.000 --> 02:25:20.000
-This is cue #8719
-
-8720
-02:25:20.000 --> 02:25:21.000
-This is cue #8720
-
-8721
-02:25:21.000 --> 02:25:22.000
-This is cue #8721
-
-8722
-02:25:22.000 --> 02:25:23.000
-This is cue #8722
-
-8723
-02:25:23.000 --> 02:25:24.000
-This is cue #8723
-
-8724
-02:25:24.000 --> 02:25:25.000
-This is cue #8724
-
-8725
-02:25:25.000 --> 02:25:26.000
-This is cue #8725
-
-8726
-02:25:26.000 --> 02:25:27.000
-This is cue #8726
-
-8727
-02:25:27.000 --> 02:25:28.000
-This is cue #8727
-
-8728
-02:25:28.000 --> 02:25:29.000
-This is cue #8728
-
-8729
-02:25:29.000 --> 02:25:30.000
-This is cue #8729
-
-8730
-02:25:30.000 --> 02:25:31.000
-This is cue #8730
-
-8731
-02:25:31.000 --> 02:25:32.000
-This is cue #8731
-
-8732
-02:25:32.000 --> 02:25:33.000
-This is cue #8732
-
-8733
-02:25:33.000 --> 02:25:34.000
-This is cue #8733
-
-8734
-02:25:34.000 --> 02:25:35.000
-This is cue #8734
-
-8735
-02:25:35.000 --> 02:25:36.000
-This is cue #8735
-
-8736
-02:25:36.000 --> 02:25:37.000
-This is cue #8736
-
-8737
-02:25:37.000 --> 02:25:38.000
-This is cue #8737
-
-8738
-02:25:38.000 --> 02:25:39.000
-This is cue #8738
-
-8739
-02:25:39.000 --> 02:25:40.000
-This is cue #8739
-
-8740
-02:25:40.000 --> 02:25:41.000
-This is cue #8740
-
-8741
-02:25:41.000 --> 02:25:42.000
-This is cue #8741
-
-8742
-02:25:42.000 --> 02:25:43.000
-This is cue #8742
-
-8743
-02:25:43.000 --> 02:25:44.000
-This is cue #8743
-
-8744
-02:25:44.000 --> 02:25:45.000
-This is cue #8744
-
-8745
-02:25:45.000 --> 02:25:46.000
-This is cue #8745
-
-8746
-02:25:46.000 --> 02:25:47.000
-This is cue #8746
-
-8747
-02:25:47.000 --> 02:25:48.000
-This is cue #8747
-
-8748
-02:25:48.000 --> 02:25:49.000
-This is cue #8748
-
-8749
-02:25:49.000 --> 02:25:50.000
-This is cue #8749
-
-8750
-02:25:50.000 --> 02:25:51.000
-This is cue #8750
-
-8751
-02:25:51.000 --> 02:25:52.000
-This is cue #8751
-
-8752
-02:25:52.000 --> 02:25:53.000
-This is cue #8752
-
-8753
-02:25:53.000 --> 02:25:54.000
-This is cue #8753
-
-8754
-02:25:54.000 --> 02:25:55.000
-This is cue #8754
-
-8755
-02:25:55.000 --> 02:25:56.000
-This is cue #8755
-
-8756
-02:25:56.000 --> 02:25:57.000
-This is cue #8756
-
-8757
-02:25:57.000 --> 02:25:58.000
-This is cue #8757
-
-8758
-02:25:58.000 --> 02:25:59.000
-This is cue #8758
-
-8759
-02:25:59.000 --> 02:26:00.000
-This is cue #8759
-
-8760
-02:26:00.000 --> 02:26:01.000
-This is cue #8760
-
-8761
-02:26:01.000 --> 02:26:02.000
-This is cue #8761
-
-8762
-02:26:02.000 --> 02:26:03.000
-This is cue #8762
-
-8763
-02:26:03.000 --> 02:26:04.000
-This is cue #8763
-
-8764
-02:26:04.000 --> 02:26:05.000
-This is cue #8764
-
-8765
-02:26:05.000 --> 02:26:06.000
-This is cue #8765
-
-8766
-02:26:06.000 --> 02:26:07.000
-This is cue #8766
-
-8767
-02:26:07.000 --> 02:26:08.000
-This is cue #8767
-
-8768
-02:26:08.000 --> 02:26:09.000
-This is cue #8768
-
-8769
-02:26:09.000 --> 02:26:10.000
-This is cue #8769
-
-8770
-02:26:10.000 --> 02:26:11.000
-This is cue #8770
-
-8771
-02:26:11.000 --> 02:26:12.000
-This is cue #8771
-
-8772
-02:26:12.000 --> 02:26:13.000
-This is cue #8772
-
-8773
-02:26:13.000 --> 02:26:14.000
-This is cue #8773
-
-8774
-02:26:14.000 --> 02:26:15.000
-This is cue #8774
-
-8775
-02:26:15.000 --> 02:26:16.000
-This is cue #8775
-
-8776
-02:26:16.000 --> 02:26:17.000
-This is cue #8776
-
-8777
-02:26:17.000 --> 02:26:18.000
-This is cue #8777
-
-8778
-02:26:18.000 --> 02:26:19.000
-This is cue #8778
-
-8779
-02:26:19.000 --> 02:26:20.000
-This is cue #8779
-
-8780
-02:26:20.000 --> 02:26:21.000
-This is cue #8780
-
-8781
-02:26:21.000 --> 02:26:22.000
-This is cue #8781
-
-8782
-02:26:22.000 --> 02:26:23.000
-This is cue #8782
-
-8783
-02:26:23.000 --> 02:26:24.000
-This is cue #8783
-
-8784
-02:26:24.000 --> 02:26:25.000
-This is cue #8784
-
-8785
-02:26:25.000 --> 02:26:26.000
-This is cue #8785
-
-8786
-02:26:26.000 --> 02:26:27.000
-This is cue #8786
-
-8787
-02:26:27.000 --> 02:26:28.000
-This is cue #8787
-
-8788
-02:26:28.000 --> 02:26:29.000
-This is cue #8788
-
-8789
-02:26:29.000 --> 02:26:30.000
-This is cue #8789
-
-8790
-02:26:30.000 --> 02:26:31.000
-This is cue #8790
-
-8791
-02:26:31.000 --> 02:26:32.000
-This is cue #8791
-
-8792
-02:26:32.000 --> 02:26:33.000
-This is cue #8792
-
-8793
-02:26:33.000 --> 02:26:34.000
-This is cue #8793
-
-8794
-02:26:34.000 --> 02:26:35.000
-This is cue #8794
-
-8795
-02:26:35.000 --> 02:26:36.000
-This is cue #8795
-
-8796
-02:26:36.000 --> 02:26:37.000
-This is cue #8796
-
-8797
-02:26:37.000 --> 02:26:38.000
-This is cue #8797
-
-8798
-02:26:38.000 --> 02:26:39.000
-This is cue #8798
-
-8799
-02:26:39.000 --> 02:26:40.000
-This is cue #8799
-
-8800
-02:26:40.000 --> 02:26:41.000
-This is cue #8800
-
-8801
-02:26:41.000 --> 02:26:42.000
-This is cue #8801
-
-8802
-02:26:42.000 --> 02:26:43.000
-This is cue #8802
-
-8803
-02:26:43.000 --> 02:26:44.000
-This is cue #8803
-
-8804
-02:26:44.000 --> 02:26:45.000
-This is cue #8804
-
-8805
-02:26:45.000 --> 02:26:46.000
-This is cue #8805
-
-8806
-02:26:46.000 --> 02:26:47.000
-This is cue #8806
-
-8807
-02:26:47.000 --> 02:26:48.000
-This is cue #8807
-
-8808
-02:26:48.000 --> 02:26:49.000
-This is cue #8808
-
-8809
-02:26:49.000 --> 02:26:50.000
-This is cue #8809
-
-8810
-02:26:50.000 --> 02:26:51.000
-This is cue #8810
-
-8811
-02:26:51.000 --> 02:26:52.000
-This is cue #8811
-
-8812
-02:26:52.000 --> 02:26:53.000
-This is cue #8812
-
-8813
-02:26:53.000 --> 02:26:54.000
-This is cue #8813
-
-8814
-02:26:54.000 --> 02:26:55.000
-This is cue #8814
-
-8815
-02:26:55.000 --> 02:26:56.000
-This is cue #8815
-
-8816
-02:26:56.000 --> 02:26:57.000
-This is cue #8816
-
-8817
-02:26:57.000 --> 02:26:58.000
-This is cue #8817
-
-8818
-02:26:58.000 --> 02:26:59.000
-This is cue #8818
-
-8819
-02:26:59.000 --> 02:27:00.000
-This is cue #8819
-
-8820
-02:27:00.000 --> 02:27:01.000
-This is cue #8820
-
-8821
-02:27:01.000 --> 02:27:02.000
-This is cue #8821
-
-8822
-02:27:02.000 --> 02:27:03.000
-This is cue #8822
-
-8823
-02:27:03.000 --> 02:27:04.000
-This is cue #8823
-
-8824
-02:27:04.000 --> 02:27:05.000
-This is cue #8824
-
-8825
-02:27:05.000 --> 02:27:06.000
-This is cue #8825
-
-8826
-02:27:06.000 --> 02:27:07.000
-This is cue #8826
-
-8827
-02:27:07.000 --> 02:27:08.000
-This is cue #8827
-
-8828
-02:27:08.000 --> 02:27:09.000
-This is cue #8828
-
-8829
-02:27:09.000 --> 02:27:10.000
-This is cue #8829
-
-8830
-02:27:10.000 --> 02:27:11.000
-This is cue #8830
-
-8831
-02:27:11.000 --> 02:27:12.000
-This is cue #8831
-
-8832
-02:27:12.000 --> 02:27:13.000
-This is cue #8832
-
-8833
-02:27:13.000 --> 02:27:14.000
-This is cue #8833
-
-8834
-02:27:14.000 --> 02:27:15.000
-This is cue #8834
-
-8835
-02:27:15.000 --> 02:27:16.000
-This is cue #8835
-
-8836
-02:27:16.000 --> 02:27:17.000
-This is cue #8836
-
-8837
-02:27:17.000 --> 02:27:18.000
-This is cue #8837
-
-8838
-02:27:18.000 --> 02:27:19.000
-This is cue #8838
-
-8839
-02:27:19.000 --> 02:27:20.000
-This is cue #8839
-
-8840
-02:27:20.000 --> 02:27:21.000
-This is cue #8840
-
-8841
-02:27:21.000 --> 02:27:22.000
-This is cue #8841
-
-8842
-02:27:22.000 --> 02:27:23.000
-This is cue #8842
-
-8843
-02:27:23.000 --> 02:27:24.000
-This is cue #8843
-
-8844
-02:27:24.000 --> 02:27:25.000
-This is cue #8844
-
-8845
-02:27:25.000 --> 02:27:26.000
-This is cue #8845
-
-8846
-02:27:26.000 --> 02:27:27.000
-This is cue #8846
-
-8847
-02:27:27.000 --> 02:27:28.000
-This is cue #8847
-
-8848
-02:27:28.000 --> 02:27:29.000
-This is cue #8848
-
-8849
-02:27:29.000 --> 02:27:30.000
-This is cue #8849
-
-8850
-02:27:30.000 --> 02:27:31.000
-This is cue #8850
-
-8851
-02:27:31.000 --> 02:27:32.000
-This is cue #8851
-
-8852
-02:27:32.000 --> 02:27:33.000
-This is cue #8852
-
-8853
-02:27:33.000 --> 02:27:34.000
-This is cue #8853
-
-8854
-02:27:34.000 --> 02:27:35.000
-This is cue #8854
-
-8855
-02:27:35.000 --> 02:27:36.000
-This is cue #8855
-
-8856
-02:27:36.000 --> 02:27:37.000
-This is cue #8856
-
-8857
-02:27:37.000 --> 02:27:38.000
-This is cue #8857
-
-8858
-02:27:38.000 --> 02:27:39.000
-This is cue #8858
-
-8859
-02:27:39.000 --> 02:27:40.000
-This is cue #8859
-
-8860
-02:27:40.000 --> 02:27:41.000
-This is cue #8860
-
-8861
-02:27:41.000 --> 02:27:42.000
-This is cue #8861
-
-8862
-02:27:42.000 --> 02:27:43.000
-This is cue #8862
-
-8863
-02:27:43.000 --> 02:27:44.000
-This is cue #8863
-
-8864
-02:27:44.000 --> 02:27:45.000
-This is cue #8864
-
-8865
-02:27:45.000 --> 02:27:46.000
-This is cue #8865
-
-8866
-02:27:46.000 --> 02:27:47.000
-This is cue #8866
-
-8867
-02:27:47.000 --> 02:27:48.000
-This is cue #8867
-
-8868
-02:27:48.000 --> 02:27:49.000
-This is cue #8868
-
-8869
-02:27:49.000 --> 02:27:50.000
-This is cue #8869
-
-8870
-02:27:50.000 --> 02:27:51.000
-This is cue #8870
-
-8871
-02:27:51.000 --> 02:27:52.000
-This is cue #8871
-
-8872
-02:27:52.000 --> 02:27:53.000
-This is cue #8872
-
-8873
-02:27:53.000 --> 02:27:54.000
-This is cue #8873
-
-8874
-02:27:54.000 --> 02:27:55.000
-This is cue #8874
-
-8875
-02:27:55.000 --> 02:27:56.000
-This is cue #8875
-
-8876
-02:27:56.000 --> 02:27:57.000
-This is cue #8876
-
-8877
-02:27:57.000 --> 02:27:58.000
-This is cue #8877
-
-8878
-02:27:58.000 --> 02:27:59.000
-This is cue #8878
-
-8879
-02:27:59.000 --> 02:28:00.000
-This is cue #8879
-
-8880
-02:28:00.000 --> 02:28:01.000
-This is cue #8880
-
-8881
-02:28:01.000 --> 02:28:02.000
-This is cue #8881
-
-8882
-02:28:02.000 --> 02:28:03.000
-This is cue #8882
-
-8883
-02:28:03.000 --> 02:28:04.000
-This is cue #8883
-
-8884
-02:28:04.000 --> 02:28:05.000
-This is cue #8884
-
-8885
-02:28:05.000 --> 02:28:06.000
-This is cue #8885
-
-8886
-02:28:06.000 --> 02:28:07.000
-This is cue #8886
-
-8887
-02:28:07.000 --> 02:28:08.000
-This is cue #8887
-
-8888
-02:28:08.000 --> 02:28:09.000
-This is cue #8888
-
-8889
-02:28:09.000 --> 02:28:10.000
-This is cue #8889
-
-8890
-02:28:10.000 --> 02:28:11.000
-This is cue #8890
-
-8891
-02:28:11.000 --> 02:28:12.000
-This is cue #8891
-
-8892
-02:28:12.000 --> 02:28:13.000
-This is cue #8892
-
-8893
-02:28:13.000 --> 02:28:14.000
-This is cue #8893
-
-8894
-02:28:14.000 --> 02:28:15.000
-This is cue #8894
-
-8895
-02:28:15.000 --> 02:28:16.000
-This is cue #8895
-
-8896
-02:28:16.000 --> 02:28:17.000
-This is cue #8896
-
-8897
-02:28:17.000 --> 02:28:18.000
-This is cue #8897
-
-8898
-02:28:18.000 --> 02:28:19.000
-This is cue #8898
-
-8899
-02:28:19.000 --> 02:28:20.000
-This is cue #8899
-
-8900
-02:28:20.000 --> 02:28:21.000
-This is cue #8900
-
-8901
-02:28:21.000 --> 02:28:22.000
-This is cue #8901
-
-8902
-02:28:22.000 --> 02:28:23.000
-This is cue #8902
-
-8903
-02:28:23.000 --> 02:28:24.000
-This is cue #8903
-
-8904
-02:28:24.000 --> 02:28:25.000
-This is cue #8904
-
-8905
-02:28:25.000 --> 02:28:26.000
-This is cue #8905
-
-8906
-02:28:26.000 --> 02:28:27.000
-This is cue #8906
-
-8907
-02:28:27.000 --> 02:28:28.000
-This is cue #8907
-
-8908
-02:28:28.000 --> 02:28:29.000
-This is cue #8908
-
-8909
-02:28:29.000 --> 02:28:30.000
-This is cue #8909
-
-8910
-02:28:30.000 --> 02:28:31.000
-This is cue #8910
-
-8911
-02:28:31.000 --> 02:28:32.000
-This is cue #8911
-
-8912
-02:28:32.000 --> 02:28:33.000
-This is cue #8912
-
-8913
-02:28:33.000 --> 02:28:34.000
-This is cue #8913
-
-8914
-02:28:34.000 --> 02:28:35.000
-This is cue #8914
-
-8915
-02:28:35.000 --> 02:28:36.000
-This is cue #8915
-
-8916
-02:28:36.000 --> 02:28:37.000
-This is cue #8916
-
-8917
-02:28:37.000 --> 02:28:38.000
-This is cue #8917
-
-8918
-02:28:38.000 --> 02:28:39.000
-This is cue #8918
-
-8919
-02:28:39.000 --> 02:28:40.000
-This is cue #8919
-
-8920
-02:28:40.000 --> 02:28:41.000
-This is cue #8920
-
-8921
-02:28:41.000 --> 02:28:42.000
-This is cue #8921
-
-8922
-02:28:42.000 --> 02:28:43.000
-This is cue #8922
-
-8923
-02:28:43.000 --> 02:28:44.000
-This is cue #8923
-
-8924
-02:28:44.000 --> 02:28:45.000
-This is cue #8924
-
-8925
-02:28:45.000 --> 02:28:46.000
-This is cue #8925
-
-8926
-02:28:46.000 --> 02:28:47.000
-This is cue #8926
-
-8927
-02:28:47.000 --> 02:28:48.000
-This is cue #8927
-
-8928
-02:28:48.000 --> 02:28:49.000
-This is cue #8928
-
-8929
-02:28:49.000 --> 02:28:50.000
-This is cue #8929
-
-8930
-02:28:50.000 --> 02:28:51.000
-This is cue #8930
-
-8931
-02:28:51.000 --> 02:28:52.000
-This is cue #8931
-
-8932
-02:28:52.000 --> 02:28:53.000
-This is cue #8932
-
-8933
-02:28:53.000 --> 02:28:54.000
-This is cue #8933
-
-8934
-02:28:54.000 --> 02:28:55.000
-This is cue #8934
-
-8935
-02:28:55.000 --> 02:28:56.000
-This is cue #8935
-
-8936
-02:28:56.000 --> 02:28:57.000
-This is cue #8936
-
-8937
-02:28:57.000 --> 02:28:58.000
-This is cue #8937
-
-8938
-02:28:58.000 --> 02:28:59.000
-This is cue #8938
-
-8939
-02:28:59.000 --> 02:29:00.000
-This is cue #8939
-
-8940
-02:29:00.000 --> 02:29:01.000
-This is cue #8940
-
-8941
-02:29:01.000 --> 02:29:02.000
-This is cue #8941
-
-8942
-02:29:02.000 --> 02:29:03.000
-This is cue #8942
-
-8943
-02:29:03.000 --> 02:29:04.000
-This is cue #8943
-
-8944
-02:29:04.000 --> 02:29:05.000
-This is cue #8944
-
-8945
-02:29:05.000 --> 02:29:06.000
-This is cue #8945
-
-8946
-02:29:06.000 --> 02:29:07.000
-This is cue #8946
-
-8947
-02:29:07.000 --> 02:29:08.000
-This is cue #8947
-
-8948
-02:29:08.000 --> 02:29:09.000
-This is cue #8948
-
-8949
-02:29:09.000 --> 02:29:10.000
-This is cue #8949
-
-8950
-02:29:10.000 --> 02:29:11.000
-This is cue #8950
-
-8951
-02:29:11.000 --> 02:29:12.000
-This is cue #8951
-
-8952
-02:29:12.000 --> 02:29:13.000
-This is cue #8952
-
-8953
-02:29:13.000 --> 02:29:14.000
-This is cue #8953
-
-8954
-02:29:14.000 --> 02:29:15.000
-This is cue #8954
-
-8955
-02:29:15.000 --> 02:29:16.000
-This is cue #8955
-
-8956
-02:29:16.000 --> 02:29:17.000
-This is cue #8956
-
-8957
-02:29:17.000 --> 02:29:18.000
-This is cue #8957
-
-8958
-02:29:18.000 --> 02:29:19.000
-This is cue #8958
-
-8959
-02:29:19.000 --> 02:29:20.000
-This is cue #8959
-
-8960
-02:29:20.000 --> 02:29:21.000
-This is cue #8960
-
-8961
-02:29:21.000 --> 02:29:22.000
-This is cue #8961
-
-8962
-02:29:22.000 --> 02:29:23.000
-This is cue #8962
-
-8963
-02:29:23.000 --> 02:29:24.000
-This is cue #8963
-
-8964
-02:29:24.000 --> 02:29:25.000
-This is cue #8964
-
-8965
-02:29:25.000 --> 02:29:26.000
-This is cue #8965
-
-8966
-02:29:26.000 --> 02:29:27.000
-This is cue #8966
-
-8967
-02:29:27.000 --> 02:29:28.000
-This is cue #8967
-
-8968
-02:29:28.000 --> 02:29:29.000
-This is cue #8968
-
-8969
-02:29:29.000 --> 02:29:30.000
-This is cue #8969
-
-8970
-02:29:30.000 --> 02:29:31.000
-This is cue #8970
-
-8971
-02:29:31.000 --> 02:29:32.000
-This is cue #8971
-
-8972
-02:29:32.000 --> 02:29:33.000
-This is cue #8972
-
-8973
-02:29:33.000 --> 02:29:34.000
-This is cue #8973
-
-8974
-02:29:34.000 --> 02:29:35.000
-This is cue #8974
-
-8975
-02:29:35.000 --> 02:29:36.000
-This is cue #8975
-
-8976
-02:29:36.000 --> 02:29:37.000
-This is cue #8976
-
-8977
-02:29:37.000 --> 02:29:38.000
-This is cue #8977
-
-8978
-02:29:38.000 --> 02:29:39.000
-This is cue #8978
-
-8979
-02:29:39.000 --> 02:29:40.000
-This is cue #8979
-
-8980
-02:29:40.000 --> 02:29:41.000
-This is cue #8980
-
-8981
-02:29:41.000 --> 02:29:42.000
-This is cue #8981
-
-8982
-02:29:42.000 --> 02:29:43.000
-This is cue #8982
-
-8983
-02:29:43.000 --> 02:29:44.000
-This is cue #8983
-
-8984
-02:29:44.000 --> 02:29:45.000
-This is cue #8984
-
-8985
-02:29:45.000 --> 02:29:46.000
-This is cue #8985
-
-8986
-02:29:46.000 --> 02:29:47.000
-This is cue #8986
-
-8987
-02:29:47.000 --> 02:29:48.000
-This is cue #8987
-
-8988
-02:29:48.000 --> 02:29:49.000
-This is cue #8988
-
-8989
-02:29:49.000 --> 02:29:50.000
-This is cue #8989
-
-8990
-02:29:50.000 --> 02:29:51.000
-This is cue #8990
-
-8991
-02:29:51.000 --> 02:29:52.000
-This is cue #8991
-
-8992
-02:29:52.000 --> 02:29:53.000
-This is cue #8992
-
-8993
-02:29:53.000 --> 02:29:54.000
-This is cue #8993
-
-8994
-02:29:54.000 --> 02:29:55.000
-This is cue #8994
-
-8995
-02:29:55.000 --> 02:29:56.000
-This is cue #8995
-
-8996
-02:29:56.000 --> 02:29:57.000
-This is cue #8996
-
-8997
-02:29:57.000 --> 02:29:58.000
-This is cue #8997
-
-8998
-02:29:58.000 --> 02:29:59.000
-This is cue #8998
-
-8999
-02:29:59.000 --> 02:30:00.000
-This is cue #8999
-
-9000
-02:30:00.000 --> 02:30:01.000
-This is cue #9000
-
-9001
-02:30:01.000 --> 02:30:02.000
-This is cue #9001
-
-9002
-02:30:02.000 --> 02:30:03.000
-This is cue #9002
-
-9003
-02:30:03.000 --> 02:30:04.000
-This is cue #9003
-
-9004
-02:30:04.000 --> 02:30:05.000
-This is cue #9004
-
-9005
-02:30:05.000 --> 02:30:06.000
-This is cue #9005
-
-9006
-02:30:06.000 --> 02:30:07.000
-This is cue #9006
-
-9007
-02:30:07.000 --> 02:30:08.000
-This is cue #9007
-
-9008
-02:30:08.000 --> 02:30:09.000
-This is cue #9008
-
-9009
-02:30:09.000 --> 02:30:10.000
-This is cue #9009
-
-9010
-02:30:10.000 --> 02:30:11.000
-This is cue #9010
-
-9011
-02:30:11.000 --> 02:30:12.000
-This is cue #9011
-
-9012
-02:30:12.000 --> 02:30:13.000
-This is cue #9012
-
-9013
-02:30:13.000 --> 02:30:14.000
-This is cue #9013
-
-9014
-02:30:14.000 --> 02:30:15.000
-This is cue #9014
-
-9015
-02:30:15.000 --> 02:30:16.000
-This is cue #9015
-
-9016
-02:30:16.000 --> 02:30:17.000
-This is cue #9016
-
-9017
-02:30:17.000 --> 02:30:18.000
-This is cue #9017
-
-9018
-02:30:18.000 --> 02:30:19.000
-This is cue #9018
-
-9019
-02:30:19.000 --> 02:30:20.000
-This is cue #9019
-
-9020
-02:30:20.000 --> 02:30:21.000
-This is cue #9020
-
-9021
-02:30:21.000 --> 02:30:22.000
-This is cue #9021
-
-9022
-02:30:22.000 --> 02:30:23.000
-This is cue #9022
-
-9023
-02:30:23.000 --> 02:30:24.000
-This is cue #9023
-
-9024
-02:30:24.000 --> 02:30:25.000
-This is cue #9024
-
-9025
-02:30:25.000 --> 02:30:26.000
-This is cue #9025
-
-9026
-02:30:26.000 --> 02:30:27.000
-This is cue #9026
-
-9027
-02:30:27.000 --> 02:30:28.000
-This is cue #9027
-
-9028
-02:30:28.000 --> 02:30:29.000
-This is cue #9028
-
-9029
-02:30:29.000 --> 02:30:30.000
-This is cue #9029
-
-9030
-02:30:30.000 --> 02:30:31.000
-This is cue #9030
-
-9031
-02:30:31.000 --> 02:30:32.000
-This is cue #9031
-
-9032
-02:30:32.000 --> 02:30:33.000
-This is cue #9032
-
-9033
-02:30:33.000 --> 02:30:34.000
-This is cue #9033
-
-9034
-02:30:34.000 --> 02:30:35.000
-This is cue #9034
-
-9035
-02:30:35.000 --> 02:30:36.000
-This is cue #9035
-
-9036
-02:30:36.000 --> 02:30:37.000
-This is cue #9036
-
-9037
-02:30:37.000 --> 02:30:38.000
-This is cue #9037
-
-9038
-02:30:38.000 --> 02:30:39.000
-This is cue #9038
-
-9039
-02:30:39.000 --> 02:30:40.000
-This is cue #9039
-
-9040
-02:30:40.000 --> 02:30:41.000
-This is cue #9040
-
-9041
-02:30:41.000 --> 02:30:42.000
-This is cue #9041
-
-9042
-02:30:42.000 --> 02:30:43.000
-This is cue #9042
-
-9043
-02:30:43.000 --> 02:30:44.000
-This is cue #9043
-
-9044
-02:30:44.000 --> 02:30:45.000
-This is cue #9044
-
-9045
-02:30:45.000 --> 02:30:46.000
-This is cue #9045
-
-9046
-02:30:46.000 --> 02:30:47.000
-This is cue #9046
-
-9047
-02:30:47.000 --> 02:30:48.000
-This is cue #9047
-
-9048
-02:30:48.000 --> 02:30:49.000
-This is cue #9048
-
-9049
-02:30:49.000 --> 02:30:50.000
-This is cue #9049
-
-9050
-02:30:50.000 --> 02:30:51.000
-This is cue #9050
-
-9051
-02:30:51.000 --> 02:30:52.000
-This is cue #9051
-
-9052
-02:30:52.000 --> 02:30:53.000
-This is cue #9052
-
-9053
-02:30:53.000 --> 02:30:54.000
-This is cue #9053
-
-9054
-02:30:54.000 --> 02:30:55.000
-This is cue #9054
-
-9055
-02:30:55.000 --> 02:30:56.000
-This is cue #9055
-
-9056
-02:30:56.000 --> 02:30:57.000
-This is cue #9056
-
-9057
-02:30:57.000 --> 02:30:58.000
-This is cue #9057
-
-9058
-02:30:58.000 --> 02:30:59.000
-This is cue #9058
-
-9059
-02:30:59.000 --> 02:31:00.000
-This is cue #9059
-
-9060
-02:31:00.000 --> 02:31:01.000
-This is cue #9060
-
-9061
-02:31:01.000 --> 02:31:02.000
-This is cue #9061
-
-9062
-02:31:02.000 --> 02:31:03.000
-This is cue #9062
-
-9063
-02:31:03.000 --> 02:31:04.000
-This is cue #9063
-
-9064
-02:31:04.000 --> 02:31:05.000
-This is cue #9064
-
-9065
-02:31:05.000 --> 02:31:06.000
-This is cue #9065
-
-9066
-02:31:06.000 --> 02:31:07.000
-This is cue #9066
-
-9067
-02:31:07.000 --> 02:31:08.000
-This is cue #9067
-
-9068
-02:31:08.000 --> 02:31:09.000
-This is cue #9068
-
-9069
-02:31:09.000 --> 02:31:10.000
-This is cue #9069
-
-9070
-02:31:10.000 --> 02:31:11.000
-This is cue #9070
-
-9071
-02:31:11.000 --> 02:31:12.000
-This is cue #9071
-
-9072
-02:31:12.000 --> 02:31:13.000
-This is cue #9072
-
-9073
-02:31:13.000 --> 02:31:14.000
-This is cue #9073
-
-9074
-02:31:14.000 --> 02:31:15.000
-This is cue #9074
-
-9075
-02:31:15.000 --> 02:31:16.000
-This is cue #9075
-
-9076
-02:31:16.000 --> 02:31:17.000
-This is cue #9076
-
-9077
-02:31:17.000 --> 02:31:18.000
-This is cue #9077
-
-9078
-02:31:18.000 --> 02:31:19.000
-This is cue #9078
-
-9079
-02:31:19.000 --> 02:31:20.000
-This is cue #9079
-
-9080
-02:31:20.000 --> 02:31:21.000
-This is cue #9080
-
-9081
-02:31:21.000 --> 02:31:22.000
-This is cue #9081
-
-9082
-02:31:22.000 --> 02:31:23.000
-This is cue #9082
-
-9083
-02:31:23.000 --> 02:31:24.000
-This is cue #9083
-
-9084
-02:31:24.000 --> 02:31:25.000
-This is cue #9084
-
-9085
-02:31:25.000 --> 02:31:26.000
-This is cue #9085
-
-9086
-02:31:26.000 --> 02:31:27.000
-This is cue #9086
-
-9087
-02:31:27.000 --> 02:31:28.000
-This is cue #9087
-
-9088
-02:31:28.000 --> 02:31:29.000
-This is cue #9088
-
-9089
-02:31:29.000 --> 02:31:30.000
-This is cue #9089
-
-9090
-02:31:30.000 --> 02:31:31.000
-This is cue #9090
-
-9091
-02:31:31.000 --> 02:31:32.000
-This is cue #9091
-
-9092
-02:31:32.000 --> 02:31:33.000
-This is cue #9092
-
-9093
-02:31:33.000 --> 02:31:34.000
-This is cue #9093
-
-9094
-02:31:34.000 --> 02:31:35.000
-This is cue #9094
-
-9095
-02:31:35.000 --> 02:31:36.000
-This is cue #9095
-
-9096
-02:31:36.000 --> 02:31:37.000
-This is cue #9096
-
-9097
-02:31:37.000 --> 02:31:38.000
-This is cue #9097
-
-9098
-02:31:38.000 --> 02:31:39.000
-This is cue #9098
-
-9099
-02:31:39.000 --> 02:31:40.000
-This is cue #9099
-
-9100
-02:31:40.000 --> 02:31:41.000
-This is cue #9100
-
-9101
-02:31:41.000 --> 02:31:42.000
-This is cue #9101
-
-9102
-02:31:42.000 --> 02:31:43.000
-This is cue #9102
-
-9103
-02:31:43.000 --> 02:31:44.000
-This is cue #9103
-
-9104
-02:31:44.000 --> 02:31:45.000
-This is cue #9104
-
-9105
-02:31:45.000 --> 02:31:46.000
-This is cue #9105
-
-9106
-02:31:46.000 --> 02:31:47.000
-This is cue #9106
-
-9107
-02:31:47.000 --> 02:31:48.000
-This is cue #9107
-
-9108
-02:31:48.000 --> 02:31:49.000
-This is cue #9108
-
-9109
-02:31:49.000 --> 02:31:50.000
-This is cue #9109
-
-9110
-02:31:50.000 --> 02:31:51.000
-This is cue #9110
-
-9111
-02:31:51.000 --> 02:31:52.000
-This is cue #9111
-
-9112
-02:31:52.000 --> 02:31:53.000
-This is cue #9112
-
-9113
-02:31:53.000 --> 02:31:54.000
-This is cue #9113
-
-9114
-02:31:54.000 --> 02:31:55.000
-This is cue #9114
-
-9115
-02:31:55.000 --> 02:31:56.000
-This is cue #9115
-
-9116
-02:31:56.000 --> 02:31:57.000
-This is cue #9116
-
-9117
-02:31:57.000 --> 02:31:58.000
-This is cue #9117
-
-9118
-02:31:58.000 --> 02:31:59.000
-This is cue #9118
-
-9119
-02:31:59.000 --> 02:32:00.000
-This is cue #9119
-
-9120
-02:32:00.000 --> 02:32:01.000
-This is cue #9120
-
-9121
-02:32:01.000 --> 02:32:02.000
-This is cue #9121
-
-9122
-02:32:02.000 --> 02:32:03.000
-This is cue #9122
-
-9123
-02:32:03.000 --> 02:32:04.000
-This is cue #9123
-
-9124
-02:32:04.000 --> 02:32:05.000
-This is cue #9124
-
-9125
-02:32:05.000 --> 02:32:06.000
-This is cue #9125
-
-9126
-02:32:06.000 --> 02:32:07.000
-This is cue #9126
-
-9127
-02:32:07.000 --> 02:32:08.000
-This is cue #9127
-
-9128
-02:32:08.000 --> 02:32:09.000
-This is cue #9128
-
-9129
-02:32:09.000 --> 02:32:10.000
-This is cue #9129
-
-9130
-02:32:10.000 --> 02:32:11.000
-This is cue #9130
-
-9131
-02:32:11.000 --> 02:32:12.000
-This is cue #9131
-
-9132
-02:32:12.000 --> 02:32:13.000
-This is cue #9132
-
-9133
-02:32:13.000 --> 02:32:14.000
-This is cue #9133
-
-9134
-02:32:14.000 --> 02:32:15.000
-This is cue #9134
-
-9135
-02:32:15.000 --> 02:32:16.000
-This is cue #9135
-
-9136
-02:32:16.000 --> 02:32:17.000
-This is cue #9136
-
-9137
-02:32:17.000 --> 02:32:18.000
-This is cue #9137
-
-9138
-02:32:18.000 --> 02:32:19.000
-This is cue #9138
-
-9139
-02:32:19.000 --> 02:32:20.000
-This is cue #9139
-
-9140
-02:32:20.000 --> 02:32:21.000
-This is cue #9140
-
-9141
-02:32:21.000 --> 02:32:22.000
-This is cue #9141
-
-9142
-02:32:22.000 --> 02:32:23.000
-This is cue #9142
-
-9143
-02:32:23.000 --> 02:32:24.000
-This is cue #9143
-
-9144
-02:32:24.000 --> 02:32:25.000
-This is cue #9144
-
-9145
-02:32:25.000 --> 02:32:26.000
-This is cue #9145
-
-9146
-02:32:26.000 --> 02:32:27.000
-This is cue #9146
-
-9147
-02:32:27.000 --> 02:32:28.000
-This is cue #9147
-
-9148
-02:32:28.000 --> 02:32:29.000
-This is cue #9148
-
-9149
-02:32:29.000 --> 02:32:30.000
-This is cue #9149
-
-9150
-02:32:30.000 --> 02:32:31.000
-This is cue #9150
-
-9151
-02:32:31.000 --> 02:32:32.000
-This is cue #9151
-
-9152
-02:32:32.000 --> 02:32:33.000
-This is cue #9152
-
-9153
-02:32:33.000 --> 02:32:34.000
-This is cue #9153
-
-9154
-02:32:34.000 --> 02:32:35.000
-This is cue #9154
-
-9155
-02:32:35.000 --> 02:32:36.000
-This is cue #9155
-
-9156
-02:32:36.000 --> 02:32:37.000
-This is cue #9156
-
-9157
-02:32:37.000 --> 02:32:38.000
-This is cue #9157
-
-9158
-02:32:38.000 --> 02:32:39.000
-This is cue #9158
-
-9159
-02:32:39.000 --> 02:32:40.000
-This is cue #9159
-
-9160
-02:32:40.000 --> 02:32:41.000
-This is cue #9160
-
-9161
-02:32:41.000 --> 02:32:42.000
-This is cue #9161
-
-9162
-02:32:42.000 --> 02:32:43.000
-This is cue #9162
-
-9163
-02:32:43.000 --> 02:32:44.000
-This is cue #9163
-
-9164
-02:32:44.000 --> 02:32:45.000
-This is cue #9164
-
-9165
-02:32:45.000 --> 02:32:46.000
-This is cue #9165
-
-9166
-02:32:46.000 --> 02:32:47.000
-This is cue #9166
-
-9167
-02:32:47.000 --> 02:32:48.000
-This is cue #9167
-
-9168
-02:32:48.000 --> 02:32:49.000
-This is cue #9168
-
-9169
-02:32:49.000 --> 02:32:50.000
-This is cue #9169
-
-9170
-02:32:50.000 --> 02:32:51.000
-This is cue #9170
-
-9171
-02:32:51.000 --> 02:32:52.000
-This is cue #9171
-
-9172
-02:32:52.000 --> 02:32:53.000
-This is cue #9172
-
-9173
-02:32:53.000 --> 02:32:54.000
-This is cue #9173
-
-9174
-02:32:54.000 --> 02:32:55.000
-This is cue #9174
-
-9175
-02:32:55.000 --> 02:32:56.000
-This is cue #9175
-
-9176
-02:32:56.000 --> 02:32:57.000
-This is cue #9176
-
-9177
-02:32:57.000 --> 02:32:58.000
-This is cue #9177
-
-9178
-02:32:58.000 --> 02:32:59.000
-This is cue #9178
-
-9179
-02:32:59.000 --> 02:33:00.000
-This is cue #9179
-
-9180
-02:33:00.000 --> 02:33:01.000
-This is cue #9180
-
-9181
-02:33:01.000 --> 02:33:02.000
-This is cue #9181
-
-9182
-02:33:02.000 --> 02:33:03.000
-This is cue #9182
-
-9183
-02:33:03.000 --> 02:33:04.000
-This is cue #9183
-
-9184
-02:33:04.000 --> 02:33:05.000
-This is cue #9184
-
-9185
-02:33:05.000 --> 02:33:06.000
-This is cue #9185
-
-9186
-02:33:06.000 --> 02:33:07.000
-This is cue #9186
-
-9187
-02:33:07.000 --> 02:33:08.000
-This is cue #9187
-
-9188
-02:33:08.000 --> 02:33:09.000
-This is cue #9188
-
-9189
-02:33:09.000 --> 02:33:10.000
-This is cue #9189
-
-9190
-02:33:10.000 --> 02:33:11.000
-This is cue #9190
-
-9191
-02:33:11.000 --> 02:33:12.000
-This is cue #9191
-
-9192
-02:33:12.000 --> 02:33:13.000
-This is cue #9192
-
-9193
-02:33:13.000 --> 02:33:14.000
-This is cue #9193
-
-9194
-02:33:14.000 --> 02:33:15.000
-This is cue #9194
-
-9195
-02:33:15.000 --> 02:33:16.000
-This is cue #9195
-
-9196
-02:33:16.000 --> 02:33:17.000
-This is cue #9196
-
-9197
-02:33:17.000 --> 02:33:18.000
-This is cue #9197
-
-9198
-02:33:18.000 --> 02:33:19.000
-This is cue #9198
-
-9199
-02:33:19.000 --> 02:33:20.000
-This is cue #9199
-
-9200
-02:33:20.000 --> 02:33:21.000
-This is cue #9200
-
-9201
-02:33:21.000 --> 02:33:22.000
-This is cue #9201
-
-9202
-02:33:22.000 --> 02:33:23.000
-This is cue #9202
-
-9203
-02:33:23.000 --> 02:33:24.000
-This is cue #9203
-
-9204
-02:33:24.000 --> 02:33:25.000
-This is cue #9204
-
-9205
-02:33:25.000 --> 02:33:26.000
-This is cue #9205
-
-9206
-02:33:26.000 --> 02:33:27.000
-This is cue #9206
-
-9207
-02:33:27.000 --> 02:33:28.000
-This is cue #9207
-
-9208
-02:33:28.000 --> 02:33:29.000
-This is cue #9208
-
-9209
-02:33:29.000 --> 02:33:30.000
-This is cue #9209
-
-9210
-02:33:30.000 --> 02:33:31.000
-This is cue #9210
-
-9211
-02:33:31.000 --> 02:33:32.000
-This is cue #9211
-
-9212
-02:33:32.000 --> 02:33:33.000
-This is cue #9212
-
-9213
-02:33:33.000 --> 02:33:34.000
-This is cue #9213
-
-9214
-02:33:34.000 --> 02:33:35.000
-This is cue #9214
-
-9215
-02:33:35.000 --> 02:33:36.000
-This is cue #9215
-
-9216
-02:33:36.000 --> 02:33:37.000
-This is cue #9216
-
-9217
-02:33:37.000 --> 02:33:38.000
-This is cue #9217
-
-9218
-02:33:38.000 --> 02:33:39.000
-This is cue #9218
-
-9219
-02:33:39.000 --> 02:33:40.000
-This is cue #9219
-
-9220
-02:33:40.000 --> 02:33:41.000
-This is cue #9220
-
-9221
-02:33:41.000 --> 02:33:42.000
-This is cue #9221
-
-9222
-02:33:42.000 --> 02:33:43.000
-This is cue #9222
-
-9223
-02:33:43.000 --> 02:33:44.000
-This is cue #9223
-
-9224
-02:33:44.000 --> 02:33:45.000
-This is cue #9224
-
-9225
-02:33:45.000 --> 02:33:46.000
-This is cue #9225
-
-9226
-02:33:46.000 --> 02:33:47.000
-This is cue #9226
-
-9227
-02:33:47.000 --> 02:33:48.000
-This is cue #9227
-
-9228
-02:33:48.000 --> 02:33:49.000
-This is cue #9228
-
-9229
-02:33:49.000 --> 02:33:50.000
-This is cue #9229
-
-9230
-02:33:50.000 --> 02:33:51.000
-This is cue #9230
-
-9231
-02:33:51.000 --> 02:33:52.000
-This is cue #9231
-
-9232
-02:33:52.000 --> 02:33:53.000
-This is cue #9232
-
-9233
-02:33:53.000 --> 02:33:54.000
-This is cue #9233
-
-9234
-02:33:54.000 --> 02:33:55.000
-This is cue #9234
-
-9235
-02:33:55.000 --> 02:33:56.000
-This is cue #9235
-
-9236
-02:33:56.000 --> 02:33:57.000
-This is cue #9236
-
-9237
-02:33:57.000 --> 02:33:58.000
-This is cue #9237
-
-9238
-02:33:58.000 --> 02:33:59.000
-This is cue #9238
-
-9239
-02:33:59.000 --> 02:34:00.000
-This is cue #9239
-
-9240
-02:34:00.000 --> 02:34:01.000
-This is cue #9240
-
-9241
-02:34:01.000 --> 02:34:02.000
-This is cue #9241
-
-9242
-02:34:02.000 --> 02:34:03.000
-This is cue #9242
-
-9243
-02:34:03.000 --> 02:34:04.000
-This is cue #9243
-
-9244
-02:34:04.000 --> 02:34:05.000
-This is cue #9244
-
-9245
-02:34:05.000 --> 02:34:06.000
-This is cue #9245
-
-9246
-02:34:06.000 --> 02:34:07.000
-This is cue #9246
-
-9247
-02:34:07.000 --> 02:34:08.000
-This is cue #9247
-
-9248
-02:34:08.000 --> 02:34:09.000
-This is cue #9248
-
-9249
-02:34:09.000 --> 02:34:10.000
-This is cue #9249
-
-9250
-02:34:10.000 --> 02:34:11.000
-This is cue #9250
-
-9251
-02:34:11.000 --> 02:34:12.000
-This is cue #9251
-
-9252
-02:34:12.000 --> 02:34:13.000
-This is cue #9252
-
-9253
-02:34:13.000 --> 02:34:14.000
-This is cue #9253
-
-9254
-02:34:14.000 --> 02:34:15.000
-This is cue #9254
-
-9255
-02:34:15.000 --> 02:34:16.000
-This is cue #9255
-
-9256
-02:34:16.000 --> 02:34:17.000
-This is cue #9256
-
-9257
-02:34:17.000 --> 02:34:18.000
-This is cue #9257
-
-9258
-02:34:18.000 --> 02:34:19.000
-This is cue #9258
-
-9259
-02:34:19.000 --> 02:34:20.000
-This is cue #9259
-
-9260
-02:34:20.000 --> 02:34:21.000
-This is cue #9260
-
-9261
-02:34:21.000 --> 02:34:22.000
-This is cue #9261
-
-9262
-02:34:22.000 --> 02:34:23.000
-This is cue #9262
-
-9263
-02:34:23.000 --> 02:34:24.000
-This is cue #9263
-
-9264
-02:34:24.000 --> 02:34:25.000
-This is cue #9264
-
-9265
-02:34:25.000 --> 02:34:26.000
-This is cue #9265
-
-9266
-02:34:26.000 --> 02:34:27.000
-This is cue #9266
-
-9267
-02:34:27.000 --> 02:34:28.000
-This is cue #9267
-
-9268
-02:34:28.000 --> 02:34:29.000
-This is cue #9268
-
-9269
-02:34:29.000 --> 02:34:30.000
-This is cue #9269
-
-9270
-02:34:30.000 --> 02:34:31.000
-This is cue #9270
-
-9271
-02:34:31.000 --> 02:34:32.000
-This is cue #9271
-
-9272
-02:34:32.000 --> 02:34:33.000
-This is cue #9272
-
-9273
-02:34:33.000 --> 02:34:34.000
-This is cue #9273
-
-9274
-02:34:34.000 --> 02:34:35.000
-This is cue #9274
-
-9275
-02:34:35.000 --> 02:34:36.000
-This is cue #9275
-
-9276
-02:34:36.000 --> 02:34:37.000
-This is cue #9276
-
-9277
-02:34:37.000 --> 02:34:38.000
-This is cue #9277
-
-9278
-02:34:38.000 --> 02:34:39.000
-This is cue #9278
-
-9279
-02:34:39.000 --> 02:34:40.000
-This is cue #9279
-
-9280
-02:34:40.000 --> 02:34:41.000
-This is cue #9280
-
-9281
-02:34:41.000 --> 02:34:42.000
-This is cue #9281
-
-9282
-02:34:42.000 --> 02:34:43.000
-This is cue #9282
-
-9283
-02:34:43.000 --> 02:34:44.000
-This is cue #9283
-
-9284
-02:34:44.000 --> 02:34:45.000
-This is cue #9284
-
-9285
-02:34:45.000 --> 02:34:46.000
-This is cue #9285
-
-9286
-02:34:46.000 --> 02:34:47.000
-This is cue #9286
-
-9287
-02:34:47.000 --> 02:34:48.000
-This is cue #9287
-
-9288
-02:34:48.000 --> 02:34:49.000
-This is cue #9288
-
-9289
-02:34:49.000 --> 02:34:50.000
-This is cue #9289
-
-9290
-02:34:50.000 --> 02:34:51.000
-This is cue #9290
-
-9291
-02:34:51.000 --> 02:34:52.000
-This is cue #9291
-
-9292
-02:34:52.000 --> 02:34:53.000
-This is cue #9292
-
-9293
-02:34:53.000 --> 02:34:54.000
-This is cue #9293
-
-9294
-02:34:54.000 --> 02:34:55.000
-This is cue #9294
-
-9295
-02:34:55.000 --> 02:34:56.000
-This is cue #9295
-
-9296
-02:34:56.000 --> 02:34:57.000
-This is cue #9296
-
-9297
-02:34:57.000 --> 02:34:58.000
-This is cue #9297
-
-9298
-02:34:58.000 --> 02:34:59.000
-This is cue #9298
-
-9299
-02:34:59.000 --> 02:35:00.000
-This is cue #9299
-
-9300
-02:35:00.000 --> 02:35:01.000
-This is cue #9300
-
-9301
-02:35:01.000 --> 02:35:02.000
-This is cue #9301
-
-9302
-02:35:02.000 --> 02:35:03.000
-This is cue #9302
-
-9303
-02:35:03.000 --> 02:35:04.000
-This is cue #9303
-
-9304
-02:35:04.000 --> 02:35:05.000
-This is cue #9304
-
-9305
-02:35:05.000 --> 02:35:06.000
-This is cue #9305
-
-9306
-02:35:06.000 --> 02:35:07.000
-This is cue #9306
-
-9307
-02:35:07.000 --> 02:35:08.000
-This is cue #9307
-
-9308
-02:35:08.000 --> 02:35:09.000
-This is cue #9308
-
-9309
-02:35:09.000 --> 02:35:10.000
-This is cue #9309
-
-9310
-02:35:10.000 --> 02:35:11.000
-This is cue #9310
-
-9311
-02:35:11.000 --> 02:35:12.000
-This is cue #9311
-
-9312
-02:35:12.000 --> 02:35:13.000
-This is cue #9312
-
-9313
-02:35:13.000 --> 02:35:14.000
-This is cue #9313
-
-9314
-02:35:14.000 --> 02:35:15.000
-This is cue #9314
-
-9315
-02:35:15.000 --> 02:35:16.000
-This is cue #9315
-
-9316
-02:35:16.000 --> 02:35:17.000
-This is cue #9316
-
-9317
-02:35:17.000 --> 02:35:18.000
-This is cue #9317
-
-9318
-02:35:18.000 --> 02:35:19.000
-This is cue #9318
-
-9319
-02:35:19.000 --> 02:35:20.000
-This is cue #9319
-
-9320
-02:35:20.000 --> 02:35:21.000
-This is cue #9320
-
-9321
-02:35:21.000 --> 02:35:22.000
-This is cue #9321
-
-9322
-02:35:22.000 --> 02:35:23.000
-This is cue #9322
-
-9323
-02:35:23.000 --> 02:35:24.000
-This is cue #9323
-
-9324
-02:35:24.000 --> 02:35:25.000
-This is cue #9324
-
-9325
-02:35:25.000 --> 02:35:26.000
-This is cue #9325
-
-9326
-02:35:26.000 --> 02:35:27.000
-This is cue #9326
-
-9327
-02:35:27.000 --> 02:35:28.000
-This is cue #9327
-
-9328
-02:35:28.000 --> 02:35:29.000
-This is cue #9328
-
-9329
-02:35:29.000 --> 02:35:30.000
-This is cue #9329
-
-9330
-02:35:30.000 --> 02:35:31.000
-This is cue #9330
-
-9331
-02:35:31.000 --> 02:35:32.000
-This is cue #9331
-
-9332
-02:35:32.000 --> 02:35:33.000
-This is cue #9332
-
-9333
-02:35:33.000 --> 02:35:34.000
-This is cue #9333
-
-9334
-02:35:34.000 --> 02:35:35.000
-This is cue #9334
-
-9335
-02:35:35.000 --> 02:35:36.000
-This is cue #9335
-
-9336
-02:35:36.000 --> 02:35:37.000
-This is cue #9336
-
-9337
-02:35:37.000 --> 02:35:38.000
-This is cue #9337
-
-9338
-02:35:38.000 --> 02:35:39.000
-This is cue #9338
-
-9339
-02:35:39.000 --> 02:35:40.000
-This is cue #9339
-
-9340
-02:35:40.000 --> 02:35:41.000
-This is cue #9340
-
-9341
-02:35:41.000 --> 02:35:42.000
-This is cue #9341
-
-9342
-02:35:42.000 --> 02:35:43.000
-This is cue #9342
-
-9343
-02:35:43.000 --> 02:35:44.000
-This is cue #9343
-
-9344
-02:35:44.000 --> 02:35:45.000
-This is cue #9344
-
-9345
-02:35:45.000 --> 02:35:46.000
-This is cue #9345
-
-9346
-02:35:46.000 --> 02:35:47.000
-This is cue #9346
-
-9347
-02:35:47.000 --> 02:35:48.000
-This is cue #9347
-
-9348
-02:35:48.000 --> 02:35:49.000
-This is cue #9348
-
-9349
-02:35:49.000 --> 02:35:50.000
-This is cue #9349
-
-9350
-02:35:50.000 --> 02:35:51.000
-This is cue #9350
-
-9351
-02:35:51.000 --> 02:35:52.000
-This is cue #9351
-
-9352
-02:35:52.000 --> 02:35:53.000
-This is cue #9352
-
-9353
-02:35:53.000 --> 02:35:54.000
-This is cue #9353
-
-9354
-02:35:54.000 --> 02:35:55.000
-This is cue #9354
-
-9355
-02:35:55.000 --> 02:35:56.000
-This is cue #9355
-
-9356
-02:35:56.000 --> 02:35:57.000
-This is cue #9356
-
-9357
-02:35:57.000 --> 02:35:58.000
-This is cue #9357
-
-9358
-02:35:58.000 --> 02:35:59.000
-This is cue #9358
-
-9359
-02:35:59.000 --> 02:36:00.000
-This is cue #9359
-
-9360
-02:36:00.000 --> 02:36:01.000
-This is cue #9360
-
-9361
-02:36:01.000 --> 02:36:02.000
-This is cue #9361
-
-9362
-02:36:02.000 --> 02:36:03.000
-This is cue #9362
-
-9363
-02:36:03.000 --> 02:36:04.000
-This is cue #9363
-
-9364
-02:36:04.000 --> 02:36:05.000
-This is cue #9364
-
-9365
-02:36:05.000 --> 02:36:06.000
-This is cue #9365
-
-9366
-02:36:06.000 --> 02:36:07.000
-This is cue #9366
-
-9367
-02:36:07.000 --> 02:36:08.000
-This is cue #9367
-
-9368
-02:36:08.000 --> 02:36:09.000
-This is cue #9368
-
-9369
-02:36:09.000 --> 02:36:10.000
-This is cue #9369
-
-9370
-02:36:10.000 --> 02:36:11.000
-This is cue #9370
-
-9371
-02:36:11.000 --> 02:36:12.000
-This is cue #9371
-
-9372
-02:36:12.000 --> 02:36:13.000
-This is cue #9372
-
-9373
-02:36:13.000 --> 02:36:14.000
-This is cue #9373
-
-9374
-02:36:14.000 --> 02:36:15.000
-This is cue #9374
-
-9375
-02:36:15.000 --> 02:36:16.000
-This is cue #9375
-
-9376
-02:36:16.000 --> 02:36:17.000
-This is cue #9376
-
-9377
-02:36:17.000 --> 02:36:18.000
-This is cue #9377
-
-9378
-02:36:18.000 --> 02:36:19.000
-This is cue #9378
-
-9379
-02:36:19.000 --> 02:36:20.000
-This is cue #9379
-
-9380
-02:36:20.000 --> 02:36:21.000
-This is cue #9380
-
-9381
-02:36:21.000 --> 02:36:22.000
-This is cue #9381
-
-9382
-02:36:22.000 --> 02:36:23.000
-This is cue #9382
-
-9383
-02:36:23.000 --> 02:36:24.000
-This is cue #9383
-
-9384
-02:36:24.000 --> 02:36:25.000
-This is cue #9384
-
-9385
-02:36:25.000 --> 02:36:26.000
-This is cue #9385
-
-9386
-02:36:26.000 --> 02:36:27.000
-This is cue #9386
-
-9387
-02:36:27.000 --> 02:36:28.000
-This is cue #9387
-
-9388
-02:36:28.000 --> 02:36:29.000
-This is cue #9388
-
-9389
-02:36:29.000 --> 02:36:30.000
-This is cue #9389
-
-9390
-02:36:30.000 --> 02:36:31.000
-This is cue #9390
-
-9391
-02:36:31.000 --> 02:36:32.000
-This is cue #9391
-
-9392
-02:36:32.000 --> 02:36:33.000
-This is cue #9392
-
-9393
-02:36:33.000 --> 02:36:34.000
-This is cue #9393
-
-9394
-02:36:34.000 --> 02:36:35.000
-This is cue #9394
-
-9395
-02:36:35.000 --> 02:36:36.000
-This is cue #9395
-
-9396
-02:36:36.000 --> 02:36:37.000
-This is cue #9396
-
-9397
-02:36:37.000 --> 02:36:38.000
-This is cue #9397
-
-9398
-02:36:38.000 --> 02:36:39.000
-This is cue #9398
-
-9399
-02:36:39.000 --> 02:36:40.000
-This is cue #9399
-
-9400
-02:36:40.000 --> 02:36:41.000
-This is cue #9400
-
-9401
-02:36:41.000 --> 02:36:42.000
-This is cue #9401
-
-9402
-02:36:42.000 --> 02:36:43.000
-This is cue #9402
-
-9403
-02:36:43.000 --> 02:36:44.000
-This is cue #9403
-
-9404
-02:36:44.000 --> 02:36:45.000
-This is cue #9404
-
-9405
-02:36:45.000 --> 02:36:46.000
-This is cue #9405
-
-9406
-02:36:46.000 --> 02:36:47.000
-This is cue #9406
-
-9407
-02:36:47.000 --> 02:36:48.000
-This is cue #9407
-
-9408
-02:36:48.000 --> 02:36:49.000
-This is cue #9408
-
-9409
-02:36:49.000 --> 02:36:50.000
-This is cue #9409
-
-9410
-02:36:50.000 --> 02:36:51.000
-This is cue #9410
-
-9411
-02:36:51.000 --> 02:36:52.000
-This is cue #9411
-
-9412
-02:36:52.000 --> 02:36:53.000
-This is cue #9412
-
-9413
-02:36:53.000 --> 02:36:54.000
-This is cue #9413
-
-9414
-02:36:54.000 --> 02:36:55.000
-This is cue #9414
-
-9415
-02:36:55.000 --> 02:36:56.000
-This is cue #9415
-
-9416
-02:36:56.000 --> 02:36:57.000
-This is cue #9416
-
-9417
-02:36:57.000 --> 02:36:58.000
-This is cue #9417
-
-9418
-02:36:58.000 --> 02:36:59.000
-This is cue #9418
-
-9419
-02:36:59.000 --> 02:37:00.000
-This is cue #9419
-
-9420
-02:37:00.000 --> 02:37:01.000
-This is cue #9420
-
-9421
-02:37:01.000 --> 02:37:02.000
-This is cue #9421
-
-9422
-02:37:02.000 --> 02:37:03.000
-This is cue #9422
-
-9423
-02:37:03.000 --> 02:37:04.000
-This is cue #9423
-
-9424
-02:37:04.000 --> 02:37:05.000
-This is cue #9424
-
-9425
-02:37:05.000 --> 02:37:06.000
-This is cue #9425
-
-9426
-02:37:06.000 --> 02:37:07.000
-This is cue #9426
-
-9427
-02:37:07.000 --> 02:37:08.000
-This is cue #9427
-
-9428
-02:37:08.000 --> 02:37:09.000
-This is cue #9428
-
-9429
-02:37:09.000 --> 02:37:10.000
-This is cue #9429
-
-9430
-02:37:10.000 --> 02:37:11.000
-This is cue #9430
-
-9431
-02:37:11.000 --> 02:37:12.000
-This is cue #9431
-
-9432
-02:37:12.000 --> 02:37:13.000
-This is cue #9432
-
-9433
-02:37:13.000 --> 02:37:14.000
-This is cue #9433
-
-9434
-02:37:14.000 --> 02:37:15.000
-This is cue #9434
-
-9435
-02:37:15.000 --> 02:37:16.000
-This is cue #9435
-
-9436
-02:37:16.000 --> 02:37:17.000
-This is cue #9436
-
-9437
-02:37:17.000 --> 02:37:18.000
-This is cue #9437
-
-9438
-02:37:18.000 --> 02:37:19.000
-This is cue #9438
-
-9439
-02:37:19.000 --> 02:37:20.000
-This is cue #9439
-
-9440
-02:37:20.000 --> 02:37:21.000
-This is cue #9440
-
-9441
-02:37:21.000 --> 02:37:22.000
-This is cue #9441
-
-9442
-02:37:22.000 --> 02:37:23.000
-This is cue #9442
-
-9443
-02:37:23.000 --> 02:37:24.000
-This is cue #9443
-
-9444
-02:37:24.000 --> 02:37:25.000
-This is cue #9444
-
-9445
-02:37:25.000 --> 02:37:26.000
-This is cue #9445
-
-9446
-02:37:26.000 --> 02:37:27.000
-This is cue #9446
-
-9447
-02:37:27.000 --> 02:37:28.000
-This is cue #9447
-
-9448
-02:37:28.000 --> 02:37:29.000
-This is cue #9448
-
-9449
-02:37:29.000 --> 02:37:30.000
-This is cue #9449
-
-9450
-02:37:30.000 --> 02:37:31.000
-This is cue #9450
-
-9451
-02:37:31.000 --> 02:37:32.000
-This is cue #9451
-
-9452
-02:37:32.000 --> 02:37:33.000
-This is cue #9452
-
-9453
-02:37:33.000 --> 02:37:34.000
-This is cue #9453
-
-9454
-02:37:34.000 --> 02:37:35.000
-This is cue #9454
-
-9455
-02:37:35.000 --> 02:37:36.000
-This is cue #9455
-
-9456
-02:37:36.000 --> 02:37:37.000
-This is cue #9456
-
-9457
-02:37:37.000 --> 02:37:38.000
-This is cue #9457
-
-9458
-02:37:38.000 --> 02:37:39.000
-This is cue #9458
-
-9459
-02:37:39.000 --> 02:37:40.000
-This is cue #9459
-
-9460
-02:37:40.000 --> 02:37:41.000
-This is cue #9460
-
-9461
-02:37:41.000 --> 02:37:42.000
-This is cue #9461
-
-9462
-02:37:42.000 --> 02:37:43.000
-This is cue #9462
-
-9463
-02:37:43.000 --> 02:37:44.000
-This is cue #9463
-
-9464
-02:37:44.000 --> 02:37:45.000
-This is cue #9464
-
-9465
-02:37:45.000 --> 02:37:46.000
-This is cue #9465
-
-9466
-02:37:46.000 --> 02:37:47.000
-This is cue #9466
-
-9467
-02:37:47.000 --> 02:37:48.000
-This is cue #9467
-
-9468
-02:37:48.000 --> 02:37:49.000
-This is cue #9468
-
-9469
-02:37:49.000 --> 02:37:50.000
-This is cue #9469
-
-9470
-02:37:50.000 --> 02:37:51.000
-This is cue #9470
-
-9471
-02:37:51.000 --> 02:37:52.000
-This is cue #9471
-
-9472
-02:37:52.000 --> 02:37:53.000
-This is cue #9472
-
-9473
-02:37:53.000 --> 02:37:54.000
-This is cue #9473
-
-9474
-02:37:54.000 --> 02:37:55.000
-This is cue #9474
-
-9475
-02:37:55.000 --> 02:37:56.000
-This is cue #9475
-
-9476
-02:37:56.000 --> 02:37:57.000
-This is cue #9476
-
-9477
-02:37:57.000 --> 02:37:58.000
-This is cue #9477
-
-9478
-02:37:58.000 --> 02:37:59.000
-This is cue #9478
-
-9479
-02:37:59.000 --> 02:38:00.000
-This is cue #9479
-
-9480
-02:38:00.000 --> 02:38:01.000
-This is cue #9480
-
-9481
-02:38:01.000 --> 02:38:02.000
-This is cue #9481
-
-9482
-02:38:02.000 --> 02:38:03.000
-This is cue #9482
-
-9483
-02:38:03.000 --> 02:38:04.000
-This is cue #9483
-
-9484
-02:38:04.000 --> 02:38:05.000
-This is cue #9484
-
-9485
-02:38:05.000 --> 02:38:06.000
-This is cue #9485
-
-9486
-02:38:06.000 --> 02:38:07.000
-This is cue #9486
-
-9487
-02:38:07.000 --> 02:38:08.000
-This is cue #9487
-
-9488
-02:38:08.000 --> 02:38:09.000
-This is cue #9488
-
-9489
-02:38:09.000 --> 02:38:10.000
-This is cue #9489
-
-9490
-02:38:10.000 --> 02:38:11.000
-This is cue #9490
-
-9491
-02:38:11.000 --> 02:38:12.000
-This is cue #9491
-
-9492
-02:38:12.000 --> 02:38:13.000
-This is cue #9492
-
-9493
-02:38:13.000 --> 02:38:14.000
-This is cue #9493
-
-9494
-02:38:14.000 --> 02:38:15.000
-This is cue #9494
-
-9495
-02:38:15.000 --> 02:38:16.000
-This is cue #9495
-
-9496
-02:38:16.000 --> 02:38:17.000
-This is cue #9496
-
-9497
-02:38:17.000 --> 02:38:18.000
-This is cue #9497
-
-9498
-02:38:18.000 --> 02:38:19.000
-This is cue #9498
-
-9499
-02:38:19.000 --> 02:38:20.000
-This is cue #9499
-
-9500
-02:38:20.000 --> 02:38:21.000
-This is cue #9500
-
-9501
-02:38:21.000 --> 02:38:22.000
-This is cue #9501
-
-9502
-02:38:22.000 --> 02:38:23.000
-This is cue #9502
-
-9503
-02:38:23.000 --> 02:38:24.000
-This is cue #9503
-
-9504
-02:38:24.000 --> 02:38:25.000
-This is cue #9504
-
-9505
-02:38:25.000 --> 02:38:26.000
-This is cue #9505
-
-9506
-02:38:26.000 --> 02:38:27.000
-This is cue #9506
-
-9507
-02:38:27.000 --> 02:38:28.000
-This is cue #9507
-
-9508
-02:38:28.000 --> 02:38:29.000
-This is cue #9508
-
-9509
-02:38:29.000 --> 02:38:30.000
-This is cue #9509
-
-9510
-02:38:30.000 --> 02:38:31.000
-This is cue #9510
-
-9511
-02:38:31.000 --> 02:38:32.000
-This is cue #9511
-
-9512
-02:38:32.000 --> 02:38:33.000
-This is cue #9512
-
-9513
-02:38:33.000 --> 02:38:34.000
-This is cue #9513
-
-9514
-02:38:34.000 --> 02:38:35.000
-This is cue #9514
-
-9515
-02:38:35.000 --> 02:38:36.000
-This is cue #9515
-
-9516
-02:38:36.000 --> 02:38:37.000
-This is cue #9516
-
-9517
-02:38:37.000 --> 02:38:38.000
-This is cue #9517
-
-9518
-02:38:38.000 --> 02:38:39.000
-This is cue #9518
-
-9519
-02:38:39.000 --> 02:38:40.000
-This is cue #9519
-
-9520
-02:38:40.000 --> 02:38:41.000
-This is cue #9520
-
-9521
-02:38:41.000 --> 02:38:42.000
-This is cue #9521
-
-9522
-02:38:42.000 --> 02:38:43.000
-This is cue #9522
-
-9523
-02:38:43.000 --> 02:38:44.000
-This is cue #9523
-
-9524
-02:38:44.000 --> 02:38:45.000
-This is cue #9524
-
-9525
-02:38:45.000 --> 02:38:46.000
-This is cue #9525
-
-9526
-02:38:46.000 --> 02:38:47.000
-This is cue #9526
-
-9527
-02:38:47.000 --> 02:38:48.000
-This is cue #9527
-
-9528
-02:38:48.000 --> 02:38:49.000
-This is cue #9528
-
-9529
-02:38:49.000 --> 02:38:50.000
-This is cue #9529
-
-9530
-02:38:50.000 --> 02:38:51.000
-This is cue #9530
-
-9531
-02:38:51.000 --> 02:38:52.000
-This is cue #9531
-
-9532
-02:38:52.000 --> 02:38:53.000
-This is cue #9532
-
-9533
-02:38:53.000 --> 02:38:54.000
-This is cue #9533
-
-9534
-02:38:54.000 --> 02:38:55.000
-This is cue #9534
-
-9535
-02:38:55.000 --> 02:38:56.000
-This is cue #9535
-
-9536
-02:38:56.000 --> 02:38:57.000
-This is cue #9536
-
-9537
-02:38:57.000 --> 02:38:58.000
-This is cue #9537
-
-9538
-02:38:58.000 --> 02:38:59.000
-This is cue #9538
-
-9539
-02:38:59.000 --> 02:39:00.000
-This is cue #9539
-
-9540
-02:39:00.000 --> 02:39:01.000
-This is cue #9540
-
-9541
-02:39:01.000 --> 02:39:02.000
-This is cue #9541
-
-9542
-02:39:02.000 --> 02:39:03.000
-This is cue #9542
-
-9543
-02:39:03.000 --> 02:39:04.000
-This is cue #9543
-
-9544
-02:39:04.000 --> 02:39:05.000
-This is cue #9544
-
-9545
-02:39:05.000 --> 02:39:06.000
-This is cue #9545
-
-9546
-02:39:06.000 --> 02:39:07.000
-This is cue #9546
-
-9547
-02:39:07.000 --> 02:39:08.000
-This is cue #9547
-
-9548
-02:39:08.000 --> 02:39:09.000
-This is cue #9548
-
-9549
-02:39:09.000 --> 02:39:10.000
-This is cue #9549
-
-9550
-02:39:10.000 --> 02:39:11.000
-This is cue #9550
-
-9551
-02:39:11.000 --> 02:39:12.000
-This is cue #9551
-
-9552
-02:39:12.000 --> 02:39:13.000
-This is cue #9552
-
-9553
-02:39:13.000 --> 02:39:14.000
-This is cue #9553
-
-9554
-02:39:14.000 --> 02:39:15.000
-This is cue #9554
-
-9555
-02:39:15.000 --> 02:39:16.000
-This is cue #9555
-
-9556
-02:39:16.000 --> 02:39:17.000
-This is cue #9556
-
-9557
-02:39:17.000 --> 02:39:18.000
-This is cue #9557
-
-9558
-02:39:18.000 --> 02:39:19.000
-This is cue #9558
-
-9559
-02:39:19.000 --> 02:39:20.000
-This is cue #9559
-
-9560
-02:39:20.000 --> 02:39:21.000
-This is cue #9560
-
-9561
-02:39:21.000 --> 02:39:22.000
-This is cue #9561
-
-9562
-02:39:22.000 --> 02:39:23.000
-This is cue #9562
-
-9563
-02:39:23.000 --> 02:39:24.000
-This is cue #9563
-
-9564
-02:39:24.000 --> 02:39:25.000
-This is cue #9564
-
-9565
-02:39:25.000 --> 02:39:26.000
-This is cue #9565
-
-9566
-02:39:26.000 --> 02:39:27.000
-This is cue #9566
-
-9567
-02:39:27.000 --> 02:39:28.000
-This is cue #9567
-
-9568
-02:39:28.000 --> 02:39:29.000
-This is cue #9568
-
-9569
-02:39:29.000 --> 02:39:30.000
-This is cue #9569
-
-9570
-02:39:30.000 --> 02:39:31.000
-This is cue #9570
-
-9571
-02:39:31.000 --> 02:39:32.000
-This is cue #9571
-
-9572
-02:39:32.000 --> 02:39:33.000
-This is cue #9572
-
-9573
-02:39:33.000 --> 02:39:34.000
-This is cue #9573
-
-9574
-02:39:34.000 --> 02:39:35.000
-This is cue #9574
-
-9575
-02:39:35.000 --> 02:39:36.000
-This is cue #9575
-
-9576
-02:39:36.000 --> 02:39:37.000
-This is cue #9576
-
-9577
-02:39:37.000 --> 02:39:38.000
-This is cue #9577
-
-9578
-02:39:38.000 --> 02:39:39.000
-This is cue #9578
-
-9579
-02:39:39.000 --> 02:39:40.000
-This is cue #9579
-
-9580
-02:39:40.000 --> 02:39:41.000
-This is cue #9580
-
-9581
-02:39:41.000 --> 02:39:42.000
-This is cue #9581
-
-9582
-02:39:42.000 --> 02:39:43.000
-This is cue #9582
-
-9583
-02:39:43.000 --> 02:39:44.000
-This is cue #9583
-
-9584
-02:39:44.000 --> 02:39:45.000
-This is cue #9584
-
-9585
-02:39:45.000 --> 02:39:46.000
-This is cue #9585
-
-9586
-02:39:46.000 --> 02:39:47.000
-This is cue #9586
-
-9587
-02:39:47.000 --> 02:39:48.000
-This is cue #9587
-
-9588
-02:39:48.000 --> 02:39:49.000
-This is cue #9588
-
-9589
-02:39:49.000 --> 02:39:50.000
-This is cue #9589
-
-9590
-02:39:50.000 --> 02:39:51.000
-This is cue #9590
-
-9591
-02:39:51.000 --> 02:39:52.000
-This is cue #9591
-
-9592
-02:39:52.000 --> 02:39:53.000
-This is cue #9592
-
-9593
-02:39:53.000 --> 02:39:54.000
-This is cue #9593
-
-9594
-02:39:54.000 --> 02:39:55.000
-This is cue #9594
-
-9595
-02:39:55.000 --> 02:39:56.000
-This is cue #9595
-
-9596
-02:39:56.000 --> 02:39:57.000
-This is cue #9596
-
-9597
-02:39:57.000 --> 02:39:58.000
-This is cue #9597
-
-9598
-02:39:58.000 --> 02:39:59.000
-This is cue #9598
-
-9599
-02:39:59.000 --> 02:40:00.000
-This is cue #9599
-
-9600
-02:40:00.000 --> 02:40:01.000
-This is cue #9600
-
-9601
-02:40:01.000 --> 02:40:02.000
-This is cue #9601
-
-9602
-02:40:02.000 --> 02:40:03.000
-This is cue #9602
-
-9603
-02:40:03.000 --> 02:40:04.000
-This is cue #9603
-
-9604
-02:40:04.000 --> 02:40:05.000
-This is cue #9604
-
-9605
-02:40:05.000 --> 02:40:06.000
-This is cue #9605
-
-9606
-02:40:06.000 --> 02:40:07.000
-This is cue #9606
-
-9607
-02:40:07.000 --> 02:40:08.000
-This is cue #9607
-
-9608
-02:40:08.000 --> 02:40:09.000
-This is cue #9608
-
-9609
-02:40:09.000 --> 02:40:10.000
-This is cue #9609
-
-9610
-02:40:10.000 --> 02:40:11.000
-This is cue #9610
-
-9611
-02:40:11.000 --> 02:40:12.000
-This is cue #9611
-
-9612
-02:40:12.000 --> 02:40:13.000
-This is cue #9612
-
-9613
-02:40:13.000 --> 02:40:14.000
-This is cue #9613
-
-9614
-02:40:14.000 --> 02:40:15.000
-This is cue #9614
-
-9615
-02:40:15.000 --> 02:40:16.000
-This is cue #9615
-
-9616
-02:40:16.000 --> 02:40:17.000
-This is cue #9616
-
-9617
-02:40:17.000 --> 02:40:18.000
-This is cue #9617
-
-9618
-02:40:18.000 --> 02:40:19.000
-This is cue #9618
-
-9619
-02:40:19.000 --> 02:40:20.000
-This is cue #9619
-
-9620
-02:40:20.000 --> 02:40:21.000
-This is cue #9620
-
-9621
-02:40:21.000 --> 02:40:22.000
-This is cue #9621
-
-9622
-02:40:22.000 --> 02:40:23.000
-This is cue #9622
-
-9623
-02:40:23.000 --> 02:40:24.000
-This is cue #9623
-
-9624
-02:40:24.000 --> 02:40:25.000
-This is cue #9624
-
-9625
-02:40:25.000 --> 02:40:26.000
-This is cue #9625
-
-9626
-02:40:26.000 --> 02:40:27.000
-This is cue #9626
-
-9627
-02:40:27.000 --> 02:40:28.000
-This is cue #9627
-
-9628
-02:40:28.000 --> 02:40:29.000
-This is cue #9628
-
-9629
-02:40:29.000 --> 02:40:30.000
-This is cue #9629
-
-9630
-02:40:30.000 --> 02:40:31.000
-This is cue #9630
-
-9631
-02:40:31.000 --> 02:40:32.000
-This is cue #9631
-
-9632
-02:40:32.000 --> 02:40:33.000
-This is cue #9632
-
-9633
-02:40:33.000 --> 02:40:34.000
-This is cue #9633
-
-9634
-02:40:34.000 --> 02:40:35.000
-This is cue #9634
-
-9635
-02:40:35.000 --> 02:40:36.000
-This is cue #9635
-
-9636
-02:40:36.000 --> 02:40:37.000
-This is cue #9636
-
-9637
-02:40:37.000 --> 02:40:38.000
-This is cue #9637
-
-9638
-02:40:38.000 --> 02:40:39.000
-This is cue #9638
-
-9639
-02:40:39.000 --> 02:40:40.000
-This is cue #9639
-
-9640
-02:40:40.000 --> 02:40:41.000
-This is cue #9640
-
-9641
-02:40:41.000 --> 02:40:42.000
-This is cue #9641
-
-9642
-02:40:42.000 --> 02:40:43.000
-This is cue #9642
-
-9643
-02:40:43.000 --> 02:40:44.000
-This is cue #9643
-
-9644
-02:40:44.000 --> 02:40:45.000
-This is cue #9644
-
-9645
-02:40:45.000 --> 02:40:46.000
-This is cue #9645
-
-9646
-02:40:46.000 --> 02:40:47.000
-This is cue #9646
-
-9647
-02:40:47.000 --> 02:40:48.000
-This is cue #9647
-
-9648
-02:40:48.000 --> 02:40:49.000
-This is cue #9648
-
-9649
-02:40:49.000 --> 02:40:50.000
-This is cue #9649
-
-9650
-02:40:50.000 --> 02:40:51.000
-This is cue #9650
-
-9651
-02:40:51.000 --> 02:40:52.000
-This is cue #9651
-
-9652
-02:40:52.000 --> 02:40:53.000
-This is cue #9652
-
-9653
-02:40:53.000 --> 02:40:54.000
-This is cue #9653
-
-9654
-02:40:54.000 --> 02:40:55.000
-This is cue #9654
-
-9655
-02:40:55.000 --> 02:40:56.000
-This is cue #9655
-
-9656
-02:40:56.000 --> 02:40:57.000
-This is cue #9656
-
-9657
-02:40:57.000 --> 02:40:58.000
-This is cue #9657
-
-9658
-02:40:58.000 --> 02:40:59.000
-This is cue #9658
-
-9659
-02:40:59.000 --> 02:41:00.000
-This is cue #9659
-
-9660
-02:41:00.000 --> 02:41:01.000
-This is cue #9660
-
-9661
-02:41:01.000 --> 02:41:02.000
-This is cue #9661
-
-9662
-02:41:02.000 --> 02:41:03.000
-This is cue #9662
-
-9663
-02:41:03.000 --> 02:41:04.000
-This is cue #9663
-
-9664
-02:41:04.000 --> 02:41:05.000
-This is cue #9664
-
-9665
-02:41:05.000 --> 02:41:06.000
-This is cue #9665
-
-9666
-02:41:06.000 --> 02:41:07.000
-This is cue #9666
-
-9667
-02:41:07.000 --> 02:41:08.000
-This is cue #9667
-
-9668
-02:41:08.000 --> 02:41:09.000
-This is cue #9668
-
-9669
-02:41:09.000 --> 02:41:10.000
-This is cue #9669
-
-9670
-02:41:10.000 --> 02:41:11.000
-This is cue #9670
-
-9671
-02:41:11.000 --> 02:41:12.000
-This is cue #9671
-
-9672
-02:41:12.000 --> 02:41:13.000
-This is cue #9672
-
-9673
-02:41:13.000 --> 02:41:14.000
-This is cue #9673
-
-9674
-02:41:14.000 --> 02:41:15.000
-This is cue #9674
-
-9675
-02:41:15.000 --> 02:41:16.000
-This is cue #9675
-
-9676
-02:41:16.000 --> 02:41:17.000
-This is cue #9676
-
-9677
-02:41:17.000 --> 02:41:18.000
-This is cue #9677
-
-9678
-02:41:18.000 --> 02:41:19.000
-This is cue #9678
-
-9679
-02:41:19.000 --> 02:41:20.000
-This is cue #9679
-
-9680
-02:41:20.000 --> 02:41:21.000
-This is cue #9680
-
-9681
-02:41:21.000 --> 02:41:22.000
-This is cue #9681
-
-9682
-02:41:22.000 --> 02:41:23.000
-This is cue #9682
-
-9683
-02:41:23.000 --> 02:41:24.000
-This is cue #9683
-
-9684
-02:41:24.000 --> 02:41:25.000
-This is cue #9684
-
-9685
-02:41:25.000 --> 02:41:26.000
-This is cue #9685
-
-9686
-02:41:26.000 --> 02:41:27.000
-This is cue #9686
-
-9687
-02:41:27.000 --> 02:41:28.000
-This is cue #9687
-
-9688
-02:41:28.000 --> 02:41:29.000
-This is cue #9688
-
-9689
-02:41:29.000 --> 02:41:30.000
-This is cue #9689
-
-9690
-02:41:30.000 --> 02:41:31.000
-This is cue #9690
-
-9691
-02:41:31.000 --> 02:41:32.000
-This is cue #9691
-
-9692
-02:41:32.000 --> 02:41:33.000
-This is cue #9692
-
-9693
-02:41:33.000 --> 02:41:34.000
-This is cue #9693
-
-9694
-02:41:34.000 --> 02:41:35.000
-This is cue #9694
-
-9695
-02:41:35.000 --> 02:41:36.000
-This is cue #9695
-
-9696
-02:41:36.000 --> 02:41:37.000
-This is cue #9696
-
-9697
-02:41:37.000 --> 02:41:38.000
-This is cue #9697
-
-9698
-02:41:38.000 --> 02:41:39.000
-This is cue #9698
-
-9699
-02:41:39.000 --> 02:41:40.000
-This is cue #9699
-
-9700
-02:41:40.000 --> 02:41:41.000
-This is cue #9700
-
-9701
-02:41:41.000 --> 02:41:42.000
-This is cue #9701
-
-9702
-02:41:42.000 --> 02:41:43.000
-This is cue #9702
-
-9703
-02:41:43.000 --> 02:41:44.000
-This is cue #9703
-
-9704
-02:41:44.000 --> 02:41:45.000
-This is cue #9704
-
-9705
-02:41:45.000 --> 02:41:46.000
-This is cue #9705
-
-9706
-02:41:46.000 --> 02:41:47.000
-This is cue #9706
-
-9707
-02:41:47.000 --> 02:41:48.000
-This is cue #9707
-
-9708
-02:41:48.000 --> 02:41:49.000
-This is cue #9708
-
-9709
-02:41:49.000 --> 02:41:50.000
-This is cue #9709
-
-9710
-02:41:50.000 --> 02:41:51.000
-This is cue #9710
-
-9711
-02:41:51.000 --> 02:41:52.000
-This is cue #9711
-
-9712
-02:41:52.000 --> 02:41:53.000
-This is cue #9712
-
-9713
-02:41:53.000 --> 02:41:54.000
-This is cue #9713
-
-9714
-02:41:54.000 --> 02:41:55.000
-This is cue #9714
-
-9715
-02:41:55.000 --> 02:41:56.000
-This is cue #9715
-
-9716
-02:41:56.000 --> 02:41:57.000
-This is cue #9716
-
-9717
-02:41:57.000 --> 02:41:58.000
-This is cue #9717
-
-9718
-02:41:58.000 --> 02:41:59.000
-This is cue #9718
-
-9719
-02:41:59.000 --> 02:42:00.000
-This is cue #9719
-
-9720
-02:42:00.000 --> 02:42:01.000
-This is cue #9720
-
-9721
-02:42:01.000 --> 02:42:02.000
-This is cue #9721
-
-9722
-02:42:02.000 --> 02:42:03.000
-This is cue #9722
-
-9723
-02:42:03.000 --> 02:42:04.000
-This is cue #9723
-
-9724
-02:42:04.000 --> 02:42:05.000
-This is cue #9724
-
-9725
-02:42:05.000 --> 02:42:06.000
-This is cue #9725
-
-9726
-02:42:06.000 --> 02:42:07.000
-This is cue #9726
-
-9727
-02:42:07.000 --> 02:42:08.000
-This is cue #9727
-
-9728
-02:42:08.000 --> 02:42:09.000
-This is cue #9728
-
-9729
-02:42:09.000 --> 02:42:10.000
-This is cue #9729
-
-9730
-02:42:10.000 --> 02:42:11.000
-This is cue #9730
-
-9731
-02:42:11.000 --> 02:42:12.000
-This is cue #9731
-
-9732
-02:42:12.000 --> 02:42:13.000
-This is cue #9732
-
-9733
-02:42:13.000 --> 02:42:14.000
-This is cue #9733
-
-9734
-02:42:14.000 --> 02:42:15.000
-This is cue #9734
-
-9735
-02:42:15.000 --> 02:42:16.000
-This is cue #9735
-
-9736
-02:42:16.000 --> 02:42:17.000
-This is cue #9736
-
-9737
-02:42:17.000 --> 02:42:18.000
-This is cue #9737
-
-9738
-02:42:18.000 --> 02:42:19.000
-This is cue #9738
-
-9739
-02:42:19.000 --> 02:42:20.000
-This is cue #9739
-
-9740
-02:42:20.000 --> 02:42:21.000
-This is cue #9740
-
-9741
-02:42:21.000 --> 02:42:22.000
-This is cue #9741
-
-9742
-02:42:22.000 --> 02:42:23.000
-This is cue #9742
-
-9743
-02:42:23.000 --> 02:42:24.000
-This is cue #9743
-
-9744
-02:42:24.000 --> 02:42:25.000
-This is cue #9744
-
-9745
-02:42:25.000 --> 02:42:26.000
-This is cue #9745
-
-9746
-02:42:26.000 --> 02:42:27.000
-This is cue #9746
-
-9747
-02:42:27.000 --> 02:42:28.000
-This is cue #9747
-
-9748
-02:42:28.000 --> 02:42:29.000
-This is cue #9748
-
-9749
-02:42:29.000 --> 02:42:30.000
-This is cue #9749
-
-9750
-02:42:30.000 --> 02:42:31.000
-This is cue #9750
-
-9751
-02:42:31.000 --> 02:42:32.000
-This is cue #9751
-
-9752
-02:42:32.000 --> 02:42:33.000
-This is cue #9752
-
-9753
-02:42:33.000 --> 02:42:34.000
-This is cue #9753
-
-9754
-02:42:34.000 --> 02:42:35.000
-This is cue #9754
-
-9755
-02:42:35.000 --> 02:42:36.000
-This is cue #9755
-
-9756
-02:42:36.000 --> 02:42:37.000
-This is cue #9756
-
-9757
-02:42:37.000 --> 02:42:38.000
-This is cue #9757
-
-9758
-02:42:38.000 --> 02:42:39.000
-This is cue #9758
-
-9759
-02:42:39.000 --> 02:42:40.000
-This is cue #9759
-
-9760
-02:42:40.000 --> 02:42:41.000
-This is cue #9760
-
-9761
-02:42:41.000 --> 02:42:42.000
-This is cue #9761
-
-9762
-02:42:42.000 --> 02:42:43.000
-This is cue #9762
-
-9763
-02:42:43.000 --> 02:42:44.000
-This is cue #9763
-
-9764
-02:42:44.000 --> 02:42:45.000
-This is cue #9764
-
-9765
-02:42:45.000 --> 02:42:46.000
-This is cue #9765
-
-9766
-02:42:46.000 --> 02:42:47.000
-This is cue #9766
-
-9767
-02:42:47.000 --> 02:42:48.000
-This is cue #9767
-
-9768
-02:42:48.000 --> 02:42:49.000
-This is cue #9768
-
-9769
-02:42:49.000 --> 02:42:50.000
-This is cue #9769
-
-9770
-02:42:50.000 --> 02:42:51.000
-This is cue #9770
-
-9771
-02:42:51.000 --> 02:42:52.000
-This is cue #9771
-
-9772
-02:42:52.000 --> 02:42:53.000
-This is cue #9772
-
-9773
-02:42:53.000 --> 02:42:54.000
-This is cue #9773
-
-9774
-02:42:54.000 --> 02:42:55.000
-This is cue #9774
-
-9775
-02:42:55.000 --> 02:42:56.000
-This is cue #9775
-
-9776
-02:42:56.000 --> 02:42:57.000
-This is cue #9776
-
-9777
-02:42:57.000 --> 02:42:58.000
-This is cue #9777
-
-9778
-02:42:58.000 --> 02:42:59.000
-This is cue #9778
-
-9779
-02:42:59.000 --> 02:43:00.000
-This is cue #9779
-
-9780
-02:43:00.000 --> 02:43:01.000
-This is cue #9780
-
-9781
-02:43:01.000 --> 02:43:02.000
-This is cue #9781
-
-9782
-02:43:02.000 --> 02:43:03.000
-This is cue #9782
-
-9783
-02:43:03.000 --> 02:43:04.000
-This is cue #9783
-
-9784
-02:43:04.000 --> 02:43:05.000
-This is cue #9784
-
-9785
-02:43:05.000 --> 02:43:06.000
-This is cue #9785
-
-9786
-02:43:06.000 --> 02:43:07.000
-This is cue #9786
-
-9787
-02:43:07.000 --> 02:43:08.000
-This is cue #9787
-
-9788
-02:43:08.000 --> 02:43:09.000
-This is cue #9788
-
-9789
-02:43:09.000 --> 02:43:10.000
-This is cue #9789
-
-9790
-02:43:10.000 --> 02:43:11.000
-This is cue #9790
-
-9791
-02:43:11.000 --> 02:43:12.000
-This is cue #9791
-
-9792
-02:43:12.000 --> 02:43:13.000
-This is cue #9792
-
-9793
-02:43:13.000 --> 02:43:14.000
-This is cue #9793
-
-9794
-02:43:14.000 --> 02:43:15.000
-This is cue #9794
-
-9795
-02:43:15.000 --> 02:43:16.000
-This is cue #9795
-
-9796
-02:43:16.000 --> 02:43:17.000
-This is cue #9796
-
-9797
-02:43:17.000 --> 02:43:18.000
-This is cue #9797
-
-9798
-02:43:18.000 --> 02:43:19.000
-This is cue #9798
-
-9799
-02:43:19.000 --> 02:43:20.000
-This is cue #9799
-
-9800
-02:43:20.000 --> 02:43:21.000
-This is cue #9800
-
-9801
-02:43:21.000 --> 02:43:22.000
-This is cue #9801
-
-9802
-02:43:22.000 --> 02:43:23.000
-This is cue #9802
-
-9803
-02:43:23.000 --> 02:43:24.000
-This is cue #9803
-
-9804
-02:43:24.000 --> 02:43:25.000
-This is cue #9804
-
-9805
-02:43:25.000 --> 02:43:26.000
-This is cue #9805
-
-9806
-02:43:26.000 --> 02:43:27.000
-This is cue #9806
-
-9807
-02:43:27.000 --> 02:43:28.000
-This is cue #9807
-
-9808
-02:43:28.000 --> 02:43:29.000
-This is cue #9808
-
-9809
-02:43:29.000 --> 02:43:30.000
-This is cue #9809
-
-9810
-02:43:30.000 --> 02:43:31.000
-This is cue #9810
-
-9811
-02:43:31.000 --> 02:43:32.000
-This is cue #9811
-
-9812
-02:43:32.000 --> 02:43:33.000
-This is cue #9812
-
-9813
-02:43:33.000 --> 02:43:34.000
-This is cue #9813
-
-9814
-02:43:34.000 --> 02:43:35.000
-This is cue #9814
-
-9815
-02:43:35.000 --> 02:43:36.000
-This is cue #9815
-
-9816
-02:43:36.000 --> 02:43:37.000
-This is cue #9816
-
-9817
-02:43:37.000 --> 02:43:38.000
-This is cue #9817
-
-9818
-02:43:38.000 --> 02:43:39.000
-This is cue #9818
-
-9819
-02:43:39.000 --> 02:43:40.000
-This is cue #9819
-
-9820
-02:43:40.000 --> 02:43:41.000
-This is cue #9820
-
-9821
-02:43:41.000 --> 02:43:42.000
-This is cue #9821
-
-9822
-02:43:42.000 --> 02:43:43.000
-This is cue #9822
-
-9823
-02:43:43.000 --> 02:43:44.000
-This is cue #9823
-
-9824
-02:43:44.000 --> 02:43:45.000
-This is cue #9824
-
-9825
-02:43:45.000 --> 02:43:46.000
-This is cue #9825
-
-9826
-02:43:46.000 --> 02:43:47.000
-This is cue #9826
-
-9827
-02:43:47.000 --> 02:43:48.000
-This is cue #9827
-
-9828
-02:43:48.000 --> 02:43:49.000
-This is cue #9828
-
-9829
-02:43:49.000 --> 02:43:50.000
-This is cue #9829
-
-9830
-02:43:50.000 --> 02:43:51.000
-This is cue #9830
-
-9831
-02:43:51.000 --> 02:43:52.000
-This is cue #9831
-
-9832
-02:43:52.000 --> 02:43:53.000
-This is cue #9832
-
-9833
-02:43:53.000 --> 02:43:54.000
-This is cue #9833
-
-9834
-02:43:54.000 --> 02:43:55.000
-This is cue #9834
-
-9835
-02:43:55.000 --> 02:43:56.000
-This is cue #9835
-
-9836
-02:43:56.000 --> 02:43:57.000
-This is cue #9836
-
-9837
-02:43:57.000 --> 02:43:58.000
-This is cue #9837
-
-9838
-02:43:58.000 --> 02:43:59.000
-This is cue #9838
-
-9839
-02:43:59.000 --> 02:44:00.000
-This is cue #9839
-
-9840
-02:44:00.000 --> 02:44:01.000
-This is cue #9840
-
-9841
-02:44:01.000 --> 02:44:02.000
-This is cue #9841
-
-9842
-02:44:02.000 --> 02:44:03.000
-This is cue #9842
-
-9843
-02:44:03.000 --> 02:44:04.000
-This is cue #9843
-
-9844
-02:44:04.000 --> 02:44:05.000
-This is cue #9844
-
-9845
-02:44:05.000 --> 02:44:06.000
-This is cue #9845
-
-9846
-02:44:06.000 --> 02:44:07.000
-This is cue #9846
-
-9847
-02:44:07.000 --> 02:44:08.000
-This is cue #9847
-
-9848
-02:44:08.000 --> 02:44:09.000
-This is cue #9848
-
-9849
-02:44:09.000 --> 02:44:10.000
-This is cue #9849
-
-9850
-02:44:10.000 --> 02:44:11.000
-This is cue #9850
-
-9851
-02:44:11.000 --> 02:44:12.000
-This is cue #9851
-
-9852
-02:44:12.000 --> 02:44:13.000
-This is cue #9852
-
-9853
-02:44:13.000 --> 02:44:14.000
-This is cue #9853
-
-9854
-02:44:14.000 --> 02:44:15.000
-This is cue #9854
-
-9855
-02:44:15.000 --> 02:44:16.000
-This is cue #9855
-
-9856
-02:44:16.000 --> 02:44:17.000
-This is cue #9856
-
-9857
-02:44:17.000 --> 02:44:18.000
-This is cue #9857
-
-9858
-02:44:18.000 --> 02:44:19.000
-This is cue #9858
-
-9859
-02:44:19.000 --> 02:44:20.000
-This is cue #9859
-
-9860
-02:44:20.000 --> 02:44:21.000
-This is cue #9860
-
-9861
-02:44:21.000 --> 02:44:22.000
-This is cue #9861
-
-9862
-02:44:22.000 --> 02:44:23.000
-This is cue #9862
-
-9863
-02:44:23.000 --> 02:44:24.000
-This is cue #9863
-
-9864
-02:44:24.000 --> 02:44:25.000
-This is cue #9864
-
-9865
-02:44:25.000 --> 02:44:26.000
-This is cue #9865
-
-9866
-02:44:26.000 --> 02:44:27.000
-This is cue #9866
-
-9867
-02:44:27.000 --> 02:44:28.000
-This is cue #9867
-
-9868
-02:44:28.000 --> 02:44:29.000
-This is cue #9868
-
-9869
-02:44:29.000 --> 02:44:30.000
-This is cue #9869
-
-9870
-02:44:30.000 --> 02:44:31.000
-This is cue #9870
-
-9871
-02:44:31.000 --> 02:44:32.000
-This is cue #9871
-
-9872
-02:44:32.000 --> 02:44:33.000
-This is cue #9872
-
-9873
-02:44:33.000 --> 02:44:34.000
-This is cue #9873
-
-9874
-02:44:34.000 --> 02:44:35.000
-This is cue #9874
-
-9875
-02:44:35.000 --> 02:44:36.000
-This is cue #9875
-
-9876
-02:44:36.000 --> 02:44:37.000
-This is cue #9876
-
-9877
-02:44:37.000 --> 02:44:38.000
-This is cue #9877
-
-9878
-02:44:38.000 --> 02:44:39.000
-This is cue #9878
-
-9879
-02:44:39.000 --> 02:44:40.000
-This is cue #9879
-
-9880
-02:44:40.000 --> 02:44:41.000
-This is cue #9880
-
-9881
-02:44:41.000 --> 02:44:42.000
-This is cue #9881
-
-9882
-02:44:42.000 --> 02:44:43.000
-This is cue #9882
-
-9883
-02:44:43.000 --> 02:44:44.000
-This is cue #9883
-
-9884
-02:44:44.000 --> 02:44:45.000
-This is cue #9884
-
-9885
-02:44:45.000 --> 02:44:46.000
-This is cue #9885
-
-9886
-02:44:46.000 --> 02:44:47.000
-This is cue #9886
-
-9887
-02:44:47.000 --> 02:44:48.000
-This is cue #9887
-
-9888
-02:44:48.000 --> 02:44:49.000
-This is cue #9888
-
-9889
-02:44:49.000 --> 02:44:50.000
-This is cue #9889
-
-9890
-02:44:50.000 --> 02:44:51.000
-This is cue #9890
-
-9891
-02:44:51.000 --> 02:44:52.000
-This is cue #9891
-
-9892
-02:44:52.000 --> 02:44:53.000
-This is cue #9892
-
-9893
-02:44:53.000 --> 02:44:54.000
-This is cue #9893
-
-9894
-02:44:54.000 --> 02:44:55.000
-This is cue #9894
-
-9895
-02:44:55.000 --> 02:44:56.000
-This is cue #9895
-
-9896
-02:44:56.000 --> 02:44:57.000
-This is cue #9896
-
-9897
-02:44:57.000 --> 02:44:58.000
-This is cue #9897
-
-9898
-02:44:58.000 --> 02:44:59.000
-This is cue #9898
-
-9899
-02:44:59.000 --> 02:45:00.000
-This is cue #9899
-
-9900
-02:45:00.000 --> 02:45:01.000
-This is cue #9900
-
-9901
-02:45:01.000 --> 02:45:02.000
-This is cue #9901
-
-9902
-02:45:02.000 --> 02:45:03.000
-This is cue #9902
-
-9903
-02:45:03.000 --> 02:45:04.000
-This is cue #9903
-
-9904
-02:45:04.000 --> 02:45:05.000
-This is cue #9904
-
-9905
-02:45:05.000 --> 02:45:06.000
-This is cue #9905
-
-9906
-02:45:06.000 --> 02:45:07.000
-This is cue #9906
-
-9907
-02:45:07.000 --> 02:45:08.000
-This is cue #9907
-
-9908
-02:45:08.000 --> 02:45:09.000
-This is cue #9908
-
-9909
-02:45:09.000 --> 02:45:10.000
-This is cue #9909
-
-9910
-02:45:10.000 --> 02:45:11.000
-This is cue #9910
-
-9911
-02:45:11.000 --> 02:45:12.000
-This is cue #9911
-
-9912
-02:45:12.000 --> 02:45:13.000
-This is cue #9912
-
-9913
-02:45:13.000 --> 02:45:14.000
-This is cue #9913
-
-9914
-02:45:14.000 --> 02:45:15.000
-This is cue #9914
-
-9915
-02:45:15.000 --> 02:45:16.000
-This is cue #9915
-
-9916
-02:45:16.000 --> 02:45:17.000
-This is cue #9916
-
-9917
-02:45:17.000 --> 02:45:18.000
-This is cue #9917
-
-9918
-02:45:18.000 --> 02:45:19.000
-This is cue #9918
-
-9919
-02:45:19.000 --> 02:45:20.000
-This is cue #9919
-
-9920
-02:45:20.000 --> 02:45:21.000
-This is cue #9920
-
-9921
-02:45:21.000 --> 02:45:22.000
-This is cue #9921
-
-9922
-02:45:22.000 --> 02:45:23.000
-This is cue #9922
-
-9923
-02:45:23.000 --> 02:45:24.000
-This is cue #9923
-
-9924
-02:45:24.000 --> 02:45:25.000
-This is cue #9924
-
-9925
-02:45:25.000 --> 02:45:26.000
-This is cue #9925
-
-9926
-02:45:26.000 --> 02:45:27.000
-This is cue #9926
-
-9927
-02:45:27.000 --> 02:45:28.000
-This is cue #9927
-
-9928
-02:45:28.000 --> 02:45:29.000
-This is cue #9928
-
-9929
-02:45:29.000 --> 02:45:30.000
-This is cue #9929
-
-9930
-02:45:30.000 --> 02:45:31.000
-This is cue #9930
-
-9931
-02:45:31.000 --> 02:45:32.000
-This is cue #9931
-
-9932
-02:45:32.000 --> 02:45:33.000
-This is cue #9932
-
-9933
-02:45:33.000 --> 02:45:34.000
-This is cue #9933
-
-9934
-02:45:34.000 --> 02:45:35.000
-This is cue #9934
-
-9935
-02:45:35.000 --> 02:45:36.000
-This is cue #9935
-
-9936
-02:45:36.000 --> 02:45:37.000
-This is cue #9936
-
-9937
-02:45:37.000 --> 02:45:38.000
-This is cue #9937
-
-9938
-02:45:38.000 --> 02:45:39.000
-This is cue #9938
-
-9939
-02:45:39.000 --> 02:45:40.000
-This is cue #9939
-
-9940
-02:45:40.000 --> 02:45:41.000
-This is cue #9940
-
-9941
-02:45:41.000 --> 02:45:42.000
-This is cue #9941
-
-9942
-02:45:42.000 --> 02:45:43.000
-This is cue #9942
-
-9943
-02:45:43.000 --> 02:45:44.000
-This is cue #9943
-
-9944
-02:45:44.000 --> 02:45:45.000
-This is cue #9944
-
-9945
-02:45:45.000 --> 02:45:46.000
-This is cue #9945
-
-9946
-02:45:46.000 --> 02:45:47.000
-This is cue #9946
-
-9947
-02:45:47.000 --> 02:45:48.000
-This is cue #9947
-
-9948
-02:45:48.000 --> 02:45:49.000
-This is cue #9948
-
-9949
-02:45:49.000 --> 02:45:50.000
-This is cue #9949
-
-9950
-02:45:50.000 --> 02:45:51.000
-This is cue #9950
-
-9951
-02:45:51.000 --> 02:45:52.000
-This is cue #9951
-
-9952
-02:45:52.000 --> 02:45:53.000
-This is cue #9952
-
-9953
-02:45:53.000 --> 02:45:54.000
-This is cue #9953
-
-9954
-02:45:54.000 --> 02:45:55.000
-This is cue #9954
-
-9955
-02:45:55.000 --> 02:45:56.000
-This is cue #9955
-
-9956
-02:45:56.000 --> 02:45:57.000
-This is cue #9956
-
-9957
-02:45:57.000 --> 02:45:58.000
-This is cue #9957
-
-9958
-02:45:58.000 --> 02:45:59.000
-This is cue #9958
-
-9959
-02:45:59.000 --> 02:46:00.000
-This is cue #9959
-
-9960
-02:46:00.000 --> 02:46:01.000
-This is cue #9960
-
-9961
-02:46:01.000 --> 02:46:02.000
-This is cue #9961
-
-9962
-02:46:02.000 --> 02:46:03.000
-This is cue #9962
-
-9963
-02:46:03.000 --> 02:46:04.000
-This is cue #9963
-
-9964
-02:46:04.000 --> 02:46:05.000
-This is cue #9964
-
-9965
-02:46:05.000 --> 02:46:06.000
-This is cue #9965
-
-9966
-02:46:06.000 --> 02:46:07.000
-This is cue #9966
-
-9967
-02:46:07.000 --> 02:46:08.000
-This is cue #9967
-
-9968
-02:46:08.000 --> 02:46:09.000
-This is cue #9968
-
-9969
-02:46:09.000 --> 02:46:10.000
-This is cue #9969
-
-9970
-02:46:10.000 --> 02:46:11.000
-This is cue #9970
-
-9971
-02:46:11.000 --> 02:46:12.000
-This is cue #9971
-
-9972
-02:46:12.000 --> 02:46:13.000
-This is cue #9972
-
-9973
-02:46:13.000 --> 02:46:14.000
-This is cue #9973
-
-9974
-02:46:14.000 --> 02:46:15.000
-This is cue #9974
-
-9975
-02:46:15.000 --> 02:46:16.000
-This is cue #9975
-
-9976
-02:46:16.000 --> 02:46:17.000
-This is cue #9976
-
-9977
-02:46:17.000 --> 02:46:18.000
-This is cue #9977
-
-9978
-02:46:18.000 --> 02:46:19.000
-This is cue #9978
-
-9979
-02:46:19.000 --> 02:46:20.000
-This is cue #9979
-
-9980
-02:46:20.000 --> 02:46:21.000
-This is cue #9980
-
-9981
-02:46:21.000 --> 02:46:22.000
-This is cue #9981
-
-9982
-02:46:22.000 --> 02:46:23.000
-This is cue #9982
-
-9983
-02:46:23.000 --> 02:46:24.000
-This is cue #9983
-
-9984
-02:46:24.000 --> 02:46:25.000
-This is cue #9984
-
-9985
-02:46:25.000 --> 02:46:26.000
-This is cue #9985
-
-9986
-02:46:26.000 --> 02:46:27.000
-This is cue #9986
-
-9987
-02:46:27.000 --> 02:46:28.000
-This is cue #9987
-
-9988
-02:46:28.000 --> 02:46:29.000
-This is cue #9988
-
-9989
-02:46:29.000 --> 02:46:30.000
-This is cue #9989
-
-9990
-02:46:30.000 --> 02:46:31.000
-This is cue #9990
-
-9991
-02:46:31.000 --> 02:46:32.000
-This is cue #9991
-
-9992
-02:46:32.000 --> 02:46:33.000
-This is cue #9992
-
-9993
-02:46:33.000 --> 02:46:34.000
-This is cue #9993
-
-9994
-02:46:34.000 --> 02:46:35.000
-This is cue #9994
-
-9995
-02:46:35.000 --> 02:46:36.000
-This is cue #9995
-
-9996
-02:46:36.000 --> 02:46:37.000
-This is cue #9996
-
-9997
-02:46:37.000 --> 02:46:38.000
-This is cue #9997
-
-9998
-02:46:38.000 --> 02:46:39.000
-This is cue #9998
-
-9999
-02:46:39.000 --> 02:46:40.000
-This is cue #9999
-
-10000
-02:46:40.000 --> 02:46:41.000
-This is cue #10000
-
-10001
-02:46:41.000 --> 02:46:42.000
-This is cue #10001
-
-10002
-02:46:42.000 --> 02:46:43.000
-This is cue #10002
-
-10003
-02:46:43.000 --> 02:46:44.000
-This is cue #10003
-
-10004
-02:46:44.000 --> 02:46:45.000
-This is cue #10004
-
-10005
-02:46:45.000 --> 02:46:46.000
-This is cue #10005
-
-10006
-02:46:46.000 --> 02:46:47.000
-This is cue #10006
-
-10007
-02:46:47.000 --> 02:46:48.000
-This is cue #10007
-
-10008
-02:46:48.000 --> 02:46:49.000
-This is cue #10008
-
-10009
-02:46:49.000 --> 02:46:50.000
-This is cue #10009
-
-10010
-02:46:50.000 --> 02:46:51.000
-This is cue #10010
-
-10011
-02:46:51.000 --> 02:46:52.000
-This is cue #10011
-
-10012
-02:46:52.000 --> 02:46:53.000
-This is cue #10012
-
-10013
-02:46:53.000 --> 02:46:54.000
-This is cue #10013
-
-10014
-02:46:54.000 --> 02:46:55.000
-This is cue #10014
-
-10015
-02:46:55.000 --> 02:46:56.000
-This is cue #10015
-
-10016
-02:46:56.000 --> 02:46:57.000
-This is cue #10016
-
-10017
-02:46:57.000 --> 02:46:58.000
-This is cue #10017
-
-10018
-02:46:58.000 --> 02:46:59.000
-This is cue #10018
-
-10019
-02:46:59.000 --> 02:47:00.000
-This is cue #10019
-
-10020
-02:47:00.000 --> 02:47:01.000
-This is cue #10020
-
-10021
-02:47:01.000 --> 02:47:02.000
-This is cue #10021
-
-10022
-02:47:02.000 --> 02:47:03.000
-This is cue #10022
-
-10023
-02:47:03.000 --> 02:47:04.000
-This is cue #10023
-
-10024
-02:47:04.000 --> 02:47:05.000
-This is cue #10024
-
-10025
-02:47:05.000 --> 02:47:06.000
-This is cue #10025
-
-10026
-02:47:06.000 --> 02:47:07.000
-This is cue #10026
-
-10027
-02:47:07.000 --> 02:47:08.000
-This is cue #10027
-
-10028
-02:47:08.000 --> 02:47:09.000
-This is cue #10028
-
-10029
-02:47:09.000 --> 02:47:10.000
-This is cue #10029
-
-10030
-02:47:10.000 --> 02:47:11.000
-This is cue #10030
-
-10031
-02:47:11.000 --> 02:47:12.000
-This is cue #10031
-
-10032
-02:47:12.000 --> 02:47:13.000
-This is cue #10032
-
-10033
-02:47:13.000 --> 02:47:14.000
-This is cue #10033
-
-10034
-02:47:14.000 --> 02:47:15.000
-This is cue #10034
-
-10035
-02:47:15.000 --> 02:47:16.000
-This is cue #10035
-
-10036
-02:47:16.000 --> 02:47:17.000
-This is cue #10036
-
-10037
-02:47:17.000 --> 02:47:18.000
-This is cue #10037
-
-10038
-02:47:18.000 --> 02:47:19.000
-This is cue #10038
-
-10039
-02:47:19.000 --> 02:47:20.000
-This is cue #10039
-
-10040
-02:47:20.000 --> 02:47:21.000
-This is cue #10040
-
-10041
-02:47:21.000 --> 02:47:22.000
-This is cue #10041
-
-10042
-02:47:22.000 --> 02:47:23.000
-This is cue #10042
-
-10043
-02:47:23.000 --> 02:47:24.000
-This is cue #10043
-
-10044
-02:47:24.000 --> 02:47:25.000
-This is cue #10044
-
-10045
-02:47:25.000 --> 02:47:26.000
-This is cue #10045
-
-10046
-02:47:26.000 --> 02:47:27.000
-This is cue #10046
-
-10047
-02:47:27.000 --> 02:47:28.000
-This is cue #10047
-
-10048
-02:47:28.000 --> 02:47:29.000
-This is cue #10048
-
-10049
-02:47:29.000 --> 02:47:30.000
-This is cue #10049
-
-10050
-02:47:30.000 --> 02:47:31.000
-This is cue #10050
-
-10051
-02:47:31.000 --> 02:47:32.000
-This is cue #10051
-
-10052
-02:47:32.000 --> 02:47:33.000
-This is cue #10052
-
-10053
-02:47:33.000 --> 02:47:34.000
-This is cue #10053
-
-10054
-02:47:34.000 --> 02:47:35.000
-This is cue #10054
-
-10055
-02:47:35.000 --> 02:47:36.000
-This is cue #10055
-
-10056
-02:47:36.000 --> 02:47:37.000
-This is cue #10056
-
-10057
-02:47:37.000 --> 02:47:38.000
-This is cue #10057
-
-10058
-02:47:38.000 --> 02:47:39.000
-This is cue #10058
-
-10059
-02:47:39.000 --> 02:47:40.000
-This is cue #10059
-
-10060
-02:47:40.000 --> 02:47:41.000
-This is cue #10060
-
-10061
-02:47:41.000 --> 02:47:42.000
-This is cue #10061
-
-10062
-02:47:42.000 --> 02:47:43.000
-This is cue #10062
-
-10063
-02:47:43.000 --> 02:47:44.000
-This is cue #10063
-
-10064
-02:47:44.000 --> 02:47:45.000
-This is cue #10064
-
-10065
-02:47:45.000 --> 02:47:46.000
-This is cue #10065
-
-10066
-02:47:46.000 --> 02:47:47.000
-This is cue #10066
-
-10067
-02:47:47.000 --> 02:47:48.000
-This is cue #10067
-
-10068
-02:47:48.000 --> 02:47:49.000
-This is cue #10068
-
-10069
-02:47:49.000 --> 02:47:50.000
-This is cue #10069
-
-10070
-02:47:50.000 --> 02:47:51.000
-This is cue #10070
-
-10071
-02:47:51.000 --> 02:47:52.000
-This is cue #10071
-
-10072
-02:47:52.000 --> 02:47:53.000
-This is cue #10072
-
-10073
-02:47:53.000 --> 02:47:54.000
-This is cue #10073
-
-10074
-02:47:54.000 --> 02:47:55.000
-This is cue #10074
-
-10075
-02:47:55.000 --> 02:47:56.000
-This is cue #10075
-
-10076
-02:47:56.000 --> 02:47:57.000
-This is cue #10076
-
-10077
-02:47:57.000 --> 02:47:58.000
-This is cue #10077
-
-10078
-02:47:58.000 --> 02:47:59.000
-This is cue #10078
-
-10079
-02:47:59.000 --> 02:48:00.000
-This is cue #10079
-
-10080
-02:48:00.000 --> 02:48:01.000
-This is cue #10080
-
-10081
-02:48:01.000 --> 02:48:02.000
-This is cue #10081
-
-10082
-02:48:02.000 --> 02:48:03.000
-This is cue #10082
-
-10083
-02:48:03.000 --> 02:48:04.000
-This is cue #10083
-
-10084
-02:48:04.000 --> 02:48:05.000
-This is cue #10084
-
-10085
-02:48:05.000 --> 02:48:06.000
-This is cue #10085
-
-10086
-02:48:06.000 --> 02:48:07.000
-This is cue #10086
-
-10087
-02:48:07.000 --> 02:48:08.000
-This is cue #10087
-
-10088
-02:48:08.000 --> 02:48:09.000
-This is cue #10088
-
-10089
-02:48:09.000 --> 02:48:10.000
-This is cue #10089
-
-10090
-02:48:10.000 --> 02:48:11.000
-This is cue #10090
-
-10091
-02:48:11.000 --> 02:48:12.000
-This is cue #10091
-
-10092
-02:48:12.000 --> 02:48:13.000
-This is cue #10092
-
-10093
-02:48:13.000 --> 02:48:14.000
-This is cue #10093
-
-10094
-02:48:14.000 --> 02:48:15.000
-This is cue #10094
-
-10095
-02:48:15.000 --> 02:48:16.000
-This is cue #10095
-
-10096
-02:48:16.000 --> 02:48:17.000
-This is cue #10096
-
-10097
-02:48:17.000 --> 02:48:18.000
-This is cue #10097
-
-10098
-02:48:18.000 --> 02:48:19.000
-This is cue #10098
-
-10099
-02:48:19.000 --> 02:48:20.000
-This is cue #10099
-
-10100
-02:48:20.000 --> 02:48:21.000
-This is cue #10100
-
-10101
-02:48:21.000 --> 02:48:22.000
-This is cue #10101
-
-10102
-02:48:22.000 --> 02:48:23.000
-This is cue #10102
-
-10103
-02:48:23.000 --> 02:48:24.000
-This is cue #10103
-
-10104
-02:48:24.000 --> 02:48:25.000
-This is cue #10104
-
-10105
-02:48:25.000 --> 02:48:26.000
-This is cue #10105
-
-10106
-02:48:26.000 --> 02:48:27.000
-This is cue #10106
-
-10107
-02:48:27.000 --> 02:48:28.000
-This is cue #10107
-
-10108
-02:48:28.000 --> 02:48:29.000
-This is cue #10108
-
-10109
-02:48:29.000 --> 02:48:30.000
-This is cue #10109
-
-10110
-02:48:30.000 --> 02:48:31.000
-This is cue #10110
-
-10111
-02:48:31.000 --> 02:48:32.000
-This is cue #10111
-
-10112
-02:48:32.000 --> 02:48:33.000
-This is cue #10112
-
-10113
-02:48:33.000 --> 02:48:34.000
-This is cue #10113
-
-10114
-02:48:34.000 --> 02:48:35.000
-This is cue #10114
-
-10115
-02:48:35.000 --> 02:48:36.000
-This is cue #10115
-
-10116
-02:48:36.000 --> 02:48:37.000
-This is cue #10116
-
-10117
-02:48:37.000 --> 02:48:38.000
-This is cue #10117
-
-10118
-02:48:38.000 --> 02:48:39.000
-This is cue #10118
-
-10119
-02:48:39.000 --> 02:48:40.000
-This is cue #10119
-
-10120
-02:48:40.000 --> 02:48:41.000
-This is cue #10120
-
-10121
-02:48:41.000 --> 02:48:42.000
-This is cue #10121
-
-10122
-02:48:42.000 --> 02:48:43.000
-This is cue #10122
-
-10123
-02:48:43.000 --> 02:48:44.000
-This is cue #10123
-
-10124
-02:48:44.000 --> 02:48:45.000
-This is cue #10124
-
-10125
-02:48:45.000 --> 02:48:46.000
-This is cue #10125
-
-10126
-02:48:46.000 --> 02:48:47.000
-This is cue #10126
-
-10127
-02:48:47.000 --> 02:48:48.000
-This is cue #10127
-
-10128
-02:48:48.000 --> 02:48:49.000
-This is cue #10128
-
-10129
-02:48:49.000 --> 02:48:50.000
-This is cue #10129
-
-10130
-02:48:50.000 --> 02:48:51.000
-This is cue #10130
-
-10131
-02:48:51.000 --> 02:48:52.000
-This is cue #10131
-
-10132
-02:48:52.000 --> 02:48:53.000
-This is cue #10132
-
-10133
-02:48:53.000 --> 02:48:54.000
-This is cue #10133
-
-10134
-02:48:54.000 --> 02:48:55.000
-This is cue #10134
-
-10135
-02:48:55.000 --> 02:48:56.000
-This is cue #10135
-
-10136
-02:48:56.000 --> 02:48:57.000
-This is cue #10136
-
-10137
-02:48:57.000 --> 02:48:58.000
-This is cue #10137
-
-10138
-02:48:58.000 --> 02:48:59.000
-This is cue #10138
-
-10139
-02:48:59.000 --> 02:49:00.000
-This is cue #10139
-
-10140
-02:49:00.000 --> 02:49:01.000
-This is cue #10140
-
-10141
-02:49:01.000 --> 02:49:02.000
-This is cue #10141
-
-10142
-02:49:02.000 --> 02:49:03.000
-This is cue #10142
-
-10143
-02:49:03.000 --> 02:49:04.000
-This is cue #10143
-
-10144
-02:49:04.000 --> 02:49:05.000
-This is cue #10144
-
-10145
-02:49:05.000 --> 02:49:06.000
-This is cue #10145
-
-10146
-02:49:06.000 --> 02:49:07.000
-This is cue #10146
-
-10147
-02:49:07.000 --> 02:49:08.000
-This is cue #10147
-
-10148
-02:49:08.000 --> 02:49:09.000
-This is cue #10148
-
-10149
-02:49:09.000 --> 02:49:10.000
-This is cue #10149
-
-10150
-02:49:10.000 --> 02:49:11.000
-This is cue #10150
-
-10151
-02:49:11.000 --> 02:49:12.000
-This is cue #10151
-
-10152
-02:49:12.000 --> 02:49:13.000
-This is cue #10152
-
-10153
-02:49:13.000 --> 02:49:14.000
-This is cue #10153
-
-10154
-02:49:14.000 --> 02:49:15.000
-This is cue #10154
-
-10155
-02:49:15.000 --> 02:49:16.000
-This is cue #10155
-
-10156
-02:49:16.000 --> 02:49:17.000
-This is cue #10156
-
-10157
-02:49:17.000 --> 02:49:18.000
-This is cue #10157
-
-10158
-02:49:18.000 --> 02:49:19.000
-This is cue #10158
-
-10159
-02:49:19.000 --> 02:49:20.000
-This is cue #10159
-
-10160
-02:49:20.000 --> 02:49:21.000
-This is cue #10160
-
-10161
-02:49:21.000 --> 02:49:22.000
-This is cue #10161
-
-10162
-02:49:22.000 --> 02:49:23.000
-This is cue #10162
-
-10163
-02:49:23.000 --> 02:49:24.000
-This is cue #10163
-
-10164
-02:49:24.000 --> 02:49:25.000
-This is cue #10164
-
-10165
-02:49:25.000 --> 02:49:26.000
-This is cue #10165
-
-10166
-02:49:26.000 --> 02:49:27.000
-This is cue #10166
-
-10167
-02:49:27.000 --> 02:49:28.000
-This is cue #10167
-
-10168
-02:49:28.000 --> 02:49:29.000
-This is cue #10168
-
-10169
-02:49:29.000 --> 02:49:30.000
-This is cue #10169
-
-10170
-02:49:30.000 --> 02:49:31.000
-This is cue #10170
-
-10171
-02:49:31.000 --> 02:49:32.000
-This is cue #10171
-
-10172
-02:49:32.000 --> 02:49:33.000
-This is cue #10172
-
-10173
-02:49:33.000 --> 02:49:34.000
-This is cue #10173
-
-10174
-02:49:34.000 --> 02:49:35.000
-This is cue #10174
-
-10175
-02:49:35.000 --> 02:49:36.000
-This is cue #10175
-
-10176
-02:49:36.000 --> 02:49:37.000
-This is cue #10176
-
-10177
-02:49:37.000 --> 02:49:38.000
-This is cue #10177
-
-10178
-02:49:38.000 --> 02:49:39.000
-This is cue #10178
-
-10179
-02:49:39.000 --> 02:49:40.000
-This is cue #10179
-
-10180
-02:49:40.000 --> 02:49:41.000
-This is cue #10180
-
-10181
-02:49:41.000 --> 02:49:42.000
-This is cue #10181
-
-10182
-02:49:42.000 --> 02:49:43.000
-This is cue #10182
-
-10183
-02:49:43.000 --> 02:49:44.000
-This is cue #10183
-
-10184
-02:49:44.000 --> 02:49:45.000
-This is cue #10184
-
-10185
-02:49:45.000 --> 02:49:46.000
-This is cue #10185
-
-10186
-02:49:46.000 --> 02:49:47.000
-This is cue #10186
-
-10187
-02:49:47.000 --> 02:49:48.000
-This is cue #10187
-
-10188
-02:49:48.000 --> 02:49:49.000
-This is cue #10188
-
-10189
-02:49:49.000 --> 02:49:50.000
-This is cue #10189
-
-10190
-02:49:50.000 --> 02:49:51.000
-This is cue #10190
-
-10191
-02:49:51.000 --> 02:49:52.000
-This is cue #10191
-
-10192
-02:49:52.000 --> 02:49:53.000
-This is cue #10192
-
-10193
-02:49:53.000 --> 02:49:54.000
-This is cue #10193
-
-10194
-02:49:54.000 --> 02:49:55.000
-This is cue #10194
-
-10195
-02:49:55.000 --> 02:49:56.000
-This is cue #10195
-
-10196
-02:49:56.000 --> 02:49:57.000
-This is cue #10196
-
-10197
-02:49:57.000 --> 02:49:58.000
-This is cue #10197
-
-10198
-02:49:58.000 --> 02:49:59.000
-This is cue #10198
-
-10199
-02:49:59.000 --> 02:50:00.000
-This is cue #10199
-
-10200
-02:50:00.000 --> 02:50:01.000
-This is cue #10200
-
-10201
-02:50:01.000 --> 02:50:02.000
-This is cue #10201
-
-10202
-02:50:02.000 --> 02:50:03.000
-This is cue #10202
-
-10203
-02:50:03.000 --> 02:50:04.000
-This is cue #10203
-
-10204
-02:50:04.000 --> 02:50:05.000
-This is cue #10204
-
-10205
-02:50:05.000 --> 02:50:06.000
-This is cue #10205
-
-10206
-02:50:06.000 --> 02:50:07.000
-This is cue #10206
-
-10207
-02:50:07.000 --> 02:50:08.000
-This is cue #10207
-
-10208
-02:50:08.000 --> 02:50:09.000
-This is cue #10208
-
-10209
-02:50:09.000 --> 02:50:10.000
-This is cue #10209
-
-10210
-02:50:10.000 --> 02:50:11.000
-This is cue #10210
-
-10211
-02:50:11.000 --> 02:50:12.000
-This is cue #10211
-
-10212
-02:50:12.000 --> 02:50:13.000
-This is cue #10212
-
-10213
-02:50:13.000 --> 02:50:14.000
-This is cue #10213
-
-10214
-02:50:14.000 --> 02:50:15.000
-This is cue #10214
-
-10215
-02:50:15.000 --> 02:50:16.000
-This is cue #10215
-
-10216
-02:50:16.000 --> 02:50:17.000
-This is cue #10216
-
-10217
-02:50:17.000 --> 02:50:18.000
-This is cue #10217
-
-10218
-02:50:18.000 --> 02:50:19.000
-This is cue #10218
-
-10219
-02:50:19.000 --> 02:50:20.000
-This is cue #10219
-
-10220
-02:50:20.000 --> 02:50:21.000
-This is cue #10220
-
-10221
-02:50:21.000 --> 02:50:22.000
-This is cue #10221
-
-10222
-02:50:22.000 --> 02:50:23.000
-This is cue #10222
-
-10223
-02:50:23.000 --> 02:50:24.000
-This is cue #10223
-
-10224
-02:50:24.000 --> 02:50:25.000
-This is cue #10224
-
-10225
-02:50:25.000 --> 02:50:26.000
-This is cue #10225
-
-10226
-02:50:26.000 --> 02:50:27.000
-This is cue #10226
-
-10227
-02:50:27.000 --> 02:50:28.000
-This is cue #10227
-
-10228
-02:50:28.000 --> 02:50:29.000
-This is cue #10228
-
-10229
-02:50:29.000 --> 02:50:30.000
-This is cue #10229
-
-10230
-02:50:30.000 --> 02:50:31.000
-This is cue #10230
-
-10231
-02:50:31.000 --> 02:50:32.000
-This is cue #10231
-
-10232
-02:50:32.000 --> 02:50:33.000
-This is cue #10232
-
-10233
-02:50:33.000 --> 02:50:34.000
-This is cue #10233
-
-10234
-02:50:34.000 --> 02:50:35.000
-This is cue #10234
-
-10235
-02:50:35.000 --> 02:50:36.000
-This is cue #10235
-
-10236
-02:50:36.000 --> 02:50:37.000
-This is cue #10236
-
-10237
-02:50:37.000 --> 02:50:38.000
-This is cue #10237
-
-10238
-02:50:38.000 --> 02:50:39.000
-This is cue #10238
-
-10239
-02:50:39.000 --> 02:50:40.000
-This is cue #10239
-
-10240
-02:50:40.000 --> 02:50:41.000
-This is cue #10240
-
-10241
-02:50:41.000 --> 02:50:42.000
-This is cue #10241
-
-10242
-02:50:42.000 --> 02:50:43.000
-This is cue #10242
-
-10243
-02:50:43.000 --> 02:50:44.000
-This is cue #10243
-
-10244
-02:50:44.000 --> 02:50:45.000
-This is cue #10244
-
-10245
-02:50:45.000 --> 02:50:46.000
-This is cue #10245
-
-10246
-02:50:46.000 --> 02:50:47.000
-This is cue #10246
-
-10247
-02:50:47.000 --> 02:50:48.000
-This is cue #10247
-
-10248
-02:50:48.000 --> 02:50:49.000
-This is cue #10248
-
-10249
-02:50:49.000 --> 02:50:50.000
-This is cue #10249
-
-10250
-02:50:50.000 --> 02:50:51.000
-This is cue #10250
-
-10251
-02:50:51.000 --> 02:50:52.000
-This is cue #10251
-
-10252
-02:50:52.000 --> 02:50:53.000
-This is cue #10252
-
-10253
-02:50:53.000 --> 02:50:54.000
-This is cue #10253
-
-10254
-02:50:54.000 --> 02:50:55.000
-This is cue #10254
-
-10255
-02:50:55.000 --> 02:50:56.000
-This is cue #10255
-
-10256
-02:50:56.000 --> 02:50:57.000
-This is cue #10256
-
-10257
-02:50:57.000 --> 02:50:58.000
-This is cue #10257
-
-10258
-02:50:58.000 --> 02:50:59.000
-This is cue #10258
-
-10259
-02:50:59.000 --> 02:51:00.000
-This is cue #10259
-
-10260
-02:51:00.000 --> 02:51:01.000
-This is cue #10260
-
-10261
-02:51:01.000 --> 02:51:02.000
-This is cue #10261
-
-10262
-02:51:02.000 --> 02:51:03.000
-This is cue #10262
-
-10263
-02:51:03.000 --> 02:51:04.000
-This is cue #10263
-
-10264
-02:51:04.000 --> 02:51:05.000
-This is cue #10264
-
-10265
-02:51:05.000 --> 02:51:06.000
-This is cue #10265
-
-10266
-02:51:06.000 --> 02:51:07.000
-This is cue #10266
-
-10267
-02:51:07.000 --> 02:51:08.000
-This is cue #10267
-
-10268
-02:51:08.000 --> 02:51:09.000
-This is cue #10268
-
-10269
-02:51:09.000 --> 02:51:10.000
-This is cue #10269
-
-10270
-02:51:10.000 --> 02:51:11.000
-This is cue #10270
-
-10271
-02:51:11.000 --> 02:51:12.000
-This is cue #10271
-
-10272
-02:51:12.000 --> 02:51:13.000
-This is cue #10272
-
-10273
-02:51:13.000 --> 02:51:14.000
-This is cue #10273
-
-10274
-02:51:14.000 --> 02:51:15.000
-This is cue #10274
-
-10275
-02:51:15.000 --> 02:51:16.000
-This is cue #10275
-
-10276
-02:51:16.000 --> 02:51:17.000
-This is cue #10276
-
-10277
-02:51:17.000 --> 02:51:18.000
-This is cue #10277
-
-10278
-02:51:18.000 --> 02:51:19.000
-This is cue #10278
-
-10279
-02:51:19.000 --> 02:51:20.000
-This is cue #10279
-
-10280
-02:51:20.000 --> 02:51:21.000
-This is cue #10280
-
-10281
-02:51:21.000 --> 02:51:22.000
-This is cue #10281
-
-10282
-02:51:22.000 --> 02:51:23.000
-This is cue #10282
-
-10283
-02:51:23.000 --> 02:51:24.000
-This is cue #10283
-
-10284
-02:51:24.000 --> 02:51:25.000
-This is cue #10284
-
-10285
-02:51:25.000 --> 02:51:26.000
-This is cue #10285
-
-10286
-02:51:26.000 --> 02:51:27.000
-This is cue #10286
-
-10287
-02:51:27.000 --> 02:51:28.000
-This is cue #10287
-
-10288
-02:51:28.000 --> 02:51:29.000
-This is cue #10288
-
-10289
-02:51:29.000 --> 02:51:30.000
-This is cue #10289
-
-10290
-02:51:30.000 --> 02:51:31.000
-This is cue #10290
-
-10291
-02:51:31.000 --> 02:51:32.000
-This is cue #10291
-
-10292
-02:51:32.000 --> 02:51:33.000
-This is cue #10292
-
-10293
-02:51:33.000 --> 02:51:34.000
-This is cue #10293
-
-10294
-02:51:34.000 --> 02:51:35.000
-This is cue #10294
-
-10295
-02:51:35.000 --> 02:51:36.000
-This is cue #10295
-
-10296
-02:51:36.000 --> 02:51:37.000
-This is cue #10296
-
-10297
-02:51:37.000 --> 02:51:38.000
-This is cue #10297
-
-10298
-02:51:38.000 --> 02:51:39.000
-This is cue #10298
-
-10299
-02:51:39.000 --> 02:51:40.000
-This is cue #10299
-
-10300
-02:51:40.000 --> 02:51:41.000
-This is cue #10300
-
-10301
-02:51:41.000 --> 02:51:42.000
-This is cue #10301
-
-10302
-02:51:42.000 --> 02:51:43.000
-This is cue #10302
-
-10303
-02:51:43.000 --> 02:51:44.000
-This is cue #10303
-
-10304
-02:51:44.000 --> 02:51:45.000
-This is cue #10304
-
-10305
-02:51:45.000 --> 02:51:46.000
-This is cue #10305
-
-10306
-02:51:46.000 --> 02:51:47.000
-This is cue #10306
-
-10307
-02:51:47.000 --> 02:51:48.000
-This is cue #10307
-
-10308
-02:51:48.000 --> 02:51:49.000
-This is cue #10308
-
-10309
-02:51:49.000 --> 02:51:50.000
-This is cue #10309
-
-10310
-02:51:50.000 --> 02:51:51.000
-This is cue #10310
-
-10311
-02:51:51.000 --> 02:51:52.000
-This is cue #10311
-
-10312
-02:51:52.000 --> 02:51:53.000
-This is cue #10312
-
-10313
-02:51:53.000 --> 02:51:54.000
-This is cue #10313
-
-10314
-02:51:54.000 --> 02:51:55.000
-This is cue #10314
-
-10315
-02:51:55.000 --> 02:51:56.000
-This is cue #10315
-
-10316
-02:51:56.000 --> 02:51:57.000
-This is cue #10316
-
-10317
-02:51:57.000 --> 02:51:58.000
-This is cue #10317
-
-10318
-02:51:58.000 --> 02:51:59.000
-This is cue #10318
-
-10319
-02:51:59.000 --> 02:52:00.000
-This is cue #10319
-
-10320
-02:52:00.000 --> 02:52:01.000
-This is cue #10320
-
-10321
-02:52:01.000 --> 02:52:02.000
-This is cue #10321
-
-10322
-02:52:02.000 --> 02:52:03.000
-This is cue #10322
-
-10323
-02:52:03.000 --> 02:52:04.000
-This is cue #10323
-
-10324
-02:52:04.000 --> 02:52:05.000
-This is cue #10324
-
-10325
-02:52:05.000 --> 02:52:06.000
-This is cue #10325
-
-10326
-02:52:06.000 --> 02:52:07.000
-This is cue #10326
-
-10327
-02:52:07.000 --> 02:52:08.000
-This is cue #10327
-
-10328
-02:52:08.000 --> 02:52:09.000
-This is cue #10328
-
-10329
-02:52:09.000 --> 02:52:10.000
-This is cue #10329
-
-10330
-02:52:10.000 --> 02:52:11.000
-This is cue #10330
-
-10331
-02:52:11.000 --> 02:52:12.000
-This is cue #10331
-
-10332
-02:52:12.000 --> 02:52:13.000
-This is cue #10332
-
-10333
-02:52:13.000 --> 02:52:14.000
-This is cue #10333
-
-10334
-02:52:14.000 --> 02:52:15.000
-This is cue #10334
-
-10335
-02:52:15.000 --> 02:52:16.000
-This is cue #10335
-
-10336
-02:52:16.000 --> 02:52:17.000
-This is cue #10336
-
-10337
-02:52:17.000 --> 02:52:18.000
-This is cue #10337
-
-10338
-02:52:18.000 --> 02:52:19.000
-This is cue #10338
-
-10339
-02:52:19.000 --> 02:52:20.000
-This is cue #10339
-
-10340
-02:52:20.000 --> 02:52:21.000
-This is cue #10340
-
-10341
-02:52:21.000 --> 02:52:22.000
-This is cue #10341
-
-10342
-02:52:22.000 --> 02:52:23.000
-This is cue #10342
-
-10343
-02:52:23.000 --> 02:52:24.000
-This is cue #10343
-
-10344
-02:52:24.000 --> 02:52:25.000
-This is cue #10344
-
-10345
-02:52:25.000 --> 02:52:26.000
-This is cue #10345
-
-10346
-02:52:26.000 --> 02:52:27.000
-This is cue #10346
-
-10347
-02:52:27.000 --> 02:52:28.000
-This is cue #10347
-
-10348
-02:52:28.000 --> 02:52:29.000
-This is cue #10348
-
-10349
-02:52:29.000 --> 02:52:30.000
-This is cue #10349
-
-10350
-02:52:30.000 --> 02:52:31.000
-This is cue #10350
-
-10351
-02:52:31.000 --> 02:52:32.000
-This is cue #10351
-
-10352
-02:52:32.000 --> 02:52:33.000
-This is cue #10352
-
-10353
-02:52:33.000 --> 02:52:34.000
-This is cue #10353
-
-10354
-02:52:34.000 --> 02:52:35.000
-This is cue #10354
-
-10355
-02:52:35.000 --> 02:52:36.000
-This is cue #10355
-
-10356
-02:52:36.000 --> 02:52:37.000
-This is cue #10356
-
-10357
-02:52:37.000 --> 02:52:38.000
-This is cue #10357
-
-10358
-02:52:38.000 --> 02:52:39.000
-This is cue #10358
-
-10359
-02:52:39.000 --> 02:52:40.000
-This is cue #10359
-
-10360
-02:52:40.000 --> 02:52:41.000
-This is cue #10360
-
-10361
-02:52:41.000 --> 02:52:42.000
-This is cue #10361
-
-10362
-02:52:42.000 --> 02:52:43.000
-This is cue #10362
-
-10363
-02:52:43.000 --> 02:52:44.000
-This is cue #10363
-
-10364
-02:52:44.000 --> 02:52:45.000
-This is cue #10364
-
-10365
-02:52:45.000 --> 02:52:46.000
-This is cue #10365
-
-10366
-02:52:46.000 --> 02:52:47.000
-This is cue #10366
-
-10367
-02:52:47.000 --> 02:52:48.000
-This is cue #10367
-
-10368
-02:52:48.000 --> 02:52:49.000
-This is cue #10368
-
-10369
-02:52:49.000 --> 02:52:50.000
-This is cue #10369
-
-10370
-02:52:50.000 --> 02:52:51.000
-This is cue #10370
-
-10371
-02:52:51.000 --> 02:52:52.000
-This is cue #10371
-
-10372
-02:52:52.000 --> 02:52:53.000
-This is cue #10372
-
-10373
-02:52:53.000 --> 02:52:54.000
-This is cue #10373
-
-10374
-02:52:54.000 --> 02:52:55.000
-This is cue #10374
-
-10375
-02:52:55.000 --> 02:52:56.000
-This is cue #10375
-
-10376
-02:52:56.000 --> 02:52:57.000
-This is cue #10376
-
-10377
-02:52:57.000 --> 02:52:58.000
-This is cue #10377
-
-10378
-02:52:58.000 --> 02:52:59.000
-This is cue #10378
-
-10379
-02:52:59.000 --> 02:53:00.000
-This is cue #10379
-
-10380
-02:53:00.000 --> 02:53:01.000
-This is cue #10380
-
-10381
-02:53:01.000 --> 02:53:02.000
-This is cue #10381
-
-10382
-02:53:02.000 --> 02:53:03.000
-This is cue #10382
-
-10383
-02:53:03.000 --> 02:53:04.000
-This is cue #10383
-
-10384
-02:53:04.000 --> 02:53:05.000
-This is cue #10384
-
-10385
-02:53:05.000 --> 02:53:06.000
-This is cue #10385
-
-10386
-02:53:06.000 --> 02:53:07.000
-This is cue #10386
-
-10387
-02:53:07.000 --> 02:53:08.000
-This is cue #10387
-
-10388
-02:53:08.000 --> 02:53:09.000
-This is cue #10388
-
-10389
-02:53:09.000 --> 02:53:10.000
-This is cue #10389
-
-10390
-02:53:10.000 --> 02:53:11.000
-This is cue #10390
-
-10391
-02:53:11.000 --> 02:53:12.000
-This is cue #10391
-
-10392
-02:53:12.000 --> 02:53:13.000
-This is cue #10392
-
-10393
-02:53:13.000 --> 02:53:14.000
-This is cue #10393
-
-10394
-02:53:14.000 --> 02:53:15.000
-This is cue #10394
-
-10395
-02:53:15.000 --> 02:53:16.000
-This is cue #10395
-
-10396
-02:53:16.000 --> 02:53:17.000
-This is cue #10396
-
-10397
-02:53:17.000 --> 02:53:18.000
-This is cue #10397
-
-10398
-02:53:18.000 --> 02:53:19.000
-This is cue #10398
-
-10399
-02:53:19.000 --> 02:53:20.000
-This is cue #10399
-
-10400
-02:53:20.000 --> 02:53:21.000
-This is cue #10400
-
-10401
-02:53:21.000 --> 02:53:22.000
-This is cue #10401
-
-10402
-02:53:22.000 --> 02:53:23.000
-This is cue #10402
-
-10403
-02:53:23.000 --> 02:53:24.000
-This is cue #10403
-
-10404
-02:53:24.000 --> 02:53:25.000
-This is cue #10404
-
-10405
-02:53:25.000 --> 02:53:26.000
-This is cue #10405
-
-10406
-02:53:26.000 --> 02:53:27.000
-This is cue #10406
-
-10407
-02:53:27.000 --> 02:53:28.000
-This is cue #10407
-
-10408
-02:53:28.000 --> 02:53:29.000
-This is cue #10408
-
-10409
-02:53:29.000 --> 02:53:30.000
-This is cue #10409
-
-10410
-02:53:30.000 --> 02:53:31.000
-This is cue #10410
-
-10411
-02:53:31.000 --> 02:53:32.000
-This is cue #10411
-
-10412
-02:53:32.000 --> 02:53:33.000
-This is cue #10412
-
-10413
-02:53:33.000 --> 02:53:34.000
-This is cue #10413
-
-10414
-02:53:34.000 --> 02:53:35.000
-This is cue #10414
-
-10415
-02:53:35.000 --> 02:53:36.000
-This is cue #10415
-
-10416
-02:53:36.000 --> 02:53:37.000
-This is cue #10416
-
-10417
-02:53:37.000 --> 02:53:38.000
-This is cue #10417
-
-10418
-02:53:38.000 --> 02:53:39.000
-This is cue #10418
-
-10419
-02:53:39.000 --> 02:53:40.000
-This is cue #10419
-
-10420
-02:53:40.000 --> 02:53:41.000
-This is cue #10420
-
-10421
-02:53:41.000 --> 02:53:42.000
-This is cue #10421
-
-10422
-02:53:42.000 --> 02:53:43.000
-This is cue #10422
-
-10423
-02:53:43.000 --> 02:53:44.000
-This is cue #10423
-
-10424
-02:53:44.000 --> 02:53:45.000
-This is cue #10424
-
-10425
-02:53:45.000 --> 02:53:46.000
-This is cue #10425
-
-10426
-02:53:46.000 --> 02:53:47.000
-This is cue #10426
-
-10427
-02:53:47.000 --> 02:53:48.000
-This is cue #10427
-
-10428
-02:53:48.000 --> 02:53:49.000
-This is cue #10428
-
-10429
-02:53:49.000 --> 02:53:50.000
-This is cue #10429
-
-10430
-02:53:50.000 --> 02:53:51.000
-This is cue #10430
-
-10431
-02:53:51.000 --> 02:53:52.000
-This is cue #10431
-
-10432
-02:53:52.000 --> 02:53:53.000
-This is cue #10432
-
-10433
-02:53:53.000 --> 02:53:54.000
-This is cue #10433
-
-10434
-02:53:54.000 --> 02:53:55.000
-This is cue #10434
-
-10435
-02:53:55.000 --> 02:53:56.000
-This is cue #10435
-
-10436
-02:53:56.000 --> 02:53:57.000
-This is cue #10436
-
-10437
-02:53:57.000 --> 02:53:58.000
-This is cue #10437
-
-10438
-02:53:58.000 --> 02:53:59.000
-This is cue #10438
-
-10439
-02:53:59.000 --> 02:54:00.000
-This is cue #10439
-
-10440
-02:54:00.000 --> 02:54:01.000
-This is cue #10440
-
-10441
-02:54:01.000 --> 02:54:02.000
-This is cue #10441
-
-10442
-02:54:02.000 --> 02:54:03.000
-This is cue #10442
-
-10443
-02:54:03.000 --> 02:54:04.000
-This is cue #10443
-
-10444
-02:54:04.000 --> 02:54:05.000
-This is cue #10444
-
-10445
-02:54:05.000 --> 02:54:06.000
-This is cue #10445
-
-10446
-02:54:06.000 --> 02:54:07.000
-This is cue #10446
-
-10447
-02:54:07.000 --> 02:54:08.000
-This is cue #10447
-
-10448
-02:54:08.000 --> 02:54:09.000
-This is cue #10448
-
-10449
-02:54:09.000 --> 02:54:10.000
-This is cue #10449
-
-10450
-02:54:10.000 --> 02:54:11.000
-This is cue #10450
-
-10451
-02:54:11.000 --> 02:54:12.000
-This is cue #10451
-
-10452
-02:54:12.000 --> 02:54:13.000
-This is cue #10452
-
-10453
-02:54:13.000 --> 02:54:14.000
-This is cue #10453
-
-10454
-02:54:14.000 --> 02:54:15.000
-This is cue #10454
-
-10455
-02:54:15.000 --> 02:54:16.000
-This is cue #10455
-
-10456
-02:54:16.000 --> 02:54:17.000
-This is cue #10456
-
-10457
-02:54:17.000 --> 02:54:18.000
-This is cue #10457
-
-10458
-02:54:18.000 --> 02:54:19.000
-This is cue #10458
-
-10459
-02:54:19.000 --> 02:54:20.000
-This is cue #10459
-
-10460
-02:54:20.000 --> 02:54:21.000
-This is cue #10460
-
-10461
-02:54:21.000 --> 02:54:22.000
-This is cue #10461
-
-10462
-02:54:22.000 --> 02:54:23.000
-This is cue #10462
-
-10463
-02:54:23.000 --> 02:54:24.000
-This is cue #10463
-
-10464
-02:54:24.000 --> 02:54:25.000
-This is cue #10464
-
-10465
-02:54:25.000 --> 02:54:26.000
-This is cue #10465
-
-10466
-02:54:26.000 --> 02:54:27.000
-This is cue #10466
-
-10467
-02:54:27.000 --> 02:54:28.000
-This is cue #10467
-
-10468
-02:54:28.000 --> 02:54:29.000
-This is cue #10468
-
-10469
-02:54:29.000 --> 02:54:30.000
-This is cue #10469
-
-10470
-02:54:30.000 --> 02:54:31.000
-This is cue #10470
-
-10471
-02:54:31.000 --> 02:54:32.000
-This is cue #10471
-
-10472
-02:54:32.000 --> 02:54:33.000
-This is cue #10472
-
-10473
-02:54:33.000 --> 02:54:34.000
-This is cue #10473
-
-10474
-02:54:34.000 --> 02:54:35.000
-This is cue #10474
-
-10475
-02:54:35.000 --> 02:54:36.000
-This is cue #10475
-
-10476
-02:54:36.000 --> 02:54:37.000
-This is cue #10476
-
-10477
-02:54:37.000 --> 02:54:38.000
-This is cue #10477
-
-10478
-02:54:38.000 --> 02:54:39.000
-This is cue #10478
-
-10479
-02:54:39.000 --> 02:54:40.000
-This is cue #10479
-
-10480
-02:54:40.000 --> 02:54:41.000
-This is cue #10480
-
-10481
-02:54:41.000 --> 02:54:42.000
-This is cue #10481
-
-10482
-02:54:42.000 --> 02:54:43.000
-This is cue #10482
-
-10483
-02:54:43.000 --> 02:54:44.000
-This is cue #10483
-
-10484
-02:54:44.000 --> 02:54:45.000
-This is cue #10484
-
-10485
-02:54:45.000 --> 02:54:46.000
-This is cue #10485
-
-10486
-02:54:46.000 --> 02:54:47.000
-This is cue #10486
-
-10487
-02:54:47.000 --> 02:54:48.000
-This is cue #10487
-
-10488
-02:54:48.000 --> 02:54:49.000
-This is cue #10488
-
-10489
-02:54:49.000 --> 02:54:50.000
-This is cue #10489
-
-10490
-02:54:50.000 --> 02:54:51.000
-This is cue #10490
-
-10491
-02:54:51.000 --> 02:54:52.000
-This is cue #10491
-
-10492
-02:54:52.000 --> 02:54:53.000
-This is cue #10492
-
-10493
-02:54:53.000 --> 02:54:54.000
-This is cue #10493
-
-10494
-02:54:54.000 --> 02:54:55.000
-This is cue #10494
-
-10495
-02:54:55.000 --> 02:54:56.000
-This is cue #10495
-
-10496
-02:54:56.000 --> 02:54:57.000
-This is cue #10496
-
-10497
-02:54:57.000 --> 02:54:58.000
-This is cue #10497
-
-10498
-02:54:58.000 --> 02:54:59.000
-This is cue #10498
-
-10499
-02:54:59.000 --> 02:55:00.000
-This is cue #10499
-
-10500
-02:55:00.000 --> 02:55:01.000
-This is cue #10500
-
-10501
-02:55:01.000 --> 02:55:02.000
-This is cue #10501
-
-10502
-02:55:02.000 --> 02:55:03.000
-This is cue #10502
-
-10503
-02:55:03.000 --> 02:55:04.000
-This is cue #10503
-
-10504
-02:55:04.000 --> 02:55:05.000
-This is cue #10504
-
-10505
-02:55:05.000 --> 02:55:06.000
-This is cue #10505
-
-10506
-02:55:06.000 --> 02:55:07.000
-This is cue #10506
-
-10507
-02:55:07.000 --> 02:55:08.000
-This is cue #10507
-
-10508
-02:55:08.000 --> 02:55:09.000
-This is cue #10508
-
-10509
-02:55:09.000 --> 02:55:10.000
-This is cue #10509
-
-10510
-02:55:10.000 --> 02:55:11.000
-This is cue #10510
-
-10511
-02:55:11.000 --> 02:55:12.000
-This is cue #10511
-
-10512
-02:55:12.000 --> 02:55:13.000
-This is cue #10512
-
-10513
-02:55:13.000 --> 02:55:14.000
-This is cue #10513
-
-10514
-02:55:14.000 --> 02:55:15.000
-This is cue #10514
-
-10515
-02:55:15.000 --> 02:55:16.000
-This is cue #10515
-
-10516
-02:55:16.000 --> 02:55:17.000
-This is cue #10516
-
-10517
-02:55:17.000 --> 02:55:18.000
-This is cue #10517
-
-10518
-02:55:18.000 --> 02:55:19.000
-This is cue #10518
-
-10519
-02:55:19.000 --> 02:55:20.000
-This is cue #10519
-
-10520
-02:55:20.000 --> 02:55:21.000
-This is cue #10520
-
-10521
-02:55:21.000 --> 02:55:22.000
-This is cue #10521
-
-10522
-02:55:22.000 --> 02:55:23.000
-This is cue #10522
-
-10523
-02:55:23.000 --> 02:55:24.000
-This is cue #10523
-
-10524
-02:55:24.000 --> 02:55:25.000
-This is cue #10524
-
-10525
-02:55:25.000 --> 02:55:26.000
-This is cue #10525
-
-10526
-02:55:26.000 --> 02:55:27.000
-This is cue #10526
-
-10527
-02:55:27.000 --> 02:55:28.000
-This is cue #10527
-
-10528
-02:55:28.000 --> 02:55:29.000
-This is cue #10528
-
-10529
-02:55:29.000 --> 02:55:30.000
-This is cue #10529
-
-10530
-02:55:30.000 --> 02:55:31.000
-This is cue #10530
-
-10531
-02:55:31.000 --> 02:55:32.000
-This is cue #10531
-
-10532
-02:55:32.000 --> 02:55:33.000
-This is cue #10532
-
-10533
-02:55:33.000 --> 02:55:34.000
-This is cue #10533
-
-10534
-02:55:34.000 --> 02:55:35.000
-This is cue #10534
-
-10535
-02:55:35.000 --> 02:55:36.000
-This is cue #10535
-
-10536
-02:55:36.000 --> 02:55:37.000
-This is cue #10536
-
-10537
-02:55:37.000 --> 02:55:38.000
-This is cue #10537
-
-10538
-02:55:38.000 --> 02:55:39.000
-This is cue #10538
-
-10539
-02:55:39.000 --> 02:55:40.000
-This is cue #10539
-
-10540
-02:55:40.000 --> 02:55:41.000
-This is cue #10540
-
-10541
-02:55:41.000 --> 02:55:42.000
-This is cue #10541
-
-10542
-02:55:42.000 --> 02:55:43.000
-This is cue #10542
-
-10543
-02:55:43.000 --> 02:55:44.000
-This is cue #10543
-
-10544
-02:55:44.000 --> 02:55:45.000
-This is cue #10544
-
-10545
-02:55:45.000 --> 02:55:46.000
-This is cue #10545
-
-10546
-02:55:46.000 --> 02:55:47.000
-This is cue #10546
-
-10547
-02:55:47.000 --> 02:55:48.000
-This is cue #10547
-
-10548
-02:55:48.000 --> 02:55:49.000
-This is cue #10548
-
-10549
-02:55:49.000 --> 02:55:50.000
-This is cue #10549
-
-10550
-02:55:50.000 --> 02:55:51.000
-This is cue #10550
-
-10551
-02:55:51.000 --> 02:55:52.000
-This is cue #10551
-
-10552
-02:55:52.000 --> 02:55:53.000
-This is cue #10552
-
-10553
-02:55:53.000 --> 02:55:54.000
-This is cue #10553
-
-10554
-02:55:54.000 --> 02:55:55.000
-This is cue #10554
-
-10555
-02:55:55.000 --> 02:55:56.000
-This is cue #10555
-
-10556
-02:55:56.000 --> 02:55:57.000
-This is cue #10556
-
-10557
-02:55:57.000 --> 02:55:58.000
-This is cue #10557
-
-10558
-02:55:58.000 --> 02:55:59.000
-This is cue #10558
-
-10559
-02:55:59.000 --> 02:56:00.000
-This is cue #10559
-
-10560
-02:56:00.000 --> 02:56:01.000
-This is cue #10560
-
-10561
-02:56:01.000 --> 02:56:02.000
-This is cue #10561
-
-10562
-02:56:02.000 --> 02:56:03.000
-This is cue #10562
-
-10563
-02:56:03.000 --> 02:56:04.000
-This is cue #10563
-
-10564
-02:56:04.000 --> 02:56:05.000
-This is cue #10564
-
-10565
-02:56:05.000 --> 02:56:06.000
-This is cue #10565
-
-10566
-02:56:06.000 --> 02:56:07.000
-This is cue #10566
-
-10567
-02:56:07.000 --> 02:56:08.000
-This is cue #10567
-
-10568
-02:56:08.000 --> 02:56:09.000
-This is cue #10568
-
-10569
-02:56:09.000 --> 02:56:10.000
-This is cue #10569
-
-10570
-02:56:10.000 --> 02:56:11.000
-This is cue #10570
-
-10571
-02:56:11.000 --> 02:56:12.000
-This is cue #10571
-
-10572
-02:56:12.000 --> 02:56:13.000
-This is cue #10572
-
-10573
-02:56:13.000 --> 02:56:14.000
-This is cue #10573
-
-10574
-02:56:14.000 --> 02:56:15.000
-This is cue #10574
-
-10575
-02:56:15.000 --> 02:56:16.000
-This is cue #10575
-
-10576
-02:56:16.000 --> 02:56:17.000
-This is cue #10576
-
-10577
-02:56:17.000 --> 02:56:18.000
-This is cue #10577
-
-10578
-02:56:18.000 --> 02:56:19.000
-This is cue #10578
-
-10579
-02:56:19.000 --> 02:56:20.000
-This is cue #10579
-
-10580
-02:56:20.000 --> 02:56:21.000
-This is cue #10580
-
-10581
-02:56:21.000 --> 02:56:22.000
-This is cue #10581
-
-10582
-02:56:22.000 --> 02:56:23.000
-This is cue #10582
-
-10583
-02:56:23.000 --> 02:56:24.000
-This is cue #10583
-
-10584
-02:56:24.000 --> 02:56:25.000
-This is cue #10584
-
-10585
-02:56:25.000 --> 02:56:26.000
-This is cue #10585
-
-10586
-02:56:26.000 --> 02:56:27.000
-This is cue #10586
-
-10587
-02:56:27.000 --> 02:56:28.000
-This is cue #10587
-
-10588
-02:56:28.000 --> 02:56:29.000
-This is cue #10588
-
-10589
-02:56:29.000 --> 02:56:30.000
-This is cue #10589
-
-10590
-02:56:30.000 --> 02:56:31.000
-This is cue #10590
-
-10591
-02:56:31.000 --> 02:56:32.000
-This is cue #10591
-
-10592
-02:56:32.000 --> 02:56:33.000
-This is cue #10592
-
-10593
-02:56:33.000 --> 02:56:34.000
-This is cue #10593
-
-10594
-02:56:34.000 --> 02:56:35.000
-This is cue #10594
-
-10595
-02:56:35.000 --> 02:56:36.000
-This is cue #10595
-
-10596
-02:56:36.000 --> 02:56:37.000
-This is cue #10596
-
-10597
-02:56:37.000 --> 02:56:38.000
-This is cue #10597
-
-10598
-02:56:38.000 --> 02:56:39.000
-This is cue #10598
-
-10599
-02:56:39.000 --> 02:56:40.000
-This is cue #10599
-
-10600
-02:56:40.000 --> 02:56:41.000
-This is cue #10600
-
-10601
-02:56:41.000 --> 02:56:42.000
-This is cue #10601
-
-10602
-02:56:42.000 --> 02:56:43.000
-This is cue #10602
-
-10603
-02:56:43.000 --> 02:56:44.000
-This is cue #10603
-
-10604
-02:56:44.000 --> 02:56:45.000
-This is cue #10604
-
-10605
-02:56:45.000 --> 02:56:46.000
-This is cue #10605
-
-10606
-02:56:46.000 --> 02:56:47.000
-This is cue #10606
-
-10607
-02:56:47.000 --> 02:56:48.000
-This is cue #10607
-
-10608
-02:56:48.000 --> 02:56:49.000
-This is cue #10608
-
-10609
-02:56:49.000 --> 02:56:50.000
-This is cue #10609
-
-10610
-02:56:50.000 --> 02:56:51.000
-This is cue #10610
-
-10611
-02:56:51.000 --> 02:56:52.000
-This is cue #10611
-
-10612
-02:56:52.000 --> 02:56:53.000
-This is cue #10612
-
-10613
-02:56:53.000 --> 02:56:54.000
-This is cue #10613
-
-10614
-02:56:54.000 --> 02:56:55.000
-This is cue #10614
-
-10615
-02:56:55.000 --> 02:56:56.000
-This is cue #10615
-
-10616
-02:56:56.000 --> 02:56:57.000
-This is cue #10616
-
-10617
-02:56:57.000 --> 02:56:58.000
-This is cue #10617
-
-10618
-02:56:58.000 --> 02:56:59.000
-This is cue #10618
-
-10619
-02:56:59.000 --> 02:57:00.000
-This is cue #10619
-
-10620
-02:57:00.000 --> 02:57:01.000
-This is cue #10620
-
-10621
-02:57:01.000 --> 02:57:02.000
-This is cue #10621
-
-10622
-02:57:02.000 --> 02:57:03.000
-This is cue #10622
-
-10623
-02:57:03.000 --> 02:57:04.000
-This is cue #10623
-
-10624
-02:57:04.000 --> 02:57:05.000
-This is cue #10624
-
-10625
-02:57:05.000 --> 02:57:06.000
-This is cue #10625
-
-10626
-02:57:06.000 --> 02:57:07.000
-This is cue #10626
-
-10627
-02:57:07.000 --> 02:57:08.000
-This is cue #10627
-
-10628
-02:57:08.000 --> 02:57:09.000
-This is cue #10628
-
-10629
-02:57:09.000 --> 02:57:10.000
-This is cue #10629
-
-10630
-02:57:10.000 --> 02:57:11.000
-This is cue #10630
-
-10631
-02:57:11.000 --> 02:57:12.000
-This is cue #10631
-
-10632
-02:57:12.000 --> 02:57:13.000
-This is cue #10632
-
-10633
-02:57:13.000 --> 02:57:14.000
-This is cue #10633
-
-10634
-02:57:14.000 --> 02:57:15.000
-This is cue #10634
-
-10635
-02:57:15.000 --> 02:57:16.000
-This is cue #10635
-
-10636
-02:57:16.000 --> 02:57:17.000
-This is cue #10636
-
-10637
-02:57:17.000 --> 02:57:18.000
-This is cue #10637
-
-10638
-02:57:18.000 --> 02:57:19.000
-This is cue #10638
-
-10639
-02:57:19.000 --> 02:57:20.000
-This is cue #10639
-
-10640
-02:57:20.000 --> 02:57:21.000
-This is cue #10640
-
-10641
-02:57:21.000 --> 02:57:22.000
-This is cue #10641
-
-10642
-02:57:22.000 --> 02:57:23.000
-This is cue #10642
-
-10643
-02:57:23.000 --> 02:57:24.000
-This is cue #10643
-
-10644
-02:57:24.000 --> 02:57:25.000
-This is cue #10644
-
-10645
-02:57:25.000 --> 02:57:26.000
-This is cue #10645
-
-10646
-02:57:26.000 --> 02:57:27.000
-This is cue #10646
-
-10647
-02:57:27.000 --> 02:57:28.000
-This is cue #10647
-
-10648
-02:57:28.000 --> 02:57:29.000
-This is cue #10648
-
-10649
-02:57:29.000 --> 02:57:30.000
-This is cue #10649
-
-10650
-02:57:30.000 --> 02:57:31.000
-This is cue #10650
-
-10651
-02:57:31.000 --> 02:57:32.000
-This is cue #10651
-
-10652
-02:57:32.000 --> 02:57:33.000
-This is cue #10652
-
-10653
-02:57:33.000 --> 02:57:34.000
-This is cue #10653
-
-10654
-02:57:34.000 --> 02:57:35.000
-This is cue #10654
-
-10655
-02:57:35.000 --> 02:57:36.000
-This is cue #10655
-
-10656
-02:57:36.000 --> 02:57:37.000
-This is cue #10656
-
-10657
-02:57:37.000 --> 02:57:38.000
-This is cue #10657
-
-10658
-02:57:38.000 --> 02:57:39.000
-This is cue #10658
-
-10659
-02:57:39.000 --> 02:57:40.000
-This is cue #10659
-
-10660
-02:57:40.000 --> 02:57:41.000
-This is cue #10660
-
-10661
-02:57:41.000 --> 02:57:42.000
-This is cue #10661
-
-10662
-02:57:42.000 --> 02:57:43.000
-This is cue #10662
-
-10663
-02:57:43.000 --> 02:57:44.000
-This is cue #10663
-
-10664
-02:57:44.000 --> 02:57:45.000
-This is cue #10664
-
-10665
-02:57:45.000 --> 02:57:46.000
-This is cue #10665
-
-10666
-02:57:46.000 --> 02:57:47.000
-This is cue #10666
-
-10667
-02:57:47.000 --> 02:57:48.000
-This is cue #10667
-
-10668
-02:57:48.000 --> 02:57:49.000
-This is cue #10668
-
-10669
-02:57:49.000 --> 02:57:50.000
-This is cue #10669
-
-10670
-02:57:50.000 --> 02:57:51.000
-This is cue #10670
-
-10671
-02:57:51.000 --> 02:57:52.000
-This is cue #10671
-
-10672
-02:57:52.000 --> 02:57:53.000
-This is cue #10672
-
-10673
-02:57:53.000 --> 02:57:54.000
-This is cue #10673
-
-10674
-02:57:54.000 --> 02:57:55.000
-This is cue #10674
-
-10675
-02:57:55.000 --> 02:57:56.000
-This is cue #10675
-
-10676
-02:57:56.000 --> 02:57:57.000
-This is cue #10676
-
-10677
-02:57:57.000 --> 02:57:58.000
-This is cue #10677
-
-10678
-02:57:58.000 --> 02:57:59.000
-This is cue #10678
-
-10679
-02:57:59.000 --> 02:58:00.000
-This is cue #10679
-
-10680
-02:58:00.000 --> 02:58:01.000
-This is cue #10680
-
-10681
-02:58:01.000 --> 02:58:02.000
-This is cue #10681
-
-10682
-02:58:02.000 --> 02:58:03.000
-This is cue #10682
-
-10683
-02:58:03.000 --> 02:58:04.000
-This is cue #10683
-
-10684
-02:58:04.000 --> 02:58:05.000
-This is cue #10684
-
-10685
-02:58:05.000 --> 02:58:06.000
-This is cue #10685
-
-10686
-02:58:06.000 --> 02:58:07.000
-This is cue #10686
-
-10687
-02:58:07.000 --> 02:58:08.000
-This is cue #10687
-
-10688
-02:58:08.000 --> 02:58:09.000
-This is cue #10688
-
-10689
-02:58:09.000 --> 02:58:10.000
-This is cue #10689
-
-10690
-02:58:10.000 --> 02:58:11.000
-This is cue #10690
-
-10691
-02:58:11.000 --> 02:58:12.000
-This is cue #10691
-
-10692
-02:58:12.000 --> 02:58:13.000
-This is cue #10692
-
-10693
-02:58:13.000 --> 02:58:14.000
-This is cue #10693
-
-10694
-02:58:14.000 --> 02:58:15.000
-This is cue #10694
-
-10695
-02:58:15.000 --> 02:58:16.000
-This is cue #10695
-
-10696
-02:58:16.000 --> 02:58:17.000
-This is cue #10696
-
-10697
-02:58:17.000 --> 02:58:18.000
-This is cue #10697
-
-10698
-02:58:18.000 --> 02:58:19.000
-This is cue #10698
-
-10699
-02:58:19.000 --> 02:58:20.000
-This is cue #10699
-
-10700
-02:58:20.000 --> 02:58:21.000
-This is cue #10700
-
-10701
-02:58:21.000 --> 02:58:22.000
-This is cue #10701
-
-10702
-02:58:22.000 --> 02:58:23.000
-This is cue #10702
-
-10703
-02:58:23.000 --> 02:58:24.000
-This is cue #10703
-
-10704
-02:58:24.000 --> 02:58:25.000
-This is cue #10704
-
-10705
-02:58:25.000 --> 02:58:26.000
-This is cue #10705
-
-10706
-02:58:26.000 --> 02:58:27.000
-This is cue #10706
-
-10707
-02:58:27.000 --> 02:58:28.000
-This is cue #10707
-
-10708
-02:58:28.000 --> 02:58:29.000
-This is cue #10708
-
-10709
-02:58:29.000 --> 02:58:30.000
-This is cue #10709
-
-10710
-02:58:30.000 --> 02:58:31.000
-This is cue #10710
-
-10711
-02:58:31.000 --> 02:58:32.000
-This is cue #10711
-
-10712
-02:58:32.000 --> 02:58:33.000
-This is cue #10712
-
-10713
-02:58:33.000 --> 02:58:34.000
-This is cue #10713
-
-10714
-02:58:34.000 --> 02:58:35.000
-This is cue #10714
-
-10715
-02:58:35.000 --> 02:58:36.000
-This is cue #10715
-
-10716
-02:58:36.000 --> 02:58:37.000
-This is cue #10716
-
-10717
-02:58:37.000 --> 02:58:38.000
-This is cue #10717
-
-10718
-02:58:38.000 --> 02:58:39.000
-This is cue #10718
-
-10719
-02:58:39.000 --> 02:58:40.000
-This is cue #10719
-
-10720
-02:58:40.000 --> 02:58:41.000
-This is cue #10720
-
-10721
-02:58:41.000 --> 02:58:42.000
-This is cue #10721
-
-10722
-02:58:42.000 --> 02:58:43.000
-This is cue #10722
-
-10723
-02:58:43.000 --> 02:58:44.000
-This is cue #10723
-
-10724
-02:58:44.000 --> 02:58:45.000
-This is cue #10724
-
-10725
-02:58:45.000 --> 02:58:46.000
-This is cue #10725
-
-10726
-02:58:46.000 --> 02:58:47.000
-This is cue #10726
-
-10727
-02:58:47.000 --> 02:58:48.000
-This is cue #10727
-
-10728
-02:58:48.000 --> 02:58:49.000
-This is cue #10728
-
-10729
-02:58:49.000 --> 02:58:50.000
-This is cue #10729
-
-10730
-02:58:50.000 --> 02:58:51.000
-This is cue #10730
-
-10731
-02:58:51.000 --> 02:58:52.000
-This is cue #10731
-
-10732
-02:58:52.000 --> 02:58:53.000
-This is cue #10732
-
-10733
-02:58:53.000 --> 02:58:54.000
-This is cue #10733
-
-10734
-02:58:54.000 --> 02:58:55.000
-This is cue #10734
-
-10735
-02:58:55.000 --> 02:58:56.000
-This is cue #10735
-
-10736
-02:58:56.000 --> 02:58:57.000
-This is cue #10736
-
-10737
-02:58:57.000 --> 02:58:58.000
-This is cue #10737
-
-10738
-02:58:58.000 --> 02:58:59.000
-This is cue #10738
-
-10739
-02:58:59.000 --> 02:59:00.000
-This is cue #10739
-
-10740
-02:59:00.000 --> 02:59:01.000
-This is cue #10740
-
-10741
-02:59:01.000 --> 02:59:02.000
-This is cue #10741
-
-10742
-02:59:02.000 --> 02:59:03.000
-This is cue #10742
-
-10743
-02:59:03.000 --> 02:59:04.000
-This is cue #10743
-
-10744
-02:59:04.000 --> 02:59:05.000
-This is cue #10744
-
-10745
-02:59:05.000 --> 02:59:06.000
-This is cue #10745
-
-10746
-02:59:06.000 --> 02:59:07.000
-This is cue #10746
-
-10747
-02:59:07.000 --> 02:59:08.000
-This is cue #10747
-
-10748
-02:59:08.000 --> 02:59:09.000
-This is cue #10748
-
-10749
-02:59:09.000 --> 02:59:10.000
-This is cue #10749
-
-10750
-02:59:10.000 --> 02:59:11.000
-This is cue #10750
-
-10751
-02:59:11.000 --> 02:59:12.000
-This is cue #10751
-
-10752
-02:59:12.000 --> 02:59:13.000
-This is cue #10752
-
-10753
-02:59:13.000 --> 02:59:14.000
-This is cue #10753
-
-10754
-02:59:14.000 --> 02:59:15.000
-This is cue #10754
-
-10755
-02:59:15.000 --> 02:59:16.000
-This is cue #10755
-
-10756
-02:59:16.000 --> 02:59:17.000
-This is cue #10756
-
-10757
-02:59:17.000 --> 02:59:18.000
-This is cue #10757
-
-10758
-02:59:18.000 --> 02:59:19.000
-This is cue #10758
-
-10759
-02:59:19.000 --> 02:59:20.000
-This is cue #10759
-
-10760
-02:59:20.000 --> 02:59:21.000
-This is cue #10760
-
-10761
-02:59:21.000 --> 02:59:22.000
-This is cue #10761
-
-10762
-02:59:22.000 --> 02:59:23.000
-This is cue #10762
-
-10763
-02:59:23.000 --> 02:59:24.000
-This is cue #10763
-
-10764
-02:59:24.000 --> 02:59:25.000
-This is cue #10764
-
-10765
-02:59:25.000 --> 02:59:26.000
-This is cue #10765
-
-10766
-02:59:26.000 --> 02:59:27.000
-This is cue #10766
-
-10767
-02:59:27.000 --> 02:59:28.000
-This is cue #10767
-
-10768
-02:59:28.000 --> 02:59:29.000
-This is cue #10768
-
-10769
-02:59:29.000 --> 02:59:30.000
-This is cue #10769
-
-10770
-02:59:30.000 --> 02:59:31.000
-This is cue #10770
-
-10771
-02:59:31.000 --> 02:59:32.000
-This is cue #10771
-
-10772
-02:59:32.000 --> 02:59:33.000
-This is cue #10772
-
-10773
-02:59:33.000 --> 02:59:34.000
-This is cue #10773
-
-10774
-02:59:34.000 --> 02:59:35.000
-This is cue #10774
-
-10775
-02:59:35.000 --> 02:59:36.000
-This is cue #10775
-
-10776
-02:59:36.000 --> 02:59:37.000
-This is cue #10776
-
-10777
-02:59:37.000 --> 02:59:38.000
-This is cue #10777
-
-10778
-02:59:38.000 --> 02:59:39.000
-This is cue #10778
-
-10779
-02:59:39.000 --> 02:59:40.000
-This is cue #10779
-
-10780
-02:59:40.000 --> 02:59:41.000
-This is cue #10780
-
-10781
-02:59:41.000 --> 02:59:42.000
-This is cue #10781
-
-10782
-02:59:42.000 --> 02:59:43.000
-This is cue #10782
-
-10783
-02:59:43.000 --> 02:59:44.000
-This is cue #10783
-
-10784
-02:59:44.000 --> 02:59:45.000
-This is cue #10784
-
-10785
-02:59:45.000 --> 02:59:46.000
-This is cue #10785
-
-10786
-02:59:46.000 --> 02:59:47.000
-This is cue #10786
-
-10787
-02:59:47.000 --> 02:59:48.000
-This is cue #10787
-
-10788
-02:59:48.000 --> 02:59:49.000
-This is cue #10788
-
-10789
-02:59:49.000 --> 02:59:50.000
-This is cue #10789
-
-10790
-02:59:50.000 --> 02:59:51.000
-This is cue #10790
-
-10791
-02:59:51.000 --> 02:59:52.000
-This is cue #10791
-
-10792
-02:59:52.000 --> 02:59:53.000
-This is cue #10792
-
-10793
-02:59:53.000 --> 02:59:54.000
-This is cue #10793
-
-10794
-02:59:54.000 --> 02:59:55.000
-This is cue #10794
-
-10795
-02:59:55.000 --> 02:59:56.000
-This is cue #10795
-
-10796
-02:59:56.000 --> 02:59:57.000
-This is cue #10796
-
-10797
-02:59:57.000 --> 02:59:58.000
-This is cue #10797
-
-10798
-02:59:58.000 --> 02:59:59.000
-This is cue #10798
-
-10799
-02:59:59.000 --> 03:00:00.000
-This is cue #10799
-
-10800
-03:00:00.000 --> 03:00:01.000
-This is cue #10800
-
-10801
-03:00:01.000 --> 03:00:02.000
-This is cue #10801
-
-10802
-03:00:02.000 --> 03:00:03.000
-This is cue #10802
-
-10803
-03:00:03.000 --> 03:00:04.000
-This is cue #10803
-
-10804
-03:00:04.000 --> 03:00:05.000
-This is cue #10804
-
-10805
-03:00:05.000 --> 03:00:06.000
-This is cue #10805
-
-10806
-03:00:06.000 --> 03:00:07.000
-This is cue #10806
-
-10807
-03:00:07.000 --> 03:00:08.000
-This is cue #10807
-
-10808
-03:00:08.000 --> 03:00:09.000
-This is cue #10808
-
-10809
-03:00:09.000 --> 03:00:10.000
-This is cue #10809
-
-10810
-03:00:10.000 --> 03:00:11.000
-This is cue #10810
-
-10811
-03:00:11.000 --> 03:00:12.000
-This is cue #10811
-
-10812
-03:00:12.000 --> 03:00:13.000
-This is cue #10812
-
-10813
-03:00:13.000 --> 03:00:14.000
-This is cue #10813
-
-10814
-03:00:14.000 --> 03:00:15.000
-This is cue #10814
-
-10815
-03:00:15.000 --> 03:00:16.000
-This is cue #10815
-
-10816
-03:00:16.000 --> 03:00:17.000
-This is cue #10816
-
-10817
-03:00:17.000 --> 03:00:18.000
-This is cue #10817
-
-10818
-03:00:18.000 --> 03:00:19.000
-This is cue #10818
-
-10819
-03:00:19.000 --> 03:00:20.000
-This is cue #10819
-
-10820
-03:00:20.000 --> 03:00:21.000
-This is cue #10820
-
-10821
-03:00:21.000 --> 03:00:22.000
-This is cue #10821
-
-10822
-03:00:22.000 --> 03:00:23.000
-This is cue #10822
-
-10823
-03:00:23.000 --> 03:00:24.000
-This is cue #10823
-
-10824
-03:00:24.000 --> 03:00:25.000
-This is cue #10824
-
-10825
-03:00:25.000 --> 03:00:26.000
-This is cue #10825
-
-10826
-03:00:26.000 --> 03:00:27.000
-This is cue #10826
-
-10827
-03:00:27.000 --> 03:00:28.000
-This is cue #10827
-
-10828
-03:00:28.000 --> 03:00:29.000
-This is cue #10828
-
-10829
-03:00:29.000 --> 03:00:30.000
-This is cue #10829
-
-10830
-03:00:30.000 --> 03:00:31.000
-This is cue #10830
-
-10831
-03:00:31.000 --> 03:00:32.000
-This is cue #10831
-
-10832
-03:00:32.000 --> 03:00:33.000
-This is cue #10832
-
-10833
-03:00:33.000 --> 03:00:34.000
-This is cue #10833
-
-10834
-03:00:34.000 --> 03:00:35.000
-This is cue #10834
-
-10835
-03:00:35.000 --> 03:00:36.000
-This is cue #10835
-
-10836
-03:00:36.000 --> 03:00:37.000
-This is cue #10836
-
-10837
-03:00:37.000 --> 03:00:38.000
-This is cue #10837
-
-10838
-03:00:38.000 --> 03:00:39.000
-This is cue #10838
-
-10839
-03:00:39.000 --> 03:00:40.000
-This is cue #10839
-
-10840
-03:00:40.000 --> 03:00:41.000
-This is cue #10840
-
-10841
-03:00:41.000 --> 03:00:42.000
-This is cue #10841
-
-10842
-03:00:42.000 --> 03:00:43.000
-This is cue #10842
-
-10843
-03:00:43.000 --> 03:00:44.000
-This is cue #10843
-
-10844
-03:00:44.000 --> 03:00:45.000
-This is cue #10844
-
-10845
-03:00:45.000 --> 03:00:46.000
-This is cue #10845
-
-10846
-03:00:46.000 --> 03:00:47.000
-This is cue #10846
-
-10847
-03:00:47.000 --> 03:00:48.000
-This is cue #10847
-
-10848
-03:00:48.000 --> 03:00:49.000
-This is cue #10848
-
-10849
-03:00:49.000 --> 03:00:50.000
-This is cue #10849
-
-10850
-03:00:50.000 --> 03:00:51.000
-This is cue #10850
-
-10851
-03:00:51.000 --> 03:00:52.000
-This is cue #10851
-
-10852
-03:00:52.000 --> 03:00:53.000
-This is cue #10852
-
-10853
-03:00:53.000 --> 03:00:54.000
-This is cue #10853
-
-10854
-03:00:54.000 --> 03:00:55.000
-This is cue #10854
-
-10855
-03:00:55.000 --> 03:00:56.000
-This is cue #10855
-
-10856
-03:00:56.000 --> 03:00:57.000
-This is cue #10856
-
-10857
-03:00:57.000 --> 03:00:58.000
-This is cue #10857
-
-10858
-03:00:58.000 --> 03:00:59.000
-This is cue #10858
-
-10859
-03:00:59.000 --> 03:01:00.000
-This is cue #10859
-
-10860
-03:01:00.000 --> 03:01:01.000
-This is cue #10860
-
-10861
-03:01:01.000 --> 03:01:02.000
-This is cue #10861
-
-10862
-03:01:02.000 --> 03:01:03.000
-This is cue #10862
-
-10863
-03:01:03.000 --> 03:01:04.000
-This is cue #10863
-
-10864
-03:01:04.000 --> 03:01:05.000
-This is cue #10864
-
-10865
-03:01:05.000 --> 03:01:06.000
-This is cue #10865
-
-10866
-03:01:06.000 --> 03:01:07.000
-This is cue #10866
-
-10867
-03:01:07.000 --> 03:01:08.000
-This is cue #10867
-
-10868
-03:01:08.000 --> 03:01:09.000
-This is cue #10868
-
-10869
-03:01:09.000 --> 03:01:10.000
-This is cue #10869
-
-10870
-03:01:10.000 --> 03:01:11.000
-This is cue #10870
-
-10871
-03:01:11.000 --> 03:01:12.000
-This is cue #10871
-
-10872
-03:01:12.000 --> 03:01:13.000
-This is cue #10872
-
-10873
-03:01:13.000 --> 03:01:14.000
-This is cue #10873
-
-10874
-03:01:14.000 --> 03:01:15.000
-This is cue #10874
-
-10875
-03:01:15.000 --> 03:01:16.000
-This is cue #10875
-
-10876
-03:01:16.000 --> 03:01:17.000
-This is cue #10876
-
-10877
-03:01:17.000 --> 03:01:18.000
-This is cue #10877
-
-10878
-03:01:18.000 --> 03:01:19.000
-This is cue #10878
-
-10879
-03:01:19.000 --> 03:01:20.000
-This is cue #10879
-
-10880
-03:01:20.000 --> 03:01:21.000
-This is cue #10880
-
-10881
-03:01:21.000 --> 03:01:22.000
-This is cue #10881
-
-10882
-03:01:22.000 --> 03:01:23.000
-This is cue #10882
-
-10883
-03:01:23.000 --> 03:01:24.000
-This is cue #10883
-
-10884
-03:01:24.000 --> 03:01:25.000
-This is cue #10884
-
-10885
-03:01:25.000 --> 03:01:26.000
-This is cue #10885
-
-10886
-03:01:26.000 --> 03:01:27.000
-This is cue #10886
-
-10887
-03:01:27.000 --> 03:01:28.000
-This is cue #10887
-
-10888
-03:01:28.000 --> 03:01:29.000
-This is cue #10888
-
-10889
-03:01:29.000 --> 03:01:30.000
-This is cue #10889
-
-10890
-03:01:30.000 --> 03:01:31.000
-This is cue #10890
-
-10891
-03:01:31.000 --> 03:01:32.000
-This is cue #10891
-
-10892
-03:01:32.000 --> 03:01:33.000
-This is cue #10892
-
-10893
-03:01:33.000 --> 03:01:34.000
-This is cue #10893
-
-10894
-03:01:34.000 --> 03:01:35.000
-This is cue #10894
-
-10895
-03:01:35.000 --> 03:01:36.000
-This is cue #10895
-
-10896
-03:01:36.000 --> 03:01:37.000
-This is cue #10896
-
-10897
-03:01:37.000 --> 03:01:38.000
-This is cue #10897
-
-10898
-03:01:38.000 --> 03:01:39.000
-This is cue #10898
-
-10899
-03:01:39.000 --> 03:01:40.000
-This is cue #10899
-
-10900
-03:01:40.000 --> 03:01:41.000
-This is cue #10900
-
-10901
-03:01:41.000 --> 03:01:42.000
-This is cue #10901
-
-10902
-03:01:42.000 --> 03:01:43.000
-This is cue #10902
-
-10903
-03:01:43.000 --> 03:01:44.000
-This is cue #10903
-
-10904
-03:01:44.000 --> 03:01:45.000
-This is cue #10904
-
-10905
-03:01:45.000 --> 03:01:46.000
-This is cue #10905
-
-10906
-03:01:46.000 --> 03:01:47.000
-This is cue #10906
-
-10907
-03:01:47.000 --> 03:01:48.000
-This is cue #10907
-
-10908
-03:01:48.000 --> 03:01:49.000
-This is cue #10908
-
-10909
-03:01:49.000 --> 03:01:50.000
-This is cue #10909
-
-10910
-03:01:50.000 --> 03:01:51.000
-This is cue #10910
-
-10911
-03:01:51.000 --> 03:01:52.000
-This is cue #10911
-
-10912
-03:01:52.000 --> 03:01:53.000
-This is cue #10912
-
-10913
-03:01:53.000 --> 03:01:54.000
-This is cue #10913
-
-10914
-03:01:54.000 --> 03:01:55.000
-This is cue #10914
-
-10915
-03:01:55.000 --> 03:01:56.000
-This is cue #10915
-
-10916
-03:01:56.000 --> 03:01:57.000
-This is cue #10916
-
-10917
-03:01:57.000 --> 03:01:58.000
-This is cue #10917
-
-10918
-03:01:58.000 --> 03:01:59.000
-This is cue #10918
-
-10919
-03:01:59.000 --> 03:02:00.000
-This is cue #10919
-
-10920
-03:02:00.000 --> 03:02:01.000
-This is cue #10920
-
-10921
-03:02:01.000 --> 03:02:02.000
-This is cue #10921
-
-10922
-03:02:02.000 --> 03:02:03.000
-This is cue #10922
-
-10923
-03:02:03.000 --> 03:02:04.000
-This is cue #10923
-
-10924
-03:02:04.000 --> 03:02:05.000
-This is cue #10924
-
-10925
-03:02:05.000 --> 03:02:06.000
-This is cue #10925
-
-10926
-03:02:06.000 --> 03:02:07.000
-This is cue #10926
-
-10927
-03:02:07.000 --> 03:02:08.000
-This is cue #10927
-
-10928
-03:02:08.000 --> 03:02:09.000
-This is cue #10928
-
-10929
-03:02:09.000 --> 03:02:10.000
-This is cue #10929
-
-10930
-03:02:10.000 --> 03:02:11.000
-This is cue #10930
-
-10931
-03:02:11.000 --> 03:02:12.000
-This is cue #10931
-
-10932
-03:02:12.000 --> 03:02:13.000
-This is cue #10932
-
-10933
-03:02:13.000 --> 03:02:14.000
-This is cue #10933
-
-10934
-03:02:14.000 --> 03:02:15.000
-This is cue #10934
-
-10935
-03:02:15.000 --> 03:02:16.000
-This is cue #10935
-
-10936
-03:02:16.000 --> 03:02:17.000
-This is cue #10936
-
-10937
-03:02:17.000 --> 03:02:18.000
-This is cue #10937
-
-10938
-03:02:18.000 --> 03:02:19.000
-This is cue #10938
-
-10939
-03:02:19.000 --> 03:02:20.000
-This is cue #10939
-
-10940
-03:02:20.000 --> 03:02:21.000
-This is cue #10940
-
-10941
-03:02:21.000 --> 03:02:22.000
-This is cue #10941
-
-10942
-03:02:22.000 --> 03:02:23.000
-This is cue #10942
-
-10943
-03:02:23.000 --> 03:02:24.000
-This is cue #10943
-
-10944
-03:02:24.000 --> 03:02:25.000
-This is cue #10944
-
-10945
-03:02:25.000 --> 03:02:26.000
-This is cue #10945
-
-10946
-03:02:26.000 --> 03:02:27.000
-This is cue #10946
-
-10947
-03:02:27.000 --> 03:02:28.000
-This is cue #10947
-
-10948
-03:02:28.000 --> 03:02:29.000
-This is cue #10948
-
-10949
-03:02:29.000 --> 03:02:30.000
-This is cue #10949
-
-10950
-03:02:30.000 --> 03:02:31.000
-This is cue #10950
-
-10951
-03:02:31.000 --> 03:02:32.000
-This is cue #10951
-
-10952
-03:02:32.000 --> 03:02:33.000
-This is cue #10952
-

gpac-0.8.0.tar.gz/tests/media/webvtt/multiline-header-additional.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/multiline-header-id-invalid.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/multiline-header-id.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/multiline-header.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/overlapping-end.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/overlapping-middle.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/overlapping-rewritten.vtt Deleted

@@ -1,81 +0,0 @@
-WEBVTT Example of overlapping cues being rewritten to be able to signal RAP 
-
-1 RAP here                        
-00:00:00.000 --> 00:00:03.000 
-First cue from 0s to 5s
-
-1b RAP here
-00:00:03.000 --> 00:00:05.000 
-First cue from 0s to 5s
-
-2
-00:00:03.000 --> 00:00:05.000 
-Second cue from 3s to 9s 
-
-2b RAP here
-00:00:05.000 --> 00:00:08.000 
-Second cue from 3s to 9s 
-
-2c RAP here
-00:00:08.000 --> 00:00:09.000 
-Second cue from 3s to 9s
-
-3
-00:00:08.000 --> 00:00:09.000 
-3rd cue from 8s to 14s
-
-3b RAP here
-00:00:09.000 --> 00:00:10.000 
-3rd cue from 8s to 14s
-
-3c RAP here
-00:00:10.000 --> 00:00:12.000 
-3rd cue from 8s to 14s
-
-4
-00:00:10.000 --> 00:00:12.000
-4th cue from 10s to 18s
-
-3d RAP here
-00:00:12.000 --> 00:00:14.000 
-3rd cue from 8s to 14s
-
-4b
-00:00:12.000 --> 00:00:14.000
-4th cue from 10s to 18s
-
-5
-00:00:12.000 --> 00:00:14.000
-5th cue from 12s to 24s
-
-4c RAP here
-00:00:14.000 --> 00:00:16.000
-4th cue from 10s to 18s
-
-5b
-00:00:14.000 --> 00:00:16.000
-5th cue from 12s to 24s
-
-4d RAP here
-00:00:16.000 --> 00:00:18.000
-4th cue from 10s to 18s
-
-5b
-00:00:16.000 --> 00:00:18.000
-5th cue from 12s to 24s
-
-6
-00:00:16.000 --> 00:00:18.000
-6th cue from 16s to 26s
-
-5c RAP here
-00:00:18.000 --> 00:00:24.000
-5th cue from 12s to 24s
-
-6b 
-00:00:18.000 --> 00:00:24.000
-6th cue from 16s to 26s
-
-6c 
-00:00:24.000 --> 00:00:26.000
-6th cue from 16s to 26s

gpac-0.8.0.tar.gz/tests/media/webvtt/overlapping-start.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/overlapping.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/simple.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spaces.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-basic.vtt Deleted

@@ -1,40 +0,0 @@
-WEBVTT
-
-00:11.000 --> 00:13.000
-<v Roger Bingham>We are in New York City
-
-00:13.000 --> 00:16.000
-<v Roger Bingham>We're actually at the Lucern Hotel, just down the street
-
-00:16.000 --> 00:18.000
-<v Roger Bingham>from the American Museum of Natural History
-
-00:18.000 --> 00:20.000
-<v Roger Bingham>And with me is Neil deGrasse Tyson
-
-00:20.000 --> 00:22.000
-<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
-
-00:22.000 --> 00:24.000
-<v Roger Bingham>at the AMNH.
-
-00:24.000 --> 00:26.000
-<v Roger Bingham>Thank you for walking down here.
-
-00:27.000 --> 00:30.000
-<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
-
-00:30.000 --> 00:31.500 align:end size:50%
-<v Roger Bingham>When we e-mailed-
-
-00:30.500 --> 00:32.500 align:start size:50%
-<v Neil deGrasse Tyson>Didn't we talk about enough in that conversation?
-
-00:32.000 --> 00:35.500 align:end size:50%
-<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
-
-00:32.500 --> 00:33.500 align:start size:50%
-<v Neil deGrasse Tyson><i>Laughs</i>
-
-00:35.500 --> 00:38.000
-<v Roger Bingham>You know I'm so excited my glasses are falling off here.
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-comment.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-comment2.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-identifier.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-multiple-lines.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-nested.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/spec-example-voice.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/svg.vtt Deleted

@@ -1,4502 +0,0 @@
-WEBVTT
-
-00:00.000	--> 	00:00.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	0	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.040	--> 	00:00.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.080	--> 	00:00.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.120	--> 	00:00.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.160	--> 	00:00.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.200	--> 	00:00.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.240	--> 	00:00.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.280	--> 	00:00.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.320	--> 	00:00.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.360	--> 	00:00.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.400	--> 	00:00.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.440	--> 	00:00.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.480	--> 	00:00.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.520	--> 	00:00.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.560	--> 	00:00.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.600	--> 	00:00.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.640	--> 	00:00.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.680	--> 	00:00.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.720	--> 	00:00.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.760	--> 	00:00.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.800	--> 	00:00.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.840	--> 	00:00.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.880	--> 	00:00.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.920	--> 	00:00.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:00.960	--> 	00:01.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.000	--> 	00:01.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	-1.13687E-13	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.040	--> 	00:01.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.080	--> 	00:01.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.120	--> 	00:01.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.160	--> 	00:01.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.200	--> 	00:01.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.240	--> 	00:01.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.280	--> 	00:01.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.320	--> 	00:01.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.360	--> 	00:01.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.400	--> 	00:01.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.440	--> 	00:01.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.480	--> 	00:01.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.520	--> 	00:01.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.560	--> 	00:01.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.600	--> 	00:01.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.640	--> 	00:01.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.680	--> 	00:01.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.720	--> 	00:01.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.760	--> 	00:01.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.800	--> 	00:01.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.840	--> 	00:01.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.880	--> 	00:01.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.920	--> 	00:01.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:01.960	--> 	00:02.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.000	--> 	00:02.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.040	--> 	00:02.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.080	--> 	00:02.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.120	--> 	00:02.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.160	--> 	00:02.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.200	--> 	00:02.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.240	--> 	00:02.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.280	--> 	00:02.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.320	--> 	00:02.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.360	--> 	00:02.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.400	--> 	00:02.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.440	--> 	00:02.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.480	--> 	00:02.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.520	--> 	00:02.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.560	--> 	00:02.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.600	--> 	00:02.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.640	--> 	00:02.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.680	--> 	00:02.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.720	--> 	00:02.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.760	--> 	00:02.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.800	--> 	00:02.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.840	--> 	00:02.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.880	--> 	00:02.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.920	--> 	00:02.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:02.960	--> 	00:03.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.000	--> 	00:03.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.040	--> 	00:03.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.080	--> 	00:03.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.120	--> 	00:03.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.160	--> 	00:03.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.200	--> 	00:03.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.240	--> 	00:03.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.280	--> 	00:03.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.320	--> 	00:03.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.360	--> 	00:03.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.400	--> 	00:03.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.440	--> 	00:03.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.480	--> 	00:03.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.520	--> 	00:03.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.560	--> 	00:03.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.600	--> 	00:03.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.640	--> 	00:03.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.680	--> 	00:03.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.720	--> 	00:03.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.760	--> 	00:03.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.800	--> 	00:03.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.840	--> 	00:03.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.880	--> 	00:03.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.920	--> 	00:03.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:03.960	--> 	00:04.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.000	--> 	00:04.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.040	--> 	00:04.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.080	--> 	00:04.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.120	--> 	00:04.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.160	--> 	00:04.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.200	--> 	00:04.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.240	--> 	00:04.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.280	--> 	00:04.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.320	--> 	00:04.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.360	--> 	00:04.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.400	--> 	00:04.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.440	--> 	00:04.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.480	--> 	00:04.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.520	--> 	00:04.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.560	--> 	00:04.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.600	--> 	00:04.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.640	--> 	00:04.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.680	--> 	00:04.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.720	--> 	00:04.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.760	--> 	00:04.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.800	--> 	00:04.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.840	--> 	00:04.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.880	--> 	00:04.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.920	--> 	00:04.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:04.960	--> 	00:05.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.000	--> 	00:05.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.040	--> 	00:05.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.080	--> 	00:05.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.120	--> 	00:05.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.160	--> 	00:05.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.200	--> 	00:05.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.240	--> 	00:05.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.280	--> 	00:05.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.320	--> 	00:05.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.360	--> 	00:05.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.400	--> 	00:05.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.440	--> 	00:05.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.480	--> 	00:05.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.520	--> 	00:05.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.560	--> 	00:05.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.600	--> 	00:05.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.640	--> 	00:05.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.680	--> 	00:05.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.720	--> 	00:05.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.760	--> 	00:05.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.800	--> 	00:05.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.840	--> 	00:05.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.880	--> 	00:05.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.920	--> 	00:05.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:05.960	--> 	00:06.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.000	--> 	00:06.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.040	--> 	00:06.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.080	--> 	00:06.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.120	--> 	00:06.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.160	--> 	00:06.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.200	--> 	00:06.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.240	--> 	00:06.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.280	--> 	00:06.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.320	--> 	00:06.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.360	--> 	00:06.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.400	--> 	00:06.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.440	--> 	00:06.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.480	--> 	00:06.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.520	--> 	00:06.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.560	--> 	00:06.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.600	--> 	00:06.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.640	--> 	00:06.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.680	--> 	00:06.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.720	--> 	00:06.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.760	--> 	00:06.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.800	--> 	00:06.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.840	--> 	00:06.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.880	--> 	00:06.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.920	--> 	00:06.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:06.960	--> 	00:07.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.000	--> 	00:07.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.040	--> 	00:07.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.080	--> 	00:07.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.120	--> 	00:07.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.160	--> 	00:07.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.200	--> 	00:07.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.240	--> 	00:07.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.280	--> 	00:07.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.320	--> 	00:07.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.360	--> 	00:07.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.400	--> 	00:07.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.440	--> 	00:07.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.480	--> 	00:07.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.520	--> 	00:07.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.560	--> 	00:07.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.600	--> 	00:07.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.640	--> 	00:07.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.680	--> 	00:07.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.720	--> 	00:07.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.760	--> 	00:07.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.800	--> 	00:07.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.840	--> 	00:07.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.880	--> 	00:07.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.920	--> 	00:07.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:07.960	--> 	00:08.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.000	--> 	00:08.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.040	--> 	00:08.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.080	--> 	00:08.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.120	--> 	00:08.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.160	--> 	00:08.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.200	--> 	00:08.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.240	--> 	00:08.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.280	--> 	00:08.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.320	--> 	00:08.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.360	--> 	00:08.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.400	--> 	00:08.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.440	--> 	00:08.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.480	--> 	00:08.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.520	--> 	00:08.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.560	--> 	00:08.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.600	--> 	00:08.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.640	--> 	00:08.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.680	--> 	00:08.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.720	--> 	00:08.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.760	--> 	00:08.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.800	--> 	00:08.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.840	--> 	00:08.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.880	--> 	00:08.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.920	--> 	00:08.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:08.960	--> 	00:09.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.000	--> 	00:09.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.040	--> 	00:09.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.080	--> 	00:09.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.120	--> 	00:09.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.160	--> 	00:09.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.200	--> 	00:09.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.240	--> 	00:09.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.280	--> 	00:09.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.320	--> 	00:09.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.360	--> 	00:09.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.400	--> 	00:09.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.440	--> 	00:09.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.480	--> 	00:09.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.520	--> 	00:09.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.560	--> 	00:09.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.600	--> 	00:09.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.640	--> 	00:09.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.680	--> 	00:09.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.720	--> 	00:09.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.760	--> 	00:09.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.800	--> 	00:09.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.840	--> 	00:09.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.880	--> 	00:09.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.920	--> 	00:09.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:09.960	--> 	00:10.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.000	--> 	00:10.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.040	--> 	00:10.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.080	--> 	00:10.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.120	--> 	00:10.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.160	--> 	00:10.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.200	--> 	00:10.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.240	--> 	00:10.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.280	--> 	00:10.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.320	--> 	00:10.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.360	--> 	00:10.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.400	--> 	00:10.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.440	--> 	00:10.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.480	--> 	00:10.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.520	--> 	00:10.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.560	--> 	00:10.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.600	--> 	00:10.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.640	--> 	00:10.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.680	--> 	00:10.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.720	--> 	00:10.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.760	--> 	00:10.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.800	--> 	00:10.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.840	--> 	00:10.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.880	--> 	00:10.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.920	--> 	00:10.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:10.960	--> 	00:11.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.000	--> 	00:11.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.040	--> 	00:11.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.080	--> 	00:11.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.120	--> 	00:11.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.160	--> 	00:11.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.200	--> 	00:11.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.240	--> 	00:11.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.280	--> 	00:11.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.320	--> 	00:11.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.360	--> 	00:11.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.400	--> 	00:11.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.440	--> 	00:11.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.480	--> 	00:11.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.520	--> 	00:11.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.560	--> 	00:11.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.600	--> 	00:11.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.640	--> 	00:11.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.680	--> 	00:11.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.720	--> 	00:11.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.760	--> 	00:11.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.800	--> 	00:11.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.840	--> 	00:11.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.880	--> 	00:11.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.920	--> 	00:11.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:11.960	--> 	00:12.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.000	--> 	00:12.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.040	--> 	00:12.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.080	--> 	00:12.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.120	--> 	00:12.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.160	--> 	00:12.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.200	--> 	00:12.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.240	--> 	00:12.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.280	--> 	00:12.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.320	--> 	00:12.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.360	--> 	00:12.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.400	--> 	00:12.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.440	--> 	00:12.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.480	--> 	00:12.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.520	--> 	00:12.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.560	--> 	00:12.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.600	--> 	00:12.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.640	--> 	00:12.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.680	--> 	00:12.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.720	--> 	00:12.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.760	--> 	00:12.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.800	--> 	00:12.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.840	--> 	00:12.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.880	--> 	00:12.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.920	--> 	00:12.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:12.960	--> 	00:13.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.000	--> 	00:13.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.040	--> 	00:13.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.080	--> 	00:13.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.120	--> 	00:13.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.160	--> 	00:13.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.200	--> 	00:13.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.240	--> 	00:13.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.280	--> 	00:13.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.320	--> 	00:13.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.360	--> 	00:13.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.400	--> 	00:13.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.440	--> 	00:13.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.480	--> 	00:13.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.520	--> 	00:13.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.560	--> 	00:13.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.600	--> 	00:13.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.640	--> 	00:13.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.680	--> 	00:13.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.720	--> 	00:13.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.760	--> 	00:13.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.800	--> 	00:13.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.840	--> 	00:13.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.880	--> 	00:13.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.920	--> 	00:13.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:13.960	--> 	00:14.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.000	--> 	00:14.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.040	--> 	00:14.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.080	--> 	00:14.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.120	--> 	00:14.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.160	--> 	00:14.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.200	--> 	00:14.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.240	--> 	00:14.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.280	--> 	00:14.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.320	--> 	00:14.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.360	--> 	00:14.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.400	--> 	00:14.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.440	--> 	00:14.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.480	--> 	00:14.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.520	--> 	00:14.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.560	--> 	00:14.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.600	--> 	00:14.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.640	--> 	00:14.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.680	--> 	00:14.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.720	--> 	00:14.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.760	--> 	00:14.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.800	--> 	00:14.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.840	--> 	00:14.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.880	--> 	00:14.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.920	--> 	00:14.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:14.960	--> 	00:15.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.000	--> 	00:15.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.040	--> 	00:15.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.080	--> 	00:15.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.120	--> 	00:15.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.160	--> 	00:15.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.200	--> 	00:15.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.240	--> 	00:15.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.280	--> 	00:15.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.320	--> 	00:15.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.360	--> 	00:15.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.400	--> 	00:15.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.440	--> 	00:15.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.480	--> 	00:15.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.520	--> 	00:15.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.560	--> 	00:15.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.600	--> 	00:15.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.640	--> 	00:15.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.680	--> 	00:15.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.720	--> 	00:15.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.760	--> 	00:15.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.800	--> 	00:15.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.840	--> 	00:15.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.880	--> 	00:15.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.920	--> 	00:15.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:15.960	--> 	00:16.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.000	--> 	00:16.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.040	--> 	00:16.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.080	--> 	00:16.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.120	--> 	00:16.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.160	--> 	00:16.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.200	--> 	00:16.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.240	--> 	00:16.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.280	--> 	00:16.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.320	--> 	00:16.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.360	--> 	00:16.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.400	--> 	00:16.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.440	--> 	00:16.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.480	--> 	00:16.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.520	--> 	00:16.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.560	--> 	00:16.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.600	--> 	00:16.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.640	--> 	00:16.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.680	--> 	00:16.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.720	--> 	00:16.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.760	--> 	00:16.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.800	--> 	00:16.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.840	--> 	00:16.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.880	--> 	00:16.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.920	--> 	00:16.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:16.960	--> 	00:17.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.000	--> 	00:17.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.040	--> 	00:17.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.080	--> 	00:17.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.120	--> 	00:17.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.160	--> 	00:17.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.200	--> 	00:17.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.240	--> 	00:17.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.280	--> 	00:17.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.320	--> 	00:17.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.360	--> 	00:17.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.400	--> 	00:17.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.440	--> 	00:17.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.480	--> 	00:17.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.520	--> 	00:17.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.560	--> 	00:17.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.600	--> 	00:17.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.640	--> 	00:17.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.680	--> 	00:17.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.720	--> 	00:17.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.760	--> 	00:17.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.800	--> 	00:17.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.840	--> 	00:17.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.880	--> 	00:17.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.920	--> 	00:17.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:17.960	--> 	00:18.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.000	--> 	00:18.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.040	--> 	00:18.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.080	--> 	00:18.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.120	--> 	00:18.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.160	--> 	00:18.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.200	--> 	00:18.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.240	--> 	00:18.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.280	--> 	00:18.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.320	--> 	00:18.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.360	--> 	00:18.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.400	--> 	00:18.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.440	--> 	00:18.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.480	--> 	00:18.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.520	--> 	00:18.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.560	--> 	00:18.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.600	--> 	00:18.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.640	--> 	00:18.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.680	--> 	00:18.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.720	--> 	00:18.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.760	--> 	00:18.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.800	--> 	00:18.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.840	--> 	00:18.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.880	--> 	00:18.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.920	--> 	00:18.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:18.960	--> 	00:19.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.000	--> 	00:19.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.040	--> 	00:19.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.080	--> 	00:19.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.120	--> 	00:19.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.160	--> 	00:19.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.200	--> 	00:19.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.240	--> 	00:19.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.280	--> 	00:19.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.320	--> 	00:19.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.360	--> 	00:19.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.400	--> 	00:19.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.440	--> 	00:19.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.480	--> 	00:19.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.520	--> 	00:19.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.560	--> 	00:19.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.600	--> 	00:19.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.640	--> 	00:19.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.680	--> 	00:19.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.720	--> 	00:19.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.760	--> 	00:19.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.800	--> 	00:19.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.840	--> 	00:19.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.880	--> 	00:19.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.920	--> 	00:19.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:19.960	--> 	00:20.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.000	--> 	00:20.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.040	--> 	00:20.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.080	--> 	00:20.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.120	--> 	00:20.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.160	--> 	00:20.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.200	--> 	00:20.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.240	--> 	00:20.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.280	--> 	00:20.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.320	--> 	00:20.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.360	--> 	00:20.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.400	--> 	00:20.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.440	--> 	00:20.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.480	--> 	00:20.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.520	--> 	00:20.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.560	--> 	00:20.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.600	--> 	00:20.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.640	--> 	00:20.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.680	--> 	00:20.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.720	--> 	00:20.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.760	--> 	00:20.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.800	--> 	00:20.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.840	--> 	00:20.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.880	--> 	00:20.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.920	--> 	00:20.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:20.960	--> 	00:21.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.000	--> 	00:21.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.040	--> 	00:21.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.080	--> 	00:21.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.120	--> 	00:21.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.160	--> 	00:21.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.200	--> 	00:21.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.240	--> 	00:21.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.280	--> 	00:21.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.320	--> 	00:21.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.360	--> 	00:21.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.400	--> 	00:21.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.440	--> 	00:21.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.480	--> 	00:21.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.520	--> 	00:21.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.560	--> 	00:21.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.600	--> 	00:21.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.640	--> 	00:21.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.680	--> 	00:21.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.720	--> 	00:21.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.760	--> 	00:21.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.800	--> 	00:21.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.840	--> 	00:21.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.880	--> 	00:21.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.920	--> 	00:21.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:21.960	--> 	00:22.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.000	--> 	00:22.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.040	--> 	00:22.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.080	--> 	00:22.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.120	--> 	00:22.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.160	--> 	00:22.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.200	--> 	00:22.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.240	--> 	00:22.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.280	--> 	00:22.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.320	--> 	00:22.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.360	--> 	00:22.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.400	--> 	00:22.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.440	--> 	00:22.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.480	--> 	00:22.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.520	--> 	00:22.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.560	--> 	00:22.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.600	--> 	00:22.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.640	--> 	00:22.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.680	--> 	00:22.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.720	--> 	00:22.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.760	--> 	00:22.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.800	--> 	00:22.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.840	--> 	00:22.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.880	--> 	00:22.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.920	--> 	00:22.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:22.960	--> 	00:23.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.000	--> 	00:23.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.040	--> 	00:23.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.080	--> 	00:23.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.120	--> 	00:23.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.160	--> 	00:23.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.200	--> 	00:23.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.240	--> 	00:23.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.280	--> 	00:23.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.320	--> 	00:23.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.360	--> 	00:23.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.400	--> 	00:23.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.440	--> 	00:23.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.480	--> 	00:23.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.520	--> 	00:23.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.560	--> 	00:23.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.600	--> 	00:23.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.640	--> 	00:23.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.680	--> 	00:23.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.720	--> 	00:23.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.760	--> 	00:23.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.800	--> 	00:23.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.840	--> 	00:23.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.880	--> 	00:23.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.920	--> 	00:23.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:23.960	--> 	00:24.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.000	--> 	00:24.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.040	--> 	00:24.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.080	--> 	00:24.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.120	--> 	00:24.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.160	--> 	00:24.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.200	--> 	00:24.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.240	--> 	00:24.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.280	--> 	00:24.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.320	--> 	00:24.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.360	--> 	00:24.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.400	--> 	00:24.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.440	--> 	00:24.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.480	--> 	00:24.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.520	--> 	00:24.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.560	--> 	00:24.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.600	--> 	00:24.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.640	--> 	00:24.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.680	--> 	00:24.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.720	--> 	00:24.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.760	--> 	00:24.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.800	--> 	00:24.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.840	--> 	00:24.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.880	--> 	00:24.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.920	--> 	00:24.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:24.960	--> 	00:25.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.000	--> 	00:25.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.040	--> 	00:25.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.080	--> 	00:25.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.120	--> 	00:25.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.160	--> 	00:25.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.200	--> 	00:25.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.240	--> 	00:25.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.280	--> 	00:25.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.320	--> 	00:25.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.360	--> 	00:25.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.400	--> 	00:25.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.440	--> 	00:25.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.480	--> 	00:25.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.520	--> 	00:25.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.560	--> 	00:25.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.600	--> 	00:25.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.640	--> 	00:25.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.680	--> 	00:25.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.720	--> 	00:25.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.760	--> 	00:25.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.800	--> 	00:25.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.840	--> 	00:25.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.880	--> 	00:25.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.920	--> 	00:25.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:25.960	--> 	00:26.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.000	--> 	00:26.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.040	--> 	00:26.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.080	--> 	00:26.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.120	--> 	00:26.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.160	--> 	00:26.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.200	--> 	00:26.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.240	--> 	00:26.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.280	--> 	00:26.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.320	--> 	00:26.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.360	--> 	00:26.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.400	--> 	00:26.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.440	--> 	00:26.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.480	--> 	00:26.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.520	--> 	00:26.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.560	--> 	00:26.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.600	--> 	00:26.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.640	--> 	00:26.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.680	--> 	00:26.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.720	--> 	00:26.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.760	--> 	00:26.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.800	--> 	00:26.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.840	--> 	00:26.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.880	--> 	00:26.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.920	--> 	00:26.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:26.960	--> 	00:27.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.000	--> 	00:27.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.040	--> 	00:27.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.080	--> 	00:27.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.120	--> 	00:27.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.160	--> 	00:27.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.200	--> 	00:27.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.240	--> 	00:27.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.280	--> 	00:27.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.320	--> 	00:27.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.360	--> 	00:27.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.400	--> 	00:27.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.440	--> 	00:27.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.480	--> 	00:27.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.520	--> 	00:27.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.560	--> 	00:27.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.600	--> 	00:27.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.640	--> 	00:27.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.680	--> 	00:27.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.720	--> 	00:27.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.760	--> 	00:27.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.800	--> 	00:27.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.840	--> 	00:27.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.880	--> 	00:27.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.920	--> 	00:27.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:27.960	--> 	00:28.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.000	--> 	00:28.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.040	--> 	00:28.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.080	--> 	00:28.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.120	--> 	00:28.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.160	--> 	00:28.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.200	--> 	00:28.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.240	--> 	00:28.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.280	--> 	00:28.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.320	--> 	00:28.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.360	--> 	00:28.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.400	--> 	00:28.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.440	--> 	00:28.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.480	--> 	00:28.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.520	--> 	00:28.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.560	--> 	00:28.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.600	--> 	00:28.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.640	--> 	00:28.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.680	--> 	00:28.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.720	--> 	00:28.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.760	--> 	00:28.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.800	--> 	00:28.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.840	--> 	00:28.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.880	--> 	00:28.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.920	--> 	00:28.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:28.960	--> 	00:29.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.000	--> 	00:29.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.040	--> 	00:29.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.080	--> 	00:29.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.120	--> 	00:29.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.160	--> 	00:29.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.200	--> 	00:29.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.240	--> 	00:29.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.280	--> 	00:29.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.320	--> 	00:29.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.360	--> 	00:29.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.400	--> 	00:29.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.440	--> 	00:29.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.480	--> 	00:29.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.520	--> 	00:29.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.560	--> 	00:29.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.600	--> 	00:29.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.640	--> 	00:29.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.680	--> 	00:29.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.720	--> 	00:29.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.760	--> 	00:29.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.800	--> 	00:29.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.840	--> 	00:29.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.880	--> 	00:29.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.920	--> 	00:29.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:29.960	--> 	00:30.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.000	--> 	00:30.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.040	--> 	00:30.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.080	--> 	00:30.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.120	--> 	00:30.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.160	--> 	00:30.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.200	--> 	00:30.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.240	--> 	00:30.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.280	--> 	00:30.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.320	--> 	00:30.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.360	--> 	00:30.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.400	--> 	00:30.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.440	--> 	00:30.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.480	--> 	00:30.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.520	--> 	00:30.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.560	--> 	00:30.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.600	--> 	00:30.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.640	--> 	00:30.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.680	--> 	00:30.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.720	--> 	00:30.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.760	--> 	00:30.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.800	--> 	00:30.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.840	--> 	00:30.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.880	--> 	00:30.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.920	--> 	00:30.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:30.960	--> 	00:31.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.000	--> 	00:31.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.040	--> 	00:31.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.080	--> 	00:31.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.120	--> 	00:31.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.160	--> 	00:31.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.200	--> 	00:31.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.240	--> 	00:31.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.280	--> 	00:31.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.320	--> 	00:31.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.360	--> 	00:31.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.400	--> 	00:31.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.440	--> 	00:31.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.480	--> 	00:31.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.520	--> 	00:31.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.560	--> 	00:31.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.600	--> 	00:31.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.640	--> 	00:31.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.680	--> 	00:31.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.720	--> 	00:31.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.760	--> 	00:31.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.800	--> 	00:31.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.840	--> 	00:31.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.880	--> 	00:31.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.920	--> 	00:31.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:31.960	--> 	00:32.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.000	--> 	00:32.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.040	--> 	00:32.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.080	--> 	00:32.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.120	--> 	00:32.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.160	--> 	00:32.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.200	--> 	00:32.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.240	--> 	00:32.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.280	--> 	00:32.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.320	--> 	00:32.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.360	--> 	00:32.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.400	--> 	00:32.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.440	--> 	00:32.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.480	--> 	00:32.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.520	--> 	00:32.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.560	--> 	00:32.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.600	--> 	00:32.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.640	--> 	00:32.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.680	--> 	00:32.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.720	--> 	00:32.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.760	--> 	00:32.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.800	--> 	00:32.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.840	--> 	00:32.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.880	--> 	00:32.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.920	--> 	00:32.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:32.960	--> 	00:33.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.000	--> 	00:33.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.040	--> 	00:33.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.080	--> 	00:33.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.120	--> 	00:33.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.160	--> 	00:33.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.200	--> 	00:33.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.240	--> 	00:33.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.280	--> 	00:33.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.320	--> 	00:33.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.360	--> 	00:33.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.400	--> 	00:33.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.440	--> 	00:33.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.480	--> 	00:33.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.520	--> 	00:33.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.560	--> 	00:33.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.600	--> 	00:33.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.640	--> 	00:33.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.680	--> 	00:33.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.720	--> 	00:33.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.760	--> 	00:33.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.800	--> 	00:33.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.840	--> 	00:33.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.880	--> 	00:33.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.920	--> 	00:33.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:33.960	--> 	00:34.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.000	--> 	00:34.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.040	--> 	00:34.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.080	--> 	00:34.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.120	--> 	00:34.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.160	--> 	00:34.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.200	--> 	00:34.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.240	--> 	00:34.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.280	--> 	00:34.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.320	--> 	00:34.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.360	--> 	00:34.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.400	--> 	00:34.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.440	--> 	00:34.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.480	--> 	00:34.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.520	--> 	00:34.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.560	--> 	00:34.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.600	--> 	00:34.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.640	--> 	00:34.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.680	--> 	00:34.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.720	--> 	00:34.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.760	--> 	00:34.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.800	--> 	00:34.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.840	--> 	00:34.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.880	--> 	00:34.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.920	--> 	00:34.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:34.960	--> 	00:35.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.000	--> 	00:35.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.040	--> 	00:35.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.080	--> 	00:35.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.120	--> 	00:35.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.160	--> 	00:35.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.200	--> 	00:35.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.240	--> 	00:35.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.280	--> 	00:35.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.320	--> 	00:35.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.360	--> 	00:35.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.400	--> 	00:35.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.440	--> 	00:35.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.480	--> 	00:35.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.520	--> 	00:35.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.560	--> 	00:35.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.600	--> 	00:35.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.640	--> 	00:35.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.680	--> 	00:35.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.720	--> 	00:35.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.760	--> 	00:35.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.800	--> 	00:35.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.840	--> 	00:35.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.880	--> 	00:35.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.920	--> 	00:35.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:35.960	--> 	00:36.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.000	--> 	00:36.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.040	--> 	00:36.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.080	--> 	00:36.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.120	--> 	00:36.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.160	--> 	00:36.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.200	--> 	00:36.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.240	--> 	00:36.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.280	--> 	00:36.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.320	--> 	00:36.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.360	--> 	00:36.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.400	--> 	00:36.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.440	--> 	00:36.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.480	--> 	00:36.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.520	--> 	00:36.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.560	--> 	00:36.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.600	--> 	00:36.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.640	--> 	00:36.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.680	--> 	00:36.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.720	--> 	00:36.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.760	--> 	00:36.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.800	--> 	00:36.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.840	--> 	00:36.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.880	--> 	00:36.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.920	--> 	00:36.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:36.960	--> 	00:37.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.000	--> 	00:37.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.040	--> 	00:37.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.080	--> 	00:37.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.120	--> 	00:37.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.160	--> 	00:37.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.200	--> 	00:37.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.240	--> 	00:37.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.280	--> 	00:37.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.320	--> 	00:37.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.360	--> 	00:37.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.400	--> 	00:37.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.440	--> 	00:37.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.480	--> 	00:37.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.520	--> 	00:37.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.560	--> 	00:37.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.600	--> 	00:37.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.640	--> 	00:37.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.680	--> 	00:37.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.720	--> 	00:37.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.760	--> 	00:37.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.800	--> 	00:37.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.840	--> 	00:37.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.880	--> 	00:37.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.920	--> 	00:37.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:37.960	--> 	00:38.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.000	--> 	00:38.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.040	--> 	00:38.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.080	--> 	00:38.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.120	--> 	00:38.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.160	--> 	00:38.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.200	--> 	00:38.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.240	--> 	00:38.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.280	--> 	00:38.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.320	--> 	00:38.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.360	--> 	00:38.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.400	--> 	00:38.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.440	--> 	00:38.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.480	--> 	00:38.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.520	--> 	00:38.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.560	--> 	00:38.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.600	--> 	00:38.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.640	--> 	00:38.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.680	--> 	00:38.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.720	--> 	00:38.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.760	--> 	00:38.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.800	--> 	00:38.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.840	--> 	00:38.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.880	--> 	00:38.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.920	--> 	00:38.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:38.960	--> 	00:39.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.000	--> 	00:39.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.040	--> 	00:39.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.080	--> 	00:39.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.120	--> 	00:39.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.160	--> 	00:39.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.200	--> 	00:39.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.240	--> 	00:39.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.280	--> 	00:39.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.320	--> 	00:39.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.360	--> 	00:39.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.400	--> 	00:39.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.440	--> 	00:39.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.480	--> 	00:39.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.520	--> 	00:39.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.560	--> 	00:39.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.600	--> 	00:39.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.640	--> 	00:39.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.680	--> 	00:39.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.720	--> 	00:39.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.760	--> 	00:39.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.800	--> 	00:39.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.840	--> 	00:39.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.880	--> 	00:39.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.920	--> 	00:39.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:39.960	--> 	00:40.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.000	--> 	00:40.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.040	--> 	00:40.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.080	--> 	00:40.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.120	--> 	00:40.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.160	--> 	00:40.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.200	--> 	00:40.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.240	--> 	00:40.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.280	--> 	00:40.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.320	--> 	00:40.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.360	--> 	00:40.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.400	--> 	00:40.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.440	--> 	00:40.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.480	--> 	00:40.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.520	--> 	00:40.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.560	--> 	00:40.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.600	--> 	00:40.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.640	--> 	00:40.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.680	--> 	00:40.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.720	--> 	00:40.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.760	--> 	00:40.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.800	--> 	00:40.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.840	--> 	00:40.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.880	--> 	00:40.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.920	--> 	00:40.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:40.960	--> 	00:41.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.000	--> 	00:41.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.040	--> 	00:41.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.080	--> 	00:41.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.120	--> 	00:41.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.160	--> 	00:41.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.200	--> 	00:41.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.240	--> 	00:41.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.280	--> 	00:41.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.320	--> 	00:41.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.360	--> 	00:41.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.400	--> 	00:41.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.440	--> 	00:41.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.480	--> 	00:41.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.520	--> 	00:41.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.560	--> 	00:41.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.600	--> 	00:41.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.640	--> 	00:41.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.680	--> 	00:41.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.720	--> 	00:41.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.760	--> 	00:41.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.800	--> 	00:41.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.840	--> 	00:41.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.880	--> 	00:41.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.920	--> 	00:41.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:41.960	--> 	00:42.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.000	--> 	00:42.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.040	--> 	00:42.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.080	--> 	00:42.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.120	--> 	00:42.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.160	--> 	00:42.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.200	--> 	00:42.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.240	--> 	00:42.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.280	--> 	00:42.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.320	--> 	00:42.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.360	--> 	00:42.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.400	--> 	00:42.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.440	--> 	00:42.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.480	--> 	00:42.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.520	--> 	00:42.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.560	--> 	00:42.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.600	--> 	00:42.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.640	--> 	00:42.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.680	--> 	00:42.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.720	--> 	00:42.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.760	--> 	00:42.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.800	--> 	00:42.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.840	--> 	00:42.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.880	--> 	00:42.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.920	--> 	00:42.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:42.960	--> 	00:43.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.000	--> 	00:43.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.040	--> 	00:43.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.080	--> 	00:43.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.120	--> 	00:43.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.160	--> 	00:43.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.200	--> 	00:43.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.240	--> 	00:43.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.280	--> 	00:43.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.320	--> 	00:43.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.360	--> 	00:43.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.400	--> 	00:43.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.440	--> 	00:43.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.480	--> 	00:43.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.520	--> 	00:43.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.560	--> 	00:43.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.600	--> 	00:43.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.640	--> 	00:43.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.680	--> 	00:43.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.720	--> 	00:43.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.760	--> 	00:43.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.800	--> 	00:43.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.840	--> 	00:43.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.880	--> 	00:43.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.920	--> 	00:43.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:43.960	--> 	00:44.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.000	--> 	00:44.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.040	--> 	00:44.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.080	--> 	00:44.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.120	--> 	00:44.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.160	--> 	00:44.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.200	--> 	00:44.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.240	--> 	00:44.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.280	--> 	00:44.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.320	--> 	00:44.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.360	--> 	00:44.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.400	--> 	00:44.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.440	--> 	00:44.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.480	--> 	00:44.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.520	--> 	00:44.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.560	--> 	00:44.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.600	--> 	00:44.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.640	--> 	00:44.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.680	--> 	00:44.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.720	--> 	00:44.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.760	--> 	00:44.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.800	--> 	00:44.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.840	--> 	00:44.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.880	--> 	00:44.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.920	--> 	00:44.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:44.960	--> 	00:45.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.000	--> 	00:45.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.040	--> 	00:45.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.080	--> 	00:45.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.120	--> 	00:45.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.160	--> 	00:45.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.200	--> 	00:45.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.240	--> 	00:45.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.280	--> 	00:45.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.320	--> 	00:45.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.360	--> 	00:45.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.400	--> 	00:45.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.440	--> 	00:45.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.480	--> 	00:45.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.520	--> 	00:45.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.560	--> 	00:45.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.600	--> 	00:45.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.640	--> 	00:45.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.680	--> 	00:45.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.720	--> 	00:45.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.760	--> 	00:45.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.800	--> 	00:45.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.840	--> 	00:45.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.880	--> 	00:45.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.920	--> 	00:45.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:45.960	--> 	00:46.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.000	--> 	00:46.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.040	--> 	00:46.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.080	--> 	00:46.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.120	--> 	00:46.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.160	--> 	00:46.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.200	--> 	00:46.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.240	--> 	00:46.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.280	--> 	00:46.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.320	--> 	00:46.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.360	--> 	00:46.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.400	--> 	00:46.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.440	--> 	00:46.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.480	--> 	00:46.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.520	--> 	00:46.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.560	--> 	00:46.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.600	--> 	00:46.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.640	--> 	00:46.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.680	--> 	00:46.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.720	--> 	00:46.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.760	--> 	00:46.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.800	--> 	00:46.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.840	--> 	00:46.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.880	--> 	00:46.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.920	--> 	00:46.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:46.960	--> 	00:47.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.000	--> 	00:47.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.040	--> 	00:47.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.080	--> 	00:47.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.120	--> 	00:47.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.160	--> 	00:47.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.200	--> 	00:47.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.240	--> 	00:47.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.280	--> 	00:47.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.320	--> 	00:47.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.360	--> 	00:47.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.400	--> 	00:47.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.440	--> 	00:47.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.480	--> 	00:47.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.520	--> 	00:47.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.560	--> 	00:47.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.600	--> 	00:47.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.640	--> 	00:47.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.680	--> 	00:47.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.720	--> 	00:47.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.760	--> 	00:47.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.800	--> 	00:47.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.840	--> 	00:47.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.880	--> 	00:47.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.920	--> 	00:47.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:47.960	--> 	00:48.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.000	--> 	00:48.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.040	--> 	00:48.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.080	--> 	00:48.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.120	--> 	00:48.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.160	--> 	00:48.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.200	--> 	00:48.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.240	--> 	00:48.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.280	--> 	00:48.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.320	--> 	00:48.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.360	--> 	00:48.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.400	--> 	00:48.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.440	--> 	00:48.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.480	--> 	00:48.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.520	--> 	00:48.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.560	--> 	00:48.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.600	--> 	00:48.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.640	--> 	00:48.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.680	--> 	00:48.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.720	--> 	00:48.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.760	--> 	00:48.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.800	--> 	00:48.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.840	--> 	00:48.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.880	--> 	00:48.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.920	--> 	00:48.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:48.960	--> 	00:49.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.000	--> 	00:49.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.040	--> 	00:49.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.080	--> 	00:49.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.120	--> 	00:49.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.160	--> 	00:49.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.200	--> 	00:49.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.240	--> 	00:49.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.280	--> 	00:49.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.320	--> 	00:49.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.360	--> 	00:49.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.400	--> 	00:49.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.440	--> 	00:49.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.480	--> 	00:49.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.520	--> 	00:49.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.560	--> 	00:49.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.600	--> 	00:49.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.640	--> 	00:49.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.680	--> 	00:49.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.720	--> 	00:49.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.760	--> 	00:49.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.800	--> 	00:49.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.840	--> 	00:49.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.880	--> 	00:49.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.920	--> 	00:49.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:49.960	--> 	00:50.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.000	--> 	00:50.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.040	--> 	00:50.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.080	--> 	00:50.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.120	--> 	00:50.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.160	--> 	00:50.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.200	--> 	00:50.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.240	--> 	00:50.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.280	--> 	00:50.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.320	--> 	00:50.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.360	--> 	00:50.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.400	--> 	00:50.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.440	--> 	00:50.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.480	--> 	00:50.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.520	--> 	00:50.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.560	--> 	00:50.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.600	--> 	00:50.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.640	--> 	00:50.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.680	--> 	00:50.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.720	--> 	00:50.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.760	--> 	00:50.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.800	--> 	00:50.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.840	--> 	00:50.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.880	--> 	00:50.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.920	--> 	00:50.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:50.960	--> 	00:51.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.000	--> 	00:51.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.040	--> 	00:51.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.080	--> 	00:51.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.120	--> 	00:51.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.160	--> 	00:51.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.200	--> 	00:51.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.240	--> 	00:51.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.280	--> 	00:51.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.320	--> 	00:51.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.360	--> 	00:51.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.400	--> 	00:51.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.440	--> 	00:51.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.480	--> 	00:51.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.520	--> 	00:51.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.560	--> 	00:51.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.600	--> 	00:51.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.640	--> 	00:51.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.680	--> 	00:51.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.720	--> 	00:51.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.760	--> 	00:51.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.800	--> 	00:51.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.840	--> 	00:51.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.880	--> 	00:51.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.920	--> 	00:51.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:51.960	--> 	00:52.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.000	--> 	00:52.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.040	--> 	00:52.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.080	--> 	00:52.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.120	--> 	00:52.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.160	--> 	00:52.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.200	--> 	00:52.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.240	--> 	00:52.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.280	--> 	00:52.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.320	--> 	00:52.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.360	--> 	00:52.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.400	--> 	00:52.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.440	--> 	00:52.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.480	--> 	00:52.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.520	--> 	00:52.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.560	--> 	00:52.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.600	--> 	00:52.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.640	--> 	00:52.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.680	--> 	00:52.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.720	--> 	00:52.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.760	--> 	00:52.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.800	--> 	00:52.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.840	--> 	00:52.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.880	--> 	00:52.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.920	--> 	00:52.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:52.960	--> 	00:53.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.000	--> 	00:53.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.040	--> 	00:53.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.080	--> 	00:53.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.120	--> 	00:53.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.160	--> 	00:53.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.200	--> 	00:53.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.240	--> 	00:53.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.280	--> 	00:53.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.320	--> 	00:53.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.360	--> 	00:53.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.400	--> 	00:53.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.440	--> 	00:53.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.480	--> 	00:53.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.520	--> 	00:53.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.560	--> 	00:53.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.600	--> 	00:53.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.640	--> 	00:53.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.680	--> 	00:53.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.720	--> 	00:53.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.760	--> 	00:53.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.800	--> 	00:53.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.840	--> 	00:53.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.880	--> 	00:53.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.920	--> 	00:53.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:53.960	--> 	00:54.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.000	--> 	00:54.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.040	--> 	00:54.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.080	--> 	00:54.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.120	--> 	00:54.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.160	--> 	00:54.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.200	--> 	00:54.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.240	--> 	00:54.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.280	--> 	00:54.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.320	--> 	00:54.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.360	--> 	00:54.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.400	--> 	00:54.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.440	--> 	00:54.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.480	--> 	00:54.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.520	--> 	00:54.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.560	--> 	00:54.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.600	--> 	00:54.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.640	--> 	00:54.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.680	--> 	00:54.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.720	--> 	00:54.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.760	--> 	00:54.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.800	--> 	00:54.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.840	--> 	00:54.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.880	--> 	00:54.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.920	--> 	00:54.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:54.960	--> 	00:55.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.000	--> 	00:55.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.040	--> 	00:55.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.080	--> 	00:55.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.120	--> 	00:55.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.160	--> 	00:55.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.200	--> 	00:55.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.240	--> 	00:55.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.280	--> 	00:55.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.320	--> 	00:55.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.360	--> 	00:55.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.400	--> 	00:55.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.440	--> 	00:55.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.480	--> 	00:55.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.520	--> 	00:55.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.560	--> 	00:55.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.600	--> 	00:55.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.640	--> 	00:55.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.680	--> 	00:55.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.720	--> 	00:55.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.760	--> 	00:55.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.800	--> 	00:55.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.840	--> 	00:55.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.880	--> 	00:55.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.920	--> 	00:55.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:55.960	--> 	00:56.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.000	--> 	00:56.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.040	--> 	00:56.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.080	--> 	00:56.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.120	--> 	00:56.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.160	--> 	00:56.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.200	--> 	00:56.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.240	--> 	00:56.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.280	--> 	00:56.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.320	--> 	00:56.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.360	--> 	00:56.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.400	--> 	00:56.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.440	--> 	00:56.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.480	--> 	00:56.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.520	--> 	00:56.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.560	--> 	00:56.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.600	--> 	00:56.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.640	--> 	00:56.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.680	--> 	00:56.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.720	--> 	00:56.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.760	--> 	00:56.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.800	--> 	00:56.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.840	--> 	00:56.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.880	--> 	00:56.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.920	--> 	00:56.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:56.960	--> 	00:57.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.000	--> 	00:57.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.040	--> 	00:57.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.080	--> 	00:57.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.120	--> 	00:57.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.160	--> 	00:57.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.200	--> 	00:57.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.240	--> 	00:57.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.280	--> 	00:57.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.320	--> 	00:57.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.360	--> 	00:57.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.400	--> 	00:57.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.440	--> 	00:57.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.480	--> 	00:57.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.520	--> 	00:57.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.560	--> 	00:57.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.600	--> 	00:57.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.640	--> 	00:57.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.680	--> 	00:57.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.720	--> 	00:57.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.760	--> 	00:57.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.800	--> 	00:57.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.840	--> 	00:57.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.880	--> 	00:57.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.920	--> 	00:57.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:57.960	--> 	00:58.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.000	--> 	00:58.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.040	--> 	00:58.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.080	--> 	00:58.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.120	--> 	00:58.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.160	--> 	00:58.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.200	--> 	00:58.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.240	--> 	00:58.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.280	--> 	00:58.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.320	--> 	00:58.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.360	--> 	00:58.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.400	--> 	00:58.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.440	--> 	00:58.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.480	--> 	00:58.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.520	--> 	00:58.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.560	--> 	00:58.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.600	--> 	00:58.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.640	--> 	00:58.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.680	--> 	00:58.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.720	--> 	00:58.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.760	--> 	00:58.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.800	--> 	00:58.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.840	--> 	00:58.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.880	--> 	00:58.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.920	--> 	00:58.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:58.960	--> 	00:59.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.000	--> 	00:59.040	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	360	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.040	--> 	00:59.080	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	14.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.080	--> 	00:59.120	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	28.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.120	--> 	00:59.160	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	43.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.160	--> 	00:59.200	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	57.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.200	--> 	00:59.240	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	72	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.240	--> 	00:59.280	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	86.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.280	--> 	00:59.320	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	100.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.320	--> 	00:59.360	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	115.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.360	--> 	00:59.400	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	129.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.400	--> 	00:59.440	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	144	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.440	--> 	00:59.480	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	158.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.480	--> 	00:59.520	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	172.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.520	--> 	00:59.560	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	187.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.560	--> 	00:59.600	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	201.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.600	--> 	00:59.640	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	216	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.640	--> 	00:59.680	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	230.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.680	--> 	00:59.720	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	244.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.720	--> 	00:59.760	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	259.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.760	--> 	00:59.800	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	273.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.800	--> 	00:59.840	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	288	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.840	--> 	00:59.880	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	302.4	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.880	--> 	00:59.920	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	316.8	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.920	--> 	00:59.960	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	331.2	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-
-00:59.960	--> 	01:00.000	
-<svg width="640" height="360" xmlns='http://www.w3.org/2000/svg' viewBox='0 0 200 200'><g transform='translate(150,100)'><g transform='rotate(	345.6	)'><line x1='0' y1='0' x2='0' y2='-25' stroke='blue' stroke-width='2'></line></g></g></svg>	
-

gpac-0.8.0.tar.gz/tests/media/webvtt/timestamps-invalid.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/webvtt/timestamps.vtt Deleted

gpac-0.8.0.tar.gz/tests/media/x3d Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-Arc2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-ArcClose2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-Disk2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-Polyline2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-Polypoint2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-2D-TriangleSet2d.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-IndexedTriangleFanSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-IndexedTriangleSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-IndexedTriangleStripSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-LineSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-TriangleFanSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-TriangleSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-3D-TriangleStripSet.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-misc-ColorRGBA.x3dv Deleted

@@ -1,42 +0,0 @@
-#X3D V3.0
-
-Group {
- children [
-  WorldInfo {
-   info ["This shows IndexedFaceSets" "with RGBA color per vertex" "" "GPAC Regression Tests" "$Date: 2007-07-27 11:30:48 $ - $Revision: 1.2 $" "(C) 2002-2004 GPAC Team"]
-   title "ColorRGBA X3D Test test"
-  }
-  Transform {
-   translation -1.5 0 0
-   children [
-    Shape {
-     geometry IndexedFaceSet {
-      coordIndex [0 1 2 3 -1 1 7 4 2 -1 7 6 5 4 -1 0 3 5 6 -1 3 2 4 5 -1 6 7 1 0 -1]
-      color DEF COL ColorRGBA {
-       color [1 0 0 1, 0 1 0 0.2, 0 0 1 1, 1 1 0 0.5, 1 0 1 0.8, 0 1 1 0.2, 1 0.5 0.5 0.4, 0.5 0.5 1 0.7]
-      }
-      coord DEF COORD Coordinate {
-       point [-1 -1 1 1 -1 1 1 1 1 -1 1 1 1 1 -1 -1 1 -1 -1 -1 -1 1 -1 -1]
-      }
-     }
-    }
-   ]
-  }
-  Transform {
-   translation 1.5 0 0
-   children [
-    Shape {
-     geometry IndexedFaceSet {
-      colorIndex [0 1 2 3 4 5 6 7]
-      colorPerVertex FALSE
-      coordIndex [0 1 2 3 -1 1 7 4 2 -1 7 6 5 4 -1 0 3 5 6 -1 3 2 4 5 -1 6 7 1 0 -1]
-      color USE COL
-      coord USE COORD
-     }
-    }
-   ]
-  }
- ]
-}
-
-

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-misc-HatchStyle.x3dv Deleted

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-misc-KeySensor.x3dv Deleted

@@ -1,73 +0,0 @@
-#X3D V3.0
-
-Group {
- children [
-  Group {
-   children [
-    Group {
-     children [
-      WorldInfo {
-       info ["This shows usage of X3D KeySensor" "and triggering of events" "" "GPAC Regression Tests" "$Date: 2007-07-27 11:30:48 $ - $Revision: 1.2 $" "(C) 2002-2003 ENST"]
-       title "KeySensor X3D Test"
-      }
-      Shape {
-       appearance Appearance {
-        material Material {
-         diffuseColor 1 1 1
-        }
-       }
-       geometry DEF TEXT Text {
-        string ["Hit any key", ""]
-        fontStyle FontStyle {
-         justify ["MIDDLE" "MIDDLE"]
-        }
-       }
-      }
-      DEF SC Script {
-       inputOnly SFString keyUp
-       inputOnly SFString keyDown
-       inputOnly SFInt32 sysKeyUp
-       inputOnly SFInt32 sysKeyDown
-       inputOnly SFBool altKey
-       inputOnly SFBool ctrlKey
-       inputOnly SFBool shiftKey
-       initializeOnly SFNode txt USE TEXT
-       url ["javascript:
-        function keyUp(value) {
-         txt.string[0] = 'Key up: ' + value;
-        }
-        function keyDown(value) {
-         txt.string[0] = 'Key down: ' + value;
-        }     
-        function sysKeyUp(value) {
-         txt.string[0] = 'System Key up: ' + value;
-        }
-        function sysKeyDown(value) {
-         txt.string[0] = 'System Key down: ' + value;
-        }     
-        function altKey(value) {
-         txt.string[1] = value ? 'ALT key pressed' : '';
-        }     
-        function shiftKey(value) {
-         txt.string[1] = value ? 'SHIFT key pressed' : '';
-        }     
-        function ctrlKey(value) {
-         txt.string[1] = value ? 'CTRL key pressed' : '';
-        }     
-       "
-       ]
-      }
-      DEF KS KeySensor {}
-     ]
-    }
-   ]
-  }
- ]
-}
-ROUTE KS.keyPress TO SC.keyDown
-ROUTE KS.keyRelease TO SC.keyUp
-ROUTE KS.actionKeyPress TO SC.sysKeyDown
-ROUTE KS.actionKeyRelease TO SC.sysKeyUp
-ROUTE KS.altKey TO SC.altKey
-ROUTE KS.controlKey TO SC.ctrlKey
-ROUTE KS.shiftKey TO SC.shiftKey

gpac-0.8.0.tar.gz/tests/media/x3d/x3d-misc-StringSensor.x3dv Deleted

@@ -1,83 +0,0 @@
-#X3D V3.0
-
-Group { 
- children [
-  WorldInfo {
-   title "StringSensor X3D Test"
-   info ["This shows usage of X3D StringSensor" "" "GPAC Regression Tests" "$Date: 2007-07-27 11:30:48 $ - $Revision: 1.2 $" "(C) 2002 ENST"]
-  }
-
-  Transform { 
-   translation 0 1 0
-   children [
-    Shape { 
-     appearance DEF APP Appearance { 
-      material Material { 
-       diffuseColor 1 1 1
-      }
-     }
-     geometry Text { 
-      string [ "StringSensor" ]
-      fontStyle DEF FS FontStyle { 
-       justify [ "MIDDLE" "MIDDLE" ]
-      }
-     }
-    }
-   ]
-  }
-  Transform { 
-   translation -4 -1 0
-   children [
-    Shape { 
-     appearance USE APP
-     geometry Text { 
-      string [ "Edit:" ]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform { 
-   translation 1.8 -1 0
-   children [
-    Shape { 
-     appearance USE APP
-     geometry DEF N3 Text { 
-      string [""]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform { 
-   translation -4 -2.2 0
-   children [
-    Shape { 
-     appearance USE APP 
-     geometry Text { 
-      string [ "Final:" ]
-      fontStyle USE FS
-     }
-    }
-   ]
-  }
-  Transform { 
-   translation 1.8 -2.2 0
-   children [
-    Shape { 
-     appearance USE APP
-     geometry DEF N2 Text { 
-      string [""]
-      fontStyle USE FS 
-     }
-    }
-   ]
-  }
-  DEF STR StringSensor { 
-  }
- ]
-}
-
-ROUTE STR.enteredText TO N3.string
-ROUTE STR.finalText TO N2.string
-

gpac-0.8.0.tar.gz/tests/media/xmlin4 Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/anim.swf Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/ebu-ttd_sample.ttml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/first.xml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/input.txt Deleted

@@ -1,13 +0,0 @@
-This is a test file containing some text.
-
-1st paragraph
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse vehicula suscipit ligula, quis dignissim ipsum auctor quis. Vestibulum condimentum pharetra quam, id aliquet libero euismod quis. Sed sollicitudin ullamcorper arcu, sit amet maximus tortor gravida vel. Duis in dolor in lorem consectetur eleifend. Donec ac suscipit ante. Praesent pharetra vestibulum felis et aliquet. In hac habitasse platea dictumst. Vestibulum orci urna, auctor vel tempus vitae, mattis at enim. Donec porttitor sollicitudin ex, vitae congue dolor dapibus sit amet. Integer vitae quam a erat dignissim eleifend. Aliquam sagittis leo ut leo luctus pulvinar. Fusce ut porta eros, eget bibendum justo. Mauris nunc quam, ullamcorper in hendrerit et, tristique elementum erat. Vivamus convallis pellentesque dignissim.
-
-2nd paragraph
-Vivamus sed euismod ligula, non tempus sapien. Ut iaculis arcu quis cursus placerat. Phasellus vitae ipsum justo. Curabitur pretium nulla ut lorem pulvinar, quis lobortis augue congue. Donec mattis placerat elit, non tincidunt nunc bibendum et. Sed fermentum urna sit amet quam ultrices gravida. Suspendisse vulputate nisl enim. Duis euismod luctus enim vel dapibus. Vestibulum at elementum diam. Mauris commodo pharetra bibendum.
-
-3rd paragraph
-Ut eget quam mauris. Cras tincidunt tincidunt est, id dapibus massa gravida gravida. Mauris sed congue nisl, quis dignissim orci. Proin ac fringilla orci. Morbi malesuada elit id arcu ullamcorper efficitur. Etiam eget leo arcu. Donec vestibulum diam odio, ac porta libero bibendum pharetra. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed vel ullamcorper dui. Donec vel blandit mauris. Nunc eleifend maximus tristique.
-
-4th paragraph
-Praesent turpis lorem, maximus ut luctus eget, sodales ut enim. Ut malesuada mollis efficitur. In mi urna, laoreet sit amet imperdiet quis, fermentum sed ipsum. Sed enim augue, dignissim at sollicitudin non, consectetur sit amet elit. Donec lobortis leo sapien, non cursus nisl ullamcorper eu. Proin id massa porta, mollis dui non, rhoncus ipsum. Cras eu est a eros dictum tincidunt nec nec turpis. Quisque nec arcu a ex blandit semper ac et libero. Sed at augue sed tellus congue imperdiet eu id ex. Fusce ac accumsan augue.

gpac-0.8.0.tar.gz/tests/media/xmlin4/input.xml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/last.xml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-mett-no-mime.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-mett-xml-header.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-mett-xml.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-mett.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-metx-no-namespace.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/meta-metx.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/second.xml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/subt-sbtt-no-mime.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/subt-sbtt.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/subt-stpp-no-namespace.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/subt-stpp.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/text-stxt-header.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/text-stxt-no-mime.nhml Deleted

gpac-0.8.0.tar.gz/tests/media/xmlin4/text-stxt.nhml Deleted

gpac-0.8.0.tar.gz/tests/rules Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-background-background2D-bind-play-ui.xml Deleted

@@ -1,73 +0,0 @@
-<TestValidationScript >
-<mousemove time="1894.000000" x="98" y="198" />
-<mousemove time="1929.000000" x="98" y="192" />
-<mousemove time="1964.000000" x="99" y="186" />
-<mousemove time="1999.000000" x="99" y="183" />
-<mousemove time="2034.000000" x="100" y="182" />
-<mousemove time="2069.000000" x="100" y="178" />
-<mousemove time="2104.000000" x="101" y="173" />
-<mousemove time="2140.000000" x="102" y="170" />
-<mousemove time="2209.000000" x="102" y="167" />
-<mousemove time="2244.000000" x="102" y="163" />
-<mousemove time="2279.000000" x="103" y="156" />
-<mousemove time="2314.000000" x="103" y="148" />
-<mousemove time="2349.000000" x="103" y="137" />
-<mousemove time="2384.000000" x="103" y="126" />
-<mousemove time="2420.000000" x="102" y="116" />
-<mousemove time="2456.000000" x="101" y="110" />
-<mousemove time="2491.000000" x="101" y="104" />
-<mousemove time="2527.000000" x="101" y="102" />
-<mousemove time="2562.000000" x="100" y="102" />
-<mousedown time="3243.000000" button="Left" x="100" y="102" />
-<mouseup time="3584.000000" button="Left" x="100" y="102" />
-<mousemove time="3926.000000" x="100" y="103" />
-<mousemove time="3962.000000" x="100" y="112" />
-<mousemove time="3997.000000" x="100" y="131" />
-<mousemove time="4033.000000" x="100" y="147" />
-<mousemove time="4069.000000" x="102" y="161" />
-<mousemove time="4105.000000" x="102" y="167" />
-<mousemove time="4140.000000" x="102" y="170" />
-<mousemove time="4174.000000" x="102" y="172" />
-<mousemove time="4515.000000" x="102" y="170" />
-<mousemove time="4550.000000" x="102" y="164" />
-<mousemove time="4585.000000" x="102" y="154" />
-<mousemove time="4619.000000" x="102" y="145" />
-<mousemove time="4654.000000" x="102" y="132" />
-<mousemove time="4689.000000" x="102" y="121" />
-<mousemove time="4725.000000" x="102" y="110" />
-<mousemove time="4760.000000" x="102" y="104" />
-<mousemove time="4796.000000" x="102" y="101" />
-<mousemove time="4832.000000" x="102" y="100" />
-<mousemove time="4867.000000" x="101" y="100" />
-<mousemove time="5891.000000" x="101" y="103" />
-<mousemove time="5925.000000" x="101" y="109" />
-<mousemove time="5961.000000" x="102" y="120" />
-<mousemove time="5961.000000" x="102" y="129" />
-<mousemove time="5997.000000" x="103" y="140" />
-<mousemove time="6033.000000" x="106" y="150" />
-<mousemove time="6068.000000" x="106" y="160" />
-<mousemove time="6103.000000" x="106" y="167" />
-<mousemove time="6138.000000" x="106" y="171" />
-<mousemove time="6173.000000" x="107" y="171" />
-<mousemove time="8923.000000" x="110" y="171" />
-<mousemove time="8957.000000" x="118" y="169" />
-<mousemove time="8992.000000" x="130" y="160" />
-<mousemove time="9026.000000" x="135" y="152" />
-<mousemove time="9061.000000" x="141" y="142" />
-<mousemove time="9096.000000" x="146" y="131" />
-<mousemove time="9131.000000" x="151" y="119" />
-<mousemove time="9166.000000" x="153" y="113" />
-<mousemove time="9201.000000" x="154" y="111" />
-<mousemove time="9236.000000" x="154" y="110" />
-<mousemove time="9508.000000" x="154" y="111" />
-<mousemove time="9543.000000" x="154" y="115" />
-<mousemove time="9578.000000" x="152" y="126" />
-<mousemove time="9612.000000" x="149" y="134" />
-<mousemove time="9646.000000" x="146" y="141" />
-<mousemove time="9681.000000" x="141" y="145" />
-<mousemove time="9716.000000" x="133" y="149" />
-<mousemove time="9751.000000" x="124" y="151" />
-<mousemove time="9786.000000" x="110" y="152" />
-<mousemove time="9820.000000" x="100" y="152" />
-<mousemove time="9855.000000" x="97" y="152" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-background-background2D-image-play-ui.xml Deleted

@@ -1,62 +0,0 @@
-<TestValidationScript >
-<mousemove time="263.000000" x="97" y="197" />
-<mousemove time="3381.000000" x="97" y="150" />
-<mousemove time="3417.000000" x="97" y="143" />
-<mousemove time="3452.000000" x="97" y="130" />
-<mousemove time="3487.000000" x="97" y="119" />
-<mousemove time="3523.000000" x="97" y="115" />
-<mousemove time="3524.000000" x="97" y="114" />
-<mousemove time="3560.000000" x="97" y="111" />
-<mousemove time="3596.000000" x="97" y="109" />
-<mousedown time="4243.000000" button="Left" x="97" y="109" />
-<mouseup time="4586.000000" button="Left" x="97" y="109" />
-<mousemove time="4931.000000" x="97" y="110" />
-<mousemove time="4967.000000" x="97" y="125" />
-<mousemove time="5003.000000" x="95" y="134" />
-<mousemove time="5038.000000" x="95" y="137" />
-<mousemove time="5379.000000" x="95" y="134" />
-<mousemove time="5415.000000" x="95" y="129" />
-<mousemove time="5415.000000" x="95" y="125" />
-<mousemove time="5449.000000" x="95" y="120" />
-<mousemove time="5484.000000" x="97" y="115" />
-<mousemove time="5521.000000" x="98" y="112" />
-<mousemove time="5557.000000" x="98" y="111" />
-<mousemove time="5558.000000" x="98" y="110" />
-<mousedown time="6000.000000" button="Left" x="98" y="110" />
-<mouseup time="6205.000000" button="Left" x="98" y="110" />
-<mousemove time="6478.000000" x="98" y="112" />
-<mousemove time="6514.000000" x="98" y="128" />
-<mousemove time="6515.000000" x="98" y="138" />
-<mousemove time="6551.000000" x="98" y="149" />
-<mousemove time="6586.000000" x="98" y="151" />
-<mousemove time="7065.000000" x="98" y="150" />
-<mousemove time="7099.000000" x="98" y="148" />
-<mousemove time="7133.000000" x="98" y="142" />
-<mousemove time="7168.000000" x="98" y="134" />
-<mousemove time="7203.000000" x="98" y="126" />
-<mousemove time="7238.000000" x="98" y="116" />
-<mousemove time="7273.000000" x="98" y="109" />
-<mousemove time="7309.000000" x="98" y="101" />
-<mousemove time="7343.000000" x="98" y="93" />
-<mousemove time="7379.000000" x="97" y="86" />
-<mousemove time="7415.000000" x="97" y="77" />
-<mousemove time="7452.000000" x="96" y="65" />
-<mousemove time="7487.000000" x="96" y="51" />
-<mousemove time="7522.000000" x="96" y="39" />
-<mousemove time="7557.000000" x="96" y="30" />
-<mousemove time="7592.000000" x="96" y="27" />
-<mousemove time="7626.000000" x="95" y="26" />
-<mousemove time="9403.000000" x="95" y="43" />
-<mousemove time="9437.000000" x="95" y="73" />
-<mousemove time="9472.000000" x="96" y="97" />
-<mousemove time="9508.000000" x="96" y="114" />
-<mousemove time="9544.000000" x="96" y="130" />
-<mousemove time="9545.000000" x="96" y="138" />
-<mousemove time="9581.000000" x="97" y="148" />
-<mousemove time="9616.000000" x="98" y="158" />
-<mousemove time="9651.000000" x="99" y="171" />
-<mousemove time="9686.000000" x="100" y="182" />
-<mousemove time="9721.000000" x="101" y="191" />
-<mousemove time="9756.000000" x="101" y="197" />
-<mousemove time="9756.000000" x="101" y="199" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-background-background2D-movie-play-ui.xml Deleted

@@ -1,43 +0,0 @@
-<TestValidationScript >
-<mousemove time="1242.000000" x="101" y="191" />
-<mousemove time="1281.000000" x="101" y="181" />
-<mousemove time="1281.000000" x="101" y="176" />
-<mousemove time="1319.000000" x="101" y="166" />
-<mousemove time="1362.000000" x="100" y="157" />
-<mousemove time="1402.000000" x="100" y="146" />
-<mousemove time="1440.000000" x="100" y="139" />
-<mousemove time="1482.000000" x="100" y="136" />
-<mousemove time="1561.000000" x="99" y="134" />
-<mousemove time="1601.000000" x="99" y="131" />
-<mousemove time="1606.000000" x="99" y="130" />
-<mousemove time="1642.000000" x="99" y="125" />
-<mousemove time="1681.000000" x="99" y="116" />
-<mousemove time="1723.000000" x="99" y="110" />
-<mousemove time="1726.000000" x="99" y="108" />
-<mousemove time="1762.000000" x="99" y="107" />
-<mousemove time="2842.000000" x="99" y="113" />
-<mousemove time="2847.000000" x="99" y="117" />
-<mousemove time="2884.000000" x="99" y="129" />
-<mousemove time="2921.000000" x="99" y="136" />
-<mousemove time="2962.000000" x="99" y="141" />
-<mousemove time="3000.000000" x="99" y="145" />
-<mousemove time="3007.000000" x="100" y="147" />
-<mousemove time="3042.000000" x="100" y="150" />
-<mousemove time="4162.000000" x="100" y="149" />
-<mousemove time="4201.000000" x="100" y="142" />
-<mousemove time="4242.000000" x="100" y="138" />
-<mousemove time="4282.000000" x="100" y="133" />
-<mousemove time="4322.000000" x="99" y="120" />
-<mousemove time="4362.000000" x="99" y="114" />
-<mousemove time="4406.000000" x="99" y="112" />
-<mousemove time="4442.000000" x="99" y="111" />
-<mousemove time="5162.000000" x="99" y="114" />
-<mousemove time="5201.000000" x="99" y="123" />
-<mousemove time="5257.000000" x="101" y="135" />
-<mousemove time="5288.000000" x="101" y="141" />
-<mousemove time="5324.000000" x="101" y="146" />
-<mousemove time="5361.000000" x="102" y="150" />
-<mousemove time="5402.000000" x="102" y="152" />
-<mousemove time="5442.000000" x="102" y="154" />
-<mousemove time="5481.000000" x="104" y="155" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-background-background2D-url-change-play-ui.xml Deleted

@@ -1,53 +0,0 @@
-<TestValidationScript >
-<mousemove time="1219.000000" x="104" y="154" />
-<mousemove time="1255.000000" x="104" y="146" />
-<mousemove time="1290.000000" x="101" y="136" />
-<mousemove time="1325.000000" x="101" y="130" />
-<mousemove time="1361.000000" x="100" y="123" />
-<mousemove time="1362.000000" x="100" y="119" />
-<mousemove time="1398.000000" x="100" y="113" />
-<mousemove time="1433.000000" x="100" y="111" />
-<mousemove time="1537.000000" x="100" y="110" />
-<mousemove time="1572.000000" x="100" y="109" />
-<mousedown time="1878.000000" button="Left" x="100" y="109" />
-<mouseup time="2660.000000" button="Left" x="100" y="109" />
-<mousedown time="3276.000000" button="Left" x="100" y="109" />
-<mouseup time="3924.000000" button="Left" x="100" y="109" />
-<mousemove time="4970.000000" x="100" y="110" />
-<mousemove time="5007.000000" x="100" y="116" />
-<mousemove time="5043.000000" x="100" y="124" />
-<mousemove time="5044.000000" x="100" y="129" />
-<mousemove time="5079.000000" x="100" y="136" />
-<mousemove time="5114.000000" x="100" y="142" />
-<mousemove time="5148.000000" x="100" y="144" />
-<mousemove time="5524.000000" x="100" y="143" />
-<mousemove time="5559.000000" x="99" y="138" />
-<mousemove time="5593.000000" x="99" y="128" />
-<mousemove time="5629.000000" x="99" y="122" />
-<mousemove time="5664.000000" x="99" y="117" />
-<mousemove time="5700.000000" x="99" y="112" />
-<mousemove time="5736.000000" x="99" y="108" />
-<mousemove time="5772.000000" x="99" y="107" />
-<mousemove time="6320.000000" x="99" y="108" />
-<mousemove time="6355.000000" x="99" y="114" />
-<mousemove time="6390.000000" x="99" y="125" />
-<mousemove time="6426.000000" x="99" y="138" />
-<mousemove time="6462.000000" x="99" y="144" />
-<mousemove time="6498.000000" x="99" y="145" />
-<mousemove time="6942.000000" x="99" y="144" />
-<mousemove time="6977.000000" x="99" y="141" />
-<mousemove time="7013.000000" x="99" y="133" />
-<mousemove time="7047.000000" x="98" y="122" />
-<mousemove time="7087.000000" x="98" y="115" />
-<mousemove time="7123.000000" x="98" y="111" />
-<mousemove time="7158.000000" x="98" y="109" />
-<mousemove time="7194.000000" x="98" y="108" />
-<mousemove time="7671.000000" x="98" y="109" />
-<mousemove time="7672.000000" x="98" y="110" />
-<mousemove time="7707.000000" x="98" y="116" />
-<mousemove time="7742.000000" x="98" y="127" />
-<mousemove time="7777.000000" x="98" y="136" />
-<mousemove time="7811.000000" x="99" y="142" />
-<mousemove time="7845.000000" x="99" y="144" />
-<mousemove time="7880.000000" x="100" y="145" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-discsensor-play-ui.xml Deleted

@@ -1,120 +0,0 @@
-<TestValidationScript >
-<mousemove time="187.000000" x="100" y="190" />
-<mousemove time="1004.000000" x="95" y="145" />
-<mousemove time="1039.000000" x="84" y="140" />
-<mousemove time="1074.000000" x="73" y="134" />
-<mousemove time="1109.000000" x="69" y="130" />
-<mousemove time="1143.000000" x="69" y="129" />
-<mousemove time="1179.000000" x="68" y="129" />
-<mousemove time="1215.000000" x="68" y="128" />
-<mousemove time="1251.000000" x="68" y="127" />
-<mousemove time="1287.000000" x="68" y="126" />
-<mousemove time="1323.000000" x="68" y="125" />
-<mousemove time="1323.000000" x="69" y="125" />
-<mousemove time="1358.000000" x="69" y="124" />
-<mousemove time="1392.000000" x="70" y="123" />
-<mousedown time="1565.000000" button="Left" x="70" y="123" />
-<mousemove time="1839.000000" x="70" y="117" />
-<mousemove time="1876.000000" x="72" y="110" />
-<mousemove time="1913.000000" x="73" y="107" />
-<mousemove time="1950.000000" x="73" y="105" />
-<mousemove time="1989.000000" x="73" y="98" />
-<mousemove time="1989.000000" x="74" y="94" />
-<mousemove time="2026.000000" x="75" y="90" />
-<mousemove time="2062.000000" x="75" y="89" />
-<mousemove time="2099.000000" x="75" y="88" />
-<mousemove time="2100.000000" x="75" y="87" />
-<mousemove time="2136.000000" x="75" y="85" />
-<mousemove time="2172.000000" x="75" y="84" />
-<mousemove time="2448.000000" x="75" y="85" />
-<mousemove time="2483.000000" x="75" y="86" />
-<mousemove time="2520.000000" x="75" y="87" />
-<mousemove time="2557.000000" x="75" y="89" />
-<mousemove time="2594.000000" x="75" y="93" />
-<mousemove time="2631.000000" x="75" y="99" />
-<mousemove time="2632.000000" x="75" y="104" />
-<mousemove time="2669.000000" x="75" y="108" />
-<mousemove time="2708.000000" x="75" y="110" />
-<mousemove time="2745.000000" x="75" y="115" />
-<mousemove time="2781.000000" x="74" y="120" />
-<mousemove time="2818.000000" x="73" y="123" />
-<mousemove time="2855.000000" x="73" y="124" />
-<mousemove time="2891.000000" x="73" y="125" />
-<mousemove time="2994.000000" x="73" y="126" />
-<mouseup time="3098.000000" button="Left" x="73" y="126" />
-<mousemove time="3443.000000" x="78" y="124" />
-<mousemove time="3479.000000" x="84" y="118" />
-<mousemove time="3514.000000" x="90" y="113" />
-<mousemove time="3550.000000" x="95" y="107" />
-<mousemove time="3586.000000" x="99" y="101" />
-<mousemove time="3621.000000" x="104" y="96" />
-<mousemove time="3656.000000" x="107" y="94" />
-<mousemove time="3691.000000" x="107" y="93" />
-<mousemove time="3725.000000" x="107" y="92" />
-<mousemove time="3760.000000" x="109" y="90" />
-<mousemove time="3795.000000" x="110" y="88" />
-<mousemove time="3830.000000" x="112" y="86" />
-<mousemove time="3865.000000" x="114" y="84" />
-<mousemove time="3900.000000" x="117" y="82" />
-<mousemove time="3934.000000" x="121" y="79" />
-<mousemove time="3969.000000" x="122" y="79" />
-<mousemove time="4038.000000" x="123" y="79" />
-<mousedown time="4347.000000" button="Left" x="123" y="79" />
-<mousemove time="4695.000000" x="123" y="82" />
-<mousemove time="4732.000000" x="123" y="88" />
-<mousemove time="4769.000000" x="122" y="93" />
-<mousemove time="4805.000000" x="121" y="97" />
-<mousemove time="4843.000000" x="121" y="99" />
-<mousemove time="4879.000000" x="121" y="101" />
-<mousemove time="4916.000000" x="121" y="105" />
-<mousemove time="4953.000000" x="121" y="108" />
-<mousemove time="4990.000000" x="121" y="109" />
-<mouseup time="5163.000000" button="Left" x="121" y="109" />
-<mousemove time="5612.000000" x="129" y="109" />
-<mousemove time="5648.000000" x="145" y="109" />
-<mousemove time="5684.000000" x="158" y="107" />
-<mousemove time="5719.000000" x="163" y="105" />
-<mousemove time="5755.000000" x="166" y="103" />
-<mousemove time="5791.000000" x="166" y="102" />
-<mousemove time="5996.000000" x="167" y="100" />
-<mousemove time="6067.000000" x="167" y="99" />
-<mousemove time="6068.000000" x="167" y="98" />
-<mousedown time="6103.000000" button="Left" x="167" y="98" />
-<mousemove time="6382.000000" x="167" y="97" />
-<mousemove time="6418.000000" x="167" y="96" />
-<mousemove time="6454.000000" x="167" y="94" />
-<mousemove time="6489.000000" x="166" y="93" />
-<mousemove time="6525.000000" x="166" y="92" />
-<mousemove time="6595.000000" x="165" y="91" />
-<mousemove time="6630.000000" x="165" y="90" />
-<mouseup time="6769.000000" button="Left" x="165" y="90" />
-<mousedown time="8059.000000" button="Left" x="165" y="90" />
-<mousemove time="8337.000000" x="165" y="86" />
-<mousemove time="8375.000000" x="161" y="80" />
-<mousemove time="8411.000000" x="159" y="74" />
-<mousemove time="8447.000000" x="156" y="68" />
-<mousemove time="8448.000000" x="155" y="66" />
-<mousemove time="8486.000000" x="154" y="64" />
-<mousemove time="8525.000000" x="153" y="62" />
-<mousemove time="8563.000000" x="152" y="61" />
-<mousemove time="8603.000000" x="151" y="61" />
-<mouseup time="8741.000000" button="Left" x="151" y="61" />
-<mousemove time="8948.000000" x="150" y="61" />
-<mousemove time="8951.000000" x="147" y="64" />
-<mousemove time="8986.000000" x="136" y="73" />
-<mousemove time="9020.000000" x="120" y="86" />
-<mousemove time="9055.000000" x="105" y="99" />
-<mousemove time="9090.000000" x="95" y="105" />
-<mousemove time="9125.000000" x="90" y="109" />
-<mousemove time="9161.000000" x="86" y="112" />
-<mousemove time="9196.000000" x="83" y="113" />
-<mousemove time="9231.000000" x="80" y="115" />
-<mousemove time="9266.000000" x="77" y="116" />
-<mousemove time="9302.000000" x="76" y="118" />
-<mousemove time="9372.000000" x="74" y="118" />
-<mousemove time="9409.000000" x="72" y="118" />
-<mousemove time="9445.000000" x="70" y="118" />
-<mousemove time="9480.000000" x="69" y="118" />
-<mousemove time="9622.000000" x="68" y="118" />
-<mousedown time="9797.000000" button="Left" x="68" y="118" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-htk-sensor-play-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-keysensor-play-ui.xml Deleted

@@ -1,97 +0,0 @@
-<TestValidationScript >
-<mousemove time="247.000000" x="83" y="133" />
-<mousemove time="839.000000" x="83" y="91" />
-<mousemove time="875.000000" x="86" y="97" />
-<mousemove time="909.000000" x="87" y="104" />
-<mousemove time="944.000000" x="88" y="107" />
-<mousemove time="979.000000" x="89" y="108" />
-<mousemove time="1048.000000" x="90" y="109" />
-<mousemove time="1083.000000" x="91" y="111" />
-<mousemove time="1118.000000" x="97" y="114" />
-<mousemove time="1153.000000" x="103" y="121" />
-<mousemove time="1189.000000" x="107" y="125" />
-<mousemove time="1223.000000" x="109" y="128" />
-<mousemove time="1258.000000" x="110" y="130" />
-<mousemove time="1462.000000" x="110" y="131" />
-<mousemove time="1496.000000" x="108" y="132" />
-<mousemove time="1531.000000" x="106" y="134" />
-<mousemove time="1566.000000" x="105" y="134" />
-<mousemove time="1601.000000" x="105" y="135" />
-<mousemove time="1635.000000" x="104" y="137" />
-<mousemove time="1671.000000" x="103" y="139" />
-<mousemove time="1706.000000" x="102" y="141" />
-<mousemove time="1740.000000" x="101" y="142" />
-<mousemove time="1775.000000" x="100" y="143" />
-<mousemove time="1810.000000" x="99" y="144" />
-<mousemove time="1845.000000" x="98" y="146" />
-<mousemove time="1879.000000" x="96" y="146" />
-<keydown time="2831.000000" key_identifier="Shift" shift="true" />
-<keyup time="3140.000000" key_identifier="Shift" />
-<keydown time="3577.000000" key_identifier="Shift" shift="true" />
-<keydown time="3994.000000" key_identifier="F1" shift="true" />
-<keyup time="4131.000000" key_identifier="F1" shift="true" />
-<keydown time="4372.000000" key_identifier="F2" shift="true" />
-<keyup time="4512.000000" key_identifier="F2" shift="true" />
-<keydown time="4787.000000" key_identifier="F3" shift="true" />
-<keyup time="4925.000000" key_identifier="F3" shift="true" />
-<keydown time="5440.000000" key_identifier="F4" shift="true" />
-<keyup time="5612.000000" key_identifier="Shift" />
-<keyup time="5612.000000" key_identifier="F4" />
-<keydown time="6088.000000" key_identifier="Shift" shift="true" />
-<keydown time="6226.000000" key_identifier="F6" shift="true" />
-<keyup time="6361.000000" key_identifier="F6" shift="true" />
-<keyup time="6563.000000" key_identifier="Shift" />
-<keydown time="6735.000000" key_identifier="U+0042" />
-<textInput time="6735.000000" unicode-char="98" />
-<keydown time="6771.000000" key_identifier="U+0044" />
-<textInput time="6771.000000" unicode-char="100" />
-<keyup time="6874.000000" key_identifier="U+0042" />
-<keydown time="6910.000000" key_identifier="U+004A" />
-<textInput time="6910.000000" unicode-char="106" />
-<keyup time="6950.000000" key_identifier="U+0044" />
-<keydown time="6950.000000" key_identifier="U+0045" />
-<textInput time="6950.000000" unicode-char="101" />
-<keydown time="6986.000000" key_identifier="U+005A" />
-<textInput time="6986.000000" unicode-char="122" />
-<keyup time="6986.000000" key_identifier="U+004A" />
-<keyup time="7056.000000" key_identifier="U+005A" />
-<keydown time="7092.000000" key_identifier="U+0044" />
-<textInput time="7092.000000" unicode-char="100" />
-<keyup time="7127.000000" key_identifier="U+0045" />
-<keyup time="7228.000000" key_identifier="U+0044" />
-<keydown time="7228.000000" key_identifier="U+005A" />
-<textInput time="7228.000000" unicode-char="122" />
-<keydown time="7264.000000" key_identifier="U+0045" />
-<textInput time="7264.000000" unicode-char="101" />
-<keyup time="7299.000000" key_identifier="U+0045" />
-<keyup time="7334.000000" key_identifier="U+005A" />
-<keydown time="7370.000000" key_identifier="U+0042" />
-<textInput time="7370.000000" unicode-char="98" />
-<keyup time="7474.000000" key_identifier="U+0042" />
-<keydown time="7747.000000" key_identifier="Enter" />
-<keyup time="7783.000000" key_identifier="Enter" />
-<keydown time="8092.000000" key_identifier="Enter" />
-<keyup time="8194.000000" key_identifier="Enter" />
-<keydown time="8296.000000" key_identifier="Enter" />
-<keyup time="8397.000000" key_identifier="Enter" />
-<keydown time="8671.000000" key_identifier="U+004E" />
-<textInput time="8671.000000" unicode-char="110" />
-<keydown time="8808.000000" key_identifier="U+002C" />
-<textInput time="8808.000000" unicode-char="44" />
-<keydown time="8808.000000" key_identifier="U+0053" />
-<textInput time="8808.000000" unicode-char="115" />
-<keydown time="8809.000000" key_identifier="U+0044" />
-<textInput time="8809.000000" unicode-char="100" />
-<keyup time="8844.000000" key_identifier="U+004E" />
-<keyup time="8947.000000" key_identifier="U+002C" />
-<keyup time="8983.000000" key_identifier="U+0053" />
-<keyup time="8983.000000" key_identifier="U+0044" />
-<keydown time="9053.000000" key_identifier="U+002C" />
-<textInput time="9053.000000" unicode-char="44" />
-<keyup time="9225.000000" key_identifier="U+002C" />
-<keydown time="9734.000000" key_identifier="U+0042" />
-<textInput time="9734.000000" unicode-char="98" />
-<keydown time="9770.000000" key_identifier="U+0056" />
-<textInput time="9770.000000" unicode-char="118" />
-<keyup time="9840.000000" key_identifier="U+0042" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-mousesensor-play-ui.xml Deleted

@@ -1,93 +0,0 @@
-<TestValidationScript >
-<mousemove time="186.000000" x="96" y="191" />
-<mousemove time="1096.000000" x="98" y="133" />
-<mousemove time="1130.000000" x="103" y="123" />
-<mousemove time="1166.000000" x="108" y="113" />
-<mousemove time="1202.000000" x="113" y="106" />
-<mousemove time="1240.000000" x="118" y="99" />
-<mousemove time="1276.000000" x="122" y="93" />
-<mousemove time="1311.000000" x="123" y="90" />
-<mousemove time="1347.000000" x="123" y="85" />
-<mousemove time="1382.000000" x="123" y="77" />
-<mousemove time="1417.000000" x="120" y="66" />
-<mousemove time="1453.000000" x="114" y="57" />
-<mousemove time="1489.000000" x="105" y="48" />
-<mousemove time="1524.000000" x="99" y="42" />
-<mousemove time="1560.000000" x="88" y="38" />
-<mousemove time="1596.000000" x="77" y="38" />
-<mousemove time="1630.000000" x="65" y="38" />
-<mousemove time="1665.000000" x="56" y="40" />
-<mousemove time="1701.000000" x="47" y="46" />
-<mousemove time="1736.000000" x="39" y="55" />
-<mousemove time="1772.000000" x="33" y="63" />
-<mousemove time="1808.000000" x="32" y="69" />
-<mousemove time="1844.000000" x="33" y="73" />
-<mousemove time="1880.000000" x="39" y="78" />
-<mousemove time="1915.000000" x="43" y="82" />
-<mousemove time="1949.000000" x="48" y="86" />
-<mousemove time="1984.000000" x="53" y="88" />
-<mousemove time="2019.000000" x="55" y="88" />
-<mousemove time="2053.000000" x="57" y="88" />
-<mousemove time="2088.000000" x="57" y="87" />
-<mousemove time="2123.000000" x="57" y="84" />
-<mousemove time="2158.000000" x="57" y="83" />
-<mousedown time="2469.000000" button="Left" x="57" y="83" />
-<mouseup time="2707.000000" button="Left" x="57" y="83" />
-<mousedown time="4549.000000" button="Right" x="57" y="83" />
-<mouseup time="4789.000000" button="Right" x="57" y="83" />
-<mousedown time="5713.000000" button="Left" x="57" y="83" />
-<mouseup time="5849.000000" button="Left" x="57" y="83" />
-<mousemove time="6500.000000" x="57" y="96" />
-<mousemove time="6535.000000" x="57" y="153" />
-<mousemove time="6570.000000" x="60" y="184" />
-<mousemove time="6571.000000" x="62" y="199" />
-<mousemove time="7194.000000" x="68" y="194" />
-<mousemove time="7230.000000" x="78" y="161" />
-<mousemove time="7265.000000" x="84" y="139" />
-<mousemove time="7305.000000" x="88" y="130" />
-<mousemove time="7341.000000" x="89" y="127" />
-<mousemove time="7377.000000" x="91" y="124" />
-<mousemove time="7414.000000" x="94" y="122" />
-<wheel time="7932.000000" x="32767" y="1689397248" wheel_pos="0.000000" />
-<wheel time="7968.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="7968.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="7968.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="7968.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8005.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8005.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8005.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8041.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8041.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8078.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8288.000000" x="32767" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8288.000000" x="32767" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8324.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8324.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8361.000000" x="1" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8433.000000" x="32767" y="1689397248" wheel_pos="0.000000" />
-<wheel time="8505.000000" x="32767" y="1689397248" wheel_pos="0.000000" />
-<mousemove time="8817.000000" x="94" y="123" />
-<mousemove time="8852.000000" x="100" y="132" />
-<mousemove time="8889.000000" x="106" y="144" />
-<mousemove time="8926.000000" x="119" y="167" />
-<mousemove time="8962.000000" x="126" y="174" />
-<mousemove time="8997.000000" x="128" y="176" />
-<mousemove time="9033.000000" x="130" y="176" />
-<mousemove time="9104.000000" x="133" y="167" />
-<mousemove time="9104.000000" x="136" y="161" />
-<mousemove time="9140.000000" x="143" y="142" />
-<mousemove time="9175.000000" x="148" y="125" />
-<mousemove time="9212.000000" x="151" y="112" />
-<mousemove time="9251.000000" x="151" y="101" />
-<mousemove time="9287.000000" x="151" y="93" />
-<mousemove time="9322.000000" x="147" y="88" />
-<mousemove time="9357.000000" x="142" y="84" />
-<mousemove time="9393.000000" x="137" y="81" />
-<mousemove time="9429.000000" x="134" y="80" />
-<mousemove time="9464.000000" x="132" y="79" />
-<mousemove time="9500.000000" x="128" y="78" />
-<mousemove time="9501.000000" x="128" y="77" />
-<mousemove time="9536.000000" x="127" y="77" />
-<mousedown time="9676.000000" button="Left" x="127" y="77" />
-<mouseup time="9816.000000" button="Left" x="127" y="77" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-nested-sensors-play-ui.xml Deleted

@@ -1,81 +0,0 @@
-<TestValidationScript >
-<mousemove time="206.000000" x="127" y="122" />
-<mousemove time="844.000000" x="127" y="79" />
-<mousemove time="878.000000" x="134" y="88" />
-<mousemove time="912.000000" x="138" y="95" />
-<mousemove time="947.000000" x="139" y="100" />
-<mousemove time="981.000000" x="139" y="106" />
-<mousemove time="1017.000000" x="139" y="113" />
-<mousemove time="1052.000000" x="139" y="117" />
-<mousemove time="1087.000000" x="132" y="117" />
-<mousemove time="1122.000000" x="121" y="117" />
-<mousemove time="1123.000000" x="114" y="117" />
-<mousemove time="1159.000000" x="107" y="113" />
-<mousemove time="1195.000000" x="100" y="104" />
-<mousemove time="1230.000000" x="95" y="93" />
-<mousemove time="1265.000000" x="92" y="89" />
-<mousemove time="1299.000000" x="91" y="87" />
-<mousemove time="1368.000000" x="91" y="86" />
-<mousemove time="1609.000000" x="91" y="87" />
-<mousedown time="1886.000000" button="Left" x="91" y="87" />
-<mouseup time="2094.000000" button="Left" x="91" y="87" />
-<mousemove time="2437.000000" x="91" y="89" />
-<mousemove time="2473.000000" x="92" y="95" />
-<mousemove time="2509.000000" x="93" y="104" />
-<mousemove time="2545.000000" x="93" y="108" />
-<mousemove time="2579.000000" x="93" y="109" />
-<mousemove time="2615.000000" x="94" y="111" />
-<mousemove time="2651.000000" x="94" y="113" />
-<mousemove time="2687.000000" x="94" y="114" />
-<mousemove time="2723.000000" x="94" y="115" />
-<mousemove time="2794.000000" x="94" y="116" />
-<mousemove time="2829.000000" x="94" y="117" />
-<mousemove time="2865.000000" x="96" y="122" />
-<mousemove time="2901.000000" x="96" y="123" />
-<mousemove time="2902.000000" x="96" y="124" />
-<mousedown time="3519.000000" button="Left" x="96" y="124" />
-<mousemove time="3829.000000" x="98" y="127" />
-<mousemove time="3867.000000" x="102" y="131" />
-<mousemove time="3903.000000" x="105" y="134" />
-<mousemove time="3940.000000" x="107" y="136" />
-<mousemove time="3977.000000" x="111" y="138" />
-<mousemove time="4014.000000" x="119" y="139" />
-<mousemove time="4051.000000" x="130" y="139" />
-<mousemove time="4087.000000" x="139" y="139" />
-<mousemove time="4124.000000" x="147" y="132" />
-<mousemove time="4160.000000" x="154" y="121" />
-<mousemove time="4196.000000" x="157" y="116" />
-<mousemove time="4232.000000" x="158" y="114" />
-<mousemove time="4269.000000" x="158" y="109" />
-<mousemove time="4306.000000" x="148" y="101" />
-<mousemove time="4346.000000" x="130" y="90" />
-<mousemove time="4381.000000" x="116" y="86" />
-<mousemove time="4418.000000" x="106" y="84" />
-<mousemove time="4455.000000" x="97" y="84" />
-<mousemove time="4491.000000" x="88" y="84" />
-<mousemove time="4527.000000" x="80" y="89" />
-<mousemove time="4564.000000" x="74" y="93" />
-<mousemove time="4601.000000" x="70" y="96" />
-<mousemove time="4637.000000" x="67" y="98" />
-<mousemove time="4777.000000" x="67" y="99" />
-<mousemove time="4813.000000" x="70" y="100" />
-<mousemove time="4850.000000" x="76" y="102" />
-<mousemove time="4887.000000" x="78" y="103" />
-<mouseup time="5264.000000" button="Left" x="78" y="103" />
-<mousemove time="5541.000000" x="78" y="102" />
-<mousemove time="5542.000000" x="78" y="98" />
-<mousemove time="5578.000000" x="78" y="87" />
-<mousemove time="5614.000000" x="78" y="76" />
-<mousemove time="5650.000000" x="78" y="72" />
-<mousemove time="5684.000000" x="78" y="71" />
-<mousedown time="5959.000000" button="Left" x="78" y="71" />
-<mouseup time="6096.000000" button="Left" x="78" y="71" />
-<mousemove time="6303.000000" x="78" y="72" />
-<mousemove time="6338.000000" x="78" y="82" />
-<mousemove time="6373.000000" x="78" y="94" />
-<mousemove time="6408.000000" x="78" y="105" />
-<mousemove time="6444.000000" x="80" y="114" />
-<mousemove time="6481.000000" x="82" y="121" />
-<mousemove time="6517.000000" x="82" y="123" />
-<mousemove time="6552.000000" x="82" y="124" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-planesensor2D-play-ui.xml Deleted

@@ -1,80 +0,0 @@
-<TestValidationScript >
-<mousemove time="179.000000" x="82" y="169" />
-<mousemove time="899.000000" x="78" y="124" />
-<mousemove time="935.000000" x="71" y="122" />
-<mousemove time="971.000000" x="64" y="119" />
-<mousemove time="1006.000000" x="62" y="118" />
-<mousemove time="1076.000000" x="62" y="117" />
-<mousedown time="1859.000000" button="Left" x="62" y="117" />
-<mousemove time="2309.000000" x="62" y="114" />
-<mousemove time="2346.000000" x="64" y="108" />
-<mousemove time="2383.000000" x="67" y="98" />
-<mousemove time="2420.000000" x="69" y="89" />
-<mousemove time="2458.000000" x="71" y="82" />
-<mousemove time="2495.000000" x="71" y="78" />
-<mousemove time="2532.000000" x="72" y="76" />
-<mouseup time="2740.000000" button="Left" x="72" y="76" />
-<mousemove time="3049.000000" x="72" y="77" />
-<mousemove time="3085.000000" x="71" y="84" />
-<mousemove time="3121.000000" x="68" y="88" />
-<mousemove time="3156.000000" x="68" y="90" />
-<mousemove time="3191.000000" x="67" y="90" />
-<mousemove time="3261.000000" x="66" y="80" />
-<mousemove time="3296.000000" x="66" y="64" />
-<mousemove time="3332.000000" x="66" y="51" />
-<mousemove time="3367.000000" x="66" y="46" />
-<mousemove time="3403.000000" x="66" y="44" />
-<mousemove time="3439.000000" x="65" y="40" />
-<mousemove time="3440.000000" x="64" y="40" />
-<mousemove time="3475.000000" x="64" y="39" />
-<mousedown time="3681.000000" button="Left" x="64" y="39" />
-<mousemove time="3854.000000" x="64" y="41" />
-<mousemove time="3890.000000" x="64" y="45" />
-<mousemove time="3926.000000" x="64" y="51" />
-<mousemove time="3962.000000" x="64" y="62" />
-<mousemove time="3963.000000" x="64" y="67" />
-<mousemove time="4000.000000" x="64" y="74" />
-<mousemove time="4037.000000" x="64" y="77" />
-<mousemove time="4073.000000" x="64" y="78" />
-<mouseup time="4213.000000" button="Left" x="64" y="78" />
-<mousemove time="4387.000000" x="65" y="78" />
-<mousemove time="4388.000000" x="69" y="78" />
-<mousemove time="4423.000000" x="85" y="81" />
-<mousemove time="4459.000000" x="100" y="85" />
-<mousemove time="4495.000000" x="112" y="89" />
-<mousemove time="4531.000000" x="122" y="93" />
-<mousemove time="4567.000000" x="130" y="95" />
-<mousemove time="4603.000000" x="136" y="97" />
-<mousemove time="4639.000000" x="138" y="98" />
-<mousemove time="4675.000000" x="139" y="99" />
-<mousemove time="4711.000000" x="141" y="101" />
-<mousemove time="4747.000000" x="143" y="103" />
-<mousemove time="4782.000000" x="144" y="105" />
-<mousedown time="4989.000000" button="Left" x="144" y="105" />
-<mousemove time="5297.000000" x="144" y="100" />
-<mousemove time="5334.000000" x="144" y="92" />
-<mousemove time="5371.000000" x="144" y="86" />
-<mousemove time="5411.000000" x="144" y="78" />
-<mousemove time="5448.000000" x="143" y="75" />
-<mousemove time="5484.000000" x="143" y="73" />
-<mousemove time="5521.000000" x="143" y="72" />
-<mousemove time="5558.000000" x="143" y="70" />
-<mousemove time="5594.000000" x="143" y="69" />
-<mouseup time="5734.000000" button="Left" x="143" y="69" />
-<mousemove time="6009.000000" x="143" y="66" />
-<mousemove time="6045.000000" x="143" y="58" />
-<mousemove time="6081.000000" x="143" y="52" />
-<mousemove time="6117.000000" x="143" y="47" />
-<mousemove time="6152.000000" x="143" y="46" />
-<mousedown time="6392.000000" button="Left" x="143" y="46" />
-<mousemove time="6837.000000" x="143" y="47" />
-<mousemove time="6873.000000" x="143" y="58" />
-<mousemove time="6909.000000" x="143" y="69" />
-<mousemove time="6945.000000" x="145" y="77" />
-<mousemove time="6945.000000" x="145" y="79" />
-<mousemove time="6981.000000" x="145" y="82" />
-<mousemove time="7017.000000" x="145" y="86" />
-<mousemove time="7089.000000" x="145" y="87" />
-<mousemove time="7159.000000" x="146" y="87" />
-<mouseup time="7230.000000" button="Left" x="146" y="87" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-proximitysensor2D-play-ui.xml Deleted

@@ -1,75 +0,0 @@
-<TestValidationScript >
-<mousemove time="236.000000" x="146" y="132" />
-<mousemove time="932.000000" x="147" y="87" />
-<mousemove time="968.000000" x="153" y="89" />
-<mousemove time="1004.000000" x="158" y="91" />
-<mousemove time="1040.000000" x="163" y="93" />
-<mousemove time="1076.000000" x="167" y="94" />
-<mousemove time="1111.000000" x="172" y="95" />
-<mousemove time="1147.000000" x="176" y="95" />
-<mousemove time="1215.000000" x="177" y="95" />
-<mousemove time="1251.000000" x="178" y="96" />
-<mousemove time="1286.000000" x="180" y="96" />
-<mousemove time="1425.000000" x="182" y="96" />
-<mousemove time="1459.000000" x="183" y="96" />
-<mousemove time="1494.000000" x="185" y="96" />
-<mousemove time="1528.000000" x="186" y="96" />
-<mousemove time="1665.000000" x="186" y="97" />
-<mousemove time="1700.000000" x="185" y="97" />
-<mousemove time="1735.000000" x="179" y="99" />
-<mousemove time="1771.000000" x="172" y="100" />
-<mousemove time="1807.000000" x="167" y="101" />
-<mousemove time="1842.000000" x="165" y="101" />
-<mousemove time="1878.000000" x="163" y="101" />
-<mousemove time="1914.000000" x="161" y="103" />
-<mousemove time="1950.000000" x="158" y="104" />
-<mousemove time="1985.000000" x="156" y="104" />
-<mousemove time="2021.000000" x="153" y="104" />
-<mousemove time="2022.000000" x="152" y="104" />
-<mousemove time="2058.000000" x="149" y="104" />
-<mousemove time="2094.000000" x="146" y="104" />
-<mousemove time="2130.000000" x="143" y="104" />
-<mousemove time="2166.000000" x="140" y="104" />
-<mousemove time="2202.000000" x="137" y="104" />
-<mousemove time="2238.000000" x="133" y="104" />
-<mousemove time="2274.000000" x="130" y="102" />
-<mousemove time="2309.000000" x="127" y="101" />
-<mousemove time="2344.000000" x="126" y="101" />
-<mousemove time="2379.000000" x="123" y="100" />
-<mousemove time="2414.000000" x="119" y="99" />
-<mousemove time="2449.000000" x="115" y="98" />
-<mousemove time="2484.000000" x="112" y="97" />
-<mousemove time="2521.000000" x="108" y="96" />
-<mousemove time="2557.000000" x="105" y="96" />
-<mousemove time="2593.000000" x="102" y="96" />
-<mousemove time="2628.000000" x="99" y="96" />
-<mousemove time="2664.000000" x="97" y="96" />
-<mousemove time="2699.000000" x="96" y="96" />
-<mousemove time="2804.000000" x="95" y="96" />
-<mousemove time="2840.000000" x="94" y="96" />
-<mousemove time="2876.000000" x="92" y="96" />
-<mousemove time="2911.000000" x="89" y="96" />
-<mousemove time="2947.000000" x="86" y="96" />
-<mousemove time="2983.000000" x="82" y="96" />
-<mousemove time="2984.000000" x="81" y="96" />
-<mousemove time="3020.000000" x="78" y="96" />
-<mousemove time="3054.000000" x="73" y="96" />
-<mousemove time="3090.000000" x="68" y="96" />
-<mousemove time="3126.000000" x="64" y="96" />
-<mousemove time="3161.000000" x="60" y="96" />
-<mousemove time="3197.000000" x="57" y="96" />
-<mousemove time="3233.000000" x="55" y="97" />
-<mousemove time="3268.000000" x="52" y="97" />
-<mousemove time="3304.000000" x="48" y="97" />
-<mousemove time="3343.000000" x="42" y="98" />
-<mousemove time="3377.000000" x="35" y="99" />
-<mousemove time="3412.000000" x="30" y="99" />
-<mousemove time="3447.000000" x="25" y="100" />
-<mousemove time="3482.000000" x="22" y="100" />
-<mousemove time="3517.000000" x="20" y="100" />
-<mousemove time="3552.000000" x="17" y="100" />
-<mousemove time="3586.000000" x="15" y="100" />
-<mousemove time="3656.000000" x="13" y="100" />
-<mousemove time="3691.000000" x="12" y="100" />
-<mousemove time="3759.000000" x="11" y="100" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-stringsensor-play-ui.xml Deleted

@@ -1,62 +0,0 @@
-<TestValidationScript >
-<keydown time="1981.000000" key_identifier="U+0047" />
-<textInput time="1981.000000" unicode-char="103" />
-<keydown time="2050.000000" key_identifier="U+0048" />
-<textInput time="2050.000000" unicode-char="104" />
-<keydown time="2085.000000" key_identifier="U+0044" />
-<textInput time="2085.000000" unicode-char="100" />
-<keyup time="2085.000000" key_identifier="U+0047" />
-<keyup time="2155.000000" key_identifier="U+0048" />
-<keydown time="2189.000000" key_identifier="U+0053" />
-<textInput time="2189.000000" unicode-char="115" />
-<keyup time="2189.000000" key_identifier="U+0044" />
-<keyup time="2292.000000" key_identifier="U+0053" />
-<keydown time="2804.000000" key_identifier="U+0008" />
-<textInput time="2804.000000" unicode-char="8" />
-<keyup time="2907.000000" key_identifier="U+0008" />
-<keydown time="2975.000000" key_identifier="U+0008" />
-<textInput time="2975.000000" unicode-char="8" />
-<keyup time="3047.000000" key_identifier="U+0008" />
-<keydown time="3150.000000" key_identifier="U+0008" />
-<textInput time="3150.000000" unicode-char="8" />
-<keyup time="3219.000000" key_identifier="U+0008" />
-<keydown time="3322.000000" key_identifier="U+0008" />
-<textInput time="3322.000000" unicode-char="8" />
-<keyup time="3425.000000" key_identifier="U+0008" />
-<keydown time="3904.000000" key_identifier="U+004E" />
-<textInput time="3904.000000" unicode-char="110" />
-<keydown time="3973.000000" key_identifier="U+0044" />
-<textInput time="3973.000000" unicode-char="100" />
-<keyup time="4042.000000" key_identifier="U+004E" />
-<keydown time="4042.000000" key_identifier="U+002C" />
-<textInput time="4042.000000" unicode-char="44" />
-<keydown time="4112.000000" key_identifier="U+0053" />
-<textInput time="4112.000000" unicode-char="115" />
-<keyup time="4148.000000" key_identifier="U+002C" />
-<keyup time="4148.000000" key_identifier="U+0044" />
-<keydown time="4148.000000" key_identifier="U+004E" />
-<textInput time="4148.000000" unicode-char="110" />
-<keyup time="4217.000000" key_identifier="U+0053" />
-<keyup time="4251.000000" key_identifier="U+004E" />
-<keydown time="4626.000000" key_identifier="Enter" />
-<textInput time="4626.000000" unicode-char="13" />
-<keyup time="4695.000000" key_identifier="Enter" />
-<keydown time="6464.000000" key_identifier="U+0059" />
-<textInput time="6464.000000" unicode-char="121" />
-<keydown time="6533.000000" key_identifier="U+0045" />
-<textInput time="6534.000000" unicode-char="101" />
-<keyup time="6534.000000" key_identifier="U+0059" />
-<keyup time="6601.000000" key_identifier="U+0045" />
-<keydown time="6738.000000" key_identifier="U+0053" />
-<textInput time="6738.000000" unicode-char="115" />
-<keyup time="6842.000000" key_identifier="U+0053" />
-<keydown time="7183.000000" key_identifier="U+0021" />
-<textInput time="7184.000000" unicode-char="33" />
-<keyup time="7254.000000" key_identifier="U+0021" />
-<keydown time="7489.000000" key_identifier="Enter" />
-<textInput time="7489.000000" unicode-char="13" />
-<keyup time="7560.000000" key_identifier="Enter" />
-<keydown time="8528.000000" key_identifier="Enter" />
-<textInput time="8528.000000" unicode-char="13" />
-<keyup time="8596.000000" key_identifier="Enter" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-4states-play-ui.xml Deleted

@@ -1,66 +0,0 @@
-<TestValidationScript >
-<mousemove time="239.000000" x="110" y="163" />
-<mousemove time="968.000000" x="110" y="115" />
-<mousemove time="1004.000000" x="108" y="106" />
-<mousemove time="1038.000000" x="106" y="98" />
-<mousemove time="1074.000000" x="103" y="90" />
-<mousemove time="1110.000000" x="102" y="85" />
-<mousemove time="1146.000000" x="101" y="82" />
-<mousemove time="1182.000000" x="101" y="81" />
-<mousedown time="1457.000000" button="Left" x="101" y="81" />
-<mouseup time="1799.000000" button="Left" x="101" y="81" />
-<mousemove time="2109.000000" x="101" y="82" />
-<mousemove time="2143.000000" x="101" y="91" />
-<mousemove time="2178.000000" x="101" y="105" />
-<mousemove time="2215.000000" x="101" y="118" />
-<mousemove time="2251.000000" x="101" y="128" />
-<mousemove time="2286.000000" x="101" y="133" />
-<mousemove time="2321.000000" x="101" y="134" />
-<mousemove time="2457.000000" x="101" y="132" />
-<mousemove time="2493.000000" x="101" y="121" />
-<mousemove time="2527.000000" x="101" y="108" />
-<mousemove time="2561.000000" x="101" y="91" />
-<mousemove time="2598.000000" x="100" y="76" />
-<mousemove time="2634.000000" x="99" y="68" />
-<mousemove time="2669.000000" x="99" y="65" />
-<mousedown time="2944.000000" button="Left" x="99" y="65" />
-<mouseup time="3253.000000" button="Left" x="99" y="65" />
-<mousemove time="3527.000000" x="99" y="66" />
-<mousemove time="3563.000000" x="99" y="78" />
-<mousemove time="3599.000000" x="99" y="101" />
-<mousemove time="3635.000000" x="100" y="126" />
-<mousemove time="3671.000000" x="103" y="149" />
-<mousemove time="3706.000000" x="103" y="154" />
-<mousemove time="3741.000000" x="103" y="155" />
-<mousemove time="3877.000000" x="103" y="148" />
-<mousemove time="3911.000000" x="103" y="133" />
-<mousemove time="3946.000000" x="101" y="115" />
-<mousemove time="3981.000000" x="99" y="97" />
-<mousemove time="4016.000000" x="97" y="82" />
-<mousemove time="4053.000000" x="96" y="74" />
-<mousemove time="4089.000000" x="96" y="70" />
-<mousedown time="4395.000000" button="Left" x="96" y="70" />
-<mouseup time="4671.000000" button="Left" x="96" y="70" />
-<mousemove time="5012.000000" x="96" y="77" />
-<mousemove time="5048.000000" x="96" y="101" />
-<mousemove time="5084.000000" x="99" y="130" />
-<mousemove time="5119.000000" x="101" y="142" />
-<mousemove time="5154.000000" x="101" y="147" />
-<mousemove time="5188.000000" x="101" y="148" />
-<mousemove time="5326.000000" x="101" y="147" />
-<mousemove time="5361.000000" x="101" y="137" />
-<mousemove time="5396.000000" x="101" y="121" />
-<mousemove time="5431.000000" x="101" y="104" />
-<mousemove time="5467.000000" x="100" y="90" />
-<mousemove time="5503.000000" x="100" y="80" />
-<mousemove time="5538.000000" x="100" y="74" />
-<mousemove time="5573.000000" x="100" y="72" />
-<mousemove time="6795.000000" x="101" y="72" />
-<mousemove time="6832.000000" x="115" y="72" />
-<mousemove time="6833.000000" x="124" y="71" />
-<mousemove time="6868.000000" x="139" y="68" />
-<mousemove time="6904.000000" x="148" y="68" />
-<mousemove time="6939.000000" x="150" y="68" />
-<mousemove time="6975.000000" x="153" y="68" />
-<mousemove time="7010.000000" x="156" y="67" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-hitpoint-play-ui.xml Deleted

@@ -1,115 +0,0 @@
-<TestValidationScript >
-<mousemove time="172.000000" x="156" y="112" />
-<mousemove time="1102.000000" x="150" y="66" />
-<mousemove time="1139.000000" x="140" y="62" />
-<mousemove time="1175.000000" x="134" y="58" />
-<mousemove time="1211.000000" x="124" y="53" />
-<mousemove time="1248.000000" x="118" y="50" />
-<mousemove time="1285.000000" x="112" y="49" />
-<mousemove time="1323.000000" x="109" y="48" />
-<mousemove time="1358.000000" x="108" y="48" />
-<mousemove time="1394.000000" x="107" y="48" />
-<mousemove time="1430.000000" x="103" y="50" />
-<mousemove time="1466.000000" x="100" y="54" />
-<mousemove time="1502.000000" x="98" y="59" />
-<mousemove time="1538.000000" x="97" y="65" />
-<mousemove time="1575.000000" x="97" y="72" />
-<mousemove time="1611.000000" x="97" y="82" />
-<mousemove time="1648.000000" x="102" y="89" />
-<mousemove time="1685.000000" x="108" y="96" />
-<mousemove time="1720.000000" x="115" y="103" />
-<mousemove time="1757.000000" x="122" y="113" />
-<mousemove time="1797.000000" x="125" y="120" />
-<mousemove time="1834.000000" x="127" y="124" />
-<mousemove time="1870.000000" x="127" y="129" />
-<mousemove time="1906.000000" x="126" y="133" />
-<mousemove time="1942.000000" x="120" y="139" />
-<mousemove time="1978.000000" x="110" y="146" />
-<mousemove time="2014.000000" x="104" y="151" />
-<mousemove time="2050.000000" x="98" y="154" />
-<mousemove time="2051.000000" x="96" y="155" />
-<mousemove time="2088.000000" x="91" y="157" />
-<mousemove time="2124.000000" x="89" y="157" />
-<mousemove time="2159.000000" x="88" y="157" />
-<mousemove time="2570.000000" x="86" y="156" />
-<mousemove time="2606.000000" x="82" y="149" />
-<mousemove time="2642.000000" x="77" y="137" />
-<mousemove time="2643.000000" x="72" y="130" />
-<mousemove time="2679.000000" x="67" y="118" />
-<mousemove time="2716.000000" x="60" y="105" />
-<mousemove time="2753.000000" x="53" y="94" />
-<mousemove time="2789.000000" x="47" y="82" />
-<mousemove time="2826.000000" x="41" y="72" />
-<mousemove time="2862.000000" x="36" y="63" />
-<mousemove time="2899.000000" x="32" y="55" />
-<mousemove time="2936.000000" x="29" y="51" />
-<mousemove time="2937.000000" x="29" y="48" />
-<mousemove time="2973.000000" x="26" y="43" />
-<mousemove time="3010.000000" x="24" y="38" />
-<mousemove time="3046.000000" x="21" y="32" />
-<mousemove time="3083.000000" x="18" y="26" />
-<mousemove time="3120.000000" x="15" y="20" />
-<mousemove time="3157.000000" x="13" y="17" />
-<mousemove time="3192.000000" x="11" y="12" />
-<mousemove time="3229.000000" x="10" y="10" />
-<mousemove time="3230.000000" x="9" y="10" />
-<mousemove time="3269.000000" x="8" y="10" />
-<mousemove time="3338.000000" x="7" y="10" />
-<mousemove time="3374.000000" x="6" y="10" />
-<mousemove time="3479.000000" x="5" y="10" />
-<mousemove time="3516.000000" x="5" y="9" />
-<mousemove time="3586.000000" x="5" y="8" />
-<mousemove time="3621.000000" x="4" y="8" />
-<mousemove time="3658.000000" x="4" y="7" />
-<mousemove time="3899.000000" x="5" y="7" />
-<mousemove time="3935.000000" x="13" y="7" />
-<mousemove time="3971.000000" x="21" y="7" />
-<mousemove time="4008.000000" x="34" y="7" />
-<mousemove time="4044.000000" x="48" y="7" />
-<mousemove time="4081.000000" x="63" y="7" />
-<mousemove time="4118.000000" x="78" y="7" />
-<mousemove time="4119.000000" x="85" y="7" />
-<mousemove time="4155.000000" x="98" y="7" />
-<mousemove time="4190.000000" x="112" y="6" />
-<mousemove time="4227.000000" x="127" y="3" />
-<mousemove time="4264.000000" x="139" y="1" />
-<mousemove time="4301.000000" x="151" y="0" />
-<mousemove time="4509.000000" x="179" y="0" />
-<mousemove time="4545.000000" x="180" y="0" />
-<mousemove time="4545.000000" x="183" y="0" />
-<mousemove time="4581.000000" x="188" y="1" />
-<mousemove time="4617.000000" x="191" y="2" />
-<mousemove time="4652.000000" x="192" y="3" />
-<mousemove time="4790.000000" x="192" y="4" />
-<mousemove time="5407.000000" x="192" y="5" />
-<mousemove time="5444.000000" x="192" y="14" />
-<mousemove time="5480.000000" x="192" y="31" />
-<mousemove time="5516.000000" x="192" y="53" />
-<mousemove time="5553.000000" x="192" y="76" />
-<mousemove time="5554.000000" x="192" y="85" />
-<mousemove time="5591.000000" x="192" y="100" />
-<mousemove time="5627.000000" x="192" y="113" />
-<mousemove time="5664.000000" x="192" y="125" />
-<mousemove time="5701.000000" x="192" y="136" />
-<mousemove time="5737.000000" x="192" y="145" />
-<mousemove time="5773.000000" x="192" y="152" />
-<mousemove time="5810.000000" x="191" y="160" />
-<mousemove time="5846.000000" x="190" y="167" />
-<mousemove time="5848.000000" x="189" y="170" />
-<mousemove time="5884.000000" x="187" y="176" />
-<mousemove time="5920.000000" x="187" y="179" />
-<mousemove time="5956.000000" x="187" y="180" />
-<mousemove time="6131.000000" x="187" y="181" />
-<mousemove time="6168.000000" x="187" y="184" />
-<mousemove time="6168.000000" x="187" y="186" />
-<mousemove time="6204.000000" x="187" y="188" />
-<mousemove time="6790.000000" x="186" y="188" />
-<mousemove time="6790.000000" x="176" y="187" />
-<mousemove time="6826.000000" x="160" y="182" />
-<mousemove time="6862.000000" x="146" y="177" />
-<mousemove time="6899.000000" x="134" y="171" />
-<mousemove time="6936.000000" x="122" y="167" />
-<mousemove time="6972.000000" x="117" y="166" />
-<mousemove time="7008.000000" x="115" y="165" />
-<mousemove time="7148.000000" x="114" y="164" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-isactive-exposedfield-play-ui.xml Deleted

@@ -1,36 +0,0 @@
-<TestValidationScript >
-<mousemove time="960.000000" x="114" y="163" />
-<mousemove time="994.000000" x="111" y="149" />
-<mousemove time="1030.000000" x="106" y="133" />
-<mousemove time="1065.000000" x="101" y="113" />
-<mousemove time="1100.000000" x="99" y="100" />
-<mousemove time="1135.000000" x="99" y="91" />
-<mousemove time="1171.000000" x="99" y="82" />
-<mousemove time="1207.000000" x="99" y="75" />
-<mousemove time="1243.000000" x="99" y="73" />
-<mousedown time="1551.000000" button="Left" x="99" y="73" />
-<mouseup time="1929.000000" button="Left" x="99" y="73" />
-<mousemove time="2371.000000" x="99" y="74" />
-<mousemove time="2407.000000" x="99" y="84" />
-<mousemove time="2442.000000" x="100" y="98" />
-<mousemove time="2477.000000" x="100" y="110" />
-<mousemove time="2512.000000" x="100" y="113" />
-<mousemove time="2684.000000" x="100" y="108" />
-<mousemove time="2719.000000" x="100" y="92" />
-<mousemove time="2755.000000" x="99" y="83" />
-<mousemove time="2790.000000" x="99" y="76" />
-<mousemove time="2826.000000" x="99" y="72" />
-<mousemove time="2861.000000" x="99" y="70" />
-<mousedown time="3136.000000" button="Left" x="99" y="70" />
-<mouseup time="3442.000000" button="Left" x="99" y="70" />
-<mousedown time="3922.000000" button="Left" x="99" y="70" />
-<mouseup time="4193.000000" button="Left" x="99" y="70" />
-<mousemove time="4605.000000" x="99" y="71" />
-<mousemove time="4641.000000" x="99" y="84" />
-<mousemove time="4676.000000" x="100" y="108" />
-<mousemove time="4712.000000" x="103" y="142" />
-<mousemove time="4747.000000" x="110" y="180" />
-<mousemove time="4783.000000" x="111" y="191" />
-<mousemove time="4783.000000" x="114" y="198" />
-<mousemove time="4818.000000" x="115" y="199" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-isactive-play-ui.xml Deleted

@@ -1,26 +0,0 @@
-<TestValidationScript >
-<mousemove time="1021.000000" x="115" y="198" />
-<mousemove time="1021.000000" x="112" y="194" />
-<mousemove time="1056.000000" x="107" y="175" />
-<mousemove time="1090.000000" x="102" y="143" />
-<mousemove time="1125.000000" x="99" y="119" />
-<mousemove time="1160.000000" x="96" y="93" />
-<mousemove time="1195.000000" x="93" y="79" />
-<mousemove time="1231.000000" x="92" y="70" />
-<mousemove time="1266.000000" x="92" y="67" />
-<mousemove time="1302.000000" x="92" y="66" />
-<mousemove time="1337.000000" x="92" y="65" />
-<mousedown time="1578.000000" button="Left" x="92" y="65" />
-<mouseup time="1920.000000" button="Left" x="92" y="65" />
-<mousedown time="2638.000000" button="Left" x="92" y="65" />
-<mouseup time="2981.000000" button="Left" x="92" y="65" />
-<mousedown time="3596.000000" button="Left" x="92" y="65" />
-<mouseup time="3904.000000" button="Left" x="92" y="65" />
-<mousemove time="4251.000000" x="92" y="66" />
-<mousemove time="4287.000000" x="92" y="74" />
-<mousemove time="4323.000000" x="91" y="89" />
-<mousemove time="4359.000000" x="91" y="116" />
-<mousemove time="4394.000000" x="92" y="172" />
-<mousemove time="4429.000000" x="96" y="195" />
-<mousemove time="4465.000000" x="98" y="199" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-isover-play-ui.xml Deleted

@@ -1,40 +0,0 @@
-<TestValidationScript >
-<mousemove time="1049.000000" x="99" y="196" />
-<mousemove time="1084.000000" x="100" y="187" />
-<mousemove time="1118.000000" x="100" y="176" />
-<mousemove time="1153.000000" x="101" y="165" />
-<mousemove time="1188.000000" x="104" y="155" />
-<mousemove time="1223.000000" x="104" y="146" />
-<mousemove time="1258.000000" x="104" y="142" />
-<mousemove time="1293.000000" x="104" y="140" />
-<mousemove time="1327.000000" x="104" y="139" />
-<mousemove time="1531.000000" x="104" y="138" />
-<mousemove time="1566.000000" x="104" y="135" />
-<mousemove time="1601.000000" x="104" y="128" />
-<mousemove time="1636.000000" x="104" y="119" />
-<mousemove time="1673.000000" x="103" y="115" />
-<mousemove time="1707.000000" x="103" y="112" />
-<mousemove time="1743.000000" x="103" y="109" />
-<mousemove time="1779.000000" x="103" y="108" />
-<mousemove time="1813.000000" x="102" y="108" />
-<mousemove time="2666.000000" x="102" y="104" />
-<mousemove time="2701.000000" x="101" y="88" />
-<mousemove time="2737.000000" x="100" y="74" />
-<mousemove time="2773.000000" x="99" y="61" />
-<mousemove time="2774.000000" x="99" y="56" />
-<mousemove time="2810.000000" x="99" y="47" />
-<mousemove time="2844.000000" x="99" y="42" />
-<mousemove time="2878.000000" x="99" y="40" />
-<mousemove time="3528.000000" x="99" y="49" />
-<mousemove time="3563.000000" x="99" y="70" />
-<mousemove time="3598.000000" x="100" y="88" />
-<mousemove time="3633.000000" x="100" y="99" />
-<mousemove time="3668.000000" x="100" y="102" />
-<mousemove time="4184.000000" x="100" y="107" />
-<mousemove time="4219.000000" x="101" y="117" />
-<mousemove time="4255.000000" x="101" y="134" />
-<mousemove time="4255.000000" x="101" y="143" />
-<mousemove time="4291.000000" x="101" y="158" />
-<mousemove time="4325.000000" x="101" y="164" />
-<mousemove time="4360.000000" x="101" y="166" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-interactivity-touchsensor-move_over-play-ui.xml Deleted

@@ -1,54 +0,0 @@
-<TestValidationScript >
-<mousemove time="1390.000000" x="101" y="166" />
-<mousemove time="1390.000000" x="101" y="161" />
-<mousemove time="1424.000000" x="101" y="151" />
-<mousemove time="1459.000000" x="99" y="141" />
-<mousemove time="1496.000000" x="98" y="132" />
-<mousemove time="1533.000000" x="98" y="126" />
-<mousemove time="1569.000000" x="98" y="120" />
-<mousemove time="1606.000000" x="98" y="113" />
-<mousemove time="1642.000000" x="98" y="105" />
-<mousemove time="1677.000000" x="98" y="97" />
-<mousemove time="1713.000000" x="98" y="91" />
-<mousemove time="1749.000000" x="98" y="87" />
-<mousemove time="1783.000000" x="98" y="85" />
-<mousemove time="3013.000000" x="97" y="85" />
-<mousemove time="3049.000000" x="92" y="85" />
-<mousemove time="3085.000000" x="87" y="85" />
-<mousemove time="3121.000000" x="83" y="86" />
-<mousemove time="3157.000000" x="80" y="86" />
-<mousemove time="3192.000000" x="76" y="86" />
-<mousemove time="3227.000000" x="74" y="87" />
-<mousemove time="4181.000000" x="77" y="87" />
-<mousemove time="4219.000000" x="87" y="88" />
-<mousemove time="4256.000000" x="96" y="90" />
-<mousemove time="4292.000000" x="105" y="91" />
-<mousemove time="4328.000000" x="109" y="93" />
-<mousemove time="4364.000000" x="112" y="93" />
-<mousemove time="4399.000000" x="113" y="93" />
-<mousemove time="5321.000000" x="117" y="94" />
-<mousemove time="5357.000000" x="127" y="96" />
-<mousemove time="5393.000000" x="140" y="99" />
-<mousemove time="5429.000000" x="153" y="102" />
-<mousemove time="5466.000000" x="162" y="104" />
-<mousemove time="5500.000000" x="169" y="106" />
-<mousemove time="5536.000000" x="171" y="107" />
-<mousemove time="6519.000000" x="164" y="107" />
-<mousemove time="6554.000000" x="143" y="108" />
-<mousemove time="6555.000000" x="131" y="108" />
-<mousemove time="6591.000000" x="113" y="108" />
-<mousemove time="6627.000000" x="101" y="108" />
-<mousemove time="6663.000000" x="96" y="108" />
-<mousemove time="6698.000000" x="93" y="108" />
-<mousemove time="6734.000000" x="91" y="108" />
-<mousemove time="7417.000000" x="91" y="109" />
-<mousemove time="7452.000000" x="91" y="117" />
-<mousemove time="7487.000000" x="91" y="128" />
-<mousemove time="7523.000000" x="91" y="142" />
-<mousemove time="7559.000000" x="92" y="156" />
-<mousemove time="7596.000000" x="93" y="170" />
-<mousemove time="7631.000000" x="94" y="180" />
-<mousemove time="7667.000000" x="95" y="191" />
-<mousemove time="7701.000000" x="95" y="196" />
-<mousemove time="7736.000000" x="95" y="198" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-painting-xlineproperties-cap-play-ui.xml Deleted

@@ -1,75 +0,0 @@
-<TestValidationScript >
-<mousemove time="1076.000000" x="95" y="197" />
-<mousemove time="1076.000000" x="96" y="194" />
-<mousemove time="1110.000000" x="102" y="185" />
-<mousemove time="1145.000000" x="112" y="176" />
-<mousemove time="1179.000000" x="117" y="170" />
-<mousemove time="1215.000000" x="125" y="163" />
-<mousemove time="1250.000000" x="131" y="157" />
-<mousemove time="1285.000000" x="138" y="154" />
-<mousemove time="1320.000000" x="142" y="150" />
-<mousemove time="1354.000000" x="148" y="146" />
-<mousemove time="1390.000000" x="154" y="142" />
-<mousemove time="1425.000000" x="160" y="141" />
-<mousemove time="1460.000000" x="165" y="140" />
-<mousemove time="1495.000000" x="168" y="138" />
-<mousemove time="1529.000000" x="172" y="136" />
-<mousemove time="1565.000000" x="175" y="135" />
-<mousemove time="1600.000000" x="178" y="134" />
-<mousemove time="1669.000000" x="179" y="134" />
-<mousemove time="1773.000000" x="180" y="134" />
-<mousemove time="1810.000000" x="182" y="134" />
-<mousemove time="1845.000000" x="184" y="134" />
-<mousemove time="2595.000000" x="183" y="134" />
-<mousemove time="2630.000000" x="178" y="134" />
-<mousemove time="2666.000000" x="173" y="134" />
-<mousemove time="2702.000000" x="169" y="134" />
-<mousemove time="2737.000000" x="166" y="135" />
-<mousemove time="2772.000000" x="161" y="135" />
-<mousemove time="2807.000000" x="154" y="136" />
-<mousemove time="2842.000000" x="152" y="137" />
-<mousemove time="2877.000000" x="152" y="138" />
-<mousemove time="3560.000000" x="153" y="138" />
-<mousemove time="3596.000000" x="156" y="138" />
-<mousemove time="3631.000000" x="159" y="137" />
-<mousemove time="3666.000000" x="164" y="136" />
-<mousemove time="3700.000000" x="166" y="135" />
-<mousemove time="3735.000000" x="167" y="135" />
-<mousemove time="3771.000000" x="168" y="135" />
-<mousemove time="3806.000000" x="170" y="134" />
-<mousemove time="3841.000000" x="172" y="134" />
-<mousemove time="3876.000000" x="174" y="134" />
-<mousemove time="3911.000000" x="177" y="134" />
-<mousemove time="3946.000000" x="180" y="134" />
-<mousemove time="3982.000000" x="182" y="133" />
-<mousemove time="4017.000000" x="184" y="133" />
-<mousemove time="4052.000000" x="185" y="133" />
-<mousemove time="4630.000000" x="185" y="132" />
-<mousemove time="4665.000000" x="181" y="131" />
-<mousemove time="4701.000000" x="176" y="130" />
-<mousemove time="4737.000000" x="174" y="130" />
-<mousemove time="4772.000000" x="170" y="130" />
-<mousemove time="4806.000000" x="165" y="130" />
-<mousemove time="4841.000000" x="159" y="130" />
-<mousemove time="4876.000000" x="157" y="130" />
-<mousemove time="6001.000000" x="160" y="130" />
-<mousemove time="6036.000000" x="162" y="130" />
-<mousemove time="6072.000000" x="166" y="130" />
-<mousemove time="6106.000000" x="170" y="130" />
-<mousemove time="6141.000000" x="173" y="130" />
-<mousemove time="6176.000000" x="175" y="130" />
-<mousemove time="6313.000000" x="176" y="130" />
-<mousemove time="6452.000000" x="177" y="130" />
-<mousemove time="6488.000000" x="180" y="129" />
-<mousemove time="6526.000000" x="183" y="129" />
-<mousemove time="6561.000000" x="184" y="129" />
-<mousemove time="7102.000000" x="183" y="128" />
-<mousemove time="7138.000000" x="178" y="128" />
-<mousemove time="7175.000000" x="170" y="127" />
-<mousemove time="7209.000000" x="163" y="127" />
-<mousemove time="7244.000000" x="157" y="127" />
-<mousemove time="7278.000000" x="153" y="129" />
-<mousemove time="7312.000000" x="151" y="130" />
-<mousemove time="7382.000000" x="151" y="131" />
-<mousemove time="7417.000000" x="151" y="132" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-painting-xlineproperties-join-play-ui.xml Deleted

@@ -1,52 +0,0 @@
-<TestValidationScript >
-<mousemove time="176.000000" x="151" y="177" />
-<mousemove time="1080.000000" x="154" y="132" />
-<mousemove time="1115.000000" x="160" y="130" />
-<mousemove time="1149.000000" x="167" y="129" />
-<mousemove time="1184.000000" x="172" y="129" />
-<mousemove time="1220.000000" x="175" y="128" />
-<mousemove time="1255.000000" x="177" y="128" />
-<mousemove time="1290.000000" x="178" y="128" />
-<mousemove time="1359.000000" x="179" y="128" />
-<mousemove time="1394.000000" x="181" y="128" />
-<mousemove time="1429.000000" x="182" y="128" />
-<mousemove time="1532.000000" x="183" y="128" />
-<mousemove time="1566.000000" x="184" y="128" />
-<mousemove time="1601.000000" x="185" y="128" />
-<mousemove time="1706.000000" x="186" y="127" />
-<mousemove time="1741.000000" x="187" y="127" />
-<mousemove time="2255.000000" x="186" y="127" />
-<mousemove time="2291.000000" x="184" y="127" />
-<mousemove time="2328.000000" x="180" y="127" />
-<mousemove time="2363.000000" x="175" y="127" />
-<mousemove time="2398.000000" x="170" y="128" />
-<mousemove time="2432.000000" x="167" y="129" />
-<mousemove time="3047.000000" x="168" y="129" />
-<mousemove time="3081.000000" x="169" y="129" />
-<mousemove time="3116.000000" x="171" y="129" />
-<mousemove time="3151.000000" x="174" y="129" />
-<mousemove time="3187.000000" x="176" y="129" />
-<mousemove time="3222.000000" x="178" y="129" />
-<mousemove time="3257.000000" x="180" y="128" />
-<mousemove time="3293.000000" x="182" y="127" />
-<mousemove time="3327.000000" x="184" y="127" />
-<mousemove time="3362.000000" x="185" y="126" />
-<mousemove time="3978.000000" x="182" y="126" />
-<mousemove time="4014.000000" x="173" y="126" />
-<mousemove time="4014.000000" x="169" y="127" />
-<mousemove time="4049.000000" x="164" y="127" />
-<mousemove time="4083.000000" x="163" y="128" />
-<mousemove time="4867.000000" x="167" y="128" />
-<mousemove time="4902.000000" x="173" y="128" />
-<mousemove time="4937.000000" x="177" y="128" />
-<mousemove time="4973.000000" x="180" y="128" />
-<mousemove time="5008.000000" x="182" y="128" />
-<mousemove time="5045.000000" x="184" y="128" />
-<mousemove time="5080.000000" x="186" y="128" />
-<mousemove time="5525.000000" x="183" y="128" />
-<mousemove time="5564.000000" x="176" y="128" />
-<mousemove time="5600.000000" x="167" y="128" />
-<mousemove time="5635.000000" x="157" y="128" />
-<mousemove time="5669.000000" x="149" y="128" />
-<mousemove time="5705.000000" x="146" y="128" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-painting-xlineproperties-lineargradient-play-ui.xml Deleted

@@ -1,23 +0,0 @@
-<TestValidationScript >
-<mousemove time="250.000000" x="146" y="173" />
-<mousemove time="1246.000000" x="144" y="128" />
-<mousemove time="1283.000000" x="143" y="124" />
-<mousemove time="1320.000000" x="140" y="121" />
-<mousemove time="1357.000000" x="139" y="118" />
-<mousemove time="1393.000000" x="138" y="115" />
-<mousemove time="1429.000000" x="137" y="113" />
-<mousedown time="3040.000000" button="Left" x="137" y="113" />
-<mouseup time="5896.000000" button="Left" x="137" y="113" />
-<mousemove time="8613.000000" x="137" y="114" />
-<mousemove time="8649.000000" x="137" y="115" />
-<mousemove time="8685.000000" x="139" y="116" />
-<mousemove time="8722.000000" x="142" y="118" />
-<mousemove time="8758.000000" x="146" y="119" />
-<mousemove time="8794.000000" x="150" y="121" />
-<mousemove time="8831.000000" x="156" y="127" />
-<mousemove time="8866.000000" x="160" y="129" />
-<mousemove time="8902.000000" x="162" y="130" />
-<mousemove time="8938.000000" x="163" y="130" />
-<mousemove time="9008.000000" x="164" y="131" />
-<mousemove time="9043.000000" x="165" y="132" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-painting-xlineproperties-radialgradient-play-ui.xml Deleted

@@ -1,26 +0,0 @@
-<TestValidationScript >
-<mousemove time="183.000000" x="165" y="177" />
-<mousemove time="770.000000" x="165" y="133" />
-<mousemove time="807.000000" x="165" y="138" />
-<mousemove time="843.000000" x="166" y="141" />
-<mousemove time="917.000000" x="165" y="141" />
-<mousemove time="953.000000" x="160" y="136" />
-<mousemove time="989.000000" x="152" y="128" />
-<mousemove time="1025.000000" x="147" y="121" />
-<mousemove time="1061.000000" x="141" y="113" />
-<mousemove time="1097.000000" x="138" y="109" />
-<mousemove time="1133.000000" x="137" y="107" />
-<mousemove time="1170.000000" x="137" y="106" />
-<mousedown time="2959.000000" button="Left" x="137" y="106" />
-<mouseup time="6033.000000" button="Left" x="137" y="106" />
-<mousemove time="8474.000000" x="140" y="107" />
-<mousemove time="8510.000000" x="146" y="108" />
-<mousemove time="8547.000000" x="152" y="111" />
-<mousemove time="8584.000000" x="155" y="113" />
-<mousemove time="8621.000000" x="159" y="116" />
-<mousemove time="8658.000000" x="161" y="117" />
-<mousemove time="8694.000000" x="162" y="118" />
-<mousemove time="8729.000000" x="162" y="119" />
-<mousemove time="8799.000000" x="164" y="120" />
-<mousemove time="8835.000000" x="166" y="121" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-clipper2D-play-ui.xml Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-layer2D-play-ui.xml Deleted

@@ -1,34 +0,0 @@
-<TestValidationScript >
-<mousemove time="180.000000" x="33" y="121" />
-<mousemove time="1160.000000" x="35" y="76" />
-<mousemove time="1195.000000" x="44" y="75" />
-<mousemove time="1230.000000" x="60" y="74" />
-<mousemove time="1264.000000" x="78" y="71" />
-<mousemove time="1299.000000" x="93" y="69" />
-<mousemove time="1334.000000" x="105" y="65" />
-<mousemove time="1369.000000" x="117" y="62" />
-<mousemove time="1404.000000" x="128" y="56" />
-<mousemove time="1438.000000" x="136" y="48" />
-<mousemove time="1473.000000" x="145" y="39" />
-<mousemove time="1508.000000" x="154" y="30" />
-<mousemove time="1543.000000" x="161" y="21" />
-<mousemove time="1578.000000" x="166" y="15" />
-<mousemove time="1613.000000" x="169" y="11" />
-<mousemove time="1614.000000" x="172" y="10" />
-<mousemove time="1650.000000" x="173" y="8" />
-<mousemove time="1755.000000" x="174" y="8" />
-<mousemove time="1790.000000" x="177" y="10" />
-<mousemove time="1826.000000" x="179" y="13" />
-<mousemove time="1862.000000" x="180" y="14" />
-<mousemove time="1898.000000" x="182" y="18" />
-<mousemove time="1934.000000" x="182" y="20" />
-<mousemove time="1970.000000" x="182" y="21" />
-<mousedown time="2174.000000" button="Left" x="182" y="21" />
-<mouseup time="2354.000000" button="Left" x="182" y="21" />
-<mousemove time="8440.000000" x="182" y="29" />
-<mousemove time="8475.000000" x="183" y="43" />
-<mousemove time="8510.000000" x="185" y="53" />
-<mousemove time="8545.000000" x="185" y="63" />
-<mousemove time="8579.000000" x="186" y="69" />
-<mousemove time="8613.000000" x="186" y="70" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-layout-scroll-modes-horiz-play-ui.xml Deleted

@@ -1,81 +0,0 @@
-<TestValidationScript >
-<mousemove time="198.000000" x="186" y="115" />
-<mousemove time="1496.000000" x="182" y="70" />
-<mousemove time="1535.000000" x="167" y="71" />
-<mousemove time="1573.000000" x="125" y="76" />
-<mousemove time="1613.000000" x="93" y="76" />
-<mousemove time="1654.000000" x="74" y="76" />
-<mousemove time="1694.000000" x="59" y="76" />
-<mousemove time="1729.000000" x="58" y="76" />
-<mousemove time="1799.000000" x="57" y="76" />
-<mousemove time="1834.000000" x="52" y="73" />
-<mousemove time="1872.000000" x="48" y="70" />
-<mousemove time="1909.000000" x="44" y="67" />
-<mousemove time="1949.000000" x="40" y="65" />
-<mousemove time="1990.000000" x="35" y="64" />
-<mousemove time="2031.000000" x="34" y="64" />
-<mousemove time="2147.000000" x="33" y="65" />
-<mousemove time="2183.000000" x="33" y="66" />
-<mousemove time="2367.000000" x="32" y="66" />
-<mousedown time="2482.000000" button="Left" x="32" y="66" />
-<mouseup time="2627.000000" button="Left" x="32" y="66" />
-<mousemove time="3377.000000" x="32" y="67" />
-<mousemove time="3414.000000" x="32" y="69" />
-<mousemove time="3451.000000" x="32" y="73" />
-<mousemove time="3490.000000" x="31" y="75" />
-<mousemove time="3529.000000" x="31" y="76" />
-<mousedown time="3892.000000" button="Left" x="31" y="76" />
-<mouseup time="3969.000000" button="Left" x="31" y="76" />
-<mousemove time="4875.000000" x="31" y="78" />
-<mousemove time="4916.000000" x="30" y="86" />
-<mousemove time="4953.000000" x="29" y="92" />
-<mousemove time="4991.000000" x="28" y="93" />
-<mousemove time="5027.000000" x="28" y="95" />
-<mousemove time="5065.000000" x="28" y="96" />
-<mousemove time="5142.000000" x="28" y="97" />
-<mousemove time="5178.000000" x="27" y="98" />
-<mousemove time="5217.000000" x="27" y="101" />
-<mousemove time="5257.000000" x="27" y="103" />
-<mousemove time="5362.000000" x="27" y="105" />
-<mousemove time="5398.000000" x="27" y="106" />
-<mousemove time="5439.000000" x="27" y="107" />
-<mousedown time="5806.000000" button="Left" x="27" y="107" />
-<mouseup time="5955.000000" button="Left" x="27" y="107" />
-<mousemove time="6999.000000" x="27" y="108" />
-<mousemove time="7035.000000" x="27" y="111" />
-<mousemove time="7074.000000" x="26" y="116" />
-<mousemove time="7110.000000" x="26" y="119" />
-<mousemove time="7150.000000" x="26" y="121" />
-<mousedown time="7523.000000" button="Left" x="26" y="121" />
-<mouseup time="7637.000000" button="Left" x="26" y="121" />
-<mousemove time="8114.000000" x="30" y="119" />
-<mousemove time="8153.000000" x="42" y="113" />
-<mousemove time="8192.000000" x="62" y="106" />
-<mousemove time="8230.000000" x="76" y="99" />
-<mousemove time="8265.000000" x="94" y="91" />
-<mousemove time="8300.000000" x="113" y="82" />
-<mousemove time="8335.000000" x="127" y="74" />
-<mousemove time="8374.000000" x="138" y="69" />
-<mousemove time="8409.000000" x="146" y="67" />
-<mousemove time="8449.000000" x="156" y="67" />
-<mousemove time="8487.000000" x="169" y="63" />
-<mousemove time="8524.000000" x="176" y="63" />
-<mousemove time="8561.000000" x="179" y="63" />
-<mousemove time="8601.000000" x="180" y="63" />
-<mousemove time="8680.000000" x="181" y="67" />
-<mousemove time="8718.000000" x="181" y="72" />
-<mousemove time="8719.000000" x="181" y="75" />
-<mousemove time="8758.000000" x="181" y="81" />
-<mousemove time="8795.000000" x="180" y="85" />
-<mousemove time="8834.000000" x="178" y="87" />
-<mousemove time="8874.000000" x="178" y="88" />
-<mousemove time="9092.000000" x="178" y="89" />
-<mousemove time="9130.000000" x="177" y="90" />
-<mousemove time="9315.000000" x="177" y="91" />
-<mousemove time="9461.000000" x="177" y="92" />
-<mousemove time="9501.000000" x="177" y="93" />
-<mousemove time="9577.000000" x="177" y="94" />
-<mousemove time="9681.000000" x="177" y="95" />
-<mousedown time="9717.000000" button="Left" x="177" y="95" />
-<mouseup time="9826.000000" button="Left" x="177" y="95" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-layout-scroll-modes-vert-play-ui.xml Deleted

@@ -1,99 +0,0 @@
-<TestValidationScript >
-<mousemove time="177.000000" x="177" y="140" />
-<mousemove time="925.000000" x="177" y="94" />
-<mousemove time="961.000000" x="177" y="93" />
-<mousemove time="997.000000" x="172" y="88" />
-<mousemove time="1033.000000" x="166" y="80" />
-<mousemove time="1068.000000" x="161" y="74" />
-<mousemove time="1103.000000" x="158" y="70" />
-<mousemove time="1138.000000" x="156" y="64" />
-<mousemove time="1173.000000" x="154" y="59" />
-<mousemove time="1208.000000" x="154" y="53" />
-<mousemove time="1244.000000" x="154" y="48" />
-<mousemove time="1281.000000" x="154" y="47" />
-<mousemove time="1529.000000" x="154" y="46" />
-<mousedown time="1602.000000" button="Left" x="154" y="46" />
-<mouseup time="1674.000000" button="Left" x="154" y="46" />
-<mousemove time="2129.000000" x="154" y="45" />
-<mousemove time="2272.000000" x="154" y="44" />
-<mousemove time="2308.000000" x="154" y="40" />
-<mousemove time="2344.000000" x="154" y="39" />
-<mousemove time="2381.000000" x="154" y="38" />
-<mousemove time="2417.000000" x="154" y="37" />
-<mousemove time="2454.000000" x="154" y="35" />
-<mousemove time="2490.000000" x="154" y="34" />
-<mousemove time="2527.000000" x="153" y="34" />
-<mousemove time="2564.000000" x="142" y="35" />
-<mousemove time="2600.000000" x="119" y="41" />
-<mousemove time="2637.000000" x="114" y="41" />
-<mousemove time="2777.000000" x="118" y="41" />
-<mousemove time="2812.000000" x="126" y="40" />
-<mousemove time="2848.000000" x="135" y="38" />
-<mousemove time="2884.000000" x="138" y="37" />
-<mousemove time="2920.000000" x="139" y="36" />
-<mousemove time="2957.000000" x="142" y="35" />
-<mousemove time="2994.000000" x="146" y="32" />
-<mousemove time="3030.000000" x="149" y="32" />
-<mousedown time="3205.000000" button="Left" x="149" y="32" />
-<mouseup time="3311.000000" button="Left" x="149" y="32" />
-<mousemove time="4008.000000" x="149" y="33" />
-<mousemove time="4044.000000" x="149" y="35" />
-<mousemove time="4080.000000" x="149" y="37" />
-<mousemove time="4116.000000" x="150" y="38" />
-<mousemove time="4152.000000" x="150" y="39" />
-<mousemove time="4188.000000" x="150" y="40" />
-<mousemove time="4223.000000" x="150" y="41" />
-<mousemove time="4330.000000" x="150" y="42" />
-<mousemove time="4366.000000" x="150" y="43" />
-<mousedown time="4473.000000" button="Left" x="150" y="43" />
-<mouseup time="4581.000000" button="Left" x="150" y="43" />
-<mousemove time="4931.000000" x="150" y="41" />
-<mousemove time="4968.000000" x="150" y="31" />
-<mousemove time="5003.000000" x="150" y="22" />
-<mousemove time="5041.000000" x="152" y="15" />
-<mousemove time="5077.000000" x="154" y="13" />
-<mousemove time="5324.000000" x="154" y="14" />
-<mousemove time="5360.000000" x="154" y="17" />
-<mousemove time="5397.000000" x="154" y="20" />
-<mousemove time="5433.000000" x="154" y="21" />
-<mousemove time="5505.000000" x="153" y="21" />
-<mousedown time="5646.000000" button="Left" x="153" y="21" />
-<mouseup time="5752.000000" button="Left" x="153" y="21" />
-<mousemove time="6379.000000" x="153" y="20" />
-<mousemove time="6415.000000" x="152" y="20" />
-<mousemove time="6659.000000" x="149" y="20" />
-<mousemove time="6695.000000" x="137" y="24" />
-<mousemove time="6732.000000" x="120" y="29" />
-<mousemove time="6768.000000" x="103" y="37" />
-<mousemove time="6804.000000" x="87" y="48" />
-<mousemove time="6839.000000" x="71" y="58" />
-<mousemove time="6874.000000" x="57" y="67" />
-<mousemove time="6911.000000" x="55" y="68" />
-<mousemove time="7157.000000" x="55" y="66" />
-<mousemove time="7194.000000" x="55" y="64" />
-<mousemove time="7229.000000" x="55" y="63" />
-<mousemove time="7301.000000" x="55" y="62" />
-<mousemove time="7372.000000" x="55" y="61" />
-<mousedown time="7545.000000" button="Left" x="55" y="61" />
-<mouseup time="7652.000000" button="Left" x="55" y="61" />
-<mousemove time="8137.000000" x="55" y="62" />
-<mousemove time="8173.000000" x="55" y="63" />
-<mousemove time="8209.000000" x="55" y="65" />
-<mousemove time="8246.000000" x="55" y="66" />
-<mousemove time="8282.000000" x="55" y="69" />
-<mousemove time="8317.000000" x="53" y="72" />
-<mousemove time="8354.000000" x="52" y="74" />
-<mousemove time="8634.000000" x="52" y="72" />
-<mousemove time="8671.000000" x="52" y="71" />
-<mousedown time="8811.000000" button="Left" x="52" y="71" />
-<mouseup time="8919.000000" button="Left" x="52" y="71" />
-<mousemove time="9409.000000" x="52" y="70" />
-<mousemove time="9410.000000" x="52" y="69" />
-<mousemove time="9446.000000" x="52" y="64" />
-<mousemove time="9483.000000" x="52" y="57" />
-<mousemove time="9519.000000" x="52" y="54" />
-<mousemove time="9555.000000" x="51" y="53" />
-<mousemove time="9625.000000" x="51" y="52" />
-<mousemove time="9731.000000" x="51" y="51" />
-<mousemove time="9768.000000" x="51" y="50" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-layout-scroll-on-off-play-ui.xml Deleted

@@ -1,62 +0,0 @@
-<TestValidationScript >
-<mousemove time="251.000000" x="51" y="94" />
-<mousemove time="1390.000000" x="55" y="49" />
-<mousemove time="1425.000000" x="61" y="51" />
-<mousemove time="1460.000000" x="68" y="54" />
-<mousemove time="1496.000000" x="73" y="58" />
-<mousemove time="1530.000000" x="79" y="64" />
-<mousemove time="1565.000000" x="83" y="69" />
-<mousemove time="1600.000000" x="85" y="72" />
-<mousemove time="1636.000000" x="87" y="73" />
-<mousemove time="1671.000000" x="87" y="74" />
-<mousemove time="1708.000000" x="88" y="75" />
-<mousemove time="1745.000000" x="92" y="78" />
-<mousemove time="1780.000000" x="94" y="80" />
-<mousemove time="1816.000000" x="95" y="80" />
-<mousemove time="2692.000000" x="95" y="81" />
-<mousemove time="2727.000000" x="95" y="82" />
-<mousemove time="2764.000000" x="95" y="84" />
-<mousemove time="2801.000000" x="95" y="89" />
-<mousemove time="2837.000000" x="95" y="92" />
-<mousemove time="2873.000000" x="95" y="93" />
-<mousemove time="2908.000000" x="95" y="94" />
-<mousemove time="3083.000000" x="95" y="95" />
-<mousemove time="3671.000000" x="96" y="95" />
-<mousemove time="3706.000000" x="103" y="95" />
-<mousemove time="3742.000000" x="110" y="95" />
-<mousemove time="3777.000000" x="112" y="94" />
-<mousemove time="3812.000000" x="113" y="94" />
-<mousemove time="3847.000000" x="115" y="93" />
-<mousemove time="3883.000000" x="118" y="92" />
-<mousemove time="3918.000000" x="119" y="92" />
-<mousemove time="3989.000000" x="120" y="90" />
-<mousemove time="4023.000000" x="124" y="87" />
-<mousemove time="4059.000000" x="126" y="85" />
-<mousemove time="4095.000000" x="127" y="84" />
-<mousemove time="4132.000000" x="127" y="83" />
-<mousemove time="6304.000000" x="127" y="81" />
-<mousemove time="6340.000000" x="127" y="79" />
-<mousemove time="6376.000000" x="127" y="75" />
-<mousemove time="6412.000000" x="127" y="74" />
-<mousemove time="6483.000000" x="127" y="73" />
-<mousemove time="6484.000000" x="127" y="72" />
-<mousemove time="6521.000000" x="127" y="71" />
-<mousemove time="6555.000000" x="127" y="70" />
-<mousemove time="6590.000000" x="127" y="67" />
-<mousemove time="6590.000000" x="127" y="65" />
-<mousemove time="6625.000000" x="127" y="61" />
-<mousemove time="6661.000000" x="127" y="59" />
-<mousemove time="6697.000000" x="127" y="56" />
-<mousemove time="6733.000000" x="127" y="52" />
-<mousemove time="6767.000000" x="127" y="50" />
-<mousemove time="7046.000000" x="127" y="53" />
-<mousemove time="7081.000000" x="127" y="59" />
-<mousemove time="7116.000000" x="127" y="64" />
-<mousemove time="7150.000000" x="127" y="68" />
-<mousemove time="7186.000000" x="127" y="72" />
-<mousemove time="7186.000000" x="127" y="73" />
-<mousemove time="7221.000000" x="127" y="76" />
-<mousemove time="7257.000000" x="127" y="78" />
-<mousemove time="7293.000000" x="127" y="79" />
-<mousemove time="7328.000000" x="127" y="80" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-orderedgroup-play-ui.xml Deleted

@@ -1,34 +0,0 @@
-<TestValidationScript >
-<mousemove time="180.000000" x="127" y="125" />
-<mousemove time="988.000000" x="124" y="83" />
-<mousemove time="990.000000" x="121" y="85" />
-<mousemove time="1030.000000" x="116" y="89" />
-<mousemove time="1067.000000" x="112" y="92" />
-<mousemove time="1106.000000" x="110" y="95" />
-<mousemove time="1141.000000" x="108" y="97" />
-<mousedown time="1361.000000" button="Left" x="108" y="97" />
-<mouseup time="1717.000000" button="Left" x="108" y="97" />
-<mousemove time="2014.000000" x="110" y="104" />
-<mousemove time="2054.000000" x="132" y="135" />
-<mousemove time="2089.000000" x="147" y="148" />
-<mousemove time="2124.000000" x="156" y="154" />
-<mousemove time="2158.000000" x="162" y="155" />
-<mousemove time="2193.000000" x="164" y="155" />
-<mousemove time="2405.000000" x="162" y="155" />
-<mousemove time="2440.000000" x="148" y="143" />
-<mousemove time="2474.000000" x="132" y="125" />
-<mousemove time="2510.000000" x="122" y="111" />
-<mousemove time="2550.000000" x="117" y="106" />
-<mousemove time="2588.000000" x="116" y="105" />
-<mousemove time="2623.000000" x="115" y="105" />
-<mousedown time="2728.000000" button="Left" x="115" y="105" />
-<mouseup time="3055.000000" button="Left" x="115" y="105" />
-<mousemove time="3384.000000" x="125" y="105" />
-<mousemove time="3421.000000" x="181" y="127" />
-<mousemove time="3457.000000" x="197" y="133" />
-<mousemove time="3457.000000" x="199" y="141" />
-<mousemove time="6536.000000" x="190" y="145" />
-<mousemove time="6572.000000" x="167" y="145" />
-<mousemove time="6607.000000" x="155" y="145" />
-<mousemove time="6640.000000" x="150" y="146" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-pathlayout-graphics-play-ui.xml Deleted

@@ -1,46 +0,0 @@
-<TestValidationScript >
-<mousemove time="183.000000" x="150" y="191" />
-<mousemove time="2996.000000" x="149" y="141" />
-<mousemove time="3033.000000" x="144" y="132" />
-<mousemove time="3070.000000" x="132" y="119" />
-<mousemove time="3106.000000" x="118" y="104" />
-<mousemove time="3143.000000" x="102" y="93" />
-<mousemove time="3180.000000" x="86" y="83" />
-<mousemove time="3217.000000" x="68" y="75" />
-<mousemove time="3253.000000" x="60" y="74" />
-<mousemove time="3290.000000" x="53" y="71" />
-<mousemove time="3327.000000" x="49" y="71" />
-<mousemove time="3363.000000" x="48" y="70" />
-<mousemove time="3575.000000" x="50" y="70" />
-<mousemove time="3610.000000" x="53" y="70" />
-<mousemove time="3718.000000" x="55" y="70" />
-<mousemove time="3755.000000" x="57" y="71" />
-<mousemove time="3792.000000" x="60" y="71" />
-<mousemove time="3828.000000" x="61" y="71" />
-<mousemove time="3863.000000" x="61" y="72" />
-<mousemove time="3899.000000" x="63" y="72" />
-<mousemove time="3935.000000" x="65" y="73" />
-<mousemove time="3972.000000" x="66" y="73" />
-<mousedown time="4287.000000" button="Left" x="66" y="73" />
-<mouseup time="7046.000000" button="Left" x="66" y="73" />
-<mousedown time="7533.000000" button="Left" x="66" y="73" />
-<mouseup time="7916.000000" button="Left" x="66" y="73" />
-<mousemove time="8300.000000" x="66" y="74" />
-<mousemove time="8337.000000" x="66" y="79" />
-<mousemove time="8338.000000" x="67" y="87" />
-<mousemove time="8374.000000" x="71" y="112" />
-<mousemove time="8411.000000" x="74" y="128" />
-<mousemove time="8447.000000" x="76" y="136" />
-<mousemove time="8483.000000" x="76" y="139" />
-<mousemove time="8518.000000" x="76" y="140" />
-<mousemove time="8725.000000" x="76" y="136" />
-<mousemove time="8760.000000" x="76" y="125" />
-<mousemove time="8796.000000" x="74" y="112" />
-<mousemove time="8832.000000" x="74" y="101" />
-<mousemove time="8868.000000" x="72" y="93" />
-<mousemove time="8904.000000" x="72" y="91" />
-<mousemove time="8941.000000" x="72" y="89" />
-<mousemove time="8976.000000" x="72" y="88" />
-<mousedown time="9221.000000" button="Left" x="72" y="88" />
-<mouseup time="9600.000000" button="Left" x="72" y="88" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-pathlayout-play-ui.xml Deleted

@@ -1,40 +0,0 @@
-<TestValidationScript >
-<mousemove time="189.000000" x="81" y="179" />
-<mousemove time="844.000000" x="81" y="132" />
-<mousemove time="881.000000" x="79" y="125" />
-<mousemove time="917.000000" x="78" y="117" />
-<mousemove time="953.000000" x="77" y="114" />
-<mousemove time="990.000000" x="76" y="109" />
-<mousemove time="1026.000000" x="73" y="98" />
-<mousemove time="1065.000000" x="72" y="93" />
-<mousemove time="1102.000000" x="72" y="92" />
-<mousemove time="1140.000000" x="72" y="90" />
-<mousemove time="1178.000000" x="72" y="86" />
-<mousemove time="1215.000000" x="71" y="83" />
-<mousemove time="1252.000000" x="71" y="82" />
-<mousedown time="2813.000000" button="Left" x="71" y="82" />
-<mouseup time="6709.000000" button="Left" x="71" y="82" />
-<mousemove time="7348.000000" x="71" y="84" />
-<mousemove time="7386.000000" x="74" y="95" />
-<mousemove time="7423.000000" x="78" y="109" />
-<mousemove time="7424.000000" x="80" y="116" />
-<mousemove time="7461.000000" x="82" y="127" />
-<mousemove time="7497.000000" x="82" y="132" />
-<mousemove time="7532.000000" x="83" y="134" />
-<mousemove time="8126.000000" x="83" y="124" />
-<mousemove time="8163.000000" x="80" y="112" />
-<mousemove time="8198.000000" x="78" y="101" />
-<mousemove time="8234.000000" x="76" y="93" />
-<mousemove time="8272.000000" x="75" y="86" />
-<mousemove time="8309.000000" x="75" y="83" />
-<mousemove time="8346.000000" x="74" y="81" />
-<mousedown time="8666.000000" button="Left" x="74" y="81" />
-<mouseup time="9089.000000" button="Left" x="74" y="81" />
-<mousemove time="9554.000000" x="74" y="82" />
-<mousemove time="9591.000000" x="75" y="93" />
-<mousemove time="9628.000000" x="78" y="105" />
-<mousemove time="9665.000000" x="80" y="119" />
-<mousemove time="9702.000000" x="81" y="126" />
-<mousemove time="9738.000000" x="82" y="130" />
-<mousemove time="9774.000000" x="83" y="132" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-positioning-transformmatrix2D-play-ui.xml Deleted

@@ -1,63 +0,0 @@
-<TestValidationScript >
-<mousemove time="237.000000" x="83" y="177" />
-<mousemove time="1066.000000" x="84" y="131" />
-<mousemove time="1102.000000" x="92" y="124" />
-<mousemove time="1138.000000" x="103" y="114" />
-<mousemove time="1173.000000" x="114" y="104" />
-<mousemove time="1208.000000" x="124" y="98" />
-<mousemove time="1243.000000" x="130" y="94" />
-<mousemove time="1278.000000" x="137" y="89" />
-<mousemove time="1313.000000" x="140" y="87" />
-<mousemove time="1348.000000" x="141" y="87" />
-<mousemove time="1417.000000" x="141" y="85" />
-<mousemove time="1451.000000" x="144" y="81" />
-<mousemove time="1486.000000" x="147" y="74" />
-<mousemove time="1521.000000" x="151" y="70" />
-<mousemove time="1555.000000" x="152" y="69" />
-<mousedown time="1694.000000" button="Left" x="152" y="69" />
-<mouseup time="1831.000000" button="Left" x="152" y="69" />
-<mousemove time="2038.000000" x="151" y="69" />
-<mousemove time="2072.000000" x="143" y="72" />
-<mousemove time="2106.000000" x="137" y="78" />
-<mousemove time="2140.000000" x="131" y="84" />
-<mousemove time="2175.000000" x="124" y="89" />
-<mousemove time="2210.000000" x="119" y="93" />
-<mousemove time="2245.000000" x="115" y="95" />
-<mousemove time="2281.000000" x="114" y="96" />
-<mousedown time="2553.000000" button="Left" x="114" y="96" />
-<mouseup time="2657.000000" button="Left" x="114" y="96" />
-<mousemove time="3089.000000" x="112" y="96" />
-<mousemove time="3126.000000" x="105" y="93" />
-<mousemove time="3164.000000" x="95" y="91" />
-<mousemove time="3201.000000" x="94" y="90" />
-<mousemove time="3238.000000" x="89" y="89" />
-<mousemove time="3239.000000" x="84" y="87" />
-<mousemove time="3276.000000" x="73" y="85" />
-<mousemove time="3314.000000" x="64" y="83" />
-<mousemove time="3352.000000" x="62" y="82" />
-<mousemove time="3393.000000" x="61" y="82" />
-<mousemove time="3431.000000" x="58" y="81" />
-<mousemove time="3432.000000" x="57" y="81" />
-<mousemove time="3469.000000" x="56" y="81" />
-<mousemove time="3506.000000" x="56" y="80" />
-<mousedown time="3615.000000" button="Left" x="56" y="80" />
-<mouseup time="3759.000000" button="Left" x="56" y="80" />
-<mousemove time="4192.000000" x="68" y="86" />
-<mousemove time="4230.000000" x="86" y="95" />
-<mousemove time="4267.000000" x="109" y="106" />
-<mousemove time="4305.000000" x="122" y="113" />
-<mousemove time="4346.000000" x="130" y="117" />
-<mousemove time="4347.000000" x="132" y="118" />
-<mousemove time="4384.000000" x="135" y="119" />
-<mousemove time="4422.000000" x="137" y="119" />
-<mousemove time="4458.000000" x="138" y="119" />
-<mousedown time="4639.000000" button="Left" x="138" y="119" />
-<mouseup time="4748.000000" button="Left" x="138" y="119" />
-<mousemove time="5249.000000" x="138" y="121" />
-<mousemove time="5286.000000" x="142" y="128" />
-<mousemove time="5323.000000" x="152" y="148" />
-<mousemove time="5359.000000" x="159" y="162" />
-<mousemove time="5396.000000" x="163" y="168" />
-<mousemove time="5433.000000" x="166" y="169" />
-<mousemove time="5469.000000" x="167" y="170" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-compositetexture2D-background-play-ui.xml Deleted

@@ -1,46 +0,0 @@
-<TestValidationScript >
-<mousemove time="988.000000" x="160" y="165" />
-<mousemove time="1023.000000" x="147" y="151" />
-<mousemove time="1058.000000" x="135" y="136" />
-<mousemove time="1093.000000" x="125" y="125" />
-<mousemove time="1129.000000" x="118" y="117" />
-<mousemove time="1166.000000" x="112" y="112" />
-<mousemove time="1203.000000" x="104" y="106" />
-<mousemove time="1241.000000" x="102" y="103" />
-<mousemove time="1279.000000" x="100" y="100" />
-<mousemove time="1315.000000" x="99" y="99" />
-<mousemove time="1350.000000" x="99" y="98" />
-<mousemove time="1724.000000" x="101" y="98" />
-<mousemove time="1758.000000" x="103" y="98" />
-<mousemove time="1794.000000" x="105" y="98" />
-<mousemove time="1936.000000" x="106" y="97" />
-<mousemove time="2243.000000" x="106" y="96" />
-<mousemove time="2279.000000" x="106" y="94" />
-<mousemove time="2316.000000" x="106" y="92" />
-<mousemove time="2352.000000" x="105" y="89" />
-<mousemove time="2388.000000" x="105" y="88" />
-<mousemove time="2424.000000" x="104" y="87" />
-<mousemove time="2628.000000" x="103" y="87" />
-<mousemove time="2733.000000" x="103" y="89" />
-<mousemove time="2768.000000" x="103" y="92" />
-<mousemove time="2804.000000" x="103" y="93" />
-<mousemove time="2942.000000" x="104" y="93" />
-<mousemove time="2978.000000" x="104" y="94" />
-<mousemove time="3013.000000" x="105" y="94" />
-<mousedown time="3659.000000" button="Left" x="105" y="94" />
-<mouseup time="4444.000000" button="Left" x="105" y="94" />
-<mousedown time="5096.000000" button="Left" x="105" y="94" />
-<mouseup time="5472.000000" button="Left" x="105" y="94" />
-<mousemove time="5815.000000" x="105" y="95" />
-<mousemove time="5850.000000" x="105" y="96" />
-<mousemove time="5885.000000" x="105" y="100" />
-<mousemove time="5922.000000" x="103" y="106" />
-<mousemove time="5958.000000" x="102" y="116" />
-<mousemove time="5996.000000" x="102" y="124" />
-<mousemove time="6032.000000" x="102" y="134" />
-<mousemove time="6068.000000" x="103" y="141" />
-<mousemove time="6102.000000" x="104" y="148" />
-<mousemove time="6137.000000" x="105" y="154" />
-<mousemove time="6172.000000" x="105" y="155" />
-<mousemove time="6206.000000" x="106" y="155" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-compositetexture2D-transparent-play-ui.xml Deleted

@@ -1,53 +0,0 @@
-<TestValidationScript >
-<mousemove time="973.000000" x="105" y="147" />
-<mousemove time="1009.000000" x="100" y="135" />
-<mousemove time="1044.000000" x="96" y="124" />
-<mousemove time="1078.000000" x="94" y="115" />
-<mousemove time="1113.000000" x="93" y="106" />
-<mousemove time="1149.000000" x="93" y="95" />
-<mousemove time="1183.000000" x="93" y="87" />
-<mousemove time="1218.000000" x="94" y="82" />
-<mousemove time="1253.000000" x="96" y="79" />
-<mousemove time="1288.000000" x="97" y="77" />
-<mousemove time="1323.000000" x="98" y="77" />
-<mousemove time="1628.000000" x="98" y="78" />
-<mousemove time="1699.000000" x="96" y="79" />
-<mousedown time="2077.000000" button="Left" x="96" y="79" />
-<mouseup time="2659.000000" button="Left" x="96" y="79" />
-<mousemove time="2971.000000" x="96" y="80" />
-<mousemove time="3006.000000" x="96" y="90" />
-<mousemove time="3041.000000" x="96" y="104" />
-<mousemove time="3077.000000" x="96" y="123" />
-<mousemove time="3112.000000" x="96" y="139" />
-<mousemove time="3147.000000" x="98" y="149" />
-<mousemove time="3182.000000" x="99" y="156" />
-<mousemove time="3216.000000" x="99" y="157" />
-<mousemove time="3251.000000" x="99" y="153" />
-<mousemove time="3286.000000" x="96" y="142" />
-<mousemove time="3322.000000" x="90" y="129" />
-<mousemove time="3357.000000" x="85" y="115" />
-<mousemove time="3392.000000" x="80" y="103" />
-<mousemove time="3427.000000" x="78" y="93" />
-<mousemove time="3463.000000" x="76" y="85" />
-<mousemove time="3499.000000" x="75" y="80" />
-<mousemove time="3534.000000" x="74" y="78" />
-<mousemove time="3639.000000" x="74" y="77" />
-<mousemove time="3743.000000" x="74" y="76" />
-<mousemove time="3779.000000" x="74" y="73" />
-<mousemove time="3815.000000" x="73" y="69" />
-<mousemove time="3852.000000" x="73" y="67" />
-<mousemove time="3853.000000" x="73" y="66" />
-<mousemove time="3990.000000" x="72" y="66" />
-<mousedown time="4266.000000" button="Left" x="72" y="66" />
-<mouseup time="4712.000000" button="Left" x="72" y="66" />
-<mousedown time="5364.000000" button="Left" x="72" y="66" />
-<mouseup time="5774.000000" button="Left" x="72" y="66" />
-<mousemove time="6250.000000" x="72" y="68" />
-<mousemove time="6286.000000" x="72" y="76" />
-<mousemove time="6322.000000" x="73" y="92" />
-<mousemove time="6358.000000" x="78" y="109" />
-<mousemove time="6394.000000" x="83" y="125" />
-<mousemove time="6428.000000" x="87" y="136" />
-<mousemove time="6464.000000" x="89" y="140" />
-<mousemove time="6498.000000" x="89" y="142" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-gradients-text-play-ui.xml Deleted

@@ -1,89 +0,0 @@
-<TestValidationScript >
-<mousemove time="193.000000" x="89" y="187" />
-<mousemove time="1538.000000" x="89" y="141" />
-<mousemove time="1581.000000" x="91" y="136" />
-<mousemove time="1624.000000" x="94" y="127" />
-<mousemove time="1668.000000" x="96" y="124" />
-<mousemove time="1711.000000" x="99" y="113" />
-<mousemove time="1754.000000" x="101" y="107" />
-<mousemove time="1798.000000" x="104" y="101" />
-<mousemove time="1841.000000" x="105" y="96" />
-<mousemove time="1884.000000" x="105" y="92" />
-<mousemove time="1927.000000" x="106" y="91" />
-<mousemove time="2013.000000" x="106" y="90" />
-<mousemove time="2056.000000" x="106" y="89" />
-<mousemove time="2186.000000" x="106" y="87" />
-<mousemove time="2229.000000" x="106" y="86" />
-<mousedown time="2778.000000" button="Left" x="106" y="86" />
-<mousemove time="3199.000000" x="106" y="84" />
-<mousemove time="3243.000000" x="109" y="79" />
-<mousemove time="3285.000000" x="110" y="78" />
-<mousemove time="3328.000000" x="111" y="78" />
-<mousemove time="3371.000000" x="112" y="77" />
-<mousemove time="3414.000000" x="115" y="74" />
-<mousemove time="3458.000000" x="116" y="72" />
-<mousemove time="3501.000000" x="118" y="71" />
-<mousemove time="3545.000000" x="120" y="70" />
-<mousemove time="3589.000000" x="123" y="69" />
-<mousemove time="3632.000000" x="123" y="68" />
-<mousemove time="3674.000000" x="124" y="68" />
-<mousemove time="3718.000000" x="125" y="67" />
-<mousemove time="3760.000000" x="125" y="66" />
-<mousemove time="3804.000000" x="126" y="64" />
-<mousemove time="3848.000000" x="130" y="60" />
-<mousemove time="3892.000000" x="132" y="58" />
-<mousemove time="3935.000000" x="133" y="57" />
-<mousemove time="4022.000000" x="134" y="56" />
-<mousemove time="4066.000000" x="136" y="55" />
-<mousemove time="4109.000000" x="137" y="54" />
-<mouseup time="4664.000000" button="Left" x="137" y="54" />
-<mousemove time="5138.000000" x="138" y="56" />
-<mousemove time="5182.000000" x="140" y="57" />
-<mousemove time="5227.000000" x="142" y="59" />
-<mousemove time="5270.000000" x="145" y="61" />
-<mousemove time="5314.000000" x="149" y="63" />
-<mousemove time="5358.000000" x="151" y="64" />
-<mousemove time="5401.000000" x="152" y="65" />
-<mousemove time="5446.000000" x="153" y="65" />
-<mousemove time="5489.000000" x="155" y="66" />
-<mousemove time="5534.000000" x="157" y="68" />
-<mousemove time="5577.000000" x="158" y="69" />
-<mousemove time="5663.000000" x="158" y="70" />
-<mousemove time="5708.000000" x="159" y="71" />
-<mousemove time="5795.000000" x="159" y="72" />
-<mousemove time="5838.000000" x="160" y="73" />
-<mousedown time="6188.000000" button="Left" x="160" y="73" />
-<mousemove time="6447.000000" x="156" y="73" />
-<mousemove time="6491.000000" x="148" y="73" />
-<mousemove time="6535.000000" x="139" y="74" />
-<mousemove time="6579.000000" x="131" y="75" />
-<mousemove time="6624.000000" x="125" y="76" />
-<mousemove time="6668.000000" x="124" y="76" />
-<mousemove time="7062.000000" x="128" y="76" />
-<mousemove time="7106.000000" x="139" y="76" />
-<mousemove time="7150.000000" x="145" y="76" />
-<mousemove time="7194.000000" x="153" y="76" />
-<mousemove time="7238.000000" x="159" y="76" />
-<mousemove time="7282.000000" x="160" y="76" />
-<mousemove time="7368.000000" x="161" y="76" />
-<mousemove time="7411.000000" x="162" y="76" />
-<mouseup time="7670.000000" button="Left" x="162" y="76" />
-<mousemove time="7979.000000" x="158" y="76" />
-<mousemove time="8023.000000" x="142" y="80" />
-<mousemove time="8068.000000" x="133" y="84" />
-<mousemove time="8068.000000" x="129" y="85" />
-<mousemove time="8111.000000" x="126" y="87" />
-<mousemove time="8154.000000" x="125" y="87" />
-<mousemove time="8460.000000" x="125" y="86" />
-<mousemove time="8549.000000" x="125" y="85" />
-<mousemove time="8594.000000" x="125" y="84" />
-<mousemove time="8638.000000" x="125" y="83" />
-<mousemove time="8989.000000" x="125" y="82" />
-<mousemove time="9034.000000" x="126" y="81" />
-<mousemove time="9121.000000" x="127" y="80" />
-<mousemove time="9426.000000" x="127" y="79" />
-<mousemove time="9470.000000" x="128" y="78" />
-<mousemove time="9782.000000" x="128" y="77" />
-<mousemove time="9827.000000" x="128" y="74" />
-<mousemove time="9872.000000" x="128" y="73" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-gradients-transparent-play-ui.xml Deleted

@@ -1,112 +0,0 @@
-<TestValidationScript >
-<mousemove time="216.000000" x="103" y="107" />
-<mousemove time="800.000000" x="103" y="63" />
-<mousemove time="835.000000" x="105" y="64" />
-<mousemove time="871.000000" x="114" y="65" />
-<mousemove time="911.000000" x="122" y="67" />
-<mousemove time="948.000000" x="129" y="68" />
-<mousemove time="985.000000" x="134" y="70" />
-<mousemove time="1022.000000" x="138" y="72" />
-<mousemove time="1022.000000" x="140" y="73" />
-<mousemove time="1059.000000" x="143" y="75" />
-<mousemove time="1097.000000" x="147" y="76" />
-<mousemove time="1134.000000" x="149" y="76" />
-<mousemove time="1171.000000" x="149" y="77" />
-<mousedown time="1381.000000" button="Left" x="149" y="77" />
-<mousemove time="1701.000000" x="147" y="77" />
-<mousemove time="1737.000000" x="136" y="77" />
-<mousemove time="1773.000000" x="122" y="74" />
-<mousemove time="1810.000000" x="112" y="71" />
-<mousemove time="1850.000000" x="104" y="70" />
-<mousemove time="1887.000000" x="99" y="69" />
-<mousemove time="1924.000000" x="94" y="69" />
-<mousemove time="1924.000000" x="92" y="69" />
-<mousemove time="1961.000000" x="89" y="69" />
-<mousemove time="1998.000000" x="88" y="69" />
-<mousemove time="2070.000000" x="87" y="69" />
-<mousemove time="2561.000000" x="86" y="69" />
-<mousemove time="2598.000000" x="83" y="70" />
-<mousemove time="2635.000000" x="80" y="72" />
-<mousemove time="2671.000000" x="79" y="73" />
-<mousemove time="2709.000000" x="77" y="74" />
-<mousemove time="2745.000000" x="75" y="76" />
-<mousemove time="2781.000000" x="73" y="78" />
-<mousemove time="2818.000000" x="72" y="80" />
-<mousemove time="2854.000000" x="70" y="81" />
-<mousemove time="2890.000000" x="69" y="83" />
-<mousemove time="2926.000000" x="67" y="84" />
-<mousemove time="2963.000000" x="65" y="87" />
-<mousemove time="3001.000000" x="62" y="89" />
-<mousemove time="3038.000000" x="60" y="92" />
-<mousemove time="3074.000000" x="59" y="93" />
-<mousemove time="3285.000000" x="58" y="94" />
-<mousemove time="3322.000000" x="57" y="95" />
-<mousemove time="3357.000000" x="57" y="97" />
-<mousemove time="3394.000000" x="56" y="98" />
-<mousemove time="3433.000000" x="55" y="99" />
-<mousemove time="3470.000000" x="54" y="101" />
-<mousemove time="3507.000000" x="54" y="103" />
-<mousemove time="3544.000000" x="53" y="105" />
-<mousemove time="3579.000000" x="53" y="106" />
-<mousemove time="3653.000000" x="53" y="108" />
-<mousemove time="3690.000000" x="53" y="109" />
-<mousemove time="3726.000000" x="53" y="110" />
-<mousemove time="3763.000000" x="53" y="112" />
-<mousemove time="3800.000000" x="53" y="113" />
-<mousemove time="3837.000000" x="54" y="115" />
-<mousemove time="3874.000000" x="56" y="117" />
-<mousemove time="3912.000000" x="57" y="118" />
-<mousemove time="3949.000000" x="59" y="120" />
-<mousemove time="3987.000000" x="61" y="122" />
-<mousemove time="4024.000000" x="63" y="123" />
-<mousemove time="4061.000000" x="65" y="123" />
-<mousemove time="4061.000000" x="65" y="124" />
-<mousemove time="4098.000000" x="66" y="124" />
-<mousemove time="4135.000000" x="68" y="124" />
-<mousemove time="4136.000000" x="69" y="125" />
-<mousemove time="4173.000000" x="70" y="125" />
-<mousemove time="4174.000000" x="71" y="125" />
-<mousemove time="4283.000000" x="73" y="125" />
-<mousemove time="4320.000000" x="74" y="125" />
-<mousemove time="4391.000000" x="75" y="125" />
-<mousemove time="4429.000000" x="76" y="125" />
-<mousemove time="4466.000000" x="77" y="125" />
-<mousemove time="4503.000000" x="78" y="125" />
-<mousemove time="4999.000000" x="80" y="125" />
-<mousemove time="5037.000000" x="84" y="123" />
-<mousemove time="5074.000000" x="86" y="122" />
-<mousemove time="5110.000000" x="86" y="121" />
-<mousemove time="5147.000000" x="86" y="120" />
-<mousemove time="5183.000000" x="87" y="118" />
-<mousemove time="5221.000000" x="88" y="114" />
-<mousemove time="5221.000000" x="90" y="112" />
-<mousemove time="5258.000000" x="91" y="110" />
-<mousemove time="5294.000000" x="91" y="107" />
-<mousemove time="5331.000000" x="91" y="101" />
-<mousemove time="5368.000000" x="91" y="98" />
-<mousemove time="5405.000000" x="91" y="95" />
-<mousemove time="5441.000000" x="91" y="92" />
-<mousemove time="5478.000000" x="91" y="88" />
-<mousemove time="5514.000000" x="91" y="83" />
-<mousemove time="5551.000000" x="94" y="76" />
-<mousemove time="5588.000000" x="96" y="72" />
-<mousemove time="5625.000000" x="98" y="70" />
-<mousemove time="5662.000000" x="99" y="69" />
-<mousemove time="5698.000000" x="101" y="68" />
-<mousemove time="5734.000000" x="105" y="66" />
-<mousemove time="5772.000000" x="110" y="64" />
-<mousemove time="5808.000000" x="115" y="63" />
-<mousemove time="5845.000000" x="118" y="63" />
-<mousemove time="5881.000000" x="121" y="62" />
-<mousemove time="5917.000000" x="126" y="62" />
-<mousemove time="5954.000000" x="128" y="62" />
-<mousemove time="5990.000000" x="131" y="62" />
-<mousemove time="6027.000000" x="135" y="61" />
-<mousemove time="6064.000000" x="137" y="61" />
-<mousemove time="6136.000000" x="138" y="61" />
-<mousemove time="6173.000000" x="139" y="60" />
-<mousemove time="6210.000000" x="142" y="59" />
-<mousemove time="6247.000000" x="145" y="58" />
-<mousemove time="6284.000000" x="146" y="58" />
-<mouseup time="6424.000000" button="Left" x="146" y="58" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-lineargradient-simple-play-ui.xml Deleted

@@ -1,123 +0,0 @@
-<TestValidationScript >
-<mousemove time="169.000000" x="146" y="103" />
-<mousemove time="905.000000" x="145" y="58" />
-<mousemove time="940.000000" x="131" y="63" />
-<mousemove time="975.000000" x="105" y="75" />
-<mousemove time="1010.000000" x="84" y="82" />
-<mousemove time="1045.000000" x="66" y="91" />
-<mousemove time="1079.000000" x="57" y="95" />
-<mousemove time="1115.000000" x="51" y="99" />
-<mousemove time="1150.000000" x="50" y="100" />
-<mousemove time="1185.000000" x="49" y="100" />
-<mousemove time="1221.000000" x="47" y="101" />
-<mousemove time="1257.000000" x="43" y="103" />
-<mousemove time="1293.000000" x="40" y="104" />
-<mousemove time="1466.000000" x="40" y="103" />
-<mousemove time="1502.000000" x="40" y="102" />
-<mousemove time="1538.000000" x="40" y="100" />
-<mousemove time="1573.000000" x="40" y="99" />
-<mousedown time="1850.000000" button="Left" x="40" y="99" />
-<mousemove time="2092.000000" x="41" y="99" />
-<mousemove time="2127.000000" x="46" y="99" />
-<mousemove time="2162.000000" x="53" y="99" />
-<mousemove time="2199.000000" x="56" y="99" />
-<mousemove time="2235.000000" x="57" y="99" />
-<mousemove time="2274.000000" x="60" y="99" />
-<mousemove time="2310.000000" x="64" y="99" />
-<mousemove time="2347.000000" x="67" y="99" />
-<mousemove time="2384.000000" x="70" y="99" />
-<mousemove time="2420.000000" x="74" y="99" />
-<mousemove time="2457.000000" x="79" y="99" />
-<mousemove time="2493.000000" x="84" y="99" />
-<mousemove time="2529.000000" x="90" y="99" />
-<mousemove time="2566.000000" x="97" y="99" />
-<mousemove time="2603.000000" x="102" y="99" />
-<mousemove time="2603.000000" x="105" y="99" />
-<mousemove time="2640.000000" x="110" y="99" />
-<mousemove time="2677.000000" x="116" y="99" />
-<mousemove time="2713.000000" x="123" y="99" />
-<mousemove time="2753.000000" x="129" y="99" />
-<mousemove time="2789.000000" x="133" y="99" />
-<mousemove time="2790.000000" x="135" y="99" />
-<mousemove time="2826.000000" x="139" y="99" />
-<mousemove time="2862.000000" x="141" y="99" />
-<mousemove time="2899.000000" x="144" y="99" />
-<mousemove time="2936.000000" x="148" y="99" />
-<mousemove time="2972.000000" x="153" y="99" />
-<mousemove time="3008.000000" x="157" y="99" />
-<mousemove time="3045.000000" x="162" y="98" />
-<mousemove time="3081.000000" x="164" y="97" />
-<mousemove time="3118.000000" x="166" y="97" />
-<mousemove time="3155.000000" x="167" y="97" />
-<mousemove time="3156.000000" x="167" y="96" />
-<mousemove time="3192.000000" x="168" y="96" />
-<mousemove time="3228.000000" x="169" y="96" />
-<mousemove time="3400.000000" x="170" y="96" />
-<mousemove time="3437.000000" x="171" y="96" />
-<mousemove time="3711.000000" x="168" y="96" />
-<mousemove time="3748.000000" x="162" y="97" />
-<mousemove time="3785.000000" x="155" y="98" />
-<mousemove time="3821.000000" x="148" y="98" />
-<mousemove time="3857.000000" x="142" y="99" />
-<mousemove time="3858.000000" x="138" y="99" />
-<mousemove time="3894.000000" x="129" y="101" />
-<mousemove time="3930.000000" x="120" y="103" />
-<mousemove time="3967.000000" x="112" y="105" />
-<mousemove time="4003.000000" x="106" y="105" />
-<mousemove time="4039.000000" x="101" y="105" />
-<mousemove time="4075.000000" x="95" y="105" />
-<mousemove time="4111.000000" x="89" y="105" />
-<mousemove time="4147.000000" x="84" y="105" />
-<mousemove time="4183.000000" x="79" y="105" />
-<mousemove time="4183.000000" x="77" y="105" />
-<mousemove time="4219.000000" x="72" y="105" />
-<mousemove time="4254.000000" x="67" y="105" />
-<mousemove time="4290.000000" x="62" y="105" />
-<mousemove time="4326.000000" x="57" y="105" />
-<mousemove time="4430.000000" x="57" y="104" />
-<mousemove time="4638.000000" x="57" y="103" />
-<mousemove time="4709.000000" x="58" y="103" />
-<mousemove time="4745.000000" x="61" y="102" />
-<mousemove time="4746.000000" x="63" y="102" />
-<mousemove time="4786.000000" x="69" y="102" />
-<mousemove time="4823.000000" x="74" y="102" />
-<mousemove time="4859.000000" x="80" y="102" />
-<mousemove time="4895.000000" x="85" y="102" />
-<mousemove time="4931.000000" x="89" y="102" />
-<mousemove time="4968.000000" x="92" y="102" />
-<mousemove time="5004.000000" x="96" y="102" />
-<mousemove time="5005.000000" x="99" y="102" />
-<mousemove time="5043.000000" x="104" y="102" />
-<mousemove time="5079.000000" x="109" y="101" />
-<mousemove time="5116.000000" x="115" y="100" />
-<mousemove time="5151.000000" x="121" y="99" />
-<mousemove time="5188.000000" x="124" y="98" />
-<mousemove time="5224.000000" x="129" y="97" />
-<mousemove time="5261.000000" x="132" y="96" />
-<mousemove time="5297.000000" x="135" y="95" />
-<mousemove time="5333.000000" x="137" y="95" />
-<mousemove time="5506.000000" x="136" y="95" />
-<mousemove time="5542.000000" x="129" y="97" />
-<mousemove time="5578.000000" x="124" y="98" />
-<mousemove time="5615.000000" x="122" y="99" />
-<mousemove time="5651.000000" x="120" y="99" />
-<mousemove time="5687.000000" x="115" y="99" />
-<mousemove time="5724.000000" x="106" y="100" />
-<mousemove time="5760.000000" x="100" y="100" />
-<mousemove time="5797.000000" x="96" y="100" />
-<mousemove time="5833.000000" x="91" y="100" />
-<mousemove time="5870.000000" x="87" y="99" />
-<mousemove time="5907.000000" x="82" y="98" />
-<mousemove time="5943.000000" x="78" y="98" />
-<mousemove time="5944.000000" x="76" y="98" />
-<mousemove time="5980.000000" x="71" y="97" />
-<mousemove time="6016.000000" x="68" y="97" />
-<mousemove time="6053.000000" x="64" y="97" />
-<mousemove time="6090.000000" x="63" y="97" />
-<mousemove time="6126.000000" x="63" y="96" />
-<mouseup time="6368.000000" button="Left" x="63" y="96" />
-<mousemove time="6710.000000" x="66" y="101" />
-<mousemove time="6745.000000" x="76" y="114" />
-<mousemove time="6780.000000" x="86" y="125" />
-<mousemove time="6814.000000" x="92" y="131" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-lineargradient-spread-play-ui.xml Deleted

@@ -1,42 +0,0 @@
-<TestValidationScript >
-<mousemove time="236.000000" x="92" y="176" />
-<mousemove time="1171.000000" x="94" y="131" />
-<mousemove time="1206.000000" x="98" y="131" />
-<mousemove time="1243.000000" x="112" y="139" />
-<mousemove time="1280.000000" x="129" y="147" />
-<mousemove time="1317.000000" x="143" y="151" />
-<mousemove time="1354.000000" x="150" y="153" />
-<mousemove time="1390.000000" x="152" y="154" />
-<mousemove time="1425.000000" x="152" y="155" />
-<mousemove time="1741.000000" x="138" y="143" />
-<mousemove time="1777.000000" x="122" y="130" />
-<mousemove time="1778.000000" x="115" y="124" />
-<mousemove time="1814.000000" x="107" y="115" />
-<mousemove time="1854.000000" x="103" y="110" />
-<mousemove time="1890.000000" x="102" y="108" />
-<mousedown time="2866.000000" button="Left" x="102" y="108" />
-<mouseup time="3534.000000" button="Left" x="102" y="108" />
-<mousemove time="4164.000000" x="112" y="115" />
-<mousemove time="4201.000000" x="130" y="128" />
-<mousemove time="4238.000000" x="149" y="138" />
-<mousemove time="4274.000000" x="161" y="144" />
-<mousemove time="4312.000000" x="166" y="146" />
-<mousemove time="4347.000000" x="167" y="147" />
-<mousemove time="4383.000000" x="167" y="148" />
-<mousemove time="4663.000000" x="166" y="148" />
-<mousemove time="4700.000000" x="157" y="145" />
-<mousemove time="4736.000000" x="139" y="136" />
-<mousemove time="4772.000000" x="123" y="126" />
-<mousemove time="4809.000000" x="115" y="117" />
-<mousemove time="4845.000000" x="109" y="111" />
-<mousemove time="4881.000000" x="107" y="108" />
-<mousemove time="4918.000000" x="106" y="108" />
-<mousedown time="5234.000000" button="Left" x="106" y="108" />
-<mouseup time="5618.000000" button="Left" x="106" y="108" />
-<mousemove time="6006.000000" x="111" y="115" />
-<mousemove time="6043.000000" x="130" y="135" />
-<mousemove time="6080.000000" x="147" y="152" />
-<mousemove time="6081.000000" x="153" y="156" />
-<mousemove time="6117.000000" x="159" y="161" />
-<mousemove time="6152.000000" x="160" y="162" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-radialgradient-simple-play-ui.xml Deleted

@@ -1,92 +0,0 @@
-<TestValidationScript >
-<mousemove time="1089.000000" x="155" y="160" />
-<mousemove time="1124.000000" x="139" y="146" />
-<mousemove time="1160.000000" x="120" y="125" />
-<mousemove time="1195.000000" x="111" y="115" />
-<mousemove time="1230.000000" x="109" y="112" />
-<mousedown time="1634.000000" button="Left" x="109" y="112" />
-<mousemove time="1874.000000" x="108" y="114" />
-<mousemove time="1912.000000" x="106" y="116" />
-<mousemove time="1949.000000" x="105" y="119" />
-<mousemove time="2019.000000" x="104" y="120" />
-<mousemove time="2056.000000" x="103" y="121" />
-<mousemove time="2057.000000" x="103" y="122" />
-<mousemove time="2471.000000" x="103" y="121" />
-<mousemove time="2507.000000" x="103" y="120" />
-<mousemove time="2544.000000" x="103" y="116" />
-<mousemove time="2581.000000" x="103" y="115" />
-<mousemove time="2653.000000" x="104" y="113" />
-<mousemove time="2692.000000" x="105" y="111" />
-<mousemove time="2727.000000" x="106" y="111" />
-<mousemove time="3033.000000" x="106" y="110" />
-<mousemove time="3071.000000" x="107" y="109" />
-<mousemove time="3108.000000" x="108" y="109" />
-<mousemove time="3109.000000" x="108" y="108" />
-<mousemove time="3145.000000" x="109" y="108" />
-<mousemove time="3182.000000" x="110" y="108" />
-<mousemove time="3220.000000" x="112" y="108" />
-<mousemove time="3260.000000" x="114" y="108" />
-<mousemove time="3467.000000" x="115" y="108" />
-<mousemove time="3573.000000" x="116" y="108" />
-<mousemove time="3645.000000" x="117" y="108" />
-<mouseup time="4091.000000" button="Left" x="117" y="108" />
-<mousedown time="4633.000000" button="Left" x="117" y="108" />
-<mousemove time="4940.000000" x="116" y="108" />
-<mousemove time="4977.000000" x="114" y="107" />
-<mousemove time="5014.000000" x="114" y="106" />
-<mousemove time="5051.000000" x="114" y="105" />
-<mousemove time="5189.000000" x="114" y="104" />
-<mousemove time="5327.000000" x="114" y="103" />
-<mousemove time="5397.000000" x="114" y="102" />
-<mousemove time="5502.000000" x="114" y="101" />
-<mousemove time="5606.000000" x="115" y="101" />
-<mousemove time="5642.000000" x="116" y="101" />
-<mousemove time="5680.000000" x="118" y="104" />
-<mousemove time="5716.000000" x="118" y="106" />
-<mousemove time="5753.000000" x="119" y="107" />
-<mousemove time="5790.000000" x="119" y="108" />
-<mousemove time="5896.000000" x="119" y="109" />
-<mousemove time="6100.000000" x="119" y="110" />
-<mousemove time="6206.000000" x="119" y="111" />
-<mousemove time="6243.000000" x="122" y="112" />
-<mousemove time="6280.000000" x="124" y="112" />
-<mousemove time="6316.000000" x="126" y="112" />
-<mousemove time="6353.000000" x="128" y="112" />
-<mousemove time="6390.000000" x="129" y="112" />
-<mousemove time="6430.000000" x="130" y="112" />
-<mousemove time="6431.000000" x="131" y="112" />
-<mousemove time="6468.000000" x="132" y="112" />
-<mousemove time="6710.000000" x="131" y="112" />
-<mousemove time="6747.000000" x="128" y="113" />
-<mousemove time="6784.000000" x="125" y="113" />
-<mousemove time="6821.000000" x="123" y="113" />
-<mousemove time="6859.000000" x="119" y="113" />
-<mousemove time="6896.000000" x="116" y="113" />
-<mousemove time="7238.000000" x="114" y="113" />
-<mousemove time="7275.000000" x="111" y="113" />
-<mousemove time="7312.000000" x="110" y="113" />
-<mousemove time="7383.000000" x="109" y="114" />
-<mousemove time="7384.000000" x="108" y="114" />
-<mousemove time="7421.000000" x="107" y="114" />
-<mousemove time="7457.000000" x="106" y="114" />
-<mousemove time="7701.000000" x="104" y="114" />
-<mousemove time="7738.000000" x="101" y="114" />
-<mousemove time="7775.000000" x="98" y="115" />
-<mousemove time="7812.000000" x="96" y="115" />
-<mousemove time="8224.000000" x="98" y="115" />
-<mousemove time="8261.000000" x="100" y="115" />
-<mousemove time="8298.000000" x="102" y="115" />
-<mousemove time="8335.000000" x="103" y="115" />
-<mousemove time="8372.000000" x="104" y="115" />
-<mousemove time="8373.000000" x="106" y="115" />
-<mousemove time="8410.000000" x="108" y="115" />
-<mousemove time="8717.000000" x="109" y="115" />
-<mousemove time="8753.000000" x="110" y="115" />
-<mousemove time="8790.000000" x="111" y="115" />
-<mouseup time="8962.000000" button="Left" x="111" y="115" />
-<mousemove time="9234.000000" x="116" y="115" />
-<mousemove time="9270.000000" x="140" y="124" />
-<mousemove time="9305.000000" x="177" y="135" />
-<mousemove time="9342.000000" x="191" y="139" />
-<mousemove time="9342.000000" x="199" y="150" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-radialgradient-spread-play-ui.xml Deleted

@@ -1,33 +0,0 @@
-<TestValidationScript >
-<mousemove time="241.000000" x="168" y="184" />
-<mousemove time="1028.000000" x="162" y="139" />
-<mousemove time="1064.000000" x="150" y="138" />
-<mousemove time="1100.000000" x="136" y="128" />
-<mousemove time="1136.000000" x="126" y="119" />
-<mousemove time="1172.000000" x="117" y="111" />
-<mousemove time="1208.000000" x="112" y="108" />
-<mousemove time="1244.000000" x="110" y="105" />
-<mousedown time="1668.000000" button="Left" x="110" y="105" />
-<mouseup time="2092.000000" button="Left" x="110" y="105" />
-<mousemove time="2447.000000" x="115" y="108" />
-<mousemove time="2484.000000" x="127" y="113" />
-<mousemove time="2520.000000" x="142" y="122" />
-<mousemove time="2557.000000" x="155" y="129" />
-<mousemove time="2594.000000" x="164" y="134" />
-<mousemove time="2595.000000" x="165" y="135" />
-<mousemove time="2630.000000" x="167" y="136" />
-<mousemove time="2876.000000" x="159" y="136" />
-<mousemove time="2912.000000" x="144" y="131" />
-<mousemove time="2949.000000" x="129" y="123" />
-<mousemove time="2985.000000" x="121" y="118" />
-<mousemove time="3021.000000" x="111" y="113" />
-<mousemove time="3057.000000" x="110" y="113" />
-<mousedown time="3303.000000" button="Left" x="110" y="113" />
-<mouseup time="3586.000000" button="Left" x="110" y="113" />
-<mousemove time="3866.000000" x="113" y="113" />
-<mousemove time="3903.000000" x="128" y="119" />
-<mousemove time="3939.000000" x="149" y="124" />
-<mousemove time="3975.000000" x="165" y="129" />
-<mousemove time="4011.000000" x="174" y="133" />
-<mousemove time="4047.000000" x="175" y="133" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-texturing-texturetransform-interact-play-ui.xml Deleted

@@ -1,125 +0,0 @@
-<TestValidationScript >
-<mousemove time="178.000000" x="175" y="178" />
-<mousemove time="1312.000000" x="174" y="133" />
-<mousemove time="1349.000000" x="164" y="134" />
-<mousemove time="1387.000000" x="148" y="136" />
-<mousemove time="1426.000000" x="130" y="138" />
-<mousemove time="1464.000000" x="116" y="140" />
-<mousemove time="1501.000000" x="102" y="145" />
-<mousemove time="1539.000000" x="92" y="147" />
-<mousemove time="1576.000000" x="84" y="147" />
-<mousemove time="1613.000000" x="76" y="147" />
-<mousemove time="1651.000000" x="69" y="147" />
-<mousemove time="1688.000000" x="66" y="143" />
-<mousemove time="1726.000000" x="62" y="140" />
-<mousemove time="1764.000000" x="62" y="139" />
-<mousemove time="1951.000000" x="62" y="138" />
-<mousedown time="2168.000000" button="Left" x="62" y="138" />
-<mousemove time="2316.000000" x="60" y="138" />
-<mousemove time="2353.000000" x="51" y="138" />
-<mousemove time="2391.000000" x="46" y="138" />
-<mousemove time="2429.000000" x="42" y="137" />
-<mousemove time="2467.000000" x="36" y="136" />
-<mousemove time="2505.000000" x="32" y="135" />
-<mousemove time="2542.000000" x="27" y="134" />
-<mousemove time="2580.000000" x="26" y="133" />
-<mousemove time="2618.000000" x="24" y="132" />
-<mousemove time="2656.000000" x="23" y="132" />
-<mousemove time="2911.000000" x="25" y="132" />
-<mousemove time="2948.000000" x="29" y="135" />
-<mousemove time="2986.000000" x="34" y="137" />
-<mousemove time="3024.000000" x="40" y="139" />
-<mousemove time="3063.000000" x="43" y="142" />
-<mousemove time="3100.000000" x="44" y="143" />
-<mousemove time="3100.000000" x="45" y="144" />
-<mousemove time="3138.000000" x="47" y="146" />
-<mousemove time="3176.000000" x="50" y="147" />
-<mouseup time="3392.000000" button="Left" x="50" y="147" />
-<mousemove time="3502.000000" x="50" y="145" />
-<mousemove time="3539.000000" x="50" y="131" />
-<mousemove time="3576.000000" x="50" y="108" />
-<mousemove time="3614.000000" x="50" y="87" />
-<mousemove time="3650.000000" x="50" y="75" />
-<mousemove time="3687.000000" x="50" y="69" />
-<mousemove time="3726.000000" x="50" y="67" />
-<mousemove time="3764.000000" x="51" y="66" />
-<mousedown time="3982.000000" button="Left" x="51" y="66" />
-<mousemove time="4095.000000" x="49" y="66" />
-<mousemove time="4132.000000" x="45" y="66" />
-<mousemove time="4170.000000" x="43" y="66" />
-<mousemove time="4209.000000" x="41" y="64" />
-<mousemove time="4247.000000" x="39" y="62" />
-<mousemove time="4284.000000" x="37" y="60" />
-<mousemove time="4321.000000" x="34" y="57" />
-<mousemove time="4321.000000" x="33" y="56" />
-<mousemove time="4358.000000" x="32" y="55" />
-<mousemove time="4468.000000" x="32" y="54" />
-<mousemove time="4539.000000" x="32" y="53" />
-<mousemove time="4577.000000" x="30" y="52" />
-<mousemove time="4614.000000" x="30" y="51" />
-<mouseup time="4686.000000" button="Left" x="30" y="51" />
-<mousemove time="4868.000000" x="38" y="51" />
-<mousemove time="4905.000000" x="80" y="51" />
-<mousemove time="4944.000000" x="111" y="52" />
-<mousemove time="4980.000000" x="127" y="55" />
-<mousemove time="5019.000000" x="136" y="56" />
-<mousemove time="5057.000000" x="140" y="57" />
-<mousemove time="5094.000000" x="143" y="57" />
-<mousemove time="5131.000000" x="144" y="57" />
-<mousemove time="5205.000000" x="144" y="58" />
-<mousedown time="5280.000000" button="Left" x="144" y="58" />
-<mousemove time="5427.000000" x="144" y="61" />
-<mousemove time="5465.000000" x="144" y="63" />
-<mousemove time="5503.000000" x="144" y="65" />
-<mousemove time="5540.000000" x="143" y="66" />
-<mousemove time="5578.000000" x="142" y="68" />
-<mousemove time="5616.000000" x="142" y="69" />
-<mousemove time="5653.000000" x="142" y="70" />
-<mousemove time="5726.000000" x="141" y="70" />
-<mousemove time="5764.000000" x="138" y="70" />
-<mousemove time="5802.000000" x="134" y="70" />
-<mousemove time="5839.000000" x="128" y="70" />
-<mousemove time="5877.000000" x="122" y="65" />
-<mousemove time="5914.000000" x="119" y="62" />
-<mousemove time="5952.000000" x="117" y="60" />
-<mousemove time="5989.000000" x="116" y="59" />
-<mousemove time="6136.000000" x="115" y="59" />
-<mouseup time="6209.000000" button="Left" x="115" y="59" />
-<mousemove time="6354.000000" x="115" y="61" />
-<mousemove time="6394.000000" x="119" y="71" />
-<mousemove time="6431.000000" x="129" y="87" />
-<mousemove time="6468.000000" x="136" y="99" />
-<mousemove time="6506.000000" x="142" y="107" />
-<mousemove time="6543.000000" x="145" y="109" />
-<mousemove time="6581.000000" x="147" y="111" />
-<mousemove time="6617.000000" x="150" y="115" />
-<mousemove time="6653.000000" x="153" y="121" />
-<mousemove time="6690.000000" x="154" y="124" />
-<mousemove time="6728.000000" x="155" y="127" />
-<mousemove time="6766.000000" x="155" y="129" />
-<mousemove time="6912.000000" x="155" y="130" />
-<mousedown time="6950.000000" button="Left" x="155" y="130" />
-<mousemove time="7132.000000" x="153" y="130" />
-<mousemove time="7169.000000" x="152" y="129" />
-<mousemove time="7206.000000" x="152" y="127" />
-<mousemove time="7244.000000" x="151" y="126" />
-<mousemove time="7281.000000" x="150" y="125" />
-<mousemove time="7318.000000" x="150" y="123" />
-<mousemove time="7356.000000" x="149" y="122" />
-<mousemove time="7393.000000" x="148" y="122" />
-<mousemove time="7430.000000" x="147" y="122" />
-<mousemove time="7467.000000" x="146" y="121" />
-<mousemove time="7541.000000" x="145" y="121" />
-<mousemove time="7832.000000" x="144" y="123" />
-<mousemove time="7869.000000" x="142" y="125" />
-<mousemove time="7978.000000" x="141" y="127" />
-<mousemove time="8015.000000" x="140" y="128" />
-<mousemove time="8053.000000" x="140" y="130" />
-<mousemove time="8162.000000" x="139" y="130" />
-<mousemove time="8346.000000" x="139" y="129" />
-<mousemove time="8383.000000" x="139" y="128" />
-<mousemove time="8420.000000" x="139" y="127" />
-<mousemove time="8494.000000" x="139" y="126" />
-<mousemove time="8532.000000" x="139" y="125" />
-<mouseup time="8930.000000" button="Left" x="139" y="125" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-2D-viewport-simple-play-ui.xml Deleted

@@ -1,36 +0,0 @@
-<TestValidationScript >
-<mousemove time="228.000000" x="139" y="170" />
-<mousemove time="963.000000" x="139" y="127" />
-<mousemove time="1001.000000" x="141" y="141" />
-<mousemove time="1038.000000" x="143" y="155" />
-<mousemove time="1072.000000" x="143" y="165" />
-<mousemove time="1107.000000" x="143" y="169" />
-<mousemove time="1141.000000" x="143" y="170" />
-<mousemove time="1517.000000" x="141" y="168" />
-<mousemove time="1552.000000" x="131" y="153" />
-<mousemove time="1587.000000" x="118" y="132" />
-<mousemove time="1622.000000" x="107" y="113" />
-<mousemove time="1658.000000" x="101" y="103" />
-<mousemove time="1694.000000" x="98" y="97" />
-<mousemove time="1729.000000" x="97" y="95" />
-<mousemove time="1764.000000" x="97" y="94" />
-<mousemove time="2106.000000" x="97" y="96" />
-<mousemove time="2141.000000" x="106" y="110" />
-<mousemove time="2176.000000" x="116" y="130" />
-<mousemove time="2212.000000" x="125" y="149" />
-<mousemove time="2250.000000" x="129" y="158" />
-<mousemove time="2286.000000" x="131" y="161" />
-<mousemove time="2390.000000" x="131" y="160" />
-<mousemove time="2696.000000" x="127" y="149" />
-<mousemove time="2731.000000" x="116" y="133" />
-<mousemove time="2767.000000" x="111" y="121" />
-<mousemove time="2802.000000" x="107" y="113" />
-<mousemove time="2839.000000" x="105" y="107" />
-<mousemove time="2875.000000" x="104" y="104" />
-<mousemove time="3186.000000" x="106" y="111" />
-<mousemove time="3220.000000" x="115" y="125" />
-<mousemove time="3257.000000" x="127" y="141" />
-<mousemove time="3257.000000" x="132" y="148" />
-<mousemove time="3293.000000" x="139" y="158" />
-<mousemove time="3328.000000" x="143" y="162" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-interactivity-cylindersensor-play-ui.xml Deleted

@@ -1,101 +0,0 @@
-<TestValidationScript >
-<mousemove time="1304.000000" x="141" y="182" />
-<mousemove time="1338.000000" x="138" y="162" />
-<mousemove time="1372.000000" x="137" y="148" />
-<mousemove time="1407.000000" x="137" y="140" />
-<mousemove time="1442.000000" x="137" y="137" />
-<mousemove time="1478.000000" x="137" y="135" />
-<mousemove time="1512.000000" x="136" y="126" />
-<mousemove time="1548.000000" x="134" y="119" />
-<mousemove time="1584.000000" x="133" y="114" />
-<mousemove time="1620.000000" x="131" y="113" />
-<mousemove time="1656.000000" x="130" y="112" />
-<mousemove time="1691.000000" x="129" y="112" />
-<mousemove time="1727.000000" x="129" y="111" />
-<mousedown time="1866.000000" button="Left" x="129" y="111" />
-<mousemove time="2111.000000" x="132" y="111" />
-<mousemove time="2150.000000" x="136" y="110" />
-<mousemove time="2189.000000" x="140" y="109" />
-<mousemove time="2228.000000" x="142" y="109" />
-<mousemove time="2269.000000" x="144" y="109" />
-<mousemove time="2308.000000" x="147" y="109" />
-<mousemove time="2345.000000" x="152" y="109" />
-<mousemove time="2384.000000" x="154" y="109" />
-<mousemove time="2419.000000" x="155" y="109" />
-<mousemove time="2454.000000" x="156" y="109" />
-<mousemove time="2522.000000" x="156" y="108" />
-<mousemove time="2730.000000" x="154" y="108" />
-<mousemove time="2766.000000" x="150" y="108" />
-<mousemove time="2767.000000" x="148" y="108" />
-<mousemove time="2805.000000" x="145" y="108" />
-<mousemove time="2844.000000" x="141" y="108" />
-<mousemove time="2883.000000" x="136" y="108" />
-<mousemove time="2921.000000" x="130" y="108" />
-<mousemove time="2960.000000" x="126" y="109" />
-<mousemove time="2998.000000" x="123" y="109" />
-<mousemove time="3036.000000" x="120" y="109" />
-<mousemove time="3074.000000" x="116" y="109" />
-<mousemove time="3109.000000" x="113" y="109" />
-<mousemove time="3110.000000" x="112" y="109" />
-<mousemove time="3145.000000" x="111" y="109" />
-<mousemove time="3180.000000" x="110" y="109" />
-<mousemove time="3454.000000" x="111" y="108" />
-<mousemove time="3489.000000" x="112" y="104" />
-<mousemove time="3526.000000" x="116" y="98" />
-<mousemove time="3562.000000" x="121" y="92" />
-<mousemove time="3601.000000" x="124" y="89" />
-<mousemove time="3602.000000" x="126" y="87" />
-<mousemove time="3640.000000" x="128" y="85" />
-<mousemove time="3678.000000" x="129" y="84" />
-<mousemove time="3720.000000" x="131" y="82" />
-<mousemove time="3759.000000" x="132" y="80" />
-<mousemove time="3795.000000" x="134" y="77" />
-<mousemove time="3830.000000" x="136" y="72" />
-<mousemove time="3866.000000" x="139" y="69" />
-<mousemove time="3901.000000" x="141" y="68" />
-<mousemove time="3936.000000" x="142" y="66" />
-<mousemove time="3972.000000" x="144" y="62" />
-<mousemove time="4008.000000" x="147" y="59" />
-<mousemove time="4008.000000" x="148" y="59" />
-<mousemove time="4044.000000" x="150" y="56" />
-<mousemove time="4080.000000" x="152" y="55" />
-<mousemove time="4116.000000" x="154" y="54" />
-<mousemove time="4152.000000" x="156" y="53" />
-<mouseup time="4257.000000" button="Left" x="156" y="53" />
-<mousemove time="4430.000000" x="156" y="60" />
-<mousemove time="4466.000000" x="156" y="76" />
-<mousemove time="4500.000000" x="155" y="88" />
-<mousemove time="4536.000000" x="153" y="98" />
-<mousemove time="4572.000000" x="152" y="105" />
-<mousemove time="4608.000000" x="152" y="109" />
-<mousemove time="4644.000000" x="152" y="110" />
-<mousemove time="4714.000000" x="151" y="110" />
-<mousedown time="4987.000000" button="Left" x="151" y="110" />
-<mousemove time="5264.000000" x="150" y="110" />
-<mousemove time="5303.000000" x="146" y="110" />
-<mousemove time="5304.000000" x="143" y="110" />
-<mousemove time="5343.000000" x="136" y="110" />
-<mousemove time="5382.000000" x="129" y="110" />
-<mousemove time="5420.000000" x="123" y="110" />
-<mousemove time="5459.000000" x="117" y="111" />
-<mousemove time="5494.000000" x="114" y="111" />
-<mousemove time="5529.000000" x="113" y="111" />
-<mousemove time="5565.000000" x="111" y="112" />
-<mousemove time="5602.000000" x="108" y="112" />
-<mousemove time="5638.000000" x="105" y="112" />
-<mousemove time="5674.000000" x="104" y="112" />
-<mousemove time="5710.000000" x="104" y="113" />
-<mouseup time="5950.000000" button="Left" x="104" y="113" />
-<mousemove time="6390.000000" x="104" y="116" />
-<mousemove time="6391.000000" x="104" y="126" />
-<mousemove time="6426.000000" x="104" y="157" />
-<mousemove time="6461.000000" x="104" y="189" />
-<mousemove time="6496.000000" x="105" y="199" />
-<mousemove time="6496.000000" x="107" y="199" />
-<mousemove time="8374.000000" x="109" y="187" />
-<mousemove time="8374.000000" x="107" y="173" />
-<mousemove time="8409.000000" x="105" y="143" />
-<mousemove time="8445.000000" x="104" y="127" />
-<mousemove time="8479.000000" x="103" y="115" />
-<mousemove time="8515.000000" x="103" y="112" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-interactivity-planesensor-play-ui.xml Deleted

@@ -1,105 +0,0 @@
-<TestValidationScript >
-<mousemove time="258.000000" x="103" y="157" />
-<mousemove time="950.000000" x="111" y="112" />
-<mousemove time="984.000000" x="117" y="112" />
-<mousemove time="1019.000000" x="119" y="112" />
-<mousemove time="1053.000000" x="120" y="112" />
-<mousemove time="1087.000000" x="121" y="112" />
-<mousedown time="1395.000000" button="Left" x="121" y="112" />
-<mousemove time="1701.000000" x="122" y="112" />
-<mousemove time="1738.000000" x="124" y="112" />
-<mousemove time="1773.000000" x="126" y="112" />
-<mousemove time="1946.000000" x="126" y="110" />
-<mousemove time="1984.000000" x="128" y="106" />
-<mousemove time="2021.000000" x="130" y="98" />
-<mousemove time="2059.000000" x="131" y="92" />
-<mousemove time="2097.000000" x="131" y="81" />
-<mousemove time="2136.000000" x="131" y="74" />
-<mousemove time="2175.000000" x="131" y="67" />
-<mousemove time="2213.000000" x="131" y="63" />
-<mousemove time="2213.000000" x="131" y="62" />
-<mousemove time="2250.000000" x="131" y="61" />
-<mousemove time="2524.000000" x="130" y="61" />
-<mousemove time="2561.000000" x="124" y="61" />
-<mousemove time="2599.000000" x="118" y="62" />
-<mousemove time="2638.000000" x="112" y="63" />
-<mousemove time="2679.000000" x="102" y="63" />
-<mousemove time="2717.000000" x="91" y="63" />
-<mousemove time="2755.000000" x="79" y="63" />
-<mousemove time="2794.000000" x="68" y="64" />
-<mousemove time="2832.000000" x="53" y="64" />
-<mousemove time="2870.000000" x="47" y="65" />
-<mousemove time="2909.000000" x="40" y="65" />
-<mousemove time="2949.000000" x="36" y="65" />
-<mousemove time="2950.000000" x="34" y="65" />
-<mousemove time="2990.000000" x="31" y="65" />
-<mousemove time="3029.000000" x="28" y="65" />
-<mousemove time="3068.000000" x="27" y="65" />
-<mousemove time="3142.000000" x="26" y="65" />
-<mousemove time="3348.000000" x="26" y="66" />
-<mousemove time="3386.000000" x="29" y="73" />
-<mousemove time="3387.000000" x="31" y="79" />
-<mousemove time="3424.000000" x="36" y="91" />
-<mousemove time="3465.000000" x="41" y="102" />
-<mousemove time="3503.000000" x="44" y="111" />
-<mousemove time="3504.000000" x="46" y="115" />
-<mousemove time="3542.000000" x="48" y="120" />
-<mousemove time="3580.000000" x="50" y="124" />
-<mousemove time="3617.000000" x="52" y="126" />
-<mousemove time="3654.000000" x="52" y="128" />
-<mousemove time="3692.000000" x="54" y="131" />
-<mousemove time="3693.000000" x="54" y="132" />
-<mousemove time="3730.000000" x="55" y="134" />
-<mousemove time="3767.000000" x="55" y="135" />
-<mousemove time="3871.000000" x="56" y="135" />
-<mousemove time="3907.000000" x="60" y="135" />
-<mousemove time="3944.000000" x="69" y="135" />
-<mousemove time="3981.000000" x="82" y="130" />
-<mousemove time="4019.000000" x="92" y="127" />
-<mousemove time="4056.000000" x="101" y="125" />
-<mousemove time="4093.000000" x="107" y="124" />
-<mousemove time="4130.000000" x="115" y="122" />
-<mousemove time="4168.000000" x="119" y="122" />
-<mousemove time="4207.000000" x="123" y="121" />
-<mousemove time="4245.000000" x="127" y="121" />
-<mousemove time="4282.000000" x="128" y="121" />
-<mousemove time="4490.000000" x="127" y="127" />
-<mousemove time="4528.000000" x="124" y="138" />
-<mousemove time="4566.000000" x="123" y="155" />
-<mousemove time="4605.000000" x="123" y="165" />
-<mousemove time="4643.000000" x="123" y="176" />
-<mousemove time="4679.000000" x="123" y="178" />
-<mousemove time="4918.000000" x="123" y="176" />
-<mousemove time="4919.000000" x="123" y="174" />
-<mousemove time="4955.000000" x="123" y="167" />
-<mousemove time="4994.000000" x="123" y="154" />
-<mousemove time="5033.000000" x="122" y="137" />
-<mousemove time="5070.000000" x="120" y="116" />
-<mousemove time="5071.000000" x="118" y="107" />
-<mousemove time="5109.000000" x="113" y="91" />
-<mousemove time="5147.000000" x="111" y="79" />
-<mousemove time="5185.000000" x="110" y="70" />
-<mousemove time="5224.000000" x="109" y="67" />
-<mousemove time="5261.000000" x="109" y="65" />
-<mousemove time="5300.000000" x="109" y="62" />
-<mousemove time="5338.000000" x="107" y="62" />
-<mousemove time="5510.000000" x="109" y="67" />
-<mousemove time="5549.000000" x="111" y="75" />
-<mousemove time="5550.000000" x="113" y="78" />
-<mousemove time="5589.000000" x="116" y="86" />
-<mousemove time="5626.000000" x="118" y="92" />
-<mousemove time="5664.000000" x="120" y="98" />
-<mousemove time="5701.000000" x="121" y="102" />
-<mousemove time="5702.000000" x="121" y="103" />
-<mouseup time="5941.000000" button="Left" x="121" y="103" />
-<mousedown time="6311.000000" button="Left" x="121" y="103" />
-<mouseup time="6650.000000" button="Left" x="121" y="103" />
-<mousemove time="7020.000000" x="121" y="104" />
-<mousemove time="7056.000000" x="121" y="111" />
-<mousemove time="7091.000000" x="117" y="123" />
-<mousemove time="7125.000000" x="108" y="138" />
-<mousemove time="7159.000000" x="98" y="151" />
-<mousemove time="7194.000000" x="93" y="157" />
-<mousemove time="7228.000000" x="90" y="162" />
-<mousemove time="7262.000000" x="88" y="164" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-interactivity-proximitysensor-play-ui.xml Deleted

@@ -1,56 +0,0 @@
-<TestValidationScript >
-<keydown time="795.000000" key_identifier="Up" />
-<keydown time="1266.000000" key_identifier="Up" />
-<keydown time="1369.000000" key_identifier="Up" />
-<keydown time="1438.000000" key_identifier="Up" />
-<keydown time="1541.000000" key_identifier="Up" />
-<keydown time="1610.000000" key_identifier="Up" />
-<keydown time="1713.000000" key_identifier="Up" />
-<keydown time="1780.000000" key_identifier="Up" />
-<keydown time="1884.000000" key_identifier="Up" />
-<keydown time="1953.000000" key_identifier="Up" />
-<keydown time="2022.000000" key_identifier="Up" />
-<keydown time="2126.000000" key_identifier="Up" />
-<keydown time="2196.000000" key_identifier="Up" />
-<keydown time="2297.000000" key_identifier="Up" />
-<keydown time="2366.000000" key_identifier="Up" />
-<keydown time="2468.000000" key_identifier="Up" />
-<keydown time="2537.000000" key_identifier="Up" />
-<keydown time="2640.000000" key_identifier="Up" />
-<keydown time="2708.000000" key_identifier="Up" />
-<keydown time="2778.000000" key_identifier="Up" />
-<keydown time="2880.000000" key_identifier="Up" />
-<keydown time="2950.000000" key_identifier="Up" />
-<keydown time="3053.000000" key_identifier="Up" />
-<keydown time="3121.000000" key_identifier="Up" />
-<keydown time="3225.000000" key_identifier="Up" />
-<keydown time="3295.000000" key_identifier="Up" />
-<keydown time="3397.000000" key_identifier="Up" />
-<keydown time="3467.000000" key_identifier="Up" />
-<keydown time="3536.000000" key_identifier="Up" />
-<keydown time="3640.000000" key_identifier="Up" />
-<keydown time="3710.000000" key_identifier="Up" />
-<keydown time="3813.000000" key_identifier="Up" />
-<keydown time="3881.000000" key_identifier="Up" />
-<keydown time="3985.000000" key_identifier="Up" />
-<keydown time="4055.000000" key_identifier="Up" />
-<keydown time="4123.000000" key_identifier="Up" />
-<keydown time="4225.000000" key_identifier="Up" />
-<keydown time="4294.000000" key_identifier="Up" />
-<keydown time="4397.000000" key_identifier="Up" />
-<keydown time="4467.000000" key_identifier="Up" />
-<keydown time="4571.000000" key_identifier="Up" />
-<keydown time="4641.000000" key_identifier="Up" />
-<keydown time="4745.000000" key_identifier="Up" />
-<keydown time="4814.000000" key_identifier="Up" />
-<keydown time="4884.000000" key_identifier="Up" />
-<keyup time="4985.000000" key_identifier="Up" />
-<keydown time="5319.000000" key_identifier="Up" />
-<keyup time="5452.000000" key_identifier="Up" />
-<keydown time="5552.000000" key_identifier="Up" />
-<keyup time="5652.000000" key_identifier="Up" />
-<keydown time="5752.000000" key_identifier="Up" />
-<keyup time="5853.000000" key_identifier="Up" />
-<keydown time="5954.000000" key_identifier="Up" />
-<keyup time="6021.000000" key_identifier="Up" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-interactivity-spheresensor-play-ui.xml Deleted

@@ -1,134 +0,0 @@
-<TestValidationScript >
-<mousemove time="180.000000" x="94" y="155" />
-<mousemove time="994.000000" x="99" y="110" />
-<mousemove time="1029.000000" x="106" y="112" />
-<mousemove time="1065.000000" x="114" y="114" />
-<mousemove time="1101.000000" x="117" y="115" />
-<mousemove time="1137.000000" x="119" y="115" />
-<mousemove time="1172.000000" x="121" y="117" />
-<mousemove time="1207.000000" x="121" y="118" />
-<mousedown time="1447.000000" button="Left" x="121" y="118" />
-<mousemove time="1789.000000" x="121" y="117" />
-<mousemove time="1827.000000" x="121" y="115" />
-<mousemove time="1867.000000" x="121" y="113" />
-<mousemove time="1905.000000" x="121" y="110" />
-<mousemove time="1945.000000" x="121" y="108" />
-<mousemove time="1985.000000" x="121" y="106" />
-<mousemove time="2023.000000" x="121" y="105" />
-<mousemove time="2062.000000" x="121" y="104" />
-<mousemove time="2101.000000" x="121" y="103" />
-<mousemove time="2139.000000" x="121" y="101" />
-<mousemove time="2177.000000" x="121" y="99" />
-<mousemove time="2251.000000" x="121" y="98" />
-<mousemove time="2289.000000" x="121" y="97" />
-<mousemove time="2327.000000" x="121" y="96" />
-<mousemove time="2434.000000" x="121" y="95" />
-<mousemove time="2472.000000" x="121" y="94" />
-<mousemove time="2511.000000" x="121" y="92" />
-<mousemove time="2549.000000" x="121" y="90" />
-<mousemove time="2587.000000" x="120" y="88" />
-<mousemove time="2629.000000" x="120" y="84" />
-<mousemove time="2668.000000" x="120" y="80" />
-<mousemove time="2707.000000" x="120" y="78" />
-<mousemove time="2745.000000" x="120" y="76" />
-<mousemove time="2785.000000" x="120" y="75" />
-<mousemove time="2823.000000" x="120" y="74" />
-<mousemove time="3033.000000" x="121" y="74" />
-<mousemove time="3072.000000" x="124" y="74" />
-<mousemove time="3111.000000" x="128" y="76" />
-<mousemove time="3150.000000" x="132" y="78" />
-<mousemove time="3188.000000" x="134" y="80" />
-<mousemove time="3227.000000" x="136" y="81" />
-<mousemove time="3265.000000" x="138" y="82" />
-<mousemove time="3303.000000" x="140" y="82" />
-<mousemove time="3342.000000" x="141" y="83" />
-<mousemove time="3380.000000" x="142" y="83" />
-<mousemove time="3419.000000" x="143" y="83" />
-<mousemove time="3458.000000" x="145" y="84" />
-<mousemove time="3498.000000" x="147" y="85" />
-<mousemove time="3537.000000" x="148" y="88" />
-<mousemove time="3575.000000" x="149" y="88" />
-<mousemove time="3646.000000" x="150" y="88" />
-<mousemove time="3686.000000" x="151" y="89" />
-<mousemove time="3724.000000" x="152" y="89" />
-<mousemove time="3763.000000" x="153" y="89" />
-<mousemove time="3839.000000" x="154" y="89" />
-<mousemove time="4080.000000" x="156" y="89" />
-<mousemove time="4118.000000" x="158" y="91" />
-<mousemove time="4158.000000" x="159" y="91" />
-<mousemove time="4233.000000" x="160" y="92" />
-<mousemove time="4272.000000" x="162" y="93" />
-<mousemove time="4311.000000" x="163" y="94" />
-<mousemove time="4312.000000" x="163" y="95" />
-<mousemove time="4351.000000" x="164" y="97" />
-<mousemove time="4389.000000" x="164" y="98" />
-<mousemove time="4429.000000" x="164" y="99" />
-<mousemove time="4466.000000" x="164" y="101" />
-<mousemove time="4506.000000" x="164" y="103" />
-<mousemove time="4581.000000" x="164" y="105" />
-<mousemove time="4620.000000" x="164" y="106" />
-<mousemove time="4659.000000" x="164" y="107" />
-<mousemove time="4698.000000" x="164" y="108" />
-<mouseup time="4770.000000" button="Left" x="164" y="108" />
-<mousemove time="5117.000000" x="164" y="111" />
-<mousemove time="5117.000000" x="164" y="113" />
-<mousemove time="5153.000000" x="163" y="115" />
-<mousemove time="5189.000000" x="163" y="117" />
-<mousemove time="5223.000000" x="163" y="118" />
-<mousemove time="5363.000000" x="163" y="119" />
-<mousemove time="5398.000000" x="163" y="120" />
-<mousedown time="5467.000000" button="Left" x="163" y="120" />
-<mousemove time="5642.000000" x="163" y="119" />
-<mousemove time="5680.000000" x="163" y="117" />
-<mousemove time="5718.000000" x="163" y="115" />
-<mousemove time="5757.000000" x="163" y="113" />
-<mousemove time="5795.000000" x="163" y="110" />
-<mousemove time="5833.000000" x="162" y="108" />
-<mousemove time="5872.000000" x="161" y="105" />
-<mousemove time="5911.000000" x="160" y="104" />
-<mousemove time="5950.000000" x="160" y="102" />
-<mousemove time="5989.000000" x="159" y="100" />
-<mousemove time="5990.000000" x="159" y="99" />
-<mousemove time="6027.000000" x="159" y="96" />
-<mousemove time="6067.000000" x="158" y="96" />
-<mousemove time="6105.000000" x="158" y="95" />
-<mousemove time="6143.000000" x="158" y="94" />
-<mousemove time="6181.000000" x="158" y="93" />
-<mousemove time="6219.000000" x="157" y="92" />
-<mousemove time="6258.000000" x="156" y="91" />
-<mousemove time="6296.000000" x="156" y="90" />
-<mousemove time="6368.000000" x="156" y="89" />
-<mousemove time="6441.000000" x="156" y="88" />
-<mousemove time="6479.000000" x="156" y="87" />
-<mousemove time="6518.000000" x="155" y="86" />
-<mousemove time="6556.000000" x="155" y="85" />
-<mousemove time="6594.000000" x="155" y="84" />
-<mousemove time="6735.000000" x="155" y="83" />
-<mousemove time="6774.000000" x="155" y="82" />
-<mousemove time="6813.000000" x="155" y="80" />
-<mousemove time="6852.000000" x="154" y="79" />
-<mousemove time="6890.000000" x="154" y="78" />
-<mousemove time="6963.000000" x="154" y="77" />
-<mousemove time="7071.000000" x="153" y="77" />
-<mouseup time="7381.000000" button="Left" x="153" y="77" />
-<mousemove time="8236.000000" x="153" y="83" />
-<mousemove time="8271.000000" x="153" y="93" />
-<mousemove time="8306.000000" x="151" y="104" />
-<mousemove time="8342.000000" x="151" y="112" />
-<mousemove time="8377.000000" x="149" y="116" />
-<mousemove time="8413.000000" x="148" y="118" />
-<mousemove time="8414.000000" x="148" y="119" />
-<mousemove time="8519.000000" x="148" y="120" />
-<mousemove time="8555.000000" x="148" y="121" />
-<mousemove time="8591.000000" x="148" y="122" />
-<mousedown time="8728.000000" button="Left" x="148" y="122" />
-<mousemove time="8939.000000" x="148" y="119" />
-<mousemove time="8940.000000" x="148" y="116" />
-<mousemove time="8978.000000" x="148" y="111" />
-<mousemove time="9017.000000" x="148" y="106" />
-<mousemove time="9056.000000" x="148" y="103" />
-<mousemove time="9095.000000" x="148" y="100" />
-<mousemove time="9095.000000" x="148" y="99" />
-<mousemove time="9203.000000" x="148" y="98" />
-<mouseup time="9309.000000" button="Left" x="148" y="98" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-interactivity-visibilitysensor-play-ui.xml Deleted

@@ -1,44 +0,0 @@
-<TestValidationScript >
-<mousemove time="185.000000" x="98" y="153" />
-<mousemove time="786.000000" x="100" y="109" />
-<mousemove time="822.000000" x="101" y="111" />
-<mousemove time="858.000000" x="102" y="112" />
-<keydown time="2250.000000" key_identifier="Left" />
-<keydown time="2772.000000" key_identifier="Left" />
-<keydown time="2842.000000" key_identifier="Left" />
-<keydown time="2911.000000" key_identifier="Left" />
-<keydown time="3014.000000" key_identifier="Left" />
-<keyup time="3049.000000" key_identifier="Left" />
-<keydown time="3968.000000" key_identifier="Right" />
-<keyup time="4038.000000" key_identifier="Right" />
-<keydown time="4175.000000" key_identifier="Right" />
-<keyup time="4278.000000" key_identifier="Right" />
-<keydown time="4515.000000" key_identifier="Right" />
-<keyup time="4653.000000" key_identifier="Right" />
-<keydown time="5103.000000" key_identifier="Right" />
-<keyup time="5172.000000" key_identifier="Right" />
-<keydown time="5276.000000" key_identifier="Right" />
-<keyup time="5346.000000" key_identifier="Right" />
-<keydown time="5415.000000" key_identifier="Right" />
-<keyup time="5483.000000" key_identifier="Right" />
-<keydown time="5587.000000" key_identifier="Right" />
-<keyup time="5657.000000" key_identifier="Right" />
-<keydown time="5761.000000" key_identifier="Right" />
-<keyup time="5830.000000" key_identifier="Right" />
-<keydown time="5934.000000" key_identifier="Right" />
-<keyup time="6039.000000" key_identifier="Right" />
-<keydown time="6457.000000" key_identifier="Left" />
-<keyup time="6560.000000" key_identifier="Left" />
-<keydown time="6630.000000" key_identifier="Left" />
-<keyup time="6699.000000" key_identifier="Left" />
-<keydown time="6804.000000" key_identifier="Left" />
-<keyup time="6839.000000" key_identifier="Left" />
-<keydown time="6943.000000" key_identifier="Left" />
-<keyup time="7013.000000" key_identifier="Left" />
-<keydown time="7118.000000" key_identifier="Left" />
-<keyup time="7153.000000" key_identifier="Left" />
-<keydown time="7258.000000" key_identifier="Left" />
-<keyup time="7327.000000" key_identifier="Left" />
-<keydown time="7431.000000" key_identifier="Left" />
-<keyup time="7499.000000" key_identifier="Left" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-lighting-fog-play-ui.xml Deleted

@@ -1,53 +0,0 @@
-<TestValidationScript >
-<mousemove time="1277.000000" x="173" y="186" />
-<mousemove time="2221.000000" x="172" y="182" />
-<mousemove time="2256.000000" x="171" y="179" />
-<mousemove time="2292.000000" x="169" y="174" />
-<mousemove time="2327.000000" x="168" y="171" />
-<mousemove time="2363.000000" x="167" y="169" />
-<mousemove time="2399.000000" x="166" y="168" />
-<mousemove time="2435.000000" x="166" y="167" />
-<mousemove time="2505.000000" x="165" y="167" />
-<mousemove time="2542.000000" x="163" y="166" />
-<mousemove time="2577.000000" x="161" y="164" />
-<mousemove time="2613.000000" x="160" y="161" />
-<mousemove time="2648.000000" x="158" y="160" />
-<mousemove time="2684.000000" x="155" y="159" />
-<mousemove time="3418.000000" x="154" y="159" />
-<mousemove time="3454.000000" x="148" y="157" />
-<mousemove time="3490.000000" x="141" y="152" />
-<mousemove time="3526.000000" x="131" y="145" />
-<mousemove time="3562.000000" x="123" y="140" />
-<mousemove time="3598.000000" x="119" y="136" />
-<mousemove time="3635.000000" x="116" y="134" />
-<mousemove time="3672.000000" x="113" y="131" />
-<mousemove time="3709.000000" x="109" y="127" />
-<mousemove time="3745.000000" x="106" y="124" />
-<mousemove time="3782.000000" x="105" y="123" />
-<mousemove time="4689.000000" x="116" y="127" />
-<mousemove time="4724.000000" x="133" y="133" />
-<mousemove time="4725.000000" x="140" y="136" />
-<mousemove time="4761.000000" x="152" y="139" />
-<mousemove time="4795.000000" x="154" y="140" />
-<mousemove time="4864.000000" x="153" y="140" />
-<mousemove time="4899.000000" x="152" y="140" />
-<mousemove time="5036.000000" x="152" y="139" />
-<mousemove time="5717.000000" x="151" y="139" />
-<mousemove time="5751.000000" x="141" y="136" />
-<mousemove time="5785.000000" x="122" y="129" />
-<mousemove time="5821.000000" x="108" y="123" />
-<mousemove time="5856.000000" x="99" y="119" />
-<mousemove time="5891.000000" x="94" y="117" />
-<mousemove time="5926.000000" x="93" y="116" />
-<mousemove time="6503.000000" x="95" y="116" />
-<mousemove time="6538.000000" x="109" y="119" />
-<mousemove time="6576.000000" x="126" y="125" />
-<mousemove time="6576.000000" x="133" y="126" />
-<mousemove time="6612.000000" x="142" y="128" />
-<mousemove time="6646.000000" x="145" y="129" />
-<mousemove time="9064.000000" x="140" y="129" />
-<mousemove time="9098.000000" x="125" y="129" />
-<mousemove time="9134.000000" x="110" y="125" />
-<mousemove time="9170.000000" x="102" y="124" />
-<mousemove time="9205.000000" x="101" y="124" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-positioning-layer3D-play-ui.xml Deleted

@@ -1,149 +0,0 @@
-<TestValidationScript >
-<mousemove time="233.000000" x="130" y="173" />
-<mousemove time="1073.000000" x="132" y="128" />
-<mousemove time="1110.000000" x="137" y="128" />
-<mousemove time="1147.000000" x="151" y="130" />
-<mousemove time="1185.000000" x="157" y="131" />
-<mousemove time="1221.000000" x="161" y="131" />
-<mousemove time="1256.000000" x="163" y="131" />
-<mousemove time="1293.000000" x="165" y="131" />
-<mousemove time="1329.000000" x="166" y="131" />
-<mousemove time="1437.000000" x="167" y="131" />
-<mousemove time="1472.000000" x="170" y="131" />
-<mousemove time="1509.000000" x="172" y="131" />
-<mousemove time="1510.000000" x="173" y="131" />
-<mousedown time="1938.000000" button="Left" x="173" y="131" />
-<mouseup time="2292.000000" button="Left" x="173" y="131" />
-<mousedown time="2999.000000" button="Left" x="173" y="131" />
-<mouseup time="3250.000000" button="Left" x="173" y="131" />
-<mousemove time="3749.000000" x="167" y="131" />
-<mousemove time="3788.000000" x="151" y="131" />
-<mousemove time="3825.000000" x="126" y="135" />
-<mousemove time="3861.000000" x="97" y="139" />
-<mousemove time="3899.000000" x="72" y="142" />
-<mousemove time="3900.000000" x="65" y="143" />
-<mousemove time="3935.000000" x="51" y="143" />
-<mousemove time="3971.000000" x="45" y="143" />
-<mousemove time="4008.000000" x="43" y="143" />
-<mousemove time="4045.000000" x="42" y="142" />
-<mousemove time="4080.000000" x="42" y="141" />
-<mousemove time="4117.000000" x="41" y="140" />
-<mousemove time="4153.000000" x="37" y="138" />
-<mousemove time="4191.000000" x="33" y="137" />
-<mousemove time="4227.000000" x="32" y="136" />
-<mousemove time="4264.000000" x="30" y="135" />
-<mousemove time="4300.000000" x="28" y="135" />
-<mousemove time="4339.000000" x="27" y="134" />
-<mousemove time="4412.000000" x="26" y="133" />
-<mousedown time="4521.000000" button="Left" x="26" y="133" />
-<mouseup time="4631.000000" button="Left" x="26" y="133" />
-<mousemove time="4920.000000" x="28" y="133" />
-<mousemove time="4957.000000" x="43" y="126" />
-<mousemove time="4995.000000" x="63" y="120" />
-<mousemove time="5033.000000" x="73" y="117" />
-<mousemove time="5070.000000" x="76" y="116" />
-<mousemove time="5107.000000" x="78" y="116" />
-<mousedown time="5287.000000" button="Left" x="78" y="116" />
-<mousemove time="5466.000000" x="80" y="116" />
-<mousemove time="5503.000000" x="85" y="117" />
-<mousemove time="5540.000000" x="90" y="119" />
-<mousemove time="5576.000000" x="96" y="120" />
-<mousemove time="5612.000000" x="100" y="121" />
-<mousemove time="5649.000000" x="103" y="121" />
-<mousemove time="5685.000000" x="105" y="121" />
-<mousemove time="5721.000000" x="108" y="121" />
-<mousemove time="5757.000000" x="112" y="120" />
-<mousemove time="5757.000000" x="114" y="119" />
-<mousemove time="5794.000000" x="118" y="116" />
-<mousemove time="5832.000000" x="123" y="112" />
-<mousemove time="5868.000000" x="125" y="109" />
-<mousemove time="5906.000000" x="127" y="105" />
-<mousemove time="5943.000000" x="127" y="100" />
-<mousemove time="5980.000000" x="129" y="90" />
-<mousemove time="6017.000000" x="129" y="81" />
-<mousemove time="6055.000000" x="130" y="72" />
-<mousemove time="6092.000000" x="131" y="64" />
-<mousemove time="6130.000000" x="132" y="58" />
-<mousemove time="6167.000000" x="132" y="52" />
-<mousemove time="6167.000000" x="132" y="50" />
-<mousemove time="6203.000000" x="132" y="49" />
-<mousemove time="6351.000000" x="132" y="53" />
-<mousemove time="6389.000000" x="134" y="64" />
-<mousemove time="6426.000000" x="136" y="87" />
-<mousemove time="6463.000000" x="138" y="100" />
-<mousemove time="6501.000000" x="139" y="111" />
-<mousemove time="6539.000000" x="139" y="119" />
-<mousemove time="6575.000000" x="139" y="124" />
-<mousemove time="6612.000000" x="129" y="131" />
-<mousemove time="6650.000000" x="116" y="135" />
-<mousemove time="6687.000000" x="98" y="140" />
-<mousemove time="6722.000000" x="82" y="142" />
-<mousemove time="6758.000000" x="65" y="143" />
-<mousemove time="6796.000000" x="52" y="143" />
-<mousemove time="6833.000000" x="38" y="140" />
-<mousemove time="6869.000000" x="31" y="135" />
-<mousemove time="6906.000000" x="26" y="129" />
-<mousemove time="6944.000000" x="23" y="125" />
-<mousemove time="6980.000000" x="21" y="122" />
-<mousemove time="7017.000000" x="21" y="121" />
-<mousemove time="7088.000000" x="27" y="121" />
-<mousemove time="7125.000000" x="45" y="124" />
-<mousemove time="7162.000000" x="66" y="132" />
-<mousemove time="7200.000000" x="89" y="144" />
-<mousemove time="7237.000000" x="97" y="152" />
-<mousemove time="7273.000000" x="104" y="161" />
-<mousemove time="7309.000000" x="109" y="168" />
-<mousemove time="7346.000000" x="111" y="171" />
-<mousemove time="7383.000000" x="115" y="178" />
-<mousemove time="7418.000000" x="120" y="194" />
-<mousemove time="7456.000000" x="125" y="199" />
-<mousemove time="7783.000000" x="118" y="190" />
-<mousemove time="7819.000000" x="114" y="166" />
-<mousemove time="7856.000000" x="110" y="149" />
-<mousemove time="7893.000000" x="104" y="122" />
-<mousemove time="7930.000000" x="101" y="107" />
-<mousemove time="7967.000000" x="100" y="91" />
-<mousemove time="8005.000000" x="99" y="74" />
-<mousemove time="8042.000000" x="99" y="61" />
-<mousemove time="8080.000000" x="101" y="49" />
-<mousemove time="8117.000000" x="104" y="42" />
-<mousemove time="8153.000000" x="104" y="41" />
-<mousemove time="8225.000000" x="105" y="41" />
-<mousemove time="8263.000000" x="107" y="44" />
-<mousemove time="8300.000000" x="114" y="51" />
-<mousemove time="8337.000000" x="121" y="58" />
-<mousemove time="8373.000000" x="126" y="70" />
-<mousemove time="8409.000000" x="129" y="81" />
-<mousemove time="8446.000000" x="130" y="91" />
-<mousemove time="8482.000000" x="127" y="99" />
-<mousemove time="8517.000000" x="111" y="108" />
-<mousemove time="8552.000000" x="99" y="113" />
-<mousemove time="8588.000000" x="89" y="117" />
-<mousemove time="8624.000000" x="76" y="119" />
-<mousemove time="8660.000000" x="66" y="119" />
-<mousemove time="8697.000000" x="59" y="119" />
-<mousemove time="8733.000000" x="54" y="120" />
-<mousemove time="8769.000000" x="52" y="120" />
-<mousemove time="8803.000000" x="51" y="120" />
-<mousemove time="8877.000000" x="51" y="121" />
-<mousemove time="8986.000000" x="53" y="126" />
-<mousemove time="9023.000000" x="59" y="134" />
-<mousemove time="9061.000000" x="67" y="143" />
-<mousemove time="9099.000000" x="76" y="150" />
-<mousemove time="9136.000000" x="84" y="155" />
-<mousemove time="9174.000000" x="89" y="158" />
-<mousemove time="9174.000000" x="92" y="160" />
-<mousemove time="9212.000000" x="100" y="163" />
-<mousemove time="9248.000000" x="105" y="165" />
-<mousemove time="9286.000000" x="107" y="165" />
-<mousemove time="9323.000000" x="108" y="165" />
-<mousemove time="9359.000000" x="109" y="165" />
-<mousemove time="9396.000000" x="115" y="162" />
-<mousemove time="9433.000000" x="126" y="155" />
-<mousemove time="9468.000000" x="130" y="153" />
-<mousemove time="9505.000000" x="131" y="153" />
-<mousemove time="9613.000000" x="131" y="154" />
-<mousemove time="9651.000000" x="131" y="160" />
-<mousemove time="9690.000000" x="131" y="165" />
-<mousemove time="9727.000000" x="131" y="168" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-shapes-box-transparent-play-ui.xml Deleted

@@ -1,78 +0,0 @@
-<TestValidationScript >
-<mousemove time="174.000000" x="102" y="157" />
-<mousemove time="1454.000000" x="108" y="113" />
-<mousemove time="1498.000000" x="118" y="120" />
-<mousemove time="1534.000000" x="125" y="123" />
-<mousemove time="1580.000000" x="128" y="124" />
-<mousemove time="1617.000000" x="129" y="122" />
-<mousemove time="1618.000000" x="129" y="118" />
-<mousemove time="1655.000000" x="129" y="111" />
-<mousemove time="1696.000000" x="129" y="106" />
-<mousemove time="1747.000000" x="126" y="104" />
-<mousemove time="1780.000000" x="120" y="102" />
-<mousemove time="1816.000000" x="115" y="101" />
-<mousemove time="1863.000000" x="113" y="101" />
-<mousedown time="2098.000000" button="Left" x="113" y="101" />
-<mousemove time="2416.000000" x="113" y="102" />
-<mousemove time="2464.000000" x="111" y="106" />
-<mousemove time="2501.000000" x="109" y="109" />
-<mousemove time="2537.000000" x="108" y="110" />
-<mousemove time="2574.000000" x="108" y="111" />
-<mousemove time="2580.000000" x="107" y="111" />
-<mousemove time="2617.000000" x="104" y="112" />
-<mousemove time="2664.000000" x="100" y="113" />
-<mousemove time="2700.000000" x="96" y="113" />
-<mousemove time="2701.000000" x="93" y="113" />
-<mousemove time="2738.000000" x="90" y="113" />
-<mousemove time="2776.000000" x="88" y="113" />
-<mousemove time="2831.000000" x="85" y="111" />
-<mousemove time="2861.000000" x="83" y="110" />
-<mousemove time="2897.000000" x="82" y="109" />
-<mousemove time="3063.000000" x="86" y="109" />
-<mousemove time="3100.000000" x="95" y="108" />
-<mousemove time="3137.000000" x="104" y="107" />
-<mousemove time="3180.000000" x="113" y="106" />
-<mousemove time="3217.000000" x="122" y="104" />
-<mousemove time="3264.000000" x="126" y="101" />
-<mousemove time="3301.000000" x="130" y="97" />
-<mousemove time="3301.000000" x="131" y="94" />
-<mousemove time="3337.000000" x="133" y="86" />
-<mousemove time="3373.000000" x="133" y="73" />
-<mousemove time="3415.000000" x="133" y="57" />
-<mousemove time="3465.000000" x="130" y="39" />
-<mousemove time="3500.000000" x="129" y="35" />
-<mousemove time="3536.000000" x="128" y="34" />
-<mousemove time="3699.000000" x="127" y="34" />
-<mousemove time="3735.000000" x="125" y="44" />
-<mousemove time="3780.000000" x="123" y="60" />
-<mousemove time="3818.000000" x="122" y="77" />
-<mousemove time="3818.000000" x="122" y="87" />
-<mousemove time="3854.000000" x="122" y="99" />
-<mousemove time="3897.000000" x="122" y="109" />
-<mousemove time="3947.000000" x="121" y="117" />
-<mousemove time="3979.000000" x="120" y="120" />
-<mousemove time="4015.000000" x="116" y="122" />
-<mousemove time="4064.000000" x="93" y="122" />
-<mousemove time="4101.000000" x="76" y="121" />
-<mousemove time="4138.000000" x="65" y="120" />
-<mousemove time="4173.000000" x="62" y="119" />
-<mousemove time="4346.000000" x="64" y="119" />
-<mousemove time="4382.000000" x="73" y="119" />
-<mousemove time="4417.000000" x="88" y="120" />
-<mousemove time="4463.000000" x="104" y="120" />
-<mousemove time="4500.000000" x="113" y="116" />
-<mousemove time="4537.000000" x="120" y="109" />
-<mousemove time="4581.000000" x="127" y="100" />
-<mousemove time="4618.000000" x="132" y="81" />
-<mousemove time="4654.000000" x="133" y="67" />
-<mousemove time="4698.000000" x="133" y="58" />
-<mousemove time="4735.000000" x="133" y="53" />
-<mousemove time="4740.000000" x="131" y="52" />
-<mousemove time="4780.000000" x="131" y="51" />
-<mouseup time="5136.000000" button="Left" x="131" y="51" />
-<mousemove time="6934.000000" x="131" y="52" />
-<mousemove time="6940.000000" x="131" y="57" />
-<mousemove time="6981.000000" x="139" y="77" />
-<mousemove time="7018.000000" x="175" y="155" />
-<mousemove time="7063.000000" x="199" y="199" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-shapes-elevationgrid-play-ui.xml Deleted

@@ -1,70 +0,0 @@
-<TestValidationScript >
-<mousemove time="929.000000" x="126" y="168" />
-<mousemove time="964.000000" x="117" y="165" />
-<mousemove time="999.000000" x="112" y="155" />
-<mousemove time="1034.000000" x="104" y="134" />
-<mousemove time="1069.000000" x="101" y="118" />
-<mousemove time="1104.000000" x="101" y="112" />
-<mousemove time="1140.000000" x="101" y="110" />
-<mousemove time="1176.000000" x="100" y="110" />
-<mousemove time="1212.000000" x="100" y="111" />
-<mousedown time="1212.000000" button="Left" x="100" y="111" />
-<mousemove time="1288.000000" x="100" y="112" />
-<mousemove time="1304.000000" x="100" y="116" />
-<mousemove time="1355.000000" x="100" y="128" />
-<mousemove time="1355.000000" x="100" y="135" />
-<mousemove time="1390.000000" x="100" y="146" />
-<mousemove time="1426.000000" x="101" y="153" />
-<mousemove time="1462.000000" x="105" y="157" />
-<mousemove time="1497.000000" x="112" y="160" />
-<mousemove time="1532.000000" x="120" y="162" />
-<mousemove time="1568.000000" x="129" y="164" />
-<mousemove time="1604.000000" x="138" y="167" />
-<mousemove time="1640.000000" x="145" y="168" />
-<mousemove time="1676.000000" x="147" y="168" />
-<mouseup time="1712.000000" button="Left" x="147" y="168" />
-<mousemove time="1885.000000" x="140" y="163" />
-<mousemove time="1921.000000" x="128" y="150" />
-<mousemove time="1955.000000" x="118" y="139" />
-<mousemove time="1991.000000" x="109" y="130" />
-<mousemove time="2025.000000" x="102" y="122" />
-<mousemove time="2060.000000" x="98" y="116" />
-<mousemove time="2094.000000" x="96" y="111" />
-<mousemove time="2130.000000" x="94" y="106" />
-<mousemove time="2164.000000" x="91" y="102" />
-<mousemove time="2199.000000" x="90" y="99" />
-<mousedown time="2234.000000" button="Left" x="90" y="99" />
-<mouseup time="2421.000000" button="Left" x="90" y="99" />
-<mousemove time="2557.000000" x="90" y="102" />
-<mousemove time="2592.000000" x="90" y="115" />
-<mousemove time="2629.000000" x="88" y="123" />
-<mousemove time="2664.000000" x="85" y="129" />
-<mousemove time="2698.000000" x="83" y="132" />
-<mousemove time="2734.000000" x="82" y="132" />
-<mousemove time="2769.000000" x="80" y="136" />
-<mousemove time="2804.000000" x="79" y="138" />
-<mousemove time="2838.000000" x="78" y="139" />
-<mousedown time="2906.000000" button="Left" x="78" y="139" />
-<mousemove time="3079.000000" x="81" y="143" />
-<mousemove time="3116.000000" x="90" y="151" />
-<mousemove time="3151.000000" x="102" y="159" />
-<mousemove time="3186.000000" x="113" y="163" />
-<mousemove time="3222.000000" x="123" y="168" />
-<mousemove time="3256.000000" x="131" y="172" />
-<mousemove time="3291.000000" x="135" y="173" />
-<mousemove time="3327.000000" x="137" y="173" />
-<mousemove time="3362.000000" x="138" y="174" />
-<mousemove time="3397.000000" x="138" y="175" />
-<mousemove time="3433.000000" x="138" y="180" />
-<mousemove time="3468.000000" x="138" y="187" />
-<mousemove time="3504.000000" x="139" y="193" />
-<mousemove time="3540.000000" x="139" y="195" />
-<mousemove time="3575.000000" x="139" y="196" />
-<mousemove time="3610.000000" x="139" y="197" />
-<mousemove time="3646.000000" x="138" y="198" />
-<mousemove time="3646.000000" x="136" y="199" />
-<mouseup time="3853.000000" button="Left" x="136" y="199" />
-<mousemove time="3854.000000" x="136" y="199" />
-<keydown time="4534.000000" key_identifier="Home" />
-<keyup time="4638.000000" key_identifier="Home" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-shapes-extrusion-play-ui.xml Deleted

@@ -1,65 +0,0 @@
-<TestValidationScript >
-<mousemove time="925.000000" x="117" y="188" />
-<mousemove time="960.000000" x="108" y="169" />
-<mousemove time="995.000000" x="101" y="152" />
-<mousemove time="997.000000" x="100" y="148" />
-<mousemove time="1033.000000" x="98" y="135" />
-<mousemove time="1069.000000" x="97" y="126" />
-<mousemove time="1105.000000" x="96" y="122" />
-<mousemove time="1141.000000" x="94" y="120" />
-<mousedown time="1317.000000" button="Left" x="94" y="120" />
-<mouseup time="2042.000000" button="Left" x="94" y="120" />
-<mousedown time="2529.000000" button="Left" x="94" y="120" />
-<mouseup time="3290.000000" button="Left" x="94" y="120" />
-<mousedown time="3742.000000" button="Left" x="94" y="120" />
-<mouseup time="4609.000000" button="Left" x="94" y="120" />
-<mousedown time="5165.000000" button="Left" x="94" y="120" />
-<mouseup time="5688.000000" button="Left" x="94" y="120" />
-<mousemove time="6240.000000" x="96" y="120" />
-<mousemove time="6276.000000" x="109" y="127" />
-<mousemove time="6312.000000" x="125" y="134" />
-<mousemove time="6313.000000" x="133" y="139" />
-<mousemove time="6350.000000" x="151" y="143" />
-<mousemove time="6385.000000" x="164" y="147" />
-<mousemove time="6422.000000" x="174" y="150" />
-<mousemove time="6458.000000" x="178" y="152" />
-<mousemove time="6494.000000" x="180" y="153" />
-<mousemove time="7050.000000" x="174" y="153" />
-<mousemove time="7086.000000" x="161" y="146" />
-<mousemove time="7121.000000" x="148" y="135" />
-<mousemove time="7158.000000" x="140" y="126" />
-<mousemove time="7193.000000" x="136" y="124" />
-<mousemove time="7229.000000" x="136" y="123" />
-<mousemove time="7370.000000" x="144" y="125" />
-<mousemove time="7407.000000" x="158" y="134" />
-<mousemove time="7443.000000" x="169" y="141" />
-<mousemove time="7479.000000" x="173" y="147" />
-<mousemove time="7515.000000" x="174" y="148" />
-<mousemove time="7551.000000" x="174" y="150" />
-<mousemove time="7623.000000" x="172" y="152" />
-<mousemove time="7659.000000" x="170" y="154" />
-<mousemove time="7694.000000" x="169" y="155" />
-<mousedown time="7729.000000" button="Left" x="169" y="155" />
-<mousemove time="7836.000000" x="168" y="155" />
-<mousemove time="7872.000000" x="160" y="155" />
-<mousemove time="7908.000000" x="149" y="155" />
-<mousemove time="7945.000000" x="136" y="155" />
-<mousemove time="7945.000000" x="130" y="155" />
-<mousemove time="7981.000000" x="121" y="155" />
-<mousemove time="8017.000000" x="115" y="155" />
-<mousemove time="8053.000000" x="114" y="155" />
-<mousemove time="8053.000000" x="113" y="155" />
-<mousemove time="8227.000000" x="114" y="155" />
-<mousemove time="8263.000000" x="137" y="157" />
-<mousemove time="8300.000000" x="153" y="158" />
-<mousemove time="8335.000000" x="167" y="158" />
-<mousemove time="8370.000000" x="177" y="158" />
-<mousemove time="8407.000000" x="182" y="158" />
-<mousemove time="8441.000000" x="184" y="158" />
-<mouseup time="8682.000000" button="Left" x="184" y="158" />
-<mousemove time="9656.000000" x="183" y="156" />
-<mousemove time="9691.000000" x="175" y="139" />
-<mousemove time="9726.000000" x="165" y="116" />
-<mousemove time="9762.000000" x="160" y="103" />
-<mousemove time="9797.000000" x="159" y="94" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-shapes-nonlineardeformer-play-ui.xml Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-texturing-compositetexture3D-bitmap-play-ui.xml Deleted

@@ -1,43 +0,0 @@
-<TestValidationScript >
-<mousemove time="211.000000" x="100" y="179" />
-<mousemove time="876.000000" x="100" y="132" />
-<mousemove time="917.000000" x="100" y="125" />
-<mousemove time="956.000000" x="99" y="112" />
-<mousemove time="1032.000000" x="99" y="111" />
-<mousedown time="1334.000000" button="Left" x="99" y="111" />
-<mouseup time="1782.000000" button="Left" x="99" y="111" />
-<mousedown time="2310.000000" button="Left" x="99" y="111" />
-<mouseup time="2805.000000" button="Left" x="99" y="111" />
-<mousedown time="3214.000000" button="Left" x="99" y="111" />
-<mouseup time="3544.000000" button="Left" x="99" y="111" />
-<mousemove time="3694.000000" x="99" y="112" />
-<mousemove time="3735.000000" x="105" y="122" />
-<mousemove time="3772.000000" x="117" y="139" />
-<mousemove time="3809.000000" x="136" y="166" />
-<mousemove time="3849.000000" x="142" y="174" />
-<mousemove time="3888.000000" x="146" y="179" />
-<mousemove time="3923.000000" x="147" y="180" />
-<mousemove time="4037.000000" x="143" y="176" />
-<mousemove time="4074.000000" x="129" y="161" />
-<mousemove time="4109.000000" x="121" y="149" />
-<mousemove time="4145.000000" x="112" y="133" />
-<mousemove time="4186.000000" x="107" y="120" />
-<mousemove time="4228.000000" x="103" y="114" />
-<mousedown time="4382.000000" button="Left" x="103" y="114" />
-<mouseup time="4684.000000" button="Left" x="103" y="114" />
-<mousemove time="5698.000000" x="104" y="116" />
-<mousemove time="5699.000000" x="108" y="121" />
-<mousemove time="5736.000000" x="118" y="133" />
-<mousemove time="5776.000000" x="132" y="150" />
-<mousemove time="5816.000000" x="145" y="162" />
-<mousemove time="5854.000000" x="156" y="169" />
-<mousemove time="5894.000000" x="159" y="172" />
-<mousemove time="7619.000000" x="155" y="166" />
-<mousemove time="7660.000000" x="143" y="152" />
-<mousemove time="7696.000000" x="133" y="136" />
-<mousemove time="7736.000000" x="125" y="122" />
-<mousemove time="7772.000000" x="121" y="118" />
-<mousemove time="7812.000000" x="120" y="117" />
-<mousemove time="7850.000000" x="119" y="116" />
-<mousemove time="7925.000000" x="118" y="116" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-viewpoint-bind-jump-play-ui.xml Deleted

@@ -1,65 +0,0 @@
-<TestValidationScript >
-<mousemove time="188.000000" x="118" y="161" />
-<mousemove time="883.000000" x="116" y="116" />
-<mousemove time="917.000000" x="107" y="111" />
-<mousemove time="953.000000" x="98" y="107" />
-<mousemove time="989.000000" x="91" y="104" />
-<mousemove time="1026.000000" x="90" y="103" />
-<mousemove time="1027.000000" x="89" y="103" />
-<mousemove time="1063.000000" x="89" y="102" />
-<mousedown time="1310.000000" button="Left" x="89" y="102" />
-<mouseup time="1451.000000" button="Left" x="89" y="102" />
-<mousemove time="1905.000000" x="89" y="103" />
-<mousemove time="1977.000000" x="89" y="104" />
-<mousemove time="2013.000000" x="89" y="109" />
-<mousemove time="2050.000000" x="90" y="116" />
-<mousemove time="2085.000000" x="92" y="130" />
-<mousemove time="2121.000000" x="95" y="152" />
-<mousemove time="2158.000000" x="97" y="165" />
-<mousemove time="2194.000000" x="97" y="168" />
-<mousemove time="2230.000000" x="97" y="169" />
-<mousemove time="2302.000000" x="97" y="170" />
-<mousemove time="2374.000000" x="95" y="172" />
-<mousemove time="2411.000000" x="91" y="174" />
-<mousemove time="2447.000000" x="88" y="176" />
-<mousemove time="2553.000000" x="87" y="176" />
-<mousedown time="2692.000000" button="Left" x="87" y="176" />
-<mouseup time="2798.000000" button="Left" x="87" y="176" />
-<mousemove time="3111.000000" x="87" y="175" />
-<mousemove time="3147.000000" x="87" y="166" />
-<mousemove time="3183.000000" x="87" y="152" />
-<mousemove time="3219.000000" x="87" y="135" />
-<mousemove time="3255.000000" x="87" y="123" />
-<mousemove time="3291.000000" x="84" y="113" />
-<mousemove time="3328.000000" x="80" y="106" />
-<mousemove time="3364.000000" x="79" y="104" />
-<mousemove time="3400.000000" x="78" y="103" />
-<mousedown time="3645.000000" button="Left" x="78" y="103" />
-<mouseup time="3751.000000" button="Left" x="78" y="103" />
-<mousemove time="3961.000000" x="78" y="104" />
-<mousemove time="3998.000000" x="78" y="117" />
-<mousemove time="4035.000000" x="78" y="134" />
-<mousemove time="4071.000000" x="78" y="149" />
-<mousemove time="4108.000000" x="78" y="158" />
-<mousemove time="4109.000000" x="78" y="161" />
-<mousemove time="4145.000000" x="78" y="164" />
-<mousemove time="4180.000000" x="78" y="165" />
-<mousemove time="4182.000000" x="78" y="166" />
-<mousemove time="4219.000000" x="78" y="169" />
-<mousemove time="4255.000000" x="78" y="171" />
-<mousemove time="4292.000000" x="78" y="173" />
-<mousemove time="4328.000000" x="78" y="174" />
-<mousemove time="4400.000000" x="78" y="175" />
-<mousedown time="4541.000000" button="Left" x="78" y="175" />
-<mouseup time="4646.000000" button="Left" x="78" y="175" />
-<mousemove time="5032.000000" x="79" y="173" />
-<mousemove time="5033.000000" x="81" y="170" />
-<mousemove time="5069.000000" x="87" y="162" />
-<mousemove time="5105.000000" x="94" y="148" />
-<mousemove time="5140.000000" x="100" y="132" />
-<mousemove time="5176.000000" x="105" y="117" />
-<mousemove time="5211.000000" x="107" y="109" />
-<mousemove time="5247.000000" x="108" y="106" />
-<mousemove time="9693.000000" x="109" y="106" />
-<mousemove time="9728.000000" x="109" y="107" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-viewpoint-bind-play-ui.xml Deleted

@@ -1,55 +0,0 @@
-<TestValidationScript >
-<mousemove time="204.000000" x="112" y="179" />
-<mousemove time="204.000000" x="112" y="134" />
-<mousemove time="1641.000000" x="108" y="134" />
-<mousemove time="1676.000000" x="98" y="134" />
-<mousemove time="1711.000000" x="88" y="134" />
-<mousemove time="1749.000000" x="80" y="134" />
-<mousemove time="1786.000000" x="74" y="134" />
-<mousemove time="1824.000000" x="69" y="133" />
-<mousemove time="1863.000000" x="69" y="132" />
-<mousedown time="2074.000000" button="Left" x="69" y="132" />
-<mouseup time="2181.000000" button="Left" x="69" y="132" />
-<mousemove time="3199.000000" x="70" y="136" />
-<mousemove time="3234.000000" x="73" y="143" />
-<mousemove time="3272.000000" x="76" y="152" />
-<mousemove time="3308.000000" x="77" y="160" />
-<mousemove time="3343.000000" x="78" y="166" />
-<mousemove time="3379.000000" x="78" y="171" />
-<mousemove time="3416.000000" x="78" y="175" />
-<mousemove time="3454.000000" x="78" y="177" />
-<mousemove time="3558.000000" x="78" y="178" />
-<mousemove time="3630.000000" x="78" y="180" />
-<mousedown time="3806.000000" button="Left" x="78" y="180" />
-<mouseup time="3877.000000" button="Left" x="78" y="180" />
-<mousemove time="4864.000000" x="77" y="177" />
-<mousemove time="4903.000000" x="74" y="170" />
-<mousemove time="4938.000000" x="68" y="161" />
-<mousemove time="4974.000000" x="65" y="154" />
-<mousemove time="5014.000000" x="61" y="147" />
-<mousemove time="5015.000000" x="60" y="143" />
-<mousemove time="5052.000000" x="57" y="139" />
-<mousemove time="5088.000000" x="57" y="138" />
-<mousemove time="5125.000000" x="57" y="137" />
-<mousemove time="5162.000000" x="56" y="137" />
-<mousedown time="5270.000000" button="Left" x="56" y="137" />
-<mouseup time="5307.000000" button="Left" x="56" y="137" />
-<mousemove time="6152.000000" x="56" y="136" />
-<mousemove time="6536.000000" x="56" y="139" />
-<mousemove time="6572.000000" x="59" y="147" />
-<mousemove time="6608.000000" x="63" y="155" />
-<mousemove time="6642.000000" x="65" y="160" />
-<mousemove time="6676.000000" x="66" y="162" />
-<mousemove time="6712.000000" x="69" y="165" />
-<mousemove time="6749.000000" x="72" y="168" />
-<mousemove time="6751.000000" x="72" y="169" />
-<mousemove time="6787.000000" x="73" y="170" />
-<mousemove time="6893.000000" x="73" y="171" />
-<mousemove time="6929.000000" x="74" y="171" />
-<mousemove time="6965.000000" x="74" y="172" />
-<mousemove time="7003.000000" x="75" y="173" />
-<mousemove time="7039.000000" x="75" y="174" />
-<mousemove time="7110.000000" x="75" y="175" />
-<mousedown time="7181.000000" button="Left" x="75" y="175" />
-<mouseup time="7289.000000" button="Left" x="75" y="175" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-3D-viewpoint-ortho-bind-play-ui.xml Deleted

@@ -1,56 +0,0 @@
-<TestValidationScript >
-<mousemove time="1518.000000" x="102" y="167" />
-<mousemove time="1554.000000" x="84" y="140" />
-<mousemove time="1589.000000" x="75" y="119" />
-<mousemove time="1625.000000" x="71" y="105" />
-<mousemove time="1661.000000" x="68" y="100" />
-<mousemove time="1732.000000" x="68" y="99" />
-<mousedown time="1942.000000" button="Left" x="68" y="99" />
-<mouseup time="2011.000000" button="Left" x="68" y="99" />
-<mousemove time="3098.000000" x="68" y="100" />
-<mousemove time="3135.000000" x="68" y="112" />
-<mousemove time="3172.000000" x="68" y="129" />
-<mousemove time="3209.000000" x="68" y="144" />
-<mousemove time="3244.000000" x="68" y="157" />
-<mousemove time="3282.000000" x="68" y="161" />
-<mousemove time="3318.000000" x="68" y="164" />
-<mousemove time="3355.000000" x="68" y="166" />
-<mousemove time="3428.000000" x="68" y="168" />
-<mousedown time="3573.000000" button="Left" x="68" y="168" />
-<mouseup time="3714.000000" button="Left" x="68" y="168" />
-<mousemove time="4789.000000" x="68" y="167" />
-<mousemove time="4825.000000" x="69" y="165" />
-<mousemove time="4860.000000" x="71" y="162" />
-<mousemove time="4895.000000" x="72" y="156" />
-<mousemove time="4930.000000" x="73" y="152" />
-<mousemove time="4965.000000" x="73" y="144" />
-<mousemove time="5000.000000" x="72" y="135" />
-<mousemove time="5035.000000" x="72" y="126" />
-<mousemove time="5072.000000" x="72" y="120" />
-<mousemove time="5107.000000" x="72" y="117" />
-<mousemove time="5143.000000" x="72" y="114" />
-<mousemove time="5144.000000" x="72" y="113" />
-<mousemove time="5180.000000" x="72" y="111" />
-<mousemove time="5252.000000" x="72" y="110" />
-<mousemove time="5461.000000" x="72" y="111" />
-<mousemove time="5498.000000" x="79" y="122" />
-<mousemove time="5534.000000" x="86" y="134" />
-<mousemove time="5570.000000" x="89" y="141" />
-<mousemove time="5606.000000" x="91" y="146" />
-<mousemove time="5641.000000" x="92" y="148" />
-<mousemove time="5676.000000" x="92" y="149" />
-<mousemove time="6017.000000" x="92" y="148" />
-<mousemove time="6052.000000" x="89" y="141" />
-<mousemove time="6087.000000" x="83" y="126" />
-<mousemove time="6124.000000" x="79" y="115" />
-<mousemove time="6160.000000" x="77" y="110" />
-<mousemove time="6196.000000" x="77" y="106" />
-<mousemove time="6268.000000" x="77" y="105" />
-<mousemove time="7580.000000" x="77" y="106" />
-<mousemove time="7617.000000" x="81" y="112" />
-<mousemove time="7617.000000" x="84" y="118" />
-<mousemove time="7652.000000" x="88" y="126" />
-<mousemove time="7687.000000" x="90" y="132" />
-<mousemove time="7722.000000" x="92" y="137" />
-<mousemove time="7757.000000" x="93" y="139" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-bitmap-image-meter-metrics-play-ui.xml Deleted

@@ -1,96 +0,0 @@
-<TestValidationScript >
-<mousemove time="174.000000" x="94" y="157" />
-<mousemove time="876.000000" x="94" y="113" />
-<mousemove time="912.000000" x="96" y="124" />
-<mousemove time="948.000000" x="100" y="138" />
-<mousemove time="984.000000" x="105" y="148" />
-<mousemove time="1020.000000" x="108" y="161" />
-<mousemove time="1054.000000" x="109" y="171" />
-<mousemove time="1090.000000" x="111" y="175" />
-<mousemove time="1123.000000" x="111" y="176" />
-<mousemove time="1193.000000" x="111" y="175" />
-<mousemove time="1228.000000" x="111" y="171" />
-<mousemove time="1264.000000" x="110" y="162" />
-<mousemove time="1299.000000" x="108" y="148" />
-<mousemove time="1334.000000" x="107" y="135" />
-<mousemove time="1370.000000" x="107" y="124" />
-<mousemove time="1370.000000" x="107" y="122" />
-<mousemove time="1405.000000" x="107" y="120" />
-<mousedown time="1748.000000" button="Left" x="107" y="120" />
-<mousemove time="1955.000000" x="107" y="117" />
-<mousemove time="1992.000000" x="107" y="110" />
-<mousemove time="2028.000000" x="107" y="102" />
-<mousemove time="2065.000000" x="107" y="94" />
-<mousemove time="2101.000000" x="107" y="88" />
-<mousemove time="2136.000000" x="108" y="84" />
-<mousemove time="2172.000000" x="113" y="79" />
-<mousemove time="2208.000000" x="117" y="76" />
-<mousemove time="2245.000000" x="120" y="75" />
-<mousemove time="2282.000000" x="122" y="73" />
-<mousemove time="2318.000000" x="124" y="73" />
-<mousemove time="2354.000000" x="125" y="72" />
-<mousemove time="2388.000000" x="126" y="72" />
-<mousemove time="2494.000000" x="122" y="72" />
-<mousemove time="2530.000000" x="115" y="73" />
-<mousemove time="2566.000000" x="107" y="74" />
-<mousemove time="2602.000000" x="100" y="77" />
-<mousemove time="2639.000000" x="95" y="81" />
-<mousemove time="2639.000000" x="92" y="83" />
-<mousemove time="2676.000000" x="87" y="88" />
-<mousemove time="2712.000000" x="84" y="92" />
-<mousemove time="2748.000000" x="82" y="98" />
-<mousemove time="2785.000000" x="82" y="106" />
-<mousemove time="2820.000000" x="82" y="114" />
-<mousemove time="2856.000000" x="85" y="124" />
-<mousemove time="2892.000000" x="91" y="134" />
-<mousemove time="2929.000000" x="97" y="140" />
-<mousemove time="2964.000000" x="103" y="143" />
-<mousemove time="3001.000000" x="113" y="143" />
-<mousemove time="3036.000000" x="120" y="143" />
-<mousemove time="3073.000000" x="126" y="140" />
-<mousemove time="3108.000000" x="132" y="136" />
-<mousemove time="3145.000000" x="135" y="131" />
-<mousemove time="3180.000000" x="137" y="126" />
-<mousemove time="3217.000000" x="138" y="120" />
-<mousemove time="3254.000000" x="138" y="115" />
-<mousemove time="3289.000000" x="138" y="111" />
-<mousemove time="3326.000000" x="135" y="105" />
-<mousemove time="3363.000000" x="127" y="99" />
-<mousemove time="3363.000000" x="123" y="97" />
-<mousemove time="3400.000000" x="112" y="93" />
-<mousemove time="3436.000000" x="103" y="92" />
-<mousemove time="3472.000000" x="95" y="92" />
-<mousemove time="3508.000000" x="89" y="92" />
-<mousemove time="3545.000000" x="86" y="95" />
-<mousemove time="3581.000000" x="85" y="101" />
-<mousemove time="3617.000000" x="85" y="111" />
-<mousemove time="3654.000000" x="87" y="120" />
-<mousemove time="3688.000000" x="91" y="130" />
-<mousemove time="3724.000000" x="96" y="140" />
-<mousemove time="3725.000000" x="98" y="145" />
-<mousemove time="3763.000000" x="103" y="149" />
-<mousemove time="3798.000000" x="108" y="152" />
-<mousemove time="3835.000000" x="114" y="153" />
-<mousemove time="3871.000000" x="122" y="153" />
-<mousemove time="3908.000000" x="130" y="150" />
-<mousemove time="3944.000000" x="135" y="145" />
-<mousemove time="3981.000000" x="137" y="139" />
-<mousemove time="4017.000000" x="138" y="126" />
-<mousemove time="4053.000000" x="133" y="103" />
-<mousemove time="4089.000000" x="125" y="93" />
-<mousemove time="4126.000000" x="117" y="90" />
-<mousemove time="4162.000000" x="111" y="90" />
-<mousemove time="4199.000000" x="107" y="90" />
-<mousemove time="4236.000000" x="104" y="97" />
-<mousemove time="4272.000000" x="103" y="105" />
-<mousemove time="4306.000000" x="103" y="112" />
-<mousemove time="4342.000000" x="103" y="120" />
-<mousemove time="4378.000000" x="103" y="122" />
-<mousemove time="4414.000000" x="103" y="123" />
-<mouseup time="4485.000000" button="Left" x="103" y="123" />
-<mousemove time="6221.000000" x="109" y="132" />
-<mousemove time="6257.000000" x="126" y="160" />
-<mousemove time="6292.000000" x="140" y="181" />
-<mousemove time="6327.000000" x="149" y="191" />
-<mousemove time="6361.000000" x="153" y="194" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-bitmap-image-pixel-metrics-play-ui.xml Deleted

@@ -1,109 +0,0 @@
-<TestValidationScript >
-<mousemove time="886.000000" x="149" y="191" />
-<mousemove time="920.000000" x="137" y="173" />
-<mousemove time="956.000000" x="125" y="153" />
-<mousemove time="990.000000" x="117" y="135" />
-<mousemove time="1025.000000" x="113" y="125" />
-<mousemove time="1061.000000" x="111" y="117" />
-<mousemove time="1096.000000" x="110" y="115" />
-<mousemove time="1199.000000" x="110" y="114" />
-<mousemove time="1235.000000" x="109" y="114" />
-<mousedown time="1511.000000" button="Left" x="109" y="114" />
-<mousemove time="1714.000000" x="110" y="112" />
-<mousemove time="1750.000000" x="116" y="108" />
-<mousemove time="1751.000000" x="118" y="106" />
-<mousemove time="1786.000000" x="125" y="100" />
-<mousemove time="1823.000000" x="131" y="94" />
-<mousemove time="1858.000000" x="141" y="84" />
-<mousemove time="1894.000000" x="151" y="72" />
-<mousemove time="1930.000000" x="157" y="64" />
-<mousemove time="1966.000000" x="159" y="61" />
-<mousemove time="2002.000000" x="159" y="59" />
-<mousemove time="2038.000000" x="157" y="56" />
-<mousemove time="2074.000000" x="151" y="54" />
-<mousemove time="2111.000000" x="139" y="53" />
-<mousemove time="2146.000000" x="128" y="53" />
-<mousemove time="2182.000000" x="112" y="57" />
-<mousemove time="2217.000000" x="95" y="63" />
-<mousemove time="2254.000000" x="78" y="69" />
-<mousemove time="2290.000000" x="71" y="71" />
-<mousemove time="2327.000000" x="64" y="75" />
-<mousemove time="2364.000000" x="59" y="79" />
-<mousemove time="2400.000000" x="56" y="84" />
-<mousemove time="2436.000000" x="54" y="95" />
-<mousemove time="2472.000000" x="54" y="106" />
-<mousemove time="2508.000000" x="54" y="118" />
-<mousemove time="2544.000000" x="57" y="130" />
-<mousemove time="2580.000000" x="65" y="141" />
-<mousemove time="2580.000000" x="70" y="147" />
-<mousemove time="2616.000000" x="81" y="153" />
-<mousemove time="2652.000000" x="91" y="157" />
-<mousemove time="2689.000000" x="104" y="159" />
-<mousemove time="2724.000000" x="116" y="159" />
-<mousemove time="2761.000000" x="131" y="152" />
-<mousemove time="2797.000000" x="146" y="144" />
-<mousemove time="2832.000000" x="157" y="135" />
-<mousemove time="2867.000000" x="164" y="125" />
-<mousemove time="2904.000000" x="167" y="113" />
-<mousemove time="2940.000000" x="168" y="100" />
-<mousemove time="2977.000000" x="164" y="82" />
-<mousemove time="3012.000000" x="154" y="73" />
-<mousemove time="3047.000000" x="142" y="66" />
-<mousemove time="3083.000000" x="126" y="64" />
-<mousemove time="3120.000000" x="112" y="64" />
-<mousemove time="3156.000000" x="97" y="65" />
-<mousemove time="3192.000000" x="86" y="70" />
-<mousemove time="3229.000000" x="79" y="75" />
-<mousemove time="3265.000000" x="73" y="82" />
-<mousemove time="3300.000000" x="67" y="91" />
-<mousemove time="3337.000000" x="64" y="104" />
-<mousemove time="3374.000000" x="62" y="118" />
-<mousemove time="3410.000000" x="62" y="129" />
-<mousemove time="3445.000000" x="64" y="139" />
-<mousemove time="3481.000000" x="71" y="148" />
-<mousemove time="3516.000000" x="81" y="153" />
-<mousemove time="3552.000000" x="94" y="156" />
-<mousemove time="3588.000000" x="105" y="158" />
-<mousemove time="3624.000000" x="118" y="158" />
-<mousemove time="3660.000000" x="129" y="156" />
-<mousemove time="3696.000000" x="140" y="151" />
-<mousemove time="3732.000000" x="147" y="148" />
-<mousemove time="3768.000000" x="150" y="147" />
-<mousemove time="3804.000000" x="151" y="147" />
-<mousemove time="3943.000000" x="139" y="147" />
-<mousemove time="3979.000000" x="120" y="145" />
-<mousemove time="4015.000000" x="99" y="139" />
-<mousemove time="4051.000000" x="81" y="133" />
-<mousemove time="4086.000000" x="70" y="125" />
-<mousemove time="4123.000000" x="65" y="120" />
-<mousemove time="4160.000000" x="61" y="113" />
-<mousemove time="4196.000000" x="61" y="102" />
-<mousemove time="4197.000000" x="64" y="95" />
-<mousemove time="4232.000000" x="76" y="79" />
-<mousemove time="4269.000000" x="87" y="68" />
-<mousemove time="4305.000000" x="101" y="61" />
-<mousemove time="4341.000000" x="114" y="59" />
-<mousemove time="4377.000000" x="127" y="59" />
-<mousemove time="4413.000000" x="138" y="62" />
-<mousemove time="4450.000000" x="146" y="71" />
-<mousemove time="4486.000000" x="151" y="80" />
-<mousemove time="4522.000000" x="152" y="93" />
-<mousemove time="4559.000000" x="150" y="117" />
-<mousemove time="4594.000000" x="145" y="129" />
-<mousemove time="4630.000000" x="140" y="138" />
-<mousemove time="4666.000000" x="131" y="143" />
-<mousemove time="4703.000000" x="120" y="145" />
-<mousemove time="4738.000000" x="106" y="147" />
-<mousemove time="4775.000000" x="95" y="147" />
-<mousemove time="4810.000000" x="89" y="147" />
-<mousemove time="4846.000000" x="86" y="147" />
-<mousemove time="4882.000000" x="84" y="148" />
-<mousemove time="4918.000000" x="82" y="149" />
-<mousemove time="4954.000000" x="79" y="149" />
-<mouseup time="5026.000000" button="Left" x="79" y="149" />
-<mousemove time="5438.000000" x="82" y="149" />
-<mousemove time="5473.000000" x="106" y="161" />
-<mousemove time="5509.000000" x="140" y="171" />
-<mousemove time="5544.000000" x="177" y="180" />
-<mousemove time="5579.000000" x="193" y="183" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-cachetexture_nocache-play-ui.xml Deleted

@@ -1,64 +0,0 @@
-<TestValidationScript >
-<mousemove time="842.000000" x="183" y="177" />
-<mousemove time="876.000000" x="160" y="157" />
-<mousemove time="911.000000" x="127" y="126" />
-<mousemove time="947.000000" x="111" y="110" />
-<mousemove time="983.000000" x="104" y="100" />
-<mousemove time="1018.000000" x="103" y="97" />
-<mousedown time="1906.000000" button="Left" x="103" y="97" />
-<mousemove time="2114.000000" x="104" y="97" />
-<mousemove time="2150.000000" x="111" y="102" />
-<mousemove time="2187.000000" x="118" y="108" />
-<mousemove time="2224.000000" x="123" y="115" />
-<mousemove time="2259.000000" x="126" y="124" />
-<mousemove time="2297.000000" x="129" y="132" />
-<mousemove time="2333.000000" x="130" y="138" />
-<mousemove time="2368.000000" x="131" y="140" />
-<mousemove time="2404.000000" x="132" y="140" />
-<mousemove time="2542.000000" x="132" y="139" />
-<mousemove time="2578.000000" x="128" y="133" />
-<mousemove time="2579.000000" x="124" y="128" />
-<mousemove time="2617.000000" x="116" y="117" />
-<mousemove time="2654.000000" x="109" y="105" />
-<mousemove time="2691.000000" x="102" y="91" />
-<mousemove time="2727.000000" x="98" y="82" />
-<mousemove time="2763.000000" x="94" y="72" />
-<mousemove time="2799.000000" x="90" y="66" />
-<mousemove time="2836.000000" x="83" y="62" />
-<mousemove time="2876.000000" x="72" y="59" />
-<mousemove time="2913.000000" x="65" y="59" />
-<mousemove time="2950.000000" x="59" y="61" />
-<mousemove time="2987.000000" x="55" y="68" />
-<mousemove time="3023.000000" x="52" y="75" />
-<mousemove time="3060.000000" x="51" y="82" />
-<mousemove time="3096.000000" x="51" y="91" />
-<mousemove time="3133.000000" x="53" y="99" />
-<mousemove time="3169.000000" x="60" y="108" />
-<mousemove time="3206.000000" x="65" y="118" />
-<mousemove time="3242.000000" x="71" y="126" />
-<mousemove time="3279.000000" x="77" y="129" />
-<mousemove time="3316.000000" x="84" y="131" />
-<mousemove time="3353.000000" x="93" y="132" />
-<mousemove time="3389.000000" x="102" y="132" />
-<mousemove time="3390.000000" x="108" y="132" />
-<mousemove time="3426.000000" x="119" y="127" />
-<mousemove time="3462.000000" x="129" y="119" />
-<mousemove time="3499.000000" x="136" y="110" />
-<mousemove time="3536.000000" x="141" y="103" />
-<mousemove time="3573.000000" x="143" y="96" />
-<mousemove time="3609.000000" x="145" y="87" />
-<mousemove time="3646.000000" x="145" y="80" />
-<mousemove time="3647.000000" x="145" y="76" />
-<mousemove time="3683.000000" x="139" y="68" />
-<mousemove time="3720.000000" x="129" y="63" />
-<mousemove time="3757.000000" x="119" y="61" />
-<mousemove time="3793.000000" x="108" y="59" />
-<mousemove time="3834.000000" x="101" y="59" />
-<mousemove time="3835.000000" x="98" y="59" />
-<mousemove time="3872.000000" x="92" y="59" />
-<mousemove time="3908.000000" x="87" y="61" />
-<mousemove time="3945.000000" x="84" y="63" />
-<mousemove time="3981.000000" x="83" y="65" />
-<mousemove time="4016.000000" x="83" y="66" />
-<mouseup time="4121.000000" button="Left" x="83" y="66" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-command-proto-delete-play-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-command-protolist-delete-play-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-game-arrange-play-ui.xml Deleted

@@ -1,118 +0,0 @@
-<TestValidationScript >
-<mousemove time="207.000000" x="83" y="111" />
-<mousemove time="1079.000000" x="84" y="65" />
-<mousemove time="1114.000000" x="89" y="57" />
-<mousemove time="1149.000000" x="93" y="50" />
-<mousemove time="1184.000000" x="96" y="42" />
-<mousemove time="1218.000000" x="99" y="38" />
-<mousemove time="1253.000000" x="100" y="35" />
-<mousemove time="1288.000000" x="101" y="30" />
-<mousemove time="1322.000000" x="101" y="27" />
-<mousedown time="1629.000000" button="Left" x="101" y="27" />
-<mouseup time="1769.000000" button="Left" x="101" y="27" />
-<mousemove time="2247.000000" x="101" y="33" />
-<mousemove time="2283.000000" x="101" y="47" />
-<mousemove time="2284.000000" x="101" y="54" />
-<mousemove time="2319.000000" x="101" y="69" />
-<mousemove time="2353.000000" x="101" y="78" />
-<mousemove time="2387.000000" x="102" y="83" />
-<mousemove time="2423.000000" x="102" y="90" />
-<mousemove time="2458.000000" x="101" y="96" />
-<mousemove time="2494.000000" x="97" y="102" />
-<mousemove time="2529.000000" x="93" y="106" />
-<mousemove time="2565.000000" x="90" y="108" />
-<mousemove time="2600.000000" x="87" y="111" />
-<mousemove time="2635.000000" x="87" y="112" />
-<mousemove time="2669.000000" x="84" y="113" />
-<mousemove time="2705.000000" x="81" y="116" />
-<mousemove time="2741.000000" x="79" y="117" />
-<mousemove time="2777.000000" x="79" y="118" />
-<mousemove time="2813.000000" x="78" y="119" />
-<mousemove time="2849.000000" x="76" y="120" />
-<mousemove time="2884.000000" x="75" y="121" />
-<mousemove time="2954.000000" x="75" y="120" />
-<mousemove time="2989.000000" x="79" y="114" />
-<mousemove time="3025.000000" x="85" y="107" />
-<mousemove time="3061.000000" x="89" y="104" />
-<mousemove time="3097.000000" x="90" y="103" />
-<mousedown time="3476.000000" button="Left" x="90" y="103" />
-<mouseup time="3580.000000" button="Left" x="90" y="103" />
-<mousemove time="3718.000000" x="89" y="103" />
-<mousemove time="3754.000000" x="83" y="103" />
-<mousemove time="3790.000000" x="81" y="103" />
-<mousemove time="3928.000000" x="81" y="102" />
-<mousemove time="3997.000000" x="80" y="102" />
-<mousedown time="4104.000000" button="Left" x="80" y="102" />
-<mouseup time="4211.000000" button="Left" x="80" y="102" />
-<mousemove time="4386.000000" x="80" y="105" />
-<mousemove time="4422.000000" x="80" y="112" />
-<mousemove time="4457.000000" x="80" y="118" />
-<mousemove time="4492.000000" x="80" y="122" />
-<mousemove time="4527.000000" x="79" y="123" />
-<mousedown time="4733.000000" button="Left" x="79" y="123" />
-<mouseup time="4839.000000" button="Left" x="79" y="123" />
-<mousemove time="5012.000000" x="81" y="123" />
-<mousemove time="5048.000000" x="91" y="123" />
-<mousemove time="5082.000000" x="100" y="124" />
-<mousemove time="5119.000000" x="107" y="126" />
-<mousemove time="5154.000000" x="110" y="126" />
-<mousemove time="5189.000000" x="112" y="126" />
-<mousemove time="5190.000000" x="113" y="126" />
-<mousemove time="5226.000000" x="114" y="126" />
-<mousemove time="5295.000000" x="115" y="126" />
-<mousemove time="5365.000000" x="116" y="126" />
-<mousemove time="5470.000000" x="117" y="126" />
-<mousedown time="5471.000000" button="Left" x="117" y="126" />
-<mouseup time="5575.000000" button="Left" x="117" y="126" />
-<mousemove time="5781.000000" x="117" y="128" />
-<mousemove time="5815.000000" x="117" y="134" />
-<mousemove time="5850.000000" x="117" y="142" />
-<mousemove time="5887.000000" x="117" y="146" />
-<mousemove time="5922.000000" x="117" y="148" />
-<mousedown time="6400.000000" button="Left" x="117" y="148" />
-<mouseup time="6537.000000" button="Left" x="117" y="148" />
-<mousemove time="6776.000000" x="116" y="148" />
-<mousemove time="6812.000000" x="111" y="148" />
-<mousemove time="6848.000000" x="106" y="148" />
-<mousemove time="6848.000000" x="105" y="148" />
-<mousemove time="6917.000000" x="102" y="148" />
-<mousemove time="6952.000000" x="97" y="148" />
-<mousemove time="6988.000000" x="91" y="148" />
-<mousemove time="7023.000000" x="87" y="148" />
-<mousemove time="7060.000000" x="85" y="148" />
-<mousemove time="7095.000000" x="81" y="149" />
-<mousemove time="7131.000000" x="75" y="151" />
-<mousemove time="7166.000000" x="74" y="151" />
-<mousemove time="7202.000000" x="73" y="151" />
-<mousedown time="7477.000000" button="Left" x="73" y="151" />
-<mouseup time="7615.000000" button="Left" x="73" y="151" />
-<mousemove time="7788.000000" x="76" y="145" />
-<mousemove time="7824.000000" x="80" y="138" />
-<mousemove time="7858.000000" x="83" y="134" />
-<mousemove time="7894.000000" x="84" y="132" />
-<mousemove time="7963.000000" x="84" y="130" />
-<mousemove time="7999.000000" x="83" y="129" />
-<mousemove time="8035.000000" x="80" y="128" />
-<mousemove time="8071.000000" x="78" y="126" />
-<mousemove time="8176.000000" x="77" y="126" />
-<mousedown time="8247.000000" button="Left" x="77" y="126" />
-<mouseup time="8386.000000" button="Left" x="77" y="126" />
-<mousemove time="8561.000000" x="78" y="126" />
-<mousemove time="8597.000000" x="83" y="126" />
-<mousemove time="8631.000000" x="88" y="126" />
-<mousemove time="8667.000000" x="93" y="126" />
-<mousedown time="8840.000000" button="Left" x="93" y="126" />
-<mouseup time="8978.000000" button="Left" x="93" y="126" />
-<mousemove time="9117.000000" x="93" y="125" />
-<mousemove time="9153.000000" x="93" y="116" />
-<mousemove time="9189.000000" x="95" y="103" />
-<mousemove time="9224.000000" x="97" y="95" />
-<mousemove time="9259.000000" x="97" y="93" />
-<mousedown time="9431.000000" button="Left" x="97" y="93" />
-<mouseup time="9535.000000" button="Left" x="97" y="93" />
-<mousemove time="9673.000000" x="99" y="93" />
-<mousemove time="9709.000000" x="106" y="93" />
-<mousemove time="9744.000000" x="111" y="93" />
-<mousemove time="9779.000000" x="113" y="93" />
-<mousemove time="9780.000000" x="114" y="93" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-game-arrange.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-game-breakout-play-ui.xml Deleted

@@ -1,79 +0,0 @@
-<TestValidationScript >
-<mousemove time="214.000000" x="116" y="138" />
-<mousemove time="215.000000" x="116" y="95" />
-<mousemove time="746.000000" x="116" y="96" />
-<mousemove time="783.000000" x="115" y="102" />
-<mousemove time="784.000000" x="113" y="105" />
-<mousemove time="819.000000" x="110" y="112" />
-<mousemove time="854.000000" x="108" y="116" />
-<mousemove time="890.000000" x="106" y="118" />
-<mousemove time="924.000000" x="106" y="119" />
-<mousemove time="960.000000" x="106" y="120" />
-<mousemove time="996.000000" x="105" y="120" />
-<mousemove time="1099.000000" x="104" y="121" />
-<mousemove time="1135.000000" x="103" y="122" />
-<mousemove time="1170.000000" x="101" y="123" />
-<mousemove time="1171.000000" x="101" y="124" />
-<mousedown time="1378.000000" button="Left" x="101" y="124" />
-<mouseup time="1485.000000" button="Left" x="101" y="124" />
-<mousemove time="1836.000000" x="100" y="124" />
-<mousemove time="1872.000000" x="96" y="125" />
-<mousemove time="1909.000000" x="90" y="125" />
-<mousemove time="1945.000000" x="85" y="125" />
-<mousemove time="1981.000000" x="82" y="125" />
-<mousemove time="2017.000000" x="80" y="127" />
-<mousemove time="2058.000000" x="78" y="127" />
-<mousemove time="2095.000000" x="74" y="131" />
-<mousemove time="2132.000000" x="70" y="133" />
-<mousemove time="2169.000000" x="66" y="135" />
-<mousemove time="2205.000000" x="61" y="135" />
-<mousemove time="2240.000000" x="53" y="135" />
-<mousemove time="2275.000000" x="50" y="135" />
-<mousemove time="2312.000000" x="49" y="135" />
-<mousemove time="2383.000000" x="49" y="136" />
-<mousemove time="3818.000000" x="48" y="136" />
-<mousemove time="3854.000000" x="46" y="136" />
-<mousemove time="3891.000000" x="43" y="137" />
-<mousemove time="3927.000000" x="42" y="137" />
-<mousemove time="4623.000000" x="44" y="137" />
-<mousemove time="4659.000000" x="46" y="137" />
-<mousemove time="4695.000000" x="48" y="138" />
-<mousemove time="4767.000000" x="54" y="138" />
-<mousemove time="4804.000000" x="60" y="138" />
-<mousemove time="4840.000000" x="65" y="138" />
-<mousemove time="4876.000000" x="68" y="138" />
-<mousemove time="4913.000000" x="69" y="138" />
-<mousemove time="4948.000000" x="70" y="138" />
-<mousemove time="6137.000000" x="71" y="138" />
-<mousemove time="6173.000000" x="77" y="138" />
-<mousemove time="6208.000000" x="84" y="138" />
-<mousemove time="6245.000000" x="87" y="138" />
-<mousemove time="6280.000000" x="88" y="138" />
-<mousemove time="6316.000000" x="89" y="138" />
-<mousemove time="6352.000000" x="91" y="138" />
-<mousemove time="6388.000000" x="92" y="138" />
-<mousemove time="6424.000000" x="93" y="138" />
-<mousemove time="6460.000000" x="94" y="138" />
-<mousemove time="6496.000000" x="95" y="138" />
-<mousemove time="6532.000000" x="95" y="137" />
-<mousemove time="6603.000000" x="96" y="137" />
-<mousemove time="6640.000000" x="98" y="137" />
-<mousemove time="6676.000000" x="101" y="137" />
-<mousemove time="6713.000000" x="103" y="136" />
-<mousemove time="6750.000000" x="104" y="136" />
-<mousemove time="6854.000000" x="106" y="136" />
-<mousemove time="7309.000000" x="107" y="136" />
-<mousemove time="7344.000000" x="108" y="136" />
-<mousemove time="9398.000000" x="106" y="136" />
-<mousemove time="9399.000000" x="102" y="136" />
-<mousemove time="9435.000000" x="92" y="138" />
-<mousemove time="9471.000000" x="82" y="139" />
-<mousemove time="9507.000000" x="76" y="140" />
-<mousemove time="9543.000000" x="73" y="140" />
-<mousemove time="9579.000000" x="71" y="140" />
-<mousemove time="9651.000000" x="68" y="140" />
-<mousemove time="9688.000000" x="61" y="141" />
-<mousemove time="9725.000000" x="55" y="143" />
-<mousemove time="9726.000000" x="53" y="143" />
-<mousemove time="9867.000000" x="52" y="143" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-game-breakout.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-game-bubble-play-ui.xml Deleted

@@ -1,109 +0,0 @@
-<TestValidationScript >
-<mousemove time="333.000000" x="80" y="188" />
-<mousemove time="1099.000000" x="81" y="141" />
-<mousemove time="1102.000000" x="83" y="137" />
-<mousemove time="1153.000000" x="88" y="126" />
-<mousemove time="1193.000000" x="90" y="120" />
-<mousemove time="1243.000000" x="90" y="112" />
-<mousemove time="1281.000000" x="90" y="109" />
-<mousemove time="1318.000000" x="90" y="106" />
-<mousemove time="1761.000000" x="90" y="107" />
-<mousemove time="1799.000000" x="89" y="109" />
-<mousemove time="1836.000000" x="86" y="113" />
-<mousemove time="1874.000000" x="84" y="115" />
-<mousemove time="1876.000000" x="83" y="115" />
-<mousemove time="1914.000000" x="81" y="115" />
-<mousemove time="1951.000000" x="78" y="115" />
-<mousemove time="1989.000000" x="77" y="115" />
-<mousemove time="2095.000000" x="77" y="114" />
-<mousedown time="2408.000000" button="Left" x="77" y="114" />
-<mouseup time="2510.000000" button="Left" x="77" y="114" />
-<mousemove time="2755.000000" x="79" y="114" />
-<mousemove time="2805.000000" x="81" y="114" />
-<mousemove time="2875.000000" x="82" y="114" />
-<mousedown time="3187.000000" button="Left" x="82" y="114" />
-<mouseup time="3271.000000" button="Left" x="82" y="114" />
-<mousemove time="3678.000000" x="81" y="113" />
-<mousemove time="3715.000000" x="79" y="111" />
-<mousemove time="3716.000000" x="78" y="109" />
-<mousemove time="3756.000000" x="75" y="106" />
-<mousemove time="3809.000000" x="72" y="100" />
-<mousemove time="3847.000000" x="69" y="97" />
-<mousemove time="3885.000000" x="68" y="94" />
-<mousemove time="3889.000000" x="67" y="92" />
-<mousemove time="3938.000000" x="63" y="90" />
-<mousemove time="3940.000000" x="61" y="88" />
-<mousemove time="3980.000000" x="58" y="86" />
-<mousemove time="4029.000000" x="53" y="85" />
-<mousemove time="4102.000000" x="52" y="85" />
-<mousemove time="4139.000000" x="50" y="84" />
-<mousemove time="4177.000000" x="48" y="84" />
-<mousemove time="4215.000000" x="45" y="83" />
-<mousemove time="4287.000000" x="45" y="82" />
-<mousemove time="4325.000000" x="45" y="81" />
-<mousemove time="4361.000000" x="44" y="80" />
-<mousemove time="4402.000000" x="43" y="78" />
-<mousemove time="4452.000000" x="42" y="78" />
-<mousemove time="4559.000000" x="42" y="77" />
-<mousemove time="4597.000000" x="42" y="76" />
-<mousedown time="4840.000000" button="Left" x="42" y="76" />
-<mouseup time="4923.000000" button="Left" x="42" y="76" />
-<mousemove time="5199.000000" x="40" y="76" />
-<mousemove time="5200.000000" x="39" y="76" />
-<mousemove time="5237.000000" x="35" y="77" />
-<mousemove time="5275.000000" x="31" y="78" />
-<mousemove time="5314.000000" x="28" y="79" />
-<mousemove time="5361.000000" x="27" y="80" />
-<mousemove time="5399.000000" x="27" y="83" />
-<mousemove time="5437.000000" x="27" y="89" />
-<mousemove time="5475.000000" x="27" y="95" />
-<mousemove time="5515.000000" x="27" y="99" />
-<mousemove time="5563.000000" x="27" y="105" />
-<mousemove time="5601.000000" x="27" y="107" />
-<mousemove time="5639.000000" x="28" y="107" />
-<mousemove time="5676.000000" x="28" y="108" />
-<mousedown time="5952.000000" button="Left" x="28" y="108" />
-<mouseup time="6036.000000" button="Left" x="28" y="108" />
-<mousemove time="6311.000000" x="29" y="112" />
-<mousemove time="6349.000000" x="33" y="115" />
-<mousemove time="6387.000000" x="38" y="117" />
-<mousemove time="6424.000000" x="40" y="118" />
-<mousemove time="6426.000000" x="41" y="118" />
-<mousemove time="6463.000000" x="43" y="118" />
-<mousemove time="6500.000000" x="47" y="118" />
-<mousemove time="6537.000000" x="48" y="118" />
-<mousemove time="6574.000000" x="53" y="118" />
-<mousemove time="6610.000000" x="56" y="118" />
-<mousemove time="6647.000000" x="58" y="118" />
-<mousemove time="6687.000000" x="59" y="119" />
-<mousemove time="6737.000000" x="60" y="119" />
-<mousedown time="6944.000000" button="Left" x="60" y="119" />
-<mouseup time="7049.000000" button="Left" x="60" y="119" />
-<mousemove time="7256.000000" x="62" y="119" />
-<mousemove time="7294.000000" x="67" y="119" />
-<mousemove time="7342.000000" x="70" y="118" />
-<mousemove time="7380.000000" x="70" y="117" />
-<mousemove time="7455.000000" x="70" y="114" />
-<mousemove time="7457.000000" x="70" y="112" />
-<mousemove time="7506.000000" x="69" y="109" />
-<mousemove time="7508.000000" x="69" y="108" />
-<mousemove time="7546.000000" x="69" y="105" />
-<mousemove time="7582.000000" x="69" y="103" />
-<mousemove time="7619.000000" x="69" y="101" />
-<mousedown time="7726.000000" button="Left" x="69" y="101" />
-<mouseup time="7865.000000" button="Left" x="69" y="101" />
-<mousemove time="8074.000000" x="69" y="100" />
-<mousemove time="8113.000000" x="74" y="97" />
-<mousemove time="8115.000000" x="77" y="95" />
-<mousemove time="8164.000000" x="81" y="92" />
-<mousemove time="8213.000000" x="82" y="92" />
-<mousedown time="8557.000000" button="Left" x="82" y="92" />
-<mouseup time="8676.000000" button="Left" x="82" y="92" />
-<mousedown time="9328.000000" button="Left" x="82" y="92" />
-<mouseup time="9434.000000" button="Left" x="82" y="92" />
-<mousemove time="9642.000000" x="81" y="92" />
-<mousemove time="9714.000000" x="80" y="92" />
-<mousemove time="9751.000000" x="78" y="92" />
-<mousemove time="9788.000000" x="76" y="92" />
-<mousemove time="9825.000000" x="75" y="92" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-game-bubble.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-game-minesweeper-play-ui.xml Deleted

@@ -1,57 +0,0 @@
-<TestValidationScript >
-<mousemove time="189.000000" x="75" y="137" />
-<mousemove time="705.000000" x="76" y="92" />
-<mousemove time="776.000000" x="78" y="91" />
-<mousemove time="812.000000" x="85" y="87" />
-<mousemove time="847.000000" x="96" y="79" />
-<mousemove time="883.000000" x="104" y="71" />
-<mousemove time="919.000000" x="110" y="62" />
-<mousemove time="955.000000" x="114" y="55" />
-<mousemove time="991.000000" x="119" y="48" />
-<mousemove time="1027.000000" x="123" y="45" />
-<mousemove time="1503.000000" x="122" y="49" />
-<mousemove time="1539.000000" x="117" y="58" />
-<mousemove time="1575.000000" x="114" y="63" />
-<mousemove time="1611.000000" x="113" y="66" />
-<mousemove time="1647.000000" x="113" y="67" />
-<mousedown time="1752.000000" button="Left" x="113" y="67" />
-<mouseup time="1891.000000" button="Left" x="113" y="67" />
-<mousemove time="2237.000000" x="110" y="70" />
-<mousemove time="2273.000000" x="105" y="77" />
-<mousemove time="2310.000000" x="100" y="85" />
-<mousemove time="2345.000000" x="95" y="91" />
-<mousemove time="2381.000000" x="89" y="97" />
-<mousemove time="2416.000000" x="85" y="102" />
-<mousemove time="2451.000000" x="83" y="104" />
-<mousemove time="2486.000000" x="83" y="105" />
-<mousemove time="2522.000000" x="81" y="107" />
-<mousemove time="2558.000000" x="78" y="110" />
-<mousemove time="2594.000000" x="76" y="113" />
-<mousemove time="2630.000000" x="76" y="114" />
-<mousemove time="2733.000000" x="75" y="115" />
-<mousemove time="2769.000000" x="75" y="116" />
-<mousemove time="2806.000000" x="75" y="117" />
-<mousedown time="3013.000000" button="Left" x="75" y="117" />
-<mouseup time="3120.000000" button="Left" x="75" y="117" />
-<mousemove time="3500.000000" x="77" y="118" />
-<mousemove time="3500.000000" x="79" y="118" />
-<mousemove time="3536.000000" x="81" y="119" />
-<mousemove time="3572.000000" x="83" y="119" />
-<mousemove time="3641.000000" x="84" y="119" />
-<mousemove time="4021.000000" x="85" y="119" />
-<mousedown time="4022.000000" button="Left" x="85" y="119" />
-<mouseup time="4128.000000" button="Left" x="85" y="119" />
-<mousemove time="4541.000000" x="86" y="119" />
-<mousemove time="4576.000000" x="87" y="119" />
-<mousemove time="4611.000000" x="87" y="118" />
-<mousemove time="4646.000000" x="88" y="118" />
-<mousedown time="4751.000000" button="Left" x="88" y="118" />
-<mouseup time="4924.000000" button="Left" x="88" y="118" />
-<mousemove time="7348.000000" x="90" y="118" />
-<mousemove time="7383.000000" x="102" y="128" />
-<mousemove time="7418.000000" x="122" y="142" />
-<mousemove time="7453.000000" x="143" y="154" />
-<mousemove time="7489.000000" x="154" y="158" />
-<mousemove time="7490.000000" x="158" y="159" />
-<mousemove time="7524.000000" x="164" y="159" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-game-minesweeper.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-game-othello-play-ui.xml Deleted

@@ -1,153 +0,0 @@
-<TestValidationScript >
-<mousemove time="879.000000" x="162" y="159" />
-<mousemove time="915.000000" x="150" y="156" />
-<mousemove time="951.000000" x="135" y="149" />
-<mousemove time="987.000000" x="126" y="143" />
-<mousemove time="988.000000" x="124" y="141" />
-<mousemove time="1024.000000" x="123" y="139" />
-<mousemove time="1060.000000" x="123" y="136" />
-<mousemove time="1096.000000" x="123" y="135" />
-<mousemove time="1131.000000" x="123" y="134" />
-<mousemove time="1202.000000" x="121" y="134" />
-<mousemove time="1239.000000" x="118" y="134" />
-<mousemove time="1275.000000" x="110" y="134" />
-<mousemove time="1311.000000" x="107" y="134" />
-<mousemove time="1346.000000" x="105" y="134" />
-<mousedown time="1556.000000" button="Left" x="105" y="134" />
-<mouseup time="1628.000000" button="Left" x="105" y="134" />
-<mousemove time="2007.000000" x="105" y="133" />
-<mousemove time="2042.000000" x="105" y="129" />
-<mousemove time="2078.000000" x="107" y="120" />
-<mousemove time="2112.000000" x="112" y="109" />
-<mousemove time="2148.000000" x="117" y="100" />
-<mousemove time="2184.000000" x="120" y="94" />
-<mousemove time="2220.000000" x="122" y="90" />
-<mousemove time="2256.000000" x="122" y="89" />
-<mousemove time="2257.000000" x="122" y="88" />
-<mousemove time="2292.000000" x="122" y="84" />
-<mousemove time="2327.000000" x="122" y="80" />
-<mousemove time="2364.000000" x="122" y="77" />
-<mousemove time="2402.000000" x="122" y="75" />
-<mousemove time="2437.000000" x="122" y="71" />
-<mousemove time="2473.000000" x="122" y="67" />
-<mousemove time="2508.000000" x="123" y="66" />
-<mousedown time="2679.000000" button="Left" x="123" y="66" />
-<mouseup time="2817.000000" button="Left" x="123" y="66" />
-<mousemove time="3133.000000" x="120" y="66" />
-<mousemove time="3169.000000" x="111" y="68" />
-<mousemove time="3205.000000" x="106" y="74" />
-<mousemove time="3241.000000" x="100" y="82" />
-<mousemove time="3242.000000" x="97" y="87" />
-<mousemove time="3278.000000" x="93" y="96" />
-<mousemove time="3314.000000" x="89" y="104" />
-<mousemove time="3351.000000" x="86" y="112" />
-<mousemove time="3387.000000" x="82" y="118" />
-<mousemove time="3423.000000" x="80" y="122" />
-<mousemove time="3460.000000" x="78" y="124" />
-<mousemove time="3497.000000" x="76" y="126" />
-<mousemove time="3532.000000" x="76" y="127" />
-<mousemove time="3568.000000" x="75" y="127" />
-<mousemove time="3604.000000" x="73" y="128" />
-<mousemove time="3640.000000" x="71" y="129" />
-<mousemove time="3641.000000" x="70" y="129" />
-<mousedown time="3815.000000" button="Left" x="70" y="129" />
-<mouseup time="3886.000000" button="Left" x="70" y="129" />
-<mousemove time="4199.000000" x="70" y="125" />
-<mousemove time="4236.000000" x="70" y="117" />
-<mousemove time="4272.000000" x="69" y="108" />
-<mousemove time="4306.000000" x="68" y="102" />
-<mousemove time="4342.000000" x="68" y="100" />
-<mousemove time="4343.000000" x="68" y="99" />
-<mousemove time="4380.000000" x="68" y="98" />
-<mousemove time="4416.000000" x="68" y="97" />
-<mousemove time="4452.000000" x="67" y="97" />
-<mousemove time="4488.000000" x="67" y="96" />
-<mousedown time="4662.000000" button="Left" x="67" y="96" />
-<mouseup time="4769.000000" button="Left" x="67" y="96" />
-<mousemove time="5050.000000" x="66" y="96" />
-<mousemove time="5154.000000" x="70" y="96" />
-<mousemove time="5189.000000" x="84" y="96" />
-<mousemove time="5225.000000" x="100" y="96" />
-<mousemove time="5261.000000" x="109" y="98" />
-<mousemove time="5298.000000" x="113" y="104" />
-<mousemove time="5334.000000" x="114" y="111" />
-<mousemove time="5335.000000" x="115" y="114" />
-<mousemove time="5371.000000" x="116" y="120" />
-<mousemove time="5407.000000" x="117" y="125" />
-<mousemove time="5443.000000" x="118" y="129" />
-<mousemove time="5479.000000" x="119" y="131" />
-<mousemove time="5513.000000" x="120" y="131" />
-<mousemove time="5587.000000" x="121" y="131" />
-<mousemove time="5623.000000" x="122" y="131" />
-<mousemove time="5660.000000" x="123" y="131" />
-<mousemove time="5696.000000" x="124" y="131" />
-<mousemove time="5766.000000" x="125" y="131" />
-<mousedown time="5767.000000" button="Left" x="125" y="131" />
-<mouseup time="5941.000000" button="Left" x="125" y="131" />
-<mousemove time="6219.000000" x="119" y="130" />
-<mousemove time="6255.000000" x="106" y="123" />
-<mousemove time="6291.000000" x="93" y="117" />
-<mousemove time="6327.000000" x="85" y="115" />
-<mousemove time="6362.000000" x="79" y="113" />
-<mousemove time="6401.000000" x="71" y="111" />
-<mousemove time="6437.000000" x="67" y="109" />
-<mousemove time="6473.000000" x="64" y="107" />
-<mousemove time="6474.000000" x="62" y="105" />
-<mousemove time="6510.000000" x="56" y="103" />
-<mousemove time="6547.000000" x="54" y="102" />
-<mousemove time="6582.000000" x="53" y="102" />
-<mousemove time="6618.000000" x="49" y="102" />
-<mousemove time="6654.000000" x="46" y="104" />
-<mousemove time="6690.000000" x="44" y="106" />
-<mousemove time="6724.000000" x="44" y="107" />
-<mousemove time="6759.000000" x="43" y="107" />
-<mousedown time="6932.000000" button="Left" x="43" y="107" />
-<mouseup time="7003.000000" button="Left" x="43" y="107" />
-<mousemove time="7316.000000" x="45" y="105" />
-<mousemove time="7351.000000" x="48" y="101" />
-<mousemove time="7388.000000" x="52" y="95" />
-<mousemove time="7423.000000" x="54" y="88" />
-<mousemove time="7459.000000" x="56" y="83" />
-<mousemove time="7495.000000" x="57" y="81" />
-<mousemove time="7531.000000" x="57" y="80" />
-<mousemove time="7567.000000" x="57" y="76" />
-<mousemove time="7603.000000" x="59" y="71" />
-<mousemove time="7643.000000" x="60" y="67" />
-<mousemove time="7679.000000" x="60" y="66" />
-<mousemove time="7716.000000" x="61" y="65" />
-<mousemove time="7752.000000" x="62" y="64" />
-<mousedown time="7857.000000" button="Left" x="62" y="64" />
-<mouseup time="8001.000000" button="Left" x="62" y="64" />
-<mousemove time="8179.000000" x="62" y="67" />
-<mousemove time="8215.000000" x="62" y="76" />
-<mousemove time="8252.000000" x="65" y="87" />
-<mousemove time="8253.000000" x="67" y="93" />
-<mousemove time="8289.000000" x="74" y="108" />
-<mousemove time="8324.000000" x="80" y="119" />
-<mousemove time="8360.000000" x="85" y="129" />
-<mousemove time="8396.000000" x="88" y="135" />
-<mousemove time="8431.000000" x="91" y="139" />
-<mousemove time="8468.000000" x="92" y="141" />
-<mousemove time="8504.000000" x="92" y="145" />
-<mousemove time="8541.000000" x="92" y="148" />
-<mousemove time="8577.000000" x="92" y="149" />
-<mousedown time="8820.000000" button="Left" x="92" y="149" />
-<mouseup time="8926.000000" button="Left" x="92" y="149" />
-<mousemove time="9239.000000" x="88" y="149" />
-<mousemove time="9275.000000" x="75" y="150" />
-<mousemove time="9277.000000" x="66" y="150" />
-<mousemove time="9314.000000" x="53" y="151" />
-<mousemove time="9352.000000" x="44" y="151" />
-<mousemove time="9388.000000" x="38" y="151" />
-<mousemove time="9424.000000" x="31" y="151" />
-<mousemove time="9461.000000" x="28" y="151" />
-<mousemove time="9497.000000" x="26" y="151" />
-<mousemove time="9533.000000" x="25" y="149" />
-<mousemove time="9534.000000" x="23" y="148" />
-<mousemove time="9570.000000" x="21" y="145" />
-<mousemove time="9605.000000" x="20" y="142" />
-<mousemove time="9643.000000" x="20" y="140" />
-<mousemove time="9679.000000" x="20" y="138" />
-<mousemove time="9786.000000" x="20" y="137" />
-<mousedown time="9788.000000" button="Left" x="20" y="137" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-game-othello.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-interpolation-timesensor-enabled-play-ui.xml Deleted

@@ -1,63 +0,0 @@
-<TestValidationScript >
-<mousemove time="187.000000" x="20" y="182" />
-<mousemove time="723.000000" x="20" y="131" />
-<mousemove time="759.000000" x="22" y="121" />
-<mousemove time="794.000000" x="25" y="113" />
-<mousemove time="830.000000" x="26" y="110" />
-<mousemove time="866.000000" x="26" y="109" />
-<mousemove time="1711.000000" x="26" y="113" />
-<mousemove time="1747.000000" x="28" y="133" />
-<mousemove time="1783.000000" x="32" y="154" />
-<mousemove time="1785.000000" x="34" y="160" />
-<mousemove time="1820.000000" x="35" y="164" />
-<mousemove time="1855.000000" x="36" y="164" />
-<mousemove time="2470.000000" x="36" y="158" />
-<mousemove time="2505.000000" x="36" y="143" />
-<mousemove time="2540.000000" x="35" y="129" />
-<mousemove time="2576.000000" x="34" y="119" />
-<mousemove time="2577.000000" x="33" y="115" />
-<mousemove time="2613.000000" x="32" y="111" />
-<mousemove time="2649.000000" x="32" y="109" />
-<mousemove time="3490.000000" x="32" y="111" />
-<mousemove time="3527.000000" x="32" y="115" />
-<mousemove time="3563.000000" x="33" y="124" />
-<mousemove time="3600.000000" x="35" y="133" />
-<mousemove time="3635.000000" x="36" y="137" />
-<mousemove time="3671.000000" x="37" y="139" />
-<mousemove time="3706.000000" x="37" y="140" />
-<mousemove time="3741.000000" x="38" y="140" />
-<mousemove time="4559.000000" x="38" y="139" />
-<mousemove time="4594.000000" x="38" y="137" />
-<mousemove time="4628.000000" x="37" y="132" />
-<mousemove time="4663.000000" x="36" y="126" />
-<mousemove time="4699.000000" x="34" y="117" />
-<mousemove time="4735.000000" x="33" y="108" />
-<mousemove time="4771.000000" x="33" y="104" />
-<mousemove time="4806.000000" x="32" y="102" />
-<mousemove time="5777.000000" x="32" y="103" />
-<mousemove time="5813.000000" x="32" y="107" />
-<mousemove time="5849.000000" x="32" y="118" />
-<mousemove time="5885.000000" x="34" y="129" />
-<mousemove time="5920.000000" x="36" y="134" />
-<mousemove time="5955.000000" x="37" y="138" />
-<mousemove time="5989.000000" x="37" y="139" />
-<mousemove time="6635.000000" x="37" y="138" />
-<mousemove time="6669.000000" x="37" y="133" />
-<mousemove time="6704.000000" x="36" y="123" />
-<mousemove time="6741.000000" x="35" y="113" />
-<mousemove time="6777.000000" x="35" y="106" />
-<mousemove time="6813.000000" x="34" y="101" />
-<mousemove time="6849.000000" x="34" y="98" />
-<mousemove time="6884.000000" x="34" y="95" />
-<mousedown time="8445.000000" button="Left" x="34" y="95" />
-<mouseup time="8587.000000" button="Left" x="34" y="95" />
-<mousemove time="9389.000000" x="34" y="101" />
-<mousemove time="9425.000000" x="36" y="127" />
-<mousemove time="9461.000000" x="41" y="155" />
-<mousemove time="9496.000000" x="43" y="172" />
-<mousemove time="9530.000000" x="45" y="176" />
-<mousemove time="9768.000000" x="45" y="175" />
-<mousemove time="9803.000000" x="45" y="170" />
-<mousemove time="9837.000000" x="41" y="160" />
-<mousemove time="9872.000000" x="39" y="153" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-interpolation-timesensor-starttime_norestart-play-ui.xml Deleted

@@ -1,47 +0,0 @@
-<TestValidationScript >
-<mousemove time="228.000000" x="36" y="157" />
-<mousemove time="853.000000" x="36" y="116" />
-<mousemove time="890.000000" x="36" y="127" />
-<mousemove time="926.000000" x="36" y="134" />
-<mousemove time="961.000000" x="36" y="137" />
-<mousemove time="1199.000000" x="36" y="136" />
-<mousemove time="1233.000000" x="35" y="132" />
-<mousemove time="1268.000000" x="34" y="122" />
-<mousemove time="1304.000000" x="33" y="115" />
-<mousemove time="1339.000000" x="33" y="112" />
-<mousemove time="1374.000000" x="33" y="111" />
-<mousemove time="1410.000000" x="33" y="110" />
-<mousemove time="2931.000000" x="33" y="112" />
-<mousemove time="2966.000000" x="34" y="124" />
-<mousemove time="3003.000000" x="37" y="136" />
-<mousemove time="3040.000000" x="40" y="145" />
-<mousemove time="3076.000000" x="41" y="148" />
-<mousemove time="3110.000000" x="42" y="150" />
-<mousemove time="3181.000000" x="42" y="151" />
-<mousemove time="4493.000000" x="42" y="150" />
-<mousemove time="4529.000000" x="42" y="144" />
-<mousemove time="4563.000000" x="42" y="134" />
-<mousemove time="4598.000000" x="41" y="123" />
-<mousemove time="4634.000000" x="40" y="115" />
-<mousemove time="4670.000000" x="40" y="107" />
-<mousemove time="4705.000000" x="40" y="101" />
-<mousemove time="4741.000000" x="40" y="99" />
-<mousedown time="5255.000000" button="Left" x="40" y="99" />
-<mouseup time="5394.000000" button="Left" x="40" y="99" />
-<mousedown time="6852.000000" button="Left" x="40" y="99" />
-<mouseup time="6924.000000" button="Left" x="40" y="99" />
-<mousedown time="7926.000000" button="Left" x="40" y="99" />
-<mouseup time="8098.000000" button="Left" x="40" y="99" />
-<mousemove time="8967.000000" x="40" y="100" />
-<mousemove time="9004.000000" x="40" y="110" />
-<mousemove time="9004.000000" x="41" y="115" />
-<mousemove time="9041.000000" x="43" y="124" />
-<mousemove time="9077.000000" x="45" y="135" />
-<mousemove time="9113.000000" x="45" y="145" />
-<mousemove time="9148.000000" x="46" y="149" />
-<mousemove time="9184.000000" x="46" y="151" />
-<mousemove time="9770.000000" x="46" y="150" />
-<mousemove time="9806.000000" x="46" y="145" />
-<mousemove time="9806.000000" x="46" y="140" />
-<mousemove time="9842.000000" x="44" y="130" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-interpolation-timesensor-starttime_restart-play-ui.xml Deleted

@@ -1,44 +0,0 @@
-<TestValidationScript >
-<mousemove time="169.000000" x="35" y="137" />
-<mousemove time="693.000000" x="35" y="96" />
-<mousemove time="728.000000" x="37" y="107" />
-<mousemove time="764.000000" x="39" y="120" />
-<mousemove time="800.000000" x="40" y="133" />
-<mousemove time="835.000000" x="40" y="138" />
-<mousemove time="870.000000" x="40" y="140" />
-<mousemove time="939.000000" x="40" y="133" />
-<mousemove time="973.000000" x="39" y="122" />
-<mousemove time="1009.000000" x="37" y="111" />
-<mousemove time="1045.000000" x="37" y="107" />
-<mousemove time="1080.000000" x="37" y="106" />
-<mousedown time="1561.000000" button="Left" x="37" y="106" />
-<mouseup time="1632.000000" button="Left" x="37" y="106" />
-<mousemove time="2193.000000" x="37" y="107" />
-<mousemove time="2229.000000" x="37" y="116" />
-<mousemove time="2265.000000" x="38" y="126" />
-<mousemove time="2305.000000" x="40" y="135" />
-<mousemove time="2342.000000" x="41" y="139" />
-<mousemove time="2377.000000" x="41" y="140" />
-<mousemove time="2412.000000" x="41" y="139" />
-<mousemove time="2448.000000" x="40" y="129" />
-<mousemove time="2483.000000" x="36" y="109" />
-<mousemove time="2519.000000" x="35" y="96" />
-<mousemove time="2554.000000" x="34" y="92" />
-<mousedown time="2660.000000" button="Left" x="34" y="92" />
-<mouseup time="2766.000000" button="Left" x="34" y="92" />
-<mousedown time="3501.000000" button="Left" x="34" y="92" />
-<mouseup time="3570.000000" button="Left" x="34" y="92" />
-<mousedown time="4197.000000" button="Left" x="34" y="92" />
-<mouseup time="4303.000000" button="Left" x="34" y="92" />
-<mousedown time="4962.000000" button="Left" x="34" y="92" />
-<mouseup time="5033.000000" button="Left" x="34" y="92" />
-<mousedown time="5900.000000" button="Left" x="34" y="92" />
-<mouseup time="6005.000000" button="Left" x="34" y="92" />
-<mousemove time="7151.000000" x="34" y="98" />
-<mousemove time="7186.000000" x="35" y="111" />
-<mousemove time="7222.000000" x="38" y="131" />
-<mousemove time="7259.000000" x="41" y="142" />
-<mousemove time="7295.000000" x="42" y="152" />
-<mousemove time="7331.000000" x="43" y="160" />
-<mousemove time="7366.000000" x="43" y="163" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-keynavigator-play-ui.xml Deleted

@@ -1,70 +0,0 @@
-<TestValidationScript >
-<mousemove time="1471.000000" x="43" y="162" />
-<mousemove time="1507.000000" x="43" y="154" />
-<mousemove time="1541.000000" x="43" y="141" />
-<mousemove time="1575.000000" x="43" y="126" />
-<mousemove time="1613.000000" x="43" y="111" />
-<mousemove time="1649.000000" x="42" y="98" />
-<mousemove time="1685.000000" x="42" y="90" />
-<mousemove time="1721.000000" x="41" y="85" />
-<mousemove time="1755.000000" x="41" y="81" />
-<mousemove time="1789.000000" x="41" y="74" />
-<mousemove time="1824.000000" x="41" y="68" />
-<mousemove time="1860.000000" x="41" y="63" />
-<mousemove time="1897.000000" x="41" y="61" />
-<mousemove time="1933.000000" x="41" y="59" />
-<mousemove time="1934.000000" x="41" y="58" />
-<mousemove time="1972.000000" x="41" y="57" />
-<mousemove time="2007.000000" x="41" y="56" />
-<mousemove time="2725.000000" x="43" y="56" />
-<mousemove time="2726.000000" x="47" y="56" />
-<mousemove time="2762.000000" x="62" y="55" />
-<mousemove time="2799.000000" x="79" y="54" />
-<mousemove time="2836.000000" x="92" y="54" />
-<mousemove time="2871.000000" x="100" y="53" />
-<mousemove time="2906.000000" x="107" y="53" />
-<mousemove time="2941.000000" x="110" y="52" />
-<mousemove time="2976.000000" x="112" y="52" />
-<mousemove time="3011.000000" x="114" y="52" />
-<mousemove time="3046.000000" x="117" y="51" />
-<mousemove time="3082.000000" x="121" y="50" />
-<mousemove time="3117.000000" x="128" y="50" />
-<mousemove time="3152.000000" x="134" y="48" />
-<mousemove time="3186.000000" x="139" y="47" />
-<mousemove time="3222.000000" x="140" y="47" />
-<mousemove time="3771.000000" x="140" y="48" />
-<mousemove time="3807.000000" x="144" y="62" />
-<mousemove time="3844.000000" x="148" y="84" />
-<mousemove time="3880.000000" x="150" y="101" />
-<mousemove time="3916.000000" x="150" y="116" />
-<mousemove time="3953.000000" x="150" y="126" />
-<mousemove time="3989.000000" x="150" y="131" />
-<mousemove time="3990.000000" x="150" y="132" />
-<mousemove time="4030.000000" x="150" y="133" />
-<keydown time="5286.000000" key_identifier="Left" />
-<keyup time="5492.000000" key_identifier="Left" />
-<keydown time="5730.000000" key_identifier="Up" />
-<keyup time="5936.000000" key_identifier="Up" />
-<keydown time="5970.000000" key_identifier="Right" />
-<keyup time="6142.000000" key_identifier="Right" />
-<keydown time="6312.000000" key_identifier="Down" />
-<keyup time="6451.000000" key_identifier="Down" />
-<keydown time="6621.000000" key_identifier="Left" />
-<keyup time="6790.000000" key_identifier="Left" />
-<keydown time="7164.000000" key_identifier="Up" />
-<keyup time="7300.000000" key_identifier="Up" />
-<keydown time="7437.000000" key_identifier="Down" />
-<keyup time="7574.000000" key_identifier="Down" />
-<keydown time="7677.000000" key_identifier="Right" />
-<keyup time="7816.000000" key_identifier="Right" />
-<keydown time="7986.000000" key_identifier="Up" />
-<keyup time="8122.000000" key_identifier="Up" />
-<keydown time="8431.000000" key_identifier="Down" />
-<keyup time="8570.000000" key_identifier="Down" />
-<keydown time="8945.000000" key_identifier="Left" />
-<keyup time="9117.000000" key_identifier="Left" />
-<keydown time="9287.000000" key_identifier="Up" />
-<keyup time="9423.000000" key_identifier="Up" />
-<keydown time="9732.000000" key_identifier="Right" />
-<keyup time="9837.000000" key_identifier="Right" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-linking-inline-direct-inline-play-ui.xml Deleted

@@ -1,83 +0,0 @@
-<TestValidationScript >
-<mousemove time="172.000000" x="150" y="178" />
-<mousemove time="1216.000000" x="143" y="131" />
-<mousemove time="1250.000000" x="135" y="126" />
-<mousemove time="1285.000000" x="127" y="120" />
-<mousemove time="1321.000000" x="120" y="114" />
-<mousemove time="1356.000000" x="115" y="109" />
-<mousemove time="1391.000000" x="112" y="107" />
-<mousemove time="1392.000000" x="112" y="106" />
-<mousemove time="1462.000000" x="111" y="104" />
-<mousemove time="1497.000000" x="110" y="104" />
-<mousemove time="1532.000000" x="110" y="103" />
-<mousedown time="2114.000000" button="Left" x="110" y="103" />
-<mousemove time="2423.000000" x="111" y="103" />
-<mousemove time="2460.000000" x="115" y="103" />
-<mousemove time="2496.000000" x="118" y="103" />
-<mousemove time="2532.000000" x="120" y="103" />
-<mousemove time="2568.000000" x="125" y="103" />
-<mousemove time="2603.000000" x="129" y="103" />
-<mousemove time="2641.000000" x="133" y="103" />
-<mousemove time="2677.000000" x="136" y="103" />
-<mousemove time="2714.000000" x="140" y="103" />
-<mousemove time="2750.000000" x="143" y="103" />
-<mousemove time="2751.000000" x="145" y="103" />
-<mousemove time="2786.000000" x="150" y="103" />
-<mousemove time="2822.000000" x="156" y="104" />
-<mousemove time="2858.000000" x="159" y="106" />
-<mousemove time="2894.000000" x="162" y="109" />
-<mousemove time="2931.000000" x="164" y="111" />
-<mousemove time="2967.000000" x="166" y="114" />
-<mousemove time="3004.000000" x="167" y="117" />
-<mousemove time="3041.000000" x="169" y="122" />
-<mousemove time="3076.000000" x="170" y="126" />
-<mousemove time="3116.000000" x="170" y="131" />
-<mousemove time="3153.000000" x="170" y="134" />
-<mousemove time="3189.000000" x="169" y="137" />
-<mousemove time="3225.000000" x="168" y="138" />
-<mousemove time="3331.000000" x="167" y="138" />
-<mousemove time="3367.000000" x="162" y="138" />
-<mousemove time="3404.000000" x="154" y="135" />
-<mousemove time="3441.000000" x="145" y="130" />
-<mousemove time="3441.000000" x="139" y="125" />
-<mousemove time="3478.000000" x="126" y="115" />
-<mousemove time="3513.000000" x="116" y="109" />
-<mousemove time="3550.000000" x="107" y="105" />
-<mousemove time="3587.000000" x="101" y="101" />
-<mousemove time="3623.000000" x="96" y="100" />
-<mousemove time="3659.000000" x="92" y="99" />
-<mousemove time="3696.000000" x="91" y="98" />
-<mousemove time="4112.000000" x="94" y="90" />
-<mousemove time="4148.000000" x="102" y="72" />
-<mousemove time="4185.000000" x="108" y="56" />
-<mousemove time="4220.000000" x="111" y="48" />
-<mousemove time="4256.000000" x="114" y="47" />
-<mousemove time="4293.000000" x="125" y="47" />
-<mousemove time="4329.000000" x="135" y="47" />
-<mousemove time="4331.000000" x="140" y="49" />
-<mousemove time="4366.000000" x="145" y="59" />
-<mousemove time="4402.000000" x="147" y="80" />
-<mousemove time="4438.000000" x="144" y="99" />
-<mousemove time="4475.000000" x="138" y="110" />
-<mousemove time="4515.000000" x="128" y="115" />
-<mousemove time="4552.000000" x="115" y="116" />
-<mousemove time="4589.000000" x="104" y="116" />
-<mousemove time="4625.000000" x="88" y="114" />
-<mousemove time="4661.000000" x="82" y="113" />
-<mousemove time="4698.000000" x="81" y="113" />
-<mouseup time="4906.000000" button="Left" x="81" y="113" />
-<mousemove time="5113.000000" x="93" y="116" />
-<mousemove time="5148.000000" x="102" y="120" />
-<mousemove time="5184.000000" x="111" y="124" />
-<mousemove time="5219.000000" x="114" y="125" />
-<mousemove time="5254.000000" x="115" y="126" />
-<mousedown time="5357.000000" button="Left" x="115" y="126" />
-<mousemove time="5497.000000" x="122" y="127" />
-<mousemove time="5532.000000" x="128" y="129" />
-<mousemove time="5568.000000" x="133" y="131" />
-<mousemove time="5603.000000" x="137" y="132" />
-<mousemove time="5639.000000" x="139" y="132" />
-<mousemove time="5675.000000" x="140" y="132" />
-<mousemove time="5708.000000" x="140" y="133" />
-<mouseup time="5846.000000" button="Left" x="140" y="133" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-linking-inline-od-inline-play-ui.xml Deleted

@@ -1,114 +0,0 @@
-<TestValidationScript >
-<mousemove time="227.000000" x="140" y="178" />
-<mousemove time="854.000000" x="136" y="132" />
-<mousemove time="889.000000" x="128" y="125" />
-<mousemove time="924.000000" x="118" y="119" />
-<mousemove time="959.000000" x="114" y="115" />
-<mousemove time="995.000000" x="112" y="113" />
-<mousemove time="1031.000000" x="110" y="112" />
-<mousemove time="1032.000000" x="109" y="111" />
-<mousemove time="1067.000000" x="108" y="110" />
-<mousemove time="1102.000000" x="107" y="107" />
-<mousemove time="1138.000000" x="106" y="105" />
-<mousemove time="1174.000000" x="105" y="103" />
-<mousedown time="1650.000000" button="Left" x="105" y="103" />
-<mousemove time="1923.000000" x="101" y="101" />
-<mousemove time="1959.000000" x="91" y="94" />
-<mousemove time="1996.000000" x="84" y="90" />
-<mousemove time="2031.000000" x="77" y="85" />
-<mousemove time="2068.000000" x="72" y="82" />
-<mousemove time="2104.000000" x="68" y="79" />
-<mousemove time="2143.000000" x="66" y="76" />
-<mousemove time="2143.000000" x="65" y="74" />
-<mousemove time="2178.000000" x="64" y="67" />
-<mousemove time="2214.000000" x="64" y="59" />
-<mousemove time="2251.000000" x="68" y="53" />
-<mousemove time="2287.000000" x="74" y="49" />
-<mousemove time="2324.000000" x="85" y="49" />
-<mousemove time="2360.000000" x="98" y="49" />
-<mousemove time="2396.000000" x="113" y="53" />
-<mousemove time="2432.000000" x="125" y="57" />
-<mousemove time="2469.000000" x="136" y="64" />
-<mousemove time="2470.000000" x="141" y="67" />
-<mousemove time="2507.000000" x="151" y="76" />
-<mousemove time="2543.000000" x="156" y="85" />
-<mousemove time="2579.000000" x="160" y="97" />
-<mousemove time="2620.000000" x="162" y="107" />
-<mousemove time="2657.000000" x="162" y="117" />
-<mousemove time="2692.000000" x="162" y="126" />
-<mousemove time="2729.000000" x="162" y="138" />
-<mousemove time="2729.000000" x="161" y="144" />
-<mousemove time="2766.000000" x="159" y="150" />
-<mousemove time="2803.000000" x="154" y="156" />
-<mousemove time="2838.000000" x="144" y="159" />
-<mousemove time="2875.000000" x="128" y="159" />
-<mousemove time="2912.000000" x="110" y="157" />
-<mousemove time="2948.000000" x="96" y="155" />
-<mousemove time="2983.000000" x="86" y="152" />
-<mousemove time="3020.000000" x="77" y="150" />
-<mousemove time="3021.000000" x="74" y="150" />
-<mousemove time="3057.000000" x="72" y="149" />
-<mousemove time="3093.000000" x="71" y="149" />
-<mousemove time="3196.000000" x="72" y="149" />
-<mousemove time="3233.000000" x="84" y="148" />
-<mousemove time="3270.000000" x="103" y="146" />
-<mousemove time="3270.000000" x="113" y="144" />
-<mousemove time="3307.000000" x="126" y="143" />
-<mousemove time="3343.000000" x="134" y="142" />
-<mousemove time="3379.000000" x="136" y="142" />
-<mousemove time="3416.000000" x="137" y="140" />
-<mousemove time="3452.000000" x="137" y="129" />
-<mousemove time="3489.000000" x="134" y="115" />
-<mousemove time="3526.000000" x="129" y="99" />
-<mousemove time="3562.000000" x="127" y="80" />
-<mousemove time="3598.000000" x="125" y="69" />
-<mousemove time="3638.000000" x="118" y="57" />
-<mousemove time="3674.000000" x="113" y="52" />
-<mousemove time="3710.000000" x="106" y="48" />
-<mousemove time="3747.000000" x="94" y="47" />
-<mousemove time="3783.000000" x="81" y="47" />
-<mousemove time="3819.000000" x="70" y="49" />
-<mousemove time="3856.000000" x="62" y="55" />
-<mousemove time="3893.000000" x="55" y="63" />
-<mousemove time="3893.000000" x="53" y="67" />
-<mousemove time="3929.000000" x="49" y="76" />
-<mousemove time="3966.000000" x="46" y="89" />
-<mousemove time="4003.000000" x="45" y="100" />
-<mousemove time="4039.000000" x="45" y="114" />
-<mousemove time="4076.000000" x="51" y="127" />
-<mousemove time="4112.000000" x="60" y="142" />
-<mousemove time="4149.000000" x="73" y="153" />
-<mousemove time="4185.000000" x="88" y="158" />
-<mousemove time="4186.000000" x="95" y="159" />
-<mousemove time="4223.000000" x="110" y="159" />
-<mousemove time="4260.000000" x="127" y="153" />
-<mousemove time="4295.000000" x="140" y="144" />
-<mousemove time="4332.000000" x="148" y="137" />
-<mousemove time="4370.000000" x="154" y="130" />
-<mousemove time="4407.000000" x="156" y="128" />
-<mousemove time="4443.000000" x="157" y="127" />
-<mousemove time="4546.000000" x="152" y="125" />
-<mousemove time="4583.000000" x="135" y="122" />
-<mousemove time="4619.000000" x="114" y="113" />
-<mousemove time="4620.000000" x="101" y="107" />
-<mousemove time="4656.000000" x="82" y="96" />
-<mousemove time="4692.000000" x="71" y="86" />
-<mousemove time="4728.000000" x="66" y="79" />
-<mousemove time="4765.000000" x="65" y="77" />
-<mousemove time="4802.000000" x="65" y="73" />
-<mousemove time="4839.000000" x="66" y="69" />
-<mousemove time="4875.000000" x="73" y="64" />
-<mousemove time="4912.000000" x="87" y="61" />
-<mousemove time="4913.000000" x="96" y="61" />
-<mousemove time="4949.000000" x="114" y="61" />
-<mousemove time="4986.000000" x="130" y="63" />
-<mousemove time="5024.000000" x="137" y="66" />
-<mousemove time="5060.000000" x="139" y="67" />
-<mousemove time="5095.000000" x="140" y="68" />
-<mousemove time="5130.000000" x="140" y="69" />
-<mousemove time="5166.000000" x="141" y="69" />
-<mouseup time="5235.000000" button="Left" x="141" y="69" />
-<mousemove time="9756.000000" x="143" y="74" />
-<mousemove time="9791.000000" x="148" y="82" />
-<mousemove time="9827.000000" x="164" y="105" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-linking-inline-segment-inline-play-ui.xml Deleted

@@ -1,61 +0,0 @@
-<TestValidationScript >
-<mousemove time="197.000000" x="179" y="174" />
-<mousemove time="932.000000" x="175" y="129" />
-<mousemove time="983.000000" x="159" y="123" />
-<mousemove time="1018.000000" x="144" y="116" />
-<mousemove time="1053.000000" x="131" y="112" />
-<mousemove time="1105.000000" x="118" y="106" />
-<mousemove time="1139.000000" x="115" y="106" />
-<mousemove time="1504.000000" x="115" y="107" />
-<mousemove time="1585.000000" x="115" y="106" />
-<mousemove time="1623.000000" x="115" y="99" />
-<mousemove time="1658.000000" x="115" y="93" />
-<mousemove time="1694.000000" x="115" y="88" />
-<mousemove time="1705.000000" x="115" y="87" />
-<mousemove time="1742.000000" x="114" y="87" />
-<mousemove time="1812.000000" x="112" y="87" />
-<mousemove time="1826.000000" x="111" y="87" />
-<mousemove time="1864.000000" x="109" y="87" />
-<mousemove time="1900.000000" x="107" y="87" />
-<mousemove time="1935.000000" x="102" y="87" />
-<mousemove time="1945.000000" x="99" y="87" />
-<mousemove time="1982.000000" x="93" y="88" />
-<mousemove time="2017.000000" x="89" y="88" />
-<mousemove time="2052.000000" x="87" y="89" />
-<mousemove time="2102.000000" x="87" y="91" />
-<mousemove time="2137.000000" x="87" y="93" />
-<mousemove time="2172.000000" x="87" y="96" />
-<mousemove time="2186.000000" x="88" y="96" />
-<mousemove time="2224.000000" x="91" y="97" />
-<mousemove time="2297.000000" x="92" y="97" />
-<mousemove time="2332.000000" x="93" y="97" />
-<mousemove time="2345.000000" x="94" y="97" />
-<mousemove time="2453.000000" x="94" y="98" />
-<mousedown time="2573.000000" button="Left" x="94" y="98" />
-<mousemove time="2932.000000" x="98" y="99" />
-<mousemove time="2983.000000" x="109" y="106" />
-<mousemove time="2983.000000" x="115" y="110" />
-<mousemove time="3018.000000" x="124" y="119" />
-<mousemove time="3053.000000" x="128" y="125" />
-<mousemove time="3105.000000" x="132" y="133" />
-<mousemove time="3140.000000" x="134" y="135" />
-<mousemove time="3174.000000" x="134" y="136" />
-<mouseup time="3504.000000" button="Left" x="134" y="136" />
-<keydown time="4423.000000" key_identifier="Right" />
-<keyup time="4690.000000" key_identifier="Right" />
-<keydown time="4743.000000" key_identifier="Left" />
-<keyup time="4981.000000" key_identifier="Left" />
-<mousemove time="6693.000000" x="134" y="134" />
-<mousemove time="6705.000000" x="131" y="128" />
-<mousemove time="6743.000000" x="122" y="108" />
-<mousemove time="6778.000000" x="116" y="89" />
-<mousemove time="6814.000000" x="112" y="76" />
-<mousemove time="6825.000000" x="112" y="72" />
-<mousemove time="6863.000000" x="112" y="69" />
-<mousemove time="7298.000000" x="112" y="70" />
-<mousemove time="7333.000000" x="112" y="80" />
-<mousemove time="7385.000000" x="113" y="107" />
-<mousemove time="7420.000000" x="113" y="129" />
-<mousemove time="7455.000000" x="113" y="141" />
-<mousemove time="7505.000000" x="113" y="145" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audiobuffer-play-ui.xml Deleted

@@ -1,84 +0,0 @@
-<TestValidationScript >
-<mousemove time="251.000000" x="113" y="190" />
-<mousemove time="1307.000000" x="104" y="139" />
-<mousemove time="1308.000000" x="98" y="133" />
-<mousemove time="1344.000000" x="82" y="121" />
-<mousemove time="1379.000000" x="71" y="106" />
-<mousemove time="1413.000000" x="65" y="96" />
-<mousemove time="1448.000000" x="65" y="91" />
-<mousemove time="1789.000000" x="66" y="89" />
-<mousemove time="1825.000000" x="72" y="85" />
-<mousemove time="1859.000000" x="79" y="82" />
-<mousemove time="1894.000000" x="85" y="79" />
-<mousemove time="1930.000000" x="87" y="77" />
-<mousemove time="1965.000000" x="89" y="73" />
-<mousemove time="2001.000000" x="91" y="71" />
-<mousemove time="2037.000000" x="93" y="70" />
-<mousemove time="2073.000000" x="94" y="70" />
-<mousemove time="2857.000000" x="91" y="70" />
-<mousemove time="2893.000000" x="79" y="70" />
-<mousemove time="2929.000000" x="68" y="69" />
-<mousemove time="2965.000000" x="53" y="67" />
-<mousemove time="3000.000000" x="36" y="66" />
-<mousemove time="3035.000000" x="23" y="66" />
-<mousemove time="3070.000000" x="19" y="66" />
-<mousemove time="3106.000000" x="19" y="65" />
-<mousemove time="3176.000000" x="19" y="64" />
-<mousemove time="3247.000000" x="21" y="64" />
-<mousemove time="3283.000000" x="24" y="64" />
-<mousemove time="3318.000000" x="25" y="64" />
-<mousemove time="3387.000000" x="26" y="64" />
-<mousedown time="3934.000000" button="Left" x="26" y="64" />
-<mouseup time="4856.000000" button="Left" x="26" y="64" />
-<mousemove time="5098.000000" x="27" y="64" />
-<mousemove time="5134.000000" x="40" y="64" />
-<mousemove time="5170.000000" x="56" y="67" />
-<mousemove time="5206.000000" x="74" y="71" />
-<mousemove time="5241.000000" x="91" y="76" />
-<mousemove time="5277.000000" x="105" y="79" />
-<mousemove time="5312.000000" x="116" y="80" />
-<mousemove time="5349.000000" x="125" y="80" />
-<mousemove time="5349.000000" x="127" y="80" />
-<mousemove time="5385.000000" x="131" y="80" />
-<mousemove time="5419.000000" x="135" y="79" />
-<mousemove time="5454.000000" x="143" y="76" />
-<mousemove time="5488.000000" x="152" y="71" />
-<mousemove time="5523.000000" x="157" y="70" />
-<mousemove time="5558.000000" x="158" y="70" />
-<mousedown time="5968.000000" button="Left" x="158" y="70" />
-<mouseup time="6072.000000" button="Left" x="158" y="70" />
-<mousemove time="6582.000000" x="154" y="71" />
-<mousemove time="6617.000000" x="145" y="75" />
-<mousemove time="6653.000000" x="138" y="78" />
-<mousemove time="6689.000000" x="134" y="81" />
-<mousemove time="6724.000000" x="130" y="83" />
-<mousemove time="6758.000000" x="124" y="83" />
-<mousemove time="6793.000000" x="119" y="83" />
-<mousemove time="6828.000000" x="116" y="79" />
-<mousemove time="6864.000000" x="114" y="75" />
-<mousemove time="6900.000000" x="111" y="70" />
-<mousemove time="6936.000000" x="109" y="68" />
-<mousemove time="6937.000000" x="108" y="68" />
-<mousemove time="6972.000000" x="105" y="67" />
-<mousemove time="7008.000000" x="104" y="67" />
-<mousemove time="7043.000000" x="103" y="67" />
-<mousedown time="7249.000000" button="Left" x="103" y="67" />
-<mouseup time="7352.000000" button="Left" x="103" y="67" />
-<mousemove time="7592.000000" x="103" y="71" />
-<mousemove time="7628.000000" x="103" y="79" />
-<mousemove time="7665.000000" x="103" y="89" />
-<mousemove time="7700.000000" x="103" y="103" />
-<mousemove time="7735.000000" x="103" y="115" />
-<mousemove time="7770.000000" x="103" y="122" />
-<mousemove time="7806.000000" x="103" y="128" />
-<mousemove time="7842.000000" x="103" y="129" />
-<mousemove time="7878.000000" x="103" y="130" />
-<mousemove time="7913.000000" x="103" y="131" />
-<mousemove time="7949.000000" x="103" y="132" />
-<mousedown time="8190.000000" button="Left" x="103" y="132" />
-<mouseup time="8260.000000" button="Left" x="103" y="132" />
-<mousedown time="9116.000000" button="Left" x="103" y="132" />
-<mouseup time="9221.000000" button="Left" x="103" y="132" />
-<mousedown time="9699.000000" button="Left" x="103" y="132" />
-<mouseup time="9804.000000" button="Left" x="103" y="132" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audioclip-play-ui.xml Deleted

@@ -1,73 +0,0 @@
-<TestValidationScript >
-<mousemove time="169.000000" x="124" y="154" />
-<mousemove time="750.000000" x="122" y="109" />
-<mousemove time="786.000000" x="112" y="109" />
-<mousemove time="821.000000" x="103" y="111" />
-<mousemove time="856.000000" x="97" y="111" />
-<mousemove time="890.000000" x="92" y="111" />
-<mousemove time="925.000000" x="87" y="111" />
-<mousemove time="959.000000" x="86" y="111" />
-<mousemove time="1098.000000" x="86" y="110" />
-<mousemove time="1373.000000" x="85" y="110" />
-<mousemove time="1443.000000" x="79" y="110" />
-<mousemove time="1479.000000" x="73" y="108" />
-<mousemove time="1515.000000" x="70" y="107" />
-<mousemove time="1551.000000" x="69" y="106" />
-<mousedown time="2130.000000" button="Left" x="69" y="106" />
-<mouseup time="2268.000000" button="Left" x="69" y="106" />
-<mousemove time="2644.000000" x="71" y="106" />
-<mousemove time="2679.000000" x="85" y="108" />
-<mousemove time="2714.000000" x="102" y="111" />
-<mousemove time="2749.000000" x="114" y="111" />
-<mousemove time="2785.000000" x="122" y="111" />
-<mousemove time="2820.000000" x="124" y="111" />
-<mousemove time="2856.000000" x="126" y="111" />
-<mousemove time="2892.000000" x="127" y="111" />
-<mousemove time="2928.000000" x="128" y="111" />
-<mousedown time="3203.000000" button="Left" x="128" y="111" />
-<mouseup time="3307.000000" button="Left" x="128" y="111" />
-<mousemove time="5418.000000" x="128" y="116" />
-<mousemove time="5453.000000" x="121" y="125" />
-<mousemove time="5489.000000" x="114" y="129" />
-<mousemove time="5524.000000" x="102" y="131" />
-<mousemove time="5560.000000" x="90" y="129" />
-<mousemove time="5594.000000" x="81" y="123" />
-<mousemove time="5630.000000" x="74" y="119" />
-<mousemove time="5665.000000" x="71" y="117" />
-<mousemove time="5699.000000" x="70" y="115" />
-<mousemove time="5735.000000" x="70" y="112" />
-<mousemove time="5770.000000" x="70" y="110" />
-<mousedown time="6078.000000" button="Left" x="70" y="110" />
-<mouseup time="6182.000000" button="Left" x="70" y="110" />
-<mousemove time="6900.000000" x="76" y="110" />
-<mousemove time="6935.000000" x="89" y="110" />
-<mousemove time="6971.000000" x="104" y="109" />
-<mousemove time="6971.000000" x="111" y="109" />
-<mousemove time="7006.000000" x="117" y="109" />
-<mousemove time="7043.000000" x="119" y="109" />
-<mousedown time="7284.000000" button="Left" x="119" y="109" />
-<mouseup time="7388.000000" button="Left" x="119" y="109" />
-<mousemove time="7868.000000" x="117" y="109" />
-<mousemove time="7904.000000" x="114" y="112" />
-<mousemove time="7938.000000" x="110" y="120" />
-<mousemove time="7972.000000" x="108" y="129" />
-<mousemove time="8007.000000" x="107" y="133" />
-<mousemove time="8076.000000" x="107" y="134" />
-<mousemove time="8861.000000" x="102" y="133" />
-<mousemove time="8894.000000" x="92" y="125" />
-<mousemove time="8930.000000" x="80" y="116" />
-<mousemove time="8965.000000" x="73" y="111" />
-<mousemove time="9001.000000" x="69" y="107" />
-<mousemove time="9036.000000" x="68" y="105" />
-<mousemove time="9071.000000" x="67" y="104" />
-<mousedown time="9209.000000" button="Left" x="67" y="104" />
-<mouseup time="9279.000000" button="Left" x="67" y="104" />
-<mousemove time="9418.000000" x="69" y="106" />
-<mousemove time="9454.000000" x="75" y="113" />
-<mousemove time="9490.000000" x="85" y="124" />
-<mousemove time="9526.000000" x="95" y="135" />
-<mousemove time="9560.000000" x="101" y="143" />
-<mousemove time="9596.000000" x="108" y="149" />
-<mousemove time="9631.000000" x="110" y="151" />
-<mousemove time="9665.000000" x="110" y="153" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audioclip-urlchanged-play-ui.xml Deleted

@@ -1,51 +0,0 @@
-<TestValidationScript >
-<mousemove time="206.000000" x="103" y="177" />
-<mousemove time="854.000000" x="102" y="132" />
-<mousemove time="889.000000" x="98" y="130" />
-<mousemove time="924.000000" x="92" y="126" />
-<mousemove time="958.000000" x="86" y="121" />
-<mousemove time="993.000000" x="82" y="118" />
-<mousemove time="1027.000000" x="78" y="115" />
-<mousemove time="1063.000000" x="75" y="112" />
-<mousemove time="1064.000000" x="74" y="111" />
-<mousemove time="1098.000000" x="73" y="110" />
-<mousedown time="1750.000000" button="Left" x="73" y="110" />
-<mouseup time="1820.000000" button="Left" x="73" y="110" />
-<mousemove time="2809.000000" x="75" y="110" />
-<mousemove time="2845.000000" x="86" y="110" />
-<mousemove time="2881.000000" x="99" y="110" />
-<mousemove time="2917.000000" x="109" y="109" />
-<mousemove time="2952.000000" x="115" y="109" />
-<mousemove time="2987.000000" x="117" y="109" />
-<mousemove time="3023.000000" x="121" y="109" />
-<mousemove time="3024.000000" x="122" y="109" />
-<mousemove time="3059.000000" x="123" y="108" />
-<mousedown time="3129.000000" button="Left" x="123" y="108" />
-<mouseup time="3199.000000" button="Left" x="123" y="108" />
-<mousemove time="5103.000000" x="120" y="108" />
-<mousemove time="5139.000000" x="105" y="108" />
-<mousemove time="5175.000000" x="86" y="108" />
-<mousemove time="5210.000000" x="74" y="105" />
-<mousemove time="5246.000000" x="69" y="103" />
-<mousemove time="5282.000000" x="68" y="102" />
-<mousedown time="5557.000000" button="Left" x="68" y="102" />
-<mouseup time="5628.000000" button="Left" x="68" y="102" />
-<mousemove time="7192.000000" x="78" y="113" />
-<mousemove time="7229.000000" x="92" y="130" />
-<mousemove time="7265.000000" x="103" y="148" />
-<mousemove time="7300.000000" x="108" y="154" />
-<mousemove time="7334.000000" x="110" y="155" />
-<mousemove time="8290.000000" x="110" y="153" />
-<mousemove time="8324.000000" x="110" y="148" />
-<mousemove time="8358.000000" x="110" y="145" />
-<mousemove time="8393.000000" x="110" y="144" />
-<mousemove time="8462.000000" x="110" y="143" />
-<mousemove time="8972.000000" x="110" y="142" />
-<mousemove time="9006.000000" x="112" y="132" />
-<mousemove time="9042.000000" x="117" y="121" />
-<mousemove time="9077.000000" x="121" y="113" />
-<mousemove time="9113.000000" x="123" y="109" />
-<mousemove time="9148.000000" x="124" y="109" />
-<mousedown time="9287.000000" button="Left" x="124" y="109" />
-<mouseup time="9356.000000" button="Left" x="124" y="109" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audiosource-mixing-play-ui.xml Deleted

@@ -1,152 +0,0 @@
-<TestValidationScript >
-<mousemove time="242.000000" x="110" y="198" />
-<mousemove time="1281.000000" x="104" y="142" />
-<mousemove time="1316.000000" x="93" y="126" />
-<mousemove time="1353.000000" x="82" y="109" />
-<mousemove time="1354.000000" x="78" y="103" />
-<mousemove time="1388.000000" x="71" y="96" />
-<mousemove time="1422.000000" x="64" y="91" />
-<mousemove time="1457.000000" x="59" y="89" />
-<mousemove time="1492.000000" x="57" y="88" />
-<mousemove time="1527.000000" x="53" y="88" />
-<mousemove time="1561.000000" x="48" y="88" />
-<mousemove time="1595.000000" x="46" y="87" />
-<mousemove time="1630.000000" x="46" y="86" />
-<mousemove time="1666.000000" x="45" y="84" />
-<mousemove time="1701.000000" x="44" y="83" />
-<mousemove time="1737.000000" x="43" y="82" />
-<mousemove time="1773.000000" x="41" y="80" />
-<mousemove time="1809.000000" x="38" y="80" />
-<mousemove time="1844.000000" x="37" y="80" />
-<mousedown time="2123.000000" button="Left" x="37" y="80" />
-<mousemove time="2297.000000" x="38" y="80" />
-<mousemove time="2336.000000" x="42" y="80" />
-<mousemove time="2372.000000" x="45" y="80" />
-<mousemove time="2409.000000" x="49" y="80" />
-<mousemove time="2410.000000" x="50" y="80" />
-<mousemove time="2447.000000" x="53" y="80" />
-<mousemove time="2483.000000" x="56" y="80" />
-<mousemove time="2522.000000" x="59" y="80" />
-<mousemove time="2559.000000" x="62" y="80" />
-<mousemove time="2597.000000" x="67" y="80" />
-<mousemove time="2634.000000" x="71" y="80" />
-<mousemove time="2671.000000" x="75" y="80" />
-<mousemove time="2708.000000" x="77" y="80" />
-<mousemove time="2745.000000" x="81" y="80" />
-<mousemove time="2783.000000" x="85" y="79" />
-<mousemove time="2820.000000" x="91" y="78" />
-<mousemove time="2856.000000" x="96" y="77" />
-<mousemove time="2893.000000" x="102" y="75" />
-<mousemove time="2894.000000" x="104" y="75" />
-<mousemove time="2931.000000" x="109" y="74" />
-<mousemove time="2968.000000" x="113" y="73" />
-<mousemove time="3008.000000" x="116" y="73" />
-<mousemove time="3046.000000" x="119" y="72" />
-<mousemove time="3083.000000" x="123" y="72" />
-<mousemove time="3120.000000" x="129" y="71" />
-<mousemove time="3156.000000" x="132" y="71" />
-<mousemove time="3191.000000" x="135" y="71" />
-<mousemove time="3227.000000" x="138" y="70" />
-<mousemove time="3262.000000" x="140" y="70" />
-<mousemove time="3298.000000" x="142" y="70" />
-<mousemove time="3334.000000" x="146" y="70" />
-<mousemove time="3370.000000" x="148" y="70" />
-<mousemove time="3405.000000" x="149" y="70" />
-<mouseup time="3509.000000" button="Left" x="149" y="70" />
-<mousemove time="3649.000000" x="150" y="70" />
-<mousemove time="3685.000000" x="151" y="72" />
-<mousemove time="3720.000000" x="152" y="73" />
-<mousemove time="3756.000000" x="152" y="74" />
-<mousemove time="3792.000000" x="153" y="75" />
-<mousemove time="3861.000000" x="153" y="76" />
-<mousemove time="3965.000000" x="154" y="76" />
-<mousedown time="3965.000000" button="Left" x="154" y="76" />
-<mousemove time="4514.000000" x="156" y="76" />
-<mousemove time="4551.000000" x="160" y="76" />
-<mousemove time="4587.000000" x="162" y="76" />
-<mousemove time="4622.000000" x="163" y="76" />
-<mousemove time="4797.000000" x="164" y="76" />
-<mousemove time="4867.000000" x="165" y="76" />
-<mousemove time="5146.000000" x="166" y="76" />
-<mousemove time="5183.000000" x="173" y="76" />
-<mousemove time="5219.000000" x="178" y="76" />
-<mousemove time="5220.000000" x="180" y="76" />
-<mousemove time="5256.000000" x="181" y="76" />
-<mousemove time="5257.000000" x="182" y="76" />
-<mousemove time="5327.000000" x="183" y="76" />
-<mousemove time="5363.000000" x="185" y="76" />
-<mousemove time="5398.000000" x="187" y="76" />
-<mouseup time="5673.000000" button="Left" x="187" y="76" />
-<mousemove time="5813.000000" x="181" y="77" />
-<mousemove time="5849.000000" x="158" y="84" />
-<mousemove time="5850.000000" x="141" y="89" />
-<mousemove time="5885.000000" x="107" y="97" />
-<mousemove time="5919.000000" x="82" y="101" />
-<mousemove time="5954.000000" x="66" y="105" />
-<mousemove time="5988.000000" x="53" y="107" />
-<mousemove time="6023.000000" x="44" y="108" />
-<mousemove time="6058.000000" x="39" y="110" />
-<mousemove time="6094.000000" x="35" y="114" />
-<mousemove time="6129.000000" x="33" y="116" />
-<mousemove time="6164.000000" x="33" y="117" />
-<mousemove time="6198.000000" x="33" y="118" />
-<mousemove time="6234.000000" x="34" y="120" />
-<mousemove time="6304.000000" x="35" y="121" />
-<mousemove time="6408.000000" x="36" y="121" />
-<mousemove time="6444.000000" x="37" y="121" />
-<mousemove time="6481.000000" x="38" y="121" />
-<mousemove time="6517.000000" x="39" y="122" />
-<mousedown time="6759.000000" button="Left" x="39" y="122" />
-<mousemove time="7138.000000" x="40" y="122" />
-<mousemove time="7173.000000" x="47" y="122" />
-<mousemove time="7210.000000" x="59" y="122" />
-<mousemove time="7247.000000" x="68" y="122" />
-<mousemove time="7283.000000" x="77" y="122" />
-<mousemove time="7320.000000" x="86" y="121" />
-<mousemove time="7321.000000" x="90" y="121" />
-<mousemove time="7357.000000" x="94" y="121" />
-<mousemove time="7394.000000" x="98" y="121" />
-<mousemove time="7431.000000" x="103" y="121" />
-<mousemove time="7469.000000" x="109" y="120" />
-<mousemove time="7506.000000" x="115" y="119" />
-<mousemove time="7543.000000" x="120" y="118" />
-<mousemove time="7544.000000" x="123" y="118" />
-<mousemove time="7581.000000" x="127" y="118" />
-<mousemove time="7618.000000" x="131" y="118" />
-<mousemove time="7654.000000" x="137" y="118" />
-<mousemove time="7691.000000" x="142" y="118" />
-<mousemove time="7731.000000" x="145" y="118" />
-<mousemove time="7768.000000" x="147" y="118" />
-<mousemove time="7805.000000" x="149" y="118" />
-<mousemove time="7806.000000" x="151" y="118" />
-<mousemove time="7843.000000" x="154" y="118" />
-<mousemove time="7881.000000" x="156" y="118" />
-<mousemove time="7986.000000" x="157" y="119" />
-<mousemove time="8023.000000" x="159" y="119" />
-<mousemove time="8059.000000" x="161" y="119" />
-<mousemove time="8095.000000" x="162" y="119" />
-<mousemove time="8199.000000" x="162" y="120" />
-<mouseup time="8474.000000" button="Left" x="162" y="120" />
-<mousemove time="8717.000000" x="158" y="122" />
-<mousemove time="8752.000000" x="142" y="129" />
-<mousemove time="8788.000000" x="113" y="144" />
-<mousemove time="8823.000000" x="97" y="149" />
-<mousemove time="8858.000000" x="85" y="154" />
-<mousemove time="8894.000000" x="76" y="159" />
-<mousemove time="8929.000000" x="66" y="163" />
-<mousemove time="8965.000000" x="59" y="166" />
-<mousemove time="9001.000000" x="56" y="167" />
-<mousemove time="9037.000000" x="55" y="168" />
-<mousemove time="9073.000000" x="52" y="169" />
-<mousemove time="9109.000000" x="47" y="171" />
-<mousemove time="9145.000000" x="45" y="171" />
-<mousemove time="9181.000000" x="42" y="171" />
-<mousemove time="9217.000000" x="41" y="171" />
-<mousemove time="9253.000000" x="39" y="170" />
-<mousemove time="9289.000000" x="38" y="168" />
-<mousemove time="9324.000000" x="37" y="167" />
-<mousemove time="9360.000000" x="36" y="166" />
-<mousemove time="9396.000000" x="35" y="165" />
-<mousemove time="9432.000000" x="35" y="164" />
-<mousedown time="9640.000000" button="Left" x="35" y="164" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audiosource-play-ui.xml Deleted

@@ -1,54 +0,0 @@
-<TestValidationScript >
-<mousemove time="245.000000" x="93" y="189" />
-<mousemove time="1315.000000" x="92" y="140" />
-<mousemove time="1350.000000" x="87" y="129" />
-<mousemove time="1385.000000" x="83" y="119" />
-<mousemove time="1420.000000" x="79" y="112" />
-<mousemove time="1456.000000" x="78" y="109" />
-<mousemove time="1669.000000" x="77" y="109" />
-<mousedown time="1814.000000" button="Left" x="77" y="109" />
-<mouseup time="1919.000000" button="Left" x="77" y="109" />
-<mousemove time="2557.000000" x="79" y="109" />
-<mousemove time="2595.000000" x="90" y="109" />
-<mousemove time="2629.000000" x="108" y="105" />
-<mousemove time="2669.000000" x="123" y="103" />
-<mousemove time="2672.000000" x="128" y="102" />
-<mousemove time="2709.000000" x="134" y="102" />
-<mousemove time="2745.000000" x="138" y="102" />
-<mousemove time="2781.000000" x="140" y="102" />
-<mousemove time="2819.000000" x="141" y="102" />
-<mousedown time="3004.000000" button="Left" x="141" y="102" />
-<mouseup time="3113.000000" button="Left" x="141" y="102" />
-<mousemove time="4155.000000" x="141" y="105" />
-<mousemove time="4190.000000" x="140" y="110" />
-<mousemove time="4231.000000" x="139" y="113" />
-<mousemove time="4267.000000" x="138" y="114" />
-<mousemove time="5400.000000" x="135" y="114" />
-<mousemove time="5436.000000" x="121" y="114" />
-<mousemove time="5472.000000" x="102" y="112" />
-<mousemove time="5511.000000" x="88" y="107" />
-<mousemove time="5550.000000" x="73" y="99" />
-<mousemove time="5590.000000" x="65" y="95" />
-<mousemove time="5630.000000" x="61" y="94" />
-<mousemove time="6136.000000" x="62" y="95" />
-<mousemove time="6176.000000" x="63" y="95" />
-<mousedown time="6284.000000" button="Left" x="63" y="95" />
-<mouseup time="6396.000000" button="Left" x="63" y="95" />
-<mousemove time="6570.000000" x="65" y="95" />
-<mousemove time="6605.000000" x="75" y="95" />
-<mousemove time="6645.000000" x="93" y="99" />
-<mousemove time="6681.000000" x="103" y="100" />
-<mousemove time="6718.000000" x="111" y="101" />
-<mousemove time="6756.000000" x="118" y="102" />
-<mousemove time="6791.000000" x="122" y="102" />
-<mousemove time="6831.000000" x="123" y="102" />
-<mousemove time="6906.000000" x="124" y="102" />
-<mousedown time="6981.000000" button="Left" x="124" y="102" />
-<mouseup time="7058.000000" button="Left" x="124" y="102" />
-<mousemove time="7406.000000" x="122" y="108" />
-<mousemove time="7440.000000" x="111" y="117" />
-<mousemove time="7475.000000" x="104" y="126" />
-<mousemove time="7510.000000" x="98" y="134" />
-<mousemove time="7544.000000" x="98" y="136" />
-<mousemove time="7579.000000" x="98" y="137" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-audiosource-urlchanged-play-ui.xml Deleted

@@ -1,54 +0,0 @@
-<TestValidationScript >
-<mousemove time="810.000000" x="117" y="162" />
-<mousemove time="844.000000" x="108" y="156" />
-<mousemove time="879.000000" x="102" y="150" />
-<mousemove time="914.000000" x="97" y="145" />
-<mousemove time="948.000000" x="93" y="137" />
-<mousemove time="983.000000" x="89" y="132" />
-<mousemove time="1018.000000" x="87" y="130" />
-<mousemove time="1053.000000" x="85" y="128" />
-<mousemove time="1088.000000" x="84" y="126" />
-<mousemove time="1461.000000" x="90" y="125" />
-<mousemove time="1496.000000" x="104" y="122" />
-<mousemove time="1532.000000" x="113" y="119" />
-<mousemove time="1567.000000" x="117" y="118" />
-<mousemove time="1602.000000" x="120" y="116" />
-<mousemove time="1638.000000" x="125" y="114" />
-<mousemove time="1674.000000" x="127" y="113" />
-<mousemove time="1710.000000" x="128" y="113" />
-<mousedown time="1813.000000" button="Left" x="128" y="113" />
-<mouseup time="1882.000000" button="Left" x="128" y="113" />
-<mousemove time="2734.000000" x="123" y="113" />
-<mousemove time="2770.000000" x="110" y="109" />
-<mousemove time="2806.000000" x="94" y="105" />
-<mousemove time="2840.000000" x="82" y="101" />
-<mousemove time="2876.000000" x="74" y="100" />
-<mousemove time="2877.000000" x="69" y="100" />
-<mousemove time="2912.000000" x="63" y="99" />
-<mousemove time="2948.000000" x="61" y="99" />
-<mousedown time="3497.000000" button="Left" x="61" y="99" />
-<mouseup time="3601.000000" button="Left" x="61" y="99" />
-<mousemove time="4932.000000" x="62" y="99" />
-<mousemove time="4968.000000" x="74" y="99" />
-<mousemove time="5004.000000" x="89" y="100" />
-<mousemove time="5040.000000" x="101" y="102" />
-<mousemove time="5076.000000" x="105" y="102" />
-<mousemove time="5111.000000" x="106" y="103" />
-<mousemove time="5147.000000" x="109" y="103" />
-<mousemove time="5182.000000" x="112" y="103" />
-<mousemove time="5217.000000" x="114" y="103" />
-<mousemove time="5287.000000" x="115" y="103" />
-<mousemove time="5323.000000" x="116" y="104" />
-<mousemove time="5359.000000" x="117" y="104" />
-<mousedown time="5394.000000" button="Left" x="117" y="104" />
-<mouseup time="5499.000000" button="Left" x="117" y="104" />
-<mousemove time="6962.000000" x="114" y="112" />
-<mousemove time="6998.000000" x="107" y="127" />
-<mousemove time="7033.000000" x="104" y="141" />
-<mousemove time="7068.000000" x="103" y="147" />
-<mousemove time="7102.000000" x="103" y="148" />
-<mousemove time="8530.000000" x="99" y="148" />
-<mousemove time="8565.000000" x="95" y="146" />
-<mousemove time="8600.000000" x="93" y="145" />
-<mousemove time="8703.000000" x="93" y="144" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-imagetexture-url-change-play-ui.xml Deleted

@@ -1,86 +0,0 @@
-<TestValidationScript >
-<mousemove time="174.000000" x="98" y="182" />
-<mousemove time="1136.000000" x="98" y="117" />
-<mousemove time="1138.000000" x="98" y="115" />
-<mousemove time="1173.000000" x="98" y="114" />
-<mousemove time="1448.000000" x="98" y="113" />
-<mousedown time="1586.000000" button="Left" x="98" y="113" />
-<mousemove time="1780.000000" x="98" y="114" />
-<mousemove time="1816.000000" x="98" y="119" />
-<mousemove time="1852.000000" x="97" y="126" />
-<mousemove time="1888.000000" x="97" y="133" />
-<mousemove time="1924.000000" x="97" y="139" />
-<mousemove time="1960.000000" x="97" y="143" />
-<mousemove time="1996.000000" x="100" y="147" />
-<mousemove time="2032.000000" x="105" y="149" />
-<mousemove time="2068.000000" x="111" y="150" />
-<mousemove time="2068.000000" x="113" y="150" />
-<mousemove time="2104.000000" x="120" y="147" />
-<mousemove time="2140.000000" x="122" y="146" />
-<mousemove time="2176.000000" x="123" y="146" />
-<mouseup time="2212.000000" button="Left" x="123" y="146" />
-<mousemove time="2386.000000" x="123" y="145" />
-<mousemove time="2422.000000" x="123" y="142" />
-<mousemove time="2457.000000" x="122" y="141" />
-<mousemove time="2492.000000" x="121" y="140" />
-<mousemove time="2526.000000" x="117" y="136" />
-<mousemove time="2562.000000" x="112" y="129" />
-<mousemove time="2598.000000" x="109" y="122" />
-<mousemove time="2634.000000" x="107" y="120" />
-<mousemove time="2669.000000" x="106" y="118" />
-<mousemove time="2704.000000" x="105" y="116" />
-<mousemove time="2740.000000" x="104" y="114" />
-<mousedown time="2844.000000" button="Left" x="104" y="114" />
-<mousemove time="3185.000000" x="104" y="111" />
-<mousemove time="3220.000000" x="104" y="101" />
-<mousemove time="3257.000000" x="104" y="85" />
-<mousemove time="3292.000000" x="104" y="71" />
-<mousemove time="3328.000000" x="111" y="60" />
-<mousemove time="3329.000000" x="115" y="55" />
-<mousemove time="3364.000000" x="123" y="48" />
-<mousemove time="3400.000000" x="129" y="43" />
-<mousemove time="3435.000000" x="131" y="42" />
-<mouseup time="3540.000000" button="Left" x="131" y="42" />
-<mousemove time="3610.000000" x="131" y="43" />
-<mousemove time="3645.000000" x="133" y="53" />
-<mousemove time="3679.000000" x="136" y="67" />
-<mousemove time="3714.000000" x="140" y="81" />
-<mousemove time="3749.000000" x="143" y="89" />
-<mousemove time="3783.000000" x="144" y="93" />
-<mousemove time="3817.000000" x="145" y="94" />
-<mousemove time="3852.000000" x="145" y="95" />
-<mousemove time="3887.000000" x="145" y="97" />
-<mousemove time="3922.000000" x="145" y="99" />
-<mousemove time="3957.000000" x="143" y="101" />
-<mousemove time="3993.000000" x="128" y="103" />
-<mousemove time="4028.000000" x="114" y="103" />
-<mousemove time="4063.000000" x="105" y="103" />
-<mousemove time="4098.000000" x="103" y="103" />
-<mousedown time="4167.000000" button="Left" x="103" y="103" />
-<mouseup time="4510.000000" button="Left" x="103" y="103" />
-<mousemove time="4616.000000" x="104" y="103" />
-<mousemove time="4652.000000" x="113" y="103" />
-<mousemove time="4688.000000" x="127" y="103" />
-<mousemove time="4724.000000" x="139" y="103" />
-<mousemove time="4760.000000" x="146" y="105" />
-<mousemove time="4794.000000" x="150" y="107" />
-<mousemove time="4829.000000" x="152" y="108" />
-<mousemove time="4863.000000" x="153" y="109" />
-<mousedown time="4898.000000" button="Left" x="153" y="109" />
-<mouseup time="5071.000000" button="Left" x="153" y="109" />
-<mousemove time="5141.000000" x="151" y="109" />
-<mousemove time="5177.000000" x="137" y="109" />
-<mousemove time="5212.000000" x="123" y="108" />
-<mousemove time="5247.000000" x="110" y="107" />
-<mousemove time="5282.000000" x="103" y="105" />
-<mousemove time="5318.000000" x="97" y="103" />
-<mousemove time="5354.000000" x="95" y="102" />
-<mousemove time="5390.000000" x="94" y="102" />
-<mousedown time="5495.000000" button="Left" x="94" y="102" />
-<mouseup time="5599.000000" button="Left" x="94" y="102" />
-<mousemove time="5808.000000" x="96" y="105" />
-<mousemove time="5844.000000" x="111" y="119" />
-<mousemove time="5880.000000" x="130" y="142" />
-<mousemove time="5916.000000" x="140" y="157" />
-<mousemove time="5951.000000" x="142" y="159" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-movietexture-control-play-ui.xml Deleted

@@ -1,68 +0,0 @@
-<TestValidationScript >
-<mousemove time="1738.000000" x="144" y="160" />
-<mousemove time="1777.000000" x="147" y="163" />
-<mousemove time="1819.000000" x="150" y="165" />
-<mousemove time="1820.000000" x="150" y="166" />
-<mousemove time="1860.000000" x="151" y="167" />
-<mousemove time="1937.000000" x="151" y="168" />
-<mousemove time="2018.000000" x="151" y="169" />
-<mousemove time="2057.000000" x="149" y="169" />
-<mousemove time="2096.000000" x="148" y="169" />
-<mousemove time="2137.000000" x="147" y="169" />
-<mousemove time="2177.000000" x="130" y="169" />
-<mousemove time="2218.000000" x="108" y="170" />
-<mousemove time="2256.000000" x="90" y="170" />
-<mousemove time="2296.000000" x="77" y="172" />
-<mousemove time="2297.000000" x="72" y="174" />
-<mousemove time="2337.000000" x="62" y="176" />
-<mousemove time="2377.000000" x="56" y="176" />
-<mousemove time="2417.000000" x="50" y="176" />
-<mousemove time="2457.000000" x="48" y="176" />
-<mousedown time="3417.000000" button="Left" x="48" y="176" />
-<mouseup time="3487.000000" button="Left" x="48" y="176" />
-<mousemove time="4099.000000" x="55" y="176" />
-<mousemove time="4135.000000" x="76" y="176" />
-<mousemove time="4136.000000" x="90" y="178" />
-<mousemove time="4171.000000" x="113" y="180" />
-<mousemove time="4206.000000" x="125" y="182" />
-<mousemove time="4241.000000" x="127" y="182" />
-<mousemove time="4276.000000" x="128" y="182" />
-<mousemove time="4450.000000" x="131" y="181" />
-<mousemove time="4486.000000" x="140" y="175" />
-<mousemove time="4522.000000" x="150" y="169" />
-<mousemove time="4558.000000" x="155" y="166" />
-<mousemove time="4593.000000" x="156" y="165" />
-<mousedown time="4697.000000" button="Left" x="156" y="165" />
-<mouseup time="4804.000000" button="Left" x="156" y="165" />
-<mousemove time="5492.000000" x="150" y="166" />
-<mousemove time="5533.000000" x="130" y="169" />
-<mousemove time="5571.000000" x="101" y="171" />
-<mousemove time="5576.000000" x="89" y="172" />
-<mousemove time="5613.000000" x="79" y="172" />
-<mousemove time="5652.000000" x="75" y="172" />
-<mousedown time="5972.000000" button="Left" x="75" y="172" />
-<mouseup time="6091.000000" button="Left" x="75" y="172" />
-<mousemove time="6332.000000" x="87" y="172" />
-<mousemove time="6332.000000" x="100" y="172" />
-<mousemove time="6370.000000" x="125" y="172" />
-<mousemove time="6410.000000" x="140" y="172" />
-<mousemove time="6453.000000" x="143" y="172" />
-<mousemove time="6932.000000" x="136" y="173" />
-<mousemove time="6936.000000" x="127" y="174" />
-<mousemove time="6972.000000" x="93" y="176" />
-<mousemove time="7010.000000" x="70" y="176" />
-<mousemove time="7052.000000" x="57" y="176" />
-<mousemove time="7056.000000" x="56" y="176" />
-<mousemove time="7092.000000" x="55" y="176" />
-<mousemove time="7216.000000" x="54" y="176" />
-<mousedown time="7296.000000" button="Left" x="54" y="176" />
-<mouseup time="7402.000000" button="Left" x="54" y="176" />
-<mousemove time="7712.000000" x="56" y="176" />
-<mousemove time="7748.000000" x="79" y="176" />
-<mousemove time="7784.000000" x="113" y="176" />
-<mousemove time="7820.000000" x="138" y="176" />
-<mousemove time="7856.000000" x="149" y="176" />
-<mousemove time="7892.000000" x="150" y="176" />
-<mousedown time="8129.000000" button="Left" x="150" y="176" />
-<mouseup time="8236.000000" button="Left" x="150" y="176" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-media-movietexture-url-change-play-ui.xml Deleted

@@ -1,39 +0,0 @@
-<TestValidationScript >
-<mousemove time="1283.000000" x="140" y="176" />
-<mousemove time="1319.000000" x="124" y="177" />
-<mousemove time="1331.000000" x="117" y="178" />
-<mousemove time="1369.000000" x="109" y="180" />
-<mousemove time="1404.000000" x="108" y="180" />
-<mousemove time="1608.000000" x="109" y="180" />
-<mousemove time="1642.000000" x="118" y="180" />
-<mousemove time="1678.000000" x="131" y="178" />
-<mousemove time="1691.000000" x="135" y="178" />
-<mousemove time="1733.000000" x="142" y="178" />
-<mousemove time="1768.000000" x="146" y="178" />
-<mousemove time="1804.000000" x="148" y="178" />
-<mousemove time="1810.000000" x="149" y="178" />
-<mousemove time="1851.000000" x="150" y="178" />
-<mousedown time="1971.000000" button="Left" x="150" y="178" />
-<mouseup time="2080.000000" button="Left" x="150" y="178" />
-<mousemove time="3527.000000" x="139" y="178" />
-<mousemove time="3567.000000" x="121" y="177" />
-<mousemove time="3608.000000" x="104" y="177" />
-<mousemove time="3648.000000" x="88" y="177" />
-<mousemove time="3686.000000" x="80" y="177" />
-<mousemove time="3726.000000" x="75" y="177" />
-<mousemove time="3767.000000" x="73" y="177" />
-<mousemove time="3926.000000" x="73" y="176" />
-<mousedown time="5049.000000" button="Left" x="73" y="176" />
-<mouseup time="5163.000000" button="Left" x="73" y="176" />
-<mousemove time="8037.000000" x="78" y="175" />
-<mousemove time="8049.000000" x="83" y="175" />
-<mousemove time="8089.000000" x="93" y="172" />
-<mousemove time="8127.000000" x="102" y="170" />
-<mousemove time="8162.000000" x="105" y="169" />
-<mousemove time="8197.000000" x="106" y="168" />
-<mousemove time="8246.000000" x="106" y="167" />
-<mousemove time="8964.000000" x="107" y="167" />
-<mousemove time="8999.000000" x="110" y="167" />
-<mousemove time="9035.000000" x="115" y="167" />
-<mousemove time="9087.000000" x="116" y="167" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-misc-hc-proto-events-play-ui.xml Deleted

@@ -1,92 +0,0 @@
-<TestValidationScript >
-<mousemove time="856.000000" x="116" y="164" />
-<mousemove time="891.000000" x="114" y="154" />
-<mousemove time="926.000000" x="111" y="143" />
-<mousemove time="961.000000" x="107" y="133" />
-<mousemove time="996.000000" x="104" y="123" />
-<mousemove time="1031.000000" x="102" y="116" />
-<mousemove time="1066.000000" x="101" y="111" />
-<mousemove time="1102.000000" x="101" y="108" />
-<mousemove time="1171.000000" x="100" y="107" />
-<mousemove time="1206.000000" x="100" y="106" />
-<mousemove time="1241.000000" x="100" y="105" />
-<mousemove time="1310.000000" x="100" y="104" />
-<mousedown time="1624.000000" button="Left" x="100" y="104" />
-<mouseup time="2069.000000" button="Left" x="100" y="104" />
-<mousemove time="2374.000000" x="100" y="106" />
-<mousemove time="2410.000000" x="100" y="116" />
-<mousemove time="2445.000000" x="100" y="127" />
-<mousemove time="2481.000000" x="100" y="132" />
-<mousemove time="2515.000000" x="100" y="134" />
-<mousemove time="2755.000000" x="99" y="133" />
-<mousemove time="2790.000000" x="99" y="129" />
-<mousemove time="2825.000000" x="99" y="123" />
-<mousemove time="2860.000000" x="99" y="115" />
-<mousemove time="2895.000000" x="99" y="109" />
-<mousemove time="2931.000000" x="99" y="106" />
-<mousemove time="2967.000000" x="98" y="104" />
-<mousemove time="3003.000000" x="98" y="103" />
-<mousedown time="3548.000000" button="Left" x="98" y="103" />
-<mouseup time="3823.000000" button="Left" x="98" y="103" />
-<mousemove time="4061.000000" x="98" y="104" />
-<mousemove time="4097.000000" x="98" y="115" />
-<mousemove time="4133.000000" x="98" y="129" />
-<mousemove time="4167.000000" x="98" y="137" />
-<mousemove time="4202.000000" x="99" y="139" />
-<mousemove time="4477.000000" x="99" y="136" />
-<mousemove time="4513.000000" x="99" y="128" />
-<mousemove time="4548.000000" x="98" y="120" />
-<mousemove time="4583.000000" x="98" y="113" />
-<mousemove time="4619.000000" x="98" y="110" />
-<mousemove time="4654.000000" x="98" y="107" />
-<mousemove time="4690.000000" x="98" y="104" />
-<mousemove time="4726.000000" x="98" y="102" />
-<mousedown time="5000.000000" button="Left" x="98" y="102" />
-<mousemove time="5308.000000" x="97" y="101" />
-<mousemove time="5343.000000" x="88" y="90" />
-<mousemove time="5380.000000" x="73" y="76" />
-<mousemove time="5381.000000" x="69" y="72" />
-<mousemove time="5417.000000" x="62" y="65" />
-<mousemove time="5453.000000" x="59" y="60" />
-<mousemove time="5489.000000" x="58" y="57" />
-<mousemove time="5525.000000" x="58" y="55" />
-<mousemove time="5560.000000" x="64" y="53" />
-<mousemove time="5596.000000" x="77" y="52" />
-<mousemove time="5631.000000" x="86" y="52" />
-<mousemove time="5666.000000" x="92" y="52" />
-<mousemove time="5703.000000" x="97" y="55" />
-<mousemove time="5739.000000" x="99" y="57" />
-<mousemove time="5775.000000" x="100" y="59" />
-<mousemove time="5845.000000" x="100" y="60" />
-<mouseup time="5881.000000" button="Left" x="100" y="60" />
-<mousemove time="6020.000000" x="100" y="64" />
-<mousemove time="6055.000000" x="99" y="73" />
-<mousemove time="6090.000000" x="98" y="83" />
-<mousemove time="6125.000000" x="98" y="93" />
-<mousemove time="6161.000000" x="98" y="100" />
-<mousemove time="6196.000000" x="98" y="102" />
-<mousemove time="6231.000000" x="98" y="103" />
-<mousemove time="6232.000000" x="98" y="104" />
-<mousemove time="6268.000000" x="98" y="106" />
-<mousemove time="6303.000000" x="98" y="111" />
-<mousemove time="6340.000000" x="98" y="122" />
-<mousemove time="6375.000000" x="102" y="138" />
-<mousemove time="6410.000000" x="106" y="153" />
-<mousemove time="6445.000000" x="108" y="160" />
-<mousemove time="6480.000000" x="108" y="162" />
-<mousemove time="6584.000000" x="109" y="162" />
-<mousemove time="7161.000000" x="109" y="156" />
-<mousemove time="7196.000000" x="109" y="140" />
-<mousemove time="7231.000000" x="108" y="123" />
-<mousemove time="7266.000000" x="107" y="109" />
-<mousemove time="7301.000000" x="105" y="99" />
-<mousemove time="7338.000000" x="105" y="92" />
-<mousemove time="7374.000000" x="104" y="87" />
-<mousemove time="7547.000000" x="104" y="94" />
-<mousemove time="7583.000000" x="104" y="109" />
-<mousemove time="7620.000000" x="105" y="123" />
-<mousemove time="7655.000000" x="107" y="136" />
-<mousemove time="7690.000000" x="110" y="148" />
-<mousemove time="7725.000000" x="112" y="156" />
-<mousemove time="7759.000000" x="114" y="159" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-misc-non-linear-parsing-conditional-play-ui.xml Deleted

@@ -1,72 +0,0 @@
-<TestValidationScript >
-<mousemove time="1031.000000" x="109" y="134" />
-<mousemove time="1031.000000" x="106" y="126" />
-<mousemove time="1067.000000" x="103" y="116" />
-<mousemove time="1102.000000" x="102" y="110" />
-<mousemove time="1138.000000" x="102" y="106" />
-<mousemove time="1173.000000" x="101" y="102" />
-<mousemove time="1209.000000" x="100" y="99" />
-<mousemove time="1244.000000" x="100" y="98" />
-<mousemove time="1280.000000" x="100" y="97" />
-<mousedown time="1622.000000" button="Left" x="100" y="97" />
-<mouseup time="2272.000000" button="Left" x="100" y="97" />
-<mousemove time="2546.000000" x="100" y="98" />
-<mousemove time="2581.000000" x="100" y="112" />
-<mousemove time="2618.000000" x="102" y="127" />
-<mousemove time="2654.000000" x="104" y="139" />
-<mousemove time="2690.000000" x="104" y="143" />
-<mousemove time="2690.000000" x="104" y="144" />
-<mousemove time="2760.000000" x="104" y="143" />
-<mousemove time="2795.000000" x="103" y="133" />
-<mousemove time="2831.000000" x="100" y="117" />
-<mousemove time="2867.000000" x="98" y="105" />
-<mousemove time="2903.000000" x="97" y="100" />
-<mousemove time="2938.000000" x="97" y="99" />
-<mousedown time="3042.000000" button="Left" x="97" y="99" />
-<mousemove time="3247.000000" x="92" y="99" />
-<mousemove time="3283.000000" x="81" y="98" />
-<mousemove time="3319.000000" x="64" y="93" />
-<mousemove time="3355.000000" x="52" y="89" />
-<mousemove time="3391.000000" x="46" y="87" />
-<mousemove time="3425.000000" x="44" y="86" />
-<mouseup time="3633.000000" button="Left" x="44" y="86" />
-<mousemove time="3840.000000" x="45" y="86" />
-<mousemove time="3875.000000" x="53" y="87" />
-<mousemove time="3910.000000" x="68" y="93" />
-<mousemove time="3946.000000" x="78" y="100" />
-<mousemove time="3982.000000" x="85" y="107" />
-<mousemove time="4017.000000" x="87" y="110" />
-<mousemove time="4052.000000" x="90" y="112" />
-<mousemove time="4087.000000" x="92" y="113" />
-<mousemove time="4123.000000" x="93" y="113" />
-<mousedown time="4193.000000" button="Left" x="93" y="113" />
-<mouseup time="4500.000000" button="Left" x="93" y="113" />
-<mousemove time="4741.000000" x="93" y="114" />
-<mousemove time="4777.000000" x="97" y="125" />
-<mousemove time="4813.000000" x="103" y="138" />
-<mousemove time="4848.000000" x="105" y="148" />
-<mousemove time="4883.000000" x="107" y="152" />
-<mousemove time="4918.000000" x="108" y="153" />
-<mousedown time="5125.000000" button="Left" x="108" y="153" />
-<mouseup time="5299.000000" button="Left" x="108" y="153" />
-<mousemove time="5572.000000" x="108" y="150" />
-<mousemove time="5607.000000" x="107" y="136" />
-<mousemove time="5642.000000" x="103" y="120" />
-<mousemove time="5678.000000" x="103" y="107" />
-<mousemove time="5712.000000" x="101" y="96" />
-<mousemove time="5748.000000" x="101" y="88" />
-<mousemove time="5784.000000" x="100" y="84" />
-<mousemove time="5820.000000" x="100" y="83" />
-<mousemove time="5889.000000" x="100" y="82" />
-<mousedown time="5994.000000" button="Left" x="100" y="82" />
-<mouseup time="6131.000000" button="Left" x="100" y="82" />
-<mousemove time="6269.000000" x="105" y="82" />
-<mousemove time="6305.000000" x="112" y="81" />
-<mousemove time="6340.000000" x="120" y="80" />
-<mousemove time="6376.000000" x="125" y="79" />
-<mousemove time="6412.000000" x="130" y="77" />
-<mousemove time="6446.000000" x="136" y="75" />
-<mousemove time="6481.000000" x="144" y="70" />
-<mousemove time="6516.000000" x="150" y="68" />
-<mousemove time="6550.000000" x="154" y="65" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-proto-conditional-play-ui.xml Deleted

@@ -1,30 +0,0 @@
-<TestValidationScript >
-<mousemove time="173.000000" x="154" y="110" />
-<mousemove time="890.000000" x="148" y="69" />
-<mousemove time="928.000000" x="127" y="78" />
-<mousemove time="966.000000" x="113" y="83" />
-<mousemove time="1001.000000" x="100" y="84" />
-<mousemove time="1035.000000" x="88" y="86" />
-<mousemove time="1073.000000" x="81" y="89" />
-<mousemove time="1108.000000" x="75" y="92" />
-<mousemove time="1144.000000" x="74" y="93" />
-<mousemove time="1183.000000" x="73" y="93" />
-<mousemove time="1218.000000" x="72" y="93" />
-<mousemove time="1255.000000" x="71" y="93" />
-<mousemove time="1291.000000" x="70" y="95" />
-<mousemove time="1327.000000" x="68" y="96" />
-<mousemove time="1365.000000" x="68" y="97" />
-<mousemove time="1404.000000" x="68" y="98" />
-<mousedown time="1651.000000" button="Left" x="68" y="98" />
-<mouseup time="2112.000000" button="Left" x="68" y="98" />
-<mousedown time="2715.000000" button="Left" x="68" y="98" />
-<mouseup time="3087.000000" button="Left" x="68" y="98" />
-<mousedown time="3702.000000" button="Left" x="68" y="98" />
-<mouseup time="4028.000000" button="Left" x="68" y="98" />
-<mousedown time="4782.000000" button="Left" x="68" y="98" />
-<mouseup time="5042.000000" button="Left" x="68" y="98" />
-<mousemove time="5572.000000" x="68" y="102" />
-<mousemove time="5612.000000" x="74" y="119" />
-<mousemove time="5650.000000" x="76" y="126" />
-<mousemove time="5688.000000" x="76" y="128" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-proto-multiple-play-ui.xml Deleted

@@ -1,79 +0,0 @@
-<TestValidationScript >
-<mousemove time="221.000000" x="76" y="173" />
-<mousemove time="1095.000000" x="76" y="127" />
-<mousemove time="1129.000000" x="76" y="125" />
-<mousemove time="1130.000000" x="75" y="122" />
-<mousemove time="1167.000000" x="73" y="117" />
-<mousemove time="1203.000000" x="70" y="113" />
-<mousemove time="1239.000000" x="69" y="110" />
-<mousemove time="1274.000000" x="69" y="109" />
-<mousemove time="1446.000000" x="68" y="109" />
-<mousemove time="1480.000000" x="68" y="108" />
-<mousemove time="1585.000000" x="69" y="108" />
-<mousemove time="1621.000000" x="78" y="111" />
-<mousemove time="1657.000000" x="85" y="114" />
-<mousemove time="1693.000000" x="89" y="116" />
-<mousemove time="1728.000000" x="91" y="117" />
-<mousedown time="2175.000000" button="Left" x="91" y="117" />
-<mouseup time="2314.000000" button="Left" x="91" y="117" />
-<mousemove time="2622.000000" x="92" y="117" />
-<mousemove time="2657.000000" x="97" y="117" />
-<mousemove time="2693.000000" x="106" y="113" />
-<mousemove time="2728.000000" x="113" y="109" />
-<mousemove time="2764.000000" x="118" y="106" />
-<mousemove time="2801.000000" x="120" y="105" />
-<mousemove time="2836.000000" x="125" y="103" />
-<mousemove time="2873.000000" x="130" y="99" />
-<mousemove time="2909.000000" x="133" y="97" />
-<mousemove time="2944.000000" x="134" y="97" />
-<mousedown time="3047.000000" button="Left" x="134" y="97" />
-<mouseup time="3154.000000" button="Left" x="134" y="97" />
-<mousemove time="3362.000000" x="126" y="97" />
-<mousemove time="3397.000000" x="108" y="103" />
-<mousemove time="3433.000000" x="84" y="107" />
-<mousemove time="3470.000000" x="66" y="107" />
-<mousemove time="3505.000000" x="55" y="107" />
-<mousemove time="3541.000000" x="44" y="105" />
-<mousemove time="3576.000000" x="41" y="104" />
-<mousemove time="3611.000000" x="40" y="103" />
-<mousemove time="3647.000000" x="40" y="102" />
-<mousedown time="3718.000000" button="Left" x="40" y="102" />
-<mouseup time="3891.000000" button="Left" x="40" y="102" />
-<mousemove time="4097.000000" x="43" y="102" />
-<mousemove time="4132.000000" x="67" y="108" />
-<mousemove time="4167.000000" x="80" y="114" />
-<mousemove time="4202.000000" x="87" y="119" />
-<mousemove time="4238.000000" x="91" y="120" />
-<mousemove time="4274.000000" x="93" y="120" />
-<mousemove time="4310.000000" x="94" y="120" />
-<mousedown time="4851.000000" button="Left" x="94" y="120" />
-<mouseup time="4990.000000" button="Left" x="94" y="120" />
-<mousemove time="5163.000000" x="88" y="120" />
-<mousemove time="5198.000000" x="74" y="120" />
-<mousemove time="5235.000000" x="65" y="118" />
-<mousemove time="5270.000000" x="57" y="114" />
-<mousemove time="5305.000000" x="56" y="112" />
-<mousemove time="5342.000000" x="55" y="110" />
-<mousemove time="5377.000000" x="55" y="109" />
-<mousedown time="5615.000000" button="Left" x="55" y="109" />
-<mouseup time="5719.000000" button="Left" x="55" y="109" />
-<mousemove time="5824.000000" x="56" y="109" />
-<mousemove time="5860.000000" x="69" y="109" />
-<mousemove time="5896.000000" x="87" y="109" />
-<mousemove time="5931.000000" x="107" y="109" />
-<mousemove time="5967.000000" x="121" y="108" />
-<mousemove time="6002.000000" x="132" y="105" />
-<mousemove time="6037.000000" x="140" y="102" />
-<mousemove time="6073.000000" x="146" y="100" />
-<mousemove time="6109.000000" x="147" y="100" />
-<mousemove time="6178.000000" x="147" y="99" />
-<mousedown time="6281.000000" button="Left" x="147" y="99" />
-<mouseup time="6417.000000" button="Left" x="147" y="99" />
-<mousemove time="6659.000000" x="147" y="101" />
-<mousemove time="6695.000000" x="147" y="116" />
-<mousemove time="6731.000000" x="147" y="144" />
-<mousemove time="6767.000000" x="145" y="165" />
-<mousemove time="6803.000000" x="145" y="171" />
-<mousemove time="6837.000000" x="145" y="173" />
-<mousemove time="6872.000000" x="144" y="174" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-proto-nested-play-ui.xml Deleted

@@ -1,54 +0,0 @@
-<TestValidationScript >
-<mousemove time="869.000000" x="143" y="174" />
-<mousemove time="903.000000" x="133" y="155" />
-<mousemove time="938.000000" x="126" y="144" />
-<mousemove time="974.000000" x="123" y="134" />
-<mousemove time="1009.000000" x="121" y="130" />
-<mousemove time="1078.000000" x="121" y="129" />
-<mousemove time="1419.000000" x="120" y="129" />
-<mousemove time="1453.000000" x="114" y="129" />
-<mousemove time="1487.000000" x="99" y="129" />
-<mousemove time="1524.000000" x="80" y="129" />
-<mousemove time="1560.000000" x="66" y="129" />
-<mousemove time="1595.000000" x="58" y="129" />
-<mousemove time="1630.000000" x="57" y="129" />
-<mousemove time="1665.000000" x="55" y="129" />
-<mousedown time="2178.000000" button="Left" x="55" y="129" />
-<mouseup time="2281.000000" button="Left" x="55" y="129" />
-<mousemove time="2587.000000" x="56" y="129" />
-<mousemove time="2622.000000" x="70" y="129" />
-<mousemove time="2657.000000" x="91" y="130" />
-<mousemove time="2693.000000" x="108" y="130" />
-<mousemove time="2728.000000" x="116" y="130" />
-<mousemove time="2762.000000" x="117" y="130" />
-<mousedown time="3239.000000" button="Left" x="117" y="130" />
-<mouseup time="3375.000000" button="Left" x="117" y="130" />
-<mousemove time="3718.000000" x="115" y="130" />
-<mousemove time="3753.000000" x="88" y="130" />
-<mousemove time="3789.000000" x="56" y="132" />
-<mousemove time="3825.000000" x="36" y="132" />
-<mousemove time="3859.000000" x="32" y="132" />
-<mousemove time="3893.000000" x="31" y="132" />
-<mousemove time="4168.000000" x="36" y="132" />
-<mousemove time="4203.000000" x="50" y="131" />
-<mousemove time="4238.000000" x="74" y="128" />
-<mousemove time="4273.000000" x="89" y="127" />
-<mousemove time="4308.000000" x="98" y="126" />
-<mousemove time="4344.000000" x="101" y="126" />
-<mousemove time="4379.000000" x="102" y="126" />
-<mousemove time="4414.000000" x="103" y="126" />
-<mousemove time="4449.000000" x="104" y="126" />
-<mousemove time="4483.000000" x="105" y="126" />
-<mousemove time="4654.000000" x="99" y="126" />
-<mousemove time="4689.000000" x="83" y="126" />
-<mousemove time="4724.000000" x="62" y="127" />
-<mousemove time="4762.000000" x="52" y="128" />
-<mousemove time="4797.000000" x="50" y="128" />
-<mousemove time="4832.000000" x="49" y="128" />
-<mousemove time="4867.000000" x="47" y="128" />
-<mousemove time="5653.000000" x="53" y="135" />
-<mousemove time="5687.000000" x="71" y="150" />
-<mousemove time="5723.000000" x="87" y="160" />
-<mousemove time="5757.000000" x="96" y="165" />
-<mousemove time="5792.000000" x="98" y="167" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-proto-route-play-ui.xml Deleted

@@ -1,21 +0,0 @@
-<TestValidationScript >
-<mousemove time="1478.000000" x="95" y="161" />
-<mousemove time="1478.000000" x="91" y="155" />
-<mousemove time="1514.000000" x="82" y="143" />
-<mousemove time="1550.000000" x="78" y="132" />
-<mousemove time="1585.000000" x="74" y="124" />
-<mousemove time="1622.000000" x="71" y="117" />
-<mousemove time="1659.000000" x="70" y="113" />
-<mousemove time="1696.000000" x="69" y="111" />
-<mousemove time="1732.000000" x="69" y="110" />
-<mousemove time="1768.000000" x="69" y="109" />
-<mousedown time="2332.000000" button="Left" x="69" y="109" />
-<mouseup time="5149.000000" button="Left" x="69" y="109" />
-<mousedown time="6858.000000" button="Left" x="69" y="109" />
-<mouseup time="8110.000000" button="Left" x="69" y="109" />
-<mousemove time="9229.000000" x="70" y="112" />
-<mousemove time="9266.000000" x="88" y="131" />
-<mousemove time="9302.000000" x="112" y="147" />
-<mousemove time="9339.000000" x="131" y="159" />
-<mousemove time="9374.000000" x="138" y="163" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-script-child-create-play-ui.xml Deleted

@@ -1,31 +0,0 @@
-<TestValidationScript >
-<mousemove time="796.000000" x="137" y="163" />
-<mousemove time="831.000000" x="130" y="155" />
-<mousemove time="867.000000" x="121" y="141" />
-<mousemove time="902.000000" x="116" y="131" />
-<mousemove time="937.000000" x="111" y="124" />
-<mousemove time="938.000000" x="110" y="122" />
-<mousemove time="972.000000" x="107" y="116" />
-<mousemove time="1006.000000" x="105" y="114" />
-<mousemove time="1040.000000" x="104" y="112" />
-<mousemove time="1110.000000" x="103" y="111" />
-<mousemove time="1146.000000" x="102" y="111" />
-<mousemove time="1181.000000" x="102" y="109" />
-<mousemove time="1216.000000" x="101" y="109" />
-<mousemove time="1251.000000" x="101" y="108" />
-<mousemove time="1287.000000" x="101" y="106" />
-<mousemove time="1322.000000" x="101" y="105" />
-<mousemove time="1357.000000" x="101" y="104" />
-<mousemove time="1392.000000" x="101" y="103" />
-<mousemove time="1427.000000" x="101" y="102" />
-<mousedown time="1972.000000" button="Left" x="101" y="102" />
-<mouseup time="2755.000000" button="Left" x="101" y="102" />
-<mousedown time="3235.000000" button="Left" x="101" y="102" />
-<mousemove time="3574.000000" x="103" y="106" />
-<mousemove time="3610.000000" x="107" y="120" />
-<mousemove time="3646.000000" x="111" y="135" />
-<mousemove time="3682.000000" x="114" y="148" />
-<mousemove time="3719.000000" x="116" y="156" />
-<mousemove time="3755.000000" x="117" y="158" />
-<mouseup time="3925.000000" button="Left" x="117" y="158" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-script-date.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-script-load-url-play-ui.xml Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-script-node-create-play-ui.xml Deleted

@@ -1,50 +0,0 @@
-<TestValidationScript >
-<mousemove time="200.000000" x="98" y="145" />
-<mousemove time="953.000000" x="98" y="103" />
-<mousemove time="989.000000" x="98" y="112" />
-<mousemove time="1025.000000" x="100" y="122" />
-<mousemove time="1061.000000" x="100" y="127" />
-<mousemove time="1095.000000" x="100" y="129" />
-<mousemove time="1197.000000" x="100" y="125" />
-<mousemove time="1232.000000" x="100" y="119" />
-<mousemove time="1267.000000" x="100" y="112" />
-<mousemove time="1303.000000" x="100" y="108" />
-<mousemove time="1338.000000" x="100" y="107" />
-<mousemove time="1441.000000" x="100" y="106" />
-<mousedown time="1714.000000" button="Left" x="100" y="106" />
-<mouseup time="1922.000000" button="Left" x="100" y="106" />
-<mousedown time="2503.000000" button="Left" x="100" y="106" />
-<mouseup time="3050.000000" button="Left" x="100" y="106" />
-<mousemove time="3326.000000" x="100" y="117" />
-<mousemove time="3362.000000" x="101" y="135" />
-<mousemove time="3362.000000" x="102" y="142" />
-<mousemove time="3397.000000" x="103" y="151" />
-<mousemove time="3431.000000" x="103" y="153" />
-<mousemove time="3534.000000" x="103" y="143" />
-<mousemove time="3569.000000" x="102" y="132" />
-<mousemove time="3604.000000" x="101" y="120" />
-<mousemove time="3640.000000" x="100" y="113" />
-<mousemove time="3675.000000" x="99" y="110" />
-<mousemove time="3710.000000" x="99" y="109" />
-<mousemove time="3743.000000" x="99" y="108" />
-<mousemove time="3779.000000" x="99" y="106" />
-<mousemove time="3815.000000" x="99" y="105" />
-<mousemove time="3851.000000" x="99" y="104" />
-<mousemove time="3989.000000" x="99" y="103" />
-<mousedown time="4025.000000" button="Left" x="99" y="103" />
-<mouseup time="4198.000000" button="Left" x="99" y="103" />
-<mousemove time="4406.000000" x="99" y="115" />
-<mousemove time="4442.000000" x="99" y="136" />
-<mousemove time="4476.000000" x="99" y="150" />
-<mousemove time="4512.000000" x="99" y="155" />
-<mousemove time="7365.000000" x="99" y="148" />
-<mousemove time="7399.000000" x="98" y="137" />
-<mousemove time="7434.000000" x="96" y="120" />
-<mousemove time="7468.000000" x="95" y="111" />
-<mousemove time="7503.000000" x="95" y="110" />
-<mousemove time="8081.000000" x="95" y="111" />
-<mousemove time="8117.000000" x="103" y="120" />
-<mousemove time="8152.000000" x="110" y="127" />
-<mousemove time="8187.000000" x="115" y="132" />
-<mousemove time="8221.000000" x="118" y="132" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-script-proto-play-ui.xml Deleted

@@ -1,100 +0,0 @@
-<TestValidationScript >
-<mousemove time="1638.000000" x="5" y="172" />
-<mousemove time="1675.000000" x="3" y="158" />
-<mousemove time="1711.000000" x="2" y="152" />
-<mousemove time="1747.000000" x="11" y="143" />
-<mousemove time="1785.000000" x="34" y="132" />
-<mousemove time="1823.000000" x="54" y="127" />
-<mousemove time="1860.000000" x="70" y="126" />
-<mousemove time="1897.000000" x="77" y="128" />
-<mousemove time="1935.000000" x="83" y="132" />
-<mousemove time="1937.000000" x="85" y="133" />
-<mousemove time="1977.000000" x="87" y="134" />
-<mousemove time="2015.000000" x="91" y="136" />
-<mousemove time="2053.000000" x="94" y="137" />
-<mousemove time="2090.000000" x="95" y="139" />
-<mousemove time="2690.000000" x="93" y="133" />
-<mousemove time="2726.000000" x="92" y="115" />
-<mousemove time="2727.000000" x="92" y="109" />
-<mousemove time="2769.000000" x="92" y="94" />
-<mousemove time="2807.000000" x="96" y="83" />
-<mousemove time="2845.000000" x="103" y="71" />
-<mousemove time="2883.000000" x="114" y="62" />
-<mousemove time="2922.000000" x="118" y="61" />
-<mousemove time="2960.000000" x="124" y="61" />
-<mousemove time="2999.000000" x="130" y="63" />
-<mousemove time="3037.000000" x="134" y="74" />
-<mousemove time="3038.000000" x="137" y="80" />
-<mousemove time="3075.000000" x="141" y="98" />
-<mousemove time="3112.000000" x="144" y="116" />
-<mousemove time="3151.000000" x="145" y="128" />
-<mousemove time="3190.000000" x="145" y="136" />
-<mousemove time="3227.000000" x="144" y="143" />
-<mousemove time="3228.000000" x="141" y="145" />
-<mousemove time="3265.000000" x="135" y="150" />
-<mousemove time="3303.000000" x="129" y="152" />
-<mousemove time="3343.000000" x="120" y="152" />
-<mousemove time="3381.000000" x="110" y="152" />
-<mousemove time="3383.000000" x="105" y="152" />
-<mousemove time="3421.000000" x="95" y="150" />
-<mousemove time="3460.000000" x="88" y="146" />
-<mousemove time="3499.000000" x="83" y="141" />
-<mousemove time="3539.000000" x="79" y="126" />
-<mousemove time="3577.000000" x="77" y="113" />
-<mousemove time="3615.000000" x="77" y="109" />
-<mousemove time="3653.000000" x="77" y="108" />
-<mousemove time="3727.000000" x="78" y="108" />
-<mousemove time="3769.000000" x="82" y="106" />
-<mousemove time="3808.000000" x="90" y="100" />
-<mousemove time="3845.000000" x="104" y="91" />
-<mousemove time="3884.000000" x="115" y="79" />
-<mousemove time="3922.000000" x="126" y="68" />
-<mousemove time="3923.000000" x="129" y="61" />
-<mousemove time="3961.000000" x="132" y="53" />
-<mousemove time="3999.000000" x="134" y="49" />
-<mousemove time="4038.000000" x="134" y="46" />
-<mousemove time="4075.000000" x="130" y="40" />
-<mousemove time="4113.000000" x="115" y="33" />
-<mousemove time="4151.000000" x="100" y="33" />
-<mousemove time="4190.000000" x="78" y="40" />
-<mousemove time="4229.000000" x="59" y="52" />
-<mousemove time="4268.000000" x="48" y="61" />
-<mousemove time="4307.000000" x="45" y="67" />
-<mousemove time="4347.000000" x="45" y="79" />
-<mousemove time="4385.000000" x="45" y="94" />
-<mousemove time="4423.000000" x="48" y="114" />
-<mousemove time="4461.000000" x="53" y="125" />
-<mousemove time="4500.000000" x="61" y="135" />
-<mousemove time="4538.000000" x="71" y="142" />
-<mousemove time="4577.000000" x="83" y="148" />
-<mousemove time="4615.000000" x="100" y="153" />
-<mousemove time="4654.000000" x="111" y="153" />
-<mousemove time="4693.000000" x="123" y="153" />
-<mousemove time="4732.000000" x="135" y="153" />
-<mousemove time="4770.000000" x="150" y="146" />
-<mousemove time="4807.000000" x="158" y="138" />
-<mousemove time="4845.000000" x="165" y="127" />
-<mousemove time="4884.000000" x="169" y="116" />
-<mousemove time="4921.000000" x="170" y="103" />
-<mousemove time="4960.000000" x="170" y="86" />
-<mousemove time="4999.000000" x="170" y="74" />
-<mousemove time="5039.000000" x="169" y="64" />
-<mousemove time="5077.000000" x="167" y="58" />
-<mousemove time="5079.000000" x="167" y="56" />
-<mousemove time="5118.000000" x="165" y="53" />
-<mousemove time="5155.000000" x="161" y="51" />
-<mousemove time="5193.000000" x="157" y="49" />
-<mousemove time="5231.000000" x="155" y="49" />
-<mousemove time="5269.000000" x="154" y="49" />
-<mousemove time="5416.000000" x="154" y="50" />
-<mousemove time="5453.000000" x="154" y="72" />
-<mousemove time="5491.000000" x="154" y="87" />
-<mousemove time="5528.000000" x="152" y="106" />
-<mousemove time="5566.000000" x="150" y="122" />
-<mousemove time="5604.000000" x="148" y="132" />
-<mousemove time="5641.000000" x="147" y="141" />
-<mousemove time="5642.000000" x="145" y="143" />
-<mousemove time="5680.000000" x="144" y="146" />
-<mousemove time="5718.000000" x="144" y="148" />
-<mousemove time="5757.000000" x="143" y="149" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-storage-play-ui.xml Deleted

@@ -1,68 +0,0 @@
-<TestValidationScript >
-<mousemove time="171.000000" x="121" y="93" />
-<mousemove time="1016.000000" x="121" y="49" />
-<mousemove time="1052.000000" x="119" y="62" />
-<mousemove time="1088.000000" x="113" y="80" />
-<mousemove time="1124.000000" x="107" y="95" />
-<mousemove time="1160.000000" x="102" y="103" />
-<mousemove time="1195.000000" x="98" y="108" />
-<mousemove time="1229.000000" x="96" y="110" />
-<mousedown time="1504.000000" button="Left" x="96" y="110" />
-<mouseup time="1844.000000" button="Left" x="96" y="110" />
-<mousemove time="2256.000000" x="96" y="112" />
-<mousemove time="2292.000000" x="96" y="127" />
-<mousemove time="2326.000000" x="97" y="136" />
-<mousemove time="2363.000000" x="98" y="145" />
-<mousemove time="2398.000000" x="101" y="151" />
-<mousemove time="2433.000000" x="102" y="156" />
-<mousemove time="2469.000000" x="102" y="159" />
-<mousemove time="2504.000000" x="102" y="160" />
-<mousemove time="2574.000000" x="102" y="157" />
-<mousemove time="2608.000000" x="102" y="152" />
-<mousemove time="2643.000000" x="102" y="142" />
-<mousemove time="2677.000000" x="102" y="130" />
-<mousemove time="2713.000000" x="101" y="117" />
-<mousemove time="2749.000000" x="101" y="109" />
-<mousemove time="2785.000000" x="101" y="106" />
-<mousedown time="3504.000000" button="Left" x="101" y="106" />
-<mouseup time="3844.000000" button="Left" x="101" y="106" />
-<mousemove time="4152.000000" x="101" y="107" />
-<mousemove time="4188.000000" x="103" y="117" />
-<mousemove time="4225.000000" x="107" y="131" />
-<mousemove time="4260.000000" x="109" y="141" />
-<mousemove time="4295.000000" x="111" y="145" />
-<mousemove time="4329.000000" x="111" y="146" />
-<mousemove time="4432.000000" x="111" y="145" />
-<mousemove time="4467.000000" x="111" y="143" />
-<mousemove time="4502.000000" x="111" y="142" />
-<mousemove time="4537.000000" x="111" y="141" />
-<mousemove time="6852.000000" x="111" y="135" />
-<mousemove time="6886.000000" x="107" y="125" />
-<mousemove time="6922.000000" x="106" y="120" />
-<mousemove time="6957.000000" x="106" y="119" />
-<mousemove time="7028.000000" x="105" y="119" />
-<mousedown time="7132.000000" button="Left" x="105" y="119" />
-<mousemove time="7342.000000" x="104" y="119" />
-<mousemove time="7377.000000" x="94" y="119" />
-<mousemove time="7413.000000" x="81" y="119" />
-<mousemove time="7449.000000" x="72" y="119" />
-<mousemove time="7485.000000" x="69" y="118" />
-<mousemove time="7522.000000" x="62" y="115" />
-<mousemove time="7560.000000" x="50" y="111" />
-<mousemove time="7596.000000" x="49" y="109" />
-<mousemove time="7632.000000" x="49" y="107" />
-<mousemove time="7669.000000" x="50" y="99" />
-<mousemove time="7705.000000" x="60" y="82" />
-<mousemove time="7742.000000" x="69" y="73" />
-<mousemove time="7777.000000" x="82" y="67" />
-<mousemove time="7814.000000" x="95" y="67" />
-<mousemove time="7850.000000" x="107" y="67" />
-<mousemove time="7887.000000" x="118" y="76" />
-<mousemove time="7923.000000" x="129" y="90" />
-<mousemove time="7960.000000" x="133" y="100" />
-<mousemove time="7995.000000" x="134" y="113" />
-<mousemove time="8036.000000" x="132" y="121" />
-<mousemove time="8072.000000" x="129" y="127" />
-<mousemove time="8108.000000" x="126" y="129" />
-<mouseup time="8178.000000" button="Left" x="126" y="129" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-stream-text-switch-play-ui.xml Deleted

@@ -1,37 +0,0 @@
-<TestValidationScript >
-<mousemove time="237.000000" x="126" y="174" />
-<mousemove time="1000.000000" x="121" y="129" />
-<mousemove time="1035.000000" x="111" y="124" />
-<mousemove time="1070.000000" x="103" y="120" />
-<mousemove time="1105.000000" x="97" y="116" />
-<mousemove time="1106.000000" x="95" y="114" />
-<mousemove time="1141.000000" x="89" y="109" />
-<mousemove time="1176.000000" x="87" y="107" />
-<mousemove time="1211.000000" x="87" y="106" />
-<mousemove time="1246.000000" x="86" y="106" />
-<mousedown time="2034.000000" button="Left" x="86" y="106" />
-<mouseup time="2208.000000" button="Left" x="86" y="106" />
-<mousemove time="3907.000000" x="90" y="106" />
-<mousemove time="3943.000000" x="99" y="106" />
-<mousemove time="3979.000000" x="110" y="106" />
-<mousemove time="4015.000000" x="116" y="106" />
-<mousemove time="4051.000000" x="121" y="106" />
-<mousemove time="4086.000000" x="124" y="106" />
-<mousemove time="4121.000000" x="126" y="106" />
-<mousedown time="5272.000000" button="Left" x="126" y="106" />
-<mouseup time="5445.000000" button="Left" x="126" y="106" />
-<mousemove time="7953.000000" x="125" y="106" />
-<mousemove time="7988.000000" x="119" y="106" />
-<mousemove time="8024.000000" x="110" y="106" />
-<mousemove time="8059.000000" x="100" y="107" />
-<mousemove time="8095.000000" x="93" y="107" />
-<mousemove time="8131.000000" x="90" y="107" />
-<mousemove time="8167.000000" x="89" y="107" />
-<mousemove time="8204.000000" x="86" y="107" />
-<mousemove time="8238.000000" x="81" y="107" />
-<mousemove time="8274.000000" x="79" y="107" />
-<mousemove time="8310.000000" x="78" y="107" />
-<mousemove time="8345.000000" x="76" y="107" />
-<mousemove time="8381.000000" x="74" y="107" />
-<mousemove time="8450.000000" x="73" y="107" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-OCR-play-ui.xml Deleted

@@ -1,139 +0,0 @@
-<TestValidationScript >
-<mousemove time="1074.000000" x="179" y="181" />
-<mousemove time="1079.000000" x="168" y="180" />
-<mousemove time="1115.000000" x="151" y="180" />
-<mousemove time="1154.000000" x="137" y="180" />
-<mousemove time="1194.000000" x="122" y="180" />
-<mousemove time="1200.000000" x="115" y="181" />
-<mousemove time="1237.000000" x="97" y="183" />
-<mousemove time="1275.000000" x="85" y="184" />
-<mousemove time="1315.000000" x="71" y="184" />
-<mousemove time="1319.000000" x="67" y="184" />
-<mousemove time="1355.000000" x="61" y="184" />
-<mousemove time="1395.000000" x="57" y="184" />
-<mousemove time="1434.000000" x="56" y="184" />
-<mousemove time="1514.000000" x="55" y="184" />
-<mousemove time="1594.000000" x="52" y="184" />
-<mousemove time="1599.000000" x="51" y="184" />
-<mousemove time="1635.000000" x="46" y="184" />
-<mousemove time="1675.000000" x="42" y="184" />
-<mousemove time="1714.000000" x="41" y="184" />
-<mousemove time="1794.000000" x="40" y="183" />
-<mousemove time="1833.000000" x="40" y="182" />
-<mousemove time="1914.000000" x="40" y="181" />
-<mousemove time="1954.000000" x="40" y="180" />
-<mousedown time="2475.000000" button="Left" x="40" y="180" />
-<mouseup time="2630.000000" button="Left" x="40" y="180" />
-<mousemove time="3600.000000" x="41" y="180" />
-<mousemove time="3618.000000" x="43" y="179" />
-<mousemove time="3635.000000" x="44" y="179" />
-<mousemove time="3652.000000" x="46" y="179" />
-<mousemove time="3668.000000" x="48" y="179" />
-<mousemove time="3687.000000" x="49" y="178" />
-<mousemove time="3704.000000" x="52" y="178" />
-<mousemove time="3720.000000" x="55" y="177" />
-<mousemove time="3737.000000" x="56" y="177" />
-<mousemove time="3754.000000" x="57" y="177" />
-<mousemove time="3771.000000" x="58" y="176" />
-<mousemove time="3896.000000" x="56" y="176" />
-<mousemove time="3913.000000" x="52" y="176" />
-<mousemove time="3931.000000" x="47" y="176" />
-<mousemove time="3948.000000" x="42" y="176" />
-<mousemove time="3964.000000" x="36" y="176" />
-<mousemove time="3981.000000" x="34" y="176" />
-<mousemove time="3998.000000" x="32" y="176" />
-<mousemove time="4016.000000" x="31" y="176" />
-<mousedown time="4442.000000" button="Left" x="31" y="176" />
-<mouseup time="4681.000000" button="Left" x="31" y="176" />
-<mousemove time="5047.000000" x="32" y="176" />
-<mousemove time="5084.000000" x="41" y="176" />
-<mousemove time="5122.000000" x="53" y="176" />
-<mousemove time="5161.000000" x="69" y="175" />
-<mousemove time="5167.000000" x="77" y="174" />
-<mousemove time="5204.000000" x="96" y="172" />
-<mousemove time="5241.000000" x="111" y="169" />
-<mousemove time="5282.000000" x="121" y="168" />
-<mousemove time="5286.000000" x="122" y="168" />
-<mousemove time="5322.000000" x="124" y="168" />
-<mousemove time="5361.000000" x="126" y="169" />
-<mousemove time="5402.000000" x="130" y="173" />
-<mousemove time="5406.000000" x="131" y="174" />
-<mousemove time="5442.000000" x="133" y="176" />
-<mousemove time="5481.000000" x="137" y="179" />
-<mousemove time="5522.000000" x="145" y="184" />
-<mousemove time="5526.000000" x="149" y="185" />
-<mousemove time="5562.000000" x="159" y="187" />
-<mousemove time="5601.000000" x="166" y="187" />
-<mousemove time="5643.000000" x="172" y="187" />
-<mousemove time="5646.000000" x="175" y="187" />
-<mousemove time="5681.000000" x="177" y="187" />
-<mousemove time="5842.000000" x="173" y="185" />
-<mousemove time="5882.000000" x="166" y="182" />
-<mousemove time="5922.000000" x="160" y="179" />
-<mousemove time="5925.000000" x="159" y="177" />
-<mousemove time="5961.000000" x="156" y="176" />
-<mousemove time="6041.000000" x="153" y="175" />
-<mousemove time="6082.000000" x="148" y="171" />
-<mousemove time="6086.000000" x="144" y="168" />
-<mousemove time="6121.000000" x="135" y="157" />
-<mousemove time="6162.000000" x="123" y="140" />
-<mousemove time="6202.000000" x="111" y="121" />
-<mousemove time="6203.000000" x="107" y="114" />
-<mousemove time="6244.000000" x="102" y="103" />
-<mousemove time="6281.000000" x="100" y="98" />
-<mousemove time="6322.000000" x="99" y="96" />
-<mousemove time="6479.000000" x="98" y="96" />
-<mousemove time="6560.000000" x="98" y="98" />
-<mousemove time="6600.000000" x="98" y="99" />
-<mousemove time="6640.000000" x="98" y="101" />
-<mousemove time="6681.000000" x="98" y="102" />
-<mousemove time="6760.000000" x="98" y="103" />
-<mousemove time="6801.000000" x="98" y="104" />
-<mousedown time="7079.000000" button="Left" x="98" y="104" />
-<mouseup time="7200.000000" button="Left" x="98" y="104" />
-<mousemove time="7767.000000" x="98" y="105" />
-<mousemove time="7803.000000" x="98" y="106" />
-<mousemove time="7842.000000" x="98" y="108" />
-<mousemove time="7882.000000" x="98" y="109" />
-<mousemove time="7922.000000" x="98" y="110" />
-<mousemove time="7961.000000" x="98" y="111" />
-<mousedown time="8127.000000" button="Left" x="98" y="111" />
-<mouseup time="8397.000000" button="Left" x="98" y="111" />
-<mousemove time="9129.000000" x="98" y="109" />
-<mousedown time="9574.000000" button="Left" x="98" y="109" />
-<mouseup time="9678.000000" button="Left" x="98" y="109" />
-<mousemove time="10197.000000" x="98" y="111" />
-<mousemove time="10237.000000" x="96" y="115" />
-<mousemove time="10242.000000" x="93" y="119" />
-<mousemove time="10280.000000" x="85" y="131" />
-<mousemove time="10318.000000" x="75" y="143" />
-<mousemove time="10358.000000" x="66" y="152" />
-<mousemove time="10398.000000" x="56" y="162" />
-<mousemove time="10437.000000" x="52" y="164" />
-<mousemove time="10477.000000" x="49" y="166" />
-<mousemove time="10517.000000" x="46" y="168" />
-<mousemove time="10517.000000" x="44" y="170" />
-<mousemove time="10558.000000" x="42" y="174" />
-<mousemove time="10598.000000" x="39" y="179" />
-<mousemove time="10638.000000" x="37" y="182" />
-<mousemove time="10642.000000" x="37" y="183" />
-<mousemove time="10679.000000" x="36" y="184" />
-<mousedown time="11036.000000" button="Left" x="36" y="184" />
-<mouseup time="11145.000000" button="Left" x="36" y="184" />
-<mousemove time="11850.000000" x="35" y="184" />
-<mousemove time="11893.000000" x="35" y="183" />
-<mousedown time="11933.000000" button="Left" x="35" y="183" />
-<mouseup time="12095.000000" button="Left" x="35" y="183" />
-<mousemove time="13054.000000" x="38" y="180" />
-<mousemove time="13061.000000" x="42" y="176" />
-<mousemove time="13112.000000" x="63" y="154" />
-<mousemove time="13148.000000" x="81" y="135" />
-<mousemove time="13183.000000" x="91" y="123" />
-<mousemove time="13220.000000" x="95" y="119" />
-<mousemove time="13261.000000" x="96" y="118" />
-<mousemove time="13501.000000" x="96" y="117" />
-<mousemove time="13546.000000" x="97" y="117" />
-<mousemove time="13582.000000" x="97" y="116" />
-<mousemove time="13620.000000" x="97" y="115" />
-<mousemove time="13663.000000" x="97" y="114" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-OCR.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-audio-play-ui.xml Deleted

@@ -1,82 +0,0 @@
-<TestValidationScript >
-<mousemove time="209.000000" x="154" y="155" />
-<mousemove time="1224.000000" x="152" y="110" />
-<mousemove time="1261.000000" x="149" y="110" />
-<mousemove time="1298.000000" x="142" y="108" />
-<mousemove time="1334.000000" x="129" y="105" />
-<mousemove time="1369.000000" x="119" y="103" />
-<mousemove time="1405.000000" x="112" y="103" />
-<mousemove time="1441.000000" x="105" y="104" />
-<mousemove time="1477.000000" x="103" y="105" />
-<mousemove time="2033.000000" x="103" y="113" />
-<mousemove time="2069.000000" x="106" y="128" />
-<mousemove time="2104.000000" x="111" y="143" />
-<mousemove time="2143.000000" x="116" y="154" />
-<mousemove time="2180.000000" x="119" y="158" />
-<mousemove time="2217.000000" x="120" y="161" />
-<mousemove time="2287.000000" x="121" y="161" />
-<mousemove time="2499.000000" x="121" y="160" />
-<mousemove time="2567.000000" x="121" y="159" />
-<mousemove time="2637.000000" x="121" y="158" />
-<mousemove time="2742.000000" x="121" y="157" />
-<mousemove time="3434.000000" x="121" y="156" />
-<mousemove time="3469.000000" x="121" y="155" />
-<mousemove time="3506.000000" x="121" y="154" />
-<mousemove time="3542.000000" x="120" y="153" />
-<mousemove time="3578.000000" x="120" y="151" />
-<mousedown time="3787.000000" button="Left" x="120" y="151" />
-<mouseup time="3961.000000" button="Left" x="120" y="151" />
-<mousemove time="4449.000000" x="103" y="133" />
-<mousemove time="4485.000000" x="85" y="113" />
-<mousemove time="4521.000000" x="73" y="96" />
-<mousemove time="4557.000000" x="68" y="85" />
-<mousemove time="4593.000000" x="66" y="78" />
-<mousemove time="4630.000000" x="65" y="75" />
-<mousemove time="4701.000000" x="66" y="73" />
-<mousemove time="4737.000000" x="72" y="70" />
-<mousemove time="4772.000000" x="76" y="68" />
-<mousemove time="4809.000000" x="77" y="66" />
-<mousemove time="4846.000000" x="75" y="62" />
-<mousemove time="4881.000000" x="68" y="58" />
-<mousemove time="4918.000000" x="60" y="56" />
-<mousemove time="4953.000000" x="57" y="55" />
-<mousemove time="5060.000000" x="57" y="54" />
-<mousemove time="5096.000000" x="57" y="53" />
-<mousemove time="5132.000000" x="51" y="52" />
-<mousemove time="5169.000000" x="43" y="51" />
-<mousemove time="5204.000000" x="38" y="50" />
-<mousemove time="5239.000000" x="37" y="50" />
-<mousemove time="5273.000000" x="36" y="50" />
-<mousemove time="5310.000000" x="34" y="50" />
-<mousemove time="5345.000000" x="34" y="49" />
-<mousemove time="5486.000000" x="34" y="48" />
-<mousemove time="5627.000000" x="33" y="48" />
-<mousedown time="5664.000000" button="Left" x="33" y="48" />
-<mouseup time="5839.000000" button="Left" x="33" y="48" />
-<mousemove time="6225.000000" x="34" y="48" />
-<mousemove time="6295.000000" x="35" y="48" />
-<mousedown time="6604.000000" button="Left" x="35" y="48" />
-<mouseup time="6742.000000" button="Left" x="35" y="48" />
-<mousemove time="7323.000000" x="35" y="50" />
-<mousemove time="7393.000000" x="34" y="51" />
-<mousemove time="7429.000000" x="31" y="52" />
-<mousemove time="7464.000000" x="29" y="53" />
-<mousemove time="7773.000000" x="32" y="53" />
-<mousemove time="7808.000000" x="34" y="53" />
-<mousemove time="7843.000000" x="36" y="53" />
-<mousemove time="7879.000000" x="38" y="53" />
-<mousemove time="8085.000000" x="39" y="52" />
-<mousemove time="8155.000000" x="40" y="52" />
-<mousemove time="8224.000000" x="41" y="51" />
-<mousemove time="8326.000000" x="40" y="51" />
-<mousemove time="8361.000000" x="39" y="51" />
-<mousemove time="8396.000000" x="37" y="51" />
-<mousemove time="8431.000000" x="35" y="50" />
-<mousemove time="8568.000000" x="35" y="49" />
-<mousemove time="8704.000000" x="33" y="49" />
-<mousemove time="8739.000000" x="32" y="49" />
-<mousemove time="8878.000000" x="32" y="48" />
-<mousemove time="8947.000000" x="32" y="47" />
-<mousedown time="9286.000000" button="Left" x="32" y="47" />
-<mouseup time="9461.000000" button="Left" x="32" y="47" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-audio-speed-play-ui.xml Deleted

@@ -1,64 +0,0 @@
-<TestValidationScript >
-<mousemove time="1318.000000" x="39" y="177" />
-<mousemove time="1352.000000" x="44" y="168" />
-<mousemove time="1387.000000" x="52" y="158" />
-<mousemove time="1422.000000" x="60" y="148" />
-<mousemove time="1458.000000" x="66" y="138" />
-<mousemove time="1493.000000" x="70" y="130" />
-<mousemove time="1528.000000" x="75" y="122" />
-<mousemove time="1563.000000" x="80" y="116" />
-<mousemove time="1598.000000" x="84" y="112" />
-<mousemove time="1634.000000" x="87" y="110" />
-<mousemove time="1670.000000" x="89" y="108" />
-<mousemove time="1706.000000" x="91" y="107" />
-<mousemove time="1742.000000" x="93" y="107" />
-<mousemove time="2695.000000" x="93" y="115" />
-<mousemove time="2731.000000" x="96" y="132" />
-<mousemove time="2768.000000" x="99" y="145" />
-<mousemove time="2803.000000" x="100" y="152" />
-<mousemove time="2839.000000" x="101" y="154" />
-<mousemove time="3968.000000" x="93" y="152" />
-<mousemove time="4002.000000" x="77" y="142" />
-<mousemove time="4037.000000" x="57" y="129" />
-<mousemove time="4071.000000" x="47" y="122" />
-<mousemove time="4107.000000" x="41" y="115" />
-<mousemove time="4109.000000" x="39" y="113" />
-<mousemove time="4146.000000" x="37" y="109" />
-<mousemove time="4181.000000" x="36" y="109" />
-<mousemove time="4216.000000" x="36" y="108" />
-<mousemove time="5608.000000" x="37" y="109" />
-<mousemove time="5644.000000" x="56" y="121" />
-<mousemove time="5681.000000" x="79" y="134" />
-<mousemove time="5716.000000" x="102" y="142" />
-<mousemove time="5751.000000" x="114" y="145" />
-<mousemove time="5786.000000" x="122" y="145" />
-<mousemove time="5821.000000" x="126" y="145" />
-<mousemove time="5856.000000" x="131" y="141" />
-<mousemove time="5891.000000" x="136" y="136" />
-<mousemove time="5927.000000" x="140" y="131" />
-<mousemove time="5962.000000" x="144" y="127" />
-<mousemove time="5998.000000" x="147" y="123" />
-<mousemove time="6033.000000" x="151" y="119" />
-<mousemove time="6068.000000" x="155" y="115" />
-<mousemove time="6069.000000" x="158" y="113" />
-<mousemove time="6106.000000" x="160" y="109" />
-<mousemove time="6142.000000" x="162" y="107" />
-<mousemove time="6178.000000" x="163" y="105" />
-<mousemove time="6213.000000" x="166" y="102" />
-<mousemove time="6248.000000" x="166" y="101" />
-<mousemove time="8255.000000" x="164" y="104" />
-<mousemove time="8291.000000" x="156" y="112" />
-<mousemove time="8326.000000" x="147" y="119" />
-<mousemove time="8364.000000" x="140" y="126" />
-<mousemove time="8399.000000" x="135" y="131" />
-<mousemove time="8435.000000" x="133" y="133" />
-<mousemove time="8469.000000" x="132" y="134" />
-<mousemove time="9155.000000" x="134" y="132" />
-<mousemove time="9189.000000" x="141" y="125" />
-<mousemove time="9225.000000" x="147" y="119" />
-<mousemove time="9259.000000" x="150" y="115" />
-<mousemove time="9294.000000" x="151" y="114" />
-<mousemove time="9330.000000" x="152" y="112" />
-<mousemove time="9367.000000" x="153" y="110" />
-<mousemove time="9402.000000" x="154" y="110" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-complete-play-ui.xml Deleted

@@ -1,95 +0,0 @@
-<TestValidationScript >
-<mousemove time="209.000000" x="32" y="92" />
-<mousemove time="647.000000" x="32" y="49" />
-<mousemove time="687.000000" x="32" y="50" />
-<mousemove time="729.000000" x="32" y="51" />
-<mousemove time="732.000000" x="33" y="51" />
-<mousemove time="769.000000" x="35" y="54" />
-<mousemove time="808.000000" x="40" y="59" />
-<mousemove time="849.000000" x="44" y="63" />
-<mousemove time="888.000000" x="49" y="68" />
-<mousemove time="929.000000" x="52" y="69" />
-<mousemove time="971.000000" x="53" y="70" />
-<mousemove time="1128.000000" x="51" y="70" />
-<mousemove time="1168.000000" x="44" y="65" />
-<mousemove time="1209.000000" x="36" y="57" />
-<mousemove time="1248.000000" x="33" y="55" />
-<mousemove time="1287.000000" x="31" y="52" />
-<mousemove time="1329.000000" x="28" y="50" />
-<mousemove time="1332.000000" x="27" y="47" />
-<mousemove time="1368.000000" x="25" y="46" />
-<mousemove time="1407.000000" x="23" y="45" />
-<mousemove time="1449.000000" x="22" y="44" />
-<mousemove time="1488.000000" x="21" y="42" />
-<mousemove time="1529.000000" x="20" y="41" />
-<mousemove time="1567.000000" x="20" y="39" />
-<mousemove time="1647.000000" x="20" y="38" />
-<mousemove time="1687.000000" x="20" y="37" />
-<mousemove time="1727.000000" x="20" y="36" />
-<mousemove time="1848.000000" x="19" y="36" />
-<mousemove time="1892.000000" x="19" y="35" />
-<mousemove time="1967.000000" x="18" y="34" />
-<mousemove time="2009.000000" x="18" y="32" />
-<mousemove time="2048.000000" x="18" y="31" />
-<mousemove time="2128.000000" x="17" y="31" />
-<mousemove time="2288.000000" x="17" y="30" />
-<mousedown time="2448.000000" button="Left" x="17" y="30" />
-<mouseup time="2578.000000" button="Left" x="17" y="30" />
-<mousedown time="3180.000000" button="Left" x="17" y="30" />
-<mouseup time="3333.000000" button="Left" x="17" y="30" />
-<mousemove time="3784.000000" x="18" y="30" />
-<mousemove time="3822.000000" x="22" y="30" />
-<mousemove time="3861.000000" x="27" y="30" />
-<mousemove time="3900.000000" x="30" y="30" />
-<mousemove time="3900.000000" x="32" y="30" />
-<mousemove time="3939.000000" x="36" y="30" />
-<mousemove time="3981.000000" x="39" y="30" />
-<mousemove time="4019.000000" x="44" y="30" />
-<mousemove time="4025.000000" x="46" y="29" />
-<mousemove time="4063.000000" x="52" y="29" />
-<mousemove time="4100.000000" x="59" y="29" />
-<mousemove time="4141.000000" x="66" y="29" />
-<mousemove time="4144.000000" x="68" y="29" />
-<mousemove time="4181.000000" x="69" y="29" />
-<mousemove time="4220.000000" x="70" y="29" />
-<mousemove time="4261.000000" x="71" y="29" />
-<mousemove time="4301.000000" x="72" y="28" />
-<mousemove time="4340.000000" x="73" y="28" />
-<mousemove time="4384.000000" x="74" y="28" />
-<mousemove time="4421.000000" x="75" y="27" />
-<mousemove time="4501.000000" x="76" y="27" />
-<mousemove time="4504.000000" x="77" y="27" />
-<mousemove time="4540.000000" x="78" y="25" />
-<mousemove time="4579.000000" x="80" y="25" />
-<mousemove time="4619.000000" x="82" y="24" />
-<mousedown time="4981.000000" button="Left" x="82" y="24" />
-<mouseup time="5069.000000" button="Left" x="82" y="24" />
-<mousemove time="5255.000000" x="87" y="24" />
-<mousemove time="5295.000000" x="92" y="24" />
-<mousemove time="5298.000000" x="95" y="24" />
-<mousemove time="5334.000000" x="100" y="24" />
-<mousemove time="5374.000000" x="102" y="24" />
-<mousemove time="5414.000000" x="105" y="24" />
-<mousemove time="5418.000000" x="106" y="24" />
-<mousemove time="5455.000000" x="108" y="24" />
-<mousemove time="5493.000000" x="109" y="24" />
-<mousemove time="5655.000000" x="110" y="24" />
-<mousemove time="5656.000000" x="110" y="25" />
-<mousemove time="5695.000000" x="111" y="25" />
-<mousemove time="5696.000000" x="112" y="25" />
-<mousemove time="5734.000000" x="113" y="25" />
-<mousemove time="5738.000000" x="113" y="27" />
-<mousemove time="5776.000000" x="114" y="27" />
-<mousemove time="5777.000000" x="115" y="27" />
-<mousemove time="5894.000000" x="116" y="27" />
-<mousedown time="6094.000000" button="Left" x="116" y="27" />
-<mouseup time="6216.000000" button="Left" x="116" y="27" />
-<mousemove time="6455.000000" x="113" y="27" />
-<mousemove time="6493.000000" x="106" y="27" />
-<mousemove time="6535.000000" x="94" y="27" />
-<mousemove time="6573.000000" x="91" y="27" />
-<mousemove time="6616.000000" x="88" y="27" />
-<mousemove time="6652.000000" x="85" y="27" />
-<mousemove time="6659.000000" x="84" y="27" />
-<mousedown time="6974.000000" button="Left" x="84" y="27" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-deactivation-play-ui.xml Deleted

@@ -1,26 +0,0 @@
-<TestValidationScript >
-<mousemove time="191.000000" x="84" y="72" />
-<mousemove time="758.000000" x="84" y="29" />
-<mousemove time="793.000000" x="88" y="50" />
-<mousemove time="828.000000" x="93" y="75" />
-<mousemove time="880.000000" x="100" y="107" />
-<mousemove time="916.000000" x="104" y="117" />
-<mousemove time="952.000000" x="106" y="122" />
-<mousemove time="999.000000" x="107" y="123" />
-<mousemove time="1188.000000" x="107" y="124" />
-<mousemove time="1189.000000" x="107" y="127" />
-<mousemove time="1239.000000" x="106" y="136" />
-<mousemove time="1240.000000" x="105" y="140" />
-<mousemove time="1278.000000" x="103" y="150" />
-<mousemove time="1313.000000" x="103" y="159" />
-<mousemove time="1348.000000" x="103" y="166" />
-<mousemove time="1361.000000" x="103" y="168" />
-<mousemove time="1399.000000" x="103" y="170" />
-<mousemove time="1434.000000" x="103" y="171" />
-<mousemove time="1469.000000" x="104" y="171" />
-<mousemove time="1794.000000" x="110" y="171" />
-<mousemove time="1828.000000" x="121" y="171" />
-<mousemove time="1877.000000" x="136" y="169" />
-<mousemove time="1912.000000" x="147" y="168" />
-<mousemove time="1948.000000" x="150" y="168" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-http-play-ui.xml Deleted

@@ -1,112 +0,0 @@
-<TestValidationScript >
-<mousemove time="2756.000000" x="141" y="167" />
-<mousemove time="2763.000000" x="132" y="166" />
-<mousemove time="2799.000000" x="106" y="160" />
-<mousemove time="2846.000000" x="66" y="159" />
-<mousemove time="2883.000000" x="45" y="160" />
-<mousemove time="2919.000000" x="32" y="164" />
-<mousemove time="2964.000000" x="25" y="165" />
-<mousemove time="3000.000000" x="24" y="165" />
-<mousemove time="3248.000000" x="28" y="165" />
-<mousemove time="3283.000000" x="36" y="166" />
-<mousemove time="3319.000000" x="44" y="168" />
-<mousemove time="3364.000000" x="47" y="169" />
-<mousemove time="3563.000000" x="46" y="169" />
-<mousemove time="3599.000000" x="42" y="168" />
-<mousemove time="3647.000000" x="39" y="167" />
-<mousemove time="3648.000000" x="37" y="166" />
-<mousemove time="3802.000000" x="37" y="165" />
-<mousedown time="4364.000000" button="Left" x="37" y="165" />
-<mousemove time="4636.000000" x="38" y="165" />
-<mousemove time="4671.000000" x="44" y="165" />
-<mousemove time="4706.000000" x="52" y="165" />
-<mousemove time="4742.000000" x="63" y="165" />
-<mousemove time="4778.000000" x="67" y="165" />
-<mousemove time="4814.000000" x="71" y="165" />
-<mousemove time="4849.000000" x="77" y="165" />
-<mousemove time="4886.000000" x="82" y="165" />
-<mousemove time="4921.000000" x="86" y="165" />
-<mousemove time="4957.000000" x="90" y="165" />
-<mousemove time="4992.000000" x="91" y="165" />
-<mousemove time="4992.000000" x="92" y="165" />
-<mousemove time="5064.000000" x="94" y="164" />
-<mousemove time="5100.000000" x="97" y="164" />
-<mousemove time="5136.000000" x="98" y="164" />
-<mousemove time="5172.000000" x="99" y="164" />
-<mousemove time="5208.000000" x="101" y="164" />
-<mousemove time="5244.000000" x="103" y="164" />
-<mousemove time="5279.000000" x="104" y="164" />
-<mouseup time="5314.000000" button="Left" x="104" y="164" />
-<mousemove time="6032.000000" x="94" y="157" />
-<mousemove time="6068.000000" x="71" y="138" />
-<mousemove time="6104.000000" x="54" y="121" />
-<mousemove time="6138.000000" x="45" y="110" />
-<mousemove time="6172.000000" x="41" y="105" />
-<mousemove time="6207.000000" x="39" y="103" />
-<mousemove time="6241.000000" x="38" y="102" />
-<mousemove time="6276.000000" x="38" y="101" />
-<mousemove time="6315.000000" x="37" y="100" />
-<mousemove time="6330.000000" x="37" y="99" />
-<mousemove time="6375.000000" x="36" y="98" />
-<mousemove time="6434.000000" x="36" y="97" />
-<mousemove time="6480.000000" x="36" y="96" />
-<mousemove time="6516.000000" x="36" y="89" />
-<mousemove time="6564.000000" x="34" y="73" />
-<mousemove time="6598.000000" x="33" y="65" />
-<mousemove time="6633.000000" x="32" y="63" />
-<mousemove time="6963.000000" x="47" y="63" />
-<mousemove time="6999.000000" x="68" y="65" />
-<mousemove time="7035.000000" x="89" y="70" />
-<mousemove time="7082.000000" x="111" y="78" />
-<mousemove time="7118.000000" x="119" y="80" />
-<mousemove time="7154.000000" x="122" y="80" />
-<mousemove time="7196.000000" x="124" y="80" />
-<mousemove time="7280.000000" x="125" y="80" />
-<mousemove time="7315.000000" x="125" y="79" />
-<mousemove time="7365.000000" x="129" y="70" />
-<mousemove time="7399.000000" x="137" y="60" />
-<mousemove time="7436.000000" x="147" y="49" />
-<mousemove time="7481.000000" x="156" y="41" />
-<mousemove time="7517.000000" x="160" y="39" />
-<mousemove time="7554.000000" x="161" y="38" />
-<mousemove time="7763.000000" x="160" y="38" />
-<mousemove time="7800.000000" x="153" y="38" />
-<mousemove time="7836.000000" x="136" y="38" />
-<mousemove time="7836.000000" x="124" y="38" />
-<mousemove time="7881.000000" x="101" y="37" />
-<mousemove time="7918.000000" x="83" y="34" />
-<mousemove time="7953.000000" x="69" y="31" />
-<mousemove time="7959.000000" x="63" y="31" />
-<mousemove time="7998.000000" x="50" y="30" />
-<mousemove time="8034.000000" x="40" y="30" />
-<mousemove time="8081.000000" x="31" y="32" />
-<mousemove time="8118.000000" x="26" y="34" />
-<mousemove time="8153.000000" x="23" y="35" />
-<mousemove time="8197.000000" x="22" y="35" />
-<mousemove time="8281.000000" x="24" y="36" />
-<mousemove time="8316.000000" x="29" y="38" />
-<mousemove time="8352.000000" x="41" y="41" />
-<mousemove time="8398.000000" x="47" y="41" />
-<mousemove time="8434.000000" x="51" y="41" />
-<mousemove time="8598.000000" x="52" y="41" />
-<mousemove time="8635.000000" x="57" y="41" />
-<mousemove time="8680.000000" x="65" y="39" />
-<mousemove time="8716.000000" x="72" y="37" />
-<mousemove time="8754.000000" x="76" y="36" />
-<mousemove time="8758.000000" x="77" y="36" />
-<mousemove time="9234.000000" x="77" y="37" />
-<mousemove time="9281.000000" x="77" y="39" />
-<mousemove time="9434.000000" x="76" y="40" />
-<mousemove time="9438.000000" x="76" y="41" />
-<mousemove time="9515.000000" x="76" y="42" />
-<mousemove time="9564.000000" x="74" y="43" />
-<mousemove time="9599.000000" x="74" y="44" />
-<mousemove time="9636.000000" x="73" y="45" />
-<mousemove time="9680.000000" x="73" y="46" />
-<mousemove time="9715.000000" x="71" y="46" />
-<mousemove time="9764.000000" x="70" y="46" />
-<mousemove time="9800.000000" x="66" y="46" />
-<mousemove time="9800.000000" x="61" y="45" />
-<mousemove time="9837.000000" x="54" y="44" />
-<mousemove time="9873.000000" x="49" y="42" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-inline-av-play-ui.xml Deleted

@@ -1,105 +0,0 @@
-<TestValidationScript >
-<mousemove time="1664.000000" x="121" y="199" />
-<mousemove time="1708.000000" x="116" y="185" />
-<mousemove time="1744.000000" x="115" y="175" />
-<mousemove time="1782.000000" x="121" y="162" />
-<mousemove time="1822.000000" x="124" y="160" />
-<mousemove time="1859.000000" x="124" y="159" />
-<mousemove time="2380.000000" x="125" y="160" />
-<mousemove time="2418.000000" x="126" y="160" />
-<mousemove time="2424.000000" x="126" y="161" />
-<mousemove time="2475.000000" x="126" y="162" />
-<mousemove time="2506.000000" x="127" y="163" />
-<mousemove time="2544.000000" x="127" y="164" />
-<mousemove time="2582.000000" x="128" y="164" />
-<mousemove time="2674.000000" x="129" y="164" />
-<mousemove time="2778.000000" x="130" y="164" />
-<mousedown time="2861.000000" button="Left" x="130" y="164" />
-<mouseup time="3003.000000" button="Left" x="130" y="164" />
-<mousemove time="3533.000000" x="130" y="162" />
-<mousemove time="3538.000000" x="127" y="156" />
-<mousemove time="3577.000000" x="118" y="138" />
-<mousemove time="3614.000000" x="112" y="120" />
-<mousemove time="3661.000000" x="105" y="94" />
-<mousemove time="3697.000000" x="103" y="87" />
-<mousemove time="3734.000000" x="103" y="85" />
-<mousemove time="3779.000000" x="103" y="73" />
-<mousemove time="3816.000000" x="104" y="63" />
-<mousemove time="3853.000000" x="105" y="58" />
-<mousemove time="3894.000000" x="106" y="57" />
-<mousemove time="3944.000000" x="106" y="54" />
-<mousemove time="3980.000000" x="107" y="50" />
-<mousemove time="3981.000000" x="108" y="48" />
-<mousemove time="4019.000000" x="109" y="44" />
-<mousemove time="4056.000000" x="110" y="43" />
-<mousemove time="4098.000000" x="110" y="42" />
-<mousemove time="4144.000000" x="111" y="42" />
-<mousemove time="4144.000000" x="111" y="41" />
-<mousemove time="4180.000000" x="112" y="40" />
-<mousemove time="4254.000000" x="107" y="40" />
-<mousemove time="4310.000000" x="92" y="38" />
-<mousemove time="4341.000000" x="86" y="35" />
-<mousemove time="4379.000000" x="85" y="33" />
-<mousemove time="4417.000000" x="85" y="32" />
-<mousemove time="4455.000000" x="84" y="32" />
-<mousemove time="4511.000000" x="83" y="32" />
-<mousedown time="4626.000000" button="Left" x="83" y="32" />
-<mousemove time="5141.000000" x="83" y="33" />
-<mouseup time="5177.000000" button="Left" x="83" y="33" />
-<mousemove time="5367.000000" x="86" y="33" />
-<mousemove time="5402.000000" x="91" y="33" />
-<mousemove time="5438.000000" x="96" y="33" />
-<mousemove time="5473.000000" x="101" y="33" />
-<mousemove time="5508.000000" x="105" y="33" />
-<mousemove time="5543.000000" x="107" y="33" />
-<mousemove time="5748.000000" x="108" y="33" />
-<mousemove time="5783.000000" x="109" y="33" />
-<mousemove time="5818.000000" x="110" y="35" />
-<mousemove time="5853.000000" x="112" y="36" />
-<mousemove time="5889.000000" x="113" y="36" />
-<mousemove time="5959.000000" x="114" y="36" />
-<mousemove time="6166.000000" x="114" y="35" />
-<mousemove time="6236.000000" x="113" y="35" />
-<mousemove time="6306.000000" x="112" y="35" />
-<mousedown time="6342.000000" button="Left" x="112" y="35" />
-<mouseup time="6514.000000" button="Left" x="112" y="35" />
-<mousemove time="6750.000000" x="112" y="38" />
-<mousemove time="6785.000000" x="108" y="77" />
-<mousemove time="6820.000000" x="97" y="119" />
-<mousemove time="6855.000000" x="91" y="147" />
-<mousemove time="6855.000000" x="89" y="155" />
-<mousemove time="6890.000000" x="88" y="162" />
-<mousemove time="6924.000000" x="87" y="167" />
-<mousemove time="6959.000000" x="87" y="168" />
-<mousemove time="7127.000000" x="87" y="167" />
-<mousemove time="7162.000000" x="86" y="167" />
-<mousedown time="7230.000000" button="Left" x="86" y="167" />
-<mouseup time="7333.000000" button="Left" x="86" y="167" />
-<mousemove time="7635.000000" x="86" y="166" />
-<mousemove time="7718.000000" x="86" y="165" />
-<mousemove time="7818.000000" x="86" y="164" />
-<mousemove time="8235.000000" x="86" y="165" />
-<mousemove time="8302.000000" x="86" y="166" />
-<mousemove time="8369.000000" x="86" y="167" />
-<mousemove time="8402.000000" x="85" y="167" />
-<mousemove time="8418.000000" x="84" y="167" />
-<mousemove time="8435.000000" x="81" y="168" />
-<mousemove time="8452.000000" x="77" y="168" />
-<mousemove time="8468.000000" x="72" y="169" />
-<mousemove time="8486.000000" x="63" y="170" />
-<mousemove time="8503.000000" x="56" y="170" />
-<mousemove time="9153.000000" x="58" y="170" />
-<mousemove time="9168.000000" x="60" y="169" />
-<mousemove time="9186.000000" x="63" y="168" />
-<mousemove time="9203.000000" x="67" y="167" />
-<mousemove time="9219.000000" x="73" y="166" />
-<mousemove time="9236.000000" x="78" y="165" />
-<mousemove time="9252.000000" x="83" y="164" />
-<mousemove time="9268.000000" x="86" y="163" />
-<mousemove time="9286.000000" x="88" y="163" />
-<mousemove time="9303.000000" x="89" y="163" />
-<mousemove time="9319.000000" x="90" y="163" />
-<mousemove time="9386.000000" x="91" y="163" />
-<mousedown time="9469.000000" button="Left" x="91" y="163" />
-<mouseup time="9619.000000" button="Left" x="91" y="163" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-inline-segments.sh Deleted

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-segments-play-ui.xml Deleted

@@ -1,23 +0,0 @@
-<TestValidationScript >
-<mousemove time="5816.000000" x="113" y="199" />
-<mousemove time="5854.000000" x="110" y="189" />
-<mousemove time="5894.000000" x="108" y="179" />
-<mousemove time="5934.000000" x="106" y="160" />
-<mousemove time="5974.000000" x="104" y="143" />
-<mousemove time="6013.000000" x="103" y="129" />
-<mousemove time="6065.000000" x="101" y="113" />
-<mousemove time="6105.000000" x="101" y="108" />
-<mousemove time="6105.000000" x="100" y="107" />
-<mousemove time="6145.000000" x="100" y="105" />
-<mousemove time="6184.000000" x="99" y="104" />
-<mousemove time="9360.000000" x="99" y="105" />
-<mousemove time="9401.000000" x="101" y="110" />
-<mousemove time="9441.000000" x="103" y="118" />
-<mousemove time="9481.000000" x="108" y="133" />
-<mousemove time="9521.000000" x="111" y="141" />
-<mousemove time="9566.000000" x="113" y="146" />
-<mousemove time="9566.000000" x="113" y="147" />
-<mousemove time="9607.000000" x="113" y="148" />
-<mousemove time="9611.000000" x="113" y="149" />
-<mousemove time="9691.000000" x="114" y="149" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-video-play-ui.xml Deleted

@@ -1,85 +0,0 @@
-<TestValidationScript >
-<mousemove time="3826.000000" x="165" y="189" />
-<mousemove time="3862.000000" x="150" y="180" />
-<mousemove time="3897.000000" x="146" y="177" />
-<mousemove time="3908.000000" x="145" y="177" />
-<mousemove time="3980.000000" x="143" y="176" />
-<mousemove time="4015.000000" x="141" y="173" />
-<mousemove time="4028.000000" x="140" y="173" />
-<mousemove time="4067.000000" x="139" y="173" />
-<mousemove time="4102.000000" x="139" y="172" />
-<mousemove time="4138.000000" x="139" y="170" />
-<mousemove time="4148.000000" x="139" y="169" />
-<mousemove time="4187.000000" x="139" y="167" />
-<mousedown time="4347.000000" button="Left" x="139" y="167" />
-<mouseup time="4488.000000" button="Left" x="139" y="167" />
-<mousemove time="4897.000000" x="126" y="167" />
-<mousemove time="4909.000000" x="120" y="167" />
-<mousemove time="4949.000000" x="102" y="167" />
-<mousemove time="4985.000000" x="80" y="167" />
-<mousemove time="5021.000000" x="71" y="167" />
-<mousemove time="5070.000000" x="65" y="167" />
-<mousemove time="5105.000000" x="64" y="167" />
-<mousemove time="5141.000000" x="63" y="167" />
-<mousedown time="5227.000000" button="Left" x="63" y="167" />
-<mouseup time="5333.000000" button="Left" x="63" y="167" />
-<mousemove time="5554.000000" x="63" y="166" />
-<mousemove time="5593.000000" x="63" y="147" />
-<mousemove time="5632.000000" x="67" y="122" />
-<mousemove time="5667.000000" x="70" y="105" />
-<mousemove time="5703.000000" x="71" y="95" />
-<mousemove time="5715.000000" x="72" y="91" />
-<mousemove time="5754.000000" x="76" y="80" />
-<mousemove time="5789.000000" x="86" y="67" />
-<mousemove time="5824.000000" x="96" y="58" />
-<mousemove time="5835.000000" x="99" y="56" />
-<mousemove time="5874.000000" x="103" y="54" />
-<mousemove time="5908.000000" x="106" y="52" />
-<mousemove time="5942.000000" x="107" y="51" />
-<mousemove time="5954.000000" x="108" y="51" />
-<mousemove time="5993.000000" x="109" y="49" />
-<mousemove time="6028.000000" x="110" y="47" />
-<mousemove time="6064.000000" x="113" y="45" />
-<mousemove time="6073.000000" x="114" y="43" />
-<mousemove time="6112.000000" x="114" y="42" />
-<mousemove time="6147.000000" x="114" y="41" />
-<mousemove time="6267.000000" x="114" y="40" />
-<mousemove time="6352.000000" x="114" y="39" />
-<mousemove time="6387.000000" x="114" y="37" />
-<mousemove time="6422.000000" x="114" y="36" />
-<mousemove time="6472.000000" x="115" y="35" />
-<mousemove time="6667.000000" x="115" y="34" />
-<mousedown time="6715.000000" button="Left" x="115" y="34" />
-<mouseup time="6873.000000" button="Left" x="115" y="34" />
-<mousemove time="7149.000000" x="116" y="42" />
-<mousemove time="7184.000000" x="119" y="54" />
-<mousemove time="7185.000000" x="122" y="65" />
-<mousemove time="7234.000000" x="129" y="88" />
-<mousemove time="7268.000000" x="138" y="107" />
-<mousemove time="7303.000000" x="144" y="118" />
-<mousemove time="7315.000000" x="147" y="124" />
-<mousemove time="7354.000000" x="151" y="131" />
-<mousemove time="7388.000000" x="155" y="135" />
-<mousemove time="7422.000000" x="157" y="139" />
-<mousemove time="7435.000000" x="158" y="141" />
-<mousemove time="7474.000000" x="158" y="146" />
-<mousemove time="7510.000000" x="159" y="149" />
-<mousemove time="7544.000000" x="160" y="151" />
-<mousemove time="7593.000000" x="160" y="152" />
-<mousemove time="7631.000000" x="161" y="155" />
-<mousemove time="7666.000000" x="162" y="158" />
-<mousemove time="7701.000000" x="164" y="159" />
-<mousemove time="7754.000000" x="166" y="162" />
-<mousemove time="7788.000000" x="167" y="163" />
-<mousemove time="7871.000000" x="168" y="163" />
-<mousemove time="7907.000000" x="169" y="163" />
-<mousemove time="7943.000000" x="172" y="163" />
-<mousemove time="7955.000000" x="173" y="163" />
-<mousemove time="8062.000000" x="173" y="164" />
-<mousedown time="8232.000000" button="Left" x="173" y="164" />
-<mouseup time="8336.000000" button="Left" x="173" y="164" />
-<mousemove time="9114.000000" x="181" y="169" />
-<mousemove time="9150.000000" x="191" y="174" />
-<mousemove time="9187.000000" x="198" y="176" />
-<mousemove time="9188.000000" x="199" y="179" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/bifs-timeline-mediacontrol-videospeed-play-ui.xml Deleted

@@ -1,59 +0,0 @@
-<TestValidationScript >
-<mousemove time="1084.000000" x="198" y="182" />
-<mousemove time="1119.000000" x="159" y="171" />
-<mousemove time="1154.000000" x="128" y="159" />
-<mousemove time="1168.000000" x="117" y="155" />
-<mousemove time="1208.000000" x="99" y="152" />
-<mousemove time="1240.000000" x="82" y="151" />
-<mousemove time="1275.000000" x="68" y="150" />
-<mousemove time="1313.000000" x="55" y="150" />
-<mousemove time="1325.000000" x="51" y="150" />
-<mousemove time="1365.000000" x="46" y="149" />
-<mousemove time="1404.000000" x="45" y="149" />
-<mousemove time="1598.000000" x="44" y="149" />
-<mousemove time="2628.000000" x="45" y="149" />
-<mousemove time="2662.000000" x="54" y="157" />
-<mousemove time="2718.000000" x="72" y="169" />
-<mousemove time="2753.000000" x="78" y="173" />
-<mousemove time="2788.000000" x="79" y="174" />
-<mousemove time="3109.000000" x="84" y="174" />
-<mousemove time="3144.000000" x="97" y="174" />
-<mousemove time="3156.000000" x="107" y="174" />
-<mousemove time="3195.000000" x="121" y="174" />
-<mousemove time="3234.000000" x="132" y="171" />
-<mousemove time="3268.000000" x="138" y="169" />
-<mousemove time="3304.000000" x="141" y="166" />
-<mousemove time="3316.000000" x="143" y="165" />
-<mousemove time="3356.000000" x="146" y="163" />
-<mousemove time="3390.000000" x="149" y="159" />
-<mousemove time="3426.000000" x="153" y="155" />
-<mousemove time="3438.000000" x="154" y="154" />
-<mousemove time="3482.000000" x="155" y="152" />
-<mousemove time="3551.000000" x="156" y="152" />
-<mousemove time="3586.000000" x="157" y="152" />
-<mousemove time="3620.000000" x="157" y="151" />
-<mousemove time="5924.000000" x="156" y="151" />
-<mousemove time="5964.000000" x="152" y="151" />
-<mousemove time="6000.000000" x="140" y="152" />
-<mousemove time="6036.000000" x="125" y="153" />
-<mousemove time="6072.000000" x="112" y="154" />
-<mousemove time="6085.000000" x="108" y="154" />
-<mousemove time="6121.000000" x="102" y="154" />
-<mousemove time="6157.000000" x="98" y="154" />
-<mousemove time="6193.000000" x="96" y="154" />
-<mousemove time="7331.000000" x="97" y="167" />
-<mousemove time="7376.000000" x="102" y="179" />
-<mousemove time="7383.000000" x="104" y="186" />
-<mousemove time="7402.000000" x="105" y="189" />
-<mousemove time="7419.000000" x="106" y="191" />
-<mousemove time="7434.000000" x="108" y="191" />
-<mousemove time="7451.000000" x="108" y="192" />
-<mousemove time="8676.000000" x="108" y="191" />
-<mousemove time="8729.000000" x="102" y="176" />
-<mousemove time="8764.000000" x="97" y="162" />
-<mousemove time="8800.000000" x="93" y="147" />
-<mousemove time="8845.000000" x="91" y="136" />
-<mousemove time="8881.000000" x="90" y="130" />
-<mousemove time="8917.000000" x="90" y="129" />
-<mousemove time="8918.000000" x="89" y="129" />
-</TestValidationScript>
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts-negctts-dash-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts_broken-edits-dash-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/counter_cues_cts_broken-negctts-dash-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/laser-stz_animate_hrefstreamid-play-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/laser-stz_animate_hrefstreamid2-play-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/xmlin-meta-metx-no-namespace-import-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/xmlin-subt-stpp-export-track-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/xmlin-subt-stpp-no-namespace-import-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/rules/xmlin-ttml-stpp-export-track-stderr.txt Deleted

gpac-0.8.0.tar.gz/tests/scripts Deleted

gpac-0.8.0.tar.gz/tests/scripts/3D-HEVC.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/aac_sbr.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/audelim.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/audio_sample_entry.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/auxv.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/bifs_all.sh Deleted

@@ -1,179 +0,0 @@
-check_inline_res()
-{
- #check for *-inline used in linking and mediacontrol - the dependent file is $basename-inline.bt
- if [ $inline_resource = 1 ] ; then
-  libfile="${btfile%.*}-inline.bt"
-  if [ -f $libfile ] ; then
-   $MP4BOX -mp4 $libfile 2> /dev/null
-   libfile="${btfile%.*}-inline.mp4"
-  else
-   libfile=""
-   fi
- fi
-}
-
-#@bt_test execute tests on BT file: BT<->XMT, BT<->MP4, XMT<->MP4,  conversions BT, XMT and MP4 Playback
-#we have to create the mp4 & co in the source dir for playback, as some files use relative URLs not imported during mp4 encoding ...
-bt_test ()
-{
- btfile=$1
- xmtfile=${btfile%.*}'.xmt'
- mp4file=${btfile%.*}'.mp4'
- libfile=""
- name=$(basename $1)
- name=${name%.*}
- extern_proto=0
- playback_test=1
- inline_resource=0
-
- #file used by other test
- case $btfile in
- *-inline.bt )
-  return ;;
- *-lib.bt )
-  return ;;
- *externproto* )
-  extern_proto=1 ;;
- *inline-http* )
-  ;;
- *inline* )
-  inline_resource=1
-   ;;
- *htk* )
-  return;;
- *counter-auto* )
-  return;;
- bifs-game* )
-  playback_test=0
-  ;;
- *-date* )
-  playback_test=0
-  ;;
-esac
-
- name=${name/bifs/bt}
-
- #start our test, specifying all hash names we will check
- test_begin "$name"
-
- #UI test mode, check for sensor in source
- if [ $test_ui != 0 ] ; then
-   has_sensor=`grep Sensor $1 | grep -v TimeSensor | grep -v MediaSensor`
-   if [ "$has_sensor" != "" ]; then
-    check_inline_res
-    #generate in bifs folder because of links in scene
-    $MP4BOX -mp4 $btfile 2> /dev/null
-    do_ui_test $mp4file "play"
-    rm $mp4file 2> /dev/null
-    rm $libfile 2> /dev/null
-  fi
- fi
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- #check for extern proto, and make MP4 out of lib
- if [ $extern_proto = 1 ] ; then
-  libfile="${btfile%.*}-lib.bt"
-  do_test "$MP4BOX -mp4 $libfile" "Proto-lib-BT->MP4"
-  libfile="${btfile%.*}-lib.mp4"
- fi
-
- check_inline_res
-
- #first do BT->MP4
- do_test "$MP4BOX -mp4 $btfile" "BT2MP4" && do_hash_test "$mp4file" "bt-to-mp4"
-
- #then BT->XMT
- do_test "$MP4BOX -xmt $btfile" "BT2XMT" && do_hash_test "$xmtfile" "bt-to-xmt"
-
- #then all following tests can be run in parallel, but for now we run them sequentially
-
- #XMT->BT
- do_test "$MP4BOX -bt $xmtfile -out test1.bt" "XMT2BT" && do_hash_test "test1.bt" "xmt-to-bt" && rm test1.bt 2> /dev/null 
-
- #XMT->MP4
- do_test "$MP4BOX -mp4 $xmtfile -out $mp4file.tmp" "XMT2MP4" && do_hash_test "$mp4file.tmp" "xmt-to-mp4" && rm "$mp4file.tmp" 
-
- #MP4->BT
- do_test "$MP4BOX -bt $mp4file -out test2.bt" "MP42BT" && do_hash_test "test2.bt" "mp4-to-bt" && rm test2.bt 2> /dev/null 
-
- #MP4->XMT
- do_test "$MP4BOX -xmt $mp4file -out test.xmt" "MP42XMT" && do_hash_test "test.xmt" "mp4-to-xmt" && rm test.xmt 2> /dev/null 
-
- #MP4 stat
- do_test "$MP4BOX -stat $mp4file -std" "MP4STAT" 
- do_test "$MP4BOX -stats $mp4file -std" "MP4STATS" 
- do_test "$MP4BOX -statx $mp4file -std" "MP4STATX" 
-
- if [ $play_all = 1 ] ; then
-
-  #BT playback
-  do_test "$MP4CLIENT -run-for 1 $btfile" "bt-play" 
-
-  #XMT playback
-  do_test "$MP4CLIENT -run-for 1 $xmtfile" "xmt-play" 
-
- fi
-
- if [ $playback_test = 0 ] ; then
-  do_test "$MP4CLIENT -run-for 1 $mp4file" "play" 
- else
-  #MP4 playback - dump 10 sec of AVI and hash it. This should be enough for most of our sequences ...
-  do_playback_test $mp4file "play" 
- fi
-
- #this will sync everything, we can delete after
- test_end
-
- rm $xmtfile 2> /dev/null
- rm $mp4file 2> /dev/null
-
- if [ "$libfile" != "" ] ; then
-  rm $libfile 2> /dev/null
- fi
-
-}
-
-
-bifs_tests ()
-{
- for bt in $MEDIA_DIR/bifs/*.bt ; do
-  bt_test $bt
- done
-}
-
-if [ $disable_playback != 0 ] ; then
-
-#simple encoding test
-bt_test $MEDIA_DIR/bifs/bifs-2D-texturing-lineargradient-simple.bt
-
-#simple encoding with image import test
-bt_test $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt
-
-#simple encoding with AV import test
-bt_test $MEDIA_DIR/bifs/bifs-timeline-mediacontrol-inline-av-inline.bt
-
-#proto encoding
- for bt in $MEDIA_DIR/bifs/bifs-proto-*.bt ; do
-  bt_test $bt
- done
-
- #bifs commands
- for bt in $MEDIA_DIR/bifs/bifs-command-*.bt ; do
-  bt_test $bt
- done
-
- #od commands
- for bt in $MEDIA_DIR/bifs/bifs-od-*.bt ; do
-  bt_test $bt
- done
-
-
-else
-
-bifs_tests
-
-fi
-

gpac-0.8.0.tar.gz/tests/scripts/charset.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/compositor_modes.sh Deleted

@@ -1,85 +0,0 @@
-
-compositor_test ()
-{
- btfile=$2
- name=$(basename $2)
- name=${name%.*}
-
- test_begin "compositor-$1-$name"
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- do_playback_test "$3 -no-save $2" "play"
-
- test_end
-}
-
-BIFS_DIR="$MEDIA_DIR/bifs"
-BIFS_DIR="$MEDIA_DIR/bifs"
-SVG_DIR="$MEDIA_DIR/svg"
-
-#we don't check all files for 2D or always mode checking, onnly: backgrounds2D, interactivity (one is enough), material, texturing and bitmap
-test_2d_3d()
-{
-compositor_test $1 "$BIFS_DIR/bifs-2D-background-background2D-bind.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-background-background2D-image.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-background-background2D-layer2D.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-interactivity-nested-sensors.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-lineproperties.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-material2D.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-xlineproperties-cap.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-xlineproperties-compositetexture2D.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-xlineproperties-imagetexture.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-painting-xlineproperties-lineargradient.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-positioning-form-align-center.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-positioning-layer2d-in-layer2d.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-positioning-layout-horiz-ltr-nowrap.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-shapes-all.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-shapes-pointset2D.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-texturing-compositetexture2D-background.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-texturing-compositetexture2D-bitmap.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-texturing-compositetexture2D-transparent.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-texturing-gradients-transparent.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-texturing-imagetexture-shapes.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-2D-viewport-complete.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-3D-positioning-layer3D.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-bitmap-image-meter-metrics.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-bitmap-image-pixel-metrics.bt" "$opt"
-compositor_test $1 "$BIFS_DIR/bifs-misc-hc-proto-offscreengroup.bt" "$opt"
-}
-
-if [ $disable_playback != 0 ] ; then
- return
-fi
-
-
-opt="-opt Compositor:OpenGLMode=disable"
-test_2d_3d "nogl"
-
-opt="-opt Compositor:OpenGLMode=always"
-test_2d_3d "glonly"
-
-#test draw mode on animations
-opt="-opt Compositor:OpenGLMode=hybrid -opt Compositor:DrawMode=immediate"
-compositor_test "hyb-immediate" "$BIFS_DIR/bifs-interpolation-positioninterpolator2D-position.bt" $opt
-opt="-opt Compositor:OpenGLMode=disable -opt Compositor:DrawMode=immediate"
-compositor_test "nogl-immediate" "$BIFS_DIR/bifs-interpolation-positioninterpolator2D-position.bt" $opt
-opt="-opt Compositor:OpenGLMode=hybrid -opt Compositor:DrawMode=defer-debug"
-compositor_test "hyb-defer-debug" "$BIFS_DIR/bifs-interpolation-positioninterpolator2D-position.bt" $opt
-opt="-opt Compositor:OpenGLMode=disable -opt Compositor:DrawMode=defer-debug"
-compositor_test "nogl-defer-debug" "$BIFS_DIR/bifs-interpolation-positioninterpolator2D-position.bt" $opt
-
-
-#test opacity on SVG
-opt="-opt Compositor:OpenGLMode=hybrid -opt Compositor:DrawMode=immediate"
-compositor_test "svgopacity-hyb-immediate" "$SVG_DIR/opacity.svg" $opt
-opt="-opt Compositor:OpenGLMode=hybrid -opt Compositor:DrawMode=defer"
-compositor_test "svgopacity-hyb-defer" "$SVG_DIR/opacity.svg" $opt
-opt="-opt Compositor:OpenGLMode=disable -opt Compositor:DrawMode=immediate"
-compositor_test "svgopacity-nogl-immediate" "$SVG_DIR/opacity.svg" $opt
-opt="-opt Compositor:OpenGLMode=disable -opt Compositor:DrawMode=defer"
-compositor_test "svgopacity-nogl-defer" "$SVG_DIR/opacity.svg" $opt
-opt="-opt Compositor:OpenGLMode=always"
-compositor_test "svgopacity-gl" "$SVG_DIR/opacity.svg" $opt
-

gpac-0.8.0.tar.gz/tests/scripts/dash-cenc.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-descriptor.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-dynamic.sh Deleted

@@ -1,177 +0,0 @@
-#!/bin/sh
-
-test_begin "dash-dynamic-simple"
-
-if [ $test_skip  = 0 ] ; then
-
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -closest -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-#hash 3rd segment of video and audio, making sur the tfdt is correct
-do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
-
-fi
-
-test_end
-
-
-test_begin "dash-dynamic-loop"
-
-if [ $test_skip  = 0 ] ; then
-
-#import 2.4sec (2.4 gops) and dash using loop mode
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=2.4 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=2.4 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -closest -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video $TEMP_DIR/file.mp4#audio -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-#hash 3rd segment of video and audio
-do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
-
-fi
-
-test_end
-
-
-
-test_begin "dash-dynamic-loop-dur-less-than-seg"
-
-if [ $test_skip  = 0 ] ; then
-
-#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video:dur=1.40001 $TEMP_DIR/file.mp4#audio:dur=1.40001 -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
-
-fi
-
-test_end
-
-
-test_begin "dash-dynamic-loop-dur-greater-than-seg"
-
-if [ $test_skip  = 0 ] ; then
-
-#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 $TEMP_DIR/file.mp4#video:dur=2.4001 $TEMP_DIR/file.mp4#audio:dur=2.40001 -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2-audio"
-
-fi
-
-test_end
-
-
-test_begin "dash-dynamic-noloop-dur-less-than-seg"
-
-if [ $test_skip  = 0 ] ; then
-
-#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 -no-loop $TEMP_DIR/file.mp4#video:dur=1.4001 $TEMP_DIR/file.mp4#audio:dur=1.4001 -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-do_hash_test $TEMP_DIR/file_dash_track1_p2_1.m4s "hash-seg1p2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_p2_1.m4s "hash-seg1p2-audio"
-
-do_hash_test $TEMP_DIR/file_dash_track1_p3_1.m4s "hash-seg1p3-video"
-do_hash_test $TEMP_DIR/file_dash_track2_p3_1.m4s "hash-seg1p3-audio"
-
-fi
-
-test_end
-
-
-test_begin "dash-dynamic-noloop-dur-greater-than-seg"
-
-if [ $test_skip  = 0 ] ; then
-
-#import 10 sec (10 gops) and dash for a shorter media duration using loop mode
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264:dur=10 -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_audio.aac:dur=10 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-do_test "$MP4BOX -dash-live 2000 -subdur 2000 -profile live -mpd-refresh 10 -time-shift -1 -run-for 4000 -no-loop $TEMP_DIR/file.mp4#video:dur=2.4001 $TEMP_DIR/file.mp4#audio:dur=2.4001 -out $TEMP_DIR/file.mpd" "dash-gen" &
-
-sleep 1
-
-dump_dur=2
-do_playback_test "$TEMP_DIR/file.mpd" "dash-play"
-
-#wait for the end of the MP4Box
-wait
-
-#hash the final MPD (written as  static)
-do_hash_test $TEMP_DIR/file.mpd "hash-mpd"
-
-do_hash_test $TEMP_DIR/file_dash_track1_2.m4s "hash-seg2p1-video"
-do_hash_test $TEMP_DIR/file_dash_track2_2.m4s "hash-seg2p1-audio"
-
-do_hash_test $TEMP_DIR/file_dash_track1_p2_1.m4s "hash-seg1p2-video"
-do_hash_test $TEMP_DIR/file_dash_track2_p2_1.m4s "hash-seg1p2-audio"
-
-fi
-
-test_end
-

gpac-0.8.0.tar.gz/tests/scripts/dash-if-live.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-if-ondemand.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-live.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-main-singlefile.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-main.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-media-input-dur.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-multiperiod.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-srd-hevc.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-ssix.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-subtitle.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-template.sh Deleted

@@ -1,31 +0,0 @@
-#!/bin/sh
-
-base_test()
-{
-
-test_begin $1
-
-do_test "$MP4BOX -add $EXTERNAL_MEDIA_DIR/counter/counter_30s_I25_baseline_1280x720_512kbps.264 -new $TEMP_DIR/file.mp4" "dash-input-preparation"
-
-#test bandwidth, time and init
-do_test "$MP4BOX -dash 1000 -out $TEMP_DIR/file.mpd $TEMP_DIR/file.mp4$2" "$1-dash"
-
-do_hash_test $TEMP_DIR/file.mpd "$1-hash-mpd"
-
-do_hash_test $TEMP_DIR/$3 "$1-hash-init"
-
-do_hash_test $TEMP_DIR/$4 "$1-hash-seg"
-
-do_playback_test "$TEMP_DIR/file.mpd" "$1-play"
-
-test_end
-
-}
-
-base_test "dash-template-bandwidth-time" ":bandwidth=600000 -profile live -segment-name test-\$Bandwidth\$-\$Time%05d\$\$Init=is\$" "test-600000-is.mp4" "test-600000-01000.m4s"
-
-base_test "dash-template-repid-number" ":id=myrep -profile live -segment-name test-\$RepresentationID\$-\$Number%d\$" "test-myrep-.mp4" "test-myrep-10.m4s"
-
-base_test "dash-template-baseurl-global-path" ":id=myrep -base-url some_dir/ -profile live -segment-name \$Path=some_dir/\$test-\$RepresentationID\$-\$Number%d\$" "some_dir/test-myrep-.mp4" "some_dir/test-myrep-10.m4s"
-
-base_test "dash-template-baseurl-rep-path" ":id=myrep:baseURL=some_dir/ -profile live -segment-name \$Path=some_dir/\$test-\$RepresentationID\$-\$Number%d\$" "some_dir/test-myrep-.mp4" "some_dir/test-myrep-10.m4s"

gpac-0.8.0.tar.gz/tests/scripts/dash-timeline.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash-ts.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/dash_cues.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/encryption.sh Deleted

@@ -1,128 +0,0 @@
-
-
-crypto_unit_test()
-{
-
-test_begin "encryption-$1"
-
-if [ $test_skip  = 1 ] ; then
- return
-fi
-
-cryptfile="$TEMP_DIR/$1-crypted.mp4"
-decryptfile="$TEMP_DIR/$1-decrypted.mp4"
-
-do_test "$MP4BOX -crypt $2 -out $cryptfile $mp4file" "Encrypt"
-do_hash_test $cryptfile "crypt"
-
-do_test "$MP4BOX -decrypt $2 -out $decryptfile $cryptfile" "Decrypt"
-do_hash_test $decryptfile "decrypt"
-
-#compare hashes of source and decrypted
-do_compare_file_hashes $mp4file $decryptfile
-rv=$?
-
-if [ $rv != 0 ] ; then
-result="Hash is not the same between source content and decrypted content"
-fi
-
-#do dash test
-do_test "$MP4BOX -dash 4000 -profile live -out $TEMP_DIR/test.mpd $cryptfile" "DASH"
-
-dashfile="$TEMP_DIR/$1-crypted_dashinit.mp4"
-do_hash_test $dashfile "crypt-dash-init"
-
-dashfile="$TEMP_DIR/$1-crypted_dash1.m4s"
-do_hash_test $dashfile "crypt-dash-seg"
-
-#playback test of files for which we can retrieve the key
-if [ $1 != "adobe" ] ; then
-do_playback_test "$cryptfile" "play"
-fi
-
-test_end
-
-}
-
-crypto_test_file()
-{
-
-for drm in $MEDIA_DIR/encryption/*.xml ; do
-#vp9 only supports ctr for now
-if [ $1 == "vp9" ] ; then
- case $drm in
- *cbc* )
- 	continue ;;
- *adobe* )
- 	continue ;;
- *isma* )
- 	continue ;;
- *cens* )
- 	continue ;;
- *clearbytes* )
- 	continue ;;
- *forceclear* )
- 	continue ;;
- esac
-elif [ $1 != "avc" ] ; then
- case $drm in
- *clearbytes* )
- 	continue ;;
- *forceclear* )
- 	continue ;;
- esac
-fi
-
-name=$(basename $drm)
-name=${name%%.*}
-
-crypto_unit_test "$name-$1" $drm
-
-done
-
-}
-
-mp4file="$TEMP_DIR/source_media.mp4"
-
-#AVC
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264 -new $mp4file 2> /dev/null
-crypto_test_file "avc"
-
-#AAC
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_audio.aac -new $mp4file 2> /dev/null
-crypto_test_file "aac"
-
-#HEVC
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/counter.hvc -new $mp4file 2> /dev/null
-crypto_test_file "hevc"
-
-#AV1
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/video.av1 -new $mp4file 2> /dev/null
-crypto_test_file "av1"
-
-rm -f $mp4file 2> /dev/null
-
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
- return
-fi
-
-#test encryption of AVC with emul prev byte in non encrypted NAL
-test_begin "encryption-avc-ebp"
-
-$MP4BOX -crypt $MEDIA_DIR/encryption/cbcs.xml $EXTERNAL_MEDIA_DIR/misc/avc_sei_epb.mp4 -out $mp4file 2> /dev/null
-do_hash_test $mp4file "crypt-avc-epb"
-rm -f $mp4file 2> /dev/null
-
-test_end
-
-#AV1 with small tiles less than 16 bytes
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/import/obu_tiles4x2_grp4.av1 -new $mp4file 2> /dev/null
-crypto_test_file "av1small"
-
-
-#VP9, we only test CTR
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/import/counter_1280_720_I_25_500k.ivf -new $mp4file 2> /dev/null
-crypto_test_file "vp9"
-
-

gpac-0.8.0.tar.gz/tests/scripts/encryption_import.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/fuzz-base.sh Deleted

@@ -1,74 +0,0 @@
-
-#@mp4_test execute basics MP4Box tests on source file: -add, -info, -dts, -hint -drtp -sdp -unhint and MP4 Playback
-fuzz_encode ()
-{
- name=$(basename $1)
- mp4file="$TEMP_DIR/$name.mp4"
-
- test_begin "fuzz-base-$name"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- fuzz_test=1
-
- #encode media
- do_test "$MP4BOX -mp4 $1 -out $mp4file" "MediaEncode"
-
- rm $mp4file
- test_end
-}
-
-#@mp4_test execute basics MP4Box tests on source file: -add, -info, -dts, -hint -drtp -sdp -unhint and MP4 Playback
-fuzz_import ()
-{
- name=$(basename $1)
- mp4file="$TEMP_DIR/$name.mp4"
-
- test_begin "fuzz-base-$name"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- fuzz_test=1
-
- #test media
- do_test "$MP4BOX -info $1" "RawMediaInfo"
- #import media
- do_test "$MP4BOX -add $1 -new $mp4file" "MediaImport"
-
- rm $mp4file
- test_end
-}
-
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
-  return
-fi
-
-for src in $EXTERNAL_MEDIA_DIR/fuzzing/* ; do
- case $src in 
- *.xmt )
- fuzz_encode $src
- ;;
- *.bt )
- fuzz_encode $src
- ;;
- *.xsr )
- fuzz_encode $src
- ;;
- *.info )
- ;;
- *.media )
- ;;
- *.html* )
- ;;
- * )
- fuzz_import $src
- ;;
- esac
-done
-
-

gpac-0.8.0.tar.gz/tests/scripts/hls.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/iff.sh Deleted

@@ -1,77 +0,0 @@
-#!/bin/sh
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
-  return
-fi
-
-COUNTERFILE=$EXTERNAL_MEDIA_DIR/counter/counter_1280_720_I_25_tiled_500kb.hevc
-
-test_begin "iff"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-iff_file="$TEMP_DIR/basic.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE -ab heic -new $iff_file" "create-iff-basic"
-do_hash_test $iff_file "create-iff-basic"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic"
-
-iff_file="$TEMP_DIR/basic-time.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:time=1.2 -ab heic -new $iff_file" "create-iff-basic-time"
-do_hash_test $iff_file "create-iff-basic-time"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-time"
-
-iff_file="$TEMP_DIR/basic-id.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:id=42 -ab heic -new $iff_file" "create-iff-basic-id"
-do_hash_test $iff_file "create-iff-basic-id"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-id"
-
-iff_file="$TEMP_DIR/basic-primary.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:primary -ab heic -new $iff_file" "create-iff-basic-primary"
-do_hash_test $iff_file "create-iff-basic-primary"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-primary"
-
-iff_file="$TEMP_DIR/basic-name.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:name=MyImage -ab heic -new $iff_file" "create-iff-basic-name"
-do_hash_test $iff_file "create-iff-basic-name"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-name"
-
-iff_file="$TEMP_DIR/basic-hidden.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:hidden -ab heic -new $iff_file" "create-iff-basic-hidden"
-do_hash_test $iff_file "create-iff-basic-hidden"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-hidden"
-
-iff_file="$TEMP_DIR/basic-rotation.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:rotation=90 -ab heic -new $iff_file" "create-iff-basic-rotation"
-do_hash_test $iff_file "create-iff-basic-rotation"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-rotation"
-
-iff_file="$TEMP_DIR/basic-all.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:id=2:primary:name=Test:time=4.2:hidden:rotation=90 -ab heic -new $iff_file" "create-iff-basic-all"
-do_hash_test $iff_file "create-iff-basic-all"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-basic-all"
-
-iff_file="$TEMP_DIR/2images.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:time=0:primary -add-image $COUNTERFILE:time=4.2 -ab heic -new $iff_file" "create-iff-2images"
-do_hash_test $iff_file "create-iff-2images"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-2images"
-
-iff_file="$TEMP_DIR/2images-ref.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:id=1:time=0:primary -add-image $COUNTERFILE:time=4.2:id=2:ref=thmb,1 -ab heic -new $iff_file" "create-iff-2images-ref"
-do_hash_test $iff_file "create-iff-2images-ref"
-do_test "$MP4BOX -diso $iff_file" "diso-iff-2images-ref"
-
-iff_tile_file="$TEMP_DIR/tiled.heic"
-do_test "$MP4BOX -add-image $COUNTERFILE:split_tiles:primary -ab heic -new $iff_tile_file" "create-iff-tiled"
-do_hash_test $iff_tile_file "create-iff-tiled"
-do_test "$MP4BOX -diso $iff_tile_file" "diso-iff-tiled"
-
-#test pict video handler + add image
-iff_file="$TEMP_DIR/vidseq.heic"
-do_test "$MP4BOX -add $COUNTERFILE:hdlr=pict -ab heic -new $iff_file" "create-pict-heif"
-do_hash_test $iff_file "create-pict-heif"
-do_test "$MP4BOX -add-image $COUNTERFILE:primary $iff_file" "add-image-pict"
-do_hash_test $iff_file "add-image-pict"
-
-test_end

gpac-0.8.0.tar.gz/tests/scripts/item.sh Deleted

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-mp4file=$TEMP_DIR/test.mp4
-
-test_begin "meta"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-do_test "$MP4BOX -set-meta Metadata:id=0 $EXTERNAL_MEDIA_DIR/item/counter_noItems1.mp4 -out $mp4file" "set0"
-do_hash_test $mp4file "set0"
-do_test "$MP4BOX -set-meta Metadata:id=1 $EXTERNAL_MEDIA_DIR/item/counter_noItems2.mp4 -out $mp4file" "set1"
-do_hash_test $mp4file "set1"
-do_test "$MP4BOX -set-meta Metadata $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -out $mp4file" "set2"
-do_hash_test $mp4file "set2"
-
-
-do_test "$MP4BOX -add-item $EXTERNAL_MEDIA_DIR/item/file.html:mime=html:id=1 -add-item $EXTERNAL_MEDIA_DIR/item/file.css:mime=css:id=2 -add-item $EXTERNAL_MEDIA_DIR/item/file.js:mime=javascript:id=3 -add-item $EXTERNAL_MEDIA_DIR/item/file.svg:mime=svg:id=4 $EXTERNAL_MEDIA_DIR/item/counter_noItems.mp4 -out $mp4file" "add-items"
-do_hash_test $mp4file "add-items"
-
-do_test "$MP4BOX -set-primary id=2 $mp4file" "set-primary"
-do_hash_test $mp4file "mp4box-set-primary"
-
-do_test "$MP4BOX $mp4file -dump-item 1:path=$TEMP_DIR/file1.html" "dump-item1"
-do_hash_test $TEMP_DIR/file1.html "dump-item1"
-do_test "$MP4BOX $mp4file -dump-item 2:path=$TEMP_DIR/file1.css" "dump-item2"
-do_hash_test $TEMP_DIR/file1.css "dump-item2"
-do_test "$MP4BOX $mp4file -dump-item 3:path=$TEMP_DIR/file1.js" "dump-item3"
-do_hash_test $TEMP_DIR/file1.js "dump-item3"
-do_test "$MP4BOX $mp4file -dump-item 4:path=$TEMP_DIR/file1.svg" "dump-item4"
-do_hash_test $TEMP_DIR/file1.svg "dump-item4"
-
-
-do_test "$MP4BOX -rem-item 1 $mp4file" "remove-item1"
-do_hash_test $mp4file "remove-item1"
-do_test "$MP4BOX -rem-item 2 $mp4file" "remove-item2"
-do_hash_test $mp4file "remove-item2"
-do_test "$MP4BOX -rem-item 3 $mp4file" "remove-item3"
-do_hash_test $mp4file "remove-item3"
-do_test "$MP4BOX -rem-item 4 $mp4file" "remove-item4"
-do_hash_test $mp4file "remove-item4"
-
-do_test "$MP4BOX -set-meta XML -set-xml $EXTERNAL_MEDIA_DIR/item/file.xml:id=1 $mp4file" "set-meta-XML-data"
-do_hash_test $mp4file "set-meta-XML-data"
-
-do_test "$MP4BOX -dump-xml $TEMP_DIR/file1.xml:id=1 $mp4file" "dump-meta-XML-data"
-do_hash_test $mp4file "dump-meta-XML-data"
-
-do_test "$MP4BOX -rem-xml id=1 $mp4file" "remove-meta-XML-data"
-do_hash_test $mp4file "remove-meta-XML-data"
-
-test_end

gpac-0.8.0.tar.gz/tests/scripts/laser_all.sh Deleted

@@ -1,94 +0,0 @@
-
-#@lsr_test execute tests on lsr file: laser<->MP4, laser<->saf,  conversions BT, XMT and MP4 Playback
-lsr_test ()
-{
- lsrfile=$1
- mp4file=${lsrfile%.*}'.mp4'
- saffile=${lsrfile%.*}'.saf'
- name=$(basename $1)
- name=${name%.*}
- force_coord_bits=0
-
- case $1 in
- *.png )
- return ;;
-
- *.jpg )
- return ;;
-
- *enst_canvas* )
- force_coord_bits=1 ;;
- esac
-
- #start our test, specifying all hash names we will check
- test_begin "laser-$name"
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- opts=""
- if [ $force_coord_bits = 1 ] ; then
-  opts="-coord-bits 24"
- fi
-
- #LSR->MP4
- do_test "$MP4BOX $opts -mp4 $lsrfile" "LSR2MP4" && do_hash_test "$mp4file" "lsr-to-mp4"
-
- #LSR->SAF
- do_test "$MP4BOX $opts -saf $lsrfile" "LSR2SAF" && do_hash_test "$saffile" "lsr-to-saf"
-
- #run all following tests in parallel
-
- #MP4->LSR
- do_test "$MP4BOX -lsr $mp4file -out test1.lsr" "MP42LSR" && do_hash_test "test1.lsr" "mp4-to-lsr" && rm test1.lsr 2> /dev/null &
-
- #SAF->LSR
- do_test "$MP4BOX -lsr $saffile -out test2.lsr" "SAF2LSR" && do_hash_test "test2.lsr" "saf-to-lsr" && rm test2.lsr 2> /dev/null &
-
- if [ $play_all = 1 ] ; then
-
-  #mp4 playback
-  do_test "$MP4CLIENT -run-for 1 $mp4file" "mp4-play" &
-
-  #lsr playback
-  do_test "$MP4CLIENT -run-for 1 $lsrfile" "lsr-play" &
-
- fi
-
- #SAF playback - dump 10 sec of AVI and hash it. This should be enough for most of our sequences ...
- do_playback_test $saffile "play" &
-
- #this will sync everything, we can delete after
- test_end
-
- rm $saffile 2> /dev/null
- rm $mp4file 2> /dev/null
-
-}
-
-
-laser_tests ()
-{
- for bt in $MEDIA_DIR/laser/*.xml ; do
-  lsr_test $bt
- done
-}
-
-rm -f MEDIA_DIR/laser/*.mp4 2> /dev/null
-rm -f MEDIA_DIR/laser/*.saf 2> /dev/null
-
-if [ $disable_playback != 0 ] ; then
-
-#simple encoding tests
-lsr_test $MEDIA_DIR/laser/enst_afrique.xml
-lsr_test $MEDIA_DIR/laser/stz_animate_stroke-linejoin.xml
-lsr_test $MEDIA_DIR/laser/stz_image_parsing.xml
-lsr_test $MEDIA_DIR/laser/stz_image_parsing2.xml
-lsr_test $MEDIA_DIR/laser/enst_canvas.xml
-
-else
-
-laser_tests
-
-fi
-

gpac-0.8.0.tar.gz/tests/scripts/mp42ts.sh Deleted

@@ -1,45 +0,0 @@
-#test MP4Box RTP streaming and MP4 client
-
-#DST="-dst=239.255.0.1"
-DST=""
-
-IFCE="127.0.0.1"
-
-tsfile="$TEMP_DIR/test.ts"
-
-
-ts_test ()
-{
-
-test_begin "mp42ts-$1"
-if [ $test_skip  = 1 ] ; then
-return
-fi
-
-do_test "$MP42TS $2" "file"
-do_hash_test $tsfile "file"
-
-do_playback_test "$tsfile" "play"
-
-rm $tsfile
-test_end
-}
-
-mp4file="$TEMP_DIR/test.mp4"
-
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac -new $mp4file 2> /dev/null
-
-
-ts_test "simple" "-src $mp4file -dst-file=$tsfile -pcr-init 0"
-
-ts_test "rate" "-src $mp4file -dst-file=$tsfile -rate 10000 -pcr-init 0"
-
-ts_test "singleau" "-src $mp4file -dst-file=$tsfile -single-au -pcr-init 0"
-
-ts_test "multiau" "-src $mp4file -dst-file=$tsfile -multi-au -pcr-init 0"
-
-ts_test "temi" "-src $mp4file -dst-file=$tsfile -temi -pcr-init 0"
-
-ts_test "pcr" "-src $mp4file -dst-file=$tsfile -pcr-ms 40 -force-pcr-only -pcr-init 0 -pcr-offset 30000 -rap"
-
-rm $mp4file

gpac-0.8.0.tar.gz/tests/scripts/mp4box-base.sh Deleted

@@ -1,92 +0,0 @@
-
-
-test_begin "mp4box-base-dump"
-if [ "$test_skip" = 1 ] ; then
- return
-fi
-
-mp4file="$TEMP_DIR/test.mp4"
-do_test "$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac -add $MEDIA_DIR/auxiliary_files/subtitle_fr.srt:lang=fra -new $mp4file" "create-mp4"
-do_hash_test $mp4file "create-mp4"
-
-do_test "$MP4BOX -add $mp4file -dref -new $TEMP_DIR/dref.mp4" "create-dref-mp4"
-do_hash_test $TEMP_DIR/dref.mp4 "create-dref-mp4"
-
-do_test "$MP4BOX  -raw 1 $mp4file -out $TEMP_DIR/test.tmp" "raw-264"
-do_hash_test $TEMP_DIR/test.tmp "raw-264"
-rm $TEMP_DIR/test.tmp 2&>/dev/null
-
-do_test "$MP4BOX  -raw 2 $mp4file -out $TEMP_DIR/test.tmp" "raw-aac"
-do_hash_test $TEMP_DIR/test.tmp "raw-aac"
-rm $TEMP_DIR/test.tmp 2&>/dev/null
-
-do_test "$MP4BOX  -raw 3 $mp4file -out $TEMP_DIR/test.tmp" "raw-text"
-do_hash_test $TEMP_DIR/test.tmp "raw-text"
-rm $TEMP_DIR/test.tmp 2&>/dev/null
-
-do_test "$MP4BOX  -srt 3 $mp4file -out $TEMP_DIR/test.tmp" "srt-text"
-do_hash_test $TEMP_DIR/test.tmp "srt-text"
-rm $TEMP_DIR/test.tmp 2&>/dev/null
-
-do_test "$MP4BOX  -ttxt 3 $mp4file -out $TEMP_DIR/test.tmp" "ttxt-text"
-do_hash_test $TEMP_DIR/test.tmp "ttxt-text"
-rm $TEMP_DIR/test.tmp 2&>/dev/null
-
-
-do_test "$MP4BOX -raws 1 $mp4file" "raw-samples"
-n=`ls -1f $TEMP_DIR/test_track* | wc -l | tr -d ' '`
-n=${n#0}
-if [ "$n" != 173 ] ; then
-result="Wrong sample count $n (expected 173)"
-fi
-rm $TEMP_DIR/test_track* 2&>/dev/null
-
-do_test "$MP4BOX -info 1 $mp4file" "InfoTk1"
-do_test "$MP4BOX -info 2 $mp4file" "InfoTk2"
-do_test "$MP4BOX -info 3 $mp4file" "InfoTk3"
-
-do_test "$MP4BOX -raws 1:1 $mp4file -out $TEMP_DIR/test.tmp" "raw-sample"
-do_hash_test $TEMP_DIR/test.tmp "raw-sample"
-
-do_test "$MP4BOX -flat $mp4file" "flat-storage"
-do_hash_test $mp4file "flat-storage"
-
-do_test "$MP4BOX -brand MP4V:1 -ab iso6 -inter 250 $mp4file" "interleave-250ms"
-do_hash_test $mp4file "interleave-250ms"
-
-do_test "$MP4BOX -rb iso6 -frag 1000 $mp4file -out $TEMP_DIR/frag-1s.mp4" "frag-1s"
-do_hash_test "$TEMP_DIR/frag-1s.mp4" "frag-1s"
-mv "$TEMP_DIR/frag-1s.mp4" $mp4file
-
-test_end
-
-#commented out since not very usefull, always changing and not impacting coverage
-return
-
-test_begin "mp4box-base-help"
-
-do_test "$MP4BOX -version" "Version" &
-do_test "$MP4BOX -h" "Help" &
-do_test "$MP4BOX -h general" "HelpGeneral" &
-do_test "$MP4BOX -h hint" "HelpHint" &
-do_test "$MP4BOX -h dash" "HelpDash" &
-do_test "$MP4BOX -h import" "HelpImport" &
-do_test "$MP4BOX -h encode" "HelpEncode" &
-do_test "$MP4BOX -h meta" "HelpMeta" &
-do_test "$MP4BOX -h extract" "HelpExtract" &
-do_test "$MP4BOX -h dump" "HelpDump" &
-do_test "$MP4BOX -h swf" "HelpSwf" &
-do_test "$MP4BOX -h crypt" "HelpCrypt" &
-do_test "$MP4BOX -h format" "HelpFormat" &
-do_test "$MP4BOX -h rtp" "HelpRtp" &
-do_test "$MP4BOX -h live" "HelpLive" &
-do_test "$MP4BOX -h all" "HelpAll" &
-do_test "$MP4BOX -nodes" "Nodes" &
-do_test "$MP4BOX -node AnimationStream" "NodeAnimStream" &
-do_test "$MP4BOX -xnodes" "Xnodes" &
-do_test "$MP4BOX -xnode" "ElevationGrid" &
-do_test "$MP4BOX -snodes" "Snodes" &
-do_test "$MP4BOX -languages" "Languages" &
-
-test_end
-

gpac-0.8.0.tar.gz/tests/scripts/mp4box-deps.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/mp4box-io.sh Deleted

@@ -1,134 +0,0 @@
-hint_test ()
-{
- tempfile=$1'.tmp'
- hintfile=$1'.hint'
- #hint media
- do_test "$MP4BOX -hint $1 -out $hintfile" "RTPHint"
- do_hash_test $hintfile "hint"
-
- #check SDP+RTP packets
- do_test "$MP4BOX -drtp $hintfile -out $tempfile" "RTPDump"
- do_hash_test "$tempfile" "drtp"
-
- #unhint media
- do_test "$MP4BOX -unhint $hintfile" "RTPUnhint"
- do_hash_test $hintfile "unhint"
-
- rm $tempfile
- rm $hintfile
-}
-
-#@mp4_test execute basics MP4Box tests on source file: -add, -info, -dts, -hint -drtp -sdp -unhint and MP4 Playback
-mp4_test ()
-{
- do_hint=1
- do_play=1
-
- #ignore xlst & others, no hinting for images
- case $1 in
- *.xslt )
-  return ;;
- *.html* )
-  return ;;
- *.bt )
-  return ;;
- *.wrl )
-  return ;;
- #only check the logo.png
- */logo.jpg )
-  return ;;
- # mkv not supported yet
- *.mkv )
-  return ;;
- *.jpg )
-  do_hint=0 ;;
- *.jpeg )
-  do_hint=0 ;;
- # jp2, mjp2 and m1v disabled
- *.jp2 )
-  return ;;
- *.mj2 )
-  return ;;
- *.m1v )
-  return ;;
- *.av1 )
-  do_hint=0 ;;
- *.opus )
-  do_hint=0 ;;
- *.obu )
-  do_hint=0 ;;
- *.ivf )
-  do_hint=0 ;;
- *.png )
-  do_hint=0 ;;
- *.qcp )
-  do_play=0 ;;
- #no support for hinting or playback yet
- *.ismt )
-  do_hint=0 && do_play=0 ;;
- esac
-
- name=$(basename $1)
- test_begin "mp4box-io-$name"
-
- mp4file="$TEMP_DIR/$name.mp4"
- tmp1="$TEMP_DIR/$name.1.tmp"
- tmp2="$TEMP_DIR/$name.2.tmp"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- #test media
- do_test "$MP4BOX -info $1" "RawMediaInfo"
- #import media
- do_test "$MP4BOX -add $1 -new $mp4file" "MediaImport"
- do_hash_test $mp4file "add"
-
- #all the tests below are run in parallel
-
- #test info - no hash on this one we usually change it a lot
- do_test "$MP4BOX -info $mp4file" "MediaInfo" &
-
- #test -diso
- do_test "$MP4BOX -diso $mp4file -out $tmp1" "XMDDump" && do_hash_test $tmp1 "diso" && rm $tmp1 2> /dev/null &
-
- #test dts
- do_test "$MP4BOX -dts $mp4file -out $tmp2" "MediaTime" && do_hash_test $tmp2 "dts" && rm $tmp2 2> /dev/null &
-
-
- if [ $do_hint != 0 ] ; then
-  hint_test $mp4file &
- fi
-
- if [ $do_play != 0 ] ; then
-  #MP4 playback
-  dump_dur=8
-  do_playback_test $mp4file "play"
- fi
-
- test_end
-}
-
-
-mp4box_tests ()
-{
- for src in $MEDIA_DIR/auxiliary_files/* ; do
-  mp4_test $src
- done
-
- if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
-  return
- fi
-
- for src in $EXTERNAL_MEDIA_DIR/import/* ; do
-  mp4_test $src
- done
-
-}
-
-mp4box_tests
-
-#mp4_test "auxiliary_files/enst_audio.aac"
-#mp4_test $MEDIA_DIR/import/speedway.mj2
-

gpac-0.8.0.tar.gz/tests/scripts/mp4box-kind.sh Deleted

@@ -1,157 +0,0 @@
-#!/bin/sh
-
-output=$TEMP_DIR/output.mp4
-
-my_test_with_hash ()
-{
-	do_test "$1" $2
-	do_hash_test $output $2
-}
-
-
-test_begin "mp4box-kind"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264:dur=1 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac:dur=1 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-my_test_with_hash "$MP4BOX -kind all=myKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-all-scheme" $output
-$MP4BOX -info $output 2> /dev/null
-$MP4BOX -diso $output 2> /dev/null
-
-my_test_with_hash "$MP4BOX -kind-rem all=myKindScheme $output" "kind-all-scheme-rem"
-
-my_test_with_hash "$MP4BOX -kind-rem all=myKindScheme $output" "kind-all-scheme-rem-twice"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind all=myKindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-all-scheme-value"
-
-my_test_with_hash "$MP4BOX -kind-rem all=myKindScheme=myKindValue $output" "kind-all-scheme-value-rem"
-
-rm $output 2> /dev/null
-do_test "$MP4BOX -kind all=myKindScheme=myKindValue2 $TEMP_DIR/file.mp4 -out $output" "kind-all-scheme-value-multiple-1"
-do_test "$MP4BOX -kind all=myKindScheme=myKindValue $output" "kind-all-scheme-value-multiple-2"
-my_test_with_hash "$MP4BOX -kind all=myKindScheme $output" "kind-all-scheme-value-multiple-3"
-
-my_test_with_hash "$MP4BOX -kind-rem all=myKindScheme=myKindValue $output" "kind-all-multiple-rem-1"
-
-my_test_with_hash "$MP4BOX -kind-rem all=myKindScheme $output" "kind-all-rem-scheme"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind all=urn:gpac:kindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-all-scheme-with-column"
-
-my_test_with_hash "$MP4BOX -kind-rem all=urn:gpac:kindScheme=myKindValue  $output" "kind-all-scheme-with-column-rem"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind all=myFirstKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-all-2-schemes-1"
-my_test_with_hash "$MP4BOX -kind all=mySecondKindScheme $output" "kind-all-2-schemes-2"
-
-my_test_with_hash "$MP4BOX -kind-rem all=myFirstKindScheme $output" "kind-all-2-schemes-rem-1"
-my_test_with_hash "$MP4BOX -kind-rem all=mySecondKindScheme $output" "kind-all-2-schemes-rem-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind all=myFirstKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-all-same-scheme-1"
-my_test_with_hash "$MP4BOX -kind all=myFirstKindScheme $output" "kind-all-same-scheme-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind all=myFirstKindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-all-same-scheme-value-1"
-my_test_with_hash "$MP4BOX -kind all=myFirstKindScheme=myKindValue $output" "kind-all-same-scheme-value-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind myKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-scheme"
-
-my_test_with_hash "$MP4BOX -kind-rem myKindScheme $output" "kind-scheme-rem"
-
-my_test_with_hash "$MP4BOX -kind-rem myKindScheme $output" "kind-scheme-rem-twice"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind myKindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-scheme-value"
-
-my_test_with_hash "$MP4BOX -kind-rem myKindScheme=myKindValue $output" "kind-scheme-value-rem"
-
-rm $output 2> /dev/null
-do_test "$MP4BOX -kind myKindScheme=myKindValue2 $TEMP_DIR/file.mp4 -out $output" "kind-scheme-value-multiple-1"
-do_test "$MP4BOX -kind myKindScheme=myKindValue $output" "kind-scheme-value-multiple-2"
-my_test_with_hash "$MP4BOX -kind myKindScheme $output" "kind-scheme-value-multiple-3"
-
-my_test_with_hash "$MP4BOX -kind-rem myKindScheme=myKindValue $output" "kind-multiple-rem-1"
-
-my_test_with_hash "$MP4BOX -kind-rem myKindScheme $output" "kind-rem-scheme"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind urn:gpac:kindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output"	
-
-my_test_with_hash "$MP4BOX -kind-rem urn:gpac:kindScheme=myKindValue  $output" "kind-scheme-with-column-rem"
-
-rm $output 2> /dev/null
-do_test "$MP4BOX -kind myFirstKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-2-schemes-1"
-my_test_with_hash "$MP4BOX -kind mySecondKindScheme $output" "kind-2-schemes-2"
-
-do_test "$MP4BOX -kind-rem myFirstKindScheme $output" "kind-2-schemes-rem-1"
-my_test_with_hash "$MP4BOX -kind-rem mySecondKindScheme $output" "kind-2-schemes-rem-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind myFirstKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-same-scheme-1"
-my_test_with_hash "$MP4BOX -kind myFirstKindScheme $output" "kind-same-scheme-1"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind myFirstKindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-same-scheme-value-1"
-my_test_with_hash "$MP4BOX -kind myFirstKindScheme=myKindValue $output" "kind-same-scheme-value-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind 1=myKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-track-scheme"
-my_test_with_hash "$MP4BOX -kind-rem 1=myKindScheme $output" "kind-track-scheme-rem"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind 1=myKindScheme=myKindValue $TEMP_DIR/file.mp4 -out $output" "kind-track-scheme-value"
-my_test_with_hash "$MP4BOX -kind-rem 1=myKindScheme=myKindValue $output" "kind-track-scheme-value-rem"
-
-rm $output 2> /dev/null
-do_test "$MP4BOX -kind 1=myKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-track-2-schemes-1"
-my_test_with_hash "$MP4BOX -kind 1=mySecondKindScheme $output" "kind-track-2-schemes-2"
-my_test_with_hash "$MP4BOX -kind-rem 1=myKindScheme $output" "kind-track-2-schemes-rem-1"
-my_test_with_hash "$MP4BOX -kind-rem 1=mySecondKindScheme $output" "kind-track-2-schemes-rem-2"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -kind 1=mySecondKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-track-2-schemes-2-tracks-1"
-my_test_with_hash "$MP4BOX -kind 2=mySecondKindScheme $output" "kind-track-2-schemes-2-tracks-2"
-my_test_with_hash "$MP4BOX -kind-rem 1=mySecondKindScheme $output" "kind-track-2-schemes-2-tracks-rem-1"
-my_test_with_hash "$MP4BOX -kind-rem 2=mySecondKindScheme $output" "kind-track-2-schemes-2-tracks-rem-2"
-
-rm $output 2> /dev/null
-rm $TEMP_DIR/out2.mp4 2> /dev/null
-my_test_with_hash "$MP4BOX -kind mySecondKindScheme $TEMP_DIR/file.mp4 -out $output" "kind-new-output"
-
-my_test_with_hash "$MP4BOX -add $output $TEMP_DIR/out2.mp4" "kind-import-mp4"
-rm $TEMP_DIR/out2.mp4 2> /dev/null
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=myKindScheme -new $output" "kind-import-track-scheme"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=myKindScheme=myKindValue -new $output" "kind-import-track-scheme-value"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=urn:gpac:kindScheme=myKindValue -new $output" "kind-import-track-scheme-value-column"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=myKindScheme=myKindValue:kind=myKindScheme=myKindValue2 -new $output" "kind-import-track-2-schemes-same-kind"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=myKindScheme=myKindValue:kind=myKindScheme2=myKindValue2 -new $output" "kind-import-track-2-schemes-same-kind"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:kind=myKindScheme=myKindValue:kind=myKindScheme=myKindValue -new $output" "kind-import-track-2-kinds-same"
-
-#### TODO
-## concat of same kinds, of different kinds
-## fragmentation/segmentation preserves kinds
-## dash uses kinds
-
-rm $TEMP_DIR/file.mp4 2> /dev/null
-rm $output 2> /dev/null
-
-test_end
-

gpac-0.8.0.tar.gz/tests/scripts/mp4box-lang.sh Deleted

@@ -1,75 +0,0 @@
-#!/bin/sh
-
-output=$TEMP_DIR/output.mp4
-
-my_test_with_hash ()
-{
-	do_test "$1" $2
-	do_hash_test $output $2
-
-	do_test "$MP4BOX -info $output" "$2-info"
-	do_test "$MP4BOX -diso $output -out $TEMP_DIR/out_info.xml" "$2-diso"
-	do_hash_test $TEMP_DIR/out_info.xml "$2-diso"
-}
-
-
-test_begin "mp4box-lang"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/subtitle.srt:dur=1 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac:dur=1 -new $TEMP_DIR/file.mp4 2> /dev/null
-
-my_test_with_hash "$MP4BOX -lang all=en $TEMP_DIR/file.mp4 -out $output" "all-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang all=eng $TEMP_DIR/file.mp4 -out $output" "all-3-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang all=en-US $TEMP_DIR/file.mp4 -out $output" "all-2-2-char"
-my_test_with_hash "$MP4BOX -lang all=fr-FR $TEMP_DIR/file.mp4 -out $output" "all-twice"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang en $TEMP_DIR/file.mp4 -out $output" "2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang eng $TEMP_DIR/file.mp4 -out $output" "3-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang en-US $TEMP_DIR/file.mp4 -out $output" "2-2-char"
-my_test_with_hash "$MP4BOX -add $output -new $TEMP_DIR/out2.mp4" "copy"
-rm $TEMP_DIR/out2.mp4 2> /dev/null
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang 1=en $TEMP_DIR/file.mp4 -out $output" "track-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang 1=eng $TEMP_DIR/file.mp4 -out $output" "track-3-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -lang 1=en-US $TEMP_DIR/file.mp4 -out $output" "track-2-2-char"
-my_test_with_hash "$MP4BOX -lang 2=en-US $output" "second-track"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=en -new $output" "param-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=eng -new $output" "param-3-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=en-US -new $output" "param-2-2-char"
-
-rm $output 2> /dev/null
-my_test_with_hash "$MP4BOX -add $TEMP_DIR/file.mp4#1:lang=fr-FR:lang=en-US -new $output" "param-twice"
-
-#### TODO
-## concat of same language, of different language
-## fragmentation/segmentation preserves language
-## dash uses new language
-
-rm $TEMP_DIR/file.mp4 2> /dev/null
-rm $output 2> /dev/null
-rm $TEMP_DIR/out_info.xml 2> /dev/null
-
-test_end
\ No newline at end of file

gpac-0.8.0.tar.gz/tests/scripts/mp4box-rtp.sh Deleted

@@ -1,48 +0,0 @@
-#test MP4Box RTP streaming and MP4 client
-
-#DST="-dst=239.255.0.1"
-DST=""
-
-IFCE="127.0.0.1"
-
-rtp_test ()
-{
-
-test_begin "mp4box-rtp-$1" 
-if [ $test_skip  = 1 ] ; then
-return
-fi
-
-do_test "$MP4BOX -rtp -run-for=0 -sdp=$TEMP_DIR/session.sdp $DST -ifce=$IFCE $2" "streamer-init"
-do_hash_test "$TEMP_DIR/session.sdp" "streamer-init"
-
-#we have a bug in avi dumping of RTP source, just check regular playback for now
-do_test "$MP4CLIENT -run-for 2 -opt Network:BufferLength=1000 -no-save -ifce $IFCE $TEMP_DIR/session.sdp" "play" &
-
-#run for a bit more because of buffering and client startup time
-do_test "$MP4BOX -rtp -run-for=6 -sdp=$TEMP_DIR/session.sdp $DST -ifce=$IFCE $2" "streamer-run"
-
-test_end
-}
-
-mp4file="$TEMP_DIR/test.mp4"
-
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/enst_video.h264:dur=1 -add $MEDIA_DIR/auxiliary_files/enst_audio.aac:dur=1 -new $mp4file 2> /dev/null
-rtp_test "avc-aac" $mp4file
-
-rm $mp4file > /dev/null
-
-
-$MP4BOX -add $MEDIA_DIR/auxiliary_files/count_video.cmp:dur=1 -add $MEDIA_DIR/auxiliary_files/count_english.mp3:dur=1 -new $mp4file 2> /dev/null
-rtp_test "mpeg4p2-mp3" $mp4file
-rm $mp4file > /dev/null
-
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
-return
-fi
-
-$MP4BOX -add $EXTERNAL_MEDIA_DIR/import/bear_video.263:dur=1 -add $EXTERNAL_MEDIA_DIR/import/bear_audio.amr:dur=1 -new $mp4file 2> /dev/null
-rtp_test "h263-amr" $mp4file
-rm $mp4file > /dev/null
-

gpac-0.8.0.tar.gz/tests/scripts/mp4box-subtitle.sh Deleted

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-my_test()
-{
-	do_test "$1 $2" $3
-	do_hash_test $2 $3
-}
-
-test_begin "mp4box-subtitle"
-
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-my_test "$MP4BOX -ttxt $MEDIA_DIR/auxiliary_files/subtitle.srt -out" "$TEMP_DIR/subtitle-srt.ttxt" "srt-to-ttxt-out"
-
-my_test "$MP4BOX -add $MEDIA_DIR/auxiliary_files/subtitle.srt -new" "$TEMP_DIR/subtitle-srt-tx3g.mp4" "srt-add"
-
-my_test "$MP4BOX -add $MEDIA_DIR/auxiliary_files/subtitle.srt:fmt=VTT -new" "$TEMP_DIR/subtitle-srt-wvtt.mp4" "srt-vtt-add"
-
-my_test "$MP4BOX -add $TEMP_DIR/subtitle-srt.ttxt -new" "$TEMP_DIR/subtitle-ttxt-tx3g.mp4" "tx3g-add"
-
-my_test "$MP4BOX -add $MEDIA_DIR/webvtt/spec-example-basic.vtt -new" "$TEMP_DIR/subtitle-vtt-wvtt.mp4" "vtt-add"
-
-my_test "$MP4BOX -add $MEDIA_DIR/ttml/ebu-ttd_sample.ttml -new" "$TEMP_DIR/subtitle-ttml-stpp.mp4" "ttml-add"
-
-my_test "$MP4BOX -ttxt 1 $TEMP_DIR/subtitle-srt-tx3g.mp4 -out" "$TEMP_DIR/subtitle-tx3g.ttxt" "tx3g-dump-track-out"
-
-my_test "$MP4BOX -srt 1 $TEMP_DIR/subtitle-ttxt-tx3g.mp4 -out" "$TEMP_DIR/subtitle-tx3g.srt" "srt-dump-track-out"
-
-my_test "$MP4BOX -srt $TEMP_DIR/subtitle-srt.ttxt -out" "$TEMP_DIR/subtitle-ttxt.srt" "ttxt-to-srt-out"
-
-my_test "$MP4BOX -svg $MEDIA_DIR/auxiliary_files/subtitle.srt -out" "$TEMP_DIR/subtitle-srt.svg" "srt-to-svg-out"
-
-my_test "$MP4BOX -svg $TEMP_DIR/subtitle-srt.ttxt -out" "$TEMP_DIR/subtitle-ttxt.svg" "ttxt-to-svg-out"
-
-my_test "$MP4BOX -raw 1:output=$TEMP_DIR/subtitle-out.vtt" "$TEMP_DIR/subtitle-srt-wvtt.mp4" "vtt-raw-output"
-
-my_test "$MP4BOX -diso $MEDIA_DIR/auxiliary_files/subs.ismt -out" "$TEMP_DIR/out_info.xml" "fragmented-ttml"
-
-test_end

gpac-0.8.0.tar.gz/tests/scripts/mp4box-timescale.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/mp4client-base.sh Deleted

@@ -1,69 +0,0 @@
-if [ $disable_playback != 0 ] ; then
-return
-fi
-
-
-#1- test MP4Client -guid
-single_playback_test "-guid" "mp4client-gui"
-
-#2- test playback of raw media
-single_playback_test "$MEDIA_DIR/auxiliary_files/count_english.mp3" "mp4client-mp3"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-m4vp2"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/enst_video.h264" "mp4client-h264"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/enst_audio.aac" "mp4client-aac"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-jpg"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/logo.png" "mp4client-png"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/subtitle.srt" "mp4client-srt"
-
-single_playback_test "$MEDIA_DIR/auxiliary_files/nefertiti.wrl" "mp4client-vrml"
-
-single_playback_test "$MEDIA_DIR/bifs/bifs-command-animated-osmo4logo.bt" "mp4client-bt-logo"
-
-single_playback_test "$MEDIA_DIR/bifs/bifs-2D-texturing-texturetransform-base.bt" "mp4client-bt-image"
-
-
-if [ $EXTERNAL_MEDIA_AVAILABLE != 0 ] ; then
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/bear_audio.amr" "mp4client-amr"
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/obrother_wideband.amr" "mp4client-amrwb"
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/bear_video.263" "mp4client-h263"
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/rus_utf16.srt" "mp4client-srt-utf16"
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/dead_ogg.ogg" "mp4client-ogg"
-
-single_playback_test "$EXTERNAL_MEDIA_DIR/import/dead_mpg.mpg" "mp4client-mpg"
-
-fi
-
-#3- test SDL out (travis build uses x11)
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-sdl2d-jpg"
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-sdl2d-yuv"
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=disable -no-save $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-sdl2d-compose"
-
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-sdlgl-jpg"
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-sdlgl-yuv"
-
-single_playback_test "-opt Video:DriverName=sdl_out -opt Compositor:OpenGLMode=hybrid -no-save $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-sdlgl-compose"
-
-
-# misc MP4Client tests
-outfile=$TEMP_DIR/bifs-od-language-code.mp4
-$MP4BOX -mp4 $MEDIA_DIR/bifs/bifs-od-language-code.bt -out $outfile 2> /dev/null
-single_playback_test "-opt Systems:Language3CC=fre -opt Systems:Language2CC=fr -no-save $outfile" "mp4client-lang-fr"
-rm $outfile 2> /dev/null
-
-

gpac-0.8.0.tar.gz/tests/scripts/mp4client-dash-config.sh Deleted

@@ -1,36 +0,0 @@
-if [ $disable_playback != 0 ] ; then
-return
-fi
-
-
-URL="http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live-1s/mp4-live-1s-mpd-AV-BS.mpd"
-DEFAULT_OPT="-run-for 10 -opt DASH:AutoSwitchCount=0 -opt DASH:BufferingMode=minBuffer -opt DASH:NetworkAdaptation=buffer -opt DASH:StartRepresentation=minBandwidth -opt DASH:SpeedAdaptation=no -opt DASH:SwitchProbeCount=1 -opt DASH:AgressiveSwitching=no"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT" "mp4client-dash-default"
-
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:AutoSwitchCount=0" "mp4client-dash-autoswitch-0"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:AutoSwitchCount=1" "mp4client-dash-autoswitch-1"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:AutoSwitchCount=5" "mp4client-dash-autoswitch-5"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:BufferingMode=segments" "mp4client-dash-bufferingmode-segments"
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:BufferingMode=minBuffer" "mp4client-dash-bufferingmode-minBuffer"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:BufferingMode=none" "mp4client-dash-bufferingmode-none"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:NetworkAdaptation=disabled" "mp4client-dash-networkadaptation-disabled"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:NetworkAdaptation=bandwidth" "mp4client-dash-networkadaptation-bandwidth"
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:NetworkAdaptation=buffer" "mp4client-dash-networkadaptation-buffer"
-
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:StartRepresentation=minBandwidth" "mp4client-dash-startrepresentation-minbandwidth"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:StartRepresentation=maxBandwidth" "mp4client-dash-startrepresentation-maxbandwidth"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:StartRepresentation=minQuality" "mp4client-dash-startrepresentation-minquality"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:StartRepresentation=maxQuality" "mp4client-dash-startrepresentation-maxquality"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:SpeedAdaptation=yes" "mp4client-dash-speedadaptation-yes"
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:SpeedAdaptation=no" "mp4client-dash-speedadaptation-no"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:SwitchProbeCount=0" "mp4client-dash-switchprobecount-0"
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:SwitchProbeCount=1" "mp4client-dash-switchprobecount-1"
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:SwitchProbeCount=5" "mp4client-dash-switchprobecount-5"
-
-do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:AgressiveSwitching=yes" "mp4client-dash-agressiveswitching-yes"
-#do_test "$MP4CLIENT $URL $DEFAULT_OPT -opt DASH:AgressiveSwitching=no" "mp4client-dash-agressiveswitching-no"

gpac-0.8.0.tar.gz/tests/scripts/mp4client-dash.sh Deleted

@@ -1,36 +0,0 @@
-if [ $disable_playback != 0 ] ; then
-return
-fi
-
-DASH_REF_TPT="http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech"
-
-# MP4Client live profile dash playback
-single_playback_test "$DASH_REF_TPT/mp4-live/mp4-live-mpd-AV-BS.mpd" "mp4client-dash-isobmf-live-bs"
-single_playback_test "$DASH_REF_TPT/mp4-live-mux/mp4-live-mux-mpd-AV-NBS.mpd" "mp4client-dash-isobmf-live-bs-mux"
-
-single_playback_test "$DASH_REF_TPT//mp4-live-periods/mp4-live-periods-mpd.mpd" "mp4client-dash-isobmf-live-periods"
-single_playback_test "$DASH_REF_TPT//mp4-live-periods/mp4-live-periods-reversed-mpd.mpd " "mp4client-dash-isobmf-live-periods-reversed"
-
-# MP4Client onDemand profile dash playback
-single_playback_test "$DASH_REF_TPT/mp4-onDemand/mp4-onDemand-mpd-AV.mpd" "mp4client-dash-isobmf-ondemand"
-
-# MP4Client main profile dash playback
-single_playback_test "$DASH_REF_TPT/mp4-main-single/mp4-main-single-mpd-AV-NBS.mpd" "mp4client-dash-isobmf-main-single"
-single_playback_test "$DASH_REF_TPT/mp4-main-multi/mp4-main-multi-mpd-AV-NBS.mpd" "mp4client-dash-isobmf-main-multi"
-
-#SRD tests
-single_playback_test "$DASH_REF_TPT/SRD/mp4-live/srd-3x3.mpd" "mp4client-dash-isobmf-live-srd"
-
-#todo: add other SRD tests ...
-
-#todo: add dash-if sequences
-
-
-#baseURL tests
-
-single_playback_test "http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/dash/base_url_switch/src_baseurl.mpd" "mp4client-dash-baseurl-http"
-
-if [ $EXTERNAL_MEDIA_AVAILABLE != 0 ] ; then
-single_playback_test "$EXTERNAL_MEDIA_DIR/dash/base_url_switch/src_baseurl.mpd" "mp4client-dash-baseurl-local"
-fi
-

gpac-0.8.0.tar.gz/tests/scripts/mp4client-http.sh Deleted

@@ -1,38 +0,0 @@
-if [ $disable_playback != 0 ] ; then
-return
-fi
-
-#progressive bifs in http
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt"
-
-#progressive bifs in https
-single_playback_test " https://raw.githubusercontent.com/gpac/gpac/master/tests/media/bifs/bifs-2D-background-background2D-image.bt" "mp4client-https-bt"
-
-#progressive jpg (same code for jpg & png)
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/sky.jpg" "mp4client-http-jpg"
-
-#progressive mp3
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/count_french.mp3" "mp4client-http-mp3"
-
-#progressive aac
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/auxiliary_files/enst_audio.aac" "mp4client-http-aac"
-
-#progressive ac3
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/counter/counter_30s_audio.ac3" "mp4client-http-ac3"
-
-#progressive amr
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/resources/media/import/bear_audio.amr" "mp4client-http-amr"
-
-#progressive bifs with commands in http
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.bt" "mp4client-http-bt-commands"
-
-#progressive MP4 with commands in http
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-command-animated-osmo4logo.mp4" "mp4client-http-mp4-commands"
-
-
-#progressive MP4 AV in http
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/uhd/mux_sources/hevcds_720p60_3M.mp4" "mp4client-http-mp4av"
-
-
-#re-run progressive bifs in http to test the cache
-single_playback_test " http://download.tsi.telecom-paristech.fr/gpac/gpac_test_suite/regression_tests/bifs/bifs-2D-background-background2D-bind.bt" "mp4client-http-bt-cached"

gpac-0.8.0.tar.gz/tests/scripts/mp4client-rawout.sh Deleted

@@ -1,40 +0,0 @@
-if [ $disable_playback != 0 ] ; then
-return
-fi
-
-#test all the rendering color mode and texturing tools of the soft rasterizer using raw output module
-
-run_rawout_tests()
-{
- opts="-opt Video:DriverName=raw_out -opt RAWVideo:PixelFormat=$1 -no-save"
- single_playback_test "$opts -run-for 1" "mp4client-rawout-$1-gui"
- single_playback_test "$opts $MEDIA_DIR/auxiliary_files/logo.jpg" "mp4client-rawout-$1-jpg"
- single_playback_test "$opts $MEDIA_DIR/auxiliary_files/count_video.mp4" "mp4client-rawout-$1-yuv"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-background-background2D-image.bt" "mp4client-rawout-$1-back"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-texturing-gradients-transparent.bt" "mp4client-rawout-$1-gradalpha"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-texturing-imagetexture-shapes.bt" "mp4client-rawout-$1-texture"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-painting-material2D.bt" "mp4client-rawout-$1-alpha"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-painting-colortransform-alpha.bt" "mp4client-rawout-$1-cmatalpha"
- single_playback_test "$opts $MEDIA_DIR/bifs/bifs-2D-painting-colortransform-texture.bt" "mp4client-rawout-$1-cmattexture"
-
- single_playback_test "$opts $testfile" "mp4client-rawout-$1-textyuv"
-
-
-}
-
-testfile=$TEMP_DIR/text_yuv.mp4
-$MP4BOX -mp4 "$MEDIA_DIR/bifs/bifs-2D-texturing-movietexture-shapes.bt" -out $testfile 2> /dev/null
-
-#RGB555 tests are commented since we don't build GPAC with RGB555 support
-#run_rawout_tests "555"
-run_rawout_tests "565"
-run_rawout_tests "rgb"
-run_rawout_tests "bgr"
-run_rawout_tests "rgb32"
-run_rawout_tests "bgr32"
-run_rawout_tests "rgba"
-run_rawout_tests "argb"
-
-
-rm $testfile 2> /dev/null
-

gpac-0.8.0.tar.gz/tests/scripts/negctts.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/nhml-subs.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/no-frags-default.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/qt_prores.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/range_extension.sh Deleted

@@ -1,35 +0,0 @@
-#!/bin/sh
-
-temp_file=$TEMP_DIR/test.mp4
-
-rext_test() {
-
-test_begin $1
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-do_test "$MP4BOX -add $2 -new $temp_file" "import"
-do_hash_test "$temp_file" "import"
-
-do_playback_test "$temp_file" "play"
-
-test_end
-}
-
-#avc range extension
-rext_test "avc-420-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_420.h264"
-rext_test "avc-422-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_422.h264"
-rext_test "avc-444-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_444.h264"
-rext_test "avc-420-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_420_10.h264"
-rext_test "avc-422-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_422_10.h264"
-rext_test "avc-444-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-10min-320x180-bipbop_444_10.h264"
-
-#hevc range extension
-rext_test "hevc-420-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_420.hvc"
-rext_test "hevc-422-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_422.hvc"
-rext_test "hevc-444-8bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_444.hvc"
-rext_test "hevc-420-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_420_10.hvc"
-rext_test "hevc-422-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_422_10.hvc"
-rext_test "hevc-444-10bit" "$EXTERNAL_MEDIA_DIR/rext/counter-bifs-1min-640x360-bipbop_444_10.hvc"
-

gpac-0.8.0.tar.gz/tests/scripts/scalable.sh Deleted

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-scalable_test()
-{
-testname=$(basename "$1" | cut -d '.' -f1)
-
-
-test_begin $testname
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
-mp4file="$TEMP_DIR/$testname.mp4"
-splitfile="$TEMP_DIR/$testname-split.mp4"
-mergefile="$TEMP_DIR/$testname-merge.mp4"
-
-$MP4BOX -add $1 -new $mp4file 2> /dev/null
-
-do_test "$MP4BOX -add "$1:svcmode=split" -new $splitfile" "Split"
-do_hash_test $splitfile "split"
-
-do_test "$MP4BOX -add "$splitfile:svcmode=merge" -new $mergefile" "Merge"
-do_hash_test $mergefile "merge"
-
-#compare hashes of source and merge
-do_compare_file_hashes $mp4file $mergefile
-rv=$?
-
-if [ $rv != 0 ] ; then
-result="Hash is not the same between source content and merge content"
-fi
-
-do_playback_test "$splitfile" "play"
-
-do_test "$MP4BOX -dash 1000 $splitfile -out $TEMP_DIR/$testname.mpd" "dash"
-do_playback_test "$TEMP_DIR/$testname.mpd" "dash-playback"
-
-test_end
-
-}
-
-if [ $EXTERNAL_MEDIA_AVAILABLE = 0 ] ; then
- return
-fi
-
-for i in `ls $EXTERNAL_MEDIA_DIR/scalable/* | grep -v "html"` ; do
-
-scalable_test $i
-
-done
-

gpac-0.8.0.tar.gz/tests/scripts/smooth.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/swf.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/test_prl.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/vtt-all.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/x3d.sh Deleted

gpac-0.8.0.tar.gz/tests/scripts/xmlin.sh Deleted

@@ -1,101 +0,0 @@
-
-nhml_test  ()
-{
- name=$(basename $1)
- name=${name%.*}
-
- test_begin "xmlin-$name"
- if [ $test_skip  = 1 ] ; then
-  return
- fi
-
- mp4file=$TEMP_DIR/$name.mp4
- src="$TEMP_DIR/$name""_track1.nhml"
- dst="$TEMP_DIR/$name""_track1.mp4"
-
- do_test "$MP4BOX -add $1.nhml -new $mp4file" "import"
- do_hash_test $mp4file "import"
-
- do_test "$MP4BOX -info $mp4file" "info"
-
- rm -f $TEMP_DIR/test.xml
- do_test "$MP4BOX -raw 1 $mp4file -out $TEMP_DIR/test.xml " "export-track"
- do_hash_test $TEMP_DIR/test.xml "export-track"
- rm -f $TEMP_DIR/test.xml
-
- do_test "$MP4BOX -raws 1 $mp4file" "export-samples"
-
- do_test "$MP4BOX -nhml 1 $mp4file" "export-nhml"
- do_hash_test $src "export-nhml"
-
- do_test "$MP4BOX -add $src -new $dst" "nhml-reimport"
- do_hash_test $dst "nhml-reimport"
-
- test_end
-}
-
-
-nhml_test "$MEDIA_DIR/xmlin4/meta-metx"
-
-nhml_test "$MEDIA_DIR/xmlin4/meta-mett"
-
-nhml_test "$MEDIA_DIR/xmlin4/meta-mett-no-mime"
-
-nhml_test "$MEDIA_DIR/xmlin4/meta-mett-xml"
-
-nhml_test "$MEDIA_DIR/xmlin4/meta-mett-xml-header"
-
-nhml_test "$MEDIA_DIR/xmlin4/subt-stpp"
-
-nhml_test "$MEDIA_DIR/xmlin4/subt-sbtt"
-
-nhml_test "$MEDIA_DIR/xmlin4/subt-sbtt-no-mime"
-
-nhml_test "$MEDIA_DIR/xmlin4/text-stxt"
-
-nhml_test "$MEDIA_DIR/xmlin4/text-stxt-no-mime"
-
-nhml_test "$MEDIA_DIR/xmlin4/text-stxt-header"
-
-
-#Testing 'metx' import when namespace is not given, shoud fail
-test_begin "xmlin-meta-metx-no-namespace"
- do_test "$MP4BOX -add $MEDIA_DIR/xmlin4/meta-metx-no-namespace.nhml -new $TEMP_DIR/meta-metx-no-namespace.mp4" "import"
-test_end
-
-#Testing 'stpp' import when namespace is not provided, should fail
-test_begin "xmlin-subt-stpp-no-namespace"
- do_test "$MP4BOX -add $MEDIA_DIR/xmlin4/subt-stpp-no-namespace.nhml -new $TEMP_DIR/subt-stpp-no-namespace.mp4" "import"
-test_end
-
-# Testing SWF conversion as SVG and import as 'stxt' stream
-test_begin "xmlin-swf-stxt"
-
-do_test "$MP4BOX -add $MEDIA_DIR/xmlin4/anim.swf:fmt=svg -new $TEMP_DIR/text-stxt-svg.mp4" "import"
-do_hash_test $TEMP_DIR/text-stxt-svg.mp4 "import"
-
-rm -f $TEMP_DIR/test.svg
-do_test "$MP4BOX -raw 1 $TEMP_DIR/text-stxt-svg.mp4 -out $TEMP_DIR/test.svg" "export-track"
-do_hash_test $TEMP_DIR/test.svg "export-track"
-rm -f $TEMP_DIR/test.svg
-
-do_test "$MP4BOX -raws 1 $TEMP_DIR/text-stxt-svg.mp4" "export-samples"
-
-test_end
-
-# Testing TTML import as 'stpp' stream
-test_begin "xmlin-ttml-stpp"
-
-do_test "$MP4BOX -add $MEDIA_DIR/xmlin4/ebu-ttd_sample.ttml -new $TEMP_DIR/subt-stpp-ttml.mp4" "import"
-do_hash_test $TEMP_DIR/subt-stpp-ttml.mp4 "import"
-
-rm -f $TEMP_DIR/test.ttml
-do_test "$MP4BOX -raw 1 $TEMP_DIR/subt-stpp-ttml.mp4 -out $TEMP_DIR/test.ttml" "export-track"
-do_hash_test $TEMP_DIR/test.ttml "export-track"
-rm -f $TEMP_DIR/test.ttml
-
-do_test "$MP4BOX -raws 1 $TEMP_DIR/subt-stpp-ttml.mp4" "export-samples"
-do_hash_test $TEMP_DIR/subt-stpp-ttml_track1_003.xml "export-sample"
-
-test_end
-

gpac-0.8.0.tar.gz/tests/stylesheet.xsl Deleted

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template match="/">
-  <html><body>
-    <h3>Version: <xsl:value-of select="GPACTestSuite/@version"/> Platform: <xsl:value-of select="GPACTestSuite/@platform"/> Start: <xsl:value-of select="GPACTestSuite/@start_date"/> End: <xsl:value-of select="GPACTestSuite/@end_date"/></h3>
-    <h3>Test: <xsl:value-of select="GPACTestSuite/TestSuiteResults/@NumTests"/>   Passed: <xsl:value-of select="GPACTestSuite/TestSuiteResults/@TestsPassed"/>   Failed: <xsl:value-of select="GPACTestSuite/TestSuiteResults/@TestsFailed"/> Leaked: <xsl:value-of select="GPACTestSuite/TestSuiteResults/@TestsLeaked"/></h3>
-
-    <table border="1">
-      <tr bgcolor="#80c0c0">
-        <th>Name</th>
-        <th>Execution Status</th>
-        <th>Execution Logs</th>
-      </tr>
-      <xsl:for-each select="GPACTestSuite/test">
-      <tr>
-        <xsl:choose>
-          <xsl:when test="@result='OK'">
-			<td><font color="green"><xsl:value-of select="@name"/></font></td>
-            <td><a href="logs/{@name}-passed.xml"> <font color="green"><xsl:value-of select="@result"/></font></a></td>
-          </xsl:when>
-          <xsl:when test="@result='play:MemLeak '">
-			<td><font color="orange"><xsl:value-of select="@name"/></font></td>
-            <td><font color="orange"><xsl:value-of select="@result"/></font></td>
-          </xsl:when>
-          <xsl:otherwise>
-			<td><font color="red"><xsl:value-of select="@name"/></font></td>
-            <td><font color="red"><xsl:value-of select="@result"/></font></td>
-          </xsl:otherwise>
-        </xsl:choose>
-        <td><a href="logs/{@name}-logs.txt"> View detail</a></td>
-      </tr>
-      </xsl:for-each>
-    </table>
-  </body></html>
-</xsl:template>
-
-</xsl:stylesheet>

gpac-0.8.0.tar.gz/.gitignore -> gpac-1.0.0.tar.gz/.gitignore Changed

gpac-1.0.0.tar.gz/.gitmodules Added

gpac-0.8.0.tar.gz/.travis.yml -> gpac-1.0.0.tar.gz/.travis.yml Changed

@@ -1,19 +1,30 @@
+#changes for GPAC filters (0.9+) for travis CI: GPAC hosts its own buildbot for building on various platforms, running tests, coverage and safety checks
+#TravisCI is only used for checking sanity of PRs. Consequently:
+#- OSX and mingw no longer compiled
+#- linux only compiled for
+#  - mp4box static
+#  - release mode with mem tracking and gcov
+
 language: c
 compiler: gcc
 os:
   - linux
-  - osx
+#  - osx
+dist: bionic
+services:
+  - xvfb
+
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y update -qq ; fi
 install:
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install build-essential fakeroot dpkg-dev devscripts ccache debhelper pkg-config g++ mesa-utils ; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng12-dev libopenjpeg-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev linux-sound-base libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl1.2-dev dvb-apps libavcodec-extra libavutil-dev libmozjs185-dev ; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev ; fi
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq -y install lcov time; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install build-essential fakeroot dpkg-dev devscripts ccache debhelper pkg-config g++ mesa-utils lcov ; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y zlib1g-dev libfreetype6-dev libjpeg62-dev libpng-dev libmad0-dev libfaad-dev libogg-dev libvorbis-dev libtheora-dev liba52-0.7.4-dev libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libavdevice-dev libxv-dev x11proto-video-dev libgl1-mesa-dev x11proto-gl-dev libxvidcore-dev libssl-dev libjack-dev libasound2-dev libpulse-dev libsdl2-dev dvb-apps ; fi
+  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq -y install time; fi
+#  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -y install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-x86-64-dev ; fi
 #  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo chown -R "$USER":admin /usr/local; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
-  - 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
+#  - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
+#  - 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="--enable-debug --static-modules" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
@@ -22,23 +33,23 @@
   include:
     - os: linux
       before_script:
-        - "export DISPLAY=:99.0"
-        - "sh -e /etc/init.d/xvfb start"
-        - sleep 3 # give xvfb some time to start
-        - glxinfo # check glx status
+        #git submodule update is called by travis, just checkout filter branch
+        - "git -C ./testsuite checkout filters"
+        - xvfb-run -e /dev/stdout --auto-servernum --server-num=1 glxinfo # check glx status
       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=""
-    - 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=""
-    - os: linux
-      env: GPAC_CONFIGURE_OPTIONS="--prefix=build/all --enable-debug --disable-all" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
-    - os: linux
-      env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse --disable-atsc" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
-    - os: osx
-      env: GPAC_CONFIGURE_OPTIONS="--enable-mem-track" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="sudo make install" DOTRAVIS="" 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=""
+#    - 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=""
+#    - os: linux
+#      env: GPAC_CONFIGURE_OPTIONS="--prefix=build/all --enable-debug --disable-all" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="make install" DOTRAVIS=""
+#    - os: linux
+#      env: GPAC_CONFIGURE_OPTIONS="--enable-debug --use-js=no --use-mad=no --use-xvid=no --use-ogg=no --use-vorbis=no --use-theora=no --use-openjpeg=no --disable-streaming --disable-isoff-frag --disable-isoff-hint --disable-isoff-write --disable-loader-xmt --disable-loader-bt --disable-loader-isoff --disable-scene-encode --disable-mcrypt --disable-od-dump --disable-scene-dump --disable-scene-stats --disable-swf --disable-export --disable-import --disable-m2ps --disable-ogg -disable-avi --disable-qtvr --disable-seng --disable-smgr --disable-x3d --disable-3d --disable-ssl --disable-jack --disable-pulse --use-a52=no --disable-odf --disable-isoff --disable-m2ts-mux --disable-dvbx --disable-saf --disable-vobsub --disable-ttxt --disable-od-parse --disable-atsc" GPAC_CONFIGURE_ECFLAGS="" DOINSTALL="" DOTRAVIS=""
+#    - os: osx
+#      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 && $DOTRAVIS
+  - ./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

gpac-0.8.0.tar.gz/Changelog -> gpac-1.0.0.tar.gz/Changelog Changed

@@ -1,3 +1,168 @@
+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,
+    * moving DASH/HLS segmenter to a filter
+    * moving MP4Client compositor and most of the GF_Terminal internals to a filter
+    * addition of a new application gpac, whose only purpose is to create and run filter chains
+    * removal of MP42TS and DashCast applications since these functionalities are provided by gpac
+    * deprecation of some features (widget management, MSE draft implementation for SVG media, UPnP, TEMI player support).
+- Profile system allowing to override through a static file default options of all filters and libgpac core
+- Alias system for gpac app to simplify your command lines
+- Enhanced DASHer:
+    * Support for HLS and dual HLS / DASH generation
+    * Support for any input
+    * True low-latency mode for DASH
+    * Support for multiple periods
+    * Support for other segment formats (raw, mkv, webm currently tested)
+- Input and outputs
+    * Generic pipe, TCP, UDP, and Unix Domain socket input and output
+    * RTSP server output
+    * 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
+- Compositor is a standalone filter (SVG/BIFS/VRML graphics in a filter chain)
+- Image encoding support through libjpg and libpng
+- Full FFMPEG support:
+    * Encoding/decoding through FFMPEG libavcodec
+    * Multiplexing/demultiplexing through FFMPEG libavformat
+    * Device grabbers through FFMPEG libavdevice
+    * Raw audio and video filters through FFMPEG libavfilter
+- Support for QuickJS (ES2002) and bindings for:
+    * Complete filter API
+    * GPAC software rasterizer (EVG)
+    * WebGL 1.0 Core
+    * XmlHttpRequest and uDOM APIs
+    * Storage
+- Inspect and analyze filter
+- MPEG-2 TS splitter
+- Video cropper filter with zero-copy mode
+- Video flip filter
+- Source concatenator filter
+- Simple audio and video output filters
+- Experimental audio and video rewinder filter
+- Encryption
+    * On-the-fly encryption and decryption, now available as filters
+    * Segment-based encryption and decryption
+- ISOBMFF 
+    * box customization
+    * Better QT support, prores parsing and dumping
+    * Support for raw media (QT style or ISOBMFF for audio)
+    * Simplify HEIF batch conversion through item to track mapping
+    * Reading from pipes (fragmented or progressive files)
+    * Writing to packets rather than files
+    * Fast interleaved file creation mode with less storage requirements
+- FileIO wrapper for cases where files are not stored in a file system known by GPAC
+- Testing and Documentation
+    * Live doc generation (man and wiki)
+    * Improved coverage
+    * Split test suite as dedicated repo
+    * Moved all resource to https://wiki.gpac.io
+    * Started howto pages on wiki
+    * Many bug fixes
+
+27/06/2019: GPAC 0.8.0
+ - General
+    * Many security fixes (static compile and fuzzing through AFL, always ongoing).
+    * Many bugs fixes
+    * Added :ncl option in log levels to disable color logs
+    * More tests and coverage
+ - File Formats
+    * Better support of QTFF / ProRes files
+    * Support for AV1
+       - import and export
+       - source formats: OBUs (Section 5), IVF and AnnexB
+       - AV1 in HEIF
+    * Support for color (nclc, nclx and ICC profiles) in HEIF and ISOBMFF
+    * Support for HDR (mdcv, clli) info in HEIF and ISOBMFF
+    * Support for alpha in HEIF
+    * Support for enforcing pasp presence even for 1:1 ratios
+    * HEVC temporal sublayer split in MP4Box
+    * Allow meta storage before mdat for meta-only files (heif and co)
+    * Added option to keep AU delimiter in isobmff samples
+    * Support for opus import
+    * Support for pixi and ccst in HEIF
+    * DolbyVision 'dvcC' and partial 'dvhe' boxes for HDR
+    * Support for VP9 import and playback
+    * Sample dependency in avc and hevc importers, and track thinner for non-refs images
+    * Support for audio_roll signaling
+    * New audio import mode to control AudioSampleEntry creation (v0, v1 ISOBMFF, v1 QTFF)
+    * xHE-AAC import with detection of sync samples
+    * Added support for MPEG-H 3D audio boxes (no import yet)
+    * Handle Vobsub empty SPU packets
+    * Added auxv and pict support
+ - Common Encryption
+    * Fully compliant CENC supporting cenc, cens, cbc1 and cbcs
+    * CENC for AV1
+    * Improved DASH+CENC support, pssh in MPD
+    * ForceClear mode for CENC to skip encryption without sample groups
+    * Made senc in movie fragments always stored before truns
+    * Added default values handling for cbcs and possibility to set protection system per track
+    * Compatibility with OpenSSL 1.1.x
+ - Streaming and Adaptive Streaming
+    * Support for ATSC3.0 both US and Korean versions !
+    * Support for for live splices (xlink period insertions) in DASH client
+    * Automatic period continuity in DASH when no codec change between periods
+    * Added DASH cue-base segmentation (XML based) and -dsap option to generate cue files from source
+    * Support for BBA-0 and BOLA implementations
+    * Write fragment defaults in trex even when not using them
+    * Support for simple ssix for keyframe data byterange at the start of a segment
+    * Moved segment template at AdaptationSet level if only one representation
+    * Changed default bsmode in dasher if single input file
+    * Added init-seg-ext option
+    * Added -mvex-after-traks option to MP4Box when dashing for CMAF
+    * Added segmentation option to insert a tfdt per traf
+    * Added -closest mode for DASH segmentation
+    * Added -bound option to use audio segmenting method for video
+    * Renamed -dash-run-for to -run-for
+    * Added '=' in dash templates
+    * Improved bandwith estimation when using HTTP 1.1 chunk transfer
+    * Add option to force moof base offsets
+ - MP4Box
+    * Added -catpl to concatenate from playlist in MP4Box
+    * Added options to set movie timescale at import and dash time
+    * Added mpd rip option and top-level box compressor in MP4Box
+    * Made -dts skip timing check and added -dtsc for that
+    * Made force-cat option more agressive
+    * Support for MovieFragmentRandomAccess using -mfra option
+    * Added -dtsx to dump timing without offset
+    * Added -dnalc opt for nal CRC dump
+    * Added chunk extraction up to time until end
+    * ISOBMFF single track import now removes references by default
+ - Decoders
+    * Updated ffmpeg to 4.0.2
+    * Moved to openHEVC 3.0 API
+    * Added nvdec support (windows, linux) with reuse of decoder context for tiled VR
+    * Added HEVC support to mediacodec on android
+    * AV1 playback through ffmpeg
+    * Opus playback through ffmpeg
+ - 3D, VR and 360
+    * Added vrhud for multiviewpoint 360
+    * Added forced visibility mode of tiles in VR
+    * Added tile visibility debug mode
+    * Added forced stereo output for openhevc
+    * Disable face nav if mouse grabbed
+    * Added simple face tracking vr navigation based on udp commands
+    * Added PSVR support
+    * Added mouse move emulation at window border to force sphere rotation when inactive
+    * Changed tile visibility algo to sample points in mesh
+ - Players (Mobile and Desktop)
+    * Added about extension
+    * Added multiple audio objects in dynamic scene
+    * Added addon splicing of main content
+    * Added mosaic://v1:.:vN url support
+    * Added gaze simulation through mouse and gaze-sphere visibility test
+ - Subtitles
+    * Allow * as argument of -srt|ttxt to dump all possible tracks (#925)
+    * Improved support for WebVTT import
+    * Improved support for WebVTT DASHing/fragmentation
+ - Misc
+    * OSX install now done through PKG and modify PATH env in/etc/paths
+    * Added initial PMT version and disc marker to TS muxer
+    * 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
  - 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)
@@ -374,7 +539,7 @@
 	- added support for nero chapters in MP4 ('chpl' box), in MP4Box (-chap file.chp) and selection in players (chapters mapped to MPEG-4 SegmentDescriptors).
 		note regarding chp files: not sure about file syntax, currently support for (one chapter entry per line):
 			 ZoomPlayer syntax: AddChapter (-fps for import framerate selection), AddChapterBySecond and AddChapterByTime
-			 Regular time code  la SRT: HH:MM:SS[:ms or .ms] [Chapter Name]
+			 Regular time code â¦ la SRT: HH:MM:SS[:ms or .ms] [Chapter Name]
 			 SMPTE time code: HH:MM:SS;fr/fps [Chapter Name] - if fps is omitted, use '-fps' if specified or 25 fps default.
 			 
 	- fixed avi packed bitstream flag removal bug with beta versions of DivX.

gpac-0.8.0.tar.gz/Makefile -> gpac-1.0.0.tar.gz/Makefile Changed

@@ -3,6 +3,10 @@
 #
 include config.mak
 
+ifndef SRC_PATH
+override SRC_PATH = .
+endif
+
 vpath %.c $(SRC_PATH)
 
 all:	version
@@ -12,6 +16,11 @@
 	$(MAKE) -C modules all
 endif
 
+
+config.mak:
+	./configure
+
+
 GITREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
 TAG:=$(shell git --git-dir=$(SRC_PATH)/.git describe --tags --abbrev=0 2> /dev/null)
 VERSION:=$(shell echo `git --git-dir=$(SRC_PATH)/.git describe --tags --long  || echo "UNKNOWN"` | sed "s/^$(TAG)-//")
@@ -56,18 +65,21 @@
 	$(MAKE) -C src distclean
 	$(MAKE) -C applications distclean
 	$(MAKE) -C modules distclean
-	rm -f config.mak config.h
+	rm -f config.mak config.h config.log
 	@find . -type f -name '*.gcno*' -delete
 	@find . -type f -name '*.gcda*' -delete
 	@rm -f coverage.info 2> /dev/null
 	@rm -f bin/gcc/gm_*$(DYN_LIB_SUFFIX) 2> /dev/null
 	@rm -f bin/gcc/gf_*$(DYN_LIB_SUFFIX) 2> /dev/null
 
-docs:
-	@cd $(SRC_PATH)/doc && doxygen
+doc:
+	@cd $(SRC_PATH)/share/doc && doxygen
+
+man:
+	@cd $(SRC_PATH)/share/doc/man && MP4Box -genman && MP4Client -genman && gpac -genman
 
 test_suite:
-	@cd $(SRC_PATH)/tests && ./make_tests.sh
+	@cd $(SRC_PATH)/testsuite && ./make_tests.sh
 
 lcov_clean:
 	lcov --directory . --zerocounters
@@ -76,7 +88,7 @@
 	@echo "Generating lcov info in coverage.info"
 	@rm -f ./gpac-conf-* > /dev/null
 	@lcov -q -capture --directory . --output-file all.info
-	@lcov --remove all.info /usr/* /usr/include/* /usr/local/include/* /usr/include/libkern/i386/* /usr/include/sys/_types/* /opt/* /opt/local/include/* /opt/local/include/mozjs185/* --output coverage.info
+	@lcov --remove all.info '*/usr/*' '*/opt/*' '*/include/*' '*/validator/*' '*/quickjs/*' '*/jsmods/WebGLRenderingContextBase*' '*/utils/Remotery*' '*/utils/gzio*'  --output coverage.info
 	@rm all.info
 	@echo "Purging lcov info"
 	@cd src ; for dir in * ; do cd .. ; sed -i -- "s/$$dir\/$$dir\//$$dir\//g" coverage.info; cd src; done ; cd ..
@@ -87,12 +99,12 @@
 	@genhtml -q -o coverage coverage.info
 
 travis_tests:
-	@echo "Running tests"
-	@cd $(SRC_PATH)/tests && ./make_tests.sh -warn -sync-before
+	@echo "Running tests in $(SRC_PATH)/testsuite"
+	@cd $(SRC_PATH)/testsuite && ./make_tests.sh -precommit -p=0
 
 travis_deploy:
 	@echo "Deploying results"
-	@cd $(SRC_PATH)/tests && ./ghp_deploy.sh
+	@cd $(SRC_PATH)/testsuite && ./ghp_deploy.sh
 
 travis: travis_tests lcov travis_deploy
 
@@ -102,26 +114,11 @@
 	$(INSTALL) -d "$(DESTDIR)$(prefix)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(libdir)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
+	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/gpac$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin"
 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
-ifneq ($(MP4BOX_STATIC), yes)
-	if [ -f bin/gcc/MP42TS$(EXE_SUFFIX) ] ; then \
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP42TS$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
-	fi
-ifneq ($(CONFIG_WIN32), yes)
-ifneq ($(CONFIG_FFMPEG), no)
-ifneq ($(DISABLE_CORE_TOOLS), yes)
-ifneq ($(DISABLE_AV_PARSERS), yes)
-	if [ -f bin/gcc/DashCast$(EXE_SUFFIX) ] ; then \
-	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast$(EXE_SUFFIX) "$(DESTDIR)$(prefix)/bin" ; \
-	fi
-endif
-endif
-endif
-endif
-endif
 endif
 ifneq ($(MP4BOX_STATIC), yes)
 ifeq ($(DISABLE_PLAYER), no)
@@ -135,39 +132,64 @@
 	fi
 	$(INSTALL) -d "$(DESTDIR)$(moddir)"
 ifneq ($(MP4BOX_STATIC),yes)
-	$(INSTALL) bin/gcc/*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)"
-	rm -f $(DESTDIR)$(moddir)/libgpac$(DYN_LIB_SUFFIX)
-	rm -f $(DESTDIR)$(moddir)/nposmozilla$(DYN_LIB_SUFFIX)
+	$(INSTALL) bin/gcc/gm_*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)" || true
+	$(INSTALL) bin/gcc/gf_*$(DYN_LIB_SUFFIX) "$(DESTDIR)$(moddir)" || true
+	#rm -f $(DESTDIR)$(moddir)/libgpac$(DYN_LIB_SUFFIX)
+	#rm -f $(DESTDIR)$(moddir)/nposmozilla$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_OPENHEVC),yes)
+	cp -a bin/gcc/libopenhevc* $(DESTDIR)$(prefix)/$(libdir)/ || true
+endif
 	$(MAKE) installdylib
 endif
 	$(INSTALL) -d "$(DESTDIR)$(mandir)"
 	$(INSTALL) -d "$(DESTDIR)$(mandir)/man1"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/doc/man/mp4box.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/doc/man/mp4client.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/doc/man/gpac.1 $(DESTDIR)$(mandir)/man1/
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/doc/man/gpac-filters.1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/doc/gpac.mp4 $(DESTDIR)$(prefix)/share/gpac/
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/res"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.bt "$(DESTDIR)$(prefix)/share/gpac/gui/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gui.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/gwlib.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/mpegu-core.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
-	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/gui/webvtt-renderer.js "$(DESTDIR)$(prefix)/share/gpac/gui/"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/icons"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/gui/extensions"
-	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders/"
-
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/shaders"
+	$(INSTALL) -d "$(DESTDIR)$(prefix)/share/gpac/scripts"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/include"
+	$(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) $(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/applications"
+
+ifeq ($(IS_DEB_MAKE),undefined)
+	ln -sf $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)/usr/share/pixmaps/gpac.png
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)/usr/share/applications/"
+else
+	dh_link $(DESTDIR)$(prefix)/share/gpac/res/gpac.png $(DESTDIR)$(prefix)/share/pixmaps/gpac.png
+	$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/share/gpac.desktop "$(DESTDIR)$(prefix)/share/applications/"
+endif
+
+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/gui/mpegu-core.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)/gui/icons/* "$(DESTDIR)$(prefix)/share/gpac/gui/icons/"
-	cp -R $(SRC_PATH)/gui/extensions/* "$(DESTDIR)$(prefix)/share/gpac/gui/extensions/"
-	cp $(SRC_PATH)/shaders/* "$(DESTDIR)$(prefix)/share/gpac/shaders/"
+	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)/include/* "$(DESTDIR)$(prefix)/include/"
 else
-	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/icons/* $(DESTDIR)$(prefix)/share/gpac/gui/icons/
-	cp -R --no-preserve=mode,ownership,timestamp $(SRC_PATH)/gui/extensions/* $(DESTDIR)$(prefix)/share/gpac/gui/extensions/
-	cp --no-preserve=mode,ownership,timestamp $(SRC_PATH)/shaders/* $(DESTDIR)$(prefix)/share/gpac/shaders/
+	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)/include/* $(DESTDIR)$(prefix)/include/
 endif
 
@@ -175,23 +197,14 @@
 	$(INSTALL) -d "$(DESTDIR)$(prefix)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(libdir)"
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
+	ln -sf $(BUILD_PATH)/bin/gcc/gpac$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/gpac$(EXE_SUFFIX)
 ifeq ($(DISABLE_ISOFF), no)
 	ln -sf $(BUILD_PATH)/bin/gcc/MP4Box$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Box$(EXE_SUFFIX)
-	ln -sf $(BUILD_PATH)/bin/gcc/MP42TS$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP42TS$(EXE_SUFFIX)
 endif
 ifneq ($(MP4BOX_STATIC),yes)
 ifeq ($(DISABLE_PLAYER), no)
 	ln -sf $(BUILD_PATH)/bin/gcc/MP4Client$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/MP4Client$(EXE_SUFFIX)
 endif
-ifneq ($(CONFIG_WIN32), yes)
-ifneq ($(CONFIG_FFMPEG), no)
-ifneq ($(DISABLE_CORE_TOOLS), yes)
-ifneq ($(DISABLE_AV_PARSERS), yes)
-	ln -sf $(BUILD_PATH)/bin/gcc/DashCast$(EXE_SUFFIX) $(DESTDIR)$(prefix)/bin/DashCast$(EXE_SUFFIX)
-endif
-endif
-endif
-endif
 endif
 ifeq ($(CONFIG_DARWIN),yes)
 	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(VERSION_SONAME)$(DYN_LIB_SUFFIX)
@@ -201,9 +214,15 @@
 	ln -s $(BUILD_PATH)/bin/gcc/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME)
 	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so.$(VERSION_MAJOR)
 	ln -sf $(DESTDIR)$(prefix)/$(libdir)/libgpac$(DYN_LIB_SUFFIX).$(VERSION_SONAME) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
+
+	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 $(SRC_PATH)/share/gpac.desktop $(DESTDIR)/usr/share/applications/
+
 ifeq ($(DESTDIR)$(prefix),$(prefix))
 	ldconfig || true
 endif
+
 endif
 
 uninstall:
@@ -216,12 +235,13 @@
 	rm -rf $(DESTDIR)$(prefix)/$(libdir)/pkgconfig/gpac.pc
 	rm -rf $(DESTDIR)$(prefix)/bin/MP4Box
 	rm -rf $(DESTDIR)$(prefix)/bin/MP4Client
-	rm -rf $(DESTDIR)$(prefix)/bin/MP42TS
-	rm -rf $(DESTDIR)$(prefix)/bin/DashCast
 	rm -rf $(DESTDIR)$(mandir)/man1/mp4box.1
 	rm -rf $(DESTDIR)$(mandir)/man1/mp4client.1
 	rm -rf $(DESTDIR)$(mandir)/man1/gpac.1
+	rm -rf $(DESTDIR)$(mandir)/man1/gpac-filters.1
 	rm -rf $(DESTDIR)$(prefix)/share/gpac
+	rm -rf $(DESTDIR)/usr/share/pixmaps/gpac.png
+	rm -rf $(DESTDIR)/usr/share/applications/gpac.desktop
 	rm -rf $(DESTDIR)$(prefix)/include/gpac
 
 installdylib:
@@ -275,11 +295,11 @@
 
 ifeq ($(CONFIG_DARWIN),yes)
 dmg:
-	@if [ ! -z "$(shell git diff FETCH_HEAD)" ]; then \
-		echo "Local revision and remote revision are not congruent; you may have local commit."; \
-		echo "Please consider pushing your commit before generating an installer"; \
-		exit 1; \
-	fi
+#	@if [ ! -z "$(shell git diff FETCH_HEAD)" ]; then \
+#		echo "Local revision and remote revision are not congruent; you may have local commit."; \
+#		echo "Please consider pushing your commit before generating an installer"; \
+#		exit 1; \
+#	fi
 	rm "bin/gcc/MP4Client"
 	$(MAKE) -C applications/mp4client
 	./mkdmg.sh $(arch)
@@ -289,7 +309,8 @@
 deb:
 	git checkout --	debian/changelog
 	fakeroot debian/rules clean
-	sed -i "s/-DEV/-DEV-rev$(VERSION)-$(BRANCH)/" debian/changelog
+	# add version to changelog for final filename
+	sed -i -r "s/^(\w+) $([0-9\.]+)(-[A-Z]+)?$/\1 (\2\3-rev$(VERSION)-$(BRANCH))/" debian/changelog
 	fakeroot debian/rules configure
 	fakeroot debian/rules binary
 	rm -rf debian/
@@ -323,9 +344,10 @@
 	@echo
 	@echo "tests: run all tests. For more info, check gpac/regression_tests/test_suite_make.sh -h"
 	@echo
+	@echo "doc:  build libgpac documentation in gpac/doc"
+	@echo "man:  build gpac man files in gpac/doc/man (must have latest build binaries installed)"
+	@echo
 	@echo "lcov: generate lcov files"
 	@echo "lcov_clean: clean all lcov/gcov files"
-	@echo
-	@echo "docs:  build libgpac documentation in gpac/doc"
 
 -include .depend

gpac-0.8.0.tar.gz/README.md -> gpac-1.0.0.tar.gz/README.md Changed

@@ -17,24 +17,113 @@
 
 [![Build Status](https://tests.gpac.io/testres/badge/build/android)](https://buildbot.gpac.io/#/grid?branch=master)
 
-[![Coverage](https://tests.gpac.io/testres/badge/cov/linux64)](https://tests.gpac.io/)
+[![Coverage](https://tests.gpac.io/testres/badge/cov/linux64?branch=master)](https://tests.gpac.io/testres/)
+[![Coverage](https://tests.gpac.io/testres/badge/covfn/linux64?branch=master)](https://tests.gpac.io/testres/)
 
 ![License](https://img.shields.io/badge/license-LGPL-blue.svg)
 
-README for GPAC version 0.8.0
+# GPAC Introduction
+Current version: 1.0.0
 
-GPAC is a multimedia framework oriented towards rich media and distributed under the LGPL license (see COPYING).
+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 supports many multimedia formats, from simple audiovisual containers (avi, mov, mpg) to complex
-presentation formats (MPEG-4 Systems, SVG Tiny 1.2, VRML/X3D) and 360 videos. GPAC supports presentation scripting for MPEG4/VRML/X3D through mozilla SpiderMonkey javascript engine.
+For more information, visit [GPAC website](http://gpac.io)
 
-GPAC currently supports local playback, http progressive download, Adaptive HTTP Streaming (MPEG-DASH, HLS), RTP/RTSP streaming over UDP (unicast or multicast) or TCP and TS demuxing (from file, IP or DVB4Linux).
+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).
 
-GPAC also features MP4Box, a multimedia swiss-army knife for the prompt, and MP42TS, a fast TS multiplexer from MP4 and RTP sources.
+# Features
 
-For compilation and installation instruction, check INSTALLME file
+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, ...
+- 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, ...
+- Streaming: MPEG-2 Transport Stream, RTP, RTSP, HTTP, Apple HLS, MPEG-DASH, ATSC 3.0 ROUTE, ...
+- Supported IOs: local files, pipes, UDP/TCP, HTTP(S), custom IO
+- Presentation formats: MPEG-4 BIFS, SVG Tiny 1.2, VRML/X3D
+- JS scripting through QuickJS for both SVG/BIFS/VRML and extending GPAC framework tools
+- 3D support (360 videos, WebGL JS filters…)
+- Inputs: microphone, camera, desktop grabbing
+- Highly configurable media processing pipeline
 
-For GPAC configuration instruction, check gpac/doc/configuration.html or gpac/doc/man/gpac.1 (man gpac when installed)
+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).
 
-For more information, visit the GPAC website:
-	http://gpac.io
+
+# 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).
+
+
+## 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.
+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 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).
+
+
+
+# Getting started
+## Download
+Stable and nightly builds installers for Windows, Linux, OSX, Android, iOS are available on [gpac.io](https://gpac.wp.imt.fr/downloads/).
+
+If you want to compile GPAC yourself, please follow the instructions in the [build section](https://wiki.gpac.io/Build-Introduction) of our wiki.
+
+## 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).
+
+
+## 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`.
+
+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 
+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).
+
+# 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)
+
+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.
+
+
+# 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).
+
+## 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
+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

gpac-0.8.0.tar.gz/applications/Makefile -> gpac-1.0.0.tar.gz/applications/Makefile Changed

gpac-1.0.0.tar.gz/applications/deprecated Added

gpac-1.0.0.tar.gz/applications/deprecated/mp42ts Added

gpac-1.0.0.tar.gz/applications/deprecated/mp42ts/Makefile Added

@@ -0,0 +1,70 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/applications/mp42ts
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LINKFLAGS=-L../../bin/gcc
+ifeq ($(CONFIG_WIN32),yes)
+EXE=.exe
+PROG=MP42TS$(EXE)
+else
+EXT=
+PROG=MP42TS
+endif
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+
+#FIXME we have to disable AAC+bifs support in mp42ts since it reuses things from aac_in already in libgpac ...
+ifeq ($(STATIC_MODULES), yes)
+CFLAGS+=-DGPAC_DISABLE_PLAYER
+endif
+
+LINKFLAGS+=-lgpac_static
+LINKFLAGS+= $(GPAC_SH_FLAGS)
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac 
+ifeq ($(CONFIG_DARWIN),yes)
+#LINKFLAGS+= -Wl,-rpath,'@loader_path'
+else
+LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
+endif
+endif
+
+
+#common objs - insert after ../static if any to overwrite list of objects
+OBJS= main.o
+
+SRCS := $(OBJS:.o=.c) 
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(CC) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/applications/deprecated/mp42ts/main.c Added

@@ -0,0 +1,2932 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2005-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / mp4-to-ts (mp42ts) application
+ *
+ *  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/media_tools.h>
+#include <gpac/constants.h>
+#include <gpac/base_coding.h>
+#include <gpac/mpegts.h>
+#include <gpac/main.h>
+
+#ifndef GPAC_DISABLE_STREAMING
+#include <gpac/internal/ietf_dev.h>
+#endif
+
+#ifndef GPAC_DISABLE_SENG
+#include <gpac/scene_engine.h>
+#endif
+
+#ifndef GPAC_DISABLE_TTXT
+#include <gpac/webvtt.h>
+#endif
+
+
+#ifdef GPAC_DISABLE_MPEG2TS_MUX
+#error "Cannot compile MP42TS if GPAC is not built with MPEG2-TS Muxing support"
+#endif
+
+#define MP42TS_PRINT_TIME_MS 500 /*refresh printed info every CLOCK_REFRESH ms*/
+#define MP42TS_VIDEO_FREQ 1000 /*meant to send AVC IDR only every CLOCK_REFRESH ms*/
+
+#define GPAC_DISABLE_PLAYER
+
+
+s32 temi_id_1 = -1;
+s32 temi_id_2 = -1;
+
+u32 temi_url_insertion_delay = 1000;
+u32 temi_offset = 0;
+Bool temi_disable_loop = GF_FALSE;
+
+Double temi_period=0;
+Bool request_temi_toggle = GF_FALSE;
+Bool temi_on = GF_TRUE;
+Bool temi_single_toggle = GF_FALSE;
+u64 temi_period_last_dts = 0;
+FILE *logfile = NULL;
+
+//no longer supported for filters
+#define GPAC_DISABLE_PLAYER
+
+
+static void usage()
+{
+	fprintf(stderr, "mp42ts <inputs> <destinations> [options]\n"
+	        "\n"
+	        "Inputs:\n"
+	        "-src filename[:OPTS]   specifies an input file used for a TS service\n"
+	        "                        * currently only supports ISO files and SDP files\n"
+	        "                        * can be used several times, once for each program\n"
+	        "By default each source is a program in a TS. \n"
+	        "Source options are colon-separated list of options, as follows:\n"
+	        "ID=N                   specifies the program ID for this source.\n"
+	        "             All sources with the same ID will be added to the same program\n"
+	        "name=STR               program name, as used in DVB service description table\n"
+	        "provider=STR           provider name, as used in DVB service description table\n"
+	        "disc                   the first packet of each stream will have the discontinuity marker set\n"
+	        "pmt=N                  sets version number of the PMT\n"
+
+	        "\n"
+	        "-prog filename        same as -src filename\n"
+	        "\n"
+	        "Destinations:\n"
+	        "Several destinations may be specified as follows, at least one is mandatory\n"
+	        "-dst-udp UDP_address:port (multicast or unicast)\n"
+	        "-dst-rtp RTP_address:port\n"
+	        "-dst-file filename\n"
+	        "The following parameters may be specified when -dst-file is used\n"
+	        "-segment-dir dir       server local directory to store segments (ends with a '/')\n"
+	        "-segment-duration dur  segment duration in seconds\n"
+	        "-segment-manifest file m3u8 file basename\n"
+	        "-segment-http-prefix p client address for accessing server segments\n"
+	        "-segment-number n      number of segments to list in the manifest\n"
+	        "\n"
+	        "Basic options:\n"
+	        "-rate R                specifies target rate in kbps of the multiplex (optional)\n"
+	        "-real-time             specifies the muxer will work in real-time mode\n"
+	        "                        * if not specified, the muxer will generate the TS as quickly as possible\n"
+	        "                        * automatically set for SDP or BT input\n"
+	        "-pcr-init V            sets initial value V for PCR - if not set, random value is used\n"
+	        "-pcr-offset V          offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media.\n"
+	        "-psi-rate V            sets PSI refresh rate V in ms (default 100ms).\n"
+	        "                        * If 0, PSI data is only send once at the beginning or before each IDR when -rap option is set.\n"
+	        "                        * This should be set to 0 for DASH streams.\n"
+	        "-time n                request the muxer to stop after n ms\n"
+	        "-single-au             forces 1 PES = 1 AU (disabled by default)\n"
+	        "-multi-au              forces 1 PES = N AU for all streams (disabled by default).\n"
+	        "                        By default, audio streams pack N AUs in one PES but video and systems data use 1 AU per PES.\n"
+	        "-rap                   forces RAP/IDR to be aligned with PES start for video streams (disabled by default)\n"
+	        "                          in this mode, PAT, PMT and PCR will be inserted before the first TS packet of the RAP PES\n"
+	        "-flush-rap             same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT\n"
+	        "-nb-pack N             specifies to pack up to N TS packets together before sending on network or writing to file\n"
+	        "-pcr-ms N              sets max interval in ms between 2 PCR. Default is 100 ms or at each PES header\n"
+	        "-force-pcr-only        allows sending PCR-only packets to enforce the requested PCR rate - STILL EXPERIMENTAL.\n"
+	        "-ttl N                 specifies Time-To-Live for multicast. Default is 1.\n"
+	        "-ifce IPIFCE           specifies default IP interface to use. Default is IF_ANY.\n"
+	        "-temi [URL]            Inserts TEMI time codes in adaptation field. URL is optional, and can be a number for external timeline IDs\n"
+	        "-temi-delay DelayMS    Specifies delay between two TEMI url descriptors (default is 1000)\n"
+	        "-temi-offset OffsetMS  Specifies an offset in ms to add to TEMI (by default TEMI starts at 0)\n"
+	        "-temi-noloop           Do not restart the TEMI timeline at the end of the source\n"
+	        "-temi2 ID              Inserts a secondary TEMI time codes in adaptation field of the audio PID if any. ID shall be set to the desired external timeline IDs\n"
+	        "-insert-ntp            Inserts NTP timestamp in TEMI timeline descriptor\n"
+	        "-sdt-rate MS           Gives the SDT carrousel rate in milliseconds. If 0 (default), SDT is not sent\n"
+	        "\n"
+	        "MPEG-4/T-DMB options:\n"
+	        "-bifs-src filename          update file: must be either an .sdp or a .bt file\n"
+	        "-audio url             may be mp3/udp or aac/http (shoutcast/icecast)\n"
+	        "-video url             shall be a raw h264 frame\n"
+	        "-mpeg4-carousel n      carousel period in ms\n"
+	        "-mpeg4 or -4on2        forces usage of MPEG-4 signaling (IOD and SL Config)\n"
+	        "-4over2                same as -4on2 and uses PMT to carry OD Updates\n"
+	        "-bifs-pes              carries BIFS over PES instead of sections\n"
+	        "-bifs-pes-ex           carries BIFS over PES without writing timestamps in SL\n"
+	        "\n"
+	        "Misc options\n"
+#ifdef GPAC_MEMORY_TRACKING
+            "-mem-track             enables memory tracker\n"
+            "-mem-track-stack       enables memory tracker stack dumping\n"
+#endif
+	        "-h or -help            print this screen\n"
+	        "-hc                    print libgpac options\n"
+	        "\n"
+			"GPAC version %s\n"
+	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
+	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
+	        "Features: %s %s\n\n", gf_gpac_version(), gf_enabled_features(), gf_disabled_features()
+	       );
+}
+
+
+#define MAX_MUX_SRC_PROG	100
+typedef struct
+{
+
+#ifndef GPAC_DISABLE_ISOM
+	GF_ISOFile *mp4;
+#endif
+
+	u32 nb_streams, pcr_idx;
+	GF_ESInterface streams[40];
+	GF_Descriptor *iod;
+#ifndef GPAC_DISABLE_SENG
+	GF_SceneEngine *seng;
+#endif
+	GF_Thread *th;
+	char *bifs_src_name;
+	u32 rate;
+	Bool repeat;
+	u32 mpeg4_signaling;
+	Bool audio_configured;
+	u64 samples_done, samples_count;
+	u32 nb_real_streams;
+	Bool real_time;
+	GF_List *od_updates;
+
+	u32 max_sample_size;
+
+	char program_name[20];
+	char provider_name[20];
+	u32 ID;
+	Bool is_not_program_declaration;
+	Bool set_disc;
+	u32 pmt_version;
+
+	Double last_ntp;
+} M2TSSource;
+
+#ifndef GPAC_DISABLE_ISOM
+typedef struct
+{
+	GF_ISOFile *mp4;
+	u32 track, sample_number, sample_count;
+	u32 mstype, mtype;
+	GF_ISOSample *sample;
+	/*refresh rate for images*/
+	u32 image_repeat_ms, nb_repeat_last;
+	void *dsi;
+	u32 dsi_size;
+
+	void *dsi_and_rap;
+	Bool loop;
+	Bool is_repeat;
+	s64 ts_offset, cts_dts_shift;
+	M2TSSource *source;
+
+	const char *temi_url;
+	u32 last_temi_url, timeline_id;
+	Bool insert_ntp;
+
+} GF_ESIMP4;
+#endif
+
+typedef struct
+{
+	u32 carousel_period, ts_delta;
+	u16 aggregate_on_stream;
+	Bool adjust_carousel_time;
+	Bool discard;
+	Bool rap;
+	Bool critical;
+	Bool vers_inc;
+} GF_ESIStream;
+
+typedef struct
+{
+	u32 size;
+	char *data;
+} GF_SimpleDataDescriptor;
+
+//TODO: find a clean way to save this data
+#ifndef GPAC_DISABLE_PLAYER
+static u32 audio_OD_stream_id = (u32)-1;
+#endif
+
+#define AUDIO_OD_ESID	100
+#define AUDIO_DATA_ESID	101
+#define VIDEO_DATA_ESID	105
+
+/*output types*/
+enum
+{
+	GF_MP42TS_FILE, /*open mpeg2ts file*/
+	GF_MP42TS_UDP,  /*open udp socket*/
+	GF_MP42TS_RTP,  /*open rtp socket*/
+#ifndef GPAC_DISABLE_PLAYER
+	GF_MP42TS_HTTP,	/*open http downloader*/
+#endif
+};
+
+static u32 format_af_descriptor(char *af_data, u32 timeline_id, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
+{
+	u32 res;
+	u32 len;
+	u32 last_time=0;
+	GF_BitStream *bs = gf_bs_new(af_data, 188, GF_BITSTREAM_WRITE);
+
+	if (ntp) {
+		last_time = 1000*(ntp>>32);
+		last_time += 1000*(ntp&0xFFFFFFFF)/0xFFFFFFFF;
+	} else if (timescale) {
+		last_time = (u32) (1000*timecode/timescale);
+	}
+	if (temi_url && (!*last_url_time || (last_time - *last_url_time + 1 >= temi_url_insertion_delay)) ) {
+		*last_url_time = last_time + 1;
+		len = 0;
+		gf_bs_write_int(bs,	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR, 8);
+		gf_bs_write_int(bs,	len, 8);
+
+		gf_bs_write_int(bs,	0, 1); //force_reload
+		gf_bs_write_int(bs,	0, 1); //is_announcement
+		gf_bs_write_int(bs,	0, 1); //splicing_flag
+		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
+		gf_bs_write_int(bs,	0xFF, 5); //reserved
+		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
+
+		if (temi_url) {
+			char *url = (char *)temi_url;
+			if (!strnicmp(temi_url, "http://", 7)) {
+				gf_bs_write_int(bs,	1, 8); //url_scheme
+				url = (char *) temi_url + 7;
+			} else if (!strnicmp(temi_url, "https://", 8)) {
+				gf_bs_write_int(bs,	2, 8); //url_scheme
+				url = (char *) temi_url + 8;
+			} else {
+				gf_bs_write_int(bs,	0, 8); //url_scheme
+			}
+			gf_bs_write_u8(bs, (u32) strlen(url)); //url_path_len
+			gf_bs_write_data(bs, url, (u32) strlen(url) ); //url
+			gf_bs_write_u8(bs, 0); //nb_addons
+		}
+		//rewrite len
+		len = (u32) gf_bs_get_position(bs) - 2;
+		af_data[1] = len;
+	}
+
+	if (timescale || ntp) {
+		Bool use64 = (timecode > 0xFFFFFFFFUL) ? GF_TRUE : GF_FALSE;
+		len = 3; //3 bytes flags
+
+		if (timescale) len += 4 + (use64 ? 8 : 4);
+		if (ntp) len += 8;
+
+		//write timeline descriptor
+		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
+		gf_bs_write_int(bs,	len, 8);
+
+		gf_bs_write_int(bs,	timescale ? (use64 ? 2 : 1) : 0, 2); //has_timestamp
+		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
+		gf_bs_write_int(bs,	0, 1); //has_ptp
+		gf_bs_write_int(bs,	0, 2); //has_timecode
+		gf_bs_write_int(bs,	0, 1); //force_reload
+		gf_bs_write_int(bs,	0, 1); //paused
+		gf_bs_write_int(bs,	0, 1); //discontinuity
+		gf_bs_write_int(bs,	0xFF, 7); //reserved
+		gf_bs_write_int(bs,	timeline_id, 8); //timeline_id
+		if (timescale) {
+			gf_bs_write_u32(bs,	timescale); //timescale
+			if (use64)
+				gf_bs_write_u64(bs,	timecode); //timestamp
+			else
+				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
+		}
+		if (ntp) {
+			gf_bs_write_u64(bs,	ntp); //ntp
+		}
+	}
+	res = (u32) gf_bs_get_position(bs);
+	gf_bs_del(bs);
+	return res;
+}
+
+#ifndef GPAC_DISABLE_ISOM
+
+static GF_Err mp4_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
+{
+	char af_data[188];
+	GF_ESIMP4 *priv = (GF_ESIMP4 *)ifce->input_udta;
+	if (!priv) return GF_BAD_PARAM;
+
+	switch (act_type) {
+	case GF_ESI_INPUT_DATA_FLUSH:
+	{
+		GF_ESIPacket pck;
+#ifndef GPAC_DISABLE_TTXT
+		GF_List *cues = NULL;
+#endif
+		if (!priv->sample)
+			priv->sample = gf_isom_get_sample(priv->mp4, priv->track, priv->sample_number+1, NULL);
+
+		if (!priv->sample) {
+			return GF_IO_ERR;
+		}
+
+		memset(&pck, 0, sizeof(GF_ESIPacket));
+
+		pck.flags = GF_ESI_DATA_AU_START | GF_ESI_DATA_HAS_CTS;
+		if (priv->sample->IsRAP) pck.sap_type = priv->sample->IsRAP;
+		pck.cts = priv->sample->DTS + priv->ts_offset;
+		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
+
+		if (priv->timeline_id) {
+			Bool deactivate_temi=GF_FALSE;
+			u64 ntp=0;
+			u64 tc = priv->sample->DTS + priv->sample->CTS_Offset + priv->cts_dts_shift;
+			Bool insert_temi=GF_FALSE;
+			if (temi_disable_loop) {
+				tc += priv->ts_offset;
+			}
+
+			if (temi_offset) {
+				tc += ((u64) temi_offset) * ifce->timescale / 1000;
+			}
+
+			if (priv->insert_ntp) {
+				u32 sec, frac;
+				gf_net_get_ntp(&sec, &frac);
+				ntp = sec;
+				ntp <<= 32;
+				ntp |= frac;
+			}
+			if (!temi_period) {
+				//toggle temi at RAP POINTS ONLY
+				if (request_temi_toggle && priv->sample->IsRAP) {
+					temi_on = !temi_on;
+					if (!temi_on) {
+						deactivate_temi = GF_TRUE;
+					}
+					fprintf(stderr, "Turning TEMI %st at DTS "LLU" (%g sec)\n", temi_on ? "on" : "off" , priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
+					request_temi_toggle = GF_FALSE;
+				}
+				insert_temi = temi_on;
+			} else {
+
+				if (!temi_on) {
+					if (priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
+						temi_on = GF_TRUE;
+						temi_period_last_dts = priv->sample->DTS;
+						fprintf(stderr, "Turning TEMI on at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
+					}
+				} else {
+					if (!temi_single_toggle && priv->sample->IsRAP && ((priv->sample->DTS - temi_period_last_dts) >= temi_period * ifce->timescale)) {
+						temi_on = GF_FALSE;
+						temi_period_last_dts = priv->sample->DTS;
+						fprintf(stderr, "Turning TEMI off at DTS "LLU" (%g sec)\n", priv->sample->DTS, ((Double)priv->sample->DTS)/ifce->timescale);
+						deactivate_temi = GF_TRUE;
+					}
+				}
+				insert_temi = temi_on;
+			}
+
+			if (insert_temi) {
+				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, tc, ifce->timescale, ntp, priv->temi_url, &priv->last_temi_url);
+				pck.mpeg2_af_descriptors = af_data;
+			} else if (deactivate_temi) {
+				pck.mpeg2_af_descriptors_size = format_af_descriptor(af_data, priv->timeline_id - 1, 0, 0, 0, "", &priv->last_temi_url);
+				pck.mpeg2_af_descriptors = af_data;
+			}
+		}
+
+		if (priv->nb_repeat_last) {
+			pck.cts += priv->nb_repeat_last*ifce->timescale * priv->image_repeat_ms / 1000;
+		}
+
+		pck.dts = pck.cts;
+		if (priv->cts_dts_shift) {
+			pck.cts += + priv->cts_dts_shift;
+			pck.flags |= GF_ESI_DATA_HAS_DTS;
+		}
+
+		if (priv->sample->CTS_Offset) {
+			pck.cts += priv->sample->CTS_Offset;
+			pck.flags |= GF_ESI_DATA_HAS_DTS;
+		}
+
+		if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
+			pck.data = (char*)priv->dsi;
+			pck.data_len = priv->dsi_size;
+			ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+			pck.flags &= ~GF_ESI_DATA_AU_START;
+		}
+
+		pck.flags |= GF_ESI_DATA_AU_END;
+		pck.data = priv->sample->data;
+		pck.data_len = priv->sample->dataLength;
+		pck.duration = gf_isom_get_sample_duration(priv->mp4, priv->track, priv->sample_number+1);
+#ifndef GPAC_DISABLE_TTXT
+		if (priv->mtype==GF_ISOM_MEDIA_TEXT && priv->mstype==GF_ISOM_SUBTYPE_WVTT) {
+			u64             start;
+			GF_WebVTTCue    *cue;
+			GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start);
+			start = (priv->sample->DTS * 1000) / ifce->timescale;
+			cues = gf_webvtt_parse_iso_cues(priv->sample, start);
+			if (gf_list_count(cues)>1) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] More than one cue in sample\n"));
+			}
+			cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+			if (cue) {
+				pck.data = cue->text;
+				pck.data_len = (u32)strlen(cue->text)+1;
+			} else {
+				pck.data = NULL;
+				pck.data_len = 0;
+			}
+		}
+#endif
+		ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Track %d: sample %d CTS %d\n", priv->track, priv->sample_number+1, pck.cts));
+
+#ifndef GPAC_DISABLE_VTT
+		if (cues) {
+			while (gf_list_count(cues)) {
+				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+				gf_list_rem(cues, 0);
+				gf_webvtt_cue_del(cue);
+			}
+			gf_list_del(cues);
+			cues = NULL;
+		}
+#endif
+		gf_isom_sample_del(&priv->sample);
+		priv->sample_number++;
+
+		if (!priv->source->real_time && !priv->is_repeat) {
+			priv->source->samples_done++;
+			gf_set_progress("MPEG-2 TS Muxing", priv->source->samples_done, priv->source->samples_count);
+		}
+
+		if (priv->sample_number==priv->sample_count) {
+			if (priv->loop) {
+				Double scale;
+				u64 duration;
+				/*increment ts offset*/
+				scale = gf_isom_get_media_timescale(priv->mp4, priv->track);
+				scale /= gf_isom_get_timescale(priv->mp4);
+				duration = (u64) (gf_isom_get_duration(priv->mp4) * scale);
+				priv->ts_offset += duration;
+				priv->sample_number = 0;
+				priv->is_repeat = (priv->sample_count==1) ? GF_TRUE : GF_FALSE;
+			}
+			else if (priv->image_repeat_ms && priv->source->nb_real_streams) {
+				priv->nb_repeat_last++;
+				priv->sample_number--;
+				priv->is_repeat = GF_TRUE;
+			} else {
+				if (!(ifce->caps & GF_ESI_STREAM_IS_OVER)) {
+					ifce->caps |= GF_ESI_STREAM_IS_OVER;
+					if (priv->sample_count>1) {
+						assert(priv->source->nb_real_streams);
+						priv->source->nb_real_streams--;
+					}
+				}
+			}
+		}
+	}
+	return GF_OK;
+
+	case GF_ESI_INPUT_DESTROY:
+		if (priv->dsi) gf_free(priv->dsi);
+		if (ifce->decoder_config) {
+			gf_free(ifce->decoder_config);
+			ifce->decoder_config = NULL;
+		}
+		gf_free(priv);
+		ifce->input_udta = NULL;
+		return GF_OK;
+	default:
+		return GF_BAD_PARAM;
+	}
+}
+
+static void fill_isom_es_ifce(M2TSSource *source, GF_ESInterface *ifce, GF_ISOFile *mp4, u32 track_num, u32 bifs_use_pes, Bool compute_max_size)
+{
+	GF_ESIMP4 *priv;
+	char *_lan;
+	GF_ESD *esd;
+	Bool is_hevc=GF_FALSE;
+	u64 avg_rate, duration;
+	s32 ref_count;
+	s64 mediaOffset;
+
+	GF_SAFEALLOC(priv, GF_ESIMP4);
+	if (!priv) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate MP4 input handler\n"));
+		return;
+	}
+
+	priv->mp4 = mp4;
+	priv->track = track_num;
+	priv->mtype = gf_isom_get_media_type(priv->mp4, priv->track);
+	priv->mstype = gf_isom_get_media_subtype(priv->mp4, priv->track, 1);
+	priv->loop = source->real_time ? GF_TRUE : GF_FALSE;
+	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
+	source->samples_count += priv->sample_count;
+	if (priv->sample_count>1)
+		source->nb_real_streams++;
+
+	priv->source = source;
+	memset(ifce, 0, sizeof(GF_ESInterface));
+	ifce->stream_id = gf_isom_get_track_id(mp4, track_num);
+
+	esd = gf_media_map_esd(mp4, track_num, 0);
+
+	if (esd) {
+		ifce->stream_type = esd->decoderConfig->streamType;
+		ifce->object_type_indication = esd->decoderConfig->objectTypeIndication;
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->dataLength) {
+			switch (esd->decoderConfig->objectTypeIndication) {
+			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_MPEG4_PART2:
+				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
+				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				if (esd->decoderConfig->objectTypeIndication == GF_CODECID_MPEG4_PART2) {
+					priv->dsi = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
+					priv->dsi_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+					memcpy(priv->dsi, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				}
+				break;
+			case GF_CODECID_HEVC:
+			case GF_CODECID_LHVC:
+				is_hevc=GF_TRUE;
+			case GF_CODECID_AVC:
+			case GF_CODECID_SVC:
+			case GF_CODECID_MVC:
+				gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
+				break;
+			case GF_CODECID_WEBVTT:
+				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
+				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				break;
+			}
+		}
+		gf_odf_desc_del((GF_Descriptor *)esd);
+	}
+	gf_isom_get_media_language(mp4, track_num, &_lan);
+	if (!_lan || !strcmp(_lan, "und")) {
+		ifce->lang = 0;
+	} else {
+		ifce->lang = GF_4CC(_lan[0],_lan[1],_lan[2],' ');
+	}
+	if (_lan) {
+		gf_free(_lan);
+	}
+
+	ifce->timescale = gf_isom_get_media_timescale(mp4, track_num);
+	ifce->duration = gf_isom_get_media_timescale(mp4, track_num);
+	avg_rate = gf_isom_get_media_data_size(mp4, track_num);
+	if (!avg_rate) return;
+	avg_rate *= ifce->timescale * 8;
+	if (0!=(duration=gf_isom_get_media_duration(mp4, track_num)))
+		avg_rate /= duration;
+
+	ifce->bit_rate = (u32) avg_rate;
+	ifce->duration = (Double) (s64) gf_isom_get_media_duration(mp4, track_num);
+	ifce->duration /= ifce->timescale;
+
+	GF_SAFEALLOC(ifce->sl_config, GF_SLConfig);
+	if (!ifce->sl_config) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate interface SLConfig\n"));
+		return;
+	}
+
+	ifce->sl_config->tag = GF_ODF_SLC_TAG;
+	ifce->sl_config->useAccessUnitStartFlag = 1;
+	ifce->sl_config->useAccessUnitEndFlag = 1;
+	ifce->sl_config->useRandomAccessPointFlag = 1;
+	ifce->sl_config->useTimestampsFlag = 1;
+	ifce->sl_config->timestampLength = 33;
+	ifce->sl_config->timestampResolution = ifce->timescale;
+
+	/*test mode in which time stamps are 90khz and not coded but copied over from PES header*/
+	if (bifs_use_pes==2) {
+		ifce->sl_config->timestampLength = 0;
+		ifce->sl_config->timestampResolution = 90000;
+	}
+
+#ifdef GPAC_DISABLE_ISOM_WRITE
+	fprintf(stderr, "Warning: GPAC was compiled without ISOM Write support, can't set SL Config!\n");
+#else
+	gf_isom_set_extraction_slc(mp4, track_num, 1, ifce->sl_config);
+#endif
+
+	ifce->input_ctrl = mp4_input_ctrl;
+	if (priv != ifce->input_udta) {
+		if (ifce->input_udta)
+			gf_free(ifce->input_udta);
+		ifce->input_udta = priv;
+	}
+
+
+	if (! gf_isom_get_edit_list_type(mp4, track_num, &mediaOffset)) {
+		priv->ts_offset = mediaOffset;
+	}
+
+	if (gf_isom_has_time_offset(mp4, track_num)==2) {
+		priv->cts_dts_shift = gf_isom_get_cts_to_dts_shift(mp4, track_num);
+	}
+
+	ifce->depends_on_stream = 0;
+	ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_SCAL);
+	if (ref_count > 0) {
+		gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_SCAL, (u32) ref_count, &ifce->depends_on_stream);
+	} else if (is_hevc) {
+		ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_BASE);
+		if (ref_count > 0) {
+			gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_BASE, (u32) ref_count, &ifce->depends_on_stream);
+		}
+	}
+
+	if (compute_max_size) {
+		u32 i;
+		for (i=0; i < priv->sample_count; i++) {
+			u32 s = gf_isom_get_sample_size(mp4, track_num, i+1);
+			if (s>source->max_sample_size) source->max_sample_size = s;
+		}
+	}
+
+}
+
+#endif //GPAC_DISABLE_ISOM
+
+
+#ifndef GPAC_DISABLE_SENG
+static GF_Err seng_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
+{
+	if (act_type==GF_ESI_INPUT_DESTROY) {
+		//TODO: free my data
+		if (ifce->input_udta)
+			gf_free(ifce->input_udta);
+		ifce->input_udta = NULL;
+		return GF_OK;
+	}
+
+	return GF_OK;
+}
+#endif
+
+
+#ifndef GPAC_DISABLE_STREAMING
+typedef struct
+{
+	/*RTP channel*/
+	GF_RTPChannel *rtp_ch;
+
+	/*depacketizer*/
+	GF_RTPDepacketizer *depacketizer;
+
+	GF_ESIPacket pck;
+
+	GF_ESInterface *ifce;
+
+	Bool cat_dsi, is_264;
+	void *dsi_and_rap;
+	u32 avc_dsi_size;
+
+	Bool use_carousel;
+	u32 au_sn;
+
+	s64 ts_offset;
+	Bool rtcp_init;
+	M2TSSource *source;
+
+	u32 min_dts_inc;
+	u64 prev_cts;
+	u64 prev_dts;
+} GF_ESIRTP;
+
+static GF_Err rtp_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
+{
+	u32 size, PayloadStart;
+	GF_Err e;
+	GF_RTPHeader hdr;
+	char buffer[8000];
+	GF_ESIRTP *rtp = (GF_ESIRTP*)ifce->input_udta;
+
+	if (!ifce->input_udta) return GF_BAD_PARAM;
+
+	switch (act_type) {
+	case GF_ESI_INPUT_DATA_FLUSH:
+		/*flush rtcp channel*/
+		while (1) {
+			Bool has_sr = GF_FALSE;
+			size = gf_rtp_read_rtcp(rtp->rtp_ch, buffer, 8000);
+			if (!size) break;
+			e = gf_rtp_decode_rtcp(rtp->rtp_ch, buffer, size, &has_sr);
+
+			if (e == GF_EOS) ifce->caps |= GF_ESI_STREAM_IS_OVER;
+
+			if (has_sr && !rtp->rtcp_init) {
+				Double time = rtp->rtp_ch->last_SR_NTP_sec;
+				time += ((Double)rtp->rtp_ch->last_SR_NTP_frac)/0xFFFFFFFF;
+				if (!rtp->source->last_ntp) {
+					rtp->source->last_ntp = time;
+				}
+				if (time >= rtp->source->last_ntp) {
+					time -= rtp->source->last_ntp;
+				} else {
+					time = 0;
+				}
+				rtp->ts_offset = rtp->rtp_ch->last_SR_rtp_time;
+				rtp->ts_offset -= (s64) (time * rtp->rtp_ch->TimeScale);
+				rtp->rtcp_init = GF_TRUE;
+			}
+		}
+		/*flush rtp channel*/
+		while (1) {
+			size = gf_rtp_read_rtp(rtp->rtp_ch, buffer, 8000);
+			if (!size) break;
+			e = gf_rtp_decode_rtp(rtp->rtp_ch, buffer, size, &hdr, &PayloadStart);
+			if (e) return e;
+			gf_rtp_depacketizer_process(rtp->depacketizer, &hdr, buffer + PayloadStart, size - PayloadStart);
+		}
+		return GF_OK;
+	case GF_ESI_INPUT_DESTROY:
+		gf_rtp_depacketizer_del(rtp->depacketizer);
+		if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
+		gf_rtp_del(rtp->rtp_ch);
+		gf_free(rtp);
+
+		if (ifce->decoder_config) {
+			gf_free(ifce->decoder_config);
+			ifce->decoder_config = NULL;
+		}
+		ifce->input_udta = NULL;
+		return GF_OK;
+	}
+	return GF_OK;
+}
+
+static void rtp_sl_packet_cbk(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
+{
+	GF_ESIRTP *rtp = (GF_ESIRTP*)udta;
+
+	/*sync not found yet, cannot start (since we don't support PCR discontinuities yet ...)*/
+	if (!rtp->rtcp_init) return;
+
+	/*try to compute a DTS*/
+	if (hdr->accessUnitStartFlag && !hdr->decodingTimeStampFlag) {
+		if (!rtp->prev_cts) {
+			rtp->prev_cts = rtp->prev_dts = hdr->compositionTimeStamp;
+		}
+
+		if (hdr->compositionTimeStamp > rtp->prev_cts) {
+			u32 diff = (u32) (hdr->compositionTimeStamp - rtp->prev_cts);
+			if (!rtp->min_dts_inc || (rtp->min_dts_inc > diff)) {
+				rtp->min_dts_inc = diff;
+				rtp->prev_dts = hdr->compositionTimeStamp - diff;
+			}
+		}
+		hdr->decodingTimeStampFlag = 1;
+		hdr->decodingTimeStamp = rtp->prev_dts + rtp->min_dts_inc;
+		rtp->prev_dts += rtp->min_dts_inc;
+		if (hdr->compositionTimeStamp < hdr->decodingTimeStamp) {
+			hdr->decodingTimeStamp = hdr->compositionTimeStamp;
+		}
+	}
+
+	rtp->pck.data = payload;
+	rtp->pck.data_len = size;
+	rtp->pck.dts = hdr->decodingTimeStamp + rtp->ts_offset;
+	rtp->pck.cts = hdr->compositionTimeStamp + rtp->ts_offset;
+	rtp->pck.flags = 0;
+	if (hdr->compositionTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_CTS;
+	if (hdr->decodingTimeStampFlag) rtp->pck.flags |= GF_ESI_DATA_HAS_DTS;
+	if (hdr->accessUnitStartFlag) rtp->pck.flags |= GF_ESI_DATA_AU_START;
+	if (hdr->accessUnitEndFlag) rtp->pck.flags |= GF_ESI_DATA_AU_END;
+	if (hdr->randomAccessPointFlag) rtp->pck.sap_type = 1;
+
+	if (rtp->use_carousel) {
+		if ((hdr->AU_sequenceNumber==rtp->au_sn) && hdr->randomAccessPointFlag) rtp->pck.flags |= GF_ESI_DATA_REPEAT;
+		rtp->au_sn = hdr->AU_sequenceNumber;
+	}
+
+	if (rtp->is_264) {
+		if (!payload) return;
+
+		/*send a NALU delim: copy over NAL ref idc*/
+		if (hdr->accessUnitStartFlag) {
+			char sc[6];
+			sc[0] = sc[1] = sc[2] = 0;
+			sc[3] = 1;
+			sc[4] = (payload[4] & 0x60) | GF_AVC_NALU_ACCESS_UNIT;
+			sc[5] = 0xF0 /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
+
+			rtp->pck.data = sc;
+			rtp->pck.data_len = 6;
+			rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
+
+			rtp->pck.flags &= ~GF_ESI_DATA_AU_START;
+
+			/*since we don't inspect the RTP content, we can only concatenate SPS and PPS indicated in SDP*/
+			if (hdr->randomAccessPointFlag && rtp->dsi_and_rap) {
+				rtp->pck.data = (char*)rtp->dsi_and_rap;
+				rtp->pck.data_len = rtp->avc_dsi_size;
+
+				rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
+			}
+
+			rtp->pck.data = payload;
+			rtp->pck.data_len = size;
+		}
+
+		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
+	} else {
+		if (rtp->cat_dsi && hdr->randomAccessPointFlag && hdr->accessUnitStartFlag) {
+			if (rtp->dsi_and_rap) gf_free(rtp->dsi_and_rap);
+			rtp->pck.data_len = size + rtp->depacketizer->sl_map.configSize;
+			rtp->dsi_and_rap = gf_malloc(sizeof(char)*(rtp->pck.data_len));
+			memcpy(rtp->dsi_and_rap, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
+			memcpy((char *) rtp->dsi_and_rap + rtp->depacketizer->sl_map.configSize, payload, size);
+			rtp->pck.data = (char*)rtp->dsi_and_rap;
+		}
+		rtp->ifce->output_ctrl(rtp->ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &rtp->pck);
+	}
+}
+
+static void fill_rtp_es_ifce(GF_ESInterface *ifce, GF_SDPMedia *media, GF_SDPInfo *sdp, M2TSSource *source)
+{
+	u32 i;
+	GF_Err e;
+	GF_X_Attribute*att;
+	GF_ESIRTP *rtp;
+	GF_RTPMap*map;
+	GF_SDPConnection *conn;
+	GF_RTSPTransport trans;
+
+	/*check connection*/
+	conn = sdp->c_connection;
+	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
+
+	/*check payload type*/
+	map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
+	GF_SAFEALLOC(rtp, GF_ESIRTP);
+	if (!rtp) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate RTP input handler\n"));
+		return;
+	}
+
+	memset(ifce, 0, sizeof(GF_ESInterface));
+	rtp->rtp_ch = gf_rtp_new();
+	i=0;
+	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
+		if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ifce->stream_id = atoi(att->Value);
+	}
+
+	memset(&trans, 0, sizeof(GF_RTSPTransport));
+	trans.Profile = media->Profile;
+	trans.source = conn ? conn->host : sdp->o_address;
+	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
+	if (!trans.IsUnicast) {
+		trans.port_first = media->PortNumber;
+		trans.port_last = media->PortNumber + 1;
+		trans.TTL = conn ? conn->TTL : 0;
+	} else {
+		trans.client_port_first = media->PortNumber;
+		trans.client_port_last = media->PortNumber + 1;
+	}
+
+	if (gf_rtp_setup_transport(rtp->rtp_ch, &trans, NULL) != GF_OK) {
+		gf_rtp_del(rtp->rtp_ch);
+		fprintf(stderr, "Cannot initialize RTP transport\n");
+		return;
+	}
+	/*setup depacketizer*/
+	rtp->depacketizer = gf_rtp_depacketizer_new(media, rtp_sl_packet_cbk, rtp);
+	if (!rtp->depacketizer) {
+		gf_rtp_del(rtp->rtp_ch);
+		fprintf(stderr, "Cannot create RTP depacketizer\n");
+		return;
+	}
+	/*setup channel*/
+	gf_rtp_setup_payload(rtp->rtp_ch, map->PayloadType, map->ClockRate);
+	ifce->input_udta = rtp;
+	ifce->input_ctrl = rtp_input_ctrl;
+	rtp->ifce = ifce;
+	rtp->source = source;
+
+	ifce->object_type_indication = rtp->depacketizer->sl_map.CodecID;
+	ifce->stream_type = rtp->depacketizer->sl_map.StreamType;
+	ifce->timescale = gf_rtp_get_clockrate(rtp->rtp_ch);
+	if (rtp->depacketizer->sl_map.config) {
+		switch (ifce->object_type_indication) {
+		case GF_CODECID_MPEG4_PART2:
+			rtp->cat_dsi = GF_TRUE;
+			break;
+		case GF_CODECID_AVC:
+		case GF_CODECID_SVC:
+		case GF_CODECID_MVC:
+			rtp->is_264 = GF_TRUE;
+			rtp->depacketizer->flags |= GF_RTP_AVC_USE_ANNEX_B;
+			{
+#ifndef GPAC_DISABLE_AV_PARSERS
+				GF_AVCConfig *avccfg = gf_odf_avc_cfg_read(rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
+				if (avccfg) {
+					GF_AVCConfigSlot *slc;
+					u32 i;
+					GF_BitStream *bs;
+
+					bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
+						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->sequenceParameterSets, i);
+						gf_bs_write_u32(bs, 1);
+						gf_bs_write_data(bs, slc->data, slc->size);
+					}
+					for (i=0; i<gf_list_count(avccfg->pictureParameterSets); i++) {
+						slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
+						gf_bs_write_u32(bs, 1);
+						gf_bs_write_data(bs, slc->data, slc->size);
+					}
+					gf_bs_get_content(bs, (char **) &rtp->dsi_and_rap, &rtp->avc_dsi_size);
+					gf_bs_del(bs);
+				}
+				gf_odf_avc_cfg_del(avccfg);
+#endif
+			}
+			break;
+		case GF_CODECID_AAC_MPEG4:
+			ifce->decoder_config = (char*)gf_malloc(sizeof(char) * rtp->depacketizer->sl_map.configSize);
+			ifce->decoder_config_size = rtp->depacketizer->sl_map.configSize;
+			memcpy(ifce->decoder_config, rtp->depacketizer->sl_map.config, rtp->depacketizer->sl_map.configSize);
+			break;
+		}
+	}
+	if (rtp->depacketizer->sl_map.StreamStateIndication) {
+		rtp->use_carousel = GF_TRUE;
+		rtp->au_sn=0;
+	}
+
+	gf_rtp_depacketizer_reset(rtp->depacketizer, GF_TRUE);
+	e = gf_rtp_initialize(rtp->rtp_ch, 0x100000ul, GF_FALSE, 0, 10, 200, NULL);
+	if (e!=GF_OK) {
+		gf_rtp_del(rtp->rtp_ch);
+		fprintf(stderr, "Cannot initialize RTP channel: %s\n", gf_error_to_string(e));
+		return;
+	}
+	fprintf(stderr, "RTP interface initialized\n");
+}
+#endif /*GPAC_DISABLE_STREAMING*/
+
+#ifndef GPAC_DISABLE_SENG
+static GF_Err void_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
+{
+	return GF_OK;
+}
+#endif
+
+/*AAC import features*/
+#ifndef GPAC_DISABLE_PLAYER
+
+void *audio_prog = NULL;
+static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts);
+#define DONT_USE_TERMINAL_MODULE_API
+#include "../../modules/aac_in/aac_in.c"
+AACReader *aac_reader = NULL;
+u64 audio_discontinuity_offset = 0;
+
+/*create an OD codec and encode the descriptor*/
+static GF_Err encode_audio_desc(GF_ESD *esd, GF_SimpleDataDescriptor *audio_desc)
+{
+	GF_Err e;
+	GF_ODCodec *odc = gf_odf_codec_new();
+	GF_ODUpdate *od_com = (GF_ODUpdate*)gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
+	assert( esd );
+	assert( audio_desc );
+	gf_list_add(od->ESDescriptors, esd);
+	od->objectDescriptorID = AUDIO_DATA_ESID;
+	gf_list_add(od_com->objectDescriptors, od);
+
+	e = gf_odf_codec_add_com(odc, (GF_ODCom*)od_com);
+	if (e) {
+		fprintf(stderr, "Audio input error add the command to be encoded\n");
+		return e;
+	}
+	e = gf_odf_codec_encode(odc, 0);
+	if (e) {
+		fprintf(stderr, "Audio input error encoding the descriptor\n");
+		return e;
+	}
+	e = gf_odf_codec_get_au(odc, &audio_desc->data, &audio_desc->size);
+	if (e) {
+		fprintf(stderr, "Audio input error getting the descriptor\n");
+		return e;
+	}
+	e = gf_odf_com_del((GF_ODCom**)&od_com);
+	if (e) {
+		fprintf(stderr, "Audio input error deleting the command\n");
+		return e;
+	}
+	gf_odf_codec_del(odc);
+
+	return GF_OK;
+}
+
+#endif
+
+
+static void SampleCallBack(void *calling_object, u16 ESID, char *data, u32 size, u64 ts)
+{
+	u32 i;
+	//fprintf(stderr, "update: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
+
+	if (calling_object) {
+		M2TSSource *source = (M2TSSource *)calling_object;
+
+#ifndef GPAC_DISABLE_PLAYER
+		if (ESID == AUDIO_DATA_ESID) {
+			if (audio_OD_stream_id != (u32)-1) {
+				/*this is the first time we get some audio data. Therefore we are sure we can retrieve the audio descriptor. Then we'll
+				  send it by calling this callback recursively so that a player gets the audio descriptor before audio data.
+				  Hack: the descriptor is carried thru the input_udta, you shall delete it*/
+				GF_SimpleDataDescriptor *audio_desc = source->streams[audio_OD_stream_id].input_udta;
+				if (audio_desc && !audio_desc->data) /*intended for HTTP/AAC: an empty descriptor was set (vs already filled for RTP/UDP MP3)*/
+				{
+					/*get the audio descriptor and encode it*/
+					GF_ESD *esd = AAC_GetESD(aac_reader);
+					assert(esd->slConfig->timestampResolution);
+					esd->slConfig->useAccessUnitStartFlag = 1;
+					esd->slConfig->useAccessUnitEndFlag = 1;
+					esd->slConfig->useTimestampsFlag = 1;
+					esd->slConfig->timestampLength = 33;
+					/*audio stream, all samples are RAPs*/
+					esd->slConfig->useRandomAccessPointFlag = 0;
+					esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+					for (i=0; i<source->nb_streams; i++) {
+						if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
+							GF_Err e;
+							source->streams[i].timescale = esd->slConfig->timestampResolution;
+							e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
+							if (e != GF_OK) {
+								fprintf(stderr, "Failed updating TS program timescale\n");
+							}
+							else if (!source->streams[i].sl_config)
+								source->streams[i].sl_config = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
+
+							memcpy(source->streams[i].sl_config, esd->slConfig, sizeof(GF_SLConfig));
+							break;
+						}
+					}
+					esd->ESID = AUDIO_DATA_ESID;
+					assert(audio_OD_stream_id != (u32)-1);
+					encode_audio_desc(esd, audio_desc);
+
+					/*build the ESI*/
+					{
+						/*audio OD descriptor: rap=1 and vers_inc=0*/
+						GF_SAFEALLOC(source->streams[audio_OD_stream_id].input_udta, GF_ESIStream);
+						if (!source->streams[audio_OD_stream_id].input_udta) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate aac input handler\n"));
+							return;
+						}
+						((GF_ESIStream*)source->streams[audio_OD_stream_id].input_udta)->rap = 1;
+
+						/*we have the descriptor; now call this callback recursively so that a player gets the audio descriptor before audio data.*/
+						source->repeat = 1;
+						SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
+						source->repeat = 0;
+
+						/*clean*/
+						gf_free(audio_desc->data);
+						gf_free(audio_desc);
+						gf_free(source->streams[audio_OD_stream_id].input_udta);
+						source->streams[audio_OD_stream_id].input_udta = NULL;
+					}
+				}
+			}
+			/*update the timescale if needed*/
+			else if (!source->audio_configured) {
+				GF_ESD *esd = AAC_GetESD(aac_reader);
+				assert(esd->slConfig->timestampResolution);
+				for (i=0; i<source->nb_streams; i++) {
+					if (source->streams[i].stream_id == AUDIO_DATA_ESID) {
+						GF_Err e;
+						source->streams[i].timescale = esd->slConfig->timestampResolution;
+						source->streams[i].decoder_config = esd->decoderConfig->decoderSpecificInfo->data;
+						source->streams[i].decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+						esd->decoderConfig->decoderSpecificInfo->data = NULL;
+						esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
+						e = gf_m2ts_program_stream_update_ts_scale(&source->streams[i], esd->slConfig->timestampResolution);
+						if (!e)
+							source->audio_configured = 1;
+						break;
+					}
+				}
+				gf_odf_desc_del((GF_Descriptor *)esd);
+			}
+
+			/*overwrite timing as it is flushed to 0 on discontinuities*/
+			ts += audio_discontinuity_offset;
+		}
+#endif
+		i=0;
+		while (i<source->nb_streams) {
+			if (source->streams[i].output_ctrl==NULL) {
+				fprintf(stderr, "MULTIPLEX NOT YET CREATED\n");
+				return;
+			}
+			if (source->streams[i].stream_id == ESID) {
+				GF_ESIStream *priv = (GF_ESIStream *)source->streams[i].input_udta;
+				GF_ESIPacket pck;
+				memset(&pck, 0, sizeof(GF_ESIPacket));
+				pck.data = data;
+				pck.data_len = size;
+				pck.flags |= GF_ESI_DATA_HAS_CTS;
+				pck.flags |= GF_ESI_DATA_HAS_DTS;
+				pck.flags |= GF_ESI_DATA_AU_START;
+				pck.flags |= GF_ESI_DATA_AU_END;
+				if (ts) pck.cts = pck.dts = ts;
+
+				if (priv->rap)
+					pck.sap_type = 1;
+				if (source->repeat || !priv->vers_inc) {
+					pck.flags |= GF_ESI_DATA_REPEAT;
+					fprintf(stderr, "RAP carousel from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
+				} else {
+					if (ESID != AUDIO_DATA_ESID && ESID != VIDEO_DATA_ESID)	/*don't log A/V inputs*/
+						fprintf(stderr, "Update from scene engine sent: ESID=%d - size=%d - ts="LLD"\n", ESID, size, ts);
+				}
+				source->streams[i].output_ctrl(&source->streams[i], GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+				return;
+			}
+			i++;
+		}
+	}
+	return;
+}
+
+//static gf_seng_callback * SampleCallBack = &mySampleCallBack;
+
+
+static volatile Bool run = 1;
+
+#ifndef GPAC_DISABLE_SENG
+static GF_ESIStream * set_broadcast_params(M2TSSource *source, u16 esid, u32 period, u32 ts_delta, u16 aggregate_on_stream, Bool adjust_carousel_time, Bool force_rap, Bool aggregate_au, Bool discard_pending, Bool signal_rap, Bool signal_critical, Bool version_inc)
+{
+	u32 i=0;
+	GF_ESIStream *priv=NULL;
+	GF_ESInterface *esi=NULL;
+
+	/*locate our stream*/
+	if (esid) {
+		while (i<source->nb_streams) {
+			if (source->streams[i].stream_id == esid) {
+				priv = (GF_ESIStream *)source->streams[i].input_udta;
+				esi = &source->streams[i];
+				break;
+			}
+			else {
+				i++;
+			}
+		}
+		/*TODO: stream not found*/
+	}
+
+	/*TODO - set/reset the ESID for the parsers*/
+	if (!priv) return NULL;
+
+	/*TODO - if discard is set, abort current carousel*/
+	if (discard_pending) {
+	}
+
+	/*remember RAP flag*/
+	priv->rap = signal_rap;
+	priv->critical = signal_critical;
+	priv->vers_inc = version_inc;
+
+	priv->ts_delta = ts_delta;
+	priv->adjust_carousel_time = adjust_carousel_time;
+
+	/*change stream aggregation mode*/
+	if ((aggregate_on_stream != (u16)-1) && (priv->aggregate_on_stream != aggregate_on_stream)) {
+		gf_seng_enable_aggregation(source->seng, esid, aggregate_on_stream);
+		priv->aggregate_on_stream = aggregate_on_stream;
+	}
+	/*change stream aggregation mode*/
+	if (priv->aggregate_on_stream==esi->stream_id) {
+		if (priv->aggregate_on_stream && (period!=(u32)-1) && (esi->repeat_rate != period)) {
+			esi->repeat_rate = period;
+		}
+	} else {
+		esi->repeat_rate = 0;
+	}
+	return priv;
+}
+#endif
+
+#ifndef GPAC_DISABLE_SENG
+
+static u32 seng_output(void *param)
+{
+	GF_Err e;
+	u64 last_src_modif, mod_time;
+	M2TSSource *source = (M2TSSource *)param;
+	GF_SceneEngine *seng = source->seng;
+#ifndef GPAC_DISABLE_PLAYER
+	GF_SimpleDataDescriptor *audio_desc;
+#endif
+	Bool update_context=0;
+	Bool force_rap, adjust_carousel_time, discard_pending, signal_rap, signal_critical, version_inc, aggregate_au;
+	u32 period, ts_delta;
+	u16 es_id, aggregate_on_stream;
+	e = GF_OK;
+	gf_sleep(2000); /*TODO: events instead? What are we waiting for?*/
+	gf_seng_encode_context(seng, SampleCallBack);
+
+	last_src_modif = source->bifs_src_name ? gf_file_modification_time(source->bifs_src_name) : 0;
+
+	/*send the audio descriptor*/
+#ifndef GPAC_DISABLE_PLAYER
+	if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL && audio_OD_stream_id!=(u32)-1) {
+		audio_desc = source->streams[audio_OD_stream_id].input_udta;
+		if (audio_desc && audio_desc->data) /*RTP/UDP + MP3 case*/
+		{
+			assert(audio_OD_stream_id != (u32)-1);
+			assert(!aac_reader); /*incompatible with AAC*/
+			source->repeat = 1;
+			SampleCallBack(source, AUDIO_OD_ESID, audio_desc->data, audio_desc->size, 0/*gf_m2ts_get_sys_clock(muxer)*/);
+			source->repeat = 0;
+			gf_free(audio_desc->data);
+			gf_free(audio_desc);
+			source->streams[audio_OD_stream_id].input_udta = NULL;
+		}
+	}
+#endif
+
+	while (run) {
+		if (!gf_prompt_has_input()) {
+			if (source->bifs_src_name) {
+				mod_time = gf_file_modification_time(source->bifs_src_name);
+				if (mod_time != last_src_modif) {
+					FILE *srcf;
+					char flag_buf[201], *flag;
+					fprintf(stderr, "Update file modified - processing\n");
+					last_src_modif = mod_time;
+
+					srcf = gf_fopen(source->bifs_src_name, "rt");
+					if (!srcf) continue;
+
+					/*checks if we have a broadcast config*/
+					if (!fgets(flag_buf, 200, srcf))
+						flag_buf[0] = '\0';
+					gf_fclose(srcf);
+
+					aggregate_au = force_rap = adjust_carousel_time = discard_pending = signal_rap = signal_critical = 0;
+					version_inc = 1;
+					period = -1;
+					aggregate_on_stream = -1;
+					ts_delta = 0;
+					es_id = 0;
+
+					/*find our keyword*/
+					flag = strstr(flag_buf, "gpac_broadcast_config ");
+					if (flag) {
+						flag += strlen("gpac_broadcast_config ");
+						/*move to next word*/
+						while (flag && (flag[0]==' ')) flag++;
+
+						while (1) {
+							char *sep = strchr(flag, ' ');
+							if (sep) sep[0] = 0;
+							if (!strnicmp(flag, "esid=", 5)) {
+								/*ESID on which the update is applied*/
+								es_id = atoi(flag+5);
+							} else if (!strnicmp(flag, "period=", 7)) {
+								/*TODO: target period carousel for ESID ??? (ESID/carousel)*/
+								period = atoi(flag+7);
+							} else if (!strnicmp(flag, "ts=", 3)) {
+								/*TODO: */
+								ts_delta = atoi(flag+3);
+							} else if (!strnicmp(flag, "carousel=", 9)) {
+								/*TODO: why? => sends the update on carousel id specified by this argument*/
+								aggregate_on_stream = atoi(flag+9);
+							} else if (!strnicmp(flag, "restamp=", 8)) {
+								/*CTS is updated when carouselled*/
+								adjust_carousel_time = atoi(flag+8);
+							} else if (!strnicmp(flag, "discard=", 8)) {
+								/*when we receive several updates during a single carousel period, this attribute specifies whether the current update discard pending ones*/
+								discard_pending = atoi(flag+8);
+							} else if (!strnicmp(flag, "aggregate=", 10)) {
+								/*Boolean*/
+								aggregate_au = atoi(flag+10);
+							} else if (!strnicmp(flag, "force_rap=", 10)) {
+								/*TODO: */
+								force_rap = atoi(flag+10);
+							} else if (!strnicmp(flag, "rap=", 4)) {
+								/*TODO: */
+								signal_rap = atoi(flag+4);
+							} else if (!strnicmp(flag, "critical=", 9)) {
+								/*TODO: */
+								signal_critical = atoi(flag+9);
+							} else if (!strnicmp(flag, "vers_inc=", 9)) {
+								/*Boolean to increment m2ts section version number*/
+								version_inc = atoi(flag+9);
+							}
+							if (sep) {
+								sep[0] = ' ';
+								flag = sep+1;
+							} else {
+								break;
+							}
+						}
+
+						set_broadcast_params(source, es_id, period, ts_delta, aggregate_on_stream, adjust_carousel_time, force_rap, aggregate_au, discard_pending, signal_rap, signal_critical, version_inc);
+					}
+
+					e = gf_seng_encode_from_file(seng, es_id, aggregate_au ? 0 : 1, source->bifs_src_name, SampleCallBack);
+					if (e) {
+						fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
+					} else
+						gf_seng_aggregate_context(seng, 0);
+
+					update_context=1;
+
+
+
+				}
+			}
+			if (update_context) {
+				source->repeat = 1;
+				e = gf_seng_encode_context(seng, SampleCallBack);
+				source->repeat = 0;
+				update_context = 0;
+			}
+
+			gf_sleep(10);
+		} else { /*gf_prompt_has_input()*/
+			char c = gf_prompt_get_char();
+			switch (c) {
+			case 'u':
+			{
+				GF_Err e;
+				char szCom[8192];
+				fprintf(stderr, "Enter command to send:\n");
+				fflush(stdin);
+				szCom[0] = 0;
+				if (1 > scanf("%[^\t\n]", szCom)) {
+					fprintf(stderr, "No command has been properly entered, aborting.\n");
+					break;
+				}
+				e = gf_seng_encode_from_string(seng, 0, 0, szCom, SampleCallBack);
+				if (e) {
+					fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
+				}
+				update_context=1;
+			}
+			break;
+			case 'p':
+			{
+				char rad[GF_MAX_PATH];
+				fprintf(stderr, "Enter output file name - \"std\" for stderr: ");
+				if (1 > scanf("%s", rad)) {
+					fprintf(stderr, "No outfile name has been entered, aborting.\n");
+					break;
+				}
+				e = gf_seng_save_context(seng, !strcmp(rad, "std") ? NULL : rad);
+				fprintf(stderr, "Dump done (%s)\n", gf_error_to_string(e));
+			}
+			break;
+			case 'q':
+			{
+				run = 0;
+			}
+			}
+			e = GF_OK;
+		}
+	}
+
+
+	return e ? 1 : 0;
+}
+
+void fill_seng_es_ifce(GF_ESInterface *ifce, u32 i, GF_SceneEngine *seng, u32 period)
+{
+	GF_Err e = GF_OK;
+	u32 len;
+	GF_ESIStream *stream;
+	char *config_buffer = NULL;
+
+	memset(ifce, 0, sizeof(GF_ESInterface));
+	e = gf_seng_get_stream_config(seng, i, (u16*) &(ifce->stream_id), &config_buffer, &len, (u32*) &(ifce->stream_type), (u32*) &(ifce->object_type_indication), &(ifce->timescale));
+	if (e) {
+		fprintf(stderr, "Cannot set the stream config for stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
+	}
+
+	ifce->repeat_rate = period;
+	GF_SAFEALLOC(stream, GF_ESIStream);
+	if (!stream) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate SENG input handler\n"));
+		return;
+	}
+
+	stream->rap = 1;
+	if (ifce->input_udta)
+		gf_free(ifce->input_udta);
+	ifce->input_udta = stream;
+
+	//fprintf(stderr, "Caroussel period: %d\n", period);
+//	e = gf_seng_set_carousel_time(seng, ifce->stream_id, period);
+	if (e) {
+		fprintf(stderr, "Cannot set carousel time on stream %d to %d: %s\n", ifce->stream_id, period, gf_error_to_string(e));
+	}
+	ifce->input_ctrl = seng_input_ctrl;
+
+}
+#endif
+
+static Bool open_source(M2TSSource *source, char *src, u32 carousel_rate, u32 mpeg4_signaling, char *update, char *audio_input_ip, u16 audio_input_port, char *video_buffer, Bool force_real_time, u32 bifs_use_pes, const char *temi_url, Bool compute_max_size, Bool insert_ntp)
+{
+#ifndef GPAC_DISABLE_STREAMING
+	GF_SDPInfo *sdp;
+#endif
+
+	memset(source, 0, sizeof(M2TSSource));
+	source->mpeg4_signaling = mpeg4_signaling;
+
+	/*open ISO file*/
+#ifndef GPAC_DISABLE_ISOM
+	if (gf_isom_probe_file(src)) {
+		u32 i;
+		u32 nb_tracks;
+		Bool has_bifs_od = 0;
+		Bool temi_assigned = 0;
+		u32 first_audio = 0;
+		u32 first_other = 0;
+		s64 min_offset = 0;
+		u32 min_offset_timescale = 0;
+		source->mp4 = gf_isom_open(src, GF_ISOM_OPEN_READ, 0);
+		if (!source->mp4)
+			return GF_FALSE;
+		source->nb_streams = 0;
+		source->real_time = force_real_time;
+		/*on MPEG-2 TS, carry 3GPP timed text as MPEG-4 Part17*/
+		gf_isom_text_set_streaming_mode(source->mp4, 1);
+		nb_tracks = gf_isom_get_track_count(source->mp4);
+
+		for (i=0; i<nb_tracks; i++) {
+			Bool check_deps = 0;
+			if (gf_isom_get_media_type(source->mp4, i+1) == GF_ISOM_MEDIA_HINT)
+				continue;
+
+			fill_isom_es_ifce(source, &source->streams[i], source->mp4, i+1, bifs_use_pes, compute_max_size);
+			if (!source->streams[i].input_udta) continue;
+			if (min_offset > ((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset) {
+				min_offset = ((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset;
+				min_offset_timescale = source->streams[i].timescale;
+			}
+
+			switch(source->streams[i].stream_type) {
+			case GF_STREAM_OD:
+				has_bifs_od = 1;
+				source->streams[i].repeat_rate = carousel_rate;
+				break;
+			case GF_STREAM_SCENE:
+				has_bifs_od = 1;
+				source->streams[i].repeat_rate = carousel_rate;
+				break;
+			case GF_STREAM_VISUAL:
+				/*turn on image repeat*/
+				switch (source->streams[i].object_type_indication) {
+				case GF_CODECID_JPEG:
+				case GF_CODECID_PNG:
+					((GF_ESIMP4 *)source->streams[i].input_udta)->image_repeat_ms = carousel_rate;
+					break;
+				default:
+					check_deps = 1;
+					if (gf_isom_get_sample_count(source->mp4, i+1)>1) {
+						/*get first visual stream as PCR*/
+						if (!source->pcr_idx) {
+							source->pcr_idx = i+1;
+							if ((temi_id_1>=0) || (temi_id_2>=0)) {
+								temi_assigned = GF_TRUE;
+								((GF_ESIMP4 *)source->streams[i].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
+								((GF_ESIMP4 *)source->streams[i].input_udta)->insert_ntp = insert_ntp;
+
+								if (temi_url && (temi_id_1>=0))
+									((GF_ESIMP4 *)source->streams[i].input_udta)->temi_url = temi_url;
+
+								if (temi_id_1>=0) temi_id_1 = -1;
+								else temi_id_2 = -1;
+							}
+						}
+					}
+					break;
+				}
+				break;
+			case GF_STREAM_AUDIO:
+				if (!first_audio) first_audio = i+1;
+				check_deps = 1;
+				break;
+			default:
+				/*log not supported stream type: %s*/
+				break;
+			}
+			source->nb_streams++;
+			if (gf_isom_get_sample_count(source->mp4, i+1)>1) first_other = i+1;
+
+			if (check_deps) {
+				u32 k;
+				Bool found_dep = 0;
+				for (k=0; k<nb_tracks; k++) {
+					if (gf_isom_get_media_type(source->mp4, k+1) != GF_ISOM_MEDIA_OD)
+						continue;
+
+					/*this stream is not refered to by any OD, send as regular PES*/
+					if (gf_isom_has_track_reference(source->mp4, k+1, GF_ISOM_REF_OD, gf_isom_get_track_id(source->mp4, i+1) )==1) {
+						found_dep = 1;
+						break;
+					}
+				}
+				if (!found_dep) {
+					source->streams[i].caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
+				}
+			}
+		}
+		if (has_bifs_od && !source->mpeg4_signaling) source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+		if ( !temi_assigned && first_audio && ((temi_id_1>=0) || (temi_id_2>=0) ) ) {
+			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->timeline_id = (u32) ( (temi_id_1>=0) ? temi_id_1 + 1 : temi_id_2 + 1 );
+			((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->insert_ntp = insert_ntp;
+
+			if (temi_url && (temi_id_1>=0) )
+				((GF_ESIMP4 *)source->streams[first_audio-1].input_udta)->temi_url = temi_url;
+
+			if (temi_id_1>=0) temi_id_1 = -1;
+			else temi_id_2 = -1;
+		}
+
+		/*if no visual PCR found, use first audio*/
+		if (!source->pcr_idx) source->pcr_idx = first_audio;
+		if (!source->pcr_idx) source->pcr_idx = first_other;
+		if (source->pcr_idx) {
+			GF_ESIMP4 *priv;
+			source->pcr_idx-=1;
+			priv = source->streams[source->pcr_idx].input_udta;
+			gf_isom_set_default_sync_track(source->mp4, priv->track);
+		}
+
+		if (min_offset < 0) {
+			for (i=0; i<source->nb_streams; i++) {
+				Double scale = source->streams[i].timescale;
+				scale /= min_offset_timescale;
+				((GF_ESIMP4 *)source->streams[i].input_udta)->ts_offset += (s64) (-min_offset * scale);
+			}
+		}
+
+		source->iod = gf_isom_get_root_od(source->mp4);
+		if (source->iod) {
+			GF_ObjectDescriptor*iod = (GF_ObjectDescriptor*)source->iod;
+			if (gf_list_count( ((GF_ObjectDescriptor*)source->iod)->ESDescriptors) == 0) {
+				gf_odf_desc_del(source->iod);
+				source->iod = NULL;
+			} else {
+				fprintf(stderr, "IOD found for program %s\n", src);
+
+				/*if using 4over2, get rid of OD tracks*/
+				if (source->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_SCENE) {
+					for (i=0; i<gf_list_count(iod->ESDescriptors); i++) {
+						u32 track_num, k;
+						GF_M2TSDescriptor *oddesc;
+						GF_ISOSample *sample;
+						GF_ESD *esd = gf_list_get(iod->ESDescriptors, i);
+						if (esd->decoderConfig->streamType!=GF_STREAM_OD) continue;
+						track_num = gf_isom_get_track_by_id(source->mp4, esd->ESID);
+						if (gf_isom_get_sample_count(source->mp4, track_num)>1) continue;
+
+						sample = gf_isom_get_sample(source->mp4, track_num, 1, NULL);
+						if (sample->dataLength >= 255-2) {
+							gf_isom_sample_del(&sample);
+							continue;
+						}
+						/*rewrite ESD dependencies*/
+						for (k=0; k<gf_list_count(iod->ESDescriptors); k++) {
+							GF_ESD *dep_esd = gf_list_get(iod->ESDescriptors, k);
+							if (dep_esd->dependsOnESID==esd->ESID) dep_esd->dependsOnESID = esd->dependsOnESID;
+						}
+
+						for (k=0; k<source->nb_streams; k++) {
+							if (source->streams[k].stream_id==esd->ESID) {
+								source->streams[k].stream_type = 0;
+								break;
+							}
+						}
+
+						if (!source->od_updates) source->od_updates = gf_list_new();
+						GF_SAFEALLOC(oddesc, GF_M2TSDescriptor);
+						oddesc->data_len = sample->dataLength;
+						oddesc->data = sample->data;
+						oddesc->tag = GF_M2TS_MPEG4_ODUPDATE_DESCRIPTOR;
+						sample->data = NULL;
+						gf_isom_sample_del(&sample);
+						gf_list_add(source->od_updates, oddesc);
+
+						gf_list_rem(iod->ESDescriptors, i);
+						i--;
+						gf_odf_desc_del((GF_Descriptor *) esd);
+						source->samples_count--;
+					}
+				}
+
+			}
+		}
+		return 1;
+	}
+#endif
+
+
+#ifndef GPAC_DISABLE_STREAMING
+	/*open SDP file*/
+	if (strstr(src, ".sdp")) {
+		GF_X_Attribute *att;
+		char *sdp_buf;
+		u32 sdp_size, i;
+		GF_Err e;
+
+		e = gf_file_load_data(src, (u8 **) &sdp_buf, &sdp_size);
+		if (e) {
+			fprintf(stderr, "Error opening %s\n", src);
+			return 0;
+		}
+
+		sdp = gf_sdp_info_new();
+		e = gf_sdp_info_parse(sdp, sdp_buf, sdp_size);
+		gf_free(sdp_buf);
+		if (e) {
+			fprintf(stderr, "Error opening %s : %s\n", src, gf_error_to_string(e));
+			gf_sdp_info_del(sdp);
+			return 0;
+		}
+
+		i=0;
+		while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
+			char buf[2000];
+			u32 size;
+			char *buf64;
+			u32 size64;
+			char *iod_str;
+			if (strcmp(att->Name, "mpeg4-iod") ) continue;
+			iod_str = att->Value + 1;
+			if (strnicmp(iod_str, "data:application/mpeg4-iod;base64", strlen("data:application/mpeg4-iod;base64"))) continue;
+
+			buf64 = strstr(iod_str, ",");
+			if (!buf64) break;
+			buf64 += 1;
+			size64 = (u32) strlen(buf64) - 1;
+			size = gf_base64_decode(buf64, size64, buf, 2000);
+
+			gf_odf_desc_read(buf, size, &source->iod);
+			break;
+		}
+
+		source->nb_streams = gf_list_count(sdp->media_desc);
+		for (i=0; i<source->nb_streams; i++) {
+			GF_SDPMedia *media = gf_list_get(sdp->media_desc, i);
+			fill_rtp_es_ifce(&source->streams[i], media, sdp, source);
+			switch(source->streams[i].stream_type) {
+			case GF_STREAM_OD:
+			case GF_STREAM_SCENE:
+				source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+				source->streams[i].repeat_rate = carousel_rate;
+				break;
+			}
+			if (!source->pcr_idx && (source->streams[i].stream_type == GF_STREAM_VISUAL)) {
+				source->pcr_idx = i+1;
+			}
+		}
+
+		if (source->pcr_idx) source->pcr_idx-=1;
+		gf_sdp_info_del(sdp);
+
+		return 2;
+	} else
+#endif /*GPAC_DISABLE_STREAMING*/
+
+#ifndef GPAC_DISABLE_SENG
+		if (strstr(src, ".bt")) //open .bt file
+		{
+			u32 i;
+			u32 load_type=0;
+			source->seng = gf_seng_init(source, src, load_type, NULL, (load_type == GF_SM_LOAD_DIMS) ? 1 : 0);
+			if (!source->seng) {
+				fprintf(stderr, "Cannot create scene engine\n");
+				exit(1);
+			}
+			else {
+				fprintf(stderr, "Scene engine created.\n");
+			}
+			assert( source );
+			assert( source->seng);
+			source->iod = gf_seng_get_iod(source->seng);
+			if (! source->iod) {
+				fprintf(stderr, __FILE__": No IOD\n");
+			}
+
+			source->nb_streams = gf_seng_get_stream_count(source->seng);
+			source->rate = carousel_rate;
+			source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+
+			for (i=0; i<source->nb_streams; i++) {
+				fill_seng_es_ifce(&source->streams[i], i, source->seng, source->rate);
+				//fprintf(stderr, "Fill interface\n");
+				if (!source->pcr_idx && (source->streams[i].stream_type == GF_STREAM_AUDIO)) {
+					source->pcr_idx = i+1;
+				}
+			}
+
+#ifndef GPAC_DISABLE_PLAYER
+			/*when an audio input is present, declare it and store OD + ESD_U*/
+			if (audio_input_ip) {
+				/*add the audio program*/
+				source->pcr_idx = source->nb_streams;
+				source->streams[source->nb_streams].stream_type = GF_STREAM_AUDIO;
+				/*hack: http urls are not decomposed therefore audio_input_port remains null*/
+				if (audio_input_port) {	/*UDP/RTP*/
+					source->streams[source->nb_streams].object_type_indication = GF_CODECID_MPEG_AUDIO;
+				} else { /*HTTP*/
+					aac_reader->oti = source->streams[source->nb_streams].object_type_indication = GF_CODECID_AAC_MPEG4;
+				}
+				source->streams[source->nb_streams].input_ctrl = void_input_ctrl;
+				source->streams[source->nb_streams].stream_id = AUDIO_DATA_ESID;
+				source->streams[source->nb_streams].timescale = 1000;
+
+				GF_SAFEALLOC(source->streams[source->nb_streams].input_udta, GF_ESIStream);
+				if (!source->streams[source->nb_streams].input_udta) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate audio input handler\n"));
+					return 0;
+				}
+
+				((GF_ESIStream*)source->streams[source->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every audio update*/
+				assert( source );
+				//assert( source->iod);
+				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
+					/*create the descriptor*/
+					GF_ESD *esd;
+					GF_SimpleDataDescriptor *audio_desc;
+					GF_SAFEALLOC(audio_desc, GF_SimpleDataDescriptor);
+					if (audio_input_port) {	/*UDP/RTP*/
+						esd = gf_odf_desc_esd_new(0);
+						esd->decoderConfig->streamType = source->streams[source->nb_streams].stream_type;
+						esd->decoderConfig->objectTypeIndication = source->streams[source->nb_streams].object_type_indication;
+					} else {				/*HTTP*/
+						esd = AAC_GetESD(aac_reader);		/*in case of AAC, we have to wait the first ADTS chunk*/
+					}
+					assert( esd );
+					esd->ESID = source->streams[source->nb_streams].stream_id;
+					if (esd->slConfig->timestampResolution) /*in case of AAC, we have to wait the first ADTS chunk*/
+						encode_audio_desc(esd, audio_desc);
+					else
+						gf_odf_desc_del((GF_Descriptor *)esd);
+
+					/*find the audio OD stream and attach its descriptor*/
+					for (i=0; i<source->nb_streams; i++) {
+						if (source->streams[i].stream_id == AUDIO_OD_ESID) {
+							if (source->streams[i].input_udta)
+								gf_free(source->streams[i].input_udta);
+							source->streams[i].input_udta = (void*)audio_desc;	/*Hack: the real input_udta type (for our SampleCallBack function) is GF_ESIStream*/
+							audio_OD_stream_id = i;
+							break;
+						}
+					}
+					if (audio_OD_stream_id == (u32)-1) {
+						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
+						return 0;
+					}
+				} else {
+					source->mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
+				}
+				source->nb_streams++;
+			}
+#endif
+
+			/*when an audio input is present, declare it and store OD + ESD_U*/
+			if (video_buffer) {
+				/*add the video program*/
+				source->streams[source->nb_streams].stream_type = GF_STREAM_VISUAL;
+				source->streams[source->nb_streams].object_type_indication = GF_CODECID_AVC;
+				source->streams[source->nb_streams].input_ctrl = void_input_ctrl;
+				source->streams[source->nb_streams].stream_id = VIDEO_DATA_ESID;
+				source->streams[source->nb_streams].timescale = 1000;
+
+				GF_SAFEALLOC(source->streams[source->nb_streams].input_udta, GF_ESIStream);
+				if (!source->streams[source->nb_streams].input_udta) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to allocate video input handler\n"));
+					return 0;
+				}
+				((GF_ESIStream*)source->streams[source->nb_streams].input_udta)->vers_inc = 1;	/*increment version number at every video update*/
+				assert(source);
+
+				if (source->iod && ((source->iod->tag!=GF_ODF_IOD_TAG) || (mpeg4_signaling != GF_M2TS_MPEG4_SIGNALING_SCENE))) {
+					assert(0); /*TODO*/
+#if 0
+					/*create the descriptor*/
+					GF_ESD *esd;
+					GF_SimpleDataDescriptor *video_desc;
+					GF_SAFEALLOC(video_desc, GF_SimpleDataDescriptor);
+					esd = gf_odf_desc_esd_new(0);
+					esd->decoderConfig->streamType = source->streams[source->nb_streams].stream_type;
+					esd->decoderConfig->objectTypeIndication = source->streams[source->nb_streams].object_type_indication;
+					esd->ESID = source->streams[source->nb_streams].stream_id;
+
+					/*find the audio OD stream and attach its descriptor*/
+					for (i=0; i<source->nb_streams; i++) {
+						if (source->streams[i].stream_id == 103/*TODO: VIDEO_OD_ESID*/) {
+							if (source->streams[i].input_udta)
+								gf_free(source->streams[i].input_udta);
+							source->streams[i].input_udta = (void*)video_desc;
+							audio_OD_stream_id = i;
+							break;
+						}
+					}
+					if (audio_OD_stream_id == (u32)-1) {
+						fprintf(stderr, "Error: could not find an audio OD stream with ESID=100 in '%s'\n", src);
+						return 0;
+					}
+#endif
+				} else {
+					assert (source->mpeg4_signaling == GF_M2TS_MPEG4_SIGNALING_SCENE);
+				}
+
+				source->nb_streams++;
+			}
+
+			if (!source->pcr_idx) source->pcr_idx=1;
+			source->th = gf_th_new("Carousel");
+			source->bifs_src_name = update;
+			gf_th_run(source->th, seng_output, source);
+			return 1;
+		} else
+#endif
+		{
+			FILE *f = gf_fopen(src, "rt");
+			if (f) {
+				gf_fclose(f);
+				fprintf(stderr, "Error opening %s - not a supported input media, skipping.\n", src);
+			} else {
+				fprintf(stderr, "Error opening %s - no such file.\n", src);
+			}
+			return 0;
+		}
+}
+
+#ifdef GPAC_MEMORY_TRACKING
+GF_MemTrackerType mem_track = GF_MemTrackerNone;
+#endif
+
+/*macro to keep retro compatibility with '=' and spaces in parse_args*/
+#define CHECK_PARAM(param) (!strnicmp(arg, param, strlen(param)) \
+        && (   ((arg[strlen(param)] == '=') && (next_arg = arg+strlen(param)+1)) \
+            || ((strlen(arg) == strlen(param)) && ++i && (i<argc) && (next_arg = argv[i]))))
+
+/*parse MP42TS arguments*/
+static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, s64 *pcr_init_val, u32 *pcr_offset, u32 *psi_refresh_rate, GF_M2TS_PackMode *pes_packing_mode, u32 *bifs_use_pes,
+                                  M2TSSource *sources, u32 *nb_sources, char **bifs_src_name,
+                                  Bool *real_time, u32 *run_time, char **video_buffer, u32 *video_buffer_size,
+                                  u32 *audio_input_type, char **audio_input_ip, u16 *audio_input_port,
+                                  u32 *output_type, char **ts_out, char **udp_out, char **rtp_out, u16 *output_port,
+                                  char** segment_dir, u32 *segment_duration, char **segment_manifest, u32 *segment_number, char **segment_http_prefix, u32 *split_rap, u32 *nb_pck_pack, u32 *pcr_ms, u32 *ttl, const char **ip_ifce, const char **temi_url, u32 *sdt_refresh_rate, Bool *enable_forced_pcr)
+{
+	Bool rate_found=0, mpeg4_carousel_found=0, time_found=0, src_found=0, dst_found=0, audio_input_found=0, video_input_found=0,
+	     seg_dur_found=0, seg_dir_found=0, seg_manifest_found=0, seg_number_found=0, seg_http_found=0, real_time_found=0, insert_ntp=0;
+	char *arg = NULL, *next_arg = NULL, *error_msg = "no argument found";
+	u32 mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_NONE;
+	Bool force_real_time = 0;
+	s32 i;
+
+	/*first pass: find audio - NO GPAC INIT MODIFICATION MUST OCCUR IN THIS PASS*/
+	for (i=1; i<argc; i++) {
+		arg = argv[i];
+		if (!stricmp(arg, "-h") || strstr(arg, "-help")) {
+			usage();
+			return GF_EOS;
+		}
+		else if (!stricmp(arg, "-hc") ) {
+			fprintf(stderr, "libgpac options:\n");
+			gf_sys_print_core_help(GF_ARGMODE_ALL, 0);
+			return GF_EOS;
+		}
+		else if (CHECK_PARAM("-pcr-init")) {
+			sscanf(next_arg, LLD, pcr_init_val);
+		}
+		else if (CHECK_PARAM("-pcr-offset")) {
+			*pcr_offset = atoi(next_arg);
+		}
+		else if (CHECK_PARAM("-video")) {
+			GF_Err e;
+			if (video_input_found) {
+				error_msg = "multiple '-video' found";
+				arg = NULL;
+				goto error;
+			}
+			video_input_found = 1;
+			e = gf_file_load_data(next_arg, (u8 **) video_buffer, video_buffer_size);
+			if (e) {
+				fprintf(stderr, "Error while reading video file %s\n", next_arg);
+				goto error;
+			}
+		} else if (CHECK_PARAM("-audio")) {
+			if (audio_input_found) {
+				error_msg = "multiple '-audio' found";
+				arg = NULL;
+				goto error;
+			}
+			audio_input_found = 1;
+			if (!strnicmp(next_arg, "udp://", 6) || !strnicmp(next_arg, "rtp://", 6) || !strnicmp(next_arg, "http://", 7)) {
+				char *sep;
+				/*set audio input type*/
+				if (!strnicmp(next_arg, "udp://", 6))
+					*audio_input_type = GF_MP42TS_UDP;
+				else if (!strnicmp(next_arg, "rtp://", 6))
+					*audio_input_type = GF_MP42TS_RTP;
+#ifndef GPAC_DISABLE_PLAYER
+				else if (!strnicmp(next_arg, "http://", 7))
+					*audio_input_type = GF_MP42TS_HTTP;
+#endif
+				/*http needs to get the complete URL*/
+				switch(*audio_input_type) {
+				case GF_MP42TS_UDP:
+				case GF_MP42TS_RTP:
+					sep = strchr(next_arg+6, ':');
+					*real_time=1;
+					if (sep) {
+						*audio_input_port = atoi(sep+1);
+						sep[0]=0;
+						*audio_input_ip = gf_strdup(next_arg+6);
+						sep[0]=':';
+					} else {
+						*audio_input_ip = gf_strdup(next_arg+6);
+					}
+					break;
+#ifndef GPAC_DISABLE_PLAYER
+				case GF_MP42TS_HTTP:
+					/* No need to dup since it may come from argv */
+					*audio_input_ip = next_arg;
+					assert(audio_input_port != 0);
+					break;
+#endif
+				default:
+					assert(0);
+				}
+			}
+		} else if (CHECK_PARAM("-psi-rate")) {
+			*psi_refresh_rate = atoi(next_arg);
+		} else if (!stricmp(arg, "-bifs-pes")) {
+			*bifs_use_pes = 1;
+		} else if (!stricmp(arg, "-bifs-pes-ex")) {
+			*bifs_use_pes = 2;
+		} else if (!stricmp(arg, "-mpeg4") || !stricmp(arg, "-4on2")) {
+			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
+		} else if (!stricmp(arg, "-4over2")) {
+			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_SCENE;
+		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
+#ifdef GPAC_MEMORY_TRACKING
+			gf_sys_close();
+            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
+			gf_sys_init(mem_track, NULL);
+			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
+#endif
+		} else if (CHECK_PARAM("-rate")) {
+			if (rate_found) {
+				error_msg = "multiple '-rate' found";
+				arg = NULL;
+				goto error;
+			}
+			rate_found = 1;
+			*mux_rate = 1000*atoi(next_arg);
+		} else if (CHECK_PARAM("-mpeg4-carousel")) {
+			if (mpeg4_carousel_found) {
+				error_msg = "multiple '-mpeg4-carousel' found";
+				arg = NULL;
+				goto error;
+			}
+			mpeg4_carousel_found = 1;
+			*carrousel_rate = atoi(next_arg);
+		} else if (!strnicmp(arg, "-real-time", 10)) {
+			if (real_time_found) {
+				goto error;
+			}
+			real_time_found = 1;
+			*real_time = 1;
+		} else if (CHECK_PARAM("-time")) {
+			if (time_found) {
+				error_msg = "multiple '-time' found";
+				arg = NULL;
+				goto error;
+			}
+			time_found = 1;
+			*run_time = atoi(next_arg);
+		} else if (!stricmp(arg, "-single-au")) {
+			*pes_packing_mode = GF_M2TS_PACK_NONE;
+		} else if (!stricmp(arg, "-multi-au")) {
+			*pes_packing_mode = GF_M2TS_PACK_ALL;
+		} else if (!stricmp(arg, "-rap")) {
+			*split_rap = 1;
+		} else if (!stricmp(arg, "-flush-rap")) {
+			*split_rap = 2;
+		} else if (!stricmp(arg, "-force-pcr-only")) {
+			*enable_forced_pcr = GF_TRUE;
+		} else if (CHECK_PARAM("-nb-pack")) {
+			*nb_pck_pack = atoi(next_arg);
+		} else if (CHECK_PARAM("-nb-pck")) {
+			*nb_pck_pack = atoi(next_arg);
+		} else if (CHECK_PARAM("-pcr-ms")) {
+			*pcr_ms = atoi(next_arg);
+		} else if (CHECK_PARAM("-ttl")) {
+			*ttl = atoi(next_arg);
+		} else if (CHECK_PARAM("-ifce")) {
+			*ip_ifce = next_arg;
+		} else if (CHECK_PARAM("-sdt-rate")) {
+			*sdt_refresh_rate = atoi(next_arg);
+		} else if (CHECK_PARAM("-segment-dir")) {
+			if (seg_dir_found) {
+				goto error;
+			}
+			seg_dir_found = 1;
+			*segment_dir = next_arg;
+			/* TODO: add the path separation char, if missing */
+		} else if (CHECK_PARAM("-segment-duration")) {
+			if (seg_dur_found) {
+				goto error;
+			}
+			seg_dur_found = 1;
+			*segment_duration = atoi(next_arg);
+		} else if (CHECK_PARAM("-segment-manifest")) {
+			if (seg_manifest_found) {
+				goto error;
+			}
+			seg_manifest_found = 1;
+			*segment_manifest = next_arg;
+		} else if (CHECK_PARAM("-segment-http-prefix")) {
+			if (seg_http_found) {
+				goto error;
+			}
+			seg_http_found = 1;
+			*segment_http_prefix = next_arg;
+		} else if (CHECK_PARAM("-segment-number")) {
+			if (seg_number_found) {
+				goto error;
+			}
+			seg_number_found = 1;
+			*segment_number = atoi(next_arg);
+		}
+		else if (CHECK_PARAM("-bifs-src")) {
+			if (src_found) {
+				error_msg = "multiple '-bifs-src' found";
+				arg = NULL;
+				goto error;
+			}
+			src_found = 1;
+			*bifs_src_name = next_arg;
+		} else if (CHECK_PARAM("-dst-file")) {
+			dst_found = 1;
+			*ts_out = gf_strdup(next_arg);
+		} else if (CHECK_PARAM("-temi")) {
+			if (next_arg[0]=='-') {
+				*temi_url = NULL;
+				i--;
+				temi_id_1 = 150;
+			} else {
+				u32 temi_id = 0;
+				if (sscanf(next_arg, "%d", &temi_id) == 1) {
+					if (temi_id < 0x80 || temi_id>0xFF) {
+						fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
+						return GF_BAD_PARAM;
+					}
+				}
+				if (!temi_id) {
+					*temi_url = next_arg;
+					if (strlen(next_arg) > 150) {
+						fprintf(stderr, "URLs longer than 150 bytes are not currently supported\n");
+						return GF_NOT_SUPPORTED;
+					}
+					temi_id_1 = 0;
+				} else {
+					temi_id_1 = temi_id;
+					*temi_url = NULL;
+				}
+			}
+		} else if (CHECK_PARAM("-temi2")) {
+			u32 temi_id = 0;
+			if (next_arg[0]=='-') {
+				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
+				return GF_BAD_PARAM;
+			}
+			if (sscanf(next_arg, "%d", &temi_id) == 1) {
+				if (temi_id < 0x80 || temi_id>0xFF) {
+					fprintf(stderr, "TEMI external timeline IDs shall be in the range [0x80, 0xFF], but %d was specified\n", temi_id);
+					return GF_BAD_PARAM;
+				}
+				temi_id_2 = temi_id;
+			} else {
+				fprintf(stderr, "No ID for secondary external TEMI timeline specified\n");
+				return GF_BAD_PARAM;
+			}
+		} else if (CHECK_PARAM("-temi-delay")) {
+			temi_url_insertion_delay = atoi(next_arg);
+		} else if (CHECK_PARAM("-temi-offset")) {
+			temi_offset = atoi(next_arg);
+		} else if (!stricmp(arg, "-temi-noloop")) {
+			temi_disable_loop = 1;
+		} else if (!stricmp(arg, "-temi-off")) {
+			temi_on = GF_FALSE;
+		} else if (CHECK_PARAM("-temi-period")) {
+			temi_period = atof(next_arg);
+			if (temi_period<0) {
+				temi_period *= -1;
+				temi_single_toggle = GF_TRUE;
+			}
+		} else if (!stricmp(arg, "-insert-ntp")) {
+			insert_ntp = GF_TRUE;
+		}
+		else if (CHECK_PARAM("-dst-udp")) {
+			char *sep = strchr(next_arg, ':');
+			dst_found = 1;
+			*real_time=1;
+			if (sep) {
+				*output_port = atoi(sep+1);
+				sep[0]=0;
+				*udp_out = gf_strdup(next_arg);
+				sep[0]=':';
+			} else {
+				*udp_out = gf_strdup(next_arg);
+			}
+		}
+		else if (CHECK_PARAM("-dst-rtp")) {
+			char *sep = strchr(next_arg, ':');
+			dst_found = 1;
+			*real_time=1;
+			if (sep) {
+				*output_port = atoi(sep+1);
+				sep[0]=0;
+				*rtp_out = gf_strdup(next_arg);
+				sep[0]=':';
+			} else {
+				*rtp_out = gf_strdup(next_arg);
+			}
+		} else if (CHECK_PARAM("-src")) { //second pass arguments
+		} else if (CHECK_PARAM("-prog")) { //second pass arguments
+		} else {
+			u32 res = gf_sys_is_gpac_arg(arg);
+			if (!res) {
+				error_msg = "unknown option";
+				goto error;
+			} else if (res==2) {
+				if (!strchr(arg, '=')) i++;
+			}
+		}
+	}
+	
+	if (*real_time) force_real_time = 1;
+	rate_found = 1;
+
+	/*second pass: open sources*/
+	for (i=1; i<argc; i++) {
+		u32 res;
+		char *src_args;
+		arg = argv[i];
+		if (arg[0] !='-') continue;
+
+		if (! CHECK_PARAM("-src") && ! CHECK_PARAM("-prog") ) continue;
+
+		src_args = strchr(next_arg, ':');
+		if (src_args && (src_args[1]=='\\')) {
+			src_args = strchr(src_args+2, ':');
+		}
+		if (src_args) {
+			src_args[0] = 0;
+			src_args = src_args + 1;
+		}
+
+		res = open_source(&sources[*nb_sources], next_arg, *carrousel_rate, mpeg4_signaling, *bifs_src_name, *audio_input_ip, *audio_input_port, *video_buffer, force_real_time, *bifs_use_pes, *temi_url, (*pcr_offset == (u32) -1) ? 1 : 0, insert_ntp);
+
+		//we may have arguments
+		while (src_args) {
+			char *sep = strchr(src_args, ':');
+			if (sep) sep[0] = 0;
+
+			if (!strnicmp(src_args, "name=", 5)) {
+				strncpy(sources[*nb_sources].program_name, src_args+5, 20);
+			} else if (!strnicmp(src_args, "provider=", 9)) {
+				strncpy(sources[*nb_sources].provider_name, src_args+9, 20);
+			} else if (!strnicmp(src_args, "ID=", 3)) {
+				u32 k;
+				sources[*nb_sources].ID = atoi(src_args+3);
+
+				for (k=0; k<*nb_sources; k++) {
+					if (sources[k].ID == sources[*nb_sources].ID) {
+						sources[*nb_sources].is_not_program_declaration = 1;
+						if (sources[k].max_sample_size < sources[*nb_sources].max_sample_size)
+							sources[k].max_sample_size = sources[*nb_sources].max_sample_size;
+
+						break;
+					}
+				}
+			} else if (!strnicmp(src_args, "disc", 4)) {
+				sources[*nb_sources].set_disc = GF_TRUE;
+			} else if (!strnicmp(src_args, "PMT=", 4)) {
+				sources[*nb_sources].pmt_version = atoi(src_args+4);
+			}
+
+			if (sep) {
+				sep[0] = ':';
+				src_args = sep+1;
+			} else
+				break;
+		}
+
+		if (res) {
+			(*nb_sources)++;
+			if (res==2) *real_time=1;
+		}
+	}
+	/*syntax is correct; now testing the presence of mandatory arguments*/
+	if (dst_found && *nb_sources && rate_found) {
+		return GF_OK;
+	} else {
+		if (!dst_found)
+			fprintf(stderr, "Error: Destination argument not found\n");
+		if (! *nb_sources)
+			fprintf(stderr, "Error: No Programs are available\n");
+		usage();
+		return GF_BAD_PARAM;
+	}
+
+error:
+	if (!arg) {
+		fprintf(stderr, "Error: %s\n", error_msg);
+	} else {
+		fprintf(stderr, "Error: %s \"%s\"\n", error_msg, arg);
+	}
+	return GF_BAD_PARAM;
+}
+
+static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix, u32 first_segment, u32 last_segment, Bool end)
+{
+	FILE *manifest_fp;
+	u32 i;
+	char manifest_tmp_name[GF_MAX_PATH];
+	char manifest_name[GF_MAX_PATH];
+	char *tmp_manifest = manifest_tmp_name;
+
+	if (segment_dir) {
+		sprintf(manifest_tmp_name, "%stmp.m3u8", segment_dir);
+		sprintf(manifest_name, "%s%s", segment_dir, manifest);
+	} else {
+		sprintf(manifest_tmp_name, "tmp.m3u8");
+		sprintf(manifest_name, "%s", manifest);
+	}
+
+	manifest_fp = gf_fopen(tmp_manifest, "wt");
+	if (!manifest_fp) {
+		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
+		return GF_BAD_PARAM;
+	}
+
+	fprintf(manifest_fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
+
+	for (i = first_segment; i <= last_segment; i++) {
+		fprintf(manifest_fp, "#EXTINF:%u,\n%s%s_%u.ts\n", segment_duration, http_prefix, segment_prefix, i);
+	}
+
+	if (end) {
+		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
+	}
+	gf_fclose(manifest_fp);
+
+	if (!rename(tmp_manifest, manifest_name)) {
+		return GF_OK;
+	} else {
+		if (remove(manifest_name)) {
+			fprintf(stderr, "Error removing file %s\n", manifest_name);
+			return GF_IO_ERR;
+		} else if (rename(tmp_manifest, manifest_name)) {
+			fprintf(stderr, "Could not rename temporary m3u8 manifest file (%s) into %s\n", tmp_manifest, manifest_name);
+			return GF_IO_ERR;
+		} else {
+			return GF_OK;
+		}
+	}
+}
+
+int main(int argc, char **argv)
+{
+	/********************/
+	/*   declarations   */
+	/********************/
+	const char *ts_pck;
+	char *ts_pack_buffer = NULL;
+	GF_Err e;
+	u32 run_time;
+	Bool real_time, is_stdout;
+	s64 pcr_init_val = -1;
+	u32 usec_till_next, ttl, split_rap, sdt_refresh_rate;
+	GF_M2TS_PackMode pes_packing_mode;
+	u32 i, j, mux_rate, nb_sources, cur_pid, carrousel_rate, last_print_time, last_video_time, bifs_use_pes, psi_refresh_rate, nb_pck_pack, nb_pck_in_pack, pcr_ms;
+	char *ts_out = NULL, *udp_out = NULL, *rtp_out = NULL, *audio_input_ip = NULL;
+	FILE *ts_output_file = NULL;
+	GF_Socket *ts_output_udp_sk = NULL, *audio_input_udp_sk = NULL;
+#ifndef GPAC_DISABLE_STREAMING
+	GF_RTPChannel *ts_output_rtp = NULL;
+	GF_RTSPTransport tr;
+	GF_RTPHeader hdr;
+#endif
+	char *video_buffer;
+	u32 video_buffer_size;
+	u16 output_port = 0, audio_input_port = 0;
+	u32 output_type, audio_input_type, pcr_offset;
+	char *audio_input_buffer = NULL;
+	u32 audio_input_buffer_length=65536;
+	char *bifs_src_name;
+	const char *insert_temi = 0;
+	M2TSSource sources[MAX_MUX_SRC_PROG];
+	u32 segment_duration, segment_index, segment_number;
+	char segment_manifest_default[GF_MAX_PATH];
+	char *segment_manifest, *segment_http_prefix, *segment_dir;
+	char segment_prefix[GF_MAX_PATH];
+	char segment_name[GF_MAX_PATH];
+	const char *ip_ifce = NULL;
+	GF_M2TS_Time prev_seg_time;
+	GF_M2TS_Mux *muxer;
+	Bool enable_forced_pcr = GF_FALSE;
+	/*****************/
+	/*   gpac init   */
+	/*****************/
+	gf_sys_init(GF_MemTrackerNone, NULL);
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+
+	/***********************/
+	/*   initialisations   */
+	/***********************/
+	real_time = 0;
+	is_stdout = 0;
+	ts_output_file = NULL;
+	video_buffer = NULL;
+	last_video_time = 0;
+	audio_input_type = 0;
+	sdt_refresh_rate = 0;
+	ts_output_udp_sk = NULL;
+	udp_out = NULL;
+#ifndef GPAC_DISABLE_STREAMING
+	ts_output_rtp = NULL;
+	rtp_out = NULL;
+#endif
+	ts_out = NULL;
+	bifs_src_name = NULL;
+	nb_sources = 0;
+	mux_rate = 0;
+	run_time = 0;
+	carrousel_rate = 500;
+	output_port = 1234;
+	segment_duration = 0;
+	segment_number = 10; /* by default, we keep the 10 previous segments */
+	segment_index = 0;
+	segment_manifest = NULL;
+	segment_http_prefix = NULL;
+	segment_dir = NULL;
+	prev_seg_time.sec = 0;
+	prev_seg_time.nanosec = 0;
+	video_buffer_size = 0;
+	nb_pck_pack = 1;
+	pcr_ms = 100;
+#ifndef GPAC_DISABLE_PLAYER
+	aac_reader = AAC_Reader_new();
+#endif
+	muxer = NULL;
+	pes_packing_mode = GF_M2TS_PACK_AUDIO_ONLY;
+	bifs_use_pes = 0;
+	split_rap = 0;
+	ttl = 1;
+	psi_refresh_rate = GF_M2TS_PSI_DEFAULT_REFRESH_RATE;
+	pcr_offset = (u32) -1;
+
+	/***********************/
+	/*   parse arguments   */
+	/***********************/
+	if (GF_OK != parse_args(argc, argv, &mux_rate, &carrousel_rate, &pcr_init_val, &pcr_offset, &psi_refresh_rate, &pes_packing_mode, &bifs_use_pes, sources, &nb_sources, &bifs_src_name,
+	                        &real_time, &run_time, &video_buffer, &video_buffer_size,
+	                        &audio_input_type, &audio_input_ip, &audio_input_port,
+	                        &output_type, &ts_out, &udp_out, &rtp_out, &output_port,
+	                        &segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &pcr_ms, &ttl, &ip_ifce, &insert_temi, &sdt_refresh_rate, &enable_forced_pcr)) {
+		goto exit;
+	}
+
+	e = gf_sys_set_args(argc, (const char **) argv);
+	if (e) {
+		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
+		goto exit;
+	}
+
+	if (run_time && !mux_rate) {
+		fprintf(stderr, "Cannot specify TS run time for VBR multiplex - disabling run time\n");
+		run_time = 0;
+	}
+
+	/***************************/
+	/*   create mp42ts muxer   */
+	/***************************/
+	muxer = gf_m2ts_mux_new(mux_rate, psi_refresh_rate, real_time);
+	if (!muxer) {
+		fprintf(stderr, "Could not create the muxer. Aborting.\n");
+		goto exit;
+	}
+	gf_m2ts_mux_use_single_au_pes_mode(muxer, pes_packing_mode);
+	if (pcr_init_val>=0) gf_m2ts_mux_set_initial_pcr(muxer, (u64) pcr_init_val);
+	gf_m2ts_mux_set_pcr_max_interval(muxer, pcr_ms);
+	gf_m2ts_mux_enable_pcr_only_packets(muxer, enable_forced_pcr);
+
+
+	if (ts_out != NULL) {
+		if (segment_duration) {
+			strcpy(segment_prefix, ts_out);
+			if (segment_dir) {
+				if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+					sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
+				} else {
+					sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
+				}
+			} else {
+				sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
+			}
+			ts_out = gf_strdup(segment_name);
+			if (!segment_manifest) {
+				sprintf(segment_manifest_default, "%s.m3u8", segment_prefix);
+				segment_manifest = segment_manifest_default;
+			}
+			//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
+		}
+		if (!strcmp(ts_out, "stdout") || !strcmp(ts_out, "-") ) {
+			ts_output_file = stdout;
+			is_stdout = GF_TRUE;
+		} else {
+			ts_output_file = gf_fopen(ts_out, "wb");
+			is_stdout = GF_FALSE;
+		}
+		if (!ts_output_file) {
+			fprintf(stderr, "Error opening %s\n", ts_out);
+			goto exit;
+		}
+	}
+	if (udp_out != NULL) {
+		ts_output_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
+		if (gf_sk_is_multicast_address((char *)udp_out)) {
+			e = gf_sk_setup_multicast(ts_output_udp_sk, (char *)udp_out, output_port, ttl, 0, (char *) ip_ifce);
+		} else {
+			e = gf_sk_bind(ts_output_udp_sk, ip_ifce, output_port, (char *)udp_out, output_port, GF_SOCK_REUSE_PORT);
+		}
+		if (e) {
+			fprintf(stderr, "Error initializing UDP socket: %s\n", gf_error_to_string(e));
+			goto exit;
+		}
+	}
+#ifndef GPAC_DISABLE_STREAMING
+	if (rtp_out != NULL) {
+		ts_output_rtp = gf_rtp_new();
+		gf_rtp_set_ports(ts_output_rtp, output_port);
+		memset(&tr, 0, sizeof(GF_RTSPTransport));
+		tr.IsUnicast = gf_sk_is_multicast_address((char *)rtp_out) ? 0 : 1;
+		tr.Profile="RTP/AVP";
+		tr.destination = (char *)rtp_out;
+		tr.source = "0.0.0.0";
+		tr.IsRecord = 0;
+		tr.Append = 0;
+		tr.SSRC = rand();
+		tr.port_first = output_port;
+		tr.port_last = output_port+1;
+		if (tr.IsUnicast) {
+			tr.client_port_first = output_port;
+			tr.client_port_last = output_port+1;
+		} else {
+			tr.source = (char *)rtp_out;
+			tr.TTL = ttl;
+		}
+		e = gf_rtp_setup_transport(ts_output_rtp, &tr, (char *)ts_out);
+		if (e != GF_OK) {
+			fprintf(stderr, "Cannot setup RTP transport info : %s\n", gf_error_to_string(e));
+			goto exit;
+		}
+		e = gf_rtp_initialize(ts_output_rtp, 0, 1, 1500, 0, 0, (char *) ip_ifce);
+		if (e != GF_OK) {
+			fprintf(stderr, "Cannot initialize RTP sockets : %s\n", gf_error_to_string(e));
+			goto exit;
+		}
+		memset(&hdr, 0, sizeof(GF_RTPHeader));
+		hdr.Version = 2;
+		hdr.PayloadType = 33;	/*MP2T*/
+		hdr.SSRC = tr.SSRC;
+		hdr.Marker = 0;
+	}
+#endif /*GPAC_DISABLE_STREAMING*/
+
+	/************************************/
+	/*   create streaming audio input   */
+	/************************************/
+	if (audio_input_ip)
+		switch(audio_input_type) {
+		case GF_MP42TS_UDP:
+			audio_input_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
+			if (gf_sk_is_multicast_address((char *)audio_input_ip)) {
+				e = gf_sk_setup_multicast(audio_input_udp_sk, (char *)audio_input_ip, audio_input_port, 32, 0, NULL);
+			} else {
+				e = gf_sk_bind(audio_input_udp_sk, NULL, audio_input_port, (char *)audio_input_ip, audio_input_port, GF_SOCK_REUSE_PORT);
+			}
+			if (e) {
+				fprintf(stderr, "Error initializing UDP socket for %s:%d : %s\n", audio_input_ip, audio_input_port, gf_error_to_string(e));
+				goto exit;
+			}
+			gf_sk_set_buffer_size(audio_input_udp_sk, 0, GF_M2TS_UDP_BUFFER_SIZE);
+			gf_sk_set_block_mode(audio_input_udp_sk, 0);
+
+			/*allocate data buffer*/
+			audio_input_buffer = (char*)gf_malloc(audio_input_buffer_length);
+			assert(audio_input_buffer);
+			break;
+		case GF_MP42TS_RTP:
+			/*TODO: not implemented*/
+			assert(0);
+			break;
+#ifndef GPAC_DISABLE_PLAYER
+		case GF_MP42TS_HTTP:
+			audio_prog = (void*)&sources[nb_sources-1];
+			aac_download_file(aac_reader, audio_input_ip);
+			break;
+#endif
+		case GF_MP42TS_FILE:
+			assert(0); /*audio live input is restricted to realtime/streaming*/
+			break;
+		default:
+			assert(0);
+		}
+
+	if (!nb_sources) {
+		fprintf(stderr, "No program to mux, quitting.\n");
+	}
+
+	for (i=0; i<nb_sources; i++) {
+		if (!sources[i].ID) {
+			for (j=i+1; j<nb_sources; j++) {
+				if (sources[i].ID < sources[j].ID) sources[i].ID = sources[i].ID+1;
+			}
+			if (!sources[i].ID) sources[i].ID = 1;
+		}
+	}
+
+	/****************************************/
+	/*   declare all streams to the muxer   */
+	/****************************************/
+	cur_pid = 100;	/*PIDs start from 100*/
+	for (i=0; i<nb_sources; i++) {
+		GF_M2TS_Mux_Program *program;
+
+		if (! sources[i].is_not_program_declaration) {
+			u32 prog_pcr_offset = 0;
+			if (pcr_offset==(u32)-1) {
+				if (sources[i].max_sample_size && mux_rate) {
+					Double r = sources[i].max_sample_size * 8;
+					r *= 90000;
+					r/= mux_rate;
+					//add 10% of safety to cover TS signaling and other potential table update while sending the largest PES
+					r *= 1.1;
+					prog_pcr_offset = (u32) r;
+				}
+			} else {
+				prog_pcr_offset = pcr_offset;
+			}
+			fprintf(stderr, "Setting up program ID %d - send rates: PSI %d ms PCR %d ms - PCR offset %d\n", sources[i].ID, psi_refresh_rate, pcr_ms, prog_pcr_offset);
+
+			program = gf_m2ts_mux_program_add(muxer, sources[i].ID, cur_pid, psi_refresh_rate, prog_pcr_offset, sources[i].mpeg4_signaling, sources[i].pmt_version, sources[i].set_disc);
+			if (sources[i].mpeg4_signaling) program->iod = sources[i].iod;
+			if (sources[i].od_updates) {
+				program->loop_descriptors = sources[i].od_updates;
+				sources[i].od_updates = NULL;
+			}
+		} else {
+			program = gf_m2ts_mux_program_find(muxer, sources[i].ID);
+		}
+		if (!program) continue;
+
+		for (j=0; j<sources[i].nb_streams; j++) {
+			GF_M2TS_Mux_Stream *stream;
+			Bool force_pes_mode = 0;
+			/*likely an OD stream disabled*/
+			if (!sources[i].streams[j].stream_type) continue;
+
+			if (sources[i].streams[j].stream_type==GF_STREAM_SCENE) force_pes_mode = bifs_use_pes ? 1 : 0;
+
+			stream = gf_m2ts_program_stream_add(program, &sources[i].streams[j], cur_pid+j+1, (sources[i].pcr_idx==j) ? 1 : 0, force_pes_mode, GF_TRUE);
+			if (split_rap && (sources[i].streams[j].stream_type==GF_STREAM_VISUAL)) stream->start_pes_at_rap = 1;
+		}
+
+		cur_pid += sources[i].nb_streams;
+		while (cur_pid % 10)
+			cur_pid ++;
+
+		if (sources[i].program_name[0] || sources[i].provider_name[0] ) gf_m2ts_mux_program_set_name(program, sources[i].program_name, sources[i].provider_name);
+	}
+	muxer->flush_pes_at_rap = (split_rap == 2) ? GF_TRUE : GF_FALSE;
+
+	if (sdt_refresh_rate) {
+		gf_m2ts_mux_enable_sdt(muxer, sdt_refresh_rate);
+	}
+	gf_m2ts_mux_update_config(muxer, 1);
+
+	if (nb_pck_pack>1) {
+		ts_pack_buffer = gf_malloc(sizeof(char) * 188 * nb_pck_pack);
+	}
+
+	/*****************/
+	/*   main loop   */
+	/*****************/
+	last_print_time = gf_sys_clock();
+	while (run) {
+		u32 status;
+
+		/*check for some audio input from the network*/
+		if (audio_input_ip) {
+			u32 read;
+			switch (audio_input_type) {
+			case GF_MP42TS_UDP:
+			case GF_MP42TS_RTP:
+				/*e =*/
+				gf_sk_receive(audio_input_udp_sk, audio_input_buffer, audio_input_buffer_length, &read);
+				if (read) {
+					SampleCallBack((void*)&sources[nb_sources-1], AUDIO_DATA_ESID, audio_input_buffer, read, gf_m2ts_get_sys_clock(muxer));
+				}
+				break;
+#ifndef GPAC_DISABLE_PLAYER
+			case GF_MP42TS_HTTP:
+				/*nothing to do: AAC_OnLiveData is called automatically*/
+				/*check we're still alive*/
+				if (gf_dm_is_thread_dead(aac_reader->dnload)) {
+					GF_ESD *esd;
+					aac_download_file(aac_reader, audio_input_ip);
+					esd = AAC_GetESD(aac_reader);
+					if (!esd)
+						break;
+					assert(esd->slConfig->timestampResolution); /*if we don't have this value we won't be able to adjust the timestamps within the MPEG2-TS*/
+					if (esd->slConfig->timestampResolution)
+						audio_discontinuity_offset = gf_m2ts_get_sys_clock(muxer) * (u64)esd->slConfig->timestampResolution / 1000;
+					gf_odf_desc_del((GF_Descriptor *)esd);
+				}
+				break;
+#endif
+			default:
+				assert(0);
+			}
+		}
+
+		/*flush all packets*/
+		nb_pck_in_pack=0;
+		while ((ts_pck = gf_m2ts_mux_process(muxer, &status, &usec_till_next)) != NULL) {
+
+			if (ts_pack_buffer) {
+				memcpy(ts_pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
+				nb_pck_in_pack++;
+
+				if (nb_pck_in_pack < nb_pck_pack)
+					continue;
+
+				ts_pck = (const char *) ts_pack_buffer;
+			} else {
+				nb_pck_in_pack = 1;
+			}
+
+call_flush:
+			if (ts_output_file != NULL) {
+				gf_fwrite(ts_pck, 1, 188 * nb_pck_in_pack, ts_output_file);
+				if (segment_duration && (muxer->time.sec > prev_seg_time.sec + segment_duration)) {
+					prev_seg_time = muxer->time;
+					gf_fclose(ts_output_file);
+					segment_index++;
+					if (segment_dir) {
+						if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+							sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
+						} else {
+							sprintf(segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index);
+						}
+					} else {
+						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
+					}
+					ts_output_file = gf_fopen(segment_name, "wb");
+					if (!ts_output_file) {
+						fprintf(stderr, "Error opening %s\n", segment_name);
+						goto exit;
+					}
+					/* delete the oldest segment */
+					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)) {
+						char old_segment_name[GF_MAX_PATH];
+						if (segment_dir) {
+							if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+								sprintf(old_segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
+							} else {
+								sprintf(old_segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
+							}
+						} else {
+							sprintf(old_segment_name, "%s_%d.ts", segment_prefix, segment_index - segment_number - 1);
+						}
+						gf_delete_file(old_segment_name);
+					}
+					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix,
+//								   (segment_index >= segment_number/2 ? segment_index - segment_number/2 : 0), segment_index >1 ? segment_index-1 : 0, 0);
+					               ( (segment_index > segment_number ) ? segment_index - segment_number : 0), segment_index >1 ? segment_index-1 : 0, 0);
+				}
+			}
+
+			if (ts_output_udp_sk != NULL) {
+				e = gf_sk_send(ts_output_udp_sk, (char*)ts_pck, 188 * nb_pck_in_pack);
+				if (e) {
+					fprintf(stderr, "Error %s sending UDP packet\n", gf_error_to_string(e));
+				}
+			}
+#ifndef GPAC_DISABLE_STREAMING
+			if (ts_output_rtp != NULL) {
+				u32 ts;
+				hdr.SequenceNumber++;
+				/*muxer clock at 90k*/
+				ts = muxer->time.sec*90000 + muxer->time.nanosec*9/100000;
+				/*FIXME - better discontinuity check*/
+				hdr.Marker = (ts < hdr.TimeStamp) ? 1 : 0;
+				hdr.TimeStamp = ts;
+				e = gf_rtp_send_packet(ts_output_rtp, &hdr, (char*)ts_pck, 188 * nb_pck_in_pack, 0);
+				if (e) {
+					fprintf(stderr, "Error %s sending RTP packet\n", gf_error_to_string(e));
+				}
+			}
+#endif
+
+			nb_pck_in_pack = 0;
+
+			if (status>=GF_M2TS_STATE_PADDING) {
+				break;
+			}
+		}
+		if (nb_pck_in_pack) {
+			ts_pck = (const char *) ts_pack_buffer;
+			goto call_flush;
+		}
+
+		/*push video*/
+		{
+			u32 now=gf_sys_clock();
+			if (now/MP42TS_VIDEO_FREQ != last_video_time/MP42TS_VIDEO_FREQ) {
+				/*should use carrousel behaviour instead of being pushed manually*/
+				if (video_buffer)
+					SampleCallBack((void*)&sources[nb_sources-1], VIDEO_DATA_ESID, video_buffer, video_buffer_size, gf_m2ts_get_sys_clock(muxer)+1000/*try buffering due to VLC msg*/);
+				last_video_time = now;
+			}
+		}
+
+		if (real_time) {
+			/*refresh every MP42TS_PRINT_TIME_MS ms*/
+			u32 now=gf_sys_clock();
+			if (now > last_print_time + MP42TS_PRINT_TIME_MS) {
+				last_print_time = now;
+				fprintf(stderr, "M2TS: time % 6d - TS time % 6d - bitrate % 8d\r", gf_m2ts_get_sys_clock(muxer), gf_m2ts_get_ts_clock(muxer), muxer->average_birate_kbps);
+
+				if (gf_prompt_has_input()) {
+					char c = gf_prompt_get_char();
+					if (c=='q') break;
+					else if (c=='t') request_temi_toggle = GF_TRUE;
+				}
+			}
+			if (status == GF_M2TS_STATE_IDLE) {
+#if 0
+				/*wait till next packet is ready to be sent*/
+				if (usec_till_next>1000) {
+					//fprintf(stderr, "%d usec till next packet\n", usec_till_next);
+					gf_sleep(usec_till_next / 1000);
+				}
+#else
+				//we don't have enough precision on usec counting and we end up eating one core on most machines, so let's just sleep
+				//one second whenever we are idle - it's maybe too much but the muxer will catchup afterwards
+				gf_sleep(1);
+#endif
+			}
+		}
+
+
+		if (run_time) {
+			if (gf_m2ts_get_ts_clock(muxer) > run_time) {
+				fprintf(stderr, "Stopping multiplex at %d ms (requested runtime %d ms)\n", gf_m2ts_get_ts_clock(muxer), run_time);
+				break;
+			}
+		}
+		if (status==GF_M2TS_STATE_EOS) {
+			break;
+		}
+	}
+
+	{
+		u64 bits = muxer->tot_pck_sent*8*188;
+		u64 dur_ms = gf_m2ts_get_ts_clock(muxer);
+		if (!dur_ms) dur_ms = 1;
+		fprintf(stderr, "Done muxing - %.02f sec - %sbitrate %d kbps "LLD" packets written\n", ((Double) dur_ms)/1000.0,mux_rate ? "" : "average ", (u32) (bits/dur_ms), muxer->tot_pck_sent);
+		fprintf(stderr, " Padding: "LLD" packets (%g kbps) - "LLD" PES padded bytes (%g kbps)\n", muxer->tot_pad_sent, (Double) (muxer->tot_pad_sent*188*8.0/dur_ms) , muxer->tot_pes_pad_bytes, (Double) (muxer->tot_pes_pad_bytes*8.0/dur_ms) );
+	}
+
+exit:
+	if (ts_pack_buffer) gf_free(ts_pack_buffer);
+	run = 0;
+	if (segment_duration) {
+		write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index - segment_number, segment_index, 1);
+	}
+	if (ts_output_file && !is_stdout) gf_fclose(ts_output_file);
+	if (ts_output_udp_sk) gf_sk_del(ts_output_udp_sk);
+#ifndef GPAC_DISABLE_STREAMING
+	if (ts_output_rtp) gf_rtp_del(ts_output_rtp);
+#endif
+	if (ts_out) gf_free(ts_out);
+	if (audio_input_udp_sk) gf_sk_del(audio_input_udp_sk);
+	if (audio_input_buffer) gf_free (audio_input_buffer);
+	if (video_buffer) gf_free(video_buffer);
+	if (udp_out) gf_free(udp_out);
+#ifndef GPAC_DISABLE_STREAMING
+	if (rtp_out) gf_free(rtp_out);
+#endif
+	if (muxer) gf_m2ts_mux_del(muxer);
+
+	for (i=0; i<nb_sources; i++) {
+		for (j=0; j<sources[i].nb_streams; j++) {
+			if (sources[i].streams[j].input_ctrl) sources[i].streams[j].input_ctrl(&sources[i].streams[j], GF_ESI_INPUT_DESTROY, NULL);
+			if (sources[i].streams[j].input_udta) {
+				gf_free(sources[i].streams[j].input_udta);
+			}
+			if (sources[i].streams[j].decoder_config) {
+				gf_free(sources[i].streams[j].decoder_config);
+			}
+			if (sources[i].streams[j].sl_config) {
+				gf_free(sources[i].streams[j].sl_config);
+			}
+		}
+		if (sources[i].iod) gf_odf_desc_del((GF_Descriptor*)sources[i].iod);
+#ifndef GPAC_DISABLE_ISOM
+		if (sources[i].mp4) gf_isom_close(sources[i].mp4);
+#endif
+
+#ifndef GPAC_DISABLE_SENG
+		if (sources[i].seng) {
+			gf_seng_terminate(sources[i].seng);
+			sources[i].seng = NULL;
+		}
+#endif
+		if (sources[i].th) gf_th_del(sources[i].th);
+	}
+
+#ifndef GPAC_DISABLE_PLAYER
+	if (aac_reader) AAC_Reader_del(aac_reader);
+#endif
+
+	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();
+		return 2;
+	}
+#endif
+	return 0;
+}

gpac-1.0.0.tar.gz/applications/deprecated/mp42ts/mp42ts.vcxproj Added

@@ -0,0 +1,265 @@
+<?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>{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </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" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </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>
+    <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>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj\mp42ts_deb\mp42ts.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild>false</MinimalRebuild>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj\mp42ts_rel\mp42ts.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(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>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\mp42ts\main.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <Private>true</Private>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-1.0.0.tar.gz/applications/deprecated/old_arch Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.def Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.dsp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.idl Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.rc Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.rgs Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX.vcxproj Added

@@ -0,0 +1,376 @@
+<?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>{72486240-A124-496E-A67A-E76FEC7E99BE}</ProjectGuid>
+    <RootNamespace>GPAX</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>Dynamic</UseOfAtl>
+    <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'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <CustomBuildStep>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+    <Midl>
+      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <CustomBuildStep>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+    <Midl>
+      <TypeLibraryName>.\obj/w32_deb/GPAX.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <CustomBuildStep>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+    <Midl>
+      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <CustomBuildStep>
+      <Message>
+      </Message>
+      <Command>
+      </Command>
+      <Outputs>
+      </Outputs>
+    </CustomBuildStep>
+    <Midl>
+      <TypeLibraryName>.\obj/w32_rel/GPAX.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>..\..\applications\GPAX\GPAX.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <SupportUnloadOfDelayLoadedDLL>false</SupportUnloadOfDelayLoadedDLL>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\..\applications\GPAX\gpax.bmp" />
+    <None Include="..\..\applications\GPAX\GPAX.def" />
+    <None Include="..\..\applications\GPAX\GPAX.rgs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\GPAX\GPAX.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\GPAX\GPAXPlugin.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\GPAX\StdAfx.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\applications\GPAX\GPAX.h" />
+    <ClInclude Include="..\..\applications\GPAX\GPAXPlugin.h" />
+    <ClInclude Include="..\..\applications\GPAX\resource.h" />
+    <ClInclude Include="..\..\applications\GPAX\StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="..\..\applications\GPAX\GPAX.idl">
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\GPAX.tlb</TypeLibraryName>
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GPAX.tlb</TypeLibraryName>
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\GPAX.tlb</TypeLibraryName>
+      <TypeLibraryName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GPAX.tlb</TypeLibraryName>
+    </Midl>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\applications\GPAX\GPAX.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\GPAX;$(OUTDIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.cpp Added

@@ -0,0 +1,710 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2006-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ActiveX control
+ *
+ *  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 "stdafx.h"
+#include "GPAX.h"
+#include "GPAXPlugin.h"
+#include <gpac/network.h>
+#include <gpac/utf.h>
+#include <shlobj.h>
+#include <math.h>
+
+#ifndef _WIN32_WCE
+#include <direct.h>
+#include <mshtml.h>
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CGPAXPlugin
+
+#if 0
+static print_err(char *msg, char *title)
+{
+	u16 w_msg[1024], w_title[1024];
+	CE_CharToWide(msg, w_msg);
+	CE_CharToWide(title, w_title);
+	::MessageBox(NULL, w_msg, w_title, MB_OK);
+}
+#endif
+
+
+void CGPAXPlugin::SetStatusText(char *msg)
+{
+#ifndef _WIN32_WCE
+	if (m_pBrowser) {
+		if (msg) {
+			u16 w_msg[1024];
+			gf_utf8_mbstowcs(w_msg, 1024, (const char **)&msg);
+			m_pBrowser->put_StatusText((BSTR) w_msg);
+		} else {
+			m_pBrowser->put_StatusText(L"");
+		}
+	}
+#endif
+}
+//GPAC player Event Handler. not yet implemented, just dummies here
+Bool CGPAXPlugin::EventProc(GF_Event *evt)
+{
+	char msg[1024];
+	if (!m_term) return GF_FALSE;
+
+	switch (evt->type) {
+	case GF_EVENT_MESSAGE:
+		if (evt->message.error) {
+			sprintf(msg, "(GPAC) %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
+		} else {
+			sprintf(msg, "(GPAC) %s", evt->message.message);
+		}
+		SetStatusText(msg);
+		break;
+	case GF_EVENT_PROGRESS:
+		if (evt->progress.done == evt->progress.total) {
+			SetStatusText(NULL);
+			m_iDownload_progress = 100;
+		} else {
+			char *szTitle = "";
+			if (evt->progress.progress_type==0) szTitle = "Buffer ";
+			else if (evt->progress.progress_type==1)
+			{
+				szTitle = "Download ";
+				m_iDownload_progress = (int)floor((100.0*evt->progress.done) / evt->progress.total);
+			}
+			else if (evt->progress.progress_type==2) szTitle = "Import ";
+			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
+			SetStatusText(msg);
+		}
+		break;
+	case GF_EVENT_CONNECT:
+		m_bIsConnected = evt->connect.is_connected;
+		break;
+	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
+	case GF_EVENT_SCENE_SIZE:
+		gf_term_set_size(m_term, m_width, m_height);
+		break;
+	/*window has been resized (full-screen plugin), resize*/
+	case GF_EVENT_SIZE:
+		m_width = evt->size.width;
+		m_height = evt->size.height;
+		gf_term_set_size(m_term, m_width, m_height);
+		break;
+	case GF_EVENT_DBLCLICK:
+		gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
+		break;
+	case GF_EVENT_KEYDOWN:
+		if ((evt->key.flags  & GF_KEY_MOD_ALT)) {
+		} else {
+			switch (evt->key.key_code) {
+			case GF_KEY_HOME:
+				gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 1);
+				break;
+			case GF_KEY_ESCAPE:
+				gf_term_set_option(m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(m_term, GF_OPT_FULLSCREEN));
+				break;
+			}
+		}
+		break;
+	case GF_EVENT_NAVIGATE_INFO:
+		strcpy(msg, evt->navigate.to_url);
+		SetStatusText(msg);
+		break;
+	case GF_EVENT_NAVIGATE:
+		if (gf_term_is_supported_url(m_term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
+			gf_term_navigate_to(m_term, evt->navigate.to_url);
+			return GF_TRUE;
+		}
+#ifndef _WIN32_WCE
+		else if (m_pBrowser) {
+			u32 i;
+			const char **sz_ptr;
+			u16 w_szTar[1024], w_szURL[1024];
+			VARIANT target, flags;
+			flags.intVal = 0;
+			target.bstrVal = L"_SELF";
+
+			for (i=0; i<evt->navigate.param_count; i++) {
+				if (!strcmp(evt->navigate.parameters[i], "_parent")) target.bstrVal = L"_PARENT";
+				else if (!strcmp(evt->navigate.parameters[i], "_blank")) target.bstrVal = L"_BLANK";
+				else if (!strcmp(evt->navigate.parameters[i], "_top")) target.bstrVal = L"_TOP";
+				else if (!strcmp(evt->navigate.parameters[i], "_new")) flags.intVal |= navOpenInNewWindow;
+				else if (!strnicmp(evt->navigate.parameters[i], "_target=", 8)) {
+					sz_ptr = & evt->navigate.parameters[i]+8;
+					gf_utf8_mbstowcs(w_szTar, 1024, (const char **)sz_ptr);
+					target.bstrVal = (BSTR) w_szTar;
+				}
+			}
+			sz_ptr = & evt->navigate.to_url;
+			gf_utf8_mbstowcs(w_szURL, 1024, (const char **)sz_ptr);
+			m_pBrowser->Navigate((BSTR) w_szURL, &flags, &target, NULL, NULL);;
+			return GF_TRUE;
+		}
+#endif
+		break;
+	}
+	return GF_FALSE;
+}
+
+Bool GPAX_EventProc(void *ptr, GF_Event *evt)
+{
+	CGPAXPlugin *_this = (CGPAXPlugin *)ptr;
+	return _this->EventProc(evt);
+}
+
+//Read Parameters from pPropBag given by MSIE
+Bool CGPAXPlugin::ReadParamString(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog,
+                                  WCHAR *name, char *buf, int bufsize)
+{
+	VARIANT v;
+	HRESULT hr;
+	Bool retval = GF_FALSE;
+
+	v.vt = VT_EMPTY;
+	v.bstrVal = NULL;
+	hr = pPropBag->Read(name, &v, pErrorLog);
+	if(SUCCEEDED(hr))
+	{
+		if(v.vt==VT_BSTR && v.bstrVal)
+		{
+//            USES_CONVERSION;
+//            lstrcpyn(buf,OLE2T(v.bstrVal),bufsize);
+			const u16 *srcp = (const u16 *) v.bstrVal;
+			size_t len = gf_utf8_wcstombs(buf, bufsize, &srcp);
+			if (len>=0) {
+				buf[(u32) len] = 0;
+				retval = GF_TRUE;
+			}
+		}
+		VariantClear(&v);
+	}
+	return retval;
+}
+
+void CGPAXPlugin::LoadDATAUrl()
+{
+#ifndef _WIN32_WCE
+	HRESULT hr;
+
+	if (m_url[0]) return;
+	/*get parent doc*/
+	CComPtr<IOleContainer> spContainer;
+	if (m_spClientSite->GetContainer(&spContainer) != S_OK)
+		return;
+	CComPtr<IHTMLDocument2> spDoc = CComQIPtr<IHTMLDocument2>(spContainer);
+	CComPtr<IHTMLElementCollection> spColl;
+	if (spDoc->get_all(&spColl) != S_OK)
+		return;
+	/*get HTML <object> in the doc*/
+	CComPtr<IDispatch> spDisp;
+	CComPtr<IHTMLElementCollection> sphtmlObjects;
+
+	CComPtr<IDispatch> spDispObjects;
+	if (spColl->tags(CComVariant("OBJECT"), &spDispObjects) != S_OK)
+		return;
+	CComPtr<IHTMLElementCollection> spObjs = CComQIPtr<IHTMLElementCollection>(spDispObjects);
+
+	/*browse all objects and find us*/
+	long lCount = 0;
+	spObjs->get_length(&lCount);
+	for (long lCnt = 0; lCnt < lCount; lCnt++) {
+		IDispatch *an_obj= NULL;
+		CComVariant varEmpty;
+		CComVariant varName;
+		varName.vt = VT_I4;
+		varName.lVal = lCnt;
+		hr = spObjs->item(varName, varEmpty, &an_obj);
+		varName.Clear();
+		varEmpty.Clear();
+		if (hr != S_OK) continue;
+
+		/*get the IHTMLObject*/
+		IHTMLObjectElement* pObjectElem=NULL;
+		an_obj->QueryInterface(IID_IHTMLObjectElement, (void**)&pObjectElem);
+		if (!pObjectElem) continue;
+
+		/*get its parent owner - it MUST be us*/
+		IDispatch *disp= NULL;
+		pObjectElem->get_object(&disp);
+		if (disp != this) continue;
+
+		BSTR data = NULL;
+		if ((pObjectElem->get_data(&data) == S_OK) && data) {
+			const u16 *srcp = (const u16 *) data;
+			size_t len = gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
+			if (len>=0) m_url[(u32) len] = 0;
+		}
+		SysFreeString(data);
+		break;
+	}
+
+	if (m_url) {
+		UpdateURL();
+	}
+#endif
+
+}
+
+// trap keys and forward on to the control
+BOOL CGPAXPlugin::PreTranslateMessage(MSG* pMsg)
+{
+	switch (pMsg->message)
+	{
+	case WM_KEYDOWN:
+	case WM_KEYUP:
+		switch (pMsg->wParam)
+		{
+		case VK_UP:
+		case VK_DOWN:
+		case VK_LEFT:
+		case VK_RIGHT:
+		case VK_HOME:
+		case VK_END:
+			SendMessage (pMsg->message, pMsg->wParam, pMsg->lParam);
+			// Windowless controls won't be able to call SendMessage.
+			// Instead, just respond to the message here.
+			return TRUE;
+		}
+		break;
+	}
+	return FALSE;
+//  return COleControl::PreTranslateMessage(pMsg);
+}
+
+
+
+
+#define GPAC_REG_KEY	HKEY_CURRENT_USER
+
+static void gpax_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
+{
+	FILE *logs = (FILE *) cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
+//Create window message fuction. when the window is created, also initialize a instance of
+//GPAC player instance.
+LRESULT CGPAXPlugin::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	if (m_term) return 0;
+	const char *str;
+
+	if (m_hWnd==NULL) return 0;
+
+	gf_sys_init(GF_MemTrackerNone);
+
+	//Create a structure m_user for initialize the terminal. the parameters to set:
+	//1)config file path
+	//2)Modules file path
+	//3)window handler
+	//4)EventProc
+	memset(&m_user, 0, sizeof(m_user));
+
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
+
+	m_user.config = gf_cfg_init(NULL, NULL);
+	if(!m_user.config) {
+#ifdef _WIN32_WCE
+		::MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
+#else
+		::MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
+#endif
+		goto err_exit;
+	}
+
+	/*check log file*/
+	str = gf_opts_get_key("General", "log-file");
+	if (str) {
+		m_pLogs = gf_fopen(str, "wt");
+		if (m_pLogs) gf_log_set_callback(m_pLogs, gpax_do_log);
+	}
+
+	/*if logs are specified, use them*/
+	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
+
+
+	str = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
+	m_user.modules = gf_modules_new(NULL, m_user.config);
+	if(!gf_modules_get_count(m_user.modules)) goto err_exit;
+
+	m_user.os_window_handler = m_hWnd;
+	m_user.opaque = this;
+	m_user.EventProc = GPAX_EventProc;
+
+	//create a terminal
+	m_term = gf_term_new(&m_user);
+
+	if (!m_term) goto err_exit;
+
+	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
+
+	LoadDATAUrl();
+
+	RECT rc;
+	::GetWindowRect(m_hWnd, &rc);
+	m_width = rc.right-rc.left;
+	m_height = rc.bottom-rc.top;
+	if (m_bAutoStart && strlen(m_url)) Play();
+	return 0;
+
+	//Error Processing
+err_exit:
+	if(m_user.modules)
+		gf_modules_del(m_user.modules);
+	m_user.modules = NULL;
+	if(m_user.config)
+		gf_cfg_del(m_user.config);
+	m_user.config = NULL;
+	gf_sys_close();
+	return 1;
+}
+
+void CGPAXPlugin::UnloadTerm()
+{
+	if (m_term) {
+		GF_Terminal *a_term = m_term;
+		m_term = NULL;
+		gf_term_del(a_term);
+	}
+	if (m_user.modules) gf_modules_del(m_user.modules);
+	if (m_user.config) gf_cfg_del(m_user.config);
+	if (m_pLogs)
+		gf_fclose(m_pLogs);
+	m_pLogs = NULL;
+	gf_log_set_callback(NULL, NULL);
+	memset(&m_user, 0, sizeof(m_user));
+	gf_sys_close();
+}
+CGPAXPlugin::~CGPAXPlugin()
+{
+	UnloadTerm();
+#ifndef _WIN32_WCE
+	if (m_pBrowser) m_pBrowser->Release();
+	m_pBrowser = NULL;
+#endif
+}
+LRESULT CGPAXPlugin::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+	UnloadTerm();
+	return 0;
+}
+
+
+HRESULT CGPAXPlugin::OnDraw(ATL_DRAWINFO& di)
+{
+	if (m_term && m_bInitialDraw) {
+		m_bInitialDraw = GF_FALSE;
+		if (m_bAutoStart) Play();
+	}
+	return S_OK;
+}
+
+// Load is called before OnCreate, but it may not be called at
+// all if there are no parameters.
+STDMETHODIMP CGPAXPlugin::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog)
+{
+	char szOpt[1024];
+	// examine the <embed>/<param> tag arguments
+
+	m_url[0] = 0;
+	ReadParamString(pPropBag,pErrorLog,L"src", m_url, MAXLEN_URL);
+	if (!m_url[0])
+		ReadParamString(pPropBag,pErrorLog,L"data", m_url, MAXLEN_URL);
+
+	if (ReadParamString(pPropBag,pErrorLog,L"autostart", szOpt, 1024))
+		m_bAutoStart = (!stricmp(szOpt, "false") || !stricmp(szOpt, "no")) ? GF_FALSE : GF_TRUE;
+
+	if (ReadParamString(pPropBag,pErrorLog,L"use3d", szOpt, 1024))
+		m_bUse3D = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
+
+	if (ReadParamString(pPropBag,pErrorLog,L"aspectratio", szOpt, 1024)) {
+		if (!stricmp(szOpt, "keep")) m_AR = GF_ASPECT_RATIO_KEEP;
+		else if (!stricmp(szOpt, "16:9")) m_AR = GF_ASPECT_RATIO_16_9;
+		else if (!stricmp(szOpt, "4:3")) m_AR = GF_ASPECT_RATIO_4_3;
+		else if (!stricmp(szOpt, "fill")) m_AR = GF_ASPECT_RATIO_FILL_SCREEN;
+	}
+
+	if (ReadParamString(pPropBag,pErrorLog,L"loop", szOpt, 1024))
+		m_bLoop = !stricmp(szOpt, "true") ? GF_FALSE : GF_TRUE;
+
+	if (ReadParamString(pPropBag,pErrorLog,L"gui", szOpt, 1024))
+		m_bUseGUI = (!stricmp(szOpt, "true") || !stricmp(szOpt, "yes")) ? GF_TRUE : GF_FALSE;
+
+	UpdateURL();
+
+#ifndef _WIN32_WCE
+	/*get the top-level container*/
+	if (!m_pBrowser) {
+		IServiceProvider *isp, *isp2 = NULL;
+		if ( SUCCEEDED(m_spClientSite->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&isp)) ) ) {
+
+			if (SUCCEEDED(isp->QueryService(SID_STopLevelBrowser, IID_IServiceProvider, reinterpret_cast<void **>(&isp2)) ) ) {
+				isp2->QueryService(SID_SWebBrowserApp, IID_IWebBrowser2, reinterpret_cast<void **>(&m_pBrowser));
+				isp2->Release();
+			}
+			isp->Release();
+		}
+	}
+	if (m_pBrowser) m_pBrowser->put_StatusText(L"GPAC Ready");
+#endif
+
+	return IPersistPropertyBagImpl<CGPAXPlugin>::Load(pPropBag, pErrorLog);
+}
+
+void CGPAXPlugin::UpdateURL()
+{
+	/*get absolute URL*/
+	if (!strlen(m_url)) return;
+	IMoniker* pMoniker	= NULL;
+	LPOLESTR sDisplayName;
+
+	if (SUCCEEDED(m_spClientSite->GetMoniker(OLEGETMONIKER_TEMPFORUSER,
+	              OLEWHICHMK_CONTAINER,
+	              &pMoniker) ) ) {
+		char parent_url[1024];
+		pMoniker->GetDisplayName(NULL, NULL, &sDisplayName);
+		wcstombs(parent_url, sDisplayName, 300);
+		pMoniker->Release();
+
+		char *abs_url = gf_url_concatenate(parent_url, m_url);
+		if (abs_url) {
+			strcpy(m_url, abs_url);
+			gf_free(abs_url);
+		}
+	}
+}
+
+STDMETHODIMP CGPAXPlugin::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties)
+{
+	u16 wurl[MAXLEN_URL];
+	const char *sptr;
+	u16 len;
+
+	VARIANT value;
+	if( pPropBag == NULL) return E_INVALIDARG;
+
+	VariantInit(&value);
+
+	V_VT(&value) = VT_BOOL;
+	V_BOOL(&value) = m_bAutoStart ? VARIANT_TRUE : VARIANT_FALSE;
+	pPropBag->Write(OLESTR("AutoStart"), &value);
+	VariantClear(&value);
+
+	V_VT(&value) = VT_BSTR;
+
+	sptr = (const char *)m_url;
+	len = (u16) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
+	V_BSTR(&value) = SysAllocStringLen(NULL, len+1);
+	memcpy(V_BSTR(&value) , wurl, len*sizeof(u16));
+	V_BSTR(&value) [len] = 0;
+
+	pPropBag->Write(OLESTR("src"), &value);
+	VariantClear(&value);
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::Play()
+{
+	if (m_term) {
+		if (!m_bIsConnected) {
+			if (strlen(m_url)) {
+				/*connect from 0 and pause if not autoplay*/
+				const char *gui = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+				if (gui && m_bUseGUI) {
+					gf_cfg_set_key(m_user.config, "Temp", "BrowserMode", "yes");
+					gf_cfg_set_key(m_user.config, "Temp", "GUIStartupFile", m_url);
+					gf_term_connect(m_term, gui);
+				} else {
+					gf_term_connect(m_term, m_url);
+				}
+				gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, m_AR);
+			}
+		} else
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);   //if target is connected, set it playing
+	}
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::Pause()
+{
+	if(m_term) {
+		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+		} else {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+		}
+	}
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::Stop()
+{
+	if(m_term) gf_term_disconnect(m_term);     //set it stop
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::QualitySwitch(int switch_up)
+{
+	if (m_term) gf_term_switch_quality(m_term, switch_up ? GF_TRUE : GF_FALSE);
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::SetURL(BSTR _url)
+{
+	if (m_term) {
+		u16 *srcp;
+		u32 len;
+		char *url;
+
+		srcp = (u16 *)_url;
+		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
+		if (len) {
+			url = (char *) gf_malloc(sizeof(char) * (len+1));
+			srcp = (u16 *)_url;
+			len = (u32) gf_utf8_wcstombs(url, len, (const u16 **)&srcp);
+			url[len] = 0;
+			strcpy(m_url, url);
+			gf_term_connect(m_term, url);
+			gf_free(url);
+		}
+	}
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::Update(BSTR _mtype, BSTR _updates)
+{
+	if (m_term) {
+		u16 *srcp;
+		u32 len;
+		char mtype[1024], *updates;
+
+		srcp = (u16 *) _mtype;
+		len = (u32) gf_utf8_wcstombs(mtype, 1024, (const u16 **)&srcp);
+		mtype[len] = 0;
+
+		srcp = (u16 *)_updates;
+		len = (u32) gf_utf8_wcstombs(NULL, 0, (const u16 **)&srcp);
+		if (len) {
+			updates = (char *) gf_malloc(sizeof(char) * (len+1));
+			srcp = (u16 *)_updates;
+			len = (u32) gf_utf8_wcstombs(updates, len, (const u16 **)&srcp);
+			updates[len] = 0;
+			gf_term_scene_update(m_term, mtype, updates);
+			gf_free(updates);
+		}
+	}
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::get_src(BSTR *url)
+{
+	u16 wurl[MAXLEN_URL];
+	const char *sptr;
+	u16 len;
+	if (url==NULL) return E_POINTER;
+
+	sptr = (const char *)m_url;
+	len = (u32) gf_utf8_mbstowcs(wurl, MAXLEN_URL, &sptr);
+	*url = SysAllocStringLen(NULL, len+1);
+	memcpy(*url, wurl, len*sizeof(u16));
+	*url[len] = 0;
+	return S_OK;
+}
+STDMETHODIMP CGPAXPlugin::put_src(BSTR url)
+{
+	const u16 *srcp = (const u16 *)url;
+	u32 len = (u32) gf_utf8_wcstombs(m_url, MAXLEN_URL, &srcp);
+	m_url[len] = 0;
+	UpdateURL();
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::get_AutoStart(VARIANT_BOOL *as)
+{
+	if (as==NULL) return E_POINTER;
+	*as = m_bAutoStart ? VARIANT_TRUE: VARIANT_FALSE;
+	return S_OK;
+}
+STDMETHODIMP CGPAXPlugin::put_AutoStart(VARIANT_BOOL as)
+{
+	m_bAutoStart = (as !=VARIANT_FALSE) ? GF_TRUE : GF_FALSE;
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::get_DownloadProgress(INT *dp)
+{
+	if (dp==NULL) return E_POINTER;
+	*dp = m_iDownload_progress;
+	return S_OK;
+}
+STDMETHODIMP CGPAXPlugin::put_DownloadProgress(INT dp)
+{
+	return S_OK;
+}
+
+STDMETHODIMP CGPAXPlugin::GetInterfaceSafetyOptions(
+    REFIID riid,
+    DWORD *pdwSupportedOptions,
+    DWORD *pdwEnabledOptions
+)
+{
+	if( (NULL == pdwSupportedOptions) || (NULL == pdwEnabledOptions) )
+		return E_POINTER;
+
+	*pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACESAFE_FOR_UNTRUSTED_CALLER;
+
+	if ((IID_IDispatch == riid) || (IID_IGPAX == riid)) {
+		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_CALLER;
+		return NOERROR;
+	}
+	else if (IID_IPersistPropertyBag == riid)  {
+		*pdwEnabledOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA;
+		return NOERROR;
+	}
+	*pdwEnabledOptions = 0;
+	return E_NOINTERFACE;
+};
+
+STDMETHODIMP CGPAXPlugin::SetInterfaceSafetyOptions(
+    REFIID riid,
+    DWORD dwOptionSetMask,
+    DWORD dwEnabledOptions
+)
+{
+	if ((IID_IDispatch == riid) || (IID_IGPAX == riid) ) {
+		if( (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwOptionSetMask)
+		        && (INTERFACESAFE_FOR_UNTRUSTED_CALLER == dwEnabledOptions) ) {
+			return NOERROR;
+		}
+		return E_FAIL;
+	}
+	else if (IID_IPersistPropertyBag == riid) {
+		if( (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwOptionSetMask)
+		        && (INTERFACESAFE_FOR_UNTRUSTED_DATA == dwEnabledOptions) ) {
+			return NOERROR;
+		}
+		return E_FAIL;
+	}
+	return E_FAIL;
+};
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAXPlugin.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX_i.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAX_p.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAXps.def Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/GPAXps.mk Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/StdAfx.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/StdAfx.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/dlldata.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/gpax.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/GPAX/resource.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/Makefile Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_data.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_data.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_decoder.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_decoder.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_encoder.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_encoder.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_muxer.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/audio_muxer.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/circular_buffer.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/circular_buffer.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/cmd_data.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/cmd_data.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/controler.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/controler.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/dashcast.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/libav_compat.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/message_queue.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/message_queue.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/register.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/register.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/task.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/task.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_data.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_data.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_decoder.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_decoder.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_encoder.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_encoder.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_muxer.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_muxer.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_scaler.c Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/dashcast/video_scaler.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/mp42avi Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/mp42avi/Makefile Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/mp42avi/main.c Added

@@ -0,0 +1,768 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / command-line mp4 toolbox
+ *
+ *  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/isomedia.h>
+#include <gpac/compositor.h>
+#include <gpac/scenegraph.h>
+#include <gpac/bifs.h>
+#include <gpac/options.h>
+
+#ifdef WIN32
+#include <windows.h>
+#define GPAC_CFG_FILE "GPAC.cfg"
+#else
+#include <pwd.h>
+typedef struct tagBITMAPFILEHEADER
+{
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
+} BITMAPFILEHEADER;
+
+typedef struct tagBITMAPINFOHEADER {
+	u32	biSize;
+	s32	biWidth;
+	s32	biHeight;
+	u16	biPlanes;
+	u16	biBitCount;
+	u32	biCompression;
+	u32	biSizeImage;
+	s32	biXPelsPerMeter;
+	s32	biYPelsPerMeter;
+	u32	biClrUsed;
+	u32	biClrImportant;
+} BITMAPINFOHEADER;
+
+#define BI_RGB        0L
+
+#define GPAC_CFG_FILE ".gpacrc"
+#endif
+
+#include <gpac/internal/avilib.h>
+#include <gpac/internal/compositor_dev.h>
+
+void PrintVersion()
+{
+	printf ("MP42AVI - GPAC version %s\n", GPAC_FULL_VERSION);
+}
+
+void PrintUsage()
+{
+	printf ("MP42AVI [option] input\n"
+	        "Dumps BIFS media frames as AVI, BMP or raw\n\n"
+	        "Options\n"
+	        "-fps Framerate: specifies extraction framerate - if not set computed from track length\n"
+	        "-size WxH: forces output BIFS to the given resolution\n"
+	        "-raw [frame]: uses raw format for output - only dumps one frame if specified\n"
+	        "-bmp [frame]: uses BMP format for output - only dumps one frame if specified\n"
+	        "-outpath path: specifies where to dump frames/movie\n"
+	        "\n"
+	        "Note: when dumping a frame, either the frame number can be specified or the frame time\n"
+	        "in the format hh:mm:ss:xFz where hh, mm, ss are hours, minutes, seconds, x the number\n"
+	        "of the frame in the seconds and z the frame rate used to express the time\n"
+	        "\n"
+	        "-cfg: specifies path to GPAC config file (GPAC.cfg)\n"
+	        "-v: prints version\n"
+	        "-h: prints this message\n"
+	        "\nWritten by Jean Le Feuvre - (c) 2000-2005\n");
+}
+
+
+typedef struct
+{
+	GF_Compositor *sr;
+	GF_SceneGraph *sg;
+	GF_BifsDecoder *bifs;
+	GF_ISOFile *file;
+
+	u32 track;
+	u64 duration, cts;
+} BIFSVID;
+
+void node_init(void *cbk, GF_Node *node)
+{
+	BIFSVID *b2v = cbk;
+	switch (gf_node_get_tag(node)) {
+	case TAG_MPEG4_Conditional:
+	case TAG_MPEG4_QuantizationParameter:
+		break;
+	default:
+		if (b2v->sr) gf_sc_on_node_init(b2v->sr, node);
+		break;
+	}
+}
+
+void node_modif(void *cbk, GF_Node *node)
+{
+	BIFSVID *b2v = cbk;
+	if (b2v->sr) gf_sc_invalidate(b2v->sr, node);
+}
+
+Double get_scene_time(void *cbk)
+{
+	Double res;
+	BIFSVID *b2v = cbk;
+	res = (Double) (s64) b2v->cts;
+	res /= (Double) (s64) b2v->duration;
+	return res;
+}
+
+void write_bmp(GF_VideoSurface *fb, char *rad_name, u32 img_num)
+{
+	char str[GF_MAX_PATH];
+	BITMAPFILEHEADER fh;
+	BITMAPINFOHEADER fi;
+	FILE *fout;
+	u32 j, i;
+	char *ptr;
+
+	if (img_num<10) {
+		sprintf(str, "%s_00%d.bmp", rad_name, img_num);
+	} else if (img_num<100) {
+		sprintf(str, "%s_0%d.bmp", rad_name, img_num);
+	} else {
+		sprintf(str, "%s_%d.bmp", rad_name, img_num);
+	}
+
+	fout = gf_fopen(str, "wb");
+	if (!fout) return;
+
+	memset(&fh, 0, sizeof(fh));
+	fh.bfType = 19778;
+	fh.bfOffBits = 14 + 40;
+
+	memset(&fi, 0, sizeof(char)*40);
+	fi.biSize = sizeof(char)*40;
+	fi.biWidth = fb->width;
+	fi.biHeight = fb->height;
+	fi.biPlanes = 1;
+	fi.biBitCount = 24;
+	fi.biCompression = BI_RGB;
+	fi.biSizeImage = fb->pitch * fb->height;
+
+	/*NOT ALIGNED!!*/
+	gf_fwrite(&fh.bfType, 2, 1, fout);
+	gf_fwrite(&fh.bfSize, 4, 1, fout);
+	gf_fwrite(&fh.bfReserved1, 2, 1, fout);
+	gf_fwrite(&fh.bfReserved2, 2, 1, fout);
+	gf_fwrite(&fh.bfOffBits, 4, 1, fout);
+
+	gf_fwrite(&fi, 1, 40, fout);
+
+	for (j=fb->height; j>0; j--) {
+		ptr = fb->video_buffer + (j-1)*fb->pitch;
+		//gf_fwrite(ptr, 1, fb->width  * 3, fout);
+		for (i=0; i<fb->width; i++) {
+			fputc(ptr[2], fout);
+			fputc(ptr[1], fout);
+			fputc(ptr[0], fout);
+			ptr+=3;
+		}
+	}
+
+	gf_fclose(fout);
+}
+
+
+void write_raw(GF_VideoSurface *fb, char *rad_name, u32 img_num)
+{
+	char str[GF_MAX_PATH];
+	FILE *fout;
+	if (img_num<10) {
+		sprintf(str, "%s_00%d.raw", rad_name, img_num);
+	} else if (img_num<100) {
+		sprintf(str, "%s_0%d.raw", rad_name, img_num);
+	} else {
+		sprintf(str, "%s_%d.raw", rad_name, img_num);
+	}
+
+	fout = gf_fopen(str, "wb");
+	if (!fout) return;
+	gf_fwrite(fb->video_buffer , fb->height*fb->pitch, 1, fout);
+	gf_fclose(fout);
+}
+
+void dump_frame(BIFSVID b2v, char *conv_buf, char *out_path, u32 dump_type, avi_t *avi_out, u32 frameNum)
+{
+	u32 k;
+	GF_VideoSurface fb;
+
+	/*lock it*/
+	gf_sc_get_screen_buffer(b2v.sr, &fb);
+	/*export frame*/
+	switch (dump_type) {
+	case 0:
+		/*reverse frame*/
+		for (k=0; k<fb.height; k++) {
+			memcpy(conv_buf + k*fb.width*3, fb.video_buffer + (fb.height-k-1) * fb.pitch, sizeof(char) * fb.width  * 3);
+		}
+		if (AVI_write_frame(avi_out, conv_buf, fb.height*fb.width*3, 1) <0)
+			printf("Error writing frame\n");
+		break;
+	case 2:
+		write_raw(&fb, out_path, frameNum);
+		break;
+	case 1:
+		write_bmp(&fb, out_path, frameNum);
+		break;
+	}
+	/*unlock it*/
+	gf_sc_release_screen_buffer(b2v.sr, &fb);
+}
+
+/*generates an intertwined bmp from a scene file with 5 different viewpoints*/
+void bifs3d_viewpoints_merger(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
+{
+	GF_User user;
+	char out_path[GF_MAX_PATH];
+	char old_driv[1024];
+	BIFSVID b2v;
+	Bool needs_raw;
+	GF_Err e;
+	GF_VideoSurface fb;
+	unsigned char **rendered_frames;
+	u32 nb_viewpoints = 5;
+	u32 viewpoint_index;
+
+
+	/* Configuration of the Rendering Capabilities */
+	{
+		const char *test;
+		char config_path[GF_MAX_PATH];
+		memset(&user, 0, sizeof(GF_User));
+		user.config = gf_cfg_init(szConfigFile, NULL);
+
+		if (!user.config) {
+			fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
+			return;
+		}
+
+		test = gf_cfg_get_key(user.config, "Core", "ModulesDirectory");
+		user.modules = gf_modules_new((const unsigned char *) test, user.config);
+		strcpy(old_driv, "raw_out");
+		if (!gf_modules_get_count(user.modules)) {
+			printf("Error: no modules found\n");
+			goto err_exit;
+		}
+
+		/*switch driver to raw_driver*/
+		test = gf_cfg_get_key(user.config, "core", "video-output");
+		if (test) strcpy(old_driv, test);
+
+		needs_raw = 0;
+		test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
+		/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
+		if (test && strstr(test, "2D")) {
+			needs_raw = 1;
+		}
+	}
+
+	memset(&b2v, 0, sizeof(BIFSVID));
+	user.init_flags = GF_TERM_NO_AUDIO;
+	/* Initialization of the compositor */
+	b2v.sr = gf_sc_new(&user, 0, NULL);
+	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
+
+	/* Initialization of the scene graph */
+	b2v.sg = gf_sg_new();
+	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
+	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
+	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
+
+	/*load config*/
+	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
+
+	{
+		u32 di;
+		u32 track_number;
+		GF_ESD *esd;
+		u16 es_id;
+		b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
+
+		for (track_number=0; track_number<gf_isom_get_track_count(file); track_number++) {
+			esd = gf_isom_get_esd(file, track_number+1, 1);
+			if (!esd) continue;
+			if (!esd->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
+			gf_odf_desc_del((GF_Descriptor *) esd);
+			esd = NULL;
+		}
+		if (!esd) {
+			printf("no bifs track found\n");
+			goto err_exit;
+		}
+
+		es_id = (u16) gf_isom_get_track_id(file, track_number+1);
+		e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
+		if (e) {
+			printf("BIFS init error %s\n", gf_error_to_string(e));
+			gf_odf_desc_del((GF_Descriptor *) esd);
+			esd = NULL;
+			goto err_exit;
+		}
+
+		{
+			GF_ISOSample *samp = gf_isom_get_sample(file, track_number+1, 1, &di);
+			b2v.cts = samp->DTS + samp->CTS_Offset;
+			/*apply command*/
+			gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
+			gf_isom_sample_del(&samp);
+		}
+
+		b2v.duration = gf_isom_get_media_duration(file, track_number+1);
+
+		gf_odf_desc_del((GF_Descriptor *) esd);
+
+	}
+	gf_sc_set_scene(b2v.sr, b2v.sg);
+
+	if (!width || !height) {
+		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
+	}
+	/*we work in RGB24, and we must make sure the pitch is %4*/
+	if ((width*3)%4) {
+		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
+		while ((width*3)%4) width--;
+	}
+	gf_sc_set_size(b2v.sr, width, height);
+	gf_sc_get_screen_buffer(b2v.sr, &fb);
+	width = fb.width;
+	height = fb.height;
+	gf_sc_release_screen_buffer(b2v.sr, &fb);
+
+	GF_SAFEALLOC(rendered_frames, nb_viewpoints*sizeof(char *));
+	for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
+		GF_SAFEALLOC(rendered_frames[viewpoint_index-1], fb.width*fb.height*3);
+		gf_sc_set_viewpoint(b2v.sr, viewpoint_index, NULL);
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
+		/*needed for background2D !!*/
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
+		strcpy(out_path, "");
+		if (out_dir) {
+			strcat(out_path, out_dir);
+			if (out_path[strlen(out_path)-1] != '\\') strcat(out_path, "\\");
+		}
+		strcat(out_path, rad_name);
+		strcat(out_path, "_view");
+		gf_sc_get_screen_buffer(b2v.sr, &fb);
+		write_bmp(&fb, out_path, viewpoint_index);
+		memcpy(rendered_frames[viewpoint_index-1], fb.video_buffer, fb.width*fb.height*3);
+		gf_sc_release_screen_buffer(b2v.sr, &fb);
+	}
+
+	if (width != 800 || height != 480) {
+		printf("Wrong scene dimension, cannot produce output\n");
+		goto err_exit;
+	} else {
+		u32 x, y;
+		GF_VideoSurface out_fb;
+		u32 bpp = 3;
+		out_fb.width = 800;
+		out_fb.height = 480;
+		out_fb.pitch = 800*bpp;
+		out_fb.pixel_format = GF_PIXEL_RGB_24;
+		out_fb.is_hardware_memory = 0;
+		GF_SAFEALLOC(out_fb.video_buffer, out_fb.pitch*out_fb.height)
+#if 1
+		for (y=0; y<out_fb.height; y++) {
+			/*starting red pixel is R1, R5, R4, R3, R2, R1, R5, ... when increasing line num*/
+			u32 line_shift = (5-y) % 5;
+			for (x=0; x<out_fb.width; x++) {
+				u32 view_shift = (line_shift+bpp*x)%5;
+				u32 offset = out_fb.pitch*y + x*bpp;
+				/* red */
+				out_fb.video_buffer[offset] = rendered_frames[view_shift][offset];
+				/* green */
+				out_fb.video_buffer[offset+1] = rendered_frames[(view_shift+1)%5][offset+1];
+				/* blue */
+				out_fb.video_buffer[offset+2] = rendered_frames[(view_shift+2)%5][offset+2];
+			}
+		}
+#else
+		/*calibration*/
+		for (y=0; y<out_fb.height; y++) {
+			u32 line_shift = (5- y%5) % 5;
+			for (x=0; x<out_fb.width; x++) {
+				u32 view_shift = (line_shift+bpp*x)%5;
+				u32 offset = out_fb.pitch*y + x*bpp;
+				out_fb.video_buffer[offset] = ((view_shift)%5 == 2) ? 0xFF : 0;
+				out_fb.video_buffer[offset+1] = ((view_shift+1)%5 == 2) ? 0xFF : 0;
+				out_fb.video_buffer[offset+2] = ((view_shift+2)%5 == 2) ? 0xFF : 0;
+			}
+		}
+#endif
+		write_bmp(&out_fb, "output", 0);
+	}
+
+	/*destroy everything*/
+	gf_bifs_decoder_del(b2v.bifs);
+	gf_sg_del(b2v.sg);
+	gf_sc_set_scene(b2v.sr, NULL);
+	gf_sc_del(b2v.sr);
+
+
+
+err_exit:
+	/*	if (rendered_frames) {
+			for (viewpoint_index = 1; viewpoint_index <= nb_viewpoints; viewpoint_index++) {
+				if (rendered_frames[viewpoint_index-1]) gf_free(rendered_frames[viewpoint_index-1]);
+			}
+			gf_free(rendered_frames);
+		}
+		if (output_merged_frame) gf_free(output_merged_frame);
+	*/
+	if (user.modules) gf_modules_del(user.modules);
+	if (needs_raw) gf_cfg_set_key(user.config, "core", "video-output", old_driv);
+	gf_cfg_del(user.config);
+}
+
+void bifs_to_vid(GF_ISOFile *file, char *szConfigFile, u32 width, u32 height, char *rad_name, u32 dump_type, char *out_dir, Double fps, s32 frameID, s32 dump_time)
+{
+	GF_User user;
+	BIFSVID b2v;
+	u16 es_id;
+	Bool first_dump, needs_raw;
+	u32 i, j, di, count, timescale, frameNum;
+	u32 duration, cur_time;
+	GF_VideoSurface fb;
+	GF_Err e;
+	char old_driv[1024];
+	const char *test;
+	char config_path[GF_MAX_PATH];
+	avi_t *avi_out;
+	Bool reset_fps;
+	GF_ESD *esd;
+	char comp[5];
+	char *conv_buf;
+
+	memset(&user, 0, sizeof(GF_User));
+	if (szConfigFile && strlen(szConfigFile)) {
+		user.config = gf_cfg_init(config_path, NULL);
+	} else {
+		user.config = gf_cfg_init(NULL, NULL);
+	}
+
+	if (!user.config) {
+		fprintf(stdout, "Error: Configuration File \"%s\" not found in %s\n", GPAC_CFG_FILE, config_path);
+		return;
+	}
+	avi_out = NULL;
+	conv_buf = NULL;
+	esd = NULL;
+	needs_raw = 0;
+	test = gf_cfg_get_key(user.config, "Core", "ModulesDirectory");
+	user.modules = gf_modules_new((const unsigned char *) test, user.config);
+	strcpy(old_driv, "raw_out");
+	if (!gf_modules_get_count(user.modules)) {
+		printf("Error: no modules found\n");
+		goto err_exit;
+	}
+
+	/*switch driver to raw_driver*/
+	test = gf_cfg_get_key(user.config, "core", "video-output");
+	if (test) strcpy(old_driv, test);
+
+	test = gf_cfg_get_key(user.config, "Compositor", "RendererName");
+	/*since we only support RGB24 for MP42AVI force using RAW out with 2D driver*/
+	if (test && strstr(test, "2D")) {
+		needs_raw = 1;
+	}
+
+	needs_raw = 0;
+	user.init_flags = GF_TERM_NO_AUDIO | GF_TERM_FORCE_3D;
+	b2v.sr = gf_sc_new(&user, 0, NULL);
+	gf_sc_set_option(b2v.sr, GF_OPT_VISIBLE, 0);
+
+	b2v.sg = gf_sg_new();
+	gf_sg_set_scene_time_callback(b2v.sg, get_scene_time, &b2v);
+	gf_sg_set_init_callback(b2v.sg, node_init, &b2v);
+	gf_sg_set_modified_callback(b2v.sg, node_modif, &b2v);
+
+	/*load config*/
+	gf_sc_set_option(b2v.sr, GF_OPT_RELOAD_CONFIG, 1);
+
+	b2v.bifs = gf_bifs_decoder_new(b2v.sg, 0);
+
+	strcpy(config_path, "");
+	if (out_dir) {
+		strcat(config_path, out_dir);
+		if (config_path[strlen(config_path)-1] != '\\') strcat(config_path, "\\");
+	}
+	strcat(config_path, rad_name);
+	strcat(config_path, "_bifs");
+	if (!dump_type) {
+		strcat(config_path, ".avi");
+		avi_out = AVI_open_output_file(config_path);
+		comp[0] = comp[1] = comp[2] = comp[3] = comp[4] = 0;
+		if (!avi_out) goto err_exit;
+	}
+
+
+	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->dependsOnESID && (esd->decoderConfig->streamType == GF_STREAM_SCENE)) break;
+		gf_odf_desc_del((GF_Descriptor *) esd);
+		esd = NULL;
+	}
+	if (!esd) {
+		printf("no bifs track found\n");
+		goto err_exit;
+	}
+
+	b2v.duration = gf_isom_get_media_duration(file, i+1);
+	timescale = gf_isom_get_media_timescale(file, i+1);
+	es_id = (u16) gf_isom_get_track_id(file, i+1);
+	e = gf_bifs_decoder_configure_stream(b2v.bifs, es_id, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, esd->decoderConfig->objectTypeIndication);
+	if (e) {
+		printf("BIFS init error %s\n", gf_error_to_string(e));
+		gf_odf_desc_del((GF_Descriptor *) esd);
+		esd = NULL;
+		goto err_exit;
+	}
+	if (dump_time>=0) dump_time = dump_time *1000 / timescale;
+
+	gf_sc_set_scene(b2v.sr, b2v.sg);
+	count = gf_isom_get_sample_count(file, i+1);
+
+	reset_fps = 0;
+	if (!fps) {
+		fps = (Float) (count * timescale);
+		fps /= (Double) (s64) b2v.duration;
+		printf("Estimated BIFS FrameRate %g\n", fps);
+		reset_fps = 1;
+	}
+
+	if (!width || !height) {
+		gf_sg_get_scene_size_info(b2v.sg, &width, &height);
+	}
+	/*we work in RGB24, and we must make sure the pitch is %4*/
+	if ((width*3)%4) {
+		printf("Adjusting width (%d) to have a stride multiple of 4\n", width);
+		while ((width*3)%4) width--;
+	}
+
+	gf_sc_set_size(b2v.sr, width, height);
+	gf_sc_draw_frame(b2v.sr, 0, NULL);
+
+	gf_sc_get_screen_buffer(b2v.sr, &fb);
+	width = fb.width;
+	height = fb.height;
+	if (avi_out) {
+		AVI_set_video(avi_out, width, height, fps, comp);
+		conv_buf = gf_malloc(sizeof(char) * width * height * 3);
+	}
+	printf("Dumping at BIFS resolution %d x %d\n\n", width, height);
+	gf_sc_release_screen_buffer(b2v.sr, &fb);
+
+	cur_time = 0;
+
+	duration = (u32)(timescale / fps);
+	if (reset_fps) fps = 0;
+
+	frameNum = 1;
+	first_dump = 1;
+	for (j=0; j<count; j++) {
+		GF_ISOSample *samp = gf_isom_get_sample(file, i+1, j+1, &di);
+
+		b2v.cts = samp->DTS + samp->CTS_Offset;
+		/*apply command*/
+		gf_bifs_decode_au(b2v.bifs, es_id, samp->data, samp->dataLength, ((Double)(s64)b2v.cts)/1000.0);
+		gf_isom_sample_del(&samp);
+
+		if ((frameID>=0) && (j<(u32)frameID)) continue;
+		if ((dump_time>=0) && ((u32) dump_time>b2v.cts)) continue;
+		/*render frame*/
+		gf_sc_draw_frame(b2v.sr, 0, NULL);
+		/*needed for background2D !!*/
+		if (first_dump) {
+			gf_sc_draw_frame(b2v.sr, 0, NULL);
+			first_dump = 0;
+		}
+
+		if (fps) {
+			if (cur_time > b2v.cts) continue;
+
+			while (1) {
+				printf("dumped frame time %f (frame %d - sample %d)\r", ((Float)cur_time)/timescale, frameNum, j+1);
+				dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, frameNum);
+				frameNum++;
+				cur_time += duration;
+				if (cur_time > b2v.cts) break;
+			}
+		} else {
+			dump_frame(b2v, conv_buf, config_path, dump_type, avi_out, (frameID>=0) ? frameID : frameNum);
+			if (frameID>=0 || dump_time>=0) break;
+			frameNum++;
+			printf("dumped frame %d / %d\r", j+1, count);
+		}
+
+	}
+	gf_odf_desc_del((GF_Descriptor *) esd);
+
+	/*destroy everything*/
+	gf_bifs_decoder_del(b2v.bifs);
+	gf_sg_del(b2v.sg);
+	gf_sc_set_scene(b2v.sr, NULL);
+	gf_sc_del(b2v.sr);
+
+err_exit:
+	if (avi_out) AVI_close(avi_out);
+	if (conv_buf) gf_free(conv_buf);
+	if (user.modules) gf_modules_del(user.modules);
+	if (needs_raw) gf_cfg_set_key(user.config, "core", "video-output", old_driv);
+	gf_cfg_del(user.config);
+}
+
+int main (int argc, char **argv)
+{
+	Double fps_dump;
+	u32 i;
+	char rad[500];
+	s32 frameID, h, m, s, f;
+	Float fps;
+	u32 dump_type;
+	s32 dump_time;
+	u32 dump_w, dump_h;
+	Bool copy;
+	char szConfigFile[4096];
+	char *dump_out;
+	char *inName, *arg;
+	GF_ISOFile *file;
+
+	if (argc < 2) {
+		PrintUsage();
+		return 0;
+	}
+
+	dump_type = 0;
+	fps_dump = 0.0f;
+	dump_w = dump_h = 0;
+	dump_out = NULL;
+	inName = NULL;
+	frameID = -1;
+	dump_time = -1;
+	szConfigFile[0] = 0;
+
+	for (i = 1; i < (u32) argc ; i++) {
+		arg = argv[i];
+		if (arg[0] != '-') {
+			inName = arg;
+			break;
+		}
+		if (!stricmp(arg, "-h")) {
+			PrintUsage();
+			return 0;
+		} else if (!stricmp(arg, "-version")) {
+			PrintVersion();
+			return 0;
+		} else if (!stricmp(arg, "-size")) {
+			sscanf(argv[i+1], "%dx%d", &dump_w, &dump_h);
+			i++;
+		} else if (!stricmp(arg, "-raw")) {
+			dump_type = 2;
+			if ((i+1<(u32)argc) && (argv[i+1][0]!='-')) {
+				if (strstr(argv[i+1], "T")) {
+					if (strstr(argv[i+1], "F")) {
+						sscanf(argv[i+1], "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
+						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
+					} else {
+						sscanf(argv[i+1], "T%d:%d:%d", &h, &m, &s);
+						dump_time = (s32) ((3600*h + 60*m + s)*1000);
+					}
+				} else {
+					frameID = atoi(argv[i+1]);
+				}
+				i++;
+			}
+		} else if (!stricmp(arg, "-bmp")) {
+			dump_type = 1;
+			if ((i+1<(u32)argc) && (argv[i+1][0]!='-')) {
+				if (strstr(argv[i+1], "T")) {
+					if (strstr(argv[i+1], "F")) {
+						sscanf(argv[i+1], "T%d:%d:%d:%dF%f", &h, &m, &s, &f, &fps);
+						dump_time = (s32) ((3600*h + 60*m + s)*1000 + 1000*f/fps);
+					} else {
+						sscanf(argv[i+1], "T%d:%d:%d", &h, &m, &s);
+						dump_time = (s32) ((3600*h + 60*m + s)*1000);
+					}
+				} else {
+					frameID = atoi(argv[i+1]);
+				}
+				i++;
+			}
+		} else if (!stricmp(arg, "-3d")) {
+			dump_type = 3;
+		} else if (!stricmp(arg, "-outpath")) {
+			dump_out = argv[i+1];
+			i++;
+		} else if (!stricmp(arg, "-fps")) {
+			fps_dump = atof(argv[i+1]);
+			i++;
+		} else if (!stricmp(arg, "-copy")) {
+			copy = 1;
+		} else if (!stricmp(arg, "-cfg")) {
+			strcpy(szConfigFile, argv[i+1]);
+			i += 1;
+		} else {
+			PrintUsage();
+			return (0);
+		}
+	}
+	if (!inName) {
+		PrintUsage();
+		return 0;
+	}
+	gf_sys_init(GF_MemTrackerNone);
+
+	file = gf_isom_open(inName, GF_ISOM_OPEN_READ, NULL);
+	if (!file) {
+		printf("Error opening file: %s\n", gf_error_to_string(gf_isom_last_error(NULL)));
+		return 0;
+	}
+
+	if (dump_out) {
+		arg = strrchr(inName, GF_PATH_SEPARATOR);
+		if (arg) {
+			strcpy(rad, arg + 1);
+		} else {
+			strcpy(rad, inName);
+		}
+	} else {
+		strcpy(rad, inName);
+	}
+	while (rad[strlen(rad)-1] != '.') rad[strlen(rad)-1] = 0;
+	rad[strlen(rad)-1] = 0;
+	if (dump_type == 3) {
+		bifs3d_viewpoints_merger(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
+	}
+	else bifs_to_vid(file, szConfigFile, dump_w, dump_h, rad, dump_type, dump_out, fps_dump, frameID, dump_time);
+	printf("\ndone\n");
+	gf_isom_delete(file);
+	return 0;
+
+}
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_icon.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_icon_mask.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_menu.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4_menu_mask.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/aif/osmo4aif.rss Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_ui.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_ui.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_view.cpp Added

@@ -0,0 +1,587 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2006-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Symbian GUI player
+ *
+ *  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 FILES
+#include <coemain.h>
+#include <eikenv.h>
+
+#include "osmo4_view.h"
+#include "osmo4_ui.h"
+
+#include <gpac/options.h>
+/*for initial setup*/
+#include <gpac/modules/service.h>
+
+
+#if defined(__SERIES60_3X__)
+#define GPAC_CFG_DIR	"\\private\\F01F9075\\"
+#define GPAC_MODULES_DIR	"\\sys\\bin\\"
+#else
+#define GPAC_CFG_DIR	"\\system\\apps\\Osmo4\\"
+#define GPAC_MODULES_DIR	GPAC_CFG_DIR
+#endif
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// Cosmo4AppView::NewL()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+COsmo4AppView* COsmo4AppView::NewL( const TRect& aRect )
+{
+	COsmo4AppView* self = COsmo4AppView::NewLC( aRect );
+	CleanupStack::Pop( self );
+	return self;
+}
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::NewLC()
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+COsmo4AppView* COsmo4AppView::NewLC( const TRect& aRect )
+{
+	COsmo4AppView* self = new ( ELeave ) COsmo4AppView;
+	CleanupStack::PushL( self );
+	self->ConstructL( aRect );
+	return self;
+}
+
+
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::COsmo4AppView()
+// C++ default constructor can NOT contain any code, that might leave.
+// -----------------------------------------------------------------------------
+//
+COsmo4AppView::COsmo4AppView()
+{
+	// No implementation required
+	m_pTimer = NULL;
+#ifndef GPAC_GUI_ONLY
+	memset(&m_user, 0, sizeof(GF_User));
+	m_term = NULL;
+	m_mx = NULL;
+	memset(&m_rti, 0, sizeof(GF_SystemRTInfo));
+#endif
+	last_title_update = 0;
+	show_rti = 0;
+#if defined(__SERIES60_3X__)
+	selector = NULL;
+	target = NULL;
+#endif
+}
+
+
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::~COsmo4AppView()
+// Destructor.
+// -----------------------------------------------------------------------------
+//
+COsmo4AppView::~COsmo4AppView()
+{
+	Shutdown();
+#ifndef GPAC_GUI_ONLY
+	if (m_mx) gf_mx_del(m_mx);
+#endif
+
+#if defined(__SERIES60_3X__)
+	if (selector) delete selector;
+	//if (target) delete target;
+#endif
+}
+
+void COsmo4AppView::Shutdown()
+{
+//	MessageBox("Osmo4 shutdown request", "");
+	if (m_pTimer) {
+		m_pTimer->Cancel();
+		delete m_pTimer;
+		m_pTimer = NULL;
+	}
+#ifndef GPAC_GUI_ONLY
+	if (m_term) {
+		GF_Terminal *t = m_term;
+		m_term = NULL;
+		gf_term_del(t);
+	}
+	if (m_Logs) {
+		gf_fclose(m_Logs);
+		m_Logs = NULL;
+	}
+	if (m_user.config) {
+		gf_cfg_del(m_user.config);
+		m_user.config = NULL;
+	}
+	if (m_user.modules) {
+		gf_modules_del(m_user.modules);
+		m_user.modules = NULL;
+	}
+#endif
+//	MessageBox("Osmo4 shutdown OK", "");
+}
+
+void COsmo4AppView::MessageBox(const char *text, const char *title)
+{
+	HBufC *msg1, *msg2;
+	TInt length = User::StringLength( ( TUint8* ) text) + 1;
+	msg1 = HBufC::NewL( length );
+	msg1->Des().Copy( TPtrC8(( TText8* ) text) );
+
+	length = User::StringLength( ( TUint8* ) title) + 1;
+	msg2 = HBufC::NewL( length );
+	msg2->Des().Copy( TPtrC8(( TText8* ) title) );
+
+	CEikonEnv::Static()->InfoWinL(*msg2, *msg1);
+	delete msg1;
+	delete msg2;
+}
+
+TInt myTick(TAny* aObject)
+{
+	return ((COsmo4AppView*)aObject)->OnTick();
+}
+
+TInt COsmo4AppView::OnTick()
+{
+#ifndef GPAC_GUI_ONLY
+	if (m_term) gf_term_process_step(m_term);
+
+	/*check RTI display*/
+	if (show_rti && gf_sys_get_rti(500, &m_rti, 0)) DisplayRTI();
+#endif
+	/*never stop...*/
+	return 1;
+}
+
+void COsmo4AppView::DisplayRTI()
+{
+#ifndef GPAC_GUI_ONLY
+	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
+	char szInfo[20];
+	sprintf(szInfo, "CPU %02d FPS %02.2f", m_rti.process_cpu_usage, gf_term_get_framerate(m_term, 0));
+	app->SetInfo(szInfo);
+#endif
+}
+
+
+//GPAC log function
+static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
+{
+	char szMsg[2048];
+	COsmo4AppView *app = (COsmo4AppView *)cbk;
+
+#ifndef GPAC_GUI_ONLY
+	gf_mx_p(app->m_mx);
+	if (app->m_Logs) {
+		vfprintf(app->m_Logs, fmt, list);
+	} else {
+		vsnprintf(szMsg, 2048, fmt, list);
+		app->MessageBox(szMsg, "Error:");
+	}
+	gf_mx_v(app->m_mx);
+#endif
+}
+
+static Bool GPAC_EventProc(void *ptr, GF_Event *evt)
+{
+	COsmo4AppView *app = (COsmo4AppView *)ptr;
+	return app->EventProc(evt);
+}
+
+Bool COsmo4AppView::EventProc(GF_Event *evt)
+{
+	TRect r;
+
+#ifndef GPAC_GUI_ONLY
+	switch (evt->type) {
+	case GF_EVENT_MESSAGE:
+		if (!evt->message.message) return 0;
+		if (evt->message.error) {
+			char err[1024];
+			sprintf(err, "Error: %s", gf_error_to_string(evt->message.error));
+			MessageBox(evt->message.message, err);
+		} else {
+			MessageBox(evt->message.message, "Info");
+		}
+		break;
+	case GF_EVENT_SCENE_SIZE:
+		r = Rect();
+		gf_term_set_size(m_term, r.Width(), r.Height());
+		break;
+	}
+#endif
+	return 0;
+}
+
+void COsmo4AppView::SetupLogs()
+{
+	const char *opt;
+
+#ifndef GPAC_GUI_ONLY
+	gf_mx_p(m_mx);
+	if (do_log) {
+		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
+		do_log = 0;
+	}
+	/*setup GPAC logs: log all errors*/
+	opt = gf_cfg_get_key(m_user.config, "General", "Logs");
+	if (opt && !strstr(opt, "none")) {
+		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
+		if (!filename) {
+			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\data\\gpac_logs.txt");
+			filename = "\\data\\gpac_logs.txt";
+		}
+		m_Logs = gf_fopen(filename, "wt");
+		if (!m_Logs) {
+			MessageBox("Cannot open log file - disabling logs", "Warning !");
+		} else {
+			MessageBox("Debug logs enabled!", filename);
+			do_log = 1;
+			gf_log_set_tools_levels( opt );
+		}
+	}
+	if (!do_log) {
+		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
+		if (m_Logs) gf_fclose(m_Logs);
+	}
+
+	gf_log_set_callback(this, on_gpac_log);
+	gf_mx_v(m_mx);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Osmo4 logs initialized\n"));
+#endif
+}
+
+
+static void Osmo4_progress_cbk(void *usr, char *title, u32 done, u32 total)
+{
+#ifndef GPAC_GUI_ONLY
+	COsmo4AppView *view = (COsmo4AppView *) usr;
+	COsmo4AppUi *app = (COsmo4AppUi *) CEikonEnv::Static()->AppUi();
+
+	if (done==total) {
+		app->SetInfo(NULL);
+	} else if (view->last_title_update + 500 < gf_sys_clock()) {
+		char szName[1024];
+		view->last_title_update = gf_sys_clock();
+		sprintf(szName, "%s %02d %%", title, (done*100 / total) );
+		app->SetInfo(szName);
+	}
+#endif
+}
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::ConstructL()
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void COsmo4AppView::ConstructL( const TRect& aRect )
+{
+	const char *opt;
+	Bool first_launch = 0;
+
+#if defined(__SERIES60_3X__)
+	selector = CRemConInterfaceSelector::NewL();
+	target = CRemConCoreApiTarget::NewL(*selector, *this);
+	selector->OpenTargetL();
+#endif
+
+	// Create a window for this application view
+	CreateWindowL();
+	// Set the windows size
+	SetRect( aRect );
+	//draw
+	ActivateL();
+
+#ifndef GPAC_GUI_ONLY
+	m_window = Window();
+	m_session = CEikonEnv::Static()->WsSession();
+
+	m_mx = gf_mx_new("Osmo4");
+
+	//load config file
+	m_user.config = gf_cfg_init(NULL, &first_launch);
+	if (!m_user.config) {
+		MessageBox("Cannot create GPAC Config file", "Fatal Error");
+		User::Leave(KErrGeneral);
+	}
+	if (first_launch) {
+		MessageBox("Osmo4", "Thank you for Installing");
+	}
+
+	/*load modules*/
+	opt = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
+	m_user.modules = gf_modules_new(opt, m_user.config);
+	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
+		MessageBox(m_user.modules ? "No modules available" : "Cannot create module manager", "Fatal Error");
+		if (m_user.modules) gf_modules_del(m_user.modules);
+		gf_cfg_del(m_user.config);
+		User::Leave(KErrGeneral);
+	}
+
+	if (first_launch) {
+		/*first launch, register all files ext*/
+		for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
+			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
+			if (!ifce) continue;
+			if (ifce) {
+				ifce->CanHandleURL(ifce, "test.test");
+				gf_modules_close_interface((GF_BaseInterface *)ifce);
+			}
+		}
+	}
+
+	/*we don't thread the terminal, ie appart from the audio renderer, media decoding and visual rendering is
+	handled by the app process*/
+	m_user.init_flags = GF_TERM_NO_REGULATION;
+	m_user.EventProc = GPAC_EventProc;
+	m_user.opaque = this;
+	m_user.os_window_handler = (void *) &m_window;
+	m_user.os_display = (void *) &m_session;
+
+	m_term = gf_term_new(&m_user);
+	if (!m_term) {
+		MessageBox("Cannot load GPAC terminal", "Fatal Error");
+		gf_modules_del(m_user.modules);
+		gf_cfg_del(m_user.config);
+		User::Leave(KErrGeneral);
+	}
+	//MessageBox("GPAC terminal loaded", "Success !");
+
+	/*ok set output size*/
+	TSize s = m_window.Size();
+	gf_term_set_size(m_term, s.iWidth, s.iHeight);
+
+
+	/*start our callback (every ms)*/
+	const TInt KTickInterval = 33000;
+	m_pTimer = CPeriodic::NewL(CActive::EPriorityStandard);
+	m_pTimer->Start(KTickInterval, KTickInterval, TCallBack(myTick, this));
+
+	opt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+	if (opt) gf_term_connect(m_term, opt);
+
+#endif
+
+}
+
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::Draw()
+// Draws the display.
+// -----------------------------------------------------------------------------
+//
+void COsmo4AppView::Draw( const TRect& /*aRect*/ ) const
+{
+#ifndef GPAC_GUI_ONLY
+	if (!m_term) {
+		CWindowGc& gc = SystemGc();
+		TRgb black(0,0,0);
+		gc.SetBrushColor(black);
+		gc.Clear();
+	} else {
+		/*FIXME - this is just to force a screen flush, needs rework*/
+		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
+	}
+#else
+	CWindowGc& gc = SystemGc();
+	TRgb black(0,0,0);
+	TRect rect = Rect();
+	gc.SetBrushColor(black);
+	gc.Clear(rect);
+#endif
+}
+
+void COsmo4AppView::ShowHide(Bool show)
+{
+#ifndef GPAC_GUI_ONLY
+	if (show) {
+		MakeVisible(ETrue);
+		if (m_term) {
+			gf_term_set_option(m_term, GF_OPT_VISIBLE, 1);
+			DrawDeferred();
+		}
+	} else {
+		MakeVisible(EFalse);
+		if (m_term) gf_term_set_option(m_term, GF_OPT_VISIBLE, 0);
+	}
+#else
+	MakeVisible(ETrue);
+#endif
+}
+
+// -----------------------------------------------------------------------------
+// COsmo4AppView::SizeChanged()
+// Called by framework when the view size is changed.
+// -----------------------------------------------------------------------------
+//
+void COsmo4AppView::SizeChanged()
+{
+#ifndef GPAC_GUI_ONLY
+	if (m_term) {
+		TSize s = m_window.Size();
+		gf_term_set_size(m_term, s.iWidth, s.iHeight);
+	}
+#endif
+	DrawNow();
+}
+
+void COsmo4AppView::Connect(const char *url)
+{
+#ifndef GPAC_GUI_ONLY
+	char the_url[1024];
+	/*copy before removing from recent files*/
+	strcpy(the_url, url);
+	gf_cfg_set_key(m_user.config, "RecentFiles", the_url, NULL);
+	gf_cfg_insert_key(m_user.config, "RecentFiles", the_url, "", 0);
+	u32 count = gf_cfg_get_key_count(m_user.config, "RecentFiles");
+	if (count > 10) gf_cfg_set_key(m_user.config, "RecentFiles", gf_cfg_get_key_name(m_user.config, "RecentFiles", count-1), NULL);
+
+	if (m_term) gf_term_connect(m_term, the_url);
+#endif
+}
+
+
+TKeyResponse COsmo4AppView::OfferKeyEventL(const TKeyEvent& aKeyEvent, TEventCode aType)
+{
+	GF_Event evt;
+	u32 ret;
+
+	evt.key.hw_code = aKeyEvent.iScanCode;
+	evt.key.flags = 0;
+	switch (aType) {
+	case EEventKeyUp:
+		evt.type = GF_EVENT_KEYUP;
+		break;
+	case EEventKeyDown:
+	case EEventKey:
+		evt.type = GF_EVENT_KEYDOWN;
+		break;
+	default:
+		return EKeyWasNotConsumed;
+	}
+
+	switch (aKeyEvent.iCode) {
+	case EKeyLeftArrow:
+		evt.key.key_code = GF_KEY_LEFT;
+		break;
+	case EKeyRightArrow:
+		evt.key.key_code = GF_KEY_RIGHT;
+		break;
+	case EKeyUpArrow:
+		evt.key.key_code = GF_KEY_UP;
+		break;
+	case EKeyDownArrow:
+		evt.key.key_code = GF_KEY_DOWN;
+		break;
+	case EKeyIncVolume:
+		evt.key.key_code = GF_KEY_VOLUMEUP;
+		break;
+	case EKeyDecVolume:
+		evt.key.key_code = GF_KEY_VOLUMEDOWN;
+		break;
+	default:
+		switch (aKeyEvent.iScanCode) {
+		case EStdKeyIncVolume:
+			evt.key.key_code = GF_KEY_VOLUMEUP;
+			break;
+		case EStdKeyDecVolume:
+			evt.key.key_code = GF_KEY_VOLUMEDOWN;
+			break;
+		default:
+			return EKeyWasNotConsumed;
+		}
+	}
+#ifndef GPAC_GUI_ONLY
+	ret = gf_term_user_event(m_term, &evt);
+	/*generate a key up*/
+	if (aType==EEventKey) {
+		evt.type = GF_EVENT_KEYUP;
+		ret += gf_term_user_event(m_term, &evt);
+	}
+#else
+	ret = 0;
+#endif
+	return ret ? EKeyWasConsumed : EKeyWasNotConsumed;
+}
+
+#if defined(__SERIES60_3X__)
+void COsmo4AppView::MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct)
+{
+	GF_Event e;
+	switch (aOperationId) {
+	/*
+	    TRequestStatus status;
+		case ERemConCoreApiPausePlayFunction:
+		case ERemConCoreApiStop:
+		case ERemConCoreApiRewind:
+		case ERemConCoreApiForward:
+		case ERemConCoreApiFastForward:
+		case ERemConCoreApiBackward:
+			switch (aButtonAct) {
+			case ERemConCoreApiButtonPress:
+				break;
+			case ERemConCoreApiButtonRelease:
+				break;
+			case ERemConCoreApiButtonClick:
+				break;
+			default:
+				break;
+			}
+	*/
+	case ERemConCoreApiVolumeUp:
+	case ERemConCoreApiVolumeDown:
+#ifndef GPAC_GUI_ONLY
+		e.key.hw_code = 0;
+		e.key.flags = 0;
+		e.key.key_code = (aOperationId==ERemConCoreApiVolumeUp) ? GF_KEY_VOLUMEUP : GF_KEY_VOLUMEDOWN;
+		switch (aButtonAct) {
+		case ERemConCoreApiButtonPress:
+			e.type = GF_EVENT_KEYDOWN;
+			gf_term_user_event(m_term, &e);
+			break;
+		case ERemConCoreApiButtonRelease:
+			e.type = GF_EVENT_KEYUP;
+			gf_term_user_event(m_term, &e);
+			break;
+		default:
+			e.type = GF_EVENT_KEYDOWN;
+			gf_term_user_event(m_term, &e);
+			e.type = GF_EVENT_KEYUP;
+			gf_term_user_event(m_term, &e);
+			break;
+		}
+#endif
+		break;
+	default:
+		break;
+	}
+}
+
+#endif

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/osmo4_view.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/playlist.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/playlist.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4.rss Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4.svg Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_caption.rss Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_gen.rss Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_sym/res/osmo4_reg.rss Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32 Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/AddressBar.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/AddressBar.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/FileProps.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/FileProps.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/MainFrm.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/MainFrm.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/OpenUrl.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/OpenUrl.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.cpp Added

@@ -0,0 +1,2080 @@
+// Options.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "Osmo4.h"
+#include "MainFrm.h"
+
+#include <gpac/modules/codec.h>
+#include <gpac/modules/raster2d.h>
+#include <gpac/modules/font.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/video_out.h>
+
+#include <gpac/iso639.h>
+#include "Options.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// COptions dialog
+
+
+COptions::COptions(CWnd* pParent /*=NULL*/)
+	: CDialog(COptions::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptions)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptions::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptions)
+	DDX_Control(pDX, IDC_SELECT, m_Selector);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptions, CDialog)
+	//{{AFX_MSG_MAP(COptions)
+	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
+	ON_WM_CLOSE()
+	ON_WM_DESTROY()
+	ON_CBN_SELCHANGE(IDC_SELECT, OnSelchangeSelect)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+BOOL COptions::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	m_general.Create(IDD_OPT_GEN, this);
+	m_systems.Create(IDD_OPT_SYSTEMS, this);
+	m_render.Create(IDD_OPT_RENDER, this);
+	m_render2d.Create(IDD_OPT_RENDER2D, this);
+	m_render3d.Create(IDD_OPT_RENDER3D, this);
+	m_decoder.Create(IDD_OPT_DECODER, this);
+	m_audio.Create(IDD_OPT_AUDIO, this);
+	m_video.Create(IDD_OPT_VIDEO, this);
+	m_http.Create(IDD_OPT_HTTP, this);
+	m_font.Create(IDD_OPT_FONT, this);
+	m_stream.Create(IDD_OPT_STREAM, this);
+	m_cache.Create(IDD_OPT_MCACHE, this);
+	m_files.Create(IDD_OPT_FILETYPES, this);
+	m_logs.Create(IDD_OPT_LOGS, this);
+
+	m_Selector.AddString("General");
+	m_Selector.AddString("MPEG-4 Systems");
+	m_Selector.AddString("Media Decoders");
+	m_Selector.AddString("Compositor");
+	m_Selector.AddString("2D Drawing");
+	m_Selector.AddString("3D Drawing");
+	m_Selector.AddString("Video Output");
+	m_Selector.AddString("Audio Output");
+	m_Selector.AddString("Text Engine");
+	m_Selector.AddString("File Download");
+	m_Selector.AddString("Real-Time Streaming");
+	m_Selector.AddString("Streaming Cache");
+	m_Selector.AddString("File Types");
+	m_Selector.AddString("Log System");
+
+	HideAll();
+
+	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
+	u32 sel = sOpt ? atoi(sOpt) : 0;
+	if (sel>13) sel=13;
+	m_Selector.SetCurSel(sel);
+	m_general.ShowWindow(SW_SHOW);
+
+	OnSelchangeSelect();
+
+	return TRUE;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// COptions message handlers
+
+void COptions::HideAll()
+{
+	m_general.ShowWindow(SW_HIDE);
+	m_systems.ShowWindow(SW_HIDE);
+	m_render.ShowWindow(SW_HIDE);
+	m_render2d.ShowWindow(SW_HIDE);
+	m_render3d.ShowWindow(SW_HIDE);
+	m_audio.ShowWindow(SW_HIDE);
+	m_video.ShowWindow(SW_HIDE);
+	m_http.ShowWindow(SW_HIDE);
+	m_font.ShowWindow(SW_HIDE);
+	m_stream.ShowWindow(SW_HIDE);
+	m_decoder.ShowWindow(SW_HIDE);
+	m_cache.ShowWindow(SW_HIDE);
+	m_files.ShowWindow(SW_HIDE);
+	m_files.ShowWindow(SW_HIDE);
+	m_logs.ShowWindow(SW_HIDE);
+}
+
+void COptions::OnSelchangeSelect()
+{
+	HideAll();
+	switch (m_Selector.GetCurSel()) {
+	case 0:
+		m_general.ShowWindow(SW_SHOW);
+		break;
+	case 1:
+		m_systems.ShowWindow(SW_SHOW);
+		break;
+	case 2:
+		m_decoder.ShowWindow(SW_SHOW);
+		break;
+	case 3:
+		m_render.ShowWindow(SW_SHOW);
+		break;
+	case 4:
+		m_render2d.ShowWindow(SW_SHOW);
+		break;
+	case 5:
+		m_render3d.ShowWindow(SW_SHOW);
+		break;
+	case 6:
+		m_video.ShowWindow(SW_SHOW);
+		break;
+	case 7:
+		m_audio.ShowWindow(SW_SHOW);
+		break;
+	case 8:
+		m_font.ShowWindow(SW_SHOW);
+		break;
+	case 9:
+		m_http.ShowWindow(SW_SHOW);
+		break;
+	case 10:
+		m_stream.ShowWindow(SW_SHOW);
+		break;
+	case 11:
+		m_cache.ShowWindow(SW_SHOW);
+		break;
+	case 12:
+		m_files.ShowWindow(SW_SHOW);
+		break;
+	case 13:
+		m_logs.ShowWindow(SW_SHOW);
+		break;
+	}
+}
+
+void COptions::OnSaveopt()
+{
+	m_general.SaveOptions();
+	m_systems.SaveOptions();
+	m_decoder.SaveOptions();
+	m_render.SaveOptions();
+	m_render2d.SaveOptions();
+	m_render3d.SaveOptions();
+	m_audio.SaveOptions();
+	m_video.SaveOptions();
+	m_http.SaveOptions();
+	m_font.SaveOptions();
+	m_stream.SaveOptions();
+	m_cache.SaveOptions();
+	m_logs.SaveOptions();
+
+	Osmo4 *gpac = GetApp();
+	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
+	m_render2d.SetYUV();
+}
+
+void COptions::OnClose()
+{
+	char str[20];
+	sprintf(str, "%d", m_Selector.GetCurSel());
+	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
+
+	DestroyWindow();
+}
+
+void COptions::OnDestroy()
+{
+	CDialog::OnDestroy();
+	delete this;
+	((CMainFrame *)GetApp()->m_pMainWnd)->m_pOpt = NULL;
+}
+
+
+COptGen::COptGen(CWnd* pParent /*=NULL*/)
+	: CDialog(COptGen::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptGen)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptGen::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptGen)
+	DDX_Control(pDX, IDC_LOOKFORSUB, m_LookForSubs);
+	DDX_Control(pDX, IDC_DUMP_XMT, m_ViewXMT);
+	DDX_Control(pDX, IDC_NO_CONSOLE, m_NoConsole);
+	DDX_Control(pDX, IDC_LOOP, m_Loop);
+	DDX_Control(pDX, IDC_SINGLE_INSTANCE, m_SingleInstance);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptGen, CDialog)
+	//{{AFX_MSG_MAP(COptGen)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptGen message handlers
+
+
+
+BOOL COptGen::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
+	m_Loop.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "LookForSubtitles");
+	m_LookForSubs.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ConsoleOff");
+	m_NoConsole.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "ViewXMT");
+	m_ViewXMT.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "SingleInstance");
+	m_SingleInstance.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	return TRUE;
+}
+
+void COptGen::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+
+	gpac->m_Loop = (Bool) m_Loop.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
+	gpac->m_LookForSubtitles = (Bool) m_LookForSubs.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "LookForSubtitles",  gpac->m_LookForSubtitles ? "yes" : "no");
+	gpac->m_NoConsole = (Bool) m_NoConsole.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "ConsoleOff", gpac->m_NoConsole ? "yes" : "no");
+	gpac->m_ViewXMTA = (Bool) m_ViewXMT.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "ViewXMT", gpac->m_ViewXMTA ? "yes" : "no");
+	gpac->m_SingleInstance = (Bool) m_SingleInstance.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "SingleInstance", gpac->m_SingleInstance ? "yes" : "no");
+}
+
+COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
+	: CDialog(COptSystems::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptSystems)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptSystems::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptSystems)
+	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
+	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
+	DDX_Control(pDX, IDC_BIFSDROP, m_LateFramesAlwaysDrawn);
+	DDX_Control(pDX, IDC_LANG, m_Lang);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptSystems, CDialog)
+	//{{AFX_MSG_MAP(COptSystems)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptSystems message handlers
+
+
+
+
+
+BOOL COptSystems::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
+	if (!sOpt) sOpt = "eng";
+	s32 select = 0;
+	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
+	u32 i, count = gf_lang_get_count();
+	for (i=0; i<count; i++) {
+		const char *n2c = gf_lang_get_2cc(i);
+		const char *n3c = gf_lang_get_3cc(i);
+
+		m_Lang.AddString(gf_lang_get_name(i) );
+		if (sOpt && n3c && !stricmp(sOpt, n3c))
+			select = m_Lang.GetCount() - 1;
+	}
+	m_Lang.SetCurSel(select);
+
+
+	/*system config*/
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
+	select = 0;
+	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
+	m_Threading.AddString("Single Thread");
+	m_Threading.AddString("Mutli Thread");
+	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
+	m_Threading.AddString("Free");
+	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
+	m_Threading.SetCurSel(select);
+
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_ForceDuration.SetCheck(1);
+	} else {
+		m_ForceDuration.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DrawLateFrames");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_LateFramesAlwaysDrawn.SetCheck(1);
+	} else {
+		m_LateFramesAlwaysDrawn.SetCheck(0);
+	}
+
+
+	return TRUE;
+}
+
+
+void COptSystems::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+
+	s32 sel = m_Lang.GetCurSel();
+	u32 i=0;
+
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(i) );
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(i) );
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(i) );
+
+	sel = m_Threading.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DrawLateFrames", m_LateFramesAlwaysDrawn.GetCheck() ? "yes" : "no");
+}
+
+
+OptDecoder::OptDecoder(CWnd* pParent /*=NULL*/)
+	: CDialog(OptDecoder::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(OptDecoder)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void OptDecoder::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(OptDecoder)
+	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
+	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(OptDecoder, CDialog)
+	//{{AFX_MSG_MAP(OptDecoder)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// OptDecoder message handlers
+
+
+
+BOOL OptDecoder::OnInitDialog()
+{
+	u32 i;
+	const char *sOpt;
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+
+	/*audio dec enum*/
+	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseDecoder *ifce;
+	s32 select = 0;
+	s32 to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifce) continue;
+
+		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
+			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+			m_Audio.AddString(ifce->module_name);
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *)ifce);
+	}
+	m_Audio.SetCurSel(select);
+
+	/*video dec enum*/
+	while (m_Video.GetCount()) m_Video.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
+	count = gf_modules_get_count(gpac->m_user.modules);
+	select = 0;
+	to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifce) continue;
+
+		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
+			if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+			m_Video.AddString(ifce->module_name);
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *)ifce);
+	}
+	m_Video.SetCurSel(select);
+	return TRUE;
+}
+
+void OptDecoder::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	char str[100];
+	m_Audio.GetWindowText(str, 100);
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
+	m_Video.GetWindowText(str, 100);
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
+
+}
+
+COptRender::COptRender(CWnd* pParent /*=NULL*/)
+	: CDialog(COptRender::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptRender)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptRender::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptRender)
+	DDX_Control(pDX, IDC_DRAW_BOUNDS, m_DrawBounds);
+	DDX_Control(pDX, IDC_GD_LIST, m_Graphics);
+	DDX_Control(pDX, IDC_USE_RENDER3D, m_Use3DRender);
+	DDX_Control(pDX, IDC_AA_LIST, m_AntiAlias);
+	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
+	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
+	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptRender, CDialog)
+	//{{AFX_MSG_MAP(COptRender)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptRender message handlers
+
+
+
+#define NUM_RATES 11
+static char *BIFSRates[11] =
+{
+	"5.0",
+	"7.5",
+	"10.0",
+	"12.5",
+	"15.0",
+	"24.0",
+	"25.0",
+	"30.0",
+	"50.0",
+	"60.0",
+	"100.0",
+};
+
+
+
+BOOL COptRender::OnInitDialog()
+{
+	s32 i;
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "OpenGLMode");
+	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "always")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
+	m_ForceSize.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
+	if (!sOpt) sOpt = "30.0";
+	s32 select = 0;
+	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
+	for (i = 0; i<NUM_RATES; i++) {
+		m_BIFSRate.AddString(BIFSRates[i]);
+		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
+	}
+	m_BIFSRate.SetCurSel(select);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
+	m_HighSpeed.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
+	while (m_AntiAlias.GetCount()) m_AntiAlias.DeleteString(0);
+
+	m_AntiAlias.AddString("None");
+	m_AntiAlias.AddString("Text only");
+	m_AntiAlias.AddString("Complete");
+	select = 2;
+	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
+	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
+	m_AntiAlias.SetCurSel(select);
+
+	/*graphics driver enum*/
+	while (m_Graphics.GetCount()) m_Graphics.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "raster2d");
+	s32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseInterface *ifce;
+	select = 0;
+	u32 to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_RASTER_2D_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+		m_Graphics.AddString(ifce->module_name);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_Graphics.SetCurSel(select);
+
+
+	m_DrawBounds.AddString("None");
+	m_DrawBounds.AddString("Box/Rect");
+	m_DrawBounds.AddString("AABB Tree");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BoundingVolume");
+	if (sOpt && !stricmp(sOpt, "Box")) m_DrawBounds.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "AABB")) m_DrawBounds.SetCurSel(2);
+	else m_DrawBounds.SetCurSel(0);
+
+	return TRUE;
+}
+
+
+Bool COptRender::SaveOptions()
+{
+	char str[50];
+	Osmo4 *gpac = GetApp();
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
+
+	s32 sel = m_BIFSRate.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRates[sel]);
+
+	sel = m_AntiAlias.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
+
+	sel = m_DrawBounds.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
+
+	m_Graphics.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "core", "raster2d", str);
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "OpenGLMode", m_Use3DRender.GetCheck() ? "always" : "disable");
+	return GF_FALSE;
+}
+
+
+COptRender2D::COptRender2D(CWnd* pParent /*=NULL*/)
+	: CDialog(COptRender2D::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptRender2D)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptRender2D::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptRender2D)
+	DDX_Control(pDX, IDC_FORMAT_YUV, m_YUVFormat);
+	DDX_Control(pDX, IDC_YUV, m_NoYUV);
+	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
+	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptRender2D, CDialog)
+	//{{AFX_MSG_MAP(COptRender2D)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptRender2D message handlers
+
+BOOL COptRender2D::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawMode");
+	if (sOpt && !stricmp(sOpt, "immediate")) {
+		m_DirectRender.SetCheck(1);
+	} else {
+		m_DirectRender.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
+	if (sOpt && !stricmp(sOpt, "no")) {
+		m_Scalable.SetCheck(0);
+	} else {
+		m_Scalable.SetCheck(1);
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableYUV");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_NoYUV.SetCheck(1);
+	} else {
+		m_NoYUV.SetCheck(0);
+	}
+
+	SetYUV();
+
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void COptRender2D::SetYUV()
+{
+	Osmo4 *gpac = GetApp();
+	u32 yuv_format = gf_term_get_option(gpac->m_term, GF_OPT_YUV_FORMAT);
+	if (!yuv_format) {
+		m_YUVFormat.SetWindowText("(No YUV used)");
+	} else {
+		char str[100];
+		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
+		m_YUVFormat.SetWindowText(str);
+	}
+}
+
+void COptRender2D::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawMode", m_DirectRender.GetCheck() ? "immediate" : "defer");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableYUV", m_NoYUV.GetCheck() ? "yes" : "no");
+}
+
+
+COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
+	: CDialog(COptRender3D::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptRender3D)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptRender3D::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptRender3D)
+	DDX_Control(pDX, IDC_BITMAP_USE_PIXEL, m_BitmapPixels);
+	DDX_Control(pDX, IDC_DISABLE_TX_RECT, m_DisableTXRect);
+	DDX_Control(pDX, IDC_RASTER_OUTLINE, m_RasterOutlines);
+	DDX_Control(pDX, IDC_EMUL_POW2, m_EmulPow2);
+	DDX_Control(pDX, IDC_DISABLE_POLY_AA, m_PolyAA);
+	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
+	DDX_Control(pDX, IDC_BACK_CULL, m_BackCull);
+	DDX_Control(pDX, IDC_DRAW_MODE, m_Wireframe);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
+	//{{AFX_MSG_MAP(COptRender3D)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptRender3D message handlers
+
+
+BOOL COptRender3D::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	m_DrawNormals.AddString("Never");
+	m_DrawNormals.AddString("Per Face");
+	m_DrawNormals.AddString("Per Vertex");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
+	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
+	else m_DrawNormals.SetCurSel(0);
+
+	m_BackCull.AddString("Off");
+	m_BackCull.AddString("On");
+	m_BackCull.AddString("Alpha");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
+	if (sOpt && !stricmp(sOpt, "Off")) m_BackCull.SetCurSel(0);
+	else if (sOpt && !stricmp(sOpt, "Alpha")) m_BackCull.SetCurSel(2);
+	else m_BackCull.SetCurSel(1);
+
+	m_Wireframe.AddString("Solid");
+	m_Wireframe.AddString("Wireframe");
+	m_Wireframe.AddString("Both");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
+	if (sOpt && !stricmp(sOpt, "WireOnly")) m_Wireframe.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_Wireframe.SetCurSel(2);
+	else m_Wireframe.SetCurSel(0);
+
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "RasterOutlines");
+	m_RasterOutlines.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
+	m_EmulPow2.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "PolygonAA");
+	m_PolyAA.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels");
+	m_BitmapPixels.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DisableRectExt");
+	m_DisableTXRect.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	return TRUE;  // return TRUE unless you set the focus to a control
+	// EXCEPTION: OCX Property Pages should return FALSE
+}
+
+void COptRender3D::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+
+	u32 sel = m_DrawNormals.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
+	sel = m_BackCull.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", (sel==2) ? "Alpha" : (sel==1) ? "On" : "Off");
+	sel = m_Wireframe.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "RasterOutlines", m_RasterOutlines.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulPow2.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "PolygonAA", m_PolyAA.GetCheck() ? "yes" : "no");
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DisableRectExt", m_DisableTXRect.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BitmapCopyPixels", m_BitmapPixels.GetCheck() ? "yes" : "no");
+}
+
+COptVideo::COptVideo(CWnd* pParent /*=NULL*/)
+	: CDialog(COptVideo::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptVideo)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptVideo::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptVideo)
+	DDX_Control(pDX, IDC_SWITCH_RES, m_SwitchRes);
+	DDX_Control(pDX, IDC_VIDEO_LIST, m_Videos);
+	DDX_Control(pDX, IDC_HWMEMORY, m_UseHWMemory);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptVideo, CDialog)
+	//{{AFX_MSG_MAP(COptVideo)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptVideo message handlers
+
+BOOL COptVideo::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	m_SwitchRes.SetCheck(gf_cfg_get_bool(gpac->m_user.config, "core", "switch-vres") );
+	sOpt = gf_cfg_get_bool(gpac->m_user.config, "core", "hwvmem");
+	m_UseHWMemory.SetCheck(sOpt && !stricmp(sOpt, "Always") ? 1 : 0);
+
+
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseInterface *ifce;
+	s32 to_sel = 0;
+	s32 select = 0;
+	/*video drivers enum*/
+	while (m_Videos.GetCount()) m_Videos.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "video-output");
+
+	for (u32 i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+		m_Videos.AddString(ifce->module_name);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_Videos.SetCurSel(select);
+
+	return TRUE;
+
+}
+
+void COptVideo::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	char str[50];
+
+	gf_cfg_set_key(gpac->m_user.config, "core", "switch-vres", m_SwitchRes.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "core", "hwvmem", m_UseHWMemory.GetCheck() ? "Always" : "Auto");
+	m_Videos.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "core", "video-output", str);
+}
+
+
+COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
+	: CDialog(COptAudio::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptAudio)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptAudio::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptAudio)
+	DDX_Control(pDX, IDC_AUDIO_NOTIFS, m_Notifs);
+	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
+	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
+	DDX_Control(pDX, IDC_AUDIO_MULTICH, m_AudioMultiCH);
+	DDX_Control(pDX, IDC_AUDIO_FPS, m_AudioDur);
+	DDX_Control(pDX, IDC_SPIN_FPS, m_SpinFPS);
+	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
+	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
+	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptAudio, CDialog)
+	//{{AFX_MSG_MAP(COptAudio)
+	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
+	ON_CBN_SELCHANGE(IDC_DRIVER_LIST, OnSelchangeDriverList)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptAudio message handlers
+
+BOOL COptAudio::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	m_AudioSpin.SetBuddy(& m_AudioEdit);
+	m_SpinFPS.SetBuddy(& m_AudioDur);
+	m_SpinFPS.SetRange(0, 2000);
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_ForceConfig.SetCheck(1);
+	} else {
+		m_ForceConfig.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
+	if (sOpt) {
+		m_AudioEdit.SetWindowText(sOpt);
+	} else {
+		m_AudioEdit.SetWindowText("2");
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
+	if (sOpt) {
+		m_AudioDur.SetWindowText(sOpt);
+	} else {
+		m_AudioDur.SetWindowText("120");
+	}
+
+	OnForceAudio();
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
+	m_AudioResync.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableMultiChannel");
+	m_AudioMultiCH.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	/*driver enum*/
+	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "audio-output");
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseInterface *ifce;
+	s32 select = 0;
+	s32 to_sel = 0;
+	for (u32 i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+		m_DriverList.AddString(ifce->module_name);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_DriverList.SetCurSel(select);
+
+	m_Notifs.ShowWindow(SW_HIDE);
+	if (sOpt && strstr(sOpt, "DirectSound")) m_Notifs.ShowWindow(SW_SHOW);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "DisableNotification");
+	if (sOpt && !stricmp(sOpt, "yes"))
+		m_Notifs.SetCheck(1);
+	else
+		m_Notifs.SetCheck(0);
+
+	return TRUE;
+}
+
+
+void COptAudio::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	char str[50];
+
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableMultiChannel", m_AudioMultiCH.GetCheck() ? "yes" : "no");
+
+	m_AudioEdit.GetWindowText(str, 20);
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
+	m_AudioDur.GetWindowText(str, 20);
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
+
+	m_DriverList.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "core", "audio-output", str);
+
+	if (strstr(str, "DirectSound")) {
+		gf_cfg_set_key(gpac->m_user.config, "Audio", "DisableNotification", m_Notifs.GetCheck() ? "yes" : "no");
+	}
+
+}
+
+void COptAudio::OnForceAudio()
+{
+	BOOL en = m_ForceConfig.GetCheck();
+
+	m_AudioSpin.EnableWindow(en);
+	m_AudioEdit.EnableWindow(en);
+	m_SpinFPS.EnableWindow(en);
+	m_AudioDur.EnableWindow(en);
+}
+
+void COptAudio::OnSelchangeDriverList()
+{
+	char str[50];
+	m_DriverList.GetWindowText(str, 50);
+	if (strstr(str, "DirectSound")) {
+		m_Notifs.ShowWindow(SW_SHOW);
+	} else {
+		m_Notifs.ShowWindow(SW_HIDE);
+	}
+}
+
+
+
+
+COptFont::COptFont(CWnd* pParent /*=NULL*/)
+	: CDialog(COptFont::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptFont)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptFont::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptFont)
+	DDX_Control(pDX, IDC_TEXTURE_MODE, m_TextureModes);
+	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
+	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptFont, CDialog)
+	//{{AFX_MSG_MAP(COptFont)
+	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptFont message handlers
+
+BOOL COptFont::OnInitDialog()
+{
+	u32 i;
+	GF_BaseInterface *ifce;
+
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	/*video drivers enum*/
+	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontReader");
+	s32 to_sel = 0;
+	s32 select = 0;
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(ifce->module_name, sOpt)) select = to_sel;
+		m_Fonts.AddString(ifce->module_name);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_Fonts.SetCurSel(select);
+
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontDirectory");
+	if (sOpt) m_BrowseFont.SetWindowText(sOpt);
+
+	/*text texturing modes*/
+	while (m_TextureModes.GetCount()) m_TextureModes.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
+	m_TextureModes.AddString("Default");
+	m_TextureModes.AddString("Never");
+	m_TextureModes.AddString("Always");
+	if (sOpt && !stricmp(sOpt, "3D")) m_TextureModes.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "Always")) m_TextureModes.SetCurSel(2);
+	else m_TextureModes.SetCurSel(0);
+
+	return TRUE;
+}
+
+
+
+static char szCacheDir[MAX_PATH];
+
+static int CALLBACK LocCbck(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM pData)
+{
+	char dir[MAX_PATH];
+	if (uMsg == BFFM_INITIALIZED) {
+		strcpy(dir, szCacheDir);
+		SendMessage(hwnd, BFFM_SETSELECTION, TRUE,(LPARAM) dir);
+	}
+	return 0;
+}
+
+void COptFont::OnBrowseFont()
+{
+	BROWSEINFO brw;
+	LPMALLOC pMalloc;
+	LPITEMIDLIST ret;
+	char dir[MAX_PATH];
+
+	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
+
+		m_BrowseFont.GetWindowText(szCacheDir, MAX_PATH);
+
+		memset(&brw, 0, sizeof(BROWSEINFO));
+		brw.hwndOwner = this->GetSafeHwnd();
+		brw.pszDisplayName = dir;
+		brw.lpszTitle = "Select Font Directory...";
+		brw.ulFlags = 0L;
+		brw.lpfn = LocCbck;
+
+		ret = SHBrowseForFolder(&brw);
+		if (ret != NULL) {
+			if (::SHGetPathFromIDList(ret, dir)) {
+				m_BrowseFont.SetWindowText(dir);
+			}
+			pMalloc->Free(ret);
+		}
+		pMalloc->Release();
+	}
+}
+
+
+void COptFont::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	char str[MAX_PATH];
+
+	m_Fonts.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontReader", str);
+	m_BrowseFont.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontDirectory", str);
+	switch (m_TextureModes.GetCurSel()) {
+	case 2:
+		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Always");
+		break;
+	case 1:
+		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Never");
+		break;
+	default:
+		gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", "Default");
+		break;
+	}
+}
+
+
+COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
+	: CDialog(COptHTTP::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptHTTP)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptHTTP::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptHTTP)
+	DDX_Control(pDX, IDC_HTTP_PROXY, m_ProxyName);
+	DDX_Control(pDX, IDC_HTTP_USE_PROXY, m_useProxy);
+	DDX_Control(pDX, IDC_SAX_DELAY, m_SAXDuration);
+	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
+	DDX_Control(pDX, IDC_RESTART_CACHE, m_DisableCache);
+	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
+	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
+	//{{AFX_MSG_MAP(COptHTTP)
+	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
+	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnSaxProgressive)
+	ON_BN_CLICKED(IDC_HTTP_USE_PROXY, OnUseProxy)
+	//}}AFX_MSG_MAP
+	ON_BN_CLICKED(IDC_RESTART_CACHE, &COptHTTP::OnBnClickedRestartCache)
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptHTTP message handlers
+
+
+void COptHTTP::OnBrowseCache()
+{
+	BROWSEINFO brw;
+	LPMALLOC pMalloc;
+	LPITEMIDLIST ret;
+	char dir[MAX_PATH];
+
+	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
+
+		m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
+
+		memset(&brw, 0, sizeof(BROWSEINFO));
+		brw.hwndOwner = this->GetSafeHwnd();
+		brw.pszDisplayName = dir;
+		brw.lpszTitle = "Select HTTP Cache Directory...";
+		brw.ulFlags = 0L;
+		brw.lpfn = LocCbck;
+
+		ret = SHBrowseForFolder(&brw);
+		if (ret != NULL) {
+			if (::SHGetPathFromIDList(ret, dir)) {
+				m_CacheDir.SetWindowText(dir);
+			}
+			pMalloc->Free(ret);
+		}
+		pMalloc->Release();
+	}
+}
+
+BOOL COptHTTP::OnInitDialog()
+{
+	char proxy[GF_MAX_PATH];
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
+	if (sOpt) m_CacheDir.SetWindowText(sOpt);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CleanCache");
+	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "DisableCache");
+	m_DisableCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
+	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	OnSaxProgressive();
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
+	if (sOpt) {
+		m_SAXDuration.SetWindowText(sOpt);
+	} else {
+		m_SAXDuration.SetWindowText("0");
+	}
+	//if (m_Progressive.GetCheck()) m_SAXDuration.EnableWindow(1);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyEnabled");
+	m_useProxy.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	OnUseProxy();
+	strcpy(proxy, "");
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyName");
+	if (sOpt) {
+		strcpy(proxy, sOpt);
+		sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "HTTPProxyPort");
+		if (sOpt) {
+			strcat(proxy, ":");
+			strcat(proxy, sOpt);
+		}
+	}
+	m_ProxyName.SetWindowText(proxy);
+	return TRUE;
+}
+
+void COptHTTP::OnSaxProgressive()
+{
+	if (m_Progressive.GetCheck()) {
+		m_SAXDuration.EnableWindow(1);
+	} else {
+		m_SAXDuration.EnableWindow(0);
+	}
+}
+
+
+void COptHTTP::OnUseProxy()
+{
+	if (m_useProxy.GetCheck()) {
+		m_ProxyName.EnableWindow(1);
+	} else {
+		m_ProxyName.EnableWindow(0);
+	}
+}
+
+void COptHTTP::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+
+	gf_cfg_set_key(gpac->m_user.config, "Core", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Core", "DisableCache", m_DisableCache.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
+
+	m_SAXDuration.GetWindowText(szCacheDir, MAX_PATH);
+	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
+
+	gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyEnabled", m_useProxy.GetCheck() ? "yes" : "no");
+	m_ProxyName.GetWindowText(szCacheDir, MAX_PATH);
+	char *sep = strrchr(szCacheDir, ':');
+	if (sep) {
+		sep[0] = 0;
+		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyName", szCacheDir);
+		sep[0] = ':';
+		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyPort", sep+1);
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyName", szCacheDir);
+		gf_cfg_set_key(gpac->m_user.config, "Core", "HTTPProxyPort", NULL);
+	}
+	m_CacheDir.GetWindowText(szCacheDir, MAX_PATH);
+	gf_cfg_set_key(gpac->m_user.config, "Core", "CacheDirectory", szCacheDir);
+}
+
+
+COptStream::COptStream(CWnd* pParent /*=NULL*/)
+	: CDialog(COptStream::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptStream)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptStream::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptStream)
+	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
+	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
+	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
+	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
+	DDX_Control(pDX, IDC_REORDER, m_Reorder);
+	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
+	DDX_Control(pDX, IDC_PORT, m_Port);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptStream, CDialog)
+	//{{AFX_MSG_MAP(COptStream)
+	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
+	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
+	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
+	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
+	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptStream message handlers
+
+BOOL COptStream::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	while (m_Port.GetCount()) m_Port.DeleteString(0);
+	m_Port.AddString("554 (RTSP standard)");
+	m_Port.AddString("7070 (RTSP ext)");
+	m_Port.AddString("80 (RTSP / HTTP tunnel)");
+	m_Port.AddString("8080 (RTSP / HTTP tunnel)");
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
+	u32 port = 554;
+	Bool force_rtsp = GF_FALSE;
+	if (sOpt) port = atoi(sOpt);
+	switch (port) {
+	case 8080:
+		m_Port.SetCurSel(3);
+		force_rtsp = GF_TRUE;
+		break;
+	case 80:
+		m_Port.SetCurSel(2);
+		force_rtsp = GF_TRUE;
+		break;
+	case 7070:
+		m_Port.SetCurSel(1);
+		break;
+	default:
+		m_Port.SetCurSel(0);
+		break;
+	}
+
+	Bool use_rtsp = GF_FALSE;
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
+	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = GF_TRUE;
+
+	if (force_rtsp) {
+		m_UseRTSP.SetCheck(1);
+		m_UseRTSP.EnableWindow(0);
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+	} else {
+		m_UseRTSP.SetCheck(use_rtsp);
+		m_UseRTSP.EnableWindow(1);
+		m_Reorder.EnableWindow(1);
+		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
+		if (sOpt && !stricmp(sOpt, "0")) {
+			m_Reorder.SetCheck(0);
+		} else {
+			m_Reorder.SetCheck(1);
+		}
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
+	if (sOpt) {
+		m_Timeout.SetWindowText(sOpt);
+	} else {
+		m_Timeout.SetWindowText("30000");
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
+	if (sOpt) {
+		m_Buffer.SetWindowText(sOpt);
+	} else {
+		m_Buffer.SetWindowText("3000");
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
+	u32 buf_len = 0;
+	if (sOpt) buf_len = atoi(sOpt);
+	if (buf_len) {
+		m_RebufferLen.SetWindowText(sOpt);
+		m_Rebuffer.SetCheck(1);
+		m_RebufferLen.EnableWindow(1);
+	} else {
+		m_RebufferLen.SetWindowText("0");
+		m_Rebuffer.SetCheck(0);
+		m_RebufferLen.EnableWindow(0);
+	}
+
+	return TRUE;
+}
+
+
+void COptStream::OnSelchangePort()
+{
+	s32 sel = m_Port.GetCurSel();
+	switch (sel) {
+	case 3:
+	case 2:
+		m_UseRTSP.SetCheck(1);
+		m_UseRTSP.EnableWindow(0);
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+		break;
+	case 1:
+	default:
+		m_UseRTSP.SetCheck(0);
+		m_UseRTSP.EnableWindow(1);
+		m_Reorder.SetCheck(1);
+		m_Reorder.EnableWindow(1);
+		break;
+	}
+}
+
+void COptStream::OnRtsp()
+{
+	if (m_UseRTSP.GetCheck()) {
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+	} else {
+		m_Reorder.SetCheck(1);
+		m_Reorder.EnableWindow(1);
+	}
+
+}
+
+void COptStream::CheckRebuffer()
+{
+	char str[50];
+	s32 buf, rebuf;
+	m_Buffer.GetWindowText(str, 50);
+	buf = atoi(str);
+	m_RebufferLen.GetWindowText(str, 50);
+	rebuf = atoi(str);
+	if (rebuf*2 > buf) {
+		rebuf = buf/2;
+		sprintf(str, "%d", rebuf);
+		m_RebufferLen.SetWindowText(str);
+	}
+}
+
+void COptStream::OnRebuffer()
+{
+	if (!m_Rebuffer.GetCheck()) {
+		m_RebufferLen.EnableWindow(0);
+	} else {
+		m_RebufferLen.EnableWindow(1);
+		CheckRebuffer();
+	}
+}
+
+void COptStream::OnUpdateRebufferLen()
+{
+	CheckRebuffer();
+}
+
+void COptStream::OnUpdateBuffer()
+{
+	CheckRebuffer();
+}
+
+void COptStream::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	Bool force_rtsp = GF_FALSE;
+	s32 sel = m_Port.GetCurSel();
+	switch (sel) {
+	case 3:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
+		force_rtsp = GF_TRUE;
+		break;
+	case 2:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
+		force_rtsp = GF_TRUE;
+		break;
+	case 1:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
+		break;
+	default:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
+		break;
+	}
+
+	if (force_rtsp) {
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
+		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
+	}
+
+	char str[50];
+
+	m_Timeout.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
+
+	m_Buffer.GetWindowText(str, 50);
+	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
+	if (m_Rebuffer.GetCheck()) {
+		m_RebufferLen.GetWindowText(str, 50);
+		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
+	}
+}
+
+
+
+
+COptMCache::COptMCache(CWnd* pParent /*=NULL*/)
+	: CDialog(COptMCache::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptMCache)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptMCache::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptMCache)
+	DDX_Control(pDX, IDC_BASEPRES, m_BaseName);
+	DDX_Control(pDX, IDC_MCACHE_USENAME, m_UseBase);
+	DDX_Control(pDX, IDC_MCACHE_OVERWRITE, m_Overwrite);
+	DDX_Control(pDX, IDC_BROWSE_MCACHE, m_RecDir);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptMCache, CDialog)
+	//{{AFX_MSG_MAP(COptMCache)
+	ON_BN_CLICKED(IDC_BROWSE_MCACHE, OnBrowseMcache)
+	ON_BN_CLICKED(IDC_MCACHE_USENAME, OnMcacheUsename)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptMCache message handlers
+
+void COptMCache::OnBrowseMcache()
+{
+	BROWSEINFO brw;
+	LPMALLOC pMalloc;
+	LPITEMIDLIST ret;
+	char dir[MAX_PATH];
+
+	if (NOERROR == ::SHGetMalloc(&pMalloc) ) {
+
+		m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
+
+		memset(&brw, 0, sizeof(BROWSEINFO));
+		brw.hwndOwner = this->GetSafeHwnd();
+		brw.pszDisplayName = dir;
+		brw.lpszTitle = "Select HTTP Cache Directory...";
+		brw.ulFlags = 0L;
+		brw.lpfn = LocCbck;
+
+		ret = SHBrowseForFolder(&brw);
+		if (ret != NULL) {
+			if (::SHGetPathFromIDList(ret, dir)) {
+				m_RecDir.SetWindowText(dir);
+			}
+			pMalloc->Free(ret);
+		}
+		pMalloc->Release();
+	}
+}
+
+BOOL COptMCache::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "RecordDirectory");
+	if (!sOpt) sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
+	if (sOpt) m_RecDir.SetWindowText(sOpt);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles");
+	m_Overwrite.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "StreamingCache", "BaseFileName");
+	if (sOpt) {
+		m_UseBase.SetCheck(1);
+		m_BaseName.EnableWindow(TRUE);
+		m_BaseName.SetWindowText(sOpt);
+	} else {
+		m_UseBase.SetCheck(0);
+		m_BaseName.EnableWindow(FALSE);
+		m_BaseName.SetWindowText("uses service URL");
+	}
+	return TRUE;
+}
+
+void COptMCache::OnMcacheUsename()
+{
+	if (m_UseBase.GetCheck()) {
+		m_BaseName.EnableWindow(TRUE);
+		m_BaseName.SetWindowText("record");
+	} else {
+		m_BaseName.EnableWindow(FALSE);
+		m_BaseName.SetWindowText("uses service URL");
+	}
+}
+
+void COptMCache::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+
+	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "KeepExistingFiles", m_Overwrite.GetCheck() ? "no" : "yes");
+	if (m_UseBase.GetCheck()) {
+		m_BaseName.GetWindowText(szCacheDir, MAX_PATH);
+		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", szCacheDir);
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "BaseFileName", NULL);
+	}
+	m_RecDir.GetWindowText(szCacheDir, MAX_PATH);
+	gf_cfg_set_key(gpac->m_user.config, "StreamingCache", "RecordDirectory", szCacheDir);
+}
+
+
+OptFiles::OptFiles(CWnd* pParent /*=NULL*/)
+	: CDialog(OptFiles::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(OptFiles)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void OptFiles::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(OptFiles)
+	DDX_Control(pDX, IDC_ASSOCIATE, m_DoAssociate);
+	DDX_Control(pDX, IDC_FILES_PLUG, m_PlugName);
+	DDX_Control(pDX, IDC_FILES_MIMES, m_mimes);
+	DDX_Control(pDX, IDC_FILES_EXT, m_extensions);
+	DDX_Control(pDX, IDC_FILELIST, m_FileDescs);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(OptFiles, CDialog)
+	//{{AFX_MSG_MAP(OptFiles)
+	ON_CBN_SELCHANGE(IDC_FILELIST, OnSelchangeFilelist)
+	ON_BN_CLICKED(IDC_ASSOCIATE, OnAssociate)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// OptFiles message handlers
+
+BOOL OptFiles::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	Osmo4 *gpac = GetApp();
+	u32 count, i;
+
+	while (m_FileDescs.GetCount()) m_FileDescs.DeleteString(0);
+	count = gf_cfg_get_key_count(gpac->m_user.config, "MimeTypes");
+	for (i=0; i<count; i++) {
+		char *sMime, *sKey, sDesc[200];
+		const char *sOpt;
+		sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", i);
+		if (!sMime) continue;
+		sOpt = gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
+		if (!sOpt) continue;
+		sKey = (char *) strstr(sOpt, "\" \"");
+		if (!sKey) continue;
+		strcpy(sDesc, sKey+3);
+		sKey = strchr(sDesc, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+		m_FileDescs.AddString(sDesc);
+	}
+	m_FileDescs.SetCurSel(0);
+	SetSelection(0);
+	return TRUE;
+}
+
+void OptFiles::OnSelchangeFilelist()
+{
+	SetSelection(m_FileDescs.GetCurSel());
+}
+
+void OptFiles::SetSelection(u32 sel)
+{
+	Osmo4 *gpac = GetApp();
+	char *sMime, *sKey, sDesc[200], sText[200];
+	sMime = (char *) gf_cfg_get_key_name(gpac->m_user.config, "MimeTypes", sel);
+	sprintf(sText, "Mime Type: %s", sMime);
+	m_mimes.SetWindowText(sText);
+	strcpy(cur_mime, sMime);
+	sMime = (char *) gf_cfg_get_key(gpac->m_user.config, "MimeTypes", sMime);
+	strcpy(sDesc, sMime+1);
+	sKey = strchr(sDesc, '\"');
+	sKey[0] = 0;
+	sprintf(sText, "Extensions: %s", sDesc);
+	strcpy(cur_ext, sDesc);
+	m_extensions.SetWindowText(sText);
+	sKey = strrchr(sMime, '\"');
+	sprintf(sText, "Module: %s", sKey+2);
+	m_PlugName.SetWindowText(sText);
+
+	Bool has_asso, need_asso, go = GF_TRUE;
+	sKey = cur_ext;
+	need_asso = has_asso = GF_FALSE;
+
+	HKEY hKey;
+	DWORD dwSize;
+	while (go) {
+		Bool ok;
+		char szExt[50], szReg[60], c;
+		char *tmp = strchr(sKey, ' ');
+		if (!tmp) {
+			go = GF_FALSE;
+		}
+		else {
+			c = tmp[0];
+			tmp[0] = 0;
+		}
+		sprintf(szExt, ".%s", sKey);
+		sprintf(szReg, "GPAC\\%s", sKey);
+		if (tmp) {
+			tmp[0] = c;
+			tmp += 1;
+		}
+
+		if (RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, KEY_READ, &hKey ) == ERROR_SUCCESS) {
+			dwSize = 200;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
+			RegCloseKey(hKey);
+			if (ok && !stricmp((char *)sDesc, szReg)) has_asso = GF_TRUE;
+			else need_asso = GF_TRUE;
+		} else need_asso = GF_TRUE;
+		sKey = tmp;
+
+	}
+	m_DoAssociate.SetCheck(has_asso);
+	if (need_asso && has_asso)
+		OnAssociate();
+}
+
+
+void OptFiles::OnAssociate()
+{
+	char *sKey, sDesc[200];
+	unsigned char szApp[MAX_PATH];
+	unsigned char szIco[MAX_PATH];
+
+	strcpy((char *) szApp, GetApp()->szApplicationPath);
+	strcpy((char *) szIco, (const char *) szApp);
+	strcat((char *) szIco, "Osmo4.ico");
+	strcat((char *) szApp, "Osmo4.exe \"%L\"");
+
+	if (m_DoAssociate.GetCheck()) {
+		Bool go = GF_TRUE;
+		sKey = cur_ext;
+
+		HKEY hKey;
+		DWORD dwSize;
+		while (go) {
+			Bool ok;
+			char szExt[50], szReg[60], szOld[80], szPath[1024], c;
+			char *tmp = strchr(sKey, ' ');
+			if (!tmp) {
+				go = GF_FALSE;
+			}
+			else {
+				c = tmp[0];
+				tmp[0] = 0;
+			}
+			sprintf(szExt, ".%s", sKey);
+			sprintf(szReg, "GPAC\\%s", sKey);
+			if (tmp) {
+				tmp[0] = c;
+				tmp += 1;
+			}
+
+			RegOpenKeyEx(HKEY_CLASSES_ROOT, szExt, 0, 0, &hKey );
+			dwSize = 200;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
+			RegCloseKey(hKey);
+			strcpy(szOld, "");
+			if (ok && stricmp((char *)sDesc, szReg)) strcpy(szOld, sDesc);
+
+			strcpy(szPath, szReg);
+			strcat(szPath, "\\DefaultIcon");
+			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+			RegSetValueEx(hKey, "", 0, REG_SZ, szIco, (DWORD) strlen((const char *) szIco)+1);
+			RegCloseKey(hKey);
+
+			strcpy(szPath, szReg);
+			strcat(szPath, "\\Shell\\open\\command");
+			RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+			RegSetValueEx(hKey, "", 0, REG_SZ, szApp, (DWORD) strlen((const char *) szApp)+1);
+			RegCloseKey(hKey);
+
+			if (strlen(szOld)) {
+				strcpy(szPath, szReg);
+				strcat(szPath, "\\Backup");
+				RegCreateKeyEx(HKEY_CLASSES_ROOT, szPath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char *) szOld, (DWORD) strlen((const char *) szIco)+1);
+				RegCloseKey(hKey);
+			}
+
+			RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+			RegSetValueEx(hKey, "", 0, REG_SZ, (const unsigned char *) szReg, (DWORD) strlen(szReg)+1);
+			RegCloseKey(hKey);
+
+			sKey = tmp;
+		}
+	} else {
+		Bool go = GF_TRUE;
+		sKey = cur_ext;
+
+		HKEY hKey;
+		DWORD dwSize;
+		while (go) {
+			Bool ok;
+			char szExt[50], szReg[60], szPath[1024], c;
+			char *tmp = strchr(sKey, ' ');
+			if (!tmp) {
+				go = GF_FALSE;
+			}
+			else {
+				c = tmp[0];
+				tmp[0] = 0;
+			}
+			sprintf(szExt, ".%s", sKey);
+			sprintf(szReg, "GPAC\\%s", sKey);
+			if (tmp) {
+				tmp[0] = c;
+				tmp += 1;
+			}
+
+			strcpy(szPath, szReg);
+			strcat(szPath, "\\Backup");
+			RegOpenKeyEx(HKEY_CLASSES_ROOT, szPath, 0, 0, &hKey );
+			dwSize = 200;
+			ok = GF_TRUE;
+			if (RegQueryValueEx(hKey, "", NULL, NULL,(unsigned char*) sDesc, &dwSize) != ERROR_SUCCESS) ok = GF_FALSE;
+			RegCloseKey(hKey);
+			if (ok && strlen((char *)sDesc)) {
+				RegCreateKeyEx(HKEY_CLASSES_ROOT, szExt, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+				RegSetValueEx(hKey, "", 0, REG_SZ, (unsigned char*) sDesc, (DWORD) strlen((const char *) sDesc)+1);
+				RegCloseKey(hKey);
+			}
+
+			RegOpenKeyEx(HKEY_CLASSES_ROOT, szReg, 0, 0, &hKey );
+			RegDeleteKey(hKey, "Backup");
+			RegDeleteKey(hKey, "DefaultIcon");
+			RegDeleteKey(hKey, "Shell\\open\\command");
+			RegDeleteKey(hKey, "Shell\\open");
+			RegDeleteKey(hKey, "Shell");
+			RegCloseKey(hKey);
+			RegDeleteKey(HKEY_CLASSES_ROOT, szReg);
+
+			sKey = tmp;
+		}
+	}
+}
+
+COptLogs::COptLogs(CWnd* pParent /*=NULL*/)
+	: CDialog(COptLogs::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptLogs)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptLogs::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptLogs)
+	DDX_Control(pDX, IDC_TOOL_SYNC, m_sync);
+	DDX_Control(pDX, IDC_TOOL_SCRIPT, m_script);
+	DDX_Control(pDX, IDC_TOOL_SCENE, m_scene);
+	DDX_Control(pDX, IDC_TOOL_RTP, m_rtp);
+	DDX_Control(pDX, IDC_TOOL_RENDER, m_render);
+	DDX_Control(pDX, IDC_TOOL_PARSER, m_parser);
+	DDX_Control(pDX, IDC_TOOL_NET, m_net);
+	DDX_Control(pDX, IDC_TOOL_MMIO, m_mmio);
+	DDX_Control(pDX, IDC_TOOL_MEDIA, m_media);
+	DDX_Control(pDX, IDC_TOOL_CORE, m_core);
+	DDX_Control(pDX, IDC_TOOL_CONTAINER, m_container);
+	DDX_Control(pDX, IDC_TOOL_COMPOSE, m_compose);
+	DDX_Control(pDX, IDC_TOOL_CODING, m_coding);
+	DDX_Control(pDX, IDC_TOOL_CODEC, m_codec);
+	DDX_Control(pDX, IDC_TOOL_AUTHOR, m_author);
+	DDX_Control(pDX, IDC_LOG_LEVEL, m_Level);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptLogs, CDialog)
+	//{{AFX_MSG_MAP(COptLogs)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptLogs message handlers
+
+BOOL COptLogs::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+#if 0
+	Osmo4 *gpac = GetApp();
+	switch (gpac->m_log_level) {
+	case GF_LOG_ERROR:
+		m_Level.SetCurSel(1);
+		break;
+	case GF_LOG_WARNING:
+		m_Level.SetCurSel(2);
+		break;
+	case GF_LOG_INFO:
+		m_Level.SetCurSel(3);
+		break;
+	case GF_LOG_DEBUG:
+		m_Level.SetCurSel(4);
+		break;
+	default:
+		m_Level.SetCurSel(0);
+		break;
+	}
+
+	m_sync.SetCheck(gpac->m_log_tools & GF_LOG_SYNC);
+	m_script.SetCheck(gpac->m_log_tools & GF_LOG_SCRIPT);
+	m_scene.SetCheck(gpac->m_log_tools & GF_LOG_SCENE);
+	m_rtp.SetCheck(gpac->m_log_tools & GF_LOG_RTP);
+	m_render.SetCheck(gpac->m_log_tools & GF_LOG_COMPOSE);
+	m_parser.SetCheck(gpac->m_log_tools & GF_LOG_PARSER);
+	m_net.SetCheck(gpac->m_log_tools & GF_LOG_NETWORK);
+	m_mmio.SetCheck(gpac->m_log_tools & GF_LOG_MMIO);
+	m_media.SetCheck(gpac->m_log_tools & GF_LOG_MEDIA);
+	m_core.SetCheck(gpac->m_log_tools & GF_LOG_CORE);
+	m_container.SetCheck(gpac->m_log_tools & GF_LOG_CONTAINER);
+	m_compose.SetCheck(gpac->m_log_tools & GF_LOG_INTERACT);
+	m_coding.SetCheck(gpac->m_log_tools & GF_LOG_CODING);
+	m_codec.SetCheck(gpac->m_log_tools & GF_LOG_CODEC);
+	m_author.SetCheck(gpac->m_log_tools & GF_LOG_AUTHOR);
+#endif
+
+	return TRUE;
+}
+
+void COptLogs::SaveOptions()
+{
+	Osmo4 *gpac = GetApp();
+	CString str = "";
+	const char *level = "error";
+	u32 flags = 0;
+
+	switch (m_Level.GetCurSel()) {
+	case 1:
+		level = "error";
+		break;
+	case 2:
+		level = "warning";
+		break;
+	case 3:
+		level = "info";
+		break;
+	case 4:
+		level = "debug";
+		break;
+	default:
+		level = "none";
+		break;
+	}
+
+	if (m_sync.GetCheck()) {
+		str +="sync:";
+	}
+	if (m_script.GetCheck()) {
+		str +="script:";
+	}
+	if (m_scene.GetCheck()) {
+		str +="scene:";
+	}
+	if (m_rtp.GetCheck()) {
+		str +="rtp:";
+	}
+	if (m_render.GetCheck()) {
+		str +="compose:";
+	}
+	if (m_parser.GetCheck()) {
+		str +="parser:";
+	}
+	if (m_net.GetCheck()) {
+		str +="network:";
+	}
+	if (m_mmio.GetCheck()) {
+		str +="mmio:";
+	}
+	if (m_media.GetCheck()) {
+		str +="media:";
+	}
+	if (m_core.GetCheck()) {
+		str +="core:";
+	}
+	if (m_container.GetCheck()) {
+		str +="container:";
+	}
+	if (m_compose.GetCheck()) {
+		str +="interact:";
+	}
+	if (m_coding.GetCheck()) {
+		str +="coding:";
+	}
+	if (m_codec.GetCheck()) {
+		str +="codec:";
+	}
+	if (m_author.GetCheck()) {
+		str +="author:";
+	}
+
+	gf_cfg_set_key(gpac->m_user.config, "General", "Logs", str);
+	str += "@";
+	str += level;
+	gf_log_set_tools_levels(str);
+}
+
+void COptHTTP::OnBnClickedRestartCache()
+{
+	// TODO : ajoutez ici le code de votre gestionnaire de notification de contrôle
+}

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Options.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.cpp Added

@@ -0,0 +1,944 @@
+// GPAC.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "Osmo4.h"
+#include <gpac/network.h>
+#include <direct.h>
+#include "MainFrm.h"
+#include "OpenUrl.h"
+#include "resource.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// Osmo4
+
+BEGIN_MESSAGE_MAP(Osmo4, CWinApp)
+	//{{AFX_MSG_MAP(Osmo4)
+	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
+	ON_COMMAND(ID_FILE_STEP, OnFileStep)
+	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
+	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
+	ON_COMMAND(ID_CONFIG_RELOAD, OnConfigReload)
+	ON_COMMAND(ID_FILE_PLAY, OnFilePlay)
+	ON_UPDATE_COMMAND_UI(ID_FILE_PLAY, OnUpdateFilePlay)
+	ON_UPDATE_COMMAND_UI(ID_FILE_STEP, OnUpdateFileStep)
+	ON_COMMAND(ID_FILE_STOP, OnFileStop)
+	ON_UPDATE_COMMAND_UI(ID_FILE_STOP, OnUpdateFileStop)
+	ON_COMMAND(ID_SWITCH_RENDER, OnSwitchRender)
+	ON_UPDATE_COMMAND_UI(ID_FILE_RELOAD, OnUpdateFileStop)
+	ON_COMMAND(ID_H_ABOUT, OnAbout)
+	ON_COMMAND(ID_FILE_MIGRATE, OnFileMigrate)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// Osmo4 construction
+
+Osmo4::Osmo4()
+{
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only Osmo4 object
+
+Osmo4 theApp;
+
+
+
+class UserPassDialog : public CDialog
+{
+// Construction
+public:
+	UserPassDialog(CWnd* pParent = NULL);   // standard constructor
+
+	Bool GetPassword(const char *site_url, char *user, char *password);
+
+// Dialog Data
+	//{{AFX_DATA(UserPassDialog)
+	enum { IDD = IDD_PASSWD };
+	CStatic	m_SiteURL;
+	CEdit m_User;
+	CEdit m_Pass;
+	//}}AFX_DATA
+
+	void SetSelection(u32 sel);
+	char cur_ext[200], cur_mime[200];
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(UserPassDialog)
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+	const char *m_site_url;
+	char *m_user, *m_password;
+
+	// Generated message map functions
+	//{{AFX_MSG(UserPassDialog)
+	virtual BOOL OnInitDialog();
+	afx_msg void OnClose();
+	//}}AFX_MSG
+};
+
+UserPassDialog::UserPassDialog(CWnd* pParent /*=NULL*/)
+	: CDialog(UserPassDialog::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptStream)
+	//}}AFX_DATA_INIT
+}
+
+void UserPassDialog::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(UserPassDialog)
+	DDX_Control(pDX, IDC_TXT_SITE, m_SiteURL);
+	DDX_Control(pDX, IDC_EDIT_USER, m_User);
+	DDX_Control(pDX, IDC_EDIT_PASSWORD, m_Pass);
+	//}}AFX_DATA_MAP
+}
+
+BOOL UserPassDialog::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	m_SiteURL.SetWindowText(m_site_url);
+	m_User.SetWindowText(m_user);
+	m_Pass.SetWindowText("");
+	return TRUE;
+}
+
+void UserPassDialog::OnClose()
+{
+	m_User.GetWindowText(m_user, 50);
+	m_Pass.GetWindowText(m_password, 50);
+}
+
+Bool UserPassDialog::GetPassword(const char *site_url, char *user, char *password)
+{
+	m_site_url = site_url;
+	m_user = user;
+	if (DoModal() != IDOK) return GF_FALSE;
+	return GF_TRUE;
+}
+
+
+static void Osmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
+{
+	if (!total) return;
+	CMainFrame *pFrame = (CMainFrame *) ((Osmo4 *) usr)->m_pMainWnd;
+	s32 prog = (s32) ( (100 * (u64)done) / total);
+	if (pFrame->m_last_prog < prog) {
+		pFrame->console_err = GF_OK;
+		pFrame->m_last_prog = prog;
+		pFrame->console_message.Format("%s %02d %%", title, prog);
+		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
+		if (done==total) pFrame->m_last_prog = -1;
+	}
+}
+
+#define W32_MIN_WIDTH 120
+
+static void log_msg(char *msg)
+{
+	::MessageBox(NULL, msg, "GPAC", MB_OK);
+}
+Bool Osmo4_EventProc(void *priv, GF_Event *evt)
+{
+	u32 dur;
+	Osmo4 *gpac = (Osmo4 *) priv;
+	CMainFrame *pFrame = (CMainFrame *) gpac->m_pMainWnd;
+	/*shutdown*/
+	if (!pFrame) return GF_FALSE;
+
+	switch (evt->type) {
+	case GF_EVENT_DURATION:
+		dur = (u32) (1000 * evt->duration.duration);
+		//if (dur<1100) dur = 0;
+		pFrame->m_pPlayList->SetDuration((u32) evt->duration.duration );
+		gpac->max_duration = dur;
+		gpac->can_seek = evt->duration.can_seek;
+		if (!gpac->can_seek) {
+			pFrame->m_Sliders.m_PosSlider.EnableWindow(FALSE);
+		} else {
+			pFrame->m_Sliders.m_PosSlider.EnableWindow(TRUE);
+			pFrame->m_Sliders.m_PosSlider.SetRangeMin(0);
+			pFrame->m_Sliders.m_PosSlider.SetRangeMax(dur);
+		}
+		break;
+
+	case GF_EVENT_MESSAGE:
+		if (!evt->message.service || !strcmp(evt->message.service, (LPCSTR) pFrame->m_pPlayList->GetURL() )) {
+			pFrame->console_service = "main service";
+		} else {
+			pFrame->console_service = evt->message.service;
+		}
+		if (evt->message.error!=GF_OK) {
+			if (evt->message.error<GF_OK || !gpac->m_NoConsole) {
+				pFrame->console_err = evt->message.error;
+				pFrame->console_message = evt->message.message;
+				gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
+
+				/*any error before connection confirm is a service connection error*/
+				if (!gpac->m_isopen) pFrame->m_pPlayList->SetDead();
+			}
+			return GF_FALSE;
+		}
+		if (gpac->m_NoConsole) return GF_FALSE;
+
+		/*process user message*/
+		pFrame->console_err = GF_OK;
+		pFrame->console_message = evt->message.message;
+		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 0, 0);
+		break;
+	case GF_EVENT_PROGRESS:
+		char *szType;
+		if (evt->progress.progress_type==0) szType = "Buffer ";
+		else if (evt->progress.progress_type==1) szType = "Download ";
+		else if (evt->progress.progress_type==2) szType = "Import ";
+		gf_set_progress(szType, evt->progress.done, evt->progress.total);
+		break;
+	case GF_EVENT_NAVIGATE_INFO:
+		pFrame->console_message = evt->navigate.to_url;
+		gpac->m_pMainWnd->PostMessage(WM_CONSOLEMSG, 1000, 0);
+		break;
+
+	case GF_EVENT_SCENE_SIZE:
+		if (evt->size.width && evt->size.height) {
+			gpac->orig_width = evt->size.width;
+			gpac->orig_height = evt->size.height;
+			if (gpac->m_term && !pFrame->m_bFullScreen)
+				pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
+		}
+		break;
+		/*don't resize on win32 msg notif*/
+#if 0
+	case GF_EVENT_SIZE:
+		if (/*gpac->m_term && !pFrame->m_bFullScreen && */gpac->orig_width && (evt->size.width < W32_MIN_WIDTH) )
+			pFrame->PostMessage(WM_SETSIZE, W32_MIN_WIDTH, (W32_MIN_WIDTH*gpac->orig_height) / gpac->orig_width);
+		else
+			pFrame->PostMessage(WM_SETSIZE, evt->size.width, evt->size.height);
+		break;
+#endif
+
+	case GF_EVENT_CONNECT:
+//		if (pFrame->m_bStartupFile) return 0;
+
+		pFrame->BuildStreamList(GF_TRUE);
+		if (evt->connect.is_connected) {
+			pFrame->BuildChapterList(GF_FALSE);
+			gpac->m_isopen = GF_TRUE;
+			//resetting sliders when opening a new file creates a deadlock on the window thread which is disconnecting
+			pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, gpac->m_isopen ? 4 : 3);
+			pFrame->m_Sliders.m_PosSlider.SetPos(0);
+			pFrame->SetProgTimer(GF_TRUE);
+		} else {
+			gpac->max_duration = 0;
+			gpac->m_isopen = GF_FALSE;
+			pFrame->BuildChapterList(GF_TRUE);
+		}
+		if (!pFrame->m_bFullScreen) {
+			pFrame->SetFocus();
+			pFrame->SetForegroundWindow();
+		}
+		break;
+
+	case GF_EVENT_QUIT:
+		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
+		break;
+	case GF_EVENT_MIGRATE:
+	{
+	}
+	break;
+	case GF_EVENT_KEYDOWN:
+		gf_term_process_shortcut(gpac->m_term, evt);
+		/*update volume control*/
+		pFrame->m_Sliders.SetVolume();
+
+		switch (evt->key.key_code) {
+		case GF_KEY_HOME:
+			gf_term_set_option(gpac->m_term, GF_OPT_NAVIGATION_TYPE, 1);
+			break;
+		case GF_KEY_ESCAPE:
+			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
+			break;
+		case GF_KEY_MEDIANEXTTRACK:
+			pFrame->m_pPlayList->PlayNext();
+			break;
+		case GF_KEY_MEDIAPREVIOUSTRACK:
+			pFrame->m_pPlayList->PlayPrev();
+			break;
+		case GF_KEY_H:
+			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
+				gf_term_switch_quality(gpac->m_term, GF_TRUE);
+			break;
+		case GF_KEY_L:
+			if ((evt->key.flags & GF_KEY_MOD_CTRL) && gpac->m_isopen)
+				gf_term_switch_quality(gpac->m_term, GF_FALSE);
+			break;
+		case GF_KEY_LEFT:
+		case GF_KEY_RIGHT:
+			if (gpac->m_isopen && (gf_term_get_option(gpac->m_term, GF_OPT_NAVIGATION) == GF_NAVIGATE_NONE)) {
+				if (evt->key.flags & GF_KEY_MOD_CTRL) {
+					if (evt->key.key_code==GF_KEY_LEFT) pFrame->m_pPlayList->PlayPrev();
+					else if (evt->key.key_code==GF_KEY_RIGHT) pFrame->m_pPlayList->PlayNext();
+				}
+				else if (gpac->can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
+					u32 duration = gpac->max_duration;
+					s32 current_time = gf_term_get_time_in_ms(gpac->m_term);
+
+					if (evt->key.key_code==GF_KEY_LEFT) {
+						current_time -= 5*duration/100;
+						if (current_time<0) current_time=0;
+						gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
+					}
+					else if (evt->key.key_code==GF_KEY_RIGHT) {
+						current_time += 5*duration/100;
+						if ((u32) current_time < duration) {
+							gf_term_play_from_time(gpac->m_term, (u64) current_time, 0);
+						}
+					}
+				}
+			}
+			break;
+		}
+		break;
+	case GF_EVENT_NAVIGATE:
+		/*fixme - a proper browser would require checking mime type & co*/
+		/*store URL since it may be destroyed, and post message*/
+		gpac->m_navigate_url = evt->navigate.to_url;
+		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
+		return GF_TRUE;
+	case GF_EVENT_VIEWPOINTS:
+		pFrame->BuildViewList();
+		return GF_FALSE;
+	case GF_EVENT_STREAMLIST:
+		pFrame->BuildStreamList(GF_FALSE);
+		return GF_FALSE;
+	case GF_EVENT_SET_CAPTION:
+		pFrame->SetWindowText(evt->caption.caption);
+		break;
+	case GF_EVENT_DBLCLICK:
+		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
+		return GF_FALSE;
+	case GF_EVENT_AUTHORIZATION:
+	{
+		UserPassDialog passdlg;
+		return passdlg.GetPassword(evt->auth.site_url, evt->auth.user, evt->auth.password);
+	}
+	}
+	return GF_FALSE;
+}
+
+
+/*here's the trick: use a storage section shared among all processes for the wnd handle and for the command line
+NOTE: this has to be static memory of course, don't try to alloc anything there...*/
+#pragma comment(linker, "/SECTION:.shr,RWS")
+#pragma data_seg(".shr")
+HWND static_gpac_hwnd = NULL;
+char static_szCmdLine[MAX_PATH] = "";
+#pragma data_seg()
+
+const char *static_gpac_get_url()
+{
+	return (const char *) static_szCmdLine;
+}
+
+static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
+{
+	FILE *logs = (FILE *) cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
+BOOL Osmo4::InitInstance()
+{
+	CCommandLineInfo cmdInfo;
+
+	afxAmbientActCtx = FALSE;
+
+	m_logs = NULL;
+
+	m_term = NULL;
+
+	memset(&m_user, 0, sizeof(GF_User));
+
+	/*get Osmo4.exe path*/
+	strcpy((char *) szApplicationPath, AfxGetApp()->m_pszHelpFilePath);
+	while (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') szApplicationPath[strlen((char *) szApplicationPath)-1] = 0;
+	if (szApplicationPath[strlen((char *) szApplicationPath)-1] != '\\') strcat(szApplicationPath, "\\");
+
+	gf_sys_init(GF_MemTrackerNone);
+
+	/*setup user*/
+	memset(&m_user, 0, sizeof(GF_User));
+
+	Bool first_launch = GF_FALSE;
+	/*init config and modules*/
+	m_user.config = gf_cfg_init(NULL, &first_launch);
+	if (!m_user.config) {
+		MessageBox(NULL, "GPAC Configuration file not found", "Fatal Error", MB_OK);
+		m_pMainWnd->PostMessage(WM_CLOSE);
+	}
+
+	char *name = gf_cfg_get_filename(m_user.config);
+	char *sep = strrchr(name, '\\');
+	if (sep) sep[0] = 0;
+	strcpy(szUserPath, name);
+	if (sep) sep[0] = '\\';
+
+	const char *opt = gf_cfg_get_key(m_user.config, "General", "SingleInstance");
+	m_SingleInstance = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
+
+	m_hMutex = NULL;
+	if (m_SingleInstance) {
+		m_hMutex = CreateMutex(NULL, FALSE, "Osmo4_GPAC_INSTANCE");
+		if ( GetLastError() == ERROR_ALREADY_EXISTS ) {
+			char szDIR[1024];
+			if (m_hMutex) CloseHandle(m_hMutex);
+			m_hMutex = NULL;
+
+			if (!static_gpac_hwnd || !IsWindow(static_gpac_hwnd) ) {
+				::MessageBox(NULL, "Osmo4 ghost process detected", "Error at last shutdown" , MB_OK);
+			} else {
+				::SetForegroundWindow(static_gpac_hwnd);
+
+				if (m_lpCmdLine && strlen(m_lpCmdLine)) {
+					DWORD_PTR res;
+					size_t len;
+					char *the_url, *cmd;
+					GetCurrentDirectory(1024, szDIR);
+					if (szDIR[strlen(szDIR)-1] != '\\') strcat(szDIR, "\\");
+					cmd = (char *)(const char *) m_lpCmdLine;
+					strcpy(static_szCmdLine, "");
+					if (cmd[0]=='"') cmd+=1;
+
+					if (!strnicmp(cmd, "-queue ", 7)) {
+						strcat(static_szCmdLine, "-queue ");
+						cmd += 7;
+					}
+					the_url = gf_url_concatenate(szDIR, cmd);
+					if (!the_url) {
+						strcat(static_szCmdLine, cmd);
+					} else {
+						strcat(static_szCmdLine, the_url);
+						gf_free(the_url);
+					}
+					while ( (len = strlen(static_szCmdLine)) ) {
+						char s = static_szCmdLine[len-1];
+						if ((s==' ') || (s=='"')) static_szCmdLine[len-1]=0;
+						else break;
+					}
+					::SendMessageTimeout(static_gpac_hwnd, WM_NEWINSTANCE, 0, 0, 0, 1000, &res);
+				}
+			}
+
+			return FALSE;
+		}
+	}
+
+#if 0
+	// Standard initialization
+#ifdef _AFXDLL
+	Enable3dControls();			// Call this when using MFC in a shared DLL
+#else
+	Enable3dControlsStatic();	// Call this when linking to MFC statically
+#endif
+
+#endif
+
+	SetRegistryKey(_T("GPAC"));
+	CMainFrame* pFrame = new CMainFrame;
+	m_pMainWnd = pFrame;
+	pFrame->LoadFrame(IDR_MAINFRAME, WS_OVERLAPPEDWINDOW | FWS_ADDTOTITLE, NULL, NULL);
+	pFrame->LoadAccelTable( MAKEINTRESOURCE(IDR_MAINACCEL));
+
+	m_pMainWnd->DragAcceptFiles();
+
+	if (m_SingleInstance) static_gpac_hwnd = m_pMainWnd->m_hWnd;
+
+	m_user.modules = gf_modules_new(NULL, m_user.config);
+	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
+		MessageBox(NULL, "No modules available - system cannot work", "Fatal Error", MB_OK);
+		m_pMainWnd->PostMessage(WM_CLOSE);
+	}
+	else if (first_launch) {
+		/*first launch, register all files ext*/
+		u32 i;
+		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
+			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
+			if (!ifce) continue;
+			if (ifce) {
+				ifce->CanHandleURL(ifce, "test.test");
+				gf_modules_close_interface((GF_BaseInterface *)ifce);
+			}
+		}
+		/*set some shortcuts*/
+		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeUp", "ctrl+Up");
+		gf_cfg_set_key(m_user.config, "Shortcuts", "VolumeDown", "ctrl+Down");
+		gf_cfg_set_key(m_user.config, "Shortcuts", "FastRewind", "ctrl+Left");
+		gf_cfg_set_key(m_user.config, "Shortcuts", "FastForward", "ctrl+Right");
+		gf_cfg_set_key(m_user.config, "Shortcuts", "Play", "ctrl+ ");
+	}
+
+	/*check log file*/
+	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
+	if (str) {
+		m_logs = gf_fopen(str, "wt");
+		gf_log_set_callback(m_logs, osmo4_do_log);
+	}
+	else m_logs = NULL;
+
+	/*set log level*/
+	if (gf_log_set_tools_levels(gf_cfg_get_key(m_user.config, "General", "Logs")) != GF_OK)
+		fprintf(stdout, "osmo4: invalid log level specified\n");
+
+	m_user.opaque = this;
+	m_user.os_window_handler = pFrame->m_pWndView->m_hWnd;
+	m_user.EventProc = Osmo4_EventProc;
+
+	m_reset = GF_FALSE;
+	orig_width = 320;
+	orig_height = 240;
+
+	gf_set_progress_callback(this, Osmo4_progress_cbk);
+
+	m_term = gf_term_new(&m_user);
+	if (! m_term) {
+		MessageBox(NULL, "Cannot load GPAC Terminal", "Fatal Error", MB_OK);
+		m_pMainWnd->PostMessage(WM_CLOSE);
+		return TRUE;
+	}
+	SetOptions();
+	UpdateRenderSwitch();
+
+	pFrame->SendMessage(WM_SETSIZE, orig_width, orig_height);
+	pFrame->m_Address.ReloadURLs();
+
+	pFrame->m_Sliders.SetVolume();
+
+	m_reconnect_time = 0;
+
+
+	ParseCommandLine(cmdInfo);
+
+	start_mode = 0;
+
+	if (! cmdInfo.m_strFileName.IsEmpty()) {
+		pFrame->m_pPlayList->QueueURL(cmdInfo.m_strFileName);
+		pFrame->m_pPlayList->RefreshList();
+		pFrame->m_pPlayList->PlayNext();
+	} else {
+		char sPL[MAX_PATH];
+		strcpy((char *) sPL, szUserPath);
+		strcat(sPL, "gpac_pl.m3u");
+		pFrame->m_pPlayList->OpenPlayList(sPL);
+		const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "PLEntry");
+		if (sOpt) {
+			s32 count = (s32)gf_list_count(pFrame->m_pPlayList->m_entries);
+			pFrame->m_pPlayList->m_cur_entry = atoi(sOpt);
+			if (pFrame->m_pPlayList->m_cur_entry>=count)
+				pFrame->m_pPlayList->m_cur_entry = count-1;
+		} else {
+			pFrame->m_pPlayList->m_cur_entry = -1;
+		}
+#if 0
+		if (pFrame->m_pPlayList->m_cur_entry>=0) {
+			start_mode = 1;
+			pFrame->m_pPlayList->Play();
+		}
+#endif
+
+		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+		if (sOpt && !strstr(sOpt, "gui") ) gf_term_connect(m_term, sOpt);
+
+		sOpt = gf_cfg_get_key(m_user.config, "General", "PlaylistLoop");
+		m_Loop = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	}
+	pFrame->SetFocus();
+	pFrame->SetForegroundWindow();
+	return TRUE;
+}
+
+int Osmo4::ExitInstance()
+{
+	if (m_term) gf_term_del(m_term);
+	if (m_user.modules) gf_modules_del(m_user.modules);
+	if (m_user.config) gf_cfg_del(m_user.config);
+	gf_sys_close();
+	/*last instance*/
+	if (m_hMutex) {
+		CloseHandle(m_hMutex);
+		static_gpac_hwnd = NULL;
+	}
+	if (m_logs) gf_fclose(m_logs);
+	return CWinApp::ExitInstance();
+}
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Osmo4 message handlers
+
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CAboutDlg dialog used for App About
+
+class CAboutDlg : public CDialog
+{
+public:
+	CAboutDlg();
+
+// Dialog Data
+	//{{AFX_DATA(CAboutDlg)
+	enum { IDD = IDD_ABOUTBOX };
+	//}}AFX_DATA
+
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CAboutDlg)
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+	//{{AFX_MSG(CAboutDlg)
+	virtual BOOL OnInitDialog();
+	afx_msg void OnGogpac();
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
+{
+	//{{AFX_DATA_INIT(CAboutDlg)
+	//}}AFX_DATA_INIT
+}
+
+void CAboutDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CAboutDlg)
+	//}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
+	//{{AFX_MSG_MAP(CAboutDlg)
+	ON_BN_CLICKED(IDC_GOGPAC, OnGogpac)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+void Osmo4::OnAbout()
+{
+	CAboutDlg aboutDlg;
+	aboutDlg.DoModal();
+}
+
+BOOL CAboutDlg::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	CString str = "GPAC/Osmo4 - version " GPAC_FULL_VERSION;
+	SetWindowText(str);
+	return TRUE;
+}
+
+void CAboutDlg::OnGogpac()
+{
+	ShellExecute(NULL, "open", "http://gpac.io", NULL, NULL, SW_SHOWNORMAL);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Osmo4 message handlers
+
+
+void Osmo4::SetOptions()
+{
+	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
+	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
+	m_LookForSubtitles = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
+	m_NoConsole = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "ViewXMT");
+	m_ViewXMTA  = (sOpt && !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
+	m_NoMimeFetch = (!sOpt || !stricmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+}
+
+
+void Osmo4::OnOpenUrl()
+{
+	COpenUrl url;
+	if (url.DoModal() != IDOK) return;
+
+	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
+	pFrame->m_pPlayList->Truncate();
+	pFrame->m_pPlayList->QueueURL(url.m_url);
+	pFrame->m_pPlayList->RefreshList();
+	pFrame->m_pPlayList->PlayNext();
+}
+
+
+CString Osmo4::GetFileFilter()
+{
+	u32 keyCount, i;
+	CString sFiles;
+	CString sExts;
+	CString supportedFiles;
+
+	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
+	supportedFiles = "All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2";
+
+	sExts = "";
+	sFiles = "";
+	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
+	for (i=0; i<keyCount; i++) {
+		const char *sMime;
+		Bool first;
+		char *sKey;
+		const char *opt;
+		char szKeyList[1000], sDesc[1000];
+		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
+		if (!sMime) continue;
+		CString sOpt;
+		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
+		/*remove module name*/
+		strcpy(szKeyList, opt+1);
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+		/*get description*/
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		strcpy(sDesc, sKey+1);
+		sKey[0] = 0;
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+
+		/*if same description for # mime types skip (means an old mime syntax)*/
+		if (sFiles.Find(sDesc)>=0) continue;
+		/*if same extensions for # mime types skip (don't polluate the file list)*/
+		if (sExts.Find(szKeyList)>=0) continue;
+
+		sExts += szKeyList;
+		sExts += " ";
+		sFiles += sDesc;
+		sFiles += "|";
+
+		first = GF_TRUE;
+
+		sOpt = CString(szKeyList);
+		while (1) {
+
+			int pos = sOpt.Find(' ');
+			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
+			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
+			if (ext.Find(".")<0) {
+				if (!first) {
+					sFiles += ";";
+				} else {
+					first = GF_FALSE;
+				}
+				sFiles += "*.";
+				sFiles += ext;
+
+				CString sext = ext;
+				sext += ";";
+				if (supportedFiles.Find(sext)<0) {
+					supportedFiles += ";*.";
+					supportedFiles += ext;
+				}
+			}
+
+			if (sOpt==ext) break;
+			CString rem;
+			rem.Format("%s ", (LPCTSTR) ext);
+			sOpt.Replace((LPCTSTR) rem, "");
+		}
+		sFiles += "|";
+	}
+	supportedFiles += "|";
+	supportedFiles += sFiles;
+	supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
+	return supportedFiles;
+}
+
+void Osmo4::OnOpenFile()
+{
+	CString sFiles = GetFileFilter();
+	u32 nb_items;
+
+	/*looks like there's a bug here, main filter isn't used correctly while the others are*/
+	CFileDialog fd(TRUE,NULL,NULL, OFN_ALLOWMULTISELECT | OFN_HIDEREADONLY | OFN_FILEMUSTEXIST , sFiles);
+	fd.m_ofn.nMaxFile = 25000;
+	fd.m_ofn.lpstrFile = (char *) gf_malloc(sizeof(char) * fd.m_ofn.nMaxFile);
+	fd.m_ofn.lpstrFile[0] = 0;
+
+	if (fd.DoModal()!=IDOK) {
+		gf_free(fd.m_ofn.lpstrFile);
+		return;
+	}
+
+	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
+
+	nb_items = 0;
+	POSITION pos = fd.GetStartPosition();
+	while (pos) {
+		CString file = fd.GetNextPathName(pos);
+		nb_items++;
+	}
+	/*if several items, act as playlist (replace playlist), otherwise as browser (lost all "next" context)*/
+	if (nb_items==1)
+		pFrame->m_pPlayList->Truncate();
+	else
+		pFrame->m_pPlayList->Clear();
+
+	pos = fd.GetStartPosition();
+	while (pos) {
+		CString file = fd.GetNextPathName(pos);
+		pFrame->m_pPlayList->QueueURL(file);
+	}
+	gf_free(fd.m_ofn.lpstrFile);
+	pFrame->m_pPlayList->RefreshList();
+	pFrame->m_pPlayList->PlayNext();
+}
+
+
+void Osmo4::Pause()
+{
+	if (!m_isopen) return;
+	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) ? GF_STATE_PAUSED : GF_STATE_PLAYING);
+}
+
+void Osmo4::OnMainPause()
+{
+	Pause();
+}
+
+void Osmo4::OnFileStep()
+{
+	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+	((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
+}
+void Osmo4::OnUpdateFileStep(CCmdUI* pCmdUI)
+{
+	pCmdUI->Enable(m_isopen && !m_reset);
+}
+
+void Osmo4::PlayFromTime(u32 time)
+{
+	Bool do_pause;
+	if (start_mode==1) do_pause = GF_TRUE;
+	else if (start_mode==2) do_pause = GF_FALSE;
+	else do_pause = /*!m_AutoPlay*/GF_FALSE;
+	gf_term_play_from_time(m_term, time, do_pause);
+	m_reset = GF_FALSE;
+}
+
+
+void Osmo4::OnFileReload()
+{
+	gf_term_disconnect(m_term);
+	m_pMainWnd->PostMessage(WM_OPENURL);
+}
+
+void Osmo4::OnFileMigrate()
+{
+}
+
+void Osmo4::OnConfigReload()
+{
+	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
+}
+
+void Osmo4::UpdatePlayButton(Bool force_play)
+{
+	if (!force_play && gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 4);
+	} else {
+		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
+	}
+}
+
+void Osmo4::OnFilePlay()
+{
+	if (m_isopen) {
+		if (m_reset) {
+			m_reset = GF_FALSE;
+			PlayFromTime(0);
+			((CMainFrame *)m_pMainWnd)->SetProgTimer(GF_TRUE);
+		} else {
+			Pause();
+		}
+		UpdatePlayButton();
+	} else {
+		((CMainFrame *) m_pMainWnd)->m_pPlayList->Play();
+	}
+}
+
+void Osmo4::OnUpdateFilePlay(CCmdUI* pCmdUI)
+{
+	if (m_isopen) {
+		pCmdUI->Enable(TRUE);
+		if (pCmdUI->m_nID==ID_FILE_PLAY) {
+			if (!m_isopen) {
+				pCmdUI->SetText("Play/Pause\tCtrl+P");
+			} else if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+				pCmdUI->SetText("Pause\tCtrl+P");
+			} else {
+				pCmdUI->SetText("Resume\tCtrl+P");
+			}
+		}
+	} else {
+		pCmdUI->Enable(((CMainFrame *)m_pMainWnd)->m_pPlayList->HasValidEntries() );
+		pCmdUI->SetText("Play\tCtrl+P");
+	}
+}
+
+void Osmo4::OnFileStop()
+{
+	CMainFrame *pFrame = (CMainFrame *) m_pMainWnd;
+	if (m_reset) return;
+	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) Pause();
+	m_reset = GF_TRUE;
+	pFrame->m_Sliders.m_PosSlider.SetPos(0);
+	pFrame->SetProgTimer(GF_FALSE);
+	pFrame->m_wndToolBar.SetButtonInfo(5, ID_FILE_PLAY, TBBS_BUTTON, 3);
+	start_mode = 2;
+}
+
+void Osmo4::OnUpdateFileStop(CCmdUI* pCmdUI)
+{
+//	pCmdUI->Enable(m_isopen);
+}
+
+void Osmo4::OnSwitchRender()
+{
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
+	Bool use_gl = (opt && !stricmp(opt, "always")) ? GF_TRUE : GF_FALSE;
+	gf_cfg_set_key(m_user.config, "Compositor", "OpenGLMode", use_gl ? "disable" : "always");
+
+	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
+
+	UpdateRenderSwitch();
+}
+
+void Osmo4::UpdateRenderSwitch()
+{
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
+	if (opt && !stricmp(opt, "disable"))
+		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 10);
+	else
+		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 9);
+}

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.rc Added

@@ -0,0 +1,885 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+IDR_MAINFRAME MENU
+BEGIN
+    POPUP "&File"
+    BEGIN
+        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
+        MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
+        MENUITEM SEPARATOR
+        MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
+        POPUP "Streaming Cache"
+        BEGIN
+            MENUITEM "&Enable",                     ID_REC_ENABLE
+            MENUITEM "&Stop and Save",              ID_REC_STOP
+            MENUITEM "&Abort",                      ID_REC_ABORT
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Copy",                        ID_FILE_COPY
+        MENUITEM "Paste",                       ID_FILE_PASTE
+        MENUITEM SEPARATOR
+        MENUITEM "Exit",                        ID_FILE_EXIT
+    END
+    POPUP "View"
+    BEGIN
+        POPUP "Viewpoint"
+        BEGIN
+            MENUITEM "",                            ID_VIEWPORT_EMPTY
+        END
+        POPUP "&Navigation"
+        BEGIN
+            MENUITEM "Headlight",                   ID_HEADLIGHT
+            MENUITEM SEPARATOR
+            MENUITEM "&None",                       ID_NAVIGATE_NONE
+            MENUITEM "&Walk",                       ID_NAVIGATE_WALK
+            MENUITEM "&Fly",                        ID_NAVIGATE_FLY
+            MENUITEM "&Examine",                    ID_NAVIGATE_EXAM
+            MENUITEM "&Pan",                        ID_NAVIGATE_PAN
+            MENUITEM "&Slide",                      ID_NAVIGATE_SLIDE
+            MENUITEM "&Orbit",                      ID_NAVIGATE_ORBIT
+            MENUITEM "&VR",                         ID_NAVIGATE_VR
+            MENUITEM "&Game",                       ID_NAVIGATE_GAME
+            MENUITEM SEPARATOR
+            POPUP "Collision"
+            BEGIN
+                MENUITEM "Off",                         ID_COLLIDE_NONE
+                MENUITEM "Regular",                     ID_COLLIDE_REG
+                MENUITEM "Displacement",                ID_COLLIDE_DISP
+            END
+            MENUITEM "Gravity",                     ID_GRAVITY
+            MENUITEM SEPARATOR
+            MENUITEM "&Reset",                      ID_NAV_RESET
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "&Fullscreen",                 ID_VIEW_FULLSCREEN
+        MENUITEM "Original &Aspect",            ID_VIEW_ORIGINAL
+        POPUP "Aspect &Ratio"
+        BEGIN
+            MENUITEM "&Keep Original",              ID_AR_KEEP
+            MENUITEM "&Fill Screen",                ID_AR_FILL
+            MENUITEM "Ratio 4/3",                   ID_AR_43
+            MENUITEM "Ratio 16/9",                  ID_AR_169
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Resource Usage",              ID_VIEW_CPU
+        MENUITEM SEPARATOR
+        MENUITEM "&Options",                    IDD_CONFIGURE
+    END
+    POPUP "Play"
+    BEGIN
+        POPUP "Stream &Selection"
+        BEGIN
+            POPUP "Audio"
+            BEGIN
+                MENUITEM "",                            ID_AUDIO_EMPTY
+            END
+            POPUP "Video"
+            BEGIN
+                MENUITEM "",                            ID_VIDEO_EMPTY
+            END
+            POPUP "Subtitle"
+            BEGIN
+                MENUITEM "",                            ID_SUBS_EMPTY
+            END
+            MENUITEM SEPARATOR
+            MENUITEM "Add Subtitle",                ID_ADD_SUBTITLE
+        END
+        POPUP "&Chapters"
+        BEGIN
+            MENUITEM "",                            ID_SETCHAP_FIRST
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Playlist\tF3",                ID_VIEW_PL, CHECKED
+        MENUITEM "&Loop Playlist",              ID_PLAYLIST_LOOP
+        MENUITEM SEPARATOR
+        MENUITEM "Play/Pause\tCtrl+P",          ID_FILE_PLAY
+        MENUITEM "Step-by-Step\tCtrl+S",        ID_FILE_STEP
+        MENUITEM "Stop",                        ID_FILE_STOP
+        MENUITEM SEPARATOR
+        MENUITEM "Reload File\tF5",             ID_FILE_RELOAD
+        MENUITEM SEPARATOR
+        MENUITEM "Clear History",               ID_CLEAR_NAV
+        MENUITEM "Reload Config",               ID_CONFIG_RELOAD
+    END
+    POPUP "?"
+    BEGIN
+        MENUITEM "Shortcut List",               ID_SHORTCUTS
+        MENUITEM "Navigation Keys",             ID_NAV_INFO
+        MENUITEM SEPARATOR
+        MENUITEM "&About ...",                  ID_H_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOGEX 0, 0, 209, 137
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_CLIENTEDGE
+CAPTION "Osmo4 / GPAC version X.X.X"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,8,4,20,20
+    CTEXT           "Osmo4 Player - GPAC Multimedia Framework",IDC_STATIC,31,10,150,10,SS_NOPREFIX
+    CTEXT           "(c) 2000-2013 Telecom ParisTech\nAll Rights Reserved",IDC_STATIC,4,64,201,18
+    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",IDC_STATIC,4,26,200,18
+    PUSHBUTTON      "http://gpac.io",IDC_GOGPAC,43,47,121,13,BS_FLAT,WS_EX_STATICEDGE
+    GROUPBOX        "With Many Thanks To:",IDC_STATIC,3,82,203,53
+    CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
+END
+
+IDD_PASSWD DIALOG 0, 0, 134, 71
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Enter user name and password"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,4,56,50,12
+    PUSHBUTTON      "Cancel",IDCANCEL,80,56,50,12
+    LTEXT           "Static__________________________",IDC_TXT_SITE,25,4,105,8
+    LTEXT           "Login",IDC_STATIC,7,21,18,8
+    LTEXT           "Password",IDC_STATIC,7,37,32,8
+    EDITTEXT        IDC_EDIT_USER,47,18,55,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PASSWORD,47,34,55,14,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Site",IDC_STATIC,7,4,13,8
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Osmo4-GPAC"
+		VALUE "FileVersion", "0.8.0"
+            VALUE "InternalName", "Osmo4"
+            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012"
+            VALUE "OriginalFilename", "Osmo4.EXE"
+            VALUE "ProductName", "Osmo4-GPAC"
+		VALUE "ProductVersion", "0.8.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 136
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_MAINTOOLS TOOLBAR 16, 15
+BEGIN
+    BUTTON      ID_OPEN_FILE
+    BUTTON      ID_NAV_PREV
+    BUTTON      ID_NAV_NEXT
+    BUTTON      ID_FILE_PLAY
+    BUTTON      ID_FILE_PLAY
+    BUTTON      ID_FILE_STEP
+    BUTTON      ID_FILE_STOP
+    BUTTON      ID_FILE_PROPS
+    BUTTON      IDD_CONFIGURE
+    BUTTON      ID_SWITCH_RENDER
+    BUTTON      ID_SWITCH_RENDER
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_MAINTOOLS           BITMAP                  "res\\maintool.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDR_MAINFRAME           "Osmo4"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_APP_TITLE       "Osmo4"
+    AFX_IDS_IDLEMESSAGE     "Ready"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
+    ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
+    ID_PLAYLIST_LOOP        "Restarts playlist from beginning when playlist is over"
+    ID_OPEN_FILE             "Opens local file"
+    ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
+END
+
+STRINGTABLE
+BEGIN
+    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_SCSIZE          "Change the window size"
+    AFX_IDS_SCMOVE          "Change the window position"
+    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
+    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
+    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
+    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
+    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
+END
+
+STRINGTABLE
+BEGIN
+    AFX_IDS_SCRESTORE       "Restore the window to normal size"
+    AFX_IDS_SCTASKLIST      "Activate Task List"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_STOP            "Stops current presentation"
+    ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
+    ID_COLLIDE_NONE         "Turns collision detection off"
+    ID_COLLIDE_REG          "Turns collision detection on"
+    ID_COLLIDE_DISP         "Collision with camera displacement"
+    ID_HEADLIGHT            "Turns headlight on/off"
+END
+
+STRINGTABLE
+BEGIN
+    ID_CLEAR_NAV            "Clears navigation history"
+    ID_TIMER                " "
+    ID_FPS                  " "
+    ID_VIEW_PL              "View navigation history as a playlist"
+END
+
+STRINGTABLE
+BEGIN
+    ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
+    ID_AR_KEEP              "Keep Aspect Ratio of presentation"
+    ID_SHORTCUTS            "List of available shortcuts"
+    ID_FILE_PROP            "Show presentation properties"
+    ID_FILE_STEP            "Step one frame into presentation"
+    IDD_CONFIGURE           "Configure Player"
+    ID_VIEW_SCALABLE        "Uses vectorial zooming when resizing the window"
+    ID_OPEN_URL             "Open remote presentation"
+    ID_FILE_RELOAD          "Reload current presentation"
+    ID_FILE_PLAY            "Play/Pause presentation"
+    ID_NAVIGATE_NONE        "Disable navigation"
+END
+
+STRINGTABLE
+BEGIN
+    ID_NAVIGATE_WALK        "Turn walk navigation on"
+    ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
+    ID_AR_43                "Forces Aspect Ratio of 4/3"
+    ID_AR_169               "Forces Aspect Ratio of 16/9"
+    ID_NAV_RESET            "Restore last viewpoint"
+END
+
+STRINGTABLE
+BEGIN
+    ID_NAVIGATE_VR          "QT-VR like navigation"
+    ID_REC_ENABLE           "Enable recording of streaming data"
+    ID_REC_STOP             "Stops recording and save to file"
+    ID_REC_ABORT            "Stops recording and discard data"
+END
+
+STRINGTABLE
+BEGIN
+    ID_FILE_COPY            "Copy selected text to clipboard"
+    ID_FILE_PASTE           "Paste clipboard"
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// French (France) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_OPENFILE DIALOG 0, 0, 301, 23
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Select Location"
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_COMBOURL,3,5,273,67,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
+END
+
+IDD_OPTIONS DIALOG 0, 0, 174, 106
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Osmo4 Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "Apply",IDC_SAVEOPT,147,2,26,12
+    COMBOBOX        IDC_SELECT,42,2,99,173,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Category",IDC_STATIC,7,4,29,8
+END
+
+IDD_OPT_GEN DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Loop At End",IDC_LOOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,4,55,10
+    CONTROL         "Look for subtitles",IDC_LOOKFORSUB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,42,69,10
+    CONTROL         "Disable console messages",IDC_NO_CONSOLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,17,99,10
+    CONTROL         "View Graph in XMT-A format",IDC_DUMP_XMT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,30,105,10
+    CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
+END
+
+IDD_OPT_RENDER DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Rendering Frame Rate",IDC_STATIC,5,4,72,8
+    COMBOBOX        IDC_BIFS_RATE,81,2,84,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,49,64,10
+    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,49,72,10
+    LTEXT           "Anti-Aliasing Level",IDC_STATIC,7,20,58,8
+    COMBOBOX        IDC_AA_LIST,81,17,84,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Use 3D Renderer",IDC_USE_RENDER3D,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,63,71,10
+    LTEXT           "2D Rasterizer",IDC_STATIC,7,35,44,8
+    COMBOBOX        IDC_GD_LIST,81,33,84,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_DRAW_BOUNDS,109,60,56,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Bounds",IDC_STATIC,82,64,25,8
+END
+
+IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,27,15,11,14
+    EDITTEXT        IDC_EDIT_AUDIO,5,15,19,14,ES_READONLY | ES_NUMBER
+    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,3,73,10
+    LTEXT           "buffers",IDC_STATIC,43,18,23,8
+    CONTROL         "Spin1",IDC_SPIN_FPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ARROWKEYS,104,15,11,14
+    EDITTEXT        IDC_AUDIO_FPS,77,15,24,14,ES_NUMBER
+    LTEXT           "Audio Driver",IDC_STATIC,7,63,40,8
+    CONTROL         "No Resynchronization",IDC_AUDIO_RESYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,46,82,10
+    COMBOBOX        IDC_DRIVER_LIST,63,60,103,62,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Disable Notifications",IDC_AUDIO_NOTIFS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,47,79,10
+    CONTROL         "Disable Multichannel",IDC_AUDIO_MULTICH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,34,81,10
+    LTEXT           "ms total length",IDC_STATIC,118,18,49,8
+END
+
+IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Video Driver",IDC_STATIC,6,7,40,8
+    COMBOBOX        IDC_VIDEO_LIST,55,5,111,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Change video resolution in fullscreen",IDC_SWITCH_RES,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,29,131,10
+    CONTROL         "Use Hardware Video Memory in 2D mode",IDC_HWMEMORY,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,44,143,10
+END
+
+IDD_OPT_HTTP DIALOGEX 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    PUSHBUTTON      "...",IDC_BROWSE_CACHE,57,4,109,12
+    CONTROL         "Clean cache at exit",IDC_CLEAN_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,23,77,10
+    CONTROL         "Disable Cache",IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,22,62,10
+    LTEXT           "Cache Directory",IDC_STATIC,5,5,52,8
+    CONTROL         "XML progressive load",IDC_SAX_PROGRESSIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,42,84,10
+    EDITTEXT        IDC_SAX_DELAY,142,41,22,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "TimeSlice (ms)",IDC_STATIC,91,43,46,8
+    EDITTEXT        IDC_HTTP_PROXY,54,58,111,12,ES_AUTOHSCROLL
+    CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
+END
+
+IDD_OPT_FONT DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Font Engine",IDC_STATIC,6,11,39,8
+    COMBOBOX        IDC_FONT_LIST,60,8,105,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_BROWSE_FONT,2,40,164,12
+    LTEXT           "System Font Directory",IDC_STATIC,46,29,70,8
+    COMBOBOX        IDC_TEXTURE_MODE,101,58,64,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
+END
+
+IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_LANG,75,4,92,58,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,3,61,17
+    LTEXT           "Decoder Threading",IDC_STATIC,4,28,62,8
+    COMBOBOX        IDC_DEC_THREAD,75,25,92,57,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,109,10
+    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
+END
+
+IDD_OPT_STREAM DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Default Port",IDC_STATIC,6,6,40,8
+    COMBOBOX        IDC_PORT,52,3,113,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,19,68,10
+    CONTROL         "use RTP reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,19,76,10
+    LTEXT           "milliseconds before control timeout",IDC_STATIC,38,34,108,8
+    EDITTEXT        IDC_TIMEOUT,3,32,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "milliseconds of Media Buffering ",IDC_STATIC,38,48,100,8
+    EDITTEXT        IDC_BUFFER,3,47,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_REBUFFER_LEN,83,60,30,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,63,79,10
+    LTEXT           "milliseconds",IDC_STATIC,117,63,41,8
+END
+
+IDD_PROPERTIES DIALOGEX 0, 0, 338, 150
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Presentation Properties"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "Tree1",IDC_ODTREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_SINGLEEXPAND | WS_BORDER | WS_TABSTOP,2,2,120,114
+    EDITTEXT        IDC_ODINFO,123,17,213,130,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_OEMCONVERT | ES_READONLY | WS_VSCROLL | WS_HSCROLL,WS_EX_DLGMODALFRAME | WS_EX_STATICEDGE
+    PUSHBUTTON      "Get World Info",IDC_WORLD,2,118,119,13
+    PUSHBUTTON      "View Scene Graph",IDC_VIEWSG,2,134,119,13
+    CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
+END
+
+IDD_OPT_DECODER DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Prefered Audio Module",-1,46,5,69,8
+    COMBOBOX        IDC_AUDEC_LIST,26,17,111,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Prefered Video Module",-1,48,40,69,8
+    COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Disable YUV Hardware",IDC_YUV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,54,89,10
+    LTEXT           "Static",IDC_FORMAT_YUV,97,57,67,8
+    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,32,72,10
+    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
+END
+
+IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "Use OpenGL Outlines",IDC_RASTER_OUTLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,2,84,10
+    CONTROL         "Emulate power-of-two textures for video",IDC_EMUL_POW2,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,45,140,10
+    CONTROL         "Polygon Anti-Aliasing",IDC_DISABLE_POLY_AA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,90,2,78,10
+    CONTROL         "Disable rectangular texture extensions",IDC_DISABLE_TX_RECT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,55,135,10
+    CONTROL         "Bitmap node uses direct pixel copy",IDC_BITMAP_USE_PIXEL,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,65,125,10
+    LTEXT           "Draw Normals",IDC_STATIC,4,17,45,8
+    COMBOBOX        IDC_DRAW_NORMALS,4,25,48,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Backface Cull",IDC_STATIC,57,17,55,8
+    COMBOBOX        IDC_BACK_CULL,57,25,47,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Draw Mode",IDC_STATIC,113,17,55,8
+    COMBOBOX        IDC_DRAW_MODE,111,25,53,44,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_SLIDERS DIALOGEX 0, 0, 218, 18
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    CONTROL         "Slider1",ID_SLIDER,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS,0,3,185,12
+    CONTROL         "Slider1",ID_AUDIO_VOL,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_BORDER | WS_TABSTOP,187,3,30,13
+END
+
+IDD_NAVBAR DIALOGEX 0, 0, 279, 15
+STYLE DS_SETFONT | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_ADDRESS,29,1,130,196,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP,WS_EX_ACCEPTFILES
+    LTEXT           "Address",IDC_DUMTXT,1,4,26,8
+END
+
+IDD_PLAYLIST DIALOGEX 0, 0, 186, 54
+STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_TOOLWINDOW
+CAPTION "Osmo4 Playlist"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
+END
+
+IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "...",IDC_BROWSE_MCACHE,41,2,126,12
+    CONTROL         "Overwrite existing files",IDC_MCACHE_OVERWRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,18,85,10
+    CONTROL         "Use filename",IDC_MCACHE_USENAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,31,57,10
+    LTEXT           "Record To",IDC_STATIC,4,4,35,8
+    EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
+END
+
+IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_FILELIST,59,6,108,61,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Supported Files",IDC_STATIC,6,8,50,8
+    LTEXT           "Extension",IDC_FILES_EXT,7,25,154,8
+    LTEXT           "Mime Type",IDC_FILES_MIMES,7,37,156,8
+    CONTROL         "Associate with Osmo4",IDC_ASSOCIATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,60,84,10
+    LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
+END
+
+IDD_OPT_LOGS DIALOG 0, 20, 169, 76
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Level",IDC_STATIC,6,7,18,8
+    COMBOBOX        IDC_LOG_LEVEL,30,4,64,74,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "core",IDC_TOOL_CORE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,23,30,10
+    CONTROL         "coding",IDC_TOOL_CODING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,33,37,10
+    CONTROL         "container",IDC_TOOL_CONTAINER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,43,45,10
+    CONTROL         "network",IDC_TOOL_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,53,41,10
+    CONTROL         "rtp",IDC_TOOL_RTP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,63,24,10
+    CONTROL         "author",IDC_TOOL_AUTHOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,24,36,10
+    CONTROL         "sync",IDC_TOOL_SYNC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,34,31,10
+    CONTROL         "codec",IDC_TOOL_CODEC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,44,36,10
+    CONTROL         "parser",IDC_TOOL_PARSER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,54,35,10
+    CONTROL         "media",IDC_TOOL_MEDIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,64,35,10
+    CONTROL         "scene",IDC_TOOL_SCENE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,24,35,10
+    CONTROL         "script",IDC_TOOL_SCRIPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,34,33,10
+    CONTROL         "compose",IDC_TOOL_COMPOSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,44,45,10
+    CONTROL         "render",IDC_TOOL_RENDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,54,36,10
+    CONTROL         "mmio",IDC_TOOL_MMIO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,64,32,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_OPT_VIDEO, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_FONT, DIALOG
+    BEGIN
+        LEFTMARGIN, 1
+        RIGHTMARGIN, 168
+        BOTTOMMARGIN, 74
+    END
+
+    IDD_OPT_SYSTEMS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 167
+        TOPMARGIN, 1
+        BOTTOMMARGIN, 75
+    END
+
+    IDD_OPT_STREAM, DIALOG
+    BEGIN
+        LEFTMARGIN, 1
+        RIGHTMARGIN, 167
+        TOPMARGIN, 1
+    END
+
+    IDD_PROPERTIES, DIALOG
+    BEGIN
+        RIGHTMARGIN, 335
+        TOPMARGIN, 1
+    END
+
+    IDD_OPT_DECODER, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_RENDER3D, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_NAVBAR, DIALOG
+    BEGIN
+        RIGHTMARGIN, 167
+    END
+
+    IDD_OPT_FILETYPES, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+
+    IDD_OPT_LOGS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 168
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_PLAYLIST TOOLBAR 16, 15
+BEGIN
+    BUTTON      ID_PL_OPEN
+    BUTTON      ID_PL_SAVE
+    BUTTON      ID_PL_ADD_FILE
+    BUTTON      ID_PL_REM_FILE
+    BUTTON      ID_PL_UP
+    BUTTON      ID_PL_DOWN
+    BUTTON      ID_PL_SORT_FILE
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_PLAYLIST            BITMAP                  "res\\playlist.bmp"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif //_WIN32\r\n"
+    "#include ""res\\Osmo4.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON                    "..\\..\\doc\\osmo4.ico"
+IDI_PLAY                ICON                    "res\\play.ico"
+IDI_STOP                ICON                    "res\\stop.ico"
+IDI_PAUSE               ICON                    "res\\pause.ico"
+IDI_MESSAGE             ICON                    "res\\message.ico"
+IDI_ERR                 ICON                    "res\\error.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_OPT_RENDER DLGINIT
+BEGIN
+    IDC_BIFS_RATE, 0x403, 4, 0
+0x2e35, 0x0030, 
+    IDC_BIFS_RATE, 0x403, 4, 0
+0x2e37, 0x0035, 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3031, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3231, 0x352e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3531, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3432, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3532, 0x302e, "\000" 
+    IDC_BIFS_RATE, 0x403, 5, 0
+0x3033, 0x302e, "\000" 
+    0
+END
+
+IDD_OPT_SYSTEMS DLGINIT
+BEGIN
+    IDC_LANG, 0x403, 8, 0
+0x6e45, 0x6c67, 0x7369, 0x0068, 
+    IDC_LANG, 0x403, 7, 0
+0x7246, 0x6e65, 0x6863, "\000" 
+    IDC_LANG, 0x403, 7, 0
+0x6547, 0x6d72, 0x6e61, "\000" 
+    IDC_LANG, 0x403, 8, 0
+0x7449, 0x6c61, 0x6169, 0x006e, 
+    IDC_LANG, 0x403, 8, 0
+0x7053, 0x6e61, 0x7369, 0x0068, 
+    IDC_LANG, 0x403, 9, 0
+0x6843, 0x6e69, 0x6565, 0x6573, "\000" 
+    IDC_LANG, 0x403, 10, 0
+0x614a, 0x6170, 0x656e, 0x7365, 0x0065, 
+    IDC_DEC_THREAD, 0x403, 14, 0
+0x6953, 0x676e, 0x656c, 0x5420, 0x7268, 0x6165, 0x0064, 
+    IDC_DEC_THREAD, 0x403, 13, 0
+0x754d, 0x6c74, 0x2069, 0x6854, 0x6572, 0x6461, "\000" 
+    IDC_DEC_THREAD, 0x403, 5, 0
+0x7246, 0x6565, "\000" 
+    0
+END
+
+IDD_OPT_LOGS DLGINIT
+BEGIN
+    IDC_LOG_LEVEL, 0x403, 9, 0
+0x6944, 0x6173, 0x6c62, 0x6465, "\000" 
+    IDC_LOG_LEVEL, 0x403, 6, 0
+0x7245, 0x6f72, 0x0072, 
+    IDC_LOG_LEVEL, 0x403, 8, 0
+0x6157, 0x6e72, 0x6e69, 0x0067, 
+    IDC_LOG_LEVEL, 0x403, 5, 0
+0x6e49, 0x6f66, "\000" 
+    IDC_LOG_LEVEL, 0x403, 6, 0
+0x6544, 0x7562, 0x0067, 
+    0
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_MAINACCEL ACCELERATORS
+BEGIN
+    "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
+    "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
+    VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
+    "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
+    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
+    "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
+    VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+#include "res\Osmo4.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Osmo4.vcxproj Added

@@ -0,0 +1,387 @@
+<?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>{C79C2D73-06E9-4622-92CE-F166B1B51792}</ProjectGuid>
+    <RootNamespace>Osmo4</RootNamespace>
+    <Keyword>MFCProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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>
+  <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>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <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>
+    <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>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>8388608</StackReserveSize>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/osmo4_w32_rel/Osmo4.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;%(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>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>8388608</StackReserveSize>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(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>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <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/osmo4_w32_deb/Osmo4.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\osmo4_w32\AddressBar.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\FileProps.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\MainFrm.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\OpenUrl.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\Options.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\Osmo4.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\Playlist.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\Sliders.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\osmo4_w32\StdAfx.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\applications\osmo4_w32\Osmo4.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\applications\osmo4_w32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\applications\osmo4_w32\AddressBar.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\FileProps.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\MainFrm.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\OpenUrl.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\Options.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\Osmo4.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\Playlist.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\Resource.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\Sliders.h" />
+    <ClInclude Include="..\..\applications\osmo4_w32\StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\applications\osmo4_w32\res\error.ico" />
+    <None Include="..\..\applications\osmo4_w32\res\maintool.bmp" />
+    <None Include="..\..\applications\osmo4_w32\res\message.ico" />
+    <None Include="..\..\applications\osmo4_w32\res\osmo4.ico" />
+    <None Include="..\..\applications\osmo4_w32\res\pause.ico" />
+    <None Include="..\..\applications\osmo4_w32\res\play.ico" />
+    <None Include="..\..\applications\osmo4_w32\res\playlist.bmp" />
+    <None Include="..\..\applications\osmo4_w32\res\stop.ico" />
+    <None Include="..\..\doc\osmo4.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Playlist.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Playlist.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Sliders.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/Sliders.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/StdAfx.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/StdAfx.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/Osmo4.rc2 Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/error.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/maintool.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/message.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/osmo4.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/pause.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/play.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/playlist.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/res/stop.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_w32/resource.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/MainFrm.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/MainFrm.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/OpenDlg.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/OpenDlg.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.cpp Added

@@ -0,0 +1,1237 @@
+// Options.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "Osmo4.h"
+#include <gpac/options.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/codec.h>
+#include <gpac/modules/font.h>
+#include <gpac/constants.h>
+#include <gpac/iso639.h>
+
+#include "Options.h"
+#include <gx.h>
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// COptions dialog
+
+
+COptions::COptions(CWnd* pParent /*=NULL*/)
+	: CDialog(COptions::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptions)
+	//}}AFX_DATA_INIT
+
+}
+
+
+void COptions::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptions)
+	DDX_Control(pDX, IDC_COMBOSEL, m_Selection);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptions, CDialog)
+	//{{AFX_MSG_MAP(COptions)
+	ON_BN_CLICKED(IDC_SAVEOPT, OnSaveopt)
+	ON_CBN_SELCHANGE(IDC_COMBOSEL, OnSelchangeCombosel)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptions message handlers
+
+
+void COptions::OnSelchangeCombosel()
+{
+	HideAll();
+	switch (m_Selection.GetCurSel()) {
+	case 0:
+		m_general.ShowWindow(SW_SHOW);
+		break;
+	case 1:
+		m_systems.ShowWindow(SW_SHOW);
+		break;
+	case 2:
+		m_decoder.ShowWindow(SW_SHOW);
+		break;
+	case 3:
+		m_render.ShowWindow(SW_SHOW);
+		break;
+	case 4:
+		m_render3D.ShowWindow(SW_SHOW);
+		break;
+	case 5:
+		m_audio.ShowWindow(SW_SHOW);
+		break;
+	case 6:
+		m_font.ShowWindow(SW_SHOW);
+		break;
+	case 7:
+		m_http.ShowWindow(SW_SHOW);
+		break;
+	case 8:
+		m_stream.ShowWindow(SW_SHOW);
+		break;
+	}
+}
+
+void COptions::HideAll()
+{
+	m_general.ShowWindow(SW_HIDE);
+	m_systems.ShowWindow(SW_HIDE);
+	m_render.ShowWindow(SW_HIDE);
+	m_render3D.ShowWindow(SW_HIDE);
+	m_audio.ShowWindow(SW_HIDE);
+	m_http.ShowWindow(SW_HIDE);
+	m_font.ShowWindow(SW_HIDE);
+	m_stream.ShowWindow(SW_HIDE);
+	m_decoder.ShowWindow(SW_HIDE);
+}
+
+BOOL COptions::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	m_general.Create(IDD_OPT_GEN, this);
+	m_systems.Create(IDD_OPT_SYSTEMS, this);
+	m_decoder.Create(IDD_OPT_DECODER, this);
+	m_render.Create(IDD_OPT_RENDER, this);
+	m_render3D.Create(IDD_OPT_RENDER3D, this);
+	m_audio.Create(IDD_OPT_AUDIO, this);
+	m_http.Create(IDD_OPT_HTTP, this);
+	m_font.Create(IDD_OPT_FONT, this);
+	m_stream.Create(IDD_OPT_STREAM, this);
+
+	m_Selection.AddString(_T("General"));
+	m_Selection.AddString(_T("MPEG-4 Systems"));
+	m_Selection.AddString(_T("Decoders"));
+	m_Selection.AddString(_T("Compositor"));
+	m_Selection.AddString(_T("3D Rendering"));
+	m_Selection.AddString(_T("Audio"));
+	m_Selection.AddString(_T("Text"));
+	m_Selection.AddString(_T("Download"));
+	m_Selection.AddString(_T("Streaming"));
+	HideAll();
+
+	const char *sOpt = gf_cfg_get_key(GetApp()->m_user.config, "General", "ConfigPanel");
+	u32 sel = sOpt ? atoi(sOpt) : 0;
+	if (sel>8) sel=8;
+	m_Selection.SetCurSel(sel);
+	OnSelchangeCombosel();
+
+	SetFocus();
+	return TRUE;
+}
+
+void COptions::OnSaveopt()
+{
+	m_general.SaveOptions();
+	m_systems.SaveOptions();
+	m_render.SaveOptions();
+	m_render3D.SaveOptions();
+	m_audio.SaveOptions();
+	m_http.SaveOptions();
+	m_font.SaveOptions();
+	m_stream.SaveOptions();
+	m_decoder.SaveOptions();
+
+	COsmo4 *gpac = GetApp();
+	gf_term_set_option(gpac->m_term, GF_OPT_RELOAD_CONFIG, 1);
+}
+
+void COptions::OnOK()
+{
+	char str[20];
+	sprintf(str, "%d", m_Selection.GetCurSel());
+	gf_cfg_set_key(GetApp()->m_user.config, "General", "ConfigPanel", str);
+
+	EndDialog(IDCANCEL);
+}
+
+
+
+COptAudio::COptAudio(CWnd* pParent /*=NULL*/)
+	: CDialog(COptAudio::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptAudio)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptAudio::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptAudio)
+	DDX_Control(pDX, IDC_DRIVER_LIST, m_DriverList);
+	DDX_Control(pDX, IDC_AUDIO_RESYNC, m_AudioResync);
+	DDX_Control(pDX, IDC_AUDIO_DUR, m_AudioDur);
+	DDX_Control(pDX, IDC_SPIN_DUR, m_SpinDur);
+	DDX_Control(pDX, IDC_FORCE_AUDIO, m_ForceConfig);
+	DDX_Control(pDX, IDC_SPIN_AUDIO, m_AudioSpin);
+	DDX_Control(pDX, IDC_EDIT_AUDIO, m_AudioEdit);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptAudio, CDialog)
+	//{{AFX_MSG_MAP(COptAudio)
+	ON_BN_CLICKED(IDC_FORCE_AUDIO, OnForceAudio)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptAudio message handlers
+
+BOOL COptAudio::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	m_AudioSpin.SetBuddy(& m_AudioEdit);
+	m_SpinDur.SetBuddy(& m_AudioDur);
+	m_SpinDur.SetRange(0, 1000);
+
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+	TCHAR wTmp[500];
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "ForceConfig");
+	m_ForceConfig.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NumBuffers");
+	if (sOpt) {
+		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
+		m_AudioEdit.SetWindowText(wTmp);
+	} else {
+		m_AudioEdit.SetWindowText(_T("2"));
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "TotalDuration");
+	if (sOpt) {
+		CE_CharToWide((char *)sOpt, (u16 *)wTmp);
+		m_AudioDur.SetWindowText(wTmp);
+	} else {
+		m_AudioDur.SetWindowText(_T("200"));
+	}
+
+	OnForceAudio();
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Audio", "NoResync");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_AudioResync.SetCheck(1);
+	} else {
+		m_AudioResync.SetCheck(0);
+	}
+
+	/*driver enum*/
+	while (m_DriverList.GetCount()) m_DriverList.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "core", "audio-output");
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseInterface *ifce;
+	s32 select = 0;
+	s32 to_sel = 0;
+	for (u32 i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		CE_CharToWide((char *) ((GF_BaseInterface *)ifce)->module_name, (u16 *)wTmp);
+		m_DriverList.AddString(wTmp);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_DriverList.SetCurSel(select);
+
+
+	return TRUE;
+}
+
+
+void COptAudio::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+	TCHAR wstr[50];
+	char str[50];
+
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "ForceConfig", m_ForceConfig.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "NoResync", m_AudioResync.GetCheck() ? "yes" : "no");
+
+	m_AudioEdit.GetWindowText(wstr, 20);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "NumBuffers", str);
+	m_AudioDur.GetWindowText(wstr, 20);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Audio", "TotalDuration", str);
+
+	m_DriverList.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "core", "audio-output", str);
+
+}
+
+void COptAudio::OnForceAudio()
+{
+	BOOL en = m_ForceConfig.GetCheck();
+
+	m_AudioSpin.EnableWindow(en);
+	m_AudioEdit.EnableWindow(en);
+	m_SpinDur.EnableWindow(en);
+	m_AudioDur.EnableWindow(en);
+}
+
+
+COptDecoder::COptDecoder(CWnd* pParent /*=NULL*/)
+	: CDialog(COptDecoder::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptDecoder)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptDecoder::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptDecoder)
+	DDX_Control(pDX, IDC_VIDEC_LIST, m_Video);
+	DDX_Control(pDX, IDC_AUDEC_LIST, m_Audio);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptDecoder, CDialog)
+	//{{AFX_MSG_MAP(COptDecoder)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptDecoder message handlers
+
+BOOL COptDecoder::OnInitDialog()
+{
+	u32 i;
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	/*audio dec enum*/
+	while (m_Audio.GetCount()) m_Audio.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefAudioDec");
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	GF_BaseDecoder *ifce;
+	s32 select = 0;
+	s32 to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifce) continue;
+		if (ifce->CanHandleStream(ifce, GF_STREAM_AUDIO, NULL, 0)) {
+			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+			TCHAR wzTmp[500];
+			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
+			m_Audio.AddString(wzTmp);
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *) ifce);
+	}
+	m_Audio.SetCurSel(select);
+
+	/*audio dec enum*/
+	while (m_Video.GetCount()) m_Video.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "DefVideoDec");
+	count = gf_modules_get_count(gpac->m_user.modules);
+	select = 0;
+	to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce  = (GF_BaseDecoder *) gf_modules_load_interface(gpac->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifce) continue;
+		if (ifce->CanHandleStream(ifce, GF_STREAM_VISUAL, NULL, 0)) {
+			if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+			TCHAR wzTmp[500];
+			CE_CharToWide((char *) ifce->module_name, (u16 *)wzTmp);
+			m_Video.AddString(wzTmp);
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *) ifce);
+	}
+	m_Video.SetCurSel(select);
+
+	return TRUE;
+}
+
+void COptDecoder::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+	TCHAR wstr[100];
+	char str[100];
+
+	m_Audio.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefAudioDec", str);
+	m_Video.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "DefVideoDec", str);
+}
+
+
+
+COptFont::COptFont(CWnd* pParent /*=NULL*/)
+	: CDialog(COptFont::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptFont)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptFont::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptFont)
+	DDX_Control(pDX, IDC_USE_TEXTURE, m_UseTexture);
+	DDX_Control(pDX, IDC_FONT_LIST, m_Fonts);
+	DDX_Control(pDX, IDC_BROWSE_FONT, m_BrowseFont);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptFont, CDialog)
+	//{{AFX_MSG_MAP(COptFont)
+	ON_BN_CLICKED(IDC_BROWSE_FONT, OnBrowseFont)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptFont message handlers
+
+BOOL COptFont::OnInitDialog()
+{
+	u32 i;
+	GF_BaseInterface *ifce;
+
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	TCHAR wTmp[500];
+	const char *sOpt;
+
+	/*video drivers enum*/
+	while (m_Fonts.GetCount()) m_Fonts.DeleteString(0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontReader");
+	s32 to_sel = 0;
+	s32 select = 0;
+	u32 count = gf_modules_get_count(gpac->m_user.modules);
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(gpac->m_user.modules, i, GF_FONT_READER_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		CE_CharToWide((char *) ifce->module_name, (u16 *)wTmp);
+		m_Fonts.AddString(wTmp);
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_Fonts.SetCurSel(select);
+
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "FontCache", "FontDirectory");
+	CE_CharToWide((char *)sOpt, (u16 *)wTmp);
+	if (sOpt) m_BrowseFont.SetWindowText(wTmp);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "TextureTextMode");
+	m_UseTexture.SetCheck( (!sOpt || stricmp(sOpt, "Never")) ? 1 : 0);
+
+	return TRUE;
+}
+
+void COptFont::OnBrowseFont()
+{
+
+}
+
+
+void COptFont::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+	char str[MAX_PATH];
+	TCHAR wstr[MAX_PATH];
+
+	m_Fonts.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontReader", str);
+	m_BrowseFont.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "FontCache", "FontDirectory", str);
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "TextureTextMode", m_UseTexture.GetCheck() ? "Default" : "Never");
+}
+
+
+
+COptGen::COptGen(CWnd* pParent /*=NULL*/)
+	: CDialog(COptGen::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptGen)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptGen::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptGen)
+	DDX_Control(pDX, IDC_NO_BACKLIGHT, m_NoBacklight);
+	DDX_Control(pDX, IDC_FILL_SCREEN, m_Fill);
+	DDX_Control(pDX, IDC_LOOP, m_Loop);
+	DDX_Control(pDX, IDC_ENABLE_LOGS, m_Logs);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptGen, CDialog)
+	//{{AFX_MSG_MAP(COptGen)
+	ON_BN_CLICKED(IDC_FILEASSOC, OnFileassoc)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptGen message handlers
+
+
+
+BOOL COptGen::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Loop");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_Loop.SetCheck(1);
+	} else {
+		m_Loop.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "FillScreen");
+	m_Fill.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "DisableBackLight");
+	m_NoBacklight.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "General", "Logs");
+	m_Logs.SetCheck((sOpt && !strstr(sOpt, "none")) ? 1 : 0);
+	return TRUE;
+}
+
+void COptGen::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+
+	gpac->m_Loop = m_Loop.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "Loop", gpac->m_Loop ? "yes" : "no");
+	gpac->m_fit_screen = m_Fill.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "FillScreen", gpac->m_fit_screen ? "yes" : "no");
+	gpac->m_disable_backlight = m_NoBacklight.GetCheck();
+	gf_cfg_set_key(gpac->m_user.config, "General", "DisableBackLight", gpac->m_disable_backlight ? "yes" : "no");
+
+	gpac->EnableLogs(m_Logs.GetCheck() ? 1 : 0);
+}
+
+void COptGen::OnFileassoc()
+{
+	HKEY hSection;
+	TCHAR szDir[MAX_PATH];
+	char szTemp[MAX_PATH];
+	TCHAR cmd[MAX_PATH];
+	DWORD ioSize = MAX_PATH;
+	DWORD dwDisp;
+
+	RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, KEY_READ, &hSection);
+
+	GetModuleFileName(NULL, szDir, MAX_PATH);
+
+	while (szDir[strlen((char *) szDir)-1] != (TCHAR) '\\') szDir[strlen((char *) szDir)-1] = 0;
+	if (!hSection)
+		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Osmo4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
+
+	CE_WideToChar((u16 *)szDir, szTemp);
+	/*overwrite install dir with current path*/
+	RegSetValueEx(hSection, _T("Install_Dir"), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
+	RegCloseKey(hSection);
+
+
+	/*overwrite .mp4 file associations */
+	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\DefaultIcon"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
+	wcscpy(cmd, szDir);
+	wcscat(cmd, _T("Osmo4.ico") );
+	CE_WideToChar((u16 *)cmd, szTemp);
+
+	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen((const char *) szTemp)+1);
+	RegCloseKey(hSection);
+
+	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T("mp4file\\Shell\\open\\command"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
+	wcscpy(cmd, szDir);
+	wcscat(cmd, _T("Osmo4.exe \"%L\"") );
+	CE_WideToChar((u16 *)cmd, szTemp);
+	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) szTemp, strlen(szTemp)+1);
+	RegCloseKey(hSection);
+
+	RegCreateKeyEx(HKEY_CLASSES_ROOT, _T(".mp4"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hSection, &dwDisp);
+	RegSetValueEx(hSection, _T(""), 0, REG_SZ, (const unsigned char *) "mp4file", strlen("mp4file")+1);
+	RegCloseKey(hSection);
+}
+
+
+
+COptHTTP::COptHTTP(CWnd* pParent /*=NULL*/)
+	: CDialog(COptHTTP::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptHTTP)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptHTTP::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptHTTP)
+	DDX_Control(pDX, IDC_RESTART_CACHE, m_RestartFile);
+	DDX_Control(pDX, IDC_CLEAN_CACHE, m_CleanCache);
+	DDX_Control(pDX, IDC_BROWSE_CACHE, m_CacheDir);
+	DDX_Control(pDX, IDC_SAX_PROGRESSIVE, m_Progressive);
+	DDX_Control(pDX, IDC_SAX_DURATION, m_SaxDuration);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptHTTP, CDialog)
+	//{{AFX_MSG_MAP(COptHTTP)
+	ON_BN_CLICKED(IDC_BROWSE_CACHE, OnBrowseCache)
+	ON_BN_CLICKED(IDC_SAX_PROGRESSIVE, OnProgressive)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptHTTP message handlers
+
+
+void COptHTTP::OnBrowseCache()
+{
+
+}
+
+BOOL COptHTTP::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	TCHAR wTmp[500];
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CleanCache");
+	m_CleanCache.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "RestartFiles");
+	m_RestartFile.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "Progressive");
+	m_Progressive.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "SAXLoader", "MaxDuration");
+	if (sOpt) {
+		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
+		m_SaxDuration.SetWindowText(wTmp);
+	} else {
+		m_SaxDuration.SetWindowText( _T("30") );
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Core", "CacheDirectory");
+	CE_CharToWide((char *) sOpt, (u16 *)wTmp);
+	if (sOpt) m_CacheDir.SetWindowText(wTmp);
+
+	OnProgressive();
+	return TRUE;
+}
+
+void COptHTTP::OnProgressive()
+{
+	m_SaxDuration.EnableWindow( m_Progressive.GetCheck() ? TRUE : FALSE );
+}
+
+void COptHTTP::SaveOptions()
+{
+	TCHAR wTmp[500];
+	char szCacheDir[500];
+	COsmo4 *gpac = GetApp();
+
+	gf_cfg_set_key(gpac->m_user.config, "Core", "CleanCache", m_CleanCache.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Core", "RestartFiles", m_RestartFile.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "Progressive", m_Progressive.GetCheck() ? "yes" : "no");
+
+	m_SaxDuration.GetWindowText(wTmp, MAX_PATH);
+	CE_WideToChar((u16 *)wTmp, szCacheDir);
+	gf_cfg_set_key(gpac->m_user.config, "SAXLoader", "MaxDuration", szCacheDir);
+
+	m_CacheDir.GetWindowText(wTmp, MAX_PATH);
+	CE_WideToChar((u16 *)wTmp, szCacheDir);
+	gf_cfg_set_key(gpac->m_user.config, "Core", "CacheDirectory", szCacheDir);
+}
+
+
+
+COptRender::COptRender(CWnd* pParent /*=NULL*/)
+	: CDialog(COptRender::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptRender)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptRender::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptRender)
+	DDX_Control(pDX, IDC_AA_LIST, m_Antialias);
+	DDX_Control(pDX, IDC_FORCE_SIZE, m_ForceSize);
+	DDX_Control(pDX, IDC_FAST_RENDER, m_HighSpeed);
+	DDX_Control(pDX, IDC_ZOOM_SCALABLE, m_Scalable);
+	DDX_Control(pDX, IDC_DIRECTRENDER, m_DirectRender);
+	DDX_Control(pDX, IDC_BIFS_RATE, m_BIFSRate);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptRender, CDialog)
+	//{{AFX_MSG_MAP(COptRender)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptRender message handlers
+
+
+
+#define NUM_RATES 11
+static char *BIFSRates[11] =
+{
+	"5.0",
+	"7.5",
+	"10.0",
+	"12.5",
+	"15.0",
+	"24.0",
+	"25.0",
+	"30.0",
+	"50.0",
+	"60.0",
+	"100.0",
+};
+
+
+
+BOOL COptRender::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DirectDraw");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_DirectRender.SetCheck(1);
+	} else {
+		m_DirectRender.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ScalableZoom");
+	if (sOpt && !stricmp(sOpt, "no")) {
+		m_Scalable.SetCheck(0);
+	} else {
+		m_Scalable.SetCheck(1);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceSceneSize");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_ForceSize.SetCheck(1);
+	} else {
+		m_ForceSize.SetCheck(0);
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "FrameRate");
+	if (!sOpt) sOpt = "30.0";
+	s32 select = 0;
+	while (m_BIFSRate.GetCount()) m_BIFSRate.DeleteString(0);
+	for (s32 i = 0; i<NUM_RATES; i++) {
+		TCHAR szText[100];
+		CE_CharToWide(BIFSRates[i], (u16 *)szText);
+		m_BIFSRate.AddString(szText);
+		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
+	}
+	m_BIFSRate.SetCurSel(select);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "HighSpeed");
+	m_HighSpeed.SetCheck((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "AntiAlias");
+	while (m_Antialias.GetCount()) m_Antialias.DeleteString(0);
+
+	m_Antialias.AddString(_T("None"));
+	m_Antialias.AddString(_T("Text only"));
+	m_Antialias.AddString(_T("Complete"));
+	select = 2;
+	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
+	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
+	m_Antialias.SetCurSel(select);
+
+	return TRUE;
+}
+
+
+void COptRender::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DirectDraw", m_DirectRender.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ScalableZoom", m_Scalable.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "HighSpeed", m_HighSpeed.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "ForceSceneSize", m_ForceSize.GetCheck() ? "yes" : "no");
+
+	s32 sel = m_BIFSRate.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "FrameRate", BIFSRates[sel]);
+
+	sel = m_Antialias.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
+}
+
+
+
+
+COptRender3D::COptRender3D(CWnd* pParent /*=NULL*/)
+	: CDialog(COptRender3D::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptRender)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptRender3D::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptRender)
+	DDX_Control(pDX, IDC_WIRE_MODE, m_WireMode);
+	DDX_Control(pDX, IDC_DRAW_NORMALS, m_DrawNormals);
+	DDX_Control(pDX, IDC_USE_3D_REN, m_Use3DRender);
+	DDX_Control(pDX, IDC_NO_BACKCULL, m_NoBackFace);
+	DDX_Control(pDX, IDC_EMULATE_POW2, m_EmulatePOW2);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptRender3D, CDialog)
+	//{{AFX_MSG_MAP(COptRender3D)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+BOOL COptRender3D::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "ForceOpenGL");
+	m_Use3DRender.SetCheck( (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "BackFaceCulling");
+	m_NoBackFace.SetCheck( (sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "EmulatePOW2");
+	m_EmulatePOW2.SetCheck( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	m_WireMode.ResetContent();
+	m_WireMode.AddString(_T("Solid Draw"));
+	m_WireMode.AddString(_T("Wireframe"));
+	m_WireMode.AddString(_T("Both"));
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "Wireframe");
+	if (sOpt && !stricmp(sOpt, "WireOnly")) m_WireMode.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_WireMode.SetCurSel(2);
+	else m_WireMode.SetCurSel(0);
+
+
+	m_DrawNormals.ResetContent();
+	m_DrawNormals.AddString(_T("Never"));
+	m_DrawNormals.AddString(_T("Per Face"));
+	m_DrawNormals.AddString(_T("Per Vertex"));
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Compositor", "DrawNormals");
+	if (sOpt && !stricmp(sOpt, "PerFace")) m_DrawNormals.SetCurSel(1);
+	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_DrawNormals.SetCurSel(2);
+	else m_DrawNormals.SetCurSel(0);
+
+	return TRUE;
+}
+
+
+void COptRender3D::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+
+	u32 sel = m_DrawNormals.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : (sel==1) ? "PerFace" : "Never");
+
+	sel = m_WireMode.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : (sel==1) ? "WireOnly" : "WireNone");
+
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "BackFaceCulling", m_NoBackFace.GetCheck() ? "Off" : "On");
+	gf_cfg_set_key(gpac->m_user.config, "Compositor", "EmulatePOW2", m_EmulatePOW2.GetCheck() ? "yes" : "no");
+}
+
+
+COptStream::COptStream(CWnd* pParent /*=NULL*/)
+	: CDialog(COptStream::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptStream)
+	//}}AFX_DATA_INIT
+}
+
+
+void COptStream::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptStream)
+	DDX_Control(pDX, IDC_REBUFFER_LEN, m_RebufferLen);
+	DDX_Control(pDX, IDC_REBUFFER, m_Rebuffer);
+	DDX_Control(pDX, IDC_BUFFER, m_Buffer);
+	DDX_Control(pDX, IDC_TIMEOUT, m_Timeout);
+	DDX_Control(pDX, IDC_REORDER, m_Reorder);
+	DDX_Control(pDX, IDC_RTSP, m_UseRTSP);
+	DDX_Control(pDX, IDC_PORT, m_Port);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptStream, CDialog)
+	//{{AFX_MSG_MAP(COptStream)
+	ON_CBN_SELCHANGE(IDC_PORT, OnSelchangePort)
+	ON_BN_CLICKED(IDC_RTSP, OnRtsp)
+	ON_BN_CLICKED(IDC_REBUFFER, OnRebuffer)
+	ON_EN_UPDATE(IDC_REBUFFER_LEN, OnUpdateRebufferLen)
+	ON_EN_UPDATE(IDC_BUFFER, OnUpdateBuffer)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptStream message handlers
+
+BOOL COptStream::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	TCHAR wTmp[500];
+	const char *sOpt;
+
+	while (m_Port.GetCount()) m_Port.DeleteString(0);
+	m_Port.AddString(_T("554 (RTSP standard)"));
+	m_Port.AddString(_T("7070 (RTSP ext)"));
+	m_Port.AddString(_T("80 (RTSP / HTTP tunnel)"));
+	m_Port.AddString(_T("8080 (RTSP / HTTP tunnel)"));
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "DefaultPort");
+	u32 port = 554;
+	Bool force_rtsp = 0;;
+	if (sOpt) port = atoi(sOpt);
+	switch (port) {
+	case 8080:
+		m_Port.SetCurSel(3);
+		force_rtsp = 1;
+		break;
+	case 80:
+		m_Port.SetCurSel(2);
+		force_rtsp = 1;
+		break;
+	case 7070:
+		m_Port.SetCurSel(1);
+		break;
+	default:
+		m_Port.SetCurSel(0);
+		break;
+	}
+
+	Bool use_rtsp = 0;
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTPoverRTSP");
+	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
+
+	if (force_rtsp) {
+		m_UseRTSP.SetCheck(1);
+		m_UseRTSP.EnableWindow(0);
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+	} else {
+		m_UseRTSP.SetCheck(use_rtsp);
+		m_UseRTSP.EnableWindow(1);
+		m_Reorder.EnableWindow(1);
+		sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "ReorderSize");
+		if (sOpt && !stricmp(sOpt, "0")) {
+			m_Reorder.SetCheck(0);
+		} else {
+			m_Reorder.SetCheck(1);
+		}
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Streaming", "RTSPTimeout");
+	if (sOpt) {
+		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
+		m_Timeout.SetWindowText(wTmp);
+	} else {
+		m_Timeout.SetWindowText(_T("30000"));
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "BufferLength");
+	if (sOpt) {
+		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
+		m_Buffer.SetWindowText(wTmp);
+	} else {
+		m_Buffer.SetWindowText(_T("3000"));
+	}
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Network", "RebufferLength");
+	u32 buf_len = 0;
+	if (sOpt) buf_len = atoi(sOpt);
+	if (buf_len) {
+		CE_CharToWide((char *) sOpt, (u16 *)wTmp);
+		m_RebufferLen.SetWindowText(wTmp);
+		m_Rebuffer.SetCheck(1);
+		m_RebufferLen.EnableWindow(1);
+	} else {
+		m_RebufferLen.SetWindowText(_T("0"));
+		m_Rebuffer.SetCheck(0);
+		m_RebufferLen.EnableWindow(0);
+	}
+
+	return TRUE;
+}
+
+
+void COptStream::OnSelchangePort()
+{
+	s32 sel = m_Port.GetCurSel();
+	switch (sel) {
+	case 3:
+	case 2:
+		m_UseRTSP.SetCheck(1);
+		m_UseRTSP.EnableWindow(0);
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+		break;
+	case 1:
+	default:
+		m_UseRTSP.SetCheck(0);
+		m_UseRTSP.EnableWindow(1);
+		m_Reorder.SetCheck(1);
+		m_Reorder.EnableWindow(1);
+		break;
+	}
+}
+
+void COptStream::OnRtsp()
+{
+	if (m_UseRTSP.GetCheck()) {
+		m_Reorder.SetCheck(0);
+		m_Reorder.EnableWindow(0);
+	} else {
+		m_Reorder.SetCheck(1);
+		m_Reorder.EnableWindow(1);
+	}
+
+}
+
+void COptStream::CheckRebuffer()
+{
+	TCHAR wstr[50];
+	char str[50];
+	s32 buf, rebuf;
+	m_Buffer.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	buf = atoi(str);
+	m_RebufferLen.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	rebuf = atoi(str);
+	if (rebuf*2 > buf) {
+		rebuf = buf/2;
+		wsprintf(wstr, _T("%d"), rebuf);
+		m_RebufferLen.SetWindowText(wstr);
+	}
+}
+
+void COptStream::OnRebuffer()
+{
+	if (!m_Rebuffer.GetCheck()) {
+		m_RebufferLen.EnableWindow(0);
+	} else {
+		m_RebufferLen.EnableWindow(1);
+		CheckRebuffer();
+	}
+}
+
+void COptStream::OnUpdateRebufferLen()
+{
+	CheckRebuffer();
+}
+
+void COptStream::OnUpdateBuffer()
+{
+	CheckRebuffer();
+}
+
+void COptStream::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+	Bool force_rtsp = 0;
+	s32 sel = m_Port.GetCurSel();
+	switch (sel) {
+	case 3:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "8080");
+		force_rtsp = 1;
+		break;
+	case 2:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "80");
+		force_rtsp = 1;
+		break;
+	case 1:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "7070");
+		break;
+	default:
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "DefaultPort", "554");
+		break;
+	}
+
+	if (force_rtsp) {
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", "yes");
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTPoverRTSP", m_UseRTSP.GetCheck() ? "yes" : "no");
+		if (!m_UseRTSP.GetCheck()) gf_cfg_set_key(gpac->m_user.config, "Streaming", "ReorderSize", m_Reorder.GetCheck() ? "30" : "0");
+	}
+
+	TCHAR wstr[50];
+	char str[50];
+
+	m_Timeout.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Streaming", "RTSPTimeout", str);
+
+	m_Buffer.GetWindowText(wstr, 50);
+	CE_WideToChar((u16 *)wstr, str);
+	gf_cfg_set_key(gpac->m_user.config, "Network", "BufferLength", str);
+	if (m_Rebuffer.GetCheck()) {
+		m_RebufferLen.GetWindowText(wstr, 50);
+		CE_WideToChar((u16 *)wstr, str);
+		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", str);
+	} else {
+		gf_cfg_set_key(gpac->m_user.config, "Network", "RebufferLength", "0");
+	}
+}
+
+
+
+COptSystems::COptSystems(CWnd* pParent /*=NULL*/)
+	: CDialog(COptSystems::IDD, pParent)
+{
+	//{{AFX_DATA_INIT(COptSystems)
+	// NOTE: the ClassWizard will add member initialization here
+	//}}AFX_DATA_INIT
+}
+
+
+void COptSystems::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(COptSystems)
+	DDX_Control(pDX, IDC_FORCE_DURATION, m_ForceDuration);
+	DDX_Control(pDX, IDC_DEC_THREAD, m_Threading);
+	DDX_Control(pDX, IDC_BIFSDROP, m_BifsAlwaysDrawn);
+	DDX_Control(pDX, IDC_LANG, m_Lang);
+	//}}AFX_DATA_MAP
+}
+
+
+BEGIN_MESSAGE_MAP(COptSystems, CDialog)
+	//{{AFX_MSG_MAP(COptSystems)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COptSystems message handlers
+
+
+
+BOOL COptSystems::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+
+	COsmo4 *gpac = GetApp();
+	const char *sOpt;
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "Language3CC");
+	if (!sOpt) sOpt = "eng";
+	s32 select = 0;
+	while (m_Lang.GetCount()) m_Lang.DeleteString(0);
+	s32 idx = gf_lang_find(sOpt);
+	u32 i, count = gf_lang_get_count();
+	for (i=0; i<count; i++) {
+		TCHAR szTmp[100];
+		CE_CharToWide( (char *)gf_lang_get_name(i), (u16 *)szTmp);
+		m_Lang.AddString(szTmp);
+		if (idx>=0 && (i==idx))
+			select = i;
+	}
+	m_Lang.SetCurSel(select);
+
+
+	/*system config*/
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ThreadingPolicy");
+	select = 0;
+	while (m_Threading.GetCount()) m_Threading.DeleteString(0);
+	m_Threading.AddString(_T("Single Thread"));
+	m_Threading.AddString(_T("Mutli Thread"));
+	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
+	m_Threading.AddString(_T("Free"));
+	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
+	m_Threading.SetCurSel(select);
+
+
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "ForceSingleClock");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_ForceDuration.SetCheck(1);
+	} else {
+		m_ForceDuration.SetCheck(0);
+	}
+	sOpt = gf_cfg_get_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS");
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		m_BifsAlwaysDrawn.SetCheck(1);
+	} else {
+		m_BifsAlwaysDrawn.SetCheck(0);
+	}
+
+
+	return TRUE;
+}
+
+
+void COptSystems::SaveOptions()
+{
+	COsmo4 *gpac = GetApp();
+
+	s32 sel = m_Lang.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "LanguageName", gf_lang_get_name(sel) );
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
+
+	sel = m_Threading.GetCurSel();
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
+
+	/*reset duration flag*/
+	gpac->m_duration = (u32) -1;
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "ForceSingleClock", m_ForceDuration.GetCheck() ? "yes" : "no");
+	gf_cfg_set_key(gpac->m_user.config, "Systems", "AlwaysDrawBIFS", m_BifsAlwaysDrawn.GetCheck() ? "yes" : "no");
+
+}
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Options.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.cpp Added

@@ -0,0 +1,638 @@
+// Osmo4.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "Osmo4.h"
+
+#include <gpac/options.h>
+#include <gpac/modules/service.h>
+#include "MainFrm.h"
+#include "OpenDlg.h"
+#include "Options.h"
+#include <gx.h>
+
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// COsmo4
+
+BEGIN_MESSAGE_MAP(COsmo4, CWinApp)
+	//{{AFX_MSG_MAP(COsmo4)
+	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
+	ON_COMMAND(IDD_CONFIGURE, OnConfigure)
+	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
+	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
+	ON_COMMAND(ID_SHORTCUTS, OnShortcuts)
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+
+
+
+
+
+Bool Osmo4CE_EventProc(void *priv, GF_Event *event)
+{
+	u32 dur;
+	COsmo4 *app = (COsmo4 *) priv;
+	CMainFrame *pFrame = (CMainFrame *) app->m_pMainWnd;
+	/*shutdown*/
+	if (!pFrame) return 0;
+
+	switch (event->type) {
+	case GF_EVENT_MESSAGE:
+		if (event->message.error!=GF_OK) {
+			if (event->message.error<GF_OK) {
+				pFrame->console_err = event->message.error;
+				pFrame->console_message = event->message.message;
+				pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
+			}
+			return 0;
+		}
+		if (1) return 0;
+		/*process user message*/
+		pFrame->console_err = GF_OK;
+		pFrame->console_message = event->message.message;
+		pFrame->PostMessage(WM_CONSOLEMSG, 0, 0);
+		break;
+	case GF_EVENT_SIZE:
+		break;
+	case GF_EVENT_SCENE_SIZE:
+		app->m_scene_width = event->size.width;
+		app->m_scene_height = event->size.height;
+		if (!pFrame->m_full_screen)
+			pFrame->PostMessage(WM_SETSIZE, event->size.width, event->size.height);
+		break;
+	case GF_EVENT_CONNECT:
+		app->m_open = event->connect.is_connected;
+		break;
+	case GF_EVENT_DURATION:
+		dur = (u32) (1000 * event->duration.duration);
+		if (dur<2000) dur = 0;
+		app->m_duration = dur;
+		app->m_can_seek = event->duration.can_seek && dur;
+		pFrame->m_progBar.m_range_invalidated = 1;
+		/*by default, don't display timing if not seekable and vice-versa*/
+		if (app->m_can_seek != pFrame->m_view_timing) {
+			pFrame->m_view_timing = app->m_can_seek;
+			if (!pFrame->m_full_screen)
+				pFrame->PostMessage(WM_SETSIZE, 0, 0);
+		}
+		break;
+	case GF_EVENT_NAVIGATE:
+		/*store URL since it may be destroyed, and post message*/
+		app->m_navigate_url = event->navigate.to_url;
+		pFrame->PostMessage(WM_NAVIGATE, NULL, NULL);
+		return 1;
+	case GF_EVENT_QUIT:
+		pFrame->PostMessage(WM_CLOSE, 0L, 0L);
+		break;
+	/*ipaq keys*/
+	case GF_EVENT_KEYDOWN:
+		switch (event->key.key_code) {
+		case GF_KEY_F1:
+			pFrame->PostMessage(WM_COMMAND, ID_FILE_OPEN);
+			break;
+		case GF_KEY_F2:
+			pFrame->PostMessage(WM_QUIT);
+			break;
+		case GF_KEY_F3:
+			pFrame->PostMessage(WM_COMMAND, ID_FILE_RESTART);
+			break;
+		case GF_KEY_F5:
+			pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
+			break;
+		case GF_KEY_ENTER:
+			pFrame->PostMessage(WM_COMMAND, ID_FILE_PAUSE);
+			break;
+		case GF_KEY_LEFT:
+			if (app->m_duration>=2000) {
+				s32 res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
+				if (res<0) res=0;
+				gf_term_play_from_time(app->m_term, res, 0);
+			}
+			break;
+		case GF_KEY_RIGHT:
+			if (app->m_duration>=2000) {
+				u32 res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
+				if (res>=app->m_duration) res = 0;
+				gf_term_play_from_time(app->m_term, res, 0);
+			}
+			break;
+		case GF_KEY_UP:
+			if (app->m_duration>=2000) pFrame->PostMessage(WM_COMMAND, ID_FILE_STEP);
+			break;
+		case GF_KEY_DOWN:
+			gf_term_set_option(app->m_term, GF_OPT_REFRESH, 0);
+			break;
+		}
+		break;
+	case GF_EVENT_DBLCLICK:
+		pFrame->PostMessage(WM_COMMAND, ID_VIEW_FULLSCREEN);
+		return 0;
+	}
+
+	return 0;
+}
+
+COsmo4::COsmo4()
+	: CWinApp()
+{
+	// TODO: add construction code here,
+	// Place all significant initialization in InitInstance
+	m_logs = NULL;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only COsmo4 object
+
+COsmo4 theApp;
+
+static void osmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
+{
+	FILE *logs = (FILE *) cbk;
+	if (logs) {
+		vfprintf(logs, fmt, list);
+		fflush(logs);
+	}
+}
+
+void COsmo4::EnableLogs(Bool turn_on)
+{
+	if (turn_on) {
+		const char *filename = gf_cfg_get_key(m_user.config, "General", "LogFile");
+		if (!filename) {
+			gf_cfg_set_key(m_user.config, "General", "LogFile", "\\gpac_logs.txt");
+			filename = "\\gpac_logs.txt";
+		}
+		m_logs = gf_fopen(filename, "wt");
+		if (!m_logs) {
+			MessageBox(NULL, _T("Couldn't open log file on file system"), _T("Disabling logs"), MB_OK);
+			turn_on = 0;
+		} else {
+			gf_log_set_tools_levels("network:rtp:sync:codec:media@debug");
+			gf_log_set_callback(m_logs, osmo4_do_log);
+			gf_cfg_set_key(m_user.config, "General", "Logs", "network:rtp:sync:codec:media@debug");
+		}
+	}
+	if (!turn_on) {
+		if (m_logs) {
+			gf_fclose(m_logs);
+			m_logs = 0;
+		}
+		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_NONE);
+		gf_log_set_callback(NULL, NULL);
+		gf_cfg_set_key(m_user.config, "General", "Logs", "all@quiet");
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// COsmo4 initialization
+
+BOOL COsmo4::InitInstance()
+{
+	Bool first_load = 0;
+	if (!AfxSocketInit())
+	{
+		AfxMessageBox(IDP_SOCKETS_INIT_FAILED);
+		return FALSE;
+	}
+
+	gf_sys_init(GF_MemTrackerNone);
+
+	SetRegistryKey(_T("GPAC"));
+
+	m_prev_batt_bl = m_prev_ac_bl = 0;
+
+	m_screen_width = GetSystemMetrics(SM_CXSCREEN);
+	m_screen_height = GetSystemMetrics(SM_CYSCREEN);
+	m_menu_height = GetSystemMetrics(SM_CYMENU);
+	m_scene_width = m_scene_height = 0;
+
+	CMainFrame* pFrame = new CMainFrame;
+	m_pMainWnd = pFrame;
+
+	pFrame->LoadFrame(IDR_MAINFRAME, WS_VISIBLE, NULL, NULL);
+
+	pFrame->ShowWindow(m_nCmdShow);
+	pFrame->UpdateWindow();
+
+	TCHAR w_config_path[MAX_PATH];
+	char config_path[MAX_PATH];
+	GetModuleFileName(NULL, w_config_path, MAX_PATH);
+	CE_WideToChar((u16 *) w_config_path, (char *) config_path);
+
+	while (config_path[strlen((char *) config_path)-1] != '\\') config_path[strlen((char *) config_path)-1] = 0;
+
+	/*setup user*/
+	memset(&m_user, 0, sizeof(GF_User));
+
+	/*init config and plugins*/
+	m_user.config = gf_cfg_init(NULL, &first_load);
+	if (!m_user.config) {
+		MessageBox(NULL, _T("GPAC Configuration file not found"), _T("Fatal Error"), MB_OK);
+		m_pMainWnd->PostMessage(WM_CLOSE);
+	}
+
+	const char *str = gf_cfg_get_key(m_user.config, "General", "Logs");
+	EnableLogs((str && strcmp(str, "all@quiet") ) ? 1 : 0);
+
+	if (first_load) {
+		/*first launch, register all files ext*/
+		u32 i;
+		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
+			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
+			if (!ifce) continue;
+			if (ifce) {
+				ifce->CanHandleURL(ifce, "test.test");
+				gf_modules_close_interface((GF_BaseInterface *)ifce);
+			}
+		}
+		::MessageBox(NULL, _T("Osmo4/GPAC Setup complete"), _T("Initial launch"), MB_OK);
+	}
+
+
+	str = gf_cfg_get_key(m_user.config, "Core", "ModulesDirectory");
+	m_user.modules = gf_modules_new(str, m_user.config);
+	if (!m_user.modules || ! gf_modules_get_count(m_user.modules) ) {
+		MessageBox(NULL, _T("No plugins available - system cannot work"), _T("Fatal Error"), MB_OK);
+		m_pMainWnd->PostMessage(WM_QUIT);
+		return FALSE;
+	}
+
+	m_user.config = m_user.config;
+	m_user.modules = m_user.modules;
+	m_user.EventProc = Osmo4CE_EventProc;
+	m_user.opaque = this;
+	m_user.os_window_handler = pFrame->m_wndView.m_hWnd;
+
+
+	m_term = gf_term_new(&m_user);
+	if (! m_term) {
+		MessageBox(NULL, _T("Cannot load MPEG-4 Terminal"), _T("Fatal Error"), MB_OK);
+		m_pMainWnd->PostMessage(WM_QUIT);
+	}
+
+	m_stopped = 0;
+	m_open = 0;
+	m_can_seek = 0;
+	m_DoResume = 0;
+	SetOptions();
+	pFrame->SendMessage(WM_SETSIZE, 0, 0);
+	ShowTaskBar(0);
+
+	CCommandLineInfo cmdInfo;
+	ParseCommandLine(cmdInfo);
+
+	if (! cmdInfo.m_strFileName.IsEmpty()) {
+		m_filename = cmdInfo.m_strFileName;
+		m_pMainWnd->PostMessage(WM_OPENURL);
+	} else {
+		str = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+		if (str) gf_term_connect(m_term, str);
+	}
+	return TRUE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// COsmo4 message handlers
+
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CAboutDlg dialog used for App About
+
+class CAboutDlg : public CDialog
+{
+public:
+	CAboutDlg();
+
+// Dialog Data
+	//{{AFX_DATA(CAboutDlg)
+	enum { IDD = IDD_ABOUTBOX };
+	CStatic m_AbtTxt;
+	//}}AFX_DATA
+
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CAboutDlg)
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	//}}AFX_VIRTUAL
+
+// Implementation
+protected:
+	//{{AFX_MSG(CAboutDlg)
+	virtual BOOL OnInitDialog();		// Added for WCE apps
+	//}}AFX_MSG
+	DECLARE_MESSAGE_MAP()
+};
+
+CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
+{
+	//{{AFX_DATA_INIT(CAboutDlg)
+	//}}AFX_DATA_INIT
+}
+
+void CAboutDlg::DoDataExchange(CDataExchange* pDX)
+{
+	CDialog::DoDataExchange(pDX);
+	//{{AFX_DATA_MAP(CAboutDlg)
+	DDX_Control(pDX, IDC_ABT_TEXT, m_AbtTxt);
+	//}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
+	//{{AFX_MSG_MAP(CAboutDlg)
+	// No message handlers
+	//}}AFX_MSG_MAP
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// COsmo4 commands
+// Added for WCE apps
+
+BOOL CAboutDlg::OnInitDialog()
+{
+	CDialog::OnInitDialog();
+	CString str = _T("Osmo4 Player\nGPAC V");
+	str += _T(GPAC_VERSION);
+	str += _T(" (build");
+	str += _T(GPAC_BUILD_NUMBER);
+	str += _T(")");
+	m_AbtTxt.SetWindowText(str);
+	return TRUE;
+}
+
+
+
+void COsmo4::OnAppAbout()
+{
+	CAboutDlg aboutDlg;
+	ShowTaskBar(1);
+	aboutDlg.DoModal();
+	ShowTaskBar(0);
+}
+
+
+int COsmo4::ExitInstance()
+{
+	gf_term_del(m_term);
+	gf_modules_del(m_user.modules);
+	gf_cfg_del(m_user.config);
+	ShowTaskBar(1);
+	gf_sys_close();
+	if (m_logs) gf_fclose(m_logs);
+	return CWinApp::ExitInstance();
+}
+
+void COsmo4::SetOptions()
+{
+	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
+	m_Loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "FillScreen");
+	m_fit_screen = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "DisableBackLight");
+	m_disable_backlight = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
+	sOpt = gf_cfg_get_key(m_user.config, "General", "NoMIMETypeFetch");
+	m_no_mime_fetch = (!sOpt || !stricmp(sOpt, "yes")) ? 1 : 0;
+
+	//gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
+}
+
+void COsmo4::Pause()
+{
+	if (!m_open) return;
+
+	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+		SetBacklightState(0);
+	} else {
+		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+		SetBacklightState(1);
+	}
+	((CMainFrame*)m_pMainWnd)->SetPauseButton();
+}
+
+
+void COsmo4::OnConfigure()
+{
+	COptions dlg;
+
+	ShowTaskBar(1);
+	dlg.DoModal();
+	ShowTaskBar(0);
+}
+
+void COsmo4::ShowTaskBar(Bool showIt, Bool pause_only)
+{
+	if (showIt) {
+		m_DoResume = 0;
+		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+			m_DoResume = 1;
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+		}
+		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 1);
+		if (!pause_only) {
+			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
+			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
+		}
+		SetBacklightState(0);
+	} else {
+		if (!pause_only) {
+			SHFullScreen(GetForegroundWindow(), SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
+			::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
+		}
+		gf_term_set_option(m_term, GF_OPT_FREEZE_DISPLAY, 0);
+		gf_term_set_option(m_term, GF_OPT_REFRESH, 0);
+		if (m_DoResume) {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+			SetBacklightState(1);
+			m_DoResume = 0;
+		}
+		m_pMainWnd->SetFocus();
+	}
+}
+
+
+CString COsmo4::GetFileFilter()
+{
+	u32 keyCount, i;
+	CString sFiles;
+	CString sExts;
+	CString supportedFiles;
+
+	return CString("All Files |*.*|");
+
+	supportedFiles = "All Known Files|*.m3u;*.pls";
+
+	sExts = "";
+	sFiles = "";
+	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
+	for (i=0; i<keyCount; i++) {
+		const char *sMime;
+		Bool first;
+		char *sKey;
+		char szKeyList[1000], sDesc[1000];
+		short swKeyList[1000], swDesc[1000];
+		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
+		if (!sMime) continue;
+		CString sOpt;
+		const char *opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
+		/*remove #include <gpac/options.h>
+		name*/
+		strcpy(szKeyList, opt+1);
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+		/*get description*/
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		strcpy(sDesc, sKey+1);
+		sKey[0] = 0;
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+
+		CE_CharToWide(sDesc, (unsigned short *)swDesc);
+		CE_CharToWide(szKeyList, (unsigned short *)swKeyList);
+
+		/*if same description for # mime types skip (means an old mime syntax)*/
+		if (sFiles.Find((LPCTSTR) swDesc)>=0) continue;
+		/*if same extensions for # mime types skip (don't polluate the file list)*/
+		if (sExts.Find((LPCTSTR) swKeyList)>=0) continue;
+
+		sExts += (LPCTSTR) swKeyList;
+		sExts += " ";
+		sFiles += (LPCTSTR) swDesc;
+		sFiles += "|";
+
+		first = 1;
+
+		sOpt = CString(szKeyList);
+		while (1) {
+
+			int pos = sOpt.Find(' ');
+			CString ext = (pos==-1) ? sOpt : sOpt.Left(pos);
+			/*WATCHOUT: we do have some "double" ext , eg .wrl.gz - these are NOT supported by windows*/
+			if (ext.Find(_T("."))<0) {
+				if (!first) {
+					sFiles += ";";
+				} else {
+					first = 0;
+				}
+				sFiles += "*.";
+				sFiles += ext;
+
+				CString sext = ext;
+				sext += ";";
+				if (supportedFiles.Find(sext)<0) {
+					supportedFiles += ";*.";
+					supportedFiles += ext;
+				}
+			}
+
+			if (sOpt==ext) break;
+			CString rem;
+			rem.Format(_T("%s "), (LPCTSTR) ext);
+			sOpt.Replace((LPCTSTR) rem, _T(""));
+		}
+		sFiles += "|";
+	}
+	supportedFiles += "|";
+	supportedFiles += sFiles;
+	//supportedFiles += "M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files |*.*|";
+	supportedFiles += "All Files |*.*|";
+	return supportedFiles;
+}
+
+void COsmo4::OnOpenFile()
+{
+	Bool res;
+	CFileDialog fd(TRUE,NULL,_T("\\"),OFN_HIDEREADONLY, GetFileFilter());
+
+	ShowTaskBar(1);
+	res = 0;
+	if (fd.DoModal()==IDOK) {
+		res = 1;
+		m_filename = fd.GetPathName();
+		m_DoResume = 0;/*done by term*/
+	}
+	ShowTaskBar(0);
+	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
+}
+
+void COsmo4::OnOpenUrl()
+{
+	OpenDlg dlg;
+	Bool res;
+	ShowTaskBar(1, 1);
+	res = 0;
+	if (dlg.DoModal() == IDOK) {
+		res = 1;
+		m_DoResume = 0;/*done by term*/
+	}
+	ShowTaskBar(0, 1);
+	if (res) m_pMainWnd->PostMessage(WM_OPENURL);
+}
+
+void COsmo4::SetBacklightState(Bool disable)
+{
+	HKEY hKey = 0;
+	DWORD dwSize;
+	DWORD dwValue;
+	HANDLE hBL;
+
+	if (!m_disable_backlight) return;
+
+	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
+
+	if (disable) {
+		dwSize = 4;
+		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &m_prev_batt_bl, &dwSize);
+		dwSize = 4;
+		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &m_prev_ac_bl,&dwSize);
+		dwSize = 4;
+		dwValue = 0xefff ;
+		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		dwSize = 4;
+		dwValue = 0xefff ;
+		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+	} else {
+		if (m_prev_batt_bl) {
+			dwSize = 4;
+			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&m_prev_batt_bl, dwSize);
+		}
+		if (m_prev_ac_bl) {
+			dwSize = 4;
+			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&m_prev_ac_bl, dwSize);
+		}
+	}
+	RegCloseKey(hKey);
+	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
+	if (hBL) {
+		SetEvent(hBL);
+		CloseHandle(hBL);
+	}
+}
+
+void COsmo4::OnShortcuts()
+{
+	ShowTaskBar(1);
+
+	MessageBox(NULL,
+	           _T("Double Click: Fullscreen on/off\n"),
+
+	           _T("Osmo4 Shortcuts"),
+	           MB_OK);
+
+	ShowTaskBar(0);
+}
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Osmo4.rc Added

@@ -0,0 +1,758 @@
+//Microsoft eMbedded Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+#include "newres.h"
+
+#include <gpac/version.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDR_MAINFRAME           ICON    DISCARDABLE     "res\\Osmo4.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\Cmdbar.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar
+//
+
+IDR_MAINFRAME TOOLBAR DISCARDABLE  16, 16
+BEGIN
+    BUTTON      ID_OPEN_FILE
+    BUTTON      ID_FILE_PAUSE
+    BUTTON      ID_FILE_STEP
+    BUTTON      ID_FILE_STOP
+    BUTTON      ID_VIEW_FULLSCREEN
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Accelerator
+//
+
+IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
+BEGIN
+    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
+    "Q",            ID_APP_EXIT,            VIRTKEY, CONTROL, NOINVERT
+    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
+    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL, NOINVERT
+    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL, NOINVERT
+    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 140, 153
+STYLE WS_POPUP | WS_CAPTION
+EXSTYLE 0x80000000L
+CAPTION "About Osmo4"
+FONT 8, "System"
+BEGIN
+    ICON            IDR_MAINFRAME,IDC_STATIC,15,3,21,20
+    CTEXT           "Osmo4 player\nGPAC MPEG-4 SDK",IDC_ABT_TEXT,44,4,64,17
+    CTEXT           "This program is free software and may be distributed according to the terms of the GNU Lesser General Public License",
+                    IDC_STATIC,3,24,131,24
+    CTEXT           "GPAC Copyright (C) Telecom ParisTech 2000 - 2012 - All Rights Reserved http://gpac.io",
+                    IDC_STATIC,4,52,129,26
+					LTEXT           "Authors: Jean Le Feuvre, Cyril Concolato",IDC_STATIC,11,100,109,8
+    LTEXT           "Mozilla SpiderMonkey (JavaScript)",IDC_STATIC,11,110,
+                    109,8
+    LTEXT           "The FreeType Project",IDC_STATIC,11,120,70,8
+    LTEXT           "The PNG Group, The I.J.G.",IDC_STATIC,12,130,87,8
+    LTEXT           "XVID, FAAD, MAD, 3GPP",IDC_STATIC,13,139,80,8
+    LTEXT           "------------ With many thanks to: -------------",
+                    IDC_STATIC,0,91,139,8
+END
+
+IDD_OPENFILE DIALOG DISCARDABLE  0, 0, 133, 116
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Select file location"
+FONT 8, "System"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,92,33,27,14
+    COMBOBOX        IDC_FILELIST,4,17,127,52,CBS_DROPDOWN | CBS_AUTOHSCROLL | 
+                    CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Cancel",IDCANCEL,14,34,27,14
+    LTEXT           "Enter path to remote file",IDC_STATIC,25,6,80,8
+END
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "\0"
+            VALUE "FileDescription", "Osmo4-GPAC\0"
+            VALUE "FileVersion", GPAC_VERSION"\0"
+            VALUE "InternalName", "Osmo4\0"
+            VALUE "LegalCopyright", "Copyright (C) Telecom ParisTech 2005-2012\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "Osmo4.EXE\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "Osmo4-GPAC\0"
+            VALUE "ProductVersion", GPAC_VERSION"\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_ABOUTBOX, DIALOG
+    BEGIN
+        RIGHTMARGIN, 138
+        TOPMARGIN, 1
+    END
+
+    IDD_OPENFILE, DIALOG
+    BEGIN
+        LEFTMARGIN, 2
+        TOPMARGIN, 2
+        BOTTOMMARGIN, 113
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menubar
+//
+
+IDR_MENU MENU DISCARDABLE 
+BEGIN
+    POPUP "File"
+    BEGIN
+        MENUITEM "Open",                        ID_OPEN_FILE
+        MENUITEM "Open URL",                    ID_OPEN_URL
+        MENUITEM SEPARATOR
+        MENUITEM "Exit",                        ID_APP_EXIT
+    END
+    POPUP "View"
+    BEGIN
+        POPUP "Viewpoint"
+        BEGIN
+            MENUITEM "",                            ID_VIEWPORT_EMPTY
+        END
+        POPUP "Navigation"
+        BEGIN
+            MENUITEM "Reset",                       ID_NAV_RESET
+            MENUITEM SEPARATOR
+            MENUITEM "None",                        ID_NAV_NONE
+            MENUITEM "Walk",                        ID_NAV_WALK
+            MENUITEM "Fly",                         ID_NAV_FLY
+            MENUITEM "Examine",                     ID_NAV_EXAMINE
+            MENUITEM "Slide",                       ID_NAV_SLIDE
+            MENUITEM SEPARATOR
+            MENUITEM "Headlight",                   ID_NAV_HEADLIGHT
+            MENUITEM "Gravity",                     ID_NAV_GRAVITY
+            POPUP "Collision"
+            BEGIN
+                MENUITEM "Off",                         ID_COLLIDE_OFF
+                MENUITEM "Regular",                     ID_COLLIDE_REG
+                MENUITEM "Displacement",                ID_COLLIDE_DISP
+            END
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Fullscreen",                  ID_VIEW_FULLSCREEN
+        POPUP "Aspect Ratio"
+        BEGIN
+            MENUITEM "Keep Original",               ID_VIEW_AR_ORIG
+            MENUITEM "Fill Screen",                 ID_VIEW_AR_FILL
+            MENUITEM "Ratio 4/3",                   ID_VIEW_AR_43
+            MENUITEM "Ratio 16/9",                  ID_VIEW_AR_169
+            MENUITEM SEPARATOR
+            MENUITEM "Fit Screen",                  ID_VIEW_FIT
+        END
+        MENUITEM SEPARATOR
+        MENUITEM "Time Control",                ID_VIEW_TIMING
+        MENUITEM SEPARATOR
+        MENUITEM "Settings",                    IDD_CONFIGURE
+    END
+    POPUP "?"
+    BEGIN
+        MENUITEM "Shortcuts",                   ID_SHORTCUTS
+        MENUITEM "About ...",                   ID_APP_ABOUT
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Data
+//
+
+IDR_MENU SHMENUBAR DISCARDABLE 
+BEGIN
+    IDR_MENU, 3,
+    I_IMAGENONE, ID_FILE, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_FILE, 0, 0,
+    I_IMAGENONE, ID_VIEW, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_VIEW, 0, 1,
+    I_IMAGENONE, ID_MENUITEM32789, TBSTATE_ENABLED, 
+    TBSTYLE_DROPDOWN | TBSTYLE_AUTOSIZE, IDS_CAP_MENUITEM32790, 0, 2,
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_EDIT                "File"
+    IDS_TOOL                "Tools"
+    IDP_SOCKETS_INIT_FAILED "Windows sockets initialization failed."
+END
+
+STRINGTABLE PRELOAD DISCARDABLE 
+BEGIN
+    IDR_MAINFRAME           "Osmo4\n\nOsmo4\n\n\nOsmo4.Document\nOsmo4 Document"
+END
+
+STRINGTABLE PRELOAD DISCARDABLE 
+BEGIN
+    AFX_IDS_IDLEMESSAGE     "Ready"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
+    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
+    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_EDIT_CLEAR           "Erase the selection\nErase"
+    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
+    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"
+    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"
+    ID_EDIT_FIND            "Find the specified text\nFind"
+    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"
+    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"
+    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"
+    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"
+    ID_EDIT_UNDO            "Undo the last action\nUndo"
+    ID_EDIT_REDO            "Redo the previously undone action\nRedo"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    AFX_IDS_SCTASKLIST      "Activate Task List"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_NEW                 "New"
+    IDS_FILE                "File"
+    IDS_MHELP               "Help"
+    IDS_SAVE                "Save"
+    IDS_CUT                 "Cut"
+    IDS_COPY                "Copy"
+    IDS_PASTE               "Paste"
+    IDS_ABOUT               "About"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    ID_INDICATOR_CAPS       "CAP"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_CAP_FILE            "File"
+    ID_FILE_RESTART         "Restart presentation"
+    IDS_CAP_MENUITEM32790   "?"
+END
+
+STRINGTABLE DISCARDABLE 
+BEGIN
+    IDS_CAP_VIEW            "View"
+END
+
+#endif    // English (U.S.) 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
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_CONTROL DIALOG DISCARDABLE  0, 0, 161, 15
+STYLE DS_SETFOREGROUND | WS_CHILD | WS_VISIBLE
+EXSTYLE WS_EX_STATICEDGE
+FONT 8, "System"
+BEGIN
+    CONTROL         "Slider1",IDC_SLIDER,"msctls_trackbar32",TBS_BOTH | 
+                    TBS_NOTICKS | WS_TABSTOP,0,1,101,12
+    LTEXT           "00:00 FPS 30.00",IDC_TIME,102,3,56,10
+END
+
+IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 134, 121
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Osmo4 Options"
+FONT 8, "System"
+BEGIN
+    PUSHBUTTON      "Apply",IDC_SAVEOPT,108,3,24,14
+    COMBOBOX        IDC_COMBOSEL,3,5,99,80,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    LTEXT           "-------------------------------------------------------",
+                    IDC_STATIC,0,17,133,8
+END
+
+IDD_OPT_GEN DIALOG DISCARDABLE  0, 120, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    CONTROL         "Loop at end",IDC_LOOP,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,6,28,54,10
+    PUSHBUTTON      "Make Default MPEG-4 Player",IDC_FILEASSOC,5,90,124,20,
+                    BS_MULTILINE
+    CONTROL         "Stretch display to fill screen",IDC_FILL_SCREEN,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,6,45,104,10
+    CONTROL         "Disable Backlight while playing",IDC_NO_BACKLIGHT,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,61,111,10
+    CONTROL         "Enable logs",IDC_ENABLE_LOGS,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,6,74,52,10
+END
+
+IDD_OPT_RENDER DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Rendering Frame Rate",IDC_STATIC,27,27,73,8
+    COMBOBOX        IDC_BIFS_RATE,29,39,68,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    CONTROL         "Direct Rendering",IDC_DIRECTRENDER,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,1,64,69,10
+    CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,70,64,61,10
+    CONTROL         "Fast Rendering",IDC_FAST_RENDER,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,70,79,60,10
+    CONTROL         "Force Scene Size",IDC_FORCE_SIZE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,1,79,70,10
+    LTEXT           "Anti-Aliasing",IDC_STATIC,6,103,40,8
+    COMBOBOX        IDC_AA_LIST,56,99,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+END
+
+IDD_OPT_SYSTEMS DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Prefered Language for stream selection",IDC_STATIC,3,46,
+                    64,19
+    COMBOBOX        IDC_LANG,69,48,60,72,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    LTEXT           "Decoder Threading",IDC_STATIC,4,75,62,8
+    COMBOBOX        IDC_DEC_THREAD,69,72,60,30,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    CONTROL         "Always draw late BIFS frames",IDC_BIFSDROP,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,91,111,10
+    CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,4,106,82,10
+END
+
+IDD_OPT_VIDEO DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Graphics Driver",IDC_STATIC,5,54,50,8
+    LTEXT           "Anti-Aliasing",IDC_STATIC,6,77,40,8
+    LTEXT           "Video Driver",IDC_STATIC,5,98,40,8
+    COMBOBOX        IDC_GD_LIST,56,53,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_AA_LIST,56,73,71,47,CBS_DROPDOWNLIST | WS_VSCROLL | 
+                    WS_TABSTOP
+    COMBOBOX        IDC_VIDEO_LIST,56,95,71,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_OPT_AUDIO DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    CONTROL         "Force Audio Config",IDC_FORCE_AUDIO,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,5,33,77,10
+    LTEXT           "Number of buffers",IDC_STATIC,5,51,60,8
+    LTEXT           "Total Duration in ms",IDC_STATIC,4,69,64,8
+    EDITTEXT        IDC_EDIT_AUDIO,68,48,34,14,ES_AUTOHSCROLL | ES_READONLY
+    CONTROL         "Spin1",IDC_SPIN_AUDIO,"msctls_updown32",UDS_SETBUDDYINT | 
+                    UDS_ARROWKEYS | UDS_HORZ,105,49,19,12
+    EDITTEXT        IDC_AUDIO_DUR,68,67,34,14,ES_AUTOHSCROLL
+    CONTROL         "Spin1",IDC_SPIN_DUR,"msctls_updown32",UDS_SETBUDDYINT | 
+                    UDS_ARROWKEYS | UDS_HORZ,105,68,19,12
+    CONTROL         "Disable Audio Resync",IDC_AUDIO_RESYNC,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,5,85,84,10
+    LTEXT           "Default Plugin",IDC_STATIC,5,103,45,8
+    COMBOBOX        IDC_DRIVER_LIST,52,100,73,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_OPT_FONT DIALOG DISCARDABLE  0, 20, 133, 119
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Font Engine",IDC_STATIC,35,33,39,8
+    COMBOBOX        IDC_FONT_LIST,12,45,98,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Systems Font Directory",IDC_STATIC,19,87,76,8
+    PUSHBUTTON      "...",IDC_BROWSE_FONT,6,98,115,12
+    CONTROL         "Draw text through texturing",IDC_USE_TEXTURE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,10,68,107,10
+END
+
+IDD_OPT_HTTP DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Cache Directory",IDC_STATIC,35,9,53,8
+    PUSHBUTTON      "...",IDC_BROWSE_CACHE,7,22,113,14
+    CONTROL         "Remove temp files",IDC_CLEAN_CACHE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,43,75,10
+    CONTROL         "Always redownload incomplete cached files",
+                    IDC_RESTART_CACHE,"Button",BS_AUTOCHECKBOX | 
+                    BS_MULTILINE | WS_TABSTOP,7,54,102,22
+    CONTROL         "XML Progressive Load",IDC_SAX_PROGRESSIVE,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,77,85,10
+    EDITTEXT        IDC_SAX_DURATION,27,89,35,14,ES_CENTER | ES_AUTOHSCROLL | 
+                    ES_NUMBER
+END
+
+IDD_OPT_STREAM DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Default RTSP Port",IDC_STATIC,33,33,58,8
+    COMBOBOX        IDC_PORT,15,42,95,30,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
+    CONTROL         "RTP over RTSP",IDC_RTSP,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,1,58,64,10
+    CONTROL         "RTP Reordering",IDC_REORDER,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,66,58,66,10
+    EDITTEXT        IDC_TIMEOUT,1,72,35,14,ES_CENTER | ES_AUTOHSCROLL | 
+                    ES_NUMBER
+    LTEXT           "ms before control timeout",IDC_STATIC,44,75,83,8
+    EDITTEXT        IDC_BUFFER,1,87,35,14,ES_CENTER | ES_AUTOHSCROLL | 
+                    ES_NUMBER
+    LTEXT           "ms of Media Buffering ",IDC_STATIC,44,90,72,8
+    CONTROL         "Rebuffer if less than",IDC_REBUFFER,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,2,106,78,10
+    EDITTEXT        IDC_REBUFFER_LEN,81,105,35,12,ES_CENTER | ES_AUTOHSCROLL | 
+                    ES_NUMBER
+    LTEXT           "ms",IDC_STATIC,121,108,10,8
+END
+
+IDD_OPT_DECODER DIALOG DISCARDABLE  0, 20, 133, 121
+STYLE DS_MODALFRAME | DS_CONTROL | WS_CHILD
+FONT 8, "System"
+BEGIN
+    LTEXT           "Prefered Audio Output",-1,33,9,70,8
+    LTEXT           "Prefered Video Output",-1,33,44,80,8
+    COMBOBOX        IDC_AUDEC_LIST,11,22,109,54,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_VIDEC_LIST,12,57,109,47,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_OPT_RENDER3D DIALOG DISCARDABLE  0, 0, 133, 121
+STYLE DS_MODALFRAME | WS_CHILD
+FONT 8, "System"
+BEGIN
+    CONTROL         "Use 3D Renderer",IDC_USE_3D_REN,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,3,29,121,10
+    CONTROL         "Disable Backface Culling",IDC_NO_BACKCULL,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,3,41,92,10
+    CONTROL         "Emulate pow2 textures for video",IDC_EMULATE_POW2,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,1,97,121,10
+    LTEXT           "Drawing Mode",IDC_STATIC,5,56,46,8
+    COMBOBOX        IDC_WIRE_MODE,61,54,61,35,CBS_DROPDOWN | WS_VSCROLL | 
+                    WS_TABSTOP
+    LTEXT           "Draw Normals",IDC_STATIC,5,73,45,8
+    COMBOBOX        IDC_DRAW_NORMALS,62,72,61,35,CBS_DROPDOWN | WS_VSCROLL | 
+                    WS_TABSTOP
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONTROL, DIALOG
+    BEGIN
+        RIGHTMARGIN, 160
+        BOTTOMMARGIN, 14
+    END
+
+    IDD_OPTIONS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 133
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_GEN, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_RENDER, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_SYSTEMS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_VIDEO, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_AUDIO, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_FONT, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 118
+    END
+
+    IDD_OPT_HTTP, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_STREAM, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+
+    IDD_OPT_DECODER, DIALOG
+    BEGIN
+        RIGHTMARGIN, 132
+        BOTTOMMARGIN, 120
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "#include ""newres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
+    "#define _AFX_NO_OLE_RESOURCES\r\n"
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
+    "\r\n"
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
+    "#ifdef _WIN32\r\n"
+    "LANGUAGE 9, 1\r\n"
+    "#pragma code_page(1252)\r\n"
+    "#endif //_WIN32\r\n"
+    "#include ""res\\Osmo4.rc2""  // non-Microsoft eMbedded Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#include ""wceres.rc""         // WCE-specific components\r\n"
+    "#endif\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_OPT_RENDER DLGINIT
+BEGIN
+    IDC_BIFS_RATE, 0x403, 8, 0
+0x0035, 0x002e, 0x0030, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 8, 0
+0x0037, 0x002e, 0x0035, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0031, 0x0030, 0x002e, 0x0030, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0031, 0x0032, 0x002e, 0x0035, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0031, 0x0035, 0x002e, 0x0030, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0032, 0x0034, 0x002e, 0x0030, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0032, 0x0035, 0x002e, 0x0030, 0x0000, 
+    IDC_BIFS_RATE, 0x403, 10, 0
+0x0033, 0x0030, 0x002e, 0x0030, 0x0000, 
+    0
+END
+
+IDD_OPT_SYSTEMS DLGINIT
+BEGIN
+    IDC_DEC_THREAD, 0x403, 28, 0
+0x0053, 0x0069, 0x006e, 0x0067, 0x006c, 0x0065, 0x0020, 0x0054, 0x0068, 
+0x0072, 0x0065, 0x0061, 0x0064, 0x0000, 
+    IDC_DEC_THREAD, 0x403, 26, 0
+0x004d, 0x0075, 0x0074, 0x006c, 0x0069, 0x0020, 0x0054, 0x0068, 0x0072, 
+0x0065, 0x0061, 0x0064, 0x0000, 
+    IDC_DEC_THREAD, 0x403, 10, 0
+0x0046, 0x0072, 0x0065, 0x0065, 0x0000, 
+    0
+END
+
+#endif    // French (France) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+#define _AFX_NO_SPLITTER_RESOURCES
+#define _AFX_NO_OLE_RESOURCES
+#define _AFX_NO_TRACKER_RESOURCES
+#define _AFX_NO_PROPERTY_RESOURCES
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE 9, 1
+#pragma code_page(1252)
+#endif //_WIN32
+#include "res\Osmo4.rc2"  // non-Microsoft eMbedded Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+//#include "wceres.rc"         // WCE-specific components
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/ProgressBar.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/ProgressBar.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/Resource.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/StdAfx.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/StdAfx.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/newres.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/res Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Cmdbar.bmp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Osmo4.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/res/Osmo4.rc2 Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4) Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/archive.bat Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/build_installer.bat Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/gpac.inf Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wce/smartphone 2003 (armv4)/release/install/readme.txt Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.Info.plist Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.InfoPlist.strings Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Darwin.Osmo.icns Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Makefile Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/Playlist.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/fileprops.cpp Added

@@ -0,0 +1,650 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Osmo4 wxWidgets GUI
+ *
+ *  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 "fileprops.h"
+#include "wxOsmo4.h"
+#include "Playlist.h"
+#include <wx/filename.h>
+#include <gpac/modules/codec.h>
+#include <gpac/modules/service.h>
+#include <gpac/constants.h>
+/*ISO 639 languages*/
+#include <gpac/iso639.h>
+
+
+wxFileProps::wxFileProps(wxWindow *parent)
+	: wxDialog(parent, -1, wxString(_T("File Properties")))
+{
+
+	m_pApp = (wxOsmo4Frame *)parent;
+	SetSize(540, 260);
+	assert(m_pApp->m_pPlayList);
+
+	m_pTreeView = new wxTreeCtrl(this, ID_TREE_VIEW, wxPoint(4, 2), wxSize(200, 180), wxTR_DEFAULT_STYLE | wxSUNKEN_BORDER);
+
+	new wxStaticText(this, 0, _T("Information"), wxPoint(210, 2), wxSize(60, 20));
+	m_pViewSel = new wxComboBox(this, ID_VIEW_SEL, _T(""), wxPoint(280, 2), wxSize(120, 24), 0, NULL, wxCB_READONLY);
+	m_pViewSel->Append(wxT("General"));
+	m_pViewSel->Append(wxT("Streams"));
+	m_pViewSel->Append(wxT("Playback"));
+	m_pViewSel->Append(wxT("Network"));
+	m_pViewSel->SetSelection(0);
+
+	m_pViewInfo = new wxTextCtrl(this, -1, wxT(""), wxPoint(210, 30), wxSize(320, 200), wxTE_MULTILINE | wxTE_READONLY | wxHSCROLL | wxSUNKEN_BORDER);
+
+#ifdef WIN32
+	m_pViewInfo->SetBackgroundColour(wxColour(wxT("LIGHT GREY")));
+#endif
+
+	m_pViewWI = new wxButton(this, ID_VIEW_WI, wxT("View World Info"), wxPoint(4, 174), wxSize(200, 40));
+	m_pViewSG = new wxButton(this, ID_VIEW_SG, wxT("View Scene Graph"), wxPoint(4, 220), wxSize(200, 40));
+
+
+	wxString str = m_pApp->m_pPlayList->GetDisplayName();
+	str += wxT(" Properties");
+	SetTitle(str);
+
+	m_pTimer = new wxTimer();
+	m_pTimer->SetOwner(this, ID_OD_TIMER);
+	m_pTimer->Start(500, 0);
+	RewriteODTree();
+
+}
+
+wxFileProps::~wxFileProps()
+{
+	m_pTimer->Stop();
+	delete m_pTimer;
+}
+
+
+BEGIN_EVENT_TABLE(wxFileProps, wxDialog)
+	EVT_TREE_ITEM_ACTIVATED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
+	EVT_TREE_SEL_CHANGED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
+	EVT_TREE_ITEM_EXPANDED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
+	EVT_TREE_ITEM_COLLAPSED(ID_TREE_VIEW, wxFileProps::OnSetSelection)
+	EVT_TIMER(ID_OD_TIMER, wxFileProps::OnTimer)
+	EVT_BUTTON(ID_VIEW_SG, wxFileProps::OnViewSG)
+	EVT_BUTTON(ID_VIEW_WI, wxFileProps::OnViewWorld)
+	EVT_COMBOBOX(ID_VIEW_SEL, wxFileProps::OnSelectInfo)
+END_EVENT_TABLE()
+
+void wxFileProps::RewriteODTree()
+{
+	GF_ObjectManager *root_odm = gf_term_get_root_object(m_pApp->m_term);
+	if (!root_odm) return;
+
+	m_pTreeView->DeleteAllItems();
+	ODTreeData *root = new ODTreeData(root_odm);
+	m_pTreeView->AddRoot(wxT("Root OD"), -1, -1, root);
+	wxTreeItemId rootId = m_pTreeView->GetRootItem();
+
+	WriteInlineTree(root);
+	SetInfo(root_odm);
+}
+
+void wxFileProps::WriteInlineTree(ODTreeData *root)
+{
+	/*browse all ODs*/
+	u32 count = gf_term_get_object_count(m_pApp->m_term, root->m_pODMan);
+
+	for (u32 i=0; i<count; i++) {
+		GF_ObjectManager *odm = gf_term_get_object(m_pApp->m_term, root->m_pODMan, i);
+		if (!odm) return;
+		ODTreeData *odd = new ODTreeData(odm);
+		m_pTreeView->AppendItem(root->GetId(), wxT("Object Descriptor"), -1, -1, odd);
+
+		/*if inline propagate*/
+		switch (gf_term_object_subscene_type(m_pApp->m_term, odm)) {
+		case 1:
+			m_pTreeView->SetItemText(odd->GetId(), wxT("Root Scene"));
+			WriteInlineTree(odd);
+			break;
+		case 2:
+			m_pTreeView->SetItemText(odd->GetId(), wxT("Inline Scene"));
+			WriteInlineTree(odd);
+			break;
+		case 3:
+			m_pTreeView->SetItemText(odd->GetId(), wxT("Extern Proto Lib"));
+			break;
+		default:
+			break;
+		}
+	}
+}
+
+void wxFileProps::OnSetSelection(wxTreeEvent& event)
+{
+	ODTreeData *odd = (ODTreeData *) m_pTreeView->GetItemData(event.GetItem());
+	SetInfo(odd->m_pODMan);
+}
+
+void wxFileProps::SetInfo(GF_ObjectManager *odm)
+{
+	m_current_odm = odm;
+
+	switch (m_pViewSel->GetSelection()) {
+	case 3:
+		SetNetworkInfo();
+		break;
+	case 2:
+		SetDecoderInfo();
+		break;
+	case 1:
+		SetStreamsInfo();
+		break;
+	default:
+		SetGeneralInfo();
+		break;
+	}
+}
+
+void wxFileProps::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+	switch (m_pViewSel->GetSelection()) {
+	case 2:
+		SetDecoderInfo();
+		break;
+	}
+}
+void wxFileProps::OnSelectInfo(wxCommandEvent & WXUNUSED(event) )
+{
+	SetInfo(m_current_odm);
+}
+
+void wxFileProps::SetGeneralInfo()
+{
+	wxString info;
+	GF_MediaInfo odi;
+	u32 h, m, s;
+	u32 i, j;
+
+	info = wxT("");
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+
+	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
+
+	if (odi.has_profiles) info += wxT("Initial ");
+	info += wxString::Format(wxT("Object Descriptor ID %d\n"), odi.od->objectDescriptorID);
+	if (odi.duration) {
+		h = (u32) (odi.duration / 3600);
+		m = (u32) (odi.duration / 60) - h*60;
+		s = (u32) (odi.duration) - h*3600 - m*60;
+		info += wxString::Format(wxT("Duration %02d:%02d:%02d\n"), h, m, s);
+	} else {
+		info += wxT("Unknown duration\n");
+	}
+
+	if (odi.owns_service) {
+		info += wxT("Service Handler: ") + wxString(odi.service_handler, wxConvUTF8) + wxT("\n");
+		info += wxT("Service URL: ") + wxString(odi.service_url, wxConvUTF8) + wxT("\n");
+	}
+
+	if (odi.od->URLString) {
+		info += wxT("Remote OD - URL: ") + wxString(odi.od->URLString, wxConvUTF8) + wxT("\n");
+	}
+
+	if (odi.codec_name) {
+		switch (odi.od_type) {
+		case GF_STREAM_VISUAL:
+			info += wxString::Format(wxT("Video Object: Width %d - Height %d\n"), odi.width, odi.height);
+			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
+			break;
+		case GF_STREAM_AUDIO:
+			info += wxString::Format(wxT("Audio Object: Sample Rate %d - %d channels\n"), odi.sample_rate, odi.num_channels);
+			info += wxT("Media Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
+			break;
+		case GF_STREAM_PRIVATE_SCENE:
+		case GF_STREAM_SCENE:
+			if (odi.width && odi.height) {
+				info += wxString::Format(wxT("Scene Description: Width %d - Height %d\n"), odi.width, odi.height);
+			} else {
+				info += wxT("Scene Description: No size specified\n");
+			}
+			info += wxT("Scene Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
+			break;
+		case GF_STREAM_TEXT:
+			if (odi.width && odi.height) {
+				info += wxString::Format(wxT("Text Object: Width %d - Height %d\n"), odi.width, odi.height);
+			} else {
+				info += wxString::Format(wxT("Text Object: No size specified\n"));
+			}
+			info += wxT("Text Codec ") + wxString(odi.codec_name, wxConvUTF8) + wxT("\n");
+			break;
+		}
+	}
+	if (odi.protection==2) info += wxT("Encrypted Media NOT UNLOCKED");
+	else if (odi.protection==1) info += wxT("Encrypted Media");
+
+	if (!gf_list_count(odi.od->OCIDescriptors)) {
+		m_pViewInfo->Clear();
+		m_pViewInfo->AppendText(info);
+		return;
+	}
+
+	info += wxT("\nObject Content Information:\n");
+
+	/*check OCI (not everything interests us) - FIXME: support for unicode*/
+	for (i=0; i<gf_list_count(odi.od->OCIDescriptors); i++) {
+		GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
+		switch (desc->tag) {
+		case GF_ODF_SEGMENT_TAG:
+		{
+			GF_Segment *sd = (GF_Segment *) desc;
+			info += wxT("\nSegment Descriptor:\nName: ") + wxString((char *) sd->SegmentName, wxConvUTF8);
+			info += wxString::Format(wxT(" - start time %g sec - duration %g sec\n"), sd->startTime, sd->Duration);
+		}
+		break;
+		case GF_ODF_CC_NAME_TAG:
+		{
+			GF_CC_Name *ccn = (GF_CC_Name *)desc;
+			info += wxT("\nContent Creators:\n");
+			for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
+				GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
+				if (!ci->isUTF8) continue;
+				info += wxT("\t") + wxString(ci->contentCreatorName, wxConvUTF8) + wxT("\n");
+			}
+		}
+		break;
+
+		case GF_ODF_SHORT_TEXT_TAG:
+		{
+			GF_ShortTextual *std = (GF_ShortTextual *)desc;
+			info += wxT("\n") + wxString(std->eventName, wxConvUTF8) + wxT(": ") + wxString(std->eventText, wxConvUTF8) + wxT("\n");
+		}
+		break;
+		/*todo*/
+		case GF_ODF_CC_DATE_TAG:
+			break;
+		default:
+			break;
+		}
+
+	}
+
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+}
+
+void wxFileProps::SetStreamsInfo()
+{
+	u32 i, count;
+	wxString info;
+	GF_MediaInfo odi;
+	char code[5];
+
+	info = wxT("");
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+
+	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
+
+	if (odi.has_profiles) {
+		info += wxString::Format(wxT("\tOD Profile@Level %d\n"), odi.OD_pl);
+		info += wxString::Format(wxT("\tScene Profile@Level %d\n"), odi.scene_pl);
+		info += wxString::Format(wxT("\tGraphics Profile@Level %d\n"), odi.graphics_pl);
+		info += wxString::Format(wxT("\tAudio Profile@Level %d\n"), odi.audio_pl);
+		info += wxString::Format(wxT("\tVisual Profile@Level %d\n"), odi.scene_pl);
+		if (odi.inline_pl) info += wxT("\tInline Content use same profiles\n");
+		info += wxT("\n");
+	}
+
+	count = gf_list_count(odi.od->ESDescriptors);
+
+	for (i=0; i<count; i++) {
+		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
+
+		info += wxString::Format(wxT("Stream ID %d - Clock ID %d\n"), esd->ESID, esd->OCRESID);
+		if (esd->dependsOnESID) {
+			info += wxString::Format(wxT("\tDepends on Stream ID %d for decoding\n"), esd->dependsOnESID);
+		}
+		switch (esd->decoderConfig->streamType) {
+		case GF_STREAM_OD:
+			info += wxString::Format(wxT("\tOD Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_OCR:
+			info += wxT("\tObject Clock Reference Stream\n");
+			break;
+		case GF_STREAM_SCENE:
+			info += wxString::Format(wxT("\tScene Description Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_PRIVATE_SCENE:
+			info += wxString::Format(wxT("\tGPAC Private Scene Description Stream\n"));
+			break;
+		case GF_STREAM_VISUAL:
+			info += wxT("\tVisual Stream - media type: ");
+			switch (esd->decoderConfig->objectTypeIndication) {
+			case GPAC_OTI_VIDEO_MPEG4_PART2:
+				info += wxT("MPEG-4\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
+				info += wxT("MPEG-2 Simple Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_MAIN:
+				info += wxT("MPEG-2 Main Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_SNR:
+				info += wxT("MPEG-2 SNR Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
+				info += wxT("MPEG-2 Spatial Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_HIGH:
+				info += wxT("MPEG-2 High Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG2_422:
+				info += wxT("MPEG-2 422 Profile\n");
+				break;
+			case GPAC_OTI_VIDEO_MPEG1:
+				info += wxT("MPEG-1\n");
+				break;
+			case GPAC_OTI_IMAGE_JPEG:
+				info += wxT("JPEG\n");
+				break;
+			case GPAC_OTI_IMAGE_PNG:
+				info += wxT("PNG\n");
+				break;
+			case GPAC_OTI_IMAGE_JPEG_2000:
+				info += wxT("JPEG2000\n");
+				break;
+			case 0x80:
+				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
+				code[4] = 0;
+				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
+				break;
+			default:
+				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
+				break;
+			}
+			break;
+
+		case GF_STREAM_AUDIO:
+			info += wxT("\tAudio Stream - media type: ");
+			switch (esd->decoderConfig->objectTypeIndication) {
+			case GPAC_OTI_AUDIO_AAC_MPEG4:
+				info += wxT("MPEG-4\n");
+				break;
+			case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+				info += wxT("MPEG-2 AAC Main Profile\n");
+				break;
+			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+				info += wxT("MPEG-2 AAC LowComplexity Profile\n");
+				break;
+			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+				info += wxT("MPEG-2 AAC Scalable Sampling Rate Profile\n");
+				break;
+			case GPAC_OTI_AUDIO_MPEG2_PART3:
+				info += wxT("MPEG-2 Audio\n");
+				break;
+			case GPAC_OTI_AUDIO_MPEG1:
+				info += wxT("MPEG-1 Audio\n");
+				break;
+			case 0xA0:
+				info += wxT("EVRC Audio\n");
+				break;
+			case 0xA1:
+				info += wxT("SMV Audio\n");
+				break;
+			case 0xE1:
+				info += wxT("QCELP Audio\n");
+				break;
+			case 0x80:
+				memcpy(code, esd->decoderConfig->decoderSpecificInfo->data, 4);
+				code[4] = 0;
+				info += wxT("GPAC Intern (") + wxString(code, wxConvUTF8) + wxT(")\n");
+				break;
+			default:
+				info += wxString::Format(wxT("Private/Unknown Type (0x%x)\n"), esd->decoderConfig->objectTypeIndication);
+				break;
+			}
+			break;
+		case GF_STREAM_MPEG7:
+			info += wxString::Format(wxT("\tMPEG-7 Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_IPMP:
+			info += wxString::Format(wxT("\tIPMP Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_OCI:
+			info += wxString::Format(wxT("\tOCI Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_MPEGJ:
+			info += wxString::Format(wxT("\tMPEGJ Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		case GF_STREAM_INTERACT:
+			info += wxString::Format(wxT("\tUser Interaction Stream - version %d\n"), esd->decoderConfig->objectTypeIndication);
+			break;
+		default:
+			info += wxT("Private/Unknown\n");
+			break;
+		}
+
+		info += wxString::Format(wxT("\tBuffer Size %d\n\tAverage Bitrate %d bps\n\tMaximum Bitrate %d bps\n"), esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
+		if (esd->slConfig->predefined==SLPredef_SkipSL) {
+			info += wxString::Format(wxT("\tNot using MPEG-4 Synchronization Layer\n"));
+		} else {
+			info += wxString::Format(wxT("\tStream Clock Resolution %d\n"), esd->slConfig->timestampResolution);
+		}
+		if (esd->URLString)
+			info += wxT("\tStream Location: ") + wxString(esd->URLString, wxConvUTF8) + wxT("\n");
+
+		/*check language*/
+		if (esd->langDesc) {
+			s32 idx;
+			char lan[4];
+			lan[0] = esd->langDesc->langCode>>16;
+			lan[1] = (esd->langDesc->langCode>>8)&0xFF;
+			lan[2] = (esd->langDesc->langCode)&0xFF;
+			lan[3] = 0;
+			idx = gf_lang_find(lan);
+			if (idx>=0) {
+				info += wxString::Format(wxT("\tStream Language: %s\n"), gf_lang_get_name(idx) );
+			}
+		}
+
+	}
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+}
+
+
+void wxFileProps::SetDecoderInfo()
+{
+	GF_MediaInfo odi;
+	wxString info;
+	u32 h, m, s;
+
+	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi)) {
+		m_pViewInfo->Clear();
+		m_pViewInfo->AppendText(info);
+		return;
+	}
+
+	info = wxT("Status: ");
+	switch (odi.status) {
+	case 0:
+	case 1:
+	case 2:
+		h = (u32) (odi.current_time / 3600);
+		m = (u32) (odi.current_time / 60) - h*60;
+		s = (u32) (odi.current_time) - h*3600 - m*60;
+		if (odi.status==0) info += wxT("Stopped");
+		else if (odi.status==1) info += wxT("Playing");
+		else info += wxT("Paused");
+		info += wxString::Format(wxT("\nObject Time: %02d:%02d:%02d\n"), h, m, s);
+		break;
+	case 3:
+		info += wxT("Not Setup\n");
+		m_pViewInfo->Clear();
+		m_pViewInfo->AppendText(info);
+		return;
+	default:
+		info += wxT("Setup Failed\n");
+		m_pViewInfo->Clear();
+		m_pViewInfo->AppendText(info);
+		return;
+	}
+	/*get clock drift*/
+	info += wxString::Format(wxT("Clock drift: %d ms\n"), odi.clock_drift);
+	/*get buffering*/
+	if (odi.buffer>=0) info += wxString::Format(wxT("Buffering Time: %d ms\n"), odi.buffer);
+	else if (odi.buffer==-1) info += wxT("Not buffering\n");
+	else info += wxT("Not Playing\n");
+
+	/*get DB occupation*/
+	if (odi.buffer>=0) info += wxString::Format(wxT("Decoding Buffer: %d Access Units\n"), odi.db_unit_count);
+	/*get CB occupation*/
+	if (odi.cb_max_count)
+		info += wxString::Format(wxT("Composition Memory: %d/%d Units\n"), odi.cb_unit_count, odi.cb_max_count);
+
+	Float avg_dec_time = 0;
+	if (odi.nb_dec_frames) {
+		avg_dec_time = (Float) odi.total_dec_time;
+		avg_dec_time /= odi.nb_dec_frames;
+	}
+	info += wxString::Format(wxT("Average Bitrate %d kbps (%d max)\nAverage Decoding Time %.2f ms (%d max)\nTotal decoded frames %d - %d dropped\n"),
+	                         (u32) odi.avg_bitrate/1024, odi.max_bitrate/1024, avg_dec_time, odi.max_dec_time, odi.nb_dec_frames, odi.nb_dropped);
+
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+}
+
+void wxFileProps::SetNetworkInfo()
+{
+	wxString info;
+	u32 id;
+	NetStatCommand com;
+	GF_MediaInfo odi;
+	u32 d_enum;
+	GF_Err e;
+
+	info = wxT("");
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(wxT(""));
+
+	if (!m_current_odm || gf_term_get_object_info(m_pApp->m_term, m_current_odm, &odi) != GF_OK) return;
+
+	if (odi.owns_service) {
+		const char *url, *path;
+		u32 done, total, bps;
+		info = wxT("Current Downloads in service:\n");
+		d_enum = 0;
+		while (gf_term_get_download_info(m_pApp->m_term, m_current_odm, &d_enum, &url, &path, &done, &total, &bps)) {
+			info += wxString(url, wxConvUTF8);
+			if (total) {
+				info += wxString::Format(wxT(": %d / %d bytes (%.2f %%) - %.2f kBps\n"), done, total, (100.0*done)/total, ((Double)bps)/1024);
+			} else {
+				info += wxString::Format(wxT(": %.2f kBps\n"), ((Double)bps)/1024);
+			}
+		}
+		if (!d_enum) info = wxT("No Downloads in service\n");
+		info += wxT("\n");
+	}
+
+	d_enum = 0;
+	while (gf_term_get_channel_net_info(m_pApp->m_term, m_current_odm, &d_enum, &id, &com, &e)) {
+		if (e) continue;
+		if (!com.bw_down && !com.bw_up) continue;
+
+		info += wxString::Format(wxT("Stream ID %d statistics:\n"), id);
+		if (com.multiplex_port) {
+			info += wxString::Format(wxT("\tMultiplex Port %d - multiplex ID %d\n"), com.multiplex_port, com.port);
+		} else {
+			info += wxString::Format(wxT("\tPort %d\n"), com.port);
+		}
+		info += wxString::Format(wxT("\tPacket Loss Percentage: %.4f\n"), com.pck_loss_percentage);
+		info += wxString::Format(wxT("\tDown Bandwidth: %.3f bps\n"), ((Float)com.bw_down)/1024);
+		if (com.bw_up) info += wxString::Format(wxT("\tUp Bandwidth: %d bps\n"), com.bw_up);
+		if (com.ctrl_port) {
+			if (com.multiplex_port) {
+				info += wxString::Format(wxT("\tControl Multiplex Port: %d - Control Multiplex ID %d\n"), com.multiplex_port, com.ctrl_port);
+			} else {
+				info += wxString::Format(wxT("\tControl Port: %d\n"), com.ctrl_port);
+			}
+			info += wxString::Format(wxT("\tControl Down Bandwidth: %d bps\n"), com.ctrl_bw_down);
+			info += wxString::Format(wxT("\tControl Up Bandwidth: %d bps\n"), com.ctrl_bw_up);
+		}
+		info += wxT("\n");
+	}
+	m_pViewInfo->Clear();
+	m_pViewInfo->AppendText(info);
+}
+
+
+void wxFileProps::OnViewWorld(wxCommandEvent &WXUNUSED(event))
+{
+	wxString wit;
+	const char *str;
+	GF_List *descs;
+	descs = gf_list_new();
+	str = gf_term_get_world_info(m_pApp->m_term, m_current_odm, descs);
+
+	if (!str) {
+		wxMessageDialog(this, wxT("No World Info available"), wxT("Sorry!"), wxOK).ShowModal();
+		return;
+	}
+
+	wit = wxT("");
+	for (u32 i=0; gf_list_count(descs); i++) {
+		const char *d = (const char *) gf_list_get(descs, i);
+		wit += wxString(d, wxConvUTF8);
+		wit += wxT("\n");
+	}
+	wxMessageDialog(this, wit, wxString(str, wxConvUTF8), wxOK).ShowModal();
+	gf_list_del(descs);
+}
+
+void wxFileProps::OnViewSG(wxCommandEvent &WXUNUSED(event))
+{
+	const char *sOpt;
+	Bool dump_xmt;
+	wxFileName out_file;
+	char szOutFile[GF_MAX_PATH];
+	wxString fname;
+
+	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "Core", "CacheDirectory");
+	out_file.AssignDir(wxString(sOpt, wxConvUTF8) );
+
+	sOpt = gf_cfg_get_key(m_pApp->m_user.config, "General", "ViewXMT");
+	out_file.SetFullName(wxT("scene_dump"));
+	if (sOpt && !stricmp(sOpt, "yes")) {
+		dump_xmt = 1;
+	} else {
+		dump_xmt = 0;
+	}
+	strcpy(szOutFile, out_file.GetFullName().mb_str(wxConvUTF8));
+
+	GF_Err e = gf_term_dump_scene(m_pApp->m_term, szOutFile, NULL, dump_xmt, 0, m_current_odm);
+	if (e) {
+		wxMessageDialog dlg(this, wxString(gf_error_to_string(e), wxConvUTF8), wxT("Error while dumping"), wxOK);
+		dlg.ShowModal();
+	} else {
+		wxString cmd = get_pref_browser(m_pApp->m_user.config);
+		cmd += wxT(" ");
+		cmd += wxString(szOutFile, wxConvUTF8);
+		wxExecute(cmd);
+	}
+}

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/fileprops.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/menubtn.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/menubtn.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/osmo4.ico Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/osmo4.xpm Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/playlist.xpm Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/resource.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/toolbar.xpm Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxGPACControl.cpp Added

@@ -0,0 +1,1051 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Osmo4 wxWidgets GUI
+ *
+ *  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 "wxOsmo4.h"
+#include <gpac/options.h>
+#include <gpac/modules/codec.h>
+#include <gpac/modules/raster2d.h>
+#include <gpac/modules/font.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/video_out.h>
+
+#include <gpac/iso639.h>
+
+#include "wxGPACControl.h"
+
+
+#define NUM_RATES 11
+static const char *BIFSRates[11] =
+{
+	"5.0",
+	"7.5",
+	"10.0",
+	"12.5",
+	"15.0",
+	"24.0",
+	"25.0",
+	"30.0",
+	"50.0",
+	"60.0",
+	"100.0"
+};
+
+void wxGPACControl::SetYUVLabel()
+{
+	u32 yuv_format = gf_term_get_option(m_pApp->m_term, GF_OPT_YUV_FORMAT);
+	if (!yuv_format) {
+		m_yuvtxt->SetLabel(wxT("(No YUV used)"));
+	} else {
+		char str[100];
+		sprintf(str, "(%s used)", gf_4cc_to_str(yuv_format));
+		m_yuvtxt->SetLabel(wxString(str, wxConvUTF8) );
+	}
+}
+
+wxGPACControl::wxGPACControl(wxWindow *parent)
+	: wxDialog(parent, -1, wxString(wxT("GPAC Control Panel")))
+{
+	const char *sOpt;
+	SetSize(320, 240);
+	u32 i;
+	wxBoxSizer *bs;
+	Centre();
+
+	m_pApp = (wxOsmo4Frame *)parent;
+
+	s_main = new wxBoxSizer(wxVERTICAL);
+
+	s_header = new wxBoxSizer(wxHORIZONTAL);
+	//s_header->Add(new wxStaticText(this, 0, wxT("Category"), wxDefaultPosition, wxSize(60, 20)), wxALIGN_CENTER);
+	m_select = new wxComboBox(this, ID_SELECT, wxT(""), wxDefaultPosition, wxSize(120, 30), 0, NULL, wxCB_READONLY);
+	s_header->Add(m_select, 2, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_header->Add( new wxButton(this, ID_APPLY, wxT("Apply"), wxDefaultPosition,
+#ifdef WIN32
+	                            wxSize(40, 20)
+#else
+	                            wxSize(40, 30)
+#endif
+	                           ),
+	               1, wxALIGN_TOP|wxALIGN_RIGHT|wxADJUST_MINSIZE);
+	s_main->Add(s_header, 0, wxEXPAND, 0);
+
+	/*general section*/
+	s_general = new wxBoxSizer(wxVERTICAL);
+	m_loop = new wxCheckBox(this, 0, wxT("Loop at End"), wxPoint(10, 40), wxSize(140, 20));
+	s_general->Add(m_loop);
+	m_lookforsubs = new wxCheckBox(this, 0, wxT("Look for Subtitles"), wxPoint(180, 40), wxSize(140, 20));
+	s_general->Add(m_lookforsubs);
+	m_noconsole = new wxCheckBox(this, 0, wxT("Disable console messages"), wxPoint(10, 80), wxSize(180, 20));
+	s_general->Add(m_noconsole);
+	m_viewxmt = new wxCheckBox(this, 0, wxT("View graph in XMT-A format"), wxPoint(10, 120), wxSize(180, 20));
+	s_general->Add(m_viewxmt);
+	s_main->Add(s_general, 0, wxEXPAND, 0);
+
+	/*MPEG-4 systems*/
+	s_mpeg4 = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Prefered Stream Language")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_lang = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_lang, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
+
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Decoder Threading Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_thread = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_thread, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_mpeg4->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_bifsalwaysdrawn = new wxCheckBox(this, 0, wxT("Always draw late BIFS frames"));
+	s_mpeg4->Add(m_bifsalwaysdrawn);
+	m_singletime = new wxCheckBox(this, 0, wxT("Force Single Timeline"));
+	s_mpeg4->Add(m_singletime);
+	s_main->Add(s_mpeg4, 0, wxEXPAND, 0);
+
+	/*media decoders*/
+	s_mdec = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Prefered Audio Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_decaudio = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_decaudio, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Prefered Video Output")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_decvideo = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_decvideo, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_mdec->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_mdec, 0, wxEXPAND, 0);
+
+	/*Rendering*/
+	s_rend = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Target Frame Rate")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_fps = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_fps, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Anti-Aliasing")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_aa = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_aa, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Graphics Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_graph = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_graph, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_draw_bounds = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(new wxStaticText(this, 0, wxT("Bounds")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	bs->Add(m_draw_bounds, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_fast = new wxCheckBox(this, 0, wxT("Fast Rendering"));
+	m_force_size = new wxCheckBox(this, 0, wxT("Force Scene Size"));
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(m_fast, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	bs->Add(m_force_size, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_use3D = new wxCheckBox(this, 0, wxT("Use 3D Renderer"));
+	s_rend->Add(m_use3D, 0, wxALL|wxEXPAND, 2);
+	m_bWas3D = m_use3D->GetValue();
+	s_main->Add(s_rend, 0, wxEXPAND, 0);
+
+	/*Render 2D*/
+	s_rend2d = new wxBoxSizer(wxVERTICAL);
+	m_direct = new wxCheckBox(this, 0, wxT("Direct Rendering"));
+	s_rend2d->Add(m_direct, 0, wxALL|wxEXPAND, 2);
+	m_scalable = new wxCheckBox(this, 0, wxT("Scalable Zoom"));
+	s_rend2d->Add(m_scalable, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_noyuv = new wxCheckBox(this, 0, wxT("Disable YUV hardware"));
+	bs->Add(m_noyuv, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_yuvtxt = new wxStaticText(this, 0, wxT("(No YUV used)"), wxDefaultPosition, wxSize(60, 20), wxALIGN_LEFT);
+	bs->Add(m_yuvtxt, wxALIGN_CENTER|wxADJUST_MINSIZE);
+	s_rend2d->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_rend2d, 0, wxEXPAND, 0);
+
+	/*Render 3D*/
+	s_rend3d = new wxBoxSizer(wxVERTICAL);
+	m_raster_outlines = new wxCheckBox(this, 0, wxT("Use OpenGL Raster outlines"));
+	s_rend3d->Add(m_raster_outlines, 0, wxALL|wxEXPAND, 2);
+	m_polyaa = new wxCheckBox(this, 0, wxT("Enable polygon anti-aliasing"));
+	s_rend3d->Add(m_polyaa, 0, wxALL|wxEXPAND, 2);
+	m_nobackcull = new wxCheckBox(this, 0, wxT("Disable backface culling"));
+	s_rend3d->Add(m_nobackcull, 0, wxALL|wxEXPAND, 2);
+
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Wireframe mode")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_wire = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_wire, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
+
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Draw Normals")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_normals = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_normals, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rend3d->Add(bs, 0, wxALL|wxEXPAND, 2);
+
+	m_emulpow2 = new wxCheckBox(this, 0, wxT("Emulate power-of-two textures for video"));
+	s_rend3d->Add(m_emulpow2, 0, wxALL|wxEXPAND, 2);
+	m_norectext = new wxCheckBox(this, 0, wxT("Disable rectangular texture extensions"));
+	s_rend3d->Add(m_norectext, 0, wxALL|wxEXPAND, 2);
+	m_copypixels = new wxCheckBox(this, 0, wxT("Bitmap node uses direct pixel copy"));
+	s_rend3d->Add(m_copypixels, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_rend3d, 0, wxEXPAND, 0);
+
+	/*video*/
+	s_video = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Video Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_video = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_video , wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_video->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_switchres = new wxCheckBox(this, 0, wxT("Change video resolution in fullscreen"));
+	s_video->Add(m_switchres, 0, wxALL|wxEXPAND, 2);
+	m_usehwmem = new wxCheckBox(this, 0, wxT("Use hardware memory in 2D mode"));
+	s_video->Add(m_usehwmem, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_video, 0, wxEXPAND, 0);
+
+
+	/*audio*/
+	s_audio = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Audio Driver")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_audio = new wxComboBox(this, ID_AUDIO_DRIVER, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_audio, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_forcecfg = new wxCheckBox(this, ID_FORCE_AUDIO, wxT("Force Audio Config"));
+	m_forcecfg->SetValue(1);
+	s_audio->Add(m_forcecfg, 0, wxALL|wxEXPAND, 2);
+
+
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Number of buffers")), wxALIGN_CENTER|wxADJUST_MINSIZE);
+	m_nbbuf = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 30, 15);
+	m_nbbuf->SetValue(8);
+	bs->Add(m_nbbuf, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
+
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Total length in ms")), wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_buflen = new wxSpinCtrl(this, -1, wxT(""), wxDefaultPosition, wxSize(20, 20), wxSP_WRAP | wxSP_ARROW_KEYS, 1, 1000);
+	m_buflen->SetValue(400);
+	bs->Add(m_buflen, wxALIGN_CENTER | wxADJUST_MINSIZE|wxLEFT,10);
+	s_audio->Add(bs, 0, wxALL|wxEXPAND, 2);
+
+	m_noresync = new wxCheckBox(this, -1, wxT("Disable Resynchronization"));
+	s_audio->Add(m_noresync);
+	m_nomulitch = new wxCheckBox(this, -1, wxT("Disable Multichannel"));
+	s_audio->Add(m_nomulitch);
+#ifdef WIN32
+	m_notifs = new wxCheckBox(this, -1, wxT("Disable DirectSound Notifications"));
+	s_audio->Add(m_notifs);
+#endif
+	s_main->Add(s_audio, 0, wxEXPAND, 0);
+
+	/*font*/
+	s_font = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Font Engine")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_font = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_font, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("System Font Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_fontdir = new wxButton(this, ID_FONT_DIR, wxT("..."), wxDefaultPosition, wxDefaultSize);
+	bs->Add(m_fontdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Text Texturing Mode")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_texturemode = new wxComboBox(this, 0, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_READONLY);
+	bs->Add(m_texturemode, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_font->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_font, 0, wxEXPAND, 0);
+
+	/*download*/
+	s_dnld = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Cache Directory")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_cachedir = new wxButton(this, ID_CACHE_DIR, wxT("..."));
+	bs->Add(m_cachedir, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_cleancache = new wxCheckBox(this, -1, wxT("Remove temp files on exit"));
+	s_dnld->Add(m_cleancache);
+	m_restartcache = new wxCheckBox(this, -1, wxT("Always redownload incomplete cached files"));
+	s_dnld->Add(m_restartcache);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_progressive = new wxCheckBox(this, ID_PROGRESSIVE, wxT("XML progressive load"));
+	bs->Add(m_progressive, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_sax_duration = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
+	bs->Add(m_sax_duration, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	bs->Add(new wxStaticText(this, 0, wxT("max load slice (ms)")), wxADJUST_MINSIZE | wxALIGN_CENTER);
+	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_use_proxy = new wxCheckBox(this, ID_USE_PROXY, wxT("Use proxy"));
+	bs->Add(m_use_proxy, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_proxy_name = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
+	bs->Add(m_proxy_name, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_dnld->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_dnld, 0, wxEXPAND, 0);
+
+	/*streaming*/
+	s_stream = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Default RTSP port")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_port = new wxComboBox(this, ID_RTSP_PORT, wxT(""), wxPoint(160, 40), wxSize(140, 30), 0, NULL, wxCB_READONLY);
+	bs->Add(m_port, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_rtsp = new wxCheckBox(this, ID_RTP_OVER_RTSP, wxT("RTP over RTSP"), wxPoint(10, 80), wxSize(140, 20));
+	m_reorder = new wxCheckBox(this, -1, wxT("use RTP reordering"), wxPoint(160, 80), wxSize(130, 20));
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(m_rtsp, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	bs->Add(m_reorder, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_timeout = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 120), wxSize(60, 20));
+	bs->Add(new wxStaticText(this, 0, wxT("Control Timeout (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	bs->Add(m_timeout, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_buffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(10, 150), wxSize(60, 20));
+	bs->Add(new wxStaticText(this, 0, wxT("Media Buffering (ms): ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	bs->Add(m_buffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_dorebuffer = new wxCheckBox(this, ID_RTSP_REBUFFER, wxT("Rebuffer if below"));
+	bs->Add(m_dorebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_rebuffer = new wxTextCtrl(this, 0, wxT(""), wxPoint(200, 180), wxSize(60, 20));
+	bs->Add(m_rebuffer, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	m_rebuffer->Disable();
+	s_stream->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_stream, 0, wxEXPAND, 0);
+
+	/*streaming cache*/
+	s_rec = new wxBoxSizer(wxVERTICAL);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	bs->Add(new wxStaticText(this, 0, wxT("Record To: ")), wxALIGN_CENTER | wxADJUST_MINSIZE | wxALIGN_RIGHT);
+	m_recdir = new wxButton(this, ID_RECORD_DIR, wxT("..."));
+	bs->Add(m_recdir, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
+	m_overwrite = new wxCheckBox(this, -1, wxT("Overwrite existing files"));
+	s_rec->Add(m_overwrite);
+	bs = new wxBoxSizer(wxHORIZONTAL);
+	m_usename = new wxCheckBox(this, ID_USE_FILENAME, wxT("Use filename"));
+	m_recfile = new wxTextCtrl(this, 0, wxT(""));
+	bs->Add(m_usename, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	bs->Add(m_recfile, wxALIGN_CENTER | wxADJUST_MINSIZE);
+	s_rec->Add(bs, 0, wxALL|wxEXPAND, 2);
+	s_main->Add(s_rec, 0, wxEXPAND, 0);
+
+	/*load options*/
+	GF_Config *cfg = m_pApp->m_user.config;
+	/*general*/
+	sOpt = gf_cfg_get_key(cfg, "General", "Loop");
+	m_loop->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "General", "LookForSubtitles");
+	m_lookforsubs->SetValue((sOpt && !stricmp(sOpt, "no")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "General", "ConsoleOff");
+	m_noconsole->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "General", "ViewXMT");
+	m_viewxmt->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	/*lang config*/
+	u32 count = gf_lang_get_count();
+	for (i=0; i<count; i++) {
+		m_lang->Append(wxString(gf_lang_get_name(i), wxConvUTF8) );
+	}
+
+	sOpt = gf_cfg_get_key(cfg, "Systems", "Language3CC");
+	if (!sOpt) sOpt = "eng";
+	s32 select = gf_lang_find(sOpt);
+	if (select<0) select = 0;
+	m_lang->SetSelection(select);
+
+	/*systems config*/
+	sOpt = gf_cfg_get_key(cfg, "Systems", "ThreadingPolicy");
+	select = 0;
+	m_thread->Append(wxT("Single Thread"));
+	m_thread->Append(wxT("Mutli Thread"));
+	if (sOpt && !stricmp(sOpt, "Multi")) select = 1;
+	m_thread->Append(wxT("Free"));
+	if (sOpt && !stricmp(sOpt, "Free")) select = 2;
+	m_thread->SetSelection(select);
+	sOpt = gf_cfg_get_key(cfg, "Systems", "ForceSingleClock");
+	m_singletime->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Systems", "AlwaysDrawBIFS");
+	m_bifsalwaysdrawn->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+
+	/*audio dec enum*/
+	sOpt = gf_cfg_get_key(cfg, "Systems", "DefAudioDec");
+	u32 count = gf_modules_get_count(m_pApp->m_user.modules);
+	GF_BaseDecoder *ifc_d;
+	select = 0;
+	s32 to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifc_d) continue;
+		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_AUDIO, NULL, 0)) {
+			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
+			m_decaudio->Append(wxString(ifc_d->module_name, wxConvUTF8) );
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
+	}
+	m_decaudio->SetSelection(select);
+
+	/*video dec enum*/
+	sOpt = gf_cfg_get_key(cfg, "Systems", "DefVideoDec");
+	select = to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifc_d = (GF_BaseDecoder *) gf_modules_load_interface(m_pApp->m_user.modules, i, GF_MEDIA_DECODER_INTERFACE);
+		if (!ifc_d) continue;
+		if (ifc_d->CanHandleStream(ifc_d, GF_STREAM_VISUAL, NULL, 0)) {
+			if (sOpt && !stricmp(ifc_d->module_name, sOpt)) select = to_sel;
+			m_decvideo->Append(wxString(ifc_d->module_name, wxConvUTF8) );
+			to_sel++;
+		}
+		gf_modules_close_interface((GF_BaseInterface *) ifc_d);
+	}
+	m_decvideo->SetSelection(select);
+
+	/*rendering FIXME*/
+	m_bWas3D = 0;
+	m_use3D->SetValue(m_bWas3D ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "ForceSceneSize");
+	m_force_size->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "FrameRate");
+	if (!sOpt) sOpt = "30.0";
+	select = 0;
+	for (i = 0; i<NUM_RATES; i++) {
+		m_fps->Append(wxString(BIFSRates[i], wxConvUTF8) );
+		if (sOpt && !stricmp(sOpt, BIFSRates[i]) ) select = i;
+	}
+	m_fps->SetSelection(select);
+
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "HighSpeed");
+	m_fast->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "AntiAlias");
+	m_aa->Append(wxT("None"));
+	m_aa->Append(wxT("Text only"));
+	m_aa->Append(wxT("Complete"));
+	select = 2;
+	if (sOpt && !stricmp(sOpt, "Text")) select = 1;
+	else if (sOpt && !stricmp(sOpt, "None")) select = 0;
+	m_aa->SetSelection(select);
+
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "BoundingVolume");
+	m_draw_bounds->Append(wxT("None"));
+	m_draw_bounds->Append(wxT("Box/Rect"));
+	m_draw_bounds->Append(wxT("AABB Tree"));
+	select = 0;
+	if (sOpt && !stricmp(sOpt, "Box")) select = 1;
+	else if (sOpt && !stricmp(sOpt, "AABB")) select = 2;
+	m_draw_bounds->SetSelection(select);
+
+	/*render2d*/
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "DirectDraw");
+	m_direct->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "ScalableZoom");
+	m_scalable->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableYUV");
+	m_noyuv->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	SetYUVLabel();
+
+	/*graphics driver enum*/
+	sOpt = gf_cfg_get_key(cfg, "core", "raster2d");
+	GF_BaseInterface *ifce;
+	select = to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_RASTER_2D_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		m_graph->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_graph->SetSelection(select);
+
+	/*render3d*/
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "RasterOutlines");
+	m_raster_outlines->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "EmulatePOW2");
+	m_emulpow2->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "PolygonAA");
+	m_polyaa->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "BackFaceCulling");
+	m_nobackcull->SetValue((sOpt && !stricmp(sOpt, "Off")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "BitmapCopyPixels");
+	m_copypixels->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "DisableRectExt");
+	m_norectext->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	m_wire->Append(wxT("No Wireframe"));
+	m_wire->Append(wxT("Wireframe Only"));
+	m_wire->Append(wxT("Solid and Wireframe"));
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "Wireframe");
+	if (sOpt && !stricmp(sOpt, "WireOnly")) m_wire->SetSelection(1);
+	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) m_wire->SetSelection(2);
+	else m_wire->SetSelection(0);
+	m_normals->Append(wxT("Never"));
+	m_normals->Append(wxT("Per Face"));
+	m_normals->Append(wxT("Per Vertex"));
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "DrawNormals");
+	if (sOpt && !stricmp(sOpt, "PerFace")) m_normals->SetSelection(1);
+	else if (sOpt && !stricmp(sOpt, "PerVertex")) m_normals->SetSelection(2);
+	else m_normals->SetSelection(0);
+
+	/*video*/
+	m_switchres->SetValue( gf_cfg_get_bool(cfg, "core", "switch-vres") );
+	sOpt = gf_cfg_get_key(cfg, "core", "hwvmem");
+	m_usehwmem->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "core", "video-output");
+	select = to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_VIDEO_OUTPUT_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		m_video->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_video->SetSelection(select);
+
+	/*audio*/
+	sOpt = gf_cfg_get_key(cfg, "Audio", "ForceConfig");
+	m_forcecfg->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Audio", "NumBuffers");
+	m_nbbuf->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("2"));
+	sOpt = gf_cfg_get_key(cfg, "Audio", "TotalDuration");
+	m_buflen->SetValue( sOpt ? wxString(sOpt, wxConvUTF8) : wxT("120"));
+	wxCommandEvent event;
+	ForceAudio(event);
+	sOpt = gf_cfg_get_key(cfg, "Audio", "NoResync");
+	m_noresync->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableMultiChannel");
+	m_nomulitch->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+
+	/*driver enum*/
+	sOpt = gf_cfg_get_key(cfg, "core", "audio-output");
+	select = to_sel = 0;
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_AUDIO_OUTPUT_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		m_audio->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_audio->SetSelection(select);
+#ifdef WIN32
+	sOpt = gf_cfg_get_key(cfg, "Audio", "DisableNotification");
+	m_notifs->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	wxCommandEvent audevt;
+	OnSetAudioDriver(audevt);
+#endif
+
+	/*font*/
+	sOpt = gf_cfg_get_key(cfg, "FontCache", "FontReader");
+	to_sel = select = 0;
+	for (i=0; i<count; i++) {
+		ifce = gf_modules_load_interface(m_pApp->m_user.modules, i, GF_FONT_READER_INTERFACE);
+		if (!ifce) continue;
+		if (sOpt && !stricmp(((GF_BaseInterface *)ifce)->module_name, sOpt)) select = to_sel;
+		m_font->Append(wxString(((GF_BaseInterface *)ifce)->module_name, wxConvUTF8) );
+		gf_modules_close_interface(ifce);
+		to_sel++;
+	}
+	m_font->SetSelection(select);
+	sOpt = gf_cfg_get_key(cfg, "FontCache", "FontDirectory");
+	if (sOpt) m_fontdir->SetLabel(wxString(sOpt, wxConvUTF8) );
+	sOpt = gf_cfg_get_key(cfg, "Compositor", "TextureTextMode");
+	m_texturemode->Append(wxT("Default"));
+	m_texturemode->Append(wxT("Never"));
+	m_texturemode->Append(wxT("Always"));
+	if (sOpt && !stricmp(sOpt, "Always")) m_texturemode->SetSelection(2);
+	else if (sOpt && !stricmp(sOpt, "3D")) m_texturemode->SetSelection(1);
+	else m_texturemode->SetSelection(0);
+
+	/*downloader*/
+	sOpt = gf_cfg_get_key(cfg, "Core", "CacheDirectory");
+	if (sOpt) m_cachedir->SetLabel(wxString(sOpt, wxConvUTF8) );
+	sOpt = gf_cfg_get_key(cfg, "Core", "CleanCache");
+	m_cleancache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "Core", "RestartFiles");
+	m_restartcache->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "Progressive");
+	m_progressive->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	sOpt = gf_cfg_get_key(cfg, "SAXLoader", "MaxDuration");
+	m_sax_duration->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30"));
+	if (! m_progressive->GetValue()) m_sax_duration->Enable(0);
+
+	sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyEnabled");
+	m_use_proxy->SetValue( (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0);
+	char szProxy[GF_MAX_PATH];
+	strcpy(szProxy, "");
+	sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyName");
+	if (sOpt) {
+		strcat(szProxy, sOpt);
+		sOpt = gf_cfg_get_key(cfg, "Core", "HTTPProxyPort");
+		if (sOpt) {
+			strcat(szProxy, ":");
+			strcat(szProxy, sOpt);
+		}
+	} else {
+		m_use_proxy->SetValue(0);
+	}
+	m_proxy_name->SetValue( wxString((char *)szProxy, wxConvUTF8) );
+	if (! m_use_proxy->GetValue()) m_proxy_name->Enable(0);
+
+	/*streaming*/
+	m_port->Append(wxT("554 (RTSP standard)"));
+	m_port->Append(wxT("7070 (RTSP ext)"));
+	m_port->Append(wxT("80 (RTSP / HTTP tunnel)"));
+	m_port->Append(wxT("8080 (RTSP / HTTP tunnel)"));
+	sOpt = gf_cfg_get_key(cfg, "Streaming", "DefaultPort");
+	u32 port = 554;
+	Bool force_rtsp = 0;
+	if (sOpt) port = atoi(sOpt);
+	switch (port) {
+	case 8080:
+		m_port->SetSelection(3);
+		force_rtsp = 1;
+		break;
+	case 80:
+		m_port->SetSelection(2);
+		force_rtsp = 1;
+		break;
+	case 7070:
+		m_port->SetSelection(1);
+		break;
+	default:
+		m_port->SetSelection(0);
+		break;
+	}
+
+	Bool use_rtsp = 0;
+	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTPoverRTSP");
+	if (sOpt && !stricmp(sOpt, "yes")) use_rtsp = 1;
+
+	if (force_rtsp) {
+		m_rtsp->SetValue(1);
+		m_rtsp->Enable(0);
+		m_reorder->SetValue(0);
+		m_reorder->Enable(0);
+	} else {
+		m_rtsp->SetValue(use_rtsp ? 1 : 0);
+		m_rtsp->Enable(1);
+		m_reorder->Enable(1);
+		sOpt = gf_cfg_get_key(cfg, "Streaming", "ReorderSize");
+		m_reorder->SetValue( (sOpt && !stricmp(sOpt, "0")) ? 1 : 0);
+	}
+	sOpt = gf_cfg_get_key(cfg, "Streaming", "RTSPTimeout");
+	m_timeout->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("30000"));
+	sOpt = gf_cfg_get_key(cfg, "Network", "BufferLength");
+	m_buffer->SetValue(sOpt ? wxString(sOpt, wxConvUTF8) : wxT("3000"));
+	sOpt = gf_cfg_get_key(cfg, "Network", "RebufferLength");
+	u32 buf_len = 0;
+	if (sOpt) buf_len = atoi(sOpt);
+	if (buf_len) {
+		m_dorebuffer->SetValue(1);
+		m_rebuffer->SetValue(wxString(sOpt, wxConvUTF8));
+		m_rebuffer->Enable(1);
+	} else {
+		m_dorebuffer->SetValue(0);
+		m_rebuffer->SetValue(wxT("0"));
+		m_rebuffer->Enable(0);
+	}
+
+	RTPoverRTSP(event);
+
+	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "RecordDirectory");
+	if (!sOpt) sOpt = gf_cfg_get_key(cfg, "Core", "CacheDirectory");
+	if (sOpt) m_recdir->SetLabel(wxString(sOpt, wxConvUTF8));
+	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "KeepExistingFiles");
+	m_overwrite->SetValue((sOpt && !stricmp(sOpt, "yes")) ? 0 : 1);
+
+	sOpt = gf_cfg_get_key(cfg, "StreamingCache", "BaseFileName");
+	if (sOpt) {
+		m_usename->SetValue(1);
+		m_recfile->Enable(1);
+		m_recfile->SetValue(wxString(sOpt, wxConvUTF8));
+	} else {
+		m_usename->SetValue(0);
+		m_recfile->Enable(0);
+		m_recfile->SetValue(wxT("uses service URL"));
+	}
+
+	m_select->Append(wxT("General"));
+	m_select->Append(wxT("MPEG-4 Systems"));
+	m_select->Append(wxT("Media Decoders"));
+	m_select->Append(wxT("Compositor"));
+	m_select->Append(wxT("Renderer 2D"));
+	m_select->Append(wxT("Renderer 3D"));
+	m_select->Append(wxT("Video Output"));
+	m_select->Append(wxT("Audio Output"));
+	m_select->Append(wxT("Text Engine"));
+	m_select->Append(wxT("File Download"));
+	m_select->Append(wxT("Real-Time Streaming"));
+	m_select->Append(wxT("Streaming Cache"));
+
+	sOpt = gf_cfg_get_key(cfg, "General", "ConfigPanel");
+	m_sel = sOpt ? atoi(sOpt) : 0;
+	if (m_sel>11) m_sel=11;
+	m_select->SetSelection(m_sel);
+
+	DoSelect();
+}
+
+BEGIN_EVENT_TABLE(wxGPACControl, wxDialog)
+	EVT_BUTTON(ID_APPLY, wxGPACControl::Apply)
+	EVT_COMBOBOX(ID_SELECT, wxGPACControl::OnSetSelection)
+	EVT_CHECKBOX(ID_FORCE_AUDIO, wxGPACControl::ForceAudio)
+	EVT_COMBOBOX(ID_AUDIO_DRIVER, wxGPACControl::OnSetAudioDriver)
+	EVT_BUTTON(ID_FONT_DIR, wxGPACControl::FontDir)
+	EVT_BUTTON(ID_CACHE_DIR, wxGPACControl::CacheDir)
+	EVT_CHECKBOX(ID_PROGRESSIVE, wxGPACControl::OnProgressive)
+	EVT_CHECKBOX(ID_USE_PROXY, wxGPACControl::OnUseProxy)
+	EVT_CHECKBOX(ID_RTP_OVER_RTSP, wxGPACControl::RTPoverRTSP)
+	EVT_CHECKBOX(ID_RTSP_REBUFFER, wxGPACControl::Rebuffer)
+	EVT_COMBOBOX(ID_RTSP_PORT, wxGPACControl::OnSetRTSPPort)
+	EVT_CHECKBOX(ID_USE_FILENAME, wxGPACControl::OnUseFileName)
+	EVT_BUTTON(ID_RECORD_DIR, wxGPACControl::OnRecDir)
+END_EVENT_TABLE()
+
+
+wxGPACControl::~wxGPACControl()
+{
+	char str[20];
+	sprintf(str, "%d", m_sel);
+	gf_cfg_set_key(m_pApp->m_user.config, "General", "ConfigPanel", str);
+}
+
+
+void wxGPACControl::DoSelect()
+{
+
+	/*hide everything*/
+	s_main->Show(s_general, false);
+	s_main->Show(s_mpeg4, false);
+	s_main->Show(s_mdec, false);
+	s_main->Show(s_rend, false);
+	s_main->Show(s_rend2d, false);
+	s_main->Show(s_rend3d, false);
+	s_main->Show(s_video, false);
+	s_main->Show(s_audio, false);
+	s_main->Show(s_font, false);
+	s_main->Show(s_dnld, false);
+	s_main->Show(s_stream, false);
+	s_main->Show(s_rec, false);
+	switch (m_sel) {
+	case 0:
+		s_main->Show(s_general, true);
+		break;
+	case 1:
+		s_main->Show(s_mpeg4, true);
+		break;
+	case 2:
+		s_main->Show(s_mdec, true);
+		break;
+	case 3:
+		s_main->Show(s_rend, true);
+		break;
+	case 4:
+		s_main->Show(s_rend2d, true);
+		break;
+	case 5:
+		s_main->Show(s_rend3d, true);
+		break;
+	case 6:
+		s_main->Show(s_video, true);
+		break;
+	case 7:
+		s_main->Show(s_audio, true);
+		break;
+	case 8:
+		s_main->Show(s_font, true);
+		break;
+	case 9:
+		s_main->Show(s_dnld, true);
+		break;
+	case 10:
+		s_main->Show(s_stream, true);
+		break;
+	case 11:
+		s_main->Show(s_rec, true);
+		break;
+	}
+	SetSizer(s_main);
+	s_main->Fit(this);
+	//s_main->Layout();
+	return;
+
+}
+
+void wxGPACControl::OnSetSelection(wxCommandEvent &WXUNUSED(event))
+{
+	m_sel = m_select->GetSelection();
+	DoSelect();
+}
+
+void wxGPACControl::FontDir(wxCommandEvent &WXUNUSED(event))
+{
+	wxDirDialog dlg(this);
+	dlg.SetPath(m_fontdir->GetLabel());
+	if (dlg.ShowModal() == wxID_OK) {
+		m_fontdir->SetLabel(dlg.GetPath());
+	}
+}
+void wxGPACControl::CacheDir(wxCommandEvent &WXUNUSED(event))
+{
+	wxDirDialog dlg(this);
+	dlg.SetPath(m_cachedir->GetLabel());
+	if (dlg.ShowModal() == wxID_OK) {
+		m_cachedir->SetLabel(dlg.GetPath());
+	}
+}
+
+void wxGPACControl::OnProgressive(wxCommandEvent &WXUNUSED(event))
+{
+	m_sax_duration->Enable(m_progressive->GetValue() ? 1 : 0);
+}
+
+void wxGPACControl::OnUseProxy(wxCommandEvent &WXUNUSED(event))
+{
+	m_proxy_name->Enable(m_use_proxy->GetValue() ? 1 : 0);
+}
+
+void wxGPACControl::RTPoverRTSP(wxCommandEvent &WXUNUSED(event))
+{
+	m_reorder->Enable(m_rtsp->GetValue() ? 0 : 1);
+}
+
+void wxGPACControl::Rebuffer(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_dorebuffer->GetValue()) {
+		m_rebuffer->Enable();
+	} else {
+		m_rebuffer->Disable();
+	}
+}
+
+void wxGPACControl::OnSetRTSPPort(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_port->GetSelection() > 1) {
+		m_rtsp->Enable(0);
+		m_reorder->Enable(0);
+	} else {
+		m_rtsp->Enable(1);
+		m_reorder->Enable(1);
+	}
+}
+
+void wxGPACControl::OnRecDir(wxCommandEvent &WXUNUSED(event))
+{
+	wxDirDialog dlg(this);
+	dlg.SetPath(m_recdir->GetLabel());
+	if (dlg.ShowModal() == wxID_OK) {
+		m_recdir->SetLabel(dlg.GetPath());
+	}
+}
+
+void wxGPACControl::OnUseFileName(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_usename->GetValue()) {
+		m_recfile->Enable();
+		m_recfile->SetValue(wxT("record"));
+	} else {
+		m_recfile->Disable();
+		m_recfile->SetValue(wxT("uses service URL"));
+	}
+}
+
+void wxGPACControl::ForceAudio(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_forcecfg->GetValue()) {
+		m_nbbuf->Enable();
+		m_buflen->Enable();
+	} else {
+		m_nbbuf->Disable();
+		m_buflen->Disable();
+	}
+}
+
+void wxGPACControl::OnSetAudioDriver(wxCommandEvent &WXUNUSED(event))
+{
+#ifdef WIN32
+	if (strstr(m_audio->GetStringSelection().mb_str(wxConvUTF8), "DirectSound")) {
+		m_notifs->Enable(1);
+	} else {
+		m_notifs->Enable(0);
+	}
+#endif
+}
+
+
+
+void wxGPACControl::Apply(wxCommandEvent &WXUNUSED(event))
+{
+	/*save options*/
+	GF_Config *cfg = m_pApp->m_user.config;
+
+	m_pApp->m_loop = m_loop->GetValue() ? 1 : 0;
+	gf_cfg_set_key(cfg, "General", "Loop", m_loop->GetValue() ? "yes" : "no");
+	m_pApp->m_lookforsubs = m_lookforsubs->GetValue() ? 1 : 0;
+	gf_cfg_set_key(cfg, "General", "LookForSubtitles",  m_lookforsubs->GetValue() ? "yes" : "no");
+	m_pApp->m_console_off = m_noconsole->GetValue() ? 1 : 0;
+	gf_cfg_set_key(cfg, "General", "ConsoleOff", m_noconsole->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "General", "ViewXMT", m_viewxmt->GetValue() ? "yes" : "no");
+
+	s32 sel = m_lang->GetSelection();
+	gf_cfg_set_key(cfg, "Systems", "LanguageName", gf_lang_get_name(sel) );
+	gf_cfg_set_key(cfg, "Systems", "Language3CC", gf_lang_get_3cc(sel) );
+	gf_cfg_set_key(cfg, "Systems", "Language2CC", gf_lang_get_2cc(sel) );
+
+
+	sel = m_thread->GetSelection();
+	gf_cfg_set_key(cfg, "Systems", "ThreadingPolicy", (sel==0) ? "Single" : ( (sel==1) ? "Multi" : "Free"));
+	gf_cfg_set_key(cfg, "Systems", "ForceSingleClock", m_singletime->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Systems", "AlwaysDrawBIFS", m_bifsalwaysdrawn->GetValue() ? "yes" : "no");
+
+	gf_cfg_set_key(cfg, "Systems", "DefAudioDec", m_decaudio->GetStringSelection().mb_str(wxConvUTF8));
+	gf_cfg_set_key(cfg, "Systems", "DefVideoDec", m_decvideo->GetStringSelection().mb_str(wxConvUTF8));
+
+
+	gf_cfg_set_key(cfg, "Compositor", "HighSpeed", m_fast->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "ForceSceneSize", m_force_size->GetValue() ? "yes" : "no");
+
+	gf_cfg_set_key(cfg, "Compositor", "FrameRate", BIFSRates[m_fps->GetSelection()]);
+	sel = m_aa->GetSelection();
+	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", (sel==0) ? "None" : ( (sel==1) ? "Text" : "All"));
+	sel = m_draw_bounds->GetSelection();
+	gf_cfg_set_key(cfg, "Compositor", "BoundingVolume", (sel==2) ? "AABB" : (sel==1) ? "Box" : "None");
+
+	Bool is_3D = m_use3D->GetValue() ? 1 : 0;
+	if (m_bWas3D != is_3D) {
+		/*FIXME*/
+	}
+	gf_cfg_set_key(cfg, "core", "raster2d", m_graph->GetStringSelection().mb_str(wxConvUTF8));
+
+	gf_cfg_set_key(cfg, "Compositor", "DirectDraw", m_direct->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", m_scalable->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "DisableYUV", m_noyuv->GetValue() ? "yes" : "no");
+
+	gf_cfg_set_key(cfg, "Compositor", "RasterOutlines", m_raster_outlines->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", m_emulpow2->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "PolygonAA", m_polyaa->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "DisableRectExt", m_norectext->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "BitmapCopyPixels", m_copypixels->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Compositor", "BackFaceCulling", m_nobackcull->GetValue() ? "Off" : "On");
+
+	sel = m_wire->GetSelection();
+	gf_cfg_set_key(cfg, "Compositor", "Wireframe", (sel==2) ? "WireOnSolid" : ( (sel==1) ? "WireOnly" : "WireNone" ) );
+	sel = m_normals->GetSelection();
+	gf_cfg_set_key(cfg, "Compositor", "DrawNormals", (sel==2) ? "PerVertex" : ( (sel==1) ? "PerFace" : "Never" ) );
+
+	gf_cfg_set_key(cfg, "core", "switch-vres", m_switchres->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "core", "hwvmem", m_usehwmem->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "core", "video-output", m_video->GetStringSelection().mb_str(wxConvUTF8));
+
+
+	gf_cfg_set_key(cfg, "Audio", "ForceConfig", m_forcecfg->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Audio", "NoResync", m_noresync->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Audio", "DisableMultiChannel", m_nomulitch->GetValue() ? "yes" : "no");
+
+	gf_cfg_set_key(cfg, "Audio", "NumBuffers", wxString::Format(wxT("%d"), m_nbbuf->GetValue()).mb_str(wxConvUTF8) );
+	gf_cfg_set_key(cfg, "Audio", "TotalDuration", wxString::Format(wxT("%d"), m_buflen->GetValue()).mb_str(wxConvUTF8) );
+	gf_cfg_set_key(cfg, "core", "audio-output", m_audio->GetStringSelection().mb_str(wxConvUTF8));
+#ifdef WIN32
+	if (m_notifs->IsEnabled())
+		gf_cfg_set_key(cfg, "Audio", "DisableNotification", m_notifs->GetValue() ? "yes" : "no");
+#endif
+
+	gf_cfg_set_key(cfg, "FontCache", "FontReader", m_font->GetStringSelection().mb_str(wxConvUTF8));
+	gf_cfg_set_key(cfg, "FontCache", "FontDirectory", m_fontdir->GetLabel().mb_str(wxConvUTF8));
+	switch (m_texturemode->GetSelection()) {
+	case 2:
+		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Always");
+		break;
+	case 1:
+		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Never");
+		break;
+	default:
+		gf_cfg_set_key(cfg, "Compositor", "TextureTextMode", "Default");
+		break;
+	}
+
+	gf_cfg_set_key(cfg, "Core", "CleanCache", m_cleancache->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "Core", "RestartFiles", m_restartcache->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "SAXLoader", "Progressive", m_progressive->GetValue() ? "yes" : "no");
+	gf_cfg_set_key(cfg, "SAXLoader", "MaxDuration", m_sax_duration->GetLabel().mb_str(wxConvUTF8));
+	gf_cfg_set_key(cfg, "Core", "CacheDirectory", m_cachedir->GetLabel().mb_str(wxConvUTF8));
+
+
+	Bool force_rtsp = 0;
+	switch (m_port->GetSelection()) {
+	case 3:
+		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "8080");
+		force_rtsp = 1;
+		break;
+	case 2:
+		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "80");
+		force_rtsp = 1;
+		break;
+	case 1:
+		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "7070");
+		break;
+	default:
+		gf_cfg_set_key(cfg, "Streaming", "DefaultPort", "554");
+		break;
+	}
+
+	if (force_rtsp) {
+		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", "yes");
+	} else {
+		gf_cfg_set_key(cfg, "Streaming", "RTPoverRTSP", m_rtsp->GetValue() ? "yes" : "no");
+		if (!m_rtsp->GetValue()) gf_cfg_set_key(cfg, "Streaming", "ReorderSize", m_dorebuffer->GetValue() ? "30" : "0");
+	}
+
+	gf_cfg_set_key(cfg, "Streaming", "RTSPTimeout", m_timeout->GetValue().mb_str(wxConvUTF8));
+	gf_cfg_set_key(cfg, "Network", "BufferLength", m_buffer->GetValue().mb_str(wxConvUTF8));
+	if (m_dorebuffer->GetValue()) {
+		gf_cfg_set_key(cfg, "Network", "RebufferLength", m_rebuffer->GetValue().mb_str(wxConvUTF8));
+	} else {
+		gf_cfg_set_key(cfg, "Network", "RebufferLength", "0");
+	}
+
+	gf_cfg_set_key(cfg, "StreamingCache", "KeepExistingFiles", m_overwrite->GetValue() ? "no" : "yes");
+	if (m_usename->GetValue()) {
+		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", m_recfile->GetValue().mb_str(wxConvUTF8));
+	} else {
+		gf_cfg_set_key(cfg, "StreamingCache", "BaseFileName", NULL);
+	}
+	gf_cfg_set_key(cfg, "StreamingCache", "RecordDirectory", m_recdir->GetLabel().mb_str(wxConvUTF8));
+
+
+	gf_term_set_option(m_pApp->m_term, GF_OPT_RELOAD_CONFIG, 1);
+}
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxGPACControl.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.cpp Added

@@ -0,0 +1,2392 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Osmo4 wxWidgets GUI
+ *
+ *  GPAC is gf_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 "wxOsmo4.h"
+#include "wxGPACControl.h"
+#include "fileprops.h"
+#include <wx/image.h>
+#include <gpac/modules/service.h>
+#include <gpac/network.h>
+#include <gpac/constants.h>
+#include <gpac/options.h>
+
+
+IMPLEMENT_APP(wxOsmo4App)
+
+#include "osmo4.xpm"
+
+#include <wx/dnd.h>
+
+
+
+
+
+#include <wx/filename.h>
+#include <wx/clipbrd.h>
+
+#include "toolbar.xpm"
+
+#include "Playlist.h"
+
+#ifdef WIN32
+#define	FRAME_H	140
+#else
+#define	FRAME_H	110
+#endif
+
+
+wxString get_pref_browser(GF_Config *cfg)
+{
+	const char *sOpt = gf_cfg_get_key(cfg, "General", "Browser");
+	if (sOpt) return wxString(sOpt, wxConvUTF8);
+	return wxEmptyString;
+	/*
+	#ifdef __WXMAC__
+		return wxT("safari");
+	#else
+	#ifdef WIN32
+		return wxT("explorer.exe");
+	#else
+		return wxT("mozilla");
+	#endif
+	#endif*/
+}
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxGPACEvent, wxEvent )
+
+wxGPACEvent::wxGPACEvent(wxWindow* win)
+{
+	SetEventType(GPAC_EVENT);
+	SetEventObject(win);
+	gpac_evt.type = 0;
+	to_url = wxT("");
+}
+wxEvent *wxGPACEvent::Clone() const
+{
+	wxGPACEvent *evt = new wxGPACEvent((wxWindow *) m_eventObject);
+	evt->to_url = to_url;
+	evt->gpac_evt = gpac_evt;
+	return evt;
+}
+
+#include <wx/wx.h>
+
+/*open file dlg*/
+BEGIN_EVENT_TABLE(OpenURLDlg, wxDialog)
+	EVT_BUTTON(ID_URL_GO, OpenURLDlg::OnGo)
+END_EVENT_TABLE()
+
+OpenURLDlg::OpenURLDlg(wxWindow *parent, GF_Config *cfg)
+	: wxDialog(parent, -1, wxString(wxT("Enter remote presentation location")))
+{
+#ifndef WIN32
+	SetSize(430, 35);
+#else
+	SetSize(430, 55);
+#endif
+	Centre();
+	m_url = new wxComboBox(this, -1, wxT(""), wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN);
+	m_url->SetSize(0, 2, 340, 18, wxSIZE_AUTO);
+	m_go = new wxButton(this, ID_URL_GO, wxT("Go !"));
+#ifndef WIN32
+	m_go->SetSize(344, 2, 20, 18, wxSIZE_AUTO);
+#else
+	m_go->SetSize(364, 2, 30, 18, wxSIZE_AUTO);
+#endif
+	m_urlVal = wxT("");
+
+	m_cfg = cfg;
+
+	const char *sOpt;
+	u32 i=0;
+
+	while (1) {
+		sOpt = gf_cfg_get_key_name(m_cfg, "RecentFiles", i);
+		if (!sOpt) break;
+		m_url->Append(wxString(sOpt, wxConvUTF8) );
+		i++;
+	}
+}
+
+#define MAX_LAST_FILES		20
+void UpdateLastFiles(GF_Config *cfg, const char *URL)
+{
+	u32 nb_entries;
+	gf_cfg_set_key(cfg, "RecentFiles", URL, NULL);
+	gf_cfg_insert_key(cfg, "RecentFiles", URL, "", 0);
+	/*remove last entry if needed*/
+	nb_entries = gf_cfg_get_key_count(cfg, "RecentFiles");
+	if (nb_entries>MAX_LAST_FILES) {
+		gf_cfg_set_key(cfg, "RecentFiles", gf_cfg_get_key_name(cfg, "RecentFiles", nb_entries-1), NULL);
+	}
+}
+
+void OpenURLDlg::OnGo(wxCommandEvent& event)
+{
+	m_urlVal = m_url->GetValue();
+	UpdateLastFiles(m_cfg, m_urlVal.mb_str(wxConvUTF8));
+	EndModal(wxID_OK);
+}
+/*end open file dlg*/
+
+#ifdef WIN32
+u32 get_sys_col(int idx)
+{
+	u32 res;
+	DWORD val = GetSysColor(idx);
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
+	res |= (val>>16)&0xFF;
+	return res;
+}
+#endif
+
+static void wxOsmo4_progress_cbk(const void *usr, const char *title, u64 done, u64 total)
+{
+	if (!total) return;
+	wxOsmo4Frame *app = (wxOsmo4Frame *)usr;
+	s32 prog = (s32) ( (100 * (u64)done) / total);
+	if (app->m_last_prog < prog) {
+		app->m_last_prog = prog;
+
+		if (prog<100) {
+			/*appears to crash wxWidgets / X11 when refreshing the text too often*/
+			if (app->m_LastStatusTime + 200 > gf_sys_clock()) return;
+			char msg[1024];
+			sprintf(msg, "%s %02d %%)", title, prog);
+			//app->SetStatus(wxString(msg, wxConvUTF8));
+		} else {
+			app->SetStatus(wxT("Ready"));
+			app->m_last_prog = -1;
+		}
+	}
+}
+
+Bool GPAC_EventProc(void *ptr, GF_Event *evt)
+{
+	wxCommandEvent event;
+	wxOsmo4Frame *app = (wxOsmo4Frame *)ptr;
+
+	switch (evt->type) {
+	case GF_EVENT_DURATION:
+		app->m_duration = (u32) (evt->duration.duration*1000);
+		app->m_can_seek = evt->duration.can_seek;
+		if (app->m_duration<1100) app->m_can_seek = 0;
+		app->m_pProg->Enable(app->m_can_seek ? 1 : 0);
+		app->m_pPlayList->SetDuration((u32) evt->duration.duration);
+		break;
+	case GF_EVENT_MESSAGE:
+	{
+		const char *servName;
+		if (!evt->message.service || !strcmp(evt->message.service, app->m_pPlayList->GetURL().mb_str(wxConvUTF8))) {
+			servName = "main service";
+		} else {
+			servName = evt->message.service;
+		}
+		if (!evt->message.message) return 0;
+
+		if (evt->message.error) {
+			app->SetStatus(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")") );
+			if (!app->m_connected) app->m_pPlayList->SetDead();
+		}
+		else if (!app->m_console_off) {
+			if (strstr(evt->message.message, "100 %")) {
+				app->SetStatus(wxT(""));
+			} else {
+				app->SetStatus(wxString(evt->message.message, wxConvUTF8) );
+			}
+		}
+
+#if 0
+		/*log*/
+		if (evt->message.error)
+			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(") ") + wxString(gf_error_to_string(evt->message.error), wxConvUTF8) );
+		else
+			::wxLogMessage(wxString(evt->message.message, wxConvUTF8) + wxT(" (") + wxString(servName, wxConvUTF8) + wxT(")"));
+#endif
+	}
+	break;
+	case GF_EVENT_PROGRESS:
+	{
+		const char *sTitle;
+		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
+		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
+		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
+		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
+	}
+	break;
+	case GF_EVENT_KEYDOWN:
+		if (app->m_can_seek && (evt->key.flags & GF_KEY_MOD_ALT)) {
+			s32 res;
+			switch (evt->key.key_code) {
+			case GF_KEY_LEFT:
+				res = gf_term_get_time_in_ms(app->m_term) - 5*app->m_duration/100;
+				if (res<0) res=0;
+				gf_term_play_from_time(app->m_term, res, 0);
+				break;
+			case GF_KEY_RIGHT:
+				res = gf_term_get_time_in_ms(app->m_term) + 5*app->m_duration/100;
+				if ((u32) res>=app->m_duration) res = 0;
+				gf_term_play_from_time(app->m_term, res, 0);
+				break;
+			case GF_KEY_DOWN:
+				res = gf_term_get_time_in_ms(app->m_term) - 60000;
+				if (res<0) res=0;
+				gf_term_play_from_time(app->m_term, res, 0);
+				break;
+			case GF_KEY_UP:
+				res = gf_term_get_time_in_ms(app->m_term) + 60000;
+				if ((u32) res>=app->m_duration) res = 0;
+				gf_term_play_from_time(app->m_term, res, 0);
+				break;
+			}
+		} else if (evt->key.flags & GF_KEY_MOD_CTRL) {
+			switch (evt->key.key_code) {
+			case GF_KEY_LEFT:
+				app->m_pPlayList->PlayPrev();
+				break;
+			case GF_KEY_RIGHT:
+				app->m_pPlayList->PlayNext();
+				break;
+			}
+		} else {
+			switch (evt->key.key_code) {
+			case GF_KEY_HOME:
+				gf_term_set_option(app->m_term, GF_OPT_NAVIGATION_TYPE, 1);
+				break;
+			case GF_KEY_ESCAPE:
+				if (gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN))
+					gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, 0);
+				break;
+			default:
+			{
+				wxGPACEvent wxevt(app);
+				wxevt.gpac_evt = *evt;
+				app->AddPendingEvent(wxevt);
+			}
+			break;
+			}
+		}
+		break;
+
+	case GF_EVENT_CONNECT:
+	{
+		wxGPACEvent wxevt(app);
+		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
+		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
+		if (!evt->connect.is_connected) app->m_duration = 0;
+		app->AddPendingEvent(wxevt);
+	}
+	break;
+	case GF_EVENT_NAVIGATE:
+	{
+		wxGPACEvent wxevt(app);
+		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
+		wxevt.gpac_evt.type = evt->type;
+		app->AddPendingEvent(wxevt);
+	}
+	return 1;
+	case GF_EVENT_SET_CAPTION:
+	{
+		wxGPACEvent wxevt(app);
+		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
+		wxevt.gpac_evt.type = evt->type;
+		app->AddPendingEvent(wxevt);
+	}
+	return 1;
+
+	case GF_EVENT_QUIT:
+	case GF_EVENT_VIEWPOINTS:
+	case GF_EVENT_STREAMLIST:
+	case GF_EVENT_SCENE_SIZE:
+//	case GF_EVENT_SIZE:
+	{
+		wxGPACEvent wxevt(app);
+		wxevt.gpac_evt = *evt;
+		app->AddPendingEvent(wxevt);
+	}
+	break;
+	case GF_EVENT_DBLCLICK:
+		gf_term_set_option(app->m_term, GF_OPT_FULLSCREEN, !gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN));
+		return 0;
+	case GF_EVENT_MOUSEDOWN:
+		if (!gf_term_get_option(app->m_term, GF_OPT_FULLSCREEN)) {
+#ifdef __WXGTK__
+			app->m_pVisual->SetFocus();
+#else
+			app->m_pView->SetFocus();
+#endif
+		}
+		break;
+	case GF_EVENT_AUTHORIZATION:
+	{
+		wxGPACEvent wxevt(app);
+		wxTextEntryDialog user_d (0,
+		                          wxT("Please set the user name for connection"),
+		                          wxString(evt->auth.site_url, wxConvUTF8),
+		                          wxString(evt->auth.user, wxConvUTF8));
+		if (user_d.ShowModal() != wxID_OK)
+			return 0;
+		strncpy(evt->auth.user, user_d.GetValue().mb_str(wxConvUTF8), 50);
+		wxPasswordEntryDialog passwd_d(0,
+		                               wxT("Please enter password"),
+		                               wxString(evt->auth.site_url, wxConvUTF8),
+		                               wxString(evt->auth.password, wxConvUTF8));
+		if (passwd_d.ShowModal() != wxID_OK)
+			return 0;
+		strncpy(evt->auth.password, passwd_d.GetValue().mb_str(wxConvUTF8), 50);
+		return 1;
+	}
+	case GF_EVENT_SYS_COLORS:
+#ifdef WIN32
+		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
+		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);
+		evt->sys_cols.sys_colors[2] = get_sys_col(COLOR_APPWORKSPACE);
+		evt->sys_cols.sys_colors[3] = get_sys_col(COLOR_BACKGROUND);
+		evt->sys_cols.sys_colors[4] = get_sys_col(COLOR_BTNFACE);
+		evt->sys_cols.sys_colors[5] = get_sys_col(COLOR_BTNHIGHLIGHT);
+		evt->sys_cols.sys_colors[6] = get_sys_col(COLOR_BTNSHADOW);
+		evt->sys_cols.sys_colors[7] = get_sys_col(COLOR_BTNTEXT);
+		evt->sys_cols.sys_colors[8] = get_sys_col(COLOR_CAPTIONTEXT);
+		evt->sys_cols.sys_colors[9] = get_sys_col(COLOR_GRAYTEXT);
+		evt->sys_cols.sys_colors[10] = get_sys_col(COLOR_HIGHLIGHT);
+		evt->sys_cols.sys_colors[11] = get_sys_col(COLOR_HIGHLIGHTTEXT);
+		evt->sys_cols.sys_colors[12] = get_sys_col(COLOR_INACTIVEBORDER);
+		evt->sys_cols.sys_colors[13] = get_sys_col(COLOR_INACTIVECAPTION);
+		evt->sys_cols.sys_colors[14] = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
+		evt->sys_cols.sys_colors[15] = get_sys_col(COLOR_INFOBK);
+		evt->sys_cols.sys_colors[16] = get_sys_col(COLOR_INFOTEXT);
+		evt->sys_cols.sys_colors[17] = get_sys_col(COLOR_MENU);
+		evt->sys_cols.sys_colors[18] = get_sys_col(COLOR_MENUTEXT);
+		evt->sys_cols.sys_colors[19] = get_sys_col(COLOR_SCROLLBAR);
+		evt->sys_cols.sys_colors[20] = get_sys_col(COLOR_3DDKSHADOW);
+		evt->sys_cols.sys_colors[21] = get_sys_col(COLOR_3DFACE);
+		evt->sys_cols.sys_colors[22] = get_sys_col(COLOR_3DHIGHLIGHT);
+		evt->sys_cols.sys_colors[23] = get_sys_col(COLOR_3DLIGHT);
+		evt->sys_cols.sys_colors[24] = get_sys_col(COLOR_3DSHADOW);
+		evt->sys_cols.sys_colors[25] = get_sys_col(COLOR_WINDOW);
+		evt->sys_cols.sys_colors[26] = get_sys_col(COLOR_WINDOWFRAME);
+		evt->sys_cols.sys_colors[27] = get_sys_col(COLOR_WINDOWTEXT);
+		return 1;
+#else
+		memset(evt->sys_cols.sys_colors, 0, sizeof(u32)*28);
+		return 1;
+#endif
+	}
+	return 0;
+}
+
+
+
+bool wxOsmo4App::OnInit()
+{
+#ifdef __WXGTK__
+	XSynchronize((Display *) wxGetDisplay(), 1);
+#endif
+	wxFrame *frame = new wxOsmo4Frame();
+	frame->Show(TRUE);
+	SetTopWindow(frame);
+	return true;
+}
+
+
+class myDropfiles : public wxFileDropTarget
+{
+public:
+	myDropfiles() : wxFileDropTarget() {}
+	virtual bool OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames);
+	wxOsmo4Frame *m_pMain;
+};
+
+bool myDropfiles::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filenames)
+{
+	u32 count = filenames.GetCount();
+
+	if (count==1) {
+		const char *ext = strrchr(filenames.Item(0).mb_str(wxConvUTF8) , '.');
+		/*if playing and sub d&d, open sub in current presentation*/
+		if (m_pMain->m_connected && ext && ( !stricmp(ext, ".srt") || !stricmp(ext, ".sub") || !stricmp(ext, ".ttxt") || !stricmp(ext, ".xml") ) ) {
+			m_pMain->AddSubtitle(filenames.Item(0).mb_str(wxConvUTF8) , 1);
+			return TRUE;
+		}
+	}
+
+	for (u32 i=0; i<count; i++)
+		m_pMain->m_pPlayList->QueueURL(filenames.Item(i));
+
+	m_pMain->m_pPlayList->RefreshList();
+	m_pMain->m_pPlayList->PlayNext();
+	return TRUE;
+}
+
+bool GPACLogs::OnFrameClose(wxFrame *frame)
+{
+	Show(FALSE);
+	return 0;
+}
+
+void wxOsmo4Frame::ShowViewWindow(Bool do_show)
+{
+	m_pView->Show(do_show ? 1 : 0);
+#ifdef __WXGTK__
+	//m_pView->Show(0);
+#endif
+}
+
+#ifdef __WXGTK__
+extern "C" {
+#ifdef __WXGTK20__
+	int gdk_x11_drawable_get_xid( void * );
+	void *gdk_x11_drawable_get_xdisplay( void * );
+#endif
+	void *gtk_widget_get_parent_window( void * );
+}
+#endif
+
+
+void wxOsmo4Frame::CheckVideoOut()
+{
+	const char *sOpt = gf_cfg_get_key(m_user.config, "core", "video-output");
+	void *os_handle = NULL;
+	void *os_display = NULL;
+	/*build a child window for embed display*/
+	if (sOpt && stricmp(sOpt, "SDL Video Output")) {
+		if (m_user.os_window_handler) return;
+		m_bExternalView = 0;
+
+#ifdef __WXGTK__
+		GtkWidget* widget = m_pVisual->GetHandle();
+
+#ifdef __WXGTK20__
+		os_handle = (void *) gdk_x11_drawable_get_xid(gtk_widget_get_parent_window(widget));
+#else
+		os_handle = (void *)*(int *)( (char *)gtk_widget_get_parent_window(widget) + 2 * sizeof(void *) );
+#endif
+
+#elif defined (WIN32)
+		os_handle = m_pView->GetHandle();
+#endif
+		if (os_handle) {
+			m_user.os_window_handler = os_handle;
+			m_user.os_display = os_display;
+			ShowViewWindow(1);
+			m_pView->SetSize(320, 240);
+			SetSize(wxSize(320, 240+FRAME_H));
+			SetWindowStyle(wxDEFAULT_FRAME_STYLE);
+			DoLayout(320, 240);
+			return;
+		}
+	}
+	/*we're using SDL, don't use SDL hack*/
+	m_bExternalView = 1;
+	m_user.os_window_handler = 0;
+	m_user.os_display = NULL;
+	SetSize(wxSize(320,FRAME_H));
+	m_pView->SetSize(0, 0);
+	ShowViewWindow(0);
+	DoLayout();
+	SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
+}
+
+static void wxOsmo4_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
+{
+	wxOsmo4Frame *osmo = (wxOsmo4Frame *)cbk;
+
+	if (osmo->m_logs) {
+		vfprintf(osmo->m_logs, fmt, list);
+		fflush(osmo->m_logs);
+	} else {
+		::wxVLogMessage(wxString(fmt, wxConvUTF8), list);
+	}
+}
+
+
+Bool wxOsmo4Frame::LoadTerminal()
+{
+	m_term = NULL;
+	memset(&m_user, 0, sizeof(GF_User));
+
+	/*locate exec dir for cfg file*/
+	wxPathList pathList;
+	wxString currentDir(wxGetCwd());
+	wxString abs_gpac_path = wxT("");
+	char *gpac_cfg, *sep;
+
+	::wxLogMessage(wxT("Looking for GPAC configuration file"));
+
+	/*load config*/
+	Bool first_launch = 0;
+	m_user.config = gf_cfg_init(NULL, &first_launch);
+
+	if (!m_user.config) {
+		wxMessageDialog(NULL, wxT("Cannot open GPAC configuration file"), wxT("Init error"), wxOK);
+		return 0;
+	}
+
+	gpac_cfg = gf_cfg_get_filename(m_user.config);
+	sep = strrchr(gpac_cfg, '/');
+	if (!sep) sep = strrchr(gpac_cfg, '\\');
+	if (sep) sep[0] = 0;
+	strcpy(szAppPath, gpac_cfg);
+	if (sep) sep[0] = '/';
+
+	/*check log file*/
+	const char *str = gf_cfg_get_key(m_user.config, "General", "LogFile");
+	if (str) m_logs = gf_fopen(str, "wt");
+	gf_log_set_callback(this, wxOsmo4_do_log);
+
+	/*set log level*/
+	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
+
+	gf_sys_init(GF_MemTrackerNone);
+
+	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
+
+	m_user.modules = gf_modules_new(str, m_user.config);
+	/*initial launch*/
+	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
+		wxMessageDialog(NULL, wxT("No modules available - system cannot work"), wxT("Fatal Error"), wxOK).ShowModal();
+		if (m_user.modules) gf_modules_del(m_user.modules);
+		gf_cfg_del(m_user.config);
+		m_user.config = NULL;
+		return 0;
+	}
+
+	if (first_launch) {
+		u32 i;
+		for (i=0; i<gf_modules_get_count(m_user.modules); i++) {
+			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(m_user.modules, i, GF_NET_CLIENT_INTERFACE);
+			if (!ifce) continue;
+			if (ifce) {
+				ifce->CanHandleURL(ifce, "test.test");
+				gf_modules_close_interface((GF_BaseInterface *) ifce);
+			}
+		}
+	}
+
+
+
+	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
+	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
+		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
+	}
+
+	::wxLogMessage(wxT("Starting GPAC Terminal"));
+	/*now load terminal*/
+	m_user.opaque = this;
+	m_user.EventProc = GPAC_EventProc;
+
+	CheckVideoOut();
+
+	m_term = gf_term_new(&m_user);
+	if (!m_term) {
+		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
+		return 0;
+	} else {
+		::wxLogMessage(wxT("GPAC Terminal started") );
+	}
+	return 1;
+}
+
+
+
+wxOsmo4Frame::wxOsmo4Frame() :
+	wxFrame((wxFrame *) NULL, -1, wxT("Osmo4 - GPAC"), wxPoint(-1, -1), wxSize(320, FRAME_H), //wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER)
+	        wxDEFAULT_FRAME_STYLE
+	       )
+
+{
+	int ws[3];
+	m_Address = NULL;
+	m_pView = NULL;
+	m_term = NULL;
+	SetIcon(wxIcon(osmo4));
+	m_bExternalView = 0;
+	m_last_prog = -1;
+	m_num_chapters = 0;
+	m_chapters_start = NULL;
+	m_bViewRTI = 0;
+	m_logs = NULL;
+	m_bStartupFile = 0;
+	gf_set_progress_callback(this, wxOsmo4_progress_cbk);
+
+	myDropfiles *droptarget = new myDropfiles();
+	droptarget->m_pMain = this;
+	SetDropTarget(droptarget);
+	m_pLogs = new GPACLogs(this);
+	m_bGrabbed = 0;
+
+	/*new menu bar*/
+	wxMenuBar *b = new wxMenuBar();
+	/*file*/
+	wxMenu *menu = new wxMenu();
+	menu->Append(GWX_FILE_OPEN, wxT("&Open File\tCtrl+O"), wxT("Open local presentation"));
+	menu->Append(GWX_FILE_OPEN_URL, wxT("&Open URL\tCtrl+U"), wxT("Open remote presentation"));
+	menu->AppendSeparator();
+	menu->Append(FILE_PROPERTIES, wxT("&Properties\tCtrl+I"), wxT("Show presentation properties"));
+	menu->Enable(FILE_PROPERTIES, 0);
+	wxMenu *smenu = new wxMenu();
+	smenu->Append(ID_MCACHE_ENABLE, wxT("&Enable"), wxT("Turns Recorder On/Off"));
+	smenu->Append(ID_MCACHE_STOP, wxT("&Stop"), wxT("Stops recording and saves"));
+	smenu->Append(ID_MCACHE_ABORT, wxT("&Abort"), wxT("Stops recording and discards"));
+	menu->Append(0, wxT("&Streaming Cache"), smenu);
+	menu->AppendSeparator();
+	menu->Append(FILE_COPY, wxT("&Copy\tCtrl+C"), wxT("Copy selected text"));
+	menu->Append(FILE_PASTE, wxT("&Paste\tCtrl+V"), wxT("Copy selected text"));
+	menu->AppendSeparator();
+	menu->Append(FILE_QUIT, wxT("E&xit"), wxT("Quit the application"));
+	b->Append(menu, wxT("&File"));
+	/*view*/
+	menu = new wxMenu();
+	vp_list = new wxMenu();
+	menu->Append(0, wxT("&Viewpoint"), vp_list);
+	smenu = new wxMenu();
+	smenu->Append(ID_HEADLIGHT, wxT("Headlight"), wxT("Turns headlight on/off"), wxITEM_CHECK);
+	smenu->AppendSeparator();
+	smenu->Append(ID_NAVIGATE_NONE, wxT("None"), wxT("Disables Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_WALK, wxT("Walk"), wxT("Walk Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_FLY, wxT("Fly"), wxT("Fly Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_EXAMINE, wxT("Examine"), wxT("Examine Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_PAN, wxT("Pan"), wxT("Pan Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_SLIDE, wxT("Slide"), wxT("Slide Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_ORBIT, wxT("Orbit"), wxT("Orbit Navigation"), wxITEM_CHECK);
+	smenu->Append(ID_NAVIGATE_GAME, wxT("Game"), wxT("Game Navigation"), wxITEM_CHECK);
+	smenu->AppendSeparator();
+	wxMenu *ssmenu = new wxMenu();
+	ssmenu->Append(ID_COLLIDE_NONE, wxT("None"), wxT("No Collision detection"), wxITEM_CHECK);
+	ssmenu->Append(ID_COLLIDE_REG, wxT("Regular"), wxT("Regular Collision detection"), wxITEM_CHECK);
+	ssmenu->Append(ID_COLLIDE_DISP, wxT("Displacement"), wxT("Collision detecion with camera displacement"), wxITEM_CHECK);
+	smenu->Append(0, wxT("&Collision"), ssmenu);
+	smenu->Append(ID_GRAVITY, wxT("Gravity"), wxT("Turns gravity on/off"), wxITEM_CHECK);
+	smenu->AppendSeparator();
+	smenu->Append(ID_NAVIGATE_RESET, wxT("Reset"), wxT("Reset Navigation"));
+
+	menu->Append(0, wxT("&Navigation"), smenu);
+	menu->AppendSeparator();
+	menu->Append(VIEW_FULLSCREEN, wxT("&Fullscreen"), wxT("Toggles Fullscreen"), wxITEM_CHECK);
+	menu->Append(VIEW_ORIGINAL, wxT("&Original Size"), wxT("Restore original size"));
+	smenu = new wxMenu();
+	smenu->Append(VIEW_AR_KEEP, wxT("Keep Original\tCtrl+1"), wxT("Keep original aspect ratio"), wxITEM_CHECK);
+	smenu->Append(VIEW_AR_FILL, wxT("Fill Screen\tCtrl+2"), wxT("Stretch presentation to fill screen"), wxITEM_CHECK);
+	smenu->Append(VIEW_AR_43, wxT("Ratio 4/3\tCtrl+3"), wxT("Force aspect ratio to 4/3"), wxITEM_CHECK);
+	smenu->Append(VIEW_AR_169, wxT("Ratio 16/9\tCtrl+4"), wxT("Force aspect ratio to 16/9"), wxITEM_CHECK);
+	menu->Append(0, wxT("&Aspect Ratio"), smenu);
+	smenu->Check(VIEW_AR_KEEP, 1);
+	menu->AppendSeparator();
+	menu->Append(VIEW_OPTIONS, wxT("&Options"), wxT("View Options"));
+	menu->AppendSeparator();
+	menu->Append(VIEW_RTI, wxT("&Resource Usage"), wxT("View Resource Usage"), wxITEM_CHECK);
+	menu->Append(VIEW_LOGS, wxT("&Logs"), wxT("View GPAC logs"));
+	b->Append(menu, wxT("&View"));
+
+	/*play*/
+	menu = new wxMenu();
+	sel_menu = new wxMenu();
+	sel_menu->Append(0, wxT("&Audio"), new wxMenu());
+	sel_menu->Append(0, wxT("&Video"), new wxMenu());
+	sel_menu->Append(0, wxT("&Subtitles"), new wxMenu());
+	sel_menu->AppendSeparator();
+	sel_menu->Append(ID_ADD_SUB, wxT("&Add Subtitle"), wxT("Adds subtitle"));
+	menu->Append(ID_STREAM_MENU, wxT("&Streams Selection"), sel_menu);
+	chap_menu = new wxMenu();
+	menu->Append(ID_CHAPTER_MENU, wxT("&Chapters"), chap_menu);
+
+	menu->AppendSeparator();
+	menu->Append(VIEW_PLAYLIST, wxT("&Playlist\tCtrl+L"), wxT("Show navigation history as playlist"), wxITEM_CHECK);
+	menu->Append(ID_CLEAR_NAV, wxT("&Clear History"), wxT("Clear navigation history"));
+	menu->AppendSeparator();
+	menu->Append(FILE_PLAY, wxT("&Play/Pause\tCtrl+P"), wxT("Play/Pause/Resume Presentation"));
+	menu->Append(FILE_STEP, wxT("&Step-by-Step\tCtrl+S"), wxT("Play/Pause/Resume Presentation"));
+	menu->Append(FILE_STOP, wxT("&Stop"), wxT("Stop Presentation"));
+	menu->AppendSeparator();
+	menu->Append(FILE_RELOAD_CONFIG, wxT("&Reload Config\tCtrl+R"), wxT("Reload Configuration File"));
+	menu->Append(FILE_RELOAD, wxT("&Reload File\tCtrl+R"), wxT("Reload Presentation"));
+	b->Append(menu, wxT("&Play"));
+
+	menu = new wxMenu();
+	menu->Append(APP_SHORTCUTS, wxT("&Shortcuts"), wxT("Show keyboard shortcuts"));
+	menu->Append(APP_NAV_KEYS, wxT("&Navigation Keys"), wxT("Show navigation keys"));
+	menu->AppendSeparator();
+	menu->Append(APP_ABOUT, wxT("&About"), wxT("Display information and copyright"));
+	b->Append(menu, wxT("&?"));
+
+	SetMenuBar(b);
+
+	m_pStatusbar = CreateStatusBar(1, 0, -1, wxT("statusBar"));
+	ws[0] = 60;
+	ws[1] = 70;
+	ws[2] = -1;
+	m_pStatusbar->SetFieldsCount(3, ws);
+
+	SetStatusBarPane(2);
+	wxColour foreCol = m_pStatusbar->GetBackgroundColour();
+	SetBackgroundColour(foreCol);
+
+
+	m_pTimer = new wxTimer();
+	m_pTimer->SetOwner(this, ID_CTRL_TIMER);
+	m_bGrabbed = 0;
+
+	/*create toolbar*/
+	m_pToolBar = CreateToolBar(wxTB_FLAT|wxTB_HORIZONTAL);
+	m_pOpenFile = new wxBitmap(tool_open_file);
+	m_pPrev = new wxBitmap(tool_prev);
+	m_pNext = new wxBitmap(tool_next);
+	m_pPlay = new wxBitmap(tool_play);
+	m_pPause = new wxBitmap(tool_pause);
+	m_pStep = new wxBitmap(tool_step);
+	m_pStop = new wxBitmap(tool_stop);
+	m_pInfo = new wxBitmap(tool_info);
+	m_pConfig = new wxBitmap(tool_config);
+	m_pSW2D = new wxBitmap(tool_sw_2d);
+	m_pSW3D = new wxBitmap(tool_sw_3d);
+
+	m_pToolBar->AddTool(GWX_FILE_OPEN, wxT(""), *m_pOpenFile, wxT("Open File"));
+	m_pToolBar->AddSeparator();
+	m_pPrevBut = new wxMenuButton(m_pToolBar, FILE_PREV, *m_pPrev);
+	m_pPrevBut->SetToolTip(wxT("Previous Location"));
+	m_pToolBar->AddControl(m_pPrevBut);
+	m_pNextBut = new wxMenuButton(m_pToolBar, FILE_NEXT, *m_pNext);
+	m_pNextBut->SetToolTip(wxT("Next Location"));
+	m_pToolBar->AddControl(m_pNextBut);
+
+	m_pToolBar->AddSeparator();
+	m_pToolBar->AddTool(FILE_PLAY, wxT(""), *m_pPlay, wxT("Play/Pause File"));
+	m_pToolBar->AddTool(FILE_STEP, wxT(""), *m_pStep, wxT("Step-by-Step Mode"));
+	m_pToolBar->AddTool(FILE_STOP, wxT(""), *m_pStop, wxT("Stop File"));
+	m_pToolBar->AddSeparator();
+	m_pToolBar->AddTool(FILE_PROPERTIES, wxT(""), *m_pInfo, wxT("Show File Information"));
+	m_pToolBar->AddSeparator();
+	m_pToolBar->AddTool(VIEW_OPTIONS, wxT(""), *m_pConfig, wxT("GPAC Configuration"));
+	m_pToolBar->AddTool(SWITCH_RENDER, wxT(""), *m_pSW3D, wxT("Switch 2D/3D Renderers"));
+
+	m_pToolBar->Realize();
+
+	m_Address = new wxMyComboBox(this, ID_ADDRESS, wxT(""), wxPoint(50, 0), wxSize(80, 20));
+	wxStaticText *add_text = new wxStaticText(this, -1, wxT("URL"), wxPoint(0, 0), wxSize(40, 20));
+	add_text->SetBackgroundColour(foreCol);
+
+	m_pAddBar = new wxBoxSizer(wxHORIZONTAL);
+	m_pAddBar->Add(add_text, 0, wxALIGN_TOP);
+	m_pAddBar->Add(m_Address, 2, wxALIGN_CENTER|wxEXPAND|wxADJUST_MINSIZE);
+	m_pAddBar->SetMinSize(80, 32);
+	m_pAddBar->Layout();
+
+	m_pProg = new wxSlider(this, ID_SLIDER, 0, 0, 1000, wxPoint(0, 22), wxSize(80, 22), wxSL_HORIZONTAL|wxSUNKEN_BORDER);
+	m_pProg->Enable(0);
+	m_pProg->Show();
+	m_pProg->SetBackgroundColour(foreCol);
+
+	m_pView = new wxWindow(this, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
+	m_pView->SetBackgroundColour(wxColour(wxT("BLACK")));
+#ifdef __WXGTK__
+	m_pVisual = new wxWindow(m_pView, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
+	m_pVisual->SetBackgroundColour(wxColour(wxT("BLACK")));
+#endif
+
+	m_pPlayList = new wxPlaylist(this);
+	m_pPlayList->SetIcon(wxIcon(osmo4));
+	m_pPlayList->Hide();
+	Raise();
+	Show();
+
+	m_connected = 0;
+	if (!LoadTerminal()) {
+		Close(TRUE);
+		return;
+	}
+
+
+
+	if (m_bExternalView) SetWindowStyle(wxDEFAULT_FRAME_STYLE & ~(wxMAXIMIZE_BOX | wxRESIZE_BORDER));
+	DoLayout(320, 240);
+	UpdateRenderSwitch();
+
+	const char *sOpt = gf_cfg_get_key(m_user.config, "General", "ConsoleOff");
+	m_console_off = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "Loop");
+	m_loop = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	sOpt = gf_cfg_get_key(m_user.config, "General", "LookForSubtitles");
+	m_lookforsubs = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
+	gf_term_set_option(m_term, GF_OPT_AUDIO_VOLUME, 100);
+
+	ReloadURLs();
+	Raise();
+	m_pStatusbar->SetStatusText(wxT("Ready"), 2);
+	m_LastStatusTime = 0;
+
+	m_pPrevBut->Refresh();
+	m_pNextBut->Refresh();
+
+	wxOsmo4App &app = wxGetApp();
+	if (app.argc>1) {
+		m_pPlayList->QueueURL(wxString(app.argv[1]));
+		m_pPlayList->RefreshList();
+		m_pPlayList->PlayNext();
+	} else {
+		char sPL[GF_MAX_PATH];
+		strcpy((char *) sPL, szAppPath);
+#ifdef WIN32
+		strcat(sPL, "gpac_pl.m3u");
+#else
+		strcat(sPL, ".gpac_pl.m3u");
+#endif
+		m_pPlayList->OpenPlaylist(wxString(sPL, wxConvUTF8) );
+		const char *sOpt = gf_cfg_get_key(m_user.config, "General", "PLEntry");
+		if (sOpt) {
+			m_pPlayList->m_cur_entry = atoi(sOpt);
+			if (m_pPlayList->m_cur_entry>=(s32)gf_list_count(m_pPlayList->m_entries))
+				m_pPlayList->m_cur_entry = -1;
+		}
+
+		sOpt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+		if (sOpt) {
+			gf_term_connect(m_term, sOpt);
+			m_bStartupFile = 1;
+		}
+	}
+
+	sOpt = gf_cfg_get_key(m_user.config, "core", "audio-output");
+
+	if (!strcmp(sOpt, "No Audio Output Available")) {
+		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
+		SetStatus(wxT("No audio ouput available"));
+
+	} else {
+		SetStatus(wxT("Ready"));
+	}
+}
+
+wxOsmo4Frame::~wxOsmo4Frame()
+{
+	vp_list = NULL;
+	sel_menu = NULL;
+
+	if (m_user.modules) gf_modules_del(m_user.modules);
+	gf_sys_close();
+	if (m_user.config) gf_cfg_del(m_user.config);
+
+	if (m_chapters_start) gf_free(m_chapters_start);
+	if (m_pView) delete m_pView;
+
+	//m_pToolBar->RemoveTool(FILE_PREV);
+	//m_pToolBar->RemoveTool(FILE_NEXT);
+
+	delete m_pPrevBut;
+	delete m_pNextBut;
+	delete m_pPlayList;
+	delete m_pTimer;
+	delete m_pOpenFile;
+	delete m_pPrev;
+	delete m_pNext;
+	delete m_pPlay;
+	delete m_pPause;
+	delete m_pStep;
+	delete m_pStop;
+	delete m_pInfo;
+	delete m_pConfig;
+	delete m_pSW2D;
+	delete m_pSW3D;
+}
+
+
+BEGIN_EVENT_TABLE(wxOsmo4Frame, wxFrame)
+	EVT_CLOSE(wxOsmo4Frame::OnCloseApp)
+	EVT_MENU(GWX_FILE_OPEN, wxOsmo4Frame::OnFileOpen)
+	EVT_MENU(GWX_FILE_OPEN_URL, wxOsmo4Frame::OnFileOpenURL)
+	EVT_MENU(FILE_RELOAD_CONFIG, wxOsmo4Frame::OnFileReloadConfig)
+	EVT_MENU(FILE_RELOAD, wxOsmo4Frame::OnFileReload)
+	EVT_MENU(FILE_PROPERTIES, wxOsmo4Frame::OnFileProperties)
+	EVT_MENU(FILE_QUIT, wxOsmo4Frame::OnFileQuit)
+	EVT_MENU(VIEW_FULLSCREEN, wxOsmo4Frame::OnFullScreen)
+	EVT_MENU(VIEW_OPTIONS, wxOsmo4Frame::OnOptions)
+	EVT_MENU(VIEW_AR_KEEP, wxOsmo4Frame::OnViewARKeep)
+	EVT_MENU(VIEW_AR_FILL, wxOsmo4Frame::OnViewARFill)
+	EVT_MENU(VIEW_AR_169, wxOsmo4Frame::OnViewAR169)
+	EVT_MENU(VIEW_AR_43, wxOsmo4Frame::OnViewAR43)
+	EVT_MENU(VIEW_ORIGINAL, wxOsmo4Frame::OnViewOriginal)
+	EVT_MENU(VIEW_PLAYLIST, wxOsmo4Frame::OnPlaylist)
+	EVT_UPDATE_UI(VIEW_PLAYLIST, wxOsmo4Frame::OnUpdatePlayList)
+	EVT_MENU(FILE_COPY, wxOsmo4Frame::OnFileCopy)
+	EVT_UPDATE_UI(FILE_COPY, wxOsmo4Frame::OnUpdateFileCopy)
+	EVT_MENU(FILE_PASTE, wxOsmo4Frame::OnFilePaste)
+	EVT_UPDATE_UI(FILE_PASTE, wxOsmo4Frame::OnUpdateFilePaste)
+
+	EVT_MENU(ID_CLEAR_NAV, wxOsmo4Frame::OnClearNav)
+	EVT_UPDATE_UI(ID_STREAM_MENU, wxOsmo4Frame::OnUpdateStreamMenu)
+	EVT_UPDATE_UI(ID_CHAPTER_MENU, wxOsmo4Frame::OnUpdateChapterMenu)
+	EVT_MENU(ID_ADD_SUB, wxOsmo4Frame::OnAddSub)
+
+	EVT_MENU(ID_MCACHE_ENABLE, wxOsmo4Frame::OnCacheEnable)
+	EVT_UPDATE_UI(ID_MCACHE_ENABLE, wxOsmo4Frame::OnUpdateCacheEnable)
+	EVT_MENU(ID_MCACHE_STOP, wxOsmo4Frame::OnCacheStop)
+	EVT_MENU(ID_MCACHE_ABORT, wxOsmo4Frame::OnCacheAbort)
+	EVT_UPDATE_UI(ID_MCACHE_STOP, wxOsmo4Frame::OnUpdateCacheAbort)
+	EVT_UPDATE_UI(ID_MCACHE_ABORT, wxOsmo4Frame::OnUpdateCacheAbort)
+
+
+	EVT_MENU(APP_SHORTCUTS, wxOsmo4Frame::OnShortcuts)
+	EVT_MENU(APP_NAV_KEYS, wxOsmo4Frame::OnNavInfo)
+	EVT_MENU(APP_ABOUT, wxOsmo4Frame::OnAbout)
+	EVT_GPACEVENT(wxOsmo4Frame::OnGPACEvent)
+	EVT_TIMER(ID_CTRL_TIMER, wxOsmo4Frame::OnTimer)
+	EVT_COMMAND_SCROLL(ID_SLIDER, wxOsmo4Frame::OnSlide)
+	EVT_MENU(VIEW_LOGS, wxOsmo4Frame::OnLogs)
+	EVT_MENU(VIEW_RTI, wxOsmo4Frame::OnRTI)
+
+	EVT_MENUBUTTON_OPEN(FILE_PREV, wxOsmo4Frame::OnFilePrevOpen)
+	EVT_MENUBUTTON_OPEN(FILE_NEXT, wxOsmo4Frame::OnFileNextOpen)
+	EVT_MENU(FILE_PREV, wxOsmo4Frame::OnNavPrev)
+	EVT_UPDATE_UI(FILE_PREV, wxOsmo4Frame::OnUpdateNavPrev)
+	EVT_MENU_RANGE(ID_NAV_PREV_0, ID_NAV_PREV_9, wxOsmo4Frame::OnNavPrevMenu)
+	EVT_MENU(FILE_NEXT, wxOsmo4Frame::OnNavNext)
+	EVT_UPDATE_UI(FILE_NEXT, wxOsmo4Frame::OnUpdateNavNext)
+	EVT_MENU_RANGE(ID_NAV_NEXT_0, ID_NAV_NEXT_9, wxOsmo4Frame::OnNavNextMenu)
+
+	EVT_TOOL(FILE_PLAY, wxOsmo4Frame::OnFilePlay)
+	EVT_TOOL(FILE_STEP, wxOsmo4Frame::OnFileStep)
+	EVT_TOOL(FILE_STOP, wxOsmo4Frame::OnFileStop)
+	EVT_TOOL(SWITCH_RENDER, wxOsmo4Frame::OnRenderSwitch)
+
+	EVT_COMBOBOX(ID_ADDRESS, wxOsmo4Frame::OnURLSelect)
+
+	EVT_MENU_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnStreamSel)
+	EVT_UPDATE_UI_RANGE(ID_SELSTREAM_0, ID_SELSTREAM_9, wxOsmo4Frame::OnUpdateStreamSel)
+
+	EVT_MENU_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnChapterSel)
+	EVT_UPDATE_UI_RANGE(ID_SETCHAP_FIRST, ID_SETCHAP_LAST, wxOsmo4Frame::OnUpdateChapterSel)
+
+	EVT_MENU_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnViewport)
+	EVT_UPDATE_UI_RANGE(ID_VIEWPOINT_FIRST, ID_VIEWPOINT_LAST, wxOsmo4Frame::OnUpdateViewport)
+
+	EVT_MENU_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnNavigate)
+	EVT_UPDATE_UI_RANGE(ID_NAVIGATE_NONE, ID_NAVIGATE_GAME, wxOsmo4Frame::OnUpdateNavigation)
+	EVT_MENU(ID_NAVIGATE_RESET, wxOsmo4Frame::OnNavigateReset)
+
+	EVT_MENU_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnCollide)
+	EVT_UPDATE_UI_RANGE(ID_COLLIDE_NONE, ID_COLLIDE_DISP, wxOsmo4Frame::OnUpdateCollide)
+
+	EVT_MENU(ID_HEADLIGHT, wxOsmo4Frame::OnHeadlight)
+	EVT_UPDATE_UI(ID_HEADLIGHT, wxOsmo4Frame::OnUpdateHeadlight)
+	EVT_MENU(ID_GRAVITY, wxOsmo4Frame::OnGravity)
+	EVT_UPDATE_UI(ID_GRAVITY, wxOsmo4Frame::OnUpdateGravity)
+
+	EVT_UPDATE_UI(FILE_PROPERTIES, wxOsmo4Frame::OnUpdateNeedsConnect)
+	EVT_UPDATE_UI(FILE_RELOAD, wxOsmo4Frame::OnUpdateNeedsConnect)
+	EVT_UPDATE_UI(FILE_PLAY, wxOsmo4Frame::OnUpdatePlay)
+	EVT_UPDATE_UI(FILE_STOP, wxOsmo4Frame::OnUpdateNeedsConnect)
+	EVT_UPDATE_UI(FILE_STEP, wxOsmo4Frame::OnUpdateNeedsConnect)
+	EVT_UPDATE_UI(VIEW_ORIGINAL, wxOsmo4Frame::OnUpdateNeedsConnect)
+	EVT_UPDATE_UI(VIEW_FULLSCREEN, wxOsmo4Frame::OnUpdateFullScreen)
+	EVT_UPDATE_UI(VIEW_AR_KEEP, wxOsmo4Frame::OnUpdateAR)
+	EVT_UPDATE_UI(VIEW_AR_FILL, wxOsmo4Frame::OnUpdateAR)
+	EVT_UPDATE_UI(VIEW_AR_169, wxOsmo4Frame::OnUpdateAR)
+	EVT_UPDATE_UI(VIEW_AR_43, wxOsmo4Frame::OnUpdateAR)
+
+	EVT_SIZE(wxOsmo4Frame::OnSize)
+END_EVENT_TABLE()
+
+void wxOsmo4Frame::DoLayout(u32 v_width, u32 v_height)
+{
+	wxPoint pos;
+	if (!m_Address || !m_pProg) return;
+
+	int t_h = m_pToolBar->GetSize().y;
+	int a_h = m_pAddBar->GetSize().y;
+	int p_h = m_pProg->GetSize().y;
+
+	if (m_bExternalView) {
+		if (v_width && v_height) {
+			m_orig_width = v_width;
+			m_orig_height = v_height;
+		}
+		SetClientSize(320, a_h+p_h+t_h);
+		m_pAddBar->SetDimension(0,0, 320, a_h);
+		m_pProg->SetSize(0, t_h+a_h, 320, p_h, 0);
+		return;
+	}
+
+	if (v_width && v_height) {
+		m_orig_width = v_width;
+		m_orig_height = v_height;
+		v_height += a_h + p_h + t_h;
+		SetClientSize(v_width, v_height);
+		m_pView->SetSize(0, a_h+t_h, v_width, v_height, 0);
+		m_pAddBar->SetDimension(0, t_h, v_width, a_h);
+		m_pProg->SetSize(0, v_height - p_h, v_width, p_h, 0);
+	}
+	wxSize s = GetClientSize();
+	s.y -= a_h + p_h + t_h;
+	if (m_pView) {
+		m_pView->SetSize(0, a_h+t_h, s.x, s.y, 0);
+		m_pAddBar->SetDimension(0, 0, s.x, a_h);
+		m_pAddBar->SetDimension(0, 0, s.x, a_h);
+		m_pAddBar->Layout();
+		m_pProg->SetSize(0, s.y+t_h+a_h, s.x, p_h, 0);
+		if (m_term) gf_term_set_size(m_term, s.x, s.y);
+	}
+}
+
+void wxOsmo4Frame::OnSize(wxSizeEvent &event)
+{
+	DoLayout();
+}
+
+void wxOsmo4Frame::OnCloseApp(wxCloseEvent &WXUNUSED(event))
+{
+	if (m_term) gf_term_del(m_term);
+	m_term = NULL;
+	Destroy();
+}
+
+
+wxString wxOsmo4Frame::GetFileFilter()
+{
+	u32 keyCount, i;
+	wxString sFiles, sSupportedFiles, sExts;
+
+	/*force MP4 and 3GP files at beginning to make sure they are selected (Win32 bug with too large filters)*/
+	sSupportedFiles = wxT("All Known Files|*.m3u;*.pls;*.mp4;*.3gp;*.3g2");
+	sExts = wxT("");
+	sFiles = wxT("");
+	keyCount = gf_cfg_get_key_count(m_user.config, "MimeTypes");
+	for (i=0; i<keyCount; i++) {
+		Bool first = 1;
+		const char *sMime;
+		char *sKey;
+		const char *opt;
+		char szKeyList[1000], sDesc[1000];
+		sMime = gf_cfg_get_key_name(m_user.config, "MimeTypes", i);
+		if (!sMime) continue;
+		opt = gf_cfg_get_key(m_user.config, "MimeTypes", sMime);
+		/*remove module name*/
+		strcpy(szKeyList, opt+1);
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+		/*get description*/
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		strcpy(sDesc, sKey+1);
+		sKey[0] = 0;
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+
+		/*if same description for # mime types skip (means an old mime syntax)*/
+		if (sFiles.Find(wxString(sDesc, wxConvUTF8) )>=0) continue;
+		/*if same extensions for # mime types skip (don't polluate the file list)*/
+		if (sExts.Find(wxString(szKeyList, wxConvUTF8) )>=0) continue;
+
+		sExts += wxString(szKeyList, wxConvUTF8);
+		sExts += wxT(" ");
+		sFiles += wxString(sDesc, wxConvUTF8);
+		sFiles += wxT("|");
+
+		wxString sOpt = wxString(szKeyList, wxConvUTF8);
+		while (1) {
+			wxString ext = sOpt.BeforeFirst(' ');
+			if (ext.Find('.')<0) {
+				if (first) first = 0;
+				else sFiles += wxT(";");
+				sFiles += wxT("*.");
+				sFiles += ext;
+				wxString sext = ext;
+				sext += wxT(";");
+				if (sSupportedFiles.Find(sext)<0) {
+					sSupportedFiles  += wxT(";*.");
+					sSupportedFiles += ext;
+				}
+			}
+			if (sOpt==ext) break;
+			wxString rem = ext + wxT(" ");
+			sOpt.Replace(rem, wxT(""), TRUE);
+		}
+		sFiles += wxT("|");
+	}
+	sSupportedFiles += wxT("|");
+	sSupportedFiles += sFiles;
+	sSupportedFiles += wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|All Files|*.*||");
+	return sSupportedFiles;
+}
+
+void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
+{
+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
+
+	if (dlg.ShowModal() != wxID_OK) return;
+
+	wxArrayString stra;
+	dlg.GetPaths(stra);
+	if (stra.GetCount() == 1) {
+		m_pPlayList->Truncate();
+	} else {
+		m_pPlayList->Clear();
+	}
+	for (u32 i=0; i<stra.GetCount(); i++)
+		m_pPlayList->QueueURL(stra[i]);
+
+	m_pPlayList->RefreshList();
+	m_pPlayList->PlayNext();
+}
+
+void wxOsmo4Frame::OnFileOpenURL(wxCommandEvent & WXUNUSED(event))
+{
+	OpenURLDlg dlg(this, m_user.config);
+	if (dlg.ShowModal()==wxID_OK) {
+		m_pPlayList->Truncate();
+		m_pPlayList->QueueURL(dlg.m_urlVal);
+		m_pPlayList->RefreshList();
+		m_pPlayList->PlayNext();
+	}
+}
+
+void wxOsmo4Frame::OnFileProperties(wxCommandEvent & WXUNUSED(event))
+{
+	wxFileProps dlg(this);
+	dlg.SetIcon(wxIcon(osmo4));
+	dlg.ShowModal();
+}
+
+void wxOsmo4Frame::OnFileReload(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_disconnect(m_term);
+	m_connected = 0;
+	DoConnect();
+}
+
+void wxOsmo4Frame::OnFileReloadConfig(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_RELOAD_CONFIG, 1);
+}
+
+void wxOsmo4Frame::OnFileQuit(wxCommandEvent & WXUNUSED(event))
+{
+	Close(FALSE);
+}
+
+void wxOsmo4Frame::OnViewOriginal(wxCommandEvent & WXUNUSED(event))
+{
+	if (!m_bExternalView) {
+		DoLayout(m_orig_width, m_orig_height);
+	} else {
+		gf_term_set_option(m_term, GF_OPT_ORIGINAL_VIEW, 1);
+	}
+}
+
+void wxOsmo4Frame::OnOptions(wxCommandEvent & WXUNUSED(event))
+{
+	wxGPACControl dlg(this);
+	dlg.SetIcon(wxIcon(osmo4));
+	dlg.ShowModal();
+}
+
+void wxOsmo4Frame::DoConnect()
+{
+	//if (m_connected) { gf_term_disconnect(m_term); m_connected = 0; }
+
+	wxString url = m_pPlayList->GetURL();
+	m_Address->SetValue(url);
+#ifdef __WXGTK__
+	m_pVisual->SetFocus();
+#else
+	m_pView->SetFocus();
+#endif
+	wxString txt = wxT("Osmo4 - ");
+	txt += m_pPlayList->GetDisplayName();
+	SetTitle(txt);
+	m_bStartupFile = 0;
+	gf_term_connect(m_term, url.mb_str(wxConvUTF8));
+}
+
+void wxOsmo4Frame::OnLogs(wxCommandEvent & WXUNUSED(event))
+{
+	m_pLogs->Show();
+}
+
+void wxOsmo4Frame::OnUpdateNeedsConnect(wxUpdateUIEvent &event)
+{
+	event.Enable(m_connected ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnUpdatePlay(wxUpdateUIEvent &event)
+{
+	event.Enable( (m_connected || m_pPlayList->HasValidEntries()) ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnUpdateFullScreen(wxUpdateUIEvent &event)
+{
+	if (m_connected) {
+		event.Enable(1);
+		event.Check(gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0);
+	} else {
+		event.Enable(0);
+	}
+}
+
+void wxOsmo4Frame::OnFullScreen(wxCommandEvent & WXUNUSED(event))
+{
+	Bool isFS = gf_term_get_option(m_term, GF_OPT_FULLSCREEN) ? 1 : 0;
+	gf_term_set_option(m_term, GF_OPT_FULLSCREEN, isFS ? 0 : 1);
+}
+
+void wxOsmo4Frame::OnViewARKeep(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
+}
+void wxOsmo4Frame::OnViewARFill(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
+}
+void wxOsmo4Frame::OnViewAR169(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
+}
+void wxOsmo4Frame::OnViewAR43(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
+}
+
+void wxOsmo4Frame::OnUpdateAR(wxUpdateUIEvent &event)
+{
+	if (!m_connected) {
+		event.Enable(0);
+		return;
+	}
+	event.Enable(1);
+	u32 val = gf_term_get_option(m_term, GF_OPT_ASPECT_RATIO);
+	if ((event.GetId() == VIEW_AR_FILL) && (val==GF_ASPECT_RATIO_FILL_SCREEN))
+		event.Check(1);
+	else if ((event.GetId() == VIEW_AR_KEEP) && (val==GF_ASPECT_RATIO_KEEP))
+		event.Check(1);
+	else if ((event.GetId() == VIEW_AR_169) && (val==GF_ASPECT_RATIO_16_9))
+		event.Check(1);
+	else if ((event.GetId() == VIEW_AR_43) && (val==GF_ASPECT_RATIO_4_3))
+		event.Check(1);
+	else event.Check(0);
+}
+
+void wxOsmo4Frame::OnShortcuts(wxCommandEvent & WXUNUSED(event))
+{
+	wxMessageDialog dlg(this,
+	                    wxT("Shortcuts with focus on main frame:\n")
+	                    wxT("Open File: Ctrl + O\n")
+	                    wxT("Show File Information: Ctrl + I\n")
+	                    wxT("Reload File: Ctrl + R\n")
+	                    wxT("Pause/Resume File: Ctrl + P\n")
+	                    wxT("Step by Step: Ctrl + S\n")
+	                    wxT("Fullscreen On/Off: Alt + Return\n")
+	                    wxT("View Playlist: Ctrl + L\n")
+	                    wxT("Aspect Ratio Normal: Ctrl + 1\n")
+	                    wxT("Aspect Ratio Fill: Ctrl + 2\n")
+	                    wxT("Aspect Ratio 4/3: Ctrl + 3\n")
+	                    wxT("Aspect Ratio 16/9: Ctrl + 4\n")
+	                    wxT("\n")
+	                    wxT("Shortcuts with focus on video frame:\n")
+	                    wxT("Seek +5% into presentation: Alt + right arrow\n")
+	                    wxT("Seek -5% into presentation: Alt + left arrow\n")
+	                    wxT("Seek +1min into presentation: Alt + up arrow\n")
+	                    wxT("Seek -1min into presentation: Alt + down arrow\n")
+	                    wxT("Next Playlist Entry: Ctrl + right arrow\n")
+	                    wxT("Prev Playlist Entry: Ctrl + left arrow\n")
+
+	                    , wxT("Shortcuts Available on Osmo4")
+	                    , wxOK);
+
+	dlg.ShowModal();
+}
+
+void wxOsmo4Frame::OnNavInfo(wxCommandEvent & WXUNUSED(event))
+{
+	wxMessageDialog dlg(this,
+	                    wxT("* Walk & Fly modes:\n")
+	                    wxT("\tH move: H pan - V move: Z-translate - V move+CTRL or Wheel: V pan - Right Click (Walk only): Jump\n")
+	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: Z-translate - up/down+CTRL: V pan\n")
+	                    wxT("* Pan mode:\n")
+	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Z-translate\n")
+	                    wxT("\tleft/right: H pan - left/right+CTRL: H translate - up/down: V pan - up/down+CTRL: Z-translate\n")
+	                    wxT("* Slide mode:\n")
+	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL or Wheel: Z-translate\n")
+	                    wxT("\tleft/right: H translate - left/right+CTRL: H pan - up/down: V translate - up/down+CTRL: Z-translate\n")
+	                    wxT("* Examine & Orbit mode:\n")
+	                    wxT("\tH move: Y-Axis rotate - H move+CTRL: No move - V move: X-Axis rotate - V move+CTRL or Wheel: Z-translate\n")
+	                    wxT("\tleft/right: Y-Axis rotate - left/right+CTRL: H translate - up/down: X-Axis rotate - up/down+CTRL: Y-translate\n")
+	                    wxT("* VR mode:\n")
+	                    wxT("\tH move: H pan - V move: V pan - V move+CTRL or Wheel: Camera Zoom\n")
+	                    wxT("\tleft/right: H pan - up/down: V pan - up/down+CTRL: Camera Zoom\n")
+	                    wxT("* Game mode (press END to escape):\n")
+	                    wxT("\tH move: H pan - V move: V pan\n")
+	                    wxT("\tleft/right: H translate - up/down: Z-translate\n")
+	                    wxT("\n")
+	                    wxT("* All 3D modes: CTRL+PGUP/PGDOWN will zoom in/out camera (field of view) \n")
+	                    wxT("\n")
+	                    wxT("*Slide Mode in 2D:\n")
+	                    wxT("\tH move: H translate - V move: V translate - V move+CTRL: zoom\n")
+	                    wxT("\tleft/right: H translate - up/down: V translate - up/down+CTRL: zoom\n")
+	                    wxT("*Examine Mode in 2D (3D renderer only):\n")
+	                    wxT("\tH move: Y-Axis rotate - V move: X-Axis rotate\n")
+	                    wxT("\tleft/right: Y-Axis rotate - up/down: X-Axis rotate\n")
+	                    wxT("\n")
+	                    wxT("HOME: reset navigation to last viewpoint (2D or 3D navigation)\n")
+	                    wxT("SHIFT key in all modes: fast movement\n")
+
+	                    , wxT("3D navigation keys (\'H\'orizontal and \'V\'ertical) used in GPAC")
+	                    , wxOK );
+	dlg.ShowModal();
+}
+
+
+/*open file dlg*/
+class AboutDlg : public wxDialog {
+public:
+	AboutDlg(wxWindow *parent);
+
+private:
+	wxStaticText *m_info;
+	wxButton *m_close;
+	void OnClose(wxCommandEvent& event);
+	DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(AboutDlg, wxDialog)
+	EVT_BUTTON(ID_ABOUT_CLOSE, AboutDlg::OnClose)
+END_EVENT_TABLE()
+
+AboutDlg::AboutDlg(wxWindow *parent)
+	: wxDialog(parent, -1, wxString(wxT("GPAC/Osmo4 V ")wxT(GPAC_FULL_VERSION)))
+{
+	SetSize(220, 320);
+	Centre();
+	wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+
+	m_info = new wxStaticText(this, -1, wxT("http://gpac.io"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE);
+	sizer->Add(m_info, 1, wxEXPAND|wxADJUST_MINSIZE, 0);
+	m_close = new wxButton(this, ID_ABOUT_CLOSE, wxT("Close"), wxDefaultPosition, wxSize(120, 20));
+	sizer->Add(m_close, 0, wxEXPAND, 0);
+
+	SetIcon(wxIcon(osmo4));
+	m_info->SetLabel(
+	    wxT("Osmo4 Player\n")
+	    wxT("GPAC Multimedia Framework\n")
+	    wxT("\n")
+	    wxT("This program is gf_free software and may\n")
+	    wxT("be distributed according to the terms\n")
+	    wxT("of the GNU Lesser General Public License\n")
+	    wxT("\n")
+	    wxT("Authors: Jean Le Feuvre\n")
+	    wxT("(c) Telecom ParisTech 2005-2012\n")
+	    wxT("All Rights Reserved\n")
+	    wxT("http://gpac.io\n")
+	    wxT("\n")
+	    wxT(" ** With Many Thanks To ** \n\n")
+	    wxT("Mozilla SpiderMonkey (JavaScript)\n")
+	    wxT("The FreeType Project\n")
+	    wxT("The PNG Group, The I.J.G.\n")
+	    wxT("FFMPEG, FAAD, XVID, MAD\n")
+	);
+
+	SetSizer(sizer);
+	sizer->Fit(this);
+}
+void AboutDlg::OnClose(wxCommandEvent& WXUNUSED(event))
+{
+	Close(FALSE);
+}
+
+void wxOsmo4Frame::OnAbout(wxCommandEvent & WXUNUSED(event))
+{
+	AboutDlg dlg(this);
+	dlg.ShowModal();
+}
+
+
+void wxOsmo4Frame::OnGPACEvent(wxGPACEvent &event)
+{
+	wxString cmd;
+	wxCommandEvent evt;
+	if (!m_term) return;
+
+	switch (event.gpac_evt.type) {
+	case GF_EVENT_NAVIGATE:
+		if (gf_term_is_supported_url(m_term, event.to_url.mb_str(wxConvUTF8), 1, 0)) {
+			char *str = gf_url_concatenate(m_pPlayList->GetURL().mb_str(wxConvUTF8), event.to_url.mb_str(wxConvUTF8));
+			if (str) {
+				m_pPlayList->Truncate();
+				m_pPlayList->QueueURL(wxString(str, wxConvUTF8));
+				m_pPlayList->RefreshList();
+				gf_free(str);
+				m_pPlayList->PlayNext();
+			}
+			return;
+		}
+		cmd = get_pref_browser(m_user.config);
+		if (cmd.IsEmpty()) {
+			cmd += wxT(" ");
+			cmd += event.to_url;
+			wxExecute(cmd);
+		} else {
+#ifdef wxLaunchDefaultBrowser
+			wxLaunchDefaultBrowser(event.to_url);
+#endif
+		}
+		break;
+	case GF_EVENT_QUIT:
+		Close(TRUE);
+		break;
+	case GF_EVENT_SET_CAPTION:
+		SetTitle(event.to_url);
+		break;
+	case GF_EVENT_CONNECT:
+		BuildStreamList(0);
+		ConnectAcknowledged(event.gpac_evt.connect.is_connected);
+		break;
+	case GF_EVENT_KEYDOWN:
+		if (!(event.gpac_evt.key.flags & GF_KEY_MOD_CTRL)) return;
+		switch (event.gpac_evt.key.key_code) {
+		case GF_KEY_R:
+			gf_term_set_option(m_term, GF_OPT_REFRESH, 1);
+			break;
+		case GF_KEY_P:
+			OnFilePlay(evt);
+			break;
+		case GF_KEY_S:
+			OnFileStep(evt);
+			break;
+		}
+		break;
+	case GF_EVENT_SCENE_SIZE:
+		m_orig_width = event.gpac_evt.size.width;
+		m_orig_height = event.gpac_evt.size.height;
+	case GF_EVENT_SIZE:
+		if (! gf_term_get_option(m_term, GF_OPT_FULLSCREEN)) {
+			DoLayout(event.gpac_evt.size.width, event.gpac_evt.size.height);
+		}
+		break;
+	case GF_EVENT_VIEWPOINTS:
+		BuildViewList();
+		break;
+	case GF_EVENT_STREAMLIST:
+		BuildStreamList(0);
+		break;
+	}
+}
+
+
+static wxString format_time(u32 duration, u32 timescale)
+{
+	u32 h, m, s;
+	Float time = duration;
+	time /= timescale;
+	time *= 1000;
+	h = (u32) (time / 1000 / 3600);
+	m = (u32) (time / 1000 / 60 - h*60);
+	s = (u32) (time / 1000 - h*3600 - m*60);
+	return wxString::Format(wxT("%02d:%02d:%02d"), h, m, s);
+}
+
+void wxOsmo4Frame::SetStatus(wxString str)
+{
+	//m_pStatusbar->SetStatusText(str, 2);
+	m_LastStatusTime = gf_sys_clock();
+}
+
+#define RTI_REFRESH_MS		500
+void wxOsmo4Frame::OnRTI(wxCommandEvent & event)
+{
+	m_bViewRTI = event.IsChecked();
+	if (m_bViewRTI) {
+		if (!m_pTimer->IsRunning()) m_pTimer->Start(RTI_REFRESH_MS, 0);
+	} else if (!m_connected && m_pTimer->IsRunning()) {
+		m_LastStatusTime = 0;
+		m_pStatusbar->SetStatusText(wxT("Ready"), 2);
+		m_pTimer->Stop();
+	}
+}
+
+void wxOsmo4Frame::OnTimer(wxTimerEvent& WXUNUSED(event))
+{
+	wxString str;
+	u32 now;
+	if (m_LastStatusTime) {
+		now = gf_sys_clock();
+		if (now > 1000+m_LastStatusTime) {
+			m_LastStatusTime = 0;
+			m_pStatusbar->SetStatusText(wxT("Ready"), 2);
+		}
+	}
+
+	if (m_bViewRTI) {
+		GF_SystemRTInfo rti;
+		if (!gf_sys_get_rti(RTI_REFRESH_MS, &rti, 0)) return;
+		if (rti.gpac_memory) rti.process_memory = rti.gpac_memory;
+
+		str = wxString::Format(wxT("CPU %02d (%02d) - Mem %d kB" ),
+		                       rti.total_cpu_usage, rti.process_cpu_usage, rti.gpac_memory/1024);
+
+		m_pStatusbar->SetStatusText(str, 2);
+	}
+	if (!m_connected) return;
+
+	now = gf_term_get_time_in_ms(m_term);
+	if (!now) return;
+
+	if (!m_duration) {
+		str = format_time(now, 1000);
+		m_pStatusbar->SetStatusText(str);
+		str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
+		m_pStatusbar->SetStatusText(str, 1);
+		return;
+	}
+#ifdef __WXGTK__
+	if (m_bGrabbed) {
+		u32 now = gf_sys_clock() - m_last_grab_time;
+		if (now>200) {
+			m_bGrabbed = 0;
+			Double res = (Double) m_last_grab_pos;
+			res /= 1000;
+			res *= m_duration;
+			if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
+				gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+				m_bToReset = 0;
+			}
+			gf_term_play_from_time(m_term, (u32) res, 0);
+			return;
+		}
+	}
+#endif
+
+	if (!m_bGrabbed) {
+		if ((now >= m_duration + 500) && gf_term_get_option(m_term, GF_OPT_IS_FINISHED)) {
+			m_pPlayList->PlayNext();
+		} else {
+			Double val = now * 1000;
+			val /= m_duration;
+			m_pProg->SetValue((val<=1000) ? (u32) val : 1000);
+
+			if (0) {
+				str = format_time(m_duration-now, 1000);
+			} else {
+				str = format_time(now, 1000);
+			}
+			m_pStatusbar->SetStatusText(str);
+			str = wxString::Format(wxT("FPS %.2f"), gf_term_get_framerate(m_term, 0));
+			m_pStatusbar->SetStatusText(str, 1);
+		}
+	}
+}
+
+void wxOsmo4Frame::ConnectAcknowledged(Bool bOk)
+{
+	if (bOk) {
+		m_pTimer->Start(RTI_REFRESH_MS, 0);
+		m_connected = 1;
+		m_bToReset = 0;
+		UpdatePlay();
+		BuildChapterList(0);
+	} else {
+		BuildChapterList(1);
+		if (!m_connected) {
+			UpdatePlay();
+			m_pTimer->Stop();
+			//m_pProg->Enable(0);
+		}
+	}
+}
+
+void wxOsmo4Frame::OnFilePlay(wxCommandEvent & WXUNUSED(event))
+{
+	wxCommandEvent evt;
+	if (m_connected) {
+		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+			if (m_bToReset) {
+				m_pTimer->Start(100, 0);
+				gf_term_play_from_time(m_term, 0, 0);
+			}
+			m_bToReset = 0;
+			UpdatePlay();
+		} else {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+			UpdatePlay();
+		}
+	} else {
+		m_pPlayList->Play();
+	}
+}
+
+void wxOsmo4Frame::OnFileStep(wxCommandEvent & WXUNUSED(event))
+{
+	wxCommandEvent evt;
+	gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+	UpdatePlay();
+}
+
+void wxOsmo4Frame::OnFileStop(wxCommandEvent &WXUNUSED(event))
+{
+	Stop();
+}
+
+void wxOsmo4Frame::Stop()
+{
+	if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+		gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+	}
+	m_bToReset = 1;
+	m_pTimer->Stop();
+	m_pProg->SetValue(0);
+	UpdatePlay();
+}
+
+void wxOsmo4Frame::OnSlide(wxScrollEvent &event)
+{
+	if (!m_duration) return;
+
+	/*wxSlider on GTK is buggy, so track a release timeout*/
+#ifdef __WXGTK__
+	m_last_grab_time = gf_sys_clock();
+	m_bGrabbed = 1;
+	m_last_grab_pos = event.GetPosition();
+	Double now = (Double) m_last_grab_pos;
+	now /= 1000;
+	now *= m_duration;
+	wxString str = format_time((u32) (now), 1000);
+	m_pStatusbar->SetStatusText(str);
+	if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
+#else
+	s32 type = event.GetEventType();
+	if (type == wxEVT_SCROLL_THUMBTRACK) {
+		m_bGrabbed = 1;
+		Double now = (Double) event.GetPosition();
+		now /= 1000;
+		now *= m_duration;
+		wxString str = format_time((u32) (now), 1000);
+		m_pStatusbar->SetStatusText(str);
+	}
+	else if (m_bGrabbed) {
+		m_bGrabbed = 0;
+		Double res = (Double) m_pProg->GetValue();
+		res /= 1000;
+		res *= m_duration;
+		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED) {
+			gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+			m_bToReset = 0;
+			if (!m_pTimer->IsRunning()) m_pTimer->Start(100, 0);
+		}
+		gf_term_play_from_time(m_term, (u32) res, 0);
+	}
+#endif
+}
+
+
+void wxOsmo4Frame::BuildViewList()
+{
+	if (!vp_list || !m_connected) return;
+
+	while (vp_list->GetMenuItemCount()) {
+		wxMenuItem* it = vp_list->FindItemByPosition(0);
+		vp_list->Delete(it);
+	}
+
+	s32 id = ID_VIEWPOINT_FIRST;
+	nb_viewpoints = 0;
+	while (1) {
+		const char *szName;
+		Bool bound;
+		GF_Err e = gf_term_get_viewpoint(m_term, nb_viewpoints+1, &szName, &bound);
+		if (e) break;
+		if (szName) {
+			vp_list->AppendCheckItem(id+nb_viewpoints, wxString(szName, wxConvUTF8) );
+		} else {
+			vp_list->AppendCheckItem(id+nb_viewpoints, wxString::Format(wxT("Viewpoint #%d"), nb_viewpoints+1) );
+		}
+		nb_viewpoints++;
+	}
+}
+
+void wxOsmo4Frame::OnViewport(wxCommandEvent & event)
+{
+	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
+	gf_term_set_viewpoint(m_term, ID+1, NULL);
+}
+
+void wxOsmo4Frame::OnUpdateViewport(wxUpdateUIEvent & event)
+{
+	u32 ID = event.GetId() - ID_VIEWPOINT_FIRST;
+	const char *szName;
+	Bool bound;
+	gf_term_get_viewpoint(m_term, ID+1, &szName, &bound);
+	event.Enable(1);
+	if (bound) event.Check(1);
+}
+
+void wxOsmo4Frame::OnNavigate(wxCommandEvent & event)
+{
+	switch (event.GetId()) {
+	case ID_NAVIGATE_NONE:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
+		break;
+	case ID_NAVIGATE_WALK:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
+		break;
+	case ID_NAVIGATE_FLY:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
+		break;
+	case ID_NAVIGATE_EXAMINE:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
+		break;
+	case ID_NAVIGATE_PAN:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_PAN);
+		break;
+	case ID_NAVIGATE_SLIDE:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
+		break;
+	case ID_NAVIGATE_ORBIT:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_ORBIT);
+		break;
+	case ID_NAVIGATE_GAME:
+		gf_term_set_option(m_term, GF_OPT_NAVIGATION, GF_NAVIGATE_GAME);
+		break;
+	}
+}
+void wxOsmo4Frame::OnNavigateReset(wxCommandEvent & WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_NAVIGATION_TYPE, 0);
+}
+void wxOsmo4Frame::OnUpdateNavigation(wxUpdateUIEvent & event)
+{
+	u32 ID = event.GetId();
+	event.Enable(0);
+	if (!m_connected) return;
+	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
+	bool enable = type ? 1 : 0;
+
+	u32 mode = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
+	/*common 2D/3D modes*/
+	if (ID==ID_NAVIGATE_NONE) {
+		event.Enable(enable);
+		event.Check(mode ? 0 : 1);
+	}
+	else if (ID==ID_NAVIGATE_EXAMINE) {
+		event.Enable(enable);
+		event.Check((mode==GF_NAVIGATE_EXAMINE) ? 1 : 0);
+	}
+	else if (ID==ID_NAVIGATE_SLIDE) {
+		event.Enable(enable);
+		event.Check((mode==GF_NAVIGATE_SLIDE) ? 1 : 0);
+	}
+
+	if (type==GF_NAVIGATE_TYPE_2D) return;
+	event.Enable(enable);
+	if (ID==ID_NAVIGATE_WALK) event.Check((mode==GF_NAVIGATE_WALK) ? 1 : 0);
+	else if (ID==ID_NAVIGATE_FLY) event.Check((mode==GF_NAVIGATE_FLY) ? 1 : 0);
+	else if (ID==ID_NAVIGATE_PAN) event.Check((mode==GF_NAVIGATE_PAN) ? 1 : 0);
+	else if (ID==ID_NAVIGATE_ORBIT) event.Check((mode==GF_NAVIGATE_ORBIT) ? 1 : 0);
+	else if (ID==ID_NAVIGATE_GAME) event.Check((mode==GF_NAVIGATE_GAME) ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnRenderSwitch(wxCommandEvent &WXUNUSED(event))
+{
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
+	Bool use_gl = (opt && !stricmp(opt, "yes")) ? 1 : 0;
+	gf_cfg_set_key(m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
+
+	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
+
+	UpdateRenderSwitch();
+}
+
+void wxOsmo4Frame::UpdateRenderSwitch()
+{
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
+	m_pToolBar->RemoveTool(SWITCH_RENDER);
+	if (opt && !stricmp(opt, "yes"))
+		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW2D, wxNullBitmap, FALSE, NULL, wxT("2D Rasterizer"));
+	else
+		m_pToolBar->InsertTool(12, SWITCH_RENDER, *m_pSW3D, wxNullBitmap, FALSE, NULL, wxT("OpenGL Rendering"));
+
+#ifdef WIN32
+	/*there's a display bug with the menubtn, remove and reinsert*/
+	m_pToolBar->RemoveTool(FILE_PREV);
+	m_pToolBar->RemoveTool(FILE_NEXT);
+	m_pToolBar->InsertControl(2, m_pPrevBut);
+	m_pToolBar->InsertControl(3, m_pNextBut);
+#endif
+	m_pToolBar->Realize();
+}
+
+void wxOsmo4Frame::UpdatePlay()
+{
+	m_pToolBar->RemoveTool(FILE_PLAY);
+	if (m_connected) {
+		if (gf_term_get_option(m_term, GF_OPT_PLAY_STATE)==GF_STATE_PAUSED)
+			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
+		else
+			m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPause, wxNullBitmap, FALSE, NULL, wxT("Play File"));
+	} else {
+		m_pToolBar->InsertTool(5, FILE_PLAY, *m_pPlay, wxNullBitmap, FALSE, NULL, wxT("Pause File"));
+	}
+
+#ifdef WIN32
+	/*there's a display bug with the menubtn, remove and reinsert*/
+	m_pToolBar->RemoveTool(FILE_PREV);
+	m_pToolBar->RemoveTool(FILE_NEXT);
+	m_pToolBar->InsertControl(2, m_pPrevBut);
+	m_pToolBar->InsertControl(3, m_pNextBut);
+#endif
+	m_pToolBar->Realize();
+}
+
+void wxOsmo4Frame::OnCollide(wxCommandEvent & event)
+{
+	u32 ID = event.GetId();
+	if (ID==ID_COLLIDE_NONE) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NONE);
+	else if (ID==ID_COLLIDE_REG) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
+	else if (ID==ID_COLLIDE_DISP) gf_term_set_option(m_term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
+}
+void wxOsmo4Frame::OnUpdateCollide(wxUpdateUIEvent & event)
+{
+	u32 ID = event.GetId();
+	event.Enable(0);
+	if (!m_connected) return;
+	event.Enable(1);
+	u32 mode = gf_term_get_option(m_term, GF_OPT_COLLISION);
+	if (ID==ID_COLLIDE_NONE) {
+		event.Check((mode==GF_COLLISION_NONE) ? 1 : 0);
+	}
+	else if (ID==ID_COLLIDE_REG) {
+		event.Check((mode==GF_COLLISION_NORMAL) ? 1 : 0);
+	}
+	else if (ID==ID_COLLIDE_DISP) {
+		event.Check((mode==GF_COLLISION_DISPLACEMENT) ? 1 : 0);
+	}
+}
+
+void wxOsmo4Frame::OnHeadlight(wxCommandEvent &WXUNUSED(event))
+{
+	Bool val = !gf_term_get_option(m_term, GF_OPT_HEADLIGHT);
+	gf_term_set_option(m_term, GF_OPT_HEADLIGHT, val);
+}
+void wxOsmo4Frame::OnUpdateHeadlight(wxUpdateUIEvent & event)
+{
+	event.Enable(0);
+	if (!m_connected) return;
+	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
+	if (type!=GF_NAVIGATE_TYPE_3D) return;
+
+	event.Enable(1);
+	event.Check(gf_term_get_option(m_term, GF_OPT_HEADLIGHT) ? 1 : 0);
+}
+void wxOsmo4Frame::OnGravity(wxCommandEvent & WXUNUSED(event))
+{
+	Bool val = gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 0 : 1;
+	gf_term_set_option(m_term, GF_OPT_GRAVITY, val);
+}
+void wxOsmo4Frame::OnUpdateGravity(wxUpdateUIEvent & event)
+{
+	event.Enable(0);
+	if (!m_connected) return;
+	u32 type = gf_term_get_option(m_term, GF_OPT_NAVIGATION_TYPE);
+	if (type!=GF_NAVIGATE_TYPE_3D) return;
+	type = gf_term_get_option(m_term, GF_OPT_NAVIGATION);
+	if (type != GF_NAVIGATE_WALK) return;
+	event.Enable(1);
+	event.Check(gf_term_get_option(m_term, GF_OPT_GRAVITY) ? 1 : 0);
+}
+
+
+BEGIN_EVENT_TABLE(wxMyComboBox, wxComboBox)
+	EVT_KEY_UP(wxMyComboBox::OnKeyUp)
+END_EVENT_TABLE()
+
+void wxMyComboBox::OnKeyUp(wxKeyEvent &event)
+{
+	if (event.GetKeyCode()==WXK_RETURN) {
+		event.Skip();
+		wxCommandEvent evt;
+		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
+		evt.SetEventObject(this);
+		evt.SetId(GetId());
+		GetParent()->AddPendingEvent(evt);
+	}
+}
+
+
+void wxOsmo4Frame::ReloadURLs()
+{
+	const char *sOpt;
+	u32 i=0;
+
+	m_Address->Clear();
+	while (1) {
+		sOpt = gf_cfg_get_key_name(m_user.config, "RecentFiles", i);
+		if (!sOpt) break;
+		m_Address->Append(wxString(sOpt, wxConvUTF8) );
+		i++;
+	}
+}
+
+void wxOsmo4Frame::SelectionReady()
+{
+	wxString urlVal = m_Address->GetValue();
+	if (urlVal.Find(wxT("://"))>0) {
+		UpdateLastFiles(m_user.config, urlVal.mb_str(wxConvUTF8));
+		ReloadURLs();
+	}
+	m_pPlayList->Truncate();
+	m_pPlayList->QueueURL(urlVal);
+	m_pPlayList->RefreshList();
+	m_pPlayList->PlayNext();
+}
+
+void wxOsmo4Frame::OnURLSelect(wxCommandEvent &WXUNUSED(event))
+{
+	SelectionReady();
+}
+
+void wxOsmo4Frame::OnPlaylist(wxCommandEvent &WXUNUSED(event))
+{
+	assert(m_pPlayList);
+	m_pPlayList->Show(m_pPlayList->IsShown() ? 0 : 1);
+}
+
+void wxOsmo4Frame::OnUpdatePlayList(wxUpdateUIEvent & event)
+{
+	event.Enable(1);
+	event.Check(m_pPlayList->IsShown() ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnFilePrevOpen(wxNotifyEvent & event)
+{
+	u32 count = gf_list_count(m_pPlayList->m_entries);
+	u32 start = m_pPlayList->m_cur_entry - 1;
+	wxMenu *popup = new wxMenu();
+
+	for (u32 i=0; i<10; i++) {
+		if (i > start) break;
+		if (start - i >= count) break;
+		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start - i);
+		popup->Append(ID_NAV_PREV_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
+	}
+	m_pPrevBut->AssignMenu(popup);
+}
+
+void wxOsmo4Frame::OnFileNextOpen(wxNotifyEvent & event)
+{
+	u32 count = gf_list_count(m_pPlayList->m_entries);
+	wxMenu *popup = new wxMenu();
+	u32 start = m_pPlayList->m_cur_entry + 1;
+	for (u32 i=0; i<10; i++) {
+		if (start + i >= count) break;
+		PLEntry *ple = (PLEntry *) gf_list_get(m_pPlayList->m_entries, start + i);
+		popup->Append(ID_NAV_NEXT_0 + i, wxString(ple->m_disp_name, wxConvUTF8) );
+	}
+	m_pNextBut->AssignMenu(popup);
+}
+
+void wxOsmo4Frame::OnNavPrev(wxCommandEvent &WXUNUSED(event))
+{
+	if (m_pPlayList->m_cur_entry<=0) return;
+	m_pPlayList->PlayPrev();
+}
+void wxOsmo4Frame::OnUpdateNavPrev(wxUpdateUIEvent & event)
+{
+	if (m_pPlayList->m_cur_entry<=0) event.Enable(0);
+	else event.Enable(TRUE);
+}
+void wxOsmo4Frame::OnNavPrevMenu(wxCommandEvent &event)
+{
+	u32 ID = event.GetId() - ID_NAV_PREV_0;
+	s32 prev = m_pPlayList->m_cur_entry - ID;
+	if (prev>=0) {
+		m_pPlayList->m_cur_entry = prev;
+		m_pPlayList->PlayPrev();
+	}
+}
+void wxOsmo4Frame::OnNavNext(wxCommandEvent &WXUNUSED(event))
+{
+	/*don't play if last could trigger playlist loop*/
+	if ((m_pPlayList->m_cur_entry<0) || (gf_list_count(m_pPlayList->m_entries) == 1 + (u32) m_pPlayList->m_cur_entry)) return;
+	m_pPlayList->PlayNext();
+}
+void wxOsmo4Frame::OnUpdateNavNext(wxUpdateUIEvent & event)
+{
+	if (m_pPlayList->m_cur_entry<0) event.Enable(0);
+	else if ((u32) m_pPlayList->m_cur_entry + 1 == gf_list_count(m_pPlayList->m_entries) ) event.Enable(0);
+	else event.Enable(1);
+}
+
+void wxOsmo4Frame::OnNavNextMenu(wxCommandEvent &event)
+{
+	u32 ID = event.GetId() - ID_NAV_NEXT_0;
+	s32 next = m_pPlayList->m_cur_entry + ID;
+	if (next < (s32) gf_list_count(m_pPlayList->m_entries) ) {
+		m_pPlayList->m_cur_entry = next;
+		m_pPlayList->PlayNext();
+	}
+}
+
+void wxOsmo4Frame::OnClearNav(wxCommandEvent &WXUNUSED(event))
+{
+	m_pPlayList->ClearButPlaying();
+}
+
+
+void wxOsmo4Frame::BuildStreamList(Bool reset_only)
+{
+	u32 nb_subs;
+	wxMenu *pMenu;
+
+	pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
+	while (pMenu->GetMenuItemCount()) {
+		wxMenuItem* it = pMenu->FindItemByPosition(0);
+		pMenu->Delete(it);
+	}
+	pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
+	while (pMenu->GetMenuItemCount()) {
+		wxMenuItem* it = pMenu->FindItemByPosition(0);
+		pMenu->Delete(it);
+	}
+	pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
+	while (pMenu->GetMenuItemCount()) {
+		wxMenuItem* it = pMenu->FindItemByPosition(0);
+		pMenu->Delete(it);
+	}
+
+	if (reset_only) {
+		m_bFirstStreamListBuild = 1;
+		return;
+	}
+
+	if (!gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) return;
+
+	nb_subs = 0;
+	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
+	if (!root_od) return;
+	u32 count = gf_term_get_object_count(m_term, root_od);
+
+	for (u32 i=0; i<count; i++) {
+		char szLabel[1024];
+		GF_MediaInfo info;
+		GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, i);
+		if (!odm) return;
+
+		if (gf_term_get_object_info(m_term, odm, &info) != GF_OK) break;
+
+		if (info.owns_service) {
+			char *szName = (char *) strrchr(info.service_url, '\\');
+			if (!szName) szName = (char *) strrchr(info.service_url, '/');
+			if (!szName) szName = (char *) info.service_url;
+			else szName += 1;
+			strcpy(szLabel, szName);
+			szName = strrchr(szLabel, '.');
+			if (szName) szName[0] = '\0';
+		}
+		switch (info.od_type) {
+		case GF_STREAM_AUDIO:
+			pMenu = sel_menu->FindItemByPosition(0)->GetSubMenu();
+			if (!info.owns_service) sprintf(szLabel, "Audio #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
+			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
+			break;
+		case GF_STREAM_VISUAL:
+			pMenu = sel_menu->FindItemByPosition(1)->GetSubMenu();
+			if (!info.owns_service) sprintf(szLabel, "Video #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
+			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
+			break;
+		case GF_STREAM_TEXT:
+			nb_subs ++;
+			pMenu = sel_menu->FindItemByPosition(2)->GetSubMenu();
+			if (!info.owns_service) sprintf(szLabel, "Subtitle #"LLU, (u64)pMenu->GetMenuItemCount() + 1);
+			pMenu->AppendCheckItem(ID_SELSTREAM_0 +i, wxString(szLabel, wxConvUTF8));
+			break;
+		}
+	}
+	if (m_bFirstStreamListBuild) {
+		m_bFirstStreamListBuild = 0;
+		if (!nb_subs && m_lookforsubs) LookForSubtitles();
+	}
+}
+
+void wxOsmo4Frame::OnStreamSel(wxCommandEvent & event)
+{
+	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
+	if (!root_od) return;
+	u32 ID = event.GetId() - ID_SELSTREAM_0;
+	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
+	gf_term_select_object(m_term, odm);
+}
+
+void wxOsmo4Frame::OnUpdateStreamSel(wxUpdateUIEvent & event)
+{
+	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
+	if (!root_od) return;
+	u32 ID = event.GetId() - ID_SELSTREAM_0;
+
+	GF_ObjectManager *odm = gf_term_get_object(m_term, root_od, ID);
+	if (!odm) return;
+
+	GF_MediaInfo info;
+	gf_term_get_object_info(m_term, odm, &info);
+	event.Enable(1);
+	event.Check(info.status ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnUpdateStreamMenu(wxUpdateUIEvent & event)
+{
+	if (!m_connected || !gf_term_get_option(m_term, GF_OPT_CAN_SELECT_STREAMS)) {
+		event.Enable(0);
+	} else {
+		event.Enable(1);
+	}
+}
+
+void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
+{
+	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
+
+	if (dlg.ShowModal() == wxID_OK) {
+		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
+	}
+
+}
+
+void wxOsmo4Frame::AddSubtitle(const char *fileName, Bool auto_play)
+{
+	gf_term_add_object(m_term, fileName, auto_play);
+}
+
+static Bool subs_enum_dir_item(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	wxOsmo4Frame *_this = (wxOsmo4Frame*)cbck;
+	_this->AddSubtitle(item_path, 0);
+	return 0;
+}
+
+void wxOsmo4Frame::LookForSubtitles()
+{
+	char dir[GF_MAX_PATH];
+	const char *url = m_pPlayList->GetURL().mb_str(wxConvUTF8);
+	strcpy(dir, url);
+	char *sep = strrchr(dir, '\\');
+	if (!sep) strcpy(dir, ::wxGetCwd().mb_str(wxConvUTF8));
+	else sep[0] = 0;
+
+	gf_enum_directory(dir, 0, subs_enum_dir_item, this, "ttxt;srt");
+}
+
+void wxOsmo4Frame::OnCacheEnable(wxCommandEvent &WXUNUSED(event))
+{
+	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
+	if (state==GF_MEDIA_CACHE_DISABLED) {
+		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED);
+	} else if (state==GF_MEDIA_CACHE_DISABLED) {
+		gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
+	}
+}
+
+void wxOsmo4Frame::OnCacheStop(wxCommandEvent &WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
+}
+
+void wxOsmo4Frame::OnCacheAbort(wxCommandEvent &WXUNUSED(event))
+{
+	gf_term_set_option(m_term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISCARD);
+}
+
+void wxOsmo4Frame::OnUpdateCacheEnable(wxUpdateUIEvent & event)
+{
+	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
+	switch (state) {
+	case GF_MEDIA_CACHE_ENABLED:
+		event.Enable(1);
+		event.SetText(wxT("Enabled"));
+		break;
+	case GF_MEDIA_CACHE_RUNNING:
+		event.SetText(wxT("Running"));
+		event.Enable(0);
+		break;
+	case GF_MEDIA_CACHE_DISABLED:
+		event.SetText(wxT("Disabled"));
+		break;
+	}
+}
+
+void wxOsmo4Frame::OnUpdateCacheAbort(wxUpdateUIEvent & event)
+{
+	u32 state = gf_term_get_option(m_term, GF_OPT_MEDIA_CACHE);
+	event.Enable( (state==GF_MEDIA_CACHE_RUNNING) ? 1 : 0);
+}
+
+
+
+void wxOsmo4Frame::BuildChapterList(Bool reset_only)
+{
+	GF_MediaInfo odi;
+
+	while (chap_menu->GetMenuItemCount()) {
+		wxMenuItem* it = chap_menu->FindItemByPosition(0);
+		chap_menu->Delete(it);
+	}
+	if (m_chapters_start) gf_free(m_chapters_start);
+	m_chapters_start = NULL;
+	m_num_chapters = 0;
+	if (reset_only) return;
+
+	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
+	if (!root_od) return;
+	if (gf_term_get_object_info(m_term, root_od, &odi) != GF_OK) return;
+
+	u32 count = gf_list_count(odi.od->OCIDescriptors);
+	m_num_chapters = 0;
+	for (u32 i=0; i<count; i++) {
+		char szLabel[1024];
+		GF_Segment *seg = (GF_Segment *) gf_list_get(odi.od->OCIDescriptors, i);
+		if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
+
+		if (seg->SegmentName && strlen((const char *)seg->SegmentName)) {
+			strcpy(szLabel, (const char *) seg->SegmentName);
+		} else {
+			sprintf(szLabel, "Chapter %02d", m_num_chapters+1);
+		}
+		chap_menu->AppendCheckItem(ID_SETCHAP_FIRST + m_num_chapters, wxString(szLabel, wxConvUTF8));
+
+		m_chapters_start = (Double *) gf_realloc(m_chapters_start, sizeof(Double)*(m_num_chapters+1));
+		m_chapters_start[m_num_chapters] = seg->startTime;
+		m_num_chapters++;
+	}
+
+	/*get any service info*/
+	NetInfoCommand com;
+	if (!m_bStartupFile && gf_term_get_service_info(m_term, root_od, &com) == GF_OK) {
+		wxString title = wxT("");
+		if (com.track_info) {
+			title.Format(wxT("%02d "), (u32) (com.track_info>>16) );
+		}
+		if (com.artist) {
+			title.Append(wxString(com.artist, wxConvUTF8));
+			title += wxT(" ");
+		}
+		if (com.name) {
+			title.Append(wxString(com.name, wxConvUTF8));
+			title += wxT(" ");
+		}
+		if (com.album) {
+			title += wxT("(");
+			title.Append(wxString(com.album, wxConvUTF8));
+			title += wxT(")");
+		}
+
+		if (title.length()) SetTitle(title);
+	}
+
+}
+
+void wxOsmo4Frame::OnChapterSel(wxCommandEvent & event)
+{
+	GF_ObjectManager *root_od = gf_term_get_root_object(m_term);
+	if (!root_od) return;
+	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
+	gf_term_play_from_time(m_term, (u32) (1000*m_chapters_start[ID]), 0);
+}
+
+void wxOsmo4Frame::OnUpdateChapterSel(wxUpdateUIEvent & event)
+{
+	Double now;
+	Bool is_current;
+	u32 ID = event.GetId() - ID_SETCHAP_FIRST;
+
+	now = gf_term_get_time_in_ms(m_term);
+	now /= 1000;
+
+	is_current = 0;
+	if (m_chapters_start[ID]<=now) {
+		if (ID+1<m_num_chapters) {
+			if (m_chapters_start[ID+1]>now) is_current = 1;
+		} else {
+			is_current = 1;
+		}
+	}
+	event.Enable(1);
+	event.Check(is_current ? 1 : 0);
+}
+
+void wxOsmo4Frame::OnUpdateChapterMenu(wxUpdateUIEvent & event)
+{
+	if (!m_connected || !m_num_chapters) {
+		event.Enable(0);
+	} else {
+		event.Enable(1);
+	}
+}
+
+void wxOsmo4Frame::OnFileCopy(wxCommandEvent &event)
+{
+	const char *text = gf_term_get_text_selection(m_term, 0);
+	if (!text) return;
+	if (!wxTheClipboard->Open()) return;
+
+	wxTheClipboard->SetData( new wxTextDataObject( wxString(text, wxConvUTF8)) );
+	wxTheClipboard->Close();
+}
+
+void wxOsmo4Frame::OnUpdateFileCopy(wxUpdateUIEvent &event)
+{
+	if (gf_term_get_text_selection(m_term, 1)!=NULL) {
+		event.Enable(1);
+	} else {
+		event.Enable(0);
+	}
+}
+
+void wxOsmo4Frame::OnFilePaste(wxCommandEvent &event)
+{
+	if (!wxTheClipboard->Open()) return;
+	if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
+		wxTextDataObject data;
+		wxTheClipboard->GetData(data);
+		gf_term_paste_text(m_term, data.GetText().mb_str(wxConvUTF8), 0);
+	}
+	wxTheClipboard->Close();
+}
+
+void wxOsmo4Frame::OnUpdateFilePaste(wxUpdateUIEvent &event)
+{
+	Bool ok = 0;
+	if (wxTheClipboard->Open()) {
+		if (wxTheClipboard->IsSupported( wxDF_TEXT )) {
+			if (gf_term_paste_text(m_term, NULL, 1)==GF_OK) {
+				ok = 1;
+			}
+		}
+		wxTheClipboard->Close();
+	}
+	event.Enable(ok ? 1 : 0);
+}
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmo4_wx/wxOsmo4.rc Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/Osmo4.ico Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/main.cpp Added

@@ -0,0 +1,1497 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / command-line client
+ *
+ *  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.
+ *
+ */
+
+/*includes both terminal and od browser*/
+#include <gpac/terminal.h>
+#include <gpac/options.h>
+/*for initial setup*/
+#include <gpac/modules/service.h>
+
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+
+#include <windows.h>
+#include <commdlg.h>
+#include <commctrl.h>
+
+#ifdef _WIN32_WCE
+#include <aygshell.h>
+#include <gx.h>
+
+#else
+
+#ifndef _T
+#define _T(__a) (LPCSTR) __a
+#endif
+
+#endif
+
+#include "resource.h"
+
+#define WM_LOADTERM	WM_USER + 1
+#define STATE_TIMER_ID		20
+#define STATE_TIMER_DUR		1000
+#define GPAC_TIMER_ID		21
+#define GPAC_TIMER_DUR		33
+
+
+Bool gf_file_dialog(HINSTANCE inst, HWND parent, char *url, const char *ext_list, GF_Config *cfg);
+void set_backlight_state(Bool disable);
+void refresh_recent_files();
+void do_layout(Bool notif_size);
+
+static HWND g_hwnd = NULL;
+static HWND g_hwnd_disp = NULL;
+static HWND g_hwnd_menu = NULL;
+static HWND g_hwnd_status = NULL;
+static HINSTANCE g_hinst = NULL;
+static Bool is_ppc = GF_FALSE;
+
+static Bool is_connected = GF_FALSE;
+static Bool navigation_on = GF_FALSE;
+static Bool playlist_navigation_on = GF_TRUE;
+
+static u32 log_level = GF_LOG_ERROR;
+
+static u32 Duration;
+static Bool CanSeek = GF_FALSE;
+static u32 Volume=100;
+static char the_url[GF_MAX_PATH] = "";
+static Bool NavigateTo = GF_FALSE;
+static char the_next_url[GF_MAX_PATH];
+static GF_Terminal *term;
+static GF_User user;
+static u32 disp_w = 0;
+static u32 disp_h = 0;
+static u32 screen_w = 0;
+static u32 screen_h = 0;
+static u32 menu_h = 0;
+static u32 caption_h = 0;
+static u32 ratio_h = 1;
+static Bool backlight_off = GF_FALSE;
+static u32 prev_batt_bl, prev_ac_bl;
+static Bool show_status = GF_TRUE;
+static Bool reset_status = GF_TRUE;
+static u32 last_state_time = 0;
+static Bool loop = GF_FALSE;
+static Bool full_screen = GF_FALSE;
+static Bool force_2d_gl = GF_FALSE;
+static Bool ctrl_mod_down = GF_FALSE;
+static Bool view_cpu = GF_TRUE;
+static Bool use_low_fps = GF_FALSE;
+static Bool use_svg_prog = GF_FALSE;
+
+static Bool log_rti = GF_FALSE;
+static FILE *log_file = NULL;
+static u32 rti_update_time_ms = 200;
+
+static u32 playlist_act = 0;
+
+
+void recompute_res(u32 sw, u32 sh )
+{
+	caption_h = GetSystemMetrics(SM_CYCAPTION);
+	menu_h = GetSystemMetrics(SM_CYMENU)+2;
+	screen_w = GetSystemMetrics(SM_CXSCREEN);
+	screen_h = GetSystemMetrics(SM_CYSCREEN);
+
+	ratio_h = sh / screen_h;
+	screen_w = sw;
+	screen_h = sh;
+	menu_h *= ratio_h;
+//	caption_h *= ratio_h;
+	disp_w = screen_w;
+	disp_h = screen_h - menu_h /*- caption_h*/;
+}
+
+
+void set_status(char *state)
+{
+	if (show_status && g_hwnd_status) {
+#ifdef _WIN32_WCE
+		TCHAR wstate[1024];
+		CE_CharToWide(state, (u16 *) wstate);
+		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
+#else
+		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) state);
+#endif
+		last_state_time = GetTickCount();
+	}
+}
+
+void update_state_info()
+{
+	TCHAR wstate[1024];
+	Double FPS;
+	u32 time, m, s;
+	if (!show_status) return;
+	if (last_state_time) {
+		if (GetTickCount() > last_state_time + 200) {
+			last_state_time = 0;
+			reset_status = GF_TRUE;
+		}
+		else return;
+	}
+	if (!term) return;
+	if (!is_connected && reset_status) {
+		SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) TEXT("Ready") );
+		reset_status = GF_FALSE;
+		return;
+	}
+
+	FPS = gf_term_get_framerate(term, GF_FALSE);
+	time = gf_term_get_time_in_ms(term) / 1000;
+	m = time/60;
+	s = time - m*60;
+	if (view_cpu) {
+		GF_SystemRTInfo rti;
+		if (!gf_sys_get_rti(STATE_TIMER_DUR, &rti, 0)) return;
+		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f : CPU %02d"), m, s, FPS, rti.total_cpu_usage);
+	} else {
+		wsprintf(wstate, TEXT("T %02d:%02d : FPS %02.2f"), m, s, FPS);
+	}
+	SendMessage(g_hwnd_status, WM_SETTEXT, 0, (LPARAM) wstate);
+}
+
+
+static u64 prev_pos = 0;
+void cbk_on_progress(void *_title, u64 done, u64 total)
+{
+#if 0
+	char szMsg[1024];
+	u32 pos = (u32) ((u64) done * 100)/total;
+	if (pos<prev_pos) prev_pos = 0;
+	if (pos!=prev_pos) {
+		prev_pos = pos;
+		sprintf(szMsg, "%s: (%02d/100)", _title ? (char *)_title : "", pos);
+		set_status(szMsg);
+	}
+#endif
+}
+
+void set_full_screen()
+{
+	full_screen = (Bool)!full_screen;
+	if (full_screen) {
+		show_status = GF_FALSE;
+		do_layout(GF_FALSE);
+		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
+	} else {
+		const char *str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
+		show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
+		gf_term_set_option(term, GF_OPT_FULLSCREEN, full_screen);
+		do_layout(GF_TRUE);
+	}
+}
+
+
+static void on_gpac_rti_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
+{
+	if (!log_file) return;
+
+	if (lm & GF_LOG_RTI) {
+		GF_SystemRTInfo rti;
+		if (fmt) vfprintf(log_file, fmt, list);
+
+		gf_sys_get_rti(rti_update_time_ms, &rti, 0);
+
+		fprintf(log_file, "% 8d\t% 8d\t% 8d\t% 4d\t% 8d\t\t",
+		        gf_sys_clock(),
+		        gf_term_get_time_in_ms(term),
+		        rti.total_cpu_usage,
+		        (u32) gf_term_get_framerate(term, GF_FALSE),
+		        (u32) ( rti.gpac_memory / 1024)
+		       );
+	} else if (fmt && (ll>=GF_LOG_INFO)) {
+		vfprintf(log_file, fmt, list);
+	}
+}
+static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
+{
+	if (fmt && log_file) vfprintf(log_file, fmt, list);
+}
+
+
+static void setup_logs()
+{
+	if (log_file) gf_fclose(log_file);
+	log_file = NULL;
+
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
+	gf_log_set_callback(NULL, NULL);
+
+	if (log_rti) {
+		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
+		if (!filename) {
+			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
+			filename = "\\gpac_logs.txt";
+		}
+		log_file = gf_fopen(filename, "a+t");
+
+		fprintf(log_file, "!! GPAC RunTime Info for file %s !!\n", the_url);
+		fprintf(log_file, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
+
+		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
+		gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
+		gf_log_set_callback(log_file, on_gpac_rti_log);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI] System state when enabling log\n"));
+	} else {
+		const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
+		if (!filename) {
+			gf_cfg_set_key(user.config, "General", "LogFile", "\\gpac_logs.txt");
+			filename = "\\gpac_logs.txt";
+		}
+		const char *logs = gf_cfg_get_key(user.config, "General", "Logs");
+		if (logs) {
+			if (gf_log_set_tools_levels( logs ) != GF_OK) {
+			} else {
+				if (log_file = gf_fopen(filename, "a+t")) {
+					gf_log_set_callback(log_file, on_gpac_log);
+				}
+			}
+		}
+	}
+}
+
+void do_open_file()
+{
+	gf_cfg_set_key(user.config, "RecentFiles", the_url, NULL);
+	gf_cfg_insert_key(user.config, "RecentFiles", the_url, "", 0);
+	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
+	if (count > 10) gf_cfg_set_key(user.config, "RecentFiles", gf_cfg_get_key_name(user.config, "RecentFiles", count-1), NULL);
+
+	setup_logs();
+
+	gf_term_connect(term, the_url);
+}
+
+void switch_playlist(Bool play_prev)
+{
+	char szPLE[20];
+	u32 idx = 0;
+	u32 count;
+	const char *ple = gf_cfg_get_key(user.config, "General", "PLEntry");
+	if (ple) idx = atoi(ple);
+
+	count = gf_cfg_get_key_count(user.config, "Playlist");
+	if (!count) return;
+	/*not the first launch*/
+	if (strlen(the_url)) {
+		if (!idx && play_prev) return;
+		if (play_prev) idx--;
+		else idx++;
+		if (idx>=count) return;
+	} else {
+		if (idx>=count) idx=0;
+	}
+
+	ple = gf_cfg_get_key_name(user.config, "Playlist", idx);
+	if (!ple) return;
+
+	sprintf(szPLE, "%d", idx);
+	gf_cfg_set_key(user.config, "General", "PLEntry", szPLE);
+
+	strcpy(the_url, ple);
+	do_open_file();
+}
+
+
+Bool GPAC_EventProc(void *ptr, GF_Event *evt)
+{
+	switch (evt->type) {
+	case GF_EVENT_DURATION:
+		Duration = (u32) (evt->duration.duration*1000);
+		CanSeek = evt->duration.can_seek;
+		break;
+	case GF_EVENT_MESSAGE:
+	{
+		if (!evt->message.message) return GF_FALSE;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s: %s\n", evt->message.message, gf_error_to_string(evt->message.error)));
+		//set_status((char *) evt->message.message);
+	}
+	break;
+	case GF_EVENT_PROGRESS:
+	{
+		char *szTitle = "";
+		if (evt->progress.progress_type==0) szTitle = "Buffer ";
+		else if (evt->progress.progress_type==1) szTitle = "Download ";
+		else if (evt->progress.progress_type==2) szTitle = "Import ";
+		cbk_on_progress(szTitle, evt->progress.done, evt->progress.total);
+	}
+	break;
+
+	case GF_EVENT_SIZE:
+		break;
+	case GF_EVENT_RESOLUTION:
+		recompute_res(evt->size.width, evt->size.height);
+		do_layout(GF_TRUE);
+		break;
+
+	case GF_EVENT_SCENE_SIZE:
+		do_layout(GF_TRUE);
+		break;
+	case GF_EVENT_DBLCLICK:
+		set_full_screen();
+		return GF_FALSE;
+	case GF_EVENT_CONNECT:
+		if (evt->connect.is_connected) {
+			is_connected = GF_TRUE;
+			if (!backlight_off) set_backlight_state(GF_TRUE);
+			refresh_recent_files();
+			navigation_on = (gf_term_get_option(term, GF_OPT_NAVIGATION)==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
+		} else {
+			navigation_on = GF_FALSE;
+			is_connected = GF_FALSE;
+			Duration = 0;
+		}
+		break;
+	case GF_EVENT_EOS:
+		if (Duration>2000)
+			gf_term_play_from_time(term, 0, 0);
+		break;
+	case GF_EVENT_QUIT:
+		PostMessage(g_hwnd, WM_DESTROY, 0, 0);
+		break;
+	case GF_EVENT_KEYDOWN:
+		switch (evt->key.key_code) {
+		case GF_KEY_ENTER:
+			if (full_screen) set_full_screen();
+			break;
+		case GF_KEY_1:
+			ctrl_mod_down = (Bool)!ctrl_mod_down;
+			evt->key.key_code = GF_KEY_CONTROL;
+			evt->type = ctrl_mod_down ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
+			gf_term_user_event(term, evt);
+			break;
+		case GF_KEY_MEDIAPREVIOUSTRACK:
+			playlist_act = 2;
+			break;
+		case GF_KEY_MEDIANEXTTRACK:
+			playlist_act = 1;
+			break;
+		}
+		break;
+	case GF_EVENT_NAVIGATE:
+		if (gf_term_is_supported_url(term, evt->navigate.to_url, GF_TRUE, GF_TRUE)) {
+			gf_term_navigate_to(term, evt->navigate.to_url);
+			return GF_TRUE;
+		} else {
+#ifdef _WIN32_WCE
+			u16 dst[1024];
+#endif
+			SHELLEXECUTEINFO info;
+
+			/*
+						if (full_screen) gf_term_set_option(term, GF_OPT_FULLSCREEN, 0);
+						full_screen = 0;
+			*/
+			memset(&info, 0, sizeof(SHELLEXECUTEINFO));
+			info.cbSize = sizeof(SHELLEXECUTEINFO);
+			info.lpVerb = _T("open");
+			info.fMask = SEE_MASK_NOCLOSEPROCESS;
+			info.lpFile = _T("iexplore");
+#ifdef _WIN32_WCE
+			CE_CharToWide((char *) evt->navigate.to_url, dst);
+			info.lpParameters = (LPCTSTR) dst;
+#else
+			info.lpParameters = evt->navigate.to_url;
+#endif
+			info.nShow = SW_SHOWNORMAL;
+			ShellExecuteEx(&info);
+		}
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+//#define TERM_NOT_THREADED
+
+Bool LoadTerminal()
+{
+	/*by default use current dir*/
+	strcpy(the_url, ".");
+
+	setup_logs();
+
+	g_hwnd_disp = CreateWindow(TEXT("STATIC"), NULL, WS_CHILD | WS_VISIBLE , 0, 0, disp_w, disp_h, g_hwnd, NULL, g_hinst, NULL);
+
+	user.EventProc = GPAC_EventProc;
+	/*dummy in this case (global vars) but MUST be non-NULL*/
+	user.opaque = user.modules;
+	user.os_window_handler = g_hwnd_disp;
+#ifdef TERM_NOT_THREADED
+	user.init_flags = GF_TERM_NO_REGULATION;
+	user.threads = 0;
+#endif
+
+	term = gf_term_new(&user);
+	if (!term) {
+		gf_modules_del(user.modules);
+		gf_cfg_del(user.config);
+		memset(&user, 0, sizeof(GF_User));
+		return GF_FALSE;
+	}
+
+#ifdef _WIN32_WCE
+	screen_w = term->compositor->video_out->max_screen_width;
+	screen_h = term->compositor->video_out->max_screen_height;
+	disp_w = screen_w;
+	disp_h = screen_h - menu_h /*- caption_h*/;
+#endif
+
+#ifdef TERM_NOT_THREADED
+	::SetTimer(g_hwnd, GPAC_TIMER_ID, GPAC_TIMER_DUR, NULL);
+#endif
+
+	const char *str = gf_cfg_get_key(user.config, "General", "StartupFile");
+	if (str) {
+		do_layout(GF_TRUE);
+		strcpy(the_url, str);
+		gf_term_connect(term, str);
+	}
+	return GF_TRUE;
+}
+
+void do_layout(Bool notif_size)
+{
+	u32 w, h;
+	if (full_screen) {
+		w = screen_w;
+		h = screen_h;
+		::ShowWindow(g_hwnd_status, SW_HIDE);
+#ifdef _WIN32_WCE
+		::ShowWindow(g_hwnd_menu, SW_HIDE);
+#endif
+
+#ifdef _WIN32_WCE
+		SHFullScreen(g_hwnd, SHFS_HIDESIPBUTTON);
+#endif
+		::MoveWindow(g_hwnd, 0, 0, screen_w, screen_h, 1);
+		::MoveWindow(g_hwnd_disp, 0, 0, screen_w, screen_h, 1);
+		SetForegroundWindow(g_hwnd_disp);
+	} else {
+#ifdef _WIN32_WCE
+		::ShowWindow(g_hwnd_menu, SW_SHOW);
+#endif
+		if (show_status) {
+			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
+			::ShowWindow(g_hwnd_status, SW_SHOW);
+			::MoveWindow(g_hwnd_status, 0, 0, disp_w, caption_h, 1);
+			::MoveWindow(g_hwnd_disp, 0, caption_h, disp_w, disp_h - caption_h, 1);
+			w = disp_w;
+			h = disp_h - caption_h*ratio_h;
+		} else {
+			::ShowWindow(g_hwnd_status, SW_HIDE);
+//			::MoveWindow(g_hwnd, 0, caption_h, disp_w, disp_h, 1);
+			::MoveWindow(g_hwnd, 0, 0, disp_w, disp_h, 1);
+			::MoveWindow(g_hwnd_disp, 0, 0, disp_w, disp_h, 1);
+			w = disp_w;
+			h = disp_h;
+		}
+	}
+	if (notif_size && term) gf_term_set_size(term, w, h);
+}
+
+
+void set_backlight_state(Bool disable)
+{
+#ifdef _WIN32_WCE
+	HKEY hKey = 0;
+	DWORD dwSize;
+	DWORD dwValue;
+	HANDLE hBL;
+	if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("ControlPanel\\Backlight"), 0, 0, &hKey ) != ERROR_SUCCESS) return;
+
+	if (disable) {
+		dwSize = 4;
+		RegQueryValueEx(hKey, _T("BatteryTimeout"), NULL, NULL,(unsigned char*) &prev_batt_bl, &dwSize);
+		dwSize = 4;
+		RegQueryValueEx(hKey, _T("ACTimeout"), NULL, NULL, (unsigned char*) &prev_ac_bl,&dwSize);
+		dwSize = 4;
+		dwValue = 0xefff ;
+		RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		dwSize = 4;
+		dwValue = 0xefff ;
+		RegSetValueEx( hKey, _T("ACTimeout"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		backlight_off = GF_TRUE;
+	} else {
+		if (prev_batt_bl) {
+			dwSize = 4;
+			RegSetValueEx(hKey, _T("BatteryTimeout"), NULL, REG_DWORD, (unsigned char *)&prev_batt_bl, dwSize);
+		}
+		if (prev_ac_bl) {
+			dwSize = 4;
+			RegSetValueEx(hKey, _T("ACTimeout"), NULL, REG_DWORD,(unsigned char *)&prev_ac_bl, dwSize);
+		}
+		backlight_off = GF_FALSE;
+	}
+	RegCloseKey(hKey);
+	hBL = CreateEvent(NULL, FALSE, FALSE, _T("BackLightChangeEvent"));
+	if (hBL) {
+		SetEvent(hBL);
+		CloseHandle(hBL);
+	}
+#endif
+}
+
+static Bool do_resume = GF_FALSE;
+static Bool prev_backlight_state;
+void gf_freeze_display(Bool do_gf_freeze)
+{
+	if (do_gf_freeze) {
+		prev_backlight_state = backlight_off;
+		do_resume = GF_FALSE;
+		if (0 && is_connected && gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+			do_resume= GF_TRUE;
+			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+		}
+		/*gf_freeze display*/
+		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 1);
+
+		set_backlight_state(GF_FALSE);
+		gf_sleep(100);
+	} else {
+		if (prev_backlight_state) set_backlight_state(GF_TRUE);
+		gf_term_set_option(term, GF_OPT_FREEZE_DISPLAY, 0);
+
+		if (do_resume) {
+			gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+			set_backlight_state(GF_TRUE);
+		}
+	}
+}
+
+static void show_taskbar(Bool show_it)
+{
+#ifdef _WIN32_WCE
+	HWND wnd;
+	if (!is_ppc) return;
+
+	wnd = GetForegroundWindow();
+	wnd = g_hwnd;
+	if (show_it) {
+		SHFullScreen(wnd, SHFS_SHOWSTARTICON | SHFS_SHOWTASKBAR| SHFS_SHOWSIPBUTTON);
+		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_SHOWNA);
+	} else {
+		::ShowWindow(::FindWindow(_T("HHTaskbar"),NULL), SW_HIDE);
+		SHFullScreen(wnd, SHFS_HIDESTARTICON | SHFS_HIDETASKBAR| SHFS_HIDESIPBUTTON);
+	}
+#endif
+}
+
+void refresh_recent_files()
+{
+#ifdef _WIN32_WCE
+	u32 count = gf_cfg_get_key_count(user.config, "RecentFiles");
+
+	HMENU hMenu = (HMENU)SendMessage(g_hwnd_menu, SHCMBM_GETSUBMENU, 0, ID_MENU_FILE);
+	/*pos is hardcoded*/
+	hMenu = GetSubMenu(hMenu, 2);
+
+	while (RemoveMenu(hMenu, 0, MF_BYPOSITION)) {}
+
+	for (u32 i=0; i<count; i++) {
+		TCHAR txt[100];
+		char *name;
+		const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", i);
+		name = strrchr(sOpt, '\\');
+		if (!name) name = strrchr(sOpt, '/');
+		if (!name) name = (char *) sOpt;
+		else name += 1;
+
+		CE_CharToWide(name, (u16 *) txt);
+		AppendMenu(hMenu, MF_STRING, IDM_OPEN_FILE1+i, txt);
+	}
+#endif
+}
+
+
+void open_file(HWND hwnd)
+{
+	Bool res;
+	char ext_list[4096];
+	strcpy(ext_list, "");
+
+	gf_freeze_display(GF_TRUE);
+
+	u32 count = gf_cfg_get_key_count(user.config, "MimeTypes");
+	for (u32 i=0; i<count; i++) {
+		char szKeyList[1000], *sKey;
+		const char *sMime = gf_cfg_get_key_name(user.config, "MimeTypes", i);
+		const char *opt = gf_cfg_get_key(user.config, "MimeTypes", sMime);
+		strcpy(szKeyList, opt+1);
+		sKey = strrchr(szKeyList, '\"');
+		if (!sKey) continue;
+		sKey[0] = 0;
+		strcat(ext_list, szKeyList);
+		strcat(ext_list, " ");
+	}
+#ifdef _WIN32_WCE
+	res = gf_file_dialog(g_hinst, hwnd, the_url, ext_list, user.config);
+#else
+	res = GF_FALSE;
+#endif
+	gf_freeze_display(GF_FALSE);
+
+	/*let's go*/
+	if (res) do_open_file();
+}
+
+void load_recent_file(u32 idx)
+{
+	const char *sOpt = gf_cfg_get_key_name(user.config, "RecentFiles", idx);
+	if (sOpt) {
+		strcpy(the_url, sOpt);
+		do_open_file();
+	}
+}
+
+BOOL CALLBACK AboutDialogProc(const HWND hWnd, const UINT Msg, const WPARAM wParam, const LPARAM lParam)
+{
+	BOOL ret = TRUE;
+	switch (Msg) {
+	case WM_INITDIALOG:
+	{
+		char szText[4096];
+		HWND hctl = GetDlgItem(hWnd, IDC_NAMECTRL);
+		sprintf(szText, "GPAC/Osmo4\nversion %s", GPAC_FULL_VERSION);
+#ifdef _WIN32_WCE
+		TCHAR           psz[80];
+		ZeroMemory(psz, sizeof(psz));
+		SHINITDLGINFO sid;
+		ZeroMemory(&sid, sizeof(sid));
+		sid.dwMask  = SHIDIM_FLAGS;
+		sid.dwFlags = SHIDIF_SIZEDLGFULLSCREEN;
+		sid.hDlg    = hWnd;
+		SHInitDialog(&sid);
+
+		SHMENUBARINFO mbi;
+		memset(&mbi, 0, sizeof(SHMENUBARINFO));
+		mbi.cbSize = sizeof(SHMENUBARINFO);
+		mbi.hwndParent = hWnd;
+		mbi.nToolBarId = IDR_ABOUT_MENU;
+		mbi.hInstRes = g_hinst;
+		mbi.nBmpId = 0;
+		mbi.cBmpImages = 0;
+		SHCreateMenuBar(&mbi);
+
+		u16 swText[4096];
+		CE_CharToWide(szText, swText);
+
+		SetWindowText(hctl, (LPCWSTR) swText);
+#else
+		SetWindowText(hctl, szText);
+#endif
+		MoveWindow(hctl, 0, 0, screen_w, 40, 1);
+		MoveWindow(hWnd, 0, 0, screen_w, disp_w, 1);
+
+	}
+	break;
+	case WM_COMMAND:
+	case WM_CLOSE:
+		EndDialog(hWnd, 0);
+		break;
+	default:
+		ret = FALSE;
+	}
+	return ret;
+}
+void view_about(HWND hwnd)
+{
+	gf_freeze_display(GF_TRUE);
+//	::ShowWindow(g_hwnd_mb, SW_HIDE);
+	int iResult = DialogBox(g_hinst, MAKEINTRESOURCE(IDD_APPABOUT), hwnd,(DLGPROC)AboutDialogProc);
+//	::ShowWindow(g_hwnd_mb, SW_SHOW);
+	gf_freeze_display(GF_FALSE);
+}
+
+void pause_file()
+{
+	if (!is_connected) return;
+#ifdef _WIN32_WCE
+	TBBUTTONINFO tbbi;
+	tbbi.cbSize = sizeof(tbbi);
+	tbbi.dwMask = TBIF_TEXT;
+#endif
+
+	if (gf_term_get_option(term, GF_OPT_PLAY_STATE)==GF_STATE_PLAYING) {
+		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+#ifdef _WIN32_WCE
+		tbbi.pszText = _T("Resume");
+#endif
+	} else {
+		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+#ifdef _WIN32_WCE
+		tbbi.pszText = _T("Pause");
+#endif
+	}
+#ifdef _WIN32_WCE
+	SendMessage(g_hwnd_menu, TB_SETBUTTONINFO, IDM_FILE_PAUSE, (LPARAM)&tbbi);
+#endif
+}
+
+void set_svg_progressive()
+{
+	use_svg_prog = (Bool)!use_svg_prog;
+	if (use_svg_prog) {
+		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "yes");
+		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "30");
+	} else {
+		gf_cfg_set_key(user.config, "SAXLoader", "MaxDuration", "0");
+		gf_cfg_set_key(user.config, "SAXLoader", "Progressive", "no");
+	}
+}
+
+void set_gx_mode(u32 mode)
+{
+	char *opt;
+	switch (mode) {
+	case 0:
+		opt = "raw";
+		break;
+	case 1:
+		opt = "gx";
+		break;
+	case 2:
+		opt = "gdi";
+		break;
+	}
+	gf_cfg_set_key(user.config, "GAPI", "FBAccess", opt);
+
+//	gf_term_del(term);
+//	term = gf_term_new(&user);
+//	gf_term_disconnect(term);
+//	gf_term_connect(term, the_url);
+	do_layout(GF_TRUE);
+}
+
+void do_copy_paste()
+{
+	if (!OpenClipboard(g_hwnd)) return;
+
+	/*or we are editing text and clipboard is not empty*/
+	if (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK)) {
+		HGLOBAL hglbCopy = GetClipboardData(CF_TEXT);
+		if (hglbCopy) {
+#ifdef _WIN32_WCE
+			char szString[1024];
+			LPCTSTR paste_string = (LPCTSTR) GlobalLock(hglbCopy);
+			CE_WideToChar((u16 *) paste_string, szString);
+			gf_term_paste_text(term, szString, GF_FALSE);
+#else
+			char *szString = (char *)GlobalLock(hglbCopy);
+			gf_term_paste_text(term, szString, GF_FALSE);
+#endif
+			GlobalUnlock(hglbCopy);
+		}
+	}
+	/*we have something to copy*/
+	else if (gf_term_get_text_selection(term, GF_TRUE)!=NULL) {
+		u32 len;
+		const char *text = gf_term_get_text_selection(term, GF_FALSE);
+		if (text && strlen(text)) {
+			EmptyClipboard();
+			len = strlen(text);
+
+#ifdef _WIN32_WCE
+			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u16));
+			LPCTSTR new_string = (LPCTSTR) GlobalLock(hglbCopy);
+			CE_CharToWide((char*)text, (u16*)new_string);
+#else
+			HGLOBAL hglbCopy = GlobalAlloc(GMEM_MOVEABLE, (len + 1) * sizeof(u8));
+			char *new_string = (char*) GlobalLock(hglbCopy);
+			strcpy(new_string, text);
+#endif
+			GlobalUnlock(hglbCopy);
+			SetClipboardData(CF_TEXT, hglbCopy);
+		}
+	}
+	CloseClipboard();
+}
+
+static void rewrite_log_tools(u32 tool)
+{
+	char *logs;
+	if (tool == GF_LOG_ALL) {
+		gf_log_set_tool_level(GF_LOG_ALL, log_level);
+	} else {
+		if (gf_log_tool_level_on(tool, log_level)) {
+			gf_log_set_tool_level(tool, GF_LOG_QUIET);
+		} else {
+			gf_log_set_tool_level(tool, log_level);
+		}
+	}
+	logs = gf_log_get_tools_levels();
+	if (logs) {
+		gf_cfg_set_key(user.config, "General", "Logs", logs);
+		gf_free(logs);
+	}
+	setup_logs();
+}
+
+BOOL HandleCommand(HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+	switch (LOWORD(wParam)) {
+	case IDM_FILE_OPEN:
+		open_file(hwnd);
+		break;
+	case IDM_FILE_LOG_RTI:
+		log_rti = (Bool)!log_rti;
+		setup_logs();
+		break;
+	case IDM_FILE_PAUSE:
+		pause_file();
+		break;
+	case IDM_VIEW_ABOUT:
+		view_about(hwnd);
+		break;
+	case IDM_VIEW_FS:
+		set_full_screen();
+		break;
+	case IDM_VIEW_STATUS:
+		show_status = (Bool)!show_status;
+		gf_cfg_set_key(user.config, "General", "ShowStatusBar", show_status ? "yes" : "no");
+		do_layout(GF_TRUE);
+		break;
+	case IDM_VIEW_CPU:
+		view_cpu = (Bool)!view_cpu;
+		break;
+	case IDM_VIEW_FORCEGL:
+		force_2d_gl = (Bool)!force_2d_gl;
+		gf_cfg_set_key(user.config, "Compositor", "ForceOpenGL", force_2d_gl ? "yes" : "no");
+		gf_term_set_option(term, GF_OPT_USE_OPENGL, force_2d_gl);
+		break;
+	case IDM_NAV_RESET:
+		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
+		break;
+	case IDM_NAV_NONE:
+		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
+		break;
+	case IDM_NAV_SLIDE:
+		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
+		break;
+	case IDM_NAV_WALK:
+		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
+		break;
+	case IDM_NAV_FLY:
+		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
+		break;
+	case IDM_NAV_EXAMINE:
+		gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
+		break;
+	case IDM_NAV_HEADLIGHT:
+		gf_term_set_option(term, GF_OPT_HEADLIGHT, !gf_term_get_option(term, GF_OPT_HEADLIGHT) );
+		break;
+	case IDM_NAV_COL_NONE:
+		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NONE);
+		break;
+	case IDM_NAV_COL_REG:
+		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_NORMAL);
+		break;
+	case IDM_NAV_COL_DISP:
+		gf_term_set_option(term, GF_OPT_COLLISION, GF_COLLISION_DISPLACEMENT);
+		break;
+	case IDM_NAV_GRAVITY:
+		gf_term_set_option(term, GF_OPT_GRAVITY, !gf_term_get_option(term, GF_OPT_GRAVITY));
+		break;
+
+	case IDM_VIEW_AR_NONE:
+		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
+		break;
+	case IDM_VIEW_AR_FILL:
+		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
+		break;
+	case IDM_VIEW_AR_4_3:
+		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
+		break;
+	case IDM_VIEW_AR_16_9:
+		gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
+		break;
+
+	case IDM_VIEW_LOW_RATE:
+		use_low_fps = (Bool)!use_low_fps;
+		gf_term_set_simulation_frame_rate(term, use_low_fps ? 15.0 : 30.0);
+		break;
+	case ID_VIDEO_DIRECTDRAW:
+	{
+		u32 drend = (gf_term_get_option(term, GF_OPT_DRAW_MODE)==GF_DRAW_MODE_IMMEDIATE) ? GF_DRAW_MODE_DEFER : GF_DRAW_MODE_IMMEDIATE;
+		gf_term_set_option(term, GF_OPT_DRAW_MODE, drend);
+		gf_cfg_set_key(user.config, "Compositor", "DrawMode", drend ? "immediate" : "defer");
+	}
+	break;
+
+	case ID_FILE_CUT_PASTE:
+		do_copy_paste();
+		break;
+
+	case IDM_OPEN_FILE1:
+	case IDM_OPEN_FILE2:
+	case IDM_OPEN_FILE3:
+	case IDM_OPEN_FILE4:
+	case IDM_OPEN_FILE5:
+	case IDM_OPEN_FILE6:
+	case IDM_OPEN_FILE7:
+	case IDM_OPEN_FILE8:
+	case IDM_OPEN_FILE9:
+	case IDM_OPEN_FILE10:
+		load_recent_file(LOWORD(wParam) - IDM_OPEN_FILE1);
+		break;
+
+	case IDS_CAP_DISABLE_PLAYLIST:
+		playlist_navigation_on = (Bool)!playlist_navigation_on;
+		break;
+	case IDM_VIEW_SVG_LOAD:
+		set_svg_progressive();
+		break;
+	case ID_VIDEO_DIRECTFB:
+		set_gx_mode(0);
+		break;
+	case ID_VIDEO_GAPI:
+		set_gx_mode(1);
+		break;
+	case ID_VIDEO_GDI:
+		set_gx_mode(2);
+		break;
+
+	case ID_LOGLEVEL_NONE:
+		log_level = GF_LOG_QUIET;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_LOGLEVEL_ERROR:
+		log_level = GF_LOG_ERROR;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_LOGLEVEL_WARNING:
+		log_level = GF_LOG_WARNING;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_LOGLEVEL_INFO:
+		log_level = GF_LOG_INFO;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_LOGLEVEL_DEBUG:
+		log_level = GF_LOG_DEBUG;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_TOOLS_CORE:
+		rewrite_log_tools(GF_LOG_CORE);
+		break;
+	case ID_TOOLS_CODING:
+		rewrite_log_tools(GF_LOG_CODING);
+		break;
+	case ID_TOOLS_CONTAINER:
+		rewrite_log_tools(GF_LOG_CONTAINER);
+		break;
+	case ID_TOOLS_NETWORK:
+		rewrite_log_tools(GF_LOG_NETWORK);
+		break;
+	case ID_TOOLS_RTP:
+		rewrite_log_tools(GF_LOG_RTP);
+		break;
+	case ID_TOOLS_SCRIPT:
+		rewrite_log_tools(GF_LOG_SCRIPT);
+		break;
+	case ID_TOOLS_CODEC:
+		rewrite_log_tools(GF_LOG_CODEC);
+		break;
+	case ID_TOOLS_PARSER:
+		rewrite_log_tools(GF_LOG_PARSER);
+		break;
+	case ID_TOOLS_MEDIA:
+		rewrite_log_tools(GF_LOG_MEDIA);
+		break;
+	case ID_TOOLS_SCENE:
+		rewrite_log_tools(GF_LOG_SCENE);
+		break;
+	case ID_TOOLS_INTERACT:
+		rewrite_log_tools(GF_LOG_INTERACT);
+		break;
+	case ID_TOOLS_COMPOSE:
+		rewrite_log_tools(GF_LOG_COMPOSE);
+		break;
+	case ID_TOOLS_MMIO:
+		rewrite_log_tools(GF_LOG_MMIO);
+		break;
+	case ID_TOOLS_RTI:
+		rewrite_log_tools(GF_LOG_RTI);
+		break;
+	case ID_TOOLS_ALL:
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_TOOLS_NONE:
+		log_level = GF_LOG_QUIET;
+		rewrite_log_tools(GF_LOG_ALL);
+		break;
+	case ID_LOGS_RESET:
+		if (log_file) {
+			gf_fclose(log_file);
+			log_file = NULL;
+		}
+		{
+			const char *filename = gf_cfg_get_key(user.config, "General", "LogFile");
+			if (filename) gf_delete_file(filename);
+		}
+		setup_logs();
+		break;
+
+	case IDM_ITEM_QUIT:
+		DestroyWindow(hwnd);
+		return FALSE;
+	}
+	return TRUE;
+}
+
+static BOOL OnMenuPopup(const HWND hWnd, const WPARAM wParam)
+{
+	char *opt;
+	u32 type;
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_STATUS, MF_BYCOMMAND| (show_status ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_FORCEGL, MF_BYCOMMAND| (force_2d_gl ? MF_CHECKED : MF_UNCHECKED) );
+	EnableMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (show_status ? MF_ENABLED : MF_GRAYED) );
+	if (show_status) CheckMenuItem((HMENU)wParam, IDM_VIEW_CPU, MF_BYCOMMAND| (view_cpu ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_LOW_RATE, MF_BYCOMMAND| (use_low_fps ? MF_CHECKED : MF_UNCHECKED) );
+
+	EnableMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl ? MF_ENABLED : MF_GRAYED) );
+	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTDRAW, MF_BYCOMMAND| (!force_2d_gl && gf_term_get_option(term, GF_OPT_DRAW_MODE) ? MF_CHECKED : MF_UNCHECKED) );
+
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_SVG_LOAD, MF_BYCOMMAND| (use_svg_prog ? MF_CHECKED : MF_UNCHECKED) );
+
+	opt = (char *)gf_cfg_get_key(user.config, "GAPI", "FBAccess");
+	if (!opt) opt = "raw";
+	CheckMenuItem((HMENU)wParam, ID_VIDEO_DIRECTFB, MF_BYCOMMAND| ( (!strcmp(opt,"raw")) ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_VIDEO_GAPI, MF_BYCOMMAND| ( (!strcmp(opt,"gx")) ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_VIDEO_GDI, MF_BYCOMMAND| ( (!strcmp(opt,"gdi")) ? MF_CHECKED : MF_UNCHECKED) );
+
+
+	type = gf_term_get_option(term, GF_OPT_ASPECT_RATIO);
+	CheckMenuItem((HMENU)wParam, IDS_CAP_DISABLE_PLAYLIST, MF_BYCOMMAND| (!playlist_navigation_on ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_NONE, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_KEEP) ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_FILL, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_FILL_SCREEN) ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_4_3, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_4_3) ? MF_CHECKED : MF_UNCHECKED);
+	CheckMenuItem((HMENU)wParam, IDM_VIEW_AR_16_9, MF_BYCOMMAND| (type==GF_ASPECT_RATIO_16_9) ? MF_CHECKED : MF_UNCHECKED);
+
+	EnableMenuItem((HMENU)wParam, IDM_FILE_PAUSE, MF_BYCOMMAND| (is_connected ? MF_ENABLED : MF_GRAYED) );
+
+	if (/*we have something to copy*/
+	    (gf_term_get_text_selection(term, GF_TRUE)!=NULL)
+	    /*or we are editing text and clipboard is not empty*/
+	    || (IsClipboardFormatAvailable(CF_TEXT) && (gf_term_paste_text(term, NULL, GF_TRUE)==GF_OK))
+	) {
+		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_ENABLED);
+	} else {
+		EnableMenuItem((HMENU)wParam, ID_FILE_CUT_PASTE, MF_BYCOMMAND| MF_GRAYED);
+	}
+
+	CheckMenuItem((HMENU)wParam, IDM_FILE_LOG_RTI, MF_BYCOMMAND| (log_rti) ? MF_CHECKED : MF_UNCHECKED);
+
+	if (!is_connected) type = 0;
+	else type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
+	navigation_on = type ? GF_TRUE : GF_FALSE;
+
+	EnableMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_RESET, MF_BYCOMMAND | (!type ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ((type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+	EnableMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( (type!=GF_NAVIGATE_TYPE_3D) ? MF_GRAYED : MF_ENABLED) );
+
+	if (type) {
+		u32 mode = gf_term_get_option(term, GF_OPT_NAVIGATION);
+		navigation_on = (mode==GF_NAVIGATE_NONE) ? GF_FALSE : GF_TRUE;
+		CheckMenuItem((HMENU)wParam, IDM_NAV_NONE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_NONE) ? MF_CHECKED : MF_UNCHECKED) );
+		CheckMenuItem((HMENU)wParam, IDM_NAV_SLIDE, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_SLIDE) ? MF_CHECKED : MF_UNCHECKED) );
+		CheckMenuItem((HMENU)wParam, IDM_NAV_WALK, MF_BYCOMMAND | ( (mode==GF_NAVIGATE_WALK) ? MF_CHECKED : MF_UNCHECKED) );
+		CheckMenuItem((HMENU)wParam, IDM_NAV_FLY, MF_BYCOMMAND | ((mode==GF_NAVIGATE_FLY) ? MF_CHECKED : MF_UNCHECKED) );
+		CheckMenuItem((HMENU)wParam, IDM_NAV_EXAMINE, MF_BYCOMMAND | ((mode==GF_NAVIGATE_EXAMINE) ? MF_CHECKED : MF_UNCHECKED) );
+
+		if (type==GF_NAVIGATE_TYPE_3D) {
+			CheckMenuItem((HMENU)wParam, IDM_NAV_HEADLIGHT, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_HEADLIGHT) ? MF_CHECKED : MF_UNCHECKED) );
+			CheckMenuItem((HMENU)wParam, IDM_NAV_GRAVITY, MF_BYCOMMAND | ( gf_term_get_option(term, GF_OPT_GRAVITY) ? MF_CHECKED : MF_UNCHECKED) );
+			type = gf_term_get_option(term, GF_OPT_COLLISION);
+			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_NONE, MF_BYCOMMAND | ( (type==GF_COLLISION_NONE) ? MF_CHECKED : MF_UNCHECKED) );
+			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_REG, MF_BYCOMMAND | ( (type==GF_COLLISION_NORMAL) ? MF_CHECKED : MF_UNCHECKED) );
+			CheckMenuItem((HMENU)wParam, IDM_NAV_COL_DISP, MF_BYCOMMAND | ( (type==GF_COLLISION_DISPLACEMENT) ? MF_CHECKED : MF_UNCHECKED) );
+		}
+	}
+
+	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
+	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_NONE, MF_BYCOMMAND | ( strstr(opt, "quiet") ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_ERROR, MF_BYCOMMAND | ( strstr(opt, "error") ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_WARNING, MF_BYCOMMAND | ( strstr(opt, "warning") ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_INFO, MF_BYCOMMAND | ( strstr(opt, "info") ? MF_CHECKED : MF_UNCHECKED) );
+	CheckMenuItem((HMENU)wParam, ID_LOGLEVEL_DEBUG, MF_BYCOMMAND | ( strstr(opt, "debug") ? MF_CHECKED : MF_UNCHECKED) );
+
+#define CHECK_TOOL(_ID, _name) CheckMenuItem((HMENU)wParam, _ID, MF_BYCOMMAND | ( ((strstr(opt, _name) != NULL) || !strcmp(opt, "all")) ? MF_CHECKED : MF_UNCHECKED) );
+	opt = (char *) gf_cfg_get_key(user.config, "General", "Logs");
+	CHECK_TOOL(ID_TOOLS_CORE, "core");
+	CHECK_TOOL(ID_TOOLS_CODING, "coding");
+	CHECK_TOOL(ID_TOOLS_CONTAINER, "container");
+	CHECK_TOOL(ID_TOOLS_NETWORK, "network");
+	CHECK_TOOL(ID_TOOLS_RTP, "rtp");
+	CHECK_TOOL(ID_TOOLS_SYNC, "sync");
+	CHECK_TOOL(ID_TOOLS_SCRIPT, "script");
+	CHECK_TOOL(ID_TOOLS_CODEC, "codec");
+	CHECK_TOOL(ID_TOOLS_PARSER, "parser");
+	CHECK_TOOL(ID_TOOLS_MEDIA, "media");
+	CHECK_TOOL(ID_TOOLS_SCENE, "scene");
+	CHECK_TOOL(ID_TOOLS_INTERACT, "interact");
+	CHECK_TOOL(ID_TOOLS_COMPOSE, "compose");
+	CHECK_TOOL(ID_TOOLS_MMIO, "mmio");
+	CHECK_TOOL(ID_TOOLS_RTI, "rti");
+
+
+	return TRUE;
+}
+
+
+BOOL CALLBACK MainWndProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+	switch (msg) {
+	case WM_CREATE:
+	{
+#ifdef _WIN32_WCE
+		SHMENUBARINFO mbi;
+		memset(&mbi, 0, sizeof(SHMENUBARINFO));
+		mbi.cbSize = sizeof(SHMENUBARINFO);
+		mbi.hwndParent = hwnd;
+		mbi.hInstRes = g_hinst;
+		mbi.nBmpId = 0;
+		mbi.cBmpImages = 0;
+
+		mbi.nToolBarId = IDM_MAIN_MENU;
+		SHCreateMenuBar(&mbi);
+		g_hwnd_menu = mbi.hwndMB;
+#else
+		g_hwnd_menu = NULL;
+#endif
+
+		g_hwnd_status = CreateWindow(TEXT("STATIC"), TEXT("Status"), WS_CHILD|WS_VISIBLE|SS_LEFT, 0, 0, disp_w, caption_h, hwnd, NULL, g_hinst, NULL);
+
+		do_layout(GF_TRUE);
+	}
+	break;
+
+	case WM_COMMAND:
+		if (HandleCommand(hwnd, wParam, lParam))
+			return DefWindowProc(hwnd, msg, wParam, lParam);
+		break;
+	case WM_TIMER:
+		if (wParam==STATE_TIMER_ID) update_state_info();
+#ifdef TERM_NOT_THREADED
+		else gf_term_process_step(term);
+#endif
+		break;
+	case WM_HOTKEY:
+		break;
+	case WM_KEYDOWN:
+		if (playlist_navigation_on && !navigation_on) {
+			if (wParam==VK_LEFT) {
+				switch_playlist(GF_TRUE);
+				break;
+			}
+			else if (wParam==VK_RIGHT) {
+				switch_playlist(GF_FALSE);
+				break;
+			}
+		}
+	/*fall through*/
+	case WM_SYSKEYDOWN:
+	case WM_SYSKEYUP:
+	case WM_KEYUP:
+	case WM_CHAR:
+	case WM_MOUSEMOVE:
+	case WM_LBUTTONDOWN:
+	case WM_LBUTTONDBLCLK:
+	case WM_LBUTTONUP:
+		::SendMessage(g_hwnd_disp, msg, wParam, lParam);
+		return 0;
+	case WM_INITMENUPOPUP:
+		OnMenuPopup(hwnd, wParam);
+		break;
+	case WM_CLOSE:
+		DestroyWindow(hwnd);
+		break;
+	case WM_SETFOCUS:
+		gf_freeze_display(GF_FALSE);
+		break;
+	case WM_KILLFOCUS:
+		if ((HWND) wParam==g_hwnd) {
+			gf_freeze_display(GF_TRUE);
+		}
+		break;
+	case WM_ACTIVATE:
+		if (WA_INACTIVE != LOWORD(wParam)) {
+			if ((HWND) lParam == g_hwnd) {
+				gf_freeze_display(GF_FALSE);
+				SetFocus(hwnd);
+			}
+		} else {
+			if ((HWND) lParam == g_hwnd_disp) {
+				gf_freeze_display(GF_TRUE);
+			}
+		}
+		break;
+	case WM_LOADTERM:
+		if (!LoadTerminal()) {
+			MessageBox(hwnd, _T("Cannot load GPAC"), _T("Error"), MB_OK);
+			PostQuitMessage(0);
+		}
+		break;
+	case WM_DESTROY:
+		PostQuitMessage(0);
+		break;
+	default:
+		return DefWindowProc(hwnd, msg, wParam, lParam);
+	}
+
+	return 0;
+}
+
+BOOL InitInstance (int CmdShow)
+{
+	WNDCLASS wc;
+
+	wc.style			= 0;
+	wc.lpfnWndProc		= (WNDPROC) MainWndProc;
+	wc.cbClsExtra		= 0;
+	wc.cbWndExtra		= 0;
+	wc.hInstance		= g_hinst;
+	wc.hIcon			= LoadIcon(g_hinst, MAKEINTRESOURCE(IDI_ICON));
+	wc.hCursor			= 0;
+	wc.hbrBackground	= (HBRUSH) GetStockObject(WHITE_BRUSH);
+	wc.lpszMenuName		= 0;
+	wc.lpszClassName	= _T("Osmophone");
+	RegisterClass(&wc);
+
+#ifdef _WIN32_WCE
+	int style = WS_VISIBLE;
+#else
+	int style = WS_POPUP;
+#endif
+
+	g_hwnd = CreateWindow(_T("Osmophone"), _T("Osmophone"),
+	                      style,
+	                      0, caption_h, disp_w, disp_h,
+	                      NULL, NULL, g_hinst, NULL);
+
+	if (!g_hwnd) return FALSE;
+
+	ShowWindow(g_hwnd, CmdShow);
+
+	refresh_recent_files();
+
+	::SetTimer(g_hwnd, STATE_TIMER_ID, STATE_TIMER_DUR, NULL);
+	do_layout(GF_TRUE);
+
+	set_status("Loading Terminal");
+	PostMessage(g_hwnd, WM_LOADTERM, 0, 0);
+	set_status("Ready");
+	return TRUE;
+}
+
+#ifndef GETRAWFRAMEBUFFER
+#define GETRAWFRAMEBUFFER   0x00020001
+typedef struct _RawFrameBufferInfo
+{
+	WORD wFormat;
+	WORD wBPP;
+	VOID *pFramePointer;
+	int	cxStride;
+	int	cyStride;
+	int cxPixels;
+	int cyPixels;
+} RawFrameBufferInfo;
+
+#define FORMAT_565 1
+#define FORMAT_555 2
+#define FORMAT_OTHER 3
+#endif
+
+int WINAPI WinMain(HINSTANCE hInstance,
+                   HINSTANCE hPrevInstance,
+#ifdef _WIN32_WCE
+                   LPWSTR lpCmdLine,
+#else
+                   LPSTR lpCmdLine,
+#endif
+                   int nShowCmd
+                  ) {
+	MSG 	msg;
+
+	HWND 	hwndOld = NULL;
+	const char *str;
+	Bool initial_launch = GF_FALSE;
+
+	if (hwndOld = FindWindow(_T("Osmophone"), NULL))
+	{
+		SetForegroundWindow(hwndOld);
+		return 0;
+	}
+
+	memset(&user, 0, sizeof(GF_User));
+	term = NULL;
+
+	g_hinst = hInstance;
+
+	screen_w = GetSystemMetrics(SM_CXSCREEN);
+	screen_h = GetSystemMetrics(SM_CYSCREEN);
+
+	/*are we in low res or high res*/
+	RawFrameBufferInfo Info;
+	HDC DC = GetDC(NULL);
+	ExtEscape(DC, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char*)&Info);
+	ReleaseDC(NULL,DC);
+	if (Info.pFramePointer) {
+		recompute_res(Info.cxPixels, Info.cyPixels);
+	} else {
+		recompute_res(screen_w, screen_h);
+	}
+
+
+
+#ifdef _WIN32_WCE
+	TCHAR      szBuf[MAX_PATH];
+	SystemParametersInfo(SPI_GETPLATFORMTYPE, MAX_PATH, szBuf, 0);
+	if (! lstrcmp(szBuf, __TEXT("PocketPC"))) is_ppc = GF_TRUE;
+	else if (! lstrcmp(szBuf, __TEXT("Palm PC2"))) is_ppc = GF_TRUE;
+#endif
+
+
+	user.config = gf_cfg_init(NULL, &initial_launch);
+	if (!user.config) {
+		MessageBox(NULL, _T("Couldn't locate GPAC config file"), _T("Fatal Error"), MB_OK);
+		return 0;
+	}
+
+	str = gf_cfg_get_key(user.config, "Compositor", "ScreenWidth");
+	if (str) screen_w = atoi(str);
+	str = gf_cfg_get_key(user.config, "Compositor", "ScreenHeight");
+	if (str) screen_h = atoi(str);
+	disp_w = screen_w;
+#ifdef _WIN32_WCE
+	disp_h = screen_h - menu_h /*- caption_h*/;
+#else
+	disp_h = screen_h;
+#endif
+
+	gf_sys_init(GF_MemTrackerNone);
+	user.modules = gf_modules_new(NULL, user.config);
+	if (!gf_modules_get_count(user.modules)) {
+		MessageBox(GetForegroundWindow(), _T("No modules found"), _T("GPAC Init Error"), MB_OK);
+		gf_modules_del(user.modules);
+		gf_cfg_del(user.config);
+		memset(&user, 0, sizeof(GF_User));
+		gf_sys_close();
+		return 0;
+	}
+
+	/*first launch, register all files ext*/
+	if (initial_launch) {
+		/*FFMPEG registration - FFMPEG DLLs compiled with CEGCC cannot be loaded directly under WM 6.1
+		cf http://cegcc.sourceforge.net/docs/faq.html#DllDoesNotWorkWithWindowsMobile6.1
+		*/
+		HKEY hKey = NULL;
+		DWORD dwSize;
+		DWORD dwValue;
+		RegCreateKeyEx(HKEY_LOCAL_MACHINE, _T("System\\Loader\\LoadModuleLow"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, &dwSize);
+		dwSize = 4;
+		dwValue = 1;
+		LONG res = RegSetValueEx(hKey, _T("avcodec-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		res = RegSetValueEx(hKey, _T("avformat-52.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		res = RegSetValueEx(hKey, _T("avutil-50.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		res = RegSetValueEx(hKey, _T("swscale-0.dll"), NULL, REG_DWORD, (unsigned char *)&dwValue, dwSize);
+		RegCloseKey(hKey);
+
+		u32 i;
+		for (i=0; i<gf_modules_get_count(user.modules); i++) {
+			GF_InputService *ifce = (GF_InputService *) gf_modules_load_interface(user.modules, i, GF_NET_CLIENT_INTERFACE);
+			if (!ifce) continue;
+			if (ifce) {
+				ifce->CanHandleURL(ifce, "test.test");
+				gf_modules_close_interface((GF_BaseInterface *)ifce);
+			}
+		}
+		MessageBox(NULL, _T("Thank you for installing GPAC"), _T("Initial setup done"), MB_OK);
+	}
+
+	str = gf_cfg_get_key(user.config, "General", "Loop");
+	loop = (!str || !stricmp(str, "yes")) ? GF_TRUE : GF_FALSE;
+
+	str = gf_cfg_get_key(user.config, "SAXLoader", "Progressive");
+	use_svg_prog = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
+
+	str = gf_cfg_get_key(user.config, "General", "RTIRefreshPeriod");
+	if (str) {
+		rti_update_time_ms = atoi(str);
+	} else {
+		gf_cfg_set_key(user.config, "General", "RTIRefreshPeriod", "200");
+	}
+
+	str = gf_cfg_get_key(user.config, "General", "ShowStatusBar");
+	show_status = (str && !strcmp(str, "yes")) ? GF_TRUE : GF_FALSE;
+
+
+#ifdef _WIN32_WCE
+	if (is_ppc) GXOpenInput();
+#endif
+
+	if (InitInstance(nShowCmd)) {
+		SetForegroundWindow(g_hwnd);
+		show_taskbar(GF_FALSE);
+
+		force_2d_gl = (Bool)gf_term_get_option(term, GF_OPT_USE_OPENGL);
+
+		while (GetMessage(&msg, NULL, 0,0) == TRUE) {
+			TranslateMessage (&msg);
+			DispatchMessage (&msg);
+
+			if (playlist_act) {
+				switch_playlist((Bool)(playlist_act-1));
+				playlist_act = 0;
+			}
+		}
+		show_taskbar(GF_TRUE);
+	}
+#ifdef _WIN32_WCE
+	if (is_ppc) GXCloseInput();
+#endif
+
+	/*and destroy*/
+	if (term) gf_term_del(term);
+	if (user.modules) gf_modules_del(user.modules);
+	if (user.config) gf_cfg_del(user.config);
+
+	if (backlight_off) set_backlight_state(GF_FALSE);
+
+	gf_sys_close();
+	if (log_file) gf_fclose(log_file);
+	return 0;
+}

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/newres.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/openfile.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/osmophone.rc Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/osmophone.vcxproj Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmophone/resource.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/Makefile Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.idl Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.xpt_linux Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/nsIOsmozilla.xpt_w32 Added

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmo_npapi.cpp Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmo_npapi.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.cpp Added

@@ -0,0 +1,531 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+*					All rights reserved
+*
+*  This file is part of GPAC / Osmozilla NPAPI plugin
+*
+*  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 "osmozilla.h"
+
+#ifdef XP_WIN
+#include <windows.h>
+#endif
+
+#include <gpac/options.h>
+#include <gpac/terminal.h>
+#include <gpac/term_info.h>
+
+
+short Osmozilla_GetURL(NPP instance, const char *url, const char *target);
+void Osmozilla_SetStatus(NPP instance, const char *message);
+
+
+void Osmozilla_Shutdown(Osmozilla *osmo)
+{
+	if (osmo->url) gf_free(osmo->url);
+	osmo->url = NULL;
+	if (osmo->term) {
+		GF_Terminal *a_term = osmo->term;
+		osmo->term = NULL;
+		gf_term_del(a_term);
+	}
+	if (osmo->user) {
+		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
+		if (osmo->user->config) gf_cfg_del(osmo->user->config);
+		gf_free(osmo->user);
+		osmo->user = NULL;
+	}
+}
+
+static void osmozilla_do_log(void *cbk, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list list)
+{
+	FILE *logs = (FILE *) cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
+
+Bool Osmozilla_EventProc(void *opaque, GF_Event *evt)
+{
+	char msg[1024];
+	Osmozilla *osmo = (Osmozilla *)opaque;
+	if (!osmo->term) return GF_FALSE;
+
+	switch (evt->type) {
+	case GF_EVENT_MESSAGE:
+		if (!evt->message.message) return GF_FALSE;
+		if (evt->message.error)
+			sprintf((char *)msg, "GPAC: %s (%s)", evt->message.message, gf_error_to_string(evt->message.error));
+		else
+			sprintf((char *)msg, "GPAC: %s", evt->message.message);
+
+		Osmozilla_SetStatus(osmo->np_instance, msg);
+		break;
+	case GF_EVENT_PROGRESS:
+		if (evt->progress.done == evt->progress.total) {
+			Osmozilla_SetStatus(osmo->np_instance, "");
+			osmo->download_progress = 100;
+		} else {
+			char *szTitle = (char *)"";
+			if (evt->progress.progress_type==0) szTitle = (char *)"Buffer ";
+			else if (evt->progress.progress_type==1)
+			{
+				szTitle = (char *)"Download ";
+				osmo->download_progress = (int) (100.0*evt->progress.done) / evt->progress.total;
+			}
+			else if (evt->progress.progress_type==2) szTitle = (char *)"Import ";
+
+			sprintf(msg, "(GPAC) %s: %02.2f", szTitle, (100.0*evt->progress.done) / evt->progress.total);
+			Osmozilla_SetStatus(osmo->np_instance, msg);
+		}
+		break;
+
+	/*IGNORE any scene size, just work with the size allocated in the parent doc*/
+	case GF_EVENT_SCENE_SIZE:
+		gf_term_set_size(osmo->term, osmo->width, osmo->height);
+		break;
+	/*window has been resized (full-screen plugin), resize*/
+	case GF_EVENT_SIZE:
+		osmo->width = evt->size.width;
+		osmo->height = evt->size.height;
+		gf_term_set_size(osmo->term, osmo->width, osmo->height);
+		break;
+	case GF_EVENT_CONNECT:
+		osmo->is_connected = evt->connect.is_connected;
+		break;
+	case GF_EVENT_DURATION:
+		osmo->can_seek = evt->duration.can_seek;
+		osmo->duration = evt->duration.duration;
+		break;
+	case GF_EVENT_DBLCLICK:
+		gf_term_set_option(osmo->term, GF_OPT_FULLSCREEN, !gf_term_get_option(osmo->term, GF_OPT_FULLSCREEN));
+		break;
+	case GF_EVENT_NAVIGATE_INFO:
+		strcpy(msg, evt->navigate.to_url);
+		Osmozilla_SetStatus(osmo->np_instance, msg);
+		break;
+	case GF_EVENT_NAVIGATE:
+		if (gf_term_is_supported_url(osmo->term, evt->navigate.to_url, GF_TRUE, osmo->disable_mime ? GF_TRUE : GF_FALSE)) {
+			gf_term_navigate_to(osmo->term, evt->navigate.to_url);
+			return GF_TRUE;
+		} else {
+			u32 i;
+			char *target = (char *)"_self";
+
+			for (i=0; i<evt->navigate.param_count; i++) {
+				if (!strcmp(evt->navigate.parameters[i], "_parent")) target = (char *)"_parent";
+				else if (!strcmp(evt->navigate.parameters[i], "_blank")) target = (char *)"_blank";
+				else if (!strcmp(evt->navigate.parameters[i], "_top")) target = (char *)"_top";
+				else if (!strcmp(evt->navigate.parameters[i], "_new")) target = (char *)"_new";
+				else if (!strnicmp(evt->navigate.parameters[i], "_target=", 8)) target = (char *) evt->navigate.parameters[i]+8;
+			}
+			Osmozilla_GetURL(osmo->np_instance, evt->navigate.to_url, target);
+			return GF_TRUE;
+		}
+		break;
+	}
+	return GF_FALSE;
+}
+
+int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn[], char* argv[])
+{
+	const char *str;
+	int i;
+	osmo->auto_start = 1;
+	osmo->use_gui = 0;
+
+	/*options sent from plugin*/
+	for(i=0; i<argc; i++) {
+		if (!argn[i] || !argv[i]) continue;
+		if (!stricmp(argn[i],"autostart") && (!stricmp(argv[i], "false") || !stricmp(argv[i], "no")) )
+			osmo->auto_start = 0;
+
+		else if (!stricmp(argn[i],"src") ) {
+			if (osmo->url) gf_free(osmo->url);
+			osmo->url = gf_strdup(argv[i]);
+		}
+		else if (!stricmp(argn[i],"use3d") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) ) {
+			osmo->use_3d = 1;
+		}
+		else if (!stricmp(argn[i],"loop") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) ) {
+			osmo->loop = 1;
+		}
+		else if (!stricmp(argn[i],"aspectratio")) {
+			osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
+			if (!stricmp(argv[i], "keep")) osmo->aspect_ratio = GF_ASPECT_RATIO_KEEP;
+			else if (!stricmp(argv[i], "16:9")) osmo->aspect_ratio = GF_ASPECT_RATIO_16_9;
+			else if (!stricmp(argv[i], "4:3")) osmo->aspect_ratio = GF_ASPECT_RATIO_4_3;
+			else if (!stricmp(argv[i], "fill")) osmo->aspect_ratio = GF_ASPECT_RATIO_FILL_SCREEN;
+		}
+		else if (!stricmp(argn[i],"gui") && (!stricmp(argv[i], "true") || !stricmp(argv[i], "yes") ) )
+			osmo->use_gui = 1;
+	}
+
+	/*URL is not absolute, request new stream to mozilla - we don't pass absolute URLs since some may not be
+	handled by gecko */
+	if (osmo->url) {
+		Bool absolute_url = GF_FALSE;
+		if (strstr(osmo->url, "://")) absolute_url = GF_TRUE;
+		else if (osmo->url[0] == '/') {
+			FILE *test = gf_fopen(osmo->url, "rb");
+			if (test) {
+				absolute_url = GF_TRUE;
+				gf_fclose(test);
+			}
+		}
+		else if ((osmo->url[1] == ':') && ((osmo->url[2] == '\\') || (osmo->url[2] == '/'))) absolute_url = GF_TRUE;
+
+		if (!absolute_url) {
+			char *url = osmo->url;
+			osmo->url = NULL;
+			Osmozilla_GetURL(osmo->np_instance, url, NULL);
+			gf_free(url);
+		}
+	}
+
+	GF_SAFEALLOC(osmo->user, GF_User);
+	osmo->user->config = gf_cfg_init(NULL, NULL);
+	/*need to have a valid cfg file for now*/
+	if (!osmo->user->config) {
+		gf_free(osmo->user);
+		osmo->user = NULL;
+#ifdef WIN32
+		MessageBox(NULL, "GPAC CONFIGURATION FILE NOT FOUND OR INVALID", "OSMOZILLA FATAL ERROR", MB_OK);
+#else
+		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC CONFIGURATION FILE NOT FOUND OR INVALID\n");
+#endif
+		return 0;
+	}
+
+	osmo->user->modules = gf_modules_new(NULL, osmo->user->config);
+	if (!gf_modules_get_count(osmo->user->modules)) {
+		if (osmo->user->modules) gf_modules_del(osmo->user->modules);
+		gf_free(osmo->user);
+		osmo->user = NULL;
+#ifdef WIN32
+		MessageBox(NULL, "GPAC MODULES NOT FOUND", "OSMOZILLA FATAL ERROR", MB_OK);
+#else
+		fprintf(stdout, "OSMOZILLA FATAL ERROR\nGPAC MODULES NOT FOUND\n");
+#endif
+		return 0;
+	}
+
+	osmo->user->opaque = osmo;
+	osmo->user->EventProc = Osmozilla_EventProc;
+
+	/*always fetch mime ? Check with anchor examples*/
+	osmo->disable_mime = 0;
+	str = gf_cfg_get_key(osmo->user->config, "General", "NoMIMETypeFetch");
+	if (str && !strcmp(str, "yes")) osmo->disable_mime = 0;
+	/*check log file*/
+	str = gf_cfg_get_key(osmo->user->config, "General", "LogFile");
+	if (str) {
+		osmo->logs = gf_fopen(str, "wt");
+		if (osmo->logs) gf_log_set_callback(osmo->logs, osmozilla_do_log);
+	}
+
+	/*setup logs*/
+	if (gf_log_set_tools_levels(gf_cfg_get_key(osmo->user->config, "General", "Logs")) != GF_OK)
+		fprintf(stdout, "Osmozilla: invalid log level specified\n");
+
+	fprintf(stdout, "Osmozilla initialized\n");
+	return 1;
+}
+
+int Osmozilla_SetWindow(Osmozilla *osmo, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height)
+{
+	const char *gui;
+
+	if (!osmo->user) return 0;
+
+	if (osmo->window_set) {
+		osmo->width = width;
+		osmo->height = height;
+		if (osmo->is_connected) gf_term_set_size(osmo->term, osmo->width, osmo->height);
+		return 1;
+	}
+	if (!os_wnd_handle) return 0;
+
+	osmo->width = width;
+	osmo->height = height;
+
+	osmo->user->os_window_handler = os_wnd_handle;
+	osmo->user->os_display = os_wnd_display;
+
+	/*Everything is now setup, create the terminal*/
+	fprintf(stdout, "Creating Osmozilla terminal\n");
+	osmo->term = gf_term_new(osmo->user);
+	if (!osmo->term) return 0;
+	fprintf(stdout, "Osmozilla terminal created\n");
+
+	gf_term_set_option(osmo->term, GF_OPT_ASPECT_RATIO, osmo->aspect_ratio);
+	osmo->window_set = 1;
+
+#ifdef XP_WIN
+	SetFocus((HWND)os_wnd_handle);
+#endif
+
+	/*stream not ready*/
+	if (!osmo->url || !osmo->auto_start) {
+		fprintf(stdout, "Osmozilla ready - not connecting to %s yet\n", osmo->url);
+		return 1;
+	}
+
+	/*connect from 0 and pause if not autoplay*/
+	gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
+	if (gui && osmo->use_gui) {
+		gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
+		gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", osmo->url);
+		gf_term_connect(osmo->term, gui);
+	} else {
+		gf_term_connect(osmo->term, osmo->url);
+	}
+	fprintf(stdout, "Osmozilla connected to %s\n", osmo->url);
+	return 1;
+}
+
+char *Osmozilla_GetVersion()
+{
+	return (char *) "GPAC Plugin " GPAC_FULL_VERSION " for NPAPI compatible Web Browsers. For more information go to <a href=\"http://gpac.io\">GPAC website</a>";
+}
+
+void Osmozilla_ConnectTo(Osmozilla *osmo, const char *url)
+{
+	if (!osmo->user) return;
+
+	if ( osmo->url && !strcmp(url, osmo->url))
+		return;
+
+	fprintf(stdout, "Osmozilla connecting to %s\n", url);
+
+	if (osmo->url) gf_free(osmo->url);
+	osmo->url = gf_strdup(url);
+
+	/*connect from 0 and pause if not autoplay*/
+	if (osmo->auto_start) {
+		const char *gui = gf_cfg_get_key(osmo->user->config, "General", "StartupFile");
+		if (gui && osmo->use_gui) {
+			gf_cfg_set_key(osmo->user->config, "Temp", "BrowserMode", "yes");
+			gf_cfg_set_key(osmo->user->config, "Temp", "GUIStartupFile", url);
+			gf_term_connect(osmo->term, gui);
+		} else {
+			gf_term_connect(osmo->term, url);
+		}
+	}
+	fprintf(stdout, "Osmozilla connected to %s\n", url);
+}
+
+void Osmozilla_Pause(Osmozilla *osmo)
+{
+	if (osmo->term) {
+		if (gf_term_get_option(osmo->term, GF_OPT_PLAY_STATE) == GF_STATE_PAUSED) {
+			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+		} else {
+			gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
+		}
+	}
+}
+
+void Osmozilla_Play(Osmozilla *osmo)
+{
+	if (!osmo->is_connected) {
+		if (osmo->url) gf_term_connect(osmo->term, (const char *) osmo->url);
+	} else {
+		gf_term_set_option(osmo->term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
+	}
+}
+
+void Osmozilla_Stop(Osmozilla *osmo)
+{
+	if (osmo->term) gf_term_disconnect(osmo->term);
+}
+
+#ifdef XP_WIN
+PBITMAPINFO CreateBitmapInfoStruct(GF_VideoSurface *pfb)
+{
+	PBITMAPINFO pbmi;
+	WORD    cClrBits;
+
+	cClrBits = 32;
+
+	pbmi = (PBITMAPINFO) LocalAlloc(LPTR,
+	                                sizeof(BITMAPINFOHEADER));
+
+	pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
+	pbmi->bmiHeader.biWidth = pfb->width;
+	pbmi->bmiHeader.biHeight = 1;
+	pbmi->bmiHeader.biPlanes = 1;
+	pbmi->bmiHeader.biBitCount = cClrBits;
+
+	pbmi->bmiHeader.biCompression = BI_RGB;
+	pbmi->bmiHeader.biSizeImage = ((pbmi->bmiHeader.biWidth * cClrBits +31) & ~31) /8
+	                              * pbmi->bmiHeader.biHeight;
+	pbmi->bmiHeader.biClrImportant = 0;
+	return pbmi;
+}
+#endif
+
+void Osmozilla_Print(Osmozilla *osmo, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height)
+{
+	if (is_embed) {
+#ifdef XP_MACOS
+		/*
+		os_print_dc contains a THPrint reference on MacOS
+		*/
+	}
+#endif  // XP_MACOS
+#ifdef XP_UNIX
+	/*
+	os_print_dc contains a NPPrintCallbackStruct on Unix and
+	the plug-in location and size in the NPWindow are in page coordinates (720/ inch), but the printer requires point coordinates (72/inch)
+	*/
+#endif  // XP_UNIX
+#ifdef XP_WIN
+	/*
+	The coordinates for the window rectangle are in TWIPS format.
+	This means that you need to convert the x-y coordinates using the Windows API call DPtoLP when you output text
+	*/
+	GF_VideoSurface fb;
+	u32 xsrc, ysrc;
+	u16 src_16;
+	char *src;
+	float deltay;
+	int	ysuiv = 0;
+	char *ligne;
+	BITMAPINFO	*infoSrc;
+	HDC pDC = (HDC)os_print_dc;
+	/*lock the source buffer */
+	gf_term_get_screen_buffer(osmo->term, &fb);
+	infoSrc = CreateBitmapInfoStruct(&fb);
+	deltay = (float)target_height/(float)fb.height;
+	ligne = (char *) LocalAlloc(GMEM_FIXED, fb.width*4);
+	for (ysrc=0; ysrc<fb.height; ysrc++) {
+		int ycrt, delta;
+		char *dst = (char*)ligne;
+		src = fb.video_buffer + ysrc * fb.pitch_y;
+		for (xsrc=0; xsrc<fb.width; xsrc++)
+		{
+			switch (fb.pixel_format) {
+			case GF_PIXEL_RGB_32:
+			case GF_PIXEL_ARGB:
+				dst[0] = src[0];
+				dst[1] = src[1];
+				dst[2] = src[2];
+				src+=4;
+				break;
+			case GF_PIXEL_BGR_32:
+			case GF_PIXEL_RGBA:
+				dst[0] = src[3];
+				dst[1] = src[2];
+				dst[2] = src[1];
+				src+=4;
+				break;
+			case GF_PIXEL_RGB_24:
+				dst[0] = src[2];
+				dst[1] = src[1];
+				dst[2] = src[0];
+				src+=3;
+				break;
+			case GF_PIXEL_BGR_24:
+				dst[0] = src[2];
+				dst[1] = src[1];
+				dst[2] = src[0];
+				src+=3;
+				break;
+			case GF_PIXEL_RGB_565:
+				src_16 = * ( (u16 *)src );
+				dst[2] = (src_16 >> 8) & 0xf8;
+				dst[2] += dst[2]>>5;
+				dst[1] = (src_16 >> 3) & 0xfc;
+				dst[1] += dst[1]>>6;
+				dst[0] = (src_16 << 3) & 0xf8;
+				dst[0] += dst[0]>>5;
+				src+=2;
+				break;
+			case GF_PIXEL_RGB_555:
+				src_16 = * (u16 *)src;
+				dst[2] = (src_16 >> 7) & 0xf8;
+				dst[2] += dst[2]>>5;
+				dst[1] = (src_16 >> 2) & 0xf8;
+				dst[1] += dst[1]>>5;
+				dst[0] = (src_16 << 3) & 0xf8;
+				dst[0] += dst[0]>>5;
+				src+=2;
+				break;
+			}
+			dst += 4;
+		}
+		ycrt = ysuiv;
+		ysuiv = (u32) ( ((float)ysrc+1.0)*deltay);
+		delta = ysuiv-ycrt;
+		StretchDIBits(
+		    pDC, target_x, target_y, target_width,
+		    delta,
+		    0, 0, fb.width, 1,
+		    ligne, infoSrc, DIB_RGB_COLORS, SRCCOPY);
+	}
+
+	/*unlock GPAC frame buffer */
+	gf_term_release_screen_buffer(osmo->term, &fb);
+	/* gf_free temporary  objects */
+	GlobalFree(ligne);
+	LocalFree(infoSrc);
+#endif   // XP_WIN
+
+	return;
+}
+
+/*TODO - this is full print, present the print dialog and manage the print*/
+}
+
+void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands)
+{
+	if (osmo->term) {
+		GF_Err e = gf_term_scene_update(osmo->term, (char *) type, (char *) commands);
+		if (e) {
+			char szMsg[1024];
+			sprintf((char *)szMsg, "GPAC: Error applying update (%s)", gf_error_to_string(e) );
+			Osmozilla_SetStatus(osmo->np_instance, szMsg);
+		}
+	}
+}
+
+void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up)
+{
+	if (osmo->term)
+		gf_term_switch_quality(osmo->term, switch_up ? GF_TRUE : GF_FALSE);
+}
+
+void Osmozilla_SetURL(Osmozilla *osmo, const char *url)
+{
+	if (osmo->term) {
+		if (osmo->url) gf_free(osmo->url);
+		osmo->url = gf_strdup(url);
+		gf_term_connect(osmo->term, osmo->url);
+	}
+}
+
+int Osmozilla_GetDownloadProgress(Osmozilla *osmo)
+{
+	if (osmo->term)
+		return osmo->download_progress;
+	return 0;
+}

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.def Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.h Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.png Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.rc Added

@@ -0,0 +1,128 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winresrc.h"
+
+/*do not include setup.h*/
+#define _GF_SETUP_H_
+#include <gpac/tools.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Neutral resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
+#ifdef _WIN32
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,1,0
+ PRODUCTVERSION 1,0,1,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904e4"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", " \0"
+            VALUE "FileDescription", "Osmozilla allows playback of many media and rich media files. For more information, visit <a href=""http://gpac.io"">gpac.io</a>\0"
+            VALUE "FileExtents", "*|aac|wrl,wrl.gz|x3dv,x3dv.gz,x3dvz|x3d,x3d.gz,x3dz|svg,svg.gz,svgz|mpg,mpeg,mp2,mpa,mpe,mpv2|asf,wma,wmv,asx,asr|avi|mp4,mpg4|mp4|m4a|3gp,3gpp|3gp,3gpp|3g2,3gp2|3g2,3gp2|mp2,mp3,mpga,mpega|ogg|sdp\0"
+            VALUE "FileOpenName", "GPAC Plugin|AAC Music|VRML World|X3D/VRML World|X3D/XML World|SVG Document|MPEG Video|WindowsMedia Movies|AVI Movies|MPEG-4 Videos|MPEG-4 Movies|MPEG-4 Music|3GPP Movies|3GPP Music|3GPP2 Movies|3GPP2 Music|MP3 Music|OGG Movies|SDP Session\0"
+            VALUE "FileVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
+            VALUE "InternalName", "nposmozilla\0"
+            VALUE "LegalCopyright", "Copyright � Telecom ParisTech 2005-2007\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "MIMEType", "application/x-gpac|audio/aac|model/vrml|model/x3d+vrml|model/x3d+xml|image/svg+xml|video/mpeg|video/x-ms-asf|video/avi|video/mp4|application/mp4|audio/mp4|video/3gpp|audio/3gpp|video/3gpp2|audio/3gpp2|audio/mpeg|application/ogg|application/sdp\0"
+            VALUE "OriginalFilename", "nposmozilla.dll\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "Osmozilla - GPAC Plugin for Mozilla\0"
+            VALUE "ProductVersion", GPAC_VERSION"-rev"GPAC_GIT_REVISION"\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+
+#endif    // !_MAC
+
+#endif    // Neutral resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""winresrc.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/osmozilla.vcxproj Added

@@ -0,0 +1,304 @@
+<?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>{A0288B75-0D95-4106-A3A7-779A891E8FEF}</ProjectGuid>
+    <RootNamespace>osmozilla</RootNamespace>
+  </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'">nposmozilla</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">nposmozilla</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">nposmozilla</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">nposmozilla</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/osmozilla_deb/osmozilla.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;XP_WIN32;XP_WIN;_X86_;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XPCOM_GLUE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\obj/osmozilla_deb/osmozilla.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\obj/osmozilla_deb/nposmozilla.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/osmozilla_deb/osmozilla.bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_X86_;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
+      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/osmozilla_rel/osmozilla.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\extra_lib\include\xulrunner-sdk\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;NPBASIC_EXPORTS;MOZILLA_STRICT_API;XP_WIN;_WIN64;XPCOM_GLUE;WINVER=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj/osmozilla_rel/osmozilla.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj/osmozilla_rel/</AssemblerListingLocation>
+      <ObjectFileName>.\obj/osmozilla_rel/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj/osmozilla_rel/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;user32.lib;gdi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>..\..\applications\osmozilla\osmozilla.def</ModuleDefinitionFile>
+      <ProgramDatabaseFile>.\obj/osmozilla_rel/nposmozilla.pdb</ProgramDatabaseFile>
+      <ImportLibrary>.\obj/osmozilla_rel/nposmozilla.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>copy ..\..\applications\osmozilla\nsIOsmozilla.xpt_w32 ..\..\bin\$(Platform)\$(Configuration)\nposmozilla.xpt</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\osmozilla\osmo_npapi.cpp" />
+    <ClCompile Include="..\..\applications\osmozilla\osmozilla.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\applications\osmozilla\osmozilla.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\applications\osmozilla\nsIOsmozilla.h" />
+    <ClInclude Include="..\..\applications\osmozilla\osmo_npapi.h" />
+    <ClInclude Include="..\..\applications\osmozilla\osmozilla.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/readme.txt Changed

gpac-1.0.0.tar.gz/applications/deprecated/old_arch/osmozilla/resource.h Changed

gpac-0.8.0.tar.gz/applications/generators/MPEG4/main.c -> gpac-1.0.0.tar.gz/applications/generators/MPEG4/main.c Changed

@@ -182,9 +182,8 @@
 u8 IsNDT(GF_List *NDTs, char *famName)
 {
 	u32 i;
-	char *ndtName;
 	for (i=0; i<gf_list_count(NDTs); i++) {
-		ndtName = gf_list_get(NDTs, i);
+		char *ndtName = gf_list_get(NDTs, i);
 		//remove SF / MF as we don't need that
 		if (!strcmp(ndtName+2, famName+2)) return 1;
 	}
@@ -277,7 +276,6 @@
 {
 	FILE *f;
 	u32 i, j;
-	char *NDTName;
 	BNode *n;
 	BField *bf;
 	Bool hasViewport;
@@ -366,7 +364,7 @@
 	//all NDTs are defined in v1
 	fprintf(f, "/*NodeDataType tags*/\nenum {\n");
 	for (i=0; i<gf_list_count(NDTs); i++) {
-		NDTName = gf_list_get(NDTs, i);
+		char *NDTName = gf_list_get(NDTs, i);
 		if (!i) {
 			fprintf(f, "\tNDT_%s = 1", NDTName);
 		} else {
@@ -402,10 +400,9 @@
 u32 IsNodeInTable(BNode *node, char *NDTName)
 {
 	u32 i;
-	char *ndt;
 
 	for (i=0; i<gf_list_count(node->NDT); i++) {
-		ndt = gf_list_get(node->NDT, i);
+		char *ndt = gf_list_get(node->NDT, i);
 		if (!strcmp(ndt, NDTName)) return 1;
 	}
 	return 0;
@@ -422,7 +419,6 @@
 u32 GetNDTCount(char *NDTName, GF_List *BNodes, u32 Version)
 {
 	u32 i, nodeCount;
-	BNode *n;
 
 	//V1 begins at 0
 	if (Version == 1) {
@@ -437,7 +433,7 @@
 		nodeCount = 1;
 	}
 	for (i=0; i<gf_list_count(BNodes); i++) {
-		n = gf_list_get(BNodes, i);
+		BNode *n = gf_list_get(BNodes, i);
 		if (n->version != Version) continue;
 		if (!IsNodeInTable(n, NDTName)) continue;
 		nodeCount++;
@@ -449,7 +445,6 @@
 void WriteNDT_H(FILE *f, GF_List *BNodes, GF_List *NDTs, u32 Version)
 {
 	u32 i, j, first, count;
-	char *NDTName;
 	BNode *n;
 
 
@@ -457,7 +452,7 @@
 
 	//for all NDTs
 	for (i=0; i<gf_list_count(NDTs); i++) {
-		NDTName = gf_list_get(NDTs, i);
+		char *NDTName = gf_list_get(NDTs, i);
 		count = GetNDTCount(NDTName, BNodes, Version);
 		if (Version == 2) {
 			count -= 2;
@@ -562,11 +557,10 @@
 void WriteNDT_Enc(FILE *f, GF_List *BNodes, GF_List *NDTs, u32 Version)
 {
 	u32 i, count;
-	char *NDTName;
 
 	fprintf(f, "u32 NDT_V%d_GetNodeType(u32 NDT_Tag, u32 NodeTag)\n{\n\tif(!NDT_Tag || !NodeTag) return 0;\n\tswitch(NDT_Tag) {\n", Version);
 	for (i=0; i<gf_list_count(NDTs); i++) {
-		NDTName = gf_list_get(NDTs, i);
+		char *NDTName = gf_list_get(NDTs, i);
 		count = GetNDTCount(NDTName, BNodes, Version);
 		if (Version == 2) {
 			count -= 2;
@@ -775,11 +769,10 @@
 void WriteNodeQuant(FILE *f, BNode *n)
 {
 	u32 i;
-	BField *bf;
 	fprintf(f, "static Bool %s_get_aq_info(GF_Node *n, u32 FieldIndex, u8 *QType, u8 *AType, Fixed *b_min, Fixed *b_max, u32 *QT13_bits)\n{\n\tswitch (FieldIndex) {\n", n->name);
 
 	for (i=0; i<gf_list_count(n->Fields) ; i++ ) {
-		bf = gf_list_get(n->Fields, i);
+		BField *bf = gf_list_get(n->Fields, i);
 		if (!bf->hasAnim && !bf->hasQuant) continue;
 
 		fprintf(f, "\tcase %d:\n", i);
@@ -1038,7 +1031,7 @@
 			}
 			//SFString
 			else if (!strcmp(bf->familly, "SFString")) {
-				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %u);\n", bf->name, (u32) strlen(bf->def)+1);
 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
 
@@ -1209,7 +1202,7 @@
 					store = CurrentLine;
 					CurrentLine = token;
 					GetNextToken(tok, " \"");
-					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
+					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %u);\n", bf->name, j, (u32) strlen(tok)+1);
 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
 					j+=1;
 					CurrentLine = store;
@@ -1378,10 +1371,6 @@
 
 				//get its name
 				GetNextToken(n->name, " \t[");
-				if (!strcmp(n->name, "TimeSensor")) {
-					n = n;
-				}
-
 				//extract the NDTs
 				GetNextToken(token, "\t[ %#=");
 				if (strcmp(token, "NDT")) {
@@ -1474,9 +1463,9 @@
 						}
 					} else if (!strcmp(f->familly, "SFInt32")) {
 						if (!strcmp(f->def, "+I") || !strcmp(f->def, "I")) {
-							strcpy(f->def, "1 << 31");
+							strcpy(f->def, "0x80000000");
 						} else if (!strcmp(f->def, "-I")) {
-							strcpy(f->def, "- (1 << 31)");
+							strcpy(f->def, "GF_INT_MIN");
 						}
 					}
 				}
@@ -1527,12 +1516,11 @@
 
 void WriteNodeDump(FILE *f, BNode *n)
 {
-	BField *bf;
 	u32 i;
 
 	fprintf(f, "static const char *%s_FieldName[] = {\n", n->name);
 	for (i=0; i<gf_list_count(n->Fields); i++) {
-		bf = gf_list_get(n->Fields, i);
+		BField *bf = gf_list_get(n->Fields, i);
 		if (!i) {
 			fprintf(f, " \"%s\"", bf->name);
 		} else {
@@ -1634,7 +1622,7 @@
 		        "</head>\n"\
 		        "<body>\n"\
 		        "<title>Node Coding Tables for BIFS Version %d group</title>\n"
-		        ,GPAC_FULL_VERSION, i+1, i+1);
+		        ,gf_gpac_version(), i+1, i+1);
 
 		for (j=0; j<nb_ndt; j++) {
 			u32 nb_in_ndt = 0;

gpac-0.8.0.tar.gz/applications/generators/SVG/laser.c -> gpac-1.0.0.tar.gz/applications/generators/SVG/laser.c Changed

gpac-0.8.0.tar.gz/applications/generators/SVG/main.c -> gpac-1.0.0.tar.gz/applications/generators/SVG/main.c Changed

@@ -323,7 +323,7 @@
 
 		if ( ctxt->node->doc == NULL ) {
 			/* if one XPaths a node from a fragment, libxml2 will
-			   refuse the lookup. this is not very usefull for XML
+			   refuse the lookup. this is not very useful for XML
 			   scripters. thus we need to create a temporary document
 			   to make libxml2 do it's job correctly.
 			 */
@@ -461,8 +461,6 @@
 			strcpy(att->impl_type, "SVG_PointerEvents");
 		} else if (!strcmp(att->svg_name, "vector-effect")) {
 			strcpy(att->impl_type, "SVG_VectorEffect");
-		} else if (!strcmp(att->svg_name, "vector-effect")) {
-			strcpy(att->impl_type, "SVG_VectorEffect");
 		} else if (!strcmp(att->svg_name, "display-align")) {
 			strcpy(att->impl_type, "SVG_DisplayAlign");
 		} else if (!strcmp(att->svg_name, "text-align")) {
@@ -631,7 +629,7 @@
 
 	/* attributes group already resolved */
 	for (j = 0; j < gf_list_count(globalAttrGrp); j++) {
-		SVGGenAttrGrp *attgrp = gf_list_get(globalAttrGrp, j);
+		attgrp = gf_list_get(globalAttrGrp, j);
 		if (!strcmp(attgrp->name, name)) {
 			return attgrp;
 		}

gpac-0.8.0.tar.gz/applications/generators/SVG/v2.c -> gpac-1.0.0.tar.gz/applications/generators/SVG/v2.c Changed

gpac-1.0.0.tar.gz/applications/generators/WebGLGen Added

gpac-1.0.0.tar.gz/applications/generators/WebGLGen/Makefile Added

gpac-1.0.0.tar.gz/applications/generators/WebGLGen/WGLGen Added

gpac-1.0.0.tar.gz/applications/generators/WebGLGen/main.c Added

@@ -0,0 +1,652 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2004-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / SVG Scene Graph Generator 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/tools.h>
+#include <gpac/list.h>
+
+static void start_ctx(char *ctx_name, FILE **ifce_c, FILE **fun_c)
+{
+	char szFile[GF_MAX_PATH];
+	sprintf(szFile, "../../../src/jsmods/%s.c", ctx_name);
+	FILE *res = gf_fopen(szFile, "wt");
+	*ifce_c = res;
+	*fun_c = gf_file_temp(NULL);
+
+	fprintf(res, "/* !! AUTOGENERATED FILE - DO NOT MODIFY !! \n");
+	fprintf(res, "\n%s implementation for QJS\n*/\n\n", ctx_name);
+}
+
+
+static void end_ctx(FILE *ifce_c, FILE *func_c, char *ctx_name)
+{
+
+	fprintf(ifce_c, "static const JSCFunctionListEntry %s_funcs[] =\n\{\n", ctx_name);
+	gf_fseek(func_c, 0, SEEK_SET);
+	while (!feof(func_c)) {
+		char szLine[4001];
+		szLine[0] = 0;
+		gf_fgets(szLine, 4000, func_c);
+		gf_fputs(szLine, ifce_c);
+	}
+	gf_fclose(func_c);
+	fprintf(ifce_c, "};\n");
+	gf_fclose(ifce_c);
+	gf_free(ctx_name);
+
+}
+
+static void put_const(FILE *fun_defs, char *c_name, char *c_val)
+{
+	fprintf(fun_defs, "\tJS_PROP_INT32_DEF(\"%s\", %s, JS_PROP_CONFIGURABLE),\n", c_name, c_val);
+}
+static void put_fun(FILE *fun_defs, char *f_name)
+{
+	fprintf(fun_defs, "\tJS_CFUNC_DEF(\"%s\", 0, wgl_%s),\n", f_name, f_name);
+}
+static void put_prop(FILE *fun_defs, char *ctx_name, char *pname, Bool is_readonly)
+{
+	if (is_readonly) {
+		fprintf(fun_defs, "\tJS_CGETSET_MAGIC_DEF(\"%s\", %s_getProperty, NULL, %s_PROP_%s),\n", pname, ctx_name, ctx_name, pname);
+	} else {
+		fprintf(fun_defs, "\tJS_CGETSET_MAGIC_DEF(\"%s\", %s_getProperty, %s_setProperty, %s_PROP_%s),\n", pname, ctx_name, ctx_name, ctx_name, pname);
+	}
+}
+
+static const char *get_arg_type(char *arg_type, Bool *is_array)
+{
+	*is_array = GF_FALSE;
+	if (!strcmp(arg_type, "GLenum")) return "u32";
+	if (!strcmp(arg_type, "DOMString"))  return "const char *";
+	if (!strcmp(arg_type, "DOMString?"))  return "const char *";
+	if (!strcmp(arg_type, "GLuint"))  return "u32";
+	if (!strcmp(arg_type, "GLint"))  return "s32";
+	if (!strcmp(arg_type, "GLuint"))  return "u32";
+	if (!strcmp(arg_type, "GLclampf"))  return "Float";
+	if (!strcmp(arg_type, "GLfloat"))  return "Float";
+	if (!strcmp(arg_type, "GLboolean"))  return "Bool";
+	if (!strcmp(arg_type, "boolean"))  return "Bool";
+	if (!strcmp(arg_type, "GLsizei"))  return "u32";
+	if (!strcmp(arg_type, "GLbitfield"))  return "u32";
+	if (!strcmp(arg_type, "GLshort"))  return "s16";
+	if (!strcmp(arg_type, "GLushort"))  return "u16";
+	if (!strcmp(arg_type, "GLsizeiptr"))  return "u64";
+	if (!strcmp(arg_type, "GLintptr"))  return "u64";
+	if (!strcmp(arg_type, "GLbyte"))  return "s8";
+	if (!strcmp(arg_type, "GLubyte"))  return "u8";
+	if (!strcmp(arg_type, "WebGLProgram?")) return "WebGLProgram";
+	if (!strcmp(arg_type, "WebGLShader?")) return "WebGLShader";
+	if (!strcmp(arg_type, "WebGLBuffer?")) return "WebGLBuffer";
+	if (!strcmp(arg_type, "WebGLFramebuffer?")) return "WebGLFramebuffer";
+	if (!strcmp(arg_type, "WebGLRenderbuffer?")) return "WebGLRenderbuffer";
+	if (!strcmp(arg_type, "WebGLTexture?")) return "WebGLTexture";
+	if (!strcmp(arg_type, "WebGLUniformLocation?")) return "WebGLUniformLocation";
+	if (!strcmp(arg_type, "TexImageSource?")) return "TexImageSource";
+	if (!strcmp(arg_type, "WebGLContextAttributes?")) return "WebGLContextAttributes";
+	if (!strcmp(arg_type, "boolean?")) return "Bool";
+	if (!strcmp(arg_type, "WebGLActiveInfo?")) return "JSValue";
+
+	if (!strcmp(arg_type, "Float32Array")) {
+		*is_array = GF_TRUE;
+		return "Float *";
+	}
+	if (!strcmp(arg_type, "Int32Array")) {
+		*is_array = GF_TRUE;
+		return "s32 *";
+	}
+	if (!strcmp(arg_type, "sequence<DOMString>?")) {
+		return "JSValue";
+	}
+	if (!strcmp(arg_type, "sequence<WebGLShader>?")) {
+		return "JSValue";
+	}
+	if (!strcmp(arg_type, "ArrayBufferView")
+		|| !strcmp(arg_type, "ArrayBufferView?")
+		|| !strcmp(arg_type, "BufferDataSource?")
+	) {
+		*is_array = GF_TRUE;
+		return "u8 *";
+	}
+
+	if (!strcmp(arg_type, "object?")
+		|| !strcmp(arg_type, "WebGLShaderPrecisionFormat?")
+		|| !strcmp(arg_type, "any")
+		) {
+		return NULL;
+	}
+
+	fprintf(stderr, "arg type %s not supported\n", arg_type);
+	return "JSValue";
+}
+
+static void put_arg_get(FILE *ifce_c, char *fname, int idx, char *arg_type, char *arg_name)
+{
+	Bool is_array;
+	const char *native_type = get_arg_type(arg_type, &is_array);
+	if (!native_type) return;
+
+	if (!strcmp(native_type, "Bool")) {
+		fprintf(ifce_c, "\tWGL_GET_BOOL(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "s32")) {
+		fprintf(ifce_c, "\tWGL_GET_S32(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "u32")) {
+		fprintf(ifce_c, "\tWGL_GET_U32(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "u64")) {
+		fprintf(ifce_c, "\tWGL_GET_U64(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "s64")) {
+		fprintf(ifce_c, "\tWGL_GET_S64(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "s16")) {
+		fprintf(ifce_c, "\tWGL_GET_S16(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "u16")) {
+		fprintf(ifce_c, "\tWGL_GET_U16(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(arg_type, "GLclampf")) {
+		fprintf(ifce_c, "\tWGL_GET_FLOAT_CLAMP(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "Float")) {
+		fprintf(ifce_c, "\tWGL_GET_FLOAT(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "const char *")) {
+		fprintf(ifce_c, "\tWGL_GET_STRING(%s, argv[%d]);\n", arg_name, idx);
+	}
+	else if (!strcmp(native_type, "WebGLProgram")
+	 	|| !strcmp(native_type, "WebGLShader")
+	 	|| !strcmp(native_type, "WebGLBuffer")
+	 	|| !strcmp(native_type, "WebGLFramebuffer")
+	 	|| !strcmp(native_type, "WebGLRenderbuffer")
+	 	|| !strcmp(native_type, "WebGLTexture")
+	 	|| !strcmp(native_type, "WebGLUniformLocation")
+	) {
+		fprintf(ifce_c, "\tWGL_GET_GLID(%s, argv[%d], %s_class_id);\n", arg_name, idx, native_type);
+	}
+
+	else if (!strcmp(arg_type, "BufferDataSource?")) {
+		fprintf(ifce_c, "\tif(!JS_IsObject(argv[%d])) {\n", idx);
+		fprintf(ifce_c, "\t\tWGL_GET_U32(%s_size, argv[%d]);\n", arg_name, idx);
+		fprintf(ifce_c, "\t} else {\n");
+		fprintf(ifce_c, "\t\t%s = wgl_GetArrayBuffer(ctx, &%s_size, argv[%d]);\n", arg_name, arg_name, idx);
+		fprintf(ifce_c, "\t}\n");
+	}
+	else if (is_array && !strcmp(native_type, "u8 *")) {
+		fprintf(ifce_c, "\tif(!JS_IsArray(ctx, argv[%d])) return js_throw_err(ctx, WGL_INVALID_VALUE);\n", idx);
+		fprintf(ifce_c, "\t%s = wgl_GetArrayBuffer(ctx, &%s_size, argv[%d]);\n", arg_name, arg_name, idx);
+	}
+	else if (is_array && (!strcmp(native_type, "Float *") || !strcmp(native_type, "s32 *")) ) {
+		u32 vlen = 1;
+		if (strstr(fname, "2fv")) vlen = 2;
+		else if (strstr(fname, "3fv")) vlen = 3;
+		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);
+		else {
+			Bool is_matrix = GF_FALSE;
+			if (strstr(fname, "Matrix")) is_matrix = GF_TRUE;
+			if (strstr(fname, "vertexAttrib")) {
+				fprintf(ifce_c, "\tif (!WGL_LOAD_FLOAT_VEC(ctx, argv[%d], (Float **) &%s, NULL, %d, %d)) return js_throw_err(ctx, WGL_INVALID_VALUE);\n", idx, arg_name, vlen, is_matrix);
+			} else {
+				fprintf(ifce_c, "\tif (!WGL_LOAD_FLOAT_VEC(ctx, argv[%d], (Float **) &%s, &%s_size, %d, %d)) return js_throw_err(ctx, WGL_INVALID_VALUE);\n", idx, arg_name, arg_name, vlen, is_matrix);
+			}
+		}
+	}
+	else {
+		fprintf(stderr, "arg type %s not supported\n", arg_type);
+	}
+
+}
+
+static void put_arg_decl(FILE *ifce_c, char *fname, char *arg_type, char *arg_name)
+{
+	Bool is_array = GF_FALSE;
+	const char *native_type = get_arg_type(arg_type, &is_array);
+	if (!native_type)
+		return;
+		
+	if (is_array) {
+		if (strstr(fname, "vertexAttrib1fv")) {
+			fprintf(ifce_c, "\tFloat %s[1];\n", arg_name);
+		} else if (strstr(fname, "vertexAttrib2fv")) {
+			fprintf(ifce_c, "\tFloat %s[2];\n", arg_name);
+		} else if (strstr(fname, "vertexAttrib3fv")) {
+			fprintf(ifce_c, "\tFloat %s[3];\n", arg_name);
+		} else if (strstr(fname, "vertexAttrib4fv")) {
+			fprintf(ifce_c, "\tFloat %s[4];\n", arg_name);
+		} else {
+			fprintf(ifce_c, "\t%s %s = NULL;\n", native_type, arg_name);
+			fprintf(ifce_c, "\tu32 %s_size = 0;\n", arg_name);
+		}
+	} else {
+		if (strstr(arg_name, " *"))
+			fprintf(ifce_c, "\t%s %s = NULL;\n", native_type, arg_name);
+		else if (!strcmp(native_type, "JSValue"))
+			fprintf(ifce_c, "\t%s %s = JS_UNDEFINED;\n", native_type, arg_name);
+		else if (!strncmp(native_type, "WebGL", 5))
+			fprintf(ifce_c, "\tGLuint %s = 0;\n", arg_name);
+		else
+			fprintf(ifce_c, "\t%s %s = 0;\n", native_type, arg_name);
+	}
+}
+/*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 void wrap_func(FILE *ifce_c, char *fname, char *fun_def)
+{
+	char *sep, *nsep;
+	u32 len, i, nb_args;
+	u32 first_char;
+	u32 ret_type=0;
+	Bool is_create=GF_FALSE;
+	Bool is_delete_fun=GF_FALSE;
+	char *ret_val=NULL, *exc_value=NULL, *arg_type[50], *arg_name[50];
+
+	if (strstr(not_autogen_funcs, fname)) {
+		fprintf(ifce_c, "\nstatic JSValue wgl_%s(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);\n", fname);
+		return;
+	}
+
+	fprintf(ifce_c, "\nstatic JSValue wgl_%s(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)\n{\n", fname);
+
+	nb_args = 0;
+	memset(arg_type, 0, sizeof(char *)*50);
+	memset(arg_name, 0, sizeof(char *)*50);
+
+	sep = fun_def;
+	while (sep[0]==' ') sep++;
+	/*parse exception*/
+	if (sep[0]=='[') {
+		nsep = strchr(sep, ']');
+		assert(nsep);
+		nsep[0]=0;
+		exc_value = gf_strdup(sep);
+		nsep[0]=']';
+		sep = nsep+1;
+		while (sep[0]==' ') sep++;
+	}
+	/*parse return value*/
+	nsep = strchr(sep, ' ');
+	assert(nsep);
+	nsep[0] = 0;
+	ret_val = strdup(sep);
+	sep = nsep+1;
+	len = strlen(fname);
+	assert(!strncmp(sep, fname, len) );
+	sep += len+1;
+	while (sep) {
+		char *next_arg;
+		nsep = strchr(sep, ',');
+		if (!nsep) {
+			nsep = strchr(sep, ')');
+			if (!nsep) break;
+		}
+		nsep[0]=0;
+		next_arg = nsep+1;
+
+		if (nb_args>=50) {
+			assert(0);
+		}
+		nsep = strchr(sep, ' ');
+		if (!nsep)
+			break;
+		assert(nsep);
+		nsep[0] = 0;
+		arg_type[nb_args] = gf_strdup(sep);
+		arg_name[nb_args] = gf_strdup(nsep+1);
+		nb_args++;
+		sep = next_arg;
+		while (sep[0]==' ') sep++;
+	}
+
+	fprintf(ifce_c, "\tJSValue ret_val_js = JS_UNDEFINED;\n");
+
+	for (i=0; i<nb_args; i++) {
+		put_arg_decl(ifce_c, fname, arg_type[i], arg_name[i]);
+	}
+	fprintf(ifce_c, "\tWGL_CHECK_CONTEXT\n");
+
+	if (nb_args) {
+		fprintf(ifce_c, "\tif (argc<%d) return js_throw_err(ctx, WGL_INVALID_VALUE);\n", nb_args);
+		for (i=0; i<nb_args; i++) {
+			put_arg_get(ifce_c, fname, i, arg_type[i], arg_name[i]);
+		}
+	}
+
+	/*hack a few funcs with different signatures*/
+	if (!strcmp(fname, "getActiveAttrib")) {
+		fprintf(ifce_c, "\tret_val_js = webgl_getActiveAttrib(ctx, program, index);\n\treturn ret_val_js;\n");
+		goto fun_done;
+	}
+	if (!strcmp(fname, "getActiveUniform")) {
+		fprintf(ifce_c, "\tret_val_js = webgl_getActiveUniform(ctx, program, index);\n\treturn ret_val_js;\n");
+		goto fun_done;
+	}
+	if (!strcmp(fname, "getAttachedShaders")) {
+		fprintf(ifce_c, "\tret_val_js = webgl_getAttachedShaders(ctx, JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id), program);\n\treturn ret_val_js;\n");
+		goto fun_done;
+	}
+	if (!strcmp(fname, "getBufferParameter")) {
+		fprintf(ifce_c, "\tret_val_js = webgl_getBufferParameter(ctx, target, pname);\n\treturn ret_val_js;\n");
+		goto fun_done;
+	}
+
+	if (ret_val && strcmp(ret_val, "void")) {
+		if (!strcmp(fname, "createBuffer") || !strcmp(fname, "createFramebuffer") || !strcmp(fname, "createTexture") || !strcmp(fname, "createRenderbuffer")) {
+			fprintf(ifce_c, "\tGF_WebGLObject *wglo;\n");
+			is_create = GF_TRUE;
+			ret_type = 2;
+
+		} else if (!strcmp(fname, "createProgram") || !strcmp(fname, "createShader")) {
+			fprintf(ifce_c, "\tGF_WebGLObject *wglo;\n");
+			ret_type = 2;
+		} else {
+			put_arg_decl(ifce_c, fname, ret_val, "ret_val");
+			ret_type = 1;
+		}
+	}
+
+	first_char = fname[0];
+	if ((first_char < 'A') || (first_char > 'Z')) {
+		first_char += 'A' - 'a';
+	}
+
+	if (is_create) {
+		fprintf(ifce_c, "\tGF_SAFEALLOC(wglo, GF_WebGLObject);\n");
+		fprintf(ifce_c, "\tif (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);\n");
+		fprintf(ifce_c, "\twglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);\n");
+		fprintf(ifce_c, "\tglGen%ss(1, &wglo->gl_id", fname+6);
+	} else {
+		if (!strcmp(fname, "deleteShader") || !strcmp(fname, "deleteProgram")) {
+			is_delete_fun=GF_TRUE;
+		}
+		if (!strcmp(fname, "deleteBuffer") || !strcmp(fname, "deleteTexture") || !strcmp(fname, "deleteFramebuffer") || !strcmp(fname, "deleteRenderbuffer")) {
+			fprintf(ifce_c, "\tgl%c%ss(1, &", first_char, fname+1);
+			is_delete_fun=GF_TRUE;
+		}
+		else if (!strcmp(fname, "createProgram") || !strcmp(fname, "createShader")) {
+			fprintf(ifce_c, "\tGF_SAFEALLOC(wglo, GF_WebGLObject);\n");
+			fprintf(ifce_c, "\tif (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);\n");
+			fprintf(ifce_c, "\twglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);\n");
+			fprintf(ifce_c, "\twglo->gl_id = gl%c%s(", first_char, fname+1);
+		} else if (!strcmp(fname, "clearDepth") || !strcmp(fname, "depthRange")) {
+			fprintf(ifce_c, "#if defined(GPAC_USE_GLES2)\n");
+			fprintf(ifce_c, "\tgl%c%sf(\n", first_char, fname+1);
+			fprintf(ifce_c, "#else\n");
+			fprintf(ifce_c, "\tgl%c%s(\n", first_char, fname+1);
+			fprintf(ifce_c, "#endif\n\t\t");
+		} else {
+			fprintf(ifce_c, "\t");
+			if (ret_type==1) {
+				fprintf(ifce_c, "ret_val = ");
+			}
+			if (!strncmp(fname, "uniform", 7)) {
+
+				fprintf(ifce_c, "/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/\n\tif ((s32) location>=0)\n\t\t");
+			}
+			fprintf(ifce_c, "gl%c%s(", first_char, fname+1);
+		}
+	}
+
+	Bool prev_is_transpose = GF_FALSE;
+	for (i=0; i<nb_args; i++) {
+		Bool is_array;
+		get_arg_type(arg_type[i], &is_array);
+
+		if (!strcmp(arg_name[i], "transpose")) {
+			fprintf(ifce_c, "%s_size, ", arg_name[i+1]);
+			prev_is_transpose = GF_TRUE;
+		}
+		else if (prev_is_transpose) {
+			is_array = GF_FALSE;
+		}
+
+		if (is_array && (
+			!strcmp(fname, "bufferData") || !strcmp(fname, "bufferSubData")
+			|| !strcmp(fname, "compressedTexImage2D") || !strcmp(fname, "compressedTexSubImage2D")
+			|| !strncmp(fname, "uniform", 7)
+
+		)) {
+			is_array = GF_FALSE;
+			fprintf(ifce_c, "%s_size, ", arg_name[i]);
+		}
+		if (!strcmp(arg_type[i], "GLintptr") && (!strcmp(fname, "vertexAttribPointer") || !strcmp(fname, "drawElements")) ) {
+			fprintf(ifce_c, "(void *)");
+		}
+
+		fprintf(ifce_c, "%s", arg_name[i]);
+
+		if (is_array) {
+			if (strstr(fname, "vertexAttrib1fv")) {}
+			else if (strstr(fname, "vertexAttrib2fv")) {}
+			else if (strstr(fname, "vertexAttrib3fv")) {}
+			else if (strstr(fname, "vertexAttrib4fv")) {}
+			else {
+				fprintf(ifce_c, ", %s_size", arg_name[i]);
+			}
+		}
+		if (i+1<nb_args)
+			fprintf(ifce_c, ", ");
+	}
+
+	fprintf(ifce_c, ");\n");
+	if (is_delete_fun) {
+		Bool is_array;
+		const char *nat_type = get_arg_type(arg_type[0], &is_array);
+		fprintf(ifce_c, "\t{\n\tGF_WebGLObject *glo = JS_GetOpaque(argv[0], %s_class_id);\n\tif (glo) {\n\tglo->gl_id=0;\n", nat_type);
+		fprintf(ifce_c, "\tJS_FreeValue(ctx, glo->obj);\n\tglo->obj = JS_UNDEFINED;\n\tgf_list_del_item(glo->par_ctx->all_objects, glo);\n");
+		fprintf(ifce_c, "\t}\n\t}\n");
+	}
+
+	if (ret_type==1) {
+
+		if (!strcmp(ret_val, "GLenum") || !strcmp(ret_val, "GLint")) {
+			fprintf(ifce_c, "\tret_val_js = JS_NewInt32(ctx, ret_val);\n");
+		} else if (!strcmp(ret_val, "GLboolean") ) {
+			fprintf(ifce_c, "\tret_val_js = JS_NewBool(ctx, ret_val);\n");
+		} else if (!strcmp(ret_val, "WebGLProgram") ) {
+			fprintf(ifce_c, "\tret_val_js = JS_NewObjectClass(ctx, WebGLProgram_class_id);\n");
+			fprintf(ifce_c, "\tJS_SetOpaque(ret_val_js, wglo);\n");
+		} else {
+			fprintf(stderr, "retval %s not supported in %s\n", ret_val, fname);
+		}
+	} else if (ret_type==2) {
+		Bool is_array;
+		const char *native_type = get_arg_type(ret_val, &is_array);
+		fprintf(ifce_c, "\tret_val_js = JS_NewObjectClass(ctx, %s_class_id);\n", native_type);
+		fprintf(ifce_c, "\tJS_SetOpaque(ret_val_js, wglo);\n");
+		fprintf(ifce_c, "\twglo->obj = JS_DupValue(ctx, ret_val_js);\n");
+		fprintf(ifce_c, "\twglo->class_id = %s_class_id;\n", native_type);
+		fprintf(ifce_c, "\tgf_list_add(wglo->par_ctx->all_objects, wglo);\n");
+	}
+
+	for (i=0; i<nb_args; i++) {
+		Bool is_array;
+		const char *native_type = get_arg_type(arg_type[i], &is_array);
+		if (!native_type) continue;
+		if (!strcmp(native_type, "const char *")) {
+			fprintf(ifce_c, "\tJS_FreeCString(ctx, %s);\n", arg_name[i]);
+		}
+
+		if (is_array && strcmp(native_type, "u8 *")) {
+			if (strstr(fname, "vertexAttrib1fv")) {
+			} else if (strstr(fname, "vertexAttrib2fv")) {
+			} else if (strstr(fname, "vertexAttrib3fv")) {
+			} else if (strstr(fname, "vertexAttrib4fv")) {
+			} else {
+				fprintf(ifce_c, "\tif (%s) gf_free(%s);\n", arg_name[i], arg_name[i]);
+			}
+		}
+	}
+
+	fprintf(ifce_c, "\treturn ret_val_js;\n");
+
+fun_done:
+	while (nb_args>1) {
+		gf_free(arg_type[nb_args-1]);
+		gf_free(arg_name[nb_args-1]);
+		nb_args--;
+	}
+	gf_free(ret_val);
+	fprintf(ifce_c, "}\n");
+}
+
+
+static void load_idl(const char *file)
+{
+	Bool in_ctxbase = GF_FALSE;
+	char szLine[4001], *sep;
+	char *curCtx = NULL;
+	u32 len;
+	FILE * idl = gf_fopen(file, "rt");
+	FILE *ifce_c=NULL;
+	FILE *fun_defs=NULL;
+
+	while (!feof(idl)) {
+		gf_fgets(szLine, 4000, idl);
+		if (strstr(szLine, "implements"))
+			continue;
+		len = strlen(szLine);
+		while (len && strchr(" \n", szLine[len])) {
+			szLine[len] = 0;
+			len--;
+		}
+		if (!len) continue;
+
+		if (!in_ctxbase) {
+			if (!strstr(szLine, "RenderingContextBase"))
+				continue;
+			in_ctxbase = GF_TRUE;
+			sep = strchr(szLine, ' ');
+			assert(sep);
+			curCtx = gf_strdup(sep+1);
+			start_ctx(curCtx, &ifce_c, &fun_defs);
+			continue;
+		} else {
+			if (strstr(szLine, "};")){
+				in_ctxbase = GF_FALSE;
+				end_ctx(ifce_c, fun_defs, curCtx);
+				ifce_c = NULL;
+				continue;
+			}
+		}
+
+		if (strstr(szLine, "/*")) continue;
+		sep = strstr(szLine, "const ");
+		if (sep) {
+			char *cname, *nsep;
+			sep = strchr(sep+7, ' ');
+			assert(sep);
+			sep++;
+			nsep = strchr(sep, ' ');
+			assert(nsep);
+			nsep[0] = 0;
+			cname = gf_strdup(sep);
+			sep = strchr(nsep+1, '=');
+			assert(sep);
+			sep++;
+			while (sep[0]==' ') sep++;
+			nsep = strchr(sep, ';');
+			assert(nsep);
+			nsep[0]=0;
+			put_const(fun_defs, cname, sep);
+			gf_free(cname);
+			continue;
+		}
+		sep = strstr(szLine, "typedef");
+		if (sep) continue;
+
+		sep = strstr(szLine, "attribute");
+		if (sep) {
+			char *nsep;
+			Bool is_readonly = GF_FALSE;
+			sep = szLine;
+			while (sep[0]==' ') sep++;
+			if (!strncmp(sep, "readonly", 8)) {
+				is_readonly = GF_TRUE;
+				sep+=9;
+			}
+			sep += 10;
+			sep = strchr(sep, ' ');
+			assert(sep);
+			sep+=1;
+			nsep = strchr(sep, ';');
+			assert(nsep);
+			nsep[0] = 0;
+			put_prop(fun_defs, curCtx, sep, is_readonly);
+			continue;
+		}
+		/*double type declaration for glXXXifv*/
+		if (strstr(szLine, ", sequence<"))
+			continue;
+		/*double type declaration for bufferData*/
+		if (strstr(szLine, ", GLsizeiptr size"))
+			continue;
+		/*double type declaration for texImage2D and texSubImage2D*/
+		if (strstr(szLine, ", TexImageSource"))
+			continue;
+
+		sep = strstr(szLine, "(");
+		/*this is a function*/
+		if (sep) {
+			char *nsep, *fname;
+			sep = strchr(szLine, ']');
+			if (sep) sep+=1;
+			else sep = szLine;
+			while (sep[0] == ' ') sep++;
+			sep = strchr(sep, ' ');
+			assert(sep);
+			sep++;
+			nsep = strchr(sep, '(');
+			assert(nsep);
+			nsep[0] = 0;
+			fname = gf_strdup(sep);
+			put_fun(fun_defs, sep);
+			nsep[0] = '(';
+
+			wrap_func(ifce_c, fname, szLine);
+			gf_free(fname);
+			continue;
+		}
+		fprintf(stderr, "instruction %s not handled\n", szLine);
+	}
+
+
+	gf_fclose(idl);
+}
+
+int main(int argc, char **argv)
+{
+	u32 i=0;
+	for (i=1; i<argc; i++) {
+		load_idl(argv[i]);
+	}
+
+	return 0;
+}
+
+

gpac-1.0.0.tar.gz/applications/generators/WebGLGen/webgl1.idl Added

@@ -0,0 +1,708 @@
+// AUTOGENERATED FILE -- DO NOT EDIT -- SEE Makefile
+//
+// WebGL IDL definitions scraped from the Khronos specification:
+// https://www.khronos.org/registry/webgl/specs/latest/
+//
+// This IDL depends on the typed array specification defined at:
+// https://www.khronos.org/registry/typedarray/specs/latest/typedarrays.idl
+
+typedef unsigned long  GLenum;
+typedef boolean        GLboolean;
+typedef unsigned long  GLbitfield;
+typedef byte           GLbyte;         /* 'byte' should be a signed 8 bit type. */
+typedef short          GLshort;
+typedef long           GLint;
+typedef long           GLsizei;
+typedef long long      GLintptr;
+typedef long long      GLsizeiptr;
+// Ideally the typedef below would use 'unsigned byte', but that doesn't currently exist in Web IDL.
+typedef octet          GLubyte;        /* 'octet' should be an unsigned 8 bit type. */
+typedef unsigned short GLushort;
+typedef unsigned long  GLuint;
+typedef unrestricted float GLfloat;
+typedef unrestricted float GLclampf;  
+
+
+dictionary WebGLContextAttributes {
+    GLboolean alpha = true;
+    GLboolean depth = true;
+    GLboolean stencil = false;
+    GLboolean antialias = true;
+    GLboolean premultipliedAlpha = true;
+    GLboolean preserveDrawingBuffer = false;
+    GLboolean preferLowPowerToHighPerformance = false;
+    GLboolean failIfMajorPerformanceCaveat = false;
+};
+
+interface WebGLObject {
+};
+
+interface WebGLBuffer : WebGLObject {
+};
+
+interface WebGLFramebuffer : WebGLObject {
+};
+
+interface WebGLProgram : WebGLObject {
+};
+
+interface WebGLRenderbuffer : WebGLObject {
+};
+
+interface WebGLShader : WebGLObject {
+};
+
+interface WebGLTexture : WebGLObject {
+};
+
+interface WebGLUniformLocation {
+};
+
+interface WebGLActiveInfo {
+    readonly attribute GLint size;
+    readonly attribute GLenum type;
+    readonly attribute DOMString name;
+};
+
+interface WebGLShaderPrecisionFormat {
+    readonly attribute GLint rangeMin;
+    readonly attribute GLint rangeMax;
+    readonly attribute GLint precision;
+};
+
+[NoInterfaceObject]
+interface WebGLRenderingContextBase
+{
+
+    /* ClearBufferMask */
+    const GLenum DEPTH_BUFFER_BIT               = 0x00000100;
+    const GLenum STENCIL_BUFFER_BIT             = 0x00000400;
+    const GLenum COLOR_BUFFER_BIT               = 0x00004000;
+    
+    /* BeginMode */
+    const GLenum POINTS                         = 0x0000;
+    const GLenum LINES                          = 0x0001;
+    const GLenum LINE_LOOP                      = 0x0002;
+    const GLenum LINE_STRIP                     = 0x0003;
+    const GLenum TRIANGLES                      = 0x0004;
+    const GLenum TRIANGLE_STRIP                 = 0x0005;
+    const GLenum TRIANGLE_FAN                   = 0x0006;
+    
+    /* AlphaFunction (not supported in ES20) */
+    /*      NEVER */
+    /*      LESS */
+    /*      EQUAL */
+    /*      LEQUAL */
+    /*      GREATER */
+    /*      NOTEQUAL */
+    /*      GEQUAL */
+    /*      ALWAYS */
+    
+    /* BlendingFactorDest */
+    const GLenum ZERO                           = 0;
+    const GLenum ONE                            = 1;
+    const GLenum SRC_COLOR                      = 0x0300;
+    const GLenum ONE_MINUS_SRC_COLOR            = 0x0301;
+    const GLenum SRC_ALPHA                      = 0x0302;
+    const GLenum ONE_MINUS_SRC_ALPHA            = 0x0303;
+    const GLenum DST_ALPHA                      = 0x0304;
+    const GLenum ONE_MINUS_DST_ALPHA            = 0x0305;
+    
+    /* BlendingFactorSrc */
+    /*      ZERO */
+    /*      ONE */
+    const GLenum DST_COLOR                      = 0x0306;
+    const GLenum ONE_MINUS_DST_COLOR            = 0x0307;
+    const GLenum SRC_ALPHA_SATURATE             = 0x0308;
+    /*      SRC_ALPHA */
+    /*      ONE_MINUS_SRC_ALPHA */
+    /*      DST_ALPHA */
+    /*      ONE_MINUS_DST_ALPHA */
+    
+    /* BlendEquationSeparate */
+    const GLenum FUNC_ADD                       = 0x8006;
+    const GLenum BLEND_EQUATION                 = 0x8009;
+    const GLenum BLEND_EQUATION_RGB             = 0x8009;   /* same as BLEND_EQUATION */
+    const GLenum BLEND_EQUATION_ALPHA           = 0x883D;
+    
+    /* BlendSubtract */
+    const GLenum FUNC_SUBTRACT                  = 0x800A;
+    const GLenum FUNC_REVERSE_SUBTRACT          = 0x800B;
+    
+    /* Separate Blend Functions */
+    const GLenum BLEND_DST_RGB                  = 0x80C8;
+    const GLenum BLEND_SRC_RGB                  = 0x80C9;
+    const GLenum BLEND_DST_ALPHA                = 0x80CA;
+    const GLenum BLEND_SRC_ALPHA                = 0x80CB;
+    const GLenum CONSTANT_COLOR                 = 0x8001;
+    const GLenum ONE_MINUS_CONSTANT_COLOR       = 0x8002;
+    const GLenum CONSTANT_ALPHA                 = 0x8003;
+    const GLenum ONE_MINUS_CONSTANT_ALPHA       = 0x8004;
+    const GLenum BLEND_COLOR                    = 0x8005;
+    
+    /* Buffer Objects */
+    const GLenum ARRAY_BUFFER                   = 0x8892;
+    const GLenum ELEMENT_ARRAY_BUFFER           = 0x8893;
+    const GLenum ARRAY_BUFFER_BINDING           = 0x8894;
+    const GLenum ELEMENT_ARRAY_BUFFER_BINDING   = 0x8895;
+    
+    const GLenum STREAM_DRAW                    = 0x88E0;
+    const GLenum STATIC_DRAW                    = 0x88E4;
+    const GLenum DYNAMIC_DRAW                   = 0x88E8;
+    
+    const GLenum BUFFER_SIZE                    = 0x8764;
+    const GLenum BUFFER_USAGE                   = 0x8765;
+    
+    const GLenum CURRENT_VERTEX_ATTRIB          = 0x8626;
+    
+    /* CullFaceMode */
+    const GLenum FRONT                          = 0x0404;
+    const GLenum BACK                           = 0x0405;
+    const GLenum FRONT_AND_BACK                 = 0x0408;
+    
+    /* DepthFunction */
+    /*      NEVER */
+    /*      LESS */
+    /*      EQUAL */
+    /*      LEQUAL */
+    /*      GREATER */
+    /*      NOTEQUAL */
+    /*      GEQUAL */
+    /*      ALWAYS */
+    
+    /* EnableCap */
+    /* TEXTURE_2D */
+    const GLenum CULL_FACE                      = 0x0B44;
+    const GLenum BLEND                          = 0x0BE2;
+    const GLenum DITHER                         = 0x0BD0;
+    const GLenum STENCIL_TEST                   = 0x0B90;
+    const GLenum DEPTH_TEST                     = 0x0B71;
+    const GLenum SCISSOR_TEST                   = 0x0C11;
+    const GLenum POLYGON_OFFSET_FILL            = 0x8037;
+    const GLenum SAMPLE_ALPHA_TO_COVERAGE       = 0x809E;
+    const GLenum SAMPLE_COVERAGE                = 0x80A0;
+    
+    /* ErrorCode */
+    const GLenum NO_ERROR                       = 0;
+    const GLenum INVALID_ENUM                   = 0x0500;
+    const GLenum INVALID_VALUE                  = 0x0501;
+    const GLenum INVALID_OPERATION              = 0x0502;
+    const GLenum OUT_OF_MEMORY                  = 0x0505;
+    
+    /* FrontFaceDirection */
+    const GLenum CW                             = 0x0900;
+    const GLenum CCW                            = 0x0901;
+    
+    /* GetPName */
+    const GLenum LINE_WIDTH                     = 0x0B21;
+    const GLenum ALIASED_POINT_SIZE_RANGE       = 0x846D;
+    const GLenum ALIASED_LINE_WIDTH_RANGE       = 0x846E;
+    const GLenum CULL_FACE_MODE                 = 0x0B45;
+    const GLenum FRONT_FACE                     = 0x0B46;
+    const GLenum DEPTH_RANGE                    = 0x0B70;
+    const GLenum DEPTH_WRITEMASK                = 0x0B72;
+    const GLenum DEPTH_CLEAR_VALUE              = 0x0B73;
+    const GLenum DEPTH_FUNC                     = 0x0B74;
+    const GLenum STENCIL_CLEAR_VALUE            = 0x0B91;
+    const GLenum STENCIL_FUNC                   = 0x0B92;
+    const GLenum STENCIL_FAIL                   = 0x0B94;
+    const GLenum STENCIL_PASS_DEPTH_FAIL        = 0x0B95;
+    const GLenum STENCIL_PASS_DEPTH_PASS        = 0x0B96;
+    const GLenum STENCIL_REF                    = 0x0B97;
+    const GLenum STENCIL_VALUE_MASK             = 0x0B93;
+    const GLenum STENCIL_WRITEMASK              = 0x0B98;
+    const GLenum STENCIL_BACK_FUNC              = 0x8800;
+    const GLenum STENCIL_BACK_FAIL              = 0x8801;
+    const GLenum STENCIL_BACK_PASS_DEPTH_FAIL   = 0x8802;
+    const GLenum STENCIL_BACK_PASS_DEPTH_PASS   = 0x8803;
+    const GLenum STENCIL_BACK_REF               = 0x8CA3;
+    const GLenum STENCIL_BACK_VALUE_MASK        = 0x8CA4;
+    const GLenum STENCIL_BACK_WRITEMASK         = 0x8CA5;
+    const GLenum VIEWPORT                       = 0x0BA2;
+    const GLenum SCISSOR_BOX                    = 0x0C10;
+    /*      SCISSOR_TEST */
+    const GLenum COLOR_CLEAR_VALUE              = 0x0C22;
+    const GLenum COLOR_WRITEMASK                = 0x0C23;
+    const GLenum UNPACK_ALIGNMENT               = 0x0CF5;
+    const GLenum PACK_ALIGNMENT                 = 0x0D05;
+    const GLenum MAX_TEXTURE_SIZE               = 0x0D33;
+    const GLenum MAX_VIEWPORT_DIMS              = 0x0D3A;
+    const GLenum SUBPIXEL_BITS                  = 0x0D50;
+    const GLenum RED_BITS                       = 0x0D52;
+    const GLenum GREEN_BITS                     = 0x0D53;
+    const GLenum BLUE_BITS                      = 0x0D54;
+    const GLenum ALPHA_BITS                     = 0x0D55;
+    const GLenum DEPTH_BITS                     = 0x0D56;
+    const GLenum STENCIL_BITS                   = 0x0D57;
+    const GLenum POLYGON_OFFSET_UNITS           = 0x2A00;
+    /*      POLYGON_OFFSET_FILL */
+    const GLenum POLYGON_OFFSET_FACTOR          = 0x8038;
+    const GLenum TEXTURE_BINDING_2D             = 0x8069;
+    const GLenum SAMPLE_BUFFERS                 = 0x80A8;
+    const GLenum SAMPLES                        = 0x80A9;
+    const GLenum SAMPLE_COVERAGE_VALUE          = 0x80AA;
+    const GLenum SAMPLE_COVERAGE_INVERT         = 0x80AB;
+    
+    /* GetTextureParameter */
+    /*      TEXTURE_MAG_FILTER */
+    /*      TEXTURE_MIN_FILTER */
+    /*      TEXTURE_WRAP_S */
+    /*      TEXTURE_WRAP_T */
+    
+    const GLenum COMPRESSED_TEXTURE_FORMATS     = 0x86A3;
+    
+    /* HintMode */
+    const GLenum DONT_CARE                      = 0x1100;
+    const GLenum FASTEST                        = 0x1101;
+    const GLenum NICEST                         = 0x1102;
+    
+    /* HintTarget */
+    const GLenum GENERATE_MIPMAP_HINT            = 0x8192;
+    
+    /* DataType */
+    const GLenum BYTE                           = 0x1400;
+    const GLenum UNSIGNED_BYTE                  = 0x1401;
+    const GLenum SHORT                          = 0x1402;
+    const GLenum UNSIGNED_SHORT                 = 0x1403;
+    const GLenum INT                            = 0x1404;
+    const GLenum UNSIGNED_INT                   = 0x1405;
+    const GLenum FLOAT                          = 0x1406;
+    
+    /* PixelFormat */
+    const GLenum DEPTH_COMPONENT                = 0x1902;
+    const GLenum ALPHA                          = 0x1906;
+    const GLenum RGB                            = 0x1907;
+    const GLenum RGBA                           = 0x1908;
+    const GLenum LUMINANCE                      = 0x1909;
+    const GLenum LUMINANCE_ALPHA                = 0x190A;
+    
+    /* PixelType */
+    /*      UNSIGNED_BYTE */
+    const GLenum UNSIGNED_SHORT_4_4_4_4         = 0x8033;
+    const GLenum UNSIGNED_SHORT_5_5_5_1         = 0x8034;
+    const GLenum UNSIGNED_SHORT_5_6_5           = 0x8363;
+    
+    /* Shaders */
+    const GLenum FRAGMENT_SHADER                  = 0x8B30;
+    const GLenum VERTEX_SHADER                    = 0x8B31;
+    const GLenum MAX_VERTEX_ATTRIBS               = 0x8869;
+    const GLenum MAX_VERTEX_UNIFORM_VECTORS       = 0x8DFB;
+    const GLenum MAX_VARYING_VECTORS              = 0x8DFC;
+    const GLenum MAX_COMBINED_TEXTURE_IMAGE_UNITS = 0x8B4D;
+    const GLenum MAX_VERTEX_TEXTURE_IMAGE_UNITS   = 0x8B4C;
+    const GLenum MAX_TEXTURE_IMAGE_UNITS          = 0x8872;
+    const GLenum MAX_FRAGMENT_UNIFORM_VECTORS     = 0x8DFD;
+    const GLenum SHADER_TYPE                      = 0x8B4F;
+    const GLenum DELETE_STATUS                    = 0x8B80;
+    const GLenum LINK_STATUS                      = 0x8B82;
+    const GLenum VALIDATE_STATUS                  = 0x8B83;
+    const GLenum ATTACHED_SHADERS                 = 0x8B85;
+    const GLenum ACTIVE_UNIFORMS                  = 0x8B86;
+    const GLenum ACTIVE_ATTRIBUTES                = 0x8B89;
+    const GLenum SHADING_LANGUAGE_VERSION         = 0x8B8C;
+    const GLenum CURRENT_PROGRAM                  = 0x8B8D;
+    
+    /* StencilFunction */
+    const GLenum NEVER                          = 0x0200;
+    const GLenum LESS                           = 0x0201;
+    const GLenum EQUAL                          = 0x0202;
+    const GLenum LEQUAL                         = 0x0203;
+    const GLenum GREATER                        = 0x0204;
+    const GLenum NOTEQUAL                       = 0x0205;
+    const GLenum GEQUAL                         = 0x0206;
+    const GLenum ALWAYS                         = 0x0207;
+    
+    /* StencilOp */
+    /*      ZERO */
+    const GLenum KEEP                           = 0x1E00;
+    const GLenum REPLACE                        = 0x1E01;
+    const GLenum INCR                           = 0x1E02;
+    const GLenum DECR                           = 0x1E03;
+    const GLenum INVERT                         = 0x150A;
+    const GLenum INCR_WRAP                      = 0x8507;
+    const GLenum DECR_WRAP                      = 0x8508;
+    
+    /* StringName */
+    const GLenum VENDOR                         = 0x1F00;
+    const GLenum RENDERER                       = 0x1F01;
+    const GLenum VERSION                        = 0x1F02;
+    
+    /* TextureMagFilter */
+    const GLenum NEAREST                        = 0x2600;
+    const GLenum LINEAR                         = 0x2601;
+    
+    /* TextureMinFilter */
+    /*      NEAREST */
+    /*      LINEAR */
+    const GLenum NEAREST_MIPMAP_NEAREST         = 0x2700;
+    const GLenum LINEAR_MIPMAP_NEAREST          = 0x2701;
+    const GLenum NEAREST_MIPMAP_LINEAR          = 0x2702;
+    const GLenum LINEAR_MIPMAP_LINEAR           = 0x2703;
+    
+    /* TextureParameterName */
+    const GLenum TEXTURE_MAG_FILTER             = 0x2800;
+    const GLenum TEXTURE_MIN_FILTER             = 0x2801;
+    const GLenum TEXTURE_WRAP_S                 = 0x2802;
+    const GLenum TEXTURE_WRAP_T                 = 0x2803;
+    
+    /* TextureTarget */
+    const GLenum TEXTURE_2D                     = 0x0DE1;
+    const GLenum TEXTURE                        = 0x1702;
+    
+    const GLenum TEXTURE_CUBE_MAP               = 0x8513;
+    const GLenum TEXTURE_BINDING_CUBE_MAP       = 0x8514;
+    const GLenum TEXTURE_CUBE_MAP_POSITIVE_X    = 0x8515;
+    const GLenum TEXTURE_CUBE_MAP_NEGATIVE_X    = 0x8516;
+    const GLenum TEXTURE_CUBE_MAP_POSITIVE_Y    = 0x8517;
+    const GLenum TEXTURE_CUBE_MAP_NEGATIVE_Y    = 0x8518;
+    const GLenum TEXTURE_CUBE_MAP_POSITIVE_Z    = 0x8519;
+    const GLenum TEXTURE_CUBE_MAP_NEGATIVE_Z    = 0x851A;
+    const GLenum MAX_CUBE_MAP_TEXTURE_SIZE      = 0x851C;
+    
+    /* TextureUnit */
+    const GLenum TEXTURE0                       = 0x84C0;
+    const GLenum TEXTURE1                       = 0x84C1;
+    const GLenum TEXTURE2                       = 0x84C2;
+    const GLenum TEXTURE3                       = 0x84C3;
+    const GLenum TEXTURE4                       = 0x84C4;
+    const GLenum TEXTURE5                       = 0x84C5;
+    const GLenum TEXTURE6                       = 0x84C6;
+    const GLenum TEXTURE7                       = 0x84C7;
+    const GLenum TEXTURE8                       = 0x84C8;
+    const GLenum TEXTURE9                       = 0x84C9;
+    const GLenum TEXTURE10                      = 0x84CA;
+    const GLenum TEXTURE11                      = 0x84CB;
+    const GLenum TEXTURE12                      = 0x84CC;
+    const GLenum TEXTURE13                      = 0x84CD;
+    const GLenum TEXTURE14                      = 0x84CE;
+    const GLenum TEXTURE15                      = 0x84CF;
+    const GLenum TEXTURE16                      = 0x84D0;
+    const GLenum TEXTURE17                      = 0x84D1;
+    const GLenum TEXTURE18                      = 0x84D2;
+    const GLenum TEXTURE19                      = 0x84D3;
+    const GLenum TEXTURE20                      = 0x84D4;
+    const GLenum TEXTURE21                      = 0x84D5;
+    const GLenum TEXTURE22                      = 0x84D6;
+    const GLenum TEXTURE23                      = 0x84D7;
+    const GLenum TEXTURE24                      = 0x84D8;
+    const GLenum TEXTURE25                      = 0x84D9;
+    const GLenum TEXTURE26                      = 0x84DA;
+    const GLenum TEXTURE27                      = 0x84DB;
+    const GLenum TEXTURE28                      = 0x84DC;
+    const GLenum TEXTURE29                      = 0x84DD;
+    const GLenum TEXTURE30                      = 0x84DE;
+    const GLenum TEXTURE31                      = 0x84DF;
+    const GLenum ACTIVE_TEXTURE                 = 0x84E0;
+    
+    /* TextureWrapMode */
+    const GLenum REPEAT                         = 0x2901;
+    const GLenum CLAMP_TO_EDGE                  = 0x812F;
+    const GLenum MIRRORED_REPEAT                = 0x8370;
+    
+    /* Uniform Types */
+    const GLenum FLOAT_VEC2                     = 0x8B50;
+    const GLenum FLOAT_VEC3                     = 0x8B51;
+    const GLenum FLOAT_VEC4                     = 0x8B52;
+    const GLenum INT_VEC2                       = 0x8B53;
+    const GLenum INT_VEC3                       = 0x8B54;
+    const GLenum INT_VEC4                       = 0x8B55;
+    const GLenum BOOL                           = 0x8B56;
+    const GLenum BOOL_VEC2                      = 0x8B57;
+    const GLenum BOOL_VEC3                      = 0x8B58;
+    const GLenum BOOL_VEC4                      = 0x8B59;
+    const GLenum FLOAT_MAT2                     = 0x8B5A;
+    const GLenum FLOAT_MAT3                     = 0x8B5B;
+    const GLenum FLOAT_MAT4                     = 0x8B5C;
+    const GLenum SAMPLER_2D                     = 0x8B5E;
+    const GLenum SAMPLER_CUBE                   = 0x8B60;
+    
+    /* Vertex Arrays */
+    const GLenum VERTEX_ATTRIB_ARRAY_ENABLED        = 0x8622;
+    const GLenum VERTEX_ATTRIB_ARRAY_SIZE           = 0x8623;
+    const GLenum VERTEX_ATTRIB_ARRAY_STRIDE         = 0x8624;
+    const GLenum VERTEX_ATTRIB_ARRAY_TYPE           = 0x8625;
+    const GLenum VERTEX_ATTRIB_ARRAY_NORMALIZED     = 0x886A;
+    const GLenum VERTEX_ATTRIB_ARRAY_POINTER        = 0x8645;
+    const GLenum VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
+    
+    /* Read Format */
+    const GLenum IMPLEMENTATION_COLOR_READ_TYPE   = 0x8B9A;
+    const GLenum IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
+
+    /* Shader Source */
+    const GLenum COMPILE_STATUS                 = 0x8B81;
+    
+    /* Shader Precision-Specified Types */
+    const GLenum LOW_FLOAT                      = 0x8DF0;
+    const GLenum MEDIUM_FLOAT                   = 0x8DF1;
+    const GLenum HIGH_FLOAT                     = 0x8DF2;
+    const GLenum LOW_INT                        = 0x8DF3;
+    const GLenum MEDIUM_INT                     = 0x8DF4;
+    const GLenum HIGH_INT                       = 0x8DF5;
+    
+    /* Framebuffer Object. */
+    const GLenum FRAMEBUFFER                    = 0x8D40;
+    const GLenum RENDERBUFFER                   = 0x8D41;
+    
+    const GLenum RGBA4                          = 0x8056;
+    const GLenum RGB5_A1                        = 0x8057;
+    const GLenum RGB565                         = 0x8D62;
+    const GLenum DEPTH_COMPONENT16              = 0x81A5;
+    const GLenum STENCIL_INDEX                  = 0x1901;
+    const GLenum STENCIL_INDEX8                 = 0x8D48;
+    const GLenum DEPTH_STENCIL                  = 0x84F9;
+    
+    const GLenum RENDERBUFFER_WIDTH             = 0x8D42;
+    const GLenum RENDERBUFFER_HEIGHT            = 0x8D43;
+    const GLenum RENDERBUFFER_INTERNAL_FORMAT   = 0x8D44;
+    const GLenum RENDERBUFFER_RED_SIZE          = 0x8D50;
+    const GLenum RENDERBUFFER_GREEN_SIZE        = 0x8D51;
+    const GLenum RENDERBUFFER_BLUE_SIZE         = 0x8D52;
+    const GLenum RENDERBUFFER_ALPHA_SIZE        = 0x8D53;
+    const GLenum RENDERBUFFER_DEPTH_SIZE        = 0x8D54;
+    const GLenum RENDERBUFFER_STENCIL_SIZE      = 0x8D55;
+    
+    const GLenum FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           = 0x8CD0;
+    const GLenum FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           = 0x8CD1;
+    const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         = 0x8CD2;
+    const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE = 0x8CD3;
+    
+    const GLenum COLOR_ATTACHMENT0              = 0x8CE0;
+    const GLenum DEPTH_ATTACHMENT               = 0x8D00;
+    const GLenum STENCIL_ATTACHMENT             = 0x8D20;
+    const GLenum DEPTH_STENCIL_ATTACHMENT       = 0x821A;
+    
+    const GLenum NONE                           = 0;
+    
+    const GLenum FRAMEBUFFER_COMPLETE                      = 0x8CD5;
+    const GLenum FRAMEBUFFER_INCOMPLETE_ATTACHMENT         = 0x8CD6;
+    const GLenum FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT = 0x8CD7;
+    const GLenum FRAMEBUFFER_INCOMPLETE_DIMENSIONS         = 0x8CD9;
+    const GLenum FRAMEBUFFER_UNSUPPORTED                   = 0x8CDD;
+    
+    const GLenum FRAMEBUFFER_BINDING            = 0x8CA6;
+    const GLenum RENDERBUFFER_BINDING           = 0x8CA7;
+    const GLenum MAX_RENDERBUFFER_SIZE          = 0x84E8;
+    
+    const GLenum INVALID_FRAMEBUFFER_OPERATION  = 0x0506;
+    
+    /* WebGL-specific enums */
+    const GLenum UNPACK_FLIP_Y_WEBGL            = 0x9240;
+    const GLenum UNPACK_PREMULTIPLY_ALPHA_WEBGL = 0x9241;
+    const GLenum CONTEXT_LOST_WEBGL             = 0x9242;
+    const GLenum UNPACK_COLORSPACE_CONVERSION_WEBGL = 0x9243;
+    const GLenum BROWSER_DEFAULT_WEBGL          = 0x9244;
+
+    readonly attribute HTMLCanvasElement canvas;
+    readonly attribute GLsizei drawingBufferWidth;
+    readonly attribute GLsizei drawingBufferHeight;
+
+    [WebGLHandlesContextLoss] WebGLContextAttributes? getContextAttributes();
+    [WebGLHandlesContextLoss] boolean isContextLost();
+    
+    sequence<DOMString>? getSupportedExtensions();
+    object? getExtension(DOMString name);
+
+    void activeTexture(GLenum texture);
+    void attachShader(WebGLProgram? program, WebGLShader? shader);
+    void bindAttribLocation(WebGLProgram? program, GLuint index, DOMString name);
+    void bindBuffer(GLenum target, WebGLBuffer? buffer);
+    void bindFramebuffer(GLenum target, WebGLFramebuffer? framebuffer);
+    void bindRenderbuffer(GLenum target, WebGLRenderbuffer? renderbuffer);
+    void bindTexture(GLenum target, WebGLTexture? texture);
+    void blendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    void blendEquation(GLenum mode);
+    void blendEquationSeparate(GLenum modeRGB, GLenum modeAlpha);
+    void blendFunc(GLenum sfactor, GLenum dfactor);
+    void blendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+
+    typedef (ArrayBuffer or ArrayBufferView) BufferDataSource;
+    void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+    void bufferData(GLenum target, BufferDataSource? data, GLenum usage);
+    void bufferSubData(GLenum target, GLintptr offset, BufferDataSource? data);
+
+    [WebGLHandlesContextLoss] GLenum checkFramebufferStatus(GLenum target);
+    void clear(GLbitfield mask);
+    void clearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+    void clearDepth(GLclampf depth);
+    void clearStencil(GLint s);
+    void colorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+    void compileShader(WebGLShader? shader);
+
+    void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, ArrayBufferView data);
+    void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, ArrayBufferView data);
+
+    void copyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+    void copyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+    WebGLBuffer? createBuffer();
+    WebGLFramebuffer? createFramebuffer();
+    WebGLProgram? createProgram();
+    WebGLRenderbuffer? createRenderbuffer();
+    WebGLShader? createShader(GLenum type);
+    WebGLTexture? createTexture();
+
+    void cullFace(GLenum mode);
+
+    void deleteBuffer(WebGLBuffer? buffer);
+    void deleteFramebuffer(WebGLFramebuffer? framebuffer);
+    void deleteProgram(WebGLProgram? program);
+    void deleteRenderbuffer(WebGLRenderbuffer? renderbuffer);
+    void deleteShader(WebGLShader? shader);
+    void deleteTexture(WebGLTexture? texture);
+
+    void depthFunc(GLenum func);
+    void depthMask(GLboolean flag);
+    void depthRange(GLclampf zNear, GLclampf zFar);
+    void detachShader(WebGLProgram? program, WebGLShader? shader);
+    void disable(GLenum cap);
+    void disableVertexAttribArray(GLuint index);
+    void drawArrays(GLenum mode, GLint first, GLsizei count);
+    void drawElements(GLenum mode, GLsizei count, GLenum type, GLintptr offset);
+
+    void enable(GLenum cap);
+    void enableVertexAttribArray(GLuint index);
+    void finish();
+    void flush();
+    void framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, WebGLRenderbuffer? renderbuffer);
+    void framebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, WebGLTexture? texture, GLint level);
+    void frontFace(GLenum mode);
+
+    void generateMipmap(GLenum target);
+
+    WebGLActiveInfo? getActiveAttrib(WebGLProgram? program, GLuint index);
+    WebGLActiveInfo? getActiveUniform(WebGLProgram? program, GLuint index);
+    sequence<WebGLShader>? getAttachedShaders(WebGLProgram? program);
+
+    [WebGLHandlesContextLoss] GLint getAttribLocation(WebGLProgram? program, DOMString name);
+
+    any getBufferParameter(GLenum target, GLenum pname);
+    any getParameter(GLenum pname);
+
+    [WebGLHandlesContextLoss] GLenum getError();
+
+    any getFramebufferAttachmentParameter(GLenum target, GLenum attachment, GLenum pname);
+    any getProgramParameter(WebGLProgram? program, GLenum pname);
+    DOMString? getProgramInfoLog(WebGLProgram? program);
+    any getRenderbufferParameter(GLenum target, GLenum pname);
+    any getShaderParameter(WebGLShader? shader, GLenum pname);
+    WebGLShaderPrecisionFormat? getShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype);
+    DOMString? getShaderInfoLog(WebGLShader? shader);
+
+    DOMString? getShaderSource(WebGLShader? shader);
+
+    any getTexParameter(GLenum target, GLenum pname);
+
+    any getUniform(WebGLProgram? program, WebGLUniformLocation? location);
+
+    WebGLUniformLocation? getUniformLocation(WebGLProgram? program, DOMString name);
+
+    any getVertexAttrib(GLuint index, GLenum pname);
+
+    [WebGLHandlesContextLoss] GLsizeiptr getVertexAttribOffset(GLuint index, GLenum pname);
+
+    void hint(GLenum target, GLenum mode);
+    [WebGLHandlesContextLoss] GLboolean isBuffer(WebGLBuffer? buffer);
+    [WebGLHandlesContextLoss] GLboolean isEnabled(GLenum cap);
+    [WebGLHandlesContextLoss] GLboolean isFramebuffer(WebGLFramebuffer? framebuffer);
+    [WebGLHandlesContextLoss] GLboolean isProgram(WebGLProgram? program);
+    [WebGLHandlesContextLoss] GLboolean isRenderbuffer(WebGLRenderbuffer? renderbuffer);
+    [WebGLHandlesContextLoss] GLboolean isShader(WebGLShader? shader);
+    [WebGLHandlesContextLoss] GLboolean isTexture(WebGLTexture? texture);
+    void lineWidth(GLfloat width);
+    void linkProgram(WebGLProgram? program);
+    void pixelStorei(GLenum pname, GLint param);
+    void polygonOffset(GLfloat factor, GLfloat units);
+
+    void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView? pixels);
+
+    void renderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+    void sampleCoverage(GLclampf value, GLboolean invert);
+    void scissor(GLint x, GLint y, GLsizei width, GLsizei height);
+
+    void shaderSource(WebGLShader? shader, DOMString source);
+
+    void stencilFunc(GLenum func, GLint ref, GLuint mask);
+    void stencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask);
+    void stencilMask(GLuint mask);
+    void stencilMaskSeparate(GLenum face, GLuint mask);
+    void stencilOp(GLenum fail, GLenum zfail, GLenum zpass);
+    void stencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+
+    typedef (ImageData or HTMLImageElement or HTMLCanvasElement or HTMLVideoElement) TexImageSource;
+    void texImage2D(GLenum target, GLint level, GLenum internalformat,  GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, ArrayBufferView? pixels);
+    void texImage2D(GLenum target, GLint level, GLenum internalformat, GLenum format, GLenum type, TexImageSource? source); // May throw DOMException
+
+    void texParameterf(GLenum target, GLenum pname, GLfloat param);
+    void texParameteri(GLenum target, GLenum pname, GLint param);
+
+    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, ArrayBufferView? pixels);
+    void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLenum format, GLenum type, TexImageSource? source); // May throw DOMException
+
+    void uniform1f(WebGLUniformLocation? location, GLfloat x);
+    void uniform1fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform1fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform1i(WebGLUniformLocation? location, GLint x);
+    void uniform1iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform1iv(WebGLUniformLocation? location, sequence<long> v);
+    void uniform2f(WebGLUniformLocation? location, GLfloat x, GLfloat y);
+    void uniform2fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform2fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform2i(WebGLUniformLocation? location, GLint x, GLint y);
+    void uniform2iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform2iv(WebGLUniformLocation? location, sequence<long> v);
+    void uniform3f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z);
+    void uniform3fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform3fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform3i(WebGLUniformLocation? location, GLint x, GLint y, GLint z);
+    void uniform3iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform3iv(WebGLUniformLocation? location, sequence<long> v);
+    void uniform4f(WebGLUniformLocation? location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void uniform4fv(WebGLUniformLocation? location, Float32Array v);
+    void uniform4fv(WebGLUniformLocation? location, sequence<GLfloat> v);
+    void uniform4i(WebGLUniformLocation? location, GLint x, GLint y, GLint z, GLint w);
+    void uniform4iv(WebGLUniformLocation? location, Int32Array v);
+    void uniform4iv(WebGLUniformLocation? location, sequence<long> v);
+
+    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
+    void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
+    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
+    void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
+    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32Array value);
+    void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, sequence<GLfloat> value);
+
+    void useProgram(WebGLProgram? program);
+    void validateProgram(WebGLProgram? program);
+
+    void vertexAttrib1f(GLuint indx, GLfloat x);
+    void vertexAttrib1fv(GLuint indx, Float32Array values);
+    void vertexAttrib1fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttrib2f(GLuint indx, GLfloat x, GLfloat y);
+    void vertexAttrib2fv(GLuint indx, Float32Array values);
+    void vertexAttrib2fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+    void vertexAttrib3fv(GLuint indx, Float32Array values);
+    void vertexAttrib3fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+    void vertexAttrib4fv(GLuint indx, Float32Array values);
+    void vertexAttrib4fv(GLuint indx, sequence<GLfloat> values);
+    void vertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+
+    void viewport(GLint x, GLint y, GLsizei width, GLsizei height);
+};
+
+interface WebGLRenderingContext
+{
+};
+WebGLRenderingContext implements WebGLRenderingContextBase;
+
+
+[Constructor(DOMString type, optional WebGLContextEventInit eventInit)]
+interface WebGLContextEvent : Event {
+    readonly attribute DOMString statusMessage;
+};
+
+// EventInit is defined in the DOM4 specification.
+dictionary WebGLContextEventInit : EventInit {
+    DOMString statusMessage;
+};

gpac-1.0.0.tar.gz/applications/generators/WebGLGen/webgl2.idl Added

@@ -0,0 +1,584 @@
+// AUTOGENERATED FILE -- DO NOT EDIT -- SEE Makefile
+//
+// WebGL IDL definitions scraped from the Khronos specification:
+// https://www.khronos.org/registry/webgl/specs/latest/
+//
+// This IDL depends on the typed array specification defined at:
+// https://www.khronos.org/registry/typedarray/specs/latest/typedarrays.idl
+
+typedef long long GLint64;
+typedef unsigned long long GLuint64;
+
+
+interface WebGLQuery : WebGLObject {
+};
+
+interface WebGLSampler : WebGLObject {
+};
+
+interface WebGLSync : WebGLObject {
+};
+
+interface WebGLTransformFeedback : WebGLObject {
+};
+
+interface WebGLVertexArrayObject : WebGLObject {
+};
+
+typedef (Float32Array or sequence<GLfloat>) Float32List;
+typedef (Int32Array or sequence<GLint>) Int32List;
+typedef (Uint32Array or sequence<GLuint>) Uint32List;
+
+[NoInterfaceObject]
+interface WebGL2RenderingContextBase
+{
+  const GLenum READ_BUFFER                                   = 0x0C02;
+  const GLenum UNPACK_ROW_LENGTH                             = 0x0CF2;
+  const GLenum UNPACK_SKIP_ROWS                              = 0x0CF3;
+  const GLenum UNPACK_SKIP_PIXELS                            = 0x0CF4;
+  const GLenum PACK_ROW_LENGTH                               = 0x0D02;
+  const GLenum PACK_SKIP_ROWS                                = 0x0D03;
+  const GLenum PACK_SKIP_PIXELS                              = 0x0D04;
+  const GLenum COLOR                                         = 0x1800;
+  const GLenum DEPTH                                         = 0x1801;
+  const GLenum STENCIL                                       = 0x1802;
+  const GLenum RED                                           = 0x1903;
+  const GLenum RGB8                                          = 0x8051;
+  const GLenum RGBA8                                         = 0x8058;
+  const GLenum RGB10_A2                                      = 0x8059;
+  const GLenum TEXTURE_BINDING_3D                            = 0x806A;
+  const GLenum UNPACK_SKIP_IMAGES                            = 0x806D;
+  const GLenum UNPACK_IMAGE_HEIGHT                           = 0x806E;
+  const GLenum TEXTURE_3D                                    = 0x806F;
+  const GLenum TEXTURE_WRAP_R                                = 0x8072;
+  const GLenum MAX_3D_TEXTURE_SIZE                           = 0x8073;
+  const GLenum UNSIGNED_INT_2_10_10_10_REV                   = 0x8368;
+  const GLenum MAX_ELEMENTS_VERTICES                         = 0x80E8;
+  const GLenum MAX_ELEMENTS_INDICES                          = 0x80E9;
+  const GLenum TEXTURE_MIN_LOD                               = 0x813A;
+  const GLenum TEXTURE_MAX_LOD                               = 0x813B;
+  const GLenum TEXTURE_BASE_LEVEL                            = 0x813C;
+  const GLenum TEXTURE_MAX_LEVEL                             = 0x813D;
+  const GLenum MIN                                           = 0x8007;
+  const GLenum MAX                                           = 0x8008;
+  const GLenum DEPTH_COMPONENT24                             = 0x81A6;
+  const GLenum MAX_TEXTURE_LOD_BIAS                          = 0x84FD;
+  const GLenum TEXTURE_COMPARE_MODE                          = 0x884C;
+  const GLenum TEXTURE_COMPARE_FUNC                          = 0x884D;
+  const GLenum CURRENT_QUERY                                 = 0x8865;
+  const GLenum QUERY_RESULT                                  = 0x8866;
+  const GLenum QUERY_RESULT_AVAILABLE                        = 0x8867;
+  const GLenum STREAM_READ                                   = 0x88E1;
+  const GLenum STREAM_COPY                                   = 0x88E2;
+  const GLenum STATIC_READ                                   = 0x88E5;
+  const GLenum STATIC_COPY                                   = 0x88E6;
+  const GLenum DYNAMIC_READ                                  = 0x88E9;
+  const GLenum DYNAMIC_COPY                                  = 0x88EA;
+  const GLenum MAX_DRAW_BUFFERS                              = 0x8824;
+  const GLenum DRAW_BUFFER0                                  = 0x8825;
+  const GLenum DRAW_BUFFER1                                  = 0x8826;
+  const GLenum DRAW_BUFFER2                                  = 0x8827;
+  const GLenum DRAW_BUFFER3                                  = 0x8828;
+  const GLenum DRAW_BUFFER4                                  = 0x8829;
+  const GLenum DRAW_BUFFER5                                  = 0x882A;
+  const GLenum DRAW_BUFFER6                                  = 0x882B;
+  const GLenum DRAW_BUFFER7                                  = 0x882C;
+  const GLenum DRAW_BUFFER8                                  = 0x882D;
+  const GLenum DRAW_BUFFER9                                  = 0x882E;
+  const GLenum DRAW_BUFFER10                                 = 0x882F;
+  const GLenum DRAW_BUFFER11                                 = 0x8830;
+  const GLenum DRAW_BUFFER12                                 = 0x8831;
+  const GLenum DRAW_BUFFER13                                 = 0x8832;
+  const GLenum DRAW_BUFFER14                                 = 0x8833;
+  const GLenum DRAW_BUFFER15                                 = 0x8834;
+  const GLenum MAX_FRAGMENT_UNIFORM_COMPONENTS               = 0x8B49;
+  const GLenum MAX_VERTEX_UNIFORM_COMPONENTS                 = 0x8B4A;
+  const GLenum SAMPLER_3D                                    = 0x8B5F;
+  const GLenum SAMPLER_2D_SHADOW                             = 0x8B62;
+  const GLenum FRAGMENT_SHADER_DERIVATIVE_HINT               = 0x8B8B;
+  const GLenum PIXEL_PACK_BUFFER                             = 0x88EB;
+  const GLenum PIXEL_UNPACK_BUFFER                           = 0x88EC;
+  const GLenum PIXEL_PACK_BUFFER_BINDING                     = 0x88ED;
+  const GLenum PIXEL_UNPACK_BUFFER_BINDING                   = 0x88EF;
+  const GLenum FLOAT_MAT2x3                                  = 0x8B65;
+  const GLenum FLOAT_MAT2x4                                  = 0x8B66;
+  const GLenum FLOAT_MAT3x2                                  = 0x8B67;
+  const GLenum FLOAT_MAT3x4                                  = 0x8B68;
+  const GLenum FLOAT_MAT4x2                                  = 0x8B69;
+  const GLenum FLOAT_MAT4x3                                  = 0x8B6A;
+  const GLenum SRGB                                          = 0x8C40;
+  const GLenum SRGB8                                         = 0x8C41;
+  const GLenum SRGB8_ALPHA8                                  = 0x8C43;
+  const GLenum COMPARE_REF_TO_TEXTURE                        = 0x884E;
+  const GLenum RGBA32F                                       = 0x8814;
+  const GLenum RGB32F                                        = 0x8815;
+  const GLenum RGBA16F                                       = 0x881A;
+  const GLenum RGB16F                                        = 0x881B;
+  const GLenum VERTEX_ATTRIB_ARRAY_INTEGER                   = 0x88FD;
+  const GLenum MAX_ARRAY_TEXTURE_LAYERS                      = 0x88FF;
+  const GLenum MIN_PROGRAM_TEXEL_OFFSET                      = 0x8904;
+  const GLenum MAX_PROGRAM_TEXEL_OFFSET                      = 0x8905;
+  const GLenum MAX_VARYING_COMPONENTS                        = 0x8B4B;
+  const GLenum TEXTURE_2D_ARRAY                              = 0x8C1A;
+  const GLenum TEXTURE_BINDING_2D_ARRAY                      = 0x8C1D;
+  const GLenum R11F_G11F_B10F                                = 0x8C3A;
+  const GLenum UNSIGNED_INT_10F_11F_11F_REV                  = 0x8C3B;
+  const GLenum RGB9_E5                                       = 0x8C3D;
+  const GLenum UNSIGNED_INT_5_9_9_9_REV                      = 0x8C3E;
+  const GLenum TRANSFORM_FEEDBACK_BUFFER_MODE                = 0x8C7F;
+  const GLenum MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS    = 0x8C80;
+  const GLenum TRANSFORM_FEEDBACK_VARYINGS                   = 0x8C83;
+  const GLenum TRANSFORM_FEEDBACK_BUFFER_START               = 0x8C84;
+  const GLenum TRANSFORM_FEEDBACK_BUFFER_SIZE                = 0x8C85;
+  const GLenum TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN         = 0x8C88;
+  const GLenum RASTERIZER_DISCARD                            = 0x8C89;
+  const GLenum MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS = 0x8C8A;
+  const GLenum MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS       = 0x8C8B;
+  const GLenum INTERLEAVED_ATTRIBS                           = 0x8C8C;
+  const GLenum SEPARATE_ATTRIBS                              = 0x8C8D;
+  const GLenum TRANSFORM_FEEDBACK_BUFFER                     = 0x8C8E;
+  const GLenum TRANSFORM_FEEDBACK_BUFFER_BINDING             = 0x8C8F;
+  const GLenum RGBA32UI                                      = 0x8D70;
+  const GLenum RGB32UI                                       = 0x8D71;
+  const GLenum RGBA16UI                                      = 0x8D76;
+  const GLenum RGB16UI                                       = 0x8D77;
+  const GLenum RGBA8UI                                       = 0x8D7C;
+  const GLenum RGB8UI                                        = 0x8D7D;
+  const GLenum RGBA32I                                       = 0x8D82;
+  const GLenum RGB32I                                        = 0x8D83;
+  const GLenum RGBA16I                                       = 0x8D88;
+  const GLenum RGB16I                                        = 0x8D89;
+  const GLenum RGBA8I                                        = 0x8D8E;
+  const GLenum RGB8I                                         = 0x8D8F;
+  const GLenum RED_INTEGER                                   = 0x8D94;
+  const GLenum RGB_INTEGER                                   = 0x8D98;
+  const GLenum RGBA_INTEGER                                  = 0x8D99;
+  const GLenum SAMPLER_2D_ARRAY                              = 0x8DC1;
+  const GLenum SAMPLER_2D_ARRAY_SHADOW                       = 0x8DC4;
+  const GLenum SAMPLER_CUBE_SHADOW                           = 0x8DC5;
+  const GLenum UNSIGNED_INT_VEC2                             = 0x8DC6;
+  const GLenum UNSIGNED_INT_VEC3                             = 0x8DC7;
+  const GLenum UNSIGNED_INT_VEC4                             = 0x8DC8;
+  const GLenum INT_SAMPLER_2D                                = 0x8DCA;
+  const GLenum INT_SAMPLER_3D                                = 0x8DCB;
+  const GLenum INT_SAMPLER_CUBE                              = 0x8DCC;
+  const GLenum INT_SAMPLER_2D_ARRAY                          = 0x8DCF;
+  const GLenum UNSIGNED_INT_SAMPLER_2D                       = 0x8DD2;
+  const GLenum UNSIGNED_INT_SAMPLER_3D                       = 0x8DD3;
+  const GLenum UNSIGNED_INT_SAMPLER_CUBE                     = 0x8DD4;
+  const GLenum UNSIGNED_INT_SAMPLER_2D_ARRAY                 = 0x8DD7;
+  const GLenum DEPTH_COMPONENT32F                            = 0x8CAC;
+  const GLenum DEPTH32F_STENCIL8                             = 0x8CAD;
+  const GLenum FLOAT_32_UNSIGNED_INT_24_8_REV                = 0x8DAD;
+  const GLenum FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING         = 0x8210;
+  const GLenum FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE         = 0x8211;
+  const GLenum FRAMEBUFFER_ATTACHMENT_RED_SIZE               = 0x8212;
+  const GLenum FRAMEBUFFER_ATTACHMENT_GREEN_SIZE             = 0x8213;
+  const GLenum FRAMEBUFFER_ATTACHMENT_BLUE_SIZE              = 0x8214;
+  const GLenum FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE             = 0x8215;
+  const GLenum FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE             = 0x8216;
+  const GLenum FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE           = 0x8217;
+  const GLenum FRAMEBUFFER_DEFAULT                           = 0x8218;
+  const GLenum DEPTH_STENCIL_ATTACHMENT                      = 0x821A;
+  const GLenum DEPTH_STENCIL                                 = 0x84F9;
+  const GLenum UNSIGNED_INT_24_8                             = 0x84FA;
+  const GLenum DEPTH24_STENCIL8                              = 0x88F0;
+  const GLenum UNSIGNED_NORMALIZED                           = 0x8C17;
+  const GLenum DRAW_FRAMEBUFFER_BINDING                      = 0x8CA6; /* Same as FRAMEBUFFER_BINDING */
+  const GLenum READ_FRAMEBUFFER                              = 0x8CA8;
+  const GLenum DRAW_FRAMEBUFFER                              = 0x8CA9;
+  const GLenum READ_FRAMEBUFFER_BINDING                      = 0x8CAA;
+  const GLenum RENDERBUFFER_SAMPLES                          = 0x8CAB;
+  const GLenum FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER          = 0x8CD4;
+  const GLenum MAX_COLOR_ATTACHMENTS                         = 0x8CDF;
+  const GLenum COLOR_ATTACHMENT1                             = 0x8CE1;
+  const GLenum COLOR_ATTACHMENT2                             = 0x8CE2;
+  const GLenum COLOR_ATTACHMENT3                             = 0x8CE3;
+  const GLenum COLOR_ATTACHMENT4                             = 0x8CE4;
+  const GLenum COLOR_ATTACHMENT5                             = 0x8CE5;
+  const GLenum COLOR_ATTACHMENT6                             = 0x8CE6;
+  const GLenum COLOR_ATTACHMENT7                             = 0x8CE7;
+  const GLenum COLOR_ATTACHMENT8                             = 0x8CE8;
+  const GLenum COLOR_ATTACHMENT9                             = 0x8CE9;
+  const GLenum COLOR_ATTACHMENT10                            = 0x8CEA;
+  const GLenum COLOR_ATTACHMENT11                            = 0x8CEB;
+  const GLenum COLOR_ATTACHMENT12                            = 0x8CEC;
+  const GLenum COLOR_ATTACHMENT13                            = 0x8CED;
+  const GLenum COLOR_ATTACHMENT14                            = 0x8CEE;
+  const GLenum COLOR_ATTACHMENT15                            = 0x8CEF;
+  const GLenum FRAMEBUFFER_INCOMPLETE_MULTISAMPLE            = 0x8D56;
+  const GLenum MAX_SAMPLES                                   = 0x8D57;
+  const GLenum HALF_FLOAT                                    = 0x140B;
+  const GLenum RG                                            = 0x8227;
+  const GLenum RG_INTEGER                                    = 0x8228;
+  const GLenum R8                                            = 0x8229;
+  const GLenum RG8                                           = 0x822B;
+  const GLenum R16F                                          = 0x822D;
+  const GLenum R32F                                          = 0x822E;
+  const GLenum RG16F                                         = 0x822F;
+  const GLenum RG32F                                         = 0x8230;
+  const GLenum R8I                                           = 0x8231;
+  const GLenum R8UI                                          = 0x8232;
+  const GLenum R16I                                          = 0x8233;
+  const GLenum R16UI                                         = 0x8234;
+  const GLenum R32I                                          = 0x8235;
+  const GLenum R32UI                                         = 0x8236;
+  const GLenum RG8I                                          = 0x8237;
+  const GLenum RG8UI                                         = 0x8238;
+  const GLenum RG16I                                         = 0x8239;
+  const GLenum RG16UI                                        = 0x823A;
+  const GLenum RG32I                                         = 0x823B;
+  const GLenum RG32UI                                        = 0x823C;
+  const GLenum VERTEX_ARRAY_BINDING                          = 0x85B5;
+  const GLenum R8_SNORM                                      = 0x8F94;
+  const GLenum RG8_SNORM                                     = 0x8F95;
+  const GLenum RGB8_SNORM                                    = 0x8F96;
+  const GLenum RGBA8_SNORM                                   = 0x8F97;
+  const GLenum SIGNED_NORMALIZED                             = 0x8F9C;
+  const GLenum COPY_READ_BUFFER                              = 0x8F36;
+  const GLenum COPY_WRITE_BUFFER                             = 0x8F37;
+  const GLenum COPY_READ_BUFFER_BINDING                      = 0x8F36; /* Same as COPY_READ_BUFFER */
+  const GLenum COPY_WRITE_BUFFER_BINDING                     = 0x8F37; /* Same as COPY_WRITE_BUFFER */
+  const GLenum UNIFORM_BUFFER                                = 0x8A11;
+  const GLenum UNIFORM_BUFFER_BINDING                        = 0x8A28;
+  const GLenum UNIFORM_BUFFER_START                          = 0x8A29;
+  const GLenum UNIFORM_BUFFER_SIZE                           = 0x8A2A;
+  const GLenum MAX_VERTEX_UNIFORM_BLOCKS                     = 0x8A2B;
+  const GLenum MAX_FRAGMENT_UNIFORM_BLOCKS                   = 0x8A2D;
+  const GLenum MAX_COMBINED_UNIFORM_BLOCKS                   = 0x8A2E;
+  const GLenum MAX_UNIFORM_BUFFER_BINDINGS                   = 0x8A2F;
+  const GLenum MAX_UNIFORM_BLOCK_SIZE                        = 0x8A30;
+  const GLenum MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS        = 0x8A31;
+  const GLenum MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS      = 0x8A33;
+  const GLenum UNIFORM_BUFFER_OFFSET_ALIGNMENT               = 0x8A34;
+  const GLenum ACTIVE_UNIFORM_BLOCKS                         = 0x8A36;
+  const GLenum UNIFORM_TYPE                                  = 0x8A37;
+  const GLenum UNIFORM_SIZE                                  = 0x8A38;
+  const GLenum UNIFORM_BLOCK_INDEX                           = 0x8A3A;
+  const GLenum UNIFORM_OFFSET                                = 0x8A3B;
+  const GLenum UNIFORM_ARRAY_STRIDE                          = 0x8A3C;
+  const GLenum UNIFORM_MATRIX_STRIDE                         = 0x8A3D;
+  const GLenum UNIFORM_IS_ROW_MAJOR                          = 0x8A3E;
+  const GLenum UNIFORM_BLOCK_BINDING                         = 0x8A3F;
+  const GLenum UNIFORM_BLOCK_DATA_SIZE                       = 0x8A40;
+  const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORMS                 = 0x8A42;
+  const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES          = 0x8A43;
+  const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER     = 0x8A44;
+  const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER   = 0x8A46;
+  const GLenum INVALID_INDEX                                 = 0xFFFFFFFF;
+  const GLenum MAX_VERTEX_OUTPUT_COMPONENTS                  = 0x9122;
+  const GLenum MAX_FRAGMENT_INPUT_COMPONENTS                 = 0x9125;
+  const GLenum MAX_SERVER_WAIT_TIMEOUT                       = 0x9111;
+  const GLenum OBJECT_TYPE                                   = 0x9112;
+  const GLenum SYNC_CONDITION                                = 0x9113;
+  const GLenum SYNC_STATUS                                   = 0x9114;
+  const GLenum SYNC_FLAGS                                    = 0x9115;
+  const GLenum SYNC_FENCE                                    = 0x9116;
+  const GLenum SYNC_GPU_COMMANDS_COMPLETE                    = 0x9117;
+  const GLenum UNSIGNALED                                    = 0x9118;
+  const GLenum SIGNALED                                      = 0x9119;
+  const GLenum ALREADY_SIGNALED                              = 0x911A;
+  const GLenum TIMEOUT_EXPIRED                               = 0x911B;
+  const GLenum CONDITION_SATISFIED                           = 0x911C;
+  const GLenum WAIT_FAILED                                   = 0x911D;
+  const GLenum SYNC_FLUSH_COMMANDS_BIT                       = 0x00000001;
+  const GLenum VERTEX_ATTRIB_ARRAY_DIVISOR                   = 0x88FE;
+  const GLenum ANY_SAMPLES_PASSED                            = 0x8C2F;
+  const GLenum ANY_SAMPLES_PASSED_CONSERVATIVE               = 0x8D6A;
+  const GLenum SAMPLER_BINDING                               = 0x8919;
+  const GLenum RGB10_A2UI                                    = 0x906F;
+  const GLenum INT_2_10_10_10_REV                            = 0x8D9F;
+  const GLenum TRANSFORM_FEEDBACK                            = 0x8E22;
+  const GLenum TRANSFORM_FEEDBACK_PAUSED                     = 0x8E23;
+  const GLenum TRANSFORM_FEEDBACK_ACTIVE                     = 0x8E24;
+  const GLenum TRANSFORM_FEEDBACK_BINDING                    = 0x8E25;
+  const GLenum TEXTURE_IMMUTABLE_FORMAT                      = 0x912F;
+  const GLenum MAX_ELEMENT_INDEX                             = 0x8D6B;
+  const GLenum TEXTURE_IMMUTABLE_LEVELS                      = 0x82DF;
+
+  const GLint64 TIMEOUT_IGNORED                              = -1;
+
+  /* WebGL-specific enums */
+  const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL                 = 0x9247;
+
+  /* Buffer objects */
+  // WebGL1:
+  void bufferData(GLenum target, GLsizeiptr size, GLenum usage);
+  void bufferData(GLenum target, ArrayBuffer? srcData, GLenum usage);
+  void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage);
+  void bufferSubData(GLenum target, GLintptr dstByteOffset, BufferDataSource srcData);
+  // WebGL2:
+  void bufferData(GLenum target, ArrayBufferView srcData, GLenum usage, GLuint srcOffset,
+                  optional GLuint length = 0);
+  void bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData,
+                     GLuint srcOffset, optional GLuint length = 0);
+
+  void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset,
+                         GLintptr writeOffset, GLsizeiptr size);
+  // MapBufferRange, in particular its read-only and write-only modes,
+  // can not be exposed safely to JavaScript. GetBufferSubData
+  // replaces it for the purpose of fetching data back from the GPU.
+  void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData,
+                        optional GLuint dstOffset = 0, optional GLuint length = 0);
+
+  /* Framebuffer objects */
+  void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0,
+                       GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+  void framebufferTextureLayer(GLenum target, GLenum attachment, WebGLTexture? texture, GLint level,
+                               GLint layer);
+  void invalidateFramebuffer(GLenum target, sequence<GLenum> attachments);
+  void invalidateSubFramebuffer(GLenum target, sequence<GLenum> attachments,
+                                GLint x, GLint y, GLsizei width, GLsizei height);
+  void readBuffer(GLenum src);
+
+  /* Renderbuffer objects */
+  any getInternalformatParameter(GLenum target, GLenum internalformat, GLenum pname);
+  void renderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat,
+                                      GLsizei width, GLsizei height);
+
+  /* Texture objects */
+  void texStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+                    GLsizei height);
+  void texStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+                    GLsizei height, GLsizei depth);
+
+  // WebGL1 legacy entrypoints:
+  void texImage2D(GLenum target, GLint level, GLint internalformat,
+                  GLsizei width, GLsizei height, GLint border, GLenum format,
+                  GLenum type, ArrayBufferView? pixels);
+  void texImage2D(GLenum target, GLint level, GLint internalformat,
+                  GLenum format, GLenum type, TexImageSource source); // May throw DOMException
+
+  void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                     GLsizei width, GLsizei height,
+                     GLenum format, GLenum type, ArrayBufferView? pixels);
+  void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                     GLenum format, GLenum type, TexImageSource source); // May throw DOMException
+
+  // WebGL2 entrypoints:
+  void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLint border, GLenum format, GLenum type, GLintptr pboOffset);
+  void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLint border, GLenum format, GLenum type,
+                  TexImageSource source); // May throw DOMException
+  void texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLint border, GLenum format, GLenum type, ArrayBufferView srcData,
+                  GLuint srcOffset);
+
+  void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLsizei depth, GLint border, GLenum format, GLenum type, GLintptr pboOffset);
+  void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLsizei depth, GLint border, GLenum format, GLenum type,
+                  TexImageSource source); // May throw DOMException
+  void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView? srcData);
+  void texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
+                  GLsizei depth, GLint border, GLenum format, GLenum type, ArrayBufferView srcData,
+                  GLuint srcOffset);
+
+  void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type, GLintptr pboOffset);
+  void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type,
+                     TexImageSource source); // May throw DOMException
+  void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
+                     GLsizei height, GLenum format, GLenum type, ArrayBufferView srcData,
+                     GLuint srcOffset);
+
+  void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                     GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+                     GLintptr pboOffset);
+  void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                     GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+                     TexImageSource source); // May throw DOMException
+  void texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                     GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+                     ArrayBufferView? srcData, optional GLuint srcOffset = 0);
+
+  void copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                         GLint x, GLint y, GLsizei width, GLsizei height);
+
+  void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+                            GLsizei height, GLint border, GLintptr offset);
+  void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+                            GLsizei height, GLint border, ArrayBufferView srcData,
+                            optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
+
+  void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+                            GLsizei height, GLsizei depth, GLint border, GLintptr offset);
+  void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+                            GLsizei height, GLsizei depth, GLint border, ArrayBufferView srcData,
+                            optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
+
+  void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                               GLsizei width, GLsizei height, GLenum format, GLintptr offset);
+  void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                               GLsizei width, GLsizei height, GLenum format,
+                               ArrayBufferView srcData,
+                               optional GLuint srcOffset = 0,
+                               optional GLuint srcLengthOverride = 0);
+
+  void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                               GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
+                               GLenum format, GLintptr offset);
+  void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                               GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
+                               GLenum format, ArrayBufferView srcData,
+                               optional GLuint srcOffset = 0,
+                               optional GLuint srcLengthOverride = 0);
+
+  /* Programs and shaders */
+  [WebGLHandlesContextLoss] GLint getFragDataLocation(WebGLProgram program, DOMString name);
+
+  /* Uniforms */
+  void uniform1ui(WebGLUniformLocation? location, GLuint v0);
+  void uniform2ui(WebGLUniformLocation? location, GLuint v0, GLuint v1);
+  void uniform3ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2);
+  void uniform4ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+
+  void uniform1fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform2fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform3fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform4fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+
+  void uniform1iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform2iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform3iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform4iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+
+  void uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+  void uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+                  optional GLuint srcLength = 0);
+
+  void uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                        optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+
+  void uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                        optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+
+  void uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                          optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+  void uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
+                        optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+
+  /* Vertex attribs */
+  void vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
+  void vertexAttribI4iv(GLuint index, Int32List values);
+  void vertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+  void vertexAttribI4uiv(GLuint index, Uint32List values);
+  void vertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+
+  /* Writing to the drawing buffer */
+  void vertexAttribDivisor(GLuint index, GLuint divisor);
+  void drawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
+  void drawElementsInstanced(GLenum mode, GLsizei count, GLenum type, GLintptr offset, GLsizei instanceCount);
+  void drawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLintptr offset);
+
+  /* Reading back pixels */
+  // WebGL1:
+  void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+                  ArrayBufferView? dstData);
+  // WebGL2:
+  void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+                  GLintptr offset);
+  void readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
+                  ArrayBufferView dstData, GLuint dstOffset);
+
+  /* Multiple Render Targets */
+  void drawBuffers(sequence<GLenum> buffers);
+
+  void clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values,
+                     optional GLuint srcOffset = 0);
+  void clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values,
+                     optional GLuint srcOffset = 0);
+  void clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values,
+                      optional GLuint srcOffset = 0);
+
+  void clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+
+  /* Query Objects */
+  WebGLQuery? createQuery();
+  void deleteQuery(WebGLQuery? query);
+  [WebGLHandlesContextLoss] GLboolean isQuery(WebGLQuery? query);
+  void beginQuery(GLenum target, WebGLQuery query);
+  void endQuery(GLenum target);
+  WebGLQuery? getQuery(GLenum target, GLenum pname);
+  any getQueryParameter(WebGLQuery query, GLenum pname);
+
+  /* Sampler Objects */
+  WebGLSampler? createSampler();
+  void deleteSampler(WebGLSampler? sampler);
+  [WebGLHandlesContextLoss] GLboolean isSampler(WebGLSampler? sampler);
+  void bindSampler(GLuint unit, WebGLSampler? sampler);
+  void samplerParameteri(WebGLSampler sampler, GLenum pname, GLint param);
+  void samplerParameterf(WebGLSampler sampler, GLenum pname, GLfloat param);
+  any getSamplerParameter(WebGLSampler sampler, GLenum pname);
+
+  /* Sync objects */
+  WebGLSync? fenceSync(GLenum condition, GLbitfield flags);
+  [WebGLHandlesContextLoss] GLboolean isSync(WebGLSync? sync);
+  void deleteSync(WebGLSync? sync);
+  GLenum clientWaitSync(WebGLSync sync, GLbitfield flags, GLuint64 timeout);
+  void waitSync(WebGLSync sync, GLbitfield flags, GLint64 timeout);
+  any getSyncParameter(WebGLSync sync, GLenum pname);
+
+  /* Transform Feedback */
+  WebGLTransformFeedback? createTransformFeedback();
+  void deleteTransformFeedback(WebGLTransformFeedback? tf);
+  [WebGLHandlesContextLoss] GLboolean isTransformFeedback(WebGLTransformFeedback? tf);
+  void bindTransformFeedback (GLenum target, WebGLTransformFeedback? tf);
+  void beginTransformFeedback(GLenum primitiveMode);
+  void endTransformFeedback();
+  void transformFeedbackVaryings(WebGLProgram program, sequence<DOMString> varyings, GLenum bufferMode);
+  WebGLActiveInfo? getTransformFeedbackVarying(WebGLProgram program, GLuint index);
+  void pauseTransformFeedback();
+  void resumeTransformFeedback();
+
+  /* Uniform Buffer Objects and Transform Feedback Buffers */
+  void bindBufferBase(GLenum target, GLuint index, WebGLBuffer? buffer);
+  void bindBufferRange(GLenum target, GLuint index, WebGLBuffer? buffer, GLintptr offset, GLsizeiptr size);
+  any getIndexedParameter(GLenum target, GLuint index);
+  sequence<GLuint>? getUniformIndices(WebGLProgram program, sequence<DOMString> uniformNames);
+  any getActiveUniforms(WebGLProgram program, sequence<GLuint> uniformIndices, GLenum pname);
+  GLuint getUniformBlockIndex(WebGLProgram program, DOMString uniformBlockName);
+  any getActiveUniformBlockParameter(WebGLProgram program, GLuint uniformBlockIndex, GLenum pname);
+  DOMString? getActiveUniformBlockName(WebGLProgram program, GLuint uniformBlockIndex);
+  void uniformBlockBinding(WebGLProgram program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+
+  /* Vertex Array Objects */
+  WebGLVertexArrayObject? createVertexArray();
+  void deleteVertexArray(WebGLVertexArrayObject? vertexArray);
+  [WebGLHandlesContextLoss] GLboolean isVertexArray(WebGLVertexArrayObject? vertexArray);
+  void bindVertexArray(WebGLVertexArrayObject? array);
+};
+WebGL2RenderingContextBase implements WebGLRenderingContextBase;
+
+interface WebGL2RenderingContext
+{
+};
+WebGL2RenderingContext implements WebGL2RenderingContextBase;
+
+

gpac-0.8.0.tar.gz/applications/generators/X3D/main.c -> gpac-1.0.0.tar.gz/applications/generators/X3D/main.c Changed

@@ -145,9 +145,8 @@
 u8 IsNDT(GF_List *NDTs, char *famName)
 {
 	u32 i;
-	char *ndtName;
 	for (i=0; i<gf_list_count(NDTs); i++) {
-		ndtName = gf_list_get(NDTs, i);
+		char *ndtName = gf_list_get(NDTs, i);
 		//remove SF / MF as we don't need that
 		if (!strcmp(ndtName+2, famName+2)) return 1;
 	}
@@ -567,7 +566,7 @@
 			}
 			//SFString
 			else if (!strcmp(bf->familly, "SFString")) {
-				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %u);\n", bf->name, (u32) strlen(bf->def)+1);
 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
 
@@ -809,7 +808,7 @@
 					store = CurrentLine;
 					CurrentLine = token;
 					GetNextToken(tok, " \"");
-					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
+					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %u);\n", bf->name, j, (u32) strlen(tok)+1);
 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
 					j+=1;
 					CurrentLine = store;
@@ -912,10 +911,9 @@
 static u32 IsNodeInTable(X3DNode *node, char *NDTName)
 {
 	u32 i;
-	char *ndt;
 
 	for (i=0; i<gf_list_count(node->NDT); i++) {
-		ndt = gf_list_get(node->NDT, i);
+		char *ndt = gf_list_get(node->NDT, i);
 		if (!strcmp(ndt, NDTName)) return 1;
 	}
 	return 0;
@@ -923,11 +921,9 @@
 
 static u32 GetNDTCount(char *NDTName, GF_List *XNodes)
 {
-	u32 i, nodeCount;
-	X3DNode *n;
-	nodeCount = 0;
+	u32 i, nodeCount = 0;
 	for (i=0; i<gf_list_count(XNodes); i++) {
-		n = gf_list_get(XNodes, i);
+		X3DNode *n = gf_list_get(XNodes, i);
 		if (!IsNodeInTable(n, NDTName)) continue;
 		nodeCount++;
 	}
@@ -1140,12 +1136,11 @@
 
 void WriteNodeDump(FILE *f, X3DNode *n)
 {
-	X3DField *bf;
 	u32 i;
 
 	fprintf(f, "static const char *%s_FieldName[] = {\n", n->name);
 	for (i=0; i<gf_list_count(n->Fields); i++) {
-		bf = gf_list_get(n->Fields, i);
+		X3DField *bf = gf_list_get(n->Fields, i);
 		if (!i) {
 			fprintf(f, " \"%s\"", bf->name);
 		} else {
@@ -1203,9 +1198,8 @@
 
 int main (int argc, char **argv)
 {
-	FILE *nodes, *pf;
+	FILE *nodes;
 	GF_List *XNodes, *NDTs;
-	X3DNode *n;
 	X3DField *bf;
 	u32 nb_nodes, nb_imp;
 
@@ -1222,6 +1216,7 @@
 	gf_fclose(nodes);
 
 	if (argc>1) {
+		FILE *pf;
 		pf = gf_fopen(argv[1], "rt");
 		if (!pf) fprintf(stdout, "Cannot open profile file %s\n", argv[1]);
 		else {
@@ -1255,7 +1250,7 @@
 	nb_imp = 0;
 	//free nodes
 	while (gf_list_count(XNodes)) {
-		n = gf_list_get(XNodes, 0);
+		X3DNode *n = gf_list_get(XNodes, 0);
 		if (!n->skip_impl) nb_imp++;
 		gf_list_rem(XNodes, 0);
 		while (gf_list_count(n->NDT)) {

gpac-1.0.0.tar.gz/applications/gpac Added

gpac-1.0.0.tar.gz/applications/gpac/Info.plist Added

gpac-1.0.0.tar.gz/applications/gpac/Makefile Added

@@ -0,0 +1,65 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/applications/gpac
+
+CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS)
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LINKFLAGS=-L../../bin/gcc
+ifeq ($(CONFIG_WIN32),yes)
+EXE=.exe
+PROG=gpac$(EXE)
+LINKFLAGS+=$(UNICODEFLAGS)
+else
+EXT=
+PROG=gpac
+endif
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+LINKFLAGS+=$(shell pkg-config ../../gpac.pc --libs --static | sed 's/-lgpac //'  )
+LINKFLAGS+= $(GPAC_SH_FLAGS)
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac
+ifeq ($(CONFIG_DARWIN),yes)
+#LINKFLAGS+= -Wl,-rpath,'@loader_path'
+else
+LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
+endif
+endif
+
+
+#common objs - insert after ../static if any to overwrite list of objects
+OBJS= main.o
+
+SRCS := $(OBJS:.o=.c)
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(CC) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
+
+clean:
+	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+
+dep: depend
+
+depend:
+	rm -f .depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/applications/gpac/main.c Added

@@ -0,0 +1,3928 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / gpac application
+ *
+ *  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/main.h>
+#include <gpac/filters.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 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 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;
+
+//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;
+static FILE *helpout = NULL;
+
+static void gpac_rmt_user_callback(void *udta, const char* text);
+
+static const char *auto_gen_md_warning = "\n";
+
+//uncomment to check argument description matches our conventions - see filter.h
+#define CHECK_DOC
+
+//the default set of separators
+static char separator_set[7] = GF_FS_DEFAULT_SEPS;
+#define SEP_LINK	5
+#define SEP_FRAG	2
+#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_codec(GF_FilterSession *session);
+static void write_filters_options(GF_FilterSession *fsess);
+static void write_core_options();
+static void write_file_extensions();
+static int gpac_make_lang(char *filename);
+static Bool gpac_expand_alias(int argc, char **argv);
+static u32 gpac_unit_tests(GF_MemTrackerType mem_track);
+
+static Bool revert_cache_file(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info);
+
+
+
+#ifndef GPAC_DISABLE_DOC
+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, "
+"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 "
+"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).\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 "
+"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"
+"- 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"
+"- 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"
+"- 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"
+"- 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"
+"- 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"
+"\n  \n"
+"When string parameters are used (eg 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"
+"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"
+"\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"
+"EX \"src=file.mp4\" or \"-src file.mp4\" or  \"-i file.mp4\"\n"
+"This will find a filter (for example `fin`) able to load `file.mp4`. The same result can be achieved by using `fin:src=file.mp4`.\n"
+"EX \"dst=dump.yuv\" or \"-dst dump.yuv\" or \"-o dump.yuv\"\n"
+"This will dump the video content in `dump.yuv`. The same result can be achieved by using `fout:dst=dump.yuv`.\n"
+"\n"
+"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"
+"## 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"
+"This will use __ffdmx__ to read `file.mp4` and __ffdec__ to decode it.\n"
+"This can be used to test a specific filter when alternate filter chains are possible.\n"
+"## 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. "
+"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"
+"- 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"
+"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"
+"This will force decoding media from `file.mp4` and trash (send to `null`) the result (doing a decoder benchmark for example).\n"
+"\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 "
+"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"
+"EX f::a=foo:b=bar\n"
+"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"
+"## 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"
+"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"
+"\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"
+"\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"
+"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"
+"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#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"
+"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"
+"- 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"
+"\n"
+"A sourceID name can also use wildcard or be empty to match a property regardless of the source filter.\n"
+"EX fA fB:SID=*#ServiceID=2\n"
+"EX fA fB:SID=#ServiceID=2\n"
+"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 to connect to `vout` only PIDs with `ItemID` property equal to `200`.\n"
+"EX src=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"
+"This indicates to connect to `vout` only PIDs with `Width` property equal to `640`.\n"
+"EX src=vid.mp4 @#Width-640 vout\n"
+"This indicates to connect to `vout` only PIDs with `Width` property less than `640`\n"
+"\n"
+"Multiple fragment can be specified to check for multiple PID properties.\n"
+"EX src=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"
+"# 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"
+"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"
+"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"
+"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"
+"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"
+"This will warn if `OPTFOO` is not consumed, but will not track `OPTBAR`.\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"
+"- 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"
+"- 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"
+"# 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"
+"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"
+"In this case, the destination will be cloned for each item, and all will be exported to different JPEGs thanks to URL templating.\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"
+"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"
+"In this case, each new `ServiceID` value found when connecting PIDs to the destination will create a new destination file.\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"
+"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 "
+"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"
+"\n"
+"PID properties may be conditionally assigned by checking other PID properties. The syntax uses paranthesis (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"
+"This will assign PID property `Prop` to `VAL` for PIDs with property `CP` equal to `CV`, and to `VAL2` for PIDs with property `CP2` equal to `CV2`.\n"
+"`#Prop=(CP=CV)(CP2=CV2)VAL`\n"
+"This will assign PID property `Prop` to `VAL` for PIDs with property `CP` equal to `CV` and property `CP2` equal to `CV2`.\n"
+"`#Prop=(CP=CV)VAL,()DEFAULT`\n"
+"This will assign PID property `Prop` to `VAL` for PIDs with property `CP` equal to `CV`, or to `DEFAULT` for other PIDs.\n"
+"The condition syntax is the same as source ID fragment syntax.\n"
+"Note: When set, the default value (empty condition) always matches the PID, therefore it should be placed last in the list of conditions.\n"
+"EX gpac -i source.mp4:#MyProp=(audio)\"Super Audio\",(video)\"Super Video\"\n"
+"This will assign property `MyProp` to `Super Audio` for audio PIDs and to `Super Video` for video PIDs.\n"
+"EX gpac -i source.mp4:#MyProp=(audio1)\"Super Audio\"\n"
+"This will assign property `MyProp` to `Super Audio` for first audio PID declared.\n"
+"EX gpac -i source.mp4:#MyProp=(Width+1280)HD\n"
+"This will assign property `MyProp` to `HD` for PIDs with property `Width` greater than 1280.\n"
+"# Using option files\n"
+"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"
+"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"
+"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"
+"- $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"
+"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"
+"# 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"
+"\n";
+#endif
+
+static void gpac_filter_help(void)
+{
+	gf_sys_format_help(helpout, help_flags,
+"Usage: gpac [options] FILTER [LINK] FILTER [...] \n"
+#ifndef GPAC_DISABLE_DOC
+	"%s", gf_sys_localized("gpac", "doc", gpac_doc)
+#else
+	"GPAC compiled without built-in doc.\n"
+#endif
+	);
+
+}
+
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/compositor_ext.h>
+#include <gpac/modules/hardcoded_proto.h>
+#include <gpac/modules/font.h>
+
+static void gpac_modules_help(void)
+{
+	u32 i;
+	gf_sys_format_help(helpout, help_flags, "Available modules:\n");
+	for (i=0; i<gf_modules_count(); i++) {
+		char *str = (char *) gf_modules_get_file_name(i);
+		if (!str) continue;
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s: implements ", str);
+		if (!strncmp(str, "gm_", 3) || !strncmp(str, "gsm_", 4)) {
+			GF_BaseInterface *ifce = gf_modules_load_by_name(str, GF_VIDEO_OUTPUT_INTERFACE);
+			if (ifce) {
+				gf_sys_format_help(helpout, help_flags, "VideoOutput ");
+				gf_modules_close_interface(ifce);
+			}
+			ifce = gf_modules_load_by_name(str, GF_AUDIO_OUTPUT_INTERFACE);
+			if (ifce) {
+				gf_sys_format_help(helpout, help_flags, "AudioOutput ");
+				gf_modules_close_interface(ifce);
+			}
+			ifce = gf_modules_load_by_name(str, GF_FONT_READER_INTERFACE);
+			if (ifce) {
+				gf_sys_format_help(helpout, help_flags, "FontReader ");
+				gf_modules_close_interface(ifce);
+			}
+			ifce = gf_modules_load_by_name(str, GF_COMPOSITOR_EXT_INTERFACE);
+			if (ifce) {
+				gf_sys_format_help(helpout, help_flags, "CompositorExtension ");
+				gf_modules_close_interface(ifce);
+			}
+			ifce = gf_modules_load_by_name(str, GF_HARDCODED_PROTO_INTERFACE);
+			if (ifce) {
+				gf_sys_format_help(helpout, help_flags, "HardcodedProto ");
+				gf_modules_close_interface(ifce);
+			}
+		} else {
+			gf_sys_format_help(helpout, help_flags, "Filter ");
+		}
+		gf_sys_format_help(helpout, help_flags, "\n");
+	}
+	gf_sys_format_help(helpout, help_flags, "\n");
+}
+
+#ifndef GPAC_DISABLE_DOC
+const char *gpac_alias =
+"The gpac command line can become quite complex when many sources or filters are used. In order to simplify this, an alias system is provided.\n"
+"\n"
+"To assign an alias, use the syntax `gpac -alias=\"NAME VALUE\"`.\n"
+"- `NAME`: shall be a single string, with no space.\n"
+"- `VALUE`: the list of argument this alias replaces. If not set, the alias is destroyed\n"
+"\n"
+"When parsing arguments, the alias will be replace by its value.\n"
+"EX gpac -alias=\"output aout vout\"\n"
+"This allows later audio and video playback using `gpac -i src.mp4 output`\n"
+"\n"
+"Aliases can use arguments from the command line. The allowed syntaxes are:\n"
+"- `@{a}`: replaced by the value of the argument with index `a` after the alias\n"
+"- `@{a,b}`: replaced by the value of the arguments with index `a` and `b`\n"
+"- `@{a:b}`: replaced by the value of the arguments between index `a` and `b`\n"
+"- `@{-a,b}`: replaced by the value of the arguments with index `a` and `b`, inserting a list separator (comma by default) between them\n"
+"- `@{-a:b}`: replaced by the value of the arguments between index `a` and `b`, inserting a list separator (comma by default) between them\n"
+"- `@{+a,b}`: clones the parent word in the alias for `a` and `b`, replacing this pattern in each clone by the corresponding argument\n"
+"- `@{+a:b}`: clones the parent word in the alias for each argument between index `a` and `b`, replacing this pattern in each clone by the corresponding argument\n"
+"\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"
+"\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"
+"The command `gpac foo f1 f2` expands to `gpac src=f2 dst=test.mp4 f1`\n"
+"EX -alias=\"list: inspect src=@{+:N}\"\n"
+"The command `gpac list f1 f2 f3` expands to `gpac inspect src=f1 src=f2 src=f3`\n"
+"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"
+"\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"
+"\n";
+#endif
+
+static void gpac_alias_help(GF_SysArgMode argmode)
+{
+	u32 i, count;
+
+	if (argmode >= GF_ARGMODE_EXPERT) {
+
+#ifndef GPAC_DISABLE_DOC
+		gf_sys_format_help(helpout, help_flags, "%s", gf_sys_localized("gpac", "alias", gpac_alias) );
+#else
+		gf_sys_format_help(helpout, help_flags, "%s", "GPAC compiled without built-in doc.\n");
+#endif
+		if (argmode == GF_ARGMODE_EXPERT) {
+			return;
+		}
+	}
+
+	count = gf_opts_get_key_count("gpac.alias");
+	if (count) {
+		if (argmode < GF_ARGMODE_EXPERT) {
+			gf_sys_format_help(helpout, help_flags, "Available aliases (use 'gpac -hx alias' for more info on aliases):\n");
+		} else {
+			gf_sys_format_help(helpout, help_flags, "Available aliases:\n");
+		}
+		for (i=0; i<count; i++) {
+			const char *alias = gf_opts_get_key_name("gpac.alias", i);
+			const char *alias_doc = gf_opts_get_key("gpac.aliasdoc", alias);
+			const char *alias_value = gf_opts_get_key("gpac.alias", alias);
+
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s", alias);
+			if (argmode>=GF_ARGMODE_ADVANCED)
+				gf_sys_format_help(helpout, help_flags, " (%s)", alias_value);
+
+			if (alias_doc)
+				gf_sys_format_help(helpout, help_flags | GF_PRINTARG_OPT_DESC, ": %s", gf_sys_localized("gpac", "aliasdoc", alias_doc));
+			else if  (argmode<GF_ARGMODE_ADVANCED) {
+				gf_sys_format_help(helpout, help_flags, " (%s)", alias_value);
+			}
+
+			gf_sys_format_help(helpout, help_flags, "\n");
+		}
+	} else {
+		gf_sys_format_help(helpout, help_flags, "No aliases defined - use 'gpac -hx alias' for more info on aliases\n");
+	}
+}
+
+
+static void gpac_core_help(GF_SysArgMode mode, Bool for_logs)
+{
+	u32 mask;
+	gf_sys_format_help(helpout, help_flags, "# libgpac %s options:\n", for_logs ? "logs" : "core");
+	if (for_logs) {
+		mask = GF_ARG_SUBSYS_LOG;
+	} else {
+		mask = 0xFFFFFFFF;
+		mask &= ~GF_ARG_SUBSYS_LOG;
+		mask &= ~GF_ARG_SUBSYS_FILTERS;
+	}
+	gf_sys_print_core_help(helpout, help_flags, mode, mask);
+}
+
+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),
+ 	GF_DEF_ARG("mem-track-stack", NULL, "enable memory tracker with stack dumping", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+#endif
+	GF_DEF_ARG("ltf", NULL, "load test-unit filters (used for for unit tests only)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	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("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=: 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"\
+		"- 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.\n 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"\
+			"- links: print possible connections between each supported filters.\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"
+			"  - 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"\
+			"- FNAME.OPT: print option `OPT` in filter `FNAME`"
+		, NULL, NULL, GF_ARG_STRING, 0),
+
+ 	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. Appending `:reload` to the profile name will force recreating a new configuration file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+ 	GF_DEF_ARG("alias", NULL, "assign a new alias or remove an alias. Can be specified several times. See [alias usage (-h alias)](#using-aliases)", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+ 	GF_DEF_ARG("aliasdoc", NULL, "assign documentation for a given alias (optional). Can be specified several times", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+
+ 	GF_DEF_ARG("uncache", NULL, "revert all items in GPAC cache directory to their original name and server path", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+
+	GF_DEF_ARG("wc", NULL, "write all core options in the config file unless already set", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("we", NULL, "write all file extensions in the config file unless already set (useful to change some default file extensions)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("wf", NULL, "write all filter options in the config file unless already set", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	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),
+	{0}
+};
+
+
+static void gpac_usage(GF_SysArgMode argmode)
+{
+	u32 i=0;
+	if ((argmode != GF_ARGMODE_ADVANCED) && (argmode != GF_ARGMODE_EXPERT) ) {
+		if (gen_doc!=2)
+			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"
+		"__[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"
+		"\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"
+		"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 -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`",
+			(gen_doc==1) ? "[gpac -h doc](core_config#global-filter-options)" : "`gpac -h doc`"
+		);
+	}
+
+	while (gpac_args[i].name) {
+		GF_GPACArg *arg = &gpac_args[i];
+		i++;
+
+		if (argmode!=GF_ARGMODE_ALL) {
+			if ((argmode==GF_ARGMODE_EXPERT) && !(arg->flags & GF_ARG_HINT_EXPERT)) continue;
+			if ((argmode==GF_ARGMODE_ADVANCED) && !(arg->flags & GF_ARG_HINT_ADVANCED)) continue;
+			else if ((argmode==GF_ARGMODE_BASE) && (arg->flags & (GF_ARG_HINT_ADVANCED| GF_ARG_HINT_EXPERT)) ) continue;
+		}
+
+		gf_sys_print_arg(helpout, help_flags, arg, "gpac");
+	}
+
+	if (argmode>=GF_ARGMODE_ADVANCED) {
+		gf_sys_format_help(helpout, help_flags, "\n  \nThe following libgpac core options allow customizing the filter session:\n  \n" );
+		gf_sys_print_core_help(helpout, help_flags, argmode, GF_ARG_SUBSYS_FILTERS);
+	}
+
+	if (argmode==GF_ARGMODE_BASE) {
+		if ( gf_opts_get_key_count("gpac.aliasdoc")) {
+			gf_sys_format_help(helpout, help_flags, "\n");
+			gpac_alias_help(GF_ARGMODE_BASE);
+		}
+
+		gf_sys_format_help(helpout, help_flags, "\ngpac - GPAC command line filter engine - version %s\n%s\n", gf_gpac_version(), gf_gpac_copyright() );
+	}
+}
+
+#ifndef GPAC_DISABLE_DOC
+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"
+"Applications in GPAC can also specify a different configuration file through the [-p](GPAC) option to indicate a profile. "
+"This allows different configurations for different usages and simplifies command line typing.\n"
+"EX gpac -p=foo []\n"
+"This will load configuration from $HOME/.gpac/foo/GPAC.cfg, creating it if needed.\n"
+"The reserved name `0` is used to disable configuration file writing.\n"
+"By default the configuration file only holds a few system specific options and directories. It is possible to serialize "
+"the entire set of options to the configuration file, using [-wc](GPAC) [-wf](GPAC). This should be avoided as the resulting "
+"configuration file size will be quite large, hence larger memory usage for the applications.\n"
+"The options specified in the configuration file may be overriden by the values in __restrict.cfg__ file located in GPAC share system directory (e.g. /usr/share/gpac), "
+"if present; this allows enforcing system-wide configuration values.\n"
+"Note: The methods describe in this section apply to any application in GPAC transferring their arguments "
+"to libgpac. This is the case for __gpac__, __MP4Box__, __MP4Client/Osmo4__.\n"
+"# Core options\n"
+"The options from libgpac core can also be assigned though the config file from section __core__ using "
+"option name **without initial dash** as key name.\n"
+"EX [core]threads=2\n"
+"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 "
+"`[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"
+"This will force the rtp input filter to always request RTP over RTSP by default.\n"
+"To generate a configuration file with all filters options serialized, use [-wf](GPAC).\n"
+"# Global filter options\n"
+"It is possible to specify options global to multiple filters using `--OPTNAME=VAL`. Global options do not override filter options but "
+"take precedence over options loaded from configuration file.\n"
+"This will set option `OPTNAME`, when present, to `VAL` in any loaded filter.\n"
+"EX --buffer=100 -i file vout aout\n"
+"This is equivalent to specifying `vout:buffer=100 aout:buffer=100`.\n"
+"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"
+"This is equivalent to specifying `-o dump.264:profile=Baseline`.\n"
+
+};
+#endif
+
+static void gpac_config_help()
+{
+
+#ifndef GPAC_DISABLE_DOC
+		gf_sys_format_help(helpout, help_flags, "%s", gf_sys_localized("gpac", "config", gpac_config) );
+#else
+		gf_sys_format_help(helpout, help_flags, "%s", "GPAC compiled without built-in doc.\n");
+#endif
+}
+
+
+static Bool logs_to_file=GF_FALSE;
+
+#define DEF_LOG_ENTRIES	10
+
+struct _logentry
+{
+	u32 tool, level;
+	u32 nb_repeat;
+	u64 clock;
+	char *szMsg;
+} *static_logs;
+static u32 nb_log_entries = DEF_LOG_ENTRIES;
+
+static u32 log_write=0;
+
+static char *log_buf = NULL;
+static u32 log_buf_size=0;
+static void gpac_on_logs(void *cbck, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char* fmt, va_list vlist)
+{
+	va_list vlist_tmp;
+	va_copy(vlist_tmp, vlist);
+	u32 len = vsnprintf(NULL, 0, fmt, vlist_tmp);
+	va_end(vlist_tmp);
+	if (log_buf_size < len+2) {
+		log_buf_size = len+2;
+		log_buf = gf_realloc(log_buf, log_buf_size);
+	}
+	vsprintf(log_buf, fmt, vlist);
+
+	if (log_write && static_logs[log_write-1].szMsg) {
+		if (!strcmp(static_logs[log_write-1].szMsg, log_buf)) {
+			static_logs[log_write-1].nb_repeat++;
+			return;
+		}
+	}
+
+	static_logs[log_write].level = log_level;
+	static_logs[log_write].tool = log_tool;
+	if (static_logs[log_write].szMsg) gf_free(static_logs[log_write].szMsg);
+	static_logs[log_write].szMsg = gf_strdup(log_buf);
+	static_logs[log_write].clock = gf_net_get_utc();
+
+	log_write++;
+	if (log_write==nb_log_entries) {
+		log_write = nb_log_entries - 1;
+		gf_free(static_logs[0].szMsg);
+		memmove(&static_logs[0], &static_logs[1], sizeof (struct _logentry) * (nb_log_entries-1) );
+		memset(&static_logs[log_write], 0, sizeof(struct _logentry));
+	}
+}
+
+u64 last_report_clock_us = 0;
+static void print_date(u64 time)
+{
+	time_t gtime;
+	struct tm *t;
+	u32 sec;
+	u32 ms;
+	gtime = time / 1000;
+	sec = (u32)(time / 1000);
+	ms = (u32)(time - ((u64)sec) * 1000);
+	t = gf_gmtime(&gtime);
+//	fprintf(stderr, "[%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900 + t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, ms);
+	fprintf(stderr, "[%02d:%02d:%02d.%03dZ] ", t->tm_hour, t->tm_min, t->tm_sec, ms);
+}
+
+static void gpac_print_report(GF_FilterSession *fsess, Bool is_init, Bool is_final)
+{
+	u32 i, count, nb_active;
+	u64 now;
+
+	if (is_init) {
+		if (enable_reports==2)
+			gf_sys_set_console_code(stderr, GF_CONSOLE_SAVE);
+
+		logs_to_file = gf_log_use_file();
+		if (!logs_to_file && (enable_reports==2) ) {
+			if (!nb_log_entries) nb_log_entries = 1;
+			static_logs = gf_malloc(sizeof(struct _logentry) * nb_log_entries);
+			memset(static_logs, 0, sizeof(struct _logentry) * nb_log_entries);
+			gf_log_set_callback(fsess, gpac_on_logs);
+		}
+		last_report_clock_us = gf_sys_clock_high_res();
+		return;
+	}
+
+	now = gf_sys_clock_high_res();
+	if ( (now - last_report_clock_us < 200000) && !is_final)
+		return;
+
+	last_report_clock_us = now;
+	if (!is_final)
+		gf_sys_set_console_code(stderr, GF_CONSOLE_CLEAR);
+
+	gf_sys_get_rti(100, &rti, 0);
+	gf_sys_set_console_code(stderr, GF_CONSOLE_CYAN);
+	print_date(gf_net_get_utc());
+	fprintf(stderr, "GPAC Session Status: ");
+	gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+	fprintf(stderr, "mem % 10"LLD_SUF" kb CPU % 2d", rti.gpac_memory/1000, rti.process_cpu_time);
+	fprintf(stderr, "\n");
+
+	gf_fs_lock_filters(fsess, GF_TRUE);
+	nb_active = count = gf_fs_get_filters_count(fsess);
+	for (i=0; i<count; i++) {
+		GF_FilterStats stats;
+		gf_fs_get_filter_stats(fsess, i, &stats);
+		if (stats.done || stats.filter_alias) {
+			nb_active--;
+			continue;
+		}
+		if (report_filter && (!strstr(report_filter, stats.reg_name)))
+			continue;
+
+		gf_sys_set_console_code(stderr, GF_CONSOLE_GREEN);
+		fprintf(stderr, "%s", stats.name ? stats.name : stats.reg_name);
+		gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+		if (stats.name && strcmp(stats.name, stats.reg_name))
+			fprintf(stderr, " (%s)", stats.reg_name);
+		fprintf(stderr, ": ");
+
+		if (stats.status) {
+			fprintf(stderr, "%s\n", stats.status);
+		} else {
+			if (stats.stream_type)
+				fprintf(stderr, "%s ", gf_stream_type_name(stats.stream_type));
+			if (stats.codecid)
+			 	fprintf(stderr, "(%s) ", gf_codecid_name(stats.codecid) );
+
+			if ((stats.nb_pid_in == stats.nb_pid_out) && (stats.nb_pid_in==1)) {
+				Double pck_per_sec = (Double) (stats.nb_hw_pck_sent ? stats.nb_hw_pck_sent : stats.nb_pck_sent);
+				pck_per_sec *= 1000000;
+				pck_per_sec /= (stats.time_process+1);
+
+				fprintf(stderr, "% 10"LLD_SUF" pck %02.02f FPS ", (s64) stats.nb_out_pck, pck_per_sec);
+			} else {
+				if (stats.nb_pid_in)
+					fprintf(stderr, "%d input PIDs % 10"LLD_SUF" pck ", stats.nb_pid_in, (s64)stats.nb_in_pck);
+				if (stats.nb_pid_out)
+					fprintf(stderr, "%d output PIDs % 10"LLD_SUF" pck ", stats.nb_pid_out, (s64) stats.nb_out_pck);
+			}
+			if (stats.in_eos)
+				fprintf(stderr, "- EOS");
+			fprintf(stderr, "\n");
+		}
+	}
+	fprintf(stderr, "Active filters: %d\n", nb_active);
+
+	if (static_logs) {
+		if (is_final && (!log_write || !static_logs[log_write-1].szMsg))
+			return;
+
+		fprintf(stderr, "\nLogs:\n");
+		for (i=0; i<log_write; i++) {
+			if (static_logs[i].level==GF_LOG_ERROR) gf_sys_set_console_code(stderr, GF_CONSOLE_RED);
+			else if (static_logs[i].level==GF_LOG_WARNING) gf_sys_set_console_code(stderr, GF_CONSOLE_YELLOW);
+			else if (static_logs[i].level==GF_LOG_INFO) gf_sys_set_console_code(stderr, GF_CONSOLE_GREEN);
+			else gf_sys_set_console_code(stderr, GF_CONSOLE_CYAN);
+
+			print_date(static_logs[i].clock);
+
+			if (static_logs[i].nb_repeat)
+				fprintf(stderr, "[repeated %d] ", static_logs[i].nb_repeat);
+
+			fprintf(stderr, "%s", static_logs[i].szMsg);
+			gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
+		}
+		fprintf(stderr, "\n");
+	}
+	gf_fs_lock_filters(fsess, GF_FALSE);
+	fflush(stderr);
+}
+
+static Bool gpac_event_proc(void *opaque, GF_Event *event)
+{
+	GF_FilterSession *fsess = (GF_FilterSession *)opaque;
+	if (event->type==GF_EVENT_PROGRESS) {
+		if (event->progress.progress_type==3) {
+			gpac_print_report(fsess, GF_FALSE, GF_FALSE);
+		}
+	}
+	else if (event->type==GF_EVENT_QUIT) {
+		gf_fs_abort(fsess, GF_TRUE);
+	}
+	return GF_FALSE;
+}
+
+
+typedef enum
+{
+	GPAC_COM_UNDEF = 0,
+	GPAC_QUIT,
+	GPAC_EXIT,
+	GPAC_PRINT_STATS,
+	GPAC_PRINT_GRAPH,
+	GPAC_SEND_UPDATE,
+	GPAC_LIST_FILTERS,
+	GPAC_INSERT_FILTER,
+	GPAC_REMOVE_FILTER,
+	GPAC_PRINT_HELP
+} GPAC_Command;
+
+struct _gpac_key
+{
+	u8 char_code;
+	GPAC_Command cmd_type;
+	const char *cmd_help;
+	u32 flags;
+} GPAC_Keys[] = {
+	{'q', GPAC_QUIT, "flush all streams and exit", 0},
+	{'x', GPAC_EXIT, "exit with no flush (may break output files)", 0},
+	{'s', GPAC_PRINT_STATS, "print statistics", 0},
+	{'g', GPAC_PRINT_GRAPH, "print filter graph", 0},
+	{'l', GPAC_LIST_FILTERS, "list filters", 0},
+	{'u', GPAC_SEND_UPDATE, "update argument of filter", 0},
+	{'i', GPAC_INSERT_FILTER, "insert a filter in the chain", 0},
+	{'r', GPAC_REMOVE_FILTER, "remove a filter from the chain", 0},
+	{'h', GPAC_PRINT_HELP, "print this help", 0},
+	{0}
+};
+
+static GPAC_Command get_cmd(u8 char_code)
+{
+	u32 i=0;
+	while (GPAC_Keys[i].char_code) {
+		if (GPAC_Keys[i].char_code == char_code)
+			return GPAC_Keys[i].cmd_type;
+		i++;
+	}
+	return GPAC_COM_UNDEF;
+}
+
+static void gpac_fsess_task_help()
+{
+	gf_sys_format_help(helpout, help_flags, "Available runtime options/keys:\n");
+
+	u32 i=0;
+	while (GPAC_Keys[i].char_code) {
+		gf_sys_format_help(helpout, help_flags, "- %c: %s\n", GPAC_Keys[i].char_code, GPAC_Keys[i].cmd_help);
+		i++;
+	}
+}
+
+char szFilter[100];
+char szCom[2048];
+static u64 run_start_time = 0;
+static Bool gpac_fsess_task(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
+{
+	if (enable_prompt && gf_prompt_has_input()) {
+		u32 i, count;
+		GF_Filter *filter;
+		const GF_Filter *link_from=NULL;
+		GF_Err e;
+		char *link_args = NULL;
+		GPAC_Command c = get_cmd(gf_prompt_get_char());
+		switch (c) {
+		case GPAC_QUIT:
+			gf_fs_abort(fsess, GF_TRUE);
+			nb_loops = 0;
+			return GF_FALSE;
+		case GPAC_EXIT:
+			gf_fs_abort(fsess, GF_FALSE);
+			nb_loops = 0;
+			return GF_FALSE;
+		case GPAC_PRINT_STATS:
+			gf_fs_print_stats(fsess);
+			break;
+		case GPAC_PRINT_GRAPH:
+			gf_fs_print_connections(fsess);
+			break;
+		case GPAC_PRINT_HELP:
+			gpac_fsess_task_help();
+			break;
+		case GPAC_SEND_UPDATE:
+			fprintf(stderr, "Sending filter update - enter the target filter ID, name, registry name or #N with N the 0-based index in loaded filter list:\n");
+
+			if (1 > scanf("%99s", szFilter)) {
+				fprintf(stderr, "Cannot read the filter ID, aborting.\n");
+				break;
+			}
+			e = GF_OK;
+			if (szFilter[0]=='#') {
+				GF_FilterStats stats;
+				u32 idx = atoi(szFilter+1);
+				gf_fs_lock_filters(fsess, GF_TRUE);
+				e = gf_fs_get_filter_stats(fsess, idx, &stats);
+				gf_fs_lock_filters(fsess, GF_FALSE);
+				if (e==GF_OK)
+					strncpy(szFilter, stats.filter_id ? stats.filter_id : stats.name, 99);
+			}
+			if (e) {
+				fprintf(stderr, "Cannot get filter for ID %s, aborting.\n", szFilter);
+				break;
+			}
+			fprintf(stderr, "Enter the command to send\n");
+			if (1 > scanf("%2047s", szCom)) {
+				fprintf(stderr, "Cannot read the command, aborting.\n");
+				break;
+			}
+			gf_fs_send_update(fsess, szFilter, NULL, szCom, NULL, 0);
+			break;
+		case GPAC_LIST_FILTERS:
+			gf_fs_lock_filters(fsess, GF_TRUE);
+			count = gf_fs_get_filters_count(fsess);
+			fprintf(stderr, "Loaded filters:\n");
+			for (i=0; i<count; i++) {
+				GF_FilterStats stats;
+				gf_fs_get_filter_stats(fsess, i, &stats);
+				if (stats.filter_id)
+					fprintf(stderr, "%s (%s) ID %s\n", stats.name, stats.reg_name, stats.filter_id);
+				else
+					fprintf(stderr, "%s (%s)\n", stats.name, stats.reg_name);
+			}
+			gf_fs_lock_filters(fsess, GF_FALSE);
+			break;
+		case GPAC_INSERT_FILTER:
+		case GPAC_REMOVE_FILTER:
+			fprintf(stderr, "%s filter ID, name, registry name or #N with N the 0-based index in loaded filter list:\n",
+					(c==GPAC_INSERT_FILTER) ? "Inserting filter - enter the source" : "Removing filter - enter the");
+
+			if (1 > scanf("%99s", szFilter)) {
+				fprintf(stderr, "Cannot read the filter ID or index, aborting.\n");
+				break;
+			}
+			link_args = strchr(szFilter, separator_set[SEP_LINK]);
+			if (link_args) {
+				link_args[0] = 0;
+				link_args++;
+			}
+			if (szFilter[0]=='#') {
+				GF_FilterStats stats;
+				u32 idx = atoi(szFilter+1);
+				gf_fs_lock_filters(fsess, GF_TRUE);
+				gf_fs_get_filter_stats(fsess, idx, &stats);
+				gf_fs_lock_filters(fsess, GF_FALSE);
+				link_from = stats.filter;
+			} else {
+				const GF_Filter *link_from_by_reg=NULL;
+				gf_fs_lock_filters(fsess, GF_TRUE);
+				count = gf_fs_get_filters_count(fsess);
+				for (i=0; i<count; i++) {
+					GF_FilterStats stats;
+					gf_fs_get_filter_stats(fsess, i, &stats);
+					if (!strcmp(stats.name, szFilter)) {
+						link_from = stats.filter;
+						break;
+					}
+					if (!link_from_by_reg && !strcmp(stats.reg_name, szFilter)) {
+						link_from_by_reg = stats.filter;
+					}
+				}
+				gf_fs_lock_filters(fsess, GF_FALSE);
+				if (!link_from)
+					link_from = link_from_by_reg;
+			}
+			if (!link_from) {
+				fprintf(stderr, "Failed to get filter %s, not found\n", szFilter);
+				break;
+			}
+
+			if (c==GPAC_REMOVE_FILTER) {
+				gf_filter_remove((GF_Filter *) link_from);
+				break;
+			}
+
+			fprintf(stderr, "Enter the filter to insert\n");
+			if (1 > scanf("%2047s", szCom)) {
+				fprintf(stderr, "Cannot read the filter to insert, aborting.\n");
+				break;
+			}
+
+			if (!strncmp(szCom, "src=", 4)) {
+				filter = gf_fs_load_source(fsess, szCom+4, NULL, NULL, &e);
+			} else if (!strncmp(szCom, "dst=", 4)) {
+				filter = gf_fs_load_destination(fsess, szCom+4, NULL, NULL, &e);
+			} else {
+				filter = gf_fs_load_filter(fsess, szCom, &e);
+			}
+
+			if (!filter) {
+				fprintf(stderr, "Cannot load filter %s: %s\n", szCom, gf_error_to_string(e));
+				break;
+			}
+			gf_filter_set_source(filter, (GF_Filter *) link_from, link_args);
+			//reconnect outputs of source
+			gf_filter_reconnect_output((GF_Filter *) link_from);
+			break;
+		default:
+			break;
+		}
+	}
+	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;
+			return GF_FALSE;
+		}
+	}
+
+	if (gf_fs_is_last_task(fsess))
+		return GF_FALSE;
+	*reschedule_ms = 500;
+	return GF_TRUE;
+}
+
+static Bool sigint_catched=GF_FALSE;
+static Bool sigint_processed=GF_FALSE;
+#ifdef WIN32
+#include <windows.h>
+static BOOL WINAPI gpac_sig_handler(DWORD sig)
+{
+	if (sig == CTRL_C_EVENT) {
+#else
+#include <signal.h>
+static void gpac_sig_handler(int sig)
+{
+	if (sig == SIGINT) {
+#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");
+				}
+				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;
+			}
+		}
+	}
+#ifdef WIN32
+	return TRUE;
+#endif
+}
+
+static void parse_sep_set(const char *arg, Bool *override_seps)
+{
+	if (!arg) return;
+	u32 len = (u32) strlen(arg);
+	if (!len) return;
+	*override_seps = GF_TRUE;
+	if (len>=1) separator_set[0] = arg[0];
+	if (len>=2) separator_set[1] = arg[1];
+	if (len>=3) separator_set[2] = arg[2];
+	if (len>=4) separator_set[3] = arg[3];
+	if (len>=5) separator_set[4] = arg[4];
+	if (len>=6) separator_set[5] = arg[5];
+}
+
+
+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 (alias_argv) {
+		while (gf_list_count(args_alloc)) {
+			gf_free(gf_list_pop_back(args_alloc));
+		}
+		gf_list_del(args_alloc);
+		gf_list_del(args_used);
+		gf_free(alias_argv);
+	}
+	if (log_buf) gf_free(log_buf);
+	if ((helpout != stdout) && (helpout != stderr)) {
+		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\nbuild: %s\n"
+			".br\nCopyright: %s\n.br\n"
+			".SH SEE ALSO\n"
+			".LP\ngpac(1), MP4Client(1), MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
+		}
+		gf_fclose(helpout);
+	}
+
+	if (sidebar_md)
+		gf_fclose(sidebar_md);
+
+	if (static_logs) {
+		for (i=0; i<nb_log_entries; i++) {
+			if (static_logs[i].szMsg)
+				gf_free(static_logs[i].szMsg);
+		}
+		gf_free(static_logs);
+	}
+	gf_sys_close();
+	if (code) return code;
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (gf_memory_size() || gf_file_handles_count() ) {
+		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+		gf_memory_print();
+		return 2;
+	}
+#endif
+	return 0;
+}
+
+#define gpac_exit(_code) return gpac_exit_fun(_code, alias_argv, alias_argc)
+
+#include <gpac/network.h>
+static void gpac_load_suggested_filter_args()
+{
+	u32 i, count, k;
+	GF_Config *opts = NULL;
+	GF_FilterSession *fsess;
+	const char *version, *cfg_path;
+	char *all_opts;
+
+	if (gf_opts_get_bool("core", "no-argchk"))
+		return;
+
+	cfg_path = gf_opts_get_filename();
+	all_opts = gf_url_concatenate(cfg_path, "all_opts.txt");
+
+	opts = gf_cfg_force_new("probe", all_opts);
+	gf_free(all_opts);
+
+	version = gf_cfg_get_key(opts, "version", "version");
+	if (version && !strcmp(version, gf_gpac_version()) ) {
+		gf_cfg_del(opts);
+		return;
+	}
+	gf_cfg_del_section(opts, "allopts");
+	gf_cfg_set_key(opts, "version", "version", gf_gpac_version());
+
+	gf_sys_format_help(stderr, 0, "__Refreshing all options registry, this may take some time ... ");
+
+	fsess = gf_fs_new(0, GF_FS_SCHEDULER_LOCK_FREE, GF_FS_FLAG_LOAD_META, NULL);
+	if (!fsess) {
+		gf_sys_format_help(stderr, 0, "\nWarning: Error creating session\n");
+		gf_cfg_del(opts);
+		return;
+	}
+
+	count = gf_fs_filters_registers_count(fsess);
+	for (i=0; i<count; i++) {
+		const GF_FilterRegister *freg = gf_fs_get_filter_register(fsess, i);
+
+		k=0;
+		while (freg->args) {
+			const char *old_val;
+			char *argn=NULL;
+			const GF_FilterArgs *arg = &freg->args[k];
+			if (!arg || !arg->arg_name) {
+				break;
+			}
+			k++;
+			if (arg->flags & GF_FS_ARG_HINT_HIDE) continue;
+
+			if (arg->flags & GF_FS_ARG_META) {
+				gf_dynstrcat(&argn, "-+", NULL);
+			} else {
+				gf_dynstrcat(&argn, "--", NULL);
+			}
+			gf_dynstrcat(&argn, arg->arg_name, NULL);
+
+			old_val = gf_cfg_get_key(opts, "allopts", argn);
+			if (old_val) {
+				char *newval = gf_strdup(freg->name);
+				gf_dynstrcat(&newval, old_val, " ");
+				gf_cfg_set_key(opts, "allopts", argn, newval);
+				gf_free(newval);
+			} else {
+				gf_cfg_set_key(opts, "allopts", argn, freg->name);
+			}
+			gf_free(argn);
+		}
+	}
+	gf_fs_del(fsess);
+	gf_cfg_del(opts);
+	gf_sys_format_help(stderr, 0, "done\n");
+}
+
+
+static void gpac_suggest_arg(char *aname)
+{
+	u32 k;
+	const GF_GPACArg *args;
+	if (!aname) return;
+	Bool found=GF_FALSE;
+	for (k=0; k<2; k++) {
+		u32 i=0;
+		if (k==0) args = gpac_args;
+		else args = gf_sys_get_options();
+
+		while (args[i].name) {
+			const GF_GPACArg *arg = &args[i];
+			i++;
+			if (gf_sys_word_match(aname, arg->name)) {
+				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 -hx%s)\n", arg->name, k ? " core" : ""));
+			}
+		}
+	}
+	if (!found) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Unrecognized option \"%s\", check usage \"gpac -h\"\n", aname));
+	}
+}
+
+static void gpac_suggest_filter(char *fname, Bool is_help, Bool filter_only)
+{
+	Bool found = GF_FALSE;
+	u32 i, count;
+	if (!fname) return;
+	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 (gf_sys_word_match(fname, freg->name)) {
+			if (!found) {
+				found = GF_TRUE;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Closest filter names: \n"));
+			}
+			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", "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"));
+				}
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("-h %s\n", doc_helps[i]));
+			}
+			i++;
+		}
+		if (!filter_only) {
+			Bool arg_found=GF_FALSE;
+			u32 nb_alias = gf_opts_get_key_count("gpac.alias");
+			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) {
+						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));
+				}
+			}
+			for (i=0; i<count; i++) {
+				u32 j=0;
+				const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+
+				while (reg->args) {
+					const GF_FilterArgs *arg = &reg->args[j];
+					if (!arg || !arg->arg_name) break;
+					j++;
+					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;
+					}
+					gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s \n", reg->name, arg->arg_name);
+				}
+			}
+		}
+	}
+	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" : ""
+		));
+	}
+}
+
+static void gpac_suggest_filter_arg(GF_Config *opts, char *argname, u32 atype)
+{
+	char *keyname;
+	const char *keyval;
+	u32 i, count, len, nb_filters, j;
+	Bool f_found = GF_FALSE;
+	char szSep[2];
+
+	if (gf_opts_get_bool("core", "no-argchk"))
+		return;
+
+	szSep[0] = separator_set[0];
+	szSep[1] = 0;
+
+	len = (u32) strlen(argname);
+	keyname = gf_malloc(sizeof(char)*(len+3));
+	sprintf(keyname, "-%c%s", (atype==2) ? '+' : '-', argname);
+	keyval = gf_cfg_get_key(opts, "allopts", keyname);
+	gf_free(keyname);
+	if (keyval) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Argument \"%s%s\" was set but not used by any filter\n",
+		(atype==2) ? "-+" : (atype ? "--" : szSep), argname));
+		return;
+	}
+
+	nb_filters = gf_fs_get_filters_count(session);
+	count = gf_cfg_get_key_count(opts, "allopts");
+	for (i=0; i<count; i++) {
+		Bool ffound = GF_FALSE;
+		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;
+		u32 alen = (u32) strlen(arg);
+		if (alen>2*len) continue;
+
+		for (j=0; j<nb_filters; j++) {
+			GF_FilterStats stats;
+			stats.reg_name = NULL;
+			gf_fs_get_filter_stats(session, j, &stats);
+
+			if (stats.reg_name && strstr(aval, stats.reg_name)) {
+				ffound = GF_TRUE;
+				break;
+			}
+		}
+		if (!ffound) 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",
+					(atype==2) ? "-+" : (atype ? "--" : szSep), argname));
+				f_found = GF_TRUE;
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("- %s in filters %s\n", arg, aval));
+		}
+	}
+	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",
+			(atype==2) ? "-+" : (atype ? "--" : szSep), argname));
+	}
+}
+
+static void gpac_check_session_args()
+{
+	GF_Config *opts = NULL;
+	u32 idx = 0;
+	char *argname;
+	u32 argtype;
+
+	while (1) {
+		if (gf_fs_enum_unmapped_options(session, &idx, &argname, &argtype)==GF_FALSE)
+			break;
+
+		if (!opts) {
+			const char *cfg_path = gf_opts_get_filename();
+			char *all_opts = gf_url_concatenate(cfg_path, "all_opts.txt");
+			opts = gf_cfg_new(NULL, all_opts);
+			gf_free(all_opts);
+		}
+		if (!opts) {
+			break;
+		}
+		gpac_suggest_filter_arg(opts, argname, argtype);
+	}
+	if (opts) gf_cfg_del(opts);
+}
+
+static int gpac_main(int argc, char **argv)
+{
+	GF_Err e=GF_OK;
+	int i;
+	const char *profile=NULL;
+	u32 sflags=0;
+	Bool override_seps=GF_FALSE;
+	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 *loaded_filters=NULL;
+	GF_SysArgMode argmode = GF_ARGMODE_BASE;
+	u32 nb_filters = 0;
+	Bool nothing_to_do = GF_TRUE;
+	GF_MemTrackerType mem_track=GF_MemTrackerNone;
+	char *view_conn_for_filter = NULL;
+	Bool view_filter_conn = GF_FALSE;
+	Bool dump_codecs = GF_FALSE;
+	Bool has_alias = GF_FALSE;
+	Bool alias_set = GF_FALSE;
+	GF_FilterSession *tmp_sess;
+	u32 loops_done = 0;
+	Bool has_xopt = GF_FALSE;
+	helpout = stdout;
+
+	//look for mem track and profile, and also process all helpers
+	for (i=1; i<argc; i++) {
+		char *arg = argv[i];
+		if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
+#ifdef GPAC_MEMORY_TRACKING
+            mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
+#else
+			fprintf(stderr, "WARNING - GPAC not compiled with Memory Tracker - ignoring \"%s\"\n", arg);
+#endif
+		} else if (!strncmp(arg, "-p=", 3)) {
+			profile = arg+3;
+		} else if (!strncmp(arg, "-mkl=", 5)) {
+			return gpac_make_lang(arg+5);
+		}
+	}
+
+	gf_sys_init(mem_track, profile);
+
+//	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+	gf_log_set_tool_level(GF_LOG_APP, GF_LOG_INFO);
+
+	if (gf_opts_get_key_count("gpac.alias")) {
+		for (i=1; i<argc; i++) {
+			char *arg = argv[i];
+			if (gf_opts_get_key("gpac.alias", arg) != NULL) {
+				has_alias = GF_TRUE;
+				break;
+			}
+		}
+		if (has_alias) {
+			if (! gpac_expand_alias(argc, argv) ) {
+				gpac_exit(1);
+			}
+			argc = alias_argc;
+			argv = alias_argv;
+		}
+	}
+
+
+	//this will parse default args
+	e = gf_sys_set_args(argc, (const char **) argv);
+	if (e) {
+		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
+		gpac_exit(1);
+	}
+
+	if (!profile || strcmp(profile, "0") )
+		gpac_load_suggested_filter_args();
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_APP, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("GPAC args: "));
+		for (i=1; i<argc; i++) {
+			char *arg = argv[i];
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("%s ", arg));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("\n"));
+	}
+#endif
+
+	for (i=1; i<argc; i++) {
+		char *arg = argv[i];
+		char *arg_val = strchr(arg, '=');
+		if (arg_val) {
+			arg_val[0]=0;
+			arg_val++;
+		}
+
+		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;
+
+			if (i+1<argc)
+				gf_sys_mark_arg_used(i+1, GF_TRUE);
+
+			if ((i+1==argc) || (argv[i+1][0]=='-')) {
+				gpac_usage(argmode);
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "log")) {
+				gpac_core_help(GF_ARGMODE_ALL, GF_TRUE);
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "core")) {
+				gpac_core_help(argmode, GF_FALSE);
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "modules")) {
+				gpac_modules_help();
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "doc")) {
+				gpac_filter_help();
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "alias")) {
+				gpac_alias_help(argmode);
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "props")) {
+				dump_all_props();
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "cfg")) {
+				gpac_config_help();
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "prompt")) {
+				gpac_fsess_task_help();
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "codecs")) {
+				dump_codecs = GF_TRUE;
+				sflags |= GF_FS_FLAG_LOAD_META | GF_FS_FLAG_NO_GRAPH_CACHE;
+				i++;
+			} else if (!strcmp(argv[i+1], "links")) {
+				view_filter_conn = GF_TRUE;
+				if ((i+2<argc)	&& (argv[i+2][0] != '-')) {
+					view_conn_for_filter = argv[i+2];
+					gf_sys_mark_arg_used(i+2, GF_TRUE);
+					i++;
+				}
+
+				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" \
+	        		"Disabled features: %s\n", gf_gpac_version(), gf_sys_features(GF_FALSE), gf_sys_features(GF_TRUE)
+				);
+				gpac_exit(0);
+			} else if (!strcmp(argv[i+1], "filters")) {
+				list_filters = 1;
+				sflags |= GF_FS_FLAG_NO_GRAPH_CACHE;
+				i++;
+			} else if (!strcmp(argv[i+1], "filters:*") || !strcmp(argv[i+1], "filters:@")) {
+				list_filters = 2;
+				sflags |= GF_FS_FLAG_NO_GRAPH_CACHE;
+				i++;
+			} else {
+				print_filter_info = 1;
+				sflags |= GF_FS_FLAG_NO_GRAPH_CACHE;
+			}
+		}
+		else if (has_xopt && !strcmp(arg, "-h")) {
+			gf_opts_set_key("temp", "gpac-help", "yes");
+		}
+		else if (!strcmp(arg, "-genmd") || !strcmp(arg, "-genman")) {
+			argmode = GF_ARGMODE_ALL;
+			if (!strcmp(arg, "-genmd")) {
+				gf_opts_set_key("temp", "gendoc", "yes");
+				gen_doc = 1;
+				help_flags = GF_PRINTARG_MD;
+				helpout = gf_fopen("gpac_general.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » Usage\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+				fprintf(helpout, "# General Usage of gpac\n");
+			} else {
+				gf_opts_set_key("temp", "gendoc", "yes");
+				gen_doc = 2;
+				help_flags = GF_PRINTARG_MAN;
+				helpout = gf_fopen("gpac.1", "w");
+	 			fprintf(helpout, ".TH gpac 1 2019 gpac GPAC\n");
+				fprintf(helpout, ".\n.SH NAME\n.LP\ngpac \\- GPAC command-line filter session manager\n"
+				".SH SYNOPSIS\n.LP\n.B gpac\n"
+				".RI [options] FILTER [LINK] FILTER [...]\n.br\n.\n");
+			}
+			gpac_usage(GF_ARGMODE_ALL);
+
+			if (gen_doc==1) {
+				fprintf(helpout, "# Using Aliases\n");
+			} else {
+				fprintf(helpout, ".SH Using Aliases\n.PL\n");
+			}
+			gpac_alias_help(GF_ARGMODE_EXPERT);
+
+			if (gen_doc==1) {
+				gf_fclose(helpout);
+				helpout = gf_fopen("core_config.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » Configuration\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+			}
+			gpac_config_help();
+
+			if (gen_doc==1) {
+				gf_fclose(helpout);
+				helpout = gf_fopen("core_options.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » Core Options\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+				fprintf(helpout, "# GPAC Core Options\n");
+			}
+			gpac_core_help(argmode, GF_FALSE);
+
+			if (gen_doc==1) {
+				gf_fclose(helpout);
+				helpout = gf_fopen("core_logs.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » Logging System\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+				fprintf(helpout, "# GPAC Log System\n");
+			}
+			gpac_core_help(argmode, GF_TRUE);
+
+			if (gen_doc==1) {
+				gf_fclose(helpout);
+				helpout = gf_fopen("filters_general.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » General Concepts\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+			}
+			gf_sys_format_help(helpout, help_flags, "%s", gpac_doc);
+
+			if (gen_doc==1) {
+				gf_fclose(helpout);
+				helpout = gf_fopen("filters_properties.md", "w");
+				fprintf(helpout, "[**HOME**](Home) » [**Filters**](Filters) » Built-in Properties\n");
+				fprintf(helpout, "%s", auto_gen_md_warning);
+			}
+			gf_sys_format_help(helpout, help_flags, "# GPAC Built-in properties\n");
+			dump_all_props();
+//			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\nbuild: %s\n"
+				".br\nCopyright: %s\n.br\n"
+				".SH SEE ALSO\n"
+				".LP\ngpac-filters(1), MP4Client(1), MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
+				gf_fclose(helpout);
+
+				helpout = gf_fopen("gpac-filters.1", "w");
+	 			fprintf(helpout, ".TH gpac 1 2019 gpac GPAC\n");
+				fprintf(helpout, ".\n.SH NAME\n.LP\ngpac \\- GPAC command-line filter session manager\n"
+				".SH SYNOPSIS\n.LP\n.B gpac\n"
+				".RI [options] FILTER [LINK] FILTER [...]\n.br\n.\n"
+				".SH DESCRIPTION\n.LP"
+				"\nThis page describes all filters usually present in GPAC\n"
+				"\nTo check for help on a filter not listed here, use gpac -h myfilter\n"
+				"\n"
+				);
+			}
+
+			list_filters = 1;
+		}
+		else if (!strcmp(arg, "-ltf")) {
+			load_test_filters = GF_TRUE;
+		} else if (!strcmp(arg, "-stats")) {
+			dump_stats = GF_TRUE;
+		} else if (!strcmp(arg, "-graph")) {
+			dump_graph = GF_TRUE;
+		} else if (strstr(arg, ":*") || strstr(arg, ":@")) {
+			if (list_filters)
+				list_filters = 3;
+			else
+				print_meta_filters = GF_TRUE;
+		} else if (!strcmp(arg, "-wc")) {
+			write_core_opts = GF_TRUE;
+		} else if (!strcmp(arg, "-we")) {
+			write_extensions = GF_TRUE;
+		} else if (!strcmp(arg, "-wf")) {
+			write_profile = GF_TRUE;
+		} else if (!strcmp(arg, "-wfx")) {
+			write_profile = GF_TRUE;
+			sflags |= GF_FS_FLAG_LOAD_META;
+		} else if (!strcmp(arg, "-sloop")) {
+			nb_loops = -1;
+			if (arg_val) nb_loops = atoi(arg_val);
+		} 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, "-uncache")) {
+			const char *cache_dir = gf_opts_get_key("core", "cache");
+			gf_enum_directory(cache_dir, GF_FALSE, revert_cache_file, NULL, ".txt");
+			fprintf(stderr, "GPAC Cache dir %s flattened\n", cache_dir);
+			gpac_exit(0);
+		} else if (!strcmp(arg, "-cfg")) {
+			nothing_to_do = GF_FALSE;
+		}
+
+		else if (!strcmp(arg, "-alias") || !strcmp(arg, "-aliasdoc")) {
+			char *alias_val;
+			Bool exists;
+			if (!arg_val) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("-alias does not have any argument, check usage \"gpac -h\"\n"));
+				gpac_exit(1);
+			}
+			alias_val = arg_val ? strchr(arg_val, ' ') : NULL;
+			if (alias_val) alias_val[0] = 0;
+
+			session = gf_fs_new_defaults(sflags);
+			exists = gf_fs_filter_exists(session, arg_val);
+			gf_fs_del(session);
+			if (exists) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("alias %s has the same name as an existing filter, not allowed\n", arg_val));
+				if (alias_val) alias_val[0] = ' ';
+				gpac_exit(1);
+			}
+
+			gf_opts_set_key(!strcmp(arg, "-alias") ? "gpac.alias" : "gpac.aliasdoc", arg_val, alias_val ? alias_val+1 : NULL);
+			fprintf(stderr, "Set %s for %s to %s\n", arg, arg_val, alias_val ? alias_val+1 : "NULL");
+			if (alias_val) alias_val[0] = ' ';
+			alias_set = GF_TRUE;
+		}
+		else if (!strncmp(arg, "-seps", 5)) {
+			parse_sep_set(arg_val, &override_seps);
+		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
+
+		} else if (!strcmp(arg, "-k")) {
+			enable_prompt = GF_TRUE;
+		} else if (!strcmp(arg, "-r")) {
+			enable_reports = 2;
+			if (arg_val && !strlen(arg_val)) {
+				enable_reports = 1;
+			} else {
+				report_filter = arg_val;
+			}
+		} else if (!strcmp(arg, "-unit-tests")) {
+			do_unit_tests = GF_TRUE;
+		} 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) ) {
+				if (!has_xopt) {
+					gpac_suggest_arg(arg);
+					gpac_exit(1);
+				} else {
+					gf_sys_mark_arg_used(i, GF_FALSE);
+				}
+			}
+		}
+
+		if (arg_val) {
+			arg_val--;
+			arg_val[0]='=';
+		}
+	}
+
+	if (do_unit_tests) {
+		gpac_exit( gpac_unit_tests(mem_track) );
+	}
+
+	if (alias_set) {
+		gpac_exit(0);
+	}
+
+	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));
+	}
+	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");
+
+
+restart:
+
+	session = gf_fs_new_defaults(sflags);
+
+	if (!session) {
+		gpac_exit(1);
+	}
+	if (override_seps) gf_fs_set_separators(session, separator_set);
+	if (load_test_filters) gf_fs_register_test_filters(session);
+
+	if (gf_fs_get_max_resolution_chain_length(session) <= 1 ) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\nDynamic resolution of filter connections disabled\n\n"));
+	}
+
+	if (list_filters || print_filter_info) {
+		if (print_filters(argc, argv, session, argmode)==GF_FALSE)
+			e = GF_FILTER_NOT_FOUND;
+		goto exit;
+	}
+	if (view_filter_conn) {
+		gf_fs_print_all_connections(session, view_conn_for_filter, gf_sys_format_help);
+		goto exit;
+	}
+	if (dump_codecs) {
+		dump_all_codec(session);
+		goto exit;
+	}
+	if (write_profile || write_extensions || write_core_opts) {
+		if (write_core_opts)
+			write_core_options();
+		if (write_extensions)
+			write_file_extensions();
+		if (write_profile)
+			write_filters_options(session);
+		goto exit;
+	}
+
+	gf_sys_profiler_set_callback(NULL, gpac_rmt_user_callback);
+
+	//all good to go, load filters
+	has_xopt = GF_FALSE;
+	loaded_filters = gf_list_new();
+	for (i=1; i<argc; i++) {
+		GF_Filter *filter=NULL;
+		Bool is_simple=GF_FALSE;
+		Bool f_loaded = GF_FALSE;
+		char *arg = argv[i];
+
+		if (!strcmp(arg, "-src") || !strcmp(arg, "-i") || !strcmp(arg, "-ib") ) {
+			if (!strcmp(arg, "-ib")) {
+				const char *fargs=NULL;
+				const char *fio_url = make_fileio(argv[i+1], &fargs, GF_TRUE, &e);
+				if (fio_url)
+					filter = gf_fs_load_source(session, fio_url, fargs, NULL, &e);
+			} else {
+				filter = gf_fs_load_source(session, argv[i+1], NULL, NULL, &e);
+			}
+			arg = argv[i+1];
+			i++;
+			f_loaded = GF_TRUE;
+		} else if (!strcmp(arg, "-dst") || !strcmp(arg, "-o")  || !strcmp(arg, "-ob") ) {
+			if (!strcmp(arg, "-ob")) {
+				const char *fargs=NULL;
+				const char *fio_url = make_fileio(argv[i+1], &fargs, GF_FALSE, &e);
+				if (fio_url)
+					filter = gf_fs_load_destination(session, fio_url, fargs, NULL, &e);
+			} else {
+				filter = gf_fs_load_destination(session, argv[i+1], NULL, NULL, &e);
+			}
+			arg = argv[i+1];
+			i++;
+			f_loaded = GF_TRUE;
+		}
+		//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 (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];
+				continue;
+			}
+
+			if (!strncmp(arg, "src=", 4) ) {
+				filter = gf_fs_load_source(session, arg+4, NULL, NULL, &e);
+			} else if (!strncmp(arg, "dst=", 4) ) {
+				filter = gf_fs_load_destination(session, arg+4, NULL, NULL, &e);
+			} else {
+				e = GF_EOS;
+				char *need_gfio = strstr(arg, "@gfi://");
+				if (!need_gfio) need_gfio = strstr(arg, "@gfo://");
+				if (need_gfio) {
+					const char *fargs=NULL;
+					const char *fio_url;
+					char *updated_args;
+					u32 len = (u32) (need_gfio - arg);
+					updated_args = gf_malloc(sizeof(char)*(len+1));
+					strncpy(updated_args, arg, len);
+					updated_args[len]=0;
+
+					fio_url = make_fileio(need_gfio+7, &fargs, need_gfio[3]=='i' ? GF_TRUE : GF_FALSE, &e);
+					if (fio_url) {
+						gf_dynstrcat(&updated_args, fio_url, NULL);
+						if (fargs)
+							gf_dynstrcat(&updated_args, fargs, NULL);
+
+						filter = gf_fs_load_filter(session, updated_args, &e);
+					}
+					gf_free(updated_args);
+				} else {
+					filter = gf_fs_load_filter(session, arg, &e);
+				}
+				is_simple=GF_TRUE;
+				if (!filter && has_xopt)
+					continue;
+			}
+		}
+
+		if (!filter) {
+			if (!e) e = GF_FILTER_NOT_FOUND;
+
+			if (e!=GF_FILTER_NOT_FOUND) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Failed to load filter%s \"%s\": %s\n", is_simple ? "" : " for",  arg, gf_error_to_string(e) ));
+			} else {
+				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;
+			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 (!link_from) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Wrong filter index @%d\n", link_prev_filter));
+				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);
+	}
+	if (!gf_list_count(loaded_filters)) {
+		if (nothing_to_do && !gen_doc) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Nothing to do, check usage \"gpac -h\"\ngpac - GPAC command line filter engine - version %s\n%s\n", gf_gpac_version(), gf_gpac_copyright()));
+			e = GF_BAD_PARAM;
+		} else {
+			e = GF_EOS;
+		}
+		goto exit;
+	}
+	if (enable_reports) {
+		if (enable_reports==2)
+			gf_fs_set_ui_callback(session, gpac_event_proc, session);
+
+		gf_fs_enable_reporting(session, GF_TRUE);
+	}
+
+	if (enable_prompt || (runfor>0)) {
+		if (enable_prompt) {
+			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");
+	}
+	if (!enable_prompt) {
+#ifdef WIN32
+		SetConsoleCtrlHandler((PHANDLER_ROUTINE)gpac_sig_handler, TRUE);
+#else
+		signal(SIGINT, gpac_sig_handler);
+#endif
+	}
+
+	if (enable_reports) {
+		gpac_print_report(session, GF_TRUE, GF_FALSE);
+	}
+
+	e = gf_fs_run(session);
+	if (e>0) e = GF_OK;
+
+	if (e) {
+		fprintf(stderr, "session error %s\n", gf_error_to_string(e) );
+	} else {
+		e = gf_fs_get_last_connect_error(session);
+		if (e<0) fprintf(stderr, "session last connect error %s\n", gf_error_to_string(e) );
+
+		if (!e) {
+			e = gf_fs_get_last_process_error(session);
+			if (e<0) fprintf(stderr, "session last process error %s\n", gf_error_to_string(e) );
+		}
+		gpac_check_session_args();
+	}
+
+	if (enable_reports) {
+		if (enable_reports==2) {
+			gf_sys_set_console_code(stderr, GF_CONSOLE_RESTORE);
+		}
+		gpac_print_report(session, GF_FALSE, GF_TRUE);
+	}
+
+exit:
+	if (enable_reports==2) {
+		gf_log_set_callback(session, NULL);
+	}
+
+	if (e && nb_filters) {
+		gf_fs_run(session);
+	}
+	if (dump_stats)
+		gf_fs_print_stats(session);
+	if (dump_graph)
+		gf_fs_print_connections(session);
+
+
+	tmp_sess = session;
+	session = NULL;
+	gf_fs_del(tmp_sess);
+	if (loaded_filters) gf_list_del(loaded_filters);
+
+	cleanup_file_io();
+
+	if (!e && nb_loops) {
+		if (nb_loops>0) nb_loops--;
+		loops_done++;
+		fprintf(stderr, "session done, restarting (loop %d)\n", loops_done);
+		gf_log_reset_file();
+		goto restart;
+	}
+
+	gpac_exit(e<0 ? 1 : 0);
+}
+
+GF_MAIN_FUNC(gpac_main)
+
+
+/*********************************************************
+		Filter and property info/dump functions
+*********************************************************/
+
+static void dump_caps(u32 nb_caps, const GF_FilterCapability *caps)
+{
+	u32 i;
+	for (i=0;i<nb_caps; i++) {
+		const char *szName;
+		const char *szVal;
+		char szDump[GF_PROP_DUMP_ARG_SIZE];
+		const GF_FilterCapability *cap = &caps[i];
+		if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE) && i+1==nb_caps) break;
+		if (!i) gf_sys_format_help(helpout, help_flags, "Capabilities Bundle:\n");
+		else if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+			gf_sys_format_help(helpout, help_flags, "Capabilities Bundle:\n");
+			continue;
+		}
+
+		szName = cap->name ? cap->name : gf_props_4cc_get_name(cap->code);
+		if (!szName) szName = gf_4cc_to_str(cap->code);
+		gf_sys_format_help(helpout, help_flags, "\t Flags:");
+		if (cap->flags & GF_CAPFLAG_INPUT) gf_sys_format_help(helpout, help_flags, " Input");
+		if (cap->flags & GF_CAPFLAG_OUTPUT) gf_sys_format_help(helpout, help_flags, " Output");
+		if (cap->flags & GF_CAPFLAG_EXCLUDED) gf_sys_format_help(helpout, help_flags, " Exclude");
+		if (cap->flags & GF_CAPFLAG_LOADED_FILTER) gf_sys_format_help(helpout, help_flags, " LoadedFilterOnly");
+
+		//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);
+
+		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);
+		gf_sys_format_help(helpout, help_flags, "\n");
+	}
+}
+
+static void print_filter_arg(const GF_FilterArgs *a, u32 gen_doc)
+{
+	Bool is_enum = GF_FALSE;
+
+	if ((a->arg_type==GF_PROP_UINT) && a->min_max_enum && strchr(a->min_max_enum, '|')) {
+		is_enum = GF_TRUE;
+	}
+
+	if (gen_doc==1) {
+		gf_sys_format_help(helpout, help_flags, "<a id=\"%s\">", a->arg_name);
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s", a->arg_name);
+		gf_sys_format_help(helpout, help_flags, "</a> (%s", is_enum ? "enum" : gf_props_get_type_name(a->arg_type));
+	} else {
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s (%s", a->arg_name, is_enum ? "enum" : gf_props_get_type_name(a->arg_type));
+	}
+	if (a->arg_default_val) {
+		if (!strcmp(a->arg_default_val, "2147483647"))
+			gf_sys_format_help(helpout, help_flags, ", default: __+I__");
+		else if (!strcmp(a->arg_default_val, "-2147483648"))
+			gf_sys_format_help(helpout, help_flags, ", default: __-I__");
+		else
+			gf_sys_format_help(helpout, help_flags, ", default: __%s__", a->arg_default_val);
+	} else {
+//		gf_sys_format_help(helpout, help_flags, ", no default");
+	}
+	if (a->min_max_enum && !is_enum) {
+		if (!strcmp(a->min_max_enum, "-2147483648-I"))
+			gf_sys_format_help(helpout, help_flags, ", %s: -I-I", /*strchr(a->min_max_enum, '|') ? "Enum" : */"minmax");
+		else
+			gf_sys_format_help(helpout, help_flags, ", %s: %s", /*strchr(a->min_max_enum, '|') ? "Enum" : */"minmax", a->min_max_enum);
+	}
+	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 (a->min_max_enum && strchr(a->min_max_enum, '|'))
+		gf_sys_format_help(helpout, help_flags, "\n");
+}
+
+static void print_filter_single_opt(const GF_FilterRegister *reg, char *optname, GF_Filter *filter_inst)
+{
+	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 (!args) return;
+
+	while (1) {
+		const GF_FilterArgs *a = & args[idx];
+		if (!a || !a->arg_name) break;
+		idx++;
+		if (strcmp(a->arg_name, optname)) continue;
+
+		print_filter_arg(a, 0);
+		found = GF_TRUE;
+		break;
+	}
+	if (found) return;
+
+	idx = 0;
+	while (1) {
+		const GF_FilterArgs *a = & args[idx];
+		if (!a || !a->arg_name) break;
+		idx++;
+		if (gf_sys_word_match(optname, a->arg_name)
+			|| (a->arg_desc && strstr(a->arg_desc, optname))
+		) {
+			if (!found) {
+				found = GF_TRUE;
+				fprintf(stderr, "No such option %s for filter %s - did you mean:\n", optname, filter_inst ? gf_filter_get_name(filter_inst) : reg->name);
+			}
+			fprintf(stderr, " - %s: %s\n", a->arg_name, a->arg_desc);
+		}
+	}
+	if (found) return;
+
+	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)
+{
+	const GF_FilterArgs *args = NULL;
+
+	if (gen_doc==1) {
+		char szName[1024];
+		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, "%s", auto_gen_md_warning);
+
+			if (!sidebar_md) {
+				char *sbbuf = NULL;
+				if (gf_file_exists("_Sidebar.md")) {
+					char szLine[1024];
+					u32 end_pos=0;
+					sidebar_md = gf_fopen("_Sidebar.md", "r");
+					gf_fseek(sidebar_md, 0, SEEK_SET);
+					while (!feof(sidebar_md)) {
+						char *read = gf_fgets(szLine, 1024, sidebar_md);
+						if (!read) break;
+						if (!strncmp(szLine, "**Filters Help**", 16)) {
+							end_pos = (u32) gf_ftell(sidebar_md);
+							break;
+						}
+					}
+					if (!end_pos) end_pos = (u32) gf_ftell(sidebar_md);
+					if (end_pos) {
+						sbbuf = gf_malloc(end_pos+1);
+						gf_fseek(sidebar_md, 0, SEEK_SET);
+						end_pos = (u32) gf_fread(sbbuf, end_pos, sidebar_md);
+						sbbuf[end_pos]=0;
+						gf_fclose(sidebar_md);
+					}
+				}
+				sidebar_md = gf_fopen("_Sidebar.md", "w");
+				if (sbbuf) {
+					fprintf(sidebar_md, "%s\n  \n", sbbuf);
+					gf_free(sbbuf);
+				}
+			}
+#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);
+				exit(1);
+			}
+#endif
+		}
+
+#ifndef GPAC_DISABLE_DOC
+		gf_sys_format_help(helpout, help_flags, "# %s\n", reg->description);
+#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");
+		} 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 (filter_inst)
+			gf_sys_format_help(helpout, help_flags, "Version: %s\n", gf_filter_get_version(filter_inst) );
+		else {
+			if (reg->version) {
+				if (!strncmp(reg->version, "! ", 2)) {
+					if (!gen_doc)
+						gf_sys_format_help(helpout, help_flags, "%s\n", reg->version+2);
+				} else {
+					gf_sys_format_help(helpout, help_flags, "Version: %s\n", reg->version);
+				}
+			}
+		}
+	}
+
+	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 {
+#ifndef GPAC_DISABLE_DOC
+		if (reg->author) 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;
+			gf_sys_format_help(helpout, hf, "\n%s\n\n", reg->help);
+		}
+#else
+		gf_sys_format_help(helpout, help_flags, "GPAC compiled without built-in doc\n");
+#endif
+	}
+
+	if (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);
+
+		gf_sys_format_help(helpout, help_flags, "Flags:");
+		if (reg->flags & GF_FS_REG_EXPLICIT_ONLY) gf_sys_format_help(helpout, help_flags, " ExplicitOnly");
+		if (reg->flags & GF_FS_REG_MAIN_THREAD) gf_sys_format_help(helpout, help_flags, " MainThread");
+		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->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");
+
+		gf_sys_format_help(helpout, help_flags, "\nPriority %d", reg->priority);
+
+		gf_sys_format_help(helpout, help_flags, "\n");
+	}
+
+	if (filter_inst) args = gf_filter_get_args(filter_inst);
+	else args = reg->args;
+
+	if (args) {
+		u32 idx=0;
+		if (gen_doc==1) {
+			gf_sys_format_help(helpout, help_flags, "# Options  \n");
+		} else {
+			switch (argmode) {
+			case GF_ARGMODE_ALL:
+			case GF_ARGMODE_EXPERT:
+				gf_sys_format_help(helpout, help_flags, "# Options (expert):\n");
+				break;
+			case GF_ARGMODE_ADVANCED:
+				gf_sys_format_help(helpout, help_flags, "# Options (advanced):\n");
+				break;
+			case GF_ARGMODE_BASE:
+				gf_sys_format_help(helpout, help_flags, "# Options (basic):\n");
+				break;
+			}
+		}
+
+		while (1) {
+			const GF_FilterArgs *a = & args[idx];
+			if (!a || !a->arg_name) break;
+			idx++;
+
+			if (a->flags & GF_FS_ARG_HINT_HIDE) continue;
+
+			switch (argmode) {
+			case GF_ARGMODE_ALL:
+			case GF_ARGMODE_EXPERT:
+			 	break;
+			case GF_ARGMODE_ADVANCED:
+			 	if (a->flags & GF_FS_ARG_HINT_EXPERT) continue;
+			 	break;
+			case GF_ARGMODE_BASE:
+			 	if (a->flags & (GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_HINT_ADVANCED)) continue;
+			 	break;
+			}
+
+			print_filter_arg(a, gen_doc);
+
+			if (!gen_doc) continue;
+
+#ifdef CHECK_DOC
+			if (a->flags & GF_FS_ARG_META) continue;
+
+			u8 achar;
+			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);
+				exit(1);
+			}
+			while (1) {
+				const GF_FilterArgs *anarg = & args[j];
+				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);
+					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);
+                    	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);
+                    	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);
+					exit(1);
+				}
+			}
+            if (!(a->flags&GF_FS_ARG_META)) {
+				char *sep;
+
+				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);
+					exit(1);
+				}
+
+				achar = a->arg_desc[0];
+				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);
+						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);
+					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);
+					exit(1);
+				}
+			}
+#endif
+		}
+	} else {
+		gf_sys_format_help(helpout, help_flags, "No options\n");
+	}
+
+	if (reg->nb_caps) {
+		if (!gen_doc && (argmode==GF_ARGMODE_ALL)) {
+			dump_caps(reg->nb_caps, reg->caps);
+		}
+	}
+	gf_sys_format_help(helpout, help_flags, "\n");
+}
+
+static Bool print_filters(int argc, char **argv, GF_FilterSession *session, GF_SysArgMode argmode)
+{
+	Bool found = GF_FALSE;
+	char *fname = NULL;
+	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 (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;
+					}
+				}
+				fname = arg;
+
+				if (!strcmp(arg, reg->name) ) {
+					if (optname)
+						print_filter_single_opt(reg, optname, NULL);
+					else
+						print_filter(reg, argmode, NULL);
+					found = GF_TRUE;
+				} 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
+					) {
+						if (optname)
+							print_filter_single_opt(reg, optname, NULL);
+						else
+							print_filter(reg, argmode, NULL);
+						found = GF_TRUE;
+						break;
+					}
+					//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 (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 (found) return GF_TRUE;
+	if (!fname) return GF_FALSE;
+	if (!print_filter_info) return GF_FALSE;
+	if (gen_doc) return GF_FALSE;
+
+	for (i=0; i<count; i++) {
+		u32 j=0;
+		const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+
+		while (reg->args) {
+			const GF_FilterArgs *arg = &reg->args[j];
+			if (!arg || !arg->arg_name) break;
+			j++;
+			if (strcmp(arg->arg_name, fname)) continue;
+			if (!found) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("No such filter \"%s\" but found filters with matching options:\n", fname));
+				found = GF_TRUE;
+			}
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s.%s: %s\n", reg->name, arg->arg_name, arg->arg_desc);
+		}
+	}
+
+	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)
+{
+	u32 i=0;
+	const GF_BuiltInProperty *prop_info;
+
+	if (gen_doc==1) {
+		gf_sys_format_help(helpout, help_flags, "## Built-in property types\n"
+		"  \n");
+
+		gf_sys_format_help(helpout, help_flags, "Name | Description  \n");
+		gf_sys_format_help(helpout, help_flags, "--- | ---  \n");
+		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;
+			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"
+		"- 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 {
+		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++) {
+			if (i==GF_PROP_STRING_NO_COPY) continue;
+			if (i==GF_PROP_DATA_NO_COPY) 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));
+			} else {
+				gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s : %s\n", gf_props_get_type_name(i), gf_props_get_type_desc(i) );
+			}
+		}
+		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");
+	}
+	i=0;
+	while ((prop_info = gf_props_get_description(i))) {
+		i++;
+		char szFlags[10];
+		if (! prop_info->name) continue;
+
+		if (gen_doc==1) {
+			strcpy(szFlags, "");
+			if (prop_info->flags & GF_PROP_FLAG_GSF_REM) strcat(szFlags, "D");
+			if (prop_info->flags & GF_PROP_FLAG_PCK) strcat(szFlags, "P");
+
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s | %s | %s | %s  \n", prop_info->name,  gf_props_get_type_name(prop_info->data_type),
+				szFlags,
+			 	prop_info->description,
+			 	gf_4cc_to_str(prop_info->type)
+			);
+		} else if (gen_doc==2) {
+			gf_sys_format_help(helpout, help_flags, ".TP\n.B %s (%s,%s,%s%s)\n%s\n", prop_info->name, gf_4cc_to_str(prop_info->type), gf_props_get_type_name(prop_info->data_type),
+			 	(prop_info->flags & GF_PROP_FLAG_GSF_REM) ? "D" : " ",
+			 	(prop_info->flags & GF_PROP_FLAG_PCK) ? "P" : " ",
+				prop_info->description);
+		} else {
+			u32 len;
+			const char *ptype;
+			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");
+
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s", prop_info->name);
+			len = (u32) strlen(prop_info->name);
+			while (len<16) {
+				gf_sys_format_help(helpout, help_flags, " ");
+				len++;
+			}
+			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) {
+				gf_sys_format_help(helpout, help_flags, " ");
+				len++;
+			}
+
+			gf_sys_format_help(helpout, help_flags, "%s", prop_info->description);
+
+			if (prop_info->data_type==GF_PROP_PIXFMT) {
+				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() );
+			}
+			gf_sys_format_help(helpout, help_flags, "\n");
+		}
+	}
+	if (gen_doc==1) {
+		u32 idx=0;
+		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);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Audio formats\n");
+		gf_sys_format_help(helpout, help_flags, " Name | File extensions | Description  \n");
+		gf_sys_format_help(helpout, help_flags, " --- | --- | ---  \n");
+		while ( gf_audio_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);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Stream types\n");
+		gf_sys_format_help(helpout, help_flags, " Name | Description  \n");
+		gf_sys_format_help(helpout, help_flags, " --- | ---  \n");
+		while ( gf_stream_types_enum(&idx, &name, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, "%s | %s  \n", name, desc);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Codecs\n");
+		gf_sys_format_help(helpout, help_flags, "The codec name identifies a codec within GPAC. There can be several names for a given codec. The first name is used as a default file extension when dumping a raw media stream.\n"
+			"  \n");
+
+		gf_sys_format_help(helpout, help_flags, " Name | Description  \n");
+		gf_sys_format_help(helpout, help_flags, " --- | ---  \n");
+		while ( gf_codecid_enum(idx, &name, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR | GF_PRINTARG_ESCAPE_PIPE, "%s | %s  \n", name, desc);
+			idx++;
+		}
+
+	} else if (gen_doc==2) {
+		u32 idx=0;
+		const char *name, *fileext, *desc;
+		gf_sys_format_help(helpout, help_flags, "# Pixel formats\n");
+		while ( gf_pixel_fmt_enum(&idx, &name, &fileext, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s (ext *.%s)\n%s\n", name, fileext, desc);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Audio formats\n");
+		while ( gf_audio_fmt_enum(&idx, &name, &fileext, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s (ext *.%s)\n%s\n", name, fileext, desc);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Stream types\n");
+		while ( gf_stream_types_enum(&idx, &name, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s\n%s\n", name, desc);
+		}
+
+		idx=0;
+		gf_sys_format_help(helpout, help_flags, "# Codecs\n");
+		while ( gf_codecid_enum(idx, &name, &desc)) {
+			gf_sys_format_help(helpout, help_flags | GF_PRINTARG_NL_TO_BR, ".TP\n.B %s\n%s\n", name, desc);
+			idx++;
+		}
+	}}
+
+static void dump_all_codec(GF_FilterSession *session)
+{
+	GF_PropertyValue rawp, filep, stp;
+	GF_PropertyValue cp, acp;
+	char szFlags[10], szCap[2];
+	u32 cidx=0;
+	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, "  - 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");
+
+	rawp.type = cp.type = GF_PROP_UINT;
+	rawp.value.uint = GF_CODECID_RAW;
+	filep.type = cp.type = GF_PROP_UINT;
+	filep.value.uint = GF_STREAM_FILE;
+	stp.type = GF_PROP_UINT;
+	cp.type = GF_PROP_UINT;
+	acp.type = GF_PROP_UINT;
+	szCap[1] = 0;
+
+	while (1) {
+		u32 i;
+		const char *lname;
+		const char *sname;
+		const char *mime;
+		u32 rfc4cc;
+		Bool enc_found = GF_FALSE;
+		Bool dec_found = GF_FALSE;
+		Bool dmx_found = GF_FALSE;
+		Bool mx_found = GF_FALSE;
+		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 (!sname) break;
+
+		stp.value.uint = gf_codecid_type(cp.value.uint);
+		acp.value.uint = gf_codecid_alt(cp.value.uint);
+
+		for (i=0; i<count; i++) {
+			const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+			if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_STREAM_TYPE, &stp, GF_PROP_PID_STREAM_TYPE, &stp, GF_TRUE)) {
+				if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_CODECID, &rawp, GF_PROP_PID_CODECID, &cp, GF_TRUE)) {
+					enc_found = GF_TRUE;
+				} else if (acp.value.uint && gf_fs_check_filter_register_cap(reg, GF_PROP_PID_CODECID, &rawp, GF_PROP_PID_CODECID, &acp, GF_TRUE)) {
+						enc_found = GF_TRUE;
+				}
+				if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_CODECID, &cp, GF_PROP_PID_CODECID, &rawp, GF_TRUE)) {
+					dec_found = GF_TRUE;
+				} else if (acp.value.uint && gf_fs_check_filter_register_cap(reg, GF_PROP_PID_CODECID, &acp, GF_PROP_PID_CODECID, &rawp, GF_TRUE)) {
+					dec_found = GF_TRUE;
+				}
+			}
+
+			if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_STREAM_TYPE, &filep, GF_PROP_PID_STREAM_TYPE, &stp, GF_TRUE)) {
+				if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_STREAM_TYPE, &filep, GF_PROP_PID_CODECID, &cp, GF_TRUE))
+					dmx_found = GF_TRUE;
+			}
+			if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_STREAM_TYPE, &stp, GF_PROP_PID_STREAM_TYPE, &filep, GF_TRUE)) {
+				if ( gf_fs_check_filter_register_cap(reg, GF_PROP_PID_CODECID, &cp, GF_PROP_PID_STREAM_TYPE, &filep, GF_TRUE))
+					mx_found = GF_TRUE;
+			}
+		}
+
+		szFlags[0] = 0;
+		if (enc_found || dec_found || dmx_found || mx_found) {
+			strcpy(szFlags, " [");
+			if (dmx_found) { szCap[0] = 'I'; strcat(szFlags, szCap); }
+			if (mx_found) { szCap[0] = 'O'; strcat(szFlags, szCap); }
+			if (dec_found) { szCap[0] = 'D'; strcat(szFlags, szCap); }
+			if (enc_found) { szCap[0] = 'E'; strcat(szFlags, szCap); }
+			strcat(szFlags, "]");
+		}
+
+		mime = gf_codecid_mime(cp.value.uint);
+		rfc4cc = gf_codecid_4cc_type(cp.value.uint);
+		gf_sys_format_help(helpout, help_flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s%s: ", sname, szFlags);
+		gf_sys_format_help(helpout, help_flags, "%s", lname);
+		if (rfc4cc || mime) {
+			gf_sys_format_help(helpout, help_flags, " (");
+			if (rfc4cc) gf_sys_format_help(helpout, help_flags, "%s", gf_4cc_to_str(rfc4cc) );
+			if (rfc4cc&&mime) gf_sys_format_help(helpout, help_flags, ", ");
+			if (mime) gf_sys_format_help(helpout, help_flags, "%s", mime);
+			gf_sys_format_help(helpout, help_flags, ")");
+		}
+		gf_sys_format_help(helpout, help_flags, "\n");
+	}
+	gf_sys_format_help(helpout, help_flags, "\n");
+}
+
+/*********************************************************
+			Config file writing functions
+*********************************************************/
+
+static void write_core_options()
+{
+	//print libgpac core help
+	const GF_GPACArg *args = gf_sys_get_options();
+	u32 i = 0;
+
+	while (args[i].name) {
+		if (! gf_opts_get_key("core", args[i].name) && args[i].val) {
+			gf_opts_set_key("core", args[i].name, args[i].val);
+		}
+		i++;
+	}
+}
+
+static void write_file_extensions()
+{
+	u32 i = 0;
+
+	while (1) {
+		const char *short_name, *long_name, *mime ;
+		u32 cid = gf_codecid_enum(i, &short_name, &long_name);
+		if (cid==GF_CODECID_NONE) break;
+		mime = gf_codecid_mime(cid);
+		if (mime && ! gf_opts_get_key("file_extensions", mime) ) {
+			gf_opts_set_key("file_extensions", mime, short_name);
+		}
+		i++;
+	}
+}
+
+static void write_filters_options(GF_FilterSession *fsess)
+{
+	u32 i, count;
+	count = gf_fs_filters_registers_count(fsess);
+	for (i=0; i<count; i++) {
+		char *meta_sep;
+		u32 j=0;
+		char szSecName[200];
+
+		const GF_FilterRegister *freg = gf_fs_get_filter_register(fsess, i);
+		sprintf(szSecName, "filter@%s", freg->name);
+		meta_sep = strchr(szSecName + 7, ':');
+		if (meta_sep) meta_sep[0] = 0;
+
+		while (freg->args) {
+			const GF_FilterArgs *arg = &freg->args[j];
+			if (!arg || !arg->arg_name) break;
+			j++;
+
+			if (arg->arg_default_val && !gf_opts_get_key(szSecName, arg->arg_name)) {
+				gf_opts_set_key(szSecName, arg->arg_name, arg->arg_default_val);
+			}
+		}
+	}
+}
+
+/*********************************************************
+		Language file creation / update functions
+*********************************************************/
+
+static Bool lang_updated = GF_FALSE;
+static void gpac_lang_set_key(GF_Config *cfg, const char *sec_name,  const char *key_name, const char *key_val)
+{
+	char szKeyCRC[1024];
+	const char *opt = gf_cfg_get_key(cfg, sec_name, key_name);
+	u32 crc_key = 0;
+	if (opt) {
+		sprintf(szKeyCRC, "%s_crc", key_name);
+		const char *crc_opt = gf_cfg_get_key(cfg, sec_name, szKeyCRC);
+		if (crc_opt) {
+			u32 old_crc = atoi(crc_opt);
+			crc_key = gf_crc_32((u8*)key_val, (u32) strlen(key_val));
+			if (old_crc != crc_key) {
+				gf_sys_format_help(helpout, help_flags, "Warning: description has changed for %s:%s (crc %d - crc in file %d) - please check translation\n", sec_name, key_name, crc_key, old_crc);
+			}
+			return;
+		}
+	}
+	if (!opt) {
+		char szKeyCRCVal[100];
+		if (!crc_key) {
+			sprintf(szKeyCRC, "%s_crc", key_name);
+			crc_key = gf_crc_32((u8*)key_val, (u32) strlen(key_val));
+		}
+		sprintf(szKeyCRCVal, "%u", crc_key);
+		gf_cfg_set_key(cfg, sec_name, key_name, key_val);
+		gf_cfg_set_key(cfg, sec_name, szKeyCRC, szKeyCRCVal);
+		lang_updated = GF_TRUE;
+	}
+}
+static int gpac_make_lang(char *filename)
+{
+	GF_Config *cfg;
+	u32 i;
+	gf_sys_init(GF_MemTrackerNone, NULL);
+
+	session = gf_fs_new_defaults(0);
+	if (!session) {
+		gf_sys_format_help(helpout, help_flags, "failed to load session, cannot create language file\n");
+		return 1;
+	}
+	if (!gf_file_exists(filename)) {
+		FILE *f = gf_fopen(filename, "wt");
+		if (!f) {
+			gf_sys_format_help(helpout, help_flags, "failed to open %s in write mode\n", filename);
+			gf_fs_del(session);
+			return 1;
+		}
+		gf_fclose(f);
+	}
+
+	cfg = gf_cfg_new(NULL, filename);
+
+	//print gpac help
+	i = 0;
+	while (gpac_args[i].name) {
+		gpac_lang_set_key(cfg, "gpac", gpac_args[i].name, gpac_args[i].description);
+		i++;
+	}
+
+	//print gpac doc
+	gpac_lang_set_key(cfg, "gpac", "doc", gpac_doc);
+
+	//print gpac alias doc
+	gpac_lang_set_key(cfg, "gpac", "alias", gpac_alias);
+
+	//print libgpac core help
+	const GF_GPACArg *args = gf_sys_get_options();
+	i = 0;
+
+	while (args[i].name) {
+		gpac_lang_set_key(cfg, "core", args[i].name, args[i].description);
+		i++;
+	}
+
+	//print properties
+	i=0;
+	const GF_BuiltInProperty *prop_info;
+	while ((prop_info = gf_props_get_description(i))) {
+		i++;
+		if (! prop_info->name || !prop_info->description) continue;
+		gpac_lang_set_key(cfg, "properties", prop_info->name, prop_info->description);
+	}
+
+	//print filters
+	u32 count = gf_fs_filters_registers_count(session);
+	for (i=0; i<count; i++) {
+		u32 j=0;
+		const GF_FilterRegister *reg = gf_fs_get_filter_register(session, i);
+
+		if (reg->description) {
+			gpac_lang_set_key(cfg, reg->name, "desc", reg->description);
+		}
+		if (reg->help) {
+			gpac_lang_set_key(cfg, reg->name, "help", reg->help);
+		}
+		while (reg->args && reg->args[j].arg_name) {
+			gpac_lang_set_key(cfg, reg->name, reg->args[j].arg_name, reg->args[j].arg_desc);
+			j++;
+		}
+	}
+
+	if (!lang_updated) {
+		gf_cfg_discard_changes(cfg);
+		fprintf(stderr, "lang file %s has not been modified\n", filename);
+	} else {
+		fprintf(stderr, "lang file generated in %s\n", filename);
+	}
+	gf_cfg_del(cfg);
+
+	gf_fs_del(session);
+	gf_sys_close();
+	return 0;
+}
+
+
+/*********************************************************
+			Alias functions
+*********************************************************/
+
+static GFINLINE void push_arg(char *_arg, Bool _dup)
+{
+	alias_argv = gf_realloc(alias_argv, sizeof(char**) * (alias_argc+1));\
+	alias_argv[alias_argc] = _dup ? gf_strdup(_arg) : _arg; \
+	if (_dup) {
+		if (!args_alloc) args_alloc = gf_list_new();
+		gf_list_add(args_alloc, alias_argv[alias_argc]);
+	}
+	alias_argc++;
+}
+
+static Bool gpac_expand_alias_arg(char *param, char *prefix, char *suffix, int arg_idx, int argc, char **argv);
+
+static Bool check_param_extension(char *szArg, int arg_idx, int argc, char **argv)
+{
+	char *par_start = strstr(szArg, "@{");
+	if (par_start) {
+		char szPar[100];
+		Bool ok;
+		char *par_end = strchr(par_start, '}');
+		if (!par_end) {
+			fprintf(stderr, "Bad format %s for alias parameter, expecting @{N}\n", szArg);
+			return GF_FALSE;
+		}
+		par_end[0] = 0;
+		strcpy(szPar, par_start+2);
+		par_start[0] = 0;
+
+	 	ok = gpac_expand_alias_arg(szPar, szArg, par_end+1, arg_idx, argc, argv);
+	 	if (!ok) return GF_FALSE;
+		par_start[0] = '@';
+		par_end[0] = '}';
+		return GF_TRUE;
+	}
+	//done, push arg
+	push_arg(szArg, 1);
+	return GF_TRUE;
+}
+
+static Bool gpac_expand_alias_arg(char *param, char *prefix, char *suffix, int arg_idx, int argc, char **argv)
+{
+	char szArg[1024];
+	char szSepList[2];
+	char *oparam = param;
+	szSepList[0] = separator_set[SEP_LIST];
+	szSepList[1] = 0;
+
+	Bool is_list = param[0]=='-';
+	Bool is_expand = param[0]=='+';
+
+	if (is_list || is_expand) param++;
+	strcpy(szArg, prefix);
+	while (param) {
+		u32 idx=0;
+		u32 last_idx=0;
+		char *sep = strchr(param, ',');
+		if (sep) sep[0]=0;
+
+		if ((param[0]=='n') || (param[0]=='N')) {
+			idx = argc - arg_idx - 1;
+			if (param[1]=='-') {
+				u32 diff = atoi(param+2);
+				if (diff>=idx) {
+					if (sep) sep[0]=',';
+					fprintf(stderr, "Bad usage for alias parameter %s: not enough parameters\n", oparam);
+					return GF_FALSE;
+				}
+				idx -= diff;
+			}
+		} else {
+			char *lsep = strchr(param, ':');
+			if (lsep) {
+				lsep[0] = 0;
+				if (strlen(param))
+					idx = atoi(param);
+				else
+					idx=1;
+
+				lsep[0] = ':';
+				if ((lsep[1]=='n') || (lsep[1]=='N')) {
+
+					last_idx = argc - arg_idx - 1;
+					if (lsep[2]=='-') {
+						u32 diff = atoi(lsep+3);
+						if (diff>=last_idx) {
+							fprintf(stderr, "Bad usage for alias parameter %s: not enough parameters\n", oparam);
+							return GF_FALSE;
+						}
+						last_idx -= diff;
+					}
+				} else {
+					last_idx = atoi(lsep+1);
+				}
+			} else {
+				idx = atoi(param);
+			}
+		}
+		if (!idx) {
+			if (sep) sep[0]=',';
+			fprintf(stderr, "Bad format for alias parameter %s: cannot extract argument index\n", oparam);
+			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);
+			return GF_FALSE;
+		}
+
+		if (!last_idx) last_idx=idx;
+		for (; idx<=last_idx;idx++) {
+			char *an_arg = argv[idx+arg_idx];
+
+			if (!args_used) args_used = gf_list_new();
+			gf_list_add(args_used, an_arg);
+
+			if (is_expand) {
+				strcpy(szArg, prefix);
+				strcat(szArg, an_arg);
+				strcat(szArg, suffix);
+
+				Bool ok = check_param_extension(szArg, arg_idx, argc, argv);
+				if (!ok) {
+					if (sep) sep[0]=',';
+					return GF_FALSE;
+				}
+			} else {
+				strcat(szArg, an_arg);
+				if (is_list && (idx<last_idx)) {
+					strcat(szArg, szSepList);
+				}
+			}
+		}
+
+		if (!sep) break;
+		sep[0]=',';
+		param = sep+1;
+		if (is_list) {
+			strcat(szArg, szSepList);
+		}
+	}
+
+	if (is_expand)
+		return GF_TRUE;
+
+	strcat(szArg, suffix);
+
+	return check_param_extension(szArg, arg_idx, argc, argv);
+}
+
+static Bool gpac_expand_alias(int argc, char **argv)
+{
+	u32 i;
+
+	for (i=0; i< (u32) argc; i++) {
+		char *arg = argv[i];
+		char *alias = (char *) gf_opts_get_key("gpac.alias", arg);
+		if (alias == NULL) {
+			if (gf_list_find(args_used, arg)<0) {
+				push_arg(arg, 0);
+			}
+			continue;
+		}
+		char *sep;
+		while (alias) {
+			sep = strchr(alias, ' ');
+			if (sep) sep[0] = 0;
+			Bool ok = check_param_extension(alias, i, argc, argv);
+			if (sep) sep[0] = ' ';
+			if (!ok) return GF_FALSE;
+			if (!sep) break;
+			alias = sep+1;
+		}
+
+	}
+	return GF_TRUE;
+}
+
+#ifdef GPAC_ENABLE_COVERAGE
+#include <gpac/utf.h>
+#include <gpac/base_coding.h>
+#include <gpac/network.h>
+#include <gpac/iso639.h>
+#include <gpac/token.h>
+#include <gpac/xml.h>
+#include <gpac/thread.h>
+#include <gpac/avparse.h>
+#include <gpac/mpegts.h>
+#include <gpac/rtp_streamer.h>
+#include <gpac/internal/odf_dev.h>
+#endif
+static u32 gpac_unit_tests(GF_MemTrackerType mem_track)
+{
+#ifdef GPAC_ENABLE_COVERAGE
+	u32 ucs4_buf[4];
+	u8 utf8_buf[7];
+
+	void *mem = gf_calloc(4, sizeof(u32));
+	gf_free(mem);
+
+	if (mem_track == GF_MemTrackerNone) return 0;
+
+	gpac_fsess_task_help(); //for coverage
+	gf_dm_sess_last_error(NULL);
+	gf_log_use_color();
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[CoreUnitTests] performing tests\n"));
+
+	utf8_buf[0] = 'a';
+	utf8_buf[1] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 1, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for single char\n"));
+		return 1;
+	}
+	utf8_buf[0] = 0xc2;
+	utf8_buf[1] = 0xa3;
+	utf8_buf[2] = 'a';
+	utf8_buf[3] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 3, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for 2-byte + 1-byte char\n"));
+		return 1;
+	}
+	utf8_buf[0] = 0xe0;
+	utf8_buf[1] = 0xa4;
+	utf8_buf[2] = 0xb9;
+	utf8_buf[3] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 3, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for 3-byte char\n"));
+		return 1;
+	}
+	utf8_buf[0] = 0xf0;
+	utf8_buf[1] = 0x90;
+	utf8_buf[2] = 0x8d;
+	utf8_buf[3] = 0x88;
+	utf8_buf[4] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 4, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for 4-byte char\n"));
+		return 1;
+	}
+
+	utf8_buf[0] = 0xf8;
+	utf8_buf[1] = 0x80;
+	utf8_buf[2] = 0x80;
+	utf8_buf[3] = 0x80;
+	utf8_buf[4] = 0xaf;
+	utf8_buf[5] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 5, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for 5-byte char\n"));
+		return 1;
+	}
+	utf8_buf[0] = 0xfc;
+	utf8_buf[1] = 0x80;
+	utf8_buf[2] = 0x80;
+	utf8_buf[3] = 0x80;
+	utf8_buf[4] = 0x80;
+	utf8_buf[5] = 0xaf;
+	utf8_buf[6] = 0;
+	if (! utf8_to_ucs4 (ucs4_buf, 6, (unsigned char *) utf8_buf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] UCS-4 translation failed for 6-byte char\n"));
+		return 1;
+	}
+	//test error case
+	utf8_buf[0] = 0xf8;
+	utf8_to_ucs4 (ucs4_buf, 6, (unsigned char *) utf8_buf);
+
+	char buf[5], obuf[3];
+	obuf[0] = 1;
+	obuf[1] = 2;
+	u32 res = gf_base16_encode(obuf, 2, buf, 5);
+	if (res != 4) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] base16 encode fail\n"));
+		return 1;
+	}
+	u32 res2 = gf_base16_decode(buf, res, obuf, 3);
+	if (res2 != 2) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] base16 decode fail\n"));
+		return 1;
+	}
+
+	u8 *zbuf;
+	u32 osize;
+	GF_Err e;
+	u8 *ozbuf;
+
+#ifndef GPAC_DISABLE_ZLIB
+	zbuf = gf_strdup("123451234512345123451234512345");
+	osize=0;
+	e = gf_gz_compress_payload(&zbuf, 1 + (u32) strlen(zbuf), &osize);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] zlib compress fail\n"));
+		gf_free(zbuf);
+		return 1;
+	}
+	ozbuf=NULL;
+	res=0;
+	e = gf_gz_decompress_payload(zbuf, osize, &ozbuf, &res);
+	gf_free(zbuf);
+	if (ozbuf) gf_free(ozbuf);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] zlib decompress fail\n"));
+		return 1;
+	}
+#endif
+
+	zbuf = gf_strdup("123451234512345123451234512345");
+	osize=0;
+	e = gf_lz_compress_payload(&zbuf, 1+(u32) strlen(zbuf), &osize);
+	if (e && (e!= GF_NOT_SUPPORTED)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] lzma compress fail\n"));
+		gf_free(zbuf);
+		return 1;
+	}
+	ozbuf=NULL;
+	res=0;
+	e = gf_lz_decompress_payload(zbuf, osize, &ozbuf, &res);
+	gf_free(zbuf);
+	if (ozbuf) gf_free(ozbuf);
+	if (e && (e!= GF_NOT_SUPPORTED)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] lzma decompress fail\n"));
+		return 1;
+	}
+
+	gf_htonl(0xAABBCCDD);
+	gf_ntohl(0xAABBCCDD);
+	gf_htons(0xAABB);
+	gf_tohs(0xAABB);
+	gf_errno_str(-1);
+
+	/* these two lock the bash shell in test mode
+	gf_prompt_set_echo_off(GF_TRUE);
+	gf_prompt_set_echo_off(GF_FALSE);
+	*/
+
+	gf_net_set_ntp_shift(-1000);
+	gf_net_get_ntp_diff_ms(gf_net_get_ntp_ts() );
+	gf_net_get_timezone();
+	gf_net_get_utc_ts(70, 1, 0, 0, 0, 0);
+	gf_net_ntp_diff_ms(1000000, 1000000);
+	gf_lang_get_count();
+	gf_lang_get_2cc(2);
+	GF_Blob b;
+	b.data = (u8 *) "test";
+	b.size = 5;
+	char url[100];
+	u8 *data;
+	u32 size;
+	sprintf(url, "gmem://%p", &b);
+
+	gf_blob_get_data(url, &data, &size);
+	if (!data || strcmp((char *)data, "test")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreUnitTests] blob url parsing fail\n"));
+		return 1;
+	}
+	gf_sys_get_battery_state(NULL, NULL, NULL, NULL, NULL);
+	gf_sys_get_process_id();
+	data = (u8 *) gf_log_get_tools_levels();
+	if (data) gf_free(data);
+
+	gf_sys_is_quiet();
+	gf_sys_get_argv();
+	gf_mx_get_num_locks(NULL);
+	sigint_catched = GF_TRUE;
+
+#ifdef WIN32
+	gpac_sig_handler(CTRL_C_EVENT);
+#else
+	gpac_sig_handler(SIGINT);
+#endif
+
+	gf_mkdir("testdir");
+	gf_mkdir("testdir/somedir");
+	strcpy(url, "testdir/somedir/test.bin");
+	FILE *f=gf_fopen(url, "wb");
+	fprintf(f, "some test\n");
+#ifdef GPAC_MEMORY_TRACKING
+	gf_memory_print();
+#endif
+	gf_fclose(f);
+	gf_file_modification_time(url);
+	gf_m2ts_probe_file(url);
+
+	gf_cleanup_dir("testdir");
+	gf_rmdir("testdir");
+
+	//math.c not covered yet by our sample files
+	GF_Matrix2D mx;
+	gf_mx2d_init(mx);
+	gf_mx2d_add_skew(&mx, FIX_ONE, FIX_ONE);
+	gf_mx2d_add_skew_x(&mx, GF_PI/4);
+	gf_mx2d_add_skew_y(&mx, GF_PI/4);
+	GF_Point2D scale, translate;
+	Fixed rotate;
+	gf_mx2d_decompose(&mx, &scale, &rotate, &translate);
+	GF_Rect rc1, rc2;
+	memset(&rc1, 0, sizeof(GF_Rect));
+	memset(&rc2, 0, sizeof(GF_Rect));
+	gf_rect_equal(&rc1, &rc2);
+
+	GF_Matrix mat;
+	gf_mx_init(mat);
+	Fixed yaw, pitch, roll;
+	gf_mx_get_yaw_pitch_roll(&mat, &yaw, &pitch, &roll);
+	gf_mx_ortho_reverse_z(&mat, -20, 20, -20, 20, 0.1, 100.0);
+	gf_mx_perspective_reverse_z(&mat, 0.76, 1.0, 0.1, 100.0);
+
+	GF_Ray ray;
+	GF_Vec center, outPoint;
+	memset(&ray, 0, sizeof(GF_Ray));
+	ray.dir.z = FIX_ONE;
+	memset(&center, 0, sizeof(GF_Vec));
+	gf_ray_hit_sphere(&ray, &center, FIX_ONE, &outPoint);
+
+	gf_closest_point_to_line(center, ray.dir, center);
+
+	GF_Plane plane;
+	plane.d = FIX_ONE;
+	plane.normal = center;
+	gf_plane_intersect_line(&plane, &center, &ray.dir, &outPoint);
+
+	GF_Vec4 rot, quat;
+	rot.x = rot.y = 0;
+	rot.z = FIX_ONE;
+	rot.q = GF_PI/4;
+	quat = gf_quat_from_rotation(rot);
+	gf_quat_get_inv(&quat);
+	gf_quat_rotate(&quat, &ray.dir);
+	gf_quat_slerp(quat, quat, FIX_ONE/2);
+	GF_BBox bbox;
+	memset(&bbox, 0, sizeof(GF_BBox));
+	gf_bbox_equal(&bbox, &bbox);
+
+	GF_Vec v;
+	v.x = v.y = v.z = 0;
+	gf_vec_scale_p(&v, 2*FIX_ONE);
+
+	//token.c
+	char container[1024];
+	gf_token_get_strip("12 34{ 56 : }", 0, "{:", " ", container, 1024);
+
+	//netwok.c
+	char name[GF_MAX_IP_NAME_LEN];
+	gf_sk_get_host_name(name);
+	gf_sk_set_usec_wait(NULL, 1000);
+	u32 fam;
+	u16 port;
+	//to remove once we have rtsp server back
+	gf_sk_get_local_info(NULL, &port, &fam);
+	gf_sk_receive_wait(NULL, NULL, 0, &fam, 1);
+	gf_sk_send_wait(NULL, NULL, 0, 1);
+
+	//path2D
+	GF_Path *path = gf_path_new();
+	gf_path_add_move_to(path, 0, 0);
+	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>");
+	gf_xml_dom_get_error(dom);
+	gf_xml_dom_get_line(dom);
+	gf_xml_dom_get_root_nodes_count(dom);
+	gf_xml_dom_del(dom);
+
+	//downloader - to update once we find a way to integrate atsc demux in tests
+	GF_DownloadManager *dm = gf_dm_new(NULL);
+	gf_dm_set_auth_callback(dm, NULL, NULL);
+
+	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);
+
+	//constants
+	gf_stream_type_afx_name(GPAC_AFX_3DMC);
+	//thread
+	gf_th_stop(NULL);
+	gf_list_swap(NULL, NULL);
+	//bitstream
+	GF_BitStream *bs = gf_bs_new("test", 4, GF_BITSTREAM_READ);
+	gf_bs_bits_available(bs);
+	gf_bs_get_bit_offset(bs);
+	gf_bs_read_vluimsbf5(bs);
+	gf_bs_del(bs);
+	//module
+	gf_module_load_static(NULL);
+
+	gf_mp3_version_name(0);
+	char tsbuf[188];
+	u8 is_pes=GF_TRUE;
+	memset(tsbuf, 0, 188);
+	tsbuf[0] = 0x47;
+	tsbuf[1] = 0x40;
+	tsbuf[4]=0x00;
+	tsbuf[5]=0x00;
+	tsbuf[6]=0x01;
+	tsbuf[10] = 0x80;
+	tsbuf[11] = 0xc0;
+	tsbuf[13] = 0x2 << 4;
+	gf_m2ts_restamp(tsbuf, 188, 1000, &is_pes);
+
+
+	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);
+
+	gf_opts_discard_changes();
+
+	gf_rtp_reset_ssrc(NULL);
+	gf_rtp_enable_nat_keepalive(NULL, 0);
+	gf_rtp_stop(NULL);
+	gf_rtp_streamer_get_payload_type(NULL);
+	gf_rtsp_unregister_interleave(NULL, 0);
+	gf_rtsp_reset_aggregation(NULL);
+
+	get_cmd('h');
+	gpac_suggest_arg("blcksize");
+	gpac_suggest_filter("outf", GF_FALSE, GF_FALSE);
+	//todo: build tests for these two
+	gf_filter_pid_negociate_property_str(NULL, NULL, NULL);
+	gf_filter_pid_negociate_property_dyn(NULL, NULL, NULL);
+
+	gf_props_parse_type("uint");
+	//this one is just a wrapper around an internal function
+	gf_filter_pck_new_copy(NULL, NULL, NULL);
+	gf_filter_get_max_extra_input_pids(NULL);
+	gf_filter_remove(NULL);
+	gf_filter_reconnect_output(NULL);
+
+	gf_audio_fmt_get_cicp_layout(2, 1, 1);
+	gf_audio_fmt_get_layout_from_cicp(3);
+	gf_audio_fmt_get_layout_name_from_cicp(3);
+	gf_audio_fmt_get_cicp_from_layout(GF_AUDIO_CH_FRONT_LEFT|GF_AUDIO_CH_FRONT_RIGHT);
+
+	//old bifs parsing stuff
+	gf_odf_desc_del(gf_odf_desc_new(GF_ODF_ELEM_MASK_TAG));
+	GF_TextConfig *txtc = (GF_TextConfig *)gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
+	gf_odf_get_text_config(NULL, 0, 0, txtc);
+	gf_odf_dump_txtcfg(txtc, NULL, 0, GF_FALSE);
+	gf_odf_desc_del((GF_Descriptor *) txtc);
+#endif
+	return 0;
+}
+
+static Bool revert_cache_file(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	const char *url;
+	GF_Config *cached;
+	if (strncmp(item_name, "gpac_cache_", 11)) return GF_FALSE;
+	cached = gf_cfg_new(NULL, item_path);
+	url = gf_cfg_get_key(cached, "cache", "url");
+	if (url) url = strstr(url, "://");
+	if (url) {
+		u32 i, len, dir_len=0, k=0;
+		char *dst_name;
+		char *sep;
+		
+		sep = strstr(item_path, "gpac_cache_");
+		if (sep) {
+			sep[0] = 0;
+			dir_len = (u32) strlen(item_path);
+			sep[0] = 'g';
+		}
+		url+=3;
+		len = (u32) strlen(url);
+		dst_name = gf_malloc(len+dir_len+1);
+		memset(dst_name, 0, len+dir_len+1);
+
+		strncpy(dst_name, item_path, dir_len);
+		k=dir_len;
+		for (i=0; i<len; i++) {
+			dst_name[k] = url[i];
+			if (dst_name[k]==':') dst_name[k]='_';
+			else if (dst_name[k]=='/') {
+				if (!gf_dir_exists(dst_name))
+					gf_mkdir(dst_name);
+			}
+			k++;
+		}
+		sep = strrchr(item_path, '.');
+		if (sep) {
+			sep[0]=0;
+			if (gf_file_exists(item_path)) {
+				gf_file_move(item_path, dst_name);
+			}
+			sep[0]='.';
+		}
+		gf_free(dst_name);
+	}
+	gf_cfg_del(cached);
+	gf_file_delete(item_path);
+	return GF_FALSE;
+}
+
+
+typedef struct
+{
+	FILE *filep;
+	char *path;
+	Bool write;
+	u32 nb_refs;
+} FileIOCtx;
+
+static GF_List *all_gfio_defined = NULL;
+
+static GF_FileIO *fio_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_err);
+
+static GF_Err fio_seek(GF_FileIO *fileio, u64 offset, s32 whence)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return GF_BAD_PARAM;
+	gf_fseek(ioctx->filep, offset, whence);
+	return GF_OK;
+}
+static u32 fio_read(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return 0;
+	return (u32) gf_fread(buffer, bytes, ioctx->filep);
+}
+static u32 fio_write(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return 0;
+	if (!bytes) {
+		fflush(ioctx->filep);
+		return 0;
+	}
+	return (u32) gf_fwrite(buffer, bytes, ioctx->filep);
+}
+static s64 fio_tell(GF_FileIO *fileio)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return -1;
+	return gf_ftell(ioctx->filep);
+}
+static Bool fio_eof(GF_FileIO *fileio)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return GF_TRUE;
+	return feof(ioctx->filep);
+}
+static int fio_printf(GF_FileIO *fileio, const char *format, va_list args)
+{
+	FileIOCtx *ioctx = gf_fileio_get_udta(fileio);
+	if (!ioctx || !ioctx->filep) return -1;
+	return vfprintf(ioctx->filep, format, args);
+}
+
+static GF_FileIO *fio_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_err)
+{
+	GF_FileIO *gfio;
+	FileIOCtx *ioctx;
+	u32 i, count;
+	u64 file_size;
+	Bool no_concatenate = GF_FALSE;
+	FileIOCtx *ioctx_ref = gf_fileio_get_udta(fileio_ref);
+
+	*out_err = GF_OK;
+
+	if (!strcmp(mode, "ref")) {
+		ioctx_ref->nb_refs++;
+		return fileio_ref;
+	}
+	if (!strcmp(mode, "unref")) {
+		if (!ioctx_ref->nb_refs) return NULL;
+		ioctx_ref->nb_refs--;
+		if (ioctx_ref->nb_refs)
+			return fileio_ref;
+
+		url = NULL;
+	}
+
+	if (!strcmp(mode, "url")) {
+		if (!url) return NULL;
+		GF_SAFEALLOC(ioctx, FileIOCtx);
+		if (!ioctx) return NULL;
+		ioctx->path = gf_url_concatenate(ioctx_ref->path, url);
+		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+		if (!gfio) {
+			if (ioctx->path) gf_free(ioctx->path);
+			gf_free(ioctx);
+			return NULL;
+		}
+		//remember it but no need to keep a ref on it
+		gf_list_add(all_gfio_defined, gfio);
+		return gfio;
+	}
+	if (!strcmp(mode, "probe")) {
+		if (!gf_file_exists(url)) *out_err = GF_URL_ERROR;
+		return NULL;
+	}
+
+	if (!url) {
+		if (ioctx_ref->filep) gf_fclose(ioctx_ref->filep);
+		ioctx_ref->filep = NULL;
+
+		if (!ioctx_ref->nb_refs) {
+			gf_list_del_item(all_gfio_defined, fileio_ref);
+			gf_fileio_del(fileio_ref);
+			if (ioctx_ref->path) gf_free(ioctx_ref->path);
+			gf_free(ioctx_ref);
+		}
+		return NULL;
+	}
+
+	//file handle not opened, we can use the current gfio
+	if (!ioctx_ref->filep && (!strnicmp(url, "gfio://", 7) || !strcmp(url, ioctx_ref->path)) ) {
+		ioctx_ref->filep = gf_fopen(ioctx_ref->path, mode);
+		if (!ioctx_ref->filep) {
+			*out_err = GF_IO_ERR;
+			return NULL;
+		}
+		file_size = gf_fsize(ioctx_ref->filep);
+		//in test mode we want to use our ftell and fseek wrappers
+		if (strchr(mode, 'r')) {
+			gf_fileio_set_stats(fileio_ref, file_size, file_size, GF_TRUE, 0);
+		}
+		return fileio_ref;
+	}
+
+	//file handle already open (file is being opened twice), create a new gfio or check if we have already created one
+	gfio = NULL;
+	ioctx = NULL;
+	count = gf_list_count(all_gfio_defined);
+	for (i=0; i<count; i++) {
+		GF_FileIO *a_gfio = gf_list_get(all_gfio_defined, i);
+		ioctx = gf_fileio_get_udta(a_gfio);
+		if (ioctx && !strcmp(ioctx->path, url)) {
+			if (ioctx->filep) {
+				no_concatenate = GF_TRUE;
+				ioctx = NULL;
+			}
+			gfio = a_gfio;
+			break;
+		}
+		ioctx = NULL;
+	}
+	if (!ioctx) {
+		GF_SAFEALLOC(ioctx, FileIOCtx);
+		if (!ioctx) {
+			*out_err = GF_OUT_OF_MEM;
+			return NULL;
+		}
+		if (strnicmp(url, "gfio://", 7)) {
+			if (no_concatenate)
+				ioctx->path = gf_strdup(url);
+			else
+				ioctx->path = gf_url_concatenate(ioctx_ref->path, url);
+		} else {
+			ioctx->path = gf_strdup(ioctx_ref->path);
+		}
+		gfio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+		if (!gfio) {
+			if (ioctx->path) gf_free(ioctx->path);
+			gf_free(ioctx);
+			*out_err = GF_OUT_OF_MEM;
+		}
+	}
+
+	if (strnicmp(url, "gfio://", 7)) {
+		ioctx->filep = gf_fopen(ioctx->path, mode);
+	} else {
+		ioctx->filep = gf_fopen(ioctx_ref->path, mode);
+	}
+
+	if (!ioctx->filep) {
+		*out_err = GF_IO_ERR;
+		gf_list_del_item(all_gfio_defined, gfio);
+		gf_fileio_del(gfio);
+		if (ioctx->path) gf_free(ioctx->path);
+		gf_free(ioctx);
+		return NULL;
+	}
+
+	file_size = gf_fsize(ioctx->filep);
+	if (strchr(mode, 'r'))
+		gf_fileio_set_stats(gfio, file_size,file_size, GF_TRUE, 0);
+	return gfio;
+}
+
+
+static const char *make_fileio(const char *inargs, const char **out_arg, Bool is_input, GF_Err *e)
+{
+	FileIOCtx *ioctx;
+	GF_FileIO *fio;
+	char *sep = (char *) gf_url_colon_suffix(inargs);
+	*out_arg = NULL;
+	if (sep) sep[0] = 0;
+
+	GF_SAFEALLOC(ioctx, FileIOCtx);
+	if (!ioctx) return NULL;
+	ioctx->path = gf_strdup(inargs);
+	if (!ioctx->path) {
+		gf_free(ioctx);
+		return NULL;
+	}
+	if (sep) {
+		sep[0] = ':';
+		*out_arg = sep+1;
+	}
+	fio = gf_fileio_new(ioctx->path, ioctx, fio_open, fio_seek, fio_read, fio_write, fio_tell, fio_eof, fio_printf);
+	if (!fio) {
+		gf_free(ioctx->path);
+		gf_free(ioctx);
+		*e = GF_OUT_OF_MEM;
+		return NULL;
+	}
+	if (!all_gfio_defined) {
+		all_gfio_defined = gf_list_new();
+		if (!all_gfio_defined) return NULL;
+	}
+	gf_list_add(all_gfio_defined, fio);
+	//keep alive until end
+	ioctx->nb_refs = 1;
+	return gf_fileio_url(fio);
+}
+
+static void cleanup_file_io()
+{
+	if (!all_gfio_defined) return;
+	while (gf_list_count(all_gfio_defined)) {
+		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);
+		}
+		if (ioctx->path) gf_free(ioctx->path);
+		gf_free(ioctx);
+	}
+	gf_list_del(all_gfio_defined);
+	all_gfio_defined = NULL;
+}
+
+
+static void gpac_rmt_user_callback(void *udta, const char* text)
+{
+	fprintf(stderr, "Remotery says: %s\n", text);
+	gf_sys_profiler_send("{ \"type\": \"chat\", \"value\": \"Got it !\"}");
+}

gpac-0.8.0.tar.gz/applications/mp4box/Makefile -> gpac-1.0.0.tar.gz/applications/mp4box/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/applications/mp4box
 
-CFLAGS= $(OPTFLAGS) -DGPAC_HAVE_CONFIG_H -I"$(SRC_PATH)/include"
+CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS)
 
 ifeq ($(DEBUGBUILD), yes)
 CFLAGS+=-g
@@ -15,11 +15,16 @@
 endif
 
 LINKFLAGS=-L../../bin/gcc -L../../extra_lib/lib/gcc
+ifeq ($(CONFIG_DARWIN),yes)
+#LINKFLAGS+= -Wl,-rpath,'@loader_path'
+else
+LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
+endif
 
 ifeq ($(STATICBUILD),yes)
 ##include static modules and other deps for libgpac
 include ../../static.mak
-LINKFLAGS+=-lgpac_static
+LINKFLAGS+=$(shell pkg-config ../../gpac.pc --libs --static | sed 's/-lgpac //'  )
 LINKFLAGS+= $(GPAC_SH_FLAGS)
 LINKFLAGS+=$(EXTRALIBS)
 else
@@ -47,29 +52,28 @@
 
 endif
 
-
 #common obj
-OBJS=main.o filedump.o fileimport.o 
+OBJS=main.o filedump.o fileimport.o
 ifeq ($(DISABLE_STREAMING),no)
 OBJS+=live.o
 endif
 
 
 
-SRCS := $(OBJS:.o=.c) 
+SRCS := $(OBJS:.o=.c)
 
 all: $(PROG)
 
 $(PROG): $(OBJS)
 	$(CC) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
 
-clean: 
+clean:
 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
 
 dep: depend
 
 depend:
-	rm -f .depend	
+	rm -f .depend
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 distclean: clean

gpac-0.8.0.tar.gz/applications/mp4box/filedump.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -23,7 +23,7 @@
  *
  */
 
-#include <gpac/tools.h>
+#include "mp4box.h"
 
 #if defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)
 
@@ -43,8 +43,6 @@
 #include <gpac/constants.h>
 #include <gpac/avparse.h>
 #include <gpac/internal/media_dev.h>
-/*for asctime and gmtime*/
-#include <time.h>
 /*ISO 639 languages*/
 #include <gpac/iso639.h>
 #include <gpac/mpegts.h>
@@ -53,19 +51,17 @@
 #include <gpac/scene_manager.h>
 #endif
 #include <gpac/internal/media_dev.h>
-#include <gpac/internal/isomedia_dev.h>
 #include <gpac/media_tools.h>
+/*for built-in box printing*/
+#include <gpac/internal/isomedia_dev.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;
 
 void scene_coding_log(void *cbk, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char *fmt, va_list vlist);
 
-#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample);
-#endif
-
 void PrintLanguages()
 {
 	u32 i=0, count = gf_lang_get_count();
@@ -86,8 +82,7 @@
 
 GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name)
 {
-	const char *tag;
-	char szName[1024];
+	const u8 *tag;
 	FILE *t;
 	u32 tag_len;
 	GF_Err e = gf_isom_apple_get_tag(file, GF_ISOM_ITUNE_COVER_ART, &tag, &tag_len);
@@ -100,6 +95,7 @@
 	}
 
 	if (inName) {
+		char szName[1024];
 		if (is_final_name) {
 			strcpy(szName, inName);
 		} else {
@@ -113,40 +109,15 @@
 	} else {
 		t = stdout;
 	}
-	gf_fwrite(tag, tag_len & 0x7FFFFFFF, 1, t);
+	gf_fwrite(tag, tag_len & 0x7FFFFFFF, t);
 
 	if (inName) gf_fclose(t);
 	return GF_OK;
 }
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err set_cover_art(GF_ISOFile *file, char *inName)
-{
-	GF_Err e;
-	char *tag, *ext;
-	FILE *t;
-	u32 tag_len;
-	t = gf_fopen(inName, "rb");
-	gf_fseek(t, 0, SEEK_END);
-	tag_len = (u32) gf_ftell(t);
-	gf_fseek(t, 0, SEEK_SET);
-	tag = gf_malloc(sizeof(char) * tag_len);
-	tag_len = (u32) fread(tag, sizeof(char), tag_len, t);
-	gf_fclose(t);
-
-	ext = strrchr(inName, '.');
-	if (!stricmp(ext, ".png")) tag_len |= 0x80000000;
-	e = gf_isom_apple_set_tag(file, GF_ISOM_ITUNE_COVER_ART, tag, tag_len);
-	gf_free(tag);
-	return e;
-}
-
-#endif
-
 #ifndef GPAC_DISABLE_SCENE_DUMP
 
-GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log)
+GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log, Bool no_odf_conv)
 {
 	GF_Err e;
 	GF_SceneManager *ctx;
@@ -178,12 +149,16 @@
 			gf_sg_del(sg);
 			return e;
 		}
+		if (no_odf_conv)
+			gf_isom_disable_odf_conversion(load.isom, GF_TRUE);
+
 	} else if (ftype==GF_FILE_TYPE_LSR_SAF) {
 		load.isom = gf_isom_open("saf_conv", GF_ISOM_WRITE_EDIT, NULL);
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-		if (load.isom)
-			e = import_file(load.isom, file, 0, 0, 0);
-		else
+		if (load.isom) {
+			GF_Fraction _frac = {0,0};
+			e = import_file(load.isom, file, 0, _frac, 0, NULL, NULL, 0);
+		} else
 #else
 		fprintf(stderr, "Warning: GPAC was compiled without Media Import support\n");
 #endif
@@ -234,7 +209,7 @@
 
 #ifndef GPAC_DISABLE_SCENE_STATS
 
-static void dump_stats(FILE *dump, GF_SceneStatistics *stats)
+static void dump_stats(FILE *dump, const GF_SceneStatistics *stats)
 {
 	u32 i;
 	s32 created, count, draw_created, draw_count, deleted, draw_deleted;
@@ -394,7 +369,7 @@
 	e = gf_sm_load_init(&load);
 	if (!e) e = gf_sm_load_run(&load);
 	gf_sm_load_done(&load);
-	if (e) goto exit;
+	if (e<0) goto exit;
 
 	if (inName) {
 		strcpy(szBuf, inName);
@@ -413,8 +388,12 @@
 	fprintf(stderr, "Analysing Scene\n");
 
 	fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-	fprintf(dump, "\n");
-	fprintf(dump, "<SceneStatistics file=\"%s\" DumpType=\"%s\">\n", file, (stat_level==1) ? "full scene" : ((stat_level==2) ? "AccessUnit based" : "SceneGraph after each AU"));
+	fprintf(dump, "\n");
+
+	fprintf(dump, "<SceneStatistics file=\"%s\" DumpType=\"%s\">\n", gf_file_basename(file), (stat_level==1) ? "full scene" : ((stat_level==2) ? "AccessUnit based" : "SceneGraph after each AU"));
 
 	sm = gf_sm_stats_new();
 
@@ -456,9 +435,9 @@
 			if (e) goto exit;
 		}
 		if (stat_level==2) {
-			fprintf(dump, "<AUStatistics StreamID=\"%d\" AUTime=\""LLD"\">\n", au->owner->ESID, LLD_CAST au->timing);
+			fprintf(dump, "<AUStatistics StreamID=\"%d\" AUTime=\""LLD"\">\n", au->owner->ESID, au->timing);
 		} else {
-			fprintf(dump, "<GraphStatistics StreamID=\"%d\" AUTime=\""LLD"\">\n", au->owner->ESID, LLD_CAST au->timing);
+			fprintf(dump, "<GraphStatistics StreamID=\"%d\" AUTime=\""LLD"\">\n", au->owner->ESID, au->timing);
 		}
 		/*dump stats*/
 		dump_stats(dump, gf_sm_stats_get(sm) );
@@ -548,60 +527,21 @@
 }
 #endif
 
-void PrintNode(const char *name, u32 graph_type)
+#ifndef GPAC_DISABLE_VRML
+static void do_print_node(GF_Node *node, GF_SceneGraph *sg, const char *name, u32 graph_type, Bool is_nodefield, Bool do_cov)
 {
-#ifdef GPAC_DISABLE_VRML
-	fprintf(stderr, "VRML/MPEG-4/X3D scene graph is disabled in this build of GPAC\n");
-	return;
-#else
-	const char *nname, *std_name;
-	char szField[1024];
-	GF_Node *node;
-	GF_SceneGraph *sg;
-	u32 tag, nbF, i;
+	u32 nbF, i;
 	GF_FieldInfo f;
 #ifndef GPAC_DISABLE_BIFS
 	u8 qt, at;
 	Fixed bmin, bmax;
 	u32 nbBits;
 #endif /*GPAC_DISABLE_BIFS*/
-	Bool is_nodefield = 0;
 
-	char *sep = strchr(name, '.');
-	if (sep) {
-		strcpy(szField, sep+1);
-		sep[0] = 0;
-		is_nodefield = 1;
-	}
-
-	if (graph_type==1) {
-#ifndef GPAC_DISABLE_X3D
-		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;
-#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;
-	}
-
-	sg = gf_sg_new();
-	node = gf_node_new(sg, tag);
-	gf_node_register(node, NULL);
-	nname = gf_node_get_class_name(node);
-	if (!node) {
-		fprintf(stderr, "Node %s not supported in current built\n", nname);
-		return;
-	}
 	nbF = gf_node_get_field_count(node);
 
 	if (is_nodefield) {
+		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);
@@ -628,8 +568,29 @@
 		}
 		return;
 	}
-
-	fprintf(stderr, "Node Syntax:\n%s {\n", nname);
+	if (do_cov) {
+		u32 ndt;
+		if (graph_type==0) {
+			u32 all;
+			gf_node_mpeg4_type_by_class_name(name);
+			gf_bifs_get_child_table(node);
+			all = gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_ALL);
+			for (i=0; i<all; i++) {
+				u32 res;
+				gf_sg_script_get_field_index(node, i, GF_SG_FIELD_CODING_ALL, &res);
+			}
+
+			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_DEF);
+			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_IN);
+			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_OUT);
+			gf_node_get_num_fields_in_mode(node, GF_SG_FIELD_CODING_DYN);
+		}
+		else if (graph_type==1) gf_node_x3d_type_by_class_name(name);
+		for (ndt=NDT_SFWorldNode; ndt<NDT_LAST; ndt++) {
+			gf_node_in_table_by_tag(gf_node_get_tag(node), ndt);
+		}
+	}
+	fprintf(stderr, "%s {\n", name);
 
 	for (i=0; i<nbF; i++) {
 		gf_node_get_field(node, i, &f);
@@ -638,7 +599,7 @@
 			continue;
 		}
 
-		fprintf(stderr, "\t%s %s %s", gf_sg_vrml_get_event_type_name(f.eventType, 0), gf_sg_vrml_get_field_type_by_name(f.fieldType), f.name);
+		fprintf(stderr, "\t%s %s %s", gf_sg_vrml_get_event_type_name(f.eventType, 0), gf_sg_vrml_get_field_type_name(f.fieldType), f.name);
 		if (f.fieldType==GF_SG_VRML_SFNODE) fprintf(stderr, " NULL");
 		else if (f.fieldType==GF_SG_VRML_MFNODE) fprintf(stderr, " []");
 		else if (gf_sg_vrml_is_sf_field(f.fieldType)) {
@@ -646,13 +607,13 @@
 			PrintNodeSFField(f.fieldType, f.far_ptr);
 		} else {
 			void *ptr;
-			u32 i, sftype;
+			u32 j, sftype;
 			GenMFField *mffield = (GenMFField *) f.far_ptr;
 			fprintf(stderr, " [");
 			sftype = gf_sg_vrml_get_sf_type(f.fieldType);
-			for (i=0; i<mffield->count; i++) {
-				if (i) fprintf(stderr, " ");
-				gf_sg_vrml_mf_get_item(f.far_ptr, f.fieldType, &ptr, i);
+			for (j=0; j<mffield->count; j++) {
+				if (j) fprintf(stderr, " ");
+				gf_sg_vrml_mf_get_item(f.far_ptr, f.fieldType, &ptr, j);
 				PrintNodeSFField(sftype, ptr);
 			}
 			fprintf(stderr, "]");
@@ -673,18 +634,72 @@
 		}
 #endif /*GPAC_DISABLE_BIFS*/
 		fprintf(stderr, "\n");
+
+		if (do_cov) {
+			gf_node_get_field_by_name(node, (char *) f.name, &f);
+		}
 	}
 	fprintf(stderr, "}\n\n");
 
+}
+#endif
+
+
+void 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;
+#else
+	const char *std_name;
+	GF_Node *node;
+	GF_SceneGraph *sg;
+	u32 tag;
+#ifndef GPAC_DISABLE_BIFS
+#endif /*GPAC_DISABLE_BIFS*/
+	Bool is_nodefield = 0;
+
+	char *sep = strchr(name, '.');
+	if (sep) {
+		sep[0] = 0;
+		is_nodefield = 1;
+	}
+
+	if (graph_type==1) {
+#ifndef GPAC_DISABLE_X3D
+		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;
+#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;
+	}
+
+	sg = gf_sg_new();
+	node = gf_node_new(sg, tag);
+	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;
+	}
+	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*/
 }
 
-void PrintBuiltInNodes(u32 graph_type)
+void PrintBuiltInNodes(u32 graph_type, Bool dump_nodes)
 {
 #if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_X3D) && !defined(GPAC_DISABLE_SVG)
-	GF_Node *node;
 	GF_SceneGraph *sg;
 	u32 i, nb_in, nb_not_in, start_tag, end_tag;
 
@@ -724,10 +739,14 @@
 		fprintf(stderr, "Available MPEG-4 nodes in this build (encoding/decoding/dumping):\n");
 	}
 	for (i=start_tag; i<end_tag; i++) {
-		node = gf_node_new(sg, i);
+		GF_Node *node = gf_node_new(sg, i);
 		if (node) {
 			gf_node_register(node, NULL);
-			fprintf(stderr, " %s\n", gf_node_get_class_name(node));
+			if (dump_nodes) {
+				do_print_node(node, sg, gf_node_get_class_name(node), graph_type, GF_FALSE, GF_TRUE);
+			} else {
+				fprintf(stderr, " %s\n", gf_node_get_class_name(node));
+			}
 			gf_node_unregister(node, NULL);
 			nb_in++;
 		} else {
@@ -742,19 +761,37 @@
 	} else {
 		fprintf(stderr, "\n%d nodes supported - %d nodes not supported\n", nb_in, nb_not_in);
 	}
+	//coverage
+	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);
+		}
+
+	}
 #else
 	fprintf(stderr, "\nNo scene graph enabled in this MP4Box build\n");
 #endif
 }
 
 
-void PrintBuiltInBoxes()
+void PrintBuiltInBoxes(Bool 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++) {
 		gf_isom_dump_supported_box(i, stdout);
+        if (do_cov) {
+			u32 btype = gf_isom_get_supported_box_type(i);
+            GF_Box *b=gf_isom_box_new(btype);
+            if (b) {
+                GF_Box *c=NULL;
+                gf_isom_clone_box(b, &c);
+                if (c) gf_isom_box_del(c);
+                gf_isom_box_del(b);
+            }
+        }
 	}
 	fprintf(stdout, "</Boxes>\n");
 }
@@ -766,9 +803,9 @@
 	u32 i, j, size;
 	FILE *dump;
 	const char *sdp;
-	char szBuf[1024];
 
 	if (inName) {
+		char szBuf[1024];
 		strcpy(szBuf, inName);
 		if (!is_final_name) strcat(szBuf, "_rtp.xml");
 		dump = gf_fopen(szBuf, "wt");
@@ -791,9 +828,11 @@
 		gf_isom_sdp_track_get(file, i+1, &sdp, &size);
 		fprintf(dump, "<SDPInfo>%s</SDPInfo>", sdp);
 
+#ifndef GPAC_DISABLE_ISOM_HINTING
 		for (j=0; j<gf_isom_get_sample_count(file, i+1); j++) {
 			gf_isom_dump_hint_sample(file, i+1, j+1, dump);
 		}
+#endif
 		fprintf(dump, "</RTPHintTrack>\n");
 	}
 	fprintf(dump, "</RTPFile>\n");
@@ -805,13 +844,20 @@
 void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_mode)
 {
 	u32 i, j, k, count;
-	Bool has_error, is_fragmented=0;
+	Bool has_ctts_error, is_fragmented=GF_FALSE;
 	FILE *dump;
-	char szBuf[1024];
 	Bool skip_offset = ((dump_mode==2) || (dump_mode==4)) ? GF_TRUE : GF_FALSE;
 	Bool check_ts = ((dump_mode==3) || (dump_mode==4)) ? GF_TRUE : GF_FALSE;
+	struct _ts_info {
+		u64 dts;
+		s64 cts;
+	};
+	struct _ts_info *timings = NULL;
+	u32 nb_timings=0, nb_timings_alloc = 0;
+
 
 	if (inName) {
+		char szBuf[1024];
 		strcpy(szBuf, inName);
 		if (!is_final_name) strcat(szBuf, "_ts.txt");
 		dump = gf_fopen(szBuf, "wt");
@@ -823,9 +869,9 @@
 		dump = stdout;
 	}
 	if (gf_isom_is_fragmented(file))
-		is_fragmented = 1;
+		is_fragmented = GF_TRUE;
 
-	has_error = 0;
+	has_ctts_error = GF_FALSE;
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
 		s64 cts_dts_shift = gf_isom_get_cts_to_dts_shift(file, i+1);
 		u32 has_cts_offset = gf_isom_has_time_offset(file, i+1);
@@ -839,9 +885,17 @@
 
 
 		count = gf_isom_get_sample_count(file, i+1);
+		if (has_cts_offset && check_ts) {
+			if (nb_timings_alloc<count) {
+				nb_timings_alloc = count;
+				timings = gf_realloc(timings, sizeof (struct _ts_info) * count);
+			}
+			nb_timings = 0;
+		}
 
 		for (j=0; j<count; j++) {
-			u64 dts, cts, offset;
+			s64 cts;
+			u64 dts, offset;
 			u32 isLeading, dependsOn, dependedOn, redundant;
 			Bool is_rap, has_roll;
 			s32 roll_distance;
@@ -855,52 +909,47 @@
 			gf_isom_get_sample_rap_roll_info(file, i+1, j+1, &is_rap, &has_roll, &roll_distance);
 			dts = samp->DTS;
 			cts = dts + (s32) samp->CTS_Offset;
-			fprintf(dump, "Sample %d\tDTS "LLD"\tCTS "LLD"\t%d\t%d", j+1, LLD_CAST dts, LLD_CAST cts, samp->dataLength, samp->IsRAP);
+			fprintf(dump, "Sample %d\tDTS "LLU"\tCTS "LLD"\t%d\t%d", j+1, dts, cts, samp->dataLength, samp->IsRAP);
 
 			if (!skip_offset)
-				fprintf(dump, "\t"LLD, offset);
+				fprintf(dump, "\t"LLU, offset);
 
 			fprintf(dump, "\t%d\t%d\t%d\t%d\t%d\t%d\t%d", isLeading, dependsOn, dependedOn, redundant, is_rap, has_roll, roll_distance);
 
-			if (cts<dts) {
+			if (cts< (s64) dts) {
 				if (has_cts_offset==2) {
-					if (cts_dts_shift && (cts+cts_dts_shift<dts)) {
+					if (cts_dts_shift && (cts+cts_dts_shift < (s64) dts)) {
 						fprintf(dump, " #NEGATIVE CTS OFFSET!!!");
-						has_error = 1;
+						has_ctts_error = 1;
 					} else if (!cts_dts_shift) {
 						fprintf(dump, " #possible negative CTS offset (no cslg in file)");
 					}
 				} else {
 					fprintf(dump, " #NEGATIVE CTS OFFSET!!!");
-					has_error = 1;
+					has_ctts_error = 1;
 				}
 			}
-
-			gf_isom_sample_del(&samp);
-
 			if (has_cts_offset && check_ts) {
-				for (k=0; k<count; k++) {
-					u64 adts, acts;
-					if (k==j) continue;
-					samp = gf_isom_get_sample_info(file, i+1, k+1, NULL, NULL);
-					adts = samp->DTS;
-					acts = adts + (s32) samp->CTS_Offset;
+				for (k=0; k<nb_timings; k++) {
 
-					if (adts==dts) {
+					if (timings[k].dts==dts) {
 						fprintf(dump, " #SAME DTS USED!!!");
-						has_error = 1;
+						has_ctts_error = 1;
 					}
-					if (acts==cts) {
+					if (timings[k].cts==cts) {
 						fprintf(dump, " #SAME CTS USED!!! ");
-						has_error = 1;
+						has_ctts_error = 1;
 					}
-
-					gf_isom_sample_del(&samp);
 				}
+				timings[nb_timings].dts = dts;
+				timings[nb_timings].cts = cts;
+				nb_timings++;
 			}
 
+			gf_isom_sample_del(&samp);
+
 			if (is_fragmented) {
-				fprintf(dump, "\t%d", gf_isom_sample_was_traf_start(file, i+1, j+1) );
+				fprintf(dump, "\t%d", gf_isom_sample_is_fragment_start(file, i+1, j+1, NULL) );
 			}
 			fprintf(dump, "\n");
 			gf_set_progress("Dumping track timing", j+1, count);
@@ -908,13 +957,15 @@
 		fprintf(dump, "\n\n");
 		gf_set_progress("Dumping track timing", count, count);
 	}
+	if (timings) gf_free(timings);
+
 	if (inName) gf_fclose(dump);
-	if (has_error) fprintf(stderr, "\tFile has CTTS table errors\n");
+	if (has_ctts_error) fprintf(stderr, "\tFile has CTTS table errors\n");
 }
 
 
 
-static u32 read_nal_size_hdr(char *ptr, u32 nalh_size)
+static u32 read_nal_size_hdr(u8 *ptr, u32 nalh_size)
 {
 	u32 nal_size=0;
 	u32 v = nalh_size;
@@ -928,393 +979,31 @@
 }
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-
-static void dump_sei(FILE *dump, u8 *ptr, u32 ptr_size, Bool is_hevc)
-{
-	u32 sei_idx = 0;
-	u32 i = is_hevc ? 2 : 1;
-	u8 *sei_no_epb = NULL;
-	u32 sei_no_epb_size = 0;
-	fprintf(dump, " SEI=\"");
-
-
-	/*PPS still contains emulation bytes*/
-	sei_no_epb = gf_malloc(ptr_size + 1/*for SEI null string termination*/);
-	sei_no_epb_size = gf_media_nalu_remove_emulation_bytes((const char *) ptr, (char *) sei_no_epb, ptr_size);
-
-
-	while (i+2 < sei_no_epb_size) {
-		u32 sei_type = 0;
-		u32 sei_size = 0;
-		while (sei_no_epb[i] == 0xFF) {
-			sei_type+= 255;
-			i++;
-		}
-		sei_type += sei_no_epb[i];
-		i++;
-		while (sei_no_epb[i] == 0xFF) {
-			sei_size += 255;
-			i++;
-		}
-		sei_size += sei_no_epb[i];
-		i++;
-		i+=sei_size;
-
-		if (sei_idx) fprintf(dump, ",");
-		fprintf(dump, "(type=%u, size=%u)", sei_type, sei_size);
-		sei_idx++;
-		if (sei_no_epb[i]== 0x80) {
-			i=sei_no_epb_size;
-			break;
-		}
-	}
-	if (i != sei_no_epb_size) {
-		fprintf(dump, "(garbage at end)");
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("dump_sei(): garbage at end for index=%u (size of SEI(s)=%u)"));
-	}
-	fprintf(dump, "\"");
-	gf_free(sei_no_epb);
-}
-
-static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, HEVCState *hevc, AVCState *avc, u32 nalh_size, Bool dump_crc)
-{
-	s32 res;
-	u8 type, nal_ref_idc, hdr;
-	u8 dependency_id, quality_id, temporal_id;
-	u8 track_ref_index;
-	s8 sample_offset;
-	u32 data_offset, data_size;
-	s32 idx;
-	GF_BitStream *bs;
-
-
-	if (!ptr_size) {
-		fprintf(dump, "error=\"invalid nal size 0\"");
-		return;
-	}
-
-	if (dump_crc) fprintf(dump, "crc=\"%u\" ", gf_crc_32(ptr, ptr_size) );
-
-	if (hevc) {
-#ifndef GPAC_DISABLE_HEVC
-		res = gf_media_hevc_parse_nalu(ptr, ptr_size, hevc, &type, &temporal_id, &quality_id);
-
-		fprintf(dump, "code=\"%d\" type=\"", type);
-		switch (type) {
-		case GF_HEVC_NALU_SLICE_TRAIL_N:
-			fputs("TRAIL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TRAIL_R:
-			fputs("TRAIL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TSA_N:
-			fputs("TSA_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_TSA_R:
-			fputs("TSA_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_STSA_N:
-			fputs("STSA_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_STSA_R:
-			fputs("STSA_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RADL_N:
-			fputs("RADL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RADL_R:
-			fputs("RADL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RASL_N:
-			fputs("RASL_N slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_RASL_R:
-			fputs("RASL_R slice segment", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_W_LP:
-			fputs("Broken link access slice (W LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-			fputs("Broken link access slice (W DLP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_BLA_N_LP:
-			fputs("Broken link access slice (N LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_IDR_W_DLP:
-			fputs("IDR slice (W DLP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_IDR_N_LP:
-			fputs("IDR slice (N LP)", dump);
-			break;
-		case GF_HEVC_NALU_SLICE_CRA:
-			fputs("CRA slice", dump);
-			break;
-
-		case GF_HEVC_NALU_VID_PARAM:
-			gf_media_hevc_read_vps(ptr, ptr_size, hevc);
-			fputs("Video Parameter Set", dump);
-			break;
-		case GF_HEVC_NALU_SEQ_PARAM:
-			gf_media_hevc_read_sps(ptr, ptr_size, hevc);
-			fputs("Sequence Parameter Set", dump);
-			break;
-		case GF_HEVC_NALU_PIC_PARAM:
-			gf_media_hevc_read_pps(ptr, ptr_size, hevc);
-			fputs("Picture Parameter Set", dump);
-			break;
-		case GF_HEVC_NALU_ACCESS_UNIT:
-			fputs("AU Delimiter", dump);
-			fprintf(dump, "\" primary_pic_type=\"%d", ptr[2] >> 5);
-			break;
-		case GF_HEVC_NALU_END_OF_SEQ:
-			fputs("End of Sequence", dump);
-			break;
-		case GF_HEVC_NALU_END_OF_STREAM:
-			fputs("End of Stream", dump);
-			break;
-		case GF_HEVC_NALU_FILLER_DATA:
-			fputs("Filler Data", dump);
-			break;
-		case GF_HEVC_NALU_SEI_PREFIX:
-			fputs("SEI Prefix", dump);
-			break;
-		case GF_HEVC_NALU_SEI_SUFFIX:
-			fputs("SEI Suffix", dump);
-			break;
-		case 48:
-			fputs("HEVCAggregator", dump);
-			break;
-		case 49:
-		{
-			u32 remain = ptr_size-2;
-			char *s = ptr+2;
-
-			fputs("HEVCExtractor ", dump);
-			while (remain) {
-				u32 mode = s[0];
-				remain -= 1;
-				s += 1;
-				if (mode) {
-					u32 len = s[0];
-					if (len+1>remain) {
-						fprintf(dump, "error=\"invalid inband data extractor size: %d vs %d remaining\"", len, remain);
-						return;
-					}
-					remain -= len+1;
-					s += len+1;
-					fprintf(dump, "\" inband_size=\"%d", len);
-				} else {
-					if (remain < 2 + 2*nalh_size) {
-						fprintf(dump, "error=\"invalid ref data extractor size: %d vs %d remaining\"", 2 + 2*nalh_size, remain);
-						return;
-					}
-					track_ref_index = (u8) s[0];
-					sample_offset = (s8) s[1];
-					data_offset = read_nal_size_hdr(&s[2], nalh_size);
-					data_size = read_nal_size_hdr(&s[2+nalh_size], nalh_size);
-					fprintf(dump, "\" track_ref_index=\"%d\" sample_offset=\"%d\" data_offset=\"%d\" data_size=\"%d", track_ref_index, sample_offset, data_offset, data_size);
-
-					remain -= 2 + 2*nalh_size;
-					s += 2 + 2*nalh_size;
-				}
-			}
-		}
-			break;
-		default:
-			fprintf(dump, "UNKNOWN (parsing return %d)", res);
-			break;
-		}
-		fputs("\"", dump);
-
-		if ((type==GF_HEVC_NALU_SEI_PREFIX) || (type==GF_HEVC_NALU_SEI_SUFFIX)) {
-			dump_sei(dump, (u8 *) ptr, ptr_size, hevc ? GF_TRUE : GF_FALSE);
-		}
-
-		if (type<GF_HEVC_NALU_VID_PARAM) {
-
-			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);
-			fprintf(dump, " first_slice_in_pic=\"%d\"", hevc->s_info.first_slice_segment_in_pic_flag);
-			fprintf(dump, " dependent_slice_segment=\"%d\"", hevc->s_info.dependent_slice_segment_flag);
-		}
-
-		fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", quality_id, temporal_id);
-
-#endif //GPAC_DISABLE_HEVC
-		return;
-	}
-
-	bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
-	hdr = gf_bs_read_u8(bs);
-	type = hdr & 0x1F;
-	nal_ref_idc = hdr & 0x60;
-	nal_ref_idc>>=5;
-	fprintf(dump, "code=\"%d\" type=\"", type);
-	res = 0;
-	switch (type) {
-	case GF_AVC_NALU_NON_IDR_SLICE:
-		res = gf_media_avc_parse_nalu(bs, ptr[0], avc);
-		fputs("Non IDR slice", dump);
-
-		if (res>=0)
-			fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
-		break;
-	case GF_AVC_NALU_DP_A_SLICE:
-		fputs("DP Type A slice", dump);
-		break;
-	case GF_AVC_NALU_DP_B_SLICE:
-		fputs("DP Type B slice", dump);
-		break;
-	case GF_AVC_NALU_DP_C_SLICE:
-		fputs("DP Type C slice", dump);
-		break;
-	case GF_AVC_NALU_IDR_SLICE:
-		res = gf_media_avc_parse_nalu(bs, ptr[0], avc);
-		fputs("IDR slice", dump);
-		if (res>=0)
-			fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
-		break;
-	case GF_AVC_NALU_SEI:
-		fputs("SEI Message", dump);
-		break;
-	case GF_AVC_NALU_SEQ_PARAM:
-		fputs("SequenceParameterSet", dump);
-		idx = gf_media_avc_read_sps(ptr, ptr_size, avc, 0, NULL);
-		assert (idx >= 0);
-		fprintf(dump, "\" sps_id=\"%d", idx);
-		fprintf(dump, "\" frame_mbs_only_flag=\"%d", avc->sps->frame_mbs_only_flag);
-		fprintf(dump, "\" mb_adaptive_frame_field_flag=\"%d", avc->sps->mb_adaptive_frame_field_flag);
-		fprintf(dump, "\" vui_parameters_present_flag=\"%d", avc->sps->vui_parameters_present_flag);
-		fprintf(dump, "\" max_num_ref_frames=\"%d", avc->sps->max_num_ref_frames);
-		fprintf(dump, "\" gaps_in_frame_num_value_allowed_flag=\"%d", avc->sps->gaps_in_frame_num_value_allowed_flag);
-		fprintf(dump, "\" chroma_format_idc=\"%d", avc->sps->chroma_format);
-		fprintf(dump, "\" bit_depth_luma_minus8=\"%d", avc->sps->luma_bit_depth_m8);
-		fprintf(dump, "\" bit_depth_chroma_minus8=\"%d", avc->sps->chroma_bit_depth_m8);
-		fprintf(dump, "\" width=\"%d", avc->sps->width);
-		fprintf(dump, "\" height=\"%d", avc->sps->height);
-		fprintf(dump, "\" crop_top=\"%d", avc->sps->crop.top);
-		fprintf(dump, "\" crop_left=\"%d", avc->sps->crop.left);
-		fprintf(dump, "\" crop_bottom=\"%d", avc->sps->crop.bottom);
-		fprintf(dump, "\" crop_right=\"%d", avc->sps->crop.right);
-		if (avc->sps->vui_parameters_present_flag) {
-			fprintf(dump, "\" vui_video_full_range_flag=\"%d", avc->sps->vui.video_full_range_flag);
-			fprintf(dump, "\" vui_video_signal_type_present_flag=\"%d", avc->sps->vui.video_signal_type_present_flag);
-			fprintf(dump, "\" vui_aspect_ratio_info_present_flag=\"%d", avc->sps->vui.aspect_ratio_info_present_flag);
-			fprintf(dump, "\" vui_aspect_ratio_num=\"%d", avc->sps->vui.par_num);
-			fprintf(dump, "\" vui_aspect_ratio_den=\"%d", avc->sps->vui.par_den);
-			fprintf(dump, "\" vui_overscan_info_present_flag=\"%d", avc->sps->vui.overscan_info_present_flag);
-			fprintf(dump, "\" vui_colour_description_present_flag=\"%d", avc->sps->vui.colour_description_present_flag);
-			fprintf(dump, "\" vui_colour_primaries=\"%d", avc->sps->vui.colour_primaries);
-			fprintf(dump, "\" vui_transfer_characteristics=\"%d", avc->sps->vui.transfer_characteristics);
-			fprintf(dump, "\" vui_matrix_coefficients=\"%d", avc->sps->vui.matrix_coefficients);
-			fprintf(dump, "\" vui_low_delay_hrd_flag=\"%d", avc->sps->vui.low_delay_hrd_flag);
-		}
-		break;
-	case GF_AVC_NALU_PIC_PARAM:
-		fputs("PictureParameterSet", dump);
-		idx = gf_media_avc_read_pps(ptr, ptr_size, avc);
-		assert (idx >= 0);
-		fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", idx, avc->pps[idx].sps_id);
-		fprintf(dump, "\" entropy_coding_mode_flag=\"%d", avc->pps[idx].entropy_coding_mode_flag);
-
-		break;
-	case GF_AVC_NALU_ACCESS_UNIT:
-		fputs("AccessUnit delimiter", dump);
-		fprintf(dump, "\" primary_pic_type=\"%d", gf_bs_read_u8(bs) >> 5);
-		break;
-	case GF_AVC_NALU_END_OF_SEQ:
-		fputs("EndOfSequence", dump);
-		break;
-	case GF_AVC_NALU_END_OF_STREAM:
-		fputs("EndOfStream", dump);
-		break;
-	case GF_AVC_NALU_FILLER_DATA:
-		fputs("Filler data", dump);
-		break;
-	case GF_AVC_NALU_SEQ_PARAM_EXT:
-		fputs("SequenceParameterSetExtension", dump);
-		break;
-	case GF_AVC_NALU_SVC_PREFIX_NALU:
-		fputs("SVCPrefix", dump);
-		break;
-	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-		fputs("SVCSubsequenceParameterSet", dump);
-		idx = gf_media_avc_read_sps(ptr, ptr_size, avc, 1, NULL);
-		assert (idx >= 0);
-		fprintf(dump, "\" sps_id=\"%d", idx - GF_SVC_SSPS_ID_SHIFT);
-		break;
-	case GF_AVC_NALU_SLICE_AUX:
-		fputs("Auxiliary Slice", dump);
-		break;
-
-	case GF_AVC_NALU_SVC_SLICE:
-		gf_media_avc_parse_nalu(bs, ptr[0], avc);
-		fputs(is_svc ? "SVCSlice" : "CodedSliceExtension", dump);
-		dependency_id = (ptr[2] & 0x70) >> 4;
-		quality_id = (ptr[2] & 0x0F);
-		temporal_id = (ptr[3] & 0xE0) >> 5;
-		fprintf(dump, "\" dependency_id=\"%d\" quality_id=\"%d\" temporal_id=\"%d", dependency_id, quality_id, temporal_id);
-		fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
-		break;
-	case 30:
-		fputs("SVCAggregator", dump);
-		break;
-	case 31:
-		fputs("SVCExtractor", dump);
-		track_ref_index = (u8) ptr[4];
-		sample_offset = (s8) ptr[5];
-		data_offset = read_nal_size_hdr(&ptr[6], nalh_size);
-		data_size = read_nal_size_hdr(&ptr[6+nalh_size], nalh_size);
-		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:
-		fputs("UNKNOWN", dump);
-		break;
-	}
-	fputs("\"", dump);
-
-	if (nal_ref_idc) {
-		fprintf(dump, " nal_ref_idc=\"%d\"", nal_ref_idc);
-	}
-
-	if (type==GF_AVC_NALU_SEI) {
-		dump_sei(dump, (u8 *) ptr, ptr_size, GF_FALSE);
-	}
-
-	if (res<0)
-		fprintf(dump, " status=\"error decoding slice\"");
-
-	if (bs) gf_bs_del(bs);
-}
+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);
 #endif
 
-void dump_isom_nal_ex(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
+
+static void dump_isom_nal_ex(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, u32 dump_flags)
 {
-	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
+	u32 i, j, count, nb_descs, track, nalh_size, timescale, cur_extract_mode;
 	s32 countRef;
-	Bool is_adobe_protection = GF_FALSE;
-#ifndef GPAC_DISABLE_AV_PARSERS
+	Bool is_adobe_protected = GF_FALSE;
+	Bool is_cenc_protected = GF_FALSE;
 	Bool is_hevc = GF_FALSE;
+#ifndef GPAC_DISABLE_AV_PARSERS
 	AVCState avc;
 	HEVCState hevc;
+#endif
 	GF_AVCConfig *avccfg, *svccfg;
 	GF_HEVCConfig *hevccfg, *lhvccfg;
 	GF_AVCConfigSlot *slc;
-#endif
+	Bool has_svcc = GF_FALSE;
 
 	track = gf_isom_get_track_by_id(file, trackID);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	memset(&avc, 0, sizeof(AVCState));
-	avccfg = gf_isom_avc_config_get(file, track, 1);
-	svccfg = gf_isom_svc_config_get(file, track, 1);
 	memset(&hevc, 0, sizeof(HEVCState));
-	hevccfg = gf_isom_hevc_config_get(file, track, 1);
-	lhvccfg = gf_isom_lhvc_config_get(file, track, 1);
-	if (!avccfg && !svccfg && !hevccfg && !lhvccfg) {
-		fprintf(stderr, "Error: Track #%d is not NALU-based!\n", trackID);
-		return;
-	}
 #endif
 
 	count = gf_isom_get_sample_count(file, track);
@@ -1323,84 +1012,132 @@
 
 	cur_extract_mode = gf_isom_get_nalu_extract_mode(file, track);
 
+	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;
+	}
+
 	fprintf(dump, "<NALUTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-	//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;
-		gf_isom_get_reference(file, track, GF_ISOM_REF_TBAS, 1, &tk);
-		hevccfg = gf_isom_hevc_config_get(file, tk, 1);
-	}
-	fprintf(dump, " <NALUConfig>\n");
 
-#define DUMP_ARRAY(arr, name, loc)\
+#define DUMP_ARRAY(arr, name, loc, _is_svc)\
+	if (arr) {\
+		fprintf(dump, "  <%sArray location=\"%s\">\n", name, loc);\
+		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");\
+		}\
+		fprintf(dump, "  </%sArray>\n", name);\
+	}\
+
+#else
+
+#define DUMP_ARRAY(arr, name, loc, _is_svc)\
 	if (arr) {\
 		fprintf(dump, "  <%sArray location=\"%s\">\n", name, loc);\
 		for (i=0; i<gf_list_count(arr); i++) {\
 			slc = gf_list_get(arr, i);\
-			fprintf(dump, "   <NALU number=\"%d\" size=\"%d\" ", i+1, slc->size);\
-			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size, dump_crc);\
+			fprintf(dump, "   <NALU size=\"%d\" ", slc->size);\
 			fprintf(dump, "/>\n");\
 		}\
 		fprintf(dump, "  </%sArray>\n", name);\
 	}\
 
+#endif
+
 	nalh_size = 0;
 
-	if (avccfg) {
-		nalh_size = avccfg->nal_unit_size;
+	for (j=0; j<nb_descs; j++) {
+		GF_AVCConfig *mvccfg;
+		Bool is_svc;
 
-		DUMP_ARRAY(avccfg->sequenceParameterSets, "AVCSPS", "avcC")
-		DUMP_ARRAY(avccfg->pictureParameterSets, "AVCPPS", "avcC")
-		DUMP_ARRAY(avccfg->sequenceParameterSetExtensions, "AVCSPSEx", "avcC")
-	}
-	if (svccfg) {
-		if (!nalh_size) nalh_size = svccfg->nal_unit_size;
-		DUMP_ARRAY(svccfg->sequenceParameterSets, "SVCSPS", "svcC")
-		DUMP_ARRAY(svccfg->pictureParameterSets, "SVCPPS", "svcC")
-	}
-	if (hevccfg) {
-#ifndef GPAC_DISABLE_HEVC
-		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);
-			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCSPS", "hvcC")
-			} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCPPS", "hvcC")
-			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCVPS", "hvcC")
-			} else {
-				DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "hvcC")
+		avccfg = gf_isom_avc_config_get(file, track, j+1);
+		svccfg = gf_isom_svc_config_get(file, track, j+1);
+		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);
+
+		is_svc = (svccfg!=NULL) ? 1:0;
+
+		//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;
+			gf_isom_get_reference(file, track, GF_ISOM_REF_TBAS, 1, &tk);
+			hevccfg = gf_isom_hevc_config_get(file, tk, 1);
+		}
+
+		fprintf(dump, " <NALUConfig>\n");
+
+		if (!avccfg && !svccfg && !hevccfg && !lhvccfg) {
+			fprintf(stderr, "Error: Track #%d is not NALU-based!\n", trackID);
+			return;
+		}
+
+		if (avccfg) {
+			nalh_size = avccfg->nal_unit_size;
+
+			DUMP_ARRAY(avccfg->sequenceParameterSets, "AVCSPS", "avcC", is_svc);
+			DUMP_ARRAY(avccfg->pictureParameterSets, "AVCPPS", "avcC", is_svc)
+			DUMP_ARRAY(avccfg->sequenceParameterSetExtensions, "AVCSPSEx", "avcC", is_svc)
+		}
+		if (is_svc) {
+			if (!nalh_size) nalh_size = svccfg->nal_unit_size;
+			DUMP_ARRAY(svccfg->sequenceParameterSets, "SVCSPS", "svcC", is_svc)
+			DUMP_ARRAY(svccfg->pictureParameterSets, "SVCPPS", "svcC", is_svc)
+		}
+		if (mvccfg) {
+			if (!nalh_size) nalh_size = mvccfg->nal_unit_size;
+			DUMP_ARRAY(mvccfg->sequenceParameterSets, "SVCSPS", "mvcC", is_svc)
+			DUMP_ARRAY(mvccfg->pictureParameterSets, "SVCPPS", "mvcC", is_svc)
+		}
+		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);
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCSPS", "hvcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCPPS", "hvcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCVPS", "hvcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "hvcC", 0)
+				}
 			}
 		}
-#endif
-	}
-	if (lhvccfg) {
-#ifndef GPAC_DISABLE_HEVC
-		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);
-			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCSPS", "lhcC")
-			} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCPPS", "lhcC")
-			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-				DUMP_ARRAY(ar->nalus, "HEVCVPS", "lhcC")
-			} else {
-				DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "lhcC")
+		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);
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCSPS", "lhcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCPPS", "lhcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCVPS", "lhcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "lhcC", 0)
+				}
 			}
 		}
-#endif
-	}
+		fprintf(dump, " </NALUConfig>\n");
 
-#endif
-	fprintf(dump, " </NALUConfig>\n");
+		if (avccfg) gf_odf_avc_cfg_del(avccfg);
+		if (svccfg) {
+			gf_odf_avc_cfg_del(svccfg);
+			has_svcc = GF_TRUE;
+		}
+		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+		if (lhvccfg) gf_odf_hevc_cfg_del(lhvccfg);
+	}
 
 	/*fixme: for dumping encrypted track: we don't have neither avccfg nor svccfg*/
 	if (!nalh_size) nalh_size = 4;
@@ -1409,7 +1146,7 @@
 	countRef = gf_isom_get_reference_count(file, track, GF_ISOM_REF_SCAL);
 	if (countRef > 0)
 	{
-		u32 refTrackID;
+		GF_ISOTrackID refTrackID;
 		fprintf(dump, " <SCALReferences>\n");
 		for (i = 1; i <= (u32) countRef; i++)
 		{
@@ -1422,26 +1159,38 @@
 
 	fprintf(dump, " <NALUSamples>\n");
 	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	is_adobe_protection = gf_isom_is_adobe_protection_media(file, track, 1);
+	is_adobe_protected = gf_isom_is_adobe_protection_media(file, track, 1);
+	is_cenc_protected = gf_isom_is_cenc_media(file, track, 1);
 	for (i=0; i<count; i++) {
 		u64 dts, cts;
-		u32 size, nal_size, idx;
-		char *ptr;
-		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
+		Bool is_rap;
+		u32 size, nal_size, idx, di;
+		u8 *ptr;
+		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, &di);
 		if (!samp) {
 			fprintf(dump, "\n", i+1);
 			continue;
 		}
 		dts = samp->DTS;
 		cts = dts + (s32) samp->CTS_Offset;
+		is_rap = samp->IsRAP;
+		if (!is_rap) gf_isom_get_sample_rap_roll_info(file, track, i+1, &is_rap, NULL, NULL);
+
+		if (dump_flags&2) {
+			fprintf(dump, "  <Sample size=\"%d\" RAP=\"%d\"", samp->dataLength, is_rap);
+		} else {
+			fprintf(dump, "  <Sample DTS=\""LLD"\" CTS=\""LLD"\" size=\"%d\" RAP=\"%d\"", dts, cts, samp->dataLength, is_rap);
+		}
+		if (nb_descs>1)
+			fprintf(dump, " sample_description=\"%d\"", di);
+		fprintf(dump, " >\n");
 
-		fprintf(dump, "  <Sample number=\"%d\" DTS=\""LLD"\" CTS=\""LLD"\" size=\"%d\" RAP=\"%d\" >\n", i+1, dts, cts, samp->dataLength, samp->IsRAP);
 		if (cts<dts) fprintf(dump, "\n");
 
 		idx = 1;
 		ptr = samp->data;
 		size = samp->dataLength;
-		if (is_adobe_protection) {
+		if (is_adobe_protected) {
 			u8 encrypted_au = ptr[0];
 			if (encrypted_au) {
 				fprintf(dump, "   \n", i+1);
@@ -1457,13 +1206,21 @@
 			nal_size = read_nal_size_hdr(ptr, nalh_size);
 			ptr += nalh_size;
 
-			if (nalh_size + nal_size > size) {
+			if (nal_size >= UINT_MAX-nalh_size || nalh_size + nal_size > size) {
 				fprintf(dump, "   \n", idx, nal_size, size);
 				break;
 			} else {
-				fprintf(dump, "   <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
+				fprintf(dump, "   <NALU size=\"%d\" ", nal_size);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc ? &hevc : NULL, &avc, nalh_size, dump_crc);
+				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);
+					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
 				fprintf(dump, "/>\n");
 			}
@@ -1480,33 +1237,46 @@
 	fprintf(dump, " </NALUSamples>\n");
 	fprintf(dump, "</NALUTrack>\n");
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (avccfg) gf_odf_avc_cfg_del(avccfg);
-	if (svccfg) gf_odf_avc_cfg_del(svccfg);
-#ifndef GPAC_DISABLE_HEVC
-	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
-	if (lhvccfg) gf_odf_hevc_cfg_del(lhvccfg);
-#endif
-
-#endif
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 }
 
-void dump_isom_obu(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc);
+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);
 
-void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool dump_crc)
+void dump_isom_nal(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, u32 dump_flags)
 {
 	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);
+
 		u32 track = gf_isom_get_track_by_id(file, trackID);
+		esd = gf_isom_get_esd(file, track, 1);
 
-		if (gf_isom_get_media_subtype(file, track, 1) == GF_ISOM_SUBTYPE_AV01) {
+		if (!esd || !esd->decoderConfig) {
+			switch (gf_isom_get_media_subtype(file, track, 1)) {
+			case GF_ISOM_SUBTYPE_AV01:
+				is_av1 = GF_TRUE;
+				break;
+			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:
+				is_prores = GF_TRUE;
+				break;
+			}
+		}
+		else if (esd->decoderConfig->objectTypeIndication == GF_CODECID_AV1) {
 			is_av1 = GF_TRUE;
 		}
+		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");
@@ -1519,79 +1289,20 @@
 	}
 
 	if (is_av1)
-		dump_isom_obu(file, trackID, dump, dump_crc);
+		dump_isom_obu(file, trackID, dump, dump_flags);
+	else if (is_prores)
+		dump_qt_prores(file, trackID, dump, dump_flags);
 	else
-		dump_isom_nal_ex(file, trackID, dump, dump_crc);
+		dump_isom_nal_ex(file, trackID, dump, dump_flags);
 
 	if (inName) gf_fclose(dump);
 }
 
-
 #ifndef GPAC_DISABLE_AV_PARSERS
-static void dump_obu(FILE *dump, u32 idx, AV1State *av1, char *obu, u32 obu_length, ObuType obu_type, u32 obu_size, u32 hdr_size, Bool dump_crc)
-{
-#define DUMP_OBU_INT(_v) fprintf(dump, #_v"=\"%d\" ", av1->_v);
-#define DUMP_OBU_INT2(_n, _v) fprintf(dump, _n"=\"%d\" ", _v);
-
-	fprintf(dump, "   <OBU number=\"%d\" size=\"%d\" type=\"%s\" header_size=\"%d\" has_size_field=\"%d\" has_ext=\"%d\" temporalID=\"%d\" spatialID=\"%d\" ", idx, (u32) obu_size, 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) fprintf(dump, "crc=\"%u\" ", gf_crc_32(obu, obu_length) );
-	switch (obu_type) {
-	case OBU_SEQUENCE_HEADER:
-		DUMP_OBU_INT(width)
-		DUMP_OBU_INT(height)
-		DUMP_OBU_INT(bit_depth)
-		DUMP_OBU_INT(still_picture)
-		DUMP_OBU_INT(OperatingPointIdc)
-		DUMP_OBU_INT(color_range)
-		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)
-		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) fprintf(dump, "frame_type=\"key\" ");
-			else if (av1->frame_state.frame_type==AV1_INTER_FRAME) fprintf(dump, "frame_type=\"inter\" ");
-			else if (av1->frame_state.frame_type==AV1_INTRA_ONLY_FRAME) fprintf(dump, "frame_type=\"intra_only\" ");
-			else if (av1->frame_state.frame_type==AV1_SWITCH_FRAME) fprintf(dump, "frame_type=\"switch\" ");
-			fprintf(dump, "refresh_frame_flags=\"%d\" ", av1->frame_state.refresh_frame_flags);
-
-			DUMP_OBU_INT2("show_frame", av1->frame_state.show_frame);
-			if (av1->frame_state.show_existing_frame) {
-				DUMP_OBU_INT2("show_existing_frame", av1->frame_state.show_existing_frame);
-			} else {
-				DUMP_OBU_INT2("show_existing_frame", 0);
-			}
-		}
-		if (obu_type==OBU_FRAME_HEADER)
-			break;
-
-	case OBU_TILE_GROUP:
-		if (av1->frame_state.nb_tiles_in_obu) {
-			DUMP_OBU_INT2("nb_tiles", av1->frame_state.nb_tiles_in_obu)
-		} else {
-			fprintf(dump, "nb_tiles=\"unknown\" ");
-		}
-		break;
-	default:
-		break;
-
-	}
-	fprintf(dump, "/>\n");
-}
+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
 
-void dump_isom_obu(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
+static void dump_isom_obu(GF_ISOFile *file, GF_ISOTrackID trackID, FILE *dump, Bool dump_crc)
 {
 #ifndef GPAC_DISABLE_AV_PARSERS
 	u32 i, count, track, timescale;
@@ -1604,7 +1315,7 @@
 
 	track = gf_isom_get_track_by_id(file, trackID);
 
-	memset(&av1, 0, sizeof(AV1State));
+	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);
@@ -1618,14 +1329,12 @@
 
 	fprintf(dump, " <OBUConfig>\n");
 
-	idx = 1;
 	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((const char *)obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+		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);
-		dump_obu(dump, idx, &av1, (char*)obu->obu, (u32)obu->obu_length, obu_type, (u32)obu_size, hdr_size, dump_crc);
+		gf_inspect_dump_obu(dump, &av1, obu->obu, obu->obu_length, obu_type, obu_size, hdr_size, dump_crc);
 		gf_bs_del(bs);
-		idx++;
 	}
 	fprintf(dump, " </OBUConfig>\n");
 
@@ -1634,7 +1343,7 @@
 	for (i=0; i<count; i++) {
 		u64 dts, cts;
 		u32 size;
-		char *ptr;
+		u8 *ptr;
 		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
 		if (!samp) {
 			fprintf(dump, "\n", i+1);
@@ -1653,13 +1362,11 @@
 		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);
-
 			if (obu_size > size) {
 				fprintf(dump, "   \n", idx, (u32) obu_size, size);
 				break;
 			}
-
-			dump_obu(dump, idx, &av1, ptr, (u32)obu_size, obu_type, (u32) obu_size, hdr_size, dump_crc);
+			gf_inspect_dump_obu(dump, &av1, ptr, obu_size, obu_type, obu_size, hdr_size, dump_crc);
 			ptr += obu_size;
 			size -= (u32)obu_size;
 			idx++;
@@ -1675,10 +1382,51 @@
 	fprintf(dump, "</OBUTrack>\n");
 
 	if (av1.config) gf_odf_av1_cfg_del(av1.config);
+	gf_av1_reset_state(&av1, GF_TRUE);
+#endif
+}
+
+static void dump_qt_prores(GF_ISOFile *file, u32 trackID, FILE *dump, Bool dump_crc)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	u32 i, count, track, timescale;
+
+	track = gf_isom_get_track_by_id(file, trackID);
+
+	count = gf_isom_get_sample_count(file, track);
+	timescale = gf_isom_get_media_timescale(file, track);
+
+	fprintf(dump, "<ProResTrack trackID=\"%d\" SampleCount=\"%d\" TimeScale=\"%d\">\n", trackID, count, timescale);
+
+	for (i=0; i<count; i++) {
+		void gf_inspect_dump_prores(FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc);
+		u64 dts, cts;
+		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, NULL);
+		if (!samp) {
+			fprintf(dump, "\n", i+1);
+			continue;
+		}
+		dts = samp->DTS;
+		cts = dts + (s32) samp->CTS_Offset;
+
+		if (cts!=dts) fprintf(dump, "\n", cts, dts);
+		if (!samp->IsRAP) fprintf(dump, "\n");
+
+		fprintf(dump, "  <Sample number=\"%d\" CTS=\""LLD"\" size=\"%d\">\n", i+1, cts, samp->dataLength);
+
+		gf_inspect_dump_prores(dump, samp->data, samp->dataLength, dump_crc);
+		fprintf(dump, "  </Sample>\n");
+
+		gf_isom_sample_del(&samp);
+
+		fprintf(dump, "\n");
+		gf_set_progress("Analysing ProRes Track", i+1, count);
+	}
+	fprintf(dump, "</ProResTrack>\n");
 #endif
 }
 
-void dump_isom_saps(GF_ISOFile *file, u32 trackID, u32 dump_saps_mode, char *inName, Bool is_final_name)
+void dump_isom_saps(GF_ISOFile *file, GF_ISOTrackID trackID, u32 dump_saps_mode, char *inName, Bool is_final_name)
 {
 	FILE *dump;
 	u32 i, count;
@@ -1714,9 +1462,10 @@
 		Bool traf_start = 0;
 		u32 sap_type = 0;
 		u64 doffset;
+		
 		GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, &di, &doffset);
 
-		traf_start = gf_isom_sample_was_traf_start(file, track, i+1);
+		traf_start = gf_isom_sample_is_fragment_start(file, track, i+1, NULL);
 
 		sap_type = samp->IsRAP;
 		if (!sap_type) {
@@ -1762,9 +1511,9 @@
 {
 	u32 i, j;
 	FILE *dump;
-	char szBuf[1024];
 
 	if (inName) {
+		char szBuf[1024];
 		strcpy(szBuf, inName);
 		if (!is_final_name) strcat(szBuf, "_ismacryp.xml");
 		dump = gf_fopen(szBuf, "wt");
@@ -1797,12 +1546,11 @@
 }
 
 
-void dump_isom_timed_text(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type)
+void dump_isom_timed_text(GF_ISOFile *file, GF_ISOTrackID trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type)
 {
 	FILE *dump;
 	GF_Err e;
 	u32 track;
-	char szBuf[1024];
 
 	track = gf_isom_get_track_by_id(file, trackID);
 	if (!track) {
@@ -1820,6 +1568,7 @@
 	}
 
 	if (inName) {
+		char szBuf[1024];
 		char *ext;
 		ext = ((dump_type==GF_TEXTDUMPTYPE_SVG) ? "svg" : ((dump_type==GF_TEXTDUMPTYPE_SRT) ? "srt" : "ttxt"));
 		if (is_final_name) {
@@ -1853,13 +1602,12 @@
 	const char *sdp;
 	u32 size, i;
 	FILE *dump;
-	char szBuf[1024];
 
 	if (inName) {
-		char *ext;
+		char szBuf[1024];
 		strcpy(szBuf, inName);
 		if (!is_final_name) {
-			ext = strchr(szBuf, '.');
+			char *ext = strchr(szBuf, '.');
 			if (ext) ext[0] = 0;
 			strcat(szBuf, "_sdp.txt");
 		}
@@ -1892,15 +1640,15 @@
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
-GF_Err dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name, Bool do_track_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)
 {
 	GF_Err e;
 	FILE *dump = stdout;
 	Bool do_close=GF_FALSE;
-	char szBuf[1024];
 	if (!file) return GF_ISOM_INVALID_FILE;
 
 	if (inName) {
+		char szBuf[1024];
 		strcpy(szBuf, inName);
 		if (!is_final_name) {
 			strcat(szBuf, do_track_dump ? "_dump.xml" : "_info.xml");
@@ -1917,21 +1665,22 @@
 	if (do_track_dump) {
 		fprintf(dump, "<ISOBaseMediaFileTrace>\n");
 	}
-	e = gf_isom_dump(file, dump);
+	e = gf_isom_dump(file, dump, skip_init, skip_samples);
 	if (e) {
 		fprintf(stderr, "Error dumping ISO structure\n");
 	}
 
 	if (do_track_dump) {
-		u32 i, j;
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+		u32 i;
 		//because of dump mode we need to reopen in regular read mode to avoid mem leaks
 		GF_ISOFile *the_file = gf_isom_open(gf_isom_get_filename(file), GF_ISOM_OPEN_READ, NULL);
 		u32 tcount = gf_isom_get_track_count(the_file);
 		fprintf(dump, "<Tracks>\n");
-#ifndef GPAC_DISABLE_MEDIA_EXPORT
+
 		for (i=0; i<tcount; i++) {
 			GF_MediaExporter dumper;
-			u32 trackID = gf_isom_get_track_id(the_file, i+1);
+			GF_ISOTrackID trackID = gf_isom_get_track_id(the_file, i+1);
 			u32 mtype = gf_isom_get_media_type(the_file, i+1);
 			u32 msubtype = gf_isom_get_media_subtype(the_file, i+1, 1);
 			Bool fmt_handled = GF_FALSE;
@@ -1941,8 +1690,8 @@
 			dumper.dump_file = dump;
 
 			if (mtype == GF_ISOM_MEDIA_HINT) {
+#ifndef GPAC_DISABLE_ISOM_HINTING
 				char *name=NULL;
-				u32 scount;
 				if (msubtype==GF_ISOM_SUBTYPE_RTP) name = "RTPHintTrack";
 				else if (msubtype==GF_ISOM_SUBTYPE_SRTP) name = "SRTPHintTrack";
 				else if (msubtype==GF_ISOM_SUBTYPE_RRTP) name = "RTPReceptionHintTrack";
@@ -1952,12 +1701,15 @@
 
 				fprintf(dump, "<%s trackID=\"%d\">\n", name, trackID);
 
-				scount=gf_isom_get_sample_count(the_file, i+1);
+#ifndef GPAC_DISABLE_ISOM_HINTING
+				u32 j, scount=gf_isom_get_sample_count(the_file, i+1);
 				for (j=0; j<scount; j++) {
 					gf_isom_dump_hint_sample(the_file, i+1, j+1, dump);
 				}
+#endif
 				fprintf(dump, "</%s>\n", name);
 				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);
@@ -1965,7 +1717,7 @@
 			} else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) ) {
 
 				if (msubtype==GF_ISOM_SUBTYPE_WVTT) {
-					gf_webvtt_dump_iso_track(&dumper, NULL, i+1, GF_FALSE, GF_TRUE);
+					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);
@@ -1974,9 +1726,9 @@
 			}
 
 			if (!fmt_handled) {
-				dumper.nhml_only = GF_TRUE;
-				dumper.flags = GF_EXPORT_NATIVE | GF_EXPORT_NHML | GF_EXPORT_NHML_FULL;
-				gf_media_export_nhml(&dumper, GF_FALSE);
+				dumper.flags = GF_EXPORT_NHML | GF_EXPORT_NHML_FULL;
+				dumper.print_stats_graph = fs_dump_flags;
+				gf_media_export(&dumper);
 			}
 		}
 #else
@@ -2033,7 +1785,7 @@
 	} else {
 		time -= 2082844800;
 		now = (u32) time;
-		sprintf(szTime, "GMT %s", asctime(gmtime(&now)) );
+		sprintf(szTime, "GMT %s", asctime(gf_gmtime(&now)) );
 	}
 	return szTime;
 }
@@ -2058,7 +1810,7 @@
 
 GF_Err dump_isom_udta(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_udta_type, u32 dump_udta_track)
 {
-	char szName[1024], *data;
+	u8 *data;
 	FILE *t;
 	bin128 uuid;
 	u32 count, res;
@@ -2079,6 +1831,7 @@
 		return e;
 	}
 	if (inName) {
+		char szName[1024];
 		if (is_final_name)
 			strcpy(szName, inName);
 		else
@@ -2093,12 +1846,11 @@
 	} else {
 		t = stdout;
 	}
-	res = (u32) fwrite(data, 1, count, t);
+	res = (u32) gf_fwrite(data+8, count-8, t);
 	if (inName) gf_fclose(t);
 	gf_free(data);
-	if (count != res) {
+	if (count-8 != res) {
 		fprintf(stderr, "Error writing udta to file\n");
-		gf_free(data);
 		return GF_IO_ERR;
 	}
 	return GF_OK;
@@ -2107,11 +1859,30 @@
 
 GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg)
 {
-	char szName[1024];
 	FILE *t;
 	u32 i, count;
+	u32 chap_tk = 0;
 	count = gf_isom_get_chapter_count(file, 0);
+
+	if (!count) {
+		for (i=0; i<gf_isom_get_track_count(file); i++) {
+			if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_CHAP)) {
+				GF_Err e = gf_isom_get_reference(file, i+1, GF_ISOM_REF_CHAP, 1, &chap_tk);
+				if (!e) break;
+			}
+		}
+		if (!chap_tk) {
+			fprintf(stderr, "No chapters or chapters track found in file\n");
+			return GF_OK;
+		}
+
+		fprintf(stderr, "Chapter track found, dumping to ttxt\n");
+		dump_isom_timed_text(file, gf_isom_get_track_id(file, chap_tk), inName, is_final_name, GF_FALSE, GF_TEXTDUMPTYPE_TTXT);
+		return GF_OK;
+
+	}
 	if (inName) {
+		char szName[1024];
 		strcpy(szName, inName);
 		if (!is_final_name) {
 			if (dump_ogg) {
@@ -2129,9 +1900,9 @@
 	for (i=0; i<count; i++) {
 		u64 chapter_time;
 		const char *name;
-		char szDur[20];
 		gf_isom_get_chapter(file, 0, i+1, &chapter_time, &name);
 		if (dump_ogg) {
+			char szDur[20];
 			fprintf(t, "CHAPTER%02d=%s\n", i+1, format_duration(chapter_time, 1000, szDur));
 			fprintf(t, "CHAPTER%02dNAME=%s\n", i+1, name);
 		} else {
@@ -2185,10 +1956,9 @@
 static void print_config_hash(GF_List *xps_array, char *szName)
 {
 	u32 i, j;
-	GF_AVCConfigSlot *slc;
 	u8 hash[20];
 	for (i=0; i<gf_list_count(xps_array); i++) {
-		slc = gf_list_get(xps_array, i);
+		GF_AVCConfigSlot *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]);
@@ -2196,10 +1966,16 @@
 	}
 }
 
-#if !defined(GPAC_DISABLE_HEVC) && !defined( GPAC_DISABLE_AV_PARSERS)
-void dump_hevc_track_info(GF_ISOFile *file, u32 trackNum, GF_HEVCConfig *hevccfg, HEVCState *hevc_state)
+void dump_hevc_track_info(GF_ISOFile *file, u32 trackNum, GF_HEVCConfig *hevccfg
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+	, HEVCState *hevc_state
+#endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
+	)
 {
-	u32 k, idx;
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+	u32 idx;
+#endif
+	u32 k;
 	Bool non_hevc_base_layer=GF_FALSE;
 	fprintf(stderr, "\t%s Info:", hevccfg->is_lhvc ? "LHVC" : "HEVC");
 	if (!hevccfg->is_lhvc)
@@ -2221,17 +1997,21 @@
 		if (ar->type==GF_HEVC_NALU_VID_PARAM) {
 			fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
 
+#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 idx=gf_media_hevc_read_vps(vps->data, vps->size, hevc_state);
-				if (hevccfg->is_lhvc && (idx>=0)) {
-					non_hevc_base_layer = ! hevc_state->vps[idx].base_layer_internal_flag;
+				s32 ps_idx=gf_media_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) && !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);
 		u32 width, height;
@@ -2255,8 +2035,8 @@
 				fprintf(stderr, "\nFailed to read SPS: %s\n\n", gf_error_to_string((e) ));
 			}
 		}
-
 	}
+#endif
 	if (!hevccfg->is_lhvc)
 		fprintf(stderr, "\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
 	else
@@ -2272,21 +2052,24 @@
 		else if (ar->type==GF_HEVC_NALU_VID_PARAM) print_config_hash(ar->nalus, "VPS");
 	}
 }
-#endif
 
 
-void DumpTrackInfo(GF_ISOFile *file, u32 trackID, Bool full_dump)
+void DumpTrackInfo(GF_ISOFile *file, GF_ISOTrackID trackID, Bool full_dump, Bool is_track_num)
 {
 	Float scale;
 	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;
+	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;
 	u64 time_slice, dur, size;
-	u8 bps;
 	GF_ESD *esd;
 	char szDur[50];
 	char *lang;
 
-	trackNum = gf_isom_get_track_by_id(file, trackID);
+	if (!is_track_num) {
+		trackNum = gf_isom_get_track_by_id(file, trackID);
+	} else {
+		trackNum = trackID;
+		trackID = gf_isom_get_track_id(file, trackNum);
+	}
 	if (!trackNum) {
 		fprintf(stderr, "No track with ID %d found\n", trackID);
 		return;
@@ -2297,7 +2080,7 @@
 	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));
 
-	nb_edits = gf_isom_get_edit_segment_count(file, trackNum);
+	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));
 
@@ -2316,7 +2099,7 @@
 	for (i = 0; i < count; i++) {
 		char *kind_scheme, *kind_value;
 		gf_isom_get_track_kind(file, trackNum, i, &kind_scheme, &kind_value);
-		fprintf(stderr, "Kind: %s - %s\n", kind_scheme, kind_value);
+		fprintf(stderr, "Kind: %s - %s\n", kind_scheme ? kind_scheme : "null", kind_value ? kind_value : "null");
 		if (kind_scheme) gf_free(kind_scheme);
 		if (kind_value) gf_free(kind_value);
 	}
@@ -2342,9 +2125,15 @@
 
 	print_udta(file, trackNum);
 
-	if (gf_isom_is_video_subtype(mtype) ) {
+	if (gf_isom_is_video_handler_type(mtype) ) {
 		s32 tx, ty;
 		u32 w, h;
+		u16 bit_depth;
+
+		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
+		gf_isom_get_visual_bit_depth(file, trackNum, 1, &bit_depth);
+		fprintf(stderr, "Visual Sample Entry Info: width=%d height=%d (depth=%d bits)\n", w, h, (int)bit_depth);
+
 		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);
 	}
@@ -2353,8 +2142,10 @@
 	gf_isom_set_nalu_extract_mode(file, trackNum, GF_ISOM_NALU_EXTRACT_INSPECT);
 
 	msub_type = gf_isom_get_media_subtype(file, trackNum, 1);
+	if (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP)
+		gf_isom_get_original_format_type(file, trackNum, 1, &msub_type);
+
 	if ((msub_type==GF_ISOM_SUBTYPE_MPEG4)
-	        || (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP)
 	        || (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
 	        || (msub_type==GF_ISOM_SUBTYPE_AVC2_H264)
 	        || (msub_type==GF_ISOM_SUBTYPE_AVC3_H264)
@@ -2375,7 +2166,7 @@
 			fprintf(stderr, "WARNING: Broken MPEG-4 Track\n");
 			if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
 		} else {
-			const char *st = gf_odf_stream_type_name(esd->decoderConfig->streamType);
+			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);
@@ -2390,7 +2181,7 @@
 				u32 w, h;
 				u16 rvc_predef;
 				w = h = 0;
-				if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
+				if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 					if (!esd->decoderConfig->decoderSpecificInfo) {
 #else
@@ -2414,16 +2205,12 @@
 					}
 #endif
 				} else if (gf_isom_get_avc_svc_type(file, trackNum, 1) != GF_ISOM_AVCTYPE_NONE) {
-#ifndef GPAC_DISABLE_AV_PARSERS
 					GF_AVCConfig *avccfg, *svccfg, *mvccfg;
-					GF_AVCConfigSlot *slc;
-					s32 par_n, par_d;
-#endif
 
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					if (full_dump) fprintf(stderr, "\t");
 					fprintf(stderr, "AVC/H264 Video - Visual Size %d x %d\n", w, h);
-#ifndef GPAC_DISABLE_AV_PARSERS
+
 					avccfg = gf_isom_avc_config_get(file, trackNum, 1);
 					svccfg = gf_isom_svc_config_get(file, trackNum, 1);
 					mvccfg = gf_isom_mvc_config_get(file, trackNum, 1);
@@ -2433,8 +2220,11 @@
 						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 );
 						fprintf(stderr, "\tNAL Unit length bits: %d\n", 8*avccfg->nal_unit_size);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
 						for (i=0; i<gf_list_count(avccfg->sequenceParameterSets); i++) {
-							slc = gf_list_get(avccfg->sequenceParameterSets, i);
+							s32 par_n, par_d;
+							GF_AVCConfigSlot *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;
@@ -2443,6 +2233,8 @@
 							}
 							if (!full_dump) break;
 						}
+#endif
+
 						if (avccfg->chroma_bit_depth) {
 							fprintf(stderr, "\tChroma format %s - Luma bit depth %d - chroma bit depth %d\n", gf_avc_hevc_get_chroma_format_name(avccfg->chroma_format), avccfg->luma_bit_depth, avccfg->chroma_bit_depth);
 						}
@@ -2455,9 +2247,11 @@
 					if (svccfg) {
 						fprintf(stderr, "\n\tSVC Info: %d SPS - %d PPS - Profile %s @ Level %g\n", gf_list_count(svccfg->sequenceParameterSets) , gf_list_count(svccfg->pictureParameterSets), gf_avc_get_profile_name(svccfg->AVCProfileIndication), ((Double)svccfg->AVCLevelIndication)/10.0 );
 						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++) {
-							slc = gf_list_get(svccfg->sequenceParameterSets, i);
+							GF_AVCConfigSlot *slc = gf_list_get(svccfg->sequenceParameterSets, i);
 							if (slc) {
+								s32 par_n, par_d;
 								u32 s_w, s_h, sps_id;
 								gf_avc_get_sps_info(slc->data, slc->size, &sps_id, &s_w, &s_h, &par_n, &par_d);
 								fprintf(stderr, "\t\tSPS ID %d - Visual Size %d x %d\n", sps_id, s_w, s_h);
@@ -2468,6 +2262,7 @@
 								}
 							}
 						}
+#endif
 						print_config_hash(svccfg->sequenceParameterSets, "SPS");
 						print_config_hash(svccfg->pictureParameterSets, "PPS");
 						print_config_hash(svccfg->sequenceParameterSetExtensions, "SPSEx");
@@ -2478,10 +2273,12 @@
 					if (mvccfg) {
 						fprintf(stderr, "\n\tMVC Info: %d SPS - %d PPS - Profile %s @ Level %g\n", gf_list_count(mvccfg->sequenceParameterSets) , gf_list_count(mvccfg->pictureParameterSets), gf_avc_get_profile_name(mvccfg->AVCProfileIndication), ((Double)mvccfg->AVCLevelIndication)/10.0 );
 						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++) {
-							slc = gf_list_get(mvccfg->sequenceParameterSets, i);
+							GF_AVCConfigSlot *slc = gf_list_get(mvccfg->sequenceParameterSets, i);
 							if (slc) {
 								u32 s_w, s_h, sps_id;
+								s32 par_n, par_d;
 								gf_avc_get_sps_info(slc->data, slc->size, &sps_id, &s_w, &s_h, &par_n, &par_d);
 								fprintf(stderr, "\t\tSPS ID %d - Visual Size %d x %d\n", sps_id, s_w, s_h);
 								if ((par_n>0) && (par_d>0)) {
@@ -2491,19 +2288,19 @@
 								}
 							}
 						}
+#endif
 						print_config_hash(mvccfg->sequenceParameterSets, "SPS");
 						print_config_hash(mvccfg->pictureParameterSets, "PPS");
 						gf_odf_avc_cfg_del(mvccfg);
 					}
-#endif /*GPAC_DISABLE_AV_PARSERS*/
 
-				} else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC)
-				           || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_LHVC)
+				} else if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_HEVC)
+				           || (esd->decoderConfig->objectTypeIndication==GF_CODECID_LHVC)
 				          ) {
+					GF_HEVCConfig *hevccfg, *lhvccfg;
 					GF_OperatingPointsInformation *oinf;
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					HEVCState hevc_state;
-					GF_HEVCConfig *hevccfg, *lhvccfg;
 					memset(&hevc_state, 0, sizeof(HEVCState));
 					hevc_state.sps_active_idx = -1;
 #endif
@@ -2511,18 +2308,17 @@
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					if (full_dump) fprintf(stderr, "\t");
 					fprintf(stderr, "HEVC Video - Visual Size %d x %d\n", w, h);
-#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					hevccfg = gf_isom_hevc_config_get(file, trackNum, 1);
 					lhvccfg = gf_isom_lhvc_config_get(file, trackNum, 1);
 
 					if (msub_type==GF_ISOM_SUBTYPE_HVT1) {
-						const char *data;
-						u32 size;
-						u32  is_default, x,y,w,h, id, independent;
+						const u8 *data;
+						u32 tsize;
+						u32  is_default, tx,ty,tw,th, id, independent;
 						Bool full_frame;
-						if (gf_isom_get_tile_info(file, trackNum, 1, &is_default, &id, &independent, &full_frame, &x, &y, &w, &h)) {
-							fprintf(stderr, "\tHEVC Tile - ID %d independent %d (x,y,w,h)=%d,%d,%d,%d \n", id, independent, x, y, w, h);
-						} else if (gf_isom_get_sample_group_info(file, trackNum, 1, GF_ISOM_SAMPLE_GROUP_TRIF, &is_default, &data, &size)) {
+						if (gf_isom_get_tile_info(file, trackNum, 1, &is_default, &id, &independent, &full_frame, &tx, &ty, &tw, &th)) {
+							fprintf(stderr, "\tHEVC Tile - ID %d independent %d (x,y,w,h)=%d,%d,%d,%d \n", id, independent, tx, ty, tw, th);
+						} else if (gf_isom_get_sample_group_info(file, trackNum, 1, GF_ISOM_SAMPLE_GROUP_TRIF, &is_default, &data, &tsize)) {
 							fprintf(stderr, "\tHEVC Tile track containing a tile set\n");
 						} else {
 							fprintf(stderr, "\tHEVC Tile track without tiling info\n");
@@ -2535,12 +2331,20 @@
 						fprintf(stderr, "\tHEVC Tile base track\n");
 					}
 					if (hevccfg) {
-						dump_hevc_track_info(file, trackNum, hevccfg, &hevc_state);
+						dump_hevc_track_info(file, trackNum, hevccfg
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+							, &hevc_state
+#endif
+						);
 						gf_odf_hevc_cfg_del(hevccfg);
 						fprintf(stderr, "\n");
 					}
 					if (lhvccfg) {
-						dump_hevc_track_info(file, trackNum, lhvccfg, &hevc_state);
+						dump_hevc_track_info(file, trackNum, lhvccfg
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
+							, &hevc_state
+#endif
+						);
 						gf_odf_hevc_cfg_del(lhvccfg);
 					}
 
@@ -2564,27 +2368,26 @@
 						fprintf(stderr, ") num_profile_tier_level %d ", gf_list_count(oinf->profile_tier_levels) );
 						fprintf(stderr, " num_operating_points %d dependency layers %d \n", gf_list_count(oinf->operating_points), gf_list_count(oinf->dependency_layers) );
 					}
-#endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
 				}
 
 				/*OGG media*/
-				else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_MEDIA_OGG) {
+				else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_THEORA) {
 					char *szName;
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 					if (full_dump) fprintf(stderr, "\t");
-					if (!strnicmp(&esd->decoderConfig->decoderSpecificInfo->data[3], "theora", 6)) szName = "Theora";
+					if (!strnicmp((char *) &esd->decoderConfig->decoderSpecificInfo->data[3], "theora", 6)) szName = "Theora";
 					else szName = "Unknown";
 					fprintf(stderr, "Ogg/%s video / GPAC Mux  - Visual Size %d x %d\n", szName, w, h);
 				}
-				else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_JPEG) {
+				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==GPAC_OTI_IMAGE_PNG) {
+				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==GPAC_OTI_IMAGE_JPEG_2000) {
+				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);
 				}
@@ -2605,11 +2408,11 @@
 #endif
 				Bool is_mp2 = GF_FALSE;
 				switch (esd->decoderConfig->objectTypeIndication) {
-				case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-				case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-				case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+				case GF_CODECID_AAC_MPEG2_MP:
+				case GF_CODECID_AAC_MPEG2_LCP:
+				case GF_CODECID_AAC_MPEG2_SSRP:
 					is_mp2 = GF_TRUE;
-				case GPAC_OTI_AUDIO_AAC_MPEG4:
+				case GF_CODECID_AAC_MPEG4:
 #ifndef GPAC_DISABLE_AV_PARSERS
 					if (!esd->decoderConfig->decoderSpecificInfo)
 						e = GF_NON_COMPLIANT_BITSTREAM;
@@ -2618,12 +2421,19 @@
 					if (full_dump) fprintf(stderr, "\t");
 					if (e) fprintf(stderr, "Corrupted AAC Config\n");
 					else {
+						char *signaling = "implicit";
 						char *heaac = "";
 						if (!is_mp2 && a_cfg.has_sbr) {
 							if (a_cfg.has_ps) heaac = "(HE-AAC v2) ";
 							else heaac = "(HE-AAC v1) ";
 						}
-						fprintf(stderr, "%s %s- %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), heaac, a_cfg.nb_chan, a_cfg.base_sr);
+						if (a_cfg.base_object_type==2) {
+							if (a_cfg.has_ps || a_cfg.has_sbr)
+								signaling = "backward compatible";
+						} else {
+							signaling = "hierarchical";
+						}
+						fprintf(stderr, "%s (AOT=%d %s) %s- %d Channel(s) - SampleRate %d", gf_m4a_object_type_name(a_cfg.base_object_type), a_cfg.base_object_type, signaling, heaac, a_cfg.nb_chan, a_cfg.base_sr);
 						if (is_mp2) fprintf(stderr, " (MPEG-2 Signaling)");
 						if (a_cfg.has_sbr) fprintf(stderr, " - SBR: SampleRate %d Type %s", a_cfg.sbr_sr, gf_m4a_object_type_name(a_cfg.sbr_object_type));
 						if (a_cfg.has_ps) fprintf(stderr, " - PS");
@@ -2633,21 +2443,21 @@
 					fprintf(stderr, "MPEG-2/4 Audio - %d Channels - SampleRate %d\n", nb_ch, sr);
 #endif
 					break;
-				case GPAC_OTI_AUDIO_MPEG2_PART3:
-				case GPAC_OTI_AUDIO_MPEG1:
+				case GF_CODECID_MPEG2_PART3:
+				case GF_CODECID_MPEG_AUDIO:
 					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) {
-							oti = GF_4CC((u8)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
+							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(oti),
-							        gf_mp3_num_channels(oti),
-							        gf_mp3_sampling_rate(oti),
-							        gf_mp3_layer(oti)
+							        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 {
@@ -2659,30 +2469,28 @@
 					}
 					break;
 				/*OGG media*/
-				case GPAC_OTI_MEDIA_OGG:
-				{
-					char *szName;
-					if (full_dump) fprintf(stderr, "\t");
-					if (!strnicmp(&esd->decoderConfig->decoderSpecificInfo->data[3], "vorbis", 6)) szName = "Vorbis";
-					else if (!strnicmp(&esd->decoderConfig->decoderSpecificInfo->data[2], "Speex", 5)) szName = "Speex";
-					else if (!strnicmp(&esd->decoderConfig->decoderSpecificInfo->data[2], "Flac", 4)) szName = "Flac";
-					else szName = "Unknown";
-					fprintf(stderr, "Ogg/%s audio / GPAC Mux - Sample Rate %d - %d channel(s)\n", szName, sr, nb_ch);
-				}
-				break;
-				case GPAC_OTI_AUDIO_EVRC_VOICE:
+				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;
-				case GPAC_OTI_AUDIO_SMV_VOICE:
+				case GF_CODECID_SMV:
 					fprintf(stderr, "SMV Audio - Sample Rate 8000 - 1 channel\n");
 					break;
-				case GPAC_OTI_AUDIO_13K_VOICE:
+				case GF_CODECID_QCELP:
 					fprintf(stderr, "QCELP Audio - Sample Rate 8000 - 1 channel\n");
 					break;
 				/*packetVideo hack for EVRC...*/
-				case 0xD1:
+				case GF_CODECID_EVRC_PV:
 					if (esd->decoderConfig->decoderSpecificInfo && (esd->decoderConfig->decoderSpecificInfo->dataLength==8)
-					        && !strnicmp(esd->decoderConfig->decoderSpecificInfo->data, "pvmm", 4)) {
+					        && !strnicmp((char *)esd->decoderConfig->decoderSpecificInfo->data, "pvmm", 4)) {
 						if (full_dump) fprintf(stderr, "\t");
 						fprintf(stderr, "EVRC Audio (PacketVideo Mux) - Sample Rate 8000 - 1 channel\n");
 					}
@@ -2697,19 +2505,19 @@
 						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 if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_AFX) {
+				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AFX) {
 					u8 tag = esd->decoderConfig->decoderSpecificInfo ? esd->decoderConfig->decoderSpecificInfo->data[0] : 0xFF;
-					const char *afxtype = gf_afx_get_type_description(tag);
+					const char *afxtype = gf_stream_type_afx_name(tag);
 					fprintf(stderr, "AFX Stream - type %s (%d)\n", afxtype, tag);
-				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_FONT) {
+				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_FONT) {
 					fprintf(stderr, "Font Data stream\n");
-				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_LASER) {
+				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_LASER) {
 					GF_LASERConfig l_cfg;
 					gf_odf_get_laser_config(esd->decoderConfig->decoderSpecificInfo, &l_cfg);
 					fprintf(stderr, "LASER Stream - %s\n", l_cfg.newSceneIndicator ? "Full Scene" : "Scene Segment");
-				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_TEXT_MPEG4) {
+				} else if (esd->decoderConfig->objectTypeIndication==GF_CODECID_TEXT_MPEG4) {
 					fprintf(stderr, "MPEG-4 Streaming Text stream\n");
-				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE) {
+				} 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);
@@ -2760,10 +2568,11 @@
 					fprintf(stderr, "Rights Issuer: %s\n", KMS_URI);
 					fprintf(stderr, "Content ID: %s\n", scheme_URI);
 					if (textHdrs) {
-						u32 i, offset;
+						u32 offset;
 						const char *start = textHdrs;
 						fprintf(stderr, "OMA Textual Headers:\n");
-						i=offset=0;
+						i=0;
+						offset=0;
 						while (i<hdr_len) {
 							if (start[i]==0) {
 								fprintf(stderr, "\t%s\n", start+offset);
@@ -2773,7 +2582,7 @@
 						}
 						fprintf(stderr, "\t%s\n", start+offset);
 					}
-					if (orig_len) fprintf(stderr, "Original media size "LLD"\n", LLD_CAST orig_len);
+					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"));
 
 
@@ -2784,17 +2593,17 @@
 					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);
 				} else if(gf_isom_is_adobe_protection_media(file, trackNum, 1)) {
-					gf_isom_get_adobe_protection_info(file, trackNum, 1, NULL, &scheme_type, &version);
+					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, 1) ));
+					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;
-		u32 w, h, i, count;
+		u32 w, h;
 		gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
 		fprintf(stderr, "\tAOM AV1 stream - Resolution %d x %d\n", w, h);
 
@@ -2809,10 +2618,9 @@
 		count = gf_list_count(av1c->obu_array);
 		for (i=0; i<count; i++) {
 			u8 hash[20];
-			u32 j;
 			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, av1_get_obu_name(obu->obu_type) );
+			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");
 		}
@@ -2833,26 +2641,25 @@
 		fprintf(stderr, "\t3GPP QCELP stream - Sample Rate %d - %d channel(s) %d bps\n", sr, nb_ch, (u32) bps);
 	} else if (msub_type == GF_ISOM_SUBTYPE_MP3) {
 		fprintf(stderr, "\tMPEG 1/2 Audio stream - Sample Rate %d - %d channel(s) %d bps\n", sr, nb_ch, (u32) bps);
-	} else if (msub_type == GF_ISOM_SUBTYPE_AC3) {
+	} else if ((msub_type == GF_ISOM_SUBTYPE_AC3) || (msub_type == GF_ISOM_SUBTYPE_EC3)) {
 		u32 br = 0;
-		Bool lfe = 0;
-		Bool is_ec3 = 0;
+		const char *lfe = "";
+		Bool is_ec3 = (msub_type == GF_ISOM_SUBTYPE_EC3) ? GF_TRUE : GF_FALSE;
 #ifndef GPAC_DISABLE_AV_PARSERS
 		GF_AC3Config *ac3 = gf_isom_ac3_config_get(file, trackNum, 1);
 		if (ac3) {
-			int i;
 			nb_ch = gf_ac3_get_channels(ac3->streams[0].acmod);
 			for (i=0; i<ac3->streams[0].nb_dep_sub; ++i) {
 				assert(ac3->streams[0].nb_dep_sub == 1);
 				nb_ch += gf_ac3_get_channels(ac3->streams[0].chan_loc);
 			}
-			lfe = ac3->streams[0].lfon;
+			if (ac3->streams[0].lfon) lfe = ".1";
 			br = ac3->is_ec3 ? ac3->brcode : gf_ac3_get_bitrate(ac3->brcode);
 			is_ec3 = ac3->is_ec3;
 			gf_free(ac3);
 		}
 #endif
-		fprintf(stderr, "\t%s stream - Sample Rate %d - %d%s channel(s) - bitrate %d\n", is_ec3 ? "EC-3" : "AC-3", sr, nb_ch, lfe ? ".1" : "", br);
+		fprintf(stderr, "\t%s stream - Sample Rate %d - %d%s channel(s) - bitrate %d\n", is_ec3 ? "EC-3" : "AC-3", sr, nb_ch, lfe, br);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_SMV) {
 		fprintf(stderr, "\t3GPP SMV stream - Sample Rate %d - %d channel(s) %d bits per samples\n", sr, nb_ch, (u32) bps);
 	} else if (msub_type == GF_ISOM_SUBTYPE_3GP_DIMS) {
@@ -2869,10 +2676,10 @@
 		if (dims.content_script_types) fprintf(stderr, "\tscript languages %s\n", dims.content_script_types);
 	} else if (mtype==GF_ISOM_MEDIA_HINT) {
 		u32 refTrack;
-		s32 i, refCount = gf_isom_get_reference_count(file, trackNum, GF_ISOM_REF_HINT);
-		if (refCount) {
+		s32 refCount = gf_isom_get_reference_count(file, trackNum, GF_ISOM_REF_HINT);
+		if (refCount>0) {
 			fprintf(stderr, "Streaming Hint Track for track%s ", (refCount>1) ? "s" :"");
-			for (i=0; i<refCount; i++) {
+			for (i=0; i<(u32) refCount; i++) {
 				gf_isom_get_reference(file, trackNum, GF_ISOM_REF_HINT, i+1, &refTrack);
 				if (i) fprintf(stderr, " - ");
 				fprintf(stderr, "ID %d", gf_isom_get_track_id(file, refTrack));
@@ -2883,9 +2690,11 @@
 		}
 #ifndef GPAC_DISABLE_ISOM_HINTING
 		refCount = gf_isom_get_payt_count(file, trackNum);
-		for (i=0; i<refCount; i++) {
-			const char *name = gf_isom_get_payt_info(file, trackNum, i+1, &refTrack);
-			fprintf(stderr, "\tPayload ID %d: type %s\n", refTrack, name);
+		if (refCount>0) {
+			for (i=0; i<(u32) refCount; i++) {
+				const char *name = gf_isom_get_payt_info(file, trackNum, i+1, &refTrack);
+				fprintf(stderr, "\tPayload ID %d: type %s\n", refTrack, name);
+			}
 		}
 #endif
 	} else if (mtype==GF_ISOM_MEDIA_FLASH) {
@@ -2967,7 +2776,7 @@
 	} else {
 		GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(file, trackNum, 1);
 		if (udesc) {
-			if (gf_isom_is_video_subtype(mtype) ) {
+			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"),
                         udesc->compressor_name, udesc->width, udesc->height);
@@ -3118,7 +2927,6 @@
 
 	count = gf_isom_get_chapter_count(file, trackNum);
 	if (count) {
-		char szDur[20];
 		const char *name;
 		u64 time;
 		fprintf(stderr, "\nChapters:\n");
@@ -3169,18 +2977,17 @@
 {
 	GF_InitialObjectDescriptor *iod;
 	u32 i, brand, min, timescale, count, tag_len;
-	const char *tag;
+	const u8 *tag;
 	u64 create, modif;
 	char szDur[50];
 
 	DumpMetaItem(file, 1, 0, "Root Meta");
 	if (!gf_isom_has_movie(file)) {
 		if (gf_isom_has_segment(file, &brand, &min)) {
-			u32 j, count;
 			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 traf_count = gf_isom_segment_get_track_fragment_count(file, i+1);
+				u32 j, traf_count = gf_isom_segment_get_track_fragment_count(file, i+1);
 				for (j=0; j<traf_count; j++) {
 					u32 ID;
 					u64 tfdt;
@@ -3258,7 +3065,6 @@
 
 	count = gf_isom_get_chapter_count(file, 0);
 	if (count) {
-		char szDur[20];
 		const char *name;
 		u64 time;
 		fprintf(stderr, "\nChapters:\n");
@@ -3313,7 +3119,7 @@
 	print_udta(file, 0);
 	fprintf(stderr, "\n");
 	for (i=0; i<gf_isom_get_track_count(file); i++) {
-		DumpTrackInfo(file, gf_isom_get_track_id(file, i+1), 0);
+		DumpTrackInfo(file, i+1, 0, GF_TRUE);
 	}
 }
 
@@ -3432,20 +3238,24 @@
 		}
 		break;
 	case GF_M2TS_EVT_SDT_FOUND:
+#ifndef GPAC_DISABLE_LOG
 		count = gf_list_count(ts->SDTs) ;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program Description found - %d desc:\n", count));
 		for (i=0; i<count; i++) {
 			GF_M2TS_SDT *sdt = gf_list_get(ts->SDTs, i);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\tServiceID %d - Provider %s - Name %s\n", sdt->service_id, sdt->provider, sdt->service));
 		}
+#endif
 		break;
 	case GF_M2TS_EVT_SDT_UPDATE:
+#ifndef GPAC_DISABLE_LOG
 		count = gf_list_count(ts->SDTs) ;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program Description updated - %d desc\n", count));
 		for (i=0; i<count; i++) {
 			GF_M2TS_SDT *sdt = gf_list_get(ts->SDTs, i);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\tServiceID %d - Provider %s - Name %s\n", sdt->service_id, sdt->provider, sdt->service));
 		}
+#endif
 		break;
 	case GF_M2TS_EVT_SDT_REPEAT:
 		break;
@@ -3485,7 +3295,7 @@
 				if (interpolated_pcr_value) fprintf(dumper->timestamps_info_file, "%f", interpolated_pcr_value/(300.0 * 90000));
 				fprintf(dumper->timestamps_info_file, "\t");
 				if (pck->DTS) fprintf(dumper->timestamps_info_file, "%f", (pck->DTS / 90000.0));
-				fprintf(dumper->timestamps_info_file, "\t%f\t%d\t%d", pck->PTS / 90000.0, (pck->flags & GF_M2TS_PES_PCK_RAP ? 1 : 0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY ? 1 : 0));
+				fprintf(dumper->timestamps_info_file, "\t%f\t%d\t%d", pck->PTS / 90000.0, (pck->flags & GF_M2TS_PES_PCK_RAP) ? 1 : 0, (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0);
 				if (interpolated_pcr_value) {
 					diff = (pck->DTS ? pck->DTS : pck->PTS) / 90000.0;
 					diff -= pes->last_pcr_value / (300.0 * 90000);
@@ -3498,7 +3308,7 @@
 		}
 
 		if (dumper->has_seen_pat && dumper->pes_out && (dumper->dump_pid == pck->stream->pid)) {
-			gf_fwrite(pck->data, pck->data_len, 1, dumper->pes_out);
+			gf_fwrite(pck->data, pck->data_len, dumper->pes_out);
 		}
 		break;
 	case GF_M2TS_EVT_PES_PCR:
@@ -3506,7 +3316,7 @@
 		if (gf_list_count(ts->programs)>1 && pck->stream->program->number != dumper->prog_number)
 			break;
 		if (dumper->timestamps_info_file) {
-			fprintf(dumper->timestamps_info_file, "%u\t%d\t%f\t\t\t\t%d\n", pck->stream->program->last_pcr_value_pck_number, pck->stream->pid, pck->PTS / (300*90000.0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY ? 1 : 0));
+			fprintf(dumper->timestamps_info_file, "%u\t%d\t%f\t\t\t\t%d\n", pck->stream->program->last_pcr_value_pck_number, pck->stream->pid, pck->PTS / (300*90000.0), (pck->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0);
 		}
 		break;
 	case GF_M2TS_EVT_SL_PCK:
@@ -3519,7 +3329,7 @@
 			if (sl_pck->stream->mpeg4_es_id) {
 				GF_ESD *esd = ((GF_M2TS_PES*)sl_pck->stream)->esd;
 				if (!dumper->is_info_dumped) {
-					if (esd->decoderConfig->decoderSpecificInfo) gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, dumper->pes_out_info);
+					if (esd->decoderConfig->decoderSpecificInfo) gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, dumper->pes_out_info);
 					dumper->is_info_dumped = 1;
 					fprintf(dumper->pes_out_nhml, "<NHNTStream version=\"1.0\" ");
 					fprintf(dumper->pes_out_nhml, "timeScale=\"%d\" ", esd->slConfig->timestampResolution);
@@ -3530,8 +3340,8 @@
 					fprintf(dumper->pes_out_nhml, "inRootOD=\"yes\">\n");
 				}
 				gf_sl_depacketize(esd->slConfig, &header, sl_pck->data, sl_pck->data_len, &header_len);
-				gf_fwrite(sl_pck->data+header_len, sl_pck->data_len-header_len, 1, dumper->pes_out);
-				fprintf(dumper->pes_out_nhml, "<NHNTSample DTS=\""LLD"\" dataLength=\"%d\" isRAP=\"%s\"/>\n", LLD_CAST header.decodingTimeStamp, sl_pck->data_len-header_len, (header.randomAccessPointFlag?"yes":"no"));
+				gf_fwrite(sl_pck->data+header_len, sl_pck->data_len-header_len, dumper->pes_out);
+				fprintf(dumper->pes_out_nhml, "<NHNTSample DTS=\""LLD"\" dataLength=\"%d\" isRAP=\"%s\"/>\n", header.decodingTimeStamp, sl_pck->data_len-header_len, (header.randomAccessPointFlag?"yes":"no"));
 			}
 		}
 	}
@@ -3542,7 +3352,7 @@
 
 void dump_mpeg2_ts(char *mpeg2ts_file, char *out_name, Bool prog_num)
 {
-	char data[188];
+	u8 data[188];
 	GF_M2TS_Dump dumper;
 
 	u32 size;
@@ -3550,10 +3360,6 @@
 	GF_M2TS_Demuxer *ts;
 	FILE *src;
 
-	if (!prog_num && !out_name) {
-		fprintf(stderr, "No program number nor output filename specified. No timestamp file will be generated.");
-	}
-
 	src = gf_fopen(mpeg2ts_file, "rb");
 	if (!src) {
 		fprintf(stderr, "Cannot open %s: no such file\n", mpeg2ts_file);
@@ -3590,7 +3396,7 @@
 
 	/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
 	while (!feof(src)) {
-		size = (u32) fread(data, 1, 188, src);
+		size = (u32) gf_fread(data, 188, src);
 		if (size<188) break;
 
 		gf_m2ts_process_data(ts, data, size);
@@ -3598,6 +3404,16 @@
 	}
 	dumper.has_seen_pat = GF_TRUE;
 
+	if (!prog_num) {
+		GF_M2TS_Program *p = gf_list_get(ts->programs, 0);
+		if (p) prog_num = p->number;
+		fprintf(stderr, "No program number specified, defaulting to first program\n");
+	}
+
+	if (!prog_num && !out_name) {
+		fprintf(stderr, "No program number nor output filename specified. No timestamp file will be generated\n");
+	}
+
 	if (prog_num) {
 		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");
@@ -3613,7 +3429,7 @@
 	fdone = 0;
 
 	while (!feof(src)) {
-		size = (u32) fread(data, 1, 188, src);
+		size = (u32) gf_fread(data, 188, src);
 		if (size<188) break;
 
 		gf_m2ts_process_data(ts, data, size);
@@ -3639,13 +3455,13 @@
 
 
 #include <gpac/download.h>
-#include <gpac/internal/mpd.h>
+#include <gpac/mpd.h>
 
 void get_file_callback(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
 	if (parameter->msg_type==GF_NETIO_DATA_EXCHANGE) {
-		u32 tot_size, bps, done;
-		u64 max;
+		u64 tot_size, done, max;
+		u32 bps;
 		gf_dm_sess_get_stats(parameter->sess, NULL, NULL, &tot_size, &done, &bps, NULL);
 		if (tot_size) {
 			max = done;
@@ -3673,8 +3489,8 @@
 {
 	char szPATH[GF_MAX_PATH];
 	const char *url;
-	char *sep;
 	GF_Config *cached;
+
 	if (!strstr(item_path, "gpac_cache_")) {
 		fprintf(stderr, "%s is not a gpac cache file\n", item_path);
 		return;
@@ -3690,6 +3506,7 @@
 	if (url) url = strstr(url, "://");
 	if (url) {
 		u32 i, len, dir_len=0, k=0;
+		char *sep;
 		char *dst_name;
 		sep = strstr(item_path, "gpac_cache_");
 		if (sep) {
@@ -3714,7 +3531,7 @@
 			k++;
 		}
 		if (gf_file_exists(item_path)) {
-			gf_move_file(item_path, dst_name);
+			gf_file_move(item_path, dst_name);
 		}
 
 		gf_free(dst_name);
@@ -3722,44 +3539,48 @@
 		fprintf(stderr, "Failed to reverse %s cache file\n", item_path);
 	}
 	gf_cfg_del(cached);
-	gf_delete_file(szPATH);
+	gf_file_delete(szPATH);
 }
 
-GF_Err rip_mpd(const char *mpd_src)
+GF_Err rip_mpd(const char *mpd_src, const char *output_dir)
 {
 	GF_DownloadSession *sess;
 	u32 i, connect_time, reply_time, download_time, req_hdr_size, rsp_hdr_size;
 	GF_Err e;
-	GF_DOMParser *mpd_parser;
-	GF_MPD *mpd;
+	GF_DOMParser *mpd_parser=NULL;
+	GF_MPD *mpd=NULL;
 	GF_MPD_Period *period;
 	GF_MPD_AdaptationSet *as;
 	GF_MPD_Representation *rep;
 	char szName[GF_MAX_PATH];
-	char *name;
-	GF_Config *cfg;
 	GF_DownloadManager *dm;
 
-	gf_sys_init(0);
-
-	cfg = gf_cfg_new(NULL, NULL);
-	gf_cfg_set_key(cfg, "General", "CacheDirectory", ".");
-	gf_cfg_set_key(cfg, "Downloader", "CleanCache", "true");
-	dm = gf_dm_new(cfg);
-
+	if (output_dir) {
+		char *sep;
+		strcpy(szName, output_dir);
+		sep = gf_file_basename(szName);
+		if (sep) sep[0] = 0;
+		gf_opts_set_key("temp", "cache", szName);
+	} else {
+		gf_opts_set_key("temp", "cache", ".");
+	}
+	gf_opts_set_key("temp", "clean-cache", "true");
+	dm = gf_dm_new(NULL);
 
-	name = strrchr(mpd_src, '/');
+/*
+	char *name = strrchr(mpd_src, '/');
 	if (!name) name = strrchr(mpd_src, '\\');
 	if (!name) name = "manifest.mpd";
 	else name ++;
 
 	if (strchr(name, '?') || strchr(name, '&')) name = "manifest.mpd";
+*/
 
 	fprintf(stderr, "Downloading %s\n", mpd_src);
 	sess = get_file(mpd_src, dm, &e);
 	if (!sess) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error downloading MPD file %s: %s\n", mpd_src, gf_error_to_string(e) ));
-		return e;
+		goto err_exit;
 	}
 	strcpy(szName, gf_dm_sess_get_cache_name(sess) );
 	gf_dm_sess_get_header_sizes_and_times(sess, &req_hdr_size, &rsp_hdr_size, &connect_time, &reply_time, &download_time);
@@ -3767,7 +3588,7 @@
 
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error fetching MPD file %s: %s\n", mpd_src, gf_error_to_string(e)));
-		return e;
+		goto err_exit;
 	}
 	else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Fetched file %s\n", mpd_src));
@@ -3786,6 +3607,7 @@
 	mpd = gf_mpd_new();
 	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), mpd, mpd_src);
 	gf_xml_dom_del(mpd_parser);
+	mpd_parser=NULL;
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error initializing MPD %s : %s\n", mpd_src, gf_error_to_string(e)));
 		goto err_exit;
@@ -3842,7 +3664,7 @@
 
 				} else if (out_range_start || out_range_end || !seg_url) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("byte range rip not yet implemented\n"));
-					if (seg_idx) gf_free(seg_url);
+					if (seg_url) gf_free(seg_url);
 					e = GF_NOT_SUPPORTED;
 					goto err_exit;
 				}
@@ -3878,9 +3700,12 @@
 					fprintf(stderr, "Downloading %s\n", seg_url);
 					sess = get_file(seg_url, dm, &e);
 					if (e) {
-						if (seg_url) gf_free(seg_url);
+						gf_free(seg_url);
 						if (e != GF_URL_ERROR) {
 							GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Error downloading segment %s: %s\n", seg_url, gf_error_to_string(e)));
+						} else {
+							//todo, properly detect end of dash representation
+							e = GF_OK;
 						}
 						break;
 					}
@@ -3890,16 +3715,10 @@
 				}
 			}
 		}
-		if (initTemplate) {
-			gf_free(initTemplate);
-			initTemplate = NULL;
-		}
 	}
 
 err_exit:
-	gf_mpd_del(mpd);
+	if (mpd) gf_mpd_del(mpd);
 	gf_dm_del(dm);
-	gf_cfg_del(cfg);
-	gf_sys_close();
 	return e;
 }

gpac-0.8.0.tar.gz/applications/mp4box/fileimport.c -> gpac-1.0.0.tar.gz/applications/mp4box/fileimport.c Changed

gpac-0.8.0.tar.gz/applications/mp4box/live.c -> gpac-1.0.0.tar.gz/applications/mp4box/live.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-2019
  *					All rights reserved
  *
  *			Authors: Jean Le Feuvre
@@ -26,23 +26,17 @@
  */
 
 
-#include <gpac/constants.h>
-#include <gpac/isomedia.h>
+#include "mp4box.h"
 
 #ifndef GPAC_DISABLE_SENG
 #include <gpac/scene_engine.h>
 #endif
 #ifndef GPAC_DISABLE_STREAMING
-#include <gpac/filestreamer.h>
 #include <gpac/rtp_streamer.h>
 #endif
 
 #include <gpac/mpegts.h>
 
-#ifndef GPAC_DISABLE_STREAMING
-#include <gpac/internal/ietf_dev.h>
-#endif
-
 #if defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)
 
 #error "Cannot compile MP4Box if GPAC is not built with ISO File Format support"
@@ -51,164 +45,16 @@
 
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
 
-void PrintStreamerUsage()
-{
-	fprintf(stderr, "File Streamer Options\n"
-	        "\n"
-	        "MP4Box can stream ISO files to RTP. The streamer currently doesn't support\n"
-	        "data carrouselling and will therefore not handle BIFS and OD streams properly.\n"
-	        "\n"
-            "-rtp         enables streamer\n"
-            "-run-for=T   runs for T seconds of the media then exits\n"
-	        "-noloop      disables looping when streaming\n"
-	        "-mpeg4       forces MPEG-4 ES Generic for all RTP streams\n"
-	        "-dst=IP      IP destination (uni/multi-cast). Default: 127.0.0.1\n"
-	        "-port=PORT   output port of the first stream. Default: 7000\n"
-	        "-mtu=MTU     path MTU for RTP packets. Default is 1450 bytes\n"
-	        "-ifce=IFCE   IP address of the physical interface to use. Default: NULL (ANY)\n"
-	        "-ttl=TTL     time to live for multicast packets. Default: 1\n"
-	        "-sdp=Name    file name of the generated SDP. Default: \"session.sdp\"\n"
-	        "\n"
-	       );
-}
-
-static void on_logs(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	FILE *logs = (FILE*)cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-int stream_file_rtp(int argc, char **argv)
-{
-	GF_ISOMRTPStreamer *file_streamer;
-	char *sdp_file = "session.sdp";
-	char *ip_dest = "127.0.0.1";
-	char *ifce_addr = NULL;
-	char *inName = NULL;
-	char *logs=NULL;
-	FILE *logfile=NULL;
-	u16 port = 7000;
-	u32 ttl = 1;
-	Bool loop = GF_TRUE;
-    GF_MemTrackerType mem_track = GF_MemTrackerNone;
-	Bool force_mpeg4 = GF_FALSE;
-    u32 path_mtu = 1450;
-    Double run_for = -1.0;
-	u32 i;
-
-	for (i = 1; i < (u32) argc ; i++) {
-		char *arg = argv[i];
-
-		if (arg[0] != '-') {
-			if (inName) {
-				fprintf(stderr, "Error - 2 input names specified, please check usage\n");
-				return 1;
-			}
-			inName = arg;
-		}
-		else if (!stricmp(arg, "-noloop")) loop = GF_FALSE;
-		else if (!stricmp(arg, "-mpeg4")) force_mpeg4 = GF_TRUE;
-		else if (!strnicmp(arg, "-port=", 6)) port = atoi(arg+6);
-		else if (!strnicmp(arg, "-mtu=", 5)) path_mtu = atoi(arg+5);
-		else if (!strnicmp(arg, "-dst=", 5)) ip_dest = arg+5;
-		else if (!strnicmp(arg, "-ttl=", 5)) ttl = atoi(arg+5);
-		else if (!strnicmp(arg, "-ifce=", 6)) ifce_addr = arg+6;
-		else if (!strnicmp(arg, "-sdp=", 5)) sdp_file = arg+5;
-        else if (!stricmp(arg, "-mem-track")) mem_track = GF_MemTrackerSimple;
-        else if (!stricmp(arg, "-mem-track-stack")) mem_track = GF_MemTrackerBackTrace;
-		else if (!strnicmp(arg, "-logs=", 6)) logs = arg+6;
-		else if (!strnicmp(arg, "-lf=", 4)) logfile = gf_fopen(arg+4, "wt");
-        else if (!strnicmp(arg, "-run-for=", 9)) run_for = atof(arg+9);
-	}
-
-	gf_sys_init(mem_track);
-	if (logs)
-		gf_log_set_tools_levels(logs);
-	else
-		gf_log_set_tool_level(GF_LOG_RTP, GF_LOG_INFO); //set to debug to have packet list
-	if (logfile) {
-		gf_log_set_callback(logfile, on_logs);
-	}
 
-	if (!gf_isom_probe_file(inName)) {
-		fprintf(stderr, "File %s is not a valid ISO Media file and cannot be streamed\n", inName);
-		if (logfile) gf_fclose(logfile);
-		gf_sys_close();
-		return 1;
-	}
-
-	file_streamer = gf_isom_streamer_new(inName, ip_dest, port, loop, force_mpeg4, path_mtu, ttl, ifce_addr);
-	if (!file_streamer) {
-		fprintf(stderr, "Cannot create file streamer\n");
-	} else {
-        Bool run = GF_TRUE;
-		u32 check = 50;
-		fprintf(stderr, "Starting streaming %s to %s:%d\n", inName, ip_dest, port);
-		gf_isom_streamer_write_sdp(file_streamer, sdp_file);
-
-        if (run_for==0) run=GF_FALSE;
-
-		while (run) {
-			gf_isom_streamer_send_next_packet(file_streamer, 0, 0);
-			check--;
-			if (!check) {
-				if (gf_prompt_has_input()) {
-					char c = (char) gf_prompt_get_char();
-					if (c=='q') break;
-				}
-				check = 50;
-			}
-            if ((run_for > 0) && (run_for < gf_isom_streamer_get_current_time(file_streamer)) )
-                break;
-		}
-		gf_isom_streamer_del(file_streamer);
-	}
-	if (logfile) gf_fclose(logfile);
-	gf_sys_close();
-	return 0;
-}
 
 
-void PrintLiveUsage()
-{
-	fprintf(stderr,
-
-	        "Live scene encoder options:\n"
-	        "-dst=IP    destination IP - default: NULL\n"
-	        "-port=PORT destination port - default: 7000\n"
-	        "-mtu=MTU   path MTU for RTP packets. Default is 1450 bytes\n"
-	        "-ifce=IFCE IP address of the physical interface to use. Default: NULL(ANY)\n"
-	        "-ttl=TTL   time to live for multicast packets. Default: 1\n"
-	        "-sdp=Name  ouput SDP file - default: session.sdp\n"
-	        "\n"
-	        "-dims      turns on DIMS mode for SVG input - default: off\n"
-	        "-no-rap    disabled RAP sending - this also disables carousel generation. Default: off\n"
-	        "-src=file  source of updates - default: null\n"
-	        "-rap=time  duration in ms of base carousel - default: 0 (off)\n"
-	        "            you can specify the RAP period of a single ESID (not in DIMS):\n"
-	        "                -rap=ESID=X:time\n"
-	        "\n"
-	        "Runtime options:\n"
-	        "q:         quits\n"
-	        "u:         inputs some commands to be sent\n"
-	        "U:         same as u but signals the updates as critical\n"
-	        "e:         inputs some commands to be sent without being aggregated\n"
-	        "E:         same as e but signals the updates as critical\n"
-	        "f:         forces RAP sending\n"
-	        "F:         forces RAP regeneration and sending\n"
-	        "p:         dumps current scene\n"
-	        "\n"
-	        "GPAC version: " GPAC_FULL_VERSION "\n"
-	        "");
-}
 typedef struct
 {
 	GF_RTPStreamer *rtp;
 	Bool manual_rtcp;
 	u16 ESID;
 
-	char *carousel_data;
+	u8 *carousel_data;
 	u32 carousel_size, carousel_alloc;
 	u32 last_carousel_time;
 	u64 carousel_ts, time_at_carousel_store;
@@ -265,7 +111,7 @@
 }
 
 
-static void live_session_callback(void *calling_object, u16 ESID, char *data, u32 size, u64 ts)
+static void live_session_callback(void *calling_object, u16 ESID, u8 *data, u32 size, u64 ts)
 {
 	LiveSession *livesess = (LiveSession *) calling_object;
 	RTPChannel *rtpch;
@@ -310,7 +156,7 @@
 static void live_session_send_carousel(LiveSession *livesess, RTPChannel *ch)
 {
 	u32 now = gf_sys_clock();
-	u64 ts=0;
+	u64 ts;
 	if (ch) {
 		if (ch->carousel_size) {
 			ts = ch->carousel_ts + ch->timescale * ( (ch->adjust_carousel_time ? (u64)gf_sys_clock() : ch->time_at_carousel_store) - ch->init_time + ch->ts_delta)/1000;
@@ -346,7 +192,7 @@
 	}
 }
 
-static void live_session_setup(LiveSession *livesess, char *ip, u16 port, u32 path_mtu, u32 ttl, char *ifce_addr, char *sdp_name)
+static Bool live_session_setup(LiveSession *livesess, char *ip, u16 port, u32 path_mtu, u32 ttl, char *ifce_addr, char *sdp_name)
 {
 	RTPChannel *rtpch;
 	u32 count = gf_seng_get_stream_count(livesess->seng);
@@ -355,10 +201,16 @@
 	char *sdp = gf_rtp_streamer_format_sdp_header("GPACSceneStreamer", ip, NULL, iod64);
 	if (iod64) gf_free(iod64);
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		GF_Descriptor *desc = gf_seng_get_iod(livesess->seng);
+		if (desc) gf_odf_desc_del(desc);
+	}
+#endif
 	for (i=0; i<count; i++) {
 		u16 ESID;
 		u32 st, oti, ts;
-		char *config = NULL;
+		const u8 *config = NULL;
 		u32 config_len;
 		gf_seng_get_stream_config(livesess->seng, i, &ESID, &config, &config_len, &st, &oti, &ts);
 
@@ -373,9 +225,9 @@
 		switch (st) {
 		case GF_STREAM_OD:
 		case GF_STREAM_SCENE:
-			rtpch->rtp = gf_rtp_streamer_new_extended(st, oti, ts, ip, port, path_mtu, ttl, ifce_addr,
-			             GP_RTP_PCK_SYSTEMS_CAROUSEL, (char *) config, config_len,
-			             96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4);
+			rtpch->rtp = gf_rtp_streamer_new(st, oti, ts, ip, port, path_mtu, ttl, ifce_addr,
+			             GP_RTP_PCK_SYSTEMS_CAROUSEL, config, config_len,
+			             96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, GF_FALSE);
 
 			if (rtpch->rtp) {
 				gf_rtp_streamer_disable_auto_rtcp(rtpch->rtp);
@@ -383,18 +235,20 @@
 			}
 			break;
 		default:
-			rtpch->rtp = gf_rtp_streamer_new(st, oti, ts, ip, port, path_mtu, ttl, ifce_addr, GP_RTP_PCK_SIGNAL_RAP, (char *) config, config_len);
+			rtpch->rtp = gf_rtp_streamer_new(st, oti, ts, ip, port, path_mtu, ttl, ifce_addr, GP_RTP_PCK_SIGNAL_RAP, config, config_len, 96, 0, 0, GF_FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, GF_FALSE);
 			break;
 		}
 		rtpch->ESID = ESID;
 		rtpch->adjust_carousel_time = 1;
 		gf_list_add(livesess->streams, rtpch);
 
-		gf_rtp_streamer_append_sdp(rtpch->rtp, ESID, (char *) config, config_len, NULL, &sdp);
+		if (!rtpch->rtp)
+			return GF_FALSE;
+
+		gf_rtp_streamer_append_sdp(rtpch->rtp, ESID, config, config_len, NULL, &sdp);
 
 		/*fetch initial config of the broadcast*/
 		gf_seng_get_stream_carousel_info(livesess->seng, ESID, &rtpch->carousel_period, &rtpch->aggregate_on_stream);
-
 		port += 2;
 	}
 	if (sdp) {
@@ -403,6 +257,7 @@
 		gf_fclose(out);
 		gf_free(sdp);
 	}
+	return GF_TRUE;
 }
 
 void live_session_shutdown(LiveSession *livesess)
@@ -475,7 +330,7 @@
 	u32 i;
 	char *filename = NULL;
 	char *dst = NULL;
-	char *ifce_addr = NULL;
+	const char *ifce_addr = NULL;
 	char *sdp_name = "session.sdp";
 	u16 dst_port = 7000;
 	u32 load_type=0;
@@ -483,7 +338,7 @@
 	u32 ttl = 1;
 	u32 path_mtu = 1450;
 	s32 next_time;
-	u64 last_src_modif, mod_time;
+	u64 last_src_modif, mod_time, runfor=0, start_time;
 	char *src_name = NULL;
 	Bool run, has_carousel, no_rap;
 	Bool udp = 0;
@@ -502,12 +357,15 @@
 	aggregate_au = 1;
 	es_id = 0;
 	no_rap = 0;
-	gf_sys_init(GF_MemTrackerNone);
+	gf_sys_init(GF_MemTrackerNone, NULL);
 
 	memset(&livesess, 0, sizeof(LiveSession));
 
 	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_INFO);
 
+	gf_sys_set_args(argc, (const char **) argv);
+
+
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
 		if (arg[0] != '-') filename = arg;
@@ -516,7 +374,6 @@
 		else if (!strnicmp(arg, "-sdp=", 5)) sdp_name = arg+5;
 		else if (!strnicmp(arg, "-mtu=", 5)) path_mtu = atoi(arg+5);
 		else if (!strnicmp(arg, "-ttl=", 5)) ttl = atoi(arg+5);
-		else if (!strnicmp(arg, "-ifce=", 6)) ifce_addr = arg+6;
 		else if (!strnicmp(arg, "-no-rap", 7)) no_rap = 1;
 		else if (!strnicmp(arg, "-dims", 5)) load_type = GF_SM_LOAD_DIMS;
 		else if (!strnicmp(arg, "-src=", 5)) src_name = arg+5;
@@ -528,12 +385,17 @@
 			sk_port = atoi(arg+5);
 			udp = 0;
 		}
+		else if (!stricmp(arg, "-run-for")) {
+			runfor = 1 + 1000 * atoi(argv[i+1]);
+			i++;
+		}
 	}
 	if (!filename) {
 		fprintf(stderr, "Missing filename\n");
 		PrintLiveUsage();
 		return 1;
 	}
+	ifce_addr = gf_opts_get_key("core", "ifce");
 
 	if (dst_port && dst) livesess.streams = gf_list_new();
 
@@ -542,7 +404,16 @@
 		fprintf(stderr, "Cannot create scene engine\n");
 		return 1;
 	}
-	if (livesess.streams) live_session_setup(&livesess, dst, dst_port, path_mtu, ttl, ifce_addr, sdp_name);
+	if (livesess.streams) {
+		Bool res = live_session_setup(&livesess, dst, dst_port, path_mtu, ttl, (char *) ifce_addr, sdp_name);
+		if (!res) {
+			live_session_shutdown(&livesess);
+			if (update_buffer) gf_free(update_buffer);
+			if (sk) gf_sk_del(sk);
+			gf_sys_close();
+			return e ? 1 : 0;
+		}
+	}
 
 	has_carousel = 0;
 	last_src_modif = src_name ? gf_file_modification_time(src_name) : 0;
@@ -563,8 +434,7 @@
 	for (i=0; i<(u32) argc; i++) {
 		char *arg = argv[i];
 		if (!strnicmp(arg, "-rap=", 5)) {
-			u32 period, id, j;
-			RTPChannel *ch;
+			u32 id, j;
 			period = id = 0;
 			if (strchr(arg, ':')) {
 				sscanf(arg, "-rap=ESID=%u:%u", &id, &period);
@@ -604,6 +474,21 @@
 
 	live_session_send_carousel(&livesess, NULL);
 
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		aggregate_on_stream = (u16) -1;
+		adjust_carousel_time = force_rap = discard_pending = signal_rap = signal_critical = 0;
+		aggregate_au = version_inc = 1;
+		period = -1;
+		ts_delta = 0;
+		es_id = 0;
+
+		set_broadcast_params(&livesess, es_id, period, ts_delta, aggregate_on_stream, adjust_carousel_time, force_rap, aggregate_au, discard_pending, signal_rap, signal_critical, version_inc);
+	}
+#endif
+
+	start_time = gf_sys_clock_high_res();
 	check = 10;
 	run = 1;
 	while (run) {
@@ -617,14 +502,12 @@
 					run=0;
 					break;
 				case 'U':
-					livesess.critical = 1;
 				case 'u':
 				{
-					GF_Err e;
 					char szCom[8192];
 					fprintf(stderr, "Enter command to send:\n");
 					szCom[0] = 0;
-					if (1 > scanf("%[^\t\n]", szCom)) {
+					if (1 > scanf("%8191[^\t\n]", szCom)) {
 						fprintf(stderr, "No command entered properly, aborting.\n");
 						break;
 					}
@@ -634,19 +517,17 @@
 					if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
 					e = gf_seng_aggregate_context(livesess.seng, 0);
 					if (e) fprintf(stderr, "Aggregating context failed: %s\n", gf_error_to_string(e));
-					livesess.critical = 0;
+					livesess.critical = (c=='U') ? 1 : 0;
 					update_context = 1;
 				}
 				break;
 				case 'E':
-					livesess.critical = 1;
 				case 'e':
 				{
-					GF_Err e;
 					char szCom[8192];
 					fprintf(stderr, "Enter command to send:\n");
 					szCom[0] = 0;
-					if (1 > scanf("%[^\t\n]", szCom)) {
+					if (1 > scanf("%8191[^\t\n]", szCom)) {
 						printf("No command entered properly, aborting.\n");
 						break;
 					}
@@ -654,7 +535,7 @@
 					while (getchar()!='\n') {}
 					e = gf_seng_encode_from_string(livesess.seng, 0, 1, szCom, live_session_callback);
 					if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
-					livesess.critical = 0;
+					livesess.critical = (c=='E') ? 1 : 0;
 					e = gf_seng_aggregate_context(livesess.seng, 0);
 					if (e) fprintf(stderr, "Aggregating context failed: %s\n", gf_error_to_string(e));
 
@@ -665,7 +546,7 @@
 				{
 					char rad[GF_MAX_PATH];
 					fprintf(stderr, "Enter output file name - \"std\" for stderr: ");
-					if (1 > scanf("%s", rad)) {
+					if (1 > scanf("%1023s", rad)) {
 						fprintf(stderr, "No ouput file name entered, aborting.\n");
 						break;
 					}
@@ -696,7 +577,7 @@
 				if (!srcf) continue;
 
 				/*checks if we have a broadcast config*/
-				if (!fgets(flag_buf, 200, srcf))
+				if (!gf_fgets(flag_buf, 200, srcf))
 					flag_buf[0] = '\0';
 				gf_fclose(srcf);
 
@@ -712,7 +593,7 @@
 				if (flag) {
 					flag += strlen("gpac_broadcast_config ");
 					/*move to next word*/
-					while (flag && (flag[0]==' ')) flag++;
+					while (flag[0]==' ') flag++;
 
 					while (1) {
 						char *sep = strchr(flag, ' ');
@@ -750,13 +631,13 @@
 
 		/*process updates from socket source*/
 		if (sk) {
-			char buffer[2049];
+			u8 buffer[2049];
 			u32 bytes_read;
 			u32 update_length;
 			u32 bytes_received;
 
 
-			e = gf_sk_receive(sk, buffer, 2048, 0, &bytes_read);
+			e = gf_sk_receive(sk, buffer, 2048, &bytes_read);
 			if (e == GF_OK) {
 				u32 hdr_length = 0;
 				u8 cmd_type = buffer[0];
@@ -801,7 +682,7 @@
 					bytes_received = bytes_read-hdr_length;
 				}
 				while (bytes_received<update_length) {
-					e = gf_sk_receive(sk, buffer, 2048, 0, &bytes_read);
+					e = gf_sk_receive(sk, buffer, 2048, &bytes_read);
 					switch (e) {
 					case GF_IP_NETWORK_EMPTY:
 						break;
@@ -839,6 +720,10 @@
 			continue;
 		}
 
+		if (runfor && (gf_sys_clock_high_res() > start_time+runfor))
+			break;
+
+
 		if (!has_carousel) {
 			gf_sleep(10);
 			continue;
@@ -852,6 +737,16 @@
 		live_session_send_carousel(&livesess, ch);
 	}
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+/*		gf_seng_save_context(livesess.seng, NULL);
+		gf_seng_aggregate_context
+		gf_seng_encode_from_string
+		gf_seng_encode_from_file
+*/
+	}
+#endif
+
 exit:
 	live_session_shutdown(&livesess);
 	if (update_buffer) gf_free(update_buffer);
@@ -864,223 +759,3 @@
 #endif /*!defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)*/
 
 #endif /*defined(GPAC_DISABLE_ISOM) || defined(GPAC_DISABLE_ISOM_WRITE)*/
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-u32 grab_live_m2ts(const char *grab_m2ts, const char *grab_ifce, const char *outName)
-{
-	char data[0x80000];
-	u32 check = 50;
-	u64 nb_pck;
-	Bool first_run, is_rtp;
-	FILE *output;
-#ifndef GPAC_DISABLE_STREAMING
-	u16 seq_num;
-	GF_RTPReorder *ch = NULL;
-#endif
-	GF_Socket *sock;
-	GF_Err e = gf_m2ts_get_socket(grab_m2ts, grab_ifce, GF_M2TS_UDP_BUFFER_SIZE, &sock);
-
-	if (e) {
-		fprintf(stderr, "Cannot open %s: %s\n", grab_m2ts, gf_error_to_string(e));
-		return 1;
-	}
-	output = gf_fopen(outName, "wb");
-	if (!output) {
-		fprintf(stderr, "Cannot open %s: check path and rights\n", outName);
-		gf_sk_del(sock);
-		return 1;
-	}
-
-	fprintf(stderr, "Dumping %s stream to %s - press q to abort\n", grab_m2ts, outName);
-
-	first_run = 1;
-	is_rtp = 0;
-	while (1) {
-		u32 size = 0;
-
-		check--;
-		if (!check) {
-			if (gf_prompt_has_input()) {
-				char c = (char) gf_prompt_get_char();
-				if (c=='q') break;
-			}
-			check = 50;
-		}
-
-		/*m2ts chunks by chunks*/
-		e = gf_sk_receive(sock, data, 0x40000, 0, &size);
-		if (!size || e) {
-			gf_sleep(1);
-			continue;
-		}
-		if (first_run) {
-			first_run = 0;
-			/*FIXME: we assume only simple RTP packaging (no CSRC nor extensions)*/
-			if ((data[0] != 0x47) && ((data[1] & 0x7F) == 33) ) {
-				is_rtp = 1;
-#ifndef GPAC_DISABLE_STREAMING
-				ch = gf_rtp_reorderer_new(100, 500);
-#endif
-			}
-		}
-		/*process chunk*/
-		if (is_rtp) {
-#ifndef GPAC_DISABLE_STREAMING
-			char *pck;
-			seq_num = ((data[2] << 8) & 0xFF00) | (data[3] & 0xFF);
-			gf_rtp_reorderer_add(ch, (void *) data, size, seq_num);
-
-			pck = (char *) gf_rtp_reorderer_get(ch, &size);
-			if (pck) {
-				fwrite(pck+12, size-12, 1, output);
-				gf_free(pck);
-			}
-#else
-			fwrite(data+12, size-12, 1, output);
-#endif
-		} else {
-			fwrite(data, size, 1, output);
-		}
-	}
-	nb_pck = gf_ftell(output);
-	nb_pck /= 188;
-	fprintf(stderr, "Captured "LLU" TS packets\n", nb_pck );
-	gf_fclose(output);
-	gf_sk_del(sock);
-
-#ifndef GPAC_DISABLE_STREAMING
-	if (ch)
-		gf_rtp_reorderer_del(ch);
-#endif
-	return 0;
-}
-
-#endif /* GPAC_DISABLE_MPEG2TS */
-
-#ifndef GPAC_DISABLE_ATSC
-
-#include <gpac/atsc.h>
-
-static Bool inspect_mode = GF_FALSE;
-
-static u32 nb_services=0;
-void atsc_on_evt(void *udta, GF_ATSCEventType evt, u32 evt_param, GF_ATSCEventFileInfo *info)
-{
-	switch (evt) {
-	case GF_ATSC_EVT_SERVICE_FOUND:
-		fprintf(stderr, "found service id %d\n", evt_param);
-		nb_services++;
-		break;
-	case GF_ATSC_EVT_SERVICE_SCAN:
-		fprintf(stderr, "Done scaning all services\n");
-		break;
-	case GF_ATSC_EVT_SEG:
-		if (inspect_mode) {
-			gf_atsc3_dmx_remove_object_by_name( (GF_ATSCDmx *) udta, evt_param, (char *) info->filename, GF_FALSE);
-		}
-		break;
-	case GF_ATSC_EVT_MPD:
-		if (inspect_mode) {
-			fprintf(stderr, "MPD update found\n");
-		}
-		break;
-	default:
-		break;
-	}
-}
-
-static void atsc_stats(GF_ATSCDmx *atscd, u32 now)
-{
-	Double rate=0.0;
-	u64 st = gf_atsc3_dmx_get_first_packet_time(atscd);
-	u64 et = gf_atsc3_dmx_get_last_packet_time(atscd);
-	u64 nb_pck = gf_atsc3_dmx_get_nb_packets(atscd);
-	u64 nb_bytes = gf_atsc3_dmx_get_recv_bytes(atscd);
-
-	et -= st;
-	if (et) {
-		rate = (Double)nb_bytes*8;
-		rate /= et;
-	}
-	if (now) {
-		fprintf(stderr, "                                                                                                 \r");
-		fprintf(stderr, "At %us stats: "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps\r", now/1000, nb_bytes, nb_pck, et/1000, rate);
-	} else {
-		fprintf(stderr, "\nFinal stats: "LLU" bytes "LLU" packets in "LLU" ms rate %.02f mbps\n", nb_bytes, nb_pck, et/1000, rate);
-	}
-}
-
-u32 grab_atsc3_session(const char *dir, const char *ifce, s32 serviceID, s32 atsc_max_segs, u32 stats_rate, u32 debug_tsi)
-{
-	GF_ATSCDmx *atscd;
-	Bool run = GF_TRUE;
-	GF_SystemRTInfo rti;
-	u32 nb_stats=1;
-	u32 start_time = gf_sys_clock();
-
-	gf_sys_get_rti(0, &rti, 0);
-
-	atscd = gf_atsc3_dmx_new(ifce, dir, 0);
-	if (!atscd) {
-		fprintf(stderr, "Failed to create ATSC3 demuxer\n");
-		return 1;
-	}
-	gf_atsc3_set_callback(atscd, atsc_on_evt, atscd);
-	gf_atsc3_tune_in(atscd, (u32) serviceID, GF_FALSE);
-	if (atsc_max_segs>=0)
-		gf_atsc3_set_max_objects_store(atscd, (u32) atsc_max_segs);
-
-	if (debug_tsi) {
-		fprintf(stderr, "Filtering objects from TSI %d only\n", debug_tsi);
-		gf_atsc3_dmx_debug_tsi(atscd, debug_tsi);
-	}
-
-	if (!dir) {
-		fprintf(stderr, "No output dir, ATSC3 demux inspect mode only\n");
-		inspect_mode = GF_TRUE;
-	}
-	fprintf(stderr, "Starting ATSC3 demux, press 'q' to stop, 'm' for memory/cpu info\n");
-
-	while (atscd && run) {
-		Bool is_empty = GF_TRUE;
-		GF_Err e = gf_atsc3_dmx_process(atscd);
-		if (e != GF_IP_NETWORK_EMPTY) is_empty = GF_FALSE;
-
-		if (is_empty) {
-			u32 /*st, */now = gf_sys_clock()- start_time;
-			gf_sleep(1);
-
-			if (gf_prompt_has_input()) {
-				u8 c = gf_prompt_get_char();
-				switch (c) {
-				case 'q':
-					run = GF_FALSE;
-					break;
-				case 'm':
-					gf_sys_get_rti(100, &rti, 0);
-					fprintf(stderr, "CPU %02d - memory "LLU"\n", rti.process_cpu_usage,  rti.gpac_memory);
-					break;
-				}
-			}
-
-			if (!nb_services && (now >=10000)) {
-				fprintf(stderr, "\nNo ATSC3 service found in %u ms, aborting\n", now);
-				run = GF_FALSE;
-			}
-			if (stats_rate) {
-				/*st = gf_sys_clock();*/
-				if (now >= nb_stats*1000*stats_rate) {
-					nb_stats+=1;
-					atsc_stats(atscd, now);
-				}
-			}
-		}
-	}
-	atsc_stats(atscd, 0);
-	gf_atsc3_dmx_del(atscd);
-	fprintf(stderr, "\n");
-	return 0;
-}
-
-#endif /* GPAC_DISABLE_ATSC */

gpac-0.8.0.tar.gz/applications/mp4box/main.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / mp4box application
@@ -24,13 +24,7 @@
  */
 
 
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/utf.h>
-
-#ifndef GPAC_DISABLE_SMGR
-#include <gpac/scene_manager.h>
-#endif
+#include "mp4box.h"
 
 #ifdef GPAC_DISABLE_ISOM
 
@@ -44,123 +38,28 @@
 #endif
 
 #include <gpac/media_tools.h>
+#include <gpac/main.h>
 
 /*RTP packetizer flags*/
 #ifndef GPAC_DISABLE_STREAMING
 #include <gpac/ietf.h>
 #endif
 
-#ifndef GPAC_DISABLE_MCRYPT
-#include <gpac/ismacryp.h>
+#ifndef GPAC_DISABLE_CRYPTO
+#include <gpac/crypt_tools.h>
 #endif
 
 #include <gpac/constants.h>
+#include <gpac/filters.h>
 
-#include <gpac/internal/mpd.h>
-
-#include <time.h>
+#include <gpac/mpd.h>
 
 #define BUFFSIZE	8192
 #define DEFAULT_INTERLEAVING_IN_SEC 0.5
 
-/*in fileimport.c*/
-
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-void convert_file_info(char *inName, u32 trackID);
-#endif
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample);
-#else
-GF_Err import_file(GF_ISOFile *dest, char *inName, u32 import_flags, Double force_fps, u32 frames_per_sample) {
-	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);
-GF_Err cat_isomedia_file(GF_ISOFile *mp4, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command, Bool is_pl);
-
-#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);
-#endif
-
-GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt);
-GF_Err hdr_file(GF_ISOFile* movie, char* file_name);
-
-#endif
-
-GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name);
-GF_Err dump_isom_chapters(GF_ISOFile *file, char *inName, Bool is_final_name, Bool dump_ogg);
-void 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);
-u32 id3_get_genre_tag(const char *name);
-
-GF_Err rip_mpd(const char *mpd);
-
-/*in filedump.c*/
-#ifndef GPAC_DISABLE_SCENE_DUMP
-GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log);
-//void gf_check_isom_files(char *conf_rules, char *inName);
-#endif
-#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);
-void PrintBuiltInBoxes();
-
-#ifndef GPAC_DISABLE_ISOM_DUMP
-GF_Err dump_isom_xml(GF_ISOFile *file, char *inName, Bool is_final_name, Bool do_track_dump);
-#endif
-
-
-#ifndef GPAC_DISABLE_ISOM_HINTING
-#ifndef GPAC_DISABLE_ISOM_DUMP
-void dump_isom_rtp(GF_ISOFile *file, char *inName, Bool is_final_name);
-#endif
-void dump_isom_sdp(GF_ISOFile *file, char *inName, Bool is_final_name);
-#endif
-
-void dump_isom_timestamps(GF_ISOFile *file, char *inName, Bool is_final_name, u32 dump_mode);
-void dump_isom_nal(GF_ISOFile *file, u32 trackID, char *inName, Bool is_final_name, Bool dump_crc);
-
-void dump_isom_saps(GF_ISOFile *file, u32 trackID, u32 dump_saps_mode, 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, u32 trackID, char *inName, Bool is_final_name, Bool is_convert, GF_TextDumpType dump_type);
-#endif /*GPAC_DISABLE_ISOM_DUMP*/
-
-
-void DumpTrackInfo(GF_ISOFile *file, u32 trackID, Bool full_dump);
-void DumpMovieInfo(GF_ISOFile *file);
-void PrintLanguages();
-
-#ifndef GPAC_DISABLE_MPEG2TS
-void dump_mpeg2_ts(char *mpeg2ts_file, char *pes_out_name, Bool prog_num);
-#endif
-
-
-#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
-void PrintStreamerUsage();
-int stream_file_rtp(int argc, char **argv);
-int live_session(int argc, char **argv);
-void PrintLiveUsage();
-#endif
-
-#if !defined(GPAC_DISABLE_STREAMING)
-u32 grab_live_m2ts(const char *grab_m2ts, const char *ifce_name, const char *outName);
-#endif
-
-#ifndef GPAC_DISABLE_ATSC
-u32 grab_atsc3_session(const char *dir, const char *ifce, s32 serviceID, s32 max_segs, u32 stats_rate, u32 debug_tsi);
-#endif
 
 int mp4boxTerminal(int argc, char **argv);
 
-u32 quiet = 0;
 Bool dvbhdemux = GF_FALSE;
 Bool keep_sys_tracks = GF_FALSE;
 
@@ -169,7 +68,8 @@
 u32 swf_flags = 0;
 Float swf_flatten_angle = 0;
 s32 laser_resolution = 0;
-
+static FILE *helpout = NULL;
+static u32 help_flags = 0;
 
 typedef struct {
 	u32 code;
@@ -204,776 +104,982 @@
 
 void PrintVersion()
 {
-	fprintf(stderr, "MP4Box - GPAC version " GPAC_FULL_VERSION "\n"
-	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
+	fprintf(stderr, "MP4Box - GPAC version %s\n"
+	        "%s\n"
 	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
-	        "Features: %s\n", gpac_features());
+	        "Features: %s %s\n", gf_gpac_version(), gf_gpac_copyright(), gf_sys_features(GF_FALSE), gf_sys_features(GF_TRUE));
 }
 
-void PrintGeneralUsage()
+GF_GPACArg m4b_gen_args[] =
 {
-	fprintf(stderr, "General Options:\n"
 #ifdef GPAC_MEMORY_TRACKING
-            " -mem-track:  enables memory tracker\n"
-            " -mem-track-stack:  enables memory tracker with stack dumping\n"
+ 	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),
 #endif
-	        " -strict-error        exits after the first error is reported\n"
-	        " -inter time_in_ms    interleaves file data (track chunks of time_in_ms)\n"
-	        "                       * Note 1: Interleaving is 0.5s by default\n"
-	        "                       * Note 2: Performs drift checking across tracks\n"
-	        "                       * Note 3: a value of 0 disables interleaving\n"
-	        " -old-inter time      same as -inter but doesn't perform drift checking\n"
-	        " -tight               performs tight interleaving (sample based) of the file\n"
-	        "                       * Note: reduces disk seek but increases file size\n"
-	        " -flat                stores file with all media data first, non-interleaved\n"
-	        " -frag time_in_ms     fragments file (track fragments of time_in_ms)\n"
-	        "                       * Note: Always disables interleaving\n"
-	        " -out filename        specifies output file name\n"
-	        "                       * Note: By default input (MP4,3GP) file is overwritten\n"
-	        " -tmp dirname         specifies directory for temporary file creation\n"
-	        "                       * Note: Default temp dir is OS-dependent\n"
-			" -for-test            disables all creation/modif dates and GPAC versions in files\n"
-			" -co64                forces usage of 64-bit chunk offsets for ISOBMF files\n"
-	        " -write-buffer SIZE   specifies write buffer in bytes for ISOBMF files\n"
-	        " -no-sys              removes all MPEG-4 Systems info except IOD (profiles)\n"
-	        "                       * Note: Set by default whith '-add' and '-cat'\n"
-	        " -no-iod              removes InitialObjectDescriptor from file\n"
-	        " -mfra                inserts movie fragment random offset when fragmenting file (ignored in dash mode).\n"
-	        " -isma                rewrites the file as an ISMA 1.0 AV file\n"
-	        " -ismax               same as \'-isma\' and removes all clock references\n"
-	        " -3gp                 rewrites as 3GPP(2) file (no more MPEG-4 Systems Info)\n"
-	        "                       * Note 1: some tracks may be removed in the process\n"
-	        "                       * Note 2: always on for *.3gp *.3g2 *.3gpp\n"
-	        " -ipod                rewrites the file for iPod\n"
-	        " -psp                 rewrites the file for PSP devices\n"
-	        " -brand ABCD[:v]      sets major brand of file, with optional version\n"
-	        " -ab ABCD             adds given brand to file's alternate brand list\n"
-	        " -rb ABCD             removes given brand from file's alternate brand list\n"
-	        " -cprt string         adds copyright string to movie\n"
-	        " -chap file           adds chapter information contained in file\n"
-	        " -set-track-id id1:id2 changes the id of a track from id1 to id2\n"
-	        " -swap-track-id id1:id2 swaps the IDs of the identified tracks\n"
-	        " -rem trackID         removes track from file\n"
-	        " -rap trackID         removes all non-RAP samples from track\n"
-	        " -refonly trackID    removes all non-reference pictures from track\n"
-	        " -enable trackID      enables track\n"
-	        " -disable trackID     disables track\n"
-	        " -new                 forces creation of a new destination file\n"
-	        " -timescale VAL       sets movie timescale to VAL ticks per second (default is 600)\n"
-	        " -lang [tkID=]LAN     sets track language. LAN is the BCP-47 code (eng, en-UK, ...)\n"
-	        " -delay tkID=TIME     sets track start delay in ms\n"
-	        " -par tkID=PAR        sets visual track pixel aspect ratio (PAR=N:D or \"none\" or \"force\" to write anyway)\n"
-	        " -hdr file            path to XML file describing HDR boxes (mdcv, clli, ...)"
-	        " -name tkID=NAME      sets track handler name\n"
-	        "                       * NAME can indicate a UTF-8 file (\"file://file name\"\n"
-	        " -itags tag1[:tag2]   sets iTunes tags to file - more info: MP4Box -tag-list\n"
-	        " -split time_sec      splits in files of time_sec max duration, starting each file at RAP.\n"
-	        "                       * Note: this removes all MPEG-4 Systems media\n"
-	        " -split-size size     splits in files of max filesize kB. same as -splits.\n"
-	        "                       * Note: this removes all MPEG-4 Systems media\n"
-	        " -split-rap           splits in files beginning at each RAP. same as -splitr.\n"
-	        "                       * Note: this removes all MPEG-4 Systems media\n"
-	        " -split-chunk S:E     extracts a new file from Start to End (in seconds). same as -splitx\n"
-	        "                       E may be a number, \"end\" or \"end-N\", where N is a number of seconds before the end\n"
-	        "                       * Note: this removes all MPEG-4 Systems media\n"
-	        " -splitz S:E          same as -split-chunk, but adjust the end time to be before the last RAP sample\n"
-	        "                       * Note: this removes all MPEG-4 Systems media\n"
-	        " -group-add fmt       creates a new grouping information in the file. Format is\n"
-	        "                      a colon-separated list of following options:\n"
-	        "                      refTrack=ID: ID of the track used as a group reference.\n"
-	        "                       If not set, the track will belong to the same group as the previous trackID specified.\n"
-	        "                       If 0 or no previous track specified, a new alternate group will be created\n"
-	        "                      switchID=ID: ID of the switch group to create.\n"
-	        "                       If 0, a new ID will be computed for you\n"
-	        "                       If <0, disables SwitchGroup\n"
-	        "                      criteria=string: list of space-separated 4CCs.\n"
-	        "                      trackID=ID: ID of the track to add to this group.\n"
-	        "\n"
-	        "                       *WARNING* Options modify state as they are parsed:\n"
-	        "                        trackID=1:criteria=lang:trackID=2\n"
-	        "                       is different from:\n"
-	        "                        criteria=lang:trackID=1:trackID=2\n"
-	        "\n"
-	        " -group-rem-track ID  removes track from its group\n"
-	        " -group-rem ID        removes the track's group\n"
-	        " -group-clean         removes all group information from all tracks\n"
-	        " -group-single        puts all tracks in a single group\n"
-	        " -ref id:XXXX:refID   adds a reference of type 4CC from track ID to track refID\n"
-	        " -keep-utc            keeps UTC timing in the file after edit\n"
-	        " -udta ID:[OPTS]      sets udta for given track or movie if ID is 0. OPTS is a colon separated list of:\n"
-	        "        type=CODE     where code is the 4CC code of the UDTA (not needed for box= option)\n"
-	        "        box=FILE	          where FILE is the location of the udta data, formatted as serialized boxes\n"
-#ifndef GPAC_DISABLE_CORE_TOOLS
-	        "        box=base64,DATA      where DATA is the base64 encoded udta data, formatted as serialized boxes\n"
-#endif
-	        "        src=FILE	          where FILE is the location of the udta data (will be stored in a single box of type CODE)\n"
-#ifndef GPAC_DISABLE_CORE_TOOLS
-	        "        src=base64,DATA      where DATA is the base64 encoded udta data (will be stored in a single box of type CODE)\n"
-#endif
-	        "	                   If no source is set, UDTA of type CODE will be removed\n"
-	        "\n");
+ 	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"
+					"  - 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"
+ 			"- 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"
+	        "- 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"
+	        "- criteria=string: list of space-separated 4CCs.\n"
+	        "- 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),
+
+	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"
+	        "- 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),
+
+
+	{0}
+};
+
+void PrintGeneralUsage()
+{
+	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 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"
+		"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"
+		"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."
+		"  \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];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-gen");
+	}
 }
 
+
+GF_GPACArg 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"
+	        "- $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"
+	        "- $Bandwidth$ is replaced by representation bandwidth.\n"
+	        "- $Init=NAME$ is replaced by NAME for init segment, ignored otherwise. May occur multiple times.\n"
+	        "- $Index=NAME$ is replaced by NAME for index segments, ignored otherwise. May occur multiple times.\n"
+	        "- $Path=PATH$ is replaced by PATH when creating segments, ignored otherwise. May occur multiple times.\n"
+	        "- $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments. May occur multiple times", 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"
+	"- 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"
+	"- 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, "enable video segmentation with same method as audio (i.e.: always try to split before or at the segment boundary - not after)", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("closest", NULL, "enable video segmentation closest 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"
+	"- 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"
+	"- 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"
+	        "- 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),
+	{0}
+};
+
 void PrintDASHUsage()
 {
-	fprintf(stderr, "DASH Options:\n"
-	        " -mpd m3u8            converts HLS manifest (local or remote http) to MPD\n"
-	        "                       Note: not compatible with other DASH options (except -out and -tmp) and does not convert associated segments\n"
-	        " -dash dur            enables DASH-ing of the file(s) with a segment duration of DUR ms\n"
-	        "                       Note: the duration of a fragment (subsegment) is set\n"
-	        "	                            using the -frag switch.\n"
-	        "                       Note: for onDemand profile, sets duration of a subsegment\n"
-	        " -dash-strict dur     [DEPRECATED, will behave like -dash]\n"
-	        " -dash-live[=F] dur   generates a live DASH session using dur segment duration, optionally writing live context to F\n"
-	        "                       MP4Box will run the live session until \'q\' is pressed or a fatal error occurs.\n"
-	        " -ddbg-live[=F] dur   same as -dash-live without time regulation for debug purposes.\n"
-	        " -frag time_in_ms     Specifies a fragment duration of time_in_ms.\n"
-	        "                       * Note: By default, this is the DASH duration\n"
-	        " -out filename        specifies output MPD file name.\n"
-	        " -tmp dirname         specifies directory for temporary file creation\n"
-	        "                       * Note: Default temp dir is OS-dependent\n"
-	        " -profile NAME        specifies the target DASH profile: \"onDemand\",\n"
-	        "                       \"live\", \"main\", \"simple\", \"full\",\n"
-	        "                       \"hbbtv1.5:live\", \"dashavc264:live\", \"dashavc264:onDemand\"\n"
-	        "                       * This will set default option values to ensure conformance to the desired profile\n"
-	        "                       * Default profile is \"full\" in static mode, \"live\" in dynamic mode\n"
-	        " -profile-ext STRING  specifies a list of profile extensions, as used by DASH-IF and DVB.\n"
-	        "                       The string will be colon-concatenated with the profile used\n"
-	        "\n"
-	        "Input media files to dash can use the following modifiers\n"
-	        " \"#trackID=N\"       only uses the track ID N from the source file\n"
-	        " \"#video\"           only uses the first video track from the source file\n"
-	        " \"#audio\"           only uses the first audio track from the source file\n"
-	        " \":id=NAME\"         sets the representation ID to NAME\n"
-	        " \":dur=VALUE\"       processes VALUE seconds from the media\n"
-	        "                       If VALUE is longer than media duration, last sample duration is extended.\n"
-	        " \":period=NAME\"     sets the representation's period to NAME. Multiple periods may be used\n"
-	        "                       period appear in the MPD in the same order as specified with this option\n"
-	        " \":BaseURL=NAME\"    sets the BaseURL. Set multiple times for multiple BaseURLs\n"
-	        "                        WARNING: this does NOT modify generated files location (see segment template).\n"
-	        " \":bandwidth=VALUE\" sets the representation's bandwidth to a given value\n"
-	        " \":period_duration=VALUE\"  increases the duration of this period by the given duration in seconds\n"
-	        "                       only used when no input media is specified (remote period insertion), eg :period=X:xlink=Z:duration=Y.\n"
-	        " \":xlink=VALUE\"     sets the xlink value for the period containing this element\n"
-	        "                       only the xlink declared on the first rep of a period will be used\n"
-	        " \":role=VALUE\"      sets the role of this representation (cf DASH spec).\n"
-	        "                       media with different roles belong to different adaptation sets.\n"
-	        " \":desc_p=VALUE\"    adds a descriptor at the Period level. Value must be a properly formatted XML element.\n"
-	        " \":desc_as=VALUE\"   adds a descriptor at the AdaptationSet level. Value must be a properly formatted XML element.\n"
-	        "                       two input files with different values will be in different AdaptationSet elements.\n"
-	        " \":desc_as_c=VALUE\" adds a descriptor at the AdaptationSet level. Value must be a properly formatted XML element.\n"
-	        "                       value is ignored while creating AdaptationSet elements.\n"
-	        " \":desc_rep=VALUE\"  adds a descriptor at the Representation level. Value must be a properly formatted XML element.\n"
-	        "                       value is ignored while creating AdaptationSet elements.\n"
-	        " \":sscale\"          forces movie timescale to match media timescale of the first track in the segment.\n"
-	        "\n"
-	        " -rap                 segments begin with random access points\n"
-	        "                       Note: segment duration may not be exactly what asked by\n"
-	        "                       \"-dash\" since encoded video data is not modified\n"
-	        " -frag-rap            All fragments begin with random access points\n"
-	        "                       Note: fragment duration may not be exactly what is asked by\n"
-	        "                       \"-frag\" since encoded video data is not modified\n"
-	        " -segment-name name   sets the segment name for generated segments\n"
-	        "                       If not set (default), segments are concatenated in output file\n"
-	        "                        except in \"live\" profile where dash_%%s is used\n"
-	        "                       Replacement strings supported:\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"
-	        "                      $Bandwidth$ is replaced by representation bandwidth.\n"
-	        "                      $Init=NAME$ is replaced by NAME for init segment, ignored otherwise. May occur multiple times.\n"
-	        "                      $Index=NAME$ is replaced by NAME for index segments, ignored otherwise. May occur multiple times.\n"
-	        "                      $Path=PATH$ is replaced by PATH when creating segments, ignored otherwise. May occur multiple times.\n"
-	        "                      $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments. May occur multiple times.\n"
-			"\n"
-	        " -segment-ext name    sets the segment extension. Default is m4s, \"null\" means no extension\n"
-	        " -init-segment-ext n  sets the segment extension for init segments (and index and bitstream switching segments). Default is mp4, \"null\" means no extension\n"
-	        " -segment-timeline    uses SegmentTimeline when generating segments.\n"
-	        " -segment-marker MARK adds a box of type \'MARK\' at the end of each DASH segment. MARK shall be a 4CC identifier\n"
-	        " -insert-utc          inserts UTC clock at the beginning of each ISOBMF segment\n"
-	        " -base-url string     sets Base url at MPD level. Can be used several times.\n"
-	        "                        WARNING: this does NOT modify generated files location (see segment template).\n"
-	        " -mpd-title string    sets MPD title.\n"
-	        " -mpd-source string   sets MPD source.\n"
-	        " -mpd-info-url string sets MPD info url.\n"
-	        " -cprt string         adds copyright string to MPD\n"
-	        " -dash-ctx FILE       stores/restore DASH timing from FILE.\n"
-	        " -dynamic             uses dynamic MPD type instead of static.\n"
-	        " -last-dynamic        same as dynamic but closes the period (insert lmsg brand if needed and update duration).\n"
-	        " -mpd-duration DUR    sets the duration in second of a live session (0 by default). If 0, you must use -mpd-refresh.\n"
-	        " -mpd-refresh TIME    specifies MPD update time in seconds (double can be used).\n"
-	        " -time-shift  TIME    specifies MPD time shift buffer depth in seconds (default 0). Specify -1 to keep all files\n"
-	        " -subdur DUR          specifies maximum duration in ms of the input file to be dashed in LIVE or context mode.\n"
-	        "                       NOTE: This does not change the segment duration: dashing stops once segments produced exceeded the duration.\n"
-	        "                       NOTE: If there is not enough samples to finish a segment, data is looped unless -no-loop is used (period end).\n"
-	        " -run-for TIME        runs for T ms of the dash-live session then exits\n"
-	        " -min-buffer TIME     specifies MPD min buffer time in milliseconds\n"
-	        " -ast-offset TIME     specifies MPD AvailabilityStartTime offset in ms if positive, or availabilityTimeOffset of each representation if negative. Default is 0 sec delay\n"
-	        " -dash-scale SCALE    specifies that timing for -dash and -frag are expressed in SCALE units per seconds\n"
-	        " -mem-frags           fragments will be produced in memory rather than on disk before flushing to disk\n"
-	        " -pssh-moof           [deprecated] use -pssh=f\n"
-	        " -pssh=MODE           sets pssh store mode. Mode can be v (moov), f (frag), m (mpd) mv/vm (moov+mpd) mf/fm (moof+mpd).\n"
-	        " -sample-groups-traf  stores sample group descriptions in traf (duplicated for each traf). If not used, sample group descriptions are stored in the movie box.\n"
-			" -mvex-after-traks    Stores mvex box after trak boxes within the moov box. If not used, mvex is before.\n"
-	        " -no-cache            disable file cache for dash inputs .\n"
-	        " -no-loop             disables looping content in live mode and uses period switch instead.\n"
-	        " -bound               enables video segmentation with same method as audio (i.e.: always try to split before or at the segment boundary - not after)\n"
-	        " -closest             enables video segmentation closest to the segment boundary (before or after)\n"
+	u32 i=0;
+	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"
+		"\n"
+		"# Specifying input files\n"
+		"Input media files to dash can use the following modifiers\n"
+		"- #trackID=N: only use the track ID N from the source file\n"
+		"- #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"
+		"- :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"
+		"- :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"
+		"- :desc_p=VALUE: add a descriptor at the Period level. Value must be a properly formatted XML element.\n"
+		"- :desc_as=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Two input files with different values will be in different AdaptationSet elements.\n"
+		"- :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.\n"
+		"- :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"
+		"\n"
+		"Note: `@@f` must be placed after all other options.\n"
+		"\n"
+		"# Options\n"
+		);
 
-	        "\n"
-	        "Advanced Options, should not be needed when using -profile:\n"
-	        " -subsegs-per-sidx N  sets the number of subsegments to be written in each SIDX box\n"
-	        "                       If 0, a single SIDX box is used per segment\n"
-	        "                       If -1, no SIDX box is used\n"
-	        " -ssix                Enables SubsegmentIndexBox (describing 2 ranges, first one from moof to end of first I-frame, second one unmapped). Doesn't work with daisy chaining mode\n"
-	        " -url-template        uses SegmentTemplate instead of explicit sources in segments.\n"
-	        "                       Ignored if segments are stored in the output file.\n"
-	        " -daisy-chain         uses daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0.\n"
-	        " -single-segment      uses a single segment for the whole file (OnDemand profile). \n"
-	        " -single-file         uses a single file for the whole file (default). \n"
-	        " -bs-switching MODE   sets bitstream switching to \"inband\" (default), \"merge\", \"multi\", \"no\" or \"single\" to test with single input.\n"
-	        " -moof-sn N           sets sequence number of first moof to N\n"
-	        " -tfdt N              sets TFDT of first traf to N in SCALE units (cf -dash-scale)\n"
-	        " -no-frags-default    disables default fragments flags in trex (required by some dash-if profiles and CMAF/smooth streaming compatibility)\n"
-	        " -single-traf         uses a single track fragment per moof (smooth streaming and derived specs may require this)\n"
-            " -tfdt-traf           uses a tfdt per track fragment (when -single-traf is used)\n"
-	        " -dash-ts-prog N      program_number to be considered in case of an MPTS input file.\n"
-	        " -frag-rt             when using fragments in live mode, flush fragments according to their timing (only supported with a single input).\n"
-	        " -cp-location=MODE    sets ContentProtection element location. Possible values for mode are:\n"
-	        "                        as: sets ContentProtection in AdaptationSet element\n"
-	        "                        rep: sets ContentProtection in Representation element\n"
-	        "                        both: sets ContentProtection in both elements\n"
-	        " -start-date          for live mode, sets start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ. Default is now.\n"
-	        "                        !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!\n"
-	        " -cues                ignores dash duration and segment according to cue times in given XML file. See tests/media/dash_cues for examples.\n"
-	        " -strict-cues         throw error if something is wrong while parsing cues or applying cue-based segmentation.\n"
-	        "\n");
+
+	while (m4b_dash_args[i].name) {
+		GF_GPACArg *arg = &m4b_dash_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-dash");
+	}
 }
 
-void PrintFormats()
+
+GF_GPACArg m4b_imp_args[] =
 {
-	fprintf(stderr, "Supported raw formats and file extensions:\n"
-	        " NHNT                 .media .nhnt .info\n"
-	        " NHML                 .nhml (opt: .media .info)\n"
-	        " MPEG-1-2 Video       .m1v .m2v\n"
-	        " MPEG-4 Video         .cmp .m4v\n"
-	        " H263 Video           .263 .h263\n"
-	        " AVC/H264 Video       .h264 .h26L .264 .26L .x264 .svc\n"
-	        " HEVC Video           .hevc .h265 .265 .hvc .shvc .lhvc .mhvc\n"
-	        " JPEG Images          .jpg .jpeg\n"
-	        " JPEG-2000 Images     .jp2\n"
-	        " PNG Images           .png\n"
-	        " MPEG 1-2 Audio       .mp3, .mp2, .m1a, .m2a\n"
-	        " ADTS-AAC Audio       .aac\n"
-	        " Dolby (e)AC-3 Audio  .ac3 .ec3\n"
-	        " AMR(WB) Audio        .amr .awb\n"
-	        " EVRC Audio           .evc\n"
-	        " SMV Audio            .smv\n"
-	        "\n"
-	        "Supported containers and file extensions:\n"
-	        " AVI                  .avi\n"
-	        " MPEG-2 PS            .mpg .mpeg .vob .vcd .svcd\n"
-	        " MPEG-2 TS            .ts .m2t\n"
-	        " QCP                  .qcp\n"
-	        " OGG                  .ogg\n"
-	        " ISO-Media files      no extension checking\n"
-	        "\n"
-	        "Supported text formats:\n"
-	        " SRT Subtitles        .srt\n"
-	        " SUB Subtitles        .sub\n"
-	        " VobSub               .idx\n"
-	        " GPAC Timed Text      .ttxt\n"
-	        " VTT                  .vtt\n"
-	        " TTML                 .ttml\n"
-	        " QuickTime TeXML Text .xml  (cf QT documentation)\n"
-	        "\n"
-	        "Supported Scene formats:\n"
-	        " MPEG-4 XMT-A         .xmt .xmta .xmt.gz .xmta.gz\n"
-	        " MPEG-4 BT            .bt .bt.gz\n"
-	        " MPEG-4 SAF           .saf .lsr\n"
-	        " VRML                 .wrl .wrl.gz\n"
-	        " X3D-XML              .x3d .x3d.gz\n"
-	        " X3D-VRML             .x3dv .x3dv.gz\n"
-	        " MacroMedia Flash     .swf (very limited import support only)\n"
-	        "\n"
-	        "Supported chapter formats:\n"
-	        " Nero chapters        .txt .chap\n"
-	        "\n"
-	       );
-}
+ 	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: Note: 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`\nWarning: 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).\nNote: Maximum value is 15", NULL, NULL, GF_ARG_INT, 0),
+	{0}
+};
 
 void PrintImportUsage()
 {
-	fprintf(stderr, "Importing Options\n"
-	        "\nFile importing syntax:\n"
-	        " \"#video\" \"#audio\"  base import for most AV files\n"
-	        " \"#trackID=ID\"        track import for IsoMedia and other files\n"
-	        " \"#pid=ID\"            stream import from MPEG-2 TS\n"
-	        " \":dur=D\"             imports only the first D seconds\n"
-	        " \":lang=LAN\"          sets imported media language code\n"
-	        " \":delay=delay_ms\"    sets imported media initial delay in ms\n"
-	        " \":par=PAR\"           sets visual pixel aspect ratio (PAR=Num:Den)\n"
-	        " \":name=NAME\"         sets track handler name\n"
-	        " \":ext=EXT\"           overrides file extension when importing\n"
-	        " \":hdlr=code\"         sets track handler type to the given code point (4CC)\n"
-	        " \":disable\"           imported track(s) will be disabled\n"
-	        " \":group=G\"           adds the track as part of the G alternate group.\n"
-	        "                         If G is 0, the first available GroupID will be picked.\n"
-	        " \":fps=VAL\"           same as -fps option\n"
-	        " \":rap\"               imports only RAP samples\n"
-	        " \":refs\"              imports only reference pictures\n"
-	        " \":trailing\"          keeps trailing 0-bytes in AVC/HEVC samples\n"
-	        " \":agg=VAL\"           same as -agg option\n"
-	        " \":dref\"              same as -dref option\n"
-	        " \":keep_refs\"         keeps track reference when importing a single track\n"
-	        " \":nodrop\"            same as -nodrop option\n"
-	        " \":packed\"            same as -packed option\n"
-	        " \":sbr\"               same as -sbr option\n"
-	        " \":sbrx\"              same as -sbrx option\n"
-	        " \":ovsbr\"             same as -ovsbr option\n"
-	        " \":ps\"                same as -ps option\n"
-	        " \":psx\"               same as -psx option\n"
-	        " \":asemode=MODE\"      sets the mode to create the AudioSampleEntry\n"
-	        " \"                       v0-bs : uses MPEG AudioSampleEntry v0 and the channel count from the bitstream (even if greater than 2) - default\n"
-	        " \"                       v0-2  : uses MPEG AudioSampleEntry v0 and the channel count is forced to 2\n"
-	        " \"                       v1    : uses MPEG AudioSampleEntry v1 and the channel count from the bitstream\n"
-	        " \"                       v1-qt : uses QuickTime Sound Sample Description Version 1 and the channel count from the bitstream (even if greater than 2)\n"
-			" \":audio_roll=N\"      adds a roll sample group with roll_distance = N\n"
-	        " \":mpeg4\"             same as -mpeg4 option\n"
-	        " \":nosei\"             discard all SEI messages during import\n"
-	        " \":svc\"               import SVC/LHVC with explicit signaling (no AVC base compatibility)\n"
-	        " \":nosvc\"             discard SVC/LHVC data when importing\n"
-	        " \":svcmode=MODE\"      sets SVC/LHVC import mode:\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/HEVC 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\n"
-	        " \":temporal\"          sets HEVC/LHVC temporal sublayer import mode:\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\n"
-	        " \":subsamples\"        adds SubSample information for AVC+SVC\n"
-	        " \":deps\"              import sample dependency information for AVC and HEVC\n"
-	        " \":ccst\"              adds default HEIF ccst box to visual sample entry\n"
-	        " \":forcesync\"         forces non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
-	        "       !! RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players\n"
-	        " \":xps_inband\"        Sets xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)\n"
-	        " \":au_delim\"          Keeps AU delimiter NAL units in the imported file\n"
-	        " \":max_lid=N\"         sets HEVC max layer ID to be imported to N. Default imports all.\n"
-	        " \":max_tid=N\"         sets HEVC max temporal ID to be imported to N. Default imports all.\n"
-	        " \":tiles\"             adds HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks.\n"
-	        " \":split_tiles\"       splits HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track.\n"
-	        " \":negctts\"           uses negative CTS-DTS offsets (ISO4 brand)\n"
-	        " \":stype=4CC\"         forces the sample description type to a different value\n"
-	        "                         !! THIS MAY BREAK THE FILE WRITING !!\n"
-	        " \":chap\"              specifies the track is a chapter track\n"
-	        " \":chapter=NAME\"      adds a single chapter (old nero format) with given name lasting the entire file\n"
-	        "                         This command can be used in -cat as well\n"
-	        " \":chapfile=file\"     adds a chapter file (old nero format)\n"
-	        "                         This command can be used in -cat as well\n"
-	        " \":layout=WxHxXxY\"    specifies the track layout\n"
-	        "                         - if W (resp H) = 0, the max width (resp height) of\n"
-	        "                         the tracks in the file are used.\n"
-	        "                         - if Y=-1, the layout is moved to the bottom of the\n"
-	        "                         track area\n"
-	        "                         - X and Y can be omitted (:layout=WxH)\n"
-	        " \":rescale=TS\"        forces media timescale to TS !! changes the media duration\n"
-	        " \":timescale=TS\"      sets imported media timescale to TS.\n"
-	        " \":moovts=TS\"         sets movie timescale to TS. A negative value picks the media timescale of the first track imported.\n"
-	        " \":noedit\"            do not set edit list when importing B-frames video tracks\n"
-	        " \":rvc=FILENAME\"      sets RVC configuration for the media\n"
-	        " \":fmt=FORMAT\"        overrides format detection with given format (cf BT/XMTA doc)\n"
-	        " \":profile=INT\"       overrides AVC profile\n"
-	        " \":level=INT\"         overrides AVC level\n"
-	        " \":novpsext\"          removes VPS extensions from HEVC VPS\n"
-	        " \":keepav1t\"          keeps AV1 temporal delimiter OBU in samples, might help if source file had losses\n"
-
-	        " \":font=name\"         specifies font name for text import (default \"Serif\")\n"
-	        " \":size=s\"            specifies font size for text import (default 18)\n"
-	        " \":text_layout=WxHxXxY\"    specifies the track text layout\n"
-	        "                         - if W (resp H) = 0, the max width (resp height) of\n"
-	        "                         the tracks in the file are used.\n"
-	        "                         - if Y=-1, the layout is moved to the bottom of the\n"
-	        "                         track area\n"
-	        "                         - X and Y can be omitted (:layout=WxH)\n"
-
-	        " \":swf-global\"        all SWF defines are placed in first scene replace\n"
-	        "                         * Note: By default SWF defines are sent when needed\n"
-	        " \":swf-no-ctrl\"       uses a single stream for movie control and dictionary\n"
-	        "                         * Note: this will disable ActionScript\n"
-	        " \":swf-no-text\"       removes all SWF text\n"
-	        " \":swf-no-font\"       removes all embedded SWF Fonts (terminal fonts used)\n"
-	        " \":swf-no-line\"       removes all lines from SWF shapes\n"
-	        " \":swf-no-grad\"       removes all gradients from swf shapes\n"
-	        " \":swf-quad\"          uses quadratic bezier curves instead of cubic ones\n"
-	        " \":swf-xlp\"           support for lines transparency and scalability\n"
-	        " \":swf-ic2d\"          uses indexed curve 2D hardcoded proto\n"
-	        " \":swf-same-app\"      appearance nodes are reused\n"
-	        " \":swf-flatten=ang\"   complementary angle below which 2 lines are merged\n"
-	        "                         * Note: angle \'0\' means no flattening\n"
-	        " \":kind=schemeURI=value\"  sets kind for the track\n"
-	        " \":txtflags=flags\"    sets display flags (hexa number) of text track\n"
-	        " \":txtflags+=flags\"   adds display flags (hexa number) to text track\n"
-	        " \":txtflags-=flags\"   removes display flags (hexa number) from text track\n"
-	        " \":rate=VAL\"          forces average rate and max rate to VAL (in bps) in btrt box. If 0, removes btrt box\n"
-	        " \":bitdepth=VAL\"      sets bit depth to VAL for imported video content (default is 24)\n"
-	        " \":colr=OPT\"           sets color profile for imported video content (see ISO/IEC 23001-8). OPT 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"
-	        "                         - \"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\n"
-	        "\n"
-	        " -add file              add file tracks to (new) output file\n"
-	        " -cat file              concatenates file samples to (new) output file\n"
-	        "                         * Note: creates tracks if needed\n"
-	        "                         * Note: aligns initial timestamp of the file to be concatenated.\n"
-	        " -catx file             same as cat but new tracks can be imported before concatenation by specifying '+ADD_COMMAND'\n"
-	        "                        where ADD_COMMAND is a regular -add syntax\n"
-	        " -catpl file            concatenates files listed in the given file (one file per line, lines starting with # are comments).\n"
-	        "                         * each listed file is concatenated as if called with -cat\n"
-	        " -unalign-cat           does not attempt to align timestamps of samples inbetween tracks\n"
-	        " -force-cat             skips media configuration check when concatenating file\n"
-	        "                         !!! THIS MAY BREAK THE CONCATENATED TRACK(S) !!!\n"
-	        " -keep-sys              keeps all MPEG-4 Systems info when using '-add' / 'cat'\n"
-	        " -keep-all              keeps all existing tracks when using '-add'\n"
-	        "                         * Note: only used when adding IsoMedia files\n"
-	        "\n"
-	        "All the following options can be specified as default or for each track.\n"
-	        "When specified by track the syntax is \":opt\" or \":opt=val\".\n\n"
-	        " -dref                  keeps media data in original file\n"
-	        " -no-drop               forces constant FPS when importing AVI video\n"
-	        " -packed                forces packed bitstream when importing raw ASP\n"
-	        " -sbr                   backward compatible signaling of AAC-SBR\n"
-	        " -sbrx                  non-backward compatible signaling of AAC-SBR\n"
-	        " -ps                    backward compatible signaling of AAC-PS\n"
-	        " -psx                   non-backward compatible signaling of AAC-PS\n"
-	        " -ovsbr                 oversample SBR\n"
-	        "                         * Note: SBR AAC, PS AAC and oversampled SBR cannot be detected at import time\n"
-	        " -fps FPS               forces frame rate for video and SUB subtitles import\n"
-	        "                         FPS is either a number or expressed as timescale-increment\n"
-	        "                         * For raw H263 import, default FPS is 15\n"
-	        "                         * For all other imports, default FPS is 25\n"
-	        "                         !! THIS IS IGNORED FOR IsoMedia IMPORT !!\n"
-	        " -mpeg4                 forces MPEG-4 sample descriptions when possible (3GPP2)\n"
-	        "                         For AAC, forces MPEG-4 AAC signaling even if MPEG-2\n"
-	        " -agg N                 aggregates N audio frames in 1 sample (3GP media only)\n"
-	        "                         * Note: Maximum value is 15 - Disabled by default\n"
-	        "\n"
-	       );
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# Importing Options\n"
+		"# File importing\n"
+		"Syntax is [-add]() / [-cat]() `filename[#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, the following syntax is used:\n"
+		"- `-add inputFile#video`: adds the first video track in `inputFile`.\n"
+		"- `-add inputFile#audio`: adds the first audio track in `inputFile`.\n"
+		"- `-add inputFile#trackID=ID` or `-add inputFile#ID`: adds the specified track. For IsoMedia files, ID is the track ID. For other media files, ID is the value indicated by `MP4Box -info inputFile`.\n"
+		"  \n"
+		"By default all imports are performed sequentially, and final interleaving is done at the end; this however requires a temporary file holding input 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]() option, but this disables media interleaving.\n"
+		"  \n"
+		"If you wish to create an interleaved new file with no temporary storage, use the [-newfs]() 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). \n"
+		" - Some muxing options (marked with `*` below) will be activated for all inputs (i.e. in this mode, it is not possible to import one AVC track with `xps_inband` and another without).\n"
+		" - Some muxing options (marked as `!` below) cannot be used in this mode as they require temporary storage for file edition.\n"
+		" - Usage of [-cat]() is possible in this mode, 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"
+		"  \n"
+		"MP4Box can import a desired amount of the input file rather than the whole file. To do this, use the syntax `-add inputFile:dur=N`, where N is the number of seconds you wish to import from input. MP4Box cannot start importing from a random point in the input, it always import from the begining.\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). Check [TTXT doc](Subtitling-with-GPAC) for more details.\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]`.\n"
+		"  \n"
+		""
+		"Allowed per-file options:\n"
+		"- #video, #audio: base import for most AV files\n"
+		"- #trackID=ID: track import for IsoMedia and other files\n"
+		"- #pid=ID: stream import from MPEG-2 TS\n"
+		"- :dur=D: `*` import only the specified duration from the media. D 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\n"
+		"- :lang=LAN: set imported media language code\n"
+		"- :delay=delay_ms: set imported media initial delay in ms\n"
+		"- :par=PAR: set visual pixel aspect ratio (see [-par](MP4B_GEN) )\n"
+		"- :clap=CLAP: set visual clean aperture (see [-clap](MP4B_GEN) )\n"
+		"- :mx=MX: sets track matrix (see [-mx](MP4B_GEN) )\n"
+		"- :name=NAME: set track handler name\n"
+		"- :ext=EXT: override file extension when importing\n"
+		"- :hdlr=code: set track handler type to the given code point (4CC)\n"
+		"- :disable: imported track(s) will be disabled\n"
+		"- :group=G: add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked.\n"
+		"- :fps=VAL: same as [-fps]()\n"
+		"- :rap: `!` import only RAP samples\n"
+		"- :refs: `!` import only reference pictures\n"
+		"- :trailing: keep trailing 0-bytes in AVC/HEVC samples\n"
+		"- :agg=VAL: `*` same as [-agg]()\n"
+		"- :dref: `*` same as [-dref]()\n"
+		"- :keep_refs: keeps track reference when importing a single track\n"
+		"- :nodrop: same as [-nodrop]()\n"
+		"- :packed: `*` same as [-packed]()\n"
+		"- :sbr: same as [-sbr]()\n"
+		"- :sbrx: same as [-sbrx]()\n"
+		"- :ovsbr: same as [-ovsbr]()\n"
+		"- :ps: same as [-ps]()\n"
+		"- :psx: same as [-psx]()\n"
+		"- :asemode=MODE: `*` set the mode to create the AudioSampleEntry\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\n"
+		"- :audio_roll=N: add a roll sample group with roll_distance `N`\n"
+		"- :mpeg4: `*` same as [-mpeg4]() option\n"
+		"- :nosei: discard all SEI messages during import\n"
+		"- :svc: import SVC/LHVC with explicit signaling (no AVC base compatibility)\n"
+		"- :nosvc: discard SVC/LHVC data when importing\n"
+		"- :svcmode=MODE: `!` set SVC/LHVC import mode\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\n"
+		"- :temporal: `!` set HEVC/LHVC temporal sublayer import mode\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\n"
+		"- :subsamples: add SubSample information for AVC+SVC\n"
+		"- :deps: import sample dependency information for AVC and HEVC\n"
+		"- :ccst: add default HEIF ccst box to visual sample entry\n"
+		"- :forcesync: force non IDR samples with I slices to be marked as sync points (AVC GDR)\n"
+		"Warning: RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players\n"
+		"- :xps_inband: `*` set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)\n"
+		"- :xps_inbandx: `*` same as xps_inband and also keep first xPS in sample desciption\n"
+		"- :au_delim: keep AU delimiter NAL units in the imported file\n"
+		"- :max_lid=N: set HEVC max layer ID to be imported to `N` (by default imports all layers)\n"
+		"- :max_tid=N: set HEVC max temporal ID to be imported to `N` (by default imports all temporal sublayers)\n"
+		"- :tiles: add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks\n"
+		"- :split_tiles: `!` split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track.\n"
+		"- :negctts: use negative CTS-DTS offsets (ISO4 brand)\n"
+		"- :chap: specify the track is a chapter track\n"
+		"- :chapter=NAME: add a single chapter (old nero format) with given name lasting the entire file\n"
+		"- :chapfile=file: adds a chapter file (old nero format)\n"
+		"- :layout=WxHxXxY: specify the track layout\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`\n"
+		"- :rescale=TS: force media timescale to TS !! changes the media duration\n"
+		"- :timescale=TS: set imported media timescale to TS.\n"
+		"- :moovts=TS: set movie timescale to TS. A negative value picks the media timescale of the first track imported.\n"
+		"- :noedit: `*` do not set edit list when importing B-frames video tracks\n"
+		"- :rvc=FILENAME: set RVC configuration for the media\n"
+		"- :fmt=FORMAT: override format detection with given format (cf BT/XMTA doc)\n"
+		"- :profile=INT: override AVC profile\n"
+		"- :level=INT: override AVC level\n"
+		"- :novpsext: remove VPS extensions from HEVC VPS\n"
+		"- :keepav1t: keep AV1 temporal delimiter OBU in samples, might help if source file had losses\n"
+		"- :font=name: specify font name for text import (default `Serif`)\n"
+		"- :size=s: specify font size for text import (default `18`)\n"
+		"- :text_layout=WxHxXxY: specify the track text layout\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`\n"
+		"- :swf-global: all SWF defines are placed in first scene replace rather than when needed\n"
+		"- :swf-no-ctrl: use a single stream for movie control and dictionary (this will disable ActionScript)\n"
+		"- :swf-no-text: remove all SWF text\n"
+		"- :swf-no-font: remove all embedded SWF Fonts (local playback host fonts used)\n"
+		"- :swf-no-line: remove all lines from SWF shapes\n"
+		"- :swf-no-grad: remove all gradients from SWF shapes\n"
+		"- :swf-quad: use quadratic bezier curves instead of cubic ones\n"
+		"- :swf-xlp: support for lines transparency and scalability\n"
+		"- :swf-ic2d: use indexed curve 2D hardcoded proto\n"
+		"- :swf-same-app: appearance nodes are reused\n"
+		"- :swf-flatten=ang: complementary angle below which 2 lines are merged, `0` means no flattening\n"
+		"- :kind=schemeURI=value: set kind for the track\n"
+		"- :txtflags=flags: set display flags (hexa number) of text track\n"
+		"- :txtflags+=flags: add display flags (hexa number) to text track\n"
+		"- :txtflags-=flags: remove display flags (hexa number) from text track\n"
+		"- :rate=VAL: force average rate and max rate to VAL (in bps) in btrt box. If 0, removes btrt box\n"
+		"- :stz2: use compact size table (for low-bitrates)\n"
+		"- :bitdepth=VAL: set bit depth to VAL for imported video content (default is 24)\n"
+		"- :colr=OPT: set color profile for imported video content (see ISO/IEC 23001-8). `OPT` 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"
+		"  - 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\n"
+		"- :dv-profile=VAL: set the Dolby Vision profile\n"
+		"- :tc=VAL: inject a single QT timecode. `VAL` is formated 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\n"
+		"- :lastsampdur[=VAL]\" sets duration of the last sample. `VAL` is formated 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\n"
+		"- :fstat: print filter session stats after import\n"
+		"- :fgraph: print filter session graph after import\n"
+		"- :sopt:[OPTS]: set `OPTS` as additional arguments to source filter. `OPTS` can be any usual filter argument, see [filter doc `gpac -h doc`](Filters)\n"
+		"- :dopt:[OPTS]: `*` set `OPTS` as additional arguments to [destination filter](mp4mx). OPTS can be any usual filter argument, see [filter doc `gpac -h doc`](Filters)\n"
+		"- @@f1[:args][@@fN:args]: 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\n"
+		"\n"
+		"Note: `sopt`, `dopt` and `@@f` must be placed after all other options.\n"
+		"# Global import options\n"
+	);
+	while (m4b_imp_args[i].name) {
+		GF_GPACArg *arg = &m4b_imp_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-import");
+	}
 }
 
+GF_GPACArg m4b_senc_args[] =
+{
+ 	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.\nNote: 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.\nNote: cannot be used with [-sync]()", NULL, NULL, GF_ARG_INT, 0),
+ 	GF_DEF_ARG("log", 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),
+ 	{0}
+};
+
+
 void PrintEncodeUsage()
 {
-	fprintf(stderr, "MPEG-4 Scene Encoding Options\n"
-	        " -mp4                 specify input file is for encoding.\n"
-	        " -def                 encode DEF names\n"
-	        " -sync time_in_ms     forces BIFS sync sample generation every time_in_ms\n"
-	        "                       * Note: cannot be used with -shadow\n"
-	        " -shadow time_ms      forces BIFS sync shadow sample generation every time_ms.\n"
-	        "                       * Note: cannot be used with -sync\n"
-	        " -log                 generates scene codec log file if available\n"
-	        " -ms file             specifies file for track importing\n"
-	        "\nChunk Processing\n"
-	        " -ctx-in file         specifies initial context (MP4/BT/XMT)\n"
-	        "                       * Note: input file must be a commands-only file\n"
-	        " -ctx-out file        specifies storage of updated context (MP4/BT/XMT)\n"
-	        "\n"
-	        "LASeR Encoding options\n"
-	        " -resolution res      resolution factor (-8 to 7, default 0)\n"
-	        "                       all coords are multiplied by 2^res before truncation\n"
-	        " -coord-bits bits     bits used for encoding truncated coordinates\n"
-	        "                       (0 to 31, default 12)\n"
-	        " -scale-bits bits     extra bits used for encoding truncated scales\n"
-	        "                       (0 to 4, default 0)\n"
-	        " -auto-quant res      resolution is given as if using -resolution\n"
-	        "                       but coord-bits and scale-bits are infered\n"
-	       );
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# MPEG-4 Scene Encoding Options\n"
+		"## General considerations\n"
+		"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\n"
+		"Any media track specified through a `MuxInfo` element will be imported in the resulting MP4 file.\n"
+		"See https://wiki.gpac.io/MPEG-4-BIFS-Textual-Format and related pages.\n"
+		"## 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 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"
+		"  \n"
+		"Options:\n"
+	);
+
+	while (m4b_senc_args[i].name) {
+		GF_GPACArg *arg = &m4b_senc_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-senc");
+	}
 }
 
+GF_GPACArg 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),
+ 	{0}
+};
+
 void PrintEncryptUsage()
 {
-	fprintf(stderr, "ISMA Encryption/Decryption Options\n"
-	        " -crypt drm_file      crypts a specific track using ISMA AES CTR 128\n"
-	        " -decrypt [drm_file]  decrypts a specific track using ISMA AES CTR 128\n"
-	        "                       * Note: drm_file can be omitted if keys are in file\n"
-	        " -set-kms kms_uri     changes KMS location for all tracks or a given one.\n"
-	        "                       * to address a track, use \'tkID=kms_uri\'\n"
-	        "\n"
-	        "DRM file syntax for GPAC ISMACryp:\n"
-	        "                      File is XML and shall start with xml header\n"
-	        "                      File root is an \"ISMACryp\" element\n"
-	        "                      File is a list of \"cryptrack\" elements\n"
-	        "\n"
-	        "cryptrack attributes are\n"
-	        " TrackID              ID of track to en/decrypt\n"
-	        " key                  AES-128 key formatted (hex string \'0x\'+32 chars)\n"
-	        " salt                 CTR IV salt key (64 bits) (hex string \'0x\'+16 chars)\n"
-	        "\nEncryption only attributes:\n"
-	        " Scheme_URI           URI of scheme used\n"
-	        " KMS_URI              URI of key management system\n"
-	        "                       * Note: \'self\' writes key and salt in the file\n"
-	        " selectiveType        selective encryption type - understood values are:\n"
-	        "   \"None\"             all samples encrypted (default)\n"
-	        "   \"Clear\"            all samples clean (not encrypted)\n"
-	        "   \"RAP\"              only encrypts random access units\n"
-	        "   \"Non-RAP\"          only encrypts non-random access units\n"
-	        "   \"Rand\"             random selection is performed\n"
-	        "   \"X\"                Encrypts every first sample out of X (uint)\n"
-	        "   \"RandX\"            Encrypts one random sample out of X (uint)\n"
-	        "\n"
-	        " ipmpType             IPMP Signaling Type: None, IPMP, IPMPX\n"
-	        " ipmpDescriptorID     IPMP_Descriptor ID to use if IPMP(X) is used\n"
-	        "                       * If not set MP4Box will generate one for you\n"
-	        "\n"
-	       );
+	u32 i=0;
+	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"
+	"  \n"
+	"Options:\n"
+	);
+	while (m4b_crypt_args[i].name) {
+		GF_GPACArg *arg = &m4b_crypt_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-crypt");
+	}
 }
 
+GF_GPACArg m4b_hint_args[] =
+{
+ 	GF_DEF_ARG("hint", NULL, "hint the file for RTP/RTSP", NULL, NULL, GF_ARG_BOOL, 0),
+ 	GF_DEF_ARG("hint", 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("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),
+ 	{0}
+};
+
 void PrintHintUsage()
 {
-	fprintf(stderr, "Hinting Options\n"
-	        " -hint                hints the file for RTP/RTSP\n"
-	        " -mtu size            specifies RTP MTU (max size) in bytes. Default size is 1450\n"
-	        "                       * Note: this includes the RTP header (12 bytes)\n"
-	        " -copy                copies media data to hint track rather than reference\n"
-	        "                       * Note: speeds up server but takes much more space\n"
-	        " -multi [maxptime]    enables frame concatenation in RTP packets if possible\n"
-	        "        maxptime       max packet duration in ms (optional, default 100ms)\n"
-	        " -rate ck_rate        specifies rtp rate in Hz when no default for payload\n"
-	        "                       * Note: default value is 90000 (MPEG rtp rates)\n"
-	        " -mpeg4               forces MPEG-4 generic payload whenever possible\n"
-	        " -latm                forces MPG4-LATM transport for AAC streams\n"
-	        " -static              enables static RTP payload IDs whenever possible\n"
-	        "                       * By default, dynamic payloads are always used\n"
-	        "\n"
-	        "MPEG-4 Generic Payload Options\n"
-	        " -ocr                 forces all streams to be synchronized\n"
-	        "                       * Most RTSP servers only support synchronized streams\n"
-	        " -rap                 signals random access points in RTP packets\n"
-	        " -ts                  signals AU Time Stamps in RTP packets\n"
-	        " -size                signals AU size in RTP packets\n"
-	        " -idx                 signals AU sequence numbers in RTP packets\n"
-	        " -iod                 prevents systems tracks embedding in IOD\n"
-	        "                       * Note: shouldn't be used with -isma option\n"
-	        "\n"
-	        " -add-sdp string      adds sdp string to (hint) track (\"-add-sdp tkID:string\")\n"
-	        "                       or movie. This will take care of SDP lines ordering\n"
-	        " -unhint              removes all hinting information.\n"
-	        "\n");
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# Hinting Options\n"
+		"IsoMedia hinting consists in creating special tracks in the file that contain transport protocol specific information and optionally multiplexing information. These tracks are then used by the server to create the actual packets being sent over the network, in other words they provide the server with hints on how to build packets, hence their names `hint tracks`.\n"
+		"MP4Box supports creation of hint tracks for RTSP servers supporting these such as QuickTime Streaming Server, DarwinStreaming Server or 3GPP-compliant RTSP servers.\n"
+		"Note: GPAC streaming tools [rtp output](rtpout) and [rtsp server](rtspout) do not use hint tracks, they use on-the-fly packetization "
+		"from any media sources, not just MP4\n"
+		"  \n"
+		"Options:\n"
+	);
+	while (m4b_hint_args[i].name) {
+		GF_GPACArg *arg = &m4b_hint_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-hint");
+	}
 }
+
+
+GF_GPACArg 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),
+ 	{0}
+};
+
 void PrintExtractUsage()
 {
-	fprintf(stderr, "Extracting Options:\n"
-	        " -raw TrackID         extracts track in raw format when supported\n"
-	        "                      :output=FileName sets the output filename for this extraction \n"
-	        " -raws TrackID        extract each track sample to a file\n"
-	        "                       * Note: \"TrackID:N\" extracts Nth sample\n"
-	        " -nhnt TrackID        extracts track in nhnt format\n"
-	        " -nhml TrackID        extracts track in nhml format (XML nhnt).\n"
-	        "                       * Note: \"-nhml TrackID:full\" for full dump\n"
-	        " -webvtt-raw TrackID  extracts raw media track in WebVTT as metadata.\n"
-	        "                       * Note: \"-webvtt-raw TrackID:embedded\" to include media data in the WebVTT file\n"
-	        " -six TrackID		   extracts raw media track in experimental XML streaming instructions.\n"
-	        " -single TrackID      extracts track to a new mp4 file\n"
-	        " -avi TrackID         extracts visual track to an avi file\n"
-	        " -qcp TrackID         same as \'-raw\' but defaults to QCP file for EVRC/SMV\n"
-	        " -aviraw TK           extracts AVI track in raw format\n"
-	        "			            $TK can be one of \"video\" \"audio\" \"audioN\"\n"
-	        " -saf                 remux file to SAF multiplex\n"
-	        " -dvbhdemux           demux DVB-H file into IP Datagrams\n"
-	        "                       * Note: can be used when encoding scene descriptions\n"
-	        " -raw-layer ID        same as -raw but skips SVC/MVC extractors when extracting\n"
-	        " -diod                extracts file IOD in raw format when supported\n"
-	        "\n"
-#if !defined(GPAC_DISABLE_STREAMING)
-	        " -grab-ts IP:port     grabs TS over UDP or RTP at IP:port location to output TS file\n"
-	        " -ifce IFCE           indicates default ifce for grab operations\n"
-#endif
-	        "\n");
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# Extracting Options\n"
+	"MP4Box can be used to extract media tracks from MP4 files. If you need to convert these tracks however, please check the [filters doc](Filters).\n"
+	"  \n"
+	"Options:\n"
+	);
+	while (m4b_extr_args[i].name) {
+		GF_GPACArg *arg = &m4b_extr_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
+	}
 }
+
+GF_GPACArg 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", 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-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),
+ 	{0}
+};
+
 void PrintDumpUsage()
 {
-	fprintf(stderr, "Dumping Options\n"
-	        " -stdb                dumps/write to stdout and assumes stdout is opened in binary mode\n"
-	        " -std                 dumps/write to stdout and try to reopen stdout in binary mode.\n"
-	        " -info [trackID]      prints movie info / track info if trackID specified\n"
-	        "                       * Note: for non IsoMedia files, gets import options\n"
-	        " -bt                  scene to bt format - removes unknown MPEG4 nodes\n"
-	        " -xmt                 scene to XMT-A format - removes unknown MPEG4 nodes\n"
-	        " -wrl                 scene VRML format - removes unknown VRML nodes\n"
-	        " -x3d                 scene to X3D/XML format - removes unknown X3D nodes\n"
-	        " -x3dv                scene to X3D/VRML format - removes unknown X3D nodes\n"
-	        " -lsr                 scene to LASeR format\n"
-	        " -diso                dumps IsoMedia file boxes in XML output\n"
-	        " -dxml                dumps IsoMedia file boxes and known track samples in XML output\n"
-	        " -drtp                rtp hint samples structure to XML output\n"
-	        " -dts                 prints sample timing, size and position in file to text output\n"
-	        " -dtsx                same as -dts but does not print offset\n"
-	        " -dtsc                same as -dts but analyse each sample for duplicated dts/cts - slow !\n"
-	        " -dtsxc               same as -dtsc does not print offset - slow !\n"
-	        " -dnal trackID        prints NAL sample info of given track\n"
-	        " -dnalc trackID       prints NAL sample info of given track, adding CRC for each nal\n"
-	        " -sdp                 dumps SDP description of hinted file\n"
-	        " -sdp                 dumps SDP description of hinted file\n"
-	        " -dsap trackID        dumps DASH SAP cues (see -cues) for a given track.\n"
-	        "                       use -dsaps to only print sample number, -dsapc to only CTS, -dsapd to only print DTS, -dsapp to only print presentation time.\n"
-	        " -dcr                 ISMACryp samples structure to XML output\n"
-	        " -dump-cover          extracts cover art\n"
-	        " -dump-chap           extracts chapter file\n"
-	        " -dump-chap-ogg       extracts chapter file as OGG format\n"
-	        " -dump-udta [ID:]4cc  extracts udta for the given 4CC. If ID is given, dumps from UDTA of the given track ID, otherwise moov is used.\n"
-	        "\n"
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	        " -ttxt                converts input subtitle to GPAC TTXT format\n"
-#endif
-	        " -ttxt TrackID        dumps Text track to GPAC TTXT format\n"
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	        " -srt                 converts input subtitle to SRT format\n"
-#endif
-	        " -srt TrackID         dumps Text track to SRT format\n"
-	        "\n"
-	        " -rip-mpd             download manifest and segments of an MPD. Does not work with live sessions\n"
-	        "\n"
-	        " -stat                generates node/field statistics for scene\n"
-	        " -stats               generates node/field statistics per MPEG-4 Access Unit\n"
-	        " -statx               generates node/field statistics for scene after each AU\n"
-	        "\n"
-	        " -hash                generates SHA-1 Hash of the input file\n"
-	        "\n"
-	        " -comp BOXLIST        compresses top level box listed. The list is formated as orig_4cc_1=comp_4cc_1[,orig_4cc_2=comp_4cc_2]\n"
-#ifndef GPAC_DISABLE_CORE_TOOLS
-	        " -bin                 converts input XML file using NHML bitstream syntax to binary\n"
-#endif
-	        "\n");
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# File Dumping\n"
+	"  \n"
+	"MP4Box has many dump functionalities, from simple track listing to more complete reporting of special tracks.\n"
+	"  \n"
+	"Options:\n"
+	);
+	while (m4b_dump_args[i].name) {
+		GF_GPACArg *arg = &m4b_dump_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
+	}
 }
 
+GF_GPACArg 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"
+		"- 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"
+		"- file_path `this` or `self`: item is the file itself\n"
+		"- tk=tkID: meta location (file, moov, track)\n"
+		"- name=str: item name\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"
+		"- 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"
+		"- 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"
+		"- split_tiles: for an HEVC tiled image, each tile is stored as a separate item\n"
+		"- rotation=a: set the rotation angle for this image to 90*a degrees anti-clockwise\n"
+		"- hidden: indicate that this image item should be hidden\n"
+		"- icc_path: path to icc to add as colr\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),
+	{0}
+};
+
 void PrintMetaUsage()
 {
-	fprintf(stderr, "Meta handling Options\n"
-		" -set-meta args       sets given meta type - syntax: \"ABCD[:tk=ID]\"\n"
-		"                       * ABCD: four char meta type (NULL or 0 to remove meta)\n"
-		"                       * [:tk=ID]: if not set use root (file) meta\n"
-		"                                if ID is 0 use moov meta\n"
-		"                                if ID is not 0 use track meta\n"
-		" -add-item args       adds resource to meta\n"
-		"                       * syntax: file_path + options (\':\' separated):\n"
-		"                        file_path \"this\" or \"self\": item is the file itself\n"
-		"                        tk=ID:            meta location (file, moov, track)\n"
-		"                        name=str:         item name\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"
-		"                        id=id:	           item ID\n"
-		"                        ref=4cc,id:       reference of type 4cc to an other item\n"
-		" -add-image args      adds the given file (with parameters) as HEIF image item \n"
-		"                       * same syntax as add-item with the following options\n"
-		"						 name=str			same as for -add-item\n"
-		"						 id=id				same as for -add-item\n"
-		"						 ref=4cc, id		same as for -add-item\n"
-		"                        primary			indicates that this item should be the primary item.\n"
-		"						 time=t				uses the next sync sample after time t (float, in sec, default 0)\n"
-		"						 split_tiles		for an HEVC tiled image, each tile is stored as a separate item\n"
-		"                        rotation=a       sets the rotation angle for this image to 90*a degrees anti-clockwise.\n"
-		"                        hidden             indicates that this image item should be hidden.\n"
-		"                        icc_path           path to icc to add as colr.\n"
-		"                        alpha            indicates that the image is an alpha image (should use ref=auxl also).\n"
-		" -rem-item args       removes resource from meta - syntax: item_ID[:tk=ID]\n"
-		" -set-primary args    sets item as primary for meta - syntax: item_ID[:tk=ID]\n"
-		" -set-xml args        sets meta XML data\n"
-		"                       * syntax: xml_file_path[:tk=ID][:binary]\n"
-		" -rem-xml [tk=ID]     removes meta XML data\n"
-		" -dump-xml args       dumps meta XML to file - syntax file_path[:tk=ID]\n"
-		" -dump-item args      dumps item to file - syntax item_ID[:tk=ID][:path=fileName]\n"
-		" -package             packages input XML file into an ISO container\n"
-		"                       * all media referenced except hyperlinks are added to file\n"
-		" -mgt                 packages input XML file into an MPEG-U widget with ISO container.\n"
-		"                       * all files contained in the current folder are added to the widget package\n"
-		);
+	u32 i=0;
+	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."
+	"  \n  \n");
+	while (m4b_meta_args[i].name) {
+		GF_GPACArg *arg = &m4b_meta_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
+	}
 }
 
+GF_GPACArg 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),
+	{0}
+};
+
 void PrintSWFUsage()
 {
-	fprintf(stderr,
-	        "SWF Importer Options\n"
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "# SWF Importer Options\n"
 	        "\n"
 	        "MP4Box can import simple Macromedia Flash files (\".SWF\")\n"
 	        "You can specify a SWF input file with \'-bt\', \'-xmt\' and \'-mp4\' options\n"
-	        "\n"
-	        " -global              all SWF defines are placed in first scene replace\n"
-	        "                       * Note: By default SWF defines are sent when needed\n"
-	        " -no-ctrl             uses a single stream for movie control and dictionary\n"
-	        "                       * Note: this will disable ActionScript\n"
-	        " -no-text             removes all SWF text\n"
-	        " -no-font             removes all embedded SWF Fonts (terminal fonts used)\n"
-	        " -no-line             removes all lines from SWF shapes\n"
-	        " -no-grad             removes all gradients from swf shapes\n"
-	        " -quad                uses quadratic bezier curves instead of cubic ones\n"
-	        " -xlp                 support for lines transparency and scalability\n"
-	        " -flatten ang         complementary angle below which 2 lines are merged\n"
-	        "                       * Note: angle \'0\' means no flattening\n"
-	        "\n"
-	       );
+	        "  \n"
+	        "Options:\n"
+	);
+	while (m4b_swf_args[i].name) {
+		GF_GPACArg *arg = &m4b_swf_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
+	}
 }
 
-void PrintATSCUsage()
+GF_GPACArg m4b_liveenc_args[] =
 {
-	fprintf(stderr,
-	        "ATSC3 reader Options\n"
-	        "\n"
-	        "MP4Box can read ATSC3 sessions from network. \n"
-	        "\n"
-	        " -atsc 			enables ATSC3 reader\n"
-	        " -ifce IP			IP adress of network interface to use\n"
-	        " -dir PATH			local filesystem path to which the files are written. If not set, nothing is written to disk.\n"
-	        " -service ID:		ID of the service to grab. If not set or -1, all services are dumped. If 0, no services are dumped. If -2, the first service found is used.\n"
-	        " -nb-segs N:		sets max segments to keep on disk per stream. -1 (default) keeps all.\n"
-	        " -atsc-stats N:	prints stats every N seconds. If 0 (default) stats disabled.\n"
-	        "\n"
-	        "On OSX with VM packet replay you will need to force mcast routing, eg:\n"
-	        "route add -net 239.255.1.4/32 -interface vboxnet0\n"
+ 	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),
+ 	GF_DEF_ARG("ifce", NULL, "IP address of the physical interface to use", NULL, NULL, GF_ARG_STRING, 0),
+ 	GF_DEF_ARG("ttl", NULL, "time to live for multicast packets", "1", NULL, GF_ARG_INT, 0),
+ 	GF_DEF_ARG("sdp", NULL, "output SDP file", "session.sdp", NULL, GF_ARG_STRING, 0),
+ 	GF_DEF_ARG("dims", NULL, "turn on DIMS mode for SVG input", NULL, NULL, GF_ARG_BOOL, 0),
+ 	GF_DEF_ARG("no-rap", NULL, "disable RAP sending and carousel generation", NULL, NULL, GF_ARG_BOOL, 0),
+ 	GF_DEF_ARG("src", NULL, "source of scene updates", NULL, NULL, GF_ARG_STRING, 0),
+ 	GF_DEF_ARG("rap", NULL, "duration in ms of base carousel; you can specify the RAP period of a single ESID (not in DIMS) using `ESID=X:time`", NULL, NULL, GF_ARG_INT, 0),
+ 	{0}
+};
+
+void PrintLiveUsage()
+{
+	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"
+	        "Options:\n"
 	        "\n"
-	       );
+	);
+	while (m4b_liveenc_args[i].name) {
+		GF_GPACArg *arg = &m4b_liveenc_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-extract");
+	}
+
+	gf_sys_format_help(helpout, help_flags, "  \n"
+		"Runtime options:\n"
+		"- q: quits\n"
+		"- u: inputs some commands to be sent\n"
+		"- U: same as u but signals the updates as critical\n"
+		"- e: inputs some commands to be sent without being aggregated\n"
+		"- E: same as e but signals the updates as critical\n"
+		"- f: forces RAP sending\n"
+		"- F: forces RAP regeneration and sending\n"
+		"- p: dumps current scene\n"
+	);
+}
+
+void PrintCoreUsage()
+{
+	gf_sys_format_help(helpout, help_flags, "# libgpac core options\n");
+	gf_sys_print_core_help(NULL, 0, GF_ARGMODE_ALL, 0);
 }
+
+GF_GPACArg m4b_usage_args[] =
+{
+ 	GF_DEF_ARG("h", NULL, "print help\n"
+ 		"- general: general options help\n"
+		"- hint: hinting options help\n"
+		"- dash: DASH segmenter help\n"
+		"- import: import options help\n"
+		"- encode: encode options help\n"
+		"- meta: meta handling options help\n"
+		"- extract: extraction options help\n"
+		"- dump: dump options help\n"
+		"- swf: Flash (SWF) options help\n"
+		"- crypt: ISMA E&A options help\n"
+		"- format: supported formats help\n"
+		"- live: BIFS streamer help\n"
+		"- core: libgpac core options\n"
+		"- all: all options are printed\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("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),
+ 	{0}
+};
+
 void PrintUsage()
 {
-	fprintf (stderr, "MP4Box [option] input [option]\n"
-	         " -h general           general options help\n"
-	         " -h hint              hinting options help\n"
-	         " -h dash              DASH segmenter help\n"
-	         " -h import            import options help\n"
-	         " -h encode            encode options help\n"
-	         " -h meta              meta handling options help\n"
-	         " -h extract           extraction options help\n"
-	         " -h dump              dump options help\n"
-	         " -h swf               Flash (SWF) options help\n"
-	         " -h crypt             ISMA E&A options help\n"
-	         " -h format            supported formats help\n"
-	         " -h rtp               file streamer help\n"
-	         " -h live              BIFS streamer help\n"
-	         " -h atsc              ATSC3 reader help\n"
-	         " -h all               all options are printed\n"
-	         "\n"
-	         " -nodes               lists supported MPEG4 nodes\n"
-	         " -node NodeName       gets MPEG4 node syntax and QP info\n"
-	         " -xnodes              lists supported X3D nodes\n"
-	         " -xnode NodeName      gets X3D node syntax\n"
-	         " -snodes              lists supported SVG nodes\n"
-	         " -languages           lists supported ISO 639 languages\n"
-	         " -boxes               lists all supported ISOBMF boxes and their syntax\n"
-	         "\n"
-	         " -quiet               quiet mode\n"
-	         " -noprog              disables progress\n"
-	         " -v                   verbose mode\n"
-	         " -logs                set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
-	         " -log-file FILE       sets output log file. Also works with -lf FILE\n"
-	         " -log-clock or -lc    logs time in micro sec since start time of GPAC before each log line.\n"
-	         " -log-utc or -lu      logs UTC time in ms before each log line.\n"
-	         " -version             gets build version\n"
-	         " -- INPUT             escape option if INPUT starts with - character\n"
-	         "\n"
-	        );
+	u32 i=0;
+	gf_sys_format_help(helpout, help_flags, "MP4Box [option] input [option]\n"
+		"  \n"
+		"# General Options:\n"
+	);
+	while (m4b_usage_args[i].name) {
+		GF_GPACArg *arg = &m4b_usage_args[i];
+		i++;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4box-general");
+	}
 }
 
+static u32 PrintHelpForArgs(char *arg_name, GF_GPACArg *args, Bool exact_match)
+{
+	u32 res=0;
+	u32 i=0;
+	while (args[i].name) {
+		GF_GPACArg *arg = &args[i];
+		GF_GPACArg an_arg;
+		if (exact_match && strcmp(arg_name, arg->name)) {
+			i++;
+			continue;
+		}
+		if (!exact_match && !gf_sys_word_match(arg_name, arg->name)) {
+			i++;
+			continue;
+		}
+		an_arg = *arg;
+		if (!exact_match) {
+			an_arg.description = NULL;
+			an_arg.type = GF_ARG_BOOL;
+		}
+		gf_sys_print_arg(helpout, 0, &an_arg, "");
+		res++;
+		i++;
+	}
+	return res;
+}
+static Bool PrintHelpArg(char *arg_name, Bool exact_match, GF_FilterSession *fs)
+{
+	Bool first=GF_TRUE;
+	GF_GPACArg an_arg;
+	u32 i, count;
+	u32 res = 0;
+	res += PrintHelpForArgs(arg_name, m4b_gen_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_dash_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_imp_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_senc_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_crypt_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_hint_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_extr_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_dump_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_meta_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_swf_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_liveenc_args, exact_match);
+	res += PrintHelpForArgs(arg_name, m4b_usage_args, exact_match);
+	res += PrintHelpForArgs(arg_name, (GF_GPACArg *) gf_sys_get_options(), exact_match);
+
+	if (!fs) return res;
+
+	memset(&an_arg, 0, sizeof(GF_GPACArg));
+	count = gf_fs_filters_registers_count(fs);
+	for (i=0; i<count; i++) {
+		u32 j=0;
+		const GF_FilterRegister *reg = gf_fs_get_filter_register(fs, i);
+
+		while (reg->args) {
+			u32 len;
+			const GF_FilterArgs *arg = &reg->args[j];
+			if (!arg || !arg->arg_name) break;
+			j++;
+			if (exact_match && strcmp(arg->arg_name, arg_name)) continue;
+			if (!exact_match && !gf_sys_word_match(arg->arg_name, arg_name)) continue;
+
+			an_arg.name = arg->arg_name;
+			if (exact_match) {
+				an_arg.description = arg->arg_desc;
+				switch (arg->arg_type) {
+				case GF_PROP_BOOL:
+					an_arg.type = GF_ARG_BOOL;
+					break;
+				case GF_PROP_UINT:
+				case GF_PROP_SINT:
+					an_arg.type = GF_ARG_INT;
+					break;
+				case GF_PROP_DOUBLE:
+					an_arg.type = GF_ARG_DOUBLE;
+					break;
+				case GF_PROP_STRING_LIST:
+				case GF_PROP_UINT_LIST:
+					an_arg.type = GF_ARG_STRINGS;
+					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");
+				}
+				fprintf(helpout, "[%s]", reg->name);
+				len = (u32)strlen(reg->name);
+				while (len<10) {
+					len++;
+					fprintf(helpout, " ");
+				}
+				fprintf(helpout, " ");
+			}
+
+			gf_sys_print_arg(helpout, GF_PRINTARG_ADD_DASH, &an_arg, "TEST");
+			res++;
+		}
+	}
+	if (res) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static void PrintHelp(char *arg_name)
+{
+	GF_FilterSession *fs;
+	Bool res;
+
+	fs = gf_fs_new_defaults(0);
+
+	if (arg_name[0]=='-')
+		arg_name++;
+
+	res = PrintHelpArg(arg_name, GF_TRUE, fs);
+	if (!res) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("Option -%s unknown, please check usage.\n", arg_name));
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Possible options are:\n"));
+
+		PrintHelpArg(arg_name, GF_FALSE, fs);
+	}
+	if (fs)
+		gf_fs_del(fs);
+}
 
 void scene_coding_log(void *cbk, GF_LOG_Level log_level, GF_LOG_Tool log_tool, const char *fmt, va_list vlist)
 {
@@ -1197,18 +1303,17 @@
 static void check_media_profile(GF_ISOFile *file, u32 track)
 {
 	u8 PL;
-	GF_M4ADecSpecInfo dsi;
 	GF_ESD *esd = gf_isom_get_esd(file, track, 1);
 	if (!esd) return;
 
 	switch (esd->decoderConfig->streamType) {
 	case 0x04:
 		PL = gf_isom_get_pl_indication(file, GF_ISOM_PL_VISUAL);
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-			GF_M4VDecSpecInfo dsi;
-			gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-			if (dsi.VideoPL > PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, dsi.VideoPL);
-		} else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
+		if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) {
+			GF_M4VDecSpecInfo vdsi;
+			gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &vdsi);
+			if (vdsi.VideoPL > PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, vdsi.VideoPL);
+		} else if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_AVC) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_SVC)) {
 			gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, 0x15);
 		} else if (!PL) {
 			gf_isom_set_pl_indication(file, GF_ISOM_PL_VISUAL, 0xFE);
@@ -1217,12 +1322,15 @@
 	case 0x05:
 		PL = gf_isom_get_pl_indication(file, GF_ISOM_PL_AUDIO);
 		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-			gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-			if (dsi.audioPL > PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_AUDIO, dsi.audioPL);
+		case GF_CODECID_AAC_MPEG2_MP:
+		case GF_CODECID_AAC_MPEG2_LCP:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+		case GF_CODECID_AAC_MPEG4:
+		{
+			GF_M4ADecSpecInfo adsi;
+			gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &adsi);
+			if (adsi.audioPL > PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_AUDIO, adsi.audioPL);
+		}
 			break;
 		default:
 			if (!PL) gf_isom_set_pl_indication(file, GF_ISOM_PL_AUDIO, 0xFE);
@@ -1324,21 +1432,9 @@
 	return type;
 }
 
-#if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM_WRITE)
-static Bool can_convert_to_isma(GF_ISOFile *file)
-{
-	u32 spec = gf_isom_guess_specification(file);
-	if (spec==GF_ISOM_BRAND_ISMA) return GF_TRUE;
-	return GF_FALSE;
-}
-#endif
-
-static void progress_quiet(const void *cbck, const char *title, u64 done, u64 total) { }
-
-
 typedef struct
 {
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	char *line;
 } SDPLine;
 
@@ -1359,10 +1455,9 @@
 {
 	MetaActionType act_type;
 	Bool root_meta, use_dref;
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	u32 meta_4cc;
-	char szPath[GF_MAX_PATH];
-	char szName[1024], mime_type[1024], enc_type[1024];
+	char *szPath, *szName, *mime_type, *enc_type;
 	u32 item_id;
 	Bool primary;
 	u32 item_type;
@@ -1375,25 +1470,21 @@
 static Bool parse_meta_args(MetaAction *meta, MetaActionType act_type, char *opts)
 {
 	Bool ret = 0;
-	char szSlot[1024], *next;
 
 	memset(meta, 0, sizeof(MetaAction));
 	meta->act_type = act_type;
-	meta->mime_type[0] = 0;
-	meta->enc_type[0] = 0;
-	meta->szName[0] = 0;
-	meta->szPath[0] = 0;
 	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;
-		strcpy(szSlot, opts);
-		next = strchr(szSlot, ':');
-		/*use ':' as separator, but beware DOS paths...*/
-		if (next && next[1]=='\\') next = strchr(next+2, ':');
+
+		szSlot = opts;
+		next = gf_url_colon_suffix(opts);
 		if (next) next[0] = 0;
 
 		if (!strnicmp(szSlot, "tk=", 3)) {
@@ -1411,37 +1502,40 @@
 		}
 		else if (!strnicmp(szSlot, "ref=", 4)) {
 			char type[10];
-			sscanf(szSlot, "ref=%s,%u", type, &meta->ref_item_id);
+			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)) {
-			strcpy(meta->szName, szSlot+5);
+			meta->szName = gf_strdup(szSlot+5);
 			ret = 1;
 		}
 		else if (!strnicmp(szSlot, "path=", 5)) {
-			strcpy(meta->szPath, szSlot+5);
+			meta->szPath = gf_strdup(szSlot+5);
 			ret = 1;
 		}
 		else if (!strnicmp(szSlot, "mime=", 5)) {
 			meta->item_type = GF_META_ITEM_TYPE_MIME;
-			strcpy(meta->mime_type, szSlot+5);
+			meta->mime_type = gf_strdup(szSlot+5);
 			ret = 1;
 		}
 		else if (!strnicmp(szSlot, "encoding=", 9)) {
-			strcpy(meta->enc_type, szSlot+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;
@@ -1449,6 +1543,7 @@
 		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;
@@ -1456,6 +1551,7 @@
 		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;
@@ -1463,6 +1559,7 @@
 		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;
@@ -1470,6 +1567,7 @@
 		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;
@@ -1477,6 +1575,7 @@
 		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;
@@ -1484,6 +1583,7 @@
 		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;
@@ -1503,6 +1603,7 @@
 		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;
@@ -1518,7 +1619,12 @@
 			case META_ACTION_ADD_IMAGE_ITEM:
 			case META_ACTION_SET_XML:
 			case META_ACTION_DUMP_XML:
-				strcpy(meta->szPath, szSlot);
+				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:
@@ -1531,12 +1637,13 @@
 				break;
 			}
 		}
+		if (!next) break;
 		opts += strlen(szSlot);
+		next[0] = ':';
 	}
 	return ret;
 }
-#endif
-
+#endif //GPAC_DISABLE_ISOM_WRITE
 
 typedef enum {
 	TSEL_ACTION_SET_PARAM = 0,
@@ -1547,24 +1654,25 @@
 typedef struct
 {
 	TSELActionType act_type;
-	u32 trackID;
+	GF_ISOTrackID trackID;
 
-	u32 refTrackID;
+	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)
 {
-	u32 refTrackID = 0;
+	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], *next;
+	char szSlot[1024];
 	TSELAction *tsel_list;
 
 	has_switch_id = 0;
@@ -1572,12 +1680,11 @@
 
 	if (!opts) return 0;
 	while (1) {
+		char *next;
 		if (!opts || !opts[0]) return 1;
 		if (opts[0]==':') opts += 1;
 		strcpy(szSlot, opts);
-		next = strchr(szSlot, ':');
-		/*use ':' as separator, but beware DOS paths...*/
-		if (next && next[1]=='\\') next = strchr(szSlot+2, ':');
+		next = gf_url_colon_suffix(szSlot);
 		if (next) next[0] = 0;
 
 
@@ -1627,9 +1734,15 @@
 	}
 	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;\
+	}
 
-#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); return mp4box_cleanup(1); }
 
 typedef enum {
 	TRAC_ACTION_REM_TRACK		= 0,
@@ -1649,23 +1762,28 @@
 	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;
-	u32 trackID;
+	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
@@ -1683,21 +1801,8 @@
 GF_DashSegmenterInput *set_dash_input(GF_DashSegmenterInput *dash_inputs, char *name, u32 *nb_dash_inputs)
 {
 	GF_DashSegmenterInput *di;
-	char *sep;
-	// skip ./ and ../, and look for first . to figure out extension
-	if ((name[1]=='/') || (name[2]=='/') || (name[1]=='\\') || (name[2]=='\\') ) sep = strchr(name+3, '.');
-	else {
-		char *s2 = strchr(name, ':');
-		sep = strchr(name, '.');
-		if (sep && s2 && (s2 - sep) < 0) {
-			sep = name;
-		}
-	}
-
-	//then look for our opt separator :
-	sep = strchr(sep ? sep : name, ':');
-
-	if (sep && (sep[1]=='\\')) sep = strchr(sep+1, ':');
+	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) );
@@ -1708,7 +1813,7 @@
 		char *opts, *first_opt;
 		opts = first_opt = sep;
 		while (opts) {
-			sep = strchr(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) ||
@@ -1719,28 +1824,37 @@
 				        !strnicmp(sep, ":role=", 6) ||
 				        !strnicmp(sep, ":desc", 5) ||
 				        !strnicmp(sep, ":sscale", 7) ||
-				        !strnicmp(sep, ":duration=", 10) || /*legacy*/!strnicmp(sep, ":period_duration=", 10) ||
-				        !strnicmp(sep, ":xlink=", 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)) sep = strchr(sep+3, ':');
+			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)) {
-				u32 i;
 				di->representationID = gf_strdup(opts+3);
-				/* check to see if this representation Id has already been assigned */
-				for (i=0; i<(*nb_dash_inputs)-1; i++) {
-					GF_DashSegmenterInput *other_di;
-					other_di = &dash_inputs[i];
-					if (!strcmp(other_di->representationID, di->representationID)) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Duplicate Representation ID \"%s\" in command line\n", di->representationID));
-					}
-				}
-			} else if (!strnicmp(opts, "dur=", 4)) di->media_duration = (Double)atof(opts+4);
+				/*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 *));
@@ -1786,10 +1900,18 @@
 			}
 			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, "period_duration=", 16)) {
-				di->period_duration = (Double) atof(opts+16);
-			}	else if (!strnicmp(opts, "duration=", 9)) {
-				di->period_duration = (Double) atof(opts+9); /*legacy: use period_duration instead*/
+			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;
@@ -1799,6 +1921,8 @@
 		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);
@@ -1814,7 +1938,7 @@
 	if (!action || !string) return GF_BAD_PARAM;
 
 	while (param) {
-		param = strchr(param, ':');
+		param = gf_url_colon_suffix(param);
 		if (param) {
 			*param = 0;
 			param++;
@@ -1862,11 +1986,11 @@
 }
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
-static GF_Err nhml_bs_to_bin(char *inName, char *outName, u32 dump_std)
+static GF_Err xml_bs_to_bin(char *inName, char *outName, u32 dump_std)
 {
 	GF_Err e;
 	GF_XMLNode *root;
-	char *data = NULL;
+	u8 *data = NULL;
 	u32 data_size;
 
 	GF_DOMParser *dom = gf_xml_dom_new();
@@ -1882,7 +2006,7 @@
 		return GF_OK;
 	}
 
-	e = gf_xml_parse_bit_sequence(root, &data, &data_size);
+	e = gf_xml_parse_bit_sequence(root, inName, &data, &data_size);
 	gf_xml_dom_del(dom);
 
 	if (e) {
@@ -1891,7 +2015,7 @@
 	}
 
 	if (dump_std) {
-		fwrite(data, 1, data_size, stdout);
+		gf_fwrite(data, data_size, stdout);
 	} else {
 		FILE *t;
 		char szFile[GF_MAX_PATH];
@@ -1906,7 +2030,7 @@
 			fprintf(stderr, "Failed to open file %s\n", szFile);
 			e = GF_IO_ERR;
 		} else {
-			if (fwrite(data, 1, data_size, t) != data_size) {
+			if (gf_fwrite(data, data_size, t) != data_size) {
 				fprintf(stderr, "Failed to write output to file %s\n", szFile);
 				e = GF_IO_ERR;
 			}
@@ -1918,10 +2042,52 @@
 }
 #endif /*GPAC_DISABLE_CORE_TOOLS*/
 
+static u64 do_size_top_boxes(char *inName, char *compress_top_boxes, u32 mode)
+{
+	FILE *in;
+	u64 top_size = 0;
+	Bool do_all = GF_FALSE;
+	GF_BitStream *bs_in;
+	if (!compress_top_boxes) return GF_BAD_PARAM;
+	if (!strcmp(compress_top_boxes, "all"))
+		do_all = GF_TRUE;
+
+	in = gf_fopen(inName, "rb");
+	if (!in) return GF_URL_ERROR;
+	bs_in = gf_bs_from_file(in, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs_in)) {
+		const char *stype;
+		u32 hdr_size = 8;
+		u64 lsize = gf_bs_read_u32(bs_in);
+		u32 type = gf_bs_read_u32(bs_in);
+
+		if (lsize==1) {
+			lsize = gf_bs_read_u64(bs_in);
+			hdr_size = 16;
+		} else if (lsize==0) {
+			lsize = gf_bs_available(bs_in) + 8;
+		}
+		stype = gf_4cc_to_str(type);
+		if (do_all || strstr(compress_top_boxes, stype)) {
+			//only count boxes
+			if (mode==2) {
+				top_size += 1;
+			} else {
+				top_size += lsize;
+			}
+		}
+		gf_bs_skip_bytes(bs_in, lsize - hdr_size);
+	}
+	gf_bs_del(bs_in);
+	gf_fclose(in);
+	return top_size;
+
+}
+
 static GF_Err do_compress_top_boxes(char *inName, char *outName, char *compress_top_boxes, u32 comp_top_box_version, Bool use_lzma)
 {
 	FILE *in, *out;
-	char *buf;
+	u8 *buf;
 	u32 buf_alloc, comp_size, start_offset;
 	s32 bytes_comp=0;
 	s32 bytes_uncomp=0;
@@ -1941,6 +2107,10 @@
 		u32 size, csize;
 	} *ranges=NULL;
 
+	if (!outName) {
+		fprintf(stderr, "Missing output file name\n");
+		return GF_BAD_PARAM;
+	}
 
 	in = gf_fopen(inName, "rb");
 	if (!in) return GF_URL_ERROR;
@@ -2023,7 +2193,7 @@
 		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);
+		const u8 *replace = (const u8 *) strstr(compress_top_boxes, b4cc);
 		if (!strcmp(b4cc, "moov")) has_mov = GF_TRUE;
 
 		if (!replace && !replace_all) {
@@ -2151,16 +2321,16 @@
 		new_rate /= 1000;
 
 
-		fprintf(stderr, "Log format:\nname\torig\tcomp\tgain\tadded_bytes\torate\tcrate\tsamples\tobbps\tcbbps\n");
-		fprintf(stdout, "%s\t%d\t%d\t%g\t%d\t%g\t%g\t%d\t%g\t%g\n", inName, bytes_uncomp, bytes_comp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, nb_samples,  ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
+		fprintf(stderr, "Log format:\nname\torig\tcomp\tgain\tadded_bytes\torate\tcrate\tsamples\tduration\tobbps\tcbbps\n");
+		fprintf(stdout, "%s\t%d\t%d\t%g\t%d\t%g\t%g\t%d\t%g\t%g\t%g\n", inName, bytes_uncomp, bytes_comp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, nb_samples, duration, ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
 
-		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additionnal bytes %d original rate %g kbps new rate %g kbps, orig %g box bytes/sample final %g bytes/sample\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
+		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additional bytes %d original rate %g kbps new rate %g kbps, orig %g box bytes/sample final %g bytes/sample\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes, rate, new_rate, ((Double)orig_box_overhead)/nb_samples, ((Double)final_box_overhead)/nb_samples );
 
 	} else {
 		fprintf(stderr, "Log format:\nname\torig\tcomp\tgain\tadded_bytes\n");
 		fprintf(stdout, "%s\t%d\t%d\t%g\t%d\n", inName, bytes_uncomp, bytes_comp, ((Double) (bytes_uncomp - bytes_comp)*100)/(bytes_uncomp), nb_added_box_bytes);
 
-		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additionnal bytes %d\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes);
+		fprintf(stderr, "%s Compressing top-level boxes saved %d bytes out of %d (reduced by %g %%) additional bytes %d\n", inName, bytes_uncomp-bytes_comp, bytes_uncomp, ((Double)(bytes_uncomp-bytes_comp)*100)/bytes_uncomp, nb_added_box_bytes);
 
 	}
 	return GF_OK;
@@ -2173,7 +2343,7 @@
 	GF_Err e = gf_media_get_file_hash(name, hash);
 	if (e) return e;
 	if (dump_std==2) {
-		fwrite(hash, 1, 20, stdout);
+		gf_fwrite(hash, 20, stdout);
 	} else if (dump_std==1) {
 		for (i=0; i<20; i++) fprintf(stdout, "%02X", hash[i]);
 	}
@@ -2184,35 +2354,14 @@
 	return GF_OK;
 }
 
-Bool log_sys_clock = GF_FALSE;
-Bool log_utc_time = GF_FALSE;
-
-static void on_mp4box_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	FILE *logs = cbk ? cbk : stderr;
-
-	if (log_sys_clock) {
-		fprintf(logs, "At "LLD" ", gf_sys_clock_high_res() );
-	}
-	if (log_utc_time) {
-		u64 utc_clock = gf_net_get_utc() ;
-		time_t secs = utc_clock/1000;
-		struct tm t;
-		t = *gmtime(&secs);
-		fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
-	}
 
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-char outfile[5000];
-GF_Err e;
+char outfile[GF_MAX_PATH];
 #ifndef GPAC_DISABLE_SCENE_ENCODER
-GF_SMEncodeOptions opts;
+GF_SMEncodeOptions smenc_opts;
 #endif
 SDPLine *sdp_lines = NULL;
-Double interleaving_time, split_duration, split_start, import_fps, dash_duration, dash_subduration;
+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;
@@ -2221,22 +2370,29 @@
 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 i, j, 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;
+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, force_new, remove_root_od;
-Bool print_sdp, print_info, open_edit, dump_cr, force_ocr, encode, do_log, do_flat, 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, dump_nal_crc, do_mpd_rip;
-char *inName, *outName, *arg, *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, *hdr_filename;
-u32 track_dump_type, dump_isom, dump_timestamps;
-u32 trackID;
+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_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;
+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;
@@ -2245,7 +2401,6 @@
 u32 dash_scale = 1000;
 Bool insert_utc = GF_FALSE;
 const char *udp_dest = NULL;
-
 #ifndef GPAC_DISABLE_MPD
 Bool do_mpd = GF_FALSE;
 #endif
@@ -2257,15 +2412,13 @@
 u32 MTUSize = 1450;
 #endif
 #ifndef GPAC_DISABLE_CORE_TOOLS
-Bool do_bin_nhml = GF_FALSE;
+Bool do_bin_xml = GF_FALSE;
 #endif
 GF_ISOFile *file;
 Bool frag_real_time = GF_FALSE;
-u64 dash_start_date=0;
+const char *dash_start_date=NULL;
 GF_DASH_ContentLocationMode cp_location_mode = GF_DASH_CPMODE_ADAPTATION_SET;
 Double mpd_update_time = GF_FALSE;
-Bool stream_rtp = GF_FALSE;
-Bool force_test_mode = GF_FALSE;
 Bool force_co64 = GF_FALSE;
 Bool live_scene = GF_FALSE;
 Bool use_mfra = GF_FALSE;
@@ -2275,13 +2428,14 @@
 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_UNKNOWN;
+GF_DashProfile dash_profile = GF_DASH_PROFILE_AUTO;
 const char *dash_profile_extension = NULL;
 const char *dash_cues = NULL;
 Bool strict_cues = GF_FALSE;
@@ -2291,36 +2445,23 @@
 Bool adjust_split_end = GF_FALSE;
 Bool memory_frags = GF_TRUE;
 Bool keep_utc = GF_FALSE;
-#ifndef GPAC_DISABLE_ATSC
-Bool grab_atsc = GF_FALSE;
-s32 atsc_max_segs = -1;
-u32 atsc_stats_rate = 0;
-u32 atsc_debug_tsi = 0;
-const char *atsc_output_dir = NULL;
-s32 atsc_service = -1;
-#endif
 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 *gf_logs = NULL;
 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;
-#if !defined(GPAC_DISABLE_STREAMING)
-const char *grab_m2ts = NULL;
-#endif
-const char *grab_ifce = 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 Bool split_on_bound=GF_FALSE;
-static Bool split_on_closest=GF_FALSE;
+static GF_DASH_SplitMode dash_split_mode = GF_DASH_SPLIT_OUT;
 
 u32 mp4box_cleanup(u32 ret_code) {
 	if (mpd_base_urls) {
@@ -2332,10 +2473,18 @@
 		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);
+		}
 		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);
@@ -2398,6 +2547,10 @@
 			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++) {
@@ -2419,7 +2572,7 @@
 	u32 i = *current_index;
 	/*parse our args*/
 	{
-		arg = argv[i];
+		char *arg = argv[i];
 		if (!stricmp(arg, "-itags")) {
 			CHECK_NEXT_ARG
 			itunes_tags = argv[i + 1];
@@ -2548,10 +2701,15 @@
 		else if (!stricmp(arg, "-iod")) regular_iod = 1;
 		else if (!stricmp(arg, "-flat")) {
 			open_edit = GF_TRUE;
-			do_flat = GF_TRUE;
+			do_flat = 1;
 		}
 		else if (!stricmp(arg, "-keep-utc")) keep_utc = GF_TRUE;
-		else if (!stricmp(arg, "-new")) force_new = 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]);
@@ -2641,17 +2799,29 @@
 			strncpy(szTK, argv[i + 1], sizeof(szTK));
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track par - expecting ID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
+				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 ID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
+					fprintf(stderr, "Bad format for track par - expecting tkID=PAR_NUM:PAR_DEN got %s\n", argv[i + 1]);
 					return 2;
 				}
 				sscanf(ext + 1, "%d", &tracks[nb_track_act].par_den);
@@ -2662,9 +2832,92 @@
 			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;
+				}
+			}
+			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;
+			}
+			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;
+				}
+			}
+			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
-			hdr_filename = argv[i + 1];
+			high_dynamc_range_filename = argv[i + 1];
+			i++;
+		}
+		else if (!stricmp(arg, "-bo")) {
+			freeze_box_order = GF_TRUE;
+		}
+		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++;
 		}
 		else if (!stricmp(arg, "-lang")) {
@@ -2758,7 +3011,7 @@
 			szTK[sizeof(szTK)-1] = 0;
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track delay - expecting ID=DLAY got %s\n", argv[i + 1]);
+				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;
@@ -2778,7 +3031,7 @@
 			szTK = argv[i + 1];
 			ext = strchr(szTK, ':');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i + 1]);
+				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;
@@ -2788,7 +3041,7 @@
 			szTK = ext + 1;
 			ext = strchr(szTK, ':');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track reference - expecting ID:XXXX:refID got %s\n", argv[i + 1]);
+				fprintf(stderr, "Bad format for track reference - expecting tkID:XXXX:refID got %s\n", argv[i + 1]);
 				return 2;
 			}
 			ext[0] = 0;
@@ -2809,7 +3062,7 @@
 			szTK[sizeof(szTK)-1] = 0;
 			ext = strchr(szTK, '=');
 			if (!ext) {
-				fprintf(stderr, "Bad format for track name - expecting ID=name got %s\n", argv[i + 1]);
+				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;
@@ -2832,22 +3085,23 @@
 		else if (!stricmp(arg, "-ovsbr")) import_flags |= GF_IMPORT_OVSBR;
 		else if (!stricmp(arg, "-fps")) {
 			CHECK_NEXT_ARG
-			if (!strcmp(argv[i + 1], "auto")) import_fps = GF_IMPORT_AUTO_FPS;
+			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 = ticks;
-				import_fps /= dts_inc;
+				import_fps.num = ticks;
+				import_fps.den = dts_inc;
+			} else {
+				import_fps.num = (s32) (1000 * atof(argv[i + 1]));
+				import_fps.den = 1000;
 			}
-			else import_fps = atof(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-agg")) {
 			CHECK_NEXT_ARG agg_samples = atoi(argv[i + 1]);
 			i++;
 		}
-		else if (!stricmp(arg, "-keep-all") || !stricmp(arg, "-keepall")) import_flags |= GF_IMPORT_KEEP_ALL_TRACKS;
 #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")) {
@@ -2874,54 +3128,54 @@
 #endif
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
-		else if (!stricmp(arg, "-def")) opts.flags |= GF_SM_ENCODE_USE_NAMES;
+		else if (!stricmp(arg, "-def")) smenc_opts.flags |= GF_SM_ENCODE_USE_NAMES;
 		else if (!stricmp(arg, "-sync")) {
 			CHECK_NEXT_ARG
-			opts.flags |= GF_SM_ENCODE_RAP_INBAND;
-			opts.rap_freq = atoi(argv[i + 1]);
+			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
-			opts.flags &= ~GF_SM_ENCODE_RAP_INBAND;
-			opts.flags |= GF_SM_ENCODE_RAP_SHADOW;
-			opts.rap_freq = atoi(argv[i + 1]);
+			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
-			opts.flags &= ~(GF_SM_ENCODE_RAP_INBAND | GF_SM_ENCODE_RAP_SHADOW);
-			opts.rap_freq = atoi(argv[i + 1]);
+			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
-			opts.resolution = atoi(argv[i + 1]);
+			smenc_opts.resolution = atoi(argv[i + 1]);
 			i++;
 		}
 #ifndef GPAC_DISABLE_SCENE_STATS
 		else if (!stricmp(arg, "-auto-quant")) {
 			CHECK_NEXT_ARG
-			opts.resolution = atoi(argv[i + 1]);
-			opts.auto_quant = 1;
+			smenc_opts.resolution = atoi(argv[i + 1]);
+			smenc_opts.auto_quant = 1;
 			i++;
 		}
 #endif
 		else if (!stricmp(arg, "-coord-bits")) {
 			CHECK_NEXT_ARG
-			opts.coord_bits = atoi(argv[i + 1]);
+			smenc_opts.coord_bits = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-scale-bits")) {
 			CHECK_NEXT_ARG
-			opts.scale_bits = atoi(argv[i + 1]);
+			smenc_opts.scale_bits = atoi(argv[i + 1]);
 			i++;
 		}
 		else if (!stricmp(arg, "-global-quant")) {
 			CHECK_NEXT_ARG
-			opts.resolution = atoi(argv[i + 1]);
-			opts.auto_quant = 2;
+			smenc_opts.resolution = atoi(argv[i + 1]);
+			smenc_opts.auto_quant = 2;
 			i++;
 		}
 		/*chunk encoding*/
@@ -2937,6 +3191,8 @@
 			i++;
 		}
 #endif /*GPAC_DISABLE_SCENE_ENCODER*/
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
 		else if (!strcmp(arg, "-crypt")) {
 			CHECK_NEXT_ARG
 			crypt = 1;
@@ -3014,8 +3270,12 @@
 				}
 			}
 			else {
-				sscanf(argv[i + 1], "%lf:%lf", &split_start, &split_duration);
-				split_duration -= split_start;
+				if (strchr(argv[i + 1], '-')) {
+					split_range_str = argv[i + 1];
+				} else {
+					sscanf(argv[i + 1], "%lf:%lf", &split_start, &split_duration);
+					split_duration -= split_start;
+				}
 			}
 			split_size = 0;
 			if (!stricmp(arg, "-splitz")) adjust_split_end = 1;
@@ -3082,7 +3342,7 @@
 			nb_meta_act++;
 			i++;
 		}
-		else if (!stricmp(arg, "-group-add") || !stricmp(arg, "-group-rem-track") || !stricmp(arg, "-group-rem") || !stricmp(arg, "-group-clean")) {
+		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;
@@ -3112,6 +3372,9 @@
 			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];
@@ -3123,7 +3386,12 @@
 			CHECK_NEXT_ARG
 			major_brand = GF_4CC(b[0], b[1], b[2], b[3]);
 			open_edit = GF_TRUE;
-			if (b[4] == ':') minor_version = atoi(b + 5);
+			if (b[4] == ':') {
+				if (!strncmp(b+5, "0x", 2))
+					sscanf(b+5, "0x%x", &minor_version);
+				else
+					minor_version = atoi(b + 5);
+			}
 			i++;
 		}
 		else if (!stricmp(arg, "-ab")) {
@@ -3145,68 +3413,168 @@
 			i++;
 		}
 #endif
-else if (!stricmp(arg, "-languages")) {
-	PrintLanguages();
-	return 1;
-}
-else if (!stricmp(arg, "-h")) {
-	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")) PrintFormats();
-	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();
-#ifndef GPAC_DISABLE_ATSC
-	else if (!strcmp(argv[i + 1], "atsc")) PrintATSCUsage();
+		else if (!stricmp(arg, "-languages")) {
+			PrintLanguages();
+			return 1;
+		}
+		else if (!stricmp(arg, "-h")) {
+			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 applications\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)
-	else if (!strcmp(argv[i + 1], "rtp")) PrintStreamerUsage();
-	else if (!strcmp(argv[i + 1], "live")) PrintLiveUsage();
+				PrintLiveUsage();
 #endif
-	else if (!strcmp(argv[i + 1], "all")) {
-		PrintGeneralUsage();
-		PrintExtractUsage();
-		PrintDASHUsage();
-		PrintDumpUsage();
-		PrintImportUsage();
-		PrintFormats();
-		PrintHintUsage();
-		PrintEncodeUsage();
-		PrintEncryptUsage();
-		PrintMetaUsage();
-		PrintSWFUsage();
-#ifndef GPAC_DISABLE_ATSC
-		PrintATSCUsage();
+				PrintCoreUsage();
+			} else {
+				PrintHelp(argv[i+1]);
+			}
+			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");
+			}
+
+			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)
-		PrintStreamerUsage();
-		PrintLiveUsage();
+			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);
+			}
+			return 1;
+		}
+		else if (!live_scene) {
+			u32 res = gf_sys_is_gpac_arg(arg);
+			if (res==0) {
+				PrintHelp(arg);
+				return 2;
+			} else if (res==2) {
+				i++;
+			}
+		}
 	}
-	else PrintUsage();
-	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);
-	}
-	return 1;
-}
-else if (!live_scene && !stream_rtp) {
-	fprintf(stderr, "Option %s unknown. Please check usage\n", arg);
-	return 2;
-}
-}
-*current_index = i;
-return 0;
+	*current_index = i;
+	return 0;
 }
 
 Bool mp4box_parse_args(int argc, char **argv)
@@ -3214,7 +3582,7 @@
 	u32 i;
 	/*parse our args*/
 	for (i = 1; i < (u32)argc; i++) {
-		arg = argv[i];
+		char *arg = argv[i];
 		/*input file(s)*/
 		if ((arg[0] != '-') || !stricmp(arg, "--")) {
 			char *arg_val = arg;
@@ -3252,83 +3620,39 @@
 			return 1;
 		}
 		else if (!stricmp(arg, "-sdp")) print_sdp = 1;
-		else if (!stricmp(arg, "-quiet")) quiet = 2;
         else if (!strcmp(argv[i], "-mem-track")) continue;
         else if (!strcmp(argv[i], "-mem-track-stack")) continue;
-
-		else if (!stricmp(arg, "-logs")) {
-			CHECK_NEXT_ARG
-			gf_logs = argv[i + 1];
-			if (gf_logs)
-				gf_log_set_tools_levels(gf_logs);
-			i++;
+        else if (!strcmp(argv[i], "-p")) {
+        	i++;
+        	continue;
 		}
-		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			logfile = gf_fopen(argv[i + 1], "wt");
-			gf_log_set_callback(logfile, on_mp4box_log);
+        else if (!strncmp(argv[i], "-p=", 3)) continue;
+		else if (!stricmp(arg, "-logs") || !strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
 			i++;
 		}
-		else if (!strcmp(arg, "-lc") || !strcmp(arg, "-log-clock")) {
-			log_sys_clock = GF_TRUE;
-		}
-		else if (!strcmp(arg, "-lu") || !strcmp(arg, "-log-utc")) {
-			log_utc_time = GF_TRUE;
-		}
-		else if (!stricmp(arg, "-noprog")) quiet = 1;
-		else if (!stricmp(arg, "-info")) {
+		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;
+
+				if (!stricmp(arg, "-infon")) print_info = 2;
 			}
 			else {
 				info_track_id = 0;
 			}
 		}
-#if !defined(GPAC_DISABLE_STREAMING)
 		else if (!stricmp(arg, "-grab-ts")) {
-			CHECK_NEXT_ARG
-			grab_m2ts = argv[i + 1];
-			i++;
-		}
-#endif
-		else if (!stricmp(arg, "-ifce")) {
-			CHECK_NEXT_ARG
-			grab_ifce = argv[i + 1];
-			i++;
+			fprintf(stderr, "Deprecated option - use gpac application\n");
+			return mp4box_cleanup(2);
 		}
-#ifndef GPAC_DISABLE_ATSC
 		else if (!stricmp(arg, "-atsc")) {
-			grab_atsc = GF_TRUE;
+			fprintf(stderr, "Deprecated option - use gpac application\n");
+			return mp4box_cleanup(2);
 		}
-		else if (!stricmp(arg, "-dir")) {
-			CHECK_NEXT_ARG
-			atsc_output_dir = argv[i + 1];
-			i++;
-		}
-		else if (!stricmp(arg, "-service")) {
-			CHECK_NEXT_ARG
-			atsc_service = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-nb-segs")) {
-			CHECK_NEXT_ARG
-			atsc_max_segs = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-atsc-stats")) {
-			CHECK_NEXT_ARG
-			atsc_stats_rate = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-tsi")) {
-			CHECK_NEXT_ARG
-			atsc_debug_tsi = atoi(argv[i + 1]);
-			i++;
-		}
-#endif
 #if !defined(GPAC_DISABLE_CORE_TOOLS)
 		else if (!stricmp(arg, "-wget")) {
 			CHECK_NEXT_ARG
@@ -3398,12 +3722,14 @@
 		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);
-			i++;
+			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")) {
-			stream_rtp = GF_TRUE;
+			fprintf(stderr, "Deprecated option - use gpac application\n");
+			return mp4box_cleanup(2);
 		}
 		else if (!stricmp(arg, "-live")) {
 			live_scene = GF_TRUE;
@@ -3423,29 +3749,36 @@
 			PrintNode(argv[i + 1], 1);
 			return 1;
 		}
-		else if (!stricmp(arg, "-nodes")) {
-			PrintBuiltInNodes(0);
+		else if (!stricmp(arg, "-nodes") || !stricmp(arg, "-nodex")) {
+			PrintBuiltInNodes(0, !stricmp(arg, "-nodex") ? GF_TRUE : GF_FALSE);
 			return 1;
 		}
-		else if (!stricmp(arg, "-xnodes")) {
-			PrintBuiltInNodes(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);
+			PrintBuiltInNodes(2, GF_FALSE);
 			return 1;
 		}
 #endif
-		else if (!stricmp(arg, "-boxes")) {
-			PrintBuiltInBoxes();
+		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;
@@ -3460,6 +3793,8 @@
 		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;
@@ -3475,10 +3810,27 @@
 			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;
+		}
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
-		else if (!stricmp(arg, "-bin")) do_bin_nhml = GF_TRUE;
+		else if (!stricmp(arg, "-bin")) do_bin_xml = GF_TRUE;
 #endif
 		else if (!stricmp(arg, "-dump-udta")) {
 			char *sep, *code;
@@ -3493,7 +3845,20 @@
 			else {
 				code = argv[i + 1];
 			}
-			dump_udta_type = GF_4CC(code[0], code[1], code[2], code[3]);
+			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);
+				}
+				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);
+			}
 			i++;
 		}
 		else if (!stricmp(arg, "-dmp4")) {
@@ -3519,15 +3884,12 @@
 		else if (!stricmp(arg, "-dtsxc")) {
 			dump_timestamps = 4;
 		}
-		else if (!stricmp(arg, "-dnal")) {
-			CHECK_NEXT_ARG
-			dump_nal = atoi(argv[i + 1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-dnalc")) {
+		else if (!strnicmp(arg, "-dnal", 5)) {
 			CHECK_NEXT_ARG
 			dump_nal = atoi(argv[i + 1]);
-			dump_nal_crc = GF_TRUE;
+			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)) {
@@ -3560,7 +3922,7 @@
 				fprintf(stderr, "Error: Read-Only version - subtitle conversion not available\n");
 				return 2;
 			}
-#endif
+#endif //GPAC_DISABLE_ISOM_WRITE
 			if (!stricmp(arg, "-ttxt")) dump_ttxt = GF_TRUE;
 			else dump_srt = GF_TRUE;
 			import_subtitle = 1;
@@ -3629,16 +3991,14 @@
 			CHECK_NEXT_ARG tmpdir = argv[i + 1];
 			i++;
 		}
-		else if (!stricmp(arg, "-for-test")) {
-			force_test_mode = GF_TRUE;
-		}
 		else if (!stricmp(arg, "-co64")) {
 			force_co64 = GF_TRUE;
 			open_edit = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-write-buffer")) {
 			CHECK_NEXT_ARG
-			gf_isom_set_output_buffering(NULL, atoi(argv[i + 1]));
+			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")) {
@@ -3646,18 +4006,17 @@
 			i++;
 			if (!dash_duration) open_edit = GF_TRUE;
 		}
-		else if (!stricmp(arg, "-chap")) {
-			CHECK_NEXT_ARG chap_file = argv[i + 1];
+		else if (!stricmp(arg, "-chap") || !stricmp(arg, "-chapqt")) {
+			CHECK_NEXT_ARG
+			chap_file = argv[i + 1];
 			i++;
 			open_edit = GF_TRUE;
-		}
-		else if (!strcmp(arg, "-strict-error")) {
-			gf_log_set_strict_error(1);
+			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 = GF_TRUE;
+			if (!interleaving_time) do_flat = 2;
 			open_edit = GF_TRUE;
 			needSave = GF_TRUE;
 			if (!stricmp(arg, "-old-inter")) old_interleave = 1;
@@ -3729,11 +4088,14 @@
 		else if (!stricmp(arg, "-no-loop")) {
 			no_loop = GF_TRUE;
 		}
+		else if (!stricmp(arg, "-hlsc")) {
+			hls_clock = GF_TRUE;
+		}
 		else if (!stricmp(arg, "-bound")) {
-			split_on_bound = GF_TRUE;
+			dash_split_mode = GF_DASH_SPLIT_IN;
 		}
 		else if (!stricmp(arg, "-closest")) {
-			split_on_closest = GF_TRUE;
+			dash_split_mode = GF_DASH_SPLIT_CLOSEST;
 		}
 		else if (!stricmp(arg, "-segment-ext")) {
 			CHECK_NEXT_ARG
@@ -3768,7 +4130,7 @@
 			frag_real_time = GF_TRUE;
 		}
 		else if (!stricmp(arg, "-start-date")) {
-			dash_start_date = gf_net_parse_date(argv[i+1]);
+			dash_start_date = argv[i+1];
 			i++;
 		}
 		else if (!strnicmp(arg, "-cp-location=", 13)) {
@@ -3887,6 +4249,13 @@
 		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++;
+		}
 		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;
@@ -3901,7 +4270,11 @@
 				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
 			}
 			else if (!stricmp(argv[i + 1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
-			else dash_profile = GF_DASH_PROFILE_FULL;
+			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;
+			}
 			i++;
 		}
 		else if (!stricmp(arg, "-profile-ext")) {
@@ -3939,6 +4312,7 @@
 		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++;
@@ -3953,28 +4327,32 @@
 
 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;
-	e = GF_OK;
+
 	split_duration = 0.0;
 	split_start = -1.0;
 	interleaving_time = 0;
 	dash_duration = dash_subduration = 0.0;
-	import_fps = 0;
+	import_fps.num = import_fps.den = 0;
 	import_flags = 0;
 	split_size = 0;
 	movie_time = 0;
-	dump_nal = dump_saps = dump_saps_mode = 0;
-	FullInter = HintInter = encode = do_log = old_interleave = do_saf = do_hash = verbose = do_mpd_rip = GF_FALSE;
+	dump_nal = dump_saps = dump_saps_mode = force_new = 0;
+	FullInter = HintInter = encode = do_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 = GF_FALSE;
-	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_rtp = dump_cr = dump_srt = dump_ttxt = force_new = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = GF_FALSE;
+	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 = GF_FALSE,
-    tfdt_per_traf = GF_FALSE,
-	dump_nal_crc = GF_FALSE,
-	dump_isom = dump_timestamps = 0;
+	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;
@@ -3989,14 +4367,14 @@
 	initial_tfdt = 0;
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
-	memset(&opts, 0, sizeof(opts));
+	memset(&smenc_opts, 0, sizeof(smenc_opts));
 #endif
 
 	trackID = stat_level = hint_flags = 0;
 	program_number = 0;
 	info_track_id = 0;
-	do_flat = GF_FALSE;
-	inName = outName = mediaSource = input_ctx = output_ctx = drm_file = avi2raw = cprt = chap_file = pack_file = raw_cat = hdr_filename = NULL;
+	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;
@@ -4013,6 +4391,16 @@
 #endif
 			break;
 		}
+		else if (!strcmp(argv[i], "-p")) {
+			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");
+				return 1;
+			}
+		}
+		else if (!strncmp(argv[i], "-p=", 3))
+			gpac_profile = argv[i]+3;
 	}
 
 #ifdef _TWO_DIGIT_EXPONENT
@@ -4020,38 +4408,31 @@
 #endif
 
 	/*init libgpac*/
-	gf_sys_init(mem_track);
+	gf_sys_init(mem_track, gpac_profile);
 	if (argc < 2) {
 		fprintf(stderr, "Not enough arguments - check usage with -h\n"
-			"MP4Box - GPAC version " GPAC_FULL_VERSION "\n"
-	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n");
+			"MP4Box - GPAC version %s\n"
+	        "%s\n", gf_gpac_version(), gf_gpac_copyright());
 		gf_sys_close();
 		return 0;
 	}
 
+	helpout = stdout;
+
 	i = mp4box_parse_args(argc, argv);
 	if (i) {
 		return mp4box_cleanup(i - 1);
 	}
 
-	if (!logfile && (log_sys_clock || log_utc_time) )
-		gf_log_set_callback(NULL, on_mp4box_log);
-
 	if (!inName && dump_std)
 		inName = "std";
 
-#ifndef GPAC_DISABLE_ATSC
-	if (grab_atsc) {
-		if (!gf_logs) {
-			gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-			gf_log_set_tool_level(GF_LOG_CONTAINER, GF_LOG_INFO);
-		}
-		return grab_atsc3_session(atsc_output_dir, grab_ifce, atsc_service, atsc_max_segs, atsc_stats_rate, atsc_debug_tsi);
-	}
-#endif
-
 	if (!inName) {
-		PrintUsage();
+		if (has_next_arg) {
+			fprintf(stderr, "Broken argument specifier or file name missing - check usage with -h\n");
+		} else {
+			PrintUsage();
+		}
 		return mp4box_cleanup(1);
 	}
 	if (!strcmp(inName, "std")) dump_std = 2;
@@ -4089,12 +4470,26 @@
 		int ret = live_session(argc, argv);
 		return mp4box_cleanup(ret);
 	}
-	if (stream_rtp) {
-		int ret = stream_file_rtp(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_CODING, level);
+	gf_log_set_tool_level(GF_LOG_DASH, level);
+#ifdef GPAC_MEMORY_TRACKING
+	if (mem_track)
+		gf_log_set_tool_level(GF_LOG_MEMORY, level);
+#endif
+
+	e = gf_sys_set_args(argc, (const char **) argv);
+	if (e) {
+		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
+		return mp4box_cleanup(1);
+	}
+
 	if (raw_cat) {
 		char chunk[4096];
 		FILE *fin, *fout;
@@ -4112,8 +4507,8 @@
 		gf_fseek(fin, 0, SEEK_SET);
 		done = 0;
 		while (1) {
-			u32 nb_bytes = (u32) fread(chunk, 1, 4096, fin);
-			gf_fwrite(chunk, 1, nb_bytes, fout);
+			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;
@@ -4123,48 +4518,29 @@
 		return mp4box_cleanup(0);
 	}
 	if (compress_top_boxes) {
-		e = do_compress_top_boxes(inName, outName, compress_top_boxes, comp_top_box_version, comp_lzma);
-		return mp4box_cleanup(e ? 1 : 0);
+		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);
+			return mp4box_cleanup(e ? 1 : 0);
+		}
 	}
 
 	if (do_mpd_rip) {
-		e = rip_mpd(inName);
+		e = rip_mpd(inName, outName);
 		return mp4box_cleanup(e ? 1 : 0);
 	}
 
-#if !defined(GPAC_DISABLE_STREAMING)
-	if (grab_m2ts) {
-		return grab_live_m2ts(grab_m2ts, grab_ifce, inName);
-	}
-#endif
-
-	if (gf_logs) {
-		if (quiet==1) gf_set_progress_callback(NULL, progress_quiet);
-	} else {
-		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_CODING, level);
-		gf_log_set_tool_level(GF_LOG_DASH, level);
-#ifdef GPAC_MEMORY_TRACKING
-		if (mem_track)
-			gf_log_set_tool_level(GF_LOG_MEMORY, level);
-#endif
-		if (quiet) {
-			if (quiet==2) gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_QUIET);
-			gf_set_progress_callback(NULL, progress_quiet);
-		}
-	}
-
 #ifndef GPAC_DISABLE_CORE_TOOLS
 	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) );
+			return mp4box_cleanup(1);
 		}
-		return mp4box_cleanup(1);
+		return mp4box_cleanup(0);
 	}
 #endif
 
@@ -4180,7 +4556,7 @@
 		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, inName, (u32)strlen(inName));
+			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);
@@ -4210,10 +4586,11 @@
 			if (outName)
 				strcpy(outfile, outName);
 			else {
-				const char *sep = strrchr(inName, '/');
-				char *ext = strstr(sep, ".m3u8");
+				const char *sep = gf_file_basename(inName);
+				char *ext = gf_file_ext_start(sep);
 				if (ext) ext[0] = 0;
-				sprintf(outfile, "%s.mpd", sep+1);
+				sprintf(outfile, "%s.mpd", sep);
+				if (ext) ext[0] = '.';
 			}
 		} else {
 			if (outName)
@@ -4233,7 +4610,29 @@
 			fprintf(stderr, "[DASH] Error: MPD creation problem %s\n", gf_error_to_string(e));
 			mp4box_cleanup(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, NULL, mpd, GF_TRUE, GF_TRUE, force_test_mode);
+		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);
 
@@ -4243,13 +4642,13 @@
 			gf_free(mpd_base_url);
 
 		if (remote) {
-			gf_delete_file("tmp_main.m3u8");
+			gf_file_delete("tmp_main.m3u8");
 		}
 		if (e != GF_OK) {
-			fprintf(stderr, "Error converting M3U8 (%s) to MPD (%s): %s\n", inName, outfile, gf_error_to_string(e));
+			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 M3U8 (%s) to MPD (%s)\n", inName, outfile);
+			fprintf(stderr, "Done converting %s (%s) to MPD (%s)\n", (manif_type==1) ? "HLS" : "Smooth",  inName, outfile);
 			return mp4box_cleanup(0);
 		}
 	}
@@ -4299,7 +4698,7 @@
 		if (e) {
 			fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
 			gf_isom_delete(file);
-			gf_delete_file("ttxt_convert");
+			gf_file_delete("ttxt_convert");
 			return mp4box_cleanup(1);
 		}
 		/* Prepare the export */
@@ -4317,7 +4716,7 @@
 #endif
 		/* Clean the importer */
 		gf_isom_delete(file);
-		gf_delete_file("ttxt_convert");
+		gf_file_delete("ttxt_convert");
 		if (e) {
 			fprintf(stderr, "Error converting %s: %s\n", inName, gf_error_to_string(e));
 			return mp4box_cleanup(1);
@@ -4330,108 +4729,166 @@
 	}
 
 #if !defined(GPAC_DISABLE_MEDIA_IMPORT) && !defined(GPAC_DISABLE_ISOM_WRITE)
-	if (nb_add) {
-		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;
+	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 {
-				gf_fclose(test);
-				if (! gf_isom_probe_file(inName) ) {
+				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);
 		}
 
-		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);
+		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 (i=0; i<(u32) argc; i++) {
-			if (!strcmp(argv[i], "-add")) {
-				char *src = argv[i+1];
+		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];
 
-				e = import_file(file, src, import_flags, import_fps, agg_samples);
-				if (e) {
 					while (src) {
 						char *sep = strchr(src, '+');
 						if (sep) {
 							sep[0] = 0;
-						} else {
-							break;
 						}
 
-						e = import_file(file, src, import_flags, import_fps, agg_samples);
+						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 {
-							src= NULL;
-						}
-						if (e)
 							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 importing %s: %s\n", argv[i+1], gf_error_to_string(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++;
 				}
-				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);
+				}
 
-		/*unless explicitly asked, remove all systems tracks*/
-		if (!keep_sys_tracks) remove_systems_tracks(file);
-		needSave = GF_TRUE;
-	}
+				e = gf_fs_run(fs);
+				if (e==GF_EOS) e = GF_OK;
 
-	if (nb_cat) {
-		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);
-			}
+				if (!e) e = gf_fs_get_last_connect_error(fs);
+				if (!e) e = gf_fs_get_last_process_error(fs);
 
-			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);
-			}
-		}
-		for (i=0; i<(u32)argc; i++) {
-			if (!strcmp(argv[i], "-cat") || !strcmp(argv[i], "-catx") || !strcmp(argv[i], "-catpl")) {
-				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));
+					fprintf(stderr, "Error importing sources: %s\n", gf_error_to_string(e));
 					gf_isom_delete(file);
+					gf_fs_del(fs);
 					return mp4box_cleanup(1);
 				}
-				i++;
 			}
 		}
+		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;
-		if (conv_type && can_convert_to_isma(file)) conv_type = GF_ISOM_CONV_TYPE_ISMA;
 	}
 #endif /*!GPAC_DISABLE_MEDIA_IMPORT && !GPAC_DISABLE_ISOM_WRITE*/
 
@@ -4448,19 +4905,19 @@
 		}
 		goto exit;
 	}
-#endif
+#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_log) {
-			char logfile[5000];
-			strcpy(logfile, inName);
-			if (strchr(logfile, '.')) {
-				while (logfile[strlen(logfile)-1] != '.') logfile[strlen(logfile)-1] = 0;
-				logfile[strlen(logfile)-1] = 0;
+			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(logfile, "_enc.logs");
-			logs = gf_fopen(logfile, "wt");
+			strcat(alogfile, "_enc.logs");
+			logs = gf_fopen(alogfile, "wt");
 		}
 		strcpy(outfile, outName ? outName : inName);
 		if (strchr(outfile, '.')) {
@@ -4469,8 +4926,8 @@
 		}
 		strcat(outfile, ".mp4");
 		file = gf_isom_open(outfile, GF_ISOM_WRITE_EDIT, tmpdir);
-		opts.mediaSource = mediaSource ? mediaSource : outfile;
-		e = EncodeFile(inName, file, &opts, logs);
+		smenc_opts.mediaSource = mediaSource ? mediaSource : outfile;
+		e = EncodeFile(inName, file, &smenc_opts, logs);
 		if (logs) gf_fclose(logs);
 		if (e) goto err_exit;
 		needSave = GF_TRUE;
@@ -4478,31 +4935,36 @@
 			needSave = GF_FALSE;
 			open_edit = GF_FALSE;
 		}
-#endif
+#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 = strchr(pack_file, ':');
+		char *fileName = gf_url_colon_suffix(pack_file);
 		if (fileName && ((fileName - pack_file)==4)) {
 			fileName[0] = 0;
 			file = package_file(fileName + 1, pack_file, tmpdir, pack_wgt);
 			fileName[0] = ':';
 		} else {
 			file = package_file(pack_file, NULL, tmpdir, pack_wgt);
+			if (!file) {
+				fprintf(stderr, "Failed to package file\n");
+				return mp4box_cleanup(1);
+			}
 		}
 		if (!outName) outName = inName;
 		needSave = GF_TRUE;
 		open_edit = GF_TRUE;
 	}
-#endif
+#endif //GPAC_DISABLE_ISOM_WRITE
 
 	if (dash_duration) {
 		Bool del_file = GF_FALSE;
 		char szMPD[GF_MAX_PATH], *sep;
-		GF_Config *dash_ctx = NULL;
+		char szStateFile[GF_MAX_PATH];
+		Bool dyn_state_file = GF_FALSE;
 		u32 do_abort = 0;
-		GF_DASHSegmenter *dasher;
+		GF_DASHSegmenter *dasher=NULL;
 
 		if (crypt) {
 			fprintf(stderr, "MP4Box cannot crypt and DASH on the same pass. Please encrypt your content first.\n");
@@ -4514,8 +4976,13 @@
 		if (sep) sep[0] = 0;
 		if (!outName) strcat(outfile, "_dash");
 		strcpy(szMPD, outfile);
-		strcat(szMPD, ".mpd");
-
+		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;
@@ -4525,15 +4992,20 @@
 			fprintf(stderr, "Live DASH-ing - press 'q' to quit, 's' to save context and quit\n");
 
 		if (!dash_ctx_file && dash_live) {
-			dash_ctx = gf_cfg_new(NULL, NULL);
+			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_delete_file(dash_ctx_file);
-
-			dash_ctx = gf_cfg_force_new(NULL, dash_ctx_file);
+				gf_file_delete(dash_ctx_file);
 		}
 
-		if (dash_profile==GF_DASH_PROFILE_UNKNOWN)
+		if (dash_profile==GF_DASH_PROFILE_AUTO)
 			dash_profile = dash_mode ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_FULL;
 
 		if (!dash_mode) {
@@ -4552,24 +5024,24 @@
 		}
 
 		/*setup dash*/
-		dasher = gf_dasher_new(szMPD, dash_profile, tmpdir, dash_scale, dash_ctx);
+		dasher = gf_dasher_new(szMPD, dash_profile, tmpdir, dash_scale, dash_ctx_file);
 		if (!dasher) {
 			return mp4box_cleanup(1);
-			return GF_OUT_OF_MEM;
 		}
-		e = gf_dasher_set_info(dasher, dash_title, cprt, dash_more_info, dash_source);
+		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);
 		}
-		if (dash_start_date) gf_dasher_set_start_date(dasher, dash_start_date);
-
 
-		//e = gf_dasher_set_location(dasher, mpd_source);
+		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);
 			}
 		}
@@ -4584,7 +5056,7 @@
 		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);
+		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);
@@ -4593,39 +5065,45 @@
 		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);
+		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_set_test_mode(dasher,force_test_mode);
 		if (!e) e = gf_dasher_enable_loop_inputs(dasher, ! no_loop);
-		if (!e) e = gf_dasher_set_split_on_bound(dasher, split_on_bound);
-		if (!e) e = gf_dasher_set_split_on_closest(dasher, split_on_closest);
+		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) e = gf_dasher_set_isobmff_options(dasher, mvex_after_traks);
+		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))
+			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, dash_subduration);
+			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;
@@ -4642,8 +5120,8 @@
 				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)\n", sleep_for, ms_in_session);
-				if (ms_in_session>=run_for) {
+				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;
 				}
@@ -4670,12 +5148,12 @@
 					}
 					if (!sleep_for) break;
 
-					gf_sleep(1);
-					sleep_for = gf_dasher_next_update_time(dasher, &ms_in_session);
-					if (sleep_for<1) {
+					gf_sleep(sleep_for/10);
+					sleep_for = gf_dasher_next_update_time(dasher, NULL);
+					if (sleep_for<=1) {
 						dash_now_time=gf_sys_clock();
-						fprintf(stderr, "Slept for %d ms before generation\n", dash_now_time - slept);
 						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;
 					}
 				}
@@ -4686,23 +5164,17 @@
 
 		gf_dasher_del(dasher);
 
-		if (dash_ctx) {
-			if (!force_test_mode && (do_abort==3)) {
-				if (!dash_ctx_file) {
-					char szName[1024];
-					fprintf(stderr, "Enter file name to save dash context:\n");
-					if (scanf("%s", szName) == 1) {
-						gf_cfg_set_filename(dash_ctx, szName);
-						gf_cfg_save(dash_ctx);
-					}
-				}
+		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);
 			}
-			gf_cfg_del(dash_ctx);
 		}
 		if (e) fprintf(stderr, "Error DASHing file: %s\n", gf_error_to_string(e));
 		if (file) gf_isom_delete(file);
 		if (del_file)
-			gf_delete_file(inName);
+			gf_file_delete(inName);
 
 		if (e) return mp4box_cleanup(1);
 		goto exit;
@@ -4715,16 +5187,38 @@
 	        ) {
 		FILE *st = gf_fopen(inName, "rb");
 		Bool file_exists = 0;
+		GF_ISOOpenMode omode;
 		if (st) {
 			file_exists = 1;
 			gf_fclose(st);
 		}
 		switch (get_file_type_by_ext(inName)) {
 		case 1:
-			file = gf_isom_open(inName, (u8) (force_new ? GF_ISOM_WRITE_EDIT : (open_edit ? GF_ISOM_OPEN_EDIT : ( ((dump_isom>0) || print_info) ? GF_ISOM_OPEN_READ_DUMP : GF_ISOM_OPEN_READ) ) ), tmpdir);
+			omode =  (u8) (force_new ? GF_ISOM_WRITE_EDIT : (open_edit ? GF_ISOM_OPEN_EDIT : ( ((dump_isom>0) || print_info) ? GF_ISOM_OPEN_READ_DUMP : GF_ISOM_OPEN_READ) ) );
+
+			if (crypt) {
+				//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);
+			}
+			if (!crypt && use_init_seg) {
+				file = gf_isom_open(use_init_seg, GF_ISOM_OPEN_READ_DUMP, tmpdir);
+				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) );
+						gf_isom_delete(file);
+						file = NULL;
+					}
+				}
+			}
+			if (!file)
+				file = gf_isom_open(inName, omode, tmpdir);
+
 			if (!file && (gf_isom_last_error(NULL) == GF_ISOM_INCOMPLETE_FILE) && !open_edit) {
 				u64 missing_bytes;
-				e = gf_isom_open_progressive(inName, 0, 0, &file, &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);
 			}
 
@@ -4739,6 +5233,8 @@
 					return mp4box_cleanup(1);
 				}
 			}
+			if (freeze_box_order)
+				gf_isom_freeze_order(file);
 			break;
 		/*allowed for bt<->xmt*/
 		case 2:
@@ -4763,7 +5259,7 @@
 			else if (!open_edit && file_exists /* && !gf_isom_probe_file(inName) */
 #ifndef GPAC_DISABLE_SCENE_DUMP
 			         && dump_mode == GF_SM_DUMP_NONE
-#endif
+#endif //GPAC_DISABLE_SCENE_DUMP
 			        ) {
 				/*************************************************************************************************/
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -4779,7 +5275,7 @@
 					if (e) {
 						fprintf(stderr, "Error importing %s: %s\n", inName, gf_error_to_string(e));
 						gf_isom_delete(file);
-						gf_delete_file("ttxt_convert");
+						gf_file_delete("ttxt_convert");
 						return mp4box_cleanup(1);
 					}
 				}
@@ -4794,15 +5290,18 @@
 					dump_mpeg2_ts(inName, pes_dump, program_number);
 #endif
 #ifndef GPAC_DISABLE_CORE_TOOLS
-				} else if (do_bin_nhml) {
-					nhml_bs_to_bin(inName, outName, dump_std);
+				} else if (do_bin_xml) {
+					xml_bs_to_bin(inName, outName, dump_std);
 #endif
 				} else if (do_hash) {
 					hash_file(inName, dump_std);
-				} else {
+				} else if (print_info) {
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 					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);
 				}
 				goto exit;
 			}
@@ -4820,8 +5319,8 @@
 		}
 	}
 
-	if (hdr_filename) {
-		e = hdr_file(file, hdr_filename);
+	if (high_dynamc_range_filename) {
+		e = parse_high_dynamc_range_xml_desc(file, high_dynamc_range_filename);
 		if (e) goto err_exit;
 	}
 
@@ -4829,11 +5328,6 @@
 		gf_isom_keep_utc_times(file, 1);
 	}
 
-	if (file && force_test_mode) {
-		gf_isom_no_version_date_info(file, 1);
-	}
-
-
 	strcpy(outfile, outName ? outName : inName);
 	{
 
@@ -4858,7 +5352,7 @@
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 	if (track_dump_type & GF_EXPORT_AVI_NATIVE) {
-		char szFile[1024];
+		char szFile[GF_MAX_PATH+24];
 		GF_MediaExporter mdump;
 		memset(&mdump, 0, sizeof(mdump));
 		mdump.in_name = inName;
@@ -4876,13 +5370,14 @@
 			mdump.out_name = szFile;
 		}
 
+		mdump.print_stats_graph = fs_dump_flags;
 		e = gf_media_export(&mdump);
 		if (e) goto err_exit;
 		goto exit;
 	}
-	if (!open_edit && !gf_isom_probe_file(inName) && track_dump_type) {
+	if (!open_edit && track_dump_type && !gf_isom_probe_file(inName)) {
 		GF_MediaExporter mdump;
-		char szFile[1024];
+		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;
@@ -4900,6 +5395,7 @@
 			} else {
 				mdump.out_name = outfile;
 			}
+			mdump.print_stats_graph = fs_dump_flags;
 			e = gf_media_export(&mdump);
 			if (e) goto err_exit;
 		}
@@ -4910,7 +5406,7 @@
 
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	if (dump_mode != GF_SM_DUMP_NONE) {
-		e = dump_isom_scene(inName, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_mode, do_log);
+		e = dump_isom_scene(inName, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, dump_mode, do_log, no_odf_conf);
 		if (e) goto err_exit;
 	}
 #endif
@@ -4922,25 +5418,26 @@
 #ifndef GPAC_DISABLE_ISOM_HINTING
 	if (!HintIt && 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);
 		} else {
-			if (info_track_id) DumpTrackInfo(file, info_track_id, 1);
+			if (info_track_id) DumpTrackInfo(file, info_track_id, 1, (print_info==2) ? GF_TRUE : GF_FALSE);
 			else DumpMovieInfo(file);
 		}
 	}
 #ifndef GPAC_DISABLE_ISOM_DUMP
 	if (dump_isom) {
-		e = dump_isom_xml(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, (dump_isom==2) ? GF_TRUE : GF_FALSE);
+		e = dump_isom_xml(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE, (dump_isom==2) ? GF_TRUE : GF_FALSE, merge_vtt_cues, use_init_seg ? GF_TRUE : GF_FALSE, (dump_isom==3) ? GF_TRUE : GF_FALSE);
 		if (e) goto err_exit;
 	}
 	if (dump_cr) dump_isom_ismacryp(file, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 	if ((dump_ttxt || dump_srt) && trackID) {
 
 		if (trackID == (u32)-1) {
-
-			u32 j;
 			for (j=0; j<gf_isom_get_track_count(file); j++) {
 				trackID = gf_isom_get_track_id(file, j+1);
 				dump_isom_timed_text(file, trackID, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE,
@@ -4961,7 +5458,7 @@
 #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_crc);
+	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_saps) dump_isom_saps(file, dump_saps, dump_saps_mode, dump_std ? NULL : (outName ? outName : outfile), outName ? GF_TRUE : GF_FALSE);
 
 	if (do_hash) {
@@ -4969,8 +5466,8 @@
 		if (e) goto err_exit;
 	}
 #ifndef GPAC_DISABLE_CORE_TOOLS
-	if (do_bin_nhml) {
-		e = nhml_bs_to_bin(inName, outName, dump_std);
+	if (do_bin_xml) {
+		e = xml_bs_to_bin(inName, outName, dump_std);
 		if (e) goto err_exit;
 	}
 #endif
@@ -4984,42 +5481,41 @@
 		if (!iod) {
 			fprintf(stderr, "File %s has no IOD", inName);
 		} else {
-			char szName[GF_MAX_PATH];
+			char szName[GF_MAX_PATH+10];
 			FILE *iodf;
-			GF_BitStream *bs = NULL;
-
 			sprintf(szName, "%s.iod", outfile);
 			iodf = gf_fopen(szName, "wb");
 			if (!iodf) {
 				fprintf(stderr, "Cannot open destination %s\n", szName);
 			} else {
-				char *desc;
+				u8 *desc;
 				u32 size;
-				bs = gf_bs_from_file(iodf, GF_BITSTREAM_WRITE);
+				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, 1, size, iodf);
+					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_free(bs);
+			gf_odf_desc_del((GF_Descriptor*)iod);
 		}
 	}
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
-	if (split_duration || split_size) {
-		split_isomedia_file(file, split_duration, split_size, inName, interleaving_time, split_start, adjust_split_end, outName, tmpdir);
+	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);
 		/*never save file when splitting is desired*/
 		open_edit = GF_FALSE;
 		needSave = GF_FALSE;
 	}
-#endif
+#endif // !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_MEDIA_IMPORT)
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 	if (track_dump_type) {
-		char szFile[1024];
+		char szFile[GF_MAX_PATH+24];
 		GF_MediaExporter mdump;
 		for (i=0; i<nb_track_act; i++) {
 			TrackAction *tka = &tracks[i];
@@ -5034,22 +5530,26 @@
 			} else if (outName) {
 				mdump.out_name = outName;
 				mdump.flags |= GF_EXPORT_MERGE;
-			} else {
+				/*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;
-				mdump.flags |= GF_EXPORT_FORCE_EXT;
+			} else {
+				sprintf(szFile, "%s_export", outfile);
+				mdump.out_name = szFile;
 			}
 			if (tka->trackID==(u32) -1) {
-				u32 j;
 				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.flags |= GF_EXPORT_FORCE_EXT;
+					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;
 			}
@@ -5060,6 +5560,7 @@
 		mdump.file = file;
 		mdump.flags = GF_EXPORT_SAF;
 		mdump.out_name = outfile;
+		mdump.print_stats_graph = fs_dump_flags;
 		e = gf_media_export(&mdump);
 		if (e) goto err_exit;
 	}
@@ -5067,7 +5568,9 @@
 
 	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);
@@ -5077,17 +5580,17 @@
 		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, 1);
+			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,
-			                          strlen(meta->szName) ? meta->szName : NULL,
+			                          meta->szName,
 			                          meta->item_id,
 									  meta->item_type,
-			                          strlen(meta->mime_type) ? meta->mime_type : NULL,
-			                          strlen(meta->enc_type) ? meta->enc_type : NULL,
+			                          meta->mime_type,
+			                          meta->enc_type,
 			                          meta->use_dref ? meta->szPath : NULL,  NULL,
 			                          meta->image_props);
 			if (meta->ref_type) {
@@ -5098,7 +5601,8 @@
 		case META_ACTION_ADD_IMAGE_ITEM:
 		{
 			u32 old_tk_count = gf_isom_get_track_count(file);
-			e = import_file(file, meta->szPath, 0, 0, 0);
+			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) {
@@ -5115,7 +5619,7 @@
 					}
 					if (e == GF_OK) {
 						e = gf_isom_iff_create_image_item_from_track(file, meta->root_meta, tk, 1,
-								strlen(meta->szName) ? meta->szName : NULL,
+								meta->szName,
 								meta->item_id,
 								meta->image_props, NULL);
 						if (e == GF_OK && meta->primary) {
@@ -5159,7 +5663,8 @@
 				fprintf(stderr, "No meta box in input file\n");
 			}
 			break;
-#endif
+#endif // GPAC_DISABLE_ISOM_WRITE
+
 		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);
@@ -5247,7 +5752,7 @@
 		gf_isom_sdp_clean(file);
 		needSave = GF_TRUE;
 	}
-#endif
+#endif // GPAC_DISABLE_ISOM_HINTING
 
 	if (timescale && (timescale != gf_isom_get_timescale(file))) {
 		gf_isom_set_timescale(file, timescale);
@@ -5308,8 +5813,7 @@
 		}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 		if (conv_type == GF_ISOM_CONV_TYPE_IPOD) {
-			u32 major_brand = 0;
-
+			u32 ipod_major_brand = 0;
 			fprintf(stderr, "Setting up iTunes/iPod file...\n");
 
 			for (i=0; i<gf_isom_get_track_count(file); i++) {
@@ -5318,28 +5822,16 @@
 				case GF_ISOM_MEDIA_VISUAL:
                 case GF_ISOM_MEDIA_AUXV:
                 case GF_ISOM_MEDIA_PICT:
-					major_brand = GF_ISOM_BRAND_M4V;
+					ipod_major_brand = GF_ISOM_BRAND_M4V;
 					gf_isom_set_ipod_compatible(file, i+1);
-#if 0
-					switch (gf_isom_get_media_subtype(file, i+1, 1)) {
-					case GF_ISOM_SUBTYPE_AVC_H264:
-					case GF_ISOM_SUBTYPE_AVC2_H264:
-					case GF_ISOM_SUBTYPE_AVC3_H264:
-					case GF_ISOM_SUBTYPE_AVC4_H264:
-						fprintf(stderr, "Forcing AVC/H264 SAR to 1:1...\n");
-						gf_media_change_par(file, i+1, 1, 1);
-						break;
-					}
-#endif
 					break;
 				case GF_ISOM_MEDIA_AUDIO:
-					if (!major_brand) major_brand = GF_ISOM_BRAND_M4A;
-					else gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_M4A, 1);
+					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) {
-						u32 j;
 						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);
@@ -5363,32 +5855,11 @@
 					break;
 				}
 			}
-			gf_isom_set_brand_info(file, major_brand, 1);
-			gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_MP42, 1);
+			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;
 		}
 
-#ifndef GPAC_DISABLE_MCRYPT
-		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");
-				e = GF_BAD_PARAM;
-				goto err_exit;
-			}
-			if (crypt == 1) {
-				e = gf_crypt_file(file, drm_file);
-			} else if (crypt ==2) {
-				e = gf_decrypt_file(file, drm_file);
-			}
-			if (e) goto err_exit;
-			needSave = GF_TRUE;
-		}
-#endif /*GPAC_DISABLE_MCRYPT*/
 	} else if (outName) {
 		strcpy(outfile, outName);
 	}
@@ -5396,7 +5867,8 @@
 	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;
-		u32 timescale = gf_isom_get_timescale(file);
+
+		timescale = gf_isom_get_timescale(file);
 		switch (tka->act_type) {
 		case TRAC_ACTION_REM_TRACK:
 			e = gf_isom_remove_track(file, track);
@@ -5438,26 +5910,26 @@
 			if (tka->delay_ms) {
 				u64 tk_dur;
 
-				gf_isom_remove_edit_segments(file, track);
+				gf_isom_remove_edits(file, track);
 				tk_dur = gf_isom_get_track_duration(file, track);
-				if (gf_isom_get_edit_segment_count(file, track))
+				if (gf_isom_get_edits_count(file, track))
 					needSave = GF_TRUE;
 				if (tka->delay_ms>0) {
-					gf_isom_append_edit_segment(file, track, (timescale*tka->delay_ms)/1000, 0, GF_ISOM_EDIT_EMPTY);
-					gf_isom_append_edit_segment(file, track, tk_dur, 0, GF_ISOM_EDIT_NORMAL);
+					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_segment(file, track, tk_dur-to_skip, media_time, GF_ISOM_EDIT_NORMAL);
+						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_edit_segment_count(file, track)) {
-				gf_isom_remove_edit_segments(file, track);
+			} else if (gf_isom_get_edits_count(file, track)) {
+				gf_isom_remove_edits(file, track);
 				needSave = GF_TRUE;
 			}
 			break;
@@ -5507,7 +5979,15 @@
 			}
 			break;
 		case TRAC_ACTION_SET_PAR:
-			e = gf_media_change_par(file, track, tka->par_num, tka->par_den, GF_FALSE);
+			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:
@@ -5516,13 +5996,13 @@
 			break;
 		case TRAC_ACTION_ENABLE:
 			if (!gf_isom_is_track_enabled(file, track)) {
-				e = gf_isom_set_track_enabled(file, track, 1);
+				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, 0);
+				e = gf_isom_set_track_enabled(file, track, GF_FALSE);
 				needSave = GF_TRUE;
 			}
 			break;
@@ -5541,6 +6021,7 @@
 			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;
@@ -5556,7 +6037,7 @@
 
 		while (tags) {
 			char *val;
-			char *sep = strchr(tags, ':');
+			char *sep = gf_url_colon_suffix(tags);
 			u32 tlen, itag = 0;
 			if (sep) {
 				while (sep) {
@@ -5566,7 +6047,7 @@
 					if (itag<nb_itunes_tags) {
 						break;
 					}
-					sep = strchr(sep+1, ':');
+					sep = gf_url_colon_suffix(sep+1);
 				}
 				if (sep) sep[0] = 0;
 			}
@@ -5588,25 +6069,17 @@
 				tags = NULL;
 				continue;
 			}
-			if (val) {
-				val ++;
-				if ((val[0]==':') || !val[0] || !stricmp(val, "NULL") ) val = NULL;
-			}
+			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:
 			{
-				char *d, *ext;
-				d=NULL;
+				u8 *d=NULL;
 				if (val) {
-					FILE *t = gf_fopen(val, "rb");
-					gf_fseek(t, 0, SEEK_END);
-					tlen = (u32)gf_ftell(t);
-					gf_fseek(t, 0, SEEK_SET);
-					d = gf_malloc(sizeof(char) * tlen);
-					tlen = (u32)fread(d, sizeof(char), tlen, t);
-					gf_fclose(t);
+					char *ext;
+					gf_file_load_data(val, (u8 **) &d, &tlen);
 
 					ext = strrchr(val, '.');
 					if (!stricmp(ext, ".png")) tlen |= 0x80000000;
@@ -5616,7 +6089,7 @@
 			}
 			break;
 			case GF_ISOM_ITUNE_TEMPO:
-				gf_isom_apple_set_tag(file, itag, NULL, atoi(val) );
+				gf_isom_apple_set_tag(file, itag, NULL, val ? atoi(val) : 0);
 				break;
 			case GF_ISOM_ITUNE_GENRE:
 			{
@@ -5625,7 +6098,7 @@
 					gf_isom_apple_set_tag(file, itag, NULL, _v);
 				} else {
 					if (!val) val="";
-					gf_isom_apple_set_tag(file, itag, val, (u32) strlen(val) );
+					gf_isom_apple_set_tag(file, itag, (u8 *) val, (u32) strlen(val) );
 				}
 			}
 			break;
@@ -5650,20 +6123,20 @@
 					}
 					else tlen = 0;
 				}
-				if (!val || tlen) gf_isom_apple_set_tag(file, itag, val ? _t : NULL, tlen);
+				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:
 			{
-				char _t[1];
+				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, val, tlen);
+				gf_isom_apple_set_tag(file, itag, (u8 *)val, tlen);
 				break;
 			}
 			needSave = GF_TRUE;
@@ -5692,7 +6165,7 @@
 	}
 	if (chap_file) {
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-		e = gf_media_import_chapters(file, chap_file, import_fps);
+		e = gf_media_import_chapters(file, chap_file, import_fps, chap_qt);
 		needSave = GF_TRUE;
 #else
 		fprintf(stderr, "Warning: GPAC compiled without Media Import, chapters can't be imported\n");
@@ -5706,14 +6179,64 @@
 		needSave = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_add; i++) {
-		gf_isom_modify_alternate_brand(file, brand_add[i], 1);
+		gf_isom_modify_alternate_brand(file, brand_add[i], GF_TRUE);
 		needSave = GF_TRUE;
 	}
 	for (i=0; i<nb_alt_brand_rem; i++) {
-		gf_isom_modify_alternate_brand(file, brand_rem[i], 0);
+		gf_isom_modify_alternate_brand(file, brand_rem[i], GF_FALSE);
+		needSave = 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) );
+			goto err_exit;
+		}
 		needSave = 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");
+			e = GF_BAD_PARAM;
+			goto err_exit;
+		}
+		if (crypt == 1) {
+			if (use_init_seg) {
+				e = gf_crypt_fragment(file, drm_file, outfile, inName, fs_dump_flags);
+			} else {
+				e = gf_crypt_file(file, drm_file, outfile, interleaving_time, fs_dump_flags);
+			}
+		} else if (crypt ==2) {
+			if (use_init_seg) {
+				e = gf_decrypt_fragment(file, drm_file, outfile, inName, fs_dump_flags);
+			} else {
+				e = gf_decrypt_file(file, drm_file, outfile, interleaving_time, fs_dump_flags);
+			}
+		}
+		if (e) goto err_exit;
+		needSave = outName ? GF_FALSE : GF_TRUE;
+
+		if (!Frag && !HintIt && !FullInter && !force_co64) {
+			char szName[GF_MAX_PATH];
+			strcpy(szName, gf_isom_get_filename(file) );
+			gf_isom_delete(file);
+			file = NULL;
+			if (!outName) {
+				e = gf_file_move(outfile, szName);
+				if (e) goto err_exit;
+			}
+			goto exit;
+		}
+	}
+#endif /*GPAC_DISABLE_CRYPTO*/
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	if (Frag) {
 		if (!interleaving_time) interleaving_time = DEFAULT_INTERLEAVING_IN_SEC;
@@ -5721,9 +6244,9 @@
 		fprintf(stderr, "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 && !outName && !force_new) {
-			if (gf_delete_file(inName)) fprintf(stderr, "Error removing file %s\n", inName);
-			else if (gf_move_file(outfile, inName)) fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
+		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 (e) goto err_exit;
 		gf_isom_delete(file);
@@ -5743,31 +6266,13 @@
 	}
 #endif
 
-	/*full interleave (sample-based) if just hinted*/
-	if (FullInter) {
-		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_TIGHT);
-	} else if (!interleaving_time) {
-		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_STREAMABLE);
-		needSave = GF_TRUE;
-	} else if (do_flat) {
-		e = gf_isom_set_storage_mode(file, GF_ISOM_STORE_FLAT);
-		needSave = GF_TRUE;
-	} else {
-		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 (e) goto err_exit;
-
 #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 j, k, count = gf_isom_get_track_count(file);
+				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);
@@ -5792,34 +6297,60 @@
 	}
 #endif /*!defined(GPAC_DISABLE_ISOM_HINTING) && !defined(GPAC_DISABLE_SENG)*/
 
+	/*full interleave (sample-based) if just hinted*/
+	if (FullInter) {
+		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 {
+		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 (outName) {
-			fprintf(stderr, "Saving to %s: ", outfile);
-			gf_isom_set_final_name(file, outfile);
-		} else if (encode || pack_file) {
-			fprintf(stderr, "Saving to %s: ", gf_isom_get_filename(file) );
+
+		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) );
+			} else {
+				fprintf(stderr, "Saving %s: ", inName);
+			}
+			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 {
-			fprintf(stderr, "Saving %s: ", inName);
+			if (outName)
+				gf_isom_set_final_name(file, outfile);
 		}
-		if (HintIt && FullInter) fprintf(stderr, "Hinted file - Full Interleaving\n");
-		else if (FullInter) fprintf(stderr, "Full Interleaving\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" : "");
 
 		e = gf_isom_close(file);
 		file = NULL;
 
 		if (!e && !outName && !encode && !force_new && !pack_file) {
-			e = gf_delete_file(inName);
-			if (e) {
-				fprintf(stderr, "Error removing file %s\n", inName);
-			} else {
-				e = gf_move_file(outfile, inName);
+			if (gf_file_exists(inName)) {
+				e = gf_file_delete(inName);
 				if (e) {
-					fprintf(stderr, "Error renaming file %s to %s\n", outfile, inName);
+					fprintf(stderr, "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);
+			}
 		}
 	} else {
 		gf_isom_delete(file);
@@ -5836,7 +6367,8 @@
 	gf_isom_delete(file);
 	fprintf(stderr, "Error: Read-only version of MP4Box.\n");
 	return mp4box_cleanup(1);
-#endif
+#endif //GPAC_DISABLE_ISOM_WRITE
+
 
 err_exit:
 	/*close libgpac*/
@@ -5857,43 +6389,8 @@
 	return 0;
 }
 
-#if defined(WIN32) && !defined(NO_WMAIN)
-#include <windows.h>
 
-int wmain( int argc, wchar_t** wargv )
-{
-	int i;
-	int res;
-	size_t len;
-	size_t 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, (const unsigned short**)&src_str);
-		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;
-		}
-	}
-	/* force windows console codepage to utf8 to display (some, but not all) characters properly */
-	SetConsoleOutputCP(65001);
-	res = mp4boxMain(argc, argv);
-	for (i = 0; i < argc; i++) {
-		free(argv[i]);
-	}
-	free(argv);
-	return res;
-}
-#else
-int main(int argc, char** argv)
-{
-	return mp4boxMain( argc, argv );
-}
-#endif //win32
+GF_MAIN_FUNC(mp4boxMain)
 
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.0.tar.gz/applications/mp4box/mp4box.h Added

@@ -0,0 +1,145 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / mp4box application
+ *
+ *  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 _MP4BOX_H
+#define _MP4BOX_H
+
+#include <gpac/constants.h>
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/isomedia.h>
+#include <gpac/utf.h>
+#include <gpac/filters.h>
+
+#ifndef GPAC_DISABLE_SMGR
+#include <gpac/scene_manager.h>
+#endif
+
+
+typedef enum {
+	GF_FILE_TYPE_NOT_SUPPORTED	= 0,
+	GF_FILE_TYPE_ISO_MEDIA		= 1,
+	GF_FILE_TYPE_BT_WRL_X3DV	= 2,
+	GF_FILE_TYPE_XMT_X3D		= 3,
+	GF_FILE_TYPE_SVG			= 4,
+	GF_FILE_TYPE_SWF			= 5,
+	GF_FILE_TYPE_LSR_SAF		= 6,
+} GF_FileType;
+
+
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+void convert_file_info(char *inName, GF_ISOTrackID trackID);
+#endif
+
+GF_Err parse_high_dynamc_range_xml_desc(GF_ISOFile* movie, 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);
+#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);
+
+#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);
+#endif
+
+GF_ISOFile *package_file(char *file_name, char *fcc, const char *tmpdir, Bool make_wgt);
+
+#endif
+
+GF_Err dump_isom_cover_art(GF_ISOFile *file, char *inName, Bool is_final_name);
+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);
+u32 id3_get_genre_tag(const char *name);
+
+/*in filedump.c*/
+#ifndef GPAC_DISABLE_SCENE_DUMP
+GF_Err dump_isom_scene(char *file, char *inName, Bool is_final_name, GF_SceneDumpFormat dump_mode, Bool do_log, Bool no_odf_conv);
+//void gf_check_isom_files(char *conf_rules, char *inName);
+#endif
+#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);
+
+#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);
+#endif
+
+
+#ifndef GPAC_DISABLE_ISOM_HINTING
+#ifndef GPAC_DISABLE_ISOM_DUMP
+void dump_isom_rtp(GF_ISOFile *file, char *inName, Bool is_final_name);
+#endif
+void dump_isom_sdp(GF_ISOFile *file, char *inName, Bool is_final_name);
+#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);
+void dump_isom_saps(GF_ISOFile *file, GF_ISOTrackID trackID, u32 dump_saps_mode, 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();
+
+#ifndef GPAC_DISABLE_MPEG2TS
+void dump_mpeg2_ts(char *mpeg2ts_file, char *pes_out_name, Bool prog_num);
+#endif
+
+
+#if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_SENG)
+void PrintStreamerUsage();
+int stream_file_rtp(int argc, char **argv);
+int live_session(int argc, char **argv);
+void PrintLiveUsage();
+#endif
+
+#if !defined(GPAC_DISABLE_STREAMING)
+u32 grab_live_m2ts(const char *grab_m2ts, const char *outName);
+#endif
+
+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);
+
+#endif // _MP4BOX_H
+

gpac-0.8.0.tar.gz/applications/mp4box/wrapper.c -> gpac-1.0.0.tar.gz/applications/mp4box/wrapper.c Changed

gpac-0.8.0.tar.gz/applications/mp4client/Makefile -> gpac-1.0.0.tar.gz/applications/mp4client/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/applications/mp4client
 
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -I../../
+CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS)
 
 LINKFLAGS=$(GPAC_SH_FLAGS)
 
@@ -37,28 +37,33 @@
 ifeq ($(STATICBUILD),yes)
 ##include static modules and other deps for libgpac
 include ../../static.mak
-LINKFLAGS=-lgpac_static $(GPAC_SH_FLAGS) $(EXTRALIBS)
+LINKFLAGS+=$(shell pkg-config ../../gpac.pc --libs --static | sed 's/-lgpac //'  )
+LINKFLAGS+=$(GPAC_SH_FLAGS) $(EXTRALIBS)
 else
 LINKFLAGS+=-lgpac
+ifeq ($(CONFIG_DARWIN),yes)
+#LINKFLAGS+= -Wl,-rpath,'@loader_path'
+else
+LINKFLAGS+= -Wl,-rpath,'$$ORIGIN' -Wl,-rpath-link,../../bin/gcc
+endif
 endif
-
 
 #common obj
-OBJS= main.o extract.o
+OBJS= main.o
 ifeq ($(CONFIG_DARWIN),yes)
 OBJS+= carbon_events.o
 LDFLAGS += -framework Carbon
 endif
 
 
-SRCS := $(OBJS:.o=.c) 
+SRCS := $(OBJS:.o=.c)
 
 all: $(PROG)
 
 MP4Client$(EXE): $(OBJS)
 	$(CC) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LINKFLAGS) $(LDFLAGS)
 
-clean: 
+clean:
 	rm -f $(OBJS) ../../bin/gcc/$(PROG)
 
 install: clean
@@ -70,7 +75,7 @@
 dep: depend
 
 depend:
-	rm -f .depend	
+	rm -f .depend
 	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
 
 distclean: clean

gpac-0.8.0.tar.gz/applications/mp4client/carbon_events.c -> gpac-1.0.0.tar.gz/applications/mp4client/carbon_events.c Changed

gpac-0.8.0.tar.gz/applications/mp4client/main.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2005-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / command-line client
@@ -31,18 +31,15 @@
 #include <gpac/events.h>
 #include <gpac/media_tools.h>
 #include <gpac/options.h>
-#include <gpac/modules/service.h>
+#include <gpac/main.h>
+
 #include <gpac/avparse.h>
 #include <gpac/network.h>
 #include <gpac/utf.h>
-#include <time.h>
 
 /*ISO 639 languages*/
 #include <gpac/iso639.h>
 
-//FIXME we need a plugin for playlists
-#include <gpac/internal/terminal_dev.h>
-
 
 #ifndef WIN32
 #include <dlfcn.h>
@@ -62,31 +59,33 @@
 #endif	//WIN32
 
 /*local prototypes*/
-void PrintWorldInfo(GF_Terminal *term);
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *URL);
-void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name);
+static void PrintWorldInfo(GF_Terminal *term);
+static void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *URL);
+static void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name);
 
-void ViewODs(GF_Terminal *term, Bool show_timing);
-void PrintGPACConfig();
+static void ViewODs(GF_Terminal *term, Bool show_timing);
+static void MakeScreenshot(Bool for_coverage);
+static void PrintAVInfo(Bool final);
 
 static u32 gui_mode = 0;
+static int ret_val = 0;
 
 static Bool restart = GF_FALSE;
 static Bool reload = GF_FALSE;
+Bool do_coverage = GF_FALSE;
 
 Bool no_prog = 0;
 
+static FILE *helpout = NULL;
+u32 help_flags = 0;
+
 #if defined(__DARWIN__) || defined(__APPLE__)
-//we keep no decoder thread because of JS_GC deadlocks between threads ...
-static u32 threading_flags = GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_DECODER_THREAD;
 #define VK_MOD  GF_KEY_MOD_ALT
 #else
-static u32 threading_flags = 0;
 #define VK_MOD  GF_KEY_MOD_CTRL
 #endif
+
 static Bool no_audio = GF_FALSE;
-static Bool term_step = GF_FALSE;
-static Bool no_regulation = GF_FALSE;
 static u32 bench_mode = 0;
 static u32 bench_mode_start = 0;
 static u32 bench_buffer = 0;
@@ -105,16 +104,13 @@
 FILE *playlist = NULL;
 static Bool readonly_playlist = GF_FALSE;
 
-static GF_Config *cfg_file;
 static u32 display_rti = 0;
 static Bool Run;
 static Bool CanSeek = GF_FALSE;
 static char the_url[GF_MAX_PATH];
 static char pl_path[GF_MAX_PATH];
 static Bool no_mime_check = GF_TRUE;
-static Bool be_quiet = GF_FALSE;
-static u64 log_time_start = 0;
-static Bool log_utc_time = GF_FALSE;
+static u64 log_rti_time_start = 0;
 static Bool loop_at_end = GF_FALSE;
 static u32 forced_width=0;
 static u32 forced_height=0;
@@ -126,45 +122,97 @@
 u32 last_x, last_y;
 Bool right_down = GF_FALSE;
 
-void dump_frame(GF_Terminal *term, char *rad_path, u32 dump_type, u32 frameNum);
-
-enum
-{
-	DUMP_NONE = 0,
-	DUMP_AVI = 1,
-	DUMP_BMP = 2,
-	DUMP_PNG = 3,
-	DUMP_RAW = 4,
-	DUMP_SHA1 = 5,
-
-	//DuMP flags
-	DUMP_DEPTH_ONLY = 1<<16,
-	DUMP_RGB_DEPTH = 1<<17,
-	DUMP_RGB_DEPTH_SHAPE = 1<<18
-};
+Float scale = 1;
 
-Bool dump_file(char *the_url, char *out_url, u32 dump_mode, Double fps, u32 width, u32 height, Float scale, u32 *times, u32 nb_times);
+static Bool shell_visible = GF_TRUE;
+#if defined(WIN32) && !defined(_WIN32_WCE)
 
+static HWND console_hwnd = NULL;
+static Bool owns_wnd = GF_FALSE;
+#include <tlhelp32.h>
+#include <Psapi.h>
+static DWORD getParentPID(DWORD pid)
+{
+	DWORD ppid = 0;
+	HANDLE h = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+	if (h) {
+		PROCESSENTRY32 pe = { 0 };
+		pe.dwSize = sizeof(PROCESSENTRY32);
+		if (Process32First(h, &pe)) {
+			do {
+				if (pe.th32ProcessID == pid) {
+					ppid = pe.th32ParentProcessID;
+					break;
+				}
+			} while (Process32Next(h, &pe));
+		}
+		CloseHandle(h);
+	}
+	return (ppid);
+}
 
-static Bool shell_visible = GF_TRUE;
-void hide_shell(u32 cmd_type)
+static void getProcessName(DWORD pid, PUCHAR fname, DWORD sz)
+{
+	HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid);
+	if (h) {
+		GetModuleFileNameEx(h, NULL, fname, sz);
+		CloseHandle(h);
+	}
+}
+static void w32_hide_shell(u32 cmd_type)
 {
-#if defined(WIN32) && !defined(_WIN32_WCE)
 	typedef HWND (WINAPI *GetConsoleWindowT)(void);
 	HMODULE hk32 = GetModuleHandle("kernel32.dll");
-	GetConsoleWindowT GetConsoleWindow = (GetConsoleWindowT ) GetProcAddress(hk32,"GetConsoleWindow");
+	if (!console_hwnd) {
+		char parentName[GF_MAX_PATH];
+		DWORD dwProcessId = 0;
+		DWORD dwParentProcessId = 0;
+		DWORD dwParentParentProcessId = 0;
+		GetConsoleWindowT GetConsoleWindow = (GetConsoleWindowT)GetProcAddress(hk32, "GetConsoleWindow");
+		console_hwnd = GetConsoleWindow();
+		dwProcessId = GetCurrentProcessId();
+		dwParentProcessId = getParentPID(dwProcessId);
+		if (dwParentProcessId)
+				dwParentParentProcessId = getParentPID(dwParentProcessId);
+		//get parent process name, check for explorer
+		parentName[0] = 0;
+		getProcessName(dwParentProcessId, parentName, GF_MAX_PATH);
+		if (strstr(parentName, "explorer")) {
+			owns_wnd = GF_TRUE;
+		}
+		//get parent parent process name, check for devenv (or any other ide name ...)
+		else if (dwParentParentProcessId) {
+			owns_wnd = GF_FALSE;
+			parentName[0] = 0;
+			getProcessName(dwParentParentProcessId, parentName, GF_MAX_PATH);
+			if (strstr(parentName, "devenv")) {
+				owns_wnd = GF_TRUE;
+			}
+		} else {
+			owns_wnd = GF_FALSE;
+		}
+	}
+	if (!owns_wnd || !console_hwnd) return;
+
 	if (cmd_type==0) {
-		ShowWindow( GetConsoleWindow(), SW_SHOW);
+		ShowWindow(console_hwnd, SW_SHOW);
 		shell_visible = GF_TRUE;
 	}
 	else if (cmd_type==1) {
-		ShowWindow( GetConsoleWindow(), SW_HIDE);
+		ShowWindow(console_hwnd, SW_HIDE);
 		shell_visible = GF_FALSE;
 	}
-	else if (cmd_type==2) PostMessage(GetConsoleWindow(), WM_CLOSE, 0, 0);
+	else if (cmd_type == 2) {
+		PostMessage(GetConsoleWindow(), WM_CLOSE, 0, 0);
+	}
+}
+
+#define hide_shell w32_hide_shell
+#else
+
+#define hide_shell(_var)
 
 #endif
-}
 
 
 void send_open_url(const char *url)
@@ -176,202 +224,218 @@
 	gf_term_send_event(term, &evt);
 }
 
-void PrintUsage()
+GF_GPACArg mp4client_args[] =
 {
-	fprintf(stderr, "Usage MP4Client [options] [filename]\n"
-	        "\t-c fileName:    user-defined configuration file. Also works with -cfg\n"
 #ifdef GPAC_MEMORY_TRACKING
-            "\t-mem-track:  enables memory tracker\n"
-            "\t-mem-track-stack:  enables memory tracker with stack dumping\n"
-#endif
-	        "\t-rti fileName:  logs run-time info (FPS, CPU, Mem usage) to file\n"
-	        "\t-rtix fileName: same as -rti but driven by GPAC logs\n"
-	        "\t-quiet:         removes script message, buffering and downloading status\n"
-	        "\t-strict-error:  exit when the player reports its first error\n"
-	        "\t-opt option:    Overrides an option in the configuration file. String format is section:key=value. \n"
-	        "\t                  \"section:key=null\" removes the key\n"
-	        "\t                  \"section:*=null\" removes the section\n"
-	        "\t-conf option:   Same as -opt but does not start player.\n"
-	        "\t-log-file file: sets output log file. Also works with -lf\n"
-	        "\t-logs log_args: sets log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
-	        "\t                 levelX can be one of:\n"
-	        "\t        \"quiet\"      : skip logs\n"
-	        "\t        \"error\"      : logs only error messages\n"
-	        "\t        \"warning\"    : logs error+warning messages\n"
-	        "\t        \"info\"       : logs error+warning+info messages\n"
-	        "\t        \"debug\"      : logs all messages\n"
-	        "\t                 toolX can be one of:\n"
-	        "\t        \"core\"       : libgpac core\n"
-	        "\t        \"coding\"     : bitstream formats (audio, video, scene)\n"
-	        "\t        \"container\"  : container formats (ISO File, MPEG-2 TS, AVI, ...)\n"
-	        "\t        \"network\"    : network data exept RTP trafic\n"
-	        "\t        \"rtp\"        : rtp trafic\n"
-	        "\t        \"author\"     : authoring tools (hint, import, export)\n"
-	        "\t        \"sync\"       : terminal sync layer\n"
-	        "\t        \"codec\"      : terminal codec messages\n"
-	        "\t        \"parser\"     : scene parsers (svg, xmt, bt) and other\n"
-	        "\t        \"media\"      : terminal media object management\n"
-	        "\t        \"scene\"      : scene graph and scene manager\n"
-	        "\t        \"script\"     : scripting engine messages\n"
-	        "\t        \"interact\"   : interaction engine (events, scripts, etc)\n"
-	        "\t        \"smil\"       : SMIL timing engine\n"
-	        "\t        \"compose\"    : composition engine (2D, 3D, etc)\n"
-	        "\t        \"mmio\"       : Audio/Video HW I/O management\n"
-	        "\t        \"rti\"        : various run-time stats\n"
-	        "\t        \"cache\"      : HTTP cache subsystem\n"
-	        "\t        \"audio\"      : Audio renderer and mixers\n"
-#ifdef GPAC_MEMORY_TRACKING
-	        "\t        \"mem\"        : GPAC memory tracker\n"
-#endif
-#ifndef GPAC_DISABLE_DASH_CLIENT
-	        "\t        \"dash\"       : HTTP streaming logs\n"
+ 	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),
 #endif
-	        "\t        \"module\"     : GPAC modules debugging\n"
-	        "\t        \"mutex\"      : mutex\n"
-	        "\t        \"all\"        : all tools logged - other tools can be specified afterwards.\n"
-	        "\tThe special value \"ncl\" disables color logs.\n"
-	        "\n"
-	        "\t-log-clock or -lc      : logs time in micro sec since start time of GPAC before each log line.\n"
-	        "\t-log-utc or -lu        : logs UTC time in ms before each log line.\n"
-	        "\t-ifce IPIFCE           : Sets default Multicast interface\n"
-	        "\t-size WxH:      specifies visual size (default: scene size)\n"
-#if defined(__DARWIN__) || defined(__APPLE__)
-	        "\t-thread:        enables thread usage for terminal and compositor \n"
-#else
-	        "\t-no-thread:     disables thread usage (except for audio)\n"
-#endif
-	        "\t-no-cthread:    disables compositor thread (iOS and Android mode)\n"
-	        "\t-no-audio:      disables audio \n"
-	        "\t-no-wnd:        uses windowless mode (Win32 only)\n"
-	        "\t-no-back:       uses transparent background for output window when no background is specified (Win32 only)\n"
-	        "\t-align vh:      specifies v and h alignment for windowless mode\n"
-	        "\t                 possible v values: t(op), m(iddle), b(ottom)\n"
-	        "\t                 possible h values: l(eft), m(iddle), r(ight)\n"
-	        "\t                 default alignment is top-left\n"
-	        "\t                 default alignment is top-left\n"
-	        "\t-pause:         pauses at first frame\n"
-	        "\t-play-from T:   starts from T seconds in media\n"
-	        "\t-speed S:       starts with speed S\n"
-	        "\t-loop:          loops presentation\n"
-	        "\t-no-regulation: disables framerate regulation\n"
-	        "\t-bench:         disable a/v output and bench source decoding (as fast as possible)\n"
-	        "\t-vbench:        disable audio output, video sync bench source decoding/display (as fast as possible)\n"
-	        "\t-sbench:        disable all decoders and bench systems layer (as fast as possible)\n"
-	        "\t-fs:            starts in fullscreen mode\n"
-	        "\t-views v1:.:vN: creates an auto-stereo scene of N views. vN can be any type of URL supported by GPAC.\n"
-	        "\t                 in this mode, URL argument of GPAC is ignored, GUI as well.\n"
-	        "\t                 this is equivalent as using views://v1:.:N as an URL.\n"
-	        "\t-mosaic v1:.:vN: creates a mosaic of N views. vN can be any type of URL supported by GPAC.\n"
-	        "\t                 in this mode, URL argument of GPAC is ignored.\n"
-	        "\t                 this is equivalent as using mosaic://v1:.:N as an URL.\n"
-	        "\n"
-	        "\t-exit:          automatically exits when presentation is over\n"
-	        "\t-run-for TIME:  runs for TIME seconds and exits\n"
-	        "\t-service ID:    auto-tune to given service ID in a multiplex\n"
-	        "\t-noprog:        disable progress report\n"
-	        "\t-no-save:       disable saving config file on exit\n"
-	        "\t-no-addon:      disable automatic loading of media addons declared in source URL\n"
-	        "\t-gui:           starts in GUI mode. The GUI is indicated in GPAC config, section General, by the key [StartupFile]\n"
-	        "\t-ntp-shift T:   shifts NTP clock of T (signed int) milliseconds\n"
-	        "\n"
-	        "Dumper Options (times is a formated as start-end, with start being sec, h:m:s:f/fps or h:m:s:ms):\n"
-	        "\t-bmp [times]:   dumps given frames to bmp\n"
-	        "\t-png [times]:   dumps given frames to png\n"
-	        "\t-raw [times]:   dumps given frames to raw\n"
-	        "\t-avi [times]:   dumps given file to raw avi\n"
-	        "\t-sha [times]:   dumps given file to raw SHA-1 (1 hash per frame)\n"
-	        "\r-out filename:  name of the output file\n"
-	        "\t-rgbds:         dumps the RGBDS pixel format texture\n"
-	        "\t                 with -avi [times]: dumps an rgbds-format .avi\n"
-	        "\t-rgbd:          dumps the RGBD pixel format texture\n"
-	        "\t                 with -avi [times]: dumps an rgbd-format .avi\n"
-	        "\t-depth:         dumps depthmap (z-buffer) frames\n"
-	        "\t                 with -avi [times]: dumps depthmap in grayscale .avi\n"
-	        "\t                 with -bmp: dumps depthmap in grayscale .bmp\n"
-	        "\t                 with -png: dumps depthmap in grayscale .png\n"
-	        "\t-fps FPS:       specifies frame rate for AVI dumping (default: %f)\n"
-	        "\t-scale s:       scales the visual size (default: 1)\n"
-	        "\t-fill:          uses fill aspect ratio for dumping (default: none)\n"
-	        "\t-show:          shows window while dumping (default: no)\n"
-	        "\n"
-	        "\t-uncache:       Revert all cached items to their original name and location. Does not start player.\n"
-	        "\n"
-	        "\t-help:          shows this screen\n"
-	        "\n"
-	        "MP4Client - GPAC command line player and dumper - version "GPAC_FULL_VERSION"\n"
-	        "(c) Telecom ParisTech 2000-2018 - Licence LGPL v2\n"
-	        "GPAC Configuration: " GPAC_CONFIGURATION "\n"
-	        "Features: %s\n",
-	        GF_IMPORT_DEFAULT_FPS,
-	        gpac_features()
-	       );
+	 GF_DEF_ARG("rti", NULL, "log run-time info (FPS, CPU, Mem usage) to given file", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
+	 GF_DEF_ARG("rtix", NULL, "same as -rti but driven by GPAC logs", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT),
+	 GF_DEF_ARG("size", NULL, "specify visual size WxH. If not set, scene size or video size is used", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_ADVANCED),
+	 GF_DEF_ARG("rti-refresh", NULL, "set refresh time in ms between two runt-time counters queries (default is 200)", NULL, NULL, GF_ARG_INT, 0),
+
+ 	GF_DEF_ARG("no-thread", NULL, "disable thread usage (except for depending on driver audio)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+ 	GF_DEF_ARG("no-audio", NULL, "disable audio", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+
+#ifdef GPAC_CONFIG_WIN32
+ 	GF_DEF_ARG("no-wnd", NULL, "use windowless mode (Win32 only)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERIMENTAL),
+ 	GF_DEF_ARG("no-back", NULL, "use transparent background for output window when no background is specified (Win32 only)", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERIMENTAL),
+ 	GF_DEF_ARG("align", NULL, "specify v and h alignment for windowless mode\n"
+ 	"- tl: top/left\n"
+ 	"- tm: top/horizontal middle\n"
+ 	"- tr: top/right\n"
+ 	"- ml: vertical middle/left\n"
+ 	"- mm: vertical middle/horizontal middle\n"
+ 	"- mr: vertical middle/right\n"
+ 	"- bl: bottom/left\n"
+ 	"- bm: bottom/horizontal middle\n"
+ 	"- br: bottom/right", "tl", "tl|tm|tr|ml|mm|mr|bl|bm|br", GF_ARG_INT, GF_ARG_HINT_EXPERIMENTAL),
+#endif // GPAC_CONFIG_WIN32
+
+ 	GF_DEF_ARG("pause", NULL, "pause at first frame", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("play-from", NULL, "start playback from given time in seconds in media", NULL, NULL, GF_ARG_DOUBLE, 0),
+	GF_DEF_ARG("speed", NULL, "start playback wit given speed", NULL, NULL, GF_ARG_DOUBLE, 0),
+	GF_DEF_ARG("loop", NULL, "loop playback", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("fs", NULL, "start in fullscreen mode", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("exit", NULL, "exit when presentation is over", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("run-for", NULL, "run for indicated time in seconds and exits", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("service", NULL, "auto-tune to given service ID in a multiplex", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("no-save", NULL, "do not save configuration file on exit", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("no-addon", NULL, "disable automatic loading of media addons declared in source URL", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("gui", NULL, "start in GUI mode. The GUI is indicated in the [configuration](core_config) file __[General]StartupFile__", NULL, NULL, GF_ARG_BOOL, 0),
+	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_STRING, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("stats", NULL, "dump filter session stats after playback", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("graph", NULL, "dump filter session graph after playback", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT),
+	GF_DEF_ARG("nk", NULL, "disable keyboard interaction", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_ADVANCED),
+	GF_DEF_ARG("h", "help", "show this help. Use `-hx` to show expert help", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("hc", NULL, "show libgpac core options", NULL, NULL, GF_ARG_BOOL, 0),
+	GF_DEF_ARG("hr", NULL, "show runtime options when keybard interaction is enabled", NULL, NULL, GF_ARG_BOOL, 0),
+	{0}
+};
+
+
+void PrintUsage(Bool show_all)
+{
+	u32 i=0;
+
+	if (help_flags & GF_PRINTARG_MAN) {
+		fprintf(helpout, ".SH \"DESCRIPTION\"\n.LP\nMP4Client is GPAC command-line media player. It supports all GPAC playback features (2D and 3D support, local playback, RTP streaming, HTTP faststart, many audio and video codecs ...).\n.br\nSpecific URLs shortcuts are available, see gpac -h compositor\n.\n.\n.SH OPTIONS\n");
+	} else {
+		gf_sys_format_help(helpout, help_flags, "Usage: MP4Client [options] [filename]\n"
+			"# General\n"
+			"The player accepts any URL supported by GPAC.\n"
+			"Specific URLs shortcuts are available, see [GPAC Compositor (gpac -h compositor)](compositor)\n"
+			"Version: %s\n"
+			"%s\n"
+			"For more info on GPAC configuration, use `gpac ` [-h](GPAC) `bin`  \n  \n"
+			"# Options  \n  \n",
+			(help_flags == GF_PRINTARG_MD) ? GPAC_VERSION : gf_gpac_version(),
+			gf_gpac_copyright()
+		);
+	}
+
+	while (mp4client_args[i].name) {
+		GF_GPACArg *arg = &mp4client_args[i];
+		i++;
+		if (!show_all && (arg->flags & (GF_ARG_HINT_EXPERIMENTAL|GF_ARG_HINT_EXPERT) ))
+			continue;
+		gf_sys_print_arg(helpout, help_flags, arg, "mp4client");
+	}
+}
+
+typedef enum
+{
+	MP4C_QUIT = 0,
+	MP4C_KILL,
+	MP4C_RELOAD,
+	MP4C_OPEN,
+	MP4C_OPEN_PL,
+	MP4C_PL_NEXT,
+	MP4C_PL_JUMP,
+	MP4C_DISCONNECT,
+	MP4C_SELECT,
+	MP4C_PAUSE_RESUME,
+	MP4C_STEP,
+	MP4C_SEEK,
+	MP4C_SEEK_TIME,
+	MP4C_TIME,
+	MP4C_UPDATE,
+	MP4C_EVALJS,
+	MP4C_SCREENSHOT,
+	MP4C_WORLDINFO,
+	MP4C_ODLIST,
+	MP4C_ODINFO_ID,
+	MP4C_ODINFO_NUM,
+	MP4C_ODTIME,
+	MP4C_ODBUF,
+	MP4C_DUMPSCENE,
+	MP4C_STRESSMODE,
+	MP4C_NAVMODE,
+	MP4C_LASTVP,
+	MP4C_OGL2D,
+	MP4C_AR_4_3,
+	MP4C_AR_16_9,
+	MP4C_AR_NONE,
+	MP4C_AR_ORIG,
+	MP4C_LOGS,
+	MP4C_RELOAD_OPTS,
+	MP4C_DISP_RTI,
+	MP4C_DISP_FPS,
+	MP4C_DISP_STATS,
+	MP4C_DISP_GRAPH,
+	MP4C_HELP,
+	MP4C_DOWNRATE,
+	MP4C_VMEM_CACHE,
+
+} MP4C_Command;
+
+struct _mp4c_key
+{
+ u8 char_code;
+ MP4C_Command cmd_type;
+ const char *cmd_help;
+ u32 flags;
+} MP4C_Keys[] = {
+	{'q', MP4C_QUIT, "quit", 0},
+	{'X', MP4C_KILL, "kill", 0},
+	{'r', MP4C_KILL, "reload current presentation", 0},
+	{'o', MP4C_OPEN, "connect to the specified URL", 0},
+	{'O', MP4C_OPEN_PL, "connect to the specified playlist", 0},
+	{'N', MP4C_PL_NEXT, "switch to the next URL in the playlist. Also works with `\\n`", 0},
+	{'P', MP4C_PL_JUMP, "jump to a given number ahead in the playlist", 0},
+	{'D', MP4C_DISCONNECT, "disconnect the current presentation", 0},
+	{'G', MP4C_SELECT, "select object or service ID", 0},
+	{'p', MP4C_PAUSE_RESUME, "play/pause the presentation", 0},
+	{'s', MP4C_STEP, "step one frame ahead", 0},
+	{'z', MP4C_SEEK, "seek into presentation by percentage", 0},
+	{'T', MP4C_SEEK_TIME, "seek into presentation by time", 0},
+	{'t', MP4C_TIME, "print current timing", 0},
+	{'u', MP4C_UPDATE, "send a command (BIFS or LASeR) to the main scene", 0},
+	{'e', MP4C_EVALJS, "evaluate JavaScript code in the main scene", 0},
+	{'Z', MP4C_SCREENSHOT, "dump current output frame to PNG", 0},
+	{'w', MP4C_WORLDINFO, "view world info", 0},
+	{ 'v', MP4C_ODLIST, "view list of active media objects in scene", 0},
+	{ 'i', MP4C_ODINFO_ID, "view Object Descriptor info (by ID)", 0},
+	{ 'j', MP4C_ODINFO_NUM, "view Object Descriptor info (by number)", 0},
+	{ 'b', MP4C_ODTIME, "view media objects timing and buffering info", 0},
+	{ 'm', MP4C_ODBUF, "view media objects buffering and memory info", 0},
+	{ 'd', MP4C_DUMPSCENE, "dump scene graph", 0},
+	{ 'k', MP4C_STRESSMODE, "turn stress mode on/off", 0},
+	{ 'n', MP4C_NAVMODE, "change navigation mode", 0},
+	{ 'x', MP4C_LASTVP, "reset to last active viewpoint", 0},
+	{ '3', MP4C_OGL2D, "switch OpenGL on or off for 2D scenes", 0},
+	{ '4', MP4C_AR_4_3, "force 4/3 Aspect Ratio", 0},
+	{ '5', MP4C_AR_16_9, "force 16/9 Aspect Ratio", 0},
+	{ '6', MP4C_AR_NONE, "force no Aspect Ratio (always fill screen)", 0},
+	{ '7', MP4C_AR_ORIG, "force original Aspect Ratio (default)", 0},
+	{ 'H', MP4C_DOWNRATE, "set HTTP max download rate", 0},
+	{ 'E', MP4C_RELOAD_OPTS, "force reload of compositor options", 0},
+
+	{ 'L', MP4C_LOGS, "change to new log tool/level. CF MP4Client usage for possible values", 0},
+	{ 'R', MP4C_DISP_RTI, "toggle run-time info display in window title bar on/off", 0},
+	{ 'F', MP4C_DISP_FPS, "toggle displaying of FPS in stderr on/off", 0},
+	{ 'f', MP4C_DISP_STATS, "print filter session stats", 0},
+	{ 'g', MP4C_DISP_GRAPH, "print filter session graph", 0},
+
+	{ 'h', MP4C_HELP, "print this message", 0},
+	//below this, only experimental features
+	{ 'M', MP4C_VMEM_CACHE, "specify video cache memory for 2D objects", 1},
+	{0}
+};
+
+MP4C_Command get_cmd(u8 char_code)
+{
+	u32 i=0;
+	while (MP4C_Keys[i].char_code) {
+		if (MP4C_Keys[i].char_code == char_code)
+			return MP4C_Keys[i].cmd_type;
+		i++;
+	}
+	return 0;
 }
 
 void PrintHelp()
 {
-	fprintf(stderr, "MP4Client command keys:\n"
-	        "\tq: quit\n"
-	        "\tX: kill\n"
-	        "\to: connect to the specified URL\n"
-	        "\tO: connect to the specified playlist\n"
-	        "\tN: switch to the next URL in the playlist. Also works with \\n\n"
-	        "\tP: jumps to a given number ahead in the playlist\n"
-	        "\tr: reload current presentation\n"
-	        "\tD: disconnects the current presentation\n"
-	        "\tG: selects object or service ID\n"
-	        "\n"
-	        "\tp: play/pause the presentation\n"
-	        "\ts: step one frame ahead\n"
-	        "\tz: seek into presentation by percentage\n"
-	        "\tT: seek into presentation by time\n"
-	        "\tt: print current timing\n"
-	        "\n"
-	        "\tu: sends a command (BIFS or LASeR) to the main scene\n"
-	        "\te: evaluates JavaScript code\n"
-	        "\tZ: dumps output video to PNG\n"
-	        "\n"
-	        "\tw: view world info\n"
-	        "\tv: view Object Descriptor list\n"
-	        "\ti: view Object Descriptor info (by ID)\n"
-	        "\tj: view Object Descriptor info (by number)\n"
-	        "\tb: view media objects timing and buffering info\n"
-	        "\tm: view media objects buffering and memory info\n"
-	        "\td: dumps scene graph\n"
-	        "\n"
-	        "\tk: turns stress mode on/off\n"
-	        "\tn: changes navigation mode\n"
-	        "\tx: reset to last active viewpoint\n"
-	        "\n"
-	        "\t3: switch OpenGL on or off for 2D scenes\n"
-	        "\n"
-	        "\t4: forces 4/3 Aspect Ratio\n"
-	        "\t5: forces 16/9 Aspect Ratio\n"
-	        "\t6: forces no Aspect Ratio (always fill screen)\n"
-	        "\t7: forces original Aspect Ratio (default)\n"
-	        "\n"
-	        "\tL: changes to new log level. CF MP4Client usage for possible values\n"
-	        "\tT: select new tools to log. CF MP4Client usage for possible values\n"
-	        "\n"
-	        "\tl: list available modules\n"
-	        "\tc: prints some GPAC configuration info\n"
-	        "\tE: forces reload of GPAC configuration\n"
-	        "\n"
-	        "\tR: toggles run-time info display in window title bar on/off\n"
-	        "\tF: toggle displaying of FPS in stderr on/off\n"
-	        "\tg: print GPAC allocated memory\n"
-	        "\th: print this message\n"
-	        "\n"
-	        "\tEXPERIMENTAL/UNSTABLE OPTIONS\n"
-	        "\tC: Enable Streaming Cache\n"
-	        "\tS: Stops Streaming Cache and save to file\n"
-	        "\tA: Aborts Streaming Cache\n"
-	        "\tM: specifies video cache memory for 2D objects\n"
-	        "\n"
-	        "MP4Client - GPAC command line player - version %s\n"
-	        "GPAC Written by Jean Le Feuvre (c) 2001-2005 - ENST (c) 2005-200X\n",
-
-	        GPAC_FULL_VERSION
-	       );
+	u32 i=0;
+
+	gf_sys_format_help(helpout, help_flags, "# MP4Client runtime commands\n"
+		"## Prompt Interaction\n"
+		"The following keys are used for prompt interaction:\n");
+
+	while (MP4C_Keys[i].char_code) {
+		struct _mp4c_key *k = &MP4C_Keys[i];
+		i++;
+		gf_sys_format_help(helpout, help_flags|GF_PRINTARG_HIGHLIGHT_FIRST, "%c: %s%s\n", k->char_code, k->cmd_help, k->flags ? " **! experimental !**" : "");
+	}
+
+	gf_sys_format_help(helpout, help_flags, "\n"
+		"## Content interaction\n"
+		"It is possible to interact with content (interactive or not) using mouse and keyboard.\n"
+		"The following commands are available:\n"
+		"TODO\n"
+		"\n"
+	);
 }
 
 
@@ -385,8 +449,6 @@
 	fprintf(stderr, "%02d:%02d:%02d.%03d", h, m, s, ms);
 }
 
-void PrintAVInfo(Bool final);
-
 
 static u32 rti_update_time_ms = 200;
 static FILE *rti_logs = NULL;
@@ -396,6 +458,7 @@
 	GF_SystemRTInfo rti;
 
 	/*refresh every second*/
+	if (!Run) return;
 	if (!display_rti && !rti_logs) return;
 	if (!gf_sys_get_rti(rti_update_time_ms, &rti, 0) && !legend)
 		return;
@@ -436,43 +499,46 @@
 	}
 }
 
+#include <gpac/revision.h>
+#define MP4CLIENT_CAPTION	"GPAC MP4Client "GPAC_VERSION "-rev" GPAC_GIT_REVISION
+
 static void ResetCaption()
 {
 	GF_Event event;
 	if (display_rti) return;
 	event.type = GF_EVENT_SET_CAPTION;
+	event.caption.caption = NULL;
+
 	if (is_connected) {
 		char szName[1024];
-		NetInfoCommand com;
+		GF_TermURLInfo urli;
 
-		event.caption.caption = NULL;
 		/*get any service info*/
-		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &com) == GF_OK) {
+		if (!startup_file && gf_term_get_service_info(term, gf_term_get_root_object(term), &urli) == GF_OK) {
 			strcpy(szName, "");
-			if (com.track_info) {
+			if (urli.track_num) {
 				char szBuf[10];
-				sprintf(szBuf, "%02d ", (u32) (com.track_info>>16) );
+				sprintf(szBuf, "%02d ", (u32) urli.track_num );
 				strcat(szName, szBuf);
 			}
-			if (com.artist) {
-				strcat(szName, com.artist);
+			if (urli.artist) {
+				strcat(szName, urli.artist);
 				strcat(szName, " ");
 			}
-			if (com.name) {
-				strcat(szName, com.name);
+			if (urli.name) {
+				strcat(szName, urli.name);
 				strcat(szName, " ");
 			}
-			if (com.album) {
+			if (urli.album) {
 				strcat(szName, "(");
-				strcat(szName, com.album);
+				strcat(szName, urli.album);
 				strcat(szName, ")");
 			}
-			if (com.provider) {
+			if (urli.provider) {
 				strcat(szName, "(");
-				strcat(szName, com.provider);
+				strcat(szName, urli.provider);
 				strcat(szName, ")");
 			}
-
 			if (strlen(szName)) event.caption.caption = szName;
 		}
 		if (!event.caption.caption) {
@@ -481,7 +547,7 @@
 			event.caption.caption = str ? str+1 : the_url;
 		}
 	} else {
-		event.caption.caption = "GPAC MP4Client " GPAC_FULL_VERSION;
+		event.caption.caption = MP4CLIENT_CAPTION;
 	}
 	gf_term_user_event(term, &event);
 }
@@ -508,6 +574,12 @@
 	gf_term_set_option(term, GF_OPT_VIDEO_BENCH, is_on);
 }
 
+#ifdef GPAC_ENABLE_COVERAGE
+#define getch() 0
+#define read_line_input(_line, _maxSize, _showContent) GF_FALSE
+
+#else
+
 #ifndef WIN32
 #include <termios.h>
 int getch() {
@@ -540,7 +612,7 @@
  * @param maxSize the maximum size of the line to read
  * @param showContent boolean indicating if the line read should be printed on stderr or not
  */
-static const char * read_line_input(char * line, int maxSize, Bool showContent) {
+static Bool read_line_input(char * line, int maxSize, Bool showContent) {
 	char read;
 	int i = 0;
 	if (fflush( stderr ))
@@ -548,7 +620,7 @@
 	do {
 		line[i] = '\0';
 		if (i >= maxSize - 1)
-			return line;
+			return GF_FALSE;
 		read = getch();
 		if (read == 8 || read == 127) {
 			if (i > 0) {
@@ -562,9 +634,10 @@
 		fflush(stderr);
 	} while (read != '\n');
 	if (!read)
-		return 0;
-	return line;
+		return GF_FALSE;
+	return GF_TRUE;
 }
+#endif //!GPAC_ENABLE_COVERAGE
 
 static void do_set_speed(Fixed desired_speed)
 {
@@ -583,6 +656,8 @@
 	if (gui_mode==1) {
 		if (evt->type==GF_EVENT_QUIT) {
 			Run = 0;
+			if (evt->message.error>0)
+				ret_val = evt->message.error;
 		} else if (evt->type==GF_EVENT_KEYDOWN) {
 			switch (evt->key.key_code) {
 			case GF_KEY_C:
@@ -624,8 +699,9 @@
 			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONSOLE, ("%s %s: %s\n", servName, evt->message.message, gf_error_to_string(evt->message.error)));
 			}
-		} else if (!be_quiet)
+		} else {
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONSOLE, ("%s %s\n", servName, evt->message.message));
+		}
 	}
 	break;
 	case GF_EVENT_PROGRESS:
@@ -686,7 +762,6 @@
 		}
 		break;
 	case GF_EVENT_KEYDOWN:
-		gf_term_process_shortcut(term, evt);
 		switch (evt->key.key_code) {
 		case GF_KEY_SPACE:
 			if (evt->key.flags & GF_KEY_MOD_CTRL) {
@@ -818,6 +893,10 @@
 			if (playback_speed != FIX_ONE)
 				gf_term_set_speed(term, playback_speed);
 
+			if (do_coverage) {
+				gf_term_switch_quality(term, 1);
+			}
+
 		} else if (is_connected) {
 			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
 			is_connected = 0;
@@ -849,12 +928,22 @@
 		}
 		break;
 	case GF_EVENT_SCENE_SIZE:
-		if (forced_width && forced_height) {
+
+		if ((forced_width && forced_height) || scale) {
 			GF_Event size;
-			size.type = GF_EVENT_SIZE;
-			size.size.width = forced_width;
-			size.size.height = forced_height;
-			gf_term_user_event(term, &size);
+			u32 nw = forced_width ? forced_width : evt->size.width;
+			u32 nh = forced_height ? forced_height : evt->size.height;
+
+			if (scale != 1) {
+				nw  = (u32)(nw * scale);
+				nh = (u32)(nh * scale);
+			}
+			if ((nw != evt->size.width) || (nh != evt->size.height)) {
+				size.type = GF_EVENT_SIZE;
+				size.size.width = nw;
+				size.size.height = nh;
+				gf_term_user_event(term, &size);
+			}
 		}
 		break;
 
@@ -877,9 +966,9 @@
 		readonly_playlist = 0;
 		if (!playlist) {
 			readonly_playlist = 0;
-			playlist = gf_temp_file_new(NULL);
+			playlist = gf_file_temp(NULL);
 		}
-		pos = ftell(playlist);
+		pos = (u32) gf_ftell(playlist);
 		i=0;
 		while (i<evt->open_file.nb_files) {
 			if (evt->open_file.files[i] != NULL) {
@@ -887,14 +976,16 @@
 			}
 			i++;
 		}
-		fseek(playlist, pos, SEEK_SET);
+		gf_fseek(playlist, pos, SEEK_SET);
 		request_next_playlist_item = 1;
 	}
 	return 1;
 
 	case GF_EVENT_QUIT:
-		if (evt->message.error)  {
+		if (evt->message.error<0)  {
 			fprintf(stderr, "A fatal error was encoutered: %s (%s) - exiting ...\n", evt->message.message ? evt->message.message : "no details", gf_error_to_string(evt->message.error) );
+		} else {
+			ret_val = evt->message.error;
 		}
 		Run = 0;
 		break;
@@ -906,7 +997,8 @@
 	}
 	break;
 	case GF_EVENT_NAVIGATE_INFO:
-		if (evt->navigate.to_url) fprintf(stderr, "Go to URL: \"%s\"\r", evt->navigate.to_url);
+		if (evt->navigate.to_url)
+			fprintf(stderr, "Go to URL: \"%s\"\r", evt->navigate.to_url);
 		break;
 	case GF_EVENT_NAVIGATE:
 		if (gf_term_is_supported_url(term, evt->navigate.to_url, 1, no_mime_check)) {
@@ -924,20 +1016,23 @@
 		break;
 	case GF_EVENT_AUTHORIZATION:
 	{
-		int maxTries = 1;
+		u32 nb_retry = 4;
 		assert( evt->type == GF_EVENT_AUTHORIZATION);
 		assert( evt->auth.user);
 		assert( evt->auth.password);
 		assert( evt->auth.site_url);
-		while ((!strlen(evt->auth.user) || !strlen(evt->auth.password)) && (maxTries--) >= 0) {
+		while ((!strlen(evt->auth.user) || !strlen(evt->auth.password)) && (nb_retry > 0) ) {
+			nb_retry--;
 			fprintf(stderr, "**** Authorization required for site %s ****\n", evt->auth.site_url);
 			fprintf(stderr, "login   : ");
-			read_line_input(evt->auth.user, 50, 1);
+			if (!read_line_input(evt->auth.user, 50, 1))
+				continue;
 			fprintf(stderr, "\npassword: ");
-			read_line_input(evt->auth.password, 50, 0);
+			if (!read_line_input(evt->auth.password, 50, 0))
+				continue;
 			fprintf(stderr, "*********\n");
 		}
-		if (maxTries < 0) {
+		if (nb_retry == 0) {
 			fprintf(stderr, "**** No User or password has been filled, aborting ***\n");
 			return 0;
 		}
@@ -954,12 +1049,12 @@
 }
 
 
-void list_modules(GF_ModuleManager *modules)
+void list_modules()
 {
 	u32 i;
 	fprintf(stderr, "\rAvailable modules:\n");
-	for (i=0; i<gf_modules_get_count(modules); i++) {
-		char *str = (char *) gf_modules_get_file_name(modules, i);
+	for (i=0; i<gf_modules_count(); i++) {
+		char *str = (char *) gf_modules_get_file_name(i);
 		if (str) fprintf(stderr, "\t%s\n", str);
 	}
 	fprintf(stderr, "\n");
@@ -971,20 +1066,20 @@
 	char nav;
 	u32 type = gf_term_get_option(term, GF_OPT_NAVIGATION_TYPE);
 	e = GF_OK;
-	fflush(stdin);
+//	fflush(stdin);
 
 	if (!type) {
 		fprintf(stderr, "Content/compositor doesn't allow user-selectable navigation\n");
 	} else if (type==1) {
 		fprintf(stderr, "Select Navigation (\'N\'one, \'E\'xamine, \'S\'lide): ");
-		nav = getch();
+		nav = do_coverage ? 'N' : getch();
 		if (nav=='N') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
 		else if (nav=='E') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_EXAMINE);
 		else if (nav=='S') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_SLIDE);
 		else fprintf(stderr, "Unknown selector \'%c\' - only \'N\',\'E\',\'S\' allowed\n", nav);
 	} else if (type==2) {
 		fprintf(stderr, "Select Navigation (\'N\'one, \'W\'alk, \'F\'ly, \'E\'xamine, \'P\'an, \'S\'lide, \'G\'ame, \'V\'R, \'O\'rbit): ");
-		nav = getch();
+		nav = do_coverage ? 'N' : getch();
 		if (nav=='N') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_NONE);
 		else if (nav=='W') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_WALK);
 		else if (nav=='F') e = gf_term_set_option(term, GF_OPT_NAVIGATION, GF_NAVIGATE_FLY);
@@ -1000,71 +1095,12 @@
 }
 
 
-static Bool get_time_list(char *arg, u32 *times, u32 *nb_times)
+static void on_rti_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
 {
-	char *str;
-	Float var;
-	Double sec;
-	u32 h, m, s, ms, f, fps;
-	if (!arg || (arg[0]=='-') || !isdigit(arg[0])) return 0;
-
-	/*SMPTE time code*/
-	if (strchr(arg, ':') && strchr(arg, ';') && strchr(arg, '/')) {
-		if (sscanf(arg, "%02ud:%02ud:%02ud;%02ud/%02ud", &h, &m, &s, &f, &fps)==5) {
-			sec = 0;
-			if (fps) sec = ((Double)f) / fps;
-			sec += 3600*h + 60*m + s;
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-			return 1;
-		}
-	}
-	while (arg) {
-		str = strchr(arg, '-');
-		if (str) str[0] = 0;
-		/*HH:MM:SS:MS time code*/
-		if (strchr(arg, ':') && (sscanf(arg, "%u:%u:%u:%u", &h, &m, &s, &ms)==4)) {
-			sec = ms;
-			sec /= 1000;
-			sec += 3600*h + 60*m + s;
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-		} else if (sscanf(arg, "%f", &var)==1) {
-			sec = atof(arg);
-			times[*nb_times] = (u32) (1000*sec);
-			(*nb_times) ++;
-		}
-		if (!str) break;
-		str[0] = '-';
-		arg = str+1;
-	}
-	return 1;
-}
-
-static u64 last_log_time=0;
-static void on_gpac_log(void *cbk, GF_LOG_Level ll, GF_LOG_Tool lm, const char *fmt, va_list list)
-{
-	FILE *logs = cbk ? cbk : stderr;
-
 	if (rti_logs && (lm & GF_LOG_RTI)) {
 		char szMsg[2048];
 		vsnprintf(szMsg, 2048, fmt, list);
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
-	} else {
-		if (log_time_start) {
-			u64 now = gf_sys_clock_high_res();
-			fprintf(logs, "At "LLD" (diff %d) - ", now - log_time_start, (u32) (now - last_log_time) );
-			last_log_time = now;
-		}
-		if (log_utc_time) {
-			u64 utc_clock = gf_net_get_utc() ;
-			time_t secs = utc_clock/1000;
-			struct tm t;
-			t = *gmtime(&secs);
-			fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
-		}
-		vfprintf(logs, fmt, list);
-		fflush(logs);
 	}
 }
 
@@ -1080,178 +1116,68 @@
 
 		/*turn on RTI loging*/
 		if (use_rtix) {
-			gf_log_set_callback(NULL, on_gpac_log);
+			gf_log_set_callback(NULL, on_rti_log);
 			gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI] System state when enabling log\n"));
-		} else if (log_time_start) {
-			log_time_start = gf_sys_clock_high_res();
+		} else if (log_rti_time_start) {
+			log_rti_time_start = gf_sys_clock_high_res();
 		}
 	}
 }
 
-void set_cfg_option(char *opt_string)
-{
-	char *sep, *sep2, szSec[1024], szKey[1024], szVal[1024];
-	sep = strchr(opt_string, ':');
-	if (!sep) {
-		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
-		return;
-	}
-	{
-		const size_t sepIdx = sep - opt_string;
-		if (sepIdx >= sizeof(szSec)) {
-			fprintf(stderr, "Badly formatted option %s - Section name is too long\n", opt_string);
-			return;
-		}
-
-		strncpy(szSec, opt_string, sepIdx);
-		szSec[sepIdx] = 0;
-	}
-	sep ++;
-	sep2 = strchr(sep, '=');
-	if (!sep2) {
-		fprintf(stderr, "Badly formatted option %s - expected Section:Name=Value\n", opt_string);
-		return;
-	}
-	{
-		const size_t sepIdx = sep2 - sep;
-		if (sepIdx >= sizeof(szKey)) {
-			fprintf(stderr, "Badly formatted option %s - key name is too long\n", opt_string);
-			return;
-		}
-		strncpy(szKey, sep, sepIdx);
-		szKey[sepIdx] = 0;
-		if (strlen(sep2 + 1) >= sizeof(szVal)) {
-			fprintf(stderr, "Badly formatted option %s - value is too long\n", opt_string);
-			return;
-		}
-		strcpy(szVal, sep2+1);
-	}
-
-	if (!stricmp(szKey, "*")) {
-		if (stricmp(szVal, "null")) {
-			fprintf(stderr, "Badly formatted option %s - expected Section:*=null\n", opt_string);
-			return;
-		}
-		gf_cfg_del_section(cfg_file, szSec);
-		return;
-	}
-
-	if (!stricmp(szVal, "null")) {
-		szVal[0]=0;
-	}
-	gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
-}
-
-Bool revert_cache_file(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
-{
-	const char *url;
-	char *sep;
-	GF_Config *cached;
-	if (strncmp(item_name, "gpac_cache_", 11)) return GF_FALSE;
-	cached = gf_cfg_new(NULL, item_path);
-	url = gf_cfg_get_key(cached, "cache", "url");
-	if (url) url = strstr(url, "://");
-	if (url) {
-		u32 i, len, dir_len=0, k=0;
-		char *dst_name;
-		sep = strstr(item_path, "gpac_cache_");
-		if (sep) {
-			sep[0] = 0;
-			dir_len = (u32) strlen(item_path);
-			sep[0] = 'g';
-		}
-		url+=3;
-		len = (u32) strlen(url);
-		dst_name = gf_malloc(len+dir_len+1);
-		memset(dst_name, 0, len+dir_len+1);
-
-		strncpy(dst_name, item_path, dir_len);
-		k=dir_len;
-		for (i=0; i<len; i++) {
-			dst_name[k] = url[i];
-			if (dst_name[k]==':') dst_name[k]='_';
-			else if (dst_name[k]=='/') {
-				if (!gf_dir_exists(dst_name))
-					gf_mkdir(dst_name);
-			}
-			k++;
-		}
-		sep = strrchr(item_path, '.');
-		if (sep) {
-			sep[0]=0;
-			if (gf_file_exists(item_path)) {
-				gf_move_file(item_path, dst_name);
-			}
-			sep[0]='.';
-		}
-		gf_free(dst_name);
-	}
-	gf_cfg_del(cached);
-	gf_delete_file(item_path);
-	return GF_FALSE;
-}
-void do_flatten_cache(const char *cache_dir)
-{
-	gf_enum_directory(cache_dir, GF_FALSE, revert_cache_file, NULL, "*.txt");
-}
-
 
 #ifdef WIN32
 #include <wincon.h>
 #endif
 
-static void progress_quiet(const void *cbck, const char *title, u64 done, u64 total) { }
-
 int mp4client_main(int argc, char **argv)
 {
 	char c;
+	MP4C_Command cmdtype;
 	const char *str;
-	int ret_val = 0;
-	u32 i, times[100], nb_times, dump_mode;
+	GF_Err e;
+	u32 i, ll;
 	u32 simulation_time_in_ms = 0;
 	u32 initial_service_id = 0;
 	Bool auto_exit = GF_FALSE;
-	Bool logs_set = GF_FALSE;
 	Bool start_fs = GF_FALSE;
 	Bool use_rtix = GF_FALSE;
 	Bool pause_at_first = GF_FALSE;
 	Bool no_cfg_save = GF_FALSE;
-	Bool is_cfg_only = GF_FALSE;
-
+	Bool print_stats = GF_FALSE;
+	Bool print_graph = GF_FALSE;
+	Bool no_keyboard = GF_FALSE;
 	Double play_from = 0;
 #ifdef GPAC_MEMORY_TRACKING
     GF_MemTrackerType mem_track = GF_MemTrackerNone;
 #endif
-	Double fps = GF_IMPORT_DEFAULT_FPS;
-	Bool fill_ar, visible, do_uncache, has_command;
-	char *url_arg, *out_arg, *the_cfg, *rti_file, *views, *mosaic;
+	Bool has_command;
+	char *url_arg, *gpac_profile, *rti_file;
 	FILE *logfile = NULL;
-	Float scale = 1;
 #ifndef WIN32
 	dlopen(NULL, RTLD_NOW|RTLD_GLOBAL);
 #endif
 
+	helpout = stdout;
+
 	/*by default use current dir*/
 	strcpy(the_url, ".");
 
 	memset(&user, 0, sizeof(GF_User));
 
-	dump_mode = DUMP_NONE;
-	fill_ar = visible = do_uncache = has_command = GF_FALSE;
-	url_arg = out_arg = the_cfg = rti_file = views = mosaic = NULL;
-	nb_times = 0;
-	times[0] = 0;
+	has_command = GF_FALSE;
+	url_arg = gpac_profile = rti_file = NULL;
 
-	/*first locate config file if specified*/
+	/*first identify profile and mem tracking */
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
-		if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
-			the_cfg = argv[i+1];
+		if (!strcmp(arg, "-p")) {
+			gpac_profile = argv[i+1];
 			i++;
-		}
-		else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
+		} else if (!strncmp(arg, "-p=", 3)) {
+			gpac_profile = argv[i]+3;
+		} else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack")) {
 #ifdef GPAC_MEMORY_TRACKING
             mem_track = !strcmp(arg, "-mem-track-stack") ? GF_MemTrackerBackTrace : GF_MemTrackerSimple;
 #else
@@ -1262,166 +1188,139 @@
 		} else if (!strcmp(arg, "-guid")) {
 			gui_mode = 2;
 		} else if (!strcmp(arg, "-h") || !strcmp(arg, "-help")) {
-			PrintUsage();
+			PrintUsage(GF_FALSE);
+			return 0;
+		} else if (!strcmp(arg, "-hx")) {
+			PrintUsage(GF_TRUE);
+			return 0;
+		} else if (!strcmp(arg, "-hr")) {
+			PrintHelp();
+			return 0;
+		} else if (!strcmp(arg, "-hc")) {
+			fprintf(stderr, "libgpac options:\n");
+			gf_sys_print_core_help(helpout, help_flags, GF_ARGMODE_ALL, 0);
 			return 0;
 		}
 	}
 
 #ifdef GPAC_MEMORY_TRACKING
-	gf_sys_init(mem_track);
+	gf_sys_init(mem_track, gpac_profile);
 #else
-	gf_sys_init(GF_MemTrackerNone);
+	gf_sys_init(GF_MemTrackerNone, gpac_profile);
 #endif
-	gf_sys_set_args(argc, (const char **) argv);
 
-	cfg_file = gf_cfg_init(the_cfg, NULL);
-	if (!cfg_file) {
-		fprintf(stderr, "Error: Configuration File not found\n");
-		return 1;
-	}
-	/*if logs are specified, use them*/
-	if (gf_log_set_tools_levels( gf_cfg_get_key(cfg_file, "General", "Logs") ) != GF_OK) {
-		return 1;
-	}
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+	//we by default want 2 additional threads:
+	//main thread might get locked on vsync
+	//second thread might be busy decoding audio/video
+	//third thread will then be able to refill all buffers/perform networks tasks
+	gf_opts_set_key("temp", "threads", "2");
 
-	if( gf_cfg_get_key(cfg_file, "General", "Logs") != NULL ) {
-		logs_set = GF_TRUE;
+	e = gf_sys_set_args(argc, (const char **) argv);
+	if (e) {
+		fprintf(stderr, "Error assigning libgpac arguments: %s\n", gf_error_to_string(e) );
+		gf_sys_close();
+		return 1;
 	}
 
 	if (!gui_mode) {
-		str = gf_cfg_get_key(cfg_file, "General", "ForceGUI");
+		str = gf_opts_get_key("General", "ForceGUI");
 		if (str && !strcmp(str, "yes")) gui_mode = 1;
 	}
 
 	for (i=1; i<(u32) argc; i++) {
 		char *arg = argv[i];
 
-		if (!strcmp(arg, "-rti")) {
+		if (!strcmp(arg, "-genmd")) {
+			help_flags = GF_PRINTARG_MD;
+			helpout = gf_fopen("mp4client.md", "w");
+
+	 		fprintf(helpout, "[**HOME**](Home) » MP4Client  \n");
+	 		fprintf(helpout, "\n");
+			PrintUsage(GF_TRUE);
+			PrintHelp();
+			gf_fclose(helpout);
+			gf_sys_close();
+			return 0;
+		} else if (!strcmp(arg, "-genman")) {
+			help_flags = GF_PRINTARG_MAN;
+			helpout = gf_fopen("mp4client.1", "w");
+
+
+	 		fprintf(helpout, ".TH MP4Client 1 2019 MP4Client GPAC\n");
+			fprintf(helpout, ".\n.SH NAME\n.LP\nMP4Client \\- GPAC command-line media player\n.SH SYNOPSIS\n.LP\n.B MP4Client\n.RI [options] \\ [file]\n.br\n.\n");
+
+	 		PrintUsage(GF_TRUE);
+			PrintHelp();
+
+			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\nbuild: %s\n"
+			".br\nCopyright: %s\n.br\n"
+			".SH SEE ALSO\n"
+			".LP\ngpac(1), MP4Box(1)\n", gf_gpac_version(), gf_gpac_copyright());
+
+			gf_fclose(helpout);
+			gf_sys_close();
+			return 0;
+		} else if (!strcmp(arg, "-rti")) {
 			rti_file = argv[i+1];
 			i++;
 		} else if (!strcmp(arg, "-rtix")) {
 			rti_file = argv[i+1];
 			i++;
 			use_rtix = GF_TRUE;
+		} else if (!strcmp(arg, "-rti-refresh")) {
+			rti_update_time_ms = atoi(argv[i+1]);
+			i++;
 		} else if (!stricmp(arg, "-size")) {
 			/*usage of %ud breaks sscanf on MSVC*/
 			if (sscanf(argv[i+1], "%dx%d", &forced_width, &forced_height) != 2) {
 				forced_width = forced_height = 0;
 			}
 			i++;
-		} else if (!strcmp(arg, "-quiet")) {
-			be_quiet = 1;
-		} else if (!strcmp(arg, "-strict-error")) {
-			gf_log_set_strict_error(1);
-		} else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
-			logfile = gf_fopen(argv[i+1], "wt");
-			gf_log_set_callback(logfile, on_gpac_log);
-			i++;
-		} else if (!strcmp(arg, "-logs") ) {
-			if (gf_log_set_tools_levels(argv[i+1]) != GF_OK) {
-				return 1;
-			}
-			logs_set = GF_TRUE;
-			i++;
-		} else if (!strcmp(arg, "-log-clock") || !strcmp(arg, "-lc")) {
-			log_time_start = 1;
-		} else if (!strcmp(arg, "-log-utc") || !strcmp(arg, "-lu")) {
-			log_utc_time = 1;
 		}
-#if defined(__DARWIN__) || defined(__APPLE__)
-		else if (!strcmp(arg, "-thread")) threading_flags = 0;
-#else
-		else if (!strcmp(arg, "-no-thread")) threading_flags = GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_WINDOW_NO_THREAD;
-#endif
-		else if (!strcmp(arg, "-no-cthread") || !strcmp(arg, "-no-compositor-thread")) threading_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
-		else if (!strcmp(arg, "-no-audio")) no_audio = 1;
-		else if (!strcmp(arg, "-no-regulation")) no_regulation = 1;
-		else if (!strcmp(arg, "-fs")) start_fs = 1;
-
-		else if (!strcmp(arg, "-opt")) {
-			set_cfg_option(argv[i+1]);
-			i++;
-		} else if (!strcmp(arg, "-conf")) {
-			set_cfg_option(argv[i+1]);
-			is_cfg_only=GF_TRUE;
+		//libgpac opts using an argument
+		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf") || !strcmp(arg, "-logs") || !strcmp(arg, "-cfg")  || !strcmp(arg, "-ifce") ) {
 			i++;
 		}
-		else if (!strcmp(arg, "-ifce")) {
-			gf_cfg_set_key(cfg_file, "Network", "DefaultMCastInterface", argv[i+1]);
-			i++;
-		}
-		else if (!stricmp(arg, "-help")) {
-			PrintUsage();
-			return 1;
+
+		else if (!strcmp(arg, "-no-thread")) {
+			gf_opts_set_key("temp", "threads", "0");
 		}
-		else if (!stricmp(arg, "-noprog")) {
-			no_prog=1;
-			gf_set_progress_callback(NULL, progress_quiet);
+		else if (!strcmp(arg, "-no-audio")) {
+			no_audio = GF_TRUE;
 		}
+		else if (!strcmp(arg, "-fs")) start_fs = 1;
 		else if (!stricmp(arg, "-no-save") || !stricmp(arg, "--no-save") /*old versions used --n-save ...*/) {
 			no_cfg_save=1;
 		}
-		else if (!stricmp(arg, "-ntp-shift")) {
-			s32 shift = atoi(argv[i+1]);
-			i++;
-			gf_net_set_ntp_shift(shift);
-		}
 		else if (!stricmp(arg, "-run-for")) {
-			simulation_time_in_ms = atoi(argv[i+1]) * 1000;
+			simulation_time_in_ms = (u32) (atof(argv[i+1]) * 1000);
 			if (!simulation_time_in_ms)
 				simulation_time_in_ms = 1; /*1ms*/
 			i++;
-		}
-
-		else if (!strcmp(arg, "-out")) {
-			out_arg = argv[i+1];
-			i++;
-		}
-		else if (!stricmp(arg, "-fps")) {
-			fps = atof(argv[i+1]);
-			i++;
-		} else if (!strcmp(arg, "-avi") || !strcmp(arg, "-sha")) {
-			dump_mode &= 0xFFFF0000;
-
-			if (!strcmp(arg, "-sha")) dump_mode |= DUMP_SHA1;
-			else dump_mode |= DUMP_AVI;
-
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) {
-				if (!strcmp(arg, "-avi") && (nb_times!=2) ) {
-					fprintf(stderr, "Only one time arg found for -avi - check usage\n");
-					return 1;
-				}
-				i++;
-			}
-		} else if (!strcmp(arg, "-rgbds")) { /*get dump in rgbds pixel format*/
-				dump_mode |= DUMP_RGB_DEPTH_SHAPE;
-		} else if (!strcmp(arg, "-rgbd")) { /*get dump in rgbd pixel format*/
-				dump_mode |= DUMP_RGB_DEPTH;
-		} else if (!strcmp(arg, "-depth")) {
-				dump_mode |= DUMP_DEPTH_ONLY;
-		} else if (!strcmp(arg, "-bmp")) {
-			dump_mode &= 0xFFFF0000;
-			dump_mode |= DUMP_BMP;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-png")) {
-			dump_mode &= 0xFFFF0000;
-			dump_mode |= DUMP_PNG;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
-		} else if (!strcmp(arg, "-raw")) {
-			dump_mode &= 0xFFFF0000;
-			dump_mode |= DUMP_RAW;
-			if ((url_arg || (i+2<(u32)argc)) && get_time_list(argv[i+1], times, &nb_times)) i++;
 		} else if (!stricmp(arg, "-scale")) {
 			sscanf(argv[i+1], "%f", &scale);
 			i++;
 		}
-		else if (!strcmp(arg, "-c") || !strcmp(arg, "-cfg")) {
-			/* already parsed */
+		/* already parsed */
+		else if (!strcmp(arg, "-nk")) {
+			no_keyboard = GF_TRUE;
+		}
+		/* already parsed */
+		else if (!strcmp(arg, "-p")) {
 			i++;
 		}
+		/* already parsed */
+		else if (!strcmp(arg, "-mem-track") || !strcmp(arg, "-mem-track-stack") || !strcmp(arg, "-gui") || !strcmp(arg, "-guid")
+			 || !strncmp(arg, "-p=", 3)
+		) {
+		}
 
 		/*arguments only used in non-gui mode*/
-		if (!gui_mode) {
+		else if (!gui_mode) {
 			if (arg[0] != '-') {
 				if (url_arg) {
 					fprintf(stderr, "Several input URLs provided (\"%s\", \"%s\"). Check your command-line.\n", url_arg, arg);
@@ -1454,22 +1353,8 @@
 				if (argv[i+1][1]=='m') align_mode |= 1;
 				else if (argv[i+1][1]=='r') align_mode |= 2;
 				i++;
-			} else if (!strcmp(arg, "-fill")) {
-				fill_ar = GF_TRUE;
-			} else if (!strcmp(arg, "-show")) {
-				visible = 1;
-			} else if (!strcmp(arg, "-uncache")) {
-				do_uncache = GF_TRUE;
 			}
 			else if (!strcmp(arg, "-exit")) auto_exit = GF_TRUE;
-			else if (!stricmp(arg, "-views")) {
-				views = argv[i+1];
-				i++;
-			}
-			else if (!stricmp(arg, "-mosaic")) {
-				mosaic = argv[i+1];
-				i++;
-			}
 			else if (!stricmp(arg, "-com")) {
 				has_command = GF_TRUE;
 				i++;
@@ -1477,38 +1362,31 @@
 			else if (!stricmp(arg, "-service")) {
 				initial_service_id = atoi(argv[i+1]);
 				i++;
+			} else if (!stricmp(arg, "-stats")) {
+				print_stats=GF_TRUE;
+			} else if (!stricmp(arg, "-graph")) {
+				print_graph=GF_TRUE;
+			} else if (!stricmp(arg, "-cov")) {
+				do_coverage = GF_TRUE;
+				print_stats = GF_TRUE;
+				print_graph = GF_TRUE;
+			} else {
+				u32 res = gf_sys_is_gpac_arg(arg);
+				if (!res) {
+					fprintf(stderr, "Unrecognized option %s\n", arg);
+				} else if (res==2) {
+					i++;
+				}
 			}
+		} else if (gf_sys_is_gpac_arg(arg)==2) {
+			i++;
 		}
-	}
-	if (is_cfg_only) {
-		gf_cfg_del(cfg_file);
-		fprintf(stderr, "GPAC Config updated\n");
-		return 0;
-	}
-	if (do_uncache) {
-		const char *cache_dir = gf_cfg_get_key(cfg_file, "General", "CacheDirectory");
-		do_flatten_cache(cache_dir);
-		fprintf(stderr, "GPAC Cache dir %s flattened\n", cache_dir);
-		gf_cfg_del(cfg_file);
-		return 0;
-	}
+ 	}
 
-	if (dump_mode && !url_arg ) {
-		FILE *test;
-		url_arg = (char *)gf_cfg_get_key(cfg_file, "General", "StartupFile");
-		test = url_arg ? gf_fopen(url_arg, "rt") : NULL;
-		if (!test) url_arg = NULL;
-		else gf_fclose(test);
-		
-		if (!url_arg) {
-			fprintf(stderr, "Missing argument for dump\n");
-			PrintUsage();
-			if (logfile) gf_fclose(logfile);
-			return 1;
-		}
-	}
+	//will run switch helpout to stderr
+	helpout = stderr;
 
-	if (!gui_mode && !url_arg && (gf_cfg_get_key(cfg_file, "General", "StartupFile") != NULL)) {
+	if (!gui_mode && !url_arg && (gf_opts_get_key("General", "StartupFile") != NULL)) {
 		gui_mode=1;
 	}
 
@@ -1518,7 +1396,7 @@
 		TCHAR buffer[1024];
 		DWORD res = GetCurrentDirectory(1024, buffer);
 		buffer[res] = 0;
-		opt = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
+		opt = gf_opts_get_key("core", "mod-dirs");
 		if (strstr(opt, buffer)) {
 			gui_mode=1;
 		} else {
@@ -1531,27 +1409,14 @@
 		hide_shell(1);
 	}
 	if (gui_mode) {
-		no_prog=1;
-		gf_set_progress_callback(NULL, progress_quiet);
+		gf_sys_set_cfg_option("core:noprog=yes");
 	}
 
-	if (!url_arg && simulation_time_in_ms)
-		simulation_time_in_ms += gf_sys_clock();
-
 #if defined(__DARWIN__) || defined(__APPLE__)
 	carbon_init();
 #endif
 
 
-	if (dump_mode) rti_file = NULL;
-
-	if (!logs_set) {
-		gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
-	}
-	//only override default log callback when needed
-	if (rti_file || logfile || log_utc_time || log_time_start)
-		gf_log_set_callback(NULL, on_gpac_log);
-
 	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
 
 	{
@@ -1561,80 +1426,37 @@
 	}
 
 
-	/*setup dumping options*/
-	if (dump_mode) {
-		user.init_flags |= GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION;
-		if (!visible)
-			user.init_flags |= GF_TERM_INIT_HIDE;
-
-		gf_cfg_set_key(cfg_file, "Audio", "DriverName", "Raw Audio Output");
-		no_cfg_save=GF_TRUE;
-	} else {
-		init_w = forced_width;
-		init_h = forced_height;
-	}
-
-	user.modules = gf_modules_new(NULL, cfg_file);
-	if (user.modules) i = gf_modules_get_count(user.modules);
-	if (!i || !user.modules) {
-		fprintf(stderr, "Error: no modules found - exiting\n");
-		if (user.modules) gf_modules_del(user.modules);
-		gf_cfg_del(cfg_file);
-		gf_sys_close();
-		if (logfile) gf_fclose(logfile);
-		return 1;
-	}
-	fprintf(stderr, "Modules Found : %d \n", i);
-
-	str = gf_cfg_get_key(cfg_file, "General", "GPACVersion");
-	if (!str || strcmp(str, GPAC_FULL_VERSION)) {
-		gf_cfg_del_section(cfg_file, "PluginsCache");
-		gf_cfg_set_key(cfg_file, "General", "GPACVersion", GPAC_FULL_VERSION);
-	}
+	init_w = forced_width;
+	init_h = forced_height;
 
-	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
 	/*dummy in this case (global vars) but MUST be non-NULL*/
-	user.opaque = user.modules;
-	if (threading_flags) user.init_flags |= threading_flags;
-	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
-	if (no_regulation) user.init_flags |= GF_TERM_NO_REGULATION;
-
-	if (threading_flags & (GF_TERM_NO_DECODER_THREAD|GF_TERM_NO_COMPOSITOR_THREAD) ) term_step = GF_TRUE;
+	user.opaque = &user;
 
-	//in dump mode we don't want to rely on system clock but on the number of samples being consumed
-	if (dump_mode) user.init_flags |= GF_TERM_USE_AUDIO_HW_CLOCK;
+	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
 
 	if (bench_mode) {
-		gf_cfg_discard_changes(user.config);
+		gf_opts_discard_changes();
 		auto_exit = GF_TRUE;
-		gf_cfg_set_key(user.config, "Audio", "DriverName", "Raw Audio Output");
-		if (bench_mode!=2) {
-			gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
-			gf_cfg_set_key(user.config, "RAWVideo", "RawOutput", "null");
-			gf_cfg_set_key(user.config, "Compositor", "OpenGLMode", "disable");
-		} else {
-			gf_cfg_set_key(user.config, "Video", "DisableVSync", "yes");
-		}
+		if (bench_mode!=2) user.init_flags |= GF_TERM_NO_VIDEO;
 	}
 
-	{
+	if (forced_width && forced_height) {
 		char dim[50];
 		sprintf(dim, "%d", forced_width);
-		gf_cfg_set_key(user.config, "Compositor", "DefaultWidth", forced_width ? dim : NULL);
+		gf_opts_set_key("Temp", "DefaultWidth", dim);
 		sprintf(dim, "%d", forced_height);
-		gf_cfg_set_key(user.config, "Compositor", "DefaultHeight", forced_height ? dim : NULL);
+		gf_opts_set_key("Temp", "DefaultHeight", dim);
 	}
 
 	fprintf(stderr, "Loading GPAC Terminal\n");
 	i = gf_sys_clock();
+
 	term = gf_term_new(&user);
 	if (!term) {
 		fprintf(stderr, "\nInit error - check you have at least one video out and one rasterizer...\nFound modules:\n");
-		list_modules(user.modules);
-		gf_modules_del(user.modules);
-		gf_cfg_discard_changes(cfg_file);
-		gf_cfg_del(cfg_file);
+		list_modules();
+		gf_opts_discard_changes();
 		gf_sys_close();
 		if (logfile) gf_fclose(logfile);
 		return 1;
@@ -1647,48 +1469,22 @@
 		if (bench_mode==1) bench_mode=2;
 	}
 
-	if (dump_mode) {
-//		gf_term_set_option(term, GF_OPT_VISIBLE, 0);
-		if (fill_ar) gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
-	} else {
-		/*check video output*/
-		str = gf_cfg_get_key(cfg_file, "Video", "DriverName");
-		if (!bench_mode && !strcmp(str, "Raw Video Output")) fprintf(stderr, "WARNING: using raw output video (memory only) - no display used\n");
-		/*check audio output*/
-		str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
-		if (!str || !strcmp(str, "No Audio Output Available")) fprintf(stderr, "WARNING: no audio output available - make sure no other program is locking the sound card\n");
-
-		str = gf_cfg_get_key(cfg_file, "General", "NoMIMETypeFetch");
-		no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
-	}
+	str = gf_opts_get_key("General", "NoMIMETypeFetch");
+	no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
 
-	str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Enabled");
-	if (str && !strcmp(str, "yes")) {
-		str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Name");
+	if (gf_opts_get_bool("core", "proxy-on")) {
+		str = gf_opts_get_key("core", "proxy-name");
 		if (str) fprintf(stderr, "HTTP Proxy %s enabled\n", str);
 	}
 
 	if (rti_file) {
-		str = gf_cfg_get_key(cfg_file, "General", "RTIRefreshPeriod");
-		if (str) {
-			rti_update_time_ms = atoi(str);
-		} else {
-			gf_cfg_set_key(cfg_file, "General", "RTIRefreshPeriod", "200");
-		}
 		UpdateRTInfo("At GPAC load time\n");
 	}
 
 	Run = 1;
 
-	if (dump_mode) {
-		if (!nb_times) {
-			times[0] = 0;
-			nb_times++;
-		}
-		ret_val = dump_file(url_arg, out_arg, dump_mode, fps, forced_width, forced_height, scale, times, nb_times);
-		Run = 0;
-	}
-	else if (views) {
+	if (url_arg && !strcmp(url_arg, "NOGUI")) {
+		url_arg = NULL;
 	}
 	/*connect if requested*/
 	else if (!gui_mode && url_arg) {
@@ -1704,12 +1500,13 @@
 		}
 		ext = strrchr(the_url, '.');
 		if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
-			GF_Err e = GF_OK;
+			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);
@@ -1719,6 +1516,7 @@
 					}
 					gf_dm_sess_del(sess);
 				}
+#endif
 			}
 
 			playlist = e ? NULL : gf_fopen(the_url, "rt");
@@ -1737,9 +1535,9 @@
 		}
 	} else {
 		fprintf(stderr, "Hit 'h' for help\n\n");
-		str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
+		str = gf_opts_get_key("General", "StartupFile");
 		if (str) {
-			strncpy(the_url, "MP4Client "GPAC_FULL_VERSION , sizeof(the_url)-1);
+			snprintf(the_url, sizeof(the_url)-1, "MP4Client %s", gf_gpac_version() );
 			the_url[sizeof(the_url) - 1] = 0;
 			gf_term_connect(term, str);
 			startup_file = 1;
@@ -1750,30 +1548,23 @@
 
 	if (start_fs) gf_term_set_option(term, GF_OPT_FULLSCREEN, 1);
 
-	if (views) {
-		char szTemp[4046];
-		sprintf(szTemp, "views://%s", views);
-		gf_term_connect(term, szTemp);
-	}
-	if (mosaic) {
-		char szTemp[4046];
-		sprintf(szTemp, "mosaic://%s", mosaic);
-		gf_term_connect(term, szTemp);
-	}
 	if (bench_mode) {
 		rti_update_time_ms = 500;
 		bench_mode_start = gf_sys_clock();
 	}
 
+	if (simulation_time_in_ms)
+		simulation_time_in_ms += gf_sys_clock();
+
 
 	while (Run) {
 
 		/*we don't want getchar to block*/
-		if ((gui_mode==1) || !gf_prompt_has_input()) {
+		if ((gui_mode==1) || (no_keyboard || !gf_prompt_has_input()) ) {
 			if (reload) {
 				reload = 0;
 				gf_term_disconnect(term);
-				gf_term_connect(term, startup_file ? gf_cfg_get_key(cfg_file, "General", "StartupFile") : the_url);
+				gf_term_connect(term, startup_file ? gf_opts_get_key("General", "StartupFile") : the_url);
 			}
 			if (restart && gf_term_get_option(term, GF_OPT_IS_OVER)) {
 				restart = 0;
@@ -1803,11 +1594,10 @@
 			}
 
 			if (!use_rtix || display_rti) UpdateRTInfo(NULL);
-			if (term_step) {
-				gf_term_process_step(term);
-			} else {
-				gf_sleep(rti_update_time_ms);
-			}
+
+
+			gf_term_process_step(term);
+
 			if (auto_exit && eos_seen && gf_term_get_option(term, GF_OPT_IS_OVER)) {
 				Run = GF_FALSE;
 			}
@@ -1820,11 +1610,15 @@
 			}
 			continue;
 		}
+
 		c = gf_prompt_get_char();
 
 force_input:
-		switch (c) {
-		case 'q':
+		if (c=='\n') cmdtype=MP4C_PL_NEXT;
+		else cmdtype = get_cmd(c);
+
+		switch (cmdtype) {
+		case MP4C_QUIT:
 		{
 			GF_Event evt;
 			memset(&evt, 0, sizeof(GF_Event));
@@ -1833,32 +1627,31 @@
 		}
 //			Run = 0;
 		break;
-		case 'X':
+		case MP4C_KILL:
 			exit(0);
 			break;
-		case 'Q':
-			break;
-		case 'o':
+
+		case MP4C_OPEN:
 			startup_file = 0;
 			gf_term_disconnect(term);
 			fprintf(stderr, "Enter the absolute URL\n");
-			if (1 > scanf("%s", the_url)) {
+			if (1 > scanf("%1023s", the_url)) {
 				fprintf(stderr, "Cannot read absolute URL, aborting\n");
 				break;
 			}
 			if (rti_file) init_rti_logs(rti_file, the_url, use_rtix);
 			gf_term_connect(term, the_url);
 			break;
-		case 'O':
+		case MP4C_OPEN_PL:
 			gf_term_disconnect(term);
 			fprintf(stderr, "Enter the absolute URL to the playlist\n");
-			if (1 > scanf("%s", the_url)) {
+			if (1 > scanf("%1023s", the_url)) {
 				fprintf(stderr, "Cannot read the absolute URL, aborting.\n");
 				break;
 			}
 			playlist = gf_fopen(the_url, "rt");
 			if (playlist) {
-				if (1 >	fscanf(playlist, "%s", the_url)) {
+				if (1 >	fscanf(playlist, "%1023s", the_url)) {
 					fprintf(stderr, "Cannot read any URL from playlist, aborting.\n");
 					gf_fclose( playlist);
 					break;
@@ -1867,16 +1660,15 @@
 				gf_term_connect(term, the_url);
 			}
 			break;
-		case '\n':
-		case 'N':
+		case MP4C_PL_NEXT:
 			if (playlist) {
 				int res;
 				gf_term_disconnect(term);
 
-				res = fscanf(playlist, "%s", the_url);
+				res = fscanf(playlist, "%1023s", the_url);
 				if ((res == EOF) && loop_at_end) {
-					fseek(playlist, 0, SEEK_SET);
-					res = fscanf(playlist, "%s", the_url);
+					gf_fseek(playlist, 0, SEEK_SET);
+					res = fscanf(playlist, "%1023s", the_url);
 				}
 				if (res == EOF) {
 					fprintf(stderr, "No more items - exiting\n");
@@ -1889,7 +1681,7 @@
 				}
 			}
 			break;
-		case 'P':
+		case MP4C_PL_JUMP:
 			if (playlist) {
 				u32 count;
 				gf_term_disconnect(term);
@@ -1898,7 +1690,7 @@
 					break;
 				}
 				while (count) {
-					if (fscanf(playlist, "%s", the_url)) {
+					if (fscanf(playlist, "%1023s", the_url)) {
 						fprintf(stderr, "Failed to read line, aborting\n");
 						break;
 					}
@@ -1908,23 +1700,23 @@
 				gf_term_connect(term, the_url);
 			}
 			break;
-		case 'r':
+		case MP4C_RELOAD:
 			if (is_connected)
 				reload = 1;
 			break;
 
-		case 'D':
+		case MP4C_DISCONNECT:
 			if (is_connected) gf_term_disconnect(term);
 			break;
 
-		case 'p':
+		case MP4C_PAUSE_RESUME:
 			if (is_connected) {
 				Bool is_pause = gf_term_get_option(term, GF_OPT_PLAY_STATE);
 				fprintf(stderr, "[Status: %s]\n", is_pause ? "Playing" : "Paused");
 				gf_term_set_option(term, GF_OPT_PLAY_STATE, is_pause ? GF_STATE_PLAYING : GF_STATE_PAUSED);
 			}
 			break;
-		case 's':
+		case MP4C_STEP:
 			if (is_connected) {
 				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
 				fprintf(stderr, "Step time: ");
@@ -1933,8 +1725,8 @@
 			}
 			break;
 
-		case 'z':
-		case 'T':
+		case MP4C_SEEK:
+		case MP4C_SEEK_TIME:
 			if (!CanSeek || (Duration<=2000)) {
 				fprintf(stderr, "scene not seekable\n");
 			} else {
@@ -1943,7 +1735,7 @@
 				fprintf(stderr, "Duration: ");
 				PrintTime(Duration);
 				res = gf_term_get_time_in_ms(term);
-				if (c=='z') {
+				if (cmdtype==MP4C_SEEK) {
 					res *= 100;
 					res /= (s64)Duration;
 					fprintf(stderr, " (current %.2f %%)\nEnter Seek percentage:\n", res);
@@ -1979,7 +1771,7 @@
 			}
 			break;
 
-		case 't':
+		case MP4C_TIME:
 		{
 			if (is_connected) {
 				fprintf(stderr, "Current Time: ");
@@ -1990,13 +1782,13 @@
 			}
 		}
 		break;
-		case 'w':
+		case MP4C_WORLDINFO:
 			if (is_connected) PrintWorldInfo(term);
 			break;
-		case 'v':
+		case MP4C_ODLIST:
 			if (is_connected) PrintODList(term, NULL, 0, 0, "Root");
 			break;
-		case 'i':
+		case MP4C_ODINFO_ID:
 			if (is_connected) {
 				u32 ID;
 				fprintf(stderr, "Enter OD ID (0 for main OD): ");
@@ -2005,12 +1797,12 @@
 					ViewOD(term, ID, (u32)-1, NULL);
 				} else {
 					char str_url[GF_MAX_PATH];
-					if (scanf("%s", str_url) == 1)
+					if (scanf("%1023s", str_url) == 1)
 						ViewOD(term, 0, (u32)-1, str_url);
 				}
 			}
 			break;
-		case 'j':
+		case MP4C_ODINFO_NUM:
 			if (is_connected) {
 				u32 num;
 				do {
@@ -2020,31 +1812,26 @@
 				ViewOD(term, (u32)-1, num, NULL);
 			}
 			break;
-		case 'b':
+		case MP4C_ODTIME:
 			if (is_connected) ViewODs(term, 1);
 			break;
 
-		case 'm':
+		case MP4C_ODBUF:
 			if (is_connected) ViewODs(term, 0);
 			break;
 
-		case 'l':
-			list_modules(user.modules);
-			break;
-
-		case 'n':
+		case MP4C_NAVMODE:
 			if (is_connected) set_navigation();
 			break;
-		case 'x':
+		case MP4C_LASTVP:
 			if (is_connected) gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
 			break;
 
-		case 'd':
+		case MP4C_DUMPSCENE:
 			if (is_connected) {
 				GF_ObjectManager *odm = NULL;
 				char radname[GF_MAX_PATH], *sExt;
-				GF_Err e;
-				u32 i, count, odid;
+				u32 count, odid;
 				Bool xml_dump, std_out;
 				radname[0] = 0;
 				do {
@@ -2059,7 +1846,7 @@
 						GF_MediaInfo info;
 						odm = gf_term_get_object(term, root_odm, i);
 						if (gf_term_get_object_info(term, odm, &info) == GF_OK) {
-							if (info.od->objectDescriptorID==odid) break;
+							if (info.ODID==odid) break;
 						}
 						odm = NULL;
 					}
@@ -2067,7 +1854,7 @@
 				do {
 					fprintf(stderr, "Enter file radical name (+\'.x\' for XML dumping) - \"std\" for stderr: ");
 					fflush(stderr);
-				} while( 1 > scanf("%s", radname));
+				} while( 1 > scanf("%1023s", radname));
 				sExt = strrchr(radname, '.');
 				xml_dump = 0;
 				if (sExt) {
@@ -2080,10 +1867,7 @@
 			}
 			break;
 
-		case 'c':
-			PrintGPACConfig();
-			break;
-		case '3':
+		case MP4C_OGL2D:
 		{
 			Bool use_3d = !gf_term_get_option(term, GF_OPT_USE_OPENGL);
 			if (gf_term_set_option(term, GF_OPT_USE_OPENGL, use_3d)==GF_OK) {
@@ -2091,7 +1875,7 @@
 			}
 		}
 		break;
-		case 'k':
+		case MP4C_STRESSMODE:
 		{
 			Bool opt = gf_term_get_option(term, GF_OPT_STRESS_MODE);
 			opt = !opt;
@@ -2099,70 +1883,45 @@
 			gf_term_set_option(term, GF_OPT_STRESS_MODE, opt);
 		}
 		break;
-		case '4':
+		case MP4C_AR_4_3:
 			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_4_3);
 			break;
-		case '5':
+		case MP4C_AR_16_9:
 			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_16_9);
 			break;
-		case '6':
+		case MP4C_AR_NONE:
 			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 			break;
-		case '7':
+		case MP4C_AR_ORIG:
 			gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_KEEP);
 			break;
 
-		case 'C':
-			switch (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)) {
-			case GF_MEDIA_CACHE_DISABLED:
-				gf_term_set_option(term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_ENABLED);
-				break;
-			case GF_MEDIA_CACHE_ENABLED:
-				gf_term_set_option(term, GF_OPT_MEDIA_CACHE, GF_MEDIA_CACHE_DISABLED);
-				break;
-			case GF_MEDIA_CACHE_RUNNING:
-				fprintf(stderr, "Streaming Cache is running - please stop it first\n");
-				continue;
-			}
-			switch (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)) {
-			case GF_MEDIA_CACHE_ENABLED:
-				fprintf(stderr, "Streaming Cache Enabled\n");
-				break;
-			case GF_MEDIA_CACHE_DISABLED:
-				fprintf(stderr, "Streaming Cache Disabled\n");
-				break;
-			case GF_MEDIA_CACHE_RUNNING:
-				fprintf(stderr, "Streaming Cache Running\n");
-				break;
-			}
-			break;
-		case 'S':
-		case 'A':
-			if (gf_term_get_option(term, GF_OPT_MEDIA_CACHE)==GF_MEDIA_CACHE_RUNNING) {
-				gf_term_set_option(term, GF_OPT_MEDIA_CACHE, (c=='S') ? GF_MEDIA_CACHE_DISABLED : GF_MEDIA_CACHE_DISCARD);
-				fprintf(stderr, "Streaming Cache stopped\n");
-			} else {
-				fprintf(stderr, "Streaming Cache not running\n");
-			}
-			break;
-		case 'R':
+		case MP4C_DISP_RTI:
 			display_rti = !display_rti;
 			ResetCaption();
 			break;
-		case 'F':
+		case MP4C_DISP_FPS:
 			if (display_rti) display_rti = 0;
 			else display_rti = 2;
 			ResetCaption();
 			break;
-
-		case 'u':
+		case MP4C_DISP_STATS:
+		case MP4C_DISP_GRAPH:
+			ll = gf_log_get_tool_level(GF_LOG_APP);
+			gf_log_set_tool_level(GF_LOG_APP, GF_LOG_INFO);
+			if (cmdtype==MP4C_DISP_STATS)
+				gf_term_print_stats(term);
+			else
+				gf_term_print_graph(term);
+			gf_log_set_tool_level(GF_LOG_APP, ll);
+			break;
+		case MP4C_UPDATE:
 		{
-			GF_Err e;
 			char szCom[8192];
 			fprintf(stderr, "Enter command to send:\n");
-			fflush(stdin);
+//			fflush(stdin);
 			szCom[0] = 0;
-			if (1 > scanf("%[^\t\n]", szCom)) {
+			if (1 > scanf("%8191[^\t\n]", szCom)) {
 				fprintf(stderr, "Cannot read command to send, aborting.\n");
 				break;
 			}
@@ -2170,14 +1929,13 @@
 			if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
 		}
 		break;
-		case 'e':
+		case MP4C_EVALJS:
 		{
-			GF_Err e;
 			char jsCode[8192];
 			fprintf(stderr, "Enter JavaScript code to evaluate:\n");
-			fflush(stdin);
+//			fflush(stdin);
 			jsCode[0] = 0;
-			if (1 > scanf("%[^\t\n]", jsCode)) {
+			if (1 > scanf("%8191[^\t\n]", jsCode)) {
 				fprintf(stderr, "Cannot read code to evaluate, aborting.\n");
 				break;
 			}
@@ -2186,13 +1944,13 @@
 		}
 		break;
 
-		case 'L':
+		case MP4C_LOGS:
 		{
 			char szLog[1024], *cur_logs;
 			cur_logs = gf_log_get_tools_levels();
 			fprintf(stderr, "Enter new log level (current tools %s):\n", cur_logs);
 			gf_free(cur_logs);
-			if (scanf("%s", szLog) < 1) {
+			if (scanf("%1023s", szLog) < 1) {
 				fprintf(stderr, "Cannot read new log level, aborting.\n");
 				break;
 			}
@@ -2200,14 +1958,7 @@
 		}
 		break;
 
-		case 'g':
-		{
-			GF_SystemRTInfo rti;
-			gf_sys_get_rti(rti_update_time_ms, &rti, 0);
-			fprintf(stderr, "GPAC allocated memory "LLD"\n", rti.gpac_memory);
-		}
-		break;
-		case 'M':
+		case MP4C_VMEM_CACHE:
 		{
 			u32 size;
 			do {
@@ -2217,7 +1968,7 @@
 		}
 		break;
 
-		case 'H':
+		case MP4C_DOWNRATE:
 		{
 			u32 http_bitrate = gf_term_get_option(term, GF_OPT_HTTP_MAX_RATE);
 			do {
@@ -2228,102 +1979,24 @@
 		}
 		break;
 
-		case 'E':
+		case MP4C_RELOAD_OPTS:
 			gf_term_set_option(term, GF_OPT_RELOAD_CONFIG, 1);
 			break;
 
-		case 'B':
-			switch_bench(!bench_mode);
-			break;
-
-		case 'Y':
-		{
-			char szOpt[8192];
-			fprintf(stderr, "Enter option to set (Section:Name=Value):\n");
-			fflush(stdin);
-			szOpt[0] = 0;
-			if (1 > scanf("%[^\t\n]", szOpt)) {
-				fprintf(stderr, "Cannot read option\n");
-				break;
-			}
-			set_cfg_option(szOpt);
-		}
-		break;
-
 		/*extract to PNG*/
-		case 'Z':
-		{
-			char szFileName[100];
-			u32 nb_pass, nb_views, offscreen_view = 0;
-			GF_VideoSurface fb;
-			GF_Err e;
-			nb_pass = 1;
-			nb_views = gf_term_get_option(term, GF_OPT_NUM_STEREO_VIEWS);
-			if (nb_views>1) {
-				fprintf(stderr, "Auto-stereo mode detected - type number of view to dump (0 is main output, 1 to %d offscreen view, %d for all offscreen, %d for all offscreen and main)\n", nb_views, nb_views+1, nb_views+2);
-				if (scanf("%d", &offscreen_view) != 1) {
-					offscreen_view = 0;
-				}
-				if (offscreen_view==nb_views+1) {
-					offscreen_view = 1;
-					nb_pass = nb_views;
-				}
-				else if (offscreen_view==nb_views+2) {
-					offscreen_view = 0;
-					nb_pass = nb_views+1;
-				}
-			}
-			while (nb_pass) {
-				nb_pass--;
-				if (offscreen_view) {
-					sprintf(szFileName, "view%d_dump.png", offscreen_view);
-					e = gf_term_get_offscreen_buffer(term, &fb, offscreen_view-1, 0);
-				} else {
-					sprintf(szFileName, "gpac_video_dump_"LLU".png", gf_net_get_utc() );
-					e = gf_term_get_screen_buffer(term, &fb);
-				}
-				offscreen_view++;
-				if (e) {
-					fprintf(stderr, "Error dumping screen buffer %s\n", gf_error_to_string(e) );
-					nb_pass = 0;
-				} else {
-#ifndef GPAC_DISABLE_AV_PARSERS
-					u32 dst_size = fb.width*fb.height*4;
-					char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
-
-					e = gf_img_png_enc(fb.video_buffer, fb.width, fb.height, fb.pitch_y, fb.pixel_format, dst, &dst_size);
-					if (e) {
-						fprintf(stderr, "Error encoding PNG %s\n", gf_error_to_string(e) );
-						nb_pass = 0;
-					} else {
-						FILE *png = gf_fopen(szFileName, "wb");
-						if (!png) {
-							fprintf(stderr, "Error writing file %s\n", szFileName);
-							nb_pass = 0;
-						} else {
-							gf_fwrite(dst, dst_size, 1, png);
-							gf_fclose(png);
-							fprintf(stderr, "Dump to %s\n", szFileName);
-						}
-					}
-					if (dst) gf_free(dst);
-					gf_term_release_screen_buffer(term, &fb);
-#endif //GPAC_DISABLE_AV_PARSERS
-				}
-			}
-			fprintf(stderr, "Done: %s\n", szFileName);
-		}
-		break;
+		case MP4C_SCREENSHOT:
+			MakeScreenshot(GF_FALSE);
+			break;
 
-		case 'G':
+		case MP4C_SELECT:
 		{
 			GF_ObjectManager *root_od, *odm;
 			u32 index;
 			char szOpt[8192];
 			fprintf(stderr, "Enter 0-based index of object to select or service ID:\n");
-			fflush(stdin);
+//			fflush(stdin);
 			szOpt[0] = 0;
-			if (1 > scanf("%[^\t\n]", szOpt)) {
+			if (1 > scanf("%8191[^\t\n]", szOpt)) {
 				fprintf(stderr, "Cannot read OD ID\n");
 				break;
 			}
@@ -2346,7 +2019,7 @@
 		}
 		break;
 
-		case 'h':
+		case MP4C_HELP:
 			PrintHelp();
 			break;
 		default:
@@ -2363,28 +2036,142 @@
 		gf_log_set_strict_error(0);
 	}
 
+	if (print_graph || print_stats) {
+		ll = gf_log_get_tool_level(GF_LOG_APP);
+		gf_log_set_tool_level(GF_LOG_APP, GF_LOG_INFO);
+		if (print_graph)
+			gf_term_print_graph(term);
+		if (print_stats)
+			gf_term_print_stats(term);
+		gf_log_set_tool_level(GF_LOG_APP, ll);
+	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (do_coverage) {
+		u32 w, h, k, nb_drawn;
+		GF_Event evt;
+		Bool is_bound;
+		const char *outName;
+		GF_ObjectManager *root_odm, *odm;
+		PrintAVInfo(GF_TRUE);
+		PrintODList(term, NULL, 0, 0, "Root");
+		ViewODs(term, GF_TRUE);
+		ViewODs(term, GF_FALSE);
+		ViewOD(term, 0, (u32) -1, NULL);
+		ViewOD(term, 0, 1, NULL);
+		PrintUsage(0);
+		PrintHelp();
+		PrintWorldInfo(term);
+		gf_term_dump_scene(term, NULL, NULL, GF_FALSE, 0, NULL);
+		gf_term_get_current_service_id(term);
+		gf_term_toggle_addons(term, GF_FALSE);
+		set_navigation();
+		get_cmd('v');
+
+		gf_term_play_from_time(term, 0, 0);
+
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_MOUSEUP;
+		evt.mouse.x = 20;
+		evt.mouse.y = 20;
+		gf_term_send_event(term, &evt);
+
+		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+		//exercise step clocks
+		gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+		root_odm = gf_term_get_root_object(term);
+		gf_term_find_service(term, root_odm, 0);
+		gf_term_select_service(term, root_odm, 0);
+		odm = gf_term_get_object(term, root_odm, 0);
+		gf_term_select_object(term, odm );
+		gf_term_object_subscene_type(term, odm);
+		gf_term_get_visual_output_size(term, &w, &h);
+
+		gf_term_is_type_supported(term, "video/mp4");
+		gf_term_get_url(term);
+		gf_term_get_simulation_frame_rate(term, &nb_drawn);
+
+		gf_term_get_text_selection(term, GF_TRUE);
+		gf_term_paste_text(term, "test", GF_TRUE);
+
+		gf_term_set_option(term, GF_OPT_AUDIO_MUTE, 1);
+
+
+		MakeScreenshot(GF_TRUE);
+
+		gf_term_scene_update(term, NULL, "REPLACE DYN_TRANS.translation BY 10 10");
+		gf_term_add_object(term, NULL, GF_TRUE);
+
+		gf_term_get_viewpoint(term, 1, &outName, &is_bound);
+		gf_term_set_viewpoint(term, 1, "testvp");
+
+		for (k=GF_NAVIGATE_WALK; k<=GF_NAVIGATE_VR; k++) {
+			gf_term_set_option(term, GF_OPT_NAVIGATION, k);
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_MOUSEDOWN;
+			evt.mouse.x = 100;
+			evt.mouse.y = 100;
+			gf_term_user_event(term, &evt);
+			evt.type = GF_EVENT_MOUSEMOVE;
+			evt.mouse.x += 10;
+			gf_term_user_event(term, &evt);
+			evt.mouse.y += 10;
+			gf_term_user_event(term, &evt);
+
+			evt.type = GF_EVENT_KEYDOWN;
+			evt.key.key_code = GF_KEY_CONTROL;
+			gf_term_user_event(term, &evt);
+
+			evt.type = GF_EVENT_MOUSEMOVE;
+			evt.mouse.x = 120;
+			evt.mouse.y = 110;
+			gf_term_user_event(term, &evt);
+
+			evt.type = GF_EVENT_KEYUP;
+			evt.key.key_code = GF_KEY_CONTROL;
+			gf_term_user_event(term, &evt);
+
+			evt.type = GF_EVENT_KEYDOWN;
+			evt.key.key_code = GF_KEY_J;
+			gf_term_user_event(term, &evt);
+
+		}
+		gf_term_set_option(term, GF_OPT_NAVIGATION_TYPE, 0);
+
+		gf_term_connect_with_path(term, "logo.jpg", "./media/auxiliary_files/");
+		gf_term_navigate_to(term, "./media/auxiliary_files/logo.jpg");
+		send_open_url("./media/auxiliary_files/logo.jpg");
+		switch_bench(1);
+		do_set_speed(1.0);
+		hide_shell(0);
+		list_modules();
+	}
+#endif
 
 	i = gf_sys_clock();
 	gf_term_disconnect(term);
 	if (rti_file) UpdateRTInfo("Disconnected\n");
 
-	fprintf(stderr, "Deleting terminal... ");
 	if (playlist) gf_fclose(playlist);
 
 #if defined(__DARWIN__) || defined(__APPLE__)
 	carbon_uninit();
 #endif
 
+	//special condition for immediate exit without terminal deletion
+	if (ret_val==3) {
+		fprintf(stderr, "Exit forced, no cleanup\n");
+		exit(0);
+	}
+
+	fprintf(stderr, "Deleting terminal... ");
 	gf_term_del(term);
 	fprintf(stderr, "done (in %d ms) - ran for %d ms\n", gf_sys_clock() - i, gf_sys_clock());
 
 	fprintf(stderr, "GPAC cleanup ...\n");
-	gf_modules_del(user.modules);
 
 	if (no_cfg_save)
-		gf_cfg_discard_changes(cfg_file);
-
-	gf_cfg_del(cfg_file);
+		gf_opts_discard_changes();
 
 	gf_sys_close();
 
@@ -2406,49 +2193,90 @@
 	return ret_val;
 }
 
-#if defined(WIN32) && !defined(NO_WMAIN)
-int wmain(int argc, wchar_t** wargv)
-{
-	int i;
-	int res;
-	size_t len;
-	size_t 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;
-		if (res_len > len) {
-			fprintf(stderr, "Length allocated for conversion of wide char to UTF-8 not sufficient\n");
-			return -1;
-		}
-	}
-	res = mp4client_main(argc, argv);
-	for (i = 0; i < argc; i++) {
-		free(argv[i]);
-	}
-	free(argv);
-	return res;
-}
-#else
-int main(int argc, char** argv)
+GF_MAIN_FUNC(mp4client_main)
+
+
+static void MakeScreenshot(Bool for_coverage)
 {
-	return mp4client_main(argc, argv);
+	char szFileName[100];
+	u32 nb_pass, nb_views, offscreen_view = 0;
+	GF_VideoSurface fb;
+	GF_Err e;
+	nb_pass = 1;
+	nb_views = gf_term_get_option(term, GF_OPT_NUM_STEREO_VIEWS);
+	if (nb_views>1) {
+		fprintf(stderr, "Auto-stereo mode detected - type number of view to dump (0 is main output, 1 to %d offscreen view, %d for all offscreen, %d for all offscreen and main)\n", nb_views, nb_views+1, nb_views+2);
+		if (!for_coverage) {
+			if (scanf("%d", &offscreen_view) != 1) {
+				offscreen_view = 0;
+			}
+		}
+		if (offscreen_view==nb_views+1) {
+			offscreen_view = 1;
+			nb_pass = nb_views;
+		}
+		else if (offscreen_view==nb_views+2) {
+			offscreen_view = 0;
+			nb_pass = nb_views+1;
+		}
+	}
+	if (for_coverage && !offscreen_view) {
+		if (gf_term_get_offscreen_buffer(term, &fb, 0, 0)==GF_OK)
+			gf_term_release_screen_buffer(term, &fb);
+	}
+	while (nb_pass) {
+		nb_pass--;
+		if (offscreen_view) {
+			sprintf(szFileName, "view%d_dump.png", offscreen_view);
+			e = gf_term_get_offscreen_buffer(term, &fb, offscreen_view-1, 0);
+		} else {
+			sprintf(szFileName, "gpac_video_dump_"LLU".png", gf_net_get_utc() );
+			e = gf_term_get_screen_buffer(term, &fb);
+		}
+		offscreen_view++;
+		if (e) {
+			fprintf(stderr, "Error dumping screen buffer %s\n", gf_error_to_string(e) );
+			nb_pass = 0;
+		} else {
+#ifndef GPAC_DISABLE_AV_PARSERS
+			u32 dst_size = fb.width*fb.height*4;
+			char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
+
+			e = gf_img_png_enc(fb.video_buffer, fb.width, fb.height, fb.pitch_y, fb.pixel_format, dst, &dst_size);
+			if (e) {
+				fprintf(stderr, "Error encoding PNG %s\n", gf_error_to_string(e) );
+				nb_pass = 0;
+			} else {
+				FILE *png = gf_fopen(szFileName, "wb");
+				if (!png) {
+					fprintf(stderr, "Error writing file %s\n", szFileName);
+					nb_pass = 0;
+				} else {
+					gf_fwrite(dst, dst_size, png);
+					gf_fclose(png);
+					fprintf(stderr, "Dump to %s\n", szFileName);
+				}
+			}
+			if (dst) gf_free(dst);
+			gf_term_release_screen_buffer(term, &fb);
+
+			if (for_coverage) gf_file_delete(szFileName);
+#endif //GPAC_DISABLE_AV_PARSERS
+		}
+	}
+	fprintf(stderr, "Done: %s\n", szFileName);
 }
-#endif //win32
+
 static GF_ObjectManager *video_odm = NULL;
 static GF_ObjectManager *audio_odm = NULL;
 static GF_ObjectManager *scene_odm = NULL;
 static u32 last_odm_count = 0;
-void PrintAVInfo(Bool final)
+
+static void PrintAVInfo(Bool final)
 {
 	GF_MediaInfo a_odi, v_odi, s_odi;
-	Double avg_dec_time=0;
-	u32 tot_time=0;
-	Bool print_codecs = final;
+	Double avg_dec_time;
+	u32 tot_time;
 
 	if (scene_odm) {
 		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
@@ -2460,7 +2288,7 @@
 	}
 	if (!video_odm && !audio_odm && !scene_odm) {
 		u32 count, i;
-		GF_ObjectManager *root_odm = root_odm = gf_term_get_root_object(term);
+		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
 		if (!root_odm) return;
 
 		if (gf_term_get_object_info(term, root_odm, &v_odi)==GF_OK) {
@@ -2500,12 +2328,12 @@
 	} else {
 		memset(&v_odi, 0, sizeof(v_odi));
 	}
-	if (print_codecs && audio_odm) {
+	if (audio_odm) {
 		gf_term_get_object_info(term, audio_odm, &a_odi);
 	} else {
 		memset(&a_odi, 0, sizeof(a_odi));
 	}
-	if ((print_codecs || !video_odm) && scene_odm) {
+	if (!video_odm && scene_odm) {
 		gf_term_get_object_info(term, scene_odm, &s_odi);
 	} else {
 		memset(&s_odi, 0, sizeof(s_odi));
@@ -2523,54 +2351,51 @@
 			fprintf(stderr, "Drawn %d frames FPS %.2f (simulation FPS %.2f) - duration %d ms\n", nb_frames_drawn, ((Float)nb_frames_drawn*1000)/tot_time,(Float) FPS, gf_term_get_time_in_ms(term)  );
 		}
 	}
-	if (print_codecs) {
-		if (video_odm) {
-			fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
-			if (final) {
-				u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-				if (v_odi.nb_dropped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
-				}
-				fprintf(stderr, "\n");
-			}
-		}
-		if (audio_odm) {
-			fprintf(stderr, "%s SR %d num channels %d bpp %d duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, a_odi.bits_per_sample, a_odi.duration);
-			if (final) {
-				u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-				fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
-				if (a_odi.nb_dropped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
-				}
-				fprintf(stderr, "\n");
+	if (video_odm) {
+		fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
+		if (final) {
+			u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
+			if (!dec_run_time) dec_run_time = 1;
+			if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
+			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
+			if (v_odi.nb_dropped) {
+				fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
 			}
+			fprintf(stderr, "\n");
 		}
-		if (scene_odm) {
-			u32 w, h;
-			gf_term_get_visual_output_size(term, &w, &h);
-			fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
-			if (final) {
-				if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-					u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
-					if (!dec_run_time) dec_run_time = 1;
-					fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
-					fprintf(stderr, "\n");
-				} else {
-					u32 nb_frames_drawn;
-					Double FPS;
-					gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-					tot_time = gf_sys_clock() - bench_mode_start;
-					FPS = gf_term_get_framerate(term, 0);
-					fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-				}
+	}
+	if (audio_odm) {
+		fprintf(stderr, "%s SR %d num channels %d %s duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, gf_audio_fmt_name(a_odi.afmt), a_odi.duration);
+		if (final) {
+			u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
+			if (!dec_run_time) dec_run_time = 1;
+			if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
+			fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
+			if (a_odi.nb_dropped) {
+				fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
 			}
+			fprintf(stderr, "\n");
 		}
+	}
+	if (scene_odm) {
+		u32 w, h;
+		gf_term_get_visual_output_size(term, &w, &h);
+		fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
 		if (final) {
+			if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
+				u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
+				if (!dec_run_time) dec_run_time = 1;
+				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
+				fprintf(stderr, "\n");
+			} else {
+				u32 nb_frames_drawn;
+				Double FPS;
+				gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
+				tot_time = gf_sys_clock() - bench_mode_start;
+				FPS = gf_term_get_framerate(term, 0);
+				fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
+			}
+
 			fprintf(stderr, "**********************************************************\n\n");
 			return;
 		}
@@ -2580,7 +2405,7 @@
 		tot_time = v_odi.last_frame_time - v_odi.first_frame_time;
 		if (!tot_time) tot_time=1;
 		if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-		fprintf(stderr, "%d f FPS %.2f (%.2f ms max) rate %d ", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / tot_time, v_odi.max_dec_time/1000.0, (u32) v_odi.instant_bitrate/1000);
+		fprintf(stderr, "%d f FPS %.2f (%.2f ms max) rate %d ", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / tot_time, v_odi.max_dec_time/1000.0, (u32) v_odi.avg_bitrate/1000);
 	}
 	else if (scene_odm) {
 
@@ -2588,7 +2413,7 @@
 			avg_dec_time = (Float) 1000000 * s_odi.nb_dec_frames;
 			avg_dec_time /= s_odi.total_dec_time;
 			if (s_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*s_odi.current_time / s_odi.duration ) );
-			fprintf(stderr, "%d f %.2f (%d us max) - rate %d ", s_odi.nb_dec_frames, avg_dec_time, s_odi.max_dec_time, (u32) s_odi.instant_bitrate/1000);
+			fprintf(stderr, "%d f %.2f (%d us max) - rate %d ", s_odi.nb_dec_frames, avg_dec_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000);
 		} else {
 			u32 nb_frames_drawn;
 			Double FPS;
@@ -2599,9 +2424,8 @@
 		}
 	}
 	else if (audio_odm) {
-		if (!print_codecs) {
-			gf_term_get_object_info(term, audio_odm, &a_odi);
-		}
+		gf_term_get_object_info(term, audio_odm, &a_odi);
+
 		tot_time = a_odi.last_frame_time - a_odi.first_frame_time;
 		if (!tot_time) tot_time=1;
 		if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
@@ -2609,7 +2433,7 @@
 	}
 }
 
-void PrintWorldInfo(GF_Terminal *term)
+static void PrintWorldInfo(GF_Terminal *term)
 {
 	u32 i;
 	const char *title;
@@ -2628,12 +2452,11 @@
 	gf_list_del(descs);
 }
 
-void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name)
+static void PrintODList(GF_Terminal *term, GF_ObjectManager *root_odm, u32 num, u32 indent, char *root_name)
 {
 	GF_MediaInfo odi;
 	u32 i, count;
 	char szIndent[50];
-	GF_ObjectManager *odm;
 
 	if (!root_odm) {
 		fprintf(stderr, "Currently loaded objects:\n");
@@ -2646,7 +2469,7 @@
 		fprintf(stderr, "Current service ID %d\n", count);
 
 	if (gf_term_get_object_info(term, root_odm, &odi) != GF_OK) return;
-	if (!odi.od) {
+	if (!odi.ODID) {
 		fprintf(stderr, "Service not attached\n");
 		return;
 	}
@@ -2656,11 +2479,11 @@
 
 	fprintf(stderr, "%s", szIndent);
 	fprintf(stderr, "#%d %s - ", num, root_name);
-	if (odi.od->ServiceID) fprintf(stderr, "Service ID %d ", odi.od->ServiceID);
+	if (odi.ServiceID) fprintf(stderr, "Service ID %d ", odi.ServiceID);
 	if (odi.media_url) {
 		fprintf(stderr, "%s\n", odi.media_url);
 	} else {
-		fprintf(stderr, "OD ID %d\n", odi.od->objectDescriptorID);
+		fprintf(stderr, "OD ID %d\n", odi.ODID);
 	}
 
 	szIndent[indent]=' ';
@@ -2669,7 +2492,7 @@
 
 	count = gf_term_get_object_count(term, root_odm);
 	for (i=0; i<count; i++) {
-		odm = gf_term_get_object(term, root_odm, i);
+		GF_ObjectManager *odm = gf_term_get_object(term, root_odm, i);
 		if (!odm) break;
 		num++;
 		if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
@@ -2688,19 +2511,15 @@
 				fprintf(stderr, "#%d - ", num);
 				if (odi.media_url) {
 					fprintf(stderr, "%s", odi.media_url);
-				} else if (odi.od) {
-				 	if (odi.od->URLString) {
-						fprintf(stderr, "%s", odi.od->URLString);
-					} else {
-						fprintf(stderr, "ID %d", odi.od->objectDescriptorID);
-					}
 				} else if (odi.service_url) {
 					fprintf(stderr, "%s", odi.service_url);
+				} else if (odi.remote_url) {
+					fprintf(stderr, "%s", odi.remote_url);
 				} else {
-					fprintf(stderr, "unknown");
+					fprintf(stderr, "ID %d", odi.ODID);
 				}
 				fprintf(stderr, " - %s", (odi.od_type==GF_STREAM_VISUAL) ? "Video" : (odi.od_type==GF_STREAM_AUDIO) ? "Audio" : "Systems");
-				if (odi.od && odi.od->ServiceID) fprintf(stderr, " - Service ID %d", odi.od->ServiceID);
+				if (odi.ServiceID) fprintf(stderr, " - Service ID %d", odi.ServiceID);
 				fprintf(stderr, "\n");
 				break;
 			}
@@ -2708,12 +2527,12 @@
 	}
 }
 
-void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *szURL)
+static void ViewOD(GF_Terminal *term, u32 OD_ID, u32 number, const char *szURL)
 {
 	GF_MediaInfo odi;
-	u32 i, j, count, d_enum,id;
+	u32 i, count, d_enum, id;
+	GF_TermNetStats stats;
 	GF_Err e;
-	NetStatCommand com;
 	GF_ObjectManager *odm, *root_odm = gf_term_get_root_object(term);
 	if (!root_odm) return;
 
@@ -2728,7 +2547,7 @@
 			if (!odm) break;
 			if (gf_term_get_object_info(term, odm, &odi) == GF_OK) {
 				if (szURL && strstr(odi.service_url, szURL)) break;
-				if ((number == (u32)(-1)) && odi.od && (odi.od->objectDescriptorID == OD_ID)) break;
+				if ((number == (u32)(-1)) && (odi.ODID == OD_ID)) break;
 				else if (i == (u32)(number-1)) break;
 			}
 			odm = NULL;
@@ -2740,26 +2559,12 @@
 		else fprintf(stderr, "cannot find OD with number %d\n", number);
 		return;
 	}
-	if (!odi.od) {
+	if (!odi.ODID) {
 		if (number == (u32)-1) fprintf(stderr, "Object %d not attached yet\n", OD_ID);
 		else fprintf(stderr, "Object #%d not attached yet\n", number);
 		return;
 	}
 
-	if (!odi.od) {
-		fprintf(stderr, "Service not attached\n");
-		return;
-	}
-
-	if (odi.od->tag==GF_ODF_IOD_TAG) {
-		fprintf(stderr, "InitialObjectDescriptor %d\n", odi.od->objectDescriptorID);
-		fprintf(stderr, "Profiles and Levels: Scene %x - Graphics %x - Visual %x - Audio %x - OD %x\n",
-		        odi.scene_pl, odi.graphics_pl, odi.visual_pl, odi.audio_pl, odi.OD_pl);
-		fprintf(stderr, "Inline Profile Flag %d\n", odi.inline_pl);
-	} else {
-		fprintf(stderr, "ObjectDescriptor %d\n", odi.od->objectDescriptorID);
-	}
-
 	fprintf(stderr, "Object Duration: ");
 	if (odi.duration) {
 		PrintTime((u32) (odi.duration*1000));
@@ -2812,114 +2617,13 @@
 	}
 	if (odi.protection) fprintf(stderr, "Encrypted Media%s\n", (odi.protection==2) ? " NOT UNLOCKED" : "");
 
-	count = gf_list_count(odi.od->ESDescriptors);
-	fprintf(stderr, "%d streams in OD\n", count);
-	for (i=0; i<count; i++) {
-		GF_ESD *esd = (GF_ESD *) gf_list_get(odi.od->ESDescriptors, i);
+	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);
 
-		fprintf(stderr, "\nStream ID %d - Clock ID %d\n", esd->ESID, esd->OCRESID);
-		if (esd->dependsOnESID) fprintf(stderr, "\tDepends on Stream ID %d for decoding\n", esd->dependsOnESID);
+	if (odi.lang_code)
+		fprintf(stderr, "\tStream Language: %s\n", odi.lang_code);
 
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD:
-			fprintf(stderr, "\tOD Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCR:
-			fprintf(stderr, "\tOCR Stream\n");
-			break;
-		case GF_STREAM_SCENE:
-			fprintf(stderr, "\tScene Description Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_VISUAL:
-			fprintf(stderr, "\tVisual Stream - media type: %s", gf_esd_get_textual_description(esd));
-			break;
-		case GF_STREAM_AUDIO:
-			fprintf(stderr, "\tAudio Stream - media type: %s", gf_esd_get_textual_description(esd));
-			break;
-		case GF_STREAM_MPEG7:
-			fprintf(stderr, "\tMPEG-7 Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_IPMP:
-			fprintf(stderr, "\tIPMP Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_OCI:
-			fprintf(stderr, "\tOCI Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_MPEGJ:
-			fprintf(stderr, "\tMPEGJ Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_INTERACT:
-			fprintf(stderr, "\tUser Interaction Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		case GF_STREAM_TEXT:
-			fprintf(stderr, "\tStreaming Text Stream - version %d\n", esd->decoderConfig->objectTypeIndication);
-			break;
-		default:
-			fprintf(stderr, "\tUnknown Stream\n");
-			break;
-		}
-
-		fprintf(stderr, "\tBuffer Size %d\n\tAverage Bitrate %d bps\n\tMaximum Bitrate %d bps\n", esd->decoderConfig->bufferSizeDB, esd->decoderConfig->avgBitrate, esd->decoderConfig->maxBitrate);
-		if (esd->slConfig->predefined==SLPredef_SkipSL) {
-			fprintf(stderr, "\tNot using MPEG-4 Synchronization Layer\n");
-		} else {
-			fprintf(stderr, "\tStream Clock Resolution %d\n", esd->slConfig->timestampResolution);
-		}
-		if (esd->URLString) fprintf(stderr, "\tStream Location: %s\n", esd->URLString);
-
-		/*check language*/
-		if (esd->langDesc) {
-			s32 lang_idx;
-			char lan[4];
-			lan[0] = esd->langDesc->langCode>>16;
-			lan[1] = (esd->langDesc->langCode>>8)&0xFF;
-			lan[2] = (esd->langDesc->langCode)&0xFF;
-			lan[3] = 0;
-
-			lang_idx = gf_lang_find(lan);
-			if (lang_idx>=0) {
-				fprintf(stderr, "\tStream Language: %s\n", gf_lang_get_name(lang_idx));
-			}
-		}
-	}
 	fprintf(stderr, "\n");
-	/*check OCI (not everything interests us) - FIXME: support for unicode*/
-	count = gf_list_count(odi.od->OCIDescriptors);
-	if (count) {
-		fprintf(stderr, "%d Object Content Information descriptors in OD\n", count);
-		for (i=0; i<count; i++) {
-			GF_Descriptor *desc = (GF_Descriptor *) gf_list_get(odi.od->OCIDescriptors, i);
-			switch (desc->tag) {
-			case GF_ODF_SEGMENT_TAG:
-			{
-				GF_Segment *sd = (GF_Segment *) desc;
-				fprintf(stderr, "Segment Descriptor: Name: %s - start time %g sec - duration %g sec\n", sd->SegmentName, sd->startTime, sd->Duration);
-			}
-			break;
-			case GF_ODF_CC_NAME_TAG:
-			{
-				GF_CC_Name *ccn = (GF_CC_Name *)desc;
-				fprintf(stderr, "Content Creators:\n");
-				for (j=0; j<gf_list_count(ccn->ContentCreators); j++) {
-					GF_ContentCreatorInfo *ci = (GF_ContentCreatorInfo *) gf_list_get(ccn->ContentCreators, j);
-					if (!ci->isUTF8) continue;
-					fprintf(stderr, "\t%s\n", ci->contentCreatorName);
-				}
-			}
-			break;
-
-			case GF_ODF_SHORT_TEXT_TAG:
-			{
-				GF_ShortTextual *std = (GF_ShortTextual *)desc;
-				fprintf(stderr, "Description:\n\tEvent: %s\n\t%s\n", std->eventName, std->eventText);
-			}
-			break;
-			default:
-				break;
-			}
-		}
-		fprintf(stderr, "\n");
-	}
 
 	switch (odi.status) {
 	case 0:
@@ -2949,7 +2653,7 @@
 		const char *url;
 		u32 done, total, bps;
 		d_enum = 0;
-		while (gf_term_get_download_info(term, odm, &d_enum, &url, NULL, &done, &total, &bps)) {
+		while (gf_term_get_download_info(term, odm, &d_enum, &url, &done, &total, &bps)) {
 			if (d_enum==1) fprintf(stderr, "Current Downloads in service:\n");
 			if (done && total) {
 				fprintf(stderr, "%s: %d / %d bytes (%.2f %%) - %.2f kBps\n", url, done, total, (100.0f*done)/total, ((Float)bps)/1024.0f);
@@ -2960,34 +2664,35 @@
 		if (!d_enum) fprintf(stderr, "No Downloads in service\n");
 		fprintf(stderr, "\n");
 	}
+
 	d_enum = 0;
-	while (gf_term_get_channel_net_info(term, odm, &d_enum, &id, &com, &e)) {
+	while (gf_term_get_channel_net_info(term, odm, &d_enum, &id, &stats, &e)) {
 		if (e) continue;
-		if (!com.bw_down && !com.bw_up) continue;
+		if (!stats.bw_down && !stats.bw_up) continue;
 
 		fprintf(stderr, "Stream ID %d statistics:\n", id);
-		if (com.multiplex_port) {
-			fprintf(stderr, "\tMultiplex Port %d - multiplex ID %d\n", com.multiplex_port, com.port);
+		if (stats.multiplex_port) {
+			fprintf(stderr, "\tMultiplex Port %d - multiplex ID %d\n", stats.multiplex_port, stats.port);
 		} else {
-			fprintf(stderr, "\tPort %d\n", com.port);
-		}
-		fprintf(stderr, "\tPacket Loss Percentage: %.4f\n", com.pck_loss_percentage);
-		fprintf(stderr, "\tDown Bandwidth: %d bps\n", com.bw_down);
-		if (com.bw_up) fprintf(stderr, "\tUp Bandwidth: %d bps\n", com.bw_up);
-		if (com.ctrl_port) {
-			if (com.multiplex_port) {
-				fprintf(stderr, "\tControl Multiplex Port: %d - Control Multiplex ID %d\n", com.multiplex_port, com.ctrl_port);
+			fprintf(stderr, "\tPort %d\n", stats.port);
+		}
+		fprintf(stderr, "\tPacket Loss Percentage: %.4f\n", stats.pck_loss_percentage);
+		fprintf(stderr, "\tDown Bandwidth: %d bps\n", stats.bw_down);
+		if (stats.bw_up) fprintf(stderr, "\tUp Bandwidth: %d bps\n", stats.bw_up);
+		if (stats.ctrl_port) {
+			if (stats.multiplex_port) {
+				fprintf(stderr, "\tControl Multiplex Port: %d - Control Multiplex ID %d\n", stats.multiplex_port, stats.ctrl_port);
 			} else {
-				fprintf(stderr, "\tControl Port: %d\n", com.ctrl_port);
+				fprintf(stderr, "\tControl Port: %d\n", stats.ctrl_port);
 			}
-			fprintf(stderr, "\tDown Bandwidth: %d bps\n", com.ctrl_bw_down);
-			fprintf(stderr, "\tUp Bandwidth: %d bps\n", com.ctrl_bw_up);
+			fprintf(stderr, "\tDown Bandwidth: %d bps\n", stats.ctrl_bw_down);
+			fprintf(stderr, "\tUp Bandwidth: %d bps\n", stats.ctrl_bw_up);
 		}
 		fprintf(stderr, "\n");
 	}
 }
 
-void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
+static void PrintODTiming(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
 {
 	GF_MediaInfo odi;
 	u32 ind = indent;
@@ -2995,7 +2700,7 @@
 	if (!odm) return;
 
 	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.od) {
+	if (!odi.ODID) {
 		fprintf(stderr, "Service not attached\n");
 		return;
 	}
@@ -3006,7 +2711,7 @@
 
 	if (! odi.generated_scene) {
 
-		fprintf(stderr, "- OD %d: ", odi.od->objectDescriptorID);
+		fprintf(stderr, "- OD %d: ", odi.ODID);
 		switch (odi.status) {
 		case 1:
 			fprintf(stderr, "Playing - ");
@@ -3038,7 +2743,7 @@
 
 }
 
-void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
+static void PrintODBuffer(GF_Terminal *term, GF_ObjectManager *odm, u32 indent)
 {
 	Float avg_dec_time;
 	GF_MediaInfo odi;
@@ -3046,7 +2751,7 @@
 	if (!odm) return;
 
 	if (gf_term_get_object_info(term, odm, &odi) != GF_OK) return;
-	if (!odi.od) {
+	if (!odi.ODID) {
 		fprintf(stderr, "Service not attached\n");
 		return;
 	}
@@ -3060,7 +2765,7 @@
 	if (odi.generated_scene) {
 		fprintf(stderr, "+ Service %s:\n", odi.service_url);
 	} else {
-		fprintf(stderr, "- OD %d: ", odi.od->objectDescriptorID);
+		fprintf(stderr, "- OD %d: ", odi.ODID);
 		switch (odi.status) {
 		case 1:
 			fprintf(stderr, "Playing");
@@ -3108,7 +2813,7 @@
 
 }
 
-void ViewODs(GF_Terminal *term, Bool show_timing)
+static void ViewODs(GF_Terminal *term, Bool show_timing)
 {
 	GF_ObjectManager *root_odm = gf_term_get_root_object(term);
 	if (!root_odm) return;
@@ -3120,41 +2825,3 @@
 	}
 	fprintf(stderr, "\n");
 }
-
-
-void PrintGPACConfig()
-{
-	u32 i, j, cfg_count, key_count;
-	char szName[200];
-	char *secName = NULL;
-
-	fprintf(stderr, "Enter section name (\"*\" for complete dump):\n");
-	if (1 > scanf("%s", szName)) {
-		fprintf(stderr, "No section name, aborting.\n");
-		return;
-	}
-	if (strcmp(szName, "*")) secName = szName;
-
-	fprintf(stderr, "\n\n*** GPAC Configuration ***\n\n");
-
-	cfg_count = gf_cfg_get_section_count(cfg_file);
-	for (i=0; i<cfg_count; i++) {
-		const char *sec = gf_cfg_get_section_name(cfg_file, i);
-		if (secName) {
-			if (stricmp(sec, secName)) continue;
-		} else {
-			if (!stricmp(sec, "General")) continue;
-			if (!stricmp(sec, "MimeTypes")) continue;
-			if (!stricmp(sec, "RecentFiles")) continue;
-		}
-		fprintf(stderr, "[%s]\n", sec);
-		key_count = gf_cfg_get_key_count(cfg_file, sec);
-		for (j=0; j<key_count; j++) {
-			const char *key = gf_cfg_get_key_name(cfg_file, sec, j);
-			const char *val = gf_cfg_get_key(cfg_file, sec, key);
-			fprintf(stderr, "%s=%s\n", key, val);
-		}
-		fprintf(stderr, "\n");
-	}
-}
-

gpac-0.8.0.tar.gz/applications/mp4client/mp4client.rc -> gpac-1.0.0.tar.gz/applications/mp4client/mp4client.rc Changed

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

gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstance.java -> gpac-1.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GPACInstance.java Changed

@@ -17,7 +17,7 @@
 
 /**
  * @version $Revision$
- * 
+ *
  */
 public class GPACInstance implements GPACInstanceInterface {
 
@@ -51,25 +51,25 @@
 
     /**
      * Loads all libraries
-     * 
+     *
      * @param config
-     * 
+     *
      * @return a map of exceptions containing the library as key and the exception as value. If map is empty, no error
-     * 
+     *
      */
-    
-    
+
+
     synchronized static Map<String, Throwable> loadAllLibraries(GpacConfig config) {
         if (errors != null)
             return errors;
         StringBuilder sb = new StringBuilder();
         final String[] toLoad = { "GLESv2", "log",//$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
-                                 "jpegdroid", "javaenv", //$NON-NLS-1$ //$NON-NLS-2$ 
+                                 "jpegdroid", "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$
                                  "stlport_shared", "stdc++", "faad", "gpac", //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-                                 "gm_droid_cam", "gm_droid_mpegv","gm_mediacodec_dec", //$NON-NLS-1$ //$NON-NLS-2$
-								 "avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter",
+                                 /*"gm_droid_cam",*/ "gm_droid_mpegv","gm_mediacodec_dec", //$NON-NLS-1$ //$NON-NLS-2$
+								 "avutil", "swscale", "swresample", "avcodec", "avformat", "avfilter", "avdevice",
                                  "gpacWrapper" }; // //$NON-NLS-1$ //$NON-NLS-2$
         HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
         for (String s : toLoad) {
@@ -136,7 +136,7 @@
 
     /**
      * Constructor
-     * 
+     *
      * @param callback
      * @param width
      * @param height
@@ -216,7 +216,7 @@
 
     /**
      * Call this method when a key has been pressed
-     * 
+     *
      * @param keyCode
      * @param event
      * @param pressed true if key is pressed, false if key is released
@@ -237,7 +237,7 @@
 
     /**
      * Resizes the object to new dimensions
-     * 
+     *
      * @param width
      * @param height
      */
@@ -245,12 +245,12 @@
         Log.i(LOG_LIB, "Resizing to " + width + "x" + height); //$NON-NLS-1$ //$NON-NLS-2$
         gpacresize(width, height);
     }
-    
+
     private boolean touched = false;
 
     /**
      * Call this when a motion event occurs
-     * 
+     *
      * @param event
      */
     public void motionEvent(MotionEvent event) {
@@ -302,14 +302,14 @@
 
     /**
      * Opens an URL
-     * 
+     *
      * @param url The URL to open
      */
     private native void gpacconnect(String url);
 
     /**
      * Used to create the GPAC instance
-     * 
+     *
      * @param callback
      * @param width
      * @param height
@@ -330,14 +330,14 @@
 
     /**
      * Renders
-     * 
+     *
      * @param handle
      */
     private native void gpacrender();
 
     /**
      * Resizes the current view
-     * 
+     *
      * @param width The new width to set
      * @param height The new height to set
      */
@@ -350,7 +350,7 @@
 
     /**
      * To call when a key has been pressed
-     * 
+     *
      * @param keycode
      * @param rawkeycode
      * @param up
@@ -360,7 +360,7 @@
 
     /**
      * To call when a mouse is down
-     * 
+     *
      * @param x Position in pixels
      * @param y Position in pixels
      */
@@ -368,7 +368,7 @@
 
     /**
      * To call when a mouse is up (released)
-     * 
+     *
      * @param x Position in pixels
      * @param y Position in pixels
      */
@@ -376,7 +376,7 @@
 
     /**
      * To call when a mouse is moving
-     * 
+     *
      * @param x Position in pixels
      * @param y Position in pixels
      */
@@ -385,7 +385,7 @@
     /**
      * To call when a change in orientation is returned from the sensors
      * All angles are in RADIANS and positive in the COUNTER-CLOCKWISE direction
-     * 
+     *
      * @param x yaw (rotation around the -Z axis) range: [-PI, PI]
      * @param y pitch (rotation around the -X axis) range: [-PI/2, PI/2]
      * @param z roll (rotation around the Y axis) range: [-PI, PI]
@@ -416,7 +416,7 @@
     public native void setGpacPreference(String category, String name, String value);
 
 
-    
+
     /**
      * @see com.gpac.Osmo4.GPACInstanceInterface#setGpacLogs(String)
      */

gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacConfig.java -> gpac-1.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/GpacConfig.java Changed

@@ -13,12 +13,12 @@
 
 /**
  * This class handles all GPAC configuration directories
- * 
+ *
  * @author Pierre Souchay (VizionR SAS) (last changed by $LastChangedBy$)
  * @version $Revision$
- * 
+ *
  */
- 
+
 /**
  * NOTE FOR DEVELOPERS
  * Whenever you add or change a path here, you MUST verify also the corresponding path in src/utils/os_config_init.c
@@ -29,7 +29,7 @@
 
     /**
      * Default Constructor
-     * 
+     *
      * @param context
      */
     public GpacConfig(Context context) {
@@ -52,17 +52,17 @@
         //Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacModulesDirectory + " for modules"); //$NON-NLS-1$ //$NON-NLS-2$
         gpacLibsDirectory = dataDir + "/lib/"; //$NON-NLS-1$
         Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLibsDirectory + " for libraries"); //$NON-NLS-1$ //$NON-NLS-2$
-        
-        gpacGuiDirectory = dataDir + "/gui/";
+
+        gpacGuiDirectory = dataDir + "/share/gui/";
         Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacGuiDirectory + " for GUI"); //$NON-NLS-1$ //$NON-NLS-2$
 
-        gpacShaderDirectory = dataDir + "/shaders/";
+        gpacShaderDirectory = dataDir + "/share/shaders/";
         Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacShaderDirectory + " for shader files"); //$NON-NLS-1$ //$NON-NLS-2$
-        
+
         File osmo = new File(Environment.getExternalStorageDirectory(), "osmo"); //$NON-NLS-1$
         gpacLogDirectory = osmo.getAbsolutePath() + "/log/";
         Log.v(LOG_GPAC_CONFIG, "Using directory " + gpacLogDirectory + " for log files"); //$NON-NLS-1$ //$NON-NLS-2$
-        
+
         //check if GPAC.cfg exists in /sdcard/osmo
         File gpac_cfg = new File(osmo.getAbsolutePath(), "GPAC.cfg");
 		if (gpac_cfg.exists())
@@ -73,7 +73,7 @@
 
     /**
      * Ensures all directories are created
-     * 
+     *
      * @return The {@link GpacConfig} instance itself
      */
     public GpacConfig ensureAllDirectoriesExist() {
@@ -82,10 +82,10 @@
         }
         return this;
     }
-    
+
     /**
      * Default directory for GPAC configuration directory, ends with /
-     * 
+     *
      * @return the gpacAppDirectory
      */
     public String getGpacAppDirectory() {
@@ -95,7 +95,7 @@
 
     /**
      * Default directory for GPAC configuration directory, ends with /
-     * 
+     *
      * @return the gpacConfigDirectory
      */
     public String getGpacConfigDirectory() {
@@ -104,7 +104,7 @@
 
     /**
      * Directory of Android containing all fonts
-     * 
+     *
      * @return the gpacFontDirectory
      */
     public String getGpacFontDirectory() {
@@ -113,7 +113,7 @@
 
     /**
      * Default directory for GPAC modules directory, ends with /
-     * 
+     *
      * @return the gpacModulesDirectory
      */
     public String getGpacModulesDirectory() {
@@ -130,16 +130,16 @@
 
     /**
      * Default directory for cached files
-     * 
+     *
      * @return the gpacCacheDirectory
      */
     public String getGpacCacheDirectory() {
         return gpacCacheDirectory;
     }
-    
+
     /**
      * Default directory for GUI files
-     * 
+     *
      * @return the gpacGuiDirectory
      */
     public String getGpacGuiDirectory() {
@@ -154,7 +154,7 @@
     public String getGpacShaderDirectory() {
         return gpacShaderDirectory;
     }
-    
+
     /**
      * Default directory for log files
      *
@@ -163,9 +163,9 @@
     public String getGpacLogDirectory() {
         return gpacLogDirectory;
     }
-    
+
     private final String gpacAppDirectory;
-    
+
     private final String gpacConfigDirectory;
 
     private final String gpacFontDirectory = "/system/fonts/"; //$NON-NLS-1$
@@ -175,16 +175,16 @@
     private final String gpacLibsDirectory;
 
     private final String gpacCacheDirectory;
-    
+
     private final String gpacGuiDirectory;
 
     private final String gpacShaderDirectory;
-    
+
     private final String gpacLogDirectory;
 
     /**
      * Creates a given directory if it does not exist
-     * 
+     *
      * @param path
      */
     private static boolean createDirIfNotExist(String path) {
@@ -202,7 +202,7 @@
 
     /**
      * Get the GPAC.cfg file
-     * 
+     *
      * @return the file
      */
     public File getGpacConfigFile() {
@@ -211,7 +211,7 @@
 
     /**
      * Get the GPAC.cfg file
-     * 
+     *
      * @return the file
      */
     public File getGpacLastRevFile() {
@@ -220,7 +220,7 @@
 
     /**
      * Get the configuration as text
-     * 
+     *
      * @return a String with newlines representing all the configuration
      */
     public String getConfigAsText() {

gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Osmo4.java -> gpac-1.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/java/com/gpac/Osmo4/Osmo4.java Changed

@@ -94,9 +94,9 @@
 import com.lge.real3d.Real3DInfo;
 /**
  * The main Osmo4 activity, used to launch everything
- * 
+ *
  * @version $Revision$
- * 
+ *
  */
 public class Osmo4 extends Activity implements GpacCallback {
 
@@ -104,7 +104,7 @@
 	private static final int INITIAL_HIDE_DELAY = 300;
 
 	public boolean m3DLibraryLoaded = false;
-	private Real3D mReal3D;	
+	private Real3D mReal3D;
 	private View mDecorView;
 
     private boolean shouldDeleteGpacConfig = false;
@@ -156,7 +156,7 @@
     private GpacLogger logger;
 
     private ProgressDialog startupProgress;
-    
+
     private LinearLayout gl_view;
 
     /**
@@ -176,7 +176,7 @@
 			final String LGE_3D_DISPLAY = "lge.hardware.real3d.barrier.landscape";
 			if(this.getPackageManager().hasSystemFeature(LGE_3D_DISPLAY))
 				m3DLibraryLoaded = true;
-        } 
+        }
         catch (ClassNotFoundException e) {
         	m3DLibraryLoaded = false;
         }
@@ -214,7 +214,7 @@
         startupProgress.setMessage(getResources().getText(R.string.osmoLoading));
         startupProgress.setTitle(R.string.osmoLoading);
         startupProgress.show();
-        
+
         if (mGLView != null) {
             setContentView(R.layout.main);
             if (toOpen != null)
@@ -223,9 +223,9 @@
             return;
         }
 		Preview.context = this;
-       
+
         setContentView(R.layout.main);
-		
+
 		final View contentView = (LinearLayout)findViewById(R.id.surface_gl);
 		mDecorView =  getWindow().getDecorView();
 
@@ -250,7 +250,7 @@
 					if (Osmo4.this.keyboardIsVisible)
 						((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(mGLView.getWindowToken(), 0);
 					hideSystemUI();
-				} 
+				}
 				return true;
 			}
 		});
@@ -263,9 +263,9 @@
 
 	showSystemUI();
 		mGLView = new Osmo4GLSurfaceView(this);
-		
+
 		gl_view = (LinearLayout)findViewById(R.id.surface_gl);
-        
+
         sensors = new SensorServices(this);
 
         if( m3DLibraryLoaded ) //should be checking wether the terminal is a LG one
@@ -295,7 +295,7 @@
 
                         Osmo4Renderer renderer = new Osmo4Renderer(Osmo4.this, gpacConfig, toOpen);
                         mGLView.setRenderer(renderer);
-                       
+
                         gl_view.addView(mGLView);
 
                         sensors.setRenderer(renderer);
@@ -330,7 +330,7 @@
         		if (!guiDir.delete())
         			Log.e(LOG_OSMO_TAG, "Failed to delete " + guiDir);
         	}
-        	if (!guiDir.mkdir())
+        	if (!guiDir.mkdirs())
         		Log.e(LOG_OSMO_TAG, "Failed to create directory " + guiDir);
         	copyAssets(gpacConfig, GUI_ROOT_ASSET_DIR);
         }
@@ -341,12 +341,12 @@
             // we do not delete the directory if it already exists, because it might contain custom shaders
             if (shaderDir.exists()) {
                     Log.v(LOG_OSMO_TAG, "Shader directory already exists at: " + shaderDir);
-            }else if (!shaderDir.mkdir()){
+            }else if (!shaderDir.mkdirs()){
                 Log.e(LOG_OSMO_TAG, "Failed to create directory " + shaderDir);
             }
         }
         copyAssets(gpacConfig, SHADER_ROOT_ASSET_DIR);
-        
+
         //if there is not a GPAC.cfg in external storage (i.e  using config in app directory)
         //copy GPAC.cfg from gpacAppDirectoryto gpacLogDirectory
         File osmo = new File(Environment.getExternalStorageDirectory(), "osmo");
@@ -368,7 +368,7 @@
         }
 
     }
-    
+
     /*
      * Copy GUI elements
      *
@@ -379,7 +379,7 @@
     private final static String GUI_ROOT_ASSET_DIR = "gui";
     private final static String SHADER_ROOT_ASSET_DIR = "shaders";
 
-    private void copyAssets(GpacConfig config, String asset_dir) {    
+    private void copyAssets(GpacConfig config, String asset_dir) {
      		StringBuilder sb = new StringBuilder();
      		HashMap<String, Throwable> exceptions = new HashMap<String, Throwable>();
 				AssetManager assetManager = getAssets();
@@ -397,9 +397,9 @@
 				    } catch(IOException e) {
 				        Log.e(LOG_OSMO_TAG, "Failed to copy: " + path, e);
 				        exceptions.put("Failed to copy " + path, e);
-				    }       
+				    }
 				}
-				
+
 				if (!exceptions.isEmpty()) {
 					try {
               PrintStream out = new PrintStream(config.getGpacLogDirectory() + "debug_assets.txt", "UTF-8"); //$NON-NLS-1$//$NON-NLS-2$
@@ -609,7 +609,7 @@
 
     /**
      * Opens a new activity to select a file
-     * 
+     *
      * @return true if activity has been selected
      */
     private boolean openFileDialog() {
@@ -825,7 +825,7 @@
 
     /**
      * Cleans GPAC cache
-     * 
+     *
      * @return true if successful
      */
     protected boolean cleanCache() {
@@ -1332,7 +1332,7 @@
             mHideHandler.removeMessages(0);
         }
     }
-    
+
     public void setLogFile(String logfile) {
 	    logger.setEnableLogOnDisk(true);
 	    logger.setLogFile(logfile);

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

@@ -30,8 +30,8 @@
 #include <gpac/terminal.h>
 #include <gpac/thread.h>
 #include <gpac/options.h>
-#include <gpac/modules/service.h>
-#include <gpac/internal/terminal_dev.h>
+#include <gpac/network.h>
+//#include <gpac/internal/terminal_dev.h>
 #include <gpac/internal/compositor_dev.h>
 
 #include "wrapper.h"
@@ -53,6 +53,13 @@
 
 static pthread_key_t jni_thread_env_key = 0;
 
+struct _tag_terminal
+{
+	GF_User *user;
+	GF_Compositor *compositor;
+	GF_FilterSession *fsess;
+};
+
 //these two are used by modumles - define them when using static module build
 #ifdef GPAC_STATIC_MODULES
 
@@ -194,7 +201,7 @@
 	allowedVersions[1] = JNI_VERSION_1_4;
 	allowedVersions[2] = JNI_VERSION_1_2;
 	allowedVersions[3] = JNI_VERSION_1_1;
-	JNIEnv * env;
+	JNIEnv * env = NULL;
 	if (!vm)
 		return -1;
 	for (int i = 0 ; i < NUM_JNI_VERSIONS; i++) {
@@ -210,6 +217,10 @@
 		}
 
 	}
+	if (! env) {
+		LOGW("Failed to find any supported JNI VERSION");
+		return -1;
+	}
 	javaVM = vm;
 	LOGI("Registering %s natives\n", className);
 	res = jniRegisterNativeMethods(env, className, sMethods, (sizeof(sMethods) - 1)/sizeof(JNINativeMethod));
@@ -234,6 +245,16 @@
 	m_term = NULL;
 	m_mx = NULL;
 	mainJavaEnv = NULL;
+
+	debug_f = 0;
+	m_window = NULL;
+	m_session = NULL;
+
+	m_cfg_dir[0]=0;
+	m_modules_dir[0]=0;
+	m_cache_dir[0]=0;
+	m_font_dir[0]=0;
+
 #ifndef GPAC_GUI_ONLY
 	memset(&m_user, 0, sizeof(GF_User));
 	memset(&m_rti, 0, sizeof(GF_SystemRTInfo));
@@ -267,6 +288,7 @@
 		m_term = NULL;
 		gf_term_del(t);
 	}
+	/*
 	if (m_user.config) {
 		gf_cfg_del(m_user.config);
 		m_user.config = NULL;
@@ -274,7 +296,7 @@
 	if (m_user.modules) {
 		gf_modules_del(m_user.modules);
 		m_user.modules = NULL;
-	}
+	}*/
 #endif
 	m_term = NULL;
 	gf_sys_close();
@@ -372,12 +394,6 @@
 	return 1;
 }
 //-------------------------------
-void CNativeWrapper::DisplayRTI() {
-#ifndef GPAC_GUI_ONLY
-	// display some system informations ?
-#endif
-}
-//-------------------------------
 int CNativeWrapper::Quit(int code) {
 
 	Shutdown();
@@ -529,7 +545,7 @@
 Bool CNativeWrapper::GPAC_EventProc(void *cbk, GF_Event *evt) {
 	if (cbk)
 	{
-		CNativeWrapper* ptr = (CNativeWrapper*)cbk;
+		CNativeWrapper* ptr = (CNativeWrapper *) cbk;
 		char msg[4096];
 		msg[0] = 0;
 		LOGD("GPAC_EventProc() Message=%d", evt->type);
@@ -681,9 +697,9 @@
 	debug_log("SetupLogs()");
 
 	gf_mx_p(m_mx);
-	gf_log_set_tools_levels( gf_cfg_get_key(m_user.config, "General", "Logs") );
+	gf_log_set_tools_levels( gf_opts_get_key("core", "logs"), GF_TRUE );
 	gf_log_set_callback(this, on_gpac_log);
-	opt = gf_cfg_get_key(m_user.config, "General", "LogFile");
+	opt = gf_opts_get_key("core", "log-file");
 	if (opt) {
 		JavaEnvTh *env = getEnv();
 		if (env && env->cbk_setLogFile) {
@@ -712,17 +728,17 @@
 	if (cfg_dir)
 		strcpy(m_cfg_dir, cfg_dir);
 
-	char m_cfg_filename[GF_MAX_PATH];
+/*	char m_cfg_filename[GF_MAX_PATH];
 	if (m_cfg_dir[0]) {
 		LOGI("GPAC.cfg found in %s, force using it.\n", m_cfg_dir);
 		strcpy(m_cfg_filename, m_cfg_dir);
 		strcat(m_cfg_filename, "GPAC.cfg");
 	}
+*/
 
 	int m_Width = width;
 	int m_Height = height;
 
-	int first_launch = 0;
 	const char *opt;
 
 	m_window = env;
@@ -737,11 +753,27 @@
 
 	m_mx = gf_mx_new("Osmo4");
 
-	//load config file
-	LOGI("Loading User Config %s...", "GPAC.cfg");
-	m_user.config = gf_cfg_init(m_cfg_dir[0] ? m_cfg_filename : NULL, NULL);
+	m_user.init_flags = 0;
+	m_user.opaque = this;
+
+	m_user.os_window_handler = m_window;
+	m_user.os_display = m_session;
+	m_user.EventProc = GPAC_EventProc;
+	if (!javaVM) {
+		LOGE("NO JAVA VM FOUND, m_user=%p !!!!\n", &m_user);
+		return Quit(KErrGeneral);
+	}
+
+	LOGD("Loading GPAC terminal, m_user=%p...", &m_user);
+	gf_sys_init(GF_MemTrackerNone, NULL);
+	gf_fm_request_set_callback(this, on_fm_request);
+
 	gf_set_progress_callback(this, Osmo4_progress_cbk);
 
+	//load config file
+	//LOGI("Loading User Config %s...", "GPAC.cfg");
+	//m_user.config = gf_cfg_init(m_cfg_dir ? m_cfg_filename : NULL, NULL);
+
 
 	char path[512];
 	strcpy(path, gui_dir);
@@ -751,12 +783,13 @@
 	strcat(vertex_path, "/../shaders/vertex.glsl");
 	strcat(fragment_path, "/../shaders/fragment.glsl");
 
-	gf_cfg_set_key(m_user.config, "Compositor", "VertexShader", vertex_path);
-	gf_cfg_set_key(m_user.config, "Compositor", "FragmentShader", fragment_path);
-	gf_cfg_set_key(m_user.config, "Compositor", "OpenGLMode", "hybrid");
-	opt = gf_cfg_get_key(m_user.config, "General", "ModulesDirectory");
+	gf_opts_set_key("core", "vert-shader", vertex_path);
+	gf_opts_set_key("core", "frag-shader", fragment_path);
+	gf_opts_set_key("filter@compositor", "ogl", "hybrid");
+	opt = gf_opts_get_key("core", "mod-dirs");
 	LOGI("loading modules in directory %s...", opt);
-	m_user.modules = gf_modules_new(opt, m_user.config);
+
+	/*m_user.modules = gf_modules_new(opt, m_user.config);
 	if (!m_user.modules || !gf_modules_get_count(m_user.modules)) {
 		LOGE("No modules found in directory %s !", opt);
 		if (m_user.modules)
@@ -764,32 +797,17 @@
 		gf_cfg_del(m_user.config);
 		m_user.config = NULL;
 		return Quit(KErrGeneral);
-	}
-
-	/*we don't thread the visual compositor to be able to minimize the app and still have audio running*/
-	m_user.init_flags = GF_TERM_NO_COMPOSITOR_THREAD;
-	m_user.opaque = this;
-
-	m_user.os_window_handler = m_window;
-	m_user.os_display = m_session;
-	m_user.EventProc = GPAC_EventProc;
-	if (!javaVM) {
-		LOGE("NO JAVA VM FOUND, m_user=%p !!!!\n", &m_user);
-		return Quit(KErrGeneral);
-	}
+	}*/
 
-	LOGD("Loading GPAC terminal, m_user=%p...", &m_user);
-	gf_sys_init(GF_MemTrackerNone);
-	gf_fm_request_set_callback(this, on_fm_request);
 	SetupLogs();
 	m_term = gf_term_new(&m_user);
 	if (!m_term) {
 		LOGE("Cannot load GPAC Terminal with m_user=%p", &m_user);
 		MessageBox("Cannot load GPAC terminal", "Fatal Error", GF_SERVICE_ERROR);
-		gf_modules_del(m_user.modules);
+		/*gf_modules_del(m_user.modules);
 		m_user.modules = NULL;
 		gf_cfg_del(m_user.config);
-		m_user.config = NULL;
+		m_user.config = NULL;*/
 		return Quit(KErrGeneral);
 	}
 
@@ -801,7 +819,7 @@
 	LOGD("Setting term size m_user=%p...", &m_user);
 	gf_term_set_size(m_term, m_Width, m_Height);
 
-	opt = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+	opt = gf_opts_get_key("General", "StartupFile");
 	LOGD("File loaded at startup=%s.", opt);
 
 	if (!urlToLoad)
@@ -812,7 +830,7 @@
 	}
 	debug_log("init end");
 	LOGD("Saving config file...\n");
-	gf_cfg_save(m_user.config);
+	//gf_cfg_save(m_user.config);
 	LOGI("Initialization complete, config file saved.\n");
 
 	return 0;
@@ -820,16 +838,14 @@
 //-------------------------------
 int CNativeWrapper::connect(const char *url)
 {
-	const char *str;
-	char the_url[256];
-
 	if (m_term)
 	{
+		const char *str;
 		debug_log("Starting to connect ...");
-		str = gf_cfg_get_key(m_user.config, "General", "StartupFile");
+		str = gf_opts_get_key("General", "StartupFile");
 		if (str)
 		{
-			gf_cfg_set_key(m_user.config, "Temp", "GUIStartupFile", url);
+			gf_opts_set_key("Temp", "GUIStartupFile", url);
 			gf_term_connect(m_term, str);
 		}
 		if( url )
@@ -843,10 +859,10 @@
 
 void CNativeWrapper::setGpacPreference( const char * category, const char * name, const char * value)
 {
-	if (m_user.config) {
-		gf_cfg_set_key(m_user.config, category, name, value);
-		gf_cfg_save(m_user.config);
-	}
+	//if (m_user.config) {
+		gf_opts_set_key(category, name, value);
+	//	gf_cfg_save(m_user.config);
+	//}
 }
 
 //-----------------------------------------------------
@@ -884,7 +900,7 @@
 		return;
 	}
 	debug_log("setAudioEnvironment start");
-	m_term->compositor->audio_renderer->audio_out->Setup(m_term->compositor->audio_renderer->audio_out, javaVM, 0, 0);
+	//m_term->compositor->audio_renderer->audio_out->Setup(m_term->compositor->audio_renderer->audio_out, javaVM, 0, 0);
 	debug_log("setAudioEnvironment end");
 }
 //-----------------------------------------------------
@@ -911,7 +927,7 @@
 	evt.mouse.x = x;
 	evt.mouse.y = y;
 
-	int ret = gf_term_user_event(m_term, &evt);
+	gf_term_user_event(m_term, &evt);
 	debug_log("onMouseDown end");
 }
 //-----------------------------------------------------
@@ -929,7 +945,7 @@
 	evt.mouse.x = x;
 	evt.mouse.y = y;
 
-	int ret = gf_term_user_event(m_term, &evt);
+	gf_term_user_event(m_term, &evt);
 	debug_log("onMouseUp end");
 }
 //-----------------------------------------------------
@@ -942,7 +958,7 @@
 	evt.mouse.x = x;
 	evt.mouse.y = y;
 
-	int ret = gf_term_user_event(m_term, &evt);
+	gf_term_user_event(m_term, &evt);
 }
 //-----------------------------------------------------
 void CNativeWrapper::onKeyPress(int keycode, int rawkeycode, int up, int flag, int unicode) {
@@ -959,13 +975,13 @@
 
 	translate_key(keycode, &evt.key);
 	//evt.key.key_code = GF_KEY_A;
-	int ret = gf_term_user_event(m_term, &evt);
+	gf_term_user_event(m_term, &evt);
 
 	if (evt.type == GF_EVENT_KEYUP && unicode) {
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_TEXTINPUT;
 		evt.character.unicode_char = unicode;
-		ret = gf_term_user_event(m_term, &evt);
+		gf_term_user_event(m_term, &evt);
 	}
 }
 //-----------------------------------------------------
@@ -1090,12 +1106,12 @@
 	evt.sensor.z = z;
 	evt.sensor.w = 0;
 
-	int ret = gf_term_user_event(m_term, &evt);
+	gf_term_user_event(m_term, &evt);
 }
 //-----------------------------------------------------
 void CNativeWrapper::setGpacLogs(const char *tools_at_level)
 {
-	gf_log_set_tools_levels(tools_at_level);
+	gf_log_set_tools_levels(tools_at_level, GF_TRUE);
 }
 
 //---------------------------------------------------------------------------------------------------

gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.h -> gpac-1.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper.h Changed

gpac-0.8.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper_jni.hpp -> gpac-1.0.0.tar.gz/applications/osmo4_android_studio/app/src/main/jni/wrapper_jni.hpp Changed

gpac-0.8.0.tar.gz/applications/osmo4_ios/main.c -> gpac-1.0.0.tar.gz/applications/osmo4_ios/main.c Changed

@@ -29,8 +29,6 @@
 #include <gpac/constants.h>
 #include <gpac/options.h>
 #include <gpac/events.h>
-#include <gpac/modules/service.h>
-#include <gpac/internal/terminal_dev.h>
 
 #include <pwd.h>
 #include <unistd.h>
@@ -43,7 +41,6 @@
 static Bool not_threaded = 1;
 
 static Bool no_audio = 0;
-static Bool no_regulation = 0;
 Bool is_connected = 0;
 Bool startup_file = 0;
 GF_User user;
@@ -51,7 +48,6 @@
 u64 Duration;
 GF_Err last_error = GF_OK;
 
-static GF_Config *cfg_file;
 static u32 display_rti = 0;
 static Bool Run;
 static Bool CanSeek = 0;
@@ -127,8 +123,11 @@
 {
 	GF_Event event;
 	if (display_rti) return;
+	memset(&event, 0, sizeof(GF_Event));
+
 	event.type = GF_EVENT_SET_CAPTION;
 	if (is_connected) {
+#ifdef FILTER_FIXME
 		char szName[1024];
 		NetInfoCommand com;
 
@@ -162,8 +161,10 @@
 			if (!str) str = strrchr(the_url, '/');
 			event.caption.caption = str ? str+1 : the_url;
 		}
+#endif
+
 	} else {
-		event.caption.caption = "GPAC MP4Client " GPAC_FULL_VERSION;
+		event.caption.caption = "GPAC MP4Client " GPAC_VERSION;
 	}
 	gf_term_user_event(term, &event);
 }
@@ -326,29 +327,6 @@
 	}
 }
 
-static void init_rti_logs(char *rti_file, char *url, Bool use_rtix)
-{
-	if (rti_logs) gf_fclose(rti_logs);
-	rti_logs = gf_fopen(rti_file, "wt");
-	if (rti_logs) {
-		fprintf(rti_logs, "!! GPAC RunTime Info ");
-		if (url) fprintf(rti_logs, "for file %s", url);
-		fprintf(rti_logs, " !!\n");
-		fprintf(rti_logs, "SysTime(ms)\tSceneTime(ms)\tCPU\tFPS\tMemory(kB)\tObservation\n");
-
-		/*turn on RTI loging*/
-		if (use_rtix) {
-			gf_log_set_callback(NULL, on_gpac_log);
-			gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_ERROR);
-			gf_log_set_tool_level(GF_LOG_RTI, GF_LOG_DEBUG);
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI] System state when enabling log\n"));
-		} else if (log_time_start) {
-			log_time_start = gf_sys_clock();
-		}
-	}
-}
-
 void set_cfg_option(char *opt_string)
 {
 	char *sep, *sep2, szSec[1024], szKey[1024], szVal[1024];
@@ -380,21 +358,21 @@
 			fprintf(stderr, "Badly formatted option %s - expected Section:*=null\n", opt_string);
 			return;
 		}
-		gf_cfg_del_section(cfg_file, szSec);
+		gf_opts_del_section(szSec);
 		return;
 	}
 
 	if (!stricmp(szVal, "null")) {
 		szVal[0]=0;
 	}
-	gf_cfg_set_key(cfg_file, szSec, szKey, szVal[0] ? szVal : NULL);
+	gf_opts_set_key(szSec, szKey, szVal[0] ? szVal : NULL);
 }
 
 
 static void on_progress_null(const void *_ptr, const char *_title, u64 done, u64 total)
 {
 }
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 int SDL_main (int argc, char *argv[])
 #else
 int main (int argc, char *argv[])
@@ -407,12 +385,9 @@
 	u32 simulation_time = 0;
 	Bool auto_exit = 0;
 	Bool use_gui = 0;
-	Bool use_rtix = 0;
     GF_MemTrackerType mem_track = GF_MemTrackerNone;
-
-	Bool ret, fill_ar, visible;
 	Bool logs_set = GF_FALSE;
-	char *url_arg, *the_cfg, *rti_file;
+	char *url_arg, *the_cfg;
 	const char *logs_settings = NULL;
 	GF_SystemRTInfo rti;
 	FILE *logfile = NULL;
@@ -421,8 +396,7 @@
 
 	memset(&user, 0, sizeof(GF_User));
 
-	fill_ar = visible = 0;
-	url_arg = the_cfg = rti_file = NULL;
+	url_arg = the_cfg = NULL;
 
 #ifdef GPAC_MEMORY_TRACKING
 	for (i=1; i<argc; i++) {
@@ -433,16 +407,9 @@
 	}
 #endif
 
-	gf_sys_init(mem_track);
+	gf_sys_init(mem_track, NULL);
 	gf_set_progress_callback(NULL, on_progress_null);
-
-	cfg_file = gf_cfg_init(the_cfg, NULL);
-	if (!cfg_file) {
-		fprintf(stderr, "Error: Configuration File \"GPAC.cfg\" not found\n");
-		if (logfile) gf_fclose(logfile);
-		return 1;
-	}
-
+    
 	for (i=1; i<argc; i++) {
 		char *arg = argv[i];
 		if (arg[0] != '-') {
@@ -479,19 +446,19 @@
  	}
 
 	if (logs_settings) {
-		if (gf_log_set_tools_levels(logs_settings) != GF_OK) {
+		if (gf_log_set_tools_levels(logs_settings, GF_TRUE) != GF_OK) {
 			return 1;
 		}
 		logs_set = GF_TRUE;
 	}
 
 	if (!logs_set)
-		gf_log_set_tools_levels( gf_cfg_get_key(cfg_file, "General", "Logs") );
+		gf_log_set_tools_levels( gf_opts_get_key("core", "logs"), GF_TRUE);
 
-	gf_cfg_set_key(cfg_file, "Compositor", "OpenGLMode", "hybrid");
+	gf_opts_set_key("filter@compositor", "ogl", "hybrid");
 
 	if (!logfile) {
-		const char *opt = gf_cfg_get_key(cfg_file, "General", "LogFile");
+		const char *opt = gf_opts_get_key("core", "log-file");
 		if (opt) {
 			logfile = gf_fopen(opt, "wt");
 			if (logfile)
@@ -501,13 +468,12 @@
 
 	gf_sys_get_rti(500, &rti, GF_RTI_SYSTEM_MEMORY_ONLY);
 	memory_at_gpac_startup = rti.physical_memory_avail;
-	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
 
 	init_w = forced_width;
 	init_h = forced_height;
-
+/*
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Loading modules\n" ));
-	str = gf_cfg_get_key(cfg_file, "General", "ModulesDirectory");
+	str = gf_opts_get_key("core", "mod-dirs");
 
 	user.modules = gf_modules_new((const char *) str, cfg_file);
 	if (user.modules) i = gf_modules_get_count(user.modules);
@@ -520,13 +486,11 @@
 		return 1;
 	}
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Modules Loaded (%d found in %s)\n", i, str));
-
+*/
 //	url_arg="$IOS_DOCS/NBA_score_table_2_hd.mp4#LIVE360TV";
-	gf_cfg_set_key(cfg_file, "Compositor", "NumViews", "1");
-//	gf_cfg_set_key(cfg_file, "Compositor", "StereoType", "SideBySide");
 
 	if (url_arg && !strncmp(url_arg, "$IOS_DOCS", 9)) {
-		char *path = (char *) gf_cfg_get_key(cfg_file, "General", "iOSDocumentsDir");
+		char *path = (char *) gf_opts_get_key("General", "iOSDocumentsDir");
 		if (path) {
 			strcpy(the_url, path);
 			path = strchr(url_arg, '/');
@@ -539,25 +503,18 @@
 	}
 	gf_sys_set_args(argc, (const char **) argv);
 
-	user.config = cfg_file;
 	user.EventProc = GPAC_EventProc;
 	/*dummy in this case (global vars) but MUST be non-NULL*/
-	user.opaque = user.modules;
-	if (not_threaded) user.init_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
+	//user.opaque = user.modules;
 	if (no_audio) user.init_flags |= GF_TERM_NO_AUDIO;
-	if (no_regulation) user.init_flags |= GF_TERM_NO_REGULATION;
-//	user.init_flags |= GF_TERM_NO_DECODER_THREAD;
 
 	if (bench_mode) {
-		gf_cfg_discard_changes(user.config);
+		//gf_cfg_discard_changes(user.config);
 		auto_exit = GF_TRUE;
-		gf_cfg_set_key(user.config, "Audio", "DriverName", "Raw Audio Output");
 		if (bench_mode!=2) {
-			gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
-			gf_cfg_set_key(user.config, "RAWVideo", "RawOutput", "null");
-			gf_cfg_set_key(user.config, "Compositor", "OpenGLMode", "disable");
+			gf_opts_set_key("filter@compositor", "ogl", "off");
 		} else {
-			gf_cfg_set_key(user.config, "Video", "DisableVSync", "yes");
+			gf_opts_set_key("core", "disable-vsync", "yes");
 		}
 	}
 
@@ -566,8 +523,8 @@
 	term = gf_term_new(&user);
 	if (!term) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("\nInit error - check you have at least one video out and one rasterizer...\nFound modules:\n"));
-		gf_modules_del(user.modules);
-		gf_cfg_del(cfg_file);
+		//gf_modules_del(user.modules);
+		//gf_cfg_del(cfg_file);
 		gf_sys_close();
 		if (logfile) gf_fclose(logfile);
 		return 1;
@@ -578,41 +535,23 @@
 		display_rti = 2;
 		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
 		if (bench_mode==1) bench_mode=2;
-	} else {
-		/*check video output*/
-		str = gf_cfg_get_key(cfg_file, "Video", "DriverName");
-		if (!strcmp(str, "Raw Video Output")) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("WARNING: using raw output video (memory only) - no display used\n"));
-		}
 	}
 
 	/*check audio output*/
-	str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
+	str = gf_opts_get_key("core", "audio-output");
 	if (!str || !strcmp(str, "No Audio Output Available")) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("WARNING: no audio output availble - make sure no other program is locking the sound card\n"));
 	}
-	str = gf_cfg_get_key(cfg_file, "General", "NoMIMETypeFetch");
+	str = gf_opts_get_key("General", "NoMIMETypeFetch");
 	no_mime_check = (str && !stricmp(str, "yes")) ? 1 : 0;
 
-	str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Enabled");
+	str = gf_opts_get_key("core", "proxy-on");
 	if (str && !strcmp(str, "yes")) {
-		str = gf_cfg_get_key(cfg_file, "HTTPProxy", "Name");
+		str = gf_opts_get_key("core", "proxy-name");
 		if (str) GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("HTTP Proxy %s enabled\n", str));
 	}
 
-	if (rti_file) {
-		str = gf_cfg_get_key(cfg_file, "General", "RTIRefreshPeriod");
-		if (str) {
-			rti_update_time_ms = atoi(str);
-		} else {
-			gf_cfg_set_key(cfg_file, "General", "RTIRefreshPeriod", "200");
-		}
-		UpdateRTInfo("At GPAC load time\n");
-	}
-
 	Run = 1;
-	ret = 1;
-
 
 	ext = url_arg ? strrchr(url_arg, '.') : NULL;
 	if (ext && (!stricmp(ext, ".m3u") || !stricmp(ext, ".pls"))) {
@@ -623,12 +562,15 @@
 		strcpy(pl_path, url_arg);
 		/*this is not clean, we need to have a plugin handle playlist for ourselves*/
 		if (!strncmp("http:", url_arg, 5)) {
+#ifdef FILTER_FIXME
 			GF_DownloadSession *sess = gf_dm_sess_new(term->downloader, url_arg, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
 			if (sess) {
 				e = gf_dm_sess_process(sess);
 				if (!e) strcpy(pl_path, gf_dm_sess_get_cache_name(sess));
 				gf_dm_sess_del(sess);
 			}
+#endif
+
 		}
 
 		playlist = e ? NULL : gf_fopen(pl_path, "rt");
@@ -643,10 +585,11 @@
 	} else if (!use_gui && url_arg) {
 		gf_term_connect(term, url_arg);
 	} else {
-		str = gf_cfg_get_key(cfg_file, "General", "StartupFile");
+		str = gf_opts_get_key("General", "StartupFile");
 		if (str) {
-			if (!url_arg)
-				strcpy(the_url, "MP4Client "GPAC_FULL_VERSION);
+			if (!url_arg) {
+				sprintf(the_url, "MP4Client %s", gf_gpac_version() );
+			}
 			gf_term_connect(term, str);
 			startup_file = 1;
 		}
@@ -672,7 +615,7 @@
 			request_next_playlist_item=0;
 			gf_term_disconnect(term);
 
-			if (fscanf(playlist, "%s", szPath) == EOF) {
+			if (fscanf(playlist, "%1023s", szPath) == EOF) {
 				fprintf(stderr, "No more items - exiting\n");
 				Run = 0;
 			} else if (szPath[0] == '#') {
@@ -683,7 +626,7 @@
 			}
 		}
 
-		if (!use_rtix || display_rti) UpdateRTInfo(NULL);
+		if (display_rti) UpdateRTInfo(NULL);
 		if (not_threaded) {
 			//printf("gf_term_process_step from run loop\n");
 			gf_term_process_step(term);
@@ -704,7 +647,6 @@
 	}
 
 	gf_term_disconnect(term);
-	if (rti_file) UpdateRTInfo("Disconnected\n");
 
 	if (gyro_dev) {
 		sensor_stop(gyro_dev);
@@ -715,8 +657,8 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("OK\n"));
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("GPAC cleanup ...\n"));
-	gf_modules_del(user.modules);
-	gf_cfg_del(cfg_file);
+	//gf_modules_del(user.modules);
+	//gf_cfg_del(cfg_file);
 
 	if (gyro_dev) {
 		sensor_destroy(&gyro_dev);
@@ -744,9 +686,7 @@
 void PrintAVInfo(Bool final)
 {
 	GF_MediaInfo a_odi, v_odi, s_odi;
-	Double avg_dec_time=0;
-	u32 tot_time=0;
-	Bool print_codecs = final;
+	u32 tot_time;
 
 	if (scene_odm) {
 		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
@@ -758,7 +698,7 @@
 	}
 	if (!video_odm && !audio_odm && !scene_odm) {
 		u32 count, i;
-		GF_ObjectManager *root_odm = root_odm = gf_term_get_root_object(term);
+		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
 		if (!root_odm) return;
 
 		if (gf_term_get_object_info(term, root_odm, &v_odi)==GF_OK) {
@@ -793,12 +733,12 @@
 	} else {
 		memset(&v_odi, 0, sizeof(v_odi));
 	}
-	if (print_codecs && audio_odm) {
+	if (audio_odm) {
 		gf_term_get_object_info(term, audio_odm, &a_odi);
 	} else {
 		memset(&a_odi, 0, sizeof(a_odi));
 	}
-	if ((print_codecs || !video_odm) && scene_odm) {
+	if (!video_odm && scene_odm) {
 		gf_term_get_object_info(term, scene_odm, &s_odi);
 	} else {
 		memset(&s_odi, 0, sizeof(s_odi));
@@ -816,85 +756,82 @@
 			fprintf(stderr, "Drawn %d frames FPS %.2f (simulation FPS %.2f) - duration %d ms\n", nb_frames_drawn, ((Float)nb_frames_drawn*1000)/tot_time,(Float) FPS, gf_term_get_time_in_ms(term)  );
 		}
 	}
-	if (print_codecs) {
-		if (video_odm) {
-			fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
-			if (final) {
-				u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
-				if (v_odi.nb_dropped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
-				}
-				fprintf(stderr, "\n");
-			}
-		}
-		if (audio_odm) {
-			fprintf(stderr, "%s SR %d num channels %d bpp %d duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, a_odi.bits_per_sample, a_odi.duration);
-			if (final) {
-				u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
-				if (!dec_run_time) dec_run_time = 1;
-				if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
-				fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
-				if (a_odi.nb_dropped) {
-					fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
-				}
-				fprintf(stderr, "\n");
+	if (video_odm) {
+		fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
+		if (final) {
+			u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
+			if (!dec_run_time) dec_run_time = 1;
+			if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
+			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
+			if (v_odi.nb_dropped) {
+				fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_dropped);
 			}
+			fprintf(stderr, "\n");
 		}
-		if (scene_odm) {
-			u32 w, h;
-			gf_term_get_visual_output_size(term, &w, &h);
-			fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
-			if (final) {
-				if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-					u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
-					if (!dec_run_time) dec_run_time = 1;
-					fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
-					fprintf(stderr, "\n");
-				} else {
-					u32 nb_frames_drawn;
-					Double FPS;
-					gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
-					tot_time = gf_sys_clock() - bench_mode_start;
-					FPS = gf_term_get_framerate(term, 0);
-					fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
-				}
+	}
+	if (audio_odm) {
+		fprintf(stderr, "%s SR %d num channels %d fmt %s duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, gf_audio_fmt_name(a_odi.afmt), a_odi.duration);
+		if (final) {
+			u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
+			if (!dec_run_time) dec_run_time = 1;
+			if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
+			fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
+			if (a_odi.nb_dropped) {
+				fprintf(stderr, " (Error during bench: %d frames drop)", a_odi.nb_dropped);
 			}
+			fprintf(stderr, "\n");
 		}
+	}
+	if (scene_odm) {
+		u32 w, h;
+		gf_term_get_visual_output_size(term, &w, &h);
+		fprintf(stderr, "%s scene size %dx%d rastered to %dx%d duration %.2fs\n", s_odi.codec_name ? s_odi.codec_name : "", s_odi.width, s_odi.height, w, h, s_odi.duration);
 		if (final) {
-			fprintf(stderr, "**********************************************************\n\n");
-			return;
+			if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
+				u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
+				if (!dec_run_time) dec_run_time = 1;
+				fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
+				fprintf(stderr, "\n");
+			} else {
+				u32 nb_frames_drawn;
+				Double FPS;
+				gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
+				tot_time = gf_sys_clock() - bench_mode_start;
+				FPS = gf_term_get_framerate(term, 0);
+				fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
+			}
 		}
 	}
+	if (final) {
+		fprintf(stderr, "**********************************************************\n\n");
+		return;
+	}
 
 	if (video_odm) {
+		u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
+		if (!dec_run_time) dec_run_time = 1;
 		tot_time = v_odi.last_frame_time - v_odi.first_frame_time;
 		if (!tot_time) tot_time=1;
 		if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
-		fprintf(stderr, "%d f FPS %.2f (%.2f ms max) rate %d ", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / tot_time, v_odi.max_dec_time/1000.0, (u32) v_odi.instant_bitrate/1000);
+		fprintf(stderr, "%d f FPS %.2f (max %d us/f) rate avg %d max %d", v_odi.nb_dec_frames, ((Float)v_odi.nb_dec_frames*1000) / dec_run_time, v_odi.max_dec_time, (u32) v_odi.avg_bitrate/1000, (u32) v_odi.max_bitrate/1000);
 	}
 	else if (scene_odm) {
-
 		if (s_odi.nb_dec_frames>2 && s_odi.total_dec_time) {
-			avg_dec_time = (Float) 1000000 * s_odi.nb_dec_frames;
-			avg_dec_time /= s_odi.total_dec_time;
-			if (s_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*s_odi.current_time / s_odi.duration ) );
-			fprintf(stderr, "%d f %.2f (%d us max) - rate %d ", s_odi.nb_dec_frames, avg_dec_time, s_odi.max_dec_time, (u32) s_odi.instant_bitrate/1000);
+			u32 dec_run_time = s_odi.last_frame_time - s_odi.first_frame_time;
+			if (!dec_run_time) dec_run_time = 1;
+			fprintf(stderr, "%d frames FPS %.2f (max %d us/f) rate avg %d max %d", s_odi.nb_dec_frames, ((Float)s_odi.nb_dec_frames*1000) / dec_run_time, s_odi.max_dec_time, (u32) s_odi.avg_bitrate/1000, (u32) s_odi.max_bitrate/1000);
+			fprintf(stderr, "\n");
 		} else {
 			u32 nb_frames_drawn;
 			Double FPS;
 			gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
 			tot_time = gf_sys_clock() - bench_mode_start;
-			FPS = gf_term_get_framerate(term, 1);
-			fprintf(stderr, "%d f FPS %.2f (abs %.2f) ", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
+			FPS = gf_term_get_framerate(term, 0);
+			fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
 		}
 	}
 	else if (audio_odm) {
-		if (!print_codecs) {
-			gf_term_get_object_info(term, audio_odm, &a_odi);
-		}
+		gf_term_get_object_info(term, audio_odm, &a_odi);
 		tot_time = a_odi.last_frame_time - a_odi.first_frame_time;
 		if (!tot_time) tot_time=1;
 		if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );

gpac-0.8.0.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist -> gpac-1.0.0.tar.gz/applications/osmo4_ios/osmo4ios-Info.plist Changed

gpac-0.8.0.tar.gz/applications/testapps/broadcaster/RTP_serv_generator.c -> gpac-1.0.0.tar.gz/applications/testapps/broadcaster/RTP_serv_generator.c Changed

gpac-0.8.0.tar.gz/applications/testapps/broadcaster/broadcaster.c -> gpac-1.0.0.tar.gz/applications/testapps/broadcaster/broadcaster.c Changed

@@ -62,8 +62,10 @@
 		}
 		else if (!strcmp("-m", a) || !strcmp("--mtu", a))
 		{
-			*mtu_size = atoi(argv[counter+1]);
-			if (!(mtu_size)) return -3;
+			if (mtu_size) {
+				*mtu_size = atoi(argv[counter+1]);
+				if (! (*mtu_size)) return -3;
+			}
 		}
 		else if (!strcmp("-d", a) || !strcmp("--debug", a))
 		{
@@ -102,10 +104,10 @@
 {
 	RAP_Input *input = par;
 	PNC_CallbackData *data = input->data;
-	u32 *timer;
 
 	input->status = 1;
 	while (input->status==1) {
+		u32 *timer;
 		gf_mx_p(input->carrousel_mutex);
 
 		timer = input->RAPtimer;
@@ -169,7 +171,6 @@
 	unsigned char temp[MAX_BUF];
 	FILE *fp;
 	u32 byte_read;
-	int ret;
 	GF_Config *gf_config_file;
 	GF_Socket *TCP_socket;
 	GF_Socket *conn_socket;
@@ -186,6 +187,7 @@
 
 	while(input->status == 1)
 	{
+		int ret;
 		memset(buffer, 0, sizeof(buffer));
 		e = gf_sk_accept(TCP_socket, &conn_socket);
 		if (e == GF_OK) {
@@ -237,7 +239,7 @@
 
 			while (1)
 			{
-				GF_Err e = gf_sk_receive(conn_socket, temp, sizeof(temp), 0, &byte_read);
+				e = gf_sk_receive(conn_socket, temp, sizeof(temp), 0, &byte_read);
 
 				if (e == GF_OK) {
 					gf_fwrite(temp, 1, byte_read, fp);
@@ -410,7 +412,7 @@
 	run = 1;
 	while (run)
 	{
-		GF_Err e = PNC_processBIFSGenerator(data);
+		e = PNC_processBIFSGenerator(data);
 		if (e) {
 			fprintf(stderr, "Cannot Process BIFS data (%s)\n", gf_error_to_string(e));
 			break;

gpac-0.8.0.tar.gz/applications/testapps/broadcaster/sdp_generator.c -> gpac-1.0.0.tar.gz/applications/testapps/broadcaster/sdp_generator.c Changed

gpac-0.8.0.tar.gz/applications/testapps/hevcbench/main.c -> gpac-1.0.0.tar.gz/applications/testapps/hevcbench/main.c Changed

@@ -563,27 +563,33 @@
 		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
 
 #if (COPY_TYPE!=5)
-		needs_stride=0;
+//		needs_stride=0;
 #endif
 
 
 #if (NO_TEX==0)
 		glBindTexture(texture_type, txid[0] );
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+#if (COPY_TYPE!=5)
 		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+#endif
 		glTexImage2D(texture_type, 0, GL_LUMINANCE, w, h, 0, pixel_format, memory_format, NULL);
 		//glTexSubImage2D crashes with PBO and 2-bytes luminance on my FirePro W5000 ...
 //		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
 
 		glBindTexture(texture_type, txid[1] );
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+#if (COPY_TYPE!=5)
 		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+#endif
 		glTexImage2D(texture_type, 0, GL_LUMINANCE, uv_w, uv_h, 0, pixel_format, memory_format, NULL);
 //		glTexSubImage2D(texture_type, 0, 0, 0, uv_w, uv_h, pixel_format, memory_format, pU);
 
 		glBindTexture(texture_type, txid[2] );
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+#if (COPY_TYPE!=5)
 		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+#endif
 		glTexImage2D(texture_type, 0, GL_LUMINANCE, uv_w, uv_h, 0, pixel_format, memory_format, NULL);
 //		glTexSubImage2D(texture_type, 0, 0, 0, uv_w, uv_h, pixel_format, memory_format, pV);
 #endif
@@ -868,7 +874,7 @@
 					if (!sdl_is_init && !no_display) {
 						u64 sdl_init_time = gf_sys_clock_high_res();
 						u32 stride = HVCFrame.frameInfo.nYPitch;
-						u32 bpp = HVCFrame.frameInfo.nBitDepth;
+						bpp = HVCFrame.frameInfo.nBitDepth;
 						if ((bpp==10) && output_8bit) {
 							bpp = 8;
 							stride = HVCFrame.frameInfo.nYPitch/2;

gpac-0.8.0.tar.gz/applications/testapps/loadcompare/loadcompare.c -> gpac-1.0.0.tar.gz/applications/testapps/loadcompare/loadcompare.c Changed

@@ -59,7 +59,6 @@
 {
 	GF_Err e = GF_OK;
 	GF_SceneLoader load;
-	GF_SceneGraph *sg;
 	u32 i, starttime, endtime;
 	u32 nb;
 	if (lc->spread_repeat) nb = 1;
@@ -67,6 +66,7 @@
 
 	*loadtime = 0;
 	for (i = 0; i< nb; i++) {
+		GF_SceneGraph *sg;
 		memset(&load, 0, sizeof(GF_SceneLoader));
 		sg = gf_sg_new();
 		load.ctx = gf_sm_new(sg);
@@ -101,7 +101,6 @@
 {
 	GF_Err e = GF_OK;
 	GF_SceneLoader load;
-	GF_SceneGraph *sg;
 	u32 i, starttime, endtime;
 
 	u32 nb;
@@ -111,6 +110,7 @@
 	*loadtime = 0;
 
 	for (i = 0; i<nb; i++) {
+		GF_SceneGraph *sg;
 		memset(&load, 0, sizeof(GF_SceneLoader));
 		sg = gf_sg_new();
 		load.ctx = gf_sm_new(sg);
@@ -299,7 +299,6 @@
 GF_Err decode_svg(GF_LoadCompare *lc, char *item_name, char *item_path, char *svg_out_path)
 {
 	GF_SceneManager *ctx;
-	GF_SceneGraph *sg;
 	GF_SceneLoader load;
 	GF_ISOFile *mp4;
 	GF_Err e = GF_OK;
@@ -314,6 +313,7 @@
 		if (lc->verbose) fprintf(stdout, "Could not open file %s\n", mp4_path);
 		e = GF_IO_ERR;
 	} else {
+		GF_SceneGraph *sg;
 		sg = gf_sg_new();
 		ctx = gf_sm_new(sg);
 		memset(&load, 0, sizeof(GF_SceneLoader));
@@ -347,9 +347,7 @@
 GF_Err libxml_load_svg(GF_LoadCompare *lc, char *item_path, u32 *loadtime)
 {
 	GF_Err e = GF_OK;
-	GF_SceneGraph *sg;
 	u32 i, starttime, endtime;
-	void *p;
 
 	u32 nb;
 	if (lc->spread_repeat) nb = 1;
@@ -358,6 +356,8 @@
 	*loadtime = 0;
 
 	for (i = 0; i<nb; i++) {
+		void *p;
+		GF_SceneGraph *sg;
 		sg = gf_sg_new();
 
 		starttime = gf_sys_clock();
@@ -424,7 +424,6 @@
 
 GF_Err create_gz_file(GF_LoadCompare *lc, char *item_name, char *item_path, u32 *size)
 {
-	char buffer[100];
 	char gz_path[256];
 	GF_Err e = GF_OK;
 	FILE *file = NULL;
@@ -442,6 +441,7 @@
 		if (lc->verbose) fprintf(stdout, "Could not open file %s or %s\n", item_path, gz_path);
 		e = GF_IO_ERR;
 	} else {
+		char buffer[100];
 		while ((read = fread(buffer, 1, 100, file))) gzwrite(gz, buffer, read);
 		gf_fclose(file);
 		gzclose(gz);
@@ -600,7 +600,6 @@
 int main(int argc, char **argv)
 {
 	u32 i;
-	char *arg;
 	GF_LoadCompare lc;
 	Bool single = 0;
 	char *out = NULL;
@@ -613,7 +612,7 @@
 	lc.out = stdout;
 
 	for (i = 1; i < (u32) argc ; i++) {
-		arg = argv[i];
+		char *arg = argv[i];
 		if (!stricmp(arg, "-out")) {
 			out = argv[i+1];
 			i++;

gpac-0.8.0.tar.gz/applications/testapps/svg2bifs/main.c -> gpac-1.0.0.tar.gz/applications/testapps/svg2bifs/main.c Changed

@@ -52,7 +52,7 @@
 		1: resolving begin times
 		2: resolving end times */
 	u32 resolve_stage;
-	/* Animation element being defered */
+	/* Animation element being deferred */
 	SVG_Element *animation_elt;
 	/* anim parent*/
 	SVG_Element *anim_parent;
@@ -67,7 +67,7 @@
 	char *from;
 	char *by;
 	char *values;
-} SVG_DeferedAnimation;
+} SVG_DeferredAnimation;
 
 
 static GF_Node *create_appearance(SVGPropertiesPointers *svg_props, GF_SceneGraph *sg)
@@ -75,9 +75,9 @@
 	M_Appearance *app;
 	M_Material2D *mat;
 	M_XLineProperties *xlp;
-	M_RadialGradient *rg;
+/*	M_RadialGradient *rg;
 	M_LinearGradient *lg;
-
+*/
 	app = (M_Appearance *)gf_node_new(sg, TAG_MPEG4_Appearance);
 
 	app->material = gf_node_new(sg, TAG_MPEG4_Material2D);
@@ -181,7 +181,7 @@
 	return (GF_Node *)tr;
 }
 
-static void svg_parse_animation(GF_SceneGraph *sg, SVG_DeferedAnimation *anim)
+static void svg_parse_animation(GF_SceneGraph *sg, SVG_DeferredAnimation *anim)
 {
 	GF_FieldInfo info;
 	u32 tag;
@@ -280,7 +280,7 @@
 	char *id_string = NULL;
 	u32	tag;
 	SVG_Element *elt;
-	SVG_DeferedAnimation *anim = NULL;
+	SVG_DeferredAnimation *anim = NULL;
 
 	tag = gf_xml_get_element_tag(name, 0);
 	elt = (SVG_Element*)gf_node_new(converter->svg_sg, tag);
@@ -296,7 +296,7 @@
 //	if (converter->bifs_parent) fprintf(stdout, "%s\n", gf_node_get_class_name(converter->bifs_parent));
 
 	if (gf_svg_is_animation_tag(tag)) {
-		GF_SAFEALLOC(anim, SVG_DeferedAnimation);
+		GF_SAFEALLOC(anim, SVG_DeferredAnimation);
 		/*default anim target is parent node*/
 		anim->animation_elt = elt;
 		if (converter->svg_parent) {
@@ -532,7 +532,7 @@
 				if (converter->all_atts.d) {
 					M_Coordinate2D *c2d;
 					M_XCurve2D *xc = (M_XCurve2D *)shape->geometry;
-					u32 i, j, c, k;
+					u32 j, c, k;
 
 					xc->point = gf_node_new(converter->bifs_sg, TAG_MPEG4_Coordinate2D);
 					c2d = (M_Coordinate2D *)xc->point;
@@ -630,7 +630,6 @@
 				if (converter->all_atts.points) {
 					M_Coordinate2D *c2d;
 					M_IndexedFaceSet2D *ifs = (M_IndexedFaceSet2D *)shape->geometry;
-					u32 i;
 
 					ifs->coord = gf_node_new(converter->bifs_sg, TAG_MPEG4_Coordinate2D);
 					c2d = (M_Coordinate2D *)ifs->coord;
@@ -837,7 +836,7 @@
 						M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
 						if (converter->all_atts.keyTimes) {
 							SFFloat *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(*converter->all_atts.keyTimes);
 							for (i = 0; i < count; i++) {
 								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
@@ -847,7 +846,7 @@
 						}
 						if (converter->all_atts.values) {
 							SFVec2f *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(converter->all_atts.values->values);
 							for (i = 0; i < count; i++) {
 								SVG_Point_Angle *p;
@@ -879,7 +878,7 @@
 						M_ScalarInterpolator *si = (M_ScalarInterpolator *)child;
 						if (converter->all_atts.keyTimes) {
 							SFFloat *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(*converter->all_atts.keyTimes);
 							for (i = 0; i < count; i++) {
 								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
@@ -889,7 +888,7 @@
 						}
 						if (converter->all_atts.values) {
 							SFFloat *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(converter->all_atts.values->values);
 							for (i = 0; i < count; i++) {
 								SVG_Point_Angle *p;
@@ -926,7 +925,7 @@
 						M_PositionInterpolator2D *pi2d = (M_PositionInterpolator2D *)child;
 						if (converter->all_atts.keyTimes) {
 							SFFloat *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(*converter->all_atts.keyTimes);
 							for (i = 0; i < count; i++) {
 								Fixed *f = gf_list_get(*converter->all_atts.keyTimes, i);
@@ -936,7 +935,7 @@
 						}
 						if (converter->all_atts.values) {
 							SFVec2f *g;
-							u32 count, i;
+							u32 count;
 							count = gf_list_count(converter->all_atts.values->values);
 							for (i = 0; i < count; i++) {
 								SVG_Point *p;

gpac-1.0.0.tar.gz/applications/testapps/ts2hds Added

gpac-1.0.0.tar.gz/applications/testapps/ts2hds/Makefile Changed

gpac-1.0.0.tar.gz/applications/testapps/ts2hds/f4m.c Changed

gpac-1.0.0.tar.gz/applications/testapps/ts2hds/f4v.c Changed

gpac-1.0.0.tar.gz/applications/testapps/ts2hds/main.c Changed

gpac-1.0.0.tar.gz/applications/testapps/ts2hds/ts2hds.h Changed

gpac-1.0.0.tar.gz/applications/testapps/udptsseg Added

gpac-1.0.0.tar.gz/applications/testapps/udptsseg/Makefile Changed

gpac-1.0.0.tar.gz/applications/testapps/udptsseg/main.c Added

@@ -0,0 +1,312 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Cyril COncolato, Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2008-2012
+*					All rights reserved
+*
+*  This file is part of GPAC / udp TS segmenter (udptsseg) application
+*
+*  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/media_tools.h>
+#include <gpac/constants.h>
+#include <gpac/base_coding.h>
+#include <gpac/ietf.h>
+#include <gpac/mpegts.h>
+
+#define UDP_BUFFER_SIZE	64484
+
+/* adapted from http://svn.assembla.com/svn/legend/segmenter/segmenter.c */
+static GF_Err write_manifest(char *manifest, char *segment_dir, u32 segment_duration, char *segment_prefix, char *http_prefix,
+                             u32 first_segment, u32 last_segment, Bool end) {
+	FILE *manifest_fp;
+	u32 i;
+	char manifest_tmp_name[GF_MAX_PATH];
+	char manifest_name[GF_MAX_PATH];
+	char *tmp_manifest = manifest_tmp_name;
+
+	if (segment_dir) {
+		sprintf(manifest_tmp_name, "%stmp.m3u8", segment_dir);
+		sprintf(manifest_name, "%s%s", segment_dir, manifest);
+	} else {
+		sprintf(manifest_tmp_name, "tmp.m3u8");
+		sprintf(manifest_name, "%s", manifest);
+	}
+
+	manifest_fp = gf_fopen(tmp_manifest, "w");
+	if (!manifest_fp) {
+		fprintf(stderr, "Could not create m3u8 manifest file (%s)\n", tmp_manifest);
+		return GF_BAD_PARAM;
+	}
+
+	fprintf(manifest_fp, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
+
+	for (i = first_segment; i <= last_segment; i++) {
+		fprintf(manifest_fp, "#EXTINF:%u,\n%s%s_%u.ts\n", segment_duration, http_prefix, segment_prefix, i);
+	}
+
+	if (end) {
+		fprintf(manifest_fp, "#EXT-X-ENDLIST\n");
+	}
+	gf_fclose(manifest_fp);
+
+	if (!rename(tmp_manifest, manifest_name)) {
+		return GF_OK;
+	} else {
+		if (remove(manifest_name)) {
+			fprintf(stdout, "Error removing file %s\n", manifest_name);
+			return GF_IO_ERR;
+		} else if (rename(tmp_manifest, manifest_name)) {
+			fprintf(stderr, "Could not rename temporary m3u8 manifest file (%s) into %s\n", tmp_manifest, manifest_name);
+			return GF_IO_ERR;
+		} else {
+			return GF_OK;
+		}
+	}
+}
+
+void usage()
+{
+	fprintf(stderr, "usage: udptsseg -src=UDP -dst-file=FILE -segment-duration=DUR -segment-dir=DIR -segment-manifest=M3U8 -segment-http-prefix=P -segment-number=N\n"
+	        "-src=UDP                udp://address:port providing the input transport stream\n"
+	        "-dst-file=FILE          e.g. out.ts, radical name of all segments\n"
+	        "-segment-dir=DIR        server local directory to store segments (with the trailing path separator)\n"
+	        "-segment-duration=DUR   segment duration in seconds\n"
+	        "-segment-manifest=M3U8  m3u8 file basename\n"
+	        "-segment-http-prefix=P  client address for accessing server segments\n"
+	        "-segment-number=N       only n segments are used using a cyclic pattern\n"
+	        "\n");
+}
+
+int main(int argc, char **argv)
+{
+	u32 i;
+	char *arg = NULL;
+	char *ts_in = NULL;
+	char *segment_dir = NULL;
+	char *segment_manifest = NULL;
+	char *segment_http_prefix = NULL;
+	u32 run_time = 0;
+	char *input_ip = NULL;
+	u32 input_port = 0;
+	GF_Socket *input_udp_sk = NULL;
+	char *input_buffer = NULL;
+	u32 input_buffer_size = UDP_BUFFER_SIZE;
+	GF_Err e = GF_OK;
+	FILE *ts_output_file = NULL;
+	char *ts_out = NULL;
+	char segment_prefix[GF_MAX_PATH];
+	char segment_name[GF_MAX_PATH];
+	u32 segment_duration = 0;
+	u32 segment_index = 0;
+	u32 segment_number = 0;
+	char segment_manifest_default[GF_MAX_PATH];
+	u32 last_segment_time = 0;
+	u32 last_segment_size = 0;
+	u32 read = 0;
+	u32 towrite = 0;
+	u32 leftinbuffer = 0;
+
+	fprintf(stdout, "UDP Transport Stream Segmenter\n");
+
+	if (argc < 7) {
+		usage();
+		return 0;
+	}
+	/*****************/
+	/*   gpac init   */
+	/*****************/
+	gf_sys_init(GF_MemTrackerNone);
+
+	/*****************/
+	/*   parsing of the arguments */
+	/*****************/
+	for (i = 1; i < (u32) argc ; i++) {
+		arg = argv[i];
+		if (!strnicmp(arg, "-src=udp://",11)) {
+			char *sep;
+			arg+=11;
+			sep = strchr(arg+6, ':');
+			if (sep) {
+				input_port = atoi(sep+1);
+				sep[0]=0;
+				input_ip = gf_strdup(arg);
+				sep[0]=':';
+			} else {
+				input_ip = gf_strdup(arg);
+			}
+
+		} else if (!strnicmp(arg, "-time=", 6)) {
+			run_time = atoi(arg+6);
+		} else if (!strnicmp(arg, "-dst-file=", 10)) {
+			ts_out = gf_strdup(arg+10);
+		} else if (!strnicmp(arg, "-segment-dir=", 13)) {
+			segment_dir = gf_strdup(arg+13);
+		} else if (!strnicmp(arg, "-segment-duration=", 18)) {
+			segment_duration = atoi(arg+18);
+		} else if (!strnicmp(arg, "-segment-manifest=", 18)) {
+			segment_manifest = gf_strdup(arg+18);
+		} else if (!strnicmp(arg, "-segment-http-prefix=", 21)) {
+			segment_http_prefix = gf_strdup(arg+21);
+		} else if (!strnicmp(arg, "-segment-number=", 16)) {
+			segment_number = atoi(arg+16);
+		}
+	}
+	fprintf(stdout, "Listening to TS input on %s:%d\n", input_ip, input_port);
+	fprintf(stdout, "Creating %d sec. segments in directory %s\n", segment_duration, segment_dir);
+	fprintf(stdout, "Creating %s manifest with %d segments\n", segment_manifest, segment_number);
+
+	/*****************/
+	/*   creation of the input socket   */
+	/*****************/
+	input_udp_sk = gf_sk_new(GF_SOCK_TYPE_UDP);
+	if (gf_sk_is_multicast_address((char *)input_ip)) {
+		e = gf_sk_setup_multicast(input_udp_sk, (char *)input_ip, input_port, 32, 0, NULL);
+	} else {
+		e = gf_sk_bind(input_udp_sk, NULL, input_port, (char *)input_ip, input_port, GF_SOCK_REUSE_PORT);
+	}
+	if (e) {
+		fprintf(stdout, "Error initializing UDP socket for %s:%d : %s\n", input_ip, input_port, gf_error_to_string(e));
+		goto exit;
+	}
+	gf_sk_set_buffer_size(input_udp_sk, 0, UDP_BUFFER_SIZE);
+	gf_sk_set_block_mode(input_udp_sk, 1);
+
+	/*****************/
+	/*   Initialisation of the TS and Manifest files   */
+	/*****************/
+
+	if (segment_duration) {
+		char *dot;
+		strcpy(segment_prefix, ts_out);
+		dot = strrchr(segment_prefix, '.');
+		dot[0] = 0;
+		if (segment_dir) {
+			if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+				sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
+			} else {
+				sprintf(segment_name, "%s%c%s_%d.ts", segment_dir, GF_PATH_SEPARATOR, segment_prefix, segment_index);
+			}
+		} else {
+			sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
+		}
+		fprintf(stderr, "Processing %s segment\r", segment_name);
+		ts_out = gf_strdup(segment_name);
+		if (!segment_manifest) {
+			sprintf(segment_manifest_default, "%s.m3u8", segment_prefix);
+			segment_manifest = segment_manifest_default;
+		}
+		//write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix, segment_index, 0, 0);
+	}
+	ts_output_file = gf_fopen(ts_out, "wb");
+	if (!ts_output_file) {
+		fprintf(stderr, "Error opening %s\n", ts_out);
+		goto exit;
+	}
+
+	/*allocate data buffer*/
+	input_buffer = (char*)gf_malloc(input_buffer_size);
+	assert(input_buffer);
+
+	/*****************/
+	/*   main loop   */
+	/*****************/
+	last_segment_time = gf_sys_clock();
+	last_segment_size = 0;
+	while (1) {
+		/*check for some input from the network*/
+		if (input_ip) {
+			gf_sk_receive(input_udp_sk, input_buffer+leftinbuffer, input_buffer_size-leftinbuffer, 0, &read);
+			leftinbuffer += read;
+			if (leftinbuffer) {
+				fprintf(stderr, "Processing %s segment ... received %d bytes (buffer: %d, segment: %d)\n", segment_name, read, leftinbuffer, last_segment_size);
+				if (input_buffer[0] != 0x47) {
+					while ((i < leftinbuffer) && (input_buffer[i] != 0x47)) i++;
+					fprintf(stderr, "Warning: data in buffer not starting with the MPEG-2 TS sync byte, skipping %d bytes of %d\n", i, leftinbuffer);
+					if (i < leftinbuffer) memmove(input_buffer, input_buffer+i, leftinbuffer-i);
+					leftinbuffer -=i;
+				}
+				if ((leftinbuffer % 188) != 0) {
+					fprintf(stderr, "Warning: data in buffer with a size (%d bytes) not multiple of 188 bytes\n", leftinbuffer);
+					towrite = leftinbuffer - (leftinbuffer % 188);
+				} else {
+					towrite = leftinbuffer;
+				}
+			} else {
+				towrite = 0;
+			}
+			/*write to current file */
+			if (ts_output_file != NULL) {
+				u32 now = gf_sys_clock();
+				if (towrite) {
+					gf_fwrite(input_buffer, 1, towrite, ts_output_file);
+					if (towrite < leftinbuffer) {
+						fprintf(stderr, "Warning: wrote %d bytes, keeping %d bytes\n", towrite, (leftinbuffer-towrite));
+						memmove(input_buffer, input_buffer+towrite, leftinbuffer-towrite);
+					}
+					leftinbuffer -= towrite;
+					last_segment_size += towrite;
+				}
+				if ((now - last_segment_time) > segment_duration*1000) {
+					last_segment_time = now;
+					gf_fclose(ts_output_file);
+					fprintf(stderr, "Closing segment %s (%d bytes)\n", segment_name, last_segment_size);
+					last_segment_size = 0;
+					segment_index++;
+					if (segment_dir) {
+						if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+							sprintf(segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index);
+						} else {
+							sprintf(segment_name, "%s%c%s_%d.ts", segment_dir, GF_PATH_SEPARATOR, segment_prefix, segment_index);
+						}
+					} else {
+						sprintf(segment_name, "%s_%d.ts", segment_prefix, segment_index);
+					}
+					ts_output_file = gf_fopen(segment_name, "wb");
+					if (!ts_output_file) {
+						fprintf(stderr, "Error opening segment %s\n", segment_name);
+						goto exit;
+					}
+					/* delete the oldest segment */
+					if (segment_number && ((s32) (segment_index - segment_number - 1) >= 0)) {
+						char old_segment_name[GF_MAX_PATH];
+						if (segment_dir) {
+							if (strchr("\\/", segment_name[strlen(segment_name)-1])) {
+								sprintf(old_segment_name, "%s%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
+							} else {
+								sprintf(old_segment_name, "%s/%s_%d.ts", segment_dir, segment_prefix, segment_index - segment_number - 1);
+							}
+						} else {
+							sprintf(old_segment_name, "%s_%d.ts", segment_prefix, segment_index - segment_number - 1);
+						}
+						gf_delete_file(old_segment_name);
+						fprintf(stderr, "Deleting segment %s\n", old_segment_name);
+					}
+					write_manifest(segment_manifest, segment_dir, segment_duration, segment_prefix, segment_http_prefix,
+					               //								   (segment_index >= segment_number/2 ? segment_index - segment_number/2 : 0), segment_index >1 ? segment_index-1 : 0, 0);
+					               ( (segment_index > segment_number ) ? segment_index - segment_number : 0), segment_index >1 ? segment_index-1 : 0, 0);
+				}
+			}
+
+			//}
+		}
+		/*cpu load regulation*/
+		gf_sleep(1);
+	}
+exit:
+	return 0;
+}

gpac-1.0.0.tar.gz/applications/testapps/udptsseg/udptsseg.dsp Changed

gpac-1.0.0.tar.gz/applications/testapps/udptsseg/udptsseg.vcproj Changed

gpac-0.8.0.tar.gz/build/android/jni/Android.mk -> gpac-1.0.0.tar.gz/build/android/jni/Android.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/Application.mk -> gpac-1.0.0.tar.gz/build/android/jni/Application.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/common.mk -> gpac-1.0.0.tar.gz/build/android/jni/common.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/gpac_build_android -> gpac-1.0.0.tar.gz/build/android/jni/gpac_build_android Changed

gpac-0.8.0.tar.gz/build/android/jni/libgpac/Android.mk -> gpac-1.0.0.tar.gz/build/android/jni/libgpac/Android.mk Changed

@@ -15,266 +15,401 @@
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/jpeg/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/png/
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/faad
-LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/js/
+LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/ffmpeg_android/
+LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../extra_lib/include/openjpeg
 LOCAL_C_INCLUDES 	+= $(LOCAL_PATH)/../../../../modules
 
 LOCAL_LDLIBS    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
 LOCAL_LDLIBS    += -lGLESv2 -ldl
-LOCAL_LDLIBS    += -ljs_osmo -leditline -lft2 -ljpegdroid -lopenjpeg -lpng -lz
-#LOCAL_EXPORT_LDLIBS= -ljs_osmo -leditline -lft2 -ljpeg -lopenjpeg -lpng -lz
+LOCAL_LDLIBS    += -lft2 -ljpegdroid -lopenjpeg -lpng -lfaad -lmad -lz
+
+#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_SHARED_LIBRARIES    += -L$(LOCAL_PATH)/../../../../extra_lib/lib/android/$(TARGET_ARCH_ABI)
+#LOCAL_SHARED_LIBRARIES    += -lGLESv2 -ldl
+#LOCAL_SHARED_LIBRARIES    += -lft2 -ljpegdroid -lopenjpeg -lpng -lz
+
+#LOCAL_EXPORT_LDLIBS= -lft2 -ljpeg -lopenjpeg -lpng -lz
 
 
 LOCAL_CFLAGS +=	-DGPAC_HAVE_CONFIG_H
 LOCAL_CFLAGS += -DNO_MALLINFO
-LOCAL_CFLAGS += -DGPAC_ANDROID
+LOCAL_CFLAGS += -DGPAC_CONFIG_ANDROID
+LOCAL_CFLAGS += -DGPAC_DISABLE_REMOTERY
+
 #LOCAL_CFLAGS += -DGPAC_FIXED_POINT
 
 LOCAL_SRC_FILES := \
-	../../../../src/compositor/mpeg4_textures.c \
-	../../../../src/compositor/navigate.c \
-	../../../../src/compositor/texturing_gl.c \
-	../../../../src/compositor/svg_paint_servers.c \
+	../../../../src/bifs/arith_decoder.c \
+	../../../../src/bifs/bifs_codec.c \
+	../../../../src/bifs/bifs_node_tables.c \
+	../../../../src/bifs/com_dec.c \
+	../../../../src/bifs/com_enc.c \
+	../../../../src/bifs/conditional.c \
+	../../../../src/bifs/field_decode.c \
+	../../../../src/bifs/field_encode.c \
+	../../../../src/bifs/memory_decoder.c \
+	../../../../src/bifs/predictive_mffield.c \
+	../../../../src/bifs/quantize.c \
+	../../../../src/bifs/script_dec.c \
+	../../../../src/bifs/script_enc.c \
+	../../../../src/bifs/unquantize.c \
+	../../../../src/compositor/audio_input.c \
 	../../../../src/compositor/audio_mixer.c \
-	../../../../src/compositor/mpeg4_animstream.c \
-	../../../../src/compositor/mpeg4_geometry_ifs2d.c \
+	../../../../src/compositor/audio_render.c \
+	../../../../src/compositor/bindable.c \
+	../../../../src/compositor/camera.c \
+	../../../../src/compositor/clock.c \
+	../../../../src/compositor/compositor_2d.c \
+	../../../../src/compositor/compositor_3d.c \
 	../../../../src/compositor/compositor.c \
+	../../../../src/compositor/compositor_node_init.c \
+	../../../../src/compositor/drawable.c \
+	../../../../src/compositor/events.c \
+	../../../../src/compositor/font_engine.c \
+	../../../../src/compositor/hardcoded_protos.c \
+	../../../../src/compositor/hc_flash_shape.c \
+	../../../../src/compositor/media_object.c \
+	../../../../src/compositor/mesh.c \
 	../../../../src/compositor/mesh_collide.c \
-	../../../../src/compositor/svg_media.c \
 	../../../../src/compositor/mesh_tesselate.c \
+	../../../../src/compositor/mpeg4_animstream.c \
+	../../../../src/compositor/mpeg4_audio.c \
+	../../../../src/compositor/mpeg4_background2d.c \
+	../../../../src/compositor/mpeg4_background.c \
 	../../../../src/compositor/mpeg4_bitmap.c \
-	../../../../src/compositor/camera.c \
-	../../../../src/compositor/svg_grouping.c \
-	../../../../src/compositor/mpeg4_grouping.c \
-	../../../../src/compositor/drawable.c \
-	../../../../src/compositor/events.c \
-	../../../../src/compositor/offscreen_cache.c \
-	../../../../src/compositor/visual_manager.c \
-	../../../../src/compositor/mpeg4_sound.c \
-	../../../../src/compositor/mpeg4_grouping_3d.c \
-	../../../../src/compositor/mpeg4_layer_3d.c \
-	../../../../src/compositor/mpeg4_path_layout.c \
+	../../../../src/compositor/mpeg4_composite.c \
+	../../../../src/compositor/mpeg4_form.c \
 	../../../../src/compositor/mpeg4_geometry_2d.c \
-	../../../../src/compositor/audio_input.c \
-	../../../../src/compositor/compositor_node_init.c \
 	../../../../src/compositor/mpeg4_geometry_3d.c \
-	../../../../src/compositor/svg_base.c \
+	../../../../src/compositor/mpeg4_geometry_ifs2d.c \
 	../../../../src/compositor/mpeg4_geometry_ils2d.c \
-	../../../../src/compositor/visual_manager_2d.c \
-	../../../../src/compositor/mpeg4_sensors.c \
-	../../../../src/compositor/mpeg4_form.c \
-	../../../../src/compositor/x3d_geometry.c \
-	../../../../src/compositor/texturing.c \
-	../../../../src/compositor/mpeg4_audio.c \
-	../../../../src/compositor/svg_font.c \
-	../../../../src/compositor/mpeg4_background.c \
-	../../../../src/compositor/audio_render.c \
-	../../../../src/compositor/mpeg4_layout.c \
+	../../../../src/compositor/mpeg4_gradients.c \
 	../../../../src/compositor/mpeg4_grouping_2d.c \
-	../../../../src/compositor/mesh.c \
+	../../../../src/compositor/mpeg4_grouping_3d.c \
+	../../../../src/compositor/mpeg4_grouping.c \
+	../../../../src/compositor/mpeg4_inline.c \
+	../../../../src/compositor/mpeg4_inputsensor.c \
 	../../../../src/compositor/mpeg4_layer_2d.c \
-	../../../../src/compositor/compositor_2d.c \
-	../../../../src/compositor/svg_geometry.c \
-	../../../../src/compositor/visual_manager_3d_gl.c \
-	../../../../src/compositor/font_engine.c \
-	../../../../src/compositor/mpeg4_viewport.c \
-	../../../../src/compositor/bindable.c \
+	../../../../src/compositor/mpeg4_layer_3d.c \
+	../../../../src/compositor/mpeg4_layout.c \
+	../../../../src/compositor/mpeg4_lighting.c \
+	../../../../src/compositor/mpeg4_mediacontrol.c \
+	../../../../src/compositor/mpeg4_mediasensor.c \
+	../../../../src/compositor/mpeg4_path_layout.c \
+	../../../../src/compositor/mpeg4_sensors.c \
+	../../../../src/compositor/mpeg4_sound.c \
 	../../../../src/compositor/mpeg4_text.c \
+	../../../../src/compositor/mpeg4_textures.c \
 	../../../../src/compositor/mpeg4_timesensor.c \
-	../../../../src/compositor/mpeg4_composite.c \
+	../../../../src/compositor/mpeg4_viewport.c \
+	../../../../src/compositor/navigate.c \
+	../../../../src/compositor/object_manager.c \
+	../../../../src/compositor/offscreen_cache.c \
+	../../../../src/compositor/scene.c \
+	../../../../src/compositor/scene_node_init.c \
+	../../../../src/compositor/scene_ns.c \
+	../../../../src/compositor/svg_base.c \
+	../../../../src/compositor/svg_external.c \
+	../../../../src/compositor/svg_filters.c \
+	../../../../src/compositor/svg_font.c \
+	../../../../src/compositor/svg_geometry.c \
+	../../../../src/compositor/svg_grouping.c \
+	../../../../src/compositor/svg_media.c \
+	../../../../src/compositor/svg_paint_servers.c \
+	../../../../src/compositor/svg_text.c \
+	../../../../src/compositor/texturing.c \
+	../../../../src/compositor/texturing_gl.c \
+	../../../../src/compositor/visual_manager_2d.c \
 	../../../../src/compositor/visual_manager_2d_draw.c \
-	../../../../src/compositor/mpeg4_background2d.c \
 	../../../../src/compositor/visual_manager_3d.c \
-	../../../../src/compositor/mpeg4_lighting.c \
-	../../../../src/compositor/mpeg4_gradients.c \
-	../../../../src/compositor/compositor_3d.c \
-	../../../../src/compositor/hardcoded_protos.c \
-	../../../../src/compositor/svg_text.c \
-	../../../../src/compositor/hc_flash_shape.c \
-	../../../../src/compositor/svg_filters.c \
+	../../../../src/compositor/visual_manager_3d_gl.c \
+	../../../../src/compositor/visual_manager.c \
+	../../../../src/compositor/x3d_geometry.c \
+	../../../../src/crypto/g_crypt.c \
+	../../../../src/crypto/g_crypt_openssl.c \
+	../../../../src/crypto/g_crypt_tinyaes.c \
+	../../../../src/crypto/tiny_aes.c \
+	../../../../src/evg/ftgrays.c \
+	../../../../src/evg/raster3d.c \
+	../../../../src/evg/raster_565.c \
+	../../../../src/evg/raster_argb.c\
+	../../../../src/evg/raster_rgb.c \
+	../../../../src/evg/raster_yuv.c \
+	../../../../src/evg/stencil.c \
+	../../../../src/evg/surface.c \
+	../../../../src/filter_core/filter.c \
+	../../../../src/filter_core/filter_pck.c \
+	../../../../src/filter_core/filter_pid.c \
+	../../../../src/filter_core/filter_props.c \
+	../../../../src/filter_core/filter_queue.c \
+	../../../../src/filter_core/filter_register.c \
+	../../../../src/filter_core/filter_session.c \
+	../../../../src/filters/bsrw.c \
+	../../../../src/filters/compose.c \
+	../../../../src/filters/dasher.c \
+	../../../../src/filters/dec_ac52.c \
+	../../../../src/filters/dec_bifs.c \
+	../../../../src/filters/dec_faad.c \
+	../../../../src/filters/dec_img.c \
+	../../../../src/filters/dec_j2k.c \
+	../../../../src/filters/dec_laser.c \
+	../../../../src/filters/dec_mad.c \
+	../../../../src/filters/dec_odf.c \
+	../../../../src/filters/dec_openhevc.c \
+	../../../../src/filters/dec_opensvc.c \
+	../../../../src/filters/decrypt_cenc_isma.c \
+	../../../../src/filters/dec_theora.c \
+	../../../../src/filters/dec_ttml.c \
+	../../../../src/filters/dec_ttxt.c \
+	../../../../src/filters/dec_vorbis.c \
+	../../../../src/filters/dec_vtb.c \
+	../../../../src/filters/dec_webvtt.c \
+	../../../../src/filters/dec_xvid.c \
+	../../../../src/filters/dec_mediacodec.c \
+	../../../../src/filters/dec_mediacodec_jni.c \
+	../../../../src/filters/dmx_avi.c \
+	../../../../src/filters/dmx_dash.c \
+	../../../../src/filters/dmx_gsf.c \
+	../../../../src/filters/dmx_m2ts.c \
+	../../../../src/filters/dmx_mpegps.c \
+	../../../../src/filters/dmx_nhml.c \
+	../../../../src/filters/dmx_nhnt.c \
+	../../../../src/filters/dmx_ogg.c \
+	../../../../src/filters/dmx_saf.c \
+	../../../../src/filters/dmx_vobsub.c \
+	../../../../src/filters/enc_jpg.c \
+	../../../../src/filters/enc_png.c \
+	../../../../src/filters/encrypt_cenc_isma.c \
+	../../../../src/filters/ff_common.c \
+	../../../../src/filters/ff_avf.c \
+	../../../../src/filters/ff_dec.c \
+	../../../../src/filters/ff_dmx.c \
+	../../../../src/filters/ff_enc.c \
+	../../../../src/filters/ff_mx.c \
+	../../../../src/filters/ff_rescale.c \
+	../../../../src/filters/filelist.c \
+	../../../../src/filters/hevcmerge.c \
+	../../../../src/filters/hevcsplit.c \
+	../../../../src/filters/in_atsc.c \
+	../../../../src/filters/in_dvb4linux.c \
+	../../../../src/filters/in_file.c \
+	../../../../src/filters/in_http.c \
+	../../../../src/filters/in_rtp.c \
+	../../../../src/filters/in_rtp_rtsp.c \
+	../../../../src/filters/in_rtp_sdp.c \
+	../../../../src/filters/in_rtp_signaling.c \
+	../../../../src/filters/in_rtp_stream.c \
+	../../../../src/filters/in_sock.c \
+	../../../../src/filters/inspect.c \
+	../../../../src/filters/isoffin_load.c \
+	../../../../src/filters/isoffin_read.c \
+	../../../../src/filters/isoffin_read_ch.c \
+	../../../../src/filters/jsfilter.c \
+	../../../../src/filters/load_bt_xmt.c \
+	../../../../src/filters/load_svg.c \
+	../../../../src/filters/load_text.c \
+	../../../../src/filters/mux_avi.c \
+	../../../../src/filters/mux_gsf.c \
+	../../../../src/filters/mux_isom.c \
+	../../../../src/filters/mux_ts.c \
+	../../../../src/filters/out_audio.c \
+	../../../../src/filters/out_file.c \
+	../../../../src/filters/out_http.c \
+	../../../../src/filters/out_rtp.c \
+	../../../../src/filters/out_rtsp.c \
+	../../../../src/filters/out_sock.c \
+	../../../../src/filters/reframe_ac3.c \
+	../../../../src/filters/reframe_adts.c \
+	../../../../src/filters/reframe_amr.c \
+	../../../../src/filters/reframe_av1.c \
+	../../../../src/filters/reframe_flac.c \
+	../../../../src/filters/reframe_h263.c \
+	../../../../src/filters/reframe_img.c \
+	../../../../src/filters/reframe_latm.c \
+	../../../../src/filters/reframe_mp3.c \
+	../../../../src/filters/reframe_mpgvid.c \
+	../../../../src/filters/reframe_nalu.c \
+	../../../../src/filters/reframe_prores.c \
+	../../../../src/filters/reframe_qcp.c \
+	../../../../src/filters/reframe_rawpcm.c \
+	../../../../src/filters/reframe_rawvid.c \
+	../../../../src/filters/reframer.c \
+	../../../../src/filters/resample_audio.c \
+	../../../../src/filters/rewind.c \
+	../../../../src/filters/rewrite_adts.c \
+	../../../../src/filters/rewrite_mp4v.c \
+	../../../../src/filters/rewrite_nalu.c \
+	../../../../src/filters/rewrite_obu.c \
+	../../../../src/filters/tileagg.c \
+	../../../../src/filters/tssplit.c \
+	../../../../src/filters/unit_test_filter.c \
+	../../../../src/filters/vcrop.c \
+	../../../../src/filters/vflip.c \
+	../../../../src/filters/write_generic.c \
+	../../../../src/filters/write_nhml.c \
+	../../../../src/filters/write_nhnt.c \
+	../../../../src/filters/write_qcp.c \
+	../../../../src/filters/write_vtt.c \
+	../../../../src/ietf/rtcp.c \
+	../../../../src/ietf/rtp.c \
+	../../../../src/ietf/rtp_depacketizer.c \
+	../../../../src/ietf/rtp_packetizer.c \
+	../../../../src/ietf/rtp_pck_3gpp.c \
+	../../../../src/ietf/rtp_pck_mpeg12.c \
+	../../../../src/ietf/rtp_pck_mpeg4.c \
+	../../../../src/ietf/rtp_streamer.c \
+	../../../../src/ietf/rtsp_command.c \
+	../../../../src/ietf/rtsp_common.c \
+	../../../../src/ietf/rtsp_response.c \
+	../../../../src/ietf/rtsp_session.c \
+	../../../../src/ietf/sdp.c \
+	../../../../src/isomedia/avc_ext.c \
+	../../../../src/isomedia/box_code_3gpp.c \
+	../../../../src/isomedia/box_code_adobe.c \
+	../../../../src/isomedia/box_code_apple.c \
+	../../../../src/isomedia/box_code_base.c \
+	../../../../src/isomedia/box_code_drm.c \
+	../../../../src/isomedia/box_code_meta.c \
+	../../../../src/isomedia/box_dump.c \
+	../../../../src/isomedia/box_funcs.c \
+	../../../../src/isomedia/data_map.c \
+	../../../../src/isomedia/drm_sample.c \
+	../../../../src/isomedia/hinting.c \
+	../../../../src/isomedia/hint_track.c \
+	../../../../src/isomedia/iff.c \
+	../../../../src/isomedia/isom_intern.c \
+	../../../../src/isomedia/isom_read.c \
+	../../../../src/isomedia/isom_store.c \
+	../../../../src/isomedia/isom_write.c \
+	../../../../src/isomedia/media.c \
+	../../../../src/isomedia/media_odf.c \
+	../../../../src/isomedia/meta.c \
+	../../../../src/isomedia/movie_fragments.c \
+	../../../../src/isomedia/sample_descs.c \
+	../../../../src/isomedia/stbl_read.c \
+	../../../../src/isomedia/stbl_write.c \
+	../../../../src/isomedia/track.c \
+	../../../../src/isomedia/tx3g.c \
+	../../../../src/jsmods/evg.c \
+	../../../../src/jsmods/scene_js.c \
+	../../../../src/jsmods/storage.c \
+	../../../../src/jsmods/webgl.c \
+	../../../../src/jsmods/xhr.c \
+	../../../../src/laser/lsr_dec.c \
+	../../../../src/laser/lsr_enc.c \
+	../../../../src/laser/lsr_tables.c \
+	../../../../src/media_tools/ait.c \
 	../../../../src/media_tools/atsc_dmx.c \
 	../../../../src/media_tools/avilib.c \
-	../../../../src/media_tools/filestreamer.c \
-	../../../../src/media_tools/isom_tools.c \
+	../../../../src/media_tools/av_parsers.c \
+	../../../../src/media_tools/crypt_tools.c \
+	../../../../src/media_tools/dash_client.c \
 	../../../../src/media_tools/dash_segmenter.c \
-	../../../../src/media_tools/mpeg2_ps.c \
-	../../../../src/media_tools/vobsub.c \
-	../../../../src/media_tools/media_import.c \
-	../../../../src/media_tools/text_import.c \
-	../../../../src/media_tools/webvtt.c \
-	../../../../src/media_tools/ismacryp.c \
+	../../../../src/media_tools/dsmcc.c \
+	../../../../src/media_tools/dvb_mpe.c \
+	../../../../src/media_tools/gpac_ogg.c \
 	../../../../src/media_tools/img.c \
-	../../../../src/media_tools/mpegts.c \
-	../../../../src/media_tools/saf.c \
-	../../../../src/media_tools/av_parsers.c \
 	../../../../src/media_tools/isom_hinter.c \
-	../../../../src/media_tools/gpac_ogg.c \
-	../../../../src/media_tools/media_export.c \
-	../../../../src/media_tools/dvb_mpe.c \
+	../../../../src/media_tools/isom_tools.c \
 	../../../../src/media_tools/m2ts_mux.c \
-	../../../../src/media_tools/reedsolomon.c \
-	../../../../src/media_tools/dash_client.c \
-	../../../../src/media_tools/mpd.c \
 	../../../../src/media_tools/m3u8.c \
-	../../../../src/media_tools/ait.c \
-	../../../../src/media_tools/dsmcc.c \
-	../../../../src/media_tools/html5_media.c \
-	../../../../src/media_tools/html5_mse.c \
-	../../../../src/laser/lsr_tables.c \
-	../../../../src/laser/lsr_dec.c \
-	../../../../src/laser/lsr_enc.c \
-	../../../../src/scene_manager/scene_dump.c \
+	../../../../src/media_tools/media_export.c \
+	../../../../src/media_tools/media_import.c \
+	../../../../src/media_tools/mpd.c \
+	../../../../src/media_tools/mpeg2_ps.c \
+	../../../../src/media_tools/mpegts.c \
+	../../../../src/media_tools/reedsolomon.c \
+	../../../../src/media_tools/saf.c \
+	../../../../src/media_tools/vobsub.c \
+	../../../../src/media_tools/webvtt.c \
+	../../../../src/odf/desc_private.c \
+	../../../../src/odf/descriptors.c \
+	../../../../src/odf/ipmpx_code.c \
+	../../../../src/odf/ipmpx_dump.c \
+	../../../../src/odf/ipmpx_parse.c \
+	../../../../src/odf/oci_codec.c \
+	../../../../src/odf/odf_code.c \
+	../../../../src/odf/odf_codec.c \
+	../../../../src/odf/odf_command.c \
+	../../../../src/odf/odf_dump.c \
+	../../../../src/odf/odf_parse.c \
+	../../../../src/odf/qos.c \
+	../../../../src/odf/slc.c \
+	../../../../src/quickjs/cutils.c \
+	../../../../src/quickjs/libbf.c \
+	../../../../src/quickjs/libregexp.c \
+	../../../../src/quickjs/libunicode.c \
+	../../../../src/quickjs/quickjs.c \
+	../../../../src/scenegraph/base_scenegraph.c \
+	../../../../src/scenegraph/commands.c \
+	../../../../src/scenegraph/dom_events.c \
+	../../../../src/scenegraph/dom_js.c \
+	../../../../src/scenegraph/mpeg4_animators.c \
+	../../../../src/scenegraph/mpeg4_nodes.c \
+	../../../../src/scenegraph/mpeg4_valuator.c \
+	../../../../src/scenegraph/smil_anim.c \
+	../../../../src/scenegraph/smil_timing.c \
+	../../../../src/scenegraph/svg_attributes.c \
+	../../../../src/scenegraph/svg_properties.c \
+	../../../../src/scenegraph/svg_js.c \
+	../../../../src/scenegraph/svg_types.c \
+	../../../../src/scenegraph/vrml_interpolators.c \
+	../../../../src/scenegraph/vrml_proto.c \
+	../../../../src/scenegraph/vrml_route.c \
+	../../../../src/scenegraph/vrml_script.c \
+	../../../../src/scenegraph/vrml_js.c \
+	../../../../src/scenegraph/vrml_tools.c \
+	../../../../src/scenegraph/x3d_nodes.c \
+	../../../../src/scenegraph/xml_ns.c \
+	../../../../src/scene_manager/encode_isom.c \
 	../../../../src/scene_manager/loader_bt.c \
+	../../../../src/scene_manager/loader_isom.c \
 	../../../../src/scene_manager/loader_qt.c \
-	../../../../src/scene_manager/encode_isom.c \
-	../../../../src/scene_manager/swf_parse.c \
+	../../../../src/scene_manager/loader_svg.c \
+	../../../../src/scene_manager/loader_xmt.c \
+	../../../../src/scene_manager/scene_dump.c \
 	../../../../src/scene_manager/scene_engine.c \
-	../../../../src/scene_manager/scene_stats.c \
 	../../../../src/scene_manager/scene_manager.c \
-	../../../../src/scene_manager/text_to_bifs.c \
-	../../../../src/scene_manager/loader_isom.c \
+	../../../../src/scene_manager/scene_stats.c \
 	../../../../src/scene_manager/swf_bifs.c \
+	../../../../src/scene_manager/swf_parse.c \
 	../../../../src/scene_manager/swf_svg.c \
-	../../../../src/scene_manager/loader_xmt.c \
-	../../../../src/scene_manager/loader_svg.c \
+	../../../../src/scene_manager/text_to_bifs.c \
+	../../../../src/terminal/terminal.c \
 	../../../../src/utils/alloc.c \
-	../../../../src/utils/os_net.c \
-	../../../../src/utils/path2d_stroker.c \
-	../../../../src/utils/zutil.c \
-	../../../../src/utils/os_divers.c \
-	../../../../src/utils/os_file.c \
-	../../../../src/utils/path2d.c \
 	../../../../src/utils/base_encoding.c \
-	../../../../src/utils/module.c \
-	../../../../src/utils/uni_bidi.c \
-	../../../../src/utils/dlmalloc.c \
-	../../../../src/utils/math.c \
-	../../../../src/utils/xml_parser.c \
-	../../../../src/utils/os_module.c \
-	../../../../src/utils/url.c \
-	../../../../src/utils/downloader.c \
-	../../../../src/utils/list.c \
-	../../../../src/utils/error.c \
 	../../../../src/utils/bitstream.c \
+	../../../../src/utils/cache.c \
 	../../../../src/utils/color.c \
-	../../../../src/utils/token.c \
 	../../../../src/utils/configfile.c \
+	../../../../src/utils/constants.c \
+	../../../../src/utils/downloader.c \
+	../../../../src/utils/error.c \
+	../../../../src/utils/gltools.c \
+	../../../../src/utils/gzio.c \
+	../../../../src/utils/list.c \
+	../../../../src/utils/math.c \
+	../../../../src/utils/module.c \
 	../../../../src/utils/os_config_init.c \
-	../../../../src/utils/utf.c \
+	../../../../src/utils/os_divers.c \
+	../../../../src/utils/os_file.c \
+	../../../../src/utils/os_module.c \
+	../../../../src/utils/os_net.c \
 	../../../../src/utils/os_thread.c \
-	../../../../src/utils/cache.c \
+	../../../../src/utils/path2d.c \
+	../../../../src/utils/path2d_stroker.c \
 	../../../../src/utils/sha1.c \
-	../../../../src/bifs/predictive_mffield.c \
-	../../../../src/bifs/script_dec.c \
-	../../../../src/bifs/memory_decoder.c \
-	../../../../src/bifs/unquantize.c \
-	../../../../src/bifs/script_enc.c \
-	../../../../src/bifs/field_encode.c \
-	../../../../src/bifs/conditional.c \
-	../../../../src/bifs/bifs_node_tables.c \
-	../../../../src/bifs/arith_decoder.c \
-	../../../../src/bifs/field_decode.c \
-	../../../../src/bifs/com_enc.c \
-	../../../../src/bifs/quantize.c \
-	../../../../src/bifs/bifs_codec.c \
-	../../../../src/bifs/com_dec.c \
-	../../../../src/ietf/rtsp_common.c \
-	../../../../src/ietf/sdp.c \
-	../../../../src/ietf/rtcp.c \
-	../../../../src/ietf/rtsp_command.c \
-	../../../../src/ietf/rtsp_session.c \
-	../../../../src/ietf/rtp_pck_3gpp.c \
-	../../../../src/ietf/rtp_pck_mpeg12.c \
-	../../../../src/ietf/rtp_pck_mpeg4.c \
-	../../../../src/ietf/rtsp_response.c \
-	../../../../src/ietf/rtp_depacketizer.c \
-	../../../../src/ietf/rtp_streamer.c \
-	../../../../src/ietf/rtp.c \
-	../../../../src/ietf/rtp_packetizer.c \
-	../../../../src/isomedia/avc_ext.c \
-	../../../../src/isomedia/box_dump.c \
-	../../../../src/isomedia/box_code_drm.c \
-	../../../../src/isomedia/track.c \
-	../../../../src/isomedia/box_funcs.c \
-	../../../../src/isomedia/isom_read.c \
-	../../../../src/isomedia/box_code_meta.c \
-	../../../../src/isomedia/box_code_base.c \
-	../../../../src/isomedia/box_code_adobe.c \
-	../../../../src/isomedia/box_code_apple.c \
-	../../../../src/isomedia/sample_descs.c \
-	../../../../src/isomedia/meta.c \
-	../../../../src/isomedia/stbl_read.c \
-	../../../../src/isomedia/box_code_3gpp.c \
-	../../../../src/isomedia/isom_intern.c \
-	../../../../src/isomedia/isom_write.c \
-	../../../../src/isomedia/drm_sample.c \
-	../../../../src/isomedia/iff.c \
-	../../../../src/isomedia/ttml.c \
-	../../../../src/isomedia/tx3g.c \
-	../../../../src/isomedia/hint_track.c \
-	../../../../src/isomedia/stbl_write.c \
-	../../../../src/isomedia/data_map.c \
-	../../../../src/isomedia/media.c \
-	../../../../src/isomedia/hinting.c \
-	../../../../src/isomedia/isom_store.c \
-	../../../../src/isomedia/movie_fragments.c \
-	../../../../src/isomedia/media_odf.c \
-	../../../../src/crypto/g_crypt.c \
-	../../../../src/crypto/g_crypt_openssl.c \
-	../../../../src/crypto/g_crypt_tinyaes.c \
-	../../../../src/crypto/tiny_aes.c \
-	../../../../src/terminal/scene.c \
-	../../../../src/terminal/terminal.c \
-	../../../../src/terminal/network_service.c \
-	../../../../src/terminal/input_sensor.c \
-	../../../../src/terminal/media_sensor.c \
-	../../../../src/terminal/media_object.c \
-	../../../../src/terminal/channel.c \
-	../../../../src/terminal/term_node_init.c \
-	../../../../src/terminal/object_browser.c \
-	../../../../src/terminal/mpeg4_inline.c \
-	../../../../src/terminal/decoder.c \
-	../../../../src/terminal/media_manager.c \
-	../../../../src/terminal/media_memory.c \
-	../../../../src/terminal/clock.c \
-	../../../../src/terminal/svg_external.c \
-	../../../../src/terminal/media_control.c \
-	../../../../src/terminal/object_manager.c \
-	../../../../src/scenegraph/xml_ns.c \
-	../../../../src/scenegraph/commands.c \
-	../../../../src/scenegraph/vrml_tools.c \
-	../../../../src/scenegraph/vrml_route.c \
-	../../../../src/scenegraph/dom_events.c \
-	../../../../src/scenegraph/smil_anim.c \
-	../../../../src/scenegraph/mpeg4_valuator.c \
-	../../../../src/scenegraph/svg_smjs.c \
-	../../../../src/scenegraph/vrml_interpolators.c \
-	../../../../src/scenegraph/svg_attributes.c \
-	../../../../src/scenegraph/mpeg4_nodes.c \
-	../../../../src/scenegraph/vrml_smjs.c \
-	../../../../src/scenegraph/mpeg4_animators.c \
-	../../../../src/scenegraph/dom_smjs.c \
-	../../../../src/scenegraph/svg_properties.c \
-	../../../../src/scenegraph/xbl_process.c \
-	../../../../src/scenegraph/svg_types.c \
-	../../../../src/scenegraph/x3d_nodes.c \
-	../../../../src/scenegraph/base_scenegraph.c \
-	../../../../src/scenegraph/smil_timing.c \
-	../../../../src/scenegraph/vrml_script.c \
-	../../../../src/scenegraph/vrml_proto.c \
-	../../../../src/scenegraph/html5_media_smjs.c \
-	../../../../src/scenegraph/html5_mse_smjs.c \
-	../../../../src/odf/ipmpx_dump.c \
-	../../../../src/odf/odf_code.c \
-	../../../../src/odf/desc_private.c \
-	../../../../src/odf/slc.c \
-	../../../../src/odf/odf_codec.c \
-	../../../../src/odf/qos.c \
-	../../../../src/odf/ipmpx_parse.c \
-	../../../../src/odf/ipmpx_code.c \
-	../../../../src/odf/odf_dump.c \
-	../../../../src/odf/odf_parse.c \
-	../../../../src/odf/odf_command.c \
-	../../../../src/odf/oci_codec.c \
-	../../../../src/odf/descriptors.c
+	../../../../src/utils/token.c \
+	../../../../src/utils/uni_bidi.c \
+	../../../../src/utils/unicode.c \
+	../../../../src/utils/url.c \
+	../../../../src/utils/utf.c \
+	../../../../src/utils/xml_parser.c \
+	../../../../src/utils/zutil.c
 
 include $(BUILD_SHARED_LIBRARY)

gpac-0.8.0.tar.gz/build/android/jni/libgpac/Application.mk -> gpac-1.0.0.tar.gz/build/android/jni/libgpac/Application.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/libgpac/config.h -> gpac-1.0.0.tar.gz/build/android/jni/libgpac/config.h Changed

gpac-0.8.0.tar.gz/build/android/jni/modules/Android.mk -> gpac-1.0.0.tar.gz/build/android/jni/modules/Android.mk Changed

@@ -1,29 +1,12 @@
 LOCAL_PATH:= $(call my-dir)
-include $(LOCAL_PATH)/gm_bifs_dec.mk
-include $(LOCAL_PATH)/gm_ctx_load.mk
-include $(LOCAL_PATH)/gm_dummy_in.mk
+
 include $(LOCAL_PATH)/gm_ft_font.mk
-include $(LOCAL_PATH)/gm_img_in.mk
-include $(LOCAL_PATH)/gm_ismacryp.mk
-include $(LOCAL_PATH)/gm_isom_in.mk
-include $(LOCAL_PATH)/gm_laser_dec.mk
-include $(LOCAL_PATH)/gm_odf_dec.mk
-include $(LOCAL_PATH)/gm_rtp_in.mk
-include $(LOCAL_PATH)/gm_saf_in.mk
-include $(LOCAL_PATH)/gm_soft_raster.mk
-include $(LOCAL_PATH)/gm_svg_in.mk
-include $(LOCAL_PATH)/gm_timedtext.mk
 include $(LOCAL_PATH)/gm_droid_out.mk
-include $(LOCAL_PATH)/gm_gpac_js.mk
 include $(LOCAL_PATH)/gm_droid_audio.mk
-include $(LOCAL_PATH)/gm_mp3_in.mk
-include $(LOCAL_PATH)/gm_ffmpeg_in.mk
-include $(LOCAL_PATH)/gm_droid_cam.mk
 include $(LOCAL_PATH)/gm_droid_mpegv.mk
-include $(LOCAL_PATH)/gm_mpegts_in.mk
-include $(LOCAL_PATH)/gm_mpd_in.mk
-include $(LOCAL_PATH)/gm_aac_in.mk
-include $(LOCAL_PATH)/gm_widgetman.mk
-include $(LOCAL_PATH)/gm_osd.mk
 
-include $(LOCAL_PATH)/gm_mediacodec_dec.mk
+#old arch not yet backported
+#include $(LOCAL_PATH)/gm_osd.mk
+#include $(LOCAL_PATH)/gm_droid_cam.mk
+#include $(LOCAL_PATH)/gm_widgetman.mk
+

gpac-0.8.0.tar.gz/build/android/jni/modules/Application.mk -> gpac-1.0.0.tar.gz/build/android/jni/modules/Application.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_droid_audio.mk -> gpac-1.0.0.tar.gz/build/android/jni/modules/gm_droid_audio.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/modules/gm_droid_out.mk -> gpac-1.0.0.tar.gz/build/android/jni/modules/gm_droid_out.mk Changed

gpac-0.8.0.tar.gz/build/android/jni/mp4box/Android.mk -> gpac-1.0.0.tar.gz/build/android/jni/mp4box/Android.mk Changed

gpac-1.0.0.tar.gz/build/msvc14/dec_openhevc.vcxproj Added

@@ -0,0 +1,287 @@
+<?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-CD9AFA416974}</ProjectGuid>
+    <RootNamespace>dec_openhevc</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <ProjectName>ohevcdec</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/dec_openhevc_deb/dec_openhevc.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>openhevc.lib;%(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>
+    </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/dec_openhevc_deb/dec_openhevc.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>openhevc.lib;%(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>
+    </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/dec_openhevc_rel/dec_openhevc.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>openhevc.lib;%(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>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dec_openhevc_rel/dec_openhevc.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>openhevc.lib;%(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>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\filter_export.cpp" />
+    <ClCompile Include="..\..\src\filters\dec_openhevc.c" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.8.0.tar.gz/build/msvc14/dx_hw.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/dx_hw.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/ft_font.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/ft_font.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/gpac.sln -> gpac-1.0.0.tar.gz/build/msvc14/gpac.sln Changed

@@ -4,112 +4,39 @@
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcxproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bifs_dec", "bifs_dec.vcxproj", "{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctx_load", "ctx_load.vcxproj", "{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy_in", "dummy_in.vcxproj", "{073E2381-4FDE-4C4D-A117-C489EB17C48B}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcxproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcxproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcxproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdip_raster", "gdip_raster.vcxproj", "{CAA5A551-006A-4119-8115-FB14692E719F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "img_in", "img_in.vcxproj", "{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isom_in", "isom_in.vcxproj", "{FC8F1F56-078E-470D-B252-68EDDE88AA9D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "laser_dec", "laser_dec.vcxproj", "{879E26B2-48DB-47B3-B82F-893696286E6F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac", "libgpac.vcxproj", "{233014D5-F6E5-419D-8757-FA9CE7337088}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgpac_dll", "libgpac_dll.vcxproj", "{D3540754-E0CF-4604-AC11-82DE9BD4D814}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcxproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcxproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcxproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odf_dec", "odf_dec.vcxproj", "{A86E6EF8-3683-4AD0-8878-7A0D51326088}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcxproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcxproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtp_in", "rtp_in.vcxproj", "{E2DBD151-9523-4E1A-9478-F3F825668F6E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "saf_in", "saf_in.vcxproj", "{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdl_out", "sdl_out.vcxproj", "{F346A9A7-CF8D-4409-8776-1D4244F96EF8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soft_raster", "soft_raster.vcxproj", "{71071F01-C813-4384-BE38-0F4020BCC0EE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svg_in", "svg_in.vcxproj", "{402A8794-B724-44A3-B608-84B600ECA387}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "timedtext", "timedtext.vcxproj", "{464697D2-BA44-446F-8223-1EB3969ED1A8}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wav_out", "wav_out.vcxproj", "{01183543-B182-4E32-9FD6-FC15C847316C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xvid_dec", "xvid_dec.vcxproj", "{4258687D-4905-46A6-9407-08F4F8A81CC0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ismacryp", "ismacryp.vcxproj", "{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ac3_in", "ac3_in.vcxproj", "{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac_js", "gpac_js.vcxproj", "{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_filter", "audio_filter.vcxproj", "{C993119B-29B1-49C8-8EA3-A9ABF633164E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "platinum", "platinum.vcxproj", "{694C765F-DFD6-467E-A813-B3F887E822D4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "widgetman", "widgetman.vcxproj", "{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redirect_av", "redirect_av.vcxproj", "{073E2281-4FDE-4C4D-A217-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui_rec", "ui_rec.vcxproj", "{073E2381-4FDE-4C4D-A117-C489DB17C48C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opensvc_dec", "opensvc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EB17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpd_in", "mpd_in.vcxproj", "{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_dec", "amr_dec.vcxproj", "{5ED5A1C8-DB34-4089-8E53-EFB225754D02}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amr_float_dec", "amr_float_dec.vcxproj", "{5D3983BF-143F-49C3-9284-89778282AEFE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "validator.vcxproj", "{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mse_in", "mse_in.vcxproj", "{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "applications", "applications", "{B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{6274F5D2-A9CB-4DF9-BF9E-818416ACD347}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openhevc_dec", "openhevc.vcxproj", "{073E2381-4FDE-4C4D-B217-C489EF17C48B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ohevcdec", "dec_openhevc.vcxproj", "{042D3628-67F3-4B6C-8CC0-CD9AFA416974}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashcast", "dashcast.vcxproj", "{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpac", "gpac.vcxproj", "{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {D3540754-E0CF-4604-AC11-82DE9BD4D814}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nvdec", "nvdec.vcxproj", "{073E2381-4CDB-4C4D-B217-C489EF17C48B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dektec_out", "dektec_out.vcxproj", "{CAC981C2-5665-4E90-80D3-604C1A785D91}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atsc_in", "atsc_in.vcxproj", "{48071212-239F-4F24-B4FA-E21250CCB087}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "out_dektec", "..\..\modules\dektec_out\out_dektec.vcxproj", "{042E3638-67F3-4C6C-8C00-CD9BFA416974}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -135,62 +62,6 @@
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|Win32.Build.0 = Release|Win32
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.ActiveCfg = Release|x64
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2}.Release|x64.Build.0 = Release|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Debug|x64.ActiveCfg = Debug|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|Win32.ActiveCfg = Release|Win32
-		{C79C2D73-06E9-4622-92CE-F166B1B51792}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|Win32.Build.0 = Debug|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.ActiveCfg = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Debug|x64.Build.0 = Debug|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.ActiveCfg = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|Win32.Build.0 = Release|Win32
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.ActiveCfg = Release|x64
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}.Release|x64.Build.0 = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|Win32.Build.0 = Debug|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.ActiveCfg = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Debug|x64.Build.0 = Debug|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.ActiveCfg = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|Win32.Build.0 = Release|Win32
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.ActiveCfg = Release|x64
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}.Release|x64.Build.0 = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|Win32.Build.0 = Debug|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.ActiveCfg = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Debug|x64.Build.0 = Debug|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.ActiveCfg = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|Win32.Build.0 = Release|Win32
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.ActiveCfg = Release|x64
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B}.Release|x64.Build.0 = Release|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -203,18 +74,6 @@
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|Win32.Build.0 = Release|Win32
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.ActiveCfg = Release|x64
 		{B64736BD-9245-4F40-961D-EB9822265764}.Release|x64.Build.0 = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|Win32.Build.0 = Debug|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.ActiveCfg = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Debug|x64.Build.0 = Debug|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.ActiveCfg = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|Win32.Build.0 = Release|Win32
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.ActiveCfg = Release|x64
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3}.Release|x64.Build.0 = Release|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -227,54 +86,6 @@
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|Win32.Build.0 = Debug|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.ActiveCfg = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Debug|x64.Build.0 = Debug|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.ActiveCfg = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|Win32.Build.0 = Release|Win32
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.ActiveCfg = Release|x64
-		{CAA5A551-006A-4119-8115-FB14692E719F}.Release|x64.Build.0 = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|Win32.Build.0 = Debug|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.ActiveCfg = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Debug|x64.Build.0 = Debug|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.ActiveCfg = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|Win32.Build.0 = Release|Win32
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.ActiveCfg = Release|x64
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}.Release|x64.Build.0 = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|Win32.Build.0 = Debug|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.ActiveCfg = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Debug|x64.Build.0 = Debug|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.ActiveCfg = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|Win32.Build.0 = Release|Win32
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.ActiveCfg = Release|x64
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D}.Release|x64.Build.0 = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|Win32.Build.0 = Debug|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.ActiveCfg = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Debug|x64.Build.0 = Debug|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.ActiveCfg = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|Win32.Build.0 = Release|Win32
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.ActiveCfg = Release|x64
-		{879E26B2-48DB-47B3-B82F-893696286E6F}.Release|x64.Build.0 = Release|x64
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
 		{233014D5-F6E5-419D-8757-FA9CE7337088}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
@@ -303,30 +114,6 @@
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|Win32.Build.0 = Release|Win32
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.ActiveCfg = Release|x64
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814}.Release|x64.Build.0 = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|Win32.Build.0 = Debug|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.ActiveCfg = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Debug|x64.Build.0 = Debug|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.ActiveCfg = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|Win32.Build.0 = Release|Win32
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.ActiveCfg = Release|x64
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}.Release|x64.Build.0 = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.ActiveCfg = Debug - MP4Box_only|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|Win32.Build.0 = Debug - MP4Box_only|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Debug - MP4Box_only|x64.ActiveCfg = Debug - MP4Box_only|x64
@@ -343,78 +130,6 @@
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|Win32.Build.0 = Release|Win32
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.ActiveCfg = Release|x64
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497}.Release|x64.Build.0 = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|Win32.Build.0 = Debug|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.ActiveCfg = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Debug|x64.Build.0 = Debug|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.ActiveCfg = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|Win32.Build.0 = Release|Win32
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.ActiveCfg = Release|x64
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165}.Release|x64.Build.0 = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|Win32.Build.0 = Debug|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.ActiveCfg = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Debug|x64.Build.0 = Debug|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.ActiveCfg = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|Win32.Build.0 = Release|Win32
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.ActiveCfg = Release|x64
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088}.Release|x64.Build.0 = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|Win32.Build.0 = Debug|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.ActiveCfg = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Debug|x64.Build.0 = Debug|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.ActiveCfg = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|Win32.Build.0 = Release|Win32
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.ActiveCfg = Release|x64
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}.Release|x64.Build.0 = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|Win32.Build.0 = Debug|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.ActiveCfg = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Debug|x64.Build.0 = Debug|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.ActiveCfg = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|Win32.Build.0 = Release|Win32
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.ActiveCfg = Release|x64
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}.Release|x64.Build.0 = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|Win32.Build.0 = Debug|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.ActiveCfg = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Debug|x64.Build.0 = Debug|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.ActiveCfg = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|Win32.Build.0 = Release|Win32
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.ActiveCfg = Release|x64
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E}.Release|x64.Build.0 = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|Win32.Build.0 = Debug|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.ActiveCfg = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Debug|x64.Build.0 = Debug|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.ActiveCfg = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|Win32.Build.0 = Release|Win32
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.ActiveCfg = Release|x64
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}.Release|x64.Build.0 = Release|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -427,42 +142,6 @@
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|Win32.Build.0 = Release|Win32
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.ActiveCfg = Release|x64
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8}.Release|x64.Build.0 = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|Win32.Build.0 = Debug|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.ActiveCfg = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Debug|x64.Build.0 = Debug|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.ActiveCfg = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|Win32.Build.0 = Release|Win32
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.ActiveCfg = Release|x64
-		{71071F01-C813-4384-BE38-0F4020BCC0EE}.Release|x64.Build.0 = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.ActiveCfg = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|Win32.Build.0 = Debug|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.ActiveCfg = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Debug|x64.Build.0 = Debug|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.ActiveCfg = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|Win32.Build.0 = Release|Win32
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.ActiveCfg = Release|x64
-		{402A8794-B724-44A3-B608-84B600ECA387}.Release|x64.Build.0 = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|Win32.Build.0 = Debug|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.ActiveCfg = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Debug|x64.Build.0 = Debug|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.ActiveCfg = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|Win32.Build.0 = Release|Win32
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.ActiveCfg = Release|x64
-		{464697D2-BA44-446F-8223-1EB3969ED1A8}.Release|x64.Build.0 = Release|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -475,162 +154,6 @@
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|Win32.Build.0 = Release|Win32
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.ActiveCfg = Release|x64
 		{01183543-B182-4E32-9FD6-FC15C847316C}.Release|x64.Build.0 = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|Win32.Build.0 = Debug|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.ActiveCfg = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Debug|x64.Build.0 = Debug|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.ActiveCfg = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|Win32.Build.0 = Release|Win32
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.ActiveCfg = Release|x64
-		{4258687D-4905-46A6-9407-08F4F8A81CC0}.Release|x64.Build.0 = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|Win32.Build.0 = Debug|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.ActiveCfg = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Debug|x64.Build.0 = Debug|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.ActiveCfg = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|Win32.Build.0 = Release|Win32
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.ActiveCfg = Release|x64
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}.Release|x64.Build.0 = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|Win32.Build.0 = Debug|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.ActiveCfg = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Debug|x64.Build.0 = Debug|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.ActiveCfg = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|Win32.Build.0 = Release|Win32
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.ActiveCfg = Release|x64
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812}.Release|x64.Build.0 = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.ActiveCfg = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|Win32.Build.0 = Debug|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.ActiveCfg = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Debug|x64.Build.0 = Debug|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.ActiveCfg = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|Win32.Build.0 = Release|Win32
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.ActiveCfg = Release|x64
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}.Release|x64.Build.0 = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|Win32.Build.0 = Debug|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.ActiveCfg = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Debug|x64.Build.0 = Debug|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.ActiveCfg = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|Win32.Build.0 = Release|Win32
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.ActiveCfg = Release|x64
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E}.Release|x64.Build.0 = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|Win32.Build.0 = Debug|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.ActiveCfg = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Debug|x64.Build.0 = Debug|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.ActiveCfg = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|Win32.Build.0 = Release|Win32
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.ActiveCfg = Release|x64
-		{694C765F-DFD6-467E-A813-B3F887E822D4}.Release|x64.Build.0 = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.ActiveCfg = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|Win32.Build.0 = Debug|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.ActiveCfg = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Debug|x64.Build.0 = Debug|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.ActiveCfg = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|Win32.Build.0 = Release|Win32
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.ActiveCfg = Release|x64
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}.Release|x64.Build.0 = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B}.Release|x64.Build.0 = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|Win32.Build.0 = Debug|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.ActiveCfg = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Debug|x64.Build.0 = Debug|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.ActiveCfg = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|Win32.Build.0 = Release|Win32
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.ActiveCfg = Release|x64
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}.Release|x64.Build.0 = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|Win32.Build.0 = Debug|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.ActiveCfg = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Debug|x64.Build.0 = Debug|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.ActiveCfg = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|Win32.Build.0 = Release|Win32
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.ActiveCfg = Release|x64
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02}.Release|x64.Build.0 = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|Win32.Build.0 = Debug|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.ActiveCfg = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Debug|x64.Build.0 = Debug|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.ActiveCfg = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|Win32.Build.0 = Release|Win32
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.ActiveCfg = Release|x64
-		{5D3983BF-143F-49C3-9284-89778282AEFE}.Release|x64.Build.0 = Release|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -643,144 +166,60 @@
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|Win32.Build.0 = Release|Win32
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.ActiveCfg = Release|x64
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}.Release|x64.Build.0 = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.ActiveCfg = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Debug|x64.Build.0 = Debug|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|Win32.Build.0 = Release|Win32
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.ActiveCfg = Release|x64
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}.Release|x64.Build.0 = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|Win32.Build.0 = Debug|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.ActiveCfg = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Debug|x64.Build.0 = Debug|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.ActiveCfg = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
-		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|Win32.Build.0 = Debug|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.ActiveCfg = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Debug|x64.Build.0 = Debug|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.ActiveCfg = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|Win32.Build.0 = Release|Win32
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.ActiveCfg = Release|x64
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B}.Release|x64.Build.0 = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|Win32.Build.0 = Debug|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.ActiveCfg = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Debug|x64.Build.0 = Debug|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.ActiveCfg = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|Win32.Build.0 = Release|Win32
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.ActiveCfg = Release|x64
-		{CAC981C2-5665-4E90-80D3-604C1A785D91}.Release|x64.Build.0 = Release|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|Win32.ActiveCfg = Debug|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|Win32.Build.0 = Debug|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|x64.ActiveCfg = Debug|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Debug|x64.Build.0 = Debug|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|Win32.ActiveCfg = Release|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|Win32.Build.0 = Release|Win32
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|x64.ActiveCfg = Release|x64
-		{48071212-239F-4F24-B4FA-E21250CCB087}.Release|x64.Build.0 = Release|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug|Win32.Build.0 = Debug|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug|x64.ActiveCfg = Debug|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Debug|x64.Build.0 = Debug|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release|Win32.ActiveCfg = Release|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release|Win32.Build.0 = Release|Win32
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release|x64.ActiveCfg = Release|x64
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974}.Release|x64.Build.0 = Release|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug|Win32.Build.0 = Debug|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug|x64.ActiveCfg = Debug|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Debug|x64.Build.0 = Debug|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|Win32.ActiveCfg = Release - MP4Box_only|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release|Win32.ActiveCfg = Release|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release|Win32.Build.0 = Release|Win32
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release|x64.ActiveCfg = Release|x64
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}.Release|x64.Build.0 = Release|x64
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Debug - MP4Box_only|Win32.ActiveCfg = Debug|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Debug - MP4Box_only|x64.ActiveCfg = Debug|x64
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Debug|Win32.ActiveCfg = Debug|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Debug|Win32.Build.0 = Debug|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Debug|x64.ActiveCfg = Debug|x64
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release - MP4Box_only|Win32.ActiveCfg = Release|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release - MP4Box_only|x64.ActiveCfg = Release|x64
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|Win32.ActiveCfg = Release|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|Win32.Build.0 = Release|Win32
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|x64.ActiveCfg = Release|x64
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{A35D99BF-D72D-4F56-99A1-97249B22BCE2} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{C79C2D73-06E9-4622-92CE-F166B1B51792} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{BAE0C03A-56E0-4D37-89F5-62DD03BFC013} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{B64736BD-9245-4F40-961D-EB9822265764} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9FECAB79-BC70-4EEA-A23B-B64159F904B3} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{042D3628-67F3-4B5C-8BC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{CAA5A551-006A-4119-8115-FB14692E719F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{FC8F1F56-078E-470D-B252-68EDDE88AA9D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{879E26B2-48DB-47B3-B82F-893696286E6F} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
-		{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
 		{48E2C7C6-52EB-46FB-8722-00A62F46F497} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{B38E812D-9823-48E7-BE5F-BF09B0AD4165} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{A86E6EF8-3683-4AD0-8878-7A0D51326088} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E2DBD151-9523-4E1A-9478-F3F825668F6E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{F346A9A7-CF8D-4409-8776-1D4244F96EF8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{71071F01-C813-4384-BE38-0F4020BCC0EE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{402A8794-B724-44A3-B608-84B600ECA387} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{464697D2-BA44-446F-8223-1EB3969ED1A8} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{01183543-B182-4E32-9FD6-FC15C847316C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{4258687D-4905-46A6-9407-08F4F8A81CC0} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{1DE72B1E-0DD6-4AFD-95E9-D23ACAB31812} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{27F7FDF4-479B-47B5-BFEA-12E9EA41F663} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{C993119B-29B1-49C8-8EA3-A9ABF633164E} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{694C765F-DFD6-467E-A813-B3F887E822D4} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2281-4FDE-4C4D-A217-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-A117-C489DB17C48C} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EB17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{B1AEFA90-318F-459C-96EE-B4DFF3318B7B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5ED5A1C8-DB34-4089-8E53-EFB225754D02} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5D3983BF-143F-49C3-9284-89778282AEFE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{75CD44BD-BE6F-407F-84CA-D0F60264EB4B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
-		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{073E2381-4CDB-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{CAC981C2-5665-4E90-80D3-604C1A785D91} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
-		{48071212-239F-4F24-B4FA-E21250CCB087} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{042D3628-67F3-4B6C-8CC0-CD9AFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0} = {B7FFDE3D-6BF0-4EE1-B6FD-BD15A503DBBA}
+		{042E3638-67F3-4C6C-8C00-CD9BFA416974} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2516E9BA-1B96-4935-ABF3-0D6D3F959230}
 	EndGlobalSection
 EndGlobal

gpac-1.0.0.tar.gz/build/msvc14/gpac.vcxproj Added

@@ -0,0 +1,383 @@
+<?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 - MP4Box_only|Win32">
+      <Configuration>Release - MP4Box_only</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release - MP4Box_only|x64">
+      <Configuration>Release - MP4Box_only</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>{F728CC74-D7D0-41D2-8A28-05CE9F2EF0D0}</ProjectGuid>
+    <RootNamespace>gpac</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v140</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</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 - MP4Box_only|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)'=='Release - MP4Box_only|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 - MP4Box_only|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">false</LinkIncremental>
+    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableManagedIncrementalBuild>
+    <EnableManagedIncrementalBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableManagedIncrementalBuild>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_deb/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(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>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_deb/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>../../include</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;libcryptoMDd.lib;libsslMDd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_rel/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <LinkStatus>
+      </LinkStatus>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_rel/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</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>
+      <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>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_rel/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(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>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;libcryptoMD.lib;libsslMD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj/gpac_rel/gpac.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <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>
+      <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>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\gpac\main.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="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-0.8.0.tar.gz/build/msvc14/libgpac.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/libgpac.vcxproj Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug - MP4Box_only|Win32">
       <Configuration>Debug - MP4Box_only</Configuration>
@@ -55,9 +55,6 @@
     <ClInclude Include="..\..\include\gpac\esi.h" />
     <ClInclude Include="..\..\include\gpac\events.h" />
     <ClInclude Include="..\..\include\gpac\events_constants.h" />
-    <ClInclude Include="..\..\include\gpac\filestreamer.h" />
-    <ClInclude Include="..\..\include\gpac\html5_media.h" />
-    <ClInclude Include="..\..\include\gpac\html5_mse.h" />
     <ClInclude Include="..\..\include\gpac\ietf.h" />
     <ClInclude Include="..\..\include\gpac\internal\avilib.h" />
     <ClInclude Include="..\..\include\gpac\internal\bifs_dev.h" />
@@ -82,7 +79,7 @@
     <ClInclude Include="..\..\include\gpac\internal\swf_dev.h" />
     <ClInclude Include="..\..\include\gpac\internal\terminal_dev.h" />
     <ClInclude Include="..\..\include\gpac\internal\vobsub.h" />
-    <ClInclude Include="..\..\include\gpac\ismacryp.h" />
+    <ClInclude Include="..\..\include\gpac\crypt_tools.h" />
     <ClInclude Include="..\..\include\gpac\iso639.h" />
     <ClInclude Include="..\..\include\gpac\isomedia.h" />
     <ClInclude Include="..\..\include\gpac\laser.h" />
@@ -108,11 +105,10 @@
     <ClInclude Include="..\..\include\gpac\nodes_mpeg4.h" />
     <ClInclude Include="..\..\include\gpac\nodes_svg.h" />
     <ClInclude Include="..\..\include\gpac\nodes_x3d.h" />
-    <ClInclude Include="..\..\include\gpac\nodes_xbl.h" />
     <ClInclude Include="..\..\include\gpac\options.h" />
     <ClInclude Include="..\..\include\gpac\path2d.h" />
+    <ClInclude Include="..\..\include\gpac\Remotery.h" />
     <ClInclude Include="..\..\include\gpac\revision.h" />
-    <ClInclude Include="..\..\include\gpac\ringbuffer.h" />
     <ClInclude Include="..\..\include\gpac\rtp_streamer.h" />
     <ClInclude Include="..\..\include\gpac\scenegraph.h" />
     <ClInclude Include="..\..\include\gpac\scenegraph_svg.h" />
@@ -146,10 +142,22 @@
     <ClInclude Include="..\..\src\compositor\visual_manager.h" />
     <ClInclude Include="..\..\src\compositor\visual_manager_2d.h" />
     <ClInclude Include="..\..\src\compositor\visual_manager_3d.h" />
+    <ClInclude Include="..\..\src\filters\dec_nvdec_sdk.h" />
+    <ClInclude Include="..\..\src\filters\ff_common.h" />
+    <ClInclude Include="..\..\src\filters\in_rtp.h" />
+    <ClInclude Include="..\..\src\filters\isoffin.h" />
+    <ClInclude Include="..\..\src\filter_core\filter_session.h" />
     <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h" />
-    <ClInclude Include="..\..\src\terminal\input_sensor.h" />
-    <ClInclude Include="..\..\src\terminal\media_control.h" />
-    <ClInclude Include="..\..\src\terminal\media_memory.h" />
+    <ClInclude Include="..\..\src\quickjs\cutils.h" />
+    <ClInclude Include="..\..\src\quickjs\libregexp-opcode.h" />
+    <ClInclude Include="..\..\src\quickjs\libregexp.h" />
+    <ClInclude Include="..\..\src\quickjs\libunicode-table.h" />
+    <ClInclude Include="..\..\src\quickjs\libunicode.h" />
+    <ClInclude Include="..\..\src\quickjs\list.h" />
+    <ClInclude Include="..\..\src\quickjs\quickjs-atom.h" />
+    <ClInclude Include="..\..\src\quickjs\quickjs-opcode.h" />
+    <ClInclude Include="..\..\src\quickjs\quickjs.h" />
+    <ClInclude Include="..\..\src\scenegraph\qjs_common.h" />
     <ClInclude Include="..\..\src\utils\module_wrap.h" />
   </ItemGroup>
   <ItemGroup>
@@ -172,6 +180,7 @@
     <ClCompile Include="..\..\src\compositor\audio_render.c" />
     <ClCompile Include="..\..\src\compositor\bindable.c" />
     <ClCompile Include="..\..\src\compositor\camera.c" />
+    <ClCompile Include="..\..\src\compositor\clock.c" />
     <ClCompile Include="..\..\src\compositor\compositor.c" />
     <ClCompile Include="..\..\src\compositor\compositor_2d.c" />
     <ClCompile Include="..\..\src\compositor\compositor_3d.c" />
@@ -181,6 +190,7 @@
     <ClCompile Include="..\..\src\compositor\font_engine.c" />
     <ClCompile Include="..\..\src\compositor\hardcoded_protos.c" />
     <ClCompile Include="..\..\src\compositor\hc_flash_shape.c" />
+    <ClCompile Include="..\..\src\compositor\media_object.c" />
     <ClCompile Include="..\..\src\compositor\mesh.c" />
     <ClCompile Include="..\..\src\compositor\mesh_collide.c" />
     <ClCompile Include="..\..\src\compositor\mesh_tesselate.c" />
@@ -199,10 +209,14 @@
     <ClCompile Include="..\..\src\compositor\mpeg4_grouping.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_grouping_2d.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_grouping_3d.c" />
+    <ClCompile Include="..\..\src\compositor\mpeg4_inline.c" />
+    <ClCompile Include="..\..\src\compositor\mpeg4_inputsensor.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_layer_2d.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_layer_3d.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_layout.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_lighting.c" />
+    <ClCompile Include="..\..\src\compositor\mpeg4_mediacontrol.c" />
+    <ClCompile Include="..\..\src\compositor\mpeg4_mediasensor.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_path_layout.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_sensors.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_sound.c" />
@@ -211,8 +225,13 @@
     <ClCompile Include="..\..\src\compositor\mpeg4_timesensor.c" />
     <ClCompile Include="..\..\src\compositor\mpeg4_viewport.c" />
     <ClCompile Include="..\..\src\compositor\navigate.c" />
+    <ClCompile Include="..\..\src\compositor\object_manager.c" />
     <ClCompile Include="..\..\src\compositor\offscreen_cache.c" />
+    <ClCompile Include="..\..\src\compositor\scene.c" />
+    <ClCompile Include="..\..\src\compositor\scene_node_init.c" />
+    <ClCompile Include="..\..\src\compositor\scene_ns.c" />
     <ClCompile Include="..\..\src\compositor\svg_base.c" />
+    <ClCompile Include="..\..\src\compositor\svg_external.c" />
     <ClCompile Include="..\..\src\compositor\svg_filters.c" />
     <ClCompile Include="..\..\src\compositor\svg_font.c" />
     <ClCompile Include="..\..\src\compositor\svg_geometry.c" />
@@ -228,6 +247,123 @@
     <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\bsrw.c" />
+    <ClCompile Include="..\..\src\filters\compose.c" />
+    <ClCompile Include="..\..\src\filters\dasher.c" />
+    <ClCompile Include="..\..\src\filters\decrypt_cenc_isma.c" />
+    <ClCompile Include="..\..\src\filters\dec_nvdec.c" />
+    <ClCompile Include="..\..\src\filters\dec_nvdec_sdk.c" />
+    <ClCompile Include="..\..\src\filters\dmx_gsf.c" />
+    <ClCompile Include="..\..\src\filters\encrypt_cenc_isma.c" />
+    <ClCompile Include="..\..\src\filters\dec_ac52.c" />
+    <ClCompile Include="..\..\src\filters\dec_bifs.c" />
+    <ClCompile Include="..\..\src\filters\dec_faad.c" />
+    <ClCompile Include="..\..\src\filters\dec_img.c" />
+    <ClCompile Include="..\..\src\filters\dec_j2k.c" />
+    <ClCompile Include="..\..\src\filters\dec_laser.c" />
+    <ClCompile Include="..\..\src\filters\dec_mad.c" />
+    <ClCompile Include="..\..\src\filters\dec_mediacodec.c" />
+    <ClCompile Include="..\..\src\filters\dec_odf.c" />
+    <ClCompile Include="..\..\src\filters\dec_openhevc.c" />
+    <ClCompile Include="..\..\src\filters\dec_opensvc.c" />
+    <ClCompile Include="..\..\src\filters\dec_theora.c" />
+    <ClCompile Include="..\..\src\filters\dec_ttml.c" />
+    <ClCompile Include="..\..\src\filters\dec_ttxt.c" />
+    <ClCompile Include="..\..\src\filters\dec_vorbis.c" />
+    <ClCompile Include="..\..\src\filters\dec_vtb.c" />
+    <ClCompile Include="..\..\src\filters\dec_webvtt.c" />
+    <ClCompile Include="..\..\src\filters\dec_xvid.c" />
+    <ClCompile Include="..\..\src\filters\dmx_avi.c" />
+    <ClCompile Include="..\..\src\filters\dmx_dash.c" />
+    <ClCompile Include="..\..\src\filters\dmx_m2ts.c" />
+    <ClCompile Include="..\..\src\filters\dmx_mpegps.c" />
+    <ClCompile Include="..\..\src\filters\dmx_nhml.c" />
+    <ClCompile Include="..\..\src\filters\dmx_nhnt.c" />
+    <ClCompile Include="..\..\src\filters\dmx_ogg.c" />
+    <ClCompile Include="..\..\src\filters\dmx_saf.c" />
+    <ClCompile Include="..\..\src\filters\dmx_vobsub.c" />
+    <ClCompile Include="..\..\src\filters\enc_jpg.c" />
+    <ClCompile Include="..\..\src\filters\enc_png.c" />
+    <ClCompile Include="..\..\src\filters\ff_common.c" />
+    <ClCompile Include="..\..\src\filters\ff_avf.c" />
+    <ClCompile Include="..\..\src\filters\ff_dec.c" />
+    <ClCompile Include="..\..\src\filters\ff_dmx.c" />
+    <ClCompile Include="..\..\src\filters\ff_enc.c" />
+    <ClCompile Include="..\..\src\filters\ff_mx.c" />
+    <ClCompile Include="..\..\src\filters\ff_rescale.c" />
+    <ClCompile Include="..\..\src\filters\filelist.c" />
+    <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_dvb4linux.c" />
+    <ClCompile Include="..\..\src\filters\in_file.c" />
+    <ClCompile Include="..\..\src\filters\in_http.c" />
+    <ClCompile Include="..\..\src\filters\in_pipe.c" />
+    <ClCompile Include="..\..\src\filters\in_rtp.c" />
+    <ClCompile Include="..\..\src\filters\in_rtp_rtsp.c" />
+    <ClCompile Include="..\..\src\filters\in_rtp_sdp.c" />
+    <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\isoffin_load.c" />
+    <ClCompile Include="..\..\src\filters\isoffin_read.c" />
+    <ClCompile Include="..\..\src\filters\isoffin_read_ch.c" />
+    <ClCompile Include="..\..\src\filters\jsfilter.c" />
+    <ClCompile Include="..\..\src\filters\load_bt_xmt.c" />
+    <ClCompile Include="..\..\src\filters\load_svg.c" />
+    <ClCompile Include="..\..\src\filters\load_text.c" />
+    <ClCompile Include="..\..\src\filters\mux_avi.c" />
+    <ClCompile Include="..\..\src\filters\mux_gsf.c" />
+    <ClCompile Include="..\..\src\filters\mux_isom.c" />
+    <ClCompile Include="..\..\src\filters\mux_ts.c" />
+    <ClCompile Include="..\..\src\filters\out_audio.c" />
+    <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_rtp.c" />
+    <ClCompile Include="..\..\src\filters\out_rtsp.c" />
+    <ClCompile Include="..\..\src\filters\out_sock.c" />
+    <ClCompile Include="..\..\src\filters\out_video.c" />
+    <ClCompile Include="..\..\src\filters\reframer.c" />
+    <ClCompile Include="..\..\src\filters\reframe_ac3.c" />
+    <ClCompile Include="..\..\src\filters\reframe_adts.c" />
+    <ClCompile Include="..\..\src\filters\reframe_amr.c" />
+    <ClCompile Include="..\..\src\filters\reframe_av1.c" />
+    <ClCompile Include="..\..\src\filters\reframe_flac.c" />
+    <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_mp3.c" />
+    <ClCompile Include="..\..\src\filters\reframe_mpgvid.c" />
+    <ClCompile Include="..\..\src\filters\reframe_nalu.c" />
+    <ClCompile Include="..\..\src\filters\reframe_prores.c" />
+    <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\resample_audio.c" />
+    <ClCompile Include="..\..\src\filters\rewind.c" />
+    <ClCompile Include="..\..\src\filters\rewrite_adts.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\tssplit.c" />
+    <ClCompile Include="..\..\src\filters\unit_test_filter.c" />
+    <ClCompile Include="..\..\src\filters\vcrop.c" />
+    <ClCompile Include="..\..\src\filters\vflip.c" />
+    <ClCompile Include="..\..\src\filters\write_generic.c" />
+    <ClCompile Include="..\..\src\filters\write_nhml.c" />
+    <ClCompile Include="..\..\src\filters\write_nhnt.c" />
+    <ClCompile Include="..\..\src\filters\write_qcp.c" />
+    <ClCompile Include="..\..\src\filters\write_vtt.c" />
+    <ClCompile Include="..\..\src\filter_core\filter.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_pck.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_pid.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_props.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_queue.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_register.c" />
+    <ClCompile Include="..\..\src\filter_core\filter_session.c" />
     <ClCompile Include="..\..\src\ietf\rtcp.c" />
     <ClCompile Include="..\..\src\ietf\rtp.c" />
     <ClCompile Include="..\..\src\ietf\rtp_depacketizer.c" />
@@ -253,7 +389,6 @@
     <ClCompile Include="..\..\src\isomedia\data_map.c" />
     <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
     <ClCompile Include="..\..\src\isomedia\iff.c" />
-    <ClCompile Include="..\..\src\isomedia\ttml.c" />
     <ClCompile Include="..\..\src\isomedia\hinting.c" />
     <ClCompile Include="..\..\src\isomedia\hint_track.c" />
     <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
@@ -269,6 +404,13 @@
     <ClCompile Include="..\..\src\isomedia\stbl_write.c" />
     <ClCompile Include="..\..\src\isomedia\track.c" />
     <ClCompile Include="..\..\src\isomedia\tx3g.c" />
+    <ClCompile Include="..\..\src\jsmods\evg.c" />
+    <ClCompile Include="..\..\src\jsmods\scene_js.c" />
+    <ClCompile Include="..\..\src\jsmods\storage.c" />
+    <ClCompile Include="..\..\src\jsmods\webgl.c">
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OnlyExplicitInline</InlineFunctionExpansion>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\xhr.c" />
     <ClCompile Include="..\..\src\laser\lsr_dec.c" />
     <ClCompile Include="..\..\src\laser\lsr_enc.c" />
     <ClCompile Include="..\..\src\laser\lsr_tables.c" />
@@ -276,6 +418,14 @@
     <ClCompile Include="..\..\src\crypto\g_crypt_openssl.c" />
     <ClCompile Include="..\..\src\crypto\g_crypt_tinyaes.c" />
     <ClCompile Include="..\..\src\crypto\tiny_aes.c" />
+    <ClCompile Include="..\..\src\evg\ftgrays.c" />
+    <ClCompile Include="..\..\src\evg\raster3d.c" />
+    <ClCompile Include="..\..\src\evg\raster_565.c" />
+    <ClCompile Include="..\..\src\evg\raster_argb.c" />
+    <ClCompile Include="..\..\src\evg\raster_rgb.c" />
+    <ClCompile Include="..\..\src\evg\raster_yuv.c" />
+    <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\avilib.c" />
@@ -284,12 +434,9 @@
     <ClCompile Include="..\..\src\media_tools\dash_segmenter.c" />
     <ClCompile Include="..\..\src\media_tools\dsmcc.c" />
     <ClCompile Include="..\..\src\media_tools\dvb_mpe.c" />
-    <ClCompile Include="..\..\src\media_tools\filestreamer.c" />
     <ClCompile Include="..\..\src\media_tools\gpac_ogg.c" />
-    <ClCompile Include="..\..\src\media_tools\html5_media.c" />
-    <ClCompile Include="..\..\src\media_tools\html5_mse.c" />
     <ClCompile Include="..\..\src\media_tools\img.c" />
-    <ClCompile Include="..\..\src\media_tools\ismacryp.c" />
+    <ClCompile Include="..\..\src\media_tools\crypt_tools.c" />
     <ClCompile Include="..\..\src\media_tools\isom_hinter.c" />
     <ClCompile Include="..\..\src\media_tools\isom_tools.c" />
     <ClCompile Include="..\..\src\media_tools\m2ts_mux.c" />
@@ -301,7 +448,6 @@
     <ClCompile Include="..\..\src\media_tools\mpegts.c" />
     <ClCompile Include="..\..\src\media_tools\reedsolomon.c" />
     <ClCompile Include="..\..\src\media_tools\saf.c" />
-    <ClCompile Include="..\..\src\media_tools\text_import.c" />
     <ClCompile Include="..\..\src\media_tools\vobsub.c" />
     <ClCompile Include="..\..\src\media_tools\webvtt.c" />
     <ClCompile Include="..\..\src\odf\descriptors.c" />
@@ -317,30 +463,59 @@
     <ClCompile Include="..\..\src\odf\odf_parse.c" />
     <ClCompile Include="..\..\src\odf\qos.c" />
     <ClCompile Include="..\..\src\odf\slc.c" />
+    <ClCompile Include="..\..\src\quickjs\cutils.c" />
+    <ClCompile Include="..\..\src\quickjs\libbf.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\libregexp.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</WarningLevel>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\libunicode.c" />
+    <ClCompile Include="..\..\src\quickjs\quickjs.c">
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">Level1</WarningLevel>
+      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Level1</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" />
-    <ClCompile Include="..\..\src\scenegraph\dom_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c" />
-    <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c" />
+    <ClCompile Include="..\..\src\scenegraph\dom_js.c" />
     <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c" />
     <ClCompile Include="..\..\src\scenegraph\mpeg4_nodes.c" />
     <ClCompile Include="..\..\src\scenegraph\mpeg4_valuator.c" />
     <ClCompile Include="..\..\src\scenegraph\smil_anim.c" />
     <ClCompile Include="..\..\src\scenegraph\smil_timing.c" />
     <ClCompile Include="..\..\src\scenegraph\svg_attributes.c" />
+    <ClCompile Include="..\..\src\scenegraph\svg_js.c" />
     <ClCompile Include="..\..\src\scenegraph\svg_properties.c" />
-    <ClCompile Include="..\..\src\scenegraph\svg_smjs.c" />
     <ClCompile Include="..\..\src\scenegraph\svg_types.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_interpolators.c" />
+    <ClCompile Include="..\..\src\scenegraph\vrml_js.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_proto.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_route.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_script.c" />
-    <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_tools.c" />
-    <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c" />
     <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c" />
-    <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
     <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
     <ClCompile Include="..\..\src\scene_manager\encode_isom.c" />
     <ClCompile Include="..\..\src\scene_manager\loader_bt.c" />
@@ -356,34 +531,20 @@
     <ClCompile Include="..\..\src\scene_manager\swf_parse.c" />
     <ClCompile Include="..\..\src\scene_manager\swf_svg.c" />
     <ClCompile Include="..\..\src\scene_manager\text_to_bifs.c" />
-    <ClCompile Include="..\..\src\terminal\channel.c" />
-    <ClCompile Include="..\..\src\terminal\clock.c" />
-    <ClCompile Include="..\..\src\terminal\decoder.c" />
-    <ClCompile Include="..\..\src\terminal\input_sensor.c" />
-    <ClCompile Include="..\..\src\terminal\media_control.c" />
-    <ClCompile Include="..\..\src\terminal\media_manager.c" />
-    <ClCompile Include="..\..\src\terminal\media_memory.c" />
-    <ClCompile Include="..\..\src\terminal\media_object.c" />
-    <ClCompile Include="..\..\src\terminal\media_sensor.c" />
-    <ClCompile Include="..\..\src\terminal\mpeg4_inline.c" />
-    <ClCompile Include="..\..\src\terminal\network_service.c" />
-    <ClCompile Include="..\..\src\terminal\object_browser.c" />
-    <ClCompile Include="..\..\src\terminal\object_manager.c" />
-    <ClCompile Include="..\..\src\terminal\scene.c" />
-    <ClCompile Include="..\..\src\terminal\svg_external.c" />
     <ClCompile Include="..\..\src\terminal\terminal.c" />
-    <ClCompile Include="..\..\src\terminal\term_node_init.c" />
     <ClCompile Include="..\..\src\utils\alloc.c" />
     <ClCompile Include="..\..\src\utils\base_encoding.c" />
     <ClCompile Include="..\..\src\utils\bitstream.c" />
     <ClCompile Include="..\..\src\utils\cache.c" />
     <ClCompile Include="..\..\src\utils\color.c" />
     <ClCompile Include="..\..\src\utils\configfile.c" />
+    <ClCompile Include="..\..\src\utils\constants.c" />
     <ClCompile Include="..\..\src\utils\dlmalloc.c" />
     <ClCompile Include="..\..\src\utils\downloader.c" />
     <ClCompile Include="..\..\src\utils\error.c" />
+    <ClCompile Include="..\..\src\utils\gltools.c" />
+    <ClCompile Include="..\..\src\utils\gzio.c" />
     <ClCompile Include="..\..\src\utils\list.c" />
-    <ClCompile Include="..\..\src\utils\map.c" />
     <ClCompile Include="..\..\src\utils\math.c" />
     <ClCompile Include="..\..\src\utils\module.c" />
     <ClCompile Include="..\..\src\utils\os_config_init.c" />
@@ -394,7 +555,7 @@
     <ClCompile Include="..\..\src\utils\os_thread.c" />
     <ClCompile Include="..\..\src\utils\path2d.c" />
     <ClCompile Include="..\..\src\utils\path2d_stroker.c" />
-    <ClCompile Include="..\..\src\utils\ringbuffer.c" />
+    <ClCompile Include="..\..\src\utils\Remotery.c" />
     <ClCompile Include="..\..\src\utils\sha1.c" />
     <ClCompile Include="..\..\src\utils\token.c" />
     <ClCompile Include="..\..\src\utils\unicode.c" />
@@ -403,10 +564,12 @@
     <ClCompile Include="..\..\src\utils\utf.c" />
     <ClCompile Include="..\..\src\utils\xml_parser.c" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\filters\dec_vtb_glctx.m" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{233014D5-F6E5-419D-8757-FA9CE7337088}</ProjectGuid>
     <RootNamespace>libgpac</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -419,7 +582,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -443,7 +606,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -511,27 +674,11 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">libgpac_static</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac_static</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release - MP4Box_only|x64'">libgpac_static</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug - MP4Box_only|x64'">$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-    <IncludePath>$(IncludePath)</IncludePath>
-    <CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(IncludePath)</IncludePath>
-    <LibraryPath>$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <PreBuildEvent>
       <Command>"$(ProjectDir)..\..\version.bat"</Command>
@@ -540,7 +687,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -555,6 +702,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -578,7 +726,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -593,6 +741,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -616,7 +765,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -631,8 +780,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
-      <OmitFramePointers>false</OmitFramePointers>
-      <EnablePREfast>false</EnablePREfast>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -657,7 +805,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -672,6 +820,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -696,7 +845,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -708,6 +857,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -730,7 +880,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>GPAC_MP4BOX_MINI;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -742,6 +892,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -750,6 +901,7 @@
     <Lib>
       <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -764,7 +916,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -776,6 +928,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -799,7 +952,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/openjpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <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>
@@ -811,6 +964,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -820,6 +974,7 @@
       <OutputFile>../../bin/$(Platform)/$(Configuration)/libgpac_static.lib</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetMachine>MachineX64</TargetMachine>
+      <AdditionalOptions> /ignore:4221 %(AdditionalOptions)</AdditionalOptions>
     </Lib>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -829,4 +984,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

gpac-0.8.0.tar.gz/build/msvc14/libgpac.vcxproj.filters -> gpac-1.0.0.tar.gz/build/msvc14/libgpac.vcxproj.filters Changed

@@ -49,6 +49,24 @@
     <Filter Include="include\modules">
       <UniqueIdentifier>{d451e478-a766-4a33-a371-db9e1292017f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="filter_core">
+      <UniqueIdentifier>{e0d29c23-f961-46c4-a4d5-c7939a0d43b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="filters">
+      <UniqueIdentifier>{36bd8e9d-a6d6-4212-8659-33f6692fccaf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="filters\nvdec">
+      <UniqueIdentifier>{31cfbb94-a9c2-4ef2-b571-3f6887127e5b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="evg">
+      <UniqueIdentifier>{46167f3c-694d-4be9-b8cc-8578e73200cb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="quickjs">
+      <UniqueIdentifier>{755b6b4e-b649-42c3-83f8-1ef8ed0e570e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="jsmods">
+      <UniqueIdentifier>{80294c55-c59a-47aa-8e77-0c43e6a1e7c1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\win32\inttypes.h">
@@ -192,15 +210,6 @@
     <ClInclude Include="..\..\src\media_tools\mpeg2_ps.h">
       <Filter>media_tools</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\terminal\input_sensor.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\terminal\media_control.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\terminal\media_memory.h">
-      <Filter>terminal</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\utils\module_wrap.h">
       <Filter>utils</Filter>
     </ClInclude>
@@ -264,21 +273,9 @@
     <ClInclude Include="..\..\include\gpac\events_constants.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\gpac\filestreamer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\html5_media.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\gpac\html5_mse.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\gpac\ietf.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ismacryp.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\gpac\iso639.h">
       <Filter>include</Filter>
     </ClInclude>
@@ -324,9 +321,6 @@
     <ClInclude Include="..\..\include\gpac\nodes_x3d.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\gpac\nodes_xbl.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\gpac\options.h">
       <Filter>include</Filter>
     </ClInclude>
@@ -336,9 +330,6 @@
     <ClInclude Include="..\..\include\gpac\revision.h">
       <Filter>include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\gpac\ringbuffer.h">
-      <Filter>include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\gpac\rtp_streamer.h">
       <Filter>include</Filter>
     </ClInclude>
@@ -396,9 +387,60 @@
     <ClInclude Include="..\..\include\gpac\webvtt.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\filter_core\filter_session.h">
+      <Filter>filter_core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filters\ff_common.h">
+      <Filter>filters</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filters\in_rtp.h">
+      <Filter>filters</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filters\isoffin.h">
+      <Filter>filters</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\gpac\atsc.h">
       <Filter>include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\gpac\crypt_tools.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filters\dec_nvdec_sdk.h">
+      <Filter>filters\nvdec</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\gpac\Remotery.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\cutils.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\libregexp.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\libregexp-opcode.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\libunicode.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\libunicode-table.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\list.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\quickjs.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\quickjs-atom.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\quickjs\quickjs-opcode.h">
+      <Filter>quickjs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\scenegraph\qjs_common.h">
+      <Filter>scenegraph</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\bifs\arith_decoder.c">
@@ -785,24 +827,12 @@
     <ClCompile Include="..\..\src\media_tools\dvb_mpe.c">
       <Filter>media_tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\filestreamer.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\media_tools\gpac_ogg.c">
       <Filter>media_tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\html5_media.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\html5_mse.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\media_tools\img.c">
       <Filter>media_tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\ismacryp.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\media_tools\isom_hinter.c">
       <Filter>media_tools</Filter>
     </ClCompile>
@@ -836,9 +866,6 @@
     <ClCompile Include="..\..\src\media_tools\saf.c">
       <Filter>media_tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\media_tools\text_import.c">
-      <Filter>media_tools</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\media_tools\vobsub.c">
       <Filter>media_tools</Filter>
     </ClCompile>
@@ -935,15 +962,6 @@
     <ClCompile Include="..\..\src\scenegraph\dom_events.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\dom_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\html5_media_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\html5_mse_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\scenegraph\mpeg4_animators.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
@@ -965,9 +983,6 @@
     <ClCompile Include="..\..\src\scenegraph\svg_properties.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\svg_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\scenegraph\svg_types.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
@@ -983,69 +998,15 @@
     <ClCompile Include="..\..\src\scenegraph\vrml_script.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\scenegraph\vrml_tools.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\xbl_process.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\scenegraph\xml_ns.c">
       <Filter>scenegraph</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\terminal\channel.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\clock.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\decoder.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\input_sensor.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_control.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_manager.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_memory.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_object.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\media_sensor.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\mpeg4_inline.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\network_service.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_browser.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\object_manager.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\scene.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\svg_external.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\terminal\term_node_init.c">
-      <Filter>terminal</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\terminal\terminal.c">
       <Filter>terminal</Filter>
     </ClCompile>
@@ -1079,9 +1040,6 @@
     <ClCompile Include="..\..\src\utils\list.c">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\utils\map.c">
-      <Filter>utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\utils\math.c">
       <Filter>utils</Filter>
     </ClCompile>
@@ -1109,9 +1067,6 @@
     <ClCompile Include="..\..\src\utils\path2d_stroker.c">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\utils\ringbuffer.c">
-      <Filter>utils</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\utils\sha1.c">
       <Filter>utils</Filter>
     </ClCompile>
@@ -1133,20 +1088,481 @@
     <ClCompile Include="..\..\src\utils\xml_parser.c">
       <Filter>utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c">
-      <Filter>scenegraph</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\isomedia\ttml.c">
-      <Filter>isomedia</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\utils\os_file.c">
       <Filter>utils</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\utils\gzio.c">
+      <Filter>utils</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\isomedia\iff.c">
       <Filter>isomedia</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\media_tools\atsc_dmx.c">
       <Filter>media_tools</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\compositor\clock.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\media_object.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\mpeg4_inline.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\mpeg4_inputsensor.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\mpeg4_mediacontrol.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\mpeg4_mediasensor.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\object_manager.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\scene.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\scene_node_init.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\scene_ns.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\compositor\svg_external.c">
+      <Filter>compositor</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\utils\constants.c">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_pck.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_pid.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_props.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_queue.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_register.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filter_core\filter_session.c">
+      <Filter>filter_core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\compose.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_ac52.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_bifs.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_faad.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_img.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_j2k.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_laser.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_mad.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_odf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_openhevc.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_opensvc.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_theora.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_ttml.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_ttxt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_vorbis.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_vtb.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_webvtt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_xvid.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\decrypt_cenc_isma.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_avi.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_dash.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_m2ts.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_mpegps.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_nhml.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_nhnt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_ogg.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_saf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_vobsub.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\enc_jpg.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\enc_png.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_common.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_dec.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_dmx.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_enc.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_rescale.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\filelist.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_dvb4linux.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_file.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_http.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_rtp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_rtp_rtsp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_rtp_sdp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_rtp_signaling.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_rtp_stream.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\inspect.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\isoffin_load.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\isoffin_read.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\isoffin_read_ch.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\load_bt_xmt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\load_svg.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\load_text.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\mux_avi.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\mux_isom.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_audio.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_file.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_http.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_video.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_ac3.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_adts.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_amr.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_h263.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_img.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_mp3.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_mpgvid.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_nalu.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_qcp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_rawpcm.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_rawvid.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\rewind.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\rewrite_adts.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\rewrite_mp4v.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\rewrite_nalu.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\unit_test_filter.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\vcrop.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\write_generic.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\write_nhml.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\write_nhnt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\write_qcp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\write_vtt.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dasher.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\bsrw.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dmx_gsf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_pipe.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_sock.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\mux_gsf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\mux_ts.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_pipe.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_sock.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_av1.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\rewrite_obu.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\tileagg.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\encrypt_cenc_isma.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\media_tools\crypt_tools.c">
+      <Filter>media_tools</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_nvdec.c">
+      <Filter>filters\nvdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_nvdec_sdk.c">
+      <Filter>filters\nvdec</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\utils\Remotery.c">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\in_atsc.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\ftgrays.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_rtp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\raster_565.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\raster_argb.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\raster_rgb.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\raster_yuv.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_latm.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\stencil.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\surface.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\vflip.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\cutils.c">
+      <Filter>quickjs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\libbf.c">
+      <Filter>quickjs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\libregexp.c">
+      <Filter>quickjs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\libunicode.c">
+      <Filter>quickjs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\quickjs\quickjs.c">
+      <Filter>quickjs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\scene_js.c">
+      <Filter>jsmods</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\xhr.c">
+      <Filter>jsmods</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scenegraph\dom_js.c">
+      <Filter>scenegraph</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scenegraph\svg_js.c">
+      <Filter>scenegraph</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\scenegraph\vrml_js.c">
+      <Filter>scenegraph</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_flac.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\hevcmerge.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\hevcsplit.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\out_rtsp.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\jsfilter.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\evg.c">
+      <Filter>jsmods</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\storage.c">
+      <Filter>jsmods</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jsmods\webgl.c">
+      <Filter>jsmods</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\utils\gltools.c">
+      <Filter>utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_mx.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\ff_avf.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\evg\raster3d.c">
+      <Filter>evg</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\reframe_prores.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\tssplit.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\filters\dec_mediacodec.c">
+      <Filter>filters</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\filters\dec_vtb_glctx.m">
+      <Filter>filters</Filter>
+    </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

gpac-0.8.0.tar.gz/build/msvc14/libgpac_dll.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/libgpac_dll.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/mp4box.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/mp4box.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/mp4client.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/mp4client.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/sdl_out.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/sdl_out.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/validator.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/validator.vcxproj Changed

gpac-0.8.0.tar.gz/build/msvc14/wav_out.vcxproj -> gpac-1.0.0.tar.gz/build/msvc14/wav_out.vcxproj Changed

gpac-0.8.0.tar.gz/build/symbian/sis/osmo4_gcce.pkg -> gpac-1.0.0.tar.gz/build/symbian/sis/osmo4_gcce.pkg Changed

gpac-0.8.0.tar.gz/build/symbian/sis/osmo4_thumb.pkg -> gpac-1.0.0.tar.gz/build/symbian/sis/osmo4_thumb.pkg Changed

gpac-0.8.0.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-1.0.0.tar.gz/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -7,32 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		2839E2821A162C48002D73E1 /* opensvc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */; };
-		2839E2831A162CC9002D73E1 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		2839E2B21A16363E002D73E1 /* audio_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2921A16363E002D73E1 /* audio_data.c */; };
-		2839E2B31A16363E002D73E1 /* audio_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2941A16363E002D73E1 /* audio_decoder.c */; };
-		2839E2B41A16363E002D73E1 /* audio_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2961A16363E002D73E1 /* audio_encoder.c */; };
-		2839E2B51A16363E002D73E1 /* audio_muxer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2981A16363E002D73E1 /* audio_muxer.c */; };
-		2839E2B61A16363E002D73E1 /* circular_buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29A1A16363E002D73E1 /* circular_buffer.c */; };
-		2839E2B71A16363E002D73E1 /* cmd_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29C1A16363E002D73E1 /* cmd_data.c */; };
-		2839E2B81A16363E002D73E1 /* controler.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E29E1A16363E002D73E1 /* controler.c */; };
-		2839E2B91A16363E002D73E1 /* dashcast.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A01A16363E002D73E1 /* dashcast.c */; };
-		2839E2BA1A16363E002D73E1 /* message_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A21A16363E002D73E1 /* message_queue.c */; };
-		2839E2BB1A16363E002D73E1 /* register.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A41A16363E002D73E1 /* register.c */; };
-		2839E2BC1A16363E002D73E1 /* task.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A61A16363E002D73E1 /* task.c */; };
-		2839E2BD1A16363E002D73E1 /* video_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2A81A16363E002D73E1 /* video_data.c */; };
-		2839E2BE1A16363E002D73E1 /* video_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AA1A16363E002D73E1 /* video_decoder.c */; };
-		2839E2BF1A16363E002D73E1 /* video_encoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AC1A16363E002D73E1 /* video_encoder.c */; };
-		2839E2C01A16363E002D73E1 /* video_muxer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2AE1A16363E002D73E1 /* video_muxer.c */; };
-		2839E2C11A16363E002D73E1 /* video_scaler.c in Sources */ = {isa = PBXBuildFile; fileRef = 2839E2B01A16363E002D73E1 /* video_scaler.c */; };
-		2839E2C21A1636A7002D73E1 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		2839E2C31A163700002D73E1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA641A15240800372C59 /* AVFoundation.framework */; };
-		2839E2C51A163712002D73E1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2C41A163711002D73E1 /* CoreMedia.framework */; };
-		2839E2CB1A16375C002D73E1 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2CA1A16375C002D73E1 /* QTKit.framework */; };
-		2839E2CD1A163E1E002D73E1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2CC1A163E1E002D73E1 /* Foundation.framework */; };
-		28C5AA651A15240800372C59 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA641A15240800372C59 /* AVFoundation.framework */; };
-		28C5AA671A152BB700372C59 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA661A152BB700372C59 /* CoreFoundation.framework */; };
-		28C5AA691A152BC400372C59 /* VideoDecodeAcceleration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA681A152BC400372C59 /* VideoDecodeAcceleration.framework */; };
 		28C5AA801A16277200372C59 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA741A15FF0000372C59 /* Carbon.framework */; };
 		920100B018D5A444003D1ACA /* arith_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8A18D5A444003D1ACA /* arith_decoder.c */; };
 		920100B118D5A444003D1ACA /* bifs_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8B18D5A444003D1ACA /* bifs_codec.c */; };
@@ -50,76 +24,6 @@
 		920100BD18D5A444003D1ACA /* script_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9718D5A444003D1ACA /* script_dec.c */; };
 		920100BE18D5A444003D1ACA /* script_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9818D5A444003D1ACA /* script_enc.c */; };
 		920100BF18D5A444003D1ACA /* unquantize.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9918D5A444003D1ACA /* unquantize.c */; };
-		920100C018D5A444003D1ACA /* audio_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9B18D5A444003D1ACA /* audio_input.c */; };
-		920100C118D5A444003D1ACA /* audio_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9C18D5A444003D1ACA /* audio_mixer.c */; };
-		920100C218D5A444003D1ACA /* audio_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9D18D5A444003D1ACA /* audio_render.c */; };
-		920100C318D5A444003D1ACA /* bindable.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9E18D5A444003D1ACA /* bindable.c */; };
-		920100C418D5A444003D1ACA /* camera.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9F18D5A444003D1ACA /* camera.c */; };
-		920100C518D5A444003D1ACA /* compositor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA018D5A444003D1ACA /* compositor.c */; };
-		920100C618D5A444003D1ACA /* compositor_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA118D5A444003D1ACA /* compositor_2d.c */; };
-		920100C718D5A444003D1ACA /* compositor_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA218D5A444003D1ACA /* compositor_3d.c */; };
-		920100C818D5A444003D1ACA /* compositor_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA318D5A444003D1ACA /* compositor_node_init.c */; };
-		920100C918D5A444003D1ACA /* drawable.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA418D5A444003D1ACA /* drawable.c */; };
-		920100CA18D5A444003D1ACA /* drawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFA518D5A444003D1ACA /* drawable.h */; };
-		920100CB18D5A444003D1ACA /* events.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA618D5A444003D1ACA /* events.c */; };
-		920100CC18D5A444003D1ACA /* font_engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA718D5A444003D1ACA /* font_engine.c */; };
-		920100CD18D5A444003D1ACA /* gl_inc.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFA818D5A444003D1ACA /* gl_inc.h */; };
-		920100CE18D5A444003D1ACA /* hardcoded_protos.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA918D5A444003D1ACA /* hardcoded_protos.c */; };
-		920100CF18D5A444003D1ACA /* hc_flash_shape.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */; };
-		920100D018D5A444003D1ACA /* mesh.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAB18D5A444003D1ACA /* mesh.c */; };
-		920100D118D5A444003D1ACA /* mesh_collide.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAC18D5A444003D1ACA /* mesh_collide.c */; };
-		920100D218D5A444003D1ACA /* mesh_tesselate.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */; };
-		920100D318D5A444003D1ACA /* mpeg4_animstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */; };
-		920100D418D5A444003D1ACA /* mpeg4_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */; };
-		920100D518D5A444003D1ACA /* mpeg4_background.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB018D5A444003D1ACA /* mpeg4_background.c */; };
-		920100D618D5A444003D1ACA /* mpeg4_background2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */; };
-		920100D718D5A444003D1ACA /* mpeg4_bitmap.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */; };
-		920100D818D5A444003D1ACA /* mpeg4_composite.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB318D5A444003D1ACA /* mpeg4_composite.c */; };
-		920100D918D5A444003D1ACA /* mpeg4_form.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB418D5A444003D1ACA /* mpeg4_form.c */; };
-		920100DA18D5A444003D1ACA /* mpeg4_geometry_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */; };
-		920100DB18D5A444003D1ACA /* mpeg4_geometry_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */; };
-		920100DC18D5A444003D1ACA /* mpeg4_geometry_ifs2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */; };
-		920100DD18D5A444003D1ACA /* mpeg4_geometry_ils2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */; };
-		920100DE18D5A444003D1ACA /* mpeg4_gradients.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */; };
-		920100DF18D5A444003D1ACA /* mpeg4_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */; };
-		920100E018D5A444003D1ACA /* mpeg4_grouping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */; };
-		920100E118D5A444003D1ACA /* mpeg4_grouping_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */; };
-		920100E218D5A444003D1ACA /* mpeg4_grouping_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */; };
-		920100E318D5A444003D1ACA /* mpeg4_layer_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */; };
-		920100E418D5A444003D1ACA /* mpeg4_layer_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */; };
-		920100E518D5A444003D1ACA /* mpeg4_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC018D5A444003D1ACA /* mpeg4_layout.c */; };
-		920100E618D5A444003D1ACA /* mpeg4_lighting.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */; };
-		920100E718D5A444003D1ACA /* mpeg4_path_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */; };
-		920100E818D5A444003D1ACA /* mpeg4_sensors.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */; };
-		920100E918D5A444003D1ACA /* mpeg4_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC418D5A444003D1ACA /* mpeg4_sound.c */; };
-		920100EA18D5A444003D1ACA /* mpeg4_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC518D5A444003D1ACA /* mpeg4_text.c */; };
-		920100EB18D5A444003D1ACA /* mpeg4_textures.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC618D5A444003D1ACA /* mpeg4_textures.c */; };
-		920100EC18D5A444003D1ACA /* mpeg4_timesensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */; };
-		920100ED18D5A444003D1ACA /* mpeg4_viewport.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */; };
-		920100EE18D5A444003D1ACA /* navigate.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC918D5A444003D1ACA /* navigate.c */; };
-		920100EF18D5A444003D1ACA /* nodes_stacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFCA18D5A444003D1ACA /* nodes_stacks.h */; };
-		920100F018D5A444003D1ACA /* offscreen_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCB18D5A444003D1ACA /* offscreen_cache.c */; };
-		920100F118D5A444003D1ACA /* offscreen_cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFCC18D5A444003D1ACA /* offscreen_cache.h */; };
-		920100F218D5A444003D1ACA /* svg_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCD18D5A444003D1ACA /* svg_base.c */; };
-		920100F318D5A444003D1ACA /* svg_filters.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCE18D5A444003D1ACA /* svg_filters.c */; };
-		920100F418D5A444003D1ACA /* svg_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCF18D5A444003D1ACA /* svg_font.c */; };
-		920100F518D5A444003D1ACA /* svg_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD018D5A444003D1ACA /* svg_geometry.c */; };
-		920100F618D5A444003D1ACA /* svg_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD118D5A444003D1ACA /* svg_grouping.c */; };
-		920100F718D5A444003D1ACA /* svg_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD218D5A444003D1ACA /* svg_media.c */; };
-		920100F818D5A444003D1ACA /* svg_paint_servers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD318D5A444003D1ACA /* svg_paint_servers.c */; };
-		920100F918D5A444003D1ACA /* svg_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD418D5A444003D1ACA /* svg_text.c */; };
-		920100FA18D5A444003D1ACA /* texturing.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD518D5A444003D1ACA /* texturing.c */; };
-		920100FB18D5A444003D1ACA /* texturing.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFD618D5A444003D1ACA /* texturing.h */; };
-		920100FC18D5A444003D1ACA /* texturing_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD718D5A444003D1ACA /* texturing_gl.c */; };
-		920100FD18D5A444003D1ACA /* visual_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD818D5A444003D1ACA /* visual_manager.c */; };
-		920100FE18D5A444003D1ACA /* visual_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFD918D5A444003D1ACA /* visual_manager.h */; };
-		920100FF18D5A444003D1ACA /* visual_manager_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */; };
-		9201010018D5A444003D1ACA /* visual_manager_2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */; };
-		9201010118D5A444003D1ACA /* visual_manager_2d_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */; };
-		9201010218D5A444003D1ACA /* visual_manager_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */; };
-		9201010318D5A444003D1ACA /* visual_manager_3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */; };
-		9201010418D5A444003D1ACA /* visual_manager_3d_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */; };
-		9201010518D5A444003D1ACA /* x3d_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE018D5A444003D1ACA /* x3d_geometry.c */; };
 		9201010718D5A444003D1ACA /* rtcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE418D5A444003D1ACA /* rtcp.c */; };
 		9201010818D5A444003D1ACA /* rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE518D5A444003D1ACA /* rtp.c */; };
 		9201010918D5A444003D1ACA /* rtp_depacketizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE618D5A444003D1ACA /* rtp_depacketizer.c */; };
@@ -158,7 +62,6 @@
 		9201012B18D5A444003D1ACA /* stbl_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000918D5A444003D1ACA /* stbl_read.c */; };
 		9201012C18D5A444003D1ACA /* stbl_write.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000A18D5A444003D1ACA /* stbl_write.c */; };
 		9201012D18D5A444003D1ACA /* track.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000B18D5A444003D1ACA /* track.c */; };
-		9201012E18D5A444003D1ACA /* ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000C18D5A444003D1ACA /* ttml.c */; };
 		9201012F18D5A444003D1ACA /* tx3g.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000D18D5A444003D1ACA /* tx3g.c */; };
 		9201013018D5A444003D1ACA /* lsr_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000F18D5A444003D1ACA /* lsr_dec.c */; };
 		9201013118D5A444003D1ACA /* lsr_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001018D5A444003D1ACA /* lsr_enc.c */; };
@@ -170,12 +73,8 @@
 		9201014618D5A445003D1ACA /* dash_segmenter.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002818D5A444003D1ACA /* dash_segmenter.c */; };
 		9201014718D5A445003D1ACA /* dsmcc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002918D5A444003D1ACA /* dsmcc.c */; };
 		9201014818D5A445003D1ACA /* dvb_mpe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002A18D5A444003D1ACA /* dvb_mpe.c */; };
-		9201014918D5A445003D1ACA /* filestreamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002B18D5A444003D1ACA /* filestreamer.c */; };
 		9201014A18D5A445003D1ACA /* gpac_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002C18D5A444003D1ACA /* gpac_ogg.c */; };
-		9201014B18D5A445003D1ACA /* html5_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002D18D5A444003D1ACA /* html5_media.c */; };
-		9201014C18D5A445003D1ACA /* html5_mse.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002E18D5A444003D1ACA /* html5_mse.c */; };
 		9201014D18D5A445003D1ACA /* img.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002F18D5A444003D1ACA /* img.c */; };
-		9201014E18D5A445003D1ACA /* ismacryp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003018D5A444003D1ACA /* ismacryp.c */; };
 		9201014F18D5A445003D1ACA /* isom_hinter.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003118D5A444003D1ACA /* isom_hinter.c */; };
 		9201015018D5A445003D1ACA /* isom_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003218D5A444003D1ACA /* isom_tools.c */; };
 		9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003318D5A444003D1ACA /* m2ts_mux.c */; };
@@ -188,7 +87,6 @@
 		9201015818D5A445003D1ACA /* mpegts.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003A18D5A444003D1ACA /* mpegts.c */; };
 		9201015918D5A445003D1ACA /* reedsolomon.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003B18D5A444003D1ACA /* reedsolomon.c */; };
 		9201015A18D5A445003D1ACA /* saf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003C18D5A444003D1ACA /* saf.c */; };
-		9201015B18D5A445003D1ACA /* text_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003D18D5A444003D1ACA /* text_import.c */; };
 		9201015C18D5A445003D1ACA /* vobsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003E18D5A444003D1ACA /* vobsub.c */; };
 		9201015D18D5A445003D1ACA /* webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003F18D5A444003D1ACA /* webvtt.c */; };
 		9201015E18D5A445003D1ACA /* desc_private.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004118D5A444003D1ACA /* desc_private.c */; };
@@ -221,9 +119,6 @@
 		9201017918D5A445003D1ACA /* base_scenegraph.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005E18D5A444003D1ACA /* base_scenegraph.c */; };
 		9201017A18D5A445003D1ACA /* commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005F18D5A444003D1ACA /* commands.c */; };
 		9201017B18D5A445003D1ACA /* dom_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006018D5A444003D1ACA /* dom_events.c */; };
-		9201017C18D5A445003D1ACA /* dom_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006118D5A444003D1ACA /* dom_smjs.c */; };
-		9201017D18D5A445003D1ACA /* html5_media_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006218D5A444003D1ACA /* html5_media_smjs.c */; };
-		9201017E18D5A445003D1ACA /* html5_mse_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006318D5A444003D1ACA /* html5_mse_smjs.c */; };
 		9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006418D5A444003D1ACA /* mpeg4_animators.c */; };
 		9201018018D5A445003D1ACA /* mpeg4_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006518D5A444003D1ACA /* mpeg4_nodes.c */; };
 		9201018118D5A445003D1ACA /* mpeg4_valuator.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006618D5A444003D1ACA /* mpeg4_valuator.c */; };
@@ -231,38 +126,14 @@
 		9201018318D5A445003D1ACA /* smil_timing.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006818D5A444003D1ACA /* smil_timing.c */; };
 		9201018418D5A445003D1ACA /* svg_attributes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006918D5A444003D1ACA /* svg_attributes.c */; };
 		9201018518D5A445003D1ACA /* svg_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006A18D5A444003D1ACA /* svg_properties.c */; };
-		9201018618D5A445003D1ACA /* svg_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006B18D5A444003D1ACA /* svg_smjs.c */; };
 		9201018718D5A445003D1ACA /* svg_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006C18D5A444003D1ACA /* svg_types.c */; };
 		9201018818D5A445003D1ACA /* vrml_interpolators.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006D18D5A444003D1ACA /* vrml_interpolators.c */; };
 		9201018918D5A445003D1ACA /* vrml_proto.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006E18D5A444003D1ACA /* vrml_proto.c */; };
 		9201018A18D5A445003D1ACA /* vrml_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006F18D5A444003D1ACA /* vrml_route.c */; };
 		9201018B18D5A445003D1ACA /* vrml_script.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007018D5A444003D1ACA /* vrml_script.c */; };
-		9201018C18D5A445003D1ACA /* vrml_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007118D5A444003D1ACA /* vrml_smjs.c */; };
 		9201018D18D5A445003D1ACA /* vrml_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007218D5A444003D1ACA /* vrml_tools.c */; };
-		9201018E18D5A445003D1ACA /* webvtt_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007318D5A444003D1ACA /* webvtt_smjs.c */; };
 		9201018F18D5A445003D1ACA /* x3d_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007418D5A444003D1ACA /* x3d_nodes.c */; };
-		9201019018D5A445003D1ACA /* xbl_process.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007518D5A444003D1ACA /* xbl_process.c */; };
 		9201019118D5A445003D1ACA /* xml_ns.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007618D5A444003D1ACA /* xml_ns.c */; };
-		9201019218D5A445003D1ACA /* channel.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007818D5A444003D1ACA /* channel.c */; };
-		9201019318D5A445003D1ACA /* clock.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007918D5A444003D1ACA /* clock.c */; };
-		9201019418D5A445003D1ACA /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007A18D5A444003D1ACA /* decoder.c */; };
-		9201019518D5A445003D1ACA /* input_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007B18D5A444003D1ACA /* input_sensor.c */; };
-		9201019618D5A445003D1ACA /* input_sensor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201007C18D5A444003D1ACA /* input_sensor.h */; };
-		9201019718D5A445003D1ACA /* media_control.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007D18D5A444003D1ACA /* media_control.c */; };
-		9201019818D5A445003D1ACA /* media_control.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201007E18D5A444003D1ACA /* media_control.h */; };
-		9201019918D5A445003D1ACA /* media_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007F18D5A444003D1ACA /* media_manager.c */; };
-		9201019A18D5A445003D1ACA /* media_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008018D5A444003D1ACA /* media_memory.c */; };
-		9201019B18D5A445003D1ACA /* media_memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201008118D5A444003D1ACA /* media_memory.h */; };
-		9201019C18D5A445003D1ACA /* media_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008218D5A444003D1ACA /* media_object.c */; };
-		9201019D18D5A445003D1ACA /* media_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008318D5A444003D1ACA /* media_sensor.c */; };
-		9201019E18D5A445003D1ACA /* mpeg4_inline.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008418D5A444003D1ACA /* mpeg4_inline.c */; };
-		9201019F18D5A445003D1ACA /* network_service.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008518D5A444003D1ACA /* network_service.c */; };
-		920101A018D5A445003D1ACA /* object_browser.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008618D5A444003D1ACA /* object_browser.c */; };
-		920101A118D5A445003D1ACA /* object_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008718D5A444003D1ACA /* object_manager.c */; };
-		920101A218D5A445003D1ACA /* scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008818D5A444003D1ACA /* scene.c */; };
-		920101A318D5A445003D1ACA /* svg_external.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008918D5A444003D1ACA /* svg_external.c */; };
-		920101A418D5A445003D1ACA /* term_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008A18D5A444003D1ACA /* term_node_init.c */; };
-		920101A518D5A445003D1ACA /* terminal.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008B18D5A444003D1ACA /* terminal.c */; };
 		920101A618D5A445003D1ACA /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008D18D5A444003D1ACA /* alloc.c */; };
 		920101A718D5A445003D1ACA /* base_encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008E18D5A444003D1ACA /* base_encoding.c */; };
 		920101A818D5A445003D1ACA /* bitstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008F18D5A444003D1ACA /* bitstream.c */; };
@@ -272,7 +143,6 @@
 		920101AD18D5A445003D1ACA /* downloader.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009418D5A444003D1ACA /* downloader.c */; };
 		920101AE18D5A445003D1ACA /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009518D5A444003D1ACA /* error.c */; };
 		920101B018D5A445003D1ACA /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009718D5A444003D1ACA /* list.c */; };
-		920101B118D5A445003D1ACA /* map.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009818D5A444003D1ACA /* map.c */; };
 		920101B218D5A445003D1ACA /* math.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009918D5A444003D1ACA /* math.c */; };
 		920101B318D5A445003D1ACA /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009A18D5A444003D1ACA /* module.c */; };
 		920101B418D5A445003D1ACA /* module_wrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201009B18D5A444003D1ACA /* module_wrap.h */; };
@@ -282,7 +152,6 @@
 		920101B918D5A445003D1ACA /* os_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A018D5A444003D1ACA /* os_thread.c */; };
 		920101BA18D5A445003D1ACA /* path2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A118D5A444003D1ACA /* path2d.c */; };
 		920101BB18D5A445003D1ACA /* path2d_stroker.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A218D5A444003D1ACA /* path2d_stroker.c */; };
-		920101BC18D5A445003D1ACA /* ringbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A318D5A444003D1ACA /* ringbuffer.c */; };
 		920101BD18D5A445003D1ACA /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A418D5A444003D1ACA /* sha1.c */; };
 		920101C018D5A445003D1ACA /* token.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A718D5A444003D1ACA /* token.c */; };
 		920101C118D5A445003D1ACA /* uni_bidi.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A818D5A444003D1ACA /* uni_bidi.c */; };
@@ -290,110 +159,240 @@
 		920101C318D5A445003D1ACA /* url.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AA18D5A444003D1ACA /* url.c */; };
 		920101C418D5A445003D1ACA /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AB18D5A444003D1ACA /* utf.c */; };
 		920101C518D5A445003D1ACA /* xml_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AC18D5A444003D1ACA /* xml_parser.c */; };
-		920101CF18D5AC67003D1ACA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 920101CE18D5AC67003D1ACA /* OpenGL.framework */; };
 		920101D118D5ACA7003D1ACA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 920101D018D5ACA7003D1ACA /* libz.dylib */; };
-		9225732F18D7269700D6FD98 /* ogg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732A18D7269700D6FD98 /* ogg_in.c */; };
-		9225733018D7269700D6FD98 /* ogg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 9225732B18D7269700D6FD98 /* ogg_in.h */; };
-		9225733118D7269700D6FD98 /* ogg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732C18D7269700D6FD98 /* ogg_load.c */; };
-		9225733218D7269700D6FD98 /* theora_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732D18D7269700D6FD98 /* theora_dec.c */; };
-		9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732E18D7269700D6FD98 /* vorbis_dec.c */; };
-		9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		9235E04B1CFECCD50051D8A1 /* vtb_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 9235E04A1CFECCD50051D8A1 /* vtb_decode.c */; };
+		9202FEB2204840FB000EE9B1 /* load_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85591F7BFB61009BC9C8 /* load_svg.c */; };
+		9202FEB32048411D000EE9B1 /* dec_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 926656C11F7D10F400299CC6 /* dec_vorbis.c */; };
+		9203644B20ECF67C0087883E /* dmx_gsf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9203644A20ECF67C0087883E /* dmx_gsf.c */; };
+		9203644D20EE0F190087883E /* in_sock.c in Sources */ = {isa = PBXBuildFile; fileRef = 9203644C20EE0F190087883E /* in_sock.c */; };
+		9203644F20EE12480087883E /* out_sock.c in Sources */ = {isa = PBXBuildFile; fileRef = 9203644E20EE12470087883E /* out_sock.c */; };
+		92061A851FE0484600B5C464 /* reframer.c in Sources */ = {isa = PBXBuildFile; fileRef = 92061A841FE0484500B5C464 /* reframer.c */; };
+		9206822C20EA41530041169F /* in_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206822B20EA41530041169F /* in_pipe.c */; };
+		9206822E20EA69680041169F /* out_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206822D20EA69680041169F /* out_pipe.c */; };
+		9206823420EA96AA0041169F /* mux_gsf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9206823320EA96AA0041169F /* mux_gsf.c */; };
+		9210D007237041C2007AFB48 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210D006237041C2007AFB48 /* ftgrays.c */; };
+		9212C0FB222D7AC000FE3580 /* vflip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212C0FA222D7AC000FE3580 /* vflip.c */; };
+		92256CCD20E0DA26004EB243 /* encrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */; };
+		9225DD752326790C00F94C42 /* mpd.h in Headers */ = {isa = PBXBuildFile; fileRef = 9225DD742326790C00F94C42 /* mpd.h */; };
+		92261A87239A6E4600C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A86239A6E4600C14199 /* out_http.c */; };
+		922B27722445D5CE001D4F72 /* dec_ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 922B27712445D5CE001D4F72 /* dec_ttml.c */; };
+		922CF1251FCEE5D600F2F6A4 /* dmx_mpegps.c in Sources */ = {isa = PBXBuildFile; fileRef = 922CF1241FCEE5D600F2F6A4 /* dmx_mpegps.c */; };
+		922CF1271FCF169900F2F6A4 /* dmx_avi.c in Sources */ = {isa = PBXBuildFile; fileRef = 922CF1261FCF169900F2F6A4 /* dmx_avi.c */; };
+		922E29832051940C00C8DCBB /* mux_avi.c in Sources */ = {isa = PBXBuildFile; fileRef = 922E29812051940C00C8DCBB /* mux_avi.c */; };
+		922E29842051940C00C8DCBB /* out_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 922E29822051940C00C8DCBB /* out_audio.c */; };
+		9231B3AF2321533F00ADB4A9 /* Remotery.h in Headers */ = {isa = PBXBuildFile; fileRef = 9231B3AE2321533F00ADB4A9 /* Remotery.h */; };
+		92334CA92333A8C900DA6051 /* libunicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334C932333A8C800DA6051 /* libunicode.c */; };
+		92334CB82333A8C900DA6051 /* quickjs.h in Headers */ = {isa = PBXBuildFile; fileRef = 92334CA22333A8C900DA6051 /* quickjs.h */; };
+		92334CBA2333A8C900DA6051 /* quickjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CA42333A8C900DA6051 /* quickjs.c */; };
+		92334CE12333AF0400DA6051 /* jsfilter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CE02333AF0400DA6051 /* jsfilter.c */; };
+		9234CF391FD6A6E400CCDFA1 /* dec_ttxt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF381FD6A6E400CCDFA1 /* dec_ttxt.c */; };
+		9234CF3D1FD7E00700CCDFA1 /* filter_register.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF3C1FD7E00700CCDFA1 /* filter_register.c */; };
+		9234CF3F1FD8311400CCDFA1 /* dec_webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF3E1FD8311400CCDFA1 /* dec_webvtt.c */; };
+		9234CF461FD8344000CCDFA1 /* in_rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF401FD8343F00CCDFA1 /* in_rtp_stream.c */; };
+		9234CF471FD8344000CCDFA1 /* in_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF411FD8343F00CCDFA1 /* in_rtp.c */; };
+		9234CF481FD8344000CCDFA1 /* in_rtp_sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF421FD8344000CCDFA1 /* in_rtp_sdp.c */; };
+		9234CF491FD8344000CCDFA1 /* in_rtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 9234CF431FD8344000CCDFA1 /* in_rtp.h */; };
+		9234CF4A1FD8344000CCDFA1 /* in_rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF441FD8344000CCDFA1 /* in_rtp_signaling.c */; };
+		9234CF4B1FD8344000CCDFA1 /* in_rtp_rtsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9234CF451FD8344000CCDFA1 /* in_rtp_rtsp.c */; };
 		9235E04E1CFECD300051D8A1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2C41A163711002D73E1 /* CoreMedia.framework */; };
 		9235E0501CFECD370051D8A1 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E04F1CFECD370051D8A1 /* CoreVideo.framework */; };
 		9235E0521CFECD450051D8A1 /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E0511CFECD450051D8A1 /* VideoToolbox.framework */; };
 		9235E0531CFECD520051D8A1 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA661A152BB700372C59 /* CoreFoundation.framework */; };
+		9239B8D6207369E5005F7264 /* enc_jpg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9239B8D5207369E5005F7264 /* enc_jpg.c */; };
+		9239B8D82073AFEF005F7264 /* enc_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 9239B8D72073AFEF005F7264 /* enc_png.c */; };
+		923C337D234794F2001CED08 /* evg.c in Sources */ = {isa = PBXBuildFile; fileRef = 923C337C234794F2001CED08 /* evg.c */; };
+		923E89CB20B6F04600F299B2 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 923E89C620B6F04600F299B2 /* g_crypt_openssl.c */; };
+		923E89CC20B6F04600F299B2 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 923E89C720B6F04600F299B2 /* tiny_aes.h */; };
+		923E89CD20B6F04600F299B2 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 923E89C820B6F04600F299B2 /* g_crypt.c */; };
+		923E89CE20B6F04600F299B2 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 923E89C920B6F04600F299B2 /* tiny_aes.c */; };
+		923E89CF20B6F04600F299B2 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 923E89CA20B6F04600F299B2 /* g_crypt_tinyaes.c */; };
+		923E89D020B6F2D300F299B2 /* filter_props.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4721F71642E00616F7C /* filter_props.c */; };
+		923EB53223D1B78D00E1FFA1 /* libbf.c in Sources */ = {isa = PBXBuildFile; fileRef = 923EB53123D1B78D00E1FFA1 /* libbf.c */; };
+		92493D8020E2A64000203C2C /* crypt_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 92493D7F20E2A64000203C2C /* crypt_tools.c */; };
+		92493D8220E2A81700203C2C /* crypt_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92493D8120E2A81700203C2C /* crypt_tools.h */; };
+		924E805D206D357A00AB580F /* reframe_rawvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 924E805C206D357A00AB580F /* reframe_rawvid.c */; };
+		924E805F206D427A00AB580F /* reframe_rawpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 924E805E206D427A00AB580F /* reframe_rawpcm.c */; };
 		924FEE821BA6C63A003F77A6 /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 924FEE811BA6C63A003F77A6 /* iff.c */; };
-		92597E4D20B4805C000365B9 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4820B4805B000365B9 /* g_crypt_openssl.c */; };
-		92597E4E20B4805C000365B9 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 92597E4920B4805B000365B9 /* tiny_aes.h */; };
-		92597E4F20B4805C000365B9 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4A20B4805B000365B9 /* g_crypt.c */; };
-		92597E5020B4805C000365B9 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4B20B4805B000365B9 /* tiny_aes.c */; };
-		92597E5120B4805C000365B9 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92597E4C20B4805B000365B9 /* g_crypt_tinyaes.c */; };
-		92A7E9592003BA8F000C22DE /* VideoToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E0511CFECD450051D8A1 /* VideoToolbox.framework */; };
-		92A7E95A2003BA9B000C22DE /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2C41A163711002D73E1 /* CoreMedia.framework */; };
-		92A7E95B2003BAA3000C22DE /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9235E04F1CFECD370051D8A1 /* CoreVideo.framework */; };
-		92A7E95D2003BAAA000C22DE /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E95C2003BAAA000C22DE /* CoreServices.framework */; };
-		92A7E95F2003BACB000C22DE /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E95E2003BACB000C22DE /* AudioToolbox.framework */; };
-		92A7E9612003BAE8000C22DE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E9602003BAE8000C22DE /* Security.framework */; };
-		92A9D3C91CCA7AAA006FF303 /* amr_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92A9D3C61CCA79B4006FF303 /* amr_in.c */; };
+		9251CA8A1E9D3E960089DDC6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9251CA881E9D3E2B0089DDC6 /* main.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 */; };
+		925730822056A610009DB328 /* rewrite_mp4v.c in Sources */ = {isa = PBXBuildFile; fileRef = 925730812056A610009DB328 /* rewrite_mp4v.c */; };
+		92586A721EA7665D00A0838A /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 92586A701EA7665D00A0838A /* ft_font.h */; };
+		92586A731EA7669200A0838A /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 92586A6F1EA7665D00A0838A /* ft_font.c */; };
+		92586A7F1EAA5A4300A0838A /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92586A7E1EAA5A4300A0838A /* validator.c */; };
+		925974FE2215BA3A0007E02B /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974F52215BA3A0007E02B /* raster_rgb.c */; };
+		925974FF2215BA3A0007E02B /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974F62215BA3A0007E02B /* raster_argb.c */; };
+		925975002215BA3A0007E02B /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974F72215BA3A0007E02B /* raster_565.c */; };
+		925975012215BA3A0007E02B /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974F82215BA3A0007E02B /* stencil.c */; };
+		925975032215BA3A0007E02B /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 925974FA2215BA3A0007E02B /* surface.c */; };
+		925975042215BA3A0007E02B /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 925974FB2215BA3A0007E02B /* rast_soft.h */; };
+		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 */; };
+		926245981FD691A000184072 /* ff_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 926245971FD691A000184072 /* ff_common.h */; };
+		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 */; };
+		926998B41FEACE8F00AA759D /* dmx_vobsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 926998B31FEACE8F00AA759D /* dmx_vobsub.c */; };
+		926C7E642019D75300E90AF6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92A7E95E2003BACB000C22DE /* AudioToolbox.framework */; };
+		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 */; };
+		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 */; };
+		9273463323506D370081AF74 /* storage.c in Sources */ = {isa = PBXBuildFile; fileRef = 9273463223506D370081AF74 /* storage.c */; };
+		9274295824647AB8009ADD8D /* bsrw.c in Sources */ = {isa = PBXBuildFile; fileRef = 9274295724647AB8009ADD8D /* bsrw.c */; };
+		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 */; };
+		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 */; };
+		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 */; };
+		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 */; };
+		9293839C23548C8F00AAAFA8 /* webgl.c in Sources */ = {isa = PBXBuildFile; fileRef = 9293839B23548C8F00AAAFA8 /* webgl.c */; };
+		9293839E2354A10800AAAFA8 /* webgl.h in Headers */ = {isa = PBXBuildFile; fileRef = 9293839D2354A10800AAAFA8 /* webgl.h */; };
+		9296BF2222CF7F5300DC9742 /* reframe_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 9296BF2122CF7F5300DC9742 /* reframe_flac.c */; };
+		929867752355DED1008A2CC6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 927AACF61E44ED58008C8E69 /* main.c */; };
+		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 */; };
 		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 */; };
 		92AAF0E718D6DB8600E2FF12 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DC18D6DB5500E2FF12 /* video.c */; };
 		92AAF0E818D6DB9300E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF0EA18D6E3A300E2FF12 /* raw_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50FD18D6D9EE00AA59D8 /* raw_video.c */; };
-		92AAF0EB18D6E5AA00E2FF12 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510918D6DA6300AA59D8 /* ftgrays.c */; };
-		92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BE510A18D6DA6300AA59D8 /* rast_soft.h */; };
-		92AAF0ED18D6E5AA00E2FF12 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510B18D6DA6300AA59D8 /* raster_565.c */; };
-		92AAF0EE18D6E5AA00E2FF12 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510C18D6DA6300AA59D8 /* raster_argb.c */; };
-		92AAF0EF18D6E5AA00E2FF12 /* raster_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510D18D6DA6300AA59D8 /* raster_load.c */; };
-		92AAF0F018D6E5AA00E2FF12 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510E18D6DA6300AA59D8 /* raster_rgb.c */; };
-		92AAF0F118D6E5AA00E2FF12 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510F18D6DA6300AA59D8 /* stencil.c */; };
-		92AAF0F218D6E5AA00E2FF12 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE511018D6DA6300AA59D8 /* surface.c */; };
-		92AAF0F518D6E5D400E2FF12 /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0F418D6E5D400E2FF12 /* audio_filter.c */; };
-		92AAF0F818D6E5FD00E2FF12 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */; };
-		92AAF0FB18D6E62600E2FF12 /* ctx_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0FA18D6E62600E2FF12 /* ctx_load.c */; };
-		92AAF0FE18D6E64800E2FF12 /* dummy_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0FD18D6E64800E2FF12 /* dummy_in.c */; };
-		92AAF10118D6E66D00E2FF12 /* gpac_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10018D6E66D00E2FF12 /* gpac_js.c */; };
-		92AAF10A18D6E69500E2FF12 /* bmp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10318D6E69500E2FF12 /* bmp_dec.c */; };
-		92AAF10B18D6E69500E2FF12 /* img_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10418D6E69500E2FF12 /* img_dec.c */; };
-		92AAF10C18D6E69500E2FF12 /* img_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10518D6E69500E2FF12 /* img_in.c */; };
-		92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF10618D6E69500E2FF12 /* img_in.h */; };
-		92AAF10E18D6E69500E2FF12 /* jp2_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10718D6E69500E2FF12 /* jp2_dec.c */; };
-		92AAF10F18D6E69500E2FF12 /* jpeg_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10818D6E69500E2FF12 /* jpeg_dec.c */; };
-		92AAF11018D6E69500E2FF12 /* png_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10918D6E69500E2FF12 /* png_dec.c */; };
-		92AAF11318D6E6B700E2FF12 /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11218D6E6B700E2FF12 /* isma_ea.c */; };
-		92AAF11A18D6E6D300E2FF12 /* isom_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11518D6E6D300E2FF12 /* isom_cache.c */; };
-		92AAF11B18D6E6D300E2FF12 /* isom_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF11618D6E6D300E2FF12 /* isom_in.h */; };
-		92AAF11C18D6E6D300E2FF12 /* load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11718D6E6D300E2FF12 /* load.c */; };
-		92AAF11D18D6E6D300E2FF12 /* read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11818D6E6D300E2FF12 /* read_ch.c */; };
-		92AAF11E18D6E6D300E2FF12 /* read.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11918D6E6D300E2FF12 /* read.c */; };
-		92AAF12118D6E6F300E2FF12 /* laser_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12018D6E6F300E2FF12 /* laser_dec.c */; };
-		92AAF12418D6E70D00E2FF12 /* mpd_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12318D6E70D00E2FF12 /* mpd_in.c */; };
-		92AAF12718D6E72800E2FF12 /* mpegts_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12618D6E72800E2FF12 /* mpegts_in.c */; };
-		92AAF12A18D6E74200E2FF12 /* mse_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12918D6E74200E2FF12 /* mse_in.c */; };
-		92AAF12D18D6E75800E2FF12 /* odf_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12C18D6E75800E2FF12 /* odf_dec.c */; };
-		92AAF13018D6E77900E2FF12 /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12F18D6E77900E2FF12 /* osd.c */; };
-		92AAF13918D6E7BC00E2FF12 /* rtp_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13218D6E7BC00E2FF12 /* rtp_in.c */; };
-		92AAF13A18D6E7BC00E2FF12 /* rtp_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF13318D6E7BC00E2FF12 /* rtp_in.h */; };
-		92AAF13B18D6E7BC00E2FF12 /* rtp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13418D6E7BC00E2FF12 /* rtp_session.c */; };
-		92AAF13C18D6E7BC00E2FF12 /* rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */; };
-		92AAF13D18D6E7BC00E2FF12 /* rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */; };
-		92AAF13E18D6E7BC00E2FF12 /* sdp_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */; };
-		92AAF13F18D6E7BC00E2FF12 /* sdp_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13818D6E7BC00E2FF12 /* sdp_load.c */; };
-		92AAF14218D6E7D800E2FF12 /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14118D6E7D800E2FF12 /* saf_in.c */; };
-		92AAF14518D6E7F500E2FF12 /* svg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14418D6E7F500E2FF12 /* svg_in.c */; };
-		92AAF14918D6E82500E2FF12 /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14718D6E82500E2FF12 /* timedtext_dec.c */; };
-		92AAF14A18D6E82500E2FF12 /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14818D6E82500E2FF12 /* timedtext_in.c */; };
-		92AAF14D18D6E83B00E2FF12 /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14C18D6E83B00E2FF12 /* validator.c */; };
-		92AAF15518D6E87500E2FF12 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14F18D6E87500E2FF12 /* unzip.c */; };
-		92AAF15618D6E87500E2FF12 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF15018D6E87500E2FF12 /* unzip.h */; };
-		92AAF15718D6E87500E2FF12 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15118D6E87500E2FF12 /* wgt_load.c */; };
-		92AAF15818D6E87500E2FF12 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15218D6E87500E2FF12 /* widget.c */; };
-		92AAF15918D6E87500E2FF12 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15318D6E87500E2FF12 /* widgetman.c */; };
-		92AAF15A18D6E87500E2FF12 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF15418D6E87500E2FF12 /* widgetman.h */; };
-		92AAF16D18D6F5EB00E2FF12 /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF16B18D6F5EA00E2FF12 /* ft_font.c */; };
-		92AAF16E18D6F5EB00E2FF12 /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF16C18D6F5EA00E2FF12 /* ft_font.h */; };
 		92AAF16F18D6F66300E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF17C18D6F8C700E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF18018D6F8EF00E2FF12 /* aac_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF17E18D6F8EF00E2FF12 /* aac_in.c */; };
-		92AAF18118D6F8EF00E2FF12 /* faad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */; };
-		92AAF19118D6FA3300E2FF12 /* ac3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */; };
-		92AAF19218D6FA3300E2FF12 /* liba52_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */; };
-		92AAF19318D6FB7B00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF19C18D6FDD900E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF1A618D6FDFA00E2FF12 /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */; };
-		92AAF1A718D6FDFA00E2FF12 /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */; };
-		92AAF1A818D6FDFA00E2FF12 /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */; };
-		92AAF1A918D6FDFA00E2FF12 /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */; };
-		92AAF1B718D70A1000E2FF12 /* mad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1B318D70A0A00E2FF12 /* mad_dec.c */; };
-		92AAF1B818D70A1000E2FF12 /* mp3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1B418D70A0A00E2FF12 /* mp3_in.c */; };
-		92AAF1B918D70A5200E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF1C518D70B4600E2FF12 /* openhevc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */; };
-		92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D518D7109A00E2FF12 /* vtt_dec.c */; };
-		92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D618D7109A00E2FF12 /* vtt_in.c */; };
 		92B02F4F1DD2004400F85E77 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B02F4E1DD2004400F85E77 /* OpenGL.framework */; };
+		92B2A4A52297FD9E002A65A7 /* out_rtsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4A42297FD9E002A65A7 /* out_rtsp.c */; };
+		92B2A4AA229D64EF002A65A7 /* hevcmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4A8229D64EF002A65A7 /* hevcmerge.c */; };
+		92B2A4AB229D64EF002A65A7 /* hevcsplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4A9229D64EF002A65A7 /* hevcsplit.c */; };
+		92B9A5071F83FD7800A24FE4 /* in_dvb4linux.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5061F83FD7700A24FE4 /* in_dvb4linux.c */; };
+		92B9A50A1F840A6800A24FE4 /* dec_vtb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5081F840A6700A24FE4 /* dec_vtb.c */; };
+		92B9A5111F8660B500A24FE4 /* terminal.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A50C1F8660B500A24FE4 /* terminal.c */; };
+		92B9A5661F8660D700A24FE4 /* svg_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5161F8660CD00A24FE4 /* svg_font.c */; };
+		92B9A5671F8660D700A24FE4 /* mpeg4_geometry_ifs2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5171F8660CE00A24FE4 /* mpeg4_geometry_ifs2d.c */; };
+		92B9A5681F8660D700A24FE4 /* mpeg4_layer_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5181F8660CE00A24FE4 /* mpeg4_layer_3d.c */; };
+		92B9A5691F8660D700A24FE4 /* mpeg4_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5191F8660CE00A24FE4 /* mpeg4_layout.c */; };
+		92B9A56A1F8660D700A24FE4 /* svg_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A51A1F8660CE00A24FE4 /* svg_grouping.c */; };
+		92B9A56B1F8660D700A24FE4 /* visual_manager_3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A51B1F8660CE00A24FE4 /* visual_manager_3d.h */; };
+		92B9A56C1F8660D700A24FE4 /* svg_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A51C1F8660CE00A24FE4 /* svg_base.c */; };
+		92B9A56D1F8660D700A24FE4 /* mpeg4_geometry_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A51D1F8660CE00A24FE4 /* mpeg4_geometry_3d.c */; };
+		92B9A56E1F8660D700A24FE4 /* mpeg4_geometry_ils2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A51E1F8660CE00A24FE4 /* mpeg4_geometry_ils2d.c */; };
+		92B9A56F1F8660D700A24FE4 /* mpeg4_lighting.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A51F1F8660CE00A24FE4 /* mpeg4_lighting.c */; };
+		92B9A5701F8660D700A24FE4 /* compositor_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5201F8660CE00A24FE4 /* compositor_3d.c */; };
+		92B9A5711F8660D700A24FE4 /* drawable.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5211F8660CE00A24FE4 /* drawable.c */; };
+		92B9A5721F8660D700A24FE4 /* mpeg4_animstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5221F8660CE00A24FE4 /* mpeg4_animstream.c */; };
+		92B9A5731F8660D700A24FE4 /* mpeg4_grouping_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5231F8660CE00A24FE4 /* mpeg4_grouping_3d.c */; };
+		92B9A5741F8660D700A24FE4 /* compositor_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5241F8660CF00A24FE4 /* compositor_2d.c */; };
+		92B9A5751F8660D700A24FE4 /* drawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A5251F8660CF00A24FE4 /* drawable.h */; };
+		92B9A5761F8660D700A24FE4 /* mpeg4_background2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5261F8660CF00A24FE4 /* mpeg4_background2d.c */; };
+		92B9A5771F8660D700A24FE4 /* mpeg4_background.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5271F8660CF00A24FE4 /* mpeg4_background.c */; };
+		92B9A5781F8660D700A24FE4 /* audio_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5281F8660CF00A24FE4 /* audio_mixer.c */; };
+		92B9A5791F8660D700A24FE4 /* mpeg4_grouping_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5291F8660CF00A24FE4 /* mpeg4_grouping_2d.c */; };
+		92B9A57A1F8660D700A24FE4 /* offscreen_cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A52A1F8660CF00A24FE4 /* offscreen_cache.h */; };
+		92B9A57B1F8660D700A24FE4 /* navigate.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A52B1F8660CF00A24FE4 /* navigate.c */; };
+		92B9A57C1F8660D700A24FE4 /* svg_filters.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A52C1F8660CF00A24FE4 /* svg_filters.c */; };
+		92B9A57D1F8660D700A24FE4 /* svg_external.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A52D1F8660D000A24FE4 /* svg_external.c */; };
+		92B9A57E1F8660D700A24FE4 /* mpeg4_mediasensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A52E1F8660D000A24FE4 /* mpeg4_mediasensor.c */; };
+		92B9A57F1F8660D700A24FE4 /* offscreen_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A52F1F8660D000A24FE4 /* offscreen_cache.c */; };
+		92B9A5801F8660D700A24FE4 /* x3d_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5301F8660D000A24FE4 /* x3d_geometry.c */; };
+		92B9A5811F8660D700A24FE4 /* svg_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5311F8660D000A24FE4 /* svg_geometry.c */; };
+		92B9A5821F8660D700A24FE4 /* hc_flash_shape.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5321F8660D000A24FE4 /* hc_flash_shape.c */; };
+		92B9A5831F8660D700A24FE4 /* hardcoded_protos.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5331F8660D000A24FE4 /* hardcoded_protos.c */; };
+		92B9A5841F8660D700A24FE4 /* mpeg4_form.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5341F8660D100A24FE4 /* mpeg4_form.c */; };
+		92B9A5851F8660D700A24FE4 /* mesh_tesselate.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5351F8660D100A24FE4 /* mesh_tesselate.c */; };
+		92B9A5861F8660D700A24FE4 /* gl_inc.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A5361F8660D100A24FE4 /* gl_inc.h */; };
+		92B9A5871F8660D700A24FE4 /* mpeg4_timesensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5371F8660D100A24FE4 /* mpeg4_timesensor.c */; };
+		92B9A5881F8660D700A24FE4 /* scene_ns.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5381F8660D100A24FE4 /* scene_ns.c */; };
+		92B9A5891F8660D700A24FE4 /* svg_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5391F8660D100A24FE4 /* svg_text.c */; };
+		92B9A58A1F8660D700A24FE4 /* visual_manager_3d_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A53A1F8660D100A24FE4 /* visual_manager_3d_gl.c */; };
+		92B9A58B1F8660D700A24FE4 /* mpeg4_path_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A53B1F8660D100A24FE4 /* mpeg4_path_layout.c */; };
+		92B9A58C1F8660D700A24FE4 /* mpeg4_composite.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A53C1F8660D200A24FE4 /* mpeg4_composite.c */; };
+		92B9A58D1F8660D700A24FE4 /* audio_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A53D1F8660D200A24FE4 /* audio_input.c */; };
+		92B9A58F1F8660D700A24FE4 /* mpeg4_bitmap.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A53F1F8660D200A24FE4 /* mpeg4_bitmap.c */; };
+		92B9A5901F8660D700A24FE4 /* mpeg4_layer_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5401F8660D200A24FE4 /* mpeg4_layer_2d.c */; };
+		92B9A5911F8660D700A24FE4 /* mpeg4_geometry_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5411F8660D200A24FE4 /* mpeg4_geometry_2d.c */; };
+		92B9A5921F8660D700A24FE4 /* visual_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A5421F8660D200A24FE4 /* visual_manager.h */; };
+		92B9A5931F8660D700A24FE4 /* mpeg4_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5431F8660D300A24FE4 /* mpeg4_text.c */; };
+		92B9A5941F8660D700A24FE4 /* visual_manager_2d_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5441F8660D300A24FE4 /* visual_manager_2d_draw.c */; };
+		92B9A5951F8660D700A24FE4 /* svg_paint_servers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5451F8660D300A24FE4 /* svg_paint_servers.c */; };
+		92B9A5961F8660D700A24FE4 /* font_engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5461F8660D300A24FE4 /* font_engine.c */; };
+		92B9A5971F8660D700A24FE4 /* audio_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5471F8660D300A24FE4 /* audio_render.c */; };
+		92B9A5981F8660D700A24FE4 /* media_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5481F8660D300A24FE4 /* media_object.c */; };
+		92B9A5991F8660D700A24FE4 /* mpeg4_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5491F8660D300A24FE4 /* mpeg4_audio.c */; };
+		92B9A59A1F8660D700A24FE4 /* texturing.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A54A1F8660D400A24FE4 /* texturing.c */; };
+		92B9A59B1F8660D700A24FE4 /* nodes_stacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A54B1F8660D400A24FE4 /* nodes_stacks.h */; };
+		92B9A59C1F8660D700A24FE4 /* camera.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A54C1F8660D400A24FE4 /* camera.c */; };
+		92B9A59D1F8660D700A24FE4 /* compositor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A54D1F8660D400A24FE4 /* compositor.c */; };
+		92B9A59E1F8660D700A24FE4 /* mesh.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A54E1F8660D400A24FE4 /* mesh.c */; };
+		92B9A59F1F8660D700A24FE4 /* mpeg4_inline.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A54F1F8660D400A24FE4 /* mpeg4_inline.c */; };
+		92B9A5A01F8660D700A24FE4 /* mpeg4_sensors.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5501F8660D400A24FE4 /* mpeg4_sensors.c */; };
+		92B9A5A11F8660D700A24FE4 /* mpeg4_textures.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5511F8660D400A24FE4 /* mpeg4_textures.c */; };
+		92B9A5A21F8660D700A24FE4 /* mpeg4_grouping.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A5521F8660D500A24FE4 /* mpeg4_grouping.h */; };
+		92B9A5A31F8660D700A24FE4 /* visual_manager_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5531F8660D500A24FE4 /* visual_manager_2d.c */; };
+		92B9A5A41F8660D700A24FE4 /* scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5541F8660D500A24FE4 /* scene.c */; };
+		92B9A5A51F8660D700A24FE4 /* mpeg4_gradients.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5551F8660D500A24FE4 /* mpeg4_gradients.c */; };
+		92B9A5A61F8660D700A24FE4 /* mpeg4_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5561F8660D500A24FE4 /* mpeg4_grouping.c */; };
+		92B9A5A71F8660D700A24FE4 /* texturing_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5571F8660D500A24FE4 /* texturing_gl.c */; };
+		92B9A5A81F8660D700A24FE4 /* object_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5581F8660D500A24FE4 /* object_manager.c */; };
+		92B9A5A91F8660D700A24FE4 /* bindable.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5591F8660D600A24FE4 /* bindable.c */; };
+		92B9A5AA1F8660D700A24FE4 /* texturing.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A55A1F8660D600A24FE4 /* texturing.h */; };
+		92B9A5AB1F8660D700A24FE4 /* events.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A55B1F8660D600A24FE4 /* events.c */; };
+		92B9A5AC1F8660D700A24FE4 /* svg_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A55C1F8660D600A24FE4 /* svg_media.c */; };
+		92B9A5AD1F8660D700A24FE4 /* clock.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A55D1F8660D600A24FE4 /* clock.c */; };
+		92B9A5AE1F8660D700A24FE4 /* mpeg4_viewport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A55E1F8660D600A24FE4 /* mpeg4_viewport.c */; };
+		92B9A5AF1F8660D700A24FE4 /* visual_manager_2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 92B9A55F1F8660D600A24FE4 /* visual_manager_2d.h */; };
+		92B9A5B01F8660D700A24FE4 /* compositor_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5601F8660D600A24FE4 /* compositor_node_init.c */; };
+		92B9A5B11F8660D700A24FE4 /* mpeg4_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5611F8660D700A24FE4 /* mpeg4_sound.c */; };
+		92B9A5B21F8660D700A24FE4 /* mpeg4_mediacontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5621F8660D700A24FE4 /* mpeg4_mediacontrol.c */; };
+		92B9A5B31F8660D700A24FE4 /* mesh_collide.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5631F8660D700A24FE4 /* mesh_collide.c */; };
+		92B9A5B41F8660D700A24FE4 /* visual_manager_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5641F8660D700A24FE4 /* visual_manager_3d.c */; };
+		92B9A5B51F8660D700A24FE4 /* visual_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5651F8660D700A24FE4 /* visual_manager.c */; };
+		92B9A5B71F866D6500A24FE4 /* scene_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5B61F866D6500A24FE4 /* scene_node_init.c */; };
+		92B9A5B91F866E0500A24FE4 /* mpeg4_inputsensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5B81F866E0500A24FE4 /* mpeg4_inputsensor.c */; };
+		92B9A5BD1F868D0000A24FE4 /* dec_laser.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5BC1F868CFF00A24FE4 /* dec_laser.c */; };
+		92B9A5BF1F8695FA00A24FE4 /* dmx_saf.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5BE1F8695FA00A24FE4 /* dmx_saf.c */; };
+		92B9A5C11F86ACDF00A24FE4 /* dec_opensvc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B9A5C01F86ACDF00A24FE4 /* dec_opensvc.c */; };
+		92BA0AD5243B68AF006FC74E /* dec_mediacodec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BA0AD3243B68AF006FC74E /* dec_mediacodec.c */; };
+		92BA0ADA243B6E2B006FC74E /* dektec_video_decl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BA0AD9243B6E2B006FC74E /* dektec_video_decl.c */; };
+		92BB85661F7BFB63009BC9C8 /* ff_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85501F7BFB60009BC9C8 /* ff_dec.c */; };
+		92BB85671F7BFB63009BC9C8 /* dec_odf.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85511F7BFB60009BC9C8 /* dec_odf.c */; };
+		92BB85681F7BFB63009BC9C8 /* dec_bifs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85521F7BFB60009BC9C8 /* dec_bifs.c */; };
+		92BB85691F7BFB63009BC9C8 /* isoffin_read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85531F7BFB60009BC9C8 /* isoffin_read_ch.c */; };
+		92BB856A1F7BFB63009BC9C8 /* reframe_img.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85541F7BFB60009BC9C8 /* reframe_img.c */; };
+		92BB856B1F7BFB63009BC9C8 /* dec_faad.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85551F7BFB60009BC9C8 /* dec_faad.c */; };
+		92BB856C1F7BFB63009BC9C8 /* reframe_adts.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85561F7BFB60009BC9C8 /* reframe_adts.c */; };
+		92BB856D1F7BFB63009BC9C8 /* dec_img.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85571F7BFB60009BC9C8 /* dec_img.c */; };
+		92BB856E1F7BFB63009BC9C8 /* compose.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85581F7BFB61009BC9C8 /* compose.c */; };
+		92BB85701F7BFB63009BC9C8 /* in_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855A1F7BFB61009BC9C8 /* in_file.c */; };
+		92BB85711F7BFB63009BC9C8 /* reframe_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855B1F7BFB61009BC9C8 /* reframe_mp3.c */; };
+		92BB85721F7BFB63009BC9C8 /* ff_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855C1F7BFB61009BC9C8 /* ff_common.c */; };
+		92BB85731F7BFB63009BC9C8 /* dec_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855D1F7BFB61009BC9C8 /* dec_mad.c */; };
+		92BB85741F7BFB63009BC9C8 /* in_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855E1F7BFB61009BC9C8 /* in_http.c */; };
+		92BB85751F7BFB63009BC9C8 /* inspect.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB855F1F7BFB62009BC9C8 /* inspect.c */; };
+		92BB85761F7BFB63009BC9C8 /* ff_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85601F7BFB62009BC9C8 /* ff_dmx.c */; };
+		92BB85771F7BFB63009BC9C8 /* isoffin.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BB85611F7BFB62009BC9C8 /* isoffin.h */; };
+		92BB85781F7BFB63009BC9C8 /* load_bt_xmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85621F7BFB63009BC9C8 /* load_bt_xmt.c */; };
+		92BB85791F7BFB63009BC9C8 /* unit_test_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85631F7BFB63009BC9C8 /* unit_test_filter.c */; };
+		92BB857A1F7BFB63009BC9C8 /* isoffin_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85641F7BFB63009BC9C8 /* isoffin_load.c */; };
+		92BB857B1F7BFB63009BC9C8 /* isoffin_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85651F7BFB63009BC9C8 /* isoffin_read.c */; };
+		92BB857D1F7BFD80009BC9C8 /* dec_xvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB857C1F7BFD7F009BC9C8 /* dec_xvid.c */; };
+		92BB857F1F7C30AF009BC9C8 /* dec_j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB857E1F7C30AE009BC9C8 /* dec_j2k.c */; };
+		92BB85811F7C3C4B009BC9C8 /* reframe_ac3.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85801F7C3C4A009BC9C8 /* reframe_ac3.c */; };
+		92BB85831F7C5774009BC9C8 /* dec_ac52.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85821F7C5773009BC9C8 /* dec_ac52.c */; };
+		92BB85851F7C606A009BC9C8 /* reframe_amr.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB85841F7C606A009BC9C8 /* reframe_amr.c */; };
+		92BB9A671F9C827600524E5B /* dmx_dash.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BB9A661F9C827600524E5B /* dmx_dash.c */; };
 		92BBFCAB1A7122AD006A7735 /* ait.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC481A7122AD006A7735 /* ait.h */; };
 		92BBFCAC1A7122AD006A7735 /* avparse.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC491A7122AD006A7735 /* avparse.h */; };
 		92BBFCAD1A7122AD006A7735 /* base_coding.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC4A1A7122AD006A7735 /* base_coding.h */; };
@@ -410,10 +409,8 @@
 		92BBFCB81A7122AD006A7735 /* download.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC551A7122AD006A7735 /* download.h */; };
 		92BBFCB91A7122AD006A7735 /* dsmcc.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC561A7122AD006A7735 /* dsmcc.h */; };
 		92BBFCBA1A7122AD006A7735 /* dvb_mpe.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC571A7122AD006A7735 /* dvb_mpe.h */; };
-		92BBFCBB1A7122AD006A7735 /* esi.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC581A7122AD006A7735 /* esi.h */; };
 		92BBFCBC1A7122AD006A7735 /* events_constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC591A7122AD006A7735 /* events_constants.h */; };
 		92BBFCBD1A7122AD006A7735 /* events.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5A1A7122AD006A7735 /* events.h */; };
-		92BBFCBE1A7122AD006A7735 /* filestreamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5B1A7122AD006A7735 /* filestreamer.h */; };
 		92BBFCBF1A7122AD006A7735 /* html5_media.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5C1A7122AD006A7735 /* html5_media.h */; };
 		92BBFCC01A7122AD006A7735 /* html5_mse.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5D1A7122AD006A7735 /* html5_mse.h */; };
 		92BBFCC11A7122AD006A7735 /* ietf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC5E1A7122AD006A7735 /* ietf.h */; };
@@ -438,27 +435,20 @@
 		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 */; };
-		92BBFCD71A7122AD006A7735 /* terminal_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC751A7122AD006A7735 /* terminal_dev.h */; };
 		92BBFCD81A7122AD006A7735 /* vobsub.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC761A7122AD006A7735 /* vobsub.h */; };
-		92BBFCD91A7122AD006A7735 /* ismacryp.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC771A7122AD006A7735 /* ismacryp.h */; };
 		92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC781A7122AD006A7735 /* iso639.h */; };
 		92BBFCDB1A7122AD006A7735 /* isomedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC791A7122AD006A7735 /* isomedia.h */; };
 		92BBFCDC1A7122AD006A7735 /* laser.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7A1A7122AD006A7735 /* laser.h */; };
 		92BBFCDD1A7122AD006A7735 /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7B1A7122AD006A7735 /* list.h */; };
-		92BBFCDE1A7122AD006A7735 /* map.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7C1A7122AD006A7735 /* map.h */; };
 		92BBFCDF1A7122AD006A7735 /* maths.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7D1A7122AD006A7735 /* maths.h */; };
 		92BBFCE01A7122AD006A7735 /* media_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7E1A7122AD006A7735 /* media_tools.h */; };
 		92BBFCE11A7122AD006A7735 /* mediaobject.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC7F1A7122AD006A7735 /* mediaobject.h */; };
 		92BBFCE21A7122AD006A7735 /* module.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC801A7122AD006A7735 /* module.h */; };
 		92BBFCE31A7122AD006A7735 /* audio_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC821A7122AD006A7735 /* audio_out.h */; };
-		92BBFCE41A7122AD006A7735 /* codec.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC831A7122AD006A7735 /* codec.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 */; };
-		92BBFCE71A7122AD006A7735 /* ipmp.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC861A7122AD006A7735 /* ipmp.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 */; };
-		92BBFCEA1A7122AD006A7735 /* service.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC891A7122AD006A7735 /* service.h */; };
-		92BBFCEB1A7122AD006A7735 /* term_ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC8A1A7122AD006A7735 /* term_ext.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 */; };
@@ -470,7 +460,6 @@
 		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 */; };
-		92BBFCF71A7122AD006A7735 /* ringbuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC961A7122AD006A7735 /* ringbuffer.h */; };
 		92BBFCF81A7122AD006A7735 /* rtp_streamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC971A7122AD006A7735 /* rtp_streamer.h */; };
 		92BBFCF91A7122AD006A7735 /* scene_engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC981A7122AD006A7735 /* scene_engine.h */; };
 		92BBFCFA1A7122AD006A7735 /* scene_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFC991A7122AD006A7735 /* scene_manager.h */; };
@@ -485,29 +474,60 @@
 		92BBFD031A7122AD006A7735 /* thread.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA21A7122AD006A7735 /* thread.h */; };
 		92BBFD041A7122AD006A7735 /* token.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA31A7122AD006A7735 /* token.h */; };
 		92BBFD051A7122AD006A7735 /* tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA41A7122AD006A7735 /* tools.h */; };
-		92BBFD061A7122AD006A7735 /* unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA51A7122AD006A7735 /* unicode.h */; };
 		92BBFD071A7122AD006A7735 /* user.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA61A7122AD006A7735 /* user.h */; };
 		92BBFD081A7122AD006A7735 /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA71A7122AD006A7735 /* utf.h */; };
 		92BBFD091A7122AD006A7735 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA81A7122AD006A7735 /* version.h */; };
 		92BBFD0A1A7122AD006A7735 /* webvtt.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCA91A7122AD006A7735 /* webvtt.h */; };
 		92BBFD0B1A7122AD006A7735 /* xml.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BBFCAA1A7122AD006A7735 /* xml.h */; };
+		92BD5568205AE807007C4C06 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 28C5AA641A15240800372C59 /* AVFoundation.framework */; };
+		92BD5569205AE93A007C4C06 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2839E2CC1A163E1E002D73E1 /* Foundation.framework */; };
+		92BD556B205AE974007C4C06 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92BD556A205AE974007C4C06 /* CoreGraphics.framework */; };
+		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 */; };
-		92BE50C218D6D5DC00AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50C118D6D5DC00AA59D8 /* main.c */; };
-		92BE50D318D6D62600AA59D8 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D118D6D62600AA59D8 /* extract.c */; };
-		92BE50D418D6D62600AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D218D6D62600AA59D8 /* main.c */; };
 		92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
-		92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92C0F37E21EC7BB0002961C8 /* out_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92C0F37D21EC7BB0002961C8 /* out_rtp.c */; };
+		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 */; };
-		92D3C6312031F4C200BA1735 /* atsc_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D3C6302031F4C100BA1735 /* atsc_in.c */; };
 		92D535711A5C0D1400F2442A /* carbon_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D5356F1A5C0CF700F2442A /* carbon_events.c */; };
-		92F8D46C1F6FF7A100616F7C /* netctrl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D46B1F6FF7A100616F7C /* netctrl.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 */; };
+		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 */; };
+		92E164AC20F8EBAE0024A9CA /* dec_nvdec_sdk.h in Headers */ = {isa = PBXBuildFile; fileRef = 92E164A920F8EBAE0024A9CA /* dec_nvdec_sdk.h */; };
+		92E164AD20F8EBAE0024A9CA /* dec_nvdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E164AA20F8EBAE0024A9CA /* dec_nvdec.c */; };
+		92E164BC20F8F2860024A9CA /* Remotery.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E164BA20F8F2860024A9CA /* Remotery.c */; };
+		92E249902057B973002CC029 /* resample_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E2498F2057B973002CC029 /* resample_audio.c */; };
+		92E318CF20645036007BE021 /* ff_rescale.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E318CE20645036007BE021 /* ff_rescale.c */; };
+		92E318D120651834007BE021 /* vcrop.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E318D020651834007BE021 /* vcrop.c */; };
+		92E9167C2073F1DB00EE92FB /* ff_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9167B2073F1DB00EE92FB /* ff_enc.c */; };
+		92EB479120F50C4200E1F2DD /* reframe_av1.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB479020F50C4200E1F2DD /* reframe_av1.c */; };
+		92EB479320F6333900E1F2DD /* rewrite_obu.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB479220F6333800E1F2DD /* rewrite_obu.c */; };
+		92EC32CB1FAC5ACB003FB9C3 /* reframe_qcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EC32CA1FAC5ACA003FB9C3 /* reframe_qcp.c */; };
+		92EC32CD1FAC81D6003FB9C3 /* reframe_h263.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EC32CC1FAC81D5003FB9C3 /* reframe_h263.c */; };
+		92EE76411FD0315D008926F5 /* load_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EE76401FD0315D008926F5 /* load_text.c */; };
+		92F8D4771F71642E00616F7C /* filter_pck.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4701F71642E00616F7C /* filter_pck.c */; };
+		92F8D4781F71642E00616F7C /* filter_pid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4711F71642E00616F7C /* filter_pid.c */; };
+		92F8D47A1F71642E00616F7C /* filter_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4731F71642E00616F7C /* filter_queue.c */; };
+		92F8D47B1F71642E00616F7C /* filter_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4741F71642E00616F7C /* filter_session.c */; };
+		92F8D47C1F71642E00616F7C /* filter_session.h in Headers */ = {isa = PBXBuildFile; fileRef = 92F8D4751F71642E00616F7C /* filter_session.h */; };
+		92F8D47D1F71642E00616F7C /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D4761F71642E00616F7C /* filter.c */; };
 		92F930821A5ADB870072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930801A5ADB870072A85C /* os_divers.c */; };
 		92F930831A5ADB870072A85C /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930811A5ADB870072A85C /* os_file.c */; };
+		92FA79432076687100AE005F /* rewind.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA79422076687100AE005F /* rewind.c */; };
+		92FE596D2088E52900CF0C5A /* dasher.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FE596C2088E52900CF0C5A /* dasher.c */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -515,6 +535,8 @@
 			isa = PBXBuildRule;
 			compilerSpec = com.apple.compilers.proxy.script;
 			fileType = sourcecode.opencl;
+			inputFiles = (
+			);
 			isEditable = 1;
 			outputFiles = (
 			);
@@ -523,66 +545,73 @@
 /* End PBXBuildRule section */
 
 /* Begin PBXContainerItemProxy section */
-		9225730E18D717AB00D6FD98 /* PBXContainerItemProxy */ = {
+		92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF0D218D6DB2D00E2FF12;
+			remoteInfo = sdl_out;
+		};
+		92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 92AAF18718D6FA1100E2FF12;
-			remoteInfo = ac3_in;
+			remoteGlobalIDString = 92AAF16418D6F40400E2FF12;
+			remoteInfo = ft_font;
 		};
-		9225731018D717AE00D6FD98 /* PBXContainerItemProxy */ = {
+		92BD5562205AB89D007C4C06 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 92AAF19718D6FDC300E2FF12;
-			remoteInfo = ffmpeg_in;
+			remoteGlobalIDString = 92AAF0D218D6DB2D00E2FF12;
+			remoteInfo = sdl_out;
 		};
-		9225731218D717B100D6FD98 /* PBXContainerItemProxy */ = {
+		92C403DE2181F1ED00331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 92AAF1AD18D709D900E2FF12;
-			remoteInfo = mp3_in;
+			remoteGlobalIDString = 92AAF16418D6F40400E2FF12;
+			remoteInfo = ft_font;
 		};
-		9225731418D717B400D6FD98 /* PBXContainerItemProxy */ = {
+		92C403E02181F1F100331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 92AAF1BD18D70B1C00E2FF12;
+			remoteGlobalIDString = 92C403D62181F10500331F39;
 			remoteInfo = openhevc_dec;
 		};
-		9225733518D727B500D6FD98 /* PBXContainerItemProxy */ = {
+		92C403E22181F1FC00331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 9225732318D7267900D6FD98;
-			remoteInfo = ogg_in;
+			remoteGlobalIDString = 92C403D62181F10500331F39;
+			remoteInfo = openhevc_dec;
 		};
-		92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */ = {
+		92C403E42181F20800331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 92AAF0D218D6DB2D00E2FF12;
 			remoteInfo = sdl_out;
 		};
-		92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */ = {
+		92C403E62181F20C00331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 92AAF16418D6F40400E2FF12;
 			remoteInfo = ft_font;
 		};
-		92AAF18218D6F9E700E2FF12 /* PBXContainerItemProxy */ = {
+		92C403E82181F21000331F39 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 92AAF17718D6F89B00E2FF12;
-			remoteInfo = aac_in;
+			remoteGlobalIDString = 92C403D62181F10500331F39;
+			remoteInfo = openhevc_dec;
 		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		2839E2861A1635F7002D73E1 /* CopyFiles */ = {
+		927AACFB1E44EEDC008C8E69 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = /usr/share/man/man1/;
@@ -600,15 +629,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
-		92BE50B118D6D53000AA59D8 /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = /usr/share/man/man1/;
-			dstSubfolderSpec = 0;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-		};
 		92BE50C518D6D60100AA59D8 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -621,39 +641,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		2839E2881A1635F7002D73E1 /* DashCast */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DashCast; sourceTree = BUILT_PRODUCTS_DIR; };
-		2839E2921A16363E002D73E1 /* audio_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_data.c; path = ../../applications/dashcast/audio_data.c; sourceTree = "<group>"; };
-		2839E2931A16363E002D73E1 /* audio_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_data.h; path = ../../applications/dashcast/audio_data.h; sourceTree = "<group>"; };
-		2839E2941A16363E002D73E1 /* audio_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_decoder.c; path = ../../applications/dashcast/audio_decoder.c; sourceTree = "<group>"; };
-		2839E2951A16363E002D73E1 /* audio_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_decoder.h; path = ../../applications/dashcast/audio_decoder.h; sourceTree = "<group>"; };
-		2839E2961A16363E002D73E1 /* audio_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_encoder.c; path = ../../applications/dashcast/audio_encoder.c; sourceTree = "<group>"; };
-		2839E2971A16363E002D73E1 /* audio_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_encoder.h; path = ../../applications/dashcast/audio_encoder.h; sourceTree = "<group>"; };
-		2839E2981A16363E002D73E1 /* audio_muxer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_muxer.c; path = ../../applications/dashcast/audio_muxer.c; sourceTree = "<group>"; };
-		2839E2991A16363E002D73E1 /* audio_muxer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = audio_muxer.h; path = ../../applications/dashcast/audio_muxer.h; sourceTree = "<group>"; };
-		2839E29A1A16363E002D73E1 /* circular_buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = circular_buffer.c; path = ../../applications/dashcast/circular_buffer.c; sourceTree = "<group>"; };
-		2839E29B1A16363E002D73E1 /* circular_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = circular_buffer.h; path = ../../applications/dashcast/circular_buffer.h; sourceTree = "<group>"; };
-		2839E29C1A16363E002D73E1 /* cmd_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cmd_data.c; path = ../../applications/dashcast/cmd_data.c; sourceTree = "<group>"; };
-		2839E29D1A16363E002D73E1 /* cmd_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cmd_data.h; path = ../../applications/dashcast/cmd_data.h; sourceTree = "<group>"; };
-		2839E29E1A16363E002D73E1 /* controler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = controler.c; path = ../../applications/dashcast/controler.c; sourceTree = "<group>"; };
-		2839E29F1A16363E002D73E1 /* controler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = controler.h; path = ../../applications/dashcast/controler.h; sourceTree = "<group>"; };
-		2839E2A01A16363E002D73E1 /* dashcast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dashcast.c; path = ../../applications/dashcast/dashcast.c; sourceTree = "<group>"; };
-		2839E2A11A16363E002D73E1 /* libav_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = libav_compat.h; path = ../../applications/dashcast/libav_compat.h; sourceTree = "<group>"; };
-		2839E2A21A16363E002D73E1 /* message_queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = message_queue.c; path = ../../applications/dashcast/message_queue.c; sourceTree = "<group>"; };
-		2839E2A31A16363E002D73E1 /* message_queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = message_queue.h; path = ../../applications/dashcast/message_queue.h; sourceTree = "<group>"; };
-		2839E2A41A16363E002D73E1 /* register.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = register.c; path = ../../applications/dashcast/register.c; sourceTree = "<group>"; };
-		2839E2A51A16363E002D73E1 /* register.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = register.h; path = ../../applications/dashcast/register.h; sourceTree = "<group>"; };
-		2839E2A61A16363E002D73E1 /* task.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = task.c; path = ../../applications/dashcast/task.c; sourceTree = "<group>"; };
-		2839E2A71A16363E002D73E1 /* task.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = task.h; path = ../../applications/dashcast/task.h; sourceTree = "<group>"; };
-		2839E2A81A16363E002D73E1 /* video_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_data.c; path = ../../applications/dashcast/video_data.c; sourceTree = "<group>"; };
-		2839E2A91A16363E002D73E1 /* video_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_data.h; path = ../../applications/dashcast/video_data.h; sourceTree = "<group>"; };
-		2839E2AA1A16363E002D73E1 /* video_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_decoder.c; path = ../../applications/dashcast/video_decoder.c; sourceTree = "<group>"; };
-		2839E2AB1A16363E002D73E1 /* video_decoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_decoder.h; path = ../../applications/dashcast/video_decoder.h; sourceTree = "<group>"; };
-		2839E2AC1A16363E002D73E1 /* video_encoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_encoder.c; path = ../../applications/dashcast/video_encoder.c; sourceTree = "<group>"; };
-		2839E2AD1A16363E002D73E1 /* video_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_encoder.h; path = ../../applications/dashcast/video_encoder.h; sourceTree = "<group>"; };
-		2839E2AE1A16363E002D73E1 /* video_muxer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_muxer.c; path = ../../applications/dashcast/video_muxer.c; sourceTree = "<group>"; };
-		2839E2AF1A16363E002D73E1 /* video_muxer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_muxer.h; path = ../../applications/dashcast/video_muxer.h; sourceTree = "<group>"; };
-		2839E2B01A16363E002D73E1 /* video_scaler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video_scaler.c; path = ../../applications/dashcast/video_scaler.c; sourceTree = "<group>"; };
-		2839E2B11A16363E002D73E1 /* video_scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = video_scaler.h; path = ../../applications/dashcast/video_scaler.h; sourceTree = "<group>"; };
 		2839E2C41A163711002D73E1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
 		2839E2C61A16371B002D73E1 /* CoreMediaIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMediaIO.framework; path = System/Library/Frameworks/CoreMediaIO.framework; sourceTree = SDKROOT; };
 		2839E2C81A16373B002D73E1 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
@@ -685,7 +672,6 @@
 		9201000918D5A444003D1ACA /* stbl_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stbl_read.c; sourceTree = "<group>"; };
 		9201000A18D5A444003D1ACA /* stbl_write.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stbl_write.c; sourceTree = "<group>"; };
 		9201000B18D5A444003D1ACA /* track.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = track.c; sourceTree = "<group>"; };
-		9201000C18D5A444003D1ACA /* ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttml.c; sourceTree = "<group>"; };
 		9201000D18D5A444003D1ACA /* tx3g.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tx3g.c; sourceTree = "<group>"; };
 		9201000F18D5A444003D1ACA /* lsr_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_dec.c; sourceTree = "<group>"; };
 		9201001018D5A444003D1ACA /* lsr_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_enc.c; sourceTree = "<group>"; };
@@ -697,12 +683,8 @@
 		9201002818D5A444003D1ACA /* dash_segmenter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_segmenter.c; sourceTree = "<group>"; };
 		9201002918D5A444003D1ACA /* dsmcc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsmcc.c; sourceTree = "<group>"; };
 		9201002A18D5A444003D1ACA /* dvb_mpe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dvb_mpe.c; sourceTree = "<group>"; };
-		9201002B18D5A444003D1ACA /* filestreamer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filestreamer.c; sourceTree = "<group>"; };
 		9201002C18D5A444003D1ACA /* gpac_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gpac_ogg.c; sourceTree = "<group>"; };
-		9201002D18D5A444003D1ACA /* html5_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media.c; sourceTree = "<group>"; };
-		9201002E18D5A444003D1ACA /* html5_mse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse.c; sourceTree = "<group>"; };
 		9201002F18D5A444003D1ACA /* img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img.c; sourceTree = "<group>"; };
-		9201003018D5A444003D1ACA /* ismacryp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ismacryp.c; sourceTree = "<group>"; };
 		9201003118D5A444003D1ACA /* isom_hinter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_hinter.c; sourceTree = "<group>"; };
 		9201003218D5A444003D1ACA /* isom_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_tools.c; sourceTree = "<group>"; };
 		9201003318D5A444003D1ACA /* m2ts_mux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m2ts_mux.c; sourceTree = "<group>"; };
@@ -715,7 +697,6 @@
 		9201003A18D5A444003D1ACA /* mpegts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpegts.c; sourceTree = "<group>"; };
 		9201003B18D5A444003D1ACA /* reedsolomon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reedsolomon.c; sourceTree = "<group>"; };
 		9201003C18D5A444003D1ACA /* saf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = saf.c; sourceTree = "<group>"; };
-		9201003D18D5A444003D1ACA /* text_import.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = text_import.c; sourceTree = "<group>"; };
 		9201003E18D5A444003D1ACA /* vobsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vobsub.c; sourceTree = "<group>"; };
 		9201003F18D5A444003D1ACA /* webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt.c; sourceTree = "<group>"; };
 		9201004118D5A444003D1ACA /* desc_private.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = desc_private.c; sourceTree = "<group>"; };
@@ -748,9 +729,6 @@
 		9201005E18D5A444003D1ACA /* base_scenegraph.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_scenegraph.c; sourceTree = "<group>"; };
 		9201005F18D5A444003D1ACA /* commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = commands.c; sourceTree = "<group>"; };
 		9201006018D5A444003D1ACA /* dom_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_events.c; sourceTree = "<group>"; };
-		9201006118D5A444003D1ACA /* dom_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_smjs.c; sourceTree = "<group>"; };
-		9201006218D5A444003D1ACA /* html5_media_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media_smjs.c; sourceTree = "<group>"; };
-		9201006318D5A444003D1ACA /* html5_mse_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse_smjs.c; sourceTree = "<group>"; };
 		9201006418D5A444003D1ACA /* mpeg4_animators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animators.c; sourceTree = "<group>"; };
 		9201006518D5A444003D1ACA /* mpeg4_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_nodes.c; sourceTree = "<group>"; };
 		9201006618D5A444003D1ACA /* mpeg4_valuator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_valuator.c; sourceTree = "<group>"; };
@@ -758,38 +736,14 @@
 		9201006818D5A444003D1ACA /* smil_timing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smil_timing.c; sourceTree = "<group>"; };
 		9201006918D5A444003D1ACA /* svg_attributes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_attributes.c; sourceTree = "<group>"; };
 		9201006A18D5A444003D1ACA /* svg_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_properties.c; sourceTree = "<group>"; };
-		9201006B18D5A444003D1ACA /* svg_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_smjs.c; sourceTree = "<group>"; };
 		9201006C18D5A444003D1ACA /* svg_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_types.c; sourceTree = "<group>"; };
 		9201006D18D5A444003D1ACA /* vrml_interpolators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_interpolators.c; sourceTree = "<group>"; };
 		9201006E18D5A444003D1ACA /* vrml_proto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_proto.c; sourceTree = "<group>"; };
 		9201006F18D5A444003D1ACA /* vrml_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_route.c; sourceTree = "<group>"; };
 		9201007018D5A444003D1ACA /* vrml_script.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_script.c; sourceTree = "<group>"; };
-		9201007118D5A444003D1ACA /* vrml_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_smjs.c; sourceTree = "<group>"; };
 		9201007218D5A444003D1ACA /* vrml_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_tools.c; sourceTree = "<group>"; };
-		9201007318D5A444003D1ACA /* webvtt_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt_smjs.c; sourceTree = "<group>"; };
 		9201007418D5A444003D1ACA /* x3d_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_nodes.c; sourceTree = "<group>"; };
-		9201007518D5A444003D1ACA /* xbl_process.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xbl_process.c; sourceTree = "<group>"; };
 		9201007618D5A444003D1ACA /* xml_ns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml_ns.c; sourceTree = "<group>"; };
-		9201007818D5A444003D1ACA /* channel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = channel.c; sourceTree = "<group>"; };
-		9201007918D5A444003D1ACA /* clock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clock.c; sourceTree = "<group>"; };
-		9201007A18D5A444003D1ACA /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; };
-		9201007B18D5A444003D1ACA /* input_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = input_sensor.c; sourceTree = "<group>"; };
-		9201007C18D5A444003D1ACA /* input_sensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input_sensor.h; sourceTree = "<group>"; };
-		9201007D18D5A444003D1ACA /* media_control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_control.c; sourceTree = "<group>"; };
-		9201007E18D5A444003D1ACA /* media_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_control.h; sourceTree = "<group>"; };
-		9201007F18D5A444003D1ACA /* media_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_manager.c; sourceTree = "<group>"; };
-		9201008018D5A444003D1ACA /* media_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_memory.c; sourceTree = "<group>"; };
-		9201008118D5A444003D1ACA /* media_memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_memory.h; sourceTree = "<group>"; };
-		9201008218D5A444003D1ACA /* media_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_object.c; sourceTree = "<group>"; };
-		9201008318D5A444003D1ACA /* media_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_sensor.c; sourceTree = "<group>"; };
-		9201008418D5A444003D1ACA /* mpeg4_inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inline.c; sourceTree = "<group>"; };
-		9201008518D5A444003D1ACA /* network_service.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = network_service.c; sourceTree = "<group>"; };
-		9201008618D5A444003D1ACA /* object_browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_browser.c; sourceTree = "<group>"; };
-		9201008718D5A444003D1ACA /* object_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_manager.c; sourceTree = "<group>"; };
-		9201008818D5A444003D1ACA /* scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene.c; sourceTree = "<group>"; };
-		9201008918D5A444003D1ACA /* svg_external.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_external.c; sourceTree = "<group>"; };
-		9201008A18D5A444003D1ACA /* term_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = term_node_init.c; sourceTree = "<group>"; };
-		9201008B18D5A444003D1ACA /* terminal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = terminal.c; sourceTree = "<group>"; };
 		9201008D18D5A444003D1ACA /* alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alloc.c; sourceTree = "<group>"; };
 		9201008E18D5A444003D1ACA /* base_encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_encoding.c; sourceTree = "<group>"; };
 		9201008F18D5A444003D1ACA /* bitstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitstream.c; sourceTree = "<group>"; };
@@ -800,7 +754,6 @@
 		9201009418D5A444003D1ACA /* downloader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = downloader.c; sourceTree = "<group>"; };
 		9201009518D5A444003D1ACA /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; };
 		9201009718D5A444003D1ACA /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
-		9201009818D5A444003D1ACA /* map.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = map.c; sourceTree = "<group>"; };
 		9201009918D5A444003D1ACA /* math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = math.c; sourceTree = "<group>"; };
 		9201009A18D5A444003D1ACA /* module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; };
 		9201009B18D5A444003D1ACA /* module_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_wrap.h; sourceTree = "<group>"; };
@@ -810,7 +763,6 @@
 		920100A018D5A444003D1ACA /* os_thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_thread.c; sourceTree = "<group>"; };
 		920100A118D5A444003D1ACA /* path2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = path2d.c; sourceTree = "<group>"; };
 		920100A218D5A444003D1ACA /* path2d_stroker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = path2d_stroker.c; sourceTree = "<group>"; };
-		920100A318D5A444003D1ACA /* ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringbuffer.c; sourceTree = "<group>"; };
 		920100A418D5A444003D1ACA /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
 		920100A718D5A444003D1ACA /* token.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = token.c; sourceTree = "<group>"; };
 		920100A818D5A444003D1ACA /* uni_bidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uni_bidi.c; sourceTree = "<group>"; };
@@ -821,243 +773,6 @@
 		920101CE18D5AC67003D1ACA /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
 		920101D018D5ACA7003D1ACA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.6.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
 		9201F93718D5A38A003D1ACA /* libgpac.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libgpac.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		9201FE8218D5A444003D1ACA /* arith_decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = arith_decoder.dep; sourceTree = "<group>"; };
-		9201FE8318D5A444003D1ACA /* bifs_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bifs_codec.dep; sourceTree = "<group>"; };
-		9201FE8418D5A444003D1ACA /* bifs_node_tables.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bifs_node_tables.dep; sourceTree = "<group>"; };
-		9201FE8518D5A444003D1ACA /* com_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com_dec.dep; sourceTree = "<group>"; };
-		9201FE8618D5A444003D1ACA /* com_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com_enc.dep; sourceTree = "<group>"; };
-		9201FE8718D5A444003D1ACA /* conditional.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = conditional.dep; sourceTree = "<group>"; };
-		9201FE8818D5A444003D1ACA /* field_decode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = field_decode.dep; sourceTree = "<group>"; };
-		9201FE8918D5A444003D1ACA /* field_encode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = field_encode.dep; sourceTree = "<group>"; };
-		9201FE8A18D5A444003D1ACA /* memory_decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = memory_decoder.dep; sourceTree = "<group>"; };
-		9201FE8B18D5A444003D1ACA /* predictive_mffield.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = predictive_mffield.dep; sourceTree = "<group>"; };
-		9201FE8C18D5A444003D1ACA /* quantize.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = quantize.dep; sourceTree = "<group>"; };
-		9201FE8D18D5A444003D1ACA /* script_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = script_dec.dep; sourceTree = "<group>"; };
-		9201FE8E18D5A444003D1ACA /* script_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = script_enc.dep; sourceTree = "<group>"; };
-		9201FE8F18D5A444003D1ACA /* unquantize.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unquantize.dep; sourceTree = "<group>"; };
-		9201FE9118D5A444003D1ACA /* audio_input.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_input.dep; sourceTree = "<group>"; };
-		9201FE9218D5A444003D1ACA /* audio_mixer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_mixer.dep; sourceTree = "<group>"; };
-		9201FE9318D5A444003D1ACA /* audio_render.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_render.dep; sourceTree = "<group>"; };
-		9201FE9418D5A444003D1ACA /* bindable.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bindable.dep; sourceTree = "<group>"; };
-		9201FE9518D5A444003D1ACA /* camera.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = camera.dep; sourceTree = "<group>"; };
-		9201FE9618D5A444003D1ACA /* compositor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor.dep; sourceTree = "<group>"; };
-		9201FE9718D5A444003D1ACA /* compositor_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_2d.dep; sourceTree = "<group>"; };
-		9201FE9818D5A444003D1ACA /* compositor_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_3d.dep; sourceTree = "<group>"; };
-		9201FE9918D5A444003D1ACA /* compositor_node_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_node_init.dep; sourceTree = "<group>"; };
-		9201FE9A18D5A444003D1ACA /* drawable.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = drawable.dep; sourceTree = "<group>"; };
-		9201FE9B18D5A444003D1ACA /* events.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = events.dep; sourceTree = "<group>"; };
-		9201FE9C18D5A444003D1ACA /* font_engine.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = font_engine.dep; sourceTree = "<group>"; };
-		9201FE9D18D5A444003D1ACA /* hardcoded_protos.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hardcoded_protos.dep; sourceTree = "<group>"; };
-		9201FE9E18D5A444003D1ACA /* hc_flash_shape.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hc_flash_shape.dep; sourceTree = "<group>"; };
-		9201FE9F18D5A444003D1ACA /* mesh.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh.dep; sourceTree = "<group>"; };
-		9201FEA018D5A444003D1ACA /* mesh_collide.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh_collide.dep; sourceTree = "<group>"; };
-		9201FEA118D5A444003D1ACA /* mesh_tesselate.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh_tesselate.dep; sourceTree = "<group>"; };
-		9201FEA218D5A444003D1ACA /* mpeg4_animstream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_animstream.dep; sourceTree = "<group>"; };
-		9201FEA318D5A444003D1ACA /* mpeg4_audio.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_audio.dep; sourceTree = "<group>"; };
-		9201FEA418D5A444003D1ACA /* mpeg4_background.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_background.dep; sourceTree = "<group>"; };
-		9201FEA518D5A444003D1ACA /* mpeg4_background2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_background2d.dep; sourceTree = "<group>"; };
-		9201FEA618D5A444003D1ACA /* mpeg4_bitmap.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_bitmap.dep; sourceTree = "<group>"; };
-		9201FEA718D5A444003D1ACA /* mpeg4_composite.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_composite.dep; sourceTree = "<group>"; };
-		9201FEA818D5A444003D1ACA /* mpeg4_form.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_form.dep; sourceTree = "<group>"; };
-		9201FEA918D5A444003D1ACA /* mpeg4_geometry_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_2d.dep; sourceTree = "<group>"; };
-		9201FEAA18D5A444003D1ACA /* mpeg4_geometry_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_3d.dep; sourceTree = "<group>"; };
-		9201FEAB18D5A444003D1ACA /* mpeg4_geometry_ifs2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_ifs2d.dep; sourceTree = "<group>"; };
-		9201FEAC18D5A444003D1ACA /* mpeg4_geometry_ils2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_ils2d.dep; sourceTree = "<group>"; };
-		9201FEAD18D5A444003D1ACA /* mpeg4_gradients.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_gradients.dep; sourceTree = "<group>"; };
-		9201FEAE18D5A444003D1ACA /* mpeg4_grouping.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping.dep; sourceTree = "<group>"; };
-		9201FEAF18D5A444003D1ACA /* mpeg4_grouping_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping_2d.dep; sourceTree = "<group>"; };
-		9201FEB018D5A444003D1ACA /* mpeg4_grouping_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping_3d.dep; sourceTree = "<group>"; };
-		9201FEB118D5A444003D1ACA /* mpeg4_layer_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layer_2d.dep; sourceTree = "<group>"; };
-		9201FEB218D5A444003D1ACA /* mpeg4_layer_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layer_3d.dep; sourceTree = "<group>"; };
-		9201FEB318D5A444003D1ACA /* mpeg4_layout.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layout.dep; sourceTree = "<group>"; };
-		9201FEB418D5A444003D1ACA /* mpeg4_lighting.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_lighting.dep; sourceTree = "<group>"; };
-		9201FEB518D5A444003D1ACA /* mpeg4_path_layout.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_path_layout.dep; sourceTree = "<group>"; };
-		9201FEB618D5A444003D1ACA /* mpeg4_sensors.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_sensors.dep; sourceTree = "<group>"; };
-		9201FEB718D5A444003D1ACA /* mpeg4_sound.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_sound.dep; sourceTree = "<group>"; };
-		9201FEB818D5A444003D1ACA /* mpeg4_text.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_text.dep; sourceTree = "<group>"; };
-		9201FEB918D5A444003D1ACA /* mpeg4_textures.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_textures.dep; sourceTree = "<group>"; };
-		9201FEBA18D5A444003D1ACA /* mpeg4_timesensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_timesensor.dep; sourceTree = "<group>"; };
-		9201FEBB18D5A444003D1ACA /* mpeg4_viewport.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_viewport.dep; sourceTree = "<group>"; };
-		9201FEBC18D5A444003D1ACA /* navigate.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = navigate.dep; sourceTree = "<group>"; };
-		9201FEBD18D5A444003D1ACA /* offscreen_cache.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = offscreen_cache.dep; sourceTree = "<group>"; };
-		9201FEBE18D5A444003D1ACA /* svg_base.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_base.dep; sourceTree = "<group>"; };
-		9201FEBF18D5A444003D1ACA /* svg_filters.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_filters.dep; sourceTree = "<group>"; };
-		9201FEC018D5A444003D1ACA /* svg_font.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_font.dep; sourceTree = "<group>"; };
-		9201FEC118D5A444003D1ACA /* svg_geometry.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_geometry.dep; sourceTree = "<group>"; };
-		9201FEC218D5A444003D1ACA /* svg_grouping.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_grouping.dep; sourceTree = "<group>"; };
-		9201FEC318D5A444003D1ACA /* svg_media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_media.dep; sourceTree = "<group>"; };
-		9201FEC418D5A444003D1ACA /* svg_paint_servers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_paint_servers.dep; sourceTree = "<group>"; };
-		9201FEC518D5A444003D1ACA /* svg_text.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_text.dep; sourceTree = "<group>"; };
-		9201FEC618D5A444003D1ACA /* texturing.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturing.dep; sourceTree = "<group>"; };
-		9201FEC718D5A444003D1ACA /* texturing_gl.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturing_gl.dep; sourceTree = "<group>"; };
-		9201FEC818D5A444003D1ACA /* visual_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager.dep; sourceTree = "<group>"; };
-		9201FEC918D5A444003D1ACA /* visual_manager_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_2d.dep; sourceTree = "<group>"; };
-		9201FECA18D5A444003D1ACA /* visual_manager_2d_draw.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_2d_draw.dep; sourceTree = "<group>"; };
-		9201FECB18D5A444003D1ACA /* visual_manager_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_3d.dep; sourceTree = "<group>"; };
-		9201FECC18D5A444003D1ACA /* visual_manager_3d_gl.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_3d_gl.dep; sourceTree = "<group>"; };
-		9201FECD18D5A444003D1ACA /* x3d_geometry.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = x3d_geometry.dep; sourceTree = "<group>"; };
-		9201FECF18D5A444003D1ACA /* rtcp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtcp.dep; sourceTree = "<group>"; };
-		9201FED018D5A444003D1ACA /* rtp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp.dep; sourceTree = "<group>"; };
-		9201FED118D5A444003D1ACA /* rtp_depacketizer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_depacketizer.dep; sourceTree = "<group>"; };
-		9201FED218D5A444003D1ACA /* rtp_packetizer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_packetizer.dep; sourceTree = "<group>"; };
-		9201FED318D5A444003D1ACA /* rtp_pck_3gpp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_3gpp.dep; sourceTree = "<group>"; };
-		9201FED418D5A444003D1ACA /* rtp_pck_mpeg12.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_mpeg12.dep; sourceTree = "<group>"; };
-		9201FED518D5A444003D1ACA /* rtp_pck_mpeg4.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_mpeg4.dep; sourceTree = "<group>"; };
-		9201FED618D5A444003D1ACA /* rtp_streamer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_streamer.dep; sourceTree = "<group>"; };
-		9201FED718D5A444003D1ACA /* rtsp_command.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_command.dep; sourceTree = "<group>"; };
-		9201FED818D5A444003D1ACA /* rtsp_common.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_common.dep; sourceTree = "<group>"; };
-		9201FED918D5A444003D1ACA /* rtsp_response.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_response.dep; sourceTree = "<group>"; };
-		9201FEDA18D5A444003D1ACA /* rtsp_session.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_session.dep; sourceTree = "<group>"; };
-		9201FEDB18D5A444003D1ACA /* sdp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sdp.dep; sourceTree = "<group>"; };
-		9201FEDD18D5A444003D1ACA /* avc_ext.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = avc_ext.dep; sourceTree = "<group>"; };
-		9201FEDE18D5A444003D1ACA /* box_code_3gpp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_3gpp.dep; sourceTree = "<group>"; };
-		9201FEDF18D5A444003D1ACA /* box_code_adobe.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_adobe.dep; sourceTree = "<group>"; };
-		9201FEE018D5A444003D1ACA /* box_code_apple.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_apple.dep; sourceTree = "<group>"; };
-		9201FEE118D5A444003D1ACA /* box_code_base.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_base.dep; sourceTree = "<group>"; };
-		9201FEE218D5A444003D1ACA /* box_code_drm.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_drm.dep; sourceTree = "<group>"; };
-		9201FEE318D5A444003D1ACA /* box_code_meta.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_meta.dep; sourceTree = "<group>"; };
-		9201FEE418D5A444003D1ACA /* box_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_dump.dep; sourceTree = "<group>"; };
-		9201FEE518D5A444003D1ACA /* box_funcs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_funcs.dep; sourceTree = "<group>"; };
-		9201FEE618D5A444003D1ACA /* data_map.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = data_map.dep; sourceTree = "<group>"; };
-		9201FEE718D5A444003D1ACA /* drm_sample.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = drm_sample.dep; sourceTree = "<group>"; };
-		9201FEE818D5A444003D1ACA /* generic_subtitle.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = generic_subtitle.dep; sourceTree = "<group>"; };
-		9201FEE918D5A444003D1ACA /* hint_track.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hint_track.dep; sourceTree = "<group>"; };
-		9201FEEA18D5A444003D1ACA /* hinting.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hinting.dep; sourceTree = "<group>"; };
-		9201FEEB18D5A444003D1ACA /* isom_intern.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_intern.dep; sourceTree = "<group>"; };
-		9201FEEC18D5A444003D1ACA /* isom_read.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_read.dep; sourceTree = "<group>"; };
-		9201FEED18D5A444003D1ACA /* isom_store.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_store.dep; sourceTree = "<group>"; };
-		9201FEEE18D5A444003D1ACA /* isom_write.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_write.dep; sourceTree = "<group>"; };
-		9201FEEF18D5A444003D1ACA /* media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media.dep; sourceTree = "<group>"; };
-		9201FEF018D5A444003D1ACA /* media_odf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_odf.dep; sourceTree = "<group>"; };
-		9201FEF118D5A444003D1ACA /* meta.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = meta.dep; sourceTree = "<group>"; };
-		9201FEF218D5A444003D1ACA /* movie_fragments.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = movie_fragments.dep; sourceTree = "<group>"; };
-		9201FEF318D5A444003D1ACA /* sample_descs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sample_descs.dep; sourceTree = "<group>"; };
-		9201FEF418D5A444003D1ACA /* stbl_read.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stbl_read.dep; sourceTree = "<group>"; };
-		9201FEF518D5A444003D1ACA /* stbl_write.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stbl_write.dep; sourceTree = "<group>"; };
-		9201FEF618D5A444003D1ACA /* track.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = track.dep; sourceTree = "<group>"; };
-		9201FEF718D5A444003D1ACA /* ttml.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ttml.dep; sourceTree = "<group>"; };
-		9201FEF818D5A444003D1ACA /* tx3g.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tx3g.dep; sourceTree = "<group>"; };
-		9201FEFA18D5A444003D1ACA /* lsr_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_dec.dep; sourceTree = "<group>"; };
-		9201FEFB18D5A444003D1ACA /* lsr_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_enc.dep; sourceTree = "<group>"; };
-		9201FEFC18D5A444003D1ACA /* lsr_tables.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_tables.dep; sourceTree = "<group>"; };
-		9201FF0D18D5A444003D1ACA /* av_parsers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = av_parsers.dep; sourceTree = "<group>"; };
-		9201FF0E18D5A444003D1ACA /* avilib.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = avilib.dep; sourceTree = "<group>"; };
-		9201FF0F18D5A444003D1ACA /* dash_client.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dash_client.dep; sourceTree = "<group>"; };
-		9201FF1018D5A444003D1ACA /* dash_segmenter.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dash_segmenter.dep; sourceTree = "<group>"; };
-		9201FF1118D5A444003D1ACA /* filestreamer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = filestreamer.dep; sourceTree = "<group>"; };
-		9201FF1218D5A444003D1ACA /* gpac_ogg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpac_ogg.dep; sourceTree = "<group>"; };
-		9201FF1318D5A444003D1ACA /* html5_media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_media.dep; sourceTree = "<group>"; };
-		9201FF1418D5A444003D1ACA /* html5_mse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_mse.dep; sourceTree = "<group>"; };
-		9201FF1518D5A444003D1ACA /* img.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = img.dep; sourceTree = "<group>"; };
-		9201FF1618D5A444003D1ACA /* ismacryp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ismacryp.dep; sourceTree = "<group>"; };
-		9201FF1718D5A444003D1ACA /* isom_hinter.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_hinter.dep; sourceTree = "<group>"; };
-		9201FF1818D5A444003D1ACA /* isom_tools.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_tools.dep; sourceTree = "<group>"; };
-		9201FF1918D5A444003D1ACA /* m2ts_mux.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = m2ts_mux.dep; sourceTree = "<group>"; };
-		9201FF1A18D5A444003D1ACA /* m3u8.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = m3u8.dep; sourceTree = "<group>"; };
-		9201FF1B18D5A444003D1ACA /* media_export.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_export.dep; sourceTree = "<group>"; };
-		9201FF1C18D5A444003D1ACA /* media_import.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_import.dep; sourceTree = "<group>"; };
-		9201FF1D18D5A444003D1ACA /* mpd.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpd.dep; sourceTree = "<group>"; };
-		9201FF1E18D5A444003D1ACA /* mpeg2_ps.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg2_ps.dep; sourceTree = "<group>"; };
-		9201FF1F18D5A444003D1ACA /* mpegts.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpegts.dep; sourceTree = "<group>"; };
-		9201FF2018D5A444003D1ACA /* saf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = saf.dep; sourceTree = "<group>"; };
-		9201FF2118D5A444003D1ACA /* text_import.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_import.dep; sourceTree = "<group>"; };
-		9201FF2218D5A444003D1ACA /* vobsub.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vobsub.dep; sourceTree = "<group>"; };
-		9201FF2318D5A444003D1ACA /* webvtt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = webvtt.dep; sourceTree = "<group>"; };
-		9201FF2518D5A444003D1ACA /* desc_private.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = desc_private.dep; sourceTree = "<group>"; };
-		9201FF2618D5A444003D1ACA /* descriptors.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = descriptors.dep; sourceTree = "<group>"; };
-		9201FF2718D5A444003D1ACA /* ipmpx_code.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_code.dep; sourceTree = "<group>"; };
-		9201FF2818D5A444003D1ACA /* ipmpx_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_dump.dep; sourceTree = "<group>"; };
-		9201FF2918D5A444003D1ACA /* ipmpx_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_parse.dep; sourceTree = "<group>"; };
-		9201FF2A18D5A444003D1ACA /* oci_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oci_codec.dep; sourceTree = "<group>"; };
-		9201FF2B18D5A444003D1ACA /* odf_code.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_code.dep; sourceTree = "<group>"; };
-		9201FF2C18D5A444003D1ACA /* odf_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_codec.dep; sourceTree = "<group>"; };
-		9201FF2D18D5A444003D1ACA /* odf_command.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_command.dep; sourceTree = "<group>"; };
-		9201FF2E18D5A444003D1ACA /* odf_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_dump.dep; sourceTree = "<group>"; };
-		9201FF2F18D5A444003D1ACA /* odf_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_parse.dep; sourceTree = "<group>"; };
-		9201FF3018D5A444003D1ACA /* qos.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = qos.dep; sourceTree = "<group>"; };
-		9201FF3118D5A444003D1ACA /* slc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = slc.dep; sourceTree = "<group>"; };
-		9201FF3318D5A444003D1ACA /* encode_isom.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encode_isom.dep; sourceTree = "<group>"; };
-		9201FF3418D5A444003D1ACA /* loader_bt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_bt.dep; sourceTree = "<group>"; };
-		9201FF3518D5A444003D1ACA /* loader_isom.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_isom.dep; sourceTree = "<group>"; };
-		9201FF3618D5A444003D1ACA /* loader_qt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_qt.dep; sourceTree = "<group>"; };
-		9201FF3718D5A444003D1ACA /* loader_svg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_svg.dep; sourceTree = "<group>"; };
-		9201FF3818D5A444003D1ACA /* loader_xmt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_xmt.dep; sourceTree = "<group>"; };
-		9201FF3918D5A444003D1ACA /* scene_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_dump.dep; sourceTree = "<group>"; };
-		9201FF3A18D5A444003D1ACA /* scene_engine.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_engine.dep; sourceTree = "<group>"; };
-		9201FF3B18D5A444003D1ACA /* scene_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_manager.dep; sourceTree = "<group>"; };
-		9201FF3C18D5A444003D1ACA /* scene_stats.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_stats.dep; sourceTree = "<group>"; };
-		9201FF3D18D5A444003D1ACA /* swf_bifs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_bifs.dep; sourceTree = "<group>"; };
-		9201FF3E18D5A444003D1ACA /* swf_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_parse.dep; sourceTree = "<group>"; };
-		9201FF3F18D5A444003D1ACA /* swf_svg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_svg.dep; sourceTree = "<group>"; };
-		9201FF4018D5A444003D1ACA /* text_to_bifs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_to_bifs.dep; sourceTree = "<group>"; };
-		9201FF4218D5A444003D1ACA /* base_scenegraph.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = base_scenegraph.dep; sourceTree = "<group>"; };
-		9201FF4318D5A444003D1ACA /* commands.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = commands.dep; sourceTree = "<group>"; };
-		9201FF4418D5A444003D1ACA /* dom_events.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dom_events.dep; sourceTree = "<group>"; };
-		9201FF4518D5A444003D1ACA /* dom_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dom_smjs.dep; sourceTree = "<group>"; };
-		9201FF4618D5A444003D1ACA /* html5_media_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_media_smjs.dep; sourceTree = "<group>"; };
-		9201FF4718D5A444003D1ACA /* html5_mse_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_mse_smjs.dep; sourceTree = "<group>"; };
-		9201FF4818D5A444003D1ACA /* mpeg4_animators.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_animators.dep; sourceTree = "<group>"; };
-		9201FF4918D5A444003D1ACA /* mpeg4_nodes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_nodes.dep; sourceTree = "<group>"; };
-		9201FF4A18D5A444003D1ACA /* mpeg4_valuator.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_valuator.dep; sourceTree = "<group>"; };
-		9201FF4B18D5A444003D1ACA /* smil_anim.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = smil_anim.dep; sourceTree = "<group>"; };
-		9201FF4C18D5A444003D1ACA /* smil_timing.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = smil_timing.dep; sourceTree = "<group>"; };
-		9201FF4D18D5A444003D1ACA /* svg_attributes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_attributes.dep; sourceTree = "<group>"; };
-		9201FF4E18D5A444003D1ACA /* svg_properties.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_properties.dep; sourceTree = "<group>"; };
-		9201FF4F18D5A444003D1ACA /* svg_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_smjs.dep; sourceTree = "<group>"; };
-		9201FF5018D5A444003D1ACA /* svg_types.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_types.dep; sourceTree = "<group>"; };
-		9201FF5118D5A444003D1ACA /* vrml_interpolators.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_interpolators.dep; sourceTree = "<group>"; };
-		9201FF5218D5A444003D1ACA /* vrml_proto.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_proto.dep; sourceTree = "<group>"; };
-		9201FF5318D5A444003D1ACA /* vrml_route.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_route.dep; sourceTree = "<group>"; };
-		9201FF5418D5A444003D1ACA /* vrml_script.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_script.dep; sourceTree = "<group>"; };
-		9201FF5518D5A444003D1ACA /* vrml_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_smjs.dep; sourceTree = "<group>"; };
-		9201FF5618D5A444003D1ACA /* vrml_tools.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_tools.dep; sourceTree = "<group>"; };
-		9201FF5718D5A444003D1ACA /* webvtt_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = webvtt_smjs.dep; sourceTree = "<group>"; };
-		9201FF5818D5A444003D1ACA /* x3d_nodes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = x3d_nodes.dep; sourceTree = "<group>"; };
-		9201FF5918D5A444003D1ACA /* xbl_process.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xbl_process.dep; sourceTree = "<group>"; };
-		9201FF5A18D5A444003D1ACA /* xml_ns.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xml_ns.dep; sourceTree = "<group>"; };
-		9201FF5C18D5A444003D1ACA /* channel.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = channel.dep; sourceTree = "<group>"; };
-		9201FF5D18D5A444003D1ACA /* clock.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = clock.dep; sourceTree = "<group>"; };
-		9201FF5E18D5A444003D1ACA /* decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = decoder.dep; sourceTree = "<group>"; };
-		9201FF5F18D5A444003D1ACA /* input_sensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = input_sensor.dep; sourceTree = "<group>"; };
-		9201FF6018D5A444003D1ACA /* media_control.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_control.dep; sourceTree = "<group>"; };
-		9201FF6118D5A444003D1ACA /* media_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_manager.dep; sourceTree = "<group>"; };
-		9201FF6218D5A444003D1ACA /* media_memory.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_memory.dep; sourceTree = "<group>"; };
-		9201FF6318D5A444003D1ACA /* media_object.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_object.dep; sourceTree = "<group>"; };
-		9201FF6418D5A444003D1ACA /* media_sensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_sensor.dep; sourceTree = "<group>"; };
-		9201FF6518D5A444003D1ACA /* mpeg4_inline.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_inline.dep; sourceTree = "<group>"; };
-		9201FF6618D5A444003D1ACA /* network_service.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = network_service.dep; sourceTree = "<group>"; };
-		9201FF6718D5A444003D1ACA /* object_browser.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = object_browser.dep; sourceTree = "<group>"; };
-		9201FF6818D5A444003D1ACA /* object_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = object_manager.dep; sourceTree = "<group>"; };
-		9201FF6918D5A444003D1ACA /* scene.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene.dep; sourceTree = "<group>"; };
-		9201FF6A18D5A444003D1ACA /* svg_external.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_external.dep; sourceTree = "<group>"; };
-		9201FF6B18D5A444003D1ACA /* term_node_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = term_node_init.dep; sourceTree = "<group>"; };
-		9201FF6C18D5A444003D1ACA /* terminal.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = terminal.dep; sourceTree = "<group>"; };
-		9201FF6E18D5A444003D1ACA /* alloc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = alloc.dep; sourceTree = "<group>"; };
-		9201FF6F18D5A444003D1ACA /* base_encoding.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = base_encoding.dep; sourceTree = "<group>"; };
-		9201FF7018D5A444003D1ACA /* bitstream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bitstream.dep; sourceTree = "<group>"; };
-		9201FF7118D5A444003D1ACA /* cache.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cache.dep; sourceTree = "<group>"; };
-		9201FF7218D5A444003D1ACA /* color.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = color.dep; sourceTree = "<group>"; };
-		9201FF7318D5A444003D1ACA /* configfile.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = configfile.dep; sourceTree = "<group>"; };
-		9201FF7418D5A444003D1ACA /* downloader.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = downloader.dep; sourceTree = "<group>"; };
-		9201FF7518D5A444003D1ACA /* error.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = error.dep; sourceTree = "<group>"; };
-		9201FF7618D5A444003D1ACA /* list.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = list.dep; sourceTree = "<group>"; };
-		9201FF7718D5A444003D1ACA /* map.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map.dep; sourceTree = "<group>"; };
-		9201FF7818D5A444003D1ACA /* math.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = math.dep; sourceTree = "<group>"; };
-		9201FF7918D5A444003D1ACA /* module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = module.dep; sourceTree = "<group>"; };
-		9201FF7A18D5A444003D1ACA /* os_config_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_config_init.dep; sourceTree = "<group>"; };
-		9201FF7C18D5A444003D1ACA /* os_module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_module.dep; sourceTree = "<group>"; };
-		9201FF7D18D5A444003D1ACA /* os_net.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_net.dep; sourceTree = "<group>"; };
-		9201FF7E18D5A444003D1ACA /* os_thread.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_thread.dep; sourceTree = "<group>"; };
-		9201FF7F18D5A444003D1ACA /* path2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = path2d.dep; sourceTree = "<group>"; };
-		9201FF8018D5A444003D1ACA /* path2d_stroker.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = path2d_stroker.dep; sourceTree = "<group>"; };
-		9201FF8118D5A444003D1ACA /* ringbuffer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ringbuffer.dep; sourceTree = "<group>"; };
-		9201FF8218D5A444003D1ACA /* sha1.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sha1.dep; sourceTree = "<group>"; };
-		9201FF8318D5A444003D1ACA /* token.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = token.dep; sourceTree = "<group>"; };
-		9201FF8418D5A444003D1ACA /* uni_bidi.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = uni_bidi.dep; sourceTree = "<group>"; };
-		9201FF8518D5A444003D1ACA /* unicode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unicode.dep; sourceTree = "<group>"; };
-		9201FF8618D5A444003D1ACA /* url.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = url.dep; sourceTree = "<group>"; };
-		9201FF8718D5A444003D1ACA /* utf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = utf.dep; sourceTree = "<group>"; };
-		9201FF8818D5A444003D1ACA /* xml_parser.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xml_parser.dep; sourceTree = "<group>"; };
 		9201FF8A18D5A444003D1ACA /* arith_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = arith_decoder.c; sourceTree = "<group>"; };
 		9201FF8B18D5A444003D1ACA /* bifs_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bifs_codec.c; sourceTree = "<group>"; };
 		9201FF8C18D5A444003D1ACA /* bifs_node_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bifs_node_tables.c; sourceTree = "<group>"; };
@@ -1074,76 +789,6 @@
 		9201FF9718D5A444003D1ACA /* script_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = script_dec.c; sourceTree = "<group>"; };
 		9201FF9818D5A444003D1ACA /* script_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = script_enc.c; sourceTree = "<group>"; };
 		9201FF9918D5A444003D1ACA /* unquantize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unquantize.c; sourceTree = "<group>"; };
-		9201FF9B18D5A444003D1ACA /* audio_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_input.c; sourceTree = "<group>"; };
-		9201FF9C18D5A444003D1ACA /* audio_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_mixer.c; sourceTree = "<group>"; };
-		9201FF9D18D5A444003D1ACA /* audio_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_render.c; sourceTree = "<group>"; };
-		9201FF9E18D5A444003D1ACA /* bindable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bindable.c; sourceTree = "<group>"; };
-		9201FF9F18D5A444003D1ACA /* camera.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = camera.c; sourceTree = "<group>"; };
-		9201FFA018D5A444003D1ACA /* compositor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor.c; sourceTree = "<group>"; };
-		9201FFA118D5A444003D1ACA /* compositor_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_2d.c; sourceTree = "<group>"; };
-		9201FFA218D5A444003D1ACA /* compositor_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_3d.c; sourceTree = "<group>"; };
-		9201FFA318D5A444003D1ACA /* compositor_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_node_init.c; sourceTree = "<group>"; };
-		9201FFA418D5A444003D1ACA /* drawable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drawable.c; sourceTree = "<group>"; };
-		9201FFA518D5A444003D1ACA /* drawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drawable.h; sourceTree = "<group>"; };
-		9201FFA618D5A444003D1ACA /* events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = events.c; sourceTree = "<group>"; };
-		9201FFA718D5A444003D1ACA /* font_engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font_engine.c; sourceTree = "<group>"; };
-		9201FFA818D5A444003D1ACA /* gl_inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl_inc.h; sourceTree = "<group>"; };
-		9201FFA918D5A444003D1ACA /* hardcoded_protos.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hardcoded_protos.c; sourceTree = "<group>"; };
-		9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hc_flash_shape.c; sourceTree = "<group>"; };
-		9201FFAB18D5A444003D1ACA /* mesh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh.c; sourceTree = "<group>"; };
-		9201FFAC18D5A444003D1ACA /* mesh_collide.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_collide.c; sourceTree = "<group>"; };
-		9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_tesselate.c; sourceTree = "<group>"; };
-		9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animstream.c; sourceTree = "<group>"; };
-		9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_audio.c; sourceTree = "<group>"; };
-		9201FFB018D5A444003D1ACA /* mpeg4_background.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background.c; sourceTree = "<group>"; };
-		9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background2d.c; sourceTree = "<group>"; };
-		9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_bitmap.c; sourceTree = "<group>"; };
-		9201FFB318D5A444003D1ACA /* mpeg4_composite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_composite.c; sourceTree = "<group>"; };
-		9201FFB418D5A444003D1ACA /* mpeg4_form.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_form.c; sourceTree = "<group>"; };
-		9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_2d.c; sourceTree = "<group>"; };
-		9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_3d.c; sourceTree = "<group>"; };
-		9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ifs2d.c; sourceTree = "<group>"; };
-		9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ils2d.c; sourceTree = "<group>"; };
-		9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_gradients.c; sourceTree = "<group>"; };
-		9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping.c; sourceTree = "<group>"; };
-		9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeg4_grouping.h; sourceTree = "<group>"; };
-		9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_2d.c; sourceTree = "<group>"; };
-		9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_3d.c; sourceTree = "<group>"; };
-		9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_2d.c; sourceTree = "<group>"; };
-		9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_3d.c; sourceTree = "<group>"; };
-		9201FFC018D5A444003D1ACA /* mpeg4_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layout.c; sourceTree = "<group>"; };
-		9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_lighting.c; sourceTree = "<group>"; };
-		9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_path_layout.c; sourceTree = "<group>"; };
-		9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sensors.c; sourceTree = "<group>"; };
-		9201FFC418D5A444003D1ACA /* mpeg4_sound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sound.c; sourceTree = "<group>"; };
-		9201FFC518D5A444003D1ACA /* mpeg4_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_text.c; sourceTree = "<group>"; };
-		9201FFC618D5A444003D1ACA /* mpeg4_textures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_textures.c; sourceTree = "<group>"; };
-		9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_timesensor.c; sourceTree = "<group>"; };
-		9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_viewport.c; sourceTree = "<group>"; };
-		9201FFC918D5A444003D1ACA /* navigate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = navigate.c; sourceTree = "<group>"; };
-		9201FFCA18D5A444003D1ACA /* nodes_stacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nodes_stacks.h; sourceTree = "<group>"; };
-		9201FFCB18D5A444003D1ACA /* offscreen_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = offscreen_cache.c; sourceTree = "<group>"; };
-		9201FFCC18D5A444003D1ACA /* offscreen_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = offscreen_cache.h; sourceTree = "<group>"; };
-		9201FFCD18D5A444003D1ACA /* svg_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_base.c; sourceTree = "<group>"; };
-		9201FFCE18D5A444003D1ACA /* svg_filters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_filters.c; sourceTree = "<group>"; };
-		9201FFCF18D5A444003D1ACA /* svg_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_font.c; sourceTree = "<group>"; };
-		9201FFD018D5A444003D1ACA /* svg_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_geometry.c; sourceTree = "<group>"; };
-		9201FFD118D5A444003D1ACA /* svg_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_grouping.c; sourceTree = "<group>"; };
-		9201FFD218D5A444003D1ACA /* svg_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_media.c; sourceTree = "<group>"; };
-		9201FFD318D5A444003D1ACA /* svg_paint_servers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_paint_servers.c; sourceTree = "<group>"; };
-		9201FFD418D5A444003D1ACA /* svg_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_text.c; sourceTree = "<group>"; };
-		9201FFD518D5A444003D1ACA /* texturing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing.c; sourceTree = "<group>"; };
-		9201FFD618D5A444003D1ACA /* texturing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texturing.h; sourceTree = "<group>"; };
-		9201FFD718D5A444003D1ACA /* texturing_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing_gl.c; sourceTree = "<group>"; };
-		9201FFD818D5A444003D1ACA /* visual_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager.c; sourceTree = "<group>"; };
-		9201FFD918D5A444003D1ACA /* visual_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager.h; sourceTree = "<group>"; };
-		9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d.c; sourceTree = "<group>"; };
-		9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_2d.h; sourceTree = "<group>"; };
-		9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d_draw.c; sourceTree = "<group>"; };
-		9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d.c; sourceTree = "<group>"; };
-		9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_3d.h; sourceTree = "<group>"; };
-		9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d_gl.c; sourceTree = "<group>"; };
-		9201FFE018D5A444003D1ACA /* x3d_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_geometry.c; sourceTree = "<group>"; };
 		9201FFE418D5A444003D1ACA /* rtcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtcp.c; sourceTree = "<group>"; };
 		9201FFE518D5A444003D1ACA /* rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp.c; sourceTree = "<group>"; };
 		9201FFE618D5A444003D1ACA /* rtp_depacketizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_depacketizer.c; sourceTree = "<group>"; };
@@ -1170,97 +815,242 @@
 		9201FFFC18D5A444003D1ACA /* drm_sample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drm_sample.c; sourceTree = "<group>"; };
 		9201FFFE18D5A444003D1ACA /* hint_track.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hint_track.c; sourceTree = "<group>"; };
 		9201FFFF18D5A444003D1ACA /* hinting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hinting.c; sourceTree = "<group>"; };
-		9225732418D7267900D6FD98 /* gm_ogg_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ogg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		9225732A18D7269700D6FD98 /* ogg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_in.c; path = ../../modules/ogg/ogg_in.c; sourceTree = "<group>"; };
-		9225732B18D7269700D6FD98 /* ogg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ogg_in.h; path = ../../modules/ogg/ogg_in.h; sourceTree = "<group>"; };
-		9225732C18D7269700D6FD98 /* ogg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_load.c; path = ../../modules/ogg/ogg_load.c; sourceTree = "<group>"; };
-		9225732D18D7269700D6FD98 /* theora_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = theora_dec.c; path = ../../modules/ogg/theora_dec.c; sourceTree = "<group>"; };
-		9225732E18D7269700D6FD98 /* vorbis_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vorbis_dec.c; path = ../../modules/ogg/vorbis_dec.c; sourceTree = "<group>"; };
+		9203644A20ECF67C0087883E /* dmx_gsf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_gsf.c; path = filters/dmx_gsf.c; sourceTree = "<group>"; };
+		9203644C20EE0F190087883E /* in_sock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_sock.c; path = filters/in_sock.c; sourceTree = "<group>"; };
+		9203644E20EE12470087883E /* out_sock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_sock.c; path = filters/out_sock.c; sourceTree = "<group>"; };
+		92061A841FE0484500B5C464 /* reframer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframer.c; path = filters/reframer.c; sourceTree = "<group>"; };
+		9206822B20EA41530041169F /* in_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_pipe.c; path = filters/in_pipe.c; sourceTree = "<group>"; };
+		9206822D20EA69680041169F /* out_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_pipe.c; path = filters/out_pipe.c; sourceTree = "<group>"; };
+		9206823320EA96AA0041169F /* mux_gsf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_gsf.c; path = filters/mux_gsf.c; sourceTree = "<group>"; };
+		9210D006237041C2007AFB48 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgrays.c; path = evg/ftgrays.c; sourceTree = "<group>"; };
+		9212C0FA222D7AC000FE3580 /* vflip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vflip.c; path = filters/vflip.c; sourceTree = "<group>"; };
+		92256CCC20E0DA26004EB243 /* encrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = encrypt_cenc_isma.c; path = filters/encrypt_cenc_isma.c; sourceTree = "<group>"; };
+		9225DD742326790C00F94C42 /* mpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mpd.h; path = ../include/gpac/mpd.h; sourceTree = "<group>"; };
+		92261A86239A6E4600C14199 /* out_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_http.c; path = filters/out_http.c; sourceTree = "<group>"; };
+		922B27712445D5CE001D4F72 /* dec_ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttml.c; path = filters/dec_ttml.c; sourceTree = "<group>"; };
 		922B48781A5ADAB3006CBBBA /* os_module.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
-		9235E04A1CFECCD50051D8A1 /* vtb_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtb_decode.c; path = ../../modules/vtb_decode/vtb_decode.c; sourceTree = "<group>"; };
+		922CF1241FCEE5D600F2F6A4 /* dmx_mpegps.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_mpegps.c; path = filters/dmx_mpegps.c; sourceTree = "<group>"; };
+		922CF1261FCF169900F2F6A4 /* dmx_avi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_avi.c; path = filters/dmx_avi.c; sourceTree = "<group>"; };
+		922E29812051940C00C8DCBB /* mux_avi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_avi.c; path = filters/mux_avi.c; sourceTree = "<group>"; };
+		922E29822051940C00C8DCBB /* out_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_audio.c; path = filters/out_audio.c; sourceTree = "<group>"; };
+		9231B3AE2321533F00ADB4A9 /* Remotery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Remotery.h; path = ../include/gpac/Remotery.h; sourceTree = "<group>"; };
+		92334C932333A8C800DA6051 /* libunicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libunicode.c; path = quickjs/libunicode.c; sourceTree = "<group>"; };
+		92334CA22333A8C900DA6051 /* quickjs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = quickjs.h; path = quickjs/quickjs.h; sourceTree = "<group>"; };
+		92334CA42333A8C900DA6051 /* quickjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = quickjs.c; path = quickjs/quickjs.c; sourceTree = "<group>"; };
+		92334CE02333AF0400DA6051 /* jsfilter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jsfilter.c; path = filters/jsfilter.c; sourceTree = "<group>"; };
+		9234CF381FD6A6E400CCDFA1 /* dec_ttxt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttxt.c; path = filters/dec_ttxt.c; sourceTree = "<group>"; };
+		9234CF3C1FD7E00700CCDFA1 /* filter_register.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_register.c; path = filter_core/filter_register.c; sourceTree = "<group>"; };
+		9234CF3E1FD8311400CCDFA1 /* dec_webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_webvtt.c; path = filters/dec_webvtt.c; sourceTree = "<group>"; };
+		9234CF401FD8343F00CCDFA1 /* in_rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_stream.c; path = filters/in_rtp_stream.c; sourceTree = "<group>"; };
+		9234CF411FD8343F00CCDFA1 /* in_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp.c; path = filters/in_rtp.c; sourceTree = "<group>"; };
+		9234CF421FD8344000CCDFA1 /* in_rtp_sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_sdp.c; path = filters/in_rtp_sdp.c; sourceTree = "<group>"; };
+		9234CF431FD8344000CCDFA1 /* in_rtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = in_rtp.h; path = filters/in_rtp.h; sourceTree = "<group>"; };
+		9234CF441FD8344000CCDFA1 /* in_rtp_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_signaling.c; path = filters/in_rtp_signaling.c; sourceTree = "<group>"; };
+		9234CF451FD8344000CCDFA1 /* in_rtp_rtsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_rtsp.c; path = filters/in_rtp_rtsp.c; sourceTree = "<group>"; };
 		9235E04F1CFECD370051D8A1 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		9235E0511CFECD450051D8A1 /* VideoToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = VideoToolbox.framework; path = System/Library/Frameworks/VideoToolbox.framework; sourceTree = SDKROOT; };
+		9239B8D5207369E5005F7264 /* enc_jpg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enc_jpg.c; path = filters/enc_jpg.c; sourceTree = "<group>"; };
+		9239B8D72073AFEF005F7264 /* enc_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enc_png.c; path = filters/enc_png.c; sourceTree = "<group>"; };
+		923C337C234794F2001CED08 /* evg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evg.c; path = jsmods/evg.c; sourceTree = "<group>"; };
+		923E89C620B6F04600F299B2 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
+		923E89C720B6F04600F299B2 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = crypto/tiny_aes.h; sourceTree = "<group>"; };
+		923E89C820B6F04600F299B2 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = crypto/g_crypt.c; sourceTree = "<group>"; };
+		923E89C920B6F04600F299B2 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = crypto/tiny_aes.c; sourceTree = "<group>"; };
+		923E89CA20B6F04600F299B2 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = crypto/g_crypt_tinyaes.c; sourceTree = "<group>"; };
+		923EB53123D1B78D00E1FFA1 /* libbf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libbf.c; path = quickjs/libbf.c; sourceTree = "<group>"; };
+		92493D7F20E2A64000203C2C /* crypt_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_tools.c; sourceTree = "<group>"; };
+		92493D8120E2A81700203C2C /* crypt_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypt_tools.h; path = ../include/gpac/crypt_tools.h; sourceTree = "<group>"; };
+		924E805C206D357A00AB580F /* reframe_rawvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_rawvid.c; path = filters/reframe_rawvid.c; sourceTree = "<group>"; };
+		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>"; };
-		92597E4820B4805B000365B9 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
-		92597E4920B4805B000365B9 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = crypto/tiny_aes.h; sourceTree = "<group>"; };
-		92597E4A20B4805B000365B9 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = crypto/g_crypt.c; sourceTree = "<group>"; };
-		92597E4B20B4805B000365B9 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = crypto/tiny_aes.c; sourceTree = "<group>"; };
-		92597E4C20B4805B000365B9 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = crypto/g_crypt_tinyaes.c; sourceTree = "<group>"; };
+		9251CA881E9D3E2B0089DDC6 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4client/main.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>"; };
+		925730812056A610009DB328 /* rewrite_mp4v.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_mp4v.c; path = filters/rewrite_mp4v.c; sourceTree = "<group>"; };
+		92586A6F1EA7665D00A0838A /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ft_font.c; path = ../../modules/ft_font/ft_font.c; sourceTree = "<group>"; };
+		92586A701EA7665D00A0838A /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft_font.h; path = ../../modules/ft_font/ft_font.h; sourceTree = "<group>"; };
+		92586A7E1EAA5A4300A0838A /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../modules/validator/validator.c; sourceTree = "<group>"; };
+		925974F52215BA3A0007E02B /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_rgb.c; path = evg/raster_rgb.c; sourceTree = "<group>"; };
+		925974F62215BA3A0007E02B /* raster_argb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_argb.c; path = evg/raster_argb.c; sourceTree = "<group>"; };
+		925974F72215BA3A0007E02B /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_565.c; path = evg/raster_565.c; sourceTree = "<group>"; };
+		925974F82215BA3A0007E02B /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = evg/stencil.c; sourceTree = "<group>"; };
+		925974FA2215BA3A0007E02B /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = evg/surface.c; sourceTree = "<group>"; };
+		925974FB2215BA3A0007E02B /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rast_soft.h; path = evg/rast_soft.h; sourceTree = "<group>"; };
+		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>"; };
+		926245971FD691A000184072 /* ff_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ff_common.h; path = filters/ff_common.h; 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>"; };
+		926656C71F7E92C200299CC6 /* dmx_m2ts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_m2ts.c; path = filters/dmx_m2ts.c; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
+		9273463223506D370081AF74 /* storage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = storage.c; path = jsmods/storage.c; sourceTree = "<group>"; };
+		9274295724647AB8009ADD8D /* bsrw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bsrw.c; path = filters/bsrw.c; sourceTree = "<group>"; };
+		92754D5F207D24F600170383 /* filelist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filelist.c; path = filters/filelist.c; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
+		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>"; };
+		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>"; };
+		92912946218A3B2B004F1A6C /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../../README.md; sourceTree = "<group>"; };
+		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; };
-		92A9D3C61CCA79B4006FF303 /* amr_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = amr_in.c; path = ../../modules/amr_dec/amr_in.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>"; };
 		92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdl_out.h; path = ../../modules/sdl_out/sdl_out.h; sourceTree = "<group>"; };
 		92AAF0DC18D6DB5500E2FF12 /* video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video.c; path = ../../modules/sdl_out/video.c; sourceTree = "<group>"; };
-		92AAF0F418D6E5D400E2FF12 /* audio_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_filter.c; path = ../../modules/audio_filter/audio_filter.c; sourceTree = "<group>"; };
-		92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bifs_dec.c; path = ../../modules/bifs_dec/bifs_dec.c; sourceTree = "<group>"; };
-		92AAF0FA18D6E62600E2FF12 /* ctx_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ctx_load.c; path = ../../modules/ctx_load/ctx_load.c; sourceTree = "<group>"; };
-		92AAF0FD18D6E64800E2FF12 /* dummy_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dummy_in.c; path = ../../modules/dummy_in/dummy_in.c; sourceTree = "<group>"; };
-		92AAF10018D6E66D00E2FF12 /* gpac_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpac_js.c; path = ../../modules/gpac_js/gpac_js.c; sourceTree = "<group>"; };
-		92AAF10318D6E69500E2FF12 /* bmp_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bmp_dec.c; path = ../../modules/img_in/bmp_dec.c; sourceTree = "<group>"; };
-		92AAF10418D6E69500E2FF12 /* img_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = img_dec.c; path = ../../modules/img_in/img_dec.c; sourceTree = "<group>"; };
-		92AAF10518D6E69500E2FF12 /* img_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = img_in.c; path = ../../modules/img_in/img_in.c; sourceTree = "<group>"; };
-		92AAF10618D6E69500E2FF12 /* img_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = img_in.h; path = ../../modules/img_in/img_in.h; sourceTree = "<group>"; };
-		92AAF10718D6E69500E2FF12 /* jp2_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jp2_dec.c; path = ../../modules/img_in/jp2_dec.c; sourceTree = "<group>"; };
-		92AAF10818D6E69500E2FF12 /* jpeg_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jpeg_dec.c; path = ../../modules/img_in/jpeg_dec.c; sourceTree = "<group>"; };
-		92AAF10918D6E69500E2FF12 /* png_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png_dec.c; path = ../../modules/img_in/png_dec.c; sourceTree = "<group>"; };
-		92AAF11218D6E6B700E2FF12 /* isma_ea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isma_ea.c; path = ../../modules/ismacryp/isma_ea.c; sourceTree = "<group>"; };
-		92AAF11518D6E6D300E2FF12 /* isom_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isom_cache.c; path = ../../modules/isom_in/isom_cache.c; sourceTree = "<group>"; };
-		92AAF11618D6E6D300E2FF12 /* isom_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isom_in.h; path = ../../modules/isom_in/isom_in.h; sourceTree = "<group>"; };
-		92AAF11718D6E6D300E2FF12 /* load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load.c; path = ../../modules/isom_in/load.c; sourceTree = "<group>"; };
-		92AAF11818D6E6D300E2FF12 /* read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = read_ch.c; path = ../../modules/isom_in/read_ch.c; sourceTree = "<group>"; };
-		92AAF11918D6E6D300E2FF12 /* read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = read.c; path = ../../modules/isom_in/read.c; sourceTree = "<group>"; };
-		92AAF12018D6E6F300E2FF12 /* laser_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = laser_dec.c; path = ../../modules/laser_dec/laser_dec.c; sourceTree = "<group>"; };
-		92AAF12318D6E70D00E2FF12 /* mpd_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpd_in.c; path = ../../modules/mpd_in/mpd_in.c; sourceTree = "<group>"; };
-		92AAF12618D6E72800E2FF12 /* mpegts_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpegts_in.c; path = ../../modules/mpegts_in/mpegts_in.c; sourceTree = "<group>"; };
-		92AAF12918D6E74200E2FF12 /* mse_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mse_in.c; path = ../../modules/mse_in/mse_in.c; sourceTree = "<group>"; };
-		92AAF12C18D6E75800E2FF12 /* odf_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = odf_dec.c; path = ../../modules/odf_dec/odf_dec.c; sourceTree = "<group>"; };
-		92AAF12F18D6E77900E2FF12 /* osd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osd.c; path = ../../modules/osd/osd.c; sourceTree = "<group>"; };
-		92AAF13218D6E7BC00E2FF12 /* rtp_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_in.c; path = ../../modules/rtp_in/rtp_in.c; sourceTree = "<group>"; };
-		92AAF13318D6E7BC00E2FF12 /* rtp_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtp_in.h; path = ../../modules/rtp_in/rtp_in.h; sourceTree = "<group>"; };
-		92AAF13418D6E7BC00E2FF12 /* rtp_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_session.c; path = ../../modules/rtp_in/rtp_session.c; sourceTree = "<group>"; };
-		92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_signaling.c; path = ../../modules/rtp_in/rtp_signaling.c; sourceTree = "<group>"; };
-		92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_stream.c; path = ../../modules/rtp_in/rtp_stream.c; sourceTree = "<group>"; };
-		92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdp_fetch.c; path = ../../modules/rtp_in/sdp_fetch.c; sourceTree = "<group>"; };
-		92AAF13818D6E7BC00E2FF12 /* sdp_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdp_load.c; path = ../../modules/rtp_in/sdp_load.c; sourceTree = "<group>"; };
-		92AAF14118D6E7D800E2FF12 /* saf_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = saf_in.c; path = ../../modules/saf_in/saf_in.c; sourceTree = "<group>"; };
-		92AAF14418D6E7F500E2FF12 /* svg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = svg_in.c; path = ../../modules/svg_in/svg_in.c; sourceTree = "<group>"; };
-		92AAF14718D6E82500E2FF12 /* timedtext_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_dec.c; path = ../../modules/timedtext/timedtext_dec.c; sourceTree = "<group>"; };
-		92AAF14818D6E82500E2FF12 /* timedtext_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_in.c; path = ../../modules/timedtext/timedtext_in.c; sourceTree = "<group>"; };
-		92AAF14C18D6E83B00E2FF12 /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = "<group>"; };
-		92AAF14F18D6E87500E2FF12 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = ../../modules/widgetman/unzip.c; sourceTree = "<group>"; };
-		92AAF15018D6E87500E2FF12 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = ../../modules/widgetman/unzip.h; sourceTree = "<group>"; };
-		92AAF15118D6E87500E2FF12 /* wgt_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wgt_load.c; path = ../../modules/widgetman/wgt_load.c; sourceTree = "<group>"; };
-		92AAF15218D6E87500E2FF12 /* widget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = widget.c; path = ../../modules/widgetman/widget.c; sourceTree = "<group>"; };
-		92AAF15318D6E87500E2FF12 /* widgetman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = widgetman.c; path = ../../modules/widgetman/widgetman.c; sourceTree = "<group>"; };
-		92AAF15418D6E87500E2FF12 /* widgetman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = widgetman.h; path = ../../modules/widgetman/widgetman.h; sourceTree = "<group>"; };
 		92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ft_font.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF16B18D6F5EA00E2FF12 /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ft_font.c; path = ../../modules/ft_font/ft_font.c; sourceTree = "<group>"; };
-		92AAF16C18D6F5EA00E2FF12 /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft_font.h; path = ../../modules/ft_font/ft_font.h; sourceTree = "<group>"; };
-		92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_aac_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF17E18D6F8EF00E2FF12 /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
-		92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = faad_dec.c; path = ../../modules/aac_in/faad_dec.c; sourceTree = "<group>"; };
-		92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ac3_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ac3_in.c; path = ../../modules/ac3_in/ac3_in.c; sourceTree = "<group>"; };
-		92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liba52_dec.c; path = ../../modules/ac3_in/liba52_dec.c; sourceTree = "<group>"; };
-		92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ffmpeg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
-		92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
-		92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
-		92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_load.c; path = ../../modules/ffmpeg_in/ffmpeg_load.c; sourceTree = "<group>"; };
-		92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_mp3_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF1B318D70A0A00E2FF12 /* mad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mad_dec.c; path = ../../modules/mp3_in/mad_dec.c; sourceTree = "<group>"; };
-		92AAF1B418D70A0A00E2FF12 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mp3_in.c; path = ../../modules/mp3_in/mp3_in.c; sourceTree = "<group>"; };
-		92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_openhevc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openhevc_dec.c; path = ../../modules/openhevc_dec/openhevc_dec.c; sourceTree = "<group>"; };
-		92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opensvc_dec.c; path = ../../modules/opensvc_dec/opensvc_dec.c; sourceTree = "<group>"; };
-		92AAF1D518D7109A00E2FF12 /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
-		92AAF1D618D7109A00E2FF12 /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
 		92B02F4E1DD2004400F85E77 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
-		92BAF023202C542C001ED2F1 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/testapps/atscdmx/main.c; sourceTree = "<group>"; };
+		92B2A4A42297FD9E002A65A7 /* out_rtsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_rtsp.c; path = filters/out_rtsp.c; sourceTree = "<group>"; };
+		92B2A4A8229D64EF002A65A7 /* hevcmerge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hevcmerge.c; path = filters/hevcmerge.c; sourceTree = "<group>"; };
+		92B2A4A9229D64EF002A65A7 /* hevcsplit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hevcsplit.c; path = filters/hevcsplit.c; sourceTree = "<group>"; };
+		92B9A5061F83FD7700A24FE4 /* in_dvb4linux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_dvb4linux.c; path = filters/in_dvb4linux.c; sourceTree = "<group>"; };
+		92B9A5081F840A6700A24FE4 /* dec_vtb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_vtb.c; path = filters/dec_vtb.c; sourceTree = "<group>"; };
+		92B9A50C1F8660B500A24FE4 /* terminal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = terminal.c; sourceTree = "<group>"; };
+		92B9A5161F8660CD00A24FE4 /* svg_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_font.c; sourceTree = "<group>"; };
+		92B9A5171F8660CE00A24FE4 /* mpeg4_geometry_ifs2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ifs2d.c; sourceTree = "<group>"; };
+		92B9A5181F8660CE00A24FE4 /* mpeg4_layer_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_3d.c; sourceTree = "<group>"; };
+		92B9A5191F8660CE00A24FE4 /* mpeg4_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layout.c; sourceTree = "<group>"; };
+		92B9A51A1F8660CE00A24FE4 /* svg_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_grouping.c; sourceTree = "<group>"; };
+		92B9A51B1F8660CE00A24FE4 /* visual_manager_3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_3d.h; sourceTree = "<group>"; };
+		92B9A51C1F8660CE00A24FE4 /* svg_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_base.c; sourceTree = "<group>"; };
+		92B9A51D1F8660CE00A24FE4 /* mpeg4_geometry_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_3d.c; sourceTree = "<group>"; };
+		92B9A51E1F8660CE00A24FE4 /* mpeg4_geometry_ils2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ils2d.c; sourceTree = "<group>"; };
+		92B9A51F1F8660CE00A24FE4 /* mpeg4_lighting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_lighting.c; sourceTree = "<group>"; };
+		92B9A5201F8660CE00A24FE4 /* compositor_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_3d.c; sourceTree = "<group>"; };
+		92B9A5211F8660CE00A24FE4 /* drawable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drawable.c; sourceTree = "<group>"; };
+		92B9A5221F8660CE00A24FE4 /* mpeg4_animstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animstream.c; sourceTree = "<group>"; };
+		92B9A5231F8660CE00A24FE4 /* mpeg4_grouping_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_3d.c; sourceTree = "<group>"; };
+		92B9A5241F8660CF00A24FE4 /* compositor_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_2d.c; sourceTree = "<group>"; };
+		92B9A5251F8660CF00A24FE4 /* drawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drawable.h; sourceTree = "<group>"; };
+		92B9A5261F8660CF00A24FE4 /* mpeg4_background2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background2d.c; sourceTree = "<group>"; };
+		92B9A5271F8660CF00A24FE4 /* mpeg4_background.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background.c; sourceTree = "<group>"; };
+		92B9A5281F8660CF00A24FE4 /* audio_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_mixer.c; sourceTree = "<group>"; };
+		92B9A5291F8660CF00A24FE4 /* mpeg4_grouping_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_2d.c; sourceTree = "<group>"; };
+		92B9A52A1F8660CF00A24FE4 /* offscreen_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = offscreen_cache.h; sourceTree = "<group>"; };
+		92B9A52B1F8660CF00A24FE4 /* navigate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = navigate.c; sourceTree = "<group>"; };
+		92B9A52C1F8660CF00A24FE4 /* svg_filters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_filters.c; sourceTree = "<group>"; };
+		92B9A52D1F8660D000A24FE4 /* svg_external.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_external.c; sourceTree = "<group>"; };
+		92B9A52E1F8660D000A24FE4 /* mpeg4_mediasensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_mediasensor.c; sourceTree = "<group>"; };
+		92B9A52F1F8660D000A24FE4 /* offscreen_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = offscreen_cache.c; sourceTree = "<group>"; };
+		92B9A5301F8660D000A24FE4 /* x3d_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_geometry.c; sourceTree = "<group>"; };
+		92B9A5311F8660D000A24FE4 /* svg_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_geometry.c; sourceTree = "<group>"; };
+		92B9A5321F8660D000A24FE4 /* hc_flash_shape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hc_flash_shape.c; sourceTree = "<group>"; };
+		92B9A5331F8660D000A24FE4 /* hardcoded_protos.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hardcoded_protos.c; sourceTree = "<group>"; };
+		92B9A5341F8660D100A24FE4 /* mpeg4_form.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_form.c; sourceTree = "<group>"; };
+		92B9A5351F8660D100A24FE4 /* mesh_tesselate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_tesselate.c; sourceTree = "<group>"; };
+		92B9A5361F8660D100A24FE4 /* gl_inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl_inc.h; sourceTree = "<group>"; };
+		92B9A5371F8660D100A24FE4 /* mpeg4_timesensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_timesensor.c; sourceTree = "<group>"; };
+		92B9A5381F8660D100A24FE4 /* scene_ns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_ns.c; sourceTree = "<group>"; };
+		92B9A5391F8660D100A24FE4 /* svg_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_text.c; sourceTree = "<group>"; };
+		92B9A53A1F8660D100A24FE4 /* visual_manager_3d_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d_gl.c; sourceTree = "<group>"; };
+		92B9A53B1F8660D100A24FE4 /* mpeg4_path_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_path_layout.c; sourceTree = "<group>"; };
+		92B9A53C1F8660D200A24FE4 /* mpeg4_composite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_composite.c; sourceTree = "<group>"; };
+		92B9A53D1F8660D200A24FE4 /* audio_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_input.c; sourceTree = "<group>"; };
+		92B9A53F1F8660D200A24FE4 /* mpeg4_bitmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_bitmap.c; sourceTree = "<group>"; };
+		92B9A5401F8660D200A24FE4 /* mpeg4_layer_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_2d.c; sourceTree = "<group>"; };
+		92B9A5411F8660D200A24FE4 /* mpeg4_geometry_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_2d.c; sourceTree = "<group>"; };
+		92B9A5421F8660D200A24FE4 /* visual_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager.h; sourceTree = "<group>"; };
+		92B9A5431F8660D300A24FE4 /* mpeg4_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_text.c; sourceTree = "<group>"; };
+		92B9A5441F8660D300A24FE4 /* visual_manager_2d_draw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d_draw.c; sourceTree = "<group>"; };
+		92B9A5451F8660D300A24FE4 /* svg_paint_servers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_paint_servers.c; sourceTree = "<group>"; };
+		92B9A5461F8660D300A24FE4 /* font_engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font_engine.c; sourceTree = "<group>"; };
+		92B9A5471F8660D300A24FE4 /* audio_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_render.c; sourceTree = "<group>"; };
+		92B9A5481F8660D300A24FE4 /* media_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_object.c; sourceTree = "<group>"; };
+		92B9A5491F8660D300A24FE4 /* mpeg4_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_audio.c; sourceTree = "<group>"; };
+		92B9A54A1F8660D400A24FE4 /* texturing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing.c; sourceTree = "<group>"; };
+		92B9A54B1F8660D400A24FE4 /* nodes_stacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nodes_stacks.h; sourceTree = "<group>"; };
+		92B9A54C1F8660D400A24FE4 /* camera.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = camera.c; sourceTree = "<group>"; };
+		92B9A54D1F8660D400A24FE4 /* compositor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor.c; sourceTree = "<group>"; };
+		92B9A54E1F8660D400A24FE4 /* mesh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh.c; sourceTree = "<group>"; };
+		92B9A54F1F8660D400A24FE4 /* mpeg4_inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inline.c; sourceTree = "<group>"; };
+		92B9A5501F8660D400A24FE4 /* mpeg4_sensors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sensors.c; sourceTree = "<group>"; };
+		92B9A5511F8660D400A24FE4 /* mpeg4_textures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_textures.c; sourceTree = "<group>"; };
+		92B9A5521F8660D500A24FE4 /* mpeg4_grouping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeg4_grouping.h; sourceTree = "<group>"; };
+		92B9A5531F8660D500A24FE4 /* visual_manager_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d.c; sourceTree = "<group>"; };
+		92B9A5541F8660D500A24FE4 /* scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene.c; sourceTree = "<group>"; };
+		92B9A5551F8660D500A24FE4 /* mpeg4_gradients.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_gradients.c; sourceTree = "<group>"; };
+		92B9A5561F8660D500A24FE4 /* mpeg4_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping.c; sourceTree = "<group>"; };
+		92B9A5571F8660D500A24FE4 /* texturing_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing_gl.c; sourceTree = "<group>"; };
+		92B9A5581F8660D500A24FE4 /* object_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_manager.c; sourceTree = "<group>"; };
+		92B9A5591F8660D600A24FE4 /* bindable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bindable.c; sourceTree = "<group>"; };
+		92B9A55A1F8660D600A24FE4 /* texturing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texturing.h; sourceTree = "<group>"; };
+		92B9A55B1F8660D600A24FE4 /* events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = events.c; sourceTree = "<group>"; };
+		92B9A55C1F8660D600A24FE4 /* svg_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_media.c; sourceTree = "<group>"; };
+		92B9A55D1F8660D600A24FE4 /* clock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clock.c; sourceTree = "<group>"; };
+		92B9A55E1F8660D600A24FE4 /* mpeg4_viewport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_viewport.c; sourceTree = "<group>"; };
+		92B9A55F1F8660D600A24FE4 /* visual_manager_2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_2d.h; sourceTree = "<group>"; };
+		92B9A5601F8660D600A24FE4 /* compositor_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_node_init.c; sourceTree = "<group>"; };
+		92B9A5611F8660D700A24FE4 /* mpeg4_sound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sound.c; sourceTree = "<group>"; };
+		92B9A5621F8660D700A24FE4 /* mpeg4_mediacontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_mediacontrol.c; sourceTree = "<group>"; };
+		92B9A5631F8660D700A24FE4 /* mesh_collide.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_collide.c; sourceTree = "<group>"; };
+		92B9A5641F8660D700A24FE4 /* visual_manager_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d.c; sourceTree = "<group>"; };
+		92B9A5651F8660D700A24FE4 /* visual_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager.c; sourceTree = "<group>"; };
+		92B9A5B61F866D6500A24FE4 /* scene_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_node_init.c; sourceTree = "<group>"; };
+		92B9A5B81F866E0500A24FE4 /* mpeg4_inputsensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inputsensor.c; sourceTree = "<group>"; };
+		92B9A5BC1F868CFF00A24FE4 /* dec_laser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_laser.c; path = filters/dec_laser.c; sourceTree = "<group>"; };
+		92B9A5BE1F8695FA00A24FE4 /* dmx_saf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_saf.c; path = filters/dmx_saf.c; sourceTree = "<group>"; };
+		92B9A5C01F86ACDF00A24FE4 /* dec_opensvc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_opensvc.c; path = filters/dec_opensvc.c; sourceTree = "<group>"; };
+		92BA0AD3243B68AF006FC74E /* dec_mediacodec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mediacodec.c; path = filters/dec_mediacodec.c; sourceTree = "<group>"; };
+		92BA0AD9243B6E2B006FC74E /* dektec_video_decl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dektec_video_decl.c; path = ../modules/dektec_out/dektec_video_decl.c; sourceTree = "<group>"; };
+		92BB854C1F7BE2BA009BC9C8 /* &#x1; */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = "\U0001"; path = "../../../../../../../\U0001"; sourceTree = "<group>"; };
+		92BB85501F7BFB60009BC9C8 /* ff_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_dec.c; path = filters/ff_dec.c; sourceTree = "<group>"; };
+		92BB85511F7BFB60009BC9C8 /* dec_odf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_odf.c; path = filters/dec_odf.c; sourceTree = "<group>"; };
+		92BB85521F7BFB60009BC9C8 /* dec_bifs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_bifs.c; path = filters/dec_bifs.c; sourceTree = "<group>"; };
+		92BB85531F7BFB60009BC9C8 /* isoffin_read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_read_ch.c; path = filters/isoffin_read_ch.c; sourceTree = "<group>"; };
+		92BB85541F7BFB60009BC9C8 /* reframe_img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_img.c; path = filters/reframe_img.c; sourceTree = "<group>"; };
+		92BB85551F7BFB60009BC9C8 /* dec_faad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_faad.c; path = filters/dec_faad.c; sourceTree = "<group>"; };
+		92BB85561F7BFB60009BC9C8 /* reframe_adts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_adts.c; path = filters/reframe_adts.c; sourceTree = "<group>"; };
+		92BB85571F7BFB60009BC9C8 /* dec_img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_img.c; path = filters/dec_img.c; sourceTree = "<group>"; };
+		92BB85581F7BFB61009BC9C8 /* compose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compose.c; path = filters/compose.c; sourceTree = "<group>"; };
+		92BB85591F7BFB61009BC9C8 /* load_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_svg.c; path = filters/load_svg.c; sourceTree = "<group>"; };
+		92BB855A1F7BFB61009BC9C8 /* in_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_file.c; path = filters/in_file.c; sourceTree = "<group>"; };
+		92BB855B1F7BFB61009BC9C8 /* reframe_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mp3.c; path = filters/reframe_mp3.c; sourceTree = "<group>"; };
+		92BB855C1F7BFB61009BC9C8 /* ff_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_common.c; path = filters/ff_common.c; sourceTree = "<group>"; };
+		92BB855D1F7BFB61009BC9C8 /* dec_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mad.c; path = filters/dec_mad.c; sourceTree = "<group>"; };
+		92BB855E1F7BFB61009BC9C8 /* in_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_http.c; path = filters/in_http.c; sourceTree = "<group>"; };
+		92BB855F1F7BFB62009BC9C8 /* inspect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inspect.c; path = filters/inspect.c; sourceTree = "<group>"; };
+		92BB85601F7BFB62009BC9C8 /* ff_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_dmx.c; path = filters/ff_dmx.c; sourceTree = "<group>"; };
+		92BB85611F7BFB62009BC9C8 /* isoffin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isoffin.h; path = filters/isoffin.h; sourceTree = "<group>"; };
+		92BB85621F7BFB63009BC9C8 /* load_bt_xmt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_bt_xmt.c; path = filters/load_bt_xmt.c; sourceTree = "<group>"; };
+		92BB85631F7BFB63009BC9C8 /* unit_test_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unit_test_filter.c; path = filters/unit_test_filter.c; sourceTree = "<group>"; };
+		92BB85641F7BFB63009BC9C8 /* isoffin_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_load.c; path = filters/isoffin_load.c; sourceTree = "<group>"; };
+		92BB85651F7BFB63009BC9C8 /* isoffin_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_read.c; path = filters/isoffin_read.c; sourceTree = "<group>"; };
+		92BB857C1F7BFD7F009BC9C8 /* dec_xvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_xvid.c; path = filters/dec_xvid.c; sourceTree = "<group>"; };
+		92BB857E1F7C30AE009BC9C8 /* dec_j2k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_j2k.c; path = filters/dec_j2k.c; sourceTree = "<group>"; };
+		92BB85801F7C3C4A009BC9C8 /* reframe_ac3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_ac3.c; path = filters/reframe_ac3.c; sourceTree = "<group>"; };
+		92BB85821F7C5773009BC9C8 /* dec_ac52.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ac52.c; path = filters/dec_ac52.c; sourceTree = "<group>"; };
+		92BB85841F7C606A009BC9C8 /* reframe_amr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_amr.c; path = filters/reframe_amr.c; sourceTree = "<group>"; };
+		92BB9A661F9C827600524E5B /* dmx_dash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_dash.c; path = filters/dmx_dash.c; sourceTree = "<group>"; };
 		92BBFC481A7122AD006A7735 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ait.h; path = ../include/gpac/ait.h; sourceTree = "<group>"; };
 		92BBFC491A7122AD006A7735 /* avparse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avparse.h; path = ../include/gpac/avparse.h; sourceTree = "<group>"; };
 		92BBFC4A1A7122AD006A7735 /* base_coding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base_coding.h; path = ../include/gpac/base_coding.h; sourceTree = "<group>"; };
@@ -1277,10 +1067,8 @@
 		92BBFC551A7122AD006A7735 /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = download.h; path = ../include/gpac/download.h; sourceTree = "<group>"; };
 		92BBFC561A7122AD006A7735 /* dsmcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dsmcc.h; path = ../include/gpac/dsmcc.h; sourceTree = "<group>"; };
 		92BBFC571A7122AD006A7735 /* dvb_mpe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dvb_mpe.h; path = ../include/gpac/dvb_mpe.h; sourceTree = "<group>"; };
-		92BBFC581A7122AD006A7735 /* esi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = esi.h; path = ../include/gpac/esi.h; sourceTree = "<group>"; };
 		92BBFC591A7122AD006A7735 /* events_constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = events_constants.h; path = ../include/gpac/events_constants.h; sourceTree = "<group>"; };
 		92BBFC5A1A7122AD006A7735 /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = events.h; path = ../include/gpac/events.h; sourceTree = "<group>"; };
-		92BBFC5B1A7122AD006A7735 /* filestreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filestreamer.h; path = ../include/gpac/filestreamer.h; sourceTree = "<group>"; };
 		92BBFC5C1A7122AD006A7735 /* html5_media.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = html5_media.h; path = ../include/gpac/html5_media.h; sourceTree = "<group>"; };
 		92BBFC5D1A7122AD006A7735 /* html5_mse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = html5_mse.h; path = ../include/gpac/html5_mse.h; sourceTree = "<group>"; };
 		92BBFC5E1A7122AD006A7735 /* ietf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ietf.h; path = ../include/gpac/ietf.h; sourceTree = "<group>"; };
@@ -1305,27 +1093,20 @@
 		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>"; };
-		92BBFC751A7122AD006A7735 /* terminal_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terminal_dev.h; sourceTree = "<group>"; };
 		92BBFC761A7122AD006A7735 /* vobsub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vobsub.h; sourceTree = "<group>"; };
-		92BBFC771A7122AD006A7735 /* ismacryp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ismacryp.h; path = ../include/gpac/ismacryp.h; sourceTree = "<group>"; };
 		92BBFC781A7122AD006A7735 /* iso639.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iso639.h; path = ../include/gpac/iso639.h; sourceTree = "<group>"; };
 		92BBFC791A7122AD006A7735 /* isomedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isomedia.h; path = ../include/gpac/isomedia.h; sourceTree = "<group>"; };
 		92BBFC7A1A7122AD006A7735 /* laser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = laser.h; path = ../include/gpac/laser.h; sourceTree = "<group>"; };
 		92BBFC7B1A7122AD006A7735 /* list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = list.h; path = ../include/gpac/list.h; sourceTree = "<group>"; };
-		92BBFC7C1A7122AD006A7735 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = map.h; path = ../include/gpac/map.h; sourceTree = "<group>"; };
 		92BBFC7D1A7122AD006A7735 /* maths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maths.h; path = ../include/gpac/maths.h; sourceTree = "<group>"; };
 		92BBFC7E1A7122AD006A7735 /* media_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = media_tools.h; path = ../include/gpac/media_tools.h; sourceTree = "<group>"; };
 		92BBFC7F1A7122AD006A7735 /* mediaobject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mediaobject.h; path = ../include/gpac/mediaobject.h; sourceTree = "<group>"; };
 		92BBFC801A7122AD006A7735 /* module.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = module.h; path = ../include/gpac/module.h; sourceTree = "<group>"; };
 		92BBFC821A7122AD006A7735 /* audio_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audio_out.h; sourceTree = "<group>"; };
-		92BBFC831A7122AD006A7735 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.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>"; };
-		92BBFC861A7122AD006A7735 /* ipmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ipmp.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>"; };
-		92BBFC891A7122AD006A7735 /* service.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = service.h; sourceTree = "<group>"; };
-		92BBFC8A1A7122AD006A7735 /* term_ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = term_ext.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>"; };
@@ -1337,7 +1118,6 @@
 		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>"; };
-		92BBFC961A7122AD006A7735 /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ringbuffer.h; path = ../include/gpac/ringbuffer.h; sourceTree = "<group>"; };
 		92BBFC971A7122AD006A7735 /* rtp_streamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtp_streamer.h; path = ../include/gpac/rtp_streamer.h; sourceTree = "<group>"; };
 		92BBFC981A7122AD006A7735 /* scene_engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scene_engine.h; path = ../include/gpac/scene_engine.h; sourceTree = "<group>"; };
 		92BBFC991A7122AD006A7735 /* scene_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scene_manager.h; path = ../include/gpac/scene_manager.h; sourceTree = "<group>"; };
@@ -1352,80 +1132,86 @@
 		92BBFCA21A7122AD006A7735 /* thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = thread.h; path = ../include/gpac/thread.h; sourceTree = "<group>"; };
 		92BBFCA31A7122AD006A7735 /* token.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = token.h; path = ../include/gpac/token.h; sourceTree = "<group>"; };
 		92BBFCA41A7122AD006A7735 /* tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tools.h; path = ../include/gpac/tools.h; sourceTree = "<group>"; };
-		92BBFCA51A7122AD006A7735 /* unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unicode.h; path = ../include/gpac/unicode.h; sourceTree = "<group>"; };
 		92BBFCA61A7122AD006A7735 /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = user.h; path = ../include/gpac/user.h; sourceTree = "<group>"; };
 		92BBFCA71A7122AD006A7735 /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = utf.h; path = ../include/gpac/utf.h; sourceTree = "<group>"; };
 		92BBFCA81A7122AD006A7735 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../include/gpac/version.h; sourceTree = "<group>"; };
 		92BBFCA91A7122AD006A7735 /* webvtt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = webvtt.h; path = ../include/gpac/webvtt.h; sourceTree = "<group>"; };
 		92BBFCAA1A7122AD006A7735 /* xml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xml.h; path = ../include/gpac/xml.h; sourceTree = "<group>"; };
+		92BD556A205AE974007C4C06 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		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; };
-		92BE50B318D6D53000AA59D8 /* MP42TS */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP42TS; sourceTree = BUILT_PRODUCTS_DIR; };
-		92BE50C118D6D5DC00AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp42ts/main.c; sourceTree = SOURCE_ROOT; };
 		92BE50C718D6D60100AA59D8 /* MP4Client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Client; sourceTree = BUILT_PRODUCTS_DIR; };
-		92BE50D118D6D62600AA59D8 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/mp4client/extract.c; sourceTree = SOURCE_ROOT; };
-		92BE50D218D6D62600AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4client/main.c; sourceTree = SOURCE_ROOT; };
-		92BE50FD18D6D9EE00AA59D8 /* raw_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raw_video.c; path = ../../modules/raw_out/raw_video.c; sourceTree = "<group>"; };
-		92BE510918D6DA6300AA59D8 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgrays.c; path = ../../modules/soft_raster/ftgrays.c; sourceTree = "<group>"; };
-		92BE510A18D6DA6300AA59D8 /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rast_soft.h; path = ../../modules/soft_raster/rast_soft.h; sourceTree = "<group>"; };
-		92BE510B18D6DA6300AA59D8 /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_565.c; path = ../../modules/soft_raster/raster_565.c; sourceTree = "<group>"; };
-		92BE510C18D6DA6300AA59D8 /* raster_argb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_argb.c; path = ../../modules/soft_raster/raster_argb.c; sourceTree = "<group>"; };
-		92BE510D18D6DA6300AA59D8 /* raster_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_load.c; path = ../../modules/soft_raster/raster_load.c; sourceTree = "<group>"; };
-		92BE510E18D6DA6300AA59D8 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_rgb.c; path = ../../modules/soft_raster/raster_rgb.c; sourceTree = "<group>"; };
-		92BE510F18D6DA6300AA59D8 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = ../../modules/soft_raster/stencil.c; sourceTree = "<group>"; };
-		92BE511018D6DA6300AA59D8 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = ../../modules/soft_raster/surface.c; sourceTree = "<group>"; };
-		92CC44F91DC0D22C0084D6A6 /* libopensvc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopensvc.dylib; 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>"; };
+		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>"; };
-		92D3C6302031F4C100BA1735 /* atsc_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = atsc_in.c; path = ../../modules/atsc_in/atsc_in.c; sourceTree = "<group>"; };
 		92D5356F1A5C0CF700F2442A /* carbon_events.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = carbon_events.c; path = ../../applications/mp4client/carbon_events.c; sourceTree = "<group>"; };
-		92F8D46B1F6FF7A100616F7C /* netctrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = netctrl.c; path = ../../modules/netctrl/netctrl.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>"; };
+		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>"; };
+		92E164A920F8EBAE0024A9CA /* dec_nvdec_sdk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dec_nvdec_sdk.h; path = filters/dec_nvdec_sdk.h; sourceTree = "<group>"; };
+		92E164AA20F8EBAE0024A9CA /* dec_nvdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_nvdec.c; path = filters/dec_nvdec.c; sourceTree = "<group>"; };
+		92E164BA20F8F2860024A9CA /* Remotery.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Remotery.c; sourceTree = "<group>"; };
+		92E2498F2057B973002CC029 /* resample_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resample_audio.c; path = filters/resample_audio.c; sourceTree = "<group>"; };
+		92E318CE20645036007BE021 /* ff_rescale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_rescale.c; path = filters/ff_rescale.c; sourceTree = "<group>"; };
+		92E318D020651834007BE021 /* vcrop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vcrop.c; path = filters/vcrop.c; sourceTree = "<group>"; };
+		92E9167B2073F1DB00EE92FB /* ff_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_enc.c; path = filters/ff_enc.c; sourceTree = "<group>"; };
+		92EB479020F50C4200E1F2DD /* reframe_av1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_av1.c; path = filters/reframe_av1.c; sourceTree = "<group>"; };
+		92EB479220F6333800E1F2DD /* rewrite_obu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_obu.c; path = filters/rewrite_obu.c; sourceTree = "<group>"; };
+		92EC32CA1FAC5ACA003FB9C3 /* reframe_qcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_qcp.c; path = filters/reframe_qcp.c; sourceTree = "<group>"; };
+		92EC32CC1FAC81D5003FB9C3 /* reframe_h263.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_h263.c; path = filters/reframe_h263.c; sourceTree = "<group>"; };
+		92EE76401FD0315D008926F5 /* load_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_text.c; path = filters/load_text.c; sourceTree = "<group>"; };
+		92F8D4701F71642E00616F7C /* filter_pck.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_pck.c; path = filter_core/filter_pck.c; sourceTree = "<group>"; };
+		92F8D4711F71642E00616F7C /* filter_pid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_pid.c; path = filter_core/filter_pid.c; sourceTree = "<group>"; };
+		92F8D4721F71642E00616F7C /* filter_props.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_props.c; path = filter_core/filter_props.c; sourceTree = "<group>"; };
+		92F8D4731F71642E00616F7C /* filter_queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_queue.c; path = filter_core/filter_queue.c; sourceTree = "<group>"; };
+		92F8D4741F71642E00616F7C /* filter_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_session.c; path = filter_core/filter_session.c; sourceTree = "<group>"; };
+		92F8D4751F71642E00616F7C /* filter_session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filter_session.h; path = filter_core/filter_session.h; sourceTree = "<group>"; };
+		92F8D4761F71642E00616F7C /* filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter.c; path = filter_core/filter.c; sourceTree = "<group>"; };
 		92F930801A5ADB870072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		92F930811A5ADB870072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
+		92FA79422076687100AE005F /* rewind.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewind.c; path = filters/rewind.c; sourceTree = "<group>"; };
+		92FE596C2088E52900CF0C5A /* dasher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dasher.c; path = filters/dasher.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
-		2839E27B1A162C24002D73E1 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2839E2831A162CC9002D73E1 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		2839E2851A1635F7002D73E1 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2839E2CD1A163E1E002D73E1 /* Foundation.framework in Frameworks */,
-				2839E2CB1A16375C002D73E1 /* QTKit.framework in Frameworks */,
-				2839E2C51A163712002D73E1 /* CoreMedia.framework in Frameworks */,
-				2839E2C31A163700002D73E1 /* AVFoundation.framework in Frameworks */,
-				2839E2C21A1636A7002D73E1 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		9201F93418D5A38A003D1ACA /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92BD5571205AE9BD007C4C06 /* AppKit.framework in Frameworks */,
+				92BD556D205AE99A007C4C06 /* OpenGL.framework in Frameworks */,
+				92BD556B205AE974007C4C06 /* CoreGraphics.framework in Frameworks */,
+				92BD5569205AE93A007C4C06 /* Foundation.framework in Frameworks */,
+				92BD5568205AE807007C4C06 /* AVFoundation.framework in Frameworks */,
+				926C7E652019D76300E90AF6 /* Security.framework in Frameworks */,
+				926C7E642019D75300E90AF6 /* AudioToolbox.framework in Frameworks */,
 				9235E0531CFECD520051D8A1 /* CoreFoundation.framework in Frameworks */,
 				9235E0521CFECD450051D8A1 /* VideoToolbox.framework in Frameworks */,
 				9235E0501CFECD370051D8A1 /* CoreVideo.framework in Frameworks */,
 				9235E04E1CFECD300051D8A1 /* CoreMedia.framework in Frameworks */,
 				920101D118D5ACA7003D1ACA /* libz.dylib in Frameworks */,
-				920101CF18D5AC67003D1ACA /* OpenGL.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9225732118D7267900D6FD98 /* Frameworks */ = {
+		927AACFA1E44EEDC008C8E69 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */,
+				927AAD0E1E44F492008C8E69 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1446,55 +1232,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92AAF17518D6F89B00E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF17C18D6F8C700E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF18518D6FA1100E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF19318D6FB7B00E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF19518D6FDC300E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92A7E9612003BAE8000C22DE /* Security.framework in Frameworks */,
-				92A7E95F2003BACB000C22DE /* AudioToolbox.framework in Frameworks */,
-				92A7E95D2003BAAA000C22DE /* CoreServices.framework in Frameworks */,
-				92A7E95B2003BAA3000C22DE /* CoreVideo.framework in Frameworks */,
-				92A7E95A2003BA9B000C22DE /* CoreMedia.framework in Frameworks */,
-				92A7E9592003BA8F000C22DE /* VideoToolbox.framework in Frameworks */,
-				28C5AA691A152BC400372C59 /* VideoDecodeAcceleration.framework in Frameworks */,
-				28C5AA671A152BB700372C59 /* CoreFoundation.framework in Frameworks */,
-				28C5AA651A15240800372C59 /* AVFoundation.framework in Frameworks */,
-				92AAF19C18D6FDD900E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1AB18D709D900E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1B918D70A5200E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1BB18D70B1C00E2FF12 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		92BE508D18D6325E00AA59D8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1503,65 +1240,26 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92BE50B018D6D53000AA59D8 /* Frameworks */ = {
+		92BE50C418D6D60100AA59D8 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */,
+				28C5AA801A16277200372C59 /* Carbon.framework in Frameworks */,
+				92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92BE50C418D6D60100AA59D8 /* Frameworks */ = {
+		92C403D52181F10500331F39 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				28C5AA801A16277200372C59 /* Carbon.framework in Frameworks */,
-				92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */,
+				92C403EA2181F57600331F39 /* libgpac.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		2839E2911A1635FE002D73E1 /* DashCast */ = {
-			isa = PBXGroup;
-			children = (
-				2839E2921A16363E002D73E1 /* audio_data.c */,
-				2839E2931A16363E002D73E1 /* audio_data.h */,
-				2839E2941A16363E002D73E1 /* audio_decoder.c */,
-				2839E2951A16363E002D73E1 /* audio_decoder.h */,
-				2839E2961A16363E002D73E1 /* audio_encoder.c */,
-				2839E2971A16363E002D73E1 /* audio_encoder.h */,
-				2839E2981A16363E002D73E1 /* audio_muxer.c */,
-				2839E2991A16363E002D73E1 /* audio_muxer.h */,
-				2839E29A1A16363E002D73E1 /* circular_buffer.c */,
-				2839E29B1A16363E002D73E1 /* circular_buffer.h */,
-				2839E29C1A16363E002D73E1 /* cmd_data.c */,
-				2839E29D1A16363E002D73E1 /* cmd_data.h */,
-				2839E29E1A16363E002D73E1 /* controler.c */,
-				2839E29F1A16363E002D73E1 /* controler.h */,
-				2839E2A01A16363E002D73E1 /* dashcast.c */,
-				2839E2A11A16363E002D73E1 /* libav_compat.h */,
-				2839E2A21A16363E002D73E1 /* message_queue.c */,
-				2839E2A31A16363E002D73E1 /* message_queue.h */,
-				2839E2A41A16363E002D73E1 /* register.c */,
-				2839E2A51A16363E002D73E1 /* register.h */,
-				2839E2A61A16363E002D73E1 /* task.c */,
-				2839E2A71A16363E002D73E1 /* task.h */,
-				2839E2A81A16363E002D73E1 /* video_data.c */,
-				2839E2A91A16363E002D73E1 /* video_data.h */,
-				2839E2AA1A16363E002D73E1 /* video_decoder.c */,
-				2839E2AB1A16363E002D73E1 /* video_decoder.h */,
-				2839E2AC1A16363E002D73E1 /* video_encoder.c */,
-				2839E2AD1A16363E002D73E1 /* video_encoder.h */,
-				2839E2AE1A16363E002D73E1 /* video_muxer.c */,
-				2839E2AF1A16363E002D73E1 /* video_muxer.h */,
-				2839E2B01A16363E002D73E1 /* video_scaler.c */,
-				2839E2B11A16363E002D73E1 /* video_scaler.h */,
-			);
-			name = DashCast;
-			sourceTree = "<group>";
-		};
 		9201000E18D5A444003D1ACA /* laser */ = {
 			isa = PBXGroup;
 			children = (
@@ -1579,16 +1277,13 @@
 				9201002318D5A444003D1ACA /* ait.c */,
 				9201002418D5A444003D1ACA /* av_parsers.c */,
 				9201002518D5A444003D1ACA /* avilib.c */,
+				92493D7F20E2A64000203C2C /* crypt_tools.c */,
 				9201002618D5A444003D1ACA /* dash_client.c */,
 				9201002818D5A444003D1ACA /* dash_segmenter.c */,
 				9201002918D5A444003D1ACA /* dsmcc.c */,
 				9201002A18D5A444003D1ACA /* dvb_mpe.c */,
-				9201002B18D5A444003D1ACA /* filestreamer.c */,
 				9201002C18D5A444003D1ACA /* gpac_ogg.c */,
-				9201002D18D5A444003D1ACA /* html5_media.c */,
-				9201002E18D5A444003D1ACA /* html5_mse.c */,
 				9201002F18D5A444003D1ACA /* img.c */,
-				9201003018D5A444003D1ACA /* ismacryp.c */,
 				9201003118D5A444003D1ACA /* isom_hinter.c */,
 				9201003218D5A444003D1ACA /* isom_tools.c */,
 				9201003318D5A444003D1ACA /* m2ts_mux.c */,
@@ -1601,7 +1296,6 @@
 				9201003A18D5A444003D1ACA /* mpegts.c */,
 				9201003B18D5A444003D1ACA /* reedsolomon.c */,
 				9201003C18D5A444003D1ACA /* saf.c */,
-				9201003D18D5A444003D1ACA /* text_import.c */,
 				9201003E18D5A444003D1ACA /* vobsub.c */,
 				9201003F18D5A444003D1ACA /* webvtt.c */,
 			);
@@ -1655,27 +1349,23 @@
 				9201005E18D5A444003D1ACA /* base_scenegraph.c */,
 				9201005F18D5A444003D1ACA /* commands.c */,
 				9201006018D5A444003D1ACA /* dom_events.c */,
-				9201006118D5A444003D1ACA /* dom_smjs.c */,
-				9201006218D5A444003D1ACA /* html5_media_smjs.c */,
-				9201006318D5A444003D1ACA /* html5_mse_smjs.c */,
+				92D6C59F2343BEFF00262217 /* dom_js.c */,
 				9201006418D5A444003D1ACA /* mpeg4_animators.c */,
 				9201006518D5A444003D1ACA /* mpeg4_nodes.c */,
 				9201006618D5A444003D1ACA /* mpeg4_valuator.c */,
 				9201006718D5A444003D1ACA /* smil_anim.c */,
 				9201006818D5A444003D1ACA /* smil_timing.c */,
 				9201006918D5A444003D1ACA /* svg_attributes.c */,
+				92D6C59D2343BEFF00262217 /* svg_js.c */,
 				9201006A18D5A444003D1ACA /* svg_properties.c */,
-				9201006B18D5A444003D1ACA /* svg_smjs.c */,
 				9201006C18D5A444003D1ACA /* svg_types.c */,
 				9201006D18D5A444003D1ACA /* vrml_interpolators.c */,
+				92D6C59E2343BEFF00262217 /* vrml_js.c */,
 				9201006E18D5A444003D1ACA /* vrml_proto.c */,
 				9201006F18D5A444003D1ACA /* vrml_route.c */,
 				9201007018D5A444003D1ACA /* vrml_script.c */,
-				9201007118D5A444003D1ACA /* vrml_smjs.c */,
 				9201007218D5A444003D1ACA /* vrml_tools.c */,
-				9201007318D5A444003D1ACA /* webvtt_smjs.c */,
 				9201007418D5A444003D1ACA /* x3d_nodes.c */,
-				9201007518D5A444003D1ACA /* xbl_process.c */,
 				9201007618D5A444003D1ACA /* xml_ns.c */,
 			);
 			path = scenegraph;
@@ -1684,26 +1374,7 @@
 		9201007718D5A444003D1ACA /* terminal */ = {
 			isa = PBXGroup;
 			children = (
-				9201007818D5A444003D1ACA /* channel.c */,
-				9201007918D5A444003D1ACA /* clock.c */,
-				9201007A18D5A444003D1ACA /* decoder.c */,
-				9201007B18D5A444003D1ACA /* input_sensor.c */,
-				9201007C18D5A444003D1ACA /* input_sensor.h */,
-				9201007D18D5A444003D1ACA /* media_control.c */,
-				9201007E18D5A444003D1ACA /* media_control.h */,
-				9201007F18D5A444003D1ACA /* media_manager.c */,
-				9201008018D5A444003D1ACA /* media_memory.c */,
-				9201008118D5A444003D1ACA /* media_memory.h */,
-				9201008218D5A444003D1ACA /* media_object.c */,
-				9201008318D5A444003D1ACA /* media_sensor.c */,
-				9201008418D5A444003D1ACA /* mpeg4_inline.c */,
-				9201008518D5A444003D1ACA /* network_service.c */,
-				9201008618D5A444003D1ACA /* object_browser.c */,
-				9201008718D5A444003D1ACA /* object_manager.c */,
-				9201008818D5A444003D1ACA /* scene.c */,
-				9201008918D5A444003D1ACA /* svg_external.c */,
-				9201008A18D5A444003D1ACA /* term_node_init.c */,
-				9201008B18D5A444003D1ACA /* terminal.c */,
+				92B9A50C1F8660B500A24FE4 /* terminal.c */,
 			);
 			path = terminal;
 			sourceTree = "<group>";
@@ -1711,30 +1382,32 @@
 		9201008C18D5A444003D1ACA /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				92F930801A5ADB870072A85C /* os_divers.c */,
-				92F930811A5ADB870072A85C /* os_file.c */,
-				922B48781A5ADAB3006CBBBA /* os_module.c */,
+				929DE7462417DC020056AFA7 /* gzio.c */,
+				9298677C235A146D008A2CC6 /* gltools.c */,
 				9201008D18D5A444003D1ACA /* alloc.c */,
 				9201008E18D5A444003D1ACA /* base_encoding.c */,
 				9201008F18D5A444003D1ACA /* bitstream.c */,
 				9201009018D5A444003D1ACA /* cache.c */,
 				9201009118D5A444003D1ACA /* color.c */,
 				9201009218D5A444003D1ACA /* configfile.c */,
+				926CE14E1FE81865002B3CF6 /* constants.c */,
 				9201009318D5A444003D1ACA /* dlmalloc.c */,
 				9201009418D5A444003D1ACA /* downloader.c */,
 				9201009518D5A444003D1ACA /* error.c */,
 				9201009718D5A444003D1ACA /* list.c */,
-				9201009818D5A444003D1ACA /* map.c */,
 				9201009918D5A444003D1ACA /* math.c */,
-				9201009A18D5A444003D1ACA /* module.c */,
 				9201009B18D5A444003D1ACA /* module_wrap.h */,
+				9201009A18D5A444003D1ACA /* module.c */,
 				9201009C18D5A444003D1ACA /* os_config_init.c */,
+				92F930801A5ADB870072A85C /* os_divers.c */,
+				92F930811A5ADB870072A85C /* os_file.c */,
+				922B48781A5ADAB3006CBBBA /* os_module.c */,
 				9201009E18D5A444003D1ACA /* os_module.c */,
 				9201009F18D5A444003D1ACA /* os_net.c */,
 				920100A018D5A444003D1ACA /* os_thread.c */,
 				920100A118D5A444003D1ACA /* path2d.c */,
 				920100A218D5A444003D1ACA /* path2d_stroker.c */,
-				920100A318D5A444003D1ACA /* ringbuffer.c */,
+				92E164BA20F8F2860024A9CA /* Remotery.c */,
 				920100A418D5A444003D1ACA /* sha1.c */,
 				920100A718D5A444003D1ACA /* token.c */,
 				920100A818D5A444003D1ACA /* uni_bidi.c */,
@@ -1749,32 +1422,27 @@
 		9201F92718D5A359003D1ACA = {
 			isa = PBXGroup;
 			children = (
+				92912946218A3B2B004F1A6C /* README.md */,
 				92FA48841D0191570072C8A4 /* linklibs */,
 				92BE50AE18D6378C00AA59D8 /* xcode */,
 				92BE50AC18D6375100AA59D8 /* applications */,
 				92BE50AD18D6376A00AA59D8 /* modules */,
 				9201FE7E18D5A444003D1ACA /* libgpac */,
 				92B02F4D1DD2004300F85E77 /* Frameworks */,
+				926C7E632018B86800E90AF6 /* Recovered References */,
 			);
 			sourceTree = "<group>";
 		};
 		9201F93818D5A38A003D1ACA /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				2839E2881A1635F7002D73E1 /* DashCast */,
 				92BE509018D6325E00AA59D8 /* MP4Box */,
-				92BE50B318D6D53000AA59D8 /* MP42TS */,
 				92BE50C718D6D60100AA59D8 /* MP4Client */,
 				9201F93718D5A38A003D1ACA /* libgpac.dylib */,
 				92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */,
 				92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */,
-				92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */,
-				92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */,
-				92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */,
-				92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */,
-				92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */,
-				9225732418D7267900D6FD98 /* gm_ogg_in.dylib */,
-				92CC44F91DC0D22C0084D6A6 /* libopensvc.dylib */,
+				927AACFD1E44EEDC008C8E69 /* gpac */,
+				92C403D72181F10500331F39 /* gf_openhevc_dec.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1783,357 +1451,29 @@
 			isa = PBXGroup;
 			children = (
 				92BBFC471A71228A006A7735 /* include */,
-				9201FE8018D5A444003D1ACA /* .deps */,
 				9201FF8918D5A444003D1ACA /* bifs */,
 				9201FF9A18D5A444003D1ACA /* compositor */,
-				92DC362B20B4803E00C48E39 /* crypto */,
+				929CB5C120B6F02800849696 /* crypto */,
+				925974F42215BA270007E02B /* evg */,
+				92F8D46F1F71641E00616F7C /* filter_core */,
+				92F8D47E1F71643600616F7C /* filters */,
 				9201FFE318D5A444003D1ACA /* ietf */,
 				9201FFF118D5A444003D1ACA /* isomedia */,
+				92D6C5982343BEC600262217 /* jsmods */,
 				9201000E18D5A444003D1ACA /* laser */,
 				9201002218D5A444003D1ACA /* media_tools */,
 				9201004018D5A444003D1ACA /* odf */,
+				92334C8E2333A8B800DA6051 /* quickjs */,
 				9201004E18D5A444003D1ACA /* scene_manager */,
 				9201005D18D5A444003D1ACA /* scenegraph */,
 				9201007718D5A444003D1ACA /* terminal */,
 				9201008C18D5A444003D1ACA /* utils */,
-				92AAF0E918D6E35200E2FF12 /* builtin_modules */,
+				92C1FF4A1E7C42A40093B61E /* builtin_modules */,
 			);
 			name = libgpac;
 			path = ../../src;
 			sourceTree = "<group>";
 		};
-		9201FE8018D5A444003D1ACA /* .deps */ = {
-			isa = PBXGroup;
-			children = (
-				9201FE8118D5A444003D1ACA /* bifs */,
-				9201FE9018D5A444003D1ACA /* compositor */,
-				9201FECE18D5A444003D1ACA /* ietf */,
-				9201FEDC18D5A444003D1ACA /* isomedia */,
-				9201FEF918D5A444003D1ACA /* laser */,
-				9201FF0C18D5A444003D1ACA /* media_tools */,
-				9201FF2418D5A444003D1ACA /* odf */,
-				9201FF3218D5A444003D1ACA /* scene_manager */,
-				9201FF4118D5A444003D1ACA /* scenegraph */,
-				9201FF5B18D5A444003D1ACA /* terminal */,
-				9201FF6D18D5A444003D1ACA /* utils */,
-			);
-			path = .deps;
-			sourceTree = "<group>";
-		};
-		9201FE8118D5A444003D1ACA /* bifs */ = {
-			isa = PBXGroup;
-			children = (
-				9201FE8218D5A444003D1ACA /* arith_decoder.dep */,
-				9201FE8318D5A444003D1ACA /* bifs_codec.dep */,
-				9201FE8418D5A444003D1ACA /* bifs_node_tables.dep */,
-				9201FE8518D5A444003D1ACA /* com_dec.dep */,
-				9201FE8618D5A444003D1ACA /* com_enc.dep */,
-				9201FE8718D5A444003D1ACA /* conditional.dep */,
-				9201FE8818D5A444003D1ACA /* field_decode.dep */,
-				9201FE8918D5A444003D1ACA /* field_encode.dep */,
-				9201FE8A18D5A444003D1ACA /* memory_decoder.dep */,
-				9201FE8B18D5A444003D1ACA /* predictive_mffield.dep */,
-				9201FE8C18D5A444003D1ACA /* quantize.dep */,
-				9201FE8D18D5A444003D1ACA /* script_dec.dep */,
-				9201FE8E18D5A444003D1ACA /* script_enc.dep */,
-				9201FE8F18D5A444003D1ACA /* unquantize.dep */,
-			);
-			path = bifs;
-			sourceTree = "<group>";
-		};
-		9201FE9018D5A444003D1ACA /* compositor */ = {
-			isa = PBXGroup;
-			children = (
-				9201FE9118D5A444003D1ACA /* audio_input.dep */,
-				9201FE9218D5A444003D1ACA /* audio_mixer.dep */,
-				9201FE9318D5A444003D1ACA /* audio_render.dep */,
-				9201FE9418D5A444003D1ACA /* bindable.dep */,
-				9201FE9518D5A444003D1ACA /* camera.dep */,
-				9201FE9618D5A444003D1ACA /* compositor.dep */,
-				9201FE9718D5A444003D1ACA /* compositor_2d.dep */,
-				9201FE9818D5A444003D1ACA /* compositor_3d.dep */,
-				9201FE9918D5A444003D1ACA /* compositor_node_init.dep */,
-				9201FE9A18D5A444003D1ACA /* drawable.dep */,
-				9201FE9B18D5A444003D1ACA /* events.dep */,
-				9201FE9C18D5A444003D1ACA /* font_engine.dep */,
-				9201FE9D18D5A444003D1ACA /* hardcoded_protos.dep */,
-				9201FE9E18D5A444003D1ACA /* hc_flash_shape.dep */,
-				9201FE9F18D5A444003D1ACA /* mesh.dep */,
-				9201FEA018D5A444003D1ACA /* mesh_collide.dep */,
-				9201FEA118D5A444003D1ACA /* mesh_tesselate.dep */,
-				9201FEA218D5A444003D1ACA /* mpeg4_animstream.dep */,
-				9201FEA318D5A444003D1ACA /* mpeg4_audio.dep */,
-				9201FEA418D5A444003D1ACA /* mpeg4_background.dep */,
-				9201FEA518D5A444003D1ACA /* mpeg4_background2d.dep */,
-				9201FEA618D5A444003D1ACA /* mpeg4_bitmap.dep */,
-				9201FEA718D5A444003D1ACA /* mpeg4_composite.dep */,
-				9201FEA818D5A444003D1ACA /* mpeg4_form.dep */,
-				9201FEA918D5A444003D1ACA /* mpeg4_geometry_2d.dep */,
-				9201FEAA18D5A444003D1ACA /* mpeg4_geometry_3d.dep */,
-				9201FEAB18D5A444003D1ACA /* mpeg4_geometry_ifs2d.dep */,
-				9201FEAC18D5A444003D1ACA /* mpeg4_geometry_ils2d.dep */,
-				9201FEAD18D5A444003D1ACA /* mpeg4_gradients.dep */,
-				9201FEAE18D5A444003D1ACA /* mpeg4_grouping.dep */,
-				9201FEAF18D5A444003D1ACA /* mpeg4_grouping_2d.dep */,
-				9201FEB018D5A444003D1ACA /* mpeg4_grouping_3d.dep */,
-				9201FEB118D5A444003D1ACA /* mpeg4_layer_2d.dep */,
-				9201FEB218D5A444003D1ACA /* mpeg4_layer_3d.dep */,
-				9201FEB318D5A444003D1ACA /* mpeg4_layout.dep */,
-				9201FEB418D5A444003D1ACA /* mpeg4_lighting.dep */,
-				9201FEB518D5A444003D1ACA /* mpeg4_path_layout.dep */,
-				9201FEB618D5A444003D1ACA /* mpeg4_sensors.dep */,
-				9201FEB718D5A444003D1ACA /* mpeg4_sound.dep */,
-				9201FEB818D5A444003D1ACA /* mpeg4_text.dep */,
-				9201FEB918D5A444003D1ACA /* mpeg4_textures.dep */,
-				9201FEBA18D5A444003D1ACA /* mpeg4_timesensor.dep */,
-				9201FEBB18D5A444003D1ACA /* mpeg4_viewport.dep */,
-				9201FEBC18D5A444003D1ACA /* navigate.dep */,
-				9201FEBD18D5A444003D1ACA /* offscreen_cache.dep */,
-				9201FEBE18D5A444003D1ACA /* svg_base.dep */,
-				9201FEBF18D5A444003D1ACA /* svg_filters.dep */,
-				9201FEC018D5A444003D1ACA /* svg_font.dep */,
-				9201FEC118D5A444003D1ACA /* svg_geometry.dep */,
-				9201FEC218D5A444003D1ACA /* svg_grouping.dep */,
-				9201FEC318D5A444003D1ACA /* svg_media.dep */,
-				9201FEC418D5A444003D1ACA /* svg_paint_servers.dep */,
-				9201FEC518D5A444003D1ACA /* svg_text.dep */,
-				9201FEC618D5A444003D1ACA /* texturing.dep */,
-				9201FEC718D5A444003D1ACA /* texturing_gl.dep */,
-				9201FEC818D5A444003D1ACA /* visual_manager.dep */,
-				9201FEC918D5A444003D1ACA /* visual_manager_2d.dep */,
-				9201FECA18D5A444003D1ACA /* visual_manager_2d_draw.dep */,
-				9201FECB18D5A444003D1ACA /* visual_manager_3d.dep */,
-				9201FECC18D5A444003D1ACA /* visual_manager_3d_gl.dep */,
-				9201FECD18D5A444003D1ACA /* x3d_geometry.dep */,
-			);
-			path = compositor;
-			sourceTree = "<group>";
-		};
-		9201FECE18D5A444003D1ACA /* ietf */ = {
-			isa = PBXGroup;
-			children = (
-				9201FECF18D5A444003D1ACA /* rtcp.dep */,
-				9201FED018D5A444003D1ACA /* rtp.dep */,
-				9201FED118D5A444003D1ACA /* rtp_depacketizer.dep */,
-				9201FED218D5A444003D1ACA /* rtp_packetizer.dep */,
-				9201FED318D5A444003D1ACA /* rtp_pck_3gpp.dep */,
-				9201FED418D5A444003D1ACA /* rtp_pck_mpeg12.dep */,
-				9201FED518D5A444003D1ACA /* rtp_pck_mpeg4.dep */,
-				9201FED618D5A444003D1ACA /* rtp_streamer.dep */,
-				9201FED718D5A444003D1ACA /* rtsp_command.dep */,
-				9201FED818D5A444003D1ACA /* rtsp_common.dep */,
-				9201FED918D5A444003D1ACA /* rtsp_response.dep */,
-				9201FEDA18D5A444003D1ACA /* rtsp_session.dep */,
-				9201FEDB18D5A444003D1ACA /* sdp.dep */,
-			);
-			path = ietf;
-			sourceTree = "<group>";
-		};
-		9201FEDC18D5A444003D1ACA /* isomedia */ = {
-			isa = PBXGroup;
-			children = (
-				9201FEDD18D5A444003D1ACA /* avc_ext.dep */,
-				9201FEDE18D5A444003D1ACA /* box_code_3gpp.dep */,
-				9201FEDF18D5A444003D1ACA /* box_code_adobe.dep */,
-				9201FEE018D5A444003D1ACA /* box_code_apple.dep */,
-				9201FEE118D5A444003D1ACA /* box_code_base.dep */,
-				9201FEE218D5A444003D1ACA /* box_code_drm.dep */,
-				9201FEE318D5A444003D1ACA /* box_code_meta.dep */,
-				9201FEE418D5A444003D1ACA /* box_dump.dep */,
-				9201FEE518D5A444003D1ACA /* box_funcs.dep */,
-				9201FEE618D5A444003D1ACA /* data_map.dep */,
-				9201FEE718D5A444003D1ACA /* drm_sample.dep */,
-				9201FEE818D5A444003D1ACA /* generic_subtitle.dep */,
-				9201FEE918D5A444003D1ACA /* hint_track.dep */,
-				9201FEEA18D5A444003D1ACA /* hinting.dep */,
-				9201FEEB18D5A444003D1ACA /* isom_intern.dep */,
-				9201FEEC18D5A444003D1ACA /* isom_read.dep */,
-				9201FEED18D5A444003D1ACA /* isom_store.dep */,
-				9201FEEE18D5A444003D1ACA /* isom_write.dep */,
-				9201FEEF18D5A444003D1ACA /* media.dep */,
-				9201FEF018D5A444003D1ACA /* media_odf.dep */,
-				9201FEF118D5A444003D1ACA /* meta.dep */,
-				9201FEF218D5A444003D1ACA /* movie_fragments.dep */,
-				9201FEF318D5A444003D1ACA /* sample_descs.dep */,
-				9201FEF418D5A444003D1ACA /* stbl_read.dep */,
-				9201FEF518D5A444003D1ACA /* stbl_write.dep */,
-				9201FEF618D5A444003D1ACA /* track.dep */,
-				9201FEF718D5A444003D1ACA /* ttml.dep */,
-				9201FEF818D5A444003D1ACA /* tx3g.dep */,
-			);
-			path = isomedia;
-			sourceTree = "<group>";
-		};
-		9201FEF918D5A444003D1ACA /* laser */ = {
-			isa = PBXGroup;
-			children = (
-				9201FEFA18D5A444003D1ACA /* lsr_dec.dep */,
-				9201FEFB18D5A444003D1ACA /* lsr_enc.dep */,
-				9201FEFC18D5A444003D1ACA /* lsr_tables.dep */,
-			);
-			path = laser;
-			sourceTree = "<group>";
-		};
-		9201FF0C18D5A444003D1ACA /* media_tools */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF0D18D5A444003D1ACA /* av_parsers.dep */,
-				9201FF0E18D5A444003D1ACA /* avilib.dep */,
-				9201FF0F18D5A444003D1ACA /* dash_client.dep */,
-				9201FF1018D5A444003D1ACA /* dash_segmenter.dep */,
-				9201FF1118D5A444003D1ACA /* filestreamer.dep */,
-				9201FF1218D5A444003D1ACA /* gpac_ogg.dep */,
-				9201FF1318D5A444003D1ACA /* html5_media.dep */,
-				9201FF1418D5A444003D1ACA /* html5_mse.dep */,
-				9201FF1518D5A444003D1ACA /* img.dep */,
-				9201FF1618D5A444003D1ACA /* ismacryp.dep */,
-				9201FF1718D5A444003D1ACA /* isom_hinter.dep */,
-				9201FF1818D5A444003D1ACA /* isom_tools.dep */,
-				9201FF1918D5A444003D1ACA /* m2ts_mux.dep */,
-				9201FF1A18D5A444003D1ACA /* m3u8.dep */,
-				9201FF1B18D5A444003D1ACA /* media_export.dep */,
-				9201FF1C18D5A444003D1ACA /* media_import.dep */,
-				9201FF1D18D5A444003D1ACA /* mpd.dep */,
-				9201FF1E18D5A444003D1ACA /* mpeg2_ps.dep */,
-				9201FF1F18D5A444003D1ACA /* mpegts.dep */,
-				9201FF2018D5A444003D1ACA /* saf.dep */,
-				9201FF2118D5A444003D1ACA /* text_import.dep */,
-				9201FF2218D5A444003D1ACA /* vobsub.dep */,
-				9201FF2318D5A444003D1ACA /* webvtt.dep */,
-			);
-			path = media_tools;
-			sourceTree = "<group>";
-		};
-		9201FF2418D5A444003D1ACA /* odf */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF2518D5A444003D1ACA /* desc_private.dep */,
-				9201FF2618D5A444003D1ACA /* descriptors.dep */,
-				9201FF2718D5A444003D1ACA /* ipmpx_code.dep */,
-				9201FF2818D5A444003D1ACA /* ipmpx_dump.dep */,
-				9201FF2918D5A444003D1ACA /* ipmpx_parse.dep */,
-				9201FF2A18D5A444003D1ACA /* oci_codec.dep */,
-				9201FF2B18D5A444003D1ACA /* odf_code.dep */,
-				9201FF2C18D5A444003D1ACA /* odf_codec.dep */,
-				9201FF2D18D5A444003D1ACA /* odf_command.dep */,
-				9201FF2E18D5A444003D1ACA /* odf_dump.dep */,
-				9201FF2F18D5A444003D1ACA /* odf_parse.dep */,
-				9201FF3018D5A444003D1ACA /* qos.dep */,
-				9201FF3118D5A444003D1ACA /* slc.dep */,
-			);
-			path = odf;
-			sourceTree = "<group>";
-		};
-		9201FF3218D5A444003D1ACA /* scene_manager */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF3318D5A444003D1ACA /* encode_isom.dep */,
-				9201FF3418D5A444003D1ACA /* loader_bt.dep */,
-				9201FF3518D5A444003D1ACA /* loader_isom.dep */,
-				9201FF3618D5A444003D1ACA /* loader_qt.dep */,
-				9201FF3718D5A444003D1ACA /* loader_svg.dep */,
-				9201FF3818D5A444003D1ACA /* loader_xmt.dep */,
-				9201FF3918D5A444003D1ACA /* scene_dump.dep */,
-				9201FF3A18D5A444003D1ACA /* scene_engine.dep */,
-				9201FF3B18D5A444003D1ACA /* scene_manager.dep */,
-				9201FF3C18D5A444003D1ACA /* scene_stats.dep */,
-				9201FF3D18D5A444003D1ACA /* swf_bifs.dep */,
-				9201FF3E18D5A444003D1ACA /* swf_parse.dep */,
-				9201FF3F18D5A444003D1ACA /* swf_svg.dep */,
-				9201FF4018D5A444003D1ACA /* text_to_bifs.dep */,
-			);
-			path = scene_manager;
-			sourceTree = "<group>";
-		};
-		9201FF4118D5A444003D1ACA /* scenegraph */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF4218D5A444003D1ACA /* base_scenegraph.dep */,
-				9201FF4318D5A444003D1ACA /* commands.dep */,
-				9201FF4418D5A444003D1ACA /* dom_events.dep */,
-				9201FF4518D5A444003D1ACA /* dom_smjs.dep */,
-				9201FF4618D5A444003D1ACA /* html5_media_smjs.dep */,
-				9201FF4718D5A444003D1ACA /* html5_mse_smjs.dep */,
-				9201FF4818D5A444003D1ACA /* mpeg4_animators.dep */,
-				9201FF4918D5A444003D1ACA /* mpeg4_nodes.dep */,
-				9201FF4A18D5A444003D1ACA /* mpeg4_valuator.dep */,
-				9201FF4B18D5A444003D1ACA /* smil_anim.dep */,
-				9201FF4C18D5A444003D1ACA /* smil_timing.dep */,
-				9201FF4D18D5A444003D1ACA /* svg_attributes.dep */,
-				9201FF4E18D5A444003D1ACA /* svg_properties.dep */,
-				9201FF4F18D5A444003D1ACA /* svg_smjs.dep */,
-				9201FF5018D5A444003D1ACA /* svg_types.dep */,
-				9201FF5118D5A444003D1ACA /* vrml_interpolators.dep */,
-				9201FF5218D5A444003D1ACA /* vrml_proto.dep */,
-				9201FF5318D5A444003D1ACA /* vrml_route.dep */,
-				9201FF5418D5A444003D1ACA /* vrml_script.dep */,
-				9201FF5518D5A444003D1ACA /* vrml_smjs.dep */,
-				9201FF5618D5A444003D1ACA /* vrml_tools.dep */,
-				9201FF5718D5A444003D1ACA /* webvtt_smjs.dep */,
-				9201FF5818D5A444003D1ACA /* x3d_nodes.dep */,
-				9201FF5918D5A444003D1ACA /* xbl_process.dep */,
-				9201FF5A18D5A444003D1ACA /* xml_ns.dep */,
-			);
-			path = scenegraph;
-			sourceTree = "<group>";
-		};
-		9201FF5B18D5A444003D1ACA /* terminal */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF5C18D5A444003D1ACA /* channel.dep */,
-				9201FF5D18D5A444003D1ACA /* clock.dep */,
-				9201FF5E18D5A444003D1ACA /* decoder.dep */,
-				9201FF5F18D5A444003D1ACA /* input_sensor.dep */,
-				9201FF6018D5A444003D1ACA /* media_control.dep */,
-				9201FF6118D5A444003D1ACA /* media_manager.dep */,
-				9201FF6218D5A444003D1ACA /* media_memory.dep */,
-				9201FF6318D5A444003D1ACA /* media_object.dep */,
-				9201FF6418D5A444003D1ACA /* media_sensor.dep */,
-				9201FF6518D5A444003D1ACA /* mpeg4_inline.dep */,
-				9201FF6618D5A444003D1ACA /* network_service.dep */,
-				9201FF6718D5A444003D1ACA /* object_browser.dep */,
-				9201FF6818D5A444003D1ACA /* object_manager.dep */,
-				9201FF6918D5A444003D1ACA /* scene.dep */,
-				9201FF6A18D5A444003D1ACA /* svg_external.dep */,
-				9201FF6B18D5A444003D1ACA /* term_node_init.dep */,
-				9201FF6C18D5A444003D1ACA /* terminal.dep */,
-			);
-			path = terminal;
-			sourceTree = "<group>";
-		};
-		9201FF6D18D5A444003D1ACA /* utils */ = {
-			isa = PBXGroup;
-			children = (
-				9201FF6E18D5A444003D1ACA /* alloc.dep */,
-				9201FF6F18D5A444003D1ACA /* base_encoding.dep */,
-				9201FF7018D5A444003D1ACA /* bitstream.dep */,
-				9201FF7118D5A444003D1ACA /* cache.dep */,
-				9201FF7218D5A444003D1ACA /* color.dep */,
-				9201FF7318D5A444003D1ACA /* configfile.dep */,
-				9201FF7418D5A444003D1ACA /* downloader.dep */,
-				9201FF7518D5A444003D1ACA /* error.dep */,
-				9201FF7618D5A444003D1ACA /* list.dep */,
-				9201FF7718D5A444003D1ACA /* map.dep */,
-				9201FF7818D5A444003D1ACA /* math.dep */,
-				9201FF7918D5A444003D1ACA /* module.dep */,
-				9201FF7A18D5A444003D1ACA /* os_config_init.dep */,
-				9201FF7C18D5A444003D1ACA /* os_module.dep */,
-				9201FF7D18D5A444003D1ACA /* os_net.dep */,
-				9201FF7E18D5A444003D1ACA /* os_thread.dep */,
-				9201FF7F18D5A444003D1ACA /* path2d.dep */,
-				9201FF8018D5A444003D1ACA /* path2d_stroker.dep */,
-				9201FF8118D5A444003D1ACA /* ringbuffer.dep */,
-				9201FF8218D5A444003D1ACA /* sha1.dep */,
-				9201FF8318D5A444003D1ACA /* token.dep */,
-				9201FF8418D5A444003D1ACA /* uni_bidi.dep */,
-				9201FF8518D5A444003D1ACA /* unicode.dep */,
-				9201FF8618D5A444003D1ACA /* url.dep */,
-				9201FF8718D5A444003D1ACA /* utf.dep */,
-				9201FF8818D5A444003D1ACA /* xml_parser.dep */,
-			);
-			path = utils;
-			sourceTree = "<group>";
-		};
 		9201FF8918D5A444003D1ACA /* bifs */ = {
 			isa = PBXGroup;
 			children = (
@@ -2160,76 +1500,87 @@
 		9201FF9A18D5A444003D1ACA /* compositor */ = {
 			isa = PBXGroup;
 			children = (
-				9201FF9B18D5A444003D1ACA /* audio_input.c */,
-				9201FF9C18D5A444003D1ACA /* audio_mixer.c */,
-				9201FF9D18D5A444003D1ACA /* audio_render.c */,
-				9201FF9E18D5A444003D1ACA /* bindable.c */,
-				9201FF9F18D5A444003D1ACA /* camera.c */,
-				9201FFA018D5A444003D1ACA /* compositor.c */,
-				9201FFA118D5A444003D1ACA /* compositor_2d.c */,
-				9201FFA218D5A444003D1ACA /* compositor_3d.c */,
-				9201FFA318D5A444003D1ACA /* compositor_node_init.c */,
-				9201FFA418D5A444003D1ACA /* drawable.c */,
-				9201FFA518D5A444003D1ACA /* drawable.h */,
-				9201FFA618D5A444003D1ACA /* events.c */,
-				9201FFA718D5A444003D1ACA /* font_engine.c */,
-				9201FFA818D5A444003D1ACA /* gl_inc.h */,
-				9201FFA918D5A444003D1ACA /* hardcoded_protos.c */,
-				9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */,
-				9201FFAB18D5A444003D1ACA /* mesh.c */,
-				9201FFAC18D5A444003D1ACA /* mesh_collide.c */,
-				9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */,
-				9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */,
-				9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */,
-				9201FFB018D5A444003D1ACA /* mpeg4_background.c */,
-				9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */,
-				9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */,
-				9201FFB318D5A444003D1ACA /* mpeg4_composite.c */,
-				9201FFB418D5A444003D1ACA /* mpeg4_form.c */,
-				9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */,
-				9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */,
-				9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */,
-				9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */,
-				9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */,
-				9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */,
-				9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */,
-				9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */,
-				9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */,
-				9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */,
-				9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */,
-				9201FFC018D5A444003D1ACA /* mpeg4_layout.c */,
-				9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */,
-				9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */,
-				9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */,
-				9201FFC418D5A444003D1ACA /* mpeg4_sound.c */,
-				9201FFC518D5A444003D1ACA /* mpeg4_text.c */,
-				9201FFC618D5A444003D1ACA /* mpeg4_textures.c */,
-				9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */,
-				9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */,
-				9201FFC918D5A444003D1ACA /* navigate.c */,
-				9201FFCA18D5A444003D1ACA /* nodes_stacks.h */,
-				9201FFCB18D5A444003D1ACA /* offscreen_cache.c */,
-				9201FFCC18D5A444003D1ACA /* offscreen_cache.h */,
-				9201FFCD18D5A444003D1ACA /* svg_base.c */,
-				9201FFCE18D5A444003D1ACA /* svg_filters.c */,
-				9201FFCF18D5A444003D1ACA /* svg_font.c */,
-				9201FFD018D5A444003D1ACA /* svg_geometry.c */,
-				9201FFD118D5A444003D1ACA /* svg_grouping.c */,
-				9201FFD218D5A444003D1ACA /* svg_media.c */,
-				9201FFD318D5A444003D1ACA /* svg_paint_servers.c */,
-				9201FFD418D5A444003D1ACA /* svg_text.c */,
-				9201FFD518D5A444003D1ACA /* texturing.c */,
-				9201FFD618D5A444003D1ACA /* texturing.h */,
-				9201FFD718D5A444003D1ACA /* texturing_gl.c */,
-				9201FFD818D5A444003D1ACA /* visual_manager.c */,
-				9201FFD918D5A444003D1ACA /* visual_manager.h */,
-				9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */,
-				9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */,
-				9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */,
-				9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */,
-				9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */,
-				9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */,
-				9201FFE018D5A444003D1ACA /* x3d_geometry.c */,
+				92B9A53D1F8660D200A24FE4 /* audio_input.c */,
+				92B9A5281F8660CF00A24FE4 /* audio_mixer.c */,
+				92B9A5471F8660D300A24FE4 /* audio_render.c */,
+				92B9A5591F8660D600A24FE4 /* bindable.c */,
+				92B9A54C1F8660D400A24FE4 /* camera.c */,
+				92B9A55D1F8660D600A24FE4 /* clock.c */,
+				92B9A5241F8660CF00A24FE4 /* compositor_2d.c */,
+				92B9A5201F8660CE00A24FE4 /* compositor_3d.c */,
+				92B9A5601F8660D600A24FE4 /* compositor_node_init.c */,
+				92B9A54D1F8660D400A24FE4 /* compositor.c */,
+				92B9A5211F8660CE00A24FE4 /* drawable.c */,
+				92B9A5251F8660CF00A24FE4 /* drawable.h */,
+				92B9A55B1F8660D600A24FE4 /* events.c */,
+				92B9A5461F8660D300A24FE4 /* font_engine.c */,
+				92B9A5361F8660D100A24FE4 /* gl_inc.h */,
+				92B9A5331F8660D000A24FE4 /* hardcoded_protos.c */,
+				92B9A5321F8660D000A24FE4 /* hc_flash_shape.c */,
+				92B9A5481F8660D300A24FE4 /* media_object.c */,
+				92B9A5631F8660D700A24FE4 /* mesh_collide.c */,
+				92B9A5351F8660D100A24FE4 /* mesh_tesselate.c */,
+				92B9A54E1F8660D400A24FE4 /* mesh.c */,
+				92B9A5221F8660CE00A24FE4 /* mpeg4_animstream.c */,
+				92B9A5491F8660D300A24FE4 /* mpeg4_audio.c */,
+				92B9A5271F8660CF00A24FE4 /* mpeg4_background.c */,
+				92B9A5261F8660CF00A24FE4 /* mpeg4_background2d.c */,
+				92B9A53F1F8660D200A24FE4 /* mpeg4_bitmap.c */,
+				92B9A53C1F8660D200A24FE4 /* mpeg4_composite.c */,
+				92B9A5341F8660D100A24FE4 /* mpeg4_form.c */,
+				92B9A5411F8660D200A24FE4 /* mpeg4_geometry_2d.c */,
+				92B9A51D1F8660CE00A24FE4 /* mpeg4_geometry_3d.c */,
+				92B9A5171F8660CE00A24FE4 /* mpeg4_geometry_ifs2d.c */,
+				92B9A51E1F8660CE00A24FE4 /* mpeg4_geometry_ils2d.c */,
+				92B9A5551F8660D500A24FE4 /* mpeg4_gradients.c */,
+				92B9A5291F8660CF00A24FE4 /* mpeg4_grouping_2d.c */,
+				92B9A5231F8660CE00A24FE4 /* mpeg4_grouping_3d.c */,
+				92B9A5561F8660D500A24FE4 /* mpeg4_grouping.c */,
+				92B9A5521F8660D500A24FE4 /* mpeg4_grouping.h */,
+				92B9A54F1F8660D400A24FE4 /* mpeg4_inline.c */,
+				92B9A5B81F866E0500A24FE4 /* mpeg4_inputsensor.c */,
+				92B9A5401F8660D200A24FE4 /* mpeg4_layer_2d.c */,
+				92B9A5181F8660CE00A24FE4 /* mpeg4_layer_3d.c */,
+				92B9A5191F8660CE00A24FE4 /* mpeg4_layout.c */,
+				92B9A51F1F8660CE00A24FE4 /* mpeg4_lighting.c */,
+				92B9A5621F8660D700A24FE4 /* mpeg4_mediacontrol.c */,
+				92B9A52E1F8660D000A24FE4 /* mpeg4_mediasensor.c */,
+				92B9A53B1F8660D100A24FE4 /* mpeg4_path_layout.c */,
+				92B9A5501F8660D400A24FE4 /* mpeg4_sensors.c */,
+				92B9A5611F8660D700A24FE4 /* mpeg4_sound.c */,
+				92B9A5431F8660D300A24FE4 /* mpeg4_text.c */,
+				92B9A5511F8660D400A24FE4 /* mpeg4_textures.c */,
+				92B9A5371F8660D100A24FE4 /* mpeg4_timesensor.c */,
+				92B9A55E1F8660D600A24FE4 /* mpeg4_viewport.c */,
+				92B9A52B1F8660CF00A24FE4 /* navigate.c */,
+				92B9A54B1F8660D400A24FE4 /* nodes_stacks.h */,
+				92B9A5581F8660D500A24FE4 /* object_manager.c */,
+				92B9A52F1F8660D000A24FE4 /* offscreen_cache.c */,
+				92B9A52A1F8660CF00A24FE4 /* offscreen_cache.h */,
+				92B9A5B61F866D6500A24FE4 /* scene_node_init.c */,
+				92B9A5381F8660D100A24FE4 /* scene_ns.c */,
+				92B9A5541F8660D500A24FE4 /* scene.c */,
+				92B9A51C1F8660CE00A24FE4 /* svg_base.c */,
+				92B9A52D1F8660D000A24FE4 /* svg_external.c */,
+				92B9A52C1F8660CF00A24FE4 /* svg_filters.c */,
+				92B9A5161F8660CD00A24FE4 /* svg_font.c */,
+				92B9A5311F8660D000A24FE4 /* svg_geometry.c */,
+				92B9A51A1F8660CE00A24FE4 /* svg_grouping.c */,
+				92B9A55C1F8660D600A24FE4 /* svg_media.c */,
+				92B9A5451F8660D300A24FE4 /* svg_paint_servers.c */,
+				92B9A5391F8660D100A24FE4 /* svg_text.c */,
+				92B9A5571F8660D500A24FE4 /* texturing_gl.c */,
+				92B9A54A1F8660D400A24FE4 /* texturing.c */,
+				92B9A55A1F8660D600A24FE4 /* texturing.h */,
+				92B9A5441F8660D300A24FE4 /* visual_manager_2d_draw.c */,
+				92B9A5531F8660D500A24FE4 /* visual_manager_2d.c */,
+				92B9A55F1F8660D600A24FE4 /* visual_manager_2d.h */,
+				92B9A53A1F8660D100A24FE4 /* visual_manager_3d_gl.c */,
+				92B9A5641F8660D700A24FE4 /* visual_manager_3d.c */,
+				92B9A51B1F8660CE00A24FE4 /* visual_manager_3d.h */,
+				92B9A5651F8660D700A24FE4 /* visual_manager.c */,
+				92B9A5421F8660D200A24FE4 /* visual_manager.h */,
+				92B9A5301F8660D000A24FE4 /* x3d_geometry.c */,
 			);
 			path = compositor;
 			sourceTree = "<group>";
@@ -2257,7 +1608,6 @@
 		9201FFF118D5A444003D1ACA /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
-				924FEE811BA6C63A003F77A6 /* iff.c */,
 				9201FFF218D5A444003D1ACA /* avc_ext.c */,
 				9201FFF318D5A444003D1ACA /* box_code_3gpp.c */,
 				9201FFF418D5A444003D1ACA /* box_code_adobe.c */,
@@ -2271,6 +1621,7 @@
 				9201FFFC18D5A444003D1ACA /* drm_sample.c */,
 				9201FFFE18D5A444003D1ACA /* hint_track.c */,
 				9201FFFF18D5A444003D1ACA /* hinting.c */,
+				924FEE811BA6C63A003F77A6 /* iff.c */,
 				9201000018D5A444003D1ACA /* isom_intern.c */,
 				9201000118D5A444003D1ACA /* isom_read.c */,
 				9201000218D5A444003D1ACA /* isom_store.c */,
@@ -2283,362 +1634,138 @@
 				9201000918D5A444003D1ACA /* stbl_read.c */,
 				9201000A18D5A444003D1ACA /* stbl_write.c */,
 				9201000B18D5A444003D1ACA /* track.c */,
-				9201000C18D5A444003D1ACA /* ttml.c */,
 				9201000D18D5A444003D1ACA /* tx3g.c */,
 			);
 			path = isomedia;
 			sourceTree = "<group>";
 		};
-		9225732918D7267D00D6FD98 /* ogg_in */ = {
-			isa = PBXGroup;
-			children = (
-				9225732A18D7269700D6FD98 /* ogg_in.c */,
-				9225732B18D7269700D6FD98 /* ogg_in.h */,
-				9225732C18D7269700D6FD98 /* ogg_load.c */,
-				9225732D18D7269700D6FD98 /* theora_dec.c */,
-				9225732E18D7269700D6FD98 /* vorbis_dec.c */,
-			);
-			name = ogg_in;
-			sourceTree = "<group>";
-		};
-		9235E04C1CFECCD90051D8A1 /* vtb_decode */ = {
-			isa = PBXGroup;
-			children = (
-				9235E04A1CFECCD50051D8A1 /* vtb_decode.c */,
-			);
-			name = vtb_decode;
-			sourceTree = "<group>";
-		};
-		92A9D3C81CCA79BD006FF303 /* amr_in */ = {
-			isa = PBXGroup;
-			children = (
-				92A9D3C61CCA79B4006FF303 /* amr_in.c */,
-			);
-			name = amr_in;
-			sourceTree = "<group>";
-		};
-		92AAF0D718D6DB3400E2FF12 /* sdl_out */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF0D818D6DB5500E2FF12 /* audio.c */,
-				92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */,
-				92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */,
-				92AAF0DC18D6DB5500E2FF12 /* video.c */,
-			);
-			name = sdl_out;
-			sourceTree = "<group>";
-		};
-		92AAF0E918D6E35200E2FF12 /* builtin_modules */ = {
-			isa = PBXGroup;
-			children = (
-				92D3C62D2031F48500BA1735 /* atsc_in */,
-				92A9D3C81CCA79BD006FF303 /* amr_in */,
-				92AAF0F318D6E5BB00E2FF12 /* audio_filter */,
-				92AAF0F618D6E5EA00E2FF12 /* bifs_dec */,
-				92AAF0F918D6E60B00E2FF12 /* ctx_load */,
-				92AAF0FC18D6E63400E2FF12 /* dummy_in */,
-				92AAF0FF18D6E66000E2FF12 /* gpac_js */,
-				92AAF10218D6E67A00E2FF12 /* img_in */,
-				92AAF11118D6E6A300E2FF12 /* isma_cenc */,
-				92AAF11418D6E6C400E2FF12 /* isom_in */,
-				92AAF11F18D6E6E300E2FF12 /* laser_dec */,
-				92AAF12218D6E6FE00E2FF12 /* mpd_in */,
-				92AAF12518D6E71C00E2FF12 /* mpegts_in */,
-				92AAF12818D6E73700E2FF12 /* mse_in */,
-				92F8D46A1F6FF78600616F7C /* netctrl */,
-				92AAF12B18D6E74F00E2FF12 /* odf_dec */,
-				92AAF12E18D6E76400E2FF12 /* osd */,
-				92BE50DF18D6D7F800AA59D8 /* raw_out */,
-				92AAF13118D6E7AB00E2FF12 /* rtp_in */,
-				92AAF14018D6E7CA00E2FF12 /* saf_in */,
-				92BE511918D6DA7100AA59D8 /* soft_raster */,
-				92AAF14318D6E7E400E2FF12 /* svg_dec */,
-				92AAF14618D6E81700E2FF12 /* timed_text */,
-				92AAF14B18D6E82A00E2FF12 /* validator */,
-				9235E04C1CFECCD90051D8A1 /* vtb_decode */,
-				92AAF1D418D7108600E2FF12 /* vtt_in */,
-				92AAF14E18D6E85D00E2FF12 /* widget_man */,
-			);
-			name = builtin_modules;
-			path = ../build/xcode;
-			sourceTree = "<group>";
-		};
-		92AAF0F318D6E5BB00E2FF12 /* audio_filter */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF0F418D6E5D400E2FF12 /* audio_filter.c */,
-			);
-			name = audio_filter;
-			sourceTree = "<group>";
-		};
-		92AAF0F618D6E5EA00E2FF12 /* bifs_dec */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */,
-			);
-			name = bifs_dec;
-			sourceTree = "<group>";
-		};
-		92AAF0F918D6E60B00E2FF12 /* ctx_load */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF0FA18D6E62600E2FF12 /* ctx_load.c */,
-			);
-			name = ctx_load;
-			sourceTree = "<group>";
-		};
-		92AAF0FC18D6E63400E2FF12 /* dummy_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF0FD18D6E64800E2FF12 /* dummy_in.c */,
-			);
-			name = dummy_in;
-			sourceTree = "<group>";
-		};
-		92AAF0FF18D6E66000E2FF12 /* gpac_js */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF10018D6E66D00E2FF12 /* gpac_js.c */,
-			);
-			name = gpac_js;
-			sourceTree = "<group>";
-		};
-		92AAF10218D6E67A00E2FF12 /* img_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF10318D6E69500E2FF12 /* bmp_dec.c */,
-				92AAF10418D6E69500E2FF12 /* img_dec.c */,
-				92AAF10518D6E69500E2FF12 /* img_in.c */,
-				92AAF10618D6E69500E2FF12 /* img_in.h */,
-				92AAF10718D6E69500E2FF12 /* jp2_dec.c */,
-				92AAF10818D6E69500E2FF12 /* jpeg_dec.c */,
-				92AAF10918D6E69500E2FF12 /* png_dec.c */,
-			);
-			name = img_in;
-			sourceTree = "<group>";
-		};
-		92AAF11118D6E6A300E2FF12 /* isma_cenc */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF11218D6E6B700E2FF12 /* isma_ea.c */,
-			);
-			name = isma_cenc;
-			sourceTree = "<group>";
-		};
-		92AAF11418D6E6C400E2FF12 /* isom_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF11518D6E6D300E2FF12 /* isom_cache.c */,
-				92AAF11618D6E6D300E2FF12 /* isom_in.h */,
-				92AAF11718D6E6D300E2FF12 /* load.c */,
-				92AAF11818D6E6D300E2FF12 /* read_ch.c */,
-				92AAF11918D6E6D300E2FF12 /* read.c */,
-			);
-			name = isom_in;
-			sourceTree = "<group>";
-		};
-		92AAF11F18D6E6E300E2FF12 /* laser_dec */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12018D6E6F300E2FF12 /* laser_dec.c */,
-			);
-			name = laser_dec;
-			sourceTree = "<group>";
-		};
-		92AAF12218D6E6FE00E2FF12 /* mpd_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12318D6E70D00E2FF12 /* mpd_in.c */,
-			);
-			name = mpd_in;
-			sourceTree = "<group>";
-		};
-		92AAF12518D6E71C00E2FF12 /* mpegts_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12618D6E72800E2FF12 /* mpegts_in.c */,
-			);
-			name = mpegts_in;
-			sourceTree = "<group>";
-		};
-		92AAF12818D6E73700E2FF12 /* mse_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12918D6E74200E2FF12 /* mse_in.c */,
-			);
-			name = mse_in;
-			sourceTree = "<group>";
-		};
-		92AAF12B18D6E74F00E2FF12 /* odf_dec */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12C18D6E75800E2FF12 /* odf_dec.c */,
-			);
-			name = odf_dec;
-			sourceTree = "<group>";
-		};
-		92AAF12E18D6E76400E2FF12 /* osd */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF12F18D6E77900E2FF12 /* osd.c */,
-			);
-			name = osd;
-			sourceTree = "<group>";
-		};
-		92AAF13118D6E7AB00E2FF12 /* rtp_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF13218D6E7BC00E2FF12 /* rtp_in.c */,
-				92AAF13318D6E7BC00E2FF12 /* rtp_in.h */,
-				92AAF13418D6E7BC00E2FF12 /* rtp_session.c */,
-				92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */,
-				92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */,
-				92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */,
-				92AAF13818D6E7BC00E2FF12 /* sdp_load.c */,
-			);
-			name = rtp_in;
-			sourceTree = "<group>";
-		};
-		92AAF14018D6E7CA00E2FF12 /* saf_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF14118D6E7D800E2FF12 /* saf_in.c */,
-			);
-			name = saf_in;
-			sourceTree = "<group>";
-		};
-		92AAF14318D6E7E400E2FF12 /* svg_dec */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF14418D6E7F500E2FF12 /* svg_in.c */,
-			);
-			name = svg_dec;
-			sourceTree = "<group>";
-		};
-		92AAF14618D6E81700E2FF12 /* timed_text */ = {
+		92334C8E2333A8B800DA6051 /* quickjs */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF14718D6E82500E2FF12 /* timedtext_dec.c */,
-				92AAF14818D6E82500E2FF12 /* timedtext_in.c */,
+				923EB53123D1B78D00E1FFA1 /* libbf.c */,
+				92910FA7233536620052365D /* cutils.c */,
+				92910FA52335363F0052365D /* libregexp.c */,
+				92334C932333A8C800DA6051 /* libunicode.c */,
+				92334CA42333A8C900DA6051 /* quickjs.c */,
+				92334CA22333A8C900DA6051 /* quickjs.h */,
 			);
-			name = timed_text;
+			name = quickjs;
 			sourceTree = "<group>";
 		};
-		92AAF14B18D6E82A00E2FF12 /* validator */ = {
+		9234CF4C1FD8344500CCDFA1 /* in_rtp */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF14C18D6E83B00E2FF12 /* validator.c */,
+				9234CF451FD8344000CCDFA1 /* in_rtp_rtsp.c */,
+				9234CF421FD8344000CCDFA1 /* in_rtp_sdp.c */,
+				9234CF441FD8344000CCDFA1 /* in_rtp_signaling.c */,
+				9234CF401FD8343F00CCDFA1 /* in_rtp_stream.c */,
+				9234CF411FD8343F00CCDFA1 /* in_rtp.c */,
+				9234CF431FD8344000CCDFA1 /* in_rtp.h */,
 			);
-			name = validator;
+			name = in_rtp;
 			sourceTree = "<group>";
 		};
-		92AAF14E18D6E85D00E2FF12 /* widget_man */ = {
+		9251CA871E9D3DFE0089DDC6 /* MP4Client */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF14F18D6E87500E2FF12 /* unzip.c */,
-				92AAF15018D6E87500E2FF12 /* unzip.h */,
-				92AAF15118D6E87500E2FF12 /* wgt_load.c */,
-				92AAF15218D6E87500E2FF12 /* widget.c */,
-				92AAF15318D6E87500E2FF12 /* widgetman.c */,
-				92AAF15418D6E87500E2FF12 /* widgetman.h */,
+				92D5356F1A5C0CF700F2442A /* carbon_events.c */,
+				9251CA881E9D3E2B0089DDC6 /* main.c */,
 			);
-			name = widget_man;
+			name = MP4Client;
 			sourceTree = "<group>";
 		};
-		92AAF16A18D6F49D00E2FF12 /* ft_font */ = {
+		92586A6E1EA7663A00A0838A /* ft_font */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF16B18D6F5EA00E2FF12 /* ft_font.c */,
-				92AAF16C18D6F5EA00E2FF12 /* ft_font.h */,
+				92586A6F1EA7665D00A0838A /* ft_font.c */,
+				92586A701EA7665D00A0838A /* ft_font.h */,
 			);
 			name = ft_font;
 			sourceTree = "<group>";
 		};
-		92AAF17D18D6F8DB00E2FF12 /* aac_in */ = {
+		925974F42215BA270007E02B /* evg */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF17E18D6F8EF00E2FF12 /* aac_in.c */,
-				92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */,
+				92D211932370832900128AE2 /* raster3d.c */,
+				9210D006237041C2007AFB48 /* ftgrays.c */,
+				925974FB2215BA3A0007E02B /* rast_soft.h */,
+				925974F72215BA3A0007E02B /* raster_565.c */,
+				925974F62215BA3A0007E02B /* raster_argb.c */,
+				925974F52215BA3A0007E02B /* raster_rgb.c */,
+				925974FC2215BA3A0007E02B /* raster_yuv.c */,
+				925974F82215BA3A0007E02B /* stencil.c */,
+				925974FA2215BA3A0007E02B /* surface.c */,
 			);
-			name = aac_in;
+			name = evg;
 			sourceTree = "<group>";
 		};
-		92AAF18C18D6FA1A00E2FF12 /* ac3_in */ = {
+		926C7E632018B86800E90AF6 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */,
-				92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */,
-			);
-			name = ac3_in;
-			sourceTree = "<group>";
-		};
-		92AAF19D18D6FDE000E2FF12 /* ffmpeg_in */ = {
-			isa = PBXGroup;
-			children = (
-				92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */,
-				92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */,
-				92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */,
-				92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */,
+				92A7E9602003BAE8000C22DE /* Security.framework */,
+				92A7E95E2003BACB000C22DE /* AudioToolbox.framework */,
+				92A7E95C2003BAAA000C22DE /* CoreServices.framework */,
 			);
-			name = ffmpeg_in;
+			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		92AAF1B218D709E700E2FF12 /* mp3_in */ = {
+		927AACF81E44ED5C008C8E69 /* gpac */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF1B318D70A0A00E2FF12 /* mad_dec.c */,
-				92AAF1B418D70A0A00E2FF12 /* mp3_in.c */,
+				927AACF61E44ED58008C8E69 /* main.c */,
 			);
-			name = mp3_in;
+			name = gpac;
 			sourceTree = "<group>";
 		};
-		92AAF1C218D70B3000E2FF12 /* openhevc_dec */ = {
+		929383A22355A6EF00AAAFA8 /* WebGL */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */,
+				9293839F2354DBDB00AAAFA8 /* WebGLRenderingContextBase.c */,
+				9293839D2354A10800AAAFA8 /* webgl.h */,
+				9293839B23548C8F00AAAFA8 /* webgl.c */,
 			);
-			name = openhevc_dec;
+			name = WebGL;
 			sourceTree = "<group>";
 		};
-		92AAF1CF18D70D3E00E2FF12 /* opensvc_dec */ = {
+		929CB5C120B6F02800849696 /* crypto */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */,
+				923E89C620B6F04600F299B2 /* g_crypt_openssl.c */,
+				923E89CA20B6F04600F299B2 /* g_crypt_tinyaes.c */,
+				923E89C820B6F04600F299B2 /* g_crypt.c */,
+				923E89C920B6F04600F299B2 /* tiny_aes.c */,
+				923E89C720B6F04600F299B2 /* tiny_aes.h */,
 			);
-			name = opensvc_dec;
+			name = crypto;
 			sourceTree = "<group>";
 		};
-		92AAF1D418D7108600E2FF12 /* vtt_in */ = {
+		92AAF0D718D6DB3400E2FF12 /* sdl_out */ = {
 			isa = PBXGroup;
 			children = (
-				92AAF1D518D7109A00E2FF12 /* vtt_dec.c */,
-				92AAF1D618D7109A00E2FF12 /* vtt_in.c */,
+				92AAF0D818D6DB5500E2FF12 /* audio.c */,
+				92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */,
+				92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */,
+				92AAF0DC18D6DB5500E2FF12 /* video.c */,
 			);
-			name = vtt_in;
+			name = sdl_out;
 			sourceTree = "<group>";
 		};
 		92B02F4D1DD2004300F85E77 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				92A7E9602003BAE8000C22DE /* Security.framework */,
-				92A7E95E2003BACB000C22DE /* AudioToolbox.framework */,
-				92A7E95C2003BAAA000C22DE /* CoreServices.framework */,
+				92BD5570205AE9BD007C4C06 /* AppKit.framework */,
+				92BD556E205AE9B0007C4C06 /* CoreImage.framework */,
+				92BD556A205AE974007C4C06 /* CoreGraphics.framework */,
+				92BB854C1F7BE2BA009BC9C8 /* &#x1; */,
 				92B02F4E1DD2004400F85E77 /* OpenGL.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		92BAF022202C541B001ED2F1 /* atscdmx */ = {
-			isa = PBXGroup;
-			children = (
-				92BAF023202C542C001ED2F1 /* main.c */,
-			);
-			name = atscdmx;
-			sourceTree = "<group>";
-		};
 		92BBFC471A71228A006A7735 /* include */ = {
 			isa = PBXGroup;
 			children = (
+				9225DD742326790C00F94C42 /* mpd.h */,
 				92D3C6282031E98600BA1735 /* atsc.h */,
 				92BBFC481A7122AD006A7735 /* ait.h */,
 				92BBFC491A7122AD006A7735 /* avparse.h */,
@@ -2652,24 +1779,24 @@
 				92BBFC511A7122AD006A7735 /* configuration.h */,
 				92BBFC521A7122AD006A7735 /* constants.h */,
 				92BBFC531A7122AD006A7735 /* crypt.h */,
+				92493D8120E2A81700203C2C /* crypt_tools.h */,
 				92BBFC541A7122AD006A7735 /* dash.h */,
 				92BBFC551A7122AD006A7735 /* download.h */,
 				92BBFC561A7122AD006A7735 /* dsmcc.h */,
 				92BBFC571A7122AD006A7735 /* dvb_mpe.h */,
-				92BBFC581A7122AD006A7735 /* esi.h */,
 				92BBFC591A7122AD006A7735 /* events_constants.h */,
 				92BBFC5A1A7122AD006A7735 /* events.h */,
-				92BBFC5B1A7122AD006A7735 /* filestreamer.h */,
+				925975072215BAC30007E02B /* evg.h */,
+				92DB148B1E4F05B500382A81 /* filters.h */,
 				92BBFC5C1A7122AD006A7735 /* html5_media.h */,
 				92BBFC5D1A7122AD006A7735 /* html5_mse.h */,
 				92BBFC5E1A7122AD006A7735 /* ietf.h */,
 				92BBFC5F1A7122AD006A7735 /* internal */,
-				92BBFC771A7122AD006A7735 /* ismacryp.h */,
 				92BBFC781A7122AD006A7735 /* iso639.h */,
 				92BBFC791A7122AD006A7735 /* isomedia.h */,
 				92BBFC7A1A7122AD006A7735 /* laser.h */,
 				92BBFC7B1A7122AD006A7735 /* list.h */,
-				92BBFC7C1A7122AD006A7735 /* map.h */,
+				92DB148C1E4F05B500382A81 /* main.h */,
 				92BBFC7D1A7122AD006A7735 /* maths.h */,
 				92BBFC7E1A7122AD006A7735 /* media_tools.h */,
 				92BBFC7F1A7122AD006A7735 /* mediaobject.h */,
@@ -2685,7 +1812,7 @@
 				92BBFC931A7122AD006A7735 /* options.h */,
 				92BBFC941A7122AD006A7735 /* path2d.h */,
 				92BBFC951A7122AD006A7735 /* revision.h */,
-				92BBFC961A7122AD006A7735 /* ringbuffer.h */,
+				9231B3AE2321533F00ADB4A9 /* Remotery.h */,
 				92BBFC971A7122AD006A7735 /* rtp_streamer.h */,
 				92BBFC981A7122AD006A7735 /* scene_engine.h */,
 				92BBFC991A7122AD006A7735 /* scene_manager.h */,
@@ -2700,7 +1827,6 @@
 				92BBFCA21A7122AD006A7735 /* thread.h */,
 				92BBFCA31A7122AD006A7735 /* token.h */,
 				92BBFCA41A7122AD006A7735 /* tools.h */,
-				92BBFCA51A7122AD006A7735 /* unicode.h */,
 				92BBFCA61A7122AD006A7735 /* user.h */,
 				92BBFCA71A7122AD006A7735 /* utf.h */,
 				92BBFCA81A7122AD006A7735 /* version.h */,
@@ -2734,7 +1860,6 @@
 				92BBFC721A7122AD006A7735 /* scenegraph_dev.h */,
 				92BBFC731A7122AD006A7735 /* smjs_api.h */,
 				92BBFC741A7122AD006A7735 /* swf_dev.h */,
-				92BBFC751A7122AD006A7735 /* terminal_dev.h */,
 				92BBFC761A7122AD006A7735 /* vobsub.h */,
 			);
 			name = internal;
@@ -2745,14 +1870,10 @@
 			isa = PBXGroup;
 			children = (
 				92BBFC821A7122AD006A7735 /* audio_out.h */,
-				92BBFC831A7122AD006A7735 /* codec.h */,
 				92BBFC841A7122AD006A7735 /* font.h */,
 				92BBFC851A7122AD006A7735 /* hardcoded_proto.h */,
-				92BBFC861A7122AD006A7735 /* ipmp.h */,
 				92BBFC871A7122AD006A7735 /* js_usr.h */,
 				92BBFC881A7122AD006A7735 /* raster2d.h */,
-				92BBFC891A7122AD006A7735 /* service.h */,
-				92BBFC8A1A7122AD006A7735 /* term_ext.h */,
 				92BBFC8B1A7122AD006A7735 /* video_out.h */,
 			);
 			name = modules;
@@ -2773,11 +1894,9 @@
 		92BE50AC18D6375100AA59D8 /* applications */ = {
 			isa = PBXGroup;
 			children = (
-				92BAF022202C541B001ED2F1 /* atscdmx */,
-				92D5356F1A5C0CF700F2442A /* carbon_events.c */,
-				2839E2911A1635FE002D73E1 /* DashCast */,
-				92BE50C918D6D60100AA59D8 /* MP4Client */,
-				92BE50B518D6D53000AA59D8 /* MP42TS */,
+				929383A32355A86F00AAAFA8 /* main.c */,
+				9251CA871E9D3DFE0089DDC6 /* MP4Client */,
+				927AACF81E44ED5C008C8E69 /* gpac */,
 				92BE509218D6325E00AA59D8 /* MP4Box */,
 			);
 			name = applications;
@@ -2786,14 +1905,8 @@
 		92BE50AD18D6376A00AA59D8 /* modules */ = {
 			isa = PBXGroup;
 			children = (
-				9225732918D7267D00D6FD98 /* ogg_in */,
-				92AAF17D18D6F8DB00E2FF12 /* aac_in */,
-				92AAF18C18D6FA1A00E2FF12 /* ac3_in */,
-				92AAF19D18D6FDE000E2FF12 /* ffmpeg_in */,
-				92AAF16A18D6F49D00E2FF12 /* ft_font */,
-				92AAF1B218D709E700E2FF12 /* mp3_in */,
-				92AAF1C218D70B3000E2FF12 /* openhevc_dec */,
-				92AAF1CF18D70D3E00E2FF12 /* opensvc_dec */,
+				92C403DB2181F15A00331F39 /* dec_openhevc */,
+				92586A6E1EA7663A00A0838A /* ft_font */,
 				92AAF0D718D6DB3400E2FF12 /* sdl_out */,
 			);
 			name = modules;
@@ -2807,72 +1920,171 @@
 			name = xcode;
 			sourceTree = "<group>";
 		};
-		92BE50B518D6D53000AA59D8 /* MP42TS */ = {
-			isa = PBXGroup;
-			children = (
-				92BE50C118D6D5DC00AA59D8 /* main.c */,
-			);
-			path = MP42TS;
-			sourceTree = "<group>";
-		};
-		92BE50C918D6D60100AA59D8 /* MP4Client */ = {
-			isa = PBXGroup;
-			children = (
-				92BE50D118D6D62600AA59D8 /* extract.c */,
-				92BE50D218D6D62600AA59D8 /* main.c */,
-			);
-			path = MP4Client;
-			sourceTree = "<group>";
-		};
-		92BE50DF18D6D7F800AA59D8 /* raw_out */ = {
-			isa = PBXGroup;
-			children = (
-				92BE50FD18D6D9EE00AA59D8 /* raw_video.c */,
-			);
-			name = raw_out;
-			sourceTree = "<group>";
-		};
-		92BE511918D6DA7100AA59D8 /* soft_raster */ = {
+		92C1FF4A1E7C42A40093B61E /* builtin_modules */ = {
 			isa = PBXGroup;
 			children = (
-				92BE510918D6DA6300AA59D8 /* ftgrays.c */,
-				92BE510A18D6DA6300AA59D8 /* rast_soft.h */,
-				92BE510B18D6DA6300AA59D8 /* raster_565.c */,
-				92BE510C18D6DA6300AA59D8 /* raster_argb.c */,
-				92BE510D18D6DA6300AA59D8 /* raster_load.c */,
-				92BE510E18D6DA6300AA59D8 /* raster_rgb.c */,
-				92BE510F18D6DA6300AA59D8 /* stencil.c */,
-				92BE511018D6DA6300AA59D8 /* surface.c */,
+				92586A7E1EAA5A4300A0838A /* validator.c */,
 			);
-			name = soft_raster;
-			sourceTree = "<group>";
-		};
-		92D3C62D2031F48500BA1735 /* atsc_in */ = {
-			isa = PBXGroup;
-			children = (
-				92D3C6302031F4C100BA1735 /* atsc_in.c */,
-			);
-			name = atsc_in;
+			name = builtin_modules;
 			sourceTree = "<group>";
 		};
-		92DC362B20B4803E00C48E39 /* crypto */ = {
+		92C403DB2181F15A00331F39 /* dec_openhevc */ = {
 			isa = PBXGroup;
 			children = (
-				92597E4820B4805B000365B9 /* g_crypt_openssl.c */,
-				92597E4C20B4805B000365B9 /* g_crypt_tinyaes.c */,
-				92597E4A20B4805B000365B9 /* g_crypt.c */,
-				92597E4B20B4805B000365B9 /* tiny_aes.c */,
-				92597E4920B4805B000365B9 /* tiny_aes.h */,
+				92C403DC2181F17E00331F39 /* dec_openhevc.c */,
 			);
-			name = crypto;
+			name = dec_openhevc;
 			sourceTree = "<group>";
 		};
-		92F8D46A1F6FF78600616F7C /* netctrl */ = {
-			isa = PBXGroup;
-			children = (
-				92F8D46B1F6FF7A100616F7C /* netctrl.c */,
+		92D6C5982343BEC600262217 /* jsmods */ = {
+			isa = PBXGroup;
+			children = (
+				9273463223506D370081AF74 /* storage.c */,
+				923C337C234794F2001CED08 /* evg.c */,
+				92D6C5992343BED700262217 /* scene_js.c */,
+				929383A22355A6EF00AAAFA8 /* WebGL */,
+				92D6C59A2343BED700262217 /* xhr.c */,
+			);
+			name = jsmods;
+			sourceTree = "<group>";
+		};
+		92E164AE20F8EBB60024A9CA /* nvdec */ = {
+			isa = PBXGroup;
+			children = (
+				92E164A820F8EBAE0024A9CA /* dec_nvdec_sdk.c */,
+				92E164A920F8EBAE0024A9CA /* dec_nvdec_sdk.h */,
+				92E164AA20F8EBAE0024A9CA /* dec_nvdec.c */,
+			);
+			name = nvdec;
+			sourceTree = "<group>";
+		};
+		92F8D46F1F71641E00616F7C /* filter_core */ = {
+			isa = PBXGroup;
+			children = (
+				92F8D4701F71642E00616F7C /* filter_pck.c */,
+				92F8D4711F71642E00616F7C /* filter_pid.c */,
+				92F8D4721F71642E00616F7C /* filter_props.c */,
+				92F8D4731F71642E00616F7C /* filter_queue.c */,
+				9234CF3C1FD7E00700CCDFA1 /* filter_register.c */,
+				92F8D4741F71642E00616F7C /* filter_session.c */,
+				92F8D4751F71642E00616F7C /* filter_session.h */,
+				92F8D4761F71642E00616F7C /* filter.c */,
+			);
+			name = filter_core;
+			sourceTree = "<group>";
+		};
+		92F8D47E1F71643600616F7C /* filters */ = {
+			isa = PBXGroup;
+			children = (
+				9274295724647AB8009ADD8D /* bsrw.c */,
+				92BB85581F7BFB61009BC9C8 /* compose.c */,
+				92FE596C2088E52900CF0C5A /* dasher.c */,
+				92BB85821F7C5773009BC9C8 /* dec_ac52.c */,
+				92BB85521F7BFB60009BC9C8 /* dec_bifs.c */,
+				92BB85551F7BFB60009BC9C8 /* dec_faad.c */,
+				92BB85571F7BFB60009BC9C8 /* dec_img.c */,
+				92BB857E1F7C30AE009BC9C8 /* dec_j2k.c */,
+				92B9A5BC1F868CFF00A24FE4 /* dec_laser.c */,
+				92BB855D1F7BFB61009BC9C8 /* dec_mad.c */,
+				92BA0AD3243B68AF006FC74E /* dec_mediacodec.c */,
+				92BB85511F7BFB60009BC9C8 /* dec_odf.c */,
+				92B9A5C01F86ACDF00A24FE4 /* dec_opensvc.c */,
+				926656C31F7D3DF700299CC6 /* dec_theora.c */,
+				922B27712445D5CE001D4F72 /* dec_ttml.c */,
+				9234CF381FD6A6E400CCDFA1 /* dec_ttxt.c */,
+				926656C11F7D10F400299CC6 /* dec_vorbis.c */,
+				92B9A5081F840A6700A24FE4 /* dec_vtb.c */,
+				9234CF3E1FD8311400CCDFA1 /* dec_webvtt.c */,
+				92BB857C1F7BFD7F009BC9C8 /* dec_xvid.c */,
+				925CE3441FA2E641004EC6F5 /* decrypt_cenc_isma.c */,
+				92BA0AD9243B6E2B006FC74E /* dektec_video_decl.c */,
+				922CF1261FCF169900F2F6A4 /* dmx_avi.c */,
+				92BB9A661F9C827600524E5B /* dmx_dash.c */,
+				9203644A20ECF67C0087883E /* dmx_gsf.c */,
+				926656C51F7D45F700299CC6 /* dmx_ogg.c */,
+				926656C71F7E92C200299CC6 /* dmx_m2ts.c */,
+				922CF1241FCEE5D600F2F6A4 /* dmx_mpegps.c */,
+				928E7AC61FB9FCDD00D2470E /* dmx_nhml.c */,
+				928E7AC41FB9F2B800D2470E /* dmx_nhnt.c */,
+				92B9A5BE1F8695FA00A24FE4 /* dmx_saf.c */,
+				926998B31FEACE8F00AA759D /* dmx_vobsub.c */,
+				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 */,
+				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 */,
+				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 */,
+				92334CE02333AF0400DA6051 /* jsfilter.c */,
+				92BB85621F7BFB63009BC9C8 /* load_bt_xmt.c */,
+				92EE76401FD0315D008926F5 /* load_text.c */,
+				92BB85591F7BFB61009BC9C8 /* load_svg.c */,
+				922E29812051940C00C8DCBB /* mux_avi.c */,
+				9206823320EA96AA0041169F /* mux_gsf.c */,
+				9290F5101FAB4C2C0038C30D /* mux_isom.c */,
+				9256B38A208662FB00088537 /* mux_ts.c */,
+				92E164AE20F8EBB60024A9CA /* nvdec */,
+				922E29822051940C00C8DCBB /* out_audio.c */,
+				9289D9F41FDEFFCD00C24F83 /* out_file.c */,
+				92261A86239A6E4600C14199 /* out_http.c */,
+				9206822D20EA69680041169F /* out_pipe.c */,
+				92C0F37D21EC7BB0002961C8 /* out_rtp.c */,
+				92B2A4A42297FD9E002A65A7 /* out_rtsp.c */,
+				9203644E20EE12470087883E /* out_sock.c */,
+				928A7F802059372C00E02E89 /* out_video.c */,
+				92061A841FE0484500B5C464 /* reframer.c */,
+				92BB85801F7C3C4A009BC9C8 /* reframe_ac3.c */,
+				92BB85561F7BFB60009BC9C8 /* reframe_adts.c */,
+				92BB85841F7C606A009BC9C8 /* reframe_amr.c */,
+				92EB479020F50C4200E1F2DD /* reframe_av1.c */,
+				9296BF2122CF7F5300DC9742 /* reframe_flac.c */,
+				92EC32CC1FAC81D5003FB9C3 /* reframe_h263.c */,
+				92BB85541F7BFB60009BC9C8 /* reframe_img.c */,
+				927DB14B21A3C7100032D205 /* reframe_latm.c */,
+				92BB855B1F7BFB61009BC9C8 /* reframe_mp3.c */,
+				9288E8631FB1BF07005460C5 /* reframe_mpgvid.c */,
+				92CDAEE71FBD9D0C0007C1C0 /* reframe_nalu.c */,
+				92860706238690D700FDA1ED /* reframe_prores.c */,
+				92EC32CA1FAC5ACA003FB9C3 /* reframe_qcp.c */,
+				924E805E206D427A00AB580F /* reframe_rawpcm.c */,
+				924E805C206D357A00AB580F /* reframe_rawvid.c */,
+				92E2498F2057B973002CC029 /* resample_audio.c */,
+				92FA79422076687100AE005F /* rewind.c */,
+				9257307D2056948D009DB328 /* rewrite_adts.c */,
+				925730812056A610009DB328 /* rewrite_mp4v.c */,
+				9257307E2056948D009DB328 /* rewrite_nalu.c */,
+				92EB479220F6333800E1F2DD /* rewrite_obu.c */,
+				92A08DBC20D946B6003589FF /* tileagg.c */,
+				9286070E239576D900FDA1ED /* tssplit.c */,
+				92BB85631F7BFB63009BC9C8 /* unit_test_filter.c */,
+				92E318D020651834007BE021 /* vcrop.c */,
+				9212C0FA222D7AC000FE3580 /* vflip.c */,
+				926CE14C1FE7E388002B3CF6 /* write_generic.c */,
+				926F15561FE986B000C40779 /* write_nhml.c */,
+				926F15541FE964CF00C40779 /* write_nhnt.c */,
+				9288350B1FE82E63002F603D /* write_qcp.c */,
+				926F15521FE867B000C40779 /* write_vtt.c */,
 			);
-			name = netctrl;
+			name = filters;
 			sourceTree = "<group>";
 		};
 		92FA48841D0191570072C8A4 /* linklibs */ = {
@@ -2908,22 +2120,15 @@
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
-		2839E27C1A162C24002D73E1 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		9201F93518D5A38A003D1ACA /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				92BBFD0B1A7122AD006A7735 /* xml.h in Headers */,
-				92BBFD061A7122AD006A7735 /* unicode.h in Headers */,
 				92BBFCAE1A7122AD006A7735 /* bifs.h in Headers */,
 				92BBFCED1A7122AD006A7735 /* mpeg4_odf.h in Headers */,
 				92BBFCBC1A7122AD006A7735 /* events_constants.h in Headers */,
+				9231B3AF2321533F00ADB4A9 /* Remotery.h in Headers */,
 				92BBFCF61A7122AD006A7735 /* revision.h in Headers */,
 				92BBFCE31A7122AD006A7735 /* audio_out.h in Headers */,
 				92BBFCF51A7122AD006A7735 /* path2d.h in Headers */,
@@ -2932,29 +2137,29 @@
 				92BBFD021A7122AD006A7735 /* terminal.h in Headers */,
 				92BBFCD81A7122AD006A7735 /* vobsub.h in Headers */,
 				92BBFCB31A7122AD006A7735 /* config_file.h in Headers */,
-				92BBFCBB1A7122AD006A7735 /* esi.h in Headers */,
 				92BBFCC61A7122AD006A7735 /* compositor_dev.h in Headers */,
+				92334CB82333A8C900DA6051 /* quickjs.h in Headers */,
 				92BBFCF21A7122AD006A7735 /* nodes_x3d.h in Headers */,
 				92BBFCF11A7122AD006A7735 /* nodes_svg.h in Headers */,
-				92BBFCF71A7122AD006A7735 /* ringbuffer.h in Headers */,
+				92B9A56B1F8660D700A24FE4 /* visual_manager_3d.h in Headers */,
 				92BBFCC21A7122AD006A7735 /* avilib.h in Headers */,
 				92BBFCC51A7122AD006A7735 /* camera.h in Headers */,
 				92BBFCDB1A7122AD006A7735 /* isomedia.h in Headers */,
 				92BBFCC11A7122AD006A7735 /* ietf.h in Headers */,
+				92F8D47C1F71642E00616F7C /* filter_session.h in Headers */,
 				92BBFCB61A7122AD006A7735 /* crypt.h in Headers */,
+				926245981FD691A000184072 /* ff_common.h in Headers */,
+				92586A721EA7665D00A0838A /* ft_font.h in Headers */,
 				92BBFCAC1A7122AD006A7735 /* avparse.h in Headers */,
 				92BBFCEE1A7122AD006A7735 /* mpegts.h in Headers */,
-				92BBFCDE1A7122AD006A7735 /* map.h in Headers */,
 				92BBFCCB1A7122AD006A7735 /* laser_dev.h in Headers */,
 				92BBFCCA1A7122AD006A7735 /* isomedia_dev.h in Headers */,
-				92BBFCE71A7122AD006A7735 /* ipmp.h in Headers */,
 				920100BC18D5A444003D1ACA /* script.h in Headers */,
-				920100CA18D5A444003D1ACA /* drawable.h in Headers */,
 				92BBFCB01A7122AD006A7735 /* cache.h in Headers */,
-				920100CD18D5A444003D1ACA /* gl_inc.h in Headers */,
 				92BBFCFE1A7122AD006A7735 /* setup.h in Headers */,
 				92BBFCFB1A7122AD006A7735 /* scenegraph_svg.h in Headers */,
 				92BBFCC01A7122AD006A7735 /* html5_mse.h in Headers */,
+				92B9A5AF1F8660D700A24FE4 /* visual_manager_2d.h in Headers */,
 				92BBFCE11A7122AD006A7735 /* mediaobject.h in Headers */,
 				92BBFCDF1A7122AD006A7735 /* maths.h in Headers */,
 				92BBFCD31A7122AD006A7735 /* reedsolomon.h in Headers */,
@@ -2962,95 +2167,82 @@
 				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 */,
-				92BBFCE41A7122AD006A7735 /* codec.h in Headers */,
 				92BBFCAB1A7122AD006A7735 /* ait.h in Headers */,
 				92BBFCC81A7122AD006A7735 /* dvb_mpe_dev.h in Headers */,
-				920100E018D5A444003D1ACA /* mpeg4_grouping.h in Headers */,
-				920100EF18D5A444003D1ACA /* nodes_stacks.h in Headers */,
 				92BBFCB51A7122AD006A7735 /* constants.h in Headers */,
 				92BBFD041A7122AD006A7735 /* token.h in Headers */,
-				920100F118D5A444003D1ACA /* offscreen_cache.h in Headers */,
 				92BBFCB11A7122AD006A7735 /* color.h in Headers */,
 				92BBFCD51A7122AD006A7735 /* smjs_api.h in Headers */,
 				92BBFCF41A7122AD006A7735 /* options.h in Headers */,
-				920100FB18D5A444003D1ACA /* texturing.h in Headers */,
 				92BBFCAD1A7122AD006A7735 /* base_coding.h in Headers */,
 				92BBFCE51A7122AD006A7735 /* font.h in Headers */,
 				92BBFCD61A7122AD006A7735 /* swf_dev.h in Headers */,
 				92BBFCC31A7122AD006A7735 /* bifs_dev.h in Headers */,
+				925975042215BA3A0007E02B /* rast_soft.h in Headers */,
+				92493D8220E2A81700203C2C /* crypt_tools.h in Headers */,
 				92BBFCF81A7122AD006A7735 /* rtp_streamer.h in Headers */,
-				920100FE18D5A444003D1ACA /* visual_manager.h in Headers */,
-				92BBFCD71A7122AD006A7735 /* terminal_dev.h in Headers */,
 				92BBFD071A7122AD006A7735 /* user.h in Headers */,
+				92B9A59B1F8660D700A24FE4 /* nodes_stacks.h in Headers */,
 				92BBFCFA1A7122AD006A7735 /* scene_manager.h in Headers */,
-				92BBFCD91A7122AD006A7735 /* ismacryp.h in Headers */,
-				9201010018D5A444003D1ACA /* visual_manager_2d.h in Headers */,
 				92BBFCB71A7122AD006A7735 /* dash.h in Headers */,
-				9201010318D5A444003D1ACA /* visual_manager_3d.h in Headers */,
+				92E164AC20F8EBAE0024A9CA /* dec_nvdec_sdk.h in Headers */,
 				92BBFD0A1A7122AD006A7735 /* webvtt.h in Headers */,
 				9201015718D5A445003D1ACA /* mpeg2_ps.h in Headers */,
 				92BBFCD41A7122AD006A7735 /* scenegraph_dev.h in Headers */,
+				92B9A5AA1F8660D700A24FE4 /* texturing.h in Headers */,
 				92BBFCFC1A7122AD006A7735 /* scenegraph_vrml.h in Headers */,
-				9201019618D5A445003D1ACA /* input_sensor.h in Headers */,
-				9201019818D5A445003D1ACA /* media_control.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 */,
 				92BBFCBF1A7122AD006A7735 /* html5_media.h in Headers */,
+				92B9A5861F8660D700A24FE4 /* gl_inc.h in Headers */,
+				92DB148E1E4F05B500382A81 /* main.h in Headers */,
 				92BBFCC41A7122AD006A7735 /* bifs_tables.h in Headers */,
 				92BBFCFD1A7122AD006A7735 /* scenegraph.h in Headers */,
 				92BBFCBA1A7122AD006A7735 /* dvb_mpe.h in Headers */,
 				92BBFCE21A7122AD006A7735 /* module.h in Headers */,
-				92597E4E20B4805C000365B9 /* tiny_aes.h in Headers */,
-				9201019B18D5A445003D1ACA /* media_memory.h in Headers */,
 				92BBFCCC1A7122AD006A7735 /* m3u8.h in Headers */,
 				92BBFCC71A7122AD006A7735 /* crypt_dev.h in Headers */,
 				92BBFCCE1A7122AD006A7735 /* mesh.h in Headers */,
 				92BBFCF91A7122AD006A7735 /* scene_engine.h in Headers */,
 				92BBFCE01A7122AD006A7735 /* media_tools.h in Headers */,
+				92B9A57A1F8660D700A24FE4 /* offscreen_cache.h in Headers */,
 				92BBFCAF1A7122AD006A7735 /* bitstream.h in Headers */,
+				92B9A5921F8660D700A24FE4 /* visual_manager.h in Headers */,
 				92BBFCC91A7122AD006A7735 /* ietf_dev.h in Headers */,
 				920101B418D5A445003D1ACA /* module_wrap.h in Headers */,
 				92BBFD001A7122AD006A7735 /* sync_layer.h in Headers */,
-				92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */,
+				92DB148D1E4F05B500382A81 /* filters.h in Headers */,
 				92D3C6292031E98600BA1735 /* atsc.h in Headers */,
-				92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */,
 				92BBFD011A7122AD006A7735 /* term_info.h in Headers */,
 				92BBFCF01A7122AD006A7735 /* nodes_mpeg4.h in Headers */,
 				92BBFCDA1A7122AD006A7735 /* iso639.h in Headers */,
+				923E89CC20B6F04600F299B2 /* tiny_aes.h in Headers */,
+				9293839E2354A10800AAAFA8 /* webgl.h in Headers */,
 				92BBFCBD1A7122AD006A7735 /* events.h in Headers */,
 				92BBFCDC1A7122AD006A7735 /* laser.h in Headers */,
 				92BBFCFF1A7122AD006A7735 /* svg_types.h in Headers */,
-				92AAF11B18D6E6D300E2FF12 /* isom_in.h in Headers */,
+				9234CF491FD8344000CCDFA1 /* in_rtp.h in Headers */,
 				92BBFCD21A7122AD006A7735 /* ogg.h in Headers */,
-				92AAF13A18D6E7BC00E2FF12 /* rtp_in.h in Headers */,
 				92BBFCF31A7122AD006A7735 /* nodes_xbl.h in Headers */,
 				92BBFCDD1A7122AD006A7735 /* list.h in Headers */,
 				92BBFCB81A7122AD006A7735 /* download.h in Headers */,
-				92BBFCEA1A7122AD006A7735 /* service.h in Headers */,
-				92BBFCEB1A7122AD006A7735 /* term_ext.h in Headers */,
+				92B9A5A21F8660D700A24FE4 /* mpeg4_grouping.h in Headers */,
+				925975082215BAC30007E02B /* evg.h in Headers */,
 				92BBFCB41A7122AD006A7735 /* configuration.h in Headers */,
 				92BBFCEF1A7122AD006A7735 /* network.h in Headers */,
-				92AAF15618D6E87500E2FF12 /* unzip.h in Headers */,
 				92BBFCCF1A7122AD006A7735 /* mpd.h in Headers */,
-				92AAF15A18D6E87500E2FF12 /* widgetman.h in Headers */,
-				92BBFCBE1A7122AD006A7735 /* filestreamer.h in Headers */,
+				92B9A5751F8660D700A24FE4 /* drawable.h in Headers */,
 				92BBFCD01A7122AD006A7735 /* odf_dev.h in Headers */,
 				92BBFCCD1A7122AD006A7735 /* media_dev.h in Headers */,
 				92BBFCEC1A7122AD006A7735 /* video_out.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9225732218D7267900D6FD98 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				9225733018D7269700D6FD98 /* ogg_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		92AAF0D118D6DB2D00E2FF12 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
@@ -3063,40 +2255,10 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92AAF16E18D6F5EB00E2FF12 /* ft_font.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF17618D6F89B00E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF18618D6FA1100E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF19618D6FDC300E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1A818D6FDFA00E2FF12 /* ffmpeg_in.h in Headers */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1AC18D709D900E2FF12 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92AAF1BC18D70B1C00E2FF12 /* Headers */ = {
+		92C403D32181F10500331F39 /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -3106,40 +2268,6 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		2839E27D1A162C24002D73E1 /* opensvc */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 2839E27F1A162C24002D73E1 /* Build configuration list for PBXNativeTarget "opensvc" */;
-			buildPhases = (
-				2839E27A1A162C24002D73E1 /* Sources */,
-				2839E27B1A162C24002D73E1 /* Frameworks */,
-				2839E27C1A162C24002D73E1 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = opensvc;
-			productName = opensvc;
-			productReference = 92CC44F91DC0D22C0084D6A6 /* libopensvc.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		2839E2871A1635F7002D73E1 /* DashCast */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 2839E28E1A1635F7002D73E1 /* Build configuration list for PBXNativeTarget "DashCast" */;
-			buildPhases = (
-				2839E2841A1635F7002D73E1 /* Sources */,
-				2839E2851A1635F7002D73E1 /* Frameworks */,
-				2839E2861A1635F7002D73E1 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = DashCast;
-			productName = DashCast;
-			productReference = 2839E2881A1635F7002D73E1 /* DashCast */;
-			productType = "com.apple.product-type.tool";
-		};
 		9201F93618D5A38A003D1ACA /* libgpac */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 9201F93B18D5A38A003D1ACA /* Build configuration list for PBXNativeTarget "libgpac" */;
@@ -3159,22 +2287,25 @@
 			productReference = 9201F93718D5A38A003D1ACA /* libgpac.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
-		9225732318D7267900D6FD98 /* ogg_in */ = {
+		927AACFC1E44EEDC008C8E69 /* gpac */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 9225732718D7267900D6FD98 /* Build configuration list for PBXNativeTarget "ogg_in" */;
+			buildConfigurationList = 927AAD011E44EEDC008C8E69 /* Build configuration list for PBXNativeTarget "gpac" */;
 			buildPhases = (
-				9225732018D7267900D6FD98 /* Sources */,
-				9225732118D7267900D6FD98 /* Frameworks */,
-				9225732218D7267900D6FD98 /* Headers */,
+				927AACF91E44EEDC008C8E69 /* Sources */,
+				927AACFA1E44EEDC008C8E69 /* Frameworks */,
+				927AACFB1E44EEDC008C8E69 /* CopyFiles */,
 			);
 			buildRules = (
 			);
 			dependencies = (
-			);
-			name = ogg_in;
-			productName = ogg_in;
-			productReference = 9225732418D7267900D6FD98 /* gm_ogg_in.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
+				92C403E12181F1F100331F39 /* PBXTargetDependency */,
+				92C403DF2181F1ED00331F39 /* PBXTargetDependency */,
+				92BD5563205AB89D007C4C06 /* PBXTargetDependency */,
+			);
+			name = gpac;
+			productName = gpac;
+			productReference = 927AACFD1E44EEDC008C8E69 /* gpac */;
+			productType = "com.apple.product-type.tool";
 		};
 		92AAF0D218D6DB2D00E2FF12 /* sdl_out */ = {
 			isa = PBXNativeTarget;
@@ -3210,91 +2341,6 @@
 			productReference = 92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */;
 			productType = "com.apple.product-type.library.dynamic";
 		};
-		92AAF17718D6F89B00E2FF12 /* aac_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF17918D6F89B00E2FF12 /* Build configuration list for PBXNativeTarget "aac_in" */;
-			buildPhases = (
-				92AAF17418D6F89B00E2FF12 /* Sources */,
-				92AAF17518D6F89B00E2FF12 /* Frameworks */,
-				92AAF17618D6F89B00E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = aac_in;
-			productName = aac_in;
-			productReference = 92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		92AAF18718D6FA1100E2FF12 /* ac3_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF18918D6FA1200E2FF12 /* Build configuration list for PBXNativeTarget "ac3_in" */;
-			buildPhases = (
-				92AAF18418D6FA1100E2FF12 /* Sources */,
-				92AAF18518D6FA1100E2FF12 /* Frameworks */,
-				92AAF18618D6FA1100E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ac3_in;
-			productName = ac3_in;
-			productReference = 92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		92AAF19718D6FDC300E2FF12 /* ffmpeg_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF19918D6FDC300E2FF12 /* Build configuration list for PBXNativeTarget "ffmpeg_in" */;
-			buildPhases = (
-				92AAF19418D6FDC300E2FF12 /* Sources */,
-				92AAF19518D6FDC300E2FF12 /* Frameworks */,
-				92AAF19618D6FDC300E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ffmpeg_in;
-			productName = ffmpeg_in;
-			productReference = 92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		92AAF1AD18D709D900E2FF12 /* mp3_in */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF1AF18D709D900E2FF12 /* Build configuration list for PBXNativeTarget "mp3_in" */;
-			buildPhases = (
-				92AAF1AA18D709D900E2FF12 /* Sources */,
-				92AAF1AB18D709D900E2FF12 /* Frameworks */,
-				92AAF1AC18D709D900E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = mp3_in;
-			productName = mp3_in;
-			productReference = 92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
-		92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92AAF1BF18D70B1C00E2FF12 /* Build configuration list for PBXNativeTarget "openhevc_dec" */;
-			buildPhases = (
-				92AAF1BA18D70B1C00E2FF12 /* Sources */,
-				92AAF1BB18D70B1C00E2FF12 /* Frameworks */,
-				92AAF1BC18D70B1C00E2FF12 /* Headers */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = openhevc_dec;
-			productName = openhevc_dec;
-			productReference = 92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */;
-			productType = "com.apple.product-type.library.dynamic";
-		};
 		92BE508F18D6325E00AA59D8 /* MP4Box */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */;
@@ -3306,29 +2352,15 @@
 			buildRules = (
 			);
 			dependencies = (
+				92C403E92181F21000331F39 /* PBXTargetDependency */,
+				92C403E72181F20C00331F39 /* PBXTargetDependency */,
+				92C403E52181F20800331F39 /* PBXTargetDependency */,
 			);
 			name = MP4Box;
 			productName = MP4Box;
 			productReference = 92BE509018D6325E00AA59D8 /* MP4Box */;
 			productType = "com.apple.product-type.tool";
 		};
-		92BE50B218D6D53000AA59D8 /* MP42TS */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 92BE50BA18D6D53000AA59D8 /* Build configuration list for PBXNativeTarget "MP42TS" */;
-			buildPhases = (
-				92BE50AF18D6D53000AA59D8 /* Sources */,
-				92BE50B018D6D53000AA59D8 /* Frameworks */,
-				92BE50B118D6D53000AA59D8 /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = MP42TS;
-			productName = MP42TS;
-			productReference = 92BE50B318D6D53000AA59D8 /* MP42TS */;
-			productType = "com.apple.product-type.tool";
-		};
 		92BE50C618D6D60100AA59D8 /* MP4Client */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 92BE50CE18D6D60100AA59D8 /* Build configuration list for PBXNativeTarget "MP4Client" */;
@@ -3340,12 +2372,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				9225733618D727B500D6FD98 /* PBXTargetDependency */,
-				9225731518D717B400D6FD98 /* PBXTargetDependency */,
-				9225731318D717B100D6FD98 /* PBXTargetDependency */,
-				9225731118D717AE00D6FD98 /* PBXTargetDependency */,
-				9225730F18D717AB00D6FD98 /* PBXTargetDependency */,
-				92AAF18318D6F9E700E2FF12 /* PBXTargetDependency */,
+				92C403E32181F1FC00331F39 /* PBXTargetDependency */,
 				92AAF17318D6F87A00E2FF12 /* PBXTargetDependency */,
 				92AAF17118D6F87100E2FF12 /* PBXTargetDependency */,
 			);
@@ -3354,21 +2381,50 @@
 			productReference = 92BE50C718D6D60100AA59D8 /* MP4Client */;
 			productType = "com.apple.product-type.tool";
 		};
+		92C403D62181F10500331F39 /* openhevc_dec */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92C403DA2181F10500331F39 /* Build configuration list for PBXNativeTarget "openhevc_dec" */;
+			buildPhases = (
+				92C403D32181F10500331F39 /* Headers */,
+				92C403D42181F10500331F39 /* Sources */,
+				92C403D52181F10500331F39 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = openhevc_dec;
+			productName = openhevc_dec;
+			productReference = 92C403D72181F10500331F39 /* gf_openhevc_dec.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		9201F92918D5A359003D1ACA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Telecom ParisTech";
+				TargetAttributes = {
+					927AACFC1E44EEDC008C8E69 = {
+						CreatedOnToolsVersion = 8.2.1;
+						DevelopmentTeam = Q46G522WGV;
+						ProvisioningStyle = Automatic;
+					};
+					92C403D62181F10500331F39 = {
+						CreatedOnToolsVersion = 10.0;
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 9201F92718D5A359003D1ACA;
 			productRefGroup = 9201F93818D5A38A003D1ACA /* Products */;
@@ -3377,18 +2433,11 @@
 			targets = (
 				9201F93618D5A38A003D1ACA /* libgpac */,
 				92BE508F18D6325E00AA59D8 /* MP4Box */,
-				92BE50B218D6D53000AA59D8 /* MP42TS */,
 				92BE50C618D6D60100AA59D8 /* MP4Client */,
-				2839E2871A1635F7002D73E1 /* DashCast */,
 				92AAF0D218D6DB2D00E2FF12 /* sdl_out */,
 				92AAF16418D6F40400E2FF12 /* ft_font */,
-				92AAF17718D6F89B00E2FF12 /* aac_in */,
-				92AAF18718D6FA1100E2FF12 /* ac3_in */,
-				92AAF19718D6FDC300E2FF12 /* ffmpeg_in */,
-				92AAF1AD18D709D900E2FF12 /* mp3_in */,
-				92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */,
-				9225732318D7267900D6FD98 /* ogg_in */,
-				2839E27D1A162C24002D73E1 /* opensvc */,
+				927AACFC1E44EEDC008C8E69 /* gpac */,
+				92C403D62181F10500331F39 /* openhevc_dec */,
 			);
 		};
 /* End PBXProject section */
@@ -3410,139 +2459,115 @@
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
-		2839E27A1A162C24002D73E1 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2839E2821A162C48002D73E1 /* opensvc_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		2839E2841A1635F7002D73E1 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				2839E2B91A16363E002D73E1 /* dashcast.c in Sources */,
-				2839E2BB1A16363E002D73E1 /* register.c in Sources */,
-				2839E2B21A16363E002D73E1 /* audio_data.c in Sources */,
-				2839E2B41A16363E002D73E1 /* audio_encoder.c in Sources */,
-				2839E2BE1A16363E002D73E1 /* video_decoder.c in Sources */,
-				2839E2C01A16363E002D73E1 /* video_muxer.c in Sources */,
-				2839E2B51A16363E002D73E1 /* audio_muxer.c in Sources */,
-				2839E2B81A16363E002D73E1 /* controler.c in Sources */,
-				2839E2B61A16363E002D73E1 /* circular_buffer.c in Sources */,
-				2839E2BF1A16363E002D73E1 /* video_encoder.c in Sources */,
-				2839E2BA1A16363E002D73E1 /* message_queue.c in Sources */,
-				2839E2C11A16363E002D73E1 /* video_scaler.c in Sources */,
-				2839E2BD1A16363E002D73E1 /* video_data.c in Sources */,
-				2839E2B31A16363E002D73E1 /* audio_decoder.c in Sources */,
-				2839E2BC1A16363E002D73E1 /* task.c in Sources */,
-				2839E2B71A16363E002D73E1 /* cmd_data.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		9201F93318D5A38A003D1ACA /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				923E89D020B6F2D300F299B2 /* filter_props.c in Sources */,
+				9202FEB32048411D000EE9B1 /* dec_vorbis.c in Sources */,
+				9202FEB2204840FB000EE9B1 /* load_svg.c in Sources */,
+				92B9A5981F8660D700A24FE4 /* media_object.c in Sources */,
 				92F930821A5ADB870072A85C /* os_divers.c in Sources */,
 				92F930831A5ADB870072A85C /* os_file.c in Sources */,
+				92B9A5A61F8660D700A24FE4 /* mpeg4_grouping.c in Sources */,
+				925730822056A610009DB328 /* rewrite_mp4v.c in Sources */,
+				9212C0FB222D7AC000FE3580 /* vflip.c in Sources */,
+				92B9A5661F8660D700A24FE4 /* svg_font.c in Sources */,
+				92B9A5AC1F8660D700A24FE4 /* svg_media.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 */,
 				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 */,
+				92E249902057B973002CC029 /* resample_audio.c in Sources */,
 				920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */,
 				920100B318D5A444003D1ACA /* com_dec.c in Sources */,
+				9234CF4A1FD8344000CCDFA1 /* in_rtp_signaling.c in Sources */,
 				920100B418D5A444003D1ACA /* com_enc.c in Sources */,
+				922B27722445D5CE001D4F72 /* dec_ttml.c in Sources */,
 				920100B518D5A444003D1ACA /* conditional.c in Sources */,
+				92EC32CD1FAC81D6003FB9C3 /* reframe_h263.c in Sources */,
+				92E164BC20F8F2860024A9CA /* Remotery.c in Sources */,
+				92BB85781F7BFB63009BC9C8 /* load_bt_xmt.c in Sources */,
 				920100B618D5A444003D1ACA /* field_decode.c in Sources */,
-				92597E4F20B4805C000365B9 /* g_crypt.c in Sources */,
+				92BB85721F7BFB63009BC9C8 /* ff_common.c in Sources */,
 				920100B718D5A444003D1ACA /* field_encode.c in Sources */,
+				9234CF471FD8344000CCDFA1 /* in_rtp.c in Sources */,
+				92B9A5911F8660D700A24FE4 /* mpeg4_geometry_2d.c in Sources */,
+				92F8D47D1F71642E00616F7C /* filter.c in Sources */,
 				920100B818D5A444003D1ACA /* memory_decoder.c in Sources */,
 				920100B918D5A444003D1ACA /* predictive_mffield.c in Sources */,
+				92B2A4A52297FD9E002A65A7 /* out_rtsp.c in Sources */,
 				920100BB18D5A444003D1ACA /* quantize.c in Sources */,
 				920100BD18D5A444003D1ACA /* script_dec.c in Sources */,
+				92B9A59D1F8660D700A24FE4 /* compositor.c in Sources */,
+				9203644B20ECF67C0087883E /* dmx_gsf.c in Sources */,
+				922E29832051940C00C8DCBB /* mux_avi.c in Sources */,
+				92BB85761F7BFB63009BC9C8 /* ff_dmx.c in Sources */,
+				92B9A5B91F866E0500A24FE4 /* mpeg4_inputsensor.c in Sources */,
+				92B9A5781F8660D700A24FE4 /* audio_mixer.c in Sources */,
 				920100BE18D5A444003D1ACA /* script_enc.c in Sources */,
 				920100BF18D5A444003D1ACA /* unquantize.c in Sources */,
-				920100C018D5A444003D1ACA /* audio_input.c in Sources */,
-				920100C118D5A444003D1ACA /* audio_mixer.c in Sources */,
-				920100C218D5A444003D1ACA /* audio_render.c in Sources */,
-				920100C318D5A444003D1ACA /* bindable.c in Sources */,
-				920100C418D5A444003D1ACA /* camera.c in Sources */,
-				920100C518D5A444003D1ACA /* compositor.c in Sources */,
-				920100C618D5A444003D1ACA /* compositor_2d.c in Sources */,
-				920100C718D5A444003D1ACA /* compositor_3d.c in Sources */,
-				920100C818D5A444003D1ACA /* compositor_node_init.c in Sources */,
-				920100C918D5A444003D1ACA /* drawable.c in Sources */,
-				920100CB18D5A444003D1ACA /* events.c in Sources */,
-				920100CC18D5A444003D1ACA /* font_engine.c in Sources */,
-				920100CE18D5A444003D1ACA /* hardcoded_protos.c in Sources */,
-				920100CF18D5A444003D1ACA /* hc_flash_shape.c in Sources */,
-				920100D018D5A444003D1ACA /* mesh.c in Sources */,
-				920100D118D5A444003D1ACA /* mesh_collide.c in Sources */,
-				920100D218D5A444003D1ACA /* mesh_tesselate.c in Sources */,
-				920100D318D5A444003D1ACA /* mpeg4_animstream.c in Sources */,
-				920100D418D5A444003D1ACA /* mpeg4_audio.c in Sources */,
-				920100D518D5A444003D1ACA /* mpeg4_background.c in Sources */,
-				920100D618D5A444003D1ACA /* mpeg4_background2d.c in Sources */,
-				920100D718D5A444003D1ACA /* mpeg4_bitmap.c in Sources */,
-				920100D818D5A444003D1ACA /* mpeg4_composite.c in Sources */,
-				920100D918D5A444003D1ACA /* mpeg4_form.c in Sources */,
-				920100DA18D5A444003D1ACA /* mpeg4_geometry_2d.c in Sources */,
-				920100DB18D5A444003D1ACA /* mpeg4_geometry_3d.c in Sources */,
-				920100DC18D5A444003D1ACA /* mpeg4_geometry_ifs2d.c in Sources */,
-				920100DD18D5A444003D1ACA /* mpeg4_geometry_ils2d.c in Sources */,
-				920100DE18D5A444003D1ACA /* mpeg4_gradients.c in Sources */,
-				920100DF18D5A444003D1ACA /* mpeg4_grouping.c in Sources */,
-				920100E118D5A444003D1ACA /* mpeg4_grouping_2d.c in Sources */,
-				920100E218D5A444003D1ACA /* mpeg4_grouping_3d.c in Sources */,
-				920100E318D5A444003D1ACA /* mpeg4_layer_2d.c in Sources */,
-				920100E418D5A444003D1ACA /* mpeg4_layer_3d.c in Sources */,
-				920100E518D5A444003D1ACA /* mpeg4_layout.c in Sources */,
-				920100E618D5A444003D1ACA /* mpeg4_lighting.c in Sources */,
-				920100E718D5A444003D1ACA /* mpeg4_path_layout.c in Sources */,
-				920100E818D5A444003D1ACA /* mpeg4_sensors.c in Sources */,
-				920100E918D5A444003D1ACA /* mpeg4_sound.c in Sources */,
-				920100EA18D5A444003D1ACA /* mpeg4_text.c in Sources */,
-				920100EB18D5A444003D1ACA /* mpeg4_textures.c in Sources */,
-				920100EC18D5A444003D1ACA /* mpeg4_timesensor.c in Sources */,
-				920100ED18D5A444003D1ACA /* mpeg4_viewport.c in Sources */,
-				920100EE18D5A444003D1ACA /* navigate.c in Sources */,
-				920100F018D5A444003D1ACA /* offscreen_cache.c in Sources */,
-				920100F218D5A444003D1ACA /* svg_base.c in Sources */,
-				920100F318D5A444003D1ACA /* svg_filters.c in Sources */,
-				920100F418D5A444003D1ACA /* svg_font.c in Sources */,
-				920100F518D5A444003D1ACA /* svg_geometry.c in Sources */,
-				920100F618D5A444003D1ACA /* svg_grouping.c in Sources */,
-				920100F718D5A444003D1ACA /* svg_media.c in Sources */,
-				920100F818D5A444003D1ACA /* svg_paint_servers.c in Sources */,
-				920100F918D5A444003D1ACA /* svg_text.c in Sources */,
-				920100FA18D5A444003D1ACA /* texturing.c in Sources */,
-				920100FC18D5A444003D1ACA /* texturing_gl.c in Sources */,
-				920100FD18D5A444003D1ACA /* visual_manager.c in Sources */,
-				920100FF18D5A444003D1ACA /* visual_manager_2d.c in Sources */,
-				9201010118D5A444003D1ACA /* visual_manager_2d_draw.c in Sources */,
-				9201010218D5A444003D1ACA /* visual_manager_3d.c in Sources */,
-				9201010418D5A444003D1ACA /* visual_manager_3d_gl.c in Sources */,
-				9201010518D5A444003D1ACA /* x3d_geometry.c in Sources */,
+				924E805F206D427A00AB580F /* reframe_rawpcm.c in Sources */,
+				92BB85831F7C5774009BC9C8 /* dec_ac52.c in Sources */,
+				92B9A5731F8660D700A24FE4 /* mpeg4_grouping_3d.c in Sources */,
+				92334CA92333A8C900DA6051 /* libunicode.c in Sources */,
+				92BB85671F7BFB63009BC9C8 /* dec_odf.c in Sources */,
+				92BB856E1F7BFB63009BC9C8 /* compose.c in Sources */,
+				92BB85811F7C3C4B009BC9C8 /* reframe_ac3.c in Sources */,
+				92F8D4771F71642E00616F7C /* filter_pck.c in Sources */,
+				9256B38B208662FC00088537 /* mux_ts.c in Sources */,
+				9288E8641FB1BF07005460C5 /* reframe_mpgvid.c in Sources */,
+				92B9A5991F8660D700A24FE4 /* mpeg4_audio.c in Sources */,
+				92B9A5111F8660B500A24FE4 /* terminal.c in Sources */,
+				92B9A5881F8660D700A24FE4 /* scene_ns.c in Sources */,
+				92B9A50A1F840A6800A24FE4 /* dec_vtb.c in Sources */,
+				92B9A5771F8660D700A24FE4 /* mpeg4_background.c in Sources */,
+				92BB85691F7BFB63009BC9C8 /* isoffin_read_ch.c in Sources */,
+				92F8D47A1F71642E00616F7C /* filter_queue.c in Sources */,
+				92B9A5A81F8660D700A24FE4 /* object_manager.c in Sources */,
 				9201010718D5A444003D1ACA /* rtcp.c in Sources */,
 				9201010818D5A444003D1ACA /* rtp.c in Sources */,
 				9201010918D5A444003D1ACA /* rtp_depacketizer.c in Sources */,
+				92910FA62335363F0052365D /* libregexp.c in Sources */,
+				92B9A5901F8660D700A24FE4 /* mpeg4_layer_2d.c in Sources */,
 				9201010A18D5A444003D1ACA /* rtp_packetizer.c in Sources */,
 				9201010B18D5A444003D1ACA /* rtp_pck_3gpp.c in Sources */,
+				92061A851FE0484600B5C464 /* reframer.c in Sources */,
 				9201010C18D5A444003D1ACA /* rtp_pck_mpeg12.c in Sources */,
+				92B9A5821F8660D700A24FE4 /* hc_flash_shape.c in Sources */,
 				9201010D18D5A444003D1ACA /* rtp_pck_mpeg4.c in Sources */,
+				92D6C59C2343BED700262217 /* xhr.c in Sources */,
+				92B9A5C11F86ACDF00A24FE4 /* dec_opensvc.c in Sources */,
+				925CE3451FA2E642004EC6F5 /* decrypt_cenc_isma.c in Sources */,
 				9201010E18D5A444003D1ACA /* rtp_streamer.c in Sources */,
+				92B9A58D1F8660D700A24FE4 /* audio_input.c in Sources */,
+				9293839C23548C8F00AAAFA8 /* webgl.c in Sources */,
 				9201010F18D5A444003D1ACA /* rtsp_command.c in Sources */,
 				9201011018D5A444003D1ACA /* rtsp_common.c in Sources */,
+				92B9A56F1F8660D700A24FE4 /* mpeg4_lighting.c in Sources */,
+				92B9A57D1F8660D700A24FE4 /* svg_external.c in Sources */,
 				9201011118D5A444003D1ACA /* rtsp_response.c in Sources */,
 				9201011218D5A444003D1ACA /* rtsp_session.c in Sources */,
+				92B2A4AB229D64EF002A65A7 /* hevcsplit.c in Sources */,
+				92B9A5711F8660D700A24FE4 /* drawable.c in Sources */,
 				9201011318D5A444003D1ACA /* sdp.c in Sources */,
+				925975032215BA3A0007E02B /* surface.c in Sources */,
 				924FEE821BA6C63A003F77A6 /* iff.c in Sources */,
 				9201011418D5A444003D1ACA /* avc_ext.c in Sources */,
 				9201011518D5A444003D1ACA /* box_code_3gpp.c in Sources */,
+				929DE7472417DC020056AFA7 /* gzio.c in Sources */,
 				9201011618D5A444003D1ACA /* box_code_adobe.c in Sources */,
+				92D6C5A02343BEFF00262217 /* svg_js.c in Sources */,
 				9201011718D5A444003D1ACA /* box_code_apple.c in Sources */,
 				9201011818D5A444003D1ACA /* box_code_base.c in Sources */,
+				92B9A58A1F8660D700A24FE4 /* visual_manager_3d_gl.c in Sources */,
+				92EE76411FD0315D008926F5 /* load_text.c in Sources */,
+				92FE596D2088E52900CF0C5A /* dasher.c in Sources */,
 				9201011918D5A444003D1ACA /* box_code_drm.c in Sources */,
 				9201011A18D5A444003D1ACA /* box_code_meta.c in Sources */,
 				9201011B18D5A444003D1ACA /* box_dump.c in Sources */,
@@ -3550,211 +2575,274 @@
 				9201011D18D5A444003D1ACA /* data_map.c in Sources */,
 				9201011E18D5A444003D1ACA /* drm_sample.c in Sources */,
 				9201012018D5A444003D1ACA /* hint_track.c in Sources */,
+				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 */,
+				9289D9F51FDEFFCE00C24F83 /* out_file.c in Sources */,
 				9201012418D5A444003D1ACA /* isom_store.c in Sources */,
+				92BB85791F7BFB63009BC9C8 /* unit_test_filter.c in Sources */,
 				9201012518D5A444003D1ACA /* isom_write.c in Sources */,
 				9201012618D5A444003D1ACA /* media.c in Sources */,
 				9201012718D5A444003D1ACA /* media_odf.c in Sources */,
 				9201012818D5A444003D1ACA /* meta.c in Sources */,
+				9274295824647AB8009ADD8D /* bsrw.c in Sources */,
 				9201012918D5A444003D1ACA /* movie_fragments.c in Sources */,
+				92BA0AD5243B68AF006FC74E /* dec_mediacodec.c in Sources */,
 				9201012A18D5A444003D1ACA /* sample_descs.c in Sources */,
 				9201012B18D5A444003D1ACA /* stbl_read.c in Sources */,
+				92B9A5AE1F8660D700A24FE4 /* mpeg4_viewport.c in Sources */,
+				92B9A56E1F8660D700A24FE4 /* mpeg4_geometry_ils2d.c in Sources */,
 				9201012C18D5A444003D1ACA /* stbl_write.c in Sources */,
-				92597E5020B4805C000365B9 /* tiny_aes.c in Sources */,
+				926656C61F7D45F700299CC6 /* dmx_ogg.c in Sources */,
 				9201012D18D5A444003D1ACA /* track.c in Sources */,
-				9201012E18D5A444003D1ACA /* ttml.c in Sources */,
+				926F15571FE986B000C40779 /* write_nhml.c in Sources */,
+				926656C81F7E92C200299CC6 /* dmx_m2ts.c in Sources */,
+				92B9A5691F8660D700A24FE4 /* mpeg4_layout.c in Sources */,
 				9201012F18D5A444003D1ACA /* tx3g.c in Sources */,
 				9201013018D5A444003D1ACA /* lsr_dec.c in Sources */,
+				9257307F2056948D009DB328 /* rewrite_adts.c in Sources */,
+				92BA0ADA243B6E2B006FC74E /* dektec_video_decl.c in Sources */,
 				9201013118D5A444003D1ACA /* lsr_enc.c in Sources */,
 				9201013218D5A445003D1ACA /* lsr_tables.c in Sources */,
+				92E164AB20F8EBAE0024A9CA /* dec_nvdec_sdk.c in Sources */,
+				924E805D206D357A00AB580F /* reframe_rawvid.c in Sources */,
+				9203644D20EE0F190087883E /* in_sock.c in Sources */,
+				92FA79432076687100AE005F /* rewind.c in Sources */,
+				92BB85661F7BFB63009BC9C8 /* ff_dec.c in Sources */,
+				9273463323506D370081AF74 /* storage.c in Sources */,
+				92B9A5B01F8660D700A24FE4 /* compositor_node_init.c in Sources */,
+				92B9A5B51F8660D700A24FE4 /* visual_manager.c in Sources */,
+				92B9A5891F8660D700A24FE4 /* svg_text.c in Sources */,
 				9201014218D5A445003D1ACA /* ait.c in Sources */,
 				9201014318D5A445003D1ACA /* av_parsers.c in Sources */,
+				92CDAEE81FBD9D0C0007C1C0 /* reframe_nalu.c in Sources */,
 				9201014418D5A445003D1ACA /* avilib.c in Sources */,
+				92B9A5A31F8660D700A24FE4 /* visual_manager_2d.c in Sources */,
+				92B9A57C1F8660D700A24FE4 /* svg_filters.c in Sources */,
+				92B9A5A01F8660D700A24FE4 /* mpeg4_sensors.c in Sources */,
 				9201014518D5A445003D1ACA /* dash_client.c in Sources */,
+				925975052215BA3A0007E02B /* raster_yuv.c in Sources */,
+				92E318D120651834007BE021 /* vcrop.c in Sources */,
+				92B9A5971F8660D700A24FE4 /* audio_render.c in Sources */,
 				9201014618D5A445003D1ACA /* dash_segmenter.c in Sources */,
 				9201014718D5A445003D1ACA /* dsmcc.c in Sources */,
+				92B9A5BF1F8695FA00A24FE4 /* dmx_saf.c in Sources */,
+				92860707238690D700FDA1ED /* reframe_prores.c in Sources */,
+				92EB479320F6333900E1F2DD /* rewrite_obu.c in Sources */,
+				92D6C5A22343BEFF00262217 /* dom_js.c in Sources */,
 				9201014818D5A445003D1ACA /* dvb_mpe.c in Sources */,
-				9201014918D5A445003D1ACA /* filestreamer.c in Sources */,
 				9201014A18D5A445003D1ACA /* gpac_ogg.c in Sources */,
-				92D3C6312031F4C200BA1735 /* atsc_in.c in Sources */,
-				9201014B18D5A445003D1ACA /* html5_media.c in Sources */,
-				9201014C18D5A445003D1ACA /* html5_mse.c in Sources */,
 				9201014D18D5A445003D1ACA /* img.c in Sources */,
-				9201014E18D5A445003D1ACA /* ismacryp.c in Sources */,
 				9201014F18D5A445003D1ACA /* isom_hinter.c in Sources */,
 				9201015018D5A445003D1ACA /* isom_tools.c in Sources */,
+				92B9A5811F8660D700A24FE4 /* svg_geometry.c in Sources */,
 				9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */,
 				9201015218D5A445003D1ACA /* m3u8.c in Sources */,
+				92256CCD20E0DA26004EB243 /* encrypt_cenc_isma.c in Sources */,
+				926998B41FEACE8F00AA759D /* dmx_vobsub.c in Sources */,
 				9201015318D5A445003D1ACA /* media_export.c in Sources */,
-				92597E4D20B4805C000365B9 /* g_crypt_openssl.c in Sources */,
 				9201015418D5A445003D1ACA /* media_import.c in Sources */,
+				92B9A5791F8660D700A24FE4 /* mpeg4_grouping_2d.c in Sources */,
+				92B9A5941F8660D700A24FE4 /* visual_manager_2d_draw.c in Sources */,
+				92B9A5AB1F8660D700A24FE4 /* events.c in Sources */,
+				9234CF481FD8344000CCDFA1 /* in_rtp_sdp.c in Sources */,
 				9201015518D5A445003D1ACA /* mpd.c in Sources */,
+				92B9A58F1F8660D700A24FE4 /* mpeg4_bitmap.c in Sources */,
 				9201015618D5A445003D1ACA /* mpeg2_ps.c in Sources */,
 				9201015818D5A445003D1ACA /* mpegts.c in Sources */,
+				92B9A5AD1F8660D700A24FE4 /* clock.c in Sources */,
+				9234CF3D1FD7E00700CCDFA1 /* filter_register.c in Sources */,
+				92E164AD20F8EBAE0024A9CA /* dec_nvdec.c in Sources */,
 				9201015918D5A445003D1ACA /* reedsolomon.c in Sources */,
+				92261A87239A6E4600C14199 /* out_http.c in Sources */,
 				9201015A18D5A445003D1ACA /* saf.c in Sources */,
-				9201015B18D5A445003D1ACA /* text_import.c in Sources */,
+				92B9A5B71F866D6500A24FE4 /* scene_node_init.c in Sources */,
 				9201015C18D5A445003D1ACA /* vobsub.c in Sources */,
 				9201015D18D5A445003D1ACA /* webvtt.c in Sources */,
+				92B9A5801F8660D700A24FE4 /* x3d_geometry.c in Sources */,
 				9201015E18D5A445003D1ACA /* desc_private.c in Sources */,
+				92E9167C2073F1DB00EE92FB /* ff_enc.c in Sources */,
+				928607132396DF8500FDA1ED /* ff_avf.c in Sources */,
 				9201015F18D5A445003D1ACA /* descriptors.c in Sources */,
 				9201016018D5A445003D1ACA /* ipmpx_code.c in Sources */,
 				9201016118D5A445003D1ACA /* ipmpx_dump.c in Sources */,
+				928E7AC51FB9F2B800D2470E /* dmx_nhnt.c in Sources */,
+				92BB856B1F7BFB63009BC9C8 /* dec_faad.c in Sources */,
+				92BB857B1F7BFB63009BC9C8 /* isoffin_read.c in Sources */,
+				92EB479120F50C4200E1F2DD /* reframe_av1.c in Sources */,
+				92B9A5851F8660D700A24FE4 /* mesh_tesselate.c in Sources */,
+				923E89CF20B6F04600F299B2 /* g_crypt_tinyaes.c in Sources */,
 				9201016218D5A445003D1ACA /* ipmpx_parse.c in Sources */,
+				92B9A5B31F8660D700A24FE4 /* mesh_collide.c in Sources */,
+				9290F5111FAB4C2C0038C30D /* mux_isom.c in Sources */,
+				92BB85731F7BFB63009BC9C8 /* dec_mad.c in Sources */,
 				9201016318D5A445003D1ACA /* oci_codec.c in Sources */,
 				9201016418D5A445003D1ACA /* odf_code.c in Sources */,
 				9201016518D5A445003D1ACA /* odf_codec.c in Sources */,
+				92B9A5B11F8660D700A24FE4 /* mpeg4_sound.c in Sources */,
 				9201016618D5A445003D1ACA /* odf_command.c in Sources */,
 				9201016718D5A445003D1ACA /* odf_dump.c in Sources */,
+				92C0F37E21EC7BB0002961C8 /* out_rtp.c in Sources */,
 				9201016818D5A445003D1ACA /* odf_parse.c in Sources */,
 				9201016918D5A445003D1ACA /* qos.c in Sources */,
+				9206822E20EA69680041169F /* out_pipe.c in Sources */,
+				92493D8020E2A64000203C2C /* crypt_tools.c in Sources */,
+				925974FE2215BA3A0007E02B /* raster_rgb.c in Sources */,
 				9201016A18D5A445003D1ACA /* slc.c in Sources */,
+				92586A7F1EAA5A4300A0838A /* validator.c in Sources */,
+				9286070F239576D900FDA1ED /* tssplit.c in Sources */,
+				92BB85751F7BFB63009BC9C8 /* inspect.c in Sources */,
+				92B9A5721F8660D700A24FE4 /* mpeg4_animstream.c in Sources */,
 				9201016B18D5A445003D1ACA /* encode_isom.c in Sources */,
+				92BB85851F7C606A009BC9C8 /* reframe_amr.c in Sources */,
+				926F15551FE964D000C40779 /* write_nhnt.c in Sources */,
 				9201016C18D5A445003D1ACA /* loader_bt.c in Sources */,
+				92B9A5B21F8660D700A24FE4 /* mpeg4_mediacontrol.c in Sources */,
+				92EC32CB1FAC5ACB003FB9C3 /* reframe_qcp.c in Sources */,
 				9201016D18D5A445003D1ACA /* loader_isom.c in Sources */,
+				92BB856D1F7BFB63009BC9C8 /* dec_img.c in Sources */,
+				92B9A5741F8660D700A24FE4 /* compositor_2d.c in Sources */,
+				92BB85741F7BFB63009BC9C8 /* in_http.c in Sources */,
+				92B9A57B1F8660D700A24FE4 /* navigate.c in Sources */,
+				92B9A59A1F8660D700A24FE4 /* texturing.c in Sources */,
 				9201016E18D5A445003D1ACA /* loader_qt.c in Sources */,
 				9201016F18D5A445003D1ACA /* loader_svg.c in Sources */,
-				92597E5120B4805C000365B9 /* g_crypt_tinyaes.c in Sources */,
 				9201017018D5A445003D1ACA /* loader_xmt.c in Sources */,
 				9201017118D5A445003D1ACA /* scene_dump.c in Sources */,
+				9239B8D82073AFEF005F7264 /* enc_png.c in Sources */,
 				9201017218D5A445003D1ACA /* scene_engine.c in Sources */,
+				928A7F812059372C00E02E89 /* out_video.c in Sources */,
+				92B2A4AA229D64EF002A65A7 /* hevcmerge.c in Sources */,
 				9201017318D5A445003D1ACA /* scene_manager.c in Sources */,
+				926CE14F1FE81865002B3CF6 /* constants.c in Sources */,
 				9201017418D5A445003D1ACA /* scene_stats.c in Sources */,
 				9201017518D5A445003D1ACA /* swf_bifs.c in Sources */,
+				923E89CB20B6F04600F299B2 /* g_crypt_openssl.c in Sources */,
+				92B9A57F1F8660D700A24FE4 /* offscreen_cache.c in Sources */,
+				92B9A59E1F8660D700A24FE4 /* mesh.c in Sources */,
+				925974FF2215BA3A0007E02B /* raster_argb.c in Sources */,
+				928E7AC71FB9FCDD00D2470E /* dmx_nhml.c in Sources */,
 				9201017618D5A445003D1ACA /* swf_parse.c in Sources */,
+				9296BF2222CF7F5300DC9742 /* reframe_flac.c in Sources */,
 				9201017718D5A445003D1ACA /* swf_svg.c in Sources */,
+				92BB857F1F7C30AF009BC9C8 /* dec_j2k.c in Sources */,
+				923E89CE20B6F04600F299B2 /* tiny_aes.c in Sources */,
+				92B9A5071F83FD7800A24FE4 /* in_dvb4linux.c in Sources */,
+				92B9A5761F8660D700A24FE4 /* mpeg4_background2d.c in Sources */,
+				92BB857A1F7BFB63009BC9C8 /* isoffin_load.c in Sources */,
+				92E318CF20645036007BE021 /* ff_rescale.c in Sources */,
 				9201017818D5A445003D1ACA /* text_to_bifs.c in Sources */,
-				92A9D3C91CCA7AAA006FF303 /* amr_in.c in Sources */,
 				9201017918D5A445003D1ACA /* base_scenegraph.c in Sources */,
+				925975012215BA3A0007E02B /* stencil.c in Sources */,
 				9201017A18D5A445003D1ACA /* commands.c in Sources */,
+				92910FA8233536620052365D /* cutils.c in Sources */,
 				9201017B18D5A445003D1ACA /* dom_events.c in Sources */,
+				92B9A56A1F8660D700A24FE4 /* svg_grouping.c in Sources */,
 				92D3C6272031E94F00BA1735 /* atsc_dmx.c in Sources */,
-				9201017C18D5A445003D1ACA /* dom_smjs.c in Sources */,
-				9201017D18D5A445003D1ACA /* html5_media_smjs.c in Sources */,
-				9201017E18D5A445003D1ACA /* html5_mse_smjs.c in Sources */,
-				92F8D46C1F6FF7A100616F7C /* netctrl.c in Sources */,
+				925975002215BA3A0007E02B /* raster_565.c in Sources */,
+				9234CF391FD6A6E400CCDFA1 /* dec_ttxt.c in Sources */,
+				92B9A56C1F8660D700A24FE4 /* svg_base.c in Sources */,
+				92BB85681F7BFB63009BC9C8 /* dec_bifs.c in Sources */,
 				9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */,
+				92334CBA2333A8C900DA6051 /* quickjs.c in Sources */,
 				9201018018D5A445003D1ACA /* mpeg4_nodes.c in Sources */,
+				92BB85711F7BFB63009BC9C8 /* reframe_mp3.c in Sources */,
 				9201018118D5A445003D1ACA /* mpeg4_valuator.c in Sources */,
 				9201018218D5A445003D1ACA /* smil_anim.c in Sources */,
 				9201018318D5A445003D1ACA /* smil_timing.c in Sources */,
+				92A08DBD20D946B7003589FF /* tileagg.c in Sources */,
 				9201018418D5A445003D1ACA /* svg_attributes.c in Sources */,
+				92754D60207D24F600170383 /* filelist.c in Sources */,
+				92B9A5831F8660D700A24FE4 /* hardcoded_protos.c in Sources */,
 				9201018518D5A445003D1ACA /* svg_properties.c in Sources */,
-				9201018618D5A445003D1ACA /* svg_smjs.c in Sources */,
 				9201018718D5A445003D1ACA /* svg_types.c in Sources */,
 				9201018818D5A445003D1ACA /* vrml_interpolators.c in Sources */,
 				9201018918D5A445003D1ACA /* vrml_proto.c in Sources */,
+				92B9A5BD1F868D0000A24FE4 /* dec_laser.c in Sources */,
+				9203644F20EE12480087883E /* out_sock.c in Sources */,
 				9201018A18D5A445003D1ACA /* vrml_route.c in Sources */,
 				9201018B18D5A445003D1ACA /* vrml_script.c in Sources */,
-				9201018C18D5A445003D1ACA /* vrml_smjs.c in Sources */,
 				9201018D18D5A445003D1ACA /* vrml_tools.c in Sources */,
-				9201018E18D5A445003D1ACA /* webvtt_smjs.c in Sources */,
+				92BB856C1F7BFB63009BC9C8 /* reframe_adts.c in Sources */,
+				9239B8D6207369E5005F7264 /* enc_jpg.c in Sources */,
+				92B9A5961F8660D700A24FE4 /* font_engine.c in Sources */,
+				922E29842051940C00C8DCBB /* out_audio.c in Sources */,
+				922CF1271FCF169900F2F6A4 /* dmx_avi.c in Sources */,
 				9201018F18D5A445003D1ACA /* x3d_nodes.c in Sources */,
-				9201019018D5A445003D1ACA /* xbl_process.c in Sources */,
+				92B9A5681F8660D700A24FE4 /* mpeg4_layer_3d.c in Sources */,
 				9201019118D5A445003D1ACA /* xml_ns.c in Sources */,
-				9201019218D5A445003D1ACA /* channel.c in Sources */,
-				9201019318D5A445003D1ACA /* clock.c in Sources */,
-				9201019418D5A445003D1ACA /* decoder.c in Sources */,
-				9201019518D5A445003D1ACA /* input_sensor.c in Sources */,
-				9201019718D5A445003D1ACA /* media_control.c in Sources */,
-				9201019918D5A445003D1ACA /* media_manager.c in Sources */,
-				9201019A18D5A445003D1ACA /* media_memory.c in Sources */,
-				9201019C18D5A445003D1ACA /* media_object.c in Sources */,
-				9201019D18D5A445003D1ACA /* media_sensor.c in Sources */,
-				9201019E18D5A445003D1ACA /* mpeg4_inline.c in Sources */,
-				9235E04B1CFECCD50051D8A1 /* vtb_decode.c in Sources */,
-				9201019F18D5A445003D1ACA /* network_service.c in Sources */,
-				920101A018D5A445003D1ACA /* object_browser.c in Sources */,
-				920101A118D5A445003D1ACA /* object_manager.c in Sources */,
-				920101A218D5A445003D1ACA /* scene.c in Sources */,
-				920101A318D5A445003D1ACA /* svg_external.c in Sources */,
-				920101A418D5A445003D1ACA /* term_node_init.c in Sources */,
-				920101A518D5A445003D1ACA /* terminal.c in Sources */,
+				923EB53223D1B78D00E1FFA1 /* libbf.c in Sources */,
+				92B9A59F1F8660D700A24FE4 /* mpeg4_inline.c in Sources */,
+				92F8D4781F71642E00616F7C /* filter_pid.c in Sources */,
+				92BB85701F7BFB63009BC9C8 /* in_file.c in Sources */,
 				920101A618D5A445003D1ACA /* alloc.c in Sources */,
 				920101A718D5A445003D1ACA /* base_encoding.c in Sources */,
+				9234CF461FD8344000CCDFA1 /* in_rtp_stream.c in Sources */,
+				92B9A56D1F8660D700A24FE4 /* mpeg4_geometry_3d.c in Sources */,
 				920101A818D5A445003D1ACA /* bitstream.c in Sources */,
+				92B9A59C1F8660D700A24FE4 /* camera.c in Sources */,
 				920101A918D5A445003D1ACA /* cache.c in Sources */,
+				926F15531FE867B000C40779 /* write_vtt.c in Sources */,
 				920101AA18D5A445003D1ACA /* color.c in Sources */,
+				92B9A5841F8660D700A24FE4 /* mpeg4_form.c in Sources */,
+				92BB9A671F9C827600524E5B /* dmx_dash.c in Sources */,
+				92B9A5A71F8660D700A24FE4 /* texturing_gl.c in Sources */,
+				92B9A5A51F8660D700A24FE4 /* mpeg4_gradients.c in Sources */,
+				9286070B23884A6B00FDA1ED /* ff_mx.c in Sources */,
+				9298677D235A146E008A2CC6 /* gltools.c in Sources */,
+				9288350C1FE82E64002F603D /* write_qcp.c in Sources */,
+				923E89CD20B6F04600F299B2 /* g_crypt.c in Sources */,
 				920101AB18D5A445003D1ACA /* configfile.c in Sources */,
 				920101AD18D5A445003D1ACA /* downloader.c in Sources */,
+				926CE14D1FE7E388002B3CF6 /* write_generic.c in Sources */,
 				920101AE18D5A445003D1ACA /* error.c in Sources */,
 				920101B018D5A445003D1ACA /* list.c in Sources */,
-				920101B118D5A445003D1ACA /* map.c in Sources */,
+				92B9A5931F8660D700A24FE4 /* mpeg4_text.c in Sources */,
+				92B9A58C1F8660D700A24FE4 /* mpeg4_composite.c in Sources */,
+				923C337D234794F2001CED08 /* evg.c in Sources */,
+				9234CF3F1FD8311400CCDFA1 /* dec_webvtt.c in Sources */,
 				920101B218D5A445003D1ACA /* math.c in Sources */,
+				92B9A57E1F8660D700A24FE4 /* mpeg4_mediasensor.c in Sources */,
 				920101B318D5A445003D1ACA /* module.c in Sources */,
+				92B9A5951F8660D700A24FE4 /* svg_paint_servers.c in Sources */,
+				92B9A5701F8660D700A24FE4 /* compositor_3d.c in Sources */,
 				920101B518D5A445003D1ACA /* os_config_init.c in Sources */,
 				920101B818D5A445003D1ACA /* os_net.c in Sources */,
 				920101B918D5A445003D1ACA /* os_thread.c in Sources */,
+				927DB14C21A3C7100032D205 /* reframe_latm.c in Sources */,
 				920101BA18D5A445003D1ACA /* path2d.c in Sources */,
 				920101BB18D5A445003D1ACA /* path2d_stroker.c in Sources */,
-				920101BC18D5A445003D1ACA /* ringbuffer.c in Sources */,
 				920101BD18D5A445003D1ACA /* sha1.c in Sources */,
+				9206823420EA96AA0041169F /* mux_gsf.c in Sources */,
 				920101C018D5A445003D1ACA /* token.c in Sources */,
+				92B9A5A91F8660D700A24FE4 /* bindable.c in Sources */,
+				9206822C20EA41530041169F /* in_pipe.c in Sources */,
 				920101C118D5A445003D1ACA /* uni_bidi.c in Sources */,
+				92D6C5A12343BEFF00262217 /* vrml_js.c in Sources */,
 				920101C218D5A445003D1ACA /* unicode.c in Sources */,
 				920101C318D5A445003D1ACA /* url.c in Sources */,
 				920101C418D5A445003D1ACA /* utf.c in Sources */,
 				920101C518D5A445003D1ACA /* xml_parser.c in Sources */,
-				92AAF0EA18D6E3A300E2FF12 /* raw_video.c in Sources */,
-				92AAF0EB18D6E5AA00E2FF12 /* ftgrays.c in Sources */,
-				92AAF0ED18D6E5AA00E2FF12 /* raster_565.c in Sources */,
-				92AAF0EE18D6E5AA00E2FF12 /* raster_argb.c in Sources */,
-				92AAF0EF18D6E5AA00E2FF12 /* raster_load.c in Sources */,
-				92AAF0F018D6E5AA00E2FF12 /* raster_rgb.c in Sources */,
-				92AAF0F118D6E5AA00E2FF12 /* stencil.c in Sources */,
-				92AAF0F218D6E5AA00E2FF12 /* surface.c in Sources */,
-				92AAF0F518D6E5D400E2FF12 /* audio_filter.c in Sources */,
-				92AAF0F818D6E5FD00E2FF12 /* bifs_dec.c in Sources */,
-				92AAF0FB18D6E62600E2FF12 /* ctx_load.c in Sources */,
-				92AAF0FE18D6E64800E2FF12 /* dummy_in.c in Sources */,
-				92AAF10118D6E66D00E2FF12 /* gpac_js.c in Sources */,
-				92AAF10A18D6E69500E2FF12 /* bmp_dec.c in Sources */,
-				92AAF10B18D6E69500E2FF12 /* img_dec.c in Sources */,
-				92AAF10C18D6E69500E2FF12 /* img_in.c in Sources */,
-				92AAF10E18D6E69500E2FF12 /* jp2_dec.c in Sources */,
-				92AAF10F18D6E69500E2FF12 /* jpeg_dec.c in Sources */,
-				92AAF11018D6E69500E2FF12 /* png_dec.c in Sources */,
-				92AAF11318D6E6B700E2FF12 /* isma_ea.c in Sources */,
-				92AAF11A18D6E6D300E2FF12 /* isom_cache.c in Sources */,
-				92AAF11C18D6E6D300E2FF12 /* load.c in Sources */,
-				92AAF11D18D6E6D300E2FF12 /* read_ch.c in Sources */,
-				92AAF11E18D6E6D300E2FF12 /* read.c in Sources */,
-				92AAF12118D6E6F300E2FF12 /* laser_dec.c in Sources */,
-				92AAF12418D6E70D00E2FF12 /* mpd_in.c in Sources */,
-				92AAF12718D6E72800E2FF12 /* mpegts_in.c in Sources */,
-				92AAF12A18D6E74200E2FF12 /* mse_in.c in Sources */,
-				92AAF12D18D6E75800E2FF12 /* odf_dec.c in Sources */,
-				92AAF13018D6E77900E2FF12 /* osd.c in Sources */,
-				92AAF13918D6E7BC00E2FF12 /* rtp_in.c in Sources */,
-				92AAF13B18D6E7BC00E2FF12 /* rtp_session.c in Sources */,
-				92AAF13C18D6E7BC00E2FF12 /* rtp_signaling.c in Sources */,
-				92AAF13D18D6E7BC00E2FF12 /* rtp_stream.c in Sources */,
-				92AAF13E18D6E7BC00E2FF12 /* sdp_fetch.c in Sources */,
-				92AAF13F18D6E7BC00E2FF12 /* sdp_load.c in Sources */,
-				92AAF14218D6E7D800E2FF12 /* saf_in.c in Sources */,
-				92AAF14518D6E7F500E2FF12 /* svg_in.c in Sources */,
-				92AAF14918D6E82500E2FF12 /* timedtext_dec.c in Sources */,
-				92AAF14A18D6E82500E2FF12 /* timedtext_in.c in Sources */,
-				92AAF14D18D6E83B00E2FF12 /* validator.c in Sources */,
-				92AAF15518D6E87500E2FF12 /* unzip.c in Sources */,
-				92AAF15718D6E87500E2FF12 /* wgt_load.c in Sources */,
-				92AAF15818D6E87500E2FF12 /* widget.c in Sources */,
-				92AAF15918D6E87500E2FF12 /* widgetman.c in Sources */,
-				92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */,
-				92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */,
+				92D211942370832900128AE2 /* raster3d.c in Sources */,
+				926656C41F7D3DF700299CC6 /* dec_theora.c in Sources */,
+				92B9A5671F8660D700A24FE4 /* mpeg4_geometry_ifs2d.c in Sources */,
+				9234CF4B1FD8344000CCDFA1 /* in_rtp_rtsp.c in Sources */,
+				92BB856A1F7BFB63009BC9C8 /* reframe_img.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		9225732018D7267900D6FD98 /* Sources */ = {
+		927AACF91E44EEDC008C8E69 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				9225732F18D7269700D6FD98 /* ogg_in.c in Sources */,
-				9225733118D7269700D6FD98 /* ogg_load.c in Sources */,
-				9225733218D7269700D6FD98 /* theora_dec.c in Sources */,
-				9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */,
+				929867752355DED1008A2CC6 /* main.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3772,52 +2860,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92AAF16D18D6F5EB00E2FF12 /* ft_font.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF17418D6F89B00E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF18018D6F8EF00E2FF12 /* aac_in.c in Sources */,
-				92AAF18118D6F8EF00E2FF12 /* faad_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF18418D6FA1100E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF19118D6FA3300E2FF12 /* ac3_in.c in Sources */,
-				92AAF19218D6FA3300E2FF12 /* liba52_dec.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF19418D6FDC300E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1A618D6FDFA00E2FF12 /* ffmpeg_decode.c in Sources */,
-				92AAF1A718D6FDFA00E2FF12 /* ffmpeg_demux.c in Sources */,
-				92AAF1A918D6FDFA00E2FF12 /* ffmpeg_load.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1AA18D709D900E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1B718D70A1000E2FF12 /* mad_dec.c in Sources */,
-				92AAF1B818D70A1000E2FF12 /* mp3_in.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		92AAF1BA18D70B1C00E2FF12 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				92AAF1C518D70B4600E2FF12 /* openhevc_dec.c in Sources */,
+				92586A731EA7669200A0838A /* ft_font.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3832,290 +2875,91 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92BE50AF18D6D53000AA59D8 /* Sources */ = {
+		92BE50C318D6D60100AA59D8 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92BE50C218D6D5DC00AA59D8 /* main.c in Sources */,
+				9251CA8A1E9D3E960089DDC6 /* main.c in Sources */,
+				92D535711A5C0D1400F2442A /* carbon_events.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		92BE50C318D6D60100AA59D8 /* Sources */ = {
+		92C403D42181F10500331F39 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92D535711A5C0D1400F2442A /* carbon_events.c in Sources */,
-				92BE50D318D6D62600AA59D8 /* extract.c in Sources */,
-				92BE50D418D6D62600AA59D8 /* main.c in Sources */,
+				92C403DD2181F17E00331F39 /* dec_openhevc.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		9225730F18D717AB00D6FD98 /* PBXTargetDependency */ = {
+		92AAF17118D6F87100E2FF12 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 92AAF18718D6FA1100E2FF12 /* ac3_in */;
-			targetProxy = 9225730E18D717AB00D6FD98 /* PBXContainerItemProxy */;
+			target = 92AAF0D218D6DB2D00E2FF12 /* sdl_out */;
+			targetProxy = 92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */;
+		};
+		92AAF17318D6F87A00E2FF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF16418D6F40400E2FF12 /* ft_font */;
+			targetProxy = 92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */;
 		};
-		9225731118D717AE00D6FD98 /* PBXTargetDependency */ = {
+		92BD5563205AB89D007C4C06 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 92AAF19718D6FDC300E2FF12 /* ffmpeg_in */;
-			targetProxy = 9225731018D717AE00D6FD98 /* PBXContainerItemProxy */;
+			target = 92AAF0D218D6DB2D00E2FF12 /* sdl_out */;
+			targetProxy = 92BD5562205AB89D007C4C06 /* PBXContainerItemProxy */;
 		};
-		9225731318D717B100D6FD98 /* PBXTargetDependency */ = {
+		92C403DF2181F1ED00331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 92AAF1AD18D709D900E2FF12 /* mp3_in */;
-			targetProxy = 9225731218D717B100D6FD98 /* PBXContainerItemProxy */;
+			target = 92AAF16418D6F40400E2FF12 /* ft_font */;
+			targetProxy = 92C403DE2181F1ED00331F39 /* PBXContainerItemProxy */;
 		};
-		9225731518D717B400D6FD98 /* PBXTargetDependency */ = {
+		92C403E12181F1F100331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */;
-			targetProxy = 9225731418D717B400D6FD98 /* PBXContainerItemProxy */;
+			target = 92C403D62181F10500331F39 /* openhevc_dec */;
+			targetProxy = 92C403E02181F1F100331F39 /* PBXContainerItemProxy */;
 		};
-		9225733618D727B500D6FD98 /* PBXTargetDependency */ = {
+		92C403E32181F1FC00331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 9225732318D7267900D6FD98 /* ogg_in */;
-			targetProxy = 9225733518D727B500D6FD98 /* PBXContainerItemProxy */;
+			target = 92C403D62181F10500331F39 /* openhevc_dec */;
+			targetProxy = 92C403E22181F1FC00331F39 /* PBXContainerItemProxy */;
 		};
-		92AAF17118D6F87100E2FF12 /* PBXTargetDependency */ = {
+		92C403E52181F20800331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 92AAF0D218D6DB2D00E2FF12 /* sdl_out */;
-			targetProxy = 92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */;
+			targetProxy = 92C403E42181F20800331F39 /* PBXContainerItemProxy */;
 		};
-		92AAF17318D6F87A00E2FF12 /* PBXTargetDependency */ = {
+		92C403E72181F20C00331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 92AAF16418D6F40400E2FF12 /* ft_font */;
-			targetProxy = 92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */;
+			targetProxy = 92C403E62181F20C00331F39 /* PBXContainerItemProxy */;
 		};
-		92AAF18318D6F9E700E2FF12 /* PBXTargetDependency */ = {
+		92C403E92181F21000331F39 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 92AAF17718D6F89B00E2FF12 /* aac_in */;
-			targetProxy = 92AAF18218D6F9E700E2FF12 /* PBXContainerItemProxy */;
+			target = 92C403D62181F10500331F39 /* openhevc_dec */;
+			targetProxy = 92C403E82181F21000331F39 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		2839E2801A162C24002D73E1 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LD_DYLIB_INSTALL_NAME = gm_opensvc.dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = "-lOpenSVCDec";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		2839E2811A162C24002D73E1 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				EXECUTABLE_PREFIX = lib;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LD_DYLIB_INSTALL_NAME = gm_opensvc.dylib;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = "-lOpenSVCDec";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		2839E28F1A1635F7002D73E1 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-					DC_AUDIO_RESAMPLER,
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LIBRARY_SEARCH_PATHS = (
-					/usr/local/lib,
-					/opt/local/lib,
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lavcodec",
-					"-lavformat",
-					"-lavutil",
-					"-lswscale",
-					"-lbz2",
-					"-lswresample",
-					"-lx264",
-					"-lx265",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavresample",
-					"-lpostproc",
-					"-liconv",
-					"-weak_framework",
-					VideoDecodeAcceleration,
-					"-weak_framework",
-					CoreFoundation,
-					"-weak_framework",
-					QuartzCore,
-					"-weak_framework",
-					CoreGraphics,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		2839E2901A1635F7002D73E1 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
-					GPAC_CONFIG_DARWIN,
-					DC_AUDIO_RESAMPLER,
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				LIBRARY_SEARCH_PATHS = (
-					/usr/local/lib,
-					/opt/local/lib,
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lavcodec",
-					"-lavformat",
-					"-lavutil",
-					"-lswscale",
-					"-lbz2",
-					"-lswresample",
-					"-lx264",
-					"-lx265",
-					"-lavdevice",
-					"-lavfilter",
-					"-lavresample",
-					"-lpostproc",
-					"-liconv",
-					"-weak_framework",
-					VideoDecodeAcceleration,
-					"-weak_framework",
-					CoreFoundation,
-					"-weak_framework",
-					QuartzCore,
-					"-weak_framework",
-					CoreGraphics,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
 		9201F92E18D5A359003D1ACA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -4123,8 +2967,10 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = GPAC_CONFIG_DARWIN;
+				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -4145,20 +2991,30 @@
 		9201F92F18D5A359003D1ACA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = GPAC_CONFIG_DARWIN;
+				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
@@ -4179,6 +3035,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = lib;
@@ -4194,21 +3052,57 @@
 					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,
+					GPAC_HAS_JP2,
+					GPAC_HAS_LIBA52,
+					GPAC_HAS_VORBIS,
+					GPAC_HAS_THEORA,
+					GPAC_HAS_OPENSVC,
+					GPAC_HAS_OPENHEVC,
+					GPAC_HAS_FFMPEG,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				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,
+					/usr/local/include,
+					"/opt/local/include/openjpeg-1.5",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
 					/opt/local/lib,
 					/opt/local/lib/nspr,
 				);
@@ -4217,6 +3111,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-Wno-conversion";
 				OTHER_LDFLAGS = (
+					"-w",
 					"-lcrypto",
 					"-lssl",
 					"-ljpeg",
@@ -4225,10 +3120,50 @@
 					"-lplds4",
 					"-lplc4",
 					"-lnspr4",
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-lavdevice",
+					"-lavfilter",
+					"-lavresample",
+					"-lpostproc",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
+					"-weak_framework",
+					CoreGraphics,
+					"-lfaad",
+					"-lmad",
+					"-lxvidcore",
+					"-lopenjpeg",
+					"-la52",
+					"-lvorbis",
+					"-ltheora",
+					"-lOpenSVCDec",
+					"-lxcb",
+					"-lxcb-shm",
+					"-lxcb-shape",
+					"-lxcb-xfixes",
+					"-lSDL2",
+					"-laom",
+					"-lvpx",
+					"-llzma",
+					"-lvpx",
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
 				SYMROOT = ../../bin/osx/;
+				WARNING_LDFLAGS = "";
 			};
 			name = Debug;
 		};
@@ -4236,6 +3171,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -4249,20 +3186,37 @@
 					NO_JS_RUNTIMETHREAD,
 					SPIDERMONKEY_NEW_API,
 					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_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				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,
+					/usr/local/include,
+					"/opt/local/include/openjpeg-1.5",
 				);
 				LIBRARY_SEARCH_PATHS = (
+					/usr/local/lib,
 					/opt/local/lib,
 					/opt/local/lib/nspr,
 				);
@@ -4270,6 +3224,7 @@
 				OBJROOT = build;
 				OTHER_CFLAGS = "-Wno-conversion";
 				OTHER_LDFLAGS = (
+					"-w",
 					"-lcrypto",
 					"-lssl",
 					"-ljpeg",
@@ -4278,67 +3233,109 @@
 					"-lplds4",
 					"-lplc4",
 					"-lnspr4",
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+					"-lswresample",
+					"-lx264",
+					"-lx265",
+					"-lavdevice",
+					"-lavfilter",
+					"-lavresample",
+					"-lpostproc",
+					"-liconv",
+					"-weak_framework",
+					VideoDecodeAcceleration,
+					"-weak_framework",
+					CoreFoundation,
+					"-weak_framework",
+					QuartzCore,
+					"-weak_framework",
+					CoreGraphics,
+					"-lfaad",
+					"-lmad",
+					"-lxvidcore",
+					"-lopenjpeg",
+					"-la52",
+					"-lvorbis",
+					"-ltheora",
+					"-lOpenSVCDec",
+					"-lxcb",
+					"-lxcb-shm",
+					"-lxcb-shape",
+					"-lxcb-xfixes",
+					"-lSDL2",
+					"-laom",
+					"-lvpx",
+					"-llzma",
+					"-lvpx",
 				);
 				PRODUCT_NAME = gpac;
 				SDKROOT = macosx;
 				SYMROOT = ../../bin/osx/;
+				WARNING_LDFLAGS = "";
 			};
 			name = Release;
 		};
-		9225732518D7267900D6FD98 /* Debug */ = {
+		927AAD021E44EEDC008C8E69 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = Q46G522WGV;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/opt/local/include,
-				);
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				LIBRARY_SEARCH_PATHS = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
-		9225732618D7267900D6FD98 /* Release */ = {
+		927AAD031E44EEDC008C8E69 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
+				DEVELOPMENT_TEAM = Q46G522WGV;
+				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/opt/local/include,
-				);
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				LIBRARY_SEARCH_PATHS = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
@@ -4348,6 +3345,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
@@ -4391,6 +3389,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -4427,6 +3426,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				EXECUTABLE_PREFIX = gm_;
@@ -4463,6 +3463,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -4488,21 +3489,19 @@
 			};
 			name = Release;
 		};
-		92AAF17A18D6F89B00E2FF12 /* Debug */ = {
+		92BE509718D6325E00AA59D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					GPAC_HAS_FAAD,
-					GPAC_CONFIG_DARWIN,
+					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -4510,59 +3509,47 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					../../include,
-				);
+				HEADER_SEARCH_PATHS = ../../include;
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-lfaad";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
 			name = Debug;
 		};
-		92AAF17B18D6F89B00E2FF12 /* Release */ = {
+		92BE509818D6325E00AA59D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_HAS_FAAD,
-					GPAC_CONFIG_DARWIN,
-				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					../../include,
-				);
+				HEADER_SEARCH_PATHS = ../../include;
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-lfaad";
+				OBJROOT = build;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
 			name = Release;
 		};
-		92AAF18A18D6FA1200E2FF12 /* Debug */ = {
+		92BE50CF18D6D60100AA59D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -4576,469 +3563,141 @@
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/a52dec,
-					../../include,
-				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-la52";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
-		92AAF18B18D6FA1200E2FF12 /* Release */ = {
+		92BE50D018D6D60100AA59D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_INHIBIT_ALL_WARNINGS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include/a52dec,
-					../../include,
-				);
 				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-la52";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
 			};
 			name = Release;
 		};
-		92AAF19A18D6FDC300E2FF12 /* Debug */ = {
+		92C403D82181F10500331F39 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				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_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "";
+				EXECUTABLE_PREFIX = gf_;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_HAS_OPENHEVC,
 					"DEBUG=1",
-					"$(inherited)",
+					GPAC_CONFIG_DARWIN,
 				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include/,
-					/opt/local/include/,
-				);
-				INSTALL_PATH = "";
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lavcodec",
-					"-lavformat",
-					"-lavutil",
-					"-lswscale",
-					"-lbz2",
-					"-lswresample",
-					"-lx264",
-					"-lx265",
-					"-liconv",
-					"-weak_framework",
-					VideoDecodeAcceleration,
-					"-weak_framework",
-					CoreFoundation,
-					"-weak_framework",
-					QuartzCore,
-					"-laom",
-					"-llzma",
-				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "-lopenhevc";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
 			};
 			name = Debug;
 		};
-		92AAF19B18D6FDC300E2FF12 /* Release */ = {
+		92C403D92181F10500331F39 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include/,
-					/opt/local/include/,
-				);
-				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = (
-					/usr/local/lib,
-					/opt/local/lib,
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = (
-					"-lz",
-					"-lavcodec",
-					"-lavformat",
-					"-lavutil",
-					"-lswscale",
-					"-lbz2",
-					"-lswresample",
-					"-lx264",
-					"-lx265",
-					"-liconv",
-					"-weak_framework",
-					VideoDecodeAcceleration,
-					"-weak_framework",
-					CoreFoundation,
-					"-weak_framework",
-					QuartzCore,
-					"-laom",
-					"-llzma",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92AAF1B018D709D900E2FF12 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
+				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_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_STRICT_PROTOTYPES = NO;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_IDENTITY = "-";
+				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_HAS_MAD,
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					../../include,
-				);
-				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-lmad";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92AAF1B118D709D900E2FF12 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				DEVELOPMENT_TEAM = Q46G522WGV;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				EXECUTABLE_PREFIX = gf_;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_PREPROCESSOR_DEFINITIONS = (
-					GPAC_HAS_MAD,
+					GPAC_HAS_OPENHEVC,
 					GPAC_CONFIG_DARWIN,
 				);
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					/opt/local/include,
-					../../include,
-				);
-				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = /opt/local/lib;
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OTHER_LDFLAGS = "-lmad";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92AAF1C018D70B1C00E2FF12 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include,
-					../../extra_lib/include,
-				);
-				INSTALL_PATH = "";
-				LIBRARY_SEARCH_PATHS = (
-					/usr/local/lib,
-					../../extra_lib/lib/gcc,
-					/opt/local/lib,
-				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_LDFLAGS = "-lopenhevc";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92AAF1C118D70B1C00E2FF12 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = gm_;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = (
-					../../include,
-					/usr/local/include,
-					../../extra_lib/include,
-				);
-				INSTALL_PATH = "";
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
-					../../extra_lib/lib/gcc,
 					/opt/local/lib,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
 				OTHER_LDFLAGS = "-lopenhevc";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92BE509718D6325E00AA59D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = ../../include;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OBJROOT = build;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SYMROOT = ../../bin/osx/;
-			};
-			name = Debug;
-		};
-		92BE509818D6325E00AA59D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = ../../include;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OBJROOT = build;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-				SYMROOT = ../../bin/osx/;
-			};
-			name = Release;
-		};
-		92BE50BB18D6D53000AA59D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OBJROOT = build;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92BE50BC18D6D53000AA59D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				OBJROOT = build;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Release;
-		};
-		92BE50CF18D6D60100AA59D8 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				ONLY_ACTIVE_ARCH = YES;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
-			};
-			name = Debug;
-		};
-		92BE50D018D6D60100AA59D8 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				INSTALL_PATH = "";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		2839E27F1A162C24002D73E1 /* Build configuration list for PBXNativeTarget "opensvc" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				2839E2801A162C24002D73E1 /* Debug */,
-				2839E2811A162C24002D73E1 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		2839E28E1A1635F7002D73E1 /* Build configuration list for PBXNativeTarget "DashCast" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				2839E28F1A1635F7002D73E1 /* Debug */,
-				2839E2901A1635F7002D73E1 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -5057,11 +3716,11 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		9225732718D7267900D6FD98 /* Build configuration list for PBXNativeTarget "ogg_in" */ = {
+		927AAD011E44EEDC008C8E69 /* Build configuration list for PBXNativeTarget "gpac" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				9225732518D7267900D6FD98 /* Debug */,
-				9225732618D7267900D6FD98 /* Release */,
+				927AAD021E44EEDC008C8E69 /* Debug */,
+				927AAD031E44EEDC008C8E69 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5084,51 +3743,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		92AAF17918D6F89B00E2FF12 /* Build configuration list for PBXNativeTarget "aac_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF17A18D6F89B00E2FF12 /* Debug */,
-				92AAF17B18D6F89B00E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		92AAF18918D6FA1200E2FF12 /* Build configuration list for PBXNativeTarget "ac3_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF18A18D6FA1200E2FF12 /* Debug */,
-				92AAF18B18D6FA1200E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		92AAF19918D6FDC300E2FF12 /* Build configuration list for PBXNativeTarget "ffmpeg_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF19A18D6FDC300E2FF12 /* Debug */,
-				92AAF19B18D6FDC300E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		92AAF1AF18D709D900E2FF12 /* Build configuration list for PBXNativeTarget "mp3_in" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF1B018D709D900E2FF12 /* Debug */,
-				92AAF1B118D709D900E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		92AAF1BF18D70B1C00E2FF12 /* Build configuration list for PBXNativeTarget "openhevc_dec" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				92AAF1C018D70B1C00E2FF12 /* Debug */,
-				92AAF1C118D70B1C00E2FF12 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 		92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -5138,20 +3752,20 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		92BE50BA18D6D53000AA59D8 /* Build configuration list for PBXNativeTarget "MP42TS" */ = {
+		92BE50CE18D6D60100AA59D8 /* Build configuration list for PBXNativeTarget "MP4Client" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				92BE50BB18D6D53000AA59D8 /* Debug */,
-				92BE50BC18D6D53000AA59D8 /* Release */,
+				92BE50CF18D6D60100AA59D8 /* Debug */,
+				92BE50D018D6D60100AA59D8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		92BE50CE18D6D60100AA59D8 /* Build configuration list for PBXNativeTarget "MP4Client" */ = {
+		92C403DA2181F10500331F39 /* Build configuration list for PBXNativeTarget "openhevc_dec" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				92BE50CF18D6D60100AA59D8 /* Debug */,
-				92BE50D018D6D60100AA59D8 /* Release */,
+				92C403D82181F10500331F39 /* Debug */,
+				92C403D92181F10500331F39 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

gpac-0.8.0.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj -> gpac-1.0.0.tar.gz/build/xcode/gpac4ios.xcodeproj/project.pbxproj Changed

@@ -10,7 +10,6 @@
 		0496F07716DD1A18009D9D8D /* libfaad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45012830B1400C384DE /* libfaad.a */; };
 		0496F07816DD1A18009D9D8D /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45112830B1400C384DE /* libfreetype.a */; };
 		0496F07916DD1A18009D9D8D /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45312830B1400C384DE /* libjpeg.a */; };
-		0496F07A16DD1A18009D9D8D /* libjs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45412830B1400C384DE /* libjs.a */; };
 		0496F07B16DD1A18009D9D8D /* libmad.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45512830B1400C384DE /* libmad.a */; };
 		0496F07C16DD1A18009D9D8D /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F2A45612830B1400C384DE /* libpng.a */; };
 		0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
@@ -22,9 +21,6 @@
 		285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9D1712C80E00AF2B9B /* libavutil.a */; };
 		285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9F1712C80E00AF2B9B /* libswscale.a */; };
 		2897039C1A13C4050063E9C0 /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2897039B1A13C4050063E9C0 /* libswresample.a */; };
-		28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240317D6367000E9D2BE /* ffmpeg_decode.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
-		28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240517D6369700E9D2BE /* ffmpeg_demux.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations -Wno-shorten-64-to-32"; }; };
-		28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240917D636DA00E9D2BE /* ffmpeg_load.c */; };
 		7141FF301292CB9200FCB27D /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7141FF2F1292CB9200FCB27D /* alloc.c */; };
 		7147426012B918C900DB5A59 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7147425F12B918C900DB5A59 /* cache.c */; };
 		71A19B2112796B6F00ACFF58 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19B2012796B6F00ACFF58 /* main.c */; };
@@ -164,10 +160,8 @@
 		71CCF2D41277045100339E12 /* av_parsers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CE1277045100339E12 /* av_parsers.c */; };
 		71CCF2D51277045100339E12 /* avilib.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1CF1277045100339E12 /* avilib.c */; };
 		71CCF2D61277045100339E12 /* dvb_mpe.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D01277045100339E12 /* dvb_mpe.c */; };
-		71CCF2D71277045100339E12 /* filestreamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D11277045100339E12 /* filestreamer.c */; };
 		71CCF2D81277045100339E12 /* gpac_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D21277045100339E12 /* gpac_ogg.c */; };
 		71CCF2D91277045100339E12 /* img.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D31277045100339E12 /* img.c */; };
-		71CCF2DA1277045100339E12 /* ismacryp.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D41277045100339E12 /* ismacryp.c */; };
 		71CCF2DB1277045100339E12 /* isom_hinter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D51277045100339E12 /* isom_hinter.c */; };
 		71CCF2DC1277045100339E12 /* isom_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D61277045100339E12 /* isom_tools.c */; };
 		71CCF2DD1277045100339E12 /* m2ts_mux.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1D71277045100339E12 /* m2ts_mux.c */; };
@@ -178,7 +172,6 @@
 		71CCF2E21277045100339E12 /* mpegts.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1DC1277045100339E12 /* mpegts.c */; };
 		71CCF2E31277045100339E12 /* reedsolomon.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1DD1277045100339E12 /* reedsolomon.c */; };
 		71CCF2E41277045100339E12 /* saf.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1DE1277045100339E12 /* saf.c */; };
-		71CCF2E51277045100339E12 /* text_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1DF1277045100339E12 /* text_import.c */; };
 		71CCF2E61277045100339E12 /* vobsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1E01277045100339E12 /* vobsub.c */; };
 		71CCF2E71277045100339E12 /* desc_private.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1E21277045100339E12 /* desc_private.c */; };
 		71CCF2E81277045100339E12 /* descriptors.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1E31277045100339E12 /* descriptors.c */; };
@@ -209,7 +202,6 @@
 		71CCF3011277045100339E12 /* base_scenegraph.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1FE1277045100339E12 /* base_scenegraph.c */; };
 		71CCF3021277045100339E12 /* commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF1FF1277045100339E12 /* commands.c */; };
 		71CCF3031277045100339E12 /* dom_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2001277045100339E12 /* dom_events.c */; };
-		71CCF3041277045100339E12 /* dom_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2011277045100339E12 /* dom_smjs.c */; };
 		71CCF3051277045100339E12 /* mpeg4_animators.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2021277045100339E12 /* mpeg4_animators.c */; };
 		71CCF3061277045100339E12 /* mpeg4_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2031277045100339E12 /* mpeg4_nodes.c */; };
 		71CCF3071277045100339E12 /* mpeg4_valuator.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2041277045100339E12 /* mpeg4_valuator.c */; };
@@ -217,36 +209,14 @@
 		71CCF3091277045100339E12 /* smil_timing.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2061277045100339E12 /* smil_timing.c */; };
 		71CCF30A1277045100339E12 /* svg_attributes.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2071277045100339E12 /* svg_attributes.c */; };
 		71CCF30B1277045100339E12 /* svg_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2081277045100339E12 /* svg_properties.c */; };
-		71CCF30C1277045100339E12 /* svg_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2091277045100339E12 /* svg_smjs.c */; };
 		71CCF30D1277045100339E12 /* svg_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20A1277045100339E12 /* svg_types.c */; };
 		71CCF30E1277045100339E12 /* vrml_interpolators.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20B1277045100339E12 /* vrml_interpolators.c */; };
 		71CCF30F1277045100339E12 /* vrml_proto.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20C1277045100339E12 /* vrml_proto.c */; };
 		71CCF3101277045100339E12 /* vrml_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20D1277045100339E12 /* vrml_route.c */; };
 		71CCF3111277045100339E12 /* vrml_script.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20E1277045100339E12 /* vrml_script.c */; };
-		71CCF3121277045100339E12 /* vrml_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF20F1277045100339E12 /* vrml_smjs.c */; };
 		71CCF3131277045100339E12 /* vrml_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2101277045100339E12 /* vrml_tools.c */; };
 		71CCF3141277045100339E12 /* x3d_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2111277045100339E12 /* x3d_nodes.c */; };
-		71CCF3151277045100339E12 /* xbl_process.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2121277045100339E12 /* xbl_process.c */; };
 		71CCF3161277045100339E12 /* xml_ns.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2131277045100339E12 /* xml_ns.c */; };
-		71CCF3171277045100339E12 /* channel.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2151277045100339E12 /* channel.c */; };
-		71CCF3181277045100339E12 /* clock.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2161277045100339E12 /* clock.c */; };
-		71CCF3191277045100339E12 /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2171277045100339E12 /* decoder.c */; };
-		71CCF31A1277045100339E12 /* input_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2181277045100339E12 /* input_sensor.c */; };
-		71CCF31B1277045100339E12 /* input_sensor.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF2191277045100339E12 /* input_sensor.h */; };
-		71CCF31C1277045100339E12 /* media_control.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF21A1277045100339E12 /* media_control.c */; };
-		71CCF31D1277045100339E12 /* media_control.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF21B1277045100339E12 /* media_control.h */; };
-		71CCF31E1277045100339E12 /* media_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF21C1277045100339E12 /* media_manager.c */; };
-		71CCF31F1277045100339E12 /* media_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF21D1277045100339E12 /* media_memory.c */; };
-		71CCF3201277045100339E12 /* media_memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF21E1277045100339E12 /* media_memory.h */; };
-		71CCF3211277045100339E12 /* media_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF21F1277045100339E12 /* media_object.c */; };
-		71CCF3221277045100339E12 /* media_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2201277045100339E12 /* media_sensor.c */; };
-		71CCF3231277045100339E12 /* mpeg4_inline.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2211277045100339E12 /* mpeg4_inline.c */; };
-		71CCF3241277045100339E12 /* network_service.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2221277045100339E12 /* network_service.c */; };
-		71CCF3251277045100339E12 /* object_browser.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2231277045100339E12 /* object_browser.c */; };
-		71CCF3261277045100339E12 /* object_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2241277045100339E12 /* object_manager.c */; };
-		71CCF3271277045100339E12 /* scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2251277045100339E12 /* scene.c */; };
-		71CCF3281277045100339E12 /* svg_external.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2261277045100339E12 /* svg_external.c */; };
-		71CCF3291277045100339E12 /* term_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2271277045100339E12 /* term_node_init.c */; };
 		71CCF32A1277045100339E12 /* terminal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2281277045100339E12 /* terminal.c */; };
 		71CCF32B1277045100339E12 /* base_encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22A1277045100339E12 /* base_encoding.c */; };
 		71CCF32C1277045100339E12 /* bitstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF22B1277045100339E12 /* bitstream.c */; };
@@ -282,7 +252,6 @@
 		71CCF3BA12770A8C00339E12 /* crypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36912770A8C00339E12 /* crypt.h */; };
 		71CCF3BB12770A8C00339E12 /* download.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36A12770A8C00339E12 /* download.h */; };
 		71CCF3BC12770A8C00339E12 /* dvb_mpe.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36B12770A8C00339E12 /* dvb_mpe.h */; };
-		71CCF3BD12770A8C00339E12 /* esi.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36C12770A8C00339E12 /* esi.h */; };
 		71CCF3BE12770A8C00339E12 /* events.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36D12770A8C00339E12 /* events.h */; };
 		71CCF3BF12770A8C00339E12 /* filestreamer.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36E12770A8C00339E12 /* filestreamer.h */; };
 		71CCF3C012770A8C00339E12 /* ietf.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF36F12770A8C00339E12 /* ietf.h */; };
@@ -305,7 +274,6 @@
 		71CCF3D112770A8C00339E12 /* swf_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38112770A8C00339E12 /* swf_dev.h */; };
 		71CCF3D212770A8C00339E12 /* terminal_dev.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38212770A8C00339E12 /* terminal_dev.h */; };
 		71CCF3D312770A8C00339E12 /* vobsub.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38312770A8C00339E12 /* vobsub.h */; };
-		71CCF3D412770A8C00339E12 /* ismacryp.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38412770A8C00339E12 /* ismacryp.h */; };
 		71CCF3D512770A8C00339E12 /* iso639.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38512770A8C00339E12 /* iso639.h */; };
 		71CCF3D612770A8C00339E12 /* isomedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38612770A8C00339E12 /* isomedia.h */; };
 		71CCF3D712770A8C00339E12 /* laser.h in Headers */ = {isa = PBXBuildFile; fileRef = 71CCF38712770A8C00339E12 /* laser.h */; };
@@ -349,117 +317,218 @@
 		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 */; };
+		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 */; };
+		8959AC8B211C9C3C004D2C87 /* out_pipe.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC81211C9C3C004D2C87 /* out_pipe.c */; };
+		8959AC8C211C9C3C004D2C87 /* out_sock.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC82211C9C3C004D2C87 /* out_sock.c */; };
+		8959AC8D211C9C3C004D2C87 /* rewrite_obu.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC83211C9C3C004D2C87 /* rewrite_obu.c */; };
+		8959AC8F211C9C77004D2C87 /* Remotery.c in Sources */ = {isa = PBXBuildFile; fileRef = 8959AC8E211C9C77004D2C87 /* Remotery.c */; };
 		896CBC872110598E00220377 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC862110598E00220377 /* Security.framework */; };
 		896CBC8921105A6900220377 /* libaom.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 896CBC8821105A6900220377 /* libaom.a */; };
-		9212E8031CCA82310036F310 /* amr_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212E8021CCA82300036F310 /* amr_in.c */; };
-		9214AD341D0181A5009D3CFD /* ac3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9214AD321D0181A5009D3CFD /* ac3_in.c */; };
-		9214AD351D0181A5009D3CFD /* liba52_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9214AD331D0181A5009D3CFD /* liba52_dec.c */; };
+		9210BA1D234A909400ED2DFF /* evg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9210BA1C234A909400ED2DFF /* evg.c */; };
+		9212C0FD222D7B3700FE3580 /* vflip.c in Sources */ = {isa = PBXBuildFile; fileRef = 9212C0FC222D7B3700FE3580 /* vflip.c */; };
 		921FEBA01CF8670A00B437C2 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9E1CF8665900B437C2 /* CoreLocation.framework */; };
 		921FEBA11CF8671300B437C2 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 921FEB9C1CF8664800B437C2 /* CoreMotion.framework */; };
 		921FEBA51CF881DE00B437C2 /* sensors_def.h in Headers */ = {isa = PBXBuildFile; fileRef = 921FEBA21CF881DE00B437C2 /* sensors_def.h */; };
 		921FEBA61CF881DE00B437C2 /* sensors.h in Headers */ = {isa = PBXBuildFile; fileRef = 921FEBA31CF881DE00B437C2 /* sensors.h */; };
 		921FEBA71CF881DE00B437C2 /* sensors.m in Sources */ = {isa = PBXBuildFile; fileRef = 921FEBA41CF881DE00B437C2 /* sensors.m */; };
-		9225CCA520343CDE00250C87 /* atsc_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225CCA420343CDD00250C87 /* atsc_in.c */; };
+		92261A89239E326900C14199 /* out_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92261A88239E326900C14199 /* out_http.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 */; };
 		922EB5821AAE13C500DF46D0 /* html5_mse.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57A1AAE13C500DF46D0 /* html5_mse.h */; };
-		922EB5831AAE13C500DF46D0 /* map.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57B1AAE13C500DF46D0 /* map.h */; };
 		922EB5841AAE13C500DF46D0 /* maths.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57C1AAE13C500DF46D0 /* maths.h */; };
 		922EB5851AAE13C500DF46D0 /* revision.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57D1AAE13C500DF46D0 /* revision.h */; };
 		922EB5861AAE13C500DF46D0 /* version.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57E1AAE13C500DF46D0 /* version.h */; };
 		922EB5871AAE13C500DF46D0 /* webvtt.h in Headers */ = {isa = PBXBuildFile; fileRef = 922EB57F1AAE13C500DF46D0 /* webvtt.h */; };
+		92334CCF2333AB9A00DA6051 /* libunicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CBE2333AB9900DA6051 /* libunicode.c */; };
+		92334CD32333AB9A00DA6051 /* quickjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92334CC22333AB9900DA6051 /* quickjs.c */; };
+		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 */; };
+		923EB53423D1B87E00E1FFA1 /* libbf.c in Sources */ = {isa = PBXBuildFile; fileRef = 923EB53323D1B87E00E1FFA1 /* libbf.c */; };
 		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 */; };
 		925FF2A61ABC53F30085B04C /* smjs_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 925FF2A41ABC53F30085B04C /* smjs_api.h */; };
 		925FF2A71ABC55030085B04C /* os_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 71CCF2361277045100339E12 /* os_file.c */; };
+		92734635235084A50081AF74 /* storage.c in Sources */ = {isa = PBXBuildFile; fileRef = 92734634235084A50081AF74 /* storage.c */; };
+		9274295A24647B98009ADD8D /* bsrw.c in Sources */ = {isa = PBXBuildFile; fileRef = 9274295924647B98009ADD8D /* bsrw.c */; };
 		9280E7251DD23FFE001E6441 /* iTunesArtwork in Resources */ = {isa = PBXBuildFile; fileRef = 9236FDEF1DD23F1400B3E86F /* iTunesArtwork */; };
+		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 */; };
+		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 */; };
 		928B2D131BE11BC100CAC65D /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D111BE11BC100CAC65D /* libcrypto.a */; };
 		928B2D141BE11BC100CAC65D /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928B2D121BE11BC100CAC65D /* libssl.a */; };
+		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 */; };
 		9292BF031CFC94060070EB05 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9292BF021CFC94060070EB05 /* CoreMedia.framework */; };
-		9292BF071CFCAAAE0070EB05 /* vtb_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 9292BF061CFCAAAE0070EB05 /* vtb_decode.c */; };
+		929383A72355AECE00AAAFA8 /* webgl.c in Sources */ = {isa = PBXBuildFile; fileRef = 929383A62355AECE00AAAFA8 /* webgl.c */; };
+		9296BF2422CFBB3900DC9742 /* reframe_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 9296BF2322CFBB3900DC9742 /* reframe_flac.c */; };
+		9298677A2357A0DA008A2CC6 /* webgl.h in Headers */ = {isa = PBXBuildFile; fileRef = 929867782357A0DA008A2CC6 /* webgl.h */; };
+		9298677F235A1587008A2CC6 /* gltools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9298677E235A1587008A2CC6 /* gltools.c */; };
 		929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929616EF8BC200B7C64F /* Default-568h@2x.png */; };
 		929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929716EF8BC200B7C64F /* icon_ipad_retina.png */; };
 		929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929816EF8BC200B7C64F /* icon_ipad.png */; };
 		929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */ = {isa = PBXBuildFile; fileRef = 929A929916EF8BC200B7C64F /* icon_retina.png */; };
 		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 */; };
 		92B039F716F2050100B2568F /* libSDL2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92B039F616F2050100B2568F /* libSDL2.a */; };
-		92B32CA41A08ABBF0065F44A /* webvtt_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */; };
-		92B32CA91A08AC130065F44A /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B32CA71A08AC130065F44A /* vtt_dec.c */; };
-		92B32CAA1A08AC130065F44A /* vtt_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B32CA81A08AC130065F44A /* vtt_in.c */; };
-		92BC210216EF8E7A000E0620 /* aac_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199071278765600ACFF58 /* aac_in.c */; };
+		92B2A4A7229C0F47002A65A7 /* out_rtsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4A6229C0F47002A65A7 /* out_rtsp.c */; };
+		92B2A4AE229D6646002A65A7 /* hevcmerge.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4AC229D6646002A65A7 /* hevcmerge.c */; };
+		92B2A4AF229D6646002A65A7 /* hevcsplit.c in Sources */ = {isa = PBXBuildFile; fileRef = 92B2A4AD229D6646002A65A7 /* hevcsplit.c */; };
 		92BC210316EF8E7A000E0620 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199991278778800ACFF58 /* audio.c */; };
-		92BC210416EF8E7A000E0620 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1990E1278767B00ACFF58 /* bifs_dec.c */; };
-		92BC210516EF8E7A000E0620 /* bmp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993E127876E300ACFF58 /* bmp_dec.c */; };
-		92BC210616EF8E7A000E0620 /* ctx_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1992D127876B000ACFF58 /* ctx_load.c */; };
 		92BC210716EF8E7A000E0620 /* cursors.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999A1278778800ACFF58 /* cursors.c */; };
-		92BC210816EF8E7A000E0620 /* dummy_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19928127876A200ACFF58 /* dummy_in.c */; };
-		92BC210916EF8E7A000E0620 /* faad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199081278765600ACFF58 /* faad_dec.c */; };
 		92BC210C16EF8E7A000E0620 /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199811278776700ACFF58 /* ft_font.c */; };
 		92BC210D16EF8E7A000E0620 /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199821278776700ACFF58 /* ft_font.h */; };
-		92BC210E16EF8E7A000E0620 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199151278769100ACFF58 /* ftgrays.c */; };
-		92BC210F16EF8E7A000E0620 /* gpac_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1994F127876FA00ACFF58 /* gpac_js.c */; };
-		92BC211216EF8E7A000E0620 /* img_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1993F127876E300ACFF58 /* img_dec.c */; };
-		92BC211316EF8E7A000E0620 /* img_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19940127876E300ACFF58 /* img_in.c */; };
-		92BC211416EF8E7A000E0620 /* img_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A19941127876E300ACFF58 /* img_in.h */; };
-		92BC211516EF8E7A000E0620 /* isom_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 970D981B16D6D0AE00FB0325 /* isom_cache.c */; };
-		92BC211616EF8E7A000E0620 /* isom_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199551278770900ACFF58 /* isom_in.h */; };
-		92BC211716EF8E7A000E0620 /* jp2_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19942127876E300ACFF58 /* jp2_dec.c */; };
-		92BC211816EF8E7A000E0620 /* jpeg_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19943127876E300ACFF58 /* jpeg_dec.c */; };
-		92BC211916EF8E7A000E0620 /* laser_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199611278772500ACFF58 /* laser_dec.c */; };
-		92BC211A16EF8E7A000E0620 /* load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199561278770900ACFF58 /* load.c */; };
-		92BC211B16EF8E7A000E0620 /* mad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19937127876D300ACFF58 /* mad_dec.c */; };
-		92BC211D16EF8E7A000E0620 /* mp3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19939127876D300ACFF58 /* mp3_in.c */; };
-		92BC211E16EF8E7A000E0620 /* mpd_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71179CBF1292EC1800A83216 /* mpd_in.c */; };
-		92BC211F16EF8E7A000E0620 /* mpegts_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1997D1278775900ACFF58 /* mpegts_in.c */; };
-		92BC212016EF8E7A000E0620 /* odf_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199671278773900ACFF58 /* odf_dec.c */; };
-		92BC212116EF8E7A000E0620 /* png_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19945127876E300ACFF58 /* png_dec.c */; };
-		92BC212216EF8E7A000E0620 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A199171278769100ACFF58 /* rast_soft.h */; };
-		92BC212316EF8E7A000E0620 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199181278769100ACFF58 /* raster_565.c */; };
-		92BC212416EF8E7A000E0620 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199191278769100ACFF58 /* raster_argb.c */; };
-		92BC212516EF8E7A000E0620 /* raster_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991A1278769100ACFF58 /* raster_load.c */; };
-		92BC212616EF8E7A000E0620 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991B1278769100ACFF58 /* raster_rgb.c */; };
-		92BC212716EF8E7A000E0620 /* read.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199581278770900ACFF58 /* read.c */; };
-		92BC212816EF8E7A000E0620 /* read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199591278770900ACFF58 /* read_ch.c */; };
-		92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996C1278774A00ACFF58 /* rtp_in.c */; };
-		92BC212A16EF8E7A000E0620 /* rtp_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1996D1278774A00ACFF58 /* rtp_in.h */; };
-		92BC212B16EF8E7A000E0620 /* rtp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996E1278774A00ACFF58 /* rtp_session.c */; };
-		92BC212C16EF8E7A000E0620 /* rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1996F1278774A00ACFF58 /* rtp_signaling.c */; };
-		92BC212D16EF8E7A000E0620 /* rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199701278774A00ACFF58 /* rtp_stream.c */; };
 		92BC212E16EF8E7A000E0620 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999C1278778800ACFF58 /* sdl_out.c */; };
 		92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1999D1278778800ACFF58 /* sdl_out.h */; };
-		92BC213016EF8E7A000E0620 /* sdp_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199711278774A00ACFF58 /* sdp_fetch.c */; };
-		92BC213116EF8E7A000E0620 /* sdp_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199721278774A00ACFF58 /* sdp_load.c */; };
-		92BC213216EF8E7A000E0620 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991C1278769100ACFF58 /* stencil.c */; };
-		92BC213316EF8E7A000E0620 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1991D1278769100ACFF58 /* surface.c */; };
-		92BC213416EF8E7A000E0620 /* svg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19933127876C300ACFF58 /* svg_in.c */; };
-		92BC213516EF8E7A000E0620 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A199891278777A00ACFF58 /* unzip.c */; };
-		92BC213616EF8E7A000E0620 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998A1278777A00ACFF58 /* unzip.h */; };
 		92BC213716EF8E7A000E0620 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1999E1278778800ACFF58 /* video.c */; };
-		92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998B1278777A00ACFF58 /* wgt_load.c */; };
-		92BC213A16EF8E7A000E0620 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998D1278777A00ACFF58 /* widget.c */; };
-		92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A1998E1278777A00ACFF58 /* widgetman.c */; };
-		92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A1998F1278777A00ACFF58 /* widgetman.h */; };
-		92C7F19A1AA8B48E00BA5B4C /* gui in Resources */ = {isa = PBXBuildFile; fileRef = 92C7F1991AA8B48E00BA5B4C /* gui */; };
-		92D127FE1BBADC7F00DA003B /* shaders in Resources */ = {isa = PBXBuildFile; fileRef = 92D127FD1BBADC7F00DA003B /* shaders */; };
+		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 */; };
-		92DC362520B47FB600C48E39 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362020B47FB600C48E39 /* g_crypt_openssl.c */; };
-		92DC362620B47FB600C48E39 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 92DC362120B47FB600C48E39 /* tiny_aes.h */; };
-		92DC362720B47FB600C48E39 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362220B47FB600C48E39 /* g_crypt.c */; };
-		92DC362820B47FB600C48E39 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362320B47FB600C48E39 /* tiny_aes.c */; };
-		92DC362920B47FB600C48E39 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DC362420B47FB600C48E39 /* g_crypt_tinyaes.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 */; };
+		92D6C5AC2343BF9400262217 /* vrml_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5A92343BF9400262217 /* vrml_js.c */; };
+		92D6C5AD2343BF9400262217 /* dom_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92D6C5AA2343BF9400262217 /* dom_js.c */; };
 		92DF5CA61BA6C6F80058A7BA /* iff.c in Sources */ = {isa = PBXBuildFile; fileRef = 92DF5CA51BA6C6F80058A7BA /* iff.c */; };
-		92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826116F254F50002629E /* timedtext_dec.c */; };
-		92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA826216F254F50002629E /* timedtext_in.c */; };
-		92E8C78D1A0CD57A00E0436D /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825F16F254DA0002629E /* isma_ea.c */; };
-		92E8C78E1A0CD57A00E0436D /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825D16F254C60002629E /* saf_in.c */; };
-		92E8C78F1A0CD57A00E0436D /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825B16F254AF0002629E /* audio_filter.c */; };
 		92E8C7901A0CD58300E0436D /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92FA825916F2549D0002629E /* validator.c */; };
-		92F8D46E1F713E5F00616F7C /* netctrl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F8D46D1F713E5F00616F7C /* netctrl.c */; };
+		92E9DFA22215CE9A00628420 /* g_crypt_tinyaes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DF9D2215CE9900628420 /* g_crypt_tinyaes.c */; };
+		92E9DFA32215CE9A00628420 /* tiny_aes.h in Headers */ = {isa = PBXBuildFile; fileRef = 92E9DF9E2215CE9900628420 /* tiny_aes.h */; };
+		92E9DFA42215CE9A00628420 /* tiny_aes.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DF9F2215CE9A00628420 /* tiny_aes.c */; };
+		92E9DFA52215CE9A00628420 /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFA02215CE9A00628420 /* g_crypt.c */; };
+		92E9DFA62215CE9A00628420 /* g_crypt_openssl.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFA12215CE9A00628420 /* g_crypt_openssl.c */; };
+		92E9DFAF2215CEA700628420 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFA72215CEA600628420 /* raster_rgb.c */; };
+		92E9DFB02215CEA700628420 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFA82215CEA700628420 /* stencil.c */; };
+		92E9DFB12215CEA700628420 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFA92215CEA700628420 /* ftgrays.c */; };
+		92E9DFB22215CEA700628420 /* raster_yuv.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFAA2215CEA700628420 /* raster_yuv.c */; };
+		92E9DFB32215CEA700628420 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFAB2215CEA700628420 /* raster_argb.c */; };
+		92E9DFB42215CEA700628420 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 92E9DFAC2215CEA700628420 /* rast_soft.h */; };
+		92E9DFB52215CEA700628420 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFAD2215CEA700628420 /* surface.c */; };
+		92E9DFB62215CEA700628420 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E9DFAE2215CEA700628420 /* raster_565.c */; };
+		92EB6D6720E4E17F00A97A49 /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D5F20E4E17F00A97A49 /* filter.c */; };
+		92EB6D6820E4E17F00A97A49 /* filter_props.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6020E4E17F00A97A49 /* filter_props.c */; };
+		92EB6D6920E4E17F00A97A49 /* filter_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6120E4E17F00A97A49 /* filter_queue.c */; };
+		92EB6D6A20E4E17F00A97A49 /* filter_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6220E4E17F00A97A49 /* filter_session.c */; };
+		92EB6D6B20E4E17F00A97A49 /* filter_pid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6320E4E17F00A97A49 /* filter_pid.c */; };
+		92EB6D6C20E4E17F00A97A49 /* filter_register.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6420E4E17F00A97A49 /* filter_register.c */; };
+		92EB6D6D20E4E17F00A97A49 /* filter_session.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EB6D6520E4E17F00A97A49 /* filter_session.h */; };
+		92EB6D6E20E4E17F00A97A49 /* filter_pck.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6620E4E17F00A97A49 /* filter_pck.c */; };
+		92EB6DC720E4E19700A97A49 /* mux_ts.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D6F20E4E19200A97A49 /* mux_ts.c */; };
+		92EB6DC820E4E19700A97A49 /* out_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7020E4E19200A97A49 /* out_file.c */; };
+		92EB6DC920E4E19700A97A49 /* ff_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7120E4E19200A97A49 /* ff_dec.c */; };
+		92EB6DCA20E4E19700A97A49 /* dec_bifs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7220E4E19200A97A49 /* dec_bifs.c */; };
+		92EB6DCB20E4E19700A97A49 /* out_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7320E4E19200A97A49 /* out_video.c */; };
+		92EB6DCC20E4E19700A97A49 /* dec_openhevc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7420E4E19200A97A49 /* dec_openhevc.c */; };
+		92EB6DCD20E4E19700A97A49 /* reframe_nalu.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7520E4E19200A97A49 /* reframe_nalu.c */; };
+		92EB6DCE20E4E19700A97A49 /* filelist.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7620E4E19200A97A49 /* filelist.c */; };
+		92EB6DCF20E4E19700A97A49 /* dmx_mpegps.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7720E4E19200A97A49 /* dmx_mpegps.c */; };
+		92EB6DD020E4E19700A97A49 /* reframe_rawvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7820E4E19200A97A49 /* reframe_rawvid.c */; };
+		92EB6DD120E4E19700A97A49 /* write_qcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7920E4E19200A97A49 /* write_qcp.c */; };
+		92EB6DD220E4E19700A97A49 /* ff_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7A20E4E19200A97A49 /* ff_common.c */; };
+		92EB6DD320E4E19700A97A49 /* dec_j2k.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7B20E4E19200A97A49 /* dec_j2k.c */; };
+		92EB6DD420E4E19700A97A49 /* inspect.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7C20E4E19200A97A49 /* inspect.c */; };
+		92EB6DD620E4E19700A97A49 /* dec_ttxt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7E20E4E19200A97A49 /* dec_ttxt.c */; };
+		92EB6DD720E4E19700A97A49 /* dec_vtb_glctx.m in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D7F20E4E19300A97A49 /* dec_vtb_glctx.m */; };
+		92EB6DD820E4E19700A97A49 /* load_bt_xmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8020E4E19300A97A49 /* load_bt_xmt.c */; };
+		92EB6DD920E4E19700A97A49 /* rewrite_adts.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8120E4E19300A97A49 /* rewrite_adts.c */; };
+		92EB6DDA20E4E19700A97A49 /* dec_webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8220E4E19300A97A49 /* dec_webvtt.c */; };
+		92EB6DDB20E4E19700A97A49 /* dmx_m2ts.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8320E4E19300A97A49 /* dmx_m2ts.c */; };
+		92EB6DDC20E4E19700A97A49 /* reframe_amr.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8420E4E19300A97A49 /* reframe_amr.c */; };
+		92EB6DDD20E4E19700A97A49 /* reframe_img.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8520E4E19300A97A49 /* reframe_img.c */; };
+		92EB6DDE20E4E19700A97A49 /* in_rtp_rtsp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8620E4E19300A97A49 /* in_rtp_rtsp.c */; };
+		92EB6DDF20E4E19700A97A49 /* out_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8720E4E19300A97A49 /* out_audio.c */; };
+		92EB6DE020E4E19700A97A49 /* write_nhml.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8820E4E19300A97A49 /* write_nhml.c */; };
+		92EB6DE120E4E19700A97A49 /* reframe_adts.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8920E4E19300A97A49 /* reframe_adts.c */; };
+		92EB6DE220E4E19700A97A49 /* dmx_dash.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8A20E4E19300A97A49 /* dmx_dash.c */; };
+		92EB6DE320E4E19700A97A49 /* compose.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8B20E4E19300A97A49 /* compose.c */; };
+		92EB6DE420E4E19700A97A49 /* dmx_saf.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8C20E4E19400A97A49 /* dmx_saf.c */; };
+		92EB6DE520E4E19700A97A49 /* encrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8D20E4E19400A97A49 /* encrypt_cenc_isma.c */; };
+		92EB6DE620E4E19700A97A49 /* ff_rescale.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8E20E4E19400A97A49 /* ff_rescale.c */; };
+		92EB6DE720E4E19700A97A49 /* enc_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D8F20E4E19400A97A49 /* enc_png.c */; };
+		92EB6DE820E4E19700A97A49 /* in_dvb4linux.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9020E4E19400A97A49 /* in_dvb4linux.c */; };
+		92EB6DE920E4E19700A97A49 /* in_rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9120E4E19400A97A49 /* in_rtp.c */; };
+		92EB6DEA20E4E19700A97A49 /* reframe_rawpcm.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9220E4E19400A97A49 /* reframe_rawpcm.c */; };
+		92EB6DEB20E4E19700A97A49 /* rewind.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9320E4E19400A97A49 /* rewind.c */; };
+		92EB6DEC20E4E19700A97A49 /* dasher.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9420E4E19400A97A49 /* dasher.c */; };
+		92EB6DED20E4E19700A97A49 /* dec_laser.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9520E4E19400A97A49 /* dec_laser.c */; };
+		92EB6DEE20E4E19700A97A49 /* write_vtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9620E4E19400A97A49 /* write_vtt.c */; };
+		92EB6DEF20E4E19700A97A49 /* isoffin.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EB6D9720E4E19400A97A49 /* isoffin.h */; };
+		92EB6DF020E4E19700A97A49 /* dec_vorbis.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9820E4E19400A97A49 /* dec_vorbis.c */; };
+		92EB6DF120E4E19700A97A49 /* isoffin_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9920E4E19400A97A49 /* isoffin_load.c */; };
+		92EB6DF220E4E19700A97A49 /* mux_avi.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9A20E4E19500A97A49 /* mux_avi.c */; };
+		92EB6DF320E4E19700A97A49 /* dmx_avi.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9B20E4E19500A97A49 /* dmx_avi.c */; };
+		92EB6DF420E4E19700A97A49 /* isoffin_read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9C20E4E19500A97A49 /* isoffin_read_ch.c */; };
+		92EB6DF520E4E19700A97A49 /* reframer.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9D20E4E19500A97A49 /* reframer.c */; };
+		92EB6DF620E4E19700A97A49 /* rewrite_mp4v.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9E20E4E19500A97A49 /* rewrite_mp4v.c */; };
+		92EB6DF720E4E19700A97A49 /* dmx_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6D9F20E4E19500A97A49 /* dmx_ogg.c */; };
+		92EB6DF820E4E19700A97A49 /* dec_faad.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA020E4E19500A97A49 /* dec_faad.c */; };
+		92EB6DF920E4E19700A97A49 /* dmx_nhml.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA120E4E19500A97A49 /* dmx_nhml.c */; };
+		92EB6DFA20E4E19700A97A49 /* dec_img.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA220E4E19500A97A49 /* dec_img.c */; };
+		92EB6DFB20E4E19700A97A49 /* write_nhnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA320E4E19500A97A49 /* write_nhnt.c */; };
+		92EB6DFC20E4E19700A97A49 /* in_rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA420E4E19500A97A49 /* in_rtp_stream.c */; };
+		92EB6DFD20E4E19700A97A49 /* reframe_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA520E4E19500A97A49 /* reframe_mp3.c */; };
+		92EB6DFE20E4E19700A97A49 /* reframe_qcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA620E4E19500A97A49 /* reframe_qcp.c */; };
+		92EB6DFF20E4E19700A97A49 /* dmx_vobsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA720E4E19600A97A49 /* dmx_vobsub.c */; };
+		92EB6E0020E4E19700A97A49 /* dec_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA820E4E19600A97A49 /* dec_mad.c */; };
+		92EB6E0120E4E19700A97A49 /* reframe_ac3.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DA920E4E19600A97A49 /* reframe_ac3.c */; };
+		92EB6E0220E4E19700A97A49 /* write_generic.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAA20E4E19600A97A49 /* write_generic.c */; };
+		92EB6E0320E4E19700A97A49 /* dec_xvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAB20E4E19600A97A49 /* dec_xvid.c */; };
+		92EB6E0420E4E19700A97A49 /* ff_dmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAC20E4E19600A97A49 /* ff_dmx.c */; };
+		92EB6E0520E4E19700A97A49 /* load_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAD20E4E19600A97A49 /* load_text.c */; };
+		92EB6E0620E4E19700A97A49 /* in_rtp_sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAE20E4E19600A97A49 /* in_rtp_sdp.c */; };
+		92EB6E0720E4E19700A97A49 /* isoffin_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DAF20E4E19600A97A49 /* isoffin_read.c */; };
+		92EB6E0820E4E19700A97A49 /* dec_ac52.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB020E4E19600A97A49 /* dec_ac52.c */; };
+		92EB6E0920E4E19700A97A49 /* dmx_nhnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB120E4E19600A97A49 /* dmx_nhnt.c */; };
+		92EB6E0A20E4E19700A97A49 /* dec_odf.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB220E4E19600A97A49 /* dec_odf.c */; };
+		92EB6E0B20E4E19700A97A49 /* mux_isom.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB320E4E19600A97A49 /* mux_isom.c */; };
+		92EB6E0C20E4E19700A97A49 /* rewrite_nalu.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB420E4E19600A97A49 /* rewrite_nalu.c */; };
+		92EB6E0D20E4E19700A97A49 /* tileagg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB520E4E19600A97A49 /* tileagg.c */; };
+		92EB6E0E20E4E19700A97A49 /* resample_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB620E4E19600A97A49 /* resample_audio.c */; };
+		92EB6E0F20E4E19700A97A49 /* load_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB720E4E19600A97A49 /* load_svg.c */; };
+		92EB6E1020E4E19700A97A49 /* in_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB820E4E19600A97A49 /* in_file.c */; };
+		92EB6E1120E4E19700A97A49 /* dec_theora.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DB920E4E19600A97A49 /* dec_theora.c */; };
+		92EB6E1220E4E19700A97A49 /* reframe_h263.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DBA20E4E19700A97A49 /* reframe_h263.c */; };
+		92EB6E1320E4E19700A97A49 /* reframe_mpgvid.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DBB20E4E19700A97A49 /* reframe_mpgvid.c */; };
+		92EB6E1420E4E19700A97A49 /* vcrop.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DBC20E4E19700A97A49 /* vcrop.c */; };
+		92EB6E1520E4E19700A97A49 /* ff_common.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EB6DBD20E4E19700A97A49 /* ff_common.h */; };
+		92EB6E1620E4E19700A97A49 /* decrypt_cenc_isma.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DBE20E4E19700A97A49 /* decrypt_cenc_isma.c */; };
+		92EB6E1720E4E19700A97A49 /* enc_jpg.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DBF20E4E19700A97A49 /* enc_jpg.c */; };
+		92EB6E1820E4E19700A97A49 /* dec_opensvc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC020E4E19700A97A49 /* dec_opensvc.c */; };
+		92EB6E1920E4E19700A97A49 /* ff_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC120E4E19700A97A49 /* ff_enc.c */; };
+		92EB6E1A20E4E19700A97A49 /* in_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC220E4E19700A97A49 /* in_http.c */; };
+		92EB6E1B20E4E19700A97A49 /* dec_vtb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC320E4E19700A97A49 /* dec_vtb.c */; };
+		92EB6E1C20E4E19700A97A49 /* in_rtp.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EB6DC420E4E19700A97A49 /* in_rtp.h */; };
+		92EB6E1D20E4E19700A97A49 /* in_rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC520E4E19700A97A49 /* in_rtp_signaling.c */; };
+		92EB6E1E20E4E19700A97A49 /* unit_test_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6DC620E4E19700A97A49 /* unit_test_filter.c */; };
+		92EB6E2020E4E1A300A97A49 /* crypt_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E1F20E4E1A300A97A49 /* crypt_tools.c */; };
+		92EB6E2220E4E1B500A97A49 /* crypt_tools.h in Headers */ = {isa = PBXBuildFile; fileRef = 92EB6E2120E4E1B500A97A49 /* crypt_tools.h */; };
+		92EB6E2E20E4E58E00A97A49 /* mpeg4_inputsensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2320E4E58D00A97A49 /* mpeg4_inputsensor.c */; };
+		92EB6E2F20E4E58E00A97A49 /* mpeg4_inline.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2420E4E58D00A97A49 /* mpeg4_inline.c */; };
+		92EB6E3020E4E58E00A97A49 /* scene_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2520E4E58D00A97A49 /* scene_node_init.c */; };
+		92EB6E3120E4E58E00A97A49 /* svg_external.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2620E4E58D00A97A49 /* svg_external.c */; };
+		92EB6E3220E4E58E00A97A49 /* clock.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2720E4E58D00A97A49 /* clock.c */; };
+		92EB6E3320E4E58E00A97A49 /* scene_ns.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2820E4E58E00A97A49 /* scene_ns.c */; };
+		92EB6E3420E4E58E00A97A49 /* mpeg4_mediasensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2920E4E58E00A97A49 /* mpeg4_mediasensor.c */; };
+		92EB6E3520E4E58E00A97A49 /* scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2A20E4E58E00A97A49 /* scene.c */; };
+		92EB6E3620E4E58E00A97A49 /* media_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2B20E4E58E00A97A49 /* media_object.c */; };
+		92EB6E3720E4E58E00A97A49 /* mpeg4_mediacontrol.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2C20E4E58E00A97A49 /* mpeg4_mediacontrol.c */; };
+		92EB6E3820E4E58E00A97A49 /* object_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E2D20E4E58E00A97A49 /* object_manager.c */; };
+		92EB6E3B20E4EBDB00A97A49 /* constants.c in Sources */ = {isa = PBXBuildFile; fileRef = 92EB6E3A20E4EBDB00A97A49 /* constants.c */; };
+		92EB6E3E20E4EC8600A97A49 /* libavdevice.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92EB6E3C20E4EC5600A97A49 /* libavdevice.a */; };
+		92EB6E4020E4EC9700A97A49 /* libavfilter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 92EB6E3F20E4EC9700A97A49 /* libavfilter.a */; };
+		92EB6E4220E4ECD500A97A49 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 92EB6E4120E4ECD500A97A49 /* AVFoundation.framework */; };
 		92F930861A5ADC1A0072A85C /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 92F930841A5ADC1A0072A85C /* os_divers.c */; };
-		92FA48891D059A820072C8A4 /* glcontext.m in Sources */ = {isa = PBXBuildFile; fileRef = 92FA48881D059A820072C8A4 /* glcontext.m */; };
 		970A26C913434D2C0007362C /* m3u8.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C713434D2C0007362C /* m3u8.c */; };
 		970A26CA13434D2C0007362C /* mpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26C813434D2C0007362C /* mpd.c */; };
 		970A26CD13434D780007362C /* m3u8.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26CB13434D780007362C /* m3u8.h */; };
@@ -467,12 +536,7 @@
 		970A26D213434D960007362C /* cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26CF13434D960007362C /* cache.h */; };
 		970A26D313434D960007362C /* ringbuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26D013434D960007362C /* ringbuffer.h */; };
 		970A26D413434D960007362C /* unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 970A26D113434D960007362C /* unicode.h */; };
-		970A26D713434DAC0007362C /* ringbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26D513434DAC0007362C /* ringbuffer.c */; };
 		970A26D813434DAC0007362C /* unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 970A26D613434DAC0007362C /* unicode.c */; };
-		970FBA7D16F9F0720052216D /* html5_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7B16F9F0720052216D /* html5_media.c */; };
-		970FBA7E16F9F0720052216D /* html5_mse.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7C16F9F0720052216D /* html5_mse.c */; };
-		970FBA8116F9F0920052216D /* html5_media_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA7F16F9F0910052216D /* html5_media_smjs.c */; };
-		970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA8016F9F0920052216D /* html5_mse_smjs.c */; };
 		97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */ = {isa = PBXBuildFile; fileRef = 97116F201646E38D00BD1AD0 /* box_code_adobe.c */; };
 		9719CE751704C35000381CE6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9793AE341704C0BD00E0C938 /* CoreGraphics.framework */; };
 		9747B6EF14864C6400280D95 /* ait.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6EC14864C6400280D95 /* ait.h */; };
@@ -482,14 +546,10 @@
 		9747B6F514864C7800280D95 /* dsmcc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9747B6F314864C7800280D95 /* dsmcc.c */; };
 		97793E5115E6370D005123E1 /* dash_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 97793E5015E6370D005123E1 /* dash_client.c */; };
 		97A5D5891704C61A00144E5D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 976AF9991704C5C9004E9C00 /* AudioToolbox.framework */; };
-		97A8DDC41896AFF300F4680F /* ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 97A8DDC31896AFF300F4680F /* ttml.c */; };
 		97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */ = {isa = PBXBuildFile; fileRef = 97DB67C41627B22F00A7E054 /* dash_segmenter.c */; };
 		97DDAFEF1569631900528219 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 97DDAFEE1569631900528219 /* sha1.c */; };
 		97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E08C68160F684B00BBDC34 /* swf_svg.c */; };
 		97E29F6917D1138B00904FBF /* webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F6817D1138B00904FBF /* webvtt.c */; };
-		97E29F6E17D114E900904FBF /* mse_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F6D17D114E900904FBF /* mse_in.c */; };
-		97E29F7A17D118F100904FBF /* raw_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7917D118F100904FBF /* raw_video.c */; };
-		97E29F7C17D1190600904FBF /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7B17D1190600904FBF /* osd.c */; };
 		97FF0660138CE4C400D6C707 /* os_config_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 97FF065F138CE4C400D6C707 /* os_config_init.c */; };
 /* End PBXBuildFile section */
 
@@ -503,6 +563,19 @@
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		9281B62721C92923006B0FD5 /* Copy Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 8;
+			dstPath = share;
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			name = "Copy Files";
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* 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>"; };
@@ -511,62 +584,12 @@
 		285DBB9D1712C80E00AF2B9B /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../extra_lib/lib/iOS/libavutil.a; sourceTree = "<group>"; };
 		285DBB9F1712C80E00AF2B9B /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = ../../extra_lib/lib/iOS/libswscale.a; sourceTree = "<group>"; };
 		2897039B1A13C4050063E9C0 /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../extra_lib/lib/iOS/libswresample.a; sourceTree = "<group>"; };
-		28F2240317D6367000E9D2BE /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
-		28F2240517D6369700E9D2BE /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
-		28F2240717D636C300E9D2BE /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
-		28F2240917D636DA00E9D2BE /* ffmpeg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_load.c; path = ../../modules/ffmpeg_in/ffmpeg_load.c; sourceTree = "<group>"; };
-		71179CBF1292EC1800A83216 /* mpd_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpd_in.c; path = ../../modules/mpd_in/mpd_in.c; sourceTree = "<group>"; };
 		7141FF2F1292CB9200FCB27D /* alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alloc.c; sourceTree = "<group>"; };
 		7147425F12B918C900DB5A59 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cache.c; sourceTree = "<group>"; };
 		71847811127860F000917298 /* libc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libc.dylib; path = usr/lib/libc.dylib; sourceTree = SDKROOT; };
 		71847813127860F000917298 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		71A199071278765600ACFF58 /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
-		71A199081278765600ACFF58 /* faad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = faad_dec.c; path = ../../modules/aac_in/faad_dec.c; sourceTree = "<group>"; };
-		71A1990E1278767B00ACFF58 /* bifs_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bifs_dec.c; path = ../../modules/bifs_dec/bifs_dec.c; sourceTree = "<group>"; };
-		71A199151278769100ACFF58 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftgrays.c; sourceTree = "<group>"; };
-		71A199171278769100ACFF58 /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rast_soft.h; sourceTree = "<group>"; };
-		71A199181278769100ACFF58 /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_565.c; sourceTree = "<group>"; };
-		71A199191278769100ACFF58 /* raster_argb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_argb.c; sourceTree = "<group>"; };
-		71A1991A1278769100ACFF58 /* raster_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_load.c; sourceTree = "<group>"; };
-		71A1991B1278769100ACFF58 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = raster_rgb.c; sourceTree = "<group>"; };
-		71A1991C1278769100ACFF58 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stencil.c; sourceTree = "<group>"; };
-		71A1991D1278769100ACFF58 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = surface.c; sourceTree = "<group>"; };
-		71A19928127876A200ACFF58 /* dummy_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dummy_in.c; path = ../../modules/dummy_in/dummy_in.c; sourceTree = "<group>"; };
-		71A1992D127876B000ACFF58 /* ctx_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ctx_load.c; path = ../../modules/ctx_load/ctx_load.c; sourceTree = "<group>"; };
-		71A19933127876C300ACFF58 /* svg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = svg_in.c; path = ../../modules/svg_in/svg_in.c; sourceTree = "<group>"; };
-		71A19937127876D300ACFF58 /* mad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mad_dec.c; path = ../../modules/mp3_in/mad_dec.c; sourceTree = "<group>"; };
-		71A19939127876D300ACFF58 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mp3_in.c; path = ../../modules/mp3_in/mp3_in.c; sourceTree = "<group>"; };
-		71A1993E127876E300ACFF58 /* bmp_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bmp_dec.c; sourceTree = "<group>"; };
-		71A1993F127876E300ACFF58 /* img_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_dec.c; sourceTree = "<group>"; };
-		71A19940127876E300ACFF58 /* img_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img_in.c; sourceTree = "<group>"; };
-		71A19941127876E300ACFF58 /* img_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = img_in.h; sourceTree = "<group>"; };
-		71A19942127876E300ACFF58 /* jp2_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jp2_dec.c; sourceTree = "<group>"; };
-		71A19943127876E300ACFF58 /* jpeg_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jpeg_dec.c; sourceTree = "<group>"; };
-		71A19945127876E300ACFF58 /* png_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = png_dec.c; sourceTree = "<group>"; };
-		71A1994F127876FA00ACFF58 /* gpac_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpac_js.c; path = ../../modules/gpac_js/gpac_js.c; sourceTree = "<group>"; };
-		71A199551278770900ACFF58 /* isom_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isom_in.h; sourceTree = "<group>"; };
-		71A199561278770900ACFF58 /* load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = load.c; sourceTree = "<group>"; };
-		71A199581278770900ACFF58 /* read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = read.c; sourceTree = "<group>"; };
-		71A199591278770900ACFF58 /* read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = read_ch.c; sourceTree = "<group>"; };
-		71A199611278772500ACFF58 /* laser_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = laser_dec.c; path = ../../modules/laser_dec/laser_dec.c; sourceTree = "<group>"; };
-		71A199671278773900ACFF58 /* odf_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = odf_dec.c; path = ../../modules/odf_dec/odf_dec.c; sourceTree = "<group>"; };
-		71A1996C1278774A00ACFF58 /* rtp_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_in.c; sourceTree = "<group>"; };
-		71A1996D1278774A00ACFF58 /* rtp_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rtp_in.h; sourceTree = "<group>"; };
-		71A1996E1278774A00ACFF58 /* rtp_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_session.c; sourceTree = "<group>"; };
-		71A1996F1278774A00ACFF58 /* rtp_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_signaling.c; sourceTree = "<group>"; };
-		71A199701278774A00ACFF58 /* rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_stream.c; sourceTree = "<group>"; };
-		71A199711278774A00ACFF58 /* sdp_fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdp_fetch.c; sourceTree = "<group>"; };
-		71A199721278774A00ACFF58 /* sdp_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdp_load.c; sourceTree = "<group>"; };
-		71A1997D1278775900ACFF58 /* mpegts_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpegts_in.c; path = ../../modules/mpegts_in/mpegts_in.c; sourceTree = "<group>"; };
 		71A199811278776700ACFF58 /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ft_font.c; path = ../../modules/ft_font/ft_font.c; sourceTree = "<group>"; };
 		71A199821278776700ACFF58 /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft_font.h; path = ../../modules/ft_font/ft_font.h; sourceTree = "<group>"; };
-		71A199891278777A00ACFF58 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
-		71A1998A1278777A00ACFF58 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
-		71A1998B1278777A00ACFF58 /* wgt_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wgt_load.c; sourceTree = "<group>"; };
-		71A1998C1278777A00ACFF58 /* wgt_load_base.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = wgt_load_base.js; sourceTree = "<group>"; };
-		71A1998D1278777A00ACFF58 /* widget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = widget.c; sourceTree = "<group>"; };
-		71A1998E1278777A00ACFF58 /* widgetman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = widgetman.c; sourceTree = "<group>"; };
-		71A1998F1278777A00ACFF58 /* widgetman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widgetman.h; sourceTree = "<group>"; };
 		71A199991278778800ACFF58 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio.c; sourceTree = "<group>"; };
 		71A1999A1278778800ACFF58 /* cursors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cursors.c; sourceTree = "<group>"; };
 		71A1999C1278778800ACFF58 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_out.c; sourceTree = "<group>"; };
@@ -712,10 +735,8 @@
 		71CCF1CE1277045100339E12 /* av_parsers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = av_parsers.c; sourceTree = "<group>"; };
 		71CCF1CF1277045100339E12 /* avilib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avilib.c; sourceTree = "<group>"; };
 		71CCF1D01277045100339E12 /* dvb_mpe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dvb_mpe.c; sourceTree = "<group>"; };
-		71CCF1D11277045100339E12 /* filestreamer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filestreamer.c; sourceTree = "<group>"; };
 		71CCF1D21277045100339E12 /* gpac_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gpac_ogg.c; sourceTree = "<group>"; };
 		71CCF1D31277045100339E12 /* img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img.c; sourceTree = "<group>"; };
-		71CCF1D41277045100339E12 /* ismacryp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ismacryp.c; sourceTree = "<group>"; };
 		71CCF1D51277045100339E12 /* isom_hinter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_hinter.c; sourceTree = "<group>"; };
 		71CCF1D61277045100339E12 /* isom_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_tools.c; sourceTree = "<group>"; };
 		71CCF1D71277045100339E12 /* m2ts_mux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m2ts_mux.c; sourceTree = "<group>"; };
@@ -726,7 +747,6 @@
 		71CCF1DC1277045100339E12 /* mpegts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpegts.c; sourceTree = "<group>"; };
 		71CCF1DD1277045100339E12 /* reedsolomon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reedsolomon.c; sourceTree = "<group>"; };
 		71CCF1DE1277045100339E12 /* saf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = saf.c; sourceTree = "<group>"; };
-		71CCF1DF1277045100339E12 /* text_import.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = text_import.c; sourceTree = "<group>"; };
 		71CCF1E01277045100339E12 /* vobsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vobsub.c; sourceTree = "<group>"; };
 		71CCF1E21277045100339E12 /* desc_private.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = desc_private.c; sourceTree = "<group>"; };
 		71CCF1E31277045100339E12 /* descriptors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = descriptors.c; sourceTree = "<group>"; };
@@ -757,7 +777,6 @@
 		71CCF1FE1277045100339E12 /* base_scenegraph.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_scenegraph.c; sourceTree = "<group>"; };
 		71CCF1FF1277045100339E12 /* commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = commands.c; sourceTree = "<group>"; };
 		71CCF2001277045100339E12 /* dom_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_events.c; sourceTree = "<group>"; };
-		71CCF2011277045100339E12 /* dom_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_smjs.c; sourceTree = "<group>"; };
 		71CCF2021277045100339E12 /* mpeg4_animators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animators.c; sourceTree = "<group>"; };
 		71CCF2031277045100339E12 /* mpeg4_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_nodes.c; sourceTree = "<group>"; };
 		71CCF2041277045100339E12 /* mpeg4_valuator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_valuator.c; sourceTree = "<group>"; };
@@ -765,36 +784,14 @@
 		71CCF2061277045100339E12 /* smil_timing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smil_timing.c; sourceTree = "<group>"; };
 		71CCF2071277045100339E12 /* svg_attributes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_attributes.c; sourceTree = "<group>"; };
 		71CCF2081277045100339E12 /* svg_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_properties.c; sourceTree = "<group>"; };
-		71CCF2091277045100339E12 /* svg_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_smjs.c; sourceTree = "<group>"; };
 		71CCF20A1277045100339E12 /* svg_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_types.c; sourceTree = "<group>"; };
 		71CCF20B1277045100339E12 /* vrml_interpolators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_interpolators.c; sourceTree = "<group>"; };
 		71CCF20C1277045100339E12 /* vrml_proto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_proto.c; sourceTree = "<group>"; };
 		71CCF20D1277045100339E12 /* vrml_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_route.c; sourceTree = "<group>"; };
 		71CCF20E1277045100339E12 /* vrml_script.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_script.c; sourceTree = "<group>"; };
-		71CCF20F1277045100339E12 /* vrml_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_smjs.c; sourceTree = "<group>"; };
 		71CCF2101277045100339E12 /* vrml_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_tools.c; sourceTree = "<group>"; };
 		71CCF2111277045100339E12 /* x3d_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_nodes.c; sourceTree = "<group>"; };
-		71CCF2121277045100339E12 /* xbl_process.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xbl_process.c; sourceTree = "<group>"; };
 		71CCF2131277045100339E12 /* xml_ns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml_ns.c; sourceTree = "<group>"; };
-		71CCF2151277045100339E12 /* channel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = channel.c; sourceTree = "<group>"; };
-		71CCF2161277045100339E12 /* clock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clock.c; sourceTree = "<group>"; };
-		71CCF2171277045100339E12 /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; };
-		71CCF2181277045100339E12 /* input_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = input_sensor.c; sourceTree = "<group>"; };
-		71CCF2191277045100339E12 /* input_sensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input_sensor.h; sourceTree = "<group>"; };
-		71CCF21A1277045100339E12 /* media_control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_control.c; sourceTree = "<group>"; };
-		71CCF21B1277045100339E12 /* media_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_control.h; sourceTree = "<group>"; };
-		71CCF21C1277045100339E12 /* media_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_manager.c; sourceTree = "<group>"; };
-		71CCF21D1277045100339E12 /* media_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_memory.c; sourceTree = "<group>"; };
-		71CCF21E1277045100339E12 /* media_memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_memory.h; sourceTree = "<group>"; };
-		71CCF21F1277045100339E12 /* media_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_object.c; sourceTree = "<group>"; };
-		71CCF2201277045100339E12 /* media_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_sensor.c; sourceTree = "<group>"; };
-		71CCF2211277045100339E12 /* mpeg4_inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inline.c; sourceTree = "<group>"; };
-		71CCF2221277045100339E12 /* network_service.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = network_service.c; sourceTree = "<group>"; };
-		71CCF2231277045100339E12 /* object_browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_browser.c; sourceTree = "<group>"; };
-		71CCF2241277045100339E12 /* object_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_manager.c; sourceTree = "<group>"; };
-		71CCF2251277045100339E12 /* scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene.c; sourceTree = "<group>"; };
-		71CCF2261277045100339E12 /* svg_external.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_external.c; sourceTree = "<group>"; };
-		71CCF2271277045100339E12 /* term_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = term_node_init.c; sourceTree = "<group>"; };
 		71CCF2281277045100339E12 /* terminal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = terminal.c; sourceTree = "<group>"; };
 		71CCF22A1277045100339E12 /* base_encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_encoding.c; sourceTree = "<group>"; };
 		71CCF22B1277045100339E12 /* bitstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitstream.c; sourceTree = "<group>"; };
@@ -831,7 +828,6 @@
 		71CCF36912770A8C00339E12 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
 		71CCF36A12770A8C00339E12 /* download.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = download.h; sourceTree = "<group>"; };
 		71CCF36B12770A8C00339E12 /* dvb_mpe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dvb_mpe.h; sourceTree = "<group>"; };
-		71CCF36C12770A8C00339E12 /* esi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = esi.h; sourceTree = "<group>"; };
 		71CCF36D12770A8C00339E12 /* events.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events.h; sourceTree = "<group>"; };
 		71CCF36E12770A8C00339E12 /* filestreamer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filestreamer.h; sourceTree = "<group>"; };
 		71CCF36F12770A8C00339E12 /* ietf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ietf.h; sourceTree = "<group>"; };
@@ -854,7 +850,6 @@
 		71CCF38112770A8C00339E12 /* swf_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swf_dev.h; sourceTree = "<group>"; };
 		71CCF38212770A8C00339E12 /* terminal_dev.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terminal_dev.h; sourceTree = "<group>"; };
 		71CCF38312770A8C00339E12 /* vobsub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vobsub.h; sourceTree = "<group>"; };
-		71CCF38412770A8C00339E12 /* ismacryp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ismacryp.h; sourceTree = "<group>"; };
 		71CCF38512770A8C00339E12 /* iso639.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iso639.h; sourceTree = "<group>"; };
 		71CCF38612770A8C00339E12 /* isomedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = isomedia.h; sourceTree = "<group>"; };
 		71CCF38712770A8C00339E12 /* laser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = laser.h; sourceTree = "<group>"; };
@@ -904,139 +899,211 @@
 		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; };
+		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>"; };
+		8959AC81211C9C3C004D2C87 /* out_pipe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_pipe.c; path = ../../src/filters/out_pipe.c; sourceTree = "<group>"; };
+		8959AC82211C9C3C004D2C87 /* out_sock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_sock.c; path = ../../src/filters/out_sock.c; sourceTree = "<group>"; };
+		8959AC83211C9C3C004D2C87 /* rewrite_obu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_obu.c; path = ../../src/filters/rewrite_obu.c; sourceTree = "<group>"; };
+		8959AC8E211C9C77004D2C87 /* Remotery.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Remotery.c; sourceTree = "<group>"; };
 		896CBC862110598E00220377 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		896CBC8821105A6900220377 /* libaom.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libaom.a; path = ../../extra_lib/lib/iOS/libaom.a; sourceTree = "<group>"; };
-		9201D1101BD3FE11005E326A /* bifs_tests */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bifs_tests; sourceTree = "<group>"; };
-		9212E8021CCA82300036F310 /* amr_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = amr_in.c; path = ../../modules/amr_dec/amr_in.c; sourceTree = "<group>"; };
-		9214AD301D018197009D3CFD /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
-		9214AD321D0181A5009D3CFD /* ac3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ac3_in.c; path = ../../modules/ac3_in/ac3_in.c; sourceTree = "<group>"; };
-		9214AD331D0181A5009D3CFD /* liba52_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liba52_dec.c; path = ../../modules/ac3_in/liba52_dec.c; sourceTree = "<group>"; };
+		9210BA1C234A909400ED2DFF /* evg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = evg.c; path = ../../src/jsmods/evg.c; sourceTree = "<group>"; };
+		9212C0FC222D7B3700FE3580 /* vflip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vflip.c; path = ../../src/filters/vflip.c; sourceTree = "<group>"; };
 		921FEB9C1CF8664800B437C2 /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; };
 		921FEB9E1CF8665900B437C2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		921FEBA21CF881DE00B437C2 /* sensors_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sensors_def.h; path = ../../applications/osmo4_ios/sensors_def.h; sourceTree = "<group>"; };
 		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>"; };
-		9225CCA420343CDD00250C87 /* atsc_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = atsc_in.c; path = ../../modules/atsc_in/atsc_in.c; 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>"; };
+		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>"; };
 		922EB57A1AAE13C500DF46D0 /* html5_mse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = html5_mse.h; sourceTree = "<group>"; };
-		922EB57B1AAE13C500DF46D0 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = "<group>"; };
 		922EB57C1AAE13C500DF46D0 /* maths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = maths.h; sourceTree = "<group>"; };
 		922EB57D1AAE13C500DF46D0 /* revision.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = revision.h; sourceTree = "<group>"; };
 		922EB57E1AAE13C500DF46D0 /* version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = version.h; sourceTree = "<group>"; };
 		922EB57F1AAE13C500DF46D0 /* webvtt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = webvtt.h; sourceTree = "<group>"; };
+		92334CBE2333AB9900DA6051 /* libunicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = libunicode.c; path = ../../src/quickjs/libunicode.c; sourceTree = "<group>"; };
+		92334CC22333AB9900DA6051 /* quickjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = quickjs.c; path = ../../src/quickjs/quickjs.c; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
 		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>"; };
 		925FF2A41ABC53F30085B04C /* smjs_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = smjs_api.h; sourceTree = "<group>"; };
+		92734634235084A50081AF74 /* storage.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = storage.c; path = ../../src/jsmods/storage.c; sourceTree = "<group>"; };
+		9274295924647B98009ADD8D /* bsrw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bsrw.c; path = ../../src/filters/bsrw.c; sourceTree = "<group>"; };
+		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>"; };
+		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>"; };
 		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>"; };
+		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; };
 		9292BF021CFC94060070EB05 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-		9292BF061CFCAAAE0070EB05 /* vtb_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtb_decode.c; path = ../../modules/vtb_decode/vtb_decode.c; sourceTree = "<group>"; };
+		929383A62355AECE00AAAFA8 /* webgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = webgl.c; path = ../../src/jsmods/webgl.c; sourceTree = "<group>"; };
+		9296BF2322CFBB3900DC9742 /* reframe_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_flac.c; path = ../../src/filters/reframe_flac.c; sourceTree = "<group>"; };
+		929867782357A0DA008A2CC6 /* webgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = webgl.h; path = ../../src/jsmods/webgl.h; sourceTree = "<group>"; };
+		9298677E235A1587008A2CC6 /* gltools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gltools.c; sourceTree = "<group>"; };
 		929A929616EF8BC200B7C64F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../../applications/osmo4_ios/Resources/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; };
 		929A929716EF8BC200B7C64F /* icon_ipad_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad_retina.png; path = ../../applications/osmo4_ios/Resources/icon_ipad_retina.png; sourceTree = SOURCE_ROOT; };
 		929A929816EF8BC200B7C64F /* icon_ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_ipad.png; path = ../../applications/osmo4_ios/Resources/icon_ipad.png; sourceTree = SOURCE_ROOT; };
 		929A929916EF8BC200B7C64F /* icon_retina.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon_retina.png; path = ../../applications/osmo4_ios/Resources/icon_retina.png; sourceTree = SOURCE_ROOT; };
 		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>"; };
 		92B039F616F2050100B2568F /* libSDL2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSDL2.a; path = ../../extra_lib/lib/iOS/libSDL2.a; sourceTree = SOURCE_ROOT; };
-		92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt_smjs.c; sourceTree = "<group>"; };
-		92B32CA71A08AC130065F44A /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
-		92B32CA81A08AC130065F44A /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
-		92B69DB31A091CFC004E74AA /* h2b2vs.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = h2b2vs.js; sourceTree = "<group>"; };
-		92B69DB41A091CFC004E74AA /* H2B2VS.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = H2B2VS.png; sourceTree = "<group>"; };
-		92B69DB51A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
-		92B69DB71A091CFC004E74AA /* applications-multimedia.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "applications-multimedia.svg"; sourceTree = "<group>"; };
-		92B69DB81A091CFC004E74AA /* fileopen.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = fileopen.js; sourceTree = "<group>"; };
-		92B69DB91A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
-		92B69DBA1A091CFC004E74AA /* player.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = player.js; sourceTree = "<group>"; };
-		92B69DBB1A091CFC004E74AA /* playlist.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = playlist.js; sourceTree = "<group>"; };
-		92B69DBC1A091CFC004E74AA /* stats.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = stats.js; sourceTree = "<group>"; };
-		92B69DBE1A091CFC004E74AA /* applications-system.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "applications-system.svg"; sourceTree = "<group>"; };
-		92B69DBF1A091CFC004E74AA /* init.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = init.js; sourceTree = "<group>"; };
-		92B69DC01A091CFC004E74AA /* gui.bt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gui.bt; sourceTree = "<group>"; };
-		92B69DC11A091CFC004E74AA /* gui.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = gui.js; sourceTree = "<group>"; };
-		92B69DC41A091CFC004E74AA /* gwlib.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = gwlib.js; sourceTree = "<group>"; };
-		92B69DC61A091CFC004E74AA /* add.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = add.svg; sourceTree = "<group>"; };
-		92B69DC71A091CFC004E74AA /* app.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = app.svg; sourceTree = "<group>"; };
-		92B69DC81A091CFC004E74AA /* audio.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio.svg; sourceTree = "<group>"; };
-		92B69DC91A091CFC004E74AA /* audio_full.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio_full.svg; sourceTree = "<group>"; };
-		92B69DCA1A091CFC004E74AA /* audio_mute.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = audio_mute.svg; sourceTree = "<group>"; };
-		92B69DCB1A091CFC004E74AA /* check.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = check.svg; sourceTree = "<group>"; };
-		92B69DCC1A091CFC004E74AA /* close.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = close.svg; sourceTree = "<group>"; };
-		92B69DCD1A091CFC004E74AA /* cross.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = cross.svg; sourceTree = "<group>"; };
-		92B69DCE1A091CFC004E74AA /* down.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = down.svg; sourceTree = "<group>"; };
-		92B69DCF1A091CFC004E74AA /* expand.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = expand.svg; sourceTree = "<group>"; };
-		92B69DD01A091CFC004E74AA /* file.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = file.svg; sourceTree = "<group>"; };
-		92B69DD11A091CFC004E74AA /* film.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = film.svg; sourceTree = "<group>"; };
-		92B69DD21A091CFC004E74AA /* folder.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = folder.svg; sourceTree = "<group>"; };
-		92B69DD31A091CFC004E74AA /* harddrive.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = harddrive.svg; sourceTree = "<group>"; };
-		92B69DD41A091CFC004E74AA /* heart.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = heart.svg; sourceTree = "<group>"; };
-		92B69DD51A091CFC004E74AA /* home.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = home.svg; sourceTree = "<group>"; };
-		92B69DD61A091CFC004E74AA /* image.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = image.svg; sourceTree = "<group>"; };
-		92B69DD71A091CFC004E74AA /* info.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = info.svg; sourceTree = "<group>"; };
-		92B69DD81A091CFC004E74AA /* laptop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = laptop.svg; sourceTree = "<group>"; };
-		92B69DD91A091CFC004E74AA /* left.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = left.svg; sourceTree = "<group>"; };
-		92B69DDA1A091CFC004E74AA /* list.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = list.svg; sourceTree = "<group>"; };
-		92B69DDB1A091CFC004E74AA /* live.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = live.svg; sourceTree = "<group>"; };
-		92B69DDC1A091CFC004E74AA /* media_next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = media_next.svg; sourceTree = "<group>"; };
-		92B69DDD1A091CFC004E74AA /* media_prev.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = media_prev.svg; sourceTree = "<group>"; };
-		92B69DDE1A091CFC004E74AA /* monitor.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = monitor.svg; sourceTree = "<group>"; };
-		92B69DDF1A091CFC004E74AA /* more.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = more.svg; sourceTree = "<group>"; };
-		92B69DE01A091CFC004E74AA /* musical.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = musical.svg; sourceTree = "<group>"; };
-		92B69DE11A091CFC004E74AA /* navigation.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = navigation.svg; sourceTree = "<group>"; };
-		92B69DE21A091CFC004E74AA /* network.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = network.svg; sourceTree = "<group>"; };
-		92B69DE31A091CFC004E74AA /* next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = next.svg; sourceTree = "<group>"; };
-		92B69DE41A091CFC004E74AA /* osmo.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = osmo.svg; sourceTree = "<group>"; };
-		92B69DE51A091CFC004E74AA /* overflowing.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = overflowing.svg; sourceTree = "<group>"; };
-		92B69DE61A091CFC004E74AA /* pause.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pause.svg; sourceTree = "<group>"; };
-		92B69DE71A091CFC004E74AA /* pl_next.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pl_next.svg; sourceTree = "<group>"; };
-		92B69DE81A091CFC004E74AA /* pl_prev.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pl_prev.svg; sourceTree = "<group>"; };
-		92B69DE91A091CFC004E74AA /* play.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play.svg; sourceTree = "<group>"; };
-		92B69DEA1A091CFC004E74AA /* play_loop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_loop.svg; sourceTree = "<group>"; };
-		92B69DEB1A091CFC004E74AA /* play_shuffle.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_shuffle.svg; sourceTree = "<group>"; };
-		92B69DEC1A091CFC004E74AA /* play_single.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = play_single.svg; sourceTree = "<group>"; };
-		92B69DED1A091CFC004E74AA /* power.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = power.svg; sourceTree = "<group>"; };
-		92B69DEE1A091CFC004E74AA /* previous.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = previous.svg; sourceTree = "<group>"; };
-		92B69DEF1A091CFC004E74AA /* remove.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = remove.svg; sourceTree = "<group>"; };
-		92B69DF01A091CFC004E74AA /* resize.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = resize.svg; sourceTree = "<group>"; };
-		92B69DF11A091CFC004E74AA /* rewind.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = rewind.svg; sourceTree = "<group>"; };
-		92B69DF21A091CFC004E74AA /* right.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = right.svg; sourceTree = "<group>"; };
-		92B69DF31A091CFC004E74AA /* seek_forward.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = seek_forward.svg; sourceTree = "<group>"; };
-		92B69DF41A091CFC004E74AA /* shrink.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = shrink.svg; sourceTree = "<group>"; };
-		92B69DF51A091CFC004E74AA /* sort.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sort.svg; sourceTree = "<group>"; };
-		92B69DF61A091CFC004E74AA /* speed.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = speed.svg; sourceTree = "<group>"; };
-		92B69DF71A091CFC004E74AA /* star.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = star.svg; sourceTree = "<group>"; };
-		92B69DF81A091CFC004E74AA /* stop.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = stop.svg; sourceTree = "<group>"; };
-		92B69DF91A091CFC004E74AA /* stop2.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = stop2.svg; sourceTree = "<group>"; };
-		92B69DFA1A091CFC004E74AA /* trash.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = trash.svg; sourceTree = "<group>"; };
-		92B69DFB1A091CFC004E74AA /* tray.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tray.svg; sourceTree = "<group>"; };
-		92B69DFC1A091CFC004E74AA /* tv.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = tv.svg; sourceTree = "<group>"; };
-		92B69DFD1A091CFC004E74AA /* up.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = up.svg; sourceTree = "<group>"; };
-		92B69DFE1A091CFC004E74AA /* world.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = world.svg; sourceTree = "<group>"; };
-		92B69E011A091CFC004E74AA /* mpegu-core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "mpegu-core.js"; sourceTree = "<group>"; };
-		92B69EB61A091CFC004E74AA /* webvtt-renderer.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "webvtt-renderer.js"; sourceTree = "<group>"; };
-		92C7F1991AA8B48E00BA5B4C /* gui */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gui; path = ../../gui; sourceTree = "<group>"; };
-		92D127FD1BBADC7F00DA003B /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; name = shaders; path = ../../shaders; sourceTree = "<group>"; };
+		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>"; };
-		92DC362020B47FB600C48E39 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = ../../../src/crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
-		92DC362120B47FB600C48E39 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = ../../../src/crypto/tiny_aes.h; sourceTree = "<group>"; };
-		92DC362220B47FB600C48E39 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = ../../../src/crypto/g_crypt.c; sourceTree = "<group>"; };
-		92DC362320B47FB600C48E39 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = ../../../src/crypto/tiny_aes.c; sourceTree = "<group>"; };
-		92DC362420B47FB600C48E39 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = ../../../src/crypto/g_crypt_tinyaes.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>"; };
+		92D6C5A92343BF9400262217 /* vrml_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_js.c; sourceTree = "<group>"; };
+		92D6C5AA2343BF9400262217 /* dom_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_js.c; sourceTree = "<group>"; };
 		92DF5CA51BA6C6F80058A7BA /* iff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iff.c; sourceTree = "<group>"; };
-		92F8D46D1F713E5F00616F7C /* netctrl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = netctrl.c; path = ../../modules/netctrl/netctrl.c; sourceTree = "<group>"; };
+		92E9DF9D2215CE9900628420 /* g_crypt_tinyaes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_tinyaes.c; path = ../../src/crypto/g_crypt_tinyaes.c; sourceTree = "<group>"; };
+		92E9DF9E2215CE9900628420 /* tiny_aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tiny_aes.h; path = ../../src/crypto/tiny_aes.h; sourceTree = "<group>"; };
+		92E9DF9F2215CE9A00628420 /* tiny_aes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tiny_aes.c; path = ../../src/crypto/tiny_aes.c; sourceTree = "<group>"; };
+		92E9DFA02215CE9A00628420 /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt.c; path = ../../src/crypto/g_crypt.c; sourceTree = "<group>"; };
+		92E9DFA12215CE9A00628420 /* g_crypt_openssl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = g_crypt_openssl.c; path = ../../src/crypto/g_crypt_openssl.c; sourceTree = "<group>"; };
+		92E9DFA72215CEA600628420 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_rgb.c; path = ../../src/evg/raster_rgb.c; sourceTree = "<group>"; };
+		92E9DFA82215CEA700628420 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = ../../src/evg/stencil.c; sourceTree = "<group>"; };
+		92E9DFA92215CEA700628420 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgrays.c; path = ../../src/evg/ftgrays.c; sourceTree = "<group>"; };
+		92E9DFAA2215CEA700628420 /* raster_yuv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_yuv.c; path = ../../src/evg/raster_yuv.c; sourceTree = "<group>"; };
+		92E9DFAB2215CEA700628420 /* raster_argb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_argb.c; path = ../../src/evg/raster_argb.c; sourceTree = "<group>"; };
+		92E9DFAC2215CEA700628420 /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rast_soft.h; path = ../../src/evg/rast_soft.h; sourceTree = "<group>"; };
+		92E9DFAD2215CEA700628420 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = ../../src/evg/surface.c; sourceTree = "<group>"; };
+		92E9DFAE2215CEA700628420 /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_565.c; path = ../../src/evg/raster_565.c; sourceTree = "<group>"; };
+		92EB6D5F20E4E17F00A97A49 /* filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter.c; path = ../../src/filter_core/filter.c; sourceTree = "<group>"; };
+		92EB6D6020E4E17F00A97A49 /* filter_props.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_props.c; path = ../../src/filter_core/filter_props.c; sourceTree = "<group>"; };
+		92EB6D6120E4E17F00A97A49 /* filter_queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_queue.c; path = ../../src/filter_core/filter_queue.c; sourceTree = "<group>"; };
+		92EB6D6220E4E17F00A97A49 /* filter_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_session.c; path = ../../src/filter_core/filter_session.c; sourceTree = "<group>"; };
+		92EB6D6320E4E17F00A97A49 /* filter_pid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_pid.c; path = ../../src/filter_core/filter_pid.c; sourceTree = "<group>"; };
+		92EB6D6420E4E17F00A97A49 /* filter_register.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_register.c; path = ../../src/filter_core/filter_register.c; sourceTree = "<group>"; };
+		92EB6D6520E4E17F00A97A49 /* filter_session.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filter_session.h; path = ../../src/filter_core/filter_session.h; sourceTree = "<group>"; };
+		92EB6D6620E4E17F00A97A49 /* filter_pck.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filter_pck.c; path = ../../src/filter_core/filter_pck.c; sourceTree = "<group>"; };
+		92EB6D6F20E4E19200A97A49 /* mux_ts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_ts.c; path = ../../src/filters/mux_ts.c; sourceTree = "<group>"; };
+		92EB6D7020E4E19200A97A49 /* out_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_file.c; path = ../../src/filters/out_file.c; sourceTree = "<group>"; };
+		92EB6D7120E4E19200A97A49 /* ff_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_dec.c; path = ../../src/filters/ff_dec.c; sourceTree = "<group>"; };
+		92EB6D7220E4E19200A97A49 /* dec_bifs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_bifs.c; path = ../../src/filters/dec_bifs.c; sourceTree = "<group>"; };
+		92EB6D7320E4E19200A97A49 /* out_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_video.c; path = ../../src/filters/out_video.c; sourceTree = "<group>"; };
+		92EB6D7420E4E19200A97A49 /* dec_openhevc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_openhevc.c; path = ../../src/filters/dec_openhevc.c; sourceTree = "<group>"; };
+		92EB6D7520E4E19200A97A49 /* reframe_nalu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_nalu.c; path = ../../src/filters/reframe_nalu.c; sourceTree = "<group>"; };
+		92EB6D7620E4E19200A97A49 /* filelist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filelist.c; path = ../../src/filters/filelist.c; sourceTree = "<group>"; };
+		92EB6D7720E4E19200A97A49 /* dmx_mpegps.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_mpegps.c; path = ../../src/filters/dmx_mpegps.c; sourceTree = "<group>"; };
+		92EB6D7820E4E19200A97A49 /* reframe_rawvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_rawvid.c; path = ../../src/filters/reframe_rawvid.c; sourceTree = "<group>"; };
+		92EB6D7920E4E19200A97A49 /* write_qcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_qcp.c; path = ../../src/filters/write_qcp.c; sourceTree = "<group>"; };
+		92EB6D7A20E4E19200A97A49 /* ff_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_common.c; path = ../../src/filters/ff_common.c; sourceTree = "<group>"; };
+		92EB6D7B20E4E19200A97A49 /* dec_j2k.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_j2k.c; path = ../../src/filters/dec_j2k.c; sourceTree = "<group>"; };
+		92EB6D7C20E4E19200A97A49 /* inspect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = inspect.c; path = ../../src/filters/inspect.c; sourceTree = "<group>"; };
+		92EB6D7E20E4E19200A97A49 /* dec_ttxt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ttxt.c; path = ../../src/filters/dec_ttxt.c; sourceTree = "<group>"; };
+		92EB6D7F20E4E19300A97A49 /* dec_vtb_glctx.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dec_vtb_glctx.m; path = ../../src/filters/dec_vtb_glctx.m; sourceTree = "<group>"; };
+		92EB6D8020E4E19300A97A49 /* load_bt_xmt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_bt_xmt.c; path = ../../src/filters/load_bt_xmt.c; sourceTree = "<group>"; };
+		92EB6D8120E4E19300A97A49 /* rewrite_adts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_adts.c; path = ../../src/filters/rewrite_adts.c; sourceTree = "<group>"; };
+		92EB6D8220E4E19300A97A49 /* dec_webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_webvtt.c; path = ../../src/filters/dec_webvtt.c; sourceTree = "<group>"; };
+		92EB6D8320E4E19300A97A49 /* dmx_m2ts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_m2ts.c; path = ../../src/filters/dmx_m2ts.c; sourceTree = "<group>"; };
+		92EB6D8420E4E19300A97A49 /* reframe_amr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_amr.c; path = ../../src/filters/reframe_amr.c; sourceTree = "<group>"; };
+		92EB6D8520E4E19300A97A49 /* reframe_img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_img.c; path = ../../src/filters/reframe_img.c; sourceTree = "<group>"; };
+		92EB6D8620E4E19300A97A49 /* in_rtp_rtsp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_rtsp.c; path = ../../src/filters/in_rtp_rtsp.c; sourceTree = "<group>"; };
+		92EB6D8720E4E19300A97A49 /* out_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = out_audio.c; path = ../../src/filters/out_audio.c; sourceTree = "<group>"; };
+		92EB6D8820E4E19300A97A49 /* write_nhml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_nhml.c; path = ../../src/filters/write_nhml.c; sourceTree = "<group>"; };
+		92EB6D8920E4E19300A97A49 /* reframe_adts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_adts.c; path = ../../src/filters/reframe_adts.c; sourceTree = "<group>"; };
+		92EB6D8A20E4E19300A97A49 /* dmx_dash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_dash.c; path = ../../src/filters/dmx_dash.c; sourceTree = "<group>"; };
+		92EB6D8B20E4E19300A97A49 /* compose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = compose.c; path = ../../src/filters/compose.c; sourceTree = "<group>"; };
+		92EB6D8C20E4E19400A97A49 /* dmx_saf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_saf.c; path = ../../src/filters/dmx_saf.c; sourceTree = "<group>"; };
+		92EB6D8D20E4E19400A97A49 /* encrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = encrypt_cenc_isma.c; path = ../../src/filters/encrypt_cenc_isma.c; sourceTree = "<group>"; };
+		92EB6D8E20E4E19400A97A49 /* ff_rescale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_rescale.c; path = ../../src/filters/ff_rescale.c; sourceTree = "<group>"; };
+		92EB6D8F20E4E19400A97A49 /* enc_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enc_png.c; path = ../../src/filters/enc_png.c; sourceTree = "<group>"; };
+		92EB6D9020E4E19400A97A49 /* in_dvb4linux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_dvb4linux.c; path = ../../src/filters/in_dvb4linux.c; sourceTree = "<group>"; };
+		92EB6D9120E4E19400A97A49 /* in_rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp.c; path = ../../src/filters/in_rtp.c; sourceTree = "<group>"; };
+		92EB6D9220E4E19400A97A49 /* reframe_rawpcm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_rawpcm.c; path = ../../src/filters/reframe_rawpcm.c; sourceTree = "<group>"; };
+		92EB6D9320E4E19400A97A49 /* rewind.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewind.c; path = ../../src/filters/rewind.c; sourceTree = "<group>"; };
+		92EB6D9420E4E19400A97A49 /* dasher.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dasher.c; path = ../../src/filters/dasher.c; sourceTree = "<group>"; };
+		92EB6D9520E4E19400A97A49 /* dec_laser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_laser.c; path = ../../src/filters/dec_laser.c; sourceTree = "<group>"; };
+		92EB6D9620E4E19400A97A49 /* write_vtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_vtt.c; path = ../../src/filters/write_vtt.c; sourceTree = "<group>"; };
+		92EB6D9720E4E19400A97A49 /* isoffin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isoffin.h; path = ../../src/filters/isoffin.h; sourceTree = "<group>"; };
+		92EB6D9820E4E19400A97A49 /* dec_vorbis.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_vorbis.c; path = ../../src/filters/dec_vorbis.c; sourceTree = "<group>"; };
+		92EB6D9920E4E19400A97A49 /* isoffin_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_load.c; path = ../../src/filters/isoffin_load.c; sourceTree = "<group>"; };
+		92EB6D9A20E4E19500A97A49 /* mux_avi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_avi.c; path = ../../src/filters/mux_avi.c; sourceTree = "<group>"; };
+		92EB6D9B20E4E19500A97A49 /* dmx_avi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_avi.c; path = ../../src/filters/dmx_avi.c; sourceTree = "<group>"; };
+		92EB6D9C20E4E19500A97A49 /* isoffin_read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_read_ch.c; path = ../../src/filters/isoffin_read_ch.c; sourceTree = "<group>"; };
+		92EB6D9D20E4E19500A97A49 /* reframer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframer.c; path = ../../src/filters/reframer.c; sourceTree = "<group>"; };
+		92EB6D9E20E4E19500A97A49 /* rewrite_mp4v.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_mp4v.c; path = ../../src/filters/rewrite_mp4v.c; sourceTree = "<group>"; };
+		92EB6D9F20E4E19500A97A49 /* dmx_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_ogg.c; path = ../../src/filters/dmx_ogg.c; sourceTree = "<group>"; };
+		92EB6DA020E4E19500A97A49 /* dec_faad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_faad.c; path = ../../src/filters/dec_faad.c; sourceTree = "<group>"; };
+		92EB6DA120E4E19500A97A49 /* dmx_nhml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_nhml.c; path = ../../src/filters/dmx_nhml.c; sourceTree = "<group>"; };
+		92EB6DA220E4E19500A97A49 /* dec_img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_img.c; path = ../../src/filters/dec_img.c; sourceTree = "<group>"; };
+		92EB6DA320E4E19500A97A49 /* write_nhnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_nhnt.c; path = ../../src/filters/write_nhnt.c; sourceTree = "<group>"; };
+		92EB6DA420E4E19500A97A49 /* in_rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_stream.c; path = ../../src/filters/in_rtp_stream.c; sourceTree = "<group>"; };
+		92EB6DA520E4E19500A97A49 /* reframe_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mp3.c; path = ../../src/filters/reframe_mp3.c; sourceTree = "<group>"; };
+		92EB6DA620E4E19500A97A49 /* reframe_qcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_qcp.c; path = ../../src/filters/reframe_qcp.c; sourceTree = "<group>"; };
+		92EB6DA720E4E19600A97A49 /* dmx_vobsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_vobsub.c; path = ../../src/filters/dmx_vobsub.c; sourceTree = "<group>"; };
+		92EB6DA820E4E19600A97A49 /* dec_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_mad.c; path = ../../src/filters/dec_mad.c; sourceTree = "<group>"; };
+		92EB6DA920E4E19600A97A49 /* reframe_ac3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_ac3.c; path = ../../src/filters/reframe_ac3.c; sourceTree = "<group>"; };
+		92EB6DAA20E4E19600A97A49 /* write_generic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = write_generic.c; path = ../../src/filters/write_generic.c; sourceTree = "<group>"; };
+		92EB6DAB20E4E19600A97A49 /* dec_xvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_xvid.c; path = ../../src/filters/dec_xvid.c; sourceTree = "<group>"; };
+		92EB6DAC20E4E19600A97A49 /* ff_dmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_dmx.c; path = ../../src/filters/ff_dmx.c; sourceTree = "<group>"; };
+		92EB6DAD20E4E19600A97A49 /* load_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_text.c; path = ../../src/filters/load_text.c; sourceTree = "<group>"; };
+		92EB6DAE20E4E19600A97A49 /* in_rtp_sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_sdp.c; path = ../../src/filters/in_rtp_sdp.c; sourceTree = "<group>"; };
+		92EB6DAF20E4E19600A97A49 /* isoffin_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isoffin_read.c; path = ../../src/filters/isoffin_read.c; sourceTree = "<group>"; };
+		92EB6DB020E4E19600A97A49 /* dec_ac52.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_ac52.c; path = ../../src/filters/dec_ac52.c; sourceTree = "<group>"; };
+		92EB6DB120E4E19600A97A49 /* dmx_nhnt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dmx_nhnt.c; path = ../../src/filters/dmx_nhnt.c; sourceTree = "<group>"; };
+		92EB6DB220E4E19600A97A49 /* dec_odf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_odf.c; path = ../../src/filters/dec_odf.c; sourceTree = "<group>"; };
+		92EB6DB320E4E19600A97A49 /* mux_isom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mux_isom.c; path = ../../src/filters/mux_isom.c; sourceTree = "<group>"; };
+		92EB6DB420E4E19600A97A49 /* rewrite_nalu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rewrite_nalu.c; path = ../../src/filters/rewrite_nalu.c; sourceTree = "<group>"; };
+		92EB6DB520E4E19600A97A49 /* tileagg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tileagg.c; path = ../../src/filters/tileagg.c; sourceTree = "<group>"; };
+		92EB6DB620E4E19600A97A49 /* resample_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resample_audio.c; path = ../../src/filters/resample_audio.c; sourceTree = "<group>"; };
+		92EB6DB720E4E19600A97A49 /* load_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_svg.c; path = ../../src/filters/load_svg.c; sourceTree = "<group>"; };
+		92EB6DB820E4E19600A97A49 /* in_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_file.c; path = ../../src/filters/in_file.c; sourceTree = "<group>"; };
+		92EB6DB920E4E19600A97A49 /* dec_theora.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_theora.c; path = ../../src/filters/dec_theora.c; sourceTree = "<group>"; };
+		92EB6DBA20E4E19700A97A49 /* reframe_h263.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_h263.c; path = ../../src/filters/reframe_h263.c; sourceTree = "<group>"; };
+		92EB6DBB20E4E19700A97A49 /* reframe_mpgvid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reframe_mpgvid.c; path = ../../src/filters/reframe_mpgvid.c; sourceTree = "<group>"; };
+		92EB6DBC20E4E19700A97A49 /* vcrop.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vcrop.c; path = ../../src/filters/vcrop.c; sourceTree = "<group>"; };
+		92EB6DBD20E4E19700A97A49 /* ff_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ff_common.h; path = ../../src/filters/ff_common.h; sourceTree = "<group>"; };
+		92EB6DBE20E4E19700A97A49 /* decrypt_cenc_isma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = decrypt_cenc_isma.c; path = ../../src/filters/decrypt_cenc_isma.c; sourceTree = "<group>"; };
+		92EB6DBF20E4E19700A97A49 /* enc_jpg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = enc_jpg.c; path = ../../src/filters/enc_jpg.c; sourceTree = "<group>"; };
+		92EB6DC020E4E19700A97A49 /* dec_opensvc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_opensvc.c; path = ../../src/filters/dec_opensvc.c; sourceTree = "<group>"; };
+		92EB6DC120E4E19700A97A49 /* ff_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ff_enc.c; path = ../../src/filters/ff_enc.c; sourceTree = "<group>"; };
+		92EB6DC220E4E19700A97A49 /* in_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_http.c; path = ../../src/filters/in_http.c; sourceTree = "<group>"; };
+		92EB6DC320E4E19700A97A49 /* dec_vtb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dec_vtb.c; path = ../../src/filters/dec_vtb.c; sourceTree = "<group>"; };
+		92EB6DC420E4E19700A97A49 /* in_rtp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = in_rtp.h; path = ../../src/filters/in_rtp.h; sourceTree = "<group>"; };
+		92EB6DC520E4E19700A97A49 /* in_rtp_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = in_rtp_signaling.c; path = ../../src/filters/in_rtp_signaling.c; sourceTree = "<group>"; };
+		92EB6DC620E4E19700A97A49 /* unit_test_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unit_test_filter.c; path = ../../src/filters/unit_test_filter.c; sourceTree = "<group>"; };
+		92EB6E1F20E4E1A300A97A49 /* crypt_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crypt_tools.c; sourceTree = "<group>"; };
+		92EB6E2120E4E1B500A97A49 /* crypt_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt_tools.h; sourceTree = "<group>"; };
+		92EB6E2320E4E58D00A97A49 /* mpeg4_inputsensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inputsensor.c; sourceTree = "<group>"; };
+		92EB6E2420E4E58D00A97A49 /* mpeg4_inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inline.c; sourceTree = "<group>"; };
+		92EB6E2520E4E58D00A97A49 /* scene_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_node_init.c; sourceTree = "<group>"; };
+		92EB6E2620E4E58D00A97A49 /* svg_external.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_external.c; sourceTree = "<group>"; };
+		92EB6E2720E4E58D00A97A49 /* clock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clock.c; sourceTree = "<group>"; };
+		92EB6E2820E4E58E00A97A49 /* scene_ns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_ns.c; sourceTree = "<group>"; };
+		92EB6E2920E4E58E00A97A49 /* mpeg4_mediasensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_mediasensor.c; sourceTree = "<group>"; };
+		92EB6E2A20E4E58E00A97A49 /* scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene.c; sourceTree = "<group>"; };
+		92EB6E2B20E4E58E00A97A49 /* media_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_object.c; sourceTree = "<group>"; };
+		92EB6E2C20E4E58E00A97A49 /* mpeg4_mediacontrol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_mediacontrol.c; sourceTree = "<group>"; };
+		92EB6E2D20E4E58E00A97A49 /* object_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_manager.c; sourceTree = "<group>"; };
+		92EB6E3A20E4EBDB00A97A49 /* constants.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = constants.c; sourceTree = "<group>"; };
+		92EB6E3C20E4EC5600A97A49 /* libavdevice.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavdevice.a; path = ../../extra_lib/lib/iOS/libavdevice.a; sourceTree = "<group>"; };
+		92EB6E3F20E4EC9700A97A49 /* libavfilter.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavfilter.a; path = ../../extra_lib/lib/iOS/libavfilter.a; sourceTree = "<group>"; };
+		92EB6E4120E4ECD500A97A49 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		92F930841A5ADC1A0072A85C /* os_divers.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
 		92F930851A5ADC1A0072A85C /* os_file.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = os_file.c; sourceTree = "<group>"; };
-		92FA48881D059A820072C8A4 /* glcontext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = glcontext.m; path = ../../modules/vtb_decode/glcontext.m; sourceTree = "<group>"; };
 		92FA825916F2549D0002629E /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = SOURCE_ROOT; };
-		92FA825B16F254AF0002629E /* audio_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_filter.c; path = ../../modules/audio_filter/audio_filter.c; sourceTree = SOURCE_ROOT; };
-		92FA825D16F254C60002629E /* saf_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = saf_in.c; path = ../../modules/saf_in/saf_in.c; sourceTree = SOURCE_ROOT; };
-		92FA825F16F254DA0002629E /* isma_ea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isma_ea.c; path = ../../modules/ismacryp/isma_ea.c; sourceTree = SOURCE_ROOT; };
-		92FA826116F254F50002629E /* timedtext_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_dec.c; path = ../../modules/timedtext/timedtext_dec.c; sourceTree = SOURCE_ROOT; };
-		92FA826216F254F50002629E /* timedtext_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_in.c; path = ../../modules/timedtext/timedtext_in.c; sourceTree = SOURCE_ROOT; };
 		970A26C713434D2C0007362C /* m3u8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m3u8.c; sourceTree = "<group>"; };
 		970A26C813434D2C0007362C /* mpd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpd.c; sourceTree = "<group>"; };
 		970A26CB13434D780007362C /* m3u8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = m3u8.h; sourceTree = "<group>"; };
@@ -1044,14 +1111,8 @@
 		970A26CF13434D960007362C /* cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cache.h; sourceTree = "<group>"; };
 		970A26D013434D960007362C /* ringbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ringbuffer.h; sourceTree = "<group>"; };
 		970A26D113434D960007362C /* unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicode.h; sourceTree = "<group>"; };
-		970A26D513434DAC0007362C /* ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringbuffer.c; sourceTree = "<group>"; };
 		970A26D613434DAC0007362C /* unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unicode.c; sourceTree = "<group>"; };
 		970A270D1343540C0007362C /* libgcc_s.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgcc_s.1.dylib; path = usr/lib/libgcc_s.1.dylib; sourceTree = SDKROOT; };
-		970D981B16D6D0AE00FB0325 /* isom_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_cache.c; sourceTree = "<group>"; };
-		970FBA7B16F9F0720052216D /* html5_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media.c; sourceTree = "<group>"; };
-		970FBA7C16F9F0720052216D /* html5_mse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse.c; sourceTree = "<group>"; };
-		970FBA7F16F9F0910052216D /* html5_media_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media_smjs.c; sourceTree = "<group>"; };
-		970FBA8016F9F0920052216D /* html5_mse_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse_smjs.c; sourceTree = "<group>"; };
 		97116F201646E38D00BD1AD0 /* box_code_adobe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_adobe.c; sourceTree = "<group>"; };
 		9747B6EC14864C6400280D95 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ait.h; sourceTree = "<group>"; };
 		9747B6ED14864C6400280D95 /* dsmcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsmcc.h; sourceTree = "<group>"; };
@@ -1061,14 +1122,10 @@
 		976AF9991704C5C9004E9C00 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		97793E5015E6370D005123E1 /* dash_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_client.c; sourceTree = "<group>"; };
 		9793AE341704C0BD00E0C938 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		97A8DDC31896AFF300F4680F /* ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttml.c; sourceTree = "<group>"; };
 		97DB67C41627B22F00A7E054 /* dash_segmenter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_segmenter.c; sourceTree = "<group>"; };
 		97DDAFEE1569631900528219 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
 		97E08C68160F684B00BBDC34 /* swf_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swf_svg.c; sourceTree = "<group>"; };
 		97E29F6817D1138B00904FBF /* webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt.c; sourceTree = "<group>"; };
-		97E29F6D17D114E900904FBF /* mse_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mse_in.c; path = ../../modules/mse_in/mse_in.c; sourceTree = "<group>"; };
-		97E29F7917D118F100904FBF /* raw_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raw_video.c; path = ../../modules/raw_out/raw_video.c; sourceTree = "<group>"; };
-		97E29F7B17D1190600904FBF /* osd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osd.c; path = ../../modules/osd/osd.c; sourceTree = "<group>"; };
 		97FF065F138CE4C400D6C707 /* os_config_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_config_init.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1077,6 +1134,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				92EB6E4220E4ECD500A97A49 /* AVFoundation.framework in Frameworks */,
+				92EB6E4020E4EC9700A97A49 /* libavfilter.a in Frameworks */,
+				92EB6E3E20E4EC8600A97A49 /* libavdevice.a in Frameworks */,
 				896CBC8921105A6900220377 /* libaom.a in Frameworks */,
 				896CBC872110598E00220377 /* Security.framework in Frameworks */,
 				9292BF031CFC94060070EB05 /* CoreMedia.framework in Frameworks */,
@@ -1099,7 +1159,6 @@
 				0496F07716DD1A18009D9D8D /* libfaad.a in Frameworks */,
 				0496F07816DD1A18009D9D8D /* libfreetype.a in Frameworks */,
 				0496F07916DD1A18009D9D8D /* libjpeg.a in Frameworks */,
-				0496F07A16DD1A18009D9D8D /* libjs.a in Frameworks */,
 				0496F07B16DD1A18009D9D8D /* libmad.a in Frameworks */,
 				0496F07C16DD1A18009D9D8D /* libpng.a in Frameworks */,
 				71A19BB212797D1B00ACFF58 /* OpenGLES.framework in Frameworks */,
@@ -1124,27 +1183,17 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		28F2240B17D6372100E9D2BE /* ffmpeg_in */ = {
-			isa = PBXGroup;
-			children = (
-				28F2240917D636DA00E9D2BE /* ffmpeg_load.c */,
-				28F2240717D636C300E9D2BE /* ffmpeg_in.h */,
-				28F2240517D6369700E9D2BE /* ffmpeg_demux.c */,
-				28F2240317D6367000E9D2BE /* ffmpeg_decode.c */,
-			);
-			name = ffmpeg_in;
-			sourceTree = "<group>";
-		};
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
-				92C7F1991AA8B48E00BA5B4C /* gui */,
+				9281B62E21C92D00006B0FD5 /* gui */,
+				9281B62F21C92D00006B0FD5 /* shaders */,
 				71CCF1381277041D00339E12 /* libgpac */,
 				929A929516EF8A7500B7C64F /* modules */,
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
 				7184780712785F7B00917298 /* Frameworks */,
 				71CCF1321277037A00339E12 /* Products */,
-				92D3C62A2031ECD600BA1735 /* Recovered References */,
+				92EB6E3920E4E62200A97A49 /* Recovered References */,
 			);
 			name = CustomTemplate;
 			sourceTree = "<group>";
@@ -1152,6 +1201,9 @@
 		7184780712785F7B00917298 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				92EB6E4120E4ECD500A97A49 /* AVFoundation.framework */,
+				92EB6E3F20E4EC9700A97A49 /* libavfilter.a */,
+				92EB6E3C20E4EC5600A97A49 /* libavdevice.a */,
 				896CBC8821105A6900220377 /* libaom.a */,
 				896CBC862110598E00220377 /* Security.framework */,
 				9292BF021CFC94060070EB05 /* CoreMedia.framework */,
@@ -1191,80 +1243,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		71A199141278769100ACFF58 /* soft_raster */ = {
-			isa = PBXGroup;
-			children = (
-				71A199151278769100ACFF58 /* ftgrays.c */,
-				71A199171278769100ACFF58 /* rast_soft.h */,
-				71A199181278769100ACFF58 /* raster_565.c */,
-				71A199191278769100ACFF58 /* raster_argb.c */,
-				71A1991A1278769100ACFF58 /* raster_load.c */,
-				71A1991B1278769100ACFF58 /* raster_rgb.c */,
-				71A1991C1278769100ACFF58 /* stencil.c */,
-				71A1991D1278769100ACFF58 /* surface.c */,
-			);
-			name = soft_raster;
-			path = ../../modules/soft_raster;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A1993D127876E300ACFF58 /* img_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A1993E127876E300ACFF58 /* bmp_dec.c */,
-				71A1993F127876E300ACFF58 /* img_dec.c */,
-				71A19940127876E300ACFF58 /* img_in.c */,
-				71A19941127876E300ACFF58 /* img_in.h */,
-				71A19942127876E300ACFF58 /* jp2_dec.c */,
-				71A19943127876E300ACFF58 /* jpeg_dec.c */,
-				71A19945127876E300ACFF58 /* png_dec.c */,
-			);
-			name = img_in;
-			path = ../../modules/img_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A199531278770900ACFF58 /* isom_in */ = {
-			isa = PBXGroup;
-			children = (
-				970D981B16D6D0AE00FB0325 /* isom_cache.c */,
-				71A199551278770900ACFF58 /* isom_in.h */,
-				71A199561278770900ACFF58 /* load.c */,
-				71A199581278770900ACFF58 /* read.c */,
-				71A199591278770900ACFF58 /* read_ch.c */,
-			);
-			name = isom_in;
-			path = ../../modules/isom_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A1996A1278774A00ACFF58 /* rtp_in */ = {
-			isa = PBXGroup;
-			children = (
-				71A1996C1278774A00ACFF58 /* rtp_in.c */,
-				71A1996D1278774A00ACFF58 /* rtp_in.h */,
-				71A1996E1278774A00ACFF58 /* rtp_session.c */,
-				71A1996F1278774A00ACFF58 /* rtp_signaling.c */,
-				71A199701278774A00ACFF58 /* rtp_stream.c */,
-				71A199711278774A00ACFF58 /* sdp_fetch.c */,
-				71A199721278774A00ACFF58 /* sdp_load.c */,
-			);
-			name = rtp_in;
-			path = ../../modules/rtp_in;
-			sourceTree = SOURCE_ROOT;
-		};
-		71A199871278777A00ACFF58 /* widgetman */ = {
-			isa = PBXGroup;
-			children = (
-				71A199891278777A00ACFF58 /* unzip.c */,
-				71A1998A1278777A00ACFF58 /* unzip.h */,
-				71A1998B1278777A00ACFF58 /* wgt_load.c */,
-				71A1998C1278777A00ACFF58 /* wgt_load_base.js */,
-				71A1998D1278777A00ACFF58 /* widget.c */,
-				71A1998E1278777A00ACFF58 /* widgetman.c */,
-				71A1998F1278777A00ACFF58 /* widgetman.h */,
-			);
-			name = widgetman;
-			path = ../../modules/widgetman;
-			sourceTree = SOURCE_ROOT;
-		};
 		71A199981278778800ACFF58 /* sdl_out */ = {
 			isa = PBXGroup;
 			children = (
@@ -1284,8 +1262,6 @@
 				921FEBA21CF881DE00B437C2 /* sensors_def.h */,
 				921FEBA31CF881DE00B437C2 /* sensors.h */,
 				921FEBA41CF881DE00B437C2 /* sensors.m */,
-				92D127FD1BBADC7F00DA003B /* shaders */,
-				92B69DB01A091CFC004E74AA /* gui */,
 				929A929616EF8BC200B7C64F /* Default-568h@2x.png */,
 				929A929716EF8BC200B7C64F /* icon_ipad_retina.png */,
 				929A929816EF8BC200B7C64F /* icon_ipad.png */,
@@ -1314,12 +1290,17 @@
 				71CCF35E12770A8C00339E12 /* include */,
 				71CCF1391277045100339E12 /* bifs */,
 				71CCF14A1277045100339E12 /* compositor */,
-				9273F71320B47F4D00DADC67 /* crypto */,
+				92E9DF9B2215CE6D00628420 /* crypto */,
+				92E9DF9C2215CE7400628420 /* evg */,
+				92EB6D5D20E4E15A00A97A49 /* filter_core */,
+				92EB6D5E20E4E16700A97A49 /* filters */,
 				71CCF1911277045100339E12 /* ietf */,
 				71CCF19F1277045100339E12 /* isomedia */,
+				92D6C5A32343BF5000262217 /* jsmods */,
 				71CCF1B91277045100339E12 /* laser */,
 				71CCF1CD1277045100339E12 /* media_tools */,
 				71CCF1E11277045100339E12 /* odf */,
+				92334CBB2333AB8200DA6051 /* quickjs */,
 				71CCF1EF1277045100339E12 /* scene_manager */,
 				71CCF1FD1277045100339E12 /* scenegraph */,
 				71CCF2141277045100339E12 /* terminal */,
@@ -1355,6 +1336,17 @@
 		71CCF14A1277045100339E12 /* compositor */ = {
 			isa = PBXGroup;
 			children = (
+				92EB6E2720E4E58D00A97A49 /* clock.c */,
+				92EB6E2B20E4E58E00A97A49 /* media_object.c */,
+				92EB6E2420E4E58D00A97A49 /* mpeg4_inline.c */,
+				92EB6E2320E4E58D00A97A49 /* mpeg4_inputsensor.c */,
+				92EB6E2C20E4E58E00A97A49 /* mpeg4_mediacontrol.c */,
+				92EB6E2920E4E58E00A97A49 /* mpeg4_mediasensor.c */,
+				92EB6E2D20E4E58E00A97A49 /* object_manager.c */,
+				92EB6E2520E4E58D00A97A49 /* scene_node_init.c */,
+				92EB6E2820E4E58E00A97A49 /* scene_ns.c */,
+				92EB6E2A20E4E58E00A97A49 /* scene.c */,
+				92EB6E2620E4E58D00A97A49 /* svg_external.c */,
 				71CCF14B1277045100339E12 /* audio_input.c */,
 				71CCF14C1277045100339E12 /* audio_mixer.c */,
 				71CCF14D1277045100339E12 /* audio_render.c */,
@@ -1454,8 +1446,6 @@
 		71CCF19F1277045100339E12 /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
-				92DF5CA51BA6C6F80058A7BA /* iff.c */,
-				97A8DDC31896AFF300F4680F /* ttml.c */,
 				97116F201646E38D00BD1AD0 /* box_code_adobe.c */,
 				71CCF1A01277045100339E12 /* avc_ext.c */,
 				71CCF1A11277045100339E12 /* box_code_3gpp.c */,
@@ -1469,6 +1459,7 @@
 				71CCF1A91277045100339E12 /* hint_track.c */,
 				71CCF1AA1277045100339E12 /* hinting.c */,
 				71CCF1AB1277045100339E12 /* drm_sample.c */,
+				92DF5CA51BA6C6F80058A7BA /* iff.c */,
 				71CCF1AC1277045100339E12 /* isom_intern.c */,
 				71CCF1AD1277045100339E12 /* isom_read.c */,
 				71CCF1AE1277045100339E12 /* isom_store.c */,
@@ -1501,10 +1492,9 @@
 		71CCF1CD1277045100339E12 /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				92EB6E1F20E4E1A300A97A49 /* crypt_tools.c */,
 				92D3C62B2031ECE600BA1735 /* atsc_dmx.c */,
 				97E29F6817D1138B00904FBF /* webvtt.c */,
-				970FBA7B16F9F0720052216D /* html5_media.c */,
-				970FBA7C16F9F0720052216D /* html5_mse.c */,
 				97DB67C41627B22F00A7E054 /* dash_segmenter.c */,
 				97793E5015E6370D005123E1 /* dash_client.c */,
 				9747B6F214864C7800280D95 /* ait.c */,
@@ -1514,10 +1504,8 @@
 				71CCF1CE1277045100339E12 /* av_parsers.c */,
 				71CCF1CF1277045100339E12 /* avilib.c */,
 				71CCF1D01277045100339E12 /* dvb_mpe.c */,
-				71CCF1D11277045100339E12 /* filestreamer.c */,
 				71CCF1D21277045100339E12 /* gpac_ogg.c */,
 				71CCF1D31277045100339E12 /* img.c */,
-				71CCF1D41277045100339E12 /* ismacryp.c */,
 				71CCF1D51277045100339E12 /* isom_hinter.c */,
 				71CCF1D61277045100339E12 /* isom_tools.c */,
 				71CCF1D71277045100339E12 /* m2ts_mux.c */,
@@ -1528,7 +1516,6 @@
 				71CCF1DC1277045100339E12 /* mpegts.c */,
 				71CCF1DD1277045100339E12 /* reedsolomon.c */,
 				71CCF1DE1277045100339E12 /* saf.c */,
-				71CCF1DF1277045100339E12 /* text_import.c */,
 				71CCF1E01277045100339E12 /* vobsub.c */,
 			);
 			name = media_tools;
@@ -1581,30 +1568,26 @@
 		71CCF1FD1277045100339E12 /* scenegraph */ = {
 			isa = PBXGroup;
 			children = (
-				92B32CA31A08ABBF0065F44A /* webvtt_smjs.c */,
-				970FBA7F16F9F0910052216D /* html5_media_smjs.c */,
-				970FBA8016F9F0920052216D /* html5_mse_smjs.c */,
 				71CCF1FE1277045100339E12 /* base_scenegraph.c */,
 				71CCF1FF1277045100339E12 /* commands.c */,
 				71CCF2001277045100339E12 /* dom_events.c */,
-				71CCF2011277045100339E12 /* dom_smjs.c */,
+				92D6C5AA2343BF9400262217 /* dom_js.c */,
 				71CCF2021277045100339E12 /* mpeg4_animators.c */,
 				71CCF2031277045100339E12 /* mpeg4_nodes.c */,
 				71CCF2041277045100339E12 /* mpeg4_valuator.c */,
 				71CCF2051277045100339E12 /* smil_anim.c */,
 				71CCF2061277045100339E12 /* smil_timing.c */,
 				71CCF2071277045100339E12 /* svg_attributes.c */,
+				92D6C5A82343BF9400262217 /* svg_js.c */,
 				71CCF2081277045100339E12 /* svg_properties.c */,
-				71CCF2091277045100339E12 /* svg_smjs.c */,
 				71CCF20A1277045100339E12 /* svg_types.c */,
 				71CCF20B1277045100339E12 /* vrml_interpolators.c */,
+				92D6C5A92343BF9400262217 /* vrml_js.c */,
 				71CCF20C1277045100339E12 /* vrml_proto.c */,
 				71CCF20D1277045100339E12 /* vrml_route.c */,
 				71CCF20E1277045100339E12 /* vrml_script.c */,
-				71CCF20F1277045100339E12 /* vrml_smjs.c */,
 				71CCF2101277045100339E12 /* vrml_tools.c */,
 				71CCF2111277045100339E12 /* x3d_nodes.c */,
-				71CCF2121277045100339E12 /* xbl_process.c */,
 				71CCF2131277045100339E12 /* xml_ns.c */,
 			);
 			name = scenegraph;
@@ -1614,25 +1597,6 @@
 		71CCF2141277045100339E12 /* terminal */ = {
 			isa = PBXGroup;
 			children = (
-				71CCF2151277045100339E12 /* channel.c */,
-				71CCF2161277045100339E12 /* clock.c */,
-				71CCF2171277045100339E12 /* decoder.c */,
-				71CCF2181277045100339E12 /* input_sensor.c */,
-				71CCF2191277045100339E12 /* input_sensor.h */,
-				71CCF21A1277045100339E12 /* media_control.c */,
-				71CCF21B1277045100339E12 /* media_control.h */,
-				71CCF21C1277045100339E12 /* media_manager.c */,
-				71CCF21D1277045100339E12 /* media_memory.c */,
-				71CCF21E1277045100339E12 /* media_memory.h */,
-				71CCF21F1277045100339E12 /* media_object.c */,
-				71CCF2201277045100339E12 /* media_sensor.c */,
-				71CCF2211277045100339E12 /* mpeg4_inline.c */,
-				71CCF2221277045100339E12 /* network_service.c */,
-				71CCF2231277045100339E12 /* object_browser.c */,
-				71CCF2241277045100339E12 /* object_manager.c */,
-				71CCF2251277045100339E12 /* scene.c */,
-				71CCF2261277045100339E12 /* svg_external.c */,
-				71CCF2271277045100339E12 /* term_node_init.c */,
 				71CCF2281277045100339E12 /* terminal.c */,
 			);
 			name = terminal;
@@ -1642,11 +1606,9 @@
 		71CCF2291277045100339E12 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				92F930841A5ADC1A0072A85C /* os_divers.c */,
-				92F930851A5ADC1A0072A85C /* os_file.c */,
-				97DDAFEE1569631900528219 /* sha1.c */,
+				8959AC8E211C9C77004D2C87 /* Remotery.c */,
+				92EB6E3A20E4EBDB00A97A49 /* constants.c */,
 				97FF065F138CE4C400D6C707 /* os_config_init.c */,
-				970A26D513434DAC0007362C /* ringbuffer.c */,
 				970A26D613434DAC0007362C /* unicode.c */,
 				7147425F12B918C900DB5A59 /* cache.c */,
 				7141FF2F1292CB9200FCB27D /* alloc.c */,
@@ -1656,9 +1618,13 @@
 				71CCF22D1277045100339E12 /* configfile.c */,
 				71CCF22F1277045100339E12 /* downloader.c */,
 				71CCF2301277045100339E12 /* error.c */,
+				929DE74824183FB40056AFA7 /* gzio.c */,
+				9298677E235A1587008A2CC6 /* gltools.c */,
 				71CCF2321277045100339E12 /* list.c */,
 				71CCF2331277045100339E12 /* math.c */,
 				71CCF2341277045100339E12 /* module.c */,
+				92F930841A5ADC1A0072A85C /* os_divers.c */,
+				92F930851A5ADC1A0072A85C /* os_file.c */,
 				71CCF2351277045100339E12 /* module_wrap.h */,
 				71CCF2361277045100339E12 /* os_file.c */,
 				71CCF2371277045100339E12 /* os_module.c */,
@@ -1666,6 +1632,7 @@
 				71CCF2391277045100339E12 /* os_thread.c */,
 				71CCF23A1277045100339E12 /* path2d.c */,
 				71CCF23B1277045100339E12 /* path2d_stroker.c */,
+				97DDAFEE1569631900528219 /* sha1.c */,
 				71CCF23E1277045100339E12 /* token.c */,
 				71CCF23F1277045100339E12 /* uni_bidi.c */,
 				71CCF2401277045100339E12 /* url.c */,
@@ -1690,10 +1657,10 @@
 		71CCF35F12770A8C00339E12 /* gpac */ = {
 			isa = PBXGroup;
 			children = (
+				92EB6E2120E4E1B500A97A49 /* crypt_tools.h */,
 				922EB5781AAE13C500DF46D0 /* dash.h */,
 				922EB5791AAE13C500DF46D0 /* html5_media.h */,
 				922EB57A1AAE13C500DF46D0 /* html5_mse.h */,
-				922EB57B1AAE13C500DF46D0 /* map.h */,
 				922EB57C1AAE13C500DF46D0 /* maths.h */,
 				922EB57D1AAE13C500DF46D0 /* revision.h */,
 				922EB57E1AAE13C500DF46D0 /* version.h */,
@@ -1716,12 +1683,10 @@
 				71CCF36912770A8C00339E12 /* crypt.h */,
 				71CCF36A12770A8C00339E12 /* download.h */,
 				71CCF36B12770A8C00339E12 /* dvb_mpe.h */,
-				71CCF36C12770A8C00339E12 /* esi.h */,
 				71CCF36D12770A8C00339E12 /* events.h */,
 				71CCF36E12770A8C00339E12 /* filestreamer.h */,
 				71CCF36F12770A8C00339E12 /* ietf.h */,
 				71CCF37012770A8C00339E12 /* internal */,
-				71CCF38412770A8C00339E12 /* ismacryp.h */,
 				71CCF38512770A8C00339E12 /* iso639.h */,
 				71CCF38612770A8C00339E12 /* isomedia.h */,
 				71CCF38712770A8C00339E12 /* laser.h */,
@@ -1806,212 +1771,212 @@
 			path = modules;
 			sourceTree = "<group>";
 		};
-		9273F71320B47F4D00DADC67 /* crypto */ = {
+		92334CBB2333AB8200DA6051 /* quickjs */ = {
 			isa = PBXGroup;
 			children = (
-				92DC362020B47FB600C48E39 /* g_crypt_openssl.c */,
-				92DC362420B47FB600C48E39 /* g_crypt_tinyaes.c */,
-				92DC362220B47FB600C48E39 /* g_crypt.c */,
-				92DC362320B47FB600C48E39 /* tiny_aes.c */,
-				92DC362120B47FB600C48E39 /* tiny_aes.h */,
+				923EB53323D1B87E00E1FFA1 /* libbf.c */,
+				92334CC92333AB9900DA6051 /* cutils.c */,
+				92334CCA2333AB9A00DA6051 /* libregexp.c */,
+				92334CBE2333AB9900DA6051 /* libunicode.c */,
+				92334CC22333AB9900DA6051 /* quickjs.c */,
+				92334CCC2333AB9A00DA6051 /* quickjs.h */,
 			);
-			path = crypto;
+			name = quickjs;
 			sourceTree = "<group>";
 		};
 		929A929516EF8A7500B7C64F /* modules */ = {
 			isa = PBXGroup;
 			children = (
-				9225CCA420343CDD00250C87 /* atsc_in.c */,
-				9214AD321D0181A5009D3CFD /* ac3_in.c */,
-				9214AD301D018197009D3CFD /* aac_in.c */,
-				9212E8021CCA82300036F310 /* amr_in.c */,
-				92FA825B16F254AF0002629E /* audio_filter.c */,
-				71A1990E1278767B00ACFF58 /* bifs_dec.c */,
-				71A1992D127876B000ACFF58 /* ctx_load.c */,
-				71A19928127876A200ACFF58 /* dummy_in.c */,
-				71A199081278765600ACFF58 /* faad_dec.c */,
-				28F2240B17D6372100E9D2BE /* ffmpeg_in */,
 				71A199811278776700ACFF58 /* ft_font.c */,
 				71A199821278776700ACFF58 /* ft_font.h */,
-				71A1994F127876FA00ACFF58 /* gpac_js.c */,
-				71A1993D127876E300ACFF58 /* img_in */,
-				92FA825F16F254DA0002629E /* isma_ea.c */,
-				71A199531278770900ACFF58 /* isom_in */,
-				71A199611278772500ACFF58 /* laser_dec.c */,
-				9214AD331D0181A5009D3CFD /* liba52_dec.c */,
-				71A19937127876D300ACFF58 /* mad_dec.c */,
-				71A19939127876D300ACFF58 /* mp3_in.c */,
-				71179CBF1292EC1800A83216 /* mpd_in.c */,
-				71A1997D1278775900ACFF58 /* mpegts_in.c */,
-				97E29F6D17D114E900904FBF /* mse_in.c */,
-				92F8D46D1F713E5F00616F7C /* netctrl.c */,
-				71A199671278773900ACFF58 /* odf_dec.c */,
-				97E29F7B17D1190600904FBF /* osd.c */,
-				97E29F7917D118F100904FBF /* raw_video.c */,
-				71A1996A1278774A00ACFF58 /* rtp_in */,
-				92FA825D16F254C60002629E /* saf_in.c */,
 				71A199981278778800ACFF58 /* sdl_out */,
-				71A199141278769100ACFF58 /* soft_raster */,
-				71A19933127876C300ACFF58 /* svg_in.c */,
-				92FA826116F254F50002629E /* timedtext_dec.c */,
-				92FA826216F254F50002629E /* timedtext_in.c */,
 				92FA825916F2549D0002629E /* validator.c */,
-				92FA488A1D05DADC0072C8A4 /* vtb_decoder */,
-				92B32CA61A08ABF10065F44A /* vtt */,
-				71A199871278777A00ACFF58 /* widgetman */,
 			);
 			name = modules;
 			sourceTree = "<group>";
 		};
-		92B32CA61A08ABF10065F44A /* vtt */ = {
-			isa = PBXGroup;
-			children = (
-				92B32CA71A08AC130065F44A /* vtt_dec.c */,
-				92B32CA81A08AC130065F44A /* vtt_in.c */,
-			);
-			name = vtt;
-			sourceTree = "<group>";
-		};
-		92B69DB01A091CFC004E74AA /* gui */ = {
-			isa = PBXGroup;
-			children = (
-				92B69DB11A091CFC004E74AA /* extensions */,
-				92B69DC01A091CFC004E74AA /* gui.bt */,
-				92B69DC11A091CFC004E74AA /* gui.js */,
-				92B69DC41A091CFC004E74AA /* gwlib.js */,
-				92B69DC51A091CFC004E74AA /* icons */,
-				92B69E011A091CFC004E74AA /* mpegu-core.js */,
-				92B69EB61A091CFC004E74AA /* webvtt-renderer.js */,
-			);
-			name = gui;
-			path = ../../gui;
-			sourceTree = "<group>";
-		};
-		92B69DB11A091CFC004E74AA /* extensions */ = {
+		92D6C5A32343BF5000262217 /* jsmods */ = {
 			isa = PBXGroup;
 			children = (
-				9201D1101BD3FE11005E326A /* bifs_tests */,
-				92B69DB21A091CFC004E74AA /* H2B2VS */,
-				92B69DB61A091CFC004E74AA /* player */,
-				92B69DBD1A091CFC004E74AA /* widget_manager */,
+				929867782357A0DA008A2CC6 /* webgl.h */,
+				9210BA1C234A909400ED2DFF /* evg.c */,
+				92D6C5A52343BF6A00262217 /* scene_js.c */,
+				92734634235084A50081AF74 /* storage.c */,
+				929383A62355AECE00AAAFA8 /* webgl.c */,
+				92D6C5A42343BF6A00262217 /* xhr.c */,
 			);
-			path = extensions;
+			name = jsmods;
 			sourceTree = "<group>";
 		};
-		92B69DB21A091CFC004E74AA /* H2B2VS */ = {
+		92E9DF9B2215CE6D00628420 /* crypto */ = {
 			isa = PBXGroup;
 			children = (
-				92B69DB31A091CFC004E74AA /* h2b2vs.js */,
-				92B69DB41A091CFC004E74AA /* H2B2VS.png */,
-				92B69DB51A091CFC004E74AA /* init.js */,
+				92E9DFA12215CE9A00628420 /* g_crypt_openssl.c */,
+				92E9DF9D2215CE9900628420 /* g_crypt_tinyaes.c */,
+				92E9DFA02215CE9A00628420 /* g_crypt.c */,
+				92E9DF9F2215CE9A00628420 /* tiny_aes.c */,
+				92E9DF9E2215CE9900628420 /* tiny_aes.h */,
 			);
-			path = H2B2VS;
+			name = crypto;
 			sourceTree = "<group>";
 		};
-		92B69DB61A091CFC004E74AA /* player */ = {
+		92E9DF9C2215CE7400628420 /* evg */ = {
 			isa = PBXGroup;
 			children = (
-				92B69DB71A091CFC004E74AA /* applications-multimedia.svg */,
-				92B69DB81A091CFC004E74AA /* fileopen.js */,
-				92B69DB91A091CFC004E74AA /* init.js */,
-				92B69DBA1A091CFC004E74AA /* player.js */,
-				92B69DBB1A091CFC004E74AA /* playlist.js */,
-				92B69DBC1A091CFC004E74AA /* stats.js */,
+				92852442237ACC2700165130 /* raster3d.c */,
+				92E9DFA92215CEA700628420 /* ftgrays.c */,
+				92E9DFAC2215CEA700628420 /* rast_soft.h */,
+				92E9DFAE2215CEA700628420 /* raster_565.c */,
+				92E9DFAB2215CEA700628420 /* raster_argb.c */,
+				92E9DFA72215CEA600628420 /* raster_rgb.c */,
+				92E9DFAA2215CEA700628420 /* raster_yuv.c */,
+				92E9DFA82215CEA700628420 /* stencil.c */,
+				92E9DFAD2215CEA700628420 /* surface.c */,
 			);
-			path = player;
+			name = evg;
 			sourceTree = "<group>";
 		};
-		92B69DBD1A091CFC004E74AA /* widget_manager */ = {
+		92EB6D5D20E4E15A00A97A49 /* filter_core */ = {
 			isa = PBXGroup;
 			children = (
-				92B69DBE1A091CFC004E74AA /* applications-system.svg */,
-				92B69DBF1A091CFC004E74AA /* init.js */,
+				92EB6D6620E4E17F00A97A49 /* filter_pck.c */,
+				92EB6D6320E4E17F00A97A49 /* filter_pid.c */,
+				92EB6D6020E4E17F00A97A49 /* filter_props.c */,
+				92EB6D6120E4E17F00A97A49 /* filter_queue.c */,
+				92EB6D6420E4E17F00A97A49 /* filter_register.c */,
+				92EB6D6220E4E17F00A97A49 /* filter_session.c */,
+				92EB6D6520E4E17F00A97A49 /* filter_session.h */,
+				92EB6D5F20E4E17F00A97A49 /* filter.c */,
 			);
-			path = widget_manager;
+			name = filter_core;
 			sourceTree = "<group>";
 		};
-		92B69DC51A091CFC004E74AA /* icons */ = {
+		92EB6D5E20E4E16700A97A49 /* filters */ = {
 			isa = PBXGroup;
 			children = (
-				92B69DC61A091CFC004E74AA /* add.svg */,
-				92B69DC71A091CFC004E74AA /* app.svg */,
-				92B69DC81A091CFC004E74AA /* audio.svg */,
-				92B69DC91A091CFC004E74AA /* audio_full.svg */,
-				92B69DCA1A091CFC004E74AA /* audio_mute.svg */,
-				92B69DCB1A091CFC004E74AA /* check.svg */,
-				92B69DCC1A091CFC004E74AA /* close.svg */,
-				92B69DCD1A091CFC004E74AA /* cross.svg */,
-				92B69DCE1A091CFC004E74AA /* down.svg */,
-				92B69DCF1A091CFC004E74AA /* expand.svg */,
-				92B69DD01A091CFC004E74AA /* file.svg */,
-				92B69DD11A091CFC004E74AA /* film.svg */,
-				92B69DD21A091CFC004E74AA /* folder.svg */,
-				92B69DD31A091CFC004E74AA /* harddrive.svg */,
-				92B69DD41A091CFC004E74AA /* heart.svg */,
-				92B69DD51A091CFC004E74AA /* home.svg */,
-				92B69DD61A091CFC004E74AA /* image.svg */,
-				92B69DD71A091CFC004E74AA /* info.svg */,
-				92B69DD81A091CFC004E74AA /* laptop.svg */,
-				92B69DD91A091CFC004E74AA /* left.svg */,
-				92B69DDA1A091CFC004E74AA /* list.svg */,
-				92B69DDB1A091CFC004E74AA /* live.svg */,
-				92B69DDC1A091CFC004E74AA /* media_next.svg */,
-				92B69DDD1A091CFC004E74AA /* media_prev.svg */,
-				92B69DDE1A091CFC004E74AA /* monitor.svg */,
-				92B69DDF1A091CFC004E74AA /* more.svg */,
-				92B69DE01A091CFC004E74AA /* musical.svg */,
-				92B69DE11A091CFC004E74AA /* navigation.svg */,
-				92B69DE21A091CFC004E74AA /* network.svg */,
-				92B69DE31A091CFC004E74AA /* next.svg */,
-				92B69DE41A091CFC004E74AA /* osmo.svg */,
-				92B69DE51A091CFC004E74AA /* overflowing.svg */,
-				92B69DE61A091CFC004E74AA /* pause.svg */,
-				92B69DE71A091CFC004E74AA /* pl_next.svg */,
-				92B69DE81A091CFC004E74AA /* pl_prev.svg */,
-				92B69DE91A091CFC004E74AA /* play.svg */,
-				92B69DEA1A091CFC004E74AA /* play_loop.svg */,
-				92B69DEB1A091CFC004E74AA /* play_shuffle.svg */,
-				92B69DEC1A091CFC004E74AA /* play_single.svg */,
-				92B69DED1A091CFC004E74AA /* power.svg */,
-				92B69DEE1A091CFC004E74AA /* previous.svg */,
-				92B69DEF1A091CFC004E74AA /* remove.svg */,
-				92B69DF01A091CFC004E74AA /* resize.svg */,
-				92B69DF11A091CFC004E74AA /* rewind.svg */,
-				92B69DF21A091CFC004E74AA /* right.svg */,
-				92B69DF31A091CFC004E74AA /* seek_forward.svg */,
-				92B69DF41A091CFC004E74AA /* shrink.svg */,
-				92B69DF51A091CFC004E74AA /* sort.svg */,
-				92B69DF61A091CFC004E74AA /* speed.svg */,
-				92B69DF71A091CFC004E74AA /* star.svg */,
-				92B69DF81A091CFC004E74AA /* stop.svg */,
-				92B69DF91A091CFC004E74AA /* stop2.svg */,
-				92B69DFA1A091CFC004E74AA /* trash.svg */,
-				92B69DFB1A091CFC004E74AA /* tray.svg */,
-				92B69DFC1A091CFC004E74AA /* tv.svg */,
-				92B69DFD1A091CFC004E74AA /* up.svg */,
-				92B69DFE1A091CFC004E74AA /* world.svg */,
+				9274295924647B98009ADD8D /* bsrw.c */,
+				92EB6D8B20E4E19300A97A49 /* compose.c */,
+				92EB6D9420E4E19400A97A49 /* dasher.c */,
+				92EB6DB020E4E19600A97A49 /* dec_ac52.c */,
+				92EB6D7220E4E19200A97A49 /* dec_bifs.c */,
+				92EB6DA020E4E19500A97A49 /* dec_faad.c */,
+				92EB6DA220E4E19500A97A49 /* dec_img.c */,
+				92EB6D7B20E4E19200A97A49 /* dec_j2k.c */,
+				92EB6D9520E4E19400A97A49 /* dec_laser.c */,
+				92EB6DA820E4E19600A97A49 /* dec_mad.c */,
+				92EB6DB220E4E19600A97A49 /* dec_odf.c */,
+				92EB6D7420E4E19200A97A49 /* dec_openhevc.c */,
+				92EB6DC020E4E19700A97A49 /* dec_opensvc.c */,
+				92EB6DB920E4E19600A97A49 /* dec_theora.c */,
+				922B2773244625B0001D4F72 /* dec_ttml.c */,
+				92EB6D7E20E4E19200A97A49 /* dec_ttxt.c */,
+				92EB6D9820E4E19400A97A49 /* dec_vorbis.c */,
+				92EB6D7F20E4E19300A97A49 /* dec_vtb_glctx.m */,
+				92EB6DC320E4E19700A97A49 /* dec_vtb.c */,
+				92EB6D8220E4E19300A97A49 /* dec_webvtt.c */,
+				92EB6DAB20E4E19600A97A49 /* dec_xvid.c */,
+				92EB6DBE20E4E19700A97A49 /* decrypt_cenc_isma.c */,
+				92EB6D9B20E4E19500A97A49 /* dmx_avi.c */,
+				92EB6D8A20E4E19300A97A49 /* dmx_dash.c */,
+				8959AC76211C9A26004D2C87 /* dmx_gsf.c */,
+				92EB6D8320E4E19300A97A49 /* dmx_m2ts.c */,
+				92EB6D7720E4E19200A97A49 /* dmx_mpegps.c */,
+				92EB6DA120E4E19500A97A49 /* dmx_nhml.c */,
+				92EB6DB120E4E19600A97A49 /* dmx_nhnt.c */,
+				92EB6D9F20E4E19500A97A49 /* dmx_ogg.c */,
+				92EB6D8C20E4E19400A97A49 /* dmx_saf.c */,
+				92EB6DA720E4E19600A97A49 /* dmx_vobsub.c */,
+				92EB6DBF20E4E19700A97A49 /* enc_jpg.c */,
+				92EB6D8F20E4E19400A97A49 /* enc_png.c */,
+				92EB6D8D20E4E19400A97A49 /* encrypt_cenc_isma.c */,
+				92EB6D7A20E4E19200A97A49 /* ff_common.c */,
+				92EB6DBD20E4E19700A97A49 /* ff_common.h */,
+				928607142398F4C800FDA1ED /* ff_avf.c */,
+				92EB6D7120E4E19200A97A49 /* ff_dec.c */,
+				92EB6DAC20E4E19600A97A49 /* ff_dmx.c */,
+				92EB6DC120E4E19700A97A49 /* ff_enc.c */,
+				9286070C238BC43D00FDA1ED /* ff_mx.c */,
+				92EB6D8E20E4E19400A97A49 /* ff_rescale.c */,
+				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 */,
+				92EB6D8620E4E19300A97A49 /* in_rtp_rtsp.c */,
+				92EB6DAE20E4E19600A97A49 /* in_rtp_sdp.c */,
+				92EB6DC520E4E19700A97A49 /* in_rtp_signaling.c */,
+				92EB6DA420E4E19500A97A49 /* in_rtp_stream.c */,
+				92EB6D9120E4E19400A97A49 /* in_rtp.c */,
+				92EB6DC420E4E19700A97A49 /* in_rtp.h */,
+				8959AC7F211C9C3C004D2C87 /* in_sock.c */,
+				92EB6D7C20E4E19200A97A49 /* inspect.c */,
+				92EB6D9920E4E19400A97A49 /* isoffin_load.c */,
+				92EB6D9C20E4E19500A97A49 /* isoffin_read_ch.c */,
+				92EB6DAF20E4E19600A97A49 /* isoffin_read.c */,
+				92EB6D9720E4E19400A97A49 /* isoffin.h */,
+				92910FA9233A44110052365D /* jsfilter.c */,
+				92EB6D8020E4E19300A97A49 /* load_bt_xmt.c */,
+				92EB6DB720E4E19600A97A49 /* load_svg.c */,
+				92EB6DAD20E4E19600A97A49 /* load_text.c */,
+				92EB6D9A20E4E19500A97A49 /* mux_avi.c */,
+				8959AC80211C9C3C004D2C87 /* mux_gsf.c */,
+				92EB6DB320E4E19600A97A49 /* mux_isom.c */,
+				92EB6D6F20E4E19200A97A49 /* mux_ts.c */,
+				92EB6D8720E4E19300A97A49 /* out_audio.c */,
+				92EB6D7020E4E19200A97A49 /* out_file.c */,
+				92261A88239E326900C14199 /* out_http.c */,
+				8959AC81211C9C3C004D2C87 /* out_pipe.c */,
+				92C0F37F21EDFA8D002961C8 /* out_rtp.c */,
+				92B2A4A6229C0F47002A65A7 /* out_rtsp.c */,
+				8959AC82211C9C3C004D2C87 /* out_sock.c */,
+				92EB6D7320E4E19200A97A49 /* out_video.c */,
+				92EB6DA920E4E19600A97A49 /* reframe_ac3.c */,
+				92EB6D8920E4E19300A97A49 /* reframe_adts.c */,
+				92EB6D8420E4E19300A97A49 /* reframe_amr.c */,
+				8959AC78211C9B29004D2C87 /* reframe_av1.c */,
+				9296BF2322CFBB3900DC9742 /* reframe_flac.c */,
+				92EB6DBA20E4E19700A97A49 /* reframe_h263.c */,
+				92EB6D8520E4E19300A97A49 /* reframe_img.c */,
+				929FA64221A3E83E000455A7 /* reframe_latm.c */,
+				92EB6DA520E4E19500A97A49 /* reframe_mp3.c */,
+				92EB6DBB20E4E19700A97A49 /* reframe_mpgvid.c */,
+				92EB6D7520E4E19200A97A49 /* reframe_nalu.c */,
+				928607082386C2A000FDA1ED /* reframe_prores.c */,
+				92EB6DA620E4E19500A97A49 /* reframe_qcp.c */,
+				92EB6D9220E4E19400A97A49 /* reframe_rawpcm.c */,
+				92EB6D7820E4E19200A97A49 /* reframe_rawvid.c */,
+				92EB6D9D20E4E19500A97A49 /* reframer.c */,
+				92EB6DB620E4E19600A97A49 /* resample_audio.c */,
+				92EB6D9320E4E19400A97A49 /* rewind.c */,
+				92EB6D8120E4E19300A97A49 /* rewrite_adts.c */,
+				92EB6D9E20E4E19500A97A49 /* rewrite_mp4v.c */,
+				92EB6DB420E4E19600A97A49 /* rewrite_nalu.c */,
+				8959AC83211C9C3C004D2C87 /* rewrite_obu.c */,
+				92EB6DB520E4E19600A97A49 /* tileagg.c */,
+				928607102395C0DE00FDA1ED /* tssplit.c */,
+				92EB6DC620E4E19700A97A49 /* unit_test_filter.c */,
+				92EB6DBC20E4E19700A97A49 /* vcrop.c */,
+				9212C0FC222D7B3700FE3580 /* vflip.c */,
+				92EB6DAA20E4E19600A97A49 /* write_generic.c */,
+				92EB6D8820E4E19300A97A49 /* write_nhml.c */,
+				92EB6DA320E4E19500A97A49 /* write_nhnt.c */,
+				92EB6D7920E4E19200A97A49 /* write_qcp.c */,
+				92EB6D9620E4E19400A97A49 /* write_vtt.c */,
 			);
-			path = icons;
+			name = filters;
 			sourceTree = "<group>";
 		};
-		92D3C62A2031ECD600BA1735 /* Recovered References */ = {
+		92EB6E3920E4E62200A97A49 /* Recovered References */ = {
 			isa = PBXGroup;
 			children = (
 				285DBB48170F17D700AF2B9B /* ffmpeg_in.h */,
-				71A199071278765600ACFF58 /* aac_in.c */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		92FA488A1D05DADC0072C8A4 /* vtb_decoder */ = {
-			isa = PBXGroup;
-			children = (
-				9292BF061CFCAAAE0070EB05 /* vtb_decode.c */,
-				92FA48881D059A820072C8A4 /* glcontext.m */,
-			);
-			name = vtb_decoder;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -2019,15 +1984,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				92BC211416EF8E7A000E0620 /* img_in.h in Headers */,
 				92BC210D16EF8E7A000E0620 /* ft_font.h in Headers */,
-				92BC211616EF8E7A000E0620 /* isom_in.h in Headers */,
-				92BC213C16EF8E7A000E0620 /* widgetman.h in Headers */,
 				92BC212F16EF8E7A000E0620 /* sdl_out.h in Headers */,
 				922EB5851AAE13C500DF46D0 /* revision.h in Headers */,
-				92BC213616EF8E7A000E0620 /* unzip.h in Headers */,
-				92BC212A16EF8E7A000E0620 /* rtp_in.h in Headers */,
-				92BC212216EF8E7A000E0620 /* rast_soft.h in Headers */,
 				71CCF2501277045100339E12 /* quant.h in Headers */,
 				71CCF2521277045100339E12 /* script.h in Headers */,
 				71CCF2601277045100339E12 /* drawable.h in Headers */,
@@ -2043,14 +2002,12 @@
 				921FEBA51CF881DE00B437C2 /* sensors_def.h in Headers */,
 				71CCF2E11277045100339E12 /* mpeg2_ps.h in Headers */,
 				922EB5861AAE13C500DF46D0 /* version.h in Headers */,
-				71CCF31B1277045100339E12 /* input_sensor.h in Headers */,
-				71CCF31D1277045100339E12 /* media_control.h in Headers */,
-				71CCF3201277045100339E12 /* media_memory.h in Headers */,
 				71CCF3361277045100339E12 /* module_wrap.h in Headers */,
 				71CCF3461277045100339E12 /* zutil.h in Headers */,
 				71CCF3B112770A8C00339E12 /* avparse.h in Headers */,
 				71CCF3B212770A8C00339E12 /* base_coding.h in Headers */,
 				71CCF3B312770A8C00339E12 /* bifs.h in Headers */,
+				92E9DFB42215CEA700628420 /* rast_soft.h in Headers */,
 				71CCF3B412770A8C00339E12 /* bitstream.h in Headers */,
 				71CCF3B512770A8C00339E12 /* color.h in Headers */,
 				71CCF3B612770A8C00339E12 /* compositor.h in Headers */,
@@ -2059,11 +2016,12 @@
 				71CCF3B912770A8C00339E12 /* constants.h in Headers */,
 				922EB5811AAE13C500DF46D0 /* html5_media.h in Headers */,
 				71CCF3BA12770A8C00339E12 /* crypt.h in Headers */,
+				92EB6E2220E4E1B500A97A49 /* crypt_tools.h in Headers */,
 				71CCF3BB12770A8C00339E12 /* download.h in Headers */,
 				71CCF3BC12770A8C00339E12 /* dvb_mpe.h in Headers */,
-				71CCF3BD12770A8C00339E12 /* esi.h in Headers */,
 				71CCF3BE12770A8C00339E12 /* events.h in Headers */,
 				71CCF3BF12770A8C00339E12 /* filestreamer.h in Headers */,
+				92E9DFA32215CE9A00628420 /* tiny_aes.h in Headers */,
 				71CCF3C012770A8C00339E12 /* ietf.h in Headers */,
 				71CCF3C112770A8C00339E12 /* avilib.h in Headers */,
 				71CCF3C212770A8C00339E12 /* bifs_dev.h in Headers */,
@@ -2072,11 +2030,11 @@
 				922EB5801AAE13C500DF46D0 /* dash.h in Headers */,
 				71CCF3C512770A8C00339E12 /* compositor_dev.h in Headers */,
 				71CCF3C612770A8C00339E12 /* crypt_dev.h in Headers */,
-				92DC362620B47FB600C48E39 /* tiny_aes.h in Headers */,
 				71CCF3C712770A8C00339E12 /* dvb_mpe_dev.h in Headers */,
 				71CCF3C812770A8C00339E12 /* ietf_dev.h in Headers */,
 				71CCF3C912770A8C00339E12 /* isomedia_dev.h in Headers */,
 				71CCF3CA12770A8C00339E12 /* laser_dev.h in Headers */,
+				92EB6E1C20E4E19700A97A49 /* in_rtp.h in Headers */,
 				71CCF3CB12770A8C00339E12 /* media_dev.h in Headers */,
 				71CCF3CC12770A8C00339E12 /* mesh.h in Headers */,
 				71CCF3CD12770A8C00339E12 /* odf_dev.h in Headers */,
@@ -2086,8 +2044,8 @@
 				71CCF3D112770A8C00339E12 /* swf_dev.h in Headers */,
 				71CCF3D212770A8C00339E12 /* terminal_dev.h in Headers */,
 				71CCF3D312770A8C00339E12 /* vobsub.h in Headers */,
+				92EB6DEF20E4E19700A97A49 /* isoffin.h in Headers */,
 				925FF2A51ABC53F30085B04C /* odf_parse_common.h in Headers */,
-				71CCF3D412770A8C00339E12 /* ismacryp.h in Headers */,
 				71CCF3D512770A8C00339E12 /* iso639.h in Headers */,
 				71CCF3D612770A8C00339E12 /* isomedia.h in Headers */,
 				71CCF3D712770A8C00339E12 /* laser.h in Headers */,
@@ -2103,15 +2061,18 @@
 				71CCF3E112770A8C00339E12 /* js_usr.h in Headers */,
 				71CCF3E212770A8C00339E12 /* raster2d.h in Headers */,
 				71CCF3E312770A8C00339E12 /* service.h in Headers */,
+				92EB6E1520E4E19700A97A49 /* ff_common.h in Headers */,
 				71CCF3E412770A8C00339E12 /* term_ext.h in Headers */,
 				71CCF3E512770A8C00339E12 /* video_out.h in Headers */,
 				71CCF3E612770A8C00339E12 /* mpeg4_odf.h in Headers */,
 				71CCF3E712770A8C00339E12 /* mpegts.h in Headers */,
 				71CCF3E812770A8C00339E12 /* network.h in Headers */,
 				71CCF3E912770A8C00339E12 /* nodes_mpeg4.h in Headers */,
+				92334CDD2333AB9A00DA6051 /* quickjs.h in Headers */,
 				71CCF3EA12770A8C00339E12 /* nodes_svg.h in Headers */,
 				71CCF3EB12770A8C00339E12 /* nodes_x3d.h in Headers */,
 				71CCF3EC12770A8C00339E12 /* nodes_xbl.h in Headers */,
+				9298677A2357A0DA008A2CC6 /* webgl.h in Headers */,
 				71CCF3ED12770A8C00339E12 /* options.h in Headers */,
 				71CCF3EE12770A8C00339E12 /* path2d.h in Headers */,
 				71CCF3EF12770A8C00339E12 /* rtp_streamer.h in Headers */,
@@ -2122,6 +2083,7 @@
 				71CCF3F412770A8C00339E12 /* scenegraph_vrml.h in Headers */,
 				71CCF3F512770A8C00339E12 /* setup.h in Headers */,
 				71CCF3F612770A8C00339E12 /* svg_types.h in Headers */,
+				92EB6D6D20E4E17F00A97A49 /* filter_session.h in Headers */,
 				71CCF3F712770A8C00339E12 /* sync_layer.h in Headers */,
 				71CCF3F812770A8C00339E12 /* term_info.h in Headers */,
 				71CCF3F912770A8C00339E12 /* terminal.h in Headers */,
@@ -2131,7 +2093,6 @@
 				71CCF3FD12770A8C00339E12 /* user.h in Headers */,
 				71CCF3FE12770A8C00339E12 /* utf.h in Headers */,
 				71CCF3FF12770A8C00339E12 /* xml.h in Headers */,
-				922EB5831AAE13C500DF46D0 /* map.h in Headers */,
 				970A26CD13434D780007362C /* m3u8.h in Headers */,
 				970A26CE13434D780007362C /* mpd.h in Headers */,
 				922EB5821AAE13C500DF46D0 /* html5_mse.h in Headers */,
@@ -2157,6 +2118,7 @@
 				71A19B1612796B5600ACFF58 /* Resources */,
 				71A19B1712796B5600ACFF58 /* Sources */,
 				71A19B1812796B5600ACFF58 /* Frameworks */,
+				9281B62721C92923006B0FD5 /* Copy Files */,
 			);
 			buildRules = (
 			);
@@ -2192,7 +2154,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 1020;
 				TargetAttributes = {
 					71A19B1912796B5600ACFF58 = {
 						DevelopmentTeam = Q46G522WGV;
@@ -2201,13 +2163,14 @@
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gpac4ios" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 1;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				en,
+				fr,
+				de,
+				ja,
+				Base,
 			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			productRefGroup = 71CCF1321277037A00339E12 /* Products */;
@@ -2225,13 +2188,13 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9281B63021C92D00006B0FD5 /* gui in Resources */,
 				9280E7251DD23FFE001E6441 /* iTunesArtwork in Resources */,
-				92C7F19A1AA8B48E00BA5B4C /* gui in Resources */,
-				92D127FE1BBADC7F00DA003B /* shaders in Resources */,
 				71EC88E11396273B004DCB6A /* osmo.icns in Resources */,
 				929A929C16EF8BC200B7C64F /* Default-568h@2x.png in Resources */,
 				929A929D16EF8BC200B7C64F /* icon_ipad_retina.png in Resources */,
 				929A929E16EF8BC200B7C64F /* icon_ipad.png in Resources */,
+				9281B63121C92D00006B0FD5 /* shaders in Resources */,
 				929A929F16EF8BC200B7C64F /* icon_retina.png in Resources */,
 				929A92A016EF8BC200B7C64F /* icon.png in Resources */,
 			);
@@ -2270,86 +2233,84 @@
 			buildActionMask = 2147483647;
 			files = (
 				92F930861A5ADC1A0072A85C /* os_divers.c in Sources */,
+				92EB6DCB20E4E19700A97A49 /* out_video.c in Sources */,
+				92E9DFA52215CE9A00628420 /* g_crypt.c in Sources */,
 				925FF2A71ABC55030085B04C /* os_file.c in Sources */,
 				92E8C7901A0CD58300E0436D /* validator.c in Sources */,
-				92E8C78B1A0CD57A00E0436D /* timedtext_dec.c in Sources */,
-				92E8C78C1A0CD57A00E0436D /* timedtext_in.c in Sources */,
-				92E8C78D1A0CD57A00E0436D /* isma_ea.c in Sources */,
-				92E8C78E1A0CD57A00E0436D /* saf_in.c in Sources */,
-				92E8C78F1A0CD57A00E0436D /* audio_filter.c in Sources */,
-				92BC210E16EF8E7A000E0620 /* ftgrays.c in Sources */,
-				92BC212316EF8E7A000E0620 /* raster_565.c in Sources */,
-				92BC212416EF8E7A000E0620 /* raster_argb.c in Sources */,
-				92BC212516EF8E7A000E0620 /* raster_load.c in Sources */,
-				92BC212616EF8E7A000E0620 /* raster_rgb.c in Sources */,
-				92BC213216EF8E7A000E0620 /* stencil.c in Sources */,
-				92BC213316EF8E7A000E0620 /* surface.c in Sources */,
+				92EB6E2020E4E1A300A97A49 /* crypt_tools.c in Sources */,
+				92EB6E0320E4E19700A97A49 /* dec_xvid.c in Sources */,
+				92EB6DFB20E4E19700A97A49 /* write_nhnt.c in Sources */,
+				8959AC8F211C9C77004D2C87 /* Remotery.c in Sources */,
+				92EB6E0D20E4E19700A97A49 /* tileagg.c in Sources */,
+				92261A89239E326900C14199 /* out_http.c in Sources */,
+				92EB6E1D20E4E19700A97A49 /* in_rtp_signaling.c in Sources */,
+				92EB6D6820E4E17F00A97A49 /* filter_props.c in Sources */,
 				92BC210316EF8E7A000E0620 /* audio.c in Sources */,
 				92BC210716EF8E7A000E0620 /* cursors.c in Sources */,
 				92BC212E16EF8E7A000E0620 /* sdl_out.c in Sources */,
-				92BC213516EF8E7A000E0620 /* unzip.c in Sources */,
-				92BC213916EF8E7A000E0620 /* wgt_load.c in Sources */,
-				92BC213A16EF8E7A000E0620 /* widget.c in Sources */,
+				92EB6DF220E4E19700A97A49 /* mux_avi.c in Sources */,
 				92DF5CA61BA6C6F80058A7BA /* iff.c in Sources */,
-				92BC213B16EF8E7A000E0620 /* widgetman.c in Sources */,
 				92BC213716EF8E7A000E0620 /* video.c in Sources */,
-				92BC212916EF8E7A000E0620 /* rtp_in.c in Sources */,
-				92BC212B16EF8E7A000E0620 /* rtp_session.c in Sources */,
-				92BC212C16EF8E7A000E0620 /* rtp_signaling.c in Sources */,
-				92BC212D16EF8E7A000E0620 /* rtp_stream.c in Sources */,
-				92BC213016EF8E7A000E0620 /* sdp_fetch.c in Sources */,
-				92BC213116EF8E7A000E0620 /* sdp_load.c in Sources */,
-				92BC211516EF8E7A000E0620 /* isom_cache.c in Sources */,
-				92BC211A16EF8E7A000E0620 /* load.c in Sources */,
-				92BC212716EF8E7A000E0620 /* read.c in Sources */,
-				92BC212816EF8E7A000E0620 /* read_ch.c in Sources */,
-				92BC210516EF8E7A000E0620 /* bmp_dec.c in Sources */,
-				92BC211216EF8E7A000E0620 /* img_dec.c in Sources */,
-				92BC211316EF8E7A000E0620 /* img_in.c in Sources */,
-				92BC211716EF8E7A000E0620 /* jp2_dec.c in Sources */,
-				92BC211816EF8E7A000E0620 /* jpeg_dec.c in Sources */,
-				92BC212116EF8E7A000E0620 /* png_dec.c in Sources */,
-				92BC210216EF8E7A000E0620 /* aac_in.c in Sources */,
-				92BC210416EF8E7A000E0620 /* bifs_dec.c in Sources */,
-				92BC210616EF8E7A000E0620 /* ctx_load.c in Sources */,
-				92BC210816EF8E7A000E0620 /* dummy_in.c in Sources */,
-				92BC210916EF8E7A000E0620 /* faad_dec.c in Sources */,
+				92EB6DE120E4E19700A97A49 /* reframe_adts.c in Sources */,
+				92EB6E1120E4E19700A97A49 /* dec_theora.c in Sources */,
+				92EB6E0020E4E19700A97A49 /* dec_mad.c in Sources */,
+				92EB6E1420E4E19700A97A49 /* vcrop.c in Sources */,
+				92EB6E1E20E4E19700A97A49 /* unit_test_filter.c in Sources */,
+				92EB6DE220E4E19700A97A49 /* dmx_dash.c in Sources */,
+				92EB6DF620E4E19700A97A49 /* rewrite_mp4v.c in Sources */,
+				92EB6DF420E4E19700A97A49 /* isoffin_read_ch.c in Sources */,
 				92BC210C16EF8E7A000E0620 /* ft_font.c in Sources */,
-				92BC210F16EF8E7A000E0620 /* gpac_js.c in Sources */,
-				92BC211916EF8E7A000E0620 /* laser_dec.c in Sources */,
-				92BC211B16EF8E7A000E0620 /* mad_dec.c in Sources */,
 				921FEBA71CF881DE00B437C2 /* sensors.m in Sources */,
-				92BC211D16EF8E7A000E0620 /* mp3_in.c in Sources */,
-				9212E8031CCA82310036F310 /* amr_in.c in Sources */,
-				92BC211E16EF8E7A000E0620 /* mpd_in.c in Sources */,
-				92BC211F16EF8E7A000E0620 /* mpegts_in.c in Sources */,
-				92BC212016EF8E7A000E0620 /* odf_dec.c in Sources */,
-				92BC213416EF8E7A000E0620 /* svg_in.c in Sources */,
+				92E9DFB62215CEA700628420 /* raster_565.c in Sources */,
+				92D6C5AB2343BF9400262217 /* svg_js.c in Sources */,
+				92EB6DDF20E4E19700A97A49 /* out_audio.c in Sources */,
+				92852443237ACC2700165130 /* raster3d.c in Sources */,
+				92EB6DF520E4E19700A97A49 /* reframer.c in Sources */,
+				92E9DFA22215CE9A00628420 /* g_crypt_tinyaes.c in Sources */,
+				929383A72355AECE00AAAFA8 /* webgl.c in Sources */,
+				92EB6DFE20E4E19700A97A49 /* reframe_qcp.c in Sources */,
 				71CCF2461277045100339E12 /* arith_decoder.c in Sources */,
 				71CCF2471277045100339E12 /* bifs_codec.c in Sources */,
+				92EB6E3720E4E58E00A97A49 /* mpeg4_mediacontrol.c in Sources */,
+				92EB6E0920E4E19700A97A49 /* dmx_nhnt.c in Sources */,
 				71CCF2481277045100339E12 /* bifs_node_tables.c in Sources */,
 				71CCF2491277045100339E12 /* com_dec.c in Sources */,
 				71CCF24A1277045100339E12 /* com_enc.c in Sources */,
+				92D6C5AD2343BF9400262217 /* dom_js.c in Sources */,
 				71CCF24B1277045100339E12 /* conditional.c in Sources */,
 				71CCF24C1277045100339E12 /* field_decode.c in Sources */,
+				92EB6E0220E4E19700A97A49 /* write_generic.c in Sources */,
+				92EB6E3020E4E58E00A97A49 /* scene_node_init.c in Sources */,
+				92EB6E0B20E4E19700A97A49 /* mux_isom.c in Sources */,
 				71CCF24D1277045100339E12 /* field_encode.c in Sources */,
 				71CCF24E1277045100339E12 /* memory_decoder.c in Sources */,
 				71CCF24F1277045100339E12 /* predictive_mffield.c in Sources */,
+				92EB6DEB20E4E19700A97A49 /* rewind.c in Sources */,
 				71CCF2511277045100339E12 /* quantize.c in Sources */,
 				71CCF2531277045100339E12 /* script_dec.c in Sources */,
 				71CCF2541277045100339E12 /* script_enc.c in Sources */,
+				92EB6DDC20E4E19700A97A49 /* reframe_amr.c in Sources */,
 				71CCF2551277045100339E12 /* unquantize.c in Sources */,
 				71CCF2561277045100339E12 /* audio_input.c in Sources */,
+				92EB6E0A20E4E19700A97A49 /* dec_odf.c in Sources */,
 				71CCF2571277045100339E12 /* audio_mixer.c in Sources */,
 				71CCF2581277045100339E12 /* audio_render.c in Sources */,
 				71CCF2591277045100339E12 /* bindable.c in Sources */,
+				8959AC8C211C9C3C004D2C87 /* out_sock.c in Sources */,
 				71CCF25A1277045100339E12 /* camera.c in Sources */,
+				92EB6E1B20E4E19700A97A49 /* dec_vtb.c in Sources */,
 				71CCF25B1277045100339E12 /* compositor.c in Sources */,
+				92EB6E3220E4E58E00A97A49 /* clock.c in Sources */,
 				71CCF25C1277045100339E12 /* compositor_2d.c in Sources */,
 				71CCF25D1277045100339E12 /* compositor_3d.c in Sources */,
+				92EB6DD320E4E19700A97A49 /* dec_j2k.c in Sources */,
 				71CCF25E1277045100339E12 /* compositor_node_init.c in Sources */,
+				92334CDA2333AB9A00DA6051 /* cutils.c in Sources */,
+				92EB6E0520E4E19700A97A49 /* load_text.c in Sources */,
 				71CCF25F1277045100339E12 /* drawable.c in Sources */,
 				71CCF2611277045100339E12 /* events.c in Sources */,
+				92EB6E3120E4E58E00A97A49 /* svg_external.c in Sources */,
+				92E9DFB02215CEA700628420 /* stencil.c in Sources */,
 				71CCF2621277045100339E12 /* font_engine.c in Sources */,
 				71CCF2641277045100339E12 /* hardcoded_protos.c in Sources */,
 				71CCF2651277045100339E12 /* hc_flash_shape.c in Sources */,
@@ -2359,6 +2320,7 @@
 				71CCF2691277045100339E12 /* mpeg4_animstream.c in Sources */,
 				71CCF26A1277045100339E12 /* mpeg4_audio.c in Sources */,
 				71CCF26B1277045100339E12 /* mpeg4_background.c in Sources */,
+				92E9DFB52215CEA700628420 /* surface.c in Sources */,
 				71CCF26C1277045100339E12 /* mpeg4_background2d.c in Sources */,
 				71CCF26D1277045100339E12 /* mpeg4_bitmap.c in Sources */,
 				71CCF26E1277045100339E12 /* mpeg4_composite.c in Sources */,
@@ -2366,8 +2328,10 @@
 				71CCF2701277045100339E12 /* mpeg4_geometry_2d.c in Sources */,
 				71CCF2711277045100339E12 /* mpeg4_geometry_3d.c in Sources */,
 				71CCF2721277045100339E12 /* mpeg4_geometry_ifs2d.c in Sources */,
+				92EB6DC820E4E19700A97A49 /* out_file.c in Sources */,
 				71CCF2731277045100339E12 /* mpeg4_geometry_ils2d.c in Sources */,
 				71CCF2741277045100339E12 /* mpeg4_gradients.c in Sources */,
+				92EB6E0620E4E19700A97A49 /* in_rtp_sdp.c in Sources */,
 				71CCF2751277045100339E12 /* mpeg4_grouping.c in Sources */,
 				71CCF2771277045100339E12 /* mpeg4_grouping_2d.c in Sources */,
 				71CCF2781277045100339E12 /* mpeg4_grouping_3d.c in Sources */,
@@ -2383,31 +2347,46 @@
 				71CCF2821277045100339E12 /* mpeg4_timesensor.c in Sources */,
 				71CCF2831277045100339E12 /* mpeg4_viewport.c in Sources */,
 				71CCF2841277045100339E12 /* navigate.c in Sources */,
-				92F8D46E1F713E5F00616F7C /* netctrl.c in Sources */,
 				71CCF2861277045100339E12 /* offscreen_cache.c in Sources */,
 				71CCF2881277045100339E12 /* svg_base.c in Sources */,
+				8959AC8A211C9C3C004D2C87 /* mux_gsf.c in Sources */,
 				71CCF2891277045100339E12 /* svg_filters.c in Sources */,
 				71CCF28A1277045100339E12 /* svg_font.c in Sources */,
+				92EB6DCC20E4E19700A97A49 /* dec_openhevc.c in Sources */,
 				71CCF28B1277045100339E12 /* svg_geometry.c in Sources */,
 				71CCF28C1277045100339E12 /* svg_grouping.c in Sources */,
 				71CCF28D1277045100339E12 /* svg_media.c in Sources */,
+				92EB6DD820E4E19700A97A49 /* load_bt_xmt.c in Sources */,
+				92EB6D6A20E4E17F00A97A49 /* filter_session.c in Sources */,
 				71CCF28E1277045100339E12 /* svg_paint_servers.c in Sources */,
+				92EB6DD720E4E19700A97A49 /* dec_vtb_glctx.m in Sources */,
 				71CCF28F1277045100339E12 /* svg_text.c in Sources */,
+				92EB6DEA20E4E19700A97A49 /* reframe_rawpcm.c in Sources */,
 				71CCF2901277045100339E12 /* texturing.c in Sources */,
 				71CCF2921277045100339E12 /* texturing_gl.c in Sources */,
 				71CCF2931277045100339E12 /* visual_manager.c in Sources */,
+				92EB6E0720E4E19700A97A49 /* isoffin_read.c in Sources */,
 				71CCF2951277045100339E12 /* visual_manager_2d.c in Sources */,
+				92EB6DD120E4E19700A97A49 /* write_qcp.c in Sources */,
 				71CCF2971277045100339E12 /* visual_manager_2d_draw.c in Sources */,
 				71CCF2981277045100339E12 /* visual_manager_3d.c in Sources */,
+				92EB6DF720E4E19700A97A49 /* dmx_ogg.c in Sources */,
 				71CCF29A1277045100339E12 /* visual_manager_3d_gl.c in Sources */,
 				71CCF29B1277045100339E12 /* x3d_geometry.c in Sources */,
 				71CCF29C1277045100339E12 /* rtcp.c in Sources */,
+				928607092386C2A000FDA1ED /* reframe_prores.c in Sources */,
+				92B2A4AE229D6646002A65A7 /* hevcmerge.c in Sources */,
 				71CCF29D1277045100339E12 /* rtp.c in Sources */,
 				71CCF29E1277045100339E12 /* rtp_depacketizer.c in Sources */,
+				92EB6DDB20E4E19700A97A49 /* dmx_m2ts.c in Sources */,
 				71CCF29F1277045100339E12 /* rtp_packetizer.c in Sources */,
 				71CCF2A01277045100339E12 /* rtp_pck_3gpp.c in Sources */,
+				92EB6DD920E4E19700A97A49 /* rewrite_adts.c in Sources */,
+				92EB6DF820E4E19700A97A49 /* dec_faad.c in Sources */,
+				92EB6E0F20E4E19700A97A49 /* load_svg.c in Sources */,
 				71CCF2A11277045100339E12 /* rtp_pck_mpeg12.c in Sources */,
 				71CCF2A21277045100339E12 /* rtp_pck_mpeg4.c in Sources */,
+				92D6C5AC2343BF9400262217 /* vrml_js.c in Sources */,
 				71CCF2A31277045100339E12 /* rtp_streamer.c in Sources */,
 				71CCF2A41277045100339E12 /* rtsp_command.c in Sources */,
 				71CCF2A51277045100339E12 /* rtsp_common.c in Sources */,
@@ -2424,35 +2403,52 @@
 				71CCF2B01277045100339E12 /* box_funcs.c in Sources */,
 				71CCF2B11277045100339E12 /* data_map.c in Sources */,
 				71CCF2B21277045100339E12 /* hint_track.c in Sources */,
+				92EB6D6720E4E17F00A97A49 /* filter.c in Sources */,
+				92EB6E1220E4E19700A97A49 /* reframe_h263.c in Sources */,
 				71CCF2B31277045100339E12 /* hinting.c in Sources */,
 				71CCF2B41277045100339E12 /* drm_sample.c in Sources */,
-				92DC362520B47FB600C48E39 /* g_crypt_openssl.c in Sources */,
+				92EB6DCD20E4E19700A97A49 /* reframe_nalu.c in Sources */,
+				9210BA1D234A909400ED2DFF /* evg.c in Sources */,
+				923EB53423D1B87E00E1FFA1 /* libbf.c in Sources */,
 				71CCF2B51277045100339E12 /* isom_intern.c in Sources */,
 				71CCF2B61277045100339E12 /* isom_read.c in Sources */,
+				92EB6DCF20E4E19700A97A49 /* dmx_mpegps.c in Sources */,
+				92EB6E1320E4E19700A97A49 /* reframe_mpgvid.c in Sources */,
 				71CCF2B71277045100339E12 /* isom_store.c in Sources */,
+				92334CDB2333AB9A00DA6051 /* libregexp.c in Sources */,
 				71CCF2B81277045100339E12 /* isom_write.c in Sources */,
 				71CCF2B91277045100339E12 /* media.c in Sources */,
+				9286070D238BC43D00FDA1ED /* ff_mx.c in Sources */,
 				71CCF2BA1277045100339E12 /* media_odf.c in Sources */,
 				71CCF2BB1277045100339E12 /* meta.c in Sources */,
 				71CCF2BC1277045100339E12 /* movie_fragments.c in Sources */,
+				92EB6DE020E4E19700A97A49 /* write_nhml.c in Sources */,
+				92EB6DD420E4E19700A97A49 /* inspect.c in Sources */,
 				71CCF2BD1277045100339E12 /* sample_descs.c in Sources */,
 				71CCF2BE1277045100339E12 /* stbl_read.c in Sources */,
 				71CCF2BF1277045100339E12 /* stbl_write.c in Sources */,
 				71CCF2C01277045100339E12 /* track.c in Sources */,
 				71CCF2C11277045100339E12 /* tx3g.c in Sources */,
-				92FA48891D059A820072C8A4 /* glcontext.m 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 */,
 				71CCF2C41277045100339E12 /* lsr_tables.c in Sources */,
+				92E9DFA42215CE9A00628420 /* tiny_aes.c in Sources */,
 				71CCF2D41277045100339E12 /* av_parsers.c in Sources */,
+				92C0F38021EDFA8E002961C8 /* out_rtp.c in Sources */,
+				92EB6E0C20E4E19700A97A49 /* rewrite_nalu.c in Sources */,
+				92D6C5A62343BF6A00262217 /* xhr.c in Sources */,
 				71CCF2D51277045100339E12 /* avilib.c in Sources */,
-				92DC362820B47FB600C48E39 /* tiny_aes.c in Sources */,
 				71CCF2D61277045100339E12 /* dvb_mpe.c in Sources */,
-				71CCF2D71277045100339E12 /* filestreamer.c in Sources */,
+				9298677F235A1587008A2CC6 /* gltools.c in Sources */,
+				8959AC79211C9B29004D2C87 /* reframe_av1.c in Sources */,
 				71CCF2D81277045100339E12 /* gpac_ogg.c in Sources */,
 				71CCF2D91277045100339E12 /* img.c in Sources */,
-				71CCF2DA1277045100339E12 /* ismacryp.c in Sources */,
 				71CCF2DB1277045100339E12 /* isom_hinter.c in Sources */,
+				92910FAA233A44110052365D /* jsfilter.c in Sources */,
+				92EB6DC920E4E19700A97A49 /* ff_dec.c in Sources */,
 				71CCF2DC1277045100339E12 /* isom_tools.c in Sources */,
 				71CCF2DD1277045100339E12 /* m2ts_mux.c in Sources */,
 				71CCF2DE1277045100339E12 /* media_export.c in Sources */,
@@ -2460,130 +2456,159 @@
 				71CCF2E01277045100339E12 /* mpeg2_ps.c in Sources */,
 				71CCF2E21277045100339E12 /* mpegts.c in Sources */,
 				71CCF2E31277045100339E12 /* reedsolomon.c in Sources */,
+				929FA64321A3E83F000455A7 /* reframe_latm.c in Sources */,
+				92E9DFB22215CEA700628420 /* raster_yuv.c in Sources */,
+				92EB6D6920E4E17F00A97A49 /* filter_queue.c in Sources */,
 				71CCF2E41277045100339E12 /* saf.c in Sources */,
-				71CCF2E51277045100339E12 /* text_import.c in Sources */,
+				8959AC89211C9C3C004D2C87 /* in_sock.c in Sources */,
+				92EB6DE620E4E19700A97A49 /* ff_rescale.c in Sources */,
+				92EB6E2F20E4E58E00A97A49 /* mpeg4_inline.c in Sources */,
 				71CCF2E61277045100339E12 /* vobsub.c in Sources */,
 				71CCF2E71277045100339E12 /* desc_private.c in Sources */,
+				92EB6DED20E4E19700A97A49 /* dec_laser.c in Sources */,
 				71CCF2E81277045100339E12 /* descriptors.c in Sources */,
 				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 */,
-				9225CCA520343CDE00250C87 /* atsc_in.c in Sources */,
 				71CCF2EC1277045100339E12 /* oci_codec.c in Sources */,
 				71CCF2ED1277045100339E12 /* odf_code.c in Sources */,
 				71CCF2EE1277045100339E12 /* odf_codec.c in Sources */,
 				71CCF2EF1277045100339E12 /* odf_command.c in Sources */,
 				71CCF2F01277045100339E12 /* odf_dump.c in Sources */,
+				92EB6D6E20E4E17F00A97A49 /* filter_pck.c in Sources */,
+				8959AC77211C9A26004D2C87 /* dmx_gsf.c in Sources */,
+				92EB6DD620E4E19700A97A49 /* dec_ttxt.c in Sources */,
+				92B2A4A7229C0F47002A65A7 /* out_rtsp.c in Sources */,
 				71CCF2F11277045100339E12 /* odf_parse.c in Sources */,
+				92EB6DCA20E4E19700A97A49 /* dec_bifs.c in Sources */,
 				71CCF2F21277045100339E12 /* qos.c in Sources */,
 				71CCF2F31277045100339E12 /* slc.c in Sources */,
+				92334CCF2333AB9A00DA6051 /* libunicode.c in Sources */,
+				92EB6DEE20E4E19700A97A49 /* write_vtt.c in Sources */,
 				71CCF2F41277045100339E12 /* encode_isom.c in Sources */,
 				71CCF2F51277045100339E12 /* loader_bt.c in Sources */,
 				71CCF2F61277045100339E12 /* loader_isom.c in Sources */,
 				71CCF2F71277045100339E12 /* loader_qt.c in Sources */,
 				71CCF2F81277045100339E12 /* loader_svg.c in Sources */,
+				9212C0FD222D7B3700FE3580 /* vflip.c in Sources */,
 				71CCF2F91277045100339E12 /* loader_xmt.c in Sources */,
 				71CCF2FA1277045100339E12 /* scene_dump.c in Sources */,
 				71CCF2FB1277045100339E12 /* scene_engine.c in Sources */,
+				92EB6DDA20E4E19700A97A49 /* dec_webvtt.c in Sources */,
 				71CCF2FC1277045100339E12 /* scene_manager.c in Sources */,
 				71CCF2FD1277045100339E12 /* scene_stats.c in Sources */,
+				92EB6DD020E4E19700A97A49 /* reframe_rawvid.c in Sources */,
 				71CCF2FE1277045100339E12 /* swf_bifs.c in Sources */,
 				71CCF2FF1277045100339E12 /* swf_parse.c in Sources */,
+				928607112395C0DE00FDA1ED /* tssplit.c in Sources */,
 				71CCF3001277045100339E12 /* text_to_bifs.c in Sources */,
+				92EB6E2E20E4E58E00A97A49 /* mpeg4_inputsensor.c in Sources */,
+				92EB6DF920E4E19700A97A49 /* dmx_nhml.c in Sources */,
 				71CCF3011277045100339E12 /* base_scenegraph.c in Sources */,
 				71CCF3021277045100339E12 /* commands.c in Sources */,
+				8959AC8D211C9C3C004D2C87 /* rewrite_obu.c in Sources */,
 				71CCF3031277045100339E12 /* dom_events.c in Sources */,
-				71CCF3041277045100339E12 /* dom_smjs.c in Sources */,
 				71CCF3051277045100339E12 /* mpeg4_animators.c in Sources */,
+				922B2774244625B0001D4F72 /* dec_ttml.c in Sources */,
 				71CCF3061277045100339E12 /* mpeg4_nodes.c in Sources */,
 				71CCF3071277045100339E12 /* mpeg4_valuator.c in Sources */,
 				71CCF3081277045100339E12 /* smil_anim.c in Sources */,
+				92EB6E3520E4E58E00A97A49 /* scene.c in Sources */,
 				71CCF3091277045100339E12 /* smil_timing.c in Sources */,
 				71CCF30A1277045100339E12 /* svg_attributes.c in Sources */,
 				71CCF30B1277045100339E12 /* svg_properties.c in Sources */,
-				71CCF30C1277045100339E12 /* svg_smjs.c in Sources */,
 				71CCF30D1277045100339E12 /* svg_types.c in Sources */,
 				71CCF30E1277045100339E12 /* vrml_interpolators.c in Sources */,
 				71CCF30F1277045100339E12 /* vrml_proto.c in Sources */,
 				71CCF3101277045100339E12 /* vrml_route.c in Sources */,
+				92EB6E3820E4E58E00A97A49 /* object_manager.c in Sources */,
 				71CCF3111277045100339E12 /* vrml_script.c in Sources */,
-				71CCF3121277045100339E12 /* vrml_smjs.c in Sources */,
-				92DC362720B47FB600C48E39 /* g_crypt.c in Sources */,
-				9214AD341D0181A5009D3CFD /* ac3_in.c in Sources */,
+				92EB6E3320E4E58E00A97A49 /* scene_ns.c in Sources */,
+				92734635235084A50081AF74 /* storage.c in Sources */,
+				92EB6E3420E4E58E00A97A49 /* mpeg4_mediasensor.c in Sources */,
 				71CCF3131277045100339E12 /* vrml_tools.c in Sources */,
+				92EB6DE720E4E19700A97A49 /* enc_png.c in Sources */,
+				9296BF2422CFBB3900DC9742 /* reframe_flac.c in Sources */,
 				71CCF3141277045100339E12 /* x3d_nodes.c in Sources */,
-				71CCF3151277045100339E12 /* xbl_process.c in Sources */,
 				71CCF3161277045100339E12 /* xml_ns.c in Sources */,
-				71CCF3171277045100339E12 /* channel.c in Sources */,
-				9292BF071CFCAAAE0070EB05 /* vtb_decode.c in Sources */,
-				71CCF3181277045100339E12 /* clock.c in Sources */,
-				71CCF3191277045100339E12 /* decoder.c in Sources */,
-				71CCF31A1277045100339E12 /* input_sensor.c in Sources */,
-				71CCF31C1277045100339E12 /* media_control.c in Sources */,
-				9214AD351D0181A5009D3CFD /* liba52_dec.c in Sources */,
-				71CCF31E1277045100339E12 /* media_manager.c in Sources */,
-				71CCF31F1277045100339E12 /* media_memory.c in Sources */,
-				71CCF3211277045100339E12 /* media_object.c in Sources */,
-				71CCF3221277045100339E12 /* media_sensor.c in Sources */,
-				71CCF3231277045100339E12 /* mpeg4_inline.c in Sources */,
-				71CCF3241277045100339E12 /* network_service.c in Sources */,
-				71CCF3251277045100339E12 /* object_browser.c in Sources */,
-				71CCF3261277045100339E12 /* object_manager.c in Sources */,
-				92DC362920B47FB600C48E39 /* g_crypt_tinyaes.c in Sources */,
-				71CCF3271277045100339E12 /* scene.c in Sources */,
-				71CCF3281277045100339E12 /* svg_external.c in Sources */,
-				71CCF3291277045100339E12 /* term_node_init.c in Sources */,
+				92EB6E1A20E4E19700A97A49 /* in_http.c in Sources */,
+				92EB6E1720E4E19700A97A49 /* enc_jpg.c in Sources */,
+				92B2A4AF229D6646002A65A7 /* hevcsplit.c in Sources */,
+				92EB6E0E20E4E19700A97A49 /* resample_audio.c in Sources */,
+				92EB6DE820E4E19700A97A49 /* in_dvb4linux.c in Sources */,
+				8959AC8B211C9C3C004D2C87 /* out_pipe.c in Sources */,
+				92EB6D6B20E4E17F00A97A49 /* filter_pid.c in Sources */,
+				92EB6DE520E4E19700A97A49 /* encrypt_cenc_isma.c in Sources */,
+				92EB6DDD20E4E19700A97A49 /* reframe_img.c in Sources */,
+				92EB6E3B20E4EBDB00A97A49 /* constants.c in Sources */,
+				8959AC88211C9C3C004D2C87 /* in_pipe.c in Sources */,
+				92EB6DC720E4E19700A97A49 /* mux_ts.c in Sources */,
+				92EB6DD220E4E19700A97A49 /* ff_common.c in Sources */,
+				92EB6E1820E4E19700A97A49 /* dec_opensvc.c in Sources */,
+				92EB6E3620E4E58E00A97A49 /* media_object.c in Sources */,
+				92EB6E0420E4E19700A97A49 /* ff_dmx.c in Sources */,
+				92EB6DCE20E4E19700A97A49 /* filelist.c in Sources */,
+				92EB6DE320E4E19700A97A49 /* compose.c in Sources */,
+				92E9DFAF2215CEA700628420 /* raster_rgb.c in Sources */,
+				929DE74924183FB40056AFA7 /* gzio.c in Sources */,
+				92EB6DF320E4E19700A97A49 /* dmx_avi.c in Sources */,
+				92EB6DFD20E4E19700A97A49 /* reframe_mp3.c in Sources */,
 				71CCF32A1277045100339E12 /* terminal.c in Sources */,
+				92E9DFB32215CEA700628420 /* raster_argb.c in Sources */,
 				71CCF32B1277045100339E12 /* base_encoding.c in Sources */,
 				71CCF32C1277045100339E12 /* bitstream.c in Sources */,
+				928607152398F4C800FDA1ED /* ff_avf.c in Sources */,
 				71CCF32D1277045100339E12 /* color.c in Sources */,
+				92EB6E0120E4E19700A97A49 /* reframe_ac3.c in Sources */,
+				92EB6D6C20E4E17F00A97A49 /* filter_register.c in Sources */,
 				71CCF32E1277045100339E12 /* configfile.c in Sources */,
 				71CCF3301277045100339E12 /* downloader.c in Sources */,
 				71CCF3311277045100339E12 /* error.c in Sources */,
 				71CCF3331277045100339E12 /* list.c in Sources */,
 				71CCF3341277045100339E12 /* math.c in Sources */,
+				92EB6E1020E4E19700A97A49 /* in_file.c in Sources */,
+				92EB6DF020E4E19700A97A49 /* dec_vorbis.c in Sources */,
+				9274295A24647B98009ADD8D /* bsrw.c in Sources */,
 				71CCF3351277045100339E12 /* module.c in Sources */,
 				71CCF3381277045100339E12 /* os_module.c in Sources */,
+				92E9DFA62215CE9A00628420 /* g_crypt_openssl.c in Sources */,
 				71CCF3391277045100339E12 /* os_net.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 */,
 				71CCF33F1277045100339E12 /* token.c in Sources */,
 				71CCF3401277045100339E12 /* uni_bidi.c in Sources */,
 				71CCF3411277045100339E12 /* url.c in Sources */,
 				71CCF3421277045100339E12 /* utf.c in Sources */,
 				71CCF3431277045100339E12 /* xml_parser.c in Sources */,
+				92EB6DEC20E4E19700A97A49 /* dasher.c in Sources */,
+				92E9DFB12215CEA700628420 /* ftgrays.c in Sources */,
 				71CCF3451277045100339E12 /* zutil.c in Sources */,
 				7141FF301292CB9200FCB27D /* alloc.c in Sources */,
 				7147426012B918C900DB5A59 /* cache.c in Sources */,
 				970A26C913434D2C0007362C /* m3u8.c in Sources */,
+				92EB6E1620E4E19700A97A49 /* decrypt_cenc_isma.c in Sources */,
 				970A26CA13434D2C0007362C /* mpd.c in Sources */,
-				970A26D713434DAC0007362C /* ringbuffer.c in Sources */,
+				92EB6DDE20E4E19700A97A49 /* in_rtp_rtsp.c in Sources */,
+				92EB6DFF20E4E19700A97A49 /* dmx_vobsub.c in Sources */,
 				970A26D813434DAC0007362C /* unicode.c in Sources */,
 				97FF0660138CE4C400D6C707 /* os_config_init.c in Sources */,
 				9747B6F414864C7800280D95 /* ait.c in Sources */,
 				9747B6F514864C7800280D95 /* dsmcc.c in Sources */,
 				97DDAFEF1569631900528219 /* sha1.c in Sources */,
+				92EB6DFC20E4E19700A97A49 /* in_rtp_stream.c in Sources */,
 				97793E5115E6370D005123E1 /* dash_client.c in Sources */,
 				97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */,
 				97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */,
 				97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */,
-				970FBA7D16F9F0720052216D /* html5_media.c in Sources */,
-				970FBA7E16F9F0720052216D /* html5_mse.c in Sources */,
-				970FBA8116F9F0920052216D /* html5_media_smjs.c in Sources */,
-				970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */,
+				92EB6DF120E4E19700A97A49 /* isoffin_load.c in Sources */,
+				92334CD32333AB9A00DA6051 /* quickjs.c in Sources */,
+				92EB6E0820E4E19700A97A49 /* dec_ac52.c in Sources */,
+				92EB6E1920E4E19700A97A49 /* ff_enc.c in Sources */,
 				97E29F6917D1138B00904FBF /* webvtt.c in Sources */,
-				97E29F6E17D114E900904FBF /* mse_in.c in Sources */,
-				97E29F7A17D118F100904FBF /* raw_video.c in Sources */,
-				97E29F7C17D1190600904FBF /* osd.c in Sources */,
-				28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */,
-				28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */,
-				28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */,
-				97A8DDC41896AFF300F4680F /* ttml.c in Sources */,
-				92B32CA41A08ABBF0065F44A /* webvtt_smjs.c in Sources */,
-				92B32CA91A08AC130065F44A /* vtt_dec.c in Sources */,
-				92B32CAA1A08AC130065F44A /* vtt_in.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2602,6 +2627,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -2613,6 +2639,12 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_CONFIG_DARWIN,
+					GPAC_CONFIG_IOS,
+					XP_UNIX,
+					CONFIG_DARWIN_GL,
+				);
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2644,6 +2676,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -2651,6 +2684,12 @@
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_CONFIG_DARWIN,
+					GPAC_CONFIG_IOS,
+					XP_UNIX,
+					CONFIG_DARWIN_GL,
+				);
 				GCC_VERSION = "";
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
@@ -2683,6 +2722,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = NO;
 				COPY_PHASE_STRIP = NO;
 				ENABLE_BITCODE = NO;
 				EXECUTABLE_PREFIX = "";
@@ -2690,11 +2731,12 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
+					GPAC_CONFIG_IOS,
 					GPAC_AMR_IN_STANDALONE,
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = "";
+				"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = NO;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -2724,16 +2766,19 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = NO;
 				COPY_PHASE_STRIP = YES;
 				ENABLE_BITCODE = NO;
 				EXECUTABLE_PREFIX = "";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
+					GPAC_CONFIG_IOS,
 					GPAC_AMR_IN_STANDALONE,
 				);
 				GCC_THUMB_SUPPORT = NO;
 				GCC_VERSION = "";
+				"GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64]" = NO;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
 				HEADER_SEARCH_PATHS = (
 					../../include,
@@ -2771,11 +2816,10 @@
 				DEPLOYMENT_LOCATION = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
+					GPAC_CONFIG_IOS,
 					XP_UNIX,
 				);
 				GCC_THUMB_SUPPORT = NO;
@@ -2802,11 +2846,10 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				DEPLOYMENT_LOCATION = YES;
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_FAST_OBJC_DISPATCH = NO;
 				GCC_OBJC_CALL_CXX_CDTORS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					GPAC_CONFIG_DARWIN,
-					GPAC_IPHONE,
+					GPAC_CONFIG_IOS,
 					XP_UNIX,
 				);
 				GCC_THUMB_SUPPORT = NO;

gpac-0.8.0.tar.gz/build/xcode/gpac4ios.xcodeproj/xcshareddata/xcschemes/libgpac_static.xcscheme -> gpac-1.0.0.tar.gz/build/xcode/gpac4ios.xcodeproj/xcshareddata/xcschemes/libgpac_static.xcscheme Changed

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

gpac-0.8.0.tar.gz/change_version.sh -> gpac-1.0.0.tar.gz/change_version.sh Changed

@@ -14,18 +14,6 @@
 rm $source
 mv ftmp $source
 
-#patch doc/configuration.html
-source="doc/configuration.html"
-sed -e "s/GPAC Version.*/GPAC Version $version/;" $source > ftmp
-rm $source
-mv ftmp $source
-
-#patch doc/man/gpac.1
-source="doc/man/gpac.1"
-sed -e "s/GPAC framework version.*/GPAC framework version $version./;" $source > ftmp
-rm $source
-mv ftmp $source
-
 
 #patch  applications/osmo4_ios/osmo4ios-Info.plist 
 
@@ -34,26 +22,6 @@
 rm $source
 mv ftmp $source
 
-# patch applications/osmo4_w32/Osmo4.rc
-
-source="applications/osmo4_w32/Osmo4.rc"
-sed -e "/\"FileDescription\", \"Osmo4-GPAC\"/{n;s/.*/		VALUE \"FileVersion\", \"$version\"/;}" $source | sed -e "/\"ProductName\", \"Osmo4-GPAC\"/{n;s/.*/		VALUE \"ProductVersion\", \"$version\"/;}" > ftmp
-rm $source
-mv ftmp $source
-
-# patch bin/smartphone 2003 (armv4)/release/install/archive.bat
-source="bin/smartphone 2003 (armv4)/release/install/archive.bat"
-sed -e "s/set gpac_version=.*/set gpac_version=\"$version-r%gpac_revision%/;" "$source" > ftmp
-rm "$source"
-mv ftmp "$source"
-
-
-# patch bin/smartphone 2003 (armv4)/release/install/build_installer.bat
-source="bin/smartphone 2003 (armv4)/release/install/build_installer.bat"
-sed -e "s/set gpac_version=.*/set gpac_version=\"$version-r%gpac_revision%/;" "$source" > ftmp
-rm "$source"
-mv ftmp "$source"
-
 # patch file gpac.pc
 source="gpac.pc"
 sed -e "s/Version:.*/Version:$version/;" $source > ftmp
@@ -77,3 +45,9 @@
 sed -e "s/\!define GPAC_VERSION.*/\!define GPAC_VERSION $version/;" $source > ftmp
 rm $source
 mv ftmp $source
+
+# patch file share/doc/configuration.html
+source="share/doc/configuration.html"
+sed -e "s/GPAC Version.*</GPAC Version $version</;" $source > ftmp
+rm $source
+mv ftmp $source

gpac-0.8.0.tar.gz/configure -> gpac-1.0.0.tar.gz/configure Changed

@@ -6,7 +6,6 @@
 #
 #set -v
 
-
 #set temporary file name
 if test ! -z "$TMPDIR" ; then
     TMPDIR1="${TMPDIR}"
@@ -68,8 +67,6 @@
 
 #GPAC module config
 static_modules="no"
-js_flags="XP_UNIX"
-js_lib="-ljs"
 lm_lib=""
 has_mingw_directx="no"
 has_js="no"
@@ -105,15 +102,14 @@
 has_ssl="no"
 has_ipv6="no"
 has_dvb4linux="no"
-has_xmlrpc="no"
 has_openjpeg="no"
 gprof_build="no"
 static_build="no"
 want_pic="no"
 want_gcov="no"
 has_joystick="no"
-has_xul="no"
 has_hid="no"
+has_sock_un="no"
 has_lzma="no"
 enable_joystick="no"
 static_mp4box="no"
@@ -166,7 +162,8 @@
 disable_ttml="no"
 disable_hevc="no"
 disable_atsc="no"
-disable_mcrypt="no"
+disable_crypto="no"
+enable_qjs="yes"
 enable_depth_compositor="no"
 enable_renoir="no"
 enable_sanitizer="no"
@@ -175,6 +172,7 @@
 avcap_ldflags="-lavcap"
 has_opensvc="no"
 has_openhevc="no"
+has_vtb="no"
 
 win32="no"
 mingw32="no"
@@ -214,7 +212,7 @@
 GPAC configuration options:
   --help                   print this message
   --prefix=PREFIX          install in PREFIX [$prefix]
-  --mandir=DIR             man documentation in DIR [PREFIX/man]
+  --mandir=DIR             man documentation in DIR [PREFIX/share/man]
 
   --verbose                enable verbose building [$verbose]
   --source-path=PATH       path of source code [$source_path]
@@ -247,7 +245,6 @@
   --enable-afl             enable instrumentation for American Fuzzy Lop
   --disable-opt            disable GCC optimizations
   --disable-ipv6           disable IPV6 support
-  --disable-wx             disable wxWidgets support
   --disable-platinum       disable Platinum UPnP support
   --disable-alsa           disable Alsa audio
   --disable-oss-audio      disable OSS audio
@@ -316,10 +313,9 @@
   --disable-scenegraph     disable scenegraph, scene parsers and player (terminal and compositor)
   --disable-hevc           disable HEVC support
   --disable-atsc           disable ATSC3 support
-  --disable-mcrypt         disable MCRYPT support
+  --disable-crypto         disable crypto support
 
-Extra libraries configuration. You can turn a libray off or force using the local version in gpac/extra_lib/
-  --use-js=OPT             force SpiderMonkey ECMAScript OPT=[no,local]
+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]
   --use-zlib=OPT           force ZLIB OPT=[no,system,local]
   --use-jpeg=OPT           force JPEG OPT=[no,local]
@@ -334,7 +330,7 @@
   --use-openjpeg=OPT       force openjpeg OPT=[no,system,local]
   --use-a52=OPT            force a52 (ac3) OPT=[no,system,local]
 
-NOTE: The object files are build at the place where configure is launched
+NOTE: The object files are built at the place where configure is launched
 EOF
 exit 1
 fi
@@ -492,8 +488,6 @@
 fi
 case $targetos in
     BeOS)
-        js_flags=-DXP_BEOS
-        xul_flags=-DXP_BEOS
         prefix="/boot/home/config"
         CFLAGS="$CFLAGS -DPIC -fomit-frame-pointer"
         # 3 gcc releases known for BeOS, each with ugly bugs
@@ -550,7 +544,6 @@
         CFLAGS="$CFLAGS -pthread"
         GPAC_SH_FLAGS=-pthread
         freebsd="yes"
-        js_flags="-DXP_UNIX -I/usr/include/js"
         ;;
 
     BSD/OS)
@@ -559,10 +552,8 @@
         ;;
 
     Darwin)
-        js_flags=-DXP_MAC
-        xul_flags=-DXP_MAC
         CFLAGS_DIR="-I$prefix/include"
-        LDFLAGS="-L$prefix/lib"
+        LDFLAGS="-L$prefix/$libdir"
         if test -d /sw/bin ; then
             alt_macosx_dir="/sw"
             CFLAGS_DIR="-I/sw/include $CFLAGS_DIR"
@@ -597,7 +588,6 @@
         ;;
 
     MINGW32*|mingw32|MINGW64*|mingw64|msys*|MSYS*)
-        js_flags="-DXP_PC -D_declspec=__declspec"
         mingw32="yes"
         win32="yes"
         want_pic="no"
@@ -621,14 +611,12 @@
         ;;
 
     CYGWIN*|cygwin*)
-        js_flags=-DXP_PC
         extralibs="$extralibs -lws2_32 -lwinmm"
         cygwin="yes"
         win32="yes"
         ;;
 
     Linux|linux|android)
-        js_flags="-DXP_UNIX -I/usr/include/js"
         LDFLAGS="$LDFLAGS -Wl,--warn-common -Wl,-z,defs"
         linux="yes"
         case "$cpu" in
@@ -672,6 +660,7 @@
 #OK check for all local & systems lib
 local_inc=$source_path/extra_lib/include
 local_lib=$source_path/extra_lib/lib/gcc
+execdir=$source_path/bin/gcc
 
 
 dolog() {
@@ -698,7 +687,7 @@
 
 
 docxx() {
- $cc -o $TMPO $TMPC $@ 0>/dev/null 2>$TMPL
+ $cc -o $TMPO $TMPCXX $@ 0>/dev/null 2>$TMPL
  dolog $@
 }
 
@@ -788,247 +777,15 @@
 
 
 
-#look for spidermonkey JS support
-mozjs_pkgcfg="no"
-
-#spidermonkey test for new API
-if test "$has_js" = "no" ; then
-
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { JSContext *cx=NULL; jsval rp; return JS_AddRoot(cx, &rp); }
-EOF
-
-    #try local
-    js_inc="$local_inc/js"
-    js_flags="-DXP_UNIX -I$local_inc/js"
-    if test "$pkg_config" != "no"; then
-        #try pkg-config
-        if $pkg_config --exists mozilla-js ; then
-            mozjs_pkgcfg="mozilla-js"
-        elif $pkg_config --exists mozjs ; then
-            mozjs_pkgcfg="mozjs"
-        elif $pkg_config --exists mozjs185 ; then
-            mozjs_pkgcfg="mozjs185"
-    elif docc $js_flags -L$local_lib -ljs -lpthread -lm ; then
-        has_js="local"
-        #dc added
-    fi
-
-    if test $mozjs_pkgcfg != "no" ; then
-        js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
-        js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
-        if docc $js_flags $js_lib_pkg $LDFLAGS -lpthread ; then
-           has_js="system"
-           js_lib=`$pkg_config --libs $mozjs_pkgcfg`
-        fi
-    #try firefox folders (starting at ubuntu 11.10, no pkg-config)
-    elif ls -d /usr/lib/firefox* > /dev/null 2>>$logs ; then
-            firefox_version=`cd /usr/lib ; ls -d firefox* | grep -v addons | grep -v devel ; cd - > /dev/null`
-            for i in $firefox_version ; do
-                if test "$has_js" = "no" ; then
-                    js_inc="/usr/include/$i"
-                    js_flags="-DXP_UNIX -I$js_inc"
-                    js_lib="-L/usr/lib/$i/ -lxul -lmozsqlite3 -lmozalloc -lnssutil3 -lnss3 -lnspr4 -lsmime3"
-                    if docc $js_flags $js_lib ; then
-                        has_js="$i"
-                    elif docc $js_flags -lnssutil3 $js_lib -lssl3 ; then
-                        #firefox 11 compatibility
-                        has_js="$i"
-                        js_lib="-lnssutil3 $js_lib -lssl3"
-                    fi
-                fi
-            done
-     fi
-
-        if test "$has_js" = "no" ; then
-            #try prefix (DC)
-            js_inc="$prefix/include/js"
-            js_flags="-DXP_UNIX -I$prefix/include/js"
-            if docc $js_flags -L$prefix/lib -ljs -lpthread ; then
-                has_js="prefix"
-                #dc added end
-            else
-                if docc $js_flags $LDFLAGS -ljs -lpthread ; then
-                    js_inc="/usr/include"
-                    has_js="system"
-                elif docc -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs -lpthread 2>>$logs ; then
-                    has_js="system"
-                    js_flags="-DXP_UNIX -I$alt_macosx_dir/include/js"
-                    js_lib="-L$alt_macosx_dir/lib -ljs"
-                    js_inc="$alt_macosx_dir/include/js"
-                else
-                    #debian spidermonkey (smjs)
-                    js_flags="-DXP_UNIX -I/usr/include/smjs"
-                    js_inc="/usr/include/smjs"
-                    if docc $js_flags $LDFLAGS -lsmjs -lpthread ; then
-                        has_js="system"
-                        js_lib="-lsmjs"
-                    else
-                        #debian spidermonkey (mozjs)
-                        js_flags="-DXP_UNIX -I/usr/include/mozjs"
-                        js_inc="/usr/include/mozjs"
-                        if docc $js_flags $LDFLAGS -lmozjs -lpthread ; then
-                            has_js="system"
-                            js_lib="-lmozjs"
-                        fi
-                    fi
-                fi
-            fi
-        fi
-    fi
-fi
-
-new_js_api="no"
-if test "$has_js" != "no" ; then
-    js_flags="-DSPIDERMONKEY_NEW_API $js_flags"
-    new_js_api="yes"
-fi
-
-#spidermonkey test for regular API
-if test "$has_js" = "no" ; then
-
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { return 0; }
-EOF
-
-    #try local
-    js_inc="$local_inc/js"
-    js_flags="-DXP_UNIX -I$local_inc/js"
-    if test "$cpu" = "sh4" ; then
-        lm_lib="-lm"
-    fi
-    if docc $js_flags $lm_lib -L$local_lib -ljs ; then
-        has_js="local"
-        #dc added
-    else
-        #try prefix (DC)
-        js_inc="$prefix/include/js"
-        js_flags="-DXP_UNIX -I$prefix/include/js"
-        if docc $js_flags -L$prefix/lib -ljs ; then
-            has_js="prefix"
-            #dc added end
-        elif test "$pkg_config" != "no"; then
-            if $pkg_config --exists mozilla-js ; then
-                mozjs_pkgcfg="mozilla-js"
-            elif $pkg_config --exists mozjs ; then
-                mozjs_pkgcfg="mozjs"
-            elif $pkg_config --exists mozjs185 ; then
-                mozjs_pkgcfg="mozjs185"
-        fi
-
-        if test $mozjs_pkgcfg != "no" ; then
-                js_flags=`$pkg_config --cflags $mozjs_pkgcfg`
-                js_lib_pkg=`$pkg_config --libs $mozjs_pkgcfg`
-                if docc $js_flags $js_lib_pkg $LDFLAGS -lpthread ; then
-                    has_js="system"
-                    js_lib=`$pkg_config --libs $mozjs_pkgcfg`
-                fi
-            fi
-        fi
-        if test "$has_js" = "no" ; then
-                if docc $js_flags $LDFLAGS -ljs ; then
-                    js_inc="/usr/include"
-                    has_js="system"
-                elif docc -DXP_UNIX -I$alt_macosx_dir/include/js -L$alt_macosx_dir/lib $LDFLAGS -ljs 2>>$logs ; then
-                    has_js="system"
-                    js_flags="-DXP_UNIX -I$alt_macosx_dir/include/js"
-                    js_lib="-L$alt_macosx_dir/lib -ljs"
-                    js_inc="$alt_macosx_dir/include/js"
-                else
-                    #debian spidermonkey (smjs)
-                    js_flags="-DXP_UNIX -I/usr/include/smjs"
-                    js_inc="/usr/include/smjs"
-                    if docc $js_flags $LDFLAGS -lsmjs ; then
-                        has_js="system"
-                        js_lib="-lsmjs"
-                    else
-                        #debian spidermonkey (mozjs)
-                        js_flags="-DXP_UNIX -I/usr/include/mozjs"
-                        js_inc="/usr/include/mozjs"
-                        if docc $js_flags $LDFLAGS -lmozjs ; then
-                            has_js="system"
-                            js_lib="-lmozjs"
-                        fi
-                    fi
-                fi
-            fi
-        fi
-fi
-
-if test "$has_js" != "no" ; then
-    if test "$linux" = "yes" ; then
-        if test "$cpu" != "sh4"; then
-            #WARNING: there is a bug in MOZJS packages, the MOZILLA_1_8_BRANCH macro is not signaled, there is no way of knowing
-            #if the lib has been compiled with or without the macro. We currently just decide that if the macro is present
-            #in the header, it was enabled in the build
-            if test "$new_js_api" = "no" ; then
-                if grep MOZILLA_1_8_BRANCH $js_inc/jsapi.h > /dev/null 2>>$logs ; then
-                    js_flags="-DMOZILLA_1_8_BRANCH $js_flags"
-                    echo "WARNING: Turning on MOZILLA_1_8_BRANCH SpiderMonkey macro"
-                    echo "If you have troubles with scripts in GPAC, disable this macro and recompile"
-                fi
-            else
-
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { JSObject *obj; JS_GetPrivate(obj); return 0; }
-EOF
-                if docc $js_flags $LDFLAGS $js_lib ; then
-
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { jsval vp; JSContext *cx=NULL; JSObject *obj = JS_NewObjectForConstructor(cx, &vp); return 0; }
-EOF
-                    if docc $js_flags $LDFLAGS $js_lib ; then
-                        js_flags="-DUSE_FFDEV_12 $js_flags"
-                    elif grep JSMutableHandleValue $js_inc/jsapi.h | grep JSHasInstanceOp > /dev/null 2>>$logs ; then
-                            js_flags="-DUSE_FFDEV_18 $js_flags"
-                    elif grep JSMutableHandleValue $js_inc/jsapi.h > /dev/null 2>>$logs ; then
-                            js_flags="-DUSE_FFDEV_18 $js_flags"
-                    elif ! grep JS_ConstructObject $js_inc/jsapi.h > /dev/null 2>>$logs ; then
-                            js_flags="-DUSE_FFDEV_16 $js_flags"
-                    elif grep JSHandleObject $js_inc/jsapi.h > /dev/null 2>>$logs ; then
-                            js_flags="-DUSE_FFDEV_15 $js_flags"
-                        else
-                js_flags="-DUSE_FFDEV_14 $js_flags"
-                 fi
-                fi
-            fi
-        fi
-    fi
-fi
-
-
-
-if test "$has_js" != "no" ; then
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { JSContext *cx=NULL; JS_SetRuntimeThread(cx); return 0;}
-EOF
-    if docc $js_flags $LDFLAGS $js_lib ; then
-        js_flags="$js_flags"
-    else
-        js_flags="-DNO_JS_RUNTIMETHREAD $js_flags"
-    fi
-fi
-
-
-#end JS test
-
-
-
 #look for platinum support
-cat > $TMPC << EOF
+cat > $TMPCXX << EOF
 #include <Platinum.h>
 int main( void ) { return 0; }
 EOF
-if docxx -o $TMPO $TMPC -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread ; then
+if docxx -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread ; then
   has_platinum="yes"
 fi
 
-
 #look for avcap support
 avcap_cflags=""
 avcap_ldflags="-lavcap"
@@ -1116,10 +873,12 @@
   if docc $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$local_lib ; then
     has_openhevc="yes"
     ohevc_ldflags="-L$local_lib $ohevc_ldflags"
+  elif docc $ohevc_cflags $ohevc_ldflags $LDFLAGS -L$execdir ; then
+    has_openhevc="yes"
+    ohevc_ldflags="-L$execdir $ohevc_ldflags"
   fi
 fi
 
-
 #look for freetype support
 cat > $TMPC << EOF
 #include <ft2build.h>
@@ -1129,32 +888,29 @@
 int main( void ) { return 0; }
 EOF
 ft_cflags="-I$prefix/include "
-ft_lflags="-L$prefix/lib -lfreetype"
+ft_lflags="-L$prefix/$libdir -lfreetype"
 if docc $CFLAGS_DIR $ft_cflags $ft_lflags $LDFLAGS ; then
     has_ft="system"
 fi
-if test "$cross_prefix" = "" ; then
-    if test "$has_ft" = "no" ; then
-        ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
-        ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
-        if docc $ft_cflags $ft_lflags $LDFLAGS ; then
-            has_ft="system"
-        fi
+
+if test "$has_ft" = "no" ; then
+    ft_cflags="`pkg-config --cflags freetype2 2>>$logs`"
+    ft_lflags="`pkg-config --libs freetype2 2>>$logs`"
+    if docc $ft_cflags $ft_lflags $LDFLAGS ; then
+        has_ft="system"
     fi
 fi
+
 if test "$has_ft" = "no" ; then
-    if test "`which freetype-config 2>>$logs`" != ""; then
-        ft_cflags="-I$local_inc/freetype"
-        ft_lflags="-L$local_lib -lfreetype"
-        if docc $ft_cflags $ft_lflags ; then
-            has_ft="local"
-        fi
+    ft_cflags="-I$local_inc/freetype"
+    ft_lflags="-L$local_lib -lfreetype"
+    if docc $ft_cflags $ft_lflags ; then
+        has_ft="local"
     fi
 fi
 #end freetype test
 
 
-
 #look for OpenSSL support
 cat > $TMPC << EOF
 #include <openssl/ssl.h>
@@ -1177,6 +933,19 @@
 fi
 
 
+#look for atomic.h
+cat > $TMPC << EOF
+#include <pthread.h>
+#include <stdatomic.h>
+int main( void ) { return 0; }
+EOF
+
+has_atomic="no"
+if docc $CFLAGS_DIR $LDFLAGS ; then
+    has_atomic="yes"
+else
+    CFLAGS="$CFLAGS -DGPAC_NO_STDATOMIC"
+fi
 
 #look for JPEG support
 cat > $TMPC << EOF
@@ -1202,7 +971,7 @@
             fi
         else
             jpeg_cflags="-I$prefix/include"
-            jpeg_lflags="-L$prefix/lib -ljpeg"
+            jpeg_lflags="-L$prefix/$libdir -ljpeg"
             if docc $jpeg_cflags $jpeg_lflags $LDFLAGS ; then
                 has_jpeg="system"
             fi
@@ -1220,6 +989,20 @@
 
 
 #look for OpenJPEG support
+
+if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
+  if $pkg_config --exists libopenjp2 ; then
+    has_openjpeg="system"
+    openjpeg_cflags=`$pkg_config --cflags libopenjp2`
+    openjpeg_ldflags=`$pkg_config --libs libopenjp2`
+  elif $pkg_config --exists libopenjpeg ; then
+    has_openjpeg="system"
+    openjpeg_cflags=`$pkg_config --cflags libopenjpeg`
+    openjpeg_ldflags=`$pkg_config --libs libopenjpeg`
+  fi
+fi
+
+if test "$has_openjpeg" = "no" ; then
 cat > $TMPC << EOF
 #include <stdio.h>
 #include <openjpeg.h>
@@ -1228,12 +1011,14 @@
 
 if docc $LDFLAGS -lopenjpeg ; then
     has_openjpeg="system"
+    openjpeg_ldflags="-lopenjpeg"
 fi
 if test "$cross_prefix" = "" ; then
     if test "$has_openjpeg" = "no" ; then
         if test "$alt_macosx_dir" != "" ; then
-            if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -ljpeg 2>>$logs ; then
+            if cc -o $TMPO $TMPC -I$alt_macosx_dir/include -L$alt_macosx_dir/lib $LDFLAGS -lopenjpeg 2>>$logs ; then
                 has_openjpeg="system"
+		openjpeg_ldflags="-lopenjpeg"
             fi
         fi
     fi
@@ -1242,9 +1027,11 @@
 if test "$has_openjpeg" = "no" ; then
     if docc -I$local_inc/openjpeg -L$local_lib -lopenjpeg ; then
         has_openjpeg="local"
+	openjpeg_ldflags="-lopenjpeg"
     fi
 fi
 
+fi
 
 
 #look for PNG support
@@ -1254,7 +1041,7 @@
 EOF
 
 png_cflags="-I$prefix/include"
-png_lflags="-L$prefix/lib -lpng -lz"
+png_lflags="-L$prefix/$libdir -lpng -lz"
 if docc $png_cflags $png_lflags $LDFLAGS ; then
     has_png="system"
 elif docc $LDFLAGS -lpng -lz ; then
@@ -1296,7 +1083,7 @@
     fi
 fi
 if test "$has_mad" = "no" ; then
-    if docc -I$local_inc/mad -L$local_lib -lmad ; then
+    if docc -I$local_inc -L$local_lib -lmad ; then
         has_mad="local"
     fi
 fi
@@ -1339,7 +1126,7 @@
 int main( void ) { return 0; }
 EOF
 
-if docc -I$prefix/include -L$prefix/lib $LDFLAGS -lxvidcore -lpthread ; then
+if docc -I$prefix/include -L$prefix/$libdir $LDFLAGS -lxvidcore -lpthread ; then
     has_xvid="system"
 elif docc $LDFLAGS -lxvidcore -lpthread ; then
     has_xvid="system"
@@ -1354,7 +1141,7 @@
     fi
 fi
 if test "$has_xvid" = "no" ; then
-    if docc -I$local_inc/xvid -L$local_lib -lxvidcore -lpthread ; then
+    if docc -I$local_inc -L$local_lib -lxvidcore -lpthread ; then
         has_xvid="local"
     fi
 fi
@@ -1380,7 +1167,7 @@
     fi
 fi
 if test "$has_faad" = "no" ; then
-    if docc -I$local_inc/faad -L$local_lib -lfaad -lm ; then
+    if docc -I$local_inc -L$local_lib -lfaad -lm ; then
         has_faad="local"
     fi
 fi
@@ -1390,14 +1177,12 @@
 #look for FFMPEG support
 
 ffmpeg_cflags=""
-ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale $ffmpeg_extra_ldflags"
-ffmpeg_lflags_dashcast="$ffmpeg_lflags -lavdevice"
+ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lavdevice -lswscale -lswresample -lavfilter $ffmpeg_extra_ldflags"
 
 if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
-  if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil libswresample ; then
-    ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice libswresample`
-    ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libswscale libavutil`
-    ffmpeg_lflags_dashcast=`$pkg_config --libs libavcodec libavformat libswscale libavutil libavdevice`
+  if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil libswresample libavfilter ; then
+    ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libavutil libavdevice libswscale libswresample libavfilter`
+    ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libavutil libavdevice libswscale libswresample libavfilter`
     has_ffmpeg="system"
   fi
 fi
@@ -1414,6 +1199,7 @@
 else
     old_ffmpeg_inc="yes"
 
+# this is immediatly overwritten below??
 cat > $TMPC << EOF
 #include <ffmpeg/avcodec.h>
 #include <stdio.h>
@@ -1440,11 +1226,10 @@
 }
 EOF
 
-if docc -I$prefix/include -L$prefix/lib $ffmpeg_lflags $LDFLAGS ; then
+if docc -I$prefix/include -L$prefix/$libdir $ffmpeg_lflags $LDFLAGS ; then
     has_ffmpeg="system"
     ffmpeg_cflags="-I$prefix/include"
-    ffmpeg_lflags="-L$prefix/lib $ffmpeg_lflags"
-    ffmpeg_lflags_dashcast="-L$prefix/lib $ffmpeg_lflags_dashcast"
+    ffmpeg_lflags="-L$prefix/$libdir $ffmpeg_lflags"
 elif docc $ffmpeg_lflags $LDFLAGS ; then
     has_ffmpeg="system"
 fi
@@ -1455,7 +1240,6 @@
                 has_ffmpeg="system"
                 ffmpeg_cflags="-I$alt_macosx_dir/include"
                 ffmpeg_lflags="-L$alt_macosx_dir/lib $ffmpeg_lflags"
-                ffmpeg_lflags_dashcast="-L$alt_macosx_dir/lib $ffmpeg_lflags_dashcast"
             fi
         fi
     fi
@@ -1465,10 +1249,25 @@
         has_ffmpeg="local"
         ffmpeg_cflags="-I$local_inc"
         ffmpeg_lflags="-L$local_lib $ffmpeg_lflags"
-        ffmpeg_lflags_dashcast="-L$local_lib $ffmpeg_lflags_dashcast"
     fi
 fi
 
+
+#now that cflags has been correctly set, retest
+cat > $TMPC << EOF
+#include <libavcodec/avcodec.h>
+int main(void) {
+    return 0;
+}
+EOF
+
+if docc $ffmpeg_cflags $ffmpeg_lflags $LDFLAGS ; then
+    old_ffmpeg_inc="no"
+else
+    old_ffmpeg_inc="yes"
+fi
+
+
 cat > $TMPC << EOF
 #include <libavutil/frame.h>
 #include <libavcodec/avcodec.h>
@@ -1620,6 +1419,21 @@
 fi
 
 
+#look for VideoToolBox support
+
+if test "$darwin" = "yes" ; then
+vtb_ldflags="-framework CoreFoundation -framework CoreVideo -framework CoreMedia -framework VideoToolBox"
+	cat > $TMPC << EOF
+#include <VideoToolbox/VideoToolbox.h>
+int main( void ) { return 0; }
+EOF
+
+if docc $LDFLAGS $vtb_ldflags ; then
+    has_vtb="yes"
+fi
+fi
+
+
 
 #look for OSS support
 if test "$darwin" = "yes" ; then
@@ -1663,53 +1477,6 @@
 
 fi
 
-
-
-#look for wxWidgets support
-has_wx="no"
-wx_too_old="no"
-
-if test "$cross_prefix" = "" ; then
-    if type wx-config >/dev/null 2>>$logs; then
-
-        wx_version=`wx-config --version | sed 's/[^0-9]//g'`
-
-        if test "$wx_version" -lt 250 ; then
-            wx_too_old="yes"
-            has_wx="yes"
-        else
-            if test "$wx_version" -lt 260 ; then
-                has_wx="yes"
-                wx_cflags=`wx-config --cppflags`
-                wx_lflags=`wx-config --libs`
-            else
-                has_wx="yes"
-                wx_cflags=`wx-config --cppflags core, base`
-                wx_lflags=`wx-config --libs core, base`
-            fi
-
-            if test "$darwin" = "yes" ; then
-                wx_lflags="-Wl,-bind_at_load $wx_lflags -lstdc++" #10.4 needs it, not sure about 10.3
-            fi
-        fi
-
-        cat > $TMPCXX << EOF
-#include <wx/wx.h>
-int main( void ) { return 0; }
-EOF
-
-        if $cc $wx_cflags -o $TMPO $TMPCXX $wx_lflags > /dev/null 2>>$logs ; then
-            wx_version=`wx-config --version | sed 's/[^0-9]//g'`
-            if test "$wx_version" -lt 254 ; then
-                wx_too_old="yes"
-            else
-                has_wx="yes"
-            fi
-        fi
-    fi
-fi
-#end wx test
-
 #look for IPv6
 cat > $TMPC << EOF
 #include <string.h>
@@ -1748,23 +1515,6 @@
 fi
 
 
-
-#look for XMLRPC
-cat > $TMPC << EOF
-#include <xmlrpc-c/base.h>
-#include <xmlrpc-c/server.h>
-#include <xmlrpc-c/server_abyss.h>
-int main( void ) {
-return 0;
-}
-EOF
-
-if docc $LDFLAGS ; then
-    has_xmlrpc="yes"
-fi
-
-
-
 #look for alsa
 cat > $TMPC << EOF
 #include <alsa/asoundlib.h>
@@ -1867,6 +1617,15 @@
     has_hid="yes"
 fi
 
+#look for sys/un.h support
+cat > $TMPC << EOF
+#include <sys/un.h>
+int main( void ) { struct sockaddr_un serv_add; return 0; }
+EOF
+
+if docc $LDFLAGS ; then
+    has_sock_un="yes"
+fi
 
 
 #look for lzma support
@@ -1924,8 +1683,6 @@
             ;;
         --disable-ipv6) has_ipv6="no"
             ;;
-        --disable-wx) has_wx="no"
-            ;;
         --disable-platinum) has_platinum="no"
             ;;
         --disable-oss-audio) has_oss_audio="no"
@@ -1948,6 +1705,8 @@
             ;;
         --disable-ssl) has_ssl="no"
             ;;
+        --disable-lzma) has_lzma="no"
+            ;;
         --enable-depth) enable_depth_compositor="yes"
             ;;
         --static-mp4box) static_mp4box="yes"
@@ -2005,6 +1764,11 @@
                 echo "WARNING!! : you have forced not to use ZLIB. This will disable some core functionalities of GPAC."
                 echo
                 has_zlib="force-no"
+            elif test "$tmp_has_zlib" = "local" ; then
+                echo
+                echo "WARNING!! : zlib is forced to be local without check - make sure it is avaliable in $local_lib"
+                echo
+                has_zlib="local"
             fi
             ;;
         --use-ogg=*) has_ogg=${opt#--use-ogg=}
@@ -2019,9 +1783,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" ; disable_mcrypt="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"
             ;;
-        --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" ; disable_mcrypt="yes"
+        --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"
             ;;
         --disable-3d) disable_3d="yes"
             ;;
@@ -2221,9 +1985,9 @@
             ;;
         --enable-atsc) disable_atsc="no"
             ;;
-        --disable-mcrypt) disable_mcrypt="yes"
+        --disable-qjs) enable_qjs="no"
             ;;
-        --enable-mcrypt) disable_mcrypt="no"
+        --enable-qjs) enable_qjs="yes"
             ;;
     esac
 done
@@ -2310,48 +2074,6 @@
 fi
 
 
-
-#look for GECKO support
-cat > $TMPCXX << EOF
-#include <npapi.h>
-int main( void ) { return 0; }
-EOF
-
-if docxx -I$xulsdk_path $LDFLAGS ; then
-    has_xul="system"
-    xul_flags="-I$xulsdk_path $xul_flags"
-fi
-
-if test "$pkg_config" != "no"; then
-  if test "$has_xul" = "no" ; then
-    if $pkg_config --exists libxul 2>>$logs ; then
-        if docxx -o $TMPO $TMPCXX `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
-            has_xul="system"
-            xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`"
-        fi
-    fi
-  fi
-fi
-
-if test "$has_xul" = "no" ; then
-    if docxx $xul_flags -I$local_inc/gecko-sdk/include $LDFLAGS ; then
-        has_xul="local"
-        xul_flags="-I$local_inc/gecko-sdk/include $xul_flags"
-    else
-        #xulrunner directories are sometimes included through js/xul/ff packages
-        if test ! "$has_js" = "no" -a ! "$has_js" = "local" ; then
-            if docxx $js_flags $js_lib_pkg $LDFLAGS ; then
-                if test "$mozjs_pkgcfg" != "no" ; then
-                    xul_flags=`$pkg_config --cflags $mozjs_pkgcfg`
-                    has_xul="$has_js"
-                fi
-            fi
-        fi
-    fi
-fi
-
-
-
 #look for joystick support
 cat > $TMPC << EOF
 #include <linux/joystick.h>
@@ -2386,8 +2108,6 @@
 
 fi
 
-
-
 #look for SDL support
 sdl_too_old=no
 has_sdl=no
@@ -2463,8 +2183,6 @@
 fi
 #end SDL check
 
-
-
 #look at endianess
 if test -z "$cross_prefix" ; then
 
@@ -2498,7 +2216,7 @@
 
 #man dir
 if test x"$mandir" = x""; then
-    mandir="${prefix}/man"
+    mandir="${prefix}/share/man"
 fi
 
 if test "$static_mp4box" = "yes"; then
@@ -2615,6 +2333,7 @@
 echo "Fixed-Point Version: $use_fixed_point"
 echo "IPV6 Support: $has_ipv6"
 echo "Static Modules: $static_modules"
+echo "QuickJS Support: $enable_qjs"
 
 if test "$disable_player" = "yes" ; then
     echo "Player disabled"
@@ -2834,9 +2553,9 @@
     echo "#define GPAC_DISABLE_ATSC" >> $TMPH
 fi
 
-if test "$disable_mcrypt" = "yes" ; then
-    echo "MCRYPT Support disabled"
-    echo "#define GPAC_DISABLE_MCRYPT" >> $TMPH
+if test "$disable_crypto" = "yes" ; then
+    echo "CRYPTO Support disabled"
+    echo "#define GPAC_DISABLE_CRYPTO" >> $TMPH
 fi
 
 echo ""
@@ -2864,8 +2583,6 @@
 echo "TinyGL support: $has_tinygl"
 echo "OpenSSL support: $has_ssl"
 
-echo "Mozilla XUL/GECKO support: $has_xul"
-
 if test "$win32" = "yes" ; then
     echo "DirectX Support: $has_mingw_directx"
 fi
@@ -2873,22 +2590,8 @@
     echo "DVB Support: $has_dvb4linux"
 fi
 
-echo "XMLRPC Support: $has_xmlrpc"
-
-if test "$wx_too_old" = "yes" ; then
-    has_wx="no"
-    echo "wxWidgets Version too old - please upgrade to 2.6.0 for wxWidgets support"
-fi
-if test "$has_wx" = "yes" ; then
-    echo "wxWidgets support: Version $wx_version"
-else
-    echo "wxWidgets support: no"
-fi
-
-
 echo ""
 echo "** Extra Libraries used **"
-echo "SpiderMonkey: $has_js"
 echo "FreeType: $has_ft"
 echo "JPEG: $has_jpeg"
 echo "OpenJPEG: $has_openjpeg"
@@ -2956,10 +2659,14 @@
     fi
 fi
 
+#we add no deprecate by default on osx (due to opengl ...)
 if test "$darwin" = "yes" ; then
-    CFLAGS="$CFLAGS_DIR $CFLAGS"
+    CFLAGS="$CFLAGS_DIR $CFLAGS -Wno-deprecated -Wno-deprecated-declarations"
+else
+    CFLAGS="$CFLAGS -Wno-deprecated -Wno-deprecated-declarations -Wno-int-in-bool-context"
 fi
 
+
 if test "$enable_sanitizer" = "yes" ; then
     CFLAGS="$CFLAGS -fsanitize=address,undefined -fno-sanitize-recover -g"
     LDFLAGS="$LDFLAGS -fsanitize=address,undefined -ldl"
@@ -3120,18 +2827,11 @@
 
 echo "INSTFLAGS=$INSTFLAGS" >> config.mak
 
-echo "CONFIG_JS=$has_js" >> config.mak
-if test "$has_js" = "no" ; then
-    has_js="no"
-else
-    if test "$has_js" = "local" ; then
-        js_flags="-DXP_UNIX -I$local_inc/js"
-        js_lib="-ljs"
-    fi
-    echo "JS_FLAGS=$js_flags" >> config.mak
-    echo "JS_LIBS=$js_lib" >> config.mak
-    echo "#define GPAC_HAS_SPIDERMONKEY" >> $TMPH
+echo "CONFIG_JS=$enable_qjs" >> config.mak
+if test "$enable_qjs" = "yes" ; then
+echo "#define GPAC_HAS_QJS" >> $TMPH
 fi
+
 if test "$has_zlib" = "no" -o "$has_zlib" = "force-no" ; then
     echo "#define GPAC_DISABLE_ZLIB" >> $TMPH
     echo "CONFIG_ZLIB=no" >> config.mak
@@ -3143,6 +2843,8 @@
 echo "CONFIG_JPEG=$has_jpeg" >> config.mak
 if test "$has_jpeg" != "no" ; then
     echo "#define GPAC_HAS_JPEG" >> $TMPH
+    echo "jpeg_cflags=$jpeg_cflags" >> config.mak
+    echo "jpeg_lflags=$jpeg_lflags" >> config.mak
 fi
 
 echo "CONFIG_PNG=$has_png" >> config.mak
@@ -3150,27 +2852,57 @@
     echo "#define GPAC_HAS_PNG" >> $TMPH
 fi
 
+echo "CONFIG_VTB=$has_vtb" >> config.mak
+if test "$has_vtb" != "no" ; then
+    echo "#define GPAC_HAS_VTB" >> $TMPH
+    echo "vtb_ldflags=$vtb_ldflags" >> config.mak
+fi
+
+if test "$has_sock_un" != "no" ; then
+    echo "#define GPAC_HAS_SOCK_UN" >> $TMPH
+fi
+
 echo "CONFIG_LZMA=$has_lzma" >> config.mak
 if test "$has_lzma" = "yes"; then
 echo "#define GPAC_HAS_LZMA" >> $TMPH
 fi
 
 echo "CONFIG_JP2=$has_openjpeg" >> config.mak
+if test "$has_openjpeg" != "no" ; then
+    echo "JP2_CFLAGS=$openjpeg_cflags" >> config.mak
+    echo "JP2_LDFLAGS=$openjpeg_ldflags" >> config.mak
+    echo "#define GPAC_HAS_JP2" >> $TMPH
+fi
 echo "CONFIG_FAAD=$has_faad" >> config.mak
+if test "$has_faad" != "no" ; then
+    echo "#define GPAC_HAS_FAAD" >> $TMPH
+fi
 echo "CONFIG_MAD=$has_mad" >> config.mak
+if test "$has_mad" != "no" ; then
+    echo "#define GPAC_HAS_MAD" >> $TMPH
+fi
 echo "CONFIG_XVID=$has_xvid" >> config.mak
+if test "$has_xvid" != "no" ; then
+    echo "#define GPAC_HAS_XVID" >> $TMPH
+fi
 echo "CONFIG_OGG=$has_ogg" >> config.mak
 echo "CONFIG_VORBIS=$has_vorbis" >> config.mak
+if test "$has_vorbis" != "no" ; then
+    echo "#define GPAC_HAS_VORBIS" >> $TMPH
+fi
 echo "CONFIG_THEORA=$has_theora" >> config.mak
+if test "$has_theora" != "no" ; then
+    echo "#define GPAC_HAS_THEORA" >> $TMPH
+fi
 echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak
 if test "$has_ffmpeg" = "no"; then
 echo "DISABLE_DASHCAST=yes" >> config.mak
 else
     echo "ffmpeg_cflags=$ffmpeg_cflags" >> config.mak
     echo "ffmpeg_lflags=$ffmpeg_lflags" >> config.mak
-    echo "ffmpeg_lflags_dashcast=$ffmpeg_lflags_dashcast" >> config.mak
     echo "CONFIG_LIBAV=$is_libav" >> config.mak
     echo "CONFIG_LIBSWRESAMPLE=$has_libswresample" >> config.mak
+    echo "#define GPAC_HAS_FFMPEG" >> $TMPH
 fi
 echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
 
@@ -3178,6 +2910,9 @@
 echo "CONFIG_ALSA=$has_alsa" >> config.mak
 echo "CONFIG_JACK=$has_jack" >> config.mak
 echo "CONFIG_A52=$has_a52" >> config.mak
+if test "$has_a52" != "no" ; then
+    echo "#define GPAC_HAS_LIBA52" >> $TMPH
+fi
 echo "CONFIG_PULSEAUDIO=$has_pulseaudio" >> config.mak
 echo "CONFIG_FREENECT=$has_freenect" >> config.mak
 if test "$has_freenect" != "no"
@@ -3186,6 +2921,10 @@
     echo "FREENECT_LDLAGS=$freenect_ld" >> config.mak
 fi
 
+if test "$want_gcov"  = "yes" ; then
+    echo "#define GPAC_ENABLE_COVERAGE" >> $TMPH
+fi
+
 echo "DISABLE_PLAYER=$disable_player" >> config.mak
 echo "DISABLE_STREAMING=$disable_streaming" >> config.mak
 echo "DISABLE_SVG=$disable_svg" >> config.mak
@@ -3225,7 +2964,7 @@
 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_MCRYPT=$disable_mcrypt" >> config.mak
+echo "DISABLE_CRYPTO=$disable_crypto" >> config.mak
 
 if test "$disable_parsers" = "yes" ; then
     disable_m2ts_mux="yes"
@@ -3292,12 +3031,6 @@
     fi
 fi
 
-echo "USE_WXWIDGETS=$has_wx" >> config.mak
-if test "$has_wx" = "yes"; then
-    echo "WX_CFLAGS=$wx_cflags" >> config.mak
-    echo "WX_LFLAGS=$wx_lflags" >> config.mak
-fi
-
 echo "CONFIG_PLATINUM=$has_platinum" >> config.mak
 
 echo "CONFIG_AVCAP=$has_avcap" >> config.mak
@@ -3310,28 +3043,23 @@
 if test "$has_opensvc" = "yes" ; then
     echo "OSVC_CFLAGS=$osvc_cflags" >> config.mak
     echo "OSVC_LDFLAGS=$osvc_ldflags" >> config.mak
+    echo "#define GPAC_HAS_OPENSVC" >> $TMPH
 fi
 
 echo "CONFIG_OPENHEVC=$has_openhevc" >> config.mak
 if test "$has_openhevc" = "yes" ; then
     echo "OHEVC_CFLAGS=$ohevc_cflags" >> config.mak
     echo "OHEVC_LDFLAGS=$ohevc_ldflags" >> config.mak
+    echo "#define GPAC_HAS_OPENHEVC" >> $TMPH
 fi
 
 echo "MOZILLA_DIR=$moz_path" >> config.mak
 
-echo "CONFIG_XUL=$has_xul" >> config.mak
-if test "$has_xul" != "no"; then
-    echo "XUL_CFLAGS=$xul_flags" >> config.mak
-fi
-
 echo "LINUX_DVB=$has_dvb4linux" >> config.mak
 if test "$has_dvb4linux" = "yes"; then
     echo "#define GPAC_HAS_LINUX_DVB" >> $TMPH
 fi
 
-echo "XMLRPC_INC=$has_xmlrpc" >> config.mak
-
 if test "$has_oss_audio" != "no"; then
     echo "OSS_INC_TYPE=$has_oss_audio" >> config.mak
     echo "OSS_CFLAGS=$OSS_CFLAGS" >> config.mak
@@ -3355,6 +3083,7 @@
 echo "HID_LDFLAGS=$hid_lib" >> config.mak
 
 
+
 if test "$is_64" = "yes"; then
 #not on OSX ...
 if test "$darwin" = "yes"; then
@@ -3400,9 +3129,9 @@
 if test "$source_path_used" = "yes" ; then
 
     echo "Creating compilation tree image"
-    SRC_DIRS="src src/utils src/isomedia src/ietf src/odf src/bifs src/scenegraph src/terminal src/crypto src/media_tools src/scene_manager src/compositor src/laser"
+    SRC_DIRS="src src/utils src/isomedia src/ietf src/odf src/bifs src/scenegraph src/filter_core src/filters src/terminal src/crypto src/media_tools src/scene_manager src/compositor src/laser src/evg src/quickjs src/jsmods"
 
-    APP_DIRS="applications/mp4box applications/mp4client applications/osmozilla applications/osmo4_wx applications/mp42ts applications/dashcast"
+    APP_DIRS="applications/gpac applications/mp4box applications/mp4client"
 
     for dir in $SRC_DIRS ; do
         mkdir -p "$dir"
@@ -3506,7 +3235,7 @@
 	echo ""
 	echo "Name: gpac"
 	echo "Description: GPAC Multimedia Framework"
-	echo "URL: http://gpac.sourceforge.net"
+	echo "URL: http://gpac.io"
 	echo "Version:$version"
 	echo "Cflags: -I\${prefix}/include"
 	echo "Libs: -L\${libdir} -lgpac"

gpac-0.8.0.tar.gz/debian/changelog -> gpac-1.0.0.tar.gz/debian/changelog Changed

gpac-0.8.0.tar.gz/debian/control -> gpac-1.0.0.tar.gz/debian/control Changed

@@ -1,33 +1,32 @@
 Source: gpac
 Section: graphics
 Priority: optional
-Maintainer: Jean Le Feuvre <jeanlf@users.sourceforge.net>
-Bugs: mailto:jeanlf@users.sourceforge.net
-Homepage: http://gpac.sourceforge.net
+Maintainer: Jean Le Feuvre <jeanlf@gpac.io>
+Bugs: mailto:jeanlf@gpac.io
+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), xulrunner-dev, libfreetype6-dev, libjpeg62-dev, libpng12-dev, libopenjpeg-dev, libmad0-dev, libfaad-dev, libogg-dev, libvorbis-dev, libtheora-dev, liba52-dev, libavcodec-dev, libavformat-dev, libswscale-dev, libxv-dev, x11proto-video-dev, libgl1-mesa-dev, x11proto-gl-dev, linux-sound-base (>= 1.0), libxvidcore-dev, libssl-dev (>= 0.9.8), libjack-dev (>= 0.118), libasound2-dev (>= 1.0), libpulse-dev (>= 0.9), libsdl-dev (>= 1.2), 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, ccache
 
 Package: gpac
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: multimedia framework based on the MPEG-4 Systems standard
- The main development goal is to provide a clean (a.k.a. readable by as many
- people as possible), small and flexible alternative to the MPEG-4 Systems
- reference software (known as IM1 and distributed in ISO/IEC 14496-5). The
- MPEG-4 Reference software is indeed a very large piece of software,
- designed to verify the standard rather than provide a small,
- production-stable software.
+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), 
+ 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.
+
 
 Package: libgpac-dev
 Architecture: any
 Section: libdevel
 Depends: gpac
-Replaces: gpac (<= 0.5.0)
-Description: multimedia framework based on the MPEG-4 Systems standard
- The main development goal is to provide a clean (a.k.a. readable by as many
- people as possible), small and flexible alternative to the MPEG-4 Systems
- reference software (known as IM1 and distributed in ISO/IEC 14496-5). The
- MPEG-4 Reference software is indeed a very large piece of software,
- designed to verify the standard rather than provide a small,
- production-stable software.
+Replaces: gpac (<= 0.8.0)
+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), 
+ 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-0.8.0.tar.gz/debian/copyright -> gpac-1.0.0.tar.gz/debian/copyright Changed

gpac-0.8.0.tar.gz/debian/docs -> gpac-1.0.0.tar.gz/debian/docs Changed

gpac-0.8.0.tar.gz/debian/gpac.install -> gpac-1.0.0.tar.gz/debian/gpac.install Changed

gpac-0.8.0.tar.gz/debian/rules -> gpac-1.0.0.tar.gz/debian/rules Changed

gpac-0.8.0.tar.gz/gpac.spec -> gpac-1.0.0.tar.gz/gpac.spec Changed

@@ -1,15 +1,14 @@
 # $Id: gpac.spec,v 1.5 2008-12-02 18:04:42 jeanlf Exp $
-Summary: GPAC is a multimedia framework covering MPEG-4, VRML/X3D and SVG.
+Summary: Framework for production, encoding, delivery and interactive playback of multimedia content
 Name: gpac
-Version: 0.8.0
-Release: 0.8.0
+Version: 1.0.0
+Release: 1.0.0
 License: LGPL
 Group: Applications/Multimedia
-Source0: gpac-0.8.0.tar.gz%{?_with_amr:Source1:http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-700.zip}
-URL: http://gpac.sourceforge.net/
+Source0: gpac-1.0.0.tar.gz
+URL: http://gpac.io/
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: SDL
-%{!?_without_js:Requires: js}
 %{!?_without_freetype:Requires: freetype}
 %{!?_without_faad:Requires: faad2}
 %{!?_without_jpeg:Requires: libjpeg-6b}
@@ -19,7 +18,6 @@
 %{!?_without_ffmpeg:Requires: ffmpeg}
 %{!?_without_jack:Requires: libjack}
 BuildRequires: SDL-devel
-%{!?_without_js:BuildRequires: js-devel}
 %{!?_without_freetype:BuildRequires: freetype-devel}
 %{!?_without_faad:BuildRequires: faad2-devel}
 %{!?_without_jpeg:BuildRequires: libjpeg-devel}
@@ -30,46 +28,25 @@
 %{!?_without_jack:BuildRequires: libjack-devel}
 
 %description
-GPAC is a multimedia framework for MPEG-4, VRML/X3D and SVG/SMIL. GPAC is built upon an implementation of the MPEG-4 Systems 
-standard (ISO/IEC 14496-1) developed from scratch in C.
-
-The main development goal is to provide a clean (a.k.a. readable by as many
-people as possible), small and flexible alternative to the MPEG-4 Systems 
-reference software (known as IM1 and distributed in ISO/IEC 14496-5). 
-GPAC covers a very large part of the MPEG-4 standard, and features what can probably 
-be seen as the most advanced and robust 2D MPEG-4 Player available worldwide, as well as 
-a decent 3D MPEG-4/VRML player.
-
-The second development goal is to achieve integration of recent multimedia 
-standards for content playback (SVG/SMIL, VRML, X3D, SWF, etc) and content delivery into a single framework.
-GPAC features 2D and 3D multimedia playback, MPEG-4 Systems (BIFS and LASeR) encoders, multiplexers and 
-publishing tools for content distribution, such as RTP streamers, MPEG-2 TS muxers, ISO Base Media File (MP4 & 3GP a.k.a. ISO/IEC 14496-12) 
-and MPEG DASH muxers.
+
+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.
 
 GPAC is licensed under the GNU Lesser General Public License.
 
 
 Available rpmbuild rebuild options :
---without : js freetype faad a52 jpeg png mad xvid ffmpeg
---with : amr
-
-To build with amr, download
-http://www.3gpp.org/ftp/Specs/archive/26_series/26.073/26073-700.zip
-and put it in the rpm source directory. Then invoke rpmbuild with the 
-"--with amr" option.
+--without : freetype faad a52 jpeg png mad xvid ffmpeg
 
 %prep
 %setup -q -n gpac
-%if %{?_with_amr:1}%{!?_with_amr:0}
-mkdir -p modules/amr_dec/amr_nb
-cd Plugins/amr_dec/AMR_NB
-unzip -j /usr/src/redhat/SOURCES/26073-700.zip
-unzip -j 26073-700_ANSI_C_source_code.zip
-cd ../../..
-%endif
 
 %build
-%configure     --enable-oss-audio     %{?_with_amr: --enable-amr-nb}     %{?_without_js: --disable-js}     %{?_without_freetype: --disable-ft}     %{?_without_faad: --disable-faad}    %{?_without_jpeg: --disable-jpeg}     %{?_without_png: --disable-png}     %{?_without_mad: --disable-mad}     %{?_without_xvid: --disable-xvid}     %{?_without_ffmpeg: --disable-ffmpeg} %{?_without_jack: --disable-jack}
+%configure     --enable-oss-audio     %{?_without_freetype: --disable-ft}     %{?_without_faad: --disable-faad}    %{?_without_jpeg: --disable-jpeg}     %{?_without_png: --disable-png}     %{?_without_mad: --disable-mad}     %{?_without_xvid: --disable-xvid}     %{?_without_ffmpeg: --disable-ffmpeg} %{?_without_jack: --disable-jack}
 make
 
 %install
@@ -92,6 +69,8 @@
 %{_mandir}/man1/*
 
 %changelog
+* Jun 16 2020 Jean Le Feuvre
+- GPAC 1.0 release
 * Fri Jul 3 2015 Jean Le Feuvre
 - Changed to README.md
 * Wed Feb 13 2008 Pierre Souchay

gpac-1.0.0.tar.gz/include/gpac/00_doxy.h Added

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) TELECOM ParisTech 2019
+ do not include in gpac, only here to create doxygen group for doc ordering
+ */
+
+
+//define doxygen groups for their order
+/*!
+\defgroup utils_grp Core Tools
+ \defgroup setup_grp Base data types
+ \ingroup utils_grp
+ \defgroup libsys_grp Library configuration
+ \ingroup utils_grp
+ \defgroup mem_grp Memory Management
+ \ingroup utils_grp
+ \defgroup errors_grp Error codes
+ \ingroup utils_grp
+ \defgroup cst_grp Constants
+ \ingroup utils_grp
+ \defgroup log_grp Logging tools
+ \ingroup utils_grp
+ \defgroup bs_grp Bitstream IO
+ \ingroup utils_grp
+ \defgroup list_grp Generic List object
+ \ingroup utils_grp
+ \defgroup time_grp Local and Network time
+ \ingroup utils_grp
+
+ \defgroup net_grp Network
+ \ingroup utils_grp
+ \defgroup thr_grp Process and Threads
+ \ingroup utils_grp
+ \defgroup math_grp Math
+ \ingroup utils_grp
+ \defgroup download_grp Downloader
+ \ingroup net_grp
+ \defgroup cache_grp DownloaderCache
+ \ingroup download_grp
+ \defgroup osfile_grp File System
+ \ingroup utils_grp
+ \defgroup bascod_grp base64 encoding
+ \ingroup utils_grp
+ \defgroup color_grp Color
+ \ingroup utils_grp
+ \defgroup cfg_grp Configuration File
+ \ingroup utils_grp
+ \defgroup cst_grp Constants
+ \ingroup utils_grp
+ \defgroup lang_grp Languages
+ \ingroup utils_grp
+ \defgroup tok_grp Tokenizer
+ \ingroup utils_grp
+ \defgroup hash_grp Hash and Compression
+ \ingroup utils_grp
+ \defgroup utf_grp Unicode and UTF
+ \ingroup utils_grp
+ \addtogroup xml_grp XML
+ \ingroup utils_grp
+ \defgroup miscsys_grp Misc tools
+ \ingroup utils_grp
+ \defgroup sysmain_grp Main tools
+ \ingroup utils_grp
+
+
+
+\defgroup media_grp Media Tools
+
+\defgroup iso_grp ISO Base Media File
+
+\defgroup filters_grp Filter Management
+
+\defgroup evg_grp Vector Graphics Rendering
+
+\defgroup scene_grp Scene Graph
+
+\defgroup mpeg4sys_grp MPEG-4 Systems
+
+\defgroup playback_grp Media Player
+
+\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.
+
+For SVG and DOM scenegraph API, see https://www.w3.org/TR/SVGTiny12/svgudom.html.
+
+For BIFS and VRML scenegraph, see https://www.web3d.org/documents/specifications/14772/V2.0/part1/javascript.html
+
+SVG and BIFS APIs are automatically loaded when loading an SVG or BIFS scene with script nodes. They cannot be loaded in another way.
+
+
+The JSFilter API is loaded through a dedicated filter, see `gpac -h jsf`.
+
+All other APIs shall be loaded by the parent script (scene or JSFilter) as ECMAScript modules using the `import` directive.
+
+GPAC uses the amazing QuickJS engine for JavaScript support: https://bellard.org/quickjs/quickjs.html. Although not JIT-enabled, it is small, fast and cross-platform which ensures the same behaviour on all devices.
+
+The module loader is the same as the QuickJS libc module loader (https://bellard.org/quickjs/quickjs.html#Modules), except that it checks for .so, .dll or .dylib extensions for C modules.
+
+This means that JS C modules as defined in QuickJS could also be used (https://bellard.org/quickjs/quickjs.html#C-Modules)
+\warning support for C modules is still not fully tested
+
+There is currently no support for non-local modules (http, https ...).
+
+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
+
+Unless indicated otherwise, all errors are handled through exceptions. An exception object contains a code (integer) attribute and optionnally a message (string) attribute.
+
+
+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.
+
+*/
+

gpac-1.0.0.tar.gz/include/gpac/Remotery.h Added

@@ -0,0 +1,672 @@
+
+
+/*
+Copyright 2014-2018 Celtoys Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+/*
+
+Compiling
+---------
+
+* Windows (MSVC) - add lib/Remotery.c and lib/Remotery.h to your program. Set include
+  directories to add Remotery/lib path. The required library ws2_32.lib should be picked
+  up through the use of the #pragma comment(lib, "ws2_32.lib") directive in Remotery.c.
+
+* Mac OS X (XCode) - simply add lib/Remotery.c and lib/Remotery.h to your program.
+
+* Linux (GCC) - add the source in lib folder. Compilation of the code requires -pthreads for
+  library linkage. For example to compile the same run: cc lib/Remotery.c sample/sample.c
+  -I lib -pthread -lm
+
+You can define some extra macros to modify what features are compiled into Remotery. These are
+documented just below this comment.
+
+*/
+
+
+#ifndef RMT_INCLUDED_H
+#define RMT_INCLUDED_H
+
+
+//! @cond Doxygen_Suppress
+
+// Set to 0 to not include any bits of Remotery in your build
+#ifndef RMT_ENABLED
+#define RMT_ENABLED 1
+#endif
+
+// Help performance of the server sending data to the client by marking this machine as little-endian 
+#ifndef RMT_ASSUME_LITTLE_ENDIAN
+#define RMT_ASSUME_LITTLE_ENDIAN 0
+#endif
+
+// Used by the Celtoys TinyCRT library (not released yet)
+#ifndef RMT_USE_TINYCRT
+#define RMT_USE_TINYCRT 0
+#endif
+
+// Assuming CUDA headers/libs are setup, allow CUDA profiling
+#ifndef RMT_USE_CUDA
+#define RMT_USE_CUDA 0
+#endif
+
+// Assuming Direct3D 11 headers/libs are setup, allow D3D11 profiling
+#ifndef RMT_USE_D3D11
+#define RMT_USE_D3D11 0
+#endif
+
+// Allow OpenGL profiling
+#ifndef RMT_USE_OPENGL
+#define RMT_USE_OPENGL 0
+#endif
+
+// Allow Metal profiling
+#ifndef RMT_USE_METAL
+#define RMT_USE_METAL 0
+#endif
+
+// Initially use POSIX thread names to name threads instead of Thread0, 1, ...
+#ifndef RMT_USE_POSIX_THREADNAMES
+#define RMT_USE_POSIX_THREADNAMES 0
+#endif
+
+// How many times we spin data back and forth between CPU & GPU
+// to calculate average RTT (Roundtrip Time). Cannot be 0.
+// Affects OpenGL & D3D11
+#ifndef RMT_GPU_CPU_SYNC_NUM_ITERATIONS
+#define RMT_GPU_CPU_SYNC_NUM_ITERATIONS 16
+#endif
+
+// Time in seconds between each resync to compensate for drifting between GPU & CPU timers,
+// effects of power saving, etc. Resyncs can cause stutter, lag spikes, stalls.
+// Set to 0 for never.
+// Affects OpenGL & D3D11
+#ifndef RMT_GPU_CPU_SYNC_SECONDS
+#define RMT_GPU_CPU_SYNC_SECONDS 30
+#endif
+
+// Whether we should automatically resync if we detect a timer disjoint (e.g.
+// changed from AC power to battery, GPU is overheating, or throttling up/down
+// due to laptop savings events). Set it to 0 to avoid resync in such events.
+// Useful if for some odd reason a driver reports a lot of disjoints.
+// Affects D3D11
+#ifndef RMT_D3D11_RESYNC_ON_DISJOINT
+#define RMT_D3D11_RESYNC_ON_DISJOINT 1
+#endif
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   Compiler/Platform Detection and Preprocessor Utilities
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+// Platform identification
+#if defined(_WINDOWS) || defined(_WIN32)
+    #define RMT_PLATFORM_WINDOWS
+#elif defined(__linux__) || defined(__FreeBSD__)
+    #define RMT_PLATFORM_LINUX
+    #define RMT_PLATFORM_POSIX
+#elif defined(__APPLE__)
+    #define RMT_PLATFORM_MACOS
+    #define RMT_PLATFORM_POSIX
+#endif
+
+#ifdef RMT_DLL
+    #if defined (RMT_PLATFORM_WINDOWS)
+        #if defined (RMT_IMPL)
+            #define RMT_API __declspec(dllexport)
+        #else
+            #define RMT_API __declspec(dllimport)
+        #endif
+    #elif defined (RMT_PLATFORM_POSIX)
+        #if defined (RMT_IMPL)
+            #define RMT_API __attribute__((visibility("default")))
+        #else
+            #define RMT_API
+        #endif
+    #endif
+#else
+    #define RMT_API
+#endif
+
+// Allows macros to be written that can work around the inability to do: #define(x) #ifdef x
+// with the C preprocessor.
+#if RMT_ENABLED
+    #define IFDEF_RMT_ENABLED(t, f) t
+#else
+    #define IFDEF_RMT_ENABLED(t, f) f
+#endif
+#if RMT_ENABLED && RMT_USE_CUDA
+    #define IFDEF_RMT_USE_CUDA(t, f) t
+#else
+    #define IFDEF_RMT_USE_CUDA(t, f) f
+#endif
+#if RMT_ENABLED && RMT_USE_D3D11
+    #define IFDEF_RMT_USE_D3D11(t, f) t
+#else
+    #define IFDEF_RMT_USE_D3D11(t, f) f
+#endif
+#if RMT_ENABLED && RMT_USE_OPENGL
+    #define IFDEF_RMT_USE_OPENGL(t, f) t
+#else
+    #define IFDEF_RMT_USE_OPENGL(t, f) f
+#endif
+#if RMT_ENABLED && RMT_USE_METAL
+    #define IFDEF_RMT_USE_METAL(t, f) t
+#else
+    #define IFDEF_RMT_USE_METAL(t, f) f
+#endif
+
+
+// Public interface is written in terms of these macros to easily enable/disable itself
+#define RMT_OPTIONAL(macro, x) IFDEF_ ## macro(x, )
+#define RMT_OPTIONAL_RET(macro, x, y) IFDEF_ ## macro(x, (y))
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   Types
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+// Boolean
+typedef unsigned int rmtBool;
+#define RMT_TRUE ((rmtBool)1)
+#define RMT_FALSE ((rmtBool)0)
+
+
+// Unsigned integer types
+typedef unsigned char rmtU8;
+typedef unsigned short rmtU16;
+typedef unsigned int rmtU32;
+typedef unsigned long long rmtU64;
+
+
+// Signed integer types
+typedef char rmtS8;
+typedef short rmtS16;
+typedef int rmtS32;
+typedef long long rmtS64;
+
+
+// Const, null-terminated string pointer
+typedef const char* rmtPStr;
+
+
+// Handle to the main remotery instance
+typedef struct Remotery Remotery;
+
+
+// All possible error codes
+typedef enum rmtError
+{
+    RMT_ERROR_NONE,
+    RMT_ERROR_RECURSIVE_SAMPLE,                 // Not an error but an internal message to calling code
+
+    // System errors
+    RMT_ERROR_MALLOC_FAIL,                      // Malloc call within remotery failed
+    RMT_ERROR_TLS_ALLOC_FAIL,                   // Attempt to allocate thread local storage failed
+    RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL,       // Failed to create a virtual memory mirror buffer
+    RMT_ERROR_CREATE_THREAD_FAIL,               // Failed to create a thread for the server
+
+    // Network TCP/IP socket errors
+    RMT_ERROR_SOCKET_INIT_NETWORK_FAIL,         // Network initialisation failure (e.g. on Win32, WSAStartup fails)
+    RMT_ERROR_SOCKET_CREATE_FAIL,               // Can't create a socket for connection to the remote viewer
+    RMT_ERROR_SOCKET_BIND_FAIL,                 // Can't bind a socket for the server
+    RMT_ERROR_SOCKET_LISTEN_FAIL,               // Created server socket failed to enter a listen state
+    RMT_ERROR_SOCKET_SET_NON_BLOCKING_FAIL,     // Created server socket failed to switch to a non-blocking state
+    RMT_ERROR_SOCKET_INVALID_POLL,              // Poll attempt on an invalid socket
+    RMT_ERROR_SOCKET_SELECT_FAIL,               // Server failed to call select on socket
+    RMT_ERROR_SOCKET_POLL_ERRORS,               // Poll notified that the socket has errors
+    RMT_ERROR_SOCKET_ACCEPT_FAIL,               // Server failed to accept connection from client
+    RMT_ERROR_SOCKET_SEND_TIMEOUT,              // Timed out trying to send data
+    RMT_ERROR_SOCKET_SEND_FAIL,                 // Unrecoverable error occured while client/server tried to send data
+    RMT_ERROR_SOCKET_RECV_NO_DATA,              // No data available when attempting a receive
+    RMT_ERROR_SOCKET_RECV_TIMEOUT,              // Timed out trying to receive data
+    RMT_ERROR_SOCKET_RECV_FAILED,               // Unrecoverable error occured while client/server tried to receive data
+
+    // WebSocket errors
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_NOT_GET,      // WebSocket server handshake failed, not HTTP GET
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_VERSION,   // WebSocket server handshake failed, can't locate WebSocket version
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_VERSION,  // WebSocket server handshake failed, unsupported WebSocket version
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_HOST,      // WebSocket server handshake failed, can't locate host
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_HOST,     // WebSocket server handshake failed, host is not allowed to connect
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_KEY,       // WebSocket server handshake failed, can't locate WebSocket key
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_KEY,      // WebSocket server handshake failed, WebSocket key is ill-formed
+    RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL,  // WebSocket server handshake failed, internal error, bad string code
+    RMT_ERROR_WEBSOCKET_DISCONNECTED,           // WebSocket server received a disconnect request and closed the socket
+    RMT_ERROR_WEBSOCKET_BAD_FRAME_HEADER,       // Couldn't parse WebSocket frame header
+    RMT_ERROR_WEBSOCKET_BAD_FRAME_HEADER_SIZE,  // Partially received wide frame header size
+    RMT_ERROR_WEBSOCKET_BAD_FRAME_HEADER_MASK,  // Partially received frame header data mask
+    RMT_ERROR_WEBSOCKET_RECEIVE_TIMEOUT,        // Timeout receiving frame header
+
+    RMT_ERROR_REMOTERY_NOT_CREATED,             // Remotery object has not been created
+    RMT_ERROR_SEND_ON_INCOMPLETE_PROFILE,       // An attempt was made to send an incomplete profile tree to the client
+
+    // CUDA error messages
+    RMT_ERROR_CUDA_DEINITIALIZED,               // This indicates that the CUDA driver is in the process of shutting down
+    RMT_ERROR_CUDA_NOT_INITIALIZED,             // This indicates that the CUDA driver has not been initialized with cuInit() or that initialization has failed
+    RMT_ERROR_CUDA_INVALID_CONTEXT,             // This most frequently indicates that there is no context bound to the current thread
+    RMT_ERROR_CUDA_INVALID_VALUE,               // This indicates that one or more of the parameters passed to the API call is not within an acceptable range of values
+    RMT_ERROR_CUDA_INVALID_HANDLE,              // This indicates that a resource handle passed to the API call was not valid
+    RMT_ERROR_CUDA_OUT_OF_MEMORY,               // The API call failed because it was unable to allocate enough memory to perform the requested operation
+    RMT_ERROR_ERROR_NOT_READY,                  // This indicates that a resource handle passed to the API call was not valid
+
+    // Direct3D 11 error messages
+    RMT_ERROR_D3D11_FAILED_TO_CREATE_QUERY,     // Failed to create query for sample
+
+    // OpenGL error messages
+    RMT_ERROR_OPENGL_ERROR,                     // Generic OpenGL error, no need to expose detail since app will need an OpenGL error callback registered
+
+    RMT_ERROR_CUDA_UNKNOWN,
+} rmtError;
+
+
+typedef enum rmtSampleFlags
+{
+    // Default behaviour
+    RMTSF_None = 0,
+
+    // Search parent for same-named samples and merge timing instead of adding a new sample
+    RMTSF_Aggregate = 1,
+
+    // Merge sample with parent if it's the same sample
+    RMTSF_Recursive = 2,
+} rmtSampleFlags;
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   Public Interface
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+// Can call remotery functions on a null pointer
+// TODO: Can embed extern "C" in these macros?
+
+#define rmt_Settings()                                                              \
+    RMT_OPTIONAL_RET(RMT_ENABLED, _rmt_Settings(), NULL )
+
+#define rmt_CreateGlobalInstance(rmt)                                               \
+    RMT_OPTIONAL_RET(RMT_ENABLED, _rmt_CreateGlobalInstance(rmt), RMT_ERROR_NONE)
+
+#define rmt_DestroyGlobalInstance(rmt)                                              \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_DestroyGlobalInstance(rmt))
+
+#define rmt_SetGlobalInstance(rmt)                                                  \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_SetGlobalInstance(rmt))
+
+#define rmt_GetGlobalInstance()                                                     \
+    RMT_OPTIONAL_RET(RMT_ENABLED, _rmt_GetGlobalInstance(), NULL)
+
+#define rmt_SetCurrentThreadName(rmt)                                               \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_SetCurrentThreadName(rmt))
+
+#define rmt_LogText(text)                                                           \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_LogText(text))
+
+#define rmt_BeginCPUSample(name, flags)                                             \
+    RMT_OPTIONAL(RMT_ENABLED, {                                                     \
+        static rmtU32 rmt_sample_hash_##name = 0;                                   \
+        _rmt_BeginCPUSample(#name, flags, &rmt_sample_hash_##name);                 \
+    })
+
+#define rmt_BeginCPUSampleStore(name, flags, hashptr)                                \
+    RMT_OPTIONAL(RMT_ENABLED, {                                                     \
+        _rmt_BeginCPUSample(name, flags, hashptr);                 \
+    })
+
+#define rmt_BeginCPUSampleDynamic(namestr, flags)                                   \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_BeginCPUSample(namestr, flags, NULL))
+
+#define rmt_EndCPUSample()                                                          \
+    RMT_OPTIONAL(RMT_ENABLED, _rmt_EndCPUSample())
+
+
+// Callback function pointer types
+typedef void* (*rmtMallocPtr)(void* mm_context, rmtU32 size);
+typedef void* (*rmtReallocPtr)(void* mm_context, void* ptr, rmtU32 size);
+typedef void (*rmtFreePtr)(void* mm_context, void* ptr);
+typedef void (*rmtInputHandlerPtr)(const char* text, void* context);
+
+
+/*! Struture to fill in to modify Remotery default settings*/
+typedef struct rmtSettings
+{
+    // Which port to listen for incoming connections on
+    rmtU16 port;
+
+    // When this server exits it can leave the port open in TIME_WAIT state for
+    // a while. This forces subsequent server bind attempts to fail when
+    // restarting. If you find restarts fail repeatedly with bind attempts, set
+    // this to true to forcibly reuse the open port.
+    rmtBool reuse_open_port;
+
+    // Only allow connections on localhost?
+    // For dev builds you may want to access your game from other devices but if
+    // you distribute a game to your players with Remotery active, probably best
+    // to limit connections to localhost.
+    rmtBool limit_connections_to_localhost;
+
+    // How long to sleep between server updates, hopefully trying to give
+    // a little CPU back to other threads.
+    rmtU32 msSleepBetweenServerUpdates;
+
+    // Size of the internal message queues Remotery uses
+    // Will be rounded to page granularity of 64k
+    rmtU32 messageQueueSizeInBytes;
+
+    // If the user continuously pushes to the message queue, the server network
+    // code won't get a chance to update unless there's an upper-limit on how
+    // many messages can be consumed per loop.
+    rmtU32 maxNbMessagesPerUpdate;
+
+    // Callback pointers for memory allocation
+    rmtMallocPtr malloc;
+    rmtReallocPtr realloc;
+    rmtFreePtr free;
+    void* mm_context;
+
+    // Callback pointer for receiving input from the Remotery console
+    rmtInputHandlerPtr input_handler;
+
+    // Context pointer that gets sent to Remotery console callback function
+    void* input_handler_context;
+
+    rmtPStr logFilename;
+} rmtSettings;
+
+
+/*! Structure to fill in when binding CUDA to Remotery*/
+typedef struct rmtCUDABind
+{
+    // The main context that all driver functions apply before each call
+    void* context;
+
+    // Driver API function pointers that need to be pointed to
+    // Untyped so that the CUDA headers are not required in this file
+    // NOTE: These are named differently to the CUDA functions because the CUDA API has a habit of using
+    // macros to point function calls to different versions, e.g. cuEventDestroy is a macro for
+    // cuEventDestroy_v2.
+    void* CtxSetCurrent;
+    void* CtxGetCurrent;
+    void* EventCreate;
+    void* EventDestroy;
+    void* EventRecord;
+    void* EventQuery;
+    void* EventElapsedTime;
+
+} rmtCUDABind;
+
+
+// Call once after you've initialised CUDA to bind it to Remotery
+#define rmt_BindCUDA(bind)                                                  \
+    RMT_OPTIONAL(RMT_USE_CUDA, _rmt_BindCUDA(bind))
+
+// Mark the beginning of a CUDA sample on the specified asynchronous stream
+#define rmt_BeginCUDASample(name, stream)                                   \
+    RMT_OPTIONAL(RMT_USE_CUDA, {                                            \
+        static rmtU32 rmt_sample_hash_##name = 0;                           \
+        _rmt_BeginCUDASample(#name, &rmt_sample_hash_##name, stream);       \
+    })
+
+// Mark the end of a CUDA sample on the specified asynchronous stream
+#define rmt_EndCUDASample(stream)                                           \
+    RMT_OPTIONAL(RMT_USE_CUDA, _rmt_EndCUDASample(stream))
+
+
+#define rmt_BindD3D11(device, context)                                      \
+    RMT_OPTIONAL(RMT_USE_D3D11, _rmt_BindD3D11(device, context))
+
+#define rmt_UnbindD3D11()                                                   \
+    RMT_OPTIONAL(RMT_USE_D3D11, _rmt_UnbindD3D11())
+
+#define rmt_BeginD3D11Sample(name)                                          \
+    RMT_OPTIONAL(RMT_USE_D3D11, {                                           \
+        static rmtU32 rmt_sample_hash_##name = 0;                           \
+        _rmt_BeginD3D11Sample(#name, &rmt_sample_hash_##name);              \
+    })
+
+#define rmt_BeginD3D11SampleDynamic(namestr)                                \
+    RMT_OPTIONAL(RMT_USE_D3D11, _rmt_BeginD3D11Sample(namestr, NULL))
+
+#define rmt_EndD3D11Sample()                                                \
+    RMT_OPTIONAL(RMT_USE_D3D11, _rmt_EndD3D11Sample())
+
+
+#define rmt_BindOpenGL()                                                    \
+    RMT_OPTIONAL(RMT_USE_OPENGL, _rmt_BindOpenGL())
+
+#define rmt_UnbindOpenGL()                                                  \
+    RMT_OPTIONAL(RMT_USE_OPENGL, _rmt_UnbindOpenGL())
+
+#define rmt_BeginOpenGLSample(name)                                         \
+    RMT_OPTIONAL(RMT_USE_OPENGL, {                                          \
+        static rmtU32 rmt_sample_hash_##name = 0;                           \
+        _rmt_BeginOpenGLSample(#name, &rmt_sample_hash_##name);             \
+    })
+
+#define rmt_BeginOpenGLSampleStore(name, hashptr)                                         \
+    RMT_OPTIONAL(RMT_USE_OPENGL, {                                          \
+        _rmt_BeginOpenGLSample(name, hashptr);             \
+    })
+
+#define rmt_BeginOpenGLSampleDynamic(namestr)                               \
+    RMT_OPTIONAL(RMT_USE_OPENGL, _rmt_BeginOpenGLSample(namestr, NULL))
+
+#define rmt_EndOpenGLSample()                                               \
+    RMT_OPTIONAL(RMT_USE_OPENGL, _rmt_EndOpenGLSample())
+
+
+#define rmt_BindMetal(command_buffer)                                       \
+    RMT_OPTIONAL(RMT_USE_METAL, _rmt_BindMetal(command_buffer));
+
+#define rmt_UnbindMetal()                                                   \
+    RMT_OPTIONAL(RMT_USE_METAL, _rmt_UnbindMetal());
+
+#define rmt_BeginMetalSample(name)                                          \
+    RMT_OPTIONAL(RMT_USE_METAL, {                                           \
+        static rmtU32 rmt_sample_hash_##name = 0;                           \
+        _rmt_BeginMetalSample(#name, &rmt_sample_hash_##name);              \
+    })
+
+#define rmt_BeginMetalSampleDynamic(namestr)                                \
+    RMT_OPTIONAL(RMT_USE_METAL, _rmt_BeginMetalSample(namestr, NULL))
+
+#define rmt_EndMetalSample()                                                \
+    RMT_OPTIONAL(RMT_USE_METAL, _rmt_EndMetalSample())
+
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   C++ Public Interface Extensions
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#ifdef __cplusplus
+
+
+#if RMT_ENABLED
+
+// Types that end samples in their destructors
+extern "C" RMT_API void _rmt_EndCPUSample(void);
+struct rmt_EndCPUSampleOnScopeExit
+{
+    ~rmt_EndCPUSampleOnScopeExit()
+    {
+        _rmt_EndCPUSample();
+    }
+};
+#if RMT_USE_CUDA
+extern "C" RMT_API void _rmt_EndCUDASample(void* stream);
+struct rmt_EndCUDASampleOnScopeExit
+{
+    rmt_EndCUDASampleOnScopeExit(void* stream) : stream(stream)
+    {
+    }
+    ~rmt_EndCUDASampleOnScopeExit()
+    {
+        _rmt_EndCUDASample(stream);
+    }
+    void* stream;
+};
+#endif
+#if RMT_USE_D3D11
+extern "C" RMT_API void _rmt_EndD3D11Sample(void);
+struct rmt_EndD3D11SampleOnScopeExit
+{
+    ~rmt_EndD3D11SampleOnScopeExit()
+    {
+        _rmt_EndD3D11Sample();
+    }
+};
+#endif
+
+#if RMT_USE_OPENGL
+extern "C" RMT_API void _rmt_EndOpenGLSample(void);
+struct rmt_EndOpenGLSampleOnScopeExit
+{
+    ~rmt_EndOpenGLSampleOnScopeExit()
+    {
+        _rmt_EndOpenGLSample();
+    }
+};
+#endif
+
+#if RMT_USE_METAL
+extern "C" RMT_API void _rmt_EndMetalSample(void);
+struct rmt_EndMetalSampleOnScopeExit
+{
+    ~rmt_EndMetalSampleOnScopeExit()
+    {
+        _rmt_EndMetalSample();
+    }
+};
+#endif
+
+#endif
+
+
+
+// Pairs a call to rmt_Begin<TYPE>Sample with its call to rmt_End<TYPE>Sample when leaving scope
+#define rmt_ScopedCPUSample(name, flags)                                                                \
+        RMT_OPTIONAL(RMT_ENABLED, rmt_BeginCPUSample(name, flags));                                     \
+        RMT_OPTIONAL(RMT_ENABLED, rmt_EndCPUSampleOnScopeExit rmt_ScopedCPUSample##name);
+#define rmt_ScopedCUDASample(name, stream)                                                              \
+        RMT_OPTIONAL(RMT_USE_CUDA, rmt_BeginCUDASample(name, stream));                                  \
+        RMT_OPTIONAL(RMT_USE_CUDA, rmt_EndCUDASampleOnScopeExit rmt_ScopedCUDASample##name(stream));
+#define rmt_ScopedD3D11Sample(name)                                                                     \
+        RMT_OPTIONAL(RMT_USE_D3D11, rmt_BeginD3D11Sample(name));                                        \
+        RMT_OPTIONAL(RMT_USE_D3D11, rmt_EndD3D11SampleOnScopeExit rmt_ScopedD3D11Sample##name);
+#define rmt_ScopedOpenGLSample(name)                                                                    \
+        RMT_OPTIONAL(RMT_USE_OPENGL, rmt_BeginOpenGLSample(name));                                      \
+        RMT_OPTIONAL(RMT_USE_OPENGL, rmt_EndOpenGLSampleOnScopeExit rmt_ScopedOpenGLSample##name);
+#define rmt_ScopedMetalSample(name)                                                                     \
+        RMT_OPTIONAL(RMT_USE_METAL, rmt_BeginMetalSample(name));                                        \
+        RMT_OPTIONAL(RMT_USE_METAL, rmt_EndMetalSampleOnScopeExit rmt_ScopedMetalSample##name);
+
+#endif
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   Private Interface - don't directly call these
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#if RMT_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+RMT_API rmtSettings* _rmt_Settings( void );
+RMT_API enum rmtError _rmt_CreateGlobalInstance(Remotery** remotery);
+RMT_API void _rmt_DestroyGlobalInstance(Remotery* remotery);
+RMT_API void _rmt_SetGlobalInstance(Remotery* remotery);
+RMT_API Remotery* _rmt_GetGlobalInstance(void);
+RMT_API void _rmt_SetCurrentThreadName(rmtPStr thread_name);
+RMT_API void _rmt_LogText(rmtPStr text);
+RMT_API void _rmt_BeginCPUSample(rmtPStr name, rmtU32 flags, rmtU32* hash_cache);
+RMT_API void _rmt_EndCPUSample(void);
+
+#if RMT_USE_CUDA
+RMT_API void _rmt_BindCUDA(const rmtCUDABind* bind);
+RMT_API void _rmt_BeginCUDASample(rmtPStr name, rmtU32* hash_cache, void* stream);
+RMT_API void _rmt_EndCUDASample(void* stream);
+#endif
+
+#if RMT_USE_D3D11
+RMT_API void _rmt_BindD3D11(void* device, void* context);
+RMT_API void _rmt_UnbindD3D11(void);
+RMT_API void _rmt_BeginD3D11Sample(rmtPStr name, rmtU32* hash_cache);
+RMT_API void _rmt_EndD3D11Sample(void);
+#endif
+
+#if RMT_USE_OPENGL
+RMT_API void _rmt_BindOpenGL();
+RMT_API void _rmt_UnbindOpenGL(void);
+RMT_API void _rmt_BeginOpenGLSample(rmtPStr name, rmtU32* hash_cache);
+RMT_API void _rmt_EndOpenGLSample(void);
+#endif
+
+#if RMT_USE_METAL
+RMT_API void _rmt_BeginMetalSample(rmtPStr name, rmtU32* hash_cache);
+RMT_API void _rmt_EndMetalSample(void);
+#endif
+
+#ifdef __cplusplus
+
+}
+#endif
+
+#if RMT_USE_METAL
+#ifdef __OBJC__
+RMT_API void _rmt_BindMetal(id command_buffer);
+RMT_API void _rmt_UnbindMetal();
+#endif
+#endif
+
+#endif  // RMT_ENABLED
+
+//! @endcond
+
+#endif

gpac-0.8.0.tar.gz/include/gpac/ait.h -> gpac-1.0.0.tar.gz/include/gpac/ait.h Changed

gpac-0.8.0.tar.gz/include/gpac/atsc.h -> gpac-1.0.0.tar.gz/include/gpac/atsc.h Changed

@@ -1,5 +1,26 @@
 /*
- * Copyright (c) TELECOM ParisTech 2011
+ *			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_
@@ -14,9 +35,20 @@
 #endif
 
 /*!
- *	\file <gpac/atsc.h>
- *	Specific extensions for ATSC ROUTE demux
- */
+\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;
@@ -42,7 +74,7 @@
 	/*! original file name*/
 	const char *filename;
 	/*! data pointer*/
-	char *data;
+	u8 *data;
 	/*! data size*/
 	u32 size;
 	/*! object TSI*/
@@ -56,127 +88,137 @@
 } 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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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)
  */
-void gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id);
+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
+\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 usefull in case of looping session, or at MPD switch boundaries
- \param atscd the ATSC demultiplexer
- \param service_id ID of the service to cleanup
+\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
+\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
+\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
+\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
+\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
+\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
+\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
+\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

gpac-0.8.0.tar.gz/include/gpac/avparse.h -> gpac-1.0.0.tar.gz/include/gpac/avparse.h Changed

gpac-0.8.0.tar.gz/include/gpac/base_coding.h -> gpac-1.0.0.tar.gz/include/gpac/base_coding.h Changed

gpac-0.8.0.tar.gz/include/gpac/bifs.h -> gpac-1.0.0.tar.gz/include/gpac/bifs.h Changed

gpac-0.8.0.tar.gz/include/gpac/bitstream.h -> gpac-1.0.0.tar.gz/include/gpac/bitstream.h Changed

gpac-0.8.0.tar.gz/include/gpac/cache.h -> gpac-1.0.0.tar.gz/include/gpac/cache.h Changed

@@ -2,7 +2,7 @@
  *                      GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Pierre Souchay
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *                                      All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -27,18 +27,17 @@
 #define _GF_CACHE_H_
 
 /*!
- *      \file <gpac/cache.h>
- *      \brief HTTP Cache management.
+\file <gpac/cache.h>
+\brief HTTP Cache management.
  */
 
 /*!
- *      \addtogroup dld_grp Downloader
- *      \ingroup utils_grp
- *      \brief HTTP Downloader Cache
- *
- *      This section documents the file HTTP caching tools the GPAC framework.
- *
- *      @{
+\addtogroup cache_grp
+\brief HTTP Downloader Cache
+
+This section documents the file HTTP caching tools the GPAC framework.
+
+@{
  */
 
 
@@ -54,142 +53,149 @@
  */
 typedef struct __DownloadedCacheEntryStruct * DownloadedCacheEntry;
 
-
+/*! cache object*/
 typedef struct __CacheReaderStruct * GF_CacheReader;
 
 /**
- * Free The DownloadedCacheEntry handle
- * \param entry The entry to delete
- * \return GF_OK
+
+Free The DownloadedCacheEntry handle
+\param entry The entry to delete
+\return GF_OK
  */
 GF_Err gf_cache_delete_entry( const DownloadedCacheEntry entry );
 
 /**
  * Get the ETag associated with this cache entry if any
- * \param entry The entry
- * \return The ETag if any was defined, NULL otherwise
+\param entry The entry
+\return The ETag if any was defined, NULL otherwise
  */
 const char * gf_cache_get_etag_on_server( const DownloadedCacheEntry entry );
 
 /**
- * Set the eTag in the cache. Data is duplicated, so original string can be freed by caller.
- * \param entry The entry
- * \param eTag The eTag to set
- * \return GF_OK if entry and eTag are valid, GF_BAD_PARAM otherwise
+
+Set the eTag in the cache. Data is duplicated, so original string can be freed by caller.
+\param entry The entry
+\param eTag The eTag to set
+\return GF_OK if entry and eTag are valid, GF_BAD_PARAM otherwise
  */
 GF_Err gf_cache_set_etag_on_disk(const DownloadedCacheEntry entry, const char * eTag );
 
-/**
- * Get the ETag associated with this cache entry if any
- * \param entry The entry
- * \return The ETag if any was defined, NULL otherwise
- */
-const char * gf_cache_get_etag_on_disk( const DownloadedCacheEntry entry );
 
 /**
- * Set the eTag in the cache. Data is duplicated, so original string can be freed by caller.
- * \param entry The entry
- * \param eTag The eTag to set
- * \return GF_OK if entry and eTag are valid, GF_BAD_PARAM otherwise
+
+Set the eTag in the cache. Data is duplicated, so original string can be freed by caller.
+\param entry The entry
+\param eTag The eTag to set
+\return GF_OK if entry and eTag are valid, GF_BAD_PARAM otherwise
  */
 GF_Err gf_cache_set_etag_on_server(const DownloadedCacheEntry entry, const char * eTag );
 
 
 /**
- * Get the Mime-Type associated with this cache entry.
- * \param entry The entry
- * \return The Mime-Type (never NULL if entry is valid)
+
+Get the Mime-Type associated with this cache entry.
+\param entry The entry
+\return The Mime-Type (never NULL if entry is valid)
  */
 const char * gf_cache_get_mime_type( const DownloadedCacheEntry entry );
 
 /**
- * Set the Mime-Type in the cache. Data is duplicated, so original string can be freed by caller.
- * \param entry The entry
- * \param mime_type The mime-type to set
- * \return GF_OK if entry and mime-type are valid, GF_BAD_PARAM otherwise
+
+Set the Mime-Type in the cache. Data is duplicated, so original string can be freed by caller.
+\param entry The entry
+\param mime_type The mime-type to set
+\return GF_OK if entry and mime-type are valid, GF_BAD_PARAM otherwise
  */
 GF_Err gf_cache_set_mime_type(const DownloadedCacheEntry entry, const char * mime_type );
 
 /**
- * Get the URL associated with this cache entry.
- * \param entry The entry
- * \return The Hash key (never NULL if entry is valid)
+
+Get the URL associated with this cache entry.
+\param entry The entry
+\return The Hash key (never NULL if entry is valid)
  */
 const char * gf_cache_get_url( const DownloadedCacheEntry entry );
 
 /**
- * Get the Hash Key associated with this cache entry.
- * \param entry The entry
- * \return The Hash key (never NULL if entry is valid)
- */
-const char * gf_cache_get_hash( const DownloadedCacheEntry entry );
 
-/**
- * Tells whether a cache entry should be cached safely (no
- * \param entry The entry
- * \return 1 if entry should be cached
+Tells whether a cache entry should be cached safely (no
+\param entry The entry
+\return 1 if entry should be cached
  */
 Bool gf_cache_can_be_cached( const DownloadedCacheEntry entry );
 
 /**
- * Get the Last-Modified information associated with this cache entry.
- * \param entry The entry
- * \return The Last-Modified header (can be NULL)
- */
-const char * gf_cache_get_last_modified_on_disk ( const DownloadedCacheEntry entry );
 
-/**
- * Get the Last-Modified information associated with this cache entry.
- * \param entry The entry
- * \return The Last-Modified header (can be NULL)
+Get the Last-Modified information associated with this cache entry.
+\param entry The entry
+\return The Last-Modified header (can be NULL)
  */
 const char * gf_cache_get_last_modified_on_server ( const DownloadedCacheEntry entry );
 
 /**
- * Set the Last-Modified header for this cache entry
- * \param entry The entry
- * \param newLastModified The new value to set, will be duplicated
- * \return GF_OK if everything went alright, GF_BAD_PARAM if entry is NULL
+
+Set the Last-Modified header for this cache entry
+\param entry The entry
+\param newLastModified The new value to set, will be duplicated
+\return GF_OK if everything went alright, GF_BAD_PARAM if entry is NULL
  */
 GF_Err gf_cache_set_last_modified_on_disk ( const DownloadedCacheEntry entry, const char * newLastModified );
 
 /**
- * Set the Last-Modified header for this cache entry
- * \param entry The entry
- * \param newLastModified The new value to set, will be duplicated
- * \return GF_OK if everything went alright, GF_BAD_PARAM if entry is NULL
+
+Set the Last-Modified header for this cache entry
+\param entry The entry
+\param newLastModified The new value to set, will be duplicated
+\return GF_OK if everything went alright, GF_BAD_PARAM if entry is NULL
  */
 GF_Err gf_cache_set_last_modified_on_server ( const DownloadedCacheEntry entry, const char * newLastModified );
 
 /**
- * Get the file name of cache associated with this cache entry.
- * \param entry The entry
- * \return The Cache file (never NULL if entry is valid)
+
+Get the file name of cache associated with this cache entry.
+\param entry The entry
+\return The Cache file (never NULL if entry is valid)
  */
 const char * gf_cache_get_cache_filename( const DownloadedCacheEntry entry );
 
 /**
- * Get the real file size of the cache entry
- * \param entry The entry
- * \return the file size
+
+Get the real file size of the cache entry
+\param entry The entry
+\return the file size
  */
 u32 gf_cache_get_cache_filesize( const DownloadedCacheEntry entry );
 
-/**
- * Flushes The disk cache for this entry (by persisting the property file
- * \param entry The entry
- */
+/*!
+
+Flushes The disk cache for this entry (by persisting the property file
+\param entry The entry
+\return error if any
+*/
 GF_Err gf_cache_flush_disk_cache( const DownloadedCacheEntry entry );
 
+/*!
+
+Set content length of resource
+\param entry The entry
+\param length size of the content in bytes
+\return error if any
+ */
 GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length );
 
+/**
+
+Get content length of resource
+\param entry The entry
+\return size of the content in bytes
+ */
 u32 gf_cache_get_content_length( const DownloadedCacheEntry entry);
 
 /**
- * \brief append cache directives to an HTTP GET request
- * \param entry The entry of cache to use
- * \param httpRequest The HTTP GET request to populate. The request must have been allocated enough to handle the cache arguments
- * \return GF_OK if everything went fine, GF_BAD_PARAM if parameters are wrong
+Append cache directives to an HTTP GET request
+\param entry The entry of cache to use
+\param httpRequest The HTTP GET request to populate. The request must have been allocated enough to handle the cache arguments
+\return GF_OK if everything went fine, GF_BAD_PARAM if parameters are wrong
  */
 GF_Err gf_cache_append_http_headers(const DownloadedCacheEntry entry, char * httpRequest);
 
@@ -198,51 +204,73 @@
  */
 
  /*!
- * Computes the size of the cache elements in directory
- * \param directory containing cache files
- * \return size in bytes
+
+Computes the size of the cache elements in directory
+\param directory containing cache files
+\return size in bytes
  */
 u64 gf_cache_get_size(const char * directory);
 
 /*!
- * Delete all cached files in given directory starting with startpattern
- * \param directory to clean up
- * \return GF_OK if everything went fine
+Delete all cached files in given directory starting with startpattern
+\param directory to clean up
+\return GF_OK if everything went fine
  */
 GF_Err gf_cache_delete_all_cached_files(const char * directory);
 
 
-/*
- * Cache Reader functions
- */
-
-GF_CacheReader gf_cache_reader_new(const DownloadedCacheEntry entry);
-
-GF_Err gf_cache_reader_del( GF_CacheReader handle );
-
-s64 gf_cache_reader_seek_at( GF_CacheReader reader, u64 seekPosition);
-
-s64 gf_cache_reader_get_position( const GF_CacheReader reader);
-
-s64 gf_cache_reader_get_currentSize( GF_CacheReader reader );
-
-s64 gf_cache_reader_get_full_size( GF_CacheReader reader );
-
-s32 gf_cache_reader_read( GF_CacheReader reader, char * buff, s32 length);
+/*!
 
+Check if a given cache entry is corrupted (incomplete)
+\param entry The entry
+\return GF_TRUE if resource is corrupted
+ */
 Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry);
 
+/*!
+Mark associated files as "to be deleted" when the cache entry is removed
+\param entry The entry
+ */
 void gf_cache_entry_set_delete_files_when_deleted(const DownloadedCacheEntry entry);
 
+/*!
+Check if associated files is marked as "to be deleted" when the cache entry is removed
+\param entry The entry
+\return GF_TRUE if cache entry is flaged as "to be deleted"
+ */
 Bool gf_cache_entry_is_delete_files_when_deleted(const DownloadedCacheEntry entry);
 
+/*!
+Get the number of sessions for a cache entry
+\param entry The entry
+\return the number of sessions using this cache entry
+ */
 u32 gf_cache_get_sessions_count_for_cache_entry(const DownloadedCacheEntry entry);
 
+/*!
+Get the start range of a cache entry
+\param entry The entry
+\return the start range in bytes
+ */
 u64 gf_cache_get_start_range( const DownloadedCacheEntry entry );
+/*!
+Get the end range of a cache entry
+\param entry The entry
+\return the end range in bytes
+ */
 u64 gf_cache_get_end_range( const DownloadedCacheEntry entry );
 
-
+/*!
+Check if the entry is marked as "headers processed" (reply headers have been parsed)
+\param entry The entry
+\return GF_TRUE if the entry is marked
+ */
 Bool gf_cache_are_headers_processed(const DownloadedCacheEntry entry);
+/*!
+Mark the entry as "headers processed"
+\param entry The entry
+\return error if any
+ */
 GF_Err gf_cache_set_headers_processed(const DownloadedCacheEntry entry);
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/color.h -> gpac-1.0.0.tar.gz/include/gpac/color.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools interfaces
@@ -37,24 +37,22 @@
 
 
 /*!
- *	\file <gpac/color.h>
- *	\brief Color conversion.
- */
+\file <gpac/color.h>
+\brief Color conversion.
+*/
 	
 /*!
- *\addtogroup color_grp Color
- *\ingroup utils_grp
- *\brief Color tools
- *
- *This section documents color tools for image processing and color conversion
- *	@{
- */
+\addtogroup color_grp
+\brief Color tools
+
+This section documents color tools for image processing and color conversion
+@{
+*/
 
 
 /*!\brief Video framebuffer object
- *
- *The video framebuffer object represents uncompressed color data like images in a variety of formats. Data in
- *the video framebuffer MUST be continuous.
+
+The video framebuffer object represents uncompressed color data like images in a variety of formats. Data in the video framebuffer MUST be continuous.
 */
 typedef struct
 {
@@ -71,18 +69,18 @@
 	/*!Pixel format of the video framebuffer*/
 	u32 pixel_format;
 	/*!pointer to the beginning of the video memory (top-left corner)*/
-	char *video_buffer;
+	u8 *video_buffer;
 	/*!indicates that the video data reside on systems memory or video card one*/
 	Bool is_hardware_memory;
 	/*!indicates U and V (and optional alpha) buffers in case of planar video with separated component. If not set, all components are in the video_buffer pointer*/
-	char *u_ptr, *v_ptr, *a_ptr;
+	u8 *u_ptr, *v_ptr, *a_ptr;
 	/*! alpha value for this surface*/
 	u8 global_alpha;
 } GF_VideoSurface;
 
 /*!\brief Video Window object
- *
- *The video window object represents a rectangle in framebuffer coordinate system
+
+The video window object represents a rectangle in framebuffer coordinate system
 */
 typedef struct
 {
@@ -98,9 +96,9 @@
 
 
 /*!\brief color matrix object
- *
- *The Color transformation matrix object allows complete color space transformation (shift, rotate, skew, add).\n
- *The matrix coefs are in rgba order, hence the color RGBA is transformed to:
+
+The Color transformation matrix object allows complete color space transformation (shift, rotate, skew, add).\n
+ The matrix coefs are in rgba order, hence the color RGBA is transformed to:
  \code
 	R'		m0	m1	m2	m3	m4			R
 	G'		m5	m6	m7	m8	m9			G
@@ -108,7 +106,7 @@
 	A'		m15	m16	m17	m18	m19			A
 	0		0	0	0	0	1			0
  \endcode
- *Coeficients are in intensity scale, ranging from 0 to \ref FIX_ONE.
+ Coeficients are in intensity scale, ranging from 0 to \ref FIX_ONE.
 */
 typedef struct
 {
@@ -119,12 +117,13 @@
 } GF_ColorMatrix;
 
 /*!\brief ARGB color object
- *
- *The color type used in the GPAC framework represents colors in the form 0xAARRGGBB, with each component ranging from 0 to 255
+
+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*/
 #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*/
 #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*/
@@ -139,101 +138,105 @@
 #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*/
 #define GF_COL_555(r, g, b) (u16) (((r & 248)<<7) + ((g & 248)<<2)  + (b>>3))
-/*!\hideinitializer 15-bits color formating macro from red, green and blue components*/
-#define GF_COL_444(r, g, b) (u16) (((r & 240)<<4) + ((g & 240))  + ((b & 240)>>4))
-/*!\hideinitializer 16-bits alphagrey color formating macro alpha and grey components*/
-#define GF_COL_AG(a, g) (u16) ( (a << 8) | g)
-/*!\hideinitializer transfoms a 32-bits color into a 16-bits one.\note alpha component is lost*/
-#define GF_COL_TO_565(c) (((GF_COL_R(c) & 248)<<8) + ((GF_COL_G(c) & 252)<<3)  + (GF_COL_B(c)>>3))
-/*!\hideinitializer transfoms a 32-bits color into a 15-bits one.\note alpha component is lost*/
-#define GF_COL_TO_555(c) (((GF_COL_R(c) & 248)<<7) + ((GF_COL_G(c) & 248)<<2)  + (GF_COL_B(c)>>3))
-/*!\hideinitializer transfoms a 32-bits color into a 16-bits alphagrey one.\note red component is used for grey, green and blue components are lost.*/
-#define GF_COL_TO_AG(c) ( (GF_COL_A(c) << 8) | GF_COL_R(c))
-/*!\hideinitializer transfoms a 32-bits color into a 15-bits one.\note alpha component is lost*/
-#define GF_COL_TO_444(c) (((GF_COL_R(c) & 240)<<4) + ((GF_COL_G(c) & 240))  + ((GF_COL_B(c)>>4) & 240) )
+
+/*!\hideinitializer gets alpha component of a wide color*/
+#define GF_COLW_A(c) (u16) ((c)>>48)
+/*!\hideinitializer gets red component of a wide color*/
+#define GF_COLW_R(c) (u16) ( ((c)>>32) & 0xFFFF)
+/*!\hideinitializer gets green component of a wide color*/
+#define GF_COLW_G(c) (u16) ( ((c)>>16) & 0xFFFF)
+/*!\hideinitializer gets blue component of a wide color*/
+#define GF_COLW_B(c) (u16) ( (c) & 0xFFFF)
 
 /*!Parses color from HTML name or hexa representation
- *\param name name of the color to parse
- *\return GF_Color value with alpha set to 0xFF if successfull, 0 otherwise
+\param name name of the color to parse
+\return GF_Color value with alpha set to 0xFF if successfull, 0 otherwise
 */
 GF_Color gf_color_parse(const char *name);
 
-/*!Gets color from HTML name or hexa representation
- *\param col color to identify
- *\return name of the color if successfull, NULL otherwise
+/*! Gets color from HTML name or hexa representation
+\param col color to identify
+\return name of the color if successfull, NULL otherwise
 */
 const char *gf_color_get_name(GF_Color col);
 
-/*!Inits a color matrix to identity*/
+/*! Inits a color matrix to identity
+\param _this the target color matrix to initialize*/
 void gf_cmx_init(GF_ColorMatrix *_this);
-/*!Inits all coefficients of a color matrix
- *\param _this color matrix to initialize
- *\param coefs list of the 20 fixed numbers to copy
-*/
-void gf_cmx_set_all(GF_ColorMatrix *_this, Fixed *coefs);
-/*!Inits all coefficients of a color matrix
- *\param _this color matrix to initialize
- *\param mrr red-to-red multiplication factor
- *\param mrg red-to-green multiplication factor
- *\param mrb red-to-blue multiplication factor
- *\param mra red-to-alpha multiplication factor
- *\param tr red translation factor
- *\param mgr green-to-red multiplication factor
- *\param mgg green-to-green multiplication factor
- *\param mgb green-to-blue multiplication factor
- *\param mga green-to-alpha multiplication factor
- *\param tg green translation factor
- *\param mbr blue-to-red multiplication factor
- *\param mbg blue-to-green multiplication factor
- *\param mbb blue-to-blue multiplication factor
- *\param mba blue-to-alpha multiplication factor
- *\param tb blue translation factor
- *\param mar alpha-to-red multiplication factor
- *\param mag alpha-to-green multiplication factor
- *\param mab alpha-to-blue multiplication factor
- *\param maa alpha-to-alpha multiplication factor
- *\param ta alpha translation factor
+
+/*! Inits all coefficients of a color matrix
+\param _this color matrix to initialize
+\param mrr red-to-red multiplication factor
+\param mrg red-to-green multiplication factor
+\param mrb red-to-blue multiplication factor
+\param mra red-to-alpha multiplication factor
+\param tr red translation factor
+\param mgr green-to-red multiplication factor
+\param mgg green-to-green multiplication factor
+\param mgb green-to-blue multiplication factor
+\param mga green-to-alpha multiplication factor
+\param tg green translation factor
+\param mbr blue-to-red multiplication factor
+\param mbg blue-to-green multiplication factor
+\param mbb blue-to-blue multiplication factor
+\param mba blue-to-alpha multiplication factor
+\param tb blue translation factor
+\param mar alpha-to-red multiplication factor
+\param mag alpha-to-green multiplication factor
+\param mab alpha-to-blue multiplication factor
+\param maa alpha-to-alpha multiplication factor
+\param ta alpha translation factor
 */
 void gf_cmx_set(GF_ColorMatrix *_this,
                 Fixed mrr, Fixed mrg, Fixed mrb, Fixed mra, Fixed tr,
                 Fixed mgr, Fixed mgg, Fixed mgb, Fixed mga, Fixed tg,
                 Fixed mbr, Fixed mbg, Fixed mbb, Fixed mba, Fixed tb,
                 Fixed mar, Fixed mag, Fixed mab, Fixed maa, Fixed ta);
-/*!Inits a matrix from another matrix
- *\param _this color matrix to initialize
- *\param from color matrix to copy from
+/*! Inits a matrix from another matrix
+\param _this color matrix to initialize
+\param from color matrix to copy from
 */
 void gf_cmx_copy(GF_ColorMatrix *_this, GF_ColorMatrix *from);
 /*!\brief color matrix multiplication
- *
- *Multiplies a color matrix by another one. Result is _this*with
- *\param _this color matrix to transform. Once the function called, _this will contain the resulting color matrix
- *\param with color matrix to add
+
+Multiplies a color matrix by another one. Result is _this*with
+\param _this color matrix to transform. Once the function called, _this will contain the resulting color matrix
+\param with color matrix to add
 */
 void gf_cmx_multiply(GF_ColorMatrix *_this, GF_ColorMatrix *with);
 /*!\brief color matrix transform
- *
- *Transforms a color with a given color matrix
- *\param _this color matrix to use.
- *\param col color to transform
- *\return transformed color
+
+Transforms a color with a given color matrix
+\param _this color matrix to use.
+\param col color to transform
+\return transformed color
 */
 GF_Color gf_cmx_apply(GF_ColorMatrix *_this, GF_Color col);
+
+/*!\brief color matrix transform on wide pixel (16 bit per component)
+
+Transforms a color with a given color matrix
+\param _this color matrix to use.
+\param col color to transform
+\return transformed color
+*/
+u64 gf_cmx_apply_wide(GF_ColorMatrix *_this, u64 col);
+
 /*!\brief color components matrix transform
- *
- *Transforms color components with a given color matrix
- *\param _this color matrix to use.
- *\param a pointer to alpha component. Once the function is called, a contains the transformed alpha component
- *\param r pointer to red component. Once the function is called, r contains the transformed red component
- *\param g pointer to green component. Once the function is called, g contains the transformed green component
- *\param b pointer to blue component. Once the function is called, b contains the transformed blue component
+
+Transforms color components with a given color matrix
+\param _this color matrix to use.
+\param a pointer to alpha component. Once the function is called, a contains the transformed alpha component
+\param r pointer to red component. Once the function is called, r contains the transformed red component
+\param g pointer to green component. Once the function is called, g contains the transformed green component
+\param b pointer to blue component. Once the function is called, b contains the transformed blue component
 */
 void gf_cmx_apply_fixed(GF_ColorMatrix *_this, Fixed *a, Fixed *r, Fixed *g, Fixed *b);
 
 
 /*!\brief Color Key descriptor
- *
- *The ColorKey object represents a ColorKey with low and high threshold keying
+
+The ColorKey object represents a ColorKey with low and high threshold keying
 */
 typedef struct
 {
@@ -248,46 +251,23 @@
 } GF_ColorKey;
 
 /*!\brief stretches two video surfaces
- *
- * Software stretch of source surface ont destination surface.
- *\param dst destination surface
- *\param src source surface
- *\param dst_wnd destination rectangle. If null the entire destination surface is used
- *\param src_wnd source rectangle. If null the entire source surface is used
- *\param alpha blend factor of source over alpha
- *\param flip flips the source
- *\param colorKey makes source pixel matching the color key transparent
- *\param cmat applies color matrix to the source
- *\return error code if any
+
+Software stretch of source surface onto destination surface.
+\param dst destination surface
+\param src source surface
+\param dst_wnd destination rectangle. If null the entire destination surface is used
+\param src_wnd source rectangle. If null the entire source surface is used
+\param alpha blend factor of source over alpha
+\param flip flips the source
+\param colorKey makes source pixel matching the color key transparent
+\param cmat applies color matrix to the source
+\return error code if any
  */
 GF_Err gf_stretch_bits(GF_VideoSurface *dst, GF_VideoSurface *src, GF_Window *dst_wnd, GF_Window *src_wnd, u8 alpha, Bool flip, GF_ColorKey *colorKey, GF_ColorMatrix * cmat);
 
 
-/*!\brief copies YUV 420 10 bits to YUV destination (only YUV420 8 bits supported)
- *
- * Software stretch of source surface ont destination surface.
- *\param vs_dst destination surface
- *\param pY source Y plane
- *\param pU source U plane. if NULL, the U plane is located after the Y plane
- *\param pV source V plane. if NULL, the V plane is located after the U plane
- *\param src_stride source stride in bytes
- *\param src_width source width in pixels
- *\param src_height source height in pixels
- *\param src_wnd source rectangle. If null the entire source surface is used
- *\param swap_uv If GF_TRUE, swaps U and V components.
- *\return error code if any
- */
-GF_Err gf_color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *src_wnd, Bool swap_uv);
-
 /*! @} */
 
-
-GF_Err gf_color_write_yuv422_10_to_yuv422(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *src_wnd, Bool swap_uv);
-GF_Err gf_color_write_yuv444_10_to_yuv444(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *src_wnd, Bool swap_uv);
-GF_Err gf_color_write_yuv422_10_to_yuv(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *src_wnd, Bool swap_uv);
-GF_Err gf_color_write_yuv444_10_to_yuv(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *src_wnd, Bool swap_uv);
-
-
 #ifdef __cplusplus
 }
 #endif

gpac-0.8.0.tar.gz/include/gpac/compositor.h -> gpac-1.0.0.tar.gz/include/gpac/compositor.h Changed

gpac-0.8.0.tar.gz/include/gpac/config_file.h -> gpac-1.0.0.tar.gz/include/gpac/config_file.h Changed

gpac-0.8.0.tar.gz/include/gpac/configuration.h -> gpac-1.0.0.tar.gz/include/gpac/configuration.h Changed

@@ -27,8 +27,19 @@
 #ifndef _GF_CONFIG_H_
 #define _GF_CONFIG_H_
 
+/*!
+\addtogroup setup_grp
+\brief Base data types
+
+This section documents the base data types of GPAC.
+
+@{
+*/
+
 #define GPAC_CONFIGURATION "(static configuration file)"
 
+
+
 /*this file defines all common macros for libgpac compilation
   except for symbian32 which uses .mmp directives ... */
 
@@ -39,9 +50,21 @@
 
 #define GPAC_HAS_SSL
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
+//codecs  
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
+#define GPAC_HAS_LIBA52
+#define GPAC_HAS_FAAD
+#define GPAC_HAS_JP2
+#define GPAC_HAS_MAD
+#define GPAC_HAS_OPENHEVC
+#define GPAC_HAS_OPENSVC
+#define GPAC_HAS_THEORA
+#define GPAC_HAS_VORBIS
+#define GPAC_HAS_XVID
+#define GPAC_HAS_FFMPEG
+#define GPAC_HAS_DTAPI
 
 /*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
 
@@ -52,6 +75,11 @@
 
 #define GPAC_HAS_GLU
 
+#ifndef GPAC_CONFIG_WIN32
+#define GPAC_CONFIG_WIN32
+#endif //GPAC_CONFIG_WIN32
+
+
 #endif /*GPAC_MP4BOX_MINI*/
 
 /*Configuration for WindowsCE 32 bits */
@@ -75,7 +103,7 @@
 #endif
 
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 
@@ -86,47 +114,48 @@
 /*Configuration for Android */
 #elif defined(GPAC_CONFIG_ANDROID)
 
-#ifndef GPAC_ANDROID
-#define GPAC_ANDROID
-#endif
-
 #define GPAC_HAS_IPV6
 #define GPAC_USE_GLES1X
 /*don't use fixed-point version on Android, not needed*/
 //#define GPAC_FIXED_POINT
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 
 /*Configuration for XCode OSX (not iOS) */
-#elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
+#elif defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_CONFIG_IOS)
 
 #define GPAC_HAS_IPV6
 #define GPAC_HAS_SSL
+#define GPAC_HAS_SOCK_UN
 
 //64-bits OSX
 #ifdef __LP64__
+/*! macro defined for 64-bits platforms*/
 #define GPAC_64_BITS
 #endif
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 #define GPAC_HAS_GLU
 
 #define GPAC_MEMORY_TRACKING
+
 /*Configuration for XCode iOS*/
-#elif defined(GPAC_CONFIG_DARWIN) && defined(GPAC_IPHONE)
+#elif defined(GPAC_CONFIG_DARWIN) && defined(GPAC_CONFIG_IOS)
 
 //64-bits iOS
 #ifdef __LP64__
+/*! macro defined for 64-bits platforms*/
 #define GPAC_64_BITS
 #endif
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
+#define GPAC_HAS_SOCK_UN
 
 /*don't use fixed-point version on iOS, not needed*/
 //#define GPAC_FIXED_POINT
@@ -146,7 +175,7 @@
 
 #define GPAC_HAS_IPV6
 #define GPAC_HAS_SSL
-
+#define GPAC_DISABLE_OGG
 
 /*Configuration for Symbian*/
 #elif defined(__SYMBIAN32__)
@@ -155,7 +184,7 @@
 #define GPAC_FIXED_POINT
 #endif
 
-#define GPAC_HAS_SPIDERMONKEY
+#define GPAC_HAS_QJS
 #define GPAC_HAS_JPEG
 #define GPAC_HAS_PNG
 
@@ -189,7 +218,8 @@
 /*disables X3D scene graphs*/
 //#define GPAC_DISABLE_X3D
 
-/*disables MPEG-4 OD Framework - this only minimalize the set of OD features used, however all cannot be removed*/
+/*disables MPEG-4 OD Framework - this only minimalize the set of OD features used, however all cannot be removed
+this macro is currently defined in setup.h */
 //#define GPAC_MINIMAL_ODF
 
 /*disables BIFS coding*/
@@ -199,7 +229,7 @@
 //#define GPAC_DISABLE_LASER
 //#define GPAC_DISABLE_SAF
 
-/*disables BIFS Engine support - TODO - merge DIMS and LASeR into BENG and rename it*/
+/*disables BIFS Engine support*/
 //#define GPAC_DISABLE_SENG
 
 /*disables Cubic QTVR importing*/
@@ -302,5 +332,7 @@
 //#define GPAC_DISABLE_VOBSUB
 
 
+/*! @} */
+
 #endif		/*_GF_CONFIG_H_*/

gpac-0.8.0.tar.gz/include/gpac/constants.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / exported constants
@@ -30,46 +30,30 @@
 extern "C" {
 #endif
 
-/*!
- *	\file <gpac/constants.h>
- *	\brief Most constants defined in GPAC are in this file.
- */
+#include <gpac/setup.h>
 
+/*!
+\file <gpac/constants.h>
+\brief Most constants defined in GPAC are in this file.
+\addtogroup cst_grp
+\brief Constants
 
-/*! \addtogroup cst_grp Constants
- *	\brief Constants used within GPAC
- *
- *	This section documents some constants used in the GPAC framework which are not related to
- *	any specific sub-project.
- *	\ingroup utils_grp
- *	@{
- */
+This section documents some constants used in the GPAC framework which are not related to any specific sub-project.
 
-/*!
- *	\brief Supported file types
- *	\hideinitializer
- *
- * Supported file types in most operations (file playback, editing, saving ...).
+@{
 */
-typedef enum {
-	GF_FILE_TYPE_NOT_SUPPORTED	= 0,
-	GF_FILE_TYPE_ISO_MEDIA		= 1,
-	GF_FILE_TYPE_BT_WRL_X3DV	= 2,
-	GF_FILE_TYPE_XMT_X3D		= 3,
-	GF_FILE_TYPE_SVG			= 4,
-	GF_FILE_TYPE_SWF			= 5,
-	GF_FILE_TYPE_LSR_SAF		= 6,
-} GF_FileType;
 
 
 /*!
- *	\brief Supported media stream types
- *	\hideinitializer
- *
- * Supported media stream types for media objects.
+\brief Supported media stream types
+\hideinitializer
+
+Supported media stream types for media objects.
 */
 enum
 {
+	/*!Unknown stream type*/
+	GF_STREAM_UNKNOWN = 0,
 	/*!MPEG-4 Object Descriptor Stream*/
 	GF_STREAM_OD		= 0x01,
 	/*!MPEG-4 Object Clock Reference Stream*/
@@ -106,87 +90,66 @@
 
 
 	/*!GPAC Private Scene streams\n
-	*\n\note
-	*this stream type (MPEG-4 user-private) is reserved for streams only used to create a scene decoder
-	*handling the scene without input streams, as is the case for file readers (BT/VRML/XML..).\n
-	*The decoderSpecificInfo carried is as follows:
-	 \code
-		u32 file_size:	total file size
-		char file_name[dsi_size - sizeof(u32)]: local file name.
-		\n\note: File may be a cache file, it is the decoder responsability to check if the file is completely
-		downloaded before parsing if needed.
-	 \endcode
-	*The inBufferLength param for decoders using these streams is the stream clock in ms (no input data is given).\n
-	*The "dummy_in" module is available to generate these streams for common files, and also takes care of proper
-	clock init in case of seeking.\n
-	*This is a reentrant stream type: if any media object with this streamtype also exist in the scene, they will be
-	*attached to the scene decoder (except when a new inline scene is detected, in which case a new decoder will
-	*be created). This allows for animation/sprite usage along with the systems timing/stream management.\n
-	*\n
-	*the objectTypeIndication currently in use for these streams are documented below\n
+	\n
+	\note
+	This stream type (MPEG-4 user-private) is reserved for streams used to create a scene decoder
+	handling the scene without input streams, as is the case for file readers (BT/VRML/XML..).\n
 	*/
 	GF_STREAM_PRIVATE_SCENE	= 0x20,
 
-	/*!GPAC Private Media streams\n
-	*\n\note
-	*this stream type (MPEG-4 user-private) is reserved for media streams bypassing GPAC for decoding
-	and composition. The media decoder is only in charge of repositioning the video output, and the compositor will
-	draw an empty rectangle if using alpha composition
-
-	*The decoderSpecificInfo carried only contains an opaque pointer in the data field, which depends on the underlying InputServce provider
+	GF_STREAM_METADATA = 0x21,
 
-	*the objectTypeIndication currently in use for these streams are documented below\n
-	*/
-	GF_STREAM_PRIVATE_MEDIA	= 0x21,
+	GF_STREAM_ENCRYPTED		= 0xE0,
+	/*stream carries files, each file being a complete AU*/
+	GF_STREAM_FILE		= 0xE1,
 
-	/*used internally to signal that the OTI carries a 4CC code, typically media subtype (stsd entry in file format)*/
-	GF_STREAM_4CC		= 0xF0
+	//other stream types may be declared using their handler 4CC as defined in ISOBMFF
 };
 
+/*! Gets the stream type name based on stream type
+\param streamType stream type GF_STREAM_XXX as defined in constants.h
+\return NULL if unknown, otherwise value
+ */
+const char *gf_stream_type_name(u32 streamType);
 
-/*!
- *	Media Object types
- *
- *	This type provides a hint to network modules which may have to generate an service descriptor on the fly.
- *	They occur only if objects/services used in the scene are not referenced through ObjectDescriptors (MPEG-4)
- *	but direct through URL
-*/
-enum
-{
-	/*!service descriptor expected is of undefined type. This should be treated like GF_MEDIA_OBJECT_SCENE*/
-	GF_MEDIA_OBJECT_UNDEF = 0,
-	/*!service descriptor expected is of SCENE type and shall contain a scene stream and OD one if needed*/
-	GF_MEDIA_OBJECT_SCENE,
-	/*!service descriptor expected is of SCENE UPDATES type (animation streams)*/
-	GF_MEDIA_OBJECT_UPDATES,
-	/*!service descriptor expected is of VISUAL type*/
-	GF_MEDIA_OBJECT_VIDEO,
-	/*!service descriptor expected is of AUDIO type*/
-	GF_MEDIA_OBJECT_AUDIO,
-	/*!service descriptor expected is of TEXT type (3GPP/MPEG4)*/
-	GF_MEDIA_OBJECT_TEXT,
-	/*!service descriptor expected is of UserInteraction type (MPEG-4 InputSensor)*/
-	GF_MEDIA_OBJECT_INTERACT
-};
 
-/*! All Media Objects inserted through URLs and not MPEG-4 OD Framework use this ODID*/
-#define GF_MEDIA_EXTERNAL_ID		1050
+/*! Gets the stream type by name
+\param name name of the stream type to query
+\return GF_STREAM_UNKNOWN if unknown, otherwise GF_STREAM_XXX value
+ */
+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)
+\param desc description  of the stream type
+\return stream type, or GF_STREAM_UNKNOWN if no more stream types
+ */
+u32 gf_stream_types_enum(u32 *idx, const char **name, const char **desc);
 
-/*!
- * \brief Pixel Formats
- *
- *	Supported pixel formats for everything using video
-*/
 #ifndef GF_4CC
-#define GF_4CC(a,b,c,d) (((a)<<24)|((b)<<16)|((c)<<8)|(d))
+/*! macro for 4CC*/
+#define GF_4CC(a,b,c,d) ((((u32)a)<<24)|(((u32)b)<<16)|(((u32)c)<<8)|(d))
 #endif
+
+/*!
+\brief Pixel Formats
+
+Supported pixel formats for everything using video
+*/
 typedef enum
 {
 	/*!8 bit GREY */
 	GF_PIXEL_GREYSCALE	=	GF_4CC('G','R','E','Y'),
-	/*!16 bit greyscale*/
+	/*!16 bit greyscale, first alpha, then grey*/
 	GF_PIXEL_ALPHAGREY	=	GF_4CC('G','R','A','L'),
+	/*!16 bit greyscale, first grey, then alpha*/
+	GF_PIXEL_GREYALPHA	=	GF_4CC('A','L','G','R'),
 	/*!12 bit RGB on 16 bits (4096 colors)*/
 	GF_PIXEL_RGB_444	=	GF_4CC('R','4','4','4'),
 	/*!15 bit RGB*/
@@ -194,18 +157,27 @@
 	/*!16 bit RGB*/
 	GF_PIXEL_RGB_565	=	GF_4CC('R','5','6','5'),
 	/*!24 bit RGB*/
-	GF_PIXEL_RGB_24		=	GF_4CC('R','G','B','3'),
+	GF_PIXEL_RGB		=	GF_4CC('R','G','B','3'),
 	/*!24 bit BGR*/
-	GF_PIXEL_BGR_24		=	GF_4CC('B','G','R','3'),
-	/*!32 bit RGB. Component ordering in bytes is B-G-R-X.*/
-	GF_PIXEL_RGB_32		=	GF_4CC('R','G','B','4'),
-	/*!32 bit BGR. Component ordering in bytes is R-G-B-X.*/
-	GF_PIXEL_BGR_32		=	GF_4CC('B','G','R','4'),
-
-	/*!32 bit ARGB. Component ordering in bytes is B-G-R-A.*/
+	GF_PIXEL_BGR		=	GF_4CC('B','G','R','3'),
+	/*!32 bit RGB. Component ordering in bytes is R-G-B-X.*/
+	GF_PIXEL_RGBX		=	GF_4CC('R','G','B','4'),
+	/*!32 bit BGR. Component ordering in bytes is B-G-R-X.*/
+	GF_PIXEL_BGRX		=	GF_4CC('B','G','R','4'),
+	/*!32 bit RGB. Component ordering in bytes is X-R-G-B.*/
+	GF_PIXEL_XRGB		=	GF_4CC('R','G','B','X'),
+	/*!32 bit BGR. Component ordering in bytes is X-B-G-R.*/
+	GF_PIXEL_XBGR		=	GF_4CC('B','G','R','X'),
+
+	/*!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.*/
 	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'),
+	/*!32 bit ABGR. Component ordering in bytes is A-B-G-R.*/
+	GF_PIXEL_ABGR		=	GF_4CC('A','B','G','R'),
+
 	/*!RGB24 + depth plane. Component ordering in bytes is R-G-B-D.*/
 	GF_PIXEL_RGBD		=	GF_4CC('R', 'G', 'B', 'D'),
 	/*!RGB24 + depth plane (7 lower bits) + shape mask. Component ordering in bytes is R-G-B-(S+D).*/
@@ -216,284 +188,411 @@
 	GF_PIXEL_RGBAS		=	GF_4CC('R', 'G', 'A', 'S'),
 
 	/*internal format for OpenGL using pachek RGB 24 bit plus planar depth plane at the end of the image*/
-	GF_PIXEL_RGB_24_DEPTH = GF_4CC('R', 'G', 'B', 'd'),
+	GF_PIXEL_RGB_DEPTH = GF_4CC('R', 'G', 'B', 'd'),
 
-	/*!YUV packed format*/
-	GF_PIXEL_YUY2		=	GF_4CC('Y','U','Y','2'),
-	/*!YUV packed format*/
+	/*!YUV packed 422 format*/
+	GF_PIXEL_YUYV		=	GF_4CC('Y','U','Y','2'),
+	/*!YUV packed 422 format*/
 	GF_PIXEL_YVYU		=	GF_4CC('Y','V','Y','U'),
-	/*!YUV packed format*/
+	/*!YUV packed 422 format*/
 	GF_PIXEL_UYVY		=	GF_4CC('U','Y','V','Y'),
-	/*!YUV packed format*/
+	/*!YUV packed 422 format*/
 	GF_PIXEL_VYUY		=	GF_4CC('V','Y','U','Y'),
-	/*!YUV packed format*/
-	GF_PIXEL_Y422		=	GF_4CC('Y','4','2','2'),
-	/*!YUV packed format*/
-	GF_PIXEL_UYNV		=	GF_4CC('U','Y','N','V'),
-	/*!YUV packed format*/
-	GF_PIXEL_YUNV		=	GF_4CC('Y','U','N','V'),
-	/*!YUV packed format*/
-	GF_PIXEL_V422		=	GF_4CC('V','4','2','2'),
 
 	/*!YUV planar format*/
-	GF_PIXEL_YV12		=	GF_4CC('Y','V','1','2'),
-	/*!YUV planar format*/
-	GF_PIXEL_IYUV		=	GF_4CC('I','Y','U','V'),
-	/*!YUV planar format*/
-	GF_PIXEL_I420		=	GF_4CC('I','4','2','0'),
-	/*!YUV planar format*/
-	GF_PIXEL_I444		=	GF_4CC('I','4','4','4'),
+	GF_PIXEL_YUV		=	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*/
+	GF_PIXEL_YUVA		=	GF_4CC('Y', 'U', 'V', 'A'),
+	/*!YUV420p + Depth plane*/
+	GF_PIXEL_YUVD		=	GF_4CC('Y', 'U', 'V', 'D'),
 	/*!420 Y planar UV interleaved*/
 	GF_PIXEL_NV21		=	GF_4CC('N','V','2','1'),
+	/*!420 Y planar UV interleaved, 10 bits, little endian */
+	GF_PIXEL_NV21_10	=	GF_4CC('N','2','1','0'),
 	/*!420 Y planar VU interleaved (U and V swapped) */
 	GF_PIXEL_NV12		=	GF_4CC('N','V','1','2'),
-	/*!420 Y planar VU interleaved (U and V swapped), 10 bits */
+	/*!420 Y planar VU interleaved (U and V swapped), 10 bits, little endian */
 	GF_PIXEL_NV12_10	=	GF_4CC('N','1','2','0'),
-
-	/*!YV12 + Alpha plane*/
-	GF_PIXEL_YUVA		=	GF_4CC('Y', 'U', 'V', 'A'),
-
-	/*!YV12 + Depth plane*/
-	GF_PIXEL_YUVD		=	GF_4CC('Y', 'U', 'V', 'D'),
-
-	/*!YUV planar format in 10 bits mode, all components are stored as shorts*/
-	GF_PIXEL_YV12_10	=	GF_4CC('Y','0','1','0'),
-
+	/*!422 YUV*/
 	GF_PIXEL_YUV422		=	GF_4CC('Y','4','4','2'),
+	/*!422 YUV, 10 bits, little endian*/
 	GF_PIXEL_YUV422_10	=	GF_4CC('Y','2','1','0'),
+	/*!444 YUV+Alpha*/
+	GF_PIXEL_YUVA444	=	GF_4CC('Y','A','4','4'),
+	/*!444 YUV*/
 	GF_PIXEL_YUV444		=	GF_4CC('Y','4','4','4'),
-	GF_PIXEL_YUV444_10	=	GF_4CC('Y','4','1','0')
+	/*!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*/
+	GF_PIXEL_GL_EXTERNAL	=	GF_4CC('E','X','G','L')
 } GF_PixelFormat;
 
 
-/*!
- * \brief Scene ObjectTypeIndication Formats
- *
- *	Supported ObjectTypeIndication for scene description streams. *_FILE_* are only used with private scene streams
- * and only carry the file name for the scene. Other internal stream types can be used in a real streaming environment
+/*! enumerates GPAC pixel formats
+\param pf_name name of the pixel format
+\return pixel format code
 */
-enum
+GF_PixelFormat gf_pixel_fmt_parse(const char *pf_name);
+
+/*! gets name of pixel formats
+\param pfmt pixel format code
+\return pixel format name
+*/
+const char *gf_pixel_fmt_name(GF_PixelFormat pfmt);
+
+/*! gets short name of pixel formats, as used for file extensions
+\param pfmt pixel format code
+\return pixel format short name
+*/
+const char *gf_pixel_fmt_sname(GF_PixelFormat pfmt);
+
+/*! enumerates pixel formats
+\param idx index of the pixel format, 0-based
+\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
+*/
+Bool 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
+*/
+const char *gf_pixel_fmt_all_names();
+
+/*! gets the list of all supported pixel format names
+\return list of supported pixel format short names
+*/
+const char *gf_pixel_fmt_all_shortnames();
+
+/*! returns size and stride characteristics for the pixel format. If the stride or stride_uv value are not 0, they are used to compute the size. Otherwise no padding at end of line is assumed.
+\param pixfmt  pixfmt format code
+\param width target frame width
+\param height target frame height
+\param[out] out_size output frame size
+\param[in,out] out_stride output frame stride for single plane or plane 0
+\param[in,out] out_stride_uv output frame stride for UV planes
+\param[out] out_planes output frame plane numbers
+\param[out] out_plane_uv_height height of UV planes
+\return error code if any
+*/
+Bool gf_pixel_get_size_info(GF_PixelFormat pixfmt, u32 width, u32 height, u32 *out_size, u32 *out_stride, u32 *out_stride_uv, u32 *out_planes, u32 *out_plane_uv_height);
+
+/*! Gets the number of bytes per pixel on first plane
+\param pixfmt  pixel format code
+\return number of bytes per pixel
+*/
+u32 gf_pixel_get_bytes_per_pixel(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);
+
+/*!
+\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*/
+typedef enum
 {
-	/*!OTI for BIFS v1*/
-	GPAC_OTI_SCENE_BIFS = 0x01,
-	/*!OTI for OD v1*/
-	GPAC_OTI_OD_V1 = 0x01,
-	/*!OTI for BIFS v2*/
-	GPAC_OTI_SCENE_BIFS_V2 = 0x02,
-	/*!OTI for OD v2*/
-	GPAC_OTI_OD_V2 = 0x02,
-	/*!OTI for BIFS InputSensor streams*/
-	GPAC_OTI_SCENE_INTERACT = 0x03,
-	/*!OTI for streams with extended BIFS config*/
-	GPAC_OTI_SCENE_BIFS_EXTENDED = 0x04,
-	/*!OTI for AFX streams with AFXConfig*/
-	GPAC_OTI_SCENE_AFX = 0x05,
-	/*!OTI for Font data streams */
-	GPAC_OTI_FONT = 0x06,
-	/*!OTI for synthesized texture streams */
-	GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE = 0x07,
-	/*!OTI for streaming text streams */
-	GPAC_OTI_TEXT_MPEG4 = 0x08,
-	/*!OTI for LASeR streams*/
-	GPAC_OTI_SCENE_LASER = 0x09,
-	/*!OTI for SAF streams*/
-	GPAC_OTI_SCENE_SAF = 0x0A,
-
-	/*!OTI for MPEG-4 Video Part 2 streams*/
-	GPAC_OTI_VIDEO_MPEG4_PART2 = 0x20,
-	/*!OTI for MPEG-4 Video Part 10 (H.264 | AVC ) streams*/
-	GPAC_OTI_VIDEO_AVC = 0x21,
-	/*!OTI for AVC Parameter sets streams*/
-	GPAC_OTI_VIDEO_AVC_PS = 0x22,
-	/*!OTI for HEVC video */
-	GPAC_OTI_VIDEO_HEVC = 0x23,
-	/*!OTI for H264-SVC streams*/
-	GPAC_OTI_VIDEO_SVC = 0x24,
-	/*!OTI for HEVC layered streams*/
-	GPAC_OTI_VIDEO_LHVC = 0x25,
-	/*!OTI for H264-SVC streams*/
-	GPAC_OTI_VIDEO_MVC = 0x29,
-	/*!OTI for AOM AV1 streams*/
-	GPAC_OTI_VIDEO_AV1 = 0x30,
-	/*!OTI for VP9 streams*/
-	GPAC_OTI_VIDEO_VP9 = 0x31,
-	/*!OTI for MPEG-4 AAC streams*/
-	GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
-
-	/*!OTI for MPEG-2 Visual Simple Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_SIMPLE = 0x60,
-	/*!OTI for MPEG-2 Visual Main Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_MAIN = 0x61,
-	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_SNR = 0x62,
-	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_SPATIAL = 0x63,
-	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_HIGH = 0x64,
-	/*!OTI for MPEG-2 Visual SNR Profile streams*/
-	GPAC_OTI_VIDEO_MPEG2_422 = 0x65,
-
-
-	/*!OTI for MPEG-2 AAC Main Profile streams*/
-	GPAC_OTI_AUDIO_AAC_MPEG2_MP = 0x66,
-	/*!OTI for MPEG-2 AAC Low Complexity Profile streams*/
-	GPAC_OTI_AUDIO_AAC_MPEG2_LCP = 0x67,
-	/*!OTI for MPEG-2 AAC Scalable Sampling Rate Profile streams*/
-	GPAC_OTI_AUDIO_AAC_MPEG2_SSRP = 0x68,
-	/*!OTI for MPEG-2 Audio Part 3 streams*/
-	GPAC_OTI_AUDIO_MPEG2_PART3 = 0x69,
-	/*!OTI for MPEG-1 Video streams*/
-	GPAC_OTI_VIDEO_MPEG1 = 0x6A,
-	/*!OTI for MPEG-1 Audio streams*/
-	GPAC_OTI_AUDIO_MPEG1 = 0x6B,
-	/*!OTI for JPEG streams*/
-	GPAC_OTI_IMAGE_JPEG = 0x6C,
-	/*!OTI for PNG streams*/
-	GPAC_OTI_IMAGE_PNG = 0x6D,
-	/*!OTI for JPEG-2000 streams*/
-	GPAC_OTI_IMAGE_JPEG_2000 = 0x6E,
+	/*!Never used by PID declarations, but used by filters caps*/
+	GF_CODECID_NONE = 0,
+	/*! codecid for BIFS v1*/
+	GF_CODECID_BIFS = 0x01,
+	/*! codecid for OD v1*/
+	GF_CODECID_OD_V1 = 0x01,
+	/*! codecid for BIFS v2*/
+	GF_CODECID_BIFS_V2 = 0x02,
+	/*! codecid for OD v2*/
+	GF_CODECID_OD_V2 = 0x02,
+	/*! codecid for BIFS InputSensor streams*/
+	GF_CODECID_INTERACT = 0x03,
+	/*! codecid for streams with extended BIFS config*/
+	GF_CODECID_BIFS_EXTENDED = 0x04,
+	/*! codecid for AFX streams with AFXConfig*/
+	GF_CODECID_AFX = 0x05,
+	/*! codecid for Font data streams */
+	GF_CODECID_FONT = 0x06,
+	/*! codecid for synthesized texture streams */
+	GF_CODECID_SYNTHESIZED_TEXTURE = 0x07,
+	/*! codecid for streaming text streams */
+	GF_CODECID_TEXT_MPEG4 = 0x08,
+	/*! codecid for LASeR streams*/
+	GF_CODECID_LASER = 0x09,
+	/*! codecid for SAF streams when stored in MP4 ...*/
+	GF_CODECID_SAF = 0x0A,
+
+	/*! codecid for MPEG-4 Video Part 2 streams*/
+	GF_CODECID_MPEG4_PART2 = 0x20,
+	/*! codecid for MPEG-4 Video Part 10 (H.264 | AVC ) streams*/
+	GF_CODECID_AVC = 0x21,
+	/*! codecid for AVC Parameter sets streams*/
+	GF_CODECID_AVC_PS = 0x22,
+	/*! codecid for HEVC video */
+	GF_CODECID_HEVC = 0x23,
+	/*! codecid for H264-SVC streams*/
+	GF_CODECID_SVC = 0x24,
+	/*! codecid for HEVC layered streams*/
+	GF_CODECID_LHVC = 0x25,
+	/*! codecid for H264-SVC streams*/
+	GF_CODECID_MVC = 0x29,
+	/*! codecid for MPEG-4 AAC streams*/
+	GF_CODECID_AAC_MPEG4 = 0x40,
+	/*! codecid for MPEG-2 Visual Simple Profile streams*/
+	GF_CODECID_MPEG2_SIMPLE = 0x60,
+	/*! codecid for MPEG-2 Visual Main Profile streams*/
+	GF_CODECID_MPEG2_MAIN = 0x61,
+	/*! codecid for MPEG-2 Visual SNR Profile streams*/
+	GF_CODECID_MPEG2_SNR = 0x62,
+	/*! codecid for MPEG-2 Visual SNR Profile streams*/
+	GF_CODECID_MPEG2_SPATIAL = 0x63,
+	/*! codecid for MPEG-2 Visual SNR Profile streams*/
+	GF_CODECID_MPEG2_HIGH = 0x64,
+	/*! codecid for MPEG-2 Visual SNR Profile streams*/
+	GF_CODECID_MPEG2_422 = 0x65,
+	/*! codecid for MPEG-2 AAC Main Profile streams*/
+	GF_CODECID_AAC_MPEG2_MP = 0x66,
+	/*! codecid for MPEG-2 AAC Low Complexity Profile streams*/
+	GF_CODECID_AAC_MPEG2_LCP = 0x67,
+	/*! codecid for MPEG-2 AAC Scalable Sampling Rate Profile streams*/
+	GF_CODECID_AAC_MPEG2_SSRP = 0x68,
+	/*! codecid for MPEG-2 Audio Part 3 streams*/
+	GF_CODECID_MPEG2_PART3 = 0x69,
+	/*! codecid for MPEG-1 Video streams*/
+	GF_CODECID_MPEG1 = 0x6A,
+	/*! codecid for MPEG-1 Audio streams*/
+	GF_CODECID_MPEG_AUDIO = 0x6B,
+	/*! codecid for JPEG streams*/
+	GF_CODECID_JPEG = 0x6C,
+	/*! codecid for PNG streams*/
+	GF_CODECID_PNG = 0x6D,
+
+	GF_CODECID_LAST_MPEG4_MAPPING = 0xFF,
+
+	/*! codecid for JPEG-2000 streams*/
+	GF_CODECID_J2K = GF_4CC('j','p','2','k'),
+
+	/*!H263 visual streams*/
+	GF_CODECID_S263 = GF_4CC('s','2','6','3'),
+	GF_CODECID_H263 = GF_4CC('h','2','6','3'),
+
+	/*! codecid for HEVC tiles */
+	GF_CODECID_HEVC_TILES = GF_4CC( 'h', 'v', 't', '1' ),
+
+	/*! codecid for EVRC Voice streams*/
+	GF_CODECID_EVRC	= GF_4CC('s','e','v','c'),
+	/*! codecid for SMV Voice streams*/
+	GF_CODECID_SMV		= GF_4CC('s','s','m','v'),
+	/*! codecid for 13K Voice / QCELP audio streams*/
+	GF_CODECID_QCELP = GF_4CC('s','q','c','p'),
+	/*! codecid for AMR*/
+	GF_CODECID_AMR = GF_4CC('s','a','m','r'),
+	/*! codecid for AMR-WB*/
+	GF_CODECID_AMR_WB = GF_4CC('s','a','w','b'),
+	/*! codecid for EVRC, PacketVideo MUX*/
+	GF_CODECID_EVRC_PV	= GF_4CC('p','e','v','c'),
+
+	/*! codecid for SMPTE VC-1 Video streams*/
+	GF_CODECID_SMPTE_VC1 = GF_4CC('v','c','-','1'),
+	/*! codecid for Dirac Video streams*/
+	GF_CODECID_DIRAC = GF_4CC('d','r','a','c'),
+	/*! codecid for AC-3 audio streams*/
+	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 DRA audio streams*/
+	GF_CODECID_DRA = GF_4CC('d','r','a','1'),
+	/*! codecid for ITU G719 audio streams*/
+	GF_CODECID_G719 = GF_4CC('g','7','1','9'),
+	/*! codecid for DTS  Express low bit rate audio*/
+	GF_CODECID_DTS_LBR = GF_4CC('d','t','s','e'),
+	/*! codecid for DTS Coherent Acoustics audio streams*/
+	GF_CODECID_DTS_CA = GF_4CC('d','t','s','c'),
+	/*! codecid for DTS-HD High Resolution audio streams*/
+	GF_CODECID_DTS_HD_HR = GF_4CC('d','t','s','h'),
+	/*! codecid for DTS-HD Master audio streams*/
+	GF_CODECID_DTS_HD_MASTER = GF_4CC('d','t','s','l'),
+	/*! codecid for DTS-X Master audio streams*/
+	GF_CODECID_DTS_X = GF_4CC('d','t','s','x'),
+
+	/*! codecid for DVB EPG*/
+	GF_CODECID_DVB_EIT = GF_4CC('e','i','t',' '),
+
+	/*! codecid for streaming SVG*/
+	GF_CODECID_SVG = GF_4CC('s','g','g',' '),
+	/*! codecid for streaming SVG + gz*/
+	GF_CODECID_SVG_GZ = GF_4CC('s','v','g','z'),
+	/*! codecid for DIMS (dsi = 3GPP DIMS configuration)*/
+	GF_CODECID_DIMS = GF_4CC('d','i','m','s'),
+	/*! codecid for streaming VTT*/
+	GF_CODECID_WEBVTT = GF_4CC('w','v','t','t'),
+	/*! codecid for streaming simple text*/
+	GF_CODECID_SIMPLE_TEXT = GF_4CC('s','t','x','t'),
+	/*! codecid for meta data streams in text format*/
+	GF_CODECID_META_TEXT = GF_4CC('m','e','t','t'),
+	/*! codecid for meta data streams in XML format*/
+	GF_CODECID_META_XML = GF_4CC('m','e','t','x'),
+	/*! codecid for subtitle streams in text format*/
+	GF_CODECID_SUBS_TEXT = GF_4CC('s','b','t','t'),
+	/*! codecid for subtitle streams in xml format*/
+	GF_CODECID_SUBS_XML = GF_4CC('s','t','p','p'),
+
+	/*! codecid for subtitle/text streams in tx3g / apple text format*/
+	GF_CODECID_TX3G = GF_4CC( 't', 'x', '3', 'g' ),
 
 	/*!
-	 * \brief Extra ObjectTypeIndication
-	 *
-	 *	ObjectTypeIndication for media (audio/video) codecs not defined in MPEG-4. Since GPAC signals streams through MPEG-4 Descriptions,
-	 *	it needs extensions for non-MPEG-4 streams such as AMR, H263 , etc.\n
-	 *\note The decoder specific info for such streams is always carried encoded, with the following syntax:\n
-	 *	DSI Syntax for audio streams
-	 \code
-	 *	u32 codec_four_cc: the codec 4CC reg code / codec id for ffmpeg
-	 *	u32 sample_rate: sampling rate or 0 if unknown
-	 *	u16 nb_channels: num channels or 0 if unknown
-	 *	u16 frame_size: num audio samples per frame or 0 if unknown
-	 *	u8 nb_bits_per_sample: nb bits or 0 if unknown
-	 *	u8 num_frames_per_au: num audio frames per AU (used in 3GPP, max 15), 0 if unknown
-	 *	char *data: per-codec extensions till end of DSI bitstream
-	 \endcode
-	 \n
-	 *	DSI Syntax for video streams
-	 \code
-	 *	u32 codec_four_cc: the codec 4CC reg code  / codec id for ffmpeg
-	 *	u16 width: video width or 0 if unknown
-	 *	u16 height: video height or 0 if unknown
-	 *	char *data: per-codec extensions till end of DSI bitstream
-	 \endcode
-	*/
-	GPAC_OTI_MEDIA_GENERIC = 0x80,
-	/*!
-	 * \brief FFMPEG ObjectTypeIndication
-	 *
-	 *	ObjectTypeIndication for FFMPEG codecs not defined in MPEG-4. FFMPEG uses the base GPAC_OTI_MEDIA_GENERIC specific info formats, and extends it as follows:
-	 \code
-	 *	u32 bit_rate: the stream rate or 0 if unknown
-	 *	u32 codec_tag: FFMPEG codec tag as defined in libavcodec
-	 *	char *data: codec extensions till end of DSI bitstream
-	 \endcode
-	 */
-	GPAC_OTI_MEDIA_FFMPEG = 0x81,
-
-	/*!OTI for EVRC Voice streams*/
-	GPAC_OTI_AUDIO_EVRC_VOICE = 0xA0,
-	/*!OTI for SMV Voice streams*/
-	GPAC_OTI_AUDIO_SMV_VOICE = 0xA1,
-	/*!OTI for 3GPP2 CMF streams*/
-	GPAC_OTI_3GPP2_CMF = 0xA2,
-	/*!OTI for SMPTE VC-1 Video streams*/
-	GPAC_OTI_VIDEO_SMPTE_VC1 = 0xA3,
-	/*!OTI for Dirac Video streams*/
-	GPAC_OTI_VIDEO_DIRAC = 0xA4,
-	/*!OTI for AC-3 audio streams*/
-	GPAC_OTI_AUDIO_AC3 = 0xA5,
-	/*!OTI for enhanced AC-3 audio streams*/
-	GPAC_OTI_AUDIO_EAC3 = 0xA6,
-	/*!OTI for DRA audio streams*/
-	GPAC_OTI_AUDIO_DRA = 0xA7,
-	/*!OTI for ITU G719 audio streams*/
-	GPAC_OTI_AUDIO_ITU_G719 = 0xA8,
-	/*!OTI for DTS Coherent Acoustics audio streams*/
-	GPAC_OTI_AUDIO_DTS_CA = 0xA9,
-	/*!OTI for DTS-HD High Resolution audio streams*/
-	GPAC_OTI_AUDIO_DTS_HD_HR = 0xAA,
-	/*!OTI for DTS-HD Master audio streams*/
-	GPAC_OTI_AUDIO_DTS_HD_MASTER = 0xAB,
-
-	/*!OTI for dummy streams (dsi = file name) using the generic context loader (BIFS/VRML/SWF/...) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_GENERIC = 0xC0,
-	/*!OTI for SVG dummy stream (dsi = file name) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_SVG = 0xC1,
-	/*!OTI for LASeR/SAF+XML dummy stream (dsi = file name) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_LASER = 0xC2,
-	/*!OTI for XBL dummy streams (dsi = file name) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_XBL = 0xC3,
-	/*!OTI for EPG dummy streams (dsi = null) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_EPG = 0xC4,
-	/*!OTI for WGT dummy streams (dsi = null) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_WGT = 0xC5,
-	/*!OTI for VTT dummy stream (dsi = file name) - GPAC internal*/
-	GPAC_OTI_PRIVATE_SCENE_VTT = 0xC6,
-
-	/*!OTI for streaming SVG - GPAC internal*/
-	GPAC_OTI_SCENE_SVG = 0xD0,
-	/*!OTI for streaming SVG + gz - GPAC internal*/
-	GPAC_OTI_SCENE_SVG_GZ = 0xD1,
-	/*!OTI for DIMS (dsi = 3GPP DIMS configuration) - GPAC internal*/
-	GPAC_OTI_SCENE_DIMS = 0xD2,
-	/*!OTI for streaming VTT - GPAC internal*/
-	GPAC_OTI_SCENE_VTT = 0xD3,
-	/*!OTI for streaming VTT from MP4- GPAC internal*/
-	GPAC_OTI_SCENE_VTT_MP4 = 0xD4,
-	/*!OTI for streaming simple text from MP4- GPAC internal*/
-	GPAC_OTI_SCENE_SIMPLE_TEXT_MP4 = 0xD5,
+		\brief OGG DecoderConfig
 
-	/*!
-	 * \brief OGG ObjectTypeIndication
-	 *
-	 *	Object type indication for all OGG media. The DSI contains all intitialization ogg packets for the codec
-	 * and is formated as follows:\n
-	 *\code
-		while (dsi_size) {
+	 The DecoderConfig for theora, vorbis, flac and opus contains all intitialization ogg packets for the codec
+	  and is formated as follows:\n
+	 \code
+	  while (dsi_size) {
 			bit(16) packet_size;
 			char packet[packet_size];
 			dsi_size -= packet_size;
-		}\endcode
-	*/
-	GPAC_OTI_MEDIA_OGG = 0xDD,
-	GPAC_OTI_MEDIA_OPUS = 0xDE,
-	GPAC_OTI_MEDIA_THEORA = 0xDF,
-
-	GPAC_OTI_MEDIA_SUBPIC = 0xE0,
-
-	/*!OTI for 13K Voice / QCELP audio streams*/
-	GPAC_OTI_AUDIO_13K_VOICE = 0xE1,
-
-	/*!OTI for RAW media streams. Input data is directly dispatched to the composition memory.  The DSI contains is formated (MSBF) as follows:\n
-	*	DSI Syntax for audio streams
-	\code
-	*	u32 sample_rate: sampling rate
-	*	u16 nb_channels: num channels
-	*	u16 nb_bits_per_sample: num of bits per audio sample
-	*	u32 frame_size: max size of audio frame in byte
-	*	u32 channel_config: GPAC mask of GF_AUDIO_CH_ constants, or 0 if unknown
-	\endcode
-	\n
-	*	DSI Syntax for video streams
-	\code
-	*	u32 codec_four_cc: the codec 4CC reg code  / codec id for ffmpeg
-	*	u16 width: video width or 0 if unknown
-	*	u16 height: video height or 0 if unknown
-	*	u32 frame_size: size of the video frame
-	*	u32 stride: horizontal stride of the video frame
-	\endcode
+		}
+	 \endcode
 	*/
-	GPAC_OTI_RAW_MEDIA_STREAM = 0x101,
+	/*! codecid for theora video streams*/
+	GF_CODECID_THEORA = GF_4CC('t','h','e','u'),
+	/*! codecid for vorbis audio streams*/
+	GF_CODECID_VORBIS = GF_4CC('v','o','r','b'),
+	/*! codecid for flac audio streams*/
+	GF_CODECID_FLAC = GF_4CC('f','l','a','c'),
+	/*! codecid for speex audio streams*/
+	GF_CODECID_SPEEX = GF_4CC('s','p','e','x'),
+	/*! codecid for opus audio streams*/
+	GF_CODECID_OPUS = GF_4CC('O','p','u','s'),
+	/*! codecid for subpic DVD subtittles - the associated stream type is text*/
+	GF_CODECID_SUBPIC = GF_4CC('s','u','b','p'),
+	/*! codecid for ADPCM audio, as used in AVI*/
+	GF_CODECID_ADPCM = GF_4CC('A','P','C','M'),
+	/*! codecid for IBM CVSD audio, as used in AVI*/
+	GF_CODECID_IBM_CVSD = GF_4CC('C','S','V','D'),
+	/*! codecid for ALAW audio, as used in AVI*/
+	GF_CODECID_ALAW = GF_4CC('A','L','A','W'),
+	/*! codecid for MULAW audio, as used in AVI*/
+	GF_CODECID_MULAW = GF_4CC('M','L','A','W'),
+	/*! codecid for OKI ADPCM audio, as used in AVI*/
+	GF_CODECID_OKI_ADPCM = GF_4CC('O','P','C','M'),
+	/*! codecid for DVI ADPCM audio, as used in AVI*/
+	GF_CODECID_DVI_ADPCM = GF_4CC('D','P','C','M'),
+	/*! codecid for DIGISTD audio, as used in AVI*/
+	GF_CODECID_DIGISTD = GF_4CC('D','S','T','D'),
+	/*! codecid for Yamaha ADPCM audio, as used in AVI*/
+	GF_CODECID_YAMAHA_ADPCM = GF_4CC('Y','P','C','M'),
+	/*! codecid for TrueSpeech audio, as used in AVI*/
+	GF_CODECID_DSP_TRUESPEECH = GF_4CC('T','S','P','E'),
+	/*! codecid for GSM 610 audio, as used in AVI*/
+	GF_CODECID_GSM610 = GF_4CC('G','6','1','0'),
+	/*! codecid for IBM MULAW audio, as used in AVI*/
+	GF_CODECID_IBM_MULAW = GF_4CC('I','U','L','W'),
+	/*! codecid for IBM ALAW audio, as used in AVI*/
+	GF_CODECID_IBM_ALAW = GF_4CC('I','A','L','W'),
+	/*! codecid for IBM ADPCM audio, as used in AVI*/
+	GF_CODECID_IBM_ADPCM = GF_4CC('I','P','C','M'),
+	/*! codecid for Flash/ShockWave streams*/
+	GF_CODECID_FLASH = GF_4CC( 'f', 'l', 's', 'h' ),
+	/*! codecid for RAW media streams. No decoder config associated (config through PID properties)*/
+	GF_CODECID_RAW = GF_4CC('R','A','W','M'),
+
+	GF_CODECID_AV1 = GF_4CC('A','V','1',' '),
+
+	GF_CODECID_VP8 = GF_4CC('V','P','0','8'),
+	GF_CODECID_VP9 = GF_4CC('V','P','0','9'),
+	GF_CODECID_VP10 = GF_4CC('V','P','1','0'),
+
+	/*QT ProRes*/
+	GF_CODECID_APCH	= GF_4CC( 'a', 'p', 'c', 'h' ),
+	GF_CODECID_APCO	= GF_4CC( 'a', 'p', 'c', 'o' ),
+	GF_CODECID_APCN	= GF_4CC( 'a', 'p', 'c', 'n' ),
+	GF_CODECID_APCS	= GF_4CC( 'a', 'p', 'c', 's' ),
+	GF_CODECID_AP4X	= GF_4CC( 'a', 'p', '4', 'x' ),
+	GF_CODECID_AP4H	= GF_4CC( 'a', 'p', '4', 'h' ),
+
+	GF_CODECID_TMCD = GF_4CC('t','m','c','d'),
+
+	GF_CODECID_FFMPEG = GF_4CC('F','F','I','D'),
+
+	//fake codec IDs for RTP
+	GF_CODECID_FAKE_MP2T = GF_4CC('M','P','2','T')
+} GF_CodecID;
+
+/*! Gets a textual description for the given codecID
+\param codecid target codec ID
+\return textual description of the stream
+*/
+const char *gf_codecid_name(GF_CodecID codecid);
 
-	/*!OTI for LIBPLAYER private streams. The data pointer in the DSI is the libplayer handle object*/
-	GPAC_OTI_PRIVATE_MEDIA_LIBPLAYER = 0xF1
-};
+/*! Enumerates supported codec format
+\param idx 0-based index, to incremented at each call
+\param short_name pointer for codec name
+\param long_name pointer for codec description
+\return codec ID
+*/
+GF_CodecID gf_codecid_enum(u32 idx, const char **short_name, const char **long_name);
 
+/*! Gets the associated streamtype for the given codecID
+\param codecid target codec ID
+\return stream type if known, GF_STREAM_UNKNOWN otherwise
+*/
+u32 gf_codecid_type(GF_CodecID codecid);
+
+/*! Gets alternate ID of codec if any
+\param codecid target codec ID
+\return alternate codec ID if known, GF_CODECID_NONE otherwise
+*/
+GF_CodecID gf_codecid_alt(GF_CodecID codecid);
+
+/*! Gets the associated ObjectTypeIndication if any for the given codecID
+\param codecid target codec ID
+\return ObjectTypeIndication if defined, 0 otherwise
+*/
+u8 gf_codecid_oti(GF_CodecID codecid);
+
+/*! Gets the codecID from a given ObjectTypeIndication
+\param stream_type stream type of the stream
+\param oti ObjectTypeIndication of the stream
+\return the codecID for this OTI
+*/
+GF_CodecID gf_codecid_from_oti(u32 stream_type, u32 oti);
+
+/*! Gets the associated 4CC used by isomedia or RFC6381
+\param codecid target codec ID
+\return RFC 4CC of codec, 0 if not mapped/known
+*/
+u32 gf_codecid_4cc_type(GF_CodecID codecid);
+
+/*! Gets the codecid given the associated short name
+\param cname target codec short name
+\return codecid codec ID
+*/
+GF_CodecID gf_codec_parse(const char *cname);
+
+/*! Gets the raw file ext (one or more, | separated) for the given codecid
+\param codecid codec ID
+\return returns file extension
+*/
+const char *gf_codecid_file_ext(GF_CodecID codecid);
+
+/*! Gets the raw file mime type for the given codecid
+\param codecid codec ID
+\return returns file mime type
+*/
+const char *gf_codecid_mime(GF_CodecID codecid);
+
+/*! Gets the codecid from isomedia code point
+\param isobmftype isomedia code point
+\return codec ID, 0 if not mapped/known
+*/
+GF_CodecID gf_codec_id_from_isobmf(u32 isobmftype);
 
 /*!
- * \brief AFX Object Code
+\brief AFX Object Code
 */
 enum
 {
@@ -524,15 +623,21 @@
 	/*!Scalable Complexity*/
 	GPAC_AFX_SCALABLE_COMPLEXITY = 0x0C,
 };
+/*! Gets a textual description of an AFX stream type
+\param afx_code target stream type descriptor
+\return textural description of the AFX stream
+*/
+const char *gf_stream_type_afx_name(u8 afx_code);
 
 
 /*channel cfg flags - DECODERS MUST OUTPUT STEREO/MULTICHANNEL IN THIS ORDER*/
+
 /*!
- * \brief Audio Channel Configuration
- *
- *	Audio channel flags for spatialization.
+\brief Audio Channel Configuration
+
+Audio channel flags for spatialization.
  \note Decoders must output stereo/multichannel audio channels in this order in the decoded audio frame.
- */
+*/
 enum
 {
 	/*!Left Audio Channel*/
@@ -544,46 +649,278 @@
 	/*!LFE Audio Channel*/
 	GF_AUDIO_CH_LFE = (1<<3),
 	/*!Back Left Audio Channel*/
-	GF_AUDIO_CH_BACK_LEFT = (1 << 4),
+	GF_AUDIO_CH_SURROUND_LEFT = (1 << 4),
 	/*!Back Right Audio Channel*/
-	GF_AUDIO_CH_BACK_RIGHT = (1 << 5),
+	GF_AUDIO_CH_SURROUND_RIGHT = (1 << 5),
 	/*Between left and center in front Audio Channel*/
-	GF_AUDIO_CH_LEFT_CENTER = (1 << 6),
+	GF_AUDIO_CH_FRONT_CENTER_LEFT = (1 << 6),
 	/*Between right and center in front Audio Channel*/
-	GF_AUDIO_CH_RIGHT_CENTER = (1 << 7),
-	/*!Back Center Audio Channel*/
-	GF_AUDIO_CH_BACK_CENTER = (1 << 8),
+	GF_AUDIO_CH_FRONT_CENTER_RIGHT = (1 << 7),
 	/*!Side Left Audio Channel*/
-	GF_AUDIO_CH_SIDE_LEFT = (1<<9),
+	GF_AUDIO_CH_REAR_SURROUND_LEFT = (1<<8),
 	/*!Side Right Audio Channel*/
-	GF_AUDIO_CH_SIDE_RIGHT = (1<<10),
-	/*!top Audio Channel*/
-	GF_AUDIO_CH_TOP_CENTER = (1 << 11),
-	/*!between left and center above Audio Channel*/
-	GF_AUDIO_CH_TOP_FRONT_LEFT = (1 << 12),
-	/*!above center Audio Channel*/
-	GF_AUDIO_CH_TOP_FRONT_CENTER = (1 << 13),
-	/*!between right and center above Audio Channel*/
-	GF_AUDIO_CH_TOP_FRONT_RIGHT = (1 << 14),
-	/*!Back Left High Audio Channel*/
-	GF_AUDIO_CH_TOP_BACK_LEFT = (1 << 15),
-	/*!Back top High Audio Channel*/
-	GF_AUDIO_CH_TOP_BACK_CENTER = (1 << 16),
-	/*!Back Right High Audio Channel*/
-	GF_AUDIO_CH_TOP_BACK_RIGHT = (1 << 17)
+	GF_AUDIO_CH_REAR_SURROUND_RIGHT = (1<<9),
+	/*!Back Center Audio Channel*/
+	GF_AUDIO_CH_REAR_CENTER = (1 << 10),
+	/*!Left surround direct Channel*/
+	GF_AUDIO_CH_SURROUND_DIRECT_LEFT = (1 << 11),
+	/*!Right surround direct Channel*/
+	GF_AUDIO_CH_SURROUND_DIRECT_RIGHT = (1 << 12),
+	/*!Left side surround Channel*/
+	GF_AUDIO_CH_SIDE_SURROUND_LEFT = (1 << 13),
+	/*!Right side surround Channel*/
+	GF_AUDIO_CH_SIDE_SURROUND_RIGHT = (1 << 14),
+	/*!Left wide front Channel*/
+	GF_AUDIO_CH_WIDE_FRONT_LEFT = (1 << 15),
+	/*!Right wide front Channel*/
+	GF_AUDIO_CH_WIDE_FRONT_RIGHT = (1 << 16),
+	/*!Left front top Channel*/
+	GF_AUDIO_CH_FRONT_TOP_LEFT = (1 << 17),
+	/*!Right front top Channel*/
+	GF_AUDIO_CH_FRONT_TOP_RIGHT = (1 << 18),
+	/*!Center front top Channel*/
+	GF_AUDIO_CH_FRONT_TOP_CENTER = (1 << 19),
+	/*!Left surround top Channel*/
+	GF_AUDIO_CH_SURROUND_TOP_LEFT = (1 << 20),
+	/*!Right surround top Channel*/
+	GF_AUDIO_CH_SURROUND_TOP_RIGHT = (1 << 21),
+	/*!Center surround top Channel*/
+	GF_AUDIO_CH_REAR_CENTER_TOP = (1 << 22),
+	/*!Left side surround top Channel*/
+	GF_AUDIO_CH_SIDE_SURROUND_TOP_LEFT = (1 << 23),
+	/*!Left side surround top Channel*/
+	GF_AUDIO_CH_SIDE_SURROUND_TOP_RIGHT = (1 << 24),
+	/*!Center surround top Channel*/
+	GF_AUDIO_CH_CENTER_SURROUND_TOP = (1 << 25),
+	/*!LFE 2  Channel*/
+	GF_AUDIO_CH_LFE2 = (1 << 26),
+	/*!Left front bottom Channel*/
+	GF_AUDIO_CH_FRONT_BOTTOM_LEFT = (1 << 27),
+	/*!Right front bottom Channel*/
+	GF_AUDIO_CH_FRONT_BOTTOM_RIGHT = (1 << 28),
+	/*!Center front bottom Channel*/
+	GF_AUDIO_CH_FRONT_BOTTOM_CENTER = (1 << 29),
+	/*!Left surround bottom Channel*/
+	GF_AUDIO_CH_SURROUND_BOTTOM_LEFT = (1 << 30),
+	/*!Right surround bottom Channel*/
+	GF_AUDIO_CH_SURROUND_BOTTOM_RIGHT = 0x80000000 //(1 << 31)
 };
+/*64 bit flags are defined as macro to avoid msvc compil warnings*/
+/*!Left edge of screen Channel*/
+#define GF_AUDIO_CH_SCREEN_EDGE_LEFT	0x2000000000ULL
+/*!Right edge of screen Channel*/
+#define GF_AUDIO_CH_SCREEN_EDGE_RIGHT	0x4000000000ULL
+/*!left back surround Channel*/
+#define GF_AUDIO_CH_BACK_SURROUND_LEFT	0x20000000000ULL
+/*!right back surround Channel*/
+#define GF_AUDIO_CH_BACK_SURROUND_RIGHT	0x40000000000ULL 
+
+
+/*!
+\brief Audio Sample format
+
+ Audio sample bit format.
+*/
+typedef enum
+{
+	/*! sample = unsigned byte, interleaved channels*/
+	GF_AUDIO_FMT_U8 = 1,
+	/*! sample = signed short Little Endian, interleaved channels*/
+	GF_AUDIO_FMT_S16,
+	/*! 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 = unsigned byte, planar channels*/
+	GF_AUDIO_FMT_U8P,
+	/*! sample = signed short, planar channels*/
+	GF_AUDIO_FMT_S16P,
+	/*! sample = signed integer, planar channels*/
+	GF_AUDIO_FMT_S32P,
+	/*! sample = 1 float, planar channels*/
+	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;
+
+
+/*! enumerates GPAC audio formats
+\param af_name name of the audio format
+\return audio format code
+*/
+GF_AudioFormat gf_audio_fmt_parse(const char *af_name);
+
+/*! gets name of audio formats
+\param afmt audio format code
+\return audio format name
+*/
+const char *gf_audio_fmt_name(GF_AudioFormat afmt);
+
+/*! gets short name of audio formats, as used for file extensions
+\param afmt audio format code
+\return audio format short name
+*/
+const char *gf_audio_fmt_sname(GF_AudioFormat afmt);
+
+
+/*! gets the list of all supported audio format names
+\return list of supported audio format names
+*/
+const char *gf_audio_fmt_all_names();
+
+/*! gets the list of all supported audio format names
+\return list of supported audio format short names
+*/
+const char *gf_audio_fmt_all_shortnames();
+
+/*! returns number of bots per sample for the given format
+\param afmt desired audio format
+\return bit depth of format
+*/
+u32 gf_audio_fmt_bit_depth(GF_AudioFormat afmt);
+
+/*! Check if a given audio format is planar
+\param afmt desired audio format
+\return GF_TRUE if the format is planar, false otherwise
+*/
+Bool gf_audio_fmt_is_planar(GF_AudioFormat afmt);
+
+/*! 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
+ */
+GF_AudioFormat gf_audio_fmt_from_isobmf(u32 msubtype);
+
+/*! 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
+*/
+GF_AudioFormat gf_audio_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **desc);
+
+/*! get CICP layout code point from audio configuration
+\param nb_chan number of channels
+\param nb_surr number of surround channels
+\param nb_lfe number of LFE channels
+\return CICP layout code point format or 0 if unknown
+*/
+u32 gf_audio_fmt_get_cicp_layout(u32 nb_chan, u32 nb_surr, u32 nb_lfe);
 
-#define SPEAKER_TOP_BACK_LEFT           0x8000
-#define SPEAKER_TOP_BACK_CENTER         0x10000
-#define SPEAKER_TOP_BACK_RIGHT          0x20000
+/*! get channel layout mask  from CICP layout
+\param cicp_layout channel layout CICP code point
+\return layout mask or 0 if unknown
+*/
+u64 gf_audio_fmt_get_layout_from_cicp(u32 cicp_layout);
 
+/*! get CICP layout name
+\param cicp_layout channel layout CICP code point
+\return name of layout of "unknown" if unknown
+*/
+const char *gf_audio_fmt_get_layout_name_from_cicp(u32 cicp_layout);
+
+/*! 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);
+
+/*! Color primaries as defined by ISO/IEC 23001-8 / 23091-2
+  */
+typedef enum
+{
+	GF_COLOR_PRIM_RESERVED0   = 0,
+	GF_COLOR_PRIM_BT709       = 1,
+	GF_COLOR_PRIM_UNSPECIFIED = 2,
+	GF_COLOR_PRIM_RESERVED    = 3,
+	GF_COLOR_PRIM_BT470M      = 4,
+	GF_COLOR_PRIM_BT470BG     = 5,
+	GF_COLOR_PRIM_SMPTE170M   = 6,
+	GF_COLOR_PRIM_SMPTE240M   = 7,
+	GF_COLOR_PRIM_FILM        = 8,
+	GF_COLOR_PRIM_BT2020      = 9,
+	GF_COLOR_PRIM_SMPTE428    = 10,
+	GF_COLOR_PRIM_SMPTE431    = 11,
+	GF_COLOR_PRIM_SMPTE432    = 12,
+	GF_COLOR_PRIM_EBU3213     = 22
+} GF_ColorPrimaries;
+
+/*! Color Transfer Characteristics as defined by ISO/IEC 23001-8 / 23091-2
+*/
+typedef enum
+{
+	GF_COLOR_TRC_RESERVED0    = 0,
+	GF_COLOR_TRC_BT709        = 1,
+	GF_COLOR_TRC_UNSPECIFIED  = 2,
+	GF_COLOR_TRC_RESERVED     = 3,
+	GF_COLOR_TRC_GAMMA22      = 4,
+	GF_COLOR_TRC_GAMMA28      = 5,
+	GF_COLOR_TRC_SMPTE170M    = 6,
+	GF_COLOR_TRC_SMPTE240M    = 7,
+	GF_COLOR_TRC_LINEAR       = 8,
+	GF_COLOR_TRC_LOG          = 9,
+	GF_COLOR_TRC_LOG_SQRT     = 10,
+	GF_COLOR_TRC_IEC61966_2_4 = 11,
+	GF_COLOR_TRC_BT1361_ECG   = 12,
+	GF_COLOR_TRC_IEC61966_2_1 = 13,
+	GF_COLOR_TRC_BT2020_10    = 14,
+	GF_COLOR_TRC_BT2020_12    = 15,
+	GF_COLOR_TRC_SMPTE2084    = 16,
+	GF_COLOR_TRC_SMPTE428     = 17,
+	GF_COLOR_TRC_ARIB_STD_B67 = 18
+} GF_ColorTransferCharacteristic;
+
+/*! MatrixCoefficients as defined by ISO/IEC 23001-8 / 23091-2
+*/
+typedef enum
+{
+    GF_COLOR_MX_RGB         = 0,
+    GF_COLOR_MX_BT709       = 1,
+    GF_COLOR_MX_UNSPECIFIED = 2,
+    GF_COLOR_MX_RESERVED    = 3,
+    GF_COLOR_MX_FCC47         = 4,
+    GF_COLOR_MX_BT470BG     = 5,
+    GF_COLOR_MX_SMPTE170M   = 6,
+    GF_COLOR_MX_SMPTE240M   = 7,
+    GF_COLOR_MX_YCGCO       = 8,
+    GF_COLOR_MX_BT2020_NCL  = 9,
+    GF_COLOR_MX_BT2020_CL   = 10,
+    GF_COLOR_MX_SMPTE2085   = 11,
+} GF_ColorMatrixCoefficients;
+
+/*! Chroma location values, semantics from CoreVideo - direct match of values  to FFmpeg*/
+typedef enum {
+	/*! Chroma location is not known*/
+    GF_CHROMALOC_UNKNOWN=0,
+	/*! Chroma sample is horizontally co-sited with the left column of luma samples, but centered vertically (MPEG-2/4 4:2:0, H.264 default for 4:2:0)*/
+    GF_CHROMALOC_LEFT,
+    /*! The chroma sample is fully centered ( MPEG-1 4:2:0, JPEG 4:2:0, H.263 4:2:0)*/
+    GF_CHROMALOC_CENTER,
+    /*! The chroma sample is co-sited with the top-left luma sample (ITU-R 601, SMPTE 274M 296M S314M(DV 4:1:1), mpeg2 4:2:2)*/
+    GF_CHROMALOC_TOPLEFT,
+    /*! The chroma sample is horizontally centered, but is co-sited with the top row of luma samples*/
+    GF_CHROMALOC_TOP,
+    /*! The chroma sample is co-sited with the bottom-left luma sample*/
+    GF_CHROMALOC_BOTTOMLEFT,
+    /*! The chroma sample is horizontally centered, but is co-sited with the bottom row of luma samples*/
+    GF_CHROMALOC_BOTTOM,
+    /*! The Cr and Cb samples are alternatingly co-sited with the left luma samples of the same field */
+    GF_CHROMALOC_DV420,
+} GF_ChromaLocation;
 
 
 /*DIMS unit flags */
 /*!
- * \brief DIMS Unit header flags
- *
- *	DIMS Unit header flags as 3GPP TS 26.142.
+\brief DIMS Unit header flags
+
+DIMS Unit header flags as 3GPP TS 26.142.
  */
 enum
 {
@@ -602,9 +939,7 @@
 };
 
 
-/*!
- * AVC NAL unit types
- */
+/*! AVC NAL unit types */
 enum
 {
 	/*! Non IDR AVC slice*/
@@ -642,13 +977,15 @@
 	/*! SVC slice*/
 	GF_AVC_NALU_SVC_SLICE = 20,
 	/*! View and dependency representation delimiter */
-	GF_AVC_NALU_VDRD = 24
+	GF_AVC_NALU_VDRD = 24,
+	/*! Dolby Vision RPU */
+	GF_AVC_NALU_DV_RPU = 28,
+	/*! Dolby Vision EL */
+	GF_AVC_NALU_DV_EL = 30,
 };
 
 
-/*!
- * AVC slice types
- */
+/*! AVC slice types */
 enum
 {
 	/*! P slice*/
@@ -673,9 +1010,7 @@
 	GF_AVC_TYPE2_SI = 9
 };
 
-/*!
- HEVC NAL unit types
- */
+/*! HEVC NAL unit types */
 enum
 {
 	/*! Trail N HEVC slice*/
@@ -736,6 +1071,10 @@
 	GF_HEVC_NALU_SEI_PREFIX = 39,
 	/*! suffix SEI message*/
 	GF_HEVC_NALU_SEI_SUFFIX = 40,
+	/*! Dolby Vision RPU */
+	GF_HEVC_NALU_DV_RPU = 62,
+	/*! Dolby Vision EL */
+	GF_HEVC_NALU_DV_EL = 63
 };
 
 
@@ -763,11 +1102,8 @@
 /*! RFC6381 codec name max length*/
 #define RFC6381_CODEC_NAME_SIZE_MAX 100
 
-/*! @} */
-
-#define GF_VENDOR_GPAC GF_4CC('G', 'P', 'A', 'C')
 
-/* ID3v2 tags from mpegts.c */
+/*! ID3v2 tags*/
 typedef enum {
 	ID3V2_FRAME_AENC = GF_4CC('A','E','N','C'),
 	ID3V2_FRAME_APIC = GF_4CC('A','P','I','C'),
@@ -792,13 +1128,14 @@
 	ID3V2_FRAME_RVRB = GF_4CC('R','V','R','B'),
 	ID3V2_FRAME_SYLT = GF_4CC('S','Y','L','T'),
 	ID3V2_FRAME_SYTC = GF_4CC('S','Y','T','C'),
-	ID3V2_FRAME_TALB = GF_4CC('T','E','N','C'),
+	ID3V2_FRAME_TALB = GF_4CC('T','A','L','B'),
 	ID3V2_FRAME_TBPM = GF_4CC('T','B','P','M'),
 	ID3V2_FRAME_TCOM = GF_4CC('T','C','O','M'),
 	ID3V2_FRAME_TCON = GF_4CC('T','C','O','N'),
 	ID3V2_FRAME_TCOP = GF_4CC('T','C','O','P'),
 	ID3V2_FRAME_TDAT = GF_4CC('T','D','A','T'),
 	ID3V2_FRAME_TDLY = GF_4CC('T','D','L','Y'),
+	ID3V2_FRAME_TDRC = GF_4CC('T','D','R','C'),
 	ID3V2_FRAME_TENC = GF_4CC('T','E','N','C'),
 	ID3V2_FRAME_TEXT = GF_4CC('T','E','X','T'),
 	ID3V2_FRAME_TFLT = GF_4CC('T','F','L','T'),
@@ -845,52 +1182,7 @@
 	ID3V2_FRAME_WXXX = GF_4CC('W','X','X','X')
 } GF_ID3v2FrameType;
 
-
-/* media types consts from media_import.c */
-enum {
-
-	GF_MEDIA_TYPE_AC3 	= GF_4CC('A','C','3',' '),
-	GF_MEDIA_TYPE_BIFS 	= GF_4CC('B','I','F','S'),
-	GF_MEDIA_TYPE_CHAP 	= GF_4CC('C','H','A','P'),
-	GF_MEDIA_TYPE_DAC3 	= GF_4CC('D','A','C','3'),
-	GF_MEDIA_TYPE_DEC3 	= GF_4CC('D','E','C','3'),
-	GF_MEDIA_TYPE_DTS 	= GF_4CC('D','T','S',' '),
-	GF_MEDIA_TYPE_H264 	= GF_4CC('H','2','6','4'),
-	GF_MEDIA_TYPE_HEVC 	= GF_4CC('H','E','V','C'),
-	GF_MEDIA_TYPE_ID3 	= GF_4CC('I','D','3',' '),
-	GF_MEDIA_TYPE_JPEG 	= GF_4CC('J','P','E','G'),
-	GF_MEDIA_TYPE_LASR 	= GF_4CC('L','A','S','R'),
-	GF_MEDIA_TYPE_LHVC 	= GF_4CC('L','H','V','C'),
-	GF_MEDIA_TYPE_LPCM 	= GF_4CC('L','P','C','M'),
-	GF_MEDIA_TYPE_M4SP 	= GF_4CC('M','4','S','P'),
-	GF_MEDIA_TYPE_M4SS 	= GF_4CC('M','4','S','S'),
-	GF_MEDIA_TYPE_MP1A 	= GF_4CC('M','P','1','A'),
-	GF_MEDIA_TYPE_MP1V 	= GF_4CC('M','P','1','V'),
-	GF_MEDIA_TYPE_MP2A 	= GF_4CC('M','P','2','A'),
-	GF_MEDIA_TYPE_MP2V 	= GF_4CC('M','P','2','V'),
-	GF_MEDIA_TYPE_MP4A 	= GF_4CC('M','P','4','A'),
-	GF_MEDIA_TYPE_MP4V 	= GF_4CC('M','P','4','V'),
-	GF_MEDIA_TYPE_MPG1 	= GF_4CC('M','P','G','1'),
-	GF_MEDIA_TYPE_MPG2 	= GF_4CC('M','P','G','2'),
-	GF_MEDIA_TYPE_MPGA 	= GF_4CC('M','P','G','A'),
-	GF_MEDIA_TYPE_NHNL 	= GF_4CC('N','H','n','l'),
-	GF_MEDIA_TYPE_NHNT 	= GF_4CC('N','H','n','t'),
-	GF_MEDIA_TYPE_PNG 	= GF_4CC('P','N','G',' '),
-	GF_MEDIA_TYPE_SVC 	= GF_4CC('S','V','C',' '),
-	GF_MEDIA_TYPE_THEO 	= GF_4CC('t','h','e','o'),
-	GF_MEDIA_TYPE_UNK 	= GF_4CC('U','N','K',' '),
-
-	/* from mpegts.c */
-	GF_MEDIA_STREAM_AC3	= GF_4CC('A','C','-','3'),
-	GF_MEDIA_STREAM_VC1	= GF_4CC('V','C','-','1'),
-
-	/* from m2ts_muc.c */
-	GF_MEDIA_LANG_UND	= GF_4CC('u','n','d',' '),
-
-};
-
-
-/* meta types from box_code_meta.c - fileimport.c */
+/*! meta types from box_code_meta.c - fileimport.c */
 enum {
 
 	GF_META_ITEM_TYPE_MIME 	= GF_4CC('m', 'i', 'm', 'e'),
@@ -910,6 +1202,17 @@
 
 };
 
+
+/*! meta types from box_code_meta.c - fileimport.c */
+enum {
+
+	GF_S4CC_MPEG4 = GF_4CC('m', 'p', '4', 's'),
+	GF_S4CC_LASER = GF_4CC('l', 's', 'r', '1'),
+};
+
+
+/*! @} */
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.8.0.tar.gz/include/gpac/crypt.h -> gpac-1.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-2018
+*			Copyright (c) Telecom ParisTech 2000-2019
 *					All rights reserved
 *
 *  This file is part of GPAC / Crypto Tools sub-project
@@ -38,70 +38,108 @@
 #endif
 
 /*!
-*	\file <gpac/crypt.h>
-*	\brief Utility tools for encryption and decryption.
+\file <gpac/crypt.h>
+\brief Utility tools for encryption and decryption.
 */
 
 /*!
-*	\addtogroup crypt_grp Cryptography
-*	\ingroup media_grp
-*	\brief Utility tools for encryption and decryption.
-*
-*This section documents the encryption and decryption routines used by GPAC, mostly AES 128 in CBC or CTR modes.
-*	@{
+\addtogroup crypt_grp Cryptography
+\ingroup media_grp
+\brief Utility tools for encryption and decryption.
+
+This section documents the encryption and decryption routines used by GPAC, mostly AES 128 in CBC or CTR modes.
+
+@{
 */
 
 #include <gpac/tools.h>
 
-/*crypto lib handler*/
+/*! cryptographic context object*/
 typedef struct _gf_crypt_context GF_Crypt;
 
+/*! Key size in bytes for AES 128*/
 #define GF_AES_128_KEYSIZE 16
 
+/*! Chaining mode of AES*/
 typedef enum {
+	/*! CBC chaining mode*/
 	GF_CBC = 0,
+	/*! CTR chaining mode*/
 	GF_CTR = 1
 } GF_CRYPTO_MODE;
 
+/*! Algorithm mode to use*/
 typedef enum {
+	/*! AES 128 bit encryption*/
 	GF_AES_128 = 0
 } GF_CRYPTO_ALGO;
 
 
-/*opens crypto context*/
+/*! opens crypto context
+\param algorithm the algorithm to use
+\param mode the chaining mode of the algorithm
+\return a new crypto context
+*/
 GF_Crypt *gf_crypt_open(GF_CRYPTO_ALGO algorithm, GF_CRYPTO_MODE mode);
-/*close crypto context*/
+/*! destroys a crypto context
+\param gfc the target crytpo context
+*/
 void gf_crypt_close(GF_Crypt *gfc);
 
-/*
-This function initializes all buffers for the specified context
-@key: Key used. MUST be 16 bytes long
-@iv: Init Vector. It needs to be random and unique (but not secret). The same IV must be used
+/*! initializes all buffers for the specified context
+After calling this function you can use the crypto context for encryption or decryption (not both).
+\param gfc the target crytpo context
+\param key the key to use. MUST be 16 bytes long
+\param iv the seed/initialization vector to use. It needs to be random and unique (but not secret). The same IV must be used
 for encryption/decryption. MUST be 16 bytes long
-After calling this function you can use the descriptor for encryption or decryption (not both).
+\return error if any
 */
 GF_Err gf_crypt_init(GF_Crypt *gfc, void *key, const void *iv);
 
-/*changes key, does not touch IV - used for key roll*/
+/*! changes key, does not touch IV. This is used for key rolling
+\param gfc the target crytpo context
+\param key the new key to use. MUST be 16 bytes long
+\return error if any
+*/
 GF_Err gf_crypt_set_key(GF_Crypt *gfc, void *key);
 
-/* sets the IV for the algorithm. Used for ISMA and CENC CTR.
+/*! sets the IV for the algorithm. Used for ISMA and CENC CTR.
+\param gfc the target crytpo context
+\param iv the new eed/initialization vector to use
+\param size the size of the IV. Must be 16 or 17 for AES. If 17 (AES CTR only), the first byte shall contain the counter position
+\return error if any
 */
 GF_Err gf_crypt_set_IV(GF_Crypt *gfc, const void *iv, u32 size);
 
-/*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). 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
+/*! 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
+\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)
+\return error if any
 */
 GF_Err gf_crypt_get_IV(GF_Crypt *gfc, void *iv, u32 *size);
 
-/*
-main encryption function.
-@Plaintext, @len: plaintext to encrypt - len should be  k*algorithms_block_size if used in a mode
-which operated in blocks (cbc, ecb, nofb), or whatever when used in cfb or ofb which operate in streams.
-The plaintext is replaced by the ciphertext.
+/*! encrypts a payload. The encryption is done inplace (plaintext is replaced by the ciphertext).
+ The buffer size should be k*algorithms_block_size if used in a mode which operated in blocks (CBC) or whatever when used in CTR which operate in streams.
+
+\param gfc the target crytpo context
+\param plaintext the clear buffer
+\param size the size of the clear buffer
+\return error if any
+*/
+GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, u32 size);
+
+/*! decrypts a payload. The decryption is done inplace (ciphertext is replaced by the plaintext).
+ The buffer size should be k*algorithms_block_size if used in a mode which operated in blocks (CBC) or whatever when used in CTR which operate in streams.
+
+\param gfc the target crytpo context
+\param ciphertext the encrypted buffer
+\param size the size of the encrypted buffer
+\return error if any
 */
-GF_Err gf_crypt_encrypt(GF_Crypt *gfc, void *plaintext, u32 len);
-/*decryption function. It is almost the same with gf_crypt_generic.*/
-GF_Err gf_crypt_decrypt(GF_Crypt *gfc, void *ciphertext, u32 len);
+GF_Err gf_crypt_decrypt(GF_Crypt *gfc, void *ciphertext, u32 size);
 
 
 /*! @} */

gpac-1.0.0.tar.gz/include/gpac/crypt_tools.h Added

@@ -0,0 +1,251 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Media Tools 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.
+ *
+ */
+
+#ifndef _GF_CRYPT_TOOLS_H_
+#define _GF_CRYPT_TOOLS_H_
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+\file <gpac/crypt_tools.h>
+\brief Utility tools for ISMA and Common Encryption.
+*/
+	
+/*!
+\addtogroup crypt_grp
+\ingroup media_grp
+\brief Utility tools for ISMA and Common Encryption.
+
+This section documents the helper tools (mostly crypt info file) used in ISMA and CENC encryption.
+
+@{
+ */
+
+#include <gpac/isomedia.h>
+
+/*! Supported encryption scheme types */
+enum
+{
+	/*! ISMA E&A encryption*/
+	GF_CRYPT_TYPE_ISMA	= GF_4CC( 'i', 'A', 'E', 'C' ),
+	/*! OMA DRM encryption*/
+	GF_CRYPT_TYPE_OMA = GF_4CC( 'o', 'd', 'k', 'm' ),
+	/*! CENC CTR-128 encryption*/
+	GF_CRYPT_TYPE_CENC	= GF_4CC('c','e','n','c'),
+	/*! CENC CBC-128 encryption*/
+	GF_CRYPT_TYPE_CBC1	= GF_4CC('c','b','c','1'),
+	/*! CENC CTR-128 pattern encryption*/
+	GF_CRYPT_TYPE_CENS	= GF_4CC('c','e','n','s'),
+	/*! CENC CBC-128 pattern encryption*/
+	GF_CRYPT_TYPE_CBCS	= GF_4CC('c','b','c','s'),
+	/*! Adobe CBC-128 encryption*/
+	GF_CRYPT_TYPE_ADOBE	= GF_4CC('a','d','k','m'),
+	/*! PIFF CTR-128 encryption*/
+	GF_CRYPT_TYPE_PIFF	= GF_4CC('p','i','f','f'),
+};
+
+/*! Selective encryption modes */
+enum
+{
+	/*! no selective encryption*/
+	GF_CRYPT_SELENC_NONE = 0,
+	/*! only encrypts RAP samples*/
+	GF_CRYPT_SELENC_RAP,
+	/*! only encrypts non-RAP samples*/
+	GF_CRYPT_SELENC_NON_RAP,
+	/*! selective encryption of random samples*/
+	GF_CRYPT_SELENC_RAND,
+	/*! selective encryption of a random sample in given range*/
+	GF_CRYPT_SELENC_RAND_RANGE,
+	/*! selective encryption of first sample in given range*/
+	GF_CRYPT_SELENC_RANGE,
+	/*! encryption of all samples but the preview range*/
+	GF_CRYPT_SELENC_PREVIEW,
+	/*!no encryption of samples, signaled with sample group*/
+	GF_CRYPT_SELENC_CLEAR,
+	/*!no encryption of samples, signaled without sample group but bytesOfEncrypted = 0*/
+	GF_CRYPT_SELENC_CLEAR_FORCED,
+};
+
+/*! Crypto information for one media stream*/
+typedef struct
+{
+	/*! scheme type used for encryptio of the track*/
+	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*/
+	char *Scheme_URI;
+	/*! selective encryption type*/
+	u32 sel_enc_type;
+	/*! for OMA, sets preview range in samples. Otherwise sets encryption AU frequency (encrypts 1 AU every sel_enc_range ones)*/
+	u32 sel_enc_range;
+	/*! IPMP signaling: 0: none, 1: IPMP, 2: IPMPX
+	when IPMP signaling is enabled, the OD stream will be updated with IPMP Update commands
+		THIS IS DEPRECATED IN GPAC
+	*/
+	u32 ipmp_type;
+	/*! if not set and IPMP enabled, defaults to TrackID
+		THIS IS DEPRECATED IN GPAC
+	*/
+	u32 ipmp_desc_id;
+	/*! type of box where sample auxiliary informations is saved, either "senc" or "PSEC" (PIFF)*/
+	u32 sai_saved_box_type;
+
+	/*! OMA encryption type: 0: none, 1: AES CBC, 2: AES CTR*/
+	u8 encryption;
+	/*! OMA textual headers*/
+	char *TextualHeaders;
+	/*! OMA transaction ID*/
+	char TransactionID[17];
+
+	/*! CENC extensions - TODO, we could extend the support to allow per key patterns and selective encryption modes
+	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;
+	/*! keys defined*/
+	bin128 *keys;
+	/*! default key index to use*/
+	u32 defaultKeyIdx;
+	/*! roll period of keys (change keys every keyRoll AUs)*/
+	u32 keyRoll;
+	/*! 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;
+	/*! force cenc and cbc1: 0: default, 1: no block alignment of encrypted data, 2: always block align even if producing non encrypted samples*/
+	u32 block_align;
+
+	/*0: same stsd for clear samples
+	1: dedicated stsd entry for clear samples, placed before the crypted entry in stsd,
+	2: dedicated stsd entry for clear samples, placed after the crypted entry in stsd,
+	*/
+	u32 force_clear_stsd_idx;
+
+	/*! adobe metadata in base64*/
+	char *metadata;
+
+	/*! force using type set in XML rather than type indicated in file when decrypting*/
+	Bool force_type;
+} GF_TrackCryptInfo;
+
+/*! Crypto information*/
+typedef struct
+{
+	/*! list of track infos*/
+	GF_List *tcis;
+	/*! global for all tracks unless overriden*/
+	u32 def_crypt_type;
+	/*! indicates a common key is used*/
+	Bool has_common_key;
+	/*! intern to parser*/
+	Bool in_text_header;
+} GF_CryptInfo;
+
+/*! loads a given crypto configuration file. Full doc is available at https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+\param file name of the crypt XML file
+\param out_err set to return error
+\return the crypt info
+*/
+GF_CryptInfo *gf_crypt_info_load(const char *file, GF_Err *out_err);
+
+/*! deletes crypto configuration file.
+\param info the target crypt info
+*/
+void gf_crypt_info_del(GF_CryptInfo *info);
+
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_ISOM_WRITE)
+
+/*! decrypts a file
+\param infile source MP4 file to decrypt
+\param drm_file location of crypto configuration file
+\param outname location of destination file
+\param interleave_time interleave time of the destination file - 0 means flat storage
+\param fs_dump_flags flags for session stats (1) and session graph (1<<1) dumping
+\return error code if any
+*/
+GF_Err gf_decrypt_file(GF_ISOFile *infile, const char *drm_file, const char *outname, Double interleave_time, u32 fs_dump_flags);
+
+/*! decrypts a fragment
+\param infile source MP4 file to decrypt
+\param drm_file location of crypto configuration file
+\param dst_file location of destination file
+\param frag_name name of fragment to decrypt
+\param fs_dump_flags flags for session stats (1) and session graph (1<<1) dumping
+\return error code if any
+*/
+GF_Err gf_decrypt_fragment(GF_ISOFile *infile, const char *drm_file, const char *dst_file, const char *frag_name, u32 fs_dump_flags);
+
+/*! encrypts a file
+\param infile source MP4 file to encrypt
+\param drm_file location of crypto configuration file
+\param outname location of destination file
+\param interleave_time interleave time of the destination file - 0 means flat storage
+\param fs_dump_flags flags for session stats (1) and session graph (1<<1) dumping
+\return error code if any
+*/
+GF_Err gf_crypt_file(GF_ISOFile *infile, const char *drm_file, const char *outname, Double interleave_time, u32 fs_dump_flags);
+
+/*! encrypts a fragment
+\param infile init segment of the MP4 file to encrypt - this SHALL NOT be encrypted
+\param drm_file location of crypto configuration file
+\param dst_file location of destination file
+\param frag_name name of fragment to encrypt
+\param fs_dump_flags flags for session stats (1) and session graph (1<<1) dumping
+\return error code if any
+*/
+GF_Err gf_crypt_fragment(GF_ISOFile *infile, const char *drm_file, const char *dst_file, const char *frag_name, u32 fs_dump_flags);
+
+#endif /*!defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_ISOM_WRITE)*/
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*_GF_CRYPT_TOOLS_H_*/
+

gpac-0.8.0.tar.gz/include/gpac/dash.h -> gpac-1.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
+ *			Copyright (c) Telecom ParisTech 2012-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Adaptive HTTP Streaming sub-project
@@ -32,17 +32,17 @@
 #endif
 
 /*!
- *	\file <gpac/dash.h>
- *	\brief DASH Client API. The DASH client can be used without GPAC player but requires at least the base utils (threads, lists, NTP timing). The HTTP interface used can be either GPAC's one or any other downloader.
- */
+\file <gpac/dash.h>
+\brief DASH Client API. The DASH client can be used without GPAC player but requires at least the base utils (threads, lists, NTP timing). The HTTP interface used can be either GPAC's one or any other downloader.
+*/
 	
 /*!
- *	\addtogroup dashc_grp DASH
- *	\ingroup media_grp
- *	\brief MPEG-DASH and HLS Client
- *
- *	@{
- */
+\addtogroup dashc_grp DASH Client
+\ingroup media_grp
+\brief MPEG-DASH and HLS Client
+
+@{
+*/
 
 #include <gpac/tools.h>
 
@@ -76,10 +76,6 @@
 	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*/
 	GF_DASH_EVENT_DESTROY_PLAYBACK,
-	/*! event sent after each segment begins/ends download when segment bufferig is enabled*/
-	GF_DASH_EVENT_BUFFERING,
-	/*! event sent once buffering is done*/
-	GF_DASH_EVENT_BUFFER_DONE,
 	/*! event sent once a new segment becomes available*/
 	GF_DASH_EVENT_SEGMENT_AVAILABLE,
 	/*! event sent when quality has been switched for the given group*/
@@ -90,455 +86,916 @@
 	GF_DASH_EVENT_TIMESHIFT_OVERFLOW,
 	/*! event send when we need the decoding statistics*/
 	GF_DASH_EVENT_CODEC_STAT_QUERY,
+	/*! event send 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*/
 	GF_DASH_EVENT_CACHE_FULL,
 	/*! event send when all groups are done in a period*/
 	GF_DASH_EVENT_END_OF_PERIOD,
 } GF_DASHEventType;
 
-/*structure used for all IO operations for DASH*/
+/*! DASH network I/O abstraction object*/
 typedef struct _gf_dash_io GF_DASHFileIO;
+/*! structure used for all IO sessions for DASH*/
 typedef void *GF_DASHFileIOSession;
 
+/*! DASH network I/O abstraction object*/
 struct _gf_dash_io
 {
-	/*user private data*/
+	/*! user private data*/
 	void *udta;
 
-	/*signals errors or specific actions to perform*/
+	/*! signals errors or specific actions to perform*/
 	GF_Err (*on_dash_event)(GF_DASHFileIO *dashio, GF_DASHEventType evt, s32 group_idx, GF_Err setup_error);
 
-	/*used to check whether a representation is supported or not. Function returns 1 if supported, 0 otherwise
+	/*! used to check whether a representation is supported or not. Function returns 1 if supported, 0 otherwise
 	if this callback is not set, the representation is assumed to be supported*/
 	Bool (*dash_codec_supported)(GF_DASHFileIO *dashio, const char *codec, u32 width, u32 height, Bool is_interlaced, u32 fps_num, u32 fps_denum, u32 sample_rate);
 
-	/*called whenever a file has to be deleted*/
+	/*! called whenever a file has to be deleted*/
 	void (*delete_cache_file)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url);
 
-	/*create a file download session for the given resource - group_idx may be -1 if this is a global resource , otherwise it indicates the group/adaptationSet in which the download happens*/
+	/*! create a file download session for the given resource - group_idx may be -1 if this is a global resource , otherwise it indicates the group/adaptationSet in which the download happens*/
 	GF_DASHFileIOSession (*create)(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx);
-	/*delete a file download session*/
+	/*! delete a file download session*/
 	void (*del)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*aborts downloading in the given file session*/
+	/*! aborts downloading in the given file session*/
 	void (*abort)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*resetup the file session with a new resource to get - this allows persistent connection usage with HTTP servers*/
+	/*! resetup the file session with a new resource to get - this allows persistent connection usage with HTTP servers*/
 	GF_Err (*setup_from_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx);
-	/*set download range for the file session*/
+	/*! set download range for the file session*/
 	GF_Err (*set_range)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache);
-	/*initialize the file session - all the headers shall be fetched before returning*/
+	/*! initialize the file session - all the headers shall be fetched before returning*/
 	GF_Err (*init)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*download the content - synchronous call: all the file shall be fetched before returning*/
+	/*! download the content - synchronous call: all the file shall be fetched before returning*/
 	GF_Err (*run)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 
-	/*get URL of the file - it may be different from the original one if resource relocation happened*/
+	/*! get URL of the file - it may be different from the original one if resource relocation happened*/
 	const char *(*get_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the name of the cache file. If NULL is returned, the file cannot be cached and its associated URL will be used when
+	/*! get the name of the cache file. If NULL is returned, the file cannot be cached and its associated URL will be used when
 	the client request file to play*/
 	const char *(*get_cache_name)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the MIME type of the file*/
+	/*! get the MIME type of the file*/
 	const char *(*get_mime)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the given hedaer value in the last HTTP response. Function is optional*/
+	/*! get the given hedaer value in the last HTTP response. Function is optional*/
 	const char *(*get_header_value)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name);
-	/*gets the UTC time at which reply has been received. Function is optional*/
+	/*! gets the UTC time at which reply has been received. Function is optional*/
 	u64 (*get_utc_start_time)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the average download rate for the session. If no session is specified, gets the max download rate
+	/*! get the average download rate for the session. If no session is specified, gets the max download rate
 	for the client (used for bandwidth simulation in local files)*/
 	u32 (*get_bytes_per_sec)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the total size on bytes for the session*/
+	/*! get the total size on bytes for the session*/
 	u32 (*get_total_size)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the total size on bytes for the session*/
+	/*! get the total size on bytes for the session*/
 	u32 (*get_bytes_done)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
 };
 
+/*! DASH client object*/
 typedef struct __dash_client GF_DashClient;
 
+/*! Quality selection mode of initial segments*/
 typedef enum
 {
-	//selects the lowest quality when starting - if one of the representation does not have video (HLS), it may be selected
-	GF_DASH_SELECT_QUALITY_LOWEST,
-	//selects the highest quality when starting
+	/*! selects the lowest quality when starting - if one of the representation does not have video (HLS), it may be selected*/
+	GF_DASH_SELECT_QUALITY_LOWEST=0,
+	/*! selects the highest quality when starting*/
 	GF_DASH_SELECT_QUALITY_HIGHEST,
-	//selects the lowest bandwidth when starting - if one of the representation does not have video (HLS), it will NOT be selected
+	/*! selects the lowest bandwidth when starting - if one of the representation does not have video (HLS), it will NOT be selected*/
 	GF_DASH_SELECT_BANDWIDTH_LOWEST,
-	//selects the highest bandwidth when starting - for tiles all low priority tiles will have the lower (below max) bandwidth selected
+	/*! selects the highest bandwidth when starting - for tiles all low priority tiles will have the lower (below max) bandwidth selected*/
 	GF_DASH_SELECT_BANDWIDTH_HIGHEST,
-	//selects the highest bandwidth when starting - for tiles all low priority tiles will have their lowest bandwidth selected
+	/*! selects the highest bandwidth when starting - for tiles all low priority tiles will have their lowest bandwidth selected*/
 	GF_DASH_SELECT_BANDWIDTH_HIGHEST_TILES
 } GF_DASHInitialSelectionMode;
 
-/*create a new DASH client:
-	@dash_io: DASH callbacks to the user
-	@max_cache_duration: maximum duration in milliseconds for the cached media. If less than mpd@minBufferTime, mpd@minBufferTime is used
-	@auto_switch_count: forces representation switching every auto_switch_count segments, set to 0 to disable
-	@keep_files: do not delete files from the cache
-	@disable_switching: turn off bandwidth switching algorithm
-	@first_select_mode: indicates which representation to select upon startup
-	@enable_buffering: forces buffering of segments for the duration indicated in the MPD before calling back the user
-	@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.
-*/
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io,
+/*! 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 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,
                            u32 max_cache_duration,
                            u32 auto_switch_count,
                            Bool keep_files,
                            Bool disable_switching,
                            GF_DASHInitialSelectionMode first_select_mode,
-                           Bool enable_buffering, u32 initial_time_shift_value);
+                           u32 initial_time_shift_value);
 
-/*delete the DASH client*/
+/*! destroys a DASH client
+\param dash the target dash clien
+*/
 void gf_dash_del(GF_DashClient *dash);
 
-/*open the DASH client for the specific manifest file*/
+/*! opens the DASH client for the specific manifest file
+\param dash the target dash client
+\param manifest_url the URL of the manifest to open
+\return error if any
+*/
 GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url);
-/*closes the dash client*/
+
+/*! closes the dash client
+\param dash the target dash client
+*/
 void gf_dash_close(GF_DashClient *dash);
 
-/*returns URL of the DASH manifest file*/
+/*! for unthreaded session, executes DASH logic
+\param dash the target dash client
+\return error if any, GF_EOS on end of session*/
+GF_Err gf_dash_process(GF_DashClient *dash);
+
+/*! returns URL of the DASH manifest file
+\param dash the target dash client
+\return the currently loaded manifest
+*/
 const char *gf_dash_get_url(GF_DashClient *dash);
 
-/*tells whether we are playing some Apple HLS M3U8*/
+/*! tells whether we are playing some Apple HLS M3U8
+\param dash the target dash client
+\return GF_TRUE if the manifest is M3U8
+*/
 Bool gf_dash_is_m3u8(GF_DashClient *dash);
 
-/*get title and source for this MPD*/
+/*! 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)
+\param source set to the source of the manifest (may be NULL)
+*/
 void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source);
 
-/*switches quality up or down*/
+/*! 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);
 
-/*indicates whether the DASH client is running or not. For the moment, the DASH client is always run by an internal thread*/
+/*! indicates whether the DASH client is running or not
+\param dash the target dash client
+\return GF_TRUE if the session is still active, GF_FALSE otherwise
+*/
 Bool gf_dash_is_running(GF_DashClient *dash);
 
-/*get duration of the presentation*/
-Double gf_dash_get_duration(GF_DashClient *dash);
+/*! indicates whether the DASH client is in setup stage (sloving periods, destroying or creating playback chain) or not
+\param dash the target dash client
+\return GF_TRUE if the session is in setup, GF_FALSE otherwise
+*/
+Bool gf_dash_is_in_setup(GF_DashClient *dash);
 
-/*check that the given file has the right XML root element*/
-Bool gf_dash_check_mpd_root_type(const char *local_url);
+/*! gets duration of the presentation
+\param dash the target dash client
+\return the duration in second of the session
+*/
+Double gf_dash_get_duration(GF_DashClient *dash);
 
-/*sets timeshift for the presentation - this function does not trigger a seek, this has to be done by the caller
-	@ms_in_timeshift: 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.
+/*! sets timeshift for the presentation - this function does not trigger a seek, this has to be done by the caller
+\param dash the target dash client
+\param ms_in_timeshift 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 error if any
 */
 GF_Err gf_dash_set_timeshift(GF_DashClient *dash, u32 ms_in_timeshift);
 
-/*returns the number of groups. A group is a set of media resources that are alternate of each other in terms of bandwidth/quality.*/
+/*! returns the number of groups. A group is a set of media resources that are alternate of each other in terms of bandwidth/quality
+\param dash the target dash client
+\return the number of groups in the active session
+*/
 u32 gf_dash_get_group_count(GF_DashClient *dash);
-/*associate user data (or NULL) with this group*/
+
+/*! associates user data (or NULL) with a given group
+\param dash the target dash client
+\param group_index the 0-based index of the target group
+\param udta the opaque data to associate to the group
+\return error if any
+*/
 GF_Err gf_dash_set_group_udta(GF_DashClient *dash, u32 group_index, void *udta);
-/*returns the user data associated with this group*/
+
+/*! returns the user data associated with this group
+\param dash the target dash client
+\param group_index the 0-based index of the target group
+\return the opaque data to associate to the group
+*/
 void *gf_dash_get_group_udta(GF_DashClient *dash, u32 group_index);
-/*indicates whether a group is selected for playback or not. Currently groups cannot be selected during playback*/
+
+/*! indicates whether a group is selected for playback or not. Currently groups cannot be selected during playback
+\param dash the target dash client
+\param group_index the 0-based index of the target group
+\return GF_TRUE if the group is selected for playback/download
+*/
 Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 group_index);
 
-/*indicates whether this group is dependent on another group (because representations are). If this is the case, all representations of this group will be made available through the base group (and @has_next_segment flag) if the group is selected.
-returns -1 if not dependent on another group, otherwise return dependent group index*/
-s32 gf_dash_group_has_dependent_group(GF_DashClient *dash, u32 idx);
+/*! indicates whether this group is dependent on another group (because representations are). If this is the case, all representations of this group will be made available through the base group (and has_next_segment flag) if the group is selected.
+returns -1 if not dependent on another group, otherwise return dependent group index
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return -1 if the group does not depend on another group, otherwise returns the dependent group index
+*/
+s32 gf_dash_group_has_dependent_group(GF_DashClient *dash, u32 group_idx);
 
-/*gives the number of groups depending on this one for decoding.*/
-u32 gf_dash_group_get_num_groups_depending_on(GF_DashClient *dash, u32 idx);
+/*! gives the number of groups depending on this one for decoding
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return the number of other groups depending on this group
+*/
+u32 gf_dash_group_get_num_groups_depending_on(GF_DashClient *dash, u32 group_idx);
 
-/*gets the index of the depending_on group with the specified group_depending_on_dep_idx (between 0 and gf_dash_group_get_num_groups_depending_on()-1)*/
-s32 gf_dash_get_dependent_group_index(GF_DashClient *dash, u32 idx, u32 group_depending_on_dep_idx);
+/*! gets the index of the depending_on group with the specified group_depending_on_dep_idx (between 0 and \ref gf_dash_group_get_num_groups_depending_on -1)
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param group_depending_on_dep_idx the 0-based index of the queried dependent group
+\return the index of the depending_on group
+*/
+s32 gf_dash_get_dependent_group_index(GF_DashClient *dash, u32 group_idx, u32 group_depending_on_dep_idx);
 
-/*indicates whether a group can be selected for playback or not. Some groups may have been disabled because of non supported features*/
-Bool gf_dash_is_group_selectable(GF_DashClient *dash, u32 idx);
+/*! indicates whether a group can be selected for playback or not. Some groups may have been disabled because of non supported features
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return GF_TRUE if the group can be selected for playback, GF_FALSE otherwise
+*/
+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. */
-void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select);
+/*! selects a group for playback. If 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);
 
-/*performs selection of representations based on language code*/
+/*! 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
+*/
 void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_code_rfc_5646);
 
-/*returns the mime type of the media resources in this group*/
-const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx);
-/*returns the URL of the first media resource to play (init segment or first media segment depending on format). start_range and end_range are optional*/
-const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range);
-
-/*returns the URL and IV associated with the first media segment if any (init segment or first media segment depending on format). key_IV is optional*/
-const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 idx, bin128 *key_IV);
+/*! returns the mime type of the media resources in this group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return the mime type of the segments in this group
+*/
+const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 group_idx);
+
+/*! returns the URL of the first media resource to play (init segment or first media segment depending on format). start_range and end_range are optional
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param start_range set to the byte start offset in the init segment
+\param end_range set to the byte end offset in the init segment
+\return URL of the init segment (can be a relative path if manifest is a local file)
+*/
+const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 group_idx, u64 *start_range, u64 *end_range);
+
+/*! returns the URL and IV associated with the first media segment if any (init segment or first media segment depending on format).
+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 key_IV set to the IV used for the first media segment (can be NULL)
+\return the key URL of the first media segment
+*/
+const char *gf_dash_group_get_segment_init_keys(GF_DashClient *dash, u32 group_idx, bin128 *key_IV);
 
-/*returns the language of the group, or NULL if none associated*/
-const char *gf_dash_group_get_language(GF_DashClient *dash, u32 idx);
+/*! returns the language of the group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return the language of the group or NULL if no language associated
+*/
+const char *gf_dash_group_get_language(GF_DashClient *dash, u32 group_idx);
 
-/*returns the language of the group, or NULL if none associated*/
-u32 gf_dash_group_get_audio_channels(GF_DashClient *dash, u32 idx);
+/*! returns the number of audio channelsof the group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return the number of audio channels, or 0 if not audio or unspecified
+*/
+u32 gf_dash_group_get_audio_channels(GF_DashClient *dash, u32 group_idx);
 
-/*get time shift buffer depth of the group - (u32) -1 means infinity*/
-u32 gf_dash_group_get_time_shift_buffer_depth(GF_DashClient *dash, u32 idx);
+/*! 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
+*/
+u32 gf_dash_group_get_time_shift_buffer_depth(GF_DashClient *dash, u32 group_idx);
 
-/*get current time in time shift buffer in seconds - 0 means 'live point'
-this gets the maximum value (further in the past) of all representations playing*/
+/*! gets current time in time shift buffer
+This functions retrieves the maximum value (further in the past) of all selected/active groups
+\param dash the target dash client
+\return current time in timeshift buffer in seconds - 0 means 'live point'
+*/
 Double gf_dash_get_timeshift_buffer_pos(GF_DashClient *dash);
 
-/*sets codec statistics for playback rate adjustment*/
-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);
-
-/*sets buffer levels*/
-void gf_dash_group_set_buffer_levels(GF_DashClient *dash, u32 idx, u32 buffer_min_ms, u32 buffer_max_ms, u32 buffer_occupancy_ms);
-
-/*indicates the buffer time in ms after which the player resumes playback. This value is less or equal to the buffer_max_ms 
-indicated in gf_dash_group_set_buffer_levels */
-GF_Err gf_dash_group_set_max_buffer_playout(GF_DashClient *dash, u32 idx, u32 max_target_buffer_ms);
+/*! sets codec statistics of a group for playback rate adjustment
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param avg_dec_time average decode time in microseconds of a frame, 0 if unknown
+\param max_dec_time maximum decode time in microseconds of a frame, 0 if unknown
+\param irap_avg_dec_time average decode time of SAP 1/2/3 pictures in microseconds of a frame, 0 if unknown
+\param irap_max_dec_time maximum decode time of SAP 1/2/3 pictures in microseconds of a frame, 0 if unknown
+\param codec_reset indicates a codec reset is pending (pipeline flush is needed before reinit)
+\param decode_only_rap indicates only SAP1/2/3 are currently being decoded. This may trigger a switch to a trick mode representation
+*/
+void gf_dash_group_set_codec_stat(GF_DashClient *dash, u32 group_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);
+
+/*! sets buffer levels of a group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param buffer_min_ms minimum buffer in milliseconds (pipeline would rebuffer below this level)
+\param buffer_max_ms maximum buffer in milliseconds (pipeline would block above this level)
+\param buffer_occupancy_ms current buffer occupancy in milliseconds
+*/
+void gf_dash_group_set_buffer_levels(GF_DashClient *dash, u32 group_idx, u32 buffer_min_ms, u32 buffer_max_ms, u32 buffer_occupancy_ms);
+
+/*! indicates the buffer time in ms after which the player resumes playback. This value is less or equal to the buffer_max_ms
+indicated in \ref gf_dash_group_set_buffer_levels
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param max_target_buffer_ms buffer in milliseconds above which pipeline resumes after a rebuffering event
+\return error if any
+*/
+GF_Err gf_dash_group_set_max_buffer_playout(GF_DashClient *dash, u32 group_idx, u32 max_target_buffer_ms);
 
+/*! DASH descriptor types*/
 typedef enum
 {
+	/*! Accessibility descriptor*/
 	GF_MPD_DESC_ACCESSIBILITY,
+	/*! Audio config descriptor*/
 	GF_MPD_DESC_AUDIOCONFIG,
+	/*! Content Protection descriptor*/
 	GF_MPD_DESC_CONTENT_PROTECTION,
+	/*! Essential Property descriptor*/
 	GF_MPD_DESC_ESSENTIAL_PROPERTIES,
+	/*! Supplemental Property descriptor*/
 	GF_MPD_DESC_SUPPLEMENTAL_PROPERTIES,
+	/*! Frame packing descriptor*/
 	GF_MPD_DESC_FRAME_PACKING,
+	/*! Role descriptor*/
 	GF_MPD_DESC_ROLE,
+	/*! Rating descriptor*/
 	GF_MPD_DESC_RATING,
+	/*! Viewpoint descriptor*/
 	GF_MPD_DESC_VIEWPOINT
 } GF_DashDescriptorType;
 
-//enumerate descriptors of the given type:
-//group_idx: index of the group for which descriptors are enumerated
-//desc_type: type of descriptor being checked, one of the above
-//role_idx: index of the descriptor being checked for this type
+/*! enumerates descriptors of the given type
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param desc_type type of descriptor being checked
+\param role_idx index of the descriptor being checked for this type
+\param desc_id set to the ID of the descriptor if found (optional, may be NULL)
+\param desc_scheme set to the scheme of the descriptor if found (optional, may be NULL)
+\param desc_value set to the desc_value of the descriptor if found (optional, may be NULL)
+\return GF_TRUE if descriptor is found, GF_FALSE otherwise
+*/
 Bool gf_dash_group_enum_descriptor(GF_DashClient *dash, u32 group_idx, GF_DashDescriptorType desc_type, u32 role_idx, const char **desc_id, const char **desc_scheme, const char **desc_value);
 
-/*returns the URL and byte range of the next media resource to play in this group.
-If switching occured, sets switching_index to the new representation index.
-If no bitstream switching is possible, also set the url and byte range of the media file required to intialize
-the playback of the next segment
-original_url is optional and may be used to het the URI of the segment
+/*! returns the URL and byte range of the next media resource to play in this group.
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param dependent_representation_index index of the dependent representation to query, 0-based
+\param url set to the URL of the next segment
+\param start_range set to the start byte offset in the segment (optional, may be NULL)
+\param end_range set to the end byte offset in the segment (optional, may be NULL)
+\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 switching_start_range set to start byte offset of the switching segment if needed (optional, may be NULL)
+\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_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
 */
-GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, u32 dependent_representation_index, const char **url, u64 *start_range, u64 *end_range,
+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*/
+/*! same as gf_dash_group_get_next_segment_location but query the current downloaded 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
+*/
 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);
-
-/*returns 1 if segment numbers loops at this level (not allowed but happens when looping captures ...*/
-Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 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 */
-Double gf_dash_group_get_start_range(GF_DashClient *dash, u32 idx);
-
-/*discards the first media resource in the queue of this group*/
-void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx);
-/*get the number of media resources available in the cache for this group*/
-u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done);
-/*get the maximum number of media resources  that can be put in the cache for this group*/
-u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx);
-/*indicates to the DASH engine that the group playback has been stopped by the user*/
-void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done);
-/*gets presentationTimeOffset and timescale for the active representation*/
-GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 idx, u64 *presentation_time_offset, u32 *timescale);
-
-/*returns 1 if the playback position is in the last period of the presentation
-if check_eos is set, return one only if the last period is known to be the last one (eg not an open period in live)
+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);
+
+/*! 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
+\param group_idx the 0-based index of the target group
+\return  GF_TRUE if segment numbers loop was detected
+*/
+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)
+\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
+*/
+void gf_dash_group_discard_segment(GF_DashClient *dash, u32 group_idx);
+
+/*! gets the number of media resources available in the cache for this group
+\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
+*/
+u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 group_idx, Bool *group_is_done);
+
+/*! 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
+\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);
+
+/*! indicates to the DASH engine that the group playback has been stopped by the user
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param done mark group as done if GF_TRUE, or not done if GF_FALSE
+*/
+void gf_dash_set_group_done(GF_DashClient *dash, u32 group_idx, Bool done);
+
+/*! gets presentationTimeOffset and timescale for the active representation
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param presentation_time_offset set to the presentation time offset for the group
+\param timescale set to the timescale used to represent the presentation time offset
+\return error if any
+*/
+GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 group_idx, u64 *presentation_time_offset, u32 *timescale);
+
+/*! checks if the session is in the last period
+\param dash the target dash client
+\param check_eos if GF_TRUE, return GF_TRUE only if the last period is known to be the last one (not an open period in live)
+\return GF_TRUE if the playback position is in the last period of the presentation
 */
 Bool gf_dash_in_last_period(GF_DashClient *dash, Bool check_eos);
-/*return value:
+
+/*! gets current period switching status for the session.
+\param dash the target dash client
+\return possible values:
 	1 if the period switching has been requested (due to seeking),
 	2 if the switching is in progress (all groups will soon be destroyed and plyback will be stopped and restarted)
 	0 if no switching is requested
 */
 u32 gf_dash_get_period_switch_status(GF_DashClient *dash);
-/*request period switch - this is typically called when the media engine signals that no more data is available for playback*/
+
+/*! request period switch - this is typically called when the media engine signals that no more data is available for playback
+\param dash the target dash client
+*/
 void gf_dash_request_period_switch(GF_DashClient *dash);
-/*returns 1 if the DASH engine is currently setting up a period (creating groups and fetching initial segments)*/
+
+/*! checks if the client is in a period setup state
+\param dash the target dash client
+\return GF_TRUE if the DASH engine is currently setting up a period (creating groups and fetching initial segments)
+*/
 Bool gf_dash_in_period_setup(GF_DashClient *dash);
-/*seeks playback to the given time. If period changes, all playback is stopped and restarted
-If the session is dynamic (live), the start_range is ignored and recomputed from current UTC clock to be at the live point. If timeshifting is desired, use @gf_dash_set_timeshift before seeking.*/
+
+/*! seeks playback to the given time. If period changes, all playback is stopped and restarted
+If the session is dynamic (live), the start_range is ignored and recomputed from current UTC clock to be at the live point. If timeshifting is desired, use \ref gf_dash_set_timeshift before seeking
+\param dash the target dash client
+\param start_range the desired seek time in seconds
+*/
 void gf_dash_seek(GF_DashClient *dash, Double start_range);
-/*when seeking, this flag is set when the seek is outside of the previously playing segment.*/
-Bool gf_dash_group_segment_switch_forced(GF_DashClient *dash, u32 idx);
-/*get video info for this group if video*/
-GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height);
 
-/*seek only a given group*/
+/*! checks if seeking time is in the previously playing segment
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return GF_TRUE if the seek request was in a different segment than the previously playing one
+*/
+Bool gf_dash_group_segment_switch_forced(GF_DashClient *dash, u32 group_idx);
+/*! gets video info for this group if video
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param max_width set to the maximum width in the group
+\param max_height set to the maximum height in the group
+\return error if any
+*/
+GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 group_idx, u32 *max_width, u32 *max_height);
+
+/*! seeks only a given group - results are undefined if the seek operation triggers a period switch
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param seek_to the desired seek time in seconds
+*/
 void gf_dash_group_seek(GF_DashClient *dash, u32 group_idx, Double seek_to);
 
-/*sets playback speed of the session. Speed is used in adaptation logic*/
+/*! sets playback speed of the session. Speed is used in adaptation logic
+\param dash the target dash client
+\param speed current playback speed
+*/
 void gf_dash_set_speed(GF_DashClient *dash, Double speed);
 
-/*returns the start_time of the first segment in the queue (usually the one being played)*/
-Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx);
-
-/*allow reloading of MPD on the local file system - useful for testing live generators*/
-void gf_dash_allow_local_mpd_update(GF_DashClient *dash, Bool allow_local_mpd_update);
-
-/*gets media info for representation*/
-GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs);
-
-/*gets media buffering info for all active representations*/
-void gf_dash_get_buffer_info(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
-
-/*updates media bandwidth for the given group. Only allowed for groups without dependencies to other groups*/
-GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx);
-
-/*resync the downloader so that the next downloaded segment falls into the indicated range - used for error recovery*/
-GF_Err gf_dash_resync_to_segment(GF_DashClient *dash, const char *latest_segment_name, const char *earliest_segment_name);
-
-/*sets dash idle interval. The default is 1 sec. The dash client thread will never go to sleep for more than this interval*/
-void gf_dash_set_idle_interval(GF_DashClient *dash, u32 idle_time_ms);
+/*! 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
+\return error if any
+*/
+GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 group_idx);
 
-/*enables UTC drift computation using HTTP header "Server-UTC: UTC", where UTC is in ms*/
+/*! enables UTC drift computation using HTTP header "Server-UTC: UTC", where UTC is in ms
+\param dash the target dash client
+\param estimate_utc_drift if GF_TRUE, enables UTC drift compensation, otherwise disables it
+*/
 void gf_dash_enable_utc_drift_compensation(GF_DashClient *dash, Bool estimate_utc_drift);
 
-/*returns GF-TRUE if MPD is dynamic, false otherwise*/
+/*! checks if session is dynamic offering (live)
+\param dash the target dash client
+\return GF_TRUE if MPD is dynamic, GF_FALSE otherwise
+*/
 Bool gf_dash_is_dynamic_mpd(GF_DashClient *dash);
 
-/*returns minimum buffer time indicated in mpd in ms*/
+/*! gets minimum buffer time of session indicated in MPD
+\param dash the target dash client
+\return minimum buffer time in ms
+*/
 u32 gf_dash_get_min_buffer_time(GF_DashClient *dash);
 
-// gets the difference between the local UTC clock and the one reported by the server 
+/*! 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
+*/
 s32 gf_dash_get_utc_drift_estimate(GF_DashClient *dash);
 
-//shifts UTC clock of server by shift_utc_ms so that new UTC in MPD is old + shift_utc_ms
+/*! shifts UTC clock of server by shift_utc_ms so that new UTC in MPD is old + shift_utc_ms
+\param dash the target dash client
+\param shift_utc_ms UTC clock shift in milliseconds. A positive value will move the clock in the future, a negative value in the past
+*/
 void gf_dash_set_utc_shift(GF_DashClient *dash, s32 shift_utc_ms);
 
-//sets max resolution@bpp for all video
+/*! sets max video display capabilities
+\param dash the target dash client
+\param width the maximum width of the display
+\param height the maximum height of the display
+\param max_display_bpp the maximum bits per pixel of the display
+\return error if any
+*/
 GF_Err gf_dash_set_max_resolution(GF_DashClient *dash, u32 width, u32 height, u8 max_display_bpp);
 
-//sets min time in ms between a 404 and the next request on the same group. The default value is 500 ms.
+/*! sets min time in ms between a 404 and the next request on the same group. The default value is 500 ms.
+\param dash the target dash client
+\param min_timeout_between_404 minimum delay in milliseconds between retries
+\return error if any
+*/
 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 default value is 100 ms.
+/*! 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.
+\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
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+*/
+void gf_dash_debug_group(GF_DashClient *dash, s32 group_idx);
 
-//only enables the given group - this shall be set before calling @gf_dash_open. If group_index is <0 (default) no groups will be disabled.
-void gf_dash_debug_group(GF_DashClient *dash, s32 group_index);
+/*! split all adatation sets so that they contain only one representation (quality)
+\param dash the target dash client
+*/
+void gf_dash_split_adaptation_sets(GF_DashClient *dash);
+
+/*! low latency mode of dash client*/
+typedef enum
+{
+	/*! disable low latency*/
+	GF_DASH_LL_DISABLE = 0,
+	/*! strict respect of segment availability start time*/
+	GF_DASH_LL_STRICT,
+	/*! allow fetching segments earlier than their availability start time in case of empty demux*/
+	GF_DASH_LL_EARLY_FETCH,
+} GF_DASHLowLatencyMode;
+
+/*! allow early segment fetch in low latency mode
+\param dash the target dash client
+\param low_lat_mode low latency mode
+*/
+void gf_dash_set_low_latency_mode(GF_DashClient *dash, GF_DASHLowLatencyMode low_lat_mode);
 
-//indicates typical buffering used by the user app . This allows fetching data earlier in live mode, if the timeshiftbuffer allows for it
+/*! indicates typical buffering used by the user app before playback starts.
+ This allows fetching data earlier in live mode, if the timeshiftbuffer allows for it
+\param dash the target dash client
+\param buffer_time_ms typical playout buffer in milliseconds
+*/
 void gf_dash_set_user_buffer(GF_DashClient *dash, u32 buffer_time_ms);
 
-//indicates the number of segments to wait before switching up bandwidth. The default value is 1 (ie stay in current
-//bandwidth or one more segment before switching up, event if download rate is enough)
-//seting to 0 means the switch will happen instantly, but this is more prone to quality changes due to network variations
+/*! indicates the number of segments to wait before switching up bandwidth. The default value is 1 (ie stay in current bandwidth or one more segment before switching up, event if download rate is enough).
+Setting this to 0 means the switch will happen instantly, but this is more prone to quality changes due to network variations
+\param dash the target dash client
+\param switch_probe_count the number of probes before switching
+*/
 void gf_dash_set_switching_probe_count(GF_DashClient *dash, u32 switch_probe_count);
-/*If agressive switching is enabled, switching targets to the closest bandwidth fitting the available download rate. Otherwise, switching targets the lowest bitrate representation that is above the currently played (eg does not try to switch to max bandwidth). Default value is no.
+
+/*! enables agressive switching mode. If agressive switching is enabled, switching targets to the closest bandwidth fitting the available download rate. Otherwise, switching targets the lowest bitrate representation that is above the currently played (eg does not try to switch to max bandwidth). Default value is no.
+\param dash the target dash client
+\param enable_agressive_switch if GF_TRUE, enables agressive mode, otherwise disables it
 */
-void gf_dash_set_agressive_adaptation(GF_DashClient *dash, Bool eanble_agressive_switch);
+void gf_dash_set_agressive_adaptation(GF_DashClient *dash, Bool enable_agressive_switch);
 
-/*returns active period start in ms*/
+/*! returns active period start
+\param dash the target dash client
+\return period start in milliseconds
+*/
 u64 gf_dash_get_period_start(GF_DashClient *dash);
-/*returns active period duration in ms*/
+
+/*! gets active period duration
+\param dash the target dash client
+\return active period duration in milliseconds
+*/
 u64 gf_dash_get_period_duration(GF_DashClient *dash);
 
-//returns number of quality available for the given group
-u32 gf_dash_group_get_num_qualities(GF_DashClient *dash, u32 idx);
+/*! gets number of quality available for a group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return number of quality available
+*/
+u32 gf_dash_group_get_num_qualities(GF_DashClient *dash, u32 group_idx);
 
-//returns number of components in the given group
-u32 gf_dash_group_get_num_components(GF_DashClient *dash, u32 idx);
+/*! gets the number of components in a group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\return number of components
+*/
+u32 gf_dash_group_get_num_components(GF_DashClient *dash, u32 group_idx);
 
+/*! disable speed adaptation
+\param dash the target dash client
+\param disable if GF_TRUE? speed adaptation is disabled, otherwise it is enabled
+*/
 void gf_dash_disable_speed_adaptation(GF_DashClient *dash, Bool disable);
 
-
+/*! DASH/HLS quality information structure*/
 typedef struct
 {
+	/*! bandwidth in bits per second*/
 	u32 bandwidth;
+	/*! ID*/
 	const char *ID;
+	/*! mime type*/
 	const char *mime;
+	/*! codec parameter of mime type*/
 	const char *codec;
+	/*! video width*/
 	u32 width;
+	/*! video width*/
 	u32 height;
+	/*! video interlaced flag*/
 	Bool interlaced;
-	u32 fps_den, fps_num;
+	/*! video framerate numerator*/
+	u32 fps_den;
+	/*! video framerate denominator*/
+	u32 fps_num;
+	/*! video sample aspect ratio numerator*/
 	u32 par_num;
+	/*! video sample aspect ratio denominator*/
 	u32 par_den;
+	/*! audio sample rate*/
 	u32 sample_rate;
+	/*! audio channel count*/
 	u32 nb_channels;
+	/*! disabled flag (not supported by DASH client)*/
 	Bool disabled;
+	/*! selected flag*/
 	Bool is_selected;
 } GF_DASHQualityInfo;
 
-//returns number of quality available for the given group
-GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 idx, u32 quality_idx, GF_DASHQualityInfo *quality);
+/*! gets information on  a given quality
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param quality_idx the 0-based index of the quality
+\param quality filled with information for the desired quality
+\return error if any
+*/
+GF_Err gf_dash_group_get_quality_info(GF_DashClient *dash, u32 group_idx, u32 quality_idx, GF_DASHQualityInfo *quality);
 
-//returns 1 if automatic quality switching is enabled
+/*! checks automatic switching mode
+\param dash the target dash client
+\return GF_TRUE if automatic quality switching is enabled
+*/
 Bool gf_dash_get_automatic_switching(GF_DashClient *dash);
 
-//sets automatic quality switching enabled or disabled
+/*! sets automatic quality switching mode. If automatic switching is off, switching can only happen based on caller inputs
+\param dash the target dash client
+\param enable_switching if GF_TRUE, automatic switching is enabled; otherwise it is disabled
+\return error if any
+*/
 GF_Err gf_dash_set_automatic_switching(GF_DashClient *dash, Bool enable_switching);
 
-//selects quality of given ID
-GF_Err gf_dash_group_select_quality(GF_DashClient *dash, u32 idx, const char *ID);
-
-//gets download rate in bytes per second for the given group
-u32 gf_dash_group_get_download_rate(GF_DashClient *dash, u32 idx);
+/*! selects quality of a group, either by ID or by index if ID is null
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param ID the ID of the desired quality
+\param q_idx the 0-based index of the desired quality
+\return error if any
+*/
+GF_Err gf_dash_group_select_quality(GF_DashClient *dash, u32 group_idx, const char *ID, u32 q_idx);
+
+/*! gets currently active quality of a group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\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
+/*! 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
+*/
 void gf_dash_override_ntp(GF_DashClient *dash, u64 server_ntp);
 
-//specifies how bitrate is allocated accross tiles of the same video
+/*! Tile adaptation mode
+This mode specifies how bitrate is allocated accross tiles of the same video
+*/
 typedef enum
 {
-	//each tile receives the same amount of bitrate (default strategy)
+	/*! each tile receives the same amount of bitrate (default strategy)*/
 	GF_DASH_ADAPT_TILE_NONE=0,
-	//bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row
+	/*! bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row*/
 	GF_DASH_ADAPT_TILE_ROWS,
-	//bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row
+	/*! bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row*/
 	GF_DASH_ADAPT_TILE_ROWS_REVERSE,
-	//bitrate decreased for top and bottom rows only, same rate for each tile on the row
+	/*! bitrate decreased for top and bottom rows only, same rate for each tile on the row*/
 	GF_DASH_ADAPT_TILE_ROWS_MIDDLE,
-	//bitrate decreases for each column of tiles starting from the left, same rate for each tile on the column
+	/*! bitrate decreases for each column of tiles starting from the left, same rate for each tile on the column*/
 	GF_DASH_ADAPT_TILE_COLUMNS,
-	//bitrate decreases for each column of tiles starting from the right, same rate for each tile on the column
+	/*! bitrate decreases for each column of tiles starting from the right, same rate for each tile on the column*/
 	GF_DASH_ADAPT_TILE_COLUMNS_REVERSE,
-	//bitrate decreased for left and right columns only, same rate for each tile on the column
+	/*! bitrate decreased for left and right columns only, same rate for each tile on the column*/
 	GF_DASH_ADAPT_TILE_COLUMNS_MIDDLE,
-	//bitrate decreased for all tiles on the edge of the picture
+	/*! bitrate decreased for all tiles on the edge of the picture*/
 	GF_DASH_ADAPT_TILE_CENTER,
-	//bitrate decreased for all tiles on the center of the picture
+	/*! bitrate decreased for all tiles on the center of the picture*/
 	GF_DASH_ADAPT_TILE_EDGES,
 } GF_DASHTileAdaptationMode;
 
-//sets type of tile adaptation.
-// @tile_rate_decrease: percentage (0->100) of global bandwidth to use at each level (recursive rate decrease for all level). If 0% or 100%, automatic rate allocation among tiles is performed (default mode)
+/*! sets tile adaptation mode
+\param dash the target dash client
+\param mode the desired tile adaptation mode
+\param tile_rate_decrease percentage (0->100) of global bandwidth to use at each level (recursive rate decrease for all level). If 0% or 100%, automatic rate allocation among tiles is performed (default mode)
+*/
 void gf_dash_set_tile_adaptation_mode(GF_DashClient *dash, GF_DASHTileAdaptationMode mode, u32 tile_rate_decrease);
 
-/*returns tile adaptation mode currently used*/
+/*! gets current tile adaptation mode
+\param dash the target dash client
+\return tile adaptation mode*/
 GF_DASHTileAdaptationMode gf_dash_get_tile_adaptation_mode(GF_DashClient *dash);
 
-//gets max width and height in pixels of the SRD this group belongs to, if any
-Bool gf_dash_group_get_srd_max_size_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height);
-
-//gets SRD info, in SRD coordinate, of the SRD this group belongs to, if any
-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);
-
-//sets quality hint for the given group. Quality degradation ranges from 0 (no degradation) to 100 (worse quality possible)
-GF_Err gf_dash_group_set_quality_degradation_hint(GF_DashClient *dash, u32 idx, u32 quality_degradation_hint);
-
-//sets visible rectangle of a video object, may be used for adaptation. If min_x==max_x==min_y=max_y==0, disable adaptation
-GF_Err gf_dash_group_set_visible_rect(GF_DashClient *dash, u32 idx, u32 min_x, u32 max_x, u32 min_y, u32 max_y);
+/*! gets max width and height in pixels of the SRD (Spatial Relationship Descriptor) a given group belongs to, if any
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param max_width set to the maximum width of the SRD of this group
+\param max_height set to the maximum height of the SRD of this group
+\return GF_TRUE if the group has an SRD descriptor associated, GF_FALSE otherwise
+*/
+Bool gf_dash_group_get_srd_max_size_info(GF_DashClient *dash, u32 group_idx, u32 *max_width, u32 *max_height);
+
+/*! gets SRD info, in SRD coordinate, of the SRD this group belongs to, if any
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param srd_id set to the id of the SRD of this group
+\param srd_x set to the horizontal coordinate of the SRD of this group
+\param srd_y set to the vertical coordinate of the SRD of this group
+\param srd_w set to the width of the SRD of this group
+\param srd_h set to the height of the SRD of this group
+\param srd_width set to the reference width (usually max width) of the SRD of this group
+\param srd_height set to the reference height (usually max height) of the SRD of this group
+\return GF_TRUE if the group has an SRD descriptor associated, GF_FALSE otherwise
+*/
+Bool gf_dash_group_get_srd_info(GF_DashClient *dash, u32 group_idx, u32 *srd_id, u32 *srd_x, u32 *srd_y, u32 *srd_w, u32 *srd_h, u32 *srd_width, u32 *srd_height);
 
-/*Enables or disables threaded downloads of media files for the dash client
- @use_threads: if true, threads are used to download files*/
-void gf_dash_set_threaded_download(GF_DashClient *dash, Bool use_threads);
+/*! sets quality hint for the given group
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param quality_degradation_hint quality degradation from 0 (no degradation) to 100 (worse quality possible)
+\return error if any
+*/
+GF_Err gf_dash_group_set_quality_degradation_hint(GF_DashClient *dash, u32 group_idx, u32 quality_degradation_hint);
+
+/*! sets visible rectangle of a video object, may be used for adaptation. If min_x==max_x==min_y=max_y==0, disable adaptation
+\param dash the target dash client
+\param group_idx the 0-based index of the target group
+\param min_x horizontal coordinate of first visible column
+\param max_x horizontal coordinate of last visible column
+\param min_y horizontal coordinate of first visible row
+\param max_y horizontal coordinate of last visible row
+\param is_gaze if set, {min_x, min_y} indicate the position of the gaze (and {max_x, max_y} are ignored)
+\return error if any
+*/
+GF_Err gf_dash_group_set_visible_rect(GF_DashClient *dash, u32 group_idx, u32 min_x, u32 max_x, u32 min_y, u32 max_y, Bool is_gaze);
 
-/*Ignores xlink on periods if some adaptation sets are specified in the period with xlink*/
+/*! Ignores xlink on periods if some adaptation sets are specified in the period with xlink
+\param dash the target dash client
+\param ignore_xlink if GF_TRUE? xlinks will be ignored on periods containing both xlinks and adaptation sets
+*/
 void gf_dash_ignore_xlink(GF_DashClient *dash, Bool ignore_xlink);
 
-/*returns true if all active groups in period are done*/
+/*! checks if all groups are done
+\param dash the target dash client
+\return GF_TRUE if all active groups in period are done
+*/
 Bool gf_dash_all_groups_done(GF_DashClient *dash);
+
+/*! sets a query string to append to xlink on periods
+\param dash the target dash client
+\param query_string the query string to append to xlinks on periods
+*/
 void gf_dash_set_period_xlink_query_string(GF_DashClient *dash, const char *query_string);
 
+/*! DASH client adaptation algorithm*/
 typedef enum {
+	/*! no adaptation*/
 	GF_DASH_ALGO_NONE = 0,
+	/*! GPAC rate-based adaptation*/
 	GF_DASH_ALGO_GPAC_LEGACY_RATE,
+	/*! GPAC buffer-based adaptation*/
 	GF_DASH_ALGO_GPAC_LEGACY_BUFFER,
-
+	/*! BBA-0*/
 	GF_DASH_ALGO_BBA0,
-
+	/*! BOLA finite*/
 	GF_DASH_ALGO_BOLA_FINITE,
+	/*! BOLA basic*/
 	GF_DASH_ALGO_BOLA_BASIC,
+	/*! BOLA-U*/
 	GF_DASH_ALGO_BOLA_U,
+	/*! BOLA-O*/
 	GF_DASH_ALGO_BOLA_O
 } GF_DASHAdaptationAlgorithm;
 
-//sets adaptation logic algorithm
+/*! sets dash adaptation algorithm. Cannot be called on an active session
+\param dash the target dash client
+\param algo the algorithm to use
+*/
 void gf_dash_set_algo(GF_DashClient *dash, GF_DASHAdaptationAlgorithm algo);
 
-//sets availabilityStartTime shift for ATSC
+/*! 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 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);
+
+/*! 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 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)
+*/
+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);
+
+/*! 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.
+\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
+*/
 void gf_dash_set_atsc_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
+\return minimum wait time in ms
+*/
+u32 gf_dash_get_min_wait_ms(GF_DashClient *dash);
+
+/*! 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
+*/
+u32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx);
+
+
 #endif //GPAC_DISABLE_DASH_CLIENT
 
 /*!	@} */

gpac-0.8.0.tar.gz/include/gpac/download.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -27,19 +27,19 @@
 #define _GF_DOWNLOAD_H_
 
 /*!
- *	\file <gpac/download.h>
- *	\brief HTTP(S) Downloader.
+\file <gpac/download.h>
+\brief HTTP(S) Downloader.
  */
 
 /*!
- *	\addtogroup dld_grp Downloader
- *	\ingroup utils_grp
- *	\brief File Downloader objects
- *
- *	This section documents the file downloading tools the GPAC framework. Currently HTTP is supported, HTTPS is under testing but may not be supported
- *depending on GPAC compilation options (HTTPS in GPAC needs OpenSSL installed on the system).
- *
- *	@{
+
+\addtogroup download_grp
+\brief HTTP Downloader
+
+This section documents the file downloading tools the GPAC framework. Currently HTTP and HTTPS are supported. HTTPS may not be supported depending on GPAC compilation options (HTTPS in GPAC needs OpenSSL installed on the system).
+
+@{
+
  */
 
 
@@ -51,12 +51,14 @@
 #include <gpac/config_file.h>
 #include <gpac/cache.h>
 
-
 /*!the download manager object. This is usually not used by GPAC modules*/
 typedef struct __gf_download_manager GF_DownloadManager;
 /*!the download manager session.*/
 typedef struct __gf_download_session GF_DownloadSession;
+/*!the optional filter session.*/
+typedef struct __gf_filter_session GF_DownloadFilterSession;
 
+/*! URL information object*/
 typedef struct GF_URL_Info_Struct {
 	const char * protocol;
 	char * server_name;
@@ -68,64 +70,61 @@
 } GF_URL_Info;
 
 /*!
- * Extracts the information from an URL. A call to gf_dm_url_info_init() must have been issue before calling this method.
- * \param url The URL to fill
- * \param info This structure will be initialized properly and filled with the data
- * \param baseURL The baseURL to use if any (can be null)
- * \return GF_OK if URL is well formed and supported by GPAC
+Extracts the information from an URL. A call to gf_dm_url_info_init() must have been issue before calling this method.
+\param url The URL to fill
+\param info This structure will be initialized properly and filled with the data
+\param baseURL The baseURL to use if any (can be null)
+\return GF_OK if URL is well formed and supported by GPAC
  */
 GF_Err gf_dm_get_url_info(const char * url, GF_URL_Info * info, const char * baseURL);
 
 /**
- * Init the GF_URL_Info structure before it can be used
- * \param info The structure to initialize
+Inits the GF_URL_Info structure before it can be used
+\param info The structure to initialize
  */
 void gf_dm_url_info_init(GF_URL_Info * info);
 
 /*!
- * Frees the inner structures of a GF_URL_Info_Struct
- * \param info The info to free
+Frees the inner structures of a GF_URL_Info_Struct
+\param info The info to free
  */
 void gf_dm_url_info_del(GF_URL_Info * info);
 
 /*!
- *\brief download manager constructor
- *
- *Creates a new download manager object.
- *\param cfg optional configuration file. Currently the download manager needs a configuration file for cache location and
- *other options. The cache directory must be indicated in the section "General", key "CacheDirectory" of the configuration
- *file. If the cache directory is not found, the cache will be disabled but the downloader will still work.
- *\return the download manager object
+\brief download manager constructor
+
+Creates a new download manager object.
+\param fsess optional filter session. If not NULL, the filter session will be used for async downloads. Otherwise, threads will be created
+\return the download manager object
 */
-GF_DownloadManager *gf_dm_new(GF_Config *cfg);
-/*
- *\brief download manager destructor
- *
- *Deletes the download manager. All running sessions are aborted
- *\param dm the download manager object
+GF_DownloadManager *gf_dm_new(GF_DownloadFilterSession *fsess);
+/*!
+\brief download manager destructor
+
+Deletes the download manager. All running sessions are aborted
+\param dm the download manager object
  */
 void gf_dm_del(GF_DownloadManager *dm);
 
 /*!
- *\brief callback function for authentication
- *
- * The gf_dm_get_usr_pass type is the type for the callback of the \ref gf_dm_set_auth_callback function used for password retrieval
- *\param usr_cbk opaque user data
- *\param site_url url of the site the user and password are requested for
- *\param usr_name the user name for this site. The allocated space for this buffer is 50 bytes. \note this varaibale may already be formatted.
- *\param password the password for this site and user. The allocated space for this buffer is 50 bytes.
- *\return 0 if user didn't fill in the information which will result in an authentication failure, 1 otherwise.
+\brief callback function for authentication
+
+The gf_dm_get_usr_pass type is the type for the callback of the \ref gf_dm_set_auth_callback function used for password retrieval
+\param usr_cbk opaque user data
+\param site_url url of the site the user and password are requested for
+\param usr_name the user name for this site. The allocated space for this buffer is 50 bytes. \note this varaibale may already be formatted.
+\param password the password for this site and user. The allocated space for this buffer is 50 bytes.
+\return 0 if user didn't fill in the information which will result in an authentication failure, 1 otherwise.
 */
 typedef Bool (*gf_dm_get_usr_pass)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
 
 /*!
- *\brief password retrieval assignment
- *
- *Assigns the callback function used for user password retrieval. If no such function is assigned to the download manager,
- *all downloads requiring authentication will fail.
- *\param dm the download manager object
- *\param get_pass \ref gf_dm_get_usr_pass callback function for user and password retrieval.
- *\param usr_cbk opaque user data passed to callback function
+\brief password retrieval assignment
+
+Assigns the callback function used for user password retrieval. If no such function is assigned to the download manager, all downloads requiring authentication will fail.
+\param dm the download manager object
+\param get_pass specifies \ref gf_dm_get_usr_pass callback function for user and password retrieval.
+\param usr_cbk opaque user data passed to callback function
  */
 void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
 
@@ -184,7 +183,7 @@
 	/*error code if any. Valid for all message types.*/
 	GF_Err error;
 	/*!data received or data to send. Only valid for GF_NETIO_GET_CONTENT and GF_NETIO_DATA_EXCHANGE (when no cache is setup) messages*/
-	const char *data;
+	const u8 *data;
 	/*!size of associated data. Only valid for GF_NETIO_GET_CONTENT and GF_NETIO_DATA_EXCHANGE messages*/
 	u32 size;
 	/*protocol header. Only valid for GF_NETIO_GET_HEADER, GF_NETIO_PARSE_HEADER and GF_NETIO_GET_METHOD*/
@@ -204,27 +203,27 @@
 } GF_NETIO_Parameter;
 
 /*!
- *\brief callback function for data reception and state signaling
- *
- * The gf_dm_user_io type is the type for the data callback function of a download session
- *\param usr_cbk opaque user data
- *\param parameter the input/output parameter structure
+\brief callback function for data reception and state signaling
+
+The gf_dm_user_io type is the type for the data callback function of a download session
+\param usr_cbk opaque user data
+\param parameter the input/output parameter structure
 */
 typedef void (*gf_dm_user_io)(void *usr_cbk, GF_NETIO_Parameter *parameter);
 
 
 
 /*!
- *\brief download session constructor
- *
- *Creates a new download session
- *\param dm the download manager object
- *\param url file to retrieve (no PUT/POST yet, only downloading is supported)
- *\param dl_flags combination of session download flags
- *\param user_io \ref gf_dm_user_io callback function for data reception and service messages
- *\param usr_cbk opaque user data passed to callback function
- *\param error error for failure cases
- *\return the session object or NULL if error. If no error is indicated and a NULL session is returned, this means the file is local
+\brief download session constructor
+
+Creates a new download session
+\param dm the download manager object
+\param url file to retrieve (no PUT/POST yet, only downloading is supported)
+\param dl_flags combination of session download flags
+\param user_io specifies \ref gf_dm_user_io callback function for data reception and service messages
+\param usr_cbk opaque user data passed to callback function
+\param error error for failure cases
+\return the session object or NULL if error. If no error is indicated and a NULL session is returned, this means the file is local
  */
 GF_DownloadSession * gf_dm_sess_new(GF_DownloadManager *dm, const char *url, u32 dl_flags,
                                     gf_dm_user_io user_io,
@@ -232,16 +231,16 @@
                                     GF_Err *error);
 
 /*!
- *\brief download session simple constructor
- *
- *Creates a new download session
- *\param dm The download manager used to create the download session
- *\param url file to retrieve (no PUT/POST yet, only downloading is supported)
- *\param dl_flags combination of session download flags
- *\param user_io \ref gf_dm_user_io callback function for data reception and service messages
- *\param usr_cbk opaque user data passed to callback function
- *\param e error for failure cases
- *\return the session object or NULL if error. If no error is indicated and a NULL session is returned, this means the file is local
+\brief download session simple constructor
+
+Creates a new download session
+\param dm The download manager used to create the download session
+\param url file to retrieve (no PUT/POST yet, only downloading is supported)
+\param dl_flags combination of session download flags
+\param user_io specifies \ref gf_dm_user_io callback function for data reception and service messages
+\param usr_cbk opaque user data passed to callback function
+\param e error for failure cases
+\return the session object or NULL if error. If no error is indicated and a NULL session is returned, this means the file is local
  */
 GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *url, u32 dl_flags,
         gf_dm_user_io user_io,
@@ -249,327 +248,305 @@
         GF_Err *e);
 
 /*!
- *brief downloader session destructor
- *
- *Deletes the download session, cleaning the cache if indicated in the configuration file of the download manager (section "Downloader", key "CleanCache")
- *\param sess the download session
+ \brief downloader session destructor
+
+Deletes the download session, cleaning the cache if indicated in the configuration file of the download manager (section "Downloader", key "CleanCache")
+\param sess the download session
 */
 void gf_dm_sess_del(GF_DownloadSession * sess);
 
 /*!
- *\brief aborts downloading
- *
- *Aborts all operations in the session, regardless of its state. The session cannot be reused once this is called.
- *\param sess the download session
- */
-void gf_dm_sess_abort(GF_DownloadSession * sess);
+\brief aborts downloading
 
-/*!
- *\brief sets private data
- *
- *associate private data with the session.
- *\param sess the download session
- *\param private_data the private data
- *\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
+Aborts all operations in the session, regardless of its state. The session cannot be reused once this is called.
+\param sess the download session
  */
-void gf_dm_sess_set_private(GF_DownloadSession * sess, void *private_data);
+void gf_dm_sess_abort(GF_DownloadSession * sess);
 
 /*!
- *\brief gets private data
- *
- *Gets private data associated with the session.
- *\param sess the download session
- *\return the private data
- *\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
- */
-void *gf_dm_sess_get_private(GF_DownloadSession * sess);
+\brief gets last session error
 
-/*!
- *\brief gets last session error
- *
- *Gets the last error that occured in the session
- *\param sess the download session
- *\return the last error
+Gets the last error that occured in the session
+\param sess the download session
+\return the last error
  */
 GF_Err gf_dm_sess_last_error(GF_DownloadSession *sess);
 
-/*!
- *\brief is download manager thread dead?
- *
- *Indicates whether the thread has ended
- *\param sess the download session
- */
-Bool gf_dm_is_thread_dead(GF_DownloadSession *sess);
 
 /*!
- *\brief fetches data on session
- *
- *Fetches data from the server. This will also performs connections and all needed exchange with server.
- *\param sess the download session
- *\param buffer destination buffer
- *\param buffer_size destination buffer allocated size
- *\param read_size amount of data actually fetched
- *\note this can only be used when the session is not threaded
+\brief fetches data on session
+
+Fetches data from the server. This will also performs connections and all needed exchange with server.
+\param sess the download session
+\param buffer destination buffer
+\param buffer_size destination buffer allocated size
+\param read_size amount of data actually fetched
+\note this can only be used when the session is not threaded
+\return error if any
  */
 GF_Err gf_dm_sess_fetch_data(GF_DownloadSession * sess, char *buffer, u32 buffer_size, u32 *read_size);
 
 /*!
- *\brief get mime type as lower case
- *
- *Fetches the mime type of the URL this session is fetching, value will be returned lower case, so application/x-mpegURL will be returned as application/x-mpegurl
- *\param sess the download session
- *\return the mime type of the URL, or NULL if error. You should get the error with \ref gf_dm_sess_last_error
+\brief get mime type as lower case
+
+Fetches the mime type of the URL this session is fetching, value will be returned lower case, so application/x-mpegURL will be returned as application/x-mpegurl
+\param sess the download session
+\return the mime type of the URL, or NULL if error. You should get the error with \ref gf_dm_sess_last_error
  */
 const char *gf_dm_sess_mime_type(GF_DownloadSession * sess);
 
 /*!
- *\brief sets session range
- *
- *Sets the session byte range. This shll be called before processing the session.
- *\param sess the download session
- *\param start_range HTTP download start range in byte
- *\param end_range HTTP download end range in byte
- *\param discontinue_cache If set, forces a new cache entry if byte range are not continuous. Otherwise a single cache entry is used to reconstruct the file
- *\note this can only be used when the session is not threaded
+\brief sets session range
+
+Sets the session byte range. This shll be called before processing the session.
+\param sess the download session
+\param start_range HTTP download start range in byte
+\param end_range HTTP download end range in byte
+\param discontinue_cache If set, forces a new cache entry if byte range are not continuous. Otherwise a single cache entry is used to reconstruct the file
+\note this can only be used when the session is not threaded
+\return error if any
  */
 GF_Err gf_dm_sess_set_range(GF_DownloadSession *sess, u64 start_range, u64 end_range, Bool discontinue_cache);
 /*!
- *\brief get cache file name
- *
- * Gets the cache file name for the session.
- *\param sess the download session
- *\return the absolute path of the cache file, or NULL if the session is not cached*/
+\brief get cache file name
+
+Gets the cache file name for the session.
+\param sess the download session
+\return the absolute path of the cache file, or NULL if the session is not cached*/
 const char *gf_dm_sess_get_cache_name(GF_DownloadSession * sess);
 
 /*!
- * \brief Marks the cache file to be deleted once the file is not used anymore by any session
- * \param dm the download manager
- * \param url The URL associate to the cache entry to be deleted
+\brief Marks the cache file to be deleted once the file is not used anymore by any session
+\param dm the download manager
+\param url The URL associate to the cache entry to be deleted
  */
 void gf_dm_delete_cached_file_entry(const GF_DownloadManager * dm, const char * url);
 
 /*!
- * Convenience function
- * \see gf_dm_delete_cached_file_entry
- *\param sess the download session
- * \param url The URL associate to the cache entry to be deleted
+Marks the cache file for this session to be deleted once the file is not used anymore by any session
+\param sess the download session
+\param url The URL associate to the cache entry to be deleted
  */
 void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url);
 
 /*!
- * Get a range of a cache entry file
- * \param sess The session
- * \param startOffset The first byte of the request to get
- * \param endOffset The last byte of request to get
- * \return The temporary name for the file created to have a range of the file
- */
-const char * gf_cache_get_cache_filename_range( const GF_DownloadSession * sess, u64 startOffset, u64 endOffset );
+\brief get statistics
 
-/*!
- *\brief get statistics
- *
- *Gets download statistics for the session. All output parameters are optional and may be set to NULL.
- *\param sess the download session
- *\param server the remote server address
- *\param path the path on the remote server
- *\param total_size the total size in bytes the file fetched, 0 if unknown.
- *\param bytes_done the amount of bytes received from the server
- *\param bytes_per_sec the average data rate in bytes per seconds
- *\param net_status the session status
+Gets download statistics for the session. All output parameters are optional and may be set to NULL.
+\param sess the download session
+\param server the remote server address
+\param path the path on the remote server
+\param total_size the total size in bytes the file fetched, 0 if unknown.
+\param bytes_done the amount of bytes received from the server
+\param bytes_per_sec the average data rate in bytes per seconds
+\param net_status the session status
+\return error if any
  */
-GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u32 *total_size, u32 *bytes_done, u32 *bytes_per_sec, GF_NetIOStatus *net_status);
+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);
 
 /*!
- *\brief get start time
- *
- *Gets session start time in UTC. If chunk-transfer is used, the start time is reset at each chunk start
- *\param sess the download session
- *\return UTC start time
+\brief get start time
+
+Gets session start time in UTC. If chunk-transfer is used, the start time is reset at each chunk start
+\param sess the download session
+\return UTC start time
  */
 u64 gf_dm_sess_get_utc_start(GF_DownloadSession *sess);
 
 
 /*!
- *\brief fetch session object
- *
- *Fetches the session object (process all headers and data transfer). This is only usable if the session is not threaded
- *\param sess the download session
- *\return the last error in the session or 0 if none*/
+\brief fetch session object
+
+Fetches the session object (process all headers and data transfer). This is only usable if the session is not threaded
+\param sess the download session
+\return the last error in the session or 0 if none*/
 GF_Err gf_dm_sess_process(GF_DownloadSession *sess);
 
 /*!
- *\brief fetch session object headers
- *
- *Fetch the session object headers and stops after that. This is only usable if the session is not threaded
- *\param sess the download session
- *\return the last error in the session or 0 if none*/
+\brief fetch session object headers
+
+Fetch the session object headers and stops after that. This is only usable if the session is not threaded
+\param sess the download session
+\return the last error in the session or 0 if none*/
 GF_Err gf_dm_sess_process_headers(GF_DownloadSession * sess);
 
 /*!
- *\brief fetch session status
- *
- *Fetch the session current status
- *\param sess the download session
- *\return the session status*/
-u32 gf_dm_sess_get_status(GF_DownloadSession * sess);
+\brief Get session resource url
 
-/*!
- *\brief Get session resource url
- *
- *Returns the original resource URL associated with the session
- *\param sess the download session
- *\return the associated URL
+Returns the original resource URL associated with the session
+\param sess the download session
+\return the associated URL
  */
 const char *gf_dm_sess_get_resource_name(GF_DownloadSession *sess);
 
-/*!
- *\brief Get session original resource url
- *
- *Returns the original resource URL before any redirection associated with the session
- *\param sess the download session
- *\return the associated URL
- */
-const char *gf_dm_sess_get_original_resource_name(GF_DownloadSession *sess);
-
 #ifndef GPAC_DISABLE_CORE_TOOLS
 /*!
- * \brief Download a file over the network using a download manager
- * \param dm The download manager to use, function will use all associated cache ressources
- * \param url The url to download
- * \param filename The filename to download
- * \param start_range start position of a byte range
- * \param end_range end position of a byte range
- * \param redirected_url If not NULL, \p redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
- * \return GF_OK if everything went fine, an error otherwise
+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 url The url to download
+\param filename The filename to download
+\param start_range start position of a byte range
+\param end_range end position of a byte range
+\param redirected_url If not NULL, \p redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
+\return GF_OK if everything went fine, an error otherwise
  */
 GF_Err gf_dm_wget_with_cache(GF_DownloadManager * dm, const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url);
 
 /*!
- * \brief Same as gf_dm_wget_with_cache, but initializes the GF_DownloadManager by itself.
- * This function is deprecated, please use gf_dm_wget_with_cache instead
- * \param url The url to download
- * \param filename The filename to download
- * \param start_range start position of a byte range
- * \param end_range end position of a byte range
- * \param redirected_url If not NULL, \p redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
- * \return GF_OK if everything went fine, an error otherwise
+\brief Same as gf_dm_wget_with_cache, but initializes the GF_DownloadManager by itself.
+
+This function is deprecated, please use gf_dm_wget_with_cache instead
+\param url The url to download
+\param filename The filename to download
+\param start_range start position of a byte range
+\param end_range end position of a byte range
+\param redirected_url If not NULL, \p redirected_url will be allocated and filled with the URL after redirection. Caller takes ownership
+\return GF_OK if everything went fine, an error otherwise
  */
 GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url);
 
 #endif /* GPAC_DISABLE_CORE_TOOLS */
 
 /*!
- *\brief Reset session
- *
- *Resets the session for new processing of the same url
- *\param sess the download session
- *\return error code if any
+Re-setup an existing, completed session to download a new URL. If same server/port/protocol is used, the same socket will be reused if the session has the GF_NETIO_SESSION_PERSISTENT flag set. This is only possible if the session is not threaded.
+\param sess The session
+\param url The new url for the session
+\param allow_direct_reuse Allow reuse of cache entry without checking cache directives
+\return GF_OK or error
  */
-GF_Err gf_dm_sess_reset(GF_DownloadSession *sess);
+GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url, Bool allow_direct_reuse);
 
 /*!
- * \brief forces the refresh of a cache entry
- * The entry is still allocated in the session.
- * \param sess The session
- * \return a pointer to the entry of session refreshed
+\brief retrieves the HTTP header value for the given name
+
+Retrieves the HTTP header value for the given header name.
+\param sess the current session
+\param name the target header name
+\return header value or NULL if not found
  */
-DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess);
+const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name);
 
 /*!
- * Tells whether session can be cached on disk.
- * Typically, when request has no content length, it deserves being streamed an cannot be cached
- * (ICY or MPEG-streamed content
- * \param sess The session
- * \return True if a cache can be created
- */
-Bool gf_dm_sess_can_be_cached_on_disk(const GF_DownloadSession *sess);
+\brief enumerates the  HTTP headers for a session
 
+Retrieves the HTTP header name and value for the given header index.
+\param sess the current session
+\param idx index for the enumeration, must be initialized to 0 for the first call
+\param hdr_name where name of header is stored - do not free
+\param hdr_val where value of header is stored - do not free
+\return error code, GF_OK or GF_EOS if no more headers
+ */
+GF_Err gf_dm_sess_enum_headers(GF_DownloadSession *sess, u32 *idx, const char **hdr_name, const char **hdr_val);
 
 /*!
- * Reassigns session flags and callbacks. This is only possible if the session is not threaded.
- * \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
- * \return GF_OK or error
+\brief sets download manager max rate per session
+
+Sets the maximum rate (per session only at the current time).
+\param dm the download manager object
+\param rate_in_bits_per_sec the new rate in bits per sec. If 0, HTTP rate will not be limited
  */
-GF_Err gf_dm_sess_reassign(GF_DownloadSession *sess, u32 flags, gf_dm_user_io user_io, void *cbk);
+void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
 
 /*!
- * Re-setup an existing, completed session to download a new URL. If same server/port/protocol is used, the same socket will be reused if the session
- * has the GF_NETIO_SESSION_PERSISTENT flag set. This is only possible if the session is not threaded.
- * \param sess The session
- * \param url The new url for the session
- * \return GF_OK or error
- */
-GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url);
+\brief gets download manager max rate per session
 
-/*
- *\retrieves the HTTP header value for the given name
- *
- *Retrieves the HTTP header value for the given header name.
- *\param sess the current session
- *\param name the target header name
- * \return header value or NULL if not found
+Sets the maximum rate (per session only at the current time).
+\param dm the download manager object
+\return the rate in bits per sec. If 0, HTTP rate is not limited
  */
-const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name);
+u32 gf_dm_get_data_rate(GF_DownloadManager *dm);
 
-/*
- *\brief sets download manager max rate per session
- *
- *Sets the maximum rate (per session only at the current time).
- *\param dm the download manager object
- *\param rate_in_bits_per_sec the new rate in bits per sec. If 0, HTTP rate will not be limited
+
+/*!
+\brief gets cumultaed download rate for all sessions
+
+Gets the cumultated bitrate in of all active sessions.
+\param dm the download manager object
+\return the cumulated rate in bits per sec.
  */
-void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec);
+u32 gf_dm_get_global_rate(GF_DownloadManager *dm);
 
-/*
- *\brief gets download manager max rate per session
- *
- *Sets the maximum rate (per session only at the current time).
- *\param dm the download manager object
- *\return the rate in bits per sec. If 0, HTTP rate is not limited
+
+/*!
+\brief Get header sizes and times stats for the session
+
+Get header sizes and times stats for the session
+\param sess the current session
+\param req_hdr_size request header size in bytes. May be NULL.
+\param rsp_hdr_size response header size in bytes. May be NULL.
+\param connect_time connection time in micro seconds. May be NULL.
+\param reply_time elapsed time between request sent and response header received, in micro seconds. May be NULL.
+\param download_time download time since request sent, in micro seconds. May be NULL.
+\return error code if any
  */
-u32 gf_dm_get_data_rate(GF_DownloadManager *dm);
+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);
 
+/*!
+\brief Forces session to use memory storage
 
-/*
- *\brief gets cumultaed download rate for all sessions
- *
- *Gets the cumultated bitrate in of all active sessions.
- *\param dm the download manager object
- *\return the cumulated rate in bits per sec.
+Forces session to use memory storage for future downloads
+\param sess the current session
  */
-u32 gf_dm_get_global_rate(GF_DownloadManager *dm);
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess);
 
+/*!
+Registers a locacl cache provider (bypassing the http session), used when populating cache from input data (atsc for example)
 
-/*
- *\brief fetches remote file in memory
- *
- *Fetches remote file in memory.
- *\param url the data to fetch
- *\param out_data output data (allocated by function)
- *\param out_size output data size
- *\param out_mime if not NULL, pointer will contain the mime type (allocated by function)
- *\return error code if any
+\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
+\param lc_udta opaque pointer passed to the callback function
+\return error code if any
  */
-GF_Err gf_dm_get_file_memory(const char *url, char **out_data, u32 *out_size, char **out_mime);
+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);
 
+/*!
+Adds a local entry in the cache
 
-/*
- *\brief Get header sizes and times stats for the session
- *
- *Get header sizes and times stats for the session
- *\param sess the current session
- *\param req_hdr_size request header size in bytes. May be NULL.
- *\param rsp_hdr_size response header size in bytes. May be NULL.
- *\param connect_time connection time in micro seconds. May be NULL.
- *\param reply_time elapsed time between request sent and response header received, in micro seconds. May be NULL.
- *\param download_time download time since request sent, in micro seconds. May be NULL.
- *\return error code if any
+\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 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
+\param clone_memory indicates that the data shall be cloned in the cache because the caller will discard it
+\param download_time_ms indicates the download time of the associated resource, if known, 0 otherwise.
+\return a cache entry structure
  */
-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);
+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);
+
+/*!
+Forces HTTP headers for a given cache entry
 
+\param dm the download manager
+\param entry the cache entry to update
+\param headers the header string, including CRLF delimiters, to force
+\return error code if any
+*/
+GF_Err gf_dm_force_headers(GF_DownloadManager *dm, const DownloadedCacheEntry entry, const char *headers);
+
+/*! HTTP methods*/
+enum
+{
+	/*! unsupported*/
+	GF_HTTP_UNKNOWN = 0,
+	/*! GET*/
+	GF_HTTP_GET,
+	/*! HEAD*/
+	GF_HTTP_HEAD,
+	/*! OPTIONS*/
+	GF_HTTP_OPTIONS,
+	/*! CONNECT*/
+	GF_HTTP_CONNECT,
+	/*! TRACE*/
+	GF_HTTP_TRACE,
+	/*! PUT*/
+	GF_HTTP_PUT,
+	/*! POST*/
+	GF_HTTP_POST,
+	/*! DELETE*/
+	GF_HTTP_DELETE
+};
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/dsmcc.h -> gpac-1.0.0.tar.gz/include/gpac/dsmcc.h Changed

gpac-0.8.0.tar.gz/include/gpac/events.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Events management
@@ -33,17 +33,17 @@
 #endif
 
 /*!
- *	\file <gpac/events.h>
- *	\brief Event system used by GPAC playback.
+\file <gpac/events.h>
+\brief Event system used by GPAC playback.
  */
 	
 /*!
- *	\addtogroup evt_grp Event System
- *	\ingroup playback_grp
- *	\brief Event system used by GPAC playback.
- *
- *This section documents the event structures used by the terminal, the compositor, input modules and output rendering modules for communication.
- *	@{
+\addtogroup evt_grp Event System
+\ingroup playback_grp
+\brief Event system used by GPAC playback.
+
+This section documents the event structures used by the terminal, the compositor, input modules and output rendering modules for communication.
+@{
  */
 
 #include <gpac/maths.h>
@@ -51,7 +51,7 @@
 #include <gpac/events_constants.h>
 
 
-/*mouse button modifiers*/
+/*! mouse button modifiers*/
 enum
 {
 	GF_MOUSE_LEFT = 0,
@@ -59,7 +59,9 @@
 	GF_MOUSE_RIGHT
 };
 
-/*event proc return value: ignored*/
+/*! Mouse event structure
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_MOUSEMOVE, GF_EVENT_MOUSEWHEEL, GF_EVENT_MOUSEDOWN, GF_EVENT_MOUSEUP*/
@@ -74,7 +76,26 @@
 	u32 key_states;
 } GF_EventMouse;
 
-/*event proc return value: ignored*/
+/*! Mouse event structure
+	event proc return value: ignored
+*/
+typedef struct
+{
+	/*GF_EVENT_MULTITOUCH*/
+	u8 type;
+	/*normalized center of multitouch event*/
+	Fixed x, y;
+	/*finger rotation*/
+	Fixed rotation;
+	/*finger pinch*/
+	Fixed pinch;
+	/*number of fingers detected*/
+	u32 num_fingers;
+} GF_EventMultiTouch;
+
+/*! Keyboard key event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_KEYDOWN and GF_EVENT_KEYUP*/
@@ -87,7 +108,9 @@
 	u32 flags;
 } GF_EventKey;
 
-/*event proc return value: ignored*/
+/*! Keyboard character event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_TEXTINPUT*/
@@ -96,7 +119,9 @@
 	u32 unicode_char;
 } GF_EventChar;
 
-/*event proc return value: ignored*/
+/*! Window resize event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_SIZE*/
@@ -105,7 +130,9 @@
 	u16 width, height;
 } GF_EventSize;
 
-/*event proc return value: ignored*/
+/*! Video setup (2D or 3D) event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_VIDEO_SETUP*/
@@ -117,19 +144,21 @@
 	/*indicates whether system memory for the backbuffer is desired (no video blitting)*/
 	Bool system_memory;
 	/*indicates whether opengl context shall be created. Values are:
-		0: no opengl context shall be created
-		1: opengl context shall be created for the main window and set as the current one
-		2: an extra opengl context shall be created for offscreen rendering and set as the current one
-			if not supported, mix of 2D (raster) and 3D (openGL) will be disabled
+		GF_FALSE: no opengl context shall be created
+		GF_TRUE: opengl context shall be created for the main window and set as the current one
 	*/
-	u32 opengl_mode;
+	Bool use_opengl;
+
+	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
 	Bool hw_reset;
 } GF_EventVideoSetup;
 
-/*event proc return value: ignored
-this event may be triggered by the compositor if owning window or if shortcut fullscreen is detected*/
+/*! Windows show event
+	event proc return value: ignored
+	this event may be triggered by the compositor if owning window or if shortcut fullscreen is detected
+*/
 typedef struct
 {
 	/*GF_EVENT_SHOWHIDE*/
@@ -138,7 +167,9 @@
 	u32 show_type;
 } GF_EventShow;
 
-/*event proc return value: ignored*/
+/*! Mouse cursor event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_SET_CURSOR*/
@@ -147,16 +178,19 @@
 	u32 cursor_type;
 } GF_EventCursor;
 
-/*event proc return value: ignored*/
+/*! Window caption event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_SET_CAPTION*/
 	u8 type;
-	/*window style flags - NOT USED YET*/
 	const char *caption;
 } GF_EventCaption;
 
-/*event proc: never posted*/
+/*! Window move event
+	event proc: never posted
+*/
 typedef struct
 {
 	/*GF_EVENT_MOVE*/
@@ -168,8 +202,10 @@
 	u8 align_x, align_y;
 } GF_EventMove;
 
-/*duration may be signaled several times: it may change when setting up streams
-event proc return value: ignored*/
+/*! Media duration event
+	duration may be signaled several times: it may change when setting up streams
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_DURATION*/
@@ -180,8 +216,9 @@
 	Bool can_seek;
 } GF_EventDuration;
 
-/*event proc return value: 0 if URL not supported, 1 if accepted (it is the user responsability to load the url)
-YOU SHALL NOT DIRECTLY OPEN THE NEW URL IN THE EVENT PROC, THIS WOULD DEADLOCK THE TERMINAL
+/*! Hyperlink navigation event
+	event proc return value: 0 if URL not supported, 1 if accepted (it is the user responsability to load the url)
+	YOU SHALL NOT DIRECTLY OPEN THE NEW URL IN THE EVENT PROC, THIS WOULD DEADLOCK THE TERMINAL
 */
 typedef struct
 {
@@ -195,7 +232,9 @@
 } GF_EventNavigate;
 
 
-/*event proc return value: ignored*/
+/*! Service message event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_MESSAGE*/
@@ -208,14 +247,16 @@
 	GF_Err error;
 } GF_EventMessage;
 
-/*event proc return value: ignored*/
+/*! Progress event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_PROGRESS*/
 	u8 type;
 	/*name of service issuing the progress notif*/
 	const char *service;
-	/*progress type: 0: buffering, 1: downloading, 2: importing (BT/VRML/...)*/
+	/*progress type: 0: buffering, 1: downloading, 2: importing (BT/VRML/...), 3: filter status update*/
 	u32 progress_type;
 	/*amount done and total amount of operation.
 		For buffer events, expresses current and total desired stream buffer in scene in milliseconds
@@ -223,11 +264,18 @@
 		For import events, no units defined (depends on importers)
 	*/
 	u32 done, total;
-	/* for download events */
-	u32 bytes_per_seconds;
+	union {
+		/* for download events */
+		u32 bytes_per_seconds;
+		/* for filter status event, index of filter in session */
+		u32 filter_idx;
+	};
+	
 } GF_EventProgress;
 
-/*event proc return value: ignored*/
+/*! Service connection event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_CONNECT*/
@@ -236,7 +284,9 @@
 	Bool is_connected;
 } GF_EventConnect;
 
-/*event proc return value: 1 to indicate the terminal should attempt a default layout for this addon, 0: nothing will be done*/
+/*! Addon connection notification event
+	event proc return value: 1 to indicate the terminal should attempt a default layout for this addon, 0: nothing will be done
+*/
 typedef struct
 {
 	/*GF_EVENT_ADDON_DETECTED*/
@@ -245,8 +295,9 @@
 	const char *mime_type;
 } GF_EventAddonConnect;
 
-/*event proc return value: 1 if info has been completed, 0 otherwise (and operation this request was for
-will then fail)*/
+/*! Authentication event
+	event proc return value: 1 if info has been completed, 0 otherwise (and operation this request was for will then fail)
+*/
 typedef struct
 {
 	/*GF_EVENT_AUTHORIZATION*/
@@ -260,7 +311,9 @@
 } GF_EventAuthorize;
 
 
-/*event proc return value: 1 if info has been completed, 0 otherwise */
+/*! System desktop colors and window decoration event
+	event proc return value: 1 if info has been completed, 0 otherwise
+*/
 typedef struct
 {
 	/*GF_EVENT_SYS_COLORS*/
@@ -274,7 +327,7 @@
 	u32 sys_colors[28];
 } GF_EventSysColors;
 
-
+/*! DOM mutation event*/
 typedef struct {
 	/* GF_EVENT_TREE_MODIFIED, GF_EVENT_NODE_INSERTED, GF_EVENT_NODE_REMOVED, GF_EVENT_NODE_INSERTED_DOC, GF_EVENT_NODE_REMOVED_DOC, GF_EVENT_ATTR_MODIFIED, GF_EVENT_CHAR_DATA_MODIFIED */
 	u8 type;
@@ -285,7 +338,7 @@
 	u8 attrChange;
 } GF_EventMutation;
 
-
+/*! Open file notification event*/
 typedef struct {
 	/* GF_EVENT_DROPFILE*/
 	u8 type;
@@ -293,20 +346,9 @@
 	char **files;
 } GF_EventOpenFile;
 
-typedef struct {
-	/*GF_EVENT_FROM_SERVICE*/
-	u8 type;
-	//cf GF_EVT_FORWARDED_ *
-	u8 forward_type;
-	/*original type of event as forwarded by the service*/
-	u32 service_event_type;
-	/*parameter of event as forwarded by the service - creation/deletion is handled by the service*/
-	void *param;
-} GF_EventFromService;
-
-
-
-/*event proc return value: ignored*/
+/*! Orientation sensor change event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_SENSOR_ORIENTATION*/
@@ -316,7 +358,9 @@
 } GF_EventSensor;
 
 
-/*event proc return value: ignored*/
+/*! Orientation sensor activation event
+	event proc return value: ignored
+*/
 typedef struct
 {
 	/*GF_EVENT_SENSOR_REQUEST*/
@@ -326,19 +370,12 @@
 	Bool activate;
 } GF_EventSensorRequest;
 
-
-/*event proc return value: ignored*/
-typedef struct
-{
-	/*GF_EVENT_SENSOR_REQUEST*/
-	u8 type;
-	u32 sync_loss_ms;
-} GF_EventSyncLoss;
-
+/*! Event object*/
 typedef union
 {
 	u8 type;
 	GF_EventMouse mouse;
+	GF_EventMultiTouch mtouch;
 	GF_EventKey key;
 	GF_EventChar character;
 	GF_EventSensor sensor;
@@ -358,9 +395,7 @@
 	GF_EventMutation mutation;
 	GF_EventOpenFile open_file;
 	GF_EventAddonConnect addon_connect;
-	GF_EventFromService from_service;
 	GF_EventSensorRequest activate_sensor;
-	GF_EventSyncLoss sync_loss;
 } GF_Event;
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/events_constants.h -> gpac-1.0.0.tar.gz/include/gpac/events_constants.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Events management
@@ -28,17 +28,14 @@
 #define _GF_EVENTS_CONSTANTS_H_
 
 /*!
- *	\file <gpac/events_constants.h>
- *	\brief Constants for event system used by GPAC playback.
+\file <gpac/events_constants.h>
+\brief Constants for event system used by GPAC playback.
  */
 	
 /*!
- *	\addtogroup evt_grp
- *	\ingroup playback_grp
- *	\brief Constants for event system used by GPAC playback.
- *
- *This section documents the event types used by the terminal, the compositor, input modules and output rendering modules for communication.
- *	@{
+\addtogroup evt_grp
+\ingroup playback_grp
+@{
  */
 
 
@@ -48,7 +45,7 @@
 	DO NOT CHANGE THEIR POSITION IN THE LIST, USED TO SPEED UP FILTERING OF USER INPUT EVENTS
 */
 
-/*events*/
+/*! Event types*/
 typedef enum {
 
 	/******************************************************
@@ -74,6 +71,7 @@
 	/*character input*/
 	GF_EVENT_TEXTINPUT,
 
+	GF_EVENT_MULTITOUCH,
 
 	/******************************************************
 
@@ -215,6 +213,8 @@
 		- when sent from gpac to user, indicate aspect ratio has been modified and video output is ready
 	*/
 	GF_EVENT_VIDEO_SETUP,
+	//set current GL context for the calling thread
+	GF_EVENT_SET_GL,
 	/*queries the list of system colors - only exchanged between compositor and video output*/
 	GF_EVENT_SYS_COLORS,
 
@@ -232,7 +232,6 @@
 	GF_EVENT_NAVIGATE_INFO, /*indicates the link or its description under the mouse pointer*/
 	GF_EVENT_MESSAGE, /*message from the MPEG-4 terminal*/
 	GF_EVENT_PROGRESS, /*progress message from the MPEG-4 terminal*/
-	GF_EVENT_FORWARDED, /*event forwarded by service (MPEG-2, RTP, ...)*/
 	GF_EVENT_VIEWPOINTS,	/*indicates viewpoint list has changed - no struct associated*/
 	GF_EVENT_STREAMLIST,	/*indicates stream list has changed - no struct associated - only used when no scene info is present*/
 	GF_EVENT_METADATA, /*indicates a change in associated metadata*/
@@ -255,18 +254,15 @@
 	GF_EVENT_TIMESHIFT_UNDERRUN,
 	GF_EVENT_MAIN_ADDON_STATE,
 
-	GF_EVENT_FROM_SERVICE,
-
 	GF_EVENT_ADDON_DETECTED,
 
 	GF_EVENT_RELOAD,
 
 	GF_EVENT_SENSOR_ORIENTATION,
 	GF_EVENT_SENSOR_REQUEST,
-	GF_EVENT_SYNC_LOST,
 } GF_EventType;
 
-/*GPAC/DOM3 key codes*/
+/*! GPAC/DOM3 key codes*/
 typedef enum {
 	GF_KEY_UNIDENTIFIED = 0,
 	GF_KEY_ACCEPT = 1, /* "Accept"    The Accept (Commit) key.*/
@@ -485,7 +481,7 @@
 } GF_KeyCode;
 
 
-/*key modifiers state - set by terminal (not set by video driver)*/
+/*! key modifiers state - set by terminal (not set by video driver)*/
 typedef enum
 {
 	GF_KEY_MOD_SHIFT = (1),
@@ -497,11 +493,14 @@
 	GF_KEY_EXT_RIGHT = (1<<6)
 } GF_KeyModifier;
 
-/*sensor signaling*/
+/*! Sensor apperance signaling*/
 enum
 {
+	/*regular*/
 	GF_CURSOR_NORMAL = 0x00,
+	/*hyperlink*/
 	GF_CURSOR_ANCHOR,
+	/*touch/click*/
 	GF_CURSOR_TOUCH,
 	/*discSensor, cylinderSensor, sphereSensor*/
 	GF_CURSOR_ROTATE,
@@ -511,24 +510,21 @@
 	GF_CURSOR_PLANE,
 	/*collision*/
 	GF_CURSOR_COLLIDE,
+	/*hide the cursor*/
 	GF_CURSOR_HIDE,
 };
 
-/*Mutation AttrChangeType Signaling*/
+#if 0
+/*! Mutation AttrChangeType Signaling*/
 enum
 {
+	/*! modification */
 	GF_MUTATION_ATTRCHANGE_MODIFICATION = 0x01,
 	GF_MUTATION_ATTRCHANGE_ADDITION = 0x02,
 	GF_MUTATION_ATTRCHANGE_REMOVAL = 0x03,
 };
+#endif
 
-enum
-{
-	//regular even codes
-	GF_EVT_REGULAR = 0,
-	/*events forwarded from MPEG-2 stack*/
-	GF_EVT_MPEG2 = 1,
-};
 
 /*! @} */

gpac-1.0.0.tar.gz/include/gpac/evg.h Added

@@ -0,0 +1,867 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Embedded Vector Graphics engine
+ *
+ *  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_EVG_H_
+#define _GF_EVG_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/path2d.h>
+#include <gpac/module.h>
+#include <gpac/color.h>
+
+/*!
+\file "gpac/evg.h"
+\brief 2D vector graphics rasterizer
+
+This file contains all defined functions for 2D vector graphics of the GPAC framework.
+*/
+
+/*!
+\addtogroup evg_grp
+\brief Vector Graphics rendering of GPAC.
+
+GPAC uses a software rasterizer for vector graphics based on FreeType's "ftgray" anti-aliased renderer.
+
+The rasterizer supports
+- drawing to RGB, YUV and grayscale surfaces.
+- Texture mapping using RGB, YUV and grayscale textures
+- Linear Gradients with opacity
+- Radial Gradients with opacity
+- Solid brush with opacity
+- axis-aligned clipping
+
+The rasterizer is only capable of filling a given GF_Path object
+- striking (outlining) of a path must be done by using \ref gf_path_get_outline to the the outline path
+- text must be first converted to GF_Path
+
+The rasterizer also supports experimental drawing of 3D primitives (point, lines, triangles). This is obviously not intended to replace GPU rendering, but can
+be useful to draw simple primitives over an existing video source. The following constraints apply in 3D mode:
+- stencils are not used
+- path can only be drawn using \ref gf_evg_surface_draw_path
+
+@{
+*/
+
+/*! stencil type used for all stencils*/
+typedef struct _gf_evg_base_stencil GF_EVGStencil;
+/*! surface type*/
+typedef struct _gf_evg_surface GF_EVGSurface;
+
+
+/*! stencil types*/
+typedef enum
+{
+	/*! solid color stencil*/
+	GF_STENCIL_SOLID = 0,
+	/*! linear color gradient stencil*/
+	GF_STENCIL_LINEAR_GRADIENT,
+	/*! radial color gradient stencil*/
+	GF_STENCIL_RADIAL_GRADIENT,
+	/*! texture stencil*/
+	GF_STENCIL_VERTEX_GRADIENT,
+	/*! texture stencil*/
+	GF_STENCIL_TEXTURE,
+} GF_StencilType;
+
+/*! gradient filling modes*/
+typedef enum
+{
+	/*! edge colors are repeated until path is filled*/
+	GF_GRADIENT_MODE_PAD,
+	/*! pattern is inversed each time it's repeated*/
+	GF_GRADIENT_MODE_SPREAD,
+	/*! pattern is repeated to fill path*/
+	GF_GRADIENT_MODE_REPEAT
+} GF_GradientMode;
+
+/*! texture map flags*/
+typedef enum
+{
+	/*! texture is repeated in its horizontal direction*/
+	GF_TEXTURE_REPEAT_S = (1<<1),
+	/*! texture is repeated in its horizontal direction*/
+	GF_TEXTURE_REPEAT_T = (1<<2),
+	/*! texture is fliped horizontally*/
+	GF_TEXTURE_FLIP_X = (1<<3),
+	/*! texture is fliped vertically*/
+	GF_TEXTURE_FLIP_Y = (1<<4),
+} GF_TextureMapFlags;
+
+/*! filter levels for texturing - up to the graphics engine but the following levels are used by
+the client*/
+typedef enum
+{
+	/*! high speed mapping (ex, no filtering applied)*/
+	GF_TEXTURE_FILTER_HIGH_SPEED,
+	/*! compromise between speed and quality (ex, filter to nearest pixel)*/
+	GF_TEXTURE_FILTER_MID,
+	/*! high quality mapping (ex, bi-linear/bi-cubic interpolation)*/
+	GF_TEXTURE_FILTER_HIGH_QUALITY
+} GF_TextureFilter;
+
+/*! rasterizer antialiasing depending on the graphics engine*/
+typedef enum
+{
+	/*! raster shall use no antialiasing */
+	GF_RASTER_HIGH_SPEED,
+	/*! raster should use fast mode and good quality if possible*/
+	GF_RASTER_MID,
+	/*! raster should use full antialiasing*/
+	GF_RASTER_HIGH_QUALITY
+} GF_RasterQuality;
+
+
+/*! common constructor for all stencil types
+\param type the stencil type
+\return a new stencil object*/
+GF_EVGStencil *gf_evg_stencil_new(GF_StencilType type);
+
+/*! common destructor for all stencils
+\param stencil the target stencil
+*/
+void gf_evg_stencil_delete(GF_EVGStencil *stencil);
+
+/*! sets stencil transformation matrix
+\param stencil the target stencil
+\param mat the 2D matrix to set
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_matrix(GF_EVGStencil *stencil, GF_Matrix2D *mat);
+
+/*! gets stencil type
+\param stencil the target stencil
+\return stencil type
+*/
+GF_StencilType gf_evg_stencil_type(GF_EVGStencil *stencil);
+
+/*! sets color for solid brush stencil
+\param stencil the target stencil
+\param color the color to set
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_brush_color(GF_EVGStencil *stencil, GF_Color color);
+
+/*! sets gradient repeat mode for a gradient stencil
+\note this may be called before the gradient is setup
+\param stencil the target stencil
+\param mode the gradient mode
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_gradient_mode(GF_EVGStencil *stencil, GF_GradientMode mode);
+/*! sets linear gradient direction for a gradient stencil
+Gradient line is defined by start and end. For example, {0,0}, {1,0} defines an horizontal gradient
+\param stencil the target stencil
+\param start_x horizontal coordinate of starting point
+\param start_y vertical coordinate of starting point
+\param end_x horizontal coordinate of ending point
+\param end_y vertical coordinate of ending point
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_linear_gradient(GF_EVGStencil *stencil, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y);
+/*! sets radial gradient center point, focal point and radius for a gradient stencil
+\param stencil the target stencil
+\param cx horizontal coordinate of center
+\param cy vertical coordinate of center
+\param fx horizontal coordinate of focal point
+\param fy vertical coordinate of focal point
+\param x_radius horizontal radius
+\param y_radius vertical radius
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_radial_gradient(GF_EVGStencil *stencil, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius);
+
+/*! sets color interpolation for a gradient stencil
+\note the colors at 0 and 1.0 MUST be provided
+\note colors shall be fed in order from 0 to 1
+
+\param stencil the target stencil
+\param pos interpolation positions. Each position gives the distance from (center for radial, start for linear) expressed between 0 and 1 (1 being the gradient bounds) - may be NULL when count is 0
+\param col colors at the given position - may be NULL when count is 0
+\param count number of colors and position. A value of 0 resets the gradient colors
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_gradient_interpolation(GF_EVGStencil *stencil, Fixed *pos, GF_Color *col, u32 count);
+
+/*! pushes a single color interpolation for a gradient stencil
+\note the colors at 0 and 1.0 MUST be provided
+\note colors shall be fed in order from 0 to 1
+
+\param stencil the target stencil
+\param pos interpolation position. A position gives the distance from (center for radial, start for linear) expressed between 0 and 1 (1 being the gradient bounds)
+\param col color at the given position
+\return error if any
+*/
+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
+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
+\param alpha the alpha value between 0 (full transparency) and 255 (full opacityy)
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_alpha(GF_EVGStencil *stencil, u8 alpha);
+
+/*! sets pixel data for a texture stencil
+\param stencil the target stencil
+\param pixels texture data starting from top row
+\param width texture width in pixels
+\param height texture height in pixels
+\param stride texture horizontal pitch (bytes to skip to get to next row)
+\param pixelFormat texture pixel format
+\note this stencil acts as a data wrapper, the pixel data is not locally copied
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_texture(GF_EVGStencil *stencil, u8 *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat);
+
+/*! sets pixel planes data for a texture stencil
+\param stencil the target stencil
+\param width texture width in pixels
+\param height texture height in pixels
+\param pixelFormat texture pixel format
+\param y_or_rgb Y plane or RGB plane
+\param stride stride of the Y or RGB plane
+\param u_plane U plane or UV plane for semi-planar YUV formats
+\param v_plane V plane for planar YUV format, NULL for semi-planar YUV formats
+\param uv_stride stride of the U and V or UV plane
+\param alpha_plane alpha plane
+\param alpha_stride stride of the alpha plane; if 0 and alpha plane is not NULL, the stride is assumed to be the same as the Y plane stride
+\note this stencil acts as a data wrapper, the pixel data is not locally copied
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_texture_planes(GF_EVGStencil *stencil, u32 width, u32 height, GF_PixelFormat pixelFormat, const u8 *y_or_rgb, u32 stride, const u8 *u_plane, const u8 *v_plane, u32 uv_stride, const u8 *alpha_plane, u32 alpha_stride);
+
+/*! callback function prototype for parametric textures
+\param cbk user data callback
+\param x horizontal coordinate in texture, ranging between 0 and width-1, (0,0) being top-left pixel, or horizontal coordinate of destination pixel on surface
+\param y vertical coordinate in texture, ranging between 0 and height-1, (0,0) being top-left pixel, or vertical coordinate of destination pixel on surface
+\param r set to the red value (not initialized before call)
+\param g set to the green value (not initialized before call)
+\param b set to the blue value (not initialized before call)
+\param a set to the alpha value (not initialized before call)
+*/
+typedef void (*gf_evg_texture_callback)(void *cbk, u32 x, u32 y, Float *r, Float *g, Float *b, Float *a);
+
+/*! sets parametric callback on a texture stencil. A parametric texture gets its pixel values from a 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.
+\param stencil the target stencil
+\param width texture width in pixels
+\param height texture height in pixels
+\param pixelFormat texture pixel format, indicates if the returned values are in RGB or YUV
+\param callback the callback function to use
+\param cbk_udta user data to pass to the callback function
+\param use_screen_coords if set, the coordinates passed to the callback function are screen coordinates rather than texture coordinates
+\return error if any
+*/
+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_udta, Bool use_screen_coords);
+
+/*! sets texture mapping options for a texture stencil
+\param stencil the target stencil
+\param map_mode texture mapping flags to set
+\return error if any
+*/
+GF_Err gf_evg_stencil_set_mapping(GF_EVGStencil *stencil, GF_TextureMapFlags map_mode);
+
+/*! sets filtering mode for a texture stencil
+\param stencil the target stencil
+\param filter_mode texture filtering mode to set
+\return error if any
+*/
+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)
+\param stencil the target stencil
+\param x horizontal coord
+\param y vertical coord
+\return pixel value
+ */
+u32 gf_evg_stencil_get_pixel(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
+ */
+GF_Err gf_evg_stencil_get_pixel_f(GF_EVGStencil *stencil, Float x, Float y, Float *r, Float *g, Float *b, Float *a);
+
+/*! 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
+ */
+GF_Err gf_evg_stencil_get_pixel_yuv_f(GF_EVGStencil *stencil, Float x, Float y, Float *Y, Float *U, Float *V, Float *A);
+
+/*! 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
+\return a new surface*/
+GF_EVGSurface *gf_evg_surface_new(Bool center_coords);
+
+/*! deletes a surface object
+\param surf the surface object
+*/
+void gf_evg_surface_delete(GF_EVGSurface *surf);
+
+/*! attaches a surface object to a texture stencil object
+\param surf the surface object
+\param sten the stencil object (shll be a texture stencil)
+\return error if any
+*/
+GF_Err gf_evg_surface_attach_to_texture(GF_EVGSurface *surf, GF_EVGStencil *sten);
+
+/*! attaches a surface object to a memory buffer
+\param surf the surface object
+\param pixels: texture data
+\param width texture width in pixels
+\param height texture height in pixels
+\param pitch_x texture horizontal pitch (bytes to skip to get to next pixel). O means linear frame buffer (eg pitch_x==bytes per pixel)
+\param pitch_y texture vertical pitch (bytes to skip to get to next line)
+\param pixelFormat texture pixel format
+\return error if any
+*/
+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);
+
+/*! sets rasterizer precision
+\param surf the surface object
+\param level the raster quality level
+\return error if any
+*/
+GF_Err gf_evg_surface_set_raster_level(GF_EVGSurface *surf, GF_RasterQuality level);
+
+/*! 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
+\param mat the matrix to set; if NULL, resets the current transformation
+\return error if any
+*/
+GF_Err gf_evg_surface_set_matrix(GF_EVGSurface *surf, GF_Matrix2D *mat);
+
+/*! 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.
+\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
+\return error if any
+*/
+GF_Err gf_evg_surface_set_matrix_3d(GF_EVGSurface *surf, GF_Matrix *mat);
+
+/*! sets the given rectangle as a clipper
+When a clipper is enabled, nothing is drawn outside of the clipper. The clipper is not affected by the surface matrix
+\param surf the surface object
+\param rc the clipper to set, in pixel coordinates of the surface; if NULL, disables clipper
+\return error if any
+*/
+GF_Err gf_evg_surface_set_clipper(GF_EVGSurface *surf, GF_IRect *rc);
+
+/*! 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
+
+\note this is only used for 2D rasterizer, and ignored in 3D mode
+\param surf the surface object
+\param path the target path to rasterize
+\return error if any
+*/
+GF_Err gf_evg_surface_set_path(GF_EVGSurface *surf, GF_Path *path);
+
+/*! draw (filling) the current path on a surface using the given stencil and current clipper if any.
+If the stencil is a solid brush and its alpha value is 0, the surface is cleared if it has an alpha component, otherwise the call is ignored.
+\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
+\return error if any
+*/
+GF_Err gf_evg_surface_fill(GF_EVGSurface *surf, GF_EVGStencil *stencil);
+
+/*! 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
+\param rc the rectangle in pixel coordinates to clear. This may lay outside the surface, and shall not be NULL
+\param col the color used to clear the canvas. The alpha component is discarded if the surface does not have alpha, otherwise it is used
+\return error if any
+*/
+GF_Err gf_evg_surface_clear(GF_EVGSurface *surf, GF_IRect *rc, GF_Color col);
+
+/*! sets center coord mode of a surface
+\note this is only used for 2D rasterizer, and ignored in 3D mode
+\param surf the 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
+*/
+void gf_evg_surface_set_center_coords(GF_EVGSurface *surf, Bool center_coords);
+
+/*! Composition mode used for ARGB surfaces - cf Canvas2D modes*/
+typedef enum
+{
+	/*! source over*/
+	GF_EVG_SRC_OVER = 0,
+	/*! source atop*/
+	GF_EVG_SRC_ATOP,
+	/*! source in*/
+	GF_EVG_SRC_IN,
+	/*! source out*/
+	GF_EVG_SRC_OUT,
+	/*! destination atop*/
+	GF_EVG_DST_ATOP,
+	/*! destination in*/
+	GF_EVG_DST_IN,
+	/*! destination out*/
+	GF_EVG_DST_OUT,
+	/*! destination over*/
+	GF_EVG_DST_OVER,
+	/*! destination * source*/
+	GF_EVG_LIGHTER,
+	/*! source copy*/
+	GF_EVG_COPY,
+	/*! source XOR destination*/
+	GF_EVG_XOR,
+} GF_EVGCompositeMode;
+
+/*! sets surface composite mode, as defined in Canvas2D - only used for ARGB surfaces
+ \warning this is still experimental
+\param surf the surface object
+\param comp_mode the composition mode to use
+*/
+void gf_evg_surface_set_composite_mode(GF_EVGSurface *surf, GF_EVGCompositeMode comp_mode);
+
+/*! callback type for alpha override
+\param udta opaque data passed back to caller
+\param src_alpha alpha value about to be blended
+\param x horizontal coordinate of pixel to be drawn, {0,0} being top-left, positive Y go down
+\param y vertical coordinate of pixel to be drawn, {0,0} being top-left, positive Y go down
+\return final alpha value to use*/
+typedef u8 (*gf_evg_get_alpha)(void *udta, u8 src_alpha, s32 x, s32 y);
+
+/*! sets alpha callback function. This allows finer control over the blending, but does not allow for pixel color modification
+\param surf the surface object
+\param get_alpha the callback function to alter the alpha value
+\param cbk opaque data for the callback function
+*/
+void gf_evg_surface_set_alpha_callback(GF_EVGSurface *surf, gf_evg_get_alpha get_alpha, void *cbk);
+
+
+/*! Primitive types for 3D software rasterize - see OpenGL terminology*/
+typedef enum
+{
+	//do NOT modify order
+
+	/*! points, 1 vertex index per primitive */
+	GF_EVG_POINTS=1,
+	/*! polygon, all vertex indices in array are used for a single face*/
+	GF_EVG_POLYGON,
+	/*! lines, 2 vertex indices per primitive*/
+	GF_EVG_LINES,
+	/*! triangles, 3 vertex indices per primitive*/
+	GF_EVG_TRIANGLES,
+	/*! quads, 4 vertex indices per primitive*/
+	GF_EVG_QUADS,
+
+	/*! line strip, 2 vertex indices for first primitive, then one for subsequent ones*/
+	GF_EVG_LINE_STRIP,
+	/*! triangle strip, 3 vertex indices for first primitive, then one for subsequent ones*/
+	GF_EVG_TRIANGLE_STRIP,
+	/*! triangle fan, 3 vertex indices for first primitive, then one for subsequent ones*/
+	GF_EVG_TRIANGLE_FAN,
+	/*! quad strip, 4 vertex indices for first primitive, then one for subsequent ones*/
+	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();
+/*! sets projection matrix
+ \note this is only used for 3D rasterizer, and fails 2D mode
+ \param surf the target 3D surface
+ \param mx the target projection matrix
+ \return error if any
+ */
+GF_Err gf_evg_surface_set_projection(GF_EVGSurface *surf, GF_Matrix *mx);
+/*! sets modelview matrix
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param mx the target modelview matrix
+\return error if any
+*/
+GF_Err gf_evg_surface_set_modelview(GF_EVGSurface *surf, GF_Matrix *mx);
+/*! draws a set of primitive using vertices and an index buffer modelview matrix
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param indices the array of indices to use in the vertex buffer
+\param nb_indices the number of indices
+\param vertices the array of vertices to use
+\param nb_vertices the number of vertices
+\param nb_comp the number of component per vertices (eg, 2, 3)
+\param prim_type the primitive type to use
+\return error if any
+*/
+GF_Err gf_evg_surface_draw_array(GF_EVGSurface *surf, u32 *indices, u32 nb_indices, Float *vertices, u32 nb_vertices, u32 nb_comp, GF_EVGPrimitiveType prim_type);
+
+/*! clears the depth buffer
+ \note the depth buffer is set by the caller. If no depth buffer is assigned, this function returns GF_OK
+ \note the color buffer is cleared using \ref gf_evg_surface_clear
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param depth the depth value to use
+\return error if any
+*/
+GF_Err gf_evg_surface_clear_depth(GF_EVGSurface *surf, Float depth);
+/*! sets the surface viewport to convert from projected coordiantes to screen coordinates
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param x the top-left coordinate of the viewport in pixels
+\param y the top-left coordinate of the viewport in pixels
+\param w the width  of the viewport in pixels
+\param h the height of the viewport in pixels
+\return error if any
+*/
+GF_Err gf_evg_surface_viewport(GF_EVGSurface *surf, u32 x, u32 y, u32 w, u32 h);
+/*! draws path on a 3D surface with the given z.
+
+The vertex shader is ignored (surface matrix must be set), and the fragment shader is called using perspective interpolation weights derived from the path bounds,
+using path bounds (top-left, top-right, bottom-right) vertices.
+ \note this is only used for 3D rasterizer, and fails 2D mode
+
+\param surf the target 3D surface
+\param path the path to draw
+\param z the z value to assign to the path in local coordinate system
+\return error if any
+*/
+GF_Err gf_evg_surface_draw_path(GF_EVGSurface *surf, GF_Path *path, Float z);
+
+/*! Depth test modes*/
+typedef enum
+{
+	/*! depth test is disabled*/
+	GF_EVGDEPTH_DISABLE,
+	/*! depth test always fails*/
+	GF_EVGDEPTH_NEVER,
+	/*! depth test always succeeds*/
+	GF_EVGDEPTH_ALWAYS,
+	/*! depth test succeeds if fragment depth is == than depth buffer value*/
+	GF_EVGDEPTH_EQUAL,
+	/*! depth test succeeds if fragment depth is != than depth buffer value*/
+	GF_EVGDEPTH_NEQUAL,
+	/*! depth test succeeds if fragment depth is < than depth buffer value*/
+	GF_EVGDEPTH_LESS,
+	/*! depth test succeeds if fragment depth is <= than depth buffer value*/
+	GF_EVGDEPTH_LESS_EQUAL,
+	/*! depth test succeeds if fragment depth is > than depth buffer value*/
+	GF_EVGDEPTH_GREATER,
+	/*! depth test succeeds if fragment depth is >= than depth buffer value*/
+	GF_EVGDEPTH_GREATER_EQUAL
+} GF_EVGDepthTest;
+
+/*! sets depth buffer test
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param mode the desired depth test mode
+\return error if any
+*/
+GF_Err gf_evg_set_depth_test(GF_EVGSurface *surf, GF_EVGDepthTest mode);
+
+/*! fragment color type */
+typedef enum
+{
+	/*! fragment is invalid (discarded or error) */
+	GF_EVG_FRAG_INVALID = 0,
+	/*! fragment is RGB */
+	GF_EVG_FRAG_RGB,
+	/*! fragment is YUV */
+	GF_EVG_FRAG_YUV,
+} GF_EVGFragmentType;
+
+/*! Parameters for the fragment callback */
+typedef struct
+{
+	/*! screen x in pixels - input param*/
+	Float screen_x;
+	/*! screen y in pixels - input param*/
+	Float screen_y;
+	/*! screen z in NDC - input param*/
+	Float screen_z;
+	/*! depth - input and output param*/
+	Float depth;
+	/*! primitive index in the current \ref gf_evg_surface_draw_array call, 0 being the first primitive  - input param*/
+	u32 prim_index;
+	/*! index of first vertex in the current primitive  - input param*/
+	u32 idx1;
+	/*! index of second vertex in the current primitive (for lines or triangles/quads)  - input param*/
+	u32 idx2;
+	/*! index of third vertex in the current primitive (for triangles/quads)  - input param*/
+	u32 idx3;
+
+	/*! primitive type  - input param*/
+	GF_EVGPrimitiveType ptype;
+
+	/*! fragment color, must be written if fragment is not discarded - output value*/
+	GF_Vec4 color;
+	/*! fragment valid state - output value*/
+	GF_EVGFragmentType frag_valid;
+
+	/*vars for lerp*/
+	/*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*/
+	Float pbc1, pbc2, pbc3;
+	/*! perspective divider
+	\note this is also 1/W of the fragment, eg opengl gl_fragCoord.w
+	*/
+	Float persp_denum;
+} GF_EVGFragmentParam;
+
+
+/*! Parameters for the vertex callback */
+typedef struct
+{
+	/*! input vertex - input param*/
+	GF_Vec4 in_vertex;
+	/*! primitive index in the current \ref gf_evg_surface_draw_array call, 0 being the first primitive  - input param*/
+	u32 prim_index;
+	/*! index of the vertex  - input param*/
+	u32 vertex_idx;
+	/*! index of the vertex in the current primitive  - input param*/
+	u32 vertex_idx_in_prim;
+	/*! primitive type  - input param*/
+	u32 ptype;
+
+	/*! transformed vertex to use, must be written  - output values*/
+	GF_Vec4 out_vertex;
+} GF_EVGVertexParam;
+
+/*! callback type for fragment shader
+ \param udta opaque data passed back to caller
+ \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
+\param surf the target 3D surface
+\param shader the fragment shader 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);
+
+/*! callback type for vertex shader
+\param udta opaque data passed back to caller
+\param vertp vertex paramters
+\return GF_TRUE if success; GF_FALSE if error*/
+typedef Bool (*gf_evg_vertex_shader)(void *udta, GF_EVGVertexParam *vertp);
+/*! assigns vertex shader to the rasterizer
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param shader the vertex shader callback to use
+\param shader_udta opaque data to pass to the callback function
+\return error if any
+ */
+GF_Err gf_evg_surface_set_vertex_shader(GF_EVGSurface *surf, gf_evg_vertex_shader shader, void *shader_udta);
+
+/*! sets face orientation for the primitives
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param is_ccw if GF_TRUE, face are given in counter-clockwise order, otherwise in clockwise order
+\return error if any
+ */
+GF_Err gf_evg_surface_set_ccw(GF_EVGSurface *surf, Bool is_ccw);
+/*! enables/disables backface culling
+ \warning not enabling backface culling when anti-aliasing is on may result in visual artefacts
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param backcull if GF_TRUE, faces with normals poiting away from camera will not be drawn
+\return error if any
+ */
+GF_Err gf_evg_surface_set_backcull(GF_EVGSurface *surf, Bool backcull);
+/*! enables/disables anti-aliased rendering
+ \warning not enabling backface culling when anti-aliasing is on may result in visual artefacts
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param antialias if GF_TRUE, edges will be anti-aliased
+\return error if any
+ */
+GF_Err gf_evg_surface_set_antialias(GF_EVGSurface *surf, Bool antialias);
+/*! sets minimum depth value for coordinates normalization - see OpenGL glDepthRange
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param min_depth the minimum depth value
+\return error if any
+ */
+GF_Err gf_evg_surface_set_min_depth(GF_EVGSurface *surf, Float min_depth);
+/*! sets maximum depth value for coordinates normalization - see OpenGL glDepthRange
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param max_depth the maximum depth value
+\return error if any
+ */
+GF_Err gf_evg_surface_set_max_depth(GF_EVGSurface *surf, Float max_depth);
+/*! indicates that the clip space after projection is [0,1] and not [-1, 1]
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param clip_zero if GF_TRUE, the projected vertices depth are in [0, 1], otherwise in [-1, 1]
+\return error if any
+ */
+GF_Err gf_evg_surface_set_clip_zero(GF_EVGSurface *surf, Bool clip_zero);
+/*! sets point size value for points primitives
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param size  the desired point size in pixels
+\return error if any
+ */
+GF_Err gf_evg_surface_set_point_size(GF_EVGSurface *surf, Float size);
+/*! sets line size (width) value for points primitives
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param size  the desired line size in pixels
+\return error if any
+ */
+GF_Err gf_evg_surface_set_line_size(GF_EVGSurface *surf, Float size);
+/*! enables point smoothing.
+ When point smoothing is enabled, the geometry drawn is a circle, otherwise a square
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param smooth if GF_TRUE, point smoothing is enabled
+\return error if any
+ */
+GF_Err gf_evg_surface_set_point_smooth(GF_EVGSurface *surf, Bool smooth);
+/*! disables early depth test
+If your fragment shader modifies the depth of the fragment, you must call this function to avoid early depth test (fragment discarded before calling the shader)
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param disable if GF_TRUE, early depth test is disabled
+\return error if any
+ */
+GF_Err gf_evg_surface_disable_early_depth(GF_EVGSurface *surf, Bool disable);
+/*! disables depth buffer write
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param do_write if GF_TRUE,  depth values are written to the depth buffer (default when creating the rasterizer)
+\return error if any
+ */
+GF_Err gf_evg_surface_write_depth(GF_EVGSurface *surf, Bool do_write);
+/*! sets  depth buffer
+ The 3D rasterizer does not allocate any surface (depth or color buffers), it is the user responsability to set these buffers
+ \warning do NOT forget to resize your depth buffer when resizing the canvas !
+\note this is only used for 3D rasterizer, and fails 2D mode
+\param surf the target 3D surface
+\param depth the depth buffer to use. Its size shall be Float*width*height
+\return error if any
+ */
+GF_Err gf_evg_surface_set_depth_buffer(GF_EVGSurface *surf, Float *depth);
+
+
+/*! performs RGB to YUV conversion
+\param surf the target  surface
+\param r the source red component
+\param g the source green component
+\param b the source blue component
+\param y the output Y component
+\param cb the output U/Cb component
+\param cr the output V/Cr component
+\return error if any
+ */
+GF_Err gf_gf_evg_rgb_to_yuv_f(GF_EVGSurface *surf, Float r, Float g, Float b, Float *y, Float *cb, Float *cr);
+
+/*! performs YUV to RGB conversion
+\param surf the target  surface
+\param y the source Y component
+\param cb the source U/Cb component
+\param cr the source V/Cr component
+\param r the output red component
+\param g the output green component
+\param b the output blue component
+\return error if any
+ */
+GF_Err gf_evg_yuv_to_rgb_f(GF_EVGSurface *surf, Float y, Float cb, Float cr, Float *r, Float *g, Float *b);
+
+/*! converts RGB to YUV
+ \param surf the target surface
+ \param col the source RGBA color
+ \param y the output Y value
+ \param cb the output Cb/U value
+ \param cr the output Cr/V value
+ */
+void gf_evg_rgb_to_yuv(GF_EVGSurface *surf, GF_Color col, u8*y, u8*cb, u8*cr);
+
+/*! converts ARGB to AYUV
+\param surf the target surface
+\param col the source ARGB color
+\return the result AYUV color
+*/
+GF_Color gf_evg_argb_to_ayuv(GF_EVGSurface *surf, GF_Color col);
+
+/*! converts AYUV to ARGB
+\param surf the target surface
+\param col the source AYUV  color
+\return the result ARGB color
+*/
+GF_Color gf_evg_ayuv_to_argb(GF_EVGSurface *surf, GF_Color col);
+
+/*! converts ARGB to AYUV for wide colors
+\param surf the target surface
+\param col the source ARGB color
+\return the result AYUV color
+*/
+u64 gf_evg_argb_to_ayuv_wide(GF_EVGSurface *surf, u64 col);
+
+/*! converts AYUV to ARGB for wide color
+\param surf the target surface
+\param col the source AYUV  color
+\return the result ARGB color
+*/
+u64 gf_evg_ayuv_to_argb_wide(GF_EVGSurface *surf, u64 col);
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_EVG_H_*/
+

gpac-1.0.0.tar.gz/include/gpac/filters.h Added

@@ -0,0 +1,3766 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters 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.
+ *
+ */
+
+#ifndef _GF_FILTERS_H_
+#define _GF_FILTERS_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+#include <gpac/list.h>
+#include <gpac/events.h>
+#include <gpac/user.h>
+#include <gpac/constants.h>
+#include <gpac/download.h>
+#include <gpac/main.h>
+
+//for offsetof()
+#include <stddef.h>
+
+/*!
+\file "gpac/filters.h"
+\brief Filter management of GPAC.
+
+This file contains all exported functions for filter management of the GPAC framework.
+*/
+
+/*!
+\addtogroup filters_grp Filter Management
+\brief Filter Management of GPAC.
+
+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_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
+- \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
+	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
+	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
+	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
+	 (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 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
+	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
+ 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);
+
+*/
+
+/*! \hideinitializer
+A packet byte offset is set to this value when not valid
+*/
+#define GF_FILTER_NO_BO 0xFFFFFFFFFFFFFFFFUL
+/*! \hideinitializer
+A packet timestamp (Decoding or Composition) is set to this value when not valid
+*/
+#define GF_FILTER_NO_TS 0xFFFFFFFFFFFFFFFFUL
+
+/*! \hideinitializer
+Filter Session object
+ */
+typedef struct __gf_filter_session GF_FilterSession;
+
+/*! \hideinitializer
+Filter object
+ */
+typedef struct __gf_filter GF_Filter;
+/*! \hideinitializer
+Filter PID object
+ */
+typedef struct __gf_filter_pid GF_FilterPid;
+
+/*! \hideinitializer
+Filter Packet object
+ */
+typedef struct __gf_filter_pck GF_FilterPacket;
+/*!
+Filter Packet destructor function prototype
+ */
+typedef void (*gf_fsess_packet_destructor)(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck);
+
+/*!
+Filter Event object
+ */
+typedef union __gf_filter_event GF_FilterEvent;
+
+/*!
+Filter Session Task object
+ */
+typedef struct __gf_fs_task GF_FSTask;
+
+/*!
+Filter Register object
+ */
+typedef struct __gf_filter_register GF_FilterRegister;
+/*!
+Filter Property object
+ */
+typedef struct __gf_prop_val GF_PropertyValue;
+
+/*!
+Filter Property Reference object, used for info query only
+ */
+typedef struct __gf_prop_entry GF_PropertyEntry;
+
+/*!
+\addtogroup fs_grp Filter Session
+\ingroup filters_grp
+\brief Filter Session
+
+ The GPAC filter session object allows building media pipelines using multiple sources and destinations and arbitrary filter chains.
+
+ Filters are described through a \ref __gf_filter_register structure. A set of built-in filters are available, and user-defined filters can be added or removed at runtime.
+
+ The filter session keeps an internal graph representation of all available filters and their possible input connections, which is used when resolving connections between filters.
+
+ The number of \ref GF_FilterCapability matched between registries defines the weight of the connection.
+
+ Paths from an instantiated filter are enabled/disabled based on the source PID capabilities.
+
+ Paths to destination are recomputed for each destination, based on the instantiated destination filter capabilities.
+
+ The graph edges are then enabled in the possible subgraphs allowed by the destination capabilities, and unused filter registries (without enabled input connections) are removed from the graph.
+
+ The resulting weighted graph is then solved using Dijkstra's algorithm, using filter priority in case of weight equality.
+
+ The filter session works by default in a semi-blocking state. Whenever output PID buffers on a filter are all full, the filter is marked as blocked and not scheduled for processing. Whenever one output PID buffer is not full, the filter unblocks.
+
+ This implies that PID buffers may grow quite large if a filter is consuming data from a PID at a much faster rate than another filter consuming from that same PID.
+ *	@{
+ */
+
+
+/*! Filter session scheduler type */
+typedef enum
+{
+	/*! In this mode, the scheduler does not use locks for packet and property queues. Main task list is mutex-protected */
+	GF_FS_SCHEDULER_LOCK_FREE=0,
+	/*! In this mode, the scheduler uses locks for packet and property queues. Defaults to lock-free if no threads are used. Main task list is mutex-protected */
+	GF_FS_SCHEDULER_LOCK,
+	/*! In this mode, the scheduler does not use locks for packet and property queues, nor for the main task list */
+	GF_FS_SCHEDULER_LOCK_FREE_X,
+	/*! In this mode, the scheduler uses locks for packet and property queues even if single-threaded (test mode) */
+	GF_FS_SCHEDULER_LOCK_FORCE,
+	/*! In this mode, the scheduler uses direct dispatch and no threads, trying to nest task calls within task calls */
+	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*/
+#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 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
+/*! Flag set to disable data probe*/
+#define GF_FS_FLAG_NO_PROBE	(1<<6)
+/*! Flag set to disable source reassignment (e.g. switching from fin to ffdmx) in PID resolution*/
+#define GF_FS_FLAG_NO_REASSIGN	(1<<7)
+/*! Flag set to print enabled/disabled edges for debug of PID resolution*/
+#define GF_FS_FLAG_PRINT_CONNECTIONS	(1<<8)
+/*! Flag set to disable argument checking*/
+#define GF_FS_FLAG_NO_ARG_CHECK	(1<<9)
+/*! 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)
+
+/*! 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
+\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
+\return the created filter session
+*/
+GF_FilterSession *gf_fs_new_defaults(u32 flags);
+
+/*! Destructs the filter session
+\param session the filter session to destruct
+*/
+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).
+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
+\param name name and arguments of the filter register to instantiate.
+\param err_code set to error code if any - may be NULL. If initially set to GF_EOS, disables log messages.
+\return created filter or NULL if filter register cannot be found
+*/
+GF_Filter *gf_fs_load_filter(GF_FilterSession *session, const char *name, GF_Err *err_code);
+
+/*! Checks if a filter register exists by name.
+\param session filter session
+\param name name of the filter register to check.
+\return GF_TRUE if a filter register exists with the given name, GF_FALSE otherwise
+*/
+Bool gf_fs_filter_exists(GF_FilterSession *session, const char *name);
+
+/*! Runs the session
+\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
+*/
+GF_Err gf_fs_run(GF_FilterSession *session);
+
+/*! The default separator set used*/
+#define GF_FS_DEFAULT_SEPS	":=#,!@"
+
+/*! Sets the set of separators to use when parsing args
+\param session filter session
+\param separator_set filter session.
+The first char is used to separate argument names - default is ':'
+The second char, if present, is used to separate names and values - default is '='
+The third char, if present, is used to separate fragments for PID sources - default is '#'
+The fourth char, if present, is used for list separators (sourceIDs, gfreg, ...) - default is ','
+The fifth char, if present, is used for boolean negation - default is '!'
+The sixth char, if present, is used for LINK directives - default is '@'
+\return error if any
+*/
+GF_Err gf_fs_set_separators(GF_FilterSession *session, const char *separator_set);
+
+/*! Sets the maximum length of a filter chain dynamically loaded to solve connection between two filters
+\param session filter session
+\param  max_chain_length sets maximum chain length when resolving filter links.
+Default value is 6 ([ in -> ] demux -> reframe -> decode -> encode -> reframe -> mux [ -> out ])
+(filter chains loaded for adaptation (eg pixel format change, audio resample) are loaded after the link resolution)
+Setting the value to 0 disables dynamic link resolution. You will have to specify the entire chain manually
+\return error if any
+*/
+GF_Err gf_fs_set_max_resolution_chain_length(GF_FilterSession *session, u32 max_chain_length);
+
+/*! Sets the maximum sleep time when postponing tasks.
+\param session filter session
+\param  max_sleep maximum sleep time in milliseconds. 0 means yield only.
+\return error if any
+*/
+GF_Err gf_fs_set_max_sleep_time(GF_FilterSession *session, u32 max_sleep);
+
+/*! gets the maximum filter chain lengtG
+\param session filter session
+\return maximum chain length when resolving filter links.
+*/
+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
+*/
+GF_Err gf_fs_stop(GF_FilterSession *session);
+
+/*! Gets the number of available filter registries (not blacklisted)
+\param session filter session
+\return number of filter registries
+*/
+u32 gf_fs_filters_registers_count(GF_FilterSession *session);
+
+/*! Returns the register at the given index
+\param session filter session
+\param idx index of register, from 0 to \ref gf_fs_filters_registers_count
+\return the register object, or NULL if index is out of bounds
+*/
+const GF_FilterRegister *gf_fs_get_filter_register(GF_FilterSession *session, u32 idx);
+
+/*! Registers the test filters used for unit tests
+\param session filter session
+*/
+void gf_fs_register_test_filters(GF_FilterSession *session);
+
+/*! Loads a source filter from a URL and arguments
+\param session filter session
+\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
+\return the filter loaded or NULL if error
+*/
+GF_Filter *gf_fs_load_source(GF_FilterSession *session, const char *url, const char *args, const char *parent_url, GF_Err *err);
+
+/*! 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 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
+\return the filter loaded or NULL if error
+*/
+GF_Filter *gf_fs_load_destination(GF_FilterSession *session, const char *url, const char *args, const char *parent_url, GF_Err *err);
+
+/*! Returns the last error which happened during a PID connection
+\param session filter session
+\return the error code if any
+*/
+GF_Err gf_fs_get_last_connect_error(GF_FilterSession *session);
+
+/*! Returns the last error which happened during a filter process
+\param session filter session
+\return the error code if any
+*/
+GF_Err gf_fs_get_last_process_error(GF_FilterSession *session);
+
+/*! Adds a user-defined register to the session
+\param session filter session
+\param freg filter register to add
+*/
+void gf_fs_add_filter_register(GF_FilterSession *session, const GF_FilterRegister *freg);
+
+/*! Removes a user-defined register from the session
+\param session filter session
+\param freg filter register to remove
+*/
+void gf_fs_remove_filter_register(GF_FilterSession *session, GF_FilterRegister *freg);
+
+/*! 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 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);
+
+/*! 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
+\return the error code if any
+*/
+GF_Err gf_fs_abort(GF_FilterSession *session, Bool do_flush);
+/*! 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 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);
+
+
+/*! Sets UI callback event
+\param session filter session
+\param ui_event_proc the event proc callback function. Its return value depends on the event type, usually 0
+\param cbk_udta pointer passed back to callback
+*/
+void gf_fs_set_ui_callback(GF_FilterSession *session, Bool (*ui_event_proc)(void *opaque, GF_Event *event), void *cbk_udta);
+
+/*! Prints stats to logs using \code LOG_APP@LOG_INFO \endcode
+\param session filter session
+*/
+void gf_fs_print_stats(GF_FilterSession *session);
+
+/*! Prints connections between loaded filters in the session to logs using \code LOG_APP@LOG_INFO \endcode
+\param session filter session
+*/
+void gf_fs_print_connections(GF_FilterSession *session);
+
+/*! 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
+\param print_fn optional callback function for print, otherwise print to stderr
+*/
+void gf_fs_print_all_connections(GF_FilterSession *session, char *filter_name, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) );
+
+/*! Checks the presence of an input capability and an output capability in a target register. The caps are matched only if they belong to the same bundle.
+\param filter_reg filter register to check
+\param in_cap_code capability code (property type) of input capability to check
+\param in_cap capabiility value of input capability to check
+\param out_cap_code capability code (property type) of output capability to check
+\param out_cap capability value of output capability to check
+\param exact_match_only if true returns TRUE only if exact match (code and value), otherwise return TRUE if caps code are matched
+\return GF_TRUE if filter register has such a match, GF_FALSE otherwise
+*/
+Bool gf_fs_check_filter_register_cap(const GF_FilterRegister *filter_reg, u32 in_cap_code, GF_PropertyValue *in_cap, u32 out_cap_code, GF_PropertyValue *out_cap, Bool exact_match_only);
+
+
+/*! Enables or disables filter reporting
+\param session filter session
+\param reporting_on if GF_TRUE, reporting will be enabled
+*/
+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
+\param session filter session
+\param do_lock if GF_TRUE, session is locked, otherwise session is unlocked
+*/
+void gf_fs_lock_filters(GF_FilterSession *session, Bool do_lock);
+
+/*! Gets number of active filters in the session
+\param session filter session
+\return number of active filters
+*/
+u32 gf_fs_get_filters_count(GF_FilterSession *session);
+
+/*! Type of filter*/
+typedef enum
+{
+	/*! Unknown filter type*/
+	GF_FS_STATS_FILTER_UNKNOWN,
+	/*! raw input (file, socket, pipe) filter type*/
+	GF_FS_STATS_FILTER_RAWIN,
+	/*! demultiplexer filter type*/
+	GF_FS_STATS_FILTER_DEMUX,
+	/*! decoder filter type*/
+	GF_FS_STATS_FILTER_DECODE,
+	/*! encoder filter type*/
+	GF_FS_STATS_FILTER_ENCODE,
+	/*! multiplexer filter type*/
+	GF_FS_STATS_FILTER_MUX,
+	/*! raw output (file, socket, pipe) filter type*/
+	GF_FS_STATS_FILTER_RAWOUT,
+} GF_FSFilterType;
+
+/*! Filter statistics object*/
+typedef struct
+{
+	/*!filter object*/
+	const GF_Filter *filter;
+	/*!set if filter is only an alias, in which case all remaining fields of the structure are not set*/
+	const GF_Filter *filter_alias;
+
+	/*!number of tasks executed by this filter*/
+	u64 nb_tasks_done;
+	/*!number of packets processed by this filter*/
+	u64 nb_pck_processed;
+	/*!number of bytes processed by this filter*/
+	u64 nb_bytes_processed;
+	/*!number of packets sent by this filter*/
+	u64 nb_pck_sent;
+	/*!number of hardware frames packets sent by this filter*/
+	u64 nb_hw_pck_sent;
+	/*!number of processing errors in the lifetime of the filter*/
+	u32 nb_errors;
+
+	/*!number of bytes sent by this filter*/
+	u64 nb_bytes_sent;
+	/*!number of microseconds this filter was active*/
+	u64 time_process;
+	/*!percentage of data processed (between 0 and 100), otherwise unknown (-1)*/
+	s32 percent;
+	/*!last status report from filter, null if session reporting is not enabled*/
+	const char *status;
+	/*!set to GF_TRUE of status or percent changed since last query for this filter, GF_FALSE otherwise*/
+	Bool report_updated;
+	/*!filter name*/
+	const char *name;
+	/*!filter register name*/
+	const char *reg_name;
+	/*!filter register ID*/
+	const char *filter_id;
+	/*!set to GF_TRUE if filter is done processing*/
+	Bool done;
+	/*!number of input PIDs*/
+	u32 nb_pid_in;
+	/*!number of input packets processed*/
+	u64 nb_in_pck;
+	/*!number of output PIDs*/
+	u32 nb_pid_out;
+	/*!number of output packets sent*/
+	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*/
+	GF_FSFilterType type;
+	/*!set to streamtype of output PID if single output, GF_STREAM_UNKNOWN otherwise*/
+	u32 stream_type;
+	/*!set to codecid of output PID if single output, GF_CODECID_NONE otherwise*/
+	u32 codecid;
+} GF_FilterStats;
+
+/*! Gets number of active filters in the session
+\param session filter session
+\param idx index of filter to query
+\param stats statistics for filter
+\return error code if any
+*/
+GF_Err gf_fs_get_filter_stats(GF_FilterSession *session, u32 idx, GF_FilterStats *stats);
+
+
+/*! Enumerates filter and meta-filter arguments not matched in the session
+\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)
+\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);
+
+
+
+/*! Flags for argument update event*/
+typedef enum
+{
+	/*! the update event can be sent down the source chain*/
+	GF_FILTER_UPDATE_DOWNSTREAM = 1<<1,
+	/*! the update event can be sent up the filter chain*/
+	GF_FILTER_UPDATE_UPSTREAM = 1<<2,
+} GF_EventPropagateType;
+
+/*! Enumerates filter and meta-filter arguments not matched in the session
+\param session filter session
+\param fid ID of filter on which to send the update, NULL if filter is set
+\param filter filter on which to send the update, NULL if fid is set
+\param name name of filter option to update
+\param val value of filter option to update
+\param propagate_mask propagation flags - 0 means no propagation
+*/
+
+void gf_fs_send_update(GF_FilterSession *session, const char *fid, GF_Filter *filter, const char *name, const char *val, GF_EventPropagateType propagate_mask);
+
+/*! @} */
+
+
+/*!
+\addtogroup fs_props Filter Properties
+\ingroup filters_grp
+\brief PID and filter properties
+
+Documents the property object used for PID and packets.
+@{
+ */
+
+/*! Property types*/
+typedef enum
+{
+	/*! not allowed*/
+	GF_PROP_FORBIDEN=0,
+	/*! signed 32 bit integer*/
+	GF_PROP_SINT,
+	/*! unsigned 32 bit integer*/
+	GF_PROP_UINT,
+	/*! signed 64 bit integer*/
+	GF_PROP_LSINT,
+	/*! unsigned 64 bit integer*/
+	GF_PROP_LUINT,
+	/*! boolean*/
+	GF_PROP_BOOL,
+	/*! 32 bit / 32 bit fraction*/
+	GF_PROP_FRACTION,
+	/*! 64 bit / 64 bit fraction*/
+	GF_PROP_FRACTION64,
+	/*! float (Fixed) number*/
+	GF_PROP_FLOAT,
+	/*! double number*/
+	GF_PROP_DOUBLE,
+	/*! 2D signed integer vector*/
+	GF_PROP_VEC2I,
+	/*! 2D double number vector*/
+	GF_PROP_VEC2,
+	/*! 3D signed integer vector*/
+	GF_PROP_VEC3I,
+	/*! 3D double number vector*/
+	GF_PROP_VEC3,
+	/*! 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,
+	/*! string property, memory is duplicated when setting the property and managed internally*/
+	GF_PROP_STRING,
+	/*! 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,
+	/*! data property, memory is duplicated when setting the property and managed internally*/
+	GF_PROP_DATA,
+	/*! const string property, memory is NOT duplicated when setting the property, stays user-managed*/
+	GF_PROP_NAME,
+	/*! 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,
+	/*! const data property, memory is NOT duplicated when setting the property, stays user-managed*/
+	GF_PROP_CONST_DATA,
+	/*! 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,
+	/*! unsigned 32 bit integer list, memory is ALWAYS duplicated when setting the property*/
+	GF_PROP_UINT_LIST,
+
+	/*! not allowed*/
+	GF_PROP_LAST_DEFINED,
+} GF_PropType;
+
+/*! Data property*/
+typedef struct
+{
+	/*! data pointer */
+	u8 *ptr;
+	/*! data size */
+	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
+{
+	/*! x coord */
+	s32 x;
+	/*! y coord */
+	s32 y;
+} GF_PropVec2i;
+
+/*! 2D double number vector property*/
+typedef struct
+{
+	/*! x coord */
+	Double x;
+	/*! y coord */
+	Double y;
+} GF_PropVec2;
+
+/*! 3D signed integer vector property*/
+typedef struct
+{
+	/*! x coord */
+	s32 x;
+	/*! y coord */
+	s32 y;
+	/*! z coord */
+	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
+{
+	/*! x coord */
+	s32 x;
+	/*! y coord */
+	s32 y;
+	/*! z coord */
+	s32 z;
+	/*! w coord */
+	s32 w;
+} GF_PropVec4i;
+
+/*! 4D double number vector property*/
+typedef struct
+{
+	/*! x coord */
+	Double x;
+	/*! y coord */
+	Double y;
+	/*! z coord */
+	Double z;
+	/*! w coord */
+	Double w;
+} GF_PropVec4;
+
+/*! Property value used by PIDs and packets*/
+struct __gf_prop_val
+{
+	/*! type of the property */
+	GF_PropType type;
+	/*! union of all possible property data types */
+	union {
+		/*! 64 bit unsigned integer value of property */
+		u64 longuint;
+		/*! 64 bit signed integer value of property */
+		s64 longsint;
+		/*! 32 bit signed integer value of property */
+		s32 sint;
+		/*! 32 bit unsigned integer value of property */
+		u32 uint;
+		/*! boolean value of property */
+		Bool boolean;
+		/*! fraction (32/32 bits) value of property */
+		GF_Fraction frac;
+		/*! fraction (64/64 bits) value of property */
+		GF_Fraction64 lfrac;
+		/*! fixed number (float or 32 bit depending on compilation settings) value of property */
+		Fixed fnumber;
+		/*! double value of property */
+		Double number;
+		/*! 2D signed integer vector value of property */
+		GF_PropVec2i vec2i;
+		/*! 2D double vector value of property */
+		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;
+		/*! string value of property. For non const string / names, the memory is freed by filter session, otherwise handled as const char *. */
+		char *string;
+		/*! pointer value of property */
+		void *ptr;
+		/*! string list value of property - memory is handled by filter session (always copy)*/
+		GF_List *string_list;
+		/*! unsigned integer list value of property - memory is handled by filter session (always copy)*/
+		GF_PropUIntList uint_list;
+	} value;
+};
+
+/*! Playback mode type supported on PID*/
+typedef enum
+{
+	/*! simplest playback mode, can play from 0 at speed=1 only*/
+	GF_PLAYBACK_MODE_NONE=0,
+	/*! seek playback mode, can play from any position at speed=1 only*/
+	GF_PLAYBACK_MODE_SEEK,
+	/*! fast forward playback mode, can play from any position at speed=N only, with N>=0*/
+	GF_PLAYBACK_MODE_FASTFORWARD,
+	/*! rewind playback mode, can play from any position at speed=N, N positive or negative*/
+	GF_PLAYBACK_MODE_REWIND
+} GF_FilterPidPlaybackMode;
+
+/*! Built-in property types
+See gpac help (gpac -h props) for codes, types, formats and and meaning
+	\hideinitializer
+*/
+enum
+{
+	GF_PROP_PID_ID = GF_4CC('P','I','D','I'),
+	GF_PROP_PID_ESID = GF_4CC('E','S','I','D'),
+	GF_PROP_PID_ITEM_ID = GF_4CC('I','T','I','D'),
+	GF_PROP_PID_SERVICE_ID = GF_4CC('P','S','I','D'),
+	GF_PROP_PID_CLOCK_ID = GF_4CC('C','K','I','D'),
+	GF_PROP_PID_DEPENDENCY_ID = GF_4CC('D','P','I','D'),
+	GF_PROP_PID_SUBLAYER = GF_4CC('D','P','S','L'),
+	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_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'),
+	GF_PROP_PID_STREAM_TYPE = GF_4CC('P','M','S','T'),
+	GF_PROP_PID_SUBTYPE = GF_4CC('P','S','S','T'),
+	GF_PROP_PID_ISOM_SUBTYPE = GF_4CC('P','I','S','T'),
+	GF_PROP_PID_ORIG_STREAM_TYPE = GF_4CC('P','O','S','T'),
+	GF_PROP_PID_CODECID = GF_4CC('P','O','T','I'),
+	GF_PROP_PID_IN_IOD = GF_4CC('P','I','O','D'),
+	GF_PROP_PID_UNFRAMED = GF_4CC('P','F','R','M'),
+	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_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'),
+	GF_PROP_PID_TIMESHIFT_STATE = GF_4CC('P','T','S','S'),
+	GF_PROP_PID_TIMESCALE = GF_4CC('T','I','M','S'),
+	GF_PROP_PID_PROFILE_LEVEL = GF_4CC('P','R','P','L'),
+	GF_PROP_PID_DECODER_CONFIG = GF_4CC('D','C','F','G'),
+	GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT = GF_4CC('E','C','F','G'),
+	GF_PROP_PID_CONFIG_IDX =  GF_4CC('I','C','F','G'),
+	GF_PROP_PID_SAMPLE_RATE = GF_4CC('A','U','S','R'),
+	GF_PROP_PID_SAMPLES_PER_FRAME = GF_4CC('F','R','M','S'),
+	GF_PROP_PID_NUM_CHANNELS = GF_4CC('C','H','N','B'),
+	GF_PROP_PID_AUDIO_BPS = GF_4CC('A','B','P','S'),
+	GF_PROP_PID_CHANNEL_LAYOUT = GF_4CC('C','H','L','O'),
+	GF_PROP_PID_AUDIO_FORMAT = GF_4CC('A','F','M','T'),
+	GF_PROP_PID_AUDIO_SPEED = GF_4CC('A','S','P','D'),
+	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_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'),
+	GF_PROP_PID_PIXFMT_WRAPPED = GF_4CC('P','F','M','W'),
+	GF_PROP_PID_STRIDE = GF_4CC('V','S','T','Y'),
+	GF_PROP_PID_STRIDE_UV = GF_4CC('V','S','T','C'),
+	GF_PROP_PID_BIT_DEPTH_Y = GF_4CC('Y','B','P','S'),
+	GF_PROP_PID_BIT_DEPTH_UV = GF_4CC('C','B','P','S'),
+	GF_PROP_PID_FPS = GF_4CC('V','F','P','F'),
+	GF_PROP_PID_INTERLACED = GF_4CC('V','I','L','C'),
+	GF_PROP_PID_SAR = GF_4CC('P','S','A','R'),
+	GF_PROP_PID_PAR = GF_4CC('V','P','A','R'),
+	GF_PROP_PID_WIDTH_MAX = GF_4CC('M', 'W','I','D'),
+	GF_PROP_PID_HEIGHT_MAX = GF_4CC('M', 'H','E','I'),
+	GF_PROP_PID_ZORDER = GF_4CC('V', 'Z','I','X'),
+	GF_PROP_PID_TRANS_X = GF_4CC('V','T','R','X'),
+	GF_PROP_PID_TRANS_Y = GF_4CC('V','T','R','Y'),
+	GF_PROP_PID_HIDDEN = GF_4CC('H','I','D','E'),
+	GF_PROP_PID_CROP_POS = GF_4CC('V','C','X','Y'),
+	GF_PROP_PID_ORIG_SIZE = GF_4CC('V','O','W','H'),
+	GF_PROP_PID_SRD = GF_4CC('S','R','D',' '),
+	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_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_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'),
+	GF_PROP_PID_URL = GF_4CC('F','U','R','L'),
+	GF_PROP_PID_REMOTE_URL = GF_4CC('R','U','R','L'),
+	GF_PROP_PID_REDIRECT_URL = GF_4CC('R','E','L','O'),
+	GF_PROP_PID_FILEPATH = GF_4CC('F','S','R','C'),
+	GF_PROP_PID_MIME = GF_4CC('M','I','M','E'),
+	GF_PROP_PID_FILE_EXT = GF_4CC('F','E','X','T'),
+	GF_PROP_PID_OUTPATH = GF_4CC('F','D','S','T'),
+	GF_PROP_PID_FILE_CACHED = GF_4CC('C','A','C','H'),
+	GF_PROP_PID_DOWN_RATE = GF_4CC('D','L','B','W'),
+	GF_PROP_PID_DOWN_SIZE = GF_4CC('D','L','S','Z'),
+	GF_PROP_PID_DOWN_BYTES = GF_4CC('D','L','B','D'),
+	GF_PROP_PID_FILE_RANGE = GF_4CC('F','B','R','A'),
+	GF_PROP_PID_DISABLE_PROGRESSIVE = GF_4CC('N','P','R','G'),
+	GF_PROP_PID_ISOM_BRANDS = GF_4CC('A','B','R','D'),
+	GF_PROP_PID_ISOM_MBRAND = GF_4CC('M','B','R','D'),
+	GF_PROP_PID_ISOM_MOVIE_TIME = GF_4CC('M','H','T','S'),
+	GF_PROP_PID_HAS_SYNC = GF_4CC('P','S','Y','N'),
+	GF_PROP_SERVICE_WIDTH = GF_4CC('D','W','D','T'),
+	GF_PROP_SERVICE_HEIGHT = GF_4CC('D','H','G','T'),
+	GF_PROP_PID_CAROUSEL_RATE = GF_4CC('C','A','R','A'),
+	GF_PROP_PID_UTC_TIME = GF_4CC('U','T','C','D'),
+	GF_PROP_PID_UTC_TIMESTAMP = GF_4CC('U','T','C','T'),
+	GF_PROP_PID_AUDIO_VOLUME = GF_4CC('A','V','O','L'),
+	GF_PROP_PID_AUDIO_PAN = GF_4CC('A','P','A','N'),
+	GF_PROP_PID_AUDIO_PRIORITY = GF_4CC('A','P','R','I'),
+	GF_PROP_PID_PROTECTION_SCHEME_TYPE = GF_4CC('S','C','H','T'),
+	GF_PROP_PID_PROTECTION_SCHEME_VERSION = GF_4CC('S','C','H','V'),
+	GF_PROP_PID_PROTECTION_SCHEME_URI = GF_4CC('S','C','H','U'),
+	GF_PROP_PID_PROTECTION_KMS_URI = GF_4CC('K','M','S','U'),
+	GF_PROP_PID_ISMA_SELECTIVE_ENC = GF_4CC('I','S','S','E'),
+	GF_PROP_PID_ISMA_IV_LENGTH = GF_4CC('I','S','I','V'),
+	GF_PROP_PID_ISMA_KI_LENGTH = GF_4CC('I','S','K','I'),
+	GF_PROP_PID_ISMA_KI = GF_4CC('I','K','E','Y'),
+	GF_PROP_PID_OMA_CRYPT_TYPE = GF_4CC('O','M','C','T'),
+	GF_PROP_PID_OMA_CID = GF_4CC('O','M','I','D'),
+	GF_PROP_PID_OMA_TXT_HDR = GF_4CC('O','M','T','H'),
+	GF_PROP_PID_OMA_CLEAR_LEN = GF_4CC('O','M','P','T'),
+	GF_PROP_PID_CRYPT_INFO = GF_4CC('E','C','R','I'),
+	GF_PROP_PID_DECRYPT_INFO = GF_4CC('E','D','R','I'),
+	GF_PROP_PCK_SENDER_NTP = GF_4CC('N','T','P','S'),
+	GF_PROP_PCK_RECEIVER_NTP = GF_4CC('N','T','P','R'),
+	GF_PROP_PID_ADOBE_CRYPT_META = GF_4CC('A','M','E','T'),
+	GF_PROP_PID_ENCRYPTED = GF_4CC('E','P','C','K'),
+	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_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'),
+	GF_PROP_PID_AMR_MODE_SET = GF_4CC('A','M','S','T'),
+	GF_PROP_PCK_SUBS = GF_4CC('S','U','B','S'),
+	GF_PROP_PID_MAX_NALU_SIZE = GF_4CC('N','A','L','S'),
+	GF_PROP_PCK_FILENUM = GF_4CC('F','N','U','M'),
+	GF_PROP_PCK_FILENAME = GF_4CC('F','N','A','M'),
+	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_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'),
+	GF_PROP_PID_MAX_CTS_OFFSET = GF_4CC('M','C','T','O'),
+	GF_PROP_PID_CONSTANT_DURATION = GF_4CC('S','C','T','D'),
+	GF_PROP_PID_ISOM_TRACK_TEMPLATE = GF_4CC('I','T','K','T'),
+	GF_PROP_PID_ISOM_TREX_TEMPLATE = GF_4CC('I','T','X','T'),
+	GF_PROP_PID_ISOM_STSD_TEMPLATE = GF_4CC('I','S','T','D'),
+	GF_PROP_PID_ISOM_UDTA = GF_4CC('I','M','U','D'),
+	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_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'),
+	GF_PROP_PID_REP_ID = GF_4CC('D','R','I','D'),
+	GF_PROP_PID_AS_ID = GF_4CC('D','A','I','D'),
+	GF_PROP_PID_MUX_SRC = GF_4CC('M','S','R','C'),
+	GF_PROP_PID_DASH_MODE = GF_4CC('D','M','O','D'),
+	GF_PROP_PID_DASH_DUR = GF_4CC('D','D','U','R'),
+	GF_PROP_PID_DASH_MULTI_PID = GF_4CC('D','M','S','D'),
+	GF_PROP_PID_DASH_MULTI_PID_IDX = GF_4CC('D','M','S','I'),
+	GF_PROP_PID_DASH_MULTI_TRACK = GF_4CC('D','M','T','K'),
+	GF_PROP_PID_ROLE = GF_4CC('R','O','L','E'),
+	GF_PROP_PID_PERIOD_DESC = GF_4CC('P','D','E','S'),
+	GF_PROP_PID_AS_COND_DESC = GF_4CC('A','C','D','S'),
+	GF_PROP_PID_AS_ANY_DESC = GF_4CC('A','A','D','S'),
+	GF_PROP_PID_REP_DESC = GF_4CC('R','D','E','S'),
+	GF_PROP_PID_BASE_URL = GF_4CC('B','U','R','L'),
+	GF_PROP_PID_TEMPLATE = GF_4CC('D','T','P','L'),
+	GF_PROP_PID_START_NUMBER = GF_4CC('D','R','S','N'),
+	GF_PROP_PID_XLINK = GF_4CC('X','L','N','K'),
+	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_DASH_CUE = GF_4CC('D','C','U','E'),
+	GF_PROP_PID_DASH_SEGMENTS = GF_4CC('D','C','N','S'),
+	GF_PROP_PID_SINGLE_SCALE = GF_4CC('D','S','T','S'),
+	GF_PROP_PID_UDP = GF_4CC('P','U','D','P'),
+
+	GF_PROP_PID_PRIMARY_ITEM = GF_4CC('P','I','T','M'),
+
+	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_CHROMALOC = GF_4CC('C','L','O','C'),
+	GF_PROP_PID_COLR_SPACE = GF_4CC('C','S','P','C'),
+	GF_PROP_PID_SRC_MAGIC = GF_4CC('P','S','M','G'),
+	GF_PROP_PID_TRACK_INDEX = GF_4CC('T','I','D','X'),
+	GF_PROP_NO_TS_LOOP = GF_4CC('N','T','S','L'),
+	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_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'),
+	//internal property indicating pointer to associated GF_DownloadSession
+	GF_PROP_PID_DOWNLOAD_SESSION = GF_4CC('G','H','T','T')
+};
+
+/*! Block patching requirements for FILE pids, as signaled by GF_PROP_PID_DISABLE_PROGRESSIVE
+ 	\hideinitializer
+*/
+enum
+{
+	GF_PID_FILE_PATCH_NONE = 0,
+	GF_PID_FILE_PATCH_REPLACE = 1,
+	GF_PID_FILE_PATCH_INSERT = 2,
+};
+
+/*! Gets readable name of built-in property
+\param prop_4cc property built-in 4cc
+\return readable name
+*/
+const char *gf_props_4cc_get_name(u32 prop_4cc);
+
+/*! Gets property type of built-in property
+\param prop_4cc property built-in 4cc
+\return property name
+*/
+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
+\return GF_TRUE if properties are equal, GF_FALSE otherwise
+*/
+Bool gf_props_equal(const GF_PropertyValue *p1, const GF_PropertyValue *p2);
+
+/*! Gets the readable name for a property type
+\param type property type
+\return readable name
+*/
+const char *gf_props_get_type_name(GF_PropType type);
+
+/*! Gets the description for a property type
+\param type property type
+\return description
+*/
+const char *gf_props_get_type_desc(GF_PropType type);
+
+/*! Gets the description type for a given  property type name
+\param name property type name
+\return property type or GF_PROP_FORBIDEN
+*/
+GF_PropType gf_props_parse_type(const char *name);
+
+
+/*! 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
+\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);
+
+/*! Maximum string size to use when dumping a property*/
+#define GF_PROP_DUMP_ARG_SIZE	100
+
+/*! 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 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);
+
+/*! 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
+\return string
+*/
+const char *gf_props_dump(u32 p4cc, const GF_PropertyValue *att, char dump[GF_PROP_DUMP_ARG_SIZE], Bool dump_data);
+
+/*! Resets a property value, freeing allocated data or strings depending on the property type
+\param prop property 4CC
+*/
+void gf_props_reset_single(GF_PropertyValue *prop);
+
+/*! Property aplies only to packets */
+#define GF_PROP_FLAG_PCK 1
+/*! Property is optional for GPAC GSF serialization (not transmitted over network when property removal is enabled) */
+#define GF_PROP_FLAG_GSF_REM 1<<1
+
+/*! Structure describing a built-in property in GPAC*/
+typedef struct {
+	/*! identifier (4CC) */
+	u32 type;
+	/*! name */
+	const char *name;
+	/*! description */
+	const char *description;
+	/*! data type  (uint, float, etc ..) */
+	u8 data_type;
+	/*! flags for the property */
+	u8 flags;
+} GF_BuiltInProperty;
+
+/*! Gets property description
+\param prop_idx built-in property index, starting from 0
+\return associated property description or NULL if property was not found
+*/
+const GF_BuiltInProperty *gf_props_get_description(u32 prop_idx);
+
+/*! Gets built-in property 4CC from name
+\param name built-in property name
+\return built-in property 4CC or 0 if not found
+*/
+u32 gf_props_get_id(const char *name);
+
+/*! Gets flags of built-in property
+\param prop_4cc built-in property 4CC
+\return built-in property flags, 0 if not found
+*/
+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 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 */
+#define PROP_LONGUINT(_val) (GF_PropertyValue){.type=GF_PROP_LUINT, .value.longuint = _val}
+/*! Helper macro to set boolean property */
+#define PROP_BOOL(_val) (GF_PropertyValue){.type=GF_PROP_BOOL, .value.boolean = _val}
+/*! Helper macro to set fixed-point number property */
+#define PROP_FIXED(_val) (GF_PropertyValue){.type=GF_PROP_FLOAT, .value.fnumber = _val}
+/*! Helper macro to set float property */
+#define PROP_FLOAT(_val) (GF_PropertyValue){.type=GF_PROP_FLOAT, .value.fnumber = FLT2FIX(_val)}
+/*! Helper macro to set 32-bit fraction property from integers*/
+#define PROP_FRAC_INT(_num, _den) (GF_PropertyValue){.type=GF_PROP_FRACTION, .value.frac.num = _num, .value.frac.den = _den}
+/*! Helper macro to set 32-bit fraction property*/
+#define PROP_FRAC(_val) (GF_PropertyValue){.type=GF_PROP_FRACTION, .value.frac = _val }
+/*! Helper macro to set 64-bit fraction property from integers*/
+#define PROP_FRAC64(_val) (GF_PropertyValue){.type=GF_PROP_FRACTION64, .value.lfrac = _val}
+/*! Helper macro to set 64-bit fraction property*/
+#define PROP_FRAC64_INT(_num, _den) (GF_PropertyValue){.type=GF_PROP_FRACTION64, .value.lfrac.num = _num, .value.lfrac.den = _den}
+/*! Helper macro to set double property */
+#define PROP_DOUBLE(_val) (GF_PropertyValue){.type=GF_PROP_DOUBLE, .value.number = _val}
+/*! Helper macro to set string property */
+#define PROP_STRING(_val) (GF_PropertyValue){.type=GF_PROP_STRING, .value.string = (char *) _val}
+/*! Helper macro to set string property without string copy (string memory is owned by filter) */
+#define PROP_STRING_NO_COPY(_val) (GF_PropertyValue){.type=GF_PROP_STRING_NO_COPY, .value.string = _val}
+/*! Helper macro to set name property */
+#define PROP_NAME(_val) (GF_PropertyValue){.type=GF_PROP_NAME, .value.string = _val}
+/*! Helper macro to set data property */
+#define PROP_DATA(_val, _len) (GF_PropertyValue){.type=GF_PROP_DATA, .value.data.ptr = _val, .value.data.size=_len}
+/*! Helper macro to set data property without data copy ( memory is owned by filter) */
+#define PROP_DATA_NO_COPY(_val, _len) (GF_PropertyValue){.type=GF_PROP_DATA_NO_COPY, .value.data.ptr = _val, .value.data.size =_len}
+/*! Helper macro to set const data property */
+#define PROP_CONST_DATA(_val, _len) (GF_PropertyValue){.type=GF_PROP_CONST_DATA, .value.data.ptr = _val, .value.data.size = _len}
+/*! Helper macro to set 2D float vector property */
+#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*/
+#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 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 */
+#define PROP_VEC4I_INT(_x, _y, _z, _w) (GF_PropertyValue){.type=GF_PROP_VEC4I, .value.vec4i.x = _x, .value.vec4i.y = _y, .value.vec4i.z = _z, .value.vec4i.w = _w}
+/*! Helper macro to set pointer property */
+#define PROP_POINTER(_val) (GF_PropertyValue){.type=GF_PROP_POINTER, .value.ptr = (void*)_val}
+
+
+/*! @} */
+
+
+
+
+/*!
+\addtogroup fs_evt Filter Events
+\ingroup filters_grp
+\brief Filter Events
+
+PIDs may receive commands and may emit messages using this system.
+
+Events may flow downwards (towards the source), in which case they are commands, or upwards (towards the sink), in which case they are informative event.
+
+A filter not implementing a process_event will result in the event being forwarded down to all input PIDs or up to all output PIDs.
+
+A filter may decide to cancel an event, in which case the event is no longer forwarded down/up the chain.
+
+GF_FEVT_PLAY, GF_FEVT_STOP and GF_FEVT_SOURCE_SEEK events will trigger a reset of PID buffers.
+
+A GF_FEVT_PLAY event on a PID already playing is discarded.
+
+A GF_FEVT_STOP event on a PID already stopped is discarded.
+
+GF_FEVT_PLAY and GF_FEVT_SET_SPEED events will trigger larger (abs(speed)>1) or smaller (abs(speed)<1) PID buffer limit in blocking mode.
+
+GF_FEVT_STOP and GF_FEVT_SOURCE_SEEK events are filtered to reset the PID buffers.
+
+@{
+ */
+
+/*! Filter event types */
+typedef enum
+{
+	/*! PID control, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
+	GF_FEVT_PLAY = 1,
+	/*! PID speed control, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
+	GF_FEVT_SET_SPEED,
+	/*! PID control, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
+	GF_FEVT_STOP,
+	/*! PID pause, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
+	GF_FEVT_PAUSE,
+	/*! PID resume, usually triggered by sink - see \ref GF_FilterPidPlaybackMode*/
+	GF_FEVT_RESUME,
+	/*! PID source seek, allows seeking in bytes the source*/
+	GF_FEVT_SOURCE_SEEK,
+	/*! PID source switch, allows a source filter to switch its source URL for the same protocol*/
+	GF_FEVT_SOURCE_SWITCH,
+	/*! DASH segment size info, sent down from muxers to manifest generators*/
+	GF_FEVT_SEGMENT_SIZE,
+	/*! Scene attach event, sent down from compositor to filters (BIFS/OD/timedtext/any scene-related) to share the scene (resources and node graph)*/
+	GF_FEVT_ATTACH_SCENE,
+	/*! Scene reset event, sent down from compositor to filters (BIFS/OD/timedtext/any scene-related) to indicate scene reset (resources and node graph). This is a direct filter call, only sent processed by filters running on the main thread*/
+	GF_FEVT_RESET_SCENE,
+	/*! quality switching request event, helps filters decide how to adapt their processing*/
+	GF_FEVT_QUALITY_SWITCH,
+	/*! visibility hint event, helps filters decide how to adapt their processing*/
+	GF_FEVT_VISIBILITY_HINT,
+	/*! special event type sent to a filter whenever the PID info properties have been modified. No cancel because no forward - cf \ref gf_filter_pid_set_info. A filter returning GF_TRUE on this event will prevent info update notification on the destination filters*/
+	GF_FEVT_INFO_UPDATE,
+	/*! buffer requirement event. This event is NOT sent to filters, it is internaly processed by the filter session. Filters may however send this
+	event to indicate their buffereing preference (real-time sinks mostly)*/
+	GF_FEVT_BUFFER_REQ,
+	/*! filter session capability change, sent whenever global capabilities (max width, max heoght, ... ) are changed*/
+	GF_FEVT_CAPS_CHANGE,
+	/*! inidicates the PID could not be connected - the PID passed is an output PID of the filter, no specific event structure is associated*/
+	GF_FEVT_CONNECT_FAIL,
+	/*! user event, sent from compositor/vout down to filters*/
+	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*/
+	GF_FEVT_FILE_DELETE,
+} GF_FEventType;
+
+/*! type: the type of the event*/
+/*! on_pid: PID to which the event is targeted. If NULL the event is targeted at the whole filter */
+#define FILTER_EVENT_BASE \
+	GF_FEventType type; \
+	GF_FilterPid *on_pid; \
+	\
+
+
+/*! Macro helper for event structure initializing*/
+#define GF_FEVT_INIT(_a, _type, _on_pid)	{ memset(&_a, 0, sizeof(GF_FilterEvent)); _a.base.type = _type; _a.base.on_pid = _on_pid; }
+
+/*! Base type of events. All events start with the fields defined in \ref FILTER_EVENT_BASE*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+} GF_FEVT_Base;
+
+/*! Event structure for GF_FEVT_PLAY, GF_FEVT_SET_SPEED*/
+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*/
+	Double speed;
+
+	/*! 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*/
+	u8 hw_buffer_reset;
+	/*! params for 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
+		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*/
+	u8 full_file_only;
+	/*! indicates any current download should be aborted*/
+	u8 forced_dash_segment_switch;
+	/*! 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
+	(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;
+
+/*! Event structure for GF_FEVT_SOURCE_SEEK and GF_FEVT_SOURCE_SWITCH*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+
+	/*! start offset in source*/
+	u64 start_offset;
+	/*! end offset in source*/
+	u64 end_offset;
+	/*! 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*/
+	u8 skip_cache_expiration;
+	/*! hint block size for source, might not be respected*/
+	u32 hint_block_size;
+} GF_FEVT_SourceSeek;
+
+/*! Event structure for GF_FEVT_SEGMENT_SIZE*/
+typedef struct
+{
+	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*/
+	u64 media_range_end;
+	/*! index start range in segment file*/
+	u64 idx_range_start;
+	/*! index end range in segment file*/
+	u64 idx_range_end;
+} GF_FEVT_SegmentSize;
+
+/*! 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
+{
+	FILTER_EVENT_BASE
+	/*! Pointer to a GF_ObjectManager structure for this PID*/
+	void *object_manager;
+} GF_FEVT_AttachScene;
+
+/*! Event structure for GF_FEVT_QUALITY_SWITCH*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+
+	/*! switch quality up or down */
+	Bool up;
+	/*! 0: current group, otherwise index of the depending_on group */
+	u32 dependent_group_index;
+	/*! index of the quality to switch, as indicated in "has:qualities" property. If < 0, sets to automatic quality switching*/
+	s32 q_idx;
+	/*! 1+tile mode adaptation (does not change other selections) */
+	u32 set_tile_mode_plus_one;
+	/*! quality degradation hint, between 0 (full quality) and 100 (lowest quality, stream not currently rendered)*/
+	u32 quality_degradation;
+} GF_FEVT_QualitySwitch;
+
+/*! Event structure for GF_FEVT_USER*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+	/*! GF_Event structure*/
+	GF_Event event;
+} GF_FEVT_Event;
+
+/*! Event structure for GF_FEVT_FILE_DELETE*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+	/*! URL to delete*/
+	const char *url;
+} GF_FEVT_FileDelete;
+
+/*! Event structure for GF_FEVT_VISIBILITY_HINT*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+	/*! gives minimun and maximum coordinates of the visible rectangle associated with channels. min_x may be greater than max_x in case of 360 videos */
+	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;
+
+
+/*! Event structure for GF_FEVT_BUFFER_REQ*/
+typedef struct
+{
+	FILTER_EVENT_BASE
+	/*! 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
+	*/
+	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
+	*/
+	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*/
+union __gf_filter_event
+{
+	GF_FEVT_Base base;
+	GF_FEVT_Play play;
+	GF_FEVT_SourceSeek seek;
+	GF_FEVT_AttachScene attach_scene;
+	GF_FEVT_Event user_event;
+	GF_FEVT_QualitySwitch quality_switch;
+	GF_FEVT_VisibililityHint visibility_hint;
+	GF_FEVT_BufferRequirement buffer_req;
+	GF_FEVT_SegmentSize seg_size;
+	GF_FEVT_FileDelete file_del;
+};
+
+/*! Gets readable name for event type
+\param type type of the event
+\return readable name of the event
+*/
+const char *gf_filter_event_name(GF_FEventType type);
+
+/*! @} */
+
+
+/*!
+\addtogroup fs_filter Filter
+\ingroup filters_grp
+\brief Filter
+
+
+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.
+
+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.
+
+Capabilities are used to check if a filter can be connected to a given input PID, or if two filters can be directly connected (capability match).
+
+Capabilities are organized in so-called bundles, gathering the caps that shall be present or not present in the PID / connecting filter. Typically a capability bundle
+will contain a stream type for input a stream type for output, a codec id for input and a codec id for output.
+
+Several capability bundles can be used if needed. A good example is the writegen filter in GPAC, which simply transforms a sequence of media frames into a raw file, hence converts
+stream_type/codecID to file extension and MIME type - cf gpac/src/filters/write_generic.c
+
+When resolving a chain, PID properties are checked against these capabilities. If a property of the same type exists in the PID than in the capability,
+it must match the capability requirement (equal, excluded). If no property exists for a given non-optional capability type,
+ the bundle is marked as not matching and the ext capability bundle in the filter is checked.
+ A PID property not listed in any capability of the filter does not impact the matching.
+
+The GF_PROP_PID_FILE_EXT and GF_PROP_PID_MIME are handled as alternate to each other, this allows matching a PID if either its MIME or extension map and avoids failing if the pid has no MIME or extension set.
+@{
+ */
+
+
+/*! Structure holding arguments for a filter*/
+typedef enum
+{
+	/*! used for GUI config: regular argument type */
+	GF_FS_ARG_HINT_NORMAL = 0,
+	/*! used for GUI config: advanced argument type */
+	GF_FS_ARG_HINT_ADVANCED = 1<<1,
+	/*! used for GUI config: expert argument type */
+	GF_FS_ARG_HINT_EXPERT = 1<<2,
+	/*! used for GUI config: hidden argument type */
+	GF_FS_ARG_HINT_HIDE = 1<<3,
+	/*! if set indicates that the argument is updatable. If so, the value will be changed if offset_in_private is valid, and the update_args function will be called if not NULL*/
+	GF_FS_ARG_UPDATE = 1<<4,
+	/*! used by meta filters (ffmpeg & co) to indicate the parsing is handled by the filter in which case the type is overloaded to string and passed to the update_args function*/
+	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,
+} GF_FSArgumentFlags;
+
+/*! Structure holding arguments for a filter*/
+typedef struct
+{
+	/*! argument name. Naming conventions:
+		- only use lowercase
+		- keep short and avoid '_'
+	*/
+	const char *arg_name;
+	/*! offset of the argument in the structure, -1 means not exposed/stored in structure, in which case it is notified through the update_arg function.
+	The offset is casted into the corresponding property value of the argument type*/
+	s32 offset_in_private;
+	/*! description of argument. Format conventions:
+		- first letter is lowercase except if it is an acronym (eg, 'IP').
+		- description does not end with a '.'; multiple sentences are however allowed with '.' separators.
+		- description does not end with a new line CR or LF; multiple sentences are however allowed with '.' separators.
+		- keep it short. If too long, use " - see filter help" and put description in filter help.
+		- only use markdown '`' and '*', except for enumeration lists which shall use "- ".
+		- do not use CR/LF in description except to start enum types description.
+		- use infinitive (eg \"set foo to bar\" and not \"sets foo to bar\").
+		- Enumerations should be described as:
+		 		sentence(s)'\n' (no '.' nor ':' at end)
+		 		- name1: val'\n' (no '.' at end)
+		 		- nameN: val (no '.' nor '\n' at end of last value description)
+			and enum value description order shall match enum order
+		- links are allowed, see GF_FilterRegister doc
+	*/
+	const char *arg_desc;
+	/*! type of argument - this is a property type*/
+	GF_PropType arg_type;
+	/*! default value of argument, can be NULL (for number types, value 0 for each dimension of the type is assumed)*/
+	const char *arg_default_val;
+	/*! string describing an enum (unsigned integer type) or a min/max value.
+		For min/max, the syntax is "min,max", with -I = -infinity and +I = +infinity
+		For enum, the syntax is "a|b|...", resoling in a=0, b=1,... To skip a value insert '|' eg "|a|b" resolves to a=1, b=2, "a||b" resolves to a=0, b=2
+
+		Naming conventions for enumeration:
+			- use single word
+			- use lowercase escept for single/double characters name (eg 'A', 'V').
+	*/
+	const char *min_max_enum;
+	/*! set of argument flags*/
+	GF_FSArgumentFlags flags;
+} GF_FilterArgs;
+
+/*! Shortcut macro to assign singed integer capability type*/
+#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 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*/
+#define CAP_LUINT(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_LUINT, .value.longuint = _b}, .flags=(_f) }
+/*! Shortcut macro to assign boolean capability type*/
+#define CAP_BOOL(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_BOOL, .value.boolean = _b}, .flags=(_f) }
+/*! Shortcut macro to assign fixed-point number capability type*/
+#define CAP_FIXED(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_FLOAT, .value.fnumber = _b}, .flags=(_f) }
+/*! Shortcut macro to assign float capability type*/
+#define CAP_FLOAT(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_FLOAT, .value.fnumber = FLT2FIX(_b)}, .flags=(_f) }
+/*! Shortcut macro to assign 32-bit fraction capability type*/
+#define CAP_FRAC_INT(_f, _a, _b, _c) { .code=_a, .val={.type=GF_PROP_FRACTION, .value.frac.num = _b, .value.frac.den = _c}, .flags=(_f) }
+/*! Shortcut macro to assign 32-bit fraction capability type from integers*/
+#define CAP_FRAC(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_FRACTION, .value.frac = _b}, .flags=(_f) }
+/*! Shortcut macro to assign double capability type*/
+#define CAP_DOUBLE(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_DOUBLE, .value.number = _b}, .flags=(_f) }
+/*! Shortcut macro to assign name (const string) capability type*/
+#define CAP_NAME(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_NAME, .value.string = _b}, .flags=(_f) }
+/*! Shortcut macro to assign string capability type*/
+#define CAP_STRING(_f, _a, _b) { .code=_a, .val={.type=GF_PROP_STRING, .value.string = _b}, .flags=(_f) }
+/*! Shortcut macro to assign unsigned integer capability type with capability priority*/
+#define CAP_UINT_PRIORITY(_f, _a, _b, _p) { .code=_a, .val={.type=GF_PROP_UINT, .value.uint = _b}, .flags=(_f), .priority=_p}
+
+/*! Flags for filter capabilities*/
+enum
+{
+	/*! when not set, indicates the start of a new set of capabilities. Set by default by the generic GF_CAPS_* */
+	GF_CAPFLAG_IN_BUNDLE = 1,
+	/*!  if set this is an input capability of the bundle*/
+	GF_CAPFLAG_INPUT = 1<<1,
+	/*!  if set this is an output capability of the bundle. A capability can be declared both as input and output. For example stream type is usually the same on both inputs and outputs*/
+	GF_CAPFLAG_OUTPUT = 1<<2,
+	/*!  when set, the capability is valid if the value does not match. If an excluded capability is not found in the destination PID, it is assumed to match*/
+	GF_CAPFLAG_EXCLUDED = 1<<3,
+	/*! when set, the capability is validated only for filter loaded for this destination filter*/
+	GF_CAPFLAG_LOADED_FILTER = 1<<4,
+	/*! Only used for output capabilities, indicates that this capability applies to all bundles. This avoids repeating capabilities common to all bundles by setting them only in the first*/
+	GF_CAPFLAG_STATIC = 1<<5,
+	/*! Only used for input capabilities, indicates that this capability is optional in the input PID */
+	GF_CAPFLAG_OPTIONAL = 1<<6,
+};
+
+/*! Shortcut macro to set for input capability flags*/
+#define GF_CAPS_INPUT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT)
+/*! Shortcut macro to set for optional input capability flags*/
+#define GF_CAPS_INPUT_OPT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_OPTIONAL)
+/*! Shortcut macro to set for static input capability flags*/
+#define GF_CAPS_INPUT_STATIC	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_STATIC)
+/*! Shortcut macro to set for static optional input capability flags*/
+#define GF_CAPS_INPUT_STATIC_OPT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_STATIC|GF_CAPFLAG_OPTIONAL)
+/*! Shortcut macro to set for excluded input capability flags*/
+#define GF_CAPS_INPUT_EXCLUDED	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_EXCLUDED)
+/*! Shortcut macro to set for input for loaded filter only capability flags*/
+#define GF_CAPS_INPUT_LOADED_FILTER	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_INPUT|GF_CAPFLAG_LOADED_FILTER)
+/*! Shortcut macro to set for output capability flags*/
+#define GF_CAPS_OUTPUT	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT)
+/*! Shortcut macro to set for output for loaded filter only capability flags*/
+#define GF_CAPS_OUTPUT_LOADED_FILTER	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_LOADED_FILTER)
+/*! Shortcut macro to set for excluded output capability flags*/
+#define GF_CAPS_OUTPUT_EXCLUDED	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_EXCLUDED)
+/*! Shortcut macro to set for static output capability flags*/
+#define GF_CAPS_OUTPUT_STATIC	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_STATIC)
+/*! Shortcut macro to set for excluded static output capability flags*/
+#define GF_CAPS_OUTPUT_STATIC_EXCLUDED	(GF_CAPFLAG_IN_BUNDLE|GF_CAPFLAG_OUTPUT|GF_CAPFLAG_EXCLUDED|GF_CAPFLAG_STATIC)
+/*! Shortcut macro to set for input and output capability flags*/
+#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)
+
+/*! Filter capability description*/
+typedef struct
+{
+	/*! 4cc of the capability listed. This shall be 0 or the type of a built-in property */
+	u32 code;
+	/*! default type and value of the capability listed*/
+	GF_PropertyValue val;
+	/*! name of the capability listed, NULL if code is set. The special value * is used to indicate that the capability is solved at runtime (the filter must be loaded)*/
+	const char *name;
+	/*! Flags of the capability*/
+	u32 flags;
+	/*! overrides the filter register priority for this capability. Usually 0*/
+	u8 priority;
+} GF_FilterCapability;
+
+/*! Filter session capability structure*/
+typedef struct
+{
+	u32 max_screen_width;
+	u32 max_screen_height;
+	u32 max_screen_bpp;
+	u32 max_screen_fps;
+	u32 max_screen_nb_views;
+	u32 max_audio_channels;
+	u32 max_audio_sample_rate;
+	u32 max_audio_bit_depth;
+} GF_FilterSessionCaps;
+
+/*! Gets filter session capability
+\param filter source of the query - avoids fetching the filter session object
+\param caps pointer filled with caps
+*/
+void gf_filter_get_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps);
+
+/*! Sets filter session capability
+\param filter source of the query - avoids fetching the filter session object
+\param caps session capability new values - completely replace the old ones
+*/
+void gf_filter_set_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps);
+
+/*! 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*/
+	GF_FPROBE_MAYBE_SUPPORTED,
+	/*! (de)mux format is supported*/
+	GF_FPROBE_SUPPORTED,
+	/*! demux format should be handled by this filter*/
+	GF_FPROBE_FORCE,
+	/*! used by demux formats not supporting data prober*/
+	GF_FPROBE_EXT_MATCH,
+} GF_FilterProbeScore;
+
+/*! Quick macro for assigning the capability arrays to the register structure*/
+#define SETCAPS( __struct ) .caps = __struct, .nb_caps=sizeof(__struct)/sizeof(GF_FilterCapability)
+
+#ifndef GPAC_DISABLE_DOC
+/*! Macro for assigning filter register description*/
+#define GF_FS_SET_DESCRIPTION(_desc) .description = _desc,
+/*! Macro for assigning filter register author*/
+#define GF_FS_SET_AUTHOR(_author) .author = _author,
+/*! Macro for assigning filter register help*/
+#define GF_FS_SET_HELP(_help) .help = _help,
+/*! Macro for assigning filter register argument types and description*/
+#define GF_FS_DEF_ARG(_name, _offset, _desc, _type, _default, _enum, _flags) { _name, _offset, _desc, _type, _default, _enum, _flags }
+#else
+#define GF_FS_SET_DESCRIPTION(_desc)
+#define GF_FS_SET_AUTHOR(_author)
+#define GF_FS_SET_HELP(_help)
+#define GF_FS_SET_ARGHELP(_help)
+#define GF_FS_DEF_ARG(_name, _offset, _desc, _type, _default, _enum, _flags) {_name, _offset, _type, _default, _enum, _flags}
+#endif
+
+/*! Filter register flags*/
+typedef enum
+{
+	/*! when set indicates all calls shall take place in the main thread (running GL output) - to be refined*/
+	GF_FS_REG_MAIN_THREAD = 1<<1,
+	/*! when set indicates the initial call to configure_pid will happen in the main thread. This is typically called by decoders requiring
+	a GL context (currently only in main thread) upon init, but not requiring it for the decode. Such decoders get their GL frames mapped
+	(through get_gl_texture callback) in the main GL thread*/
+	GF_FS_REG_CONFIGURE_MAIN_THREAD = 1<<2,
+	/*! when set indicates the filter does not take part of dynamic filter chain resolution and can only be used by explicitly loading the filter*/
+	GF_FS_REG_EXPLICIT_ONLY = 1<<3,
+	/*! when set ignores the filter weight during link resolution - this is typically needed by decoders requiring a specific reframing so that the weight of the reframer+decoder is the same as the weight of other decoders*/
+	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 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)*/
+	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.
+		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,
+
+	/*! flag dynamically set at runtime for registries loaded through shared libraries*/
+	GF_FS_REG_DYNLIB = 0x80000000
+} GF_FSRegisterFlags;
+
+/*! The filter register. Registries are loaded once at the start of the session and shall never be modified after that.
+If capabilities need to be changed for a specific filter, use \ref gf_filter_override_caps*/
+struct __gf_filter_register
+{
+	/*! mandatory - name of the filter as used when setting up filters. Naming conventions:
+		- shall not contain any space (breaks filter lookup)
+		- should use lowercase
+		- should not use '_'
+	*/
+	const char *name;
+	/*! optional - size of private stack structure. The structure is allocated by the framework and arguments are setup before calling any of the filter functions*/
+	u32 private_size;
+	/*! indicates the max number of additional input PIDs - muxers and scalable filters typically set this to (u32) -1. A value of 0 implies the filter can only handle one PID*/
+	u32 max_extra_pids;
+	/*! set of register flags*/
+	GF_FSRegisterFlags flags;
+
+	/*! list of PID capabilities*/
+	const GF_FilterCapability *caps;
+	/*! number of PID capabilities*/
+	u32 nb_caps;
+
+	/*! optional - filter arguments if any*/
+	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.
+	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.
+
+	A filter may return GF_EOS to indicate no more data is expected to be produced by this filter
+
+	A filter may return GF_PROFILE_NOT_SUPPORTED to indicate that the filter is not supported (when unable to detect this at configure) and trigger a relink of the filter graph unless disabled at session level.
+	*/
+	GF_Err (*process)(GF_Filter *filter);
+
+	/*! optional for sources, mandatory for filters and sinks - 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)
+
+	\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.
+	*/
+	GF_Err (*configure_pid)(GF_Filter *filter, GF_FilterPid *PID, Bool is_remove);
+
+	/*! optional - callback for filter initialization -  private stack of filter is allocated by framework)
+	\param filter the target filter
+	\return error if any. A filter may return GF_EOS to indicate the filter session shall not be run, but that no error should be thrown (used by dasher in realtime regulation mode)
+	*/
+	GF_Err (*initialize)(GF_Filter *filter);
+
+	/*! optional - callback for filter desctruction -  private stack of filter is freed by framework
+	\param filter the target filter
+	*/
+	void (*finalize)(GF_Filter *filter);
+
+	/*! 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 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
+	\param arg_name the name of the argument being set
+	\param new_val the value of the argument being set
+	\return error if any, GF_NOT_FOUND to silently disable argument value change.
+	*/
+	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.
+	\param filter the target filter
+	\param evt the event to process
+	\return GF_TRUE if the event should be canceled, GF_FALSE otherwise
+	*/
+	Bool (*process_event)(GF_Filter *filter, const GF_FilterEvent *evt);
+
+	/*! optional - Called whenever an output PID needs format renegotiaition. If not set, a filter chain will be loaded to solve the negotiation
+
+	\param filter the target filter
+	\param PID the filter output PID being reconfigured
+	\return error code if any
+	*/
+	GF_Err (*reconfigure_output)(GF_Filter *filter, GF_FilterPid *PID);
+
+	/*! optional, mostly used for source filters and destination filters - probe the given URL, returning a score.
+	This function is called before opening the source (no data received yet)
+
+	\param url the url of the source to probe, never NULL.
+	\param mime the MIME type of the source to probe. Can be NULL if mime not available at probe type
+	\return probe score
+	*/
+	GF_FilterProbeScore (*probe_url)(const char *url, const char *mime);
+
+	/*! 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.
+	\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
+	\return mime type of content, list of known extensions for the format if score is set to GF_FPROBE_EXT_MATCH, or NULL if not detected.
+	*/
+	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*/
+	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
+
+	\param session the filter session
+	\param freg the filter register to destroy
+	*/
+	void (*register_free)(GF_FilterSession *session, struct __gf_filter_register *freg);
+	/*! user data of register loader, not inspected/modified by filter session*/
+	void *udta;
+
+	/*! optional. Used by sink filters offering multiple sink support
+		GPAC instantiates filter chains based on filter capabilities and arguments of source and destination. When a sink/destination filter can handle
+		multiple file inputs of various formats/types, temporary filters called alias are needed to instantiate the proper chain.
+		If the return value is true, an alias filter of the same type as this filter will be created with the proper arguments and initialized (in order to modify the
+		 alias filter capabilities if needed), and finalized when no longer needed. All other callbacks will however be made on the main filter, not the alias.
+
+		A good example is HTTP output of a DASH session:
+		- the first PID will be a FILE stream for the manifest (MPD, M3U8), and the http output capabilities will be set to accept the manifest file extension.mime
+		- the other PIDs will be media PIDs (mp4, ts, mkv ...) and won't match the filter instance, creating a new instance which we don't want
+
+		By creating filter alias, a temprary HTTP output (alias) will be created, holding the arguments for the chain (including destination type). Overloading the alias filter capabilities
+		with the desired file extension or MIME will trigger the proper chain resolution. The alias will be switched to the final filter upon connecting the PIDs
+
+		To access original arguments of the chain, see \ref gf_filter_pid_get_alias_udta
+		To check if an initialize callback targets the main filter or the temporary one, see \ref gf_filter_is_alias
+	\param filter the target filter
+	\param url the url of the target destination, never NULL.
+	\param mime the MIME type of the target destination. Can be NULL if mime not available
+	\return GF_TRUE if this filter instance should be used to handle the given URL, in which case an alias filter will be created
+	*/
+	Bool (*use_alias)(GF_Filter *filter, const char *url, const char *mime);
+
+
+	/*! 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).
+	*/
+	const char *version;
+#ifndef GPAC_DISABLE_DOC
+	/*! short description of the filter. Conventions:
+		- should be small (used to generate UI / documentation)
+		- Should be Capitalized
+		- shall not use markdown
+		- shall be single line
+	*/
+	const char *description;
+	/*! author of the filter. Conventions:
+		- 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)
+	*/
+	const char *author;
+	/*! help of the filter. Conventions:
+		- describe any non-obvious behaviour 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:
+		 		- "[-OPT]()": link to self page for option OPT
+		 		- "[-OPT](LINK)": link to other page for option OPT.
+			LINK can be:
+				- GPAC: resolves to general GPAC help
+				- CORE: resolves to general CORE help
+				- LOG: resolves to general LOG help
+				- ANY: resolves to filter with register name 'ANY'
+
+			Note that [text](ANY) with ANY a filter register name will link to that filter help page
+	*/
+	const char *help;
+#endif
+};
+
+
+/*! Gets filter private stack - the stack is allocated and freed by the filter session, as are any arguments. The rest is up to the filter to delete it
+\param filter target filter
+\return filter private stack if any, NULL otherwise
+*/
+void *gf_filter_get_udta(GF_Filter *filter);
+
+/*! Sets filter name - mostly used for logging purposes
+\param filter target filter
+\param name new name to assign. If NULL, name is reset to register name
+*/
+void gf_filter_set_name(GF_Filter *filter, const char *name);
+
+/*! Gets filter name
+\param filter target filter
+\return name of the filter
+*/
+const char *gf_filter_get_name(GF_Filter *filter);
+
+/*! Makes the filter sticky. A sticky filter is not removed when all its input PIDs are disconnected. Typically used by the player
+\param filter target filter
+*/
+void gf_filter_make_sticky(GF_Filter *filter);
+
+/*! Return the number of queued events on the filter. Events are not aggregated, some filter may want to wait until all events are processed before taking actions. The function recursively goes up the filter chain and count queued events.
+\param filter target filter
+\return number of queued events
+*/
+u32 gf_filter_get_num_events_queued(GF_Filter *filter);
+
+/*! Returns the single instance of GPAC download manager. DO NOT DESTROY IT!!
+\param filter target filter
+\return the GPAC download manager
+*/
+GF_DownloadManager *gf_filter_get_download_manager(GF_Filter *filter);
+
+/*! Returns the single instance of GPAC font manager. DO NOT DESTROY IT!!
+\param filter target filter
+\return the GPAC font manager
+*/
+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
+\param filter target filter
+\param us_until_next number of microseconds to wait before recalling this task
+*/
+void gf_filter_ask_rt_reschedule(GF_Filter *filter, u32 us_until_next);
+
+/*! Posts a filter process task to the parent session. This is needed for some filters not having any input packets to process but still needing to work
+such as decoder flushes, servers, etc... The filter session will ignore this call if the filter is already scheduled for processing
+\param filter target filter
+*/
+void gf_filter_post_process_task(GF_Filter *filter);
+
+/*! Posts a task to the session scheduler. This task is not a process task but the filter will still be called by a single thread at any time (ie, might delay process)
+\param filter target filter
+\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 udta user data passed back to the task function
+\param task_name name of the task for logging purposes
+\return error code if failure
+*/
+GF_Err gf_filter_post_task(GF_Filter *filter, Bool (*task_execute) (GF_Filter *filter, void *callback, u32 *reschedule_ms), void *udta, const char *task_name);
+
+
+/*! 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 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);
+
+/*! 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.
+For a connected filter, all input PIDs od the filter will be disconnected and the filter removed.
+\param filter target filter
+\param reason the failure reason code
+*/
+void gf_filter_setup_failure(GF_Filter *filter, GF_Err reason);
+
+/*! Notify a filter fatal error but not a connection error. Typically, a 404 in HTTP.
+\param filter target filter
+\param reason the failure reason code
+\param force_disconnect indicates if the filter chain should be disconnected or not
+*/
+void gf_filter_notification_failure(GF_Filter *filter, GF_Err reason, Bool force_disconnect);
+
+/*! Disconnects a source filter chain between two filters
+\param filter the calling filter. This filter is NOT disconnected
+\param src_filter the source filter point of the chain to disconnect.
+*/
+void gf_filter_remove_src(GF_Filter *filter, GF_Filter *src_filter);
+
+/*! Disconnects a filter from fthe chain
+\param filter the filter to remove
+*/
+void gf_filter_remove(GF_Filter *filter);
+
+/*! Sets the number of additional input PID a filter can accept. This overrides the default value of the filter register
+\param filter the target filter
+\param max_extra_pids the number of additional PIDs this filter can accept
+*/
+void gf_filter_set_max_extra_input_pids(GF_Filter *filter, u32 max_extra_pids);
+
+/*! Gets the number of additional input PID a filter can accept. This overrides the default value of the filter register
+\param filter the target filter
+\return max_extra_pids the number of additional PIDs this filter can accept
+*/
+u32 gf_filter_get_max_extra_input_pids(GF_Filter *filter);
+
+
+/*! Queries if blocking mode is enabled for the filter
+\param filter the target filter
+\return GF_TRUE if blocking mode is enabled, GF_FALSE otherwise
+*/
+Bool gf_filter_block_enabled(GF_Filter *filter);
+
+/*! Indicates the EOS status on input PIDs of this filter shall not be checked when probing for end of stream in the chain
+\param filter the target filter
+\param do_block if GF_TRUE, prevents EOS checking on input stream, otherwise enables it (default is FALSE upon creation)
+*/
+void gf_filter_block_eos(GF_Filter *filter, Bool do_block);
+
+
+/*! 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.
+
+\param filter the target filter
+\param url url of source to connect to, with optional arguments.
+\param parent_url url of parent if any
+\param err return code - can be NULL
+\return the new source filter instance or NULL if error
+*/
+GF_Filter *gf_filter_connect_source(GF_Filter *filter, const char *url, const char *parent_url, GF_Err *err);
+
+/*! Connects a destination to this filter
+\param filter the target filter
+\param url url of destination to connect to, with optional arguments.
+\param err return code - can be NULL
+\return the new destination filter instance or NULL if error
+*/
+GF_Filter *gf_filter_connect_destination(GF_Filter *filter, const char *url, GF_Err *err);
+
+
+/*! Loads a new filter in the session - see \ref gf_fs_load_filter
+\param filter the target filter
+\param name name and arguments of the filter register to instantiate.
+\param err_code error code if any
+\return created filter or NULL if filter register cannot be found
+*/
+GF_Filter *gf_filter_load_filter(GF_Filter *filter, const char *name, GF_Err *err_code);
+
+/*! Checks if a source filter can handle the given URL. The source filter is not loaded.
+
+\param filter the target filter
+\param url url of source to connect to, with optional arguments.
+\param parent_url url of parent if any
+\return GF_TRUE if a source filter can be found for this URL, GF_FALSE otherwise
+*/
+Bool gf_filter_is_supported_source(GF_Filter *filter, const char *url, const char *parent_url);
+
+/*! Gets the number of input PIDs connected to a filter
+\param filter the target filter
+\return number of input PIDs
+*/
+u32 gf_filter_get_ipid_count(GF_Filter *filter);
+
+/*! Gets an input PIDs connected to a filter
+\param filter the target filter
+\param idx index of the input PID to retrieve, between 0 and \ref gf_filter_get_ipid_count
+\return the input PID, or NULL if not found
+*/
+GF_FilterPid *gf_filter_get_ipid(GF_Filter *filter, u32 idx);
+
+/*! Gets the number of output PIDs connected to a filter
+\param filter the target filter
+\return number of output PIDs
+*/
+u32 gf_filter_get_opid_count(GF_Filter *filter);
+
+/*! Gets an output PIDs connected to a filter
+\param filter the target filter
+\param idx index of the output PID to retrieve, between 0 and \ref gf_filter_get_opid_count
+\return the output PID, or NULL if not found
+*/
+GF_FilterPid *gf_filter_get_opid(GF_Filter *filter, u32 idx);
+
+/*! Queries buffer max limits on a filter. This is the max of buffer limits on all its connected outputs
+\param filter the target filter
+\param max_buf will be set to the maximum buffer duration in microseconds - may be NULL
+\param max_playout_buf will be set to the maximum playout buffer (the one triggering play) duration in microseconds - may be NULL
+*/
+void gf_filter_get_output_buffer_max(GF_Filter *filter, u32 *max_buf, u32 *max_playout_buf);
+
+/*! Sets a clock state at session level indicating the time / timestamp of the last rendered frame. This is used by basic audio output
+\param filter the target filter
+\param time_in_us the system time in us, see \ref gf_sys_clock_high_res
+\param media_timestamp the media timestamp associated with this time.
+*/
+void gf_filter_hint_single_clock(GF_Filter *filter, u64 time_in_us, GF_Fraction64 media_timestamp);
+
+/*! Retrieves the clock state at session level, as set by \ref gf_filter_hint_single_clock
+\param filter the target filter
+\param time_in_us will be set to the system time in us, see \ref gf_sys_clock_high_res - may be NULL
+\param media_timestamp will be set to the media timestamp associated with this time - may be NULL.
+*/
+void gf_filter_get_clock_hint(GF_Filter *filter, u64 *time_in_us, GF_Fraction64 *media_timestamp);
+
+/*! 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
+\param filter the target filter
+\param link_from the filter to link from
+\param link_ext any link extensions allowed in link syntax:
+\c \#PIDNAME: accepts only PID(s) with name PIDNAME
+\c \#TYPE: accepts only PIDs of matching media type. TYPE can be 'audio' 'video' 'scene' 'text' 'font'
+\c \#TYPEN: accepts only Nth PID of matching type from source
+\c \#P4CC=VAL: accepts only PIDs with property matching VAL.
+\c \#PName=VAL: same as above, using the built-in name corresponding to the property.
+\c \#P4CC-VAL: accepts only PIDs with property strictly less than VAL (only for 1-dimension number properties).
+\c \#P4CC+VAL: accepts only PIDs with property strictly greater than VAL (only for 1-dimension number properties).
+\return error code if any
+*/
+GF_Err gf_filter_set_source(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/
+
+\param filter the target filter
+*/
+void gf_filter_reset_source(GF_Filter *filter);
+
+/*! Explicitly assigns an ID to a filter. This shall be called before running the session, and cannot be called on a filter with ID assign
+\param filter the target filter
+\param filter_id the ID to assign. If NULL, a dynmic ID is generated
+\return error code if any
+*/
+GF_Err gf_filter_assign_id(GF_Filter *filter, const char *filter_id);
+
+/*! Gets the ID of a filter
+\param filter the target filter
+\return ID of the filter, NULL if not defined
+*/
+const char *gf_filter_get_id(GF_Filter *filter);
+
+
+/*! 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
+\return error code if any
+*/
+GF_Err gf_filter_override_caps(GF_Filter *filter, const GF_FilterCapability *caps, u32 nb_caps );
+
+/*! Filter session separator set query*/
+typedef enum
+{
+	/*! queries the character code used to separate between filter arguments*/
+	GF_FS_SEP_ARGS=0,
+	/*! queries the character code used to separate between argument name and value*/
+	GF_FS_SEP_NAME,
+	/*! queries the character code used to indicate fragment identifiers (source PIDs, PID properties)*/
+	GF_FS_SEP_FRAG,
+	/*! queries the character code used to separate items in a list*/
+	GF_FS_SEP_LIST,
+	/*! queries the character code used to negate values*/
+	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
+\param filter the target filter
+\param sep_type the separator type to query
+\return character code of the separator
+*/
+u8 gf_filter_get_sep(GF_Filter *filter, GF_FilterSessionSepType sep_type);
+
+/*! Queries the arguments of the destination arguments. The first output PID connected to a filter with non NULL args will be used (this is a recursive check until end of chain)
+\param filter the target filter
+\return the argument string of the destination args
+*/
+const char *gf_filter_get_dst_args(GF_Filter *filter);
+
+/*! Queries the destination name. The first output PID connected to a filter with non NULL args will be used (this is a recursive check until end of chain)
+\param filter the target filter
+\return the argument string of the destination (SHALL be freed by caller), NULL if none found
+*/
+char *gf_filter_get_dst_name(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
+\param upstream send the even upstream
+*/
+void gf_filter_send_event(GF_Filter *filter, GF_FilterEvent *evt, Bool upstream);
+
+/*! Trigger reconnection of output PIDs of a filter. This is needed when inserting a filter in the chain while the session is running
+\param filter the target filter
+\return error if any
+*/
+GF_Err gf_filter_reconnect_output(GF_Filter *filter);
+
+/*! 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.
+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
+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.
+
+If the propentry pointer references a non-null value, this value will be released using \ref gf_filter_release_property,
+so make sure to initialize the pointer to a NULL value on the first call.
+This avoid calling  \ref gf_filter_release_property after each get_info in the calling code:
+
+\code{.c}
+GF_PropertyEntry *pe=NULL;
+const GF_PropertyValue *p;
+p = gf_filter_get_info(filter, FOO, &pe);
+if (p) { }
+p = gf_filter_get_info_str(filter, "BAR", &pe);
+if (p) { }
+p = gf_filter_pid_get_info(PID, ABCD, &pe);
+if (p) { }
+p = gf_filter_pid_get_info_str(PID, "MyProp", &pe);
+if (p) { }
+gf_filter_release_property(pe);
+\endcode
+
+
+
+\param filter the target filter
+\param prop_4cc the code of the built-in property to fetch
+\param propentry the property reference object for later release. SHALL not be NULL
+\return the property if found NULL otherwise.
+*/
+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
+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
+\param propentry the property reference object for later release. See \ref gf_filter_pid_get_info for more details.
+\return the property if found NULL otherwise
+*/
+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
+\param propentry the property reference object to be released
+*/
+void gf_filter_release_property(GF_PropertyEntry *propentry);
+
+/*! Sends a filter argument update
+\param filter the target filter
+\param target_filter_id if set, the target filter will be changed to the filter with this id if any. otherwise the target filter is the one specified
+\param arg_name argument name
+\param arg_val argument value
+\param propagate_mask propagation flags - 0 means no propagation
+*/
+void gf_filter_send_update(GF_Filter *filter, const char *target_filter_id, const char *arg_name, const char *arg_val, GF_EventPropagateType propagate_mask);
+
+
+
+/*! Filters may request listening on global events.\n
+\warning This is not thread safe, the callback will be called directly upon event firing, your filter has to take care of this
+
+API of event filter is likely to change any time soon - used for backward compatibility with some old modules
+*/
+typedef struct
+{
+	/*! user data of the listener */
+	void *udta;
+	/*! callback called when an event should be filtered.
+	\param udta user data of the listener
+	\param evt the event to be processed
+	\param consumed_by_compositor indicates the event was already used by the compositor
+	\return GF_TRUE if the event is to be cancelled, GF_FALSE otherwise
+	*/
+	Bool (*on_event)(void *udta, GF_Event *evt, Bool consumed_by_compositor);
+} GF_FSEventListener;
+
+/*! Adds an event listener to the session
+\param filter filter object
+\param el the event listener to add
+\return the error code if any
+*/
+GF_Err gf_filter_add_event_listener(GF_Filter *filter, GF_FSEventListener *el);
+
+/*! Removes an event listener from the session
+\param filter filter object
+\param el the event listener to add
+\return the error code if any
+*/
+GF_Err gf_filter_remove_event_listener(GF_Filter *filter, GF_FSEventListener *el);
+
+/*! 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 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
+*/
+Bool gf_filter_forward_gf_event(GF_Filter *filter, GF_Event *evt, Bool consumed, Bool skip_user);
+
+/*! Forwards an event to the filter session. This is a shortcut for gf_filter_forward_gf_event(session, evt, GF_FALSE, GF_FALSE);
+\param filter filter object
+\param evt the event forwarded
+\return the error code if any
+*/
+Bool gf_filter_send_gf_event(GF_Filter *filter, GF_Event *evt);
+
+/*! Checks if all sink filters in the session have seen end of stream.
+\param filter filter object
+\return GF_TRUE if all sinks are in end of stream, GF_FALSE otherwise
+*/
+Bool gf_filter_all_sinks_done(GF_Filter *filter);
+
+/*! 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
+\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]);
+
+/*! Gets a filter argument value for a given argument name..
+\param filter filter object
+\param arg_name name of the filter argument
+\param prop filled with the arguments value, do NOT modify
+\return GF_TURE if success, GF_FALSE otherwise (argument is not found or is invalid)
+*/
+Bool gf_filter_get_arg(GF_Filter *filter, const char *arg_name, GF_PropertyValue *prop);
+
+
+/*! Checks if a given mime type is supported as input in the parent session
+\param filter querying filter
+\param mime mime type to query
+\return GF_TRUE if mime is supported
+*/
+Bool gf_filter_is_supported_mime(GF_Filter *filter, const char *mime);
+
+
+/*! Sends UI event from video output into the session. For now only direct callback to global event handler is used, event is not forwarded down the chain
+\param filter triggering filter
+\param uievt event to send
+\return GF_TRUE if event has been cancelled, FALSE otherwise
+*/
+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.
+\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.
+
+\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
+
+\param filter filter asking for OpenGL context activation
+\return error code if any
+*/
+GF_Err gf_filter_set_active_opengl_context(GF_Filter *filter);
+
+
+/*! 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 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
+*/
+u32 gf_filter_count_source_by_protocol(GF_Filter *filter, const char *protocol_scheme, Bool expand_proto, GF_FilterPid * (*enum_pids)(void *udta, u32 *idx), void *udta);
+
+/*! Disables data probing on the given filter. Typically used by filters loading source filters.
+\param filter target filter
+*/
+void gf_filter_disable_probe(GF_Filter *filter);
+
+/*! Disables input connection on the filter. This is used by filters acting both as true sources or demux/processing filters depending on their options.
+\param filter target filter
+*/
+void gf_filter_disable_inputs(GF_Filter *filter);
+
+/*! 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.
+\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
+*/
+Bool gf_filter_has_pid_connection_pending(GF_Filter *filter, GF_Filter *stop_at_filter);
+
+/*! checks if the some PID connection tasks are still pending at the session level
+
+This can be needed by some filters needing to make sure all their inputs are known before starting producing packets.
+
+\param filter target filter
+\return GF_TRUE if some connection tasks are pending, GF_FALSE otherwise
+*/
+Bool gf_filter_connections_pending(GF_Filter *filter);
+
+/*! Disables blocking check for a given filter
+
+This can be needed by some filters internally managing their blocking state because one of their output is not managed by the filter session.
+
+\param filter target filter
+\param prevent_blocking_enabled if GF_TRUE, filter will still be called even if one of its output is in blocking mode
+\return error if any
+*/
+GF_Err gf_filter_prevent_blocking(GF_Filter *filter, Bool prevent_blocking_enabled);
+
+/*! Checks if filter was loaded as part of a link resolution or explicitly loaded by application
+\param filter target filter
+\return GF_TRUE if filter was loaded for link resolution, GF_FALSE if filter was explicitly loaded by the application
+*/
+Bool gf_filter_is_dynamic(GF_Filter *filter);
+
+/*! Checks if reporting is turned on at session level.
+\param filter target filter
+\return GF_TRUE if reporting is enabled, GF_FALSE otherwise
+*/
+Bool gf_filter_reporting_enabled(GF_Filter *filter);
+
+/*! Updates filter status string and progress. Should not be called if reporting is turned off at session level.
+This allows gathering stats from filter in realtime. The status string can be anything but shall not contain '\n' and
+should not contain any source or destination URL except for sources and sinks.
+\param filter target filter
+\param percent percentage (from 0 to 10000) of operation status. If more than 10000 ignored
+\param szStatus string giving a status of the filter
+\return error code if any
+*/
+GF_Err gf_filter_update_status(GF_Filter *filter, u32 percent, char *szStatus);
+
+/*! check if session has been scheduled for destruction
+\param filter target filter
+\return GF_TRUE if session is about to be destroyed
+*/
+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
+know the set of available options at initialize() time.
+\param filter target filter
+\param arg name of the argument not used/found
+*/
+void gf_filter_report_unused_meta_option(GF_Filter *filter, const char *arg);
+
+/*! used by script to set a per-instance description
+\param filter target filter
+\param new_desc the new description to set
+\return error if any
+*/
+GF_Err gf_filter_set_description(GF_Filter *filter, const char *new_desc);
+
+/*! get a per-instance description
+\param filter target filter
+\return the filter instance description, NULL otherwise
+*/
+const char *gf_filter_get_description(GF_Filter *filter);
+
+/*! used by script to set a per-instance version
+\param filter target filter
+\param new_version the new version to set
+\return error if any
+*/
+GF_Err gf_filter_set_version(GF_Filter *filter, const char *new_version);
+
+/*! get a per-instance version
+\param filter target filter
+\return the filter instance version, NULL otherwise
+*/
+const char *gf_filter_get_version(GF_Filter *filter);
+
+/*! used by script to set a per-instance author
+\param filter target filter
+\param new_author the new author to set
+\return error if any
+*/
+GF_Err gf_filter_set_author(GF_Filter *filter, const char *new_author);
+
+/*! get a per-instance author
+\param filter target filter
+\return the filter instance author, NULL otherwise
+*/
+const char *gf_filter_get_author(GF_Filter *filter);
+
+/*! used by script to set a per-instance help
+\param filter target filter
+\param new_help the new help to set
+\return error if any
+*/
+GF_Err gf_filter_set_help(GF_Filter *filter, const char *new_help);
+
+/*! get a per-instance help
+\param filter target filter
+\return the filter instance help, NULL otherwise
+*/
+const char *gf_filter_get_help(GF_Filter *filter);
+
+
+/*! used by script to set a per-instance arguments. The passed array shall have a 0 argument at the end and shall be valid
+for the lifetime of the filter (not locally copied)
+\param filter target filter
+\param new_args the new args to set
+\return error if any
+*/
+GF_Err gf_filter_define_args(GF_Filter *filter, GF_FilterArgs *new_args);
+
+/*! get per-instance args
+\param filter target filter
+\return the filter instance args if any, NULL otherwise
+*/
+GF_FilterArgs *gf_filter_get_args(GF_Filter *filter);
+
+
+/*! probes mime type of a given block of data (should be begining of file )
+\param filter target filter
+\param data buffer to probe
+\param size size of buffer
+\return the mime type probed, or NULL if not recognized
+*/
+const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size);
+
+/*! checks if the given filter is an alias filter created by a multiple sink filter
+\param filter target filter
+\return GF_TRUE if this is an alias  filter created by a multiple sink filter, GF_FALSE otherwise
+*/
+Bool gf_filter_is_alias(GF_Filter *filter);
+
+/*! @} */
+
+
+/*!
+\addtogroup fs_pid Filter PID
+\ingroup filters_grp
+\brief Filter Interconnection
+
+
+A PID is a connection between two filters, holding packets to process. Internally, a PID created by a filter (output PID) is different from an input PID to a filter (configure_pid)
+but the API has been designed to hide this, so that most PID functions can be called regardless of the input/output nature of the PID.
+
+All setters functions (gf_filter_pid_set*) will fail on an input PID.
+
+The generic design of the architecture is that each filter is free to decide how it handle PIDs and their packets. This implies that the filter session has no clue how
+an output PID relates to an input PID (same goes for packets).
+Developpers must therefore manually copy PID properties that seem relevant, or more practically copy all properties from input PID to output PID and
+reassign output PID properties changed by the filter.
+
+PIDs can be reconfigured multiple times, even potentially changing caps on the fly. The current architecture does not check for capability matching during reconfigure, it is up to
+the filter to do so.
+
+It is also up to filters to decide how to handle a an input PID removal: remove the output PID immediately, keep it open to flush internal data or keep generating data on the output.
+The usual practice is to remove the output as soon as the input is removed.
+
+Once an input PID has been notified to be removed, it shall no longer be used by the filter, as it may be discarded/freed (PID are NOT reference counted).
+
+@{
+ */
+
+
+
+/*! Creates a new output PID for the filter. If the filter has a single input PID already connected, the PID properties are copied by default
+\param filter the target filter
+\return the new output PID
+*/
+GF_FilterPid *gf_filter_pid_new(GF_Filter *filter);
+
+/*! Removes an output PID from the filter. This will trigger removal of the PID upward in the chain
+\param PID the target filter PID to remove
+*/
+void gf_filter_pid_remove(GF_FilterPid *PID);
+
+/*! Creates an output PID for a raw input filter (file, sockets, pipe, etc). This will assign file name, local name, mime and extension properties to the created PID
+\param filter the target filter
+\param url URL of the source, SHALL be set
+\param local_file path on local host, can be NULL
+\param mime_type mime type of the content. If none provided and propbe_data is not null, the data will be probed for mime type resolution
+\param fext file extension of the content. If NULL, will be extracted from URL
+\param probe_data data of the stream to probe in order to solve its mime type
+\param probe_size size of the probe data
+\param trust_mime if set and mime_type is set, disables data probing
+\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);
+
+/*! 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.
+
+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.
+
+\param PID the target filter PID
+\param prop_4cc the built-in property code to modify
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_property(GF_FilterPid *PID, u32 prop_4cc, const GF_PropertyValue *value);
+
+/*! Sets a new property on an output PID - see \ref gf_filter_pid_set_property.
+\param PID the target filter PID
+\param name the name of the property to modify
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_property_str(GF_FilterPid *PID, const char *name, const GF_PropertyValue *value);
+
+/*! Sets a new property on an output PID - see \ref gf_filter_pid_set_property.
+\param PID the target filter PID
+\param name the name of the property to modify. The name will be copied to the property, and memory destruction performed by the filter session
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_property_dyn(GF_FilterPid *PID, char *name, const GF_PropertyValue *value);
+
+/*! 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.
+
+\param PID the target filter PID
+\param prop_4cc the built-in property code to modify
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_info(GF_FilterPid *PID, u32 prop_4cc, const GF_PropertyValue *value);
+
+/*! Sets a new info property on an output PID - see \ref gf_filter_pid_set_info
+See  \ref gf_filter_pid_set_info
+\param PID the target filter PID
+\param name the name of the property to modify
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_info_str(GF_FilterPid *PID, const char *name, const GF_PropertyValue *value);
+
+/*! Sets a new property on an output PID.
+See \ref gf_filter_pid_set_info
+\param PID the target filter PID
+\param name the name of the property to modify. The name will be copied to the property, and memory destruction performed by the filter session
+\param value the new value to assign, or NULL if the property is to be removed
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_info_dyn(GF_FilterPid *PID, char *name, const GF_PropertyValue *value);
+
+/*! Sets user data pointer for a PID - see \ref gf_filter_pid_set_info
+\param PID the target filter PID
+\param udta user data pointer
+*/
+void gf_filter_pid_set_udta(GF_FilterPid *PID, void *udta);
+
+/*! Gets user data pointer for a PID
+\param PID the target filter PID
+\return udta user data pointer
+*/
+void *gf_filter_pid_get_udta(GF_FilterPid *PID);
+
+/*! Gets PID name. Mostly used for logging purposes
+\param PID the target filter PID
+\param name the new PID name. function ignored if NULL.
+*/
+void gf_filter_pid_set_name(GF_FilterPid *PID, const char *name);
+
+/*! Gets PID name
+\param PID the target filter PID
+\return PID name
+*/
+const char *gf_filter_pid_get_name(GF_FilterPid *PID);
+
+/*! Gets filter name of input PID
+\param PID the target filter PID
+\return name of the filter owning this input PID
+*/
+const char *gf_filter_pid_get_filter_name(GF_FilterPid *PID);
+
+/*! Gets the source arguments of the PID, walking down the chain until the source filter
+\param PID the target filter PID
+\return argument of the source filter
+*/
+const char *gf_filter_pid_orig_src_args(GF_FilterPid *PID);
+
+/*! 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).
+\param PID the target filter PID
+\return argument of the source filter
+*/
+const char *gf_filter_pid_get_source_filter_name(GF_FilterPid *PID);
+
+/*! Gets the arguments for the filter
+\param PID the target filter PID
+\return arguments of the source filter
+*/
+const char *gf_filter_pid_get_args(GF_FilterPid *PID);
+
+/*! Sets max buffer requirement of an output PID. Typically used by audio to make sure several packets can be dispatched on a PID
+that would otherwise block after one packet
+\param PID the target filter PID
+\param total_duration_us buffer max occupancy in us
+*/
+void gf_filter_pid_set_max_buffer(GF_FilterPid *PID, u32 total_duration_us);
+
+/*! Returns max buffer requirement of a PID.
+\param PID the target filter PID
+\return buffer max in us
+*/
+u32 gf_filter_pid_get_max_buffer(GF_FilterPid *PID);
+
+/*! Checks if a given filter is in the PID parent chain. This is used to identify sources (rather than checking URL/...)
+\param PID the target filter PID
+\param filter the source filter to check
+\return GF_TRUE if filter is a source for that PID, GF_FALSE otherwise
+*/
+Bool gf_filter_pid_is_filter_in_parents(GF_FilterPid *PID, GF_Filter *filter);
+
+/*! 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
+\param nb_pck number of packets in PID
+\param max_duration maximum buffer duration allowed in us - can be 0 if buffer is measured in units
+\param duration buffer duration in us
+\return GF_TRUE if normal buffer query, GF_FALSE if final session flush, in which case buffer might never complete
+*/
+Bool gf_filter_pid_get_buffer_occupancy(GF_FilterPid *PID, u32 *max_units, u32 *nb_pck, u32 *max_duration, u32 *duration);
+
+/*! Sets loose connect for a PID, avoiding to throw an error if connection of the PID fails. Used by the compositor filter which acts as both sink and filter.
+\param PID the target filter PID
+*/
+void gf_filter_pid_set_loose_connect(GF_FilterPid *PID);
+
+
+/*! 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
+This function will trigger a reconfiguration of the filter chain to try to adapt this. If failing, the filter chain will disconnect
+This process is asynchronous, the filter asking for a PID negociation will see the notification through a pid_reconfigure if success.
+\param PID the target filter PID - this MUST be an input PID
+\param prop_4cc the built-in property code to negotiate
+\param value the new value to negotiate, SHALL NOT be NULL
+\return error code if any
+*/
+GF_Err gf_filter_pid_negociate_property(GF_FilterPid *PID, u32 prop_4cc, const GF_PropertyValue *value);
+
+/*! Negotiate a given property on an input PID for regular properties
+see \ref gf_filter_pid_negociate_property
+\param PID the target filter PID - this MUST be an input PID
+\param name name of the property to negotiate
+\param value the new value to negotiate, SHALL NOT be NULL
+\return error code if any
+*/
+GF_Err gf_filter_pid_negociate_property_str(GF_FilterPid *PID, const char *name, const GF_PropertyValue *value);
+
+/*! Negotiate a given property on an input PID for regular properties
+see \ref gf_filter_pid_negociate_property
+\param PID the target filter PID - this MUST be an input PID
+\param name the name of the property to modify. The name will be copied to the property, and memory destruction performed by the filter session
+\param value the new value to negotiate, SHALL NOT be NULL
+\return error code if any
+*/
+GF_Err gf_filter_pid_negociate_property_dyn(GF_FilterPid *PID, char *name, const GF_PropertyValue *value);
+
+/*! 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 input PID in a generic reconfigure_pid
+
+\param PID the target filter PID
+\param prop_4cc the built-in property code to negotiate
+\return the negociated property value
+*/
+const GF_PropertyValue *gf_filter_pid_caps_query(GF_FilterPid *PID, u32 prop_4cc);
+
+/*! Queries a negotiated capability on an output PID - see \ref gf_filter_pid_caps_query
+\param PID the target filter PID
+\param prop_name the property name to negotiate
+\return the negociated property value
+*/
+const GF_PropertyValue *gf_filter_pid_caps_query_str(GF_FilterPid *PID, const char *prop_name);
+
+/*! Statistics for PID*/
+typedef struct
+{
+	/*! if set, indicates the PID is disconnected and stats are not valid*/
+	u32 disconnected;
+	/*! average process rate on that PID in bits per seconds*/
+	u32 average_process_rate;
+	/*! max process rate on that PID in bits per seconds*/
+	u32 max_process_rate;
+	/*! average bitrate for that PID*/
+	u32 avgerage_bitrate;
+	/*! max bitrate for that PID*/
+	u32 max_bitrate;
+	/*! number of packets processed on that PID*/
+	u32 nb_processed;
+	/*! max packet process time of the filter in us*/
+	u32 max_process_time;
+	/*! total process time of the filter in us*/
+	u64 total_process_time;
+	/*! process time of first packet of the filter in us*/
+	u64 first_process_time;
+	/*! process time of the last packet on that PID in us*/
+	u64 last_process_time;
+	/*! minimum frame duration on that PID in us*/
+	u32 min_frame_dur;
+	/*! number of saps 1/2/3 on that PID*/
+	u32 nb_saps;
+	/*! max process time of SAP packets on that PID in us*/
+	u32 max_sap_process_time;
+	/*! total process time of SAP packets on that PID in us*/
+	u64 total_sap_process_time;
+
+	/*! max buffer time in us - only set when querying decoder stats*/
+	u64 max_buffer_time;
+	/*! max playout buffer time in us - only set when querying decoder stats*/
+	u64 max_playout_time;
+	/*! min playout buffer time in us - only set when querying decoder stats*/
+	u64 min_playout_time;
+	/*! current buffer time in us - only set when querying decoder stats*/
+	u64 buffer_time;
+	/*! number of units in input buffer of the filter - only set when querying decoder stats*/
+	u32 nb_buffer_units;
+} GF_FilterPidStatistics;
+
+/*! Direction for stats querying*/
+typedef enum
+{
+	/*! statistics are fetched on the current PID's parent filter. If the PID is an output PID, the statistics are fetched on all the destinations for that PID*/
+	GF_STATS_LOCAL = 0,
+	/*! statistics are fetched on the current PID's parent filter. The statistics are fetched on all input of the parent filter*/
+	GF_STATS_LOCAL_INPUTS,
+	/*! statistics are fetched on all inputs of the next decoder filter up the chain (towards the sink)*/
+	GF_STATS_DECODER_SINK,
+	/*! statistics are fetched on all inputs of the previous decoder filter down the chain (towards the source)*/
+	GF_STATS_DECODER_SOURCE,
+	/*! statistics are fetched on all inputs of the next encoder filter up the chain (towards the sink)*/
+	GF_STATS_ENCODER_SINK,
+	/*! statistics are fetched on all inputs of the previous encoder filter down the chain (towards the source)*/
+	GF_STATS_ENCODER_SOURCE
+} GF_FilterPidStatsLocation;
+
+/*! Gets statistics for the PID
+\param PID the target filter PID
+\param stats the retrieved statistics
+\param location indicates where to locate the filter to query stats on it.
+\return error code if any
+*/
+GF_Err gf_filter_pid_get_statistics(GF_FilterPid *PID, GF_FilterPidStatistics *stats, GF_FilterPidStatsLocation location);
+
+/*! Resets current properties of the PID
+\param PID the target filter PID
+\return error code if any
+*/
+GF_Err gf_filter_pid_reset_properties(GF_FilterPid *PID);
+
+
+/*! Function protoype for filtering properties.
+\param cbk callback data
+\param prop_4cc the built-in property code
+\param prop_name property name
+\param src_prop the property value in the source packet
+\return GF_TRUE if the property shall be merged, GF_FALSE otherwise
+*/
+typedef Bool (*gf_filter_prop_filter)(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop);
+
+/*! Push a new set of properties on destination PID using all properties from source PID. Old properties in destination will be lost (i.e. reset properties is always performed during copy properties)
+\param dst_pid the destination filter PID
+\param src_pid the source filter PID
+\return error code if any
+*/
+GF_Err gf_filter_pid_copy_properties(GF_FilterPid *dst_pid, GF_FilterPid *src_pid);
+
+/*! Push a new set of properties on destination PID, using all properties from source PID.
+Old properties of the destination are first copied to the new property set before copying the ones from the source PID, potentially filtering them.
+\param dst_pid the destination filter PID
+\param src_pid the source filter PID
+\param filter_prop callback filtering function
+\param cbk callback data passed to the callback function
+\return error code if any
+*/
+GF_Err gf_filter_pid_merge_properties(GF_FilterPid *dst_pid, GF_FilterPid *src_pid, gf_filter_prop_filter filter_prop, void *cbk );
+
+/*! 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.
+\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
+*/
+const GF_PropertyValue *gf_filter_pid_get_property(GF_FilterPid *PID, u32 prop_4cc);
+
+/*! Gets a property of the PID - see \ref gf_filter_pid_get_property
+\param PID the target filter PID
+\param prop_name the name of the property to retrieve
+\return the property if found or NULL otherwise
+*/
+const GF_PropertyValue *gf_filter_pid_get_property_str(GF_FilterPid *PID, const char *prop_name);
+
+/*! Enumerates properties of a PID - see \ref gf_filter_pid_get_property
+\param PID the target filter PID
+\param idx input/output index of the current property. 0 means first. Incremented by 1 upon success
+\param prop_4cc set to the built-in code of the property if built-in
+\param prop_name set to the name of the property if not built-in
+\return the property if found or NULL otherwise (end of enumeration)
+*/
+const GF_PropertyValue *gf_filter_pid_enum_properties(GF_FilterPid *PID, u32 *idx, u32 *prop_4cc, const char **prop_name);
+
+/*! Enumerates info of a PID
+\param PID the target filter PID
+\param idx input/output index of the current info. 0 means first. Incremented by 1 upon success
+\param prop_4cc set to the built-in code of the info if built-in
+\param prop_name set to the name of the info if not built-in
+\return the property if found or NULL otherwise (end of enumeration)
+*/
+const GF_PropertyValue *gf_filter_pid_enum_info(GF_FilterPid *PID, u32 *idx, u32 *prop_4cc, const char **prop_name);
+
+/*! Sets PID framing mode. filters can consume packets as they arrive, or may want to only process full frames/files
+\param PID the target filter PID
+\param requires_full_blocks if GF_TRUE, the packets on the PID will be reaggregated to form complete frame/files.
+\return error code if any
+*/
+GF_Err gf_filter_pid_set_framing_mode(GF_FilterPid *PID, Bool requires_full_blocks);
+
+/*! Gets cumulated buffer duration of PID (recursive until source)
+\param PID the target filter PID
+\param check_pid_full if GF_TRUE, returns 0 if the PID buffer is not yet full
+\return the duration in us, or -1 if session is in final flush
+*/
+u64 gf_filter_pid_query_buffer_duration(GF_FilterPid *PID, Bool check_pid_full);
+
+/*! Try to force a synchronous flush of the filter chain downwards this PID. If refetching a packet returns NULL, this failed.
+\param PID the target filter PID
+*/
+void gf_filter_pid_try_pull(GF_FilterPid *PID);
+
+
+/*! Looks for a built-in property value on a  PIDs. This is a recursive call on input chain
+Info query is NOT threadsafe in gpac, you
+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_4cc the code of the built-in property to fetch
+\param propentry the property reference object for later release. See \ref gf_filter_pid_get_info for more details.
+\return the property if found NULL otherwise
+*/
+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
+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
+\param propentry the property reference object for later release. See \ref gf_filter_pid_get_info for more details.
+\return the property if found NULL otherwise
+*/
+const GF_PropertyValue *gf_filter_pid_get_info_str(GF_FilterPid *PID, const char *prop_name, GF_PropertyEntry **propentry);
+
+
+/*! Signals end of stream on a PID. Each filter needs to call this when EOS is reached on a given stream since there is no explicit link between input PIDs and output PIDs
+\param PID the target filter PID
+*/
+void gf_filter_pid_set_eos(GF_FilterPid *PID);
+
+/*! Checks for end of stream has been signaled a PID input chain.
+This is a recursive call on input chain. The function is typically used to abort buffering or synchronisation init in muxers.
+\param PID the target filter PID
+\return GF_TRUE if end of stream was signaled on the input chain
+*/
+Bool gf_filter_pid_has_seen_eos(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
+*/
+Bool gf_filter_pid_is_eos(GF_FilterPid *PID);
+
+/*! Checks if there is a packet ready on an input PID.
+\param PID the target filter PID
+\return GF_TRUE if no packet in buffers
+*/
+Bool gf_filter_pid_first_packet_is_empty(GF_FilterPid *PID);
+
+/*! Gets the first packet in the input PID buffer.
+This may trigger a reconfigure signal on the filter. If reconfigure is not OK, returns NULL and the PID passed to the filter NO LONGER EXISTS (implicit remove)
+The packet is still present in the PID buffer until explicitly removed by \ref gf_filter_pid_drop_packet
+\param PID the target filter PID
+\return packet or NULL of empty or reconfigure error
+*/
+GF_FilterPacket * gf_filter_pid_get_packet(GF_FilterPid *PID);
+
+/*! Fetches the CTS of the first packet in the input PID buffer.
+\param PID the target filter PID
+\param cts set to the composition time of the first packet, in PID timescale
+\return GF_TRUE if cts was fetched, GF_FALSE otherwise
+*/
+Bool gf_filter_pid_get_first_packet_cts(GF_FilterPid *PID, u64 *cts);
+
+/*! Drops the first packet in the input PID buffer.
+\param PID the target filter PID
+*/
+void gf_filter_pid_drop_packet(GF_FilterPid *PID);
+
+/*! Gets the number of packets in input PID buffer.
+\param PID the target filter PID
+\return the number of packets
+*/
+u32 gf_filter_pid_get_packet_count(GF_FilterPid *PID);
+
+/*! Checks the capability of the input PID match its destination filter.
+\param PID the target filter PID
+\return GF_TRUE if match , GF_FALSE otherwise
+*/
+Bool gf_filter_pid_check_caps(GF_FilterPid *PID);
+
+/*! 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
+\param PID the target filter PID
+\return GF_TRUE if PID would enter blocking state , GF_FALSE otherwise
+*/
+Bool gf_filter_pid_would_block(GF_FilterPid *PID);
+
+/*! Shortcut to access the timescale of the PID - faster than get property as the timescale is locally cached for buffer management
+\param PID the target filter PID
+\return the PID timescale
+*/
+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).
+\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
+*/
+void gf_filter_pid_clear_eos(GF_FilterPid *PID, Bool all_pids);
+
+/*! Indicates how clock references (PCR of MPEG-2) should be handled.
+By default these references are passed from input packets to output packets by the filter session (this assumes the filter doesn't modify composition timestamps).
+This default can be changed with this function.
+\param PID the target filter PID
+\param filter_in_charge if set to GF_TRUE, clock references are not forwarded by the filter session and the filter is in charge of handling them
+*/
+void gf_filter_pid_set_clock_mode(GF_FilterPid *PID, Bool filter_in_charge);
+
+/*! Resolves file template using PID properties and file index. Templates follow the DASH mechanism:
+
+- $KEYWORD$ or $KEYWORD%0nd$ are replaced in the template with the resolved value,
+
+- $$ is an escape for $
+
+Supported KEYWORD (case insensitive):
+- num: replaced by file_number (usually matches GF_PROP_PCK_FILENUM, but this property is not used in the solving mechanism)
+- PID: ID of the source PID
+- URL: URL of source file
+- File: path on disk for source file
+- p4cc=ABCD: uses PID property with 4CC ABCD
+- pname=VAL: uses PID property with name VAL (either built-in prop name or other peroperty 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
+\return error if any
+*/
+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);
+
+
+/*! 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.
+
+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).
+
+\param PID the target filter PID
+\param discard_on enables/disables discard
+\return error if any
+*/
+GF_Err gf_filter_pid_set_discard(GF_FilterPid *PID, Bool discard_on);
+
+/*! Discard blocking mode for PID on end of stream. The filter is blocked when all output PIDs are in end of stream, this function unblocks the filter.
+This can be needed for playlist type filters dispatching end of stream at the end of each file but setting up next file in
+the following process() call.
+
+\param PID the target filter PID
+*/
+void gf_filter_pid_discard_block(GF_FilterPid *PID);
+
+/*! Gets URL argument of first destination of PID if any - memory shall be freed by caller.
+\param PID the target filter PID
+\return destination URL string or NULL if error
+*/
+char *gf_filter_pid_get_destination(GF_FilterPid *PID);
+
+/*! Gets URL  argument of first source of PID if any - memory shall be freed by caller.
+\param PID the target filter PID
+\return source URL string or NULL if error
+*/
+char *gf_filter_pid_get_source(GF_FilterPid *PID);
+
+/*! Indicates that this output PID requires a sourceID on the destination filter to be present. This prevents trying to link to other filters with no source IDs but
+accepting the PID
+\param PID the target filter PID
+\return error code if any
+*/
+GF_Err gf_filter_pid_require_source_id(GF_FilterPid *PID);
+
+/*! Enables decoding time reconstruction on PID for packets with DTS not set. If not enabled (default), dts not set implies dts = cts
+\param PID the target filter PID
+\param do_recompute if set, dts will be recomputed when not set
+*/
+void gf_filter_pid_recompute_dts(GF_FilterPid *PID, Bool do_recompute);
+
+/*! Queries minimum packet duration as computed from DTS/CTS info on the PID
+\param PID the target filter PID
+\return minimum packet duration computed
+*/
+u32 gf_filter_pid_get_min_pck_duration(GF_FilterPid *PID);
+
+
+/*! Sends an event down the filter chain for input PID, or up the filter chain for output PIDs.
+\param PID the target filter PID
+\param evt the event to send
+*/
+void gf_filter_pid_send_event(GF_FilterPid *PID, GF_FilterEvent *evt);
+
+
+/*! Helper function to init play events, that checks the PID \ref GF_FilterPidPlaybackMode and adjust start/speed accordingly. This does not send the event.
+\param PID the target filter PID
+\param evt the event to initialize
+\param start playback start time of request
+\param speed playback speed time of request
+\param log_name name used for logs in case of capability mismatched
+*/
+void gf_filter_pid_init_play_event(GF_FilterPid *PID, GF_FilterEvent *evt, Double start, Double speed, const char *log_name);
+
+/*! Check if the given PID is marked as playing or not.
+\param PID the target filter PID
+\return GF_TRUE if PID is currently playing, GF_FALSE otherwise
+*/
+Bool gf_filter_pid_is_playing(GF_FilterPid *PID);
+
+/*! Enables direct dispatch of packets to connected filters. This mode is useful when a filter may send a very large number of packets
+in one process() call; this is for example the case of the isobmff muxer in interleave mode. Using this mode avoids overloading
+the PID buffer with packets.
+If the session is multi-threaded, this parameter has no effect.
+\param PID the target filter PID
+\return GF_TRUE if PID is currently playing, GF_FALSE otherwise
+*/
+GF_Err gf_filter_pid_allow_direct_dispatch(GF_FilterPid *PID);
+
+/*! Gets the private stack of the alias filter associated with an input PID, if any
+
+ \note The filter type of the alias is always the type of the filter holding the input PID connection.
+\param PID the target filter PID
+\return the temporary alias filter private stack, NULL otherwise
+*/
+void *gf_filter_pid_get_alias_udta(GF_FilterPid *PID);
+
+/*! @} */
+
+
+/*!
+\addtogroup fs_pck Filter Packet
+\ingroup filters_grp
+\brief Filter data exchange
+
+ Packets consist in block of data or reference to such blocks, passed from the source to the sink only.
+Internally, a packet created by a filter (output packet) is different from an input packet to a filter (\ref gf_filter_pid_get_packet)
+but the API has been designed to hide this, so that most packet functions can be called regardless of the input/output nature of the PID.
+
+Packets have native attributes (timing, sap state, ...) but may also have any number of properties associated to them.
+
+The generic design of the architecture is that each filter is free to decide how it handle PIDs and their packets. This implies that the filter session has no clue how
+an output packet relates to an input packet.
+Developpers must therefore manually copy packet properties that seem relevant, or more practically copy all properties from input packet to output packet and
+reassign output packet properties changed by the filter.
+
+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.
+
+@{
+ */
+
+
+/*! Keeps a reference to the given input packet. The packet shall be released at some point using \ref gf_filter_pck_unref
+\param pck the target input packet
+\return error if any
+*/
+GF_Err gf_filter_pck_ref(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
+*/
+void gf_filter_pck_unref(GF_FilterPacket *pck);
+
+/*! Creates a reference to the packet properties, but not to the data.
+This is mostly useful for encoders/decoders/filters with delay, where the input packet needs to be released before getting the corresponding output (frame reordering & co).
+This allows merging back packet properties after some delay without blocking the filter chain.
+\param pck the target input packet
+\return error if any
+*/
+GF_Err gf_filter_pck_ref_props(GF_FilterPacket **pck);
+
+
+/*! 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).
+\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
+*/
+GF_FilterPacket *gf_filter_pck_new_alloc(GF_FilterPid *PID, u32 data_size, u8 **data);
+
+
+/*! Allocates a new packet on the output PID referencing internal 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).
+\param PID the target output PID
+\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
+*/
+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 source_packet the source packet this data belongs to (at least from the filter point of view).
+\return new packet or NULL if error
+*/
+GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *PID, const u8 *data, 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).
+\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
+\param destruct the callback function used to destroy the packet when no longer used - may be NULL
+\return new packet or NULL if error
+*/
+GF_FilterPacket *gf_filter_pck_new_alloc_destructor(GF_FilterPid *PID, u32 data_size, u8 **data, gf_fsess_packet_destructor destruct);
+
+/*! Clones a new 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 filter wishing to perform in-place processing of input data.
+\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
+*/
+GF_FilterPacket *gf_filter_pck_new_clone(GF_FilterPid *PID, GF_FilterPacket *pck_source, u8 **data);
+
+/*! Copies a new packet from a source packet and copy all source properties to output.
+\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
+*/
+GF_FilterPacket *gf_filter_pck_new_copy(GF_FilterPid *PID, GF_FilterPacket *pck_source, u8 **data);
+
+/*! 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.
+Note that packets created with \ref gf_filter_pck_new_frame_interface are always treated as read-only packets
+\param pck the target output packet to send
+\return error if any
+*/
+GF_Err gf_filter_pck_set_readonly(GF_FilterPacket *pck);
+
+/*! Sends the packet on its output PID. Packets SHALL be sent in processing order (eg, decoding order for video).
+However, packets don't have to be sent in their allocation order.
+\param pck the target output packet to send
+\return error if any
+*/
+GF_Err gf_filter_pck_send(GF_FilterPacket *pck);
+
+/*! Destructs a packet allocated but that cannot be sent. Shall not be used on packet references.
+\param pck the target output packet to send
+*/
+void gf_filter_pck_discard(GF_FilterPacket *pck);
+
+/*! Destructs a packet allocated but that cannot be sent. Shall not be used on packet references.
+This is a shortcut to \ref gf_filter_pck_new_ref + \ref gf_filter_pck_merge_properties + \ref gf_filter_pck_send
+\param reference the input packet to forward
+\param PID the output PID to forward to
+\return error code if any
+*/
+GF_Err gf_filter_pck_forward(GF_FilterPacket *reference, GF_FilterPid *PID);
+
+/*! Gets data associated with the packet.
+\param pck the target packet
+\param size set to the packet data size
+\return packet data if any, NULL if empty or if the packet uses a frame interface object. see \ref gf_filter_pck_get_frame_interface
+*/
+const u8 *gf_filter_pck_get_data(GF_FilterPacket *pck, u32 *size);
+
+/*! Sets a built-in property of a packet
+\param pck the target packet
+\param prop_4cc the code of the built-in property to set
+\param value the property value to set
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_property(GF_FilterPacket *pck, u32 prop_4cc, const GF_PropertyValue *value);
+
+/*! Sets a property of a packet
+\param pck the target packet
+\param name the name of the property to set
+\param value the property value to set
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_property_str(GF_FilterPacket *pck, const char *name, const GF_PropertyValue *value);
+
+/*! Sets a property of a packet
+\param pck the target packet
+\param name the code of the property to set. The name will be copied to the property, and memory destruction performed by the filter session
+\param value the property value to set
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_property_dyn(GF_FilterPacket *pck, char *name, const GF_PropertyValue *value);
+
+/*! 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
+\return error code if any
+*/
+GF_Err gf_filter_pck_merge_properties(GF_FilterPacket *pck_src, GF_FilterPacket *pck_dst);
+
+/*! Same as \ref gf_filter_pck_merge_properties but uses a filter callback to select properties to merge
+\param pck_src source packet
+\param pck_dst destination packet
+\param filter_prop callback filtering function
+\param cbk callback data passed to the callback function
+\return error code if any
+*/
+GF_Err gf_filter_pck_merge_properties_filter(GF_FilterPacket *pck_src, GF_FilterPacket *pck_dst, gf_filter_prop_filter filter_prop, void *cbk);
+
+/*! Gets built-in property of packet.
+\param pck target packet
+\param prop_4cc the code of the built-in property
+\return the property if found, NULL otherwise
+*/
+const GF_PropertyValue *gf_filter_pck_get_property(GF_FilterPacket *pck, u32 prop_4cc);
+
+/*! Gets property of packet.
+\param pck target packet
+\param prop_name the name of the property
+\return the property if found, NULL otherwise
+*/
+const GF_PropertyValue *gf_filter_pck_get_property_str(GF_FilterPacket *pck, const char *prop_name);
+
+/*! Enumerates properties on packets.
+\param pck target packet
+\param idx input/output index of the current property. 0 means first. Incremented by 1 upon success
+\param prop_4cc set to the code of the built-in property
+\param prop_name set to the name of the property
+\return the property if found, NULL otherwise
+*/
+const GF_PropertyValue *gf_filter_pck_enum_properties(GF_FilterPacket *pck, u32 *idx, u32 *prop_4cc, const char **prop_name);
+
+
+/*! Sets packet framing info. A full frame is a complete entity for the stream type, ie an access unit for media streams and a complete file for file streams
+\param pck target packet
+\param is_start packet is start of the frame
+\param is_end packet is end of the frame
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_framing(GF_FilterPacket *pck, Bool is_start, Bool is_end);
+
+/*! Gets packet framing info. A full frame is a complete entity for the stream type, ie an access unit for media streams and a complete file for file streams
+\param pck target packet
+\param is_start set to GF_TRUE if packet is start of the frame, to GF_FALSE otherwise
+\param is_end set to GF_TRUE if packet is end of the frame, to GF_FALSE otherwise
+\return error code if any
+*/
+GF_Err gf_filter_pck_get_framing(GF_FilterPacket *pck, Bool *is_start, Bool *is_end);
+
+/*! Sets Decoding Timestamp (DTS) of the packet. Do not set if unknown - automatic packet duration is based on DTS diff if DTS is present, otherwise in CTS diff.
+\param pck target packet
+\param dts decoding timestamp of packet, in PID timescale units
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_dts(GF_FilterPacket *pck, u64 dts);
+
+/*! Gets Decoding Timestamp (DTS) of the packet.
+\param pck target packet
+\return dts decoding timestamp of packet, in PID timescale units
+*/
+u64 gf_filter_pck_get_dts(GF_FilterPacket *pck);
+
+/*! Sets Composition Timestamp (CTS) of the packet. Do not set if unknown - automatic packet duration is based on DTS diff if DTS is present, otherwise in CTS diff.
+\param pck target packet
+\param cts composition timestamp of packet, in PID timescale units
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_cts(GF_FilterPacket *pck, u64 cts);
+
+/*! Gets Composition Timestamp (CTS) of the packet.
+\param pck target packet
+\return cts composition timestamp of packet, in PID timescale units
+*/
+u64 gf_filter_pck_get_cts(GF_FilterPacket *pck);
+
+/*! Returns packet timescale (same as PID timescale)
+\param pck target packet
+\return packet timescale
+*/
+u32 gf_filter_pck_get_timescale(GF_FilterPacket *pck);
+
+/*! Sets packet duration
+\param pck target packet
+\param duration duration of packet, in PID timescale units
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_duration(GF_FilterPacket *pck, u32 duration);
+
+/*! Gets packet duration
+\param pck target packet
+\return duration duration of packet, in PID timescale units
+*/
+u32 gf_filter_pck_get_duration(GF_FilterPacket *pck);
+
+/*! reallocates packet not yet sent. Returns data start and new range of data. This will reset byte offset information to not available.
+\param pck target packet
+\param nb_bytes_to_add bytes to add to packet
+\param data_start realloc pointer of packet data start - may be NULL if new_range_start is set
+\param new_range_start pointer to new (apppended space) data - may be NULL if data_start is set
+\param new_size full size of allocated block. - may be be NULL
+\return error code if any
+*/
+GF_Err gf_filter_pck_expand(GF_FilterPacket *pck, u32 nb_bytes_to_add, u8 **data_start, u8 **new_range_start, u32 *new_size);
+
+/*! Truncates packet not yet sent to given size
+\param pck target packet
+\param size new size to truncate to
+\return error code if any
+*/
+GF_Err gf_filter_pck_truncate(GF_FilterPacket *pck, u32 size);
+
+/*! SAP types as defined in annex I of ISOBMFF */
+typedef enum
+{
+	/*! no SAP */
+	GF_FILTER_SAP_NONE = 0,
+	/*! closed gop no leading */
+	GF_FILTER_SAP_1,
+	/*! closed gop leading */
+	GF_FILTER_SAP_2,
+	/*! open gop */
+	GF_FILTER_SAP_3,
+	/*! GDR */
+	GF_FILTER_SAP_4,
+} GF_FilterSAPType;
+
+/*! Sets packet SAP type
+\param pck target packet
+\param sap_type SAP type of the packet
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_sap(GF_FilterPacket *pck, GF_FilterSAPType sap_type);
+
+/*! Sets packet SAP type
+\param pck target packet
+\return sap_type SAP type of the packet
+*/
+GF_FilterSAPType gf_filter_pck_get_sap(GF_FilterPacket *pck);
+
+
+/*! Sets packet video interlacing flag
+\param pck target packet
+\param is_interlaced set to 0 if not interlaced, 1 for top field first/contains only top field, 2 for bottom field first/contains only bottom field.
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_interlaced(GF_FilterPacket *pck, u32 is_interlaced);
+
+/*! Gets packet video interlacing flag
+\param pck target packet
+\return interlaced flag, set to 0 if not interlaced, 1 for top field first, 2 otherwise.
+*/
+u32 gf_filter_pck_get_interlaced(GF_FilterPacket *pck);
+
+/*! Sets packet corrupted data flag
+\param pck target packet
+\param is_corrupted indicates if data in packet is corrupted
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_corrupted(GF_FilterPacket *pck, Bool is_corrupted);
+
+/*! Gets packet corrupted data flag
+\param pck target packet
+\return GF_TRUE if data in packet is corrupted
+*/
+Bool gf_filter_pck_get_corrupted(GF_FilterPacket *pck);
+
+/*! Sets seek flag of packet.
+For PIDs of stream type FILE with GF_PROP_PID_DISABLE_PROGRESSIVE set, the seek flag set to GF_TRUE indicates
+that the packet is a PATCH packet, replacing bytes located at gf_filter_pck_get_byte_offset in file if the interlaced flag of the packet is not set, or
+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.
+\param pck target packet
+\param is_seek indicates packet is seek frame
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_seek_flag(GF_FilterPacket *pck, Bool is_seek);
+
+/*! Gets packet seek data flag
+\param pck target packet
+\return GF_TRUE if packet is a seek packet
+*/
+Bool gf_filter_pck_get_seek_flag(GF_FilterPacket *pck);
+
+/*! Sets packet byte offset in source.
+byte offset should only be set if the data in the packet is exactly the same as the one at the given byte offset
+\param pck target packet
+\param byte_offset indicates the byte offset in the source. By default packets are created with no byte offset
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_byte_offset(GF_FilterPacket *pck, u64 byte_offset);
+
+/*! Sets packet byte offset in source
+\param pck target packet
+\return  byte offset in the source
+*/
+u64 gf_filter_pck_get_byte_offset(GF_FilterPacket *pck);
+
+/*! Sets packet roll info (number of packets to rewind/forward and decode to get a clean access point).
+\param pck target packet
+\param roll_count indicates the roll distance of this packet - only used for SAP 4 for now
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_roll_info(GF_FilterPacket *pck, s16 roll_count);
+
+/*! Gets packet roll info.
+\param pck target packet
+\return roll distance of this packet
+\return error code if any
+*/
+s16 gf_filter_pck_get_roll_info(GF_FilterPacket *pck);
+
+/*! Crypt flags for packet */
+#define GF_FILTER_PCK_CRYPT 1
+
+/*! Sets packet crypt flags
+\param pck target packet
+\param crypt_flag packet crypt flag
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_crypt_flags(GF_FilterPacket *pck, u8 crypt_flag);
+
+/*! Gets packet crypt flags
+\param pck target packet
+\return packet crypt flag
+*/
+u8 gf_filter_pck_get_crypt_flags(GF_FilterPacket *pck);
+
+/*! Packet clock reference types - used for MPEG-2 TS*/
+typedef enum
+{
+	/*! packet is not a clock reference */
+	GF_FILTER_CLOCK_NONE=0,
+	/*! packet is a PCR clock reference, expressed in PID timescale */
+	GF_FILTER_CLOCK_PCR,
+	/*! packet is a PCR clock discontinuity, expressed in PID timescale */
+	GF_FILTER_CLOCK_PCR_DISC,
+} GF_FilterClockType;
+
+/*! Sets packet clock type
+\param pck target packet
+\param ctype packet clock flag
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_clock_type(GF_FilterPacket *pck, GF_FilterClockType ctype);
+
+/*! Gets last clock type and clock value on PID. Always returns 0 if the source filter manages clock references internally cd \ref gf_filter_pid_set_clock_mode.
+\param PID target PID to query for clock
+\param clock_val last clock reference found
+\param timescale last clock reference timescale
+\return ctype packet clock flag
+*/
+GF_FilterClockType gf_filter_pid_get_clock_info(GF_FilterPid *PID, u64 *clock_val, u32 *timescale);
+
+/*! Gets clock type of packet. Always returns 0 if the source filter does NOT manages clock references internally cd \ref gf_filter_pid_set_clock_mode.
+\param pck target packet
+\return ctype packet clock flag
+*/
+GF_FilterClockType gf_filter_pck_get_clock_type(GF_FilterPacket *pck);
+
+/*! Sets packet carrousel info
+\param pck target packet
+\param version_number carrousel 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
+\param pck target packet
+\return version_number carrousel version number associated with this data chunk
+*/
+u8 gf_filter_pck_get_carousel_version(GF_FilterPacket *pck);
+
+/*! Sets packet sample dependency flags.
+
+Sample dependency flags have the same semantics as ISOBMFF:\n
+bit(2)is_leading bit(2)sample_depends_on (2)sample_is_depended_on (2)sample_has_redundancy\n
+\n
+is_leading takes one of the following four values:\n
+0: the leading nature of this sample is unknown;\n
+1: this sample is a leading sample that has a dependency before the referenced I-picture (and is therefore not decodable);\n
+2: this sample is not a leading sample;\n
+3: this sample is a leading sample that has no dependency before the referenced I-picture (and is therefore decodable);\n
+sample_depends_on takes one of the following four values:\n
+0: the dependency of this sample is unknown;\n
+1: this sample does depend on others (not an I picture);\n
+2: this sample does not depend on others (I picture);\n
+3: reserved\n
+sample_is_depended_on takes one of the following four values:\n
+0: the dependency of other samples on this sample is unknown;\n
+1: other samples may depend on this one (not disposable);\n
+2: no other sample depends on this one (disposable);\n
+3: reserved\n
+sample_has_redundancy takes one of the following four values:\n
+0: it is unknown whether there is redundant coding in this sample;\n
+1: there is redundant coding in this sample;\n
+2: there is no redundant coding in this sample;\n
+3: reserved\n
+
+\param pck target packet
+\param dep_flags sample dependency flags
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_dependency_flags(GF_FilterPacket *pck, u8 dep_flags);
+
+/*! Gets packet sample dependency flags.
+\param pck target packet
+\return dep_flags sample dependency flags - see \ref gf_filter_pck_set_dependency_flags for syntax.
+*/
+u8 gf_filter_pck_get_dependency_flags(GF_FilterPacket *pck);
+
+
+/*! Sets packet sequence number. Shall only be used when a filter handles a PLAY request based on packet sequence number
+\param pck target packet
+\param seq_num sequence number of packet
+\return error code if any
+*/
+GF_Err gf_filter_pck_set_seq_num(GF_FilterPacket *pck, u32 seq_num);
+
+/*! Gets packet sequence number info
+\param pck target packet
+\return version_number carrousel version number associated with this data chunk
+*/
+u32 gf_filter_pck_get_seq_num(GF_FilterPacket *pck);
+
+/*! Redefinition of GF_Matrix but without the maths.h include which breaks VideoToolBox on OSX/iOS */
+typedef struct __matrix GF_Matrix_unexposed;
+
+/*! frame interface flags*/
+enum
+{
+	/*! When set , indicates that the emitting filter will block until this frame is released.
+	Consumers of such a packet shall drop the packet as soon as possible, since it blocks the emiting filter.*/
+	GF_FRAME_IFCE_BLOCKING = 1,
+	/*! When set , indicates that the associated framebuffer is the main GL framebuffer.*/
+	GF_FRAME_IFCE_MAIN_GLFB = 1<<1
+};
+
+/*! Frame interface object
+
+The frame interface object can be used to expose an interface between the packet generated by a filter and its consumers, when dispatching a regular data block is not possible.
+This is typically used by decoders exposing the output image planes or by OpenGL filters outputing textures.
+Currently only video frames use this interface object.
+*/
+typedef struct _gf_filter_frame_interface
+{
+	/*! get video frame plane
+	\param frame interface object for the video frame
+	\param plane_idx plane index, 0: Y or full plane, 1: U or UV plane, 2: V plane
+	\param outPlane address of target color plane
+	\param outStride stride in bytes of target color plane
+	\return error code if any
+	*/
+	GF_Err (*get_plane)(struct _gf_filter_frame_interface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride);
+
+	/*! get video frame plane texture
+	\param frame interface object for the video frame
+	\param plane_idx plane index, 0: Y or full plane, 1: U or UV plane, 2: V plane
+	\param gl_tex_format GL texture format used
+	\param gl_tex_id GL texture ID used
+	\param texcoordmatrix texture transform to fill. The texture is expected to be layed out as an image (first pixel is top-first). If not the case, add a vertical flip (eg dispatching an OpenGL FBO). 	\return error code if any
+	*/
+	GF_Err (*get_gl_texture)(struct _gf_filter_frame_interface *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_Matrix_unexposed * texcoordmatrix);
+
+	/*! Flags for this frame interface.*/
+	u32 flags;
+
+	/*! private space for the emitting filter, consumers shall not modify this*/
+	void *user_data;
+} GF_FilterFrameInterface;
+
+
+/*! Allocates a new packet holding a reference to a frame interface object.
+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 frame_ifce the associated frame interface object
+\param destruct the destructor to be called upon packet release
+\return new packet
+*/
+GF_FilterPacket *gf_filter_pck_new_frame_interface(GF_FilterPid *PID, GF_FilterFrameInterface *frame_ifce, gf_fsess_packet_destructor destruct);
+
+/*! 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.
+
+\param pck the target packet
+\return the associated frame interface object if any, or NULL otherwise
+*/
+GF_FilterFrameInterface *gf_filter_pck_get_frame_interface(GF_FilterPacket *pck);
+
+
+/*! Checks if the packet is a blocking reference, i.e. a parent filter in the chain is waiting for its destruction to emit a new packet.
+This is typically used by sink filters to decide if they can hold references to input packets without blocking the chain.
+\param pck the target packet
+\return GF_TRUE if the packet is blocking or is a reference to a blocking packet, GF_FALSE otherwise
+*/
+Bool gf_filter_pck_is_blocking_ref(GF_FilterPacket *pck);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_FILTERS_H_
+

gpac-0.8.0.tar.gz/include/gpac/html5_media.h -> gpac-1.0.0.tar.gz/include/gpac/html5_media.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
+ *			Copyright (c) Telecom ParisTech 2013-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / HTML Media Element header
@@ -33,22 +33,24 @@
 
 
 /*!
- *	\file <gpac/html5_media.h>
- *	\brief Scene graph extensions for HTML5 media.
+\file <gpac/html5_media.h>
+\brief Scene graph extensions for HTML5 media.
  */
 	
-/*! \defgroup html5_grp HTML5
- *	\ingroup scene_grp
- *	\brief HTML5 extensions of the scene graph.
- *	
+/*!
+\defgroup html5_grp HTML5
+\ingroup scene_grp
+\brief HTML5 extensions of the scene graph.
 */
+
 /*!
- *  \addtogroup html5media_grp HTML5 media
- *	\ingroup html5_grp
- *	\brief Scene graph extensions for HTML5 media.
- *
- *This section documents the scene graph extensions used for HTML5 media (video).
- *	@{
+\addtogroup html5media_grp HTML5 media
+\ingroup html5_grp
+\brief Scene graph extensions for HTML5 media.
+
+This section documents the scene graph extensions used for HTML5 media (video).
+
+@{
  */
 
 #include <gpac/internal/scenegraph_dev.h>
@@ -62,52 +64,49 @@
 
 #include <gpac/download.h>
 #include <gpac/network.h>
-#include <gpac/modules/service.h>
 #include <gpac/xml.h>
-#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
 
-#ifdef GPAC_HAS_SPIDERMONKEY
-#include <gpac/internal/smjs_api.h>
-#endif
+#ifdef GPAC_ENABLE_HTML5_MEDIA
 
 typedef struct
 {
 	u32 nb_inst;
 	/* Basic classes */
-	GF_JSClass  arrayBufferClass;
+	JSClassDef  arrayBufferClass;
 
 	/*HTML Media classes*/
-	GF_JSClass  htmlVideoElementClass;
-	GF_JSClass  htmlAudioElementClass;
-	GF_JSClass  htmlSourceElementClass;
-	GF_JSClass  htmlTrackElementClass;
-	GF_JSClass  htmlMediaElementClass;
-	GF_JSClass  mediaControllerClass;
-	GF_JSClass  audioTrackListClass;
-	GF_JSClass  audioTrackClass;
-	GF_JSClass  videoTrackListClass;
-	GF_JSClass  videoTrackClass;
-	GF_JSClass  textTrackListClass;
-	GF_JSClass  textTrackClass;
-	GF_JSClass  textTrackCueListClass;
-	GF_JSClass  textTrackCueClass;
-	GF_JSClass  timeRangesClass;
-	GF_JSClass  trackEventClass;
-	GF_JSClass  mediaErrorClass;
+	JSClassDef  htmlVideoElementClass;
+	JSClassDef  htmlAudioElementClass;
+	JSClassDef  htmlSourceElementClass;
+	JSClassDef  htmlTrackElementClass;
+	JSClassDef  htmlMediaElementClass;
+	JSClassDef  mediaControllerClass;
+	JSClassDef  audioTrackListClass;
+	JSClassDef  audioTrackClass;
+	JSClassDef  videoTrackListClass;
+	JSClassDef  videoTrackClass;
+	JSClassDef  textTrackListClass;
+	JSClassDef  textTrackClass;
+	JSClassDef  textTrackCueListClass;
+	JSClassDef  textTrackCueClass;
+	JSClassDef  timeRangesClass;
+	JSClassDef  trackEventClass;
+	JSClassDef  mediaErrorClass;
 
 	/* Media Source Extensions */
-	GF_JSClass  mediaSourceClass;
-	GF_JSClass  sourceBufferClass;
-	GF_JSClass  sourceBufferListClass;
-	GF_JSClass  URLClass;
+	JSClassDef  mediaSourceClass;
+	JSClassDef  sourceBufferClass;
+	JSClassDef  sourceBufferListClass;
+	JSClassDef  URLClass;
 
 	/* Media Capture */
-	GF_JSClass  mediaStreamClass;
-	GF_JSClass  localMediaStreamClass;
-	GF_JSClass  mediaStreamTrackClass;
-	GF_JSClass  mediaStreamTrackListClass;
-	GF_JSClass  navigatorUserMediaClass;
-	GF_JSClass  navigatorUserMediaErrorClass;
+	JSClassDef  mediaStreamClass;
+	JSClassDef  localMediaStreamClass;
+	JSClassDef  mediaStreamTrackClass;
+	JSClassDef  mediaStreamTrackListClass;
+	JSClassDef  navigatorUserMediaClass;
+	JSClassDef  navigatorUserMediaErrorClass;
 } GF_HTML_MediaRuntime;
 
 /************************************************************
@@ -177,7 +176,7 @@
     JSObject                *_this;\
     /* GPAC-specific properties */\
     u32                     bin_id;    /* track id */\
-    LPNETCHANNEL            channel;   /* channel object used by the terminal */\
+    void *            channel;   /* channel object used by the terminal */\
     GF_ObjectDescriptor     *od;       /* MPEG-4 Object descriptor for this track */\
     GF_List                 *buffer;   /* List of MSE Packets */\
     u32						packet_index;   /* index of MSE Packets*/\
@@ -322,7 +321,7 @@
 	u32     length;
 	char    *url;
 	Bool	is_init;
-
+	GF_Blob blob;
 	/* used to do proper garbage collection between JS and Terminal */
 	u32     reference_count;
 } GF_HTML_ArrayBuffer;
@@ -372,10 +371,13 @@
 /*
  * HTML5 Array Buffer
  */
-GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length);
-JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent);
+GF_HTML_ArrayBuffer *gf_arraybuffer_new(u8 *data, u32 length);
+JSObject *gf_arraybuffer_js_new(JSContext *c, u8 *data, u32 length, JSObject *parent);
 void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js);
 
+
+#endif //GPAC_ENABLE_HTML5_MEDIA
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.8.0.tar.gz/include/gpac/html5_mse.h -> gpac-1.0.0.tar.gz/include/gpac/html5_mse.h Changed

gpac-0.8.0.tar.gz/include/gpac/ietf.h -> gpac-1.0.0.tar.gz/include/gpac/ietf.h Changed

gpac-0.8.0.tar.gz/include/gpac/internal/avilib.h -> gpac-1.0.0.tar.gz/include/gpac/internal/avilib.h Changed

@@ -289,6 +289,8 @@
 #ifndef WAVE_FORMAT_PCM
 #define WAVE_FORMAT_PCM                 (0x0001)
 #endif
+#endif
+
 #define WAVE_FORMAT_ADPCM               (0x0002)
 #define WAVE_FORMAT_IBM_CVSD            (0x0005)
 #define WAVE_FORMAT_ALAW                (0x0006)
@@ -303,27 +305,20 @@
 #define IBM_FORMAT_MULAW                (0x0101)
 #define IBM_FORMAT_ALAW                 (0x0102)
 #define IBM_FORMAT_ADPCM                (0x0103)
-#endif
 
 avi_t* AVI_open_output_file(char * filename);
 void AVI_set_video(avi_t *AVI, int width, int height, double fps, char *compressor);
 void AVI_set_audio(avi_t *AVI, int channels, int rate, int bits, int format, int mp3rate);
-int  AVI_write_frame(avi_t *AVI, char *data, int bytes, int keyframe);
-int  AVI_dup_frame(avi_t *AVI);
-int  AVI_write_audio(avi_t *AVI, char *data, int bytes);
-int  AVI_append_audio(avi_t *AVI, char *data, int bytes);
-u64 AVI_bytes_remain(avi_t *AVI);
+int  AVI_write_frame(avi_t *AVI, u8 *data, int bytes, int keyframe);
+int  AVI_write_audio(avi_t *AVI, u8 *data, int bytes);
 int  AVI_close(avi_t *AVI);
-u64 AVI_bytes_written(avi_t *AVI);
 
 avi_t *AVI_open_input_file(char *filename, int getIndex);
 avi_t *AVI_open_input_indexfile(char *filename, int getIndex, char *indexfile);
-avi_t *AVI_open_fd(FILE *fd, int getIndex);
 avi_t *AVI_open_indexfd(FILE *fd, int getIndex, char *indexfile);
 int avi_parse_input_file(avi_t *AVI, int getIndex);
 int avi_parse_index_from_file(avi_t *AVI, char *filename);
 int AVI_audio_mp3rate(avi_t *AVI);
-int AVI_audio_padrate(avi_t *AVI);
 int AVI_video_frames(avi_t *AVI);
 int  AVI_video_width(avi_t *AVI);
 int  AVI_video_height(avi_t *AVI);
@@ -336,28 +331,18 @@
 int AVI_audio_rate(avi_t *AVI);
 u64 AVI_audio_bytes(avi_t *AVI);
 int AVI_audio_chunks(avi_t *AVI);
-int  AVI_can_read_audio(avi_t *AVI);
-
-int AVI_max_video_chunk(avi_t *AVI);
 
 int AVI_frame_size(avi_t *AVI, int frame);
 int AVI_audio_size(avi_t *AVI, int frame);
-int  AVI_seek_start(avi_t *AVI);
-int  AVI_set_video_position(avi_t *AVI, int frame);
-u64 AVI_get_video_position(avi_t *AVI, int frame);
-int AVI_read_frame(avi_t *AVI, char *vidbuf, int *keyframe);
-
-int  AVI_set_audio_position(avi_t *AVI, int byte);
-int  AVI_set_audio_bitrate(avi_t *AVI, int bitrate);
 
-int AVI_get_audio_position_index(avi_t *AVI);
-int  AVI_set_audio_position_index(avi_t *AVI, int indexpos);
+u64 AVI_get_video_position(avi_t *AVI, int frame);
+int AVI_read_frame(avi_t *AVI, u8 *vidbuf, int *keyframe);
 
-int AVI_read_audio(avi_t *AVI, char *audbuf, int bytes, int *continuous);
+int AVI_read_audio(avi_t *AVI, u8 *audbuf, int bytes, int *continuous);
 
-int  AVI_read_data(avi_t *AVI, char *vidbuf, int max_vidbuf,
-                   char *audbuf, int max_audbuf,
-                   int *len);
+int AVI_seek_start(avi_t *AVI);
+int AVI_set_video_position(avi_t *AVI, int frame);
+int AVI_set_audio_position(avi_t *AVI, int byte);
 
 int AVI_scan(char *name);
 int AVI_dump(char *name, int mode);
@@ -366,16 +351,12 @@
 int AVI_file_check(char *import_file);
 
 void AVI_info(avi_t *avifile);
-u64 AVI_max_size(void);
 int avi_update_header(avi_t *AVI);
 
 int AVI_set_audio_track(avi_t *AVI, u32 track);
 int AVI_get_audio_track(avi_t *AVI);
 int AVI_audio_tracks(avi_t *AVI);
 
-void AVI_set_audio_vbr(avi_t *AVI, int is_vbr);
-int AVI_get_audio_vbr(avi_t *AVI);
-
 void AVI_set_comment_fd(avi_t *AVI, int fd);
 int  AVI_get_comment_fd(avi_t *AVI);

gpac-0.8.0.tar.gz/include/gpac/internal/bifs_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/bifs_dev.h Changed

gpac-0.8.0.tar.gz/include/gpac/internal/camera.h -> gpac-1.0.0.tar.gz/include/gpac/internal/camera.h Changed

@@ -173,12 +173,12 @@
 /*updates camera. user transform is only used in 2D to set global user zoom/pan/translate*/
 void camera_update(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords);
 /*updates camera. user transform is only used in 2D to set global user zoom/pan/translate + stereo param*/
-void camera_update_stereo(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords, Fixed horizontal_shift, Fixed viewing_distance, Fixed viewing_distance_offset, u32 camera_layout);
+void camera_update_stereo(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords, Fixed horizontal_shift, Fixed viewing_distance, Fixed viewing_distance_offset, u32 camlay);
 /*reset to last viewport*/
 void camera_reset_viewpoint(GF_Camera *cam, Bool animate);
 /*move camera to given vp*/
 void camera_move_to(GF_Camera *cam, SFVec3f pos, SFVec3f target, SFVec3f up);
-Bool camera_animate(GF_Camera *cam);
+Bool camera_animate(GF_Camera *cam, void *compositor);
 void camera_stop_anim(GF_Camera *cam);
 /*start jump mode*/
 void camera_jump(GF_Camera *cam);

gpac-0.8.0.tar.gz/include/gpac/internal/compositor_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/compositor_dev.h Changed

gpac-0.8.0.tar.gz/include/gpac/internal/dvb_mpe_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/dvb_mpe_dev.h Changed

@@ -119,7 +119,7 @@
 
 typedef struct
 {
-	char *data;                        /* Data */
+	u8 *data;                        /* Data */
 	u32 u32_version;                   /* IP version */
 	u32 u32_hdr_length;                /* header length by piece of 4 bytes */
 	u32 u32_total_length;              /* the length of the datagram (hdr+payload) in bytes */
@@ -179,7 +179,7 @@
 
 
 /* Get INT table */
-void gf_m2ts_process_int(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *ip_table, unsigned char *data, u32 data_size, u32 table_id);
+void gf_m2ts_process_int(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *ip_table, u8 *data, u32 data_size, u32 table_id);
 
 void section_DSMCC_INT(GF_M2TS_IP_PLATFORM* ip_platform, u8 *data, u32 data_size);
 
@@ -223,12 +223,12 @@
 };
 
 
-void gf_m2ts_process_mpe(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_MPE *mpe, unsigned char *data, u32 data_size, u8 table_id);
+void gf_m2ts_process_mpe(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_MPE *mpe, u8 *data, u32 data_size, u8 table_id);
 void gf_m2ts_gather_ipdatagram_information(MPE_FEC_FRAME *mff,GF_M2TS_Demuxer *ts);
 
 void socket_simu(GF_M2TS_IP_Packet *ip_packet, GF_M2TS_Demuxer *ts, Bool yield);
 
-void gf_m2ts_mpe_send_datagram(GF_M2TS_Demuxer *ts, u32 pid, unsigned char *data, u32 data_size);
+void gf_m2ts_mpe_send_datagram(GF_M2TS_Demuxer *ts, u32 pid, u8 *data, u32 data_size);
 
 /* allocate the necessary memory space*/
 u32 init_frame(MPE_FEC_FRAME * mff, u32 rows);

gpac-0.8.0.tar.gz/include/gpac/internal/ietf_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/ietf_dev.h Changed

@@ -30,8 +30,6 @@
 
 #ifndef GPAC_DISABLE_STREAMING
 
-#include <gpac/thread.h>
-
 /*
 			RTP intern
 */
@@ -83,7 +81,7 @@
 /*Adds a packet to the queue. Packet Data is memcopied*/
 GF_Err gf_rtp_reorderer_add(GF_RTPReorder *po, const void * pck, u32 pck_size, u32 pck_seqnum);
 /*gets the output of the queue. Packet Data IS YOURS to delete*/
-void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size);
+void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush);
 
 
 /*the RTP channel with both RTP and RTCP sockets and buffers
@@ -127,7 +125,7 @@
 	u32 TimeScale;
 
 	/*static buffer for RTP sending*/
-	char *send_buffer;
+	u8 *send_buffer;
 	u32 send_buffer_size;
 	u32 pck_sent_since_last_sr;
 	u32 last_pck_ts;
@@ -163,6 +161,12 @@
 	u32 last_SR_rtp_time;
 	/*payload info*/
 	u32 total_pck, total_bytes;
+
+	GF_BitStream *bs_r, *bs_w;
+	Bool no_select;
+
+	gf_rtp_tcp_callback send_interleave;
+	void *interleave_cbk1, *interleave_cbk2;
 };
 
 /*gets UTC in the channel RTP timescale*/
@@ -185,7 +189,7 @@
 
 #define RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, str)		\
 	if (strlen((const char *) str)+pos >= buf_size) {	\
-		buf_size += RTSP_WRITE_STEPALLOC;	\
+		buf_size += (u32) strlen((const char *) str);	\
 		buf = (char *) gf_realloc(buf, buf_size);		\
 	}	\
 	strcpy(buf+pos, (const char *) str);		\
@@ -204,25 +208,33 @@
 	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, "\r\n");	\
 	}	\
  
-#define RTSP_WRITE_INT(buf, buf_size, pos, d, sig)		\
+#define RTSP_WRITE_INT(buf, buf_size, pos, d, sig)	{	\
+	char temp[50]; \
 	if (sig < 0) { \
 		sprintf(temp, "%d", d);		\
 	} else { \
 		sprintf(temp, "%d", d);		\
 	}	\
-	RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, temp);
+	RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, temp); \
+	}
 
-#define RTSP_WRITE_FLOAT_WITHOUT_CHECK(buf, buf_size, pos, d)		\
-	sprintf(temp, "%.4f", d);		\
-	RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, temp);
+#define RTSP_WRITE_HEX(buf, buf_size, pos, d, sig)	{	\
+	char temp[50]; \
+	sprintf(temp, "%X", d);		\
+	RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, temp);\
+	}
 
-#define RTSP_WRITE_FLOAT(buf, buf_size, pos, d)		\
+#define RTSP_WRITE_FLOAT_WITHOUT_CHECK(buf, buf_size, pos, d) {		\
+	char temp[50]; \
 	sprintf(temp, "%.4f", d);		\
-	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, temp);
+	RTSP_WRITE_ALLOC_STR_WITHOUT_CHECK(buf, buf_size, pos, temp);\
+	}
 
-/*default packet size, but resize on the fly if needed*/
-#define RTSP_PCK_SIZE			6000
-#define RTSP_TCP_BUF_SIZE		0x10000ul
+#define RTSP_WRITE_FLOAT(buf, buf_size, pos, d)	{	\
+	char temp[50]; \
+	sprintf(temp, "%.4f", d);		\
+	RTSP_WRITE_ALLOC_STR(buf, buf_size, pos, temp); \
+	}
 
 
 typedef struct
@@ -273,23 +285,20 @@
 	char RTSPLastRequest[40];
 
 	/*current buffer from TCP if any*/
-	char TCPBuffer[RTSP_TCP_BUF_SIZE];
+	u8 *tcp_buffer;
 	u32 CurrentSize, CurrentPos;
 
 	/*RTSP interleaving*/
-	GF_Err (*RTSP_SignalData)(GF_RTSPSession *sess, void *chan, char *buffer, u32 bufferSize, Bool IsRTCP);
+	GF_Err (*RTSP_SignalData)(GF_RTSPSession *sess, void *chan, u8 *buffer, u32 bufferSize, Bool IsRTCP);
 
 	/*buffer for pck reconstruction*/
-	char *rtsp_pck_buf;
+	u8 *rtsp_pck_buf;
 	u32 rtsp_pck_size;
 	u32 pck_start, payloadSize;
 
 	/*all RTP channels in an interleaved RTP on RTSP session*/
 	GF_List *TCPChannels;
-	/*thread-safe, full duplex library for PLAY and RECORD*/
-	GF_Mutex *mx;
-
-	char *MobileIP;
+	Bool interleaved;
 };
 
 GF_RTSPSession *gf_rtsp_session_new(char *sURL, u16 DefaultPort);
@@ -297,7 +306,7 @@
 /*check connection status*/
 GF_Err gf_rtsp_check_connection(GF_RTSPSession *sess);
 /*send data on RTSP*/
-GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, char *buffer, u32 Size);
+GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, u8 *buffer, u32 Size);
 
 /*
 			Common RTSP tools
@@ -312,9 +321,9 @@
 /*force a fill on TCP buffer - used for de-interleaving and TCP-fragmented RTSP messages*/
 GF_Err gf_rtsp_refill_buffer(GF_RTSPSession *sess);
 /*parses a transport string and returns a transport structure*/
-GF_RTSPTransport *gf_rtsp_transport_parse(char *buffer);
+GF_RTSPTransport *gf_rtsp_transport_parse(u8 *buffer);
 /*parsing of header for com and rsp*/
-GF_Err gf_rtsp_parse_header(char *buffer, u32 BufferSize, u32 BodyStart, GF_RTSPCommand *com, GF_RTSPResponse *rsp);
+GF_Err gf_rtsp_parse_header(u8 *buffer, u32 BufferSize, u32 BodyStart, GF_RTSPCommand *com, GF_RTSPResponse *rsp);
 void gf_rtsp_set_command_value(GF_RTSPCommand *com, char *Header, char *Value);
 void gf_rtsp_set_response_value(GF_RTSPResponse *rsp, char *Header, char *Value);
 /*deinterleave a data packet*/
@@ -323,22 +332,180 @@
 GF_Err gf_rtsp_http_tunnel_start(GF_RTSPSession *sess, char *UserAgent);
 
 
+
+
+
+/*
+		RTP -> SL packetization tool
+	You should ONLY modify the GF_SLHeader while packetizing, all the rest is private
+	to the tool.
+	Also note that AU start/end is automatically updated, therefore you should only
+	set CTS-DTS-OCR-sequenceNumber (which is automatically incremented when splitting a payload)
+	-padding-idle infos
+	SL flags are computed on the fly, but you may wish to modify them in case of
+	packet drop/... at the encoder side
+
+*/
+struct __tag_rtp_packetizer
+{
+	/*input packet sl header cfg. modify only if needed*/
+	GF_SLHeader sl_header;
+	u32 nb_aus;
+	/*
+
+		PRIVATE _ DO NOT TOUCH
+	*/
+
+//! @cond Doxygen_Suppress
+
+	/*RTP payload type (RFC type, NOT the RTP hdr payT)*/
+	u32 rtp_payt;
+	/*packetization flags*/
+	u32 flags;
+	/*Path MTU size without 12-bytes RTP header*/
+	u32 Path_MTU;
+	/*max packet duration in RTP TS*/
+	u32 max_ptime;
+
+	/*payload type of RTP packets - only one payload type can be used in GPAC*/
+	u8 PayloadType;
+
+	/*RTP header of current packet*/
+	GF_RTPHeader rtp_header;
+
+	/*RTP packet handling callbacks*/
+	void (*OnNewPacket)(void *cbk_obj, GF_RTPHeader *header);
+	void (*OnPacketDone)(void *cbk_obj, GF_RTPHeader *header);
+	void (*OnDataReference)(void *cbk_obj, u32 payload_size, u32 offset_from_orig);
+	void (*OnData)(void *cbk_obj, u8 *data, u32 data_size, Bool is_header);
+	void *cbk_obj;
+
+	/*********************************
+		MPEG-4 Generic hinting
+	*********************************/
+
+	/*SL to RTP map*/
+	GP_RTPSLMap slMap;
+	/*SL conf and state*/
+	GF_SLConfig sl_config;
+
+	/*set to 1 if firstSL in RTP packet*/
+	Bool first_sl_in_rtp;
+	Bool has_AU_header;
+	/*current info writers*/
+	GF_BitStream *pck_hdr, *payload;
+
+	/*AU SN of last au*/
+	u32 last_au_sn;
+
+	/*info for the current packet*/
+	u32 auh_size, bytesInPacket;
+
+	/*********************************
+			ISMACryp info
+	*********************************/
+	Bool force_flush, is_encrypted;
+	u64 IV, first_AU_IV;
+	char *key_indicator;
+
+	/*********************************
+			AVC-H264 info
+	*********************************/
+	/*AVC non-IDR flag: set if all NAL in current packet are non-IDR (disposable)*/
+	Bool avc_non_idr;
+
+	/*********************************
+			AC3 info
+	*********************************/
+	/*ac3 ft flags*/
+	u8 ac3_ft;
+
+	/*********************************
+			HEVC-H265 info
+	*********************************/
+	/*HEVC Payload Header. It will be use in case of Aggreation Packet where we must add payload header for packet after having added of NALU to AP*/
+	char hevc_payload_hdr[2];
+
+//! @endcond
+
+};
+
 /*packetization routines*/
-GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_h263(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_amr(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_h263(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_amr(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
 #ifndef GPAC_DISABLE_AV_PARSERS
-GF_Err gp_rtp_builder_do_mpeg12_video(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mpeg12_video(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
 #endif
-GF_Err gp_rtp_builder_do_mpeg12_audio(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_tx3g(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex);
-GF_Err gp_rtp_builder_do_avc(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_qcelp(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_smv(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_latm(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration);
-GF_Err gp_rtp_builder_do_dims(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration);
-GF_Err gp_rtp_builder_do_ac3(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
-GF_Err gp_rtp_builder_do_hevc(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mpeg12_audio(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_tx3g(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex);
+GF_Err gp_rtp_builder_do_avc(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_qcelp(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_smv(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_latm(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration);
+GF_Err gp_rtp_builder_do_ac3(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_hevc(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+GF_Err gp_rtp_builder_do_mp2t(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize);
+
+/*! RTP depacketization tool*/
+struct __tag_rtp_depacketizer
+{
+	/*! depacketize routine*/
+	void (*depacketize)(struct __tag_rtp_depacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size);
+
+	/*! output packet sl header cfg*/
+	GF_SLHeader sl_hdr;
+
+	/*! RTP payload type (RFC type, NOT the RTP hdr payT)*/
+	u32 payt;
+	/*! depacketization flags*/
+	u32 flags;
+
+	//! RTP static map may be NULL
+	const GF_RTPStaticMap *static_map;
+
+	/*! callback routine*/
+	gf_rtp_packet_cbk on_sl_packet;
+	/*! callback udta*/
+	void *udta;
+
+	/*! SL <-> RTP map*/
+	GP_RTPSLMap sl_map;
+	/*! RTP clock rate*/
+	u32 clock_rate;
+
+	//! clip rect X
+	u32 x;
+	//! clip rect Y
+	u32 y;
+	//! clip rect or full size width
+	u32 w;
+	//! clip rect or full size height
+	u32 h;
+
+	/*! inter-packet reconstruction bitstream (for 3GP text and H264)*/
+	GF_BitStream *inter_bs;
+
+	/*! H264/AVC config*/
+	u32 h264_pck_mode;
+
+	/*3GP text reassembler state*/
+	/*! number of 3GPP text fragments*/
+	u8 nb_txt_frag;
+	/*! current 3GPP text fragments*/
+	u8 cur_txt_frag;
+	/*! current 3GPP text sample desc index*/
+	u8 sidx;
+	/*! 3GPP text total sample text len*/
+	u8 txt_len;
+	/*! number of 3GPP text modifiers*/
+	u8 nb_mod_frag;
+
+	/*! ISMACryp scheme*/
+	u32 isma_scheme;
+	/*! ISMACryp key*/
+	char *key;
+};
 
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/include/gpac/internal/isomedia_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/isomedia_dev.h Changed

@@ -99,7 +99,6 @@
 	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_PSSH	= GF_4CC( 'p', 's', 's', 'h' ),
 	GF_ISOM_BOX_TYPE_TENC	= GF_4CC( 't', 'e', 'n', 'c' ),
 
 	//track group
@@ -130,6 +129,10 @@
 	GF_ISOM_BOX_TYPE_TRAF	= GF_4CC( 't', 'r', 'a', 'f' ),
 	GF_ISOM_BOX_TYPE_TFHD	= GF_4CC( 't', 'f', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_TRUN	= GF_4CC( 't', 'r', 'u', 'n' ),
+#ifdef GF_ENABLE_CTRN
+	GF_ISOM_BOX_TYPE_CTRN	= GF_4CC( 'c', 't', 'r', 'n' ),
+#endif
+
 #endif
 
 
@@ -176,6 +179,9 @@
 	GF_ISOM_BOX_TYPE_HVC1	= GF_4CC( 'h', 'v', 'c', '1' ),
 	GF_ISOM_BOX_TYPE_HEV1	= GF_4CC( 'h', 'e', 'v', '1' ),
 	GF_ISOM_BOX_TYPE_HVT1	= GF_4CC( 'h', 'v', 't', '1' ),
+	GF_ISOM_BOX_TYPE_MVCI	= GF_4CC( 'm', 'v', 'c', 'i' ),
+	GF_ISOM_BOX_TYPE_MVCG	= GF_4CC( 'm', 'v', 'c', 'g' ),
+	GF_ISOM_BOX_TYPE_VWID	= GF_4CC( 'v', 'w', 'i', 'd' ),
 
 	GF_ISOM_BOX_TYPE_HVC2	= GF_4CC( 'h', 'v', 'c', '2' ),
 	GF_ISOM_BOX_TYPE_HEV2	= GF_4CC( 'h', 'e', 'v', '2' ),
@@ -218,6 +224,7 @@
 	GF_ISOM_BOX_TYPE_SSIX	= GF_4CC( 's', 's', 'i', 'x' ),
 	GF_ISOM_BOX_TYPE_LEVA   = GF_4CC( 'l', 'e', 'v', 'a' ),
 	GF_ISOM_BOX_TYPE_PCRB	= GF_4CC( 'p', 'c', 'r', 'b' ),
+	GF_ISOM_BOX_TYPE_EMSG	= GF_4CC( 'e', 'm', 's', 'g' ),
 
 	/*3GPP text / MPEG-4 StreamingText*/
 	GF_ISOM_BOX_TYPE_FTAB	= GF_4CC( 'f', 't', 'a', 'b' ),
@@ -448,15 +455,19 @@
 	GF_ISOM_BOX_TYPE_BLOC	= GF_4CC( 'b', 'l', 'o', 'c' ),
 	GF_ISOM_BOX_TYPE_AINF	= GF_4CC( 'a', 'i', 'n', 'f' ),
 
+	/*JPEG2000*/
+	GF_ISOM_BOX_TYPE_MJP2	= GF_4CC('m','j','p','2'),
 	GF_ISOM_BOX_TYPE_IHDR	= GF_4CC('i','h','d','r'),
 	GF_ISOM_BOX_TYPE_JP  	= GF_4CC('j','P',' ',' '),
 	GF_ISOM_BOX_TYPE_JP2H	= GF_4CC('j','p','2','h'),
 	GF_ISOM_BOX_TYPE_JP2K	= GF_4CC('j','p','2','k'),
+
 	GF_ISOM_BOX_TYPE_JPEG	= GF_4CC('j','p','e','g'),
 	GF_ISOM_BOX_TYPE_PNG 	= GF_4CC('p','n','g',' '),
 
 	/* apple QT box */
 	GF_QT_BOX_TYPE_ALIS = GF_4CC('a','l','i','s'),
+	GF_QT_BOX_TYPE_LOAD = GF_4CC('l','o','a','d'),
 	GF_QT_BOX_TYPE_WIDE = GF_4CC('w','i','d','e'),
 	GF_QT_BOX_TYPE_GMIN	= GF_4CC( 'g', 'm', 'i', 'n' ),
 	GF_QT_BOX_TYPE_TAPT	= GF_4CC( 't', 'a', 'p', 't' ),
@@ -475,20 +486,9 @@
 	GF_QT_BOX_TYPE_GAMA = GF_4CC('g','a','m','a'),
 	GF_QT_BOX_TYPE_CHRM = GF_4CC('c','h','r','m'),
 
-	GF_QT_BOX_TYPE_C608	= GF_4CC( 'c', '6', '0', '8' ),
-	GF_QT_BOX_TYPE_APCH	= GF_4CC( 'a', 'p', 'c', 'h' ),
-	GF_QT_BOX_TYPE_APCO	= GF_4CC( 'a', 'p', 'c', 'o' ),
-	GF_QT_BOX_TYPE_APCN	= GF_4CC( 'a', 'p', 'c', 'n' ),
-	GF_QT_BOX_TYPE_APCS	= GF_4CC( 'a', 'p', 'c', 's' ),
-	GF_QT_BOX_TYPE_APCF	= GF_4CC( 'a', 'p', 'c', 'f' ),
-	GF_QT_BOX_TYPE_AP4X	= GF_4CC( 'a', 'p', '4', 'x' ),
-	GF_QT_BOX_TYPE_AP4H	= GF_4CC( 'a', 'p', '4', 'h' ),
-
 	/* from drm_sample.c */
 	GF_ISOM_BOX_TYPE_264B 	= GF_4CC('2','6','4','b'),
 	GF_ISOM_BOX_TYPE_265B 	= GF_4CC('2','6','5','b'),
-	GF_ISOM_BOX_TYPE_AV1B 	= GF_4CC('a','v','1','b'),
-	GF_ISOM_BOX_TYPE_VP9B   = GF_4CC('v','p','9','b'),
 
 	/*MPEG-H 3D audio*/
 	GF_ISOM_BOX_TYPE_MHA1 	= GF_4CC('m','h','a','1'),
@@ -497,35 +497,41 @@
 	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_IPCM 	= GF_4CC('i','p','c','m'),
+	GF_ISOM_BOX_TYPE_FPCM 	= GF_4CC('f','p','c','m'),
+	GF_ISOM_BOX_TYPE_PCMC 	= GF_4CC('p','c','m','C'),
+
+	GF_ISOM_BOX_TYPE_CHNL 	= GF_4CC('c','h','n','l'),
 
 	GF_ISOM_BOX_TYPE_AUXV 	= GF_4CC('A','U','X','V'),
 
-	/*QTFF audio codes*/
-	GF_QT_BOX_TYPE_AUDIO_RAW 	= GF_4CC('r','a','w',' '),
-	GF_QT_BOX_TYPE_AUDIO_TWOS 	= GF_4CC('t','w','o','s'),
-	GF_QT_BOX_TYPE_AUDIO_SOWT 	= GF_4CC('s','o','w','t'),
-	GF_QT_BOX_TYPE_AUDIO_FL32 	= GF_4CC('f','l','3','2'),
-	GF_QT_BOX_TYPE_AUDIO_FL64 	= GF_4CC('f','l','6','4'),
-	GF_QT_BOX_TYPE_AUDIO_IN24 	= GF_4CC('i','n','2','4'),
-	GF_QT_BOX_TYPE_AUDIO_IN32 	= GF_4CC('i','n','3','2'),
-	GF_QT_BOX_TYPE_AUDIO_ULAW 	= GF_4CC('u','l','a','w'),
-	GF_QT_BOX_TYPE_AUDIO_ALAW 	= GF_4CC('a','l','a','w'),
-	GF_QT_BOX_TYPE_AUDIO_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x02),
-	GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x11),
-	GF_QT_BOX_TYPE_AUDIO_DVCA 	= GF_4CC('d','v','c','a'),
-	GF_QT_BOX_TYPE_AUDIO_QDMC 	= GF_4CC('Q','D','M','C'),
-	GF_QT_BOX_TYPE_AUDIO_QDMC2	= GF_4CC('Q','D','M','2'),
-	GF_QT_BOX_TYPE_AUDIO_QCELP	= GF_4CC('Q','c','l','p'),
-	GF_QT_BOX_TYPE_AUDIO_kMP3 	= GF_4CC(0x6D,0x73,0x00,0x55),
+	GF_ISOM_BOX_TYPE_FLAC	= GF_4CC( 'f', 'L', 'a', 'C' ),
+	GF_ISOM_BOX_TYPE_DFLA	= GF_4CC( 'd', 'f', 'L', 'a' ),
+
+	//internal only
+	GF_QT_SUBTYPE_RAW_AUD 	= GF_4CC('Q','T','R','A'),
+	GF_QT_SUBTYPE_RAW_VID 	= GF_4CC('Q','T','R','V'),
+
+
 };
 
 enum
 {
 	GF_ISOM_SAMPLE_ENTRY_UNKN = 0,
 	GF_ISOM_SAMPLE_ENTRY_VIDEO = GF_4CC('v','i','d','e'),
-	GF_ISOM_SAMPLE_ENTRY_AUDIO = GF_4CC('a','u','d','i')
+	GF_ISOM_SAMPLE_ENTRY_AUDIO = GF_4CC('a','u','d','i'),
+	GF_ISOM_SAMPLE_ENTRY_MP4S = GF_4CC('m','p','4','s')
+
 };
 
+
+/* bitstream cookies used by isobmff lib*/
+#define GF_ISOM_BS_COOKIE_NO_LOGS		1
+#define GF_ISOM_BS_COOKIE_VISUAL_TRACK	(1<<1)
+#define GF_ISOM_BS_COOKIE_QT_CONV		(1<<2)
+#define GF_ISOM_BS_COOKIE_CLONE_TRACK	(1<<3)
+
+
 #ifndef GPAC_DISABLE_ISOM
 
 
@@ -533,22 +539,30 @@
 #define GPAC_DISABLE_ISOM_ADOBE
 #endif
 
+//internal flags (up to 16)
+//if flag is set, position checking of child boxes is ignored
+#define GF_ISOM_ORDER_FREEZE 1
+
 	/*the default size is 64, cause we need to handle large boxes...
 
-	the other_boxes container is by default NOT created. When parsing a box and adding
-	a sub-box with gf_isom_box_add_default, the list is created.
-	This list is destroyed befaore calling the final box destructor
-	This list is automatically taken into account during size() and write() functions
+	the child_boxes container is by default NOT created. When parsing a box and sub-boxes are detected, the list is created.
+	This list is destroyed before calling the final box destructor
+	This list is automatically taken into account during size() and write() functions, and
+	gf_isom_box_write shall not be called in XXXX_box_write on any box registered with the child list
+
+	the full box version field is moved in the base box since we also need some internal flags, as u16 to
+	also be used for audio and video sample entries version field
 	*/
 #define GF_ISOM_BOX			\
-	u32 type;			\
-	u64 size;			\
+	u32 type;				\
+	u64 size;				\
 	const struct box_registry_entry *registry;\
-	GF_List *other_boxes;
+	GF_List *child_boxes; 	\
+	u16 internal_flags;		\
+	u16 version;				\
 
 #define GF_ISOM_FULL_BOX		\
 	GF_ISOM_BOX			\
-	u8 version;			\
 	u32 flags;			\
 
 #define GF_ISOM_UUID_BOX	\
@@ -578,7 +592,7 @@
 	tmp->type = __4cc;
 
 #define ISOM_DECREASE_SIZE(__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), __ptr->size, (bytes), __FILE__, __LINE__ )); \
+			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__ )); \
 			return GF_ISOM_INVALID_FILE; \
 		}\
 		__ptr->size -= bytes; \
@@ -596,9 +610,9 @@
 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 (*add_box)(GF_Box *par, GF_Box *b));
-GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type);
-GF_Err gf_isom_box_add_default(GF_Box *a, GF_Box *subbox);
+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_parse_ex(GF_Box **outBox, GF_BitStream *bs, u32 parent_type, Bool is_root_box);
 
 //writes box header - shall be called at the beginning of each xxxx_Write function
@@ -608,12 +622,20 @@
 //writes box header then version+flags
 GF_Err gf_isom_full_box_write(GF_Box *s, GF_BitStream *bs);
 
-void gf_isom_box_array_del(GF_List *other_boxes);
+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);
 
+void gf_isom_check_position(GF_Box *s, GF_Box *child, u32 *pos);
+void gf_isom_check_position_list(GF_Box *s, GF_List *childlist, u32 *pos);
+
 Bool gf_box_valid_in_parent(GF_Box *a, const char *parent_4cc);
 
+void gf_isom_box_array_del_parent(GF_List **child_boxes, GF_List *boxlist);
+void gf_isom_box_array_reset_parent(GF_List **child_boxes, GF_List *boxlist);
+
+void gf_isom_box_freeze_order(GF_Box *box);
+
 
 typedef struct
 {
@@ -622,7 +644,7 @@
 	u64 dataSize;
 	/* store the file offset when parsing to access the raw data */
 	u64 bsOffset;
-	char *data;
+	u8 *data;
 } GF_MediaDataBox;
 
 typedef struct
@@ -637,7 +659,7 @@
 typedef struct
 {
   GF_ISOM_FULL_BOX
-  u32 track_id;
+  GF_ISOTrackID track_id;
   u8 traf_bits;
   u8 trun_bits;
   u8 sample_bits;
@@ -661,7 +683,7 @@
 typedef struct
 {
 	GF_ISOM_BOX
-	char *data;
+	u8 *data;
 	u32 dataSize;
 	u32 original_4cc;
 } GF_UnknownBox;
@@ -669,11 +691,11 @@
 typedef struct
 {
 	GF_ISOM_UUID_BOX
-	char *data;
+	u8 *data;
 	u32 dataSize;
 } GF_UnknownUUIDBox;
 
-u32 gf_isom_solve_uuid_box(char *UUID);
+u32 gf_isom_solve_uuid_box(u8 *UUID);
 
 typedef struct
 {
@@ -683,7 +705,7 @@
 	u32 timeScale;
 	u64 duration;
 	u64 original_duration;
-	u32 nextTrackID;
+	GF_ISOTrackID nextTrackID;
 	u32 preferredRate;
 	u16 preferredVolume;
 	char reserved[10];
@@ -737,7 +759,7 @@
 {
 	u32 boxType;
 	u8 uuid[16];
-	GF_List *other_boxes;
+	GF_List *boxes;
 } GF_UserDataMap;
 
 typedef struct
@@ -763,6 +785,10 @@
 	GF_ISOFile *mov;
 
 	Bool mvex_after_traks;
+	//for compressed mov, stores the difference between compressed and uncompressed payload
+	s32 compressed_diff;
+	//for compressed mov, indicates the file offset of the moov box start
+	u64 file_offset;
 
 } GF_MovieBox;
 
@@ -771,7 +797,7 @@
 	GF_ISOM_FULL_BOX
 	u64 creationTime;
 	u64 modificationTime;
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	u32 reserved1;
 	u64 duration;
 	u32 reserved2[2];
@@ -779,8 +805,9 @@
 	u16 alternate_group;
 	u16 volume;
 	u16 reserved3;
-	u32 matrix[9];
+	s32 matrix[9];
 	u32 width, height;
+	u64 initial_duration;
 } GF_TrackHeaderBox;
 
 typedef struct
@@ -812,12 +839,12 @@
 	struct __tag_meta_box *meta;
 	GF_TrackGroupBox *groups;
 
+	GF_Box *Aperture;
+	
 	GF_MovieBox *moov;
 	/*private for media padding*/
 	u32 padding_bytes;
 	/*private for editing*/
-	char *name;
-	/*private for editing*/
 	Bool is_unpacked;
 	/*private for checking dependency*/
 	u32 originalFile;
@@ -827,15 +854,27 @@
 	struct __sample_encryption_box *sample_encryption;
 
 	/*private for SVC/MVC extractors resolution*/
-	s32 extractor_mode;
+	GF_ISONaluExtractMode extractor_mode;
 	Bool has_base_layer;
 	u32 pack_num_samples;
 
+	u64 magic;
+	u32 index;
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	u64 first_dts_chunk;
+	u32 nb_samples_in_cache;
+	u32 chunk_stsd_idx;
+	u32 chunk_cache_size;
+	GF_BitStream *chunk_cache;
+#endif
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u64 dts_at_seg_start;
 	u32 sample_count_at_seg_start;
 	Bool first_traf_merged;
 	Bool present_in_scalable_segment;
+	u32 current_traf_stsd_idx;
 #endif
 } GF_TrackBox;
 
@@ -869,6 +908,21 @@
 	GF_HandlerBox *handler;
 	struct __tag_media_info_box *information;
 	u64 BytesMissing;
+
+	//all the following are only used for NALU-based tracks
+	//NALU reader
+	GF_BitStream *nalu_parser;
+
+	GF_BitStream *nalu_out_bs;
+	GF_BitStream *nalu_ps_bs;
+	u8 *in_sample_buffer;
+	u32 in_sample_buffer_alloc;
+	u8 *tmp_nal_copy_buffer;
+	u32 tmp_nal_copy_buffer_alloc;
+
+	GF_ISOSample *extracted_samp;
+	GF_BitStream *extracted_bs;
+
 } GF_MediaBox;
 
 typedef struct
@@ -1008,6 +1062,9 @@
 	u32 r_FirstSampleInEntry;
 	u32 r_currentEntryIndex;
 	u64 r_CurrentDTS;
+
+	//stats for read
+	u32 max_ts_delta;
 } GF_TimeToSampleBox;
 
 
@@ -1032,6 +1089,9 @@
 	/*Cache for read*/
 	u32 r_currentEntryIndex;
 	u32 r_FirstSampleInEntry;
+
+	//stats for read
+	s32 max_ts_delta;
 } GF_CompositionOffsetBox;
 
 
@@ -1040,7 +1100,6 @@
 	u16 dataReferenceIndex;				\
 	char reserved[ 6 ];					\
 	u32 internal_type;					\
-	GF_List *protections;
 
 /*base sample entry box - used by some generic media sample descriptions of QT*/
 typedef struct
@@ -1058,7 +1117,7 @@
 	/*box type as specified in the file (not this box's type!!)*/
 	u32 EntryType;
 
-	char *data;
+	u8 *data;
 	u32 data_size;
 } GF_GenericSampleEntryBox;
 
@@ -1069,7 +1128,7 @@
 	u32 flags;
 	u32 timescale;
 	u32 frame_duration;
-	u8 frames_per_sec;
+	u8 frames_per_counter_tick;
 } GF_TimeCodeSampleEntryBox;
 
 typedef struct
@@ -1119,8 +1178,29 @@
     u32 bitmap;
     u32 num_audio_description;
     GF_AudioChannelDescription *audio_descs;
+    u8 *ext_data;
+    u32 ext_data_size;
 } GF_ChannelLayoutInfoBox;
 
+
+typedef struct
+{
+	GF_ISOM_BOX
+
+    u32 preload_start_time;
+    u32 preload_duration;
+    u32 preload_flags;
+    u32 default_hints;
+} GF_TrackLoadBox;
+
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+
+	GF_AudioChannelLayout layout;
+} GF_ChannelLayoutBox;
+
 typedef struct
 {
 	GF_ISOM_FULL_BOX
@@ -1155,7 +1235,7 @@
 typedef struct
 {
 	GF_ISOM_BOX
-	char *hdr;
+	u8 *hdr;
 	u32 hdr_size;
 } GF_LASERConfigurationBox;
 
@@ -1194,33 +1274,15 @@
 	u32 vertOffD;
 } GF_CleanApertureBox;
 
-typedef struct {
-	GF_ISOM_BOX
-	u32 colour_type;
-	u16 colour_primaries;
-	u16 transfer_characteristics;
-	u16 matrix_coefficients;
-	Bool full_range_flag;
-	u8* opaque;
-	u32 opaque_size;
-} GF_ColourInformationBox;
 
 typedef struct __ContentLightLevel {
 	GF_ISOM_BOX
-	u16 max_content_light_level;
-	u16 max_pic_average_light_level;
+	GF_ContentLightLevelInfo clli;
 } GF_ContentLightLevelBox;
 
 typedef struct ___MasteringDisplayColourVolume {
 	GF_ISOM_BOX
-	struct {
-		u16 x;
-		u16 y;
-	} display_primaries[3];
-	u16 white_point_x;
-	u16 white_point_y;
-	u32 max_display_mastering_luminance;
-	u32 min_display_mastering_luminance;
+	GF_MasteringDisplayColourVolumeInfo mdcv;
 } GF_MasteringDisplayColourVolumeBox;
 
 typedef struct
@@ -1245,9 +1307,26 @@
 	u32 rvc_meta_idx;
 } GF_RVCConfigurationBox;
 
+
+typedef struct {
+	GF_ISOM_BOX
+	Bool is_jp2;
+
+	u32 colour_type;
+	u16 colour_primaries;
+	u16 transfer_characteristics;
+	u16 matrix_coefficients;
+	Bool full_range_flag;
+	u8 *opaque;
+	u32 opaque_size;
+
+	u8 method, precedence, approx;
+} GF_ColourInformationBox;
+
+
+//do NOT extend this structure with boxes, children boxes shall go into the other_box field of the parent
 #define GF_ISOM_VISUAL_SAMPLE_ENTRY		\
 	GF_ISOM_SAMPLE_ENTRY_FIELDS			\
-	u16 version;						\
 	u16 revision;						\
 	u32 vendor;							\
 	u32 temporal_quality;				\
@@ -1259,16 +1338,7 @@
 	char compressor_name[33];			\
 	u16 bit_depth;						\
 	s16 color_table_index;				\
-	GF_PixelAspectRatioBox *pasp;		\
-	GF_CleanApertureBox *clap;			\
-	GF_CodingConstraintsBox *ccst;		\
-	GF_AuxiliaryTypeInfoBox *auxi;		\
-	struct __tag_protect_box *rinf;		\
-	GF_RVCConfigurationBox *rvcc;		\
-	GF_ColourInformationBox *colr;		\
-	GF_MasteringDisplayColourVolumeBox *mdcv;	\
-	GF_ContentLightLevelBox *clli;		\
-
+	struct __tag_protect_box *rinf; 	\
 
 typedef struct
 {
@@ -1284,6 +1354,12 @@
 
 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);
+Bool gf_isom_box_check_unique(GF_List *children, GF_Box *a);
+
 typedef struct
 {
 	GF_ISOM_BOX
@@ -1330,17 +1406,6 @@
 } GF_VPContentLightLevelBox;
 
 typedef struct {
-	u8 dv_version_major;
-	u8 dv_version_minor;
-	u8 dv_profile; //7 bits
-	u8 dv_level;   //6 bits
-	Bool rpu_present_flag;
-	Bool el_present_flag;
-	Bool bl_present_flag;
-	//const unsigned int (32)[5] reserved = 0;
-} GF_DOVIDecoderConfigurationRecord;
-
-typedef struct {
 	GF_ISOM_BOX
 	GF_DOVIDecoderConfigurationRecord DOVIConfig;
 } GF_DOVIConfigurationBox;
@@ -1363,6 +1428,22 @@
 
 typedef struct
 {
+	GF_ISOM_BOX
+
+	u32 width, height;
+	u16 nb_comp;
+	u8 bpc, Comp, UnkC, IPR;
+} GF_J2KImageHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_BOX
+	GF_J2KImageHeaderBox *ihdr;
+	GF_ColourInformationBox *colr;
+} GF_J2KHeaderBox;
+
+typedef struct
+{
 	GF_ISOM_VISUAL_SAMPLE_ENTRY
 	GF_ESDBox *esd;
 	/*used for Publishing*/
@@ -1379,10 +1460,11 @@
 	GF_AV1ConfigurationBox *av1_config;
 	/*vp8-9 extension*/
 	GF_VPConfigurationBox *vp_config;
+	/*jp2k extension*/
+	GF_J2KHeaderBox *jp2h;
+	/*dolbyvision extension*/
+	GF_DOVIConfigurationBox *dovi_config;
 
-
-	/*ext descriptors*/
-	GF_MPEG4ExtensionDescriptorsBox *descr;
 	/*internally emulated esd*/
 	GF_ESD *emul_esd;
 
@@ -1406,21 +1488,29 @@
 	/*box type as specified in the file (not this box's type!!)*/
 	u32 EntryType;
 	/*opaque description data (ESDS in MP4, SMI in SVQ3, ...)*/
-	char *data;
+	u8 *data;
 	u32 data_size;
 } GF_GenericVisualSampleEntryBox;
 
+enum
+{
+	GF_ISOM_AUDIO_QTFF_NONE = 0,
+	//sample entry is QTFF and data in extensions() is NOT valid (conversion done by libisomedia)
+	GF_ISOM_AUDIO_QTFF_ON_NOEXT,
+	//sample entry is QTFF and data in extensions() is valid (import from QT)
+	GF_ISOM_AUDIO_QTFF_ON_EXT_VALID,
+	GF_ISOM_AUDIO_QTFF_CONVERT_FLAG = 1<<16
+};
 
 #define GF_ISOM_AUDIO_SAMPLE_ENTRY	\
 	GF_ISOM_SAMPLE_ENTRY_FIELDS		\
-	u16 version;					\
 	u16 revision;					\
 	u32 vendor;						\
 	u16 channel_count;				\
 	u16 bitspersample;				\
 	u16 compression_id;				\
 	u16 packet_size;				\
-	u32 is_qtff;					\
+	u32 qtff_mode;					\
 	u16 samplerate_hi;				\
 	u16 samplerate_lo;				\
 	u8 extensions[36];				\
@@ -1446,10 +1536,17 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+	u8 *data;
+	u32 dataSize;
+} GF_FLACConfigBox;
+
+typedef struct
+{
 	GF_ISOM_BOX
 
 	/*OpusSpecificBox*/
-	u8 version;              //1
+	/*u8 version;              //1, field included in base box structure */
 	u8 OutputChannelCount;   //same value as the *Output Channel Count* field in the identification header defined in Ogg Opus [3]
 	u16 PreSkip;             //The value of the PreSkip field shall be at least 80 milliseconds' worth of PCM samples even when removing any number of Opus samples which may or may not contain the priming samples. The PreSkip field is not used for discarding the priming samples at the whole playback at all since it is informative only, and that task falls on the Edit List Box.
 	u32 InputSampleRate;     //The InputSampleRate field shall be set to the same value as the *Input Sample Rate* field in the identification header defined in Ogg Opus
@@ -1479,6 +1576,14 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+	u8 format_flags;
+	u8 PCM_sample_size;
+} GF_PCMConfigBox;
+
+
+typedef struct
+{
 	GF_ISOM_AUDIO_SAMPLE_ENTRY
 	//for MPEG4 audio
 	GF_ESDBox *esd;
@@ -1494,6 +1599,10 @@
 
 	//for MPEG-H audio
 	GF_MHAConfigBox *cfg_mha;
+
+	//for FLAC
+	GF_FLACConfigBox *cfg_flac;
+
 } GF_MPEGAudioSampleEntryBox;
 
 /*this is the default visual sdst (to handle unknown media)*/
@@ -1503,7 +1612,7 @@
 	/*box type as specified in the file (not this box's type!!)*/
 	u32 EntryType;
 	/*opaque description data (ESDS in MP4, ...)*/
-	char *data;
+	u8 *data;
 	u32 data_size;
 } GF_GenericAudioSampleEntryBox;
 
@@ -1555,6 +1664,57 @@
 
 typedef struct
 {
+	u8 entry_type;
+	union {
+		u32 trackID;
+		u32 output_view_id;
+		u32 start_view_id;
+	};
+	union {
+		u16 tierID;
+		u16 view_count;
+	};
+} MVCIEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u32 multiview_group_id;
+	u16 num_entries;
+	MVCIEntry *entries;
+} GF_MultiviewGroupBox;
+
+typedef struct
+{
+	u8 dep_comp_idc;
+	u16 ref_view_id;
+} ViewIDRefViewEntry;
+
+typedef struct
+{
+	u16 view_id;
+	u16 view_order_index;
+	u8 texture_in_stream;
+	u8 texture_in_track;
+	u8 depth_in_stream;
+	u8 depth_in_track;
+	u8 base_view_type;
+	u16 num_ref_views;
+	ViewIDRefViewEntry *view_refs;
+} ViewIDEntry;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	u8 min_temporal_id;
+	u8 max_temporal_id;
+	u16 num_views;
+	ViewIDEntry *views;
+} GF_ViewIdentifierBox;
+
+
+typedef struct
+{
 	GF_ISOM_FULL_BOX
 } GF_SampleDescriptionBox;
 
@@ -1567,6 +1727,10 @@
 	u32 sampleCount;
 	u32 alloc_size;
 	u32 *sizes;
+	//stats for read
+	u32 max_size;
+	u64 total_size;
+	u32 total_samples;
 } GF_SampleSizeBox;
 
 typedef struct
@@ -1706,8 +1870,11 @@
 	u32 aux_info_type_parameter;
 
 	u8 default_sample_info_size;
-	u32 sample_count;
+	u32 sample_count, sample_alloc;
 	u8 *sample_info_size;
+
+	u32 cached_sample_num;
+	u32 cached_prev_size;
 } GF_SampleAuxiliaryInfoSizeBox;
 
 typedef struct
@@ -1719,16 +1886,31 @@
 
 	u8 default_sample_info_size;
 	u32 entry_count;  //1 or stco / trun count
-	u32 *offsets;
-	u64 *offsets_large;
+	u32 entry_alloc;
+	u64 *offsets;
 
 	u64 offset_first_offset_field;
+
+	u32 total_size;
+	u8 *cached_data;
 } GF_SampleAuxiliaryInfoOffsetBox;
 
 typedef struct
 {
+	u32 sample_num;
+	u8 *moof_template;
+	u32 moof_template_size;
+	u64 seg_start_plus_one;
+	u64 sidx_start;
+	u64 sidx_end;
+	u64 moof_start;
+	u64 mdat_end;
+} GF_TrafMapEntry;
+
+typedef struct
+{
 	u32 nb_entries, nb_alloc;
-	u32 *sample_num;
+	GF_TrafMapEntry *frag_starts;
 } GF_TrafToSampleMap;
 
 typedef struct
@@ -1755,7 +1937,7 @@
 	GF_List *sampleGroups;
 	GF_List *sampleGroupsDescription;
 	u32 nb_sgpd_in_stbl;
-	u32 nb_other_boxes_in_stbl;
+	u32 nb_stbl_boxes;
 
 	GF_List *sai_sizes;
 	GF_List *sai_offsets;
@@ -1766,9 +1948,10 @@
 	u32 currentEntryIndex;
 
 	Bool no_sync_found;
+	Bool skip_sample_groups;
 } GF_SampleTableBox;
 
-void stbl_AppendTrafMap(GF_SampleTableBox *stbl);
+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);
 
 typedef struct __tag_media_info_box
 {
@@ -1781,13 +1964,14 @@
 	u32 dataEntryIndex;
 } GF_MediaInformationBox;
 
+GF_Err stbl_SetDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
 GF_Err stbl_AppendDependencyType(GF_SampleTableBox *stbl, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
 GF_Err stbl_AddDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
 
 typedef struct
 {
 	GF_ISOM_BOX
-	char *data;
+	u8 *data;
 	u32 dataSize;
 	u32 original_4cc;
 } GF_FreeSpaceBox;
@@ -1829,7 +2013,7 @@
 	GF_ISOM_BOX
 	u32 reference_type;
 	u32 trackIDCount;
-	u32 *trackIDs;
+	GF_ISOTrackID *trackIDs;
 } GF_TrackReferenceTypeBox;
 
 typedef struct
@@ -1863,7 +2047,7 @@
 	GF_ISOM_FULL_BOX
 	u32 switch_group;
 	u32 alternate_group;
-	u32 sub_track_id;
+	GF_ISOTrackID sub_track_id;
 	u64 attribute_count;
 	u32 *attribute_list;
 } GF_SubTrackInformationBox;
@@ -2014,19 +2198,9 @@
 {
 	GF_ISOM_FULL_BOX
 	u32 data_length;
-	char *data;
+	u8 *data;
 } GF_BinaryXMLBox;
 
-typedef struct
-{
-	u64 extent_offset;
-	u64 extent_length;
-	u64 extent_index;
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	/*for storage only*/
-	u64 original_extent_offset;
-#endif
-} GF_ItemExtentEntry;
 
 typedef struct
 {
@@ -2236,7 +2410,7 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	u32 def_sample_desc_index;
 	u32 def_sample_duration;
 	u32 def_sample_size;
@@ -2244,6 +2418,7 @@
 	GF_TrackBox *track;
 
 	Bool cannot_use_default;
+	GF_ISOTrackID inherit_from_traf_id;
 	
 	GF_TrackFragmentRandomAccessBox *tfra;
 } GF_TrackExtendsBox;
@@ -2252,7 +2427,7 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u32 trackID;
+	GF_ISOTrackID trackID;
 } GF_TrackExtensionPropertiesBox;
 
 /*indicates the seq num of this fragment*/
@@ -2268,14 +2443,17 @@
 	GF_ISOM_BOX
 	GF_MovieFragmentHeaderBox *mfhd;
 	GF_List *TrackList;
+	GF_List *PSSHs;
 	GF_ISOFile *mov;
 	/*offset in the file of moof or mdat (whichever comes first) for this fragment*/
 	u64 fragment_offset;
 	u32 mdat_size;
-	char *mdat;
+	u8 *mdat;
+	//when moof box was a compressed moof box, indicates the difference between the uncompressed size and the compressed size
+	s32 compressed_diff;
 
 	//temp storage of prft box
-	u32 reference_track_ID;
+	GF_ISOTrackID reference_track_ID;
 	u64 ntp, timestamp;
 } GF_MovieFragmentBox;
 
@@ -2295,7 +2473,7 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	/* all the following are optional fields */
 	u64 base_data_offset;
 	u32 sample_desc_index;
@@ -2303,7 +2481,6 @@
 	u32 def_sample_size;
 	u32 def_sample_flags;
 	u32 EmptyDuration;
-	u8 IFrameSwitching;
 } GF_TrackFragmentHeaderBox;
 
 
@@ -2340,17 +2517,45 @@
 	GF_TFBaseMediaDecodeTimeBox *tfdt;
 
 	u64 moof_start_in_bs;
+#ifdef GF_ENABLE_CTRN
+	Bool use_ctrn;
+	Bool use_inherit;
+#endif
+
+	u32 interleave_id;
+	u8 merge_sample_interleave;
+	u8 use_sample_interleave;
+	u8 force_new_trun;
+	u8 IFrameSwitching;
+	u8 use_sdtp;
 } GF_TrackFragmentBox;
 
+GF_TrackFragmentBox *gf_isom_get_traf(GF_ISOFile *mov, GF_ISOTrackID TrackID);
+
 /*FLAGS for TRUN : specify what is written in the SampleTable of TRUN*/
 enum
 {
+	/*common to both trun and ctrn*/
 	GF_ISOM_TRUN_DATA_OFFSET	= 0x01,
+	/*trun flags*/
 	GF_ISOM_TRUN_FIRST_FLAG		= 0x04,
 	GF_ISOM_TRUN_DURATION		= 0x100,
 	GF_ISOM_TRUN_SIZE			= 0x200,
 	GF_ISOM_TRUN_FLAGS			= 0x400,
-	GF_ISOM_TRUN_CTS_OFFSET		= 0x800
+	GF_ISOM_TRUN_CTS_OFFSET		= 0x800,
+
+#ifdef GF_ENABLE_CTRN
+	/*compact trun flags (not all of them, field indices are stored in trun box)*/
+	GF_ISOM_CTRN_FIRST_SAMPLE = 1<<1, //0x00000002
+	GF_ISOM_CTRN_DATAOFFSET_16 = 1<<2, //0x00000004
+	GF_ISOM_CTRN_CTSO_MULTIPLIER = 1<<3, //0x00000008
+
+	GF_ISOM_CTRN_INHERIT_CTSO = 1<<4,
+	GF_ISOM_CTRN_INHERIT_FLAGS = 1<<5,
+	GF_ISOM_CTRN_INHERIT_SIZE = 1<<6,
+	GF_ISOM_CTRN_INHERIT_DUR = 1<<7
+#endif
+
 };
 
 typedef struct
@@ -2358,15 +2563,41 @@
 	GF_ISOM_FULL_BOX
 	u32 sample_count;
 	/*the following are optional fields */
-	s32 data_offset; /* unsigned for version 0 */
-	u32 first_sample_flags;
+	/* unsigned for version 0 */
+	s32 data_offset;
 	/*can be empty*/
 	GF_List *entries;
 
+	/*only for trun, ignored for ctrn*/
+	u32 first_sample_flags;
+
 	/*in write mode with data caching*/
 	GF_BitStream *cache;
+
+#ifdef GF_ENABLE_CTRN
+	/*the remaining is internal for compact trun*/
+	/*use compact mode*/
+	Bool use_ctrn;
+	/*we store the ctrn box flags here rather than in flags and swap when writing/dumping. This avoids overwriting the flags
+	set by the fragment writer*/
+	u32 ctrn_flags;
+	/*set to default sample duration when writing, parsed from box otherwise. If 0, not used*/
+	u32 ctso_multiplier;
+	u8 ctrn_first_dur, ctrn_first_size, ctrn_first_sample_flags, ctrn_first_ctts;
+	u8 ctrn_dur, ctrn_size, ctrn_sample_flags, ctrn_ctts;
+	/*use inherit in write mode- in the current version, only size will be set and all other fields inherited*/
+	Bool use_inherit;
+#endif
+
+	u32 interleave_id;
+	u32 first_sample_idx;
+	u32 *sample_order;
 } GF_TrackFragmentRunBox;
 
+#ifdef GF_ENABLE_CTRN
+u32 gf_isom_ctrn_field_size_bits(u32 field_idx);
+#endif
+
 typedef struct
 {
 	u32 Duration;
@@ -2376,19 +2607,10 @@
 
 	/*internal*/
 	u32 SAP_type;
-	/*internal*/
+	u64 dts;
 	u32 nb_pack;
 } GF_TrunEntry;
 
-typedef struct
-{
-	GF_ISOM_BOX
-	u32 majorBrand;
-	u32 minorVersion;
-	u32 altCount;
-	u32 *altBrand;
-} GF_SegmentTypeBox;
-
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
@@ -2442,7 +2664,7 @@
 {
 	GF_ISOM_BOX
 	u8 reserved;
-	u8 prefered;
+	u8 preferred;
 	u8 required;
 } GF_RelyHintBox;
 
@@ -2626,8 +2848,9 @@
 {
 	GF_ISOM_FULL_BOX
 	u32 reserved;
-	char *data;
+	u8 *data;
 	u32 dataSize;
+	Bool qt_style;
 } GF_DataBox;
 
 typedef struct
@@ -2705,7 +2928,7 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	char *oma_ro;
+	u8 *oma_ro;
 	u32 oma_ro_size;
 } GF_OMADRMRightsObjectBox;
 
@@ -2719,7 +2942,6 @@
 	GF_OMADRMAUFormatBox *fmt;
 } GF_OMADRMKMSBox;
 
-
 typedef struct
 {
 	Bool reference_type;
@@ -2740,8 +2962,12 @@
 	u64 first_offset;
 	u32 nb_refs;
 	GF_SIDXReference *refs;
+	//for trace only
+	s32 compressed_diff;
 } GF_SegmentIndexBox;
 
+GF_Err gf_isom_set_fragment_template(GF_ISOFile *movie, u8 *tpl_data, u32 tpl_size, Bool *has_tfdt, GF_SegmentIndexBox **out_sidx);
+
 typedef struct
 {
 	u8 level;
@@ -2758,18 +2984,20 @@
 {
 	GF_ISOM_FULL_BOX
 
-	u32 subsegment_count;
+	u32 subsegment_count, subsegment_alloc;
 	GF_SubsegmentInfo *subsegments;
+	//for trace only
+	s32 compressed_diff;
 } GF_SubsegmentIndexBox;
 
 typedef struct
 {
-	u32 track_id;
+	GF_ISOTrackID track_id;
 	Bool padding_flag;
 	u8 type;
 	u32 grouping_type;
 	u32 grouping_type_parameter;
-	u32 sub_track_id;
+	GF_ISOTrackID sub_track_id;
 } GF_LevelAssignment;
 
 typedef struct __leva_box
@@ -2787,6 +3015,21 @@
 	u64 *pcr_values;
 } GF_PcrInfoBox;
 
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+	char *scheme_id_uri;
+	char *value;
+	u32 timescale;
+	u64 presentation_time_delta;
+	u32 event_duration;
+	u32 event_id;
+	u8 *message_data;
+	u32 message_data_size;
+} GF_EventMessageBox;
+
+
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 
 /*Adobe specific boxes*/
@@ -2837,6 +3080,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 !!
 	u8 segment_run_table_count;
 	GF_List *segment_run_table_entries;
 	u8 fragment_run_table_count;
@@ -3027,6 +3271,7 @@
 } LHEVC_DependentLayer;
 
 
+
 /*
 		CENC stuff
 */
@@ -3037,8 +3282,8 @@
 	u8 crypt_byte_block, skip_byte_block;
 	u8 IsProtected;
 	u8 Per_Sample_IV_size;
-	bin128 KID;
 	u8 constant_IV_size;
+	bin128 KID;
 	bin128 constant_IV;
 } GF_CENCSampleEncryptionGroupEntry;
 
@@ -3068,7 +3313,7 @@
 typedef struct __piff_tenc_box
 {
 	GF_ISOM_UUID_BOX
-	u8 version;
+	/*u8 version; field in included in base box version */
 	u32 flags;
 
 	u32 AlgorithmID;
@@ -3079,7 +3324,7 @@
 typedef struct
 {
 	GF_ISOM_UUID_BOX
-	u8 version;
+	/*u8 version; field in included in base box version */
 	u32 flags;
 
 	bin128 SystemID;
@@ -3091,13 +3336,14 @@
 typedef struct __sample_encryption_box
 {
 	GF_ISOM_UUID_BOX
-	u8 version;
+	/*u8 version; field in included in base box version */
 	u32 flags;
 
 	Bool is_piff;
 
 	GF_List *samp_aux_info; /*GF_CENCSampleAuxInfo*/
 	u64 bs_offset;
+	Bool load_needed;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	/*pointer to container traf*/
@@ -3117,7 +3363,7 @@
 typedef struct __traf_mss_timeext_box
 {
 	GF_ISOM_UUID_BOX
-	u8 version;
+	/*u8 version; field in included in base box version */
 	u32 flags;
 
 	u64 absolute_time_in_track_timescale;
@@ -3127,14 +3373,14 @@
 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 *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_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);
 
 
 #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, u32 *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_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);
 #else
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, uGF_SampleEncryptionBox *senc, 32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID,
+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);
 #endif
@@ -3152,7 +3398,7 @@
 typedef struct __adobe_flash_access_params_box
 {
 	GF_ISOM_BOX
-	char *metadata; /*base-64 encoded metadata used by the DRM client to retrieve decrypted key*/
+	u8 *metadata; /*base-64 encoded metadata used by the DRM client to retrieve decrypted key*/
 } GF_AdobeFlashAccessParamsBox;
 
 typedef struct __adobe_key_info_box
@@ -3194,7 +3440,7 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
-	u32 refTrackID;
+	GF_ISOTrackID refTrackID;
 	u64 ntp, timestamp;
 } GF_ProducerReferenceTimeBox;
 
@@ -3222,10 +3468,16 @@
 	u8 angle;
 } GF_ImageRotationBox;
 
+typedef struct
+{
+	u8 essential;
+	u32 index;
+} GF_ItemPropertyAssociationSlot;
+
 typedef struct {
 	u32 item_id;
-	GF_List *essential;
-	GF_List *property_index;
+	GF_ItemPropertyAssociationSlot *associations;
+	u32 nb_associations;
 } GF_ItemPropertyAssociationEntry;
 
 typedef struct __item_association_box {
@@ -3238,7 +3490,7 @@
 	GF_ISOM_FULL_BOX
 	char *aux_urn;
 	u32 data_size;
-	char *data;
+	u8 *data;
 } GF_AuxiliaryTypePropertyBox;
 
 typedef struct {
@@ -3385,6 +3637,7 @@
 	u64	curPos;		\
 	u8	mode;		\
 	GF_BitStream *bs;\
+	u64 last_read_offset;\
 	char *szName;
 
 typedef struct __tag_data_map
@@ -3409,7 +3662,7 @@
 	GF_ISOM_BASE_DATA_HANDLER
 	char *name;
 	u64 file_size;
-	char *byte_map;
+	u8 *byte_map;
 	u64 byte_pos;
 } GF_FileMappingDataMap;
 
@@ -3417,12 +3670,12 @@
 void gf_isom_datamap_del(GF_DataMap *ptr);
 GF_Err gf_isom_datamap_open(GF_MediaBox *minf, u32 dataRefIndex, u8 Edit);
 void gf_isom_datamap_close(GF_MediaInformationBox *minf);
-u32 gf_isom_datamap_get_data(GF_DataMap *map, char *buffer, u32 bufferLength, u64 Offset);
+u32 gf_isom_datamap_get_data(GF_DataMap *map, u8 *buffer, u32 bufferLength, u64 Offset);
 
 /*File-based data map*/
 GF_DataMap *gf_isom_fdm_new(const char *sPath, u8 mode);
 void gf_isom_fdm_del(GF_FileDataMap *ptr);
-u32 gf_isom_fdm_get_data(GF_FileDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset);
+u32 gf_isom_fdm_get_data(GF_FileDataMap *ptr, u8 *buffer, u32 bufferLength, u64 fileOffset);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_DataMap *gf_isom_fdm_new_temp(const char *sTempPath);
@@ -3431,11 +3684,11 @@
 /*file-mapping, read only*/
 GF_DataMap *gf_isom_fmo_new(const char *sPath, u8 mode);
 void gf_isom_fmo_del(GF_FileMappingDataMap *ptr);
-u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, char *buffer, u32 bufferLength, u64 fileOffset);
+u32 gf_isom_fmo_get_data(GF_FileMappingDataMap *ptr, u8 *buffer, u32 bufferLength, u64 fileOffset);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 u64 gf_isom_datamap_get_offset(GF_DataMap *map);
-GF_Err gf_isom_datamap_add_data(GF_DataMap *ptr, char *data, u32 dataSize);
+GF_Err gf_isom_datamap_add_data(GF_DataMap *ptr, u8 *data, u32 dataSize);
 #endif
 
 void gf_isom_datamap_flush(GF_DataMap *map);
@@ -3462,7 +3715,7 @@
 #define GF_ISOM_GET_FRAG_DEPEND_FLAGS(lead, depends, depended, redundant) ( (lead<<26) | (depends<<24) | (depended<<22) | (redundant<<20) )
 #define GF_ISOM_RESET_FRAG_DEPEND_FLAGS(flags) flags = flags & 0xFFFFF
 
-GF_TrackExtendsBox *GetTrex(GF_MovieBox *moov, u32 TrackID);
+GF_TrackExtendsBox *GetTrex(GF_MovieBox *moov, GF_ISOTrackID TrackID);
 #endif
 
 enum
@@ -3491,16 +3744,17 @@
 	GF_DataMap *editFileMap;
 	/*the interleaving time for dummy mode (in movie TimeScale)*/
 	u32 interleavingTime;
+	GF_ISOTrackID last_created_track_id;
 #endif
 
-	u8 openMode;
+	GF_ISOOpenMode openMode;
 	u8 storageMode;
 	/*if true 3GPP text streams are read as MPEG-4 StreamingText*/
 	u8 convert_streaming_text;
 	u8 is_jp2;
 	u8 force_co64;
-
-	Bool keep_utc, drop_date_version_info;
+	u64 next_flush_chunk_time;
+	Bool keep_utc;
 	/*main boxes for fast access*/
 	/*moov*/
 	GF_MovieBox *moov;
@@ -3513,7 +3767,16 @@
 	/*meta box if any*/
 	GF_MetaBox *meta;
 
-	Bool dump_mode_alloc;
+	s64 read_byte_offset;
+	u64 bytes_removed;
+
+	Bool disable_odf_translate;
+
+	GF_ISOCompressMode compress_mode;
+	Bool force_compress;
+
+	void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total);
+	void *progress_cbk_udta;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u32 FragmentsFlags, NextMoofNumber;
@@ -3531,6 +3794,7 @@
 	GF_SegmentIndexBox *root_sidx;
 	u64 root_sidx_offset;
 	u32 root_sidx_index;
+	Bool dyn_root_sidx;
 	GF_SubsegmentIndexBox *root_ssix;
 
 	Bool is_index_segment;
@@ -3540,8 +3804,24 @@
 	Bool single_moof_mode;
 	u32 single_moof_state;
 
+	Bool sample_groups_in_traf;
+
 	/* optional mfra box used in write mode */
 	GF_MovieFragmentRandomAccessBox *mfra;
+
+	Bool store_traf_map;
+	Bool signal_frag_bounds;
+	u64 sidx_start_offset, sidx_end_offset;
+	u64 styp_start_offset;
+	u64 mdat_end_offset;
+	GF_Box *seg_ssix, *seg_styp;
+
+	u32 sidx_pts_store_alloc, sidx_pts_store_count;
+	u64 *sidx_pts_store, *sidx_pts_next_store;
+
+	GF_SegmentIndexBox *main_sidx;
+	u64 main_sidx_end_pos;
+
 #endif
 	GF_ProducerReferenceTimeBox *last_producer_ref_time;
 
@@ -3552,27 +3832,40 @@
 	s32 es_id_default_sync;
 
 	Bool is_smooth;
+
+	GF_Err (*on_block_out)(void *usr_data, u8 *block, u32 block_size);
+	GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert);
+	void *on_block_out_usr_data;
+	u32 on_block_out_block_size;
+
+	//in block disptach mode we don't have the full file, keep the position
+	u64 fragmented_file_pos;
+	u8 *block_buffer;
+	u32 block_buffer_size;
+
+	u32 nb_box_init_seg;
 };
 
 /*time function*/
 u64 gf_isom_get_mp4time();
 /*set the last error of the file. if file is NULL, set the static error (used for IO errors*/
 void gf_isom_set_last_error(GF_ISOFile *the_file, GF_Err error);
-GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u64 *bytesMissing, Bool progressive_mode);
+GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode);
 GF_ISOFile *gf_isom_new_movie();
 /*Movie and Track access functions*/
 GF_TrackBox *gf_isom_get_track_from_file(GF_ISOFile *the_file, u32 trackNumber);
 GF_TrackBox *gf_isom_get_track(GF_MovieBox *moov, u32 trackNumber);
-GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, u32 trackID);
+GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, GF_ISOTrackID trackID);
 GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile);
-u32 gf_isom_get_tracknum_from_id(GF_MovieBox *moov, u32 trackID);
+u32 gf_isom_get_tracknum_from_id(GF_MovieBox *moov, GF_ISOTrackID trackID);
 /*open a movie*/
-GF_ISOFile *gf_isom_open_file(const char *fileName, u32 OpenMode, const char *tmp_dir);
+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);
+
 /*StreamDescription reconstruction Functions*/
-GF_Err GetESD(GF_MovieBox *moov, u32 trackID, u32 StreamDescIndex, GF_ESD **outESD);
-GF_Err GetESDForTime(GF_MovieBox *moov, u32 trackID, u64 CTS, GF_ESD **outESD);
+GF_Err GetESD(GF_MovieBox *moov, GF_ISOTrackID trackID, u32 StreamDescIndex, GF_ESD **outESD);
+GF_Err GetESDForTime(GF_MovieBox *moov, GF_ISOTrackID trackID, u64 CTS, GF_ESD **outESD);
 GF_Err Media_GetSampleDesc(GF_MediaBox *mdia, u32 SampleDescIndex, GF_SampleEntryBox **out_entry, u32 *dataRefIndex);
 GF_Err Media_GetSampleDescIndex(GF_MediaBox *mdia, u64 DTS, u32 *sampleDescIndex);
 /*get esd for given sample desc -
@@ -3601,7 +3894,7 @@
 } GF_ISOMDataRefAllType;
 GF_ISOMDataRefAllType Media_SelfContainedType(GF_MediaBox *mdia);
 
-GF_TrackBox *GetTrackbyID(GF_MovieBox *moov, u32 TrackID);
+GF_TrackBox *GetTrackbyID(GF_MovieBox *moov, GF_ISOTrackID TrackID);
 
 /*check the TimeToSample for the given time and return the Sample number
 if the entry is not found, return the closest sampleNumber in prevSampleNumber and 0 in sampleNumber
@@ -3616,9 +3909,9 @@
 GF_Err stbl_GetSampleDTS_and_Duration(GF_TimeToSampleBox *stts, u32 SampleNumber, u64 *DTS, u32 *duration);
 
 /*find a RAP or set the prev / next RAPs if vars are passed*/
-GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
+GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, GF_ISOSAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
 /*same as above but only look for open-gop RAPs and GDR (roll)*/
-GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
+GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, GF_ISOSAPType *IsRAP, u32 *prevRAP, u32 *nextRAP);
 GF_Err stbl_GetSampleInfos(GF_SampleTableBox *stbl, u32 sampleNumber, u64 *offset, u32 *chunkNumber, u32 *descIndex, GF_StscEntry **scsc_entry);
 GF_Err stbl_GetSampleShadow(GF_ShadowSyncBox *stsh, u32 *sampleNumber, u32 *syncNum);
 GF_Err stbl_GetPaddingBits(GF_PaddingBitsBox *padb, u32 SampleNumber, u8 *PadBits);
@@ -3641,13 +3934,13 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err FlushCaptureMode(GF_ISOFile *movie);
-GF_Err CanAccessMovie(GF_ISOFile *movie, u32 Mode);
-GF_ISOFile *gf_isom_create_movie(const char *fileName, u32 OpenMode, const char *tmp_dir);
-void gf_isom_insert_moov(GF_ISOFile *file);
+GF_Err CanAccessMovie(GF_ISOFile *movie, GF_ISOOpenMode Mode);
+GF_ISOFile *gf_isom_create_movie(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
+GF_Err gf_isom_insert_moov(GF_ISOFile *file);
 
-GF_Err WriteToFile(GF_ISOFile *movie);
+GF_Err WriteToFile(GF_ISOFile *movie, Bool for_fragments);
 GF_Err Track_SetStreamDescriptor(GF_TrackBox *trak, u32 StreamDescriptionIndex, u32 DataReferenceIndex, GF_ESD *esd, u32 *outStreamIndex);
-u8 RequestTrack(GF_MovieBox *moov, u32 TrackID);
+u8 RequestTrack(GF_MovieBox *moov, GF_ISOTrackID TrackID);
 /*Track-Media setup*/
 GF_Err NewMedia(GF_MediaBox **mdia, u32 MediaType, u32 TimeScale);
 GF_Err Media_ParseODFrame(GF_MediaBox *mdia, const GF_ISOSample *sample, GF_ISOSample **od_samp);
@@ -3690,25 +3983,25 @@
 /*REMOVE functions*/
 GF_Err stbl_RemoveDTS(GF_SampleTableBox *stbl, u32 sampleNumber, u32 LastAUDefDuration);
 GF_Err stbl_RemoveCTS(GF_SampleTableBox *stbl, u32 sampleNumber);
-GF_Err stbl_RemoveSize(GF_SampleSizeBox *stsz, u32 sampleNumber);
+GF_Err stbl_RemoveSize(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemoveChunk(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemoveRAP(GF_SampleTableBox *stbl, u32 sampleNumber);
-GF_Err stbl_RemoveShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber);
+GF_Err stbl_RemoveShadow(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemovePaddingBits(GF_SampleTableBox *stbl, u32 SampleNumber);
-GF_Err stbl_RemoveSampleFragments(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemoveRedundant(GF_SampleTableBox *stbl, u32 SampleNumber);
 GF_Err stbl_RemoveSubSample(GF_SampleTableBox *stbl, u32 SampleNumber);
 GF_Err stbl_RemoveSampleGroup(GF_SampleTableBox *stbl, u32 SampleNumber);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie);
-GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf);
 #endif
 
-Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type);
+GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool exact_range);
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type);
+
 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);
 
 GF_Err GetNextMediaTime(GF_TrackBox *trak, u64 movieTime, u64 *OutMovieTime);
@@ -3718,27 +4011,23 @@
 Bool CheckHintFormat(GF_TrackBox *trak, u32 HintType);
 u32 GetHintFormat(GF_TrackBox *trak);
 
-
-void gf_isom_box_add_for_dump_mode(GF_Box *parent, GF_Box *a);
-
 /*locate a box by its type or UUID*/
 GF_ItemListBox *gf_ismo_locate_box(GF_List *list, u32 boxType, bin128 UUID);
 
-GF_Err moov_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err tref_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err trak_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err mvex_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err stsd_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err hnti_AddBox(GF_Box *hnti, GF_Box *a);
-GF_Err udta_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err edts_AddBox(GF_Box *s, GF_Box *a);
-GF_Err stdp_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err stbl_AddBox(GF_Box *ptr, GF_Box *a);
-GF_Err sdtp_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err dinf_AddBox(GF_Box *s, GF_Box *a);
-GF_Err minf_AddBox(GF_Box *s, GF_Box *a);
-GF_Err mdia_AddBox(GF_Box *s, GF_Box *a);
-GF_Err traf_AddBox(GF_Box *s, GF_Box *a);
+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 stdp_box_read(GF_Box *s, GF_BitStream *bs);
+GF_Err stbl_on_child_box(GF_Box *ptr, GF_Box *a);
+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);
 
 /*rewrites avcC based on the given esd - this destroys the esd*/
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
@@ -3750,17 +4039,19 @@
 void VP9_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *vp9);
 void AV1_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *av1, GF_MediaBox *mdia);
 void AV1_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *av1);
-GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex);
+GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, GF_ISOTrackID trackID, u16 *outRefIndex);
 GF_XMLBox *gf_isom_get_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool *is_binary);
 Bool gf_isom_cenc_has_saiz_saio_track(GF_SampleTableBox *stbl, u32 scheme_type);
 
 #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);
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox  *traf, u32 len, Bool saio_32bits);
 #endif
-void 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, u64 offset, u32 len);
 
-void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_picture, u32 *x, u32 *y, u32 *w, u32 *h);
+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);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
@@ -3786,7 +4077,7 @@
 	u8 header_extension_type;
 	u8 content[3];
 	u32 data_length;
-	char *data;
+	u8 *data;
 } GF_LCTheaderExtension;
 
 typedef struct
@@ -3815,10 +4106,10 @@
 typedef struct
 {
 	GF_ISOM_BOX
-
+	//not registered with child list !!
 	GF_FECInformationBox *feci;
 	u32 data_length;
-	char *data;
+	u8 *data;
 } GF_ExtraDataBox;
 
 
@@ -3891,7 +4182,7 @@
 	u16 packetCount;
 	u16 reserved;
 	GF_List *packetTable;
-	char *AdditionalData;
+	u8 *AdditionalData;
 	u32 dataLength;
 	/*used internally for hinting*/
 	u64 TransmissionTime;
@@ -3899,7 +4190,8 @@
 	GF_List *sample_cache;
 
 	//for dump
-	u32 trackID, sampleNumber;
+	GF_ISOTrackID trackID;
+	u32 sampleNumber;
 
 	GF_ExtraDataBox *extra_data;
 } GF_HintSample;
@@ -3915,7 +4207,8 @@
 		Hint Packets (generic packet for future protocol support)
 *****************************************************/
 #define GF_ISOM_BASE_PACKET			\
-	u32 hint_subtype, trackID, sampleNumber;	\
+	u32 hint_subtype, sampleNumber;	\
+	GF_ISOTrackID trackID;\
 	s32 relativeTransTime;
 
 
@@ -3972,7 +4265,7 @@
 	//RTCP report
 	u8 Version, Padding, Count, PayloadType;
 	u32 length;
-	char *data;
+	u8 *data;
 } GF_RTCPPacket;
 
 GF_RTCPPacket *gf_isom_hint_rtcp_new();
@@ -4002,8 +4295,7 @@
 	GF_TextKaraokeBox *cur_karaoke;
 };
 
-GF_TextSample *gf_isom_parse_texte_sample(GF_BitStream *bs);
-GF_TextSample *gf_isom_parse_texte_sample_from_data(char *data, u32 dataLength);
+GF_TextSample *gf_isom_parse_text_sample(GF_BitStream *bs);
 
 struct _generic_subtitle_sample
 {
@@ -4011,17 +4303,15 @@
 	u32 len;
 };
 GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample(GF_BitStream *bs);
-GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample_from_data(char *data, u32 dataLength);
+GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample_from_data(u8 *data, u32 dataLength);
 
 
 /*do not throw fatal errors if boxes are duplicated, just warn and remove extra ones*/
 #define ERROR_ON_DUPLICATED_BOX(__abox, __parent) {	\
-		extern Bool use_dump_mode;\
-		char __ptype[5];\
+		char __ptype[GF_4CC_MSIZE];\
 		strcpy(__ptype, gf_4cc_to_str(__parent->type) );\
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] extra box %s found in %s, deleting\n", gf_4cc_to_str(__abox->type), __ptype)); \
-		if (!use_dump_mode) gf_isom_box_del(__abox);\
-		__abox=NULL;\
+		gf_isom_box_del_parent(& (__parent->child_boxes), __abox);\
 		return GF_OK;\
 	}
 
@@ -4045,8 +4335,6 @@
 
 GF_WebVTTSampleEntryBox *gf_webvtt_isom_get_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex);
 
-GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start);
-
 #endif /* GPAC_DISABLE_VTT */
 
 //exported for sgpd comparison in traf merge
@@ -4074,10 +4362,13 @@
 Bool gf_isom_box_is_file_level(GF_Box *s);
 #endif
 
-GF_Box *boxstring_new_with_data(u32 type, const char *string);
+GF_Box *boxstring_new_with_data(u32 type, const char *string, GF_List **parent);
 
 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);
+
+
 #endif //GPAC_DISABLE_ISOM
 
 #ifdef __cplusplus

gpac-0.8.0.tar.gz/include/gpac/internal/laser_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/laser_dev.h Changed

gpac-0.8.0.tar.gz/include/gpac/internal/m3u8.h -> gpac-1.0.0.tar.gz/include/gpac/internal/m3u8.h Changed

@@ -115,21 +115,21 @@
 
 /**
  * Parse the given m3u8 playlist file
- * \param file The file from cache to parse
- * \param playlist The playlist to fill. If argument is null, and file is valid, playlist will be allocated
- * \param baseURL The base URL of the playlist
- * \return GF_OK if playlist valid
+\param file The file from cache to parse
+\param playlist The playlist to fill. If argument is null, and file is valid, playlist will be allocated
+\param baseURL The base URL of the playlist
+\param GF_OK if playlist valid
  */
 GF_Err gf_m3u8_parse_master_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL);
 
 /**
  * Parse the given playlist file as a subplaylist of an existing playlist
- * \param file The file from cache to parse
- * \param playlist The playlist to fill.
- * \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
- * \return GF_OK if playlist valid
+\param file The file from cache to parse
+\param playlist The playlist to fill.
+\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 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);

gpac-0.8.0.tar.gz/include/gpac/internal/media_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/media_dev.h Changed

@@ -56,15 +56,17 @@
 /*returns size of chunk between current and next startcode (excluding startcode sizes), 0 if no more startcodes (eos)*/
 u32 gf_media_nalu_next_start_code_bs(GF_BitStream *bs);
 
-/*returns size of chunk between current startcode and end of payload (0x000000) - if no trailing bytes are found, returns the same as gf_media_nalu_next_start_code_bs*/
-u32 gf_media_nalu_payload_end_bs(GF_BitStream *bs);
-
 /*return nb bytes from current data until the next start code and set the size of the next start code (3 or 4 bytes)
 returns data_len if no startcode found and sets sc_size to 0 (last nal in payload)*/
 u32 gf_media_nalu_next_start_code(const u8 *data, u32 data_len, u32 *sc_size);
 
-u32 gf_media_nalu_emulation_bytes_remove_count(const char *buffer, u32 nal_size);
-u32 gf_media_nalu_remove_emulation_bytes(const char *buffer_src, char *buffer_dst, u32 nal_size);
+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);
 
 enum
 {
@@ -224,15 +226,21 @@
 
 typedef struct
 {
+	Bool rpu_flag;
+} AVCSeiItuTT35DolbyVision;
+
+typedef struct
+{
 	AVCSeiRecoveryPoint recovery_point;
 	AVCSeiPicTiming pic_timing;
+	AVCSeiItuTT35DolbyVision dovi;
 	/*to be eventually completed by other sei*/
 } AVCSei;
 
 typedef struct
 {
 	AVC_SPS sps[32]; /* range allowed in the spec is 0..31 */
-	s8 sps_active_idx;	/*currently active sps; must be initalized to -1 in order to discard not yet decodable SEIs*/
+	s8 sps_active_idx, pps_active_idx;	/*currently active sps; must be initalized to -1 in order to discard not yet decodable SEIs*/
 
 	AVC_PPS pps[255];
 
@@ -240,6 +248,8 @@
 	AVCSei sei;
 
 	Bool is_svc;
+	u8 last_nal_type_parsed;
+	s8 last_ps_idx;
 } AVCState;
 
 typedef struct
@@ -253,13 +263,12 @@
 
 
 /*return sps ID or -1 if error*/
-s32 gf_media_avc_read_sps(const char *sps_data, u32 sps_size, AVCState *avc, u32 subseq_sps, u32 *vui_flag_pos);
+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);
 /*return pps ID or -1 if error*/
-s32 gf_media_avc_read_pps(const char *pps_data, u32 pps_size, AVCState *avc);
-/*return sps ID or -1 if error*/
-s32 gf_media_avc_read_sps_ext(const char *spse_data, u32 spse_size);
-/*is slice an IDR*/
-Bool gf_media_avc_slice_is_IDR(AVCState *avc);
+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);
+
 /*is slice containing intra MB only*/
 Bool gf_media_avc_slice_is_intra(AVCState *avc);
 /*parses NALU, updates avc state and returns:
@@ -267,10 +276,10 @@
 	0 if NALU part of prev frame
 	-1 if bitstream error
 */
-s32 gf_media_avc_parse_nalu(GF_BitStream *bs, u32 nal_hdr, AVCState *avc);
+s32 gf_media_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(char *buffer, u32 nal_size, AVCState *avc);
+u32 gf_media_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);
@@ -344,8 +353,24 @@
 	Bool video_full_range_flag;
 	Bool colour_description_present_flag;
 	u8 colour_primaries, transfer_characteristic, matrix_coeffs;
-
 	u32 rep_format_idx;
+
+	u8 sps_ext_or_max_sub_layers_minus1, max_sub_layers_minus1, update_rep_format_flag, sub_layer_ordering_info_present_flag, scaling_list_enable_flag, infer_scaling_list_flag, scaling_list_ref_layer_id, scaling_list_data_present_flag, asymmetric_motion_partitions_enabled_flag, pcm_enabled_flag, strong_intra_smoothing_enable_flag, vui_parameters_present_flag;
+	u32 log2_diff_max_min_luma_coding_block_size;
+	u32 log2_min_transform_block_size, log2_min_luma_coding_block_size, log2_max_transform_block_size;
+	u32 max_transform_hierarchy_depth_inter, max_transform_hierarchy_depth_intra;
+
+	u8 pcm_sample_bit_depth_luma_minus1, pcm_sample_bit_depth_chroma_minus1, pcm_loop_filter_disable_flag;
+	u32 log2_min_pcm_luma_coding_block_size_minus3, log2_diff_max_min_pcm_luma_coding_block_size;
+	u8 overscan_info_present, overscan_appropriate, video_signal_type_present_flag, video_format;
+
+	u8 chroma_loc_info_present_flag;
+	u32 chroma_sample_loc_type_top_field, chroma_sample_loc_type_bottom_field;
+
+	u8 neutra_chroma_indication_flag, field_seq_flag, frame_field_info_present_flag;
+	u8 default_display_window_flag;
+	u32 left_offset, right_offset, top_offset, bottom_offset;
+	u8 hrd_parameters_present_flag;
 } HEVC_SPS;
 
 typedef struct
@@ -361,9 +386,16 @@
 	Bool slice_segment_header_extension_present_flag, output_flag_present_flag, lists_modification_present_flag, cabac_init_present_flag;
 	Bool weighted_pred_flag, weighted_bipred_flag, slice_chroma_qp_offsets_present_flag, deblocking_filter_override_enabled_flag, loop_filter_across_slices_enabled_flag, entropy_coding_sync_enabled_flag;
 	Bool loop_filter_across_tiles_enabled_flag;
-
+	s32 pic_init_qp_minus26;
 	u32 num_tile_columns, num_tile_rows;
 	u32 column_width[22], row_height[20];
+
+	Bool sign_data_hiding_flag, constrained_intra_pred_flag, transform_skip_enabled_flag, cu_qp_delta_enabled_flag, transquant_bypass_enable_flag;
+	u32 diff_cu_qp_delta_depth, pic_cb_qp_offset, pic_cr_qp_offset;
+
+	Bool deblocking_filter_control_present_flag, pic_disable_deblocking_filter_flag, pic_scaling_list_data_present_flag;
+	u32 beta_offset_div2, tc_offset_div2, log2_parallel_merge_level_minus2;
+
 } HEVC_PPS;
 
 typedef struct RepFormat
@@ -429,14 +461,14 @@
 {
 	AVCSeiRecoveryPoint recovery_point;
 	AVCSeiPicTiming pic_timing;
-
+	AVCSeiItuTT35DolbyVision dovi;
 } HEVC_SEI;
 
 typedef struct
 {
 	u8 nal_unit_type;
-	u32 frame_num, poc_lsb, slice_type;
-
+	u32 frame_num, poc_lsb, slice_type, header_size_with_emulation;
+	
 	s32 redundant_pic_cnt;
 
 	s32 poc;
@@ -449,10 +481,14 @@
 	u8 prev_layer_id_plus1;
 
 	//bit offset of the num_entry_point (if present) field
-	s32 entry_point_start_bits;
+	s32 entry_point_start_bits; 
+	u64 header_size_bits;
 	//byte offset of the payload start (after byte alignment)
 	s32 payload_start_offset;
 
+	s32 slice_qp_delta_start_bits;
+	s32 slice_qp_delta;
+
 	HEVC_SPS *sps;
 	HEVC_PPS *pps;
 } HEVCSliceInfo;
@@ -478,36 +514,53 @@
 	s32 last_parsed_vps_id;
 	s32 last_parsed_sps_id;
 	s32 last_parsed_pps_id;
+
+	// Dolby Vision
+	Bool dv_rpu;
+	Bool dv_el;
 } HEVCState;
 
+typedef struct hevc_combine{
+	Bool is_hevccombine, first_slice_segment;
+	s32 buffer_header_src_alloc; // because payload_start_offset is s32, otherwhise it's an u32
+	u8 *buffer_header_src;
+}Combine;
+
 enum
 {
 	GF_HEVC_SLICE_TYPE_B = 0,
 	GF_HEVC_SLICE_TYPE_P = 1,
 	GF_HEVC_SLICE_TYPE_I = 2,
 };
-s32 gf_media_hevc_read_vps(char *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_parse_nalu(char *data, u32 size, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
+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);
 //parses VPS and rewrites data buffer after removing VPS extension
-s32 gf_media_hevc_read_vps_ex(char *data, u32 *size, HEVCState *hevc, Bool remove_extensions);
+s32 gf_media_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);
 
-GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc_state, char *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
+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);
 
 
-GF_Err gf_media_parse_ivf_file_header(GF_BitStream *bs, int *width, int *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 *frame_rate, u32 *time_scale, u32 *num_frames);
 
 
 
 #define VP9_MAX_FRAMES_IN_SUPERFRAME 16
 
-GF_Err vp9_parse_sample(GF_BitStream *bs, GF_VPConfig *vp9_cfg, Bool *key_frame, int *FrameWidth, int *FrameHeight, int *renderWidth, int *renderHeight);
-GF_Err vp9_parse_superframe(GF_BitStream *bs, u64 ivf_frame_size, int *num_frames_in_superframe, u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME], int *superframe_index_size);
+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);
 
 
 
@@ -523,16 +576,19 @@
 
 typedef struct
 {
+	//offset in bytes after first byte of obu, including its header
+	u32 obu_start_offset;
+	u32 size;
+} AV1Tile;
+
+typedef struct
+{
 	Bool is_first_frame;
 	Bool seen_frame_header, seen_seq_header;
 	Bool key_frame, show_frame;
 	AV1FrameType frame_type;
 	GF_List *header_obus, *frame_obus; /*GF_AV1_OBUArrayEntry*/
-	struct {
-		//offset in bytes after first byte of obu, including its header
-		u32 obu_start_offset;
-		u32 size;
-	} tiles[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
+	AV1Tile tiles[AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS];
 	u32 nb_tiles_in_obu;
 	u8 refresh_frame_flags;
 	u8 order_hint;
@@ -553,14 +609,24 @@
 {
 	/*importing options*/
 	Bool keep_temporal_delim;
+	/*parser config*/
+	//if set only header frames are stored
+	Bool skip_frames;
+	//if set, frame OBUs are not pushed to the frame_obus OBU list but are written in the below bitstream
+	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;
+	u8 *frame_obus;
+	u32 frame_obus_alloc;
 
 	/*general sequence information*/
 	Bool frame_id_numbers_present_flag;
 	Bool reduced_still_picture_header;
 	Bool decoder_model_info_present_flag;
 	u16 OperatingPointIdc;
-	int width, height, UpscaledWidth;
-	double FPS;
+	u32 width, height, UpscaledWidth;
+	u32 tb_num, tb_den;
 
 	Bool use_128x128_superblock;
 	u8 frame_width_bits_minus_1, frame_height_bits_minus_1;
@@ -581,9 +647,9 @@
 	u8 frame_presentation_time_length;
 	u32 buffer_removal_time_length;
 	u8 operating_points_count;
-	u8 decoder_model_present_for_this_op[6];
-	u8 operating_point_idc[6];
-	
+	u8 decoder_model_present_for_this_op[32];
+	u8 operating_point_idc[32];
+
 	u32 tileRows, tileCols, tileRowsLog2, tileColsLog2;
 	u8 tile_size_bytes; /*coding tile header size*/
 	Bool separate_uv_delta_q;
@@ -594,12 +660,14 @@
 	Bool color_description_present_flag;
 	u8 color_primaries, transfer_characteristics, matrix_coefficients;
 	Bool color_range;
-	/*shall not be null*/
+
+	/*AV1 config record - shall not be null when parsing - this is NOT destroyed by gf_av1_reset_state(state, GF_TRUE) */
 	GF_AV1Config *config;
 
 	/*OBU parsing state, reset at each obu*/
 	Bool obu_has_size_field, obu_extension_flag;
 	u8 temporal_id, spatial_id;
+	ObuType obu_type;
 
 	/*inter-frames state */
 	u8 RefOrderHint[AV1_NUM_REF_FRAMES];
@@ -619,7 +687,6 @@
 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);
 
-GF_Err gf_media_aom_parse_ivf_file_header(GF_BitStream *bs, AV1State *state);
 GF_Err gf_media_parse_ivf_frame_header(GF_BitStream *bs, u64 *frame_size, u64 *pts);
 
 Bool gf_media_probe_ivf(GF_BitStream *bs);
@@ -629,7 +696,57 @@
 GF_Err gf_media_aom_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);
-void av1_reset_frame_state(AV1StateFrame *frame_state);
+
+/*! init av1 frame parsing state
+\param state the frame parser
+*/
+void gf_av1_init_state(AV1State *state);
+
+/*! reset av1 frame parsing state - this does not destroy the structure.
+\param state the frame parser
+\param is_destroy if TRUE, destroy internal reference picture lists
+*/
+void gf_av1_reset_state(AV1State *state, Bool is_destroy);
+
+u64 gf_av1_leb128_read(GF_BitStream *bs, u8 *opt_Leb128Bytes);
+u32 gf_av1_leb128_size(u64 value);
+u64 gf_av1_leb128_write(GF_BitStream *bs, u64 value);
+GF_Err gf_av1_parse_obu_header(GF_BitStream *bs, ObuType *obu_type, Bool *obu_extension_flag, Bool *obu_has_size_field, u8 *temporal_id, u8 *spatial_id);
+
+typedef struct
+{
+	u32 picture_size;
+	u16 deprecated_number_of_slices;
+	u8 log2_desired_slice_size_in_mb;
+} GF_ProResPictureInfo;
+
+typedef struct
+{
+	u32 frame_size;
+	u32 frame_identifier;
+	u16 frame_hdr_size;
+	u8 version;
+	u32 encoder_id;
+	u16 width;
+	u16 height;
+	u8 chroma_format;
+	u8 interlaced_mode;
+	u8 aspect_ratio_information;
+	u8 framerate_code;
+	u8 color_primaries;
+	u8 transfer_characteristics;
+	u8 matrix_coefficients;
+	u8 alpha_channel_type;
+	u8 load_luma_quant_matrix, load_chroma_quant_matrix;
+	u8 luma_quant_matrix[8][8];
+	u8 chroma_quant_matrix[8][8];
+
+	u8 nb_pic; //1 or 2
+	//for now we don't parse this
+//	GF_ProResPictureInfo pictures[2];
+} GF_ProResFrameInfo;
+
+GF_Err gf_media_prores_parse_bs(GF_BitStream *bs, GF_ProResFrameInfo *prores_frame);
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
@@ -648,7 +765,7 @@
         void (*OnNewPacket)(void *cbk, GF_RTPHeader *header),
         void (*OnPacketDone)(void *cbk, GF_RTPHeader *header),
         void (*OnDataReference)(void *cbk, u32 payload_size, u32 offset_from_orig),
-        void (*OnData)(void *cbk, char *data, u32 data_size, Bool is_head),
+        void (*OnData)(void *cbk, u8 *data, u32 data_size, Bool is_head),
         u32 Path_MTU,
         u32 max_ptime,
         u32 default_rtp_rate,
@@ -658,47 +775,59 @@
         u32 InterleaveGroupID,
         u8 InterleaveGroupPriority);
 
-void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, GF_ISOFile *file, u32 track);
+void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, u32 w, u32 h, s32 tx, s32 ty, s16 l, u32 max_w, u32 max_h, char *tx3g_base64);
 
 #endif
 
 
-typedef enum
-{
-	GF_DASH_TEMPLATE_SEGMENT = 0,
-	GF_DASH_TEMPLATE_INITIALIZATION,
-	GF_DASH_TEMPLATE_TEMPLATE,
-	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE,
-	GF_DASH_TEMPLATE_REPINDEX,
-	GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT
-} GF_DashTemplateSegmentType;
-
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline);
-
 #ifndef GPAC_DISABLE_VTT
 
 typedef struct _webvtt_parser GF_WebVTTParser;
 typedef struct _webvtt_sample GF_WebVTTSample;
 
 GF_WebVTTParser *gf_webvtt_parser_new();
-GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, const char *input_file,
+GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, FILE *vtt_file, s32 unicode_type, Bool is_srt,
                              void *user, GF_Err (*report_message)(void *, GF_Err, char *, const char *),
                              void (*on_sample_parsed)(void *, GF_WebVTTSample *),
                              void (*on_header_parsed)(void *, const char *));
-GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser, u32 duration);
-u64 gf_webvtt_parser_last_duration(GF_WebVTTParser *parser);
+GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser);
 void gf_webvtt_parser_del(GF_WebVTTParser *parser);
+void gf_webvtt_parser_suspend(GF_WebVTTParser *vttparser);
+void gf_webvtt_parser_restart(GF_WebVTTParser *parser);
+
+#include <gpac/webvtt.h>
+void gf_webvtt_parser_cue_callback(GF_WebVTTParser *parser, void (*on_cue_read)(void *, GF_WebVTTCue *), void *udta);
+GF_Err gf_webvtt_merge_cues(GF_WebVTTParser *parser, u64 start, GF_List *cues);
+GF_Err gf_webvtt_parser_finalize(GF_WebVTTParser *parser, u64 duration);
 
 void gf_webvtt_sample_del(GF_WebVTTSample * samp);
 u64 gf_webvtt_sample_get_start(GF_WebVTTSample * samp);
+u64 gf_webvtt_sample_get_end(GF_WebVTTSample * samp);
+
+
 
 #ifndef GPAC_DISABLE_ISOM
 GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, Bool box_mode, u32 index);
-GF_Err gf_webvtt_dump_sample(FILE *dump, GF_WebVTTSample *samp);
 GF_Err gf_webvtt_parser_dump_done(GF_WebVTTParser *parser, u32 duration);
 #endif /* GPAC_DISABLE_ISOM */
 
 #endif /* GPAC_DISABLE_VTT */
 
+
+#define M4V_VO_START_CODE					0x00
+#define M4V_VOL_START_CODE					0x20
+#define M4V_VOP_START_CODE					0xB6
+#define M4V_VISOBJ_START_CODE				0xB5
+#define M4V_VOS_START_CODE					0xB0
+#define M4V_GOV_START_CODE					0xB3
+#define M4V_UDTA_START_CODE					0xB2
+
+
+#define M2V_PIC_START_CODE					0x00
+#define M2V_SEQ_START_CODE					0xB3
+#define M2V_EXT_START_CODE					0xB5
+#define M2V_GOP_START_CODE					0xB8
+
+
 #endif		/*_GF_MEDIA_DEV_H_*/

gpac-0.8.0.tar.gz/include/gpac/internal/odf_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/odf_dev.h Changed

@@ -54,7 +54,7 @@
 
 /*IPMPX tools*/
 u32 gf_ipmpx_array_size(GF_BitStream *bs, u32 *array_size);
-void gf_ipmpx_write_array(GF_BitStream *bs, char *data, u32 data_len);
+void gf_ipmpx_write_array(GF_BitStream *bs, u8 *data, u32 data_len);
 
 /*QoS qualifiers base functions*/
 GF_Err gf_odf_parse_qos_qual(GF_BitStream *bs, GF_QoS_Default **qos_qual, u32 *qos_size);
@@ -143,6 +143,7 @@
 GF_Err gf_odf_del_ui_cfg(GF_UIConfig *desc);
 GF_Err gf_odf_del_laser_cfg(GF_LASERConfig *desc);
 GF_Err gf_odf_del_auxvid(GF_AuxVideoDescriptor *ld);
+GF_Err gf_odf_del_ElemMask(GF_ElementaryMask *desc);
 
 GF_Err gf_odf_read_iod(GF_BitStream *bs, GF_InitialObjectDescriptor *iod, u32 DescSize);
 GF_Err gf_odf_read_esd(GF_BitStream *bs, GF_ESD *esd, u32 DescSize);
@@ -176,7 +177,6 @@
 GF_Err gf_odf_read_sup_cid(GF_BitStream *bs, GF_SCIDesc *scid, u32 DescSize);
 GF_Err gf_odf_read_segment(GF_BitStream *bs, GF_Segment *sd, u32 DescSize);
 GF_Err gf_odf_read_mediatime(GF_BitStream *bs, GF_MediaTime *mt, u32 DescSize);
-GF_Err gf_odf_read_muxinfo(GF_BitStream *bs, GF_MuxInfo *mi, u32 DescSize);
 GF_Err gf_odf_read_ipmp_tool_list(GF_BitStream *bs, GF_IPMP_ToolList *ipmptl, u32 DescSize);
 GF_Err gf_odf_read_ipmp_tool(GF_BitStream *bs, GF_IPMP_Tool *ipmp, u32 DescSize);
 GF_Err gf_odf_read_auxvid(GF_BitStream *bs, GF_AuxVideoDescriptor *ld, u32 DescSize);
@@ -265,7 +265,6 @@
 GF_Err gf_odf_delete_command(GF_ODCom *com);
 GF_Err gf_odf_parse_command(GF_BitStream *bs, GF_ODCom **com, u32 *com_size);
 GF_Err gf_odf_read_command(GF_BitStream *bs, GF_ODCom *com, u32 gf_odf_size_command);
-GF_Err gf_odf_size_command(GF_ODCom *com, u32 *outSize);
 GF_Err gf_odf_write_command(GF_BitStream *bs, GF_ODCom *com);
 
 GF_ODCom *gf_odf_new_od_remove();

gpac-0.8.0.tar.gz/include/gpac/internal/odf_parse_common.h -> gpac-1.0.0.tar.gz/include/gpac/internal/odf_parse_common.h Changed

@@ -33,11 +33,18 @@
 #define GET_S16(field) { s16 d; if (strstr(val, "0x")) { ret += sscanf(val, "%hx", (u16*)&d); if (ret) field = d; } else { ret += sscanf(val, "%hd", &d); if (ret) field = d; }	}
 #define GET_U32(field) { u32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", &d); if (ret) field = d; } else { ret += sscanf(val, "%ud", &d); if (ret) field = d; }	}
 #define GET_S32(field) { s32 d; if (strstr(val, "0x")) { ret += sscanf(val, "%x", (u32*)&d); if (ret) field = d; } else { ret += sscanf(val, "%d", &d); if (ret) field = d; }	}
-#define GET_BOOL(field) { ret = 1; field = (!stricmp(val, "true") || !stricmp(val, "1")) ? GF_TRUE : GF_FALSE; }
+#define GET_BOOL(field) { ret = 1; field = (!stricmp(val, "true") || !strcmp(val, "1")) ? GF_TRUE : GF_FALSE; }
 #define GET_U64(field) { u64 d; if (strstr(val, "0x")) { ret += sscanf(val, LLX, &d); if (ret) field = d; } else { ret += sscanf(val, LLU, &d); if (ret) field = d; }	}
 
 #define GET_DOUBLE(field) { Float v; ret = 1; sscanf(val, "%f", &v); field = (Double) v;}
-#define GET_STRING(field) { ret = 1; field = gf_strdup(val); if (val[0] == '"') strcpy(field, val+1); if (field[strlen(field)-1] == '"') field[strlen(field)-1] = 0; }
+#define GET_STRING(field) { \
+		ret = 1;\
+		field = gf_strdup(val); \
+		if (field) { \
+			if (val[0] == '"') strcpy(field, val+1); \
+			if (field[strlen(field)-1] == '"') field[strlen(field)-1] = 0;\
+		}\
+	}
 
 
 #endif	/* _GF_OD_PARSE_COMMON_H_  */

gpac-0.8.0.tar.gz/include/gpac/internal/ogg.h -> gpac-1.0.0.tar.gz/include/gpac/internal/ogg.h Changed

@@ -38,17 +38,17 @@
 	s32 endbyte;
 	s32  endbit;
 
-	unsigned char *buffer;
-	unsigned char *ptr;
+	u8 *buffer;
+	u8 *ptr;
 	s32 storage;
 } oggpack_buffer;
 
 /* ogg_page is used to encapsulate the data in one Ogg bitstream page *****/
 
 typedef struct {
-	unsigned char *header;
+	u8 *header;
 	s32 header_len;
-	unsigned char *body;
+	u8 *body;
 	s32 body_len;
 } ogg_page;
 
@@ -83,7 +83,7 @@
 	s64  packetno;      /* sequence number for decode; the framing
                              knows where there's a hole in the data,
                              but we need coupling so that the codec
-                             (which is in a seperate abstraction
+                             (which is in a separate abstraction
                              layer) also knows about the gap */
 	s64   granulepos;
 
@@ -93,7 +93,7 @@
    to a single raw Ogg/Vorbis packet *************************************/
 
 typedef struct {
-	unsigned char *packet;
+	u8 *packet;
 	s32  bytes;
 	s32  b_o_s;
 	s32  e_o_s;
@@ -103,12 +103,12 @@
 	s64  packetno;     /* sequence number for decode; the framing
 				knows where there's a hole in the data,
 				but we need coupling so that the codec
-				(which is in a seperate abstraction
+				(which is in a separate abstraction
 				layer) also knows about the gap */
 } ogg_packet;
 
 typedef struct {
-	unsigned char *data;
+	u8 *data;
 	s32 storage;
 	s32 fill;
 	s32 returned;
@@ -128,7 +128,7 @@
 void oggpack_writecopy(oggpack_buffer *b,void *source,s32 bits);
 void oggpack_reset(oggpack_buffer *b);
 void oggpack_writeclear(oggpack_buffer *b);
-void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes);
+void oggpack_readinit(oggpack_buffer *b,u8 *buf,s32 bytes);
 void oggpack_write(oggpack_buffer *b,u32 value,s32 bits);
 s32 oggpack_look(oggpack_buffer *b,s32 bits);
 s32 oggpack_look1(oggpack_buffer *b);
@@ -138,7 +138,7 @@
 s32 oggpack_read1(oggpack_buffer *b);
 s32 oggpack_bytes(oggpack_buffer *b);
 s32 oggpack_bits(oggpack_buffer *b);
-unsigned char *oggpack_get_buffer(oggpack_buffer *b);
+u8 *oggpack_get_buffer(oggpack_buffer *b);
 
 void oggpackB_writeinit(oggpack_buffer *b);
 void oggpackB_writetrunc(oggpack_buffer *b,s32 bits);
@@ -146,7 +146,7 @@
 void oggpackB_writecopy(oggpack_buffer *b,void *source,s32 bits);
 void oggpackB_reset(oggpack_buffer *b);
 void oggpackB_writeclear(oggpack_buffer *b);
-void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes);
+void oggpackB_readinit(oggpack_buffer *b,u8 *buf,s32 bytes);
 void oggpackB_write(oggpack_buffer *b,u32 value,s32 bits);
 s32 oggpackB_look(oggpack_buffer *b,s32 bits);
 s32 oggpackB_look1(oggpack_buffer *b);
@@ -156,7 +156,7 @@
 s32 oggpackB_read1(oggpack_buffer *b);
 s32 oggpackB_bytes(oggpack_buffer *b);
 s32 oggpackB_bits(oggpack_buffer *b);
-unsigned char *oggpackB_get_buffer(oggpack_buffer *b);
+u8 *oggpackB_get_buffer(oggpack_buffer *b);
 
 /* Ogg BITSTREAM PRIMITIVES: encoding **************************/
 
@@ -171,7 +171,7 @@
 s32 ogg_sync_reset(ogg_sync_state *oy);
 s32 ogg_sync_destroy(ogg_sync_state *oy);
 
-char *ogg_sync_buffer(ogg_sync_state *oy, s32 size);
+u8 *ogg_sync_buffer(ogg_sync_state *oy, s32 size);
 s32 ogg_sync_wrote(ogg_sync_state *oy, s32 bytes);
 s32 ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og);
 s32 ogg_sync_pageout(ogg_sync_state *oy, ogg_page *og);

gpac-0.8.0.tar.gz/include/gpac/internal/scenegraph_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/scenegraph_dev.h Changed

@@ -75,7 +75,7 @@
 	THIS IS DYNAMICALLY CREATED*/
 	GF_List *routes;
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	/*JS bindings if any - THIS IS DYNAMICALLY CREATED
 	This speeds up field modif notification (script bindings are listed here)*/
 	struct _node_js_binding *js_binding;
@@ -153,7 +153,7 @@
 
 	/*callback routines*/
 	/*node callback*/
-	void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata);
+	gf_sg_node_init_callback NodeCallback;
 	/*real scene time callback*/
 	Double (*GetSceneTime)(void *userpriv);
 
@@ -251,14 +251,14 @@
 	/*listeners to add*/
 	GF_List *listeners_to_add;
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	struct __tag_svg_script_ctx *svg_js;
 	struct __tag_html_media_script_ctx *html_media_js;
 #endif
 
 #endif
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	GF_List *scripts;
 	/*
 			Note about reference counter
@@ -275,20 +275,17 @@
 	u32 reference_count;
 	/*DOM nodes*/
 	GF_List *objects;
-	/*DOM document*/
-	struct JSObject *document;
-
-	Bool dcci_doc;
-
+	struct _dom_js_data *js_data;
 	Bool trigger_gc;
+
+	u32 (*get_element_class)(GF_Node *n);
+	u32 (*get_document_class)(GF_SceneGraph *n);
 #endif
 };
 
 void gf_sg_parent_setup(GF_Node *pNode);
 void gf_sg_parent_reset(GF_Node *pNode);
 
-void *gf_node_get_name_address(GF_Node*node);
-
 void gf_node_changed_internal(GF_Node *node, GF_FieldInfo *field, Bool notify_scripts);
 
 void gf_node_dirty_parent_graph(GF_Node *node);
@@ -381,9 +378,6 @@
 Bool gf_sg_vrml_node_init(GF_Node *node);
 Bool gf_sg_vrml_node_changed(GF_Node *node, GF_FieldInfo *field);
 
-char *gf_node_vrml_dump_attribute(GF_Node *n, GF_FieldInfo *info);
-
-
 
 //
 //		MF Fields tools
@@ -444,7 +438,7 @@
 GF_Err gf_bifs_proto_field_set_aq_info(GF_ProtoFieldInterface *field, u32 QP_Type, u32 hasMinMax, u32 QPSFType, void *qp_min_value, void *qp_max_value, u32 QP13_NumBits);
 
 /*proto field instance. since it is useless to duplicate all coding info, names and the like
-we seperate proto declaration and proto instanciation*/
+we separate proto declaration and proto instanciation*/
 typedef struct
 {
 	u8 EventType;
@@ -554,13 +548,10 @@
 
 
 /* reset functions for SVG types */
-void gf_svg_reset_path(SVG_PathData path);
 void gf_svg_reset_iri(GF_SceneGraph *sg, XMLRI*iri);
 /* delete functions for SVG types */
 void gf_svg_delete_paint		(GF_SceneGraph *sg, SVG_Paint *paint);
 void gf_smil_delete_times		(GF_List *l);
-void gf_svg_delete_points		(GF_List *l);
-void gf_svg_delete_coordinates	(GF_List *l);
 /*for keyTimes, keyPoints and keySplines*/
 void gf_smil_delete_key_types	(GF_List *l);
 
@@ -637,7 +628,6 @@
 Bool gf_svg_is_current_color(GF_FieldInfo *a);
 
 void gf_svg_reset_animate_values(SMIL_AnimateValues anim_values, GF_SceneGraph *sg);
-void gf_svg_reset_animate_value(SMIL_AnimateValue anim_value, GF_SceneGraph *sg);
 
 Bool gf_svg_is_timing_tag(u32 tag);
 Bool gf_svg_is_animation_tag(u32 tag);
@@ -692,8 +682,8 @@
 	scene tree traversal.*/
 	Bool postpone;
 
-	void (*evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state);
-	u32 evaluate_status;
+	void (*evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, GF_SGSMILTimingEvalState state);
+	GF_SGSMILTimingEvalState evaluate_status;
 
 #if 0
 	/* is called only when the timed element is active */
@@ -833,37 +823,8 @@
 #endif
 
 
+typedef struct _gf_vrml_script_priv GF_ScriptPriv;
 
-/*
-		Script node
-*/
-
-typedef struct
-{
-	//extra script fields
-	GF_List *fields;
-
-	//BIFS coding stuff
-	u32 numIn, numDef, numOut;
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-	struct JSContext *js_ctx;
-	struct JSObject *js_obj;
-	struct JSObject *js_browser;
-	/*all attached objects (eg, not created by the script) are stored here so that we don't
-	allocate them again and again when getting properties. Garbage collection is performed (if needed)
-	on these objects after each eventIn execution*/
-	GF_List *js_cache;
-	//Event object, whose private is the pointer to current event being executed
-	struct JSObject *the_event;
-#endif
-
-	void (*JS_PreDestroy)(GF_Node *node);
-	void (*JS_EventIn)(GF_Node *node, GF_FieldInfo *in_field);
-
-	Bool is_loaded;
-
-} GF_ScriptPriv;
 
 /*setup script stack*/
 void gf_sg_script_init(GF_Node *node);
@@ -890,127 +851,18 @@
 
 	Double last_route_time;
 	Bool activate_event_out;
+	s32 magic;
 };
 
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 
 
 #include <gpac/download.h>
 #include <gpac/network.h>
 
-
-struct JSContext *gf_sg_ecmascript_new(GF_SceneGraph *sg);
-void gf_sg_ecmascript_del(struct JSContext *);
-
-GF_Node *gf_sg_js_get_node(struct JSContext *c, struct JSObject *obj);
-
-void gf_sg_script_init_sm_api(GF_ScriptPriv *sc, GF_Node *script);
-
-/*GC thing type: 0 for jsval, 1 for jsstring, 2 for jsobject*/
-enum
-{
-	GF_JSGC_VAL=0,
-	GF_JSGC_STRING,
-	GF_JSGC_OBJECT,
-};
-
-Bool gf_js_add_root(struct JSContext *cx, void *rp, u32 type);
-Bool gf_js_add_named_root(struct JSContext *cx, void *rp, u32 type, const char *name);
-Bool gf_js_remove_root(struct JSContext *cx, void *rp, u32 type);
 void gf_js_vrml_flush_event_out(GF_Node *node, GF_ScriptPriv *priv);
 
-#ifdef GPAC_HAS_SPIDERMONKEY
-void gf_sg_lock_javascript(struct JSContext *c, Bool LockIt);
-Bool gf_sg_try_lock_javascript(struct JSContext *c);
-void gf_sg_js_call_gc(struct JSContext *c);
-#endif /* GPAC_HAS_SPIDERMONKEY */
-
-
-typedef struct
-{
-	GF_FieldInfo field;
-	GF_Node *owner;
-	struct JSObject *obj;
-
-	/*JS list for MFFields or NULL*/
-	struct JSObject *js_list;
-
-	/*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*/
-	GF_ChildNodeItem *temp_list;
-	/*when not owned by a node*/
-	void *field_ptr;
-
-	/*cpontext in which the field was created*/
-	struct JSContext *js_ctx;
-	Bool is_rooted;
-} GF_JSField;
-
-
-struct _node_js_binding
-{
-	void *node;	/*GF_JSField for VRML, JSObject otherwise*/
-	GF_List *fields;
-};
-
-
-#ifndef GPAC_DISABLE_SVG
-
-typedef struct __tag_svg_script_ctx
-{
-	Bool (*script_execute)(struct __tag_scene_graph *sg, char *utf8_script, GF_DOM_Event *event);
-	Bool (*handler_execute)(GF_Node *n, GF_DOM_Event *event, GF_Node *observer, char *utf8_script);
-	u32 nb_scripts;
-	/*global script context for the scene*/
-	struct JSContext *js_ctx;
-	/*global object*/
-	struct JSObject *global;
-	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
-	struct JSObject *event;
-
-	Bool in_script;
-	Bool force_gc;
-} GF_SVGJS;
-
-typedef struct __tag_html_media_script_ctx
-{
-	/*global script context for the scene*/
-	struct JSContext *js_ctx;
-	/*global object*/
-	struct JSObject *global;
-	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
-	struct JSObject *event;
-
-	Bool force_gc;
-} GF_HTMLMediaJS;
-
-#endif	/*GPAC_DISABLE_SVG*/
-
-/*initialize DOM Core (subset) + xmlHTTPRequest API. The global object MUST have private data storage
-and its private data MUST be a scenegraph. This scenegraph is only used to create new documents
-and setup the callback pointers*/
-void dom_js_load(GF_SceneGraph *scene, struct JSContext *c, struct JSObject *global);
-/*unloads the DOM core support (to be called upon destruction only, once the JSContext has been destroyed
-to releases all resources used by DOM JS)*/
-void dom_js_unload();
-/*unloads DOM core before the JSContext is being destroyed */
-void gf_sg_js_dom_pre_destroy(struct JSContext *c, GF_SceneGraph *sg, GF_Node *script_or_handler_node);
-
-/*defines a new global object "document" of type Document*/
-void dom_js_define_document(struct JSContext *c, struct JSObject *global, GF_SceneGraph *doc);
-/*defines a new global object "evt" of type Event*/
-struct JSObject *dom_js_define_event(struct JSContext *c, struct JSObject *global);
-
-struct JSObject *gf_dom_new_event(struct JSContext *c);
-
-struct JSObject *dom_js_get_node_proto(struct JSContext *c);
-struct JSObject *dom_js_get_element_proto(struct JSContext *c);
-struct JSObject *dom_js_get_document_proto(struct JSContext *c);
-struct JSObject *dom_js_get_event_proto(struct JSContext *c);
-
-void dom_set_class_selector(struct JSContext *c, /*struct JSClass*/void *(*get_element_class)(GF_Node *n), /*struct JSClass*/void *(*get_document_class)(GF_SceneGraph *n) );
 
 enum
 {
@@ -1042,16 +894,10 @@
 
 };
 
-int dom_throw_exception(struct JSContext *c, u32 code);
-
 void gf_sg_handle_dom_event_for_vrml(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
 
-void gf_sg_load_script_extensions(GF_SceneGraph *sg, struct JSContext *c, struct JSObject *obj, Bool unload);
-
 Bool gf_sg_javascript_initialized();
-#endif	/*GPAC_HAS_SPIDERMONKEY*/
-
-GF_Err gf_sg_reload_xml_doc(const char *src, GF_SceneGraph *scene);
+#endif	/*GPAC_HAS_QJS*/
 
 SVG_Element *gf_svg_create_node(u32 tag);
 Bool gf_svg_node_init(GF_Node *node);
@@ -1084,20 +930,11 @@
 void gf_sg_listener_post_add(GF_Node *obs, GF_Node *listener);
 /*process all pending add_listener request*/
 void gf_dom_listener_process_add(GF_SceneGraph *sg);
-void gf_dom_listener_reset_defered(GF_SceneGraph *sg);
+void gf_dom_listener_reset_deferred(GF_SceneGraph *sg);
 
 
 void gf_node_delete_attributes(GF_Node *node);
 
-
-typedef GF_DOMNode XBL_Element;
-const char *gf_xbl_get_element_name(u32 tag);
-u32 gf_xbl_get_element_tag(const char *element_name);
-XBL_Element *gf_xbl_create_node(u32 ElementTag);
-u32 gf_xbl_get_attribute_tag(u32 element_tag, const char *attribute_name);
-GF_DOMAttribute *gf_xbl_create_attribute(GF_DOMNode *elt, u32 tag);
-
-
 GF_Node *gf_xml_node_clone(GF_SceneGraph *inScene, GF_Node *orig, GF_Node *cloned_parent, char *inst_id, Bool deep);
 
 GF_Err gf_dom_listener_del(GF_Node *listener, GF_DOMEventTarget *target);

gpac-0.8.0.tar.gz/include/gpac/internal/swf_dev.h -> gpac-1.0.0.tar.gz/include/gpac/internal/swf_dev.h Changed

@@ -186,10 +186,12 @@
 	Bool svg_shape_started;
 	/* end of SVG conversion state */
 
-	/* MP4 user */
+	/* MP4/SVG user */
 	void *user;
-	GF_Err (*add_sample)(void *user, const char *data, u32 length, u64 timestamp, Bool isRap);
-	GF_Err (*add_header)(void *user, const char *data, u32 length, Bool isHeader);
+	GF_Err (*add_sample)(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap);
+	GF_Err (*add_header)(void *user, const u8 *data, u32 length, Bool isHeader);
+
+	FILE *svg_file;
 };
 
 
@@ -204,18 +206,19 @@
 
 #ifndef GPAC_DISABLE_SVG
 GF_Err swf_to_svg_init(SWFReader *read, u32 flags, Float angle);
-GF_Err swf_svg_write_text_sample(void *user, const char *data, u32 length, u64 timestamp, Bool isRap);
-GF_Err swf_svg_write_text_header(void *user, const char *data, u32 length, Bool isHeader);
+GF_Err swf_svg_write_text_sample(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap);
+GF_Err swf_svg_write_text_header(void *user, const u8 *data, u32 length, Bool isHeader);
 #endif
 
 
 SWFReader *gf_swf_reader_new(const char *path, const char *filename);
 GF_Err gf_swf_read_header(SWFReader *read);
 void gf_swf_reader_del(SWFReader *read);
+GF_Err gf_swf_get_duration(SWFReader *read, u32 *frame_rate, u32 *frame_count);
 
 GF_Err gf_swf_reader_set_user_mode(SWFReader *read, void *user,
-                                   GF_Err (*add_sample)(void *user, const char *data, u32 length, u64 timestamp, Bool isRap),
-                                   GF_Err (*add_header)(void *user, const char *data, u32 length, Bool isheader));
+                                   GF_Err (*add_sample)(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap),
+                                   GF_Err (*add_header)(void *user, const u8 *data, u32 length, Bool isheader));
 
 typedef struct
 {

gpac-0.8.0.tar.gz/include/gpac/internal/vobsub.h -> gpac-1.0.0.tar.gz/include/gpac/internal/vobsub.h Changed

gpac-0.8.0.tar.gz/include/gpac/ismacryp.h -> gpac-1.0.0.tar.gz/include/gpac/ismacryp.h Changed

gpac-0.8.0.tar.gz/include/gpac/iso639.h -> gpac-1.0.0.tar.gz/include/gpac/iso639.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -32,51 +32,51 @@
 
 
 /*!
- *	\file <gpac/iso639.h>
- *	\brief Language codes helper tools.
+\file <gpac/iso639.h>
+\brief Language codes helper tools.
  */
 
 /*!
- *	\addtogroup lang_grp Languages
- *	\ingroup utils_grp
- *	\brief Language codes helper tools
- *
- *	This section documents the language codes used in GPAC, based in ISO 639 or RFC 5646.
- *	@{
- */
+\addtogroup lang_grp
+\brief Language codes helper tools
+
+This section documents the language codes used in GPAC, based in ISO 639 or RFC 5646.
+
+@{
+*/
 
 #include <gpac/setup.h>
 
 /*!
- *	Gets number of supported language codes
- *	\return the number of supported language codes
+Gets number of supported language codes
+\return the number of supported language codes
 */
 u32 gf_lang_get_count();
 /*!
- *	Finds language by name or code
- *	\param lang_or_rfc_5646_code the langauage name, ISO 639 code or RFC 5646 code
- *	\return the index of the language, or -1 if not supported
+Finds language by name or code
+\param lang_or_rfc_5646_code the langauage name, ISO 639 code or RFC 5646 code
+\return the index of the language, or -1 if not supported
 */
 s32 gf_lang_find(const char *lang_or_rfc_5646_code);
 
 /*!
- *	Gets the langauge name for the given index
- *	\param lang_idx the langauge 0-based IDX
- *	\return the name of the language
+Gets the langauge name for the given index
+\param lang_idx the langauge 0-based IDX
+\return the name of the language
 */
 const char *gf_lang_get_name(u32 lang_idx);
 
 /*!
- *	Gets the 2 character code for the given index
- *	\param lang_idx the langauge 0-based IDX
- *	\return the 2 character code of the language
+Gets the 2 character code for the given index
+\param lang_idx the langauge 0-based IDX
+\return the 2 character code of the language
 */
 const char *gf_lang_get_2cc(u32 lang_idx);
 
 /*!
- *	Gets the 3 character code for the given index
- *	\param lang_idx the langauge 0-based IDX
- *	\return the 3 character code of the language
+Gets the 3 character code for the given index
+\param lang_idx the langauge 0-based IDX
+\return the 3 character code of the language
 */
 const char *gf_lang_get_3cc(u32 lang_idx);

gpac-0.8.0.tar.gz/include/gpac/isomedia.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -34,182 +34,129 @@
 #endif
 
 /*!
- *	\file <gpac/isomedia.h>
- *	\brief ISOBMFF parsing and writing library.
- */
+\file <gpac/isomedia.h>
+\brief ISOBMFF parsing and writing library.
+*/
 
 /*!
- *	\addtogroup iso_grp ISO Base Media File
- *	\ingroup isobmf_grp
- *	\brief ISOBMF, 3GPP, AVC and HEVC file format utilities.
- *
- *This section documents the reading and writing of ISOBMF, 3GPP, AVC and HEVC file format  using GPAC.
- *	@{
- */
-
-#include <gpac/tools.h>
+\addtogroup iso_grp ISO Base Media File
+\brief ISOBMF, 3GPP, AVC and HEVC file format utilities.
 
+This section documents the reading and writing of ISOBMF (MP4, 3GPP, AVC, HEVC HEIF ...)
+The library supports:
+- regular movie read
+- regular movie write
+- fragmented movie and movie segments read
+- fragmented movie and movie segments write
+- QT support
+- Sample descriptions for most common media found in such files (audio, video, text and subtitles)
+- Meta and HEIF read
+- Meta and HEIF write
+- Common Encryption ISMA E&A and OMA DRM support
+- MPEG-4 Systems extensions
 
-/********************************************************************
-				FILE FORMAT CONSTANTS
-********************************************************************/
 
-/*Modes for file opening
-		NOTE 1: All the READ function in this API can be used in EDIT/WRITE mode.
+All the READ function in this API can be used in EDIT/WRITE mode.
 However, some unexpected errors or values may happen in that case, depending
-on how much modifications you made (timing, track with 0 samples, ...)
-		On the other hand, none of the EDIT/WRITE functions will work in
-READ mode.
-		NOTE 2: The output structure of a edited file will sometimes be different
+on how much modifications you made (timing, track with 0 samples, ...).
+On the other hand, none of the EDIT/WRITE functions will work in READ mode.
+
+The output structure of a edited file will sometimes be different
 from the original file, but the media-data and meta-data will be identical.
 The only change happens in the file media-data container(s) during edition
-		NOTE 3: when editing the file, you MUST set the final name of the modified file
+
+When editing the file, you MUST set the final name of the modified file
 to something different. This API doesn't allow file overwriting.
-*/
-enum
-{
-	/*Opens file for dumping: same as read-only but keeps all movie fragments info untouched*/
-	GF_ISOM_OPEN_READ_DUMP = 0,
-	/*Opens a file in READ ONLY mode*/
-	GF_ISOM_OPEN_READ,
-	/*Opens a file in WRITE ONLY mode. Media Data is captured on the fly. In this mode,
-	the editing functions are disabled.*/
-	GF_ISOM_OPEN_WRITE,
-	/*Opens an existing file in EDIT mode*/
-	GF_ISOM_OPEN_EDIT,
-	/*Creates a new file in EDIT mode*/
-	GF_ISOM_WRITE_EDIT,
-	/*Opens an existing file for fragment concatenation*/
-	GF_ISOM_OPEN_CAT_FRAGMENTS,
-};
 
-/*Movie Options for file writing*/
-enum
-{
-	/*FLAT: the MediaData (MPEG4 ESs) is stored at the beginning of the file*/
-	GF_ISOM_STORE_FLAT = 1,
-	/*STREAMABLE: the MetaData (File Info) is stored at the beginning of the file
-	for fast access during download*/
-	GF_ISOM_STORE_STREAMABLE,
-	/*INTERLEAVED: Same as STREAMABLE, plus the media data is mixed by chunk  of fixed duration*/
-	GF_ISOM_STORE_INTERLEAVED,
-	/*INTERLEAVED +DRIFT: Same as INTERLEAVED, and adds time drift control to avoid creating too long chunks*/
-	GF_ISOM_STORE_DRIFT_INTERLEAVED,
-	/*tightly interleaves samples based on their DTS, therefore allowing better placement of samples in the file.
-	This is used for both http interleaving and Hinting optimizations*/
-	GF_ISOM_STORE_TIGHT
+@{
+ */
+
+#include <gpac/tools.h>
 
-};
 
-/*Some track may depend on other tracks for several reasons. They reference these tracks
-through the following Reference Types*/
+/*! Track reference types
+
+Some track may depend on other tracks for several reasons. They reference these tracks through the following Reference Types
+*/
 enum
 {
-	/*ref type for the OD track dependencies*/
-	GF_ISOM_REF_OD			= GF_4CC( 'm', 'p', 'o', 'd' ),
-	/*ref type for stream dependencies*/
+	/*! ref type for the OD track dependencies*/
+	GF_ISOM_REF_OD = GF_4CC( 'm', 'p', 'o', 'd' ),
+	/*! ref type for stream dependencies*/
 	GF_ISOM_REF_DECODE = GF_4CC( 'd', 'p', 'n', 'd' ),
-	/*ref type for OCR (Object Clock Reference) dependencies*/
-	GF_ISOM_REF_OCR				= GF_4CC( 's', 'y', 'n', 'c' ),
-	/*ref type for IPI (Intellectual Property Information) dependencies*/
-	GF_ISOM_REF_IPI				= GF_4CC( 'i', 'p', 'i', 'r' ),
-	/*this track describes the referenced tr*/
-	GF_ISOM_REF_META		= GF_4CC( 'c', 'd', 's', 'c' ),
-	/*ref type for Hint tracks*/
-	GF_ISOM_REF_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
-	/*ref type for QT Chapter tracks*/
-	GF_ISOM_REF_CHAP		= GF_4CC( 'c', 'h', 'a', 'p' ),
-	/*ref type for the SVC and SHVC tracks*/
+	/*! ref type for OCR (Object Clock Reference) dependencies*/
+	GF_ISOM_REF_OCR = GF_4CC( 's', 'y', 'n', 'c' ),
+	/*! ref type for IPI (Intellectual Property Information) dependencies*/
+	GF_ISOM_REF_IPI = GF_4CC( 'i', 'p', 'i', 'r' ),
+	/*! this track describes the referenced tr*/
+	GF_ISOM_REF_META = GF_4CC( 'c', 'd', 's', 'c' ),
+	/*! ref type for Hint tracks*/
+	GF_ISOM_REF_HINT = GF_4CC( 'h', 'i', 'n', 't' ),
+	/*! ref type for QT Chapter tracks*/
+	GF_ISOM_REF_CHAP = GF_4CC( 'c', 'h', 'a', 'p' ),
+	/*! ref type for the SVC and SHVC base tracks*/
 	GF_ISOM_REF_BASE = GF_4CC( 's', 'b', 'a', 's' ),
+	/*! ref type for the SVC and SHVC extractor reference tracks*/
 	GF_ISOM_REF_SCAL = GF_4CC( 's', 'c', 'a', 'l' ),
+	/*! ref type for the SHVC tile base tracks*/
 	GF_ISOM_REF_TBAS = GF_4CC( 't', 'b', 'a', 's' ),
+	/*! ref type for the SHVC tile tracks*/
 	GF_ISOM_REF_SABT = GF_4CC( 's', 'a', 'b', 't' ),
+	/*! ref type for the SHVC oinf track*/
 	GF_ISOM_REF_OREF = GF_4CC( 'o', 'r', 'e', 'f' ),
-	//this track uses fonts carried/defined in the referenced track
+	/*! this track uses fonts carried/defined in the referenced track*/
 	GF_ISOM_REF_FONT = GF_4CC( 'f', 'o', 'n', 't' ),
-	//this track depends on the referenced hint track, i.e., it should only be used if the referenced hint track is used.
+	/*! this track depends on the referenced hint track, i.e., it should only be used if the referenced hint track is used.*/
 	GF_ISOM_REF_HIND = GF_4CC( 'h', 'i', 'n', 'd' ),
-	//this track contains auxiliary depth video information for the referenced video track
+	/*! this track contains auxiliary depth video information for the referenced video track*/
 	GF_ISOM_REF_VDEP = GF_4CC( 'v', 'd', 'e', 'p' ),
-	//this track contains auxiliary parallax video information for the referenced video track
+	/*! this track contains auxiliary parallax video information for the referenced video track*/
 	GF_ISOM_REF_VPLX = GF_4CC( 'v', 'p', 'l', 'x' ),
-	//this track contains subtitle, timed text or overlay graphical information for the referenced track or any track in the alternate group to which the track belongs, if any
+	/*! this track contains subtitle, timed text or overlay graphical information for the referenced track or any track in the alternate group to which the track belongs, if any*/
 	GF_ISOM_REF_SUBT = GF_4CC( 's', 'u', 'b', 't' ),
-	//thumbail track
+	/*! thumbnail track*/
 	GF_ISOM_REF_THUMB = GF_4CC( 't', 'h', 'm', 'b' ),
 	/*DRC*/
-	//additionnal audio track
-	GF_ISOM_REF_ADDA			= GF_4CC( 'a', 'd', 'd', 'a' ),
-	//DRC metadata
-	GF_ISOM_REF_ADRC			= GF_4CC( 'a', 'd', 'r', 'c' ),
-	//item->track location
-	GF_ISOM_REF_ILOC			= GF_4CC( 'i', 'l', 'o', 'c' ),
-	//AVC dep stream
-	GF_ISOM_REF_AVCP			= GF_4CC( 'a', 'v', 'c', 'p' ),
-	//AVC switch to
-	GF_ISOM_REF_SWTO			= GF_4CC( 's', 'w', 't', 'o' ),
-	//AVC switch from
-	GF_ISOM_REF_SWFR			= GF_4CC( 's', 'w', 'f', 'r' ),
-
-	//Time code
-	GF_ISOM_REF_TMCD			= GF_4CC( 't', 'm', 'c', 'd' ),
-	//Structural dependency
-	GF_ISOM_REF_CDEP			= GF_4CC( 'c', 'd', 'e', 'p' ),
-	//transcript
-	GF_ISOM_REF_SCPT			= GF_4CC( 's', 'c', 'p', 't' ),
-	//nonprimary source description
-	GF_ISOM_REF_SSRC			= GF_4CC( 's', 's', 'r', 'c' ),
-	//layer audio track dependency
-	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' ),
-
+	/*! additional audio track*/
+	GF_ISOM_REF_ADDA = GF_4CC( 'a', 'd', 'd', 'a' ),
+	/*! DRC metadata*/
+	GF_ISOM_REF_ADRC = GF_4CC( 'a', 'd', 'r', 'c' ),
+	/*! item->track location*/
+	GF_ISOM_REF_ILOC = GF_4CC( 'i', 'l', 'o', 'c' ),
+	/*! AVC dep stream*/
+	GF_ISOM_REF_AVCP = GF_4CC( 'a', 'v', 'c', 'p' ),
+	/*! AVC switch to*/
+	GF_ISOM_REF_SWTO = GF_4CC( 's', 'w', 't', 'o' ),
+	/*! AVC switch from*/
+	GF_ISOM_REF_SWFR = GF_4CC( 's', 'w', 'f', 'r' ),
+
+	/*! Time code*/
+	GF_ISOM_REF_TMCD = GF_4CC( 't', 'm', 'c', 'd' ),
+	/*! Structural dependency*/
+	GF_ISOM_REF_CDEP = GF_4CC( 'c', 'd', 'e', 'p' ),
+	/*! transcript*/
+	GF_ISOM_REF_SCPT = GF_4CC( 's', 'c', 'p', 't' ),
+	/*! nonprimary source description*/
+	GF_ISOM_REF_SSRC = GF_4CC( 's', 's', 'r', 'c' ),
+	/*! layer audio track dependency*/
+	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' ),
+	/*! Track fragment inherit */
+	GF_ISOM_REF_TRIN = GF_4CC( 't', 'r', 'i', 'n' ),
 };
 
-//defined sample groups in GPAC
-enum {
-	GF_ISOM_SAMPLE_GROUP_ROLL = GF_4CC( 'r', 'o', 'l', 'l'),
-	GF_ISOM_SAMPLE_GROUP_PROL = GF_4CC( 'p', 'r', 'o', 'l'),
-	GF_ISOM_SAMPLE_GROUP_RAP = GF_4CC( 'r', 'a', 'p', ' ' ),
-	GF_ISOM_SAMPLE_GROUP_SEIG = GF_4CC( 's', 'e', 'i', 'g' ),
-	GF_ISOM_SAMPLE_GROUP_OINF = GF_4CC( 'o', 'i', 'n', 'f'),
-	GF_ISOM_SAMPLE_GROUP_LINF = GF_4CC( 'l', 'i', 'n', 'f'),
-	GF_ISOM_SAMPLE_GROUP_TRIF = GF_4CC( 't', 'r', 'i', 'f' ),
-	GF_ISOM_SAMPLE_GROUP_NALM = GF_4CC( 'n', 'a', 'l', 'm'),
-	GF_ISOM_SAMPLE_GROUP_TELE = GF_4CC( 't', 'e', 'l', 'e'),
-	GF_ISOM_SAMPLE_GROUP_SAP = GF_4CC( 's', 'a', 'p', ' '),
-	GF_ISOM_SAMPLE_GROUP_ALST = GF_4CC( 'a', 'l', 's', 't'),
-	GF_ISOM_SAMPLE_GROUP_RASH = GF_4CC( 'r', 'a', 's', 'h'),
-
-	GF_ISOM_SAMPLE_GROUP_AVLL = GF_4CC( 'a', 'v', 'l', 'l'), //p15
-	GF_ISOM_SAMPLE_GROUP_AVSS = GF_4CC( 'a', 'v', 's', 's'), //p15
-	GF_ISOM_SAMPLE_GROUP_DTRT = GF_4CC( 'd', 't', 'r', 't'), //p15
-	GF_ISOM_SAMPLE_GROUP_MVIF = GF_4CC( 'm', 'v', 'i', 'f'), //p15
-	GF_ISOM_SAMPLE_GROUP_SCIF = GF_4CC( 's', 'c', 'i', 'f'), //p15
-	GF_ISOM_SAMPLE_GROUP_SCNM = GF_4CC( 's', 'c', 'n', 'm'), //p15
-	GF_ISOM_SAMPLE_GROUP_STSA = GF_4CC( 's', 't', 's', 'a'), //p15
-	GF_ISOM_SAMPLE_GROUP_TSAS = GF_4CC( 't', 's', 'a', 's'), //p15
-	GF_ISOM_SAMPLE_GROUP_SYNC = GF_4CC( 's', 'y', 'n', 'c'), //p15
-	GF_ISOM_SAMPLE_GROUP_TSCL = GF_4CC( 't', 's', 'c', 'l'), //p15
-	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
-};
-
-/*Track Edition flag*/
-enum {
-	/*empty segment in the track (no media for this segment)*/
+/*! Track Edit list type*/
+typedef enum {
+	/*! empty segment in the track (no media for this segment)*/
 	GF_ISOM_EDIT_EMPTY		=	0x00,
-	/*dwelled segment in the track (one media sample for this segment)*/
+	/*! dwelled segment in the track (one media sample for this segment)*/
 	GF_ISOM_EDIT_DWELL		=	0x01,
-	/*normal segment in the track*/
+	/*! normal segment in the track*/
 	GF_ISOM_EDIT_NORMAL		=	0x02
-};
+} GF_ISOEditType;
 
-/*Generic Media Types (YOU HAVE TO USE ONE OF THESE TYPES FOR COMPLIANT ISO MEDIA FILES)*/
+/*! Generic Media Types (YOU HAVE TO USE ONE OF THESE TYPES FOR COMPLIANT ISO MEDIA FILES)*/
 enum
 {
 	/*base media types*/
@@ -224,7 +171,10 @@
 	GF_ISOM_MEDIA_SUBT		= GF_4CC( 's', 'b', 't', 'l' ),
 	GF_ISOM_MEDIA_SUBPIC	= GF_4CC( 's', 'u', 'b', 'p' ),
 	GF_ISOM_MEDIA_MPEG_SUBT	= GF_4CC( 's', 'u', 'b', 't' ),
-
+	/*closed caption track types for QT/ProRes*/
+	GF_ISOM_MEDIA_CLOSED_CAPTION		= GF_4CC( 'c', 'l', 'c', 'p' ),
+	/*timecode metadata for QT/ProRes*/
+	GF_ISOM_MEDIA_TIMECODE		= GF_4CC( 't', 'm', 'c', 'd' ),
 	/*MPEG-4 media types*/
 	GF_ISOM_MEDIA_OD		= GF_4CC( 'o', 'd', 's', 'm' ),
 	GF_ISOM_MEDIA_OCR		= GF_4CC( 'c', 'r', 's', 'm' ),
@@ -235,51 +185,20 @@
 	GF_ISOM_MEDIA_MPEGJ		= GF_4CC( 'm', 'j', 's', 'm' ),
 	/*GPAC-defined, for any track using MPEG-4 systems signaling but with undefined streaml types*/
 	GF_ISOM_MEDIA_ESM		= GF_4CC( 'g', 'e', 's', 'm' ),
-
 	/*DIMS media type (same as scene but with a different mediaInfo)*/
 	GF_ISOM_MEDIA_DIMS		= GF_4CC( 'd', 'i', 'm', 's' ),
-
+	/*SWF file embedded in media track*/
 	GF_ISOM_MEDIA_FLASH		= GF_4CC( 'f', 'l', 's', 'h' ),
-
+	/*QTVR track*/
 	GF_ISOM_MEDIA_QTVR		= GF_4CC( 'q', 't', 'v', 'r' ),
-
 	GF_ISOM_MEDIA_JPEG		= GF_4CC( 'j', 'p', 'e', 'g' ),
 	GF_ISOM_MEDIA_JP2		= GF_4CC( 'j', 'p', '2', ' ' ),
 	GF_ISOM_MEDIA_PNG		= GF_4CC( 'p', 'n', 'g', ' ' ),
-
-};
-
-
-/*DRM related code points*/
-enum
-{
-	GF_ISOM_BOX_UUID_PSEC	= GF_4CC( 'P', 'S', 'E', 'C' ),
-	GF_ISOM_BOX_TYPE_SENC	= GF_4CC( 's', 'e', 'n', 'c'),
-
-	/* Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_ISMACRYP_SCHEME	= GF_4CC( 'i', 'A', 'E', 'C' ),
-	/* Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_OMADRM_SCHEME	= GF_4CC('o','d','k','m'),
-
-	/* Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_CENC_SCHEME	= GF_4CC('c','e','n','c'),
-
-	/* Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_CBC_SCHEME	= GF_4CC('c','b','c','1'),
-
-	/* Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_ADOBE_SCHEME	= GF_4CC('a','d','k','m'),
-
-	/* Pattern Encryption Scheme Type in the SchemeTypeInfoBox */
-	GF_ISOM_CENS_SCHEME	= GF_4CC('c','e','n','s'),
-	GF_ISOM_CBCS_SCHEME	= GF_4CC('c','b','c','s'),
-
-	GF_ISOM_ISMA_SCHEME = GF_4CC('i','s','m','a'),
-	GF_ISOM_ODRM_SCHEME = GF_4CC('o','d','r','m'),
+	GF_ISOM_MEDIA_TMCD		= GF_4CC( 't', 'm', 'c', 'd' ),
 };
 
 
-/*specific media sub-types - you shall make sure the media sub type is what you expect*/
+/*! specific media sub-types - you shall make sure the media sub type is what you expect*/
 enum
 {
 	/*reserved, internal use in the lib. Indicates the track complies to MPEG-4 system
@@ -313,10 +232,15 @@
 
 	/*Opus media type*/
 	GF_ISOM_SUBTYPE_OPUS = GF_4CC('O', 'p', 'u', 's'),
+	GF_ISOM_SUBTYPE_FLAC = GF_4CC( 'f', 'L', 'a', 'C' ),
 
 	/* VP */
 	GF_ISOM_SUBTYPE_VP08 = GF_4CC('v', 'p', '0', '8'),
 	GF_ISOM_SUBTYPE_VP09 = GF_4CC('v', 'p', '0', '9'),
+	GF_ISOM_SUBTYPE_VP10 = GF_4CC('v', 'p', '1', '0'),
+
+	/* Dolby Vision */
+	GF_ISOM_SUBTYPE_DVHE = GF_4CC('d', 'v', 'h', 'e'),
 
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263	= GF_4CC( 's', '2', '6', '3' ),
@@ -330,7 +254,10 @@
 	GF_ISOM_SUBTYPE_3GP_DIMS	= GF_4CC( 'd', 'i', 'm', 's' ),
 
 	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_MP4A		= GF_4CC( 'm', 'p', '4', 'a' ),
+	GF_ISOM_SUBTYPE_MP4S		= GF_4CC( 'm', 'p', '4', 's' ),
 
 	GF_ISOM_SUBTYPE_LSR1		= GF_4CC( 'l', 's', 'r', '1' ),
 	GF_ISOM_SUBTYPE_WVTT		= GF_4CC( 'w', 'v', 't', 't' ),
@@ -357,47 +284,78 @@
 	GF_ISOM_SUBTYPE_JPEG		= GF_4CC( 'j', 'p', 'e', 'g' ),
 	GF_ISOM_SUBTYPE_PNG 		= GF_4CC( 'p', 'n', 'g', ' ' ),
 	GF_ISOM_SUBTYPE_MJP2 		= GF_4CC( 'm', 'j', 'p', '2' ),
+	GF_ISOM_SUBTYPE_JP2K		= GF_4CC('j','p','2','k'),
 
 	GF_ISOM_SUBTYPE_MH3D_MHA1	= GF_4CC( 'm', 'h', 'a', '1' ),
 	GF_ISOM_SUBTYPE_MH3D_MHA2	= GF_4CC( 'm', 'h', 'a', '2' ),
 	GF_ISOM_SUBTYPE_MH3D_MHM1	= GF_4CC( 'm', 'h', 'm', '1' ),
 	GF_ISOM_SUBTYPE_MH3D_MHM2	= GF_4CC( 'm', 'h', 'm', '2' ),
 
+	GF_ISOM_SUBTYPE_IPCM		= GF_4CC( 'i', 'p', 'c', 'm' ),
+	GF_ISOM_SUBTYPE_FPCM		= GF_4CC( 'f', 'p', 'c', 'm' ),
 
 	/* on-screen colours */
 	GF_ISOM_SUBTYPE_NCLX 		= GF_4CC( 'n', 'c', 'l', 'x' ),
 	GF_ISOM_SUBTYPE_NCLC 		= GF_4CC( 'n', 'c', 'l', 'c' ),
 	GF_ISOM_SUBTYPE_PROF 		= GF_4CC( 'p', 'r', 'o', 'f' ),
 	GF_ISOM_SUBTYPE_RICC 		= GF_4CC( 'r', 'I', 'C', 'C' ),
+
+	/* QT audio codecs */
+	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'),
+	GF_QT_SUBTYPE_FL32 	= GF_4CC('f','l','3','2'),
+	GF_QT_SUBTYPE_FL64 	= GF_4CC('f','l','6','4'),
+	GF_QT_SUBTYPE_IN24 	= GF_4CC('i','n','2','4'),
+	GF_QT_SUBTYPE_IN32 	= GF_4CC('i','n','3','2'),
+	GF_QT_SUBTYPE_ULAW 	= GF_4CC('u','l','a','w'),
+	GF_QT_SUBTYPE_ALAW 	= GF_4CC('a','l','a','w'),
+	GF_QT_SUBTYPE_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x02),
+	GF_QT_SUBTYPE_IMA_ADPCM 	= GF_4CC(0x6D,0x73,0x00,0x11),
+	GF_QT_SUBTYPE_DVCA 	= GF_4CC('d','v','c','a'),
+	GF_QT_SUBTYPE_QDMC 	= GF_4CC('Q','D','M','C'),
+	GF_QT_SUBTYPE_QDMC2	= GF_4CC('Q','D','M','2'),
+	GF_QT_SUBTYPE_QCELP	= GF_4CC('Q','c','l','p'),
+	GF_QT_SUBTYPE_kMP3 	= GF_4CC(0x6D,0x73,0x00,0x55),
+
+	/* QT video codecs */
+	GF_QT_SUBTYPE_C608	= GF_4CC( 'c', '6', '0', '8' ),
+	GF_QT_SUBTYPE_APCH	= GF_4CC( 'a', 'p', 'c', 'h' ),
+	GF_QT_SUBTYPE_APCO	= GF_4CC( 'a', 'p', 'c', 'o' ),
+	GF_QT_SUBTYPE_APCN	= GF_4CC( 'a', 'p', 'c', 'n' ),
+	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'),
 };
 
 
 
 
-/*direction for sample search (including SyncSamples search)
+/*! direction for sample search (including SyncSamples search)
 Function using search allways specify the desired time in composition (presentation) time
-
 		(Sample N-1)	DesiredTime		(Sample N)
-
-FORWARD: will give the next sample given the desired time (eg, N)
-BACKWARD: will give the previous sample given the desired time (eg, N-1)
-SYNCFORWARD: will search from the desired point in time for a sync sample if any
-		If no sync info, behaves as FORWARD
-SYNCBACKWARD: will search till the desired point in time for a sync sample if any
-		If no sync info, behaves as BACKWARD
-SYNCSHADOW: use the sync shadow information to retrieve the sample.
-		If no SyncShadow info, behave as SYNCBACKWARD
 */
-enum
+typedef enum
 {
+	/*! FORWARD: will give the next sample given the desired time (eg, N)*/
 	GF_ISOM_SEARCH_FORWARD		=	1,
+	/*! BACKWARD: will give the previous sample given the desired time (eg, N-1)*/
 	GF_ISOM_SEARCH_BACKWARD		=	2,
+	/*! SYNCFORWARD: will search from the desired point in time for a sync sample if any. If no sync info, behaves as FORWARD*/
 	GF_ISOM_SEARCH_SYNC_FORWARD	=	3,
+	/*! SYNCBACKWARD: will search till the desired point in time for a sync sample if any. If no sync info, behaves as BACKWARD*/
 	GF_ISOM_SEARCH_SYNC_BACKWARD	=	4,
+	/*! SYNCSHADOW: use the sync shadow information to retrieve the sample. If no SyncShadow info, behave as SYNCBACKWARD
+	\warning deprecated in ISOBMFF*/
 	GF_ISOM_SEARCH_SYNC_SHADOW		=	5
-};
+} GF_ISOSearchMode;
 
-/*Predefined File Brand codes (MPEG-4 and JPEG2000)*/
+/*! Predefined File Brand codes (MPEG-4 and JPEG2000)*/
 enum
 {
 	/*file complying to the generic ISO Media File (base specification ISO/IEC 14496-12)
@@ -433,12 +391,18 @@
 	/* Image File Format */
 	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'),
 	/*other iso media brands */
 	GF_ISOM_BRAND_ISO1 = GF_4CC( 'i', 's', 'o', '1' ),
 	GF_ISOM_BRAND_ISO3 = GF_4CC( 'i', 's', 'o', '3' ),
 	GF_ISOM_BRAND_ISO5 = GF_4CC( 'i', 's', 'o', '5' ),
 	GF_ISOM_BRAND_ISO6 = GF_4CC( 'i', 's', 'o', '6' ),
+	GF_ISOM_BRAND_ISO7 = GF_4CC( 'i', 's', 'o', '7' ),
+	GF_ISOM_BRAND_ISO8 = GF_4CC( 'i', 's', 'o', '8' ),
+	GF_ISOM_BRAND_ISO9 = GF_4CC( 'i', 's', 'o', '9' ),
+	GF_ISOM_BRAND_ISOA = GF_4CC( 'i', 's', 'o', 'a' ),
 
 	/* QT brand*/
 	GF_ISOM_BRAND_QT  = GF_4CC( 'q', 't', ' ', ' ' ),
@@ -455,6 +419,8 @@
 
 	GF_ISOM_BRAND_HVCE = GF_4CC( 'h', 'v', 'c', 'e' ),
 	GF_ISOM_BRAND_HVCI = GF_4CC( 'h', 'v', 'c', 'i' ),
+	GF_ISOM_BRAND_HVTI = GF_4CC( 'h', 'v', 't', 'i' ),
+
 
 	GF_ISOM_BRAND_AV01 = GF_4CC( 'a', 'v', '0', '1'),
 
@@ -488,1040 +454,3404 @@
 
 };
 
-
-/*MPEG-4 ProfileAndLevel codes*/
-enum
-{
-	GF_ISOM_PL_AUDIO,
-	GF_ISOM_PL_VISUAL,
-	GF_ISOM_PL_GRAPHICS,
-	GF_ISOM_PL_SCENE,
-	GF_ISOM_PL_OD,
-	GF_ISOM_PL_MPEGJ,
-	/*not a profile, just set/unset inlineFlag*/
-	GF_ISOM_PL_INLINE,
-};
-
 #ifndef GPAC_DISABLE_ISOM
 
 #include <gpac/mpeg4_odf.h>
 
-/*the isomedia file*/
+/*! isomedia file*/
 typedef struct __tag_isom GF_ISOFile;
 
-/*Random Access Point flag*/
+/*! a track ID value - just a 32 bit value but typedefed for API safety*/
+typedef u32 GF_ISOTrackID;
+
+/*! @} */
+
+/*!
+\addtogroup isosample_grp ISO Sample
+\ingroup iso_grp
+
+Media sample for ISOBMFF API.
+@{
+*/
+
+/*! Random Access Point flag*/
 typedef enum {
+	/*! redundant sync shadow - only set when reading sample*/
 	RAP_REDUNDANT = -1,
+	/*! not rap*/
 	RAP_NO = 0,
+	/*! sync point (IDR)*/
 	RAP = 1,
+	/*! sync point (IDR)*/
 	SAP_TYPE_1 = 1,
+	/*! sync point (IDR)*/
 	SAP_TYPE_2 = 2,
+	/*! RAP, OpenGOP*/
 	SAP_TYPE_3 = 3,
+	/*! RAP, roll info (GDR or audio preroll)*/
 	SAP_TYPE_4 = 4,
-	SAP_TYPE_5 = 5,
-	SAP_TYPE_6 = 6
-} SAPType;
+} GF_ISOSAPType;
 
-/*media sample object*/
+/*! media sample object*/
 typedef struct
 {
-	/*data size*/
+	/*! data size*/
 	u32 dataLength;
-	/*data with padding if requested*/
-	char *data;
-	/*decoding time*/
+	/*! data with padding if requested*/
+	u8 *data;
+	/*! decoding time*/
 	u64 DTS;
-	/*relative offset for composition if needed*/
+	/*! relative offset for composition if needed*/
 	s32 CTS_Offset;
-	SAPType IsRAP;
-	/*number of packed samples in this sample. If 0 or 1, only 1 sample is present
+	/*! SAP type*/
+	GF_ISOSAPType IsRAP;
+	/*! allocated data size - used only when using static sample in \ref gf_isom_get_sample_ex*/
+	u32 alloc_size;
+	
+	/*! number of packed samples in this sample. If 0 or 1, only 1 sample is present
 	only used for constant size and constant duration samples*/
 	u32 nb_pack;
 } GF_ISOSample;
 
 
-/*creates a new empty sample*/
+/*! creates a new empty sample
+\return the newly allocated ISO sample*/
 GF_ISOSample *gf_isom_sample_new();
 
-/*delete a sample. NOTE:the buffer content will be destroyed by default.
+/*! 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*/
+the pointer is set to NULL after deletion
+\param samp pointer to the target ISO sample
+*/
 void gf_isom_sample_del(GF_ISOSample **samp);
 
-/********************************************************************
-				GENERAL API FUNCTIONS
-********************************************************************/
 
-/*get 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
-the last error is a FatalError, and is not always set if a bad
-param is specified...*/
-GF_Err gf_isom_last_error(GF_ISOFile *the_file);
+/*! @} */
 
-/*indicates if target file is an IsoMedia file
-  returns 1 if it is a non-special file, 2 if an init segment, 3 if a media segment,
-  returns 0 otherwise*/
+/*!
+\addtogroup isogen_grp Generic API
+\ingroup iso_grp
+
+Generic API functions
+@{
+*/
+
+/*! Movie file opening modes */
+typedef enum
+{
+	/*! Opens file for dumping: same as read-only but keeps all movie fragments info untouched*/
+	GF_ISOM_OPEN_READ_DUMP = 0,
+	/*! Opens a file in READ ONLY mode*/
+	GF_ISOM_OPEN_READ,
+	/*! Opens a file in WRITE ONLY mode. Media Data is captured on the fly and storage mode is always flat (moov at end).
+	In this mode, the editing functions are disabled.*/
+	GF_ISOM_OPEN_WRITE,
+	/*! Opens an existing file in EDIT mode*/
+	GF_ISOM_OPEN_EDIT,
+	/*! Creates a new file in EDIT mode*/
+	GF_ISOM_WRITE_EDIT,
+	/*! Opens an existing file and keep fragment information*/
+	GF_ISOM_OPEN_KEEP_FRAGMENTS,
+} GF_ISOOpenMode;
+
+/*! indicates if target file is an IsoMedia file
+\param fileName the target local file name or path to probe, gmem:// or gfio:// resource
+\return 1 if it is a non-special file, 2 if an init segment, 3 if a media segment, 0 otherwise
+*/
 u32 gf_isom_probe_file(const char *fileName);
 
-/*Opens an isoMedia File.
+/*! indicates if target file is an IsoMedia file
+\param fileName the target local file name or path to probe, gmem:// or gfio:// resource
+\param start_range the offset in the file to start probing from
+\param end_range the offset in the file at which probing shall stop
+\return 1 if it is a non-special file, 2 if an init segment, 3 if a media segment, 4 if empty or no file, 0 otherwise
+*/
+u32 gf_isom_probe_file_range(const char *fileName, u64 start_range, u64 end_range);
+
+/*! indicates if target file is an IsoMedia file
+\param inBuf the buffer to probe
+\param inSize the sizeo of the buffer to probe
+\returns 1 if it is a non-special file, 2 if an init segment, 3 if a media segment, 0 otherwise (non recognized or too short)
+*/
+u32 gf_isom_probe_data(const u8*inBuf, u32 inSize);
+
+/*! opens an isoMedia File.
 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.
-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.*/
-GF_ISOFile *gf_isom_open(const char *fileName, u32 OpenMode, const char *tmp_dir);
+\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.
+\return the created ISO file if no error
+*/
+GF_ISOFile *gf_isom_open(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir);
 
-/*close the file, write it if new/edited - equivalent to gf_isom_write()+gf_isom_delete()*/
-GF_Err gf_isom_close(GF_ISOFile *the_file);
+/*! closes the file, write it if new/edited - equivalent to gf_isom_write()+gf_isom_delete()
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_close(GF_ISOFile *isom_file);
 
-/*write the file without deleting (gf_isom_delete())*/
-GF_Err gf_isom_write(GF_ISOFile *movie);
+/*! deletes the movie without saving it
+\param isom_file the target ISO file
+*/
+void gf_isom_delete(GF_ISOFile *isom_file);
 
-/*get access to the data bitstream  - see gf_isom_open()*/
-GF_Err gf_isom_get_bs(GF_ISOFile *movie, GF_BitStream **out_bs);
+/*! 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
+the last error is a FatalError, and is not always set if a bad
+param is specified...
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_last_error(GF_ISOFile *isom_file);
 
-/*delete the movie without saving it.*/
-void gf_isom_delete(GF_ISOFile *the_file);
+/*! gets the mode of an open file
+\param isom_file the target ISO file
+\return open mode of the file
+*/
+u8 gf_isom_get_mode(GF_ISOFile *isom_file);
 
-/*Get the mode of an open file*/
-u8 gf_isom_get_mode(GF_ISOFile *the_file);
+/*! checks if file is J2K image
+\param isom_file the target ISO file
+\return GF_TRUE if file is a j2k image, GF_FALSE otherwise
+*/
+Bool gf_isom_is_JPEG2000(GF_ISOFile *isom_file);
 
-Bool gf_isom_is_JPEG2000(GF_ISOFile *mov);
+/*! gets file size of an ISO file
+\param isom_file the target ISO file
+\return the file size in bytes
+*/
+u64 gf_isom_get_file_size(GF_ISOFile *isom_file);
 
-u64 gf_isom_get_file_size(GF_ISOFile *the_file);
+/*! checks if a given four character code matches a known video handler type (vide, auxv, pict, ...)
+\param mtype the four character code to check
+\return GF_TRUE if the type is a video media type*/
+Bool gf_isom_is_video_handler_type(u32 mtype);
 
-Bool gf_isom_moov_first(GF_ISOFile *movie);
+/*! gets number of implemented boxes in  (including the internal unknown box wrapper).
+\note There can be several times the same type returned due to variation of the box (versions or flags)
+\return number of implemented boxes
+*/
+u32 gf_isom_get_num_supported_boxes();
 
-/*sets write cache size for files when creating them. If size is 0, writing
-only relies on the underlying OS fwrite/fgetc
-If movie is NULL, assigns the default write cache size for any new movie*/
-GF_Err gf_isom_set_output_buffering(GF_ISOFile *movie, u32 size);
+/*! gets four character code of box given its index. Index 0 is GPAC internal unknown box handler
+\param idx 0-based index of the box
+\return four character code of the box
+*/
+u32 gf_isom_get_supported_box_type(u32 idx);
 
-/********************************************************************
-				STREAMING API FUNCTIONS
-********************************************************************/
-/*open a movie that can be uncomplete in READ_ONLY mode
-to use for http streaming & co
+#ifndef GPAC_DISABLE_ISOM_DUMP
 
-NOTE: you must buffer the data to a local file, this mode DOES NOT handle
-http/ftp/... streaming
+/*! prints default box syntax of box given its index. Index 0 is GPAC internal unknown box handler
+\param idx 0-based index of the box
+\param trace the file object to dump to
+\return error if any
+*/
+GF_Err gf_isom_dump_supported_box(u32 idx, FILE * trace);
 
-start_range and end_range restricts the media byte range in the URL (used by DASH)
-if 0 or end_range<=start_range, the entire URL is used when parsing
+#endif
 
-BytesMissing is the predicted number of bytes missing for the file to be loaded
-Note that if the file is not optimized for streaming, this number is not accurate
-If the movie is successfully loaded (the_file non-NULL), BytesMissing is zero
+/*! @} */
+
+/*!
+\addtogroup isoread_grp ISOBMFF Reading
+\ingroup iso_grp
+
+ISOBMF file reading
+@{
 */
-GF_Err gf_isom_open_progressive(const char *fileName, u64 start_range, u64 end_range, GF_ISOFile **the_file, u64 *BytesMissing);
 
-/*If requesting a sample fails with error GF_ISOM_INCOMPLETE_FILE, use this function
-to get the number of bytes missing to retrieve the sample*/
-u64 gf_isom_get_missing_bytes(GF_ISOFile *the_file, u32 trackNumber);
+/*! checks if moov box is before any mdat box
+\param isom_file the target ISO file
+\return GF_TRUE if if moov box is before any mdat box, GF_FALSE otherwise
+*/
+Bool gf_isom_moov_first(GF_ISOFile *isom_file);
 
+/*! 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
+\return error if any
+*/
+GF_Err gf_isom_set_byte_offset(GF_ISOFile *isom_file, s64 byte_offset);
 
-/*Fragmented movie extensions*/
 
-/*return 0 if movie isn't fragmented, 1 otherwise*/
-u32 gf_isom_is_fragmented(GF_ISOFile *the_file);
-/*return 0 if track isn't fragmented, 1 otherwise*/
-u32 gf_isom_is_track_fragmented(GF_ISOFile *the_file, u32 TrackID);
+/*! opens a movie that can be uncomplete in READ_ONLY mode
+to use for http streaming & co
 
-/*a file being downloaded may be a fragmented file. In this case only partial info
-is available once the file is successfully open (gf_isom_open_progressive), and since there is
-no information wrt number fragments (which could actually be generated on the fly
-at the sender side), you must call this function on regular bases in order to
-load newly downloaded fragments. Note this may result in Track/Movie duration changes
-and SampleCount change too ...
+start_range and end_range restricts the media byte range in the URL (used by DASH)
+if 0 or end_range<=start_range, the entire URL is used when parsing
 
-if new_location is set, the previous bitstream is changed to this new location, otherwise it is refreshed (disk flush)
+If the url indicates a gfio or gmem resource, the file can be played from the associated underlying buffer. For gmem, you must call \ref gf_isom_refresh_fragmented and gf_isom_set_removed_bytes whenever the underlying buffer is modified.
 
+\param fileName the name of the local file or cache to open, gmem:// or gfio://
+\param start_range only loads starting from indicated byte range
+\param end_range loading stops at indicated byte range
+\param enable_frag_templates loads fragment and segment boundaries in an internal table
+\param isom_file pointer set to the opened file if success
+\param BytesMissing is set to the predicted number of bytes missing for the file to be loaded
+Note that if the file is not optimized for streaming, this number is not accurate
+If the movie is successfully loaded (isom_file non-NULL), BytesMissing is zero
+\return error if any
 */
-GF_Err gf_isom_refresh_fragmented(GF_ISOFile *the_file, u64 *MissingBytes, const char *new_location);
+GF_Err gf_isom_open_progressive(const char *fileName, u64 start_range, u64 end_range, Bool enable_frag_templates, GF_ISOFile **isom_file, u64 *BytesMissing);
 
-/*check if file has movie info, eg has tracks & dynamic media. Some files may just use
-the base IsoMedia structure without "moov" container*/
-Bool gf_isom_has_movie(GF_ISOFile *file);
 
-/* check if the file has a top styp box and returns the brand and version of the first styp found */
-Bool gf_isom_has_segment(GF_ISOFile *file, u32 *brand, u32 *version);
-/*get number of movie fragments in the file*/
-u32 gf_isom_segment_get_fragment_count(GF_ISOFile *file);
-/*get number of track fragments in the indicated movie fragment (1-based index)*/
-u32 gf_isom_segment_get_track_fragment_count(GF_ISOFile *file, u32 moof_index);
-/*returns the track ID and get the tfdt of the given track fragment (1-based index) in the indicated movie fragment (1-based index)*/
-u32 gf_isom_segment_get_track_fragment_decode_time(GF_ISOFile *file, u32 moof_index, u32 traf_index, u64 *decode_time);
+/*! same as  \ref gf_isom_open_progressive but allows fetching the incomplete box type
 
-/* Indicates that we want to parse only one moof/mdat at a time
-   in order to proceed to next moof, call gf_isom_reset_data_offset
+\param fileName the name of the local file or cache to open
+\param start_range only loads starting from indicated byte range
+\param end_range loading stops at indicated byte range
+\param enable_frag_templates loads fragment and segment boundaries in an internal table
+\param isom_file pointer set to the opened file if success
+\param BytesMissing is set to the predicted number of bytes missing for the file to be loaded
+\param topBoxType is set to the 4CC of the incomplete top-level box found - may be NULL
+Note that if the file is not optimized for streaming, this number is not accurate
+If the movie is successfully loaded (isom_file non-NULL), BytesMissing is zero
+\return error if any
 */
-void gf_isom_set_single_moof_mode(GF_ISOFile *file, Bool mode);
-/********************************************************************
-				READING API FUNCTIONS
-********************************************************************/
+GF_Err gf_isom_open_progressive_ex(const char *fileName, u64 start_range, u64 end_range, Bool enable_frag_templates, GF_ISOFile **isom_file, u64 *BytesMissing, u32 *topBoxType);
 
-/*return the number of tracks in the movie, or -1 if error*/
-u32 gf_isom_get_track_count(GF_ISOFile *the_file);
-
-/*return the timescale of the movie, 0 if error*/
-u32 gf_isom_get_timescale(GF_ISOFile *the_file);
+/*! retrieves number of bytes missing.
+if requesting a sample fails with error GF_ISOM_INCOMPLETE_FILE, use this function
+to get the number of bytes missing to retrieve the sample
+\param isom_file the target ISO file
+\param trackNumber the desired track to query
+\return the number of bytes missing to fetch the sample
+*/
+u64 gf_isom_get_missing_bytes(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! checks if a file has movie info (moov box with tracks & dynamic media). Some files may just use
+the base IsoMedia structure without "moov" container
+\param isom_file the target ISO file
+\return GF_TRUE if the file has a movie, GF_FALSE otherwise
+*/
+Bool gf_isom_has_movie(GF_ISOFile *isom_file);
+
+/*! gets number of tracks
+\param isom_file the target ISO file
+\return the number of tracks in the movie, or -1 if error*/
+u32 gf_isom_get_track_count(GF_ISOFile *isom_file);
+
+/*! gets the movie timescale
+\param isom_file the target ISO file
+\return the timescale of the movie, 0 if error*/
+u32 gf_isom_get_timescale(GF_ISOFile *isom_file);
+
+/*! gets the movie duration computed based on media samples and edit lists
+\param isom_file the target ISO file
+\return the computed duration of the movie, 0 if error*/
+u64 gf_isom_get_duration(GF_ISOFile *isom_file);
+
+/*! gets the original movie duration as written in the file, regardless of the media data
+\param isom_file the target ISO file
+\return the duration of the movie*/
+u64 gf_isom_get_original_duration(GF_ISOFile *isom_file);
+
+/*! gets the creation info of the movie
+\param isom_file the target ISO file
+\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_creation_time(GF_ISOFile *isom_file, u64 *creationTime, u64 *modificationTime);
+
+/*! gets the ID of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the trackID of the track, or 0 if error*/
+GF_ISOTrackID gf_isom_get_track_id(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets a track number by its ID
+\param isom_file the target ISO file
+\param trackID the target track ID
+\return the track number of the track, or 0 if error*/
+u32 gf_isom_get_track_by_id(GF_ISOFile *isom_file, GF_ISOTrackID trackID);
+
+/*! gets the track original ID (before cloning from another file)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the original trackID of the track, or 0 if error*/
+GF_ISOTrackID gf_isom_get_track_original_id(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the enable flag of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return 0: not enabled, 1: enabled, 2: error
+*/
+u8 gf_isom_is_track_enabled(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets track flags
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the track flags
+*/
+u32 gf_isom_get_track_flags(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the track duration
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the track duration in movie timescale, or 0 if error*/
+u64 gf_isom_get_track_duration(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the media type (audio, video, etc) of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the media type four character code of the media*/
+u32 gf_isom_get_media_type(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets media subtype of a sample description entry
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return the media type four character code of the given sample description*/
+u32 gf_isom_get_media_subtype(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets the composition time (media time) given the absolute time in the Movie
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param movieTime desired time in movie timescale
+\param mediaTime is set to 0 if the media is not playing at that time (empty time segment)
+\return error if any*/
+GF_Err gf_isom_get_media_time(GF_ISOFile *isom_file, u32 trackNumber, u32 movieTime, u64 *mediaTime);
+
+/*! gets the number of sample descriptions in the media - a media can have several stream descriptions (eg different codec configurations, different protetcions, different visual sizes).
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the number of sample descriptions
+*/
+u32 gf_isom_get_sample_description_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the stream description index for a given time in media time
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param for_time the desired time in media timescale
+\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)
+\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*/
+Bool gf_isom_is_self_contained(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets the media duration (without edit) based on sample table
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the media duration, 0 if no samples
+*/
+u64 gf_isom_get_media_duration(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the original media duration (without edit) as indicated in the file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the media duration
+*/
+u64 gf_isom_get_media_original_duration(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the media timescale
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the timeScale of the media
+*/
+u32 gf_isom_get_media_timescale(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets media chunking information for non-fragmented files
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param dur_min set to minimum chunk duration in media timescale (optional, can be NULL)
+\param dur_avg set to average chunk duration in media timescale (optional, can be NULL)
+\param dur_max set to maximum chunk duration in media timescale (optional, can be NULL)
+\param size_min set to smallest chunk size in bytes (optional, can be NULL)
+\param size_avg set to average chunk size in bytes (optional, can be NULL)
+\param size_max set to largest chunk size in bytes (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_get_chunks_infos(GF_ISOFile *isom_file, u32 trackNumber, u32 *dur_min, u32 *dur_avg, u32 *dur_max, u32 *size_min, u32 *size_avg, u32 *size_max);
+
+/*! gets the handler name. The outName must be:
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param outName set to the handler name (must be non NULL)
+\return error if any
+*/
+GF_Err gf_isom_get_handler_name(GF_ISOFile *isom_file, u32 trackNumber, const char **outName);
+
+/*! checks if the data reference for the given track and sample description is valid and supported
+(a data Reference allows to construct a file without integrating the media data, however this library only handles local storage external data references)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return error if any
+*/
+GF_Err gf_isom_check_data_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets the location of the data. If both outURL and outURN are set to NULL, the data is in this file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param outURL set to URL value of the data reference
+\param outURN set to URN value of the data reference
+\return error if any
+*/
+GF_Err gf_isom_get_data_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const char **outURL, const char **outURN);
+
+/*! gets the number of samples in a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the number of samples, or 0 if error*/
+u32 gf_isom_get_sample_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the constant sample size for samples of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return constant size of samples or 0 if size not constant
+*/
+u32 gf_isom_get_constant_sample_size(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the constant sample duration for samples of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return constant duration of samples, or 0 if duration not constant*/
+u32 gf_isom_get_constant_sample_duration(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! sets max audio sample packing in a single ISOSample.
+This is mostly used when processing raw audio tracks, for which extracting samples per samples would be too time consuming
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param pack_num_samples the target number of samples to pack in one ISOSample
+\return GF_TRUE if packing was successfull, GF_FALSE otherwise (non constant size and non constant duration)
+*/
+Bool gf_isom_enable_raw_pack(GF_ISOFile *isom_file, u32 trackNumber, u32 pack_num_samples);
+
+/*! gets the total media data size of a track (whether in the file or not)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return total amount of media bytes in track
+*/
+u64 gf_isom_get_media_data_size(GF_ISOFile *isom_file, u32 trackNumber);
 
-/*return the computed duration of the movie given the media in the sample tables, 0 if error*/
-u64 gf_isom_get_duration(GF_ISOFile *the_file);
+/*! 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
+\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
+\return error if any
+*/
+GF_Err gf_isom_set_sample_padding(GF_ISOFile *isom_file, u32 trackNumber, u32 padding_bytes);
+
+/*! fetches a sample from a track. The sample must be destroyed using \ref gf_isom_sample_del
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\param sampleDescriptionIndex set to the sample description index corresponding to this sample
+\return the ISO sample 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(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex);
+
+/*! fetches a sample from a track without allocating a new sample.
+This function is the same as \ref gf_isom_get_sample except that it fills in the static_sample passed as argument, potentially reallocating buffers
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\param sampleDescriptionIndex set to the sample description index corresponding to this sample
+\param static_sample a caller-allocated ISO sample to use as the returned sample
+\param data_offset set to data offset in file / current bitstream - may be NULL
+\return the ISO sample 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 are NOT destroyed
+*/
+GF_ISOSample *gf_isom_get_sample_ex(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, GF_ISOSample *static_sample, u64 *data_offset);
+
+/*! gets sample information. This is the same as \ref gf_isom_get_sample but doesn't fetch media data
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\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)
+\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);
+
+/*! gets sample information with a user-allocated sample. This is the same as \ref gf_isom_get_sample_info but uses a static allocated sample as input
+\param isom_file the target ISO file
+\param trackNumber the target track
+\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)
+\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
+*/
+GF_ISOSample *gf_isom_get_sample_info_ex(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, u64 *data_offset, GF_ISOSample *static_sample);
+
+/*! get sample decoding time
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\return decoding time in media timescale
+*/
+u64 gf_isom_get_sample_dts(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
+
+/*! gets sample duration
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\return sample duration in media timescale*/
+u32 gf_isom_get_sample_duration(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
+
+/*! gets sample size
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\return sample size in bytes*/
+u32 gf_isom_get_sample_size(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
+
+/*! gets maximum sample size in track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return max size of any sample in track*/
+u32 gf_isom_get_max_sample_size(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets average sample size in a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return average size of sample in track
+*/
+u32 gf_isom_get_avg_sample_size(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets maximum sample duration in track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return max sample delta in media timescale
+*/
+u32 gf_isom_get_max_sample_delta(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets max sample CTS offset (CTS-DTS) in track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return max sample cts offset in media timescale*/
+u32 gf_isom_get_max_sample_cts_offset(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets sample sync flag. This does not check other sample groups ('rap ' or 'sap ')
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\return GF_TRUE if sample is sync, GF_FALSE otherwise*/
+Bool gf_isom_get_sample_sync(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
+
+/*! gets 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
+\param sampleNumber the desired sample number (1-based index)
+\param is_leading set to 1 if sample is a leading picture
+\param dependsOn set to the depends_on flag
+\param dependedOn set to the depended_on flag
+\param redundant set to the redundant flag
+\return error if any
+*/
+GF_Err gf_isom_get_sample_flags(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 *is_leading, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
 
-/*return the duration of the movie as written in the file, regardless of the media data*/
-u64 gf_isom_get_original_duration(GF_ISOFile *movie);
+/*! gets a sample given a desired decoding time and set the sampleDescriptionIndex of this sample
 
-/*return the creation info of the movie*/
-GF_Err gf_isom_get_creation_time(GF_ISOFile *the_file, u64 *creationTime, u64 *modificationTime);
+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
 
-/*return the trackID of track number n, or 0 if error*/
-u32 gf_isom_get_track_id(GF_ISOFile *the_file, u32 trackNumber);
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param desiredTime the desired time in media timescale
+\param sampleDescriptionIndex set to the sample description index corresponding to this sample (optional, can be NULL)
+\param SearchMode the search direction mode
+\param sample set to the fetched sample if any. If NULL, sample is not fetched (optional, can be NULL)
+\param sample_number set to the fetched sample number if any, set to 0 otherwise (optional, can be NULL)
+\param data_offset set to the sample start offset in file (optional, can be NULL)
+
+\return GF_EOS if the desired time exceeds the media duration or error if any
+*/
+GF_Err gf_isom_get_sample_for_media_time(GF_ISOFile *isom_file, u32 trackNumber, u64 desiredTime, u32 *sampleDescriptionIndex, GF_ISOSearchMode SearchMode, GF_ISOSample **sample, u32 *sample_number, u64 *data_offset);
+
+/*! gets sample number for a given decode time
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param dts the desired decode time in media timescale
+\return the sample number or 0 if not found
+*/
+u32 gf_isom_get_sample_from_dts(GF_ISOFile *isom_file, u32 trackNumber, u64 dts);
+
+/*! 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
+\param referenceType the four character code of the reference to query
+\return -1 if error or the number of references*/
+s32 gf_isom_get_reference_count(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType);
+
+/*! get the referenced track number for a track and a given ReferenceType and Index
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param referenceType the four character code of the reference to query
+\param referenceIndex the 1-based index of the reference to query (see \ref gf_isom_get_reference_count)
+\param refTrack set to the track number of the referenced track
+\return error if any
+*/
+GF_Err gf_isom_get_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrack);
+
+/*! get the referenced track ID for a track and a given ReferenceType and Index
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param referenceType the four character code of the reference to query
+\param referenceIndex the 1-based index of the reference to query (see \ref gf_isom_get_reference_count)
+\param refTrackID set to the track ID of the referenced track
+\return error if any
+*/
+GF_Err gf_isom_get_reference_ID(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, GF_ISOTrackID *refTrackID);
+
+/*! checks if a track has a reference of given type to another track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param referenceType the four character code of the reference to query
+\param refTrackID set to the track number of the referenced track
+\return the reference index if the given track has a reference of type referenceType to refTreckID, 0 otherwise*/
+u32 gf_isom_has_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, GF_ISOTrackID refTrackID);
 
-/*return the track number of the track of specified ID, or 0 if error*/
-u32 gf_isom_get_track_by_id(GF_ISOFile *the_file, u32 trackID);
+/*! fetches a sample for a given movie time, handling possible track edit lists.
 
-/*return the original trackID of the track number n, or 0 if error*/
-u32 gf_isom_get_track_original_id(GF_ISOFile *movie, u32 trackNumber);
+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
 
-/*gets the enable flag of a track 0: NO, 1: yes, 2: error*/
-u8 gf_isom_is_track_enabled(GF_ISOFile *the_file, u32 trackNumber);
+WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
 
-/* determines if the track is encrypted 0: NO, 1: yes, 2: error*/
-Bool gf_isom_is_track_encrypted(GF_ISOFile *the_file, u32 trackNumber);
+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)
 
-/*get the track duration return 0 if bad param*/
-u64 gf_isom_get_track_duration(GF_ISOFile *the_file, u32 trackNumber);
 
-/*return the media type FOUR CHAR code type of the media*/
-u32 gf_isom_get_media_type(GF_ISOFile *the_file, u32 trackNumber);
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param movieTime the desired movie time in media timescale
+\param sampleDescriptionIndex set to the sample description index corresponding to this sample (optional, can be NULL)
+\param SearchMode the search direction mode
+\param sample set to the fetched sample if any. If NULL, sample is not fetched (optional, can be NULL)
+\param sample_number set to the fetched sample number if any, set to 0 otherwise (optional, can be NULL)
+\param data_offset set to the sample start offset in file (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *isom_file, u32 trackNumber, u64 movieTime, u32 *sampleDescriptionIndex, GF_ISOSearchMode SearchMode, GF_ISOSample **sample, u32 *sample_number, u64 *data_offset);
+
+/*! gets edit list type
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param mediaOffset set to the media offset of the edit for time-shifting edits
+\return GF_TRUE if complex edit list, GF_FALSE if no edit list or time-shifting only edit list, in which case mediaOffset is set to the CTS of the first sample to present at presentation time 0
+A negative value implies that the samples with CTS between 0 and mediaOffset should not be presented (skip)
+A positive value value implies that there is nothing to present between 0 and CTS (hold)
+*/
+Bool gf_isom_get_edit_list_type(GF_ISOFile *isom_file, u32 trackNumber, s64 *mediaOffset);
+
+/*! gets the number of edits in an edit list
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return number of edits
+*/
+u32 gf_isom_get_edits_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the desired edit information
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param EditIndex index of the edit to query (1-based index)
+\param EditTime set to the edit time in movie timescale
+\param SegmentDuration set to the edit duration in movie timescale
+\param MediaTime set to the edit media start time in media timescale
+\param EditMode set to the mode of the edit
+\return error if any
+*/
+GF_Err gf_isom_get_edit(GF_ISOFile *isom_file, u32 trackNumber, u32 EditIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, GF_ISOEditType *EditMode);
+
+/*! gets the number of languages for the copyright
+\param isom_file the target ISO file
+\return number of languages, 0 if no copyright*/
+u32 gf_isom_get_copyright_count(GF_ISOFile *isom_file);
+
+/*! gets a copyright and its language code
+\param isom_file the target ISO file
+\param Index the 1-based index of the copyright notice to query
+\param threeCharCodes set to the copyright language code
+\param notice set to the copyright notice
+\return error if any
+*/
+GF_Err gf_isom_get_copyright(GF_ISOFile *isom_file, u32 Index, const char **threeCharCodes, const char **notice);
+
+/*! gets the number of chapter for movie or track (chapters can be assigned to tracks or to movies)
+\param isom_file the target ISO file
+\param trackNumber the target track to queryy. If 0, looks for chapter at the movie level
+\return number of chapters
+*/
+u32 gf_isom_get_chapter_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the given chapter time and name for a movie or track
+\param isom_file the target ISO file
+\param trackNumber the target track to queryy. If 0, looks for chapter at the movie level
+\param Index the index of the ckhapter to queryy
+\param chapter_time set to chapter start time in milliseconds (optional, may be NULL)
+\param name set to chapter name (optional, may be NULL)
+\return error if any
+*/
+GF_Err gf_isom_get_chapter(GF_ISOFile *isom_file, u32 trackNumber, u32 Index, u64 *chapter_time, const char **name);
+
+/*! checks if a media has sync points
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return 0 if the media has no sync point info (eg, all samples are RAPs), 1 if the media has sync points (eg some samples are RAPs),  2 if the media has empty sync point info (no samples are RAPs - this will likely only happen
+			in scalable context)
+*/
+u8 gf_isom_has_sync_points(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the number of sync points in a media
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return number of sync points*/
+u32 gf_isom_get_sync_point_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! checks if a media track hhas composition time offset
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return 1 if the track uses unsigned compositionTime offsets (B-frames or similar), 2 if the track uses signed compositionTime offsets (B-frames or similar), 0 if the track does not use compositionTime offsets (CTS == DTS)
+*/
+u32 gf_isom_has_time_offset(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets cts to dts shift value if defined.
+This shift is defined only in cases of negative CTS offset (ctts version 1) and not always present in files!
+Adding shift to CTS guarantees that the shifted CTS is always greater than the DTS for any sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the shift from composition time to decode time for that track if indicated, or 0 if not found
+*/
+s64 gf_isom_get_cts_to_dts_shift(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! checks if a track has sync shadow samples (RAP samples replacing non RAP ones)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return GF_TRUE if the track has sync shadow samples*/
+Bool gf_isom_has_sync_shadows(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! checks if a track has sample dependencoes indicated
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return GF_TRUE if the track has sample dep indications*/
+Bool gf_isom_has_sample_dependency(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets a rough estimation of file size. This only works for completely self-contained files and without fragmentation
+for the current time
+\param isom_file the target ISO file
+\return estimated file size in bytes*/
+u64 gf_isom_estimate_size(GF_ISOFile *isom_file);
+
+/*! gets next alternate group ID available
+\param isom_file the target ISO file
+\return next available ID for alternate groups
+*/
+u32 gf_isom_get_next_alternate_group_id(GF_ISOFile *isom_file);
+
+
+/*! gets file name of an opened ISO file
+\param isom_file the target ISO file
+\return the file name*/
+const char *gf_isom_get_filename(GF_ISOFile *isom_file);
+
+
+/*! gets file brand information
+The brand is used to
+- differenciate MP4, MJPEG2000 and QT while indicating compatibilities
+- identify tools that shall be supported for correct parsing of the file
+
+The function will set brand, minorVersion and AlternateBrandsCount to 0 if no brand indication is found in the file
+
+\param isom_file the target ISO file
+\param brand set to the four character code of the brand
+\param minorVersion set to an informative integer for the minor version of the major brand (optional, can be NULL)
+\param AlternateBrandsCount set to the number of compatible brands (optional, can be NULL).
+\return error if any*/
+GF_Err gf_isom_get_brand_info(GF_ISOFile *isom_file, u32 *brand, u32 *minorVersion, u32 *AlternateBrandsCount);
+
+/*! gets an alternate brand indication
+\note the Major brand should always be indicated in the alternate brands
+\param isom_file the target ISO file
+\param BrandIndex 1-based index of alternate brand to query (cf \ref gf_isom_get_brand_info)
+\param brand set to the four character code of the brand
+\return error if any*/
+GF_Err gf_isom_get_alternate_brand(GF_ISOFile *isom_file, u32 BrandIndex, u32 *brand);
+
+/*! gets the internal list of brands
+\param isom_file the target ISO file
+\return the internal list of brands. DO NOT MODIFY the content
+*/
+const u32 *gf_isom_get_brands(GF_ISOFile *isom_file);
+
+/*! gets the number of padding bits at the end of a given sample if any
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the desired sample number (1-based index)
+\param NbBits set to the number of padded bits at the end of the sample
+\return error if any*/
+GF_Err gf_isom_get_sample_padding_bits(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u8 *NbBits);
+
+/*! checks if a track samples use padding bits or not
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return GF_TRUE if samples have padding bits information, GF_FALSE otherwise*/
+Bool gf_isom_has_padding_bits(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets information of a visual track for a given sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param Width set to the width of the sample description in pixels
+\param Height set to the height of the sample description in pixels
+\return error if any*/
+GF_Err gf_isom_get_visual_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *Width, u32 *Height);
+
+/*! gets bit depth of a sample description of a visual track (for uncompressed media usually)
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param bitDepth the bit depth of each pixel (eg 24 for RGB, 32 for RGBA)
+\return error if any
+*/
+GF_Err gf_isom_get_visual_bit_depth(GF_ISOFile* isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u16 *bitDepth);
+
+/*! gets information of an audio track for a given sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param SampleRate set to the audio sample rate of the sample description
+\param Channels set to the audio channel count of the sample description
+\param bitsPerSample set to the audio bits per sample for raw audio of the sample description
+\return error if any*/
+GF_Err gf_isom_get_audio_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *SampleRate, u32 *Channels, u32 *bitsPerSample);
 
-/*return the media type FOUR CHAR code type of the media*/
-u32 gf_isom_get_media_subtype(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+/*! Audio channel layout description, ISOBMFF style*/
+typedef struct
+{
+	/*! stream structure flags, 1: has channel layout, 2: has objects*/
+	u8 stream_structure;
 
-/*return the media type FOUR CHAR code type of an MPEG4 media (eg, mp4a, mp4v, enca, encv, resv, etc...)
-returns 0 if not MPEG-4 subtype*/
-u32 gf_isom_get_mpeg4_subtype(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+	/*! defined CICP channel layout*/
+	u8 definedLayout;
 
-/*Get the media (composition) time given the absolute time in the Movie
-mediaTime is set to 0 if the media is not playing at that time (empty time segment)*/
-GF_Err gf_isom_get_media_time(GF_ISOFile *the_file, u32 trackNumber, u32 movieTime, u64 *MediaTime);
+	/*! number of channels*/
+	u32 channels_count;
+	struct {
+		/*! speaker position*/
+		u8 position;
+		/*! speaker elevation if position==126*/
+		s8 elevation;
+		/*! speaker azimuth if position==126*/
+		s16 azimuth;
+	} layouts[64];
+	/*! bit-map of omitted channels using bit positions defined in CICP - only valid if definedLayout is not 0*/
+	u64 omittedChannelsMap;
+	/*! number of objects in the stream*/
+	u8 object_count;
+} GF_AudioChannelLayout;
+
+/*! get channel layout info for an audio track, ISOBMFF style
+ \param isom_file the target ISO file
+ \param trackNumber the target track
+ \param sampleDescriptionIndex the target sample description index (1-based)
+ \param layout set to the channel/object layout info for this track
+ \return GF_NOT_FOUND if not set in file, or other error if any*/
+GF_Err gf_isom_get_audio_layout(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_AudioChannelLayout *layout);
+
+
+/*! gets visual track layout information
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param width set to the width of the track in pixels
+\param height set to the height of the track in pixels
+\param translation_x set to the horizontal translation of the track in pixels
+\param translation_y set to the vertical translation of the track in pixels
+\param layer set to the z-order of the track
+\return error if any*/
+GF_Err gf_isom_get_track_layout_info(GF_ISOFile *isom_file, u32 trackNumber, u32 *width, u32 *height, s32 *translation_x, s32 *translation_y, s16 *layer);
+
+/*! gets matrix of a visual track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param matrix set to the track matrix - all coord values are expressed as 16.16 fixed point floats
+\return error if any*/
+GF_Err gf_isom_get_track_matrix(GF_ISOFile *isom_file, u32 trackNumber, u32 matrix[9]);
+
+/*! gets sample (pixel) aspect ratio information of a visual track for a given sample description
+The aspect ratio is hSpacing divided by vSpacing
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param hSpacing horizontal spacing
+\param vSpacing vertical spacing
+\return error if any*/
+GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *hSpacing, u32 *vSpacing);
+
+/*! gets color information of a visual track for a given sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param colour_type set to the four character code of the colour type mode used (nclx, nclc, prof or ricc currently defined)
+\param colour_primaries set to the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param transfer_characteristics set to the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param matrix_coefficients set to the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param full_range_flag set to the colour primaries for nclc as defined in ISO/IEC 23001-8
+\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 the media language code of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param lang set to a newly allocated string containg 3 chars (if old files) or longer form (BCP-47) - shall be freed by caller
+\return error if any*/
+GF_Err gf_isom_get_media_language(GF_ISOFile *isom_file, u32 trackNumber, char **lang);
+
+/*! gets the number of kind (media role) for a given track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return number of kind defined
+*/
+u32 gf_isom_get_track_kind_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets a given kind (media role) information for a given track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param index the 1-based index of the kind to retrieve
+\param scheme set to the scheme of the kind information - shall be freed by caller
+\param value set to the value of the kind information - shall be freed by caller
+\return error if any*/
+GF_Err gf_isom_get_track_kind(GF_ISOFile *isom_file, u32 trackNumber, u32 index, char **scheme, char **value);
+
+/*! gets the magic number associated with a track. The magic number is usually set by a file muxer, and is not serialized to file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the magic number (0 by default)
+*/
+u64 gf_isom_get_track_magic(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! 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
+*/
+Bool gf_isom_is_single_av(GF_ISOFile *isom_file);
+
+/*! guesses which specification this file refers to.
+\param isom_file the target ISO file
+\return possible values are:
+	GF_ISOM_BRAND_ISOM: unrecognized std
+	GF_ISOM_BRAND_3GP5: 3GP file (max 1 audio, 1 video) without text track
+	GF_ISOM_BRAND_3GP6: 3GP file (max 1 audio, 1 video) with text track
+	GF_ISOM_BRAND_3GG6: 3GP file multitrack file
+	GF_ISOM_BRAND_3G2A: 3GP2 file
+	GF_ISOM_BRAND_AVC1: AVC file
+	FCC("ISMA"): ISMA file (may overlap with 3GP)
+	GF_ISOM_BRAND_MP42: any generic MP4 file (eg with BIFS/OD/MPEG-4 systems stuff)
 
-/*Get the number of "streams" stored in the media - a media can have several stream descriptions...*/
-u32 gf_isom_get_sample_description_count(GF_ISOFile *the_file, u32 trackNumber);
+  for files without movie, returns the file meta handler type
+*/
+u32 gf_isom_guess_specification(GF_ISOFile *isom_file);
 
-/*Get the stream description index (eg, the ESD) for a given time IN MEDIA TIMESCALE
-return 0 if error or if empty*/
-u32 gf_isom_get_sample_description_index(GF_ISOFile *the_file, u32 trackNumber, u64 for_time);
 
-/*returns 1 if samples refering to the given stream description are present in the file
-0 otherwise*/
-Bool gf_isom_is_self_contained(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+/*! gets the nalu_length_field size used for this sample description if NALU-based (AVC/HEVC/...)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return number of bytes used to code the NALU size, or 0 if not NALU-based*/
+u32 gf_isom_get_nalu_length_field(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets max/average rate information as indicated in ESDS or BTRT boxes. If not found all values are set to 0
+if sampleDescriptionIndex is 0, gather for all sample descriptions
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param average_bitrate set to the average bitrate in bits per second of the media
+\param max_bitrate set to the maximum bitrate in bits per second of the media
+\param decode_buffer_size set to the decoder buffer size in bytes of the media
+\return error if any*/
+GF_Err gf_isom_get_bitrate(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *average_bitrate, u32 *max_bitrate, u32 *decode_buffer_size);
+
+
+/*! gets the track template of a track. This serializes track box without serializing sample tables nor sample description info
+\param isom_file the destination ISO file
+\param trackNumber the destination track
+\param output will be set to a newly allocated buffer containing the serialized box - caller shall free it
+\param output_size will be set to the size of the allocated buffer
+\return error if any
+*/
+GF_Err gf_isom_get_track_template(GF_ISOFile *isom_file, u32 trackNumber, u8 **output, u32 *output_size);
+
+/*! gets the trex template of a track. This serializes trex box
+\param isom_file the destination ISO file
+\param trackNumber the destination track
+\param output will be set to a newly allocated buffer containing the serialized box - caller shall free it
+\param output_size will be set to the size of the allocated buffer
+\return error if any
+*/
+GF_Err gf_isom_get_trex_template(GF_ISOFile *isom_file, u32 trackNumber, u8 **output, u32 *output_size);
+
+/*! sets the number of removed bytes form the input bitstream when using gmem:// url
+ The number of bytes shall be the total number since the opening of the movie
+\param isom_file the target ISO file
+\param bytes_removed number of bytes removed
+\return error if any
+*/
+GF_Err gf_isom_set_removed_bytes(GF_ISOFile *isom_file, u64 bytes_removed);
+
+/*! gets the current file offset of the current incomplete top level box not parsed
+ This shall be checked to avoid discarding bytes at or after the current top box header
+\param isom_file the target ISO file
+\param current_top_box_offset set to the offset from file first byte
+\return error if any
+*/
+GF_Err gf_isom_get_current_top_box_offset(GF_ISOFile *isom_file, u64 *current_top_box_offset);
+
+/*! purges the given number of samples, starting from the first sample, from a track of a fragmented file.
+ This avoids having sample tables growing in size when reading a fragmented file in pure streaming mode (no seek).
+ You should always keep one sample in the track
+\param isom_file the target ISO file
+\param trackNumber the desired track to purge
+\param nb_samples the number of samples to remove
+\return error if any
+*/
+GF_Err gf_isom_purge_samples(GF_ISOFile *isom_file, u32 trackNumber, u32 nb_samples);
 
-/*get the media duration (without edit) based on sample table return 0 if no samples (URL streams)*/
-u64 gf_isom_get_media_duration(GF_ISOFile *the_file, u32 trackNumber);
 
-/*get the media duration (without edit) as indicated in the file (regardless of sample tables)*/
-u64 gf_isom_get_media_original_duration(GF_ISOFile *movie, u32 trackNumber);
+#ifndef GPAC_DISABLE_ISOM_DUMP
 
-/*Get the timeScale of the media. */
-u32 gf_isom_get_media_timescale(GF_ISOFile *the_file, u32 trackNumber);
+/*! dumps file structures into XML trace file
+\param isom_file the target ISO file
+\param trace the file object to dump to
+\param skip_init does not dump init segment structure
+\return error if any
+*/
+GF_Err gf_isom_dump(GF_ISOFile *isom_file, FILE *trace, Bool skip_init, Bool skip_samples);
 
-/*gets min, average and max maximum chunk durations (each of them s optional) of the track in media timescale*/
-GF_Err gf_isom_get_chunks_infos(GF_ISOFile *movie, u32 trackNumber, u32 *dur_min, u32 *dur_avg, u32 *dur_max, u32 *size_min, u32 *size_avg, u32 *size_max);
+#endif /*GPAC_DISABLE_ISOM_DUMP*/
 
-/*Get the HandlerDescription name. The outName must be:
-		 (outName != NULL && *outName == NULL)
-the handler name is the string version of the MediaTypes*/
-GF_Err gf_isom_get_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char **outName);
 
-/*Check a DataReference of this track (index >= 1)
-A Data Reference allows to construct a file without integrating the media data*/
-GF_Err gf_isom_check_data_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+/*! @} */
 
-/*get the location of the data. If URL && URN are NULL, the data is in this file
-both strings are const: don't free them.*/
-GF_Err gf_isom_get_data_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const char **outURL, const char **outURN);
 
-/*Get the number of samples - return 0 if error*/
-u32 gf_isom_get_sample_count(GF_ISOFile *the_file, u32 trackNumber);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-/*Get constant sample size, or 0 if size not constant*/
-u32 gf_isom_get_constant_sample_size(GF_ISOFile *the_file, u32 trackNumber);
+/*!
+\addtogroup isowrite_grp ISOBMFF Writing
+\ingroup iso_grp
 
-/*Get constant sample duration, or 0 if duration not constant*/
-u32 gf_isom_get_constant_sample_duration(GF_ISOFile *the_file, u32 trackNumber);
+ISOBMF file writing
+@{
+*/
 
-/*sets max audio sample packing in a single ISOSample*/
-Bool gf_isom_enable_raw_pack(GF_ISOFile *the_file, u32 trackNumber, u32 pack_num_samples);
+/*! Movie Storage modes*/
+typedef enum
+{
+	/*! FLAT: the MediaData is stored at the beginning of the file*/
+	GF_ISOM_STORE_FLAT = 1,
+	/*! STREAMABLE: the MetaData (File Info) is stored at the beginning of the file
+	for fast access during download*/
+	GF_ISOM_STORE_STREAMABLE,
+	/*! INTERLEAVED: Same as STREAMABLE, plus the media data is mixed by chunk  of fixed duration*/
+	GF_ISOM_STORE_INTERLEAVED,
+	/*! INTERLEAVED +DRIFT: Same as INTERLEAVED, and adds time drift control to avoid creating too long chunks*/
+	GF_ISOM_STORE_DRIFT_INTERLEAVED,
+	/*! tightly interleaves samples based on their DTS, therefore allowing better placement of samples in the file.
+	This is used for both http interleaving and Hinting optimizations*/
+	GF_ISOM_STORE_TIGHT,
+	/*! FASTSTART: same as FLAT but moves moov before mdat at the end*/
+	GF_ISOM_STORE_FASTSTART,
+} GF_ISOStorageMode;
+
+/*! writes the file without deleting (see \ref gf_isom_delete)
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_write(GF_ISOFile *isom_file);
+
+/*! freezes order of the current box tree in the file.
+By default the library always reorder boxes in the recommended order in the various specifications implemented.
+New created tracks or meta items will not have a frozen order of boxes, but the function can be called several time
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_freeze_order(GF_ISOFile *isom_file);
+
+/*! keeps UTC edit times when storing
+\param isom_file the target ISO file
+\param keep_utc if GF_TRUE, do not edit times
+*/
+void gf_isom_keep_utc_times(GF_ISOFile *isom_file, Bool keep_utc);
+
+/*! 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
+\return error if any
+*/
+GF_Err gf_isom_set_timescale(GF_ISOFile *isom_file, u32 timeScale);
+
+/*! loads a set of top-level boxes in moov udta and child boxes. UDTA will be replaced if already present
+\param isom_file the target ISO file
+\param moov_boxes a serialized array of boxes to add
+\param moov_boxes_size the size of the serialized array of boxes
+\param udta_only only replace/inject udta box and entries
+\return error if any
+*/
+GF_Err gf_isom_load_extra_boxes(GF_ISOFile *isom_file, u8 *moov_boxes, u32 moov_boxes_size, Bool udta_only);
+
+/*! creates a new track
+\param isom_file the target ISO file
+\param trackID the ID of the track - if 0, the track ID is chosen by the API
+\param MediaType the handler type (four character code) of the media
+\param TimeScale the time scale of the media
+\return the track number or 0 if error*/
+u32 gf_isom_new_track(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 MediaType, u32 TimeScale);
+
+/*! creates a new track from an encoded trak box.
+\param isom_file the target ISO file
+\param trackID the ID of the track - if 0, the track ID is chosen by the API
+\param MediaType the handler type (four character code) of the media
+\param TimeScale the time scale of the media
+\param tk_box a serialized trak box to use as template
+\param tk_box_size the size of the serialized trak box
+\param udta_only only replace/inject udta box and entries
+\return the track number or 0 if error*/
+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);
 
-/*returns total amount of media bytes in track*/
-u64 gf_isom_get_media_data_size(GF_ISOFile *the_file, u32 trackNumber);
+/*! removes a track - internal cross dependencies will be updated.
+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
+\return error if any
+*/
+GF_Err gf_isom_remove_track(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! sets the enable flag of a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param enableTrack if GF_TRUE, track is enabled, otherwise disabled
+\return error if any
+*/
+GF_Err gf_isom_set_track_enabled(GF_ISOFile *isom_file, u32 trackNumber, Bool enableTrack);
 
-/*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*/
-GF_Err gf_isom_set_sample_padding(GF_ISOFile *the_file, u32 trackNumber, u32 padding_bytes);
+/*! Track header flags operation type*/
+typedef enum
+{
+	/*! set flags, erasing previous value*/
+	GF_ISOM_TKFLAGS_SET = 0,
+	/*! add flags*/
+	GF_ISOM_TKFLAGS_REM,
+	/*! remove flags*/
+	GF_ISOM_TKFLAGS_ADD,
+} GF_ISOMTrackFlagOp;
+
+/*! toggles track flags on or off
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param flags flags to modify
+\param op flag operation mode
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param time the new time
+\return error if any
+*/
+GF_Err gf_isom_set_creation_time(GF_ISOFile *isom_file, u64 time);
+
+/*! sets creationTime and modificationTime of the track to the specified date
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param time the new time
+\return error if any
+*/
+GF_Err gf_isom_set_track_creation_time(GF_ISOFile *isom_file,u32 trackNumber, u64 time);
+
+/*! changes the ID of a track - all track references present in the file are updated
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param trackID the new track ID
+\return error if trackID is already in used in the file*/
+GF_Err gf_isom_set_track_id(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOTrackID trackID);
+
+/*! forces to rewrite all dependencies when track ID changes. Used to check if track references are broken during import of a single track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_rewrite_track_dependencies(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! adds a sample to a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index associated with the sample
+\param sample the target sample to add
+\return error if any
+*/
+GF_Err gf_isom_add_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const GF_ISOSample *sample);
+
+/*! copies all sample dependency, subSample and sample group information from the given sampleNumber in source file to the last added sample in dest file
+\param dst the destination ISO file
+\param dst_track the destination track
+\param src the source ISO file
+\param src_track the source track
+\param sampleNumber the source sample number
+\return error if any
+*/
+GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber);
 
-/*return a sample given its number, and set the StreamDescIndex of this sample
-this index allows to retrieve the stream description if needed (2 media in 1 track)
-return NULL if error*/
-GF_ISOSample *gf_isom_get_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *StreamDescriptionIndex);
+/*! adds a sync shadow sample to a track.
+- There must be a regular sample with the same DTS.
+- Sync Shadow samples MUST be RAP and can only use the same sample description as the sample they shadow
+- Currently, adding sync shadow must be done in order (no sample insertion)
 
-/*same as gf_isom_get_sample but doesn't fetch media data
-@StreamDescriptionIndex (optional): set to stream description index
-@data_offset (optional): set to sample start offset in file.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sample the target shadow sample to add
+\return error if any
+*/
+GF_Err gf_isom_add_sample_shadow(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOSample *sample);
+
+/*! adds data to current sample in the track. This will update the data size.
+CANNOT be used with OD media type
+There shall not be any other
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param data the data to append to the sample
+\param data_size the size of the data to append
+\return error if any
+*/
+GF_Err gf_isom_append_sample_data(GF_ISOFile *isom_file, u32 trackNumber, u8 *data, u32 data_size);
+
+/*! adds sample references to a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index associated with the sample
+\param sample the target sample to add
+\param dataOffset is the offset in bytes of the data in the referenced file.
+\return error if any
+*/
+GF_Err gf_isom_add_sample_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_ISOSample *sample, u64 dataOffset);
 
-	  NOTE: when both StreamDescriptionIndex and data_offset are NULL, only DTS, CTS_Offset and RAP indications are
-retrieved (faster)
+/*! sets the duration of the last media sample. If not set, the duration of the last sample is the
+duration of the previous one if any, or media TimeScale (default value). This does not modify the edit list if any,
+you must modify this using \ref gf_isom_set_edit
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param duration duration of last sample in media timescale
+\return error if any
 */
-GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *StreamDescriptionIndex, u64 *data_offset);
+GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *isom_file, u32 trackNumber, u32 duration);
 
-/*retrieves given sample DTS*/
-u64 gf_isom_get_sample_dts(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*! sets the duration of the last media sample. If not set, the duration of the last sample is the
+duration of the previous one if any, or media TimeScale (default value). This does not modify the edit list if any,
+you must modify this using \ref gf_isom_set_edit.
+If both dur_num and dur_den are both zero, forces last sample duration to be the same as previous sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param dur_num duration num value
+\param dur_den duration num value
+\return error if any
+*/
+GF_Err gf_isom_set_last_sample_duration_ex(GF_ISOFile *isom_file, u32 trackNumber, u32 dur_num, u32 dur_den);
 
-/*returns sample duration in media timeScale*/
-u32 gf_isom_get_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*! patches last stts entry to make sure the cumulated duration equals the given next_dts value
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param next_dts target decode time of next sample
+\return error if any
+*/
+GF_Err gf_isom_patch_last_sample_duration(GF_ISOFile *isom_file, u32 trackNumber, u64 next_dts);
 
-/*returns sample size in bytes*/
-u32 gf_isom_get_sample_size(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*! adds a track reference to another track
+\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
+\return error if any
+*/
+GF_Err gf_isom_set_track_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 referenceType, GF_ISOTrackID ReferencedTrackID);
 
-/*returns sync flag of sample*/
-u8 gf_isom_get_sample_sync(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*! removes all track references
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_track_references(GF_ISOFile *isom_file, u32 trackNumber);
 
-GF_Err gf_isom_get_sample_flags(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *is_leading, u32 *dependsOn, u32 *dependedOn, u32 *redundant);
+/*! sets track handler name.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param nameUTF8 the handler name; either NULL (reset), a UTF-8 formatted string or a UTF8 file resource in the form "file://path/to/file_utf8"
+\return error if any
+*/
+GF_Err gf_isom_set_handler_name(GF_ISOFile *isom_file, u32 trackNumber, const char *nameUTF8);
 
-/*gets a sample given a desired decoding time IN MEDIA TIME SCALE
-and set the StreamDescIndex of this sample
-this index allows to retrieve the stream description if needed (2 media in 1 track)
-return GF_EOS if the desired time exceeds the media duration
-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*/
-GF_Err gf_isom_get_sample_for_media_time(GF_ISOFile *the_file, u32 trackNumber, u64 desiredTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *SampleNum);
+/*! updates the sample size table - this is needed when using \ref gf_isom_append_sample_data in case the resulting samples
+are of same sizes (typically in 3GP speech tracks)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_refresh_size_info(GF_ISOFile *isom_file, u32 trackNumber);
 
-/*retrieves given sample DTS*/
-u32 gf_isom_get_sample_from_dts(GF_ISOFile *the_file, u32 trackNumber, u64 dts);
+/*! updates the duration of the movie
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_update_duration(GF_ISOFile *isom_file);
 
-/*get the current tfdt of the track - this can be used to adjust sample time queries when edit list are used*/
-u64 gf_isom_get_current_tfdt(GF_ISOFile *the_file, u32 trackNumber);
 
-//returns true if the file init segment (moov) was generated from external meta-data (smooth streaming)
-Bool gf_isom_is_smooth_streaming_moov(GF_ISOFile *the_file);
+/*! updates a given sample of the media. This function updates both media data of sample and sample properties (DTS, CTS, SAP type)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the number of the sample to update
+\param sample the new sample
+\param data_only if set to GF_TRUE, only the sample data is updated, not other info
+\return error if any
+*/
+GF_Err gf_isom_update_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);
 
-/*Track Edition functions*/
+/*! updates a sample reference in the media. Note that the sample MUST exists, and that sample->data MUST be NULL and sample->dataLength must be NON NULL.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the number of the sample to update
+\param sample the new sample
+\param data_offset new offset of sample in referenced file
+\return error if any
+*/
+GF_Err gf_isom_update_sample_reference(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset);
 
-/*return a sample given a desired time in the movie. MovieTime is IN MEDIA TIME SCALE , handles edit list.
-and set the StreamDescIndex of this sample
-this index allows to retrieve the stream description if needed (2 media in 1 track)
-sample must be set to NULL before calling.
+/*! removes a given sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the number of the sample to update
+\return error if any
+*/
+GF_Err gf_isom_remove_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
 
-result Sample is NULL if an error occured
-if no sample is playing, an empty sample is returned with no data and a DTS set to MovieTime when serching in sync modes
-if no sample is playing, the closest sample in the edit time-line is returned when serching in regular modes
+/*! changes media time scale
 
-WARNING: the sample may not be sync even though the sync was requested (depends on the media and the editList)
+\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.
+\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);
 
-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)
+/*! 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")"
+\note you cannot save an edited file under the same name (overwrite not allowed)
+If the movie is created (WRITE mode), the default filename is $OPEN_NAME
 
-sampleNumber is optional and gives the number of the sample in the media
+\param isom_file the target ISO file
+\param filename the new final filename
+\return error if any
 */
-GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *the_file, u32 trackNumber, u64 movieTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *sampleNumber);
-
-/*return 1 if true edit list, 0 if no edit list or if time-shifting only edit list,
-  in which case mediaOffset is set to the DTS offset value in the media track timescale
-  (e.g., your app should add mediaOffset to all sample DTS)*/
-Bool gf_isom_get_edit_list_type(GF_ISOFile *the_file, u32 trackNumber, s64 *mediaOffset);
+GF_Err gf_isom_set_final_name(GF_ISOFile *isom_file, char *filename);
 
-/*get the number of edited segment*/
-u32 gf_isom_get_edit_segment_count(GF_ISOFile *the_file, u32 trackNumber);
+/*! sets the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)
+\param isom_file the target ISO file
+\param storage_mode the target storage mode
+\return error if any
+*/
+GF_Err gf_isom_set_storage_mode(GF_ISOFile *isom_file, GF_ISOStorageMode storage_mode);
 
-/*get the desired segment information*/
-GF_Err gf_isom_get_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 SegmentIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, u8 *EditMode);
+/*! sets the interleaving time of media data (INTERLEAVED mode only)
+\param isom_file the target ISO file
+\param InterleaveTime the target interleaving time in movie timescale
+\return error if any
+*/
+GF_Err gf_isom_set_interleave_time(GF_ISOFile *isom_file, u32 InterleaveTime);
 
-/*get the number of languages for the copyright*/
-u32 gf_isom_get_copyright_count(GF_ISOFile *the_file);
-/*get the copyright and its language code given the index*/
-GF_Err gf_isom_get_copyright(GF_ISOFile *the_file, u32 Index, const char **threeCharCodes, const char **notice);
-/*get the opaque watermark info if any - returns GF_NOT_SUPPORTED if not present*/
-GF_Err gf_isom_get_watermark(GF_ISOFile *the_file, bin128 UUID, u8** data, u32* length);
+/*! forces usage of 64 bit chunk offsets
+\param isom_file the target ISO file
+\param set_on if GF_TRUE, 64 bit chunk offsets are always used; otherwise, they are used only for large files
+\return error if any
+*/
+GF_Err gf_isom_force_64bit_chunk_offset(GF_ISOFile *isom_file, Bool set_on);
 
-/*get the number of chapter for movie or track if trackNumber !=0*/
-u32 gf_isom_get_chapter_count(GF_ISOFile *the_file, u32 trackNumber);
-/*get the given movie or track (trackNumber!=0) chapter time and name - index is 1-based
-@chapter_time: retrieves start time in milliseconds - may be NULL.
-@name: retrieves chapter name - may be NULL - SHALL NOT be destroyed by user
+/*! compression mode of top-level boxes*/
+typedef enum
+{
+	/*! no compression is used*/
+	GF_ISO_COMP_NONE=0,
+	/*! only moov box is compressed*/
+	GF_ISO_COMP_MOOV,
+	/*! only moof boxes are compressed*/
+	GF_ISO_COMP_MOOF,
+	/*! only moof and sidx boxes are compressed*/
+	GF_ISO_COMP_MOOF_SIDX,
+	/*! only moof,  sidx and ssix boxes are compressed*/
+	GF_ISO_COMP_MOOF_SSIX,
+	/*! all (moov, moof,  sidx and ssix) boxes are compressed*/
+	GF_ISO_COMP_ALL,
+} GF_ISOCompressMode;
+
+/*! 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
+\return error if any
+*/
+GF_Err gf_isom_enable_compression(GF_ISOFile *isom_file, GF_ISOCompressMode compress_mode, Bool force_compress);
+
+/*! sets the copyright in one language
+\param isom_file the target ISO file
+\param threeCharCode the ISO three character language code for copyright
+\param notice the copyright notice to add
+\return error if any
+*/
+GF_Err gf_isom_set_copyright(GF_ISOFile *isom_file, const char *threeCharCode, char *notice);
+
+/*! adds a kind type to a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param schemeURI the scheme URI of the added kind
+\param value the value of the added kind
+\return error if any
+*/
+GF_Err gf_isom_add_track_kind(GF_ISOFile *isom_file, u32 trackNumber, const char *schemeURI, const char *value);
+
+/*! removes a kind type to the track, all if NULL params
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param schemeURI the scheme URI of the removed kind
+\param value the value of the removed kind
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param new_type the new handler four character type
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param new_type the new four character code type of the smaple description
+\return error if any
+*/
+GF_Err gf_isom_set_media_subtype(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 new_type);
+
+/*! sets a track in an alternate group
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param groupId the alternate group ID
+\return error if any
+*/
+GF_Err gf_isom_set_alternate_group_id(GF_ISOFile *isom_file, u32 trackNumber, u32 groupId);
+
+/*! adds chapter info:
+
+\param isom_file the target ISO file
+\param trackNumber the target track. If 0, the chapter info is added to the movie, otherwise to the track
+\param timestamp the chapter start time in milliseconds. Chapters are added in order to the file. If a chapter with same timestamp
+	is found, its name is updated but no entry is created.
+\param name the chapter name. If NULL, defaults to 'Chapter N'
+\return error if any
 */
-GF_Err gf_isom_get_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 Index, u64 *chapter_time, const char **name);
+GF_Err gf_isom_add_chapter(GF_ISOFile *isom_file, u32 trackNumber, u64 timestamp, char *name);
 
-/*
-return 0 if the media has no sync point info (eg, all samples are RAPs)
-return 1 if the media has sync points (eg some samples are RAPs)
-return 2 if the media has empty sync point info (eg no samples are RAPs). This will likely only happen
-			in scalable context
+/*! deletes copyright
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param index the 1-based index of the copyright notice to remove, or 0 to remove all copyrights
+\return error if any
+*/
+GF_Err gf_isom_remove_chapter(GF_ISOFile *isom_file, u32 trackNumber, u32 index);
+
+/*! 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 EditMode the edit mode
+\return error if any
+*/
+GF_Err gf_isom_set_edit(GF_ISOFile *isom_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode);
+
+/*! 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
+\param edit_index the 1-based index of the edit to update
+\param EditDuration duration of the edit in movie timescale
+\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
+*/
+GF_Err gf_isom_modify_edit(GF_ISOFile *isom_file, u32 trackNumber, u32 edit_index, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode);
+
+/*! same as \ref gf_isom_modify_edit except only appends new segment
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param EditDuration duration of the edit in movie timescale
+\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
+*/
+GF_Err gf_isom_append_edit(GF_ISOFile *isom_file, u32 trackNumber, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode);
+
+/*! removes all edits in the track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_edits(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! removes the given edit. If this is not the last segment, the next segment duration is updated to maintain a continous timeline
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param edit_index the 1-based index of the edit to update
+\return error if any
+*/
+GF_Err gf_isom_remove_edit(GF_ISOFile *isom_file, u32 trackNumber, u32 edit_index);
+
+/*! updates edit list after track edition. All edit entries with a duration or media starttime larger than the media duration are clamped to media duration
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_update_edit_list_duration(GF_ISOFile *isom_file, u32 trackNumber);
+
+
+/*! remove track, moov or file-level UUID box of matching type
+\param isom_file the target ISO file
+\param trackNumber the target track for the UUID box; if 0, removes from movie; if 0xFFFFFFFF, removes from file
+\param UUID the UUID of the box to remove
+\return error if any
+*/
+GF_Err gf_isom_remove_uuid(GF_ISOFile *isom_file, u32 trackNumber, bin128 UUID);
+
+/*! adds track, moov or file-level UUID box
+\param isom_file the target ISO file
+\param trackNumber the target track for the UUID box; if 0, removes from movie; if 0xFFFFFFFF, removes from file
+\param UUID the UUID of the box to remove
+\param data the data to add, may be NULL
+\param size the size of the data to add, shall be 0 when data is NULL
+\return error if any
 */
-u8 gf_isom_has_sync_points(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_add_uuid(GF_ISOFile *isom_file, u32 trackNumber, bin128 UUID, const u8 *data, u32 size);
 
-/*returns number of sync points*/
-u32 gf_isom_get_sync_point_count(GF_ISOFile *the_file, u32 trackNumber);
+/*! uses a compact track version for sample size. This is not usually recommended
+except for speech codecs where the track has a lot of small samples
+compaction is done automatically while writing based on the track's sample sizes
+\param isom_file the target ISO file
+\param trackNumber the target track for the udta box; if 0, add the udta to the movie;
+\param CompactionOn if set to GF_TRUE, compact size tables are used; otherwise regular size tables are used
+\return error if any
+*/
+GF_Err gf_isom_use_compact_size(GF_ISOFile *isom_file, u32 trackNumber, Bool CompactionOn);
+
+/*! 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
+\param MajorBrand four character code of the major brand to set
+\param MinorVersion version of the brand
+\return error if any
+*/
+GF_Err gf_isom_set_brand_info(GF_ISOFile *isom_file, u32 MajorBrand, u32 MinorVersion);
+
+/*! adds or removes an alternate brand for the movie.
+\note When removing an alternate brand equal to the major brand, the major brand is updated with the first alternate brand remaining, or 'isom' otherwise
+\param isom_file the target ISO file
+\param Brand four character code of the brand to add or remove
+\param AddIt if set to GF_TRUE, the brand is added, otherwise it is removed
+\return error if any
+*/
+GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *isom_file, u32 Brand, Bool AddIt);
+
+/*! removes all alternate brands except major brand
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_reset_alt_brands(GF_ISOFile *isom_file);
+
+/*! 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
+\param sampleNumber the target sample number
+\param isLeading indicates that the sample is a leading picture
+\param dependsOn indicates the sample dependency towards other samples
+\param dependedOn indicates the sample dependency from other samples
+\param redundant indicates that the sample contains redundant coding
+\return error if any
+*/
+GF_Err gf_isom_set_sample_flags(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
+
+/*! sets size information of a sample description of a visual track
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param Width the width in pixels
+\param Height the height in pixels
+\return error if any
+*/
+GF_Err gf_isom_set_visual_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 Width, u32 Height);
+
+/*! sets bit depth of a sample description of a visual track (for uncompressed media usually)
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param bitDepth the bit depth of each pixel (eg 24 for RGB, 32 for RGBA)
+\return error if any
+*/
+GF_Err gf_isom_set_visual_bit_depth(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u16 bitDepth);
+
+/*! sets a visual track layout info
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param width the track width in pixels
+\param height the track height in pixels
+\param translation_x the horizontal translation (from the left) of the track in the movie canvas, expressed as 16.16 fixed point float
+\param translation_y the vertical translation (from the top) of the track in the movie canvas, expressed as 16.16 fixed point float
+\param layer z order of the track on the canvas
+\return error if any
+*/
+GF_Err gf_isom_set_track_layout_info(GF_ISOFile *isom_file, u32 trackNumber, u32 width, u32 height, s32 translation_x, s32 translation_y, s16 layer);
+
+/*! sets track matrix
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param matrix the transformation matrix of the track on the movie canvas; all coeficients are expressed as 16.16 floating points
+\return error if any
+ */
+GF_Err gf_isom_set_track_matrix(GF_ISOFile *isom_file, u32 trackNumber, s32 matrix[9]);
+
+/*! sets the pixel aspect ratio for a sample description
+\note the aspect ratio is expressed as hSpacing divided by vSpacing; 2:1 means pixel is twice as wide as it is high
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param hSpacing horizontal spacing of the aspect ratio; a value of 0 removes PAR; negative value means 1
+\param vSpacing vertical spacing of the aspect ratio; a value of 0 removes PAR; negative value means 1
+\param force_par if set, forces PAR to 1:1 when hSpacing=vSpacing; otherwise removes PAR when hSpacing=vSpacing
+\return error if any
+*/
+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
+\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)
+\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);
+
+/*! updates track aperture information for QT/ProRes
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param remove if GF_TRUE, remove track aperture information, otherwise updates it
+\return error if any
+*/
+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
+\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);
+
+/*! force Dolby Vision profile: mainly used when the bitstream doesn't contain all the necessary information
+\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
+\return error if any
+*/
+GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* isom_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 dv_profile);
+
+
+/*! sets image sequence coding constraints (mostly used for HEIF image files)
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param remove if set to GF_TRUE, removes coding constraints
+\param all_ref_pics_intra indicates if all reference pictures are intra frames
+\param intra_pred_used indicates if intra prediction is used
+\param max_ref_per_pic indicates the max number of reference images per picture
+\return error if any
+ */
+GF_Err gf_isom_set_image_sequence_coding_constraints(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Bool remove, Bool all_ref_pics_intra, Bool intra_pred_used, u32 max_ref_per_pic);
 
-/*
-returns 1 if the track uses unsigned compositionTime offsets (B-frames or similar)
-returns 2 if the track uses signed compositionTime offsets (B-frames or similar)
-returns 0 if the track does not use compositionTime offsets (CTS == DTS)
+/*! sets image sequence alpha flag (mostly used for HEIF image files). The alpha flag indicates the image sequence is an alpha plane
+or has an alpha channel
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param remove if set to GF_TRUE, removes coding constraints
+\return error if any
+*/
+GF_Err gf_isom_set_image_sequence_alpha(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Bool remove);
+
+/*! sets colour 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 colour_type the four character code of the colour type to set (nclc, nclx, prof, ricc); if 0, removes all color info
+\param colour_primaries the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param transfer_characteristics the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param matrix_coefficients the colour primaries for nclc/nclx as defined in ISO/IEC 23001-8
+\param full_range_flag the colour primaries for nclc as defined in ISO/IEC 23001-8
+\param icc_data the icc data pto set for prof and ricc types
+\param icc_size the size of the icc data
+\return error if any
 */
-u32 gf_isom_has_time_offset(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_set_visual_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, u8 *icc_data, u32 icc_size);
 
-/*returns the shift from composition time to decode time for that track if indicated, or 0 if not found
-adding shift to CTS guarantees that the shifted CTS is always greater than the DTS for any sample*/
-s64 gf_isom_get_cts_to_dts_shift(GF_ISOFile *the_file, u32 trackNumber);
 
-/*returns 1 if the track has sync shadow samples*/
-Bool gf_isom_has_sync_shadows(GF_ISOFile *the_file, u32 trackNumber);
+/*! Audio Sample Description signaling mode*/
+typedef enum {
+	/*! use ISOBMF sample entry v0*/
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET = 0,
+	/*! use ISOBMF sample entry v0*/
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS,
+	/*! use ISOBMF sample entry v0 and forces channel count to 2*/
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2,
+	/*! use ISOBMF sample entry v1*/
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG,
+	/*! use QTFF sample entry v1*/
+	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF
+} GF_AudioSampleEntryImportMode;
 
-/*returns 1 if the track has sample dep indications*/
-Bool gf_isom_has_sample_dependency(GF_ISOFile *the_file, u32 trackNumber);
 
-/*rough estimation of file size, only works for completely self-contained files and without fragmentation
-for the current time*/
-u64 gf_isom_estimate_size(GF_ISOFile *the_file);
+/*! sets audio format  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 sampleRate the audio sample rate
+\param nbChannels the number of audio channels
+\param bitsPerSample the number of bits per sample, mostly used for raw audio
+\param asemode type of audio entry signaling desired
+\return error if any
+*/
+GF_Err gf_isom_set_audio_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample, GF_AudioSampleEntryImportMode asemode);
+
 
-u32 gf_isom_get_next_alternate_group_id(GF_ISOFile *movie);
+/*! sets audio channel and object layout  information for a sample description, ISOBMFF style
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param layout the layout information
+\return error if any
+*/
+GF_Err gf_isom_set_audio_layout(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_AudioChannelLayout *layout);
 
+/*! sets CTS unpack mode (used for B-frames & like): in unpack mode, each sample uses one entry in CTTS tables
 
-/*
-		MPEG-4 Systems extensions
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param unpack if GF_TRUE, sets unpack on, creating a ctts table if none found; if GF_FALSE, sets unpack off and repacks all table info
+\return error if any
 */
+GF_Err gf_isom_set_cts_packing(GF_ISOFile *isom_file, u32 trackNumber, Bool unpack);
 
-/*check if files has root OD/IOD or not*/
-Bool gf_isom_has_root_od(GF_ISOFile *the_file);
+/*! shifts all CTS with the given offset. This MUST be called in unpack mode only
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param offset_shift CTS offset shift in media timescale
+\return error if any
+*/
+GF_Err gf_isom_shift_cts_offset(GF_ISOFile *isom_file, u32 trackNumber, s32 offset_shift);
 
-/*return the root Object descriptor of the movie (can be NULL, OD or IOD, you have to check its tag)
-YOU HAVE TO DELETE THE DESCRIPTOR
+/*! enables negative composition offset in track
+\note this will compute the composition to decode time information
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param use_negative_offsets if GF_TRUE, negative offsets are used, otherwise they are disabled
+\return error if any
 */
-GF_Descriptor *gf_isom_get_root_od(GF_ISOFile *the_file);
+GF_Err gf_isom_set_composition_offset_mode(GF_ISOFile *isom_file, u32 trackNumber, Bool use_negative_offsets);
 
-/*check the presence of a track in IOD. 0: NO, 1: YES, 2: ERROR*/
-u8 gf_isom_is_track_in_root_od(GF_ISOFile *the_file, u32 trackNumber);
+/*! enables negative composition offset in track and shift offsets
 
-/*Get the GF_ESD given the StreamDescriptionIndex - YOU HAVE TO DELETE THE DESCRIPTOR*/
-GF_ESD *gf_isom_get_esd(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param ctts_shift shif CTS offsets by the given time in media timescale if positive offsets only are used
+\return error if any
+*/
+GF_Err gf_isom_set_ctts_v1(GF_ISOFile *isom_file, u32 trackNumber, u32 ctts_shift);
 
-/*Get the decoderConfigDescriptor given the StreamDescriptionIndex - YOU HAVE TO DELETE THE DESCRIPTOR*/
-GF_DecoderConfig *gf_isom_get_decoder_config(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
 
-/*sets default TrackID (or ES_ID) for clock references. If trackNumber is 0, default sync track ID is reseted
-and will be reassigned at next ESD fetch*/
-void gf_isom_set_default_sync_track(GF_ISOFile *file, u32 trackNumber);
+/*! sets language for a track
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param code 3-character code or BCP-47 code media language
+\return error if any
+*/
+GF_Err gf_isom_set_media_language(GF_ISOFile *isom_file, u32 trackNumber, char *code);
 
-/*Return the number of track references of a track for a given ReferenceType - return -1 if error*/
-s32 gf_isom_get_reference_count(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType);
+/*! gets the ID of the last created track
+\param isom_file the target ISO file
+\return the last created track ID
+*/
+GF_ISOTrackID gf_isom_get_last_created_track_id(GF_ISOFile *isom_file);
 
-/*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
+/*! applies a box patch to the file. See examples in gpac test suite, media/boxpatch/
+\param isom_file the target ISO file
+\param trackID the ID of the track to patch, in case one of the box patch applies to a track
+\param box_patch_filename the name of the file containing the box patches
+\param for_fragments indicates if the patch targets movie fragments or regular moov
+\return error if any
 */
-GF_Err gf_isom_get_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrack);
+GF_Err gf_isom_apply_box_patch(GF_ISOFile *isom_file, GF_ISOTrackID trackID, const char *box_patch_filename, Bool for_fragments);
 
-/*Return the referenced track ID for a track and a given ReferenceType and Index
-return -1 if error, 0 if the reference is a NULL one, or the trackNumber
+/*! sets track magic number
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param magic the magic number to set; magic number is not written to file
+\return error if any
 */
-GF_Err gf_isom_get_reference_ID(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrackID);
+GF_Err gf_isom_set_track_magic(GF_ISOFile *isom_file, u32 trackNumber, u64 magic);
 
-/*Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType, 0 otherwise*/
-u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID);
+/*! sets track index in moov
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param index the 1-based index to set. Tracks will be reordered after this!
+\param track_num_changed callback function used to notify track changes during the call to this function
+\param udta opaque user data for the callback function
+\return error if any
+*/
+GF_Err gf_isom_set_track_index(GF_ISOFile *isom_file, u32 trackNumber, u32 index, void (*track_num_changed)(void *udta, u32 old_track_num, u32 new_track_num), void *udta);
 
-u8 gf_isom_get_pl_indication(GF_ISOFile *the_file, u8 PL_Code);
+/*! removes a sample description with the given index
+\warning This does not remove any added samples for that stream description, nor rewrite the sample to chunk and other boxes referencing the sample description index !
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description to remove
+\return error if any
+*/
+GF_Err gf_isom_remove_stream_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*locates the first ObjectDescriptor using the given track by inspecting any OD tracks*/
-u32 gf_isom_find_od_for_track(GF_ISOFile *file, u32 track);
+/*! updates average and max bitrate of a sample description
+if both average_bitrate and max_bitrate are 0, this removes any bitrate information
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description
+\param average_bitrate the average bitrate of the media for that sample description
+\param max_bitrate the maximum bitrate of the media for that sample description
+\param decode_buffer_size the decoder buffer size in bytes for that sample description
+\return error if any
+*/
+GF_Err gf_isom_update_bitrate(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size);
 
-/*returns file name*/
-const char *gf_isom_get_filename(GF_ISOFile *the_file);
 
-/*
-		Update of the Reading API for IsoMedia Version 2
+/*! track clone flags*/
+typedef enum
+{
+	/*! 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_ISOTrackCloneFlags;
+
+/*! clones a track. This clones everything except media data and sample info (DTS, CTS, RAPs, etc...), and also clones sample descriptions
+\param orig_file the source ISO file
+\param orig_track the source track
+\param dest_file the destination ISO file
+\param flags flags to use during clone
+\param dest_track set to the track number of cloned track
+\return error if any
 */
+GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, GF_ISOTrackCloneFlags flags, u32 *dest_track);
 
-/*retrieves the brand of the file. The brand is introduced in V2 to differenciate
-MP4, MJPEG2000 and QT while indicating compatibilities
-the brand is one of the above defined code, or any other registered brand
 
-minorVersion is an optional parameter (can be set to NULL) ,
-		"informative integer for the minor version of the major brand"
-AlternateBrandsCount is an optional parameter (can be set to NULL) ,
-	giving the number of compatible brands.
+/*! sets the GroupID of a track (only used for optimized interleaving). By setting GroupIDs
+you can specify the storage order for media data of a group of streams. This is useful
+for BIFS presentation so that static resources of the scene can be downloaded before BIFS
 
-	The function will set brand to 0 if no brand indication is found in the file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param GroupID the desired group ID
+\return error if any
 */
-GF_Err gf_isom_get_brand_info(GF_ISOFile *the_file, u32 *brand, u32 *minorVersion, u32 *AlternateBrandsCount);
+GF_Err gf_isom_set_track_interleaving_group(GF_ISOFile *isom_file, u32 trackNumber, u32 GroupID);
 
-/*gets an alternate brand indication. BrandIndex is 1-based
-Note that the Major brand should always be indicated in the alternate brands*/
-GF_Err gf_isom_get_alternate_brand(GF_ISOFile *the_file, u32 BrandIndex, u32 *brand);
+/*! sets the priority of a track within a Group (used for optimized interleaving and hinting).
+This allows tracks to be stored before other within a same group, for instance the
+hint track data can be stored just before the media data, reducing disk seeking
 
-/*get the number of padding bits at the end of a given sample if any*/
-GF_Err gf_isom_get_sample_padding_bits(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u8 *NbBits);
-/*indicates whether the track samples use padding bits or not*/
-Bool gf_isom_has_padding_bits(GF_ISOFile *the_file, u32 trackNumber);
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param InversePriority the desired priority. For a same time, within a group of tracks, the track with the lowest InversePriority will
+be written first
+\return error if any
+*/
+GF_Err gf_isom_set_track_priority_in_group(GF_ISOFile *isom_file, u32 trackNumber, u32 InversePriority);
+
+/*! sets the maximum chunk size for a track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param maxChunkSize the maximum chunk size in bytes
+\return error if any
+*/
+GF_Err gf_isom_hint_max_chunk_size(GF_ISOFile *isom_file, u32 trackNumber, u32 maxChunkSize);
+
+/*! 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
+\return error if any
+*/
+GF_Err gf_isom_make_interleave(GF_ISOFile *isom_file, Double TimeInSec);
+
+/*! sets progress callback when writing a file
+\param isom_file the target ISO file
+\param progress_cbk the progress callback function
+\param progress_cbk_udta opaque data passed to the progress callback function
+*/
+void gf_isom_set_progress_callback(GF_ISOFile *isom_file, void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total), void *progress_cbk_udta);
+
+/*! sets write callback functions for in-memory file writing
+\param isom_file the target ISO file
+\param on_block_out the block write callback function
+\param on_block_patch the block patch callback function
+\param usr_data opaque user data passed to callback functions
+\param block_size desired block size in bytes
+\return error if any
+*/
+GF_Err gf_isom_set_write_callback(GF_ISOFile *isom_file,
+ 			GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size),
+			GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert),
+ 			void *usr_data,
+ 			u32 block_size);
 
-/*returns width and height of the given visual sample desc - error if not a visual track*/
-GF_Err gf_isom_get_visual_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *Width, u32 *Height);
+/*! @} */
 
-/*returns samplerate (no SBR when applicable), channels and bps of the given audio track - error if not a audio track*/
-GF_Err gf_isom_get_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *SampleRate, u32 *Channels, u8 *bitsPerSample);
+#endif // GPAC_DISABLE_ISOM_WRITE
 
-/*returns track visual info - all coord values are expressed as 16.16 fixed point floats*/
-GF_Err gf_isom_get_track_layout_info(GF_ISOFile *the_file, u32 trackNumber, u32 *width, u32 *height, s32 *translation_x, s32 *translation_y, s16 *layer);
+/*!
+\addtogroup isomp4sys_grp ISOBMFF MPEG-4 Systems
+\ingroup iso_grp
 
-/*returns track matrix info - all coord values are expressed as 16.16 fixed point floats*/
-GF_Err gf_isom_get_track_matrix(GF_ISOFile *the_file, u32 trackNumber, u32 matrix[9]);
+MPEG-4 Systems extensions
+@{
+*/
 
-/*returns aspect ratio for the given visual sample desc - error if not a visual track*/
-GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 *hSpacing, u32 *vSpacing);
 
-/*returns color info for the given visual sample desc - error if not a visual track*/
-GF_Err gf_isom_get_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *colour_type, u16 *colour_primaries, u16 *transfer_characteristics, u16 *matrix_coefficients, Bool *full_range_flag);
+/*! MPEG-4 ProfileAndLevel codes*/
+typedef enum
+{
+	/*! Audio PL*/
+	GF_ISOM_PL_AUDIO,
+	/*! Visual PL*/
+	GF_ISOM_PL_VISUAL,
+	/*! Graphics PL*/
+	GF_ISOM_PL_GRAPHICS,
+	/*! Scene PL*/
+	GF_ISOM_PL_SCENE,
+	/*! OD PL*/
+	GF_ISOM_PL_OD,
+	/*! MPEG-J PL*/
+	GF_ISOM_PL_MPEGJ,
+	/*! not a profile, just set/unset inlineFlag*/
+	GF_ISOM_PL_INLINE,
+} GF_ISOProfileLevelType;
 
-/*gets RVC config of given sample description*/
-GF_Err gf_isom_get_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 *rvc_predefined, char **data, u32 *size, const char **mime);
+/*! gets MPEG-4 subtype of a sample description entry (eg, mp4a, mp4v, enca, encv, resv, etc...)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return the media type FOUR CHAR code type of an MPEG4 media, or 0 if not MPEG-4 subtype
+ */
+u32 gf_isom_get_mpeg4_subtype(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*
-	User Data Manipulation (cf write API too)
+/*! checks if files has root OD/IOD or not
+\param isom_file the target ISO file
+\return GF_TRUE if the file has a root OD or IOD */
+Bool gf_isom_has_root_od(GF_ISOFile *isom_file);
+
+/*! fetches the root OD of a file  (can be NULL, OD or IOD, you have to check its tag)
+\param isom_file the target ISO file
+\return the OD/IOD if any. Caller must destroy the descriptor
+*/
+GF_Descriptor *gf_isom_get_root_od(GF_ISOFile *isom_file);
+
+/*! disable OD conversion from ISOM internal to regular OD tags
+\param isom_file the target ISO file
+\param disable if TRUE, ODs and ESDs will not be converted
+*/
+void gf_isom_disable_odf_conversion(GF_ISOFile *movie, Bool disable);
+
+/*! checks the presence of a track in rood OD/IOD
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return 0: NO, 1: YES, 2: ERROR*/
+u8 gf_isom_is_track_in_root_od(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the GF_ESD given the sampleDescriptionIndex
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return the ESD associated to the sample description index, or NULL if error or not supported. Caller must destroy the ESD*/
+GF_ESD *gf_isom_get_esd(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets the decoderConfigDescriptor given the sampleDescriptionIndex
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return the decoder configuration descriptor associated to the sample description index, or NULL if error or not supported. Caller must destroy the descriptor
+*/
+GF_DecoderConfig *gf_isom_get_decoder_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! sets default TrackID (or ES_ID) for clock references.
+\param isom_file the target ISO file
+\param trackNumber the target track to set as a clock reference. If 0, default sync track ID is reseted and will be reassigned at next ESD fetch*/
+void gf_isom_set_default_sync_track(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets the profile and level value for MPEG-4 streams
+\param isom_file the target ISO file
+\param PL_Code the target profile to query file
+\return the profile and level value, 0xFF if not defined
+*/
+u8 gf_isom_get_pl_indication(GF_ISOFile *isom_file, GF_ISOProfileLevelType PL_Code);
+
+/*! finds the first ObjectDescriptor using the given track by inspecting all OD tracks
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the OD ID if dound, 0 otherwise*/
+u32 gf_isom_find_od_id_for_track(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! sets a profile and level indication for the movie iod (created if needed)
+\note Use for MPEG-4 Systems only
+if the flag is ProfileLevel is 0 this means the movie doesn't require
+the specific codec (equivalent to 0xFF value in MPEG profiles)
+\param isom_file the target ISO file
+\param PL_Code the profile and level code to set
+\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);
 
-//returns the number of entries in UDTA of the track if trackNumber is not 0, or of the movie otherwise
-u32 gf_isom_get_udta_count(GF_ISOFile *movie, u32 trackNumber);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! sets the rootOD ID of the movie if you need it. By default, movies are created without root ODs
+\note Use for MPEG-4 Systems only
+\param isom_file the target ISO file
+\param OD_ID ID to assign to the root OD/IOD
+\return error if any
+*/
+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)
+\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
+\return error if any
+*/
+GF_Err gf_isom_set_root_od_url(GF_ISOFile *isom_file, const char *url_string);
+
+/*! removes the root OD
+\note Use for MPEG-4 Systems only
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_remove_root_od(GF_ISOFile *isom_file);
+
+/*! adds a system descriptor to the OD of the movie
+\note Use for MPEG-4 Systems only
+\param isom_file the target ISO file
+\param theDesc the descriptor to add
+\return error if any
+*/
+GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *isom_file, const GF_Descriptor *theDesc);
+
+/*! adds a track to the root OD
+\note Use for MPEG-4 Systems only
+\param isom_file the target ISO file
+\param trackNumber the track to add to the root OD
+\return error if any
+*/
+GF_Err gf_isom_add_track_to_root_od(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! removes a track to the root OD
+\note Use for MPEG-4 Systems only
+\param isom_file the target ISO file
+\param trackNumber the track to remove from the root OD
+\return error if any
+*/
+GF_Err gf_isom_remove_track_from_root_od(GF_ISOFile *isom_file, u32 trackNumber);
+
+
+/*! creates a new MPEG-4 sample description in a track
+
+\note Used for MPEG-4 Systems, AAC and MPEG-4 Visual (part 2)
+
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param esd the ESD to use for that 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 index of the new sample description
+\return error if any
+*/
+GF_Err gf_isom_new_mpeg4_description(GF_ISOFile *isom_file, u32 trackNumber, const GF_ESD *esd, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! changes an MPEG-4 sample description
+\note Used for MPEG-4 Systems, AAC and MPEG-4 Visual (part 2)
+\warning This will replace the whole ESD
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description
+\param newESD the new ESD to use for that sample description
+\return error if any
+*/
+GF_Err gf_isom_change_mpeg4_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const GF_ESD *newESD);
+
+/*! adds an MPEG-4 systems descriptor to the ESD of a sample description
+\note Used for MPEG-4 Systems, AAC and MPEG-4 Visual (part 2)
+\warning This will replace the whole ESD
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description
+\param theDesc the descriptor to add to the ESD of the sample description
+\return error if any
+*/
+GF_Err gf_isom_add_desc_to_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const GF_Descriptor *theDesc);
+
+/*! clones IOD PLs from orig to dest if any
+\param orig_file the source ISO file
+\param dest_file the destination ISO file
+\return error if any
+*/
+GF_Err gf_isom_clone_pl_indications(GF_ISOFile *orig_file, GF_ISOFile *dest_file);
 
-//returns the type (box 4CC and UUID if any) of the given entry in UDTA of the track if trackNumber is not 0, or of the movie otherwise. udta_idx is 1-based index.
-GF_Err gf_isom_get_udta_type(GF_ISOFile *movie, u32 trackNumber, u32 udta_idx, u32 *UserDataType, bin128 *UUID);
+/*deletes chapter (1-based index, index 0 for all)*/
+GF_Err gf_isom_remove_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 index);
 
-/* Gets the number of UserDataItems with the same ID / UUID in the desired track or
-in the movie if trackNumber is set to 0*/
-u32 gf_isom_get_user_data_count(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
-/* Gets the UserData for the specified item from the track or the movie if trackNumber is set to 0
-data is allocated by the function and is yours to free
-you musty pass (userData != NULL && *userData=NULL)
+/*! associates a given SL config with a given ESD while extracting the OD information
+This is useful while reading the IOD / OD stream of an MP4 file. Note however that
+only full AUs are extracted, therefore the calling application must SL-packetize the streams
 
-if UserDataIndex is 0, all boxes with type==UserDataType will be serialized (including box header and size) in the buffer
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex set to the sample description index corresponding to this sample (optional, can be NULL)
+\param slConfig the SL configuration descriptor to set. The descriptor is copied by the API for further use. A NULL pointer will result
+in using the default SLConfig (predefined = 2) remapped to predefined = 0
+\return error if any
 */
-GF_Err gf_isom_get_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, char **userData, u32 *userDataSize);
+GF_Err gf_isom_set_extraction_slc(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const GF_SLConfig *slConfig);
 
+#endif //GPAC_DISABLE_ISOM_WRITE
 
-/*gets the media language code (3 chars if old files, longer if BCP-47 */
-GF_Err gf_isom_get_media_language(GF_ISOFile *the_file, u32 trackNumber, char **lang);
 
-/* gets the i-th track kind (0-based) */
-u32 gf_isom_get_track_kind_count(GF_ISOFile *the_file, u32 trackNumber);
-GF_Err gf_isom_get_track_kind(GF_ISOFile *the_file, u32 trackNumber, u32 index, char **scheme, char **value);
+/*! @} */
+
+/*!
+\addtogroup isostsd_grp ISOBMFF Sample Descriptions
+\ingroup iso_grp
+
+Sample Description functions are used to query and set codec parameters of a track
 
-/*Unknown sample description*/
+@{
+*/
+
+/*! Unknown sample description*/
 typedef struct
 {
-	/*codec tag is the containing box's tag, 0 if UUID is used*/
+	/*! codec tag is the containing box's tag, 0 if UUID is used*/
 	u32 codec_tag;
-	/*entry UUID if no tag is used*/
+	/*! entry UUID if no tag is used*/
 	bin128 UUID;
-
+	/*! codec version*/
 	u16 version;
+	/*! codec revision*/
 	u16 revision;
+	/*! vendor four character code*/
 	u32 vendor_code;
 
-	/*video codecs only*/
+	/*! temporal quality, video codecs only*/
 	u32 temporal_quality;
+	/*! spatial quality, video codecs only*/
 	u32 spatial_quality;
-	u16 width, height;
-	u32 h_res, v_res;
+	/*! width in pixels, video codecs only*/
+	u16 width;
+	/*! height in pixels, video codecs only*/
+	u16 height;
+	/*! horizontal resolution as 16.16 fixed point, video codecs only*/
+	u32 h_res;
+	/*! vertical resolution as 16.16 fixed point, video codecs only*/
+	u32 v_res;
+	/*! bit depth resolution in bits, video codecs only*/
 	u16 depth;
+	/*! color table, video codecs only*/
 	u16 color_table_index;
+	/*! compressor name, video codecs only*/
 	char compressor_name[33];
 
-	/*audio codecs only*/
+	/*! sample rate, audio codecs only*/
 	u32 samplerate;
+	/*! number of channels, audio codecs only*/
 	u16 nb_channels;
+	/*! bits per sample, audio codecs only*/
 	u16 bits_per_sample;
+	/*! indicates if QTFF signaling should be used, audio codecs only*/
+	Bool is_qtff;
 
-	/*if present*/
-	char *extension_buf;
+	/*optional, sample description specific configuration*/
+	u8 *extension_buf;
+	/*optional, sample description specific size*/
 	u32 extension_buf_size;
 } GF_GenericSampleDescription;
 
-/*returns wrapper for unknown entries - you must delete it yourself*/
-GF_GenericSampleDescription *gf_isom_get_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+/*! gets an unknown sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\return generic sample description information, or NULL if error
+*/
+GF_GenericSampleDescription *gf_isom_get_generic_sample_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets the decoder configuration of a JP2 file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param out_dsi set to the decoder configuration - shall be freed by user
+\param out_size set to the decoder configuration size
+\return error if any
+*/
+GF_Err gf_isom_get_jp2_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 **out_dsi, u32 *out_size);
 
-/*retrieves default values for a track fragment. Each variable is optional and
-if set will contain the default value for this track samples*/
-GF_Err gf_isom_get_fragment_defaults(GF_ISOFile *the_file, u32 trackNumber,
-                                     u32 *defaultDuration, u32 *defaultSize, u32 *defaultDescriptionIndex,
-                                     u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority);
-
-
-/*returns 1 if file is single AV (max one audio, one video, one text and basic od/bifs)*/
-Bool gf_isom_is_single_av(GF_ISOFile *file);
 
-/*returns TRUE if this is a video track type (vide, auxv, pict, ...)*/
-Bool gf_isom_is_video_subtype(u32 mtype);
 
-/*guess which std this file refers to. return value:
-	GF_ISOM_BRAND_ISOM: unrecognized std
-	GF_ISOM_BRAND_3GP5: 3GP file (max 1 audio, 1 video) without text track
-	GF_ISOM_BRAND_3GP6: 3GP file (max 1 audio, 1 video) with text track
-	GF_ISOM_BRAND_3GG6: 3GP file multitrack file
-	GF_ISOM_BRAND_3G2A: 3GP2 file
-	GF_ISOM_BRAND_AVC1: AVC file
-	FCC("ISMA"): ISMA file (may overlap with 3GP)
-	GF_ISOM_BRAND_MP42: any generic MP4 file (eg with BIFS/OD/MPEG-4 systems stuff)
+/*! gets RVC (Reconvigurable Video Coding) config of a track for a given sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index (1-based)
+\param rvc_predefined set to a predefined value of RVC
+\param data set to the RVC config buffer if not predefined, NULL otherwise
+\param size set to the RVC config buffer size
+\param mime set to the associated mime type of the stream
+\return error if any*/
+GF_Err gf_isom_get_rvc_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u16 *rvc_predefined, u8 **data, u32 *size, const char **mime);
 
-  for files without movie, returns the file meta handler type
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! sets the RVC config for the given track sample description
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description index
+\param rvc_predefined the predefined RVC configuration code, 0 if not predefined
+\param mime the associated mime type of the video
+\param data the RVC configuration data; ignored if rvc_predefined is not 0
+\param size the size of the RVC configuration data; ignored if rvc_predefined is not 0
+\return error if any
+*/
+GF_Err gf_isom_set_rvc_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u16 rvc_predefined, char *mime, u8 *data, u32 size);
+
+
+/*! updates fields of given visual sample description - these fields are reserved in ISOBMFF, this should only be used for QT, see QTFF
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description
+\param revision revision of the sample description format
+\param vendor four character code of the vendor
+\param temporalQ temporal quality
+\param spatialQ spatial quality
+\param horiz_res horizontal resolution as 16.16 fixed point number
+\param vert_res vertical resolution as 16.16 fixed point number
+\param frames_per_sample number of frames per media samples
+\param compressor_name human readable name for the compressor
+\param color_table_index color table index, use -1 if no color table (most common case)
+\return error if any
+*/
+GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, const char *compressor_name, s16 color_table_index);
+
+/*! updates a sample description from a serialized sample description box. Only child boxes are removed in the process
+\param isom_file the target ISO file
+\param trackNumber the target track number
+\param sampleDescriptionIndex the target sample description
+\param data a serialized sample description box
+\param size size of the serialized sample description
+\return error if any
+*/
+GF_Err gf_isom_update_sample_description_from_template(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 *data, u32 size);
+
+
+/*! creates a new unknown StreamDescription in the file.
+\note use this to store media not currently supported by the ISO media format or media types not implemented in this library
+\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 udesc generic sample description information to use
+\param outDescriptionIndex set to index of the new sample description
+\return error if any
+*/
+GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *isom_file, u32 trackNumber, const char *URLname, const char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex);
+
+/*! clones a sample description without inspecting media types
+\param isom_file the destination ISO file
+\param trackNumber the destination track
+\param orig_file the source ISO file
+\param orig_track the source track
+\param orig_desc_index the source sample description to clone
+\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 index of the new sample description
+\return error if any
+*/
+GF_Err gf_isom_clone_sample_description(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, u32 orig_desc_index, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! gets the sample description template of a track. This serializes sample description box
+\param isom_file the destination ISO file
+\param trackNumber the destination track
+\param sampleDescriptionIndex the target sample description
+\param output will be set to a newly allocated buffer containing the serialized box - caller shall free it
+\param output_size will be set to the size of the allocated buffer
+\return error if any
+*/
+GF_Err gf_isom_get_stsd_template(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 **output, u32 *output_size);
+
+#endif // GPAC_DISABLE_ISOM_WRITE
+
+/*! checks if sample descriptions are the same. This does include self-contained checking and reserved flags. The specific media cfg (DSI & co) is not analysed, only a memory comparaison is done
+\param f1 the first ISO file
+\param tk1 the first track
+\param sdesc_index1 the first sample description
+\param f2 the second ISO file
+\param tk2 the second track
+\param sdesc_index2 the second sample description
+\return GF_TRUE if sample descriptions match, GF_FALSE otherwise
 */
-u32 gf_isom_guess_specification(GF_ISOFile *file);
-/*keeps UTC edit times when storing*/
-void gf_isom_keep_utc_times(GF_ISOFile *file, Bool keep_utc);
-
-/*drops all modification/creation times and handler/copyright containing GPAC rev info (used for tests)*/
-void gf_isom_no_version_date_info(GF_ISOFile *file, Bool drop_info);
-
+Bool gf_isom_is_same_sample_description(GF_ISOFile *f1, u32 tk1, u32 sdesc_index1, GF_ISOFile *f2, u32 tk2, u32 sdesc_index2);
 
-/*gets last UTC/timestamp values indicated for the reference track in the file if any. Returns 0 if no info found*/
-Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, u32 *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info);
 
-/*gets max/average rate info as indicated in ESDS or BTRT boxes
-if sampleDescIndex is 0, gather for all sample descriptions*/
-GF_Err gf_isom_get_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescIndex, u32 *average_bitrate, u32 *max_bitrate, u32 *decode_buffer_size);
+/*! Generic 3GP/3GP2 config record*/
+typedef struct
+{
+	/*GF_4CC record type, one fo the above GF_ISOM_SUBTYPE_3GP_ * subtypes*/
+	u32 type;
+	/*4CC vendor name*/
+	u32 vendor;
+	/*codec version*/
+	u8 decoder_version;
+	/*number of sound frames per IsoMedia sample, >0 and <=15. The very last sample may contain less frames. */
+	u8 frames_per_sample;
+	/*H263 ONLY - Level*/
+	u8 H263_level;
+	/*H263 Profile*/
+	u8 H263_profile;
+	/*AMR(WB) ONLY - num of mode for the codec*/
+	u16 AMR_mode_set;
+	/*AMR(WB) ONLY - changes in codec mode per sample*/
+	u8 AMR_mode_change_period;
+} GF_3GPConfig;
 
-/*returns true if this sample was the first sample of a traf in a fragmented file, false otherwise*/
-Bool gf_isom_sample_was_traf_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum);
 
+/*! gets a 3GPP sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return the 3GP config for this sample description, NULL if not a 3GPP track
+*/
+GF_3GPConfig *gf_isom_3gp_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 #ifndef GPAC_DISABLE_ISOM_WRITE
-
-
-/********************************************************************
-				EDITING/WRITING API FUNCTIONS
-********************************************************************/
-
-/*set the timescale of the movie*/
-GF_Err gf_isom_set_timescale(GF_ISOFile *the_file, u32 timeScale);
-
-/*creates a new Track. If trackID = 0, the trackID is chosen by the API
-returns the track number or 0 if error*/
-u32 gf_isom_new_track(GF_ISOFile *the_file, u32 trackID, u32 MediaType, u32 TimeScale);
-
-/*removes the desired track - internal cross dependancies will be updated.
-WARNING: any OD streams with references to this track through  ODUpdate, ESDUpdate, ESDRemove commands
-will be rewritten*/
-GF_Err gf_isom_remove_track(GF_ISOFile *the_file, u32 trackNumber);
-
-/*sets the enable flag of a track*/
-GF_Err gf_isom_set_track_enabled(GF_ISOFile *the_file, u32 trackNumber, u8 enableTrack);
-
-/*sets creationTime and modificationTime of the movie to the specified date*/
-GF_Err gf_isom_set_creation_time(GF_ISOFile *movie, u64 time);
-/*sets creationTime and modificationTime of the track to the specified date*/
-GF_Err gf_isom_set_track_creation_time(GF_ISOFile *movie,u32 trackNumber, u64 time);
-
-/*changes the trackID - all track references present in the file are updated
-returns error if trackID is already in used in the file*/
-GF_Err gf_isom_set_track_id(GF_ISOFile *the_file, u32 trackNumber, u32 trackID);
-
-/*force to rewrite all dependencies when trackID changes*/
-GF_Err gf_isom_rewrite_track_dependencies(GF_ISOFile *movie, u32 trackNumber);
-
-/*Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)*/
-GF_Err gf_isom_add_sample(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ISOSample *sample);
-
-/*set depenecy info for given sample*/
-GF_Err gf_isom_sample_set_dep_info(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant);
-
-//copies all sample dependency, subSample and sample group information from the given sampleNumber in source file to the last added sample in dest file
-GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber);
-
-/*Add sync shadow sample to a track.
-- There must be a regular sample with the same DTS.
-- Sync Shadow samples MUST be RAP
-- Currently, adding sync shadow must be done in order (no sample insertion)
+/*! creates a 3GPP sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param config the 3GP 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_3gp_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_3GPConfig *config, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+/*! updates the 3GPP config - subtypes shall NOT differ
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param config the 3GP config for this sample description
+\param sampleDescriptionIndex the target sample description index
+\return error if any
 */
-GF_Err gf_isom_add_sample_shadow(GF_ISOFile *the_file, u32 trackNumber, GF_ISOSample *sample);
-
-/*add data to current sample in the track. Use this function for media with
-fragmented options such as MPEG-4 video packets. This will update the data size.
-CANNOT be used with OD media type*/
-GF_Err gf_isom_append_sample_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 data_size);
-
-/*sets RAP flag of last sample added to TRUE*/
-GF_Err gf_isom_set_sample_rap(GF_ISOFile *movie, u32 trackNumber);
-
-/*Add sample references to a track. The dataOffset is the offset of the data in the referenced file
-you MUST have created a StreamDescription with URL or URN specifying your referenced file
-Use streamDescriptionIndex to specify the desired stream (if several)*/
-GF_Err gf_isom_add_sample_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ISOSample *sample, u64 dataOffset);
-
-/*set the duration of the last media sample. If not set, the duration of the last sample is the
-duration of the previous one if any, or media TimeScale (default value). This does not modify the edit list if any,
-you must modify this using gf_isom_set_edit_segment*/
-GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 duration);
-
-/*sets a track reference*/
-GF_Err gf_isom_set_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferencedTrackID);
-
-/*removes a track reference*/
-GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex);
+GF_Err gf_isom_3gp_config_update(GF_ISOFile *isom_file, u32 trackNumber, GF_3GPConfig *config, u32 sampleDescriptionIndex);
+#endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
-/*removes all track references*/
-GF_Err gf_isom_remove_track_references(GF_ISOFile *the_file, u32 trackNumber);
 
-/*sets track handler name. name is either NULL (reset), a UTF-8 formatted string or a UTF8 file
-resource in the form "file://path/to/file_utf8" */
-GF_Err gf_isom_set_handler_name(GF_ISOFile *the_file, u32 trackNumber, const char *nameUTF8);
+/*! gets AVC 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 AVC config - user is responsible for deleting it
+*/
+GF_AVCConfig *gf_isom_avc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+/*! gets SVC 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 SVC config - user is responsible for deleting it
+*/
+GF_AVCConfig *gf_isom_svc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+/*! gets MVC 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 SVC config - user is responsible for deleting it
+*/
+GF_AVCConfig *gf_isom_mvc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*Update the sample size table - this is needed when using @gf_isom_append_sample_data in case the resulting samples
-are of same sizes (typically in 3GP speech tracks)*/
-GF_Err gf_isom_refresh_size_info(GF_ISOFile *file, u32 trackNumber);
+/*! AVC familiy type*/
+typedef enum
+{
+	/*! not an AVC codec*/
+	GF_ISOM_AVCTYPE_NONE=0,
+	/*! AVC only*/
+	GF_ISOM_AVCTYPE_AVC_ONLY,
+	/*! AVC+SVC in same track*/
+	GF_ISOM_AVCTYPE_AVC_SVC,
+	/*! SVC only*/
+	GF_ISOM_AVCTYPE_SVC_ONLY,
+	/*! AVC+MVC in same track*/
+	GF_ISOM_AVCTYPE_AVC_MVC,
+	/*! SVC only*/
+	GF_ISOM_AVCTYPE_MVC_ONLY,
+} GF_ISOMAVCType;
 
-/*return the duration of the movie, 0 if error*/
-GF_Err gf_isom_update_duration(GF_ISOFile *the_file);
+/*! gets the AVC family type for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param sampleDescriptionIndex the target sample description index
+\return the type of AVC media
+*/
+GF_ISOMAVCType gf_isom_get_avc_svc_type(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
-/*Update Sample functions*/
+/*! HEVC family type*/
+typedef enum
+{
+	/*! not an HEVC codec*/
+	GF_ISOM_HEVCTYPE_NONE=0,
+	/*! HEVC only*/
+	GF_ISOM_HEVCTYPE_HEVC_ONLY,
+	/*! HEVC+LHVC in same track*/
+	GF_ISOM_HEVCTYPE_HEVC_LHVC,
+	/*! LHVC only*/
+	GF_ISOM_HEVCTYPE_LHVC_ONLY,
+} GF_ISOMHEVCType;
 
-/*update a given sample of the media.
-@data_only: if set, only the sample data is updated, not other info*/
-GF_Err gf_isom_update_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, Bool data_only);
+/*! gets the HEVC 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 HEVC media
+*/
+GF_ISOMHEVCType gf_isom_get_hevc_lhvc_type(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets HEVC 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 HEVC config - user is responsible for deleting it
+*/
+GF_HEVCConfig *gf_isom_hevc_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+/*! gets LHVC 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 LHVC config - user is responsible for deleting it
+*/
+GF_HEVCConfig *gf_isom_lhvc_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
+\param sampleDescriptionIndex the target sample description index
+\return the AV1 config - user is responsible for deleting it
+*/
+GF_AV1Config *gf_isom_av1_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets VP8/9 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 VP8/9 config - user is responsible for deleting it
+*/
+GF_VPConfig *gf_isom_vp_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets DOVI 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 DOVI config - user is responsible for deleting it
+*/
+GF_DOVIDecoderConfigurationRecord* gf_isom_dovi_config_get(GF_ISOFile* isom_file, u32 trackNumber, u32 DescriptionIndex);
+
+/*! checks if some tracks in file needs layer reconstruction
+\param isom_file the target ISO file
+\return GF_TRUE if track dependencies implying extractors or implicit reconstruction are found, GF_FALSE otherwise
+*/
+Bool gf_isom_needs_layer_reconstruction(GF_ISOFile *isom_file);
 
-/*update a sample reference in the media. Note that the sample MUST exists,
-that sample->data MUST be NULL and sample->dataLength must be NON NULL;*/
-GF_Err gf_isom_update_sample_reference(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, u64 data_offset);
+/*! NALU extract modes and flags*/
+typedef enum
+{
+	/*! all extractors are rewritten*/
+	GF_ISOM_NALU_EXTRACT_DEFAULT = 0,
+	/*! all extractors are skipped but NALU data from this track is kept*/
+	GF_ISOM_NALU_EXTRACT_LAYER_ONLY,
+	/*! all extractors are kept (untouched sample) - used for dumping modes*/
+	GF_ISOM_NALU_EXTRACT_INSPECT,
+	/*! above mode is applied and PPS/SPS/... are appended in the front of every IDR*/
+	GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG = 1<<16,
+	/*! above mode is applied and all start codes are rewritten (xPS inband as well)*/
+	GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG = 2<<17,
+	/*! above mode is applied and VDRD NAL unit is inserted before SVC slice*/
+	GF_ISOM_NALU_EXTRACT_VDRD_FLAG = 1<<18,
+	/*! all extractors are skipped and only tile track data is kept*/
+	GF_ISOM_NALU_EXTRACT_TILE_ONLY = 1<<19
+} GF_ISONaluExtractMode;
 
-/*Remove a given sample*/
-GF_Err gf_isom_remove_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber);
+/*! sets the NALU extraction mode for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param nalu_extract_mode the NALU extraction mode to set
+\return error if any
+*/
+GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *isom_file, u32 trackNumber, GF_ISONaluExtractMode nalu_extract_mode);
+/*! gets the NALU extraction mode for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the NALU extraction mode used
+*/
+GF_ISONaluExtractMode gf_isom_get_nalu_extract_mode(GF_ISOFile *isom_file, u32 trackNumber);
 
-/*changes media time scale - if force_rescale is 1, only the media timescale is changed but media times are not updated */
-GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 new_timescale, Bool force_rescale);
 
-/*set the save file name of the (edited) movie.
-If the movie is edited, the default fileName is avp_#openName)
-NOTE: you cannot save an edited file under the same name (overwrite not allowed)
-If the movie is created (WRITE mode), the default filename is #openName*/
-GF_Err gf_isom_set_final_name(GF_ISOFile *the_file, char *filename);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a new AVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the AVC 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_avc_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_AVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+/*! updates an AVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param cfg the AVC config for this sample description
+\return error if any
+*/
+GF_Err gf_isom_avc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_AVCConfig *cfg);
+
+/*! creates a new SVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the SVC 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_svc_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_AVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+/*! updates an SVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param cfg the AVC config for this sample description
+\param is_additional if set, the SVCConfig will be added to the AVC sample description, otherwise the sample description will be SVC-only
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to delete
+\return error if any
+*/
+GF_Err gf_isom_svc_config_del(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! creates a new MVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the SVC 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_mvc_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_AVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! updates an MVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param cfg the AVC config for this sample description
+\param is_additional if set, the MVCConfig will be added to the AVC sample description, otherwise the sample description will be MVC-only
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to delete
+\return error if any
+*/
+GF_Err gf_isom_mvc_config_del(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! sets avc3 entry type (inband SPS/PPS) instead of avc1 (SPS/PPS in avcC 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_avc_set_inband_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Bool keep_xps);
+
+/*! sets hev1 entry type (inband SPS/PPS) instead of hvc1 (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_hevc_set_inband_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, Bool keep_xps);
+
+/*! sets lhe1 entry type instead of lhc1 but keep lhcC box intact
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return error if any
+*/
+GF_Err gf_isom_lhvc_force_inband_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! sets hvt1 entry type (tile track) or hev2/hvc2 type if is_base_track is set. It is the use responsability to set the tbas track reference to the base hevc track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param cfg may be set to the tile track configuration to indicate sub-profile of the tile, or NULL
+\param is_base_track if set to GF_TRUE, indicates this is a tile base track, otherwise this is a tile track
+\return error if any
+*/
+GF_Err gf_isom_hevc_set_tile_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_HEVCConfig *cfg, Bool is_base_track);
+
+/*! creates a new HEVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the HEVC 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_hevc_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_HEVCConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! updates an HEVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param cfg the HEVC config for this sample description
+\return error if any
+*/
+GF_Err gf_isom_hevc_config_update(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_HEVCConfig *cfg);
 
+/*! Updates L-HHVC config*/
+typedef enum {
+	//! changes track type to LHV1/LHE1: no base nor extractors in track, just enhancement layers
+	GF_ISOM_LEHVC_ONLY = 0,
+	//! changes track type to HVC2/HEV2: base and extractors/enh. in track
+	GF_ISOM_LEHVC_WITH_BASE,
+	//! changes track type to HVC1/HEV1 with additional cfg: base and enh. in track no extractors
+	GF_ISOM_LEHVC_WITH_BASE_BACKWARD,
+	//! changes track type to HVC2/HEV2 for tile base tracks
+	GF_ISOM_HEVC_TILE_BASE,
+} GF_ISOMLHEVCTrackType;
 
-/*set the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)*/
-GF_Err gf_isom_set_storage_mode(GF_ISOFile *the_file, u8 storageMode);
-u8 gf_isom_get_storage_mode(GF_ISOFile *the_file);
+/*! updates an HEVC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param cfg the LHVC config for this sample description
+\param track_type indicates the LHVC track type to set
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param nalu_size_length the new NALU size length in bytes
+\return error if any
+*/
+GF_Err gf_isom_set_nalu_length_field(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 nalu_size_length);
+
+/*! creates new VPx config
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the VPx 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
+\param vpx_type four character code of entry ('vp08', 'vp09' or 'vp10')
+\return error if any
+*/
+GF_Err gf_isom_vp_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_VPConfig *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex, u32 vpx_type);
+
+
+/*! creates new AV1 config
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the AV1 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_av1_config_new(GF_ISOFile *isom_file, u32 trackNumber, GF_AV1Config *cfg, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
 
-/*set the interleaving time of media data (INTERLEAVED mode only)
-InterleaveTime is in MovieTimeScale*/
-GF_Err gf_isom_set_interleave_time(GF_ISOFile *the_file, u32 InterleaveTime);
-u32 gf_isom_get_interleave_time(GF_ISOFile *the_file);
 
-/*forces usage of 64 bit chunk offsets*/
-void gf_isom_force_64bit_chunk_offset(GF_ISOFile *the_file, Bool set_on);
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*set the copyright in one language.*/
-GF_Err gf_isom_set_copyright(GF_ISOFile *the_file, const char *threeCharCode, char *notice);
 
-/*deletes copyright (1-based indexes)*/
-GF_Err gf_isom_remove_copyright(GF_ISOFile *the_file, u32 index);
+/*! Sample entry description for 3GPP DIMS*/
+typedef struct
+{
+	/*! profile*/
+	u8 profile;
+	/*! level*/
+	u8 level;
+	/*! number of components in path*/
+	u8 pathComponents;
+	/*! full request*/
+	Bool fullRequestHost;
+	/*! stream type*/
+	Bool streamType;
+	/*! has redundant sample (carousel)*/
+	u8 containsRedundant;
+	/*! text encoding string*/
+	const char *textEncoding;
+	/*! content encoding string*/
+	const char *contentEncoding;
+	/*! script string*/
+	const char *content_script_types;
+	/*! mime type string*/
+	const char *mime_type;
+	/*! xml schema location string*/
+	const char *xml_schema_loc;
+} GF_DIMSDescription;
 
-/*add a kind type to the track */
-GF_Err gf_isom_add_track_kind(GF_ISOFile *movie, u32 trackNumber, const char *schemeURI, const char *value);
-/*removes a kind type to the track, all if NULL params */
-GF_Err gf_isom_remove_track_kind(GF_ISOFile *movie, u32 trackNumber, const char *schemeURI, const char *value);
+/*! gets a DIMS sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param desc set to the DIMS description
+\return error if any
+*/
+GF_Err gf_isom_get_dims_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_DIMSDescription *desc);
 
-/*changes the handler type of the media*/
-GF_Err gf_isom_set_media_type(GF_ISOFile *movie, u32 trackNumber, u32 new_type);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a DIMS sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param desc the DIMS 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_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*/
 
-/*changes the type of the sampleDescriptionBox - USE AT YOUR OWN RISK, the file may not be understood afterwards*/
-GF_Err gf_isom_set_media_subtype(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 new_type);
+/*! 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;
+};
 
-GF_Err gf_isom_set_alternate_group_id(GF_ISOFile *movie, u32 trackNumber, u32 groupId);
+/*! 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;
 
-/*add chapter info:
-if trackNumber is 0, the chapter info is added to the movie, otherwise to the track
-@timestamp: chapter start time in milliseconds. Chapters are added in order to the file. If a chapter with same timestamp
-	is found, its name is updated but no entry is created.
-@name: chapter name. If NULL, defaults to 'Chapter N'
+/*! gets an AC3 sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\return AC-3 config
+*/
+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_add_chapter(GF_ISOFile *the_file, u32 trackNumber, u64 timestamp, char *name);
+GF_Err gf_isom_ac3_config_parse(u8 *dsi, u32 dsi_len, Bool is_ec3, GF_AC3Config *cfg);
 
-/*deletes copyright (1-based index, index 0 for all)*/
-GF_Err gf_isom_remove_chapter(GF_ISOFile *the_file, u32 trackNumber, u32 index);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates an AC3 sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param cfg the AC3 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_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*/
 
-/*set watermark info for movie*/
-GF_Err gf_isom_set_watermark(GF_ISOFile *the_file, bin128 UUID, u8* data, u32 length);
+/*! gets a FLAC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param dsi set to the flac decoder config - shall be freeed by caller
+\param dsi_size set to the size of the flac decoder config
+\return error if any
+*/
+GF_Err gf_isom_flac_config_get(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u8 **dsi, u32 *dsi_size);
 
-/*Track Edition functions - used to change the normal playback of the media if desired
-NOTE: IT IS THE USER RESPONSABILITY TO CREATE A CONSISTENT TIMELINE FOR THE TRACK
-This API provides the basic hooks and some basic consistency checking
-but can not check the desired functionality of the track edits
-*/
-
-/*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
-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.*/
-GF_Err gf_isom_set_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u8 EditMode);
-
-/*same as above except only modifies duration type and mediaType*/
-GF_Err gf_isom_modify_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index, u64 EditDuration, u64 MediaTime, u8 EditMode);
-/*same as above except only appends new segment*/
-GF_Err gf_isom_append_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u64 EditDuration, u64 MediaTime, u8 EditMode);
-
-/*remove the edit segments for the whole track*/
-GF_Err gf_isom_remove_edit_segments(GF_ISOFile *the_file, u32 trackNumber);
-
-/*remove the given edit segment (1-based index). If this is not the last segment, the next segment duration
-is updated to maintain a continous timeline*/
-GF_Err gf_isom_remove_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 seg_index);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a FLAC sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param metadata the flac decoder config buffer
+\param metadata_size the size of flac decoder config
+\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_flac_config_new(GF_ISOFile *isom_file, u32 trackNumber, u8 *metadata, u32 metadata_size, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*Updates edit list after track edition: all edit entries with aduration or media starttime larger than the media duration are clamped to media duration*/
-GF_Err gf_isom_update_edit_list_duration(GF_ISOFile *file, u32 track);
+/*! gets a OPUS  sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param dsi set to the OPUS decoder config - shall be freeed by caller
+\param dsi_size set to the size of the OPUS decoder config
+\return error if any
+*/
+GF_Err gf_isom_opus_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u8 **dsi, u32 *dsi_size);
 
-/*
-				User Data Manipulation
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-		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
-	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.
-Otherwise the UUID parameter is ignored
-		Several items with the same ID or UUID can be added (this allows you to store any
-	kind/number of private information under a unique ID / UUID)
+/*! creates a motion jpeg 2000 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 jpeg2000 decoder config buffer
+\param dsi_len the size of jpeg2000 decoder config
+\return error if any
 */
-/*Add a user data item in the desired track or in the movie if TrackNumber is 0*/
-GF_Err gf_isom_add_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, char *data, u32 DataLength);
-
-/*remove all user data items from the desired track or from the movie if TrackNumber is 0*/
-GF_Err gf_isom_remove_user_data(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
+GF_Err gf_isom_new_mj2k_description(GF_ISOFile *isom_file, u32 trackNumber, const char *URLname, const char *URNname, u32 *outDescriptionIndex, u8 *dsi, u32 dsi_len);
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*remove a user data item from the desired track or from the movie if TrackNumber is 0
-use the UDAT read functions to get the item index*/
-GF_Err gf_isom_remove_user_data_item(GF_ISOFile *the_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-/*remove track, moov (trackNumber=0) or file-level (trackNumber=0xFFFFFFFF) UUID box of matching type*/
-GF_Err gf_isom_remove_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID);
-/*adds track, moov (trackNumber=0) or file-level (trackNumber=0xFFFFFFFF) UUID box of given type*/
-GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, const char *data, u32 data_size);
+/*! creates a time code metadata sample description
+\note frames_per_counter_tick<0 disables counter flag but signals frames_per_tick
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param fps_num the frame rate numerator
+\param fps_den the frame rate denumerator (frame rate numerator will be track media timescale)
+\param frames_per_counter_tick if not 0, enables counter mode (sample data is an counter) and use this value as number of frames per counter tick. Otherwise, disables counter mode (sample data write h,m,s,frames)
+\param is_drop indicates that the time code in samples is a drop timecode
+\param is_counter indicates that the counter flag should be set
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_tmcd_config_new(GF_ISOFile *isom_file, u32 trackNumber, u32 fps_num, u32 fps_den, s32 frames_per_counter_tick, Bool is_drop, Bool is_counter, u32 *outDescriptionIndex);
 
-/*Add a user data item in the desired track or in the movie if TrackNumber is 0, using a serialzed buffer of ISOBMFF boxes*/
-GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 DataLength);
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-/*
-		Update of the Writing API for IsoMedia Version 2
+/*! gets information of a time code metadata sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param tmcd_flags set to the timecode description flags
+\param tmcd_fps_num set to fps numerator of timecode description
+\param tmcd_fps_den set to fps denominator of timecode description
+\param tmcd_fpt set to the ticks per second for counter mode (tmcd_flags & 0x1)
+\return error if any
+*/
+GF_Err gf_isom_get_tmcd_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *tmcd_flags, u32 *tmcd_fps_num, u32 *tmcd_fps_den, u32 *tmcd_fpt);
+
+/*! gets information of a raw PCM  sample description, ISOBMFF style
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param flags set to the pcm config flags (0: big endian, 1: little endian)
+\param pcm_size  set to PCM sample size (per channel, 16, 24, 32, 64
+\return error if any
 */
+GF_Err gf_isom_get_pcm_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *flags, u32 *pcm_size);
 
-/*use a compact track version for sample size. This is not usually recommended
-except for speech codecs where the track has a lot of small samples
-compaction is done automatically while writing based on the track's sample sizes*/
-GF_Err gf_isom_use_compact_size(GF_ISOFile *the_file, u32 trackNumber, u8 CompactionOn);
-
-/*sets the brand of the movie*/
-GF_Err gf_isom_set_brand_info(GF_ISOFile *the_file, u32 MajorBrand, u32 MinorVersion);
+/*! @} */
 
-/*adds or remove an alternate brand for the movie*/
-GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *the_file, u32 Brand, u8 AddIt);
 
-/*removes all alternate brands except major brand*/
-GF_Err gf_isom_reset_alt_brands(GF_ISOFile *movie);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+/*!
+\addtogroup isofragred_grp Fragmented ISOBMFF Read
+\ingroup iso_grp
 
-/*set the number of padding bits at the end of a given sample if needed
-if the function is never called the padding bit info is ignored
-this MUST be called on an existin sample*/
-GF_Err gf_isom_set_sample_padding_bits(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u8 NbBits);
+This describes function specific to fragmented ISOBMF files
 
+@{
+*/
 
-/*since v2 you must specify w/h of video tracks for authoring tools (no decode the video cfg / first sample)*/
-GF_Err gf_isom_set_visual_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height);
-/*since v2 you must specify w/h of video tracks for authoring tools (no decode the video cfg / first sample)*/
-GF_Err gf_isom_set_visual_bit_depth(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u16 bitDepth);
+/*! checks if a movie file is fragmented
+\param isom_file the target ISO file
+\return GF_FALSE if movie isn't fragmented, GF_TRUE otherwise
+*/
+Bool gf_isom_is_fragmented(GF_ISOFile *isom_file);
+/*! checks if a movie file is fragmented
+\param isom_file the target ISO file
+\param TrackID the target track
+\return GF_FALSE if track isn't fragmented, GF_TRUE otherwise*/
+Bool gf_isom_is_track_fragmented(GF_ISOFile *isom_file, GF_ISOTrackID TrackID);
 
-/*mainly used for 3GPP text since most ISO-based formats ignore these (except MJ2K)
-all coord values are expressed as 16.16 fixed point floats*/
-GF_Err gf_isom_set_track_layout_info(GF_ISOFile *the_file, u32 trackNumber, u32 width, u32 height, s32 translation_x, s32 translation_y, s16 layer);
+/*! checks if a file has a top styp box
+\param isom_file the target ISO file
+\param brand set to the major brand of the styp box
+\param version set to version of the styp box
+\return GF_TRUE of the file has a styp box, GF_FALSE otherwise
+*/
+Bool gf_isom_has_segment(GF_ISOFile *isom_file, u32 *brand, u32 *version);
+/*! gets number of movie fragments in the file
+\param isom_file the target ISO file
+\returns number of movie fragments in the file, 0 if none
+*/
+u32 gf_isom_segment_get_fragment_count(GF_ISOFile *isom_file);
+/*! gets number of track fragments in the indicated movie fragment
+\param isom_file the target ISO file
+\param moof_index the target movie fragment  (1-based index)
+\return number of track fragments, 0 if none
+*/
+u32 gf_isom_segment_get_track_fragment_count(GF_ISOFile *isom_file, u32 moof_index);
+/*! get the track fragment decode time of a track fragment
+\param isom_file the target ISO file
+\param moof_index the target movie fragment (1-based index)
+\param traf_index the target track fragment (1-based index)
+\param decode_time set to the track fragment decode time if present, 0 otherwise
+\return the track ID of the track fragment
+*/
+u32 gf_isom_segment_get_track_fragment_decode_time(GF_ISOFile *isom_file, u32 moof_index, u32 traf_index, u64 *decode_time);
 
-/*sets track matrix - all coordinates are expressed as 16.16 floating points*/
-GF_Err gf_isom_set_track_matrix(GF_ISOFile *the_file, u32 trackNumber, u32 matrix[9]);
+/*! 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
+\param mode if GF_TRUE, enables single moof mode; otherwise disables it
+*/
+void gf_isom_set_single_moof_mode(GF_ISOFile *isom_file, Bool mode);
 
-GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing, Bool force_par);
+GF_Err gf_isom_get_file_offset_for_time(GF_ISOFile *movie, Double start_time, u64 *max_offset);
+GF_Err gf_isom_get_sidx_duration(GF_ISOFile *movie, u64 *sidx_dur, u32 *sidx_timescale);
 
-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);
 
-typedef struct ___MasteringDisplayColourVolume GF_MasteringDisplayColourVolumeInfo;
-typedef struct __ContentLightLevel GF_ContentLightLevelInfo;
-GF_Err gf_isom_set_hdr(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_MasteringDisplayColourVolumeInfo *mdcv, GF_ContentLightLevelInfo *clli);
+/*! refreshes a fragmented file
+A file being downloaded may be a fragmented file. In this case only partial info
+is available once the file is successfully open (gf_isom_open_progressive), and since there is
+no information wrt number fragments (which could actually be generated on the fly
+at the sender side), you must call this function on regular basis in order to
+load newly downloaded fragments. Note this may result in Track/Movie duration changes
+and SampleCount change too ...
 
-GF_Err gf_isom_set_image_sequence_coding_constraints(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove, Bool all_ref_pics_intra, Bool intra_pred_used, u32 max_ref_per_pic);
-GF_Err gf_isom_set_image_sequence_alpha(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, Bool remove);
+This function should also be called when using memory read (gmem://) to refresh the underlying bitstream after appendin data to your blob.
+In the case where the file is not fragmented, no further box parsing will be done.
 
-/*passing colour_type=0 will remove all color info*/
-GF_Err gf_isom_set_visual_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 colour_type, u16 colour_primaries, u16 transfer_characteristics, u16 matrix_coefficients, Bool full_range_flag, char *icc_data, u32 icc_size);
+\param isom_file the target ISO file
+\param MissingBytes set to the number of missing bytes to parse the last incomplete top-level box found
+\param new_location if set, the previous bitstream is changed to this new location, otherwise it is refreshed (disk flush)
+\return error if any
+*/
+GF_Err gf_isom_refresh_fragmented(GF_ISOFile *isom_file, u64 *MissingBytes, const char *new_location);
+
+/*! gets the current track fragment decode time of the track (the one of the last fragment parsed).
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the track fragment decode time in media timescale
+*/
+u64 gf_isom_get_current_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)
+*/
+Bool gf_isom_is_smooth_streaming_moov(GF_ISOFile *isom_file);
+
+
+/*! gets default values of samples in a track to use for track fragments default. Each variable is optional and
+if set will contain the default value for this track samples
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param defaultDuration set to the default duration of samples, 0 if not computable
+\param defaultSize set to the default size of samples, 0 if not computable
+\param defaultDescriptionIndex set to the default sample description index of samples, 0 if not computable
+\param defaultRandomAccess set to the default sync flag of samples, 0 if not computable
+\param defaultPadding set to the default padding bits of samples, 0 if not computable
+\param defaultDegradationPriority set to the default degradation priority of samples, 0 if not computable
+\return error if any*/
+GF_Err gf_isom_get_fragment_defaults(GF_ISOFile *isom_file, u32 trackNumber,
+                                     u32 *defaultDuration, u32 *defaultSize, u32 *defaultDescriptionIndex,
+                                     u32 *defaultRandomAccess, u8 *defaultPadding, u16 *defaultDegradationPriority);
 
-/*set SR & nbChans for audio description*/
-typedef enum {
-	GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET = 0,
-	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS,
-	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2,
-	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG,
-	GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF
-} GF_AudioSampleEntryImportMode;
 
-GF_Err gf_isom_set_audio_info(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample, GF_AudioSampleEntryImportMode asemode);
 
-/*set CTS unpack mode (used for B-frames & like): in unpack mode, each sample uses one entry in CTTS tables
-unpack=0: set unpack on - !!creates a CTTS table if none found!!
-unpack=1: set unpack off and repacks all table info
+/*! gets last UTC/timestamp values indicated for the reference track in the file if any (pfrt box)
+\param isom_file the target ISO file
+\param refTrackID set to the ID of the reference track used by the pfrt box
+\param ntp set to the NTP timestamp found
+\param timestamp set to the corresponding media timestamp in refTrackID timescale
+\param reset_info if GF_TRUE, discards current NTP mapping info; this will trigger parsing of the next prft box found. If not set, subsequent pfrt boxes will not be parsed until the function is called with reset_info=GF_TRUE
+\return GF_FALSE if no info found, GF_TRUE if OK
 */
-GF_Err gf_isom_set_cts_packing(GF_ISOFile *the_file, u32 trackNumber, Bool unpack);
-/*modify CTS offset of a given sample (used for B-frames) - MUST be called in unpack mode only*/
-GF_Err gf_isom_modify_cts_offset(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 offset);
-/*shift all CTS with the given offset - MUST be called in unpack mode only*/
-GF_Err gf_isom_shift_cts_offset(GF_ISOFile *the_file, u32 trackNumber, s32 offset_shift);
-
-/*remove CTS offset table (used for B-frames)*/
-GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber);
+Bool gf_isom_get_last_producer_time_box(GF_ISOFile *isom_file, GF_ISOTrackID *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info);
 
-/*set 3-char or BCP-47 code media language*/
-GF_Err gf_isom_set_media_language(GF_ISOFile *the_file, u32 trackNumber, char *code);
-
-/*removes given stream description*/
-GF_Err gf_isom_remove_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 streamDescIndex);
-
-/*sets the RVC config for the given track sample description*/
-GF_Err gf_isom_set_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 rvc_predefined, char *mime, char *data, u32 size);
-
-/*
-	some authoring extensions
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! enables storage of traf templates (serialized sidx/moof/traf without trun/senc) at segment boundaries
+This is mostly used to recreate identical segment information when refragmenting a file
+\param isom_file the target ISO file
 */
-/*sets name for authoring - if name is NULL reset authoring name*/
-GF_Err gf_isom_set_track_name(GF_ISOFile *the_file, u32 trackNumber, char *name);
-/*gets authoring name*/
-const char *gf_isom_get_track_name(GF_ISOFile *the_file, u32 trackNumber);
+void gf_isom_enable_traf_map_templates(GF_ISOFile *isom_file);
 
-/*
-			MPEG-4 Extensions
+/*! Segment boundary information*/
+typedef struct
+{
+	/*! fragment start offset*/
+	u64 frag_start;
+	/*! 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
+	*/
+	u64 seg_start_plus_one;
+
+	/*! serialized array of styp (if present) sidx (if present) and moof with only the current traf*/
+	const u8 *moof_template;
+	/*! size of serialized buffer*/
+	u32 moof_template_size;
+	/*! sidx start, 0 if absent*/
+	u64 sidx_start;
+	/*! sidx end, 0 if absent*/
+	u64 sidx_end;
+} GF_ISOFragmentBoundaryInfo;
+
+/*! checks if a sample is a fragment start
+Only use this function if \ref gf_isom_enable_traf_map_templates has been called
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNum the target sample number
+\param frag_info filled with information on fragment boundaries (optional - can be NULL)
+\return GF_TRUE if this sample was the first sample of a traf in the fragmented source file, GF_FALSE otherwise*/
+Bool gf_isom_sample_is_fragment_start(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNum, GF_ISOFragmentBoundaryInfo *frag_info);
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+/*! resets sample information for all tracks setup. This allows keeping the memory footprint low when playing DASH/CMAF segments
+\note seeking in the file is then no longer possible
+\param isom_file the target ISO file
+\param reset_sample_count if GF_TRUE, sets sample count of all tracks back to 0
+\return error if any
+*/
+GF_Err gf_isom_reset_tables(GF_ISOFile *isom_file, Bool reset_sample_count);
+
+/*! sets the offset for parsing from the input buffer to 0 (used to reclaim input buffer)
+\param isom_file the target ISO file
+\param top_box_start set to the byte offset in the source buffer of the first top level box
+\return error if any
+*/
+GF_Err gf_isom_reset_data_offset(GF_ISOFile *isom_file, u64 *top_box_start);
+
+
+/*! 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
+
+\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.
+\return error if any
 */
+GF_Err gf_isom_release_segment(GF_ISOFile *isom_file, Bool reset_tables);
 
-/*set a profile and level indication for the movie iod (created if needed)
-if the flag is ProfileLevel is 0 this means the movie doesn't require
-the specific codec (equivalent to 0xFF value in MPEG profiles)*/
-GF_Err gf_isom_set_pl_indication(GF_ISOFile *the_file, u8 PL_Code, u8 ProfileLevel);
-
-/*set the rootOD ID of the movie if you need it. By default, movies are created without root ODs*/
-GF_Err gf_isom_set_root_od_id(GF_ISOFile *the_file, u32 OD_ID);
+/*! Flags for gf_isom_open_segment*/
+typedef enum
+{
+	/*! do not check for movie fragment sequence number*/
+	GF_ISOM_SEGMENT_NO_ORDER_FLAG = 1,
+	/*! the segment contains a scalable layer of the last opened segment*/
+	GF_ISOM_SEGMENT_SCALABLE_FLAG = 1<<1,
+} GF_ISOSegOpenMode;
 
-/*set the rootOD URL of the movie if you need it (only needed to create empty file pointing
-to external ressource)*/
-GF_Err gf_isom_set_root_od_url(GF_ISOFile *the_file, char *url_string);
+/*! opens a new segment file. Access to samples in previous segments is no longer possible
+if end_range>start_range, restricts the URL to the given byterange when parsing
 
-/*remove the root OD*/
-GF_Err gf_isom_remove_root_od(GF_ISOFile *the_file);
+\param isom_file the target ISO file
+\param fileName the file name of the new segment to open
+\param start_range the start offset in bytes in the file of the segment data
+\param end_range the end offset in bytes in the file of the segment data
+\param flags flags to use when opening the segment
+\return error if any
+*/
+GF_Err gf_isom_open_segment(GF_ISOFile *isom_file, const char *fileName, u64 start_range, u64 end_range, GF_ISOSegOpenMode flags);
 
-/*Add a system descriptor to the OD of the movie*/
-GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *the_file, GF_Descriptor *theDesc);
+/*! returns the track ID of the track containing the highest enhancement layer for the given base track
+\param isom_file the target ISO file
+\param for_base_track the number of the base track
+\return the track ID of the highest enahnacement track
+*/
+GF_ISOTrackID gf_isom_get_highest_track_in_scalable_segment(GF_ISOFile *isom_file, u32 for_base_track);
 
-/*add a track to the root OD*/
-GF_Err gf_isom_add_track_to_root_od(GF_ISOFile *the_file, u32 trackNumber);
+/*! resets internal info (track fragement decode time, number of samples, next moof number)used with fragments and segment.
+\note This should be called when seeking (with keep_sample_count=0) or when loading a media segments with the same timing as the previously loaded segment
+\param isom_file the target ISO file
+\param keep_sample_count if GF_TRUE, does not reset the sample count on tracks
+*/
+void gf_isom_reset_fragment_info(GF_ISOFile *isom_file, Bool keep_sample_count);
 
-/*remove a track to the root OD*/
-GF_Err gf_isom_remove_track_from_root_od(GF_ISOFile *the_file, u32 trackNumber);
+/*! resets sample count to 0 and next moof number to 0. When doing scalable media, should be called before opening the segment containing
+the base layer in order to make sure the sample count base number is always the same (ie 1) on all tracks
+\param isom_file the target ISO file
+*/
+void gf_isom_reset_sample_count(GF_ISOFile *isom_file);
+/*! resets moof sequence number to 0
+\param isom_file the target ISO file
+*/
+void gf_isom_reset_seq_num(GF_ISOFile *isom_file);
 
-/*Create a new StreamDescription (GF_ESD) in the file. The URL and URN are used to
-describe external media, this will creat a data reference for the media*/
-GF_Err gf_isom_new_mpeg4_description(GF_ISOFile *the_file, u32 trackNumber, GF_ESD *esd, char *URLname, char *URNname, u32 *outDescriptionIndex);
+/*! gets the duration of movie+fragments
+\param isom_file the target ISO file
+\return the duration in movie timescale, 0 if unknown or if error*/
+u64 gf_isom_get_fragmented_duration(GF_ISOFile *isom_file);
 
-/*use carefully. Very useful when you made a lot of changes (IPMP, IPI, OCI, ...)
-THIS WILL REPLACE THE WHOLE DESCRIPTOR ...*/
-GF_Err gf_isom_change_mpeg4_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_ESD *newESD);
+/*! gets the number of fragments or segments when the file is opened in \ref GF_ISOM_OPEN_READ_DUMP mode
+\param isom_file the target ISO file
+\param segments_only if set to GF_TRUE, counts segments (sidx), otherwise counts fragments
+\return the number of segments or fragments
+*/
+u32 gf_isom_get_fragments_count(GF_ISOFile *isom_file, Bool segments_only);
 
-/*Add a system descriptor to the ESD of a stream - you have to delete the descriptor*/
-GF_Err gf_isom_add_desc_to_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc);
+/*! gets total sample number and duration when the file is opened in \ref GF_ISOM_OPEN_READ_DUMP mode
+\param isom_file the target ISO file
+\param trackID the ID of the target track
+\param nb_samples set to the number of samples in the track
+\param duration set to the total duration in media timescale
+\return error if any
+*/
+GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 *nb_samples, u64 *duration);
 
-/*updates average and max bitrate - if 0 for max and avg, removes bitrate info*/
-GF_Err gf_isom_update_bitrate(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, u32 average_bitrate, u32 max_bitrate, u32 decode_buffer_size);
+/*! gets the number of the next moof to be produced
+\param isom_file the target ISO file
+\return number of the next moof
+*/
+u32 gf_isom_get_next_moof_number(GF_ISOFile *isom_file);
 
-/*updates fields of given visual sample description - these fields are reserved in ISOBMFF, this should only be used for QT*/
-GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *file, u32 track, u32 stsd_idx, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, char *compressor_name, s16 color_table_index);
+/*! @} */
+#endif //GPAC_DISABLE_ISOM_FRAGMENTS
 
 
-/*Default extensions*/
+/*!
+\addtogroup isoudta_grp ISOBMFF UserData Manipulation
+\ingroup iso_grp
 
-/*Create a new unknown StreamDescription in the file. The URL and URN are used to
-describe external media, this will creat a data reference for the media
-use this to store media not currently supported by the ISO media format
-*/
-GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, char *URLname, char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex);
+				User Data Manipulation
 
-/*change the data field of an unknown sample description*/
-GF_Err gf_isom_change_generic_sample_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_GenericSampleDescription *udesc);
+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
+	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.
+Otherwise the UUID parameter is ignored
+		Several items with the same ID or UUID can be added (this allows you to store any
+	kind/number of private information under a unique ID / UUID)
 
-/*
-special shortcut for stream description cloning from a given input file (this avoids inspecting for media type)
-@the_file, @trackNumber: destination file and track
-@orig_file, @orig_track, @orig_desc_index: orginal file, track and sample description
-@URLname, @URNname, @outDescriptionIndex: same usage as with gf_isom_new_mpeg4_description
+@{
 */
-GF_Err gf_isom_clone_sample_description(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, u32 orig_desc_index, char *URLname, char *URNname, u32 *outDescriptionIndex);
-
-/*clones all sampleDescription entries in new track, after an optional reset of existing entries*/
-GF_Err gf_isom_clone_sample_descriptions(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, Bool reset_existing);
 
-#define GF_ISOM_CLONE_TRACK_KEEP_DREF	1
-#define GF_ISOM_CLONE_TRACK_NO_QT	1<<1
+/*! gets number of udta (user data) entries of a movie or track
+\param isom_file the target ISO file
+\param trackNumber the target track if not 0; if 0, the movie udta is checked
+\return the number of entries in UDTA*/
+u32 gf_isom_get_udta_count(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! checks type of a given udta entry
+\param isom_file the target ISO file
+\param trackNumber the target track if not 0; if 0, the movie udta is checked
+\param udta_idx 1-based index of the user data to query
+\param UserDataType set to the four character code of the user data entry (optional, can be NULL)
+\param UUID set to the UUID of the user data entry (optional, can be NULL)
+\return error if any*/
+GF_Err gf_isom_get_udta_type(GF_ISOFile *isom_file, u32 trackNumber, u32 udta_idx, u32 *UserDataType, bin128 *UUID);
+
+/*! gets the number of UserDataItems with the same ID / UUID in the desired track or movie
+\param isom_file the target ISO file
+\param trackNumber the target track if not 0; if 0, the movie udta is checked
+\param UserDataType the four character code of the user data entry to query
+\param UUID the UUID of the user data entry
+\return number of UDTA entries with the given type*/
+u32 gf_isom_get_user_data_count(GF_ISOFile *isom_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
+
+/*! gets the UserData for the specified item from the track or the movie
+\param isom_file the target ISO file
+\param trackNumber the target track if not 0; if 0, the movie udta is checked
+\param UserDataType the four character code of the user data entry to query
+\param UUID the UUID of the user data entry
+\param UserDataIndex 1-based index of the user data of the given type to fetch. If 0, all boxes with type==UserDataType will be serialized (including box header and size) in the output buffer
+\param userData set to a newly allocated buffer containing the serialized data - shall be freed by caller, you must pass (userData != NULL && *userData=NULL)
+\param userDataSize set to the size of the allocated buffer
+\return error if any*/
+GF_Err gf_isom_get_user_data(GF_ISOFile *isom_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, u8 **userData, u32 *userDataSize);
 
-/*special shortcut: clones a track (everything except media data and sample info (DTS, CTS, RAPs, etc...)
-also clones sampleDescriptions
-@keep_data_ref: if set, all data references are kept (local ones become external pointing to orig_file name), otherwise all external data refs are removed (track media data will be self-contained)
-@dest_track: track number of cloned track*/
-GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, u32 flags, u32 *dest_track);
-/*special shortcut: clones IOD PLs from orig to dest if any*/
-GF_Err gf_isom_clone_pl_indications(GF_ISOFile *orig, GF_ISOFile *dest);
-/*clones root OD from input to output file, without copying root OD track references*/
-GF_Err gf_isom_clone_root_od(GF_ISOFile *input, GF_ISOFile *output);
-
-/*clones the entire movie file to destination. Tracks can be cloned if clone_tracks is set, in which case hint tracks can be
-kept if keep_hint_tracks is set
-if keep_pssh, all pssh boxes will be kept
-fragment information (mvex) is not kept*/
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh, Bool create_mvex_after_traks);
-
-/*returns true if same set of sample description in both tracks - this does include self-contained checking
-and reserved flags. The specific media cfg (DSI & co) is not analysed, only
-a brutal memory comparaison is done*/
-Bool gf_isom_is_same_sample_description(GF_ISOFile *f1, u32 tk1, u32 sdesc_index1, GF_ISOFile *f2, u32 tk2, u32 sdesc_index2);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gf_isom_set_JPEG2000(GF_ISOFile *mov, Bool set_on);
+/*! adds a user data item in the desired track or in the movie
+\param isom_file the target ISO file
+\param trackNumber the target track for the user data; if 0, adds user data to the movie
+\param UserDataType the user data four character code type
+\param UUID the user data UUID
+\param data the data to add, may be NULL
+\param size the size of the data to add, shall be 0 when data is NULL
+\return error if any
+*/
+GF_Err gf_isom_add_user_data(GF_ISOFile *isom_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u8 *data, u32 size);
+
+/*! removes all user data items from a track or movie
+\param isom_file the target ISO file
+\param trackNumber the target track for the user data; if 0, adds user data to the movie
+\param UserDataType the user data four character code type
+\param UUID the user data UUID
+\return error if any
+*/
+GF_Err gf_isom_remove_user_data(GF_ISOFile *isom_file, u32 trackNumber, u32 UserDataType, bin128 UUID);
+
+/*! removes a user data item from a track or movie
+use the UDAT read functions to get the item index
+\param isom_file the target ISO file
+\param trackNumber the target track for the user data; if 0, adds user data to the movie
+\param UserDataType the user data four character code type
+\param UUID the user data UUID
+\param UserDataIndex the 1-based index of the user data item to remove - see \ref gf_isom_get_user_data_count
+\return error if any
+*/
+GF_Err gf_isom_remove_user_data_item(GF_ISOFile *isom_file, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex);
+
+/*! adds a user data item in a track or movie using a serialzed buffer of ISOBMFF boxes
+\param isom_file the target ISO file
+\param trackNumber the target track for the udta box; if 0, add the udta to the movie;
+\param data the serialized udta box to add, shall not be NULL
+\param size the size of the data to add
+\return error if any
+*/
+GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *isom_file, u32 trackNumber, u8 *data, u32 size);
+
+/*! gets serialized user data box of a movie
+\param isom_file the destination ISO file
+\param output will be set to a newly allocated buffer containing the serialized box - caller shall free it
+\param output_size will be set to the size of the allocated buffer
+\return error if any
+*/
+GF_Err gf_isom_get_raw_user_data(GF_ISOFile *isom_file, u8 **output, u32 *output_size);
 
-/* sample information for all tracks setup are reset. This allows keeping the memory
-footprint low when playing segments. Note however that seeking in the file is then no longer possible*/
-GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count);
-/* sets the offset for parsing from the input buffer to 0 (used to reclaim input buffer)*/
-GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start);
-
-/*releases current movie segment - this closes the associated file IO object.
-If reset_tables is 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. Note however that seeking in the file is then no longer; possible
-WARNING - the sample count is not reset after the release of tables. This means you need to keep counting samples.*/
-GF_Err gf_isom_release_segment(GF_ISOFile *movie, Bool reset_tables);
+#endif //GPAC_DISABLE_ISOM_WRITE
 
-/*Flags for gf_isom_open_segment*/
-enum
-{
-	/*FLAT: the MediaData (MPEG4 ESs) is stored at the beginning of the file*/
-	GF_ISOM_SEGMENT_NO_ORDER_FLAG = 1,
-	GF_ISOM_SEGMENT_SCALABLE_FLAG = 1<<1,
-};
+/*! @} */
 
-/*opens a new segment file. Access to samples in previous segments is no longer possible
-if end_range>start_range, restricts the URL to the given byterange when parsing*/
-GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, u32 flags);
 
-/*returns track ID of the traf containing the highest enhancement layer for the given base track*/
-u32 gf_isom_get_highest_track_in_scalable_segment(GF_ISOFile *movie, u32 for_base_track);
+#if !defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+/*!
+\addtogroup isofragwrite_grp Fragmented ISOBMFF Writing
+\ingroup iso_grp
 
-/*
 			Movie Fragments Writing API
 		Movie Fragments is a feature of ISO media files for fragmentation
 	of a presentation meta-data and interleaving with its media data.
@@ -1548,34 +3878,47 @@
 		* Movie Fragments can only be used in GF_ISOM_OPEN_WRITE mode (capturing)
   and no editing functionalities can be used
 		* the fragmented movie API uses TrackID and not TrackNumber
-*/
 
-/*
-setup a track for fragmentation by specifying some default values for
-storage efficiency
-*TrackID: track identifier
-*DefaultStreamDescriptionIndex: the default description used by samples in this track
-*DefaultSampleDuration: default duration of samples in this track
-*DefaultSampleSize: default size of samples in this track (0 if unknown)
-*DefaultSampleIsSync: default key-flag (RAP) of samples in this track
-*DefaultSamplePadding: default padding bits for samples in this track
-*DefaultDegradationPriority: default degradation priority for samples in this track
-*force_traf_flags: if 1, will ignore these default in each traf but will still write them in moov
+@{
+*/
 
-If all the defaults are 0, traf flags will alwaus be used to signal them.
+/*! sets up a track for fragmentation by specifying some default values for storage efficiency
+\note If all the defaults are 0, traf flags will always be used to signal them.
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param DefaultSampleDescriptionIndex the default description used by samples in this track
+\param DefaultSampleDuration default duration of samples in this track
+\param DefaultSampleSize default size of samples in this track (0 if unknown)
+\param DefaultSampleIsSync default key-flag (RAP) of samples in this track
+\param DefaultSamplePadding default padding bits for samples in this track
+\param DefaultDegradationPriority default degradation priority for samples in this track
+\param force_traf_flags if GF_TRUE, will ignore these default in each traf but will still write them in moov
+\return error if any
 */
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID,
-                                    u32 DefaultStreamDescriptionIndex,
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *isom_file, GF_ISOTrackID TrackID,
+                                    u32 DefaultSampleDescriptionIndex,
                                     u32 DefaultSampleDuration,
                                     u32 DefaultSampleSize,
                                     u8 DefaultSampleIsSync,
                                     u8 DefaultSamplePadding,
                                     u16 DefaultDegradationPriority,
-									u8 force_traf_flags);
+									Bool force_traf_flags);
+
+/*! changes the default parameters of an existing trak fragment
+\warning should not be used if samples have already been added
 
-/*change the default parameters of an existing trak fragment - should not be used if samples have
-already been added - semantics are the same as in gf_isom_setup_track_fragment*/
-GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, u32 TrackID,
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param DefaultSampleDescriptionIndex the default description used by samples in this track
+\param DefaultSampleDuration default duration of samples in this track
+\param DefaultSampleSize default size of samples in this track (0 if unknown)
+\param DefaultSampleIsSync default key-flag (RAP) of samples in this track
+\param DefaultSamplePadding default padding bits for samples in this track
+\param DefaultDegradationPriority default degradation priority for samples in this track
+\param force_traf_flags if GF_TRUE, will ignore these default in each traf but will still write them in moov
+\return error if any
+*/
+GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *isom_file, GF_ISOTrackID TrackID,
         u32 DefaultSampleDescriptionIndex,
         u32 DefaultSampleDuration,
         u32 DefaultSampleSize,
@@ -1584,1018 +3927,1780 @@
         u16 DefaultDegradationPriority,
         u8 force_traf_flags);
 
-/*flushes data to disk and prepare movie fragmentation
-@media_segment_type: 0 if no segments, 1 if regular segment, 2 if single segment*/
-GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *the_file, u32 media_segment_type);
-
-/*sets the duration of the movie in case of movie fragments*/
-GF_Err gf_isom_set_movie_duration(GF_ISOFile *movie, u64 duration);
-
-/*starts a new movie fragment - if force_cache is set, fragment metadata will be written before
-fragment media data for all tracks*/
-GF_Err gf_isom_start_fragment(GF_ISOFile *movie, Bool moof_first);
-
-/*starts a new segment in the file. If SegName is given, the output will be written in the SegName file. If memory_mode is set, all samples writing is done in memory rather than on disk*/
-GF_Err gf_isom_start_segment(GF_ISOFile *movie, const char *SegName, Bool memory_mode);
-
-/*sets the baseMediaDecodeTime of the first sample of the given track*/
-GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, u32 TrackID, u64 decode_time);
-
-/*enables mfra when writing movie fragments*/
-GF_Err gf_isom_enable_mfra(GF_ISOFile *file);
-
-/*sets Microsoft Smooth Streaming traf 'tfxd' box info, written at the end of each traf*/
-GF_Err gf_isom_set_traf_mss_timeext(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp_in_10mhz, u64 traf_duration_in_10mhz);
-
-/*closes current segment - if fragments_per_sidx is <0, no sidx is used - if fragments_per_sidx is ==0, a single sidx is used
-timestamp_shift is the constant difference between media time and presentation time (derived from edit list)
-out_seg_size is optional, holds the segment size in bytes
+/*! flushes data to disk and prepare movie fragmentation
+\param isom_file the target ISO file
+\param media_segment_type 0 if no segments, 1 if regular segment, 2 if single segment
+\param mvex_after_tracks forces writing mvex box after track boxes
+\return error if any
+*/
+GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *isom_file, u32 media_segment_type, Bool mvex_after_tracks);
+
+/*! 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
+\return error if any
 */
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegs_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 timestamp_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size);
+GF_Err gf_isom_set_movie_duration(GF_ISOFile *isom_file, u64 duration);
 
-/*writes any pending fragment to file for low-latency output. shall only be used if no SIDX is used (subsegs_per_sidx<0 or flushing all fragments before calling gf_isom_close_segment)*/
-GF_Err gf_isom_flush_fragments(GF_ISOFile *movie, Bool last_segment);
-
-//gets name of current segment (or last segment if called between close_segment and start_segment)
-const char *gf_isom_get_segment_name(GF_ISOFile *movie);
-
-/*sets fragment prft box info, written just before the moof*/
-GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp, u64 timestamp);
-
-/*writes an empty sidx in the current movie. The SIDX will be forced to have nb_segs entries - nb_segs shall match the number of calls to
-gf_isom_close_segment that will follow. This avoids wasting time and disk space moving data around. Once gf_isom_close_segment has then been called nb_segs times,
-the pre-allocated SIDX is destroyed and sucessive calls to gf_isom_close_segment will create their own sidx (unless gf_isom_allocate_sidx is called again).
-frags_per_sidx, daisy_chain_sidx and frags_per_segment are currently ignored and reserved for future usages where multiple SIDX could be written
-if not NULL, start_range and end_range will contain the byte range of the SIDX box in the movie*/
-GF_Err gf_isom_allocate_sidx(GF_ISOFile *movie, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range, Bool use_ssix);
+/*! fragment creatio option*/
+typedef enum
+{
+	/*! moof is stored before mdat - will require temporary storage of data in memory*/
+	GF_ISOM_FRAG_MOOF_FIRST = 1,
+#ifdef GF_ENABLE_CTRN
+	/*! use compact fragment syntax*/
+	GF_ISOM_FRAG_USE_COMPACT = 1<<1,
+#endif
+} GF_ISOStartFragmentFlags;
+/*! starts a new movie fragment
+\param isom_file the target ISO file
+\param moof_first if GF_TRUE, the moof will be written before the mdat
+\return error if any
+*/
+GF_Err gf_isom_start_fragment(GF_ISOFile *isom_file, GF_ISOStartFragmentFlags moof_first);
+
+/*! starts a new segment in the file
+\param isom_file the target ISO file
+\param SegName if not NULL, the output will be written in the SegName file. If NULL, segment will be created in same file as movie. 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 memory_mode if set, all samples writing is done in memory rather than on disk. Ignored in callback mode
+\return error if any
+*/
+GF_Err gf_isom_start_segment(GF_ISOFile *isom_file, const char *SegName, Bool memory_mode);
+
+/*! sets the baseMediaDecodeTime of the first sample of the given track
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param decode_time the decode time in media timescale
+\return error if any
+*/
+GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, u64 decode_time);
+
+/*! enables mfra (movie fragment random access computing) when writing movie fragments
+\note this should only be used when generating segments in a single file
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_enable_mfra(GF_ISOFile *isom_file);
+
+/*! sets Microsoft Smooth Streaming traf 'tfxd' box info, written at the end of each traf
+\param isom_file the target ISO file
+\param reference_track_ID ID of the reference track giving the media timescale
+\param decode_traf_time decode time of the first sample in the segment in media timescale (hardcoded to 10MHz in Smooth)
+\param traf_duration duration of all samples in the traf in media timescale (hardcoded to 10MHz in Smooth)
+\return error if any
+*/
+GF_Err gf_isom_set_traf_mss_timeext(GF_ISOFile *isom_file, GF_ISOTrackID reference_track_ID, u64 decode_traf_time, u64 traf_duration);
+
+/*! closes current segment, producing a segment index box if desired
+\param isom_file the target ISO file
+\param subsegs_per_sidx number of subsegments per sidx box; a negative value disables sidx, 0 forces a single sidx for the segment (or subsegment)
+\param referenceTrackID the ID of the track used as a reference for the segment index box
+\param ref_track_decode_time the decode time fo the first sample in the reference track for this segment
+\param timestamp_shift the constant difference between media time and presentation time (derived from edit list)
+\param ref_track_next_cts the CTS of the first sample in the reference track in the next segment
+\param daisy_chain_sidx if GF_TRUE, indicates chained sidx shall be used. Otherwise, an array of indexes is used
+\param use_ssix if GF_TRUE, produces an ssix box using I-frames as first level and all other frames as second level
+\param last_segment indicates if this is the last segment of the session
+\param close_segment_handle if set to GF_TRUE, the associated file if any will be closed
+\param segment_marker_4cc a four character code used to insert an empty box at the end of the saegment with the given type. If 0, no such box is inserted
+\param index_start_range set to the start offset in bytes of the segment in the media file
+\param index_end_range set to the end offset in bytes of the segment in the media file
+\param out_seg_size set to the segment size in bytes (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_close_segment(GF_ISOFile *isom_file, s32 subsegs_per_sidx, GF_ISOTrackID referenceTrackID, u64 ref_track_decode_time, s32 timestamp_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size);
+
+/*! writes any pending fragment to file for low-latency output.
+\warning This shall only be used if no SIDX is used: subsegs_per_sidx<0 or flushing all fragments before calling \ref gf_isom_close_segment
+
+\param isom_file the target ISO file
+\param last_segment indicates if this is the last segment of the session
+\return error if any
+*/
+GF_Err gf_isom_flush_fragments(GF_ISOFile *isom_file, Bool last_segment);
+
+/*! gets name of current segment (or last segment if called between close_segment and start_segment)
+\param isom_file the target ISO file
+\return associated file name of the segment
+*/
+const char *gf_isom_get_segment_name(GF_ISOFile *isom_file);
+
+/*! sets fragment prft box info, written just before the moof
+\param isom_file the target ISO file
+\param reference_track_ID the ID of the track used as a reference for media timestamps
+\param ntp absolute NTP time
+\param timestamp media time corresponding to the NTP time, in reference track media timescale
+\return error if any
+*/
+GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *isom_file, GF_ISOTrackID reference_track_ID, u64 ntp, u64 timestamp);
+
+/*! writes an empty sidx in the current movie.
+
+The SIDX will be forced to have nb_segs entries, and nb_segs shall match the number of calls to
+\ref gf_isom_close_segment that will follow.
+This avoids wasting time and disk space moving data around. Once \ref gf_isom_close_segment has then been called nb_segs times,
+the pre-allocated SIDX is destroyed and successive calls to \ref gf_isom_close_segment will create their own sidx, unless gf_isom_allocate_sidx is called again.
+
+\param isom_file the target ISO file
+\param subsegs_per_sidx reserved to 0, currently ignored
+\param daisy_chain_sidx reserved to 0, currently ignored
+\param nb_segs number of entries in the segment index
+\param frags_per_segment reserved, currently ignored
+\param start_range set to the start offset in bytes of the segment index box
+\param end_range set to the end offset in bytes of the segment index box
+\param use_ssix if GF_TRUE, produces an ssix box using I-frames as first level and all other frames as second level
+\return error if any
+*/
+GF_Err gf_isom_allocate_sidx(GF_ISOFile *isom_file, s32 subsegs_per_sidx, Bool daisy_chain_sidx, u32 nb_segs, u32 *frags_per_segment, u32 *start_range, u32 *end_range, Bool use_ssix);
+
+/*! sets up track fragment defaults using the given template. The template shall be a serialized array of one or more trex boxes
+
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param boxes serialized array of trex boxes
+\param boxes_size size of the serialized array
+\param force_traf_flags if GF_TRUE, will ignore these default in each traf but will still write them in moov
+\return error if any
+*/
+GF_Err gf_isom_setup_track_fragment_template(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, u8 *boxes, u32 boxes_size, u8 force_traf_flags);
+
+/*! enables track fragment inheriting from a given traf.
+This shall only be set when the inherited traf shares exactly the same syntax except the sample sizes, this library does not compute which
+sample values can be inherited
+
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param BaseTrackID ID of the track from which sample values are inherited in track fragments
+\return error if any
+*/
+GF_Err gf_isom_enable_traf_inherit(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, GF_ISOTrackID BaseTrackID);
 
-enum
+/*! Track fragment options*/
+typedef enum
 {
-	/*indicates that the track fragment has no samples but still has a duration
+	/*! indicates that the track fragment has no samples but still has a duration
 	(silence-detection in audio codecs, ...).
 	param: indicates duration*/
 	GF_ISOM_TRAF_EMPTY,
-	/*I-Frame detection: this can reduce file size by detecting I-frames and
+	/*! I-Frame detection: this can reduce file size by detecting I-frames and
 	optimizing sample flags (padding, priority, ..)
 	param: on/off (0/1)*/
 	GF_ISOM_TRAF_RANDOM_ACCESS,
-	/*activate data cache on track fragment. This is useful when writing interleaved
+	/*! activate data cache on track fragment. This is useful when writing interleaved
 	media from a live source (typically audio-video), and greatly reduces file size
 	param: Number of samples (> 1) to cache before disk flushing. You shouldn't try
 	to cache too many samples since this will load your memory. base that on FPS/SR*/
 	GF_ISOM_TRAF_DATA_CACHE,
-	/*forces moof base offsets when traf based offsets would be chosen
+	/*! forces moof base offsets when traf based offsets would be chosen
 	param: on/off (0/1)*/
-	GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET
-};
-
-/*set options. Options can be set at the beginning of each new fragment only, and for the
-lifetime of the fragment*/
-GF_Err gf_isom_set_fragment_option(GF_ISOFile *the_file, u32 TrackID, u32 Code, u32 param);
-
-
-/*adds a sample to a fragmented track
-
-*TrackID: destination track
-*sample: sample to add
-*StreamDescriptionIndex: stream description for this sample. If 0, the default one
+	GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET,
+	/*! use sdtp box in traf rather than storing sample deps in trun entry. param values are:
+		0: disables sdtp
+		1: enables sdtp and disables sample dependency flags in trun
+		2: enables sdtp and also use sample dependency flags in trun
+	*/
+	GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX,
+	/*! forces new trun at next sample add
+	param: ignored*/
+	GF_ISOM_TRUN_FORCE,
+	/*! sets interleave group ID of the  next sample add. Samples with lower interleave ID will be stored first, creating new trun whenever a new group is detected
+	This will enable data cache
+	param: interleave ID*/
+	GF_ISOM_TRUN_SET_INTERLEAVE_ID,
+} GF_ISOTrackFragmentOption;
+
+/*! sets a track fragment option. Options can be set at the beginning of each new fragment only, and for the
+lifetime of the fragment
+\param isom_file the target ISO file
+\param TrackID ID of the target track
+\param Code the option type to set
+\param param the option value
+\return error if any
+*/
+GF_Err gf_isom_set_fragment_option(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, GF_ISOTrackFragmentOption Code, u32 param);
+
+/*! adds a sample to a fragmented track
+
+\param isom_file the target ISO file
+\param TrackID destination track
+\param sample sample to add
+\param sampleDescriptionIndex sample description for this sample. If 0, the default one
 is used
-*Duration: sample duration.
-Note: because of the interleaved nature of the meta/media data, the sample duration
-MUST be provided (in case of regular tracks, this was computed internally by the lib)
-*PaddingBits: padding bits for the sample, or 0
-*DegradationPriority for the sample, or 0
-*redundantCoding: indicates this is samples acts as a sync shadow point
-
+\param Duration sample duration; the sample duration MUST be provided at least for the last sample (for intermediate samples, it is recomputed internally by the lib)
+\param PaddingBits padding bits for the sample, or 0
+\param DegradationPriority for the sample, or 0
+\param redundantCoding indicates this is samples acts as a sync shadow point
+\return error if any
 */
-
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, const GF_ISOSample *sample,
-                                   u32 StreamDescriptionIndex,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, const GF_ISOSample *sample,
+                                   u32 sampleDescriptionIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundantCoding);
 
-/*appends data into last sample of track for video fragments/other media
-CANNOT be used with OD tracks*/
-GF_Err gf_isom_fragment_append_data(GF_ISOFile *the_file, u32 TrackID, char *data, u32 data_size, u8 PaddingBits);
-
-/*reset internal info used with fragments and segment. Should be called when seeking (with keep_sample_count=0) or when loading a media segments with the same timing as the previously loaded segment*/
-void gf_isom_reset_fragment_info(GF_ISOFile *movie, Bool keep_sample_count);
-
-/*reset sample count to 0 and next moof number to 0. When doint scalable media, should be called before opening the segment containing
-the base layer in order to make sure the sample count base number is always the same (ie 1) on all tracks*/
-void gf_isom_reset_sample_count(GF_ISOFile *movie);
-
-void gf_isom_reset_seq_num(GF_ISOFile *movie);
-
-/*return the duration of the movie+fragments if known, 0 if error*/
-u64 gf_isom_get_fragmented_duration(GF_ISOFile *movie);
-/*returns the number of sidx boxes*/
-u32 gf_isom_get_fragments_count(GF_ISOFile *movie, Bool segments_only);
-/*gets total sample number and duration*/
-GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *movie, u32 trackID, u32 *nb_samples, u64 *duration);
-
-GF_Err gf_isom_fragment_add_sai(GF_ISOFile *output, GF_ISOFile *input, u32 TrackID, u32 SampleNum);
-GF_Err gf_isom_clone_pssh(GF_ISOFile *output, GF_ISOFile *input, Bool in_moof);
-
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-GF_Err gf_isom_set_sync_table(GF_ISOFile *the_file, u32 trackNumber);
-
-/******************************************************************
-		GENERIC Publishing API
-******************************************************************/
-
-/*Removes all sync shadow entries for a given track. The shadow samples are NOT removed; they must be removed
-by the user app*/
-GF_Err gf_isom_remove_sync_shadows(GF_ISOFile *the_file, u32 trackNumber);
-
-/*Use this function to do the shadowing if you use shadowing.
-the sample to be shadowed MUST be a non-sync sample (ignored if not)
-the sample shadowing must be a Sync sample (error if not)*/
-GF_Err gf_isom_set_sync_shadow(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 syncSample);
-
-/*set the GroupID of a track (only used for optimized interleaving). By setting GroupIDs
-you can specify the storage order for media data of a group of streams. This is useful
-for BIFS presentation so that static resources of the scene can be downloaded before BIFS*/
-GF_Err gf_isom_set_track_interleaving_group(GF_ISOFile *the_file, u32 trackNumber, u32 GroupID);
-
-/*set the priority of a track within a Group (used for optimized interleaving and hinting).
-This allows tracks to be stored before other within a same group, for instance the
-hint track data can be stored just before the media data, reducing disk seeking
-for a same time, within a group of tracks, the track with the lowest inversePriority will
-be written first*/
-GF_Err gf_isom_set_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber, u32 InversePriority);
-
-GF_Err gf_isom_hint_max_chunk_size(GF_ISOFile *the_file, u32 trackNumber, u32 maxChunkSize);
-
-/*associate a given SL config with a given ESD while extracting the OD information
-all the SL params must be fixed by the calling app!
-The SLConfig is stored by the API for further use. A NULL pointer will result
-in using the default SLConfig (predefined = 2) remapped to predefined = 0
-This is useful while reading the IOD / OD stream of an MP4 file. Note however that
-only full AUs are extracted, therefore the calling application must SL-packetize the streams*/
-GF_Err gf_isom_set_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig *slConfig);
-
-GF_Err gf_isom_get_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig **slConfig);
+/*! appends data into last sample of track for video fragments/other media
+\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
+\param data_size the size of the data to append
+\param PaddingBits padding bits for the sample, or 0
+\return error if any
+*/
+GF_Err gf_isom_fragment_append_data(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits);
+
+
+/*! 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 use_subsample indicates if the media uses CENC subsamples
+\param use_saio_32bit indicates if 32-bit saio shall be used
+\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);
+/*! clones PSSH data between two files
+\param dst_file the target ISO file
+\param src_file the source ISO file
+\param in_moof if GF_TRUE, indicates the pssh should be cloned in current moof box
+\return error if any
+*/
+GF_Err gf_isom_clone_pssh(GF_ISOFile *dst_file, GF_ISOFile *src_file, Bool in_moof);
+/*! sets roll information for a sample in a track fragment
+\param isom_file the target ISO file
+\param trackID the ID of the target track
+\param sample_number the sample number of the last sample
+\param is_roll set to GF_TRUE to indicate the sample is a roll sample, GF_FALSE otherwise
+\param roll_distance set to the roll distance for a roll sample
+\return error if any
+*/
+GF_Err gf_isom_fragment_set_sample_roll_group(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 sample_number, Bool is_roll, s16 roll_distance);
+
+/*! sets rap information for a sample in a track fragment
+\param isom_file the target ISO file
+\param trackID the ID of the target track
+\param sample_number_in_frag the sample number of the sample in the traf
+\param is_rap set to GF_TRUE to indicate the sample is a RAP sample (open-GOP), GF_FALSE otherwise
+\param num_leading_samples set to the number of leading pictures for a RAP sample
+\return error if any
+*/
+GF_Err gf_isom_fragment_set_sample_rap_group(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 sample_number_in_frag, Bool is_rap, u32 num_leading_samples);
+
+/*! sets sample dependency flags in a track fragment - see ISO/IEC 14496-12 and \ref gf_filter_pck_set_dependency_flags
+\param isom_file the target ISO file
+\param trackID the ID of the target track
+\param is_leading indicates that the sample is a leading picture
+\param dependsOn indicates the sample dependency towards other samples
+\param dependedOn indicates the sample dependency from other samples
+\param redundant indicates that the sample contains redundant coding
+\return error if any
+*/
+GF_Err gf_isom_fragment_set_sample_flags(GF_ISOFile *isom_file, GF_ISOTrackID trackID, u32 is_leading, u32 dependsOn, u32 dependedOn, u32 redundant);
+
+
+/*! 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
+*/
+void gf_isom_set_next_moof_number(GF_ISOFile *isom_file, u32 value);
 
-u32 gf_isom_get_track_group(GF_ISOFile *the_file, u32 trackNumber);
-u32 gf_isom_get_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber);
 
-/*stores movie config (storage mode, interleave time, track groupIDs, priorities and names) in UDTA(kept on disk)
-if @remove_all is set, removes all stored info, otherwise recompute all stored info*/
-GF_Err gf_isom_store_movie_config(GF_ISOFile *the_file, Bool remove_all);
-/*restores movie config (storage mode, interleave time, track groupIDs, priorities and names) if found*/
-GF_Err gf_isom_load_movie_config(GF_ISOFile *the_file);
+/*! @} */
+#endif// !defined(GPAC_DISABLE_ISOM_FRAGMENTS) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
-/*setup interleaving for storage (shortcut for storeage mode + interleave_time)*/
-GF_Err gf_isom_make_interleave(GF_ISOFile *mp4file, Double TimeInSec);
 
+/*!
+\addtogroup isortp_grp ISOBMFF RTP Hinting
+\ingroup iso_grp
 
-/******************************************************************
-		GENERIC HINTING WRITING API
-******************************************************************/
+@{
+*/
 
-/*supported hint formats - ONLY RTP now*/
-enum
+/*! supported hint formats - ONLY RTP now*/
+typedef enum
 {
+	/*! RTP hint type*/
 	GF_ISOM_HINT_RTP = GF_4CC('r', 't', 'p', ' '),
-};
-
-#ifndef GPAC_DISABLE_ISOM_HINTING
+} GF_ISOHintFormat;
 
+#if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_ISOM_HINTING)
 
-/*Setup the resources based on the hint format
-This function MUST be called after creating a new hint track and before
-any other calls on this track*/
-GF_Err gf_isom_setup_hint_track(GF_ISOFile *the_file, u32 trackNumber, u32 HintType);
-
-/*Create a HintDescription for the HintTrack
-the rely flag indicates whether a reliable transport protocol is desired/required
+/*! sets up a hint track based on the hint format
+\warning This function MUST be called after creating a new hint track and before any other calls on this track
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintType the desired hint type
+\return error if any
+*/
+GF_Err gf_isom_setup_hint_track(GF_ISOFile *isom_file, u32 trackNumber, GF_ISOHintFormat HintType);
+
+/*! creates a HintDescription for the HintTrack
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintTrackVersion version of hint track
+\param LastCompatibleVersion last compatible version of hint track
+\param Rely flag indicating whether a reliable transport protocol is desired/required
 for data transport
 	0: not desired (UDP/IP). NB: most RTP streaming servers only support UDP/IP for data
 	1: preferable (TCP/IP if possible or UDP/IP)
 	2: required (TCP/IP only)
-The HintDescriptionIndex is set, to be used when creating a HINT sample
+\param HintDescriptionIndex is set to the newly created hint sample description index
+\return error if any
 */
-GF_Err gf_isom_new_hint_description(GF_ISOFile *the_file, u32 trackNumber, s32 HintTrackVersion, s32 LastCompatibleVersion, u8 Rely, u32 *HintDescriptionIndex);
-
-/*Starts a new sample for the hint track. A sample is just a collection of packets
-the transmissionTime is indicated in the media timeScale of the hint track*/
-GF_Err gf_isom_begin_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TransmissionTime);
+GF_Err gf_isom_new_hint_description(GF_ISOFile *isom_file, u32 trackNumber, s32 HintTrackVersion, s32 LastCompatibleVersion, u8 Rely, u32 *HintDescriptionIndex);
 
-/*stores the hint sample in the file once all your packets for this sample are done
-set IsRandomAccessPoint if you want to indicate that this is a random access point
-in the stream*/
-GF_Err gf_isom_end_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u8 IsRandomAccessPoint);
+/*! starts a new sample for the hint track. A sample is just a collection of packets
+the transmissionTime is indicated in the media timeScale of the hint track
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintDescriptionIndex the target hint sample description index
+\param TransmissionTime the target transmission time in hint media timescale
+\return error if any
+*/
+GF_Err gf_isom_begin_hint_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TransmissionTime);
+
+/*! ends an hint sample once all your packets for this sample are done
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param IsRandomAccessPoint set to GF_TRUE if you want to indicate that this is a random access point in the stream
+\return error if any
+*/
+GF_Err gf_isom_end_hint_sample(GF_ISOFile *isom_file, u32 trackNumber, u8 IsRandomAccessPoint);
 
 
-/******************************************************************
+/*!
 		PacketHandling functions
 		Data can be added at the end or at the beginning of the current packet
 		by setting AtBegin to 1 the data will be added at the beginning
 		This allows constructing the packet payload before any meta-data
-******************************************************************/
+*/
 
-/*adds a blank chunk of data in the sample that is skipped while streaming*/
-GF_Err gf_isom_hint_blank_data(GF_ISOFile *the_file, u32 trackNumber, u8 AtBegin);
+/*! 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
+\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
+/*! 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
-to add small blocks of data (encrypted parts, specific headers, ...)*/
-GF_Err gf_isom_hint_direct_data(GF_ISOFile *the_file, u32 trackNumber, char *data, u32 dataLength, u8 AtBegin);
-
-/*adds a reference to some sample data in the packet
-SourceTrackID: the ID of the track where the referenced sample is
-SampleNumber: the sample number containing the data to be added
-DataLength: the length of bytes to copy in the packet
-offsetInSample: the offset in bytes in the sample at which to begin copying data
-
-extra_data: only used when the sample is actually the sample that will contain this packet
+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
+\return error if any
+*/
+GF_Err gf_isom_hint_direct_data(GF_ISOFile *isom_file, u32 trackNumber, u8 *data, u32 dataLength, u8 AtBegin);
+
+/*! adds a reference to some sample data in the packet
+\note if you want to reference a previous HintSample in the hintTrack, you will have to parse the sample yourself ...
+
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param SourceTrackID the ID of the track where the referenced sample is
+\param SampleNumber the sample number containing the data to be added
+\param DataLength the length of bytes to copy in the packet
+\param offsetInSample the offset in bytes in the sample at which to begin copying data
+\param extra_data only used when the sample is actually the sample that will contain this packet
 (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
-
-Note that if you want to reference a previous HintSample in the hintTrack, you will
-have to parse the sample yourself ...
+\param AtBegin indicates if the blank chunk should be at the end or at the begining of the hint packet
+\return error if any
 */
-GF_Err gf_isom_hint_sample_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 SampleNumber, u16 DataLength, u32 offsetInSample, char *extra_data, u8 AtBegin);
+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);
 
 
-/*adds a reference to some stream description data in the packet (headers, ...)
-SourceTrackID: the ID of the track where the referenced sample is
-StreamDescriptionIndex: the index of the stream description in the desired track
-DataLength: the length of bytes to copy in the packet
-offsetInDescription: the offset in bytes in the description at which to begin copying data
-
-Since it is far from being obvious what this offset is, we recommend not using this
-function. The ISO Media Format specification is currently being updated to solve
-this issue*/
-GF_Err gf_isom_hint_sample_description_data(GF_ISOFile *the_file, u32 trackNumber, u32 SourceTrackID, u32 StreamDescriptionIndex, u16 DataLength, u32 offsetInDescription, u8 AtBegin);
+/*! adds a reference to some stream description data in the packet (headers, ...)
 
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param SourceTrackID the ID of the track where the referenced sample is
+\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
+\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);
 
-/******************************************************************
-		RTP SPECIFIC WRITING API
-******************************************************************/
 
-/*Creates a new RTP packet in the HintSample. If a previous packet was created,
+/*! creates a new RTP packet in the HintSample. If a previous packet was created,
 it is stored in the hint sample and a new packet is created.
-- relativeTime: RTP time offset of this packet in the HintSample if any - in hint track
-time scale. Used for data smoothing by servers.
-- PackingBit: the 'P' bit of the RTP packet header
-- eXtensionBit: the'X' bit of the RTP packet header
-- MarkerBit: the 'M' bit of the RTP packet header
-- PayloadType: the payload type, on 7 bits, format 0x0XXXXXXX
-- B_frame: indicates if this is a B-frame packet. Can be skipped by a server
-- IsRepeatedPacket: indicates if this is a duplicate packet of a previous one.
-Can be skipped by a server
-- SequenceNumber: the RTP base sequence number of the packet. Because of support for repeated
-packets, you have to set the sequence number yourself.*/
-GF_Err gf_isom_rtp_packet_begin(GF_ISOFile *the_file, u32 trackNumber, s32 relativeTime, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 PayloadType, u8 B_frame, u8 IsRepeatedPacket, u16 SequenceNumber);
 
-/*set the flags of the RTP packet*/
-GF_Err gf_isom_rtp_packet_set_flags(GF_ISOFile *the_file, u32 trackNumber, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 disposable_packet, u8 IsRepeatedPacket);
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param relativeTime RTP time offset of this packet in the HintSample if any - in hint track
+time scale. Used for data smoothing by servers.
+\param PackingBit the 'P' bit of the RTP packet header
+\param eXtensionBit the'X' bit of the RTP packet header
+\param MarkerBit the 'M' bit of the RTP packet header
+\param PayloadType the payload type, on 7 bits, format 0x0XXXXXXX
+\param disposable_packet indicates if this packet can be skipped by a server
+\param IsRepeatedPacket indicates if this is a duplicate packet of a previous one and can be skipped by a server
+\param SequenceNumber the RTP base sequence number of the packet. Because of support for repeated packets, you have to set the sequence number yourself.
+\return error if any
+*/
+GF_Err gf_isom_rtp_packet_begin(GF_ISOFile *isom_file, u32 trackNumber, s32 relativeTime, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 PayloadType, u8 disposable_packet, u8 IsRepeatedPacket, u16 SequenceNumber);
+
+/*! sets the flags of the RTP packet
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param PackingBit the 'P' bit of the RTP packet header
+\param eXtensionBit the'X' bit of the RTP packet header
+\param MarkerBit the 'M' bit of the RTP packet header
+\param disposable_packet indicates if this packet can be skipped by a server
+\param IsRepeatedPacket indicates if this is a duplicate packet of a previous one and can be skipped by a server
+\return error if any*/
+GF_Err gf_isom_rtp_packet_set_flags(GF_ISOFile *isom_file, u32 trackNumber, u8 PackingBit, u8 eXtensionBit, u8 MarkerBit, u8 disposable_packet, u8 IsRepeatedPacket);
 
-/*set the time offset of this packet. This enables packets to be placed in the hint track
+/*! sets the time offset of this packet. This enables packets to be placed in the hint track
 in decoding order, but have their presentation time-stamp in the transmitted
 packet in a different order. Typically used for MPEG video with B-frames
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param timeOffset time offset in RTP media timescale
+\return error if any
 */
-GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *the_file, u32 trackNumber, s32 timeOffset);
-
+GF_Err gf_isom_rtp_packet_set_offset(GF_ISOFile *isom_file, u32 trackNumber, s32 timeOffset);
 
-/*set some specific info in the HintDescription for RTP*/
 
-/*sets the RTP TimeScale that the server use to send packets
+/*! sets the RTP TimeScale that the server use to send packets
 some RTP payloads may need a specific timeScale that is not the timeScale in the file format
-the default timeScale choosen by the API is the MediaTimeScale of the hint track*/
-GF_Err gf_isom_rtp_set_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeScale);
-/*sets the RTP TimeOffset that the server will add to the packets
-if not set, the server adds a random offset*/
-GF_Err gf_isom_rtp_set_time_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeOffset);
-/*sets the RTP SequenceNumber Offset that the server will add to the packets
-if not set, the server adds a random offset*/
-GF_Err gf_isom_rtp_set_time_sequence_offset(GF_ISOFile *the_file, u32 trackNumber, u32 HintDescriptionIndex, u32 SequenceNumberOffset);
-
-
-
-/******************************************************************
-		SDP SPECIFIC WRITING API
-******************************************************************/
-/*add an SDP line to the SDP container at the track level (media-specific SDP info)
-NOTE: the \r\n end of line for SDP is automatically inserted*/
-GF_Err gf_isom_sdp_add_track_line(GF_ISOFile *the_file, u32 trackNumber, const char *text);
-/*remove all SDP info at the track level*/
-GF_Err gf_isom_sdp_clean_track(GF_ISOFile *the_file, u32 trackNumber);
-
-/*add an SDP line to the SDP container at the movie level (presentation SDP info)
-NOTE: the \r\n end of line for SDP is automatically inserted*/
-GF_Err gf_isom_sdp_add_line(GF_ISOFile *the_file, const char *text);
-/*remove all SDP info at the movie level*/
-GF_Err gf_isom_sdp_clean(GF_ISOFile *the_file);
-
-#endif /*GPAC_DISABLE_ISOM_HINTING*/
-
-
-#endif	/*GPAC_DISABLE_ISOM_WRITE*/
-
-#ifndef GPAC_DISABLE_ISOM_DUMP
-
-/*dumps file structures into XML trace file */
-GF_Err gf_isom_dump(GF_ISOFile *file, FILE *trace);
-/*gets number of implemented boxes in GPAC. There can be several times the same type returned due to variation of the box (versions or flags)*/
-u32 gf_isom_get_num_supported_boxes();
-/*gets 4cc of box given its index. Index 0 is GPAC internal unknown box handler.*/
-u32 gf_isom_get_supported_box_type(u32 idx);
-/*prints default box syntax of box given its index. Index 0 is GPAC internal unknown box handler*/
-GF_Err gf_isom_dump_supported_box(u32 idx, FILE * trace);
+the default timeScale choosen by the API is the MediaTimeScale of the hint track
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintDescriptionIndex the target hint sample description index
+\param TimeScale the RTP timescale to use
+\return error if any
+*/
+GF_Err gf_isom_rtp_set_timescale(GF_ISOFile *isom_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeScale);
+
+/*! sets the RTP TimeOffset that the server will add to the packets
+if not set, the server adds a random offset
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintDescriptionIndex the target hint sample description index
+\param TimeOffset the time offset in RTP timescale
+\return error if any
+*/
+GF_Err gf_isom_rtp_set_time_offset(GF_ISOFile *isom_file, u32 trackNumber, u32 HintDescriptionIndex, u32 TimeOffset);
+
+/*! sets the RTP SequenceNumber Offset that the server will add to the packets
+if not set, the server adds a random offset
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param HintDescriptionIndex the target hint sample description index
+\param SequenceNumberOffset the sequence number offset
+\return error if any
+*/
+GF_Err gf_isom_rtp_set_time_sequence_offset(GF_ISOFile *isom_file, u32 trackNumber, u32 HintDescriptionIndex, u32 SequenceNumberOffset);
+
+/*! adds an SDP line to the SDP container at the track level (media-specific SDP info)
+\note the CRLF end of line for SDP is automatically inserted
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\param text the SDP text to add the target hint track
+\return error if any
+*/
+GF_Err gf_isom_sdp_add_track_line(GF_ISOFile *isom_file, u32 trackNumber, const char *text);
+/*! removes all SDP info at the track level
+\param isom_file the target ISO file
+\param trackNumber the target hint track
+\return error if any
+*/
+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
+\param isom_file the target ISO file
+\param text the SDP text to add the target hint track
+\return error if any
+*/
+GF_Err gf_isom_sdp_add_line(GF_ISOFile *isom_file, const char *text);
+/*! removes all SDP info at the movie level
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_sdp_clean(GF_ISOFile *isom_file);
 
-#endif /*GPAC_DISABLE_ISOM_DUMP*/
+#endif// !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_ISOM_HINTING)
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-/*dumps RTP hint samples structure into XML trace file
-	@trackNumber, @SampleNum: hint track and hint sample number
-	@trace: output
+/*! dumps RTP hint samples structure into XML trace file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param SampleNum the target sample number
+\param trace the file object to dump to
+\return error if any
 */
-GF_Err gf_isom_dump_hint_sample(GF_ISOFile *the_file, u32 trackNumber, u32 SampleNum, FILE * trace);
+GF_Err gf_isom_dump_hint_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 SampleNum, FILE * trace);
 #endif
 
-/*Get SDP info at the movie level*/
-GF_Err gf_isom_sdp_get(GF_ISOFile *the_file, const char **sdp, u32 *length);
-/*Get SDP info at the track level*/
-GF_Err gf_isom_sdp_track_get(GF_ISOFile *the_file, u32 trackNumber, const char **sdp, u32 *length);
-
-u32 gf_isom_get_payt_count(GF_ISOFile *the_file, u32 trackNumber);
-const char *gf_isom_get_payt_info(GF_ISOFile *the_file, u32 trackNumber, u32 index, u32 *payID);
-
-
-
-
-/*small hint reader - performs data caching*/
-
-/*resets hint reading parameters, returns an error if the hint type is not supported for reading
-packet sequence number is always reseted to 0
-@sample_start: indicates from where the packets should be read (regular 1-based sample number)
-@ts_offset: constant offset for timestamps, must be expressed in media timescale (which is the hint timescale).
-	usually 0 (no offset)
-@sn_offset: offset for packet sequence number (first packet will have a SN of 1 + sn_offset)
-	usually 0
-@ssrc: sync source identifier for RTP
-*/
-GF_Err gf_isom_reset_hint_reader(GF_ISOFile *the_file, u32 trackNumber, u32 sample_start, u32 ts_offset, u32 sn_offset, u32 ssrc);
-
-/*reads next hint packet. ALl packets are read in transmission (decoding) order
-returns an error if not supported, or GF_EOS when no more packets are available
-currently only RTP reader is supported
-@pck_data, @pck_size: output packet data (must be freed by caller) - contains all info to be sent
-	on the wire, eg for RTP contains the RTP header and the data
-@disposable (optional): indicates that the packet can be dropped when late (B-frames & co)
-@repeated (optional): indicates this is a repeated packet (same one has already been sent)
-@trans_ts (optional): indicates the transmission time of the packet, expressed in hint timescale, taking into account
-the ts_offset specified in gf_isom_reset_hint_reader. Depending on packets this may not be the same
-as the hint sample timestamp + ts_offset, some packets may need to be sent earlier (B-frames)
-@sample_num (optional): indicates hint sample number the packet belongs to
-*/
-GF_Err gf_isom_next_hint_packet(GF_ISOFile *the_file, u32 trackNumber, char **pck_data, u32 *pck_size, Bool *disposable, Bool *repeated, u32 *trans_ts, u32 *sample_num);
-
-#endif /*GPAC_DISABLE_ISOM_HINTING*/
-
-
-
-/*
-				3GPP specific extensions
-	NOTE: MPEG-4 OD Framework cannot be used with 3GPP files.
-	Stream Descriptions are not GF_ESD, just generic config options as specified in this file
+/*! 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
+\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
+\return error if any
+*/
+GF_Err gf_isom_sdp_track_get(GF_ISOFile *isom_file, u32 trackNumber, const char **sdp, u32 *length);
+/*! gets number of payload type defines for an RTP hint track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return the number of payload types defined
+*/
+u32 gf_isom_get_payt_count(GF_ISOFile *isom_file, u32 trackNumber);
+/*! gets payload type information for an RTP hint track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param index the payload type 1_based index
+\param payID set to the ID of the payload type
+\return the sdp fmtp attribute describing the payload
 */
+const char *gf_isom_get_payt_info(GF_ISOFile *isom_file, u32 trackNumber, u32 index, u32 *payID);
 
-/*Generic 3GP/3GP2 config record*/
-typedef struct
-{
-	/*GF_4CC record type, one fo the above GF_ISOM_SUBTYPE_3GP_ * subtypes*/
-	u32 type;
-	/*4CC vendor name*/
-	u32 vendor;
-	/*codec version*/
-	u8 decoder_version;
-	/*number of sound frames per IsoMedia sample, >0 and <=15. The very last sample may contain less frames. */
-	u8 frames_per_sample;
-
-	/*H263 ONLY - Level and profile*/
-	u8 H263_level, H263_profile;
-
-	/*AMR(WB) ONLY - num of mode for the codec*/
-	u16 AMR_mode_set;
-	/*AMR(WB) ONLY - changes in codec mode per sample*/
-	u8 AMR_mode_change_period;
-} GF_3GPConfig;
-
-
-/*return the 3GP config for this tream description, NULL if not a 3GPP track*/
-GF_3GPConfig *gf_isom_3gp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
-#ifndef GPAC_DISABLE_ISOM_WRITE
-/*create the track config*/
-GF_Err gf_isom_3gp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_3GPConfig *config, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*update the track config - subtypes shall NOT differ*/
-GF_Err gf_isom_3gp_config_update(GF_ISOFile *the_file, u32 trackNumber, GF_3GPConfig *config, u32 DescriptionIndex);
-#endif	/*GPAC_DISABLE_ISOM_WRITE*/
-
-/*AVC/H264 extensions - GF_AVCConfig is defined in mpeg4_odf.h*/
-
-/*gets uncompressed AVC config - user is responsible for deleting it*/
-GF_AVCConfig *gf_isom_avc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-/*gets uncompressed SVC config - user is responsible for deleting it*/
-GF_AVCConfig *gf_isom_svc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-/*gets uncompressed MVC config - user is responsible for deleting it*/
-GF_AVCConfig *gf_isom_mvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-typedef enum
-{
-	GF_ISOM_AVCTYPE_NONE=0,
-	GF_ISOM_AVCTYPE_AVC_ONLY,
-	GF_ISOM_AVCTYPE_AVC_SVC,
-	GF_ISOM_AVCTYPE_SVC_ONLY,
-	GF_ISOM_AVCTYPE_AVC_MVC,
-	GF_ISOM_AVCTYPE_MVC_ONLY,
-} GF_ISOMAVCType;
-
-u32 gf_isom_get_avc_svc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-
-typedef enum
-{
-	GF_ISOM_HEVCTYPE_NONE=0,
-	GF_ISOM_HEVCTYPE_HEVC_ONLY,
-	GF_ISOM_HEVCTYPE_HEVC_LHVC,
-	GF_ISOM_HEVCTYPE_LHVC_ONLY,
-} GF_ISOMHEVCType;
-
-u32 gf_isom_get_hevc_lhvc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*gets HEVC config - user is responsible for deleting it*/
-GF_HEVCConfig *gf_isom_hevc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-/*gets LHVC config - user is responsible for deleting it*/
-GF_HEVCConfig *gf_isom_lhvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*gets AV1 config - user is responsible for deleting it*/
-GF_AV1Config *gf_isom_av1_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*gets VP config - user is responsible for deleting it*/
-GF_VPConfig *gf_isom_vp_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*return true if track dependencies implying extractors or implicit reconstruction are found*/
-Bool gf_isom_needs_layer_reconstruction(GF_ISOFile *file);
-
-enum
-{
-	/*all extractors are rewritten*/
-	GF_ISOM_NALU_EXTRACT_DEFAULT = 0,
-	/*all extractors are skipped but NALU data from this track is kept*/
-	GF_ISOM_NALU_EXTRACT_LAYER_ONLY,
-	/*all extractors are kept (untouched sample) - used for dumping modes*/
-	GF_ISOM_NALU_EXTRACT_INSPECT,
-	/*above mode is applied and PPS/SPS/... are appended in the front of every IDR*/
-	GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG = 1<<16,
-	/*above mode is applied and all start codes are rewritten (xPS inband as well)*/
-	GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG = 2<<17,
-	/*above mode is applied and VDRD NAL unit is inserted before SVC slice*/
-	GF_ISOM_NALU_EXTRACT_VDRD_FLAG = 1<<18,
-	/*all extractors are skipped and only tile track data is kept*/
-	GF_ISOM_NALU_EXTRACT_TILE_ONLY = 1<<19
-};
-
-GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode);
-u32 gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber);
-
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-/*creates new AVC config*/
-GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*updates AVC config*/
-GF_Err gf_isom_avc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg);
-/*updates SVC config. If is_additional is set, the SVCConfig will be added to the AVC sample description, otherwise the sample description will be SVC-only*/
-GF_Err gf_isom_svc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg, Bool is_additional);
-/*creates new SVC config*/
-GF_Err gf_isom_svc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*deletes SVC config*/
-GF_Err gf_isom_svc_config_del(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*updates MVC config. If is_additional is set, the MVCConfig will be added to the AVC sample description, otherwise the sample description will be MVC-only*/
-GF_Err gf_isom_mvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_AVCConfig *cfg, Bool is_additional);
-/*creates new MVC config*/
-GF_Err gf_isom_mvc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*deletes MVC config*/
-GF_Err gf_isom_mvc_config_del(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*sets avc3 entry type (inband SPS/PPS) instead of avc1 (SPS/PPS in avcC box)*/
-GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*sets hev1 entry type (inband SPS/PPS) instead of hvc1 (SPS/PPS in hvcC box)*/
-GF_Err gf_isom_hevc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*sets lhe1 entry type instead of lhc1 but keep lhcC box intact*/
-GF_Err gf_isom_lhvc_force_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
-/*sets hvt1 entry type (tile track) or hev2/hvc2 type if is_base_track is set - cfg may be set to indicate sub-profile of the tile. It is the use responsability to set the tbas track reference to the base hevc track*/
-GF_Err gf_isom_hevc_set_tile_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_base_track);
-
-
-/*creates new HEVC config*/
-GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*updates HEVC config*/
-GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg);
-
-/*updates L-HHVC config*/
-typedef enum {
-	//changes track type to LHV1/LHE1: no base nor extractors in track, just enhancement layers
-	GF_ISOM_LEHVC_ONLY = 0,
-	//changes track type to HVC2/HEV2: base and extractors/enh. in track
-	GF_ISOM_LEHVC_WITH_BASE,
-	//changes track type to HVC1/HEV1 with additionnal cfg: base and enh. in track no extractors
-	GF_ISOM_LEHVC_WITH_BASE_BACKWARD,
-} GF_ISOMLHEVCTrackType;
-GF_Err gf_isom_lhvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, GF_ISOMLHEVCTrackType track_type);
-
-
-/*creates new VPx config*/
-GF_Err gf_isom_vp_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_VPConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex, Bool is_vp9);
 
+#endif /*GPAC_DISABLE_ISOM_HINTING*/
 
-/*creates new AV1 config*/
-GF_Err gf_isom_av1_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AV1Config *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
 
+/*! @} */
 
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
+/*!
+\addtogroup isotxt_grp Subtitles and Timed Text
+\ingroup iso_grp
 
+@{
+*/
 
-/*
-	3GP timed text handling
 
-	NOTE: currently only writing API is developped, the reading one is not used in MPEG-4 since
-	MPEG-4 maps 3GP timed text to MPEG-4 Streaming Text (part 17)
+/*! sets streaming text reading mode (MPEG-4 text vs 3GPP)
+\param isom_file the target ISO file
+\param do_convert is set, all text samples will be retrieved as TTUs and ESD will be emulated for text tracks
+\return error if any
 */
-
-/*set streamihng text reading mode: if do_convert is set, all text samples will be retrieved as TTUs
-and ESD will be emulated for text tracks.*/
-GF_Err gf_isom_text_set_streaming_mode(GF_ISOFile *the_file, Bool do_convert);
+GF_Err gf_isom_text_set_streaming_mode(GF_ISOFile *isom_file, Bool do_convert);
 
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-/*exports text track to given format
-@dump_type: 0 for TTXT, 1 for srt, 2 for SVG
-*/
+/*! text track export type*/
 typedef enum {
+	/*! dump as TTXT XML*/
 	GF_TEXTDUMPTYPE_TTXT = 0,
+	/*! dump as TTXT XML with box */
 	GF_TEXTDUMPTYPE_TTXT_BOXES = 1,
+	/*! dump as SRT*/
 	GF_TEXTDUMPTYPE_SRT  = 2,
+	/*! dump as SVG*/
 	GF_TEXTDUMPTYPE_SVG  = 3,
 } GF_TextDumpType;
-GF_Err gf_isom_text_dump(GF_ISOFile *the_file, u32 track, FILE *dump, GF_TextDumpType dump_type);
-#endif
-
-/*returns encoded TX3G box (text sample description for 3GPP text streams) as needed by RTP or other standards:
-	@sidx: 1-based stream description index
-	@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)
-
+/*! dumps a text track to a file
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param dump the file object to write to (binary open mode)
+\param dump_type the dump type mode
+\return error if any
 */
-GF_Err gf_isom_text_get_encoded_tx3g(GF_ISOFile *file, u32 track, u32 sidx, u32 sidx_offset, char **tx3g, u32 *tx3g_size);
+GF_Err gf_isom_text_dump(GF_ISOFile *isom_file, u32 trackNumber, FILE *dump, GF_TextDumpType dump_type);
+#endif
 
-/*checks if this text description is already inserted
-@outDescIdx: set to 0 if not found, or descIndex
-@same_style, @same_box: indicates if default styles and box are used
+/*! gets encoded TX3G box (text sample description for 3GPP text streams) as needed by RTP or other standards:
+\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 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
 */
-GF_Err gf_isom_text_has_similar_description(GF_ISOFile *the_file, u32 trackNumber, GF_TextSampleDescriptor *desc, u32 *outDescIdx, Bool *same_box, Bool *same_styles);
+GF_Err gf_isom_text_get_encoded_tx3g(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 sidx_offset, u8 **tx3g, u32 *tx3g_size);
 
-/*text sample formatting*/
+/*! text sample formatting*/
 typedef struct _3gpp_text_sample GF_TextSample;
-/*creates text sample handle*/
+/*! creates text sample handle
+\return a newly allocated text sample
+*/
 GF_TextSample *gf_isom_new_text_sample();
-/*destroy text sample handle*/
+/*! destroys text sample handle
+\param tx_samp the target text sample
+*/
 void gf_isom_delete_text_sample(GF_TextSample *tx_samp);
 
-/*generic subtitle sample formatting*/
+/*! generic subtitle sample formatting*/
 typedef struct _generic_subtitle_sample GF_GenericSubtitleSample;
-/*creates generic subtitle sample handle*/
+/*! creates generic subtitle sample handle
+\return a newly allocated generic subtitle sample
+*/
 GF_GenericSubtitleSample *gf_isom_new_generic_subtitle_sample();
-/*destroy generic subtitle sample handle*/
+/*! destroys generic subtitle sample handle
+\param generic_subtitle_samp the target generic subtitle sample
+*/
 void gf_isom_delete_generic_subtitle_sample(GF_GenericSubtitleSample *generic_subtitle_samp);
 
 #ifndef GPAC_DISABLE_VTT
-GF_Err gf_isom_new_webvtt_description(GF_ISOFile *movie, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
-GF_Err gf_isom_update_webvtt_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, const char *config);
+/*! creates new WebVTT config
+\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 config the WebVTT configuration string
+\return error if any
+*/
+GF_Err gf_isom_new_webvtt_description(GF_ISOFile *isom_file, u32 trackNumber, const char *URLname, const char *URNname, u32 *outDescriptionIndex, const char *config);
+/*! updates a WebVTT sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index to update
+\param config the WebVTT configuration string
+\return error if any
+*/
+GF_Err gf_isom_update_webvtt_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const char *config);
 #endif
 
-GF_Err gf_isom_stxt_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const char **mime, const char **encoding, const char **config);
-GF_Err gf_isom_new_stxt_description(GF_ISOFile *movie, u32 trackNumber, u32 type, const char *mime, const char *encoding, const char *config, u32 *outDescriptionIndex);
-GF_Err gf_isom_update_stxt_description(GF_ISOFile *movie, u32 trackNumber, const char *encoding, const char *config, u32 DescriptionIndex);
+/*! gets WebVTT 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 WebVTT configuration string
+*/
+const char *gf_isom_get_webvtt_config(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets simple streaming text config for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param mime set to the mime type (optional, can be NULL)
+\param encoding set to the text encoding type (optional, can be NULL)
+\param config set to the WebVTT configuration string (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_stxt_get_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const char **mime, const char **encoding, const char **config);
 
-GF_Err gf_isom_xml_subtitle_get_description(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex,
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates new simple streaming text config
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param type the four character code of the simple text sample description (sbtt, stxt, mett)
+\param mime the mime type
+\param encoding the text encoding, if any
+\param config the configuration string, if any
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_new_stxt_description(GF_ISOFile *isom_file, u32 trackNumber, u32 type, const char *mime, const char *encoding, const char *config, u32 *outDescriptionIndex);
+
+/*! updates simple streaming text config
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param encoding the text encoding, if any
+\param config the configuration string, if any
+\param sampleDescriptionIndex the target sample description index
+\return error if any
+*/
+GF_Err gf_isom_update_stxt_description(GF_ISOFile *isom_file, u32 trackNumber, const char *encoding, const char *config, u32 sampleDescriptionIndex);
+#endif // GPAC_DISABLE_ISOM_WRITE
+
+/*! gets XML streaming text config for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param xmlnamespace set to the XML namespace (optional, can be NULL)
+\param xml_schema_loc set to the XML schema location (optional, can be NULL)
+\param mimes set to the associated mime(s) types (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_xml_subtitle_get_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex,
         const char **xmlnamespace, const char **xml_schema_loc, const char **mimes);
-GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile  *movie, u32 trackNumber,
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a new XML streaming text config
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param xmlnamespace the XML namespace
+\param xml_schema_loc the XML schema location (optional, can be NULL)
+\param auxiliary_mimes the associated mime(s) types (optional, can be NULL)
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_new_xml_subtitle_description(GF_ISOFile *isom_file, u32 trackNumber,
         const char *xmlnamespace, const char *xml_schema_loc, const char *auxiliary_mimes,
         u32 *outDescriptionIndex);
-GF_Err gf_isom_update_xml_subtitle_description(GF_ISOFile *movie, u32 trackNumber,
-        u32 descriptionIndex, GF_GenericSubtitleSampleDescriptor *desc);
+#endif // GPAC_DISABLE_ISOM_WRITE
+
+
+/*! gets XML metadata for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param xmlnamespace set to the XML namespace (optional, can be NULL)
+\param schema_loc set to the XML schema location (optional, can be NULL)
+\param content_encoding set to the content encoding string (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_get_xml_metadata_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, const char **xmlnamespace, const char **schema_loc, const char **content_encoding);
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates a new timed metadata sample description for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param xmlnamespace the XML namespace
+\param schema_loc the XML schema location (optional, can be NULL)
+\param content_encoding the content encoding string (optional, can be NULL)
+\param outDescriptionIndex set to the index of the created sample description
+\return error if any
+*/
+GF_Err gf_isom_new_xml_metadata_description(GF_ISOFile *isom_file, u32 trackNumber, const char *xmlnamespace, const char *schema_loc, const char *content_encoding, u32 *outDescriptionIndex);
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
 
 
 
+/*! text flags operation type*/
 typedef enum
 {
 	GF_ISOM_TEXT_FLAGS_OVERWRITE = 0,
 	GF_ISOM_TEXT_FLAGS_TOGGLE,
 	GF_ISOM_TEXT_FLAGS_UNTOGGLE,
 } GF_TextFlagsMode;
-//sets text display flags according to given mode. If SampleDescriptionIndex is 0, sets the flags for all text descriptions.
-GF_Err gf_isom_text_set_display_flags(GF_ISOFile *file, u32 track, u32 SampleDescriptionIndex, u32 flags, GF_TextFlagsMode op_type);
+/*! sets text display flags according to given mode.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index. If 0, sets the flags for all text descriptions
+\param flags the flag to set
+\param op_type the flag toggle mode
+\return error if any
+*/
+GF_Err gf_isom_text_set_display_flags(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 flags, GF_TextFlagsMode op_type);
+
+/*! gets text description of a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the target sample description index
+\param out_desc set to a newly allocated text sample descriptor - shall be freeed by user
+\return error if any
+*/
+GF_Err gf_isom_get_text_description(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, GF_TextSampleDescriptor **out_desc);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-/*Create a new TextSampleDescription in the file.
-The URL and URN are used to describe external media, this will create a data reference for the media
-GF_TextSampleDescriptor is defined in mpeg4_odf.h
+/*! creates a new TextSampleDescription in the file.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param desc the text 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_new_text_description(GF_ISOFile *isom_file, u32 trackNumber, GF_TextSampleDescriptor *desc, const char *URLname, const char *URNname, u32 *outDescriptionIndex);
+
+/*! resets text sample content
+\param tx_samp the target text sample
+\return error if any
 */
-GF_Err gf_isom_new_text_description(GF_ISOFile *the_file, u32 trackNumber, GF_TextSampleDescriptor *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*change the text sample description*/
-GF_Err gf_isom_update_text_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_TextSampleDescriptor *desc);
-
-/*reset text sample content*/
 GF_Err gf_isom_text_reset(GF_TextSample * tx_samp);
-/*reset text sample styles but keep text*/
-GF_Err gf_isom_text_reset_styles(GF_TextSample * samp);
+/*! resets text sample styles but keep text
+\param tx_samp the target text sample
+\return error if any
+*/
+GF_Err gf_isom_text_reset_styles(GF_TextSample *tx_samp);
+
+/*! appends text to sample - text_len is the number of bytes to be written from text_data. This allows
+handling UTF8 and UTF16 strings in a transparent manner
+\param tx_samp the target text sample
+\param text_data the text data to add
+\param text_len the size of the data to add
+\return error if any
+*/
+GF_Err gf_isom_text_add_text(GF_TextSample *tx_samp, char *text_data, u32 text_len);
+/*! appends style modifyer to sample
+\param tx_samp the target text sample
+\param rec the style record to add
+\return error if any
+*/
+GF_Err gf_isom_text_add_style(GF_TextSample *tx_samp, GF_StyleRecord *rec);
+/*! appends highlight modifier for the sample
+\param tx_samp the target text sample
+\param start_char first char highlighted,
+\param end_char first char not highlighted
+\return error if any
+*/
+GF_Err gf_isom_text_add_highlight(GF_TextSample *tx_samp, u16 start_char, u16 end_char);
+
+/*! sets highlight color for the whole sample
+\param tx_samp the target text sample
+\param argb color value
+\return error if any
+*/
+GF_Err gf_isom_text_set_highlight_color(GF_TextSample *tx_samp, u32 argb);
+/*! appends a new karaoke sequence in the sample
+\param tx_samp the target text sample
+\param start_time karaoke start time expressed in text stream timescale, but relative to the sample media time
+\return error if any
+*/
+GF_Err gf_isom_text_add_karaoke(GF_TextSample *tx_samp, u32 start_time);
+/*! appends a new segment in the current karaoke sequence - you must build sequences in order to be compliant
+\param tx_samp the target text sample
+\param end_time segment end time expressed in text stream timescale, but relative to the sample media time
+\param start_char first char highlighted,
+\param end_char first char not highlighted
+\return error if any
+*/
+GF_Err gf_isom_text_set_karaoke_segment(GF_TextSample *tx_samp, u32 end_time, u16 start_char, u16 end_char);
+/*! sets scroll delay for the whole sample (scrolling is enabled through GF_TextSampleDescriptor.DisplayFlags)
+\param tx_samp the target text sample
+\param scroll_delay delay for scrolling expressed in text stream timescale
+\return error if any
+*/
+GF_Err gf_isom_text_set_scroll_delay(GF_TextSample *tx_samp, u32 scroll_delay);
+/*! appends hyperlinking for the sample
+\param tx_samp the target text sample
+\param URL UTF-8 url
+\param altString UTF-8 hint (tooltip, ...) for end user
+\param start_char first char hyperlinked,
+\param end_char first char not hyperlinked
+\return error if any
+*/
+GF_Err gf_isom_text_add_hyperlink(GF_TextSample *tx_samp, char *URL, char *altString, u16 start_char, u16 end_char);
+/*! sets current text box (display pos&size within the text track window) for the sample
+\param tx_samp the target text sample
+\param top top coordinate of box
+\param left left coordinate of box
+\param bottom bottom coordinate of box
+\param right right coordinate of box
+\return error if any
+*/
+GF_Err gf_isom_text_set_box(GF_TextSample *tx_samp, s16 top, s16 left, s16 bottom, s16 right);
+/*! appends blinking for the sample
+\param tx_samp the target text sample
+\param start_char first char blinking,
+\param end_char first char not blinking
+\return error if any
+*/
+GF_Err gf_isom_text_add_blink(GF_TextSample *tx_samp, u16 start_char, u16 end_char);
+/*! sets wrap flag for the sample
+\param tx_samp the target text sample
+\param wrap_flags text wrap flags - currently only 0 (no wrap) and 1 ("soft wrap") are allowed in 3GP
+\return error if any
+*/
+GF_Err gf_isom_text_set_wrap(GF_TextSample *tx_samp, u8 wrap_flags);
+
+/*! formats sample as a regular GF_ISOSample payload in a bitstream object.
+\param tx_samp the target text sample
+\param bs thetarget bitstream
+\return error if any
+*/
+GF_Err gf_isom_text_sample_write_bs(const GF_TextSample *tx_samp, GF_BitStream *bs);
+/*! gets the serialized size of the text sample
+\param tx_samp the target text sample
+\return the serialized size
+*/
+u32 gf_isom_text_sample_size(GF_TextSample *tx_samp);
+
+/*! creates a new XML subtitle sample
+\return a new XML subtitle sample
+*/
+GF_GenericSubtitleSample *gf_isom_new_xml_subtitle_sample();
+/*! deletes an XML subtitle sample
+\param subt_samp the target XML subtitle sample
+*/
+void gf_isom_delete_xml_subtitle_sample(GF_GenericSubtitleSample *subt_samp);
+/*! resets content of an XML subtitle sample
+\param subt_samp the target XML subtitle sample
+\return error if any
+*/
+GF_Err gf_isom_xml_subtitle_reset(GF_GenericSubtitleSample *subt_samp);
+/*! the corresponding serialized ISO sample
+\param subt_samp the target XML subtitle sample
+\return the corresponding serialized ISO sample
+*/
+GF_ISOSample *gf_isom_xml_subtitle_to_sample(GF_GenericSubtitleSample *subt_samp);
+/*! appends text to an XML subtitle sample
+\param subt_samp the target XML subtitle sample
+\param text_data the UTF-8 or UTF-16 data to add
+\param text_len the size of the text to add in bytes
+\return error if any
+*/
+GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *subt_samp, char *text_data, u32 text_len);
 
-/*sets UTF16 marker for text data. This MUST be called on an empty sample. If text data added later
-on (cf below) is not formatted as UTF16 data(2 bytes char) the resulting text sample won't be compliant,
-but this library WON'T WARN*/
-GF_Err gf_isom_text_set_utf16_marker(GF_TextSample * samp);
-/*append text to sample - text_len is the number of bytes to be written from text_data. This allows
-handling UTF8 and UTF16 strings in a transparent manner*/
-GF_Err gf_isom_text_add_text(GF_TextSample * tx_samp, char *text_data, u32 text_len);
-/*append style modifyer to sample*/
-GF_Err gf_isom_text_add_style(GF_TextSample * tx_samp, GF_StyleRecord *rec);
-/*appends highlight modifier for the sample
-	@start_char: first char highlighted,
-	@end_char: first char not highlighted*/
-GF_Err gf_isom_text_add_highlight(GF_TextSample * samp, u16 start_char, u16 end_char);
-/*sets highlight color for the whole sample*/
-GF_Err gf_isom_text_set_highlight_color(GF_TextSample * samp, u8 r, u8 g, u8 b, u8 a);
-GF_Err gf_isom_text_set_highlight_color_argb(GF_TextSample * samp, u32 argb);
-/*appends a new karaoke sequence in the sample
-	@start_time: karaoke start time expressed in text stream timescale, but relative to the sample media time
-*/
-GF_Err gf_isom_text_add_karaoke(GF_TextSample * samp, u32 start_time);
-/*appends a new segment in the current karaoke sequence - you must build sequences in order to be compliant
-	@end_time: segment end time expressed in text stream timescale, but relative to the sample media time
-	@start_char: first char highlighted,
-	@end_char: first char not highlighted
-*/
-GF_Err gf_isom_text_set_karaoke_segment(GF_TextSample * samp, u32 end_time, u16 start_char, u16 end_char);
-/*sets scroll delay for the whole sample (scrolling is enabled through GF_TextSampleDescriptor.DisplayFlags)
-	@scroll_delay: delay for scrolling expressed in text stream timescale
-*/
-GF_Err gf_isom_text_set_scroll_delay(GF_TextSample * samp, u32 scroll_delay);
-/*appends hyperlinking for the sample
-	@URL: ASCII url
-	@altString: ASCII hint (tooltip, ...) for end user
-	@start_char: first char hyperlinked,
-	@end_char: first char not hyperlinked
-*/
-GF_Err gf_isom_text_add_hyperlink(GF_TextSample * samp, char *URL, char *altString, u16 start_char, u16 end_char);
-/*sets current text box (display pos&size within the text track window) for the sample*/
-GF_Err gf_isom_text_set_box(GF_TextSample * samp, s16 top, s16 left, s16 bottom, s16 right);
-/*appends blinking for the sample
-	@start_char: first char blinking,
-	@end_char: first char not blinking
-*/
-GF_Err gf_isom_text_add_blink(GF_TextSample * samp, u16 start_char, u16 end_char);
-/*sets wrap flag for the sample - currently only 0 (no wrap) and 1 ("soft wrap") are allowed in 3GP*/
-GF_Err gf_isom_text_set_wrap(GF_TextSample * samp, u8 wrap_flags);
-
-/*formats sample as a regular GF_ISOSample. The resulting sample will always be marked as random access
-text sample content is kept untouched*/
-GF_ISOSample *gf_isom_text_to_sample(GF_TextSample * tx_samp);
+#endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
+/*! @} */
 
 
-GF_GenericSubtitleSample *gf_isom_new_xml_subtitle_sample();
-void gf_isom_delete_xml_subtitle_sample(GF_GenericSubtitleSample * samp);
-GF_Err gf_isom_xml_subtitle_reset(GF_GenericSubtitleSample *samp);
-GF_ISOSample *gf_isom_xml_subtitle_to_sample(GF_GenericSubtitleSample * tx_samp);
-GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len);
+/*!
+\addtogroup isocrypt_grp Content Protection
+\ingroup iso_grp
 
-#endif	/*GPAC_DISABLE_ISOM_WRITE*/
+@{
+*/
 
-/*****************************************************
-		ISMACryp Samples
-*****************************************************/
-/*flags for GF_ISMASample*/
+/*! DRM related code points*/
 enum
 {
-	/*signals the stream the sample belongs to uses selective encryption*/
+	/*! Storage location of CENC sample auxiliary in PSEC UUID box*/
+	GF_ISOM_BOX_UUID_PSEC = GF_4CC( 'P', 'S', 'E', 'C' ),
+	/*! Storage location of CENC sample auxiliary in senc box*/
+	GF_ISOM_BOX_TYPE_SENC = GF_4CC( 's', 'e', 'n', 'c'),
+	/*! PSSH box type */
+	GF_ISOM_BOX_TYPE_PSSH = GF_4CC( 'p', 's', 's', 'h'),
+	/*! ISMA Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_ISMACRYP_SCHEME	= GF_4CC( 'i', 'A', 'E', 'C' ),
+	/*! OMA DRM Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_OMADRM_SCHEME = GF_4CC('o','d','k','m'),
+	/*! CENC AES-CTR Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_CENC_SCHEME	= GF_4CC('c','e','n','c'),
+	/*! CENC AES-CBC Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_CBC_SCHEME = GF_4CC('c','b','c','1'),
+	/*! Adobe Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_ADOBE_SCHEME = GF_4CC('a','d','k','m'),
+	/*! CENC AES-CTR Pattern Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_CENS_SCHEME	= GF_4CC('c','e','n','s'),
+	/*! CENC AES-CBC Pattern Encryption Scheme Type in the SchemeTypeInfoBox */
+	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'),
+};
+
+/*! checks if a track is encrypted or protected
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return GF_TRUE if track is protected, GF_FALSE otherwise*/
+Bool gf_isom_is_track_encrypted(GF_ISOFile *isom_file, u32 trackNumber);
+
+
+/*! flags for GF_ISMASample*/
+typedef enum
+{
+	/*! signals the stream the sample belongs to uses selective encryption*/
 	GF_ISOM_ISMA_USE_SEL_ENC = 1,
-	/*signals the sample is encrypted*/
+	/*! signals the sample is encrypted*/
 	GF_ISOM_ISMA_IS_ENCRYPTED = 2,
-};
+} GF_ISOISMACrypFlags;
 
+/*! ISMA sample*/
 typedef struct
 {
-	/*IV in ISMACryp is Byte Stream Offset*/
+	/*! IV in ISMACryp is Byte Stream Offset*/
 	u64 IV;
-	u8 IV_length;/*repeated from sampleDesc for convenience*/
+	/*! IV size in bytes, repeated from sampleDesc for convenience*/
+	u8 IV_length;
+	/*! key indicator*/
 	u8 *key_indicator;
-	u8 KI_length;/*repeated from sampleDesc for convenience*/
+	/*! key indicator size, repeated from sampleDesc for convenience*/
+	u8 KI_length;
+	/*! payload size*/
 	u32 dataLength;
-	char *data;
+	/*! payload*/
+	u8 *data;
+	/*! flags*/
 	u32 flags;
 } GF_ISMASample;
-/**
- * creates a new empty ISMA sample
- */
+/*! creates a new empty ISMA sample
+\return a new empty ISMA sample
+*/
 GF_ISMASample *gf_isom_ismacryp_new_sample();
 
-/*delete an ISMA sample. NOTE:the buffers content will be destroyed by default.
-if you wish to keep the buffer, set dataLength to 0 in the sample before deleting it*/
+/*! delete an ISMA 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
+\param samp the target ISMA sample
+*/
 void gf_isom_ismacryp_delete_sample(GF_ISMASample *samp);
 
-/*decodes ISMACryp sample based on all info in ISMACryp sample description*/
-GF_ISMASample *gf_isom_ismacryp_sample_from_data(char *data, u32 dataLength, Bool use_selective_encryption, u8 KI_length, u8 IV_length);
-/*rewrites samp content from s content*/
-GF_Err gf_isom_ismacryp_sample_to_sample(GF_ISMASample *s, GF_ISOSample *dest);
-
-/*decodes ISMACryp sample based on sample and its descrition index - returns NULL if not an ISMA sample
-Note: input sample is NOT destroyed*/
-GF_ISMASample *gf_isom_get_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, GF_ISOSample *samp, u32 sampleDescriptionIndex);
-
-/*returns whether the given media is a protected one or not - return scheme protection 4CC*/
-u32 gf_isom_is_media_encrypted(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-
-/*returns whether the given media is a protected ISMACryp one or not*/
-Bool gf_isom_is_ismacryp_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-
-/*returns whether the given media is a protected ISMACryp one or not*/
-Bool gf_isom_is_omadrm_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-
-GF_Err gf_isom_get_omadrm_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat,
+/*! decodes ISMACryp sample based on all info in ISMACryp sample description
+\param data sample data
+\param dataLength sample data size in bytes
+\param use_selective_encryption set to GF_TRUE if sample uses selective encryption
+\param KI_length set to the size in bytes of the key indicator - 0 means no key roll
+\param IV_length set to the size in bytes of the initialization vector
+\return a newly allocated ISMA sample with the parsed data
+*/
+GF_ISMASample *gf_isom_ismacryp_sample_from_data(u8 *data, u32 dataLength, Bool use_selective_encryption, u8 KI_length, u8 IV_length);
+/*! rewrites ISMA sample as an ISO sample
+\param s the ISMA sample to rewrite
+\param dest the destination ISO sample
+\return error if any
+*/
+GF_Err gf_isom_ismacryp_sample_to_sample(const GF_ISMASample *s, GF_ISOSample *dest);
+
+/*! decodes ISMACryp sample based on sample and its descrition index
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param samp the sample to decode
+\param sampleDescriptionIndex the sample description index of the sample to decode
+\return the ISMA sample or NULL if not an ISMA sample or error
+*/
+GF_ISMASample *gf_isom_get_ismacryp_sample(GF_ISOFile *isom_file, u32 trackNumber, const GF_ISOSample *samp, u32 sampleDescriptionIndex);
+
+/*! checks if sample description is protected or not
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index. If 0, checks all sample descriptions for protected ones
+\return scheme protection 4CC or 0 if not protected*/
+u32 gf_isom_is_media_encrypted(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! checks if sample description is protected with ISMACryp
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\return GF_TRUE if ISMA protection is used*/
+Bool gf_isom_is_ismacryp_media(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! checks if sample description is protected with OMA DRM
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\return GF_TRUE if OMA DRM protection is used*/
+Bool gf_isom_is_omadrm_media(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets OMA DRM configuration - all output parameters are optional and may be NULL
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\param outOriginalFormat four character code of the unprotected sample description
+\param outSchemeType set to four character code of the protection scheme type
+\param outSchemeVersion set to scheme protection version
+\param outContentID set to associated ID of content
+\param outRightsIssuerURL set to the rights issuer (license server) URL
+\param outTextualHeaders set to OMA textual headers
+\param outTextualHeadersLen set to the size in bytes of OMA textual headers
+\param outPlaintextLength set to the size in bytes of clear data in file
+\param outEncryptionType set to the OMA encryption type used
+\param outSelectiveEncryption set to GF_TRUE if sample description uses selective encryption
+\param outIVLength set to the size of the initialization vector
+\param outKeyIndicationLength set to the size of the key indicator
+\return error if any
+*/
+GF_Err gf_isom_get_omadrm_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat,
                                u32 *outSchemeType, u32 *outSchemeVersion,
                                const char **outContentID, const char **outRightsIssuerURL, const char **outTextualHeaders, u32 *outTextualHeadersLen, u64 *outPlaintextLength, u32 *outEncryptionType, Bool *outSelectiveEncryption, u32 *outIVLength, u32 *outKeyIndicationLength);
-/*retrieves ISMACryp info for the given track & SDI - all output parameters are optional - URIs SHALL NOT BE MODIFIED BY USER
-	@outOriginalFormat: retrieves orginal protected media format - usually GF_ISOM_SUBTYPE_MPEG4
-	@outSchemeType: retrieves 4CC of protection scheme (GF_ISOM_ISMACRYP_SCHEME = iAEC in ISMACryp 1.0)
-	outSchemeVersion: retrieves version of protection scheme (1 in ISMACryp 1.0)
-	outSchemeURI: retrieves URI location of scheme
-	outKMS_URI: retrieves URI location of key management system - only valid with ISMACryp 1.0
-	outSelectiveEncryption: specifies whether sample-based encryption is used in media - only valid with ISMACryp 1.0
-	outIVLength: specifies length of Initial Vector - only valid with ISMACryp 1.0
-	outKeyIndicationLength: specifies length of key indicator - only valid with ISMACryp 1.0
 
-  outSelectiveEncryption, outIVLength and outKeyIndicationLength are usually not needed to decode an
-  ISMA sample when using gf_isom_get_ismacryp_sample fct above
-*/
-GF_Err gf_isom_get_ismacryp_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, const char **outSchemeURI, const char **outKMS_URI, Bool *outSelectiveEncryption, u32 *outIVLength, u32 *outKeyIndicationLength);
+/*! retrieves ISMACryp info for the given track & SDI - all output parameters are optional - URIs SHALL NOT BE MODIFIED BY USER
 
-/*returns original format type of a protected media file*/
-GF_Err gf_isom_get_original_format_type(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat);
+\note outSelectiveEncryption, outIVLength and outKeyIndicationLength are usually not needed to decode an ISMA sample when using \ref gf_isom_get_ismacryp_sample
 
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\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 outSchemeURI set to URI location of scheme
+\param outKMS_URI set to URI location of key management system - only valid with ISMACryp 1.0
+\param outSelectiveEncryption set to whether sample-based encryption is used in media - only valid with ISMACryp 1.0
+\param outIVLength set to length of Initial Vector - only valid with ISMACryp 1.0
+\param outKeyIndicationLength set to length of key indicator - only valid with ISMACryp 1.0
+\return error if any
+*/
+GF_Err gf_isom_get_ismacryp_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, const char **outSchemeURI, const char **outKMS_URI, Bool *outSelectiveEncryption, u32 *outIVLength, u32 *outKeyIndicationLength);
+
+/*! gets original format four character code type of a protected media sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index. If 0, checks all sample descriptions for a protected one
+\param outOriginalFormat set to orginal unprotected media format
+\return error if any
+*/
+GF_Err gf_isom_get_original_format_type(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat);
+
+/*! CENC subsample entry*/
 typedef struct
 {
-	//16 bit stored but we use 32
+	/*! 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
 {
-	u8 IV_size; //0, 8 or 16; it MUST NOT be written to file
-	bin128 IV; /*can be 0, 64 or 128 bits - if 64, bytes 0-7 are used and 8-15 are 0-padded*/
+ 	/*! 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
-/*removes protection info (does not perform decryption :), for ISMA, OMA and CENC*/
-GF_Err gf_isom_remove_track_protection(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
-
-/*creates ISMACryp protection info (does not perform encryption :)*/
-GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
+/*! removes protection info (does not perform decryption), for ISMA, OMA and CENC of a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\return error if any
+*/
+GF_Err gf_isom_remove_track_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! creates ISMACryp protection info for a 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 scheme_uri URI location of scheme
+\param kms_URI URI location of key management system - only valid with ISMACryp 1.0
+\param selective_encryption whether sample-based encryption is used in media - only valid with ISMACryp 1.0
+\param KI_length length of key indicator - only valid with ISMACryp 1.0
+\param IV_length length of Initial Vector - only valid with ISMACryp 1.0
+\return error if any
+*/
+GF_Err gf_isom_set_ismacryp_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type,
                                        u32 scheme_version, char *scheme_uri, char *kms_URI,
                                        Bool selective_encryption, u32 KI_length, u32 IV_length);
 
-/*change scheme URI and/or KMS URI for crypted files. Other params cannot be changed once the media is crypted
-	@scheme_uri: new scheme URI, or NULL to keep previous
-	@kms_uri: new KMS URI, or NULL to keep previous
+/*! changes scheme URI and/or KMS URI for crypted files. Other params cannot be changed once the media is crypted
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\param scheme_uri new scheme URI, or NULL to keep previous
+\param kms_uri new KMS URI, or NULL to keep previous
+\return error if any
+*/
+GF_Err gf_isom_change_ismacryp_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, char *scheme_uri, char *kms_uri);
+
+
+/*! creates OMA DRM protection for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\param contentID associated ID of content
+\param kms_URI the rights issuer (license server) URL
+\param encryption_type the OMA encryption type used
+\param plainTextLength the size in bytes of clear data in file
+\param textual_headers OMA textual headers
+\param textual_headers_len the size in bytes of OMA textual headers
+\param selective_encryption GF_TRUE if sample description uses selective encryption
+\param KI_length the size of the key indicator
+\param IV_length the size of the initialization vector
+\return error if any
 */
-GF_Err gf_isom_change_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, char *scheme_uri, char *kms_uri);
-
-
-GF_Err gf_isom_set_oma_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index,
+GF_Err gf_isom_set_oma_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex,
                                   char *contentID, char *kms_URI, u32 encryption_type, u64 plainTextLength, char *textual_headers, u32 textual_headers_len,
                                   Bool selective_encryption, u32 KI_length, u32 IV_length);
 
+/*! creates a generic protection for a 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 scheme_uri URI location of scheme
+\param kms_URI the rights issuer (license server) URL
+\return error if any
+*/
+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
+\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);
+
+/*! 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 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
+\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_cenc_allocate_storage(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u32 AlgorithmID, u8 IV_size, bin128 KID);
-
-//if buf is NULL but len is given, this adds an unencrypted entry. otherwise, buf && len represent the sai cenc info to add
-GF_Err gf_isom_track_cenc_add_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 container_type, u8 IV_size, char *buf, u32 len, Bool use_subsamples, char *clear_IV);
 
 
-
-GF_Err gf_isom_set_cenc_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type,
+/*! creates CENC protection for a 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_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
+\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);
+/*! 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
+\param version the version of the protection system
+\param KID_count the number of key IDs
+\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
+\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);
+
+/*! removes CENC SAI size info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_cenc_saiz(GF_ISOFile *isom_file, u32 trackNumber);
+/*! removes CENC SAI offset info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_cenc_saio(GF_ISOFile *isom_file, u32 trackNumber);
+/*! removes CENC senc box info
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_samp_enc_box(GF_ISOFile *isom_file, u32 trackNumber);
+/*! removes all CENC sample groups
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_remove_samp_group_box(GF_ISOFile *isom_file, u32 trackNumber);
+/*! removes CENC PSSH box
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_remove_pssh_box(GF_ISOFile *isom_file);
+
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+/*! checks if sample description is protected with Adobe systems
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\return GF_TRUE if ADOBE protection is used
+*/
+Bool gf_isom_is_adobe_protection_media(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+
+/*! gets adobe protection information for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\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 outMetadata set to adobe metadata string
+\return GF_TRUE if ADOBE protection is used
+*/
+GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, const char **outMetadata);
 
-GF_Err gf_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, char *data, u32 len);
-
-GF_Err gf_isom_remove_cenc_saiz(GF_ISOFile *the_file, u32 trackNumber);
-GF_Err gf_isom_remove_cenc_saio(GF_ISOFile *the_file, u32 trackNumber);
-GF_Err gf_isom_remove_samp_enc_box(GF_ISOFile *the_file, u32 trackNumber);
-GF_Err gf_isom_remove_samp_group_box(GF_ISOFile *the_file, u32 trackNumber);
-GF_Err gf_isom_remove_pssh_box(GF_ISOFile *the_file);
-
-Bool gf_isom_is_adobe_protection_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion);
-GF_Err gf_isom_set_adobe_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, u32 scheme_version, Bool is_selective_enc, char *metadata, u32 len);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+/*! creates an adobe protection for a 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 is_selective_enc indicates if selective encryption is used
+\param metadata metadata information
+\param len size of metadata information in bytes
+\return error if any
+*/
+GF_Err gf_isom_set_adobe_protection(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 scheme_type, u32 scheme_version, Bool is_selective_enc, char *metadata, u32 len);
 
-void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *the_file);
+/*! removes the IPMPX tools from files
+\param isom_file the target ISO file
+*/
+void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *isom_file);
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-Bool gf_isom_is_cenc_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength);
+/*! checks of sample description is protected with CENC
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index. If 0, checks all sample descriptions for protected ones
+\return GF_TRUE if sample protection is CENC
+*/
+Bool gf_isom_is_cenc_media(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
+/*! gets CENC information of a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleDescriptionIndex the sample description index
+\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);
 
+/*! 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);
 
-/*boxType is 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*/
-GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type);
-
-void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID, u8 *constant_IV_size, bin128 *constant_IV, u8 *crypt_byte_block, u8 *skip_byte_block);
-
-Bool gf_isom_cenc_is_pattern_mode(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
-
-u32 gf_isom_get_pssh_count(GF_ISOFile *file);
-/*index is 1-based, all pointers shall not be free*/
-GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size);
-
-GF_Err gf_isom_get_pssh(GF_ISOFile *file, u32 pssh_index, u8 **pssh_data, u32 *pssh_size);
+/*! 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
+
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample
+\param sampleDescIndex the sample description index
+\param container_type is 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
+\param out_buffer set to a newly allocated buffer, or reallocated buffer if not NULL
+\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);
+
+/*! gets CENC default info for a sample description
+\param isom_file the target ISO file
+\param trackNumber the target track
+\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
+*/
+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);
+
+
+/*! 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
+*/
+u32 gf_isom_get_pssh_count(GF_ISOFile *isom_file);
+
+/*! gets PSS info
+\param isom_file the target ISO file
+\param pssh_index 1-based index of PSSH to query, see \ref gf_isom_get_pssh_count
+\param SystemID set to the protection system ID
+\param version set to the protection system version
+\param KID_count set to the number of key IDs defined
+\param KIDs array of defined key IDs
+\param private_data set to a buffer containing system ID private data
+\param private_data_size set to the size of the system ID private data
+\return error if any
+*/
+GF_Err gf_isom_get_pssh_info(GF_ISOFile *isom_file, u32 pssh_index, bin128 SystemID, u32 *version, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size);
+
+/*! gets serialized PSS
+\param isom_file the target ISO file
+\param pssh_index 1-based index of PSSH to query, see \ref gf_isom_get_pssh_count
+\param pssh_data set to a newly allocated buffer containing serialized PSSH - shall be freeed by caller
+\param pssh_size set to the size of the allocated buffer
+\return error if any
+*/
+GF_Err gf_isom_get_pssh(GF_ISOFile *isom_file, u32 pssh_index, u8 **pssh_data, u32 *pssh_size);
 
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-/*xml dumpers*/
-GF_Err gf_isom_dump_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, FILE * trace);
-GF_Err gf_isom_dump_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, u32 SampleNum, FILE *trace);
+/*! dumps ismacrypt protection of sample descriptions to xml trace
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param trace the file object to dump to
+\return error if any
+*/
+GF_Err gf_isom_dump_ismacryp_protection(GF_ISOFile *isom_file, u32 trackNumber, FILE * trace);
+/*! dumps ismacrypt sample to xml trace
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param SampleNum the target sample number
+\param trace the file object to dump to
+\return error if any
+*/
+GF_Err gf_isom_dump_ismacryp_sample(GF_ISOFile *isom_file, u32 trackNumber, u32 SampleNum, FILE *trace);
 #endif
 
-
-/********************************************************************
-				GENERAL META API FUNCTIONS
-
-	  Meta can be stored at several places in the file layout:
-		* root level (like moov, ftyp and co)
-		* moov level
-		* track level
-	Meta API uses the following parameters for all functions:
-
-	 gf_isom_*_meta_*(GF_ISOFile *file, Bool root_meta, u32 track_num, ....) with:
-		@root_meta: if set, accesses file root meta
-		@track_num: if root_meta not set, specifies whether the target meta is at the
-			moov level (track_num=0) or at the track level.
-
-********************************************************************/
-
-/*gets meta type. Returned value: 0 if no meta found, or four char code of meta (eg, "mp21", "smil", ...)*/
-u32 gf_isom_get_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num);
-
-/*indicates if the meta has an XML container (note that XML data can also be included as items).
-return value: 0 (no XML or error), 1 (XML text), 2 (BinaryXML, eg BiM) */
-u32 gf_isom_has_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num);
-
-/*extracts XML (if any) from given meta
-	@outName: output file path and location for writing
-	@is_binary: indicates if XML is Bim or regular XML
-*/
-GF_Err gf_isom_extract_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, char *outName, Bool *is_binary);
-
-/*returns number of items described in this meta*/
-u32 gf_isom_get_meta_item_count(GF_ISOFile *file, Bool root_meta, u32 track_num);
-
-/*gets item info for the given item
-	@item_num: 1-based index of item to query
-	@itemID (optional): item ID in file
-	@type: item 4CC type
-	@is_self_reference: item is the file itself
-	@item_name (optional): item name
-	@item_mime_type (optional): item mime type
-	@item_encoding (optional): item content encoding type
-	@item_url, @item_urn (optional): url/urn of external resource containing this item data if any.
-		When item is fully contained in file, these are set to NULL
-
+/*! gets CENC configuration for a given sample
+\param isom_file the target ISO file
+\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)
+\return error if any
 */
-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,
-                                  const char **item_name, const char **item_mime_type, const char **item_encoding,
-                                  const char **item_url, const char **item_urn);
+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);
 
 
-/*gets item idx from item ID*/
-u32 gf_isom_get_meta_item_by_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_ID);
+/*! @} */
 
-/*extracts item from given meta
-	@item_num: 1-based index of item to query
-	@dump_file_name: if NULL, use item name for dumping
-*/
-GF_Err gf_isom_extract_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num, const char *dump_file_name);
+/*!
+\addtogroup isometa_grp Meta and Image File Format
+\ingroup iso_grp
 
-/*extracts item from given meta in memory
-	@item_num: 1-based index of item to query
+@{
 */
-GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **mime_type, Bool use_annex_b);
 
-/*retirves 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 *file, Bool root_meta, u32 track_num);
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-/*sets meta type (four char int, eg "mp21", ...
-	Creates a meta box if none found
-	if metaType is 0, REMOVES META
+/*! gets meta type
+\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
+\return 0 if no meta found, or four char code of meta (eg, "mp21", "smil", ...)*/
+u32 gf_isom_get_meta_type(GF_ISOFile *isom_file, Bool root_meta, u32 track_num);
+
+/*! checks if the meta has an XML container (note that XML data can also be included as items).
+\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
+\return 0 (no XML or error), 1 (XML text), 2 (BinaryXML, eg BiM) */
+u32 gf_isom_has_meta_xml(GF_ISOFile *isom_file, Bool root_meta, u32 track_num);
+
+/*! extracts XML (if any) from given meta
+\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 outName output file path and location for writing
+\param is_binary indicates if XML is Bim or regular XML
+\return error if any
+*/
+GF_Err gf_isom_extract_meta_xml(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, char *outName, Bool *is_binary);
+
+/*! checks the number of items in a meta
+\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
+\return number of items*/
+u32 gf_isom_get_meta_item_count(GF_ISOFile *isom_file, Bool root_meta, u32 track_num);
+
+/*! gets item info for the given item
+\note When an item is fully contained in file, both item_url and item_urn are set to NULL
+
+\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
+\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 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)
+\param item_encoding set to the item content encoding type (optional, can be NULL)
+\param item_url set to the URL of external resource containing this item data if any.
+\param item_urn set to the URN of external resource containing this item data if any.
+\return error if any
 */
-GF_Err gf_isom_set_meta_type(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 metaType);
+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,
+                                  const char **item_name, const char **item_mime_type, const char **item_encoding,
+                                  const char **item_url, const char **item_urn);
 
-/*removes meta XML info if any*/
-GF_Err gf_isom_remove_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num);
 
-/*set meta XML data from file - erase any previously (Binary)XML info*/
-GF_Err gf_isom_set_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, char *XMLFileName, Bool IsBinaryXML);
-/*set meta XML data from memory - erase any previously (Binary)XML info*/
-GF_Err gf_isom_set_meta_xml_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, unsigned char *data, u32 data_size, Bool IsBinaryXML);
+/*! gets item index from 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 item_ID ID of the item to search
+\return item index if found, 0 otherwise
+*/
+u32 gf_isom_get_meta_item_by_id(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_ID);
+
+/*! extracts an item from given meta
+\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
+\param dump_file_name if NULL, uses item name for dumping, otherwise dumps in given file object (binary write mode)
+\return error if any
+*/
+GF_Err gf_isom_extract_meta_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num, const char *dump_file_name);
+
+/*! extracts item from given meta in memory
+\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 out_data set to allocated buffer containing the item, shall be freeed by user
+\param out_size set to the size of the allocated buffer
+\param out_alloc_size set to the allocated size of the buffer (this allows passing an existing buffer without always reallocating it)
+\param mime_type set to the mime type of the item
+\param use_annex_b for image items based on NALU formats (AVC, HEVC) indicates to extract the data as Annex B format (with start codes)
+\return error if any
+*/
+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);
+
+/*! 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
+\param track_num if GF_TRUE and root_meta is GF_FALSE, uses meta at the track level
+\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);
 
+/*! item tile mode*/
 typedef enum {
+	/*! not a tile item*/
 	TILE_ITEM_NONE = 0,
+	/*! a tile item without base*/
 	TILE_ITEM_ALL_NO_BASE,
+	/*! a tile item with base*/
 	TILE_ITEM_ALL_BASE,
+	/*! a tile item grid*/
 	TILE_ITEM_ALL_GRID,
+	/*! a tile item single*/
 	TILE_ITEM_SINGLE
 } GF_TileItemMode;
 
+/*! Image item properties*/
 typedef struct
 {
-	u32 width, height;
-	u32 hSpacing, vSpacing;
-	u32 hOffset, vOffset;
+	/*! width in pixels*/
+	u32 width;
+	/*! height in pixless*/
+	u32 height;
+	/*! pixel aspect ratio numerator*/
+	u32 hSpacing;
+	/*! pixel aspect ratio denominator*/
+	u32 vSpacing;
+	/*! horizontal offset in pixels*/
+	u32 hOffset;
+	/*! vertical offset in pixels*/
+	u32 vOffset;
+	/*! angle in radians*/
 	u32 angle;
+	/*! hidden flag*/
 	Bool hidden;
+	/*! pointer to configuration box*/
 	void *config;
+	/*! tile item mode*/
 	GF_TileItemMode tile_mode;
+	/*! tile number */
 	u32 single_tile_number;
+	/*! time for importing*/
 	double time;
+	/*! file containg iCC data for importing*/
 	char iccPath[GF_MAX_PATH];
+	/*! is alpha*/
 	Bool alpha;
+	/*! number of channels*/
 	u8 num_channels;
+	/*! bits per channels in bits*/
 	u8 bits_per_channel[3];
 } GF_ImageItemProperties;
 
-GF_Err gf_isom_meta_get_next_item_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 *item_id);
 
-GF_Err gf_isom_add_meta_item(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 *URL, const char *URN, GF_ImageItemProperties *imgprop);
-/*same as above excepts take the item directly in memory*/
-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);
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gf_isom_iff_create_image_item_from_track(GF_ISOFile *movie, Bool root_meta, u32 meta_track_number, u32 track, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props, GF_List *item_extent_refs);
+/*! sets meta type (four char int, eg "mp21", ...), creating a meta box if not found
+\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 metaType the type of meta to create. If 0, removes the meta box
+\return error if any
+*/
+GF_Err gf_isom_set_meta_type(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 metaType);
+
+/*! removes meta XML info if any
+\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
+\return error if any
+*/
+GF_Err gf_isom_remove_meta_xml(GF_ISOFile *isom_file, Bool root_meta, u32 track_num);
+
+/*! sets meta XML data from file - erase any previously (Binary)XML info
+\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 XMLFileName the XML file to import as XML item
+\param IsBinaryXML indicates if the content of the XML file is binary XML (BIM) or not
+\return error if any
+*/
+GF_Err gf_isom_set_meta_xml(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, char *XMLFileName, Bool IsBinaryXML);
+/*! set meta XML data from memory - erase any previously (Binary)XML info
+\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 data buffer containing XML data
+\param data_size size of buffer in bytes
+\param IsBinaryXML indicates if the content of the buffer is binary XML (BIM) or not
+\return error if any
+*/
+GF_Err gf_isom_set_meta_xml_memory(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u8 *data, u32 data_size, Bool IsBinaryXML);
+
+/*! gets next available item ID in a meta
+\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 set to the next available item ID
+\return error if any
+*/
+GF_Err gf_isom_meta_get_next_item_id(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 *item_id);
+
+/*! adds an item to a meta box from file
+\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 self_reference if GF_TRUE, indicates that the item is in fact the entire container file
+\param resource_path path to the file to add
+\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 URL URL of the item for external data reference (data is not contained in meta parent file)
+\param URN URN of the item for external data reference (data is not contained in meta parent file)
+\param image_props image properties information for image items
+\return error if any
+*/
+GF_Err gf_isom_add_meta_item(GF_ISOFile *isom_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 *URL, const char *URN, GF_ImageItemProperties *image_props);
 
-/*removes item from meta*/
-GF_Err gf_isom_remove_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num);
+/*! item extend description*/
+typedef struct
+{
+	/*! offset of extent in file*/
+	u64 extent_offset;
+	/*! size of extent*/
+	u64 extent_length;
+	/*! index of extent*/
+	u64 extent_index;
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	/*! for storage only, original offset in source file*/
+	u64 original_extent_offset;
+#endif
+} GF_ItemExtentEntry;
 
-/*sets the given item as the primary one. You SHALL NOT use this if the meta has a valid XML data*/
-GF_Err gf_isom_set_meta_primary_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num);
 
-GF_Err gf_isom_meta_add_item_ref(GF_ISOFile *file, Bool root_meta, u32 trackID, u32 from_id, u32 to_id, u32 type, u64 *ref_index);
+/*! adds an item to a meta box from memory
+\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 data buffer containing the item data
+\param data_len size of item data buffer in bytes
+\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);
+
+/*! creates image item(s) from samples of a media track
+\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 media_track track number to import samples from
+\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
+\param item_extent_refs list of item extend description, or NULL
+\return error if any
+*/
+GF_Err gf_isom_iff_create_image_item_from_track(GF_ISOFile *isom_file, Bool root_meta, u32 meta_track_number, u32 media_track, const char *item_name, u32 item_id, GF_ImageItemProperties *image_props, GF_List *item_extent_refs);
+
+/*! removes item from meta
+\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 the item to remove
+\return error if any
+*/
+GF_Err gf_isom_remove_meta_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num);
+
+/*! sets the given item as the primary one
+\warning This SHALL NOT be used if the meta has a valid XML data
+\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 the item to remove
+\return error if any
+*/
+GF_Err gf_isom_set_meta_primary_item(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_num);
+
+/*! adds an item reference to another 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 from_id ID of item the reference is from
+\param to_id ID of item the reference is to
+\param type four character code of reference
+\param ref_index set to the 1-based index of the reference
+\return error if any
+*/
+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);
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Err gf_isom_get_meta_image_props(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, GF_ImageItemProperties *prop);
-
-
-/********************************************************************
-				Timed Meta-Data extensions
-********************************************************************/
+/*!
+\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 the item
+\param out_image_props set to the image properties information of the item
+\return error if any
+*/
+GF_Err gf_isom_get_meta_image_props(GF_ISOFile *isom_file, Bool root_meta, u32 track_num, u32 item_id, GF_ImageItemProperties *out_image_props);
 
-GF_Err gf_isom_get_xml_metadata_description(GF_ISOFile *file, u32 track, u32 sampleDescription, const char **_namespace, const char **schema_loc, const char **content_encoding);
+/*! @} */
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
-/*create a new timed metat data sample description for this track*/
-GF_Err gf_isom_new_xml_metadata_description(GF_ISOFile *movie, u32 trackNumber, const char *_namespace, const char *schema_loc, const char *content_encoding, u32 *outDescriptionIndex);
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
+/*!
+\addtogroup isotags_grp iTunes tagging
+\ingroup iso_grp
 
+@{
+*/
 
-/********************************************************************
-				iTunes info tags
-********************************************************************/
-enum
+/*! iTunes info tags */
+typedef enum
 {
 	/*probe is only used to check if iTunes info are present*/
 	GF_ISOM_ITUNE_PROBE = 0,
-	/*probe is only used to remove all tags*/
+	/*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' ),
@@ -2617,191 +5722,345 @@
 	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' ),
-};
-/*get the given tag info.
-!! 'genre' may be coded by ID, the libisomedia doesn't translate the ID. In such a case, the result data is set to NULL
-and the data_len to the genre ID
-returns GF_URL_ERROR if no tag is present in the file
+} GF_ISOiTunesTag;
+
+/*! gets the given itunes tag info.
+\warning 'genre' may be coded by ID, the libisomedia doesn't translate the ID. In such a case, the result data is set to NULL and the data_len to the genre ID
+
+\param isom_file the target ISO file
+\param tag the tag to query
+\param data set to the tag data pointer - do not modify
+\param data_len set to the size of the tag data
+\return error if any (GF_URL_ERROR if no tag is present in the file)
 */
-GF_Err gf_isom_apple_get_tag(GF_ISOFile *mov, u32 tag, const char **data, u32 *data_len);
+GF_Err gf_isom_apple_get_tag(GF_ISOFile *isom_file, GF_ISOiTunesTag tag, const u8 **data, u32 *data_len);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
-/*set the given tag info. If data and data_len are 0, removes the given tag
-For 'genre', data may be NULL in which case the genre ID taken from the data_len parameter
+/*! 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
+\return error if any
 */
-GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, u32 tag, const char *data, u32 data_len);
+GF_Err gf_isom_apple_set_tag(GF_ISOFile *isom_file, GF_ISOiTunesTag tag, const u8 *data, u32 data_len);
 
-/*sets compatibility tag on AVC tracks (needed by iPod to play files... hurray for standards)*/
-GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *the_file, u32 trackNumber);
+/*! sets compatibility tag on AVC tracks (needed by iPod to play files... hurray for standards)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\return error if any
+*/
+GF_Err gf_isom_set_ipod_compatible(GF_ISOFile *isom_file, u32 trackNumber);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+/*! @} */
 
-/*3GPP Alternate Group API - (c) 2007 Telecom ParisTech*/
+/*!
+\addtogroup isogrp_grp Track Groups
+\ingroup iso_grp
 
-/*gets the number of switching groups declared in this track if any:
-trackNumber: track number
-alternateGroupID: alternate group id of track if speciifed, 0 otherwise
-nb_groups: number of switching groups defined for this track
+@{
 */
-GF_Err gf_isom_get_track_switch_group_count(GF_ISOFile *movie, u32 trackNumber, u32 *alternateGroupID, u32 *nb_groups);
 
-/*returns the list of criteria (expressed as 4CC IDs, cf 3GPP TS 26.244)
-trackNumber: track number
-group_index: 1-based index of the group to inspect
-switchGroupID: ID of the switch group if any, 0 otherwise (alternate-only group)
-criteriaListSize: number of criteria items in returned list
+/*! gets the number of switching groups declared in this track if any
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param alternateGroupID alternate group id of track if speciifed, 0 otherwise
+\param nb_groups set to number of switching groups defined for this track
+\return error if any
+*/
+GF_Err gf_isom_get_track_switch_group_count(GF_ISOFile *isom_file, u32 trackNumber, u32 *alternateGroupID, u32 *nb_groups);
+
+/*! get the list of criteria (expressed as 4CC IDs, cf 3GPP TS 26.244)
+\param isom_file the target ISO file
+\param trackNumber the track number
+\param group_index the 1-based index of the group to inspect
+\param switchGroupID set to the ID of the switch group if any, 0 otherwise (alternate-only group)
+\param criteriaListSize set to the number of criteria items in returned list
+\return list of criteria (four character codes, cf 3GPP TS 26.244) for the switch group
 */
-const u32 *gf_isom_get_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, u32 group_index, u32 *switchGroupID, u32 *criteriaListSize);
+const u32 *gf_isom_get_track_switch_parameter(GF_ISOFile *isom_file, u32 trackNumber, u32 group_index, u32 *switchGroupID, u32 *criteriaListSize);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-/*sets a new (switch) group for this track
-trackNumber: track
-trackRefGroup: number of a track belonging to the same alternate group. If 0, a new alternate group will be created for this track
-is_switch_group: if set, indicates that a switch group identifier shall be assigned to the created group. Otherwise, the criteria list is associated with the entire alternate group
-switchGroupID: SHALL NOT BE NULL
-	input: specifies the desired switchGroupID to use. If value is 0, next available switchGroupID in file is used.
-	output: indicates the switchGroupID used.
-criteriaList, criteriaListCount: criteria list and size. Criterias are expressed as 4CC IDs, cf 3GPP TS 26.244
+/*! sets a new (switch) group for this track
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param trackRefGroup number of a track belonging to the same alternate group. If 0, a new alternate group will be created for this track
+\param is_switch_group if set, indicates that a switch group identifier shall be assigned to the created group. Otherwise, the criteria list is associated with the entire alternate group
+\param switchGroupID set to the ID of the switch group. On input, specifies the desired switchGroupID to use; if value is 0, next available switchGroupID in file is used. On output, is set to the switchGroupID used.
+\param criteriaList list of four character codes used as criteria - cf 3GPP TS 26.244
+\param criteriaListCount number of criterias in list
+\return error if any
+*/
+GF_Err gf_isom_set_track_switch_parameter(GF_ISOFile *isom_file, u32 trackNumber, u32 trackRefGroup, Bool is_switch_group, u32 *switchGroupID, u32 *criteriaList, u32 criteriaListCount);
+
+/*! resets track switch group information
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param reset_all_group if GF_TRUE, resets the entire alternate group this track belongs to; otherwise, resets switch group for the track only
+\return error if any
+*/
+GF_Err gf_isom_reset_track_switch_parameter(GF_ISOFile *isom_file, u32 trackNumber, Bool reset_all_group);
+
+/*! resets all track switch group information in the entire movie
+\param isom_file the target ISO file
+\return error if any
+*/
+GF_Err gf_isom_reset_switch_parameters(GF_ISOFile *isom_file);
+
+/*! sets track in group of a given type and ID
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param track_group_id ID of the track group
+\param group_type four character code of the track group
+\param do_add if GF_FALSE, track is removed from that group, otherwise it is added
+\return error if any
 */
-GF_Err gf_isom_set_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, u32 trackRefGroup, Bool is_switch_group, u32 *switchGroupID, u32 *criteriaList, u32 criteriaListCount);
-
-/*resets track switch group information for the track or for the entire alternate group this track belongs to if reset_all_group is set*/
-GF_Err gf_isom_reset_track_switch_parameter(GF_ISOFile *movie, u32 trackNumber, Bool reset_all_group);
+GF_Err gf_isom_set_track_group(GF_ISOFile *isom_file, u32 trackNumber, u32 track_group_id, u32 group_type, Bool do_add);
 
-/*resets ALL track switch group information in the entire movie*/
-GF_Err gf_isom_reset_switch_parameters(GF_ISOFile *movie);
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-
-typedef struct
-{
-	u8 profile;
-	u8 level;
-	u8 pathComponents;
-	Bool fullRequestHost;
-	Bool streamType;
-	u8 containsRedundant;
-	const char *textEncoding;
-	const char *contentEncoding;
-	const char *content_script_types;
-	const char *mime_type;
-	const char *xml_schema_loc;
-} GF_DIMSDescription;
-
-GF_Err gf_isom_get_dims_description(GF_ISOFile *movie, u32 trackNumber, u32 descriptionIndex, GF_DIMSDescription *desc);
-#ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err gf_isom_new_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 *outDescriptionIndex);
-GF_Err gf_isom_update_dims_description(GF_ISOFile *movie, u32 trackNumber, GF_DIMSDescription *desc, char *URLname, char *URNname, u32 DescriptionIndex);
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+/*! @} */
 
+/*!
+\addtogroup isosubs_grp Subsamples
+\ingroup iso_grp
 
-struct __ec3_stream
-{
-	u8 fscod;
-	u8 bsid;
-	u8 bsmod;
-	u8 acmod;
-	u8 lfon;
-	/*only for EC3*/
-	u8 nb_dep_sub;
-	u8 chan_loc;
-};
+@{
+*/
 
-/*AC3 config record*/
-typedef struct
-{
-	u8 is_ec3;
-	u8 nb_streams; //1 for AC3, max 8 for EC3
-	u16 brcode; //if AC3 is bitrate code, otherwise cumulated datarate of EC3 streams
-	struct __ec3_stream streams[8];
-} GF_AC3Config;
 
-GF_AC3Config *gf_isom_ac3_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+/*! 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 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);
+
+/*! gets subsample information on a sample
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\param flags the subsample flags to query (may be 0)
+\param subSampleNumber the 1-based index of the subsample (see \ref gf_isom_sample_has_subsamples)
+\param size set to the subsample size
+\param priority set to the subsample priority
+\param reserved set to the subsample reserved value (may be used by derived specifications)
+\param discardable set to GF_TRUE if subsample is discardable
+\return error if any*/
+GF_Err gf_isom_sample_get_subsample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 flags, u32 subSampleNumber, u32 *size, u8 *priority, u32 *reserved, Bool *discardable);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err gf_isom_ac3_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AC3Config *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
+/*! adds subsample information to a given sample. Subsample information shall be added in increasing order of sampleNumbers, insertion of information is not supported
 
+\note it is possible to  add subsample information for samples not yet added to the file
+\note specifying 0 as subSampleSize will remove the last subsample information if any
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\param flags the subsample flags to query (may be 0)
+\param subSampleSize size of the subsample. If 0, this will remove the last subsample information if any
+\param priority the subsample priority
+\param reserved the subsample reserved value (may be used by derived specifications)
+\param discardable indicates if the subsample is discardable
+\return error if any*/
+GF_Err gf_isom_add_subsample(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
 
 
-/*returns the number of subsamples in the given sample for the given flags*/
-u32 gf_isom_sample_has_subsamples(GF_ISOFile *movie, u32 track, u32 sampleNumber, u32 flags);
-GF_Err gf_isom_sample_get_subsample(GF_ISOFile *movie, u32 track, u32 sampleNumber, u32 flags, u32 subSampleNumber, u32 *size, u8 *priority, u32 *reserved, Bool *discardable);
-#ifndef GPAC_DISABLE_ISOM_WRITE
-/*adds subsample information to a given sample. Subsample information shall be added in increasing order of sampleNumbers, insertion of information is not supported.
-Note that you may add subsample information for samples not yet added to the file
-specifying 0 as subSampleSize will remove the last subsample information if any*/
-GF_Err gf_isom_add_subsample(GF_ISOFile *movie, u32 track, u32 sampleNumber, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
-#endif
-/*add subsample information for the latest sample added to the current track fragment*/
-GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, u32 TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
-
-/*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, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf);
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+/*! adds subsample information for the latest sample added to the current track fragment
+\param isom_file the target ISO file
+\param TrackID the ID of the target track
+\param flags the subsample flags to query (may be 0)
+\param subSampleSize size of the subsample. If 0, this will remove the last subsample information if any
+\param priority the subsample priority
+\param reserved the subsample reserved value (may be used by derived specifications)
+\param discardable indicates if the subsample is discardable
+\return error if any*/
+GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *isom_file, GF_ISOTrackID TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
+#endif // GPAC_DISABLE_ISOM_FRAGMENTS
 
-/*gets the number of the next moof to be produced*/
-u32 gf_isom_get_next_moof_number(GF_ISOFile *movie);
-/*Sets the number of the next moof to be produced*/
-void gf_isom_set_next_moof_number(GF_ISOFile *movie, u32 value);
+#endif //GPAC_DISABLE_ISOM_WRITE
 
+/*! @} */
 
-/*returns 'rap ' and 'roll' group info for the given sample*/
-GF_Err gf_isom_get_sample_rap_roll_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, Bool *is_rap, Bool *has_roll, s32 *roll_distance);
+/*!
+\addtogroup isosgdp_grp Sample Groups
+\ingroup iso_grp
 
-/*returns opaque data of sample group*/
-Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const char **data, u32 *size);
+@{
+*/
 
-Bool gf_isom_has_cenc_sample_group(GF_ISOFile *the_file, u32 trackNumber);
+/*! defined sample groups in GPAC*/
+enum {
+	GF_ISOM_SAMPLE_GROUP_ROLL = GF_4CC( 'r', 'o', 'l', 'l'),
+	GF_ISOM_SAMPLE_GROUP_PROL = GF_4CC( 'p', 'r', 'o', 'l'),
+	GF_ISOM_SAMPLE_GROUP_RAP = GF_4CC( 'r', 'a', 'p', ' ' ),
+	GF_ISOM_SAMPLE_GROUP_SEIG = GF_4CC( 's', 'e', 'i', 'g' ),
+	GF_ISOM_SAMPLE_GROUP_OINF = GF_4CC( 'o', 'i', 'n', 'f'),
+	GF_ISOM_SAMPLE_GROUP_LINF = GF_4CC( 'l', 'i', 'n', 'f'),
+	GF_ISOM_SAMPLE_GROUP_TRIF = GF_4CC( 't', 'r', 'i', 'f' ),
+	GF_ISOM_SAMPLE_GROUP_NALM = GF_4CC( 'n', 'a', 'l', 'm'),
+	GF_ISOM_SAMPLE_GROUP_TELE = GF_4CC( 't', 'e', 'l', 'e'),
+	GF_ISOM_SAMPLE_GROUP_SAP = GF_4CC( 's', 'a', 'p', ' '),
+	GF_ISOM_SAMPLE_GROUP_ALST = GF_4CC( 'a', 'l', 's', 't'),
+	GF_ISOM_SAMPLE_GROUP_RASH = GF_4CC( 'r', 'a', 's', 'h'),
+	GF_ISOM_SAMPLE_GROUP_AVLL = GF_4CC( 'a', 'v', 'l', 'l'), //p15
+	GF_ISOM_SAMPLE_GROUP_AVSS = GF_4CC( 'a', 'v', 's', 's'), //p15
+	GF_ISOM_SAMPLE_GROUP_DTRT = GF_4CC( 'd', 't', 'r', 't'), //p15
+	GF_ISOM_SAMPLE_GROUP_MVIF = GF_4CC( 'm', 'v', 'i', 'f'), //p15
+	GF_ISOM_SAMPLE_GROUP_SCIF = GF_4CC( 's', 'c', 'i', 'f'), //p15
+	GF_ISOM_SAMPLE_GROUP_SCNM = GF_4CC( 's', 'c', 'n', 'm'), //p15
+	GF_ISOM_SAMPLE_GROUP_STSA = GF_4CC( 's', 't', 's', 'a'), //p15
+	GF_ISOM_SAMPLE_GROUP_TSAS = GF_4CC( 't', 's', 'a', 's'), //p15
+	GF_ISOM_SAMPLE_GROUP_SYNC = GF_4CC( 's', 'y', 'n', 'c'), //p15
+	GF_ISOM_SAMPLE_GROUP_TSCL = GF_4CC( 't', 's', 'c', 'l'), //p15
+	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
+};
 
-/*returns tile info */
-Bool gf_isom_get_tile_info(GF_ISOFile *file, u32 trackNumber, u32 sample_description_index, u32 *default_sample_group_index, u32 *id, u32 *independent, Bool *full_frame, u32 *x, u32 *y, u32 *w, u32 *h);
+/*! gets 'rap ' and 'roll' group info for the given sample
+\param isom_file the target ISO file
+\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_TRUE of sample has roll information, GF_FALSE 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, Bool *has_roll, s32 *roll_distance);
+
+/*! returns opaque data of sample group
+\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 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);
+
+/*! 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
+\return GF_TRUE if found, GF_FALSE otherwise*/
+Bool gf_isom_has_cenc_sample_group(GF_ISOFile *isom_file, u32 trackNumber);
+
+/*! gets HEVC tiling info
+\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 default_sample_group_index set to the default index for this sample group description if any, 0 otherwise (no defaults)
+\param id set to the tile group ID
+\param independent set to independent flag of the tile group (0: not constrained, 1: constrained in layer, 2: all intra slices)
+\param full_frame set to GF_TRUE if the tile corresponds to the entire picture
+\param x set to the horizontal position in pixels
+\param y set to the vertical position in pixels
+\param w set to the width in pixels
+\param h set to the height in pixels
+\return GF_TRUE if found, GF_FALSE otherwise*/
+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);
 
-/*returns true if date/version info droping is enabled */
-Bool gf_isom_drop_date_version_info_enabled(GF_ISOFile *file);
 
-/*sample groups information*/
 #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
-num_leading_sample is the number of samples to after this RAP that have dependences on samples before this RAP and hence should be discarded
-- currently sample group info MUST be added in order (no insertion in the tables)*/
-GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *movie, u32 track, u32 sample_number, u32 num_leading_samples);
-/*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)
-- currently sample group info MUST be added in order (no insertion in the tables)*/
-GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *movie, u32 track, u32 sample_number, s16 roll_distance);
-
-/*set encryption group for a sample_number; see GF_CENCSampleEncryptionGroupEntry for the parameters*/
-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_default(GF_ISOFile *movie, u32 track, u32 sample_number);
-
-GF_Err gf_isom_set_composition_offset_mode(GF_ISOFile *file, u32 track, Bool use_negative_offsets);
-
-//adds the given blob as a sample group description of the given grouping type. If default is set, the sample grouping will be marked as default.
-//sampleGroupDescriptionIndex is optional, used to retrieve the index
-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);
 
-//remove a sample group description of the give grouping type (if found)
-GF_Err gf_isom_remove_sample_group(GF_ISOFile *movie, u32 track, u32 grouping_type);
+/*! 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)
 
-//tags the sample in the grouping adds the given blob as a sample group description of the given grouping type. If default is set, the sample grouping will be marked as default
-GF_Err gf_isom_add_sample_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex, u32 grouping_type_parameter);
-
-
-//sets track in group of type group_type and id track_group_id. If do_add is GF_FALSE, track is removed from that group
-GF_Err gf_isom_set_track_group(GF_ISOFile *file, u32 track_number, u32 track_group_id, u32 group_type, Bool do_add);
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\param is_rap indicates if the sample is a RAP (open gop) sample
+\param num_leading_samples indicates the number of leading samples (samples after this RAP that have dependences on samples before this RAP and hence should be discarded when tuning in)
+\return error if any
+*/
+GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool is_rap, u32 num_leading_samples);
+
+/*! 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)
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\param is_roll indicates that the sample is a roll recovery point
+\param roll_distance indicates the roll distance before a correct decoding is produced
+\return error if any
+*/
+GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, Bool is_roll, s16 roll_distance);
+
+/*! sets encryption group for a sample number
+\param isom_file the target ISO file
+\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
+\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);
+
+/*! 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
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\return error if any
+*/
+GF_Err gf_isom_set_sample_cenc_default_group(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber);
+
+/*! adds the given blob as a sample group description entry of the given grouping type.
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param grouping_type the four character code of the grouping type
+\param data the payload of the sample group description
+\param data_size the size of the payload
+\param is_default if GF_TRUE, thie created entry will be marked as the default entry for the sample group description
+\param sampleGroupDescriptionIndex is set to the sample group description index (optional, can be NULL)
+\return error if any
+*/
+GF_Err gf_isom_add_sample_group_info(GF_ISOFile *isom_file, u32 trackNumber, u32 grouping_type, void *data, u32 data_size, Bool is_default, u32 *sampleGroupDescriptionIndex);
+
+/*! removes a sample group description of the give grouping type, if found
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param grouping_type the four character code of the grouping type
+\return error if any
+*/
+GF_Err gf_isom_remove_sample_group(GF_ISOFile *isom_file, u32 trackNumber, u32 grouping_type);
+
+/*! adds a sample to the given sample group
+\param isom_file the target ISO file
+\param trackNumber the target track
+\param sampleNumber the target sample number
+\param grouping_type the four character code of the grouping type
+\param sampleGroupDescriptionIndex the 1-based index of the sample group description entry
+\param grouping_type_parameter the grouping type paramter (see ISO/IEC 14496-12)
+\return error if any
+*/
+GF_Err gf_isom_add_sample_info(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleNumber, u32 grouping_type, u32 sampleGroupDescriptionIndex, u32 grouping_type_parameter);
 
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+/*! sets sample group descriptions storage in trafs and not in initial movie (Smooth compatibility)
+\param isom_file the target ISO file
+\return error if any*/
+GF_Err gf_isom_set_sample_group_in_traf(GF_ISOFile *isom_file);
 #endif
 
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID,
-									u8 *crypt_byte_block, u8 *skip_byte_block, u8 *constant_IV_size, bin128 *constant_IV);
+#endif // GPAC_DISABLE_ISOM_WRITE
 
 
-#endif /*GPAC_DISABLE_ISOM*/
-
 /*! @} */
 
+#endif /*GPAC_DISABLE_ISOM*/
 
 #ifdef __cplusplus
 }

gpac-0.8.0.tar.gz/include/gpac/laser.h -> gpac-1.0.0.tar.gz/include/gpac/laser.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2006-2012
+ *			Copyright (c) Telecom ParisTech 2006-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / BIFS codec sub-project
@@ -32,17 +32,18 @@
 
 
 /*!
- *	\file <gpac/laser.h>
- *	\brief MPEG-4 LASeR encoding and decoding.
- */
+\file <gpac/laser.h>
+\brief MPEG-4 LASeR encoding and decoding.
+*/
 	
 /*!
- *	\addtogroup laser_grp MPEG-4 LASER
- *	\ingroup mpeg4sys_grp
- *	\brief MPEG-4 LASeR encoding and decoding
- *
- *This section documents the LASeR encoding and decoding functions of the GPAC framework. For scene graph documentation, check scenegraph.h
- *	@{
+\addtogroup laser_grp MPEG-4 LASER
+\ingroup mpeg4sys_grp
+\brief MPEG-4 LASeR encoding and decoding
+
+This section documents the LASeR encoding and decoding functions of the GPAC framework. For scene graph documentation, check scenegraph.h
+
+@{
  */
 	
 #include <gpac/nodes_svg.h>
@@ -52,45 +53,108 @@
 /*for LASeRConfig*/
 #include <gpac/mpeg4_odf.h>
 
+/*! a LASeR codec*/
 typedef struct __tag_laser_codec GF_LASeRCodec;
 
 
-/*LASeR decoder constructor*/
+/*! creates a new LASeR decoder
+\param scenegraph the scenegraph on which the decoder operates
+\return a newly allocated LASeR decoder*/
 GF_LASeRCodec *gf_laser_decoder_new(GF_SceneGraph *scenegraph);
+/*! destroys a LASeR decoder
+\param codec the target LASeR decoder
+*/
 void gf_laser_decoder_del(GF_LASeRCodec *codec);
 
-/*sets the scene time. Scene time is the real clock of the bifs stream in secs*/
+/*! sets the scene time. Scene time is the real clock of the bifs stream in secs
+\param codec the target LASeR decoder
+\param GetSceneTime the scene clock query callback function
+\param st_cbk opaque data for the callback function
+*/
 void gf_laser_decoder_set_clock(GF_LASeRCodec *codec, Double (*GetSceneTime)(void *st_cbk), void *st_cbk );
 
-/*setup a stream*/
-GF_Err gf_laser_decoder_configure_stream(GF_LASeRCodec *codec, u16 ESID, char *DecoderSpecificInfo, u32 DecoderSpecificInfoLength);
-/*removes a stream*/
+/*! sets up a stream
+\param codec the target LASeR decoder
+\param ESID the ESID of the stream
+\param DecoderSpecificInfo the decoder configuration data of the LASeR stream
+\param DecoderSpecificInfoLength the size in bytes of the decoder configuration data
+\return error if any
+*/
+GF_Err gf_laser_decoder_configure_stream(GF_LASeRCodec *codec, u16 ESID, u8 *DecoderSpecificInfo, u32 DecoderSpecificInfoLength);
+/*! removes a stream
+\param codec the target LASeR decoder
+\param ESID the ESID of the stream
+\return error if any
+*/
 GF_Err gf_laser_decoder_remove_stream(GF_LASeRCodec *codec, u16 ESID);
 
-/*decode a laser AU and applies it to the graph (non-memory mode only)*/
-GF_Err gf_laser_decode_au(GF_LASeRCodec *codec, u16 ESID, const char *data, u32 data_length);
-
-/*Memory laser decoding - fills the command list with the content of the AU - cf scenegraph_vrml.h for commands usage
-	@ESID: ID of input stream
-	@data, @data_length: BIFS AU
-	@com_list: target list for decoded commands
+/*! decodes a LASeR AU and applies it to the graph (non-memory mode only)
+\param codec the target LASeR decoder
+\param ESID the ESID of the stream
+\param data the access unit payload
+\param data_length the access unit size in bytes
+\return error if any
 */
-GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, char *data, u32 data_length, GF_List *com_list);
-
+GF_Err gf_laser_decode_au(GF_LASeRCodec *codec, u16 ESID, const u8 *data, u32 data_length);
+
+/*! decodes a LASeR AU in memory - fills the command list with the content of the AU - cf scenegraph_vrml.h for commands usage
+\param codec the target LASeR decoder
+\param ESID the ESID of the stream
+\param data the access unit payload
+\param data_length the access unit size in bytes
+\param com_list a list to be filled with decoded commands
+\return error if any
+*/
+GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, u8 *data, u32 data_length, GF_List *com_list);
 
-/*constructor - @graph: scene graph being encoded*/
-GF_LASeRCodec *gf_laser_encoder_new(GF_SceneGraph *graph);
-/*destructor*/
+/*! checks if a LASeR decoder has associated conditionnals
+ \param codec the target LASeR decoder
+\return GF_TRUE if conditionnals are attached to this decoder
+*/
+Bool gf_laser_decode_has_conditionnals(GF_LASeRCodec *codec);
+
+/*! creates a new LASeR encoder
+\param scenegraph the scenegraph on which the encoder operates
+\return a newly allocated LASeR encoder*/
+GF_LASeRCodec *gf_laser_encoder_new(GF_SceneGraph *scenegraph);
+/*! destroys a LASeR encoder
+\param codec the target LASeR encoder
+*/
 void gf_laser_encoder_del(GF_LASeRCodec *codec);
-/*setup a destination stream*/
+/*! sets up a destination stream
+\param codec the target LASeR encoder
+\param ESID the ID of the stream
+\param cfg the LASeR configuration descriptor
+\return error if any
+*/
 GF_Err gf_laser_encoder_new_stream(GF_LASeRCodec *codec, u16 ESID, GF_LASERConfig *cfg);
-/*encodes a list of commands for the given stream in the output buffer - data is dynamically allocated for output*/
-GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_encoding_context, char **out_data, u32 *out_data_length);
-/*returns encoded config desc*/
-GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, char **out_data, u32 *out_data_length);
 
-/*Encodes current graph as a scene replace*/
-GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, char **out_data, u32 *out_data_length);
+/*! encodes a list of commands for the given stream in the output buffer - data is dynamically allocated for output
+\param codec the target LASeR encoder
+\param ESID the ID of the stream
+\param command_list a list of commands to encode
+\param reset_encoding_context if GF_TRUE, resets all color and font tables of LASeR streams (used for clean RAPs)
+\param out_data set to an allocated buffer containing the encoded AU - shall be destroyed by caller
+\param out_data_length set to the size of the encoded AU
+\return error if any
+*/
+GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_encoding_context, u8 **out_data, u32 *out_data_length);
+/*! gets a stream encoded config description
+\param codec the target LASeR encoder
+\param ESID the ID of the stream
+\param out_data set to an allocated buffer containing the encoded configuration - shall be destroyed by caller
+\param out_data_length set to the size of the encoded configuration
+\return error if any
+*/
+GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, u8 **out_data, u32 *out_data_length);
+
+/*! encodes current graph as a scene replace
+\param codec the target LASeR encoder
+\param out_data set to an allocated buffer containing the encoded scene replace AU - shall be destroyed by caller
+\param out_data_length set to the size of the encoded AU
+\return error if any
+*/
+GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, u8 **out_data, u32 *out_data_length);
 
 
 #endif /*GPAC_DISABLE_LASER*/

gpac-0.8.0.tar.gz/include/gpac/list.h -> gpac-1.0.0.tar.gz/include/gpac/list.h Changed

gpac-1.0.0.tar.gz/include/gpac/main.h Added

@@ -0,0 +1,249 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC
+ *
+ *  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_MAIN_H_
+#define _GF_MAIN_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+\file <gpac/main.h>
+\brief main() macro for win32.
+ */
+
+/*!
+\addtogroup sysmain_grp
+@{
+
+Thiis section decribes functions useful when developping 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
+*/
+
+#include <gpac/setup.h>
+#include <gpac/utf.h>
+
+
+
+
+#if defined(WIN32) && !defined(NO_WMAIN)
+/*! macro for main() with wide to char conversion on windows platforms*/
+#define GF_MAIN_FUNC(__fun) \
+int wmain( int argc, wchar_t** wargv )\
+{\
+	int i;\
+	int res;\
+	size_t len;\
+	size_t 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;\
+		if (res_len > len) {\
+			fprintf(stderr, "Length allocated for conversion of wide char to UTF-8 not sufficient\n");\
+			return -1;\
+		}\
+	}\
+	res = __fun(argc, argv);\
+	for (i = 0; i < argc; i++) {\
+		free(argv[i]);\
+	}\
+	free(argv);\
+	return res;\
+}
+
+#else
+
+/*! macro for main() with wide to char conversion on windows platforms*/
+#define GF_MAIN_FUNC(__fun) \
+int main(int argc, char **argv) {\
+	return __fun( argc, argv ); \
+}
+
+#endif //win32
+
+/*! structure holding a gpac 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;
+} GF_GPACArg;
+
+//these 3 values match argument hints of filters
+/*! argument is of advanced type*/
+#define GF_ARG_HINT_ADVANCED	(1<<1)
+/*! argument is of expert type*/
+#define GF_ARG_HINT_EXPERT		(1<<2)
+/*! argument should not be presented in UIs*/
+#define GF_ARG_HINT_HIDE 		(1<<3)
+/*! argument is highly experimental*/
+#define GF_ARG_HINT_EXPERIMENTAL	(1<<4)
+
+/*! argument applies to the libgpac core subsystem*/
+#define GF_ARG_SUBSYS_CORE 		(1<<5)
+/*! argument applies to the log subsystem*/
+#define GF_ARG_SUBSYS_LOG 		(1<<6)
+/*! argument applies to the filter subsystem*/
+#define GF_ARG_SUBSYS_FILTERS 	(1<<7)
+/*! argument applies to the HTTP subsystem*/
+#define GF_ARG_SUBSYS_HTTP 		(1<<8)
+/*! argument applies to the video subsystem*/
+#define GF_ARG_SUBSYS_VIDEO 		(1<<9)
+/*! argument applies to the audio subsystem*/
+#define GF_ARG_SUBSYS_AUDIO 		(1<<10)
+/*! argument applies to the font and text subsystem*/
+#define GF_ARG_SUBSYS_TEXT 		(1<<11)
+/*! argument applies to the remotery subsystem*/
+#define GF_ARG_SUBSYS_RMT 		(1<<12)
+
+/*! argument is a boolean*/
+#define GF_ARG_BOOL		0
+/*! argument is a 32 bit integer*/
+#define GF_ARG_INT		1
+/*! argument is a double*/
+#define GF_ARG_DOUBLE	2
+/*! argument is a string*/
+#define GF_ARG_STRING	3
+/*! argument is a camma-separated list of strings*/
+#define GF_ARG_STRINGS	4
+
+/*! 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}
+
+/*! gets the options defined for libgpac
+\return array of options*/
+const GF_GPACArg *gf_sys_get_options();
+
+/*! check if the given option is a libgpac argument
+\param arg_name name of the argument
+\return 0 if not a libgpac core option, 1 if option not consuming an argument, 2 if option consuming an argument*/
+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)
+\return GF_TRUE if update is OK, GF_FALSE otherwise*/
+Bool gf_sys_set_cfg_option(const char *opt_string);
+
+/*! argument dump hint options */
+typedef enum
+{
+	/*! only dumps simple arguments*/
+	GF_ARGMODE_BASE=0,
+	/*! only dumps advanced arguments*/
+	GF_ARGMODE_ADVANCED,
+	/*! only dumps expert arguments*/
+	GF_ARGMODE_EXPERT,
+	/*! dumps all arguments*/
+	GF_ARGMODE_ALL
+} GF_SysArgMode;
+
+/*! flags for help formating*/
+typedef enum
+{
+	/*! first word in format string should be highlighted */
+ 	GF_PRINTARG_HIGHLIGHT_FIRST = 1,
+	/*! prints <br/> instead of new line*/
+	GF_PRINTARG_NL_TO_BR = 1<<1,
+	/*! first word in format string is an option descritptor*/
+	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*/
+	GF_PRINTARG_ADD_DASH = 1<<4,
+	/*! the generation is for markdown*/
+	GF_PRINTARG_MD = 1<<16,
+	/*! the generation is for man pages*/
+	GF_PRINTARG_MAN = 1<<17,
+	/*! XML < and > should be escaped (for  markdown generation only) */
+	GF_PRINTARG_ESCAPE_XML = 1<<18,
+	/*! '|' should be escaped (for  markdown generation only) */
+	GF_PRINTARG_ESCAPE_PIPE = 1<<19,
+} GF_SysPrintArgFlags;
+
+
+/*! prints a argument
+\param helpout destination file - if NULL, uses stderr
+\param flags dump flags
+\param arg argument to print
+\param arg_subsystem name of subsystem of argument (core, gpac, filter name) for localization)
+*/
+void gf_sys_print_arg(FILE *helpout, GF_SysPrintArgFlags flags, const GF_GPACArg *arg, const char *arg_subsystem);
+
+/*! prints libgpac help for builton core options to stderr
+\param helpout destination file - if NULL, uses stderr
+\param flags dump flags
+\param mode filtering mode based on argument  type
+\param subsystem_flags filtering mode based on argument subsytem flags
+*/
+void gf_sys_print_core_help(FILE *helpout, GF_SysPrintArgFlags flags, GF_SysArgMode mode, u32 subsystem_flags);
+
+/*! gets localized version of string identified by module name and identifier.
+\param sec_name name of the module to query, such as "gpac", "core", or filter name
+\param str_name name of string to query, such as acore/app option or a filter argument
+\param def_val default value to return if no locaization exists
+\return localized version of the string
+*/
+const char *gf_sys_localized(const char *sec_name, const char *str_name, const char *def_val);
+
+/*! formats help to output
+\param output output file to dump to
+\param flags help formatting flags
+\param fmt arguments of the format
+*/
+void gf_sys_format_help(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...);
+
+/*! very basic word match, check the number of source characters in order in dest
+\param orig word to test
+\param dst word to compare to
+\return GF_TRUE if words are similar, GF_FALSE otherwise
+*/
+Bool gf_sys_word_match(const char *orig, const char *dst);
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_MAIN_H_
+

gpac-0.8.0.tar.gz/include/gpac/maths.h -> gpac-1.0.0.tar.gz/include/gpac/maths.h Changed

gpac-0.8.0.tar.gz/include/gpac/media_tools.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Authoring Tools sub-project
@@ -27,8 +27,8 @@
 #define _GF_MEDIA_H_
 
 /*!
- *	\file <gpac/media_tools.h>
- *	\brief media tools helper for importing, exporting and analysing
+\file <gpac/media_tools.h>
+\brief media tools helper for importing, exporting and analysing
  */
 
 #ifdef __cplusplus
@@ -38,83 +38,90 @@
 #include <gpac/isomedia.h>
 #include <gpac/avparse.h>
 #include <gpac/config_file.h>
+#include <gpac/filters.h>
 
 /*!
- *	\addtogroup mt_grp ISOBMF Helper tools
- *	\ingroup media_grp
- *	\brief media tools helper for importing, exporting and analysing.
- *
- *This section documents media tools  functions .
- *	@{
+\addtogroup mt_grp ISOBMF Helper tools
+\ingroup media_grp
+\brief media tools helper for importing, exporting and analysing.
+
+This section documents media tools  functions .
+
+@{
  */
 
 
 /*!
- *computes file hash. If file is ISO-based, computre hash according to OMA (P)DCF (without MutableDRMInformation box)
- * \param file the source file to hash
- * \param hash the 20 bytes buffer in which sha128 is performed for this file
- * \return error if any.
+ *computes file hash.
+ If file is ISOBMFF based, computes hash according to OMA (P)DCF (without MutableDRMInformation box).
+ Otherwise this is equivalent to \ref gf_sha1_file
+ 
+\param file the source file to hash
+\param hash the 20 bytes buffer in which sha128 is performed for this file
+\return error if any.
  */
 GF_Err gf_media_get_file_hash(const char *file, u8 hash[20]);
 
 #ifndef GPAC_DISABLE_ISOM
 /*!
  Creates (if needed) a GF_ESD for the given track - THIS IS RESERVED for local playback
-only, since the OTI used when emulated is not standard...
- * \param mp4 source file
- * \param track track for which the esd is to be emulated
- * \return rebuilt ESD. It is the caller responsibility to delete it.
+only, since the OTI/codecid used when emulated is not standard...
+\param isom_file source file
+\param trackNumber track for which the esd is to be emulated
+\param sampleDescriptionIndex indicates the default sample description to map. 0 is equivalent to 1, first sample description
+\return rebuilt ESD. It is the caller responsibility to delete it.
  */
-GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track);
+GF_ESD *gf_media_map_esd(GF_ISOFile *isom_file, u32 trackNumber, u32 sampleDescriptionIndex);
 
 /*!
 Creates (if needed) a GF_ESD for the given image item - THIS IS RESERVED for local playback
-only, since the OTI used when emulated is not standard...
-* \param mp4 source file
-* \param item_id item for which the esd is to be emulated
-* \return rebuilt ESD. It is the caller responsibility to delete it.
+only, since the OTI/codecid used when emulated is not standard...
+\param mp4 source file
+\param item_id item for which the esd is to be emulated
+\return rebuilt ESD. It is the caller responsibility to delete it.
 */
 GF_ESD *gf_media_map_item_esd(GF_ISOFile *mp4, u32 item_id);
 
 /*!
  * Get RFC 6381 description for a given track.
- * \param movie source movie
- * \param track track to check
- * \param szCodec a pointer to an already allocated string of size RFC6381_CODEC_NAME_SIZE_MAX bytes.
- * \param force_inband_xps force inband signaling of parameter sets.
- * \param force_sbr forces using explicit signaling for SBR.
- * \return error if any.
+\param isom_file source ISOBMF file
+\param trackNumber track to check
+\param szCodec a pointer to an already allocated string of size RFC6381_CODEC_NAME_SIZE_MAX bytes.
+\param force_inband_xps force inband signaling of parameter sets.
+\param force_sbr forces using explicit signaling for SBR.
+\return error if any.
  */
-GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec, Bool force_inband_xps, Bool force_sbr);
+GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *isom_file, u32 trackNumber, char *szCodec, Bool force_inband_xps, Bool force_sbr);
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*!
  *Changes pixel aspect ratio for visual tracks if supported. Negative values remove any PAR info
- * \param file target ISOBMF file
- * \param track target track
- * \param ar_num aspect ratio numerator
- * \param ar_den aspect ratio denominator
- * \param force_par aspect ratio is always written even when not necessary
- * \return error if any
+\param isom_file target ISOBMF file
+\param trackNumber target track
+\param ar_num aspect ratio numerator. A value of 0 removes PAR info, a value of -1 gets info from video bitstream for BOTH num and den
+\param ar_den aspect ratio denominator. A value of 0 removes PAR info, a value of -1 gets info from video bitstream for BOTH num and den
+\param force_par aspect ratio is always written even when 1:1, otherwise aspect ratio info is removed if 1:1
+\param rewrite_par aspect ratio is modified in bitstream. Ignored if ar_num or ar_den are not strictly positive
+\return error if any
  */
-GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den, Bool force_par);
+GF_Err gf_media_change_par(GF_ISOFile *isom_file, u32 trackNumber, s32 ar_num, s32 ar_den, Bool force_par, Bool rewrite_par);
 
 /*!
  *Removes all non rap samples (sync and other RAP sample group info) from the track.
- * \param file target movie
- * \param track target track
- * \param do_thin if set, removes only non-reference pictures
- * \return error if any
+\param isom_file target ISOBMF file
+\param trackNumber target track
+\param non_ref_only if GF_TRUE, removes only non-reference pictures
+\return error if any
  */
-GF_Err gf_media_remove_non_rap(GF_ISOFile *file, u32 track, Bool non_ref_only);
+GF_Err gf_media_remove_non_rap(GF_ISOFile *isom_file, u32 trackNumber, Bool non_ref_only);
 
 /*!
  *updates bitrate info on given track.
- * \param file target movie
- * \param track target track
+\param isom_file target ISOBMF file
+\param trackNumber target track
  */
-void gf_media_update_bitrate(GF_ISOFile *file, u32 track);
+void gf_media_update_bitrate(GF_ISOFile *isom_file, u32 trackNumber);
 
 #endif
 
@@ -122,17 +129,18 @@
 
 
 /*!
- *	\addtogroup mimp_grp ISOBMF Importers
- *	\ingroup media_grp
- *	\brief Media importing.
- *
- *This section documents media tools helper functions for importing, exporting and analysing.
- *	@{
- */
+\addtogroup mimp_grp ISOBMF Importers
+\ingroup media_grp
+\brief Media importing.
+
+This section documents media tools helper functions for importing, exporting and analysing.
+
+@{
+*/
 
 /*!
-* Default import FPS for video when no VUI/timing information is found
-*	\hideinitializer
+Default import FPS for video when no VUI/timing information is found
+\hideinitializer
 */
 #define GF_IMPORT_DEFAULT_FPS	25.0
 
@@ -148,8 +156,8 @@
 */
 
 /*!
- * Track importer flags
- *	\hideinitializer
+Track importer flags
+\hideinitializer
 */
 enum
 {
@@ -169,8 +177,7 @@
 	/*! special flag for text import at run time (never set on probe), indicates to leave the text box empty
 	so that we dynamically adapt to display size*/
 	GF_IMPORT_SKIP_TXT_BOX = 1<<6,
-	/*! indicates to keep unknown tracks from .MOV/.IsoMedia files*/
-	GF_IMPORT_KEEP_ALL_TRACKS = 1<<7,
+
 	/*! uses compact size in .MOV/.IsoMedia files*/
 	GF_IMPORT_USE_COMPACT_SIZE = 1<<8,
 	/*! don't add a final empty sample when importing text tracks from srt*/
@@ -193,8 +200,7 @@
 	GF_IMPORT_FORCE_SYNC = 1<<16,
 	/*! keep trailing 0 bytes in AU payloads when any*/
 	GF_IMPORT_KEEP_TRAILING = 1<<17,
-	/*! forces inband parameter sets*/
-	GF_IMPORT_FORCE_XPS_INBAND = 1<<18,
+
 	/*! do not compute edit list for B-frames video tracks*/
 	GF_IMPORT_NO_EDIT_LIST = 1<<19,
 	/*! when set, only updates tracks info and return*/
@@ -217,22 +223,16 @@
 	GF_IMPORT_KEEP_AV1_TEMPORAL_OBU  = 1<<28,
 	/*! imports sample dependencies information*/
 	GF_IMPORT_SAMPLE_DEPS  = 1<<29,
-	/*! when set a default ccst box is used in the sample entry */
-	GF_IMPORT_USE_CCST  = 1<<30,
-
-	/*! when set by user during import, will abort*/
-	GF_IMPORT_DO_ABORT = 1<<31
+	
+	//GF_IMPORT_FILTER_STATS = 0x80000000	//(=1<<31)
 };
 
-
-
-#define GF_IMPORT_AUTO_FPS		10000.0
-
+/*! max supported numbers of tracks in importer*/
 #define GF_IMPORT_MAX_TRACKS	100
-	/*!
-	 * Track info for video media
-	 *	\hideinitializer
-	 */
+/*!
+Track info for video media
+\hideinitializer
+ */
 struct __track_video_info
 {
 	/*! video width in coded samples*/
@@ -247,8 +247,8 @@
 	Double FPS;
 };
 /*!
-* Track info for audio media
-*	\hideinitializer
+Track info for audio media
+\hideinitializer
 */
 struct __track_audio_info
 {
@@ -256,6 +256,8 @@
 	u32 sample_rate;
 	/*! number of channels*/
 	u32 nb_channels;
+	/*! samples per frame*/
+	u32 samples_per_frame;
 };
 
 /*!
@@ -265,12 +267,13 @@
 {
 	/*! ID of the track (PID, TrackID, etc ...)*/
 	u32 track_num;
-	/*! track type (one of GF_ISOM_MEDIA_XXXX)*/
-	u32 type;
-	/*! media type expressed as 4CC ('MPG1', 'MPG2', ISO 4CC, AVI 4CC)*/
-	u32 media_type;
-	/*! import flags supported by the importer*/
-	u32 flags;
+	/*! stream type (one of GF_STREAM_XXXX)*/
+	u32 stream_type;
+	/*! codec ID ( one of GF_CODECID_XXX*)*/
+	u32 codecid;
+	/*! GF_ISOM_MEDIA_* : vide, auxv, pict*/
+	u32 media_subtype;
+	Bool is_chapter;
 	/*! video format info*/
 	struct __track_video_info video_info;
 	/*! audio format info*/
@@ -319,7 +322,7 @@
 	/*! media source - selects importer type based on extension*/
 	char *in_name;
 	/*! import duration if any*/
-	u32 duration;
+	GF_Fraction duration;
 	/*! importer flags*/
 	u32 flags;
 	/*! importer swf flags*/
@@ -327,7 +330,7 @@
 	/*! importer swf flatten angle when converting curves*/
 	Float swf_flatten_angle;
 	/*! Forced video FPS (CMP, AVI, OGG, H264) - also used by SUB import. Ignored if 0*/
-	Double video_fps;
+	GF_Fraction video_fps;
 	/*! optional ESD to be updated by the importer (used for BT/XMT import)*/
 	GF_ESD *esd;
 	/*! optional format indication for media source (used in IM1 reference software)*/
@@ -376,6 +379,13 @@
 	struct __program_import_info pg_info[GF_IMPORT_MAX_TRACKS];
 	/*! last error encountered during import, internal to the importer*/
 	GF_Err last_error;
+	/*! any filter options to pass to source*/
+	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*/
+	const char *filter_chain;
+
 
 	GF_AudioSampleEntryImportMode asemode;
 
@@ -384,146 +394,158 @@
 
 	Bool is_alpha;
 	Bool keep_audelim;
+	u32 xps_inband;
+	u32 print_stats_graph;
+	u32 prog_id;
+
+	/*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;
+	GF_FilterSession *run_in_session;
+	char *update_mux_args;
+	u32 track_index;
 } GF_MediaImporter;
 
 /*!
  * Imports a media file
- \param importer the importer object
- \return error if any
+\param importer the importer object
+\return error if any
  */
 GF_Err gf_media_import(GF_MediaImporter *importer);
 
 
 /*!
  Adds chapter info contained in file
- \param file target movie
- \param chap_file target chapter file
- \param import_fps specifies the chapter frame rate (optional, ignored if 0 - defaults to 25). Most formats don't use this feature
- \return error if any
+\param isom_file target ISOBMF file
+\param chap_file target chapter file
+\param import_fps specifies the chapter frame rate (optional, ignored if 0 - defaults to 25). Most formats don't use this feature
+\param for_qt use QT signaling for chapter tracks
+\return error if any
  */
-GF_Err gf_media_import_chapters(GF_ISOFile *file, char *chap_file, Double import_fps);
+GF_Err gf_media_import_chapters(GF_ISOFile *isom_file, char *chap_file, GF_Fraction import_fps, Bool for_qt);
 
 /*!
   Make the file ISMA compliant: creates ISMA BIFS / OD tracks if needed, and update audio/video IDs
 the file should not contain more than one audio and one video track
- \param file the target movie
- \param keepESIDs if true, ES IDs are not changed.
- \param keepImage if true, keeps image tracks
- \param no_ocr if true, doesn't write clock references in MPEG-4 system info
- \return error if any
+\param isom_file the target ISOBMF file
+\param keepESIDs if true, ES IDs are not changed.
+\param keepImage if true, keeps image tracks
+\param no_ocr if true, doesn't write clock references in MPEG-4 system info
+\return error if any
 */
-GF_Err gf_media_make_isma(GF_ISOFile *file, Bool keepESIDs, Bool keepImage, Bool no_ocr);
+GF_Err gf_media_make_isma(GF_ISOFile *isom_file, Bool keepESIDs, Bool keepImage, Bool no_ocr);
 
 /*!
  Make the file 3GP compliant && sets profile
- \param file the target movie
- \return error if any
+\param isom_file the target ISOBMF file
+\return error if any
  */
-GF_Err gf_media_make_3gpp(GF_ISOFile *file);
+GF_Err gf_media_make_3gpp(GF_ISOFile *isom_file);
 
 /*!
  make the file playable on a PSP
- \param file the target movie
- \return error if any
+\param isom_file the target ISOBMF file
+\return error if any
 */
-GF_Err gf_media_make_psp(GF_ISOFile *file);
+GF_Err gf_media_make_psp(GF_ISOFile *isom_file);
 
 /*!
  adjust file params for QT prores
- \param file the target movie
- \return error if any
+\param qt_file the target QT file
+\return error if any
 */
-GF_Err gf_media_check_qt_prores(GF_ISOFile *mp4);
+GF_Err gf_media_check_qt_prores(GF_ISOFile *qt_file);
 
 /*! @} */
 
 /*!
- *	\addtogroup mnal_grp AVC and HEVC ISOBMFF tools
- *	\ingroup media_grp
- *	\brief Manipulation AVC and HEVC tracks in ISOBMFF.
- *
- *This section documents functions for manipulating AVC and HEVC tracks in ISOBMFF.
- *	@{
- */
+\addtogroup mnal_grp AVC and HEVC ISOBMFF tools
+\ingroup media_grp
+\brief Manipulation AVC and HEVC tracks in ISOBMFF.
+
+This section documents functions for manipulating AVC and HEVC tracks in ISOBMFF.
+
+@{
+*/
 
 /*!
  Changes the profile (if not 0) and level (if not 0) indication of the media - only AVC/H264 supported for now
- \param file the target movie
- \param track the target track
- \param profile the new profile to set
- \param level the new level to set
- \return error if any
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param profile the new profile to set
+\param level the new level to set
+\return error if any
  */
-GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level);
+GF_Err gf_media_change_pl(GF_ISOFile *isom_file, u32 trackNumber, u32 profile, u32 level);
 
 /*!
- Rewrite AVC samples if nalu size_length has to be changed
- \param file the target movie
- \param track the target track
- \param prev_size_in_bits previous size in bits of the NALU length field in the track
- \param new_size_in_bits new size in bits of the NALU length field in the track
- \return error if any
+ Rewrite NAL-based samples (AVC/HEVC/...) samples if nalu size_length has to be changed
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param new_size_in_bits new size in bits of the NALU length field in the track, for all samples description of the track
+\return error if any
  */
-GF_Err gf_media_avc_rewrite_samples(GF_ISOFile *file, u32 track, u32 prev_size_in_bits, u32 new_size_in_bits);
+GF_Err gf_media_nal_rewrite_samples(GF_ISOFile *isom_file, u32 trackNumber, u32 new_size_in_bits);
 
 /*!
  Split SVC layers
- \param file the target movie
- \param track the target track
- \param splitAll if set each layers will be in a single track, otherwise all non-base layers will be in the same track
- \return error if any
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param splitAll if set each layers will be in a single track, otherwise all non-base layers will be in the same track
+\return error if any
  */
-GF_Err gf_media_split_svc(GF_ISOFile *file, u32 track, Bool splitAll);
+GF_Err gf_media_split_svc(GF_ISOFile *isom_file, u32 trackNumber, Bool splitAll);
 
 /*!
  Merge SVC layers
- \param file the target movie
- \param track the target track
- \param mergeAll if set all layers will be merged a single track, otherwise all non-base layers will be merged in the same track
- \return error if any
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param mergeAll if set all layers will be merged a single track, otherwise all non-base layers will be merged in the same track
+\return error if any
 */
-GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll);
-
+GF_Err gf_media_merge_svc(GF_ISOFile *isom_file, u32 trackNumber, Bool mergeAll);
 
+/*! LHVC extractor mode*/
 typedef enum
 {
-	//use extractors
+	/*! use extractors*/
 	GF_LHVC_EXTRACTORS_ON,
-	//don't use extractors and keep base track inband/outofband param set signaling
+	/*! 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)
-	GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND,
+	/*! don't use extractors and force inband signaling in enhancement layer (for ATSC3)*/
+	GF_LHVC_EXTRACTORS_OFF_FORCE_INBAND
 } GF_LHVCExtractoreMode;
 
-/* !
- Split L-HEVC layers
- \param file the target movie
- \param track the target track
- \param for_temporal_sublayers if set only temporal sublayers are split, otherwise layers are split
- \param splitAll if set each layers will be in a single track, otherwise all non-base layers will be in the same track
- \param use_extractors if set, extractors are used in the enhancement layers.
- \return error if any
+/*! Split L-HEVC layers
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param for_temporal_sublayers if set only temporal sublayers are split, otherwise layers are split
+\param splitAll if set each layers will be in a single track, otherwise all non-base layers will be in the same track
+\param extractor_mode extractor mode
+\return error if any
  */
-GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode);
+GF_Err gf_media_split_lhvc(GF_ISOFile *isom_file, u32 trackNumber, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode);
 
-/* !
+/*!
  Split HEVC tiles into different tracks
- \param file the target movie
- \param signal_only if set to 1 or 2, inserts tile description and NAL->tile mapping but does not create separate tracks. If 2, NAL->tile mapping uses RLE
- \return error if any
+\param isom_file the target ISOBMF file
+\param signal_only if set to 1 or 2, inserts tile description and NAL->tile mapping but does not create separate tracks. If 2, NAL->tile mapping uses RLE
+\return error if any
  */
-GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file, u32 signal_only);
+GF_Err gf_media_split_hevc_tiles(GF_ISOFile *isom_file, u32 signal_only);
 
 
-/* !
+/*!
  Filter HEVC/L-HEVC NALUs by temporal IDs and layer IDs, removing all NALUs above the desired levels.
- \param file the target movie
- \param track the target track
- \param max_temporal_id_plus_one max temporal ID plus 1 of all NALUs to be removed.
- \param max_layer_id_plus_one max layer ID plus 1 of all NALUs to be removed.
- \return error if any
+\param isom_file the target ISOBMF file
+\param trackNumber the target track
+\param max_temporal_id_plus_one max temporal ID plus 1 of all NALUs to be removed.
+\param max_layer_id_plus_one max layer ID plus 1 of all NALUs to be removed.
+\return error if any
  */
-GF_Err gf_media_filter_hevc(GF_ISOFile *file, u32 track, u8 max_temporal_id_plus_one, u8 max_layer_id_plus_one);
+GF_Err gf_media_filter_hevc(GF_ISOFile *isom_file, u32 trackNumber, u8 max_temporal_id_plus_one, u8 max_layer_id_plus_one);
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
@@ -532,13 +554,14 @@
 
 
 /*!
- *	\addtogroup dashseg_grp DASH Segmenter
- *	\ingroup media_grp
- *	\brief MPEG-DASH creation.
- *
- *This section documents media functions for MPEG-DASH creation.
- *	@{
- */
+\addtogroup dashseg_grp DASH Segmenter
+\ingroup media_grp
+\brief MPEG-DASH creation.
+
+This section documents media functions for MPEG-DASH creation.
+
+@{
+*/
 
 /*!
  * DASH segmenter information per source
@@ -551,6 +574,8 @@
 	char *representationID;
 	/*! ID of the period. If not set, assigned automatically*/
 	char *periodID;
+	/*! ID of the adaptation set. If not set, assigned automatically.*/
+	u32 asID;
 	/*! forced media duration.*/
 	Double media_duration;
 	/*! number of base URLs in the baseURL structure*/
@@ -583,26 +608,44 @@
 	u32 bandwidth;
 	/*! forced period duration (used when using empty periods or xlink periods without content)*/
 	Double period_duration;
-	/*! if true, the dasher inputs will open each time the segmentation function is called */
-	Bool no_cache;
+	/*! forced dash target duration for this rep*/
+	Double 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*/
+	char *seg_template;
+	/*! sets name of HLS playlist*/
+	char *hls_pl;
 	/*! if true and only one media stream in target segment, the moov will use the media stream timescale*/
 	Bool sscale;
+	/*! only imports this track from the source*/
+	u32 track_id;
+	/*! non legacy options passed to dasher for source */
+	char *source_opts;
+	/*! filter chain to instantiate between this source and the dasher*/
+	char *filter_chain;
+	/*! period order, internal only*/
+	u32 period_order;
 } GF_DashSegmenterInput;
 
 /*!
- * DASH profile constants
- *	\hideinitializer
+DASH profile constants
+\hideinitializer
+
+Matches profile enum of dasher module: auto|live|onDemand|main|full|hbbtv1.5.live|dashavc264.live|dashavc264.onDemand
  */
 typedef enum
 {
-	/*! Full dash (no profile)*/
-	GF_DASH_PROFILE_FULL = 0,
+	/*! auto profile, internal use only*/
+	GF_DASH_PROFILE_AUTO = 0,
 	/*! Live dash profile for: live for ISOFF, SIMPLE for M2TS */
 	GF_DASH_PROFILE_LIVE,
 	/*! onDemand profile*/
  	GF_DASH_PROFILE_ONDEMAND,
 	/*! main profile*/
 	GF_DASH_PROFILE_MAIN,
+	/*! Full dash (no profile)*/
+	GF_DASH_PROFILE_FULL,
 
 	/*! industry profile HbbTV 1.5 ISOBMFF Live */
 	GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE,
@@ -610,15 +653,12 @@
 	GF_DASH_PROFILE_AVC264_LIVE,
 	/*! industry profile DASH-IF ISOBMFF onDemand */
 	GF_DASH_PROFILE_AVC264_ONDEMAND,
-
-	/*! Unknown profile, internal use only*/
-	GF_DASH_PROFILE_UNKNOWN
 } GF_DashProfile;
 
 
 /*!
- * DASH bitstream switching selector
- *	\hideinitializer
+DASH bitstream switching selector
+\hideinitializer
  */
 typedef enum
 {
@@ -638,8 +678,8 @@
 
 
 /*!
- * DASH media presentation type
- *	\hideinitializer
+DASH media presentation type
+\hideinitializer
  */
 typedef enum
 {
@@ -654,8 +694,8 @@
 } GF_DashDynamicMode;
 
 /*!
- * DASH selector for content protection descriptor location
- *	\hideinitializer
+DASH selector for content protection descriptor location
+\hideinitializer
  */
 typedef enum
 {
@@ -667,185 +707,188 @@
 	GF_DASH_CPMODE_BOTH,
 } GF_DASH_ContentLocationMode;
 
+/*! DASH segmenter*/
 typedef struct __gf_dash_segmenter GF_DASHSegmenter;
 
 /*!
  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 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
+\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 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
 */
-GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile profile, const char *tmp_dir, u32 timescale, GF_Config *dasher_context_file);
+GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile profile, const char *tmp_dir, u32 timescale, const char *dasher_context_file);
 /*!
  Deletes a DASH segmenter
- \param dasher the DASH segmenter object
+\param dasher the DASH segmenter object
 */
 void gf_dasher_del(GF_DASHSegmenter *dasher);
 
 /*!
  Removes the DASH inputs. Re-add new ones with gf_dasher_add_input()
- *	\param dasher the DASH segmenter object
+\param dasher the DASH segmenter object
 */
 void gf_dasher_clean_inputs(GF_DASHSegmenter *dasher);
 
 /*! Sets MPD info
- *	\param dasher the DASH segmenter object
- *	\param title MPD title
- *	\param copyright MPD copyright
- *	\param moreInfoURL MPD "more info" URL
- *	\param sourceInfo MPD source info
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param title MPD title
+\param copyright MPD copyright
+\param moreInfoURL MPD "more info" URL
+\param sourceInfo MPD source info
+\param lang MPD language for title
+\return error code if any
 */
-GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo);
+GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo, const char *lang);
 
 /*!
  Sets MPD Location. This is useful to distrubute a dynamic MPD by mail or any non-HTTP mean
- *	\param dasher the DASH segmenter object
- *	\param location the URL where this MPD can be found
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param location the URL where this MPD can be found
+\return error code if any
 */
 GF_Err gf_dasher_set_location(GF_DASHSegmenter *dasher, const char *location);
 
 /*!
  Adds a base URL to the MPD
- *	\param dasher the DASH segmenter object
- *	\param base_url base url to add
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param base_url base url to add
+\return error code if any
 */
 GF_Err gf_dasher_add_base_url(GF_DASHSegmenter *dasher, const char *base_url);
 
 /*!
  Enable URL template -  - may be overriden by the current profile
- *	\param dasher the DASH segmenter object
- *	\param enable enable usage of URL template
- *	\param default_template template for the segment name
- *	\param default_extension extension for the segment name
- *	\param default_extension extension for the initialization segment name
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable enable usage of URL template
+\param default_template template for the segment name
+\param default_extension extension for the segment name
+\param default_init_extension extension for the initialization segment name
+\return error code if any
 */
 
 GF_Err gf_dasher_enable_url_template(GF_DASHSegmenter *dasher, Bool enable, const char *default_template, const char *default_extension, const char *default_init_extension);
 
 /*!
  Enable Segment Timeline template - may be overriden by the current profile
- *	\param dasher the DASH segmenter object
- *	\param enable enable or disable
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable enable or disable
+\return error code if any
 */
 GF_Err gf_dasher_enable_segment_timeline(GF_DASHSegmenter *dasher, Bool enable);
 
 /*!
  Enables single segment - may be overriden by the current profile
- *	\param dasher the DASH segmenter object
- *	\param enable enable or disable
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable enable or disable
+\return error code if any
 */
 
 GF_Err gf_dasher_enable_single_segment(GF_DASHSegmenter *dasher, Bool enable);
 
 /*!
  Enable single file (with multiple segments) - may be overriden by the current profile
- *	\param dasher the DASH segmenter object
- *	\param enable enable or disable
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable enable or disable
+\return error code if any
 */
 GF_Err gf_dasher_enable_single_file(GF_DASHSegmenter *dasher, Bool enable);
 
 /*!
  Sets bitstream switching mode - may be overriden by the current profile
- *	\param dasher the DASH segmenter object
- *	\param bitstream_switching mode to use for bitstream switching
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param bitstream_switching mode to use for bitstream switching
+\return error code if any
 */
 GF_Err gf_dasher_set_switch_mode(GF_DASHSegmenter *dasher, GF_DashSwitchingMode bitstream_switching);
 
 /*!
  Sets segment and fragment durations.
- *	\param dasher the DASH segmenter object
- *	\param default_segment_duration the duration of a dash segment
- *	\param default_fragment_duration the duration of a dash fragment - if 0, same as default_segment_duration
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param default_segment_duration the duration of a dash segment
+\param default_fragment_duration the duration of a dash fragment - if 0, same as default_segment_duration
+\param sub_duration the duration in seconds of media to DASH. If 0, the whole sources will be processed.
+\return error code if any
 */
-GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration);
+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
- *	\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
- *	\return error code if any
+\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
+\return error code if any
 */
 
 GF_Err gf_dasher_enable_rap_splitting(GF_DASHSegmenter *dasher, Bool segments_start_with_rap, Bool fragments_start_with_rap);
 
 /*!
  Enables segment marker
- *	\param dasher the DASH segmenter object
- *	\param segment_marker_4cc 4CC code of the segment marker box
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param segment_marker_4cc 4CC code of the segment marker box
+\return error code if any
 */
 GF_Err gf_dasher_set_segment_marker(GF_DASHSegmenter *dasher, u32 segment_marker_4cc);
 
 /*!
  Enables segment indexes
- *	\param dasher the DASH segmenter object
- *	\param enable_sidx enable or disable
- *	\param subsegs_per_sidx number of subsegments per segment
- *	\param daisy_chain_sidx enable daisy chaining of sidx
- *	\param use_ssix enables ssix generation, level 1 for I-frames, the rest of the segement not  mapped
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable_sidx enable or disable
+\param subsegs_per_sidx number of subsegments per segment
+\param daisy_chain_sidx enable daisy chaining of sidx
+\param use_ssix enables ssix generation, level 1 for I-frames, the rest of the segment not mapped
+\return error code if any
 */
 GF_Err gf_dasher_enable_sidx(GF_DASHSegmenter *dasher, Bool enable_sidx, u32 subsegs_per_sidx, Bool daisy_chain_sidx, Bool use_ssix);
 
 /*!
  Sets mode for the dash segmenter.
- *	\param dasher the DASH segmenter object
- *	\param dash_mode the mode to use. Currently switching from static mode to dynamic mode is not well supported and may produce non-compliant MPDs
- *	\param mpd_update_time time between MPD refresh, in seconds. Used for dynamic mode, may be 0 if \p mpd_live_duration is set
- *	\param time_shift_depth the depth of the time shift buffer in seconds, -1 for infinite time shift.
- *	\param mpd_live_duration total duration of the DASH session in dynamic mode, in seconds. May be set to 0 if \p mpd_update_time is set
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param dash_mode the mode to use. Currently switching from static mode to dynamic mode is not well supported and may produce non-compliant MPDs
+\param mpd_update_time time between MPD refresh, in seconds. Used for dynamic mode, may be 0 if \p mpd_live_duration is set
+\param time_shift_depth the depth of the time shift buffer in seconds, -1 for infinite time shift.
+\param mpd_live_duration total duration of the DASH session in dynamic mode, in seconds. May be set to 0 if \p mpd_update_time is set
+\return error code if any
 */
 GF_Err gf_dasher_set_dynamic_mode(GF_DASHSegmenter *dasher, GF_DashDynamicMode dash_mode, Double mpd_update_time, s32 time_shift_depth, Double mpd_live_duration);
 
 /*!
  Sets the minimal buffer desired.
- *	\param dasher the DASH segmenter object
- *	\param min_buffer min buffer time in seconds for the DASH session. Currently the minimal buffer is NOT computed from the source material and must be set to an appropriate value.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param min_buffer min buffer time in seconds for the DASH session. Currently the minimal buffer is NOT computed from the source material and must be set to an appropriate value.
+\return error code if any
 */
 GF_Err gf_dasher_set_min_buffer(GF_DASHSegmenter *dasher, Double min_buffer);
 
 /*!
  Sets the availability start time offset.
- *	\param dasher the DASH segmenter object
- *	\param ast_offset ast offset in milliseconds. If >0, the DASH session availabilityStartTime will be earlier than UTC by the amount of seconds specified. If <0, the media representation will have an availabilityTimeOffset of the amount of seconds specified, instructing the client that segments may be accessed earlier.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param ast_offset ast offset in milliseconds. If >0, the DASH session availabilityStartTime will be earlier than UTC by the amount of seconds specified. If <0, the media representation will have an availabilityTimeOffset of the amount of seconds specified, instructing the client that segments may be accessed earlier.
+\return error code if any
 */
 GF_Err gf_dasher_set_ast_offset(GF_DASHSegmenter *dasher, s32 ast_offset);
 
 /*!
  Enables memory fragmenting: fragments will be written to disk only once completed
- *	\param dasher the DASH segmenter object
- *	\param enable Enables or disables. Default is disabled.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param enable Enables or disables. Default is disabled.
+\return error code if any
 */
 GF_Err gf_dasher_enable_memory_fragmenting(GF_DASHSegmenter *dasher, Bool enable);
 
 /*!
  Sets initial values for ISOBMFF sequence number and TFDT in movie fragments.
- *	\param dasher the DASH segmenter object
- *	\param initial_moof_sn sequence number of the first moof to be generated. Default value is 1.
- *	\param initial_tfdt initial tfdt of the first traf to be generated, in DASH segmenter timescale units. Default value is 0.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param initial_moof_sn sequence number of the first moof to be generated. Default value is 1.
+\param initial_tfdt initial tfdt of the first traf to be generated, in DASH segmenter timescale units. Default value is 0.
+\return error code if any
 */
 GF_Err gf_dasher_set_initial_isobmf(GF_DASHSegmenter *dasher, u32 initial_moof_sn, u64 initial_tfdt);
 
 
-
+/*! DASH PSSH storage mode*/
 typedef enum
 {
 	//! PSSH box in moov only
@@ -862,30 +905,32 @@
 
 /*!
  Configure how default values for ISOBMFF are stored
- *	\param dasher the DASH segmenter object
- *	\param no_fragments_defaults if set, fragments default values are repeated in each traf and not set in trex. Default value is GF_FALSE
- *	\param pssh_mode sets the storage mode of PSSH in moov/moof/mpd. 
- *	\param samplegroups_in_traf if set, all sample group definitions are stored in each traf and not set in init segment. Default value is GF_FALSE
- *	\param single_traf_per_moof if set, each moof will contain a single traf, even if source media is multiplexed. Default value is GF_FALSE
- *  \param tfdt_per_traf if set, each traf will contain a tfdt. Only applicable when single_traf_per_moof is GF_TRUE. Default value is GF_FALSE
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param no_fragments_defaults if set, fragments default values are repeated in each traf and not set in trex. Default value is GF_FALSE
+\param pssh_mode sets the storage mode of PSSH in moov/moof/mpd. 
+\param samplegroups_in_traf if set, all sample group definitions are stored in each traf and not set in init segment. Default value is GF_FALSE
+\param single_traf_per_moof if set, each moof will contain a single traf, even if source media is multiplexed. Default value is GF_FALSE
+\param tfdt_per_traf if set, each traf will contain a tfdt. Only applicable when single_traf_per_moof is GF_TRUE. Default value is GF_FALSE
+\param mvex_after_traks if set, the mvex box will be written after all track boxes
+\param sdtp_in_traf mode for sdtp storage in traf (smooth compatibility): 0: not allowed, 1: only stdp, no trun flags, 2: both (trun for sync, stdp for the rest)
+\return error code if any
 */
-GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf);
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf, Bool mvex_after_traks, u32 sdtp_in_traf);
 
 /*!
  Enables insertion of UTC reference in the beginning of segments
- *	\param dasher the DASH segmenter object
- *	\param insert_utc if set, UTC will be inserted. Default value is disabled.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param insert_utc if set, UTC will be inserted. Default value is disabled.
+\return error code if any
 */
 
 GF_Err gf_dasher_enable_utc_ref(GF_DASHSegmenter *dasher, Bool insert_utc);
 
 /*!
  Enables real-time generation of media segments.
- *	\param dasher the DASH segmenter object
- *	\param real_time if set, segemnts are generated in real time. Only supported for single representation (potentially multiplexed) DASH session. Default is disabled.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param real_time if set, segments are generated in real time. Only supported for single representation (potentially multiplexed) DASH session. Default is disabled.
+\return error code if any
 */
 GF_Err gf_dasher_enable_real_time(GF_DASHSegmenter *dasher, Bool real_time);
 
@@ -899,137 +944,146 @@
 
 /*!
  Sets profile extension as used by DASH-IF and DVB.
- *	\param dasher the DASH segmenter object
- *	\param dash_profile_extension specifies a string of profile extensions, as used by DASH-IF and DVB.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param dash_profile_extension specifies a string of profile extensions, as used by DASH-IF and DVB.
+\return error code if any
 */
 GF_Err gf_dasher_set_profile_extension(GF_DASHSegmenter *dasher, const char *dash_profile_extension);
 
-/*! Sets Dasher debug mode
- *	\param dasher the DASH segmenter object
- *	\param forceTestMode If true, disable generation date print in mpd
- *	\return error code if any
-*/
-GF_Err gf_dasher_set_test_mode(GF_DASHSegmenter *dasher, Bool forceTestMode);
-
 /*!
  Enable/Disable cached inputs .
- *	\param dasher the DASH segmenter object
- *	\param no_cache if true, input file will be reopen each time the dasher process function is called .
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param no_cache if true, input file will be reopen each time the dasher process function is called .
+\return error code if any
 */
 GF_Err gf_dasher_enable_cached_inputs(GF_DASHSegmenter *dasher, Bool no_cache);
 
 /*!
  Enable/Disable loop inputs .
- *	\param dasher the DASH segmenter object
- *	\param do_loop if true, input files will be looped at the end of the file in a live simulation. Otherwise a new period will be created.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param do_loop if true, input files will be looped at the end of the file in a live simulation. Otherwise a new period will be created.
+\return error code if any
 */
 GF_Err gf_dasher_enable_loop_inputs(GF_DASHSegmenter *dasher, Bool do_loop);
 
+
+/*!
+DASH selector for segment split mode
+\hideinitializer
+ */
+typedef enum
+{
+	/*! segment start time is greater than or equal to theoretical segment start (segment_duration*segment_number)*/
+	GF_DASH_SPLIT_OUT=0,
+	/*! segment start time is as close as possible to theoretical segment start (segment_duration*segment_number), but may be greater*/
+	GF_DASH_SPLIT_CLOSEST,
+	/*! segment start time is less than or equal to theoretical segment start (segment_duration*segment_number) so that the theoretical start time is always present in the segment*/
+	GF_DASH_SPLIT_IN,
+} GF_DASH_SplitMode;
+
 /*!
  Enable/Disable split on bound mode.
- *	\param dasher the DASH segmenter object
- *	\param split_on_bound if true, video streams are segmented with the same method as audio streams
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param split_mode the desired segmentation mode
+\return error code if any
 */
-GF_Err gf_dasher_set_split_on_bound(GF_DASHSegmenter *dasher, Bool split_on_bound);
+GF_Err gf_dasher_set_split_mode(GF_DASHSegmenter *dasher, GF_DASH_SplitMode split_mode);
 
 /*!
- Enable/Disable split on closest mode.
- *	\param dasher the DASH segmenter object
- *	\param split_on_bound if true, video streams are segmented as close to the segment boundary as possible
- *	\return error code if any
+ Sets m3u8 file name - if not set, no m3u8 output
+\param dasher the DASH segmenter object
+\param insert_clock if true UTC clock is inserted in variant playlists in live
+\return error code if any
 */
-GF_Err gf_dasher_set_split_on_closest(GF_DASHSegmenter *dasher, Bool split_on_closest);
+GF_Err gf_dasher_set_hls_clock(GF_DASHSegmenter *dasher, Bool insert_clock);
 
 /*!
  Sets cue file for the session.
- *	\param dasher the DASH segmenter object
- *	\param cues_file name of the cue file. This is an XML document with root <DASHCues>, one or multiple <Stream> with attribute ID (trackID)
- and timescale (trackTimescale), and a set of <cues> per Stream with attributes sampleNumber, dts or cts.
- *	\param strict_cues if true will fail if one cue doesn't match a timestamp in the stream or if the split sample is not RAP
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param cues_file name of the cue file. This is an XML document with root 'DASHCues' element, one or multiple 'Stream' elements with attribute ID (trackID)
+ and timescale (trackTimescale), and a set of 'cues' elements per Stream with attributes sampleNumber, dts or cts.
+\param strict_cues if true will fail if one cue doesn't match a timestamp in the stream or if the split sample is not RAP
+\return error code if any
 */
 GF_Err gf_dasher_set_cues(GF_DASHSegmenter *dasher, const char *cues_file, Bool strict_cues);
 
 /*!
- Sets ISOBMFF options.
- *	\param dasher the DASH segmenter object
- *	\param mvex_after_traks if true the mvex box will be after the trak boxes
- *	\return error code if any
- */
-GF_Err gf_dasher_set_isobmff_options(GF_DASHSegmenter *dasher, Bool mvex_after_traks);
-
-/*!
  Adds a media input to the DASHer
- *	\param dasher the DASH segmenter object
- *	\param input media source to add
- *	\return error code if any
+\param dasher the DASH segmenter object
+\param input media source to add
+\return error code if any
 */
-GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, GF_DashSegmenterInput *input);
+GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, const GF_DashSegmenterInput *input);
 
 /*!
  Process the media source and generate segments
- *	\param dasher the DASH segmenter object
- *	\param sub_duration the duration in seconds of media to DASH. If 0, the whole sources will be processed.
- *	\return error code if any
+\param dasher the DASH segmenter object
+\return error code if any
 */
-GF_Err gf_dasher_process(GF_DASHSegmenter *dasher, Double sub_duration);
+GF_Err gf_dasher_process(GF_DASHSegmenter *dasher);
 
 /*!
  Returns time to wait until end of currently generated segments
- *	\param dasher the DASH segmenter object
- *  \param ms_ins_session if set, retrives the number of ms since the start of the dash session
- *	\return time to wait in milliseconds
+\param dasher the DASH segmenter object
+\param ms_ins_session if set, retrives the number of ms since the start of the dash session
+\return time to wait in milliseconds
 */
 u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher, u64 *ms_ins_session);
 
 
 /*!
  Sets dasher start date, rather than use current time. Used for debugging purposes, such as simulating long lasting sessions.
- *	\param dasher the DASH segmenter object
- *  \param dash_utc_start_date start date as UTC timstamp. If 0, current time is used
+\param dasher the DASH segmenter object
+\param dash_utc_start_date start date as as xs:date, eg YYYY-MM-DDTHH:MM:SSZ. If 0, current time is used
+*/
+void gf_dasher_set_start_date(GF_DASHSegmenter *dasher, const char *dash_utc_start_date);
+
+
+/*!
+ Sets print flags for filter session
+\param dasher the DASH segmenter object
+\param fs_print_flags flags for statistics (1) and graph (2) printing
+\return error if any
 */
-void gf_dasher_set_start_date(GF_DASHSegmenter *dasher, u64 dash_utc_start_date);
+GF_Err gf_dasher_print_session_info(GF_DASHSegmenter *dasher, u32 fs_print_flags);
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 /*!
  save file as fragmented movie
- \param file the target file to be fragmented
- \param output_file name of the output file
- \param max_duration_sec max fragment duration in seconds
- \param use_mfra insert track fragment movie fragments
- \return error if any
+\param isom_file the target file to be fragmented
+\param output_file name of the output file
+\param max_duration_sec max fragment duration in seconds
+\param use_mfra insert track fragment movie fragments
+\return error if any
  */
-GF_Err gf_media_fragment_file(GF_ISOFile *file, const char *output_file, Double max_duration_sec, Bool use_mfra);
+GF_Err gf_media_fragment_file(GF_ISOFile *isom_file, const char *output_file, Double max_duration_sec, Bool use_mfra);
 #endif
 
 /*! @} */
 
 
 /*!
- *	\addtogroup mexp_grp Media Exporter
- *	\ingroup media_grp
- *	\brief Media exporting and extraction.
- *
- *This section documents functions for media exporting and extraction.
- *	@{
+\addtogroup mexp_grp Media Exporter
+\ingroup media_grp
+\brief Media exporting and extraction.
+
+This section documents functions for media exporting and extraction.
+
+@{
  */
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 
 /*!
- * Track dumper formats and flags
- *	\hideinitializer
+Track dumper formats and flags
+\hideinitializer
  */
 enum
 {
 	/*! track dumper types are formatted as flags for conveniency for
 	authoring tools, but never used as a OR'ed set*/
 	/*native format (JPG, PNG, MP3, etc) if supported*/
-	GF_EXPORT_NATIVE = GF_TRUE,
+	GF_EXPORT_NATIVE = 1,
 	/*! raw samples (including hint tracks for rtp)*/
 	GF_EXPORT_RAW_SAMPLES = (1<<1),
 	/*! NHNT format (any MPEG-4 media)*/
@@ -1055,25 +1109,24 @@
 	for raw extraction, indicates data shall be appended at the end of output file if present
 	*/
 	GF_EXPORT_MERGE = (1<<10),
+	/*! don't infer file extension */
+	GF_EXPORT_NO_FILE_EXT = (1 << 11),
 	/*! indicates QCP file format possible as well as native (EVRC and SMV audio only)*/
-	GF_EXPORT_USE_QCP = (1<<11),
+	GF_EXPORT_USE_QCP = (1<<12),
 	/*! indicates full NHML dump*/
-	GF_EXPORT_NHML_FULL = (1<<11),
+	GF_EXPORT_NHML_FULL = (1<<13),
 	/*! exports a single svc layer*/
-	GF_EXPORT_SVC_LAYER = (1<<12),
+	GF_EXPORT_SVC_LAYER = (1<<14),
 	/*! Don't merge identical cues in consecutive samples */
-	GF_EXPORT_WEBVTT_NOMERGE = (1<<13),
-
-	/*! Experimental Streaming Instructions */
-	GF_EXPORT_SIX = (1<<14),
+	GF_EXPORT_WEBVTT_NOMERGE = (1<<15),
 
 	/*! Experimental Streaming Instructions */
-	GF_EXPORT_FORCE_EXT = (1<<15),
+	GF_EXPORT_SIX = (1<<16),
 
 	/*! ony probes extraction format*/
 	GF_EXPORT_PROBE_ONLY = (1<<30),
 	/*when set by user during export, will abort*/
-	GF_EXPORT_DO_ABORT = (1<<31),
+	GF_EXPORT_DO_ABORT = 0x80000000 //(1<<31)
 };
 
 /*!
@@ -1083,7 +1136,7 @@
 {
 	/*! source ISOBMF file */
 	GF_ISOFile *file;
-	/*! ID of track to be dumped*/
+	/*! ID of track/PID/... to be dumped*/
 	u32 trackID;
 	/*! sample number to export for GF_EXPORT_RAW_SAMPLES only*/
 	u32 sample_num;
@@ -1093,23 +1146,27 @@
 	u32 flags;
 	/*! non-ISOBMF source file (AVI, TS)*/
 	char *in_name;
-	/*! set to TRUE if no additionnal files are to be created*/
-	Bool nhml_only;
-	/*! optionnal FILE for output*/
+	/*! optional FILE for output*/
 	FILE *dump_file;
+	u32 print_stats_graph;
 } GF_MediaExporter;
 
 /*!
   Dumps a given media track
- \param dump the track dumper object
- \return  error if any
+\param dump the track dumper object
+\return  error if any
  */
 GF_Err gf_media_export(GF_MediaExporter *dump);
 
-GF_Err gf_media_export_nhml(GF_MediaExporter *dumper, Bool dims_doc);
-
 #ifndef GPAC_DISABLE_VTT
-GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge, Bool box_dump);
+/*! dumps a webvtt tracl to a given file
+\param dumper media dumper object
+\param trackNumber the target track to dump
+\param merge if GF_TRUE, merge vtt cues while dumping them
+\param box_dump if GF_TRUE, dumps box structures
+\return  error if any
+*/
+GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, u32 trackNumber, Bool merge, Bool box_dump);
 #endif
 
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
@@ -1118,12 +1175,13 @@
 
 
 /*!
- *	\addtogroup mhint_grp Media Hinting
- *	\ingroup media_grp
- *	\brief ISOBMFF file hinting.
- *
- *This section documents functions for ISOBMFF file hinting.
- *	@{
+\addtogroup mhint_grp Media Hinting
+\ingroup media_grp
+\brief ISOBMFF file hinting.
+
+ This section documents functions for ISOBMFF file hinting.
+
+@{
  */
 
 
@@ -1131,72 +1189,73 @@
 /*
 	RTP IsoMedia file hinting
 */
+/*! ISOBMFF RTP hinter object*/
 typedef struct __tag_isom_hinter GF_RTPHinter;
 
 /*!
  Creates a new track hinter object
- *	\param file the target ISOBMF file
- *	\param track the track to hint
- *	\param Path_MTU max RTP packet size (excluding IP/UDP/IP headers)
- *	\param max_ptime max packet duration in RTP timescale, can be set to 0 for auto compute
- *	\param default_rtp_rate RTP rate for the track, can be set to 0 for auto compute
- *	\param hint_flags RTP flags as defined in <gpac/ietf.h>
- *	\param PayloadID RTP payload ID, can be set to 0 for auto compute
- *	\param copy_media if set, media is copied inside the hint samples, otherwise only referenced from the media track
- *	\param InterleaveGroupID sets the group ID of this track for interleaving - same semantics as in gf_isom_set_track_interleaving_group
- *	\param InterleaveGroupPriority sets the group priority of this track for interleaving - same semantics as in gf_isom_set_track_priority_in_group
- *	\param e output error code if any
- *	\return the hinter object
+\param isom_file the target ISOBMF file
+\param trackNumber the track to hint
+\param Path_MTU max RTP packet size (excluding IP/UDP/IP headers)
+\param max_ptime max packet duration in RTP timescale, can be set to 0 for auto compute
+\param default_rtp_rate RTP rate for the track, can be set to 0 for auto compute
+\param hint_flags RTP flags as defined in <gpac/ietf.h>
+\param PayloadID RTP payload ID, can be set to 0 for auto compute
+\param copy_media if set, media is copied inside the hint samples, otherwise only referenced from the media track
+\param InterleaveGroupID sets the group ID of this track for interleaving - same semantics as in gf_isom_set_track_interleaving_group
+\param InterleaveGroupPriority sets the group priority of this track for interleaving - same semantics as in gf_isom_set_track_priority_in_group
+\param e output error code if any
+\return the hinter object
  */
-GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *file, u32 track,
+GF_RTPHinter *gf_hinter_track_new(GF_ISOFile *isom_file, u32 trackNumber,
                                   u32 Path_MTU, u32 max_ptime, u32 default_rtp_rate, u32 hint_flags, u8 PayloadID,
                                   Bool copy_media, u32 InterleaveGroupID, u8 InterleaveGroupPriority, GF_Err *e);
 
 /*!
  Delete the track hinter
- \param tkHinter track hinter object
+\param tkHinter track hinter object
 */
 void gf_hinter_track_del(GF_RTPHinter *tkHinter);
 
 /*!
  hints all samples in the media track
- \param tkHinter track hinter object
- \return error if any
+\param tkHinter track hinter object
+\return error if any
  */
 GF_Err gf_hinter_track_process(GF_RTPHinter *tkHinter);
 
 /*!
  Gets media bandwidth in kbps
- \param tkHinter track hinter object
- \return media bandwidth in kbps
+\param tkHinter track hinter object
+\return media bandwidth in kbps
 */
 u32 gf_hinter_track_get_bandwidth(GF_RTPHinter *tkHinter);
 
 /*!
  Gets track hinter flags
- \param tkHinter track hinter object
- \return hint flags for this object
+\param tkHinter track hinter object
+\return hint flags for this object
  */
 u32 gf_hinter_track_get_flags(GF_RTPHinter *tkHinter);
 
 /*!
  Gets rtp payload name
- \param tkHinter track hinter object
- \param payloadName static buffer for retrieval, minimum 30 bytes
+\param tkHinter track hinter object
+\param payloadName static buffer for retrieval, minimum 30 bytes
 */
 void gf_hinter_track_get_payload_name(GF_RTPHinter *tkHinter, char *payloadName);
 
 /*!
  Finalizes hinting process for the track (setup flags, write SDP for RTP, ...)
- \param tkHinter track hinter object
- \param AddSystemInfo if true, systems info are duplicated in the SDP (decoder cfg, PL IDs ..)
- \return error if any
+\param tkHinter track hinter object
+\param AddSystemInfo if true, systems info are duplicated in the SDP (decoder cfg, PL IDs ..)
+\return error if any
 */
 GF_Err gf_hinter_track_finalize(GF_RTPHinter *tkHinter, Bool AddSystemInfo);
 
 /*!
- * SDP IOD Profile
- *	\hideinitializer
+SDP IOD Profile
+\hideinitializer
  */
 typedef enum
 {
@@ -1213,20 +1272,21 @@
 
 /*!
 Finalizes hinting process for the file (setup flags, write SDP for RTP, ...)
-	\param file target ISOBMF file
-	\param IOD_Profile the IOD profile to use for SDP
-	\param bandwidth total bandwidth in kbps of all hinted tracks, 0 means no bandwidth info at session level
+\param isom_file target ISOBMF file
+\param IOD_Profile the IOD profile to use for SDP
+\param bandwidth total bandwidth in kbps of all hinted tracks, 0 means no bandwidth info at session level
+\return error if any
 */
-GF_Err gf_hinter_finalize(GF_ISOFile *file, GF_SDP_IODProfile IOD_Profile, u32 bandwidth);
+GF_Err gf_hinter_finalize(GF_ISOFile *isom_file, GF_SDP_IODProfile IOD_Profile, u32 bandwidth);
 
 /*!
  Check if the given data fits in an ESD url
- \param data data to be encoded
- \param data_size size of data to be encoded
- \param streamType systems stream type needed to signal data mime-type (OD, BIFS or any)
- \return GF_TRUE if the encoded data fits in an ESD url
+\param data data to be encoded
+\param data_size size of data to be encoded
+\param streamType systems stream type needed to signal data mime-type (OD, BIFS or any)
+\return GF_TRUE if the encoded data fits in an ESD url
  */
-Bool gf_hinter_can_embbed_data(char *data, u32 data_size, u32 streamType);
+Bool gf_hinter_can_embbed_data(u8 *data, u32 data_size, u32 streamType);
 
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
@@ -1234,12 +1294,13 @@
 
 
 /*!
- *	\addtogroup msaf_grp LASeR SAF creation
- *	\ingroup media_grp
- *	\brief LASeR SAF multiplexing.
- *
- *This section documents functions for LASeR SAF multiplexing.
- *	@{
+\addtogroup msaf_grp LASeR SAF creation
+\ingroup media_grp
+\brief LASeR SAF multiplexing.
+
+This section documents functions for LASeR SAF multiplexing.
+
+@{
  */
 
 
@@ -1247,63 +1308,63 @@
 typedef struct __saf_muxer GF_SAFMuxer;
 /*!
 	Creates a new SAF Multiplexer
- \return the SAF multiplexer object
+\return the SAF multiplexer object
  */
 GF_SAFMuxer *gf_saf_mux_new();
 
 /*!
 	SAF Multiplexer destructor
- \param mux the SAF multiplexer object
+\param mux the SAF multiplexer object
  */
 void gf_saf_mux_del(GF_SAFMuxer *mux);
 
 /*!
  Adds a new stream in the SAF multiplex
- \param mux the SAF multiplexer object
- \param stream_id ID of the SAF stream to create
- \param ts_res timestamp resolution for AUs in this stream
- \param buffersize_db size of decoding buffer in bytes
- \param stream_type MPEG-4 systems stream type of this stream
- \param object_type MPEG-4 systems object type indication of this stream
- \param mime_type MIME type for this stream, NULL if unknown
- \param dsi Decoder specific info for this stream
- \param dsi_len specific info size for this stream
- \param remote_url URL of the SAF stream if not embedded in the multiplex
- \return error if any
+\param mux the SAF multiplexer object
+\param stream_id ID of the SAF stream to create
+\param ts_res timestamp resolution for AUs in this stream
+\param buffersize_db size of decoding buffer in bytes
+\param stream_type MPEG-4 systems stream type of this stream
+\param object_type MPEG-4 systems object type indication of this stream
+\param mime_type MIME type for this stream, NULL if unknown
+\param dsi Decoder specific info for this stream
+\param dsi_len specific info size for this stream
+\param remote_url URL of the SAF stream if not embedded in the multiplex
+\return error if any
  */
 GF_Err gf_saf_mux_stream_add(GF_SAFMuxer *mux, u32 stream_id, u32 ts_res, u32 buffersize_db, u8 stream_type, u8 object_type, char *mime_type, char *dsi, u32 dsi_len, char *remote_url);
 
-/*!
- Removes a stream from the SAF multiplex
- \param mux the SAF multiplexer object
- \param stream_id ID of the SAF stream to remove
- \return error if any
- */
-GF_Err gf_saf_mux_stream_rem(GF_SAFMuxer *mux, u32 stream_id);
 
 /*!
  adds an AU to the given Warning, AU data will be freed by the multiplexer. AUs are NOT re-sorted by CTS, in order to enable audio interleaving.
- \param mux the SAF multiplexer object
- \param stream_id ID of the SAF stream to remove
- \param CTS composition timestamp of the AU
- \param data payload of the AU
- \param data_len payload size of the AU
- \param is_rap set to GF_TRUE to signal a random access point
- \return error if any
+\param mux the SAF multiplexer object
+\param stream_id ID of the SAF stream to remove
+\param CTS composition timestamp of the AU
+\param data payload of the AU
+\param data_len payload size of the AU
+\param is_rap set to GF_TRUE to signal a random access point
+\return error if any
 */
 GF_Err gf_saf_mux_add_au(GF_SAFMuxer *mux, u32 stream_id, u32 CTS, char *data, u32 data_len, Bool is_rap);
 
 /*!
   Gets the content of the multiplexer for the given time.
- \param mux the SAF multiplexer object
- \param time_ms target mux time in ms
- \param force_end_of_session if set to GF_TRUE, this flushes the SAF Session - no more operations will be allowed on the muxer
- \param out_data output SAF data
- \param out_size output SAF data size
- \return error if any
+\param mux the SAF multiplexer object
+\param time_ms target mux time in ms
+\param force_end_of_session if set to GF_TRUE, this flushes the SAF Session - no more operations will be allowed on the muxer
+\param out_data output SAF data
+\param out_size output SAF data size
+\return error if any
  */
-GF_Err gf_saf_mux_for_time(GF_SAFMuxer *mux, u32 time_ms, Bool force_end_of_session, char **out_data, u32 *out_size);
+GF_Err gf_saf_mux_for_time(GF_SAFMuxer *mux, u32 time_ms, Bool force_end_of_session, u8 **out_data, u32 *out_size);
 
+/*!
+  Gets timescale and TS increment from double FPS value.
+\param fps the target fps
+\param timescale output timescale value
+\param ts_inc output timestamp increment value
+*/
+void gf_media_get_video_timing(Double fps, u32 *timescale, u32 *ts_inc);
 
 #ifdef __cplusplus
 }

gpac-0.8.0.tar.gz/include/gpac/mediaobject.h -> gpac-1.0.0.tar.gz/include/gpac/mediaobject.h Changed

gpac-0.8.0.tar.gz/include/gpac/module.h -> gpac-1.0.0.tar.gz/include/gpac/module.h Changed

gpac-0.8.0.tar.gz/include/gpac/modules/audio_out.h -> gpac-1.0.0.tar.gz/include/gpac/modules/audio_out.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-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / modules interfaces
@@ -41,6 +41,8 @@
 
 /*include event system*/
 #include <gpac/module.h>
+/*include audio formats*/
+#include <gpac/constants.h>
 
 
 /*
@@ -48,7 +50,7 @@
 */
 
 /*interface name and version for audio output*/
-#define GF_AUDIO_OUTPUT_INTERFACE		GF_4CC('G','A','O', '1')
+#define GF_AUDIO_OUTPUT_INTERFACE		GF_4CC('G','A','O', '5')
 
 /*interface returned on query interface*/
 typedef struct _audiooutput
@@ -72,15 +74,15 @@
 	possible sampleRate able to handle NbChannels and NbBitsPerSample - if it doesn't handle the NbChannels
 	the internal mixer will do it
 	*/
-	GF_Err (*QueryOutputSampleRate)(struct _audiooutput *aout, u32 *io_desired_samplerate, u32 *io_NbChannels, u32 *io_nbBitsPerSample);
+	GF_Err (*QueryOutputSampleRate)(struct _audiooutput *aout, u32 *io_desired_samplerate, u32 *io_NbChannels, u32 *io_AudioFormat);
 
 	/*set output config - if audio is not running, driver must start it
-	*SampleRate, *NbChannels, *nbBitsPerSample:
+	*SampleRate, *NbChannels, *audioFormat:
 		input: desired value
 		output: final values
-	channel_cfg is the channels output cfg, eg set of flags as specified in constants.h
+	channel_layout is the channels output cfg, eg set of flags as specified in constants.h
 	*/
-	GF_Err (*ConfigureOutput) (struct _audiooutput *aout, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg);
+	GF_Err (*Configure) (struct _audiooutput *aout, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_layout);
 
 	/*returns total buffer size used in ms. This is needed to compute the min size of audio decoders output*/
 	u32 (*GetTotalBufferTime)(struct _audiooutput *aout);
@@ -118,69 +120,12 @@
 	/*these are assigned by the audio renderer once module is loaded*/
 
 	/*fills the buffer with audio data, returns effective bytes written - the rest is filled with 0*/
-	u32 (*FillBuffer) (void *audio_renderer, char *buffer, u32 buffer_size);
+	u32 (*FillBuffer) (void *audio_renderer, u8 *buffer, u32 buffer_size);
 	void *audio_renderer;
 
 } GF_AudioOutput;
 
 
-/*
-	Audio hardware output module
-*/
-
-/*interface name and version for audio output*/
-#define GF_AUDIO_FILTER_INTERFACE		GF_4CC('G','A','F', '1')
-
-/*interface returned on query interface*/
-typedef struct _tag_audio_filter GF_AudioFilter;
-
-struct _tag_audio_filter
-{
-	/* interface declaration*/
-	GF_DECL_MODULE_INTERFACE
-
-	/*sets the current filter. The filterstring is opaque to libgpac and is taken as given
-	in the GPAC configuration file, where filters are listed as a ';;' separated list in the "Filter" key of
-	the [Audio] section.
-		@returns: 1 is this module can handle the filterstring, 0 otherwise.
-	*/
-	Bool (*SetFilter)(GF_AudioFilter *af, char *filterstring);
-	/*configures the filter:
-		@samplerate: samplerate of data - this cannot be modified by a filter
-		@bits_per_sample: sample format (8 or 16 bit signed PCM data) of data - this cannot be modified by a filter
-		@input_channel_number: number of input channels
-		@input_channel_layout: channel layout of input data - cf <gpac/constants.h>
-		@output_channel_number: number of ouput channels
-		@output_channel_layout: channel layout of output data - cf <gpac/constants.h>
-		&output_block_size_in_samples: size in blocks of the data to be sent to this filter.
-				If 0, data will not be reframed and blocks of any number of samples will be processed
-		@delay_ms: delay in ms introduced by this filter
-		@inplace_processing_capable: if set to 1, this filter is capable of processing data inplace, in which case
-			the same buffer is passed for in_data and out_data in the process call
-	*/
-	GF_Err (*Configure)(GF_AudioFilter *af, u32 samplerate, u32 bits_per_sample, u32 input_channel_number, u32 input_channel_layout, u32 *output_channel_number, u32 *output_channel_layout, u32 *output_block_size_in_samples, u32 *delay_ms, Bool *inplace_processing_capable);
-	/*process a chunk of audio data.
-		@in_data: input sample buffer
-		@in_data_size: input sample buffer size. If block len was set in the configure stage, there will be block len sample
-		@out_data: output sample buffer - if inplace was set in the configure stage, same as in_data.
-				NOTE: Outputing more samples that input ones may crash the system, the buffer only contains space for
-			the same amount of samples (including channels added/removed by the filter)
-		@out_data_size: data size written to output. Usually 0 or in_data_size.
-	*/
-	GF_Err (*Process)(GF_AudioFilter *af, void *in_data, u32 in_data_size, void *out_data, u32 *out_data_size);
-
-	/*gets an option from the filter - currently not implemented */
-	const char *(*GetOption)(GF_AudioFilter *af, char *option);
-	/*sets an option to the filter - currently not implemented */
-	Bool (*SetOption)(GF_AudioFilter *af, char *option, char *value);
-
-	/*Indicates the filter should be reset (audio stop or seek )*/
-	void (*Reset)(GF_AudioFilter *af);
-
-	/*private user data for the module*/
-	void *udta;
-};
-
 #ifdef __cplusplus
 }
 #endif

gpac-0.8.0.tar.gz/include/gpac/modules/codec.h -> gpac-1.0.0.tar.gz/include/gpac/modules/codec.h Changed

@@ -62,7 +62,7 @@
 	GF_CODEC_RESILIENT_AFTER_FIRST_RAP=2
 };
 
-/*Define codec matrix*/ 
+/*Define codec matrix*/
 typedef struct __matrix GF_CodecMatrix;
 
 /*the structure for capabilities*/
@@ -219,102 +219,13 @@
 	u32 (*CanHandleStream)(IFCE_NAME, u32 StreamType, GF_ESD *esd, u8 ProfileLevelIndication);\
 	const char *(*GetName)(IFCE_NAME);\
 	void *privateStack;	\
- 
+
 
 typedef struct _basedecoder
 {
 	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
 } GF_BaseDecoder;
 
-/*interface name and version for media decoder */
-#define GF_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'M', 'D', '3')
-
-typedef struct _mediadecoderframe
-{
-	//release media frame
-	void (*Release)(struct _mediadecoderframe *frame);
-	//get media frame plane
-	// @plane_idx: plane index, 0: Y or full plane, 1: U or UV plane, 2: V plane
-	// @outPlane: adress of target color plane
-	// @outStride: stride in bytes of target color plane
-	GF_Err (*GetPlane)(struct _mediadecoderframe *frame, u32 plane_idx, const char **outPlane, u32 *outStride);
-
-	GF_Err (*GetGLTexture)(struct _mediadecoderframe *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix);
-
-	//allocated space by the decoder
-	void *user_data;
-} GF_MediaDecoderFrame;
-
-/*the media module interface. A media module MUST be implemented in synchronous mode as time
-and resources management is done by the terminal*/
-typedef struct _mediadecoder
-{
-	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
-
-	/*Process the media data in inAU.
-	@inBuffer, inBufferLength: encoded input data (complete framing of encoded data)
-	@ES_ID: stream this data belongs too (scalable object)
-	@outBuffer, outBufferLength: allocated data for decoding - if outBufferLength is not enough
-		you must set the size in outBufferLength and GF_BUFFER_TOO_SMALL
-
-	@PaddingBits is the padding at the end of the buffer (some codecs need this info)
-	@mmlevel: speed indicator for the decoding - cf above for values*/
-	GF_Err (*ProcessData)(struct _mediadecoder *,
-	                      char *inBuffer, u32 inBufferLength,
-	                      u16 ES_ID, u32 *CTS,
-	                      char *outBuffer, u32 *outBufferLength,
-	                      u8 PaddingBits, u32 mmlevel);
-
-
-	/*optional (may be null), retrievs internal output frame of decoder. this function is called only if the decoder returns GF_OK on a SetCapabilities GF_CODEC_RAW_MEMORY*/
-	GF_Err (*GetOutputBuffer)(struct _mediadecoder *, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV);
-
-	/*optional (may be null), retrievs internal output frame object of decoder. this function is called only if the decoder returns GF_OK on a SetCapabilities GF_CODEC_FRAME_OUTPUT*/
-	GF_Err (*GetOutputFrame)(struct _mediadecoder *, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize);
-} GF_MediaDecoder;
-
-
-/*
-				WARNING - DO NOT MODIFY THE POSITION OF ProcessData IN SCENE OR NODE DECODER, AS THE BOTH STRUCTURES
-		ARE TYPE_CASTED BY THE TERMINAL WHEN CALLING ProcessData
-*/
-typedef struct _scene *LPSCENE;
-
-/*interface name and version for scene decoder */
-#define GF_SCENE_DECODER_INTERFACE		GF_4CC('G', 'S', 'D', '3')
-
-typedef struct _scenedecoder
-{
-	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
-
-	/*Process the scene data in inAU.
-	@inBuffer, inBufferLength: encoded input data (complete framing of encoded data)
-	@ES_ID: stream this data belongs too (scalable object)
-	@AU_Time: specifies the current AU time. This is usually unused, however is needed for decoder
-	handling the scene graph without input data (cf below). In this case the buffer passed is always NULL and the AU
-	time caries the time of the scene (or of the stream object attached to the scene decoder, cf below)
-	@mmlevel: speed indicator for the decoding - cf above for values*/
-	GF_Err (*ProcessData)(struct _scenedecoder *, const char *inBuffer, u32 inBufferLength,
-	                      u16 ES_ID, u32 AU_Time, u32 mmlevel);
-
-
-	/*attaches scene to the decoder - a scene may be attached to several decoders of several types
-	(BIFS or others scene dec, ressource decoders (OD), etc.
-	is: inline scene owning graph (and not just graph), defined in intern/terminal_dev.h. With inline scene
-	the complete terminal is exposed so there's pretty much everything doable in a scene decoder
-	@is_scene_root: set to true if this decoder is the root of the scene, false otherwise (either another decoder
-	or a re-entrant call, cf below)
-	This is called once upon creation of the decoder (several times if re-entrant)
-	*/
-	GF_Err (*AttachScene)(struct _scenedecoder *, LPSCENE scene, Bool is_scene_root);
-	/*releases scene. If the decoder manages nodes / resources in the scene,
-	THESE MUST BE DESTROYED. May be NULL if decoder doesn't manage nodes but only create them (like BIFS, OD) and
-	doesn't have to be instructed the scene is about to be resumed
-	This is called each time the scene is about to be reseted (eg, seek and destroy)
-	*/
-	GF_Err (*ReleaseScene)(struct _scenedecoder *);
-} GF_SceneDecoder;
-
 
 /*interface name and version for node decoder mainly used by AFX*/
 #define GF_NODE_DECODER_INTERFACE		GF_4CC('G', 'N', 'D', '3')
@@ -349,35 +260,66 @@
 	/* interface declaration*/
 	GF_DECL_MODULE_INTERFACE
 
-	Bool (*RegisterDevice)(struct __input_device *, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name));
+	Bool (*RegisterDevice)(struct __input_device *, const char *urn, const char *dsi, u32 dsi_size, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name));
 	void (*Start)(struct __input_device *);
 	void (*Stop)(struct __input_device *);
 
 	void *udta;
 
 	/*this is set upon loading and shall not be modified*/
-	GF_BaseDecoder *input_decoder;
-	void (*DispatchFrame)(struct __input_device *, u8 *data, u32 data_len);
+	void *input_stream_context;
+	void (*DispatchFrame)(struct __input_device *, const u8 *data, u32 data_len);
 } GF_InputSensorDevice;
 
 
 
-
 /*interface name and version for media decoder */
-#define GF_PRIVATE_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'P', 'M', '2')
+#define GF_MEDIA_DECODER_INTERFACE		GF_4CC('G', 'M', 'D', '3')
+
+typedef struct _mediadecoderframe
+{
+	//release media frame
+	void (*Release)(struct _mediadecoderframe *frame);
+	//get media frame plane
+	// @plane_idx: plane index, 0: Y or full plane, 1: U or UV plane, 2: V plane
+	// @outPlane: adress of target color plane
+	// @outStride: stride in bytes of target color plane
+	GF_Err (*GetPlane)(struct _mediadecoderframe *frame, u32 plane_idx, const char **outPlane, u32 *outStride);
+
+	GF_Err (*GetGLTexture)(struct _mediadecoderframe *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix);
+
+	//allocated space by the decoder
+	void *user_data;
+} GF_MediaDecoderFrame;
 
 /*the media module interface. A media module MUST be implemented in synchronous mode as time
 and resources management is done by the terminal*/
-typedef struct _private_mediadecoder
+typedef struct _mediadecoder
 {
 	GF_CODEC_BASE_INTERFACE(struct _basedecoder *)
 
-	/*Control media decoder.
-	@mute: set mute or not
-	@x, y, w, h: video output position in screen coordinate
-	*/
-	GF_Err (*Control)(struct _private_mediadecoder *, Bool mute, GF_Window *src_rect, GF_Window *dst_rect);
-} GF_PrivateMediaDecoder;
+	/*Process the media data in inAU.
+	@inBuffer, inBufferLength: encoded input data (complete framing of encoded data)
+	@ES_ID: stream this data belongs too (scalable object)
+	@outBuffer, outBufferLength: allocated data for decoding - if outBufferLength is not enough
+		you must set the size in outBufferLength and GF_BUFFER_TOO_SMALL
+
+	@PaddingBits is the padding at the end of the buffer (some codecs need this info)
+	@mmlevel: speed indicator for the decoding - cf above for values*/
+	GF_Err (*ProcessData)(struct _mediadecoder *,
+	                      char *inBuffer, u32 inBufferLength,
+	                      u16 ES_ID, u32 *CTS,
+	                      char *outBuffer, u32 *outBufferLength,
+	                      u8 PaddingBits, u32 mmlevel);
+
+
+	/*optional (may be null), retrievs internal output frame of decoder. this function is called only if the decoder returns GF_OK on a SetCapabilities GF_CODEC_RAW_MEMORY*/
+	GF_Err (*GetOutputBuffer)(struct _mediadecoder *, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV);
+
+	/*optional (may be null), retrievs internal output frame object of decoder. this function is called only if the decoder returns GF_OK on a SetCapabilities GF_CODEC_FRAME_OUTPUT*/
+	GF_Err (*GetOutputFrame)(struct _mediadecoder *, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize);
+} GF_MediaDecoder;
+
 
 #ifdef __cplusplus
 }

gpac-1.0.0.tar.gz/include/gpac/modules/compositor_ext.h Added

@@ -0,0 +1,111 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / modules interfaces
+ *
+ *  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_MODULE_COMPOSITOR_EXT_H_
+#define _GF_MODULE_COMPOSITOR_EXT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/compositor.h>
+
+/*interface name and version for Terminal Extensions services*/
+#define GF_COMPOSITOR_EXT_INTERFACE		GF_4CC('C','O','X', '1')
+
+typedef struct _gf_compositor_ext GF_CompositorExt;
+
+
+typedef struct {
+	void *scenegraph;
+	void *ctx;
+	Bool unload;
+} GF_CompositorExtJS;
+
+enum
+{
+	/*start terminal extension. If 0 is returned, the module will be unloaded
+		associated param: GF_Compositor *compositor
+		@return: 1 if OK, 0 otherwise (in which case the extensions will be removed without calling stop)
+	*/
+	GF_COMPOSITOR_EXT_START = 1,
+	/*stop terminal extension
+		associated param: NULL
+		@return: ignored
+	*/
+	GF_COMPOSITOR_EXT_STOP,
+
+	/*process extension - only called GF_COMPOSITOR_EXTENSION_NOT_THREADED capability is set
+		associated param: NULL
+		@return: ignored
+	*/
+	GF_COMPOSITOR_EXT_PROCESS,
+
+	/*load/unload js bindings of this extension
+		associated param: GF_CompositorExtJS *jsext
+		@return: ignored
+	*/
+	GF_COMPOSITOR_EXT_JSBIND,
+};
+
+enum
+{
+	/*signal the extension is to be called on regular basis (once per simulation tick). This MUST be set during
+	the GF_gf_compositor_ext_START command and cannot be changed at run-time*/
+	GF_COMPOSITOR_EXTENSION_NOT_THREADED = 1<<1,
+
+	GF_COMPOSITOR_EXTENSION_JS = 1<<2,
+};
+
+
+struct _gf_compositor_ext
+{
+	/* interface declaration*/
+	GF_DECL_MODULE_INTERFACE
+
+	/*caps of the module*/
+	u32 caps;
+
+	/*terminal extension proc
+	 termext: pointer to the module
+	 action: action type of this call
+	 param: associated param of the call
+	*/
+	Bool (*process)(GF_CompositorExt *comp_ext, u32 action, void *param);
+
+	/*module private*/
+	void *udta;
+};
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif	/*#define _GF_MODULE_COMPOSITOR_EXT_H_*/
+

gpac-0.8.0.tar.gz/include/gpac/modules/font.h -> gpac-1.0.0.tar.gz/include/gpac/modules/font.h Changed

gpac-0.8.0.tar.gz/include/gpac/modules/hardcoded_proto.h -> gpac-1.0.0.tar.gz/include/gpac/modules/hardcoded_proto.h Changed

gpac-0.8.0.tar.gz/include/gpac/modules/video_out.h -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / modules interfaces
@@ -77,8 +77,6 @@
 
 	/*HW supports line blitting*/
 	GF_VIDEO_HW_HAS_LINE_BLIT = (1<<15),
-	/*HW supports locking a surface by device context (Win32 only)*/
-	GF_VIDEO_HW_HAS_HWND_HDC	= (1<<16),
 	/*HW only supports direct rendering mode*/
 	GF_VIDEO_HW_DIRECT_ONLY	= (1<<17),
 };
@@ -92,7 +90,7 @@
 typedef struct _gf_sc_texture_handler GF_TextureH;
 
 /*interface name and version for video output*/
-#define GF_VIDEO_OUTPUT_INTERFACE	GF_4CC('G','V','O','1')
+#define GF_VIDEO_OUTPUT_INTERFACE	GF_4CC('G','V','O','5')
 
 /*
 			video output interface
@@ -222,7 +220,7 @@
 	/*maximum pixel disparity*/
 	u32 disparity;
 	/*nominal display viewing distance in cm*/
-	Fixed view_distance;
+	Fixed dispdist;
 
 	/*driver private*/
 	void *opaque;

gpac-1.0.0.tar.gz/include/gpac/mpd.h Added

@@ -0,0 +1,1081 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre - Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2010-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
+ *
+ *  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 _MPD_H_
+#define _MPD_H_
+
+#include <gpac/constants.h>
+#include <gpac/xml.h>
+#include <gpac/media_tools.h>
+
+#ifndef GPAC_DISABLE_CORE_TOOLS
+
+/*!
+\file <gpac/mpd.h>
+\brief Utility tools for dash, smooth and HLS manifest loading.
+*/
+
+/*!
+\addtogroup mpd_grp MPD/M3U8/Smooth Manifest Parsing
+\ingroup media_grp
+\brief Utility tools DASH manifests
+
+This section documents the DASH, Smooth and HLS manifest parsing functions of the GPAC framework.
+@{
+*/
+
+/*! DASH template resolution mode*/
+typedef enum
+{
+	/*! resolve template for segment*/
+	GF_DASH_TEMPLATE_SEGMENT = 0,
+	/*! resolve template for initialization segment*/
+	GF_DASH_TEMPLATE_INITIALIZATION,
+	/*! resolve template for segment template*/
+	GF_DASH_TEMPLATE_TEMPLATE,
+	/*! resolve template for segment template with %d padding*/
+	GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH,
+	/*! resolve template for initialization segment template*/
+	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE,
+	/*! resolve template for segment index*/
+	GF_DASH_TEMPLATE_REPINDEX,
+	/*! resolve template for segment index template*/
+	GF_DASH_TEMPLATE_REPINDEX_TEMPLATE,
+	/*! resolve template for segment index template with %d padding*/
+	GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH,
+	/*! same as GF_DASH_TEMPLATE_INITIALIZATION but skip default "init" concatenation */
+	GF_DASH_TEMPLATE_INITIALIZATION_SKIPINIT,
+	/*! same as GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE but skip default "init" concatenation*/
+	GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE_SKIPINIT,
+} GF_DashTemplateSegmentType;
+
+/*! formats the segment name according to its template
+\param seg_type the desired format mode
+\param is_bs_switching set to GF_TRUE to indicate the target segment is a bitstream switching segment
+\param segment_name target buffer where the segment name is formatted - size must be GF_MAX_PATH
+\param rep_id ID of the target representation
+\param base_url base URL, may be NULL
+\param seg_rad_name base name of the output segements (eg, myfile_ZZZ), shall not be NULL, may be empty ("")
+\param seg_ext segment extensions
+\param start_time start time of the segment in MPD timescale
+\param bandwidth bandwidth used for the representation
+\param segment_number number of the target segment
+\param use_segment_timeline indicates if segmentTimeline is used for segment addressing in the MPD
+\return error if any
+*/
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline);
+
+/*! metrics, not yet supported*/
+typedef struct
+{
+	u32 dummy;
+} GF_MPD_Metrics;
+
+/*! Content Component description*/
+typedef struct
+{
+	/*! content component ID*/
+	u32 id;
+	/*! content component mime type*/
+	char *type;
+	/*! content component language*/
+	char *lang;
+} GF_MPD_ContentComponent;
+
+
+/*! macro for extensible MPD element
+Some elments are typically overloaded in XML, we keep the attributes / children nodes here. The attributes list is NULL if no extensions were found, otherwise it is a list of GF_XMLAttribute.
+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;	\
+
+/*! basic extensible MPD element*/
+typedef struct
+{
+	MPD_EXTENSIBLE
+} GF_MPD_ExtensibleVirtual;
+
+/*! basic extensible MPD descritpor*/
+typedef struct
+{
+	MPD_EXTENSIBLE
+	/*! mandatory schemeid URL*/
+	char *scheme_id_uri;
+	/*! associated value, may be NULL*/
+	char *value;
+	/*! associated ID, may be NULL*/
+	char *id;
+} GF_MPD_Descriptor;
+
+/*! subset, not yet supported*/
+typedef struct
+{
+	u32 dummy;
+} GF_MPD_Subset;
+
+/*! SegmentTimeline entry*/
+typedef struct
+{
+	/*! startTime in representation's MPD timescale*/
+	u64 start_time;
+	/*! duration in representation's MPD timescale - mandatory*/
+	u32 duration; /*MANDATORY*/
+	/*! may be 0xFFFFFFFF (-1) (\warning this needs further testing)*/
+	u32 repeat_count;
+} GF_MPD_SegmentTimelineEntry;
+
+/*! Segment Timeline*/
+typedef struct
+{
+	/*! list of entries*/
+	GF_List *entries;
+} GF_MPD_SegmentTimeline;
+
+/*! Byte range info*/
+typedef struct
+{
+	/*! start range (offset of first byte in associated resource)*/
+	u64 start_range;
+	/*! start range (offset of last byte in associated resource)*/
+	u64 end_range;
+} GF_MPD_ByteRange;
+
+
+/*! base URL*/
+typedef struct
+{
+	/*! URL*/
+	char *URL;
+	/*! service location if any*/
+	char *service_location;
+	/*! byte range if any*/
+	GF_MPD_ByteRange *byte_range;
+
+	/*!GPAC internal: redirection for that URL */
+	char *redirection;
+} GF_MPD_BaseURL;
+
+/*! MPD URL*/
+typedef struct
+{
+	/*! URL of source*/
+	char *sourceURL;
+	/*! byte range if any*/
+	GF_MPD_ByteRange *byte_range;
+
+	/*! GPAC internal - indicates the URL has already been solved*/
+	Bool is_resolved;
+} GF_MPD_URL;
+
+/*! MPD fraction*/
+typedef struct
+{
+	/*! numerator*/
+	u32 num;
+	/*! denominator*/
+	u32 den;
+} GF_MPD_Fractional;
+
+/*! GPAC internal, ISOBMFF info for base64 and other embedding, see N. Bouzakaria thesis*/
+typedef struct
+{
+	/*! ID of track/pid*/
+	u32 trackID;
+	/*! base64 STSD entry*/
+	char *stsd;
+	/*! media offset*/
+	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;	\
+	u64 presentation_time_offset;	\
+	u32 time_shift_buffer_depth; /* expressed in milliseconds */	\
+	GF_MPD_ByteRange *index_range;	\
+	Bool index_range_exact;	\
+	Double availability_time_offset;	\
+	GF_MPD_URL *initialization_segment;	\
+	GF_MPD_URL *representation_index;	\
+
+
+
+/*! MPD segment base*/
+typedef struct
+{
+	/*! inherits segment base*/
+	GF_MPD_SEGMENT_BASE
+} GF_MPD_SegmentBase;
+
+/*! macro for multiple segment base
+WARNING: duration is expressed in GF_MPD_SEGMENT_BASE timescale unit
+           startnumber=(u32)-1 if unused, 1 bydefault.
+*/
+#define GF_MPD_MULTIPLE_SEGMENT_BASE	\
+	GF_MPD_SEGMENT_BASE	\
+	u64 duration;	\
+	u32 start_number;	\
+	GF_MPD_SegmentTimeline *segment_timeline;	\
+	GF_MPD_URL *bitstream_switching_url;	\
+
+/*! Multiple segment base*/
+typedef struct
+{
+	/*! inherits multiple segment base*/
+	GF_MPD_MULTIPLE_SEGMENT_BASE
+} GF_MPD_MultipleSegmentBase;
+
+/*! segment URL*/
+typedef struct
+{
+	/*! media URL if any*/
+	char *media;
+	/*! media range if any*/
+	GF_MPD_ByteRange *media_range;
+	/*! index url if any*/
+	char *index;
+	/*! index range if any*/
+	GF_MPD_ByteRange *index_range;
+	/*! duration of segment*/
+	u64 duration;
+	/*! key URL of segment, HLS only*/
+	char *key_url;
+	/*! key IV of segment, HLS only*/
+	bin128 key_iv;
+	/*! UTC start time of segment, HLS only*/
+	u64 hls_utc_start_time;
+} GF_MPD_SegmentURL;
+
+/*! SegmentList*/
+typedef struct
+{
+	/*! inherits multiple segment base*/
+	GF_MPD_MULTIPLE_SEGMENT_BASE
+	/*! list of segments - can be NULL if no segment*/
+	GF_List *segment_URLs;
+	/*! xlink URL for external list*/
+	char *xlink_href;
+	/*! xlink evaluation on load if set, otherwise on use*/
+	Bool xlink_actuate_on_load;
+
+	/*! GPAC intenral, number of consecutive xlink while solving*/
+	u32 consecutive_xlink_count;
+	/*! GPAC intenral, we store the segment template here*/
+	char *dasher_segment_name;
+} GF_MPD_SegmentList;
+
+/*! SegmentTemplate*/
+typedef struct
+{
+	/*! inherits multiple segment base*/
+	GF_MPD_MULTIPLE_SEGMENT_BASE
+	/*! media segment template*/
+	char *media;
+	/*! index segment template*/
+	char *index;
+	/*! init segment template*/
+	char *initialization;
+	/*! bitstream switching segment template*/
+	char *bitstream_switching;
+} GF_MPD_SegmentTemplate;
+
+/*! MPD scan types*/
+typedef enum
+{
+	/*! unknown*/
+	GF_MPD_SCANTYPE_UNKNOWN,
+	/*! progressive*/
+	GF_MPD_SCANTYPE_PROGRESSIVE,
+	/*! interlaced*/
+	GF_MPD_SCANTYPE_INTERLACED
+} GF_MPD_ScanType;
+
+/*! Macro for common attributes and elements (representation, AdaptationSet, Preselection, ...)
+
+MANDATORY:
+	mime_type
+	codecs
+*/
+#define GF_MPD_COMMON_ATTRIBUTES_ELEMENTS	\
+	char *profiles;	\
+	u32 width;	\
+	u32 height;	\
+	GF_MPD_Fractional *sar;	\
+	GF_MPD_Fractional *framerate;	\
+	u32 samplerate;	\
+	char *mime_type;	\
+	char *segmentProfiles;	\
+	char *codecs;	\
+	u32 maximum_sap_period;	\
+	u32 starts_with_sap;	\
+	Double max_playout_rate;	\
+	Bool coding_dependency;	\
+	GF_MPD_ScanType scan_type;	\
+	GF_List *frame_packing;	\
+	GF_List *audio_channels;	\
+	GF_List *content_protection;	\
+	GF_List *essential_properties;	\
+	GF_List *supplemental_properties;	\
+	GF_List *isobmf_tracks;	\
+
+/*! common attributes*/
+typedef struct {
+	/*! inherits common attributes*/
+	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
+} GF_MPD_CommonAttributes;
+
+/*! SubRepresentation*/
+typedef struct {
+	/*! inherits common attributes*/
+	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
+	/*! level of subrepresentation*/
+	u32 level;
+	/*! dependency level of subrepresentation*/
+	char *dependecy_level;
+	/*! bandwidth of subrepresentation, MANDATORY if level set*/
+	u32 bandwidth;
+	/*! content comonents string*/
+	char *content_components;
+} GF_MPD_SubRepresentation;
+
+/*! State for representation playback, GPAC internal*/
+typedef struct
+{
+	/*! disabled*/
+	Bool disabled;
+	/*! name of cahed init segemnt URL (usually local cache or gmem:// url)*/
+	char *cached_init_segment_url;
+	/*! if set indicates the associated gmem memory is owned by this representation*/
+	Bool owned_gmem;
+	/*! start range of the init segment*/
+	u64 init_start_range;
+	/*! end range of the init segment*/
+	u64 init_end_range;
+	/*! number of switching probes*/
+	u32 probe_switch_count;
+	/*! init segment blob*/
+	GF_Blob init_segment;
+	/*! associated key URL if any, for HLS*/
+	char *key_url;
+	/*! associated key IV if any, for HLS*/
+	bin128 key_IV;
+	/*! previous maximum speed that this representation can be played, or 0 if it has never been played*/
+	Double prev_max_available_speed;
+	/*! after switch we may have some buffered segments of the previous representation; so codec stats at this moment is unreliable. we should wait after the codec reset*/
+	Bool waiting_codec_reset;
+	/*! BOLA Utility*/
+	Double bola_v;
+
+	/*! index of the next enhancement representation plus 1, 0 is reserved in case of the highest representation*/
+	u32 enhancement_rep_index_plus_one;
+	/*! set to true if the representation comes from a broadcast link (ATSC3, eMBMS)*/
+	Bool broadcast_flag;
+	/*! opaque data*/
+	void *udta;
+} GF_DASH_RepresentationPlayback;
+
+/*! segment context used by the dasher, GPAC internal*/
+typedef struct
+{
+	/*! ID of active period*/
+	char *period_id;
+	/*! start of active period*/
+	Double period_start;
+	/*! duration of active period*/
+	Double period_duration;
+	/*! if GF_TRUE, representation is over*/
+	Bool done;
+	/*! niumber of last packet processed (to resume dashing)*/
+	u64 last_pck_idx;
+	/*! number of last produced segment*/
+	u32 seg_number;
+	/*! source URL*/
+	char *src_url;
+	/*! name of init segment*/
+	char *init_seg;
+	/*! segment template (half-resolved, no more %s in it)*/
+	char *template_seg;
+	/*! index template (half-resolved, no more %s in it)*/
+	char *template_idx;
+	/*! ID of output PID*/
+	u32 pid_id;
+	/*! ID of source PID*/
+	u32 source_pid;
+	/*! ID of source dependent PID*/
+	u32 dep_pid_id;
+	/*! indicates if this representation drives the AS segmentation*/
+	Bool owns_set;
+	/*! indicates if uses multi PID (eg, multiple sample descriptions in init segment)*/
+	Bool multi_pids;
+	/*! target segment duration for this stream*/
+	Double dash_dur;
+	/*! estimated next segment start time in MPD timescale*/
+	u64 next_seg_start;
+	/*! first CTS of stream in stream timescale*/
+	u64 first_cts;
+	/*! first DCTS of stream in stream timescale*/
+	u64 first_dts;
+	/*! number of past repetitions of the stream */
+	u32 nb_repeat;
+	/*! timestamp offset (in stream timescale) due to repetitions*/
+	u64 ts_offset;
+	/*! mpd timescale of the stream*/
+	u32 mpd_timescale;
+	/*! estimated next DTS of the stream in media timescale*/
+	u64 est_next_dts;
+	/*! cumulated sub duration of the stream (to handle partial file dashing)*/
+	Double cumulated_subdur;
+	/*! cumulated duration of the stream (to handle loops)*/
+	Double cumulated_dur;
+	/*! space-separated list of PID IDs of streams muxed with this stream in a multiplex representation*/
+	char *mux_pids;
+	/*! number of segments purged from the timeline and from disk*/
+	u32 segs_purged;
+	/*! cumulated duration of segments purged*/
+	Double dur_purged;
+	/*! next moof sequence number*/
+	u32 moof_sn;
+	/*! next moof sequence number increment*/
+	u32 moof_sn_inc;
+	/*! ID of last dynamic period in manifest*/
+	u32 last_dyn_period_id;
+} GF_DASH_SegmenterContext;
+
+/*! Segment context - GPAC internal, used to produce HLS manifests and segment lists/timeline*/
+typedef struct
+{
+	/*! time in mpd timescale*/
+	u64 time;
+	/*! duration in mpd timescale*/
+	u64 dur;
+	/*! name as printed in segment lists / m3u8*/
+	char *filename;
+	/*! full path of file*/
+	char *filepath;
+	/*! file size in bytes*/
+	u32 file_size;
+	/*! file offset in bytes*/
+	u64 file_offset;
+	/*! index size in bytes*/
+	u32 index_size;
+	/*! index offset in bytes*/
+	u64 index_offset;
+	/*! segment number */
+	u32 seg_num;
+} GF_DASH_SegmentContext;
+
+/*! Representation*/
+typedef struct {
+	/*! inherits common attributes*/
+	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
+
+	/*! ID of representation, mandatory*/
+	char *id;
+	/*! bandwidth in bits per secon, mandatory*/
+	u32 bandwidth;
+	/*! quality ranking*/
+	u32 quality_ranking;
+	/*! dependency IDs of dependent representations*/
+	char *dependency_id;
+	/*! stream structure ID, not used by GPAC*/
+	char *media_stream_structure_id;
+	/*! list of baseURLs if any*/
+	GF_List *base_URLs;
+
+	/*! segment base of representation, or NULL if list or template is used*/
+	GF_MPD_SegmentBase *segment_base;
+	/*! segment list of representation, or NULL if base or template is used*/
+	GF_MPD_SegmentList *segment_list;
+	/*! segment template of representation, or NULL if base or list is used*/
+	GF_MPD_SegmentTemplate *segment_template;
+	/*! number of subrepresentation*/
+	GF_List *sub_representations;
+
+	/*! other MPD descriptors*/
+	GF_List *other_descriptors;
+
+	/*! all the below members are GPAC internal*/
+
+	/*! GPAC playback implementation*/
+	GF_DASH_RepresentationPlayback playback;
+	/*! internal, HLS: min sequence number of segments in playlist*/
+	u32 m3u8_media_seq_min;
+	/*! internal, HLS: max sequence number of segments in playlist*/
+	u32 m3u8_media_seq_max;
+
+	/*! GPAC dasher context*/
+	GF_DASH_SegmenterContext *dasher_ctx;
+	/*! list of segment states*/
+	GF_List *state_seg_list;
+	/*! segment timescale (for HLS)*/
+	u32 timescale;
+	/*! stream type (for HLS)*/
+	u32 streamtype;
+	/*! segment manifest timescale (for HLS)*/
+	u32 timescale_mpd;
+	/*! dash duration*/
+	Double dash_dur;
+	/*! init segment name for HLS single file*/
+	const char *hls_single_file_name;
+	/*! number of audio channels - HLS only*/
+	u32 nb_chan;
+	/*! video FPS - HLS only*/
+	Double fps;
+	/*! user assigned m3u8 name for this representation*/
+	const char *m3u8_name;
+	/*! generated m3u8 name if no user-assigned one*/
+	char *m3u8_var_name;
+	/*! temp file for m3u8 generation*/
+	FILE *m3u8_var_file;
+} GF_MPD_Representation;
+
+/*! AdaptationSet*/
+typedef struct
+{
+	/*! inherits common attributes*/
+	GF_MPD_COMMON_ATTRIBUTES_ELEMENTS
+	/*! ID of this set*/
+	u32 id;
+	/*! group ID for this set, default value is -1: not set in MPD*/
+	s32 group;
+	/*! language*/
+	char *lang;
+	/*! mime type*/
+	char *content_type;
+	/*! picture aspect ratio*/
+	GF_MPD_Fractional *par;
+	/*! min bandwidth in bps*/
+	u32 min_bandwidth;
+	/*! max bandwidth in bps*/
+	u32 max_bandwidth;
+	/*! min width in pixels*/
+	u32 min_width;
+	/*! max width in pixels*/
+	u32 max_width;
+	/*! min height in pixels*/
+	u32 min_height;
+	/*! max height in pixels*/
+	u32 max_height;
+	/*! min framerate*/
+	GF_MPD_Fractional min_framerate;
+	/*! max framerate*/
+	GF_MPD_Fractional max_framerate;
+	/*! set if segment boundaries are time-aligned across qualities*/
+	Bool segment_alignment;
+	/*! set if a single init segment is needed (no reinit at quality switch)*/
+	Bool bitstream_switching;
+	/*! set if subsegment boundaries are time-aligned across qualities*/
+	Bool subsegment_alignment;
+	/*! set if subsegment all start with given SAP type, 0 otherwise*/
+	u32 subsegment_starts_with_sap;
+	/*! accessibility descriptor list if any*/
+	GF_List *accessibility;
+	/*! role descriptor list if any*/
+	GF_List *role;
+	/*! rating descriptor list if any*/
+	GF_List *rating;
+	/*! viewpoint descriptor list if any*/
+	GF_List *viewpoint;
+	/*! content component descriptor list if any*/
+	GF_List *content_component;
+
+	/*! base URL (alternate location) list if any*/
+	GF_List *base_URLs;
+	/*! segment base of representation, or NULL if list or template is used*/
+	GF_MPD_SegmentBase *segment_base;
+	/*! segment list of representation, or NULL if base or template is used*/
+	GF_MPD_SegmentList *segment_list;
+	/*! segment template of representation, or NULL if base or list is used*/
+	GF_MPD_SegmentTemplate *segment_template;
+	/*! list of representations*/
+	GF_List *representations;
+	/*! xlink URL for the adaptation set*/
+	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;
+} GF_MPD_AdaptationSet;
+
+/*! MPD offering type*/
+typedef enum {
+	/*! content is statically available*/
+	GF_MPD_TYPE_STATIC,
+	/*! content is dynamically available*/
+	GF_MPD_TYPE_DYNAMIC,
+	/*! content is the last if a dynamical offering, converts MPD to static (GPAC internal)*/
+	GF_MPD_TYPE_DYNAMIC_LAST,
+} GF_MPD_Type;
+
+/*! Period*/
+typedef struct
+{
+	/*! ID of period*/
+	char *ID;
+	/*! start time in milliseconds, relative to the start of the MPD */
+	u64 start;
+	/*! duration in milliseconds*/
+	u64 duration;
+	/*! set to GF_TRUE if adaptation sets in the period don't need reinit when switching quality*/
+	Bool bitstream_switching;
+
+	/*! base URL (alternate location) list if any*/
+	GF_List *base_URLs;
+	/*! segment base of representation, or NULL if list or template is used*/
+	GF_MPD_SegmentBase *segment_base;
+	/*! segment list of representation, or NULL if base or template is used*/
+	GF_MPD_SegmentList *segment_list;
+	/*! segment template of representation, or NULL if base or list is used*/
+	GF_MPD_SegmentTemplate *segment_template;
+	/*! list of adaptation sets*/
+	GF_List *adaptation_sets;
+	/*! list of subsets (not yet implemented)*/
+	GF_List *subsets;
+	/*! xlink URL for the period*/
+	char *xlink_href;
+	/*! 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*/
+	char *origin_base_url;
+	/*! type of the period - GPAC internal*/
+	GF_MPD_Type type;
+} GF_MPD_Period;
+
+/*! Program info*/
+typedef struct
+{
+	/*! languae*/
+	char *lang;
+	/*! title*/
+	char *title;
+	/*! source*/
+	char *source;
+	/*! copyright*/
+	char *copyright;
+	/*! URL to get more info*/
+	char *more_info_url;
+} GF_MPD_ProgramInfo;
+
+/*! MPD*/
+typedef struct {
+	/*! inherits from extensible*/
+	MPD_EXTENSIBLE
+	/*! ID of the MPD*/
+	char *ID;
+	/*! profile, mandatory*/
+	char *profiles;
+	/*! offering type*/
+	GF_MPD_Type type;
+	/*! UTC of availability start anchor,  expressed in milliseconds, MANDATORY if type=dynamic*/
+	u64 availabilityStartTime;
+	/*! UTC of availability end anchor,  expressed in milliseconds*/
+	u64 availabilityEndTime;
+	/*! UTC of last publishing of the manifest*/
+	u64 publishTime;
+	/*! presentation duration in milliseconds, MANDATORY if type=static*/
+	u64 media_presentation_duration;
+	/*! refresh rate of MPD for dynamic offering, in milliseconds */
+	u32 minimum_update_period;
+	/*! minimum buffer time in milliseconds, MANDATORY*/
+	u32 min_buffer_time;
+
+	/*! time shift depth in milliseconds */
+	u32 time_shift_buffer_depth;
+	/*! presentation delay in milliseconds */
+	u32 suggested_presentation_delay;
+	/*! maximum segment duration in milliseconds */
+	u32 max_segment_duration;
+	/*! maximum subsegment duration in milliseconds */
+	u32 max_subsegment_duration;
+
+	/*! list of GF_MPD_ProgramInfo */
+	GF_List *program_infos;
+	/*! list of GF_MPD_BaseURL */
+	GF_List *base_URLs;
+	/*! list of strings */
+	GF_List *locations;
+	/*! list of Metrics */
+	GF_List *metrics;
+	/*! list of GF_MPD_Period */
+	GF_List *periods;
+
+	/*! set during parsing, to set during authoring, won't be freed by GPAC*/
+	const char *xml_namespace;
+
+	/*! dasher init NTP clock in ms - GPAC internal*/
+	u64 gpac_init_ntp_ms;
+	/*! dasher next generation time NTP clock in ms - GPAC internal*/
+	u64 gpac_next_ntp_ms;
+	/*! dasher current MPD time in milliseconds - GPAC internal*/
+	u64 gpac_mpd_time;
+
+	/*! indicates the GPAC state info should be written*/
+	Bool write_context;
+	/*! indicates this is the last static serialization of a previously dynamic MPD*/
+	Bool was_dynamic;
+	/*! indicates the HLS variant files shall be created, otherwise temp files are used*/
+	Bool create_m3u8_files;
+	/*! indicates to insert clock reference in variant playlists*/
+	Bool m3u8_time;
+} GF_MPD;
+
+/*! parses an MPD Element (and subtree) from DOM
+\param root root of DOM parsing result
+\param mpd MPD structure to fill
+\param base_url base URL of the DOM document
+\return error if any
+*/
+GF_Err gf_mpd_init_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *base_url);
+/*! parses an MPD Period element (and subtree) from DOM
+\param root root of DOM parsing result
+\param mpd MPD structure to fill
+\param base_url base URL of the DOM document
+\return error if any
+*/
+GF_Err gf_mpd_complete_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *base_url);
+/*! MPD constructor
+\return a new MPD*/
+GF_MPD *gf_mpd_new();
+/*! MPD destructor
+\param mpd the target MPD*/
+void gf_mpd_del(GF_MPD *mpd);
+/*! frees a GF_MPD_SegmentURL structure (type-casted to void *)
+\param ptr the target GF_MPD_SegmentURL
+*/
+void gf_mpd_segment_url_free(void *ptr);
+/*! frees a GF_MPD_SegmentBase structure (type-casted to void *)
+\param ptr the target GF_MPD_SegmentBase
+*/
+void gf_mpd_segment_base_free(void *ptr);
+/*! parses a new GF_MPD_SegmentURL from its DOM description
+\param container the container list where to insert the segment URL
+\param root the DOM description of the segment URL
+*/
+void gf_mpd_parse_segment_url(GF_List *container, GF_XMLNode *root);
+/*! frees a GF_MPD_URL structure (type-casted to void *)
+\param _item the target GF_MPD_URL
+*/
+void gf_mpd_url_free(void *_item);
+
+/*! MPD Period constructor
+\return a new MPD Period*/
+GF_MPD_Period *gf_mpd_period_new();
+/*! MPD Period destructor
+\param _item the MPD Period to free*/
+void gf_mpd_period_free(void *_item);
+/*! writes an MPD to a file stream
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
+\param mpd the target MPD to write
+\param out the target file object
+\param compact if set, removes all new line and indentation in the output
+\return error if any
+*/
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
+/*! writes an MPD to a local file
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
+\param mpd the target MPD to write
+\param file_name the target file name
+\return error if any
+*/
+GF_Err gf_mpd_write_file(GF_MPD const * const mpd, const char *file_name);
+
+/*! writes an MPD to a m3u8 playlist
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
+\param mpd the target MPD to write
+\param out the target file object
+\param m3u8_name the base m3u8 name to use (needed when generating variant playlist file names)
+\param period the MPD period for that m3u8
+\return error if any
+*/
+GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period);
+
+/*! parses an MPD Period and appends it to the MPD period list
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact);
+\param mpd the target MPD to write
+\param root the DOM element describing the period
+\return error if any
+*/
+GF_Err gf_mpd_parse_period(GF_MPD *mpd, GF_XMLNode *root);
+
+/*! creates a new MPD descriptor
+\param id the descriptor ID, may be NULL
+\param uri the descriptor schemeid URI, mandatory
+\param value the descriptor value, may be NULL
+\return the new descriptor or NULL if error
+*/
+GF_MPD_Descriptor *gf_mpd_descriptor_new(const char *id, const char *uri, const char *value);
+
+/*! creates a new MPD AdaptationSet
+\return the new GF_MPD_AdaptationSet or NULL if error
+*/
+GF_MPD_AdaptationSet *gf_mpd_adaptation_set_new();
+
+/*! file download abstraction object*/
+typedef struct _gf_file_get GF_FileDownload;
+/*! file download abstraction object*/
+struct _gf_file_get
+{
+	/*! callback function for session creation, fetches the given URL*/
+	GF_Err (*new_session)(GF_FileDownload *getter, char *url);
+	/*! callback function to destroy the session*/
+	void (*del_session)(GF_FileDownload *getter);
+	/*! callback function to get the local file name*/
+	const char *(*get_cache_name)(GF_FileDownload *getter);
+	/*! user private*/
+	void *udta;
+	/*! created by user after new_session*/
+	void *session;
+};
+
+/*! converts M3U8 to MPD - getter is optional (download will still be processed if NULL)
+\param m3u8_file the path to the local m3u8 master playlist file
+\param base_url the original URL of the file if any
+\param mpd_file the destination MPD file, or NULL when filling an MPD structure
+\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_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
+\param parse_sub_playlist if GF_TRUE, parses sub playlists, otherwise only the master playlist is parsed and xlink are added on each representation to the target m3u8 sub playlist
+\param keep_files if GF_TRUE, will not delete any files downloaded in the conversion process
+\return error if any
+*/
+GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url, const char *mpd_file, u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool use_segment_timeline, GF_FileDownload *getter, GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files);
+
+/*! solves an m3u8 xlink on a representation, and fills the SegmentList accordingly
+\param rep the target representation
+\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
+*/
+GF_Err gf_m3u8_solve_representation_xlink(GF_MPD_Representation *rep, GF_FileDownload *getter, Bool *is_static, u64 *duration);
+
+/*! creates a segment list from a remote segment list DOM root
+\param mpd the target MPD to write
+\param root the DOM element describing the segment list
+\return a new segment list, or NULL if error
+*/
+GF_MPD_SegmentList *gf_mpd_solve_segment_list_xlink(GF_MPD *mpd, GF_XMLNode *root);
+
+/*! inits an MPD from a smooth manifest root node
+\param root the root node of a smooth manifest
+\param mpd the MPD to fill
+\param default_base_url the default URL of the smooth manifest
+\return error if any
+*/
+GF_Err gf_mpd_init_smooth_from_dom(GF_XMLNode *root, GF_MPD *mpd, const char *default_base_url);
+
+/*! deletes a segment list
+\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
+\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
+*/
+void gf_mpd_del_list(GF_List *list, void (*__destructor)(void *), Bool reset_only);
+/*! deletes a GF_MPD_Descriptor object
+\param item the descriptor to delete
+*/
+void gf_mpd_descriptor_free(void *item);
+
+/*! splits all adaptation sets of a source MPD, creating one adaptation set per quality of each orgingal adaptation sets
+\param mpd the target MPD
+\return error if any
+*/
+GF_Err gf_mpd_split_adaptation_sets(GF_MPD *mpd);
+
+/*! converts a smooth manifest (local file) to an MPD
+\param smooth_file local path to the smooth manifest
+\param mpd MPD structure to fill
+\param default_base_url the default URL of the smooth manifest
+\return error if any
+*/
+GF_Err gf_mpd_smooth_to_mpd(char * smooth_file, GF_MPD *mpd, const char *default_base_url);
+
+/*! get the number of base URLs for the given representation. This cumuluates all base URLs at MPD, period, AdaptationSet and Representation levels
+\param mpd the target MPD
+\param period the target period
+\param set the target adaptation set
+\param rep the target representation
+\return the number of base URLs
+*/
+u32 gf_mpd_get_base_url_count(GF_MPD *mpd, GF_MPD_Period *period, GF_MPD_AdaptationSet *set, GF_MPD_Representation *rep);
+
+/*! MPD URL resolutio mode*/
+typedef enum
+{
+	/*resolves template for a media segment*/
+	GF_MPD_RESOLVE_URL_MEDIA,
+	/*resolves template for an init segment*/
+	GF_MPD_RESOLVE_URL_INIT,
+	/*resolves template for an index segment*/
+	GF_MPD_RESOLVE_URL_INDEX,
+	/*! same as GF_MPD_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$*/
+	GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE,
+	/*! same as GF_MPD_RESOLVE_URL_MEDIA but does not use startNumber*/
+	GF_MPD_RESOLVE_URL_MEDIA_NOSTART,
+} GF_MPD_URLResolveType;
+
+/*! resolves a URL based for a given segment, based on the MPD url, the type of resolution
+\param mpd the target MPD
+\param rep the target Representation
+\param set the target AdaptationSet
+\param period the target Period
+\param mpd_url the original URL of the MPD
+\param base_url_index 0-based index of the baseURL to use
+\param resolve_type the type of URL resolution desired
+\param item_index the index of the target segment (startNumber based)
+\param nb_segments_removed number of segments removed when purging the MPD after updates (can be 0). The start number will be offset by this value
+\param out_url set to the resolved URL, to be freed by caller
+\param out_range_start set to the resolved start range, 0 if no range
+\param out_range_end set to the resolved end range, 0 if no range
+\param segment_duration set to the resolved segment duartion, 0 if unknown
+\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)
+\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);
+
+/*! get duration of the presentation
+\param mpd the target MPD
+\return the duration in seconds
+*/
+Double gf_mpd_get_duration(GF_MPD *mpd);
+
+/*! gets the duration of media segments
+\param rep the target Representation
+\param set the target AdaptationSet
+\param period the target Period
+\param out_duration set to the average media segment duration
+\param out_timescale set to the MPD timescale used by this representation
+\param out_pts_offset set to the presentation time offset if any (optional, may be NULL)
+\param out_segment_timeline set to the segment timeline description if any (optional, may be NULL)
+*/
+void gf_mpd_resolve_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline);
+
+/*! gets the start_time from the segment index of a period/set/rep
+\param in_segment_index the index of the target segment (startNumber based)
+\param in_period the target Period
+\param in_set the target AdaptationSet
+\param in_rep the target Representation
+\param out_segment_start_time set to the MPD start time of the segment
+\param out_opt_segment_duration set to the segment duration (optional, may be NULL)
+\param out_opt_scale set to the MPD timescale for this segment (optional, may be NULL)
+\return error if any
+*/
+GF_Err gf_mpd_get_segment_start_time_with_timescale(s32 in_segment_index,
+	GF_MPD_Period const * const in_period, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
+	u64 *out_segment_start_time, u64 *out_opt_segment_duration, u32 *out_opt_scale);
+
+/*! MPD seek mode*/
+typedef enum {
+	/*! will return the segment containing the requested time*/
+	MPD_SEEK_PREV,
+	/*! will return the nearest segment start time, may be the previous or the next one*/
+	MPD_SEEK_NEAREST,
+} MPDSeekMode;
+
+/*! returns the segment index in the given period for the given time
+\param seek_time the desired time in seconds
+\param seek_mode the desired seek mode
+\param in_period the target Period
+\param in_set the target AdaptationSet
+\param in_rep the target Representation
+\param out_segment_index the corresponding segment index
+\param out_opt_seek_time the corresponding seek time (start time of segment in seconds) (optional, may be NULL)
+\return error if any
+*/
+GF_Err gf_mpd_seek_in_period(Double seek_time, MPDSeekMode seek_mode,
+	GF_MPD_Period const * const in_period, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
+	u32 *out_segment_index, Double *out_opt_seek_time);
+
+/*! deletes a GF_MPD_BaseURL structure (type-casted to void *)
+\param _item the GF_MPD_BaseURL to free
+*/
+void gf_mpd_base_url_free(void *_item);
+/*! creates a new GF_MPD_Representation
+\return the new representation*/
+GF_MPD_Representation *gf_mpd_representation_new();
+/*! deletes a GF_MPD_Representation structure (type-casted to void *)
+\param _item the GF_MPD_Representation to free
+*/
+void gf_mpd_representation_free(void *_item);
+
+/*! creates a new GF_MPD_SegmentTimeline
+\return the new segment timeline*/
+GF_MPD_SegmentTimeline *gf_mpd_segmentimeline_new();
+
+/*! DASHer cues information*/
+typedef struct
+{
+	/*! target splice point sample number (1-based), or 0 if not set*/
+	u32 sample_num;
+	/*! target splice point dts in cues timescale */
+	u64 dts;
+	/*! target splice point cts in cues timescale */
+	s64 cts;
+	/*! internal flag indicating if the cues is processed or not */
+	Bool is_processed;
+} GF_DASHCueInfo;
+
+/*! loads a cue file and allocates cues as needed
+\param cues_file the XML cue file to load
+\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 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);
+
+
+/*! @} */
+#endif /*GPAC_DISABLE_CORE_TOOLS*/
+
+#endif // _MPD_H_

gpac-0.8.0.tar.gz/include/gpac/mpeg4_odf.h -> gpac-1.0.0.tar.gz/include/gpac/mpeg4_odf.h Changed

gpac-0.8.0.tar.gz/include/gpac/mpegts.h -> gpac-1.0.0.tar.gz/include/gpac/mpegts.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2006-2012
+ *			Copyright (c) Telecom ParisTech 2006-2019
  *
  *  This file is part of GPAC / MPEG2-TS sub-project
  *
@@ -27,18 +27,19 @@
 #define _GF_MPEG_TS_H_
 
 /*!
- *	\file <gpac/mpegts.h>
- *	\brief MPEG-TS demultiplexer and multiplexer APIs
- */
+\file <gpac/mpegts.h>
+\brief MPEG-TS demultiplexer and multiplexer APIs
+*/
 
 /*!
- *	\addtogroup m2ts_grp MPEG-2 TS
- *	\ingroup media_grp
- *	\brief MPEG-TS demultiplexer and multiplexer APIs.
- *
- *This section documents the MPEG-TS demultiplexer and multiplexer APIs.
- *	@{
- */
+\addtogroup m2ts_grp MPEG-2 TS
+\ingroup media_grp
+\brief MPEG-TS demultiplexer and multiplexer APIs.
+
+This section documents the MPEG-TS demultiplexer and multiplexer APIs.
+
+@{
+*/
 
 
 #include <gpac/list.h>
@@ -51,8 +52,14 @@
 extern "C" {
 #endif
 
+/*! metadata types for GF_M2TS_METADATA_POINTER_DESCRIPTOR*/
+enum {
+	GF_M2TS_META_ID3 	= GF_4CC('I','D','3',' '),
+};
+
 
-/*MPEG-2 Descriptor tags*/
+
+/*! MPEG-2 Descriptor tags*/
 enum
 {
 	/* ... */
@@ -132,7 +139,7 @@
 	GF_M2TS_DVB_LOGICAL_CHANNEL_DESCRIPTOR = 0x83,
 };
 
-/* Reserved PID values */
+/*! Reserved PID values */
 enum {
 	GF_M2TS_PID_PAT			= 0x0000,
 	GF_M2TS_PID_CAT			= 0x0001,
@@ -152,7 +159,7 @@
 	GF_M2TS_PID_SIT			= 0x001F
 };
 
-/* max size includes first header, second header, payload and CRC */
+/*! max size includes first header, second header, payload and CRC */
 enum {
 	GF_M2TS_TABLE_ID_PAT			= 0x00,
 	GF_M2TS_TABLE_ID_CAT			= 0x01,
@@ -205,8 +212,8 @@
 	/* 0xff reserved */
 };
 
-/*MPEG-2 TS Media types*/
-enum
+/*! MPEG-2 TS Media types*/
+typedef enum
 {
 	GF_M2TS_VIDEO_MPEG1				= 0x01,
 	GF_M2TS_VIDEO_MPEG2				= 0x02,
@@ -264,11 +271,20 @@
 	GF_M2TS_DVB_VBI					= 0x153,
 	GF_M2TS_DVB_SUBTITLE			= 0x154,
 	GF_M2TS_METADATA_ID3_HLS		= 0x155,
-};
+} GF_M2TSStreamType;
 
 
+/*! MPEG-2 TS Registration codes types*/
+enum
+{
+	GF_M2TS_RA_STREAM_AC3	= GF_4CC('A','C','-','3'),
+	GF_M2TS_RA_STREAM_VC1	= GF_4CC('V','C','-','1'),
 
-/*MPEG-2 Descriptor tags*/
+	GF_M2TS_RA_STREAM_GPAC	= GF_4CC('G','P','A','C')
+};
+
+
+/*! MPEG-2 Descriptor tags*/
 enum
 {
 	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR	= 0x04,
@@ -276,31 +292,30 @@
 	GF_M2TS_AFDESC_BASEURL_DESCRIPTOR	= 0x06,
 };
 
-#define SECTION_HEADER_LENGTH 3 /* header till the last bit of the section_length field */
-#define SECTION_ADDITIONAL_HEADER_LENGTH 5 /* header from the last bit of the section_length field to the payload */
+/*! header till the last bit of the section_length field */
+#define SECTION_HEADER_LENGTH 3
+/*! header from the last bit of the section_length field to the payload */
+#define SECTION_ADDITIONAL_HEADER_LENGTH 5
+/*! CRC32 length*/
 #define	CRC_LENGTH 4
 
 
 
 #ifndef GPAC_DISABLE_MPEG2TS
-
-#include <time.h>
-
+/*! MPEG-2 TS demuxer*/
 typedef struct tag_m2ts_demux GF_M2TS_Demuxer;
+/*! MPEG-2 TS demuxer elementary stream*/
 typedef struct tag_m2ts_es GF_M2TS_ES;
+/*! MPEG-2 TS demuxer elementary stream section*/
 typedef struct tag_m2ts_section_es GF_M2TS_SECTION_ES;
 
-#ifdef GPAC_HAS_LINUX_DVB
-typedef struct __gf_dvb_tuner GF_Tuner;
-#endif
-
-/*Maximum number of streams in a TS*/
+/*! Maximum number of streams in a TS*/
 #define GF_M2TS_MAX_STREAMS	8192
 
-/*Maximum number of service in a TS*/
+/*! Maximum number of service in a TS*/
 #define GF_M2TS_MAX_SERVICES	65535
 
-/*Maximum size of the buffer in UDP */
+/*! Maximum size of the buffer in UDP */
 #ifdef WIN32
 #define GF_M2TS_UDP_BUFFER_SIZE	0x80000
 #else
@@ -309,21 +324,36 @@
 #define GF_M2TS_UDP_BUFFER_SIZE	0x40000
 #endif
 
+/*! Maximum PCR value */
 #define GF_M2TS_MAX_PCR	2576980377811ULL
 
-/*returns readable name for given stream type*/
-const char *gf_m2ts_get_stream_name(u32 streamType);
+/*! gets the stream name for an MPEG-2 stream type
+\param streamType the target stream type
+\return name of the stream type*/
+const char *gf_m2ts_get_stream_name(GF_M2TSStreamType streamType);
 
-/*returns 1 if file is an MPEG-2 TS */
+/*! probes a file for MPEG-2 TS format
+\param fileName name / path of the file to brobe
+\return GF_TRUE if file is an MPEG-2 TS */
 Bool gf_m2ts_probe_file(const char *fileName);
 
-/*shifts all timing by the given value
-@is_pes: array of GF_M2TS_MAX_STREAMS u8 set to 1 for PES PIDs to be restamped
+/*! probes a buffer for MPEG-2 TS format
+\param data data buffer to probe
+\param size size of buffer to probe
+\return GF_TRUE if file is an MPEG-2 TS */
+Bool gf_m2ts_probe_data(const u8 *data, u32 size);
+
+/*! restamps a set of TS packets by shifting all timing by the given value
+\param buffer data buffer to restamp
+\param size size of buffer
+\param ts_shift clock shift in 90 kHz
+\param is_pes array of GF_M2TS_MAX_STREAMS u8 set to 1 for PES PIDs to be restamped, 0 to stream to left untouched
+\return error if any
 */
-GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes);
+GF_Err gf_m2ts_restamp(u8 *buffer, u32 size, s64 ts_shift, u8 is_pes[GF_M2TS_MAX_STREAMS]);
 
-/*PES data framing modes*/
-enum
+/*! PES data framing modes*/
+typedef enum
 {
 	/*skip pes processing: all transport packets related to this stream are discarded*/
 	GF_M2TS_PES_FRAMING_SKIP,
@@ -332,181 +362,202 @@
 	/*don't use data framing: all packets are raw PES packets*/
 	GF_M2TS_PES_FRAMING_RAW,
 
+	//TODO - remove this one, we no longer reframe in the TS demuxer
 	/*use data framing: recompute start of AUs (data frames)*/
 	GF_M2TS_PES_FRAMING_DEFAULT,
-	/*same as defualt PES framing but forces nal-per-nal dispatch for AVC/HEVC (default mode may dispatch complete frames)*/
-	GF_M2TS_PES_FRAMING_DEFAULT_NAL,
-};
+} GF_M2TSPesFraming;
 
-/*PES packet flags*/
+/*! PES packet flags*/
 enum
 {
+	/*! PES packet is RAP*/
 	GF_M2TS_PES_PCK_RAP = 1,
+	/*! PES packet contains an AU start*/
 	GF_M2TS_PES_PCK_AU_START = 1<<1,
-	/*visual frame starting in this packet is an I frame or IDR (AVC/H264)*/
+	/*! visual frame starting in this packet is an I frame or IDR (AVC/H264)*/
 	GF_M2TS_PES_PCK_I_FRAME = 1<<2,
-	/*visual frame starting in this packet is a P frame*/
+	/*! visual frame starting in this packet is a P frame*/
 	GF_M2TS_PES_PCK_P_FRAME = 1<<3,
-	/*visual frame starting in this packet is a B frame*/
+	/*! visual frame starting in this packet is a B frame*/
 	GF_M2TS_PES_PCK_B_FRAME = 1<<4,
-	/*Possible PCR discontinuity from this packet on*/
+	/*! Possible PCR discontinuity from this packet on*/
 	GF_M2TS_PES_PCK_DISCONTINUITY = 1<<5
 };
 
-/*Events used by the MPEGTS demuxer*/
+/*! Events used by the MPEGTS demuxer*/
 enum
 {
-	/*PAT has been found (service connection) - no assoctiated parameter*/
+	/*! PAT has been found (service connection) - no associated parameter*/
 	GF_M2TS_EVT_PAT_FOUND = 0,
-	/*PAT has been updated - no assoctiated parameter*/
+	/*! PAT has been updated - no associated parameter*/
 	GF_M2TS_EVT_PAT_UPDATE,
-	/*repeated PAT has been found (carousel) - no assoctiated parameter*/
+	/*! repeated PAT has been found (carousel) - no associated parameter*/
 	GF_M2TS_EVT_PAT_REPEAT,
-	/*PMT has been found (service tune-in) - assoctiated parameter: new PMT*/
+	/*! PMT has been found (service tune-in) - associated parameter: new PMT*/
 	GF_M2TS_EVT_PMT_FOUND,
-	/*repeated PMT has been found (carousel) - assoctiated parameter: updated PMT*/
+	/*! repeated PMT has been found (carousel) - associated parameter: updated PMT*/
 	GF_M2TS_EVT_PMT_REPEAT,
-	/*PMT has been changed - assoctiated parameter: updated PMT*/
+	/*! PMT has been changed - associated parameter: updated PMT*/
 	GF_M2TS_EVT_PMT_UPDATE,
-	/*SDT has been received - assoctiated parameter: none*/
+	/*! SDT has been received - associated parameter: none*/
 	GF_M2TS_EVT_SDT_FOUND,
-	/*repeated SDT has been found (carousel) - assoctiated parameter: none*/
+	/*! repeated SDT has been found (carousel) - associated parameter: none*/
 	GF_M2TS_EVT_SDT_REPEAT,
-	/*SDT has been received - assoctiated parameter: none*/
+	/*! SDT has been received - associated parameter: none*/
 	GF_M2TS_EVT_SDT_UPDATE,
-	/*INT has been received - assoctiated parameter: none*/
+	/*! INT has been received - associated parameter: none*/
 	GF_M2TS_EVT_INT_FOUND,
-	/*repeated INT has been found (carousel) - assoctiated parameter: none*/
+	/*! repeated INT has been found (carousel) - associated parameter: none*/
 	GF_M2TS_EVT_INT_REPEAT,
-	/*INT has been received - assoctiated parameter: none*/
+	/*! INT has been received - associated parameter: none*/
 	GF_M2TS_EVT_INT_UPDATE,
-	/*PES packet has been received - assoctiated parameter: PES packet*/
+	/*! PES packet has been received - associated parameter: PES packet*/
 	GF_M2TS_EVT_PES_PCK,
-	/*PCR has been received - associated parameter: PES packet with no data*/
+	/*! PCR has been received - associated parameter: PES packet with no data*/
 	GF_M2TS_EVT_PES_PCR,
-	/*PTS/DTS/PCR info - assoctiated parameter: PES packet with no data*/
+	/*! PTS/DTS/PCR info - associated parameter: PES packet with no data*/
 	GF_M2TS_EVT_PES_TIMING,
-	/*An MPEG-4 SL Packet has been received in a section - assoctiated parameter: SL packet */
+	/*! An MPEG-4 SL Packet has been received in a section - associated parameter: SL packet */
 	GF_M2TS_EVT_SL_PCK,
-	/*An IP datagram has been received in a section - assoctiated parameter: IP datagram */
+	/*! An IP datagram has been received in a section - associated parameter: IP datagram */
 	GF_M2TS_EVT_IP_DATAGRAM,
-	/*Duration has been estimated - assoctiated parameter: PES packet with no data, PTS is duration in msec*/
+	/*! Duration has been estimated - associated parameter: PES packet with no data, PTS is duration in msec*/
 	GF_M2TS_EVT_DURATION_ESTIMATED,
+	/*! TS packet processed - associated parameter: pointer to a GF_M2TS_TSPCK structure*/
+	GF_M2TS_EVT_PCK,
 
-	/*AAC config has been extracted - associated parameter: PES Packet with encoded M4ADecSpecInfo in its data
+	/*! AAC config has been extracted - associated parameter: PES Packet with encoded M4ADecSpecInfo in its data
 		THIS MUST BE CLEANED UP
 	*/
 	GF_M2TS_EVT_AAC_CFG,
 #if 0
-	/* An EIT message for the present or following event on this TS has been received */
+	/*! An EIT message for the present or following event on this TS has been received */
 	GF_M2TS_EVT_EIT_ACTUAL_PF,
-	/* An EIT message for the schedule of this TS has been received */
+	/*! An EIT message for the schedule of this TS has been received */
 	GF_M2TS_EVT_EIT_ACTUAL_SCHEDULE,
-	/* An EIT message for the present or following event of an other TS has been received */
+	/*! An EIT message for the present or following event of an other TS has been received */
 	GF_M2TS_EVT_EIT_OTHER_PF,
-	/* An EIT message for the schedule of an other TS has been received */
+	/*! An EIT message for the schedule of an other TS has been received */
 	GF_M2TS_EVT_EIT_OTHER_SCHEDULE,
 #endif
-	/* A message to inform about the current date and time in the TS */
+	/*! A message to inform about the current date and time in the TS */
 	GF_M2TS_EVT_TDT,
-	/* A message to inform about the current time offset in the TS */
+	/*! A message to inform about the current time offset in the TS */
 	GF_M2TS_EVT_TOT,
-	/* A generic event message for EIT, TDT, TOT etc */
+	/*! A generic event message for EIT, TDT, TOT etc */
 	GF_M2TS_EVT_DVB_GENERAL,
-	/* MPE / MPE-FEC frame extraction and IP datagrams decryptation */
+	/*! MPE / MPE-FEC frame extraction and IP datagrams decryptation */
 	GF_M2TS_EVT_DVB_MPE,
-	/*CAT has been found (service tune-in) - assoctiated parameter: new CAT*/
+	/*! CAT has been found (service tune-in) - associated parameter: new CAT*/
 	GF_M2TS_EVT_CAT_FOUND,
-	/*repeated CAT has been found (carousel) - assoctiated parameter: updated CAT*/
+	/*! repeated CAT has been found (carousel) - associated parameter: updated CAT*/
 	GF_M2TS_EVT_CAT_REPEAT,
-	/*PMT has been changed - assoctiated parameter: updated PMT*/
+	/*! CAT has been changed - associated parameter: updated PMT*/
 	GF_M2TS_EVT_CAT_UPDATE,
-	/*AIT has been found (carousel) */
+	/*! AIT has been found (carousel) */
 	GF_M2TS_EVT_AIT_FOUND,
-	/*DSCM-CC has been found (carousel) */
+	/*! DSCM-CC has been found (carousel) */
 	GF_M2TS_EVT_DSMCC_FOUND,
 
-	/*a TEMI locator has been found or repeated*/
+	/*! 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_EOS,
+	/*! a TEMI timecode has been found*/
+	GF_M2TS_EVT_TEMI_TIMECODE
 };
 
+/*! table parsing state*/
 enum
 {
+	/*! flag set for start of the table */
 	GF_M2TS_TABLE_START		= 1,
+	/*! flag set for end of the table */
 	GF_M2TS_TABLE_END		= 1<<1,
+	/*! flag set when first occurence of the table */
 	GF_M2TS_TABLE_FOUND		= 1<<2,
+	/*! flag set when update of the table */
 	GF_M2TS_TABLE_UPDATE	= 1<<3,
-	//both update and repeat flags may be set if data has changed
+	/*! flag set when repetition of the table - both update and repeat flags may be set if data has changed*/
 	GF_M2TS_TABLE_REPEAT	= 1<<4,
 };
 
-typedef void (*gf_m2ts_section_callback)(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status);
+/*! section callback function
+\param demux the target MPEG-2 TS demultiplexer
+\param es the target section stream
+\param sections the list of gathered sections
+\param table_id the ID of the table
+\param ex_table_id the extended ID of the table
+\param version_number the version number of the table
+\param last_section_number the last section number of the table for fragmented cases
+\param status the parsing status flags
+*/
+typedef void (*gf_m2ts_section_callback)(GF_M2TS_Demuxer *demux, GF_M2TS_SECTION_ES *es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status);
 
+/*! MPEG-2 TS demuxer section*/
 typedef struct __m2ts_demux_section
 {
-	unsigned char *data;
+	/*! section data*/
+	u8 *data;
+	/*! section data size in bytes*/
 	u32 data_size;
 } GF_M2TS_Section;
 
+/*! MPEG-2 TS demuxer table*/
 typedef struct __m2ts_demux_table
 {
+	/*! pointer to next table/section*/
 	struct __m2ts_demux_table *next;
-
+	/*! set when first table completely received*/
 	u8 is_init;
+	/*! set when repeated section*/
 	u8 is_repeat;
-
-	/*table id*/
+	/*! table id*/
 	u8 table_id;
+	/*! extended table id*/
 	u16 ex_table_id;
-
-	/*reassembler state*/
+	/*! current section version number*/
 	u8 version_number;
+	/*! last received version number*/
 	u8 last_version_number;
-
+	/*! current/next indicator (cf MPEG-2 TS spec)*/
 	u8 current_next_indicator;
-
+	/*! current section number*/
 	u8 section_number;
+	/*! last section number to get the complete table*/
 	u8 last_section_number;
-
+	/*! list of sections for this table*/
 	GF_List *sections;
-
+	/*! total table size*/
 	u32 table_size;
 } GF_M2TS_Table;
 
 
+/*! MPEG-2 TS demuxer section filter*/
 typedef struct GF_M2TS_SectionFilter
 {
-	/*section reassembler*/
+	/*! section reassembler*/
 	s16 cc;
-	/*section buffer (max 4096)*/
-	char *section;
-	/*current section length as indicated in section header*/
+	/*! section buffer (max 4096)*/
+	u8 *section;
+	/*! current section length as indicated in section header*/
 	u16 length;
-	/*number of bytes received from current section*/
+	/*! number of bytes received from current section*/
 	u16 received;
-
-	/*section->table aggregator*/
+	/*! section->table aggregator*/
 	GF_M2TS_Table *table;
-
-	/* indicates that the section and last_section_number do not need to be checked */
+	/*! indicates that the section and last_section_number do not need to be checked */
 	Bool process_individual;
-
-	/* indicates that the section header with table id and extended table id ... is
+	/*! indicates that the section header with table id and extended table id ... is
 	   not parsed by the TS demuxer and left for the application  */
 	Bool direct_dispatch;
-
-	/* this field is used for AIT sections, to link the AIT with the program */
+	/*! this field is used for AIT sections, to link the AIT with the program */
 	u32 service_id;
-
+	/*! section callback*/
 	gf_m2ts_section_callback process_section;
-
+	/*! flag indicatin the demultiplexer has been restarted*/
 	Bool demux_restarted;
 } GF_M2TS_SectionFilter;
 
+/*! metadata carriage types*/
 enum metadata_carriage {
 	METADATA_CARRIAGE_SAME_TS		= 0,
 	METADATA_CARRIAGE_DIFFERENT_TS	= 1,
@@ -514,6 +565,7 @@
 	METADATA_CARRIAGE_OTHER			= 3
 };
 
+/*! MPEG-2 TS demuxer metadat pointer*/
 typedef struct tag_m2ts_metadata_pointer_descriptor {
 	u16 application_format;
 	u32 application_format_identifier;
@@ -527,10 +579,11 @@
 	u16 program_number;
 	u16 ts_location;
 	u16 ts_id;
-	char *data;
+	u8 *data;
 	u32 data_size;
 } GF_M2TS_MetadataPointerDescriptor;
 
+/*! MPEG-2 TS demuxer TEMI location*/
 typedef struct
 {
 	u32 timeline_id;
@@ -541,6 +594,7 @@
 	Double activation_countdown;
 } GF_M2TS_TemiLocationDescriptor;
 
+/*! MPEG-2 TS demuxer TEMI timecode*/
 typedef struct
 {
 	u32 timeline_id;
@@ -554,82 +608,87 @@
 } GF_M2TS_TemiTimecodeDescriptor;
 
 
-/*MPEG-2 TS program object*/
+/*! MPEG-2 TS program object*/
 typedef struct
 {
+	/*! parent demuxer*/
 	GF_M2TS_Demuxer *ts;
-
+	/*! list of streams (PES and sections)*/
 	GF_List *streams;
+	/*! PID of PMT*/
 	u32 pmt_pid;
+	/*! PID of PCR*/
 	u32 pcr_pid;
+	/*! program number*/
 	u32 number;
-
+	/*! MPEG-4 IOD if any*/
 	GF_InitialObjectDescriptor *pmt_iod;
-
-	/*list of additional ODs found per program !! used by media importer only , refine this !!
+	/*! list of additional ODs found per program
 		this list is only created when MPEG-4 over MPEG-2 is detected
-		the list AND the ODs contained in it are destroyed when destroying the demuxer
+		the list AND the ODs contained in it are destroyed when destroying the program/demuxer
 	*/
 	GF_List *additional_ods;
-	/*first dts found on this program - this is used by parsers, but not setup by the lib*/
+	/*! first dts found on this program - this is used by parsers, but not setup by the lib*/
 	u64 first_dts;
-
-	/* Last PCR value received for this program and associated packet number */
+	/*! Last PCR value received for this program and associated packet number */
 	u64 last_pcr_value;
+	/*! packet number of last PCR value received*/
 	u32 last_pcr_value_pck_number;
-	/* PCR value before the last received one for this program and associated packet number
+	/*! PCR value before the last received one for this program and associated packet number
 	used to compute PCR interpolation value*/
 	u64 before_last_pcr_value;
+	/*! packet number of before last PCR value received*/
 	u32 before_last_pcr_value_pck_number;
-
-	/*for hybrid use-cases we need to know if TDT has already been processed*/
+	/*! for hybrid use-cases we need to know if TDT has already been processed*/
 	Bool tdt_found;
-
+	/*! indicates if PID is playing. Used in scalable streams only to toggle quality switch*/
 	u32 pid_playing;
+	/*! */
 	Bool is_scalable;
-
+	/*! metadata descriptor pointer*/
 	GF_M2TS_MetadataPointerDescriptor *metadata_pointer_descriptor;
-
-	/*continuity counter check for pure PCR PIDs*/
+	/*! continuity counter check for pure PCR PIDs*/
 	s16 pcr_cc;
+
+	void *user;
 } GF_M2TS_Program;
 
-/*ES flags*/
+/*! ES flags*/
 enum
 {
-	/*ES is a PES stream*/
+	/*! ES is a PES stream*/
 	GF_M2TS_ES_IS_PES = 1,
-	/*ES is a section stream*/
+	/*! ES is a section stream*/
 	GF_M2TS_ES_IS_SECTION = 1<<1,
-	/*ES is an mpeg-4 flexmux stream*/
+	/*! ES is an mpeg-4 flexmux stream*/
 	GF_M2TS_ES_IS_FMC = 1<<2,
-	/*ES is an mpeg-4 SL-packetized stream*/
+	/*! ES is an mpeg-4 SL-packetized stream*/
 	GF_M2TS_ES_IS_SL = 1<<3,
-	/*ES is an mpeg-4 Object Descriptor SL-packetized stream*/
+	/*! ES is an mpeg-4 Object Descriptor SL-packetized stream*/
 	GF_M2TS_ES_IS_MPEG4_OD = 1<<4,
-	/*ES is a DVB MPE stream*/
+	/*! ES is a DVB MPE stream*/
 	GF_M2TS_ES_IS_MPE = 1<<5,
-	/*stream is used to send PCR to upper layer*/
+	/*! stream is used to send PCR to upper layer*/
 	GF_M2TS_INHERIT_PCR = 1<<6,
-	/*siugnals the stream is used to send the PCR, but is not the original PID carrying it*/
+	/*! signals the stream is used to send the PCR, but is not the original PID carrying it*/
 	GF_M2TS_FAKE_PCR = 1<<7,
+	/*! signals the stream type is a gpac codec id*/
+	GF_M2TS_GPAC_CODEC_ID = 1<<8,
+	/*! signals the stream type is a gpac codec id*/
+	GF_M2TS_ES_IS_PMT = 1<<9,
 
-	/*all flags above this mask are used by importers & co*/
+	/*! all flags above this mask are used by demultiplexer users*/
 	GF_M2TS_ES_STATIC_FLAGS_MASK = 0x0000FFFF,
 
-	/*always send sections regardless of their version_number*/
+	/*! always send sections regardless of their version_number*/
 	GF_M2TS_ES_SEND_REPEATED_SECTIONS = 1<<16,
-	/*Flag used by importers*/
-	GF_M2TS_ES_FIRST_DTS = 1<<17,
-
-	/*flag used to signal next discontinuity on stream should be ignored*/
-	GF_M2TS_ES_IGNORE_NEXT_DISCONTINUITY = 1<<18,
-
-	/*Flag used by importers/readers to mark streams that have been seen already in PMT process (update/found)*/
-	GF_M2TS_ES_ALREADY_DECLARED = 1<<19
+	/*! 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
 };
 
-/*Abstract Section/PES stream object, only used for type casting*/
+/*! macro for abstract Section/PES stream object, only used for type casting*/
 #define ABSTRACT_ES		\
 			GF_M2TS_Program *program; \
 			u32 flags; \
@@ -642,29 +701,40 @@
 			u64 first_dts; \
 			u32 service_id;
 
+/*! abstract Section/PES stream object*/
 struct tag_m2ts_es
 {
 	ABSTRACT_ES
 };
 
 
+/*! MPEG-2 TS muxer PES header*/
 typedef struct
 {
+	/*! stream ID*/
 	u8 id;
+	/*! packet len, 0 if unknown*/
 	u16 pck_len;
+	/*! data alignment flag*/
 	u8 data_alignment;
-	u64 PTS, DTS;
+	/*! packet PTS in 90khz*/
+	u64 PTS;
+	/*! packet DTS in 90khz*/
+	u64 DTS;
+	/*! size of PES header*/
 	u8 hdr_data_len;
 } GF_M2TS_PESHeader;
 
+/*! Section elementary stream*/
 struct tag_m2ts_section_es
 {
+	/*! derive from base M2TS stream*/
 	ABSTRACT_ES
+	/*! section reassembler*/
 	GF_M2TS_SectionFilter *sec;
 };
 
-
-/*******************************************************************************/
+/*! MPEG-2 TS muxer DVB subtitling descriptor*/
 typedef struct tag_m2ts_dvb_sub
 {
 	char language[3];
@@ -673,6 +743,7 @@
 	u16 ancillary_page_id;
 } GF_M2TS_DVB_Subtitling_Descriptor;
 
+/*! MPEG-2 TS muxer DVB teletext descriptor*/
 typedef struct tag_m2ts_dvb_teletext
 {
 	char language[3];
@@ -681,6 +752,7 @@
 	u8 page_number;
 } GF_M2TS_DVB_Teletext_Descriptor;
 
+/*! MPEG-2 TS muxer metadata descriptor*/
 typedef struct tag_m2ts_metadata_descriptor {
 	u16 application_format;
 	u32 application_format_identifier;
@@ -692,82 +764,96 @@
 	u8 service_id_record_length;
 	char *service_id_record;
 	u8 decoder_config_length;
-	char *decoder_config;
+	u8 *decoder_config;
 	u8 decoder_config_id_length;
-	char *decoder_config_id;
+	u8 *decoder_config_id;
 	u8 decoder_config_service_id;
 } GF_M2TS_MetadataDescriptor;
 
-/*MPEG-2 TS ES object*/
+//! @cond Doxygen_Suppress
+
+/*! MPEG-2 TS ES object*/
 typedef struct tag_m2ts_pes
 {
+	/*! derive from base M2TS stream*/
 	ABSTRACT_ES
-	/*continuity counter check*/
+	/*! continuity counter check*/
 	s16 cc;
+	/*! language tag*/
 	u32 lang;
-
-	/*object info*/
-	u32 vid_w, vid_h, vid_par, aud_sr, aud_nb_ch, aud_aac_obj_type, aud_aac_sr_idx;
-
+	/*! PID of stream this stream depends on*/
 	u32 depends_on_pid;
 
-	/*user private*/
-
-
-	/*mpegts lib private - do not touch :)*/
-	/*PES re-assembler*/
-	unsigned char *pck_data;
-	/*amount of bytes allocated for data */
+	/*mpegts lib private - do not touch*/
+	/*! PES re-assembler data*/
+	u8 *pck_data;
+	/*! amount of bytes allocated for data */
 	u32 pck_alloc_len;
-	/*amount of bytes received in the current PES packet (NOT INCLUDING ANY PENDING BYTES)*/
+	/*! amount of bytes received in the current PES packet (NOT INCLUDING ANY PENDING BYTES)*/
 	u32 pck_data_len;
-	/*size of the PES packet being received, as indicated in pes header length field - can be 0 if unknown*/
+	/*! size of the PES packet being received, as indicated in pes header length field - can be 0 if unknown*/
 	u32 pes_len;
+	/*! RAP flag*/
 	Bool rap;
-	u64 PTS, DTS;
-	u32 pes_end_packet_number;
-	/*bytes not consumed from previous PES - shall be less than 9*/
-	unsigned char *prev_data;
-	/*number of bytes not consumed from previous PES - shall be less than 9*/
+	/*! PES PTS in 90khz*/
+	u64 PTS;
+	/*! PES DTS in 90khz*/
+	u64 DTS;
+	/*! bytes not consumed from previous PES - shall be less than 9*/
+	u8 *prev_data;
+	/*! number of bytes not consumed from previous PES - shall be less than 9*/
 	u32 prev_data_len;
-
+	/*! number of TS packet containing the start of the current PES*/
 	u32 pes_start_packet_number;
-	/* PCR info related to the PES start */
-	/* Last PCR value received for this program and associated packet number */
+	/*! number of TS packet containing the end of the current PES*/
+	u32 pes_end_packet_number;
+	/*! Last PCR value received for this program*/
 	u64 last_pcr_value;
+	/*! packet number of last PCR*/
 	u32 last_pcr_value_pck_number;
-	/* PCR value before the last received one for this program and associated packet number
-	used to compute PCR interpolation value*/
+	/*! PCR value before the last received one for this program (used to compute PCR interpolation value)*/
 	u64 before_last_pcr_value;
+	/*! packet number of before last PCR*/
 	u32 before_last_pcr_value_pck_number;
 
 
-	/*PES reframer - 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*/
-	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *hdr);
+	/*! PES reframer callback. If NULL, pes processing is skiped
 
-	Bool single_nal_mode;
-	/*used by several reframers to store their parsing state*/
-	u32 frame_state;
-	/*LATM stuff - should be moved out of mpegts*/
-	unsigned char *buf, *reassemble_buf;
-	u32 buf_len;
-	u32 reassemble_len, reassemble_alloc;
-	u64 prev_PTS;
+	returns the number of bytes NOT consummed 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*/
 	GF_M2TS_DVB_Subtitling_Descriptor sub;
+	/*! Metadata descriptor (for ID3)*/
 	GF_M2TS_MetadataDescriptor *metadata_descriptor;
 
-	//pointer to last received temi
-	char *temi_tc_desc;
-	u32 temi_tc_desc_len, temi_tc_desc_alloc_size;
+	/*! last received TEMI payload*/
+	u8 *temi_tc_desc;
+	/*! last received TEMI payload size*/
+	u32 temi_tc_desc_len;
+	/*! allocated size of TEMI reception buffer*/
+	u32 temi_tc_desc_alloc_size;
 
-	//last decoded temi (may be one ahead of time as the last received TEMI)
+	/*! last decoded temi (may be one ahead of time as the last received TEMI)*/
 	GF_M2TS_TemiTimecodeDescriptor temi_tc;
+	/*! flag set to indicate a TEMI descriptor should be flushed with next packet*/
 	Bool temi_pending;
 } GF_M2TS_PES;
 
-/*SDT information object*/
+/*! reserved streamID for PES headers*/
+enum
+{
+	GF_M2_STREAMID_PROGRAM_STREAM_MAP = 0xBC,
+	GF_M2_STREAMID_PADDING = 0xBE,
+	GF_M2_STREAMID_PRIVATE_2 = 0xBF,
+	GF_M2_STREAMID_ECM = 0xF0,
+	GF_M2_STREAMID_EMM = 0xF1,
+	GF_M2_STREAMID_PROGRAM_STREAM_DIRECTORY = 0xFF,
+	GF_M2_STREAMID_DSMCC = 0xF2,
+	GF_M2_STREAMID_H222_TYPE_E = 0xF8
+};
+
+/*! SDT (service description table) information*/
 typedef struct
 {
 	u16 original_network_id;
@@ -781,6 +867,7 @@
 	char *provider, *service;
 } GF_M2TS_SDT;
 
+/*! NIT (network information table) information*/
 typedef struct
 {
 	u16 network_id;
@@ -792,6 +879,7 @@
 	u32 logical_channel_number;
 } GF_M2TS_NIT;
 
+/*! TDT/TOT (Time and Date table) information*/
 typedef struct
 {
 	u16 year;
@@ -802,41 +890,44 @@
 	u8 second;
 } GF_M2TS_TDT_TOT;
 
-#define GF_M2TS_BASE_DESCRIPTOR u32 tag;
-
+/*! DVB Content Description information*/
 typedef struct {
 	u8 content_nibble_level_1, content_nibble_level_2, user_nibble;
 } GF_M2TS_DVB_Content_Descriptor;
 
+/*! DVB Rating information*/
 typedef struct {
 	char country_code[3];
 	u8 value;
 } GF_M2TS_DVB_Rating_Descriptor;
 
+/*! DVB Short Event information*/
 typedef struct {
-	unsigned char lang[3];
-	unsigned char *event_name, *event_text;
+	u8 lang[3];
+	char *event_name, *event_text;
 } GF_M2TS_DVB_Short_Event_Descriptor;
 
+/*! DVB Extended Event entry*/
 typedef struct {
-	unsigned char *item;
-	unsigned char *description;
+	char *item;
+	char *description;
 } GF_M2TS_DVB_Extended_Event_Item;
 
+/*! DVB Extended Event information*/
 typedef struct {
-	unsigned char lang[3];
+	u8 lang[3];
 	u32 last;
 	GF_List *items;
-	unsigned char *text;
+	char *text;
 } GF_M2TS_DVB_Extended_Event_Descriptor;
 
-/*EIT information objects*/
+/*! DVB EIT Date and Time information*/
 typedef struct
 {
 	time_t unix_time;
 
 	/* local time offset descriptor data (unused ...) */
-	char country_code[3];
+	u8 country_code[3];
 	u8 country_region_id;
 	s32 local_time_offset_seconds;
 	time_t unix_next_toc;
@@ -844,14 +935,16 @@
 
 } GF_M2TS_DateTime_Event;
 
+/*! DVB EIT component information*/
 typedef struct {
 	u8 stream_content;
 	u8 component_type;
 	u8 component_tag;
-	char language_code[3];
-	unsigned char *text;
+	u8 language_code[3];
+	char *text;
 } GF_M2TS_Component;
 
+/*! DVB EIT Event information*/
 typedef struct
 {
 	u16 event_id;
@@ -868,6 +961,7 @@
 	GF_List *ratings;
 } GF_M2TS_EIT_Event;
 
+/*! DVB EIT information*/
 typedef struct
 {
 	u32 original_network_id;
@@ -877,10 +971,10 @@
 	u8 table_id;
 } GF_M2TS_EIT;
 
-/*MPEG-2 TS packet*/
+/*! MPEG-2 TS packet*/
 typedef struct
 {
-	char *data;
+	u8 *data;
 	u32 data_len;
 	u32 flags;
 	u64 PTS, DTS;
@@ -888,171 +982,226 @@
 	GF_M2TS_PES *stream;
 } GF_M2TS_PES_PCK;
 
-/*MPEG-4 SL packet from MPEG-2 TS*/
+/*! MPEG-4 SL packet from MPEG-2 TS*/
 typedef struct
 {
-	char *data;
+	u8 *data;
 	u32 data_len;
 	u8 version_number;
 	/*parent stream */
 	GF_M2TS_ES *stream;
 } GF_M2TS_SL_PCK;
 
-/*MPEG-2 TS demuxer*/
-struct tag_m2ts_demux
+/*! MPEG-4 SL packet from MPEG-2 TS*/
+typedef struct
 {
-	/* From M2TSIn */
-	GF_List *requested_progs;
-	GF_List *requested_pids;
-
-	/*demuxer thread*/
-	GF_Thread *th;
-	u32 run_state;
-
-	Bool force_file_refresh;
-	/*net playing*/
-	GF_Socket *sock;
-	Bool sock_is_delegate;
-
-#ifdef GPAC_HAS_LINUX_DVB
-	/*dvb playing*/
-	GF_Tuner *tuner;
-#endif
-	/*local file playing*/
-	FILE *file;
-	char filename[GF_MAX_PATH];
-	//start/end in ms
-	u32 start_range, end_range;
-	u64 file_size;
-	u64 pos_in_stream;
-	Double duration;
-	u32 nb_pck;
-	Bool loop_demux;
-	const char *ts_data_chunk;
-	u32 ts_data_chunk_size;
-
-	const char *record_to;
-	/* "Network" =  "MobileIP", "DefaultMCastInterface" */
-	Bool MobileIPEnabled;
-	const char *network_type;
-	//for sockets, we need to reopen them after resume/restart....
-	char *socket_url;
-	u32 udp_buffer_size;
-	/* Set it to 1 if the TS is meant to be played during the demux */
-	Bool demux_and_play;
-	/* End of M2TSIn */
+	/*packet start (first byte is TS sync marker)*/
+	u8 *data;
+	/*packet PID*/
+	u32 pid;
+	/*parent stream if any/already declared*/
+	GF_M2TS_ES *stream;
+} GF_M2TS_TSPCK;
 
+typedef struct
+{
+	u8 version_number;
+	u8 table_id;
+	u16 ex_table_id;
+} GF_M2TS_SectionInfo;
+
+/*! MPEG-2 TS demuxer*/
+struct tag_m2ts_demux
+{
+	/*! PIDs*/
 	GF_M2TS_ES *ess[GF_M2TS_MAX_STREAMS];
+	/*! programs*/
 	GF_List *programs;
+	/*! number of PMT received*/
 	u32 nb_prog_pmt_received;
+	/*! set to GF_TRUE if all PMT received*/
 	Bool all_prog_pmt_received;
+	/*! set to GF_TRUE if all programs are setup*/
 	Bool all_prog_processed;
-	/*keep it seperate for now - TODO check if we're sure of the order*/
+	/*! received SDTs - keep it separate for now*/
 	GF_List *SDTs;
-	GF_M2TS_TDT_TOT *TDT_time; /*UTC time from both TDT and TOT (we currently ignore local offset)*/
+ 	/*! UTC time from both TDT and TOT (we currently ignore local offset)*/
+	GF_M2TS_TDT_TOT *TDT_time;
 
-	/*user callback - MUST NOT BE NULL*/
+	/*! user callback - MUST NOT BE NULL*/
 	void (*on_event)(struct tag_m2ts_demux *ts, u32 evt_type, void *par);
-	/*private user data*/
+	/*! private user data*/
 	void *user;
 
-	/*private resync buffer*/
-	char *buffer;
-	u32 buffer_size, alloc_size;
-	/*default transport PID filters*/
-	GF_M2TS_SectionFilter *pat, *cat, *nit, *sdt, *eit, *tdt_tot;
-
+	/*! private resync buffer*/
+	u8 *buffer;
+	/*! private resync size*/
+	u32 buffer_size;
+	/*! private alloc size*/
+	u32 alloc_size;
+	/*! PAT filter*/
+	GF_M2TS_SectionFilter *pat;
+	/*! CAT filter*/
+	GF_M2TS_SectionFilter *cat;
+	/*! NIT filter*/
+	GF_M2TS_SectionFilter *nit;
+	/*! SDT filter*/
+	GF_M2TS_SectionFilter *sdt;
+	/*! EIT filter*/
+	GF_M2TS_SectionFilter *eit;
+	/*! TDT/TOT filter*/
+	GF_M2TS_SectionFilter *tdt_tot;
+	/*! MPEG-4 over 2 is present*/
 	Bool has_4on2;
-	/* analyser */
+	/*! analyser output */
 	FILE *pes_out;
 
-
+	/*! when set, only pmt and PAT are parsed*/
+	Bool seek_mode;
+	/*! 192 packet mode with prefix*/
 	Bool prefix_present;
-
+	/*! MPE direct flag*/
 	Bool direct_mpe;
-
+	/*! DVB-H demu enabled*/
 	Bool dvb_h_demux;
+	/*! sends packet for at PES header start*/
 	Bool notify_pes_timing;
 
-	/*user callback - MUST NOT BE NULL*/
+	/*! user callback - MUST NOT BE NULL*/
 	void (*on_mpe_event)(struct tag_m2ts_demux *ts, u32 evt_type, void *par);
-	/* Structure to hold all the INT tables if the TS contains IP streams */
+	/*! structure to hold all the INT tables if the TS contains IP streams */
 	struct __gf_dvb_mpe_ip_platform *ip_platform;
-
+	/*! current TS packet number*/
 	u32 pck_number;
 
-	/*remote file handling - created and destroyed by user*/
+	/*! remote file handling - created and destroyed by user*/
 	struct __gf_download_session *dnload;
-
+	/*! channel config path*/
 	const char *dvb_channels_conf_path;
 
-	/*AIT*/
+	/*! AIT*/
 	GF_List* ChannelAppList;
 
-	/*Carousel*/
+	/*! carousel enabled*/
 	Bool process_dmscc;
+	/*! carousel root dir*/
 	char* dsmcc_root_dir;
+	/*! DSM-CC objects*/
 	GF_List* dsmcc_controler;
-
-	Bool abort_parsing;
+	/*! triggers all table reset*/
 	Bool table_reset;
 
-	//duration estimation
-	u64 first_pcr_found;
-	u16 pcr_pid;
-	u64 nb_pck_at_pcr;
-
-	Bool paused;
+	/*! raw mode only parses PAT and PMT, and forward each packet as a GF_M2TS_EVT_PCK event, except PAT packets which must be recreated
+	if set, on_event shall be non-null
+	*/
+	Bool split_mode;
 };
 
+//! @endcond
+
+/*! creates a new MPEG-2 TS demultiplexer
+\return a new demultiplexer*/
 GF_M2TS_Demuxer *gf_m2ts_demux_new();
-void gf_m2ts_demux_del(GF_M2TS_Demuxer *ts);
-void gf_m2ts_reset_parsers(GF_M2TS_Demuxer *ts);
-void gf_m2ts_reset_parsers_for_program(GF_M2TS_Demuxer *ts, GF_M2TS_Program *prog);
-GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es);
-GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode);
-u32 gf_m2ts_pes_get_framing_mode(GF_M2TS_PES *pes);
-void gf_m2ts_es_del(GF_M2TS_ES *es, GF_M2TS_Demuxer *ts);
-GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, char *data, u32 data_size);
-u32 gf_dvb_get_freq_from_url(const char *channels_config_path, const char *url);
-void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts);
+/*! destroys a new MPEG-2 TS demultiplexer
+\param demux the target MPEG-2 TS demultiplexer
+*/
+void gf_m2ts_demux_del(GF_M2TS_Demuxer *demux);
 
-void gf_m2ts_pause_demux(GF_M2TS_Demuxer *ts, Bool do_pause);
+/*! resets all parsers (PES, sections) of the demultiplexer
+\param demux the target MPEG-2 TS demultiplexer
+*/
+void gf_m2ts_reset_parsers(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
+*/
+void gf_m2ts_reset_parsers_for_program(GF_M2TS_Demuxer *demux, GF_M2TS_Program *program);
+/*! sets PES framing mode of a stream
+\param pes the target MPEG-2 TS stream
+\param mode the desired PES framing mode
+\return error if any
+*/
+GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, GF_M2TSPesFraming mode);
+
+/*! processes input buffer. This will resync the input data to a TS packet start if needed
+\param demux the target MPEG-2 TS demultiplexer
+\param data the data to process
+\param data_size size of the date to process
+\return error if any
+*/
+GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *demux, u8 *data, u32 data_size);
+
+/*! initializes DSM-CC object carousel reception
+\param demux the target MPEG-2 TS demultiplexer
+*/
+void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *demux);
 
-GF_M2TS_SDT *gf_m2ts_get_sdt_info(GF_M2TS_Demuxer *ts, u32 program_id);
+/*! gets SDT info for a given program
+\param demux the target MPEG-2 TS demultiplexer
+\param program_id ID of the target MPEG-2 TS program
+\return an SDT description, or NULL if not found
+*/
+GF_M2TS_SDT *gf_m2ts_get_sdt_info(GF_M2TS_Demuxer *demux, u32 program_id);
 
-Bool gf_m2ts_crc32_check(char *data, u32 len);
+/*! 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
+*/
+void gf_m2ts_flush_pes(GF_M2TS_Demuxer *demux, GF_M2TS_PES *pes);
 
-/*aborts parsing of the current data (typically needed when parsing done by a different thread). If force_reset_pes is set, all pending pes data is discarded*/
-void gf_m2ts_abort_parsing(GF_M2TS_Demuxer *ts, Bool force_reset_pes);
+/*! 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
+*/
+void gf_m2ts_flush_all(GF_M2TS_Demuxer *ts);
 
 
+/*! MPEG-2 TS packet header*/
 typedef struct
 {
+	/*! sync byte 0x47*/
 	u8 sync;
+	/*! error indicator*/
 	u8 error;
+	/*! payload start flag (start of PES or section)*/
 	u8 payload_start;
+	/*! priority flag*/
 	u8 priority;
+	/*! PID of packet */
 	u16 pid;
+	/*! scrambling flag ( 0 not scrambled, 1/2 scrambled, 3 reserved)*/
 	u8 scrambling_ctrl;
+	/*! adaptation field type*/
 	u8 adaptation_field;
+	/*! continuity counter*/
 	u8 continuity_counter;
 } GF_M2TS_Header;
 
+/*! MPEG-2 TS packet adaptation field*/
 typedef struct
 {
+	/*! discontunity indicator (for timeline splicing)*/
 	u32 discontinuity_indicator;
+	/*! random access indicator*/
 	u32 random_access_indicator;
+	/*! priority indicator*/
 	u32 priority_indicator;
-
+	/*! PCR present flag*/
 	u32 PCR_flag;
-	u64 PCR_base, PCR_ext;
-
+	/*! PCR base value*/
+	u64 PCR_base;
+	/*! PCR extended value*/
+	u64 PCR_ext;
+	/*! original PCR flag*/
 	u32 OPCR_flag;
-	u64 OPCR_base, OPCR_ext;
-
+	/*! OPCR base value*/
+	u64 OPCR_base;
+	/*! OPCR extended value*/
+	u64 OPCR_ext;
+	/*! splicing point flag*/
 	u32 splicing_point_flag;
+	/*! transport private data flag*/
 	u32 transport_private_data_flag;
+	/*! AF extension flag*/
 	u32 adaptation_field_extension_flag;
 	/*
 		u32 splice_countdown;
@@ -1070,361 +1219,701 @@
 } GF_M2TS_AdaptationField;
 
 
+#endif /*GPAC_DISABLE_MPEG2TS*/
 
-void gf_m2ts_print_info(GF_M2TS_Demuxer *ts);
 
-/*demuxes the TS file using a complete number of 1888 blocks - refresh_type is one of the following:
-0 - this is a new file
-1 - this is a refresh of a previous file
-2 - this is the last refresh of a previous file
+#ifndef GPAC_DISABLE_MPEG2TS_MUX
+
+/*!
+\addtogroup esi_grp ES Interface
+\ingroup media_grp
+\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)
+
+@{
 */
-GF_Err gf_m2ts_demux_file(GF_M2TS_Demuxer *ts, const char *fileName, u64 start_byterange, u64 end_byterange, u32 refresh_type, Bool signal_end_of_stream);
 
-#endif /*GPAC_DISABLE_MPEG2TS*/
+/*! ESI input control commands*/
+enum
+{
+	/*! forces a data flush from interface to dest (caller) - used for non-threaded interfaces
+		corresponding parameter: unused
+	*/
+	GF_ESI_INPUT_DATA_FLUSH,
+	/*! pulls a COMPLETE AU from the stream
+		corresponding parameter: pointer to a GF_ESIPacket to fill. The input data_len in the packet is used to indicate any padding in bytes
+	*/
+	GF_ESI_INPUT_DATA_PULL,
+	/*! releases the currently pulled AU from the stream - AU cannot be pulled after that, unless seek happens
+		corresponding parameter: unused
+	*/
+	GF_ESI_INPUT_DATA_RELEASE,
 
+	/*! destroys any allocated resource by the stream interface*/
+	GF_ESI_INPUT_DESTROY,
+};
 
-#ifndef GPAC_DISABLE_MPEG2TS_MUX
+/*! ESI output control commands*/
+enum
+{
+	/*! forces a data flush from interface to dest (caller) - used for non-threaded interfaces
+		corresponding parameter: GF_ESIPacket
+	*/
+	GF_ESI_OUTPUT_DATA_DISPATCH
+};
 
-#include <gpac/esi.h>
+/*! data packet flags*/
+enum
+{
+	/*! packet is an access unit start*/
+	GF_ESI_DATA_AU_START	=	1,
+	/*! packet is an access unit end*/
+	GF_ESI_DATA_AU_END		=	1<<1,
+	/*! packet has valid CTS*/
+	GF_ESI_DATA_HAS_CTS		=	1<<2,
+	/*! packet has valid DTS*/
+	GF_ESI_DATA_HAS_DTS		=	1<<3,
+	/*! packet contains a carousel repeated AU*/
+	GF_ESI_DATA_REPEAT		=	1<<4,
+};
+
+/*! stream interface for MPEG-2 TS muxer*/
+typedef struct __data_packet_ifce
+{
+	/*! packet flags*/
+	u16 flags;
+	/*! SAP type*/
+	u8 sap_type;
+	/*! payload*/
+	u8 *data;
+	/*! payload size*/
+	u32 data_len;
+	/*! DTS expressed in media timescale*/
+	u64 dts;
+	/*! CTS/PTS expressed in media timescale*/
+	u64 cts;
+	/*! duration expressed in media timescale*/
+	u32 duration;
+	/*! packet sequence number*/
+	u32 pck_sn;
+	/*! MPEG-4 Access Unit sequence number (use for carousel of BIFS/OD AU)*/
+	u32 au_sn;
+	/*! ISM BSO for for packets using ISMACrypt/OMA/3GPP based crypto*/
+	u32 isma_bso;
+	/*! serialized list of AF descriptors*/
+	u8 *mpeg2_af_descriptors;
+	/*! size of serialized list of AF descriptors*/
+	u32 mpeg2_af_descriptors_size;
+} GF_ESIPacket;
+
+/*! video information for stream interface*/
+struct __esi_video_info
+{
+	/*! video width in pixels*/
+	u32 width;
+	/*! video height in pixels*/
+	u32 height;
+	/*! pixel aspect ratio as (num<<16)|den*/
+	u32 par;
+	/*! video framerate*/
+	Double FPS;
+};
+/*! audio information for stream interface*/
+struct __esi_audio_info
+{
+	/*! sample rate*/
+	u32 sample_rate;
+	/*! number of channels*/
+	u32 nb_channels;
+};
+
+/*! ES interface capabilities*/
+enum
+{
+	/*! data can be pulled from this stream*/
+	GF_ESI_AU_PULL_CAP	=	1,
+	/*! no more data to expect from this stream*/
+	GF_ESI_STREAM_IS_OVER	=	1<<2,
+	/*! stream is not signaled through MPEG-4 Systems (OD stream) */
+	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,
+};
+
+/*! elementary stream information*/
+typedef struct __elementary_stream_ifce
+{
+	/*! misc caps of the stream*/
+	u32 caps;
+	/*! matches PID for MPEG2, ES_ID for MPEG-4*/
+	u32 stream_id;
+	/*! MPEG-4 ST*/
+	u8 stream_type;
+	/*! codec ID*/
+	u32 codecid;
+	/*! packed 3-char language code (4CC with last byte ' ')*/
+	u32 lang;
+	/*! media timescale*/
+	u32 timescale;
+	/*! duration in ms - 0 if unknown*/
+	Double duration;
+	/*! average bit rate in bit/sec - 0 if unknown*/
+	u32 bit_rate;
+	/*! repeat rate in ms for carrouseling - 0 if no repeat*/
+	u32 repeat_rate;
+	/*! decoder configuration*/
+	u8 *decoder_config;
+	/*! decoder configuration size*/
+	u32 decoder_config_size;
+
+	/*! MPEG-4 SL Config if any*/
+	GF_SLConfig *sl_config;
+
+	/*! input ES control from caller*/
+	GF_Err (*input_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
+	/*! input user data of interface - usually set by interface owner*/
+	void *input_udta;
+
+	/*! output ES control of destination*/
+	GF_Err (*output_ctrl)(struct __elementary_stream_ifce *_self, u32 ctrl_type, void *param);
+	/*! output user data of interface - usually set during interface setup*/
+	void *output_udta;
+	/*! stream dependency ID*/
+	u32 depends_on_stream;
+} GF_ESInterface;
+
+/*! @} */
 
 /*
 	MPEG-2 TS Multiplexer
 */
 
+/*! adaptation field type*/
 enum {
+	/*! reserved*/
 	GF_M2TS_ADAPTATION_RESERVED	= 0,
+	/*! no adaptation (payload only)*/
 	GF_M2TS_ADAPTATION_NONE		= 1,
+	/*! adaptation only (no payload)*/
 	GF_M2TS_ADAPTATION_ONLY		= 2,
+	/*! adaptation and payload*/
 	GF_M2TS_ADAPTATION_AND_PAYLOAD 	= 3,
 };
 
-
-
+/*! MPEG-2 TS muxer program*/
 typedef struct __m2ts_mux_program GF_M2TS_Mux_Program;
+/*! MPEG-2 TS muxer*/
 typedef struct __m2ts_mux GF_M2TS_Mux;
 
+/*! MPEG-2 TS muxer section*/
 typedef struct __m2ts_section {
+	/*! pointer to next section*/
 	struct __m2ts_section *next;
+	/*! section data*/
 	u8 *data;
+	/*! section size*/
 	u32 length;
 } GF_M2TS_Mux_Section;
 
+/*! MPEG-2 TS muxer table*/
 typedef struct __m2ts_table {
+	/*! pointer to next table*/
 	struct __m2ts_table *next;
+	/*! table ID (we don't handle extended table ID as part of the section muxer*/
 	u8 table_id;
+	/*! version number of the table*/
 	u8 version_number;
+	/*! list of sections for the table (one or more)*/
 	struct __m2ts_section *section;
 } GF_M2TS_Mux_Table;
 
+/*! MPEG-2 TS muxer time information*/
 typedef struct
 {
+	/*! seconds*/
 	u32 sec;
+	/*! nanoseconds*/
 	u32 nanosec;
 } GF_M2TS_Time;
 
 
+/*! MPEG-2 TS muxer packet*/
 typedef struct __m2ts_mux_pck
 {
+	/*! pointer to next packet (we queue packets if needed)*/
 	struct __m2ts_mux_pck *next;
-	char *data;
+	/*! payload*/
+	u8 *data;
+	/*! payload size in bytes*/
 	u32 data_len;
-	u32 flags;
-	u64 cts, dts;
+	/*! flags*/
+	u16 flags;
+	/*! sap type*/
+	u8 sap_type;
+	/*! CTS in 90 khz*/
+	u64 cts;
+	/*! DTS in 90 khz*/
+	u64 dts;
+	/*! duration in 90 khz*/
 	u32 duration;
-
-	char *mpeg2_af_descriptors;
+	/*! serialized list of adaptation field descriptors if any*/
+	u8 *mpeg2_af_descriptors;
+	/*! size of serialized list of adaptation field descriptors*/
 	u32 mpeg2_af_descriptors_size;
 } GF_M2TS_Packet;
 
-
+/*! MPEG-2 TS muxer stream*/
 typedef struct __m2ts_mux_stream {
+	/*! next stream*/
 	struct __m2ts_mux_stream *next;
-
+	/*! pid*/
 	u32 pid;
+	/*! CC of the stream*/
 	u8 continuity_counter;
+	/*! parent program*/
 	struct __m2ts_mux_program *program;
-
-	/*average stream bit-rate in bit/sec*/
+	/*! average stream bit-rate in bit/sec*/
 	u32 bit_rate;
-
-	/*multiplexer time - NOT THE PCR*/
+	/*! multiplexer time - NOT THE PCR*/
 	GF_M2TS_Time time;
-
+	/*! next time for packet*/
 	GF_M2TS_Time next_time;
+	/*! allow PCR only packets*/
 	Bool pcr_only_mode;
-
-	/*table tools*/
+	/*! 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/...)*/
+	/*! total table sizes for bitrate estimation (PMT/PAT/...)*/
 	u32 total_table_size;
-	/* used for on-the-fly packetization of sections */
+	/*! current table - used for on-the-fly packetization of sections */
 	GF_M2TS_Mux_Table *current_table;
+	/*! active section*/
 	GF_M2TS_Mux_Section *current_section;
+	/*! current section offset*/
 	u32 current_section_offset;
+	/*! carousel rate in ms*/
 	u32 refresh_rate_ms;
+	/*! table needs updating*/
 	Bool table_needs_update;
+	/*! table needs send*/
 	Bool table_needs_send;
+	/*! force one AU per PES*/
 	Bool force_single_au;
+	/*! force initial discontinuity*/
 	Bool set_initial_disc;
+	/*! force registration descriptor*/
+	Bool force_reg_desc;
 
-	/*minimal amount of bytes we are allowed to copy frome next AU in the current PES. If no more than this
+	/*! minimal amount of bytes we are allowed to copy frome next AU in the current PES. If no more than this
 	is available in PES, don't copy from next*/
 	u32 min_bytes_copy_from_next;
-	/*process PES or table update/framing
+	/*! process PES or table update/framing
 	returns the priority of the stream,  0 meaning not scheduled, 1->N highest priority sent first*/
 	u32 (*process)(struct __m2ts_mux *muxer, struct __m2ts_mux_stream *stream);
 
-	/*PES tools*/
-	void *pes_packetizer;
-	u32 mpeg2_stream_type;
+	/*! stream type*/
+	GF_M2TSStreamType mpeg2_stream_type;
+	/*! stream ID*/
 	u32 mpeg2_stream_id;
+	/*! priority*/
 	u32 scheduling_priority;
 
-	GF_ESIPacket curr_pck; /*current packet being processed - does not belong to the packet fifo*/
+ 	/*! current packet being processed - does not belong to the packet fifo*/
+	GF_ESIPacket curr_pck;
+	/*! offset in packet*/
 	u32 pck_offset;
-	u32 next_payload_size, copy_from_next_packets, next_next_payload_size;
-	u32 pes_data_len, pes_data_remain;
+	/*! size of next payload, 0 if unknown*/
+	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*/
+	u32 next_next_payload_size;
+	/*! size of packetized packet*/
+	u32 pes_data_len;
+	/*! remaining bytes to send as TS packets*/
+	u32 pes_data_remain;
+	/*! if set forces a new PES packet at next packet*/
 	Bool force_new;
+	/*! flag set to indicate packet data shall be freed (rewrite of source packet)*/
 	Bool discard_data;
-
-	u32 next_pck_flags;
-	u64 next_pck_cts, next_pck_dts;
-
+	/*! flags of next packet*/
+	u16 next_pck_flags;
+	/*! SAP type of next packet*/
+	u8 next_pck_sap;
+	/*! CTS of next packet*/
+	u64 next_pck_cts;
+	/*! DTS of next packet*/
+	u64 next_pck_dts;
+	/*! overhead of reframing in bytes (ex, ADTS header or LATM rewrite)*/
 	u32 reframe_overhead;
-
-	Bool start_pes_at_rap, prevent_two_au_start_in_pes;
-
+	/*! if set, forces a PES start at each RAP*/
+	Bool start_pes_at_rap;
+	/*! if set, do not have more than one AU start in a PES packet*/
+	Bool prevent_two_au_start_in_pes;
+	/*! ES interface of stream*/
 	struct __elementary_stream_ifce *ifce;
+	/*! timescale scale factor (90khz / es_ifce.timeScale)*/
 	GF_Fraction ts_scale;
 
-	/*packet fifo*/
-	GF_M2TS_Packet *pck_first, *pck_last;
-	/*packet reassembler (PES packets are most of the time full frames)*/
+	/*! packet fifo head*/
+	GF_M2TS_Packet *pck_first;
+	/*! packet fifo tail*/
+	GF_M2TS_Packet *pck_last;
+	/*! packet reassembler (PES packets are most of the time full frames)*/
 	GF_M2TS_Packet *pck_reassembler;
+	/*! mutex if enabled*/
 	GF_Mutex *mx;
-	/*avg bitrate compute*/
+	/*! avg bitrate computed*/
 	u64 last_br_time;
-	u32 bytes_since_last_time, pes_since_last_time;
+	/*! number of bytes sent since last bitrate estimation*/
+	u32 bytes_since_last_time;
+	/*! number of PES packets sent since last bitrate estimation*/
+	u32 pes_since_last_time;
+	/*! last DTS sent*/
 	u64 last_dts;
-	/*MPEG-4 over MPEG-2*/
+	/*! MPEG-4 over MPEG-2 sections table id (BIFS, OD, ...)*/
 	u8 table_id;
+	/*! MPEG-4 SyncLayer header of the packet*/
 	GF_SLHeader sl_header;
-
-	u32 last_aac_time;
-	/*list of GF_M2TSDescriptor to add to the MPEG-2 stream. By default set to NULL*/
+	/*! last time when the AAC config was sent for LATM*/
+	u32 latm_last_aac_time;
+	/*! list of GF_M2TSDescriptor to add to the MPEG-2 stream. By default set to NULL*/
 	GF_List *loop_descriptors;
+
+	/*! packet SAP type when segmenting the TS*/
+	u32 pck_sap_type;
+	/*! packet SAP time (=PTS) when segmenting the TS*/
+	u64 pck_sap_time;
 } GF_M2TS_Mux_Stream;
 
+/*! MPEG-4 systems signaling mode*/
 enum {
+	/*! no MPEG-4 signaling*/
 	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*/
 	GF_M2TS_MPEG4_SIGNALING_SCENE
 };
 
+/*! MPEG-2 TS base descriptor*/
 typedef struct __m2ts_base_descriptor
 {
+	/*! descriptor tag*/
 	u8 tag;
+	/*! descriptor size*/
 	u8 data_len;
-	char *data;
+	/*! descriptor payload*/
+	u8 *data;
 } GF_M2TSDescriptor;
 
+/*! MPEG-2 TS muxer program info */
 struct __m2ts_mux_program {
+	/*! next program*/
 	struct __m2ts_mux_program *next;
-
+	/*! parent muxer*/
 	struct __m2ts_mux *mux;
+	/*! program number*/
 	u16 number;
-	/*all streams but PMT*/
+	/*! all streams but PMT*/
 	GF_M2TS_Mux_Stream *streams;
-	/*PMT*/
+	/*! PMT stream*/
 	GF_M2TS_Mux_Stream *pmt;
-	/*pointer to PCR stream*/
+	/*! pointer to PCR stream*/
 	GF_M2TS_Mux_Stream *pcr;
-
-	/*TS time at pcr init*/
+	/*! TS time at pcr init*/
 	GF_M2TS_Time ts_time_at_pcr_init;
-	u64 pcr_init_time, num_pck_at_pcr_init;
+	/*! pcr init time (rand or fixed by user)*/
+	u64 pcr_init_time;
+	/*! number of TS packet at PCR init*/
+	u64 num_pck_at_pcr_init;
+	/*! last PCR value in 27 mhz*/
 	u64 last_pcr;
+	/*! last DTS value in 90 khz*/
 	u64 last_dts;
-	//high res clock at last PCR
+	/*! system clock in microseconds at last PCR*/
 	u64 sys_clock_at_last_pcr;
+	/*! number of packets at last PCR*/
 	u64 nb_pck_last_pcr;
+	/*! min initial DTS of all streams*/
 	u64 initial_ts;
+	/*! indicates that min initial DTS of all streams is set*/
 	Bool initial_ts_set;
+	/*! if set, injects a PCR offset*/
 	Bool pcr_init_time_set;
+	/*! PCR offset to inject*/
 	u32 pcr_offset;
+	/*! indicates the initial discontinuity flag should be set on first packet of all streams*/
 	Bool initial_disc_set;
-
+	/*! MPEG-4 IOD for 4on2*/
 	GF_Descriptor *iod;
-	/*list of GF_M2TSDescriptor to add to the program descriptor loop. By default set to NULL, if non null will be reset and destroyed upon cleanup*/
+	/*! list of GF_M2TSDescriptor to add to the program descriptor loop. By default set to NULL, if non null will be reset and destroyed upon cleanup*/
 	GF_List *loop_descriptors;
+	/*! MPEG-4 signaling type*/
 	u32 mpeg4_signaling;
+	/*! if set, use MPEG-4 signaling only for BIFS and OD streams*/
 	Bool mpeg4_signaling_for_scene_only;
-
-	char *name, *provider;
+	/*! program name (for SDT)*/
+	char *name;
+	/*! program provider (for SDT)*/
+	char *provider;
+	/*! maximum delay of all streams (in stream timescale)*/
+	s32 max_media_skip;
+	/*! CTS offset in 90khz*/
+	u32 cts_offset;
 };
 
-enum
-{
-	GF_SEG_BOUNDARY_NONE=0,
-	GF_SEG_BOUNDARY_START,
-	GF_SEG_BOUNDARY_FORCE_PAT,
-	GF_SEG_BOUNDARY_FORCE_PMT,
-	GF_SEG_BOUNDARY_FORCE_PCR,
-};
-
-/*AU packing per pes configuration*/
+/*! AU packing per pes configuration*/
 typedef enum
 {
-	/*only audio AUs are packed in a single PES, video and systems are not (recommended default)*/
-	GF_M2TS_PACK_AUDIO_ONLY,
-	/*never pack AUs in a single PES*/
+	/*! only audio AUs are packed in a single PES, video and systems are not (recommended default)*/
+	GF_M2TS_PACK_AUDIO_ONLY=0,
+	/*! never pack AUs in a single PES*/
 	GF_M2TS_PACK_NONE,
-	/*always try to pack AUs in a single PES*/
+	/*! always try to pack AUs in a single PES*/
 	GF_M2TS_PACK_ALL
 } GF_M2TS_PackMode;
 
+/*! MPEG-2 TS muxer*/
 struct __m2ts_mux {
+	/*! list of programs*/
 	GF_M2TS_Mux_Program *programs;
+	/*! PAT stream*/
 	GF_M2TS_Mux_Stream *pat;
+	/*! SDT stream*/
 	GF_M2TS_Mux_Stream *sdt;
-
+	/*! TS ID*/
 	u16 ts_id;
-
+	/*! signals reconfigure is needed (PAT)*/
 	Bool needs_reconfig;
 
-	/* used to indicate that the input data is pushed to the muxer (i.e. not read from a file)
+	/*! used to indicate that the input data is pushed to the muxer (i.e. not read from a file)
 	or that the output data is sent on sockets (not written to a file) */
 	Bool real_time;
 
-	/* indicates if the multiplexer shall target a fix bit rate (monitoring timing and produce padding packets)
+	/*! indicates if the multiplexer shall target a fix bit rate (monitoring timing and produce padding packets)
 	   or if the output stream will contain only input data*/
 	Bool fixed_rate;
 
-	/*output bit-rate in bit/sec*/
+	/*! output bit-rate in bit/sec*/
 	u32 bit_rate;
 
-	/*init value for PCRs on all streams if 0, random value is used*/
+	/*! init value for PCRs on all streams if 0, random value is used*/
 	u64 init_pcr_value;
-
+	/*! PCR update rate in milliseconds*/
 	u32 pcr_update_ms;
+	/*! destination TS packet*/
+	char dst_pck[188];
+	/*! destination NULL TS packet*/
+	char null_pck[188];
 
-	char dst_pck[188], null_pck[188];
-
-	/*multiplexer time, incremented each time a packet is sent
+	/*! multiplexer time, incremented each time a packet is sent
 	  used to monitor the sending of muxer related data (PAT, ...) */
 	GF_M2TS_Time time;
 
-	/* Time of the muxer when the first call to process is made (first packet sent?) */
+	/*! Time of the muxer when the first call to process is made (first packet sent?) */
 	GF_M2TS_Time init_ts_time;
 
-	/* System time high res when the muxer is started */
+	/*! System time in microsenconds when the muxer is started */
 	u64 init_sys_time;
-
+	/*! forces PAT injection at next packet*/
 	Bool force_pat;
-
+	/*! AU per PES packing mode*/
 	GF_M2TS_PackMode au_pes_mode;
-
+	/*! enable forced PCR (PCR only packets)*/
 	Bool enable_forced_pcr;
-
-	Bool eos_found;
+	/*! last rate estimation time in microseconds*/
 	u64 last_br_time_us;
+	/*! number of TS packets over the bitrate estimation period*/
 	u32 pck_sent_over_br_window;
-	u64 tot_pck_sent, tot_pad_sent, tot_pes_pad_bytes;
-
-
+	/*! number of TS packets sent*/
+	u64 tot_pck_sent;
+	/*! number of TS NULL packets sent*/
+	u64 tot_pad_sent;
+	/*! number of PES bytes sent*/
+	u64 tot_pes_pad_bytes;
+
+	/*! average rate in kbps*/
 	u32 average_birate_kbps;
 
+	/*! if set, flushes all streams in a program when a PES RAP is found (eg sent remaining audios and co)*/
 	Bool flush_pes_at_rap;
-	/*cf enum above*/
+	/*! state for forced injection of PAT/PMT/PCR*/
 	u32 force_pat_pmt_state;
+
+	/*! 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)*/
+	Bool sap_inserted;
+	/*! SAP time (used when dashing)*/
+	u64 sap_time;
+	/*! SAP type (used when dashing)*/
+	u32 sap_type;
+	/*! last PTS in 90khz (used when dashing to build sidx)*/
+	u64 last_pts;
+	/*! last PID (used when dashing to build sidx)*/
+	u32 last_pid;
 };
 
+/*! default refresh rate for PSI data*/
+#define GF_M2TS_PSI_DEFAULT_REFRESH_RATE	200
+/*! creates a new MPEG-2 TS multiplexer
+\param mux_rate target mux rate in kbps, can be 0 for VBR
+\param pat_refresh_rate PAT refresh rate in ms
+\param real_time indicates if real-time production should be used
+\return a new MPEG-2 TS multiplexer
+ */
+GF_M2TS_Mux *gf_m2ts_mux_new(u32 mux_rate, u32 pat_refresh_rate, Bool real_time);
+/*! destroys a TS muxer
+\param muxer the target MPEG-2 TS multiplexer
+*/
+void gf_m2ts_mux_del(GF_M2TS_Mux *muxer);
 
+/*! sets max interval between two PCR. Default/max interval is 100 milliseconds
+\param muxer the target MPEG-2 TS multiplexer
+\param pcr_update_ms PCR interval in milliseconds
+*/
+void gf_m2ts_mux_set_pcr_max_interval(GF_M2TS_Mux *muxer, u32 pcr_update_ms);
+/*! adds a new program to the muxer
+\param muxer the target MPEG-2 TS multiplexer
+\param program_number number of program to add
+\param pmt_pid value of program PMT packet identifier
+\param pmt_refresh_rate refresh rate in milliseconds of PMT. 0 only sends PMT once
+\param pcr_offset initial offset in 90 kHz to add to PCR values (usually to compensate for large frame sending times)
+\param mpeg4_signaling type of MPEG-4 signaling used
+\param pmt_version initial version of the PMT
+\param initial_disc if GF_TRUE, signals packet discontinuity on the first packet of eact stream in the program
+\return a TS multiplexer program
+*/
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, u32 mpeg4_signaling, u32 pmt_version, Bool initial_disc);
+/*! adds a stream to a program
+\param program the target program
+\param ifce the stream interface object for packet and properties query
+\param pid the packet identifier for the stream
+\param is_pcr if GF_TRUE, this stream is the clock reference of the program
+\param force_pes_mode if GF_TRUE, forces PES packetization (used for streams carried over PES or sections, such as metadata and MPEG-4)
+\param needs_mutex indicates a mutex is required before calling the stream interface object
+\return a TS multiplexer program
+*/
+GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, GF_ESInterface *ifce, u32 pid, Bool is_pcr, Bool force_pes_mode, Bool needs_mutex);
+/*! updates muxer configuration
+\param muxer the target MPEG-2 TS multiplexer
+\param reset_time if GF_TRUE, resets multiplexer time to 0
+*/
+void gf_m2ts_mux_update_config(GF_M2TS_Mux *muxer, Bool reset_time);
+/*! removes stream from program, triggering PMT update as well
+\param stream the target stream to remove
+*/
+void gf_m2ts_program_stream_remove(GF_M2TS_Mux_Stream *stream);
 
+/*! finds a program by its number
+\param muxer the target MPEG-2 TS multiplexer
+\param program_number number of program to retrieve
+\return a TS multiplexer program or NULL of not found
+*/
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_find(GF_M2TS_Mux *muxer, u32 program_number);
+/*! gets number of program in a multiplex
+\param muxer the target MPEG-2 TS multiplexer
+\return number of programs
+*/
+u32 gf_m2ts_mux_program_count(GF_M2TS_Mux *muxer);
+/*! gets number of stream in a program
+\param program the target program
+\return number of streams
+*/
+u32 gf_m2ts_mux_program_get_stream_count(GF_M2TS_Mux_Program *program);
+/*! gets the packet identifier of the PMT of a program
+\param program the target program
+\return PID of the PMT
+*/
+u32 gf_m2ts_mux_program_get_pmt_pid(GF_M2TS_Mux_Program *program);
+/*! gets the packet identifier of the PCR stream of a program
+\param program the target program
+\return PID of the PCR
+*/
+u32 gf_m2ts_mux_program_get_pcr_pid(GF_M2TS_Mux_Program *program);
 
-enum
+/*! state of multiplexer*/
+typedef enum
 {
+	/*! multiplexer is idle, nothing to produce (real-time mux only)*/
 	GF_M2TS_STATE_IDLE,
+	/*! multiplexer is sending data*/
 	GF_M2TS_STATE_DATA,
+	/*! multiplexer is sending padding (no input data and fixed rate required)*/
 	GF_M2TS_STATE_PADDING,
+	/*! multiplexer is done*/
 	GF_M2TS_STATE_EOS,
-};
+} GF_M2TSMuxState;
 
-#define GF_M2TS_PSI_DEFAULT_REFRESH_RATE	200
-/*!
- * mux_rate en kbps
- */
-GF_M2TS_Mux *gf_m2ts_mux_new(u32 mux_rate, u32 pat_refresh_rate, Bool real_time);
-void gf_m2ts_mux_del(GF_M2TS_Mux *mux);
-//sets max interval between two PCR. Default/max interval is 100 ms
-void gf_m2ts_mux_set_pcr_max_interval(GF_M2TS_Mux *muxer, u32 pcr_update_ms);
-GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling, u32 pmt_version, Bool initial_disc);
-GF_M2TS_Mux_Stream *gf_m2ts_program_stream_add(GF_M2TS_Mux_Program *program, GF_ESInterface *ifce, u32 pid, Bool is_pcr, Bool force_pes_mode);
-void gf_m2ts_mux_update_config(GF_M2TS_Mux *mux, Bool reset_time);
-
-GF_M2TS_Mux_Program *gf_m2ts_mux_program_find(GF_M2TS_Mux *muxer, u32 program_number);
-
-const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status, u32 *usec_till_next);
+/*! produces one packet of the multiplex
+\param muxer the target MPEG-2 TS multiplexer
+\param status set to the current state of the multiplexer
+\param usec_till_next the target MPEG-2 TS multiplexer
+\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)
+\param muxer the target MPEG-2 TS multiplexer
+\return system clock of the multiplexer in milliseconds
+*/
 u32 gf_m2ts_get_sys_clock(GF_M2TS_Mux *muxer);
+/*! gets the multiplexer clock (computed from mux rate and packet sent)
+\param muxer the target MPEG-2 TS multiplexer
+\return multiplexer clock in milliseconds
+*/
 u32 gf_m2ts_get_ts_clock(GF_M2TS_Mux *muxer);
 
+/*! gets the multiplexer clock (computed from mux rate and packet sent)
+\param muxer the target MPEG-2 TS multiplexer
+\return multiplexer clock in 90kHz scale
+*/
+u64 gf_m2ts_get_ts_clock_90k(GF_M2TS_Mux *muxer);
+
+/*! set AU per PES packetization mode
+\param muxer the target MPEG-2 TS multiplexer
+\param au_pes_mode AU packetization mode to use
+\return error if any
+*/
 GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, GF_M2TS_PackMode au_pes_mode);
+
+/*! sets initial PCR value for all programs in multiplex. If this is not called, each program will use a random initial PCR
+\param muxer the target MPEG-2 TS multiplexer
+\param init_pcr_value initial PCR value in 90kHz
+\return error if any
+*/
 GF_Err gf_m2ts_mux_set_initial_pcr(GF_M2TS_Mux *muxer, u64 init_pcr_value);
-GF_Err gf_m2ts_mux_enable_pcr_only_packets(GF_M2TS_Mux *muxer, Bool enable_forced_pcr);
+/*! enables pure PCR packets (no payload). This can be needed for some DVB constraints on PCR refresh rate (less than one frame duration) when next video frame is not yet ready to be muxed.
 
-/*user interface functions*/
-GF_Err gf_m2ts_program_stream_update_ts_scale(GF_ESInterface *_self, u32 time_scale);
+\param muxer the target MPEG-2 TS multiplexer
+\param enable_forced_pcr if GF_TRUE, the multiplexer may use PCR-only packets; otherwise, it will wait for a frame to be ready on the PCR stream before sending a PCR
+\return error if any
+*/
+GF_Err gf_m2ts_mux_enable_pcr_only_packets(GF_M2TS_Mux *muxer, Bool enable_forced_pcr);
 
+/*! sets program name and provider
+\param program the target program
+\param program_name the program name (UTF-8)
+\param mux_provider_name the provider name (UTF-8)
+*/
 void gf_m2ts_mux_program_set_name(GF_M2TS_Mux_Program *program, const char *program_name, const char *mux_provider_name);
-void gf_m2ts_mux_enable_sdt(GF_M2TS_Mux *mux, u32 refresh_rate_ms);
 
+/*! enables sending DVB SDT
+\param muxer the target program
+\param refresh_rate_ms the refresh rate for the SDT. A value of 0 only sends the SDT once
+*/
+void gf_m2ts_mux_enable_sdt(GF_M2TS_Mux *muxer, u32 refresh_rate_ms);
 
 #endif /*GPAC_DISABLE_MPEG2TS_MUX*/
 
-/******************* Demux DVB ****************************/
-
-
-
-#ifdef GPAC_HAS_LINUX_DVB
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <linux/dvb/dmx.h>
-#include <linux/dvb/frontend.h>
-
-struct __gf_dvb_tuner {
-	u32 freq;
-	u16 vpid;
-	u16 apid;
-	fe_spectral_inversion_t specInv;
-	fe_modulation_t modulation;
-	fe_bandwidth_t bandwidth;
-	fe_transmit_mode_t TransmissionMode;
-	fe_guard_interval_t guardInterval;
-	fe_code_rate_t HP_CodeRate;
-	fe_code_rate_t LP_CodeRate;
-	fe_hierarchy_t hierarchy;
-
-	int ts_fd;
-};
-
-
-#endif //GPAC_HAS_LINUX_DVB
-
 
 #ifndef GPAC_DISABLE_MPEG2TS
-GF_Err gf_m2ts_demuxer_setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop);
-GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts);
-GF_Err gf_m2ts_demuxer_close(GF_M2TS_Demuxer *ts);
-
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
-/*quick hack to get M2TS over IP or UDP socket*/
-GF_Err gf_m2ts_get_socket(const char *url, const char *mcast_ifce_or_mobileip, u32 buf_size, GF_Socket **out_socket);
-
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/network.h -> gpac-1.0.0.tar.gz/include/gpac/network.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -29,547 +29,634 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#include <gpac/setup.h>
+#include <gpac/tools.h>
 
 /*!
- *	\file <gpac/network.h>
- *	\brief Networking.
- */
+\file <gpac/network.h>
+\brief Networking.
+*/
 
 /*!
-*	\addtogroup net_grp Network
-*	\ingroup utils_grp
-*	\brief Networking tools (URL resolution, TCP/UDP sockets)
-*
-*This section documents the IP network functions of the GPAC framework.
-*	@{
-*/
+\addtogroup net_grp
+\brief Networking tools (URL resolution, TCP/UDP sockets)
 
-#include <gpac/tools.h>
+This section documents the IP network functions of the GPAC framework.
+
+\defgroup sock_grp Socket
+\ingroup net_grp
+\defgroup sockgrp_grp Socket Group
+\ingroup net_grp
+\defgroup nett_grp Network Time and helpers
+\ingroup net_grp
+\defgroup url_grp URL tools
+\ingroup net_grp
 
+*/
 
 /*!
- *\brief URL local test
- *
- *Tests whether a URL describes a local file or not
- *\param url the url to analyze
- *\return 1 if the URL describes a local file, 0 otherwise
+\addtogroup url_grp
+\brief URL manipulation tools
+@{
+*/
+
+/*!
+\brief URL local test
+
+Tests whether a URL describes a local file or not
+\param url the url to analyze
+\return 1 if the URL describes a local file, 0 otherwise
  */
 Bool gf_url_is_local(const char *url);
 
 /*!
- *\brief gets absolute file path
- *
- *Gets the absolute file path from a relative path and its parent absolute one. This can only be used with file paths.
- *\param pathName the relative path name of a file
- *\param parentPath the absolute parent path name
- *\return absolute path name of the file, or NULL if bad paths are provided.
+\brief gets absolute file path
+
+Gets the absolute file path from a relative path and its parent absolute one. This can only be used with file paths.
+\param pathName the relative path name of a file
+\param parentPath the absolute parent path name
+\return absolute path name of the file, or NULL if bad paths are provided.
  \note the returned string must be freed by user
  */
 char *gf_url_get_absolute_path(const char *pathName, const char *parentPath);
 
 /*concatenates URL and gets back full URL - returned string must be freed by user*/
 /*!
- *\brief URL concatenation
- *
- *Concatenates a relative URL with its parent URL
- *\param parentName URL of the parent service
- *\param pathName URL of the service
- *\return absolute path name of the service, or NULL if bad paths are provided or if the service path is already an absolute one.
+\brief URL concatenation
+
+Concatenates a relative URL with its parent URL
+\param parentName URL of the parent service
+\param pathName URL of the service
+\return absolute path name of the service, or NULL if bad paths are provided or if the service path is already an absolute one.
  \note the returned string must be freed by user
  */
 char *gf_url_concatenate(const char *parentName, const char *pathName);
 
 /*!
- *\brief URL encodin
- *
- *Encodes URL by replacing special characters with their % encodings.
- *\param path URL of the service
- *\return encoded path name , or NULL if bad paths are provided.
+\brief URL concatenation
+
+Same as \ref gf_url_concatenate but if both paths are relative, resolved url is relative to parent path.
+\param parentName URL of the parent service
+\param pathName URL of the service
+\return absolute path name of the service, or NULL if bad paths are provided or if the service path is already an absolute one.
+ \note the returned string must be freed by user
+ */
+char *gf_url_concatenate_parent(const char *parentName, const char *pathName);
+
+/*!
+\brief URL encoding
+
+Encodes URL by replacing special characters with their % encodings.
+\param path URL of the service
+\return encoded path name , or NULL if bad paths are provided.
  \note the returned string must be freed by user
  */
 char *gf_url_percent_encode(const char *path);
 
 /*!
- *\brief URL to file system
- *
- *Converts a local URL to a file system value. Removes all white spaces and similar
- *\param url url to convert
+\brief URL to file system
+
+Converts a local URL to a file system value. Removes all white spaces and similar
+\param url url to convert
  */
 void gf_url_to_fs_path(char *url);
 
+/*!
+\brief get first after a filename/path
+
+Returns a pointer to the first colon at the end of a filename or URL, if any
+\param URL path or URL to inspect
+\return position of first colon, or NULL
+*/
+char* gf_url_colon_suffix(const char* URL);
+
 
 /*!
- *\brief Extract resource name from URL
- *
- * Extracts the resource name from the URL
- *\param url input url
- *\return resource name.
+\brief Extract resource name from URL
+
+Extracts the resource name from the URL
+\param url input url
+\return resource name.
  */
 const char *gf_url_get_resource_name(const char *url);
 
 /*!
- *\brief Extract resource path from URL
- *
- *Extracts the reource path from the URL
- *\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.
+\brief Extract resource path from URL
+
+Extracts the reource path from the URL
+\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.
  */
 Bool gf_url_get_resource_path(const char *url, char *res_path);
 
+/*! @} */
+
 /*!
- *\brief Remove last delimenter from URL
- *
- * Remove last delimenter from URL
- *\param sURL input url
- *\param res_path buffer for resulting path storage
- *\return GF_TRUE if delimiter was extracted, otherwise GF_FALSE.
+\addtogroup nett_grp
+\brief Network tools (time, byte ordering, ...)
+@{
+*/
+
+
+/*!
+\brief gets ipv6 support
+
+Returns IPV6 support information.
+\return 2 if the machine has IPV6 support, 1 if the library was compiled with IPV6 support, 0 otherwise
  */
-Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path);
+u32 gf_net_has_ipv6();
+
 
 /*!
- *\brief Extract extension from a resource path in URL
- *
- * Extract a resource path of URL and analyze its extension
- *\param sURL input url
- *\return The corresponding extension if exists, otherwise NULL.
+\brief checks address type
+
+Checks if an address is an IPV6 or IPV4 one.
+\param address address to check
+\return true 1 if address is IPV6 one, 0 otherwise
  */
-const char* gf_url_get_ressource_extension(const char *sURL);
+Bool gf_net_is_ipv6(const char *address);
+
 
 /*!
- *\brief Portable version of UNIX gettimeofday()
+host to network conversion of integer
+
+\param val integrer to convert
+\return converted integer
  */
-struct timeval;
-s32 gf_gettimeofday(struct timeval *tp, void *tz);
+u32 gf_htonl(u32 val);
+/*!
+network to host conversion of integer
 
+\param val integrer to convert
+\return converted integer
+ */
+u32 gf_ntohl(u32 val);
 /*!
- *\brief gets UTC time
- *
- *Gets UTC time since midnight Jan 1970
- *\param sec number of seconds
- *\param msec number of milliseconds
+host to network conversion of short integer
+\param val short integrer to convert
+\return converted integer
+ */
+u16 gf_htons(u16 val);
+/*!
+network to host conversion of short integer
+\param val short integrer to convert
+\return converted integer
+ */
+u16 gf_tohs(u16 val);
+
+/*! @} */
+
+/*!
+\addtogroup time_grp
+\brief Time manipulation tools
+@{
+*/
+
+/*!
+\brief gets UTC time
+
+Gets UTC time since midnight Jan 1970
+\param sec number of seconds
+\param msec number of milliseconds
  */
 void gf_utc_time_since_1970(u32 *sec, u32 *msec);
 
 
 /*!
- *	\brief NTP seconds from 1900 to 1970
- *	\hideinitializer
- *
- *	Macro giving the number of seconds from from 1900 to 1970
+\brief NTP seconds from 1900 to 1970
+\hideinitializer
+
+Macro giving the number of seconds from 1900 to 1970
 */
 #define GF_NTP_SEC_1900_TO_1970 2208988800ul
 
 /*!
- *\brief gets NTP time
- *
- *Gets NTP (Network Time Protocol) in seconds and fractional side
- \param sec NTP time in seconds
- \param frac fractional NTP time expressed in 1 / (1<<32 - 1) seconds units
+\brief gets NTP time
+
+Gets NTP (Network Time Protocol) in seconds and fractional side
+\param sec NTP time in seconds
+\param frac fractional NTP time expressed in 1 / (1<<32 - 1) seconds units
  */
 void gf_net_get_ntp(u32 *sec, u32 *frac);
 
 /*!
- *\brief offsets NTP time by a given amount of seconds
- *
- *Offsets NTP time of the system by a given amount of seconds in the future or the past (default value is 0).
- \param sec seconds to add or remove to the system NTP
+*\brief gets NTP time in milliseconds
+
+\return NTP time in milliseconds
+*/
+u64 gf_net_get_ntp_ms();
+
+/*!
+\brief offsets NTP time by a given amount of seconds
+
+Offsets NTP time of the system by a given amount of seconds in the future or the past (default value is 0).
+\param sec seconds to add or remove to the system NTP
  */
 void gf_net_set_ntp_shift(s32 sec);
 
 /*!
- *\brief gets NTP time
- *
- *Gets NTP (Network Time Protocol) timestamp (high 32 bit is seconds, low 32 bit is fraction)
- \return NTP timestamp
+\brief gets NTP time
+
+Gets NTP (Network Time Protocol) timestamp (high 32 bit is seconds, low 32 bit is fraction)
+\return NTP timestamp
  */
 u64 gf_net_get_ntp_ts();
 
 /*!
- *
- *Gets diff in milliseconds between NTP time and current time
- \param ntp NTP timestamp
- \return diff in milliseconds with the current time
+
+Gets diff in milliseconds between NTP time and current time
+\param ntp NTP timestamp
+\return diff in milliseconds with the current time
  */
 s32 gf_net_get_ntp_diff_ms(u64 ntp);
 
+
+/*!
+
+Gets diff in milliseconds between two NTP times  time and current time
+\param ntp_a first NTP timestamp
+\param ntp_b second NTP timestamp
+\return diff ntp_a minus ntp_b in milliseconds
+ */
+s32 gf_net_ntp_diff_ms(u64 ntp_a, u64 ntp_b);
+
+/*! @} */
+
+/*!
+\addtogroup sock_grp
+\brief Sockets (TCP, UDP unicast, multicast)
+@{
+*/
+
+/*!
+\brief error code description
+
+Returns text description of given errno code
+\param errnoval the error value to test
+\return its description
+ */
+const char *gf_errno_str(int errnoval);
+
+
 /*!
- * Socket options
- *	\hideinitializer
+Socket options
+\hideinitializer
  */
 enum
 {
 	/*!Reuses port.*/
 	GF_SOCK_REUSE_PORT = 1,
 	/*!Forces IPV6 if available.*/
-	GF_SOCK_FORCE_IPV6 = 1<<1
+	GF_SOCK_FORCE_IPV6 = 1<<1,
+	/*!Does not perfom the actual bind, only keeps address and port.*/
+	GF_SOCK_FAKE_BIND = 1<<2
 };
 
 /*!
- *\brief abstracted socket object
- *
- *The abstracted socket object allows you to build client and server applications very simply
- *with support for unicast and multicast
+\brief abstracted socket object
+
+The abstracted socket object allows you to build client and server applications very simply with support for unicast and multicast
+Available tools are socket and socket groups and some helper functions for network time
 */
 typedef struct __tag_socket GF_Socket;
 
 /*!
- *\brief abstracted socket group object
- *
- *The abstracted socket group object allows querying multiple sockets in a group
+\brief abstracted socket group object
+
+The abstracted socket group object allows querying multiple sockets in a group
 */
 typedef struct __tag_sock_group GF_SockGroup;
 
 /*!Buffer size to pass for IP address retrieval*/
-#define GF_MAX_IP_NAME_LEN	516
+#define GF_MAX_IP_NAME_LEN	1025
 
 /*!socket is a TCP socket*/
 #define GF_SOCK_TYPE_TCP		0x01
 /*!socket is a UDP socket*/
 #define GF_SOCK_TYPE_UDP		0x02
 
+#ifdef GPAC_HAS_SOCK_UN
+/*!socket is a TCP socket*/
+#define GF_SOCK_TYPE_TCP_UN		0x03
+/*!socket is a TCP socket*/
+#define GF_SOCK_TYPE_UDP_UN		0x04
+#endif
+
 /*!
- *\brief socket constructor
- *
- *Constructs a socket object
- *\param SocketType the socket type to create, either UDP or TCP
- *\return the socket object or NULL if network initialization failure
+\brief socket constructor
+
+Constructs a socket object
+\param SocketType the socket type to create, either UDP or TCP
+\return the socket object or NULL if network initialization failure
  */
 GF_Socket *gf_sk_new(u32 SocketType);
 /*!
- *\brief socket destructor
- *
- *Deletes a socket object
- *\param sock the socket object
+\brief socket destructor
+
+Deletes a socket object
+\param sock the socket object
  */
 void gf_sk_del(GF_Socket *sock);
 
 /*!
- *\brief reset internal buffer
- *
- *Forces the internal socket buffer to be reseted (discarded)
- *\param sock the socket object
+\brief reset internal buffer
+
+Forces the internal socket buffer to be reseted (discarded)
+\param sock the socket object
  */
 void gf_sk_reset(GF_Socket *sock);
 /*!
- *\brief socket buffer size control
- *
- *Sets the size of the internal buffer of the socket. The socket MUST be bound or connected before.
- *\param sock the socket object
- *\param send_buffer if 0, sets the size of the reception buffer, otherwise sets the size of the emission buffer
- *\param new_size new size of the buffer in bytes.
- *\warning This operation may fail depending on the provider, hardware...
+\brief socket buffer size control
+
+Sets the size of the internal buffer of the socket. The socket MUST be bound or connected before.
+\warning This operation may fail depending on the provider, hardware...
+\param sock the socket object
+\param send_buffer if 0, sets the size of the reception buffer, otherwise sets the size of the emission buffer
+\param new_size new size of the buffer in bytes.
+\return error if any
  */
 GF_Err gf_sk_set_buffer_size(GF_Socket *sock, Bool send_buffer, u32 new_size);
 
 /*!
- *\brief blocking mode control
- *
- *Sets the blocking mode of a socket on or off. A blocking socket will wait for the net operation to be possible
- *while a non-blocking one would return an error. By default, sockets are created in blocking mode
- *\param sock the socket object
- *\param NonBlockingOn set to 1 to use on-blocking sockets, 0 otherwise
+\brief blocking mode control
+
+Sets the blocking mode of a socket on or off. A blocking socket will wait for the net operation to be possible
+while a non-blocking one would return an error. By default, sockets are created in blocking mode
+\param sock the socket object
+\param NonBlockingOn set to 1 to use non-blocking sockets, 0 otherwise
+\return error if any
  */
 GF_Err gf_sk_set_block_mode(GF_Socket *sock, Bool NonBlockingOn);
 /*!
- *\brief socket binding
- *
- *Binds the given socket to the specified port.
- *\param local_ip the local interface IP address if desired. If NULL, the default interface will be used.
- *\param sock the socket object
- *\param port port number to bind this socket to
- *\param peer_name the remote server address, if NULL, will use localhost
- *\param peer_port remote port number to connect the socket to
- *\param options list of option for the bind operation.
+\brief socket binding
+
+Binds the given socket to the specified port.
+\param local_ip the local interface IP address if desired. If NULL, the default interface will be used.
+\param sock the socket object
+\param port port number to bind this socket to
+\param peer_name the remote server address, if NULL, will use localhost
+\param peer_port remote port number to connect the socket to
+\param options list of option for the bind operation.
+\return error if any
  */
 GF_Err gf_sk_bind(GF_Socket *sock, const char *local_ip, u16 port, const char *peer_name, u16 peer_port, u32 options);
 /*!
- *\brief connects a socket
- *
- *Connects a socket to a remote peer on a given port
- *\param sock the socket object
- *\param peer_name the remote server address (IP or DNS)
- *\param port remote port number to connect the socket to
- *\param local_ip the local (client) address (IP or DNS) if any, NULL otherwise.
+\brief connects a socket
+
+Connects a socket to a remote peer on a given port
+\param sock the socket object
+\param peer_name the remote server address (IP or DNS)
+\param port remote port number to connect the socket to
+\param local_ip the local (client) address (IP or DNS) if any, NULL otherwise.
+\return error if any
  */
 GF_Err gf_sk_connect(GF_Socket *sock, const char *peer_name, u16 port, const char *local_ip);
 /*!
- *\brief data emission
- *
- *Sends a buffer on the socket. The socket must be in a bound or connected mode
- *\param sock the socket object
- *\param buffer the data buffer to send
- *\param length the data length to send
+\brief data emission
+
+Sends a buffer on the socket. The socket must be in a bound or connected mode
+\param sock the socket object
+\param buffer the data buffer to send
+\param length the data length to send
+\return error if any
  */
-GF_Err gf_sk_send(GF_Socket *sock, const char *buffer, u32 length);
+GF_Err gf_sk_send(GF_Socket *sock, const u8 *buffer, u32 length);
 /*!
- *\brief data reception
- *
- *Fetches data on a socket. The socket must be in a bound or connected state
- *\param sock the socket object
- *\param buffer the reception buffer where data is written
- *\param length the allocated size of the reception buffer
- *\param start_from the offset in the reception buffer where to start writing
- *\param read the actual number of bytes received
- *\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
+\brief data reception
+
+Fetches data on a socket. The socket must be in a bound or connected state
+\param sock the socket object
+\param buffer the reception buffer where data is written. Passing NULL will only probe for data in socket (eg only do select() ).
+\param length the allocated size of the reception buffer
+\param read the actual number of bytes received
+\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
  */
-GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read);
+GF_Err gf_sk_receive(GF_Socket *sock, u8 *buffer, u32 length, u32 *read);
 
 /*!
- *\brief socket listening
- *
- *Sets the socket in a listening state. This socket must have been bound to a port before
- *\param sock the socket object
- *\param max_conn the maximum number of simultaneous connection this socket will accept
+\brief socket listening
+
+Sets the socket in a listening state. This socket must have been bound to a port before
+\param sock the socket object
+\param max_conn the maximum number of simultaneous connection this socket will accept
+\return error if any
  */
 GF_Err gf_sk_listen(GF_Socket *sock, u32 max_conn);
 /*!
- *\brief socket accept
- *
- *Accepts an incoming connection on a listening socket
- *\param sock the socket object
- *\param new_conn the resulting connection socket object
+\brief socket accept
+
+Accepts an incoming connection on a listening socket
+\param sock the socket object
+\param new_conn the resulting connection socket object
+\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
  */
 GF_Err gf_sk_accept(GF_Socket *sock, GF_Socket **new_conn);
 
 /*!
- *\brief server socket mode
- *
- *Disable the Nable algo (e.g. set TCP_NODELAY) and set the KEEPALIVE on
- *\param sock the socket object
- *\param server_on sets server mode on or off
+\brief server socket mode
+
+Disable the Nable algo (e.g. set TCP_NODELAY) and set the KEEPALIVE on
+\param sock the socket object
+\param server_on sets server mode on or off
+\return error if any
 */
 GF_Err gf_sk_server_mode(GF_Socket *sock, Bool server_on);
 
 /*!
- *\brief get local host name
- *
- *Retrieves local host name.
- *\param buffer destination buffer for name. Buffer must be GF_MAX_IP_NAME_LEN long
+\brief get local host name
+
+Retrieves local host name.
+\param buffer destination buffer for name. Buffer must be GF_MAX_IP_NAME_LEN long
+\return error if any
  */
 GF_Err gf_sk_get_host_name(char *buffer);
 
 /*!
- *\brief get local IP
- *
- *Gets local IP address of a connected socket, typically used for server after an ACCEPT
- *\param sock the socket object
- *\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+\brief get local IP
+
+Gets local IP address of a connected socket, typically used for server after an ACCEPT
+\param sock the socket object
+\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+\return error if any
  */
 GF_Err gf_sk_get_local_ip(GF_Socket *sock, char *buffer);
 /*!
- *\brief get local info
- *
- *Gets local socket info of a socket
- *\param sock the socket object
- *\param port local port number of the socket
- *\param sock_type socket type (UDP or TCP)
+\brief get local info
+
+Gets local socket info of a socket
+\param sock the socket object
+\param port local port number of the socket
+\param sock_type socket type (UDP or TCP)
+\return error if any
  */
 GF_Err gf_sk_get_local_info(GF_Socket *sock, u16 *port, u32 *sock_type);
 
 /*!
- *\brief get remote address
- *
- *Gets the remote address of a peer. The socket MUST be connected.
- *\param sock the socket object
- *\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+\brief get remote address
+
+Gets the remote address of a peer. The socket MUST be connected.
+\param sock the socket object
+\param buffer destination buffer for IP address. Buffer must be GF_MAX_IP_NAME_LEN long
+\return error if any
  */
 GF_Err gf_sk_get_remote_address(GF_Socket *sock, char *buffer);
 
 /*!
- *\brief set remote address
- *
- *Sets the remote address of a socket. This is used by connectionless sockets using SendTo and ReceiveFrom
- *\param sock the socket object
- *\param address the remote peer address
- *\param port the remote peer port
+\brief set remote address
+
+Sets the remote address of a socket. This is used by connectionless sockets using SendTo and ReceiveFrom
+\param sock the socket object
+\param address the remote peer address
+\param port the remote peer port
+\return error if any
  */
 GF_Err gf_sk_set_remote(GF_Socket *sock, char *address, u16 port);
 
 
 /*!
- *\brief multicast setup
- *
- *Performs multicast setup (BIND and JOIN) for the socket object
- *\param sock the socket object
- *\param multi_ip_add the multicast IP address
- *\param multi_port the multicast port number
- *\param TTL the multicast TTL (Time-To-Live)
- *\param no_bind if sets, only join the multicast
- *\param local_interface_ip the local interface IP address if desired. If NULL, the default interface will be used.
+\brief multicast setup
+
+Performs multicast setup (BIND and JOIN) for the socket object
+\param sock the socket object
+\param multi_ip_add the multicast IP address
+\param multi_port the multicast port number
+\param TTL the multicast TTL (Time-To-Live)
+\param no_bind if sets, only join the multicast
+\param local_interface_ip the local interface IP address if desired. If NULL, the default interface will be used.
+\return error if any
  */
 GF_Err gf_sk_setup_multicast(GF_Socket *sock, const char *multi_ip_add, u16 multi_port, u32 TTL, Bool no_bind, char *local_interface_ip);
 /*!
- *brief multicast address test
- *
- *tests whether an IP address is a multicast one or not
- *\param multi_ip_add the multicast IP address to test
- *\return 1 if the address is a multicast one, 0 otherwise
+ \brief multicast address test
+
+Tests whether an IP address is a multicast one or not
+\param multi_ip_add the multicast IP address to test
+\return 1 if the address is a multicast one, 0 otherwise
  */
 u32 gf_sk_is_multicast_address(const char *multi_ip_add);
 
 /*!
- *\brief send data with wait delay
- *
- *Sends data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
- *\param sock the socket object
- *\param buffer the data buffer to send
- *\param length the data length to send
- *\param delay_sec the maximum delay in second to wait before aborting
- *\return If the operation timed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
- */
-GF_Err gf_sk_send_wait(GF_Socket *sock, const char *buffer, u32 length, u32 delay_sec);
+\brief send data with wait delay
+
+Sends data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
+\param sock the socket object
+\param buffer the data buffer to send
+\param length the data length to send
+\param delay_sec the maximum delay in second to wait before aborting
+\return If the operation timed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
+ */
+GF_Err gf_sk_send_wait(GF_Socket *sock, const u8 *buffer, u32 length, u32 delay_sec);
 /* receive data with a max wait delay of Second - used for http / ftp sockets mainly*/
 /*!
- *\brief receive data with wait delay
- *
- *Fetches data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
- *\param sock the socket object
- *\param buffer the reception buffer where data is written
- *\param length the allocated size of the reception buffer
- *\param start_from the offset in the reception buffer where to start writing
- *\param read the actual number of bytes received
- *\param delay_sec the maximum delay in second to wait before aborting
- *\return If the operation timed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
- */
-GF_Err gf_sk_receive_wait(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read, u32 delay_sec);
+\brief receive data with wait delay
 
-/*!
- *\brief gets socket handle
- *
- *Gets the socket low-level handle as used by OpenSSL.
- *\param sock the socket object
- *\return the socket handle
+Fetches data with a max wait delay. This is used for http / ftp sockets mainly. The socket must be connected.
+\param sock the socket object
+\param buffer the reception buffer where data is written
+\param length the allocated size of the reception buffer
+\param read the actual number of bytes received
+\param delay_sec the maximum delay in second to wait before aborting
+\return If the operation timed out, the function will return a GF_IP_SOCK_WOULD_BLOCK error.
  */
-s32 gf_sk_get_handle(GF_Socket *sock);
+GF_Err gf_sk_receive_wait(GF_Socket *sock, u8 *buffer, u32 length, u32 *read, u32 delay_sec);
 
 /*!
- *Sets the socket wait time in microseconds. Default wait time is 500 microseconds. Any value >= 1000000 will reset to default.
- *\param sock the socket object
- *\param usec_wait wait time in microseconds
- */
-void gf_sk_set_usec_wait(GF_Socket *sock, u32 usec_wait);
+\brief gets socket handle
 
-/*!
- *Creates a new socket group
- *\return socket group object
- */
-GF_SockGroup *gf_sk_group_new();
-/*!
- *Deletes a socket group
- *\param sg socket group object
- */
-void gf_sk_group_del(GF_SockGroup *sg);
-/*!
- *Registers a socket to a socket group
- *\param sg socket group object
- *\param sk socket object to register
- */
-void gf_sk_group_register(GF_SockGroup *sg, GF_Socket *sk);
-/*!
- *Unregisters a socket from a socket group
- *\param sg socket group object
- *\param sk socket object to unregister
+Gets the socket low-level handle as used by OpenSSL.
+\param sock the socket object
+\return the socket handle
  */
-void gf_sk_group_unregister(GF_SockGroup *sg, GF_Socket *sk);
+s32 gf_sk_get_handle(GF_Socket *sock);
 
 /*!
- *Performs a select (wait) on the socket group
- *\param sg socket group object
- *\param wait_usec microseconds to wait (can be larger than one second)
- *\return error if any
+Sets the socket wait time in microseconds. Default wait time is 500 microseconds. Any value >= 1000000 will reset to default.
+\param sock the socket object
+\param usec_wait wait time in microseconds
  */
-GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 wait_usec);
-/*!
- *Checks if given socket is selected and can be read. This shall be called after gf_sk_group_select
- *\param sg socket group object
- *\param sk socket object to check
- *\return GF_TRUE if socket is ready to read, 0 otherwise
- */
-Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk);
+void gf_sk_set_usec_wait(GF_Socket *sock, u32 usec_wait);
 
 /*!
- *Fetches data on a socket without performing any select (wait), to be used with socket group on sockets that are set in the selected socket group
- *\param sock the socket object
- *\param buffer the reception buffer where data is written
- *\param length the allocated size of the reception buffer
- *\param start_from the offset in the reception buffer where to start writing
- *\param read the actual number of bytes received
- *\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
+Fetches data on a socket without performing any select (wait), to be used with socket group on sockets that are set in the selected socket group
+\param sock the socket object
+\param buffer the reception buffer where data is written
+\param length the allocated size of the reception buffer
+\param read the actual number of bytes received
+\return error if any, GF_IP_NETWORK_EMPTY if nothing to read
  */
-GF_Err gf_sk_receive_no_select(GF_Socket *sock, char *buffer, u32 length, u32 start_from, u32 *read);
-
+GF_Err gf_sk_receive_no_select(GF_Socket *sock, u8 *buffer, u32 length, u32 *read);
 
 /*!
- *\brief gets ipv6 support
- *
- *Returns IPV6 support information.
- *\return 2 if the machine has IPV6 support, 1 if the library was compiled with IPV6 support, 0 otherwise
+Checks if connection has been closed by remote peer
+\param sock the socket object
+\return error if any (GF_IP_CONNECTION_CLOSED if connection is closed)
  */
-u32 gf_net_has_ipv6();
+GF_Err gf_sk_probe(GF_Socket *sock);
 
+/*! @} */
 
 /*!
- *\brief checks address type
- *
- *Checks if an address is an IPV6 or IPV4 one.
- *\param address Adress to check
- *\return true 1 if address is IPV6 one, 0 otherwise
- */
-Bool gf_net_is_ipv6(const char *address);
-
+\addtogroup sockgrp_grp
+\brief Socket IO polling
+@{
+*/
 
 /*!
- *host to network conversion of integer
- *
- *\param val integrer to convert
- *\return converted integer
+Creates a new socket group
+\return socket group object
  */
-u32 gf_htonl(u32 val);
+GF_SockGroup *gf_sk_group_new();
 /*!
- *network to host conversion of integer
- *
- *\param val integrer to convert
- *\return converted integer
+Deletes a socket group
+\param sg socket group object
  */
-u32 gf_ntohl(u32 val);
+void gf_sk_group_del(GF_SockGroup *sg);
 /*!
- *host to network conversion of short integer
- *
- *\param val short integrer to convert
- *\return converted integer
+Registers a socket to a socket group
+\param sg socket group object
+\param sk socket object to register
  */
-u16 gf_htons(u16 val);
+void gf_sk_group_register(GF_SockGroup *sg, GF_Socket *sk);
 /*!
- *network to host conversion of short integer
- *
- *\param val short integrer to convert
- *\return converted integer
+Unregisters a socket from a socket group
+\param sg socket group object
+\param sk socket object to unregister
  */
-u16 gf_tohs(u16 val);
+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;
 
 /*!
- *	\brief MobileIP Callback
- *
- * The gf_net_mobileip_ctrl_cbk type is the type for the callback of the \ref gf_net_mobileip_set_callback function. By default no mobileip is used
- *	\param cbck Opaque user data.
- *	\param start boolean indicating wether the MobileIP subsystem should be started or stopped.
- *	\return Error code if needed.
- *
+Performs a select (wait) on the socket group
+\param sg socket group object
+\param wait_usec microseconds to wait (can be larger than one second)
+\param mode the operation mode desired
+\return error if any
  */
-typedef GF_Err (*gf_net_mobileip_ctrl_cbk)(Bool start);
+GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 wait_usec, GF_SockSelectMode mode);
 
 /*!
- *\brief Assigns MobileIP callback
- *
- *Assigns the MobileIP control callback.
- *\param _mobip_cbk MobileIP control callback
- *\param MobileIP MobileIP address
+Checks if given socket is selected and can be read. This shall be called after gf_sk_group_select
+\param sg socket group object
+\param sk socket object to check
+\param mode the operation mode desired
+\return GF_TRUE if socket is ready to read, 0 otherwise
  */
-void gf_net_mobileip_set_callback(gf_net_mobileip_ctrl_cbk _mobip_cbk, const char *MobileIP);
+Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk, GF_SockSelectMode mode);
 
 /*! @} */
 
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.8.0.tar.gz/include/gpac/nodes_mpeg4.h -> gpac-1.0.0.tar.gz/include/gpac/nodes_mpeg4.h Changed

gpac-0.8.0.tar.gz/include/gpac/nodes_svg.h -> gpac-1.0.0.tar.gz/include/gpac/nodes_svg.h Changed

@@ -116,202 +116,6 @@
 	TAG_SVG_UndefinedElement
 };
 
-/* Definition of SVG attribute internal tags - 200 defined */
-/* TAG names are made of "TAG_SVG_ATT_" + SVG attribute name (with - replaced by _) */
-enum {
-	TAG_SVG_ATT_id = TAG_SVG_ATT_RANGE_FIRST,
-	TAG_SVG_ATT__class,
-
-	TAG_SVG_ATT_requiredFeatures,
-	TAG_SVG_ATT_requiredExtensions,
-	TAG_SVG_ATT_requiredFormats,
-	TAG_SVG_ATT_requiredFonts,
-	TAG_SVG_ATT_systemLanguage,
-	TAG_SVG_ATT_display,
-	TAG_SVG_ATT_visibility,
-	TAG_SVG_ATT_image_rendering,
-	TAG_SVG_ATT_pointer_events,
-	TAG_SVG_ATT_shape_rendering,
-	TAG_SVG_ATT_text_rendering,
-	TAG_SVG_ATT_audio_level,
-	TAG_SVG_ATT_viewport_fill,
-	TAG_SVG_ATT_viewport_fill_opacity,
-	TAG_SVG_ATT_overflow,
-	TAG_SVG_ATT_fill_opacity,
-	TAG_SVG_ATT_stroke_opacity,
-	TAG_SVG_ATT_fill,
-	TAG_SVG_ATT_fill_rule,
-	TAG_SVG_ATT_filter,
-	TAG_SVG_ATT_stroke,
-	TAG_SVG_ATT_stroke_dasharray,
-	TAG_SVG_ATT_stroke_dashoffset,
-	TAG_SVG_ATT_stroke_linecap,
-	TAG_SVG_ATT_stroke_linejoin,
-	TAG_SVG_ATT_stroke_miterlimit,
-	TAG_SVG_ATT_stroke_width,
-	TAG_SVG_ATT_color,
-	TAG_SVG_ATT_color_rendering,
-	TAG_SVG_ATT_vector_effect,
-	TAG_SVG_ATT_solid_color,
-	TAG_SVG_ATT_solid_opacity,
-	TAG_SVG_ATT_display_align,
-	TAG_SVG_ATT_line_increment,
-	TAG_SVG_ATT_stop_color,
-	TAG_SVG_ATT_stop_opacity,
-	TAG_SVG_ATT_font_family,
-	TAG_SVG_ATT_font_size,
-	TAG_SVG_ATT_font_style,
-	TAG_SVG_ATT_font_variant,
-	TAG_SVG_ATT_font_weight,
-	TAG_SVG_ATT_text_anchor,
-	TAG_SVG_ATT_text_align,
-	TAG_SVG_ATT_text_decoration,
-	TAG_SVG_ATT_focusHighlight,
-	TAG_SVG_ATT_externalResourcesRequired,
-	TAG_SVG_ATT_focusable,
-	TAG_SVG_ATT_nav_next,
-	TAG_SVG_ATT_nav_prev,
-	TAG_SVG_ATT_nav_up,
-	TAG_SVG_ATT_nav_up_right,
-	TAG_SVG_ATT_nav_right,
-	TAG_SVG_ATT_nav_down_right,
-	TAG_SVG_ATT_nav_down,
-	TAG_SVG_ATT_nav_down_left,
-	TAG_SVG_ATT_nav_left,
-	TAG_SVG_ATT_nav_up_left,
-	TAG_SVG_ATT_transform,
-	TAG_SVG_ATT_target,
-	TAG_SVG_ATT_attributeName,
-	TAG_SVG_ATT_attributeType,
-	TAG_SVG_ATT_begin,
-	TAG_SVG_ATT_dur,
-	TAG_SVG_ATT_end,
-	TAG_SVG_ATT_repeatCount,
-	TAG_SVG_ATT_repeatDur,
-	TAG_SVG_ATT_restart,
-	TAG_SVG_ATT_smil_fill,
-	TAG_SVG_ATT_min,
-	TAG_SVG_ATT_max,
-	TAG_SVG_ATT_to,
-	TAG_SVG_ATT_calcMode,
-	TAG_SVG_ATT_values,
-	TAG_SVG_ATT_keyTimes,
-	TAG_SVG_ATT_keySplines,
-	TAG_SVG_ATT_from,
-	TAG_SVG_ATT_by,
-	TAG_SVG_ATT_additive,
-	TAG_SVG_ATT_accumulate,
-	TAG_SVG_ATT_path,
-	TAG_SVG_ATT_keyPoints,
-	TAG_SVG_ATT_rotate,
-	TAG_SVG_ATT_origin,
-	TAG_SVG_ATT_transform_type,
-	TAG_SVG_ATT_clipBegin,
-	TAG_SVG_ATT_clipEnd,
-	TAG_SVG_ATT_syncBehavior,
-	TAG_SVG_ATT_syncTolerance,
-	TAG_SVG_ATT_syncMaster,
-	TAG_SVG_ATT_syncReference,
-	TAG_SVG_ATT_x,
-	TAG_SVG_ATT_y,
-	TAG_SVG_ATT_width,
-	TAG_SVG_ATT_height,
-	TAG_SVG_ATT_preserveAspectRatio,
-	TAG_SVG_ATT_initialVisibility,
-	TAG_SVG_ATT_type,
-	TAG_SVG_ATT_cx,
-	TAG_SVG_ATT_cy,
-	TAG_SVG_ATT_r,
-	TAG_SVG_ATT_cursorManager_x,
-	TAG_SVG_ATT_cursorManager_y,
-	TAG_SVG_ATT_rx,
-	TAG_SVG_ATT_ry,
-	TAG_SVG_ATT_horiz_adv_x,
-	TAG_SVG_ATT_horiz_origin_x,
-	TAG_SVG_ATT_font_stretch,
-	TAG_SVG_ATT_unicode_range,
-	TAG_SVG_ATT_panose_1,
-	TAG_SVG_ATT_widths,
-	TAG_SVG_ATT_bbox,
-	TAG_SVG_ATT_units_per_em,
-	TAG_SVG_ATT_stemv,
-	TAG_SVG_ATT_stemh,
-	TAG_SVG_ATT_slope,
-	TAG_SVG_ATT_cap_height,
-	TAG_SVG_ATT_x_height,
-	TAG_SVG_ATT_accent_height,
-	TAG_SVG_ATT_ascent,
-	TAG_SVG_ATT_descent,
-	TAG_SVG_ATT_ideographic,
-	TAG_SVG_ATT_alphabetic,
-	TAG_SVG_ATT_mathematical,
-	TAG_SVG_ATT_hanging,
-	TAG_SVG_ATT_underline_position,
-	TAG_SVG_ATT_underline_thickness,
-	TAG_SVG_ATT_strikethrough_position,
-	TAG_SVG_ATT_strikethrough_thickness,
-	TAG_SVG_ATT_overline_position,
-	TAG_SVG_ATT_overline_thickness,
-	TAG_SVG_ATT_d,
-	TAG_SVG_ATT_unicode,
-	TAG_SVG_ATT_glyph_name,
-	TAG_SVG_ATT_arabic_form,
-	TAG_SVG_ATT_lang,
-	TAG_SVG_ATT_u1,
-	TAG_SVG_ATT_g1,
-	TAG_SVG_ATT_u2,
-	TAG_SVG_ATT_g2,
-	TAG_SVG_ATT_k,
-	TAG_SVG_ATT_opacity,
-	TAG_SVG_ATT_x1,
-	TAG_SVG_ATT_y1,
-	TAG_SVG_ATT_x2,
-	TAG_SVG_ATT_y2,
-	TAG_SVG_ATT_filterUnits,
-	TAG_SVG_ATT_gradientUnits,
-	TAG_SVG_ATT_spreadMethod,
-	TAG_SVG_ATT_gradientTransform,
-	TAG_SVG_ATT_pathLength,
-	TAG_SVG_ATT_points,
-	TAG_SVG_ATT_mediaSize,
-	TAG_SVG_ATT_mediaTime,
-	TAG_SVG_ATT_mediaCharacterEncoding,
-	TAG_SVG_ATT_mediaContentEncodings,
-	TAG_SVG_ATT_bandwidth,
-	TAG_SVG_ATT_fx,
-	TAG_SVG_ATT_fy,
-	TAG_SVG_ATT_size,
-	TAG_SVG_ATT_choice,
-	TAG_SVG_ATT_delta,
-	TAG_SVG_ATT_offset,
-	TAG_SVG_ATT_syncBehaviorDefault,
-	TAG_SVG_ATT_syncToleranceDefault,
-	TAG_SVG_ATT_viewBox,
-	TAG_SVG_ATT_zoomAndPan,
-	TAG_SVG_ATT_version,
-	TAG_SVG_ATT_baseProfile,
-	TAG_SVG_ATT_contentScriptType,
-	TAG_SVG_ATT_snapshotTime,
-	TAG_SVG_ATT_timelineBegin,
-	TAG_SVG_ATT_playbackOrder,
-	TAG_SVG_ATT_editable,
-	TAG_SVG_ATT_text_x,
-	TAG_SVG_ATT_text_y,
-	TAG_SVG_ATT_text_rotate,
-	TAG_SVG_ATT_transformBehavior,
-	TAG_SVG_ATT_overlay,
-	TAG_SVG_ATT_fullscreen,
-	TAG_SVG_ATT_motionTransform,
-
-	TAG_SVG_ATT_filter_transfer_type,
-	TAG_SVG_ATT_filter_table_values,
-	TAG_SVG_ATT_filter_intercept,
-	TAG_SVG_ATT_filter_amplitude,
-	TAG_SVG_ATT_filter_exponent
-
-};
-
-
 struct _all_atts {
 	XML_Space *xml_space;
 	XMLRI *xml_base;

gpac-0.8.0.tar.gz/include/gpac/options.h -> gpac-1.0.0.tar.gz/include/gpac/options.h Changed

gpac-0.8.0.tar.gz/include/gpac/path2d.h -> gpac-1.0.0.tar.gz/include/gpac/path2d.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -28,9 +28,9 @@
 #define _GF_PATH2D_H_
 
 /*!
- *	\file <gpac/path2d.h>
- *	\brief 2D Vectorial Path.
- */
+\file <gpac/path2d.h>
+\brief 2D Vectorial Path.
+*/
 
 
 
@@ -43,19 +43,19 @@
 
 
 /*!
- *\addtogroup path_grp 2D Vector Path
- *\ingroup math_grp
- *\brief Vectorial 2D Path manipulation
- *
- *This section documents the 2D path object used in the GPAC framework.
- *	@{
- */
+\addtogroup path_grp 2D Vector Path
+\ingroup math_grp
+\brief Vectorial 2D Path manipulation
+
+This section documents the 2D path object used in the GPAC framework.
+
+@{
+*/
 
 
 /*!\brief 2D Path Object
- *
- *The 2D path object is used to construct complex 2D shapes for later drawing
- * or outlining.
+
+The 2D path object is used to construct complex 2D shapes for later drawing or outlining.
  */
 typedef struct
 {
@@ -79,325 +79,335 @@
 
 
 /*!
- *	\brief path constructor
- *
- *	Constructs an empty 2D path object
- *	\return new path object
+\brief path constructor
+
+Constructs an empty 2D path object
+\return new path object
  */
 GF_Path *gf_path_new();
 /*!
- *	\brief path destructor
- *
- *	Destructs a 2D path object
- *	\param gp the target path
+\brief path destructor
+
+Destructs a 2D path object
+\param gp the target path
  */
 void gf_path_del(GF_Path *gp);
 /*!
- *	\brief path reset
- *
- *	Resets the 2D path object
- *	\param gp the target path
+\brief path reset
+
+Resets the 2D path object
+\param gp the target path
  */
 void gf_path_reset(GF_Path *gp);
 /*!
- *	\brief path copy constuctor
- *
- *	Resets a copy of a 2D path object
- *	\param gp the target path
- *	\return new path copy
+\brief path copy constuctor
+
+Resets a copy of a 2D path object
+\param gp the target path
+\return new path copy
  */
 GF_Path *gf_path_clone(GF_Path *gp);
 /*!
- *	\brief path close
- *
- *	Closes current path contour
- *	\param gp the target path
- *	\return error code if any error, \ref GF_OK otherwise
+\brief path close
+
+Closes current path contour
+\param gp the target path
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_close(GF_Path *gp);
 /*!
- *	\brief path moveTo
- *
- *	Starts a new contour from the specified point
- *	\param gp the target path
- *	\param x x-coordinate of the new point
- *	\param y y-coordinate of the new point
- *	\return error code if any error, \ref GF_OK otherwise
+\brief path moveTo
+
+Starts a new contour from the specified point
+\param gp the target path
+\param x x-coordinate of the new point
+\param y y-coordinate of the new point
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_move_to(GF_Path *gp, Fixed x, Fixed y);
 /*!
- *	\brief starts new contour
- *
- *	Starts a new contour from the specified point
- *	\param gp the target path
- *	\param pt pointer to the new start point
- *	\return error code if any error, \ref GF_OK otherwise
+\brief starts new contour
+
+Starts a new contour from the specified point
+\param gp the target path
+\param pt pointer to the new start point
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_move_to_vec(GF_Path *gp, GF_Point2D *pt);
 /*!
- *	\brief adds line to path
- *
- *	Adds a line from the current point in path to the specified point
- *	\param gp the target path
- *	\param x x-coordinate of the line end
- *	\param y y-coordinate of the line end
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds line to path
+
+Adds a line from the current point in path to the specified point
+\param gp the target path
+\param x x-coordinate of the line end
+\param y y-coordinate of the line end
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_line_to(GF_Path *gp, Fixed x, Fixed y);
 /*!
- *	\brief adds line to path
- *
- *	Adds a line from the current point in path to the specified point
- *	\param gp the target path
- *	\param pt line end
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds line to path
+
+Adds a line from the current point in path to the specified point
+\param gp the target path
+\param pt line end
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_line_to_vec(GF_Path *gp, GF_Point2D *pt);
 /*!
- *	\brief adds cubic to path
- *
- *	Adds a cubic bezier curve to the current contour, starting from the current path point
- *	\param gp the target path
- *	\param c1_x x-coordinate of the first control point of the cubic curve
- *	\param c1_y y-coordinate of the first control point of the cubic curve
- *	\param c2_x x-coordinate of the second control point of the cubic curve
- *	\param c2_y y-coordinate of the second control point of the cubic curve
- *	\param x x-coordinate of the end point of the cubic curve
- *	\param y y-coordinate of the end point of the cubic curve
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds cubic to path
+
+Adds a cubic bezier curve to the current contour, starting from the current path point
+\param gp the target path
+\param c1_x x-coordinate of the first control point of the cubic curve
+\param c1_y y-coordinate of the first control point of the cubic curve
+\param c2_x x-coordinate of the second control point of the cubic curve
+\param c2_y y-coordinate of the second control point of the cubic curve
+\param x x-coordinate of the end point of the cubic curve
+\param y y-coordinate of the end point of the cubic curve
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_cubic_to(GF_Path *gp, Fixed c1_x, Fixed c1_y, Fixed c2_x, Fixed c2_y, Fixed x, Fixed y);
 /*!
- *	\brief adds cubic to path
- *
- *	Adds a cubic bezier curve to the current contour, starting from the current path point
- *	\param gp the target path
- *	\param c1 first control point of the cubic curve
- *	\param c2 second control point of the cubic curve
- *	\param pt end point of the cubic curve
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds cubic to path
+
+Adds a cubic bezier curve to the current contour, starting from the current path point
+\param gp the target path
+\param c1 first control point of the cubic curve
+\param c2 second control point of the cubic curve
+\param pt end point of the cubic curve
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_cubic_to_vec(GF_Path *gp, GF_Point2D *c1, GF_Point2D *c2, GF_Point2D *pt);
 /*!
- *	\brief adds quadratic to path
- *
- *	Adds a quadratic bezier curve to the current contour, starting from the current path point
- *	\param gp the target path
- *	\param c_x x-coordinate of the control point of the quadratic curve
- *	\param c_y y-coordinate of the control point of the quadratic curve
- *	\param x x-coordinate of the end point of the cubic quadratic
- *	\param y y-coordinate of the end point of the cubic quadratic
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds quadratic to path
+
+Adds a quadratic bezier curve to the current contour, starting from the current path point
+\param gp the target path
+\param c_x x-coordinate of the control point of the quadratic curve
+\param c_y y-coordinate of the control point of the quadratic curve
+\param x x-coordinate of the end point of the cubic quadratic
+\param y y-coordinate of the end point of the cubic quadratic
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_quadratic_to(GF_Path *gp, Fixed c_x, Fixed c_y, Fixed x, Fixed y);
 /*!
- *	\brief adds quadratic to path
- *
- *	Adds a quadratic bezier curve to the current contour, starting from the current path point
- *	\param gp the target path
- *	\param c control point of the quadratic curve
- *	\param pt end point of the cubic quadratic
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds quadratic to path
+
+Adds a quadratic bezier curve to the current contour, starting from the current path point
+\param gp the target path
+\param c control point of the quadratic curve
+\param pt end point of the cubic quadratic
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_quadratic_to_vec(GF_Path *gp, GF_Point2D *c, GF_Point2D *pt);
 /*!
- *	\brief adds rectangle to path
- *
- *	Adds a rectangle contour to the path
- *	\param gp the target path
- *	\param cx x-coordinate of the rectangle center
- *	\param cy y-coordinate of the rectangle center
- *	\param w width of the rectangle
- *	\param h height of the rectangle
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds rectangle to path
+
+Adds a rectangle contour to the path
+\param gp the target path
+\param cx x-coordinate of the rectangle center
+\param cy y-coordinate of the rectangle center
+\param w width of the rectangle
+\param h height of the rectangle
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_rect_center(GF_Path *gp, Fixed cx, Fixed cy, Fixed w, Fixed h);
 /*!
- *	\brief adds rectangle to path
- *
- *	Adds a rectangle contour to the path
- *	\param gp the target path
- *	\param ox left-most coordinate of the rectangle
- *	\param oy top-most coordinate of the rectangle
- *	\param w width of the rectangle
- *	\param h height of the rectangle
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds rectangle to path
+
+Adds a rectangle contour to the path
+\param gp the target path
+\param ox left-most coordinate of the rectangle
+\param oy top-most coordinate of the rectangle
+\param w width of the rectangle
+\param h height of the rectangle
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_rect(GF_Path *gp, Fixed ox, Fixed oy, Fixed w, Fixed h);
 /*!
- *	\brief adds ellipse to path
- *
- *	Adds an ellipse contour to the path
- *	\param gp the target path
- *	\param cx x-coordinate of the ellipse center
- *	\param cy y-coordinate of the ellipse center
- *	\param a_axis length of the horizontal ellipse axis
- *	\param b_axis length of the vertical ellipse axis
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds ellipse to path
+
+Adds an ellipse contour to the path
+\param gp the target path
+\param cx x-coordinate of the ellipse center
+\param cy y-coordinate of the ellipse center
+\param a_axis length of the horizontal ellipse axis
+\param b_axis length of the vertical ellipse axis
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_ellipse(GF_Path *gp, Fixed cx, Fixed cy, Fixed a_axis, Fixed b_axis);
 /*!
- *	\brief adds N-bezier curve to path
- *
- *	Adds an N-degree bezier curve to the path, starting from the current point
- *	\param gp the target path
- *	\param pts points used to define the curve
- *	\param nb_pts number of points used to define the curve. The degree of the curve is therefore (nb_pts-1).
- *	\return error code if any error, \ref GF_OK otherwise
- *	\note the fineness of the path must be set before calling this function.
+\brief adds N-1 bezier curve to path
+
+Adds an N-degree bezier curve to the path, starting from the current point
+\param gp the target path
+\param pts points used to define the curve
+\param nb_pts number of points used to define the curve. The degree of the curve is therefore (nb_pts-1).
+\return error code if any error, \ref GF_OK otherwise
+\note the fineness of the path must be set before calling this function.
  */
 GF_Err gf_path_add_bezier(GF_Path *gp, GF_Point2D *pts, u32 nb_pts);
 /*!
- *	\brief adds arc as described in MPEG-4 BIFS to path
- *
- *	Adds an arc contour to the path from focal and end points.
- *	\param gp the target path
- *	\param end_x x-coordinate of the arc end point
- *	\param end_y y-coordinate of the arc end point
- *	\param fa_x x-coordinate of the arc first focal point
- *	\param fa_y y-coordinate of the arc first focal point
- *	\param fb_x x-coordinate of the arc second focal point
- *	\param fb_y y-coordinate of the arc second focal point
- *	\param cw if 1, the arc will be clockwise, otherwise counter-clockwise.
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds arc as described in MPEG-4 BIFS to path
+
+Adds an arc contour to the path from focal and end points.
+\param gp the target path
+\param end_x x-coordinate of the arc end point
+\param end_y y-coordinate of the arc end point
+\param fa_x x-coordinate of the arc first focal point
+\param fa_y y-coordinate of the arc first focal point
+\param fb_x x-coordinate of the arc second focal point
+\param fb_y y-coordinate of the arc second focal point
+\param cw if 1, the arc will be clockwise, otherwise counter-clockwise.
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_arc_to(GF_Path *gp, Fixed end_x, Fixed end_y, Fixed fa_x, Fixed fa_y, Fixed fb_x, Fixed fb_y, Bool cw);
 /*!
- *	\brief adds arc as described in SVG to path
- *
- *	Adds an arc contour to the path from end point, radii and 3 parameters.
- *	\param gp the target path
- *	\param end_x x-coordinate of the arc end point
- *	\param end_y y-coordinate of the arc end point
- *	\param r_x x-axis radius
- *	\param r_y y-axis radius
- *	\param x_axis_rotation angle for the x-axis
- *	\param large_arc_flag large or short arc selection
- *	\param sweep_flag if 1, the arc will be clockwise, otherwise counter-clockwise.
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds arc as described in SVG to path
+
+Adds an arc contour to the path from end point, radii and 3 parameters.
+\param gp the target path
+\param end_x x-coordinate of the arc end point
+\param end_y y-coordinate of the arc end point
+\param r_x x-axis radius
+\param r_y y-axis radius
+\param x_axis_rotation angle for the x-axis
+\param large_arc_flag large or short arc selection
+\param sweep_flag if 1, the arc will be clockwise, otherwise counter-clockwise.
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_svg_arc_to(GF_Path *gp, Fixed end_x, Fixed end_y, Fixed r_x, Fixed r_y, Fixed x_axis_rotation, Bool large_arc_flag, Bool sweep_flag);
+
+/*! Close type for arc*/
+typedef enum
+{
+	/*! Arc is left open*/
+	GF_PATH2D_ARC_OPEN=0,
+	/*! Arc is closed to its starting point*/
+	GF_PATH2D_ARC_CLOSE,
+	/*! Arc is closed as a pie centered on arc center*/
+	GF_PATH2D_ARC_PIE,
+} GF_Path2DArcCloseType;
 /*!
- *	\brief adds arc to path
- *
- *	Adds an arc contour to the path.
- *	\param gp the target path
- *	\param radius radius of the arc
- *	\param start_angle start angle of the arc in radians
- *	\param end_angle end angle of the arc in radians
- *	\param close_type closing type: 0 for open arc, 1 for close arc, 2 for pie
- *	\return error code if any error, \ref GF_OK otherwise
+\brief adds arc to path
+
+Adds an arc contour to the path.
+\param gp the target path
+\param radius radius of the arc
+\param start_angle start angle of the arc in radians
+\param end_angle end angle of the arc in radians
+\param close_type closing type: 0 for open arc, 1 for close arc, 2 for pie
+\return error code if any error, \ref GF_OK otherwise
  */
-GF_Err gf_path_add_arc(GF_Path *gp, Fixed radius, Fixed start_angle, Fixed end_angle, u32 close_type);
+GF_Err gf_path_add_arc(GF_Path *gp, Fixed radius, Fixed start_angle, Fixed end_angle, GF_Path2DArcCloseType close_type);
 
 /*!
- *	\brief concatenates path
- *
- *	Adds a sub-path to the path with a given transform.
- *	\param gp the target path
- *	\param subpath the path to add
- *	\param mx Matrix for subpath
- *	\return error code if any error, \ref GF_OK otherwise
+\brief concatenates path
+
+Adds a sub-path to the path with a given transform.
+\param gp the target path
+\param subpath the path to add
+\param mx Matrix for subpath
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_add_subpath(GF_Path *gp, GF_Path *subpath, GF_Matrix2D *mx);
 /*!
- *	\brief gets path control bounds
- *
- *	Gets the path control bounds, i.e. the rectangle covering all lineTo and bezier control points.
- *	\param gp the target path
- *	\param rc pointer to rectangle receiving the control rectangle
- *	\return error code if any error, \ref GF_OK otherwise
+\brief gets path control bounds
+
+Gets the path control bounds, i.e. the rectangle covering all lineTo and bezier control points.
+\param gp the target path
+\param rc pointer to rectangle receiving the control rectangle
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_get_control_bounds(GF_Path *gp, GF_Rect *rc);
 /*!
- *	\brief gets path bounds
- *
- *	Gets the path bounds, i.e. the rectangle covering all points in path except bezier control points.
- *	\param gp the target path
- *	\param rc pointer to rectangle receiving the control rectangle
- *	\return error code if any error, \ref GF_OK otherwise
+\brief gets path bounds
+
+Gets the path bounds, i.e. the rectangle covering all points in path except bezier control points.
+\param gp the target path
+\param rc pointer to rectangle receiving the control rectangle
+\return error code if any error, \ref GF_OK otherwise
  */
 GF_Err gf_path_get_bounds(GF_Path *gp, GF_Rect *rc);
 /*!
- *	\brief flattens path
- *
- *	Flattens the path, i.e. transform all bezier curves to lines according to the path flatness.
- *	\param gp the target path
+\brief flattens path
+
+Flattens the path, i.e. transform all bezier curves to lines according to the path flatness.
+\param gp the target path
  */
 void gf_path_flatten(GF_Path *gp);
 /*!
- *	\brief gets flatten copy of path
- *
- *	Gets a flatten copy of the path.
- *	\param gp the target path
- *	\return the flatten path
+\brief gets flatten copy of path
+
+Gets a flatten copy of the path.
+\param gp the target path
+\return the flatten path
  */
 GF_Path *gf_path_get_flatten(GF_Path *gp);
 /*!
- *	\brief point over path testing
- *
- *	Tests if a point is over a path or not, according to the path filling rule.
- *	\param gp the target path
- *	\param x x-coordinate of the point to check
- *	\param y y-coordinate of the point to check
- *	\return 1 if the point is over the path, 0 otherwise.
+\brief point over path testing
+
+Tests if a point is over a path or not, according to the path filling rule.
+\param gp the target path
+\param x x-coordinate of the point to check
+\param y y-coordinate of the point to check
+\return 1 if the point is over the path, 0 otherwise.
  */
 Bool gf_path_point_over(GF_Path *gp, Fixed x, Fixed y);
 
 /*!
- *	\brief path init testing
- *
- *	Tests if the path is empty or not.
- *	\param gp the target path
- *	\return 1 if the path is empty, 0 otherwise.
+\brief path init testing
+
+Tests if the path is empty or not.
+\param gp the target path
+\return 1 if the path is empty, 0 otherwise.
  */
 Bool gf_path_is_empty(GF_Path *gp);
 
 /*!
- *	\brief path iterator
- *
- *	The path iterator object is used to compute the length of a given path as well
- * as transformation matrices along this path.
+\brief path iterator
+
+The path iterator object is used to compute the length of a given path as well as transformation matrices along this path.
  */
 typedef struct _path_iterator GF_PathIterator;
 
 /*!
- *	\brief path iterator constructor
- *
- *	Creates a new path iterator from a given path
- *	\param gp the target path
- *	\return the path iterator object.
+\brief path iterator constructor
+
+Creates a new path iterator from a given path
+\param gp the target path
+\return the path iterator object.
  */
 GF_PathIterator *gf_path_iterator_new(GF_Path *gp);
 /*!
- *	\brief path iterator destructor
- *
- *	Destructs the path iterator object
- *	\param it the target path iterator
+\brief path iterator destructor
+
+Destructs the path iterator object
+\param it the target path iterator
  */
 void gf_path_iterator_del(GF_PathIterator *it);
 
 /*!
- *	\brief get path length
- *
- *	Gets a path length from its iterator
- *	\param it the target path iterator
- *	\return the length of the path
+\brief get path length
+
+Gets a path length from its iterator
+\param it the target path iterator
+\return the length of the path
  */
 Fixed gf_path_iterator_get_length(GF_PathIterator *it);
 /*!
- *\brief gets transformation matrix at given point on path
- *
- * Gets the transformation of a given point on the path, given by offset from origin.
- *The transform is so that a local system is translated to the given point, its x-axis tangent
- *to the path and in the same direction. The path direction is from first point to last point
- *of the path.
- *	\param it the target path iterator
- *	\param offset length on the path in local system unit
- *	\param follow_tangent indicates if transformation shall be computed if offset indicates a point outside the path (<0 or >path_length). In which case the path shall be virtually extended by the tangent at origin (offset <0) or at end (offset>path_length). Otherwise the transformation is not computed and 0 is returned.
- *	\param mat matrix to be transformed (transformation shall be appended) - the matrix shall not be initialized
- *	\param smooth_edges indicates if discontinuities shall be smoothed. If not set, the rotation angle THETA is the slope (DX/DY) of the current segment found.
- *	\param length_after_point if set and smooth_edges is set, the amount of the object that lies on next segment shall be computed according to length_after_point.
+\brief gets transformation matrix at given point on path
+
+Gets the transformation of a given point on the path, given by offset from origin.
+The transform is so that a local system is translated to the given point, its x-axis tangent to the path and in the same direction.
+The path direction is from first point to last point of the path.
+\param it the target path iterator
+\param offset length on the path in local system unit
+\param follow_tangent indicates if transformation shall be computed if offset indicates a point outside the path (<0 or >path_length). In which case the path shall be virtually extended by the tangent at origin (offset <0) or at end (offset>path_length). Otherwise the transformation is not computed and 0 is returned.
+\param mat matrix to be transformed (transformation shall be appended) - the matrix shall not be initialized
+\param smooth_edges indicates if discontinuities shall be smoothed. If not set, the rotation angle THETA is the slope (DX/DY) of the current segment found.
+\param length_after_point if set and smooth_edges is set, the amount of the object that lies on next segment shall be computed according to length_after_point.
+
  \code
   Let:
 	len_last: length of current checked segment
@@ -408,18 +418,18 @@
   Of course care must be taken for PI/2 angles and similar situations
  \endcode
 
- *	\return 1 if matrix has been updated, 0 otherwise, if failure or if point is out of path without tangent extension.
+\return GF_TRUE if matrix has been updated, GF_FALSE otherwise, if failure or if point is out of path without tangent extension.
+
  */
 Bool gf_path_iterator_get_transform(GF_PathIterator *it, Fixed offset, Bool follow_tangent, GF_Matrix2D *mat, Bool smooth_edges, Fixed length_after_point);
 
 
 
 /*! brief gets convexity type for a 2D polygon
- *
- * Gets the convexity type of the given 2D polygon
- * \param pts the points of the polygon
- * \param nb_pts number of points in the polygon
- * \return the convexity type of the polygon
+Gets the convexity type of the given 2D polygon
+\param pts the points of the polygon
+\param nb_pts number of points in the polygon
+\return the convexity type of the polygon
 */
 u32 gf_polygone2d_get_convexity(GF_Point2D *pts, u32 nb_pts);
 
@@ -427,8 +437,8 @@
 /* 2D Path constants */
 
 /*!
- *2D Path point tags
- *	\hideinitializer
+2D Path point tags
+\hideinitializer
  */
 enum
 {
@@ -444,8 +454,8 @@
 
 
 /*!
- *2D Path flags
- *	\hideinitializer
+2D Path flags
+\hideinitializer
  */
 enum
 {
@@ -460,8 +470,8 @@
 };
 
 /*!
- * 2D Polygon convexity type
- *	\hideinitializer
+2D Polygon convexity type
+\hideinitializer
  */
 enum
 {
@@ -480,8 +490,8 @@
 };
 
 /*!
- * Stencil alignment type for outlining
- *	\hideinitializer
+Stencil alignment type for outlining
+\hideinitializer
  */
 enum
 {
@@ -494,8 +504,8 @@
 };
 
 /*!
- * Line cap type for outlining
- *	\hideinitializer
+Line cap type for outlining
+\hideinitializer
  */
 enum
 {
@@ -510,8 +520,8 @@
 };
 
 /*!
- * Line join type for outlining
- *	\hideinitializer
+Line join type for outlining
+\hideinitializer
  */
 enum
 {
@@ -526,8 +536,8 @@
 };
 
 /*!
- * Dash types for outlining
- *	\hideinitializer
+Dash types for outlining
+\hideinitializer
  */
 enum
 {
@@ -552,8 +562,7 @@
 
 
 /*!\brief Custom dash pattern
- *
- *The custom dash pattern object is used to specify custom dashes when outlining a path.
+The custom dash pattern object is used to specify custom dashes when outlining a path.
  */
 typedef struct
 {
@@ -563,14 +572,11 @@
 	u32 num_dash;
 	/*! Value of the pattern dashes. Unit depends on the dash type*/
 	Fixed *dashes;
-	/*! SVG/CSS unit for the dashes */
-	u8 *dash_units;
 } GF_DashSettings;
 
 /*!\brief Pen properties
- *
- *The pen properties object is used to specify several parameters used when building
- *the vectorial outline of a path.
+
+The pen properties object is used to specify several parameters used when building the vectorial outline of a path.
  */
 typedef struct
 {
@@ -589,18 +595,18 @@
 	/*! The initial dash offset in the outline. All points before this offset will be
 	* ignored when building the outline*/
 	Fixed dash_offset;
-	/*! The dash pattern used for curstom dashing*/
+	/*! The dash pattern used for custom dashing*/
 	GF_DashSettings *dash_set;
 	/*! The author-specified path length. Ignored if <= 0*/
 	Fixed path_length;
 } GF_PenSettings;
 
 /*! brief builds the vectorial outline of a path
- *
- * Builds the vectorial outline of a path for the given settings. The outline of a path is a path.
- * \param path the desired path to outline
- * \param pen the properties of the virtual pen used for outlining
- * \return the outline of the path
+
+Builds the vectorial outline of a path for the given settings. The outline of a path is a path.
+\param path the desired path to outline
+\param pen the properties of the virtual pen used for outlining
+\return the outline of the path
 */
 GF_Path *gf_path_get_outline(GF_Path *path, GF_PenSettings pen);

gpac-0.8.0.tar.gz/include/gpac/rtp_streamer.h -> gpac-1.0.0.tar.gz/include/gpac/rtp_streamer.h Changed

gpac-0.8.0.tar.gz/include/gpac/scene_engine.h -> gpac-1.0.0.tar.gz/include/gpac/scene_engine.h Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2019
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -33,182 +33,135 @@
 
 
 /*!
- *	\file <gpac/scene_engine.h>
- *	\brief Live scene encoding engine with RAP generation support.
- */
+\file <gpac/scene_engine.h>
+\brief Live scene encoding engine with RAP generation support.
+*/
 	
 /*!
- *	\addtogroup seng Scene Engine
- *	\ingroup scene_grp
- *	\brief Live scene encoding engine with RAP generation support.
- *
- *This section documents the live scene encoding tools of GPAC.
- *	@{
+\addtogroup seng Scene Engine
+\ingroup scene_grp
+\brief Live scene encoding engine with RAP generation support.
+
+This section documents the live scene encoding tools of GPAC.
+
+@{
  */
 
 #include <gpac/scene_manager.h>
 
 #ifndef GPAC_DISABLE_SENG
 
+/*! scene encoding engine object*/
 typedef struct __tag_scene_engine GF_SceneEngine;
 
-
-typedef void (*gf_seng_callback)(void *udta, u16 ESID, char *data, u32 size, u64 ts);
-
-/**
- * \param calling_object is the calling object on which call back will be called
- * \param inputContext is the name of a scene file (bt, xmt or mp4) to initialize the coding context
- * \param load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
- * \param dump_path is the path where scenes are dumped
- * \param embed_resources indicates if images and scripts should be encoded inlined with the content
- *
- * must be called only one time (by process calling the DLL) before other calls
- */
+/*! callback function prototype for scene engine*/
+typedef void (*gf_seng_callback)(void *udta, u16 ESID, u8 *data, u32 size, u64 ts);
+
+/*! creates a scene engine
+\param calling_object is the calling object on which call back will be called
+\param inputContext is the name of a scene file (bt, xmt or mp4) to initialize the coding context
+\param load_type is the preferred loader type for the content (e.g. SVG vs DIMS)
+\param dump_path is the path where scenes are dumped
+\param embed_resources indicates if images and scripts should be encoded inlined with the content
+\return e scene engine object
+*/
 GF_SceneEngine *gf_seng_init(void *calling_object, char *inputContext, u32 load_type, char *dump_path, Bool embed_resources);
 
-/**
- * \param calling_object is the calling object on which call back will be called
- * \param inputContext is an UTF-8 scene description (with or without IOD) in BT or XMT-A format
- * \param load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
- * \param width width of scene if no IOD is given in the context.
- * \param height height of scene if no IOD is given in the context.
- * \param usePixelMetrics metrics system used in the scene, if no IOD is given in the context.
- * \param dump_path the path where scenes are dumped
- *
- * must be called only one time (by process calling the DLL) before other calls
- */
-GF_SceneEngine *gf_seng_init_from_string(void *calling_object, char *inputContext, u32 load_type, u32 width, u32 height, Bool usePixelMetrics, char *dump_path);
-
-
-/**
- * \param calling_object the calling object on which call back will be called
- * \param ctx an already loaded scene manager
- * \param dump_path the path where scenes are dumped
- *
- * must be called only one time (by process calling the DLL) before other calls
- */
-GF_SceneEngine *gf_seng_init_from_context(void *calling_object, GF_SceneManager *ctx, char *dump_path);
-
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- *
- * must be called after gf_seng_init()
- */
+/*! get the number of streams in the scene
+\param seng the target scene engine
+\return the number of streams
+*/
 u32 gf_seng_get_stream_count(GF_SceneEngine *seng);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID ID of the stream
- * \param carousel_period pointer to store the carousel_period
- * \param aggregate_on_es_id pointer to store the target carousel stream ID
- *
- * must be called after gf_seng_init()
+/*! gets carousel nformation for a stream
+\param seng the target scene engine
+\param ESID ID of the stream to query
+\param carousel_period set to the carousel_period in millisenconds
+\param aggregate_on_es_id set to the target carousel stream ID
+\return error if any
  */
 GF_Err gf_seng_get_stream_carousel_info(GF_SceneEngine *seng, u16 ESID, u32 *carousel_period, u16 *aggregate_on_es_id);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param idx stream index
- * \param ESID pointer to the stream ID
- * \param config pointer to the encoded BIFS config (memory is not allocated)
- * \param config_len length of the buffer
- * \param streamType pointer to get stream type
- * \param objectType pointer to get object type
- * \param timeScale pointer to get time scale
- *
- * must be called after gf_seng_init()
- */
-GF_Err gf_seng_get_stream_config(GF_SceneEngine *seng, u32 idx, u16 *ESID, char ** const config, u32 *config_len, u32 *streamType, u32 *objectType, u32 *timeScale);
-
-/**
- * Encodes the AU context which is not encoded when calling BENC_EncodeAUFromString/File
- * Should be called after Aggregate.
- *
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param callback pointer on a callback function to get the result of the coding the AU using the current context
- *
- */
+/*! gets the stream decoder configuration
+\param seng the target scene engine
+\param idx stream index
+\param ESID set to the stream ID
+\param config set to the encoded BIFS config (memory is not allocated)
+\param config_len length of the buffer
+\param streamType pointer to get stream type
+\param objectType pointer to get object type
+\param timeScale pointer to get time scale
+\return error if any
+*/
+GF_Err gf_seng_get_stream_config(GF_SceneEngine *seng, u32 idx, u16 *ESID, const u8 **config, u32 *config_len, u32 *streamType, u32 *objectType, u32 *timeScale);
+
+/*! Encodes the AU context which is not encoded when calling BENC_EncodeAUFromString/File. This should be called after Aggregate.
+\param seng the target scene engine
+\param callback pointer on a callback function to get the result of the coding the AU using the current context
+\return error if any
+*/
 GF_Err gf_seng_encode_context(GF_SceneEngine *seng, gf_seng_callback callback);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID target streams when no indication is present in the file (eg, no atES_ID )
- * \param disable_aggregation
- * \param auFile name of a file containing a description for an access unit (BT or XMT)
- * \param callback pointer on a callback function to get the result of the coding the AU using the current context
- *
- */
+/*! Encodes an AU from file
+\param seng the target scene engine
+\param ESID target streams when no indication is present in the file (eg, no atES_ID )
+\param disable_aggregation do not aggregate the access unit on its target stream
+\param auFile name of a file containing a description for an access unit (BT or XMT)
+\param callback pointer on a callback function to get the result of the coding the AU using the current context
+\return error if any
+*/
 GF_Err gf_seng_encode_from_file(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, char *auFile, gf_seng_callback callback);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID target streams when no indication is present in the file (eg, no atES_ID )
- * \param disable_aggregation
- * \param auString a char string to encode (must one or several complete nodes in BT
- * \param callback pointer on a callback function to get the result of the coding the AU using the current context
- *
- */
+/*! Encodes an AU from string
+\param seng the target scene engine
+\param ESID target streams when no indication is present in the file (eg, no atES_ID )
+\param disable_aggregation
+\param auString a char string to encode (must one or several complete nodes in BT
+\param callback pointer on a callback function to get the result of the coding the AU using the current context
+\return error if any
+*/
 GF_Err gf_seng_encode_from_string(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, char *auString, gf_seng_callback callback);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID indicates the stream to which these commands apply (0 if first scene stream)
- * \param disable_aggregation
- * \param time
- * \param commands the list of commands to encode
- * \param callback pointer on a callback function to get the result of the coding the AU using the current context
- *
- */
-GF_Err gf_seng_encode_from_commands(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, u32 time, GF_List *commands, gf_seng_callback callback);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ctxFileName name of the file to save the current state of the BIFS scene to
- *
- * save the current context of the seng.
- * if you want to save an aggregate context, use BENC_AggregateCurrentContext before
- *
- */
+/*! saves the live context to a file. Use BENC_AggregateCurrentContext before to save an aggregated context.
+\param seng the target scene engine
+\param ctxFileName name of the file to save the current state of the BIFS scene to
+\return error if any
+*/
 GF_Err gf_seng_save_context(GF_SceneEngine *seng, char *ctxFileName);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID stream ID
- * \param onESID set stream aggragation on to the specified stream, or off if onESID is 0
- *
- * marks the stream as carrying its own "rap" in the first AU of the stream
- */
+/*! marks the stream as carrying its own "rap" in the first AU of the stream
+\param seng the target scene engine
+\param ESID stream ID
+\param onESID set stream aggragation on to the specified stream, or off if onESID is 0
+\return error if any
+*/
 GF_Err gf_seng_enable_aggregation(GF_SceneEngine *seng, u16 ESID, u16 onESID);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- * \param ESID stream ID
- *
- * aggregates the current context of the seng, creates a scene replace
- * if ESID is specified, only aggregate commands for this stream
- */
+/*! aggregates the current context of the seng, creates a scene replace
+\param seng the target scene engine
+\param ESID stream ID. If not 0, only aggregate commands for this stream; otherwise aggregates for the all streams
+\return error if any
+*/
 GF_Err gf_seng_aggregate_context(GF_SceneEngine *seng, u16 ESID);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- *
- * release the memory used by this seng, no more call on the seng should happen after this
- *
- */
+/*! destroys the scene engine
+\param seng the target scene engine
+*/
 void gf_seng_terminate(GF_SceneEngine *seng);
 
-/**
- * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
- *
- * encodes the IOD for this BIFS Engine into Base64
- *
+/*! encodes the IOD for this scene engine into Base64
+\param seng the target scene engine
+\return the base64 encoded IOD, shall be freed by the caller
  */
 char *gf_seng_get_base64_iod(GF_SceneEngine *seng);
 
+/*! returns the IOD for a scene engine
+\param seng the target scene engine
+\return the IOD object - shall be destroyed by caller
+*/
 GF_Descriptor *gf_seng_get_iod(GF_SceneEngine *seng);
 
-GF_Err gf_seng_dump_rap_on(GF_SceneEngine *seng, Bool dump_rap);
-
 #endif /*GPAC_DISABLE_SENG*/
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/scene_manager.h -> gpac-1.0.0.tar.gz/include/gpac/scene_manager.h Changed

gpac-0.8.0.tar.gz/include/gpac/scenegraph.h -> gpac-1.0.0.tar.gz/include/gpac/scenegraph.h Changed

gpac-0.8.0.tar.gz/include/gpac/scenegraph_svg.h -> gpac-1.0.0.tar.gz/include/gpac/scenegraph_svg.h Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Jean Le Feuvre - Cyril COncolato
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Authors: Jean Le Feuvre - Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2004-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph sub-project
@@ -31,17 +31,18 @@
 #endif
 
 /*!
- *	\file <gpac/scenegraph_svg.h>
- *	\brief Scenegraph for SVG files
- */
+\file <gpac/scenegraph_svg.h>
+\brief Scenegraph for SVG files
+*/
 	
 /*!
- *	\addtogroup ssvg SVG Scenegraph
- *	\ingroup scene_grp
- *	\brief Scenegraph for SVG files.
- *
- *This section documents the Scenegraph for SVG files.
- *	@{
+\addtogroup ssvg SVG Scenegraph
+\ingroup scene_grp
+\brief Scenegraph for SVG files.
+
+This section documents the Scenegraph for SVG files.
+
+@{
  */
 
 
@@ -54,7 +55,7 @@
  *          DOM base scene graph
  *
  *******************************************************************************/
-
+/*! DOM attributes tags for xmlspace, xmlev, xlink, SVG and LASeR*/
 enum
 {
 	/*should never be used, this is only a parsing error*/
@@ -101,56 +102,223 @@
 	TAG_LSR_ATT_svg_width,
 	TAG_LSR_ATT_svg_height,
 	TAG_LSR_ATT_textContent,
-	/*WHAT THE HECK IS THIS THING IN THE SDL BUT NOWHERE IN THE SPEC ?*/
 	TAG_LSR_ATT_text_display,
 
 	TAG_SVG_ATT_RANGE_FIRST,
 
-	TAG_XBL_ATT_RANGE_FIRST = TAG_SVG_ATT_RANGE_FIRST + 256,
-	TAG_XBL_ATT_id = TAG_XBL_ATT_RANGE_FIRST,
-	TAG_XBL_ATT_extends,
-	TAG_XBL_ATT_display,
-	TAG_XBL_ATT_inheritstyle,
-	TAG_XBL_ATT_includes,
-	TAG_XBL_ATT_name,
-	TAG_XBL_ATT_implements,
-	TAG_XBL_ATT_type,
-	TAG_XBL_ATT_readonly,
-	TAG_XBL_ATT_onget,
-	TAG_XBL_ATT_onset,
-	TAG_XBL_ATT_event,
-	TAG_XBL_ATT_action,
-	TAG_XBL_ATT_phase,
-	TAG_XBL_ATT_button,
-	TAG_XBL_ATT_modifiers,
-	TAG_XBL_ATT_keycode,
-	TAG_XBL_ATT_key,
-	TAG_XBL_ATT_charcode,
-	TAG_XBL_ATT_clickcount,
-	TAG_XBL_ATT_command,
-	TAG_XBL_ATT_preventdefault,
-	TAG_XBL_ATT_src,
+	TAG_SVG_ATT_id = TAG_SVG_ATT_RANGE_FIRST,
+	TAG_SVG_ATT__class,
+	TAG_SVG_ATT_requiredFeatures,
+	TAG_SVG_ATT_requiredExtensions,
+	TAG_SVG_ATT_requiredFormats,
+	TAG_SVG_ATT_requiredFonts,
+	TAG_SVG_ATT_systemLanguage,
+	TAG_SVG_ATT_display,
+	TAG_SVG_ATT_visibility,
+	TAG_SVG_ATT_image_rendering,
+	TAG_SVG_ATT_pointer_events,
+	TAG_SVG_ATT_shape_rendering,
+	TAG_SVG_ATT_text_rendering,
+	TAG_SVG_ATT_audio_level,
+	TAG_SVG_ATT_viewport_fill,
+	TAG_SVG_ATT_viewport_fill_opacity,
+	TAG_SVG_ATT_overflow,
+	TAG_SVG_ATT_fill_opacity,
+	TAG_SVG_ATT_stroke_opacity,
+	TAG_SVG_ATT_fill,
+	TAG_SVG_ATT_fill_rule,
+	TAG_SVG_ATT_filter,
+	TAG_SVG_ATT_stroke,
+	TAG_SVG_ATT_stroke_dasharray,
+	TAG_SVG_ATT_stroke_dashoffset,
+	TAG_SVG_ATT_stroke_linecap,
+	TAG_SVG_ATT_stroke_linejoin,
+	TAG_SVG_ATT_stroke_miterlimit,
+	TAG_SVG_ATT_stroke_width,
+	TAG_SVG_ATT_color,
+	TAG_SVG_ATT_color_rendering,
+	TAG_SVG_ATT_vector_effect,
+	TAG_SVG_ATT_solid_color,
+	TAG_SVG_ATT_solid_opacity,
+	TAG_SVG_ATT_display_align,
+	TAG_SVG_ATT_line_increment,
+	TAG_SVG_ATT_stop_color,
+	TAG_SVG_ATT_stop_opacity,
+	TAG_SVG_ATT_font_family,
+	TAG_SVG_ATT_font_size,
+	TAG_SVG_ATT_font_style,
+	TAG_SVG_ATT_font_variant,
+	TAG_SVG_ATT_font_weight,
+	TAG_SVG_ATT_text_anchor,
+	TAG_SVG_ATT_text_align,
+	TAG_SVG_ATT_text_decoration,
+	TAG_SVG_ATT_focusHighlight,
+	TAG_SVG_ATT_externalResourcesRequired,
+	TAG_SVG_ATT_focusable,
+	TAG_SVG_ATT_nav_next,
+	TAG_SVG_ATT_nav_prev,
+	TAG_SVG_ATT_nav_up,
+	TAG_SVG_ATT_nav_up_right,
+	TAG_SVG_ATT_nav_right,
+	TAG_SVG_ATT_nav_down_right,
+	TAG_SVG_ATT_nav_down,
+	TAG_SVG_ATT_nav_down_left,
+	TAG_SVG_ATT_nav_left,
+	TAG_SVG_ATT_nav_up_left,
+	TAG_SVG_ATT_transform,
+	TAG_SVG_ATT_target,
+	TAG_SVG_ATT_attributeName,
+	TAG_SVG_ATT_attributeType,
+	TAG_SVG_ATT_begin,
+	TAG_SVG_ATT_dur,
+	TAG_SVG_ATT_end,
+	TAG_SVG_ATT_repeatCount,
+	TAG_SVG_ATT_repeatDur,
+	TAG_SVG_ATT_restart,
+	TAG_SVG_ATT_smil_fill,
+	TAG_SVG_ATT_min,
+	TAG_SVG_ATT_max,
+	TAG_SVG_ATT_to,
+	TAG_SVG_ATT_calcMode,
+	TAG_SVG_ATT_values,
+	TAG_SVG_ATT_keyTimes,
+	TAG_SVG_ATT_keySplines,
+	TAG_SVG_ATT_from,
+	TAG_SVG_ATT_by,
+	TAG_SVG_ATT_additive,
+	TAG_SVG_ATT_accumulate,
+	TAG_SVG_ATT_path,
+	TAG_SVG_ATT_keyPoints,
+	TAG_SVG_ATT_rotate,
+	TAG_SVG_ATT_origin,
+	TAG_SVG_ATT_transform_type,
+	TAG_SVG_ATT_clipBegin,
+	TAG_SVG_ATT_clipEnd,
+	TAG_SVG_ATT_syncBehavior,
+	TAG_SVG_ATT_syncTolerance,
+	TAG_SVG_ATT_syncMaster,
+	TAG_SVG_ATT_syncReference,
+	TAG_SVG_ATT_x,
+	TAG_SVG_ATT_y,
+	TAG_SVG_ATT_width,
+	TAG_SVG_ATT_height,
+	TAG_SVG_ATT_preserveAspectRatio,
+	TAG_SVG_ATT_initialVisibility,
+	TAG_SVG_ATT_type,
+	TAG_SVG_ATT_cx,
+	TAG_SVG_ATT_cy,
+	TAG_SVG_ATT_r,
+	TAG_SVG_ATT_cursorManager_x,
+	TAG_SVG_ATT_cursorManager_y,
+	TAG_SVG_ATT_rx,
+	TAG_SVG_ATT_ry,
+	TAG_SVG_ATT_horiz_adv_x,
+	TAG_SVG_ATT_horiz_origin_x,
+	TAG_SVG_ATT_font_stretch,
+	TAG_SVG_ATT_unicode_range,
+	TAG_SVG_ATT_panose_1,
+	TAG_SVG_ATT_widths,
+	TAG_SVG_ATT_bbox,
+	TAG_SVG_ATT_units_per_em,
+	TAG_SVG_ATT_stemv,
+	TAG_SVG_ATT_stemh,
+	TAG_SVG_ATT_slope,
+	TAG_SVG_ATT_cap_height,
+	TAG_SVG_ATT_x_height,
+	TAG_SVG_ATT_accent_height,
+	TAG_SVG_ATT_ascent,
+	TAG_SVG_ATT_descent,
+	TAG_SVG_ATT_ideographic,
+	TAG_SVG_ATT_alphabetic,
+	TAG_SVG_ATT_mathematical,
+	TAG_SVG_ATT_hanging,
+	TAG_SVG_ATT_underline_position,
+	TAG_SVG_ATT_underline_thickness,
+	TAG_SVG_ATT_strikethrough_position,
+	TAG_SVG_ATT_strikethrough_thickness,
+	TAG_SVG_ATT_overline_position,
+	TAG_SVG_ATT_overline_thickness,
+	TAG_SVG_ATT_d,
+	TAG_SVG_ATT_unicode,
+	TAG_SVG_ATT_glyph_name,
+	TAG_SVG_ATT_arabic_form,
+	TAG_SVG_ATT_lang,
+	TAG_SVG_ATT_u1,
+	TAG_SVG_ATT_g1,
+	TAG_SVG_ATT_u2,
+	TAG_SVG_ATT_g2,
+	TAG_SVG_ATT_k,
+	TAG_SVG_ATT_opacity,
+	TAG_SVG_ATT_x1,
+	TAG_SVG_ATT_y1,
+	TAG_SVG_ATT_x2,
+	TAG_SVG_ATT_y2,
+	TAG_SVG_ATT_filterUnits,
+	TAG_SVG_ATT_gradientUnits,
+	TAG_SVG_ATT_spreadMethod,
+	TAG_SVG_ATT_gradientTransform,
+	TAG_SVG_ATT_pathLength,
+	TAG_SVG_ATT_points,
+	TAG_SVG_ATT_mediaSize,
+	TAG_SVG_ATT_mediaTime,
+	TAG_SVG_ATT_mediaCharacterEncoding,
+	TAG_SVG_ATT_mediaContentEncodings,
+	TAG_SVG_ATT_bandwidth,
+	TAG_SVG_ATT_fx,
+	TAG_SVG_ATT_fy,
+	TAG_SVG_ATT_size,
+	TAG_SVG_ATT_choice,
+	TAG_SVG_ATT_delta,
+	TAG_SVG_ATT_offset,
+	TAG_SVG_ATT_syncBehaviorDefault,
+	TAG_SVG_ATT_syncToleranceDefault,
+	TAG_SVG_ATT_viewBox,
+	TAG_SVG_ATT_zoomAndPan,
+	TAG_SVG_ATT_version,
+	TAG_SVG_ATT_baseProfile,
+	TAG_SVG_ATT_contentScriptType,
+	TAG_SVG_ATT_snapshotTime,
+	TAG_SVG_ATT_timelineBegin,
+	TAG_SVG_ATT_playbackOrder,
+	TAG_SVG_ATT_editable,
+	TAG_SVG_ATT_text_x,
+	TAG_SVG_ATT_text_y,
+	TAG_SVG_ATT_text_rotate,
+	TAG_SVG_ATT_transformBehavior,
+	TAG_SVG_ATT_overlay,
+	TAG_SVG_ATT_fullscreen,
+	TAG_SVG_ATT_motionTransform,
+
+	TAG_SVG_ATT_filter_transfer_type,
+	TAG_SVG_ATT_filter_table_values,
+	TAG_SVG_ATT_filter_intercept,
+	TAG_SVG_ATT_filter_amplitude,
+	TAG_SVG_ATT_filter_exponent,
+
 
 	TAG_GSVG_ATT_useAsPrimary,
 	TAG_GSVG_ATT_depthOffset,
 	TAG_GSVG_ATT_depthGain,
 };
 
-
+/*! macro for DOM base attribute*/
 #define GF_DOM_BASE_ATTRIBUTE	\
 	u16 tag;	/*attribute identifier*/	\
 	u16 data_type; /*attribute datatype*/	  \
 	void *data; /*data pointer*/				\
 	struct __dom_base_attribute *next; /*next attribute*/
 
+/*! macro for DOM full attribute*/
 #define GF_DOM_FULL_ATTRIBUTE	\
 	GF_DOM_ATTRIBUTE	\
- 
+
+/*! DOM attribute*/
 typedef struct __dom_base_attribute
 {
 	GF_DOM_BASE_ATTRIBUTE
 } GF_DOMAttribute;
 
+/*! DOM full attribute*/
 typedef struct __dom_full_attribute
 {
 	GF_DOM_BASE_ATTRIBUTE
@@ -158,16 +326,19 @@
 	char *name; /*attribute name - in this case, the data field is the attribute literal value*/
 } GF_DOMFullAttribute;
 
+/*! macro for DOM base node*/
 #define GF_DOM_BASE_NODE	 \
 	BASE_NODE				\
 	CHILDREN				\
 	GF_DOMAttribute *attributes;
 
+/*! DOM base node*/
 typedef struct __dom_base_node
 {
 	GF_DOM_BASE_NODE
 } GF_DOMNode;
 
+/*! DOM full node*/
 typedef struct __dom_full_node
 {
 	GF_DOM_BASE_NODE
@@ -175,6 +346,7 @@
 	u32 ns;
 } GF_DOMFullNode;
 
+/*! DOM built-in namespaces*/
 typedef enum
 {
 	/*XMLNS is undefined*/
@@ -192,32 +364,77 @@
 	/*any other namespace uses the CRC32 of the namespace as an identifier*/
 } GF_NamespaceType;
 
-/*returns the built-in XMLNS id for this namespace if known, otherwise returns GF_XMLNS_UNDEFINED*/
+/*! gets built-in XMLNS id for this namespace
+\param name name of the namespace
+\return namespace ID if known, otherwise GF_XMLNS_UNDEFINED*/
 GF_NamespaceType gf_xml_get_namespace_id(char *name);
-
+/*! adds a new namespace
+\param sg the target scene graph
+\param name name of the namespace (full URL)
+\param qname QName of the namespace (short name in doc, eg "ev")
+\return error if any
+*/
 GF_Err gf_sg_add_namespace(GF_SceneGraph *sg, char *name, char *qname);
+/*! removes a new namespace
+\param sg the target scene graph
+\param name name of the namespace
+\param qname QName of the namespace
+\return error if any
+*/
 GF_Err gf_sg_remove_namespace(GF_SceneGraph *sg, char *name, char *qname);
-u32 gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname);
-u32 gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name);
-const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, GF_NamespaceType xmlns_id);
+/*! gets namespace code
+\param sg the target scene graph
+\param qname QName of the namespace
+\return namespace code
+*/
+GF_NamespaceType gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname);
+/*! gets namespace code from name
+\param sg the target scene graph
+\param name name of the namespace
+\return namespace code
+*/
+GF_NamespaceType gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name);
 
-GF_NamespaceType gf_xml_get_element_namespace(GF_Node *n);
+/*! gets namespace qname from ID
+\param sg the target scene graph
+\param xmlns_id ID of the namespace
+\return namespace qname
+*/
+const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, GF_NamespaceType xmlns_id);
+/*! gets namespace from ID
+\param sg the target scene graph
+\param xmlns_id ID of the namespace
+\return namespace name
+*/
 const char *gf_sg_get_namespace(GF_SceneGraph *sg, GF_NamespaceType xmlns_id);
-
+/*! push namespace parsing state
+\param elt the current node being parsed
+*/
 void gf_xml_push_namespaces(GF_DOMNode *elt);
+/*! pop namespace parsing state
+\param elt the current node being parsed
+*/
 void gf_xml_pop_namespaces(GF_DOMNode *elt);
 
+/*! gets namespace of an element
+\param n the target node
+\return namespace ID
+*/
+GF_NamespaceType gf_xml_get_element_namespace(GF_Node *n);
 
 
-
+/*! DOM text node type*/
 enum
 {
+	/*! regular text*/
 	GF_DOM_TEXT_REGULAR = 0,
+	/*! CDATA section*/
 	GF_DOM_TEXT_CDATA,
-	/*inserted text node (typically external script)*/
+	/*! inserted text node (typically external script)*/
 	GF_DOM_TEXT_INSERTED
 };
 
+/*! DOM text node*/
 typedef struct
 {
 	BASE_NODE
@@ -226,18 +443,30 @@
 	u32 type;
 } GF_DOMText;
 
-/*creates a new text node, assign string (does NOT duplicate it) and register node with parent if desired*/
+/*! creates a new text node, assign string (does NOT duplicate it) and register node with parent if desired
+\param parent the target parent node
+\param text_data UTF-8 data to add as a text node
+\return the new inserted DOM text node or NULL if error
+*/
 GF_DOMText *gf_dom_add_text_node(GF_Node *parent, char *text_data);
 
-/*replace text content of node by the specified string - if string is NULL, only resets the children of the node*/
+/*! replaces text content of node by the specified string
+\param n the target DOM node
+\param text the replacement string in UTF-8. If NULL, only resets the children of the node data to add as a text node
+*/
 void gf_dom_set_textContent(GF_Node *n, char *text);
 
-/*flatten text content of the node and returns the result - result shall be free'ed by the caller*/
+/*! flattens text content of the node
+\param n the target DOM node
+\return the flattened text - shall be free'ed by the caller*/
 char *gf_dom_flatten_textContent(GF_Node *n);
 
-/*creates a new text node - this DOES NOT register the node at all*/
+/*! creates a new text node - this DOES NOT register the node
+\param sg the target scene graph for the node
+\return the new text node*/
 GF_DOMText *gf_dom_new_text_node(GF_SceneGraph *sg);
 
+/*! DOM update (DIMS/LASeR) node*/
 typedef struct
 {
 	BASE_NODE
@@ -247,12 +476,13 @@
 	GF_List *updates;
 } GF_DOMUpdates;
 
-/*creates a new updates node and register node with parent*/
+/*! creates a new updates node and register node with parent
+\param parent the target parent node
+\return a new DOM updates node
+*/
 GF_DOMUpdates *gf_dom_add_updates_node(GF_Node *parent);
 
-/*
-	DOM event handling
-*/
+/*! DOM Event phases*/
 typedef enum
 {
 	GF_DOM_EVENT_PHASE_CAPTURE = 1,
@@ -268,7 +498,7 @@
 	GF_DOM_EVENT_PHASE_PREVENT = 1<<7,
 } GF_DOMEventPhase;
 
-/*possible event targets*/
+/*! DOM Event possible targets*/
 typedef enum
 {
 	GF_DOM_EVENT_TARGET_NODE,
@@ -280,17 +510,33 @@
 } GF_DOMEventTargetType;
 
 
-/* Structure representing the DOM EventTarget Interface */
+/*! DOM EventTarget Interface*/
 typedef struct
 {
-	GF_List *listeners;				// list of SVG Listener nodes attached to this Event Target
-	void *ptr;						// pointer to the object implementing the DOM Event Target Interface
-	GF_DOMEventTargetType ptr_type; // type of the object implementing the DOM Event Target Interface
+	/*! list of SVG Listener nodes attached to this Event Target*/
+	GF_List *listeners;
+	/*! pointer to the object implementing the DOM Event Target Interface*/
+	void *ptr;
+	/*! type of the object implementing the DOM Event Target Interface*/
+	GF_DOMEventTargetType ptr_type;
 } GF_DOMEventTarget;
 
+/*! creates a new event target
+\param type the type of the event target
+\param obj opaque data passed to the event target
+\return a new DOM event target
+*/
 GF_DOMEventTarget *gf_dom_event_target_new(GF_DOMEventTargetType type, void *obj);
-GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target);
+/*! associates a listener node and a event target node
+   - adds the listener node in the list of event listener nodes for the target node
+   - sets the target node as the user of the listener
+\param listener the target listener
+\param evt_target the event target
+\return error if any
+*/
+GF_Err gf_sg_listener_associate(GF_Node *listener, GF_DOMEventTarget *evt_target);
 
+/*! DOM Event media information*/
 typedef struct
 {
 	Bool bufferValid;
@@ -301,7 +547,7 @@
 	u64 loaded_size, total_size;
 } GF_DOMMediaEvent;
 
-/* Structure representing a DOM Event */
+/*! DOM Event structure*/
 typedef struct
 {
 	/*event type, as defined in <gpac/events.h>*/
@@ -367,48 +613,71 @@
 	const char *addon_url;
 } GF_DOM_Event;
 
-/*fires event on the specified node
-BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
+/*! fires an event on the specified node
+\warning event execution may very well destroy ANY node, especially the event target node !!
+\param node the target node
+\param event the DOM event
+\return GF_TRUE if event is consumed/aborted after this call, GF_FALSE otherwise (event now pending)
 */
 Bool gf_dom_event_fire(GF_Node *node, GF_DOM_Event *event);
+/*! fires a DOM event on the specified node
+\warning event execution may very well destroy ANY node, especially the event target node !!
+\param et the event target
+\param event the dom event
+\param sg the parent graph
+\param n the event current target, can be NULL
+\return GF_TRUE if event is consumed/aborted after this call, GF_FALSE otherwise (event now pending)
+*/
 Bool gf_sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n);
 
-/*fires event on the specified node
-BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
-use_stack: a list of parent node/use node pairs for bubbling phase - may be NULL
+/*! fires event on the specified node
+\warning event execution may very well destroy ANY node, especially the event target node !!
+\param node the target node
+\param event the DOM event
+\param use_stack a list of parent node/use node pairs for bubbling phase - may be NULL
+\return GF_TRUE if event is consumed/aborted after this call, GF_FALSE otherwise (event now pending)
 */
 Bool gf_dom_event_fire_ex(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack);
 
+/*! gets event type by name
+\param name the event name
+\return the event type*/
 GF_EventType gf_dom_event_type_by_name(const char *name);
+/*! gets event name by type
+\param type the event type
+\return the event name*/
 const char *gf_dom_event_get_name(GF_EventType type);
 
+/*! gets key name by type
+\param key_identifier the key type
+\return the key name*/
 const char *gf_dom_get_key_name(GF_KeyCode key_identifier);
+/*! gets key type by name
+\param key_name the key name
+\return the key type*/
 GF_KeyCode gf_dom_get_key_type(char *key_name);
 
 
-/*listener is simply a node added to the node events list.
+/*! macro for DOM listener
+DOM listener is simply a node added to the node events list.
 Only one observer can be attached to a listener. The listener will remove itself from the observer
 event list when destructed.*/
 #define GF_DOM_BASE_LISTENER 	\
 	/* JavaScript context in which the listener is applicable */ \
-	void *js_context; \
-	/*target EventListener object (this) */ \
-	void *evt_listen_obj; \
-	/*function value for spidermonkey - we cannot use JS_CallFunction since it does not work on closures \
-	we use 64 bits to store the value for portability safety*/\
-	u64 js_fun_val;\
-	/*compiled function for the case were CallFunction is needed*/\
-	void *js_fun; \
+	struct js_handler_context *js_data;\
 	/* text content of the callback */ \
 	char *callback;
 
+/*! DOM Event handler*/
 typedef struct __xml_ev_handler
 {
 	GF_DOM_BASE_NODE
+	/*! handler callback function*/
 	void (*handle_event)(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer);
 	GF_DOM_BASE_LISTENER
 } GF_DOMHandler;
 
+/*! DOM Event category*/
 typedef enum
 {
 	GF_DOM_EVENT_UNKNOWN_CATEGORY,
@@ -440,33 +709,76 @@
 	/*Internal GPAC events*/
 	GF_DOM_EVENT_GPAC = 1<<30,
 	/*fake events - these events are NEVER fired*/
-	GF_DOM_EVENT_FAKE = 1<<31,
+	GF_DOM_EVENT_FAKE = 0x80000000 //1<<31
 } GF_DOMEventCategory;
+
+/*! gets category of DOM event
+\param type type of event
+\return event category
+*/
 GF_DOMEventCategory gf_dom_event_get_category(GF_EventType type);
-u32 gf_sg_get_dom_event_filter(GF_SceneGraph *sg);
-u32 gf_node_get_dom_event_filter(GF_Node *node);
 
+/*! registers an event category with the scene graph. Event with unregistered categories will not be fired
+\param sg the target scene graph
+\param category the DOM event category to add
+*/
 void gf_sg_register_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category);
+/*! unregisters an event category with the scene graph
+\param sg the target scene graph
+\param category the DOM event category to add
+*/
 void gf_sg_unregister_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category);
 
-/*adds a listener to the node.
-The listener node is NOT registered with the node (it may very well not be a direct child of the node)
-@listener is a listenerElement (XML event)
+/*! adds a listener to the node.
+\param n the target node
+\param listener a listenerElement (XML event). The listener node is NOT registered with the node (it may very well not be a direct child of the node)
+\return error if any
+*/
+GF_Err gf_node_dom_listener_add(GF_Node *n, GF_Node *listener);
+/*! gets number of listener of a node
+\param n the target node
+\return number of listeners
+*/
+u32 gf_dom_listener_count(GF_Node *n);
+/*! gets a listener of a node
+\param n the target node
+\param idx 0-based index of the listener to query
+\return listener node or NULL if error
+*/
+GF_Node *gf_dom_listener_get(GF_Node *n, u32 idx);
+
+/*! creates a default listener/handler for the given event on the given node
+Listener/handler are stored at the node level
+\param observer the observer node
+\param event_type the event type
+\param event_param the event parameter
+\return the created handler element to allow for handler function override
 */
-GF_Err gf_node_dom_listener_add(GF_Node *node, GF_Node *listener);
-u32 gf_dom_listener_count(GF_Node *node);
-GF_Node *gf_dom_listener_get(GF_Node *node, u32 i);
-
-/*creates a default listener/handler for the given event on the given node, and return the
-handler element to allow for handler function override
-Listener/handler are stored at the node level*/
 GF_DOMHandler *gf_dom_listener_build(GF_Node *observer, GF_EventType event_type, u32 event_param);
 
-
+/*! registers a XML IRI with the scene graph - this is needed to handle replacement of IRI (SMIL anim, DOM / LASeR updates)
+\warning \ref gf_node_unregister_iri shall be called when the parent node of the IRI is destroyed
+\param sg the target scene graph
+\param iri the IRI to register
+*/
 void gf_node_register_iri(GF_SceneGraph *sg, XMLRI *iri);
+/*! unregisters a XML IRI with the scene graph
+\param sg the target scene graph
+\param iri the IRI to unregister
+*/
 void gf_node_unregister_iri(GF_SceneGraph *sg, XMLRI *iri);
-u32 gf_node_animation_count(GF_Node *node);
+/*! gets number of animation targeting this node
+\param n the target node
+\return the number of animations
+*/
+u32 gf_node_animation_count(GF_Node *n);
 
+/*! writes data embedded in IRI (such as base64 data) to the indicated cahce directory, and updates the IRI accordingly
+\param iri the IRI to store
+\param cache_dir location of the directory to which the data should be extracted
+\param base_filename location of the file the IRI was declared in
+\return error if any
+*/
 GF_Err gf_node_store_embedded_data(XMLRI *iri, const char *cache_dir, const char *base_filename);
 
 
@@ -474,6 +786,7 @@
  *  SVG's styling properties (see 6.1 in REC 1.1) *
  *************************************************/
 
+/*! SVG properties of node*/
 typedef struct {
 	/* Tiny 1.2 properties*/
 	SVG_Paint					*color;
@@ -561,57 +874,177 @@
 	*/
 } SVGPropertiesPointers;
 
-/*************************************
- * Generic SVG element functions     *
- *************************************/
 
+/*! initializes an SVGPropertiesPointers
+\param svg_props pointer to structure to initialize
+*/
 void gf_svg_properties_init_pointers(SVGPropertiesPointers *svg_props);
+/*! resets an SVGPropertiesPointers
+\param svg_props pointer to structure to reset
+*/
 void gf_svg_properties_reset_pointers(SVGPropertiesPointers *svg_props);
 
-void gf_svg_apply_animations(GF_Node *node, SVGPropertiesPointers *render_svg_props);
+/*! applies animations for the node
+\param n the target node
+\param render_svg_props pointer to rendering SVG properties of the node
+*/
+void gf_svg_apply_animations(GF_Node *n, SVGPropertiesPointers *render_svg_props);
+/*! check if appearance flag is set
+\param flags flags to test
+\return GF_TRUE if appearance dirty flag is set
+*/
 Bool gf_svg_has_appearance_flag_dirty(u32 flags);
 
+/*! checks if node tag indicates a transformable elemnt
+\param tag tag to check
+\return GF_TRUE if element is transformable
+*/
 Bool gf_svg_is_element_transformable(u32 tag);
-
+/*! creates an SVG attribute value for the given type
+\param attribute_type type of attribute to delete
+\return newly allocated attribute value*/
 void *gf_svg_create_attribute_value(u32 attribute_type);
-void gf_svg_delete_attribute_value(u32 type, void *value, GF_SceneGraph *sg);
-/* a == b */
+/*! destroys an SVG attribute value
+\param attribute_type type of attribute to delete
+\param value the value to destroy
+\param sg the parent scenegraph (needed for IRI registration)
+*/
+void gf_svg_delete_attribute_value(u32 attribute_type, void *value, GF_SceneGraph *sg);
+
+/*! checks if two SVG attributes are equal
+\param a first attribute
+\param b second attribute
+\return GF_TRUE if equal
+*/
 Bool gf_svg_attributes_equal(GF_FieldInfo *a, GF_FieldInfo *b);
-/* a = b */
+/*! copies attributes (a = b)
+\param a destination attribute
+\param b source attribute
+\param clamp if GF_TRUE, the interpolated value is clamped to its min/max possible values
+\return error if any
+*/
 GF_Err gf_svg_attributes_copy(GF_FieldInfo *a, GF_FieldInfo *b, Bool clamp);
-/* c = a + b */
+/*! adds attributes ( c = a + b)
+\param a first attribute
+\param b second attribute
+\param c destination attribute
+\param clamp if GF_TRUE, the interpolated value is clamped to its min/max possible values
+\return error if any
+ */
 GF_Err gf_svg_attributes_add(GF_FieldInfo *a, GF_FieldInfo *b, GF_FieldInfo *c, Bool clamp);
-Bool gf_svg_attribute_is_interpolatable(u32 type) ;
-/* c = coef * a + (1 - coef) * b */
+/*! checks if attribute type can be interpolated
+\param type attribute type
+\return GF_TRUE if type can be interpolation*/
+Bool gf_svg_attribute_is_interpolatable(u32 type);
+/*! interpolates attributes ( c = coef * a + (1 - coef) * b )
+\param a first attribute
+\param b second attribute
+\param c destination attribute
+\param coef interpolation coeficient
+\param clamp if GF_TRUE, the interpolated value is clamped to its min/max possible values
+\return error if any
+*/
 GF_Err gf_svg_attributes_interpolate(GF_FieldInfo *a, GF_FieldInfo *b, GF_FieldInfo *c, Fixed coef, Bool clamp);
-/* c = alpha * a + beta * b */
+/*! multiply and add attributes (c = alpha * a + beta * b)
+\param a first attribute
+\param alpha first multiplier
+\param b second attribute
+\param beta second multiplier
+\param c destination attribute
+\param clamp if GF_TRUE, the interpolated value is clamped to its min/max possible values
+\return error if any
+*/
 GF_Err gf_svg_attributes_muladd(Fixed alpha, GF_FieldInfo *a, Fixed beta, GF_FieldInfo *b, GF_FieldInfo *c, Bool clamp);
-
-GF_Err gf_node_get_attribute_by_tag(GF_Node *node, u32 attribute_tag, Bool create_if_not_found, Bool set_default, GF_FieldInfo *field);
-
-char *gf_svg_attribute_type_to_string(u32 att_type);
+/*! gets an attribute by its tag (built-in name)
+\param n the target node
+\param attribute_tag the attribute tag
+\param create_if_not_found if GF_TRUE, adds the attribute if not found
+\param set_default if GF_TRUE, sets the attribute to default when creating it
+\param field set to the attribute information
+\return error if any
+*/
+GF_Err gf_node_get_attribute_by_tag(GF_Node *n, u32 attribute_tag, Bool create_if_not_found, Bool set_default, GF_FieldInfo *field);
+
+/*! gets name of an attribute type
+\param att_type the attribute type
+\return the attribute name*/
+const char *gf_svg_attribute_type_to_string(u32 att_type);
+/*! parses an attribute
+\param n the target node
+\param info the attribute information
+\param attribute_content the UTF-8 string to parse
+\param anim_value_type the SMIL animation value type for this attribute, 0 if not animatable
+\return error if any
+*/
 GF_Err gf_svg_parse_attribute(GF_Node *n, GF_FieldInfo *info, char *attribute_content, u8 anim_value_type);
+/*! parses an SVG style
+\param n the target node
+\param style the UTF-8 style string to parse
+*/
 void gf_svg_parse_style(GF_Node *n, char *style);
 
-char *gf_svg_dump_attribute(GF_Node *elt, GF_FieldInfo *info);
-char *gf_svg_dump_attribute_indexed(GF_Node *elt, GF_FieldInfo *info);
+/*! dumps an SVG attribute
+\param n the target node
+\param info the attribute information
+\return the textural representation of the value - shall be destroyed by caller
+*/
+char *gf_svg_dump_attribute(GF_Node *n, GF_FieldInfo *info);
+/*! dumps an SVG indexed attribute (special 1-D version of a N dimensional attribute, used by LASeR and DOM updates)
+\param n the target node
+\param info the attribute information
+\return the textural representation of the value - shall be destroyed by caller
+*/
+char *gf_svg_dump_attribute_indexed(GF_Node *n, GF_FieldInfo *info);
 
+#if USE_GF_PATH
+/*! builds a path from its SVG representation
+\param path a 2D graphical path object
+\param commands a list of SVG path commands
+\param points a list of SVG path points
+*/
 void gf_svg_path_build(GF_Path *path, GF_List *commands, GF_List *points);
-
+#endif
+/*! parses an SVG element ID
+\param n the target node
+\param nodename the node name to parse
+\param warning_if_defined if GF_TRUE, throws a warning when the node name is already defined
+\return error if any
+*/
 GF_Err gf_svg_parse_element_id(GF_Node *n, const char *nodename, Bool warning_if_defined);
 
+/*! gets the name of a paint server type
+\param paint_type the paint server type
+\return paint server name*/
 const char *gf_svg_get_system_paint_server_name(u32 paint_type);
+/*! gets the type of a paint server by name
+\param name the paint server name
+\return paint server type*/
 u32 gf_svg_get_system_paint_server_type(const char *name);
 
-
+/*! notifies the scene time to all the timed elements in the given scene graph (including sub-scenes).
+\param sg the target scene graph
+\return the number of active timed elements, or 0 if no changes in SMIL timing nodes (no redraw/reevaluate needed)
+*/
 Bool gf_smil_notify_timed_elements(GF_SceneGraph *sg);
-void gf_smil_timing_insert_clock(GF_Node *elt, Bool is_end, Double clock);
-
+/*! inserts a new resolved time instant in the begin or end attribute.
+   The insertion preserves the sorting and removes the previous insertions which have become obsolete
+\warning Only used for inserting time when an <a> element, whose target is a timed element, is activated
+\param n the target element
+\param is_end if GF_TRUE, the SMIL clock is an end clock
+\param clock clock time in seconds
+ */
+void gf_smil_timing_insert_clock(GF_Node *n, Bool is_end, Double clock);
+/*! parses a transformation list into a 2D matrix
+\param mat the matrix to fill
+\param attribute_content the UTF8 string representin the SVG transformation
+\return GF_TRUE if success*/
 Bool gf_svg_parse_transformlist(GF_Matrix2D *mat, char *attribute_content);
 
+/*! SMIL runtime timing information*/
 typedef struct _smil_timing_rti SMIL_Timing_RTI;
 
-enum
+/*! SMIL timing evaluation state*/
+typedef enum
 {
 	SMIL_TIMING_EVAL_NONE = 0,
 	SMIL_TIMING_EVAL_UPDATE,
@@ -624,16 +1057,39 @@
 	SMIL_TIMING_EVAL_ACTIVATE,
 	/*signaled the animation element has been removed from the DOM tree*/
 	SMIL_TIMING_EVAL_DEACTIVATE,
-};
-
-void gf_smil_set_evaluation_callback(GF_Node *smil_time,
-                                     void (*smil_evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state));
+} GF_SGSMILTimingEvalState;
 
+/*! SMIL timing evaluation callback
+\param rti SMIL runtime info
+\param normalized_simple_time SMIL normalized time
+\param state SMIL evaluation state
+*/
+typedef void gf_sg_smil_evaluate(struct _smil_timing_rti *rti, Fixed normalized_simple_time, GF_SGSMILTimingEvalState state);
+/*! sets the SMIL evaluation callback for a node
+\param smil_time the target SMIL node
+\param smil_evaluate the callback function
+*/
+void gf_smil_set_evaluation_callback(GF_Node *smil_time, gf_sg_smil_evaluate smil_evaluate);
+/*! assigns media duration for a SMIL node
+\param rti the target SMIL runtime info of the node
+\param media_duration the media duration in seconds*/
 void gf_smil_set_media_duration(SMIL_Timing_RTI *rti, Double media_duration);
+/*! gets media duration of a SMIL node
+\param rti the target SMIL runtime info of the node
+\return the media duration in seconds*/
 Double gf_smil_get_media_duration(SMIL_Timing_RTI *rti);
+/*! gets node from a SMIL runtime info
+\param rti the target SMIL runtime info of the node
+\return the associated node*/
 GF_Node *gf_smil_get_element(SMIL_Timing_RTI *rti);
-
+/*! checks if a SMIL node is active
+\param node the target node
+\return GF_TRUE if node is active*/
 Bool gf_smil_timing_is_active(GF_Node *node);
+/*! notifies a SMIL node that it has been modified
+\param node the target SMIL node
+\param field the field information describing the modified attribute, may be NULL
+*/
 void gf_smil_timing_modified(GF_Node *node, GF_FieldInfo *field);
 
 /*******************************************************************************
@@ -643,25 +1099,61 @@
  *******************************************************************************/
 
 /*SVG attributes are just DOM ones*/
+/*! SVG attribute - same as DOM attribute*/
 typedef struct __dom_base_attribute SVGAttribute;
+/*! SVG extended attribute - same as DOM extended attribute*/
 typedef struct __dom_full_attribute SVGExtendedAttribute;
+/*! SVG node - same as DOM node*/
 typedef struct __dom_base_node SVG_Element;
-
+/*! SVG handler node - same as DOM Event handler*/
 typedef struct __xml_ev_handler SVG_handlerElement;
-
-
+/*! SVG all attributes*/
 typedef struct _all_atts SVGAllAttributes;
 
-void gf_svg_flatten_attributes(SVG_Element *e, SVGAllAttributes *all_atts);
-const char *gf_svg_get_attribute_name(GF_Node *elt, u32 tag);
+/*! flattens all SVG attributes in a structure
+\param n the target SVG node
+\param all_atts filled with all SVG attributes defined fo node
+*/
+void gf_svg_flatten_attributes(SVG_Element *n, SVGAllAttributes *all_atts);
+/*! gets SVG attribute name for a node
+\param n the target SVG node
+\param tag the attribute tag
+\return the attribute name
+*/
+const char *gf_svg_get_attribute_name(GF_Node *n, u32 tag);
+/*! applies inheritance of SVG attributes to a render_svg_props
+\note Some properties (audio-level, display, opacity, solid*, stop*, vector-effect, viewport*) are inherited only when they are specified with the value 'inherit' otherwise they default to their initial value which for the function below means NULL, the compositor will take care of the rest
+
+\param all_atts the flatten SVG attributes of the node
+\param render_svg_props the set of properties applying to the parent node (initialize this one to 0 for root element)
+\return the set of inherited flags (from node dirty flags)
+*/
 u32 gf_svg_apply_inheritance(SVGAllAttributes *all_atts, SVGPropertiesPointers *render_svg_props) ;
 
-/*creates a DOMAttribute for the given tag - THE ATTRIOBUTE IS NOT ADDED TO THE NODE'S ATTRIBUTES*/
-GF_DOMAttribute *gf_xml_create_attribute(GF_Node *node, u32 tag);
+/*! creates a DOM Attribute for the given tag
+\warning the attribute is not added to the node's attributes
+\param n the target node
+\param tag the target built-in tag
+\return a new DOM Attribute
+*/
+GF_DOMAttribute *gf_xml_create_attribute(GF_Node *n, u32 tag);
+/*! gets the type of a built-in XML/SVG/SMIL attribute tag
+\param tag the target attribute tag
+\return the attribute type*/
 u32 gf_xml_get_attribute_type(u32 tag);
-u32 gf_xml_get_attribute_tag(GF_Node *node, char *attribute_name, u32 ns);
 
-u32 gf_xml_get_element_tag(const char *element_name, u32 xmlns);
+/*! gets the built-in tag of a node's attribute
+\param n the target node
+\param attribute_name the target attribute name
+\param ns the target namespace
+\return the attribute tag*/
+u32 gf_xml_get_attribute_tag(GF_Node *n, char *attribute_name, GF_NamespaceType ns);
+
+/*! gets the built-in tag of a node
+\param node_name the target node name
+\param xmlns the target namespace
+\return the node tag*/
+u32 gf_xml_get_element_tag(const char *node_name, u32 xmlns);
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/scenegraph_vrml.h -> gpac-1.0.0.tar.gz/include/gpac/scenegraph_vrml.h Changed

gpac-0.8.0.tar.gz/include/gpac/setup.h -> gpac-1.0.0.tar.gz/include/gpac/setup.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / general OS configuration file
@@ -31,20 +31,25 @@
 #endif
 
 
-/*! \file "gpac/setup.h"
- *	\brief base data types of GPAC.
- *
- * This file contains the base data types of GPAC, depending on the platform.
+/*!
+\file "gpac/setup.h"
+\brief Base data types of GPAC.
+
+This file contains the base data types of GPAC, depending on the platform.
+
+
 */
 
-/*! \addtogroup setup_grp base data types
- *	\ingroup utils_grp
- *	\brief Base data types of GPAC.
- *
- *	This section documents the base data types of GPAC.
- *	@{
- */
 
+/*!
+\addtogroup setup_grp
+\brief Base data types of GPAC.
+
+This section documents the base data types of GPAC, as well as some macros wrapping platform-specific functionalities.
+For better portability, only use the base data types defined here.
+
+@{
+*/
 
 /*This is to handle cases where config.h is generated at the root of the gpac build tree (./configure)
 This is only needed when building libgpac and modules when libgpac is not installed*/
@@ -64,25 +69,38 @@
 #include <stddef.h>
 
 #if defined(_WIN64) && !defined(GPAC_64_BITS)
+/*! macro defined for 64-bits platforms*/
 #define GPAC_64_BITS
 #endif
 
+/*! 64 bit unsigned integer*/
 typedef unsigned __int64 u64;
-typedef unsigned int u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
+/*! 64 bit signed integer*/
 typedef __int64 s64;
+/*! 32 bit unsigned integer*/
+typedef unsigned int u32;
+/*! 32 bit signed integer*/
 typedef int s32;
+/*! 16 bit unsigned integer*/
+typedef unsigned short u16;
+/*! 16 bit signed integer*/
 typedef short s16;
+/*! 8 bit unsigned integer*/
+typedef unsigned char u8;
+/*! 8 bit signed integer*/
 typedef char s8;
 
 #if defined(__GNUC__)
+/*! macro for cross-platform inlining of functions*/
 #define GFINLINE inline
 #else
+/*! macro for cross-platform inlining of functions*/
 #define GFINLINE __inline
 #endif
 
+/*! default path separator of the current platform*/
 #define GF_PATH_SEPARATOR	'\\'
+/*! default max filesystem path size of the current platform*/
 #define GF_MAX_PATH	1024
 
 /*WINCE config*/
@@ -90,9 +108,7 @@
 
 /*win32 assert*/
 #ifndef assert
-
 void CE_Assert(u32 valid, char *file, u32 line);
-
 #ifndef NDEBUG
 #define assert( t )	CE_Assert((unsigned int) (t), __FILE__, __LINE__ )
 #else
@@ -159,10 +175,14 @@
 /*start SYMBIAN config*/
 #elif defined(__SYMBIAN32__)
 
+/*! macro for cross-platform inlining of functions*/
 #define GFINLINE inline
+/*! default path separator of the current platform*/
 #define GF_PATH_SEPARATOR	'\\'
 
 /*we must explicitely export our functions...*/
+
+/*! macro for cross-platform signaling of exported function of libgpac*/
 #define GF_EXPORT EXPORT_C
 
 #include <stdio.h>
@@ -176,7 +196,9 @@
 
 #ifdef __SERIES60_3X__
 
+/*! 64 bit unsigned integer*/
 typedef unsigned __int64 u64;
+/*! 64 bit signed integer*/
 typedef __int64 s64;
 
 #else
@@ -187,21 +209,30 @@
 typedef long long s64;
 */
 
+/*! 64 bit unsigned integer*/
 typedef unsigned int u64;
+/*! 64 bit signed integer*/
 typedef signed int s64;
 
 #endif	/*symbian 8*/
 
 
+/*! 32 bit unsigned integer*/
 typedef unsigned int u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
+/*! 32 bit signed integer*/
 typedef int s32;
+/*! 16 bit unsigned integer*/
+typedef unsigned short u16;
+/*! 16 bit signed integer*/
 typedef short s16;
+/*! 8 bit unsigned integer*/
+typedef unsigned char u8;
+/*! 8 bit signed integer*/
 typedef signed char s8;
 
 #pragma mpwc_relax on
 
+/*! default max filesystem path size of the current platform*/
 #define GF_MAX_PATH	260
 
 /*sorry this was developed under w32 :)*/
@@ -238,13 +269,15 @@
 
 /*UNIX likes*/
 
-/*force large file support*/
+/*! max file offset bits*/
 #ifndef _FILE_OFFSET_BITS
 #define _FILE_OFFSET_BITS 64
 #endif
+/*! largefile*/
 #ifndef _LARGEFILE_SOURCE
 #define _LARGEFILE_SOURCE
 #endif
+/*! largefile64*/
 #ifndef _LARGEFILE64_SOURCE
 #define _LARGEFILE64_SOURCE
 #endif
@@ -260,202 +293,245 @@
 #include <string.h>
 #include <assert.h>
 
-#if __APPLE__ && defined GPAC_IPHONE
+#if __APPLE__ && defined GPAC_CONFIG_IOS
 #include <TargetConditionals.h>
 #endif
 
+/*! 64 bit unsigned integer*/
 typedef uint64_t u64;
-typedef uint32_t u32;
-typedef uint16_t u16;
-typedef uint8_t u8;
+/*! 64 bit signed integer*/
 typedef int64_t s64;
+/*! 32 bit unsigned integer*/
+typedef uint32_t u32;
+/*! 32 bit signed integer*/
 typedef int32_t s32;
+/*! 16 bit unsigned integer*/
+typedef uint16_t u16;
+/*! 16 bit signed integer*/
 typedef int16_t s16;
+/*! 8 bit unsigned integer*/
+typedef uint8_t u8;
+/*! 8 bit signed integer*/
 typedef int8_t s8;
 
+/*! macro for cross-platform inlining of functions*/
 #define GFINLINE	inline
 
-/*sorry this was developed under w32 :)*/
+/*! use stricmp */
 #define stricmp		strcasecmp
+/*! use strnicmp */
 #define strnicmp	strncasecmp
 
 #ifndef strupr
-char * my_str_upr(char *str);
+/*! gets upper case
+\param str input string
+\return uper case to free*/
+char *my_str_upr(char *str);
+/*! use strupr */
 #define strupr my_str_upr
 #endif
 
 #ifndef strlwr
+/*! gets lower case
+\param str input string
+\return lower case to free*/
 char * my_str_lwr(char *str);
+/*! use strulwr */
 #define strlwr my_str_lwr
 #endif
 
+/*! default path separator of the current platform*/
 #define GF_PATH_SEPARATOR	'/'
 
 #ifdef PATH_MAX
+/*! default max filesystem path size of the current platform*/
 #define GF_MAX_PATH	PATH_MAX
 #else
-/*PATH_MAX not defined*/
+/*! default max filesystem path size of the current platform*/
 #define GF_MAX_PATH	1023
 #endif
 
 
 #endif /* end platform specific Win32/WinCE/UNIX*/
 
+
+//! @cond Doxygen_Suppress
+
 /*define what's missing*/
+
 #ifndef NULL
 #define NULL 0
 #endif
 
+//! @endcond
+
 
+/*! Double-precision floating point number*/
 typedef double Double;
+/*! Single-precision floating point number*/
 typedef float Float;
-/* 128 bit IDs */
+/*! 128 bit IDs */
 typedef u8 bin128[16];
-
+/*! max positive possible value for Double*/
 #define GF_MAX_DOUBLE		DBL_MAX
+/*! max negative possible value for Double*/
 #define GF_MIN_DOUBLE		-GF_MAX_DOUBLE
+/*! max positive possible value for Float*/
 #define GF_MAX_FLOAT		FLT_MAX
+/*! max negative possible value for Float*/
 #define GF_MIN_FLOAT		-GF_MAX_FLOAT
+/*! smallest possible value for float*/
 #define GF_EPSILON_FLOAT	FLT_EPSILON
+/*! max possible value for s16*/
 #define GF_SHORT_MAX		SHRT_MAX
+/*! min possible value for s16*/
 #define GF_SHORT_MIN		SHRT_MIN
+/*! max possible value for u32*/
 #define GF_UINT_MAX			UINT_MAX
+/*! max possible value for s32*/
 #define GF_INT_MAX			INT_MAX
+/*! min possible value for s32*/
 #define GF_INT_MIN			INT_MIN
 
 #ifndef MIN
+/*! get the smallest of two numbers*/
 #define MIN(X, Y) ((X)<(Y)?(X):(Y))
 #endif
 #ifndef MAX
+/*! get the biggest of two numbers*/
 #define MAX(X, Y) ((X)>(Y)?(X):(Y))
 #endif
 
+/*! get the absolute difference betwee two numbers*/
 #define ABSDIFF(a, b)	( ( (a) > (b) ) ? ((a) - (b)) : ((b) - (a)) )
 
 #ifndef ABS
+/*! get the absolute value of a number*/
 #define ABS(a)	( ( (a) > 0 ) ? (a) : - (a) )
 #endif
 
 #ifndef Bool
+/*! boolean value*/
 typedef enum {
 	GF_FALSE = 0,
 	GF_TRUE
 } Bool;
 #endif
 
+/*! 32 bit fraction*/
 typedef struct {
-	s64 num;
-	u64 den;
+	s32 num;
+	u32 den;
 } GF_Fraction;
 
-/*GPAC memory tracking*/
-#if defined(GPAC_MEMORY_TRACKING)
-
-void *gf_mem_malloc(size_t size, const char *filename, int line);
-void *gf_mem_calloc(size_t num, size_t size_of, const char *filename, int line);
-void *gf_mem_realloc(void *ptr, size_t size, const char *filename, int line);
-void gf_mem_free(void *ptr, const char *filename, int line);
-char *gf_mem_strdup(const char *str, const char *filename, int line);
-void gf_memory_print(void); /*prints the state of current allocations*/
-u64 gf_memory_size(); /*gets memory allocated in bytes*/
-
-#define gf_free(ptr) gf_mem_free(ptr, __FILE__, __LINE__)
-#define gf_malloc(size) gf_mem_malloc(size, __FILE__, __LINE__)
-#define gf_calloc(num, size_of) gf_mem_calloc(num, size_of, __FILE__, __LINE__)
-#define gf_strdup(s) gf_mem_strdup(s, __FILE__, __LINE__)
-#define gf_realloc(ptr1, size) gf_mem_realloc(ptr1, size, __FILE__, __LINE__)
-
-#else
-
-void* gf_malloc(size_t size);
-void* gf_calloc(size_t num, size_t size_of);
-void* gf_realloc(void *ptr, size_t size);
-void gf_free(void *ptr);
-char* gf_strdup(const char *str);
-
-#endif
-
-
-/*end GPAC memory tracking*/
+/*! 64 bit fraction*/
+typedef struct {
+	s64 num;
+	u64 den;
+} GF_Fraction64;
 
 #if (defined (WIN32) || defined (_WIN32_WCE)) && (defined(__MINGW32__) || !defined(__GNUC__))
 
-#define LLD "%I64d"
-#define LLU "%I64u"
-#define LLX "%I64x"
-#define LLXPAD( pad ) "%" pad "I64x"
-#define LLD_CAST
-#define LLU_CAST
+/*! macro for cross-platform suffix used for formating 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*/
+#define LLU_SUF "I64u"
+/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "I64x"
+
 #ifdef _WIN64
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u64)
 #else
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u32)
 #endif
 
 #elif defined (__SYMBIAN32__)
 
-#define LLD "%d"
-#define LLU "%u"
-#define LLX "%x"
-#define LLXPAD( pad ) "%" pad "x"
-#define LLD_CAST (u32)
-#define LLU_CAST (s32)
+/*! macro for cross-platform suffix used for formating 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*/
+#define LLU_SUF "u"
+/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "x"
+
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u32)
 
 /*seems that even though _LP64 is defined in OSX, %ll modifiers are still needed*/
 #elif defined(__DARWIN__) || defined(__APPLE__)
 
-#define LLD "%lld"
-#define LLU "%llu"
-#define LLX "%llx"
-#define LLXPAD( pad ) "%" pad "llx"
+/*! macro for cross-platform suffix used for formating 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*/
+#define LLU_SUF "llu"
+/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "llx"
 
 #ifdef __LP64__ /* Mac OS 64 bits */
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u64)
 #else
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u32)
 #endif
 
 #elif defined(_LP64) /*Unix 64 bits*/
 
-#define LLD "%ld"
-#define LLU "%lu"
-#define LLX "%lx"
-#define LLXPAD( pad ) "%" pad "lx"
+/*! macro for cross-platform suffix used for formating 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*/
+#define LLU_SUF "lu"
+/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "lx"
+
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST (u64)
 
 #else /*Unix 32 bits*/
 
-#define LLD "%lld"
-#define LLU "%llu"
-#define LLX "%llx"
-#define LLXPAD( pad ) "%" pad "llx"
-#define PTR_TO_U_CAST (u32)
+/*! macro for cross-platform suffix used for formating 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*/
+#define LLU_SUF "llu"
+/*! macro for cross-platform suffix used for formating u64 integers as hex in logs and printf routines*/
+#define LLX_SUF "llx"
 
-#endif
-
-#ifndef LLD_CAST
-#define LLD_CAST
-#endif
+/*! macro for cross-platform casting a pointer to an integer*/
+#define PTR_TO_U_CAST (u32)
 
-#ifndef LLU_CAST
-#define LLU_CAST
 #endif
 
 #ifndef PTR_TO_U_CAST
+/*! macro for cross-platform casting a pointer to an integer*/
 #define PTR_TO_U_CAST
 #endif
 
+/*! macro for cross-platform formatting of s64 integers in logs and printf routines*/
+#define LLD "%"LLD_SUF
+/*! macro for cross-platform formatting of u64 integers in logs and printf routines*/
+#define LLU "%"LLU_SUF
+/*! macro for cross-platform formatting of u64 integers as hexadecimal in logs and printf routines*/
+#define LLX "%"LLX_SUF
+
+
 #if !defined(GF_EXPORT)
-#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(GPAC_IPHONE)
+#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(GPAC_CONFIG_IOS)
+/*! macro for cross-platform signaling of exported function of libgpac*/
 #define GF_EXPORT __attribute__((visibility("default")))
 #else
 /*use def files for windows or let compiler decide*/
+
+/*! macro for cross-platform signaling of exported function of libgpac*/
 #define GF_EXPORT
 #endif
 #endif
 
-#if defined(GPAC_IPHONE)
+
+//! @cond Doxygen_Suppress
+
+#if defined(GPAC_CONFIG_IOS)
 #define GPAC_STATIC_MODULES
 #endif
 
@@ -498,12 +574,6 @@
 # ifndef GPAC_DISABLE_ISOM_HINTING
 # define GPAC_DISABLE_ISOM_HINTING
 # endif
-# ifndef GPAC_DISABLE_MEDIA_IMPORT
-# define GPAC_DISABLE_MEDIA_IMPORT
-# endif
-# ifndef GPAC_DISABLE_MPEG2TS_MUX
-# define GPAC_DISABLE_MPEG2TS_MUX
-# endif
 #endif
 
 #ifdef GPAC_DISABLE_ISOM
@@ -566,14 +636,92 @@
 # endif
 #endif
 
-#if !defined(GPAC_HAS_SPIDERMONKEY) || defined(GPAC_DISABLE_SVG)
-# ifndef GPAC_DISABLE_MSE
-# define GPAC_DISABLE_MSE
-# endif
+//we currently disable all extra IPMP/IPMPX/OCI/extra MPEG-4 descriptors parsing
+#ifndef GPAC_MINIMAL_ODF
+#define GPAC_MINIMAL_ODF
 #endif
 
+//define this to remove most of built-in doc of libgpac - for now filter description and help is removed, but argument help is not
+//#define GPAC_DISABLE_DOC
+
+
+//! @endcond
+
 /*! @} */
 
+/*!
+\addtogroup mem_grp
+\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.
+
+\warning these functions shall only be used after initializing the library using \ref gf_sys_init
+@{
+*/
+/*GPAC memory tracking*/
+#if defined(GPAC_MEMORY_TRACKING)
+
+
+void *gf_mem_malloc(size_t size, const char *filename, int line);
+void *gf_mem_calloc(size_t num, size_t size_of, const char *filename, int line);
+void *gf_mem_realloc(void *ptr, size_t size, const char *filename, int line);
+void gf_mem_free(void *ptr, const char *filename, int line);
+char *gf_mem_strdup(const char *str, const char *filename, int line);
+void gf_memory_print(void); /*prints the state of current allocations*/
+u64 gf_memory_size(); /*gets memory allocated in bytes*/
+
+/*! free memory allocated with gpac*/
+#define gf_free(ptr) gf_mem_free(ptr, __FILE__, __LINE__)
+/*! allocates memory, shall be freed using \ref gf_free*/
+#define gf_malloc(size) gf_mem_malloc(size, __FILE__, __LINE__)
+/*! allocates memory array, shall be freed using \ref gf_free*/
+#define gf_calloc(num, size_of) gf_mem_calloc(num, size_of, __FILE__, __LINE__)
+/*! duplicates string, shall be freed using \ref gf_free*/
+#define gf_strdup(s) gf_mem_strdup(s, __FILE__, __LINE__)
+/*! reallocates memory, shall be freed using \ref gf_free*/
+#define gf_realloc(ptr1, size) gf_mem_realloc(ptr1, size, __FILE__, __LINE__)
+
+#else
+
+/*! free memory allocated with gpac
+\param ptr same as free()
+*/
+void gf_free(void *ptr);
+
+/*! allocates memory, shall be freed using \ref gf_free
+\param size same as malloc()
+\return adress 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
+*/
+void* gf_calloc(size_t num, size_t size_of);
+
+/*! duplicates string, shall be freed using \ref gf_free
+\param str same as strdup()
+\return duplicated string
+*/
+char* gf_strdup(const char *str);
+
+/*! reallocates memory, shall be freed using \ref gf_free
+\param ptr same as realloc()
+\param size same as realloc()
+\return adress of reallocated block
+*/
+void* gf_realloc(void *ptr, size_t size);
+
+#endif
+/*! @} */
+
+
+/*end GPAC memory tracking*/
+
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.8.0.tar.gz/include/gpac/svg_types.h -> gpac-1.0.0.tar.gz/include/gpac/svg_types.h Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2019
  *			All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -31,17 +31,18 @@
 #endif
 
 /*!
- *	\file <gpac/svg_types.h>
- *	\brief Data types used for SVG scene graph
- */
+\file <gpac/svg_types.h>
+\brief Data types used for SVG scene graph
+*/
 	
 /*!
- *	\ingroup ssvg
- *	\brief Data types used for SVG scene graph.
- *
- *This section documents the data types used for SVG scene graph.
- *	@{
- */
+\ingroup ssvg
+\brief Data types used for SVG scene graph.
+
+This section documents the data types used for SVG scene graph.
+
+@{
+*/
 
 #include <gpac/path2d.h>
 #include <gpac/events_constants.h>
@@ -65,7 +66,7 @@
 	on_event_in:	unused in SVG
 */
 
-/* SVG attribute types */
+/*! SVG attribute types */
 enum {
 	SVG_Unknown_datatype					= 0,
 
@@ -173,8 +174,11 @@
 	/*LASeR types*/
 	LASeR_Choice_datatype,
 	LASeR_Size_datatype,
+
+	SVG_Matrix2D_datatype,
 };
 
+//! @cond Doxygen_Suppress
 /* Definition of SVG base data types */
 typedef char *DOM_String;
 typedef DOM_String SVG_String;
@@ -208,7 +212,10 @@
 
 typedef GF_Matrix2D SVG_Motion;
 
-/* SMIL Anim types */
+//! @endcond
+
+
+/*! SMIL Anim types */
 typedef struct {
 	/*field type*/
 	u32 type;
@@ -220,6 +227,7 @@
 	u32 tag;
 } SMIL_AttributeName;
 
+/*! SMIL time types */
 enum {
 	/*clock time*/
 	GF_SMIL_TIME_CLOCK			= 0,
@@ -233,9 +241,12 @@
 	GF_SMIL_TIME_INDEFINITE		= 4,
 };
 
+/*! macro to check if a SMIL time is a clock value*/
 #define GF_SMIL_TIME_IS_CLOCK(v) (v<=GF_SMIL_TIME_EVENT_RESOLVED)
+/*! macro to check if a SMIL time is a resolved clock value*/
 #define GF_SMIL_TIME_IS_SPECIFIED_CLOCK(v) (v<GF_SMIL_TIME_EVENT_RESOLVED)
 
+/*! XML event*/
 typedef struct
 {
 	GF_EventType type;
@@ -243,6 +254,7 @@
 	u32 parameter;
 } XMLEV_Event;
 
+/*! SMIL time*/
 typedef struct {
 	/* Type of timing value*/
 	u8 type;
@@ -265,6 +277,7 @@
 
 } SMIL_Time;
 
+/*! SMIL duration types */
 enum {
 	SMIL_DURATION_AUTO  = 0,
 	SMIL_DURATION_INDEFINITE,
@@ -272,58 +285,72 @@
 	SMIL_DURATION_NONE,
 	SMIL_DURATION_DEFINED,
 };
+/*! SMIL duration*/
 typedef struct {
 	u8 type;
 	Double clock_value;
 } SMIL_Duration;
 
+/*! SMIL retart types */
 enum {
 	SMIL_RESTART_ALWAYS = 0,
 	SMIL_RESTART_NEVER,
 	SMIL_RESTART_WHENNOTACTIVE,
 };
+/*! SMIL restart*/
 typedef u8 SMIL_Restart;
 
+/*! SMIL fill types */
 enum {
 	SMIL_FILL_FREEZE=0,
 	SMIL_FILL_REMOVE,
 
 };
+/*! SMIL fill*/
 typedef u8 SMIL_Fill;
 
+/*! SMIL repeatcount types */
 enum {
 	SMIL_REPEATCOUNT_INDEFINITE  = 0,
 	SMIL_REPEATCOUNT_DEFINED	 = 1,
 	/* used only for static allocation of SVG attributes */
 	SMIL_REPEATCOUNT_UNSPECIFIED = 2
 };
+/*! SMIL repeat count*/
 typedef struct {
 	u8 type;
 	Fixed count;
 } SMIL_RepeatCount;
 
+/*! SMIL animate value*/
 typedef struct {
 	u8 type;
 	void *value;
 } SMIL_AnimateValue;
 
+/*! SMIL animate values*/
 typedef struct {
-	u8 type;
+	u8 type, laser_strings;
 	GF_List *values;
 } SMIL_AnimateValues;
 
+/*! SMIL additive types */
 enum {
 	SMIL_ADDITIVE_REPLACE = 0,
 	SMIL_ADDITIVE_SUM
 };
+/*! SMIL additive*/
 typedef u8 SMIL_Additive;
 
+/*! SMIL accumulate types */
 enum {
 	SMIL_ACCUMULATE_NONE = 0,
 	SMIL_ACCUMULATE_SUM
 };
+/*! SMIL accumulate*/
 typedef u8 SMIL_Accumulate;
 
+/*! SMIL calcmode types */
 enum {
 	/*WARNING: default value is linear, order changed for LASeR coding*/
 	SMIL_CALCMODE_DISCRETE = 0,
@@ -331,24 +358,31 @@
 	SMIL_CALCMODE_PACED,
 	SMIL_CALCMODE_SPLINE
 };
+/*! SMIL calc mode*/
 typedef u8 SMIL_CalcMode;
 /* end of SMIL Anim types */
 
+/*! XMLRI types */
 enum {
 	XMLRI_ELEMENTID = 0,
 	XMLRI_STRING,
 	XMLRI_STREAMID
 };
+/*! XMLRI object*/
 typedef struct __xml_ri {
 	u8 type;
 	char *string;
 	void *target;
 	u32 lsr_stream_id;
+	u32 node_id;
 } XMLRI;
 
-/*the same structure is used to watch for IDREF changes (LASeR node replace)*/
+/*! XML IDREF object
+	Note: the same structure is used to watch for IDREF changes (LASeR node replace)
+*/
 typedef struct __xml_ri XML_IDREF;
 
+/*! SVG focus types */
 enum
 {
 	SVG_FOCUS_AUTO = 0,
@@ -356,31 +390,38 @@
 	SVG_FOCUS_IRI,
 };
 
+/*! SVG focus attribute*/
 typedef struct
 {
 	u8 type;
 	XMLRI target;
 } SVG_Focus;
 
+/*! SVG fontfamiliy types */
 enum {
 	SVG_FONTFAMILY_INHERIT = 0,
 	SVG_FONTFAMILY_VALUE
 };
 
+/*! SVG font attribute*/
 typedef struct {
 	u8 type;
 	SVG_String value;
 } SVG_FontFamily;
 
+/*! SVG fontstyle types */
 enum {
 	SVG_FONTSTYLE_INHERIT = 0,
 	SVG_FONTSTYLE_ITALIC = 1,
 	SVG_FONTSTYLE_NORMAL = 2,
 	SVG_FONTSTYLE_OBLIQUE = 3
 };
+/*! SVG fontstyle attribute*/
 typedef u8 SVG_FontStyle;
 
-/*the values are chosen to match LASeR code points*/
+/*! SVG path commands types
+\note the values are chosen to match LASeR code points
+*/
 enum {
 	SVG_PATHCOMMAND_M = 3,
 	SVG_PATHCOMMAND_L = 2,
@@ -392,57 +433,70 @@
 	SVG_PATHCOMMAND_Z = 8
 };
 
+/*! macros to use GF_Path directly as SVG path*/
 #define USE_GF_PATH 1
 
 #if USE_GF_PATH
+/*! SVG path data*/
 typedef GF_Path SVG_PathData;
 #else
+/*! SVG path data*/
 typedef struct {
 	GF_List *commands;
 	GF_List *points;
 } SVG_PathData;
 #endif
 
+/*! SVG point*/
 typedef struct {
 	Fixed x, y;
 } SVG_Point;
 
+/*! SVG point+angle*/
 typedef struct {
 	Fixed x, y, angle;
 } SVG_Point_Angle;
 
+/*! SVG ViewBox*/
 typedef struct {
 	Bool is_set;
 	Fixed x, y, width, height;
 } SVG_ViewBox;
 
+/*! SVG Boolean*/
 typedef Bool SVG_Boolean;
 
-/*WARNING - THESE ARE PATH FLAGS, CHECK IF WORKING*/
+/*! SVG fill rule types */
 enum {
 	SVG_FILLRULE_EVENODD= 0,
 	SVG_FILLRULE_NONZERO,
 	SVG_FILLRULE_INHERIT
 };
+/*! SVG fill rule*/
 typedef u8 SVG_FillRule;
 
+/*! SVG stroke line join types */
 enum {
 	SVG_STROKELINEJOIN_MITER = GF_LINE_JOIN_MITER_SVG,
 	SVG_STROKELINEJOIN_ROUND = GF_LINE_JOIN_ROUND,
 	SVG_STROKELINEJOIN_BEVEL = GF_LINE_JOIN_BEVEL,
 	SVG_STROKELINEJOIN_INHERIT = 100
 };
+/*! SVG stroke line join*/
 typedef u8 SVG_StrokeLineJoin;
 
-/* Warning: GPAC naming is not the same as SVG naming for line cap Flat = butt and Butt = square*/
+/*! SVG stroke line cap types
+\warning GPAC naming is not the same as SVG naming for line cap Flat = butt and Butt = square*/
 enum {
 	SVG_STROKELINECAP_BUTT = GF_LINE_CAP_FLAT,
 	SVG_STROKELINECAP_ROUND = GF_LINE_CAP_ROUND,
 	SVG_STROKELINECAP_SQUARE = GF_LINE_CAP_SQUARE,
 	SVG_STROKELINECAP_INHERIT = 100
 };
+/*! SVG stroke line cap*/
 typedef u8 SVG_StrokeLineCap;
 
+/*! SVG overflow types */
 enum {
 	SVG_OVERFLOW_INHERIT	= 0,
 	SVG_OVERFLOW_VISIBLE	= 1,
@@ -450,8 +504,10 @@
 	SVG_OVERFLOW_SCROLL		= 3,
 	SVG_OVERFLOW_AUTO		= 4
 };
+/*! SVG overflow*/
 typedef u8 SVG_Overflow;
 
+/*! SVG color types */
 enum {
 	SVG_COLOR_RGBCOLOR = 0,
 	SVG_COLOR_INHERIT,
@@ -486,11 +542,13 @@
 	SVG_COLOR_WINDOW_TEXT /* Text in windows.*/
 };
 
+/*! SVG color*/
 typedef struct {
 	u8 type;
 	Fixed red, green, blue;
 } SVG_Color;
 
+/*! SVG paint types */
 enum {
 	SVG_PAINT_NONE		= 0,
 	SVG_PAINT_COLOR		= 1,
@@ -498,12 +556,18 @@
 	SVG_PAINT_INHERIT	= 3
 };
 
-typedef struct {
+/*! SVG paint attribute*/
+struct __svg_color{
 	u8 type;
 	SVG_Color color;
 	XMLRI iri;
-} SVG_Paint, SVG_SVGColor;
+};
+/*! SVG paint attribute*/
+typedef struct __svg_color SVG_Paint;
+/*! SVG color attribute*/
+typedef struct __svg_color SVG_SVGColor;
 
+/*! SVG number types */
 enum {
 	SVG_NUMBER_VALUE		= 0,
 	SVG_NUMBER_PERCENTAGE	= 1,
@@ -520,20 +584,28 @@
 	SVG_NUMBER_AUTO_REVERSE	= 12
 };
 
-typedef struct {
+struct __svg_number {
 	u8 type;
 	Fixed value;
-} SVG_Number,
-SVG_FontSize,
-SVG_Length,
-SVG_Coordinate,
-SVG_Rotate;
-
+};
+/*! SVG number*/
+typedef struct __svg_number SVG_Number;
+/*! SVG font size*/
+typedef struct __svg_number SVG_FontSize;
+/*! SVG length*/
+typedef struct __svg_number SVG_Length;
+/*! SVG coordinate*/
+typedef struct __svg_number SVG_Coordinate;
+/*! SVG rotation*/
+typedef struct __svg_number SVG_Rotate;
+
+/*! SVG transform*/
 typedef struct {
 	u8 is_ref;
 	GF_Matrix2D mat;
 } SVG_Transform;
 
+/*! SVG transform types */
 enum {
 	SVG_TRANSFORM_MATRIX	= 0,
 	SVG_TRANSFORM_TRANSLATE = 1,
@@ -543,8 +615,10 @@
 	SVG_TRANSFORM_SKEWY		= 5
 };
 
+/*! SVG transform type*/
 typedef u8 SVG_TransformType;
 
+/*! SVG fontweight types */
 enum {
 	SVG_FONTWEIGHT_100 = 0,
 	SVG_FONTWEIGHT_200,
@@ -561,23 +635,29 @@
 	SVG_FONTWEIGHT_LIGHTER,
 	SVG_FONTWEIGHT_NORMAL
 };
+/*! SVG font weight*/
 typedef u8 SVG_FontWeight;
 
+/*! SVG fontvariant types */
 enum {
 	SVG_FONTVARIANT_INHERIT		= 0,
 	SVG_FONTVARIANT_NORMAL		= 1,
 	SVG_FONTVARIANT_SMALLCAPS	= 2
 };
+/*! SVG font variant*/
 typedef u8 SVG_FontVariant;
 
+/*! SVG visibility types */
 enum {
 	SVG_VISIBILITY_HIDDEN   = 0,
 	SVG_VISIBILITY_INHERIT	= 1,
 	SVG_VISIBILITY_VISIBLE  = 2,
 	SVG_VISIBILITY_COLLAPSE = 3
 };
+/*! SVG visibility*/
 typedef u8 SVG_Visibility;
 
+/*! SVG display types */
 enum {
 	SVG_DISPLAY_INHERIT = 0,
 	SVG_DISPLAY_NONE    = 1,
@@ -598,8 +678,10 @@
 	SVG_DISPLAY_TABLE_CELL,
 	SVG_DISPLAY_TABLE_CAPTION
 };
+/*! SVG display*/
 typedef u8 SVG_Display;
 
+/*! SVG display-align types */
 enum {
 	SVG_DISPLAYALIGN_INHERIT	= 0,
 	SVG_DISPLAYALIGN_AUTO		= 1,
@@ -607,41 +689,50 @@
 	SVG_DISPLAYALIGN_BEFORE		= 3,
 	SVG_DISPLAYALIGN_CENTER		= 4
 };
+/*! SVG display alignment*/
 typedef u8 SVG_DisplayAlign;
 
+/*! SVG text-align types */
 enum {
 	SVG_TEXTALIGN_INHERIT	= 0,
 	SVG_TEXTALIGN_START		= 1,
 	SVG_TEXTALIGN_CENTER	= 2,
 	SVG_TEXTALIGN_END		= 3
 };
+/*! SVG text alignment*/
 typedef u8 SVG_TextAlign;
 
+/*! SVG stroke dash array types */
 enum {
 	SVG_STROKEDASHARRAY_NONE	= 0,
 	SVG_STROKEDASHARRAY_INHERIT = 1,
 	SVG_STROKEDASHARRAY_ARRAY	= 2
 };
 
+/*! SVG unit array*/
 typedef struct {
 	u32 count;
 	Fixed* vals;
 	u8 *units;
 } UnitArray;
 
+/*! SVG stroke dash array*/
 typedef struct {
 	u8 type;
 	UnitArray array;
 } SVG_StrokeDashArray;
 
+/*! SVG text anchor types */
 enum {
 	SVG_TEXTANCHOR_INHERIT	= 0,
 	SVG_TEXTANCHOR_END		= 1,
 	SVG_TEXTANCHOR_MIDDLE	= 2,
 	SVG_TEXTANCHOR_START	= 3
 };
+/*! SVG text anchor*/
 typedef u8 SVG_TextAnchor;
 
+/*! SVG angle types */
 enum {
 	SVG_ANGLETYPE_UNKNOWN		= 0,
 	SVG_ANGLETYPE_UNSPECIFIED	= 1,
@@ -650,12 +741,14 @@
 	SVG_ANGLETYPE_GRAD			= 4
 };
 
+/*! SVG unit-type types */
 enum {
 	SVG_UNIT_TYPE_UNKNOWN			= 0,
 	SVG_UNIT_TYPE_USERSPACEONUSE	= 1,
 	SVG_UNIT_TYPE_OBJECTBOUNDINGBOX = 2
 };
 
+/*! SVG preserve aspect ratio types */
 enum {
 	// Alignment Types
 	SVG_PRESERVEASPECTRATIO_NONE = 1,
@@ -670,65 +763,73 @@
 	SVG_PRESERVEASPECTRATIO_XMAXYMAX = 9
 };
 
+/*! SVG meet or slice types */
 enum {
 	// Meet_or_slice Types
 	SVG_MEETORSLICE_MEET  = 0,
 	SVG_MEETORSLICE_SLICE = 1
 };
 
+/*! SVG preserve aspect ratio*/
 typedef struct {
 	Bool defer;
 	u8 align;
 	u8 meetOrSlice;
 } SVG_PreserveAspectRatio;
 
+/*! SVG zoom and pan types */
 enum {
 	SVG_ZOOMANDPAN_DISABLE = 0,
 	SVG_ZOOMANDPAN_MAGNIFY,
 };
 
+/*! SVG zoom and pan*/
 typedef u8 SVG_ZoomAndPan;
 
+/*! SVG lenght adjust types */
 enum {
 	LENGTHADJUST_UNKNOWN   = 0,
 	LENGTHADJUST_SPACING     = 1,
 	LENGTHADJUST_SPACINGANDGLYPHS     = 2
 };
 
+/*! SVG textPath methods types */
 enum {
-	// textPath Method Types
 	TEXTPATH_METHODTYPE_UNKNOWN   = 0,
 	TEXTPATH_METHODTYPE_ALIGN     = 1,
 	TEXTPATH_METHODTYPE_STRETCH     = 2
 };
+
+/*! SVG textPath spacing types */
 enum {
-	// textPath Spacing Types
 	TEXTPATH_SPACINGTYPE_UNKNOWN   = 0,
 	TEXTPATH_SPACINGTYPE_AUTO     = 1,
 	TEXTPATH_SPACINGTYPE_EXACT     = 2
 };
 
+/*! SVG Marker Unit types */
 enum {
-	// Marker Unit Types
 	SVG_MARKERUNITS_UNKNOWN        = 0,
 	SVG_MARKERUNITS_USERSPACEONUSE = 1,
 	SVG_MARKERUNITS_STROKEWIDTH    = 2
 };
+
+/*! SVG Marker Orientation types */
 enum {
-	// Marker Orientation Types
 	SVG_MARKER_ORIENT_UNKNOWN      = 0,
 	SVG_MARKER_ORIENT_AUTO         = 1,
 	SVG_MARKER_ORIENT_ANGLE        = 2
 };
 
+/*! SVG Spread Method types */
 enum {
-	// Spread Method Types
 	SVG_SPREADMETHOD_UNKNOWN = 0,
 	SVG_SPREADMETHOD_PAD     = 1,
 	SVG_SPREADMETHOD_REFLECT = 2,
 	SVG_SPREADMETHOD_REPEAT  = 3
 };
 
+/*! SVG pointer events types */
 enum {
 	SVG_POINTEREVENTS_INHERIT			= 0,
 	SVG_POINTEREVENTS_ALL				= 1,
@@ -742,8 +843,10 @@
 	SVG_POINTEREVENTS_VISIBLESTROKE		= 9,
 	SVG_POINTEREVENTS_BOUNDINGBOX		= 10
 };
+/*! SVG pointer events*/
 typedef u8 SVG_PointerEvents;
 
+/*! SVG rendering hints types */
 enum {
 	SVG_RENDERINGHINT_INHERIT				= 0,
 	SVG_RENDERINGHINT_AUTO					= 1,
@@ -754,34 +857,44 @@
 	SVG_RENDERINGHINT_GEOMETRICPRECISION	= 6,
 
 };
+/*! SVG rendering hints*/
 typedef u8 SVG_RenderingHint;
 
+/*! SVG vector effect types */
 enum {
 	SVG_VECTOREFFECT_INHERIT			= 0,
 	SVG_VECTOREFFECT_NONE				= 1,
 	SVG_VECTOREFFECT_NONSCALINGSTROKE	= 2,
 };
+/*! SVG vector effect*/
 typedef u8 SVG_VectorEffect;
 
+/*! XML event propagate types */
 enum {
 	XMLEVENT_PROPAGATE_CONTINUE = 0,
 	XMLEVENT_PROPAGATE_STOP		= 1
 };
+/*! DOM Event propagate*/
 typedef u8 XMLEV_Propagate;
 
+/*! XML event default action types */
 enum {
 	XMLEVENT_DEFAULTACTION_CANCEL = 0,
 	XMLEVENT_DEFAULTACTION_PERFORM,
 
 };
+/*! DOM Event default action*/
 typedef u8 XMLEV_DefaultAction;
 
+/*! XML event phase types */
 enum {
 	XMLEVENT_PHASE_DEFAULT	= 0,
 	XMLEVENT_PHASE_CAPTURE	= 1
 };
+/*! DOM Event phase*/
 typedef u8 XMLEV_Phase;
 
+/*! SMIL sync behaviour types */
 enum {
 	SMIL_SYNCBEHAVIOR_INHERIT		= 0,
 	/*LASeR order*/
@@ -790,63 +903,81 @@
 	SMIL_SYNCBEHAVIOR_INDEPENDENT,
 	SMIL_SYNCBEHAVIOR_LOCKED,
 };
+/*! SMIL sync behaviour*/
 typedef u8 SMIL_SyncBehavior;
 
+/*! SMIL sync tolerance types */
 enum {
 	SMIL_SYNCTOLERANCE_INHERIT		= 0,
 	SMIL_SYNCTOLERANCE_DEFAULT		= 1,
 	SMIL_SYNCTOLERANCE_VALUE		= 2
 };
 
+/*! SMIL sync tolerance*/
 typedef struct {
 	u8 type;
 	SVG_Clock value;
 } SMIL_SyncTolerance;
 
+/*! SMIL attributeType types */
 enum {
 	SMIL_ATTRIBUTETYPE_CSS	= 0,
 	SMIL_ATTRIBUTETYPE_XML,
 	SMIL_ATTRIBUTETYPE_AUTO,
 };
+/*! SMIL attribute type*/
 typedef u8 SMIL_AttributeType;
 
+/*! SVG playbackorder types */
 enum {
 	SVG_PLAYBACKORDER_ALL			= 0,
 	SVG_PLAYBACKORDER_FORWARDONLY	= 1,
 };
+/*! SVG playback order*/
 typedef u8 SVG_PlaybackOrder;
 
+/*! SVG timeline begin types */
 enum {
 	SVG_TIMELINEBEGIN_ONLOAD=0,
 	SVG_TIMELINEBEGIN_ONSTART,
 };
+/*! SVG timeline begin*/
 typedef u8 SVG_TimelineBegin;
 
+/*! XML space types */
 enum {
 	XML_SPACE_DEFAULT		= 0,
 	XML_SPACE_PRESERVE		= 1
 };
+/*! XML space type*/
 typedef u8 XML_Space;
 
 
+/*! SVG gradient units types */
 enum {
 	SVG_GRADIENTUNITS_OBJECT = 0,
 	SVG_GRADIENTUNITS_USER = 1
 };
+/*! SVG gradient unit*/
 typedef u8 SVG_GradientUnit;
 
+/*! SVG focus highlight types */
 enum {
 	SVG_FOCUSHIGHLIGHT_AUTO = 0,
 	SVG_FOCUSHIGHLIGHT_NONE	= 1
 };
+/*! SVG focus highlight*/
 typedef u8 SVG_FocusHighlight;
 
+/*! SVG initial visibility types */
 enum {
 	SVG_INITIALVISIBILTY_WHENSTARTED = 0,
 	SVG_INITIALVISIBILTY_ALWAYS		 = 1
 };
+/*! SVG initial visibility*/
 typedef u8 SVG_InitialVisibility;
 
+/*! SVG transform behaviour types */
 enum {
 	SVG_TRANSFORMBEHAVIOR_GEOMETRIC = 0,
 	SVG_TRANSFORMBEHAVIOR_PINNED,
@@ -854,21 +985,27 @@
 	SVG_TRANSFORMBEHAVIOR_PINNED270,
 	SVG_TRANSFORMBEHAVIOR_PINNED90,
 };
+/*! SVG transform behaviour*/
 typedef u8 SVG_TransformBehavior;
 
+/*! SVG overlay types */
 enum {
 	SVG_OVERLAY_NONE = 0,
 	SVG_OVERLAY_TOP,
 };
+/*! SVG overlay*/
 typedef u8 SVG_Overlay;
 
+/*! SVG focusable types */
 enum {
 	SVG_FOCUSABLE_AUTO = 0,
 	SVG_FOCUSABLE_FALSE,
 	SVG_FOCUSABLE_TRUE,
 };
+/*! SVG focusable*/
 typedef u8 SVG_Focusable;
 
+/*! SVG filter transfer types */
 enum
 {
 	SVG_FILTER_TRANSFER_IDENTITY,
@@ -877,27 +1014,32 @@
 	SVG_FILTER_TRANSFER_LINEAR,
 	SVG_FILTER_TRANSFER_GAMMA
 };
+/*! SVG filter transfer type*/
 typedef u8 SVG_Filter_TransferType;
 
+/*! SVG spread types */
 enum {
 	SVG_SPREAD_PAD = 0,
 	SVG_SPREAD_REFLECT,
 	SVG_SPREAD_REPEAT,
 };
+/*! SVG spread method*/
 typedef u8 SVG_SpreadMethod;
 
+/*! LASeR choice types */
 enum {
 	LASeR_CHOICE_ALL   = 0,
 	LASeR_CHOICE_NONE  = 1,
 	LASeR_CHOICE_N	   = 2
 };
-typedef u8 LASeR_Choice_enum;
 
+/*! LASeR choice*/
 typedef struct {
 	u32 type;
 	u32 choice_index;
 } LASeR_Choice;
 
+/*! LASeR size*/
 typedef struct {
 	Fixed width, height;
 } LASeR_Size;

gpac-0.8.0.tar.gz/include/gpac/sync_layer.h -> gpac-1.0.0.tar.gz/include/gpac/sync_layer.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / SL header file
@@ -31,16 +31,16 @@
 #endif
 
 /*!
- *	\file <gpac/sync_layer.h>
- *	\brief MPEG-4 Object Descriptor Framework Sync Layer.
- */
+\file <gpac/sync_layer.h>
+\brief MPEG-4 Object Descriptor Framework Sync Layer.
+*/
 	
 /*!
- *	\ingroup odf_grp
- *	\brief MPEG-4 Object Descriptor Framework  Sync Layer
- *
- *This section documents the MPEG-4 OD  Sync Layer used in GPAC.
- *	@{
+\ingroup odf_grp
+\brief MPEG-4 Object Descriptor Framework  Sync Layer
+
+This section documents the MPEG-4 OD  Sync Layer used in GPAC.
+@{
  */
 
 /*the Sync Layer config descriptor*/
@@ -72,25 +72,25 @@
 	u16 CUDuration;
 	u64 startDTS;
 	u64 startCTS;
-
+	//internal
 	Bool no_dts_signaling;
+	u32 carousel_version;
 } GF_SLConfig;
 
-/***************************************
-			SLConfig Tag
-***************************************/
+/*! SL config predefined values*/
 enum
 {
 	SLPredef_Null = 0x01,
 	SLPredef_MP4 = 0x02,
-	/*intern to GPAC, means NO SL at all (for streams unable to handle AU reconstruction a timing)*/
-	SLPredef_SkipSL = 0xF0
 };
 
-/*set SL predefined (assign all fields according to sl->predefined value)*/
+/*! sets SL predefined (assign all fields according to sl->predefined value)
+\param sl the target SL config descriptor
+\return error if any
+*/
 GF_Err gf_odf_slc_set_pref(GF_SLConfig *sl);
 
-
+/*! MPEG-4 sync layer header information*/
 typedef struct
 {
 	u8 accessUnitStartFlag;
@@ -125,9 +125,8 @@
 	u64 isma_BSO;
 	/*CENC extensions*/
 	u8 cenc_encrypted;
-	char *sai;
 	u8 IV_size;
-	u32 saiz;
+
 	//for CENC pattern encryption mode
 	u8 crypt_byte_block, skip_byte_block;
 	u8 constant_IV_size;
@@ -142,17 +141,35 @@
 	u64 sender_ntp;
 	//set for AUs which should be decodedd but not presented during seek
 	u8 seekFlag;
-	u32 ts_res;
+
+	u32 samplerate, channels;
 } GF_SLHeader;
 
 
-/*packetize SL-PDU. If PDU is NULL or size 0, only writes the SL header*/
-void gf_sl_packetize(GF_SLConfig* slConfig, GF_SLHeader *Header, char *PDU, u32 size, char **outPacket, u32 *OutSize);
-/*gets SL header size in bytes*/
+/*! packetizes SL-PDU. If PDU is NULL or size 0, only writes the SL header
+\param slConfig the target SL config descriptor
+\param Header the SL header for this data block
+\param PDU the payload to packetize
+\param size the payload size
+\param outPacket set to an allocated buffer containing the serialized SL packet - to be destroyed by caller
+\param OutSize set to the size of the serialized SL packer
+*/
+void gf_sl_packetize(GF_SLConfig* slConfig, GF_SLHeader *Header, u8 *PDU, u32 size, u8 **outPacket, u32 *OutSize);
+/*! gets SL header size
+\param slConfig the target SL config descriptor
+\param Header the SL header for this data block
+\return the size of the SL header in bytes
+*/
 u32 gf_sl_get_header_size(GF_SLConfig* slConfig, GF_SLHeader *Header);
 
-/*depacketize SL-PDU*/
-void gf_sl_depacketize(GF_SLConfig *slConfig, GF_SLHeader *Header, const char *PDU, u32 PDULength, u32 *HeaderLen);
+/*! depacketizes SL-PDU
+\param slConfig the target SL config descriptor
+\param Header filled with the decoded SL header
+\param PDU the SL packet to parse
+\param PDULength the size of the SL packet
+\param HeaderLen set to size of the SL header - payload will start at PDU + *HeaderLen
+*/
+void gf_sl_depacketize(GF_SLConfig *slConfig, GF_SLHeader *Header, const u8 *PDU, u32 PDULength, u32 *HeaderLen);
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/term_info.h -> gpac-1.0.0.tar.gz/include/gpac/term_info.h Changed

gpac-0.8.0.tar.gz/include/gpac/terminal.h -> gpac-1.0.0.tar.gz/include/gpac/terminal.h Changed

gpac-0.8.0.tar.gz/include/gpac/thread.h -> gpac-1.0.0.tar.gz/include/gpac/thread.h Changed

gpac-0.8.0.tar.gz/include/gpac/token.h -> gpac-1.0.0.tar.gz/include/gpac/token.h Changed

@@ -31,67 +31,67 @@
 #endif
 
 /*!
- *	\file <gpac/token.h>
- *	\brief String Tokenizer
- */
+\file <gpac/token.h>
+\brief String Tokenizer
+*/
 
 /*!
-*	\addtogroup tok_grp Tokenizer
-*	\ingroup utils_grp
-*	\brief String Tokenizer
-*
-*This section documents the basic string tokenizer of the GPAC framework.
-*	@{
+\addtogroup tok_grp
+\brief String Tokenizer
+
+This section documents the basic string tokenizer of the GPAC framework.
+
+@{
 */
 
 #include <gpac/tools.h>
 
 /*!
- *\brief get string component
- *
- *Gets the next string component comprised in a given set of characters
- *\param Buffer source string to scan
- *\param Start char offset from beginning of buffer where tokenization shall start
- *\param Separator separator characters to use
- *\param Container output buffer location
- *\param ContainerSize output buffer allocated size
- *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
+\brief get string component
+
+Gets the next string component comprised in a given set of characters
+\param Buffer source string to scan
+\param Start char offset from beginning of buffer where tokenization shall start
+\param Separator separator characters to use
+\param Container output buffer location
+\param ContainerSize output buffer allocated size
+\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
  */
 s32 gf_token_get(const char* Buffer, s32 Start, const char* Separator, char* Container, s32 ContainerSize);
 /*!
- *\brief get string component without delimitting characters
- *
- *Gets the next string component comprised in a given set of characters, removing surrounding characters
- *\param Buffer source string to scan
- *\param Start char offset from beginning of buffer where tokenization shall start
- *\param Separator separator characters to use
- *\param strip_set surrounding characters to remove
- *\param Container output buffer location
- *\param ContainerSize output buffer allocated size
- *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
+\brief get string component without delimitting characters
+
+Gets the next string component comprised in a given set of characters, removing surrounding characters
+\param Buffer source string to scan
+\param Start char offset from beginning of buffer where tokenization shall start
+\param Separator separator characters to use
+\param strip_set surrounding characters to remove
+\param Container output buffer location
+\param ContainerSize output buffer allocated size
+\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
  */
 s32 gf_token_get_strip(const char* Buffer, s32 Start, const char* Separator, const char* strip_set, char* Container, s32 ContainerSize);
 /*!
- *\brief line removal
- *
- *Gets one line from buffer and remove delimiters CR, LF and CRLF
- *\param buffer source string to scan
- *\param start char offset from beginning of buffer where tokenization shall start
- *\param size size of the input buffer to analyze
- *\param line_buffer output buffer location
- *\param line_buffer_size output buffer allocated size
- *\return position of the first char in the buffer after the last line delimiter, or -1 if no line could be found
+\brief line removal
+
+Gets one line from buffer and remove delimiters CR, LF and CRLF
+\param buffer source string to scan
+\param start char offset from beginning of buffer where tokenization shall start
+\param size size of the input buffer to analyze
+\param line_buffer output buffer location
+\param line_buffer_size output buffer allocated size
+\return position of the first char in the buffer after the last line delimiter, or -1 if no line could be found
  */
 s32 gf_token_get_line(const char *buffer, u32 start, u32 size, char *line_buffer, u32 line_buffer_size);
 /*!
- *\brief pattern location
- *
- *Locates a pattern in the buffer
- *\param Buffer source string to scan
- *\param Start char offset from beginning of buffer where tokenization shall start
- *\param Size size of the input buffer to analyze
- *\param Pattern pattern to locate
- *\return position of the first char in the buffer after the pattern, or -1 if pattern could not be found
+\brief pattern location
+
+Locates a pattern in the buffer
+\param Buffer source string to scan
+\param Start char offset from beginning of buffer where tokenization shall start
+\param Size size of the input buffer to analyze
+\param Pattern pattern to locate
+\return position of the first char in the buffer after the pattern, or -1 if pattern could not be found
  */
 s32 gf_token_find(const char* Buffer, u32 Start, u32 Size, const char* Pattern);

gpac-0.8.0.tar.gz/include/gpac/tools.h -> gpac-1.0.0.tar.gz/include/gpac/tools.h Changed

gpac-0.8.0.tar.gz/include/gpac/user.h -> gpac-1.0.0.tar.gz/include/gpac/user.h Changed

gpac-0.8.0.tar.gz/include/gpac/utf.h -> gpac-1.0.0.tar.gz/include/gpac/utf.h Changed

gpac-0.8.0.tar.gz/include/gpac/version.h -> gpac-1.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
+ *			Copyright (c) Telecom ParisTech 2012-2019
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -25,35 +25,40 @@
 
 #ifndef _GF_VERSION_H
 
-/*! \file "gpac/version.h"
- *	\brief GPAC version.
- *
-*/
-
 /*!
- *	\ingroup utils_grp
- *	\brief GPAC version definition.
- *
- *	@{
- */
+\file "gpac/version.h"
+\brief GPAC version.
+\addtogroup cst_grp
+
+@{
+*/
 
 /*!
- *	\brief GPAC Version
- *	\hideinitializer
- *
- *	Macro giving GPAC version expressed as a printable string
+\brief GPAC Version
+\hideinitializer
 */
 /* KEEP SPACE SEPARATORS FOR MAKE / GREP (SEE MAIN MAKEFILE & CONFIGURE & CO)
  * NO SPACE in GPAC_VERSION / GPAC_FULL_VERSION for proper install
  * SONAME versions must be digits (not strings)
  */
-#define GPAC_VERSION          "0.8.0"
-#define GPAC_VERSION_MAJOR 8
+/*! Macro giving GPAC version name expressed as a printable string*/
+#define GPAC_VERSION          "1.0.0"
+/*! ABI Major number of libgpac */
+#define GPAC_VERSION_MAJOR 10
+/*! ABI Minor number of libgpac */
 #define GPAC_VERSION_MINOR 0
+/*! ABI Micro number of libgpac */
 #define GPAC_VERSION_MICRO 0
 
-#include <gpac/revision.h>
-#define GPAC_FULL_VERSION       GPAC_VERSION "-rev" GPAC_GIT_REVISION
+/*! gets GPAC full version including GIT revision
+\return GPAC full version
+*/
+const char *gf_gpac_version();
+
+/*! gets GPAC copyright
+\return GPAC copyright
+*/
+const char *gf_gpac_copyright();
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/webvtt.h -> gpac-1.0.0.tar.gz/include/gpac/webvtt.h Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
+ *			Authors: Cyril Concolato, Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2013-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / WebVTT header
@@ -31,19 +31,21 @@
 #endif
 
 /*!
- *	\file <gpac/webvtt.h>
- *	\brief Helper functions for WebVTT parsing.
+\file <gpac/webvtt.h>
+\brief Helper functions for WebVTT parsing.
  */
 
 /*!
- *	\ingroup media_grp
- *	\brief Helper functions for WebVTT parsing
- *
- *This section documents the audio and video parsing functions of the GPAC framework.
- *	@{
+\addtogroup wvtt_grp WebVTT parsing
+\ingroup media_grp
+\brief Helper functions for WebVTT parsing
+
+This section documents the audio and video parsing functions of the GPAC framework.
+
+@{
  */
 
-/* WebVTT types */
+/*! WebVTT types */
 typedef enum {
 	WEBVTT_ID,
 	WEBVTT_SETTINGS,
@@ -52,13 +54,27 @@
 	WEBVTT_PRECUE_TEXT,
 } GF_WebVTTCuePropertyType;
 
+/*! WebVTT timestamp information*/
 typedef struct _webvtt_timestamp {
 	u32 hour, min, sec, ms;
 } GF_WebVTTTimestamp;
-u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts);
-void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value);
-void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour);
-
+/*! gets webvtt timestamp
+\param wvtt_ts the target WebVTT timestamp
+\return timestamp in millisecond*/
+u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *wvtt_ts);
+/*! sets webvtt timestamp
+\param wvtt_ts the target WebVTT timestamp
+\param value timestamp in millisecond
+*/
+void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *wvtt_ts, u64 value);
+/*! dumps webvtt timestamp
+\param wvtt_ts the target WebVTT timestamp
+\param dump the output file to write to
+\param dump_hour if GF_TRUE, dumps hours
+*/
+void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *wvtt_ts, FILE *dump, Bool dump_hour);
+
+/*! WebVTT cue structure*/
 typedef struct _webvtt_cue
 {
 	GF_WebVTTTimestamp start;
@@ -74,22 +90,29 @@
 	GF_WebVTTTimestamp orig_start;
 	GF_WebVTTTimestamp orig_end;
 } GF_WebVTTCue;
-
+/*! destroys a WebVTT cue
+\param cue the target WebVTT cue
+*/
 void gf_webvtt_cue_del(GF_WebVTTCue * cue);
 
 #ifndef GPAC_DISABLE_VTT
-GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *printLength);
+/*! dumps webvtt sample boxes
+\param dump the output file to write to
+\param data the WebVTT ISOBMFF sample payload
+\param dataLength the size of the payload in bytes
+\param printLength set to the printed size in bytes
+\return error if any
+*/
+GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const u8 *data, u32 dataLength, u32 *printLength);
 #endif
 
-#ifdef GPAC_HAS_SPIDERMONKEY
-#include <gpac/internal/scenegraph_dev.h>
-
-GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id,
-                           const char *start, const char *end,
-                           const char *settings,
-                           const char *payload);
-GF_Err gf_webvtt_js_removeCues(GF_Node *node);
-#endif
+/*! dumps webvtt sample boxes
+\param data the WebVTT ISOBMFF sample payload
+\param dataLength the size of the payload in bytes
+\param start the start time in milliseconds of the WebVTT cue
+\return new list of cues, to destroy by caller
+*/
+GF_List *gf_webvtt_parse_cues_from_data(const u8 *data, u32 dataLength, u64 start);
 
 /*! @} */

gpac-0.8.0.tar.gz/include/gpac/xml.h -> gpac-1.0.0.tar.gz/include/gpac/xml.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -32,262 +32,378 @@
 
 #include <gpac/tools.h>
 #include <gpac/list.h>
+#include <gpac/bitstream.h>
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
 /*!
- *	\file <gpac/xml.h>
- *	\brief XML functions.
+\file <gpac/xml.h>
+\brief XML functions.
  */
 
 /*!
- *	\addtogroup xml_grp XML
- *	\ingroup utils_grp
- *	\brief XML Parsing functions
- *
- *This section documents the XML functions of the GPAC framework.
- *	@{
- */
+\addtogroup xml_grp
+\brief XML Parsing functions
 
+This section documents the XML functions (full doc parsing and SAX parsing) of the GPAC framework.
+
+\defgroup sax_grp SAX Parsing
+\ingroup xml_grp
+\defgroup dom_grp DOM Parsing
+\ingroup xml_grp
+\defgroup xmlb_grp XML Binary Formating
+\ingroup xml_grp
+*/
+
+/*!
+\addtogroup xml_grp
+@{
+*/
 
 
+/*! Structure containing a parsed attribute*/
 typedef struct
 {
-	/*name or namespace:name*/
+	/*! name or namespace:name*/
 	char *name;
-	/*value*/
+	/*! value*/
 	char *value;
 } GF_XMLAttribute;
 
-/*XML node types*/
+/*! XML node types*/
 enum
 {
+
+	/*! XML node*/
 	GF_XML_NODE_TYPE = 0,
+	/*! text node (including carriage return between XML nodes)*/
 	GF_XML_TEXT_TYPE,
+	/*! CDATA node*/
 	GF_XML_CDATA_TYPE,
 };
 
+/*! Structure containing a parsed XML node*/
 typedef struct _xml_node
 {
+	/*! Type of the node*/
 	u32 type;
-	/*
+	/*!
 	For DOM nodes: name
 	For other (text, css, cdata), element content
 	*/
 	char *name;
 
-	/*for DOM nodes only*/
-	char *ns;	/*namespace*/
+	/*! namespace of the node, for XML node type only*/
+	char *ns;
+	/*! list of attributes of the node, for XML node type only*/
 	GF_List *attributes;
+	/*! list of children nodes of the node, for XML node type only*/
 	GF_List *content;
 } GF_XMLNode;
 
+/*! @} */
 
 
-/*
-	SAX XML Parser
+/*!
+\addtogroup sax_grp
+
+	! SAX XML Parser API
+	GPAC can do progressive loading of XML document using this SAX api.
+@{
 */
 
+/*! SAX XML Parser object*/
 typedef struct _tag_sax_parser GF_SAXParser;
+/*! SAX XML node start callback
+	\param sax_cbck user data passed durinc creation of SAX parser
+	\param node_name name of the XML node starting
+	\param name_space namespace of the XML node starting
+	\param attributes array of attributes declared for that XML node
+	\param nb_attributes number of items in array
+*/
 typedef	void (*gf_xml_sax_node_start)(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes);
+/*! SAX XML node end callback
+	\param sax_cbck user data passed durinc creation of SAX parser
+	\param node_name name of the XML node starting
+	\param name_space namespace of the XML node starting
+*/
 typedef	void (*gf_xml_sax_node_end)(void *sax_cbck, const char *node_name, const char *name_space);
+/*! SAX text content callback
+	\param sax_cbck user data passed durinc creation of SAX parser
+	\param content text content of the node
+	\param is_cdata if TRUE the content was ancapsulated in CDATA; otherwise this isthe content of a text node
+*/
 typedef	void (*gf_xml_sax_text_content)(void *sax_cbck, const char *content, Bool is_cdata);
-
-typedef	void (*gf_xml_sax_progress)(void *cbck, u64 done, u64 tot);
-
-/*creates new sax parser - all callbacks are optionals*/
+/*! SAX progress callback
+	\param cbck user data passed durinc creation of SAX parser
+	\param done amount of bytes parsed from the file
+	\param total total number of bytes in the file
+*/
+typedef	void (*gf_xml_sax_progress)(void *cbck, u64 done, u64 total);
+
+/*! creates new sax parser - all callbacks are optionals
+\param on_node_start callback for XML node start
+\param on_node_end callback for XML node end
+\param on_text_content callback for text content
+\param cbck user data passed to callback functions
+\return a SAX parser object
+*/
 GF_SAXParser *gf_xml_sax_new(gf_xml_sax_node_start on_node_start,
                              gf_xml_sax_node_end on_node_end,
                              gf_xml_sax_text_content on_text_content,
                              void *cbck);
 
-/*destroys sax parser */
+/*! destroys sax parser
+\param parser the SAX parser to destroy
+*/
 void gf_xml_sax_del(GF_SAXParser *parser);
-/*inits parser with BOM. BOM must be 4 char string with 0 terminaison. If BOM is NULL, parsing will
-assume UTF-8 compatible coding*/
+/*! Inits the parser with string containing BOM, if any. BOM must be 4 char string with 0 terminaison. If BOM is NULL, parsing will assume UTF-8 compatible coding
+\param parser the SAX parser to init
+\param BOM the 4 character with 0 terminaison BOM or NULL
+\return error code if any
+*/
 GF_Err gf_xml_sax_init(GF_SAXParser *parser, unsigned char *BOM);
-/*parses input string data. string data MUST be terminated by the 0 character (eg 2 0s for UTF-16)*/
+/*! Parses input string data. string data MUST be terminated by the 0 character (eg 2 0s for UTF-16)
+\param parser the SAX parser to use
+\param string_bytes the string to parse
+\return error code if any
+*/
 GF_Err gf_xml_sax_parse(GF_SAXParser *parser, const void *string_bytes);
-/*suspends/resume sax parsing.
+/*! Suspends or resumes SAX parsing.
 	When resuming on file, the function will run until suspended/end of file/error
 	When resuming on steram, the function will simply return
+
+\param parser the SAX parser to use
+\param do_suspend if GF_TRUE, SAX parsing is suspended, otherwise SAX parsing is resumed
+\return error code if any
 */
 GF_Err gf_xml_sax_suspend(GF_SAXParser *parser, Bool do_suspend);
-/*parses file (potentially gzipped). OnProgress is optional, used to get progress callback*/
+/*! parses file (potentially gzipped). OnProgress is optional, used to get progress callback
+\param parser the SAX parser to use
+\param fileName the file to parse
+\param OnProgress the progress function to use. The callback for the progress function is the one assigned at SAX parser creation \ref gf_xml_sax_new
+\return error code if any
+*/
 GF_Err gf_xml_sax_parse_file(GF_SAXParser *parser, const char *fileName, gf_xml_sax_progress OnProgress);
-/*get current line number*/
+/*! Gets current line number, useful for inspecting errors
+\param parser the SAX parser to use
+\return current line number of SAX parser
+*/
 u32 gf_xml_sax_get_line(GF_SAXParser *parser);
-/*get file size - may be inaccurate if gzipped (only compressed file size is known)*/
-u32 gf_xml_sax_get_file_size(GF_SAXParser *parser);
-/*get current file position*/
-u32 gf_xml_sax_get_file_pos(GF_SAXParser *parser);
 
-/*peeks a node forward in the file. May be used to pick the attribute of the first node found matching a given (attributeName, attributeValue) couple*/
+/*! Peeks a node forward in the file. This may be used to pick the attribute of the first node found matching a given (attributeName, attributeValue) couple
+\param parser SAX parser to use
+\param att_name attribute name to look for
+\param att_value value for this attribute
+\param substitute gives the name of an additional XML node type to inspect to match the node. May be NULL.
+\param get_attr gives the name of the attribute in the substitute node that matches the condition. If substitue node with name atribute is found, the content of the name attribute is returned. May be NULL.
+\param end_pattern gives a string indicating where to stop looking in the document. May be NULL.
+\param is_substitute is set to GF_TRUE if the return value corresponds to the content of the name attribute of the substitute element
+\return name of the XML node found, or NULL if no match. This string has to be freed by the caller using gf_free
+
+*/
 char *gf_xml_sax_peek_node(GF_SAXParser *parser, char *att_name, char *att_value, char *substitute, char *get_attr, char *end_pattern, Bool *is_substitute);
 
-/*file mode only, returns 1 if file is compressed, 0 otherwise*/
+/*! For file mode only, indicates if a file is compressed or not
+\param parser SAX parser to use
+\return 1 if file is compressed, 0 otherwise
+*/
 Bool gf_xml_sax_binary_file(GF_SAXParser *parser);
 
+/*! Returns the last error found during parsing
+\param parser SAX parser
+\return the last SAX error encountered
+*/
 const char *gf_xml_sax_get_error(GF_SAXParser *parser);
 
+/*! Returns the name of the root XML element
+\param file the XML file to inspect
+\param ret_code return error code if any
+\return the name of the root XML element. This string has to be freed by the caller using gf_free
+*/
 char *gf_xml_get_root_type(const char *file, GF_Err *ret_code);
 
+/*! Returns the position in bytes of the start of the current node being parsed. The byte offset points to the first < character in the opening tag.
+\param parser SAX parser
+\return the 0-based position of the current XML node
+*/
 u32 gf_xml_sax_get_node_start_pos(GF_SAXParser *parser);
+/*! Returns the position in bytes of the end of the current node being parsed. The byte offset points to the last > character in the closing tag.
+\param parser SAX parser
+\return the 0-based position of the current XML node
+*/
 u32 gf_xml_sax_get_node_end_pos(GF_SAXParser *parser);
 
+/*! @} */
+
+/*!
+\addtogroup dom_grp
+
+	! DOM Full XML document Parsing API
+	GPAC can do one-pass full document parsing of XML document using this DOM API.
+@{
+*/
+
+/*! the DOM loader. GPAC can also load complete XML document in memory, using a DOM-like approach. This is a simpler
+approach for document parsing not requiring progressive loading*/
 typedef struct _tag_dom_parser GF_DOMParser;
+
+/*! the DOM loader constructor
+\return the created DOM loader, NULL if memory error
+*/
 GF_DOMParser *gf_xml_dom_new();
+
+/*! the DOM loader constructor
+\param parser the DOM parser to destroy
+*/
 void gf_xml_dom_del(GF_DOMParser *parser);
+
+/*! Parses an XML document or fragment contained in a file
+\param parser the DOM parser to use
+\param file the file to parse
+\param OnProgress an optional callback for the parser
+\param cbk an optional user data for the progress callback
+\return error code if any
+*/
 GF_Err gf_xml_dom_parse(GF_DOMParser *parser, const char *file, gf_xml_sax_progress OnProgress, void *cbk);
-GF_Err gf_xml_dom_parse_string(GF_DOMParser *dom, char *string);
+/*! Parses an XML document or fragment contained in memory
+\param parser the DOM parser to use
+\param string the string to parse
+\return error code if any
+*/
+GF_Err gf_xml_dom_parse_string(GF_DOMParser *parser, char *string);
+/*! Gets the last error that happened during the parsing. The parser aborts at the first error found within a SAX callback
+\param parser the DOM parser to use
+\return last error code if any
+*/
 const char *gf_xml_dom_get_error(GF_DOMParser *parser);
+/*! Gets the current line of the parser. Used for error logging
+\param parser the DOM parser to use
+\return last loaded line number
+*/
 u32 gf_xml_dom_get_line(GF_DOMParser *parser);
 
+/*! Gets the number of root nodes in the document (not XML compliant, but used in DASH for remote periods)
+\param parser the DOM parser to use
+\return the number of root elements in the document
+*/
 u32 gf_xml_dom_get_root_nodes_count(GF_DOMParser *parser);
+/*! Gets the root node at the given index.
+\param parser the DOM parser to use
+\param idx index of the root node to get (0 being the first node)
+\return the root element at the given index, or NULL if error
+*/
 GF_XMLNode *gf_xml_dom_get_root_idx(GF_DOMParser *parser, u32 idx);
 
 
-/*
- *\brief Serialize a node
- *
- * Flush a node in a char
- *
- *\param node the node to flush
- *\param content_only Whether to include or not the parent node
- *\return The resulting serialization
+/*! Serialize a node to a string
+\param node the node to flush
+\param content_only Whether to include or not the parent node
+\return The resulting serialization. The string has to be freed with gf_free
  */
 char *gf_xml_dom_serialize(GF_XMLNode *node, Bool content_only);
 
-/*
- *\brief Create the root element of the DOM
- *
- * Create the root element -- the only top level element -- of the document.
- *
- *\param parser the DOM structure
- *\return The created node if creation occurs properly, otherwise NULL;
- */
-GF_XMLNode *gf_xml_dom_create_root(GF_DOMParser *parser, const char* name);
-
-/*
- *\brief Get the root element of the DOM
- *
- * Get the root element -- the only top level element -- of the document.
- *
- *\param parser the DOM structure
- *\return The corresponding node if exists, otherwise NULL;
+/*! Get the root element -- the only top level element -- of the document.
+\param parser the DOM structure
+\return The corresponding node if exists, otherwise NULL;
  */
 GF_XMLNode *gf_xml_dom_get_root(GF_DOMParser *parser);
 
-/*
- *\brief Return and detach the root element of the DOM
- *
- * Return and detach the root element of the DOM
- *
- *\param parser the DOM structure
- *\return The corresponding node if exists, otherwise NULL;
- */
-GF_XMLNode *gf_xml_dom_detach_root(GF_DOMParser *parser);
+/*!
+Creates an attribute with the given name and value.
+\param name the attribute name
+\param value the value
+\return The created attribute ;
+*/
+GF_XMLAttribute *gf_xml_dom_create_attribute(const char* name, const char* value);
 
-/*
- *\brief Sets an attribute value for this element.
- *
- * Sets an attribute value for this element
- *
- *\param node the GF_XMLNode node
- *\param name the name of the attribute
- *\param value the value of the attribute
- *\return The created attribute if setting occurs properly, otherwise NULL;
+/*! Adds the node to the end of the list of children of this node.
+\param node the GF_XMLNode node
+\param child the GF_XMLNode child to append
+\return Error code if any, otherwise GF_OK
  */
-GF_XMLAttribute *gf_xml_dom_set_attribute(GF_XMLNode *node, const char* name, const char* value);
+GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child);
 
-/*
- *\brief Gets the attribute for this element with the given name.
- *
- * Gets the attribute for this element with the given name.
- *
- *\param node the GF_XMLNode node
- *\param name the attribute name
- *\return The corresponding attribute if exists, otherwise NULL;
- */
-GF_XMLAttribute *gf_xml_dom_get_attribute(GF_XMLNode *node, const char* name);
+/*!
+\brief Removes the node to the list of children of this node.
 
-/*
- *\brief Adds the node to the end of the list of children of this node.
- *
- * Adds the node to the end of the list of children of this node.
- *
- *\param node the GF_XMLNode node
- *\param child the GF_XMLNode child to append
- *\return GF_OK if append occurs properly, otherwise a GF_Err
- */
-GF_Err gf_xml_dom_append_child(GF_XMLNode *node, GF_XMLNode *child);
+Removes the node to the list of children of this node.
+\warning Doesn't free the memory of the removed children.
 
-/*
- *\brief Removes the node to the list of children of this node.
- *
- * Removes the node to the list of children of this node.
- * Doesn't free the memory of the removed children.
- *
- *\param node the GF_XMLNode node
- *\param child the GF_XMLNode child to remove
- *\return GF_OK if removal occurs properly, otherwise a GF_Err
+\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);
 
-/*
- *\brief Node constructor.
- *
- * Creates a node with the given name and namespace URI.
- *
- *\param ns the node namespace
- *\param name the name namespace
- *\return The created GF_XMLNode if creation occurs properly, otherwise NULL;
- */
-GF_XMLNode* gf_xml_dom_node_new(const char* ns, const char* name);
+/*! Destroys a node, its attributes and its children
 
-/*
- *\brief Node destructor.
- *
- * Free a node, its attributes and its childs.
- *
- *\param node the node to free
+\param node the node to free
  */
 void gf_xml_dom_node_del(GF_XMLNode *node);
 
-/*
- *\brief bitsequence parser.
- *
- * inspects all child elements of the node and converts <BS> children into bits. BS take the following attributes:.
- *bits: value gives the number of bits used to code a value or a length
- *value: value is a 32 bit signed value
- *dataOffset: value gives an offset into a file
- *dataLength: value gives the number of bits bytes to copy in a file
- *dataFile: value gives the name of the source file
- *textmode: indicates whether the file shall be opened in text or binary mode before reading
- *text: or string: value gives a string (length is first coded on number of bits in bits attribute)
- *fcc: value gives a four character code, coded on 32 bits
- *ID128: value gives a 128 bit vlue in hexadecimal
- *data64: value gives data coded as base64
- *data: value gives data coded in hexa
- *
- *
- *
- *\param node the root node of the bitstream to create
- *\param out_data pointer to output buffer allocated by the function to store the result
- *\param out_data_size pointer to output buffer size allocated by the function to store the result
- *\return error code or GF_OK
- */
-GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **out_data, u32 *out_data_size);
 
-/*
- *\brief get the element and check that the namespace is known ('xmlns'-only supported for now)
- *\param n                  the node to process
- *\param expected_node_name optional expected name for node n
- *\param expected_ns_prefix optional expected namespace prefix for node n
- *\return error code or GF_OK
+/*! Gets the element and check that the namespace is known ('xmlns'-only supported for now)
+\param n the node to process
+\param expected_node_name optional expected name for node n
+\param expected_ns_prefix optional expected namespace prefix for node n
+\return error code or GF_OK
  */
 GF_Err gf_xml_get_element_check_namespace(const GF_XMLNode *n, const char *expected_node_name, const char *expected_ns_prefix);
 
+/*! Writes a string to an xml file and replaces forbidden chars with xml entities
+ *\param file       the xml output file
+ *\param before     optional string prefix (assumed xml-valid, pass NULL if not needed)
+ *\param str        the string to dump and escape
+ *\param after     optional string suffix (assumed xml-valid, pass NULL if not needed)
+ */
+void gf_xml_dump_string(FILE* file, const char* before, const char* str, const char* after);
+
+/*! @} */
+
+
+/*!
+\addtogroup xmlb_grp
+
+Binarization using XML in GPAC
+
+GPAC uses a special node name BS (for BitSequence) in XML documents to transform text data into sequences of bits.
+ This function inspects all child elements of the node and converts children node names BS into bits. BS take the following attributes:
+ + bits: value gives the number of bits used to code a value or a length
+ + value: value is a 32 bit signed value
+ + dataOffset: value gives an offset into a file
+ + dataLength: value gives the number of bits bytes to copy in a file
+ + dataFile: value gives the name of the source file
+ + textmode: indicates whether the file shall be opened in text or binary mode before reading
+ + text: or string: value gives a string (length is first coded on number of bits in bits attribute)
+ + fcc: value gives a four character code, coded on 32 bits
+ + ID128: value gives a 128 bit vlue in hexadecimal
+ + data64: value gives data coded as base64
+ + data: value gives data coded in hexa
+
+@{
+*/
+
+/*!\brief bit-sequence XML parser
+\param bsroot the root node of XML document describing the bitstream to create
+\param parent_url URL of the parent document
+\param out_data pointer to output buffer allocated by the function to store the result
+\param out_data_size pointer to output buffer size allocated by the function to store the result
+\return error code if any or GF_OK
+ */
+GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, const char *parent_url, u8 **out_data, u32 *out_data_size);
+
+/*!\brief bit-sequence XML parser
+
+Parses XML bit sequence in an existing bitstream object. The syntax for the XML is the same as in \ref gf_xml_parse_bit_sequence
+\param bsroot the root node of XML document describing the bitstream to create
+\param parent_url URL of the parent document
+\param bs target bitstream to write the result into. The bitstream must be a dynamic write bitstream object
+\return error code or GF_OK
+ */
+GF_Err gf_xml_parse_bit_sequence_bs(GF_XMLNode *bsroot, const char *parent_url, GF_BitStream *bs);
+
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.8.0.tar.gz/mkdmg.sh -> gpac-1.0.0.tar.gz/mkdmg.sh Changed

@@ -41,14 +41,14 @@
 mkdir -p tmpdmg/GPAC.app/Contents/MacOS/lib
 
 cp bin/gcc/gm* tmpdmg/GPAC.app/Contents/MacOS/modules
+cp bin/gcc/gf_* tmpdmg/GPAC.app/Contents/MacOS/modules
 cp bin/gcc/libgpac.dylib tmpdmg/GPAC.app/Contents/MacOS/lib
+if [ -f bin/gcc/libopenhevc.1.dylib ]; then
+    cp bin/gcc/libopenhevc.1.dylib tmpdmg/GPAC.app/Contents/MacOS/lib
+fi
 cp bin/gcc/MP4Client tmpdmg/GPAC.app/Contents/MacOS/Osmo4
 cp bin/gcc/MP4Box tmpdmg/GPAC.app/Contents/MacOS/MP4Box
-cp bin/gcc/MP42TS tmpdmg/GPAC.app/Contents/MacOS/MP42TS
-if [ -f bin/gcc/DashCast ]
-then
-cp bin/gcc/DashCast tmpdmg/GPAC.app/Contents/MacOS/DashCast
-fi
+cp bin/gcc/gpac tmpdmg/GPAC.app/Contents/MacOS/gpac
 
 cd tmpdmg/GPAC.app/Contents/MacOS/
 
@@ -59,30 +59,23 @@
   rewrite_deps $dylib
 done
 
-if [ -f DashCast ]
-then
-  rewrite_deps DashCast
-fi
-
 echo rewriting APPS dependencies
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib Osmo4
 install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
-install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib MP42TS
+install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib gpac
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib Osmo4
 install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP4Box
-install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib MP42TS
-
-if [ -f DashCast ]
-then
-install_name_tool -change /usr/local/lib/libgpac.dylib @executable_path/lib/libgpac.dylib DashCast
-install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib DashCast
-fi
+install_name_tool -change ../bin/gcc/libgpac.dylib @executable_path/lib/libgpac.dylib gpac
 
 cd ../../../..
 
 echo Copying GUI
-rsync -r --exclude=.git $source_path/gui ./tmpdmg/GPAC.app/Contents/MacOS/
-rsync -r --exclude=.git $source_path/shaders ./tmpdmg/GPAC.app/Contents/MacOS/
+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/
+cp $source_path/share/default.cfg ./tmpdmg/GPAC.app/Contents/MacOS/share/
 
 echo Building DMG
 version=`grep '#define GPAC_VERSION ' $source_path/include/gpac/version.h | cut -d '"' -f 2`

gpac-0.8.0.tar.gz/modules/Makefile -> gpac-1.0.0.tar.gz/modules/Makefile Changed

@@ -1,63 +1,32 @@
 include ../config.mak
 
 #all OS and lib independent
-PLUGDIRS=aac_in ac3_in amr_dec atsc_in audio_filter bifs_dec dummy_in soft_raster mp3_in isom_in odf_dec rtp_in timedtext img_in saf_in ismacryp raw_out validator netctrl
+PLUGDIRS=validator
 
-ifeq ($(DISABLE_DASH_CLIENT), no)
-PLUGDIRS+=mpd_in
-ifeq ($(CONFIG_JS),no)
-else
-PLUGDIRS+=mse_in
-endif
-endif
-
-ifeq ($(DISABLE_MEDIA_IMPORT), no)
-PLUGDIRS+=mpegts_in 
-endif
-
-ifeq ($(DISABLE_SMGR), no)
-PLUGDIRS+=ctx_load svg_in
-endif
-
-ifeq ($(DISABLE_SVG), no)
-PLUGDIRS+=laser_dec svg_in 
-ifeq ($(DISABLE_TTXT), no)
-PLUGDIRS+=vtt_in
-endif
+#disabled for now
+#netctrl
 
 ifneq ($(CONFIG_ZLIB), no)
-PLUGDIRS+=widgetman
+#disabled for now
+#PLUGDIRS+=widgetman
 ifeq ($(DISABLE_VRML),no)
 ifeq ($(DISABLE_LOADER_BT),no)
-PLUGDIRS+=osd
-endif
-endif
+#disabled for now
+#PLUGDIRS+=osd
 endif
 endif
 
-ifeq ($(CONFIG_FT), no)
-else
-PLUGDIRS+=ft_font
 endif
 
-ifeq ($(CONFIG_XVID), no)
-else
-PLUGDIRS+=xvid_dec
-endif
 
-ifeq ($(CONFIG_OGG), no)
+ifeq ($(CONFIG_FT), no)
 else
-PLUGDIRS+=ogg
+PLUGDIRS+=ft_font
 endif
 
 ifeq ($(CONFIG_FREENECT), no)
 else
-PLUGDIRS+=freenect
-endif
-
-ifeq ($(CONFIG_OSS_AUDIO), no)
-else
-PLUGDIRS+=oss_audio
+#PLUGDIRS+=freenect
 endif
 
 ifeq ($(CONFIG_ALSA), yes)
@@ -83,19 +52,13 @@
 PLUGDIRS+=directfb_out
 endif
 
-ifeq ($(CONFIG_JS),no)
-else
-PLUGDIRS+=gpac_js
-endif
-
-ifeq ($(CONFIG_OPENSVC),yes)
-PLUGDIRS+=opensvc_dec
-endif
-
 ifeq ($(CONFIG_HID),yes)
-PLUGDIRS+=psvr
+#PLUGDIRS+=psvr
 endif
 
+ifeq ($(CONFIG_OPENHEVC),yes)
+PLUGDIRS+=dec_openhevc
+endif
 
 #w32 plugins
 ifeq ($(CONFIG_WIN32),yes)
@@ -103,71 +66,23 @@
 ifeq ($(CONFIG_DIRECTX),yes)
 PLUGDIRS+=dx_hw
 endif
-ifeq ($(HAS_OPENGL),yes)
-PLUGDIRS+=nvdec
-endif
-endif
-
-#OSX plugins
-ifeq ($(CONFIG_DARWIN),yes)
-PLUGDIRS+=vtb_decode
 endif
 
 #other linux
 ifeq ($(CONFIG_LINUX),yes)
-ifeq ($(HAS_OPENGL),yes)
-PLUGDIRS+=nvdec
-endif
-endif
-
-ifneq ($(CONFIG_FFMPEG), no)
-ifeq ($(CONFIG_OPENHEVC),no)
-PLUGDIRS+=ffmpeg_in
-else
-ifneq ($(STATIC_MODULES), yes)
-PLUGDIRS+=ffmpeg_in
-endif
-endif
 endif
 
-#openHEVC is disabled in static build
 
 #if static modules are used, disable all previous modules (built-in in libgpac)
 ifeq ($(STATIC_MODULES), yes)
 PLUGDIRS=
-
-else 
-
-ifeq ($(CONFIG_OPENHEVC),yes)
-PLUGDIRS+=openhevc_dec
 endif
 
-endif
-
-
 #all modules below are not (yet) included in static build
 
-ifeq ($(CONFIG_AMR_NB_FT), yes)
-PLUGDIRS+=amr_float_dec
-else
-ifeq ($(CONFIG_AMR_WB_FT), yes)
-PLUGDIRS+=amr_float_dec
-endif
-endif
-
-ifeq ($(RENOIR_ENABLE),yes)
-PLUGDIRS+=viren_out
-endif
-
-
-ifeq ($(CONFIG_PLATINUM),yes)
-PLUGDIRS+=platinum
-endif
-
-ifeq ($(CONFIG_AVCAP),yes)
-PLUGDIRS+=avcap
-endif
-
+#ifeq ($(CONFIG_PLATINUM),yes)
+#PLUGDIRS+=platinum
+#endif
 
 ifeq ($(DISABLE_PLAYER), yes)
 PLUGDIRS=
@@ -176,14 +91,14 @@
 
 all: plugs
 
-plugs:	
-	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i all; done 
+plugs:
+	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i all; done
 
 dep:
-	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i dep; done 
+	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i dep; done
 
 clean:
-	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i clean; done 
+	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i clean; done
 
-distclean:	
-	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i distclean; done 
+distclean:
+	set -e; for i in $(PLUGDIRS) ; do $(MAKE) -C $$i distclean; done

gpac-0.8.0.tar.gz/modules/alsa/Makefile -> gpac-1.0.0.tar.gz/modules/alsa/Makefile Changed

gpac-0.8.0.tar.gz/modules/alsa/alsa.c -> gpac-1.0.0.tar.gz/modules/alsa/alsa.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / alsa audio output module
@@ -45,16 +45,14 @@
 static GF_Err ALSA_Setup(GF_AudioOutput*dr, void *os_handle, u32 num_buffers, u32 total_duration)
 {
 	int err;
-	const char *opt;
 	ALSAContext *ctx = (ALSAContext*)dr->opaque;
 
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "ALSA", "ForceSampleRate");
-	if (opt) ctx->force_sr = atoi(opt);
-	ctx->dev_name = gf_modules_get_option((GF_BaseInterface *)dr, "ALSA", "DeviceName");
+	ctx->force_sr = gf_opts_get_int("core", "force-alsarate");
+	ctx->dev_name = gf_opts_get_key("core", "alsa-devname");
 	if (!ctx->dev_name) {
 		ctx->dev_name = "hw:0,0";
-		gf_modules_set_option((GF_BaseInterface *)dr, "ALSA", "DeviceName", ctx->dev_name);
+		gf_opts_set_key("core", "alsa-devname", ctx->dev_name);
 	}
 
 	/*test device*/
@@ -80,7 +78,7 @@
 	ctx->wav_buf = NULL;
 }
 
-static GF_Err ALSA_ConfigureOutput(GF_AudioOutput*dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+static GF_Err ALSA_Configure(GF_AudioOutput*dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	snd_pcm_hw_params_t *hw_params = NULL;
 	int err;
@@ -122,12 +120,20 @@
 	/*set output format*/
 	ctx->nb_ch = (int) (*NbChannels);
 	ctx->block_align = ctx->nb_ch;
-	if ((*nbBitsPerSample) == 16) {
+
+	//only support for PCM 8/16/24/32 packet mode
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+		err = snd_pcm_hw_params_set_format(ctx->playback_handle, hw_params, SND_PCM_FORMAT_U8);
+		break;
+	default:
+		*audioFormat = GF_AUDIO_FMT_S16;
+	case GF_AUDIO_FMT_S16:
 		ctx->block_align *= 2;
 		err = snd_pcm_hw_params_set_format(ctx->playback_handle, hw_params, SND_PCM_FORMAT_S16_LE);
-	} else {
-		err = snd_pcm_hw_params_set_format(ctx->playback_handle, hw_params, SND_PCM_FORMAT_U8);
+		break;
 	}
+
 	if (err < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[ALSA] Cannot set sample format: %s\n", snd_strerror (err)) );
 		goto err_exit;
@@ -256,18 +262,6 @@
 	}
 }
 
-static void ALSA_SetVolume(GF_AudioOutput*dr, u32 Volume)
-{
-}
-
-static void ALSA_SetPan(GF_AudioOutput*dr, u32 Pan)
-{
-}
-
-static void ALSA_SetPriority(GF_AudioOutput*dr, u32 Priority)
-{
-}
-
 static u32 ALSA_GetAudioDelay(GF_AudioOutput*dr)
 {
 	ALSAContext *ctx = (ALSAContext*)dr->opaque;
@@ -327,11 +321,8 @@
 	driv->SelfThreaded = 0;
 	driv->Setup = ALSA_Setup;
 	driv->Shutdown = ALSA_Shutdown;
-	driv->ConfigureOutput = ALSA_ConfigureOutput;
+	driv->Configure = ALSA_Configure;
 	driv->GetAudioDelay = ALSA_GetAudioDelay;
-	driv->SetVolume = ALSA_SetVolume;
-	driv->SetPan = ALSA_SetPan;
-	driv->SetPriority = ALSA_SetPriority;
 	driv->QueryOutputSampleRate = ALSA_QueryOutputSampleRate;
 	driv->WriteAudio = ALSA_WriteAudio;
 	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "ALSA Audio Output", "gpac distribution");

gpac-1.0.0.tar.gz/modules/dec_openhevc Added

gpac-1.0.0.tar.gz/modules/dec_openhevc/Makefile Added

@@ -0,0 +1,59 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/dec_openhevc
+
+CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS) $(OHEVC_CFLAGS)
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+ifeq ($(CONFIG_DARWIN),yes)
+LINKFLAGS+=-L../../bin/gcc $(OHEVC_LDFLAGS)
+else
+LINKFLAGS+=-L../../bin/gcc $(OHEVC_LDFLAGS) -Wl,-Bsymbolic
+endif
+
+#common obj
+OBJS=dec_openhevc.o
+SRCS=$(SRC_PATH)/src/filters/dec_openhevc.c
+
+
+ifeq ($(CONFIG_WIN32), yes)
+else
+EXTRALIBS+=-ldl
+endif
+
+LINKFLAGS+=-lgpac
+
+LIB=gf_openhevc_dec$(DYN_LIB_SUFFIX)
+
+all: $(LIB)
+
+dec_openhevc.o : $(SRC_PATH)/src/filters/dec_openhevc.c
+	@echo "  CC $<"
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS) $(LDFLAGS)
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.8.0.tar.gz/modules/dektec_out/Makefile -> gpac-1.0.0.tar.gz/modules/dektec_out/Makefile Changed

gpac-0.8.0.tar.gz/modules/dektec_out/dektec_video.cpp -> gpac-1.0.0.tar.gz/modules/dektec_out/dektec_video.cpp Changed

@@ -1,85 +1,37 @@
 /*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) 
- *                  Romain Bouqueau @ GPAC Licensing
- *			        Jean Le Feuvre
- *					All rights reserved
- *
- *  This file is part of GPAC / Dektec SDI video render module
- *
- *  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.
- *
- */
-
-//#define _DTAPI_DISABLE_AUTO_LINK
-#include <DTAPI.h>
-
-extern "C" {
-
-/*driver interfaces*/
-#include <gpac/modules/video_out.h>
-#include <gpac/modules/audio_out.h>
-#include <gpac/constants.h>
-#include <gpac/setup.h>
-#include <gpac/color.h>
-#include <gpac/thread.h>
-
-#if defined(WIN32) && !defined(__GNUC__)
-# include <intrin.h>
-#else
-#  include <emmintrin.h>
-#endif
-
-typedef struct {
-	GF_VideoOutput *dr;
-	enum {
-		VIDEO,
-		AUDIO
-	} type;
-} DtCbkCtx;
-
-typedef struct
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Romain Bouqueau, Jean Le Feuvre
+*			Copyright (c) 2014-2016 GPAC Licensing
+*			Copyright (c) 2016-2020 Telecom Paris
+*					All rights reserved
+*
+*  This file is part of GPAC / Dektec SDI video 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 "dektec_video.h"
+
+#ifdef GPAC_HAS_DTAPI
+
+#ifndef FAKE_DT_API
+
+static void OnNewFrameAudio(DtMxData *pData, const DtCbkCtx *ctx)
 {
-	unsigned char *pixels_YUV_source;
-
-	u32 width, height;
-	DtMxProcess *m_Matrix;
-
-	DtDevice *dvc;
-	Bool is_sending, is_configured, is_10b, clip_sdi;
-
-	DtCbkCtx audio_cbk_ctx, video_cbk_ctx;
-
-	s64 frameNum;
-	FILE *pFile;
-	Bool is_in_flush;
-	Bool frame_transfered;
-	
-	s64 lastFrameNum;
-	u64 init_clock, last_frame_time;
-
-	u32 frame_dur, frame_scale;
-	Bool needs_reconfigure;
-	u32 force_width, force_height;
-} DtContext;
-
-static void OnNewFrameAudio(DtMxData *pData, void *pOpaque) {
-	DTAPI_RESULT  dr;
-
 	// Must have a valid frame
 	DtMxRowData &OurRow = pData->m_Rows[0];
 	if (OurRow.m_CurFrame->m_Status != DT_FRMSTATUS_OK) {
@@ -90,68 +42,96 @@
 	DtMxAudioData&  AudioData = OurRow.m_CurFrame->m_Audio;
 
 	// Init channel status word for all (valid) audio channels
-	dr = AudioData.InitChannelStatus();
+	AudioData.InitChannelStatus();
 }
 
-static void OnNewFrameVideo(DtMxData *pData, void *opaque)
+static void OnNewFrameVideo(DtMxData *pData, const DtCbkCtx  *cbck)
 {
 	u64 now = gf_sys_clock_high_res();
-	DtMxRowData&  OurRow = pData->m_Rows[0];
-	GF_VideoOutput *dr = ((DtCbkCtx*)opaque)->dr;
-	DtContext *dtc = (DtContext*)dr->opaque;
-	if (!dtc->is_configured) return;
-	if (pData->m_NumSkippedFrames>0) {
-		GF_Event evt;
-		evt.type = GF_EVENT_SYNC_LOST;
-		evt.sync_loss.sync_loss_ms = (u32)((u64)pData->m_NumSkippedFrames * dtc->frame_dur * 1000) / dtc->frame_scale;
-		dr->on_event(dr->evt_cbk_hdl, &evt);
+	const DtMxRowData&  OurRow = pData->m_Rows[0];
+	GF_DTOutCtx *ctx = cbck->ctx;
+	GF_FilterPacket *pck;
+	
+	if (!ctx->is_configured || ctx->is_eos) return;
+	if (pData->m_NumSkippedFrames > 0) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] [%lld] #skipped frames=%d\n", pData->m_Frame, pData->m_NumSkippedFrames));
 	}
 
-	if (!dtc->init_clock)  {
-		dtc->init_clock = dtc->last_frame_time = now;
+	if (!ctx->init_clock) {
+		ctx->init_clock = ctx->last_frame_time = now;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] output frame %d at %d ms - %d since last\n", dtc->frameNum, (u32) (now - dtc->init_clock)/1000,  now-dtc->last_frame_time));
-	
-	dtc->last_frame_time = now;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] output frame %d at %d ms - %d since last\n", ctx->frameNum, (u32)(now - ctx->init_clock) / 1000, now - ctx->last_frame_time));
+
+	ctx->last_frame_time = now;
 
-	if (dtc->lastFrameNum == dtc->frameNum) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTec Out] Skipping same frame %d - compositor in flush %d\n", dtc->frameNum, dtc->is_in_flush));
-		dtc->frame_transfered = GF_TRUE;
+	if (!cbck->video) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] no connected pid !\n"));
 		return;
 	}
 
-	dtc->lastFrameNum = dtc->frameNum;
-
 	// Must have a valid frame
 	if (OurRow.m_CurFrame->m_Status != DT_FRMSTATUS_OK)
 	{
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Not valid frame 4k\n"));
-		dtc->frame_transfered = GF_TRUE;
-		exit(0);
 		return; // Frame is not valid so we have to assume the frame buffers are unusable
 	}
-	if (pData->m_NumSkippedFrames>0) {
-		GF_Event evt;
-		evt.type = GF_EVENT_SYNC_LOST;
-		evt.sync_loss.sync_loss_ms = (u32) ( (u64) pData->m_NumSkippedFrames * dtc->frame_dur * 1000) / dtc->frame_scale;
-		dr->on_event(dr->evt_cbk_hdl, &evt);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] [%lld] #skipped frames=%d\n", pData->m_Frame, pData->m_NumSkippedFrames));
+	if (pData->m_NumSkippedFrames > 0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] [%lld] #skipped frames=%d\n", pData->m_Frame, pData->m_NumSkippedFrames));
+	}
+
+	pck = gf_filter_pid_get_packet(cbck->video);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(cbck->video)) {
+			ctx->is_eos = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] no packet ready !\n"));
+		}
+		return;
+	}
+	ctx->is_eos = GF_FALSE;
+
+	u8 *pY, *pU, *pV;
+	u32 pck_size = 0;
+	u32 stride = ctx->stride, stride_uv= ctx->stride_uv;
+	pU = pV = NULL;
+	pY = (u8 *) gf_filter_pck_get_data(pck, &pck_size);
+	if (!pY) {
+		GF_FilterFrameInterface *hwframe = gf_filter_pck_get_frame_interface(pck);
+		if (hwframe) {
+			hwframe->get_plane(hwframe, 0, (const u8 **) &pY, &stride);
+			if (ctx->nb_planes>1)
+				hwframe->get_plane(hwframe, 1, (const u8 **) &pU, &stride_uv);
+			if (ctx->nb_planes>2)
+				hwframe->get_plane(hwframe, 2, (const u8 **) &pV, &stride_uv);
+		}
+	}
+	if (!pY) {
+		gf_filter_pid_drop_packet(cbck->video);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] No data associated with packet\n"));
+		return;
 	}
+	if (!pU && !pV) {
+		if (ctx->nb_planes>1)
+			pU = pY + stride * ctx->height;
+		if (ctx->nb_planes>2)
+			pV = pU + stride_uv * ctx->uv_height;
+	}
+
+	//TODO - move all this into color convertion code in libgpac !
 
-	DtMxVideoBuf&  VideoBuf = OurRow.m_CurFrame->m_Video[0];
-	unsigned char* pDstY = VideoBuf.m_Planes[0].m_pBuf;
-	unsigned char* pDstU = VideoBuf.m_Planes[1].m_pBuf;
-	unsigned char* pDstV = VideoBuf.m_Planes[2].m_pBuf;
+	const DtMxVideoBuf&  VideoBuf = OurRow.m_CurFrame->m_Video[0];
+	u8* pDstY = VideoBuf.m_Planes[0].m_pBuf;
+	u8* pDstU = VideoBuf.m_Planes[1].m_pBuf;
+	u8* pDstV = VideoBuf.m_Planes[2].m_pBuf;
 
-	if (dtc->is_10b) {
-		u32 nb_pix = 2*dtc->width*dtc->height;
-		int lineC = 2*dtc->width / 2;
-		unsigned char *pSrcY = dtc->pixels_YUV_source;
-		unsigned char *pSrcU = dtc->pixels_YUV_source + 2 * dtc->width*dtc->height;
-		unsigned char *pSrcV = pSrcU + (2 * dtc->width*dtc->height / 4);
+	if (ctx->is_10b) {
+		u32 nb_pix = 2 * ctx->width*ctx->height;
+		int lineC = 2 * ctx->width / 2;
+		unsigned char *pSrcY = pY;
+		unsigned char *pSrcU = pU;
+		unsigned char *pSrcV = pV;
 
-		if (dtc->clip_sdi) {
+		if (ctx->clip) {
 			const u16 nYRangeMin = 4;
 			const u16 nYRangeMax = 1019;
 			const __m128i mMin = _mm_set1_epi16(nYRangeMin);
@@ -161,343 +141,411 @@
 				_mm_storeu_si128((__m128i *)&pDstY[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcY[i]))));
 			}
 
-			for (u32 h = 0; h < dtc->height/2; h++) {
-				for (u32 i = 0; i < dtc->width; i += 16) {
+			for (u32 h = 0; h < ctx->height / 2; h++) {
+				for (u32 i = 0; i < ctx->width; i += 16) {
 					_mm_storeu_si128((__m128i *)&pDstU[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcU[i]))));
 				}
 				//420->422: copy over each U and V line
-				memcpy(pDstU+lineC, pDstU, lineC);
+				memcpy(pDstU + lineC, pDstU, lineC);
 				pSrcU += lineC;
 				pDstU += 2 * lineC;
 			}
 
-			for (u32 h = 0; h < dtc->height / 2; h++) {
-				for (u32 i = 0; i < dtc->width; i += 16) {
+			//NV12 formats
+			if (!pSrcV) pSrcV = pU + 1;
+
+			for (u32 h = 0; h < ctx->height / 2; h++) {
+				for (u32 i = 0; i < ctx->width; i += 16) {
 					_mm_storeu_si128((__m128i *)&pDstV[i], _mm_max_epi16(mMin, _mm_min_epi16(mMax, _mm_loadu_si128((__m128i const *)&pSrcV[i]))));
 				}
 				memcpy(pDstV + lineC, pDstV, lineC);
 				pSrcV += lineC;
 				pDstV += 2 * lineC;
 			}
-		} else {
-			memcpy(pDstY, dtc->pixels_YUV_source, 2 * dtc->width*dtc->height);
-	
+		}
+		else {
+			memcpy(pDstY, pY, stride * ctx->height);
+
 			//420->422: copy over each U and V line
-			for (u32 h = 0; h < dtc->height/2; h++) {
+			for (u32 h = 0; h < ctx->height / 2; h++) {
 				memcpy(pDstU, pSrcU, lineC);
-				memcpy(pDstU+lineC, pSrcU, lineC);
+				memcpy(pDstU + lineC, pSrcU, lineC);
 				pSrcU += lineC;
 				pDstU += 2 * lineC;
 			}
-			for (u32 h = 0; h < dtc->height / 2; h++) {
+			for (u32 h = 0; h < ctx->height / 2; h++) {
 				memcpy(pDstV, pSrcV, lineC);
 				memcpy(pDstV + lineC, pSrcV, lineC);
 				pSrcV += lineC;
 				pDstV += 2 * lineC;
 			}
 		}
-	} else {
-		u32 nb_pix = dtc->width*dtc->height;
-		const int lineC = dtc->width / 2;
-		unsigned char *pSrcY = dtc->pixels_YUV_source;
-		unsigned char *pSrcU = dtc->pixels_YUV_source + dtc->width * dtc->height;
-		unsigned char *pSrcV = pSrcU + (dtc->width*dtc->height / 4);
-
-		if (dtc->clip_sdi) {
-			const u16 nYRangeMin = 4;
-			const u16 nYRangeMax = 1019;
-
-			for (u32 i = 0; i < nb_pix; i++) {
-				u16 srcy = ((u16)(*pSrcY)) << 2;
+	}
+	else {
+		const int lineC = ctx->width / 2;
+		u32 nb_pix = ctx->width*ctx->height;
+		unsigned char *pSrcY = pY;
+		unsigned char *pSrcU = pU;
+		unsigned char *pSrcV = pV;
+
+		const u16 nYRangeMin = 4;
+		const u16 nYRangeMax = 1019;
+
+		for (u32 i = 0; i < nb_pix; i++) {
+			u16 srcy = ((u16)(*pSrcY)) << 2;
+			if (ctx->clip) {
 				if (srcy < nYRangeMin)      srcy = nYRangeMin;
 				else if (srcy > nYRangeMax) srcy = nYRangeMax;
-				*(short *)pDstY = srcy;
-
-				pSrcY++;
-				pDstY += sizeof(short); //char type but short buffer
 			}
+			*(short *)pDstY = srcy;
 
-			nb_pix = dtc->width*dtc->height / 4;
-			for (u32 i = 0; i < nb_pix; i++) {
-				u16 srcu = ((u16)(*pSrcU)) << 2;
-				if (srcu < nYRangeMin)      srcu = nYRangeMin;
-				else if (srcu > nYRangeMax) srcu = nYRangeMax;
+			pSrcY++;
+			pDstY += sizeof(short); //char type but short buffer
+		}
 
-				*(short *)pDstU = srcu;
-				*(short *)(pDstU + lineC) = srcu;
+		u32 hw = ctx->width / 2;
+		u32 hh = ctx->height / 2;
 
-				pSrcU++;
-				pDstU += sizeof(short); //char type but short buffer
+		for (u32 i = 0; i < hh; i++) {
+			//420->422: copy over each U and V line
+			u8 *p_dst_u = pDstU + sizeof(short) * lineC * i * 2;
+			u8 *p_dst_v = pDstV + sizeof(short) * lineC * i * 2;
+			u8 *p_src_u = NULL;
+			u8 *p_src_v = NULL;
+			u8 *op_dst_u = p_dst_u;
+			u8 *op_dst_v = p_dst_v;
+
+			//NV12 formats
+			if (!pV) {
+				p_src_u = pSrcU + 2 * ctx->stride_uv * i;
+				p_src_v = p_src_u + 1;
 			}
+			else {
+				p_src_u = pSrcU + ctx->stride_uv * i;
+				p_src_v = pSrcV + ctx->stride_uv * i;
+			}
+
+			for (u32 j = 0; j < hw; j++) {
+				u16 srcu = ((u16)(*p_src_u)) << 2;
+				u16 srcv = ((u16)(*p_src_v)) << 2;
+
+				if (ctx->clip) {
+					if (srcu < nYRangeMin)      srcu = nYRangeMin;
+					else if (srcu > nYRangeMax) srcu = nYRangeMax;
 
-			for (u32 i = 0; i < nb_pix; i++) {
-				u16 srcv = ((u16)(*pSrcV)) << 2;
-				if (srcv < nYRangeMin)      srcv = nYRangeMin;
-				else if (srcv > nYRangeMax) srcv = nYRangeMax;
+					if (srcv < nYRangeMin)      srcv = nYRangeMin;
+					else if (srcv > nYRangeMax) srcv = nYRangeMax;
+				}
 
-				*(short *)pDstV = srcv;
-				*(short *)(pDstV + lineC) = srcv;
+				*(short *)p_dst_u = srcu;
+				p_src_u += 2;
+				p_dst_u += sizeof(short); //char type but short buffer
 
-				pSrcV++;
-				pDstV += sizeof(short); //char type but short buffer
+				*(short *)p_dst_v = srcv;
+				p_src_v += 2;
+				p_dst_v += sizeof(short); //char type but short buffer
 			}
-		}
-		else {
-			memcpy(pDstY, pSrcY, dtc->width * dtc->height);
-			memcpy(pDstU, pSrcU, dtc->width * dtc->height / 4);
-			memcpy(pDstV, pSrcV, dtc->width * dtc->height / 4);
+			memcpy(op_dst_u + lineC * sizeof(short), op_dst_u, lineC * sizeof(short));
+			memcpy(op_dst_v + lineC * sizeof(short), op_dst_v, lineC * sizeof(short));
 		}
 	}
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] wrote YUV data in "LLU" us\n", gf_sys_clock_high_res() - now));
-	dtc->frame_transfered = GF_TRUE;
+	gf_filter_pid_drop_packet(cbck->video);
+	ctx->frameNum++;
 }
 
 static void OnNewFrame(DtMxData *pData, void *pOpaque) {
 	const DtCbkCtx *ctx = ((const DtCbkCtx*)pOpaque);
-	if (ctx->type == DtCbkCtx::VIDEO)
-		OnNewFrameVideo(pData, pOpaque);
-	else if (ctx->type == DtCbkCtx::AUDIO)
-		OnNewFrameAudio(pData, pOpaque);
-}
-
-static GF_Err Dektec_Flush(GF_VideoOutput *dr, GF_Window *dest)
-{
-	DtContext *dtc = (DtContext*)dr->opaque;
-	DtMxProcess *Matrix = dtc->m_Matrix;
-
-	if (!dtc->is_configured || !dtc->is_sending) return GF_OK;
-
-	dtc->is_in_flush = GF_TRUE;
-
-	dtc->frameNum++;
-	
-	//wait for vsync, eg wait for buffer to be read by the card
-	dtc->frame_transfered = GF_FALSE;
-	while (!dtc->frame_transfered) {
-		gf_sleep(0);
-	}
-	dtc->is_in_flush = GF_FALSE;
-	return GF_OK;
-}
-
-static GF_Err Dektec_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
-{
-	DtContext *dtc = (DtContext*)dr->opaque;
-
-	if (do_lock) {
-		return GF_NOT_SUPPORTED;
-	}
-	return GF_OK;
+	if (ctx->video)
+		OnNewFrameVideo(pData, ctx);
+	else if (ctx->audio)
+		OnNewFrameAudio(pData, ctx);
 }
 
-static void Dektec_Shutdown(GF_VideoOutput *dr)
+static void dtout_disconnect(GF_DTOutCtx *ctx)
 {
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] Dektec_Shutdown\n"));
-	DtContext *dtc = (DtContext*)dr->opaque;
-	DtMxProcess *Matrix = dtc->m_Matrix;
-	dtc->is_configured = GF_FALSE;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] Disconnecting\n"));
+	DtMxProcess *Matrix = ctx->dt_matrix;
+	ctx->is_configured = GF_FALSE;
 
 	DTAPI_RESULT res = Matrix->Stop();
-	if ( res != DTAPI_OK)
+	if (res != DTAPI_OK)
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't stop transmission: %s\n", DtapiResult2Str(res)));
 
 	Matrix->Reset();
-	dtc->dvc->Detach();
-	dtc->is_sending = GF_FALSE;
+	ctx->dt_device->Detach();
+	ctx->is_sending = GF_FALSE;
 }
 
-static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+
+static GF_Err dtout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
 {
-	DtContext *dtc = (DtContext*)dr->opaque;
+	DTAPI_RESULT res;
+	int port = 1;
+	Bool send_play = GF_FALSE;
+	Bool is4K = GF_FALSE;
+	Bool is_audio = GF_FALSE;
+	GF_DTOutCtx *ctx = (GF_DTOutCtx*)gf_filter_get_udta(filter);
+	const GF_PropertyValue *p;
+	DtDevice *dt_device = ctx->dt_device;
+
+	if (is_remove) {
+		if (ctx->audio_cbk.audio == pid) {
+			ctx->audio_cbk.audio = NULL;
+		}
+		else if (ctx->video_cbk.video == pid) {
+			ctx->video_cbk.video = NULL;
+		}
+		if (ctx->is_sending && !ctx->audio_cbk.audio && !ctx->video_cbk.video) {
+			dtout_disconnect(ctx);
+		}
+		return GF_OK;
+	}
 
-	if (evt) {
-		switch (evt->type) {
-		case GF_EVENT_VIDEO_SETUP:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DekTecOut] resize (%ux%u) received.\n", evt->size.width, evt->size.height));
-			dtc->needs_reconfigure = GF_TRUE;
-			return GF_OK;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	if (p->value.uint == GF_STREAM_VISUAL) {
+		if (!ctx->video_cbk.video) {
+			ctx->video_cbk.video = pid;
+			send_play = GF_TRUE;
 		}
+		else if (ctx->video_cbk.video != pid) return GF_REQUIRES_NEW_INSTANCE;
+	}
+	else if (p->value.uint == GF_STREAM_AUDIO) {
+		if (!ctx->audio_cbk.audio) {
+			ctx->audio_cbk.audio = pid;
+			send_play = GF_TRUE;
+		}
+		else if (ctx->audio_cbk.audio != pid) return GF_REQUIRES_NEW_INSTANCE;
+		is_audio=GF_TRUE;
+	}
+	else {
+		return GF_NOT_SUPPORTED;
 	}
-	return GF_OK;
-}
 
-GF_Err Dektec_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
-{
-	const char *opt;
-	DTAPI_RESULT res;
-	DtContext *dtc = (DtContext*)dr->opaque;
-	DtDevice *dvc = dtc->dvc;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p || (p->value.uint != GF_CODECID_RAW)) return GF_NOT_SUPPORTED;
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "CardSlot");
-	if (opt) {
-		int PciBusNumber, SlotNumber;
-		sscanf(opt, "%d:%d", &PciBusNumber, &SlotNumber);
 
-		res = dvc->AttachToSlot(PciBusNumber, SlotNumber);
-		if ( res != DTAPI_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA found on PIC bus %d slot %d: %s - trying enumerating cards\n", PciBusNumber, SlotNumber, DtapiResult2Str(res) ));
-		} else {
-			return GF_OK;
-		}
-	}
-	dtc->clip_sdi = GF_TRUE;
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "ClipSDI");
-	if (!opt) 
-		gf_modules_set_option((GF_BaseInterface *)dr, "DektecVideo", "ClipSDI", "yes");
-	else if (!strcmp(opt, "no"))
-		dtc->clip_sdi = GF_FALSE;
+	if (send_play) {
+		GF_FilterEvent fevt;
+		//set a minimum buffer (although we don't buffer)
+		GF_FEVT_INIT(fevt, GF_FEVT_BUFFER_REQ, pid);
+		fevt.buffer_req.max_buffer_us = 200000;
+		gf_filter_pid_send_event(pid, &fevt);
 
-	res = dvc->AttachToType(2174);
-	if ( res != DTAPI_OK) res = dvc->AttachToType(2154);
+		gf_filter_pid_init_play_event(pid, &fevt, ctx->start, 1.0, "DekTecOut");
+		gf_filter_pid_send_event(pid, &fevt);
+	}
 
-	if ( res != DTAPI_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA 2174 or 2154 in system: %s\n", DtapiResult2Str(res)));
-		return GF_BAD_PARAM;
+	if (is_audio) {
+		//todo
+		return GF_NOT_SUPPORTED;
 	}
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "ForceRes");
-	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)dr, "DektecVideo", "ForceRes", "no");
-		dtc->force_width = dtc->force_height = 0;
-	} else if (sscanf(opt, "%ux%u", &dtc->force_width, &dtc->force_height) == 2) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Using forced resolution %ux%u\n", dtc->force_width, dtc->force_height));
-	} else {
-		dtc->force_width = dtc->force_height = 0;
+
+	u32 width = 0;
+	u32 height = 0;
+	u32 pix_fmt = 0;
+	u32 stride = 0;
+	u32 stride_uv = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) width = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (p) height = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) pix_fmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+	if (p) stride_uv = p->value.uint;
+
+	//not configured yet
+	if (!width || !height || !pix_fmt) return GF_OK;
+
+	Bool is_10_bits = GF_FALSE;
+	switch (pix_fmt) {
+	case GF_PIXEL_YUV:
+		break;
+	case GF_PIXEL_YUV_10:
+		is_10_bits = GF_TRUE;
+		break;
+	case GF_PIXEL_YUV422:
+		break;
+	case GF_PIXEL_YUV422_10:
+		is_10_bits = GF_TRUE;
+		break;
+	case GF_PIXEL_YUV444:
+		break;
+	case GF_PIXEL_YUV444_10:
+		is_10_bits = GF_TRUE;
+		break;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		break;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		is_10_bits = GF_TRUE;
+		break;
+	default:
+		GF_PropertyValue val;
+		val.type = GF_PROP_UINT;
+		val.value.uint = GF_PIXEL_YUV;
+		gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &val);
+		return GF_OK;
 	}
-	return GF_OK;
-}
+	if (!stride) stride = width * (is_10_bits ? 2 : 1);
+	if (!stride_uv) stride_uv = stride / 2;
 
-GF_Err Dektec_Configure(GF_VideoOutput *dr, u32 width, u32 height, Bool is_10_bits)
-{
-	DTAPI_RESULT res;
-	int port = 1;
-	const char *opt;
-	Bool is4K = GF_FALSE;
-	DtContext *dtc = (DtContext*)dr->opaque;
-	DtDevice *dvc = dtc->dvc;
+	GF_Fraction fps = { 30, 1 };
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+	if (p) fps = p->value.frac;
 
-	const char* sopt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "FrameRate");
-	if (!sopt) sopt = gf_modules_get_option((GF_BaseInterface *)dr, "Compositor", "FrameRate");
-	Double frameRate = 30.0;
-	int dFormat = -1, linkStd = -1;
+	if ((ctx->width == width) && (ctx->height == height) && (ctx->pix_fmt == pix_fmt) && (ctx->framerate.num * fps.den == ctx->framerate.den * fps.num) && (ctx->stride==stride) && ctx->is_configured)
+		return GF_OK;
+
+	ctx->width = width;
+	ctx->height = height;
+	ctx->pix_fmt = pix_fmt;
+	ctx->framerate = fps;
+	ctx->is_10b = is_10_bits;
+	ctx->stride = stride;
+	ctx->stride_uv = stride_uv;
 
-	if (sopt) frameRate = atof(sopt);
+	gf_pixel_get_size_info((GF_PixelFormat) pix_fmt, width, height, NULL, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+
+	int dFormat = -1, linkStd = -1;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Reconfigure to %dx%d @ %g FPS %s bits src - SDI clipping: %s\n", width, height, frameRate, is_10_bits ? "10" : "8", dtc->clip_sdi ? "yes" : "no"));
-	if (dtc->is_configured) {
-		DtMxProcess *Matrix = dtc->m_Matrix;
-		if (dtc->is_sending) {
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Reconfigure to %dx%d @ %g FPS %d/%d bits src - SDI clipping: %s\n", width, height, fps.num, fps.den, is_10_bits ? "10" : "8", ctx->clip ? "yes" : "no"));
+	if (ctx->is_configured) {
+		DtMxProcess *Matrix = ctx->dt_matrix;
+		if (ctx->is_sending) {
 			res = Matrix->Stop();
-			if ( res != DTAPI_OK) {
+			if (res != DTAPI_OK) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't stop transmission: %s\n", DtapiResult2Str(res)));
 			}
 		}
 		Matrix->Reset();
-		dtc->is_configured = GF_FALSE;
-		dtc->is_sending = GF_FALSE;
+		ctx->is_configured = GF_FALSE;
+		ctx->is_sending = GF_FALSE;
 	}
 
-	dtc->width = width;
-	dtc->height = height;
-	dtc->is_10b = is_10_bits;
-
-	if (frameRate == 30.0) {
-		dtc->frame_scale = 30;
-		dtc->frame_dur = 1;
-		if ((dtc->width==1280) && (dtc->height==720)) {
+	if (fps.num == 30 * fps.den) {
+		ctx->frame_scale = 30;
+		ctx->frame_dur = 1;
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
 			dFormat = DTAPI_IOCONFIG_720P30;
-		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
 			dFormat = DTAPI_IOCONFIG_1080P30;
-		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
 			dFormat = DTAPI_VIDSTD_2160P30;
 		}
-	} else if (frameRate == 50.0) {
-		dtc->frame_scale = 50;
-		dtc->frame_dur = 1;
-		if ((dtc->width==1280) && (dtc->height==720)) {
+	}
+	else if (fps.num == 50 * fps.den) {
+		ctx->frame_scale = 50;
+		ctx->frame_dur = 1;
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
 			dFormat = DTAPI_IOCONFIG_720P50;
-		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
 			dFormat = DTAPI_IOCONFIG_1080P50;
-		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
 			dFormat = DTAPI_VIDSTD_2160P50;
 		}
-	} else if (frameRate == 60.0) {
-		dtc->frame_scale = 60;
-		dtc->frame_dur = 1;
-		if ((dtc->width==1280) && (dtc->height==720)) {
+	}
+	else if (fps.num == 60 * fps.den) {
+		ctx->frame_scale = 60;
+		ctx->frame_dur = 1;
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
 			dFormat = DTAPI_IOCONFIG_720P60;
-		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
 			dFormat = DTAPI_IOCONFIG_1080P60;
-		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
 			dFormat = DTAPI_VIDSTD_2160P60;
 		}
-	} else if (frameRate == 59.94) {
-		dtc->frame_scale = 3000;
-		dtc->frame_dur = 1001;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] Dealing with 60 fps video is not stable, use with caution.\n"));
+	}
+	else if (fps.num*100 == 5994 * fps.den) {
+		ctx->frame_scale = 3000;
+		ctx->frame_dur = 1001;
 
-		if ((dtc->width==1280) && (dtc->height==720)) {
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
 			dFormat = DTAPI_IOCONFIG_720P59_94;
-		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
 			dFormat = DTAPI_IOCONFIG_1080P59_94;
-		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
 			dFormat = DTAPI_VIDSTD_2160P59_94;
 		}
-	} else if (frameRate == 24.0) {
-		dtc->frame_scale = 24;
-		dtc->frame_dur = 1;
-		if ((dtc->width==1280) && (dtc->height==720)) {
+	}
+	else if (fps.num == 24 * fps.den) {
+		ctx->frame_scale = 24;
+		ctx->frame_dur = 1;
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
 			dFormat = DTAPI_IOCONFIG_720P24;
-		} else if ((dtc->width==1920) && (dtc->height==1080)) {
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
 			dFormat = DTAPI_IOCONFIG_1080P24;
-		} else if ((dtc->width==3840) && (dtc->height==2160)) {
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
 			dFormat = DTAPI_VIDSTD_2160P24;
 		}
 	}
+	else if (fps.num == 25 * fps.den) {
+		ctx->frame_scale = 25;
+		ctx->frame_dur = 1;
+		if ((ctx->width == 1280) && (ctx->height == 720)) {
+			dFormat = DTAPI_IOCONFIG_720P25;
+		}
+		else if ((ctx->width == 1920) && (ctx->height == 1080)) {
+			dFormat = DTAPI_IOCONFIG_1080P25;
+		}
+		else if ((ctx->width == 3840) && (ctx->height == 2160)) {
+			dFormat = DTAPI_VIDSTD_2160P25;
+		}
+	}
 
-	if (dFormat==-1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unsupported frame rate %f / resolution %dx%d\n", frameRate, dtc->width, dtc->height));
-		return GF_BAD_PARAM;
+	if (dFormat == -1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unsupported frame rate %d/%d / resolution %dx%d\n", fps.num, fps.den, ctx->width, ctx->height));
+		return GF_FILTER_NOT_SUPPORTED;
 	}
 
-	if ((dtc->width==3840) && (dtc->height==2160)) {
+	if ((ctx->width == 3840) && (ctx->height == 2160)) {
 		is4K = GF_TRUE;
 		linkStd = DTAPI_VIDLNK_4K_SMPTE425B;
 	}
 
-	if (frameRate == 60.0)
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Dealing with 60 fps video is not stable, use with caution.\n"));
-
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
-	if (opt) {
-		port = atoi(opt);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Using port %d (%s)\n", port, opt));
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] No port specified, using default port: %d\n", port));
-	}
+	port = ctx->port ? ctx->port : 1;
 
 	DtMxPort mxPort;
 	if (!is4K)
 	{
-		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
-		if ( res != DTAPI_OK) {
+		res = dt_device->SetIoConfig(port, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
 
 		int IoStdValue = -1, IoStdSubValue = -1;
 		res = DtapiVidStd2IoStd(dFormat, IoStdValue, IoStdSubValue);
-		if ( res != DTAPI_OK) {
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unknown VidStd: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
 
-		res = dvc->SetIoConfig(port, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
-		if ( res != DTAPI_OK) {
+		res = dt_device->SetIoConfig(port, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
-		res = mxPort.AddPhysicalPort(dvc, port);
-		if (res != DTAPI_OK){
+		res = mxPort.AddPhysicalPort(dt_device, port);
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to add port %d to logical port", port));
 			return GF_BAD_PARAM;
 		}
@@ -507,8 +555,8 @@
 		DtMxPort mxPort4k(dFormat, linkStd);
 		for (int i = 0; i < 4; i++)
 		{
-			res = dvc->SetIoConfig(i+1, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
-			if ( res != DTAPI_OK) {
+			res = dt_device->SetIoConfig(i + 1, DTAPI_IOCONFIG_IODIR, DTAPI_IOCONFIG_OUTPUT, DTAPI_IOCONFIG_OUTPUT);
+			if (res != DTAPI_OK) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config for the device: %s\n", DtapiResult2Str(res)));
 				return GF_BAD_PARAM;
 			}
@@ -516,32 +564,32 @@
 
 		int IoStdValue = -1, IoStdSubValue = -1;
 		res = DtapiVidStd2IoStd(dFormat, linkStd, IoStdValue, IoStdSubValue);
-		if ( res != DTAPI_OK) {
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Unknown VidStd: %s\n", DtapiResult2Str(res)));
 			return GF_BAD_PARAM;
 		}
 
 		for (int i = 0; i < 4; i++)
 		{
-			res = dvc->SetIoConfig(i+1, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
-			if ( res != DTAPI_OK) {
+			res = dt_device->SetIoConfig(i + 1, DTAPI_IOCONFIG_IOSTD, IoStdValue, IoStdSubValue);
+			if (res != DTAPI_OK) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't set I/O config: %s\n", DtapiResult2Str(res)));
 				return GF_BAD_PARAM;
 			}
 		}
 		for (int i = 0; i < 4; i++)
 		{
-			res = mxPort4k.AddPhysicalPort(dvc, i + 1);
-			if (res != DTAPI_OK){
+			res = mxPort4k.AddPhysicalPort(dt_device, i + 1);
+			if (res != DTAPI_OK) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to add port %d to logical 4k port", (i + 1)));
 				return GF_BAD_PARAM;
 			}
 		}
-		
+
 		DtIoConfig  Cfg;
 		std::vector<DtIoConfig>  IoConfigs;
-		DtHwFuncDesc*  pHwf = dvc->m_pHwf;
-		for (int i = 0; i<dvc->m_pHwf->m_DvcDesc.m_NumPorts; i++, pHwf++)
+		DtHwFuncDesc*  pHwf = dt_device->m_pHwf;
+		for (int i = 0; i < dt_device->m_pHwf->m_DvcDesc.m_NumPorts; i++, pHwf++)
 		{
 			// Check if the port has GENNREF capability
 			if ((pHwf->m_Flags & DTAPI_CAP_GENREF) == 0)
@@ -583,16 +631,16 @@
 			// Add to list
 			IoConfigs.push_back(Cfg);
 		}
-		res = dvc->SetIoConfig(IoConfigs.data(), (int)IoConfigs.size());
-		if (res != DTAPI_OK){
+		res = dt_device->SetIoConfig(IoConfigs.data(), (int)IoConfigs.size());
+		if (res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to apply genref\n"));
 			return GF_BAD_PARAM;
 		}
 		mxPort = mxPort4k;
 	}
 
-	res = dtc->m_Matrix->AttachRowToOutput(0, mxPort);
-	if ( res != DTAPI_OK) {
+	res = ctx->dt_matrix->AttachRowToOutput(0, mxPort);
+	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Can't attach to port %d: %s\n", port, DtapiResult2Str(res)));
 		return GF_BAD_PARAM;
 	}
@@ -604,6 +652,7 @@
 
 	// Enable the video
 	RowConfig.m_VideoEnable = true;
+	//todo, make this configurable !
 	RowConfig.m_Video.m_PixelFormat = DT_PXFMT_YUV422P_16B;  // Use a planar format (16-bit)
 	RowConfig.m_Video.m_StartLine1 = RowConfig.m_Video.m_StartLine2 = 1;
 	RowConfig.m_Video.m_NumLines1 = RowConfig.m_Video.m_NumLines2 = -1;
@@ -613,7 +662,7 @@
 	// Enable audio
 	RowConfig.m_AudioEnable = true;
 	// We will add four channels (2x stereo)
-	for (int i = 0; i<4; i++)
+	for (int i = 0; i < 4; i++)
 	{
 		DtMxAudioConfig  AudioConfig;
 		AudioConfig.m_Index = i;
@@ -626,8 +675,8 @@
 	}
 
 	// Apply the row configuration
-	res = dtc->m_Matrix->SetRowConfig(0, RowConfig);
-	if (res != DTAPI_OK){
+	res = ctx->dt_matrix->SetRowConfig(0, RowConfig);
+	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to set row 0 config"));
 		return GF_BAD_PARAM;
 	}
@@ -637,156 +686,118 @@
 
 	int  DefEnd2EndDelay = 0;
 	double CbFrames = 0.0;    // Time available for the call-back method
-	res = dtc->m_Matrix->GetDefEndToEndDelay(DefEnd2EndDelay, CbFrames);
+	ctx->dt_matrix->GetDefEndToEndDelay(DefEnd2EndDelay, CbFrames);
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut]  Default end-to-end delay = %d Frames\n", DefEnd2EndDelay));
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut]  Time-for-Callback = %.1f Frame Period\n", CbFrames));
 	// Apply the default end-to-end delay
-	res = dtc->m_Matrix->SetEndToEndDelay(DefEnd2EndDelay);
-	if (res != DTAPI_OK){
+	res = ctx->dt_matrix->SetEndToEndDelay(DefEnd2EndDelay);
+	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed to set the end-to-end delay (delay=%d)", DefEnd2EndDelay));
 		return GF_BAD_PARAM;
 	}
 
-	dtc->audio_cbk_ctx.type = DtCbkCtx::AUDIO;
-	res = dtc->m_Matrix->AddMatrixCbFunc(OnNewFrame, &dtc->audio_cbk_ctx);
-	if (res != DTAPI_OK){
+	res = ctx->dt_matrix->AddMatrixCbFunc(OnNewFrame, &ctx->audio_cbk);
+	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed register audio callback function"));
 		return GF_BAD_PARAM;
 	}
-	dtc->video_cbk_ctx.type = DtCbkCtx::VIDEO;
-	dtc->video_cbk_ctx.dr = dr;
-	res = dtc->m_Matrix->AddMatrixCbFunc(OnNewFrame, &dtc->video_cbk_ctx);
+	res = ctx->dt_matrix->AddMatrixCbFunc(OnNewFrame, &ctx->video_cbk);
 	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] Failed register video callback function"));
 		return GF_BAD_PARAM;
 	}
 
-	dtc->frameNum = -1;
-	dtc->lastFrameNum = -1;
-	dtc->is_configured = GF_TRUE;
+	ctx->frameNum = 1;
+	ctx->is_configured = GF_TRUE;
 	// Start transmission right now - this function is called during the blit(), and the object clock is initialized
 	//after the blit, starting now will reduce the number of skipped frames at the dektec startup
-	res = dtc->m_Matrix->Start();
-	if ( res != DTAPI_OK) {
+	res = ctx->dt_matrix->Start();
+	if (res != DTAPI_OK) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DekTecOut] Can't start transmission: %s.\n", DtapiResult2Str(res)));
-	} else {
+	}
+	else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DekTecOut] Transmission started.\n"));
-		dtc->is_sending = GF_TRUE;
+		ctx->is_sending = GF_TRUE;
 	}
 	return GF_OK;
 }
 
-static GF_Err Dektec_Blit(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+static GF_Err dtout_initialize(GF_Filter *filter)
 {
-	DtContext *dtc = (DtContext*)dr->opaque;
-	u32 w = video_src->width;
-	u32 h = video_src->height;
-
-	if (dtc->needs_reconfigure) {
-		if ((w==1280) && (h==720)) {
-		} else if ((w==1920) && (h==1080)) {
-		} else if ((w==3840) && (h==2160)) {
-		} else {
-			return GF_NOT_SUPPORTED;
+	GF_DTOutCtx *ctx = (GF_DTOutCtx*)gf_filter_get_udta(filter);
+	DTAPI_RESULT res;
+
+	ctx->dt_device = new DtDevice;
+	ctx->dt_matrix = new DtMxProcess;
+	if (!ctx->dt_matrix || !ctx->dt_device) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] DTA API couldn't be initialized.\n"));
+		if (ctx->dt_device) delete ctx->dt_device;
+		if (ctx->dt_matrix) delete ctx->dt_matrix;
+		ctx->dt_device = NULL;
+		ctx->dt_matrix = NULL;
+		return GF_IO_ERR;
+	}
+
+	ctx->audio_cbk.ctx = ctx;
+	ctx->video_cbk.ctx = ctx;
+
+	if ((ctx->bus >= 0) && (ctx->slot >= 0)) {
+		res = ctx->dt_device->AttachToSlot(ctx->bus, ctx->slot);
+		if (res != DTAPI_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA found on PIC bus %d slot %d: %s - trying enumerating cards\n", ctx->bus, ctx->slot, DtapiResult2Str(res)));
 		}
-		if (dtc->force_width && dtc->force_height) {
-			if ((w != dtc->force_width) || (h != dtc->force_height)) {
-				return GF_NOT_SUPPORTED;
-			}
+		else {
+			return GF_OK;
 		}
-		dtc->needs_reconfigure = GF_FALSE;
-		Dektec_Configure(dr, w, h, (video_src->pixel_format==GF_PIXEL_YV12_10) ? GF_TRUE : GF_FALSE);
-	} else if ((w!=dtc->width) || (h != dtc->height)) {
-		return GF_NOT_SUPPORTED;
 	}
 
-	dtc->pixels_YUV_source = (unsigned char*)video_src->video_buffer;
+	res = ctx->dt_device->AttachToType(2174);
+	if (res != DTAPI_OK) res = ctx->dt_device->AttachToType(2154);
+
+	if (res != DTAPI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] No DTA 2174 or 2154 in system: %s\n", DtapiResult2Str(res)));
+		return GF_BAD_PARAM;
+	}
 	return GF_OK;
 }
 
-
-GF_VideoOutput *NewDektecVideoOutput()
+static void dtout_finalize(GF_Filter *filter)
 {
-	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
-	memset(driv, 0, sizeof(GF_VideoOutput));
-	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "Dektec Video Output", "gpac distribution")
-
-	DtDevice *dvc = new DtDevice;
-	DtMxProcess *Matrix = new DtMxProcess;
-	if (!Matrix || !dvc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DekTecOut] DTA API couldn't be initialized.\n"));
-		delete dvc;
-		delete Matrix;
-		gf_free(driv);
-		return NULL;
-	}
-
-	DtContext *dtc = new DtContext;
-	memset(dtc, 0, sizeof(DtContext));
-	dtc->dvc = dvc;
-	dtc->m_Matrix = Matrix;
-	driv->opaque = (void*)dtc;
-
-	driv->Flush = Dektec_Flush;
-	driv->LockBackBuffer = Dektec_LockBackBuffer;
-	driv->Setup = Dektec_Setup;
-	driv->Shutdown = Dektec_Shutdown;
-	driv->ProcessEvent = Dektec_ProcessEvent;
-	driv->Blit = Dektec_Blit;
-	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_YUV;
-	driv->max_screen_bpp = 10;
-
-	return driv;
-}
+	GF_DTOutCtx *ctx = (GF_DTOutCtx*)gf_filter_get_udta(filter);
 
-void DeleteDektecVideoOutput(void *ifce)
-{
-	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-	DtContext *dtc = (DtContext*)driv->opaque;
-
-	//delete(dtc->dtf);
-	delete(dtc->m_Matrix);
-	delete(dtc->dvc);
-	delete(dtc);
-	gf_free(driv);
+	if (ctx->is_sending) {
+		dtout_disconnect(ctx);
+	}
+	delete(ctx->dt_matrix);
+	delete(ctx->dt_device);
 }
 
+#endif //FAKE_DT_API
 
-#ifndef GPAC_STANDALONE_RENDER_2D
-
-/*interface query*/
-GPAC_MODULE_EXPORT
-	const u32 *QueryInterfaces()
+static GF_Err dtout_process(GF_Filter *filter)
 {
-	static u32 si [] = {
-		GF_VIDEO_OUTPUT_INTERFACE,
-		0
-	};
-	return si;
+	GF_DTOutCtx *ctx = (GF_DTOutCtx*)gf_filter_get_udta(filter);
+	if (!ctx->is_configured && !ctx->is_sending) {
+#ifndef FAKE_DT_API
+		if (ctx->audio_cbk.audio) gf_filter_pid_get_packet(ctx->audio_cbk.audio);
+		if (ctx->video_cbk.video) gf_filter_pid_get_packet(ctx->video_cbk.video);
+#endif
+	}
+	if (ctx->is_eos)
+		return GF_EOS;
+	gf_filter_ask_rt_reschedule(filter, 200000);
+	return GF_OK;
 }
 
-/*interface create*/
-GPAC_MODULE_EXPORT
-	GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewDektecVideoOutput();
-	return NULL;
-}
+#endif //GPAC_HAS_DTAPI
 
-/*interface destroy*/
-GPAC_MODULE_EXPORT
-	void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_VIDEO_OUTPUT_INTERFACE:
-		DeleteDektecVideoOutput((GF_VideoOutput *)ifce);
-		break;
-	}
-}
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+#include "dektec_video_decl.c"
 
-GPAC_MODULE_STATIC_DECLARATION( dektec_out )
 
+#ifdef __cplusplus
+}
 #endif
-
-} /* extern "C" */

gpac-1.0.0.tar.gz/modules/dektec_out/dektec_video.h Added

@@ -0,0 +1,98 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Romain Bouqueau, Jean Le Feuvre
+*			Copyright (c) 2014-2016 GPAC Licensing
+*			Copyright (c) 2016-2020 Telecom Paris
+*					All rights reserved
+*
+*  This file is part of GPAC / Dektec SDI video 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.
+*
+*/
+
+#ifndef _GF_DEKTECVID_H_
+#define _GF_DEKTECVID_H_
+
+#include <gpac/filters.h>
+
+
+
+//#define FAKE_DT_API
+
+#if defined(GPAC_HAS_DTAPI) && !defined(FAKE_DT_API)
+#include <DTAPI.h>
+#endif
+
+#include <gpac/constants.h>
+#include <gpac/color.h>
+#include <gpac/thread.h>
+
+#if defined(GPAC_HAS_DTAPI) && !defined(FAKE_DT_API)
+
+#if defined(WIN32) && !defined(__GNUC__)
+# include <intrin.h>
+#else
+#  include <emmintrin.h>
+#endif
+
+#endif
+
+
+typedef struct {
+	struct _dtout_ctx *ctx;
+	GF_FilterPid *video; //null if audio callback
+	GF_FilterPid *audio; //null if video callback
+} DtCbkCtx;
+
+typedef struct _dtout_ctx
+{
+	//opts
+	s32 bus, slot;
+	GF_Fraction fps;
+	Bool clip;
+	u32 port;
+	Double start;
+
+	u32 width, height, pix_fmt, stride, stride_uv, uv_height, nb_planes;
+	GF_Fraction framerate;
+	Bool is_sending, is_configured, is_10b, is_eos;
+
+#if defined(GPAC_HAS_DTAPI) && !defined(FAKE_DT_API)
+	DtMxProcess *dt_matrix;
+	DtDevice *dt_device;
+	DtCbkCtx audio_cbk, video_cbk;
+#endif
+
+	s64 frameNum;
+	u64 init_clock, last_frame_time;
+
+	u32 frame_dur, frame_scale;
+	Bool needs_reconfigure;
+} GF_DTOutCtx;
+
+
+#if defined(GPAC_HAS_DTAPI)
+GF_Err dtout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+GF_Err dtout_initialize(GF_Filter *filter);
+void dtout_finalize(GF_Filter *filter);
+GF_Err dtout_process(GF_Filter *filter);
+#endif
+
+
+#endif //_GF_DEKTECVID_H_
+
+

gpac-1.0.0.tar.gz/modules/dektec_out/dektec_video_decl.c Added

@@ -0,0 +1,111 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Romain Bouqueau, Jean Le Feuvre
+*			Copyright (c) 2014-2016 GPAC Licensing
+*			Copyright (c) 2016-2020 Telecom Paris
+*					All rights reserved
+*
+*  This file is part of GPAC / Dektec SDI video 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 "dektec_video.h"
+
+
+#ifdef GPAC_HAS_DTAPI
+#define OFFS(_n)	#_n, offsetof(GF_DTOutCtx, _n)
+#else
+#define OFFS(_n)	#_n, -1
+
+static GF_Err dtout_process_dummy(GF_Filter *filter)
+{
+	return GF_OK;
+}
+#endif
+
+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(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 },
+	{ 0 }
+};
+
+static GF_FilterCapability DTOutCaps[3];
+
+GF_FilterRegister DTOutRegister;
+
+#ifdef GPAC_HAS_DTAPI
+GPAC_MODULE_EXPORT
+GF_FilterRegister *RegisterFilter(GF_FilterSession *session)
+#else
+GF_FilterRegister *dtout_register(GF_FilterSession *session)
+#endif
+{
+	memset(DTOutCaps, 0, sizeof(DTOutCaps));
+	memset(&DTOutRegister, 0, sizeof(GF_FilterRegister));
+
+#ifndef GPAC_HAS_DTAPI
+	if (!gf_opts_get_bool("temp", "gendoc"))
+		return NULL;
+	DTOutRegister.version = "! Warning: DekTek SDK NOT AVAILABLE IN THIS BUILD !";
+#endif
+
+	DTOutCaps[0].code = GF_PROP_PID_STREAM_TYPE;
+	DTOutCaps[0].flags = GF_CAPS_INPUT;
+	DTOutCaps[0].val.type = GF_PROP_UINT;
+	DTOutCaps[0].val.value.uint = GF_STREAM_VISUAL;
+
+	DTOutCaps[1].code = GF_PROP_PID_STREAM_TYPE;
+	DTOutCaps[1].flags = GF_CAPS_INPUT;
+	DTOutCaps[1].val.type = GF_PROP_UINT;
+	DTOutCaps[1].val.value.uint = GF_STREAM_AUDIO;
+
+	DTOutCaps[2].code = GF_PROP_PID_CODECID;
+	DTOutCaps[2].flags = GF_CAPS_INPUT;
+	DTOutCaps[2].val.type = GF_PROP_UINT;
+	DTOutCaps[2].val.value.uint = GF_CODECID_RAW;
+
+	DTOutRegister.name = "dtout";
+#ifndef GPAC_DISABLE_DOC
+	DTOutRegister.description = "DekTec SDIOut";
+	DTOutRegister.help = "This filter provides SDI output to be used with __DTA 2174__ or __DTA 2154__ cards.";
+#endif
+	DTOutRegister.private_size = sizeof(GF_DTOutCtx);
+	DTOutRegister.args = DTOutArgs;
+	DTOutRegister.caps = DTOutCaps;
+	DTOutRegister.nb_caps = 3;
+
+#if defined(GPAC_HAS_DTAPI) && !defined(FAKE_DT_API)
+	DTOutRegister.initialize = dtout_initialize;
+	DTOutRegister.finalize = dtout_finalize;
+	DTOutRegister.configure_pid = dtout_configure_pid;
+	DTOutRegister.process = dtout_process;
+#else
+	DTOutRegister.process = dtout_process_dummy;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	dtout_process_dummy(NULL);
+#endif
+
+#endif
+	return &DTOutRegister;
+}

gpac-0.8.0.tar.gz/modules/dektec_out/dektec_video_old.cpp -> gpac-1.0.0.tar.gz/modules/dektec_out/dektec_video_old.cpp Changed

@@ -182,7 +182,7 @@
 
 	static GF_Err Dektec_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
 	{
-		DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
+		//DtFrameBuffer *dtf = (DtFrameBuffer*)(((DtContext*)dr->opaque)->dtf);
 
 		if (evt) {
 			switch (evt->type) {
@@ -227,7 +227,7 @@
 
 		int port = 1;
 		const char *opt;
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "DektecVideo", "SDIOutput");
+		opt = gf_opts_get_key("DektecVideo", "SDIOutput");
 		if (opt) {
 			port = atoi(opt);
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Dektec Out] Using port %d (%s)\n", port, opt));
@@ -241,9 +241,9 @@
 		
 		res = dvc->AttachToType(2174);
 		if (res != DTAPI_OK) res = dvc->AttachToType(2154);
-		res = dvc->AttachToType(-1);
-		res = dvc->AttachToSlot(10, 33);
-		res = dvc->AttachToSerial(2174000447);
+		if (res == DTAPI_OK) res = dvc->AttachToType(-1);
+		if (res == DTAPI_OK) res = dvc->AttachToSlot(10, 33);
+		if (res == DTAPI_OK) res = dvc->AttachToSerial(2174000447);
 
 		if (tru && res != DTAPI_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Dektec Out] No DTA 2174 or 2154 in system: %s\n", DtapiResult2Str(res)));

gpac-1.0.0.tar.gz/modules/dektec_out/out_dektec.vcxproj Added

@@ -0,0 +1,286 @@
+<?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>{042E3638-67F3-4C6C-8C00-CD9BFA416974}</ProjectGuid>
+    <RootNamespace>out_dektec</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <ProjectName>out_dektec</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/out_dektec_deb/out_dektec.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>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Manifest>
+      <OutputManifestFile>$(IntDir)$(TargetFileName).embed.manifest</OutputManifestFile>
+    </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/out_dektec_deb/out_dektec.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>
+    </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/out_dektec_rel/out_dektec.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>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/out_dektec_rel/out_dektec.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>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\dektec_out\dektec_video.cpp" />
+    <ClCompile Include="..\..\modules\filter_export.cpp" />
+  </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-0.8.0.tar.gz/modules/demo_is/Makefile -> gpac-1.0.0.tar.gz/modules/demo_is/Makefile Changed

gpac-0.8.0.tar.gz/modules/demo_is/demo_is.c -> gpac-1.0.0.tar.gz/modules/demo_is/demo_is.c Changed

gpac-1.0.0.tar.gz/modules/deprecated Added

gpac-1.0.0.tar.gz/modules/deprecated/epoc_hw Added

gpac-1.0.0.tar.gz/modules/deprecated/epoc_hw/epoc_aout.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/epoc_hw/epoc_codec.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/epoc_hw/epoc_vout.cpp Added

@@ -0,0 +1,555 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / EPOC video output module
+ *
+ *  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.
+ *
+ */
+
+/*driver interface*/
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/codec.h>
+
+#include <w32std.h>
+
+#ifdef GPAC_USE_GLES1X
+#include <GLES/egl.h>
+#endif
+
+typedef struct
+{
+	RWindow *window;
+	RWsSession *session;
+
+	u32 pixel_format, bpp, width, height;
+	CWsScreenDevice *screen;
+	CFbsBitmap *surface;
+	CWindowGc *gc;
+
+	char *locked_data;
+	u32 output_3d_type;
+
+#ifdef GPAC_USE_GLES1X
+	EGLDisplay egl_display;
+	EGLSurface egl_surface;
+	EGLContext egl_context;
+#endif
+
+} EPOCVideo;
+
+
+static void EVID_ResetSurface(GF_VideoOutput *dr, Bool gl_only)
+{
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+
+#ifdef GPAC_USE_GLES1X
+	if (ctx->egl_display) {
+		eglMakeCurrent(ctx->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+		if (ctx->egl_context) eglDestroyContext(ctx->egl_display, ctx->egl_context);
+		ctx->egl_context = NULL;
+		if (ctx->egl_surface) eglDestroySurface(ctx->egl_display, ctx->egl_surface);
+		ctx->egl_surface = NULL;
+		eglTerminate(ctx->egl_display);
+		ctx->egl_display = NULL;
+	}
+#endif
+	if (gl_only) return;
+
+	if (ctx->locked_data) ctx->surface->UnlockHeap();
+	ctx->locked_data = NULL;
+	if (ctx->surface) delete ctx->surface;
+	ctx->surface = NULL;
+	if (ctx->gc) delete ctx->gc;
+	ctx->gc = NULL;
+	if (ctx->screen) delete ctx->screen;
+	ctx->screen = NULL;
+}
+
+static GF_Err EVID_InitSurface(GF_VideoOutput *dr)
+{
+	TInt gl_buffer_size;
+	TInt e;
+	TDisplayMode disp_mode;
+	TSize s;
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Reseting video\n"));
+	EVID_ResetSurface(dr, 0);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video reset OK\n"));
+
+	ctx->screen = new CWsScreenDevice(*ctx->session);
+	if (!ctx->screen) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create screen device for session\n"));
+		return GF_IO_ERR;
+	}
+	e = ctx->screen->Construct();
+	if (e != KErrNone) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot construct screen device for session - error %d\n", e));
+		return GF_IO_ERR;
+	}
+	e = ctx->screen->CreateContext(ctx->gc);
+	if (e != KErrNone) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create graphical context - error %d\n", e));
+		return GF_IO_ERR;
+	}
+
+	ctx->surface = new CFbsBitmap();
+	if (!ctx->surface) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot allocate backbuffer surface\n"));
+		return GF_IO_ERR;
+	}
+
+	s = ctx->window->Size();
+	disp_mode = ctx->screen->DisplayMode();
+	e = ctx->surface->Create(s, disp_mode);
+	if (e != KErrNone) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create backbuffer surface - error %d\n", e));
+		return GF_IO_ERR;
+	}
+
+	gl_buffer_size = 0;
+	switch (disp_mode) {
+	case EGray256:
+		ctx->pixel_format = GF_PIXEL_GREYSCALE;
+		ctx->bpp = 1;
+		break;
+	case EColor64K:
+		ctx->pixel_format = GF_PIXEL_RGB_565;
+		ctx->bpp = 2;
+		gl_buffer_size = 16;
+		break;
+	case EColor16M:
+		ctx->pixel_format = GF_PIXEL_RGB_24;
+		ctx->bpp = 3;
+		gl_buffer_size = 24;
+		break;
+	/** 4096 colour display (12 bpp). */
+	case EColor4K:
+		ctx->pixel_format = GF_PIXEL_RGB_444;
+		ctx->bpp = 2;
+		gl_buffer_size = 12;
+		break;
+	/** True colour display mode (32 bpp, but top byte is unused and unspecified) */
+	case EColor16MU:
+		ctx->pixel_format = GF_PIXEL_RGB_32;
+		ctx->bpp = 4;
+		gl_buffer_size = 32;
+		break;
+#if defined(__SERIES60_3X__)
+	/** Display mode with alpha (24bpp colour plus 8bpp alpha) */
+	case EColor16MA:
+		ctx->pixel_format = GF_PIXEL_ARGB;
+		ctx->bpp = 4;
+		gl_buffer_size = 32;
+		break;
+#endif
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Unsupported display type %d\n", disp_mode));
+		return GF_NOT_SUPPORTED;
+	}
+	ctx->width = s.iWidth;
+	ctx->height = s.iHeight;
+
+#ifdef GPAC_USE_GLES1X
+	if (ctx->output_3d_type==1) {
+		if (!gl_buffer_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Display mode not supported by OpenGL\n"));
+			return GF_IO_ERR;
+		}
+		ctx->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+		if (ctx->egl_display == NULL) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot open OpenGL display\n"));
+			return GF_IO_ERR;
+		}
+
+		if (eglInitialize(ctx->egl_display, NULL, NULL) == EGL_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot initialize OpenGL display\n"));
+			return GF_IO_ERR;
+		}
+		EGLConfig *configList = NULL;
+		EGLint numOfConfigs = 0;
+		EGLint configSize   = 0;
+		if (eglGetConfigs(ctx->egl_display, configList, configSize, &numOfConfigs) == EGL_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot retrieve OpenGL configurations\n"));
+			return GF_IO_ERR;
+		}
+		configSize = numOfConfigs;
+		configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
+
+		// Define properties for the wanted EGLSurface
+		EGLint atts[7];
+		const char *opt = gf_opts_get_key("core", "gl-bits-depth");
+
+		atts[0] = EGL_BUFFER_SIZE;
+		atts[1] = gl_buffer_size;
+		atts[2] = EGL_DEPTH_SIZE;
+		atts[3] = opt ? atoi(opt) : 16;
+		atts[4] = EGL_SURFACE_TYPE;
+		atts[5] = EGL_PIXMAP_BIT;
+		atts[6] = EGL_NONE;
+
+		if (eglChooseConfig(ctx->egl_display, atts, configList, configSize, &numOfConfigs) == EGL_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot choose OpenGL configuration\n"));
+			return GF_IO_ERR;
+		}
+		EGLConfig gl_cfg = configList[0];
+		gf_free(configList);
+
+		ctx->egl_surface = eglCreatePixmapSurface(ctx->egl_display, gl_cfg, ctx->surface, NULL);
+		if (ctx->egl_surface == NULL) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL surface\n"));
+			return GF_IO_ERR;
+		}
+		ctx->egl_context = eglCreateContext(ctx->egl_display, gl_cfg, EGL_NO_CONTEXT, NULL);
+		if (ctx->egl_context == NULL) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL context\n"));
+			return GF_IO_ERR;
+		}
+		if (eglMakeCurrent(ctx->egl_display, ctx->egl_surface, ctx->egl_surface, ctx->egl_context) == EGL_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot bind OpenGL context to current thread\n"));
+			return GF_IO_ERR;
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video OpenGL setup\n"));
+	}
+
+#endif
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Video setup OK - %d x %d @ PixelFormat %s\n", ctx->width, ctx->height, gf_4cc_to_str(ctx->pixel_format) ));
+	return GF_OK;
+}
+
+#ifdef GPAC_USE_GLES1X
+
+static GF_Err EVID_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
+{
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+	EVID_ResetSurface(dr, 1);
+	if (!ctx->screen) return GF_NOT_SUPPORTED;
+
+	TDisplayMode disp_mode = ctx->screen->DisplayMode();
+	TInt gl_buffer_size = 0;
+	switch (disp_mode) {
+	case EColor64K:
+		gl_buffer_size = 16;
+		break;
+	case EColor16M:
+		gl_buffer_size = 24;
+		break;
+	/** 4096 colour display (12 bpp). */
+	case EColor4K:
+		gl_buffer_size = 12;
+		break;
+	/** True colour display mode (32 bpp, but top byte is unused and unspecified) */
+	case EColor16MU:
+		gl_buffer_size = 32;
+		break;
+#if defined(__SERIES60_3X__)
+	/** Display mode with alpha (24bpp colour plus 8bpp alpha) */
+	case EColor16MA:
+		gl_buffer_size = 32;
+		break;
+#endif
+	case EGray256:
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Unsupported display type %d for OpenGL\n", disp_mode));
+		return GF_NOT_SUPPORTED;
+	}
+
+	ctx->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+	if (ctx->egl_display == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot open OpenGL display\n"));
+		return GF_IO_ERR;
+	}
+
+	if (eglInitialize(ctx->egl_display, NULL, NULL) == EGL_FALSE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot initialize OpenGL display\n"));
+		return GF_IO_ERR;
+	}
+
+	EGLConfig *configList = NULL;
+	EGLint numOfConfigs = 0;
+	EGLint configSize   = 0;
+	if (eglGetConfigs(ctx->egl_display, configList, configSize, &numOfConfigs) == EGL_FALSE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot retrieve OpenGL configurations\n"));
+		return GF_IO_ERR;
+	}
+	configSize = numOfConfigs;
+	configList = (EGLConfig*) gf_malloc(sizeof(EGLConfig)*configSize);
+
+	// Define properties for the wanted EGLSurface
+	EGLint atts[13];
+	const char *opt = gf_opts_get_key("core", "gl-bits-depth");
+	atts[0] = EGL_RED_SIZE;
+	atts[1] = 8;
+	atts[2] = EGL_GREEN_SIZE;
+	atts[3] = 8;
+	atts[4] = EGL_BLUE_SIZE;
+	atts[5] = 8;
+	atts[6] = EGL_ALPHA_SIZE;
+	atts[7] = (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? 8 : EGL_DONT_CARE;
+	atts[8] = EGL_SURFACE_TYPE;
+	atts[9] = EGL_PBUFFER_BIT;
+	atts[10] = EGL_DEPTH_SIZE;
+	atts[11] = opt ? atoi(opt) : 16;
+	atts[12] = EGL_NONE;
+
+	if (eglChooseConfig(ctx->egl_display, atts, configList, configSize, &numOfConfigs) == EGL_FALSE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot choose Offscreen OpenGL configuration\n"));
+		return GF_IO_ERR;
+	}
+	EGLConfig gl_cfg = configList[0];
+	gf_free(configList);
+
+	atts[0] = EGL_WIDTH;
+	atts[1] = width;
+	atts[2] = EGL_HEIGHT;
+	atts[3] = height;
+	atts[4] = EGL_NONE;
+
+	ctx->egl_surface = eglCreatePbufferSurface(ctx->egl_display, gl_cfg, atts);
+	if (ctx->egl_surface == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create OpenGL Pbuffer\n"));
+		return GF_IO_ERR;
+	}
+	ctx->egl_context = eglCreateContext(ctx->egl_display, gl_cfg, EGL_NO_CONTEXT, NULL);
+	if (ctx->egl_context == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot create Offscreen OpenGL context\n"));
+		return GF_IO_ERR;
+	}
+	if (eglMakeCurrent(ctx->egl_display, ctx->egl_surface, ctx->egl_surface, ctx->egl_context) == EGL_FALSE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[EPOC Video] Cannot bind Offscreen OpenGL context to current thread\n"));
+		return GF_IO_ERR;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL setup - size %d x %d\n", width, height));
+	return GF_OK;
+}
+#endif
+
+
+static GF_Err EVID_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
+{
+	GF_Err res;
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+
+	ctx->window = (RWindow *)os_handle;
+	ctx->session = (RWsSession *)os_display;
+
+	res = EVID_InitSurface(dr);
+
+	/*setup opengl offscreen*/
+#ifdef GPAC_USE_GLES1X
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Querying Offscreen OpenGL Capabilities\n"));
+	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+	GF_Err e = EVID_SetupOGL_ES_Offscreen(dr, 20, 20);
+	if (e!=GF_OK) {
+		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+		e = EVID_SetupOGL_ES_Offscreen(dr, 20, 20);
+	}
+	if (!e) {
+		dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL available - alpha support: %s\n", (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? "yes" : "no"));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Offscreen OpenGL not available\n"));
+	}
+#endif
+
+	return res;
+}
+
+static void EVID_Shutdown(GF_VideoOutput *dr)
+{
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+	EVID_ResetSurface(dr, 0);
+	ctx->session = NULL;
+	ctx->window = NULL;
+}
+
+static GF_Err EVID_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
+{
+	//EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err EVID_Flush(GF_VideoOutput *dr, GF_Window *dest)
+{
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+
+	if (ctx->gc && ctx->surface) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Activating window\n"));
+		ctx->gc->Activate(*ctx->window);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Bliting backbuffer\n"));
+		ctx->gc->BitBlt(TPoint(0,0), ctx->surface);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Deactivating window\n"));
+		ctx->gc->Deactivate();
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Flush success\n"));
+	}
+	return GF_OK;
+}
+
+static GF_Err EVID_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+{
+	//EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+	if (!evt) return GF_OK;
+
+	switch (evt->type) {
+	case GF_EVENT_SHOWHIDE:
+		break;
+	case GF_EVENT_SIZE:
+		/*nothing to do since we don't own the window*/
+		break;
+	case GF_EVENT_VIDEO_SETUP:
+		((EPOCVideo *)dr->opaque)->output_3d_type = evt->setup.opengl_mode;
+		if (evt->setup.opengl_mode==2) {
+#ifdef GPAC_USE_GLES1X
+			return EVID_SetupOGL_ES_Offscreen(dr, evt->setup.width, evt->setup.height);
+#else
+			return GF_NOT_SUPPORTED;
+#endif
+		}
+		return EVID_InitSurface(dr/*, evt->size.width, evt->size.height*/);
+	}
+	return GF_OK;
+}
+
+static GF_Err EVID_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
+{
+	EPOCVideo *ctx = (EPOCVideo *)dr->opaque;
+	if (!ctx->surface) return GF_BAD_PARAM;
+
+	if (do_lock) {
+		if (!ctx->locked_data) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Locking backbuffer memory\n"));
+			ctx->surface->LockHeap();
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Retrieving backbuffer memory address\n"));
+			ctx->locked_data = (char *)ctx->surface->DataAddress();
+		}
+		memset(vi, 0, sizeof(GF_VideoSurface));
+		vi->height = ctx->height;
+		vi->width = ctx->width;
+		vi->is_hardware_memory = 0;
+		vi->pitch = ctx->width * ctx->bpp;
+		vi->pixel_format = ctx->pixel_format;
+		vi->video_buffer = ctx->locked_data;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Backbuffer locked OK - address 0x%08x\n", ctx->locked_data));
+	} else {
+		if (ctx->locked_data) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Unlocking backbuffer memory\n"));
+			ctx->surface->UnlockHeap();
+			ctx->locked_data = NULL;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[EPOC Video] Backbuffer unlocked OK\n"));
+		}
+	}
+	return GF_OK;
+}
+
+static void *EPOC_vout_new()
+{
+	EPOCVideo *priv;
+	GF_VideoOutput *driv;
+	GF_SAFEALLOC(driv, GF_VideoOutput);
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "EPOC Video Output", "gpac distribution")
+
+	GF_SAFEALLOC(priv, EPOCVideo);
+	driv->opaque = priv;
+
+	/*alpha and keying to do*/
+	driv->hw_caps = 0;
+#ifdef GPAC_USE_GLES1X
+	/*no offscreen opengl with epoc at the moment*/
+	driv->hw_caps |= GF_VIDEO_HW_OPENGL;
+#endif
+
+	driv->Setup = EVID_Setup;
+	driv->Shutdown = EVID_Shutdown;
+	driv->Flush = EVID_Flush;
+	driv->ProcessEvent = EVID_ProcessEvent;
+	driv->Blit = NULL;
+	driv->LockBackBuffer = EVID_LockBackBuffer;
+	driv->SetFullScreen = EVID_SetFullScreen;
+	return (void *)driv;
+}
+static void EPOC_vout_del(void *ifce)
+{
+	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
+	EPOCVideo *priv = (EPOCVideo *)driv->opaque;
+	gf_free(priv);
+	gf_free(driv);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+void *EPOC_aout_new();
+void EPOC_aout_del(void *ifce);
+
+void EPOC_codec_del(void *ifcg);
+void *EPOC_codec_new();
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_VIDEO_OUTPUT_INTERFACE,
+		GF_AUDIO_OUTPUT_INTERFACE,
+		GF_MEDIA_DECODER_INTERFACE,
+		0
+	};
+	return si;
+}
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) EPOC_vout_new();
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return (GF_BaseInterface *) EPOC_aout_new();
+	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *) EPOC_codec_new();
+	return NULL;
+}
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	GF_VideoOutput *dd = (GF_VideoOutput *)ifce;
+	switch (dd->InterfaceType) {
+	case GF_VIDEO_OUTPUT_INTERFACE:
+		EPOC_vout_del(dd);
+		break;
+	case GF_AUDIO_OUTPUT_INTERFACE:
+		EPOC_aout_del(ifce);
+		break;
+	case GF_MEDIA_DECODER_INTERFACE:
+		EPOC_codec_del(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( epoc_vout )
+
+#ifdef __cplusplus
+}
+#endif
+

gpac-1.0.0.tar.gz/modules/deprecated/old_arch Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/audio_filter Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/audio_filter/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/audio_filter/audio_filter.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/avcap Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/avcap/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/avcap/avcap.cpp Added

@@ -0,0 +1,508 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-20XX
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AVCAP video input module
+ *
+ *  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 <avcap/avcap.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/modules/service.h>
+#include <gpac/modules/codec.h>
+/*for GF_STREAM_PRIVATE_SCENE definition*/
+#include <gpac/constants.h>
+#include <gpac/download.h>
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#if !defined(__GNUC__)&& (defined(_WIN32_WCE) || defined (WIN32))
+#  pragma comment(lib, "strmiids")
+#ifdef _DEBUG
+#  pragma comment(lib, "avcapd")
+#  pragma comment(lib, "strmbasd")
+#else
+#  pragma comment(lib, "avcap")
+#  pragma comment(lib, "strmbase")
+#endif
+#  pragma comment(lib, "winmm")
+#endif
+
+
+using namespace avcap;
+
+class GPACCaptureHandler : public CaptureHandler
+{
+public:
+	GPACCaptureHandler(GF_ClientService *service, LPNETCHANNEL channel)
+		: m_pService(service), m_pChannel(channel), m_data(NULL)
+	{
+		memset(&m_pSLHeader, 0, sizeof(GF_SLHeader));
+		m_pSLHeader.compositionTimeStampFlag = 1;
+	}
+	virtual ~GPACCaptureHandler() {
+		if (m_data != NULL) {
+			gf_free(m_data);
+			m_data=NULL;
+		}
+	}
+
+	GF_ClientService *m_pService;
+	LPNETCHANNEL m_pChannel;
+	GF_SLHeader m_pSLHeader;
+
+	u32 m_height;
+	u32 m_stride;
+
+	char* m_data;
+
+public:
+	void AllocData(u32 height, u32 stride) {
+		m_height = height;
+		m_stride = stride;
+		m_data = (char*)gf_malloc(m_height * m_stride);
+	}
+	/* This method is called by the CaptureManager, when new data was captured.
+	 * \param io_buf The buffer, that contains the captured data. */
+	void handleCaptureEvent(IOBuffer* io_buf);
+};
+
+
+void GPACCaptureHandler::handleCaptureEvent(IOBuffer* io_buf)
+{
+	m_pSLHeader.compositionTimeStamp = io_buf->getTimestamp();
+
+	if (m_data) {
+		char* data = (char*)io_buf->getPtr();
+		for (u32 i=0; i<m_height; i++) {
+			memcpy(m_data + (m_height - 1 - i) * m_stride, data + i*m_stride, m_stride);
+		}
+		gf_service_send_packet(m_pService, m_pChannel, m_data, (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
+	} else {
+		gf_service_send_packet(m_pService, m_pChannel, (char *) io_buf->getPtr(), (u32)io_buf->getValidBytes(), &m_pSLHeader, GF_OK);
+	}
+	io_buf->release();
+}
+
+DeviceDescriptor* get_device_descriptor(char *name)
+{
+	// find the descriptor of the device in the device-list by index
+	const DeviceCollector::DeviceList& dl = DEVICE_COLLECTOR::instance().getDeviceList();
+	DeviceDescriptor* dd = 0;
+	int index = 0;
+
+	for(DeviceCollector::DeviceList::const_iterator i = dl.begin(); i != dl.end(); i++, index++) {
+		dd = *i;
+
+		if (!name || !stricmp(name, "default") )
+			return dd;
+		if (strstr((char *) dd->getName().c_str(), name) != NULL)
+			return dd;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Cannot find capture driver %s\n", name));
+	return NULL;
+}
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct
+{
+	/*the service we're responsible for*/
+	GF_ClientService *service;
+	u32 state;
+
+	DeviceDescriptor *device_desc;
+	CaptureDevice* device;
+
+	GPACCaptureHandler *video_handler;
+	GPACCaptureHandler *audio_handler;
+
+	u32 width, height, pixel_format, stride, out_size, fps;
+	u32 default_4cc;
+	Bool flip_video;
+} AVCapIn;
+
+
+Bool AVCap_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	if (!strnicmp(url, "camera://", 9)) return GF_TRUE;
+	if (!strnicmp(url, "video://", 8)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+GF_Err AVCap_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	GF_ESD *esd;
+	GF_BitStream *bs;
+	GF_ObjectDescriptor *od;
+	const char *opt;
+	AVCapIn *vcap = (AVCapIn *) plug->priv;
+
+	if (!vcap || !serv || !url) return GF_BAD_PARAM;
+
+	vcap->state = 0;
+	vcap->service = serv;
+
+	opt = gf_opts_get_key("AVCap", "FlipVideo");
+	if (opt && !strcmp(opt, "yes"))	vcap->flip_video = GF_TRUE;
+
+	if (!vcap->device_desc) {
+		Format *format;
+		u32 default_4cc;
+		char *name;
+		char *params = (char *) strchr(url, '?');
+		if (params) params[0] = 0;
+		name = (char *) strstr(url, "://");
+		if (name) name += 3;
+		/* get device by name  */
+		vcap->device_desc = get_device_descriptor(name);
+		if (params) {
+			params[0] = '?';
+			params ++;
+		}
+
+		if (!vcap->device_desc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Failed to instanciate AVCap\n"));
+			gf_service_connect_ack(serv, NULL, GF_REMOTE_SERVICE_ERROR);
+			return GF_OK;
+		}
+
+		vcap->device_desc->open();
+		if ( (!strnicmp(url, "camera://", 9) || !strnicmp(url, "video://", 8)) && !vcap->device_desc->isVideoCaptureDev()) {
+			vcap->device_desc->close();
+			gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
+			return GF_OK;
+		}
+		else if (!strnicmp(url, "audio://", 8) && !vcap->device_desc->isAudioDev()) {
+			vcap->device_desc->close();
+			gf_service_connect_ack(serv, NULL, GF_URL_ERROR);
+			return GF_OK;
+		}
+		vcap->device = vcap->device_desc->getDevice();
+		if (!vcap->device) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Failed to initialize capture device\n"));
+			vcap->device_desc->close();
+			gf_service_connect_ack(serv, NULL, GF_SERVICE_ERROR);
+			return GF_OK;
+		}
+		vcap->device->getFormatMgr()->setFramerate(30);
+
+		default_4cc = 0;
+		opt = gf_opts_get_key("AVCap", "Default4CC");
+		if (opt) {
+			default_4cc = GF_4CC(opt[0], opt[1], opt[2], opt[3]);
+			vcap->device->getFormatMgr()->setFormat(default_4cc);
+		}
+
+
+		while (params) {
+			char *sep = (char *) strchr(params, '&');
+			if (sep) sep[0] = 0;
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set camera option %s\n", params));
+
+			if (!strnicmp(params, "resolution=", 11)) {
+				u32 w, h;
+				if (sscanf(params+11, "%dx%d", &w, &h)==2) {
+					vcap->device->getFormatMgr()->setResolution(w, h);
+					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set resolution to %dx%d\n", w, h));
+				}
+			}
+			else if (!strnicmp(params, "fps=", 4)) {
+				u32 fps;
+				if (sscanf(params+4, "%d", &fps)==1) {
+					vcap->device->getFormatMgr()->setFramerate(fps);
+					GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Set framerate to %d\n", fps));
+				}
+			}
+			else if (!strnicmp(params, "stereo=", 7)) {
+			}
+			else if (!strnicmp(params, "mode=", 5)) {
+			}
+			else if (!strnicmp(params, "fmt=", 4)) {
+				if (!strnicmp(params+4, "rgb", 3)) {
+					default_4cc = GF_4CC('3', 'B', 'G', 'R');
+				}
+				else if (!strnicmp(params+4, "yuv", 3)) {
+					default_4cc = GF_4CC('V', 'Y', 'U', 'Y');
+				}
+				else if (strlen(params+4)>=4) {
+					default_4cc = GF_4CC(params[4], params[5], params[6], params[7]);
+				}
+			}
+
+			if (!sep) break;
+			sep[0] = '&';
+			params = sep+1;
+		}
+
+		vcap->width = vcap->device->getFormatMgr()->getWidth();
+		vcap->height = vcap->device->getFormatMgr()->getHeight();
+		vcap->fps = vcap->device->getFormatMgr()->getFramerate();
+
+		if (default_4cc )
+			vcap->device->getFormatMgr()->setFormat(default_4cc );
+
+		format = vcap->device->getFormatMgr()->getFormat();
+		switch (format->getFourcc()) {
+		case GF_4CC('V', 'Y', 'U', 'Y'):
+		case GF_4CC('2', 'Y', 'U', 'Y'):
+			vcap->pixel_format = GF_PIXEL_YUY2;
+			vcap->stride = 2*vcap->width;
+			vcap->out_size = 2*vcap->width*vcap->height;
+			break;
+		case GF_4CC('2', '1', 'U', 'Y'):
+			vcap->pixel_format = GF_PIXEL_I420;
+			vcap->stride = (u32)vcap->device->getFormatMgr()->getBytesPerLine();//1.5*vcap->width;//
+			vcap->out_size = (u32)vcap->device->getFormatMgr()->getImageSize();//1.5*vcap->width*vcap->height;//
+			break;
+		case GF_4CC('3', 'B', 'G', 'R'):
+			vcap->pixel_format = GF_PIXEL_BGR_24;
+			vcap->stride = vcap->device->getFormatMgr()->getBytesPerLine();//1.5*vcap->width;//
+			vcap->out_size = (u32)vcap->device->getFormatMgr()->getImageSize();//1.5*vcap->width*vcap->height;//
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[VideoCapture] Unsupported 4CC %s (%08x) from capture device\n", gf_4cc_to_str(format->getFourcc()), format->getFourcc()));
+			vcap->device_desc->close();
+			gf_service_connect_ack(serv, NULL, GF_NOT_SUPPORTED);
+			return GF_OK;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[VideoCapture] Device configured - resolution %dx%d - Frame Rate %d - Pixel Format %s (Device 4CC %08x) \n", vcap->width, vcap->height, vcap->fps, gf_4cc_to_str(vcap->pixel_format), format->getFourcc()));
+	}
+
+	/*ACK connection is OK*/
+	gf_service_connect_ack(serv, NULL, GF_OK);
+
+
+	/*setup object descriptor*/
+	od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+
+	esd = gf_odf_desc_esd_new(0);
+	esd->slConfig->timestampResolution = 1000;
+	if (!strnicmp(url, "camera://", 9) || !strnicmp(url, "video://", 8)) {
+		od->objectDescriptorID = 1;
+		esd->ESID = 1;
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+	} else {
+		od->objectDescriptorID = 2;
+		esd->ESID = 2;
+		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+	}
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u32(bs, vcap->pixel_format);
+	gf_bs_write_u16(bs, vcap->width);
+	gf_bs_write_u16(bs, vcap->height);
+	gf_bs_write_u32(bs, vcap->out_size);
+	gf_bs_write_u32(bs, vcap->stride);
+	gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+	gf_bs_del(bs);
+
+	gf_list_add(od->ESDescriptors, esd);
+	gf_service_declare_media(vcap->service, (GF_Descriptor*)od, GF_FALSE);
+
+	return GF_OK;
+}
+
+GF_Err AVCap_CloseService(GF_InputService *plug)
+{
+	AVCapIn *vcap = (AVCapIn *) plug->priv;
+	if (vcap->device_desc) {
+		vcap->device_desc->close();
+		vcap->device_desc = NULL;
+	}
+
+	vcap->state = 0;
+	gf_service_disconnect_ack(vcap->service, NULL, GF_OK);
+	return GF_OK;
+}
+
+/*Dummy input just send a file name, no multitrack to handle so we don't need to check sub_url nor expected type*/
+static GF_Descriptor *AVCap_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	return NULL;
+}
+
+
+GF_Err AVCap_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	AVCapIn *vcap = (AVCapIn *) plug->priv;
+
+	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
+
+	switch (com->command_type) {
+	case GF_NET_CHAN_SET_PULL:
+		return GF_NOT_SUPPORTED;
+	case GF_NET_CHAN_INTERACTIVE:
+		return GF_OK;
+	/*since data is file-based, no padding is needed (decoder plugin will handle it itself)*/
+	case GF_NET_CHAN_SET_PADDING:
+		return GF_OK;
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 500;
+		return GF_OK;
+	case GF_NET_CHAN_DURATION:
+		/*this module is not made for updates, use undefined duration*/
+		com->duration.duration = 0;
+		return GF_OK;
+	case GF_NET_CHAN_PLAY:
+		if (vcap->state==0) {
+			/*start capture*/
+			if (vcap->video_handler)
+				vcap->device->getVidCapMgr()->registerCaptureHandler(vcap->video_handler);
+
+			if (vcap->device->getVidCapMgr()->startCapture() != -1)
+				vcap->state = 1;
+			else
+				vcap->device->getVidCapMgr()->removeCaptureHandler();
+		}
+		return GF_OK;
+	case GF_NET_CHAN_STOP:
+		if (vcap->state==1) {
+			/*stop capture*/
+			vcap->device->getVidCapMgr()->removeCaptureHandler();
+			vcap->device->getVidCapMgr()->stopCapture();
+			vcap->state = 0;
+		}
+		return GF_OK;
+	case GF_NET_CHAN_CONFIG:
+		return GF_OK;
+	case GF_NET_CHAN_GET_DSI:
+		com->get_dsi.dsi = NULL;
+		com->get_dsi.dsi_len = 0;
+		return GF_OK;
+	default:
+		break;
+	}
+	return GF_OK;
+}
+
+GF_Err AVCap_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	u32 ESID;
+	AVCapIn *vcap = (AVCapIn *) plug->priv;
+
+	sscanf(url, "ES_ID=%u", &ESID);
+	if (ESID == 1) {
+		/*video connect*/
+		vcap->video_handler = new GPACCaptureHandler(vcap->service, channel);
+
+		if (vcap->flip_video)
+			vcap->video_handler->AllocData(vcap->height, vcap->stride);
+
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
+	} else if (ESID == 2) {
+		/*audio connect*/
+		vcap->audio_handler = new GPACCaptureHandler(vcap->service, channel);
+		gf_service_connect_ack(vcap->service, channel, GF_OK);
+	} else {
+		gf_service_connect_ack(vcap->service, channel, GF_STREAM_NOT_FOUND);
+	}
+	return GF_OK;
+}
+
+GF_Err AVCap_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	AVCapIn *vcap = (AVCapIn *) plug->priv;
+	if (vcap->video_handler && vcap->video_handler->m_pChannel==channel) {
+		delete vcap->video_handler;
+		vcap->video_handler = NULL;
+	}
+	else if (vcap->audio_handler && vcap->audio_handler->m_pChannel==channel) {
+		delete vcap->audio_handler;
+		vcap->audio_handler = NULL;
+	}
+	gf_service_disconnect_ack(vcap->service, channel, GF_OK);
+	return GF_OK;
+}
+
+Bool AVCap_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+	return GF_FALSE;
+}
+
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_NET_CLIENT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_NET_CLIENT_INTERFACE) {
+		AVCapIn *vcap;
+		GF_InputService *plug;
+		GF_SAFEALLOC(plug, GF_InputService);
+		memset(plug, 0, sizeof(GF_InputService));
+		GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "Video Capture using libavcap", "gpac distribution")
+
+		plug->RegisterMimeTypes = NULL;
+		plug->CanHandleURL = AVCap_CanHandleURL;
+		plug->ConnectService = AVCap_ConnectService;
+		plug->CloseService = AVCap_CloseService;
+		plug->GetServiceDescriptor = AVCap_GetServiceDesc;
+		plug->ConnectChannel = AVCap_ConnectChannel;
+		plug->DisconnectChannel = AVCap_DisconnectChannel;
+		plug->ServiceCommand = AVCap_ServiceCommand;
+		plug->CanHandleURLInService = AVCap_CanHandleURLInService;
+
+		GF_SAFEALLOC(vcap, AVCapIn);
+		plug->priv = vcap;
+		return (GF_BaseInterface *)plug;
+	}
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *bi)
+{
+	if (bi->InterfaceType==GF_NET_CLIENT_INTERFACE) {
+		GF_InputService *ifcn = (GF_InputService*)bi;
+		AVCapIn *vcap = (AVCapIn*)ifcn->priv;
+		gf_free(vcap);
+		gf_free(bi);
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( avcap )
+
+#ifdef __cplusplus
+}
+#endif

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/Makefile Added

@@ -0,0 +1,88 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/ffmpeg_in
+
+CFLAGS=-fPIC $(OPTFLAGS) -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LOCAL_LIB=
+
+LINKFLAGS=$(ffmpeg_lflags)
+
+ifeq ($(STATICBUILD),yes)
+##include static modules and other deps for libgpac
+include ../../static.mak
+LINKFLAGS+=-lgpac_static
+LINKFLAGS+=$(EXTRALIBS)
+else
+LINKFLAGS+=-lgpac
+endif
+
+#common obj
+OBJS=ffmpeg_decode.o ffmpeg_demux.o ffmpeg_load.o
+
+
+#darwin needs bz2
+ifeq ($(CONFIG_DARWIN),yes)
+LINKFLAGS+=-lbz2
+endif
+
+#old ffmpeg lib
+ifeq ($(CONFIG_FFMPEG_OLD), yes)
+CFLAGS+=-DFFMPEG_OLD_HEADERS -I/usr/include
+else
+LINKFLAGS+=-lswscale
+endif
+
+#local ffmpeg lib
+ifeq ($(CONFIG_FFMPEG), local)
+LOCAL_LIB=-L../../extra_lib/lib/gcc
+CFLAGS+= -I"$(LOCAL_INC_PATH)"
+endif
+
+ifeq ($(CONFIG_ZLIB), local)
+LOCAL_LIB=-L../../extra_lib/lib/gcc
+endif
+
+
+SRCS := $(OBJS:.o=.c)
+
+LIB=gm_ffmpeg_in$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_WIN32),yes)
+#LDFLAGS+=-export-symbols ffmpeg_in.def
+endif
+
+#need to add cross-libraries if not local
+ifeq ($(CROSS_COMPILING),yes)
+LINKFLAGS+=-L$(prefix)/$(libdir)
+endif
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) -L../../bin/gcc $(LOCAL_LIB) $(LDFLAGS) $(LINKFLAGS)
+
+clean:
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_decode.c Added

@@ -0,0 +1,1811 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / FFMPEG module
+ *
+ *  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 "ffmpeg_in.h"
+#include <gpac/avparse.h>
+#include <libavcodec/avcodec.h>
+
+
+#if ((LIBAVCODEC_VERSION_MAJOR == 55) && (LIBAVCODEC_VERSION_MINOR >= 38)) || (LIBAVCODEC_VERSION_MAJOR > 55)
+#define HAS_HEVC
+
+#include <libavutil/opt.h>
+#endif
+
+#if defined(GPAC_CONFIG_ANDROID) || defined(GPAC_CONFIG_IOS)
+#define NO_10bit
+#endif
+
+//#define FFMPEG_DIRECT_DISPATCH
+
+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
+#define AV_INPUT_BUFFER_PADDING_SIZE 0
+#endif
+
+/**
+ * Allocates data for FFMPEG decoding
+ * \param oldBuffer The oldBuffer (freed if not NULL)
+ * \param size Size to allocate (will use extra padding for real size)
+ * \return The newly allocated buffer
+ */
+static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) {
+	uint8_t * buffer;
+	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
+	u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size);
+	if (oldBuffer)
+		gf_free(oldBuffer);
+	buffer = (uint8_t*)gf_malloc( allocatedSz );
+	if (buffer)
+		memset( buffer, 0, allocatedSz);
+	return buffer;
+}
+
+
+static AVCodec *ffmpeg_get_codec(u32 codec_4cc)
+{
+	char name[5];
+	AVCodec *codec;
+	strcpy(name, gf_4cc_to_str(codec_4cc));
+
+    codec = avcodec_find_decoder(codec_4cc);
+    if (codec) return codec;
+
+	codec = avcodec_find_decoder_by_name(name);
+    if (codec) return codec;
+    strupr(name);
+    codec = avcodec_find_decoder_by_name(name);
+    if (codec) return codec;
+    strlwr(name);
+    codec = avcodec_find_decoder_by_name(name);
+    if (codec) return codec;
+	/*custom mapings*/
+    if (!stricmp(name, "s263")) codec = avcodec_find_decoder(CODEC_ID_H263);
+	else if (!stricmp(name, "mjp2")) {
+		codec = avcodec_find_decoder_by_name("jpeg2000");
+		if (!codec) codec = avcodec_find_decoder_by_name("libopenjpeg");
+	}
+    else if (!stricmp(name, "samr") || !stricmp(name, "amr ")) codec = avcodec_find_decoder(CODEC_ID_AMR_NB);
+    else if (!stricmp(name, "sawb")) codec = avcodec_find_decoder(CODEC_ID_AMR_WB);
+
+
+	return codec;
+}
+
+
+static void FFDEC_LoadDSI(FFDec *ffd, GF_BitStream *bs, AVCodec *codec, AVCodecContext *ctx, Bool from_ff_demux)
+{
+	u32 dsi_size;
+	if (!codec) return;
+
+	dsi_size = (u32) gf_bs_available(bs);
+	if (!dsi_size) return;
+
+	/*demuxer is ffmpeg, extra data can be copied directly*/
+	if (from_ff_demux) {
+		if (ctx->extradata)
+			gf_free(ctx->extradata);
+		ctx->extradata_size = dsi_size;
+		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
+		gf_bs_read_data(bs, (char *) ctx->extradata, ctx->extradata_size);
+		return;
+	}
+
+	switch (codec->id) {
+	case CODEC_ID_SVQ3:
+	{
+		u32 at_type, size;
+		size = gf_bs_read_u32(bs);
+		/*there should be an 'SMI' entry*/
+		at_type = gf_bs_read_u32(bs);
+		if (at_type == GF_4CC('S', 'M', 'I', ' ')) {
+			if (ctx->extradata)
+				gf_free(ctx->extradata);
+			ctx->extradata_size = 0x5a + size;
+			ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
+			strcpy((char *) ctx->extradata, "SVQ3");
+			gf_bs_read_data(bs, (char *)ctx->extradata + 0x5a, size);
+		}
+	}
+	break;
+	default:
+		if (ctx->extradata)
+			gf_free(ctx->extradata);
+		ctx->extradata_size = dsi_size;
+		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
+		gf_bs_read_data(bs, (char *)ctx->extradata, ctx->extradata_size);
+		break;
+	}
+}
+
+static GF_Err FFDEC_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
+{
+	u32 codec_id = 0;
+	int gotpic;
+	GF_BitStream *bs;
+	AVCodecContext **ctx;
+	AVCodec **codec;
+	AVFrame **frame;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_M4VDecSpecInfo dsi;
+	GF_Err e;
+#endif
+	FFDec *ffd = (FFDec *)plug->privateStack;
+	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
+	if (!ffd->oti) return GF_NOT_SUPPORTED;
+
+
+
+	/*locate any auxiliary video data descriptor on this stream*/
+	if (esd->dependsOnESID) {
+		u32 i = 0;
+		GF_Descriptor *d = NULL;
+		if (esd->dependsOnESID != ffd->base_ES_ID) return GF_NOT_SUPPORTED;
+		while ((d = (GF_Descriptor*)gf_list_enum(esd->extensionDescriptors, &i))) {
+			if (d->tag == GF_ODF_AUX_VIDEO_DATA) break;
+		}
+		if (!d) return GF_NOT_SUPPORTED;
+
+		ffd->depth_ES_ID = esd->ESID;
+		ctx = &ffd->depth_ctx;
+		codec = &ffd->depth_codec;
+		frame = &ffd->depth_frame;
+	} else {
+		if (ffd->base_ES_ID) return GF_NOT_SUPPORTED;
+		ffd->base_ES_ID = esd->ESID;
+		ctx = &ffd->base_ctx;
+		codec = &ffd->base_codec;
+		frame = &ffd->base_frame;
+	}
+	if (!(*ctx)) {
+
+#ifdef USE_AVCTX3
+		*ctx = avcodec_alloc_context3(NULL);
+#else
+		*ctx = avcodec_alloc_context();
+#endif
+	}
+
+	/*private FFMPEG DSI*/
+	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
+		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		codec_id = gf_bs_read_u32(bs);
+		if (ffd->st==GF_STREAM_AUDIO) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
+			(*ctx)->sample_rate = gf_bs_read_u32(bs);
+			(*ctx)->channels = gf_bs_read_u16(bs);
+			(*ctx)->frame_size = gf_bs_read_u16(bs);
+			/*bits_per_sample */gf_bs_read_u8(bs);
+			/*num_frames_per_au*/ gf_bs_read_u8(bs);
+
+			/*ffmpeg specific*/
+			(*ctx)->block_align = gf_bs_read_u16(bs);
+			(*ctx)->bit_rate = gf_bs_read_u32(bs);
+			(*ctx)->codec_tag = gf_bs_read_u32(bs);
+		} else if (ffd->st==GF_STREAM_VISUAL) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
+			(*ctx)->width = gf_bs_read_u16(bs);
+			(*ctx)->height = gf_bs_read_u16(bs);
+			(*ctx)->bit_rate = gf_bs_read_u32(bs);
+			(*ctx)->codec_tag = gf_bs_read_u32(bs);
+			ffd->raw_pix_fmt = gf_bs_read_u32(bs);
+		}
+
+		*codec = avcodec_find_decoder(codec_id);
+		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_TRUE);
+		gf_bs_del(bs);
+	}
+	/*private QT DSI*/
+	else if (ffd->oti == GPAC_OTI_MEDIA_GENERIC) {
+		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		codec_id = gf_bs_read_u32(bs);
+		if (ffd->st==GF_STREAM_AUDIO) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
+			(*ctx)->sample_rate = gf_bs_read_u32(bs);
+			(*ctx)->channels = gf_bs_read_u16(bs);
+			(*ctx)->frame_size = gf_bs_read_u16(bs);
+			/*bits_per_sample */ gf_bs_read_u8(bs);
+			/*num_frames_per_au*/ gf_bs_read_u8(bs);
+			/*just in case...*/
+			if (codec_id == GF_4CC('a', 'm', 'r', ' ')) {
+				(*ctx)->sample_rate = 8000;
+				(*ctx)->channels = 1;
+				(*ctx)->frame_size = 160;
+			}
+		} else if (ffd->st==GF_STREAM_VISUAL) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
+			(*ctx)->width = gf_bs_read_u16(bs);
+			(*ctx)->height = gf_bs_read_u16(bs);
+		}
+		(*codec) = ffmpeg_get_codec(codec_id);
+        codec_id = (*codec)->id;
+		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
+		gf_bs_del(bs);
+	}
+	/*use std MPEG-4 st/oti*/
+	else {
+		u32 codec_id = 0;
+		if (ffd->st==GF_STREAM_VISUAL) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
+			switch (ffd->oti) {
+			case GPAC_OTI_VIDEO_MPEG4_PART2:
+				codec_id = CODEC_ID_MPEG4;
+				break;
+			case GPAC_OTI_VIDEO_AVC:
+				codec_id = CODEC_ID_H264;
+				break;
+#ifdef HAS_HEVC
+			case GPAC_OTI_VIDEO_HEVC:
+				codec_id = AV_CODEC_ID_HEVC;
+				break;
+#endif
+			case GPAC_OTI_VIDEO_MPEG1:
+			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
+			case GPAC_OTI_VIDEO_MPEG2_MAIN:
+			case GPAC_OTI_VIDEO_MPEG2_SNR:
+			case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
+			case GPAC_OTI_VIDEO_MPEG2_HIGH:
+			case GPAC_OTI_VIDEO_MPEG2_422:
+				codec_id = CODEC_ID_MPEG2VIDEO;
+				break;
+			case GPAC_OTI_IMAGE_JPEG:
+				codec_id = CODEC_ID_MJPEG;
+				ffd->is_image = GF_TRUE;
+				break;
+			case GPAC_OTI_IMAGE_PNG:
+				codec_id = CODEC_ID_PNG;
+				ffd->is_image = GF_TRUE;
+				break;
+#ifdef CODEC_ID_VP9
+			case GPAC_OTI_VIDEO_VP9:
+				codec_id = CODEC_ID_VP9;
+				break;
+#endif
+#ifdef CODEC_ID_AV1
+			case GPAC_OTI_VIDEO_AV1:
+				codec_id = CODEC_ID_AV1;
+				break;
+#endif
+			case 0xFF:
+				codec_id = CODEC_ID_SVQ3;
+				break;
+			}
+		} else if (ffd->st==GF_STREAM_AUDIO) {
+			(*ctx)->codec_type = AVMEDIA_TYPE_AUDIO;
+			switch (ffd->oti) {
+			case GPAC_OTI_AUDIO_MPEG2_PART3:
+			case GPAC_OTI_AUDIO_MPEG1:
+				(*ctx)->frame_size = 1152;
+				codec_id = CODEC_ID_MP2;
+				break;
+			case GPAC_OTI_AUDIO_AC3:
+				codec_id = CODEC_ID_AC3;
+				break;
+			case GPAC_OTI_AUDIO_EAC3:
+				codec_id = CODEC_ID_EAC3;
+				break;
+            case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+            case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+            case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+            case GPAC_OTI_AUDIO_AAC_MPEG4:
+                codec_id = CODEC_ID_AAC;
+                break;
+#ifdef CODEC_ID_OPUS
+			case GPAC_OTI_MEDIA_OPUS:
+				codec_id = CODEC_ID_OPUS;
+				(*ctx)->frame_size = 2880;//use max frame size
+				break;
+#endif
+			}
+		}
+		else if ((ffd->st==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0)) {
+			codec_id = CODEC_ID_DVD_SUBTITLE;
+		}
+		*codec = avcodec_find_decoder(codec_id);
+
+        if (*codec) {
+        	switch (codec_id) {
+        	case CODEC_ID_AAC:
+#ifdef CODEC_ID_OPUS
+        	case CODEC_ID_OPUS:
+				bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+				FFDEC_LoadDSI(ffd, bs, *codec, *ctx, GF_FALSE);
+				gf_bs_del(bs);
+#endif
+				break;
+
+			}
+		}
+
+	}
+	/*should never happen*/
+	if (! (*codec)) return GF_OUT_OF_MEM;
+
+	/*not sure this is the right way to do so, no doc in ffmpeg on this topic */
+#if 0
+	/*check HW accel*/
+	avcodec_get_context_defaults3(*ctx, *codec);
+	if (*codec) {
+		AVHWAccel *hwaccel=NULL;
+		while ((hwaccel = av_hwaccel_next(hwaccel))){
+			if (hwaccel->id == (*codec)->id) {
+				(*ctx)->hwaccel_context = hwaccel;
+				(*ctx)->pix_fmt = hwaccel->pix_fmt;
+				break;
+			}
+		}
+	}
+#endif
+
+	/*setup MPEG-4 video streams*/
+	if (ffd->st==GF_STREAM_VISUAL) {
+		/*for all MPEG-4 variants get size*/
+		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_AVC)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_HEVC)
+		 	|| (ffd->oti == GPAC_OTI_VIDEO_AV1)
+		) {
+			/*if not set this may be a remap of non-mpeg4 transport (eg, transport on MPEG-TS) where
+			the DSI is carried in-band*/
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+
+				/*for regular MPEG-4, try to decode and if this fails try H263 decoder at first frame*/
+				if (ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+					e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+					if (e) return e;
+					if (dsi.width%2) dsi.width++;
+					if (dsi.height%2) dsi.height++;
+					(*ctx)->width = dsi.width;
+					(*ctx)->height = dsi.height;
+					if (!dsi.width && !dsi.height) ffd->check_short_header = GF_TRUE;
+					ffd->previous_par = (dsi.par_num<<16) | dsi.par_den;
+					ffd->no_par_update = GF_TRUE;
+#endif
+				} else if (ffd->oti==GPAC_OTI_VIDEO_AVC) {
+					ffd->check_h264_isma = GF_TRUE;
+				}
+
+				/*setup dsi for FFMPEG context BEFORE attaching decoder (otherwise not proper init)*/
+				(*ctx)->extradata = ffmpeg_realloc_buffer((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->dataLength + 8);
+				if ((*ctx)->extradata) {
+					memcpy((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+					(*ctx)->extradata_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				} else {
+					/* out of mem ? */
+					(*ctx)->extradata_size = 0;
+				}
+			}
+		}
+#if !defined(FF_API_AVFRAME_LAVC)
+		*frame = avcodec_alloc_frame();
+#else
+		*frame = av_frame_alloc();
+#endif
+
+	}
+#ifdef HAS_HEVC
+	if (ffd->oti == GPAC_OTI_VIDEO_HEVC) {
+		GF_SystemRTInfo rti;
+		u32 nb_threads, detected_nb_threads = 1;
+		const char *sOpt;
+		sOpt = gf_opts_get_key("OpenHEVC", "ThreadingType");
+		if (sOpt && !strcmp(sOpt, "wpp")) av_opt_set(*ctx, "thread_type", "slice", 0);
+		else if (sOpt && !strcmp(sOpt, "frame+wpp")) av_opt_set(*ctx, "thread_type", "frameslice", 0);
+		else {
+			av_opt_set(*ctx, "thread_type", "frame", 0);
+			if (!sOpt) gf_opts_set_key("OpenHEVC", "ThreadingType", "frame");
+		}
+		if (gf_sys_get_rti(0, &rti, 0) ) {
+			detected_nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
+		}
+		sOpt = gf_opts_get_key("OpenHEVC", "NumThreads");
+		if (!sOpt) {
+			char szO[100];
+			sprintf(szO, "%d", detected_nb_threads);
+			gf_opts_set_key("OpenHEVC", "NumThreads", szO);
+			nb_threads = detected_nb_threads;
+		} else {
+			nb_threads = atoi(sOpt);
+		}
+		if (nb_threads > detected_nb_threads) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[HEVC@ffmpeg] Initializing with %d threads but only %d available cores detected on the system\n", nb_threads, rti.nb_cores));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[HEVC@ffmpeg] Initializing with %d threads\n", nb_threads));
+		}
+		fprintf(stderr, "[HEVC@ffmpeg] Initializing with %d threads\n", nb_threads);
+		av_opt_set_int(*ctx, "threads", nb_threads, 0);
+
+		/* Set the decoder id */
+		//av_opt_set_int(openHevcContext->c->priv_data, "decoder-id", i, 0);
+
+		sOpt = gf_opts_get_key("OpenHEVC", "CBUnits");
+		if (!sOpt) gf_opts_set_key("OpenHEVC", "CBUnits", "4");
+		if (sOpt) ffd->output_cb_size = atoi(sOpt);
+	}
+#endif //HAS_HEVC
+	if (!ffd->output_cb_size) ffd->output_cb_size = 4;
+
+	if (codec_id == CODEC_ID_RAWVIDEO) {
+		(*ctx)->codec_id = CODEC_ID_RAWVIDEO;
+		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
+		if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = GF_TRUE;
+	} else {
+#ifdef USE_AVCTX3
+		if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM;
+#else
+		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
+#endif
+	}
+
+	/*setup audio streams*/
+	if (ffd->st==GF_STREAM_AUDIO) {
+		if ((*codec)->id == CODEC_ID_MP2) {
+			(*ctx)->frame_size = ((*ctx)->sample_rate > 24000) ? 1152 : 576;
+		}
+		/*may be 0 (cfg not known yet)*/
+		ffd->out_size = (*ctx)->channels * (*ctx)->frame_size * 2 /*16 / 8*/;
+		if (!(*ctx)->sample_rate) (*ctx)->sample_rate = 44100;
+		if (!(*ctx)->channels) (*ctx)->channels = 2;
+
+#if defined(USE_AVCTX3)
+
+#if !defined(FF_API_AVFRAME_LAVC)
+		ffd->audio_frame = avcodec_alloc_frame();
+#else
+		ffd->audio_frame = av_frame_alloc();
+#endif
+
+#endif
+
+	} else {
+		switch ((*codec)->id) {
+		case CODEC_ID_MJPEG:
+		case CODEC_ID_MJPEGB:
+		case CODEC_ID_LJPEG:
+#if (LIBAVCODEC_VERSION_INT > AV_VERSION_INT(51, 20, 0))
+		case CODEC_ID_GIF:
+#endif
+		case CODEC_ID_PNG:
+		case CODEC_ID_RAWVIDEO:
+			if ((*ctx)->pix_fmt==PIX_FMT_YUV420P) {
+				ffd->pix_fmt = GF_PIXEL_YV12;
+			} else {
+				ffd->pix_fmt = GF_PIXEL_RGB_24;
+			}
+			break;
+
+		case CODEC_ID_DVD_SUBTITLE:
+#if !defined(FF_API_AVFRAME_LAVC)
+			*frame = avcodec_alloc_frame();
+#else
+			*frame = av_frame_alloc();
+#endif
+
+#ifdef USE_AVCODEC2
+			{
+				AVPacket pkt;
+				av_init_packet(&pkt);
+				pkt.data = (uint8_t *) esd->decoderConfig->decoderSpecificInfo->data;
+				pkt.size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				avcodec_decode_video2((*ctx), *frame, &gotpic, &pkt);
+			}
+#else
+			avcodec_decode_video((*ctx), *frame, &gotpic, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+#endif
+			ffd->pix_fmt = GF_PIXEL_YV12;
+			break;
+		default:
+			ffd->pix_fmt = GF_PIXEL_YV12;
+			break;
+		}
+
+		ffd->out_pix_fmt = ffd->pix_fmt;
+
+		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
+			ffd->stride = (*ctx)->width;
+			if (ffd->depth_codec) {
+				ffd->out_size = (*ctx)->width * (*ctx)->height * 5 / 2;
+				ffd->out_pix_fmt = GF_PIXEL_YUVD;
+				ffd->yuv_size = (*ctx)->width * (*ctx)->height * 3 / 2;
+			} else {
+				ffd->out_size = (*ctx)->width * (*ctx)->height * 3 / 2;
+			}
+		} else {
+			ffd->out_size = (*ctx)->width * (*ctx)->height * 3;
+		}
+	}
+
+	return GF_OK;
+}
+
+static GF_Err FFDEC_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
+{
+	AVCodecContext **ctx;
+	AVCodec **codec;
+#ifdef FFMPEG_SWSCALE
+	struct SwsContext **sws;
+#endif
+	FFDec *ffd = (FFDec *)plug->privateStack;
+
+	if (ffd->base_ES_ID==ES_ID) {
+		ffd->base_ES_ID = 0;
+		codec = &ffd->base_codec;
+		ctx = &ffd->base_ctx;
+#ifdef FFMPEG_SWSCALE
+		sws = &ffd->base_sws;
+#endif
+	} else if (ffd->depth_ES_ID==ES_ID) {
+		ffd->depth_ES_ID = 0;
+		codec = &ffd->depth_codec;
+		ctx = &ffd->depth_ctx;
+#ifdef FFMPEG_SWSCALE
+		sws = &ffd->depth_sws;
+#endif
+	} else {
+		return GF_OK;
+	}
+
+	if (*ctx) {
+		if ((*ctx)->extradata) gf_free((*ctx)->extradata);
+		(*ctx)->extradata = NULL;
+		if ((*ctx)->codec) avcodec_close((*ctx));
+		*ctx = NULL;
+	}
+	*codec = NULL;
+
+#if defined(USE_AVCTX3)
+	if (ffd->audio_frame) {
+		av_free(ffd->audio_frame);
+	}
+	if (ffd->base_frame) {
+		av_free(ffd->base_frame);
+	}
+	if (ffd->depth_frame) {
+		av_free(ffd->depth_frame);
+	}
+#endif
+
+#ifdef FFMPEG_SWSCALE
+	if (*sws) {
+		sws_freeContext(*sws);
+		*sws = NULL;
+	}
+#endif
+
+	return GF_OK;
+}
+
+static GF_Err FFDEC_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *capability)
+{
+	FFDec *ffd = (FFDec *)plug->privateStack;
+
+	/*base caps*/
+	switch (capability->CapCode) {
+	/*ffmpeg seems quite reliable*/
+	case GF_CODEC_RESILIENT:
+		capability->cap.valueInt = 1;
+		return GF_OK;
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+		return GF_OK;
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 1;
+		return GF_OK;
+	case GF_CODEC_RAW_MEMORY:
+		capability->cap.valueBool = GF_TRUE;
+		return GF_OK;
+	case GF_CODEC_FRAME_OUTPUT:
+#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
+		//deactivated by default until we have more tests (stride, color formats)
+		capability->cap.valueBool = GF_FALSE;
+#endif
+		return GF_OK;
+	case GF_CODEC_WANTS_THREAD:
+		capability->cap.valueBool= GF_TRUE;
+		break;
+	}
+
+	if (!ffd->base_ctx) {
+		capability->cap.valueInt = 0;
+		return GF_OK;
+	}
+
+	/*caps valid only if stream attached*/
+	switch (capability->CapCode) {
+	case GF_CODEC_OUTPUT_SIZE:
+		capability->cap.valueInt = ffd->out_size;
+		break;
+	case GF_CODEC_SAMPLERATE:
+		capability->cap.valueInt = ffd->base_ctx->sample_rate;
+		break;
+	case GF_CODEC_NB_CHAN:
+		capability->cap.valueInt = ffd->base_ctx->channels;
+		break;
+	case GF_CODEC_BITS_PER_SAMPLE:
+		capability->cap.valueInt = 16;
+		break;
+	case GF_CODEC_BUFFER_MIN:
+		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 4 : 1;
+		break;
+	case GF_CODEC_BUFFER_MAX:
+		/*for audio let the systems engine decide since we may have very large block size (1 sec with some QT movies)*/
+		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 0 : (ffd->is_image ? 1 : ffd->output_cb_size);
+		break;
+	/*by default AAC access unit lasts num_samples (timescale being sampleRate)*/
+	case GF_CODEC_CU_DURATION:
+		capability->cap.valueInt =  (ffd->st==GF_STREAM_AUDIO) ? ffd->base_ctx->frame_size : 0;
+		break;
+	case GF_CODEC_WIDTH:
+		capability->cap.valueInt = ffd->base_ctx->width;
+		break;
+	case GF_CODEC_HEIGHT:
+		capability->cap.valueInt = ffd->base_ctx->height;
+		break;
+	case GF_CODEC_STRIDE:
+		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24)
+			capability->cap.valueInt = ffd->stride*3;
+		else if (ffd->out_pix_fmt==GF_PIXEL_RGBA)
+			capability->cap.valueInt = ffd->stride*4;
+		else
+			capability->cap.valueInt = ffd->stride;
+		break;
+	case GF_CODEC_FPS:
+		capability->cap.valueFloat = 30.0f;
+		break;
+	case GF_CODEC_PAR:
+		capability->cap.valueInt = ffd->previous_par;
+		break;
+	case GF_CODEC_PIXEL_FORMAT:
+		if (ffd->base_ctx->width) capability->cap.valueInt = ffd->out_pix_fmt;
+		break;
+	/*ffmpeg performs frame reordering internally*/
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_TRUSTED_CTS:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_WAIT_RAP:
+		//ffd->ctx->hurry_up = 5;
+		break;
+	case GF_CODEC_CHANNEL_CONFIG:
+		/*currently unused in ffmpeg*/
+		if (ffd->base_ctx->channels==1) {
+			capability->cap.valueInt = GF_AUDIO_CH_FRONT_CENTER;
+		} else {
+			capability->cap.valueInt = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
+		}
+		break;
+
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE;
+		break;
+	default:
+		capability->cap.valueInt = 0;
+		break;
+	}
+	return GF_OK;
+}
+
+static GF_Err FFDEC_SetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability capability)
+{
+	FFDec *ffd = (FFDec *)plug->privateStack;
+	assert(plug);
+	assert( ffd );
+	switch (capability.CapCode) {
+	case GF_CODEC_WAIT_RAP:
+		ffd->frame_start = 0;
+		if (ffd->st==GF_STREAM_VISUAL) {
+			if (ffd->base_ctx && ffd->base_ctx->codec) avcodec_flush_buffers(ffd->base_ctx);
+			if (ffd->depth_ctx && ffd->depth_ctx->codec) avcodec_flush_buffers(ffd->depth_ctx);
+		}
+		return GF_OK;
+	case GF_CODEC_RAW_MEMORY:
+		ffd->direct_output_mode = capability.cap.valueBool ? 1 : 0;
+		return GF_OK;
+	case GF_CODEC_FRAME_OUTPUT:
+		ffd->direct_output_mode = capability.cap.valueInt ? 2 : 0;
+		return GF_OK;
+	default:
+		/*return unsupported to avoid confusion by the player (like color space changing ...) */
+		return GF_NOT_SUPPORTED;
+	}
+}
+static GF_Err FFDEC_GetOutputPixelFromat (u32 pix_fmt, u32 * out_pix_fmt, FFDec *ffd)
+{
+
+	if (!out_pix_fmt || !ffd) return GF_BAD_PARAM;
+
+	switch (pix_fmt) {
+		case PIX_FMT_YUV420P:
+			*out_pix_fmt = GF_PIXEL_YV12;
+			break;
+		case PIX_FMT_YUV420P10LE:
+			*out_pix_fmt = GF_PIXEL_YV12_10;
+			break;
+		case PIX_FMT_YUV422P:
+			*out_pix_fmt = GF_PIXEL_YUV422;
+			break;
+		case PIX_FMT_YUV422P10LE:
+			*out_pix_fmt = GF_PIXEL_YUV422_10;
+			break;
+		case PIX_FMT_YUV444P:
+			*out_pix_fmt = GF_PIXEL_YUV444;
+			break;
+		case PIX_FMT_YUV444P10LE:
+			*out_pix_fmt = GF_PIXEL_YUV444_10;
+			break;
+		case PIX_FMT_RGBA:
+			*out_pix_fmt = GF_PIXEL_RGBA;
+			break;
+		case PIX_FMT_RGB24:
+			*out_pix_fmt = GF_PIXEL_RGB_24;
+			break;
+		case PIX_FMT_BGR24:
+			*out_pix_fmt = GF_PIXEL_BGR_24;
+			break;
+
+		default:
+			return GF_NOT_SUPPORTED;
+
+		}
+		return GF_OK;
+
+}
+
+
+static GF_Err FFDEC_ProcessAudio(FFDec *ffd,
+                                char *inBuffer, u32 inBufferLength,
+                                u16 ES_ID, u32 *CTS,
+                                char *outBuffer, u32 *outBufferLength,
+                                u8 PaddingBits, u32 mmlevel)
+{
+
+#ifdef USE_AVCODEC2
+	AVPacket pkt;
+#endif
+	s32 gotpic;
+	AVCodecContext *ctx = ffd->base_ctx;
+	s32 len;
+	u32 buf_size = (*outBufferLength);
+
+#ifdef USE_AVCODEC2
+	av_init_packet(&pkt);
+	pkt.data = (uint8_t *)inBuffer;
+	pkt.size = inBufferLength;
+#endif
+
+	(*outBufferLength) = 0;
+
+	/*seeking don't decode*/
+	if (!inBuffer || (mmlevel == GF_CODEC_LEVEL_SEEK)) {
+		*outBufferLength = 0;
+		ffd->frame_start = 0;
+		return GF_OK;
+	}
+	if (ffd->frame_start>inBufferLength) ffd->frame_start = 0;
+	//seek to last byte consumed by the previous decode4()
+	else if (ffd->frame_start) {
+		pkt.data += ffd->frame_start;
+		pkt.size -= ffd->frame_start;
+	}
+redecode:
+
+#if defined(USE_AVCTX3)
+	len = avcodec_decode_audio4(ctx, ffd->audio_frame, &gotpic, &pkt);
+	if (gotpic) {
+		//int inputDataSize = av_samples_get_buffer_size(NULL, ctx->channels, ffd->audio_frame->nb_samples, ctx->sample_fmt, 1);
+		gotpic = ffd->audio_frame->nb_samples * 2 * ctx->channels;
+	}
+#elif defined(USE_AVCODEC2)
+	gotpic = 192000;
+	len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt);
+#else
+	gotpic = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+	len = avcodec_decode_audio2(ctx, (short *)ffd->audio_buf, &gotpic, inBuffer + ffd->frame_start, inBufferLength - ffd->frame_start);
+#endif
+	if (len<0) {
+		ffd->frame_start = 0;
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (gotpic<0) {
+		ffd->frame_start = 0;
+		return GF_OK;
+	}
+
+	/*first config*/
+	if (!ffd->out_size) {
+		u32 bpp = 2;
+
+		if (ctx->channels * ctx->frame_size * bpp < gotpic) ctx->frame_size = gotpic / (bpp * ctx->channels);
+		ffd->out_size = ctx->channels * ctx->frame_size * bpp;
+	}
+	if (ffd->out_size < (u32) gotpic) {
+		/*looks like relying on frame_size is not a good idea for all codecs, so we use gotpic*/
+		(*outBufferLength) = ffd->out_size = gotpic;
+		return GF_BUFFER_TOO_SMALL;
+	}
+	if (ffd->out_size > buf_size) {
+		/*don't use too small output chunks otherwise we'll never have enough when mixing - we could
+			also request more slots in the composition memory but let's not waste mem*/
+		if (ffd->out_size < (u32) 576*ctx->channels) ffd->out_size=ctx->channels*576;
+		(*outBufferLength) = ffd->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+#if defined(USE_AVCTX3)
+	if (ffd->audio_frame->format==AV_SAMPLE_FMT_FLTP) {
+		s32 i, j;
+		s16 *output = (s16 *) outBuffer;
+		for (j=0; j<ctx->channels; j++) {
+			Float* inputChannel = (Float*)ffd->audio_frame->extended_data[j];
+			for (i=0 ; i<ffd->audio_frame->nb_samples ; i++) {
+				Float sample = inputChannel[i];
+				if (sample<-1.0f) sample=-1.0f;
+				else if (sample>1.0f) sample=1.0f;
+
+				output[i*ctx->channels + j] = (int16_t) (sample * GF_SHORT_MAX );
+			}
+		}
+	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16P) {
+		s32 i, j;
+		s16 *output = (s16 *) outBuffer;
+		for (j=0; j<ctx->channels; j++) {
+			s16* inputChannel = (s16*)ffd->audio_frame->extended_data[j];
+			for (i=0 ; i<ffd->audio_frame->nb_samples ; i++) {
+				Float sample = inputChannel[i];
+				output[i*ctx->channels + j] = (int16_t) (sample );
+			}
+		}
+	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_U8) {
+		u32 i, size = ffd->audio_frame->nb_samples * ctx->channels;
+		s16 *output = (s16 *) outBuffer;
+		s8 *input = (s8 *) ffd->audio_frame->data[0];
+		for (i=0; i<size; i++) {
+			output [i] = input[i] * 128;
+		}
+	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S32) {
+		u32 i, shift, size = ffd->audio_frame->nb_samples * ctx->channels;
+		s16 *output = (s16 *) outBuffer;
+		s32 *input = (s32*) ffd->audio_frame->data[0];
+		shift = 1<<31;
+		for (i=0; i<size; i++) {
+			output [i] = input[i] * shift;
+		}
+	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_FLT) {
+		u32 i, size = ffd->audio_frame->nb_samples * ctx->channels;
+		s16 *output = (s16 *) outBuffer;
+		Float *input = (Float *) ffd->audio_frame->data[0];
+		for (i=0; i<size; i++) {
+			Float sample = input[i];
+			if (sample<-1.0f) sample=-1.0f;
+			else if (sample>1.0f) sample=1.0f;
+			output [i] = (int16_t) (sample * GF_SHORT_MAX);
+		}
+	} else if (ffd->audio_frame->format==AV_SAMPLE_FMT_S16) {
+		memcpy(outBuffer, ffd->audio_frame->data[0], sizeof(char) * ffd->audio_frame->nb_samples * ctx->channels*2);
+	} else if (ffd->audio_frame->nb_samples) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFMPEG Decoder] Raw Audio format %d not supported\n", ffd->audio_frame->format ));
+	}
+#else
+	/*we're sure to have at least gotpic bytes available in output*/
+	memcpy(outBuffer, ffd->audio_buf, sizeof(char) * gotpic);
+#endif
+
+	(*outBufferLength) += gotpic;
+	outBuffer += gotpic;
+
+#if defined(USE_AVCTX3)
+	ffd->audio_frame->nb_samples = 0;
+#endif
+
+	ffd->frame_start += len;
+	if (inBufferLength <= ffd->frame_start) {
+		ffd->frame_start = 0;
+		return GF_OK;
+	}
+	/*still space go on*/
+	if ((*outBufferLength)+ctx->frame_size<ffd->out_size) goto redecode;
+
+	/*more frames in the current sample*/
+	return GF_PACKED_FRAMES;
+}
+
+//TODO check why we need this one ...
+static GF_Err FFDEC_ProcessRawVideo(FFDec *ffd,
+                                char *inBuffer, u32 inBufferLength,
+                                u16 ES_ID, u32 *CTS,
+                                char *outBuffer, u32 *outBufferLength,
+                                u8 PaddingBits, u32 mmlevel)
+{
+	AVCodecContext *ctx = ffd->base_ctx;
+
+	if (*outBufferLength != ffd->out_size) {
+		*outBufferLength = ffd->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+	if (inBufferLength) {
+		*outBufferLength = ffd->out_size;
+//		assert(inBufferLength==ffd->out_size);
+
+		if (ffd->raw_pix_fmt==PIX_FMT_BGR24) {
+			s32 i, j;
+			for (j=0; j<ctx->height; j++) {
+				u8 *src = (u8 *) inBuffer + j*3*ctx->width;
+				u8 *dst = (u8 *)outBuffer + j*3*ctx->width;
+				if (ffd->flipped) {
+					dst = (u8 *)outBuffer + (ctx->height-j-1) * 3*ctx->width;
+				}
+				for (i=0; i<ctx->width; i++) {
+					dst[0] = src[2];
+					dst[1] = src[1];
+					dst[2] = src[2];
+					src += 3;
+					dst += 3;
+				}
+			}
+		} else {
+			memcpy(outBuffer, inBuffer, ffd->out_size);
+		}
+	} else {
+		*outBufferLength = 0;
+	}
+	return GF_OK;
+}
+
+
+
+static GF_Err FFDEC_ProcessVideo(FFDec *ffd,
+                                char *inBuffer, u32 inBufferLength,
+                                u16 ES_ID, u32 *CTS,
+                                char *outBuffer, u32 *outBufferLength,
+                                u8 PaddingBits, u32 mmlevel)
+{
+#ifdef USE_AVCODEC2
+	AVPacket pkt;
+#endif
+	AVPicture pict;
+	u32 pix_out=0;
+	s32 w, h, gotpic, stride, ret;
+	u32 outsize=0, out_pix_fmt;
+	AVCodecContext *ctx;
+	AVCodec **codec;
+	AVFrame *frame;
+#ifdef FFMPEG_SWSCALE
+	struct SwsContext **cached_sws = &(ffd->base_sws);
+#endif
+
+	if (!ES_ID || (ffd->base_ES_ID==ES_ID)) {
+		ctx = ffd->base_ctx;
+		codec = &ffd->base_codec;
+		frame = ffd->base_frame;
+	} else if (ffd->depth_ES_ID==ES_ID) {
+		ctx = ffd->depth_ctx;
+		codec = &ffd->depth_codec;
+		frame = ffd->depth_frame;
+	} else {
+		return GF_BAD_PARAM;
+	}
+
+	/*WARNING: this breaks H264 (and maybe others) decoding, disabled for now*/
+#if 0
+	if (!ctx->hurry_up) {
+		switch (mmlevel) {
+		case GF_CODEC_LEVEL_SEEK:
+		case GF_CODEC_LEVEL_DROP:
+			/*skip as much as possible*/
+			ctx->hurry_up = 5;
+			break;
+		case GF_CODEC_LEVEL_VERY_LATE:
+		case GF_CODEC_LEVEL_LATE:
+			/*skip B-frames*/
+			ctx->hurry_up = 1;
+			break;
+		default:
+			ctx->hurry_up = 0;
+			break;
+		}
+	}
+#endif
+
+#ifdef USE_AVCODEC2
+	av_init_packet(&pkt);
+	pkt.data = (uint8_t *)inBuffer;
+	pkt.size = inBufferLength;
+	pkt.dts=0;
+	pkt.pts = *CTS;
+#endif
+
+	*outBufferLength = 0;
+	/*visual stream*/
+	w = ctx->width;
+	h = ctx->height;
+
+	/*we have a valid frame not yet dispatched*/
+	if (ffd->had_pic) {
+		ffd->had_pic = GF_FALSE;
+		gotpic = ffd->needs_output_resize ? 0 : 1;
+		ffd->needs_output_resize = 0;
+	} else {
+		if (ffd->check_h264_isma) {
+			/*for AVC bitstreams after ISMA decryption, in case (as we do) the decryption DRM tool
+			doesn't put back nalu size, do it ourselves...*/
+			if (inBuffer && !inBuffer[0] && !inBuffer[1] && !inBuffer[2] && (inBuffer[3]==0x01)) {
+				u32 nalu_size;
+				char *start, *end, *bufferEnd;
+
+				start = inBuffer;
+				end = inBuffer + 4;
+				bufferEnd = inBuffer + inBufferLength;
+				/* FIXME : SOUCHAY : not sure of exact behaviour, but old one was reading non-allocated memory */
+				while ((end+3) < bufferEnd) {
+					if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
+						nalu_size = (u32) (end - start - 4);
+						start[0] = (nalu_size>>24)&0xFF;
+						start[1] = (nalu_size>>16)&0xFF;
+						start[2] = (nalu_size>>8)&0xFF;
+						start[3] = (nalu_size)&0xFF;
+						start = end;
+						end = start+4;
+						continue;
+					}
+					end++;
+				}
+				nalu_size = (u32) ((inBuffer+inBufferLength) - start - 4);
+				start[0] = (nalu_size>>24)&0xFF;
+				start[1] = (nalu_size>>16)&0xFF;
+				start[2] = (nalu_size>>8)&0xFF;
+				start[3] = (nalu_size)&0xFF;
+				ffd->check_h264_isma = 2;
+			}
+			/*if we had ISMA E&A and lost it this is likely due to a pck loss - do NOT switch back to regular*/
+			else if (ffd->check_h264_isma == 1) {
+				ffd->check_h264_isma = GF_FALSE;
+			}
+		}
+
+#ifdef USE_AVCODEC2
+		if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+#else
+		if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+#endif
+			if (!ffd->check_short_header) {
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			/*switch to H263 (ffmpeg MPEG-4 codec doesn't understand short headers)*/
+			{
+				u32 old_codec = (*codec)->id;
+				ffd->check_short_header = GF_FALSE;
+				/*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
+				here this means the DSI was broken, so no big deal*/
+				avcodec_close(ctx);
+				*codec = avcodec_find_decoder(CODEC_ID_H263);
+
+#ifdef USE_AVCTX3
+				if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM;
+#else
+				if (! (*codec) || (avcodec_open(ctx, *codec)<0)) return GF_NON_COMPLIANT_BITSTREAM;
+#endif
+
+#if USE_AVCODEC2
+				if (avcodec_decode_video2(ctx, frame, &gotpic, &pkt) < 0) {
+#else
+				if (avcodec_decode_video(ctx, frame, &gotpic, inBuffer, inBufferLength) < 0) {
+#endif
+					/*nope, stay in MPEG-4*/
+					avcodec_close(ctx);
+					*codec = avcodec_find_decoder(old_codec);
+					assert(*codec);
+#ifdef USE_AVCTX3
+					avcodec_open2(ctx, *codec, NULL);
+#else
+					avcodec_open(ctx, *codec);
+#endif
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+			}
+		}
+
+		/*
+			if (!gotpic && (!ctx->width || !ctx->height) ) {
+				ctx->width = w;
+				ctx->height = h;
+				return GF_OK;
+			}
+		*/
+		/*some streams use odd width/height frame values*/
+		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
+			if (ctx->width%2) ctx->width++;
+			if (ctx->height%2) ctx->height++;
+		}
+	}
+
+	/*we have a picture and need resize, do it*/
+	if (gotpic && ffd->needs_output_resize) {
+		ffd->needs_output_resize = GF_FALSE;
+		ffd->had_pic = GF_TRUE;
+		*outBufferLength = ffd->out_size;
+		if (ffd->direct_output_mode) {
+			ffd->frame_size_changed = GF_TRUE;
+		} else {
+			return GF_BUFFER_TOO_SMALL;
+		}
+	}
+
+	stride = frame->linesize[0];
+
+	ret = FFDEC_GetOutputPixelFromat(ctx->pix_fmt, &out_pix_fmt, ffd);
+	if ( ret < 0)
+	{
+		return ret;
+	}
+
+	/*recompute outsize in case on-the-fly change*/
+	if ((w != ctx->width) || (h != ctx->height)
+		|| (ffd->direct_output_mode && (stride != ffd->stride))
+		|| (ffd->out_pix_fmt != out_pix_fmt)
+		//need to realloc the conversion buffer
+
+	   ) {
+
+		ffd->stride = (ffd->direct_output_mode) ? frame->linesize[0] : ctx->width;
+		if (ctx->pix_fmt  == PIX_FMT_RGBA) {
+			ffd->out_pix_fmt = ffd->pix_fmt = GF_PIXEL_RGBA;
+			outsize = ctx->width * ctx->height * 4;
+		}
+		else if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
+			outsize = ctx->width * ctx->height * 3;
+		}
+		else if (ctx->pix_fmt == PIX_FMT_YUV420P)
+		{
+			outsize = ffd->stride * ctx->height * 3 /2 ;
+			ffd->out_pix_fmt = GF_PIXEL_YV12;
+
+		}
+
+		else if (ctx->pix_fmt == PIX_FMT_YUV422P)
+		{
+			outsize = ffd->stride * ctx->height * 2 ;
+			ffd->out_pix_fmt = GF_PIXEL_YUV422;
+
+		}
+		else if (ctx->pix_fmt == PIX_FMT_YUV444P)
+		{
+			outsize = ffd->stride * ctx->height * 3 ;
+			ffd->out_pix_fmt = GF_PIXEL_YUV444;
+		}
+#ifndef NO_10bit
+		//this YUV format is handled natively in GPAC
+		else if (ctx->pix_fmt == PIX_FMT_YUV420P10LE) {
+			ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
+			ffd->out_pix_fmt = GF_PIXEL_YV12_10;
+			outsize = 3*ffd->stride * ctx->height / 2;
+		}
+		else if (ctx->pix_fmt == PIX_FMT_YUV422P10LE) {
+			ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
+			ffd->out_pix_fmt = GF_PIXEL_YUV422_10;
+			outsize = ffd->stride * ctx->height * 2;
+		}
+		else if (ctx->pix_fmt == PIX_FMT_YUV444P10LE) {
+				ffd->stride = ffd->direct_output_mode ? frame->linesize[0] : ctx->width * 2;
+				ffd->out_pix_fmt = GF_PIXEL_YUV444_10;
+				 outsize = ffd->stride * ctx->height * 3;
+		}
+#endif
+
+
+
+		if (ffd->depth_codec) {
+			outsize = 5 * ctx->width * ctx->height / 2;
+			ffd->yuv_size = 3 * ctx->width * ctx->height / 2;
+		}
+		ffd->out_size = outsize;
+
+		if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
+			ffd->previous_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
+		}
+
+		/*we didn't get any picture: wait for a picture before resizing output buffer, otherwise we will have no
+		video in the output buffer*/
+		if (!gotpic) {
+			ffd->needs_output_resize = GF_TRUE;
+//			return GF_OK;
+		}
+		*outBufferLength = ffd->out_size;
+		if (ffd->check_h264_isma) {
+			inBuffer[0] = inBuffer[1] = inBuffer[2] = 0;
+			inBuffer[3] = 1;
+		}
+#ifdef FFMPEG_SWSCALE
+		if (*cached_sws) {
+			sws_freeContext(*cached_sws);
+			*cached_sws = NULL;
+		}
+#endif
+		ffd->had_pic = GF_TRUE;
+
+		if (ffd->direct_output_mode) {
+			ffd->frame_size_changed = GF_TRUE;
+
+		} else {
+			return GF_BUFFER_TOO_SMALL;
+		}
+	}
+	/*check PAR in case on-the-fly change*/
+	if (!ffd->no_par_update && ctx->sample_aspect_ratio.num && ctx->sample_aspect_ratio.den) {
+		u32 new_par = (ctx->sample_aspect_ratio.num<<16) | ctx->sample_aspect_ratio.den;
+		if (ffd->previous_par && (new_par != ffd->previous_par)) {
+			ffd->previous_par = new_par;
+
+			if (!gotpic) {
+				ffd->needs_output_resize = GF_TRUE;
+				return GF_OK;
+			}
+			*outBufferLength = ffd->out_size;
+			ffd->had_pic = GF_TRUE;
+			if (ffd->direct_output_mode) {
+				ffd->frame_size_changed = GF_TRUE;
+			} else {
+				return GF_BUFFER_TOO_SMALL;
+			}
+		}
+	}
+
+//	if (mmlevel	== GF_CODEC_LEVEL_SEEK) return GF_OK;
+
+	if (!gotpic) return GF_OK;
+
+#if (LIBAVCODEC_VERSION_MAJOR>52)
+	//fixme - investigate this, happens in some dash cases
+	if ((frame->width!=ctx->width) || (frame->height!=ctx->height))  {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
+#endif
+
+	//copy over CTS of packet passed in decode()
+	*CTS = (u32) frame->pkt_pts;
+
+	if (ffd->direct_output_mode) {
+		*outBufferLength = ffd->out_size;
+		return GF_OK;
+	}
+
+	if (ES_ID && (ES_ID == ffd->depth_ES_ID)) {
+		s32 i;
+		u8 *pYO, *pYD;
+
+		pYO = frame->data[0];
+		pYD = (u8 *) outBuffer+ffd->yuv_size;
+		for (i=0; i<ctx->height; i++) {
+			memcpy(pYD, pYO, sizeof(char) * ctx->width);
+			pYD += ctx->width;
+			pYO += frame->linesize[0];
+		}
+		*outBufferLength = ffd->out_size;
+		return GF_OK;
+	}
+
+#if defined(_WIN32_WCE) || defined(__SYMBIAN32__)
+	if (ffd->pix_fmt==GF_PIXEL_RGB_24) {
+		memcpy(outBuffer, frame->data[0], sizeof(char)*3*ctx->width);
+	} else if (ffd->pix_fmt==GF_PIXEL_RGBA) {
+		memcpy(outBuffer, frame->data[0], sizeof(char)*4*ctx->width);
+	} else {
+		s32 i;
+		char *pYO, *pUO, *pVO;
+		unsigned char *pYD, *pUD, *pVD;
+		pYO = frame->data[0];
+		pUO = frame->data[1];
+		pVO = frame->data[2];
+		pYD = outBuffer;
+		pUD = outBuffer + ctx->width * ctx->height;
+		pVD = outBuffer + 5 * ctx->width * ctx->height / 4;
+
+
+		for (i=0; i<ctx->height; i++) {
+			memcpy(pYD, pYO, sizeof(char) * ctx->width);
+			pYD += ctx->width;
+			pYO += frame->linesize[0];
+			if (i%2) continue;
+
+			memcpy(pUD, pUO, sizeof(char) * ctx->width/2);
+			memcpy(pVD, pVO, sizeof(char) * ctx->width/2);
+			pUD += ctx->width/2;
+			pVD += ctx->width/2;
+			pUO += frame->linesize[1];
+			pVO += frame->linesize[2];
+		}
+		*outBufferLength = ffd->out_size;
+	}
+#else
+
+	memset(&pict, 0, sizeof(pict));
+	if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) {
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.linesize[0] = 3*ctx->width;
+		pix_out = PIX_FMT_RGB24;
+	} else if (ffd->out_pix_fmt==GF_PIXEL_RGBA) {
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.linesize[0] = 4*ctx->width;
+		pix_out = PIX_FMT_RGBA;
+	} else {
+		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+		pict.data[2] =  (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4;
+		pict.linesize[0] = ffd->stride;
+		pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
+		pix_out = PIX_FMT_YUV420P;
+		} else if (ffd->out_pix_fmt == GF_PIXEL_YUV422) {
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+		pict.data[2] =  (uint8_t *)outBuffer + 3*ffd->stride * ctx->height/2;
+		pict.linesize[0] = ffd->stride;
+		pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
+		pix_out = PIX_FMT_YUV422P;
+	    } else if (ffd->out_pix_fmt == GF_PIXEL_YUV444) {
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+		pict.data[2] =  (uint8_t *)outBuffer + 2*ffd->stride * ctx->height;
+		pict.linesize[0] = pict.linesize[1] = pict.linesize[2] = ffd->stride;
+		pix_out = PIX_FMT_YUV444P;
+	    }
+#ifndef NO_10bit
+		//this YUV format is handled natively in GPAC
+		if (ctx->pix_fmt==PIX_FMT_YUV420P10LE) {
+			pict.data[0] =  (uint8_t *)outBuffer;
+			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+			pict.data[2] =  (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4;
+			pict.linesize[0] = ffd->stride;
+			pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
+			pix_out = PIX_FMT_YUV420P10LE;
+		} else if (ctx->pix_fmt==PIX_FMT_YUV422P10LE) {
+			pict.data[0] =  (uint8_t *)outBuffer;
+			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+			pict.data[2] =  (uint8_t *)outBuffer + 3*ffd->stride * ctx->height/2;
+			pict.linesize[0] = ffd->stride;
+			pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
+			pix_out = PIX_FMT_YUV422P10LE;
+		} else if (ctx->pix_fmt==PIX_FMT_YUV444P10LE) {
+			pict.data[0] =  (uint8_t *)outBuffer;
+			pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+			pict.data[2] =  (uint8_t *)outBuffer + 2*ffd->stride * ctx->height;
+			pict.linesize[0] = pict.linesize[1] = pict.linesize[2] = ffd->stride;
+			pix_out = PIX_FMT_YUV444P10LE;
+		}
+#endif
+
+#if (LIBAVCODEC_VERSION_MAJOR<56)
+		if (!mmlevel && frame->interlaced_frame) {
+			avpicture_deinterlace((AVPicture *) frame, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
+		}
+#endif
+
+	}
+	pict.data[3] = 0;
+	pict.linesize[3] = 0;
+	*CTS = (u32) frame->pkt_pts;
+
+#ifndef FFMPEG_SWSCALE
+	img_convert(&pict, pix_out, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
+#else
+	*cached_sws = sws_getCachedContext(*cached_sws,
+	                                   ctx->width, ctx->height, ctx->pix_fmt,
+	                                   ctx->width, ctx->height, pix_out,
+	                                   SWS_BICUBIC, NULL, NULL, NULL);
+	if ((*cached_sws)) {
+#if LIBSWSCALE_VERSION_INT < AV_VERSION_INT(0, 9, 0)
+		sws_scale((*cached_sws), frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
+#else
+		sws_scale((*cached_sws), (const uint8_t * const*)frame->data, frame->linesize, 0, ctx->height, pict.data, pict.linesize);
+#endif
+
+	}
+#endif
+
+	*outBufferLength = ffd->out_size;
+#endif
+
+	return GF_OK;
+}
+
+
+
+static GF_Err FFDEC_ProcessData(GF_MediaDecoder *plug,
+                                char *inBuffer, u32 inBufferLength,
+                                u16 ES_ID, u32 *CTS,
+                                char *outBuffer, u32 *outBufferLength,
+                                u8 PaddingBits, u32 mmlevel)
+{
+	FFDec *ffd = (FFDec*)plug->privateStack;
+
+	if (ffd->st==GF_STREAM_AUDIO) {
+		return FFDEC_ProcessAudio(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
+	} else if ( ffd->base_ctx->codec_id == CODEC_ID_RAWVIDEO) {
+		return FFDEC_ProcessRawVideo(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
+	} else {
+		return FFDEC_ProcessVideo(ffd, inBuffer, inBufferLength, ES_ID, CTS, outBuffer, outBufferLength, PaddingBits, mmlevel);
+	}
+}
+
+
+static GF_Err FFDEC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
+{
+	FFDec *ffd = (FFDec*)ifcg->privateStack;
+	AVFrame *frame;
+
+	if (ffd->direct_output_mode != 1) return GF_BAD_PARAM;
+
+	if (ES_ID && (ffd->depth_ES_ID==ES_ID)) {
+		frame = ffd->depth_frame;
+		*pY_or_RGB = frame->data[0];
+	} else {
+		frame = ffd->base_frame;
+		*pY_or_RGB = frame->data[0];
+		*pU = frame->data[1];
+		*pV = frame->data[2];
+	}
+	return GF_OK;
+}
+
+#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
+
+typedef struct
+{
+	FFDec *ctx;
+	AVFrame *frame;
+} FF_Frame;
+
+void FFFrame_Release(GF_MediaDecoderFrame *frame)
+{
+	FF_Frame *ff_frame = (FF_Frame *)frame->user_data;
+
+	av_frame_free(&ff_frame->frame);
+}
+
+GF_Err FFFrame_GetPlane(GF_MediaDecoderFrame *frame, u32 plane_idx, const char **outPlane, u32 *outStride)
+{
+	FF_Frame *ff_frame = (FF_Frame *)frame->user_data;
+	switch (ff_frame->ctx->out_pix_fmt) {
+	case GF_PIXEL_YV12:
+	case GF_PIXEL_YV12_10:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUV444_10:
+		if (plane_idx>2) return GF_BAD_PARAM;
+		*outPlane = (const char *) ff_frame->frame->data[plane_idx];
+		*outStride = ff_frame->frame->linesize[plane_idx];
+		break;
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_RGB_24:
+	case GF_PIXEL_BGR_24:
+		if (plane_idx>0) return GF_BAD_PARAM;
+		*outPlane = (const char *) ff_frame->frame->data[plane_idx];
+		*outStride = ff_frame->frame->linesize[plane_idx];
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err FFDEC_GetOutputFrame(GF_MediaDecoder *ifcg, u16 ES_ID, GF_MediaDecoderFrame **frame, Bool *needs_resize)
+{
+	GF_MediaDecoderFrame *a_frame;
+	FF_Frame *ff_frame;
+	FFDec *ffd = (FFDec*)ifcg->privateStack;
+
+	*needs_resize = GF_FALSE;
+
+	if (!ffd->base_frame) return GF_BAD_PARAM;
+
+	GF_SAFEALLOC(a_frame, GF_MediaDecoderFrame);
+	if (!a_frame) return GF_OUT_OF_MEM;
+	GF_SAFEALLOC(ff_frame, FF_Frame);
+	if (!ff_frame) {
+		gf_free(a_frame);
+		return GF_OUT_OF_MEM;
+	}
+	a_frame->user_data = ff_frame;
+	ff_frame->ctx = ffd;
+	ff_frame->frame = av_frame_clone(ffd->base_frame);
+
+	a_frame->Release = FFFrame_Release;
+	a_frame->GetPlane = FFFrame_GetPlane;
+
+	*frame = a_frame;
+	if (ffd->frame_size_changed) {
+		ffd->frame_size_changed = GF_FALSE;
+		*needs_resize = GF_TRUE;
+	}
+
+	return GF_OK;
+}
+#endif //USE_AVCTX3
+
+static u32 FFDEC_CanHandleStream(GF_BaseDecoder *plug, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	GF_BitStream *bs;
+	u32 codec_id;
+	Bool check_4cc;
+	FFDec *ffd = (FFDec*)plug->privateStack;
+
+	/*media type query*/
+	if (!esd) {
+		if ((StreamType==GF_STREAM_VISUAL) || (StreamType==GF_STREAM_AUDIO)) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+		return GF_CODEC_NOT_SUPPORTED;
+	}
+
+	/*store types*/
+	ffd->oti = esd->decoderConfig->objectTypeIndication;
+	ffd->st = StreamType;
+
+	codec_id = 0;
+	check_4cc = GF_FALSE;
+
+	/*private from FFMPEG input*/
+	if (ffd->oti == GPAC_OTI_MEDIA_FFMPEG) {
+		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		codec_id = gf_bs_read_u32(bs);
+		gf_bs_del(bs);
+	}
+	/*private from IsoMedia input*/
+	else if (ffd->oti == GPAC_OTI_MEDIA_GENERIC) {
+		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		codec_id = gf_bs_read_u32(bs);
+		check_4cc = GF_TRUE;
+		gf_bs_del(bs);
+
+        if (codec_id == GF_4CC('s','a','m','r')) {
+            codec_id = CODEC_ID_AMR_NB;
+        }
+        else if (codec_id == GF_4CC('s','a','w','b')) {
+            codec_id = CODEC_ID_AMR_WB;
+        }
+	}
+	else if (StreamType==GF_STREAM_AUDIO) {
+		/*std MPEG-2 audio*/
+		switch (ffd->oti) {
+		case GPAC_OTI_AUDIO_MPEG2_PART3:
+		case GPAC_OTI_AUDIO_MPEG1:
+			codec_id = CODEC_ID_MP2;
+			break;
+		case GPAC_OTI_AUDIO_AC3:
+			codec_id = CODEC_ID_AC3;
+			break;
+		case GPAC_OTI_AUDIO_EAC3:
+			codec_id = CODEC_ID_EAC3;
+			break;
+        case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+        case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+        case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+        case GPAC_OTI_AUDIO_AAC_MPEG4:
+            codec_id = CODEC_ID_AAC;
+            if (avcodec_find_decoder(codec_id) != NULL)
+                return GF_CODEC_MAYBE_SUPPORTED;
+            break;
+#ifdef CODEC_ID_OPUS
+		case GPAC_OTI_MEDIA_OPUS:
+			if (avcodec_find_decoder(CODEC_ID_OPUS) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+#endif
+			return GF_CODEC_NOT_SUPPORTED;
+		}
+	}
+
+	/*std MPEG-4 visual*/
+	else if (StreamType==GF_STREAM_VISUAL) {
+
+		/*fixme - we should use some priority rather than declare ffmpeg can't handle svc*/
+		if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_AVC) {
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+				Bool is_svc = GF_FALSE;
+				u32 i, count;
+				GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				if (!cfg) return GF_CODEC_SUPPORTED;
+
+				if (esd->has_scalable_layers)
+					is_svc = GF_TRUE;
+
+				/*decode all NALUs*/
+				count = gf_list_count(cfg->sequenceParameterSets);
+				for (i=0; i<count; i++) {
+					GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, i);
+					u8 nal_type = slc->data[0] & 0x1F;
+
+					if (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
+						is_svc = GF_TRUE;
+						break;
+					}
+				}
+				gf_odf_avc_cfg_del(cfg);
+				return (is_svc || esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) ? GF_CODEC_MAYBE_SUPPORTED : GF_CODEC_SUPPORTED;
+			}
+			if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config || esd->has_scalable_layers) return GF_CODEC_MAYBE_SUPPORTED;
+			return GF_CODEC_SUPPORTED;
+		}
+
+		switch (ffd->oti) {
+		/*MPEG-4 v1 simple profile*/
+		case GPAC_OTI_VIDEO_MPEG4_PART2:
+			codec_id = CODEC_ID_MPEG4;
+			break;
+		/*H264 (not std OTI, just the way we use it internally)*/
+		case GPAC_OTI_VIDEO_AVC:
+			codec_id = CODEC_ID_H264;
+			break;
+#ifdef HAS_HEVC
+		case GPAC_OTI_VIDEO_HEVC:
+			codec_id = AV_CODEC_ID_HEVC;
+			break;
+#endif
+		/*MPEG1 video*/
+		case GPAC_OTI_VIDEO_MPEG1:
+		/*MPEG2 video*/
+		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
+		case GPAC_OTI_VIDEO_MPEG2_MAIN:
+		case GPAC_OTI_VIDEO_MPEG2_SNR:
+		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
+		case GPAC_OTI_VIDEO_MPEG2_HIGH:
+		case GPAC_OTI_VIDEO_MPEG2_422:
+			codec_id = CODEC_ID_MPEG2VIDEO;
+			break;
+		/*JPEG*/
+		case GPAC_OTI_IMAGE_JPEG:
+			codec_id = CODEC_ID_MJPEG;
+			/*return maybe supported as FFMPEG JPEG decoder has some issues with many files, so let's use it only if no
+			other dec is available*/
+			if (avcodec_find_decoder(codec_id) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+
+			return GF_CODEC_NOT_SUPPORTED;
+		case GPAC_OTI_IMAGE_PNG:
+			if (avcodec_find_decoder(CODEC_ID_PNG) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+			return GF_CODEC_NOT_SUPPORTED;
+
+#ifdef CODEC_ID_VP9
+		case GPAC_OTI_VIDEO_VP9:
+			if (avcodec_find_decoder(AV_CODEC_ID_VP9) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+			return GF_CODEC_NOT_SUPPORTED;
+#endif
+
+#ifdef CODEC_ID_AV1
+		case GPAC_OTI_VIDEO_AV1:
+			if (avcodec_find_decoder(CODEC_ID_AV1) != NULL)
+				return GF_CODEC_MAYBE_SUPPORTED;
+#endif
+			return GF_CODEC_NOT_SUPPORTED;
+
+		default:
+			return GF_CODEC_NOT_SUPPORTED;
+		}
+	}
+	/*NeroDigital DVD subtitles*/
+	else if ((StreamType==GF_STREAM_ND_SUBPIC) && (ffd->oti==0xe0))
+		return GF_CODEC_SUPPORTED;
+
+	if (!codec_id) return GF_CODEC_NOT_SUPPORTED;
+
+	if (check_4cc && (ffmpeg_get_codec(codec_id) != NULL)) {
+		if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
+		return GF_CODEC_SUPPORTED;
+	}
+
+	if (avcodec_find_decoder(codec_id) != NULL) {
+		if (esd->decoderConfig->rvc_config || esd->decoderConfig->predefined_rvc_config) return GF_CODEC_MAYBE_SUPPORTED;
+
+		//for HEVC return MAYBE supported to fallback to openHEVC if present (more optimized for now)
+#ifdef HAS_HEVC
+		if (codec_id == AV_CODEC_ID_HEVC)
+			return GF_CODEC_MAYBE_SUPPORTED;
+#endif
+
+		return GF_CODEC_SUPPORTED;
+	}
+
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static const char *FFDEC_GetCodecName(GF_BaseDecoder *dec)
+{
+	FFDec *ffd;
+	if (!dec)
+		return NULL;
+	ffd = (FFDec*)dec->privateStack;
+	if (ffd && ffd->base_codec) {
+		sprintf(ffd->szCodec, "FFMPEG %s - version %s", ffd->base_codec->name ? ffd->base_codec->name : "unknown", LIBAVCODEC_IDENT);
+		return ffd->szCodec;
+	}
+	return NULL;
+}
+
+
+void *FFDEC_Load()
+{
+	GF_MediaDecoder *ptr;
+	FFDec *priv;
+
+	GF_SAFEALLOC(ptr , GF_MediaDecoder);
+	if (!ptr) return NULL;
+	GF_SAFEALLOC(priv , FFDec);
+	if (!priv) {
+		gf_free(ptr);
+		return NULL;
+	}
+	ptr->privateStack = priv;
+
+	/* Note for valgrind : those two functions cause a leak in valgrind */
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Decoder] Registering all ffmpeg codecs...\n") );
+#ifdef FF_API_AVCODE_INIT /*commit ffmpeg 3211932c513338566b31d990d06957e15a644d13*/
+	avcodec_init();
+#endif
+	avcodec_register_all();
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG Decoder] Done registering all ffmpeg codecs.\n") );
+
+	ptr->AttachStream = FFDEC_AttachStream;
+	ptr->DetachStream = FFDEC_DetachStream;
+	ptr->GetCapabilities = FFDEC_GetCapabilities;
+	ptr->SetCapabilities = FFDEC_SetCapabilities;
+	ptr->CanHandleStream = FFDEC_CanHandleStream;
+	ptr->GetName = FFDEC_GetCodecName;
+	ptr->ProcessData = FFDEC_ProcessData;
+	ptr->GetOutputBuffer = FFDEC_GetOutputBuffer;
+#if defined(USE_AVCTX3) && defined(FFMPEG_DIRECT_DISPATCH)
+	ptr->GetOutputFrame = FFDEC_GetOutputFrame;
+#endif
+
+	GF_REGISTER_MODULE_INTERFACE(ptr, GF_MEDIA_DECODER_INTERFACE, "FFMPEG decoder", "gpac distribution");
+	return (GF_BaseInterface *) ptr;
+}
+
+void FFDEC_Delete(void *ifce)
+{
+	GF_BaseDecoder *dec = (GF_BaseDecoder*)ifce;
+	FFDec *ffd;
+	if (!ifce)
+		return;
+	ffd = (FFDec*)dec->privateStack;
+	dec->privateStack = NULL;
+	if (ffd) {
+		if (ffd->base_ctx && ffd->base_ctx->codec) avcodec_close(ffd->base_ctx);
+		ffd->base_ctx = NULL;
+		if (ffd->depth_ctx && ffd->depth_ctx->codec) avcodec_close(ffd->depth_ctx);
+		ffd->depth_ctx = NULL;
+#ifdef FFMPEG_SWSCALE
+		if (ffd->base_sws) sws_freeContext(ffd->base_sws);
+		ffd->base_sws = NULL;
+		if (ffd->depth_sws) sws_freeContext(ffd->base_sws);
+		ffd->depth_sws = NULL;
+#endif
+		gf_free(ffd);
+	}
+	gf_free(dec);
+}

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_demux.c Added

@@ -0,0 +1,1060 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / FFMPEG module
+ *
+ *  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 "ffmpeg_in.h"
+
+#ifndef DISABLE_FFMPEG_DEMUX
+
+/*default buffer is 200 ms per channel*/
+#define FFD_DATA_BUFFER		800
+
+//#define FFMPEG_DEMUX_ENABLE_MPEG2TS
+
+//#if defined(__DARWIN__) || defined(__APPLE__)
+#if !defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+#include <errno.h>
+#endif
+
+/**
+ * New versions of ffmpeg do not declare AVERROR_NOMEM, AVERROR_IO, AVERROR_NOFMT
+ */
+
+#ifndef AVERROR_NOMEM
+#define AVERROR_NOMEM AVERROR(ENOMEM)
+#endif /* AVERROR_NOMEM */
+
+#ifndef AVERROR_IO
+#define AVERROR_IO AVERROR(EIO)
+#endif /* AVERROR_IO */
+
+#ifndef AVERROR_NOFMT
+#define AVERROR_NOFMT AVERROR(EINVAL)
+#endif /* AVERROR_NOFMT */
+
+
+#if ((LIBAVFORMAT_VERSION_MAJOR == 54) && (LIBAVFORMAT_VERSION_MINOR >= 20)) || (LIBAVFORMAT_VERSION_MAJOR > 54)
+
+#define av_find_stream_info(__c)	avformat_find_stream_info(__c, NULL)
+#define USE_AVFORMAT_OPEN_INPUT	1
+#endif
+
+
+#if defined(GPAC_CONFIG_ANDROID) && (LIBAVFORMAT_VERSION_MAJOR <= 52)
+
+#ifndef FF_API_CLOSE_INPUT_FILE
+#define FF_API_CLOSE_INPUT_FILE	1
+#endif
+
+#endif
+
+
+
+static u32 FFDemux_Run(void *par)
+{
+	AVPacket pkt;
+	s64 seek_to;
+	GF_NetworkCommand com;
+	GF_NetworkCommand map;
+	GF_SLHeader slh;
+	FFDemux *ffd = (FFDemux *) par;
+
+	memset(&map, 0, sizeof(GF_NetworkCommand));
+	map.command_type = GF_NET_CHAN_MAP_TIME;
+
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.command_type = GF_NET_BUFFER_QUERY;
+
+	memset(&slh, 0, sizeof(GF_SLHeader));
+
+	slh.compositionTimeStampFlag = slh.decodingTimeStampFlag = 1;
+
+	while (ffd->is_running) {
+		//nothing connected, wait
+		if (!ffd->video_ch && !ffd->audio_ch) {
+			gf_sleep(100);
+			continue;
+		}
+
+		if ((ffd->seek_time>=0) && ffd->seekable) {
+			seek_to = (s64) (AV_TIME_BASE*ffd->seek_time);
+			av_seek_frame(ffd->ctx, -1, seek_to, AVSEEK_FLAG_BACKWARD);
+			ffd->seek_time = -1;
+		}
+		pkt.stream_index = -1;
+		/*EOF*/
+		if (av_read_frame(ffd->ctx, &pkt) <0) break;
+		if (pkt.pts == AV_NOPTS_VALUE) pkt.pts = pkt.dts;
+		if (!pkt.dts) pkt.dts = pkt.pts;
+
+		slh.compositionTimeStamp = pkt.pts;
+		slh.decodingTimeStamp = pkt.dts;
+
+		gf_mx_p(ffd->mx);
+		/*blindly send audio as soon as video is init*/
+		if (ffd->audio_ch && (pkt.stream_index == ffd->audio_st) ) {
+			slh.compositionTimeStamp *= ffd->audio_tscale.num;
+			slh.decodingTimeStamp *= ffd->audio_tscale.num;
+
+			gf_service_send_packet(ffd->service, ffd->audio_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
+		}
+		else if (ffd->video_ch && (pkt.stream_index == ffd->video_st)) {
+			slh.compositionTimeStamp *= ffd->video_tscale.num;
+			slh.decodingTimeStamp *= ffd->video_tscale.num;
+			slh.randomAccessPointFlag = pkt.flags&AV_PKT_FLAG_KEY ? 1 : 0;
+			gf_service_send_packet(ffd->service, ffd->video_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
+		}
+		gf_mx_v(ffd->mx);
+		av_free_packet(&pkt);
+
+		/*sleep untill the buffer occupancy is too low - note that this work because all streams in this
+		demuxer are synchronized*/
+		while (ffd->audio_run || ffd->video_run) {
+			gf_service_command(ffd->service, &com, GF_OK);
+			if (com.buffer.occupancy < com.buffer.max)
+				break;
+
+			gf_sleep(1);
+		}
+
+		if (!ffd->audio_run && !ffd->video_run) break;
+	}
+	/*signal EOS*/
+	if (ffd->audio_ch) gf_service_send_packet(ffd->service, ffd->audio_ch, NULL, 0, NULL, GF_EOS);
+	if (ffd->video_ch) gf_service_send_packet(ffd->service, ffd->video_ch, NULL, 0, NULL, GF_EOS);
+	ffd->is_running = 2;
+
+	return 0;
+}
+
+static const char * FFD_MIME_TYPES[] = {
+	"video/x-mpeg", "mpg mpeg mp2 mpa mpe mpv2", "MPEG 1/2 Movies",
+	"video/x-mpeg-systems", "mpg mpeg mp2 mpa mpe mpv2", "MPEG 1/2 Movies",
+	"audio/basic", "snd au", "Basic Audio",
+	"audio/x-wav", "wav", "WAV Audio",
+	"audio/vnd.wave", "wav", "WAV Audio",
+	"video/x-ms-asf", "asf wma wmv asx asr", "WindowsMedia Movies",
+	"video/x-ms-wmv", "asf wma wmv asx asr", "WindowsMedia Movies",
+	"video/x-msvideo", "avi", "AVI Movies",
+	"video/x-ms-video", "avi", "AVI Movies",
+	"video/avi", "avi", "AVI Movies",
+	"video/vnd.avi", "avi", "AVI Movies",
+	"video/H263", "h263 263", "H263 Video",
+	"video/H264", "h264 264", "H264 Video",
+	"video/MPEG4", "cmp", "MPEG-4 Video",
+	/* We let ffmpeg handle mov because some QT files with uncompressed or adpcm audio use 1 audio sample
+	   per MP4 sample which is a killer for our MP4 lib, whereas ffmpeg handles these as complete audio chunks
+	   moreover ffmpeg handles cmov, we don't */
+	"video/quicktime", "mov qt", "QuickTime Movies",
+	/* Supported by latest versions of FFMPEG */
+	"video/webm", "webm", "Google WebM Movies",
+	"audio/webm", "webm", "Google WebM Music",
+#ifdef FFMPEG_DEMUX_ENABLE_MPEG2TS
+	"video/mp2t", "ts", "MPEG 2 TS",
+#endif
+	NULL
+};
+
+static u32 FFD_RegisterMimeTypes(const GF_InputService *plug) {
+	u32 i;
+	for (i = 0 ; FFD_MIME_TYPES[i]; i+=3)
+		gf_service_register_mime(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2]);
+	return i/3;
+}
+
+static int open_file(AVFormatContext **	ic_ptr, const char * 	filename, AVInputFormat * 	fmt, void *ops) {
+#ifdef USE_PRE_0_7
+	return av_open_input_file(ic_ptr, filename, fmt, 0, NULL);
+#else
+	return avformat_open_input(ic_ptr, filename, fmt, (AVDictionary**)ops);
+#endif
+}
+
+void ffd_parse_options(FFDemux *ffd, const char *url)
+{
+#ifdef USE_AVFORMAT_OPEN_INPUT
+	int res;
+	char *frag = (char*) strchr(url, '#');
+	if (frag) frag = frag+1;
+
+	if (ffd->options) return;
+
+	while (frag) {
+		char *mid, *sep = strchr(frag, ':');
+		if (sep) sep[0] = 0;
+		mid = strchr(frag, '=');
+		if (mid) {
+			mid[0] = 0;
+			res = av_dict_set(&ffd->options, frag, mid+1, 0);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Failed to set option %s:%s\n", frag, mid+1) );
+			}
+			mid[0] = '=';
+		}
+		if (!sep) break;
+		sep[0] = ':';
+		frag = sep+1;
+	}
+#endif
+}
+
+
+static Bool FFD_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	Bool has_audio, has_video;
+	s32 i;
+	AVFormatContext *ctx;
+	AVOutputFormat *fmt_out;
+	Bool ret = GF_FALSE;
+	char *ext, szName[1024], szExt[20];
+	const char *szExtList;
+	FFDemux *ffd;
+	if (!plug || !url)
+		return GF_FALSE;
+	/*disable RTP/RTSP from ffmpeg*/
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FALSE;
+	if (!strnicmp(url, "rtspu://", 8)) return GF_FALSE;
+	if (!strnicmp(url, "rtp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "plato://", 8)) return GF_FALSE;
+	if (!strnicmp(url, "udp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "tcp://", 6)) return GF_FALSE;
+	if (!strnicmp(url, "data:", 5)) return GF_FALSE;
+
+	ffd = (FFDemux*)plug->priv;
+
+	if (strlen(url) >= sizeof(szName))
+		return GF_FALSE;
+
+	strcpy(szName, url);
+	ext = strrchr(szName, '#');
+	if (ext) ext[0] = 0;
+	ext = strrchr(szName, '?');
+	if (ext) ext[0] = 0;
+
+	ext = strrchr(szName, '.');
+	if (ext && strlen(ext) > 19) ext = NULL;
+
+	if (ext && strlen(ext) > 1 && strlen(ext) <= sizeof(szExt)) {
+		strcpy(szExt, &ext[1]);
+		strlwr(szExt);
+#ifndef FFMPEG_DEMUX_ENABLE_MPEG2TS
+		if (strstr("ts m2t mts dmb trp", szExt) ) return GF_FALSE;
+#endif
+
+		/*note we forbid ffmpeg to handle files we support*/
+		if (!strcmp(szExt, "mp4") || !strcmp(szExt, "mpg4") || !strcmp(szExt, "m4a") || !strcmp(szExt, "m21")
+		        || !strcmp(szExt, "m4v") || !strcmp(szExt, "m4a")
+		        || !strcmp(szExt, "m4s") || !strcmp(szExt, "3gs")
+		        || !strcmp(szExt, "3gp") || !strcmp(szExt, "3gpp") || !strcmp(szExt, "3gp2") || !strcmp(szExt, "3g2")
+		        || !strcmp(szExt, "mp3")
+		        || !strcmp(szExt, "ac3")
+		        || !strcmp(szExt, "amr")
+		        || !strcmp(szExt, "bt") || !strcmp(szExt, "wrl") || !strcmp(szExt, "x3dv")
+		        || !strcmp(szExt, "xmt") || !strcmp(szExt, "xmta") || !strcmp(szExt, "x3d")
+
+		        || !strcmp(szExt, "jpg") || !strcmp(szExt, "jpeg") || !strcmp(szExt, "png")
+		   ) return GF_FALSE;
+
+		/*check any default stuff that should work with ffmpeg*/
+		{
+			u32 i;
+			for (i = 0 ; FFD_MIME_TYPES[i]; i+=3) {
+				if (gf_service_check_mime_register(plug, FFD_MIME_TYPES[i], FFD_MIME_TYPES[i+1], FFD_MIME_TYPES[i+2], ext))
+					return GF_TRUE;
+			}
+		}
+	}
+
+	ffd_parse_options(ffd, url);
+
+	ctx = NULL;
+	if (open_file(&ctx, szName, NULL, ffd->options ? &ffd->options : NULL)<0) {
+		AVInputFormat *av_in = NULL;
+		/*some extensions not supported by ffmpeg*/
+		if (ext && !strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
+
+		if (open_file(&ctx, szName, av_in, ffd->options ? &ffd->options : NULL)<0) {
+			return GF_FALSE;
+		}
+	}
+
+	if (!ctx) goto exit;
+	if (av_find_stream_info(ctx) <0) goto exit;
+
+	/*figure out if we can use codecs or not*/
+	has_video = has_audio = GF_FALSE;
+	for(i = 0; i < (s32)ctx->nb_streams; i++) {
+		AVCodecContext *enc = ctx->streams[i]->codec;
+		switch(enc->codec_type) {
+		case AVMEDIA_TYPE_AUDIO:
+			if (!has_audio) has_audio = GF_TRUE;
+			break;
+		case AVMEDIA_TYPE_VIDEO:
+			if (!has_video) has_video= GF_TRUE;
+			break;
+		default:
+			break;
+		}
+	}
+	if (!has_audio && !has_video) goto exit;
+	ret = GF_TRUE;
+#if ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 47)) || (LIBAVFORMAT_VERSION_MAJOR < 52)
+	fmt_out = guess_stream_format(NULL, url, NULL);
+#else
+	fmt_out = av_guess_format(NULL, url, NULL);
+#endif
+	if (fmt_out) gf_service_register_mime(plug, fmt_out->mime_type, fmt_out->extensions, fmt_out->name);
+	else {
+		ext = strrchr(szName, '.');
+		if (ext) {
+			strcpy(szExt, &ext[1]);
+			strlwr(szExt);
+
+			szExtList = gf_opts_get_key("MimeTypes", "application/x-ffmpeg");
+			if (!szExtList) {
+				gf_service_register_mime(plug, "application/x-ffmpeg", szExt, "Other Movies (FFMPEG)");
+			} else if (!strstr(szExtList, szExt)) {
+				u32 len;
+				char *buf;
+				len = (u32) (strlen(szExtList) + strlen(szExt) + 10);
+				buf = (char*)gf_malloc(sizeof(char)*len);
+				sprintf(buf, "\"%s ", szExt);
+				strcat(buf, &szExtList[1]);
+				gf_opts_set_key("MimeTypes", "application/x-ffmpeg", buf);
+				gf_free(buf);
+			}
+		}
+	}
+
+exit:
+#if FF_API_CLOSE_INPUT_FILE
+	if (ctx) av_close_input_file(ctx);
+#else
+	if (ctx) avformat_close_input(&ctx);
+#endif
+	return ret;
+}
+
+static GF_ESD *FFD_GetESDescriptor(FFDemux *ffd, Bool for_audio)
+{
+	GF_BitStream *bs;
+	Bool dont_use_sl;
+	GF_ESD *esd = (GF_ESD *) gf_odf_desc_esd_new(0);
+	esd->ESID = 1 + (for_audio ? ffd->audio_st : ffd->video_st);
+	esd->decoderConfig->streamType = for_audio ? GF_STREAM_AUDIO : GF_STREAM_VISUAL;
+	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
+
+	/*remap std object types - depending on input formats, FFMPEG may not have separate DSI from initial frame.
+	In this case we have no choice but using FFMPEG decoders*/
+	if (for_audio) {
+		AVCodecContext *dec = ffd->ctx->streams[ffd->audio_st]->codec;
+		esd->slConfig->timestampResolution = ffd->audio_tscale.den;
+		switch (dec->codec_id) {
+		case CODEC_ID_MP2:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
+			break;
+		case CODEC_ID_MP3:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
+			break;
+		case CODEC_ID_AAC:
+			if (!dec->extradata_size) goto opaque_audio;
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
+			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
+			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
+			       dec->extradata,
+			       sizeof(char)*dec->extradata_size);
+			break;
+		default:
+opaque_audio:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_FFMPEG;
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(bs, dec->codec_id);
+			gf_bs_write_u32(bs, dec->sample_rate);
+			gf_bs_write_u16(bs, dec->channels);
+			gf_bs_write_u16(bs, dec->frame_size);
+			gf_bs_write_u8(bs, 16);
+			gf_bs_write_u8(bs, 0);
+			/*ffmpeg specific*/
+			gf_bs_write_u16(bs, dec->block_align);
+			gf_bs_write_u32(bs, dec->bit_rate);
+			gf_bs_write_u32(bs, dec->codec_tag);
+			if (dec->extradata_size) {
+				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
+			}
+			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_bs_del(bs);
+			break;
+		}
+		dont_use_sl = ffd->unreliable_audio_timing;
+	} else {
+		AVCodecContext *dec = ffd->ctx->streams[ffd->video_st]->codec;
+		esd->slConfig->timestampResolution = ffd->video_tscale.den;
+		switch (dec->codec_id) {
+		case CODEC_ID_MPEG4:
+			/*there is a bug in fragmentation of raw H264 in ffmpeg, the NALU startcode (0x00000001) is split across
+			two frames - we therefore force internal ffmpeg codec ID to avoid NALU size recompute
+			at the decoder level*/
+//		case CODEC_ID_H264:
+			/*if dsi not detected force use ffmpeg*/
+			if (!dec->extradata_size) goto opaque_video;
+			/*otherwise use any MPEG-4 Visual*/
+			esd->decoderConfig->objectTypeIndication = (dec->codec_id==CODEC_ID_H264) ? GPAC_OTI_VIDEO_AVC : GPAC_OTI_VIDEO_MPEG4_PART2;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
+			esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*dec->extradata_size);
+			memcpy(esd->decoderConfig->decoderSpecificInfo->data,
+			       dec->extradata,
+			       sizeof(char)*dec->extradata_size);
+			break;
+		case CODEC_ID_MPEG1VIDEO:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
+			break;
+		case CODEC_ID_MPEG2VIDEO:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_MAIN;
+			break;
+
+		case CODEC_ID_H263:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(bs, GF_4CC('s', '2', '6', '3') );
+			gf_bs_write_u16(bs, dec->width);
+			gf_bs_write_u16(bs, dec->height);
+			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_bs_del(bs);
+			break;
+		default:
+opaque_video:
+			esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_FFMPEG;
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(bs, dec->codec_id);
+			gf_bs_write_u16(bs, dec->width);
+			gf_bs_write_u16(bs, dec->height);
+			/*ffmpeg specific*/
+			gf_bs_write_u32(bs, dec->bit_rate);
+			gf_bs_write_u32(bs, dec->codec_tag);
+			gf_bs_write_u32(bs, dec->pix_fmt);
+
+			if (dec->extradata_size) {
+				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
+			}
+			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_bs_del(bs);
+			break;
+		}
+		dont_use_sl = GF_FALSE;
+	}
+
+	if (dont_use_sl) {
+		esd->slConfig->predefined = SLPredef_SkipSL;
+	} else {
+		/*only send full AUs*/
+		esd->slConfig->useAccessUnitStartFlag = esd->slConfig->useAccessUnitEndFlag = 0;
+		if (for_audio) {
+			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+		} else {
+			esd->slConfig->useRandomAccessPointFlag = 1;
+		}
+		esd->slConfig->useTimestampsFlag = 1;
+	}
+
+	return esd;
+}
+
+
+static void FFD_SetupObjects(FFDemux *ffd)
+{
+	GF_ESD *esd;
+	GF_ObjectDescriptor *od;
+	u32 audio_esid = 0;
+
+	if ((ffd->audio_st>=0) && (ffd->service_type != 1)) {
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
+		od->objectDescriptorID = esd->ESID;
+		audio_esid = esd->ESID;
+		gf_list_add(od->ESDescriptors, esd);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, (ffd->video_st>=0) ? GF_TRUE : GF_FALSE);
+	}
+	if ((ffd->video_st>=0) && (ffd->service_type != 2)) {
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
+		od->objectDescriptorID = esd->ESID;
+		esd->OCRESID = audio_esid;
+		gf_list_add(od->ESDescriptors, esd);
+		gf_service_declare_media(ffd->service, (GF_Descriptor*)od, GF_FALSE);
+	}
+}
+
+#ifdef USE_PRE_0_7
+static int ff_url_read(void *h, unsigned char *buf, int size)
+{
+	u32 retry = 10;
+	u32 read;
+	int full_size;
+	FFDemux *ffd = (FFDemux *)h;
+
+	full_size = 0;
+	if (ffd->buffer_used) {
+		if (ffd->buffer_used >= (u32) size) {
+			ffd->buffer_used-=size;
+			memcpy(ffd->buffer, ffd->buffer+size, sizeof(char)*ffd->buffer_used);
+#ifdef FFMPEG_DUMP_REMOTE
+			if (ffd->outdbg) gf_fwrite(buf, size, 1, ffd->outdbg);
+#endif
+			return size;
+		}
+		full_size += ffd->buffer_used;
+		buf += ffd->buffer_used;
+		size -= ffd->buffer_used;
+		ffd->buffer_used = 0;
+	}
+
+	while (size) {
+		GF_Err e = gf_dm_sess_fetch_data(ffd->dnload, buf, size, &read);
+		if (e==GF_EOS) break;
+		/*we're sync!!*/
+		if (e==GF_IP_NETWORK_EMPTY) {
+			if (!retry) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] timeout fetching bytes from network\n") );
+				return -1;
+			}
+			retry --;
+			gf_sleep(100);
+			continue;
+		}
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] error fetching bytes from network: %s\n", gf_error_to_string(e) ) );
+			return -1;
+		}
+		full_size += read;
+		if (read==size) break;
+		size -= read;
+		buf += read;
+	}
+#ifdef FFMPEG_DUMP_REMOTE
+	if (ffd->outdbg) gf_fwrite(ffd->buffer, full_size, 1, ffd->outdbg);
+#endif
+	return full_size ? (int) full_size : -1;
+}
+#endif /*USE_PRE_0_7*/
+
+
+static GF_Err FFD_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	GF_Err e;
+	s64 last_aud_pts;
+	u32 i;
+	s32 res;
+	Bool is_local;
+	const char *sOpt;
+	char *ext, szName[1024];
+	FFDemux *ffd = (FFDemux*)plug->priv;
+	AVInputFormat *av_in = NULL;
+	char szExt[20];
+
+	if (ffd->ctx) return GF_SERVICE_ERROR;
+
+	assert( url && strlen(url) < 1024);
+	strcpy(szName, url);
+	ext = strrchr(szName, '#');
+	ffd->service_type = 0;
+	ffd->service = serv;
+
+	if (ext) {
+		if (!stricmp(&ext[1], "video")) ffd->service_type = 1;
+		else if (!stricmp(&ext[1], "audio")) ffd->service_type = 2;
+		ext[0] = 0;
+	}
+
+	ffd_parse_options(ffd, url);
+
+	/*some extensions not supported by ffmpeg, overload input format*/
+	ext = strrchr(szName, '.');
+	strcpy(szExt, ext ? ext+1 : "");
+	strlwr(szExt);
+	if (!strcmp(szExt, "cmp")) av_in = av_find_input_format("m4v");
+
+	is_local = (strnicmp(url, "file://", 7) && strstr(url, "://")) ? GF_FALSE : GF_TRUE;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] opening file %s - local %d - av_in %08x\n", url, is_local, av_in));
+
+	if (!is_local) {
+		AVProbeData   pd;
+
+		/*setup wraper for FFMPEG I/O*/
+		ffd->buffer_size = 8192;
+		sOpt = gf_opts_get_key("FFMPEG", "IOBufferSize");
+		if (sOpt) ffd->buffer_size = atoi(sOpt);
+		ffd->buffer = (char*)gf_malloc(sizeof(char)*ffd->buffer_size);
+#ifdef FFMPEG_DUMP_REMOTE
+		ffd->outdbg = gf_fopen("ffdeb.raw", "wb");
+#endif
+#ifdef USE_PRE_0_7
+		init_put_byte(&ffd->io, ffd->buffer, ffd->buffer_size, 0, ffd, ff_url_read, NULL, NULL);
+		ffd->io.is_streamed = 1;
+#else
+		ffd->io.seekable = 1;
+#endif
+
+		ffd->dnload = gf_service_download_new(ffd->service, url, GF_NETIO_SESSION_NOT_THREADED  | GF_NETIO_SESSION_NOT_CACHED, NULL, ffd);
+		if (!ffd->dnload) return GF_URL_ERROR;
+		while (1) {
+			u32 read;
+			e = gf_dm_sess_fetch_data(ffd->dnload, ffd->buffer + ffd->buffer_used, ffd->buffer_size - ffd->buffer_used, &read);
+			if (e==GF_EOS) break;
+			/*we're sync!!*/
+			if (e==GF_IP_NETWORK_EMPTY) continue;
+			if (e) goto err_exit;
+			ffd->buffer_used += read;
+			if (ffd->buffer_used == ffd->buffer_size) break;
+		}
+		if (e==GF_EOS) {
+			const char *cache_file = gf_dm_sess_get_cache_name(ffd->dnload);
+			res = open_file(&ffd->ctx, cache_file, av_in, ffd->options ? &ffd->options : NULL);
+		} else {
+			pd.filename = szName;
+			pd.buf_size = ffd->buffer_used;
+			pd.buf = (u8 *) ffd->buffer;
+			av_in = av_probe_input_format(&pd, 1);
+			if (!av_in) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] error probing file %s - probe start with %c %c %c %c\n", url, ffd->buffer[0], ffd->buffer[1], ffd->buffer[2], ffd->buffer[3]));
+				return GF_NOT_SUPPORTED;
+			}
+			/*setup downloader*/
+			av_in->flags |= AVFMT_NOFILE;
+#ifdef USE_AVFORMAT_OPEN_INPUT /*commit ffmpeg 603b8bc2a109978c8499b06d2556f1433306eca7*/
+			res = avformat_open_input(&ffd->ctx, szName, av_in, NULL);
+#else
+			res = av_open_input_stream(&ffd->ctx, &ffd->io, szName, av_in, NULL);
+#endif
+		}
+	} else {
+		res = open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
+	}
+
+	switch (res) {
+#ifndef _WIN32_WCE
+	case 0:
+		e = GF_OK;
+		break;
+	case AVERROR_IO:
+		e = GF_URL_ERROR;
+		goto err_exit;
+	case AVERROR_INVALIDDATA:
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		goto err_exit;
+	case AVERROR_NOMEM:
+		e = GF_OUT_OF_MEM;
+		goto err_exit;
+	case AVERROR_NOFMT:
+		e = GF_NOT_SUPPORTED;
+		goto err_exit;
+#endif
+	default:
+		e = GF_SERVICE_ERROR;
+		goto err_exit;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] looking for streams in %s - %d streams - type %s\n", ffd->ctx->filename, ffd->ctx->nb_streams, ffd->ctx->iformat->name));
+
+#ifdef USE_AVFORMAT_OPEN_INPUT
+	res = avformat_find_stream_info(ffd->ctx, ffd->options ? &ffd->options : NULL);
+#else
+	res = av_find_stream_info(ffd->ctx);
+#endif
+
+	if (res <0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] cannot locate streams - error %d\n", res));
+		e = GF_NOT_SUPPORTED;
+		goto err_exit;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG] file %s opened - %d streams\n", url, ffd->ctx->nb_streams));
+
+	/*figure out if we can use codecs or not*/
+	ffd->audio_st = ffd->video_st = -1;
+	for (i = 0; i < ffd->ctx->nb_streams; i++) {
+		AVCodecContext *enc = ffd->ctx->streams[i]->codec;
+		switch(enc->codec_type) {
+		case AVMEDIA_TYPE_AUDIO:
+			if ((ffd->audio_st<0) && (ffd->service_type!=1)) {
+				ffd->audio_st = i;
+				ffd->audio_tscale = ffd->ctx->streams[i]->time_base;
+			}
+			break;
+		case AVMEDIA_TYPE_VIDEO:
+			if ((ffd->video_st<0) && (ffd->service_type!=2)) {
+				ffd->video_st = i;
+				ffd->video_tscale = ffd->ctx->streams[i]->time_base;
+			}
+			break;
+		default:
+			break;
+		}
+	}
+	if ((ffd->service_type==1) && (ffd->video_st<0)) goto err_exit;
+	if ((ffd->service_type==2) && (ffd->audio_st<0)) goto err_exit;
+	if ((ffd->video_st<0) && (ffd->audio_st<0)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] No supported streams in file\n"));
+		goto err_exit;
+	}
+
+
+	sOpt = gf_opts_get_key("FFMPEG", "DataBufferMS");
+	ffd->data_buffer_ms = 0;
+	if (sOpt) ffd->data_buffer_ms = atoi(sOpt);
+	if (!ffd->data_buffer_ms) ffd->data_buffer_ms = FFD_DATA_BUFFER;
+
+	/*build seek*/
+	if (is_local) {
+		/*check we do have increasing pts. If not we can't rely on pts, we must skip SL
+		we assume video pts is always present*/
+		if (ffd->audio_st>=0) {
+			last_aud_pts = 0;
+			for (i=0; i<20; i++) {
+				AVPacket pkt;
+				pkt.stream_index = -1;
+				if (av_read_frame(ffd->ctx, &pkt) <0) break;
+				if (pkt.pts == AV_NOPTS_VALUE) pkt.pts = pkt.dts;
+				if (pkt.stream_index==ffd->audio_st) last_aud_pts = pkt.pts;
+			}
+			if (last_aud_pts*ffd->audio_tscale.den<10*ffd->audio_tscale.num) ffd->unreliable_audio_timing = GF_TRUE;
+		}
+
+		ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? GF_FALSE : GF_TRUE;
+		if (!ffd->seekable) {
+#if FF_API_CLOSE_INPUT_FILE
+			av_close_input_file(ffd->ctx);
+#else
+			avformat_close_input(&ffd->ctx);
+#endif
+			ffd->ctx = NULL;
+			open_file(&ffd->ctx, szName, av_in, ffd->options ? &ffd->options : NULL);
+			av_find_stream_info(ffd->ctx);
+		}
+	}
+
+	/*let's go*/
+	gf_service_connect_ack(serv, NULL, GF_OK);
+	/*if (!ffd->service_type)*/ FFD_SetupObjects(ffd);
+	ffd->service_type = 0;
+	return GF_OK;
+
+err_exit:
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
+#if FF_API_CLOSE_INPUT_FILE
+	if (ffd->ctx) av_close_input_file(ffd->ctx);
+#else
+	if (ffd->ctx) avformat_close_input(&ffd->ctx);
+#endif
+	ffd->ctx = NULL;
+	gf_service_connect_ack(serv, NULL, e);
+	return e;
+}
+
+
+static GF_Descriptor *FFD_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	GF_ObjectDescriptor *od;
+	GF_ESD *esd;
+	FFDemux *ffd = (FFDemux*)plug->priv;
+
+	if (!ffd->ctx) return NULL;
+
+	if (expect_type==GF_MEDIA_OBJECT_UNDEF) {
+		if (ffd->video_st>=0) expect_type=GF_MEDIA_OBJECT_VIDEO;
+		else if (ffd->audio_st>=0) expect_type=GF_MEDIA_OBJECT_AUDIO;
+	}
+
+
+	/*since we don't handle multitrack in ffmpeg, we don't need to check sub_url, only use expected type*/
+	if (expect_type==GF_MEDIA_OBJECT_AUDIO) {
+		if (ffd->audio_st<0) return NULL;
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		od->objectDescriptorID = 1;
+		esd = FFD_GetESDescriptor(ffd, GF_TRUE);
+		/*if session join, setup sync*/
+		if (ffd->video_ch) esd->OCRESID = ffd->video_st+1;
+		gf_list_add(od->ESDescriptors, esd);
+		ffd->service_type = 2;
+		return (GF_Descriptor *) od;
+	}
+	if (expect_type==GF_MEDIA_OBJECT_VIDEO) {
+		if (ffd->video_st<0) return NULL;
+		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		od->objectDescriptorID = 1;
+		esd = FFD_GetESDescriptor(ffd, GF_FALSE);
+		/*if session join, setup sync*/
+		if (ffd->audio_ch) esd->OCRESID = ffd->audio_st+1;
+		gf_list_add(od->ESDescriptors, esd);
+		ffd->service_type = 1;
+		return (GF_Descriptor *) od;
+	}
+	return NULL;
+}
+
+
+static GF_Err FFD_CloseService(GF_InputService *plug)
+{
+	FFDemux *ffd = (FFDemux*)plug->priv;
+
+	ffd->is_running = 0;
+
+#if FF_API_CLOSE_INPUT_FILE
+	if (ffd->ctx) av_close_input_file(ffd->ctx);
+#else
+	if (ffd->ctx) avformat_close_input(&ffd->ctx);
+#endif
+
+	ffd->ctx = NULL;
+	ffd->audio_ch = ffd->video_ch = NULL;
+	ffd->audio_run = ffd->video_run = GF_FALSE;
+
+	if (ffd->dnload) {
+		if (ffd->is_running) {
+			while (!ffd->is_running) gf_sleep(1);
+			ffd->is_running = 0;
+		}
+		gf_service_download_del(ffd->dnload);
+		ffd->dnload = NULL;
+	}
+	if (ffd->buffer) gf_free(ffd->buffer);
+	ffd->buffer = NULL;
+
+	gf_service_disconnect_ack(ffd->service, NULL, GF_OK);
+#ifdef FFMPEG_DUMP_REMOTE
+	if (ffd->outdbg) gf_fclose(ffd->outdbg);
+#endif
+	return GF_OK;
+}
+
+static GF_Err FFD_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	GF_Err e;
+	u32 ESID;
+	FFDemux *ffd = (FFDemux*)plug->priv;
+
+	e = GF_STREAM_NOT_FOUND;
+	if (upstream) {
+		e = GF_ISOM_INVALID_FILE;
+		goto exit;
+	}
+	if (!strstr(url, "ES_ID=")) {
+		e = GF_NOT_SUPPORTED;
+		goto exit;
+	}
+	sscanf(url, "ES_ID=%u", &ESID);
+
+	if ((s32) ESID == 1 + ffd->audio_st) {
+		if (ffd->audio_ch) {
+			e = GF_SERVICE_ERROR;
+			goto exit;
+		}
+		ffd->audio_ch = channel;
+		e = GF_OK;
+	}
+	else if ((s32) ESID == 1 + ffd->video_st) {
+		if (ffd->video_ch) {
+			e = GF_SERVICE_ERROR;
+			goto exit;
+		}
+		ffd->video_ch = channel;
+		e = GF_OK;
+	}
+
+exit:
+	gf_service_connect_ack(ffd->service, channel, e);
+	return GF_OK;
+}
+
+static GF_Err FFD_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_Err e;
+	FFDemux *ffd = (FFDemux*)plug->priv;
+
+	e = GF_STREAM_NOT_FOUND;
+	if (ffd->audio_ch == channel) {
+		e = GF_OK;
+		ffd->audio_ch = NULL;
+		ffd->audio_run = GF_FALSE;
+	}
+	else if (ffd->video_ch == channel) {
+		e = GF_OK;
+		ffd->video_ch = NULL;
+		ffd->video_run = GF_FALSE;
+	}
+	gf_service_disconnect_ack(ffd->service, channel, e);
+	return GF_OK;
+}
+
+static GF_Err FFD_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	FFDemux *ffd = (FFDemux*)plug->priv;
+
+
+	if (com->command_type==GF_NET_SERVICE_HAS_AUDIO) {
+		if (ffd->audio_st>=0) return GF_OK;
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
+
+	switch (com->command_type) {
+	/*only BIFS/OD work in pull mode (cf ffmpeg_in.h)*/
+	case GF_NET_CHAN_SET_PULL:
+		return GF_NOT_SUPPORTED;
+	case GF_NET_CHAN_INTERACTIVE:
+		return ffd->seekable ? GF_OK : GF_NOT_SUPPORTED;
+	case GF_NET_CHAN_BUFFER:
+		return GF_OK;
+	case GF_NET_CHAN_DURATION:
+		if (ffd->ctx->duration == AV_NOPTS_VALUE)
+			com->duration.duration = -1;
+		else
+			com->duration.duration = (Double) ffd->ctx->duration / AV_TIME_BASE;
+		return GF_OK;
+	/*fetch start time*/
+	case GF_NET_CHAN_PLAY:
+		if (com->play.speed<0) return GF_NOT_SUPPORTED;
+
+		gf_mx_p(ffd->mx);
+		ffd->seek_time = (com->play.start_range>=0) ? com->play.start_range : 0;
+
+		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_TRUE;
+		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_TRUE;
+
+		/*play on media stream, start thread*/
+		if ((ffd->audio_ch==com->base.on_channel) || (ffd->video_ch==com->base.on_channel)) {
+			if (ffd->is_running!=1) {
+				ffd->is_running = 1;
+				gf_th_run(ffd->thread, FFDemux_Run, ffd);
+			}
+		}
+		gf_mx_v(ffd->mx);
+		return GF_OK;
+	case GF_NET_CHAN_STOP:
+		if (ffd->audio_ch==com->base.on_channel) ffd->audio_run = GF_FALSE;
+		else if (ffd->video_ch==com->base.on_channel) ffd->video_run = GF_FALSE;
+		return GF_OK;
+	/*note we don't handle PAUSE/RESUME/SET_SPEED, this is automatically handled by the demuxing thread
+	through buffer occupancy queries*/
+
+	default:
+		return GF_OK;
+	}
+
+	return GF_OK;
+}
+
+
+static Bool FFD_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+	char szURL[2048], *sep;
+	FFDemux *ffd;
+	const char *this_url;
+	if (!plug || !url)
+		return GF_FALSE;
+	ffd = (FFDemux *)plug->priv;
+	this_url = gf_service_get_url(ffd->service);
+	if (!this_url)
+		return GF_FALSE;
+
+	strcpy(szURL, this_url);
+	sep = strrchr(szURL, '#');
+	if (sep) sep[0] = 0;
+
+	if ((url[0] != '#') && strnicmp(szURL, url, sizeof(char)*strlen(szURL))) return GF_FALSE;
+	sep = strrchr(url, '#');
+	if (sep && !stricmp(sep, "#video") && (ffd->video_st>=0)) return GF_TRUE;
+	if (sep && !stricmp(sep, "#audio") && (ffd->audio_st>=0)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+void *New_FFMPEG_Demux()
+{
+	GF_InputService *ffd;
+	FFDemux *priv;
+	GF_SAFEALLOC(ffd, GF_InputService);
+	if (!ffd) return NULL;
+	GF_SAFEALLOC(priv, FFDemux);
+	if (!priv) {
+		gf_free(ffd);
+		return NULL;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins...\n") );
+	/* register all codecs, demux and protocols */
+	av_register_all();
+	avformat_network_init();
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[FFMPEG Demuxer] Registering all ffmpeg plugins DONE.\n") );
+
+	ffd->RegisterMimeTypes = FFD_RegisterMimeTypes;
+	ffd->CanHandleURL = FFD_CanHandleURL;
+	ffd->CloseService = FFD_CloseService;
+	ffd->ConnectChannel = FFD_ConnectChannel;
+	ffd->ConnectService = FFD_ConnectService;
+	ffd->DisconnectChannel = FFD_DisconnectChannel;
+	ffd->GetServiceDescriptor = FFD_GetServiceDesc;
+	ffd->ServiceCommand = FFD_ServiceCommand;
+
+	ffd->CanHandleURLInService = FFD_CanHandleURLInService;
+
+	priv->thread = gf_th_new("FFMPEG Demux");
+	priv->mx = gf_mx_new("FFMPEG Demux");
+	if (!priv->thread || !priv->mx) {
+		if (priv->thread) gf_th_del(priv->thread);
+		if (priv->mx) gf_mx_del(priv->mx);
+		gf_free(priv);
+		return NULL;
+	}
+
+	GF_REGISTER_MODULE_INTERFACE(ffd, GF_NET_CLIENT_INTERFACE, "FFMPEG Demuxer", "gpac distribution");
+	ffd->priv = priv;
+	return ffd;
+}
+
+void Delete_FFMPEG_Demux(void *ifce)
+{
+	FFDemux *ffd;
+	GF_InputService *ptr = (GF_InputService *)ifce;
+	if (!ptr)
+		return;
+	ffd = (FFDemux*)ptr->priv;
+	if (ffd) {
+		if (ffd->thread)
+			gf_th_del(ffd->thread);
+		ffd->thread = NULL;
+		if (ffd->mx)
+			gf_mx_del(ffd->mx);
+
+#ifndef USE_PRE_0_7
+		if (ffd->options) av_dict_free(&ffd->options);
+#endif
+		ffd->mx = NULL;
+		gf_free(ffd);
+		ptr->priv = NULL;
+	}
+	gf_free(ptr);
+}
+
+
+#endif

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_in.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ffmpeg_in/ffmpeg_load.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/freenect Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/freenect/Makefile Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/freenect/freenect.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gapi Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gapi/gapi.cpp Added

@@ -0,0 +1,1675 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GAPI WinCE-iPaq video render module
+ *
+ *  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 <windows.h>
+#include <aygshell.h>
+#include <wingdi.h>
+#include <gx.h>
+
+#include "gapi.h"
+
+#ifdef GPAC_USE_GLES1X
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+
+#if 0
+# pragma message("Using OpenGL-ES Common Lite Profile")
+# pragma comment(lib, "libGLES_CL")
+
+#define GLES_NO_PBUFFER
+#define GLES_NO_PIXMAP
+
+#else
+# pragma message("Using OpenGL-ES Common Profile")
+# pragma comment(lib, "libGLES_CM")
+
+//#define GLES_NO_PIXMAP
+
+#endif
+
+#pragma comment(lib, "gx.lib")
+#endif
+
+#endif
+
+static Bool landscape = GF_FALSE;
+
+
+#define PRINT(__str) OutputDebugString(_T(__str))
+
+#define GAPICTX(dr)	GAPIPriv *gctx = (GAPIPriv *) dr->opaque;
+
+static GF_Err GAPI_InitBackBuffer(GF_VideoOutput *dr, u32 VideoWidth, u32 VideoHeight);
+
+static GF_VideoOutput *the_video_driver = NULL;
+
+static void GAPI_GetCoordinates(DWORD lParam, GF_Event *evt)
+{
+	GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
+	evt->mouse.x = LOWORD(lParam);
+	evt->mouse.y = HIWORD(lParam);
+
+	if (ctx->scale_coords) {
+		evt->mouse.x = evt->mouse.x * the_video_driver->max_screen_width / ctx->sys_w;
+		evt->mouse.y = evt->mouse.y * the_video_driver->max_screen_height / ctx->sys_h;
+	}
+
+
+	if (ctx->fullscreen) {
+		POINT pt;
+		pt.x = evt->mouse.x;
+		pt.y = evt->mouse.y;
+		ClientToScreen(ctx->hWnd, &pt);
+		if (landscape) {
+			evt->mouse.x = ctx->fs_w - pt.y;
+			evt->mouse.y = pt.x;
+		} else {
+			evt->mouse.x = pt.x;
+			evt->mouse.y = pt.y;
+		}
+	}
+}
+
+static void w32_translate_key(u32 wParam, u32 lParam, GF_EventKey *evt)
+{
+	evt->flags = 0;
+	evt->hw_code = wParam;
+	switch (wParam) {
+	case VK_BACK:
+		evt->key_code = GF_KEY_BACKSPACE;
+		break;
+	case VK_TAB:
+		evt->key_code = GF_KEY_TAB;
+		break;
+	case VK_CLEAR:
+		evt->key_code = GF_KEY_CLEAR;
+		break;
+	case VK_RETURN:
+		evt->key_code = GF_KEY_ENTER;
+		break;
+	case VK_SHIFT:
+		evt->key_code = GF_KEY_SHIFT;
+		break;
+	case VK_CONTROL:
+		evt->key_code = GF_KEY_CONTROL;
+		break;
+	case VK_MENU:
+		evt->key_code = GF_KEY_ALT;
+		break;
+	case VK_PAUSE:
+		evt->key_code = GF_KEY_PAUSE;
+		break;
+	case VK_CAPITAL:
+		evt->key_code = GF_KEY_CAPSLOCK;
+		break;
+	case VK_KANA:
+		evt->key_code = GF_KEY_KANAMODE;
+		break;
+	case VK_JUNJA:
+		evt->key_code = GF_KEY_JUNJAMODE;
+		break;
+	case VK_FINAL:
+		evt->key_code = GF_KEY_FINALMODE;
+		break;
+	case VK_KANJI:
+		evt->key_code = GF_KEY_KANJIMODE;
+		break;
+	case VK_ESCAPE:
+		evt->key_code = GF_KEY_ESCAPE;
+		break;
+	case VK_CONVERT:
+		evt->key_code = GF_KEY_CONVERT;
+		break;
+	case VK_SPACE:
+		evt->key_code = GF_KEY_SPACE;
+		break;
+	case VK_PRIOR:
+		evt->key_code = GF_KEY_PAGEUP;
+		break;
+	case VK_NEXT:
+		evt->key_code = GF_KEY_PAGEDOWN;
+		break;
+	case VK_END:
+		evt->key_code = GF_KEY_END;
+		break;
+	case VK_HOME:
+		evt->key_code = GF_KEY_HOME;
+		break;
+	case VK_LEFT:
+		evt->key_code = GF_KEY_LEFT;
+		break;
+	case VK_UP:
+		evt->key_code = GF_KEY_UP;
+		break;
+	case VK_RIGHT:
+		evt->key_code = GF_KEY_RIGHT;
+		break;
+	case VK_DOWN:
+		evt->key_code = GF_KEY_DOWN;
+		break;
+	case VK_SELECT:
+		evt->key_code = GF_KEY_SELECT;
+		break;
+	case VK_PRINT:
+	case VK_SNAPSHOT:
+		evt->key_code = GF_KEY_PRINTSCREEN;
+		break;
+	case VK_EXECUTE:
+		evt->key_code = GF_KEY_EXECUTE;
+		break;
+	case VK_INSERT:
+		evt->key_code = GF_KEY_INSERT;
+		break;
+	case VK_DELETE:
+		evt->key_code = GF_KEY_DEL;
+		break;
+	case VK_HELP:
+		evt->key_code = GF_KEY_HELP;
+		break;
+
+	/*	case VK_LWIN: return ;
+		case VK_RWIN: return ;
+		case VK_APPS: return ;
+	*/
+	case VK_NUMPAD0:
+		evt->key_code = GF_KEY_0;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD1:
+		evt->key_code = GF_KEY_1;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD2:
+		evt->key_code = GF_KEY_2;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD3:
+		evt->key_code = GF_KEY_3;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD4:
+		evt->key_code = GF_KEY_4;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD5:
+		evt->key_code = GF_KEY_5;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD6:
+		evt->key_code = GF_KEY_6;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD7:
+		evt->key_code = GF_KEY_7;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD8:
+		evt->key_code = GF_KEY_8;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_NUMPAD9:
+		evt->key_code = GF_KEY_9;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_MULTIPLY:
+		evt->key_code = GF_KEY_STAR;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_ADD:
+		evt->key_code = GF_KEY_PLUS;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_SEPARATOR:
+		evt->key_code = GF_KEY_FULLSTOP;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_SUBTRACT:
+		evt->key_code = GF_KEY_HYPHEN;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_DECIMAL:
+		evt->key_code = GF_KEY_COMMA;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_DIVIDE:
+		evt->key_code = GF_KEY_SLASH;
+		evt->flags = GF_KEY_EXT_NUMPAD;
+		break;
+	case VK_F1:
+		evt->key_code = GF_KEY_F1;
+		break;
+	case VK_F2:
+		evt->key_code = GF_KEY_F2;
+		break;
+	case VK_F3:
+		evt->key_code = GF_KEY_F3;
+		break;
+	case VK_F4:
+		evt->key_code = GF_KEY_F4;
+		break;
+	case VK_F5:
+		evt->key_code = GF_KEY_F5;
+		break;
+//	case VK_F6: evt->key_code = GF_KEY_F6; break;
+//	case VK_F7: evt->key_code = GF_KEY_F7; break;
+	case VK_F6:
+		evt->key_code = GF_KEY_VOLUMEUP;
+		break;
+	case VK_F7:
+		evt->key_code = GF_KEY_VOLUMEDOWN;
+		break;
+	case VK_F8:
+		evt->key_code = GF_KEY_F8;
+		break;
+
+	case VK_F9:
+		evt->key_code = GF_KEY_F9;
+		break;
+	case VK_F10:
+		evt->key_code = GF_KEY_F10;
+		break;
+	case VK_F11:
+		evt->key_code = GF_KEY_F11;
+		break;
+	case VK_F12:
+		evt->key_code = GF_KEY_F12;
+		break;
+	case VK_F13:
+		evt->key_code = GF_KEY_F13;
+		break;
+	case VK_F14:
+		evt->key_code = GF_KEY_F14;
+		break;
+	case VK_F15:
+		evt->key_code = GF_KEY_F15;
+		break;
+	case VK_F16:
+		evt->key_code = GF_KEY_F16;
+		break;
+	case VK_F17:
+		evt->key_code = GF_KEY_F17;
+		break;
+	case VK_F18:
+		evt->key_code = GF_KEY_F18;
+		break;
+	case VK_F19:
+		evt->key_code = GF_KEY_F19;
+		break;
+	case VK_F20:
+		evt->key_code = GF_KEY_F20;
+		break;
+	case VK_F21:
+		evt->key_code = GF_KEY_F21;
+		break;
+	case VK_F22:
+		evt->key_code = GF_KEY_F22;
+		break;
+	case VK_F23:
+		evt->key_code = GF_KEY_F23;
+		break;
+	case VK_F24:
+		evt->key_code = GF_KEY_F24;
+		break;
+
+	case VK_NUMLOCK:
+		evt->key_code = GF_KEY_NUMLOCK;
+		break;
+	case VK_SCROLL:
+		evt->key_code = GF_KEY_SCROLL;
+		break;
+
+	/*
+	 * VK_L* & VK_R* - left and right Alt, Ctrl and Shift virtual keys.
+	 * Used only as parameters to GetAsyncKeyState() and GetKeyState().
+	 * No other API or message will distinguish left and right keys in this way.
+	 */
+	case VK_LSHIFT:
+		evt->key_code = GF_KEY_SHIFT;
+		evt->flags = GF_KEY_EXT_LEFT;
+		break;
+	case VK_RSHIFT:
+		evt->key_code = GF_KEY_SHIFT;
+		evt->flags = GF_KEY_EXT_RIGHT;
+		break;
+	case VK_LCONTROL:
+		evt->key_code = GF_KEY_CONTROL;
+		evt->flags = GF_KEY_EXT_LEFT;
+		break;
+	case VK_RCONTROL:
+		evt->key_code = GF_KEY_CONTROL;
+		evt->flags = GF_KEY_EXT_RIGHT;
+		break;
+	case VK_LMENU:
+		evt->key_code = GF_KEY_ALT;
+		evt->flags = GF_KEY_EXT_LEFT;
+		break;
+	case VK_RMENU:
+		evt->key_code = GF_KEY_ALT;
+		evt->flags = GF_KEY_EXT_RIGHT;
+		break;
+
+#if(WINVER >= 0x0400)
+	case VK_PROCESSKEY:
+		evt->key_code = GF_KEY_PROCESS;
+		break;
+#endif /* WINVER >= 0x0400 */
+
+	case VK_ATTN:
+		evt->key_code = GF_KEY_ATTN;
+		break;
+	case VK_CRSEL:
+		evt->key_code = GF_KEY_CRSEL;
+		break;
+	case VK_EXSEL:
+		evt->key_code = GF_KEY_EXSEL;
+		break;
+	case VK_EREOF:
+		evt->key_code = GF_KEY_ERASEEOF;
+		break;
+	case VK_PLAY:
+		evt->key_code = GF_KEY_PLAY;
+		break;
+	case VK_ZOOM:
+		evt->key_code = GF_KEY_ZOOM;
+		break;
+	//case VK_NONAME: evt->key_code = GF_KEY_NONAME; break;
+	//case VK_PA1: evt->key_code = GF_KEY_PA1; break;
+	case VK_OEM_CLEAR:
+		evt->key_code = GF_KEY_CLEAR;
+		break;
+
+	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
+	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
+	default:
+		if ((wParam>=0x30) && (wParam<=0x39))  evt->key_code = GF_KEY_0 + wParam-0x30;
+		else if ((wParam>=0x41) && (wParam<=0x5A))  evt->key_code = GF_KEY_A + wParam-0x41;
+		else {
+			GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
+			short res = (LOWORD(wParam) != 0x5b) ? LOWORD(wParam) : wParam;
+
+			if (res==ctx->keys.vkLeft) evt->key_code = landscape ? GF_KEY_UP : GF_KEY_LEFT;
+			else if (res==ctx->keys.vkRight) evt->key_code = landscape ? GF_KEY_DOWN : GF_KEY_RIGHT;
+			else if (res==ctx->keys.vkDown) evt->key_code = landscape ? GF_KEY_LEFT : GF_KEY_DOWN;
+			else if (res==ctx->keys.vkUp) evt->key_code = landscape ? GF_KEY_RIGHT : GF_KEY_UP;
+			else if (res==ctx->keys.vkStart) evt->key_code = GF_KEY_ENTER;
+			else if (res==ctx->keys.vkA)
+				evt->key_code = GF_KEY_MEDIAPREVIOUSTRACK;
+			else if (res==ctx->keys.vkB)
+				evt->key_code = GF_KEY_MEDIANEXTTRACK;
+			else if (res==ctx->keys.vkC)
+				evt->key_code = GF_KEY_SHIFT;
+			else if (res==0xc1)
+				evt->key_code = GF_KEY_ALT;
+			else if (res==0xc2)
+				evt->key_code = GF_KEY_CONTROL;
+			else if (res==0xc5)
+				evt->key_code = GF_KEY_VOLUMEDOWN;
+			else {
+				evt->key_code = GF_KEY_UNIDENTIFIED;
+			}
+		}
+		break;
+	}
+}
+
+//#define DIRECT_BITBLT
+
+LRESULT APIENTRY GAPI_WindowProc(HWND hWnd, UINT msg, UINT wParam, LONG lParam)
+{
+	GF_Event evt;
+	switch (msg) {
+	case WM_SIZE:
+	{
+		GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
+		evt.type = GF_EVENT_SIZE;
+		evt.size.width = LOWORD(lParam);
+		evt.size.height = HIWORD(lParam);
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+	}
+	break;
+	case WM_CLOSE:
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_QUIT;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		return 1;
+	case WM_DESTROY:
+	{
+		GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
+		if (ctx->owns_hwnd ) {
+			PostQuitMessage (0);
+		} else if (ctx->orig_wnd_proc) {
+			/*restore window proc*/
+			SetWindowLong(ctx->hWnd, GWL_WNDPROC, ctx->orig_wnd_proc);
+			ctx->orig_wnd_proc = 0L;
+		}
+	}
+	break;
+
+	case WM_ERASEBKGND:
+		evt.type = GF_EVENT_REFRESH;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		break;
+	case WM_PAINT:
+#ifndef DIRECT_BITBLT
+	{
+		GAPIPriv *gctx = (GAPIPriv *)the_video_driver->opaque;
+		if (gctx->gx_mode || !gctx->bitmap) break;
+		HDC dc = GetDC(gctx->hWnd);
+		BitBlt(dc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
+		ReleaseDC(gctx->hWnd, dc);
+	}
+#endif
+	break;
+
+	case WM_MOUSEMOVE:
+		GAPI_GetCoordinates(lParam, &evt);
+		evt.type = GF_EVENT_MOUSEMOVE;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		break;
+	case WM_LBUTTONDOWN:
+	case WM_LBUTTONDBLCLK:
+		GAPI_GetCoordinates(lParam, &evt);
+		evt.type = GF_EVENT_MOUSEDOWN;
+		evt.mouse.button = GF_MOUSE_LEFT;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		break;
+	case WM_LBUTTONUP:
+		GAPI_GetCoordinates(lParam, &evt);
+		evt.type = GF_EVENT_MOUSEUP;
+		evt.mouse.button = GF_MOUSE_LEFT;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		break;
+
+	/*FIXME - there's a bug on alt state (we miss one event)*/
+	case WM_SYSKEYDOWN:
+	case WM_SYSKEYUP:
+	case WM_KEYDOWN:
+	case WM_KEYUP:
+		w32_translate_key(wParam, lParam, &evt.key);
+		evt.type = ((msg==WM_SYSKEYDOWN) || (msg==WM_KEYDOWN))  ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
+		the_video_driver->on_event(the_video_driver->evt_cbk_hdl, &evt);
+		break;
+	case WM_CHAR:
+		evt.type = GF_EVENT_TEXTINPUT;
+		evt.character.unicode_char = wParam;
+		break;
+	}
+	return DefWindowProc (hWnd, msg, wParam, lParam);
+}
+
+void GAPI_WindowThread(void *par)
+{
+	MSG msg;
+	WNDCLASS wc;
+	GAPIPriv *ctx = (GAPIPriv *)the_video_driver->opaque;
+
+	memset(&wc, 0, sizeof(WNDCLASS));
+	wc.hInstance = GetModuleHandle(_T("gm_gapi.dll"));
+	wc.lpfnWndProc = GAPI_WindowProc;
+	wc.hCursor = LoadCursor (NULL, IDC_ARROW);
+	wc.hbrBackground = (HBRUSH)GetStockObject (BLACK_BRUSH);
+	wc.lpszClassName = _T("GPAC GAPI Output");
+	RegisterClass (&wc);
+
+	ctx->hWnd = CreateWindow(_T("GPAC GAPI Output"), NULL, WS_POPUP, 0, 0, 120, 100, NULL, NULL, wc.hInstance, NULL);
+	if (ctx->hWnd == NULL) {
+		ctx->ThreadID = 0;
+		ExitThread(1);
+	}
+	ShowWindow(ctx->hWnd, SW_SHOWNORMAL);
+
+	while (GetMessage (&(msg), NULL, 0, 0)) {
+		TranslateMessage (&(msg));
+		DispatchMessage (&(msg));
+	}
+	ctx->ThreadID = 0;
+	ExitThread (0);
+}
+
+
+void GAPI_SetupWindow(GF_VideoOutput *dr)
+{
+#ifdef GPAC_USE_GLES1X
+	GF_Err e;
+#endif
+	GAPIPriv *ctx = (GAPIPriv *)dr->opaque;
+	if (the_video_driver) return;
+	the_video_driver = dr;
+
+	if (!ctx->hWnd) {
+		ctx->hThread = CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) GAPI_WindowThread, (LPVOID) dr, 0, &(ctx->ThreadID) );
+		while (!ctx->hWnd && ctx->hThread) gf_sleep(10);
+		if (!ctx->hThread) return;
+		ctx->owns_hwnd = GF_TRUE;
+	} else {
+		ctx->orig_wnd_proc = GetWindowLong(ctx->hWnd, GWL_WNDPROC);
+		/*override window proc*/
+		SetWindowLong(ctx->hWnd, GWL_WNDPROC, (DWORD) GAPI_WindowProc);
+	}
+
+	{
+		HDC hdc;
+		hdc = GetDC(ctx->hWnd);
+		dr->dpi_x = GetDeviceCaps(hdc, LOGPIXELSX);
+		dr->dpi_y = GetDeviceCaps(hdc, LOGPIXELSY);
+		ReleaseDC(ctx->hWnd, hdc);
+	}
+
+
+#ifdef GPAC_USE_GLES1X
+	ctx->use_pbuffer = GF_TRUE;
+	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
+	if (e!=GF_OK) {
+		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+#ifndef GLES_NO_PIXMAP
+		e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
+#endif
+	}
+	if (!e) {
+		dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
+		return;
+	}
+	ctx->use_pbuffer = GF_FALSE;
+
+	WNDCLASS wc;
+	HINSTANCE hInst;
+	hInst = GetModuleHandle(_T("gm_gapi.dll") );
+	memset(&wc, 0, sizeof(WNDCLASS));
+	wc.hInstance = hInst;
+	wc.lpfnWndProc = GAPI_WindowProc;
+	wc.lpszClassName = _T("GPAC GAPI Offscreen");
+	RegisterClass (&wc);
+
+	ctx->gl_hwnd = CreateWindow(_T("GPAC GAPI Offscreen"), _T("GPAC GAPI Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+	if (!ctx->gl_hwnd) return;
+	ShowWindow(ctx->gl_hwnd, SW_HIDE);
+
+	dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+	e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
+
+	if (e!=GF_OK) {
+		dr->hw_caps &= ~GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+		e = GAPI_SetupOGL_ES_Offscreen(dr, 20, 20);
+	}
+	if (e==GF_OK) dr->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN;
+#endif
+
+}
+
+void GAPI_ShutdownWindow(GF_VideoOutput *dr)
+{
+	GAPIPriv *ctx = (GAPIPriv *)dr->opaque;
+
+	if (ctx->owns_hwnd) {
+		PostMessage(ctx->hWnd, WM_DESTROY, 0, 0);
+		while (ctx->ThreadID) gf_sleep(10);
+		UnregisterClass(_T("GPAC GAPI Output"), GetModuleHandle(_T("gapi.dll")));
+		CloseHandle(ctx->hThread);
+		ctx->hThread = NULL;
+	} else if (ctx->orig_wnd_proc) {
+		/*restore window proc*/
+		SetWindowLong(ctx->hWnd, GWL_WNDPROC, ctx->orig_wnd_proc);
+		ctx->orig_wnd_proc = 0L;
+	}
+	ctx->hWnd = NULL;
+#ifdef GPAC_USE_GLES1X
+	PostMessage(ctx->gl_hwnd, WM_DESTROY, 0, 0);
+	ctx->gl_hwnd = NULL;
+	UnregisterClass(_T("GPAC GAPI Offscreen"), GetModuleHandle(_T("gm_gapi.dll") ));
+#endif
+
+	the_video_driver = NULL;
+}
+
+
+GF_Err GAPI_Clear(GF_VideoOutput *dr, u32 color)
+{
+	GAPICTX(dr);
+	gctx->erase_dest = GF_TRUE;
+	return GF_OK;
+}
+
+
+static void createPixmap(GAPIPriv *ctx, u32 pix_type)
+{
+	const size_t    bmiSize = sizeof(BITMAPINFO) + 256U*sizeof(RGBQUAD);
+	BITMAPINFO*     bmi;
+	DWORD*          p;
+	u32 bpel = 0;
+
+	if (ctx->bmi) gf_free(ctx->bmi);
+
+	bmi = (BITMAPINFO*)gf_malloc(bmiSize);
+	memset(bmi, 0, bmiSize);
+
+	bmi->bmiHeader.biSize           = sizeof(BITMAPINFOHEADER);
+	bmi->bmiHeader.biWidth          = ctx->bb_width;
+	bmi->bmiHeader.biHeight         = -1 *  (s32) ctx->bb_height;	/*top-down image*/
+	bmi->bmiHeader.biPlanes         = (short)1;
+	bmi->bmiHeader.biBitCount       = (unsigned int) ctx->bits_per_pixel;
+	bmi->bmiHeader.biCompression    = BI_BITFIELDS;
+	bmi->bmiHeader.biClrUsed        = 3;
+
+	p = (DWORD*)bmi->bmiColors;
+	switch (ctx->pixel_format) {
+	case GF_PIXEL_RGB_555:
+		p[0] = 0x00007c00;
+		p[1] = 0x000003e0;
+		p[2] = 0x0000001f;
+		bpel = 16;
+		break;
+	case GF_PIXEL_RGB_565:
+		p[0] = 0x0000f800;
+		p[1] = 0x000007e0;
+		p[2] = 0x0000001f;
+		bpel = 16;
+		break;
+	case GF_PIXEL_RGB_24:
+		p[0] = 0x00ff0000;
+		p[1] = 0x0000ff00;
+		p[2] = 0x000000ff;
+		bpel = 24;
+		break;
+	}
+	ctx->hdc = GetDC(NULL/*ctx->hWnd*/);
+
+	if (pix_type==2) {
+#ifdef GPAC_USE_GLES1X
+		ctx->gl_bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->gl_bits, NULL, 0);
+#endif
+	} else if (pix_type==1) {
+		ctx->hdcBitmap = CreateCompatibleDC(ctx->hdc);
+		ctx->bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->bits, NULL, 0);
+		ctx->old_bitmap = (HBITMAP) SelectObject(ctx->hdcBitmap, ctx->bitmap);
+	} else {
+		ctx->hdcBitmap = CreateCompatibleDC(ctx->hdc);
+		ctx->bitmap = CreateDIBSection(ctx->hdc, bmi, DIB_RGB_COLORS, (void **) &ctx->backbuffer, NULL, 0);
+		ctx->old_bitmap = (HBITMAP) SelectObject(ctx->hdcBitmap, ctx->bitmap);
+
+		/*watchout - win32 always create DWORD align memory, so align our pitch*/
+		while ((ctx->bb_pitch % 4) != 0) ctx->bb_pitch ++;
+	}
+	ReleaseDC(NULL/*ctx->hWnd*/, ctx->hdc);
+
+	ctx->bmi = bmi;
+//	gf_free(bmi);
+}
+
+
+#ifdef GPAC_USE_GLES1X
+
+void GAPI_ReleaseOGL_ES(GAPIPriv *ctx, Bool offscreen_only)
+{
+	if (ctx->egldpy) {
+		eglMakeCurrent(ctx->egldpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+		if (ctx->eglctx) eglDestroyContext(ctx->egldpy, ctx->eglctx);
+		ctx->eglctx = 0;
+		if (ctx->surface) eglDestroySurface(ctx->egldpy, ctx->surface);
+		ctx->surface = 0;
+		if (ctx->egldpy) eglTerminate(ctx->egldpy);
+		ctx->egldpy = 0;
+	}
+	if (ctx->gl_bitmap) DeleteObject(ctx->gl_bitmap);
+	ctx->gl_bitmap = NULL;
+
+	if (offscreen_only) return;
+
+	if (ctx->bitmap) DeleteObject(ctx->bitmap);
+	ctx->bitmap = NULL;
+}
+
+GF_Err GAPI_SetupOGL_ES(GF_VideoOutput *dr)
+{
+	EGLint n, maj, min;
+	u32 i;
+	GF_Event evt;
+	GAPICTX(dr)
+	static int atts[32];
+	const char *opt;
+
+	i=0;
+	atts[i++] = EGL_RED_SIZE;
+	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : 5;
+	atts[i++] = EGL_GREEN_SIZE;
+	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : (gctx->pixel_format==GF_PIXEL_RGB_565) ? 6 : 5;
+	atts[i++] = EGL_BLUE_SIZE;
+	atts[i++] = (gctx->pixel_format==GF_PIXEL_RGB_24) ? 8 : 5;
+	opt = gf_opts_get_key("core", "gl-bits-depth");
+	atts[i++] = EGL_DEPTH_SIZE;
+	atts[i++] = opt ? atoi(opt) : 16;
+	atts[i++] = EGL_SURFACE_TYPE;
+
+#ifdef GLES_NO_PIXMAP
+	atts[i++] = EGL_WINDOW_BIT;
+#else
+	atts[i++] = EGL_PIXMAP_BIT;
+//	atts[i++] = gctx->fullscreen ? EGL_WINDOW_BIT : EGL_PIXMAP_BIT;
+#endif
+	atts[i++] = EGL_ALPHA_SIZE;
+	atts[i++] = EGL_DONT_CARE;
+	atts[i++] = EGL_STENCIL_SIZE;
+	atts[i++] = EGL_DONT_CARE;
+	atts[i++] = EGL_NONE;
+
+	/*whenever window is resized we must reinit OGL-ES*/
+	GAPI_ReleaseOGL_ES(gctx, GF_FALSE);
+
+	if (!gctx->fullscreen) {
+		RECT rc;
+		::GetClientRect(gctx->hWnd, &rc);
+		gctx->bb_width = rc.right-rc.left;
+		gctx->bb_height = rc.bottom-rc.top;
+
+#ifndef GLES_NO_PIXMAP
+		createPixmap(gctx, 1);
+#endif
+	}
+
+	gctx->egldpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+	if (!gctx->egldpy) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot get OpenGL display\n"));
+		return GF_IO_ERR;
+	}
+	if (!eglInitialize(gctx->egldpy, &maj, &min)) {
+		gctx->egldpy = NULL;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot initialize OpenGL layer\n"));
+		return GF_IO_ERR;
+	}
+
+	if (!eglChooseConfig(gctx->egldpy, atts, &gctx->eglconfig, 1, &n) || (eglGetError() != EGL_SUCCESS)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot choose OpenGL config\n"));
+		return GF_IO_ERR;
+	}
+
+	if (gctx->fullscreen
+#ifdef GLES_NO_PIXMAP
+	        || 1
+#endif
+	   ) {
+		gctx->surface = eglCreateWindowSurface(gctx->egldpy, gctx->eglconfig, gctx->hWnd, 0);
+	} else {
+		gctx->surface = eglCreatePixmapSurface(gctx->egldpy, gctx->eglconfig, gctx->bitmap, 0);
+	}
+
+	if (!gctx->surface) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot create OpenGL surface - error %d\n", eglGetError()));
+		return GF_IO_ERR;
+	}
+	gctx->eglctx = eglCreateContext(gctx->egldpy, gctx->eglconfig, NULL, NULL);
+	if (!gctx->eglctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot create OpenGL context\n"));
+		eglDestroySurface(gctx->egldpy, gctx->surface);
+		gctx->surface = 0L;
+		return GF_IO_ERR;
+	}
+	if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GAPI] Cannot bind OpenGL context\n"));
+		eglDestroyContext(gctx->egldpy, gctx->eglctx);
+		gctx->eglctx = 0L;
+		eglDestroySurface(gctx->egldpy, gctx->surface);
+		gctx->surface = 0L;
+		return GF_IO_ERR;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[GAPI] OpenGL initialize - %d x %d \n", gctx->bb_width, gctx->bb_height));
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_VIDEO_SETUP;
+	evt.hw_reset = 1;
+	dr->on_event(dr->evt_cbk_hdl, &evt);
+	return GF_OK;
+}
+
+
+
+GF_Err GAPI_SetupOGL_ES_Offscreen(GF_VideoOutput *dr, u32 width, u32 height)
+{
+	int atts[15];
+	const char *opt;
+	EGLint n, maj, min;
+
+	GAPICTX(dr)
+
+	GAPI_ReleaseOGL_ES(gctx, GF_TRUE);
+
+	if (!gctx->use_pbuffer) {
+		SetWindowPos(gctx->gl_hwnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE);
+		createPixmap(gctx, 2);
+	}
+
+	gctx->egldpy = eglGetDisplay(/*gctx->dpy*/EGL_DEFAULT_DISPLAY);
+	if (!eglInitialize(gctx->egldpy, &maj, &min)) {
+		gctx->egldpy = NULL;
+		return GF_IO_ERR;
+	}
+	atts[0] = EGL_RED_SIZE;
+	atts[1] = 8;
+	atts[2] = EGL_GREEN_SIZE;
+	atts[3] = 8;
+	atts[4] = EGL_BLUE_SIZE;
+	atts[5] = 8;
+	atts[6] = EGL_ALPHA_SIZE;
+	atts[7] = (dr->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA) ? 8 : EGL_DONT_CARE;
+	opt = gf_opts_get_key("core", "gl-bits-depth");
+	atts[8] = EGL_DEPTH_SIZE;
+	atts[9] = opt ? atoi(opt) : 16;
+
+	atts[10] = EGL_STENCIL_SIZE;
+	atts[11] = EGL_DONT_CARE;
+	atts[12] = EGL_SURFACE_TYPE;
+	atts[13] = gctx->use_pbuffer ? EGL_PBUFFER_BIT : EGL_PIXMAP_BIT;
+	atts[14] = EGL_NONE;
+
+	eglGetConfigs(gctx->egldpy, NULL, 0, &n);
+	if (!eglChooseConfig(gctx->egldpy, atts, &gctx->eglconfig, 1, &n)) {
+		return GF_IO_ERR;
+	}
+
+	if (!gctx->use_pbuffer) {
+		gctx->surface = eglCreatePixmapSurface(gctx->egldpy, gctx->eglconfig, gctx->gl_bitmap, 0);
+	} else {
+		atts[0] = EGL_WIDTH;
+		atts[1] = width;
+		atts[2] = EGL_HEIGHT;
+		atts[3] = height;
+		atts[4] = EGL_NONE;
+
+		gctx->surface = eglCreatePbufferSurface(gctx->egldpy, gctx->eglconfig, atts);
+	}
+
+	if (!gctx->surface) {
+		return GF_IO_ERR;
+	}
+	gctx->eglctx = eglCreateContext(gctx->egldpy, gctx->eglconfig, NULL, NULL);
+	if (!gctx->eglctx) {
+		eglDestroySurface(gctx->egldpy, gctx->surface);
+		gctx->surface = 0L;
+		return GF_IO_ERR;
+	}
+	if (!eglMakeCurrent(gctx->egldpy, gctx->surface, gctx->surface, gctx->eglctx)) {
+		eglDestroyContext(gctx->egldpy, gctx->eglctx);
+		gctx->eglctx = 0L;
+		eglDestroySurface(gctx->egldpy, gctx->surface);
+		gctx->surface = 0L;
+		return GF_IO_ERR;
+	}
+	return GF_OK;
+}
+
+#endif
+
+
+void GAPI_ReleaseObjects(GAPIPriv *ctx)
+{
+	ctx->raw_ptr = NULL;
+
+#ifdef GPAC_USE_GLES1X
+	if (ctx->output_3d_type) GAPI_ReleaseOGL_ES(ctx, GF_FALSE);
+	else
+#endif
+		if (ctx->bitmap) DeleteObject(ctx->bitmap);
+		else if (ctx->backbuffer) gf_free(ctx->backbuffer);
+	ctx->backbuffer = NULL;
+	ctx->bitmap = NULL;
+
+	if (ctx->hdcBitmap) {
+		if (ctx->old_bitmap) SelectObject(ctx->hdcBitmap, ctx->old_bitmap);
+		ctx->old_bitmap = NULL;
+		DeleteDC(ctx->hdcBitmap);
+		ctx->hdcBitmap = NULL;
+	}
+	if (ctx->hdc) ReleaseDC(NULL/*ctx->hWnd*/, ctx->hdc);
+	ctx->hdc = NULL;
+}
+
+GF_Err GAPI_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 noover)
+{
+	struct GXDisplayProperties gx = GXGetDisplayProperties();
+	RECT rc;
+	GAPICTX(dr);
+	gctx->hWnd = (HWND) os_handle;
+
+	/*get keys in both 2D and 3D modes*/
+	gctx->keys = GXGetDefaultKeys(GX_NORMALKEYS);
+
+#if 0
+	/*FIXME - not supported in rasterizer*/
+	if (gx.ffFormat & kfDirect444) {
+		gctx->pixel_format = GF_PIXEL_RGB_444;
+		gctx->BPP = 2;
+		gctx->bitsPP = 12;
+	}
+	else
+#endif
+		if (gx.ffFormat & kfDirect555) {
+			gctx->pixel_format = GF_PIXEL_RGB_555;
+			gctx->BPP = 2;
+			gctx->bits_per_pixel = 15;
+		}
+		else if (gx.ffFormat & kfDirect565) {
+			gctx->pixel_format = GF_PIXEL_RGB_565;
+			gctx->BPP = 2;
+			gctx->bits_per_pixel = 16;
+		}
+		else if (gx.ffFormat & kfDirect888) {
+			gctx->pixel_format = GF_PIXEL_RGB_24;
+			gctx->BPP = 3;
+			gctx->bits_per_pixel = 24;
+		} else {
+			return GF_NOT_SUPPORTED;
+		}
+
+	GAPI_SetupWindow(dr);
+	if (!gctx->hWnd) return GF_IO_ERR;
+
+	/*setup GX*/
+	if (!GXOpenDisplay(gctx->hWnd, 0L)) {
+		MessageBox(NULL, _T("Cannot open display"), _T("GAPI Error"), MB_OK);
+		return GF_IO_ERR;
+	}
+	GetClientRect(gctx->hWnd, &rc);
+	gctx->backup_w = rc.right - rc.left;
+	gctx->backup_h = rc.bottom - rc.top;
+
+	return GAPI_InitBackBuffer(dr, gctx->backup_w, gctx->backup_h);
+}
+
+static void GAPI_Shutdown(GF_VideoOutput *dr)
+{
+	GAPICTX(dr);
+
+	gf_mx_p(gctx->mx);
+	GAPI_ReleaseObjects(gctx);
+
+	GXCloseDisplay();
+	GAPI_ShutdownWindow(dr);
+	gf_mx_v(gctx->mx);
+}
+
+static GF_Err GAPI_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
+{
+	Bool is_wide_scene = (bOn==2) ? GF_TRUE : GF_FALSE;
+	GF_Err e;
+	GAPICTX(dr);
+
+	if (!gctx) return GF_BAD_PARAM;
+	if (is_wide_scene) bOn = GF_TRUE;
+	if (bOn == gctx->fullscreen) return GF_OK;
+
+#ifdef GPAC_USE_GLES1X
+	if (gctx->output_3d_type==1) {
+		gctx->fullscreen = bOn;
+		return GAPI_SetupOGL_ES(dr);
+	}
+#endif
+
+	gf_mx_p(gctx->mx);
+	GAPI_ReleaseObjects(gctx);
+	GXCloseDisplay();
+	e = GF_OK;
+	if (bOn) {
+		if (!GXOpenDisplay(GetParent(gctx->hWnd), 0L/*GX_FULLSCREEN*/)) {
+			GXOpenDisplay(gctx->hWnd, 0L);
+			gctx->fullscreen = GF_FALSE;
+			e = GF_IO_ERR;
+		} else {
+			gctx->fullscreen = GF_TRUE;
+		}
+	} else {
+		GXOpenDisplay(gctx->hWnd, 0L);
+		gctx->fullscreen = GF_FALSE;
+	}
+
+	landscape = GF_FALSE;
+	if (!e) {
+		if (gctx->fullscreen) {
+			gctx->backup_w = *outWidth;
+			gctx->backup_h = *outHeight;
+
+			if (is_wide_scene && (gctx->screen_w < gctx->screen_h)) landscape = GF_TRUE;
+			else if (!is_wide_scene && (gctx->screen_w > gctx->screen_h)) landscape = GF_TRUE;
+			else landscape = GF_FALSE;
+
+			if (landscape) {
+				gctx->fs_w = gctx->screen_h;
+				gctx->fs_h = gctx->screen_w;
+			} else {
+				gctx->fs_w = gctx->screen_w;
+				gctx->fs_h = gctx->screen_h;
+			}
+
+			*outWidth = gctx->fs_w;
+			*outHeight = gctx->fs_h;
+		} else {
+			*outWidth = gctx->backup_w;
+			*outHeight = gctx->backup_h;
+		}
+	}
+	gf_mx_v(gctx->mx);
+
+	return e;
+}
+
+GF_Err GAPI_ClearFS(GAPIPriv *gctx, unsigned char *ptr)
+{
+	gf_mx_p(gctx->mx);
+	memset(ptr, 0, sizeof(char) * gctx->screen_w*gctx->screen_h*gctx->BPP);
+	gf_mx_v(gctx->mx);
+	return GF_OK;
+}
+
+
+static GF_Err GAPI_FlipBackBuffer(GF_VideoOutput *dr)
+{
+	GF_VideoSurface src, dst;
+	unsigned char *ptr;
+	GAPICTX(dr);
+	if (!gctx || !gctx->gx_mode) return GF_BAD_PARAM;
+
+	/*get a pointer to video memory*/
+	if (gctx->gx_mode==1) {
+		ptr = (unsigned char *) GXBeginDraw();
+	} else {
+		ptr = (unsigned char *) gctx->raw_ptr;
+	}
+	if (!ptr) return GF_IO_ERR;
+
+	src.video_buffer = gctx->backbuffer;
+	src.width = gctx->bb_width;
+	src.height = gctx->bb_height;
+	src.pitch_x = gctx->BPP;
+	src.pitch_y = gctx->y_pitch;
+	src.pixel_format = gctx->pixel_format;
+	src.is_hardware_memory = GF_FALSE;
+
+
+	dst.width = gctx->dst_blt.w;
+	dst.height = gctx->dst_blt.h;
+	dst.pixel_format = gctx->pixel_format;
+	dst.is_hardware_memory = GF_TRUE;
+	dst.video_buffer = (char*)ptr;
+	dst.pitch_x = gctx->x_pitch;
+	dst.pitch_y = gctx->y_pitch;
+
+	if (gctx->fullscreen) {
+		if (gctx->erase_dest) {
+			gctx->erase_dest = GF_FALSE;
+			GAPI_ClearFS(gctx, ptr);
+		}
+	} else {
+		gctx->dst_blt.x += gctx->off_x;
+		gctx->dst_blt.y += gctx->off_y;
+	}
+
+	/*apply x/y offset*/
+	if (!gctx->fullscreen)
+		dst.video_buffer += gctx->dst_blt.x * gctx->x_pitch + gctx->y_pitch * gctx->dst_blt.y;
+
+	if (gctx->contiguous_mem) {
+		memcpy(dst.video_buffer, src.video_buffer, src.width*gctx->BPP*src.height );
+	} else if (landscape) {
+		u32 y, lsize = dst.height*gctx->x_pitch;
+		for (y=0; y<dst.width; y++) {
+			char *s = src.video_buffer + y*gctx->y_pitch;
+			char *d = dst.video_buffer + y*gctx->y_pitch;
+			memcpy(d, s, lsize);
+		}
+	} else {
+		u32 y, lsize = dst.width*gctx->x_pitch;
+		for (y=0; y<dst.height; y++) {
+			char *s = src.video_buffer + y*gctx->y_pitch;
+			char *d = dst.video_buffer + y*gctx->y_pitch;
+			memcpy(d, s, lsize);
+		}
+	}
+
+	if (gctx->gx_mode==1) GXEndDraw();
+	return GF_OK;
+}
+
+
+
+static GF_Err GAPI_Flush(GF_VideoOutput *dr, GF_Window *dest)
+{
+	GF_Err e;
+	GAPICTX(dr);
+
+	if (!gctx) return GF_BAD_PARAM;
+
+	gf_mx_p(gctx->mx);
+
+#ifdef GPAC_USE_GLES1X
+	if (gctx->output_3d_type==1) {
+#ifndef GLES_NO_PIXMAP
+		if (gctx->fullscreen && gctx->surface && gctx->egldpy) {
+#endif
+			if (gctx->erase_dest) {
+				InvalidateRect(gctx->hWnd, NULL, TRUE);
+				gctx->erase_dest = GF_FALSE;
+			}
+			eglSwapBuffers(gctx->egldpy, gctx->surface);
+#ifndef GLES_NO_PIXMAP
+		} else {
+			InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
+			gctx->erase_dest = GF_FALSE;
+		}
+#endif
+		gf_mx_v(gctx->mx);
+		return GF_OK;
+	}
+#endif
+	e = GF_OK;
+	if (gctx->backbuffer) {
+		if (dest) {
+			gctx->dst_blt = *dest;
+		} else {
+			assert(0);
+			gctx->dst_blt.x = gctx->dst_blt.y = 0;
+			gctx->dst_blt.w = gctx->bb_width;
+			gctx->dst_blt.h = gctx->bb_height;
+		}
+		if (gctx->gx_mode) {
+			if (!gctx->fullscreen && gctx->erase_dest) {
+				InvalidateRect(gctx->hWnd, NULL, TRUE);
+				gctx->erase_dest = GF_FALSE;
+			}
+			e = GAPI_FlipBackBuffer(dr);
+		} else {
+#ifndef DIRECT_BITBLT
+			InvalidateRect(gctx->hWnd, NULL, gctx->erase_dest);
+#else
+//			BitBlt(gctx->hdc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
+			HDC dc = GetDC(NULL);
+			BitBlt(dc, gctx->dst_blt.x, gctx->dst_blt.y, gctx->bb_width, gctx->bb_height, gctx->hdcBitmap, 0, 0, SRCCOPY);
+			ReleaseDC(NULL, dc);
+#endif
+			gctx->erase_dest = GF_FALSE;
+		}
+	}
+	gf_mx_v(gctx->mx);
+	return e;
+}
+
+u32 get_sys_col(int idx)
+{
+	u32 res;
+	DWORD val = GetSysColor(idx);
+	res = (val)&0xFF;
+	res<<=8;
+	res |= (val>>8)&0xFF;
+	res<<=8;
+	res |= (val>>16)&0xFF;
+	return res;
+}
+
+static GF_Err GAPI_ProcessEvent(GF_VideoOutput *dr, GF_Event *evt)
+{
+	GAPICTX(dr);
+	if (!evt) return GF_OK;
+	switch (evt->type) {
+	case GF_EVENT_SHOWHIDE:
+		if (gctx->hWnd) ShowWindow(gctx->hWnd, evt->show.show_type ? SW_SHOW : SW_HIDE);
+		break;
+	case GF_EVENT_SIZE:
+		/*nothing to do since we don't own the window*/
+		break;
+	case GF_EVENT_VIDEO_SETUP:
+		switch (evt->setup.opengl_mode) {
+		case 0:
+#ifdef GPAC_USE_GLES1X
+			gctx->output_3d_type = 0;
+#endif
+			return GAPI_InitBackBuffer(dr, evt->setup.width, evt->setup.height);
+#ifdef GPAC_USE_GLES1X
+		case 1:
+			gctx->output_3d_type = 1;
+			return GAPI_SetupOGL_ES(the_video_driver);
+		case 2:
+			gctx->output_3d_type = 2;
+			return GAPI_SetupOGL_ES_Offscreen(the_video_driver, evt->setup.width, evt->setup.height);
+#else
+		default:
+			return GF_NOT_SUPPORTED;
+#endif
+		}
+	case GF_EVENT_SYS_COLORS:
+		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
+		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);
+		evt->sys_cols.sys_colors[2] = get_sys_col(COLOR_APPWORKSPACE);
+		evt->sys_cols.sys_colors[3] = get_sys_col(COLOR_BACKGROUND);
+		evt->sys_cols.sys_colors[4] = get_sys_col(COLOR_BTNFACE);
+		evt->sys_cols.sys_colors[5] = get_sys_col(COLOR_BTNHIGHLIGHT);
+		evt->sys_cols.sys_colors[6] = get_sys_col(COLOR_BTNSHADOW);
+		evt->sys_cols.sys_colors[7] = get_sys_col(COLOR_BTNTEXT);
+		evt->sys_cols.sys_colors[8] = get_sys_col(COLOR_CAPTIONTEXT);
+		evt->sys_cols.sys_colors[9] = get_sys_col(COLOR_GRAYTEXT);
+		evt->sys_cols.sys_colors[10] = get_sys_col(COLOR_HIGHLIGHT);
+		evt->sys_cols.sys_colors[11] = get_sys_col(COLOR_HIGHLIGHTTEXT);
+		evt->sys_cols.sys_colors[12] = get_sys_col(COLOR_INACTIVEBORDER);
+		evt->sys_cols.sys_colors[13] = get_sys_col(COLOR_INACTIVECAPTION);
+		evt->sys_cols.sys_colors[14] = get_sys_col(COLOR_INACTIVECAPTIONTEXT);
+		evt->sys_cols.sys_colors[15] = get_sys_col(COLOR_INFOBK);
+		evt->sys_cols.sys_colors[16] = get_sys_col(COLOR_INFOTEXT);
+		evt->sys_cols.sys_colors[17] = get_sys_col(COLOR_MENU);
+		evt->sys_cols.sys_colors[18] = get_sys_col(COLOR_MENUTEXT);
+		evt->sys_cols.sys_colors[19] = get_sys_col(COLOR_SCROLLBAR);
+		evt->sys_cols.sys_colors[20] = get_sys_col(COLOR_3DDKSHADOW);
+		evt->sys_cols.sys_colors[21] = get_sys_col(COLOR_3DFACE);
+		evt->sys_cols.sys_colors[22] = get_sys_col(COLOR_3DHIGHLIGHT);
+		evt->sys_cols.sys_colors[23] = get_sys_col(COLOR_3DLIGHT);
+		evt->sys_cols.sys_colors[24] = get_sys_col(COLOR_3DSHADOW);
+		evt->sys_cols.sys_colors[25] = get_sys_col(COLOR_WINDOW);
+		evt->sys_cols.sys_colors[26] = get_sys_col(COLOR_WINDOWFRAME);
+		evt->sys_cols.sys_colors[27] = get_sys_col(COLOR_WINDOWTEXT);
+		return GF_OK;
+	}
+	return GF_OK;
+}
+
+#if 1
+
+
+
+#define ESC_QUERYESCSUPPORT 8
+#define GETGXINFO			0x00020000
+
+typedef struct GXDeviceInfo
+{
+	long Version;           //00
+	void * pvFrameBuffer;   //04
+	unsigned long cbStride; //08
+	unsigned long cxWidth;  //0c
+	unsigned long cyHeight; //10
+	unsigned long cBPP;     //14
+	unsigned long ffFormat; //18
+	char Unused[0x84-7*4];
+} GXDeviceInfo;
+
+
+static Bool check_resolution_switch(GF_VideoOutput *dr, u32 width, u32 height)
+{
+	GAPICTX(dr);
+
+	gctx->sys_w = GetSystemMetrics(SM_CXSCREEN);
+	gctx->sys_h = GetSystemMetrics(SM_CYSCREEN);
+	gctx->scale_coords = GF_FALSE;
+	if (gctx->sys_w != width) gctx->scale_coords = GF_TRUE;
+	else if (gctx->sys_h != height) gctx->scale_coords = GF_TRUE;
+
+	if (gctx->scale_coords) {
+		gctx->off_x = gctx->off_x * width / gctx->sys_w;
+		gctx->off_y = gctx->off_y * height / gctx->sys_h;
+	}
+
+	HDC hdc = GetDC(gctx->hWnd);
+	dr->dpi_x = (u32) (width * 25.4 / GetDeviceCaps(hdc, HORZSIZE) );
+	dr->dpi_y = (u32) (height * 25.4 / GetDeviceCaps(hdc, VERTSIZE) );
+	ReleaseDC(gctx->hWnd, hdc);
+
+	if ((gctx->screen_w==width) && (gctx->screen_h==height)) return GF_FALSE;
+
+	GF_Event evt;
+	dr->max_screen_width = gctx->screen_w = width;
+	dr->max_screen_height = gctx->screen_h = height;
+	dr->max_screen_bpp = 8;//we don't filter for bpp less than 8
+
+	evt.type = GF_EVENT_RESOLUTION;
+	evt.size.width = dr->max_screen_width;
+	evt.size.height = dr->max_screen_height;
+	dr->on_event(the_video_driver->evt_cbk_hdl, &evt);
+
+	return GF_TRUE;
+}
+
+#ifndef GETRAWFRAMEBUFFER
+#define GETRAWFRAMEBUFFER   0x00020001
+typedef struct _RawFrameBufferInfo
+{
+	WORD wFormat;
+	WORD wBPP;
+	VOID *pFramePointer;
+	int	cxStride;
+	int	cyStride;
+	int cxPixels;
+	int cyPixels;
+} RawFrameBufferInfo;
+
+#define FORMAT_565 1
+#define FORMAT_555 2
+#define FORMAT_OTHER 3
+#endif
+
+static GF_Err gapi_get_raw_fb(GF_VideoOutput *dr)
+{
+	long tmp;
+	RawFrameBufferInfo Info;
+	GAPICTX(dr);
+	HDC DC = GetDC(NULL);
+	memset(&Info,0,sizeof(RawFrameBufferInfo));
+
+	ExtEscape(DC, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char*)&Info);
+	if (!Info.pFramePointer /* && QueryPlatform(PLATFORM_VER) >= 421*/ )
+	{
+		//try gxinfo
+		DWORD Code = GETGXINFO;
+		if (ExtEscape(DC, ESC_QUERYESCSUPPORT, sizeof(DWORD), (char*)&Code, 0, NULL) > 0)
+		{
+			DWORD DCWidth = GetDeviceCaps(DC,HORZRES);
+			DWORD DCHeight = GetDeviceCaps(DC,VERTRES);
+			GXDeviceInfo GXInfo;
+			memset(&GXInfo,0,sizeof(GXInfo));
+			GXInfo.Version = 100;
+			ExtEscape(DC, GETGXINFO, 0, NULL, sizeof(GXInfo), (char*)&GXInfo);
+
+			// avoid VGA devices (or QVGA smartphones emulating 176x220)
+			if (GXInfo.cbStride>0 && !(GXInfo.ffFormat & kfLandscape) &&
+			        ((DCWidth == GXInfo.cxWidth && DCHeight == GXInfo.cyHeight) ||
+			         (DCWidth == GXInfo.cyHeight && DCHeight == GXInfo.cxWidth)))
+			{
+				Bool Detect = GF_FALSE;
+				int* p = (int*)GXInfo.pvFrameBuffer;
+				COLORREF Old = GetPixel(DC,0,0);
+				*p ^= -1;
+				Detect = (Bool) ( GetPixel(DC,0,0) != Old );
+				*p ^= -1;
+
+				if (Detect)
+				{
+					Info.pFramePointer = GXInfo.pvFrameBuffer;
+					Info.cxPixels = GXInfo.cxWidth;
+					Info.cyPixels = GXInfo.cyHeight;
+					Info.cxStride = GXInfo.cBPP/8;
+					Info.cyStride = GXInfo.cbStride;
+					Info.wBPP = (WORD)GXInfo.cBPP;
+					Info.wFormat = (WORD)GXInfo.ffFormat;
+				}
+			}
+		}
+	}
+
+	ReleaseDC(NULL,DC);
+
+	if (!Info.pFramePointer) return GF_NOT_SUPPORTED;
+
+	gctx->x_pitch = Info.cxStride;
+	gctx->y_pitch = Info.cyStride;
+
+	if (abs(Info.cyStride) < abs(Info.cxStride))
+	{
+		if (abs(Info.cxStride)*8 < Info.cyPixels*Info.wBPP &&
+		        abs(Info.cxStride)*8 >= Info.cxPixels*Info.wBPP) { //swapped resolution
+			tmp = Info.cxPixels;
+			Info.cxPixels = Info.cyPixels;
+			Info.cyPixels = tmp;
+		}
+	}
+	else
+	{
+		if (abs(Info.cyStride)*8 < Info.cxPixels*Info.wBPP &&
+		        abs(Info.cyStride)*8 >= Info.cyPixels*Info.wBPP) {//swapped resolution
+			tmp = Info.cxPixels;
+			Info.cxPixels = Info.cyPixels;
+			Info.cyPixels = tmp;
+		}
+	}
+
+	gctx->raw_ptr = (unsigned char *)Info.pFramePointer;
+
+	if (Info.cxStride<0)
+		gctx->raw_ptr += (Info.cxStride * (Info.cxPixels-1));
+	if (Info.cyStride<0)
+		gctx->raw_ptr += (Info.cyStride * (Info.cyPixels-1));
+
+	if (check_resolution_switch(dr, Info.cxPixels, Info.cyPixels))
+		return GF_EOS;
+
+	return GF_OK;
+}
+
+#endif
+
+
+static GF_Err GAPI_InitBackBuffer(GF_VideoOutput *dr, u32 VideoWidth, u32 VideoHeight)
+{
+	u32 gx_mode;
+	GAPICTX(dr);
+
+	if (!gctx || !VideoWidth || !VideoHeight) return GF_BAD_PARAM;
+
+	gf_mx_p(gctx->mx);
+
+	GAPI_ReleaseObjects(gctx);
+
+	/*flip W&H in landscape mode*/
+	if (landscape) {
+		u32 t = VideoWidth;
+		VideoWidth = VideoHeight;
+		VideoHeight = t;
+	}
+
+	RECT rc;
+	GetWindowRect(gctx->hWnd, &rc);
+	gctx->off_x = rc.left;
+	gctx->off_y = rc.top;
+	gctx->erase_dest = GF_TRUE;
+
+	const char *opt = gf_opts_get_key("core", "gapi-fbaccess");
+	if (!opt || !strcmp(opt, "raw")) gx_mode = 2;
+	else if (opt && !strcmp(opt, "gx")) gx_mode = 1;
+	else gx_mode = 0;
+
+	if ((gx_mode != gctx->gx_mode) || !gctx->screen_w) {
+		struct GXDisplayProperties gx = GXGetDisplayProperties();
+
+		gctx->x_pitch = gx.cbxPitch;
+		gctx->y_pitch = gx.cbyPitch;
+
+		gctx->gx_mode = gx_mode;
+		if (gctx->gx_mode==2) {
+			if (gapi_get_raw_fb(dr) == GF_EOS) {
+				gf_mx_v(gctx->mx);
+				return GF_OK;
+			}
+		} else if (check_resolution_switch(dr, gx.cxWidth, gx.cyHeight)) {
+			gf_mx_v(gctx->mx);
+			return GF_OK;
+		}
+	}
+	if (gctx->gx_mode==2) {
+		GF_Err e = gapi_get_raw_fb(dr);
+		if (e) {
+			gf_mx_v(gctx->mx);
+			if (e==GF_EOS) return GF_OK;
+			else return e;
+		}
+	}
+
+
+	gctx->bb_size = VideoWidth * VideoHeight * gctx->BPP;
+	gctx->bb_width = VideoWidth;
+	gctx->bb_height = VideoHeight;
+	gctx->bb_pitch = VideoWidth * gctx->BPP;
+
+
+	if (gctx->gx_mode) {
+		gctx->backbuffer = (char *) gf_malloc(sizeof(unsigned char) * gctx->bb_size);
+
+		gctx->contiguous_mem = ((gctx->x_pitch==gctx->BPP) && (gctx->y_pitch==gctx->screen_w*gctx->BPP)) ? GF_TRUE : GF_FALSE;
+	} else {
+		createPixmap(gctx, 0);
+	}
+
+	gf_mx_v(gctx->mx);
+	return GF_OK;
+}
+
+
+static void GAPI_AdjustLandscape(GAPIPriv *gctx, GF_VideoSurface *dst, s32 x_pitch, s32 y_pitch)
+{
+	if (y_pitch>0) {
+#if 1
+		dst->pitch_x = -y_pitch;
+		/*start of frame-buffer is top-left corner*/
+		if (x_pitch>0) {
+			dst->video_buffer += dst->height * y_pitch;
+			dst->pitch_y = x_pitch;
+		}
+		/*start of frame-buffer is top-right corner*/
+		else {
+			dst->video_buffer += dst->height * y_pitch + dst->width * x_pitch;
+			dst->pitch_y = -x_pitch;
+		}
+#else
+		dst->pitch_x = y_pitch;
+		/*start of frame-buffer is top-left corner*/
+		if (x_pitch>0) {
+			dst->video_buffer += y_pitch - x_pitch;
+			dst->pitch_y = -x_pitch;
+		}
+		/*start of frame-buffer is top-right corner*/
+		else {
+			dst->video_buffer += dst->height * y_pitch + dst->width * x_pitch;
+			dst->pitch_y = -x_pitch;
+		}
+#endif
+	} else {
+		dst->pitch_x = y_pitch;
+		/*start of frame-buffer is bottom-left corner*/
+		if (x_pitch>0) {
+			dst->pitch_y = x_pitch;
+		}
+		/*start of frame-buffer is bottom-right corner*/
+		else {
+			dst->video_buffer += dst->width * x_pitch;
+			dst->pitch_y = x_pitch;
+		}
+	}
+	u32 t = dst->width;
+	dst->width = dst->height;
+	dst->height = t;
+}
+
+static GF_Err GAPI_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
+{
+	GAPICTX(dr);
+
+	if (do_lock) {
+		if (!vi) return GF_BAD_PARAM;
+		memset(vi, 0, sizeof(GF_VideoSurface));
+		vi->width = gctx->bb_width;
+		vi->height = gctx->bb_height;
+		vi->video_buffer = gctx->backbuffer;
+		vi->pixel_format = gctx->pixel_format;
+		vi->is_hardware_memory = GF_FALSE;
+		vi->pitch_x = gctx->x_pitch;
+		vi->pitch_y = gctx->y_pitch;
+
+		if (landscape)
+			GAPI_AdjustLandscape(gctx, vi, gctx->x_pitch, gctx->y_pitch);
+	}
+	return GF_OK;
+}
+
+
+static void *NewGAPIVideoOutput()
+{
+	GAPIPriv *priv;
+	GF_VideoOutput *driv = (GF_VideoOutput *) gf_malloc(sizeof(GF_VideoOutput));
+	memset(driv, 0, sizeof(GF_VideoOutput));
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_VIDEO_OUTPUT_INTERFACE, "GAPI Video Output", "gpac distribution")
+
+	priv = (GAPIPriv *) gf_malloc(sizeof(GAPIPriv));
+	memset(priv, 0, sizeof(GAPIPriv));
+	priv->mx = gf_mx_new("GAPI");
+	driv->opaque = priv;
+
+#ifdef GPAC_USE_GLES1X
+	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
+#endif
+	/*rgb, yuv to do*/
+
+	driv->Setup = GAPI_Setup;
+	driv->Shutdown = GAPI_Shutdown;
+	driv->Flush = GAPI_Flush;
+	driv->ProcessEvent = GAPI_ProcessEvent;
+	driv->Blit = NULL;
+	driv->LockBackBuffer = GAPI_LockBackBuffer;
+	driv->SetFullScreen = GAPI_SetFullScreen;
+	return (void *)driv;
+}
+
+static void DeleteVideoOutput(void *ifce)
+{
+	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
+	GAPICTX(driv);
+	GAPI_Shutdown(driv);
+	gf_mx_del(gctx->mx);
+	gf_free(gctx);
+	gf_free(driv);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_VIDEO_OUTPUT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewGAPIVideoOutput();
+	return NULL;
+}
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	GF_VideoOutput *dd = (GF_VideoOutput *)ifce;
+	switch (dd->InterfaceType) {
+	case GF_VIDEO_OUTPUT_INTERFACE:
+		DeleteVideoOutput(dd);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( gapi )
+
+#ifdef __cplusplus
+}
+#endif
+

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gapi/gapi.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster/gdip_font.cpp Added

@@ -0,0 +1,407 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GDIplus rasterizer module
+ *
+ *  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 "gdip_priv.h"
+#include <gpac/utf.h>
+
+
+
+#ifndef GDIP_MAX_STRING_SIZE
+#define GDIP_MAX_STRING_SIZE	5000
+#endif
+
+
+GF_Err gdip_init_font_engine(GF_FontReader *dr)
+{
+	const char *sOpt;
+	FontPriv *ctx = (FontPriv *)dr->udta;
+
+	sOpt = gf_opts_get_key("FontCache", "FontSerif");
+	strcpy(ctx->font_serif, sOpt ? sOpt : "Times New Roman");
+	sOpt = gf_opts_get_key("FontCache", "FontSans");
+	strcpy(ctx->font_sans, sOpt ? sOpt : "Arial");
+	sOpt = gf_opts_get_key("FontCache", "FontFixed");
+	strcpy(ctx->font_fixed, sOpt ? sOpt : "Courier New");
+
+	return GF_OK;
+}
+GF_Err gdip_shutdown_font_engine(GF_FontReader *dr)
+{
+	FontPriv *ctx = (FontPriv *)dr->udta;
+
+	if (ctx->font) GdipDeleteFontFamily(ctx->font);
+	ctx->font = NULL;
+
+	/*nothing to do*/
+	return GF_OK;
+}
+
+
+
+static GF_Err gdip_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;
+	char *utf8 = (char*) utf_string;
+	FontPriv *priv = (FontPriv*)dr->udta;
+
+	len = utf_string ? (u32) strlen(utf_string) : 0;
+	if (!len) {
+		*io_glyph_buffer_size = 0;
+		return GF_OK;
+	}
+	if (*io_glyph_buffer_size < len+1) {
+		*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;
+	if (utf8) return GF_IO_ERR;
+
+	/*perform bidi relayout*/
+	conv = (u16*) glyph_buffer;
+	*is_rtl = gf_utf8_reorder_bidi(conv, len);
+	/*move 16bit buffer to 32bit*/
+	for (i=len; i>0; i--) {
+		glyph_buffer[i-1] = (u32) conv[i-1];
+	}
+	*io_glyph_buffer_size = (u32) len;
+	return GF_OK;
+}
+
+
+static void adjust_white_space(const unsigned short *string, Float *width, Float whiteSpaceWidth)
+{
+	u32 len , i=0;
+	while (string[i] == (unsigned short) ' ') {
+		*width += whiteSpaceWidth;
+		i++;
+	}
+	if (whiteSpaceWidth<0) return;
+	len = (u32) gf_utf8_wcslen(string);
+	if (i != len) {
+		i = len - 1;
+		while (string[i] == (unsigned short) ' ') {
+			*width += whiteSpaceWidth;
+			i--;
+		}
+	}
+}
+
+static GF_Err gdip_get_text_size(GF_FontReader *dr, const unsigned short *string, Fixed *width, Fixed *height)
+{
+	GpPath *path_tmp;
+	GpStringFormat *fmt;
+	FontPriv *ctx = (FontPriv *)dr->udta;
+	*width = *height = 0;
+	if (!ctx->font) return GF_BAD_PARAM;
+
+	GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &fmt);
+	GdipCreatePath(FillModeAlternate, &path_tmp);
+	RectF rc;
+	rc.X = rc.Y = 0;
+	rc.Width = rc.Height = 0;
+	GdipAddPathString(path_tmp, (const WCHAR *)string, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
+
+	GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
+
+	adjust_white_space(string, &rc.Width, ctx->whitespace_width);
+	*width = FLT2FIX(rc.Width);
+	*height = FLT2FIX(rc.Height);
+
+	GdipDeleteStringFormat(fmt);
+	GdipDeletePath(path_tmp);
+
+	return GF_OK;
+}
+
+static GF_Err gdip_set_font(GF_FontReader *dr, const char *fontName, u32 styles)
+{
+	WCHAR wcFontName[GDIP_MAX_STRING_SIZE];
+	FontPriv *ctx = (FontPriv *)dr->udta;
+
+	if (ctx->font) GdipDeleteFontFamily(ctx->font);
+	ctx->font = NULL;
+
+	if (fontName && strlen(fontName) >= GDIP_MAX_STRING_SIZE) fontName = NULL;
+
+	if (!fontName || !strlen(fontName) ) fontName = ctx->font_serif;
+	else if (!stricmp(fontName, "SANS") || !stricmp(fontName, "sans-serif")) fontName = ctx->font_sans;
+	else if (!stricmp(fontName, "SERIF")) fontName = ctx->font_serif;
+	else if (!stricmp(fontName, "TYPEWRITER") || !stricmp(fontName, "monospace")) fontName = ctx->font_fixed;
+
+	MultiByteToWideChar(CP_ACP, 0, fontName, (u32)strlen(fontName)+1,
+	                    wcFontName, sizeof(wcFontName)/sizeof(wcFontName[0]) );
+
+
+	GdipCreateFontFamilyFromName(wcFontName, NULL, &ctx->font);
+	if (!ctx->font) return GF_NOT_SUPPORTED;
+
+	//setup styles
+	ctx->font_style = 0;
+	if (styles & GF_FONT_WEIGHT_BOLD ) ctx->font_style |= FontStyleBold;
+	if (styles & GF_FONT_ITALIC) ctx->font_style |= FontStyleItalic;
+
+	if (styles & GF_FONT_UNDERLINED) ctx->font_style |= FontStyleUnderline;
+	if (styles & GF_FONT_STRIKEOUT) ctx->font_style |= FontStyleStrikeout;
+	return GF_OK;
+}
+
+static GF_Err gdip_get_font_info(GF_FontReader *dr, char **font_name, u32 *em_size, s32 *ascent, s32 *descent, s32 *underline, s32 *line_spacing, s32 *max_advance_h, s32 *max_advance_v)
+{
+	UINT16 val, em;
+	FontPriv *ctx = (FontPriv *)dr->udta;
+
+	*font_name = NULL;
+	*em_size = *ascent = *descent = *line_spacing = *max_advance_h = *max_advance_v = 0;
+	if (!ctx->font) return GF_BAD_PARAM;
+
+	GdipGetEmHeight(ctx->font, ctx->font_style, &em);
+	*em_size = (s32) em;
+	GdipGetCellAscent(ctx->font, ctx->font_style, &val);
+	ctx->ascent = (Float) val;
+	*ascent = (s32) val;
+	GdipGetCellDescent(ctx->font, ctx->font_style, &val);
+	*descent = (s32) val;
+	*descent *= -1;
+	ctx->descent = -1 * (Float) val;
+	*underline = *descent / 2;
+	GdipGetLineSpacing(ctx->font, ctx->font_style, &val);
+	*line_spacing = (s32) val;
+	*max_advance_v = *ascent - *descent;
+
+
+	unsigned short test_str[4];
+	Fixed w, h, w2;
+	ctx->em_size = (Float) *em_size;
+	test_str[0] = (unsigned short) '_';
+	test_str[1] = (unsigned short) '\0';
+	gdip_get_text_size(dr, test_str, &w, &h);
+	ctx->underscore_width = FIX2FLT(w);
+
+	test_str[0] = (unsigned short) '_';
+	test_str[1] = (unsigned short) ' ';
+	test_str[2] = (unsigned short) '_';
+	test_str[3] = (unsigned short) '\0';
+	gdip_get_text_size(dr, test_str, &w2, &h);
+	ctx->whitespace_width = FIX2FLT(w2 - 2*w);
+
+	*max_advance_h = (s32) MAX(ctx->underscore_width, ctx->whitespace_width);
+	return GF_OK;
+}
+
+
+
+static GF_Glyph *gdip_load_glyph(GF_FontReader *dr, u32 glyph_name)
+{
+	GF_Rect bounds;
+	GF_Glyph *glyph;
+	GpPath *path_tmp;
+	GpStringFormat *fmt;
+	GpMatrix *mat;
+	Float est_advance_h;
+	unsigned short str[4];
+	int i;
+	FontPriv *ctx = (FontPriv *)dr->udta;
+
+	if (!ctx->font) return NULL;
+
+	RectF rc;
+	rc.X = rc.Y = 0;
+	rc.Width = rc.Height = 0;
+
+	GdipCreateStringFormat(StringFormatFlagsNoWrap | StringFormatFlagsNoFitBlackBox | StringFormatFlagsMeasureTrailingSpaces, LANG_NEUTRAL, &fmt);
+	GdipSetStringFormatAlign(fmt, StringAlignmentNear);
+	GdipCreatePath(FillModeAlternate, &path_tmp);
+
+	if (glyph_name==0x20) {
+		est_advance_h = ctx->whitespace_width;
+	} else {
+		/*to compute first glyph alignment (say 'x', we figure out its bounding full box by using the '_' char as wrapper (eg, "_x_")
+		then the bounding box starting from xMin of the glyph ('x_'). The difference between both will give us a good approx
+		of the glyph alignment*/
+		str[0] = glyph_name;
+		str[1] = (unsigned short) '_';
+		str[2] = (unsigned short) 0;
+		GdipAddPathString(path_tmp, (const WCHAR *)str, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
+		GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
+		est_advance_h = rc.Width - ctx->underscore_width;
+	}
+
+	GdipResetPath(path_tmp);
+
+	str[0] = glyph_name;
+	str[1] = (unsigned short) 0;
+	rc.X = rc.Y = 0;
+	rc.Width = rc.Height = 0;
+	GdipAddPathString(path_tmp, (const WCHAR *)str, -1, ctx->font, ctx->font_style, ctx->em_size, &rc, fmt);
+
+	GdipGetPathWorldBounds(path_tmp, &rc, NULL, NULL);
+
+	/*flip so that we are in a font coordinate system - also move back the glyph to x=0 and y=baseline, GdiPlus doesn't do so*/
+	GdipCreateMatrix(&mat);
+	GdipTranslateMatrix(mat, - rc.X, -ctx->ascent, MatrixOrderAppend);
+	GdipScaleMatrix(mat, 1, -1, MatrixOrderAppend);
+	GdipTransformPath(path_tmp, mat);
+	GdipDeleteMatrix(mat);
+
+
+	/*start enum*/
+	s32 count;
+	GdipGetPointCount(path_tmp, &count);
+	GpPointF *pts = new GpPointF[count];
+	BYTE *types = new BYTE[count];
+	GdipGetPathTypes(path_tmp, types, count);
+	GdipGetPathPoints(path_tmp, pts, count);
+
+	GF_SAFEALLOC(glyph, GF_Glyph);
+	GF_SAFEALLOC(glyph->path, GF_Path);
+
+	for (i=0; i<count; ) {
+		BOOL closed = 0;
+		s32 sub_type;
+
+		sub_type = types[i] & PathPointTypePathTypeMask;
+
+		if (sub_type == PathPointTypeStart) {
+			gf_path_add_move_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y));
+			i++;
+		}
+		else if (sub_type == PathPointTypeLine) {
+			gf_path_add_line_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y));
+
+			if (types[i] & PathPointTypeCloseSubpath) gf_path_close(glyph->path);
+
+			i++;
+		}
+		else if (sub_type == PathPointTypeBezier) {
+			assert(i+2<=count);
+			gf_path_add_cubic_to(glyph->path, FLT2FIX(pts[i].X), FLT2FIX(pts[i].Y), FLT2FIX(pts[i+1].X), FLT2FIX(pts[i+1].Y), FLT2FIX(pts[i+2].X), FLT2FIX(pts[i+2].Y));
+
+			if (types[i+2] & PathPointTypeCloseSubpath) gf_path_close(glyph->path);
+
+			i += 3;
+		} else {
+			assert(0);
+			break;
+		}
+	}
+
+	delete [] pts;
+	delete [] types;
+	GdipDeleteStringFormat(fmt);
+	GdipDeletePath(path_tmp);
+
+	glyph->ID = glyph_name;
+	glyph->utf_name = glyph_name;
+	glyph->vert_advance = (s32) (ctx->ascent-ctx->descent);
+	glyph->horiz_advance = (s32) est_advance_h;
+	gf_path_get_bounds(glyph->path, &bounds);
+	glyph->width = FIX2INT(bounds.width);
+	glyph->height = FIX2INT(bounds.height);
+	return glyph;
+}
+
+
+
+
+GF_FontReader *gdip_new_font_driver()
+{
+	GdiplusStartupInput startupInput;
+	GF_FontReader *dr;
+	FontPriv *ctx;
+
+	SAFEALLOC(ctx, FontPriv);
+	SAFEALLOC(dr, GF_FontReader);
+	GdiplusStartup(&ctx->gdiToken, &startupInput, NULL);
+
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_FONT_READER_INTERFACE, "GDIplus Font Reader", "gpac distribution")
+	dr->init_font_engine = gdip_init_font_engine;
+	dr->shutdown_font_engine = gdip_shutdown_font_engine;
+	dr->set_font = gdip_set_font;
+	dr->get_font_info = gdip_get_font_info;
+	dr->get_glyphs = gdip_get_glyphs;
+	dr->load_glyph = gdip_load_glyph;
+
+	dr->udta = ctx;
+	return dr;
+}
+
+void gdip_delete_font_driver(GF_FontReader *dr)
+{
+	FontPriv *ctx = (FontPriv *)dr->udta;
+	GdiplusShutdown(ctx->gdiToken);
+
+	if (ctx->font) GdipDeleteFontFamily(ctx->font);
+	ctx->font = NULL;
+
+	gf_free(dr->udta);
+	gf_free(dr);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_FONT_READER_INTERFACE,
+		GF_RASTER_2D_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType==GF_FONT_READER_INTERFACE) return (GF_BaseInterface *)gdip_new_font_driver();
+	if (InterfaceType==GF_RASTER_2D_INTERFACE) return (GF_BaseInterface *)gdip_LoadRenderer();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_FONT_READER_INTERFACE:
+		gdip_delete_font_driver((GF_FontReader *)ifce);
+		break;
+	case GF_RASTER_2D_INTERFACE:
+		gdip_ShutdownRenderer((GF_Raster2D *)ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( gdiplus )
+
+#ifdef __cplusplus
+}
+#endif

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster/gdip_grad.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster/gdip_priv.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster/gdip_rend.cpp Added

@@ -0,0 +1,499 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GDIplus rasterizer module
+ *
+ *  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 <windows.h>
+#include "gdip_priv.h"
+
+/*all GDIPLUS includes for C api*/
+
+struct IDirectDrawSurface7;
+
+#include "GdiplusMem.h"
+#include "GdiplusEnums.h"
+#include "GdiplusTypes.h"
+#include "GdiplusInit.h"
+#include "GdiplusPixelFormats.h"
+#include "GdiplusColor.h"
+#include "GdiplusMetaHeader.h"
+#include "GdiplusImaging.h"
+#include "GdiplusColorMatrix.h"
+#include "GdiplusGpStubs.h"
+#include "GdiplusColor.h"
+#include "GdiplusFlat.h"
+
+struct _graphics
+{
+	GpGraphics *graph;
+	GpMatrix *mat;
+	GpPath *clip;
+	GpPath *current;
+	u32 w, h;
+	Bool center_coords;
+
+	/*offscreen buffer handling*/
+	GpBitmap *pBitmap;
+};
+
+GpPath *gdip_create_path(GF_Path *_this)
+{
+	GpPath *p;
+	u32 j, i, nb_pts, cur;
+	if (!_this || !_this->n_points) return NULL;
+	GdipCreatePath(FillModeAlternate, &p);
+
+	GdipSetPathFillMode(p, (_this->flags & GF_PATH_FILL_ZERO_NONZERO) ? FillModeWinding : FillModeAlternate);
+
+	cur = 0;
+	for (i=0; i<_this->n_contours; i++) {
+		nb_pts = 1+_this->contours[i] - cur;
+		GdipStartPathFigure(p);
+		for (j=cur+1; j<cur+nb_pts; ) {
+			switch (_this->tags[j]) {
+			case GF_PATH_CURVE_ON:
+				GdipAddPathLine(p, FIX2FLT(_this->points[j-1].x), FIX2FLT(_this->points[j-1].y), FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y));
+				j++;
+				break;
+			case GF_PATH_CLOSE:
+				GdipAddPathLine(p, FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y), FIX2FLT(_this->points[cur].x), FIX2FLT(_this->points[cur].y));
+				j++;
+				break;
+			case GF_PATH_CURVE_CUBIC:
+				GdipAddPathBezier(p,
+				                  FIX2FLT(_this->points[j-1].x), FIX2FLT(_this->points[j-1].y),
+				                  FIX2FLT(_this->points[j].x), FIX2FLT(_this->points[j].y),
+				                  FIX2FLT(_this->points[j+1].x), FIX2FLT(_this->points[j+1].y),
+				                  FIX2FLT(_this->points[j+2].x), FIX2FLT(_this->points[j+2].y)
+				                 );
+				j+=3;
+				break;
+			case GF_PATH_CURVE_CONIC:
+			{
+				GF_Point2D ctl, end, c1, c2, start;
+				start = _this->points[j-1];
+				ctl = _this->points[j];
+				end = _this->points[j+1];
+				c1.x = start.x + 2*(ctl.x - start.x) / 3;
+				c1.y = start.y + 2*(ctl.y - start.y) / 3;
+				c2.x = c1.x + (end.x - start.x) / 3;
+				c2.y = c1.y + (end.y - start.y) / 3;
+				GdipAddPathBezier(p,
+				                  FIX2FLT(start.x), FIX2FLT(start.y),
+				                  FIX2FLT(c1.x), FIX2FLT(c1.y),
+				                  FIX2FLT(c2.x), FIX2FLT(c2.y),
+				                  FIX2FLT(end.x), FIX2FLT(end.y)
+				                 );
+				j+=2;
+			}
+			break;
+			}
+		}
+		GdipClosePathFigure(p);
+		cur += nb_pts;
+	}
+	return p;
+}
+
+#define GPGRAPH() struct _graphics *_graph = (struct _graphics *)_this;
+
+static
+GF_SURFACE gdip_new_surface(GF_Raster2D *, Bool center_coords)
+{
+	struct _graphics *graph;
+	SAFEALLOC(graph, struct _graphics);
+	graph->center_coords = center_coords;
+	return graph;
+}
+
+static
+void gdip_delete_surface(GF_SURFACE _this)
+{
+	GPGRAPH();
+	gf_free(_graph);
+}
+
+/*should give the best results with the clippers*/
+#define GDIP_PIXEL_MODE PixelOffsetModeHighQuality
+
+static
+GF_Err gdip_attach_surface_to_device(GF_SURFACE _this, void *os_handle, u32 width, u32 height)
+{
+	GpMatrix *mat;
+	HDC handle = (HDC) os_handle;
+	GPGRAPH();
+	if (!_graph || !handle) return GF_BAD_PARAM;
+	if (_graph->graph) return GF_BAD_PARAM;
+	GdipCreateFromHDC(handle, &_graph->graph);
+
+	GdipCreateMatrix(&mat);
+	if (	_graph->center_coords) {
+		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
+		GdipTranslateMatrix(mat, (Float) width/2, (Float) height/2, MatrixOrderAppend);
+	}
+	GdipSetWorldTransform(_graph->graph, mat);
+	GdipDeleteMatrix(mat);
+	_graph->w = width;
+	_graph->h = height;
+	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
+	return GF_OK;
+}
+static
+GF_Err gdip_attach_surface_to_texture(GF_SURFACE _this, GF_STENCIL sten)
+{
+	GpMatrix *mat;
+	struct _stencil *_sten = (struct _stencil *)sten;
+	GPGRAPH();
+	if (!_graph || !_sten || !_sten->pBitmap) return GF_BAD_PARAM;
+
+	GdipGetImageGraphicsContext(_sten->pBitmap, &_graph->graph);
+
+	if (_graph->center_coords) {
+		GdipCreateMatrix(&mat);
+		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
+		GdipTranslateMatrix(mat, (Float) _sten->width/2, (Float) _sten->height/2, MatrixOrderAppend);
+		GdipSetWorldTransform(_graph->graph, mat);
+		GdipDeleteMatrix(mat);
+	}
+	_graph->w = _sten->width;
+	_graph->h = _sten->height;
+	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
+	return GF_OK;
+}
+static
+GF_Err gdip_attach_surface_to_buffer(GF_SURFACE _this, char *pixels, u32 width, u32 height, s32 pitch_x, s32 pitch_y, GF_PixelFormat pixelFormat)
+{
+	GpMatrix *mat;
+	u32 pFormat;
+	GPGRAPH();
+
+	if (pitch_y%4) return GF_NOT_SUPPORTED;
+
+	switch (pixelFormat) {
+	case GF_PIXEL_ALPHAGREY:
+		pFormat = PixelFormat16bppGrayScale;
+		if (pitch_x != 2) return GF_NOT_SUPPORTED;
+		break;
+	case GF_PIXEL_RGB_555:
+		pFormat = PixelFormat16bppRGB555;
+		if (pitch_x != 2) return GF_NOT_SUPPORTED;
+		break;
+	case GF_PIXEL_RGB_565:
+		pFormat = PixelFormat16bppRGB565;
+		if (pitch_x != 2) return GF_NOT_SUPPORTED;
+		break;
+	case GF_PIXEL_RGB:
+		pFormat = PixelFormat24bppRGB;
+		if (pitch_x != 3) return GF_NOT_SUPPORTED;
+		break;
+	case GF_PIXEL_RGBX:
+		pFormat = PixelFormat32bppRGB;
+		if (pitch_x != 4) return GF_NOT_SUPPORTED;
+		break;
+	case GF_PIXEL_ARGB:
+		pFormat = PixelFormat32bppARGB;
+		if (pitch_x != 4) return GF_NOT_SUPPORTED;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+	GdipCreateBitmapFromScan0(width, height, pitch_y, pFormat, (unsigned char*)pixels, &_graph->pBitmap);
+	GdipGetImageGraphicsContext(_graph->pBitmap, &_graph->graph);
+
+	_graph->w = width;
+	_graph->h = height;
+	if (_graph->center_coords) {
+		GdipCreateMatrix(&mat);
+		GdipScaleMatrix(mat, 1.0, -1.0, MatrixOrderAppend);
+		GdipTranslateMatrix(mat, (Float) width/2, (Float) height/2, MatrixOrderAppend);
+		GdipSetWorldTransform(_graph->graph, mat);
+		GdipDeleteMatrix(mat);
+	}
+	GdipSetPixelOffsetMode(_graph->graph, GDIP_PIXEL_MODE);
+	return GF_OK;
+}
+
+static
+void gdip_detach_surface(GF_SURFACE _this)
+{
+	GPGRAPH();
+	if (_graph->graph) GdipDeleteGraphics(_graph->graph);
+	_graph->graph = NULL;
+	if (_graph->clip) GdipDeletePath(_graph->clip);
+	_graph->clip = NULL;
+	if (_graph->pBitmap) GdipDisposeImage(_graph->pBitmap);
+	_graph->pBitmap = NULL;
+	if (_graph->current) GdipDeletePath(_graph->current);
+	_graph->current = NULL;
+}
+
+
+static
+GF_Err gdip_surface_set_raster_level(GF_SURFACE _this, GF_RasterLevel RasterSetting)
+{
+	GPGRAPH();
+	switch (RasterSetting) {
+	case GF_RASTER_HIGH_SPEED:
+		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighSpeed);
+		GdipSetCompositingQuality(_graph->graph, CompositingQualityHighSpeed);
+		break;
+	case GF_RASTER_MID:
+		GdipSetSmoothingMode(_graph->graph, SmoothingModeDefault);
+		GdipSetCompositingQuality(_graph->graph, CompositingQualityDefault);
+		break;
+	case GF_RASTER_HIGH_QUALITY:
+		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighQuality);
+		GdipSetCompositingQuality(_graph->graph, CompositingQualityDefault);
+		/*THIS IS HORRIBLY SLOW DON'T EVEN THINK ABOUT IT*/
+		/*GdipSetCompositingQuality(_graph->graph, CompositingQualityHighQuality);*/
+		break;
+	}
+	return GF_OK;
+}
+static
+GF_Err gdip_surface_set_matrix(GF_SURFACE _this, GF_Matrix2D * mat)
+{
+	GPGRAPH();
+	if (_graph->mat) GdipDeleteMatrix(_graph->mat);
+
+	_graph->mat = mat_gpac_to_gdip(mat);
+	return GF_OK;
+}
+static
+GF_Err gdip_surface_set_clipper(GF_SURFACE _this, GF_IRect *rc)
+{
+	GPGRAPH();
+	if (_graph->clip) GdipDeletePath(_graph->clip);
+	_graph->clip = 0L;
+	if (!rc) return GF_OK;
+
+	GdipCreatePath(FillModeAlternate, &_graph->clip);
+	GdipAddPathRectangleI(_graph->clip, rc->x, rc->y - rc->height, rc->width, rc->height);
+	return GF_OK;
+}
+
+static
+GpBrush *gdip_get_brush(struct _stencil *_sten)
+{
+	if (_sten->pSolid) return _sten->pSolid;
+	if (_sten->pLinear) return _sten->pLinear;
+	if (_sten->pRadial) return _sten->pRadial;
+	if (_sten->pTexture) return _sten->pTexture;
+	return NULL;
+}
+
+static GpPath *gdip_setup_path(struct _graphics *_this, GF_Path *path)
+{
+	GpPath *tr = gdip_create_path(path);
+	/*append current matrix*/
+	if (_this->mat) GdipTransformPath(tr, _this->mat);
+	return tr;
+}
+
+static
+GF_Err gdip_surface_set_path(GF_SURFACE _this, GF_Path *path)
+{
+	struct _storepath *_path;
+	GPGRAPH();
+	if (!_graph) return GF_BAD_PARAM;
+	if (_graph->current) GdipDeletePath(_graph->current);
+	_graph->current = NULL;
+	if (!path) return GF_OK;
+
+	_path = (struct _storepath *)path;
+	_graph->current = gdip_setup_path(_graph, path);
+	return GF_OK;
+}
+
+//#define NODRAW
+
+static
+GF_Err gdip_surface_fill(GF_SURFACE _this, GF_STENCIL stencil)
+{
+	GpStatus ret;
+	GpMatrix *newmat;
+	struct _stencil *_sten;
+	GPGRAPH();
+	if (!_this) return GF_BAD_PARAM;
+	if (!_graph->current) return GF_OK;
+	_sten = (struct _stencil *)stencil;
+	assert(_sten);
+
+#ifdef NODRAW
+	return GF_OK;
+#endif
+
+
+	if (_graph->clip) GdipSetClipPath(_graph->graph, _graph->clip, CombineModeReplace);
+
+	switch (_sten->type) {
+	case GF_STENCIL_SOLID:
+		assert(_sten->pSolid);
+		GdipFillPath(_graph->graph, _sten->pSolid, _graph->current);
+		break;
+	case GF_STENCIL_LINEAR_GRADIENT:
+		if (_sten->pMat) {
+			/*rebuild gradient*/
+			gdip_recompute_line_gradient(_sten);
+
+			GdipResetTextureTransform((GpTexture*)_sten->pLinear);
+			if (_sten->pMat) {
+				GdipCloneMatrix(_sten->pMat, &newmat);
+			} else {
+				GdipCreateMatrix(&newmat);
+			}
+			GdipMultiplyMatrix(newmat, _sten->pLinearMat, MatrixOrderPrepend);
+			GdipSetTextureTransform((GpTexture*)_sten->pLinear, newmat);
+			GdipDeleteMatrix(newmat);
+		}
+		GdipFillPath(_graph->graph, _sten->pLinear, _graph->current);
+		break;
+	case GF_STENCIL_RADIAL_GRADIENT:
+		/*build gradient*/
+		gdip_recompute_radial_gradient(_sten);
+
+		GdipSetCompositingQuality(_graph->graph, CompositingQualityHighSpeed);
+		GdipSetInterpolationMode(_graph->graph, InterpolationModeLowQuality);
+		GdipSetSmoothingMode(_graph->graph, SmoothingModeHighSpeed);
+
+		/*check if we need to draw solid background (GDIplus doesn't implement padded mode on path gradients)*/
+		if (_sten->pSolid) {
+			GpPath *tr;
+			GdipClonePath(_sten->circle, &tr);
+			GdipTransformPath(tr, _sten->pMat);
+			GdipSetClipPath(_graph->graph, tr, CombineModeExclude);
+			GdipFillPath(_graph->graph, _sten->pSolid, _graph->current);
+			GdipDeletePath(tr);
+			GdipResetClip(_graph->graph);
+			if (_graph->clip) GdipSetClipPath(_graph->graph, _graph->clip, CombineModeReplace);
+		}
+		GdipFillPath(_graph->graph, _sten->pRadial, _graph->current);
+		break;
+	case GF_STENCIL_VERTEX_GRADIENT:
+		assert(_sten->pRadial);
+		if (_sten->pMat) GdipSetTextureTransform((GpTexture*)_sten->pRadial, _sten->pMat);
+		ret = GdipFillPath(_graph->graph, _sten->pRadial, _graph->current);
+		break;
+	case GF_STENCIL_TEXTURE:
+		gdip_load_texture(_sten);
+		if (_sten->pTexture) {
+			GpMatrix *newmat;
+			GdipResetTextureTransform((GpTexture*)_sten->pTexture);
+			if (_sten->pMat) {
+				GdipCloneMatrix(_sten->pMat, &newmat);
+			} else {
+				GdipCreateMatrix(&newmat);
+			}
+			/*gdip flip*/
+			if (_graph->center_coords && !(_sten->tiling&GF_TEXTURE_FLIP) )
+				GdipScaleMatrix(newmat, 1, -1, MatrixOrderPrepend);
+			else if (!_graph->center_coords && (_sten->tiling&GF_TEXTURE_FLIP) )
+				GdipScaleMatrix(newmat, 1, -1, MatrixOrderPrepend);
+
+			GdipSetTextureTransform((GpTexture*)_sten->pTexture, newmat);
+			GdipDeleteMatrix(newmat);
+
+			GdipSetInterpolationMode(_graph->graph, (_sten->tFilter==GF_TEXTURE_FILTER_HIGH_QUALITY) ? InterpolationModeHighQuality : InterpolationModeLowQuality);
+			GdipFillPath(_graph->graph, _sten->pTexture, _graph->current);
+		}
+		break;
+	}
+	return GF_OK;
+}
+
+
+static
+GF_Err gdip_surface_flush(GF_SURFACE _this)
+{
+	GPGRAPH();
+	GdipFlush(_graph->graph, FlushIntentionSync);
+	return GF_OK;
+}
+
+static
+GF_Err gdip_surface_clear(GF_SURFACE _this, GF_IRect *rc, u32 color)
+{
+	GpPath *path;
+	GPGRAPH();
+
+	GdipCreatePath(FillModeAlternate, &path);
+	if (rc) {
+		/*luckily enough this maps well for both flipped and unflipped coords*/
+		GdipAddPathRectangleI(path, rc->x, rc->y - rc->height, rc->width, rc->height);
+	} else {
+		/*		if (_graph->center_coords) {
+					GdipAddPathRectangleI(path, -1 * (s32)_graph->w / 2, -1 * (s32)_graph->h / 2, _graph->w, _graph->h);
+				} else {
+		*/			GdipAddPathRectangleI(path, 0, 0, _graph->w, _graph->h);
+//		}
+	}
+	/*we MUST use clear otherwise ARGB surfaces are not cleared correctly*/
+	GdipSetClipPath(_graph->graph, path, CombineModeReplace);
+	GdipGraphicsClear(_graph->graph, color);
+	GdipDeletePath(path);
+	return GF_OK;
+}
+
+void gdip_init_driver_surface(GF_Raster2D *driver)
+{
+	driver->surface_new = gdip_new_surface;
+	driver->surface_delete = gdip_delete_surface;
+	driver->surface_attach_to_device = gdip_attach_surface_to_device;
+	driver->surface_attach_to_texture = gdip_attach_surface_to_texture;
+	driver->surface_attach_to_buffer = gdip_attach_surface_to_buffer;
+	driver->surface_detach = gdip_detach_surface;
+	driver->surface_set_raster_level = gdip_surface_set_raster_level;
+	driver->surface_set_matrix = gdip_surface_set_matrix;
+	driver->surface_set_clipper = gdip_surface_set_clipper;
+	driver->surface_set_path = gdip_surface_set_path;
+	driver->surface_fill = gdip_surface_fill;
+	driver->surface_flush = gdip_surface_flush;
+	driver->surface_clear = gdip_surface_clear;
+}
+
+
+GF_Raster2D *gdip_LoadRenderer()
+{
+	GdiplusStartupInput startupInput;
+	GF_Raster2D *driver;
+	struct _gdip_context *ctx;
+	SAFEALLOC(ctx, struct _gdip_context);
+	SAFEALLOC(driver, GF_Raster2D);
+	GdiplusStartup(&ctx->gdiToken, &startupInput, NULL);
+	driver->internal = ctx;
+	GF_REGISTER_MODULE_INTERFACE(driver, GF_RASTER_2D_INTERFACE, "GDIplus 2D Raster", "gpac distribution")
+	gdip_init_driver_texture(driver);
+	gdip_init_driver_surface(driver);
+	gdip_init_driver_grad(driver);
+	return driver;
+}
+
+void gdip_ShutdownRenderer(GF_Raster2D *driver)
+{
+	struct _gdip_context *ctx = (struct _gdip_context *)driver->internal;
+
+	GdiplusShutdown(ctx->gdiToken);
+	gf_free(ctx);
+	gf_free(driver);
+}

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/gdip_raster/gdip_texture.cpp Added

@@ -0,0 +1,440 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GDIplus rasterizer module
+ *
+ *  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 "gdip_priv.h"
+
+#define COL_565(c) GF_COL_ARGB(0xFF, (u8) ( (val >> 7) & 0xf8), (u8) ( (val >> 2) & 0xf8), (u8) ( (val << 3) & 0xf8) )
+#define COL_555(c) GF_COL_ARGB(0xFF,  (u8) ( (val >> 8) & 0xf8), (u8) ( (val >> 3) & 0xfc),  (u8) ( (val << 3) & 0xf8)	)
+
+static
+GF_Err gdip_set_texture(GF_STENCIL _this, char *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat, GF_PixelFormat destination_format_hint, Bool no_copy)
+{
+	char *ptr;
+	Bool is_yuv;
+	u32 pFormat, isBGR, BPP, i, j, col;
+	unsigned char a, r, g, b;
+	unsigned short val;
+	Bool copy;
+	GPSTEN();
+	CHECK_RET(GF_STENCIL_TEXTURE);
+
+	gdip_cmat_reset(&_sten->cmat);
+	isBGR = 0;
+	BPP = 4;
+	copy = GF_FALSE;
+	is_yuv = GF_FALSE;
+	/*is pixel format supported ?*/
+	switch (pixelFormat) {
+	case GF_PIXEL_GREYSCALE:
+		pFormat = PixelFormat24bppRGB;
+		BPP = 1;
+		/*no support for 8bit greyscale not indexed in GDIPlus ...*/
+		copy = GF_TRUE;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+		pFormat = PixelFormat32bppARGB;
+		BPP = 2;
+		/*cannot get it to work without using 32bpp argb*/
+		copy = GF_TRUE;
+		break;
+	case GF_PIXEL_RGB_555:
+		pFormat = PixelFormat16bppRGB555;
+		BPP = 2;
+		break;
+	case GF_PIXEL_RGB_565:
+		pFormat = PixelFormat16bppRGB565;
+		BPP = 2;
+		break;
+	case GF_PIXEL_RGB:
+		pFormat = PixelFormat24bppRGB;
+		BPP = 3;
+		/*one day I'll hope to understand how color management works with GDIplus bitmaps...*/
+		isBGR = 1;
+//		copy = 1;
+		break;
+	case GF_PIXEL_BGR:
+		pFormat = PixelFormat24bppRGB;
+		BPP = 3;
+		break;
+	case GF_PIXEL_RGBX:
+		pFormat = PixelFormat32bppRGB;
+		BPP = 4;
+		break;
+	case GF_PIXEL_ARGB:
+		pFormat = PixelFormat32bppARGB;
+		BPP = 4;
+		break;
+	case GF_PIXEL_RGBA:
+		pFormat = PixelFormat32bppARGB;
+		BPP = 4;
+		copy = GF_TRUE;
+		_sten->orig_buf = (unsigned char *) pixels;
+		break;
+	case GF_PIXEL_YUV:
+		if ( (width*3)%4) return GF_NOT_SUPPORTED;
+		_sten->orig_format = GF_PIXEL_YUV;
+		is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_YUVA:
+		_sten->orig_format = GF_PIXEL_YUVA;
+		is_yuv = GF_TRUE;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (_sten->pBitmap) GdipDisposeImage(_sten->pBitmap);
+	_sten->pBitmap = NULL;
+	_sten->width = width;
+	_sten->height = height;
+	_sten->destination_format = destination_format_hint;
+	if (is_yuv) {
+		_sten->orig_buf = (unsigned char*)pixels;
+		_sten->orig_stride = stride;
+		_sten->is_converted = GF_FALSE;
+		return GF_OK;
+	}
+
+	_sten->is_converted = GF_TRUE;
+	_sten->format = pFormat;
+
+	/*GDIplus limitation : horiz_stride shall be multiple of 4 and no support for pure grayscale without palette*/
+	if (!copy && pixels && !(stride%4)) {
+		if (no_copy && isBGR) return GF_NOT_SUPPORTED;
+		GdipCreateBitmapFromScan0(_sten->width, _sten->height, stride, pFormat, (unsigned char*)pixels, &_sten->pBitmap);
+		_sten->invert_br = isBGR ? GF_TRUE : GF_FALSE;
+	}
+	/*all other cases: create a local bitmap in desired format*/
+	else {
+		if (no_copy) return GF_NOT_SUPPORTED;
+		GdipCreateBitmapFromScan0(_sten->width, _sten->height, 0, pFormat, NULL, &_sten->pBitmap);
+		ptr = pixels;
+		for (j=0; j<_sten->height; j++) {
+			for (i=0; i<_sten->width; i++) {
+				switch (pixelFormat) {
+				case GF_PIXEL_GREYSCALE:
+					r = *ptr++;
+					col = GF_COL_ARGB(255, r, r, r);
+					break;
+				case GF_PIXEL_ALPHAGREY:
+					r = *ptr++;
+					a = *ptr++;
+					col = GF_COL_ARGB(a, r, r, r);
+					break;
+				case GF_PIXEL_RGB_555:
+					val = * (unsigned short *) (ptr);
+					ptr+= 2;
+					col = COL_555(val);
+					break;
+				case GF_PIXEL_RGB_565:
+					val = * (unsigned short *) (ptr);
+					ptr+= 2;
+					col = COL_565(val);
+					break;
+				/*scan0 uses bgr...*/
+				case GF_PIXEL_BGR:
+				case GF_PIXEL_RGB:
+					r = *ptr++;
+					g = *ptr++;
+					b = *ptr++;
+					if (!isBGR) {
+						col = GF_COL_ARGB(255, b, g, r);
+					} else {
+						col = GF_COL_ARGB(255, r, g, b);
+					}
+					break;
+				/*NOTE: we assume little-endian only for GDIplus platforms, so BGRA/BGRX*/
+				case GF_PIXEL_RGBX:
+				case GF_PIXEL_ARGB:
+					b = *ptr++;
+					g = *ptr++;
+					r = *ptr++;
+					a = *ptr++;
+					if (pixelFormat==GF_PIXEL_RGBX) a = 0xFF;
+					col = GF_COL_ARGB(a, r, g, b);
+					break;
+				case GF_PIXEL_RGBA:
+					r = *ptr++;
+					g = *ptr++;
+					b = *ptr++;
+					a = *ptr++;
+					col = GF_COL_ARGB(a, r, g, b);
+					break;
+				default:
+					col = GF_COL_ARGB(255, 255, 255, 255);
+					break;
+				}
+				GdipBitmapSetPixel(_sten->pBitmap, i, j, col);
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+static
+GF_Err gdip_set_texture_repeat_mode(GF_STENCIL _this, GF_TextureTiling mode)
+{
+	GPSTEN();
+	_sten->tiling = mode;
+	return GF_OK;
+}
+
+static
+GF_Err gdip_set_sr_texture_filter(GF_STENCIL _this, GF_TextureFilter filter_mode)
+{
+	GPSTEN();
+	CHECK_RET(GF_STENCIL_TEXTURE);
+	_sten->tFilter = filter_mode;
+	return GF_OK;
+}
+
+
+static
+GF_Err gdip_set_color_matrix(GF_STENCIL _this, GF_ColorMatrix *cmat)
+{
+	GPSTEN();
+	if (!cmat || cmat->identity) {
+		_sten->texture_invalid = _sten->has_cmat;
+		_sten->has_cmat = GF_FALSE;
+	} else {
+		if (_sten->invert_br) {
+			GF_ColorMatrix fin, rev;
+			memcpy(&fin, cmat, sizeof(GF_ColorMatrix));
+			memset(&rev, 0, sizeof(GF_ColorMatrix));
+			rev.m[0] = 0;
+			rev.m[2] = 1;
+			rev.m[10] = 1;
+			rev.m[12] = 0;
+			rev.m[6] = rev.m[18] = 1;
+			gf_cmx_multiply(&fin, &rev);
+			cmat_gpac_to_gdip(&fin, &_sten->cmat);
+		} else {
+			cmat_gpac_to_gdip(cmat, &_sten->cmat);
+		}
+		_sten->has_cmat = GF_TRUE;
+	}
+	_sten->texture_invalid = GF_TRUE;
+	return GF_OK;
+}
+
+static
+GF_Err gdip_set_alpha(GF_STENCIL _this, u8 alpha)
+{
+	GPSTEN();
+	if (_sten->alpha != alpha) {
+		_sten->alpha = alpha;
+		_sten->texture_invalid = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+void gdip_convert_texture(struct _stencil *sten);
+
+static
+GF_Err gdip_get_pixel(GF_STENCIL _this, u32 x, u32 y, u32 *col)
+{
+	ARGB v;
+	GpStatus st;
+
+	GPSTEN();
+	if (!_sten->is_converted) gdip_convert_texture(_sten);
+	if (!_sten->pBitmap) return GF_BAD_PARAM;
+
+	st = GdipBitmapGetPixel(_sten->pBitmap, x, y, &v);
+
+	if (_sten->invert_br) {
+		*col = GF_COL_ARGB( ((v>>24)&0xFF), ((v)&0xFF), ((v>>8)&0xFF), ((v>>16)&0xFF) );
+	} else {
+		*col = v;
+	}
+	return GF_OK;
+}
+
+
+static
+GF_Err gdip_set_pixel(GF_STENCIL _this, u32 x, u32 y, u32 col)
+{
+	GpStatus st;
+	ARGB v;
+	GPSTEN();
+	if (!_sten->pBitmap) return GF_BAD_PARAM;
+	if (!_sten->is_converted) gdip_convert_texture(_sten);
+
+	if (_sten->invert_br) {
+		v = GF_COL_ARGB( ((col>>24)&0xFF), ((col)&0xFF), ((col>>8)&0xFF), ((col>>16)&0xFF) );
+	} else {
+		v = col;
+	}
+	st = GdipBitmapSetPixel(_sten->pBitmap, x, y, v);
+	return GF_OK;
+}
+
+#if 0
+static
+GF_Err gdip_get_texture(GF_STENCIL _this, unsigned char **pixels, u32 *width, u32 *height, u32 *stride, GF_PixelFormat *pixelFormat)
+{
+	GpRect rc;
+	BitmapData data;
+	GPSTEN();
+	if (!_sten->pBitmap) return GF_BAD_PARAM;
+
+	rc.X = rc.Y = 0;
+	rc.Width = _sten->width;
+	rc.Height = _sten->height;
+
+	GdipBitmapLockBits(_sten->pBitmap, &rc, ImageLockModeRead, _sten->format, &data);
+	*pixels = (unsigned char *) data.Scan0;
+	*width = data.Width;
+	*height = data.Height;
+	*stride = data.Stride;
+	switch (data.PixelFormat) {
+	case PixelFormat16bppRGB555:
+		*pixelFormat = GF_PIXEL_RGB_555;
+		break;
+	case PixelFormat16bppRGB565:
+		*pixelFormat = GF_PIXEL_RGB_565;
+		break;
+	case PixelFormat32bppRGB:
+		*pixelFormat = GF_PIXEL_RGB_32;
+		break;
+	case PixelFormat32bppARGB:
+		*pixelFormat = GF_PIXEL_ARGB;
+		break;
+	case PixelFormat24bppRGB:
+	default:
+		*pixelFormat = GF_PIXEL_RGB_24;
+		break;
+	}
+	return GF_OK;
+}
+#endif
+
+
+void gdip_texture_modified(GF_STENCIL _this)
+{
+	GPSTEN();
+	if (_sten->orig_buf && (_sten->format == PixelFormat32bppARGB)) {
+		gdip_set_texture(_this, (char *) _sten->orig_buf, _sten->width, _sten->height, _sten->width * 4, GF_PIXEL_RGBA, GF_PIXEL_RGBA, GF_FALSE);
+	}
+	_sten->texture_invalid = GF_TRUE;
+}
+
+void gdip_init_driver_texture(GF_Raster2D *driver)
+{
+	driver->stencil_set_texture = gdip_set_texture;
+	driver->stencil_set_tiling = gdip_set_texture_repeat_mode;
+	driver->stencil_set_filter = gdip_set_sr_texture_filter;
+	driver->stencil_set_color_matrix = gdip_set_color_matrix;
+	driver->stencil_set_alpha = gdip_set_alpha;
+	driver->stencil_texture_modified = gdip_texture_modified;
+}
+
+
+void gdip_convert_texture(struct _stencil *sten)
+{
+	u32 BPP, format;
+	GF_VideoSurface src, dst;
+
+	if (sten->orig_format == GF_PIXEL_YUV) {
+		BPP = 3;
+		dst.pixel_format = GF_PIXEL_BGR;
+		format = PixelFormat24bppRGB;
+	} else {
+		BPP = 4;
+		dst.pixel_format = GF_PIXEL_ARGB;
+		format = PixelFormat32bppARGB;
+	}
+	if (BPP*sten->width*sten->height > sten->conv_size) {
+		if (sten->conv_buf) gf_free(sten->conv_buf);
+		sten->conv_size = BPP*sten->width*sten->height;
+		sten->conv_buf = (unsigned char *) gf_malloc(sizeof(unsigned char)*sten->conv_size);
+	}
+
+	memset(&src, 0, sizeof(GF_VideoSurface));
+	src.height = sten->height;
+	src.width = sten->width;
+	src.pitch_x  =0;
+	src.pitch_y = sten->orig_stride;
+	src.pixel_format = sten->orig_format;
+	src.video_buffer = (char*)sten->orig_buf;
+
+	memset(&dst, 0, sizeof(GF_VideoSurface));
+	dst.width = sten->width;
+	dst.height = sten->height;
+	dst.pitch_x = 0;
+	dst.pitch_y = BPP*sten->width;
+	dst.video_buffer = (char*)sten->conv_buf;
+
+	gf_stretch_bits(&dst, &src, NULL, NULL, 0xFF, GF_FALSE, NULL, NULL);
+
+	if (sten->pBitmap) GdipDisposeImage(sten->pBitmap);
+	GdipCreateBitmapFromScan0(sten->width, sten->height, BPP*sten->width, format, sten->conv_buf, &sten->pBitmap);
+	sten->is_converted = GF_TRUE;
+}
+
+void gdip_load_texture(struct _stencil *sten)
+{
+	GpImageAttributes *attr;
+	ColorMatrix _cmat;
+
+	if (sten->texture_invalid && sten->pTexture) {
+		GdipDeleteBrush(sten->pTexture);
+		sten->pTexture = NULL;
+	}
+	/*nothing to do*/
+	if (sten->is_converted && sten->pTexture) return;
+	sten->texture_invalid = GF_FALSE;
+
+	/*convert*/
+	if (!sten->is_converted) gdip_convert_texture(sten);
+
+	GdipCreateImageAttributes(&attr);
+	if (sten->has_cmat) {
+		memcpy(_cmat.m, sten->cmat.m, sizeof(REAL)*5*5);
+	} else {
+		memset(_cmat.m, 0, sizeof(REAL)*5*5);
+		_cmat.m[0][0] = _cmat.m[1][1] = _cmat.m[2][2] = _cmat.m[3][3] = _cmat.m[4][4] = 1.0;
+		if (sten->invert_br) {
+			_cmat.m[0][0] = 0;
+			_cmat.m[0][2] = 1;
+			_cmat.m[2][2] = 0;
+			_cmat.m[2][0] = 1;
+		}
+	}
+
+	_cmat.m[3][3] *= ((REAL) sten->alpha) /255.0f;
+	GdipSetImageAttributesColorMatrix(attr, ColorAdjustTypeDefault, TRUE, &_cmat, NULL, ColorMatrixFlagsDefault);
+	if (sten->pTexture) GdipDeleteBrush(sten->pTexture);
+	GdipCreateTextureIAI(sten->pBitmap, attr, 0, 0, sten->width, sten->height, &sten->pTexture);
+
+	/*1- wrap mode is actually ignored in constructor*/
+	/*2- GDIPlus does not support S / T clamping */
+	GdipSetTextureWrapMode(sten->pTexture, WrapModeTile);
+
+	GdipDisposeImageAttributes(attr);
+}
+

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/fm_fake_pull.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/fm_fake_push.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/fm_mmbtools.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/hyb_in.c Added

@@ -0,0 +1,312 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  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 "hyb_in.h"
+
+/*register by hand existing masters*/
+extern GF_HYBMEDIA master_fm_mmbtools;
+extern GF_HYBMEDIA master_fm_fake_pull;
+extern GF_HYBMEDIA master_fm_fake_push;
+
+GF_HYBMEDIA* hyb_masters[] = {
+	&master_fm_fake_pull,
+	&master_fm_fake_push,
+#ifdef GPAC_CONFIG_ANDROID
+	&master_fm_mmbtools,
+#endif
+};
+
+typedef struct {
+	/*GPAC Service object (i.e. how this module is seen by the terminal)*/
+	GF_ClientService *service;
+
+	/*This Hybrid media architecture assumes there is a master media*/
+	GF_HYBMEDIA* master;
+
+} GF_HYB_In;
+
+
+static u32 HYB_RegisterMimeTypes(const GF_InputService *plug)
+{
+	if (!plug)
+		return 0;
+
+	return 1;
+}
+
+static Bool HYB_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	u32 i;
+	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
+
+	for (i=0; i<nb_masters; i++) {
+		if (hyb_masters[i]->CanHandleURL(url))
+			return 1;
+	}
+
+	return 0;
+}
+
+static GF_Err hybmedia_sanity_check(GF_HYBMEDIA *master)
+{
+	/*these checks need to be upgraded when the interface changes*/
+	if (master->data_mode != HYB_PUSH && master->data_mode != HYB_PULL)
+		return GF_BAD_PARAM;
+
+	if (!master->name) goto error_exit;
+	if (!master->CanHandleURL) goto error_exit;
+	if (!master->GetOD) goto error_exit;
+	if (!master->Connect) goto error_exit;
+	if (!master->Disconnect) goto error_exit;
+
+	if (master->data_mode == HYB_PUSH) {
+		if (!master->SetState) goto error_exit;
+	}
+
+	if (master->data_mode == HYB_PULL) {
+		if (!master->GetData) goto error_exit;
+		if (!master->ReleaseData) goto error_exit;
+	}
+
+	return GF_OK;
+
+error_exit:
+	return GF_SERVICE_ERROR;
+}
+
+static GF_Err HYB_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	u32 i;
+	GF_Err e = GF_OK;
+	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
+
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Connection request from service %p for %s\n", serv, url));
+
+	if (!hyb_in || !serv || !url) return GF_BAD_PARAM;
+	hyb_in->service = serv;
+
+	/*choose the master service*/
+	for (i=0; i<nb_masters; i++) {
+		if (hyb_masters[i]->CanHandleURL(url)) {
+			hyb_in->master = hyb_masters[i];
+			break;
+		}
+	}
+	assert(hyb_in->master);
+
+	/*sanity check about the master*/
+	e = hybmedia_sanity_check(hyb_in->master);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - object \"%s\" failed the sanity checks\n", hyb_in->master->name));
+		gf_service_connect_ack(hyb_in->service, NULL, e);
+		return e;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Selected master object \"%s\" for URL: %s\n", hyb_in->master->name, url));
+
+	/*connect the master*/
+	e = hyb_in->master->Connect(hyb_in->master, hyb_in->service, url);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot connect service, wrong URL %s\n", url));
+		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
+		return e;
+	}
+	gf_service_connect_ack(hyb_in->service, NULL, GF_OK);
+	gf_service_declare_media(hyb_in->service, (GF_Descriptor*)hyb_in->master->GetOD(), 0);
+
+	return GF_OK;
+}
+
+static GF_Err HYB_CloseService(GF_InputService *plug)
+{
+	GF_Err e;
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Close Service (%p) request from terminal\n", ((GF_HYB_In*)plug->priv)->service));
+
+	/*force to stop and disconnect the master*/
+	hyb_in->master->SetState(hyb_in->master, GF_NET_CHAN_STOP);
+	e = hyb_in->master->Disconnect(hyb_in->master);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot disconnect service %p\n", hyb_in->service));
+		gf_service_connect_ack(hyb_in->service, NULL, GF_BAD_PARAM);
+		return e;
+	}
+
+	gf_service_disconnect_ack(hyb_in->service, NULL, GF_OK);
+
+	return GF_OK;
+}
+
+static GF_Descriptor *HYB_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Service Description request from terminal for %s\n", sub_url));
+
+	return NULL;
+}
+
+static GF_Err HYB_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	GF_HYB_In *hyb_in;
+	GF_HYBMEDIA *master;
+
+	if (!plug || !plug->priv)
+		return GF_SERVICE_ERROR;
+
+	hyb_in = (GF_HYB_In*)plug->priv;
+	master = (GF_HYBMEDIA*)hyb_in->master;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Connection request from service %p for %s\n", channel, url));
+
+	master->channel = channel;
+	gf_service_connect_ack(hyb_in->service, channel, GF_OK);
+
+	return GF_OK;
+}
+
+static GF_Err HYB_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Disconnect Service (%p) request from terminal\n", hyb_in->service));
+
+	gf_service_disconnect_ack(hyb_in->service, channel, GF_OK);
+	hyb_in->master->channel = NULL;
+
+	return GF_OK;
+}
+
+static GF_Err HYB_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	switch (com->command_type) {
+	case GF_NET_CHAN_SET_SPEED:
+		/*not implemented for push mode*/
+		assert(hyb_in->master->data_mode == HYB_PULL);
+		return GF_OK;
+	case GF_NET_CHAN_INTERACTIVE:
+		return GF_NOT_SUPPORTED;
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 0;
+		return GF_OK;
+	case GF_NET_CHAN_DURATION:
+		com->duration.duration = 0;
+		return GF_OK;
+	case GF_NET_CHAN_PLAY:
+	case GF_NET_CHAN_STOP:
+	case GF_NET_CHAN_PAUSE:
+	case GF_NET_CHAN_RESUME:
+		if (hyb_in->master->data_mode == HYB_PUSH)
+			return hyb_in->master->SetState(hyb_in->master, com->command_type);
+		return GF_OK;
+	case GF_NET_CHAN_SET_PULL:
+		if (hyb_in->master->data_mode == HYB_PULL)
+			return GF_OK;
+		else
+			return GF_NOT_SUPPORTED; /*we're in push mode*/
+	}
+
+	return GF_OK;
+}
+
+static Bool HYB_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+	return 0;
+}
+
+static GF_Err HYB_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+	assert(hyb_in->master->data_mode == HYB_PULL && hyb_in->master->GetData && hyb_in->master->ReleaseData);
+
+	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
+	hyb_in->master->GetData(hyb_in->master, out_data_ptr, out_data_size, out_sl_hdr);
+	*sl_compressed = 0;
+	*out_reception_status = GF_OK;
+	*is_new_data = 1;
+	return GF_OK;
+}
+
+static GF_Err HYB_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
+	return GF_OK;
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_NET_CLIENT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	GF_HYB_In *hyb_in;
+	GF_InputService *plug;
+	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
+
+	GF_SAFEALLOC(plug, GF_InputService);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC HYBRID MEDIA Loader", "gpac distribution")
+	plug->RegisterMimeTypes=	HYB_RegisterMimeTypes;
+	plug->CanHandleURL=			HYB_CanHandleURL;
+	plug->ConnectService=		HYB_ConnectService;
+	plug->CloseService=			HYB_CloseService;
+	plug->GetServiceDescriptor=	HYB_GetServiceDesc;
+	plug->ConnectChannel=		HYB_ConnectChannel;
+	plug->DisconnectChannel=	HYB_DisconnectChannel;
+	plug->ServiceCommand=		HYB_ServiceCommand;
+	plug->CanHandleURLInService=HYB_CanHandleURLInService;
+	plug->ChannelGetSLP=		HYB_ChannelGetSLP;
+	plug->ChannelReleaseSLP=	HYB_ChannelReleaseSLP;
+
+	GF_SAFEALLOC(hyb_in, GF_HYB_In);
+	plug->priv = hyb_in;
+
+	return (GF_BaseInterface *)plug;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 1\n", ifce));
+	if (ifce->InterfaceType == GF_NET_CLIENT_INTERFACE) {
+		GF_InputService *plug = (GF_InputService*)ifce;
+		GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+		gf_free(hyb_in);
+		plug->priv = NULL;
+		gf_free(plug);
+		GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 2\n", ifce));
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( hyb_in )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/hyb_in/hyb_in.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/libplayer Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/libplayer/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/libplayer/libplayer.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/mse_in Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/mse_in/Makefile Added

@@ -0,0 +1,59 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/mse_in
+
+CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include" -Wall
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g -DDEBUG
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+#libsj specific flags
+ifeq ($(CONFIG_JS),no)
+else
+CFLAGS+=$(JS_FLAGS)
+ifeq ($(CONFIG_JS),local)
+NEED_LOCAL_LIB="yes"
+LOCAL_LIB+=-L../../extra_lib/lib/gcc
+endif
+ifeq ($(CONFIG_JS),prefix)
+NEED_LOCAL_LIB="yes"
+LOCAL_LIB+=-L$(prefix)/$(libdir)
+endif
+LINKLIBS+= $(JS_LIBS)
+endif
+
+#common obj
+OBJS=mse_in.o
+
+SRCS := $(OBJS:.o=.c)
+
+LIB=gm_mse_in$(DYN_LIB_SUFFIX)
+
+all: $(LIB)
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac $(LDFLAGS)
+ifeq ($(STATICBUILD),yes)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/gm_mse_in-static$(DYN_LIB_SUFFIX) $(OBJS) $(EXTRALIBS) -L../../bin/gcc -lgpac_static $(LDFLAGS)
+endif
+
+clean:
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/mse_in/mse_in.c Added

@@ -0,0 +1,389 @@
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato, Jean Le Feuvre
+ *          Copyright (c) Telecom ParisTech 2013-
+ *                  All rights reserved
+ *
+ *  This file is part of GPAC / Media Source input module
+ *
+ *  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/modules/service.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/html5_mse.h>
+
+#ifndef GPAC_DISABLE_MSE
+
+typedef struct __mse_module
+{
+	GF_HTML_MediaSource *mediasource;
+	GF_InputService *plug;
+} GF_MSE_In;
+
+/* The MSE plugin has no MIME type associated, it cannot handle basic media resources (it needs a blob)*/
+static u32 MSE_RegisterMimeTypes(const GF_InputService *plug)
+{
+	return 0;
+}
+
+/* Only Blob URL are supported */
+static Bool MSE_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	if (!plug || !url)
+		return GF_FALSE;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURL request from terminal for URL '%s'\n", url));
+	if (!strncmp(url, "blob:", 5)) {
+		return GF_TRUE;
+	} else {
+		return GF_FALSE;
+	}
+}
+
+/* Returns the source buffer associated with the terminal channel */
+static GF_HTML_SourceBuffer *MSE_GetSourceBufferForChannel(GF_HTML_MediaSource *mediasource, LPNETCHANNEL channel)
+{
+	GF_Channel *ch;
+	if (!channel || !mediasource) {
+		return NULL;
+	} else {
+		u32 i;
+		GF_InputService *parser;
+		ch = (GF_Channel *) channel;
+		assert(ch->odm && ch->odm->ID);
+#if FILTER_FIXME
+		parser = (GF_InputService *) ch->odm->OD->service_ifce;
+#else
+		parser=NULL;
+#endif
+		if (!parser) return NULL;
+		for (i = 0; i < gf_list_count(mediasource->sourceBuffers.list); i++) {
+			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(mediasource->sourceBuffers.list, i);
+			if (sb && sb->parser && sb->parser == parser) return sb;
+		}
+		return NULL;
+	}
+}
+
+/* For a given source buffer, returns the media track associated with the terminal channel object
+   Association is saved during the ConnectChannel operation */
+static GF_HTML_Track *MSE_GetTrackForChannel(GF_HTML_SourceBuffer *sb, LPNETCHANNEL channel)
+{
+	u32 i;
+	u32 count;
+	count = gf_list_count(sb->tracks);
+	for (i = 0; i < count; i++)
+	{
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+		if (track->channel == channel)
+		{
+			return track;
+		}
+	}
+	return NULL;
+}
+
+/* For a given source buffer, returns the media track associated with the given ESID
+   Association is saved when the initialisation segment has been parsed */
+static GF_HTML_Track *gf_mse_get_track_by_esid(GF_HTML_SourceBuffer *sb, u32 ESID)
+{
+	GF_HTML_Track *track;
+	u32 i;
+	u32 count;
+	count = gf_list_count(sb->tracks);
+	for (i=0; i<count; i++)
+	{
+		track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+		if (track->bin_id == ESID)
+		{
+			return track;
+		}
+	}
+	return NULL;
+}
+
+/* We connect the channel only if the sourcebuffer has been created,
+   and a track with the right ESID has been found in the init segment */
+static GF_Err MSE_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	u32 ESID;
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+	if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
+	if (strstr(url, "ES_ID")) {
+		GF_HTML_Track *track;
+		sscanf(url, "ES_ID=%u", &ESID);
+		track = gf_mse_get_track_by_esid(sb, ESID);
+		if (!track) {
+			return GF_BAD_PARAM;
+		} else {
+			track->channel = channel;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Channel Connection request on Service %p from terminal for URL '%s#%s'\n", channel, msein->mediasource->blobURI, url));
+			return sb->parser->ConnectChannel(sb->parser, channel, url, upstream);
+		}
+	} else {
+		return GF_BAD_PARAM;
+	}
+}
+
+static GF_Err MSE_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_HTML_Track *track;
+	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+	if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
+	track = MSE_GetTrackForChannel(sb, channel);
+	if (track) {
+		track->channel = NULL;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Disconnect channel request on Service %p from terminal for channel %p\n", msein->mediasource->service, channel));
+	return sb->parser->DisconnectChannel(sb->parser, channel);
+}
+
+/* Upon service connection, if the URL is a blobURL, we do the following:
+   - get the associated MediaSource object, mark it as used
+   - trigger a source event to the media node associated with the service */
+static GF_Err MSE_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Connection request on Service %p from terminal for URL '%s'\n", serv, url));
+	if (!msein|| !serv || !url) {
+		return GF_BAD_PARAM;
+	} else {
+		GF_HTML_MediaSource     *ms = NULL;
+
+		sscanf(url, "blob:%p", &ms);
+		msein->mediasource = ms;
+		ms->reference_count++;
+		ms->service = serv;
+		gf_mse_mediasource_open(ms, serv->owner->mo);
+		return GF_OK;
+	}
+}
+
+/* There is no service description (no MPEG-4 IOD) for this module, the associated scene will be generated dynamically */
+static GF_Descriptor *MSE_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Description request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, sub_url));
+	return NULL;
+}
+
+/* Indicate that the media source object is unused anymore */
+static GF_Err MSE_CloseService(GF_InputService *plug)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	assert( msein );
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Close Service request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+	if (msein->mediasource) {
+		gf_service_disconnect_ack(msein->mediasource->service, NULL, GF_OK);
+		gf_mse_mediasource_del(msein->mediasource, GF_FALSE);
+		msein->mediasource = NULL;
+	}
+	return GF_OK;
+}
+
+/* Forward all the commands received from the the terminal
+   to the parser associated with the channel on which the command is received */
+static GF_Err MSE_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_HTML_SourceBuffer *sb = NULL;
+
+	if (!plug || !plug->priv || !com ) return GF_SERVICE_ERROR;
+
+	/* channel independant commands */
+	switch (com->command_type) {
+	case GF_NET_SERVICE_INFO:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Info command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_NOT_SUPPORTED;
+	case GF_NET_SERVICE_HAS_AUDIO:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received HasAudio command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_OK;
+	case GF_NET_SERVICE_QUALITY_SWITCH:
+		return GF_NOT_SUPPORTED;
+	default:
+		break;
+	}
+
+	if (!com->base.on_channel) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received unknown command %d from terminal on Service %p for URL '%s'\n", com->command_type, msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_NOT_SUPPORTED;
+	}
+	sb = MSE_GetSourceBufferForChannel(msein->mediasource, com->base.on_channel);
+	if (!sb || !sb->parser) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] SourceBuffer not ready on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_NOT_SUPPORTED;
+	}
+
+	switch (com->command_type) {
+	case GF_NET_CHAN_PLAY:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_STOP:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_PAUSE:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_RESUME:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_SET_SPEED:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_CONFIG:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_DURATION:
+		/* Ignore the duration given by the input service and
+		   Note: the duration of the initial segment will be 0 anyway (in MP4).*/
+		com->duration.duration = 0;
+		return GF_OK;
+
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 0;
+		return GF_OK;
+
+	case GF_NET_CHAN_BUFFER_QUERY:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_GET_DSI:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_SET_PADDING:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_SET_PULL:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	case GF_NET_CHAN_INTERACTIVE:
+		/* we are interactive */
+		return GF_OK;
+
+	case GF_NET_CHAN_GET_PIXEL_AR:
+		return sb->parser->ServiceCommand(sb->parser, com);
+
+	default:
+		return sb->parser->ServiceCommand(sb->parser, com);
+	}
+}
+
+/* Forward the request for a new packet to the track (ask the parser to parse a new buffer or use already parsed AU) */
+static GF_Err MSE_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size,
+                                GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+	GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
+	if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
+	gf_mse_track_buffer_get_next_packet(track, out_data_ptr, out_data_size, out_sl_hdr, sl_compressed, out_reception_status, is_new_data);
+	return GF_OK;
+}
+
+/* Indicate to the track that a packet can be released (and potentially deleted) */
+static GF_Err MSE_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+	GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
+	if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
+	gf_mse_track_buffer_release_packet(track);
+	return GF_OK;
+}
+
+/* This module can only handle one blobURL at a time */
+static Bool MSE_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+	GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURLInService request on service %p from terminal for URL '%s'\n", msein->mediasource->service, url));
+	if (!plug || !plug->priv) return GF_FALSE;
+	if (!strcmp(url, msein->mediasource->blobURI)) {
+		return GF_TRUE;
+	} else {
+		return GF_FALSE;
+	}
+}
+
+#endif //GPAC_DISABLE_MSE
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#ifndef GPAC_DISABLE_MSE
+		GF_NET_CLIENT_INTERFACE,
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+#ifdef GPAC_DISABLE_MSE
+	return NULL;
+#else
+	GF_MSE_In *msein;
+	GF_InputService *plug;
+	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
+
+	GF_SAFEALLOC(plug, GF_InputService);
+	if (!plug) return NULL;
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC MSE Loader", "gpac distribution")
+
+	GF_SAFEALLOC(msein, GF_MSE_In);
+	if (!msein) {
+		gf_free(plug);
+		return NULL;
+	}
+
+	plug->RegisterMimeTypes = MSE_RegisterMimeTypes;
+	plug->CanHandleURL = MSE_CanHandleURL;
+	plug->ConnectService = MSE_ConnectService;
+	plug->CloseService = MSE_CloseService;
+	plug->GetServiceDescriptor = MSE_GetServiceDesc;
+	plug->ConnectChannel = MSE_ConnectChannel;
+	plug->DisconnectChannel = MSE_DisconnectChannel;
+	plug->ServiceCommand = MSE_ServiceCommand;
+	plug->CanHandleURLInService = MSE_CanHandleURLInService;
+	plug->ChannelGetSLP = MSE_ChannelGetSLP;
+	plug->ChannelReleaseSLP = MSE_ChannelReleaseSLP;
+
+	plug->priv = msein;
+	msein->plug = plug;
+	return (GF_BaseInterface *)plug;
+#endif
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *bi)
+{
+#ifndef GPAC_DISABLE_MSE
+	GF_MSE_In *msein;
+
+	if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
+
+	msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
+	assert(msein);
+	gf_free(msein);
+	gf_free(bi);
+#endif
+}
+
+GPAC_MODULE_STATIC_DECLARATION( mse_in )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/netctrl Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/netctrl/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/netctrl/netctrl.c Added

@@ -0,0 +1,212 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Sampe On-Scvreen Display 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/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/network.h>
+
+#define XMIN 160
+#define XMAX 480
+
+#define YMAX 360
+#define YMIN 120
+
+typedef struct
+{
+	GF_Terminal *term;
+	GF_Socket *sock;
+	Bool mouse_down;
+	u32 cnt;
+	Float last_min_x, last_max_x, last_min_y, last_max_y;
+} GF_NetControl;
+
+static Bool netctrl_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *sOpt, *server_ip;
+	int port;
+	Float face_min_x, face_max_x, face_min_y, face_max_y, gaze_x, gaze_y;
+	GF_Event event;
+	GF_NetControl *netctrl = termext->udta;
+	char message[1024];
+	GF_Err e;
+	u32 bytes;
+	u32 face = 0;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		netctrl->term = (GF_Terminal *) param;
+
+		sOpt = gf_opts_get_key("NetControler", "Enabled");
+		if (!sOpt || strcmp(sOpt, "yes")) return 0;
+		sOpt = gf_opts_get_key("NetControler", "ServerIP");
+		if (sOpt) server_ip = sOpt;
+		else server_ip = "127.0.0.1";
+		sOpt = gf_opts_get_key("NetControler", "Port");
+		if (sOpt) port = atoi(sOpt);
+		else port = 20320;
+
+		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+		netctrl->sock = gf_sk_new(GF_SOCK_TYPE_UDP);
+
+		if (netctrl->sock < 0)   {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to open socket for %s:%d\n", server_ip, port));
+			return 0;
+		}
+
+		e = gf_sk_bind(netctrl->sock, server_ip, port, NULL, 0, 0);
+		if (e != GF_OK) {
+			if (netctrl->sock) gf_sk_del(netctrl->sock);
+			netctrl->sock = NULL;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[NetControl] Failed to bind to socket %s:%d\n", server_ip, port));
+			return 0;
+		}
+
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		if (netctrl->sock) gf_sk_del(netctrl->sock);
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+		gf_sk_receive(netctrl->sock, message, 1024, 0, &bytes);
+		if (!bytes) break;
+		message[bytes] = '\0';
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[NetControl] received message %s\n", message));
+
+		if (!strncmp(message, "gpac splice ", 12) || !strncmp(message, "gpac add ", 9)
+			|| !strncmp(message, "gpac select ", 12)
+		) {
+			gf_term_scene_update(netctrl->term, NULL, message);
+			break;
+		}
+
+		if (strncmp(message, "gpac:face=", 10)) break;
+
+		sscanf(message, "gpac:face=%d,%f,%f,%f,%f", &face, &face_min_x, &face_max_x, &face_min_y, &face_max_y);
+
+
+		memset(&event, 0, sizeof(GF_Event));
+		event.mouse.button = GF_MOUSE_LEFT;
+		if (face == 0) {
+			if (netctrl->last_min_x < 0.01) {
+				netctrl->term->compositor->auto_rotate = 2;
+			} else if (netctrl->last_max_x > 0.90) {
+				netctrl->term->compositor->auto_rotate = 1;
+			} else if (netctrl->last_min_y < 0.01) {
+				netctrl->term->compositor->auto_rotate = 4;
+			} else if (netctrl->last_max_y > 0.90) {
+				netctrl->term->compositor->auto_rotate = 3;
+			} else {
+				netctrl->cnt++;
+				if ((netctrl->cnt>=50) && (netctrl->mouse_down)) {
+					netctrl->term->compositor->auto_rotate = 0;
+					netctrl->mouse_down = GF_FALSE;
+					event.type = GF_EVENT_MOUSEUP;
+					netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+				}
+			}
+			break;
+		}
+
+		netctrl->last_min_x = face_min_x;
+		netctrl->last_max_x = face_max_x;
+		netctrl->last_min_y = face_min_y;
+		netctrl->last_max_y = face_max_y;
+
+		gaze_x = (face_min_x+face_max_x)/2;
+		gaze_y = (face_min_y+face_max_y)/2;
+
+		event.mouse.x = (1-gaze_x) * netctrl->term->compositor->display_width;
+		event.mouse.y = (1-gaze_y) * netctrl->term->compositor->display_height;
+
+		if (!netctrl->mouse_down) {
+			//don't grab if mouse is down
+			if (netctrl->term->compositor->navigation_state) break;
+			netctrl->mouse_down = GF_TRUE;
+			event.type = GF_EVENT_MOUSEDOWN;
+			netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+			netctrl->cnt = 0;
+		}
+		event.type = GF_EVENT_MOUSEMOVE;
+		netctrl->term->compositor->video_out->on_event(netctrl->term->compositor->video_out->evt_cbk_hdl, &event);
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *netctrl_new()
+{
+	GF_TermExt *dr;
+	GF_NetControl *netctrl;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC NetControl", "gpac distribution");
+
+	GF_SAFEALLOC(netctrl, GF_NetControl);
+	dr->process = netctrl_process;
+	dr->udta = netctrl;
+	return dr;
+}
+
+
+void netctrl_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_NetControl *netctrl = dr->udta;
+	gf_free(netctrl);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)netctrl_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		netctrl_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( netctrl )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/opencv_is Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/opencv_is/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/opencv_is/demo-sensor.bt Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/opencv_is/haarcascade_frontalface_default.xml Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/opencv_is/opencv_is.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/osd Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/osd/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/osd/osd.c Added

@@ -0,0 +1,306 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Sampe On-Scvreen Display 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/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+
+
+typedef struct
+{
+	GF_ObjectManager *odm;
+	GF_Terminal *term;
+	GF_TermEventFilter evt_filter;
+
+	/*some of our nodes*/
+	M_Switch *visible;
+	M_Transform2D *transform;
+	M_CompositeTexture2D *ct2d;
+	M_Text *text;
+
+	char statBuffer[100];
+	u32 refresh_time_ms;
+	GF_SystemRTInfo rti;
+} GF_OSD;
+
+#if 0
+static GFINLINE GF_Node *create_node(GF_OSD *osd, u32 tag, GF_Node *par)
+{
+	GF_Node *n = gf_node_new(osd->odm->subscene->graph, tag);
+	if (n) {
+		gf_node_init(n);
+		if (par) {
+			gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n);
+			gf_node_register(n, par);
+		}
+	}
+	return n;
+}
+#endif
+
+const char *osd_scene_graph = "\
+EXTERNPROTO Untransform [\
+    exposedField MFNode children []\
+]\
+[ \"urn:inet:gpac:builtin:Untransform\"]\
+OrderedGroup {\
+ children [\
+  Untransform {\
+   children [\
+  DEF N1 Switch {\
+   whichChoice 0\
+   choice [\
+    DEF N2 Transform2D {\
+     children [\
+      Shape {\
+       appearance Appearance {\
+        material Material2D {\
+         transparency 0\
+         filled TRUE\
+        }\
+        texture DEF N3 CompositeTexture2D {\
+         pixelWidth 256\
+         pixelHeight 16\
+         children [\
+          Background2D {backColor 0.6 0.6 0.6}\
+          Shape {\
+           appearance Appearance {\
+            material Material2D {\
+             emissiveColor 0 0 0\
+             filled TRUE\
+            }\
+           }\
+           geometry DEF N4 Text {\
+            string [\"My Sample Text !\"]\
+            fontStyle FontStyle {\
+             size 12\
+             justify [\"MIDDLE\", \"MIDDLE\"]\
+             family [\"SANS\"]\
+            }\
+           }\
+          }\
+         ]\
+        }\
+       }\
+       geometry Bitmap {}\
+      }\
+     ]\
+    }\
+   ]\
+  }\
+   ]\
+  }\
+ ]\
+}\
+";
+
+void osd_on_resize(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
+{
+	GF_DOMHandler *the_hdl = (GF_DOMHandler *) hdl;
+	GF_OSD *osd = the_hdl->evt_listen_obj;
+
+	if (osd->ct2d) {
+		//osd->ct2d->pixelWidth = FIX2INT(event->screen_rect.width);
+		gf_node_dirty_set((GF_Node *) osd->ct2d, GF_SG_NODE_DIRTY, 1);
+
+		if (osd->transform) {
+			osd->transform->translation.y = INT2FIX( (FIX2INT(event->screen_rect.height) - osd->ct2d->pixelHeight) / 2 ) ;
+			gf_node_dirty_set((GF_Node *) osd->transform, GF_SG_NODE_DIRTY, 1);
+		}
+	}
+}
+
+Bool osd_load_scene(GF_OSD *osd)
+{
+	GF_Node *n;
+	GF_List *nodes;
+	const char *opt;
+	GF_DOMHandler *hdl;
+	/*BT/VRML from string*/
+	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, const char *node_str, Bool force_wrl);
+
+	/*create a new scene*/
+	osd->odm = gf_odm_new();
+	osd->odm->term = osd->term;
+	osd->odm->subscene = gf_scene_new(NULL);
+	osd->odm->subscene->root_od = osd->odm;
+	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
+
+	/*create a scene graph*/
+	nodes = gf_sm_load_bt_from_string(osd->odm->subscene->graph, osd_scene_graph, 0);
+	n = gf_list_get(nodes, 0);
+	gf_list_del(nodes);
+
+	if (!n) return 0;
+
+	gf_sg_set_root_node(osd->odm->subscene->graph, n);
+	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
+
+	hdl = gf_dom_listener_build(n, GF_EVENT_RESIZE, 0);
+	hdl->handle_event = osd_on_resize;
+	hdl->evt_listen_obj = osd;
+
+	osd->visible = (M_Switch *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N1");
+	osd->transform = (M_Transform2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N2");
+	osd->ct2d = (M_CompositeTexture2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N3");
+	osd->text = (M_Text *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N4");
+	if (osd->text->string.vals[0]) {
+		gf_free(osd->text->string.vals[0]);
+		osd->text->string.vals[0] = NULL;
+	}
+	strcpy(osd->statBuffer, "Hello World !");
+	osd->text->string.vals[0] = osd->statBuffer;
+
+	opt = gf_opts_get_key("OSD", "Visible");
+	if (!opt || strcmp(opt, "yes")) osd->visible->whichChoice = -1;
+
+
+	return 1;
+}
+
+
+Bool osd_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_OSD* osd = (GF_OSD*)udta;
+	switch (event->type) {
+	case GF_EVENT_SCENE_SIZE:
+		gf_sg_set_scene_size_info(osd->odm->subscene->graph, event->size.width, event->size.height, 1);
+		break;
+	case GF_EVENT_KEYUP:
+		if ( (event->key.key_code == GF_KEY_I) && (event->key.flags & GF_KEY_MOD_CTRL)) {
+			if (osd->visible->whichChoice==0) {
+				osd->visible->whichChoice = -1;
+				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "no");
+			} else {
+				osd->visible->whichChoice = 0;
+				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "yes");
+			}
+			gf_node_dirty_set((GF_Node *) osd->visible, GF_SG_NODE_DIRTY, 1);
+		}
+		break;
+	}
+	return 0;
+}
+static Bool osd_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_OSD *osd = termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		osd->term = (GF_Terminal *) param;
+		opt = gf_opts_get_key("OSD", "Enabled");
+		if (!opt || strcmp(opt, "yes")) return 0;
+
+		/*load scene*/
+		if (! osd_load_scene(osd)) return 0;
+		/*attach scene to compositor*/
+		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 0);
+
+
+		/*we are not threaded*/
+		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+
+		osd->refresh_time_ms = 500;
+		osd->evt_filter.on_event = osd_on_event_play;
+		osd->evt_filter.udta = osd;
+		gf_term_add_event_filter(osd->term, &osd->evt_filter);
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		osd->text->string.vals[0] = NULL;
+		/*remove scene to compositor*/
+		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 1);
+		gf_odm_disconnect(osd->odm, 1);
+		osd->odm = NULL;
+
+		gf_term_remove_event_filter(osd->term, &osd->evt_filter);
+		osd->term = NULL;
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+		/*flush all events until current time if reached*/
+		if ((osd->visible->whichChoice==0) && gf_sys_get_rti(osd->refresh_time_ms, &osd->rti, 0)) {
+			sprintf(osd->statBuffer, "CPU %02d - FPS %02.2f - MEM "LLU" KB", osd->rti.process_cpu_usage, gf_sc_get_fps(osd->term->compositor, 0), osd->rti.process_memory/1000);
+			gf_node_dirty_set((GF_Node *) osd->text, GF_SG_NODE_DIRTY, 1);
+		}
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *osd_new()
+{
+	GF_TermExt *dr;
+	GF_OSD *osd;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC OnScreen Display", "gpac distribution");
+
+	GF_SAFEALLOC(osd, GF_OSD);
+	dr->process = osd_process;
+	dr->udta = osd;
+	return dr;
+}
+
+
+void osd_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_OSD *osd = dr->udta;
+	gf_free(osd);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)osd_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		osd_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( osd )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACFileMediaServer.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACFileMediaServer.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACMediaController.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACMediaController.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACMediaRenderer.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACMediaRenderer.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACPlatinum.cpp Added

@@ -0,0 +1,1740 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2009-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Platinum UPnP module
+ *
+ *  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.
+ *
+ *
+ *	----------------------------------------------------------------------------------
+ *		PLATINUM IS LICENSED UNDER GPL or commercial agreement - cf platinum license
+ *	----------------------------------------------------------------------------------
+ *
+ */
+
+//declaration of export functions is done first due to a linker bug on OSX ...
+#include <gpac/modules/term_ext.h>
+
+GF_TermExt *upnp_new();
+void upnp_delete(GF_BaseInterface *ifce);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)upnp_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		upnp_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( platinum )
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#include "GPACPlatinum.h"
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
+#  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
+# elif defined (WIN32)
+#  pragma comment(lib, "js")
+# endif
+#endif
+
+#endif
+
+GF_UPnP::GF_UPnP()
+{
+	m_pTerm = NULL;
+	m_pPlatinum = NULL;
+	m_pMediaRenderer = NULL;
+	m_pMediaServer = NULL;
+	m_pAVCtrlPoint = NULL;
+	m_renderer_bound = GF_FALSE;
+	m_pGenericController = NULL;
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	m_Devices = NULL;
+	m_pJSCtx = NULL;
+	m_nbJSInstances=0;
+	last_time = 0;
+#endif
+}
+
+GF_UPnP::~GF_UPnP()
+{
+#ifdef GPAC_HAS_SPIDERMONKEY
+	if (m_Devices) gf_list_del(m_Devices);
+#endif
+}
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+void GF_UPnP::LockJavascript(Bool do_lock)
+{
+	gf_sg_lock_javascript(m_pJSCtx, do_lock);
+}
+#endif
+
+void GF_UPnP::OnStop(const char *src_url)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaStop", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[1];
+			argv[0] = GetUPnPDevice(src_url);
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	} else {
+//		gf_term_disconnect(m_pTerm);
+		gf_term_play_from_time(m_pTerm, 0, 1);
+	}
+}
+
+NPT_String GF_UPnP::OnMigrate()
+{
+	NPT_String res = "";
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return res;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMigrate", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 0, NULL, &rval);
+			if (JSVAL_IS_STRING(rval)) {
+				char *_res = SMJS_CHARS(m_pJSCtx, rval);
+				res = _res;
+				SMJS_FREE(m_pJSCtx, _res);
+			}
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	} else {
+		GF_NetworkCommand com;
+
+		memset(&com, 0, sizeof(GF_NetworkCommand));
+		com.base.command_type = GF_NET_SERVICE_MIGRATION_INFO;
+		m_pTerm->root_scene->root_od->net_service->ifce->ServiceCommand(m_pTerm->root_scene->root_od->net_service->ifce, &com);
+		if (com.migrate.data) {
+			res = com.migrate.data;
+		} else {
+			res = m_pTerm->root_scene->root_od->net_service->url;
+		}
+	}
+	return res;
+}
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+jsval GF_UPnP::GetUPnPDevice(const char *src_url)
+{
+	return src_url ? STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, src_url ) ) : JSVAL_NULL;
+}
+#endif
+
+void GF_UPnP::OnConnect(const char *url, const char *src_url)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaConnect", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[2];
+			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, url ) );
+			argv[1] = GetUPnPDevice(src_url);
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	} else {
+		gf_term_navigate_to(m_pTerm, url);
+	}
+}
+void GF_UPnP::OnPause(Bool do_resume, const char *src_url)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, do_resume ? "onMediaPlay" : "onMediaPause", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[1];
+			argv[0] = GetUPnPDevice(src_url);
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 1, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	} else {
+		gf_term_set_option(m_pTerm, GF_OPT_PLAY_STATE, do_resume ? GF_STATE_PLAYING : GF_STATE_PAUSED);
+	}
+}
+
+void GF_UPnP::OnSeek(Double time)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaSeek", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[1];
+			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	} else {
+		/* CanSeek and Duration set for each media by event_proc */
+		if (!m_pTerm->root_scene || (m_pTerm->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL)
+		        || (m_pTerm->root_scene->duration<2000)
+		   ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] Scene not seekable\n"));
+		} else {
+			gf_term_play_from_time(m_pTerm, (u64) (time * 1000), 0);
+		}
+	}
+}
+
+void GF_UPnP::ContainerChanged(PLT_DeviceDataReference& device, const char *item_id, const char *update_id)
+{
+}
+
+void GF_UPnP::onTimeChanged(s32 renderer_idx, Double time)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaTimeChanged", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[2];
+			argv[0] = INT_TO_JSVAL( renderer_idx);
+			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, time) );
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	}
+}
+
+void GF_UPnP::onDurationChanged(s32 renderer_idx, Double dur)
+{
+	if (m_renderer_bound) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		jsval funval, rval;
+		if (!m_pJSCtx) return;
+		LockJavascript(GF_TRUE);
+		JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaDurationChanged", &funval);
+		if (JSVAL_IS_OBJECT(funval)) {
+			jsval argv[2];
+			argv[0] = INT_TO_JSVAL( renderer_idx);
+			argv[1] = DOUBLE_TO_JSVAL( JS_NewDouble(m_pJSCtx, dur) );
+			JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 2, argv, &rval);
+		}
+		LockJavascript(GF_FALSE);
+#endif
+	}
+}
+
+
+Bool GF_UPnP::ProcessEvent(GF_Event *evt)
+{
+	if (!m_pMediaRenderer) return GF_FALSE;
+	switch (evt->type) {
+	case GF_EVENT_CONNECT:
+		if (evt->connect.is_connected) {
+			const char *url = gf_term_get_url(m_pTerm);
+			if (url) {
+				m_pMediaRenderer->SetConnected(url);
+			}
+		}
+		break;
+
+	case GF_EVENT_DURATION:
+		m_pMediaRenderer->SetDuration(evt->duration.duration, evt->duration.can_seek);
+	case GF_EVENT_METADATA:
+		if (m_pTerm->root_scene) {
+			char szName[1024];
+			NetInfoCommand com;
+			memset(&com, 0, sizeof(NetInfoCommand));
+
+			/*get any service info*/
+			if (gf_term_get_service_info(m_pTerm, m_pTerm->root_scene->root_od, &com) == GF_OK) {
+				strcpy(szName, "");
+				if (com.name) {
+					strcat(szName, com.name);
+					strcat(szName, " ");
+				}
+				if (com.album) {
+					strcat(szName, "(");
+					strcat(szName, com.album);
+					strcat(szName, ")");
+				}
+
+				/*const char *artist = "Unknown";
+				if (com.artist) artist = com.artist;
+				else if (com.writer) artist = com.writer;
+				else if (com.composer) artist = com.composer;
+
+				MRSetMediaInfo(0, szName, com.artist ? com.artist : "Unknown");*/
+			}
+		}
+		break;
+	}
+	return GF_FALSE;
+}
+
+Bool upnp_on_term_event(void *udta, GF_Event *evt, Bool consumed)
+{
+	GF_UPnP *upnp = (GF_UPnP *) udta;
+	if (!consumed && upnp) return upnp->ProcessEvent(evt);
+	return GF_FALSE;
+}
+
+void GF_UPnP::Load(GF_Terminal *term)
+{
+	u16 port = 0;
+	Bool save_uuids=GF_FALSE;
+	Bool ignore_local_devices=GF_FALSE;
+	const char *uuid, *opt, *name;
+	char hostname[100], friendly_name[1024];
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[UPnP] Starting UPnP\n"));
+
+	m_pCtrlPoint = NULL;
+	m_pTerm = term;
+
+	m_pPlatinum = new PLT_UPnP();
+	m_pPlatinum->SetIgnoreLocalUUIDs(false);
+
+	gf_sk_get_host_name((char*)hostname);
+
+	opt = gf_opts_get_key("UPnP", "AllowedDevicesIP");
+	if (!opt) {
+		gf_cfg_set_key(m_pTerm->user->config, "UPnP", "AllowedDevicesIP", "");
+		opt="";
+	}
+	m_IPFilter = opt;
+
+	opt = gf_opts_get_key("UPnP", "IgnoreCreatedDevices");
+	if (!opt || !strcmp(opt, "yes")) {
+		ignore_local_devices = GF_TRUE;
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
+	}
+
+
+
+	opt = gf_opts_get_key("UPnP", "IgnoreCreatedDevices");
+	if (!opt || !strcmp(opt, "yes")) {
+		ignore_local_devices = GF_TRUE;
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "IgnoreCreatedDevices", "yes");
+	}
+
+
+	opt = gf_opts_get_key("UPnP", "SaveUUIDs");
+	if (opt && !strcmp(opt, "yes")) save_uuids = GF_TRUE;
+
+	opt = gf_opts_get_key("UPnP", "MediaRendererEnabled");
+	if (!opt || !strcmp(opt, "yes")) {
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaRendererEnabled", "yes");
+
+		name = gf_opts_get_key("UPnP", "MediaRendererName");
+		if (!name) {
+			sprintf(friendly_name, "GPAC @ %s", hostname);
+			name = friendly_name;
+		}
+
+		port = 0;
+		opt = gf_opts_get_key("UPnP", "MediaRendererPort");
+		if (opt) port = atoi(opt);
+
+		uuid = gf_opts_get_key("UPnP", "MediaRendererUUID");
+		if (uuid) {
+			m_pMediaRenderer = new GPAC_MediaRenderer(this, name, false, uuid, port);
+		} else {
+			m_pMediaRenderer = new GPAC_MediaRenderer(this, name, false, NULL, port);
+			if (save_uuids) {
+				uuid = m_pMediaRenderer->GetUUID();
+				gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaRendererUUID", uuid);
+			}
+		}
+
+		PLT_DeviceHostReference device(m_pMediaRenderer );
+		device->m_ModelDescription = "GPAC Media Renderer";
+		device->m_ModelURL = "http://gpac.io";
+		device->m_ModelNumber = gf_gpac_version();
+		device->m_ModelName = "GPAC Media Renderer";
+		device->m_Manufacturer = "Telecom ParisTech";
+		device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
+		m_pPlatinum->AddDevice(device);
+	}
+
+	opt = gf_opts_get_key("UPnP", "MediaServerEnabled");
+	if (!opt || !strcmp(opt, "yes")) {
+		char *media_root;
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerEnabled", "yes");
+
+		name = gf_opts_get_key("UPnP", "MediaServerName");
+		if (!name) {
+			sprintf(friendly_name, "GPAC @ %s", hostname);
+			name = friendly_name;
+		}
+
+		port = 0;
+		opt = gf_opts_get_key("UPnP", "MediaServerPort");
+		if (opt) port = atoi(opt);
+
+		uuid = gf_opts_get_key("UPnP", "MediaServerUUID");
+		if (uuid) {
+			m_pMediaServer = new GPAC_FileMediaServer(name, false, uuid, port);
+		} else {
+			m_pMediaServer = new GPAC_FileMediaServer(name, false, NULL, port);
+			if (save_uuids) {
+				uuid = m_pMediaServer->GetUUID();
+				gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerUUID", uuid);
+			}
+		}
+		media_root = (char *) gf_opts_get_key("UPnP", "MediaServerRoot");
+		if (!media_root) {
+			gf_cfg_set_key(m_pTerm->user->config, "UPnP", "MediaServerRoot", "all:/");
+			m_pMediaServer->AddSharedDirectory("/", "all");
+		} else {
+			while (media_root) {
+				Bool is_hidden = GF_FALSE;
+				char *sep1 = (char *)strchr(media_root, ':');
+				if (!sep1) break;
+				char *sep2 = (char *)strchr(sep1, ';');
+
+				if (!strncmp(media_root, "(h)", 3)) {
+					media_root+=3;
+					is_hidden = GF_TRUE;
+				}
+				sep1[0] = 0;
+				if (sep2) sep2[0] = 0;
+				m_pMediaServer->AddSharedDirectory(sep1+1, media_root, is_hidden);
+				sep1[0] = ':';
+				if (sep2) sep2[0] = ';';
+				else break;
+				media_root = sep2+1;
+			}
+		}
+		PLT_DeviceHostReference device(m_pMediaServer);
+		device->m_ModelDescription = "GPAC Media Server";
+		device->m_ModelURL = "http://gpac.io";
+		device->m_ModelNumber = gf_gpac_version();
+		device->m_ModelName = "GPAC Media Server";
+		device->m_Manufacturer = "Telecom ParisTech";
+		device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
+		m_pPlatinum->AddDevice(device);
+	}
+
+	opt = gf_opts_get_key("UPnP", "GenericControllerEnabled");
+	if (!opt || !strcmp(opt, "yes")) {
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "GenericControllerEnabled", "yes");
+		/*create our generic control point*/
+		if (!m_pCtrlPoint) {
+			m_pCtrlPoint = new PLT_CtrlPoint();
+			m_ctrlPtRef = PLT_CtrlPointReference(m_pCtrlPoint);
+		}
+		m_pGenericController = new GPAC_GenericController(m_ctrlPtRef, this);
+	}
+
+	opt = gf_opts_get_key("UPnP", "AVCPEnabled");
+	if (!opt || !strcmp(opt, "yes")) {
+		if (!opt) gf_cfg_set_key(m_pTerm->user->config, "UPnP", "AVCPEnabled", "yes");
+
+		if (!m_pCtrlPoint) {
+			m_pCtrlPoint = new PLT_CtrlPoint();
+			m_ctrlPtRef = PLT_CtrlPointReference(m_pCtrlPoint);
+		}
+		m_pAVCtrlPoint = new GPAC_MediaController(m_ctrlPtRef, this);
+	}
+
+	// add control point to upnp engine
+	if (m_pCtrlPoint) {
+		if (ignore_local_devices) {
+			if (m_pMediaServer) m_pCtrlPoint->IgnoreUUID(m_pMediaServer->GetUUID());
+			if (m_pMediaRenderer) m_pCtrlPoint->IgnoreUUID(m_pMediaRenderer->GetUUID());
+		}
+		m_pPlatinum->AddCtrlPoint(m_ctrlPtRef);
+	}
+
+
+
+	gf_term_add_event_filter(term, &evt_filter);
+
+	//start UPnP engine
+	m_pPlatinum->Start();
+
+	/*if we have a control point, force a rescan of the network servcies*/
+	if (m_pCtrlPoint) {
+		m_pCtrlPoint->Search();
+	}
+}
+
+void GF_UPnP::Unload()
+{
+	m_pPlatinum->Stop();
+	if (m_pGenericController) delete m_pGenericController;
+	if (m_pAVCtrlPoint) delete m_pAVCtrlPoint;
+	/*this will delete all UPnP devices*/
+	delete m_pPlatinum;
+
+	/*final cleanup of UPnP lib*/
+	NPT_AutomaticCleaner::Shutdown();
+}
+
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+void GF_UPnP::OnMediaRendererAdd(PLT_DeviceDataReference& device, int added)
+{
+	jsval funval, rval;
+	if (!m_pJSCtx) return;
+
+	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
+
+	LockJavascript(GF_TRUE);
+
+	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaRendererAdd", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		jsval argv[3];
+		argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetFriendlyName() ) );
+		argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetUUID() ) );
+		argv[2] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
+
+		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
+	}
+	LockJavascript(GF_FALSE);
+}
+
+
+void GF_UPnP::OnMediaServerAdd(PLT_DeviceDataReference& device, int added)
+{
+	jsval funval, rval;
+	if (!m_pJSCtx) return;
+
+	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)device->GetURLBase().GetHost()) == NULL) ) return;
+
+	LockJavascript(GF_TRUE);
+	JS_LookupProperty(m_pJSCtx, m_pObj, "onMediaServerAdd", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		jsval argv[3];
+		argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetFriendlyName() ) );
+		argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(m_pJSCtx, device->GetUUID() ) );
+		argv[2] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
+
+		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
+	}
+	LockJavascript(GF_FALSE);
+}
+
+static SMJS_DECL_FUNC_PROP_GET(  upnpdevice_getProperty)
+{
+#ifdef USE_FFDEV_15
+	JSObject *obj = (JSObject *) __hobj;
+	jsid id = (jsid) __hid;
+#endif
+
+	char *prop_name;
+	GPAC_DeviceItem *dev = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
+	if (!dev) return JS_FALSE;
+
+	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+	if (!prop_name) return JS_FALSE;
+
+	if (!strcmp(prop_name, "Name")) {
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetFriendlyName()) ) );
+	}
+	else if (!strcmp(prop_name, "UUID")) {
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->GetUUID()) ) );
+	}
+	else if (!strcmp(prop_name, "PresentationURL")) {
+		VPASSIGN( STRING_TO_JSVAL( JS_NewStringCopyZ(c, dev->m_device->m_PresentationURL) )  );
+	}
+	else if (!strcmp(prop_name, "ServicesCount")) {
+		u32 count = gf_list_count(dev->m_Services);
+		if (!count) {
+			dev->RefreshServiceList();
+			count = gf_list_count(dev->m_Services);
+		}
+		VPASSIGN( INT_TO_JSVAL(count)  );
+	}
+	SMJS_FREE(c, prop_name);
+	return JS_TRUE;
+}
+
+#ifdef GPAC_UNUSED_FUNC
+static JSBool upnp_device_subscribe(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+	PLT_Service* service;
+	char *service_uuid;
+	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
+	if (!item || (argc!=2) ) return JS_FALSE;
+
+	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
+	if (!JSVAL_IS_OBJECT(argv[1])) return JS_FALSE;
+
+	service_uuid = SMJS_CHARS(c, argv[0]);
+	if (item->m_device->FindServiceByType(service_uuid, service) == NPT_SUCCESS) {
+		item->m_pUPnP->m_pGenericController->m_CtrlPoint->Subscribe(service);
+	}
+	SMJS_FREE(c, service_uuid);
+	return JS_TRUE;
+}
+#endif
+
+static JSBool SMJS_FUNCTION(upnp_device_find_service)
+{
+	char *service_uuid;
+	SMJS_OBJ
+	SMJS_ARGS
+	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
+	if (!item || !argc) return JS_FALSE;
+	service_uuid = SMJS_CHARS(c, argv[0]);
+
+	GPAC_ServiceItem *serv = item->FindService(service_uuid);
+	SMJS_FREE(c, service_uuid);
+	if (!serv) {
+		SMJS_SET_RVAL( JSVAL_NULL );
+		return JS_TRUE;
+	}
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_device_get_service)
+{
+	u32 service_index;
+	SMJS_OBJ
+	SMJS_ARGS
+	GPAC_DeviceItem *item = (GPAC_DeviceItem *)SMJS_GET_PRIVATE(c, obj);
+	if (!item || !argc || !JSVAL_IS_INT(argv[0])) return JS_FALSE;
+	service_index = JSVAL_TO_INT(argv[0]);
+
+	GPAC_ServiceItem *serv = (GPAC_ServiceItem*)gf_list_get(item->m_Services, service_index);
+	if (!serv) {
+		SMJS_SET_RVAL( JSVAL_NULL );
+		return JS_TRUE;
+	}
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
+	return JS_TRUE;
+}
+
+
+void GF_UPnP::OnDeviceAdd(GPAC_DeviceItem *item, int added)
+{
+	jsval funval, rval;
+	if (!m_pJSCtx) return;
+
+	if (m_IPFilter.GetLength() && (strstr((const char*)m_IPFilter, (const char*)item->m_device->GetURLBase().GetHost()) == NULL) ) return;
+
+	LockJavascript(GF_TRUE);
+
+	if (added) {
+		item->js_ctx = m_pJSCtx;
+		item->obj = JS_NewObject(m_pJSCtx, &upnpGenericDeviceClass._class, 0, 0);
+		item->m_pUPnP = this;
+		gf_js_add_root(m_pJSCtx, &item->obj, GF_JSGC_OBJECT);
+		SMJS_SET_PRIVATE(item->js_ctx, item->obj, item);
+	}
+
+	JS_LookupProperty(m_pJSCtx, m_pObj, "onDeviceAdd", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		jsval argv[2];
+		argv[0] = OBJECT_TO_JSVAL( item->obj );
+		argv[1] = BOOLEAN_TO_JSVAL( added ? JS_TRUE : JS_FALSE);
+		JS_CallFunctionValue(m_pJSCtx, m_pObj, funval, 3, argv, &rval);
+	}
+	LockJavascript(GF_FALSE);
+}
+
+static SMJS_DECL_FUNC_PROP_GET(  upnp_getProperty)
+{
+#ifdef USE_FFDEV_15
+	JSObject *obj = (JSObject *) __hobj;
+	jsid id = (jsid) __hid;
+#endif
+
+
+	char *prop_name;
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp) return JS_FALSE;
+
+	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+	if (!prop_name) return JS_FALSE;
+
+	if (!strcmp(prop_name, "MediaRendererEnabled")) {
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaRenderer ? JS_TRUE : JS_FALSE ) );
+	}
+	else if (!strcmp(prop_name, "MediaServerEnabled")) {
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pMediaServer ? JS_TRUE : JS_FALSE)	);
+	}
+	else if (!strcmp(prop_name, "MediaControlEnabled")) {
+		VPASSIGN( BOOLEAN_TO_JSVAL( upnp->m_pAVCtrlPoint ? JS_TRUE : JS_FALSE)	);
+	}
+	else if (!strcmp(prop_name, "MediaServersCount")) {
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers) : 0)	);
+	}
+	else if (!strcmp(prop_name, "MediaRenderersCount")) {
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pAVCtrlPoint ? gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers) : 0) );
+	}
+	else if (!strcmp(prop_name, "DevicesCount")) {
+		VPASSIGN( INT_TO_JSVAL( upnp->m_pGenericController ? gf_list_count(upnp->m_pGenericController->m_Devices) : 0) );
+	}
+	SMJS_FREE(c, prop_name);
+	return JS_TRUE;
+}
+
+static SMJS_DECL_FUNC_PROP_SET(upnp_setProperty)
+{
+#ifdef USE_FFDEV_15
+	JSObject *obj = (JSObject *) __hobj;
+	jsid id = (jsid) __hid;
+#endif
+	char *prop_name;
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp) return JS_FALSE;
+
+	if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+	prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+	if (!prop_name) return JS_FALSE;
+
+	if (upnp->m_pMediaRenderer ) {
+		if (!strcmp(prop_name, "MovieDuration") && JSVAL_IS_DOUBLE( VPGET() )) {
+			jsdouble d;
+			JS_ValueToNumber(c, VPGET(), &d);
+			upnp->m_pMediaRenderer->SetDuration(d, GF_TRUE);
+		}
+		else if (!strcmp(prop_name, "MovieTime") && JSVAL_IS_DOUBLE( VPGET() )) {
+			jsdouble d;
+			JS_ValueToNumber(c, VPGET(), &d);
+			upnp->m_pMediaRenderer->SetTime(d);
+		}
+		else if (!strcmp(prop_name, "MovieURL") && JSVAL_IS_STRING( VPGET() ) ) {
+			char *url = SMJS_CHARS(c, VPGET() );
+			if (url) upnp->m_pMediaRenderer->SetConnected(url);
+			SMJS_FREE(c, url);
+		}
+	}
+	SMJS_FREE(c, prop_name);
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(upnp_get_device)
+{
+	u32 idx;
+	GPAC_DeviceItem *device;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || !argc || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
+
+	idx = JSVAL_TO_INT(argv[0]);
+	if (!upnp->m_pGenericController) return JS_FALSE;
+
+	device = (GPAC_DeviceItem *)gf_list_get(upnp->m_pGenericController->m_Devices, idx);
+	if (!device) return JS_FALSE;
+	if (!device->obj) {
+		device->js_ctx = upnp->m_pJSCtx;
+		device->obj = JS_NewObject(upnp->m_pJSCtx, &upnp->upnpGenericDeviceClass._class, 0, 0);
+		device->m_pUPnP = upnp;
+		gf_js_add_root(upnp->m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
+		SMJS_SET_PRIVATE(device->js_ctx, device->obj, device);
+	}
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(device->obj) );
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_find_service)
+{
+	char *dev_ip;
+	char *serv_name;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc!=2) || !JSVAL_IS_STRING(argv[0]) || !JSVAL_IS_STRING(argv[1]) ) return JS_FALSE;
+
+	dev_ip = SMJS_CHARS(c, argv[0]);
+	serv_name = SMJS_CHARS(c, argv[1]);
+	SMJS_SET_RVAL(JSVAL_NULL);
+	if (!dev_ip || !serv_name || !upnp->m_pGenericController) {
+		SMJS_FREE(c, dev_ip);
+		SMJS_FREE(c, serv_name);
+		return JS_TRUE;
+	}
+
+	u32 i, count = gf_list_count(upnp->m_pGenericController->m_Devices);
+	for (i=0; i<count; i++) {
+		GPAC_DeviceItem *item = (GPAC_DeviceItem *) gf_list_get(upnp->m_pGenericController->m_Devices, i);
+		if (item->m_device->GetURLBase().GetHost() == (const char *)dev_ip) {
+			GPAC_ServiceItem *serv = item->FindService(serv_name);
+			if (serv) {
+				SMJS_SET_RVAL( OBJECT_TO_JSVAL(serv->obj) );
+				break;
+			}
+		}
+	}
+	SMJS_FREE(c, dev_ip);
+	SMJS_FREE(c, serv_name);
+	return JS_TRUE;
+}
+
+static GPAC_MediaRendererItem *upnp_renderer_get_device(GF_UPnP *upnp , JSContext *c, JSObject *obj)
+{
+	char *uuid;
+	jsval val;
+	u32 i, count;
+	GPAC_MediaRendererItem *render;
+	if (!JS_LookupProperty(c, obj, "UUID", &val) || JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val) )
+		return NULL;
+	uuid = SMJS_CHARS(c, val);
+	if (!uuid) return NULL;
+
+	count = gf_list_count(upnp->m_pAVCtrlPoint->m_MediaRenderers);
+	for (i=0; i<count; i++) {
+		render = (GPAC_MediaRendererItem *)gf_list_get(upnp->m_pAVCtrlPoint->m_MediaRenderers, i);
+		if (render->m_UUID==(const char *)uuid) {
+			SMJS_FREE(c, uuid);
+			return render;
+		}
+	}
+	SMJS_FREE(c, uuid);
+	return NULL;
+}
+
+static GPAC_MediaServerItem *upnp_server_get_device(GF_UPnP *upnp , JSContext *c, JSObject *obj)
+{
+	char *uuid;
+	jsval val;
+	u32 i, count;
+	GPAC_MediaServerItem *server;
+	if (!JS_LookupProperty(c, obj, "UUID", &val) || JSVAL_IS_NULL(val) || JSVAL_IS_VOID(val) )
+		return NULL;
+	uuid = SMJS_CHARS(c, val);
+	if (!uuid) return NULL;
+
+	count = gf_list_count(upnp->m_pAVCtrlPoint->m_MediaServers);
+	for (i=0; i<count; i++) {
+		server = (GPAC_MediaServerItem *)gf_list_get(upnp->m_pAVCtrlPoint->m_MediaServers, i);
+		if (server->m_UUID==(const char *)uuid) {
+			SMJS_FREE(c, uuid);
+			return server;
+		}
+	}
+	SMJS_FREE(c, uuid);
+	return NULL;
+}
+
+
+static JSBool SMJS_FUNCTION(upnp_renderer_open)
+{
+	JSObject *sobj, *fobj;
+	jsval val;
+	GPAC_MediaRendererItem *render;
+	GPAC_MediaServerItem *server;
+	char *item, *resource_url;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc<1) ) return JS_FALSE;
+
+	render = upnp_renderer_get_device(upnp, c, obj);
+	if (!render) return JS_TRUE;
+
+	PLT_Service* service;
+	server = NULL;
+	if (argc==2) {
+		sobj = JSVAL_IS_NULL(argv[1]) ? NULL : JSVAL_TO_OBJECT(argv[1]);
+		server = sobj ? upnp_server_get_device(upnp, c, sobj) : NULL;
+		if (NPT_FAILED(server->m_device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
+			server = NULL;
+		}
+		if (!server) return JS_TRUE;
+	}
+	item = NULL;
+	resource_url = NULL;
+	if (JSVAL_IS_OBJECT(argv[0])) {
+		fobj = JSVAL_TO_OBJECT(argv[0]);
+		if (!JS_LookupProperty(c, fobj, "ObjectID", &val) || JSVAL_IS_NULL(val) || !JSVAL_IS_STRING(val)) return JS_TRUE;
+		item = SMJS_CHARS(c, val);
+	}
+	else if (JSVAL_IS_STRING(argv[0]))
+		resource_url = SMJS_CHARS(c, argv[0]);
+
+	if (!item && !resource_url) {
+		SMJS_FREE(c, item);
+		SMJS_FREE(c, resource_url);
+		return JS_TRUE;
+	}
+	if (item && !server) {
+		SMJS_FREE(c, item);
+		SMJS_FREE(c, resource_url);
+		return JS_TRUE;
+	}
+
+	if (NPT_SUCCEEDED(render->m_device->FindServiceByType("urn:schemas-upnp-org:service:AVTransport:1", service))) {
+		if (resource_url) {
+			upnp->m_pAVCtrlPoint->m_MediaController->SetAVTransportURI(render->m_device, 0, resource_url, NULL, NULL);
+			upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
+		} else {
+			NPT_String objID = item;
+
+			// look back for the PLT_MediaItem in the results
+			NPT_List<PLT_MediaObject*>::Iterator item = server->m_BrowseResults->GetFirstItem();
+			while (item) {
+				if ((*item)->m_ObjectID == objID) {
+					if ((*item)->m_Resources.GetItemCount()) {
+						upnp->m_pAVCtrlPoint->m_MediaController->SetAVTransportURI(render->m_device, 0, (*item)->m_Resources[0].m_Uri, (*item)->m_Didl, NULL);
+						upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, "1", NULL);
+					}
+					break;
+				}
+				++item;
+			}
+		}
+	}
+	SMJS_FREE(c, item);
+	SMJS_FREE(c, resource_url);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION_EXT(upnp_renderer_playback, u32 act_type)
+{
+	char szSpeed[20];
+	GPAC_MediaRendererItem *render;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp) return JS_FALSE;
+
+	render = upnp_renderer_get_device(upnp, c, obj);
+	if (!render) return JS_TRUE;
+
+	switch (act_type) {
+	/*play/setspeed*/
+	case 0:
+		strcpy(szSpeed, "1");
+		if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
+			jsdouble d;
+			JS_ValueToNumber(c, argv[0], &d);
+			sprintf(szSpeed, "%2.2f", d);
+		}
+		upnp->m_pAVCtrlPoint->m_MediaController->Play(render->m_device, 0, szSpeed, NULL);
+		break;
+	/*pause*/
+	case 1:
+		upnp->m_pAVCtrlPoint->m_MediaController->Pause(render->m_device, 0, NULL);
+		break;
+	/*stop*/
+	case 2:
+		upnp->m_pAVCtrlPoint->m_MediaController->Stop(render->m_device, 0, NULL);
+		break;
+	/*seek*/
+	case 3:
+		if (argc && JSVAL_IS_NUMBER(argv[0]) ) {
+			char szVal[100];
+			jsdouble d;
+			JS_ValueToNumber(c, argv[0], &d);
+			format_time_string(szVal, d);
+			upnp->m_pAVCtrlPoint->m_MediaController->Seek(render->m_device, 0, "ABS_TIME", szVal, NULL);
+		}
+		break;
+	}
+	return JS_TRUE;
+}
+static JSBool SMJS_FUNCTION(upnp_renderer_play)
+{
+	return upnp_renderer_playback(SMJS_CALL_ARGS, 0);
+}
+static JSBool SMJS_FUNCTION(upnp_renderer_pause)
+{
+	return upnp_renderer_playback(SMJS_CALL_ARGS, 1);
+}
+static JSBool SMJS_FUNCTION(upnp_renderer_stop)
+{
+	return upnp_renderer_playback(SMJS_CALL_ARGS, 2);
+}
+static JSBool SMJS_FUNCTION(upnp_renderer_seek)
+{
+	return upnp_renderer_playback(SMJS_CALL_ARGS, 3);
+}
+
+static JSBool SMJS_FUNCTION(upnp_get_renderer)
+{
+	JSObject *s_obj;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || !upnp->m_pAVCtrlPoint || (argc!=1) ) return JS_FALSE;
+
+	GPAC_MediaRendererItem *mr = NULL;
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 id = JSVAL_TO_INT(argv[0]);
+		mr = (GPAC_MediaRendererItem *) gf_list_get(upnp->m_pAVCtrlPoint->m_MediaRenderers, id);
+	}
+	else if (JSVAL_IS_STRING(argv[0])) {
+		u32 i=0;
+		char *uuid = SMJS_CHARS(c, argv[0]);
+		while ((mr = (GPAC_MediaRendererItem *) gf_list_enum(upnp->m_pAVCtrlPoint->m_MediaRenderers, &i))) {
+			if (mr->m_UUID==(const char *)uuid) break;
+		}
+		SMJS_FREE(c, uuid);
+	}
+	if (!mr) return JS_FALSE;
+
+	s_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, s_obj, upnp);
+
+	JS_DefineProperty(c, s_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_device->GetFriendlyName()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, s_obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_UUID ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, s_obj, "HostName", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mr->m_device->GetURLBase().GetHost() ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineFunction(c, s_obj, "Open", upnp_renderer_open, 2, 0);
+	JS_DefineFunction(c, s_obj, "Play", upnp_renderer_play, 1, 0);
+	JS_DefineFunction(c, s_obj, "Pause", upnp_renderer_pause, 0, 0);
+	JS_DefineFunction(c, s_obj, "Stop", upnp_renderer_stop, 0, 0);
+	JS_DefineFunction(c, s_obj, "Seek", upnp_renderer_seek, 0, 0);
+
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(s_obj) );
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_server_browse)
+{
+	NPT_String parent;
+	GPAC_MediaServerItem *server;
+	char *dir, *filter, *_dir, *_filter;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc!=2) ) return JS_FALSE;
+
+	server = upnp_server_get_device(upnp, c, obj);
+	if (!server) return JS_FALSE;
+
+	_dir = _filter = NULL;
+
+	dir = _dir = SMJS_CHARS(c, argv[0]);
+	if (!dir) dir = (char*)"0";
+	filter = _filter = SMJS_CHARS(c, argv[1]);
+	if (!filter) filter = (char*)"*";
+
+	PLT_Service* service;
+	if (NPT_SUCCEEDED(server->m_device->FindServiceByType("urn:schemas-upnp-org:service:ContentDirectory:1", service))) {
+		if (!strcmp(dir, "0") || !strcmp(dir, "\\") || !strcmp(dir, "/")) {
+			server->m_ParentDirectories.Clear();
+		}
+		if (!strcmp(dir, "..")) {
+			if (!server->m_ParentDirectories.GetItemCount()) {
+				SMJS_FREE(c, _dir);
+				SMJS_FREE(c, _filter);
+				return JS_FALSE;
+			}
+			server->m_ParentDirectories.Pop(parent);
+			server->m_ParentDirectories.Peek(parent);
+			dir=parent;
+
+			if (server->m_ParentDirectories.GetItemCount()==1)
+				server->m_ParentDirectories.Clear();
+
+		} else {
+			server->m_ParentDirectories.Push(dir);
+		}
+		upnp->m_pAVCtrlPoint->Browse(server, dir, filter);
+
+
+		jsval aval = INT_TO_JSVAL(0);
+		if (!server->m_BrowseResults.IsNull()) {
+			aval = INT_TO_JSVAL(server->m_BrowseResults->GetItemCount());
+		}
+		JS_SetProperty(c, obj, "FilesCount", &aval);
+	}
+	SMJS_FREE(c, _dir);
+	SMJS_FREE(c, _filter);
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(upnp_server_has_parent_dir)
+{
+	GPAC_MediaServerItem *server;
+	SMJS_OBJ
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp) return JS_FALSE;
+
+	server = upnp_server_get_device(upnp, c, obj);
+	if (!server) return JS_TRUE;
+	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( server->m_ParentDirectories.GetItemCount() ? JS_TRUE : JS_FALSE));
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_server_get_resource_uri)
+{
+	u32 idx;
+	SMJS_OBJ
+	SMJS_ARGS
+	PLT_MediaObject *mo = (PLT_MediaObject *)SMJS_GET_PRIVATE(c, obj);
+	if (!mo || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
+	idx = JSVAL_TO_INT(argv[0]);
+	if (idx<mo->m_Resources.GetItemCount()) {
+		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Resources[idx].m_Uri)));
+	} else {
+		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, "")));
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_server_get_file)
+{
+	GPAC_MediaServerItem *server;
+	u32 id;
+	JSObject *f_obj;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
+
+	server = upnp_server_get_device(upnp, c, obj);
+	if (!server) return JS_TRUE;
+	if (server->m_BrowseResults.IsNull()) return JS_TRUE;
+
+	id = JSVAL_TO_INT(argv[0]);
+	PLT_MediaObject *mo;
+	server->m_BrowseResults->Get(id, mo);
+	if (!mo) return JS_TRUE;
+
+	f_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, f_obj, mo);
+
+	JS_DefineProperty(c, f_obj, "ObjectID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_ObjectID)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, f_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Title)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, f_obj, "ParentID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_ParentID)), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, f_obj, "Directory", BOOLEAN_TO_JSVAL( mo->IsContainer() ? JS_TRUE : JS_FALSE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	if (!mo->IsContainer()) {
+		JS_DefineProperty(c, f_obj, "ResourceCount", INT_TO_JSVAL(mo->m_Resources.GetItemCount()), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineFunction(c, f_obj, "GetResourceURI", upnp_server_get_resource_uri, 1, 0);
+	}
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(f_obj));
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_server_get_file_uri)
+{
+	GPAC_MediaServerItem *server;
+	u32 id;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc!=1) || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
+
+	server = upnp_server_get_device(upnp, c, obj);
+	if (!server) return JS_TRUE;
+	if (server->m_BrowseResults.IsNull()) return JS_TRUE;
+
+	id = JSVAL_TO_INT(argv[0]);
+	PLT_MediaObject *mo;
+	server->m_BrowseResults->Get(id, mo);
+	if (!mo) return JS_TRUE;
+
+	if (mo->m_Resources.GetItemCount()) {
+		SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, mo->m_Resources[0].m_Uri) ) );
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_get_server)
+{
+	JSObject *s_obj;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || !upnp->m_pAVCtrlPoint || (argc!=1)) return JS_FALSE;
+
+
+	GPAC_MediaServerItem *ms = NULL;
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 id = JSVAL_TO_INT(argv[0]);
+		ms = (GPAC_MediaServerItem *) gf_list_get(upnp->m_pAVCtrlPoint->m_MediaServers, id);
+	}
+	else if (JSVAL_IS_STRING(argv[0])) {
+		u32 i=0;
+		char *uuid = SMJS_CHARS(c, argv[0]);
+		while ((ms = (GPAC_MediaServerItem *) gf_list_enum(upnp->m_pAVCtrlPoint->m_MediaServers, &i))) {
+			if (ms->m_UUID==(const char *)uuid) break;
+		}
+		SMJS_FREE(c, uuid);
+	}
+	if (!ms) return JS_FALSE;
+	s_obj = JS_NewObject(c, &upnp->upnpDeviceClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, s_obj, upnp);
+
+	JS_DefineProperty(c, s_obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ms->m_device->GetFriendlyName()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, s_obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ms->m_UUID ) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(c, s_obj, "FilesCount", INT_TO_JSVAL(10), 0, 0, 0  | JSPROP_PERMANENT);
+	JS_DefineFunction(c, s_obj, "Browse", upnp_server_browse, 2, 0);
+	JS_DefineFunction(c, s_obj, "GetFile", upnp_server_get_file, 1, 0);
+	JS_DefineFunction(c, s_obj, "GetFileURI", upnp_server_get_file_uri, 1, 0);
+	JS_DefineFunction(c, s_obj, "HasParentDirectory", upnp_server_has_parent_dir, 0, 0);
+
+
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(s_obj) );
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_bind_renderer)
+{
+	SMJS_OBJ
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp) return JS_TRUE;
+	upnp->m_renderer_bound = GF_TRUE;
+
+	/*remove ourselves from the event filters since we will only be called through JS*/
+	gf_term_remove_event_filter(upnp->m_pTerm, &upnp->evt_filter);
+
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_share_resource)
+{
+	char *url, *host;
+	NPT_String resourceURI;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || !upnp->m_pMediaServer || !argc || !JSVAL_IS_STRING(argv[0]) ) return JS_TRUE;
+	url = SMJS_CHARS(c, argv[0]);
+	if (!url) return JS_TRUE;
+
+	host = NULL;
+	if (argc && JSVAL_IS_STRING(argv[1]) ) {
+		host = SMJS_CHARS(c, argv[1]);
+	}
+
+	resourceURI = upnp->m_pMediaServer->GetResourceURI(url, host);
+	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, resourceURI ) ));
+
+	SMJS_FREE(c, url);
+	SMJS_FREE(c, host);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_share_virtual_resource)
+{
+	Bool temp = GF_FALSE;
+	char *res_url, *res_val, *mime;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || !upnp->m_pMediaServer || (argc<2) || !JSVAL_IS_STRING(argv[0]) || !JSVAL_IS_STRING(argv[1]) ) return JS_TRUE;
+	res_url = SMJS_CHARS(c, argv[0]);
+	if (!res_url) return JS_TRUE;
+	res_val = SMJS_CHARS(c, argv[1]);
+	if (!res_val) {
+		SMJS_FREE(c, res_url);
+		return JS_TRUE;
+	}
+	mime = NULL;
+	if (argc==3) mime = SMJS_CHARS(c, argv[2]);
+	if ((argc==4) && JSVAL_IS_BOOLEAN(argv[3]) && (JSVAL_TO_BOOLEAN(argv[3])==JS_TRUE) ) temp = GF_TRUE;
+
+	upnp->m_pMediaServer->ShareVirtualResource(res_url, res_val, mime ? mime : "application/octet-stream", temp);
+	SMJS_FREE(c, res_url);
+	SMJS_FREE(c, res_val);
+	SMJS_FREE(c, mime);
+	return JS_TRUE;
+}
+
+
+static NPT_UInt8 GENERIC_SCPDXML[] = "<scpd xmlns=\"urn:schemas-upnp-org:service-1-0\"><specVersion>  <major>1</major>   <minor>0</minor> </specVersion> <actionList>  <action>  <name>GetStatus</name>    <argumentList>    <argument>     <name>ResultStatus</name>     <direction>out</direction>      <relatedStateVariable>Status</relatedStateVariable>     </argument>   </argumentList>  </action> </actionList>  <serviceStateTable>  <stateVariable sendEvents=\"yes\">   <name>Status</name>    <dataType>boolean</dataType>   </stateVariable></serviceStateTable> </scpd>";
+
+
+static JSBool SMJS_FUNCTION(upnp_device_setup_service)
+{
+	char *name, *type, *id, *scpd_xml;
+	NPT_Result res;
+	SMJS_OBJ
+	SMJS_ARGS
+	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
+	if (!device) return JS_FALSE;
+	if (argc<3) return JS_FALSE;
+
+	name = SMJS_CHARS(c, argv[0]);
+	type = SMJS_CHARS(c, argv[1]);
+	id = SMJS_CHARS(c, argv[2]);
+
+	if (!name || !type || !id) {
+		SMJS_FREE(c, name);
+		SMJS_FREE(c, type);
+		SMJS_FREE(c, id);
+		return JS_FALSE;
+	}
+
+	scpd_xml = NULL;
+	if ((argc>3) && JSVAL_IS_STRING(argv[3])) scpd_xml = SMJS_CHARS(c, argv[3]);
+
+	GPAC_Service* service = new GPAC_Service(device, type, id, name);
+	res = service->SetSCPDXML((const char*) scpd_xml ? scpd_xml : (char *)GENERIC_SCPDXML);
+
+	SMJS_FREE(c, name);
+	SMJS_FREE(c, type);
+	SMJS_FREE(c, id);
+
+	if (res != NPT_SUCCESS) {
+		delete service;
+		return JS_FALSE;
+	}
+
+	gf_list_add(device->m_pServices, service);
+
+	service->SetupJS(c, device->m_pUPnP, device->obj);
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(service->m_pObj) );
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(upnp_device_start)
+{
+	jsval sval;
+	char *str;
+	SMJS_OBJ
+	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
+	if (!device) return JS_FALSE;
+
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "PresentationURL", &sval) && JSVAL_IS_STRING(sval)) {
+		str = SMJS_CHARS(c, sval);
+		char *url = gf_url_concatenate(device->js_source, str);
+		SMJS_FREE(c, str);
+
+		/*we will use our media server to exchange the URL if file based
+			!!! THIS IS BROKEN IF MULTIPLE INTERFACES EXIST ON THE DEVICE !!!
+		*/
+		if (device->m_pUPnP->m_pMediaServer) {
+			device->m_PresentationURL = device->m_pUPnP->m_pMediaServer->GetResourceURI(url, NULL);
+		}
+		/*otherwise we can only use absolute URLs */
+		else if (strstr(url, "://") && !strstr(url, "file://")) {
+			device->m_PresentationURL = url;
+		}
+		gf_free(url);
+	}
+
+	str = NULL;
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelDescription", &sval) && JSVAL_IS_STRING(sval))
+		str = SMJS_CHARS(c, sval);
+
+	device->m_ModelDescription = str ? str : "GPAC Generic Device";
+	SMJS_FREE(c, str);
+
+	str = NULL;
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelURL", &sval) && JSVAL_IS_STRING(sval))
+		str = SMJS_CHARS(c, sval);
+	device->m_ModelURL = str ? str : "http://gpac.io";
+	SMJS_FREE(c, str);
+
+	str = NULL;
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelNumber", &sval) && JSVAL_IS_STRING(sval))
+		str = SMJS_CHARS(c, sval);
+	device->m_ModelNumber = str ? str : gf_gpac_version();
+	SMJS_FREE(c, str);
+
+	str = NULL;
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "ModelName", &sval) && JSVAL_IS_STRING(sval))
+		str = SMJS_CHARS(c, sval);
+	device->m_ModelName = str ? str : "GPAC Generic Device";
+	SMJS_FREE(c, str);
+
+	device->m_Manufacturer = "Telecom ParisTech";
+	device->m_ManufacturerURL = "http://www.telecom-paristech.fr/";
+
+	if (device->m_pUPnP->m_pGenericController) {
+		const char *opt = gf_opts_get_key("UPnP", "IgnoreCreatedDevices");
+		if (!opt || !strcmp(opt, "yes")) {
+			device->m_pUPnP->m_pGenericController->m_CtrlPoint->IgnoreUUID(device->GetUUID());
+		}
+	}
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "Run", &sval) && JSVAL_IS_OBJECT(sval)) {
+		device->obj = obj;
+		device->run_proc = sval;
+		gf_js_add_root(device->m_pUPnP->m_pJSCtx, &device->run_proc, GF_JSGC_VAL);
+	}
+	if (JS_LookupProperty(device->m_pUPnP->m_pJSCtx, obj, "OnAction", &sval) && JSVAL_IS_OBJECT(sval)) {
+		device->obj = obj;
+		device->act_proc = sval;
+		gf_js_add_root(device->m_pUPnP->m_pJSCtx, &device->act_proc, GF_JSGC_VAL);
+	}
+	PLT_DeviceHostReference devRef(device);
+	device->m_pUPnP->m_pPlatinum->AddDevice(devRef);
+
+	return JS_TRUE;
+}
+
+#ifdef GPAC_UNUSED_FUNC
+static JSBool SMJS_FUNCTION(upnp_device_stop)
+{
+	SMJS_OBJ
+	GPAC_GenericDevice *device = (GPAC_GenericDevice *)SMJS_GET_PRIVATE(c, obj);
+	if (!device) return JS_FALSE;
+
+	PLT_DeviceHostReference devRef(device);
+	device->m_pUPnP->m_pPlatinum->RemoveDevice(devRef);
+
+	return JS_TRUE;
+}
+#endif
+
+static GPAC_GenericDevice *upnp_create_generic_device(GF_UPnP *upnp, JSObject*global, const char *id, const char *name)
+{
+	GPAC_GenericDevice *device;
+	device = new GPAC_GenericDevice(name, id);
+	device->m_pUPnP = upnp;
+	device->js_source = "";
+
+	device->obj = JS_NewObject(upnp->m_pJSCtx, &upnp->upnpDeviceClass._class, 0, global);
+	gf_js_add_root(upnp->m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
+
+	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "Name", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "ID", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, id) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineProperty(upnp->m_pJSCtx, device->obj, "UUID", STRING_TO_JSVAL( JS_NewStringCopyZ(upnp->m_pJSCtx, device->GetUUID()) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "SetupService", upnp_device_setup_service, 0, 0);
+	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "Start", upnp_device_start, 0, 0);
+//	JS_DefineFunction(upnp->m_pJSCtx, device->obj, "Stop", upnp_device_stop, 0, 0);
+	SMJS_SET_PRIVATE(upnp->m_pJSCtx, device->obj, device);
+	if (!upnp->m_Devices) upnp->m_Devices = gf_list_new();
+	gf_list_add(upnp->m_Devices, device);
+
+	return device;
+}
+
+static JSBool SMJS_FUNCTION(upnp_create_device)
+{
+	GPAC_GenericDevice *device;
+	char *id, *name;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc != 2)) return JS_FALSE;
+
+	id = SMJS_CHARS(c, argv[0]);
+	name = SMJS_CHARS(c, argv[1]);
+	if (!id || !name) {
+		SMJS_FREE(c, name);
+		SMJS_FREE(c, id);
+		return JS_FALSE;
+	}
+
+	device = upnp_create_generic_device(upnp, NULL, id, name);
+	if (device)
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(device->obj) );
+
+	SMJS_FREE(c, name);
+	SMJS_FREE(c, id);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(upnp_delete_device)
+{
+	GPAC_GenericDevice *device;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_UPnP *upnp = (GF_UPnP *)SMJS_GET_PRIVATE(c, obj);
+	if (!upnp || (argc != 1)) return JS_FALSE;
+
+	device = (GPAC_GenericDevice *) SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!device) return JS_FALSE;
+
+	gf_list_del_item(upnp->m_Devices, device);
+	device->DetachJS(c);
+	PLT_DeviceHostReference devRef = PLT_DeviceHostReference(device);
+	upnp->m_pPlatinum->RemoveDevice(devRef);
+	devRef.Detach();
+	return JS_TRUE;
+}
+
+Bool GF_UPnP::LoadJS(GF_TermExtJS *param)
+{
+	u32 i, count;
+	JSPropertySpec upnpClassProps[] = {
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+	};
+	JSFunctionSpec upnpClassFuncs[] = {
+		SMJS_FUNCTION_SPEC("BindRenderer", upnp_bind_renderer, 0),
+		SMJS_FUNCTION_SPEC("GetMediaServer", upnp_get_server, 1),
+		SMJS_FUNCTION_SPEC("GetMediaRenderer", upnp_get_renderer, 1),
+		SMJS_FUNCTION_SPEC("ShareResource", upnp_share_resource, 1),
+		SMJS_FUNCTION_SPEC("ShareVirtualResource", upnp_share_virtual_resource, 2),
+		SMJS_FUNCTION_SPEC("GetDevice", upnp_get_device, 1),
+		SMJS_FUNCTION_SPEC("FindService", upnp_find_service, 1),
+		SMJS_FUNCTION_SPEC("CreateDevice", upnp_create_device, 2),
+		SMJS_FUNCTION_SPEC("DeleteDevice", upnp_delete_device, 1),
+		SMJS_FUNCTION_SPEC(0, 0, 0)
+	};
+
+	if (param->unload) {
+		if (m_nbJSInstances) {
+			m_nbJSInstances--;
+			if (m_pJSCtx==param->ctx) m_nbJSInstances = 0;
+
+			if (!m_nbJSInstances) {
+				if (m_pGenericController) {
+					u32 i, count;
+					count = gf_list_count(m_pGenericController->m_Devices);
+					for (i=0; i<count; i++) {
+						GPAC_DeviceItem *item = (GPAC_DeviceItem *)gf_list_get(m_pGenericController->m_Devices, i);
+						item->DetachJS();
+						item->js_ctx = NULL;
+					}
+				}
+				if (m_Devices) {
+					while (gf_list_count(m_Devices)) {
+						GPAC_GenericDevice *device = (GPAC_GenericDevice*)gf_list_get(m_Devices, 0);
+						gf_list_rem(m_Devices, 0);
+						device->DetachJS(m_pJSCtx);
+					}
+					gf_list_del(m_Devices);
+					m_Devices = NULL;
+				}
+				m_pJSCtx = NULL;
+			}
+		}
+		return GF_FALSE;
+	}
+	if (m_nbJSInstances) {
+		/*FIXME - this was possible in previous version of SpiderMonkey, don't know how to fix that for new ones*/
+#if (JS_VERSION>=185)
+		m_nbJSInstances++;
+		return GF_FALSE;
+#else
+		JS_DefineProperty((JSContext*)param->ctx, (JSObject*)param->global, "UPnP", OBJECT_TO_JSVAL(m_pObj), 0, 0, 0);
+		m_nbJSInstances++;
+#endif
+		return GF_FALSE;
+	}
+
+	m_pJSCtx = (JSContext*)param->ctx;
+	/*setup JS bindings*/
+	JS_SETUP_CLASS(upnpClass, "UPNPMANAGER", JSCLASS_HAS_PRIVATE, upnp_getProperty, upnp_setProperty, JS_FinalizeStub);
+
+	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpClass, 0, 0, upnpClassProps, upnpClassFuncs, 0, 0);
+	m_pObj = JS_DefineObject(m_pJSCtx, (JSObject*)param->global, "UPnP", &upnpClass._class, 0, 0);
+	SMJS_SET_PRIVATE(m_pJSCtx, m_pObj, this);
+
+	JS_SETUP_CLASS(upnpDeviceClass, "UPNPAVDEVICE", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+
+	/*setup JS bindings*/
+	JSPropertySpec upnpDeviceClassProps[] = {
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+	};
+	JSFunctionSpec upnpDeviceClassFuncs[] = {
+		SMJS_FUNCTION_SPEC("FindService", upnp_device_find_service, 0),
+		SMJS_FUNCTION_SPEC("GetService", upnp_device_get_service, 0),
+		SMJS_FUNCTION_SPEC(0, 0, 0)
+	};
+	JS_SETUP_CLASS(upnpGenericDeviceClass, "UPNPDEVICE", JSCLASS_HAS_PRIVATE, upnpdevice_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
+	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpGenericDeviceClass, 0, 0, upnpDeviceClassProps, upnpDeviceClassFuncs, 0, 0);
+
+	JS_SETUP_CLASS(upnpServiceClass, "UPNPSERVICEDEVICE", JSCLASS_HAS_PRIVATE, upnpservice_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
+	GF_JS_InitClass(m_pJSCtx, (JSObject*)param->global, 0, &upnpServiceClass, 0, 0, 0, 0, 0, 0);
+
+	m_nbJSInstances=1;
+
+	upnp_init_time = gf_sys_clock();
+
+	count = gf_opts_get_key_count("UPnPDevices");
+	for (i=0; i<count; i++) {
+		char szFriendlyName[1024], szFile[1024], *sep;
+		const char *device_id = gf_opts_get_key_name("UPnPDevices", i);
+		const char *dev = gf_opts_get_key("UPnPDevices", device_id);
+
+		if (!strncmp(dev, "off;", 4)) continue;
+
+		if (!strncmp(dev, "on;", 3)) dev += 3;
+
+		sep = (char*)strchr(dev, ';');
+		if (!sep) continue;
+		sep[0] = 0;
+		strcpy(szFile, dev);
+		sep[0] = ';';
+
+		if (!sep[1]) continue;
+		strcpy(szFriendlyName, sep+1);
+
+		FILE *f = gf_fopen(szFile, "rt");
+		if (!f) continue;
+
+
+		GPAC_GenericDevice *device = upnp_create_generic_device(this, (JSObject*)param->global, device_id, szFriendlyName);
+		device->js_source = szFile;
+
+		jsval aval;
+		gf_fseek(f, 0, SEEK_END);
+		u32 size = (u32) gf_ftell(f);
+		gf_fseek(f, 0, SEEK_SET);
+		char *buf = (char*)gf_malloc(sizeof(char)*(size+1));
+		size = (u32) fread(buf, 1, size, f);
+		buf[size]=0;
+		/*evaluate the script on the object only*/
+		if (JS_EvaluateScript(m_pJSCtx, device->obj, buf, size, 0, 0, &aval) != JS_TRUE) {
+			gf_js_remove_root(m_pJSCtx, &device->obj, GF_JSGC_OBJECT);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[UPnP] Unable to load device %s: script error in %s\n", szFriendlyName, szFile));
+			gf_list_del_item(m_Devices, device);
+			delete device;
+		}
+		gf_fclose(f);
+		gf_free(buf);
+	}
+	return GF_TRUE;
+}
+
+#endif
+
+static Bool upnp_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_UPnP *upnp = (GF_UPnP *) termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		opt = gf_opts_get_key("UPnP", "Enabled");
+		if (!opt) {
+			//UPnP is disabled by default on all platforms until we have a more stable state on load and exit
+			opt = "no";
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in GPAC config file\n"));
+			gf_opts_set_key("UPnP", "Enabled", opt);
+		}
+		if (!strcmp(opt, "yes")) {
+			upnp->Load((GF_Terminal *)param);
+			return GF_TRUE;
+		}
+		return GF_FALSE;
+
+	case GF_TERM_EXT_STOP:
+		upnp->Unload();
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+#ifdef GPAC_HAS_SPIDERMONKEY
+		if (upnp->m_Devices) {
+			u32 now;
+			now = gf_sys_clock() - upnp->upnp_init_time;
+			if (now - upnp->last_time > 200) {
+				u32 i, count, arg_set;
+				jsval argv[1], rval;
+				upnp->LockJavascript(GF_TRUE);
+				arg_set = 0;
+				count = gf_list_count(upnp->m_Devices);
+				for (i=0; i<count; i++) {
+					GPAC_GenericDevice *device = (GPAC_GenericDevice *)gf_list_get(upnp->m_Devices, i);
+					if (!JSVAL_IS_NULL(device->run_proc)) {
+						if (!arg_set) {
+							argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(upnp->m_pJSCtx, (Double)now / 1000.0) );
+							arg_set = 1;
+						}
+						JS_CallFunctionValue(upnp->m_pJSCtx, device->obj, device->run_proc, 1, argv, &rval);
+					}
+				}
+				upnp->LockJavascript(GF_FALSE);
+				upnp->last_time = now;
+			}
+		}
+#endif
+		break;
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+	case GF_TERM_EXT_JSBIND:
+		return upnp->LoadJS((GF_TermExtJS*)param);
+#endif
+	}
+	return GF_FALSE;
+}
+
+
+GF_TermExt *upnp_new()
+{
+	GF_TermExt *dr;
+	GF_UPnP *ext;
+	dr = (GF_TermExt *) gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC UPnP Platinum", "gpac distribution");
+
+	dr->process = upnp_process;
+	ext = new GF_UPnP();
+	dr->udta = ext;
+	ext->term_ext = dr;
+	ext->evt_filter.on_event = upnp_on_term_event;
+	ext->evt_filter.udta = ext;
+
+	dr->caps = GF_TERM_EXTENSION_NOT_THREADED;
+#ifdef GPAC_HAS_SPIDERMONKEY
+	dr->caps |= GF_TERM_EXTENSION_JS;
+#endif
+	return dr;
+}
+
+
+void upnp_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_UPnP *ext = (GF_UPnP *) dr->udta;
+	delete ext;
+	gf_free(dr);
+}
+

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GPACPlatinum.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GenericDevice.cpp Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/GenericDevice.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/platinum/Makefile Added

@@ -0,0 +1,65 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/platinum
+
+CFLAGS= $(CXXFLAGS) -I"$(SRC_PATH)/include" -I$(SRC_PATH)/extra_lib/include/platinum/ -DGPAC_HAVE_CONFIG_H -I../..
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LINKLIBS= -lgpac -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread -laxTLS
+LOCAL_LIB=../../bin/gcc -L../../extra_lib/lib/gcc
+
+#common objects
+OBJS=GPACFileMediaServer.o GPACMediaController.o GPACMediaRenderer.o GenericDevice.o GPACPlatinum.o
+
+ifeq ($(CONFIG_JS),no)
+else
+CFLAGS+= $(JS_FLAGS)
+ifeq ($(CONFIG_JS),local)
+NEED_LOCAL_LIB="yes"
+LOCAL_LIB+=-L../../extra_lib/lib/gcc
+else
+LINKLIBS+= $(JS_LIBS)
+endif
+endif
+
+SRCS := $(OBJS:.o=.c)
+
+LIB=gm_platinum$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_WIN32),yes)
+#LDFLAGS+=-export-symbols platinum.def
+LINKLIBS+= -lwsock32 -lws2_32 -static-libstdc++ -static-libgcc
+endif
+
+ifeq ($(CONFIG_DARWIN), yes)
+LDFLAGS+=-framework Foundation
+endif
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CXX) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
+
+clean:
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend
+	$(CXX) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/psvr Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/psvr/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/psvr/psvr.c Added

@@ -0,0 +1,213 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / PSVR input 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/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+
+#include <hidapi/hidapi.h>
+
+typedef struct
+{
+	GF_ObjectManager *odm;
+	GF_Terminal *term;
+	GF_Thread *th;
+	Bool do_run;
+	void * device;
+
+	Float yaw, pitch, roll;
+	GF_TermEventFilter evt_filter;
+	Bool reset_mx;
+	Bool is_active;
+} GF_PSVR;
+
+#define PSVR_VENDOR_ID	0x054c
+#define PSVR_PRODUCT_ID	0x09af
+
+#define ACCELERATION_COEF 0.00003125f * GF_PI / 180
+
+static s16 read_s16(unsigned char *buffer, int offset)
+{
+	int16_t v;
+	v = buffer[offset];
+	v |= buffer[offset+1] << 8;
+	return v;
+}
+
+Bool psvr_on_event(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_PSVR *psvr = (GF_PSVR *)udta;
+	if (event->type==GF_EVENT_KEYDOWN) {
+		if (event->key.key_code==GF_KEY_HOME) {
+			psvr->reset_mx = GF_TRUE;
+		}
+	}
+	else if (event->type==GF_EVENT_SENSOR_REQUEST) {
+		if (event->activate_sensor.sensor_type==GF_EVENT_SENSOR_ORIENTATION) {
+			psvr->is_active = event->activate_sensor.activate;
+			return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+static u32 psvr_run(void *__psvr)
+{
+	GF_PSVR *psvr = (GF_PSVR *)__psvr;
+
+	hid_init();
+
+	psvr->device = hid_open(PSVR_VENDOR_ID, PSVR_PRODUCT_ID, 0);
+	if(!psvr->device) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PSVR] Failed to open PSVR HID device\n"));
+		return 0;
+	}
+
+	psvr->evt_filter.udta = psvr;
+	psvr->evt_filter.on_event = psvr_on_event;
+	gf_term_add_event_filter(psvr->term, &psvr->evt_filter);
+
+	psvr->is_active = GF_TRUE;
+	psvr->do_run = GF_TRUE;
+	while (psvr->do_run && psvr->device) {
+		unsigned char buffer[64];
+		//read device with 1 ms timeout
+		int size = hid_read_timeout(psvr->device, buffer, 64, 1);
+
+		if (size == 64) {
+			GF_Event evt;
+			s32 x_acc = read_s16(buffer, 20) + read_s16(buffer, 36);
+			s32 y_acc = read_s16(buffer, 22) + read_s16(buffer, 38);
+			s32 z_acc = read_s16(buffer, 24) + read_s16(buffer, 40);
+
+			if (psvr->reset_mx) {
+				psvr->reset_mx = 0;
+				psvr->yaw = psvr->pitch = psvr->roll = 0;
+			}
+
+			psvr->roll += -y_acc * ACCELERATION_COEF;
+			psvr->yaw += x_acc * ACCELERATION_COEF;
+			psvr->pitch += z_acc * ACCELERATION_COEF;
+
+			if (!psvr->is_active ) continue;
+
+			//post our event
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_SENSOR_ORIENTATION;
+			evt.sensor.x = psvr->yaw - GF_PI;
+			evt.sensor.y = psvr->pitch;
+			evt.sensor.z = GF_PI2 - psvr->roll;
+			evt.sensor.w = 0;
+
+			gf_term_user_event(psvr->term, &evt);
+		}
+	}
+	if (psvr->device) {
+		hid_close(psvr->device);
+		psvr->device = 0;
+	}
+	gf_term_remove_event_filter(psvr->term, &psvr->evt_filter);
+	psvr->term = NULL;
+	hid_exit();
+	return 0;
+}
+
+static Bool psvr_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_PSVR *psvr = termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		psvr->term = (GF_Terminal *) param;
+		opt = gf_opts_get_key("PSVR", "Enabled");
+		if (!opt || strcmp(opt, "yes")) return 0;
+
+		gf_th_run(psvr->th, psvr_run, psvr);
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		psvr->do_run = GF_FALSE;
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *psvr_new()
+{
+	GF_TermExt *dr;
+	GF_PSVR *psvr;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "PSVR Input", "gpac distribution");
+
+	GF_SAFEALLOC(psvr, GF_PSVR);
+	dr->process = psvr_process;
+	dr->udta = psvr;
+	psvr->th = gf_th_new("PSVR");
+
+	return dr;
+}
+
+
+void psvr_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_PSVR *psvr= dr->udta;
+	gf_th_del(psvr->th);
+	gf_free(psvr);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)psvr_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		psvr_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( psvr )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/rvc_dec Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/rvc_dec/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/rvc_dec/rvc_dec.c Added

@@ -0,0 +1,499 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenSVC Decoder module
+ *
+ *  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/modules/codec.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+
+#ifdef WIN32
+#define DllImport __declspec( dllimport )
+
+
+#if !defined(__GNUC__)
+#  pragma comment(lib, "RVCDecoder")
+#endif
+
+#else
+#define DllImport
+#endif
+
+
+
+typedef struct {
+	int Width;
+	int Height;
+	unsigned char* pY[1];
+	unsigned char* pU[1];
+	unsigned char* pV[1];
+} RVCFRAME;
+
+
+DllImport int rvc_init(char* XDF, char* VTLFolder, int isAVCFile);
+DllImport int rvc_decode(unsigned char* nal, int nal_length, char *outBuffer, int newBuffer);
+DllImport void rvc_close();
+
+
+typedef struct
+{
+	u16 ES_ID;
+	u32 width, stride, height, out_size, pixel_ar, layer;
+	Bool first_frame;
+
+	u32 nalu_size_length;
+
+	void *codec;
+} RVCDec;
+
+
+static GF_Err RVCD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
+{
+	u32 i, count;
+	s32 res;
+	char Picture;
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+	char* VTLFolder;
+	char *XDF_doc = NULL;
+	int isNALUFile;
+
+	/*not supported in this version*/
+	if (esd->dependsOnESID) return GF_NOT_SUPPORTED;
+
+	ctx->ES_ID = esd->ESID;
+	ctx->width = ctx->height = ctx->out_size = 0;
+
+	VTLFolder = (char *)gf_opts_get_key("RVCDecoder", "VTLPath");
+	if (!VTLFolder) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Cannot locate VTL: path is unknown. Please indicate path in GPAC config file:\n[RVCDecoder]\nVTLPath=PATH\n"));
+		return GF_SERVICE_ERROR;
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[RVC Decoder] Using VTL in %s\n", VTLFolder));
+	}
+
+	/*initialize RVC*/
+	if (esd->decoderConfig->predefined_rvc_config) {
+		char opt[100], *path;
+		FILE *f;
+		u32 size;
+		sprintf(opt, "Predefined_%d", esd->decoderConfig->predefined_rvc_config);
+		path = (char *) gf_opts_get_key("RVCDecoder", (const char *)opt);
+		if (!opt) return GF_NOT_SUPPORTED;
+		f = gf_fopen(path, "rt");
+		if (!f) return GF_NOT_SUPPORTED;
+		fseek(f, 0, SEEK_END);
+		size = ftell(f);
+		fseek(f, 0, SEEK_SET);
+		XDF_doc = gf_malloc(sizeof(char)*(size+1));
+		if (!XDF_doc) {
+			gf_fclose(f);
+			return GF_OUT_OF_MEM;
+		}
+		fread(XDF_doc, 1, size, f);
+		gf_fclose(f);
+		XDF_doc[size]=0;
+	} else {
+		if (!esd->decoderConfig->rvc_config)
+			return GF_NOT_SUPPORTED;
+		XDF_doc = esd->decoderConfig->rvc_config->data;
+	}
+
+
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_AVC:
+	case GPAC_OTI_VIDEO_SVC:
+	case GPAC_OTI_VIDEO_HEVC:
+	case GPAC_OTI_VIDEO_SHVC:
+		isNALUFile = 1;
+		break;
+	default:
+		isNALUFile = 0;
+		break;
+	}
+
+	rvc_init(XDF_doc, VTLFolder, isNALUFile); //->data contains the uncompressed XDF
+
+	/*free data*/
+	gf_free(XDF_doc);
+	if (esd->decoderConfig->rvc_config) {
+		esd->decoderConfig->rvc_config->data = NULL;
+		esd->decoderConfig->rvc_config->dataLength = 0;
+	}
+
+	/*decoder config not known, output buffers will be reconfigured at run-time*/
+	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
+		return GF_OK;
+
+	/*initialize the decoder */
+	if ( (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) ||  (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
+		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nalu_size_length = cfg->nal_unit_size;
+
+		/*decode all NALUs*/
+		count = gf_list_count(cfg->sequenceParameterSets);
+		for (i=0; i<count; i++) {
+			u32 w, h, par_n, par_d;
+			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
+
+			gf_avc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
+			/*by default use the base layer*/
+			if (!i) {
+				if ((ctx->width<w) || (ctx->height<h)) {
+					ctx->width = w;
+					ctx->height = h;
+					if ( ((s32)par_n>0) && ((s32)par_d>0) )
+						ctx->pixel_ar = (par_n<<16) || par_d;
+				}
+			}
+
+			/* call decode*/
+			res = rvc_decode(slc->data, slc->size, &Picture, 1);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding SPS %d\n", res));
+			}
+		}
+
+		count = gf_list_count(cfg->pictureParameterSets);
+		for (i=0; i<count; i++) {
+			GF_AVCConfigSlot *slc = gf_list_get(cfg->pictureParameterSets, i);
+			res = rvc_decode(slc->data, slc->size, &Picture, 1);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
+			}
+
+		}
+
+		gf_odf_avc_cfg_del(cfg);
+		/*initialize the decoder */
+	} else if ( (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) ||  (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)) {
+		GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nalu_size_length = cfg->nal_unit_size;
+
+		/*decode all NALUs*/
+		count = gf_list_count(cfg->param_array);
+		for (i=0; i<count; i++) {
+			u32 j, count2;
+			GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
+			count2 = gf_list_count(ar->nalus);
+			for (j=0; j<count2; j++) {
+				u32 w, h, par_n, par_d;
+				GF_AVCConfigSlot *slc = gf_list_get(ar->nalus, j);
+
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					gf_hevc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
+					/*by default use the base layer*/
+					if (!j) {
+						if ((ctx->width<w) || (ctx->height<h)) {
+							ctx->width = w;
+							ctx->height = h;
+							if ( ((s32)par_n>0) && ((s32)par_d>0) )
+								ctx->pixel_ar = (par_n<<16) || par_d;
+						}
+					}
+				}
+
+				/* call decode*/
+				res = rvc_decode(slc->data, slc->size, &Picture, 1);
+				if (res<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding parameter set: %d\n", res));
+				}
+			}
+		}
+
+		gf_odf_hevc_cfg_del(cfg);
+	} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
+		GF_M4VDecSpecInfo dsi;
+		GF_Err e;
+		/*decode DSI*/
+		e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+		if (e) return e;
+		if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->width = dsi.width;
+		ctx->height = dsi.height;
+		ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
+
+
+		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
+		}
+
+
+	} else {
+		/*unknown type, do what you want*/
+
+		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[RVC Decoder] Error decoding PPS %d\n", res));
+		}
+
+	}
+	/*adjust stride to what you decoder uses*/
+	ctx->stride = ctx->width;
+	/*precompute output buffer size*/
+	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+	return GF_OK;
+}
+static GF_Err RVCD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	//close RVC decoder
+	rvc_close();
+	ctx->codec = NULL;
+	ctx->width = ctx->height = ctx->out_size = 0;
+	return GF_OK;
+}
+static GF_Err RVCD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	switch (capability->CapCode) {
+	case GF_CODEC_RESILIENT:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_WIDTH:
+		capability->cap.valueInt = ctx->width;
+		break;
+	case GF_CODEC_HEIGHT:
+		capability->cap.valueInt = ctx->height;
+		break;
+	case GF_CODEC_STRIDE:
+		capability->cap.valueInt = ctx->stride;
+		break;
+	case GF_CODEC_PAR:
+		capability->cap.valueInt = ctx->pixel_ar;
+		break;
+	case GF_CODEC_OUTPUT_SIZE:
+		capability->cap.valueInt = ctx->out_size;
+		break;
+	case GF_CODEC_PIXEL_FORMAT:
+		capability->cap.valueInt = GF_PIXEL_YV12;
+		break;
+	case GF_CODEC_BUFFER_MIN:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_BUFFER_MAX:
+		capability->cap.valueInt = 2;
+		break;
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = 32;
+		break;
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 1;
+		break;
+	/*not known at our level...*/
+	case GF_CODEC_CU_DURATION:
+	default:
+		capability->cap.valueInt = 0;
+		break;
+	}
+	return GF_OK;
+}
+static GF_Err RVCD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+
+int bookmark = 0;
+
+static GF_Err RVCD_ProcessData(GF_MediaDecoder *ifcg,
+                               char *inBuffer, u32 inBufferLength,
+                               u16 ES_ID, u32 *CTS,
+                               char *outBuffer, u32 *outBufferLength,
+                               u8 PaddingBits, u32 mmlevel)
+{
+	s32 got_pic;
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	if (!ES_ID || (ES_ID!=ctx->ES_ID) /*|| !ctx->codec*/) {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
+	if (*outBufferLength < ctx->out_size) {
+		*outBufferLength = ctx->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+	//if your decoder outputs directly in the memory passed, setup pointers for your decoder output picture
+
+	got_pic = 0;
+
+	if (ctx->nalu_size_length) {
+		u32 i, nalu_size = 0;
+		u8 *ptr = inBuffer;
+		int nalNumber = 1;
+
+		while (inBufferLength) {
+			for (i=0; i<ctx->nalu_size_length; i++) {
+				nalu_size = (nalu_size<<8) + ptr[i];
+			}
+			ptr += ctx->nalu_size_length;
+
+			//same remark as above regardin start codes
+
+			if(nalNumber > bookmark) {
+				got_pic = rvc_decode(ptr, nalu_size, outBuffer, !got_pic);
+				bookmark ++;
+				if(got_pic>1) {
+					return GF_PACKED_FRAMES;
+				}
+			} else if(nalNumber == bookmark) {
+				got_pic = rvc_decode(NULL, 0, outBuffer, !got_pic);
+				if(got_pic>1) {
+					return GF_PACKED_FRAMES;
+				}
+			}
+			nalNumber ++;
+
+			ptr += nalu_size;
+			if (inBufferLength < nalu_size + ctx->nalu_size_length)
+				break;
+
+			inBufferLength -= nalu_size + ctx->nalu_size_length;
+		}
+		bookmark = 0;
+
+	} else {
+		u32 nalu_size = 0;
+		u8 *ptr = inBuffer;
+
+
+		got_pic = rvc_decode(ptr, inBufferLength, outBuffer, 1);
+	}
+
+	//if (got_pic!=1) return GF_OK;
+
+	/*if size changed during the decoding, resize the composition buffer*/
+	/*if ((pic.Width != ctx->width) || (pic.Height!=ctx->height))
+	{
+		ctx->width = pic.Width;
+		ctx->stride = pic.Width;
+		ctx->height = pic.Height;
+		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+		*outBufferLength = ctx->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+	*outBufferLength = ctx->out_size;*/
+
+	/*if your decoder does not output directly in the memory passed, copy over the data*/
+
+	/*memcpy(outBuffer, pic.pY[0], ctx->stride*ctx->height);
+	memcpy(outBuffer + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
+	memcpy(outBuffer + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);*/
+
+	if(got_pic>1) return GF_PACKED_FRAMES;
+	return GF_OK;
+}
+
+static u32 RVCD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
+	/*media type query*/
+	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_AVC:
+	case GPAC_OTI_VIDEO_SVC:
+	case GPAC_OTI_VIDEO_MPEG4_PART2:
+	case GPAC_OTI_VIDEO_HEVC:
+	case GPAC_OTI_VIDEO_SHVC:
+		if (!esd->decoderConfig->rvc_config && !esd->decoderConfig->predefined_rvc_config) return GF_CODEC_NOT_SUPPORTED;
+		return GF_CODEC_SUPPORTED+1;
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static const char *RVCD_GetCodecName(GF_BaseDecoder *dec)
+{
+	return "Reconfigurable Video Decoder";
+}
+
+GF_BaseDecoder *NewRVCDec()
+{
+	GF_MediaDecoder *ifcd;
+	RVCDec *dec;
+
+	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
+	GF_SAFEALLOC(dec, RVCDec);
+	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "RVC Decoder", "gpac distribution")
+
+	ifcd->privateStack = dec;
+
+	/*setup our own interface*/
+	ifcd->AttachStream = RVCD_AttachStream;
+	ifcd->DetachStream = RVCD_DetachStream;
+	ifcd->GetCapabilities = RVCD_GetCapabilities;
+	ifcd->SetCapabilities = RVCD_SetCapabilities;
+	ifcd->GetName = RVCD_GetCodecName;
+	ifcd->CanHandleStream = RVCD_CanHandleStream;
+	ifcd->ProcessData = RVCD_ProcessData;
+	return (GF_BaseDecoder *) ifcd;
+}
+
+void DeleteRVCDec(GF_BaseDecoder *ifcg)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+	gf_free(ctx);
+	gf_free(ifcg);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		GF_MEDIA_DECODER_INTERFACE,
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewRVCDec();
+#endif
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+	case GF_MEDIA_DECODER_INTERFACE:
+		DeleteRVCDec((GF_BaseDecoder*)ifce);
+		break;
+#endif
+	}
+}
+
+
+GPAC_MODULE_STATIC_DECLARATION( rev_dec )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ui_rec Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ui_rec/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ui_rec/readme.txt Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/ui_rec/ui_rec.c Added

@@ -0,0 +1,252 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2007-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / User Event Recorder 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.
+ *
+ */
+
+/*base SVG type*/
+#include <gpac/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+
+
+typedef struct __ui_rec
+{
+	FILE *uif;
+	GF_BitStream *bs;
+	GF_Terminal *term;
+	GF_Clock *ck;
+
+	GF_Event next_event;
+	u32 next_time;
+	Bool evt_loaded;
+
+	GF_TermEventFilter evt_filter;
+} GF_UIRecord;
+
+Bool uir_on_event_play(GF_UIRecord *uir , GF_Event *event, Bool consumed_by_compositor)
+{
+	switch (event->type) {
+	case GF_EVENT_CONNECT:
+		if (event->connect.is_connected) {
+			uir->ck = uir->term->root_scene->scene_codec ? uir->term->root_scene->scene_codec->ck : uir->term->root_scene->dyn_ck;
+		}
+		break;
+	}
+	return GF_FALSE;
+}
+
+Bool uir_on_event_record(GF_UIRecord *uir , GF_Event *event, Bool consumed_by_compositor)
+{
+	switch (event->type) {
+	case GF_EVENT_CONNECT:
+		if (event->connect.is_connected) {
+			uir->ck = uir->term->root_scene->scene_codec ? uir->term->root_scene->scene_codec->ck : uir->term->root_scene->dyn_ck;
+		}
+		break;
+	case GF_EVENT_CLICK:
+	case GF_EVENT_MOUSEUP:
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
+	case GF_EVENT_MOUSEOUT:
+	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
+	case GF_EVENT_MOUSEMOVE:
+	/*mouse wheel event*/
+	case GF_EVENT_MOUSEWHEEL:
+		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
+		gf_bs_write_u8(uir->bs, event->type);
+		gf_bs_write_u8(uir->bs, event->mouse.button);
+		gf_bs_write_u32(uir->bs, event->mouse.x);
+		gf_bs_write_u32(uir->bs, event->mouse.y);
+		gf_bs_write_float(uir->bs, FIX2FLT(event->mouse.wheel_pos) );
+		gf_bs_write_u8(uir->bs, event->mouse.key_states);
+		break;
+	/*Key Events*/
+	case GF_EVENT_KEYUP:
+	case GF_EVENT_KEYDOWN:
+	case GF_EVENT_LONGKEYPRESS:
+		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
+		gf_bs_write_u8(uir->bs, event->type);
+		gf_bs_write_u32(uir->bs, event->key.key_code);
+		gf_bs_write_u32(uir->bs, event->key.hw_code);
+		gf_bs_write_u32(uir->bs, event->key.flags);
+		break;
+	/*character input*/
+	case GF_EVENT_TEXTINPUT:
+		gf_bs_write_u32(uir->bs, gf_clock_time(uir->ck) );
+		gf_bs_write_u8(uir->bs, event->type);
+		gf_bs_write_u32(uir->bs, event->character.unicode_char);
+		break;
+	}
+	return GF_FALSE;
+}
+
+void uir_load_event(GF_UIRecord *uir)
+{
+	memset(&uir->next_event, 0, sizeof(GF_Event));
+	uir->evt_loaded = GF_FALSE;
+	if (!gf_bs_available(uir->bs)) return;
+
+
+	uir->next_time = gf_bs_read_u32(uir->bs);
+	uir->next_event.type = gf_bs_read_u8(uir->bs);
+	switch (uir->next_event.type) {
+	case GF_EVENT_CLICK:
+	case GF_EVENT_MOUSEUP:
+	case GF_EVENT_MOUSEDOWN:
+	case GF_EVENT_MOUSEOVER:
+	case GF_EVENT_MOUSEOUT:
+	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
+	case GF_EVENT_MOUSEMOVE:
+	/*mouse wheel event*/
+	case GF_EVENT_MOUSEWHEEL:
+		uir->next_event.mouse.button = gf_bs_read_u8(uir->bs);
+		uir->next_event.mouse.x = gf_bs_read_u32(uir->bs);
+		uir->next_event.mouse.y = gf_bs_read_u32(uir->bs);
+		uir->next_event.mouse.wheel_pos = FLT2FIX( gf_bs_read_float(uir->bs) );
+		uir->next_event.mouse.key_states = gf_bs_read_u8(uir->bs);
+		break;
+	/*Key Events*/
+	case GF_EVENT_KEYUP:
+	case GF_EVENT_KEYDOWN:
+	case GF_EVENT_LONGKEYPRESS:
+		uir->next_event.key.key_code = gf_bs_read_u32(uir->bs);
+		uir->next_event.key.hw_code = gf_bs_read_u32(uir->bs);
+		uir->next_event.key.flags = gf_bs_read_u32(uir->bs);
+		break;
+	/*character input*/
+	case GF_EVENT_TEXTINPUT:
+		uir->next_event.character.unicode_char = gf_bs_read_u32(uir->bs);
+		break;
+	}
+	uir->evt_loaded = GF_TRUE;
+}
+
+static Bool uir_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt, *uifile;
+	GF_UIRecord *uir = (GF_UIRecord*)termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		uir->term = (GF_Terminal *) param;
+		opt = gf_opts_get_key("UIRecord", "Mode");
+		if (!opt) return GF_FALSE;
+		uifile = gf_opts_get_key("UIRecord", "File");
+		if (!uifile) return GF_FALSE;
+
+		if (!strcmp(opt, "Play")) {
+			uir->uif = gf_fopen(uifile, "rb");
+			if (!uir->uif) return GF_FALSE;
+			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_READ);
+			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+
+			uir->evt_filter.on_event = uir_on_event_play;
+			uir->evt_filter.udta = uir;
+			gf_term_add_event_filter(uir->term, &uir->evt_filter);
+
+			uir_load_event(uir);
+		} else if (!strcmp(opt, "Record")) {
+			uir->uif = gf_fopen(uifile, "wb");
+			if (!uir->uif) return GF_FALSE;
+			uir->bs = gf_bs_from_file(uir->uif, GF_BITSTREAM_WRITE);
+
+			uir->evt_filter.on_event = uir_on_event_record;
+			uir->evt_filter.udta = uir;
+			gf_term_add_event_filter(uir->term, &uir->evt_filter);
+		} else {
+			return GF_FALSE;
+		}
+		return GF_TRUE;
+
+	case GF_TERM_EXT_STOP:
+		if (uir->uif) gf_fclose(uir->uif);
+		if (uir->bs) gf_bs_del(uir->bs);
+		gf_term_remove_event_filter(uir->term, &uir->evt_filter);
+		uir->term = NULL;
+		/*auto-disable the plugin by default*/
+		gf_opts_set_key("UIRecord", "Mode", "Disable");
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+		/*flush all events until current time if reached*/
+		while (uir->evt_loaded && uir->ck && (uir->next_time <= gf_clock_time(uir->ck) )) {
+			uir->term->compositor->video_out->on_event(uir->term->compositor->video_out->evt_cbk_hdl, &uir->next_event);
+			uir_load_event(uir);
+		}
+		break;
+	}
+	return GF_FALSE;
+}
+
+
+GF_TermExt *uir_new()
+{
+	GF_TermExt *dr;
+	GF_UIRecord *uir;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC UI Recorder", "gpac distribution");
+
+	GF_SAFEALLOC(uir, GF_UIRecord);
+	dr->process = uir_process;
+	dr->udta = uir;
+	return dr;
+}
+
+
+void uir_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_UIRecord *uir = (GF_UIRecord*)dr->udta;
+	gf_free(uir);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)uir_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		uir_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DECLARATION( ui_rec )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/Makefile Added

@@ -0,0 +1,66 @@
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/widgetman
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LINKLIBS= -lgpac -lz
+LOCAL_LIB=-L../../bin/gcc
+
+#common objects
+OBJS=widgetman.o unzip.o widget.o wgt_load.o
+
+ifeq ($(CONFIG_ZLIB), local)
+CFLAGS+=-I"$(LOCAL_INC_PATH)/zlib"
+LOCAL_LIB+= -L../../extra_lib/lib/gcc
+endif
+
+ifeq ($(CONFIG_JS),no)
+else
+CFLAGS+=$(JS_FLAGS)
+ifeq ($(CONFIG_JS),local)
+# if local it is staticly linked with libgpac
+NEED_LOCAL_LIB="yes"
+LOCAL_LIB+= -L../../extra_lib/lib/gcc
+else
+LINKLIBS+= $(JS_LIBS)
+endif
+endif
+
+SRCS := $(OBJS:.o=.c)
+
+LIB=gm_widgetman$(DYN_LIB_SUFFIX)
+ifeq ($(CONFIG_WIN32),yes)
+#LDFLAGS+=-export-symbols widgetman.def
+endif
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) $(LOCAL_LIB) $(LINKLIBS) $(LDFLAGS)
+
+clean:
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/unzip.c Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/unzip.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/wgt_load.c Added

@@ -0,0 +1,308 @@
+//This software module was originally developed by TelecomParisTech in the
+//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+//
+//This software module is an implementation of a part of one or
+//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+//(ISO/IEC 23007-1) free license to this software module or modifications
+//thereof for use in hardware or software products claiming conformance to
+//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+//module in hardware or software products are advised that its use may
+//infringe existing patents.
+//The original developer of this software module and his/her company, the
+//subsequent editors and their companies, and ISO/IEC have no liability
+//for use of this software module or modifications thereof in an implementation.
+//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
+//products.
+//Telecom ParisTech retains full right to use the code for his/her own purpose,
+//assign or donate the code to a third party and to inhibit third parties from
+//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
+//
+//This copyright notice must be included in all copies or derivative works.
+//
+//Copyright (c) 2009 Telecom ParisTech.
+//
+// Alternatively, this software module may be redistributed and/or modified
+//  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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:
+//					Cyril Concolato, Telecom ParisTech
+//					Jean Le Feuvre, Telecom ParisTech
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/constants.h>
+
+#if defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG)
+
+typedef struct
+{
+	GF_Scene *scene;
+	u8 oti;
+	char *file_name;
+	u32 file_size;
+	Bool loaded;
+} WgtLoad;
+
+static GF_Err WGT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
+                              u16 ES_ID, u32 stream_time, u32 mmlevel)
+{
+	GF_Err e = GF_OK;
+	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
+
+	if (stream_time==(u32)-1) {
+		gf_sg_reset(wgtload->scene->graph);
+		return GF_OK;
+	}
+
+	switch (wgtload->oti) {
+	case GPAC_OTI_PRIVATE_SCENE_WGT:
+		if (wgtload->file_name && !wgtload->loaded) {
+			const char *path, *wmpath;
+			char *tmp;
+			GF_Node *n, *root;
+			GF_FieldInfo info;
+			FILE *jsfile;
+			GF_ChildNodeItem *last;
+
+			wgtload->loaded = GF_TRUE;
+
+			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2000/svg", NULL);
+			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/1999/xlink", "xlink");
+			gf_sg_add_namespace(wgtload->scene->graph, "http://www.w3.org/2001/xml-events", "ev");
+			gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, GF_TRUE);
+
+			/* modify the scene with an Inline/Animation pointing to the widget start file URL */
+			n = root = gf_node_new(wgtload->scene->graph, TAG_SVG_svg);
+			gf_node_register(root, NULL);
+			gf_sg_set_root_node(wgtload->scene->graph, root);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+			gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
+			gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
+			gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
+			/*
+						gf_sg_set_scene_size_info(wgtload->scene->graph, 800, 600, 1);
+						gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, 1, 0, &info);
+						gf_svg_parse_attribute(n, &info, "800", 0);
+						gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, 1, 0, &info);
+						gf_svg_parse_attribute(n, &info, "600", 0);
+			*/
+			gf_node_init(n);
+
+			n = gf_node_new(wgtload->scene->graph, TAG_SVG_animation);
+			gf_node_set_id(n, 1, "w_anim");
+			gf_node_register(n, root);
+			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_FALSE, &info);
+			gf_svg_parse_attribute(n, &info, "320", 0);
+			gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_FALSE, &info);
+			gf_svg_parse_attribute(n, &info, "240", 0);
+			gf_node_init(n);
+
+			tmp = wgtload->file_name;
+			while ((tmp = strchr(tmp, '\\'))) {
+				tmp[0] = '/';
+				tmp++;
+			}
+
+			n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
+			gf_node_register(n, root);
+			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
+			path = gf_opts_get_key("Widgets", "WidgetLoadScript");
+			jsfile = path ? gf_fopen(path, "rt") : NULL;
+			if (jsfile) {
+				gf_fclose(jsfile);
+				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
+				gf_svg_parse_attribute(n, &info, (char *) path, 0);
+			} else {
+				const char *load_fun = "function load_widget(wid_url) {\n"
+				                       "	var wid = WidgetManager.load(wid_url);\n"
+				                       "	var anim = document.getElementById('w_anim');\n"
+				                       "	if (wid != null) {\n"
+				                       "		wid.activate(anim);"
+				                       "		anim.setAttributeNS('http://www.w3.org/1999/xlink', 'href', wid.main);\n"
+				                       "	} else {\n"
+				                       "		alert('Widget ' + wid_url + ' is not valid');\n"
+				                       "	}\n"
+				                       "}\n";
+
+				gf_dom_add_text_node(n, gf_strdup(load_fun) );
+			}
+			gf_node_init(n);
+
+
+			wmpath = gf_opts_get_key("Widgets", "WidgetManagerScript");
+			jsfile = wmpath ? gf_fopen(wmpath, "rt") : NULL;
+			if (jsfile) {
+				gf_fclose(jsfile);
+				n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
+				gf_node_register(n, root);
+				gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
+				gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
+				gf_svg_parse_attribute(n, &info, (char *) wmpath, 0);
+				gf_node_init(n);
+
+				n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
+				gf_node_register(n, root);
+				gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
+				gf_dom_add_text_node(n, gf_strdup("widget_manager_init();") );
+				gf_node_init(n);
+			}
+
+			tmp = (char*)gf_malloc(sizeof(char) * (strlen(wgtload->file_name)+50) );
+			sprintf(tmp, "load_widget(\"%s\");\n", wgtload->file_name);
+
+			n = gf_node_new(wgtload->scene->graph, TAG_SVG_script);
+			gf_node_register(n, root);
+			gf_node_list_add_child_last(&((GF_ParentNode *)root)->children, n, &last);
+			gf_dom_add_text_node(n, gf_strdup(tmp) );
+			gf_free(tmp);
+
+			gf_node_init(n);
+
+			if ((wgtload->scene->graph_attached!=1) && (gf_sg_get_root_node(wgtload->scene->graph)!=NULL) ) {
+				gf_scene_attach_to_compositor(wgtload->scene);
+				e = GF_EOS;
+			}
+		}
+		break;
+
+	default:
+		return GF_BAD_PARAM;
+	}
+	return e;
+}
+
+static GF_Err WGT_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
+{
+	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
+	wgtload->scene = scene;
+	return GF_OK;
+}
+
+static GF_Err WGT_ReleaseScene(GF_SceneDecoder *plug)
+{
+	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
+	wgtload->scene = NULL;
+	return GF_OK;
+}
+
+static GF_Err WGT_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
+{
+	GF_BitStream *bs;
+	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
+	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
+
+	/* decSpecInfo is not null only when reading from an WGT file (local or distant, cached or not) */
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_PRIVATE_SCENE_WGT:
+	default:
+		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
+		bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+		wgtload->file_size = gf_bs_read_u32(bs);
+		gf_bs_del(bs);
+		wgtload->file_name =  (char *) gf_malloc(sizeof(char)*(1 + esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32)) );
+		memcpy(wgtload->file_name, esd->decoderConfig->decoderSpecificInfo->data + sizeof(u32), esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) );
+		wgtload->file_name[esd->decoderConfig->decoderSpecificInfo->dataLength - sizeof(u32) ] = 0;
+		break;
+	}
+	wgtload->oti = esd->decoderConfig->objectTypeIndication;
+	return GF_OK;
+}
+
+static GF_Err WGT_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
+{
+	WgtLoad *wgtload = (WgtLoad *)plug->privateStack;
+	if (wgtload->file_name) gf_free(wgtload->file_name);
+	wgtload->file_name = NULL;
+	return GF_OK;
+}
+
+const char *WGT_GetName(struct _basedecoder *plug)
+{
+	return "GPAC W3C Widget Loader";
+}
+
+static u32 WGT_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	/*don't reply to media type query*/
+	if (!esd) return GF_CODEC_NOT_SUPPORTED;
+
+	if (StreamType==GF_STREAM_PRIVATE_SCENE) {
+		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_PRIVATE_SCENE_WGT) return GF_CODEC_SUPPORTED;
+		return GF_CODEC_NOT_SUPPORTED;
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static GF_Err WGT_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
+{
+	cap->cap.valueInt = 0;
+	if (cap->CapCode==GF_CODEC_PADDING_BYTES) {
+		/* Adding one byte of padding for \r\n problems*/
+		cap->cap.valueInt = 1;
+		return GF_OK;
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err WGT_SetCapabilities(GF_BaseDecoder *plug, const GF_CodecCapability capability)
+{
+	return GF_OK;
+}
+
+/*interface create*/
+GF_BaseInterface *LoadWidgetReader()
+{
+	WgtLoad *wgtload;
+	GF_SceneDecoder *sdec;
+
+	GF_SAFEALLOC(sdec, GF_SceneDecoder)
+	if (!sdec) return NULL;
+	GF_REGISTER_MODULE_INTERFACE(sdec, GF_SCENE_DECODER_INTERFACE, "GPAC W3C Widget Loader", "gpac distribution");
+
+	GF_SAFEALLOC(wgtload, WgtLoad);
+	if (!wgtload) {
+		gf_free(sdec);
+		return NULL;
+	}
+	
+	sdec->privateStack = wgtload;
+	sdec->AttachStream = WGT_AttachStream;
+	sdec->CanHandleStream = WGT_CanHandleStream;
+	sdec->DetachStream = WGT_DetachStream;
+	sdec->AttachScene = WGT_AttachScene;
+	sdec->ReleaseScene = WGT_ReleaseScene;
+	sdec->ProcessData = WGT_ProcessData;
+	sdec->GetName = WGT_GetName;
+	sdec->SetCapabilities = WGT_SetCapabilities;
+	sdec->GetCapabilities = WGT_GetCapabilities;
+	return (GF_BaseInterface *)sdec;
+}
+
+
+/*interface destroy*/
+void ShutdownWidgetReader(GF_BaseInterface *ifce)
+{
+	GF_SceneDecoder *sdec = (GF_SceneDecoder *)ifce;
+	WgtLoad *wgtload;
+	if (!ifce)
+		return;
+	wgtload = (WgtLoad *) sdec->privateStack;
+	if (wgtload)
+		gf_free(wgtload);
+	sdec->privateStack = NULL;
+	gf_free(sdec);
+}
+
+#endif	/* defined(GPAC_HAS_SPIDERMONKEY) && !defined(GPAC_DISABLE_SVG) */

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/wgt_load_base.js Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/widget.c Added

@@ -0,0 +1,452 @@
+//This software module was originally developed by TelecomParisTech in the
+//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+//
+//This software module is an implementation of a part of one or
+//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+//(ISO/IEC 23007-1) free license to this software module or modifications
+//thereof for use in hardware or software products claiming conformance to
+//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+//module in hardware or software products are advised that its use may
+//infringe existing patents.
+//The original developer of this software module and his/her company, the
+//subsequent editors and their companies, and ISO/IEC have no liability
+//for use of this software module or modifications thereof in an implementation.
+//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
+//products.
+//Telecom ParisTech retains full right to use the code for his/her own purpose,
+//assign or donate the code to a third party and to inhibit third parties from
+//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
+//
+//This copyright notice must be included in all copies or derivative works.
+//
+//Copyright (c) 2009 Telecom ParisTech.
+//
+// Alternatively, this software module may be redistributed and/or modified
+//  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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:
+//					Jean Le Feuvre, Telecom ParisTech
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+
+#include "widgetman.h"
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+JSBool SMJS_FUNCTION(widget_has_feature)
+{
+	char *feat_name;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+
+	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+
+	feat_name = SMJS_CHARS(c, argv[0]);
+	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+
+	if (!strcmp(feat_name, "urn:mpeg:systems:mpeg-u:2009")) SMJS_SET_RVAL( BOOLEAN_TO_JSVAL( JS_TRUE ));
+	SMJS_FREE(c, feat_name);
+	return JS_TRUE;
+}
+
+JSBool SMJS_FUNCTION(widget_open_url)
+{
+	GF_Event evt;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_NAVIGATE;
+	evt.navigate.to_url = SMJS_CHARS(c, argv[0]);
+	gf_term_send_event(wid->widget->wm->term, &evt);
+	SMJS_FREE(c, (char *)evt.navigate.to_url);
+
+	return JS_TRUE;
+}
+
+JSBool SMJS_FUNCTION(widget_get_attention)
+{
+	jsval fval;
+	SMJS_OBJ
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_TRUE;
+
+	if ((JS_LookupProperty(c, wid->widget->wm->obj, "getAttention", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
+		jsval args[1];
+		args[0] = OBJECT_TO_JSVAL(wid->obj);
+		JS_CallFunctionValue(c, wid->widget->wm->obj, fval, 1, args, SMJS_GET_RVAL);
+	}
+	return JS_TRUE;
+}
+
+JSBool SMJS_FUNCTION(widget_show_notification)
+{
+	jsval fval;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_TRUE;
+
+	if ((JS_LookupProperty(c, wid->widget->wm->obj, "showNotification", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
+		jsval *vars;
+		u32 i;
+		vars = (jsval*)gf_malloc(sizeof(jsval)*(argc+1));
+		vars[0] = OBJECT_TO_JSVAL(wid->obj);
+		for (i=0; i<argc; i++)
+			vars[i+1] = argv[i];
+
+		JS_CallFunctionValue(c, wid->widget->wm->obj, fval, argc+1, vars, SMJS_GET_RVAL);
+	}
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(widget_call_message_reply_callback)
+{
+	JSObject *list;
+	jsval *vals, fval;
+	u32 i, count;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetMessage *msg = SMJS_GET_PRIVATE(c, obj);
+	if (!msg || !argc || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
+
+	if ((JS_LookupProperty(c, obj, "replyCallback", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
+		list = JSVAL_TO_OBJECT(argv[0]);
+		JS_GetArrayLength(c, list, (jsuint*) &count);
+		vals = (jsval*)gf_malloc(sizeof(jsval)*(count+1));
+		vals[0] = OBJECT_TO_JSVAL(obj);
+		for (i=0; i<count; i++) {
+			JS_GetElement(c, list, (jsint) i, &vals[i+1]);
+		}
+		JS_CallFunctionValue(c, obj, fval, count, vals, SMJS_GET_RVAL);
+		gf_free(vals);
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(widget_message_handler_factory)
+{
+	char *msg_name;
+	u32 i, count;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!bifce) return JS_FALSE;
+
+	if (!argc) return JS_FALSE;
+	if (!JSVAL_IS_STRING(argv[0])) return JS_FALSE;
+
+	msg_name = SMJS_CHARS(c, argv[0]);
+	if (!msg_name ) return JS_FALSE;
+
+	SMJS_SET_RVAL( JSVAL_NULL );
+	count = gf_list_count(bifce->ifce->messages);
+	for (i=0; i<count; i++) {
+		GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, i);
+		if (!strcmp(msg->name, msg_name)) {
+			JSObject *an_obj = JS_NewObject(c, &bifce->wid->widget->wm->widgetAnyClass._class, 0, 0);
+			SMJS_SET_PRIVATE(c, an_obj, msg);
+			JS_DefineProperty(c, an_obj, "msgName", STRING_TO_JSVAL( JS_NewStringCopyZ(c, msg->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, an_obj, "interfaceHandler", OBJECT_TO_JSVAL( obj ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineFunction(c, an_obj, "onInvokeReply", widget_call_message_reply_callback, 1, 0);
+
+			if ((argc==2) && JSVAL_IS_OBJECT(argv[1]) && !JSVAL_IS_NULL(argv[1]))
+				JS_DefineProperty(c, an_obj, "replyCallback", argv[1], 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+
+			SMJS_SET_RVAL( OBJECT_TO_JSVAL(an_obj) );
+		}
+	}
+	SMJS_FREE(c, msg_name);
+	return JS_TRUE;
+}
+static JSBool SMJS_FUNCTION(widget_invoke_message)
+{
+	jsval oval;
+	GF_WidgetMessage *msg = NULL;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!bifce) return JS_FALSE;
+
+	SMJS_SET_RVAL( JSVAL_NULL );
+
+	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
+	if (JSVAL_IS_NULL(argv[0])) return JS_FALSE;
+	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!msg) return JS_FALSE;
+
+	/*look for JS Callback "invoke" in the widget manager script*/
+	if (JS_LookupProperty(c, bifce->ifce->obj, "invoke", &oval)==JS_TRUE) {
+		if (JSVAL_IS_OBJECT(oval)) {
+			JS_CallFunctionValue(bifce->wid->widget->wm->ctx, bifce->ifce->obj, oval, argc, argv, SMJS_GET_RVAL );
+		}
+	}
+
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(widget_invoke_message_reply)
+{
+	jsval oval;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetMessage *msg = NULL;
+	GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!bifce) return JS_FALSE;
+
+	SMJS_SET_RVAL( JSVAL_NULL );
+
+	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
+	if (JSVAL_IS_NULL(argv[0])) return JS_FALSE;
+	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!msg) return JS_FALSE;
+
+	/*look for JS Callback "invokeReply" in the widget manager script*/
+	if (JS_LookupProperty(c, bifce->ifce->obj, "invokeReply", &oval)==JS_TRUE) {
+		if (JSVAL_IS_OBJECT(oval)) {
+			JS_CallFunctionValue(bifce->wid->widget->wm->ctx, bifce->ifce->obj, oval, argc, argv, SMJS_GET_RVAL);
+		}
+	}
+	return JS_TRUE;
+}
+
+static void widget_interface_js_bind(JSContext *c, GF_WidgetInterfaceInstance *ifce)
+{
+	if (!ifce->obj) {
+		ifce->obj = JS_NewObject(c, &ifce->wid->widget->wm->widgetAnyClass._class, 0, 0);
+		SMJS_SET_PRIVATE(c, ifce->obj, ifce);
+		gf_js_add_root(c, &ifce->obj, GF_JSGC_OBJECT);
+		JS_DefineProperty(c, ifce->obj, "type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->ifce->type) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, ifce->obj, "bound", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->hostname) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineFunction(c, ifce->obj, "invoke", widget_invoke_message, 1, 0);
+		JS_DefineFunction(c, ifce->obj, "msgHandlerFactory", widget_message_handler_factory, 1, 0);
+		JS_DefineFunction(c, ifce->obj, "invokeReply", widget_invoke_message_reply, 1, 0);
+	}
+}
+
+static JSBool SMJS_FUNCTION(widget_get_interfaces)
+{
+	u32 i, count;
+	char *ifce_name;
+	JSObject *list;
+	jsuint idx;
+	jsval v;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+
+	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+	ifce_name = SMJS_CHARS(c, argv[0]);
+
+	list = JS_NewArrayObject(c, 0, 0);
+
+	count = gf_list_count(wid->bound_ifces);
+	for (i=0; i<count; i++) {
+		GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
+		if (strcmp(ifce->ifce->type, ifce_name)) continue;
+
+		widget_interface_js_bind(c, ifce);
+
+		JS_GetArrayLength(c, list, &idx);
+		v = OBJECT_TO_JSVAL(ifce->obj);
+		JS_SetElement(c, list, idx, &v);
+	}
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(list) );
+	SMJS_FREE(c, ifce_name);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION_EXT(widget_activate_component, Bool is_deactivate)
+{
+	u32 i, count;
+	char *comp_id;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+
+	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+	comp_id = SMJS_CHARS(c, argv[0]);
+
+	count = gf_list_count(wid->widget->main->components);
+	for (i=0; i<count; i++) {
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
+		if (!comp->id  || strcmp(comp->id, comp_id)) continue;
+
+		if (is_deactivate) {
+			wm_deactivate_component(c, wid, comp, NULL);
+		} else {
+			wm_activate_component(c, wid, comp, GF_FALSE);
+		}
+		break;
+	}
+	SMJS_FREE(c, comp_id);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(widget_activate_widget)
+{
+	return widget_activate_component(SMJS_CALL_ARGS, GF_FALSE);
+}
+
+static JSBool SMJS_FUNCTION(widget_deactivate_widget)
+{
+	return widget_activate_component(SMJS_CALL_ARGS, GF_TRUE);
+}
+
+void widget_on_interface_bind(GF_WidgetInterfaceInstance *ifce, Bool unbind)
+{
+	jsval funval, rval, argv[1];
+
+	const char *fun_name = unbind ? "onInterfaceUnbind" : "onInterfaceBind";
+	if (!ifce || !ifce->wid || !ifce->wid->scene_context) return;
+
+	/*look for JS Callback "invoke" in the widget manager script*/
+	if (JS_LookupProperty(ifce->wid->scene_context, ifce->wid->scene_obj, fun_name, &funval)!=JS_TRUE)
+		return;
+	if (!JSVAL_IS_OBJECT(funval)) return;
+
+	widget_interface_js_bind(ifce->wid->widget->wm->ctx, ifce);
+	argv[0] = OBJECT_TO_JSVAL(ifce->obj);
+	JS_CallFunctionValue(ifce->wid->widget->wm->ctx, ifce->ifce->obj, funval, 1, argv, &rval);
+
+}
+
+SMJS_FUNC_PROP_GET(widget_getProperty)
+
+const char *opt;
+char *prop_name;
+GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+if (!wid) return JS_FALSE;
+
+if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+if (!prop_name) return JS_FALSE;
+
+if (!strcmp(prop_name, "viewMode")) {
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "floating") );
+}
+else if (!strcmp(prop_name, "locale")) {
+	opt = gf_opts_get_key("core", "lang");
+	if (!opt) opt = "und";
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, opt) );
+}
+else if (!strcmp(prop_name, "identifier")) {
+	if (wid->widget->identifier) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->identifier) );
+}
+else if (!strcmp(prop_name, "authorName")) {
+	if (wid->widget->authorName) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorName) );
+}
+else if (!strcmp(prop_name, "authorEmail")) {
+	if (wid->widget->authorEmail) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorEmail) );
+}
+else if (!strcmp(prop_name, "authorHref")) {
+	if (wid->widget->authorHref) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->authorHref) );
+}
+else if (!strcmp(prop_name, "name")) {
+	if (wid->widget->name) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->name) );
+}
+else if (!strcmp(prop_name, "version")) {
+	if (wid->widget->version) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->version) );
+}
+else if (!strcmp(prop_name, "description")) {
+	if (wid->widget->description) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, wid->widget->description) );
+}
+else if (!strcmp(prop_name, "width")) {
+	opt = gf_opts_get_key((const char *) wid->secname, "width");
+	*vp = INT_TO_JSVAL( (opt ? atoi(opt) : 0) );
+}
+else if (!strcmp(prop_name, "height")) {
+	opt = gf_opts_get_key((const char *) wid->secname, "height");
+	*vp = INT_TO_JSVAL( (opt ? atoi(opt) : 0) );
+}
+else if (!strcmp(prop_name, "preferences")) {
+}
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
+}
+
+SMJS_FUNC_PROP_SET( widget_setProperty)
+
+/*avoids GCC warning*/
+if (!obj) obj = NULL;
+#ifndef GPAC_CONFIG_DARWIN
+if (!id) id=0;
+#endif
+if (!vp) vp=0;
+return JS_TRUE;
+}
+
+void widget_load(GF_WidgetManager *wm, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
+{
+	u32 i, count;
+	GF_WidgetInstance *wi;
+
+	/*Is this scenegraph a widget or not ? To find out, browse all widget instances*/
+	i=0;
+	while ((wi = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i))) {
+		if (!wi->scene || (wi->scene != scene)) continue;
+		break;
+	}
+	if (!wi) return;
+
+	/*OK we found our widget*/
+
+	if (unload) {
+		/*detach all bound interfaces from this script*/
+		count = gf_list_count(wi->bound_ifces);
+		for (i=0; i<count; i++) {
+			GF_WidgetInterfaceInstance *ifce = (GF_WidgetInterfaceInstance*)gf_list_get(wi->bound_ifces, i);
+			if (ifce->obj) {
+				SMJS_SET_PRIVATE(c, ifce->obj, NULL);
+				gf_js_remove_root(c, &ifce->obj, GF_JSGC_OBJECT);
+				ifce->obj = NULL;
+			}
+		}
+		return;
+	} else {
+
+		JSPropertySpec widgetClassProps[] = {
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+		};
+		JSFunctionSpec widgetClassFuncs[] = {
+			/*W3C*/
+			SMJS_FUNCTION_SPEC("has_feature", widget_has_feature, 1),
+			SMJS_FUNCTION_SPEC("openURL", widget_open_url, 1),
+			SMJS_FUNCTION_SPEC("getAttention", widget_get_attention, 0),
+			SMJS_FUNCTION_SPEC("showNotification", widget_show_notification, 0),
+			/*MPEG*/
+			SMJS_FUNCTION_SPEC("getInterfaceHandlersByType", widget_get_interfaces, 1),
+			SMJS_FUNCTION_SPEC("activateComponentWidget", widget_activate_widget, 1),
+			SMJS_FUNCTION_SPEC("deactivateComponentWidget", widget_deactivate_widget, 1),
+			SMJS_FUNCTION_SPEC(0, 0, 0)
+		};
+
+		GF_JS_InitClass(c, global, 0, &wm->widgetClass, 0, 0,widgetClassProps, widgetClassFuncs, 0, 0);
+
+
+		wi->scene_obj = JS_DefineObject(c, global, "widget", &wm->widgetClass._class, 0, 0);
+		//JS_AliasProperty(c, global, "widget", "MPEGWidget");
+		SMJS_SET_PRIVATE(c, wi->scene_obj, wi);
+		/*and remember the script*/
+		wi->scene_context = c;
+		wi->scene_global = global;
+	}
+}
+
+#endif

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/widgetman.c Added

@@ -0,0 +1,3747 @@
+//This software module was originally developed by TelecomParisTech in the
+//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+//
+//This software module is an implementation of a part of one or
+//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+//(ISO/IEC 23007-1) free license to this software module or modifications
+//thereof for use in hardware or software products claiming conformance to
+//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+//module in hardware or software products are advised that its use may
+//infringe existing patents.
+//The original developer of this software module and his/her company, the
+//subsequent editors and their companies, and ISO/IEC have no liability
+//for use of this software module or modifications thereof in an implementation.
+//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming
+//products.
+//Telecom ParisTech retains full right to use the code for his/her own purpose,
+//assign or donate the code to a third party and to inhibit third parties from
+//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products.
+//
+//This copyright notice must be included in all copies or derivative works.
+//
+//Copyright (c) 2009 Telecom ParisTech.
+//
+// Alternatively, this software module may be redistributed and/or modified
+//  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.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:
+//					Jean Le Feuvre, Telecom ParisTech
+//					Cyril Concolato, Telecom ParisTech
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "widgetman.h"
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE)
+#  pragma comment(lib, "js32")
+# elif defined (_WIN64)
+#  pragma comment(lib, "js")
+# elif defined (WIN32)
+#  pragma comment(lib, "js")
+# endif
+#endif
+
+
+JSBool gf_sg_js_event_add_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, GF_Node *vrml_node);
+JSBool gf_sg_js_event_remove_listener(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, GF_Node *vrml_node);
+
+
+
+static Bool is_same_path(const char *p1, const char *p2, u32 len)
+{
+	char c1, c2;
+	u32 i=0;
+	do {
+		if (len && (i==len))
+			break;
+		c1 = p1[i];
+		c2 = p2[i];
+		if (p1[i] != p2[i]) {
+			if ((c1=='/') && (c2=='\\')) {}
+			else if ((c1=='\\') && (c2=='/')) {}
+			else return GF_FALSE;
+		}
+		i++;
+	} while (c1);
+
+	return GF_TRUE;
+}
+
+static void widget_package_extract_file(GF_WidgetPackage *wpack, GF_WidgetPackageResource *res)
+{
+	u32 i;
+
+	if (wpack->is_zip) {
+		unz_global_info gi;
+		unzFile uf = unzOpen2(wpack->package_path, NULL);
+		if (!uf) return;
+
+		unzGetGlobalInfo(uf, &gi);
+		for (i=0; i<gi.number_entry; i++)  {
+			char buf[8192];
+			int err;
+			FILE *fout;
+			char filename_inzip[256];
+
+			unz_file_info file_info;
+			unzGetCurrentFileInfo(uf, &file_info, filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+			if (strcmp(res->inner_path, filename_inzip)) {
+				if ((i+1)<gi.number_entry)
+					unzGoToNextFile(uf);
+				continue;
+			}
+
+			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
+
+			fout=gf_fopen(res->extracted_path, "wb");
+			if (!fout) break;
+			do {
+				err = unzReadCurrentFile(uf,buf,8192);
+				if (err<0) break;
+				if (err>0)
+					if (gf_fwrite(buf,err,1,fout)!=1) {
+						//err=UNZ_ERRNO;
+						break;
+					}
+			} while (err>0);
+			if (fout) gf_fclose(fout);
+
+			res->extracted = GF_TRUE;
+			break;
+		}
+		unzClose(uf);
+#ifndef GPAC_DISABLE_ISOM
+	} else {
+		u32 count;
+		GF_ISOFile *isom = gf_isom_open(wpack->package_path, GF_ISOM_OPEN_READ, 0);
+		if (!isom ) return;
+
+		count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
+		for (i=0; i<count; i++)  {
+			u32 ID;
+			const char *url, *urn, *enc;
+			Bool self_ref;
+			const char *item_name;
+
+			gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
+			if (strcmp(res->inner_path, item_name)) continue;
+
+			gf_isom_extract_meta_item(isom, GF_TRUE, 0, ID, res->extracted_path);
+			res->extracted = GF_TRUE;
+			break;
+		}
+		gf_isom_close(isom);
+#endif /*GPAC_DISABLE_ISOM*/
+	}
+
+}
+
+static Bool package_find_res(GF_WidgetPackage *wpack, char *res_path, char *relocated_path, char *localized_rel_path)
+{
+	u32 count, i;
+	count = gf_list_count(wpack->resources);
+	for (i=0; i<count; i++) {
+		GF_WidgetPackageResource *pack_res = (GF_WidgetPackageResource*)gf_list_get(wpack->resources, i);
+		if (is_same_path(res_path, pack_res->inner_path, 0)) {
+			strcpy(localized_rel_path, res_path);
+			strcpy(relocated_path, pack_res->extracted_path);
+			if (!pack_res->extracted) widget_package_extract_file(wpack, pack_res);
+			return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+/* Checks if a resource in the package has the given rel_path, potentially in a localized sub-folder */
+static Bool widget_package_relocate_uri(void *__self, const char *parent_uri, const char *rel_path, char *relocated_path, char *localized_rel_path)
+{
+	char path[GF_MAX_PATH];
+	const char *opt;
+	GF_WidgetPackage *wpack = (GF_WidgetPackage *)__self;
+
+	assert(parent_uri);
+	/*resource belongs to our archive*/
+	if (strstr(rel_path, wpack->archive_id)) {
+		rel_path = strstr(rel_path, wpack->archive_id) + strlen(wpack->archive_id);
+	}
+	/*parent resource belongs to our archive*/
+	else if (strstr(parent_uri, wpack->archive_id)) {
+	}
+	/*resource doesn't belong to our archive*/
+	else {
+		return GF_FALSE;
+	}
+
+	/* First try to locate the resource in the locales folder */
+	opt = gf_opts_get_key("core", "lang");
+	if (opt) {
+		if (!strcmp(opt, "*") || !strcmp(opt, "un") )
+			opt = NULL;
+	}
+
+	while (opt) {
+		char lan[100];
+		char *sep;
+		char *sep_lang = strchr(opt, ';');
+		if (sep_lang) sep_lang[0] = 0;
+
+		while (strchr(" \t", opt[0]))
+			opt++;
+		strcpy(lan, opt);
+
+		if (sep_lang) {
+			sep_lang[0] = ';';
+			opt = sep_lang+1;
+		} else {
+			opt = NULL;
+		}
+
+		while (1) {
+			sep = strstr(lan, "-*");
+			if (!sep) break;
+			strncpy(sep, sep+2, strlen(sep)-2);
+		}
+
+		sprintf(path, "locales/%s/%s", lan, rel_path);
+		if (package_find_res(wpack, path, relocated_path, localized_rel_path))
+			return GF_TRUE;
+
+		/*recursively remove region (sub)tags*/
+		while (1) {
+			sep = strrchr(lan, '-');
+			if (!sep) break;
+			sep[0] = 0;
+			sprintf(path, "locales/%s/%s", lan, rel_path);
+			if (package_find_res(wpack, path, relocated_path, localized_rel_path))
+				return GF_TRUE;
+		}
+	}
+
+	/*no locale*/
+	if (package_find_res(wpack, (char*)rel_path, relocated_path, localized_rel_path))
+		return GF_TRUE;
+
+	strcpy(localized_rel_path, "");
+	strcpy(relocated_path, "");
+	return GF_FALSE;
+}
+
+
+static GF_WidgetPackage *widget_isom_new(GF_WidgetManager *wm, const char *path)
+{
+#ifdef GPAC_DISABLE_ISOM
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Widgetman] GPAC was compiled without ISO File Format support\n"));
+	return NULL;
+#else
+	GF_WidgetPackageResource *pack_res;
+	char szPath[GF_MAX_PATH];
+	const char *dir;
+	GF_WidgetPackage *wzip;
+	u32 brand = 0;
+	u32 i, count;
+	GF_ISOFile *isom = gf_isom_open(path, GF_ISOM_OPEN_READ, 0);
+	if (!isom ) return NULL;
+
+	brand = gf_isom_get_meta_type(isom, GF_TRUE, 0);
+	if ((brand!=GF_4CC('m','w','g','t') )		|| !gf_isom_has_meta_xml(isom, GF_TRUE, 0) ) {
+		gf_isom_close(isom);
+		return NULL;
+	}
+
+	GF_SAFEALLOC(wzip, GF_WidgetPackage);
+	if (!wzip) return NULL;
+
+	wzip->wm = wm;
+	wzip->relocate_uri = widget_package_relocate_uri;
+	wzip->resources = gf_list_new();
+	dir = gf_opts_get_key("core", "cache");
+	/* create the extracted path for the package root using:
+	   the cache dir + a CRC of the file path and the instance*/
+	sprintf(wzip->root_extracted_path, "%s%p", path, wzip);
+	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
+	sprintf(wzip->archive_id, "GWM_%08X_", i);
+	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
+
+
+	strcpy(szPath, wzip->root_extracted_path);
+	strcat(szPath, "config.xml");
+	if (gf_isom_extract_meta_xml(isom, GF_TRUE, 0, szPath, NULL) != GF_OK) {
+		gf_list_del(wzip->resources);
+		gf_free(wzip);
+		gf_isom_close(isom);
+		return NULL;
+	}
+
+	wzip->package_path = gf_strdup(path);
+
+	GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
+	if (!pack_res) {
+		gf_list_del(wzip->resources);
+		gf_free(wzip);
+		gf_isom_close(isom);
+		return NULL;
+	}
+	pack_res->extracted_path = gf_strdup(szPath);
+	pack_res->inner_path = gf_strdup("config.xml");
+	pack_res->extracted = GF_TRUE;
+	gf_list_add(wzip->resources, pack_res);
+
+
+	count = gf_isom_get_meta_item_count(isom, GF_TRUE, 0);
+	for (i=0; i<count; i++)  {
+		u32 ID;
+		const char *url, *urn, *enc;
+		Bool self_ref;
+		char *sep;
+		const char *item_name;
+
+		gf_isom_get_meta_item_info(isom, GF_TRUE, 0, i+1, &ID, NULL, NULL, &self_ref, &item_name, NULL, &enc, &url, &urn);
+
+		sep = strrchr(item_name, '/');
+		if (!sep) sep = strrchr(item_name, '\\');
+		if (sep) {
+			sep[0] = 0;
+			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32((char*)item_name, (u32) strlen(item_name)), sep+1);
+			sep[0] = '/';
+		} else {
+			strcpy(szPath, wzip->root_extracted_path);
+			strcat(szPath, item_name);
+		}
+		GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
+		if (!pack_res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
+			continue;
+		}
+		pack_res->extracted_path = gf_strdup(szPath);
+		pack_res->inner_path = gf_strdup(item_name);
+		pack_res->extracted = GF_FALSE;
+		gf_list_add(wzip->resources, pack_res);
+	}
+	gf_isom_close(isom);
+
+
+	/* register this widget package as a relocator to enable localization of resources inside this package */
+	gf_mx_p(wm->term->net_mx);
+	gf_list_add(wm->term->uri_relocators, wzip);
+	gf_mx_v(wm->term->net_mx);
+	return wzip;
+#endif /*GPAC_DISABLE_ISOM*/
+}
+
+static GF_WidgetPackage *widget_zip_new(GF_WidgetManager *wm, const char *path)
+{
+	unz_global_info gi;
+	const char *dir;
+	u32 i;
+	GF_WidgetPackage *wzip;
+	unzFile uf = unzOpen2(path, NULL);
+	if (!uf) return NULL;
+
+	GF_SAFEALLOC(wzip, GF_WidgetPackage);
+	if (!wzip) return NULL;
+
+	wzip->wm = wm;
+	wzip->is_zip = GF_TRUE;
+	wzip->relocate_uri = widget_package_relocate_uri;
+	wzip->resources = gf_list_new();
+	wzip->package_path = gf_strdup(path);
+	dir = gf_opts_get_key("core", "cache");
+	/* create the extracted path for the package root using:
+	   the cache dir + a CRC of the file path and the instance*/
+	sprintf(wzip->root_extracted_path, "%s%p", path, wzip);
+	i = gf_crc_32((char *)wzip->root_extracted_path, (u32) strlen(wzip->root_extracted_path));
+	sprintf(wzip->archive_id, "GWM_%08X_", i);
+	sprintf(wzip->root_extracted_path, "%s/%s", dir, wzip->archive_id);
+
+	unzGetGlobalInfo(uf, &gi);
+	for (i=0; i<gi.number_entry; i++)  {
+		char szPath[GF_MAX_PATH];
+		char *sep;
+		GF_WidgetPackageResource *pack_res;
+		char filename_inzip[256];
+		unz_file_info file_info;
+		unzGetCurrentFileInfo(uf, &file_info, filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0);
+
+		sep = strrchr(filename_inzip, '/');
+		if (!sep) sep = strrchr(filename_inzip, '\\');
+		if (sep) {
+			sep[0] = 0;
+			sprintf(szPath, "%s_%08X_%s", wzip->root_extracted_path, gf_crc_32(filename_inzip, (u32) strlen(filename_inzip)), sep+1);
+			sep[0] = '/';
+		} else {
+			strcpy(szPath, wzip->root_extracted_path);
+			strcat(szPath, filename_inzip);
+		}
+
+
+		if (!strcmp(filename_inzip, "config.xml")) {
+			int err;
+			char buf[8192];
+			FILE *fout;
+			unzOpenCurrentFile3(uf, NULL, NULL, 0, NULL/*password*/);
+
+			fout=gf_fopen(szPath,"wb");
+			if (!fout) return NULL;
+
+			do {
+				err = unzReadCurrentFile(uf,buf,8192);
+				if (err<0) break;
+
+				if (err>0)
+					if (gf_fwrite(buf,err,1,fout)!=1) {
+						err=UNZ_ERRNO;
+						break;
+					}
+			} while (err>0);
+			if (fout) gf_fclose(fout);
+			if (err==0) {
+				GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
+				if (!pack_res) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
+					continue;
+				}
+				
+				pack_res->extracted_path = gf_strdup(szPath);
+				pack_res->inner_path = gf_strdup(filename_inzip);
+				pack_res->extracted = GF_TRUE;
+				gf_list_add(wzip->resources, pack_res);
+			}
+		} else {
+			GF_SAFEALLOC(pack_res, GF_WidgetPackageResource);
+			if (!pack_res) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget resource\n"));
+				continue;
+			}
+			pack_res->extracted_path = gf_strdup(szPath);
+			pack_res->inner_path = gf_strdup(filename_inzip);
+			pack_res->extracted = GF_FALSE;
+			gf_list_add(wzip->resources, pack_res);
+		}
+
+		if ((i+1)<gi.number_entry)
+			unzGoToNextFile(uf);
+	}
+	unzClose(uf);
+
+	/* register this widget package as a relocator to enable localization of resources inside this package */
+	gf_mx_p(wm->term->net_mx);
+	gf_list_add(wm->term->uri_relocators, wzip);
+	gf_mx_v(wm->term->net_mx);
+	return wzip;
+}
+
+GF_WidgetPackage *widget_package_new(GF_WidgetManager *wm, const char *path)
+{
+	if (gf_unzip_probe(path)) {
+		return widget_zip_new(wm, path);
+	}
+#ifndef GPAC_DISABLE_ISOM
+	/*ISOFF-based packaged widget */
+	else if (gf_isom_probe_file(path)) {
+		return widget_isom_new(wm, path);
+	}
+#endif
+	return NULL;
+}
+
+static void widget_package_del(GF_WidgetManager *wm, GF_WidgetPackage *wpackage)
+{
+	gf_mx_p(wm->term->net_mx);
+	gf_list_del_item(wm->term->uri_relocators, wpackage);
+	gf_mx_v(wm->term->net_mx);
+
+	while (gf_list_count(wpackage->resources)) {
+		GF_WidgetPackageResource *wu = (GF_WidgetPackageResource*)gf_list_get(wpackage->resources, 0);
+		gf_list_rem(wpackage->resources, 0);
+		gf_delete_file(wu->extracted_path);
+		gf_free(wu->extracted_path);
+		gf_free(wu->inner_path);
+		gf_free(wu);
+	}
+	gf_list_del(wpackage->resources);
+	if (wpackage->sess) gf_dm_sess_del(wpackage->sess);
+	gf_free(wpackage->package_path);
+	gf_free(wpackage);
+}
+
+
+
+static void wm_delete_message_param(GF_WidgetPin *mp)
+{
+	if (!mp) return;
+	if (mp->node) gf_free(mp->node);
+	if (mp->attribute) gf_free(mp->attribute);
+	if (mp->default_value) gf_free(mp->default_value);
+	if (mp->name) gf_free(mp->name);
+	gf_free(mp);
+}
+
+static void wm_delete_widget_content(GF_WidgetContent *content)
+{
+	if (!content) return;
+
+	while (gf_list_count(content->interfaces)) {
+		GF_WidgetInterface *ifce = (GF_WidgetInterface*)gf_list_last(content->interfaces);
+		gf_list_rem_last(content->interfaces);
+
+		while (gf_list_count(ifce->messages)) {
+			GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_last(ifce->messages);
+			gf_list_rem_last(ifce->messages);
+
+			while (gf_list_count(msg->params)) {
+				GF_WidgetPin *par = (GF_WidgetPin*)gf_list_last(msg->params);
+				gf_list_rem_last(msg->params);
+				wm_delete_message_param(par);
+			}
+			gf_list_del(msg->params);
+
+			wm_delete_message_param(msg->input_action);
+			wm_delete_message_param(msg->output_trigger);
+			gf_free(msg->name);
+			gf_free(msg);
+		}
+		gf_list_del(ifce->messages);
+		wm_delete_message_param(ifce->bind_action);
+		wm_delete_message_param(ifce->unbind_action);
+		if (ifce->obj) gf_js_remove_root(ifce->content->widget->wm->ctx, &ifce->obj, GF_JSGC_OBJECT);
+
+		if (ifce->connectTo) gf_free(ifce->connectTo);
+		gf_free(ifce->type);
+		gf_free(ifce);
+	}
+	gf_list_del(content->interfaces);
+
+	while (gf_list_count(content->components)) {
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_last(content->components);
+		gf_list_rem_last(content->components);
+
+		wm_delete_message_param(comp->activateTrigger);
+		wm_delete_message_param(comp->deactivateTrigger);
+
+		while (gf_list_count(comp->required_interfaces)) {
+			char *type = (char*)gf_list_last(comp->required_interfaces);
+			gf_list_rem_last(comp->required_interfaces);
+			if (type) gf_free(type);
+		}
+		gf_list_del(comp->required_interfaces);
+		if (comp->id) gf_free(comp->id);
+		if (comp->src) gf_free(comp->src);
+		gf_free(comp);
+	}
+	gf_list_del(content->components);
+
+	while (gf_list_count(content->preferences)) {
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_last(content->preferences);
+		gf_list_rem_last(content->preferences);
+
+		wm_delete_message_param(pref->connectTo);
+		if (pref->value) gf_free(pref->value);
+		gf_free(pref->name);
+		gf_free(pref);
+	}
+	gf_list_del(content->preferences);
+
+	wm_delete_message_param(content->saveTrigger);
+	wm_delete_message_param(content->restoreTrigger);
+	wm_delete_message_param(content->savedAction);
+	wm_delete_message_param(content->restoredAction);
+
+	gf_free(content->src);
+	gf_free(content->relocated_src);
+	gf_free(content->mimetype);
+	gf_free(content->encoding);
+	gf_free(content);
+}
+
+static void wm_delete_widget(GF_WidgetManager *wm, GF_Widget *wid)
+{
+	gf_list_del_item(wm->widgets, wid);
+
+	if (wid->url) gf_free(wid->url);
+	if (wid->manifest_path) gf_free(wid->manifest_path);
+	wm_delete_widget_content(wid->main);
+	if (wid->local_path) gf_free(wid->local_path);
+	if (wid->name) gf_free(wid->name);
+	if (wid->shortname) gf_free(wid->shortname);
+	if (wid->identifier) gf_free(wid->identifier);
+	if (wid->authorName) gf_free(wid->authorName);
+	if (wid->authorEmail) gf_free(wid->authorEmail);
+	if (wid->authorHref) gf_free(wid->authorHref);
+	if (wid->description) gf_free(wid->description);
+	if (wid->license) gf_free(wid->license);
+	if (wid->licenseHref) gf_free(wid->licenseHref);
+	if (wid->viewmodes) gf_free(wid->viewmodes);
+	if (wid->version) gf_free(wid->version);
+	if (wid->uuid) gf_free(wid->uuid);
+
+
+	while (gf_list_count(wid->icons)) {
+		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->icons, 0);
+		gf_list_rem(wid->icons, 0);
+		wm_delete_widget_content(icon);
+	}
+	gf_list_del(wid->icons);
+
+	while (gf_list_count(wid->features)) {
+		GF_WidgetFeature *f = (GF_WidgetFeature*)gf_list_get(wid->features, 0);
+		gf_list_rem(wid->features, 0);
+		if (f->name) gf_free(f->name);
+		while (gf_list_count(f->params)) {
+			GF_WidgetFeatureParam *p = (GF_WidgetFeatureParam*)gf_list_get(f->params, 0);
+			gf_list_rem(f->params, 0);
+			if (p->name) gf_free(p->name);
+			if (p->value) gf_free(p->value);
+			gf_free(p);
+		}
+		gf_free(f);
+	}
+	gf_list_del(wid->features);
+
+	if (wid->wpack) widget_package_del(wm, wid->wpack);
+	gf_free(wid);
+}
+
+static void wm_delete_interface_instance(GF_WidgetManager *wm, GF_WidgetInterfaceInstance *bifce)
+{
+	if (bifce->hostname) gf_free(bifce->hostname);
+	if (bifce->obj) {
+		SMJS_SET_PRIVATE(wm->ctx, bifce->obj, NULL);
+		gf_js_remove_root(wm->ctx, &bifce->obj, GF_JSGC_OBJECT);
+	}
+	gf_free(bifce);
+}
+
+static void wm_delete_widget_instance(GF_WidgetManager *wm, GF_WidgetInstance *widg)
+{
+
+	while (gf_list_count(widg->components)) {
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(widg->components, 0);
+		gf_list_rem(widg->components, 0);
+		if (comp->wid) wm_delete_widget_instance(wm, comp->wid);
+		gf_free(comp);
+	}
+	gf_list_del(widg->components);
+
+	while (gf_list_count(widg->bound_ifces)) {
+		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(widg->bound_ifces, 0);
+		gf_list_rem(widg->bound_ifces, 0);
+		wm_delete_interface_instance(wm, bifce);
+	}
+	gf_list_del(widg->bound_ifces);
+
+	gf_list_del(widg->output_triggers);
+
+	if (widg->obj) {
+		SMJS_SET_PRIVATE(wm->ctx, widg->obj, NULL);
+		gf_js_remove_root(wm->ctx, &widg->obj, GF_JSGC_OBJECT);
+	}
+	gf_list_del_item(wm->widget_instances, widg);
+	widg->widget->nb_instances--;
+	if (!widg->widget->nb_instances) wm_delete_widget(wm, widg->widget);
+
+	if (!widg->permanent) {
+		gf_cfg_del_section(wm->term->user->config, (const char *)widg->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *)widg->secname, NULL);
+	}
+	if (widg->mpegu_context) gf_xml_dom_del(widg->mpegu_context);
+
+	gf_free(widg);
+}
+
+
+
+static JSBool wm_widget_call_script(GF_WidgetInstance *wid, GF_WidgetPin *pin, uintN argc, jsval *argv, jsval *rval)
+{
+	jsval fval;
+	if (!wid->scene_context || !wid->scene_global) return JS_FALSE;
+
+	/*if on_load property is assigned to this widget, add an event listener on the root.*/
+	JS_LookupProperty(wid->scene_context, wid->scene_global, pin->node, &fval);
+	if (JSVAL_IS_OBJECT(fval)) {
+		JS_CallFunctionValue(wid->scene_context, wid->scene_global, fval, argc, argv, rval);
+	}
+	return JS_TRUE;
+}
+
+static JSBool wm_widget_set_scene_input_value(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, u32 type, GF_WidgetInstance *wid, GF_WidgetPin *param, const char *value)
+{
+	char *str_val;
+	GF_Node *n;
+	GF_FieldInfo info;
+	GF_WidgetMessage *msg;
+	GF_WidgetInterface *ifce;
+
+	if (!wid && obj) wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+	if (!wid->scene) return JS_TRUE;
+
+	if (!param) {
+		if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
+
+		switch (type) {
+		/*set_input*/
+		case 0:
+			if (argc!=2) return JS_FALSE;
+			param = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+			break;
+		/*call_input_action*/
+		case 1:
+			msg = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+			param = msg ? msg->input_action : NULL;
+			break;
+		/*bind_interface*/
+		case 2:
+			ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+			param = ifce ? ifce->bind_action : NULL;
+			break;
+		/*unbind_interface*/
+		case 3:
+			ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+			param = ifce ? ifce->unbind_action : NULL;
+			break;
+		}
+	}
+
+	if (!param  || !param->node) return JS_TRUE;
+	/*this is a script call*/
+	if (!param->attribute) {
+		return wm_widget_call_script(wid, param, 0, NULL, rval);
+	}
+
+	n = gf_sg_find_node_by_name(wid->scene, param->node);
+	if (!n) return JS_TRUE;
+
+	if (param->in_action) return JS_TRUE;
+
+	param->in_action = GF_TRUE;
+
+#ifndef GPAC_DISABLE_SVG
+	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
+		u32 evt_type;
+		if (!type) {
+			char *_str_val = NULL;
+			if (value) {
+				str_val = (char *)value;
+			} else {
+				if (!JSVAL_IS_STRING(argv[1])) goto exit;
+				str_val = _str_val = SMJS_CHARS(c, argv[1]);
+			}
+
+			/* first check if the set_input refers to an attribute name or to an event name */
+			evt_type = gf_dom_event_type_by_name(param->attribute);
+
+			/*events are not allowed for <input> and <output>*/
+			if (evt_type == GF_EVENT_UNKNOWN) {
+				/* modify an attribute */
+				if (!strcmp(param->attribute, "textContent")) {
+					gf_dom_set_textContent(n, (char *)str_val);
+					gf_node_changed(n, NULL);
+				}
+				else {
+					if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+						gf_svg_parse_attribute(n, &info, (char *)str_val, 0);
+						if (info.fieldType==XMLRI_datatype) gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
+						gf_node_changed(n, &info);
+					}
+				}
+			}
+			SMJS_FREE(c, _str_val);
+
+		} else {
+			GF_DOM_Event evt;
+			memset(&evt, 0, sizeof(GF_DOM_Event));
+			/* first check if the set_input refers to an attribute name or to an event name */
+			evt_type = gf_dom_event_type_by_name(param->attribute);
+			/* launch an event */
+			if (evt_type != GF_EVENT_UNKNOWN) {
+				evt.type = evt_type;
+				gf_dom_event_fire(n, &evt);
+			} else {
+				/*should we fire a DOMAttrModified event ? to clarify in the spec*/
+
+				if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+					evt.bubbles = 1;
+					evt.type = GF_EVENT_ATTR_MODIFIED;
+					evt.attr = &info;
+					gf_dom_event_fire(n, &evt);
+				}
+			}
+		}
+	} else
+#endif
+
+
+#ifndef GPAC_DISABLE_VRML
+	{
+		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return JS_TRUE;
+
+		if (!type) {
+			char *_str_val = NULL;
+			jsdouble val;
+
+			switch (info.fieldType) {
+			case GF_SG_VRML_SFSTRING:
+				if (value) {
+					str_val = (char *)value;
+				} else {
+					if (!JSVAL_IS_STRING(argv[1]))goto exit;
+					str_val = SMJS_CHARS(c, argv[1]);
+				}
+				if ( ((SFString*)info.far_ptr)->buffer) gf_free(((SFString*)info.far_ptr)->buffer);
+				((SFString*)info.far_ptr)->buffer = str_val ? gf_strdup(str_val) : NULL;
+				break;
+			case GF_SG_VRML_SFBOOL:
+				if (value) *((SFBool*)info.far_ptr) = (!strcmp(value, "true")) ? 1 : 0;
+				else if (JSVAL_IS_BOOLEAN(argv[1])) *((SFBool*)info.far_ptr) = JSVAL_TO_BOOLEAN(argv[1]);
+				else if (JSVAL_IS_INT(argv[1])) *((SFBool*)info.far_ptr) = JSVAL_TO_INT(argv[1]);
+				else if (JSVAL_IS_STRING(argv[1])) {
+					str_val = SMJS_CHARS(c, argv[1]);
+					*((SFBool*)info.far_ptr) = (str_val && !strcmp(str_val, "true")) ? 1 : 0;
+					SMJS_FREE(c, str_val);
+				} else
+					goto exit;
+				break;
+			case GF_SG_VRML_SFINT32:
+				if (value) *((SFInt32*)info.far_ptr) = (s32) atof(value);
+				else if (JSVAL_IS_INT(argv[1])) *((SFInt32*)info.far_ptr) = JSVAL_TO_INT(argv[1]);
+				else if (JSVAL_IS_NUMBER(argv[1])) {
+					JS_ValueToNumber(c, argv[1], &val);
+					*((SFInt32*)info.far_ptr) = (s32) val;
+				} else if (JSVAL_IS_STRING(argv[1])) {
+					Double a_val;
+					str_val = SMJS_CHARS(c, argv[1]);
+					a_val = str_val ? atof(str_val) : 0;
+					*((SFInt32*)info.far_ptr) = (s32) a_val;
+					SMJS_FREE(c, str_val);
+				} else
+					goto exit;
+				break;
+			case GF_SG_VRML_SFFLOAT:
+				if (value) *((SFFloat*)info.far_ptr) = FLT2FIX(atof(value));
+				else if (JSVAL_IS_INT(argv[1])) *((SFFloat *)info.far_ptr) = INT2FIX( JSVAL_TO_INT(argv[1]) );
+				else if (JSVAL_IS_NUMBER(argv[1])) {
+					JS_ValueToNumber(c, argv[1], &val);
+					*((SFFloat *)info.far_ptr) = FLT2FIX( val );
+				} else if (JSVAL_IS_STRING(argv[1])) {
+					Double a_val;
+					str_val = SMJS_CHARS(c, argv[1]);
+					a_val = str_val ? atof(str_val) : 0;
+					*((SFFloat*)info.far_ptr) = FLT2FIX(a_val);
+					SMJS_FREE(c, str_val);
+				} else
+					goto exit;
+				break;
+			case GF_SG_VRML_SFTIME:
+				if (value) *((SFTime*)info.far_ptr) = atof(value);
+				else if (JSVAL_IS_INT(argv[1])) *((SFTime *)info.far_ptr) = JSVAL_TO_INT(argv[1]);
+				else if (JSVAL_IS_NUMBER(argv[1])) {
+					JS_ValueToNumber(c, argv[1], &val);
+					*((SFTime *)info.far_ptr) = val;
+				} else if (JSVAL_IS_STRING(argv[1])) {
+					Double a_val;
+					str_val = SMJS_CHARS(c, argv[1]);
+					a_val = str_val ? atof(str_val) : 0;
+					*((SFTime *)info.far_ptr) = a_val;
+					SMJS_FREE(c, str_val);
+				} else
+					goto exit;
+				break;
+			case GF_SG_VRML_MFSTRING:
+				if (value) {
+					str_val = (char *)value;
+				} else {
+					if (!JSVAL_IS_STRING(argv[1])) goto exit;
+					str_val = _str_val = SMJS_CHARS(c, argv[1]);
+				}
+				if ( ((GenMFField *)info.far_ptr)->count != 1) {
+					gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFSTRING);
+					gf_sg_vrml_mf_alloc(info.far_ptr, GF_SG_VRML_MFSTRING, 1);
+				}
+				if ( ((MFString*)info.far_ptr)->vals[0]) gf_free( ((MFString*)info.far_ptr)->vals[0] );
+				((MFString*)info.far_ptr)->vals[0] = str_val ? gf_strdup(str_val) : NULL;
+
+				SMJS_FREE(c, _str_val);
+				break;
+			}
+		}
+
+		//if this is a script eventIn call directly script
+		if ((n->sgprivate->tag==TAG_MPEG4_Script)
+#ifndef GPAC_DISABLE_X3D
+		        || (n->sgprivate->tag==TAG_X3D_Script)
+#endif
+		   )
+			gf_sg_script_event_in(n, &info);
+
+		gf_node_changed(n, &info);
+
+		/*if this is an exposedField, route it*/
+		if (info.eventType==GF_SG_EVENT_EXPOSED_FIELD) {
+			gf_node_event_out(n, info.fieldIndex);
+		}
+	}
+#endif /*GPAC_DISABLE_VRML*/
+
+exit:
+	param->in_action = GF_FALSE;
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(wm_widget_set_input)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	SMJS_DECL_RVAL
+	return wm_widget_set_scene_input_value(c, obj, argc, argv, rval, 0, NULL, NULL, NULL);
+}
+static JSBool SMJS_FUNCTION(wm_widget_call_input_action)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	SMJS_DECL_RVAL
+	return wm_widget_set_scene_input_value(c, obj, 1, argv, rval, 1, NULL, NULL, NULL);
+}
+
+
+static JSBool SMJS_FUNCTION(wm_widget_call_input_script)
+{
+	GF_WidgetMessage *msg;
+	GF_WidgetPin *param;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || (argc!=2) ) return JS_FALSE;
+	if (!wid->scene) return JS_TRUE;
+
+	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
+	msg = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	param = msg ? msg->input_action : NULL;
+	if (!param || !param->node || param->attribute) return JS_FALSE;
+
+	if (JSVAL_IS_OBJECT(argv[1])) {
+		jsval *args;
+		JSObject *list = JSVAL_TO_OBJECT(argv[1]);
+		u32 i, count;
+		JS_GetArrayLength(c, list, (jsuint*) &count);
+		args = (jsval*)gf_malloc(sizeof(jsval)*count);
+		for (i=0; i<count; i++) {
+			JS_GetElement(c, list, (jsint) i, &args[i] );
+		}
+
+		wm_widget_call_script(wid, param, count, args, SMJS_GET_RVAL);
+
+		gf_free(args);
+	}
+	return JS_TRUE;
+}
+
+
+static void wm_handler_destroy(GF_Node *node, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		SVG_handlerElement *handler = (SVG_handlerElement *)node;
+		if (handler->js_fun_val) {
+			gf_js_remove_root(handler->js_context, &handler->js_fun_val, GF_JSGC_VAL);
+			handler->js_fun_val=0;
+		}
+	}
+}
+
+static SVG_handlerElement *wm_create_scene_listener(GF_WidgetInstance *wid, GF_WidgetPin *param)
+{
+	/*FIXME - we need to split SVG and base DOM !!*/
+#ifdef GPAC_DISABLE_SVG
+	return NULL;
+#else
+	u32 evt_type, att_name;
+	GF_Node *listener;
+	GF_FieldInfo info;
+	GF_Node *n = NULL;
+	SVG_handlerElement *handler;
+
+	evt_type = GF_EVENT_ATTR_MODIFIED;
+	n = gf_sg_find_node_by_name(wid->scene, param->node);
+	if (!n)
+		return NULL;
+
+	att_name = 0;
+
+#ifndef GPAC_DISABLE_SVG
+	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
+		/* first check if the set_input refers to an attribute name or to an event name */
+		evt_type = gf_dom_event_type_by_name(param->attribute);
+		if (evt_type == GF_EVENT_UNKNOWN) {
+			evt_type = GF_EVENT_ATTR_MODIFIED;
+
+			/* modify textContent */
+			if (!strcmp(param->attribute, "textContent")) {
+				att_name = (u32) -1;
+			}
+			/* modify an attribute */
+			else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+				att_name = info.fieldIndex;
+			}
+			else {
+				return NULL;
+			}
+		}
+	} else
+#endif
+	{
+		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK)
+			return NULL;
+		att_name = info.fieldIndex;
+	}
+
+	listener = gf_node_new(wid->scene, TAG_SVG_listener);
+
+	handler = (SVG_handlerElement *) gf_node_new(wid->scene, TAG_SVG_handler);
+	/*we register the handler with the listener node to avoid modifying the DOM*/
+	gf_node_register((GF_Node *)handler, listener);
+	gf_node_list_add_child(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler);
+	handler->sgprivate->UserCallback = wm_handler_destroy;
+
+	/*create attributes if needed*/
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
+	((XMLEV_Event*)info.far_ptr)->type = evt_type;
+	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
+	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
+	((XMLRI*)info.far_ptr)->target = n;
+
+	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
+	((XMLEV_Event*)info.far_ptr)->type = evt_type;
+	((XMLEV_Event*)info.far_ptr)->parameter = att_name;
+
+	gf_node_dom_listener_add((GF_Node *) n, listener);
+
+	return handler;
+#endif
+}
+
+static void wm_component_activation_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer, Bool unload)
+{
+	JSObject *obj;
+	JSContext *c;
+	GF_WidgetInstance *wid;
+	GF_WidgetComponent *comp;
+	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
+
+	c = (JSContext*)handler->js_context;
+	obj = (JSObject*)handler->evt_listen_obj;
+	if (!c || !obj) return;
+	wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return;
+
+	comp = (GF_WidgetComponent *)handler->js_fun;
+	if (unload) {
+		wm_deactivate_component(c, wid, comp, NULL);
+	} else {
+		wm_activate_component(c, wid, comp, GF_FALSE);
+	}
+}
+static void wm_component_activate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
+{
+	wm_component_activation_event(hdl, evt, observer, GF_FALSE);
+}
+static void wm_component_deactivate_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
+{
+	wm_component_activation_event(hdl, evt, observer, GF_TRUE);
+}
+
+static void wm_widget_set_pref_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
+{
+	char *att;
+	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
+	GF_WidgetInstance *wid = (GF_WidgetInstance *) handler->evt_listen_obj;
+	GF_WidgetPreference *pref = (GF_WidgetPreference *) handler->js_fun;
+
+	if (evt->type != GF_EVENT_ATTR_MODIFIED) return;
+
+	if (evt->detail == (u32) -1) {
+#ifndef GPAC_DISABLE_SVG
+		att = gf_dom_flatten_textContent(evt->target);
+#endif
+	} else {
+		att = gf_node_dump_attribute(evt->target, evt->attr);
+	}
+	if (!att) return;
+	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *)wid->secname, pref->name, att);
+	gf_free(att);
+}
+
+static void on_widget_activated(JSContext *c, JSObject *obj)
+{
+	jsval funval, rval;
+	u32 i, count;
+	GF_XMLNode *context = NULL;
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || wid->activated) return;
+
+	/*widget is now activated*/
+	wid->activated = GF_TRUE;
+
+	/*for all components, setup bindings on activateTrigger & deactivateTrigger*/
+	count = gf_list_count(wid->widget->main->components);
+	for (i=0; i<count; i++) {
+		GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
+		/*setup listener*/
+		if (comp->activateTrigger && comp->activateTrigger->attribute) {
+			SVG_handlerElement *a_hdl = wm_create_scene_listener(wid, comp->activateTrigger);
+			if (!a_hdl) return;
+			a_hdl->evt_listen_obj = obj;
+			a_hdl->js_context = c;
+			a_hdl->js_fun = comp;
+			a_hdl->handle_event = wm_component_activate_event;
+		}
+		/*setup listener*/
+		if (comp->deactivateTrigger && comp->deactivateTrigger->attribute) {
+			SVG_handlerElement *a_hdl = wm_create_scene_listener(wid, comp->deactivateTrigger);
+			if (!a_hdl) continue;
+			a_hdl->evt_listen_obj = obj;
+			a_hdl->js_context = c;
+			a_hdl->js_fun = comp;
+			a_hdl->handle_event = wm_component_deactivate_event;
+		}
+	}
+
+	if (wid->mpegu_context)
+		context = gf_xml_dom_get_root(wid->mpegu_context);
+
+	/*load preferences*/
+	count = gf_list_count(wid->widget->main->preferences);
+	for (i=0; i<count; i++) {
+		const char *value;
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
+
+
+		/*get stored value for this preference*/
+		value = gf_opts_get_key((const char *)wid->secname, pref->name);
+		/*if none found, use preference*/
+		if (!value) value = pref->value;
+
+		/*and overload with migrated context*/
+		if (context) {
+			GF_XMLNode *pref_node;
+			u32 j=0;
+			while ((pref_node = (GF_XMLNode*)gf_list_enum(context->content, &j))) {
+				const char *att;
+				if (pref_node->type != GF_XML_NODE_TYPE) continue;
+				if (strcmp(pref_node->name, "preference")) continue;
+				att = wm_xml_get_attr(pref_node, "name");
+				if (!att) continue;
+				if (strcmp(att, pref->name)) continue;
+
+				att = wm_xml_get_attr(pref_node, "value");
+				if (att) value = att;
+				break;
+			}
+		}
+
+		if (pref->connectTo) {
+			SVG_handlerElement *hdl;
+
+			if (value)
+				wm_widget_set_scene_input_value(NULL, NULL, 0, 0, 0, 0, wid, pref->connectTo, value);
+
+			/*preference is read only, do not setup listener*/
+			if (pref->flags & GF_WM_PREF_READONLY) continue;
+			/*preference is migratable only, do not setup listener*/
+			if (!(pref->flags & GF_WM_PREF_SAVE)) continue;
+
+			/*create the listener*/
+			hdl = wm_create_scene_listener(wid, pref->connectTo);
+			if (!hdl) continue;
+
+			hdl->evt_listen_obj = wid;
+			hdl->js_fun = pref;
+			hdl->handle_event = wm_widget_set_pref_event;
+
+		}
+	}
+	if (count && wid->widget->main->restoredAction) {
+		wm_widget_set_scene_input_value(wid->widget->wm->ctx, wid->obj, 0, NULL, &rval, 0, wid, wid->widget->main->restoredAction, NULL);
+	}
+
+	if (wid->mpegu_context) {
+		gf_xml_dom_del(wid->mpegu_context);
+		wid->mpegu_context = NULL;
+	}
+
+	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_TRUE);
+	/*refresh all interface bindings*/
+	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "check_bindings", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		JS_CallFunctionValue(wid->widget->wm->ctx, wid->widget->wm->obj, funval, 0, 0, &rval);
+	}
+
+	/*if on_load property is assigned to this widget, call it.*/
+	JS_LookupProperty(c, obj, "on_load", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, funval, 0, 0, &rval);
+	}
+	gf_sg_lock_javascript(wid->widget->wm->ctx, GF_FALSE);
+}
+
+
+static void wm_widget_load_event(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
+{
+	JSObject *obj;
+	JSContext *c;
+	SVG_handlerElement *handler = (SVG_handlerElement *)hdl;
+
+	c = (JSContext*)handler->js_context;
+	obj = (JSObject*)handler->evt_listen_obj;
+	if (!c || !obj) return;
+
+	on_widget_activated(c, obj);
+}
+
+
+static JSBool SMJS_FUNCTION(wm_widget_activate)
+{
+#ifndef GPAC_DISABLE_SVG
+	SVG_handlerElement *handler;
+#endif
+	GF_MediaObject *mo;
+	Bool direct_trigger = GF_FALSE;
+	MFURL url;
+	SFURL _url;
+	GF_Node *inl;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !argc) return JS_FALSE;
+
+	if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
+
+	inl = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!inl) return JS_FALSE;
+
+	_url.OD_ID = 0;
+	_url.url = gf_url_concatenate(wid->widget->url, wid->widget->main->relocated_src);
+	url.count = 1;
+	url.vals = &_url;
+	mo = gf_mo_register(inl, &url, GF_FALSE, GF_TRUE);
+	if (mo) {
+		wid->scene = gf_mo_get_scenegraph(mo);
+		if (wid->scene && gf_sg_get_root_node(wid->scene)) direct_trigger = GF_TRUE;
+	}
+	if (_url.url) gf_free(_url.url);
+
+	wid->anchor = inl;
+
+	if (direct_trigger) {
+		on_widget_activated(c, obj);
+	} else {
+#ifndef GPAC_DISABLE_SVG
+		handler = gf_dom_listener_build(inl, GF_EVENT_SCENE_ATTACHED, 0);
+		handler->handle_event = wm_widget_load_event;
+		handler->js_context = c;
+		handler->evt_listen_obj = obj;
+#endif
+	}
+
+	return JS_TRUE;
+}
+
+
+static void wm_handle_dom_event(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
+{
+	GF_FieldInfo info;
+	GF_Node *n;
+	jsval argv[1], rval, jsfun;
+	SVG_handlerElement *handler = (SVG_handlerElement *) hdl;
+	GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)handler->evt_listen_obj;
+
+	if (!wid->scene)
+		return;
+
+	n = gf_sg_find_node_by_name(wid->scene, param->node);
+	if (!n) return;
+
+	/*this is a regular event output*/
+	if (event->type != GF_EVENT_ATTR_MODIFIED) {
+		jsfun = (jsval) handler->js_fun_val;
+		if (JSVAL_IS_OBJECT(jsfun))
+			JS_CallFunctionValue(handler->js_context, wid->obj, (jsval) handler->js_fun_val, 0, 0, &rval);
+		return;
+	}
+
+	/*otherwise this is a node.attr output through DOMAttributeModified*/
+	argv[0] = JSVAL_NULL;
+
+#ifndef GPAC_DISABLE_SVG
+	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
+		if (!strcmp(param->attribute, "textContent")) {
+			char *txt = gf_dom_flatten_textContent(n);
+			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, txt ? txt : "") );
+			if (txt) gf_free(txt);
+		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+			char *attValue;
+			if (event->attr->fieldIndex != info.fieldIndex) return;
+
+			attValue = gf_node_dump_attribute(n, &info);
+			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, attValue) );
+			if (attValue) gf_free(attValue);
+		} else {
+			return;
+		}
+	} else
+#endif
+	{
+		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return;
+		if (event->attr->fieldIndex != info.fieldIndex) return;
+
+		switch (info.fieldType) {
+		case GF_SG_VRML_SFSTRING:
+			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(handler->js_context, ((SFString*)info.far_ptr)->buffer ) );
+			break;
+		case GF_SG_VRML_SFINT32:
+			argv[0] = INT_TO_JSVAL( *((SFInt32*)info.far_ptr) );
+			break;
+		case GF_SG_VRML_SFBOOL:
+			argv[0] = BOOLEAN_TO_JSVAL( *((SFBool*)info.far_ptr) );
+			break;
+		case GF_SG_VRML_SFFLOAT:
+			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(handler->js_context, FIX2FLT( *((SFFloat*)info.far_ptr) ) ) );
+			break;
+		case GF_SG_VRML_SFTIME:
+			argv[0] = DOUBLE_TO_JSVAL( JS_NewDouble(handler->js_context, *((SFTime *)info.far_ptr) ) );
+			break;
+		}
+	}
+
+	jsfun = (jsval) handler->js_fun_val;
+	if (JSVAL_IS_OBJECT(jsfun))
+		JS_CallFunctionValue(handler->js_context, wid->obj, (jsval) handler->js_fun_val, 1, argv, &rval);
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_param_value)
+{
+	GF_Node *n;
+	GF_FieldInfo info;
+	GF_WidgetPin *param;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !wid->scene || !argc || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
+
+	param = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!param) return JS_FALSE;
+
+	if (!param->node) {
+		if (param->default_value) {
+			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->default_value) ) );
+			return JS_TRUE;
+		}
+		return JS_FALSE;
+	}
+
+	n = gf_sg_find_node_by_name(wid->scene, param->node);
+	if (!n) return JS_FALSE;
+
+#ifndef GPAC_DISABLE_SVG
+	if (n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) {
+		if (!strcmp(param->attribute, "textContent")) {
+			char *txt = gf_dom_flatten_textContent(n);
+			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, txt ? txt : "") ));
+			if (txt) gf_free(txt);
+		} else if (gf_node_get_attribute_by_name(n, param->attribute, 0, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+			char *attValue = gf_node_dump_attribute(n, &info);
+			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, attValue) ));
+			if (attValue) gf_free(attValue);
+		} else {
+			return JS_FALSE;
+		}
+	} else
+#endif
+	{
+		if (gf_node_get_field_by_name(n, param->attribute, &info) != GF_OK) return JS_FALSE;
+
+		switch (info.fieldType) {
+		case GF_SG_VRML_SFSTRING:
+			SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, ((SFString*)info.far_ptr)->buffer ) ) );
+			break;
+		case GF_SG_VRML_SFINT32:
+			SMJS_SET_RVAL( INT_TO_JSVAL( *((SFInt32*)info.far_ptr) ));
+			break;
+		case GF_SG_VRML_SFBOOL:
+			SMJS_SET_RVAL(BOOLEAN_TO_JSVAL( *((SFBool*)info.far_ptr) ));
+			break;
+		case GF_SG_VRML_SFFLOAT:
+			SMJS_SET_RVAL( DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT( *((SFFloat*)info.far_ptr) ) ) ));
+			break;
+		case GF_SG_VRML_SFTIME:
+			SMJS_SET_RVAL( DOUBLE_TO_JSVAL( JS_NewDouble(c, *((SFTime *)info.far_ptr) ) ));
+			break;
+		}
+	}
+
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_message_param)
+{
+	GF_WidgetPin *par = NULL;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetMessage *msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, obj);
+	if (!msg || !argc  ) return JS_FALSE;
+
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 idx = JSVAL_TO_INT(argv[0]);
+		par = gf_list_get(msg->params, idx);
+	} else if (JSVAL_IS_STRING(argv[0])) {
+		u32 i, count = gf_list_count(msg->params);
+		char *name =  SMJS_CHARS(c, argv[0]);
+		for (i=0; i<count; i++) {
+			par = gf_list_get(msg->params, i);
+			if (!strcmp(par->name, name)) break;
+			par = NULL;
+		}
+		SMJS_FREE(c, name);
+	}
+
+	if (par) {
+		JSObject *obj = JS_NewObject(c, &msg->ifce->content->widget->wm->widgetAnyClass._class, 0, 0);
+		SMJS_SET_PRIVATE(c, obj, par);
+		JS_DefineProperty(c, obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, par->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "is_input", BOOLEAN_TO_JSVAL( (par->type == GF_WM_PARAM_OUTPUT) ? JS_FALSE : JS_TRUE), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		switch (par->script_type) {
+		case GF_WM_PARAM_SCRIPT_BOOL:
+			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "boolean") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			break;
+		case GF_WM_PARAM_SCRIPT_NUMBER:
+			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "number") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			break;
+		case GF_WM_PARAM_SCRIPT_STRING:
+		default:
+			JS_DefineProperty(c, obj, "script_type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, "string") ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			break;
+		}
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_message)
+{
+	GF_WidgetMessage *msg;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInterface *ifce = (GF_WidgetInterface*)SMJS_GET_PRIVATE(c, obj);
+	if (!ifce || !argc) return JS_FALSE;
+	msg = NULL;
+
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 idx;
+		idx = JSVAL_TO_INT(argv[0]);
+		msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, idx);
+	} else if (JSVAL_IS_STRING(argv[0])) {
+		u32 i, count = gf_list_count(ifce->messages);
+		char *name = SMJS_CHARS(c, argv[0]);
+		for (i=0; i<count; i++) {
+			msg = (GF_WidgetMessage*)gf_list_get(ifce->messages, i);
+			if (!strcmp(msg->name, name)) break;
+			msg = NULL;
+		}
+		SMJS_FREE(c, name);
+	}
+	if (msg) {
+		JSObject *obj = JS_NewObject(c, &ifce->content->widget->wm->widgetAnyClass._class, 0, 0);
+		SMJS_SET_PRIVATE(c, obj, msg);
+		JS_DefineProperty(c, obj, "num_params", INT_TO_JSVAL( gf_list_count(msg->params) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, msg->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "is_input", BOOLEAN_TO_JSVAL( msg->is_output ? JS_FALSE : JS_TRUE ) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "has_output_trigger", BOOLEAN_TO_JSVAL( msg->output_trigger ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "has_input_action", BOOLEAN_TO_JSVAL( (msg->input_action && msg->input_action->attribute) ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineProperty(c, obj, "has_script_input", BOOLEAN_TO_JSVAL( (msg->input_action && !msg->input_action->attribute) ? JS_TRUE : JS_FALSE) , 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+		JS_DefineFunction(c, obj, "get_param", wm_widget_get_message_param, 1, 0);
+
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_component)
+{
+	char *comp_id;
+	u32 i, count;
+	GF_WidgetComponentInstance *comp_inst;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !argc || !JSVAL_IS_STRING(argv[0]) ) return JS_FALSE;
+
+	comp_id = SMJS_CHARS(c, argv[0]);
+	count = gf_list_count(wid->components);
+	for (i=0; i<count; i++) {
+		comp_inst = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
+		if (comp_inst->comp->id && !strcmp(comp_inst->comp->id, comp_id)) {
+			SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
+			SMJS_FREE(c, comp_id);
+			return JS_TRUE;
+		}
+	}
+	/*if requested load the component*/
+	if ((argc==2) && JSVAL_IS_BOOLEAN(argv[1]) && (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
+		count = gf_list_count(wid->widget->main->components);
+		for (i=0; i<count; i++) {
+			GF_WidgetComponent *comp = (GF_WidgetComponent*)gf_list_get(wid->widget->main->components, i);
+			if (!comp->id  || strcmp(comp->id, comp_id)) continue;
+
+			comp_inst = wm_activate_component(c, wid, comp, GF_TRUE);
+			if (comp_inst) {
+				SMJS_SET_RVAL( OBJECT_TO_JSVAL(comp_inst->wid->obj) );
+				SMJS_FREE(c, comp_id);
+				return JS_TRUE;
+			}
+			SMJS_FREE(c, comp_id);
+			return JS_TRUE;
+		}
+	}
+
+	SMJS_FREE(c, comp_id);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_interface)
+{
+	u32 idx;
+	GF_WidgetInterface *ifce;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !argc || !JSVAL_IS_INT(argv[0]) ) return JS_FALSE;
+
+	idx = JSVAL_TO_INT(argv[0]);
+	ifce = (GF_WidgetInterface*)gf_list_get(wid->widget->main->interfaces, idx);
+
+	if (ifce) {
+		if (!ifce->obj) {
+			ifce->obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
+			SMJS_SET_PRIVATE(c, ifce->obj, ifce);
+			JS_DefineProperty(c, ifce->obj, "num_messages", INT_TO_JSVAL( gf_list_count(ifce->messages) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, ifce->obj, "type", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ifce->type) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, ifce->obj, "serviceProvider", BOOLEAN_TO_JSVAL( ifce->provider ? JS_TRUE : JS_FALSE ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, ifce->obj, "multipleBinding", BOOLEAN_TO_JSVAL( ifce->multiple_binding ? JS_TRUE : JS_FALSE ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineFunction(c, ifce->obj, "get_message", wm_widget_get_message, 1, 0);
+			gf_js_add_root(c, &ifce->obj, GF_JSGC_OBJECT);
+		}
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(ifce->obj) );
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_bind_output_trigger)
+{
+	GF_WidgetMessage *msg;
+	GF_WidgetPin *param;
+	SVG_handlerElement *handler;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+
+	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_FALSE) );
+	if (!wid || !wid->scene || (argc!=3)) return JS_TRUE;
+
+	if (!JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
+	if (!JSVAL_IS_OBJECT(argv[1])) return JS_TRUE;
+	if (!JSVAL_IS_OBJECT(argv[2])) return JS_TRUE;
+
+	msg = (GF_WidgetMessage *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]));
+	if (!msg) return JS_TRUE;
+	param = msg->output_trigger;
+	if (!param) return JS_TRUE;
+
+
+	handler = wm_create_scene_listener(wid, param);
+	if (!handler) return JS_TRUE;
+	handler->js_fun_val = * (u64 *) & argv[1];
+	gf_js_add_root(c, &handler->js_fun_val, GF_JSGC_VAL);
+	handler->evt_listen_obj = wid;
+	handler->js_fun = param;
+	handler->js_context = c;
+	handler->handle_event = wm_handle_dom_event;
+	handler->sgprivate->UserPrivate = JSVAL_TO_OBJECT(argv[2]);
+
+	gf_list_add(wid->output_triggers, handler);
+	SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
+
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_get_context)
+{
+	GF_BitStream *bs;
+	u32 i, count;
+	const char *str;
+	char *att;
+	SMJS_OBJ
+	//SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+	if (!wid->scene) {
+		SMJS_SET_RVAL(JSVAL_NULL);
+		return JS_TRUE;
+	}
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<contextInformation xmlns=\"urn:mpeg:mpegu:schema:widgets:contextinfo:2010\">\n";
+	gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
+
+	count = gf_list_count(wid->widget->main->preferences);
+	for (i=0; i<count; i++) {
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
+
+		/*preference is read only, do not include in context*/
+		if (pref->flags & GF_WM_PREF_READONLY) continue;
+		/*preference is not migratable, do not include in context*/
+		if (!(pref->flags & GF_WM_PREF_MIGRATE)) continue;
+
+		str = " <preference name=\"";
+		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
+
+		gf_bs_write_data(bs, (const char *) pref->name, (u32) strlen(pref->name) );
+
+		str = "\" value=\"";
+		gf_bs_write_data(bs, (const char *) str, (u32) strlen(str) );
+
+		/*read from node*/
+		if (pref->connectTo && pref->connectTo->attribute) {
+			GF_FieldInfo info;
+			GF_Node *n = gf_sg_find_node_by_name(wid->scene, pref->connectTo->node);
+			if (n) {
+
+#ifndef GPAC_DISABLE_SVG
+				if ((n->sgprivate->tag >= GF_NODE_FIRST_DOM_NODE_TAG) && !strcmp(pref->connectTo->attribute, "textContent")) {
+					char *txt = gf_dom_flatten_textContent(n);
+					gf_bs_write_data(bs, (const char *) txt, (u32) strlen(txt) );
+				} else
+#endif
+					if (gf_node_get_field_by_name(n, pref->connectTo->attribute, &info)==GF_OK) {
+						att = gf_node_dump_attribute(n, &info);
+						if (att) {
+							gf_bs_write_data(bs, (const char *)  att, (u32) strlen(att) );
+							gf_free(att);
+						}
+					}
+			}
+		}
+		/*read from config*/
+		else {
+			att = (char *)gf_opts_get_key((const char *) wid->secname, pref->name);
+			if (!att) att = pref->value;
+
+			if (att) gf_bs_write_data(bs, (const char *) att, (u32) strlen(att) );
+		}
+
+		str = "\"/>\n";
+		gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
+	}
+	str = "</contextInformation>\n";
+	gf_bs_write_data(bs, (const char *)  str, (u32) strlen(str) );
+
+	gf_bs_write_u8(bs, 0);
+	att = NULL;
+	gf_bs_get_content(bs, &att, &count);
+	gf_bs_del(bs);
+
+	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, att) ) );
+	gf_free(att);
+
+	return JS_TRUE;
+}
+
+
+static SMJS_FUNC_PROP_GET( wm_widget_getProperty)
+
+JSString *s;
+char *prop_name;
+const char *opt;
+GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+if (!wid) return JS_FALSE;
+
+if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+if (!prop_name) return JS_FALSE;
+
+/*
+		Manifest properties
+*/
+if (!strcmp(prop_name, "manifest")) {
+	s = JS_NewStringCopyZ(c, wid->widget->manifest_path);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "url")) {
+	s = JS_NewStringCopyZ(c, wid->widget->local_path ? wid->widget->local_path : wid->widget->url);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "main")) {
+	s = JS_NewStringCopyZ(c, wid->widget->main->relocated_src);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "localizedSrc")) {
+	s = JS_NewStringCopyZ(c, wid->widget->main->src);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "mainEncoding")) {
+	s = JS_NewStringCopyZ(c, wid->widget->main->encoding);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "mainMimeType")) {
+	s = JS_NewStringCopyZ(c, wid->widget->main->mimetype);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "defaultWidth")) {
+	*vp = INT_TO_JSVAL(wid->widget->width);
+}
+else if (!strcmp(prop_name, "defaultHeight")) {
+	*vp = INT_TO_JSVAL(wid->widget->height);
+}
+else if (!strcmp(prop_name, "icons")) {
+	u32 i, count;
+	JSObject *arr;
+	count = gf_list_count(wid->widget->icons);
+	arr = JS_NewArrayObject(c, count, NULL);
+	for (i = 0; i<count; i++) {
+		GF_WidgetContent *icon = (GF_WidgetContent*)gf_list_get(wid->widget->icons, i);
+		if (icon) {
+			char *abs_reloc_url;
+			jsval icon_obj_val;
+			JSObject *icon_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
+			SMJS_SET_PRIVATE(c, icon_obj, icon);
+			JS_DefineProperty(c, icon_obj, "src", STRING_TO_JSVAL( JS_NewStringCopyZ(c, icon->src) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			if (strlen(icon->relocated_src)) abs_reloc_url = gf_url_concatenate(wid->widget->url, icon->relocated_src);
+			else abs_reloc_url = gf_strdup("");
+			JS_DefineProperty(c, icon_obj, "relocated_src", STRING_TO_JSVAL( JS_NewStringCopyZ(c, abs_reloc_url) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, icon_obj, "width", INT_TO_JSVAL( icon->width ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, icon_obj, "height", INT_TO_JSVAL( icon->height ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			icon_obj_val = OBJECT_TO_JSVAL(icon_obj);
+			JS_SetElement(c, arr, i, &icon_obj_val);
+			gf_free(abs_reloc_url);
+		}
+	}
+	*vp = OBJECT_TO_JSVAL(arr);
+}
+else if (!strcmp(prop_name, "preferences")) {
+	u32 i, count;
+	JSObject *arr;
+	count = gf_list_count(wid->widget->main->preferences);
+	arr = JS_NewArrayObject(c, count, NULL);
+	for (i = 0; i<count; i++) {
+		GF_WidgetPreference *pref = (GF_WidgetPreference*)gf_list_get(wid->widget->main->preferences, i);
+		if (pref) {
+			jsval pref_obj_val;
+			JSObject *pref_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
+			SMJS_SET_PRIVATE(c, pref_obj, pref);
+			JS_DefineProperty(c, pref_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, pref->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, pref_obj, "value", STRING_TO_JSVAL( JS_NewStringCopyZ(c, pref->value) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, pref_obj, "readonly", STRING_TO_JSVAL( JS_NewStringCopyZ(c, ((pref->flags & GF_WM_PREF_READONLY)?"true":"false")) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			pref_obj_val = OBJECT_TO_JSVAL(pref_obj);
+			JS_SetElement(c, arr, i, &pref_obj_val);
+		}
+	}
+	*vp = OBJECT_TO_JSVAL(arr);
+}
+else if (!strcmp(prop_name, "features")) {
+	u32 i, count;
+	JSObject *arr;
+	count = gf_list_count(wid->widget->features);
+	arr = JS_NewArrayObject(c, count, NULL);
+	for (i = 0; i<count; i++) {
+		GF_WidgetFeature *feat = (GF_WidgetFeature*)gf_list_get(wid->widget->features, i);
+		if (feat) {
+			jsval feat_obj_val;
+			JSObject *feat_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
+			SMJS_SET_PRIVATE(c, feat_obj, feat);
+			JS_DefineProperty(c, feat_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, feat->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			JS_DefineProperty(c, feat_obj, "required", BOOLEAN_TO_JSVAL( (feat->required? JS_TRUE : JS_FALSE) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			{
+				u32 j, pcount;
+				JSObject *params_arr;
+				pcount = gf_list_count(feat->params);
+				params_arr = JS_NewArrayObject(c, pcount, NULL);
+				for (j=0; j < pcount; j++) {
+					GF_WidgetFeatureParam *param = (GF_WidgetFeatureParam*)gf_list_get(feat->params, j);
+					JSObject *param_obj = JS_NewObject(c, &wid->widget->wm->widgetAnyClass._class, 0, 0);
+					jsval param_obj_val;
+					SMJS_SET_PRIVATE(c, param_obj, param);
+					JS_DefineProperty(c, param_obj, "name", STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->name) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+					JS_DefineProperty(c, param_obj, "value", STRING_TO_JSVAL( JS_NewStringCopyZ(c, param->value) ), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+					param_obj_val = OBJECT_TO_JSVAL(param_obj);
+					JS_SetElement(c, params_arr, j, &param_obj_val);
+				}
+				JS_DefineProperty(c, feat_obj, "params", OBJECT_TO_JSVAL(params_arr), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+			}
+			feat_obj_val = OBJECT_TO_JSVAL(feat_obj);
+			JS_SetElement(c, arr, i, &feat_obj_val);
+		}
+	}
+	*vp = OBJECT_TO_JSVAL(arr);
+}
+
+else if (!strcmp(prop_name, "components")) {
+	u32 i, count;
+	jsval val;
+	JSObject *arr;
+	count = gf_list_count(wid->components);
+	arr = JS_NewArrayObject(c, count, NULL);
+	for (i = 0; i<count; i++) {
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, i);
+		val = OBJECT_TO_JSVAL(comp->wid->obj);
+		JS_SetElement(c, arr, i, &val);
+	}
+	*vp = OBJECT_TO_JSVAL(arr);
+}
+else if (!strcmp(prop_name, "identifier")) {
+	s = JS_NewStringCopyZ(c, wid->widget->identifier);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "name")) {
+	s = JS_NewStringCopyZ(c, wid->widget->name);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "shortName")) {
+	s = JS_NewStringCopyZ(c, wid->widget->shortname);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "authorName")) {
+	s = JS_NewStringCopyZ(c, wid->widget->authorName);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "authorEmail")) {
+	s = JS_NewStringCopyZ(c, wid->widget->authorEmail);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "authorHref")) {
+	s = JS_NewStringCopyZ(c, wid->widget->authorHref);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "description")) {
+	s = JS_NewStringCopyZ(c, wid->widget->description);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "viewmodes")) {
+	if (wid->widget->viewmodes) s = JS_NewStringCopyZ(c, wid->widget->viewmodes);
+	else s = JS_NewStringCopyZ(c, "");
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "license")) {
+	s = JS_NewStringCopyZ(c, wid->widget->license);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "licenseHref")) {
+	s = JS_NewStringCopyZ(c, wid->widget->licenseHref);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "version")) {
+	s = JS_NewStringCopyZ(c, wid->widget->version);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "uuid")) {
+	s = JS_NewStringCopyZ(c, wid->widget->uuid);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "discardable")) {
+	*vp = BOOLEAN_TO_JSVAL( wid->widget->discardable ? JS_TRUE : JS_FALSE);
+}
+else if (!strcmp(prop_name, "multipleInstances")) {
+	*vp = BOOLEAN_TO_JSVAL( wid->widget->multipleInstance ? JS_TRUE : JS_FALSE);
+}
+
+/*
+		Widget Manager special properties (common to all implementations)
+*/
+else if (!strcmp(prop_name, "permanent")) {
+	*vp = BOOLEAN_TO_JSVAL( wid->permanent ? JS_TRUE : JS_FALSE);
+}
+else if (!strcmp(prop_name, "is_component")) {
+	*vp = BOOLEAN_TO_JSVAL( wid->parent ? JS_TRUE : JS_FALSE);
+}
+else if (!strcmp(prop_name, "parent")) {
+	*vp = wid->parent ? OBJECT_TO_JSVAL(wid->parent->obj) : JSVAL_NULL;
+}
+else if (!strcmp(prop_name, "activated")) {
+	*vp = BOOLEAN_TO_JSVAL( wid->activated ? JS_TRUE : JS_FALSE);
+}
+else if (!strcmp(prop_name, "section")) {
+	s = JS_NewStringCopyZ(c, (const char *) wid->secname);
+	*vp = STRING_TO_JSVAL(s);
+}
+else if (!strcmp(prop_name, "num_instances")) {
+	*vp = INT_TO_JSVAL( wid->widget->nb_instances);
+}
+else if (!strcmp(prop_name, "num_interfaces")) {
+	*vp = INT_TO_JSVAL( gf_list_count(wid->widget->main->interfaces));
+}
+else if (!strcmp(prop_name, "num_components")) {
+	*vp = INT_TO_JSVAL( gf_list_count(wid->components));
+}
+else if (!strcmp(prop_name, "num_bound_interfaces")) {
+	*vp = INT_TO_JSVAL( gf_list_count(wid->bound_ifces));
+}
+/*all variables used by the WidgetManager script but not stored*/
+else if (!strcmp(prop_name, "originating_device_ip")
+         || !strcmp(prop_name, "originating_device")
+         || !strcmp(prop_name, "device")
+        ) {
+}
+/*
+		Widget properties, common to each implementation
+*/
+else {
+	char szName[1024];
+	sprintf(szName, "WM:%s", prop_name);
+	opt = gf_opts_get_key((const char *) wid->secname, szName);
+	if (opt) {
+		Double val=0;
+		if (!strcmp(opt, "true")) *vp = BOOLEAN_TO_JSVAL(JS_TRUE);
+		else if (!strcmp(opt, "false")) *vp = BOOLEAN_TO_JSVAL(JS_FALSE);
+		else if (sscanf(opt, "%lf", &val)==1) {
+			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, val) );
+		} else {
+			s = JS_NewStringCopyZ(c, opt);
+			*vp = STRING_TO_JSVAL(s);
+		}
+	}
+}
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET( wm_widget_setProperty)
+
+char szVal[32];
+jsdouble val;
+char *prop_name;
+GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+if (!wid) return JS_FALSE;
+
+if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+
+/*internal to WidgetManager, never stored*/
+if (!strcmp(prop_name, "permanent")) {
+	wid->permanent = (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? GF_TRUE : GF_FALSE;
+}
+
+/*any widget properties*/
+else {
+	char szName[1024], *value, *_val = NULL;
+
+	if (JSVAL_IS_STRING(*vp)) {
+		value = _val = SMJS_CHARS(c, *vp);
+		if (!value) value = "";
+	}
+	else if (JSVAL_IS_BOOLEAN(*vp)) {
+		strcpy(szVal, (JSVAL_TO_BOOLEAN(*vp)==JS_TRUE) ? "true" : "false");
+		value = szVal;
+	}
+	else if (JSVAL_IS_NUMBER(*vp)) {
+		JS_ValueToNumber(c, *vp, &val);
+		sprintf(szVal, "%f", val);
+		value = szVal;
+	} else {
+		SMJS_FREE(c, prop_name);
+		return JS_TRUE;
+	}
+
+	sprintf(szName, "WM:%s", prop_name);
+	gf_cfg_set_key(wid->widget->wm->term->user->config, (const char *) wid->secname, szName, value);
+	SMJS_FREE(c, _val);
+}
+
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
+}
+
+
+
+static JSBool wm_widget_bind_interface_ex(JSContext *c, JSObject *obj, uintN argc, jsval *argv, jsval *rval, Bool is_unbind)
+{
+	u32 i, count;
+	GF_WidgetInterfaceInstance *bifce;
+	GF_WidgetInterface *ifce;
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !wid->scene) return JS_FALSE;
+
+	ifce = NULL;
+	if (argc) {
+		if (!JSVAL_IS_OBJECT(argv[0])) return JS_FALSE;
+		ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+		if (!ifce) return JS_FALSE;
+	}
+
+	if (!is_unbind) {
+		char *hostname;
+		JSObject *cookie;
+		if ((argc<3) || !JSVAL_IS_OBJECT(argv[1]) || !JSVAL_IS_STRING(argv[2])) return JS_FALSE;
+
+		cookie = JSVAL_TO_OBJECT(argv[1]);
+		hostname = SMJS_CHARS(c, argv[2]);
+		count = gf_list_count(wid->bound_ifces);
+		for (i=0; i<count; i++) {
+			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
+			if (!strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie) ) {
+				SMJS_FREE(c, hostname);
+				return JS_TRUE;
+			}
+		}
+		GF_SAFEALLOC(bifce, GF_WidgetInterfaceInstance);
+		bifce->wid = wid;
+		bifce->ifce = ifce;
+		bifce->cookie = cookie;
+		bifce->hostname = gf_strdup(hostname);
+		SMJS_FREE(c, hostname);
+		gf_list_add(wid->bound_ifces, bifce);
+
+		if (ifce->bind_action) {
+			return wm_widget_set_scene_input_value(c, obj, 1, argv, rval, 2, NULL, NULL, NULL);
+		} else {
+			widget_on_interface_bind(bifce, GF_FALSE);
+		}
+	} else {
+		JSObject *cookie = NULL;
+		if ((argc==2) && JSVAL_IS_OBJECT(argv[1])) cookie = JSVAL_TO_OBJECT(argv[1]);
+
+		count = gf_list_count(wid->bound_ifces);
+		for (i=0; i<count; i++) {
+			bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
+			if (!ifce || ( !strcmp(bifce->ifce->type, ifce->type) && (bifce->cookie==cookie)) ) {
+				gf_list_rem(wid->bound_ifces, i);
+				if (bifce->ifce->unbind_action) {
+					wm_widget_set_scene_input_value(c, NULL, 0, NULL, rval, 3, wid, bifce->ifce->unbind_action, NULL);
+				} else {
+					widget_on_interface_bind(bifce, GF_TRUE);
+				}
+				if (ifce) {
+					/*unregister our message handlers*/
+					count = gf_list_count(wid->output_triggers);
+					for (i=0; i<count; i++) {
+						u32 j, c2, found;
+						GF_DOMHandler *handler = (GF_DOMHandler*)gf_list_get(wid->output_triggers, i);
+						GF_WidgetPin *param = (GF_WidgetPin*)handler->js_fun;
+
+						if (handler->sgprivate->UserPrivate != cookie) continue;
+						found = 0;
+						c2 = gf_list_count(bifce->ifce->messages);
+						for (j=0; j<c2; j++) {
+							GF_WidgetMessage *msg = (GF_WidgetMessage*)gf_list_get(bifce->ifce->messages, j);
+							if (msg->output_trigger == param) {
+								found = 1;
+								break;
+							}
+						}
+						if (found) {
+#ifndef GPAC_DISABLE_SVG
+							GF_Node *listener = handler->sgprivate->parents->node;
+							gf_dom_listener_del(listener, listener->sgprivate->UserPrivate);
+#endif
+							gf_list_rem(wid->output_triggers, i);
+							i--;
+							count--;
+						}
+					}
+				}
+				wm_delete_interface_instance(wid->widget->wm, bifce);
+				if (ifce) return JS_TRUE;
+				i--;
+				count--;
+			}
+		}
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_bind_interface)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	SMJS_DECL_RVAL
+	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_FALSE);
+}
+static JSBool SMJS_FUNCTION(wm_widget_unbind_interface)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	SMJS_DECL_RVAL
+	return wm_widget_bind_interface_ex(c, obj, argc, argv, rval, GF_TRUE);
+}
+
+
+static JSBool SMJS_FUNCTION(wm_widget_deactivate)
+{
+	u32 i, count;
+	jsval funval;
+	SMJS_OBJ
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid) return JS_FALSE;
+
+	/*widget is a component of another widget, unregister*/
+	if (wid->parent) {
+		GF_WidgetInstance *par_wid = wid->parent;
+		count = gf_list_count(par_wid->components);
+		for (i=0; i<count; i++) {
+			GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(par_wid->components, i);
+			if (comp->wid == wid) {
+				gf_list_rem(par_wid->components, i);
+				gf_free(comp);
+				break;
+			}
+		}
+		wid->parent = NULL;
+	}
+
+	/*remove all components*/
+	while (gf_list_count(wid->components)) {
+		GF_WidgetComponentInstance *comp = (GF_WidgetComponentInstance*)gf_list_get(wid->components, 0);
+		wm_deactivate_component(c, wid, NULL, comp);
+		gf_list_rem(wid->components, 0);
+	}
+
+	/*mark the widget as deactivated, so it is no longer valid when checking all widgets bindings*/
+	wid->activated = GF_FALSE;
+
+	/*unbind existing widgets*/
+	JS_LookupProperty(wid->widget->wm->ctx, wid->widget->wm->obj, "unbind_widget", &funval);
+	if (JSVAL_IS_OBJECT(funval)) {
+		jsval an_argv[1];
+		an_argv[0] = OBJECT_TO_JSVAL(obj);
+		JS_CallFunctionValue(wid->widget->wm->ctx, wid->widget->wm->obj, funval, 1, an_argv, SMJS_GET_RVAL );
+	}
+
+	/*unbind all interfaces of this widget*/
+	wm_widget_bind_interface_ex(c, obj, 0, NULL, SMJS_GET_RVAL, GF_TRUE);
+
+	/*detach scene now that all unbind events have been sent*/
+	wid->scene = NULL;
+	return JS_TRUE;
+}
+
+
+static void wm_widget_jsbind(GF_WidgetManager *wm, GF_WidgetInstance *wid)
+{
+	if (wid->obj)
+		return;
+	wid->obj = JS_NewObject(wm->ctx, &wm->wmWidgetClass._class, 0, 0);
+	SMJS_SET_PRIVATE(wm->ctx, wid->obj, wid);
+	/*protect from GC*/
+	gf_js_add_root(wm->ctx, &wid->obj, GF_JSGC_OBJECT);
+}
+
+void wm_deactivate_component(JSContext *c, GF_WidgetInstance *wid, GF_WidgetComponent *comp, GF_WidgetComponentInstance *comp_inst)
+{
+	jsval fval, rval;
+
+	if (!comp_inst) {
+		u32 i=0;
+		while ((comp_inst = (GF_WidgetComponentInstance*)gf_list_enum(wid->components, &i))) {
+			if (comp_inst->comp == comp) break;
+			comp_inst = NULL;
+		}
+	}
+	if (!comp_inst) return;
+
+	if ((JS_LookupProperty(c, wid->widget->wm->obj, "on_widget_remove", &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
+		jsval argv[1];
+		argv[0] = OBJECT_TO_JSVAL(comp_inst->wid->obj);
+		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, fval, 1, argv, &rval);
+	}
+}
+
+GF_WidgetComponentInstance *wm_activate_component(JSContext *c, GF_WidgetInstance *wid, GF_WidgetComponent *comp, Bool skip_wm_notification)
+{
+	u32 i, count;
+	const char *fun_name = NULL;
+	jsval fval, rval;
+	GF_WidgetComponentInstance *comp_inst;
+	GF_WidgetInstance *comp_wid;
+
+	comp_wid = NULL;
+	if (comp->src) {
+		char *url = gf_url_concatenate(wid->widget->url, comp->src);
+
+		count = gf_list_count(wid->widget->wm->widget_instances);
+		for (i=0; i<count; i++) {
+			comp_wid = (GF_WidgetInstance*)gf_list_get(wid->widget->wm->widget_instances, i);
+			if (!strcmp(comp_wid->widget->url, url) && !comp_wid->parent) break;
+			comp_wid = NULL;
+		}
+		if (!comp_wid) {
+			comp_wid = wm_load_widget(wid->widget->wm, url, 0, GF_FALSE);
+			if (comp_wid) comp_wid->permanent = GF_FALSE;
+		}
+		gf_free(url);
+	}
+	if (!comp_wid) return NULL;
+
+	if (!comp_wid->activated)
+		fun_name = "on_widget_add";
+
+	GF_SAFEALLOC(comp_inst, GF_WidgetComponentInstance);
+	if (!comp_inst) return NULL;
+	comp_inst->comp = comp;
+	comp_inst->wid = comp_wid;
+	comp_wid->parent = wid;
+
+	gf_list_add(wid->components, comp_inst);
+
+	if (!comp_inst->wid->obj) wm_widget_jsbind(wid->widget->wm, comp_inst->wid);
+
+	if (!skip_wm_notification && fun_name && (JS_LookupProperty(c, wid->widget->wm->obj, fun_name, &fval)==JS_TRUE) && JSVAL_IS_OBJECT(fval)) {
+		jsval argv[1];
+		argv[0] = OBJECT_TO_JSVAL(comp_inst->wid->obj);
+		JS_CallFunctionValue(wid->widget->wm->ctx, wid->obj, fval, 1, argv, &rval);
+	}
+	if (comp_inst) return comp_inst;
+	return NULL;
+}
+
+static JSBool SMJS_FUNCTION(wm_widget_is_interface_bound)
+{
+	u32 i, count;
+	JSObject *cookie;
+	GF_WidgetInterface *ifce;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetInstance *wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, obj);
+	if (!wid || !wid->scene || (argc<1) || !JSVAL_IS_OBJECT(argv[0]) ) return JS_FALSE;
+
+	ifce = SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!ifce) return JS_FALSE;
+	cookie = NULL;
+	if ((argc==2) && JSVAL_IS_OBJECT(argv[1]) )
+		cookie = JSVAL_TO_OBJECT(argv[1]);
+
+	SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(JS_FALSE));
+	count = gf_list_count(wid->bound_ifces);
+	for (i=0; i<count; i++) {
+		GF_WidgetInterfaceInstance *bifce = (GF_WidgetInterfaceInstance*)gf_list_get(wid->bound_ifces, i);
+		if (!strcmp(bifce->ifce->type, ifce->type) && (!cookie || (bifce->cookie==cookie))) {
+			SMJS_SET_RVAL( BOOLEAN_TO_JSVAL(JS_TRUE) );
+			break;
+		}
+	}
+	return JS_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(wm_load)
+{
+	u32 i, count;
+	char *manifest, *url, *widget_ctx;
+	GF_WidgetInstance *wid;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+
+	manifest = SMJS_CHARS(c, argv[0]);
+
+	url = NULL;
+	if ((argc==2) && ! JSVAL_IS_NULL(argv[1]) && JSVAL_IS_OBJECT(argv[1])) {
+		GF_WidgetInstance *parent_widget;
+		if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[1]), &wm->wmWidgetClass, NULL) ) return JS_FALSE;
+		parent_widget = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[1]) );
+
+		if (parent_widget->widget->url) url = gf_url_concatenate(parent_widget->widget->url, manifest);
+	}
+
+	widget_ctx = NULL;
+	if ((argc==3) && !JSVAL_IS_NULL(argv[2]) && JSVAL_IS_STRING(argv[2])) {
+		widget_ctx = SMJS_CHARS(c, argv[2]);
+	}
+
+	if (!url) {
+		url = gf_strdup(manifest);
+	}
+
+	wid=NULL;
+	count = gf_list_count(wm->widget_instances);
+	for (i=0; i<count; i++) {
+		wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
+		if (!strcmp(wid->widget->url, url) && !wid->activated) break;
+		wid = NULL;
+	}
+	if (!wid) {
+		wid = wm_load_widget(wm, url, 0, GF_TRUE);
+	}
+	if (url) gf_free(url);
+
+	/*parse context if any*/
+	if (wid && wid->mpegu_context) {
+		gf_xml_dom_del(wid->mpegu_context);
+		wid->mpegu_context = NULL;
+	}
+	if (wid && widget_ctx && strlen(widget_ctx)) {
+		GF_Err e;
+		GF_XMLNode *context = NULL;
+		wid->mpegu_context = gf_xml_dom_new();
+		e = gf_xml_dom_parse_string(wid->mpegu_context, widget_ctx);
+		if (!e) {
+			context = gf_xml_dom_get_root(wid->mpegu_context);
+			if (strcmp(context->name, "contextInformation")) context = NULL;
+		} else {
+		}
+
+		if (!context && wid->mpegu_context) {
+			gf_xml_dom_del(wid->mpegu_context);
+			wid->mpegu_context = NULL;
+		}
+	}
+
+	if (wid) {
+		wm_widget_jsbind(wm, wid);
+		SMJS_SET_RVAL(OBJECT_TO_JSVAL(wid->obj));
+	}
+	SMJS_FREE(c, manifest);
+	SMJS_FREE(c, widget_ctx);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_unload)
+{
+	GF_WidgetInstance *wid;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
+
+	if (!GF_JS_InstanceOf(c, JSVAL_TO_OBJECT(argv[0]), &wm->wmWidgetClass, NULL) ) return JS_FALSE;
+	wid = (GF_WidgetInstance *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(argv[0]) );
+	if (!wid) return JS_TRUE;
+
+	/*unless explecetely requested, remove the section*/
+	if ((argc!=2) || !JSVAL_IS_BOOLEAN(argv[1]) || (JSVAL_TO_BOOLEAN(argv[1])==JS_TRUE) ) {
+		/*create section*/
+		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
+	}
+	wm_delete_widget_instance(wm, wid);
+	return JS_TRUE;
+}
+
+
+
+static SMJS_FUNC_PROP_GET( wm_getProperty)
+
+char *prop_name;
+GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+if (!wm) return JS_FALSE;
+
+if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+if (!prop_name) return JS_FALSE;
+
+if (!strcmp(prop_name, "num_widgets")) {
+	*vp = INT_TO_JSVAL(gf_list_count(wm->widget_instances));
+}
+else if (!strcmp(prop_name, "last_widget_dir")) {
+	const char *opt = gf_opts_get_key("Widgets", "last_widget_dir");
+	if (!opt) opt = "/";
+	*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(c, opt));
+}
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
+}
+
+
+static SMJS_FUNC_PROP_SET( wm_setProperty)
+
+char *prop_name;
+GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+if (!wm) return JS_FALSE;
+
+if (!JSVAL_IS_STRING(*vp)) return JS_TRUE;
+if (!SMJS_ID_IS_STRING(id)) return JS_TRUE;
+prop_name = SMJS_CHARS_FROM_STRING(c, SMJS_ID_TO_STRING(id));
+
+if (!strcmp(prop_name, "last_widget_dir")) {
+	char *v = SMJS_CHARS(c, *vp);
+	gf_cfg_set_key(wm->term->user->config, "Widgets", "last_widget_dir", v);
+	SMJS_FREE(c, v);
+}
+SMJS_FREE(c, prop_name);
+return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_get)
+{
+	u32 i;
+	GF_WidgetInstance *wid;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+	if (!argc || !JSVAL_IS_INT(argv[0])) return JS_TRUE;
+
+	i = JSVAL_TO_INT(argv[0]);
+	wid = (GF_WidgetInstance*)gf_list_get(wm->widget_instances, i);
+	if (wid) SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(wm_find_interface)
+{
+	char *ifce_name;
+	u32 i;
+	GF_WidgetInstance *wid;
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+	if (!argc || !JSVAL_IS_STRING(argv[0])) return JS_TRUE;
+
+	ifce_name = SMJS_CHARS(c, argv[0]);
+	i=0;
+	while ( (wid = (GF_WidgetInstance*)gf_list_enum(wm->widget_instances, &i) )) {
+		u32 j=0;
+		GF_WidgetInterface *wid_ifce;
+		while ((wid_ifce = (GF_WidgetInterface*)gf_list_enum(wid->widget->main->interfaces, &j))) {
+			if (!strcmp(wid_ifce->type, ifce_name)) {
+				SMJS_SET_RVAL( OBJECT_TO_JSVAL(wid->obj) );
+				SMJS_FREE(c, ifce_name);
+				return JS_TRUE;
+			}
+		}
+	}
+	SMJS_FREE(c, ifce_name);
+	return JS_TRUE;
+}
+
+
+const char *wm_xml_get_attr(GF_XMLNode *root, const char *name)
+{
+
+	u32 i, count;
+	count = gf_list_count(root->attributes);
+	for (i=0; i<count; i++) {
+		char *sep;
+		GF_XMLAttribute *att = gf_list_get(root->attributes, i);
+		if (!att->name) continue;
+		if (!strcmp(att->name, name)) return att->value;
+		sep = strchr(att->name, ':');
+		if (sep && !strcmp(sep+1, name)) return att->value;
+	}
+	return NULL;
+}
+
+/* TODO Implement real language check according to BCP 47*/
+static Bool wm_check_language(const char *xml_lang_value, const char *user_locale)
+{
+	Bool ret = GF_FALSE;
+	char *sep, *val;
+	val = (char*)xml_lang_value;
+	while (!ret) {
+		sep = strchr(val, ';');
+		if (sep) sep[0] = 0;
+		if (strstr(user_locale, val)) ret = GF_TRUE;
+		if (sep) {
+			sep[0] = ';';
+			val = sep+1;
+		} else {
+			break;
+		}
+	}
+	return ret;
+}
+
+static GF_XMLNode *wm_xml_find(GF_XMLNode *root, const char *ns_prefix, const char *name, const char *user_locale)
+{
+	GF_XMLNode *localized = NULL;
+	GF_XMLNode *non_localized = NULL;
+	u32 i, count;
+
+	if (!root) return NULL;
+
+	count = gf_list_count(root->content);
+	for (i=0; i<count; i++) {
+		GF_XMLNode *n = (GF_XMLNode*)gf_list_get(root->content, i);
+		if (n->type==GF_XML_NODE_TYPE && n->name && !strcmp(n->name, name) && ((!ns_prefix && !n->ns) || (ns_prefix && n->ns && !strcmp(ns_prefix, n->ns)))) {
+			const char *lang = wm_xml_get_attr(n, "xml:lang");
+			if (!lang) {
+				if (!non_localized) non_localized = n;
+			} else {
+				if (user_locale && wm_check_language(lang, user_locale) && !localized) localized = n;
+			}
+		}
+	}
+	if (localized) return localized;
+	else return non_localized;
+}
+
+static GF_WidgetPin *wm_parse_pin(const char *value, u16 type, const char *pin_name, const char *scriptType, const char *default_value)
+{
+	GF_WidgetPin *pin;
+	char *sep;
+
+	if (!value && !scriptType && !default_value) return NULL;
+
+	GF_SAFEALLOC(pin, GF_WidgetPin);
+	if (!pin) return NULL;
+	
+	pin->type = type;
+	if (pin_name) pin->name = gf_strdup(pin_name);
+
+	if (value) {
+		sep = strrchr(value, '.');
+		if (!sep && (type==GF_WM_PREF_CONNECT)) {
+			gf_free(pin);
+			return NULL;
+		}
+
+		/*node.event || node.attribute*/
+		if (sep) {
+			sep[0] = 0;
+			pin->node = gf_strdup(value);
+			pin->attribute = gf_strdup(sep+1);
+			sep[0] = '.';
+		}
+		/*script function*/
+		else {
+			pin->node = gf_strdup(value);
+		}
+	}
+
+	if (scriptType) {
+		if (!strcmp(scriptType, "boolean")) pin->script_type = GF_WM_PARAM_SCRIPT_BOOL;
+		else if (!strcmp(scriptType, "number")) pin->script_type = GF_WM_PARAM_SCRIPT_NUMBER;
+	} else if (default_value) {
+		pin->default_value = gf_strdup(default_value);
+	}
+	return pin;
+}
+
+static void wm_parse_mpegu_content_element(GF_WidgetContent *content, GF_XMLNode *root, const char *ns_prefix, GF_List *global_prefs)
+{
+	GF_XMLNode *ifces, *context, *pref_node;
+	GF_WidgetMessage *msg;
+	GF_WidgetInterface *ifce;
+	GF_XMLNode *ifce_node;
+	GF_WidgetPreference *pref;
+	const char *att;
+	u32 i = 0;
+
+	ifces = wm_xml_find(root, ns_prefix, "interfaces", NULL);
+	if (ifces) {
+
+		/*get all interface element*/
+		while ((ifce_node = (GF_XMLNode*)gf_list_enum(ifces->content, &i))) {
+			GF_XMLNode *msg_node;
+			u32 j;
+			const char *ifce_type, *act;
+			if (ifce_node->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(ifce_node->name, "interface")) continue;
+			ifce_type = wm_xml_get_attr(ifce_node, "type");
+			if (!ifce_type) continue;
+
+			GF_SAFEALLOC(ifce, GF_WidgetInterface);
+			ifce->type = gf_strdup(ifce_type);
+			ifce->messages = gf_list_new();
+			ifce->content = content;
+			gf_list_add(content->interfaces, ifce);
+
+			act = wm_xml_get_attr(ifce_node, "serviceProvider");
+			if (act && !strcmp(act, "true")) ifce->provider = GF_TRUE;
+
+			act = wm_xml_get_attr(ifce_node, "multipleBindings");
+			if (act && !strcmp(act, "true")) ifce->multiple_binding = GF_TRUE;
+
+			act = wm_xml_get_attr(ifce_node, "required");
+			if (act && !strcmp(act, "true")) ifce->required = GF_TRUE;
+
+			act = wm_xml_get_attr(ifce_node, "connectTo");
+			if (act) ifce->connectTo = gf_strdup(act);
+
+			act = wm_xml_get_attr(ifce_node, "bindAction");
+			if (act) {
+				ifce->bind_action = wm_parse_pin(act, GF_WM_BIND_ACTION, NULL, NULL, NULL);
+			}
+			act = wm_xml_get_attr(ifce_node, "unbindAction");
+			if (act) {
+				ifce->unbind_action = wm_parse_pin(act, GF_WM_UNBIND_ACTION, NULL, NULL, NULL);
+			}
+
+			j=0;
+			while ((msg_node = (GF_XMLNode*)gf_list_enum(ifce_node->content, &j))) {
+				u32 k;
+				GF_XMLNode *par_node;
+				const char *msg_name, *action;
+				if (msg_node->type != GF_XML_NODE_TYPE) continue;
+				if (strcmp(msg_node->name, "messageIn") && strcmp(msg_node->name, "messageOut")) continue;
+
+				msg_name = wm_xml_get_attr(msg_node, "name");
+				if (!msg_name) continue;
+				GF_SAFEALLOC(msg, GF_WidgetMessage);
+				msg->name = gf_strdup(msg_name);
+				msg->params = gf_list_new();
+				msg->ifce = ifce;
+				if (!strcmp(msg_node->name, "messageOut")) msg->is_output = 1;
+
+				gf_list_add(ifce->messages, msg);
+
+				/*get inputAction*/
+				action = wm_xml_get_attr(msg_node, "inputAction");
+				if (action) {
+					msg->input_action = wm_parse_pin(action, GF_WM_INPUT_ACTION, NULL, NULL, NULL);
+				}
+
+				/*get outputTrigger*/
+				action = wm_xml_get_attr(msg_node, "outputTrigger");
+				if (action) {
+					msg->output_trigger = wm_parse_pin(action, GF_WM_OUTPUT_TRIGGER, NULL, NULL, NULL);
+				}
+
+				/*get params*/
+				k=0;
+				while ((par_node=gf_list_enum(msg_node->content, &k))) {
+					GF_WidgetPin *wpin;
+					u16 type;
+					const char *par_name, *att_name;
+					if (par_node->type != GF_XML_NODE_TYPE) continue;
+					if (strcmp(par_node->name, "input") && strcmp(par_node->name, "output")) continue;
+
+
+					par_name = wm_xml_get_attr(par_node, "name");
+					/*invalid param, discard message*/
+					if (!par_name) {
+						gf_list_del_item(ifce->messages, msg);
+						gf_list_del(msg->params);
+						gf_free(msg->name);
+						gf_free(msg);
+						break;
+					}
+
+					if (!strcmp(par_node->name, "output")) {
+						type = GF_WM_PARAM_OUTPUT;
+						att_name = wm_xml_get_attr(par_node, "attributeModified");
+					} else {
+						type = GF_WM_PARAM_INPUT;
+						att_name = wm_xml_get_attr(par_node, "setAttribute");
+					}
+					wpin = wm_parse_pin(att_name, type, par_name, wm_xml_get_attr(par_node, "scriptParamType"), wm_xml_get_attr(par_node, "default"));
+					if (!wpin) continue;
+					wpin->msg = msg;
+
+					gf_list_add(msg->params, wpin);
+				}
+			}
+		}
+	}
+
+	/*get all component elements*/
+	i=0;
+	while (root && (ifce_node = gf_list_enum(root->content, &i))) {
+		GF_XMLNode *req_node;
+		u32 j;
+		const char *src, *id, *act;
+		GF_WidgetComponent *comp;
+		if (ifce_node->type != GF_XML_NODE_TYPE) continue;
+		if (strcmp(ifce_node->name, "component")) continue;
+		src = wm_xml_get_attr(ifce_node, "src");
+		id = wm_xml_get_attr(ifce_node, "id");
+
+		GF_SAFEALLOC(comp, GF_WidgetComponent);
+		comp->required_interfaces = gf_list_new();
+		comp->content = content;
+		if (id) comp->id = gf_strdup(id);
+		if (src) comp->src = gf_strdup(src);
+		j=0;
+		while ((req_node=gf_list_enum(ifce_node->content, &j))) {
+			const char *ifce_type;
+			if (req_node->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(req_node->name, "requiredInterface")) continue;
+			ifce_type = wm_xml_get_attr(req_node, "type");
+			if (!ifce_type) continue;
+			gf_list_add(comp->required_interfaces, gf_strdup(ifce_type));
+		}
+
+		act = wm_xml_get_attr(ifce_node, "activateTrigger");
+		if (act) comp->activateTrigger = wm_parse_pin(act, GF_WM_ACTIVATE_TRIGGER, NULL, NULL, NULL);
+		act = wm_xml_get_attr(ifce_node, "deactivateTrigger");
+		if (act) comp->deactivateTrigger = wm_parse_pin(act, GF_WM_DEACTIVATE_TRIGGER, NULL, NULL, NULL);
+
+		gf_list_add(content->components, comp);
+	}
+
+	/*clone global prefs for this content*/
+	i=0;
+	while ((pref = gf_list_enum(global_prefs, &i))) {
+		GF_WidgetPreference *apref;
+		GF_SAFEALLOC(apref, GF_WidgetPreference);
+		apref->name = gf_strdup(pref->name);
+		if (pref->value) apref->value = gf_strdup(pref->value);
+		apref->flags = pref->flags;
+		gf_list_add(content->preferences, apref);
+	}
+
+	context = wm_xml_find(root, ns_prefix, "contextConfiguration", NULL);
+	if (context) {
+		u32 j;
+		/*get all preference elements*/
+		i=0;
+		while ((pref_node = gf_list_enum(context->content, &i))) {
+			const char *att;
+			if (pref_node->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(pref_node->name, "preferenceConnect")) continue;
+			att = wm_xml_get_attr(pref_node, "name");
+			if (!att) continue;
+
+			j=0;
+			while ((pref = gf_list_enum(content->preferences, &j))) {
+				if (!strcmp(pref->name, att) && !pref->connectTo) break;
+			}
+
+			if (!pref) {
+				GF_SAFEALLOC(pref, GF_WidgetPreference);
+				if (!pref) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[WidgetMan] Failed to allocate widget preference\n"));
+					continue;
+				}
+
+				pref->name = gf_strdup(att);
+				gf_list_add(content->preferences, pref);
+			}
+			att = wm_xml_get_attr(pref_node, "value");
+			if (att) {
+				if (pref->value) gf_free(pref->value);
+				pref->value = gf_strdup(att);
+			}
+			att = wm_xml_get_attr(pref_node, "readOnly");
+			if (att && !strcmp(att, "true")) pref->flags |= GF_WM_PREF_READONLY;
+			att = wm_xml_get_attr(pref_node, "migratable");
+			if (att && !strcmp(att, "saveOnly")) pref->flags |= GF_WM_PREF_SAVE;
+			else if (att && !strcmp(att, "migrateOnly")) pref->flags |= GF_WM_PREF_MIGRATE;
+			else pref->flags |= GF_WM_PREF_SAVE | GF_WM_PREF_MIGRATE;
+
+			att = wm_xml_get_attr(pref_node, "connectTo");
+			if (att) pref->connectTo = wm_parse_pin(att, GF_WM_PREF_CONNECT, NULL, NULL, NULL);
+		}
+
+		att = wm_xml_get_attr(context, "savedAction");
+		if (att) content->savedAction = wm_parse_pin(att, GF_WM_PREF_SAVEDACTION, NULL, NULL, NULL);
+		att = wm_xml_get_attr(context, "restoredAction");
+		if (att) content->restoredAction = wm_parse_pin(att, GF_WM_PREF_RESTOREDACTION, NULL, NULL, NULL);
+		att = wm_xml_get_attr(context, "saveTrigger");
+		if (att) content->saveTrigger = wm_parse_pin(att, GF_WM_PREF_SAVETRIGGER, NULL, NULL, NULL);
+		att = wm_xml_get_attr(context, "restoreTrigger");
+		if (att) content->restoreTrigger = wm_parse_pin(att, GF_WM_PREF_RESTORETRIGGER, NULL, NULL, NULL);
+	}
+}
+
+/* Implements the W3C P&C rule for getting a single attribute value
+   see http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-valu0
+   should be different from getting normalized text but for now it's ok
+   */
+static char *wm_get_single_attribute(const char *input) {
+	u32 i, j, len;
+	char *output;
+	Bool first_space_copied;
+
+	if (!input) return gf_strdup("");
+
+	len = (u32) strlen(input);
+	output = gf_malloc(len+1);
+
+	first_space_copied = 1;
+	j = 0;
+	for (i = 0; i<len; i++) {
+		switch (input[i]) {
+		case ' ':
+		case '\t':
+		case '\r':
+		case '\n':
+			if (!first_space_copied) {
+				output[j] = ' ';
+				j++;
+				first_space_copied = 1;
+			}
+			break;
+		default:
+			output[j] = input[i];
+			j++;
+			first_space_copied = 0;
+		}
+	}
+	if (j && output[j-1] == ' ') output[j-1] = 0;
+	output[j] = 0;
+	return output;
+}
+
+/* Implements the W3C P&C rule for getting a single attribute value
+   see http://www.w3.org/TR/widgets/#rule-for-getting-a-single-attribute-valu0 */
+static u32 wm_parse_non_neg(const char *input) {
+	u32 result = 0;
+	if (strlen(input) && !strchr(input, '-')) {
+		if (sscanf(input, "%u", &result) != 1) result = 0;
+	}
+	return result;
+}
+
+/* returns the localized concatenated text content
+see http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#Node3-textContent
+and http://www.w3.org/TR/widgets/#rule-for-getting-text-content0
+*/
+static char *wm_get_text_content(GF_XMLNode *node, char *inherited_locale, const char *user_locale) {
+	if (node->type == GF_XML_TEXT_TYPE) {
+		if (node->name) return gf_strdup(node->name);
+		else return gf_strdup("");
+	} else {
+		char *xml_lang = (char *)wm_xml_get_attr(node, "xml:lang");
+		if (!xml_lang) xml_lang = inherited_locale;
+		/*
+		if (xml_lang && user_locale && wm_check_language(xml_lang, user_locale))
+		*/
+		{
+			u32 i, count;
+			char *text_content;
+			u32 text_content_len = 0;
+			text_content = gf_strdup("");
+			count = gf_list_count(node->content);
+			for (i=0; i<count; i++) {
+				GF_XMLNode *child = (GF_XMLNode *)gf_list_get(node->content, i);
+				char *child_content = wm_get_text_content(child, xml_lang, user_locale);
+				u32 child_content_len = (u32) strlen(child_content);
+				text_content = gf_realloc(text_content, text_content_len+child_content_len+1);
+				memcpy(text_content+text_content_len, child_content, child_content_len);
+				text_content[text_content_len+child_content_len] = 0;
+				text_content_len+=child_content_len;
+				gf_free(child_content);
+			}
+			return text_content;
+		}
+		/*
+		} else {
+			return gf_strdup("");
+		*/
+	}
+}
+
+static char *wm_get_normalized_text_content(GF_XMLNode *node, char *inherited_locale, const char *user_locale) {
+	char *text_content, *result;
+	/* first aggregate text content */
+	text_content = wm_get_text_content(node, inherited_locale, user_locale);
+	/* calling normalization of text content */
+	result = wm_get_single_attribute(text_content);
+	gf_free(text_content);
+	return result;
+}
+
+/* When relocating resources over HTTP, we check if the resources for a given locale exists
+  on the server by sending a HEAD message with an Accept-Language header. */
+void wm_relocate_proc(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	switch (parameter->msg_type) {
+	case GF_NETIO_GET_METHOD:
+		parameter->name = "HEAD";
+		break;
+	default:
+		return;
+	}
+}
+
+/* relocate the given resource name (res_name) using registered relocators (e.g. locales, package folder)
+   The result is the path of the file, possibly uncompressed, possibly localized.
+   The parameter widget_path provides the path for converting relative resource paths into absolute paths.*/
+static Bool wm_relocate_url(GF_WidgetManager *wm, const char *widget_path, const char *res_name, char *relocated_name, char *localized_res_name)
+{
+	Bool ok = 0;
+	char *res_url;
+	Bool result = gf_term_relocate_url(wm->term, res_name, widget_path, relocated_name, localized_res_name);
+	if (result) return result;
+
+	res_url = gf_url_concatenate(widget_path, res_name);
+
+	/*try with HTTP HEAD */
+	if (!strnicmp(widget_path, "http", 4)) {
+		GF_Err e;
+		/*fetch the remote widget manifest synchronously and load it */
+		GF_DownloadSession *sess = gf_dm_sess_new(wm->term->downloader, (char *)res_url, GF_NETIO_SESSION_NOT_THREADED, wm_relocate_proc, NULL, &e);
+		if (sess) {
+			e = gf_dm_sess_process(sess);
+			gf_dm_sess_del(sess);
+			if (e==GF_OK) {
+				const char *opt = gf_opts_get_key("core", "lang");
+				strcpy(relocated_name, res_url);
+				if (opt)
+					sprintf(localized_res_name, "%s/%s", opt, res_name);
+				else
+					strcpy(localized_res_name, res_name);
+				ok = 1;
+			}
+		}
+	}
+	gf_free(res_url);
+	return ok;
+}
+
+/* function that checks if the default start file exists in the widget (package or folder)
+   according to the default start files table from the W3C P&C spec.
+   The widget path attribute is used to get the associated relocator from the registered relocators */
+static void wm_set_default_start_file(GF_WidgetManager *wm, GF_WidgetContent *content, const char *widget_path) {
+	Bool result;
+	char localized_path[GF_MAX_PATH], relocated_path[GF_MAX_PATH];
+	char *mimetype = "text/html";
+	result = wm_relocate_url(wm, widget_path, "index.htm", relocated_path, localized_path);
+	if (result) {
+		mimetype = "text/html";
+	} else {
+		result = wm_relocate_url(wm, widget_path, "index.html", relocated_path, localized_path);
+		if (result) {
+			mimetype = "text/html";
+		} else {
+			result = wm_relocate_url(wm, widget_path, "index.svg", relocated_path, localized_path);
+			if (result) {
+				mimetype = "image/svg+xml";
+			} else {
+				result = wm_relocate_url(wm, widget_path, "index.xhtml", relocated_path, localized_path);
+				if (result) {
+					mimetype = "application/xhtml+xml";
+				} else {
+					result = wm_relocate_url(wm, widget_path, "index.xht", relocated_path, localized_path);
+					if (result) mimetype = "application/xhtml+xml";
+				}
+			}
+		}
+	}
+	if (content->src) gf_free(content->src);
+	content->src = gf_strdup(localized_path);
+	if (content->relocated_src) gf_free(content->relocated_src);
+	content->relocated_src = gf_strdup(relocated_path);
+	if (content->mimetype) gf_free(content->mimetype);
+	content->mimetype = gf_strdup(mimetype);
+	if (content->encoding) gf_free(content->encoding);
+	content->encoding = gf_strdup("utf-8");
+}
+
+static GF_WidgetContent *wm_add_icon(GF_Widget *widget, const char *icon_relocated_path, const char *icon_localized_path, const char *uri_fragment)
+{
+	GF_WidgetContent *icon;
+	u32 i, count;
+	Bool already_in = 0;
+
+	count = gf_list_count(widget->icons);
+	for (i =0; i<count; i++) {
+		GF_WidgetContent *in_icon = gf_list_get(widget->icons, i);
+		if (!strcmp(icon_localized_path, in_icon->src)) {
+			already_in = 1;
+			break;
+		}
+	}
+	if (already_in) return NULL;
+
+	GF_SAFEALLOC(icon, GF_WidgetContent);
+	if (!icon) return NULL;
+	
+	if (uri_fragment) {
+		icon->src = gf_malloc(strlen(icon_localized_path) + strlen(uri_fragment) + 1);
+		if (icon->src) {
+			strcpy(icon->src, icon_localized_path);
+			strcat(icon->src, uri_fragment);
+		}
+		icon->relocated_src = gf_malloc(strlen(icon_relocated_path) + strlen(uri_fragment) + 1);
+		if (icon->relocated_src) {
+			strcpy(icon->relocated_src, icon_relocated_path);
+			strcat(icon->relocated_src, uri_fragment);
+		}
+	} else {
+		icon->src = gf_strdup(icon_localized_path);
+		icon->relocated_src = gf_strdup(icon_relocated_path);
+	}
+	icon->interfaces = gf_list_new();
+	icon->components = gf_list_new();
+	icon->preferences = gf_list_new();
+	icon->widget = widget;
+	gf_list_add(widget->icons, icon);
+	return icon;
+}
+
+/* Scans the W3C default icons table and add each icon */
+static void wm_set_default_icon_files(GF_WidgetManager *wm, const char *widget_path, GF_Widget *widget) {
+	char relocated_path[GF_MAX_PATH], localized_path[GF_MAX_PATH];
+	Bool result;
+
+	result = wm_relocate_url(wm, widget_path, "icon.svg", relocated_path, localized_path);
+	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
+
+	result = wm_relocate_url(wm, widget_path, "icon.ico", relocated_path, localized_path);
+	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
+
+	result = wm_relocate_url(wm, widget_path, "icon.png", relocated_path, localized_path);
+	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
+
+	result = wm_relocate_url(wm, widget_path, "icon.gif", relocated_path, localized_path);
+	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
+
+	result = wm_relocate_url(wm, widget_path, "icon.jpg", relocated_path, localized_path);
+	if (result) wm_add_icon(widget, relocated_path, localized_path, NULL);
+}
+
+GF_WidgetInstance *wm_load_widget(GF_WidgetManager *wm, const char *path, u32 InstanceID, Bool skip_context)
+{
+	char szName[GF_MAX_PATH];
+	u32 i, count;
+	GF_Widget *widget = NULL;
+	GF_WidgetInstance *wi = NULL;
+	GF_XMLNode *root, *icon, *nmain, *name, *xml_node;
+	GF_Err e;
+	GF_DOMParser *dom = NULL;
+	GF_WidgetPackage *wpackage = NULL;
+
+	GF_DownloadSession *sess = NULL;
+	const char *widget_ns_prefix = NULL;
+	const char *mpegu_ns_prefix = NULL;
+	const char *user_locale = gf_opts_get_key("core", "lang");
+
+	/* Try to see if this widget is already loaded */
+	e = GF_OK;
+	count = gf_list_count(wm->widgets);
+	for (i=0; i<count; i++) {
+		widget = gf_list_get(wm->widgets, i);
+		if (!strcmp(widget->url, path)) break;
+		widget = NULL;
+	}
+
+	/*not found, retrieve the widget (if http), check the package if needed and parse the configuration document/widget manifest*/
+	if (!widget) {
+		Bool isDownloadedPackage = 0;
+
+		/* path used to locate the widget (config.xml if unpackaged or zip/isoff package), potentially after download */
+		const char *szLocalPath = path;
+		/* used to locate the config document/widget manifest potentially after unzipping */
+		const char *szManifestPath = path;
+		/* */
+		const char *szWidgetPath = path;
+		const char *desc;
+		GF_WidgetPreference *pref;
+		GF_List *global_prefs;
+		GF_WidgetContent *content;
+		Bool correct_ns = 0;
+
+		if (strstr(path, "http://")) {
+			/*fetch the remote widget manifest synchronously and load it */
+			sess = gf_dm_sess_new(wm->term->downloader, (char *)path, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
+			if (sess) {
+				e = gf_dm_sess_process(sess);
+				if (e==GF_OK) {
+					szLocalPath = gf_dm_sess_get_cache_name(sess);
+
+					if (gf_unzip_probe(szLocalPath)) {
+						isDownloadedPackage = 1;
+					} else {
+						/* TODO ISOFF-based packaged widget */
+					}
+				}
+			}
+			if (!sess || (e!=GF_OK) || !szLocalPath) goto exit;
+		}
+
+		/* Check if the widget package is a valid package and if it contains a config.xml file */
+		szManifestPath = szLocalPath;
+
+		wpackage = widget_package_new(wm, szLocalPath);
+		if (wpackage) {
+			count = gf_list_count(wpackage->resources);
+			for (i=0; i<count; i++) {
+				GF_WidgetPackageResource *wu = gf_list_get(wpackage->resources, i);
+				/* According to W3C WPC, the config.xml file (lower case) shall only be located
+				   at the root of the package
+				   see http://www.w3.org/TR/widgets/#ta-dxzVDWpaWg */
+				if (!strcmp(wu->inner_path, "config.xml")) {
+					szManifestPath = wu->extracted_path;
+					break;
+				}
+			}
+			szWidgetPath = szManifestPath;
+		}
+
+
+		/* Parse the Widget Config Document as a DOM */
+		dom = gf_xml_dom_new();
+		e = gf_xml_dom_parse(dom, szManifestPath, NULL, NULL);
+		if (e) goto exit;
+
+		root = gf_xml_dom_get_root(dom);
+		if (!root) goto exit;
+
+		correct_ns = 0;
+		count = gf_list_count(root->attributes);
+		for (i=0; i<count; i++) {
+			GF_XMLAttribute *att = gf_list_get(root->attributes, i);
+			if (att->name) {
+				if (!strcmp(att->name, "xmlns")) {
+					if (!strcmp(att->value, "http://www.w3.org/ns/widgets")) {
+						correct_ns = 1;
+					}
+				} else if (!strnicmp(att->name, "xmlns:", 6)) {
+					if (!strcmp(att->value, "http://www.w3.org/ns/widgets")) {
+						widget_ns_prefix = att->name+6;
+						correct_ns = 1;
+					} else if (!strcmp(att->value, "urn:mpeg:mpegu:schema:widgets:manifest:2010")) {
+						mpegu_ns_prefix = att->name+6;
+					}
+				}
+			}
+		}
+		/* According to the spec, wrong or no namespace means invalid widget
+		see http://www.w3.org/TR/widgets/#ta-ACCJfDGwDQ */
+		if (!correct_ns) goto exit;
+
+		/* see http://www.w3.org/TR/widgets/#ta-ACCJfDGwDQ */
+		if ((root->ns && (!widget_ns_prefix || strcmp(root->ns, widget_ns_prefix) || strcmp(root->name, "widget"))) ||
+		        (!root->ns && (widget_ns_prefix || strcmp(root->name, "widget"))))
+			goto exit;
+
+
+		/*pre-parse the root-level preference for use when parsing MPEG-U elements */
+		global_prefs = gf_list_new();
+		i=0;
+		while ((nmain = gf_list_enum(root->content, &i))) {
+			const char *pname, *pvalue;
+			/* 'normalized' preference name and readonly*/
+			char *npname, *npro;
+			u32 i, count;
+			Bool pref_exists = 0;
+			Bool readOnly = 0;
+			if (nmain->type != GF_XML_NODE_TYPE) continue;
+			if (strcmp(nmain->name, "preference")) continue;
+			pname = wm_xml_get_attr(nmain, "name");
+			npname = wm_get_single_attribute(pname);
+			if (!npname || !strlen(npname)) continue;
+
+			count = gf_list_count(global_prefs);
+			for (i = 0; i < count; i++) {
+				GF_WidgetPreference *tmp_pref = gf_list_get(global_prefs, i);
+				if (!strcmp(tmp_pref->name, npname)) {
+					pref_exists = 1;
+					break;
+				}
+			}
+			if (pref_exists) continue;
+
+			pvalue = wm_xml_get_attr(nmain, "readonly");
+			npro = wm_get_single_attribute(pvalue);
+			if (npro && strlen(npro) && !strcmp(npro, "true")) readOnly=1;
+			if (npro) gf_free(npro);
+
+			pvalue = wm_xml_get_attr(nmain, "value");
+
+			GF_SAFEALLOC(pref, GF_WidgetPreference);
+			pref->name = npname;
+			if (pvalue) pref->value = wm_get_single_attribute(pvalue);
+			/*global preferences are save and migratable*/
+			pref->flags = GF_WM_PREF_SAVE | GF_WM_PREF_MIGRATE;
+			if (readOnly) pref->flags |= GF_WM_PREF_READONLY;
+			gf_list_add(global_prefs, pref);
+		}
+
+		/* get the content element from the XML Config document */
+		GF_SAFEALLOC(content, GF_WidgetContent);
+		if (!content) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
+		content->interfaces = gf_list_new();
+		content->components = gf_list_new();
+		content->preferences = gf_list_new();
+		nmain = wm_xml_find(root, widget_ns_prefix, "content", NULL);
+		if (!nmain) {
+			/* if not found, use the default table of start files */
+			wm_set_default_start_file(wm, content, szWidgetPath);
+		} else {
+			const char *src, *encoding, *mimetype;
+			src = wm_xml_get_attr(nmain, "src");
+
+			/*check the resource exists*/
+			if (src) {
+				Bool result;
+				char relocated_path[GF_MAX_PATH], localized_path[GF_MAX_PATH];
+				/*remove any existing fragment*/
+				char *sep = strchr(src, '#');
+				if (sep) sep[0] = 0;
+				result = wm_relocate_url(wm, szWidgetPath, src, relocated_path, localized_path);
+				if (sep) sep[0] = '#';
+				if (result) {
+					content->relocated_src = gf_strdup(relocated_path);
+					content->src = gf_strdup(localized_path);
+				}
+			}
+
+			encoding = wm_xml_get_attr(nmain, "encoding");
+			if (encoding && strlen(encoding)) content->encoding = wm_get_single_attribute(encoding);
+			else content->encoding = gf_strdup("utf-8");
+
+			mimetype = wm_xml_get_attr(nmain, "type");
+			if (mimetype && strlen(mimetype)) {
+				char *sep = strchr(mimetype, ';');
+				if (sep) sep[0] = 0;
+				content->mimetype = wm_get_single_attribute(mimetype);
+				if (sep) sep[0] = ';';
+			}
+			else content->mimetype = gf_strdup("text/html");
+
+			if (!content->relocated_src) wm_set_default_start_file(wm, content, szWidgetPath);
+		}
+		if (strlen(content->relocated_src) == 0) {
+			gf_list_del(content->interfaces);
+			gf_list_del(content->components);
+			gf_list_del(content->preferences);
+			gf_free(content);
+			content = NULL;
+			goto exit;
+		}
+		/* We need to call the parse of the MPEG-U elements to clone the global preferences into widget preferences,
+		   this should probably be changed to extract the clone from that function */
+		wm_parse_mpegu_content_element(content, nmain, mpegu_ns_prefix, global_prefs);
+
+		GF_SAFEALLOC(widget, GF_Widget);
+		if (!widget) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
+		widget->url = gf_strdup(path);
+		widget->manifest_path = gf_strdup(szManifestPath);
+		if (isDownloadedPackage) widget->local_path = gf_strdup(szLocalPath);
+		widget->wm = wm;
+		widget->main = content;
+		content->widget = widget;
+		widget->icons = gf_list_new();
+		widget->features = gf_list_new();
+		if (wpackage) {
+			widget->wpack = wpackage;
+			wpackage->widget = widget;
+			/*attach downloader to our package to avoid destroying the cache file*/
+			wpackage->sess = sess;
+			sess = NULL;
+		}
+
+		/*check for icon - can be optional*/
+		i=0;
+		while ((icon = gf_list_enum(root->content, &i))) {
+			if (icon->type==GF_XML_NODE_TYPE &&
+			        icon->name && !strcmp(icon->name, "icon") &&
+			        ((!widget_ns_prefix && !icon->ns) || !strcmp(widget_ns_prefix, icon->ns))) {
+				char *sep;
+				char relocated[GF_MAX_PATH], localized_path[GF_MAX_PATH];
+				char *icon_width, *icon_height;
+				GF_WidgetContent *iconic;
+				Bool result;
+
+				char *pname = (char *)wm_xml_get_attr(icon, "src");
+				if (!pname || !strlen(pname)) continue;
+
+				/*remove any existing fragment*/
+				sep = strchr(pname, '#');
+				if (sep) sep[0] = 0;
+				result = wm_relocate_url(wm, szWidgetPath, pname, relocated, localized_path);
+				if (sep) sep[0] = '#';
+				if (!result) continue;
+
+				iconic = wm_add_icon(widget, relocated, localized_path, sep);
+				if (iconic) {
+					wm_parse_mpegu_content_element(iconic, icon, mpegu_ns_prefix, global_prefs);
+					icon_width = (char *)wm_xml_get_attr(icon, "width");
+					if (icon_width) iconic->width = wm_parse_non_neg(icon_width);
+					icon_height = (char *)wm_xml_get_attr(icon, "height");
+					if (icon_height) iconic->height = wm_parse_non_neg(icon_height);
+				}
+			}
+		}
+		/* after processing the icon elements (wether there are valid icons or not), we use the default icon table
+		  see http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-FAFYMEGELU/004/ */
+		wm_set_default_icon_files(wm, szWidgetPath, widget);
+
+		/*delete the root-level preference*/
+		i=0;
+		while ((pref = gf_list_enum(global_prefs , &i))) {
+			if (pref->value) gf_free(pref->value);
+			gf_free(pref->name);
+			gf_free(pref);
+		}
+		gf_list_del(global_prefs);
+
+		/*check for optional meta data*/
+		name = wm_xml_find(root, widget_ns_prefix, "name", user_locale);
+		if (name) {
+			const char *shortname = wm_xml_get_attr(name, "short");
+			widget->shortname = wm_get_single_attribute(shortname);
+
+			widget->name = wm_get_normalized_text_content(name, NULL, user_locale);
+		}
+
+		desc = wm_xml_get_attr(root, "id");
+		if (desc) {
+			/* TODO check if this is a valid IRI, for the moment, just hack to pass the test, check for ':'
+			  see http://dev.w3.org/2006/waf/widgets/test-suite/test-cases/ta-RawAIWHoMs/ */
+			if (strchr(desc, ':'))
+				widget->identifier = wm_get_single_attribute(desc);
+		}
+
+		desc = wm_xml_get_attr(root, "width");
+		if (desc) {
+			widget->width = wm_parse_non_neg(desc);
+		}
+		desc = wm_xml_get_attr(root, "height");
+		if (desc) {
+			widget->height = wm_parse_non_neg(desc);
+		}
+
+		name = wm_xml_find(root, widget_ns_prefix, "description", user_locale);
+		if (name) {
+			widget->description = wm_get_normalized_text_content(name, NULL, user_locale);
+		}
+
+		name = wm_xml_find(root, widget_ns_prefix, "license", user_locale);
+		if (name) {
+			const char *href = wm_xml_get_attr(name, "href");
+			widget->licenseHref = wm_get_single_attribute(href);
+
+			/* Warning the license text content should not be normalized */
+			widget->license = wm_get_text_content(name, NULL, user_locale);
+		}
+
+		desc = wm_xml_get_attr(root, "version");
+		if (desc) widget->version = wm_get_single_attribute(desc);
+
+		desc = wm_xml_get_attr(root, "uuid");
+		if (desc) widget->uuid = gf_strdup(desc);
+
+		desc = wm_xml_get_attr(root, "discardable");
+		if (desc) widget->discardable = !strcmp(desc, "true") ? 1 : 0;
+
+		desc = wm_xml_get_attr(root, "multipleInstances");
+		if (desc) widget->multipleInstance = !strcmp(desc, "true") ? 1 : 0;
+
+		name = wm_xml_find(root, widget_ns_prefix, "author", NULL);
+		if (name) {
+			desc = wm_xml_get_attr(name, "href");
+			if (desc && strchr(desc, ':')) widget->authorHref = wm_get_single_attribute(desc);
+
+			desc = wm_xml_get_attr(name, "email");
+			widget->authorEmail = wm_get_single_attribute(desc);
+
+			widget->authorName = wm_get_normalized_text_content(name, NULL, user_locale);
+		}
+
+		i=0;
+		while ((xml_node = gf_list_enum(root->content, &i))) {
+			if (xml_node->type==GF_XML_NODE_TYPE &&
+			        xml_node->name && !strcmp(xml_node->name, "feature") &&
+			        ((!widget_ns_prefix && !xml_node->ns) || !strcmp(widget_ns_prefix, xml_node->ns))) {
+
+				u32 i, count;
+				Bool already_in = 0;
+				GF_WidgetFeature *feat;
+				const char *feature_name, *req_att;
+				char *nfname;
+				Bool required = 1;
+				u32 j;
+				GF_XMLNode *param_node;
+
+				feature_name = (char *)wm_xml_get_attr(xml_node, "name");
+				if (!feature_name || !strlen(feature_name) || !strchr(feature_name, ':')) continue;
+				nfname = wm_get_single_attribute(feature_name);
+
+				req_att = (char *)wm_xml_get_attr(xml_node, "required");
+				if (req_att && !strcmp(req_att, "false")) required = 0;
+
+				count = gf_list_count(widget->features);
+				for (i = 0; i<count; i++) {
+					GF_WidgetFeature *tmp = gf_list_get(widget->features, i);
+					if (!strcmp(nfname, tmp->name)) {
+						already_in = 1;
+						break;
+					}
+				}
+				if (already_in) continue;
+
+				GF_SAFEALLOC(feat, GF_WidgetFeature);
+				if (!feat) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
+				feat->name = nfname;
+				feat->required = required;
+				feat->params = gf_list_new();
+				gf_list_add(widget->features, feat);
+
+				j = 0;
+				while ((param_node = gf_list_enum(xml_node->content, &j))) {
+					if (param_node->type==GF_XML_NODE_TYPE &&
+					        param_node->name && !strcmp(param_node->name, "param") &&
+					        ((!widget_ns_prefix && !param_node->ns) || !strcmp(widget_ns_prefix, param_node->ns))) {
+						GF_WidgetFeatureParam *wfp;
+						const char *param_name, *param_value;
+						char *npname, *npvalue;
+
+						param_name = (char *)wm_xml_get_attr(param_node, "name");
+						npname = wm_get_single_attribute(param_name);
+						if (!strlen(npname)) continue;
+
+						param_value = (char *)wm_xml_get_attr(param_node, "value");
+						npvalue = wm_get_single_attribute(param_value);
+						if (!strlen(npvalue)) {
+							gf_free(npname);
+							continue;
+						}
+
+						GF_SAFEALLOC(wfp, GF_WidgetFeatureParam);
+						if (!wfp) {
+							e = GF_OUT_OF_MEM;
+							goto exit;
+						}
+
+						wfp->name = npname;
+						wfp->value = npvalue;
+						gf_list_add(feat->params, wfp);
+
+					}
+				}
+
+			}
+		}
+
+		gf_list_add(wm->widgets, widget);
+	}
+
+	GF_SAFEALLOC(wi, GF_WidgetInstance);
+	if (!wi) {
+		e = GF_OUT_OF_MEM;
+		goto exit;
+	}
+	
+	wi->widget = widget;
+	wi->bound_ifces = gf_list_new();
+	wi->output_triggers = gf_list_new();
+	wi->components = gf_list_new();
+	widget->nb_instances++;
+	wi->instance_id = InstanceID;
+	wi->permanent = 1;
+
+	if (!InstanceID) {
+		char szInst[20];
+
+		count = gf_list_count(wm->widget_instances);
+		for (i=0; i<count; i++) {
+			GF_WidgetInstance *awi = gf_list_get(wm->widget_instances, i);
+			if (awi->widget == wi->widget)
+				wi->instance_id = awi->instance_id;
+		}
+		wi->instance_id ++;
+
+		sprintf(szName, "%s#%s#Instance%d", path, wi->widget->name, wi->instance_id);
+		sprintf((char *)wi->secname, "Widget#%08X", gf_crc_32(szName, (u32) strlen(szName)));
+
+		/*create section*/
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wi->secname, " ");
+		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:Manifest", wi->widget->url);
+		sprintf(szInst, "%d", wi->instance_id);
+		gf_cfg_set_key(wm->term->user->config, (const char *) wi->secname, "WM:InstanceID", szInst);
+	}
+	gf_list_add(wm->widget_instances, wi);
+
+
+	if (!skip_context && strstr(path, "http://")) {
+		GF_XMLNode *context;
+		GF_DownloadSession *ctx_sess = NULL;
+		char *ctxPath;
+		context = NULL;
+
+		/*fetch the remote widget context synchronously and load it */
+		ctxPath = gf_malloc(sizeof(char) * (strlen(path) + 1 + 15/*?mpeg-u-context*/));
+		strcpy(ctxPath, path);
+		if ((strchr(path, '?') == NULL) && (strstr(path, "%3f")==NULL) && (strstr(path, "%3F")==NULL) ) {
+			strcat(ctxPath, "?mpeg-u-context");
+		} else {
+			strcat(ctxPath, "&mpeg-u-context");
+		}
+
+		/*try to fetch the associated context*/
+		ctx_sess = gf_dm_sess_new(wm->term->downloader, (char *)ctxPath, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
+		if (ctx_sess) {
+			e = gf_dm_sess_process(ctx_sess);
+			if (e==GF_OK) {
+				wi->mpegu_context = gf_xml_dom_new();
+				e = gf_xml_dom_parse(wi->mpegu_context , gf_dm_sess_get_cache_name(ctx_sess), NULL, NULL);
+				if (!e) {
+					context = gf_xml_dom_get_root(wi->mpegu_context);
+					if (strcmp(context->name, "contextInformation")) context = NULL;
+				}
+			}
+			gf_dm_sess_del(ctx_sess);
+			e = GF_OK;
+		}
+		gf_free(ctxPath);
+		ctxPath = NULL;
+
+		if (!context && wi->mpegu_context) {
+			gf_xml_dom_del(wi->mpegu_context);
+			wi->mpegu_context = NULL;
+		}
+
+	}
+
+exit:
+	if (dom) gf_xml_dom_del(dom);
+	if (sess) gf_dm_sess_del(sess);
+	if (e || !wi) {
+		if (wi) wm_delete_widget_instance(wm, wi);
+		else {
+			if (wpackage) widget_package_del(wm, wpackage);
+		}
+		return NULL;
+	}
+	return wi;
+}
+
+
+static Bool wm_enum_widget(void *cbk, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
+{
+	GF_WidgetInstance *wid;
+	GF_WidgetManager *wm = (GF_WidgetManager *)cbk;
+	wid = wm_load_widget(wm, file_path, 0, 0);
+	if (wid) {
+		wm_widget_jsbind(wm, wid);
+		/*remove section info*/
+		gf_cfg_del_section(wm->term->user->config, (const char *) wid->secname);
+		gf_cfg_set_key(wm->term->user->config, "Widgets", (const char *) wid->secname, NULL);
+	}
+	return 0;
+}
+
+static Bool wm_enum_dir(void *cbk, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
+{
+	return (gf_enum_directory(file_path, 0, wm_enum_widget, cbk, "mgt")==GF_OK) ? GF_FALSE : GF_TRUE;
+}
+
+
+static JSBool SMJS_FUNCTION(wm_initialize)
+{
+	u32 i, count;
+	const char*opt;
+	SMJS_OBJ
+	//SMJS_ARGS
+	GF_WidgetManager *wm = (GF_WidgetManager *)SMJS_GET_PRIVATE(c, obj);
+
+	count = gf_opts_get_key_count("Widgets");
+	for (i=0; i<count; i++) {
+		const char *name = gf_opts_get_key_name("Widgets", i);
+		/*this is a previously loaded widgets - reload it*/
+		if (!strnicmp(name, "Widget#", 7)) {
+			const char *manifest = gf_opts_get_key(name, "WM:Manifest");
+			if (manifest) {
+				const char *ID = gf_opts_get_key(name, "WM:InstanceID");
+				u32 instID = ID ? atoi(ID) : 0;
+				GF_WidgetInstance *wi = wm_load_widget(wm, manifest, instID, 0);
+				if (wi) {
+					strcpy((char *)wi->secname, (const char *) name);
+					wm_widget_jsbind(wm, wi);
+				}
+			}
+		}
+	}
+
+	opt = gf_opts_get_key("Widgets", "WidgetStore");
+	if (opt) gf_enum_directory(opt, 1, wm_enum_dir, wm, NULL);
+
+	return JS_TRUE;
+}
+
+static void widgetmanager_load(GF_JSUserExtension *jsext, GF_SceneGraph *scene, JSContext *c, JSObject *global, Bool unload)
+{
+	GF_WidgetManager *wm;
+
+	GF_JSAPIParam par;
+	JSPropertySpec wmClassProps[] = {
+		SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+	};
+	JSFunctionSpec wmClassFuncs[] = {
+		SMJS_FUNCTION_SPEC("initialize", wm_initialize, 0),
+		SMJS_FUNCTION_SPEC("load", wm_load, 2),
+		SMJS_FUNCTION_SPEC("unload", wm_unload, 1),
+		SMJS_FUNCTION_SPEC("get", wm_get, 1),
+		SMJS_FUNCTION_SPEC("findByInterface", wm_find_interface, 1),
+		SMJS_FUNCTION_SPEC(0, 0, 0)
+	};
+
+	wm = jsext->udta;
+	/*widget manager is only loaded once*/
+	if (wm->ctx && (wm->ctx != c)) {
+		/*load the 'Widget' object in the global scope*/
+		widget_load(wm, scene, c, global, unload);
+		return;
+	}
+
+	/*unload widgets*/
+	if (unload) {
+		if (wm->obj) {
+			gf_js_remove_root(wm->ctx, &wm->obj, GF_JSGC_OBJECT);
+			wm->obj = NULL;
+		}
+
+		while (gf_list_count(wm->widget_instances)) {
+			GF_WidgetInstance *widg = gf_list_get(wm->widget_instances, 0);
+			wm_delete_widget_instance(wm, widg);
+		}
+		wm->ctx = NULL;
+		return;
+	}
+	wm->ctx = c;
+
+	if (!scene) return;
+
+	/*setup JS bindings*/
+	JS_SETUP_CLASS(wm->widmanClass, "WIDGETMANAGER", JSCLASS_HAS_PRIVATE, wm_getProperty, wm_setProperty, JS_FinalizeStub);
+
+	GF_JS_InitClass(c, global, 0, &wm->widmanClass, 0, 0, wmClassProps, wmClassFuncs, 0, 0);
+	wm->obj = JS_DefineObject(c, global, "WidgetManager", &wm->widmanClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, wm->obj, wm);
+	gf_js_add_root(c, &wm->obj, GF_JSGC_OBJECT);
+
+
+	{
+		JSPropertySpec wmWidgetClassProps[] = {
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+		};
+		JSFunctionSpec wmWidgetClassFuncs[] = {
+			SMJS_FUNCTION_SPEC("activate", wm_widget_activate, 1),
+			SMJS_FUNCTION_SPEC("deactivate", wm_widget_deactivate, 0),
+			SMJS_FUNCTION_SPEC("get_interface", wm_widget_get_interface, 1),
+			SMJS_FUNCTION_SPEC("bind_output_trigger", wm_widget_bind_output_trigger, 2),
+			SMJS_FUNCTION_SPEC("set_input", wm_widget_set_input, 2),
+			SMJS_FUNCTION_SPEC("bind_interface", wm_widget_bind_interface, 2),
+			SMJS_FUNCTION_SPEC("unbind_interface", wm_widget_unbind_interface, 1),
+			SMJS_FUNCTION_SPEC("call_input_action", wm_widget_call_input_action, 1),
+			SMJS_FUNCTION_SPEC("call_input_script", wm_widget_call_input_script, 2),
+			SMJS_FUNCTION_SPEC("is_interface_bound", wm_widget_is_interface_bound, 1),
+			SMJS_FUNCTION_SPEC("get_param_value", wm_widget_get_param_value, 1),
+			SMJS_FUNCTION_SPEC("get_context", wm_widget_get_context, 0),
+			SMJS_FUNCTION_SPEC("get_component", wm_widget_get_component, 2),
+
+			SMJS_FUNCTION_SPEC(0, 0, 0)
+		};
+		/*setup JS bindings*/
+		JS_SETUP_CLASS(wm->wmWidgetClass, "WMWIDGET", JSCLASS_HAS_PRIVATE, wm_widget_getProperty, wm_widget_setProperty, JS_FinalizeStub);
+		GF_JS_InitClass(c, global, 0, &wm->wmWidgetClass, 0, 0, wmWidgetClassProps, wmWidgetClassFuncs, 0, 0);
+
+		JS_SETUP_CLASS(wm->widgetAnyClass, "WIDGETANY", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		GF_JS_InitClass(c, global, 0, &wm->widgetAnyClass, 0, 0, 0, 0, 0, 0);
+	}
+
+	JS_SETUP_CLASS(wm->widgetClass, "MPEGWidget", JSCLASS_HAS_PRIVATE, widget_getProperty, widget_setProperty, JS_FinalizeStub);
+
+	if (scene->script_action) {
+		if (!scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_TERM, scene->RootNode, &par))
+			return;
+		wm->term = par.term;
+	}
+
+}
+
+
+static GF_JSUserExtension *gwm_new()
+{
+	GF_JSUserExtension *dr;
+	GF_WidgetManager *wm;
+	GF_SAFEALLOC(dr, GF_JSUserExtension);
+	if (!dr) return NULL;
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_JS_USER_EXT_INTERFACE, "WidgetManager JavaScript Bindings", "gpac distribution");
+
+	GF_SAFEALLOC(wm, GF_WidgetManager);
+	if (!wm) {
+		gf_free(dr);
+		return NULL;
+	}
+	wm->widget_instances = gf_list_new();
+	wm->widgets = gf_list_new();
+	dr->load = widgetmanager_load;
+	dr->udta = wm;
+	return dr;
+}
+
+
+static void gwm_delete(GF_BaseInterface *ifce)
+{
+	GF_WidgetManager *wm;
+	GF_JSUserExtension *dr = (GF_JSUserExtension *) ifce;
+	if (!dr)
+		return;
+	wm = dr->udta;
+	if (!wm)
+		return;
+	if (wm->widget_instances)
+		gf_list_del(wm->widget_instances);
+	wm->widget_instances = NULL;
+	if (wm->widgets)
+		gf_list_del(wm->widgets);
+	wm->widgets = NULL;
+	gf_free(wm);
+	dr->udta = NULL;
+	gf_free(dr);
+}
+#endif
+
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#ifdef GPAC_HAS_SPIDERMONKEY
+		GF_JS_USER_EXT_INTERFACE,
+#ifndef GPAC_DISABLE_SVG
+		GF_SCENE_DECODER_INTERFACE,
+#endif
+
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+#ifdef GPAC_HAS_SPIDERMONKEY
+	if (InterfaceType == GF_JS_USER_EXT_INTERFACE) return (GF_BaseInterface *)gwm_new();
+#ifndef GPAC_DISABLE_SVG
+	else if (InterfaceType == GF_SCENE_DECODER_INTERFACE) return (GF_BaseInterface *)LoadWidgetReader();
+#endif
+#endif
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#ifdef GPAC_HAS_SPIDERMONKEY
+	case GF_JS_USER_EXT_INTERFACE:
+		gwm_delete(ifce);
+		break;
+#ifndef GPAC_DISABLE_SVG
+	case GF_SCENE_DECODER_INTERFACE:
+		ShutdownWidgetReader(ifce);
+		break;
+#endif
+
+#endif
+	}
+}
+
+
+GPAC_MODULE_STATIC_DECLARATION( widgetman )

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/widgetman/widgetman.h Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/wiiis Added

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/wiiis/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/wiiis/test_wii.bt Changed

gpac-1.0.0.tar.gz/modules/deprecated/old_arch/wiiis/wiiis.c Added

@@ -0,0 +1,264 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2009-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Dummy input module
+ *
+ *  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/modules/codec.h>
+#include <gpac/scenegraph_vrml.h>
+#include <gpac/thread.h>
+
+#include <wiiuse.h>
+
+typedef struct
+{
+	u32 nb_wiimotes;
+	wiimote** wiimotes;
+	Bool running;
+	u32 prev_id;
+
+	GF_Thread *th;
+} GF_WiiMote;
+
+static Bool WII_RegisterDevice(struct __input_device *ifce, const char *urn, GF_BitStream *dsi, void (*AddField)(struct __input_device *_this, u32 fieldType, const char *name))
+{
+	const char *opt;
+	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
+	if (strcmp(urn, "WiiMote")) return 0;
+
+	/*init wiiuse lib*/
+	opt = gf_opts_get_key("WII", "MaxWiimotes");
+	if (opt) wii->nb_wiimotes = atoi(opt);
+	if (!wii->nb_wiimotes) wii->nb_wiimotes = 1;
+
+	wii->wiimotes = wiiuse_init(wii->nb_wiimotes);
+	if (!wii->wiimotes) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[Wii] Cannot initialize wiiuse library\n"));
+		return 0;
+	}
+
+	/*declare the interface*/
+	AddField(ifce, GF_SG_VRML_SFINT32, "uid");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "1");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "2");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "A");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "B");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "-");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "home");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "+");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "left");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "right");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "down");
+	AddField(ifce, GF_SG_VRML_SFBOOL, "up");
+	AddField(ifce, GF_SG_VRML_SFVEC3F, "ypr");
+	AddField(ifce, GF_SG_VRML_SFVEC3F, "gravity");
+
+	return 1;
+}
+
+#define WRITE_BUTTON(_b)	\
+	if (IS_JUST_PRESSED(wm, _b)) {	gf_bs_write_int(bs, 1, 1); gf_bs_write_int(bs, 1, 1); }	\
+	else if (IS_RELEASED(wm, _b)) {	gf_bs_write_int(bs, 1, 1); gf_bs_write_int(bs, 0, 1); }	\
+	else gf_bs_write_int(bs, 0, 1); \
+ 
+
+#define WII_PI	3.1415926535898f
+
+static u32 WII_Run(void *par)
+{
+	GF_BitStream *bs;
+	char *buf;
+	u32 i, buf_size, count, scan_delay;
+	const char *opt;
+
+	GF_InputSensorDevice *ifce = (GF_InputSensorDevice *)par;
+	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
+
+
+	scan_delay = 5;
+	opt = gf_opts_get_key("WII", "ScanDelay");
+	if (opt) scan_delay = atoi(opt);
+
+	/*locate the wiimotes*/
+	count = wiiuse_find(wii->wiimotes, wii->nb_wiimotes, scan_delay);
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Found %d wiimotes\n", count));
+	count = wiiuse_connect(wii->wiimotes, wii->nb_wiimotes);
+	if (count) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Connected to %d connected wiimotes\n", count));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Failed to connect to any wiimote\n"));
+	}
+
+	opt = gf_opts_get_key("WII", "MotionSensing");
+	/*enable motion sensing*/
+	if (!opt || !strcmp(opt, "yes")) {
+		Float smooth_alpha = 0.5;
+		Float ori_threshold = 10.0;
+		opt = gf_opts_get_key("WII", "OrientationThreshold");
+		if (opt) ori_threshold = (Float) atof(opt);
+		opt = gf_opts_get_key("WII", "SmoothAlpha");
+		if (opt) {
+			smooth_alpha = (Float) atof(opt);
+			if (smooth_alpha<0) smooth_alpha = 0.5;
+			else if (smooth_alpha>1.0) smooth_alpha=0.5;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[Wii] Enabling motion sensing - Alpha smoothing %f - Orientation Threshold %f\n", smooth_alpha, ori_threshold));
+
+		for (i=0; i<count; i++) {
+			wiiuse_motion_sensing(wii->wiimotes[i], 1);
+			wiiuse_set_smooth_alpha(wii->wiimotes[i],smooth_alpha);
+			wiiuse_set_orient_threshold(wii->wiimotes[i], ori_threshold);
+		}
+	}
+
+	while (wii->running) {
+		count = wiiuse_poll(wii->wiimotes, wii->nb_wiimotes);
+		if (!count) {
+			continue;
+		}
+		for (i=0; i<count; i++) {
+			struct wiimote_t* wm = wii->wiimotes[i];
+			switch (wm->event) {
+			case WIIUSE_EVENT:/* A generic event occured on the wiimote. */
+				/*create the data frame*/
+				bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				/*if not the same wiimote write the UID*/
+				if (wii->prev_id != wm->unid) {
+					gf_bs_write_int(bs, 1, 1);
+					gf_bs_write_int(bs,  wm->unid, 32);
+					wii->prev_id = wm->unid;
+				} else {
+					gf_bs_write_int(bs, 0, 1);
+				}
+
+				/*write buttons state*/
+				WRITE_BUTTON(WIIMOTE_BUTTON_ONE);
+				WRITE_BUTTON(WIIMOTE_BUTTON_TWO);
+				WRITE_BUTTON(WIIMOTE_BUTTON_A);
+				WRITE_BUTTON(WIIMOTE_BUTTON_B);
+				WRITE_BUTTON(WIIMOTE_BUTTON_MINUS);
+				WRITE_BUTTON(WIIMOTE_BUTTON_HOME);
+				WRITE_BUTTON(WIIMOTE_BUTTON_PLUS);
+				WRITE_BUTTON(WIIMOTE_BUTTON_LEFT);
+				WRITE_BUTTON(WIIMOTE_BUTTON_RIGHT);
+				WRITE_BUTTON(WIIMOTE_BUTTON_DOWN);
+				WRITE_BUTTON(WIIMOTE_BUTTON_UP);
+
+				/*write yaw-pitch-roll - FIXME: wiiuse seems to output NaN in these values upon init*/
+				gf_bs_write_int(bs, 1, 1);
+				gf_bs_write_float(bs, WII_PI * wm->orient.yaw / 24 );
+				gf_bs_write_float(bs, WII_PI * wm->orient.pitch / 180);
+				gf_bs_write_float(bs, WII_PI * wm->orient.roll / 180);
+
+				/*write gravity - FIXME: wiiuse seems to output NaN in these values upon init*/
+				gf_bs_write_int(bs, 1, 1);
+				gf_bs_write_float(bs, wm->gforce.x);
+				gf_bs_write_float(bs, wm->gforce.y);
+				gf_bs_write_float(bs, wm->gforce.z);
+
+				gf_bs_align(bs);
+				gf_bs_get_content(bs, &buf, &buf_size);
+				gf_bs_del(bs);
+
+				ifce->DispatchFrame(ifce, buf, buf_size);
+				gf_free(buf);
+				break;
+			case WIIUSE_STATUS: /*A status report was obtained from the wiimote. */
+				break;
+			case WIIUSE_DISCONNECT:/*The wiimote disconnected. */
+				break;
+			case WIIUSE_READ_DATA:/* Data was returned that was previously requested from the wiimote ROM/registers. */
+				break;
+			case WIIUSE_NUNCHUK_INSERTED:
+			case WIIUSE_NUNCHUK_REMOVED:
+			case  WIIUSE_CLASSIC_CTRL_INSERTED:
+			case WIIUSE_CLASSIC_CTRL_REMOVED:
+			case WIIUSE_GUITAR_HERO_3_CTRL_INSERTED:
+			case WIIUSE_GUITAR_HERO_3_CTRL_REMOVED:
+				break;
+			}
+		}
+	}
+	return 0;
+}
+
+static void WII_Start(struct __input_device *ifce)
+{
+	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
+	wii->running = 1;
+	gf_th_run(wii->th, WII_Run, ifce);
+}
+
+static void WII_Stop(struct __input_device *ifce)
+{
+	GF_WiiMote *wii = (GF_WiiMote *)ifce->udta;
+	wii->running = 0;
+}
+
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_INPUT_DEVICE_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	GF_WiiMote *wii;
+	GF_InputSensorDevice *plug;
+	if (InterfaceType != GF_INPUT_DEVICE_INTERFACE) return NULL;
+
+	GF_SAFEALLOC(plug, GF_InputSensorDevice);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_INPUT_DEVICE_INTERFACE, "GPAC Wiimote InputSensor", "gpac distribution")
+
+	plug->RegisterDevice = WII_RegisterDevice;
+	plug->Start = WII_Start;
+	plug->Stop = WII_Stop;
+
+	GF_SAFEALLOC(wii, GF_WiiMote);
+	plug->udta = wii;
+	wii->th = gf_th_new("WiiMote");
+	return (GF_BaseInterface *)plug;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *bi)
+{
+	GF_WiiMote *wii;
+	GF_InputSensorDevice *ifce = (GF_InputSensorDevice*)bi;
+	if (ifce->InterfaceType!=GF_INPUT_DEVICE_INTERFACE) return;
+
+	wii = ifce->udta;
+	if (wii->wiimotes) {
+		wiiuse_cleanup(wii->wiimotes, wii->nb_wiimotes);
+	}
+	gf_free(wii);
+	gf_free(bi);
+}
+
+GPAC_MODULE_STATIC_DECLARATION( wiiis )

gpac-1.0.0.tar.gz/modules/deprecated/oss_audio Added

gpac-1.0.0.tar.gz/modules/deprecated/oss_audio/Makefile Changed

gpac-1.0.0.tar.gz/modules/deprecated/oss_audio/oss.c Added

@@ -0,0 +1,294 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / linux_oss audio render module
+ *
+ *  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.
+ *
+ */
+
+
+#if defined(__DARWIN__) || defined(__APPLE__)
+#include <soundcard.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <string.h>
+
+#else
+
+#include <sys/ioctl.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#ifdef OSS_FIX_INC
+#include <soundcard.h>
+#else
+#include <sys/soundcard.h>
+#endif
+
+#endif
+
+#include <gpac/modules/audio_out.h>
+
+#define OSS_AUDIO_DEVICE	"/dev/dsp"
+
+typedef struct
+{
+	int audio_dev, sr, nb_ch;
+	u32 buf_size, delay, num_buffers, total_duration;
+	u32 force_sr;
+	char *wav_buf;
+} OSSContext;
+
+
+#define OSSCTX()	OSSContext *ctx = (OSSContext *)dr->opaque;
+
+
+static GF_Err OSS_Setup(GF_AudioOutput*dr, void *os_handle, u32 num_buffers, u32 total_duration)
+{
+	int audio;
+	const char *opt;
+	OSSCTX();
+
+	opt = gf_opts_get_key("core", "force-alsarate");
+	if (opt) ctx->force_sr = atoi(opt);
+
+	/*open OSS in non-blocking mode*/
+	audio = open(OSS_AUDIO_DEVICE, 0);
+	if (audio < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[OSS] Cannot open audio device\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	/*set blocking mode back*/
+	//fcntl(audio, F_SETFL, fcntl(audio, F_GETFL) & ~FNDELAY);
+	ctx->audio_dev=audio;
+	ctx->num_buffers = num_buffers;
+	ctx->total_duration = total_duration;
+	return GF_OK;
+}
+
+static void OSS_Shutdown(GF_AudioOutput*dr)
+{
+	OSSCTX();
+	ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
+	close(ctx->audio_dev);
+	if (ctx->wav_buf) gf_free(ctx->wav_buf);
+	ctx->wav_buf = NULL;
+}
+
+
+static GF_Err OSS_Configure(GF_AudioOutput*dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u32 channel_cfg)
+{
+	int format, blockalign, nb_bufs, frag_spec;
+	long flags;
+	OSSCTX();
+
+	if (!ctx) return GF_BAD_PARAM;
+	/* reset and reopen audio-device */
+	ioctl(ctx->audio_dev,SNDCTL_DSP_RESET,NULL);
+	close(ctx->audio_dev);
+	if (ctx->wav_buf) gf_free(ctx->wav_buf);
+	ctx->wav_buf = NULL;
+	ctx->audio_dev=open(OSS_AUDIO_DEVICE,O_WRONLY|O_NONBLOCK);
+	if (!ctx->audio_dev) return GF_IO_ERR;
+
+	/* Make the file descriptor use blocking writes with fcntl() so that
+	 we don't have to handle sleep() ourselves*/
+	flags = fcntl(ctx->audio_dev, F_GETFL);
+	flags &= ~O_NONBLOCK;
+	if (fcntl(ctx->audio_dev, F_SETFL, flags) < 0 ) return GF_IO_ERR;
+
+	ctx->nb_ch = (int) (*NbChannels);
+	if (ioctl(ctx->audio_dev, SNDCTL_DSP_CHANNELS, &ctx->nb_ch)==-1) return GF_IO_ERR;
+
+	blockalign = ctx->nb_ch;
+
+	//only support for PCM 8/16/24/32 packet mode
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+		format = AFMT_S8;
+		break;
+	default:
+		//otherwise force PCM16
+		*audioFormat = GF_AUDIO_FMT_S16;
+	case GF_AUDIO_FMT_S16:
+		blockalign *= 2;
+		format = AFMT_S16_LE;
+		break;
+	}
+	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SETFMT,&format)==-1) return GF_IO_ERR;
+	ctx->sr = (*SampleRate);
+	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&ctx->sr)==-1) return GF_IO_ERR;
+
+	nb_bufs = ctx->num_buffers ? ctx->num_buffers : 8;
+	ctx->buf_size = (*SampleRate * blockalign * ctx->total_duration) / (1000 * nb_bufs);
+	frag_spec = 4;
+	while (ctx->buf_size > (1<<(frag_spec+1)))
+		frag_spec++;
+
+	ctx->buf_size = 1<<frag_spec;
+
+	ctx->delay = (1000*ctx->buf_size) / (*SampleRate * blockalign);
+	frag_spec = ((nb_bufs<<16) & 0xFFFF0000) | frag_spec;
+
+	ctx->delay = (1000*ctx->buf_size*nb_bufs) / (*SampleRate * blockalign);
+	if ( ioctl(ctx->audio_dev, SNDCTL_DSP_SETFRAGMENT, &frag_spec) < 0 ) return GF_IO_ERR;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] setup %d buffers %d bytes each (%d ms buffer delay)", nb_bufs, ctx->buf_size, ctx->delay));
+	ctx->wav_buf = gf_realloc(ctx->wav_buf, ctx->buf_size*sizeof(char));
+	if(!ctx->wav_buf) return GF_OUT_OF_MEM;
+	memset(ctx->wav_buf, 0, ctx->buf_size*sizeof(char));
+	return GF_OK;
+}
+
+static void OSS_WriteAudio(GF_AudioOutput*dr)
+{
+	u32 written;
+	OSSCTX();
+	written = dr->FillBuffer(dr->audio_renderer, ctx->wav_buf, ctx->buf_size);
+	/*this will also perform sleep*/
+	if (written) {
+		u32 reallyWritten = write(ctx->audio_dev, ctx->wav_buf, written);
+		if (reallyWritten != written) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[OSS] Failed to write all audio to device, has written %u, should have %u", reallyWritten, written));
+		}
+	}
+}
+
+static void OSS_SetVolume(GF_AudioOutput*dr, u32 Volume) {}
+static void OSS_SetPan(GF_AudioOutput*dr, u32 Pan) {}
+static void OSS_SetPriority(GF_AudioOutput*dr, u32 Priority) {}
+static u32 OSS_GetAudioDelay(GF_AudioOutput*dr)
+{
+	OSSCTX()
+	return ctx->delay;
+}
+
+/*
+ * to get the best matching samplerate the oss-device can be set up
+ * with the desired sr. if not supported the returned value contains the
+ * best matching sr.
+ *
+ * todo: supported samplerate could depend on nb_channels and format
+ */
+static GF_Err OSS_QueryOutputSampleRate(GF_AudioOutput*dr, u32 *desired_sr, u32 *NbChannels, u32 *nbBitsPerSample)
+{
+#ifdef FORCE_SR_LIMIT
+	*NbChannels = 2;
+	if (!( *desired_sr % 11025)) return GF_OK;
+	if (*desired_sr<22050) *desired_sr = 22050;
+	else *desired_sr = 44100;
+	return GF_OK;
+#else
+	/* reset and reopen audio-device */
+	int i;
+	OSSCTX();
+	if (ctx->force_sr) {
+		*desired_sr = ctx->force_sr;
+		return GF_OK;
+	}
+	i=*desired_sr;
+	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&i)==-1) return GF_IO_ERR;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] uses samplerate %d for desired sr %d\n", i, *desired_sr));
+	*desired_sr = i;
+	i = *NbChannels;
+	if(ioctl(ctx->audio_dev,SNDCTL_DSP_CHANNELS, &i)==-1) return GF_IO_ERR;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[OSS] uses %d channels for %d desired ones\n", i, *NbChannels));
+	*NbChannels = i;
+	if(ioctl(ctx->audio_dev, SNDCTL_DSP_SPEED,&ctx->sr)==-1) return GF_OK;
+	if(ioctl(ctx->audio_dev,SNDCTL_DSP_CHANNELS, &ctx->nb_ch)==-1) return GF_OK;
+	return GF_OK;
+#endif
+}
+
+void *NewOSSRender()
+{
+	OSSContext *ctx;
+	GF_AudioOutput*driv;
+	ctx = gf_malloc(sizeof(OSSContext));
+	if(!ctx)
+		return NULL;
+	memset(ctx, 0, sizeof(OSSContext));
+	driv = gf_malloc(sizeof(GF_AudioOutput));
+	if(!driv)
+	{
+		gf_free(ctx);
+		ctx=NULL;
+		return NULL;
+	}
+	memset(driv, 0, sizeof(GF_AudioOutput));
+	driv->opaque = ctx;
+	driv->SelfThreaded = 0;
+	driv->Setup = OSS_Setup;
+	driv->Shutdown = OSS_Shutdown;
+	driv->Configure = OSS_Configure;
+	driv->GetAudioDelay = OSS_GetAudioDelay;
+	driv->SetVolume = OSS_SetVolume;
+	driv->SetPan = OSS_SetPan;
+	driv->SetPriority = OSS_SetPriority;
+	driv->QueryOutputSampleRate = OSS_QueryOutputSampleRate;
+	driv->WriteAudio = OSS_WriteAudio;
+
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "OSS Audio Output", "gpac distribution");
+	return driv;
+}
+
+void DeleteOSSRender(void *ifce)
+{
+	GF_AudioOutput*dr = (GF_AudioOutput*) ifce;
+	OSSContext *ctx = (OSSContext *)dr->opaque;
+	gf_free(ctx);
+	gf_free(dr);
+}
+
+
+/*
+ * ********************************************************************
+ * interface
+ */
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_AUDIO_OUTPUT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE)
+		return NewOSSRender();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	if (ifce->InterfaceType==GF_AUDIO_OUTPUT_INTERFACE)
+		DeleteOSSRender((GF_AudioOutput*)ifce);
+}
+
+GPAC_MODULE_STATIC_DECLARATION( oss )

gpac-0.8.0.tar.gz/modules/directfb_out/Makefile -> gpac-1.0.0.tar.gz/modules/directfb_out/Makefile Changed

gpac-0.8.0.tar.gz/modules/directfb_out/directfb_out.c -> gpac-1.0.0.tar.gz/modules/directfb_out/directfb_out.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Romain Bouqueau - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *			Copyright (c) Telecom ParisTech 2010-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / DirectFB video output module
@@ -33,51 +33,6 @@
 #define DirectFBVID() DirectFBVidCtx *ctx = (DirectFBVidCtx *)driv->opaque
 
 /**
- *	function DirectFBVid_DrawHLine
- *	- using hardware accelerator to a draw horizontal line
- **/
-static void DirectFBVid_DrawHLine(GF_VideoOutput *driv, u32 x, u32 y, u32 length, GF_Color color)
-{
-	u8 r = GF_COL_R(color);
-	u8 g = GF_COL_G(color);
-	u8 b = GF_COL_B(color);
-	DirectFBVID();
-
-	DirectFBVid_DrawHLineWrapper(ctx, x, y, length, r, g, b);
-}
-
-
-/**
- *	function DirectFBVid_DrawHLineAlpha
- *	- using hardware accelerator to draw a horizontal line with alpha
- **/
-static void DirectFBVid_DrawHLineAlpha(GF_VideoOutput *driv, u32 x, u32 y, u32 length, GF_Color color, u8 alpha)
-{
-	u8 r = GF_COL_R(color);
-	u8 g = GF_COL_G(color);
-	u8 b = GF_COL_B(color);
-	DirectFBVID();
-
-	DirectFBVid_DrawHLineAlphaWrapper(ctx, x, y, length, r, g, b, alpha);
-}
-
-
-/**
- *	function DirectFBVid_DrawRectangle
- *	- using hardware accelerator to fill a rectangle
- **/
-static void DirectFBVid_DrawRectangle(GF_VideoOutput *driv, u32 x, u32 y, u32 width, u32 height, GF_Color color)
-{
-	u8 r = GF_COL_R(color);
-	u8 g = GF_COL_G(color);
-	u8 b = GF_COL_B(color);
-	u8 a = GF_COL_A(color);
-	DirectFBVID();
-
-	DirectFBVid_DrawRectangleWrapper(ctx, x, y, width, height, r, g, b, a);
-}
-
-/**
  *	function DirectFBVid_Setup
  * 	- DirectFB setup
  **/
@@ -93,41 +48,41 @@
 	// check window mode used - SDL or X11
 	{
 		WINDOW_MODE window_mode = 0;
-		opt = gf_modules_get_option((GF_BaseInterface *)driv, "DirectFB", "WindowMode");
-		if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "DirectFB", "WindowMode", "X11");
+		opt = gf_opts_get_key("DirectFB", "WindowMode");
+		if (!opt) gf_opts_set_key("DirectFB", "WindowMode", "X11");
 		if (!opt || !strcmp(opt, "X11")) window_mode = WINDOW_X11;
-		else if (opt && !strcmp(opt, "SDL")) window_mode = WINDOW_SDL;
+		else if (!strcmp(opt, "SDL")) window_mode = WINDOW_SDL;
 		DirectFBVid_InitAndCreateSurface(ctx, window_mode);
 	}
 
 	// check hardware accelerator configuration
 	DirectFBVid_CtxSetDisableAcceleration(ctx, 0);
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "DirectFB", "DisableAcceleration");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "DirectFB", "DisableAcceleration", "no");
+	opt = gf_opts_get_key("DirectFB", "DisableAcceleration");
+	if (!opt) gf_opts_set_key("DirectFB", "DisableAcceleration", "no");
 	if (opt && !strcmp(opt, "yes")) DirectFBVid_CtxSetDisableAcceleration(ctx, 1);
 
 	// check for display configuration
 	DirectFBVid_CtxSetDisableDisplay(ctx, 0);
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "DirectFB", "DisableDisplay");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "DirectFB", "DisableDisplay", "no");
+	opt = gf_opts_get_key("DirectFB", "DisableDisplay");
+	if (!opt) gf_opts_set_key("DirectFB", "DisableDisplay", "no");
 	if (opt && !strcmp(opt, "yes")) DirectFBVid_CtxSetDisableDisplay(ctx, 1);
 
 	// set flip mode
 	{
 		FLIP_MODE flip_mode = 0;
-		opt = gf_modules_get_option((GF_BaseInterface *)driv, "DirectFB", "FlipSyncMode");
-		if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "DirectFB", "FlipSyncMode", "waitsync");
+		opt = gf_opts_get_key("DirectFB", "FlipSyncMode");
+		if (!opt) gf_opts_set_key("DirectFB", "FlipSyncMode", "waitsync");
 		if (!opt || !strcmp(opt, "waitsync")) flip_mode |= FLIP_WAITFORSYNC;
-		else if (opt && !strcmp(opt, "wait")) flip_mode |= FLIP_WAIT;
-		else if (opt && !strcmp(opt, "sync")) flip_mode |= FLIP_ONSYNC;
-		else if (opt && !strcmp(opt, "swap")) flip_mode |= FLIP_SWAP;
+		else if (!strcmp(opt, "wait")) flip_mode |= FLIP_WAIT;
+		else if (!strcmp(opt, "sync")) flip_mode |= FLIP_ONSYNC;
+		else if (!strcmp(opt, "swap")) flip_mode |= FLIP_SWAP;
 
 		DirectFBVid_CtxSetFlipMode(ctx, flip_mode);
 	}
 
 	// enable/disable blit
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "DirectFB", "DisableBlit");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "DirectFB", "DisableBlit", "no");
+	opt = gf_opts_get_key("DirectFB", "DisableBlit");
+	if (!opt) gf_opts_set_key("DirectFB", "DisableBlit", "no");
 	if (opt && !strcmp(opt, "all")) {
 		driv->hw_caps &= ~(GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_YUV);
 	}
@@ -135,18 +90,6 @@
 	else if (opt && !strcmp(opt, "rgb")) driv->hw_caps &= ~GF_VIDEO_HW_HAS_RGB;
 	else if (opt && !strcmp(opt, "rgba")) driv->hw_caps &= ~GF_VIDEO_HW_HAS_RGBA;
 
-	if (!DirectFBVid_CtxGetDisableAcceleration(ctx)) {
-		// check for functions that are hardware accelerated
-		DirectFBVid_CtxPrimaryProcessGetAccelerationMask(ctx);
-
-		driv->hw_caps |= GF_VIDEO_HW_HAS_LINE_BLIT;
-		driv->DrawHLine = DirectFBVid_DrawHLine;
-		driv->DrawHLineAlpha = DirectFBVid_DrawHLineAlpha;
-		driv->DrawRectangle = DirectFBVid_DrawRectangle;
-
-		//GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DirectFB] hardware acceleration mask %08x - Line: %d Rectangle: %d\n", mask, ctx->accel_drawline, ctx->accel_fillrect));
-	}
-
 	// end of initialization
 	DirectFBVid_CtxSetIsInit(ctx, 1);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DirectFB] Initialization success - HW caps %08x\n", driv->hw_caps));
@@ -244,7 +187,7 @@
 		return GF_OK;
 
 	case GF_EVENT_VIDEO_SETUP:
-		if (evt->setup.opengl_mode) return GF_NOT_SUPPORTED;
+		if (evt->setup.use_opengl) return GF_NOT_SUPPORTED;
 
 		if ((DirectFBVid_CtxGetWidth(ctx) !=evt->setup.width) || (DirectFBVid_CtxGetHeight(ctx) != evt->setup.height)) {
 			GF_Event gpac_evt;

gpac-0.8.0.tar.gz/modules/directfb_out/directfb_wrapper.c -> gpac-1.0.0.tar.gz/modules/directfb_out/directfb_wrapper.c Changed

gpac-0.8.0.tar.gz/modules/droid_audio/droidaudio.c -> gpac-1.0.0.tar.gz/modules/droid_audio/droidaudio.c Changed

@@ -109,8 +109,6 @@
 {
 	DroidContext *ctx = (DroidContext *)dr->opaque;
 	JNIEnv* env = GetEnv();
-	int channels;
-	int bytes;
 	LOGV("[Android Audio] Setup for %d buffers", num_buffers);
 
 	ctx->force_config = (num_buffers && total_duration) ? 1 : 0;
@@ -176,7 +174,7 @@
 
 /*we assume what was asked is what we got*/
 /* Called by the audio thread */
-static GF_Err WAV_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+static GF_Err WAV_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u64 channel_cfg)
 {
 	JNIEnv* env = NULL;
 	u32 i;
@@ -260,21 +258,21 @@
 #ifdef DROID_EXTREME_LOGS
 	LOGV("[Android Audio] WAV_WriteAudio() : entering",ctx->sampleRateInHz);
 #endif /* DROID_EXTREME_LOGS */
-	
+
 	if ( ctx->audioFormat == ENCODING_PCM_8BIT )
 		pBuffer = (*env)->GetByteArrayElements(env, ctx->buff, NULL);
 	else
 		pBuffer = (*env)->GetShortArrayElements(env, ctx->buff, NULL);
-	
+
 	if (pBuffer)
 	{
 		written = dr->FillBuffer(dr->audio_renderer, pBuffer, ctx->mbufferSizeInBytes);
-		
+
 		if ( ctx->audioFormat == ENCODING_PCM_8BIT )
 			(*env)->ReleaseByteArrayElements(env, ctx->buff, pBuffer, 0);
 		else
 			(*env)->ReleaseShortArrayElements(env, ctx->buff, pBuffer, 0);
-		
+
 		if (written)
 		{
 			if ( ctx->audioFormat == ENCODING_PCM_8BIT )
@@ -358,9 +356,11 @@
 /* Called by the audio thread */
 static GF_Err WAV_QueryOutputSampleRate(GF_AudioOutput *dr, u32 *desired_samplerate, u32 *NbChannels, u32 *nbBitsPerSample)
 {
+#ifdef TEST_QUERY_SAMPLE
 	DroidContext *ctx = (DroidContext *)dr->opaque;
 	JNIEnv* env = ctx->env;
 	u32 sampleRateInHz, channelConfig, audioFormat;
+#endif
 
 	LOGV("Query sample=%d", *desired_samplerate );
 
@@ -460,7 +460,7 @@
 	driv->SelfThreaded = 0;
 	driv->Setup = WAV_Setup;
 	driv->Shutdown = WAV_Shutdown;
-	driv->ConfigureOutput = WAV_ConfigureOutput;
+	driv->Configure = WAV_ConfigureOutput;
 	driv->GetAudioDelay = WAV_GetAudioDelay;
 	driv->GetTotalBufferTime = WAV_GetTotalBufferTime;
 	driv->SetVolume = WAV_SetVolume;

gpac-0.8.0.tar.gz/modules/droid_cam/droid_cam.c -> gpac-1.0.0.tar.gz/modules/droid_cam/droid_cam.c Changed

@@ -371,20 +371,19 @@
 static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
 	u32 trackID;
-	GF_ESD *esd;
 	ISOMReader *read;
-	GF_ObjectDescriptor *od;
-	GF_BitStream *bs;
 	char *buf;
 	u32 buf_size;
 	if (!plug || !plug->priv) return NULL;
 	read = (ISOMReader *) plug->priv;
 
-	trackID = 0;
 	trackID = read->base_track_id;
 	read->base_track_id = 0;
 
 	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
+		GF_BitStream *bs;
+		GF_ESD *esd;
+		GF_ObjectDescriptor *od;
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 		od->objectDescriptorID = 1;
 
@@ -461,18 +460,23 @@
 
 void Java_com_gpac_Osmo4_Preview_processFrameBuf( JNIEnv* env, jobject thiz, jbyteArray arr)
 {
-	u8* data;
-	u32 datasize;
 	ISOMReader* ctx = globReader;
-	GF_SLHeader hdr;
-	u32 cts = 0;
-	u32 convTime = 0;
-	u32 j = 0;
-	jbyte *jdata;
-	jsize len;
-
-	if ( ctx && ctx->started && ctx->term && ctx->term->compositor && ctx->term->compositor->audio_renderer)
-	{
+	if ( ctx
+	 	&& ctx->started
+	 	&& ctx->term
+	 	&& ctx->term->compositor
+	 	&& ctx->term->compositor->audio_renderer
+	) {
+
+		u8* data;
+		u32 datasize;
+		GF_SLHeader hdr;
+		u32 cts = 0;
+		//u32 convTime = 0;
+		//u32 j = 0;
+		jbyte *jdata;
+		jsize len;
+
 		len = (*env)->GetArrayLength(env, arr);
 		if ( len <= 0 ) return;
 		jdata = (*env)->GetByteArrayElements(env,arr,0);
@@ -529,7 +533,7 @@
 
 void camStartCamera(ISOMReader *read)
 {
-	JNIEnv* env = NULL;
+	JNIEnv* env;
 	jboolean isPortrait = JNI_FALSE;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] startCamera: %d\n", gf_th_id()));
@@ -565,7 +569,7 @@
 
 u32 getWidth(ISOMReader *read)
 {
-	JNIEnv* env = NULL;
+	JNIEnv* env;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getWidth: %d\n", gf_th_id()));
 
@@ -577,7 +581,7 @@
 
 u32 getHeight(ISOMReader *read)
 {
-	JNIEnv* env = NULL;
+	JNIEnv* env;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getHeight: %d\n", gf_th_id()));
 
@@ -589,7 +593,7 @@
 
 u32 getFormat(ISOMReader *read)
 {
-	JNIEnv* env = NULL;
+	JNIEnv* env;
 	u32 pixel_format;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getFormat: %d\n", gf_th_id()));
@@ -610,7 +614,7 @@
 
 u32 getBitsPerPix(ISOMReader *read)
 {
-	JNIEnv* env = NULL;
+	JNIEnv* env;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[ANDROID_CAMERA] getBitsPerPix: %d\n", gf_th_id()));
 
@@ -623,9 +627,6 @@
 GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	ISOMReader *read;
-	GF_BitStream *bs;
-	char *buf;
-	u32 buf_size;
 	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;

gpac-0.8.0.tar.gz/modules/droid_mpegv/droid_mpegv.c -> gpac-1.0.0.tar.gz/modules/droid_mpegv/droid_mpegv.c Changed

gpac-0.8.0.tar.gz/modules/droid_out/droid_vout-bitmap.c -> gpac-1.0.0.tar.gz/modules/droid_out/droid_vout-bitmap.c Changed

gpac-0.8.0.tar.gz/modules/droid_out/droid_vout.c -> gpac-1.0.0.tar.gz/modules/droid_out/droid_vout.c Changed

@@ -248,7 +248,7 @@
 
 static void load_matrix_shaders(GLuint program, Fixed *mat, const char *name)
 {
-	GLint loc=-1;
+	GLint loc;
 #ifdef GPAC_FIXED_POINT
 	Float _mat[16];
 	u32 i;
@@ -351,13 +351,13 @@
 void gluPerspective(GLfloat fovy, GLfloat aspect,
                     GLfloat zNear, GLfloat zFar)
 {
+#ifndef GPAC_USE_GLES2
 	GLfloat xmin, xmax, ymin, ymax;
 
 	ymax = zNear * (GLfloat)tan(fovy * PI / 360);
 	ymin = -ymax;
 	xmin = ymin * aspect;
 	xmax = ymax * aspect;
-#ifndef GPAC_USE_GLES2
 	glFrustumx((GLfixed)(xmin * 65536), (GLfixed)(xmax * 65536),
 	           (GLfixed)(ymin * 65536), (GLfixed)(ymax * 65536),
 	           (GLfixed)(zNear * 65536), (GLfixed)(zFar * 65536));
@@ -367,16 +367,10 @@
 void resizeWindow(AndroidContext *rc)
 {
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("resizeWindow : start"));
-	/* Height / width ration */
-	GLfloat ratio;
 
 	/* Protect against a divide by zero */
 	if (rc->height==0)
-	{
-		rc->height=1;
-	}
-
-	ratio=(GLfloat)rc->width/(GLfloat)rc->height;
+		rc->height = 1;
 
 	/* Setup our viewport. */
 	glViewport(0, 0, (GLsizei)rc->width, (GLsizei)rc->height);
@@ -411,20 +405,21 @@
 #endif /* DROID_EXTREME_LOGS */
 #ifdef GPAC_USE_GLES2
 	GLint loc_vertex_array, loc_texcoord_array;
-	loc_vertex_array = loc_texcoord_array = -1;
 #endif
 
 	GLfloat vertices[4][3];
 	GLfloat texcoord[4][2];
 //	int i, j;
 
+#ifndef GPAC_USE_GLES2
 	float rgba[4];
+#endif
 	gl_check_error();
 
 	// Reset states
+#ifndef GPAC_USE_GLES2
 	rgba[0] = rgba[1] = rgba[2] = 0.f;
 	rgba[0] = 1.f;
-#ifndef GPAC_USE_GLES2
 	glColor4f(1.f, 1.f, 1.f, 1.f);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, rgba);
 	glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, rgba);
@@ -462,9 +457,9 @@
 	gl_check_error();
 	if ( rc->draw_texture )
 	{
+#ifndef GPAC_USE_GLES2
 		gl_check_error();
 		int cropRect[4] = {0,rc->height,rc->width,-rc->height};
-#ifndef GPAC_USE_GLES2
 		glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, cropRect);
 		glDrawTexsOES(0, 0, 0, rc->width, rc->height);
 #endif
@@ -653,8 +648,6 @@
 GF_Err droid_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
 {
 	RAWCTX;
-	void * pixels;
-	Bool res = GF_FALSE;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android Setup: %d", init_flags));
 
@@ -662,6 +655,7 @@
 #ifdef GPAC_USE_GLES2
 
 	if ( rc->out_3d_type == 0 ) {
+		Bool res = GF_FALSE;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("We are in OpenGL: disable mode"));
 		res = initGLES2(rc);
 		if(res==GF_FALSE) {
@@ -714,9 +708,6 @@
 static GF_Err droid_LockBackBuffer(GF_VideoOutput *dr, GF_VideoSurface *vi, Bool do_lock)
 {
 	RAWCTX;
-	int ret;
-	void * pixels;
-	int i,j,t;
 #ifdef DROID_EXTREME_LOGS
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android LockBackBuffer: %d", do_lock));
 #endif /* DROID_EXTREME_LOGS */
@@ -757,73 +748,66 @@
 {
 	RAWCTX;
 
-	if (evt) {
-		switch (evt->type) {
-		case GF_EVENT_SIZE:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SIZE( %d x %d)", evt->setup.width, evt->setup.height));
-			//if (evt->setup.opengl_mode) return GF_OK;
-			//in fullscreen mode: do not change viewport; just update perspective
-			if (rc->fullscreen) {
+	if (!evt) return GF_OK;
+
+	switch (evt->type) {
+	case GF_EVENT_SIZE:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SIZE( %d x %d)", evt->setup.width, evt->setup.height));
+		//in fullscreen mode: do not change viewport; just update perspective
+		if (rc->fullscreen) {
 #ifdef GPAC_USE_GLES2
-				gl_check_error();
-				glUseProgram(rc->base_program);
-				calculate_ortho(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1), rc);
-				load_matrix_shaders(rc->base_program, (Fixed *) rc->ortho.m, "gfProjectionMatrix");
-				load_matrix_shaders(rc->base_program, (Fixed *) rc->identity.m, "gfModelViewMatrix");
-				gl_check_error();
+			gl_check_error();
+			glUseProgram(rc->base_program);
+			calculate_ortho(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1), rc);
+			load_matrix_shaders(rc->base_program, (Fixed *) rc->ortho.m, "gfProjectionMatrix");
+			load_matrix_shaders(rc->base_program, (Fixed *) rc->identity.m, "gfModelViewMatrix");
+			gl_check_error();
 #else
-				/* change to the projection matrix and set our viewing volume. */
-				glMatrixMode(GL_PROJECTION);
-				glLoadIdentity();
+			/* change to the projection matrix and set our viewing volume. */
+			glMatrixMode(GL_PROJECTION);
+			glLoadIdentity();
 
-				/* Set our perspective */
-				glOrthox(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1));
+			/* Set our perspective */
+			glOrthox(0, INT2FIX(rc->width), 0, INT2FIX(rc->height), INT2FIX(-1), INT2FIX(1));
 
-				/* Make sure we're chaning the model view and not the projection */
-				glMatrixMode(GL_MODELVIEW);
+			/* Make sure we're chaning the model view and not the projection */
+			glMatrixMode(GL_MODELVIEW);
 
-				/* Reset The View */
-				glLoadIdentity();
+			/* Reset The View */
+			glLoadIdentity();
 #endif
-				return GF_OK;
-			} else
-				return droid_Resize(dr, evt->setup.width, evt->setup.height);
-
-		case GF_EVENT_VIDEO_SETUP:
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android OpenGL mode: %d", evt->setup.opengl_mode));
-			switch (evt->setup.opengl_mode)
-			{
-			case 0:
-				rc->out_3d_type = 0;
+			return GF_OK;
+		} else
+			return droid_Resize(dr, evt->setup.width, evt->setup.height);
+
+	case GF_EVENT_VIDEO_SETUP:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Android OpenGL mode: %d", evt->setup.use_opengl));
+		if (!evt->setup.use_opengl) {
+			rc->out_3d_type = 0;
 //					initGL(rc);
-				droid_Resize(dr, evt->setup.width, evt->setup.height);
-				return GF_OK;
-			case 1:
-				rc->out_3d_type = 1;
-				droid_Resize(dr, evt->setup.width, evt->setup.height);
-				return GF_OK;
-			case 2:
-				rc->out_3d_type = 2;
-				droid_Resize(dr, evt->setup.width, evt->setup.height);
-				return GF_OK;
-			case GF_EVENT_SET_CURSOR:
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CURSOR"));
-				return GF_OK;
-			case GF_EVENT_SET_CAPTION:
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CAPTION"));
-				return GF_OK;
-			case GF_EVENT_SHOWHIDE:
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SHOWHIDE"));
-				return GF_OK;
-			default:
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Process Unknown Event: %d", evt->type));
-				return GF_OK;
-			}
-			break;
-		case GF_EVENT_TEXT_EDITING_START:
-		case GF_EVENT_TEXT_EDITING_END:
-			return GF_NOT_SUPPORTED;
+			droid_Resize(dr, evt->setup.width, evt->setup.height);
+		} else {
+			rc->out_3d_type = 1;
+			droid_Resize(dr, evt->setup.width, evt->setup.height);
 		}
+		return GF_OK;
+
+	case GF_EVENT_SET_CURSOR:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CURSOR"));
+		return GF_OK;
+	case GF_EVENT_SET_CAPTION:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SET_CAPTION"));
+		return GF_OK;
+	case GF_EVENT_SHOWHIDE:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("GF_EVENT_SHOWHIDE"));
+		return GF_OK;
+	default:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("Process Unknown Event: %d", evt->type));
+		return GF_OK;
+
+	case GF_EVENT_TEXT_EDITING_START:
+	case GF_EVENT_TEXT_EDITING_END:
+		return GF_NOT_SUPPORTED;
 	}
 	return GF_OK;
 }

gpac-0.8.0.tar.gz/modules/dx_hw/Makefile -> gpac-1.0.0.tar.gz/modules/dx_hw/Makefile Changed

gpac-0.8.0.tar.gz/modules/dx_hw/dx_2d.c -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_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-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / DirectX audio and video render module
@@ -29,28 +29,42 @@
 #define DDCONTEXT	DDContext *dd = (DDContext *)dr->opaque;
 #define DDBACK		DDSurface *pBack = (DDSurface *) gf_list_get(dd->surfaces, 0);
 
+enum
+{
+	GF_PIXEL_IYUV = GF_4CC('I', 'Y', 'U', 'V'),
+	GF_PIXEL_I420 = GF_4CC('I', '4', '2', '0'),
+	/*!YUV packed format*/
+	GF_PIXEL_UYNV = GF_4CC('U', 'Y', 'N', 'V'),
+	/*!YUV packed format*/
+	GF_PIXEL_YUNV = GF_4CC('Y', 'U', 'N', 'V'),
+	/*!YUV packed format*/
+	GF_PIXEL_V422 = GF_4CC('V', '4', '2', '2'),
+
+	GF_PIXEL_YV12 = GF_4CC('Y', 'V', '1', '2'),
+	GF_PIXEL_Y422 = GF_4CC('Y', '4', '2', '2'),
+	GF_PIXEL_YUY2 = GF_4CC('Y', 'U', 'Y', '2'),
+};
 
 
 
 static Bool pixelformat_yuv(u32 pixel_format)
 {
 	switch (pixel_format) {
-	case GF_PIXEL_YUY2:
+	case GF_PIXEL_YUYV:
 	case GF_PIXEL_YVYU:
 	case GF_PIXEL_UYVY:
 	case GF_PIXEL_VYUY:
-	case GF_PIXEL_Y422:
 	case GF_PIXEL_UYNV:
 	case GF_PIXEL_YUNV:
 	case GF_PIXEL_V422:
-	case GF_PIXEL_YV12:
+	case GF_PIXEL_YUV:
 	case GF_PIXEL_IYUV:
 	case GF_PIXEL_I420:
-	case GF_PIXEL_YV12_10:
+	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_YUV444:
 	case GF_PIXEL_YUV444_10:
-	case GF_PIXEL_YUV422_10:
 	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
 		return GF_TRUE;
 	default:
 		return GF_FALSE;
@@ -61,7 +75,7 @@
 static u32 get_win_4CC(u32 pixel_format)
 {
 	switch (pixel_format) {
-	case GF_PIXEL_YUY2:
+	case GF_PIXEL_YUYV:
 		return mmioFOURCC('Y', 'U', 'Y', '2');
 	case GF_PIXEL_YVYU:
 		return mmioFOURCC('Y', 'V', 'Y', 'U');
@@ -69,7 +83,7 @@
 		return mmioFOURCC('U', 'Y', 'V', 'Y');
 	case GF_PIXEL_VYUY:
 		return mmioFOURCC('V', 'Y', 'U', 'Y');
-	case GF_PIXEL_Y422:
+	case GF_PIXEL_YUV422:
 		return mmioFOURCC('Y', '4', '2', '2');
 	case GF_PIXEL_UYNV:
 		return mmioFOURCC('U', 'Y', 'N', 'V');
@@ -77,13 +91,13 @@
 		return mmioFOURCC('Y', 'U', 'N', 'V');
 	case GF_PIXEL_V422:
 		return mmioFOURCC('V', '4', '2', '2');
-	case GF_PIXEL_YV12:
+	case GF_PIXEL_YUV:
 		return mmioFOURCC('Y', 'V', '1', '2');
 	case GF_PIXEL_IYUV:
 		return mmioFOURCC('I', 'Y', 'U', 'V');
 	case GF_PIXEL_I420:
 		return mmioFOURCC('I', '4', '2', '0');
-	case GF_PIXEL_YV12_10:
+	case GF_PIXEL_YUV_10:
 		return mmioFOURCC('P', '0', '1', '0');
 	case GF_PIXEL_YUV444:
 		return mmioFOURCC('Y', '4', '4', '4');
@@ -91,13 +105,16 @@
 		return mmioFOURCC('Y', '4', '1', '0');
 	case GF_PIXEL_YUV422_10:
 		return mmioFOURCC('Y', '2', '1', '0');
-	case GF_PIXEL_YUV422:
-		return mmioFOURCC('Y', '4', '4', '2');
 	default:
 		return 0;
 	}
 }
 
+/*!\hideinitializer transfoms a 32-bits color into a 16-bits one.\note alpha component is lost*/
+#define GF_COL_TO_565(c) (((GF_COL_R(c) & 248)<<8) + ((GF_COL_G(c) & 252)<<3)  + (GF_COL_B(c)>>3))
+/*!\hideinitializer transfoms a 32-bits color into a 15-bits one.\note alpha component is lost*/
+#define GF_COL_TO_555(c) (((GF_COL_R(c) & 248)<<7) + ((GF_COL_G(c) & 248)<<2)  + (GF_COL_B(c)>>3))
+
 static GF_Err DD_ClearBackBuffer(GF_VideoOutput *dr, u32 color)
 {
 	HRESULT hr;
@@ -137,13 +154,13 @@
 
 	DDCONTEXT;
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
+	opt = gf_opts_get_key("core", "hwvmem");
 	if (opt) {
 		if (use_system_memory) {
-			if (!strcmp(opt, "Always")) use_system_memory = GF_FALSE;
+			if (!strcmp(opt, "always")) use_system_memory = GF_FALSE;
 		} else {
-			if (!strcmp(opt, "Never")) use_system_memory = GF_TRUE;
-			else if (!strcmp(opt, "Auto")) dd->force_video_mem_for_yuv = GF_TRUE;
+			if (!strcmp(opt, "never")) use_system_memory = GF_TRUE;
+			else if (!strcmp(opt, "auto")) dd->force_video_mem_for_yuv = GF_TRUE;
 		}
 	}
 
@@ -279,16 +296,16 @@
 		break;
 	case 24:
 		if ((pixelFmt.dwRBitMask == 0x0000FF) && (pixelFmt.dwGBitMask == 0x00FF00) && (pixelFmt.dwBBitMask == 0xFF0000))
-			dd->pixelFormat = GF_PIXEL_BGR_24;
+			dd->pixelFormat = GF_PIXEL_BGR;
 		else if ((pixelFmt.dwRBitMask == 0xFF0000) && (pixelFmt.dwGBitMask == 0x00FF00) && (pixelFmt.dwBBitMask == 0x0000FF))
-			dd->pixelFormat = GF_PIXEL_RGB_24;
+			dd->pixelFormat = GF_PIXEL_RGB;
 		dd->video_bpp = 24;
 		break;
 	case 32:
 		if ((pixelFmt.dwRBitMask == 0x0000FF) && (pixelFmt.dwGBitMask == 0x00FF00) && (pixelFmt.dwBBitMask == 0xFF0000)) {
-			dd->pixelFormat = dd->force_alpha ? GF_PIXEL_RGBA : GF_PIXEL_BGR_32;
+			dd->pixelFormat = dd->force_alpha ? GF_PIXEL_RGBA : GF_PIXEL_BGRX;
 		} else if ((pixelFmt.dwRBitMask == 0xFF0000) && (pixelFmt.dwGBitMask == 0x00FF00) && (pixelFmt.dwBBitMask == 0x0000FF)) {
-			dd->pixelFormat = dd->force_alpha ? GF_PIXEL_ARGB : GF_PIXEL_RGB_32;
+			dd->pixelFormat = dd->force_alpha ? GF_PIXEL_ARGB : GF_PIXEL_RGBX;
 		}
 		dd->video_bpp = 32;
 		break;
@@ -563,7 +580,7 @@
 	}
 	/*get RGB or YUV pool surface*/
 	//if (video_src->pixel_format==GF_PIXEL_YUVD) return GF_NOT_SUPPORTED;
-	if (video_src->pixel_format==GF_PIXEL_YUVD) video_src->pixel_format=GF_PIXEL_YV12;
+	if (video_src->pixel_format==GF_PIXEL_YUVD) video_src->pixel_format = GF_PIXEL_YUV;
 	pool = DD_GetSurface(dr, w, h, video_src->pixel_format, GF_FALSE);
 	if (!pool)
 		return GF_IO_ERR;
@@ -574,9 +591,9 @@
 	if (e) return e;
 
 	/*copy pixels to pool*/
-	dx_copy_pixels(&temp_surf, video_src, src_wnd);
+	e = gf_stretch_bits(&temp_surf, video_src, NULL, src_wnd, 0xFF, GF_FALSE, NULL, NULL);
 
-	e = DD_UnlockSurface(dd, pool->pSurface);
+	DD_UnlockSurface(dd, pool->pSurface);
 	if (e) return e;
 
 	if (overlay_type) {
@@ -595,9 +612,7 @@
 		dst.y = pt.y;
 		MAKERECT(dst_rc, (&dst));
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DX] Blit surface to dest %d x %d - overlay type %s\n", dst.w, dst.h,
-		                                   (overlay_type==0)? "none" : ((overlay_type==1) ? "Top-Level" : "ColorKey")
-		                                  ));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DX] Blit surface to dest %d x %d - overlay type %s\n", dst.w, dst.h, (overlay_type==1) ? "Top-Level" : "ColorKey" ));
 
 #if 1
 		if (overlay_type==1) {
@@ -642,16 +657,15 @@
 }
 
 
-
 static GFINLINE u32 is_yuv_supported(u32 win_4cc)
 {
-	if (win_4cc==get_win_4CC(GF_PIXEL_YV12)) return GF_PIXEL_YV12;
+	if (win_4cc==get_win_4CC(GF_PIXEL_YV12)) return GF_PIXEL_YUV;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_I420)) return GF_PIXEL_I420;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_IYUV)) return GF_PIXEL_IYUV;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_UYVY)) return GF_PIXEL_UYVY;
-	else if (win_4cc==get_win_4CC(GF_PIXEL_Y422)) return GF_PIXEL_Y422;
+	else if (win_4cc==get_win_4CC(GF_PIXEL_Y422)) return GF_PIXEL_YUV422;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_UYNV)) return GF_PIXEL_UYNV;
-	else if (win_4cc==get_win_4CC(GF_PIXEL_YUY2)) return GF_PIXEL_YUY2;
+	else if (win_4cc==get_win_4CC(GF_PIXEL_YUY2)) return GF_PIXEL_YUYV;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_YUNV)) return GF_PIXEL_YUNV;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_V422)) return GF_PIXEL_V422;
 	else if (win_4cc==get_win_4CC(GF_PIXEL_YVYU)) return GF_PIXEL_YVYU;
@@ -661,9 +675,14 @@
 static GFINLINE Bool is_yuv_planar(u32 format)
 {
 	switch  (format) {
-	case GF_PIXEL_YV12:
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YUV_10:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_IYUV:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUV444_10:
 		return GF_TRUE;
 	default:
 		return GF_FALSE;
@@ -691,13 +710,13 @@
 	h = 576;
 
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "PreferedYUV4CC");
+	opt = gf_opts_get_key("core", "pref-yuv4cc");
 	if (opt) {
 		char a, b, c, d;
 		if (sscanf(opt, "%c%c%c%c", &a, &b, &c, &d)==4) {
 			dr->yuv_pixel_format = GF_4CC(a, b, c, d);
 			dr->hw_caps |= GF_VIDEO_HW_HAS_YUV;
-			opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HasOverlay");
+			opt = gf_opts_get_key("core", "yuv-overlay");
 			if (opt && !strcmp(opt, "yes"))
 				dr->hw_caps |= GF_VIDEO_HW_HAS_YUV_OVERLAY;
 			dd->yuv_init = GF_TRUE;
@@ -737,11 +756,9 @@
 			/*then check packed */
 			if (checkPacked && is_yuv_planar(formats[i])) goto go_on;
 
-			if (dd->yuv_pool.pSurface) {
-				SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
-				memset(&dd->yuv_pool, 0, sizeof(DDSurface));
-				dd->yuv_pool.is_yuv = GF_TRUE;
-			}
+			SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
+			memset(&dd->yuv_pool, 0, sizeof(DDSurface));
+			dd->yuv_pool.is_yuv = GF_TRUE;
 
 			dr->yuv_pixel_format = formats[i];
 			if (DD_GetSurface(dr, w, h, dr->yuv_pixel_format, GF_TRUE) == NULL)
@@ -754,7 +771,7 @@
 					goto rem_fmt;
 			}
 			now = gf_sys_clock() - now;
-			if (formats[i]== GF_PIXEL_YV12)
+			if (formats[i]== GF_PIXEL_YUV)
 				force_yv12 = GF_TRUE;
 
 			if (!checkPacked) {
@@ -784,11 +801,9 @@
 			num_yuv--;
 		}
 
-		if (dd->yuv_pool.pSurface) {
-			SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
-			memset(&dd->yuv_pool, 0, sizeof(DDSurface));
-			dd->yuv_pool.is_yuv = GF_TRUE;
-		}
+		SAFE_DD_RELEASE(dd->yuv_pool.pSurface);
+		memset(&dd->yuv_pool, 0, sizeof(DDSurface));
+		dd->yuv_pool.is_yuv = GF_TRUE;
 
 		if (best_planar && (min_planar <= min_packed )) {
 			dr->yuv_pixel_format = best_planar;
@@ -797,16 +812,16 @@
 			dr->yuv_pixel_format = best_packed;
 		}
 		if (force_yv12)
-			dr->yuv_pixel_format = GF_PIXEL_YV12;
+			dr->yuv_pixel_format = GF_PIXEL_YUV;
 
 		/*store our options*/
 		sprintf(szOpt, "%c%c%c%c", (dr->yuv_pixel_format>>24) & 0xFF, (dr->yuv_pixel_format>>16) & 0xFF, (dr->yuv_pixel_format>>8) & 0xFF, (dr->yuv_pixel_format) & 0xFF);
-		gf_modules_set_option((GF_BaseInterface *)dr, "Video", "PreferedYUV4CC", szOpt);
-		gf_modules_set_option((GF_BaseInterface *)dr, "Video", "HasOverlay", (dr->hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) ? "yes" : "no");
+		gf_opts_set_key("core", "pref-yuv4cc", szOpt);
+		gf_opts_set_key("core", "yuv-overlay", (dr->hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) ? "yes" : "no");
 	}
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
-	if (opt && !strcmp(opt, "Never")) num_yuv = 0;
+	opt = gf_opts_get_key("core", "hwvmem");
+	if (opt && !strcmp(opt, "never")) num_yuv = 0;
 
 	/*too bad*/
 	if (!num_yuv) {
@@ -819,21 +834,21 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX Out] Picked YUV format %s - drawn in %d ms\n", gf_4cc_to_str(dr->yuv_pixel_format), min_planar));
 
 	/*enable YUV->RGB on the backbuffer ?*/
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "EnableOffscreenYUV");
+	opt = gf_opts_get_key("core", "offscreen-yuv");
 	/*no set is the default*/
 	if (!opt) {
 		opt = "yes";
-		gf_modules_set_option((GF_BaseInterface *)dr, "Video", "EnableOffscreenYUV", "yes");
+		gf_opts_set_key("core", "offscreen-yuv", "yes");
 	}
 	if (opt && strcmp(opt, "yes")) dr->hw_caps &= ~GF_VIDEO_HW_HAS_YUV;
 	else dd->offscreen_yuv_to_rgb = GF_TRUE;
 
 	/*get YUV overlay key*/
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "OverlayColorKey");
+	opt = gf_opts_get_key("core", "overlay-color-key");
 	/*no set is the default*/
 	if (!opt) {
 		opt = "0101FE";
-		gf_modules_set_option((GF_BaseInterface *)dr, "Video", "OverlayColorKey", "0101FE");
+		gf_opts_set_key("core", "overlay-color-key", "0101FE");
 	}
 	sscanf(opt, "%06x", &dr->overlay_color_key);
 	if (dr->overlay_color_key) dr->overlay_color_key |= 0xFF000000;
@@ -848,7 +863,7 @@
 	GF_Err e;
 	DDCONTEXT;
 #ifndef GPAC_DISABLE_3D
-	if (dd->output_3d_type) return GF_BAD_PARAM;
+	if (dd->output_3d) return GF_BAD_PARAM;
 #endif
 	if (!dd->ddraw_init) {
 		e = InitDirectDraw(dr, width, height);

gpac-0.8.0.tar.gz/modules/dx_hw/dx_audio.c -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_audio.c Changed

@@ -75,7 +75,6 @@
 
 static GF_Err DS_Setup(GF_AudioOutput *dr, void *os_handle, u32 num_buffers, u32 total_duration)
 {
-	DWORD flags;
 	HRESULT hr;
 
 	DSCONTEXT();
@@ -91,7 +90,7 @@
 	if (ctx->cfg_num_buffers <= 1) ctx->cfg_num_buffers = 2;
 
 	if ( FAILED( hr = ctx->DirectSoundCreate( NULL, &ctx->pDS, NULL ) ) ) return GF_IO_ERR;
-	flags = DSSCL_EXCLUSIVE;
+
 	if( FAILED( hr = ctx->pDS->lpVtbl->SetCooperativeLevel(ctx->pDS, ctx->hWnd, DSSCL_EXCLUSIVE) ) ) {
 		SAFE_DS_RELEASE( ctx->pDS );
 		return GF_IO_ERR;
@@ -135,11 +134,10 @@
 }
 
 /*we assume what was asked is what we got*/
-static GF_Err DS_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+static GF_Err DS_Configure(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	u32 i;
 	HRESULT hr;
-	const char *sOpt;
 	DSBUFFERDESC dsbBufferDesc;
 	IDirectSoundNotify *pNotify;
 #ifdef USE_WAVE_EX
@@ -148,15 +146,29 @@
 	DSCONTEXT();
 
 	DS_ReleaseBuffer(dr);
-
+	//only support for PCM 8/16/24/32 packet mode
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+	case GF_AUDIO_FMT_S16:
+	case GF_AUDIO_FMT_S24:
+	case GF_AUDIO_FMT_S32:
+		break;
+	default:
+		//otherwise force PCM16
+		*audioFormat = GF_AUDIO_FMT_S16;
+		break;
+	}
 	ctx->format.nChannels = *NbChannels;
-	ctx->format.wBitsPerSample = *nbBitsPerSample;
+	ctx->format.wBitsPerSample = gf_audio_fmt_bit_depth( *audioFormat);
 	ctx->format.nSamplesPerSec = *SampleRate;
 	ctx->format.cbSize = sizeof (WAVEFORMATEX);
 	ctx->format.wFormatTag = WAVE_FORMAT_PCM;
 	ctx->format.nBlockAlign = ctx->format.nChannels * ctx->format.wBitsPerSample / 8;
 	ctx->format.nAvgBytesPerSec = ctx->format.nSamplesPerSec * ctx->format.nBlockAlign;
 
+	if (!ctx->format.nBlockAlign)
+		return GF_BAD_PARAM;
+
 	if (!ctx->force_config) {
 		ctx->buffer_size = ctx->format.nBlockAlign * 1024;
 		ctx->num_audio_buffer = 2;
@@ -169,8 +181,8 @@
 	while (ctx->buffer_size % ctx->format.nBlockAlign) ctx->buffer_size++;
 
 	ctx->use_notif = GF_TRUE;
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Audio", "DisableNotification");
-	if (sOpt && !stricmp(sOpt, "yes")) ctx->use_notif = GF_FALSE;
+	if (gf_opts_get_bool("core", "ds-disable-notif"))
+		ctx->use_notif = GF_FALSE;
 
 	memset(&dsbBufferDesc, 0, sizeof(DSBUFFERDESC));
 	dsbBufferDesc.dwSize = sizeof (DSBUFFERDESC);
@@ -185,19 +197,18 @@
 		format_ex.Format = ctx->format;
 		format_ex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE);
 		format_ex.SubFormat = GPAC_KSDATAFORMAT_SUBTYPE_PCM;
-		format_ex.Samples.wValidBitsPerSample = *nbBitsPerSample;
-		//our channel config is exactly the same as ksmedia
-		format_ex.dwChannelMask = channel_cfg;
-/*		if (channel_cfg & GF_AUDIO_CH_FRONT_LEFT) format_ex.dwChannelMask |= SPEAKER_FRONT_LEFT;
+		format_ex.Samples.wValidBitsPerSample = gf_audio_fmt_bit_depth(*audioFormat);
+		
+		format_ex.dwChannelMask = 0;
+		if (channel_cfg & GF_AUDIO_CH_FRONT_LEFT) format_ex.dwChannelMask |= SPEAKER_FRONT_LEFT;
 		if (channel_cfg & GF_AUDIO_CH_FRONT_RIGHT) format_ex.dwChannelMask |= SPEAKER_FRONT_RIGHT;
 		if (channel_cfg & GF_AUDIO_CH_FRONT_CENTER) format_ex.dwChannelMask |= SPEAKER_FRONT_CENTER;
 		if (channel_cfg & GF_AUDIO_CH_LFE) format_ex.dwChannelMask |= SPEAKER_LOW_FREQUENCY;
-		if (channel_cfg & GF_AUDIO_CH_BACK_LEFT) format_ex.dwChannelMask |= SPEAKER_BACK_LEFT;
-		if (channel_cfg & GF_AUDIO_CH_BACK_RIGHT) format_ex.dwChannelMask |= SPEAKER_BACK_RIGHT;
-		if (channel_cfg & GF_AUDIO_CH_BACK_CENTER) format_ex.dwChannelMask |= SPEAKER_BACK_CENTER;
-		if (channel_cfg & GF_AUDIO_CH_SIDE_LEFT) format_ex.dwChannelMask |= SPEAKER_SIDE_LEFT;
-		if (channel_cfg & GF_AUDIO_CH_SIDE_RIGHT) format_ex.dwChannelMask |= SPEAKER_SIDE_RIGHT;
-	*/
+		if (channel_cfg & GF_AUDIO_CH_SURROUND_LEFT) format_ex.dwChannelMask |= SPEAKER_BACK_LEFT;
+		if (channel_cfg & GF_AUDIO_CH_SURROUND_RIGHT) format_ex.dwChannelMask |= SPEAKER_BACK_RIGHT;
+		if (channel_cfg & GF_AUDIO_CH_REAR_CENTER) format_ex.dwChannelMask |= SPEAKER_BACK_CENTER;
+		if (channel_cfg & GF_AUDIO_CH_SIDE_SURROUND_LEFT) format_ex.dwChannelMask |= SPEAKER_SIDE_LEFT;
+		if (channel_cfg & GF_AUDIO_CH_SIDE_SURROUND_RIGHT) format_ex.dwChannelMask |= SPEAKER_SIDE_RIGHT;
 
 		dsbBufferDesc.lpwfxFormat = (WAVEFORMATEX *) &format_ex;
 	}
@@ -207,7 +218,7 @@
 	hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
 	if (FAILED(hr)) {
 retry:
-		if (ctx->use_notif) gf_modules_set_option((GF_BaseInterface *)dr, "Audio", "DisableNotification", "yes");
+		if (ctx->use_notif) gf_opts_set_key("core", "ds-disable-notif", "yes");
 		ctx->use_notif = GF_FALSE;
 		dsbBufferDesc.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS;
 		hr = ctx->pDS->lpVtbl->CreateSoundBuffer(ctx->pDS, &dsbBufferDesc, &ctx->pOutput, NULL );
@@ -215,7 +226,7 @@
 			if (ctx->format.nChannels>2) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[DirectSound] failed to configure output for %d channels (error %08x) - falling back to stereo\n", *NbChannels, hr));
 				*NbChannels = 2;
-				return DS_ConfigureOutput(dr, SampleRate, NbChannels, nbBitsPerSample, 0);
+				return DS_Configure(dr, SampleRate, NbChannels, audioFormat, 0);
 			}
 			return GF_IO_ERR;
 		}
@@ -337,6 +348,7 @@
 	u32 retry;
 	DWORD in_play, cur_play;
 	DSCONTEXT();
+	if (!ctx->pOutput) return;
 
 	/*wait for end of current play buffer*/
 	if (ctx->pOutput->lpVtbl->GetCurrentPosition(ctx->pOutput, &in_play, NULL) != DS_OK ) {
@@ -388,7 +400,8 @@
 {
 	LONG Vol;
 	DSCONTEXT();
-	if (Volume > 100) Volume = DSBVOLUME_MAX;
+	if (!ctx->pOutput) return;
+	if (Volume > 100) Vol = DSBVOLUME_MAX;
 	else if(Volume == 0) Vol = DSBVOLUME_MIN;
 	else Vol = DSBVOLUME_MIN/2 + Volume * (DSBVOLUME_MAX-DSBVOLUME_MIN/2) / 100;
 	ctx->pOutput->lpVtbl->SetVolume(ctx->pOutput, Vol);
@@ -398,6 +411,7 @@
 {
 	LONG dspan;
 	DSCONTEXT();
+	if (!ctx->pOutput) return;
 
 	if (Pan > 100) Pan = 100;
 	if (Pan > 50) {
@@ -461,7 +475,7 @@
 
 	driv->Setup = DS_Setup;
 	driv->Shutdown = DS_Shutdown;
-	driv->ConfigureOutput = DS_ConfigureOutput;
+	driv->Configure = DS_Configure;
 	driv->SetVolume = DS_SetVolume;
 	driv->SetPan = DS_SetPan;
 	driv->Play = DS_Play;

gpac-0.8.0.tar.gz/modules/dx_hw/dx_hw.h -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_hw.h Changed

gpac-0.8.0.tar.gz/modules/dx_hw/dx_hw.rc -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_hw.rc Changed

gpac-0.8.0.tar.gz/modules/dx_hw/dx_video.c -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_video.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 / DirectX audio and video render module
@@ -87,77 +87,9 @@
 static GETPIXELFORMATATTRIBIV wglGetPixelFormatAttribivARB = NULL;
 
 
-typedef void *(APIENTRY *CREATEPBUFFERARB)(HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
-static CREATEPBUFFERARB wglCreatePbufferARB = NULL;
-
-typedef void (APIENTRY *DESTROYBUFFERARB)(void *pb);
-static DESTROYBUFFERARB wglDestroyPbufferARB = NULL;
-
-typedef HDC (APIENTRY *GETPBUFFERDCARB)(void *pb);
-static GETPBUFFERDCARB wglGetPbufferDCARB = NULL;
-
-typedef HDC (APIENTRY *RELEASEPBUFFERDCARB)(void *pb, HDC dc);
-static RELEASEPBUFFERDCARB wglReleasePbufferDCARB = NULL;
-
 typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)( int );
 PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT = NULL;
 
-static void dd_init_gl_offscreen(GF_VideoOutput *driv)
-{
-	const char *opt;
-	DDContext *dd = (DDContext*)driv->opaque;
-
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode");
-
-#ifndef _WIN32_WCE
-	wglChoosePixelFormatARB = (CHOOSEPFFORMATARB) wglGetProcAddress("wglChoosePixelFormatARB");
-
-	wglCreatePbufferARB = (CREATEPBUFFERARB) wglGetProcAddress("wglCreatePbufferARB");
-	if (opt && strcmp(opt, "PBuffer")) wglCreatePbufferARB = NULL;
-
-	if (wglCreatePbufferARB) {
-		wglDestroyPbufferARB = (DESTROYBUFFERARB) wglGetProcAddress("wglDestroyPbufferARB");
-		wglGetPbufferDCARB = (GETPBUFFERDCARB ) wglGetProcAddress("wglGetPbufferDCARB");
-		wglReleasePbufferDCARB = (RELEASEPBUFFERDCARB ) wglGetProcAddress("wglReleasePbufferDCARB");
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX] Using PBuffer for OpenGL Offscreen Rendering\n"));
-		driv->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-
-		if (!opt) gf_modules_set_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode", "PBuffer");
-	} else
-#endif
-	{
-		u32 gl_type = 1;
-
-		opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode");
-		if (opt) {
-			if (!strcmp(opt, "Window")) gl_type = 1;
-			else if (!strcmp(opt, "VisibleWindow")) gl_type = 2;
-			else gl_type = 0;
-		} else {
-			gf_modules_set_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode", "Window");
-		}
-
-		if (gl_type) {
-#ifdef _WIN32_WCE
-			dd->gl_hwnd = CreateWindow(_T("GPAC DirectDraw Output"), _T("GPAC OpenGL Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle(_T("gm_dx_hw.dll")), NULL);
-#else
-#ifdef UNICODE
-			dd->gl_hwnd = CreateWindow(L"GPAC DirectDraw Output", L"GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle(L"gm_dx_hw.dll"), NULL);
-#else
-			dd->gl_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle("gm_dx_hw.dll"), NULL);
-#endif
-#endif
-			if (!dd->gl_hwnd)
-				return;
-
-			ShowWindow(dd->gl_hwnd, (gl_type == 2) ? SW_SHOW : SW_HIDE);
-			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[DX] Using %s window for OpenGL Offscreen Rendering\n", (gl_type == 2) ? "Visible" : "Hidden"));
-			driv->hw_caps |= GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
-		}
-	}
-
-}
 #endif
 
 
@@ -167,7 +99,7 @@
 	dd->NeedRestore = GF_FALSE;
 
 #ifndef GPAC_DISABLE_3D
-	if (dd->output_3d_type==1) {
+	if (dd->output_3d) {
 #ifndef _WIN32_WCE
 		ChangeDisplaySettings(NULL,0);
 #endif
@@ -200,9 +132,6 @@
 #ifdef GPAC_DISABLE_3D
 	}
 #else
-
-		/*do not destroy associated GL context*/
-		if (dd->output_3d_type==2) return;
 	}
 
 	/*delete openGL context*/
@@ -229,10 +158,6 @@
 		ReleaseDC(dd->bound_hwnd, dd->pb_HDC);
 		dd->pb_HDC = NULL;
 	}
-	if (dd->pbuffer) {
-		wglDestroyPbufferARB(dd->pbuffer);
-		dd->pbuffer = NULL;
-	}
 
 	if (dd->gl_HRC) {
 		//wglMakeCurrent(NULL, NULL);
@@ -258,7 +183,9 @@
 
 GF_Err DD_SetupOpenGL(GF_VideoOutput *dr, u32 offscreen_width, u32 offscreen_height)
 {
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2) || !defined(_WIN32_WCE)
 	const char *sOpt;
+#endif
 	GF_Event evt;
 	Bool hw_reset = GF_FALSE;
 	DDCONTEXT
@@ -271,7 +198,7 @@
 	u32 i=0;
 	static int egl_atts[20];
 
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
+	sOpt = gf_opts_get_key("core", "gl-bits-comp");
 	nb_bits = sOpt ? atoi(sOpt) : 5;
 
 	egl_atts[i++] = EGL_RED_SIZE;
@@ -283,7 +210,7 @@
 	/*alpha for compositeTexture*/
 	egl_atts[i++] = EGL_ALPHA_SIZE;
 	egl_atts[i++] = 1;
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
+	sOpt = gf_opts_get_key("core", "gl-bits-depth");
 	nb_bits = sOpt ? atoi(sOpt) : 5;
 	egl_atts[i++] = EGL_DEPTH_SIZE;
 	egl_atts[i++] = nb_bits;
@@ -335,13 +262,13 @@
 	PIXELFORMATDESCRIPTOR pfd;
 	s32 pixelformat;
 	HWND highbpp_hwnd = NULL;
-	HWND target_hwnd = NULL;
+	HWND target_hwnd;
 	int bits_depth = 16;
 	u32 i;
 	Bool use_double_buffer;
 
 	/*already setup*/
-	target_hwnd = (dd->gl_hwnd && (dd->output_3d_type==2)) ? dd->gl_hwnd : dd->cur_hwnd;
+	target_hwnd = dd->cur_hwnd;
 	if ((dd->bound_hwnd == target_hwnd) && dd->gl_HRC)
 		goto exit;
 
@@ -349,16 +276,16 @@
 	dd->bound_hwnd = target_hwnd;
 
 	/*cleanup*/
-	DestroyObjectsEx(dd, (dd->output_3d_type==1) ? GF_FALSE : GF_TRUE);
+	DestroyObjectsEx(dd, dd->output_3d ? GF_FALSE : GF_TRUE);
 
 	//first time we init GL: create a dummy window to select pixel format for high bpp - we must do this because
 	//- we must get a valid GL context to query the extensions for bpp > 8 (regular choosePixelFormat does not work for them)
 	//- we must call SetPixelFormat to create the GL context
 	//- it is not possible to call several time SetPixelFormat on the same window with different PF properties ...
 	if (!dd->mode_high_bpp) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
+		sOpt = gf_opts_get_key("core", "gl-bits-comp");
 		if (!sOpt) {
-			gf_modules_set_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent", "8");
+			gf_opts_set_key("core", "gl-bits-comp", "8");
 			dd->bpp = 8;
 		} else {
 			dd->bpp = atoi(sOpt);
@@ -384,6 +311,9 @@
 			dd->gl_HRC = wglCreateContext(dd->gl_HDC);
 			if (!dd->gl_HRC) return GF_IO_ERR;
 
+			HGLRC cur = wglGetCurrentContext();
+			if (cur) wglShareLists(cur, dd->gl_HRC);
+
 			wglMakeCurrent(dd->gl_HDC, dd->gl_HRC);
 			wglChoosePixelFormatARB = (CHOOSEPFFORMATARB) wglGetProcAddress("wglChoosePixelFormatARB");
 			wglGetPixelFormatAttribivARB = (GETPIXELFORMATATTRIBIV) wglGetProcAddress("wglGetPixelFormatAttribivARB");
@@ -408,11 +338,11 @@
 	if (dd->gl_double_buffer ) {
 		use_double_buffer = dd->gl_double_buffer;
 	} else {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "UseGLDoubleBuffering");
+		sOpt = gf_opts_get_key("core", "gl-doublebuf");
 		if (!sOpt || !strcmp(sOpt, "yes")) use_double_buffer = GF_TRUE;
 	}
 
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
+	sOpt = gf_opts_get_key("core", "gl-bits-depth");
 	if (sOpt) bits_depth = atoi(sOpt);
 
 	memset(&pfd, 0, sizeof(pfd));
@@ -423,7 +353,6 @@
 		int pformats[200];
 		u32 nbformats=0;
 		Bool found = GF_FALSE;
-		float fattribs[1] = { 0.0f };
 
 		int hdcAttributes[] = {
 			WGL_SUPPORT_OPENGL_ARB, TRUE,
@@ -498,7 +427,6 @@
 	if (!dd->glext_init) {
 		dd->glext_init = GF_TRUE;
 		wglMakeCurrent(dd->gl_HDC, dd->gl_HRC);
-		dd_init_gl_offscreen(dr);
 	}
 
 	if (dd->disable_vsync) {
@@ -510,39 +438,8 @@
 		}
 	}
 
-	if ((dd->output_3d_type!=2) || dd->gl_hwnd) {
-		if (!wglMakeCurrent(dd->gl_HDC, dd->gl_HRC)) return GF_IO_ERR;
-	} else if (wglCreatePbufferARB) {
-		const int pbufferAttributes [50] = {
-			WGL_TEXTURE_FORMAT_ARB, WGL_TEXTURE_RGBA_ARB,
-			WGL_TEXTURE_TARGET_ARB,	WGL_TEXTURE_2D_ARB,
-			0
-		};
-		int pformats[20];
-		u32 nbformats=0;
-		int hdcAttributes[] = {
-			WGL_SUPPORT_OPENGL_ARB, TRUE,
-			WGL_DRAW_TO_PBUFFER_ARB, TRUE,
-			WGL_RED_BITS_ARB, 8,
-			WGL_GREEN_BITS_ARB, 8,
-			WGL_BLUE_BITS_ARB, 8,
-			WGL_DEPTH_BITS_ARB, bits_depth,
-			0
-		};
-		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 20, pformats, &nbformats);
-		// Create the PBuffer
-		for (i=0; i<nbformats; i++) {
-			dd->pbuffer = wglCreatePbufferARB(dd->gl_HDC, pformats[i], offscreen_width, offscreen_height, pbufferAttributes);
-			if (dd->pbuffer) break;
-		}
-		if (!dd->pbuffer) return GF_IO_ERR;
-
-		dd->pb_HDC = wglGetPbufferDCARB(dd->pbuffer);
-		dd->pb_HRC = wglCreateContext(dd->pb_HDC);
-		if (!wglMakeCurrent(dd->pb_HDC, dd->pb_HRC)) return GF_IO_ERR;
-
+	if (!wglMakeCurrent(dd->gl_HDC, dd->gl_HRC)) return GF_IO_ERR;
 
-	}
 #endif
 
 	/*special care for Firefox: XUL and OpenGL do not go well together, there is a stack overflow in WM_PAINT
@@ -554,11 +451,11 @@
 		SetWindowLong(dd->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
 #endif
 
-#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2) && !defined(_WIN32_WCE)
 exit:
 #endif
 
-	if (dd->output_3d_type==1) {
+	if (dd->output_3d) {
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
 		evt.setup.hw_reset = hw_reset;
@@ -575,7 +472,6 @@
 {
 	RECT rc;
 	DDCONTEXT
-	const char *opt;
 	dd->os_hwnd = (HWND) os_handle;
 
 	DD_SetupWindow(dr, init_flags);
@@ -592,12 +488,11 @@
 	}
 
 #ifndef GPAC_DISABLE_3D
-	dd->output_3d_type = 0;
+	dd->output_3d = 0;
 #endif
 	GetWindowRect(dd->cur_hwnd, &rc);
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "DisableVSync");
-	if (opt && !strcmp(opt, "yes")) dd->disable_vsync = GF_TRUE;
+	dd->disable_vsync = gf_opts_get_bool("core", "disable-vsync");
 
 	return GF_OK;
 }
@@ -607,9 +502,6 @@
 	DDCONTEXT
 
 	/*force destroy of opengl*/
-#ifndef GPAC_DISABLE_3D
-	if (dd->output_3d_type) dd->output_3d_type = 1;
-#endif
 	DestroyObjects(dd);
 
 	DD_ShutdownWindow(dr);
@@ -638,8 +530,6 @@
 static GF_Err DD_SetFullScreen(GF_VideoOutput *dr, Bool bOn, u32 *outWidth, u32 *outHeight)
 {
 	GF_Err e;
-	const char *sOpt;
-	u32 MaxWidth, MaxHeight;
 	DDCONTEXT;
 
 	if (bOn == dd->fullscreen) return GF_OK;
@@ -653,16 +543,11 @@
 	on the dest pixel format)*/
 	dd->yuv_init = GF_FALSE;
 	if (dd->fullscreen) {
-		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "SwitchResolution");
-		if (sOpt && !stricmp(sOpt, "yes")) dd->switch_res = GF_TRUE;
+		dd->switch_res = gf_opts_get_bool("core", "switch-vres");
 		/*get current or best fitting mode*/
 		if (GetDisplayMode(dd) != GF_OK) return GF_IO_ERR;
 	}
 
-	MaxWidth = MaxHeight = 0;
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "MaxResolution");
-	if (sOpt) sscanf(sOpt, "%dx%d", &MaxWidth, &MaxHeight);
-
 	if (dd->NeedRestore) RestoreWindow(dd);
 	/*destroy all objects*/
 	if (dd->os_hwnd!=dd->fs_hwnd) DestroyObjects(dd);
@@ -711,11 +596,6 @@
 		}
 #endif
 
-		/*change display mode*/
-		if ((MaxWidth && (dd->fs_width >= MaxWidth)) || (MaxHeight && (dd->fs_height >= MaxHeight)) ) {
-			dd->fs_width = MaxWidth;
-			dd->fs_height = MaxHeight;
-		}
 		SetWindowPos(dd->cur_hwnd, NULL, X, Y, dd->fs_width, dd->fs_height, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
 	} else if (dd->os_hwnd==dd->fs_hwnd) {
 		SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
@@ -726,7 +606,7 @@
 
 
 #ifndef GPAC_DISABLE_3D
-	if (dd->output_3d_type==1) {
+	if (dd->output_3d) {
 		e = DD_SetupOpenGL(dr, 0, 0);
 	} else
 #endif
@@ -773,7 +653,7 @@
 
 #ifndef GPAC_DISABLE_3D
 
-	if (dd->output_3d_type==1) {
+	if (dd->output_3d) {
 #if defined(GPAC_USE_GLES1X) ||  defined(GPAC_USE_GLES2)
 		if (dd->surface) eglSwapBuffers(dd->egldpy, dd->surface);
 #else
@@ -800,7 +680,7 @@
 	}
 
 	if (!dd->disable_vsync)
-		hr = dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
+		dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
 
 	if (dest) {
 		POINT pt;
@@ -898,7 +778,7 @@
 	driv->max_screen_width = GetSystemMetrics(SM_CXSCREEN);
 	driv->max_screen_height = GetSystemMetrics(SM_CYSCREEN);
 	driv->max_screen_bpp = 8;
-	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA | GF_VIDEO_HW_HAS_HWND_HDC;
+	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA;
 
 	DD_SetupDDraw(driv);

gpac-0.8.0.tar.gz/modules/dx_hw/dx_window.c -> gpac-1.0.0.tar.gz/modules/dx_hw/dx_window.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 / DirectX audio and video render module
@@ -59,374 +59,141 @@
 }
 #endif
 
-static void w32_translate_key(WPARAM wParam, LPARAM lParam, GF_EventKey *evt)
+typedef struct
 {
-	evt->flags = 0;
-	evt->hw_code = (u32) wParam;
-	switch (wParam) {
-	case VK_BACK:
-		evt->key_code = GF_KEY_BACKSPACE;
-		break;
-	case VK_TAB:
-		evt->key_code = GF_KEY_TAB;
-		break;
-	case VK_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
-	case VK_RETURN:
-		evt->key_code = GF_KEY_ENTER;
-		break;
-	case VK_SHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		break;
-	case VK_CONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		break;
-	case VK_MENU:
-		evt->key_code = GF_KEY_ALT;
-		break;
-	case VK_PAUSE:
-		evt->key_code = GF_KEY_PAUSE;
-		break;
-	case VK_CAPITAL:
-		evt->key_code = GF_KEY_CAPSLOCK;
-		break;
-	case VK_KANA:
-		evt->key_code = GF_KEY_KANAMODE;
-		break;
-	case VK_JUNJA:
-		evt->key_code = GF_KEY_JUNJAMODE;
-		break;
-	case VK_FINAL:
-		evt->key_code = GF_KEY_FINALMODE;
-		break;
-	case VK_KANJI:
-		evt->key_code = GF_KEY_KANJIMODE;
-		break;
-	case VK_ESCAPE:
-		evt->key_code = GF_KEY_ESCAPE;
-		break;
-	case VK_CONVERT:
-		evt->key_code = GF_KEY_CONVERT;
-		break;
-	case VK_SPACE:
-		evt->key_code = GF_KEY_SPACE;
-		break;
-	case VK_PRIOR:
-		evt->key_code = GF_KEY_PAGEUP;
-		break;
-	case VK_NEXT:
-		evt->key_code = GF_KEY_PAGEDOWN;
-		break;
-	case VK_END:
-		evt->key_code = GF_KEY_END;
-		break;
-	case VK_HOME:
-		evt->key_code = GF_KEY_HOME;
-		break;
-	case VK_LEFT:
-		evt->key_code = GF_KEY_LEFT;
-		break;
-	case VK_UP:
-		evt->key_code = GF_KEY_UP;
-		break;
-	case VK_RIGHT:
-		evt->key_code = GF_KEY_RIGHT;
-		break;
-	case VK_DOWN:
-		evt->key_code = GF_KEY_DOWN;
-		break;
-	case VK_SELECT:
-		evt->key_code = GF_KEY_SELECT;
-		break;
-	case VK_PRINT:
-	case VK_SNAPSHOT:
-		evt->key_code = GF_KEY_PRINTSCREEN;
-		break;
-	case VK_EXECUTE:
-		evt->key_code = GF_KEY_EXECUTE;
-		break;
-	case VK_INSERT:
-		evt->key_code = GF_KEY_INSERT;
-		break;
-	case VK_DELETE:
-		evt->key_code = GF_KEY_DEL;
-		break;
-	case VK_HELP:
-		evt->key_code = GF_KEY_HELP;
-		break;
+	u32 win_key;
+	u32 gf_key;
+	u32 gf_flags;
+} WINKeyToGPAC;
 
+static WINKeyToGPAC WINKeys[] =
+{
+	{VK_BACK, GF_KEY_BACKSPACE, 0},
+	{VK_TAB, GF_KEY_TAB, 0 },
+	{VK_CLEAR, GF_KEY_CLEAR, 0 },
+	{VK_RETURN, GF_KEY_ENTER, 0 },
+	{VK_SHIFT, GF_KEY_SHIFT, 0 },
+	{VK_CONTROL, GF_KEY_CONTROL, 0 },
+	{VK_MENU, GF_KEY_ALT, 0 },
+	{VK_PAUSE, GF_KEY_PAUSE, 0 },
+	{VK_CAPITAL, GF_KEY_CAPSLOCK, 0 },
+	{VK_KANA, GF_KEY_KANAMODE, 0 },
+	{VK_JUNJA, GF_KEY_JUNJAMODE, 0 },
+	{VK_FINAL, GF_KEY_FINALMODE, 0 },
+	{VK_KANJI, GF_KEY_KANJIMODE, 0 },
+	{VK_ESCAPE, GF_KEY_ESCAPE, 0 },
+	{VK_CONVERT, GF_KEY_CONVERT, 0 },
+	{VK_SPACE, GF_KEY_SPACE, 0 },
+	{VK_PRIOR, GF_KEY_PAGEUP, 0 },
+	{VK_NEXT, GF_KEY_PAGEDOWN, 0 },
+	{VK_END, GF_KEY_END, 0 },
+	{VK_HOME, GF_KEY_HOME, 0 },
+	{VK_LEFT, GF_KEY_LEFT, 0 },
+	{VK_UP, GF_KEY_UP, 0 },
+	{VK_RIGHT, GF_KEY_RIGHT, 0 },
+	{VK_DOWN, GF_KEY_DOWN, 0 },
+	{VK_SELECT, GF_KEY_SELECT, 0 },
+	{VK_PRINT, GF_KEY_PRINTSCREEN, 0 },
+	{ VK_SNAPSHOT, GF_KEY_PRINTSCREEN, 0 },
+	{VK_EXECUTE, GF_KEY_EXECUTE, 0 },
+	{VK_INSERT, GF_KEY_INSERT, 0 },
+	{VK_DELETE, GF_KEY_DEL, 0 },
+	{VK_HELP, GF_KEY_HELP, 0 },
 #if !defined(_WIN32_WCE) && !defined(__GNUC__)
-	case VK_OEM_PLUS:
-		evt->key_code = GF_KEY_PLUS;
-		break;
-	case VK_OEM_MINUS:
-		evt->key_code = GF_KEY_PLUS;
-		break;
+	{VK_OEM_PLUS, GF_KEY_PLUS, 0 },
+	{VK_OEM_MINUS, GF_KEY_PLUS, 0 },
 #endif
-
 #ifndef _WIN32_WCE
-	case VK_NONCONVERT:
-		evt->key_code = GF_KEY_NONCONVERT;
-		break;
-	case VK_ACCEPT:
-		evt->key_code = GF_KEY_ACCEPT;
-		break;
-	case VK_MODECHANGE:
-		evt->key_code = GF_KEY_MODECHANGE;
-		break;
+	{VK_NONCONVERT, GF_KEY_NONCONVERT, 0 },
+	{VK_ACCEPT, GF_KEY_ACCEPT, 0 },
+	{VK_MODECHANGE, GF_KEY_MODECHANGE, 0 },
 #endif
-
-	/*	case '!': evt->key_code = GF_KEY_EXCLAMATION; break;
-		case '"': evt->key_code = GF_KEY_QUOTATION; break;
-		case '#': evt->key_code = GF_KEY_NUMBER; break;
-		case '$': evt->key_code = GF_KEY_DOLLAR; break;
-		case '&': evt->key_code = GF_KEY_AMPERSAND; break;
-		case '\'': evt->key_code = GF_KEY_APOSTROPHE; break;
-		case '(': evt->key_code = GF_KEY_LEFTPARENTHESIS; break;
-		case ')': evt->key_code = GF_KEY_RIGHTPARENTHESIS; break;
-		case ',': evt->key_code = GF_KEY_COMMA; break;
-		case ':': evt->key_code = GF_KEY_COLON; break;
-		case ';': evt->key_code = GF_KEY_SEMICOLON; break;
-		case '<': evt->key_code = GF_KEY_LESSTHAN; break;
-		case '>': evt->key_code = GF_KEY_GREATERTHAN; break;
-		case '?': evt->key_code = GF_KEY_QUESTION; break;
-		case '@': evt->key_code = GF_KEY_AT; break;
-		case '[': evt->key_code = GF_KEY_LEFTSQUAREBRACKET; break;
-		case ']': evt->key_code = GF_KEY_RIGHTSQUAREBRACKET; break;
-		case '\\': evt->key_code = GF_KEY_BACKSLASH; break;
-		case '_': evt->key_code = GF_KEY_UNDERSCORE; break;
-		case '`': evt->key_code = GF_KEY_GRAVEACCENT; break;
-		case ' ': evt->key_code = GF_KEY_SPACE; break;
-		case '/': evt->key_code = GF_KEY_SLASH; break;
-		case '*': evt->key_code = GF_KEY_STAR; break;
-		case '-': evt->key_code = GF_KEY_HIPHEN; break;
-		case '+': evt->key_code = GF_KEY_PLUS; break;
-		case '=': evt->key_code = GF_KEY_EQUALS; break;
-		case '^': evt->key_code = GF_KEY_CIRCUM; break;
-		case '{': evt->key_code = GF_KEY_LEFTCURLYBRACKET; break;
-		case '}': evt->key_code = GF_KEY_RIGHTCURLYBRACKET; break;
-		case '|': evt->key_code = GF_KEY_PIPE; break;
-	*/
-
-
-	/*	case VK_LWIN: return ;
-		case VK_RWIN: return ;
-		case VK_APPS: return ;
-	*/
-	case VK_NUMPAD0:
-		evt->key_code = GF_KEY_0;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD1:
-		evt->key_code = GF_KEY_1;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD2:
-		evt->key_code = GF_KEY_2;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD3:
-		evt->key_code = GF_KEY_3;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD4:
-		evt->key_code = GF_KEY_4;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD5:
-		evt->key_code = GF_KEY_5;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD6:
-		evt->key_code = GF_KEY_6;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD7:
-		evt->key_code = GF_KEY_7;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD8:
-		evt->key_code = GF_KEY_8;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_NUMPAD9:
-		evt->key_code = GF_KEY_9;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_MULTIPLY:
-		evt->key_code = GF_KEY_STAR;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_ADD:
-		evt->key_code = GF_KEY_PLUS;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_SEPARATOR:
-		evt->key_code = GF_KEY_FULLSTOP;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_SUBTRACT:
-		evt->key_code = GF_KEY_HYPHEN;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_DECIMAL:
-		evt->key_code = GF_KEY_COMMA;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_DIVIDE:
-		evt->key_code = GF_KEY_SLASH;
-		evt->flags = GF_KEY_EXT_NUMPAD;
-		break;
-	case VK_F1:
-		evt->key_code = GF_KEY_F1;
-		break;
-	case VK_F2:
-		evt->key_code = GF_KEY_F2;
-		break;
-	case VK_F3:
-		evt->key_code = GF_KEY_F3;
-		break;
-	case VK_F4:
-		evt->key_code = GF_KEY_F4;
-		break;
-	case VK_F5:
-		evt->key_code = GF_KEY_F5;
-		break;
-	case VK_F6:
-		evt->key_code = GF_KEY_F6;
-		break;
-	case VK_F7:
-		evt->key_code = GF_KEY_F7;
-		break;
-	case VK_F8:
-		evt->key_code = GF_KEY_F8;
-		break;
-	case VK_F9:
-		evt->key_code = GF_KEY_F9;
-		break;
-	case VK_F10:
-		evt->key_code = GF_KEY_F10;
-		break;
-	case VK_F11:
-		evt->key_code = GF_KEY_F11;
-		break;
-	case VK_F12:
-		evt->key_code = GF_KEY_F12;
-		break;
-	case VK_F13:
-		evt->key_code = GF_KEY_F13;
-		break;
-	case VK_F14:
-		evt->key_code = GF_KEY_F14;
-		break;
-	case VK_F15:
-		evt->key_code = GF_KEY_F15;
-		break;
-	case VK_F16:
-		evt->key_code = GF_KEY_F16;
-		break;
-	case VK_F17:
-		evt->key_code = GF_KEY_F17;
-		break;
-	case VK_F18:
-		evt->key_code = GF_KEY_F18;
-		break;
-	case VK_F19:
-		evt->key_code = GF_KEY_F19;
-		break;
-	case VK_F20:
-		evt->key_code = GF_KEY_F20;
-		break;
-	case VK_F21:
-		evt->key_code = GF_KEY_F21;
-		break;
-	case VK_F22:
-		evt->key_code = GF_KEY_F22;
-		break;
-	case VK_F23:
-		evt->key_code = GF_KEY_F23;
-		break;
-	case VK_F24:
-		evt->key_code = GF_KEY_F24;
-		break;
-
-	case VK_NUMLOCK:
-		evt->key_code = GF_KEY_NUMLOCK;
-		break;
-	case VK_SCROLL:
-		evt->key_code = GF_KEY_SCROLL;
-		break;
-
-	/*
-	 * VK_L* & VK_R* - left and right Alt, Ctrl and Shift virtual keys.
-	 * Used only as parameters to GetAsyncKeyState() and GetKeyState().
-	 * No other API or message will distinguish left and right keys in this way.
-	 */
-	case VK_LSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case VK_LCONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RCONTROL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case VK_LMENU:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case VK_RMENU:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-
+	{VK_NUMPAD0, GF_KEY_0, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD1, GF_KEY_1, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD2, GF_KEY_2, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD3, GF_KEY_3, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD4, GF_KEY_4, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD5, GF_KEY_5, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD6, GF_KEY_6, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD7, GF_KEY_7, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD8, GF_KEY_8, GF_KEY_EXT_NUMPAD },
+	{VK_NUMPAD9, GF_KEY_9, GF_KEY_EXT_NUMPAD },
+	{VK_MULTIPLY, GF_KEY_STAR, GF_KEY_EXT_NUMPAD },
+	{VK_ADD, GF_KEY_PLUS, GF_KEY_EXT_NUMPAD },
+	{VK_SEPARATOR, GF_KEY_FULLSTOP, GF_KEY_EXT_NUMPAD },
+	{VK_SUBTRACT, GF_KEY_HYPHEN, GF_KEY_EXT_NUMPAD },
+	{VK_DECIMAL, GF_KEY_COMMA, GF_KEY_EXT_NUMPAD },
+	{VK_DIVIDE, GF_KEY_SLASH, GF_KEY_EXT_NUMPAD },
+	{VK_F1, GF_KEY_F1, 0},
+	{VK_F2, GF_KEY_F2, 0 },
+	{VK_F3, GF_KEY_F3, 0 },
+	{VK_F4, GF_KEY_F4, 0 },
+	{VK_F5, GF_KEY_F5, 0 },
+	{VK_F6, GF_KEY_F6, 0 },
+	{VK_F7, GF_KEY_F7, 0 },
+	{VK_F8, GF_KEY_F8, 0 },
+	{VK_F9, GF_KEY_F9, 0 },
+	{VK_F10, GF_KEY_F10, 0 },
+	{VK_F11, GF_KEY_F11, 0 },
+	{VK_F12, GF_KEY_F12, 0 },
+	{VK_F13, GF_KEY_F13, 0 },
+	{VK_F14, GF_KEY_F14, 0 },
+	{VK_F15, GF_KEY_F15, 0 },
+	{VK_F16, GF_KEY_F16, 0 },
+	{VK_F17, GF_KEY_F17, 0 },
+	{VK_F18, GF_KEY_F18, 0 },
+	{VK_F19, GF_KEY_F19, 0 },
+	{VK_F20, GF_KEY_F20, 0 },
+	{VK_F21, GF_KEY_F21, 0 },
+	{VK_F22, GF_KEY_F22, 0 },
+	{VK_F23, GF_KEY_F23, 0 },
+	{VK_F24, GF_KEY_F24, 0 },
+	{VK_NUMLOCK, GF_KEY_NUMLOCK, 0 },
+	{VK_SCROLL, GF_KEY_SCROLL, 0 },
+	{VK_LSHIFT, GF_KEY_SHIFT, GF_KEY_EXT_LEFT},
+	{VK_RSHIFT, GF_KEY_SHIFT, GF_KEY_EXT_RIGHT },
+	{VK_LCONTROL, GF_KEY_CONTROL, GF_KEY_EXT_LEFT },
+	{VK_RCONTROL, GF_KEY_CONTROL, GF_KEY_EXT_RIGHT },
+	{VK_LMENU, GF_KEY_ALT, GF_KEY_EXT_LEFT },
+	{VK_RMENU, GF_KEY_ALT, GF_KEY_EXT_RIGHT },
 #if(WINVER >= 0x0400)
-	case VK_PROCESSKEY:
-		evt->key_code = GF_KEY_PROCESS;
-		break;
+	{VK_PROCESSKEY, GF_KEY_PROCESS, 0},
 #endif /* WINVER >= 0x0400 */
+	{VK_ATTN, GF_KEY_ATTN, 0 },
+	{VK_CRSEL, GF_KEY_CRSEL, 0 },
+	{VK_EXSEL, GF_KEY_EXSEL, 0 },
+	{VK_EREOF, GF_KEY_ERASEEOF, 0 },
+	{VK_PLAY, GF_KEY_PLAY, 0 },
+	{VK_ZOOM, GF_KEY_ZOOM, 0 },
+	//{VK_NONAME, GF_KEY_NONAME, 0},
+	//{VK_PA1, GF_KEY_PA1, 0},
+	{VK_OEM_CLEAR, GF_KEY_CLEAR, 0 },
+};
+
+static u32 num_win_keys = sizeof(WINKeys) / sizeof(WINKeyToGPAC);
 
-	case VK_ATTN:
-		evt->key_code = GF_KEY_ATTN;
-		break;
-	case VK_CRSEL:
-		evt->key_code = GF_KEY_CRSEL;
-		break;
-	case VK_EXSEL:
-		evt->key_code = GF_KEY_EXSEL;
-		break;
-	case VK_EREOF:
-		evt->key_code = GF_KEY_ERASEEOF;
-		break;
-	case VK_PLAY:
-		evt->key_code = GF_KEY_PLAY;
-		break;
-	case VK_ZOOM:
-		evt->key_code = GF_KEY_ZOOM;
-		break;
-	//case VK_NONAME: evt->key_code = GF_KEY_NONAME; break;
-	//case VK_PA1: evt->key_code = GF_KEY_PA1; break;
-	case VK_OEM_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
+static void w32_translate_key(WPARAM wParam, LPARAM lParam, GF_EventKey *evt)
+{
+	u32 i;
+	evt->flags = 0;
+	evt->hw_code = (u32)wParam;
 
-	/*thru VK_9 are the same as ASCII '0' thru '9' (0x30 - 0x39) */
-	/* VK_A thru VK_Z are the same as ASCII 'A' thru 'Z' (0x41 - 0x5A) */
-	default:
-		if ((wParam>=0x30) && (wParam<=0x39))  evt->key_code = GF_KEY_0 + (u32) (wParam-0x30);
-		else if ((wParam>=0x41) && (wParam<=0x5A))  evt->key_code = GF_KEY_A + (u32) (wParam-0x41);
-		/*DOM 3 Events: Implementations that are unable to identify a key must use the key identifier "Unidentified".*/
-		else
-			evt->key_code = GF_KEY_UNIDENTIFIED;
-		break;
+	for (i = 0; i<num_win_keys; i++) {
+		if (WINKeys[i].win_key == (u32) wParam) {
+			evt->key_code = WINKeys[i].gf_key;
+			evt->flags = WINKeys[i].gf_flags;
+			return;
+		}
+	}
+
+	if ((wParam>=0x30) && (wParam<=0x39))
+		evt->key_code = GF_KEY_0 + (u32) (wParam-0x30);
+	else if ((wParam>=0x41) && (wParam<=0x5A))
+		evt->key_code = GF_KEY_A + (u32) (wParam-0x41);
+	/*DOM 3 Events: Implementations that are unable to identify a key must use the key identifier "Unidentified".*/
+	else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DX] Unrecognized key %X\n", wParam));
+		evt->key_code = GF_KEY_UNIDENTIFIED;
 	}
 }
 
@@ -530,9 +297,6 @@
 	case WM_ACTIVATE:
 		if (!ctx->on_secondary_screen && ctx->fullscreen && (LOWORD(wParam)==WA_INACTIVE)
 		        && (hWnd==ctx->fs_hwnd)
-#ifndef GPAC_DISABLE_3D
-		        && (ctx->output_3d_type!=2)
-#endif
 		   ) {
 			evt.type = GF_EVENT_SHOWHIDE_NOTIF;
 			vout->on_event(vout->evt_cbk_hdl, &evt);
@@ -576,7 +340,6 @@
 	case WM_DROPFILES:
 	{
 		char szFile[GF_MAX_PATH];
-		GF_Event evt;
 		u32 i;
 
 		HDROP hDrop = (HDROP) wParam;
@@ -870,9 +633,9 @@
 	SetWindowLong(hWnd, GWL_EXSTYLE, GetWindowLong(hWnd, GWL_EXSTYLE) | WS_EX_LAYERED);
 
 	/*get background ckey*/
-	opt = gf_modules_get_option((GF_BaseInterface *)vout, "Compositor", "ColorKey");
+	opt = gf_opts_get_key("filter@compositor", "ckey");
 	if (!opt) {
-		gf_modules_set_option((GF_BaseInterface *)vout, "Compositor", "ColorKey", "FFFEFEFE");
+		gf_opts_set_key("filter@compositor", "ckey", "FFFEFEFE");
 		opt = "FFFEFEFE";
 	}
 
@@ -931,7 +694,9 @@
 	ctx->force_alpha = (flags & GF_TERM_WINDOW_TRANSPARENT) ? GF_TRUE : GF_FALSE;
 
 	if (!ctx->os_hwnd) {
+#ifndef _WIN32_WCE
 		u32 styles;
+#endif
 		if (flags & GF_TERM_WINDOWLESS) ctx->windowless = GF_TRUE;
 
 
@@ -1132,10 +897,6 @@
 #endif
 	}
 
-#ifndef GPAC_DISABLE_3D
-	if (ctx->gl_hwnd) dd_closewindow(ctx->gl_hwnd);
-#endif
-
 	if (ctx->th) {
 		while (ctx->th_state!=2)
 			gf_sleep(10);
@@ -1163,9 +924,6 @@
 #endif
 	ctx->os_hwnd = NULL;
 	ctx->fs_hwnd = NULL;
-#ifndef GPAC_DISABLE_3D
-	ctx->gl_hwnd = NULL;
-#endif
 	the_video_output = NULL;
 }
 
@@ -1298,6 +1056,17 @@
 			}
 		}
 		break;
+	case GF_EVENT_SET_GL:
+#ifndef GPAC_DISABLE_3D
+		if (ctx->pb_HDC) {
+			if (!wglMakeCurrent(ctx->pb_HDC, ctx->pb_HRC))
+				return GF_IO_ERR;
+			return GF_OK;
+		}
+		if (!wglMakeCurrent(ctx->gl_HDC, ctx->gl_HRC))
+			return GF_IO_ERR;
+		return GF_OK;
+#endif
 	/*HW setup*/
 	case GF_EVENT_VIDEO_SETUP:
 		if (ctx->dd_lost) {
@@ -1305,32 +1074,23 @@
 			DestroyObjects(ctx);
 		}
 		ctx->is_setup = GF_TRUE;
-		switch (evt->setup.opengl_mode) {
-		case 0:
+		if (!evt->setup.use_opengl) {
 #ifndef GPAC_DISABLE_3D
-			ctx->output_3d_type = 0;
+			ctx->output_3d = GF_FALSE;
 #endif
 			return DD_SetBackBufferSize(dr, evt->setup.width, evt->setup.height, evt->setup.system_memory);
+		} else {
 #ifndef GPAC_DISABLE_3D
-		case 1:
-			ctx->output_3d_type = 1;
+			ctx->output_3d = GF_TRUE;
 			ctx->width = evt->setup.width;
 			ctx->height = evt->setup.height;
 			ctx->gl_double_buffer = evt->setup.back_buffer;
 			return DD_SetupOpenGL(dr, 0, 0);
-		case 2:
-			ctx->output_3d_type = 2;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DX Out] Attempting to resize Offscreen OpenGL window to %d x %d\n", evt->size.width, evt->size.height));
-			if (ctx->gl_hwnd)
-				SetWindowPos(ctx->gl_hwnd, NULL, 0, 0, evt->size.width, evt->size.height, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DX Out] Resizing Offscreen OpenGL window to %d x %d\n", evt->size.width, evt->size.height));
-			SetForegroundWindow(ctx->cur_hwnd);
-			ctx->gl_double_buffer = evt->setup.back_buffer;
-			return DD_SetupOpenGL(dr, evt->size.width, evt->size.height);
 #else
 			return GF_NOT_SUPPORTED;
 #endif
 		}
+
 	case GF_EVENT_SYS_COLORS:
 		evt->sys_cols.sys_colors[0] = get_sys_col(COLOR_ACTIVEBORDER);
 		evt->sys_cols.sys_colors[1] = get_sys_col(COLOR_ACTIVECAPTION);

gpac-1.0.0.tar.gz/modules/filter_export.cpp Added

@@ -0,0 +1,36 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC
+ *
+ *  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.
+ *
+ */
+
+/*this file is only used with Win32&MSVC to export the module interface symbols from each module DLL*/
+#include <gpac/setup.h>
+
+#if defined(_WIN32_WCE) || defined(_WIN64)
+#define EXPORT_SYMBOL(a) "/export:"#a
+#else
+#define EXPORT_SYMBOL(a) "/export:_"#a
+#endif
+
+#pragma comment (linker, EXPORT_SYMBOL(RegisterFilter) )
+

gpac-0.8.0.tar.gz/modules/ft_font/Makefile -> gpac-1.0.0.tar.gz/modules/ft_font/Makefile Changed

gpac-0.8.0.tar.gz/modules/ft_font/ft_font.c -> gpac-1.0.0.tar.gz/modules/ft_font/ft_font.c Changed

@@ -170,7 +170,7 @@
 				if (bold) strcat(szfont, " Bold");
 				if (italic) strcat(szfont, " Italic");
 			}
-			gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", szfont, file_path);
+			gf_opts_set_key("FontCache", szfont, file_path);
 
 			/*try to assign default fixed fonts*/
 			if (!bold && !italic) {
@@ -207,24 +207,12 @@
 static void ft_rescan_fonts(GF_FontReader *dr)
 {
 	u32 i, count;
-	GF_Config *cfg = gf_modules_get_config((GF_BaseInterface *)dr);
 	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) ));
 
-	count = gf_cfg_get_key_count(cfg, "FontEngine");
-	for (i=0; i<count; i++) {
-		const char *key = gf_cfg_get_key_name(cfg, "FontEngine", i);
-		if (!strcmp(key, "FontReader")) continue;
-		if (!strcmp(key, "FontDirectory")) continue;
-		if (!strcmp(key, "RescanFonts")) continue;
-		/*any other persistent options should go here*/
-
-		gf_cfg_set_key(cfg, "FontEngine", key, NULL);
-		count--;
-		i--;
-	}
-	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts", "no");
+	gf_opts_del_section("FontCache");
+	gf_opts_set_key("core", "rescan-fonts", "no");
 
 	if (ftpriv->font_fixed) gf_free(ftpriv->font_fixed);
 	ftpriv->font_fixed = NULL;
@@ -255,31 +243,30 @@
 	ftpriv->font_serif = NULL;
 
 	/* let's check we have fonts that match our default Bold/Italic/BoldItalic conventions*/
-	count = gf_cfg_get_key_count(cfg, "FontEngine");
+	count = gf_opts_get_key_count("FontCache");
 	for (i=0; i<count; i++) {
 		const char *opt;
 		char fkey[GF_MAX_PATH];
-		const char *key = gf_cfg_get_key_name(cfg, "FontEngine", i);
-		opt = gf_cfg_get_key(cfg, "FontEngine", key);
+		const char *key = gf_opts_get_key_name("FontCache", i);
+		opt = gf_opts_get_key("FontCache", key);
 		if (!strchr(opt, '/') && !strchr(opt, '\\')) continue;
-		if (!strcmp(key, "FontDirectory")) continue;
 
 		if (strstr(key, "Bold")) continue;
 		if (strstr(key, "Italic")) continue;
 
 		strcpy(fkey, key);
 		strcat(fkey, " Italic");
-		opt = gf_cfg_get_key(cfg, "FontEngine", fkey);
+		opt = gf_opts_get_key("FontCache", fkey);
 		if (!opt) continue;
 
 		strcpy(fkey, key);
 		strcat(fkey, " Bold");
-		opt = gf_cfg_get_key(cfg, "FontEngine", fkey);
+		opt = gf_opts_get_key("FontCache", fkey);
 		if (!opt) continue;
 
 		strcpy(fkey, key);
 		strcat(fkey, " Bold Italic");
-		opt = gf_cfg_get_key(cfg, "FontEngine", fkey);
+		opt = gf_opts_get_key("FontCache", fkey);
 		if (!opt) continue;
 
 		strcpy(fkey, key);
@@ -306,9 +293,9 @@
 	if (!ftpriv->font_sans) ftpriv->font_sans = gf_strdup(ftpriv->font_default ? ftpriv->font_default : "");
 	if (!ftpriv->font_fixed) ftpriv->font_fixed = gf_strdup(ftpriv->font_default ? ftpriv->font_default : "");
 
-	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed", ftpriv->font_fixed);
-	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif", ftpriv->font_serif);
-	gf_modules_set_option((GF_BaseInterface *)dr, "FontEngine", "FontSans", ftpriv->font_sans);
+	gf_opts_set_key("FontCache", "FontFixed", ftpriv->font_fixed);
+	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"));
 }
@@ -318,11 +305,14 @@
 static GF_Err ft_init_font_engine(GF_FontReader *dr)
 {
 	const char *sOpt;
+	Bool rescan = GF_FALSE;
 	FTBuilder *ftpriv = (FTBuilder *)dr->udta;
 
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontDirectory");
-	if (!sOpt) return GF_BAD_PARAM;
-
+	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"));
@@ -351,23 +341,29 @@
 		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;
+	}
 
-	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "RescanFonts");
-	if (!sOpt || !strcmp(sOpt, "yes") )
+	if (rescan)
 		ft_rescan_fonts(dr);
 
 	if (!ftpriv->font_serif) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSerif");
+		sOpt = gf_opts_get_key("FontCache", "FontSerif");
 		ftpriv->font_serif = gf_strdup(sOpt ? sOpt : "");
 	}
 
 	if (!ftpriv->font_sans) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontSans");
+		sOpt = gf_opts_get_key("FontCache", "FontSans");
 		ftpriv->font_sans = gf_strdup(sOpt ? sOpt : "");
 	}
 
 	if (!ftpriv->font_fixed) {
-		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", "FontFixed");
+		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) ));
@@ -382,8 +378,7 @@
 	ftpriv->active_face = NULL;
 	/*reset loaded fonts*/
 	while (gf_list_count(ftpriv->loaded_fonts)) {
-		FT_Face face = gf_list_get(ftpriv->loaded_fonts, 0);
-		gf_list_rem(ftpriv->loaded_fonts, 0);
+		FT_Face face = gf_list_pop_front(ftpriv->loaded_fonts);
 		FT_Done_Face(face);
 	}
 
@@ -451,6 +446,9 @@
 	fontName = (char *) OrigFontName;
 	ftpriv->active_face = NULL;
 
+	opt = gf_opts_get_key("temp_freetype", OrigFontName);
+	if (opt) return GF_NOT_SUPPORTED;
+
 	if (!fontName || !strlen(fontName) || !stricmp(fontName, "SERIF")) {
 		fontName = ftpriv->font_serif;
 	}
@@ -477,7 +475,7 @@
 		if (styles & GF_FONT_WEIGHT_BOLD & checkStyles) strcat(fname, " Bold");
 		if (styles & GF_FONT_ITALIC & checkStyles) strcat(fname, " Italic");
 
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "FontEngine", fname);
+		opt = gf_opts_get_key("FontCache", fname);
 
 		if (opt) {
 			FT_Face face;
@@ -502,8 +500,9 @@
 		}
 	}
 
-	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[FreeType] Font '%s' (%s) not found\n", fontName, fname));
+	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[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;
 }
 
@@ -573,7 +572,7 @@
 	s32 last_x, last_y;
 } ft_outliner;
 
-#if defined(GPAC_IPHONE) || defined(GPAC_ANDROID)
+#if defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_ANDROID)
 #define FTCST
 #else
 #define FTCST const
@@ -644,10 +643,8 @@
 
 	FT_Get_Glyph(ftpriv->active_face->glyph, (FT_Glyph*)&outline);
 
-#ifdef FT_GLYPH_FORMAT_OUTLINE
 	/*oops not vectorial...*/
-	if (outline->root.format != FT_GLYPH_FORMAT_OUTLINE) return NULL;
-#endif
+	if (outline->root.format==FT_GLYPH_FORMAT_BITMAP) return NULL;
 
 
 	GF_SAFEALLOC(glyph, GF_Glyph);

gpac-0.8.0.tar.gz/modules/ios_cam/ios_cam.c -> gpac-1.0.0.tar.gz/modules/ios_cam/ios_cam.c Changed

@@ -132,10 +132,7 @@
 static GF_Descriptor *CAM_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
 {
 	u32 trackID;
-	GF_ESD *esd;
 	IOSCamCtx *read;
-	GF_ObjectDescriptor *od;
-	GF_BitStream *bs;
 	char *buf;
 	u32 buf_size;
 	s32 color;
@@ -147,6 +144,9 @@
 	read->base_track_id = 0;
 
 	if (trackID && (expect_type==GF_MEDIA_OBJECT_VIDEO) ) {
+		GF_ESD *esd;
+		GF_ObjectDescriptor *od;
+		GF_BitStream *bs;
 		od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
 		od->objectDescriptorID = 1;
 
@@ -223,13 +223,13 @@
 int* decodeYUV420SP( char* yuv420sp, int width, int height)
 {
 	int frameSize = width * height;
-	int j, yp, uvp, i, y, y1192, r, g, b, u, v;
+	int j, yp, i, y, y1192, r, g, b;
 	int ti, tj;
 
 	int* rgb = (int*)gf_malloc(width*height*4);
 	for (j = 0, yp = 0, tj=height-1; j < height; j++, tj--)
 	{
-		uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
+		int uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
 		for (i = 0, ti=0; i < width; i++, yp++, ti+=width)
 		{
 			y = (0xff & ((int) yuv420sp[yp])) - 16;
@@ -315,7 +315,6 @@
 GF_Err CAM_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
 {
 	IOSCamCtx *read;
-	GF_BitStream *bs;
 	char *buf;
 	u32 buf_size;
 	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
@@ -348,6 +347,7 @@
 		return 1<<16;//gf_isom_get_pixel_aspect_ratio(read->mov, ch->track, 1, &com->par.hSpacing, &com->par.vSpacing);
 	case GF_NET_CHAN_GET_DSI:
 	{
+		GF_BitStream *bs;
 		s32 color;
 		s32 stride;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cam get DSI\n"));

gpac-0.8.0.tar.gz/modules/ios_mpegv/ios_mpegv.c -> gpac-1.0.0.tar.gz/modules/ios_mpegv/ios_mpegv.c Changed

gpac-0.8.0.tar.gz/modules/jack/Makefile -> gpac-1.0.0.tar.gz/modules/jack/Makefile Changed

gpac-0.8.0.tar.gz/modules/jack/jack.c -> gpac-1.0.0.tar.gz/modules/jack/jack.c Changed

@@ -1,14 +1,9 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Copyright (c) Pierre Souchay 2008
- *  History:
- *
- *  2008/02/19 - v1.1 (Pierre Souchay)
- *    first revision
- *  2008/03/11 - v1.2 (Pierre Souchay)
- *    added volume control
- *    fixed possible bug in latency computation (did not return the max value)
+ *			Authors: Pierre Souchay , Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2008-2019
+ *					All rights reserved
  *
  *  Jack audio output module : output audio thru the jackd daemon
  *
@@ -38,22 +33,6 @@
 #include <jack/ringbuffer.h>
 #include <gpac/modules/audio_out.h>
 
-#ifndef WIN32
-#include <unistd.h>
-int
-getPid ()
-{
-	return getpid ();
-}
-#else
-#include <windows.h>
-int
-getPid ()
-{
-	return GetCurrentProcessId();
-}
-#endif
-
 #define MAX_JACK_CLIENT_NAME_SZ 128
 /*
  * This structure defines the handle to a Jack driver
@@ -68,27 +47,19 @@
 	char *buffer;
 	u32 bufferSz;
 	u32 bytesPerSample;
-	char isActive;
-	char autoConnect;
-	char autoStartJackd;
+	Bool isActive;
+	Bool autoConnect;
 	jack_default_audio_sample_t **channels;
 	float volume;
 } JackContext;
 
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
 static void
 Jack_cleanup (JackContext * ctx)
 {
-	u32 channels = 0;
+	u32 channels;
 	if (ctx == NULL)
 		return;
-	ctx->isActive = 0;
+
 	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO, ("[Jack] Jack_cleanup\n"));
 	if (ctx->jack != NULL && ctx->isActive)
 	{
@@ -124,6 +95,7 @@
 	ctx->currentBlockSize = 0;
 	memset (ctx->jackClientName, 0, MAX_JACK_CLIENT_NAME_SZ);
 	ctx->jack = NULL;
+	ctx->isActive = 0;
 }
 
 /**
@@ -133,10 +105,8 @@
 process_callback (jack_nframes_t nframes, void *arg)
 {
 	unsigned int channel, i;
-	short *tmpBuffer;
 	size_t toRead;
 	size_t bytesToRead;
-	size_t readen;
 	GF_AudioOutput *dr = (GF_AudioOutput *) arg;
 	JackContext *ctx;
 	if (dr == NULL)
@@ -147,11 +117,12 @@
 	ctx = dr->opaque;
 	toRead = nframes * ctx->numChannels;
 	bytesToRead = toRead * ctx->bytesPerSample;
-	readen = dr->FillBuffer (dr->audio_renderer, (void *) ctx->buffer,
+	dr->FillBuffer (dr->audio_renderer, (void *) ctx->buffer,
 	                         bytesToRead);
-	toRead = readen / ctx->bytesPerSample;
+
 	if (ctx->bytesPerSample == 2)
 	{
+		short *tmpBuffer;
 		tmpBuffer = (short *) ctx->buffer;
 		for (channel = 0; channel < nframes; channel += ctx->numChannels)
 		{
@@ -233,73 +204,24 @@
 	return 0;
 }
 
-static const char *MODULE_NAME = "Jack";
-
-static const char *AUTO_CONNECT_OPTION = "AutoConnect";
-
-static const char *AUTO_START_JACKD_OPTION = "AutoStartJackd";
-
-static const char *TRUE_OPTION = "true";
-
-static const char *YES_OPTION = "yes";
-
-static char
-optionIsTrue (const char *optionValue)
-{
-	return (0 == strcasecmp (TRUE_OPTION, optionValue) ||
-	        0 == strcasecmp (YES_OPTION, optionValue)
-	        || 0 == strcmp ("1", optionValue));
-}
-
-
 static GF_Err
 Jack_Setup (GF_AudioOutput * dr, void *os_handle, u32 num_buffers,
             u32 total_duration)
 {
-	const char *opt;
 	JackContext *ctx = (JackContext *) dr->opaque;
 	jack_status_t status;
 	jack_options_t options = JackNullOption;
 
 	memset (ctx->jackClientName, 0, MAX_JACK_CLIENT_NAME_SZ);
-	snprintf (ctx->jackClientName, MAX_JACK_CLIENT_NAME_SZ, "gpac-%d",
-	          getPid ());
+	snprintf (ctx->jackClientName, MAX_JACK_CLIENT_NAME_SZ, "gpac-%d", gf_sys_get_process_id() );
 
-	opt =
-	    gf_modules_get_option ((GF_BaseInterface *) dr, MODULE_NAME,
-	                           AUTO_CONNECT_OPTION);
-	if (opt != NULL)
-	{
-		if (optionIsTrue (opt))
-			ctx->autoConnect = TRUE;
-		else
-			ctx->autoConnect = FALSE;
-	}
-	else
-	{
-		ctx->autoConnect = TRUE;
-		gf_modules_set_option ((GF_BaseInterface *) dr, MODULE_NAME,
-		                       AUTO_CONNECT_OPTION, YES_OPTION);
-	}
-	opt = gf_modules_get_option ((GF_BaseInterface *) dr, MODULE_NAME,
-	                             AUTO_START_JACKD_OPTION);
-	if (opt != NULL)
-	{
-		if (optionIsTrue (opt))
-			ctx->autoStartJackd = TRUE;
-		else
-			ctx->autoStartJackd = FALSE;
-	}
-	else
-	{
-		ctx->autoStartJackd = TRUE;
-		gf_modules_set_option ((GF_BaseInterface *) dr, MODULE_NAME,
-		                       AUTO_START_JACKD_OPTION, YES_OPTION);
-	}
-	if (!ctx->autoStartJackd)
-	{
+	ctx->autoConnect = GF_TRUE;
+	if (gf_opts_get_bool("Jack", "NoAutoConnect"))
+		ctx->autoConnect = GF_FALSE;
+
+	if (gf_opts_get_bool("Jack", "NoStartServer"))
 		options |= JackNoStartServer;
-	}
+
 	ctx->jack = jack_client_open (ctx->jackClientName, options, &status, NULL);
 	if (status & JackNameNotUnique)
 	{
@@ -330,8 +252,7 @@
 #define JACK_PORT_NAME_MAX_SZ 128
 
 static GF_Err
-Jack_ConfigureOutput (GF_AudioOutput * dr, u32 * SampleRate, u32 * NbChannels,
-                      u32 * nbBitsPerSample, u32 channel_cfg)
+Jack_Configure(GF_AudioOutput * dr, u32 * SampleRate, u32 * NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	u32 channels;
 	u32 i;
@@ -339,18 +260,24 @@
 	JackContext *ctx = (JackContext *) dr->opaque;
 	if (!ctx)
 		return GF_BAD_PARAM;
-	ctx->bytesPerSample = *nbBitsPerSample / 8;
-	if (ctx->bytesPerSample > 2 || ctx->bytesPerSample < 1)
-	{
-		GF_LOG (GF_LOG_ERROR, GF_LOG_MMIO,
-		        ("[Jack] Jack-ConfigureOutput : unable to use %d bits/sample.\n"));
-		return GF_BAD_PARAM;
+
+	//only support for PCM 8/16/24/32 packet mode
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+		ctx->bytesPerSample = 1;
+		break;
+	default:
+		//otherwise force PCM16
+		*audioFormat = GF_AUDIO_FMT_S16;
+	case GF_AUDIO_FMT_S16:
+		ctx->bytesPerSample = 2;
+		break;
 	}
 	ctx->numChannels = *NbChannels;
 	*SampleRate = jack_get_sample_rate (ctx->jack);
 	GF_LOG (GF_LOG_DEBUG, GF_LOG_MMIO,
-	        ("[Jack] Jack_ConfigureOutput channels=%d, srate=%d bits/sample=%d\n",
-	         *NbChannels, *SampleRate, *nbBitsPerSample));
+	        ("[Jack] Jack_ConfigureOutput channels=%d, srate=%d audio format %s\n",
+	         *NbChannels, *SampleRate, gf_audio_fmt_name(*audioFormat) ));
 	if (ctx->jackPorts == NULL)
 		ctx->jackPorts = gf_calloc (ctx->numChannels, sizeof (jack_port_t *));
 	if (ctx->jackPorts == NULL)
@@ -369,7 +296,9 @@
 			if (ctx->jackPorts[channels] == NULL)
 				goto exit_cleanup;
 		}
-		onBufferSizeChanged (jack_get_buffer_size (ctx->jack), dr);
+//		onBufferSizeChanged (jack_get_buffer_size (ctx->jack), dr);
+//		if (!ctx->jack) return GF_IO_ERR;
+
 		jack_set_buffer_size_callback (ctx->jack, onBufferSizeChanged, dr);
 		jack_set_process_callback (ctx->jack, process_callback, dr);
 	}
@@ -403,7 +332,7 @@
 				}
 			}
 		}
-		ctx->isActive = TRUE;
+		ctx->isActive = GF_TRUE;
 	}
 	return GF_OK;
 exit_cleanup:
@@ -501,7 +430,7 @@
 	driv->SelfThreaded = 1;
 	driv->Setup = Jack_Setup;
 	driv->Shutdown = Jack_Shutdown;
-	driv->ConfigureOutput = Jack_ConfigureOutput;
+	driv->Configure = Jack_Configure;
 	driv->GetAudioDelay = Jack_GetAudioDelay;
 	driv->SetVolume = Jack_SetVolume;
 	driv->SetPan = Jack_SetPan;
@@ -516,9 +445,8 @@
 	ctx->buffer = NULL;
 	ctx->bufferSz = 0;
 	ctx->bytesPerSample = 0;
-	ctx->isActive = FALSE;
-	ctx->autoConnect = FALSE;
-	ctx->autoStartJackd = FALSE;
+	ctx->isActive = GF_FALSE;
+	ctx->autoConnect = GF_FALSE;
 	ctx->volume = 1.0;
 
 	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE,

gpac-0.8.0.tar.gz/modules/pulseaudio/Makefile -> gpac-1.0.0.tar.gz/modules/pulseaudio/Makefile Changed

gpac-0.8.0.tar.gz/modules/pulseaudio/pulseaudio.c -> gpac-1.0.0.tar.gz/modules/pulseaudio/pulseaudio.c Changed

@@ -1,12 +1,10 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Copyright (c) Pierre Souchay 2008
+ *			Authors: Pierre Souchay , Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2008-2019
+ *					All rights reserved
  *
- *  History:
- *
- *  2008/03/30 - v1.1 (Pierre Souchay)
- *    first revision
  *
  *  PulseAudio output module : output audio thru the PulseAudio daemon
  *
@@ -61,16 +59,6 @@
 	ctx->playback_handle = NULL;
 }
 
-static const char *MODULE_NAME = "PulseAudio";
-
-static const char *OUTPUT_NAME = "OutputName";
-
-static const char *OUTPUT_DESCRIPTION = "OutputDescription";
-
-static const char *DEFAULT_OUTPUT_NAME = "GPAC";
-
-static const char *DEFAULT_OUTPUT_DESCRIPTION = "GPAC Output";
-
 static GF_Err
 PulseAudio_Setup (GF_AudioOutput * dr, void *os_handle,
                   u32 num_buffers, u32 total_duration)
@@ -79,30 +67,11 @@
 	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
 	if (ctx == NULL)
 		return GF_BAD_PARAM;
-	opt = gf_modules_get_option ((GF_BaseInterface *) dr, MODULE_NAME,
-	                             OUTPUT_NAME);
-	ctx->output_name = DEFAULT_OUTPUT_NAME;
-	if (opt != NULL)
-	{
-		ctx->output_name = opt;
-	}
-	else
-	{
-		gf_modules_set_option ((GF_BaseInterface *) dr, MODULE_NAME,
-		                       OUTPUT_NAME, DEFAULT_OUTPUT_NAME);
-	}
-	opt = gf_modules_get_option ((GF_BaseInterface *) dr, MODULE_NAME,
-	                             OUTPUT_DESCRIPTION);
-	ctx->output_description = DEFAULT_OUTPUT_DESCRIPTION;
-	if (opt != NULL)
-	{
-		ctx->output_description = opt;
-	}
-	else
-	{
-		gf_modules_set_option ((GF_BaseInterface *) dr, MODULE_NAME,
-		                       OUTPUT_DESCRIPTION, DEFAULT_OUTPUT_DESCRIPTION);
-	}
+	opt = gf_opts_get_key("PulseAudio", "Name");
+	ctx->output_name = opt ? ctx->output_name : "GPAC";
+
+	opt = gf_opts_get_key("PulseAudio", "Description");
+	ctx->output_description = opt  ? opt  : "GPAC Output";
 	return GF_OK;
 }
 
@@ -129,9 +98,7 @@
 }
 
 static GF_Err
-PulseAudio_ConfigureOutput (GF_AudioOutput * dr, u32 * SampleRate,
-                            u32 * NbChannels, u32 * nbBitsPerSample,
-                            u32 channel_cfg)
+PulseAudio_Configure(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	int pa_error = 0;
 	PulseAudioContext *ctx = (PulseAudioContext *) dr->opaque;
@@ -144,6 +111,10 @@
 		pa_simple_free (ctx->playback_handle);
 		ctx->playback_handle = NULL;
 	}
+
+	//only support for PCM 16
+	*audioFormat = GF_AUDIO_FMT_S16;
+
 	ctx->consecutive_zero_reads = 0;
 	ctx->sample_spec.format = PA_SAMPLE_S16NE;
 	ctx->sample_spec.channels = *NbChannels;
@@ -190,7 +161,7 @@
 	if (written <= 0)
 	{
 		ctx->consecutive_zero_reads++;
-		if (ctx->consecutive_zero_reads > 5) {
+		if (ctx->consecutive_zero_reads < 5) {
 			gf_sleep(5);
 		} else if (ctx->consecutive_zero_reads < 25) {
 			gf_sleep(10);
@@ -200,7 +171,7 @@
 		return;
 	}
 	ctx->consecutive_zero_reads = 0;
-	written = pa_simple_write (ctx->playback_handle, data, written, &pa_error);
+	/*written = */pa_simple_write (ctx->playback_handle, data, written, &pa_error);
 	if (pa_error != 0)
 	{
 		if (ctx->errors < 1)
@@ -214,23 +185,6 @@
 	}
 }
 
-static void
-PulseAudio_SetVolume (GF_AudioOutput * dr, u32 Volume)
-{
-	GF_LOG (GF_LOG_WARNING, GF_LOG_MMIO,
-	        ("[PulseAudio] Set volume to %lu: not yet implemented.\n", Volume));
-}
-
-static void
-PulseAudio_SetPan (GF_AudioOutput * dr, u32 Pan)
-{
-}
-
-static void
-PulseAudio_SetPriority (GF_AudioOutput * dr, u32 Priority)
-{
-}
-
 static u32
 PulseAudio_GetAudioDelay (GF_AudioOutput * dr)
 {
@@ -258,15 +212,6 @@
 	return ms_delay;
 }
 
-static GF_Err
-PulseAudio_QueryOutputSampleRate (GF_AudioOutput * dr, u32 * desired_sr,
-                                  u32 * NbChannels, u32 * nbBitsPerSample)
-{
-	/**
-	 * PulseAudio can do the resampling by itself and play any number of channels
-	 */
-	return GF_OK;
-}
 
 void *
 NewPulseAudioOutput ()
@@ -289,14 +234,10 @@
 	driv->SelfThreaded = 0;
 	driv->Setup = PulseAudio_Setup;
 	driv->Shutdown = PulseAudio_Shutdown;
-	driv->ConfigureOutput = PulseAudio_ConfigureOutput;
+	driv->Configure = PulseAudio_Configure;
 	driv->GetAudioDelay = PulseAudio_GetAudioDelay;
-	driv->SetVolume = PulseAudio_SetVolume;
-	driv->SetPan = PulseAudio_SetPan;
-	driv->SetPriority = PulseAudio_SetPriority;
-	driv->QueryOutputSampleRate = PulseAudio_QueryOutputSampleRate;
 	driv->WriteAudio = PulseAudio_WriteAudio;
-	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE, MODULE_NAME, "gpac distribution");
+	GF_REGISTER_MODULE_INTERFACE (driv, GF_AUDIO_OUTPUT_INTERFACE, "PulseAudio", "gpac distribution");
 	return driv;
 }

gpac-0.8.0.tar.gz/modules/sdl_out/Makefile -> gpac-1.0.0.tar.gz/modules/sdl_out/Makefile Changed

gpac-0.8.0.tar.gz/modules/sdl_out/audio.c -> gpac-1.0.0.tar.gz/modules/sdl_out/audio.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-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / SDL audio and video module
@@ -43,11 +43,11 @@
 			ctx->alloc_size = len;
 		}
 		memset(stream, 0, len);
-		written = dr->FillBuffer(dr->audio_renderer, (char *) ctx->audioBuff, (u32) len);
+		written = dr->FillBuffer(dr->audio_renderer, ctx->audioBuff, (u32) len);
 		if (written)
 			SDL_MixAudio(stream, ctx->audioBuff, len, ctx->volume);
 	} else {
-		dr->FillBuffer(dr->audio_renderer, (char *) stream, (u32) len);
+		dr->FillBuffer(dr->audio_renderer, stream, (u32) len);
 	}
 }
 
@@ -120,7 +120,7 @@
 	gf_free( dr );
 }
 
-static GF_Err SDLAud_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+static GF_Err SDLAud_Configure(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	s32 nb_samples;
 	SDL_AudioSpec want_format, got_format;
@@ -131,7 +131,29 @@
 
 	memset(&want_format, 0, sizeof(SDL_AudioSpec));
 	want_format.freq = *SampleRate;
-	want_format.format = (*nbBitsPerSample==16) ? AUDIO_S16SYS : AUDIO_S8;
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+	case GF_AUDIO_FMT_U8P:
+		want_format.format = AUDIO_U8;
+		break;
+	case GF_AUDIO_FMT_S16:
+	case GF_AUDIO_FMT_S16P:
+		want_format.format = AUDIO_S16;
+		break;
+#if SDL_VERSION_ATLEAST(2,0,0)
+	case GF_AUDIO_FMT_S32:
+	case GF_AUDIO_FMT_S32P:
+		want_format.format = AUDIO_S32;
+		break;
+	case GF_AUDIO_FMT_FLT:
+	case GF_AUDIO_FMT_FLTP:
+		want_format.format = AUDIO_F32;
+		break;
+#endif
+	default:
+		want_format.format = AUDIO_S16;
+		break;
+	}
 	want_format.channels = *NbChannels;
 	want_format.callback = sdl_fill_audio;
 	want_format.userdata = dr;
@@ -158,10 +180,21 @@
 	switch (got_format.format) {
 	case AUDIO_S8:
 	case AUDIO_U8:
-		*nbBitsPerSample = 8;
+		*audioFormat = GF_AUDIO_FMT_U8;
+		break;
+	case AUDIO_S16:
+		*audioFormat = GF_AUDIO_FMT_S16;
+		break;
+#if SDL_VERSION_ATLEAST(2,0,0)
+	case AUDIO_S32:
+		*audioFormat = GF_AUDIO_FMT_S32;
+		break;
+	case AUDIO_F32:
+		*audioFormat = GF_AUDIO_FMT_FLT;
 		break;
+#endif
 	default:
-		*nbBitsPerSample = 16;
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Error, unhandled audio format %s, requesting PCM s16\n", got_format.format));
 		break;
 	}
 	/*and play*/
@@ -229,7 +262,7 @@
 
 	dr->Setup = SDLAud_Setup;
 	dr->Shutdown = SDLAud_Shutdown;
-	dr->ConfigureOutput = SDLAud_ConfigureOutput;
+	dr->Configure = SDLAud_Configure;
 	dr->SetVolume = SDLAud_SetVolume;
 	dr->SetPan = SDLAud_SetPan;
 	dr->Play = SDLAud_Play;

gpac-0.8.0.tar.gz/modules/sdl_out/sdl_out.h -> gpac-1.0.0.tar.gz/modules/sdl_out/sdl_out.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-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / SDL audio and video module
@@ -67,22 +67,21 @@
 	Bool use_systems_memory;
 
 
+	Bool disable_vsync;
+
 #if SDL_VERSION_ATLEAST(2,0,0)
 	char szCaption[100];
 	Bool enable_defer_mode;
 	Bool needs_clear;
 	Bool needs_bb_flush;
 	Bool needs_bb_grab;
-#if defined(__APPLE__) && !defined(GPAC_IPHONE)
-	Bool disable_vsync;
-#endif
 
 	SDL_GLContext gl_context;
 	SDL_Renderer *renderer;
 	SDL_Window *screen;
 
 	SDL_Texture *tx_back_buffer;
-	char *back_buffer_pixels;
+	u8 *back_buffer_pixels;
 
 	SDL_Texture *pool_rgb, *pool_rgba, *pool_yuv;
 
@@ -98,7 +97,7 @@
 
 	SDL_Surface *offscreen_gl;
 
-	u32 output_3d_type;
+	Bool output_3d;
 	void *os_handle;
 
 	Bool force_alpha, hidden;
@@ -120,7 +119,7 @@
 {
 	u32 num_buffers, total_duration, delay_ms, total_size, volume, alloc_size;
 	Bool is_init, is_running;
-	Uint8 * audioBuff;
+	u8 * audioBuff;
 } SDLAudCtx;
 
 void SDL_DeleteAudio(void *ifce);

gpac-0.8.0.tar.gz/modules/sdl_out/video.c -> gpac-1.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-2012
+*			Copyright (c) Telecom ParisTech 2000-2020
 *					All rights reserved
 *
 *  This file is part of GPAC / SDL audio and video module
@@ -30,11 +30,15 @@
 #include <windows.h>
 #endif
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #include <OpenGLES/ES1/gl.h>
 #include <OpenGLES/ES1/glext.h>
 #endif
 
+#ifndef _WIN32_WCE
+#include <locale.h>
+#endif
+
 /*cursors data*/
 static char hand_data[] =
 {
@@ -156,7 +160,7 @@
 	1152, 864,
 	1280, 1024
 };
-static u32 nb_video_modes = 8;
+static const u32 nb_video_modes = 8;
 
 void SDLVid_SetCaption()
 {
@@ -203,373 +207,153 @@
 	return SDL_CreateCursor(data, mask, 32, 32, 0, 0);
 }
 
-
-static void sdl_translate_key(u32 SDLkey, GF_EventKey *evt)
+typedef struct
 {
-	evt->flags = 0;
-	evt->hw_code = SDLkey;
-	switch (SDLkey) {
-	case SDLK_BACKSPACE:
-		evt->key_code = GF_KEY_BACKSPACE;
-		break;
-	case SDLK_TAB:
-		evt->key_code = GF_KEY_TAB;
-		break;
-	case SDLK_CLEAR:
-		evt->key_code = GF_KEY_CLEAR;
-		break;
-	case SDLK_PAUSE:
-		evt->key_code = GF_KEY_PAUSE;
-		break;
-	case SDLK_ESCAPE:
-		evt->key_code = GF_KEY_ESCAPE;
-		break;
-	case SDLK_SPACE:
-		evt->key_code = GF_KEY_SPACE;
-		break;
-
-	case SDLK_KP_ENTER:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_RETURN:
-		evt->key_code = GF_KEY_ENTER;
-		break;
-
-	case SDLK_KP_MULTIPLY:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_ASTERISK:
-		evt->key_code = GF_KEY_STAR;
-		break;
-	case SDLK_KP_PLUS:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_PLUS:
-		evt->key_code = GF_KEY_PLUS;
-		break;
-	case SDLK_KP_MINUS:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_MINUS:
-		evt->key_code = GF_KEY_HYPHEN;
-		break;
-	case SDLK_KP_DIVIDE:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_SLASH:
-		evt->key_code = GF_KEY_SLASH;
-		break;
+	u32 sdl_key;
+	u32 gf_key;
+	u32 gf_flags;
+} SDLKeyToGPAC;
 
-	case SDLK_KP_0:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_0:
-		evt->key_code = GF_KEY_0;
-		break;
-	case SDLK_KP_1:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_1:
-		evt->key_code = GF_KEY_1;
-		break;
-	case SDLK_KP_2:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_2:
-		evt->key_code = GF_KEY_2;
-		break;
-	case SDLK_KP_3:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_3:
-		evt->key_code = GF_KEY_3;
-		break;
-	case SDLK_KP_4:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_4:
-		evt->key_code = GF_KEY_4;
-		break;
-	case SDLK_KP_5:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_5:
-		evt->key_code = GF_KEY_5;
-		break;
-	case SDLK_KP_6:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_6:
-		evt->key_code = GF_KEY_6;
-		break;
-	case SDLK_KP_7:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_7:
-		evt->key_code = GF_KEY_7;
-		break;
-	case SDLK_KP_8:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_8:
-		evt->key_code = GF_KEY_8;
-		break;
-	case SDLK_KP_9:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_9:
-		evt->key_code = GF_KEY_9;
-		break;
-	case SDLK_KP_PERIOD:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_PERIOD:
-		evt->key_code = GF_KEY_FULLSTOP;
-		break;
-	case SDLK_KP_EQUALS:
-		evt->flags = GF_KEY_EXT_NUMPAD;
-	case SDLK_EQUALS:
-		evt->key_code = GF_KEY_EQUALS;
-		break;
-
-	case SDLK_EXCLAIM:
-		evt->key_code = GF_KEY_EXCLAMATION;
-		break;
-	case SDLK_QUOTEDBL:
-		evt->key_code = GF_KEY_QUOTATION;
-		break;
-	case SDLK_HASH:
-		evt->key_code = GF_KEY_NUMBER;
-		break;
-	case SDLK_DOLLAR:
-		evt->key_code = GF_KEY_DOLLAR;
-		break;
-	case SDLK_AMPERSAND:
-		evt->key_code = GF_KEY_AMPERSAND;
-		break;
-	case SDLK_QUOTE:
-		evt->key_code = GF_KEY_APOSTROPHE;
-		break;
-	case SDLK_LEFTPAREN:
-		evt->key_code = GF_KEY_LEFTPARENTHESIS;
-		break;
-	case SDLK_RIGHTPAREN:
-		evt->key_code = GF_KEY_RIGHTPARENTHESIS;
-		break;
-	case SDLK_COMMA:
-		evt->key_code = GF_KEY_COMMA;
-		break;
-	case SDLK_COLON:
-		evt->key_code = GF_KEY_COLON;
-		break;
-	case SDLK_SEMICOLON:
-		evt->key_code = GF_KEY_SEMICOLON;
-		break;
-	case SDLK_LESS:
-		evt->key_code = GF_KEY_LESSTHAN;
-		break;
-	case SDLK_GREATER:
-		evt->key_code = GF_KEY_GREATERTHAN;
-		break;
-	case SDLK_QUESTION:
-		evt->key_code = GF_KEY_QUESTION;
-		break;
-	case SDLK_AT:
-		evt->key_code = GF_KEY_AT;
-		break;
-	case SDLK_LEFTBRACKET:
-		evt->key_code = GF_KEY_LEFTSQUAREBRACKET;
-		break;
-	case SDLK_RIGHTBRACKET:
-		evt->key_code = GF_KEY_RIGHTSQUAREBRACKET;
-		break;
-	case SDLK_BACKSLASH:
-		evt->key_code = GF_KEY_BACKSLASH;
-		break;
-	case SDLK_UNDERSCORE:
-		evt->key_code = GF_KEY_UNDERSCORE;
-		break;
-	case SDLK_BACKQUOTE:
-		evt->key_code = GF_KEY_GRAVEACCENT;
-		break;
-	case SDLK_DELETE:
-		evt->key_code = GF_KEY_DEL;
-		break;
-	case SDLK_UNDO:
-		evt->key_code = GF_KEY_UNDO;
-		break;
-
-	case SDLK_UP:
-		evt->key_code = GF_KEY_UP;
-		break;
-	case SDLK_DOWN:
-		evt->key_code = GF_KEY_DOWN;
-		break;
-	case SDLK_RIGHT:
-		evt->key_code = GF_KEY_RIGHT;
-		break;
-	case SDLK_LEFT:
-		evt->key_code = GF_KEY_LEFT;
-		break;
-	case SDLK_INSERT:
-		evt->key_code = GF_KEY_INSERT;
-		break;
-	case SDLK_HOME:
-		evt->key_code = GF_KEY_HOME;
-		break;
-	case SDLK_END:
-		evt->key_code = GF_KEY_END;
-		break;
-	case SDLK_PAGEUP:
-		evt->key_code = GF_KEY_PAGEUP;
-		break;
-	case SDLK_PAGEDOWN:
-		evt->key_code = GF_KEY_PAGEDOWN;
-		break;
-	case SDLK_F1:
-		evt->key_code = GF_KEY_F1;
-		break;
-	case SDLK_F2:
-		evt->key_code = GF_KEY_F2;
-		break;
-	case SDLK_F3:
-		evt->key_code = GF_KEY_F3;
-		break;
-	case SDLK_F4:
-		evt->key_code = GF_KEY_F4;
-		break;
-	case SDLK_F5:
-		evt->key_code = GF_KEY_F5;
-		break;
-	case SDLK_F6:
-		evt->key_code = GF_KEY_F6;
-		break;
-	case SDLK_F7:
-		evt->key_code = GF_KEY_F7;
-		break;
-	case SDLK_F8:
-		evt->key_code = GF_KEY_F8;
-		break;
-	case SDLK_F9:
-		evt->key_code = GF_KEY_F9;
-		break;
-	case SDLK_F10:
-		evt->key_code = GF_KEY_F10;
-		break;
-	case SDLK_F11:
-		evt->key_code = GF_KEY_F11;
-		break;
-	case SDLK_F12:
-		evt->key_code = GF_KEY_F12;
-		break;
-	case SDLK_F13:
-		evt->key_code = GF_KEY_F13;
-		break;
-	case SDLK_F14:
-		evt->key_code = GF_KEY_F14;
-		break;
-	case SDLK_F15:
-		evt->key_code = GF_KEY_F15;
-		break;
-	case SDLK_NUMLOCKCLEAR:
-		evt->key_code = GF_KEY_NUMLOCK;
-		break;
-	case SDLK_CAPSLOCK:
-		evt->key_code = GF_KEY_CAPSLOCK;
-		break;
-	case SDLK_SCROLLLOCK:
-		evt->key_code = GF_KEY_SCROLL;
-		break;
-
-	case SDLK_RSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case SDLK_LSHIFT:
-		evt->key_code = GF_KEY_SHIFT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case SDLK_LCTRL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case SDLK_RCTRL:
-		evt->key_code = GF_KEY_CONTROL;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case SDLK_LALT:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
-	case SDLK_RALT:
-		evt->key_code = GF_KEY_ALT;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
+static SDLKeyToGPAC SDLKeys[] =
+{
+	{SDLK_BACKSPACE, GF_KEY_BACKSPACE, 0},
+	{SDLK_TAB, GF_KEY_TAB, 0},
+	{SDLK_CLEAR, GF_KEY_CLEAR, 0},
+	{SDLK_PAUSE, GF_KEY_PAUSE, 0},
+	{SDLK_ESCAPE, GF_KEY_ESCAPE, 0},
+	{SDLK_SPACE, GF_KEY_SPACE, 0},
+	{SDLK_KP_ENTER, GF_KEY_EXT_NUMPAD, 0},
+	{SDLK_RETURN, GF_KEY_ENTER, 0},
+	{SDLK_KP_MULTIPLY, GF_KEY_EXT_NUMPAD, 0},
+	{SDLK_ASTERISK, GF_KEY_STAR, 0},
+	{SDLK_KP_PLUS, GF_KEY_EXT_NUMPAD, 0},
+	{SDLK_PLUS, GF_KEY_PLUS, 0},
+	{SDLK_KP_MINUS, GF_KEY_EXT_NUMPAD, 0},
+	{SDLK_MINUS, GF_KEY_HYPHEN, 0},
+	{SDLK_KP_DIVIDE, GF_KEY_EXT_NUMPAD, 0},
+	{SDLK_SLASH, GF_KEY_SLASH, 0},
+	{SDLK_KP_0, GF_KEY_0, GF_KEY_EXT_NUMPAD},
+	{SDLK_0, GF_KEY_0, 0},
+	{SDLK_KP_1, GF_KEY_1, GF_KEY_EXT_NUMPAD},
+	{SDLK_1, GF_KEY_1, 0},
+	{SDLK_KP_2, GF_KEY_2, GF_KEY_EXT_NUMPAD},
+	{SDLK_2, GF_KEY_2, 0},
+	{SDLK_KP_3, GF_KEY_3, GF_KEY_EXT_NUMPAD},
+	{SDLK_3, GF_KEY_3, 0},
+	{SDLK_KP_4, GF_KEY_4, GF_KEY_EXT_NUMPAD},
+	{SDLK_4, GF_KEY_4, 0},
+	{SDLK_KP_5, GF_KEY_5, GF_KEY_EXT_NUMPAD},
+	{SDLK_5, GF_KEY_5, 0},
+	{SDLK_KP_6, GF_KEY_6, GF_KEY_EXT_NUMPAD},
+	{SDLK_6, GF_KEY_6, 0},
+	{SDLK_KP_7, GF_KEY_7, GF_KEY_EXT_NUMPAD},
+	{SDLK_7, GF_KEY_7, 0},
+	{SDLK_KP_8, GF_KEY_8, GF_KEY_EXT_NUMPAD},
+	{SDLK_8, GF_KEY_8, 0},
+	{SDLK_KP_9, GF_KEY_9, GF_KEY_EXT_NUMPAD},
+	{SDLK_9, GF_KEY_9, 0},
+	{SDLK_KP_PERIOD, GF_KEY_FULLSTOP, GF_KEY_EXT_NUMPAD},
+	{SDLK_PERIOD, GF_KEY_FULLSTOP, 0},
+	{SDLK_KP_EQUALS, GF_KEY_EQUALS, GF_KEY_EXT_NUMPAD},
+	{SDLK_EQUALS, GF_KEY_EQUALS, 0},
+	{SDLK_EXCLAIM, GF_KEY_EXCLAMATION, 0},
+	{SDLK_QUOTEDBL, GF_KEY_QUOTATION, 0},
+	{SDLK_HASH, GF_KEY_NUMBER, 0},
+	{SDLK_DOLLAR, GF_KEY_DOLLAR, 0},
+	{SDLK_AMPERSAND, GF_KEY_AMPERSAND, 0},
+	{SDLK_QUOTE, GF_KEY_APOSTROPHE, 0},
+	{SDLK_LEFTPAREN, GF_KEY_LEFTPARENTHESIS, 0},
+	{SDLK_RIGHTPAREN, GF_KEY_RIGHTPARENTHESIS, 0},
+	{SDLK_COMMA, GF_KEY_COMMA, 0},
+	{SDLK_COLON, GF_KEY_COLON, 0},
+	{SDLK_SEMICOLON, GF_KEY_SEMICOLON, 0},
+	{SDLK_LESS, GF_KEY_LESSTHAN, 0},
+	{SDLK_GREATER, GF_KEY_GREATERTHAN, 0},
+	{SDLK_QUESTION, GF_KEY_QUESTION, 0},
+	{SDLK_AT, GF_KEY_AT, 0},
+	{SDLK_LEFTBRACKET, GF_KEY_LEFTSQUAREBRACKET, 0},
+	{SDLK_RIGHTBRACKET, GF_KEY_RIGHTSQUAREBRACKET, 0},
+	{SDLK_BACKSLASH, GF_KEY_BACKSLASH, 0},
+	{SDLK_UNDERSCORE, GF_KEY_UNDERSCORE, 0},
+	{SDLK_BACKQUOTE, GF_KEY_GRAVEACCENT, 0},
+	{SDLK_DELETE, GF_KEY_DEL, 0},
+	{SDLK_UNDO, GF_KEY_UNDO, 0},
+	{SDLK_UP, GF_KEY_UP, 0},
+	{SDLK_DOWN, GF_KEY_DOWN, 0},
+	{SDLK_RIGHT, GF_KEY_RIGHT, 0},
+	{SDLK_LEFT, GF_KEY_LEFT, 0},
+	{SDLK_INSERT, GF_KEY_INSERT, 0},
+	{SDLK_HOME, GF_KEY_HOME, 0},
+	{SDLK_END, GF_KEY_END, 0},
+	{SDLK_PAGEUP, GF_KEY_PAGEUP, 0},
+	{SDLK_PAGEDOWN, GF_KEY_PAGEDOWN, 0},
+	{SDLK_F1, GF_KEY_F1, 0},
+	{SDLK_F2, GF_KEY_F2, 0},
+	{SDLK_F3, GF_KEY_F3, 0},
+	{SDLK_F4, GF_KEY_F4, 0},
+	{SDLK_F5, GF_KEY_F5, 0},
+	{SDLK_F6, GF_KEY_F6, 0},
+	{SDLK_F7, GF_KEY_F7, 0},
+	{SDLK_F8, GF_KEY_F8, 0},
+	{SDLK_F9, GF_KEY_F9, 0},
+	{SDLK_F10, GF_KEY_F10, 0},
+	{SDLK_F11, GF_KEY_F11, 0},
+	{SDLK_F12, GF_KEY_F12, 0},
+	{SDLK_F13, GF_KEY_F13, 0},
+	{SDLK_F14, GF_KEY_F14, 0},
+	{SDLK_F15, GF_KEY_F15, 0},
+	{SDLK_NUMLOCKCLEAR, GF_KEY_NUMLOCK, 0},
+	{SDLK_CAPSLOCK, GF_KEY_CAPSLOCK, 0},
+	{SDLK_SCROLLLOCK, GF_KEY_SCROLL, 0},
+	{SDLK_RSHIFT, GF_KEY_SHIFT, GF_KEY_EXT_RIGHT},
+	{SDLK_LSHIFT, GF_KEY_SHIFT, GF_KEY_EXT_LEFT},
+	{SDLK_LCTRL, GF_KEY_CONTROL, GF_KEY_EXT_LEFT},
+	{SDLK_RCTRL, GF_KEY_CONTROL, GF_KEY_EXT_RIGHT},
+	{SDLK_LALT, GF_KEY_ALT, GF_KEY_EXT_LEFT},
+	{SDLK_RALT, GF_KEY_ALT, GF_KEY_EXT_RIGHT},
 #if (SDL_MAJOR_VERSION<=1) && (SDL_MINOR_VERSION<3)
-	case SDLK_LMETA:
-	case SDLK_LSUPER:
+	{SDLK_LMETA, GF_KEY_META, GF_KEY_EXT_LEFT},
+	{SDLK_LSUPER, GF_KEY_META, GF_KEY_EXT_LEFT},
 #else
-	case SDLK_LGUI:
+	{SDLK_LGUI, GF_KEY_META, GF_KEY_EXT_LEFT},
 #endif
-		evt->key_code = GF_KEY_META;
-		evt->flags = GF_KEY_EXT_LEFT;
-		break;
+
 #if (SDL_MAJOR_VERSION<=1) && (SDL_MINOR_VERSION<3)
-	case SDLK_RMETA:
-	case SDLK_RSUPER:
+	{SDLK_RMETA, GF_KEY_META, GF_KEY_EXT_RIGHT},
+	{SDLK_RSUPER, GF_KEY_META, GF_KEY_EXT_RIGHT},
 #else
-	case SDLK_RGUI:
+	{SDLK_RGUI, GF_KEY_META, GF_KEY_EXT_RIGHT},
 #endif
-		evt->key_code = GF_KEY_META;
-		evt->flags = GF_KEY_EXT_RIGHT;
-		break;
-	case SDLK_MODE:
-		evt->key_code = GF_KEY_MODECHANGE;
-		break;
-	case SDLK_APPLICATION:
-		evt->key_code = GF_KEY_COMPOSE;
-		break;
-	case SDLK_HELP:
-		evt->key_code = GF_KEY_HELP;
-		break;
-	case SDLK_PRINTSCREEN:
-		evt->key_code = GF_KEY_PRINTSCREEN;
-		break;
 
-#if (SDL_MAJOR_VERSION>=1) && (SDL_MINOR_VERSION>=3)
-	/*
-		SDLK_CARET		= 94,
-	 */
-	case SDLK_a:
-	case SDLK_b:
-	case SDLK_c:
-	case SDLK_d:
-	case SDLK_e:
-	case SDLK_f:
-	case SDLK_g:
-	case SDLK_h:
-	case SDLK_i:
-	case SDLK_j:
-	case SDLK_k:
-	case SDLK_l:
-	case SDLK_m:
-	case SDLK_n:
-	case SDLK_o:
-	case SDLK_p:
-	case SDLK_q:
-	case SDLK_r:
-	case SDLK_s:
-	case SDLK_t:
-	case SDLK_u:
-	case SDLK_v:
-	case SDLK_w:
-	case SDLK_x:
-	case SDLK_y:
-	case SDLK_z:
-		evt->key_code = GF_KEY_A + SDLkey - SDLK_a;
-		break;
-		/*
-		SDLK_DELETE		= 127,
-
-		SDLK_SYSREQ		= 317,
-		SDLK_POWER		= 320,
+	{SDLK_MODE, GF_KEY_MODECHANGE, 0},
+	{SDLK_APPLICATION, GF_KEY_COMPOSE, 0},
+	{SDLK_HELP, GF_KEY_HELP, 0},
+	{SDLK_PRINTSCREEN, GF_KEY_PRINTSCREEN, 0}
+};
 
-		*/
-#endif
+static u32 num_sdl_keys = sizeof(SDLKeys) / sizeof(SDLKeyToGPAC);
 
-	default:
-		if ((SDLkey>=0x30) && (SDLkey<=0x39))  evt->key_code = GF_KEY_0 + SDLkey-0x30;
-		else if ((SDLkey>=0x41) && (SDLkey<=0x5A))  evt->key_code = GF_KEY_A + SDLkey-0x41;
-		else if ((SDLkey>=0x61) && (SDLkey<=0x7A))  evt->key_code = GF_KEY_A + SDLkey-0x61;
-		else
-		{
-			evt->key_code = GF_KEY_UNIDENTIFIED;
+static void sdl_translate_key(u32 SDLkey, GF_EventKey *evt)
+{
+	u32 i;
+	evt->flags = 0;
+	evt->hw_code = SDLkey;
+	for (i=0; i<num_sdl_keys; i++) {
+		if (SDLKeys[i].sdl_key == SDLkey) {
+			evt->key_code = SDLKeys[i].gf_key;
+			evt->flags = SDLKeys[i].gf_flags;
+			return;
 		}
-		break;
+	}
+	if ((SDLkey>=0x30) && (SDLkey<=0x39))
+		evt->key_code = GF_KEY_0 + SDLkey-0x30;
+	else if ((SDLkey>=0x41) && (SDLkey<=0x5A))
+		evt->key_code = GF_KEY_A + SDLkey-0x41;
+	else if ((SDLkey>=0x61) && (SDLkey<=0x7A))
+		evt->key_code = GF_KEY_A + SDLkey-0x61;
+	else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[SDL] Unrecognized key %X\n", SDLkey));
+		evt->key_code = GF_KEY_UNIDENTIFIED;
 	}
 }
 
@@ -620,7 +404,7 @@
 }
 
 #if SDL_VERSION_ATLEAST(2,0,0)
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #define SDL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
 #define SDL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
 #define SDL_GL_WINDOW_FLAGS			SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN | SDL_WINDOW_BORDERLESS | SDL_WINDOW_RESIZABLE
@@ -632,7 +416,7 @@
 #define SDL_GL_FULLSCREEN_FLAGS		SDL_WINDOW_OPENGL | SDL_WINDOW_FULLSCREEN
 #endif
 #else
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #define SDL_WINDOW_FLAGS			SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_RESIZABLE | SDL_NOFRAME
 #define SDL_FULLSCREEN_FLAGS		SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL | SDL_FULLSCREEN | SDL_NOFRAME
 #define SDL_GL_WINDOW_FLAGS			SDL_HWSURFACE | SDL_OPENGL | SDL_HWACCEL | SDL_RESIZABLE | SDL_NOFRAME
@@ -645,10 +429,42 @@
 #endif
 #endif
 
+#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS)
+#include <gpac/media_tools.h>
+void SDLVid_SetIcon(SDLVidCtx *ctx)
+{
+	u8 *buffer, *dec_buf;
+	u32 size, w, h, pf, Bpp, dst_size=0;
+	const char cfg[GF_MAX_PATH];
+	if (!gf_opts_default_shared_directory((char *) cfg))
+		return;
+
+	strcat((char *) cfg, "/res/gpac.png");
+	if (gf_file_load_data(cfg, &buffer, &size) != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDLOut] failed to load icon file %s\n", cfg ));
+		return;
+	}
+	gf_img_png_dec(buffer, size, &w, &h, &pf, NULL, &dst_size);
+	Bpp = gf_pixel_get_bytes_per_pixel(pf);
+	dec_buf = gf_malloc(sizeof(char)*dst_size);
+	gf_img_png_dec(buffer, size, &w, &h, &pf, dec_buf, &dst_size);
+	//RGBA only
+	SDL_Surface *surface = SDL_CreateRGBSurfaceFrom(dec_buf, w, h, Bpp*8, w*Bpp, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000);
+	if (!surface) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDLOut] failed to create surface from icon: %s\n", SDL_GetError() ));
+	} else {
+		SDL_SetWindowIcon(ctx->screen, surface);
+		SDL_FreeSurface(surface);
+	}
+	gf_free(buffer);
+	gf_free(dec_buf);
+}
+#endif
+
 
 GF_Err SDLVid_ResizeWindow(GF_VideoOutput *dr, u32 width, u32 height)
 {
-	Bool hw_reset = GF_FALSE;
+	Bool hw_reset;
 	SDLVID();
 	GF_Event evt;
 
@@ -657,7 +473,7 @@
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Resizing window %dx%d\n", width, height));
 
-	if (ctx->output_3d_type) {
+	if (ctx->output_3d) {
 		u32 flags, nb_bits;
 		const char *opt;
 
@@ -678,24 +494,24 @@
 #endif
 		SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
+		opt = gf_opts_get_key("core", "gl-bits-depth");
 		nb_bits = opt ? atoi(opt) : 16;
 		SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
+		opt = gf_opts_get_key("core", "gl-bits-comp");
 		nb_bits = opt ? atoi(opt) : 8;
 		SDL_GL_SetAttribute(SDL_GL_RED_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, nb_bits);
 		SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, nb_bits);
 
-#if SDL_VERSION_ATLEAST(2,0,0)
-		if (ctx->hidden)
-			flags |= SDL_WINDOW_HIDDEN;
-#endif
-		
 		assert(width);
 		assert(height);
+
 #if SDL_VERSION_ATLEAST(2,0,0)
+		if (ctx->hidden)
+			flags |= SDL_WINDOW_HIDDEN;
+
+		hw_reset = GF_FALSE;
 
 #ifdef GPAC_USE_GLES2
 		/* Set the correct attributes for MASK and MAJOR version */
@@ -710,10 +526,26 @@
 				return GF_IO_ERR;
 			}
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
+
+#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS)
+			SDLVid_SetIcon(ctx);
+#endif
+
+			/*creating a window, at least on OSX, changes the locale and screws up float parsing !!
+			force setting the local back and pray that it will be changed before any other atof/strtod is called
+
+			!! it also looks like the locale is not enforced synchronously on OSX: adding
+				assert(strtod(0.5)) in gf_malloc proto would lead to random crashes
+			 */
+#ifndef _WIN32_WCE
+			setlocale( LC_NUMERIC, "C" );
+#endif
 		}
 
 		if ( !ctx->gl_context ) {
-			if (!(ctx->gl_context = SDL_GL_CreateContext(ctx->screen))) {
+			//in case we created a headless context before loading vout, create a shared context
+			SDL_GL_SetAttribute(SDL_GL_SHARE_WITH_CURRENT_CONTEXT, 1);
+   			if (!(ctx->gl_context = SDL_GL_CreateContext(ctx->screen))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot initialize gl context: %s\n", SDL_GetError()));
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
@@ -726,10 +558,11 @@
 			hw_reset = GF_TRUE;
 		}
 
-		opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "DisableVSync");
-		if (opt && !strcmp(opt, "yes")) {
-#if defined(__APPLE__) && !defined(GPAC_IPHONE)
-			ctx->disable_vsync = GF_TRUE;
+		if (!ctx->disable_vsync)
+			ctx->disable_vsync = gf_opts_get_bool("core", "disable-vsync");
+
+		if (ctx->disable_vsync) {
+#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
 #else
 			SDL_GL_SetSwapInterval(0);
 #endif
@@ -756,21 +589,18 @@
 	} else {
 		u32 flags;
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 		flags = SDL_FULLSCREEN_FLAGS;
 		//SDL readme says it would make us faster
 		SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
 #else
 		flags = SDL_WINDOW_FLAGS | SDL_WINDOW_RESIZABLE;
-
 		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
-
 #endif
-		if (ctx->os_handle) flags &= ~SDL_WINDOW_RESIZABLE;
 
 #if SDL_VERSION_ATLEAST(2,0,0)
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 		//still some issues with render to tager and landscape orientation, we need to reset everything ...
 		if (ctx->enable_defer_mode) {
 			if (ctx->renderer) SDL_DestroyRenderer(ctx->renderer);
@@ -793,13 +623,21 @@
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
+
+#if SDL_VERSION_ATLEAST(2,0,0) && !defined(GPAC_CONFIG_IOS)
+			SDLVid_SetIcon(ctx);
+#endif
+
+			/*see above note*/
+#ifndef _WIN32_WCE
+			setlocale( LC_NUMERIC, "C" );
+#endif
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
 			SDL_RaiseWindow(ctx->screen);
 		}
 		if ( !ctx->renderer ) {
 			u32 flags = SDL_RENDERER_ACCELERATED;
-			const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "DisableVSync");
-			if (!opt || strcmp(opt, "yes")) {
+			if (! gf_opts_get_bool("core", "disable-vsync")) {
 				flags |= SDL_RENDERER_PRESENTVSYNC;
 			}
 
@@ -810,7 +648,7 @@
 				return GF_IO_ERR;
 			}
 		}
-#ifndef GPAC_IPHONE
+#ifndef GPAC_CONFIG_IOS
 		SDL_SetWindowSize(ctx->screen, width, height);
 #endif
 		SDL_SetRenderDrawColor(ctx->renderer, 0, 0, 0, 255);
@@ -825,6 +663,27 @@
 	return ctx->screen ? GF_OK : GF_IO_ERR;
 }
 
+static void SDLVid_SetCursor(GF_VideoOutput *dr, u32 cursor_type)
+{
+#ifndef GPAC_CONFIG_IOS
+	SDLVID();
+	switch (cursor_type) {
+	case GF_CURSOR_ANCHOR:
+	case GF_CURSOR_TOUCH:
+	case GF_CURSOR_ROTATE:
+	case GF_CURSOR_PROXIMITY:
+	case GF_CURSOR_PLANE:
+		SDL_SetCursor(ctx->curs_hand);
+		break;
+	case GF_CURSOR_COLLIDE:
+		SDL_SetCursor(ctx->curs_collide);
+		break;
+	default:
+		SDL_SetCursor(ctx->curs_def);
+		break;
+	}
+#endif
+}
 
 static Bool SDLVid_InitializeWindow(SDLVidCtx *ctx, GF_VideoOutput *dr)
 {
@@ -832,8 +691,10 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
 	SDL_DisplayMode vinf;
 #else
+#if SDL_VERSION_ATLEAST(1, 2, 10)
 	const SDL_VideoInfo *vinf;
 #endif
+#endif
 
 #ifdef WIN32
 	putenv("directx");
@@ -867,8 +728,9 @@
 	dr->max_screen_height = vinf.h;
 	dr->max_screen_bpp = 8;
 #else
-	vinf = SDL_GetVideoInfo();
+
 #if SDL_VERSION_ATLEAST(1, 2, 10)
+	vinf = SDL_GetVideoInfo();
 	dr->max_screen_width = vinf->current_w;
 	dr->max_screen_height = vinf->current_h;
 	dr->max_screen_bpp = 8;
@@ -904,6 +766,7 @@
 		SDLVid_SetCaption();
 #endif
 	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Video output initialized - screen resolution %d %d\n", dr->max_screen_width, dr->max_screen_height));
+
 	return GF_TRUE;
 }
 
@@ -921,7 +784,7 @@
 	}
 
 	/*iOS SDL2 has a nasty bug that breaks switching between 2D and GL context if we don't re-init the video subsystem*/
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 	if ( ctx->screen ) {
 		SDL_DestroyWindow(ctx->screen);
 		ctx->screen=NULL;
@@ -940,8 +803,8 @@
 	SDL_QuitSubSystem(SDL_INIT_VIDEO);
 }
 
-#if defined SDL_TEXTINPUTEVENT_TEXT_SIZE /*&& !defined GPAC_IPHONE*/
-#include <gpac/unicode.h>
+#if defined SDL_TEXTINPUTEVENT_TEXT_SIZE /*&& !defined GPAC_CONFIG_IOS*/
+#include <gpac/utf.h>
 #endif
 
 
@@ -950,7 +813,7 @@
 	SDL_Event sdl_evt;
 	GF_Event gpac_evt;
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 	while (SDL_WaitEventTimeout(&sdl_evt, 0)) {
 #else
 	while (SDL_PollEvent(&sdl_evt)) {
@@ -972,6 +835,11 @@
 				gpac_evt.type = GF_EVENT_REFRESH;
 				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 				break;
+			case SDL_WINDOWEVENT_CLOSE:
+				memset(&gpac_evt, 0, sizeof(GF_Event));
+				gpac_evt.type = GF_EVENT_QUIT;
+				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+				return GF_FALSE;
 			}
 			break;
 #else
@@ -1117,10 +985,21 @@
 		case SDL_MOUSEWHEEL:
 			/*SDL handling is not perfect there, it just says up/down but no info on how much
 			the wheel was rotated...*/
-			gpac_evt.mouse.wheel_pos = INT2FIX(sdl_evt.wheel.x);
+			gpac_evt.mouse.wheel_pos = INT2FIX(sdl_evt.wheel.y);
 			gpac_evt.type = GF_EVENT_MOUSEWHEEL;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
 			break;
+
+		case SDL_MULTIGESTURE:
+			gpac_evt.mtouch.x = FLT2FIX(sdl_evt.mgesture.x);
+			gpac_evt.mtouch.y = FLT2FIX(sdl_evt.mgesture.y);
+			gpac_evt.mtouch.num_fingers = sdl_evt.mgesture.numFingers;
+			gpac_evt.mtouch.rotation = sdl_evt.mgesture.dTheta;
+			gpac_evt.mtouch.pinch = sdl_evt.mgesture.dDist;
+			gpac_evt.type = GF_EVENT_MULTITOUCH;
+			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			break;
+
 #endif
 
 		}
@@ -1140,6 +1019,7 @@
 
 	if (!SDLVid_InitializeWindow(ctx, dr)) {
 		ctx->sdl_th_state = SDL_STATE_STOP_REQ;
+		return 1;
 	}
 
 	ctx->sdl_th_state = SDL_STATE_RUNNING;
@@ -1198,7 +1078,7 @@
 
 	ctx->os_handle = os_handle;
 	ctx->is_init = GF_FALSE;
-	ctx->output_3d_type = 0;
+	ctx->output_3d = GF_FALSE;
 	ctx->force_alpha = (init_flags & GF_TERM_WINDOW_TRANSPARENT) ? GF_TRUE : GF_FALSE;
 	ctx->hidden = (init_flags & GF_TERM_INIT_HIDE) ? GF_TRUE : GF_FALSE;
 
@@ -1226,6 +1106,15 @@
 	}
 #endif
 
+	//coverage
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		GF_Event evt;
+		sdl_translate_key(SDLK_BACKSPACE, &evt.key);
+		SDLVid_SetCursor(dr, GF_CURSOR_NORMAL);
+	}
+#endif
+
 	ctx->is_init = GF_TRUE;
 	return GF_OK;
 }
@@ -1283,11 +1172,9 @@
 
 	if (ctx->fullscreen) {
 #if ! ( SDL_VERSION_ATLEAST(2,0,0) )
-		u32 flags = (ctx->output_3d_type==1) ? SDL_GL_FULLSCREEN_FLAGS : SDL_FULLSCREEN_FLAGS;
+		u32 flags = ctx->output_3d ? SDL_GL_FULLSCREEN_FLAGS : SDL_FULLSCREEN_FLAGS;
 #endif
-		Bool switch_res = GF_FALSE;
-		const char *sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "SwitchResolution");
-		if (sOpt && !stricmp(sOpt, "yes")) switch_res = GF_TRUE;
+		Bool switch_res = gf_opts_get_bool("core", "switch-vres");
 		if (!dr->max_screen_width || !dr->max_screen_height) switch_res = GF_TRUE;
 
 		ctx->store_width = *screen_width;
@@ -1339,11 +1226,11 @@
 		*screen_width = ctx->fs_width;
 		*screen_height = ctx->fs_height;
 		/*GL has changed*/
-		if (ctx->output_3d_type==1) {
+		if (ctx->output_3d) {
 			GF_Event evt;
 			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_VIDEO_SETUP;
-			evt.setup.opengl_mode = 3;
+			evt.setup.use_opengl = GF_TRUE;
 			dr->on_event(dr->evt_cbk_hdl, &evt);
 		}
 	} else {
@@ -1369,13 +1256,13 @@
 	u32 col;
 #endif
 
-	if (ctx->output_3d_type==1) return GF_BAD_PARAM;
+	if (ctx->output_3d) return GF_BAD_PARAM;
 
-	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "HardwareMemory");
+	opt = gf_opts_get_key("core", "hwvmem");
 	if (system_mem) {
-		if (opt && !strcmp(opt, "Always")) system_mem = GF_FALSE;
+		if (opt && !strcmp(opt, "always")) system_mem = GF_FALSE;
 	} else {
-		if (opt && !strcmp(opt, "Never")) system_mem = GF_TRUE;
+		if (opt && !strcmp(opt, "never")) system_mem = GF_TRUE;
 	}
 	ctx->use_systems_memory = system_mem;
 
@@ -1418,20 +1305,20 @@
 
 u32 SDLVid_MapPixelFormat(SDL_PixelFormat *format, Bool force_alpha)
 {
-	if (format->palette) return 0;
+	if (!format || format->palette) return 0;
 	switch (format->BitsPerPixel) {
 	case 16:
 		if ((format->Rmask==0x7c00) && (format->Gmask==0x03e0) && (format->Bmask==0x001f) ) return GF_PIXEL_RGB_555;
 		if ((format->Rmask==0xf800) && (format->Gmask==0x07e0) && (format->Bmask==0x001f) ) return GF_PIXEL_RGB_565;
 		return 0;
 	case 24:
-		if (format->Rmask==0x00FF0000) return GF_PIXEL_RGB_24;
-		if (format->Rmask==0x000000FF) return GF_PIXEL_BGR_24;
+		if (format->Rmask==0x00FF0000) return GF_PIXEL_RGB;
+		if (format->Rmask==0x000000FF) return GF_PIXEL_BGR;
 		return 0;
 	case 32:
 		if (format->Amask==0xFF000000) return GF_PIXEL_ARGB;
-		if (format->Rmask==0x00FF0000) return force_alpha ? GF_PIXEL_ARGB : GF_PIXEL_RGB_32;
-		if (format->Rmask==0x000000FF) return force_alpha ? GF_PIXEL_RGBA : GF_PIXEL_BGR_32;
+		if (format->Rmask==0x00FF0000) return force_alpha ? GF_PIXEL_ARGB : GF_PIXEL_RGBX;
+		if (format->Rmask==0x000000FF) return force_alpha ? GF_PIXEL_RGBA : GF_PIXEL_BGRX;
 		return 0;
 	default:
 		return 0;
@@ -1450,7 +1337,7 @@
 		video_info->pitch_x = 0;
 		video_info->pitch_y = ctx->width*3;
 		video_info->video_buffer = ctx->back_buffer_pixels;
-		video_info->pixel_format = GF_PIXEL_RGB_24;
+		video_info->pixel_format = GF_PIXEL_RGB;
 		video_info->is_hardware_memory = 0;
 		if (ctx->needs_bb_grab) {
 			SDL_RenderReadPixels(ctx->renderer, NULL, SDL_PIXELFORMAT_RGB24, video_info->video_buffer, video_info->pitch_y);
@@ -1491,7 +1378,7 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
 
 //for CGLSetParameter
-#if defined(__APPLE__) && !defined(GPAC_IPHONE)
+#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
 #include <OpenGL/OpenGL.h>
 #endif
 
@@ -1501,18 +1388,17 @@
 	/*if resizing don't process otherwise we may deadlock*/
 	if (!ctx->screen) return GF_OK;
 
-	//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] swapping video buffers\n"));
 
-	if (ctx->output_3d_type==1) {
+	if (ctx->output_3d) {
 		//with SDL2 we have to disable vsync by overriding swap interval
-#if defined(__APPLE__) && !defined(GPAC_IPHONE)
+#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
 		if (ctx->disable_vsync) {
 			GLint sync = 0;
 			CGLContextObj gl_ctx = CGLGetCurrentContext();
 			CGLSetParameter(gl_ctx, kCGLCPSwapInterval, &sync);
 		}
 #endif
-
 		SDL_GL_SwapWindow(ctx->screen);
 		return GF_OK;
 	}
@@ -1548,7 +1434,7 @@
 
 	//GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Flush\n"));
 
-	if (ctx->output_3d_type==1) {
+	if (ctx->output_3d) {
 		SDL_GL_SwapBuffers();
 		return GF_OK;
 	}
@@ -1590,28 +1476,6 @@
 }
 #endif
 
-static void SDLVid_SetCursor(GF_VideoOutput *dr, u32 cursor_type)
-{
-#ifndef GPAC_IPHONE
-	SDLVID();
-	switch (cursor_type) {
-	case GF_CURSOR_ANCHOR:
-	case GF_CURSOR_TOUCH:
-	case GF_CURSOR_ROTATE:
-	case GF_CURSOR_PROXIMITY:
-	case GF_CURSOR_PLANE:
-		SDL_SetCursor(ctx->curs_hand);
-		break;
-	case GF_CURSOR_COLLIDE:
-		SDL_SetCursor(ctx->curs_collide);
-		break;
-	default:
-		SDL_SetCursor(ctx->curs_def);
-		break;
-	}
-#endif
-}
-
 
 #ifdef WIN32
 static u32 get_sys_col(int idx)
@@ -1634,22 +1498,11 @@
 		SDLVID();
 		SDLVid_ProcessMessageQueue(ctx, dr);
 #endif
-
-#if !defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
-		{
-			SDLVID();
-			if (ctx->szCaption[0]) {
-				SDL_SetWindowTitle(ctx->screen, ctx->szCaption);
-				ctx->szCaption[0]=0;
-			}
-		}
-#endif
-
 		return GF_OK;
 	}
 	switch (evt->type) {
 	case GF_EVENT_SET_CURSOR:
-#ifndef GPAC_IPHONE
+#ifndef GPAC_CONFIG_IOS
 		SDLVid_SetCursor(dr, evt->cursor.cursor_type);
 #endif
 		break;
@@ -1663,9 +1516,11 @@
 #endif
 #if SDL_VERSION_ATLEAST(2,0,0)
 	{
+#if !defined(GPAC_CONFIG_IOS)
 		SDLVID();
-		strncpy(ctx->szCaption, evt->caption.caption, 99);
-		ctx->szCaption[99]=0;
+		SDL_SetWindowTitle(ctx->screen, evt->caption.caption);
+		SDLVid_ProcessEvent(dr, NULL);
+#endif
 	}
 #else
 	SDL_WM_SetCaption(evt->caption.caption, NULL);
@@ -1678,7 +1533,7 @@
 	case GF_EVENT_SIZE:
 	{
 		SDLVID();
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 		if (ctx->fullscreen) {
 		} else {
 			SDLVid_ResizeWindow(dr, evt->size.width, evt->size.height);
@@ -1695,7 +1550,7 @@
 	break;
 	case GF_EVENT_MOVE:
 
-#if !defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
+#if !defined(GPAC_CONFIG_IOS) && SDL_VERSION_ATLEAST(2,0,0)
 	{
 		SDLVID();
 
@@ -1717,12 +1572,12 @@
 	case GF_EVENT_VIDEO_SETUP:
 	{
 		SDLVID();
-		switch (evt->setup.opengl_mode) {
-		case 0:
+		ctx->disable_vsync=evt->setup.disable_vsync;
+		if (!evt->setup.use_opengl) {
 			/*force a resetup of the window*/
-			if (ctx->output_3d_type) {
+			if (ctx->output_3d) {
 				ctx->width = ctx->height = 0;
-				ctx->output_3d_type = 0;
+				ctx->output_3d = GF_FALSE;
 				SDLVid_ResetWindow(ctx);
 				SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
 			} else {
@@ -1730,32 +1585,24 @@
 				SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
 #endif
 			}
-			ctx->output_3d_type = 0;
+			ctx->output_3d = GF_FALSE;
 			return SDLVid_SetBackbufferSize(dr, evt->setup.width, evt->setup.height, evt->setup.system_memory);
-		case 1:
+		} else {
 			/*force a resetup of the window*/
-			if (!ctx->output_3d_type) {
+			if (!ctx->output_3d) {
 				ctx->width = ctx->height = 0;
 				SDLVid_ResetWindow(ctx);
 			}
-			ctx->output_3d_type = 1;
+			ctx->output_3d = GF_TRUE;
 			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Setting up 3D in SDL.\n"));
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 //            return SDLVid_ResizeWindow(dr, dr->max_screen_width, dr->max_screen_height);
 			return SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
 #else
 			return SDLVid_ResizeWindow(dr, evt->setup.width, evt->setup.height);
 #endif
-		case 2:
-			/*find a way to do that in SDL*/
-			ctx->output_3d_type = 2;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] 3D not supported with SDL.\n"));
-			return GF_NOT_SUPPORTED;
-		}
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Trying to set an Unknown Mode %d !\n", evt->setup.opengl_mode));
-			return GF_NOT_SUPPORTED;
 		}
+	}
 		break;
 	case GF_EVENT_SYS_COLORS:
 #ifdef WIN32
@@ -1794,7 +1641,7 @@
 
 	case GF_EVENT_TEXT_EDITING_START:
 	case GF_EVENT_TEXT_EDITING_END:
-#if defined(GPAC_IPHONE) && SDL_VERSION_ATLEAST(2,0,0)
+#if defined(GPAC_CONFIG_IOS) && SDL_VERSION_ATLEAST(2,0,0)
 		if (evt->type==GF_EVENT_TEXT_EDITING_START) {
 			SDL_StartTextInput();
 		} else {
@@ -1805,296 +1652,19 @@
 		return GF_NOT_SUPPORTED;
 #endif
 
-	}
-	return GF_OK;
-}
-
-
-static void copy_yuv(u8 *pYD, u8 *pVD, u8 *pUD, u32 pixel_format, u32 pitch_y, unsigned char *src, unsigned char *pU, unsigned char *pV, u32 src_stride, u32 src_pf, u32 src_width, u32 src_height, const GF_Window *src_wnd)
-{
-	unsigned char *pY;
-	pY = src;
-	if (src_pf == GF_PIXEL_YUV422) {
-		u32 i;
-		unsigned char * dst, * dst2, * src1, * src2, * dst3, * src3, * _src2, * _src3;
-
-		if (!pU || !pV) {
-			pU = src + src_stride * src_height;
-			pV = src + 3 * src_stride * src_height / 2;
-		}
-
-		if (src_wnd -> y || src_wnd -> x) {
-			pY = pY + src_stride * src_wnd -> y + src_wnd -> x;
-			pU = pU + (src_stride * src_wnd -> y + src_wnd -> x) / 2;
-			pV = pV + (src_stride * src_wnd -> y + src_wnd -> x) / 2;
-
-		}
-
-		src1 = pY;
-		dst = pYD;
-		_src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		_src3 = (pixel_format != GF_PIXEL_YV12) ? pV : pU;
-
-		for (i = 0; i < src_wnd -> h; i++) {
-			memcpy(dst, src1, src_wnd -> w);
-			src1 += src_stride;
-			dst += pitch_y;
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			src2 = _src2 + i * src_stride;
-			dst2 = pVD + i * pitch_y / 2;
-			src3 = _src3 + i * src_stride;
-			dst3 = pUD + i * pitch_y / 2;
-			memcpy(dst2, src2, src_wnd -> w / 2);
-			memcpy(dst3, src3, src_wnd -> w / 2);
-		}
-
-	} else if (src_pf == GF_PIXEL_YUV444) {
-		u32 i, j;
-		unsigned char * dst, * dst2, * src1, * src2, * dst3, * src3, * _src2, * _src3;
-
-		if (!pU || !pV) {
-			pU = src + src_stride * src_height;
-			pV = src + 2 * src_stride * src_height;
-		}
-
-		if (src_wnd -> y || src_wnd -> x) {
-			pY = pY + src_stride * src_wnd -> y + src_wnd -> x;
-			pU = pU + src_stride * src_wnd -> y + src_wnd -> x;
-			pV = pV + src_stride * src_wnd -> y + src_wnd -> x;
-
-		}
-		src1 = pY;
-		dst = pYD;
-		_src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		_src3 = (pixel_format != GF_PIXEL_YV12) ? pV : pU;
-
-		for (i = 0; i < src_wnd -> h; i++) {
-			memcpy(dst, src1, src_wnd -> w);
-			src1 += src_stride;
-			dst += pitch_y;
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			src2 = _src2 + 2 * i * src_stride;
-			dst2 = pVD + i * pitch_y / 2;
-			src3 = _src3 + 2 * i * src_stride;
-			dst3 = pUD + i * pitch_y / 2;
-				for (j = 0; j < src_wnd -> w / 2; j++) { 
-				* dst2 = * src2;
-				dst2++;
-				src2 += 2;
-				* dst3 = * src3;
-				dst3++;
-				src3 += 2;
-			}
-		}
-
-	} else if (src_pf == GF_PIXEL_YUV422_10) {
-		u32 i, j;
-		unsigned char * _src2, * _src3;
-		u16 * src_y, * src_u, * src_v;
-		if (!pU || !pV) {
-			pU = src + src_stride * src_height;
-			pV = src + 3 * src_stride * src_height / 2;
-		}
-
-		if (src_wnd -> y || src_wnd -> x) {
-			src_y = (u16 * ) pY + src_wnd -> x;
-			src_u = (u16 * ) pU + src_wnd -> x / 2;
-			src_v = (u16 * ) pV + src_wnd -> x / 2;
-			pY = (u8 * ) src_y + src_stride * src_wnd -> y;
-			pU = (u8 * ) src_u + src_stride * src_wnd -> y / 2;
-			pV = (u8 * ) src_v + src_stride * src_wnd -> y / 2;
-
-		}
-
-		_src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		_src3 = (pixel_format != GF_PIXEL_YV12) ? pV : pU;
-		for (i = 0; i < src_wnd -> h; i++) {
-			u16 * src = (u16 * )(pY + i * src_stride);
-			u8 * dst = (u8 * )(pYD + i * pitch_y);
-				for (j = 0; j < src_wnd -> w; j++) { 
-				* dst = ( * src) >> 2;
-				dst++;
-				src++;
-			}
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			u16 * src2 = (u16 * )(_src2 + i * src_stride);
-			u8 * dst2 = (u8 * )(pVD + i * pitch_y / 2);
-				for (j = 0; j < src_wnd -> w / 2; j++) { 
-				* dst2 = ( * src2) >> 2;
-				dst2++;
-				src2++;
-			}
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			u16 * src3 = (u16 * )(_src3 + i * src_stride);
-			u8 * dst3 = (u8 * )(pUD + i * pitch_y / 2);
-				for (j = 0; j < src_wnd -> w / 2; j++) { 
-				* dst3 = ( * src3) >> 2;
-				dst3++;
-				src3++;
-			}
-		}
-
-	} else if (src_pf == GF_PIXEL_YUV444_10) {
-		u32 i, j;
-		unsigned char * _src2, * _src3;
-		u16 * src_y, * src_u, * src_v;
-
-		if (!pU || !pV) {
-			pU = src + src_stride * src_height;
-			pV = src + 2 * src_stride * src_height;
-		}
-
-		if (src_wnd -> y || src_wnd -> x) {
-			src_y = (u16 * ) pY + src_wnd -> x;
-			src_u = (u16 * ) pU + src_wnd -> x;
-			src_v = (u16 * ) pV + src_wnd -> x;
-			pY = (u8 * ) src_y + src_stride * src_wnd -> y;
-			pU = (u8 * ) src_u + src_stride * src_wnd -> y;
-			pV = (u8 * ) src_v + src_stride * src_wnd -> y;
-
-		}
-
-		_src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		_src3 = (pixel_format != GF_PIXEL_YV12) ? pV : pU;
-		for (i = 0; i < src_wnd -> h; i++) {
-			u16 * src = (u16 * )(pY + i * src_stride);
-			u8 * dst = (u8 * ) pYD + i * pitch_y;
-				for (j = 0; j < src_wnd -> w; j++) { 
-				* dst = ( * src) >> 2;
-				dst++;
-				src++;
-			}
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			u16 * src2 = (u16 * )(_src2 + 2 * i * src_stride);
-			u8 * dst2 = (u8 * ) pVD + i * pitch_y / 2;
-				for (j = 0; j < src_wnd -> w / 2; j++) { 
-				* dst2 = ( * src2) >> 2;
-				dst2++;
-				src2 += 2;
-			}
-		}
-		for (i = 0; i < src_wnd -> h / 2; i++) {
-			u16 * src3 = (u16 * )(_src3 + 2 * i * src_stride);
-			u8 * dst3 = (u8 * ) pUD + i * pitch_y / 2;
-				for (j = 0; j < src_wnd -> w / 2; j++) { 
-				* dst3 = ( * src3) >> 2;
-				dst3++;
-				src3 += 2;
-			}
-		}
-
-	} else {
-		
-		if (!pU || !pV) {
-			pU = src + src_stride * src_height;
-			pV = src + 5*src_stride * src_height/4;
-		}
-
-		if (src_wnd->y || src_wnd->x) {
-			pY = pY + src_stride * src_wnd->y + src_wnd->x;
-			/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
-			therefore force an even Y offset for U and V planes.*/
-			pU = pU + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
-			pV = pV + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
-		}
-		
-	/*complete source copy*/
-	if ( (pitch_y == (s32) src_stride) && (src_wnd->w == src_width) && (src_wnd->h == src_height)) {
-		assert(!src_wnd->x);
-		assert(!src_wnd->y);
-		memcpy(pYD, pY, sizeof(unsigned char)*src_width*src_height);
-		memcpy(pVD, pV, sizeof(unsigned char)*src_width*src_height/4);
-		memcpy(pUD, pU, sizeof(unsigned char)*src_width*src_height/4);
-	} else if (src_pf==GF_PIXEL_YUY2) {
-		u32 i, j;
-		unsigned char *dst_y, *dst_u, *dst_v;
-
-		pY = src + src_stride * src_wnd->y + src_wnd->x;
-		pU = src + src_stride * src_wnd->y + src_wnd->x + 1;
-		pV = src + src_stride * src_wnd->y + src_wnd->x + 3;
-
-
-		dst_y = pYD;
-		dst_v = pVD;
-		dst_u = pUD;
-		for (i=0; i<src_wnd->h; i++) {
-			for (j=0; j<src_wnd->w; j+=2) {
-				*dst_y = * pY;
-				*(dst_y+1) = * (pY+2);
-				dst_y += 2;
-				pY += 4;
-				if (i%2) continue;
-
-				*dst_u = (*pU + *(pU + src_stride)) / 2;
-				*dst_v = (*pV + *(pV + src_stride)) / 2;
-				dst_u++;
-				dst_v++;
-				pU += 4;
-				pV += 4;
-			}
-			if (i%2) {
-				pU += src_stride;
-				pV += src_stride;
-			}
-		}
-	} else if (src_pf==GF_PIXEL_YV12_10) {
-		u32 i, j;
-		for (i=0; i<src_wnd->h; i++) {
-			u16 *py = (u16 *) (pY + i*src_stride);
-			for (j=0; j<src_wnd->w; j++) {
-				*pYD = (*py) >> 2;
-				pYD ++;
-				py++;
-			}
-		}
-		for (i=0; i<src_wnd->h/2; i++) {
-			u16 *pu = (u16 *) (pU + i*src_stride/2);
-			for (j=0; j<src_wnd->w/2; j++) {
-				*pUD = (*pu) >> 2;
-				pUD ++;
-				pu++;
-			}
-		}
-		for (i=0; i<src_wnd->h/2; i++) {
-			u16 *pv = (u16 *) (pV + i*src_stride/2);
-			for (j=0; j<src_wnd->w/2; j++) {
-				*pVD = (*pv) >> 2;
-				pVD ++;
-				pv++;
-			}
-		}
-
-	} else {
-		u32 i;
-		unsigned char *dst, *src, *dst2, *src2, *dst3, *src3;
-
-		src = pY;
-		dst = pYD;
-
-		src2 = (pixel_format != GF_PIXEL_YV12) ? pU : pV;
-		dst2 = pVD;
-		src3 = (pixel_format  != GF_PIXEL_YV12) ? pV : pU;
-		dst3 = pUD;
-		for (i=0; i<src_wnd->h; i++) {
-			memcpy(dst, src, src_wnd->w);
-			src += src_stride;
-			dst += pitch_y;
-			if (i<src_wnd->h/2) {
-				memcpy(dst2, src2, src_wnd->w/2);
-				src2 += src_stride/2;
-				dst2 += pitch_y/2;
-				memcpy(dst3, src3, src_wnd->w/2);
-				src3 += src_stride/2;
-				dst3 += pitch_y/2;
-			}
+	case GF_EVENT_SET_GL:
+	{
+#if SDL_VERSION_ATLEAST(2,0,0)
+		SDLVID();
+		if (SDL_GL_MakeCurrent(ctx->screen, ctx->gl_context)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot make context current: %s\n", SDL_GetError()));
+			return GF_IO_ERR;
 		}
+#endif
 	}
-  }
+		return GF_OK;
+	}
+	return GF_OK;
 }
 
 #if SDL_VERSION_ATLEAST(2,0,0)
@@ -2140,7 +1710,7 @@
 	//this is a clear (not very elegant ...)
 	if ((video_src->width<=2) && (video_src->height<=2)) {
 		u8 *pix =(u8 *) video_src->video_buffer;
-		if (video_src->pixel_format == GF_PIXEL_RGB_24) {
+		if (video_src->pixel_format == GF_PIXEL_RGB) {
 			SDL_SetRenderDrawColor(ctx->renderer, pix[0], pix[1], pix[2], 0xFF);
 		} else {
 			SDL_SetRenderDrawColor(ctx->renderer, pix[0], pix[1], pix[2], pix[3]);
@@ -2154,16 +1724,32 @@
 	}
 
 	switch (video_src->pixel_format) {
-	case GF_PIXEL_RGB_24:
+	case GF_PIXEL_RGB:
 		pool = &ctx->pool_rgb;
 		format=SDL_PIXELFORMAT_RGB24;
 		break;
+	case GF_PIXEL_XRGB:
+		pool = &ctx->pool_rgb;
+		format=SDL_PIXELFORMAT_BGRX8888;
+		break;
+	case GF_PIXEL_RGBX:
+		pool = &ctx->pool_rgb;
+		format=SDL_PIXELFORMAT_BGR888;
+		break;
+	case GF_PIXEL_XBGR:
+		pool = &ctx->pool_rgb;
+		format=SDL_PIXELFORMAT_RGBX8888;
+		break;
+	case GF_PIXEL_BGRX:
+		pool = &ctx->pool_rgb;
+		format=SDL_PIXELFORMAT_RGB888;
+		break;
 	case GF_PIXEL_RGBA:
 		pool = &ctx->pool_rgba;
 		format=SDL_PIXELFORMAT_ABGR8888;
 		set_blend=1;
 		break;
-	case GF_PIXEL_YV12:
+	case GF_PIXEL_YUV:
 		pool = &ctx->pool_yuv;
 		format=SDL_PIXELFORMAT_YV12;
 		format=SDL_PIXELFORMAT_IYUV;
@@ -2172,11 +1758,30 @@
 	case GF_PIXEL_YUV444:
 	case GF_PIXEL_YUV444_10:
 	case GF_PIXEL_YUV422_10:
-	case GF_PIXEL_YV12_10:
+	case GF_PIXEL_YUV_10:
 		need_copy=1;
 		pool = &ctx->pool_yuv;
 		format=SDL_PIXELFORMAT_YV12;
 		break;
+	/*FIXME we need to upgrade our SDL build*/
+#if !defined(GPAC_CONFIG_IOS) && SDL_VERSION_ATLEAST(2,0,0)
+	case GF_PIXEL_NV12:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_NV12;
+		break;
+	case GF_PIXEL_NV21:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_NV21;
+		break;
+#endif
+	case GF_PIXEL_UYVY:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_UYVY;
+		break;
+	case GF_PIXEL_YUYV:
+		pool = &ctx->pool_yuv;
+		format=SDL_PIXELFORMAT_YUY2;
+		break;
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -2197,18 +1802,31 @@
 	SDL_QueryTexture((*pool), &format, &acc, &w, &h);
 
 	if (need_copy) {
-		u8* pixels;
+		GF_VideoSurface dst_v;
+		u8 *pixels;
 		int pitch;
-		u8 *pY, *pU, *pV;
+		GF_Window swnd;
 		/*copy pixels*/
 		if (SDL_LockTexture(*pool, NULL, (void**)&pixels, &pitch) < 0) {
 			return GF_NOT_SUPPORTED;
 		}
+		if (!src_wnd) {
+			swnd.x = swnd.y=0;
+			swnd.w = video_src->width;
+			swnd.h = video_src->height;
+			src_wnd = &swnd;
+		}
+
+		memset(&dst_v, 0, sizeof(GF_VideoSurface));
+		dst_v.video_buffer = pixels;
+		dst_v.u_ptr = pixels + h*pitch;
+		dst_v.v_ptr = pixels + 5*h*pitch/4;
+		dst_v.pitch_y = pitch;
+		dst_v.pixel_format = GF_PIXEL_YUV;
+		dst_v.width = video_src->width;
+		dst_v.height = video_src->height;
 
-		pY = pixels;
-		pU = pixels + h*pitch;
-		pV = pixels + 5*h*pitch/4;
-		copy_yuv(pY, pU, pV, GF_PIXEL_YV12, pitch, (unsigned char *) video_src->video_buffer, (unsigned char *) video_src->u_ptr, (unsigned char *) video_src->v_ptr, video_src->pitch_y, video_src->pixel_format, video_src->width, video_src->height, src_wnd);
+		gf_stretch_bits(&dst_v, video_src, NULL, src_wnd, 0xFF, GF_FALSE, NULL, NULL);
 
 		SDL_UnlockTexture(*pool);
 	} else {
@@ -2257,6 +1875,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] Bliting surface (overlay type %d)\n", overlay_type));
 
 	if (overlay_type) {
+		GF_VideoSurface dst_v;
 		if (!video_src) {
 			if (ctx->yuv_overlay) {
 				SDL_FreeYUVOverlay(ctx->yuv_overlay);
@@ -2273,9 +1892,17 @@
 		/*copy pixels*/
 		SDL_LockYUVOverlay(ctx->yuv_overlay);
 
-		copy_yuv(ctx->yuv_overlay->pixels[0], ctx->yuv_overlay->pixels[1], ctx->yuv_overlay->pixels[2], GF_PIXEL_YV12, ctx->yuv_overlay->pitches[0],
-		         (unsigned char *) video_src->video_buffer, (unsigned char *) video_src->u_ptr, (unsigned char *) video_src->v_ptr, video_src->pitch_y, video_src->pixel_format,
-		         video_src->width, video_src->height, src_wnd);
+
+		memset(&dst_v, 0, sizeof(GF_VideoSurface));
+		dst_v.video_buffer = (char *) ctx->yuv_overlay->pixels[0];
+		dst_v.u_ptr = (char *) ctx->yuv_overlay->pixels[1];
+		dst_v.v_ptr = (char *) ctx->yuv_overlay->pixels[2];
+		dst_v.pitch_y = ctx->yuv_overlay->pitches[0];
+		dst_v.pixel_format = GF_PIXEL_YUV;
+		dst_v.width = video_src->width;
+		dst_v.height = video_src->height;
+
+		gf_stretch_bits(&dst_v, video_src, NULL, src_wnd, 0xFF, GF_FALSE, NULL, NULL);
 
 		SDL_UnlockYUVOverlay(ctx->yuv_overlay);
 
@@ -2292,7 +1919,7 @@
 		return GF_NOT_SUPPORTED;
 
 	switch (video_src->pixel_format) {
-	case GF_PIXEL_RGB_24:
+	case GF_PIXEL_RGB:
 		pool = &ctx->pool_rgb;
 		bpp = 3;
 		break;
@@ -2379,7 +2006,7 @@
 	driv->hw_caps |= GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_RGBA;
 
 
-	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "SDL_DeferMode");
+	opt = gf_opts_get_key("core", "sdl-defer");
 	ctx->enable_defer_mode = 0;
 	if (opt && !strcmp(opt, "yes"))
 		ctx->enable_defer_mode = 1;
@@ -2391,6 +2018,9 @@
 #endif
 
 
+#ifdef GPAC_ENABLE_COVERAGE
+	SDLVid_MapPixelFormat(NULL, GF_FALSE);
+#endif
 
 	driv->Blit = SDL_Blit;
 	driv->LockBackBuffer = SDLVid_LockBackBuffer;
@@ -2400,6 +2030,7 @@
 #else
 	SDL_StartTextInput();
 #endif /* SDL_TEXTINPUTEVENT_TEXT_SIZE */
+
 	return driv;
 }

gpac-0.8.0.tar.gz/modules/validator/Makefile -> gpac-1.0.0.tar.gz/modules/validator/Makefile Changed

gpac-0.8.0.tar.gz/modules/validator/validator.c -> gpac-1.0.0.tar.gz/modules/validator/validator.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *			Copyright (c) Telecom ParisTech 2010-2020
  *			All rights reserved
  *
  *  This file is part of GPAC / Test Suite Validator Recorder sub-project
@@ -23,8 +23,8 @@
  *
  */
 
-#include <gpac/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
+#include <gpac/modules/compositor_ext.h>
+#include <gpac/filters.h>
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/internal/media_dev.h>
 #include <gpac/xml.h>
@@ -32,15 +32,13 @@
 
 typedef struct __validation_module
 {
-	GF_Terminal *term;
+	GF_Compositor *compositor;
 
 	Bool is_recording;
 	Bool trace_mode;
-	char *prev_fps;
-	char *prev_alias;
 
 	/* Clock used to synchronize events in recording and playback*/
-	GF_Clock *ck;
+	GF_ObjectManager *root_odm;
 
 	/* Next event to process */
 	Bool next_event_snapshot;
@@ -72,7 +70,7 @@
 	Bool snapshot_next_frame;
 	u32 snapshot_number;
 
-	GF_TermEventFilter evt_filter;
+	GF_FSEventListener evt_filter;
 } GF_Validator;
 
 static void validator_xvs_close(GF_Validator *validator);
@@ -92,7 +90,7 @@
 	snap_node->name = gf_strdup("snapshot");
 	snap_node->attributes = gf_list_new();
 
-	GF_SAFEALLOC(att, GF_XMLAttribute);
+	att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 	if (!att) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
 		return;
@@ -102,7 +100,7 @@
 	sprintf(att->value, "%d", scene_time);
 	gf_list_add(snap_node->attributes, att);
 	
-	GF_SAFEALLOC(att, GF_XMLAttribute);
+	att = (GF_XMLAttribute *) gf_malloc(sizeof(GF_XMLAttribute));
 	if (!att) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Validator] Failed to allocate snapshot\n"));
 		return;
@@ -128,7 +126,7 @@
 	char *name = validator->test_filename ? validator->test_filename : validator->xvs_filename;
 	char *dot;
 	char dumpname[GF_MAX_PATH];
-	dot = strrchr(name, '.');
+	dot = gf_file_ext_start(name);
 	dot[0] = 0;
 	sprintf(dumpname, "%s-%s-%03d.png", name, (is_reference?"reference":"newest"), number);
 	dot[0] = '.';
@@ -139,12 +137,12 @@
 {
 	GF_Err e;
 	GF_VideoSurface fb;
-	GF_Terminal *term = validator->term;
+	GF_Compositor *compositor = validator->compositor;
 	char *dumpname;
 
 	dumpname = validator_get_snapshot_name(validator, validator->is_recording, validator->snapshot_number);
 
-	e = gf_term_get_screen_buffer(term, &fb);
+	e = gf_sc_get_screen_buffer(compositor, &fb, 0);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error dumping screen buffer %s\n", gf_error_to_string(e)));
 	} else {
@@ -159,24 +157,65 @@
 			if (!png) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Error writing file %s\n", dumpname));
 			} else {
-				gf_fwrite(dst, dst_size, 1, png);
+				gf_fwrite(dst, dst_size, png);
 				gf_fclose(png);
 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Validator] Writing file %s\n", dumpname));
 			}
 		}
 		if (dst) gf_free(dst);
-		gf_term_release_screen_buffer(term, &fb);
+		gf_sc_release_screen_buffer(compositor, &fb);
 	}
 	validator->snapshot_number++;
 	return dumpname;
 }
 
+static GF_Err validator_file_dec(char *png_filename, u32 *hint_codecid, u32 *width, u32 *height, u32 *pixel_format, char **dst, u32 *dst_size)
+{
+	u32 fsize, codecid;
+	char *data;
+	GF_Err e;
+
+	codecid = 0;
+	if (!hint_codecid || ! *hint_codecid) {
+		char *ext = gf_file_ext_start(png_filename);
+		if (!ext) return GF_NOT_SUPPORTED;
+		if (!stricmp(ext, ".png")) codecid = GF_CODECID_PNG;
+		else if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) codecid = GF_CODECID_JPEG;
+	} else {
+		codecid = *hint_codecid;
+	}
+
+	e = gf_file_load_data(png_filename, (u8 **)&data, &fsize);
+	if (e) return e;
+
+	e = GF_NOT_SUPPORTED;
+	*dst_size = 0;
+	if (codecid == GF_CODECID_JPEG) {
+#ifdef GPAC_HAS_JPEG
+		e = gf_img_jpeg_dec(data, fsize, width, height, pixel_format, NULL, dst_size, 0);
+		if (*dst_size) {
+			*dst = gf_malloc(*dst_size);
+			return gf_img_jpeg_dec(data, fsize, width, height, pixel_format, *dst, dst_size, 0);
+		}
+#endif
+	} else if (codecid == GF_CODECID_PNG) {
+#ifdef GPAC_HAS_PNG
+		e = gf_img_png_dec(data, fsize, width, height, pixel_format, NULL, dst_size);
+		if (*dst_size) {
+			*dst = gf_malloc(*dst_size);
+			return gf_img_png_dec(data, fsize, width, height, pixel_format, *dst, dst_size);
+		}
+#endif
+	}
+	return e;
+}
+
 static Bool validator_compare_snapshots(GF_Validator *validator)
 {
 	char *ref_name, *new_name;
 	u32 ref_width, ref_height, ref_pixel_format, ref_data_size;
 	u32 new_width, new_height, new_pixel_format, new_data_size;
-	char *ref_data, *new_data;
+	char *ref_data=NULL, *new_data=NULL;
 	Bool result = GF_FALSE;
 	GF_Err e;
 	u32 i;
@@ -185,16 +224,19 @@
 	ref_name = validator_get_snapshot_name(validator, GF_TRUE, snap_number);
 	new_name = validator_get_snapshot_name(validator, GF_FALSE, snap_number);
 
-	e = gf_img_file_dec(ref_name, NULL, &ref_width, &ref_height, &ref_pixel_format, &ref_data, &ref_data_size);
+	e = validator_file_dec(ref_name, NULL, &ref_width, &ref_height, &ref_pixel_format, &ref_data, &ref_data_size);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Cannot decode PNG file %s\n", ref_name));
 		goto end;
 	}
-	e = gf_img_file_dec(new_name, NULL, &new_width, &new_height, &new_pixel_format, &new_data, &new_data_size);
+	e = validator_file_dec(new_name, NULL, &new_width, &new_height, &new_pixel_format, &new_data, &new_data_size);
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Cannot decode PNG file %s\n", new_name));
 		goto end;
 	}
+	if (!ref_data) ref_data_size = 0;
+	if (!new_data) new_data_size = 0;
+
 	if (ref_width != new_width) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different widths: %d vs %d\n", ref_width, new_width));
 		goto end;
@@ -207,6 +249,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different pixel formats: %d vs %d\n", ref_pixel_format, new_pixel_format));
 		goto end;
 	}
+	if (ref_data_size != new_data_size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Snapshots have different pixel formats: %d vs %d\n", ref_pixel_format, new_pixel_format));
+		goto end;
+	}
 
 	for (i = 0; i<ref_data_size; i++) {
 		if (ref_data[i] != new_data[i]) {
@@ -220,6 +266,8 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Validator] PNG Comparison result: %s\n", (result?"Same":"Different")));
 	if (ref_name) gf_free(ref_name);
 	if (new_name) gf_free(new_name);
+	if (ref_data) gf_free(ref_data);
+	if (new_data) gf_free(new_data);
 	return result;
 }
 #endif
@@ -230,7 +278,7 @@
 	if (validator->snapshot_next_frame) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		char *snap_name = validator_create_snapshot(validator);
-		validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
+		validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->root_odm->ck));
 		gf_free(snap_name);
 #endif
 		validator->snapshot_next_frame = GF_FALSE;
@@ -248,12 +296,10 @@
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
 			if (!validator->trace_mode) {
-				gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+//deprecated				gf_sc_add_video_listener(validator->compositor, &validator->video_listener);
 			}
 
-			validator->ck = validator->term->root_scene->scene_codec ?
-			                validator->term->root_scene->scene_codec->ck :
-			                validator->term->root_scene->dyn_ck;
+			validator->root_odm = validator->compositor->root_scene->root_od;
 		}
 		break;
 	case GF_EVENT_CLICK:
@@ -271,7 +317,7 @@
 			GF_Event evt;
 			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_QUIT;
-			validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+			gf_sc_on_event(validator->compositor, &evt);
 		}
 		return GF_TRUE;
 	}
@@ -313,14 +359,14 @@
 
 	evt_node->attributes = gf_list_new();
 
-	GF_SAFEALLOC(att, GF_XMLAttribute);
+	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"));
 		return;
 	}
 	att->name = gf_strdup("time");
 	att->value = (char*)gf_malloc(100);
-	sprintf(att->value, "%f", gf_scene_get_time(validator->term->root_scene)*1000);
+	sprintf(att->value, "%f", gf_scene_get_time(validator->compositor->root_scene)*1000);
 	gf_list_add(evt_node->attributes, att);
 
 	switch (event->type) {
@@ -332,7 +378,7 @@
 	case GF_EVENT_MOUSEMOVE:
 	case GF_EVENT_MOUSEWHEEL:
 		if (event->type == GF_EVENT_MOUSEDOWN || event->type == GF_EVENT_MOUSEUP) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -351,7 +397,7 @@
 			}
 			gf_list_add(evt_node->attributes, att);
 		}
-		GF_SAFEALLOC(att, GF_XMLAttribute);
+		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"));
 			return;
@@ -361,7 +407,7 @@
 		sprintf(att->value, "%d", event->mouse.x);
 		gf_list_add(evt_node->attributes, att);
 
-		GF_SAFEALLOC(att, GF_XMLAttribute);
+		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"));
 			return;
@@ -371,7 +417,7 @@
 		sprintf(att->value, "%d", event->mouse.y);
 		gf_list_add(evt_node->attributes, att);
 		if (event->type == GF_EVENT_MOUSEWHEEL) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -382,7 +428,7 @@
 			gf_list_add(evt_node->attributes, att);
 		}
 		if (event->mouse.key_states & GF_KEY_MOD_SHIFT) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -392,7 +438,7 @@
 			gf_list_add(evt_node->attributes, att);
 		}
 		if (event->mouse.key_states & GF_KEY_MOD_CTRL) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -402,7 +448,7 @@
 			gf_list_add(evt_node->attributes, att);
 		}
 		if (event->mouse.key_states & GF_KEY_MOD_ALT) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -416,7 +462,7 @@
 	case GF_EVENT_KEYUP:
 	case GF_EVENT_KEYDOWN:
 	case GF_EVENT_LONGKEYPRESS:
-		GF_SAFEALLOC(att, GF_XMLAttribute);
+		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"));
 			return;
@@ -427,7 +473,7 @@
 #endif
 		gf_list_add(evt_node->attributes, att);
 		if (event->key.flags & GF_KEY_MOD_SHIFT) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -437,7 +483,7 @@
 			gf_list_add(evt_node->attributes, att);
 		}
 		if (event->key.flags & GF_KEY_MOD_CTRL) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -447,7 +493,7 @@
 			gf_list_add(evt_node->attributes, att);
 		}
 		if (event->key.flags & GF_KEY_MOD_ALT) {
-			GF_SAFEALLOC(att, GF_XMLAttribute);
+			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"));
 				return;
@@ -458,7 +504,7 @@
 		}
 		break;
 	case GF_EVENT_TEXTINPUT:
-		GF_SAFEALLOC(att, GF_XMLAttribute);
+		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"));
 			return;
@@ -489,9 +535,9 @@
 	case GF_EVENT_CONNECT:
 		if (event->connect.is_connected) {
 			if (!validator->trace_mode) {
-				gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+//deprecated				gf_sc_add_video_listener(validator->compositor, &validator->video_listener);
 			}
-			validator->ck = validator->term->root_scene->scene_codec ? validator->term->root_scene->scene_codec->ck : validator->term->root_scene->dyn_ck;
+			validator->root_odm = validator->compositor->root_scene->root_od;
 		}
 		break;
 	case GF_EVENT_KEYDOWN:
@@ -515,28 +561,28 @@
 			if (event->key.key_code == GF_KEY_INSERT) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 				char *snap_name = validator_create_snapshot(validator);
-				validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->ck));
+				validator_xvs_add_snapshot_node(validator, snap_name, gf_clock_time(validator->root_odm->ck));
 				gf_free(snap_name);
 #endif
 			} else if (event->key.key_code == GF_KEY_END) {
 				GF_Event evt;
 				memset(&evt, 0, sizeof(GF_Event));
 				evt.type = GF_EVENT_QUIT;
-				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+				gf_sc_on_event(validator->compositor, &evt);
 			} else if (event->key.key_code == GF_KEY_F1) {
 				validator->snapshot_next_frame = GF_TRUE;
 			}
 		} else if (event->key.key_code == GF_KEY_PAGEDOWN) {
 			rec_event = GF_FALSE;
 			validator_xvs_close(validator);
-			gf_term_disconnect(validator->term);
-			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+			gf_sc_disconnect(validator->compositor);
+//deprecated			gf_sc_remove_video_listener(validator->compositor, &validator->video_listener);
 			validator_xvs_next(validator, GF_FALSE);
 		} else if (event->key.key_code == GF_KEY_PAGEUP) {
 			rec_event = GF_FALSE;
 			validator_xvs_close(validator);
-			gf_term_disconnect(validator->term);
-			gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+			gf_sc_disconnect(validator->compositor);
+//deprecated			gf_sc_remove_video_listener(validator->compositor, &validator->video_listener);
 			validator_xvs_next(validator, GF_TRUE);
 		} else if (event->key.key_code == GF_KEY_CONTROL) {
 			rec_event = GF_FALSE;
@@ -553,7 +599,6 @@
 {
 	GF_Err e;
 	u32 att_index;
-	GF_XMLAttribute *att;
 	validator->xvl_parser = gf_xml_dom_new();
 	e = gf_xml_dom_parse(validator->xvl_parser, validator->xvl_filename, NULL, NULL);
 	if (e != GF_OK) {
@@ -569,7 +614,7 @@
 	}
 	att_index = 0;
 	while (1) {
-		att = (GF_XMLAttribute*)gf_list_get(validator->xvl_node->attributes, att_index);
+		GF_XMLAttribute *att = (GF_XMLAttribute*)gf_list_get(validator->xvl_node->attributes, att_index);
 		if (!att) break;
 		if (!strcmp(att->name, "content-base")) {
 			validator->test_base = gf_strdup(att->value);
@@ -588,12 +633,12 @@
 			char result_filename[GF_MAX_PATH];
 			char *dot;
 			xvl_content = gf_xml_dom_serialize(validator->xvl_node, GF_FALSE);
-			dot = strrchr(validator->xvl_filename, '.');
+			dot = gf_file_ext_start(validator->xvl_filename);
 			dot[0] = 0;
 			sprintf(result_filename, "%s-result.xml", validator->xvl_filename);
 			dot[0] = '.';
 			xvl_fp = gf_fopen(result_filename, "wt");
-			gf_fwrite(xvl_content, strlen(xvl_content), 1, xvl_fp);
+			gf_fwrite(xvl_content, strlen(xvl_content), xvl_fp);
 			gf_fclose(xvl_fp);
 			gf_free(xvl_content);
 		}
@@ -726,12 +771,11 @@
 		if (validator->is_recording) {
 			FILE *xvs_fp;
 			char *xvs_content;
-			char filename[100];
-			GF_XMLAttribute *att;
 			GF_XMLAttribute *att_file = NULL;
 			u32 att_index = 0;
             
             if (!validator->trace_mode) {
+				GF_XMLAttribute *att;
                 while (1) {
                     att = (GF_XMLAttribute*)gf_list_get(validator->xvs_node->attributes, att_index);
                     if (!att) {
@@ -755,6 +799,7 @@
                     if (att->value) gf_free(att->value);
                 }
                 if (validator->test_base) {
+					char filename[100];
                     sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
                     att->value = gf_strdup(filename);
                 } else {
@@ -763,7 +808,7 @@
             }
 			xvs_content = gf_xml_dom_serialize(validator->xvs_node, GF_FALSE);
 			xvs_fp = gf_fopen(validator->xvs_filename, "wt");
-			gf_fwrite(xvs_content, strlen(xvs_content), 1, xvs_fp);
+			gf_fwrite(xvs_content, strlen(xvs_content), xvs_fp);
 			gf_fclose(xvs_fp);
 			gf_free(xvs_content);
             if (validator->owns_root)
@@ -803,28 +848,27 @@
 	validator->xvs_node_in_xvl = NULL;
 	validator->xvs_filename = NULL;
 	validator->test_filename = NULL;
-	validator->ck = NULL;
+	validator->root_odm = NULL;
 	validator->xvs_event_index = 0;
 	validator->snapshot_number = 0;
 }
 
 static void validator_test_open(GF_Validator *validator)
 {
-	char filename[100];
-
 	if (!validator->trace_mode) {
+		char filename[100];
 		if (validator->test_base)
 			sprintf(filename, "%s%c%s", validator->test_base, GF_PATH_SEPARATOR, validator->test_filename);
 		else
 			sprintf(filename, "%s", validator->test_filename);
 
-		gf_sc_add_video_listener(validator->term->compositor, &validator->video_listener);
+//deprecated		gf_sc_add_video_listener(validator->compositor, &validator->video_listener);
 		if (validator->is_recording)
 			validator->snapshot_next_frame = GF_TRUE;
-		gf_term_connect(validator->term, filename);
+		gf_sc_connect_from_time_ex(validator->compositor, filename, 0, 0, 0, NULL);
 
 	}
-//	validator->ck = validator->term->root_scene->scene_codec ? validator->term->root_scene->scene_codec->ck : validator->term->root_scene->dyn_ck;
+//	validator->ck = validator->compositor->root_scene->scene_codec ? validator->compositor->root_scene->scene_codec->ck : validator->compositor->root_scene->dyn_ck;
 }
 
 static Bool validator_xvs_next(GF_Validator *validator, Bool reverse)
@@ -854,14 +898,16 @@
 static Bool validator_load_event(GF_Validator *validator)
 {
 	GF_XMLNode *event_node;
-	GF_XMLAttribute *att;
 	u32 att_index;
 
 	memset(&validator->next_event, 0, sizeof(GF_Event));
 	validator->evt_loaded = GF_FALSE;
 	validator->next_event_snapshot = GF_FALSE;
 
-	if (!validator->xvs_node) return GF_FALSE;
+	if (!validator->xvs_node) {
+		validator->compositor->validator_mode = GF_FALSE;
+		return GF_FALSE;
+	}
 
 	while (1) {
 		event_node = (GF_XMLNode*)gf_list_get(validator->xvs_node->content, validator->xvs_event_index);
@@ -889,7 +935,7 @@
 
 	att_index = 0;
 	while (1) {
-		att = (GF_XMLAttribute*)gf_list_get(event_node->attributes, att_index);
+		GF_XMLAttribute *att = (GF_XMLAttribute*)gf_list_get(event_node->attributes, att_index);
 		if (!att) break;
 		if (!strcmp(att->name, "time")) {
 			validator->next_time = atoi(att->value);
@@ -923,10 +969,11 @@
 		att_index++;
 	}
 	validator->evt_loaded = GF_TRUE;
+	validator->compositor->sys_frames_pending = GF_TRUE;
 	return GF_TRUE;
 }
 
-static Bool validator_process(GF_TermExt *termext, u32 action, void *param)
+static Bool validator_process(GF_CompositorExt *termext, u32 action, void *param)
 {
 	const char *opt;
 	GF_Validator *validator = (GF_Validator*)termext->udta;
@@ -934,24 +981,19 @@
 	switch (action) {
 
 	/* Upon starting of the terminal, we parse (possibly an XVL file), an XVS file, and start the first test sequence */
-	case GF_TERM_EXT_START:
-		validator->term = (GF_Terminal *) param;
-
-		/* if the validator is loaded, we switch off anti-aliasing for image comparison and we put a low framerate,
-		but we store the previous value to restore it upon termination of the validator */
-		opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "FrameRate");
-		if (opt) validator->prev_fps = gf_strdup(opt);
-		opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias");
-		if (opt) validator->prev_alias = gf_strdup(opt);
+	case GF_COMPOSITOR_EXT_START:
+		validator->compositor = (GF_Compositor *) param;
 
 		/* Check if the validator should be loaded and in which mode */
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Mode");
+		opt = gf_opts_get_key("Validator", "Mode");
 		if (!opt) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Validator missing configuration, stopping.\n"));
 			return GF_FALSE;
-		} else if (!strcmp(opt, "Play")) {
+		} else if (!strcmp(opt, "Play") ) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in playback mode.\n"));
 			validator->is_recording = GF_FALSE;
+			//this will indicate to the compositor to increment scene time even though no new changes
+			validator->compositor->validator_mode = GF_TRUE;
 		} else if (!strcmp(opt, "Record")) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
 			validator->is_recording = GF_TRUE;
@@ -963,13 +1005,15 @@
 			return GF_FALSE;
 		}
 
+		gf_opts_set_key("Validator", "Mode", "Disable");
+
 		/* initializes the validator and starts */
 		validator->xvs_filename = NULL;
-		validator->xvl_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVL");
+		validator->xvl_filename = (char *)gf_opts_get_key("Validator", "XVL");
 		if (!validator->xvl_filename) {
-			validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "XVS");
+			validator->xvs_filename = (char *)gf_opts_get_key("Validator", "XVS");
 			if (!validator->xvs_filename) {
-				validator->xvs_filename = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Validator", "Trace");
+				validator->xvs_filename = (char *)gf_opts_get_key("Validator", "Trace");
 				if (!validator->xvs_filename) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
 					return GF_FALSE;
@@ -984,11 +1028,6 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario playlist: %s\n", validator->xvl_filename));
 		}
 
-		/* since we changed parameters of the compositor, we need to trigger a reconfiguration */
-//		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
-//		gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
-//		gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
-
 		/* TODO: if start returns 0, the module is not loaded, so the above init (filter registration) is not removed,
 		   should probably return 1 all the time, to make sure stop is called */
 		if (validator->xvl_filename) {
@@ -1018,11 +1057,11 @@
 		validator->evt_filter.udta = validator;
 		if (!validator->is_recording) {
 			validator->evt_filter.on_event = validator_on_event_play;
-			termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+			termext->caps |= GF_COMPOSITOR_EXTENSION_NOT_THREADED;
 		} else {
 			validator->evt_filter.on_event = validator_on_event_record;
 		}
-		gf_term_add_event_filter(validator->term, &validator->evt_filter);
+		gf_filter_add_event_listener(validator->compositor->filter, &validator->evt_filter);
 		validator->video_listener.udta = validator;
 		validator->video_listener.on_video_frame = validator_on_video_frame;
 		validator->video_listener.on_video_reconfig = validator_on_video_reconfig;
@@ -1036,11 +1075,11 @@
 	/* when the terminal stops, we close the XVS parser and XVL parser if any, restore the config,
 	and free all validator data (the validator will be destroyed when the module is unloaded)
 	Note: we don't need to disconnect the terminal since it's already stopping */
-	case GF_TERM_EXT_STOP:
-		gf_term_remove_event_filter(validator->term, &validator->evt_filter);
+	case GF_COMPOSITOR_EXT_STOP:
+		gf_filter_remove_event_listener(validator->compositor->filter, &validator->evt_filter);
 		validator_xvs_close(validator);
 		validator_xvl_close(validator);
-		validator->term = NULL;
+		validator->compositor = NULL;
 		if (validator->test_base) {
 			gf_free(validator->test_base);
 			validator->test_base = NULL;
@@ -1048,30 +1087,20 @@
 		/*auto-disable the recording by default*/
 		if (!validator->trace_mode) {
 			if (validator->is_recording ) {
-				gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Play");
+				gf_opts_set_key("Validator", "Mode", "Play");
 			} else {
-				gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Disable");
+				gf_opts_set_key("Validator", "Mode", "Disable");
 			}
 		}
 		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Stopping validator\n"));
-		if (validator->prev_fps) {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", validator->prev_fps);
-			gf_free(validator->prev_fps);
-			validator->prev_fps = NULL;
-		}
-		if (validator->prev_alias) {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", validator->prev_alias);
-			gf_free(validator->prev_alias);
-			validator->prev_alias = NULL;
-		}
 		break;
 
 	/* When called in the main loop of the terminal, we don't do anything in the recording mode.
 	   In the playing/validating mode, we need to check if an event needs to be dispatched or if snapshots need to be made,
 	   until there is no more event, in which case we trigger either the load of the next XVS or the quit */
-	case GF_TERM_EXT_PROCESS:
+	case GF_COMPOSITOR_EXT_PROCESS:
 		/* if the time is right, dispatch the event and load the next one */
-		while (!validator->is_recording && validator->evt_loaded && validator->ck && (validator->next_time <= gf_clock_time(validator->ck) )) {
+		while (!validator->is_recording && validator->evt_loaded && validator->root_odm && validator->root_odm->ck && (validator->next_time <= gf_clock_time(validator->root_odm->ck) )) {
 			Bool has_more_events;
 			//u32 diff = gf_clock_time(validator->ck) - validator->next_time;
 			//GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[Validator] Time diff: evt_time=%d  clock_time = %d, diff=%d\n", validator->next_time, gf_clock_time(validator->ck), diff));
@@ -1085,20 +1114,20 @@
 				validator->next_event_snapshot = GF_FALSE;
 #endif
 			} else {
-				validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &validator->next_event);
+				gf_sc_on_event(validator->compositor, &validator->next_event);
 			}
 			has_more_events = validator_load_event(validator);
 			if (!has_more_events) {
 				validator_xvs_close(validator);
 				if (! validator->trace_mode) {
-					gf_term_disconnect(validator->term);
-					gf_sc_remove_video_listener(validator->term->compositor, &validator->video_listener);
+					gf_sc_disconnect(validator->compositor);
+//deprecated					gf_sc_remove_video_listener(validator->compositor, &validator->video_listener);
 					validator_xvs_next(validator, GF_FALSE);
 					if (!validator->xvs_node) {
 						GF_Event evt;
 						memset(&evt, 0, sizeof(GF_Event));
 						evt.type = GF_EVENT_QUIT;
-						validator->term->compositor->video_out->on_event(validator->term->compositor->video_out->evt_cbk_hdl, &evt);
+						gf_sc_on_event(validator->compositor, &evt);
 					} else {
 						if (!validator->is_recording) {
 							validator_load_event(validator);
@@ -1113,15 +1142,19 @@
 }
 
 
-GF_TermExt *validator_new()
+GF_CompositorExt *validator_new()
 {
-	GF_TermExt *dr;
+	GF_CompositorExt *dr;
 	GF_Validator *validator;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC Test Validator", "gpac distribution");
+	dr = (GF_CompositorExt*)gf_malloc(sizeof(GF_CompositorExt));
+	memset(dr, 0, sizeof(GF_CompositorExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_COMPOSITOR_EXT_INTERFACE, "GPAC Test Validator", "gpac distribution");
 
 	GF_SAFEALLOC(validator, GF_Validator);
+	if (!validator) {
+		gf_free(dr);
+		return NULL;
+	}
 	dr->process = validator_process;
 	dr->udta = validator;
 	return dr;
@@ -1130,10 +1163,8 @@
 
 void validator_delete(GF_BaseInterface *ifce)
 {
-	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_CompositorExt *dr = (GF_CompositorExt *) ifce;
 	GF_Validator *validator = (GF_Validator*)dr->udta;
-	if (validator->prev_fps) gf_free(validator->prev_fps);
-	if (validator->prev_alias) gf_free(validator->prev_alias);
 	gf_free(validator);
 	gf_free(dr);
 }
@@ -1142,7 +1173,7 @@
 const u32 *QueryInterfaces()
 {
 	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
+		GF_COMPOSITOR_EXT_INTERFACE,
 		0
 	};
 	return si;
@@ -1151,7 +1182,7 @@
 GPAC_MODULE_EXPORT
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
+	if (InterfaceType == GF_COMPOSITOR_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
 	return NULL;
 }
 
@@ -1159,7 +1190,7 @@
 void ShutdownInterface(GF_BaseInterface *ifce)
 {
 	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
+	case GF_COMPOSITOR_EXT_INTERFACE:
 		validator_delete(ifce);
 		break;
 	}

gpac-0.8.0.tar.gz/modules/wav_out/Makefile -> gpac-1.0.0.tar.gz/modules/wav_out/Makefile Changed

gpac-0.8.0.tar.gz/modules/wav_out/wav_out.c -> gpac-1.0.0.tar.gz/modules/wav_out/wav_out.c Changed

@@ -195,7 +195,7 @@
 
 
 /*we assume what was asked is what we got*/
-static GF_Err WAV_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+static GF_Err WAV_Configure(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *audioFormat, u64 channel_cfg)
 {
 	u32 i, retry;
 	HRESULT	hr;
@@ -215,11 +215,24 @@
 	if (*NbChannels>2) *NbChannels=2;
 #endif
 
+	//only support for PCM 8/16/24/32 packet mode
+	switch (*audioFormat) {
+	case GF_AUDIO_FMT_U8:
+	case GF_AUDIO_FMT_S16:
+	case GF_AUDIO_FMT_S24:
+	case GF_AUDIO_FMT_S32:
+		break;
+	default:
+		//otherwise force PCM16
+		*audioFormat = GF_AUDIO_FMT_S16;
+		break;
+	}
+
 	memset (&ctx->fmt, 0, sizeof(ctx->fmt));
 	ctx->fmt.cbSize = sizeof(WAVEFORMATEX);
 	ctx->fmt.wFormatTag = WAVE_FORMAT_PCM;
 	ctx->fmt.nChannels = *NbChannels;
-	ctx->fmt.wBitsPerSample = *nbBitsPerSample;
+	ctx->fmt.wBitsPerSample = gf_audio_fmt_bit_depth(*audioFormat);
 	ctx->fmt.nSamplesPerSec = *SampleRate;
 	ctx->fmt.nBlockAlign = ctx->fmt.wBitsPerSample * ctx->fmt.nChannels / 8;
 	ctx->fmt.nAvgBytesPerSec = *SampleRate * ctx->fmt.nBlockAlign;
@@ -238,11 +251,11 @@
 		if (channel_cfg & GF_AUDIO_CH_FRONT_RIGHT) format_ex.dwChannelMask |= SPEAKER_FRONT_RIGHT;
 		if (channel_cfg & GF_AUDIO_CH_FRONT_CENTER) format_ex.dwChannelMask |= SPEAKER_FRONT_CENTER;
 		if (channel_cfg & GF_AUDIO_CH_LFE) format_ex.dwChannelMask |= SPEAKER_LOW_FREQUENCY;
-		if (channel_cfg & GF_AUDIO_CH_BACK_LEFT) format_ex.dwChannelMask |= SPEAKER_BACK_LEFT;
-		if (channel_cfg & GF_AUDIO_CH_BACK_RIGHT) format_ex.dwChannelMask |= SPEAKER_BACK_RIGHT;
-		if (channel_cfg & GF_AUDIO_CH_BACK_CENTER) format_ex.dwChannelMask |= SPEAKER_BACK_CENTER;
-		if (channel_cfg & GF_AUDIO_CH_SIDE_LEFT) format_ex.dwChannelMask |= SPEAKER_SIDE_LEFT;
-		if (channel_cfg & GF_AUDIO_CH_SIDE_RIGHT) format_ex.dwChannelMask |= SPEAKER_SIDE_RIGHT;
+		if (channel_cfg & GF_AUDIO_CH_SURROUND_LEFT) format_ex.dwChannelMask |= SPEAKER_BACK_LEFT;
+		if (channel_cfg & GF_AUDIO_CH_SURROUND_RIGHT) format_ex.dwChannelMask |= SPEAKER_BACK_RIGHT;
+		if (channel_cfg & GF_AUDIO_CH_REAR_CENTER) format_ex.dwChannelMask |= SPEAKER_BACK_CENTER;
+		if (channel_cfg & GF_AUDIO_CH_SIDE_SURROUND_LEFT) format_ex.dwChannelMask |= SPEAKER_SIDE_LEFT;
+		if (channel_cfg & GF_AUDIO_CH_SIDE_SURROUND_RIGHT) format_ex.dwChannelMask |= SPEAKER_SIDE_RIGHT;
 		fmt = (WAVEFORMATEX *) &format_ex;
 	}
 #endif
@@ -260,6 +273,8 @@
 		retry--;
 	}
 	if (hr != MMSYSERR_NOERROR) return GF_IO_ERR;
+	ctx->fmt.nBlockAlign = fmt->nBlockAlign;
+	ctx->fmt.nAvgBytesPerSec = fmt->nAvgBytesPerSec;
 
 	if (!ctx->force_config) {
 		/*one wave buffer size*/
@@ -297,7 +312,6 @@
 static void WAV_WriteAudio(GF_AudioOutput *dr)
 {
 	LPWAVEHDR hdr;
-	HRESULT hr;
 	u32 i;
 	WAVCTX();
 
@@ -320,7 +334,7 @@
 			/*fill it*/
 			hdr->dwBufferLength = dr->FillBuffer(dr->audio_renderer, hdr->lpData, ctx->buffer_size);
 			hdr->dwFlags = 0;
-			hr = waveOutPrepareHeader(ctx->hwo, hdr, sizeof(WAVEHDR));
+			waveOutPrepareHeader(ctx->hwo, hdr, sizeof(WAVEHDR));
 			/*write it*/
 			waveOutWrite(ctx->hwo, hdr, sizeof(WAVEHDR));
 		}
@@ -444,7 +458,7 @@
 	driv->SelfThreaded = GF_FALSE;
 	driv->Setup = WAV_Setup;
 	driv->Shutdown = WAV_Shutdown;
-	driv->ConfigureOutput = WAV_ConfigureOutput;
+	driv->Configure= WAV_Configure;
 	driv->GetAudioDelay = WAV_GetAudioDelay;
 	driv->GetTotalBufferTime = WAV_GetTotalBufferTime;
 	driv->SetVolume = WAV_SetVolume;

gpac-0.8.0.tar.gz/modules/x11_out/Makefile -> gpac-1.0.0.tar.gz/modules/x11_out/Makefile Changed

gpac-0.8.0.tar.gz/modules/x11_out/x11_out.c -> gpac-1.0.0.tar.gz/modules/x11_out/x11_out.c Changed

gpac-0.8.0.tar.gz/modules/x11_out/x11_out.h -> gpac-1.0.0.tar.gz/modules/x11_out/x11_out.h Changed

gpac-0.8.0.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist -> gpac-1.0.0.tar.gz/packagers/osx/GPAC.app/Contents/Info.plist Changed

gpac-0.8.0.tar.gz/packagers/osx/SLA.r -> gpac-1.0.0.tar.gz/packagers/osx/SLA.r Changed

@@ -10,8 +10,8 @@
 
 
 data 'TEXT' (5002, "English") {
-    "Copyright (c) 2003, 2011 Telecom ParisTech. All rights reserved.\n"
-    "For more information, visit <http://gpac.sourceforge.net>\n"
+    "Copyright (c) 2003-2020 Telecom Paris. All rights reserved.\n"
+    "For more information, visit <http://gpac.io>\n"
     "\n"
 	"This software package includes many Multimedia Technologies. Some of these technologies may be covered by various patents hard to identify. These patents may or may not apply in your local jurisdiction.\n"
     "\n"
@@ -19,7 +19,7 @@
     "\n"
 	"DO NOT PROCEED with this installation if you do not understand or do not agree with these terms.\n"
     "\n"
-	"Telecom ParisTech bears no liability for any infringing usage of this software, which is provided for educational or research purposes.\n"
+	"Telecom Paris bears no liability for any infringing usage of this software, which is provided for educational or research purposes.\n"
     "\n"
 	"This software is distributed under the GNU LESSER GENERAL PUBLIC LICENSE\n"
 	"See <http://www.gnu.org/licenses/lgpl-2.1.html> for more details\n"

gpac-0.8.0.tar.gz/packagers/osx/res/preamble.txt -> gpac-1.0.0.tar.gz/packagers/osx/res/preamble.txt Changed

gpac-0.8.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-1.0.0.tar.gz/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -1,6 +1,6 @@
 ;--------------------------------
 ;General
-!define GPAC_VERSION 0.8.0
+!define GPAC_VERSION 1.0.0
 !include default.out
 
 !define GPAC_ROOT ..\..\..
@@ -39,8 +39,8 @@
   !include "MUI2.nsh"
 
 WindowIcon on
-Icon "${GPAC_ROOT}\doc\osmo4.ico"
-UninstallIcon "${GPAC_ROOT}\doc\osmo4.ico"
+Icon "${GPAC_ROOT}\share\doc\osmo4.ico"
+UninstallIcon "${GPAC_ROOT}\share\doc\osmo4.ico"
 
 ;--------------------------------
 ;Interface Settings
@@ -52,8 +52,8 @@
 Var Confirm
 Var VSRedistSetupError
 
-LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
-LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
+;LangString PAGE_TITLE ${LANG_ENGLISH} "Title"
+;LangString PAGE_SUBTITLE ${LANG_ENGLISH} "Subtitle"
 
 Function EnableNext
   Pop $R1
@@ -237,9 +237,7 @@
 
 lbl_add:
 
-
 lbl_xp:
-   File "${GPAC_BIN}\gm_gdip_raster.dll"
 
 lbl_done:
 FunctionEnd
@@ -252,11 +250,8 @@
   File /oname=ReadMe.txt "${GPAC_ROOT}\README.md"
   File /oname=License.txt "${GPAC_ROOT}\COPYING"
   File /oname=Changelog.txt "${GPAC_ROOT}\Changelog"
-  File "${GPAC_ROOT}\doc\configuration.html"
-  File "${GPAC_ROOT}\doc\gpac.mp4"
-  File "${GPAC_ROOT}\doc\osmo4.ico"
+  File "${GPAC_ROOT}\share\doc\osmo4.ico"
   File "${GPAC_BIN}\libgpac.dll"
-  File "${GPAC_BIN}\js.dll"
   File "${GPAC_BIN}\libcryptoMD.dll"
   File "${GPAC_BIN}\libsslMD.dll"
 
@@ -278,217 +273,84 @@
 
   File "${GPAC_BIN}\MP4Client.exe"
 
-  File "${GPAC_BIN}\gm_dummy_in.dll"
   File "${GPAC_BIN}\gm_dx_hw.dll"
-  File "${GPAC_BIN}\gm_gpac_js.dll"
-  File "${GPAC_BIN}\gm_ismacryp.dll"
-
-  ;copy GUI
-  SetOutPath $INSTDIR\gui
-  File "${GPAC_ROOT}\gui\gui.bt"
-  File "${GPAC_ROOT}\gui\gui.js"
-  File "${GPAC_ROOT}\gui\gwlib.js"
-  File "${GPAC_ROOT}\gui\mpegu-core.js"
-  File "${GPAC_ROOT}\gui\webvtt-renderer.js"
-  SetOutPath $INSTDIR\gui\icons
-  File /r /x .git ${GPAC_ROOT}\gui\icons\*
-  SetOutPath $INSTDIR\gui\extensions
-  File /r /x .git ${GPAC_ROOT}\gui\extensions\*
-
-  ;copy shaders
-  SetOutPath $INSTDIR\shaders
-  File "${GPAC_ROOT}\shaders\vertex.glsl"
-  File "${GPAC_ROOT}\shaders\fragment.glsl"
-
-  SetOutPath $INSTDIR
-SectionEnd
-
-SubSection "GPAC Plugins" SecPlugins
-
-
-;
-;	2 install modes, normal one and full one
-
-Section "MPEG-4 BIFS Decoder" SecBIFS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_bifs_dec.dll"
-SectionEnd
-
-Section "MPEG-4 ODF Decoder" SecODF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_odf_dec.dll"
-SectionEnd
-
-Section "MPEG-4 LASeR Decoder" SecLASeR
-  SectionIn 1
-  File "${GPAC_BIN}\gm_laser_dec.dll"
-SectionEnd
-
-Section "MPEG-4 SAF Demultiplexer" SecSAF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_saf_in.dll"
-SectionEnd
-
-Section "Textual MPEG-4 Loader" SecTextLoad
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ctx_load.dll"
-SectionEnd
-
-Section "Image Package (PNG, JPEG, BMP)" SecIMG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_img_in.dll"
-SectionEnd
-
-Section "AAC Audio" SecAAC
-  SectionIn 1
-  File "${GPAC_BIN}\gm_aac_in.dll"
-SectionEnd
-
-Section "MP3 Audio" SecMP3
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mp3_in.dll"
-SectionEnd
-
-Section "AC3 Audio" SecAC3
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ac3_in.dll"
-SectionEnd
 
-Section "FFMPEG" SecFFMPEG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_ffmpeg_in.dll"
   File "${GPAC_BIN}\avcodec-*.dll"
   File "${GPAC_BIN}\avdevice-*.dll"
   File "${GPAC_BIN}\avfilter-*.dll"
   File "${GPAC_BIN}\avformat-*.dll"
   File "${GPAC_BIN}\avutil-*.dll"
-  File "${GPAC_BIN}\avresample-*.dll"
   File "${GPAC_BIN}\swresample-*.dll"
   File "${GPAC_BIN}\swscale-*.dll"
+  File "${GPAC_BIN}\postproc-*.dll"
   File "${GPAC_BIN}\libx264-*.dll"
-SectionEnd
 
-Section "XviD Video Decoder" SecXVID
-  SectionIn 1
-  File "${GPAC_BIN}\gm_xvid_dec.dll"
-SectionEnd
-
-;Section "AMR NB & WB" SecAMRFT
-;  SectionIn 1
-;  File "..\gm_amr_float_dec.dll"
-;SectionEnd
-
-Section "Subtitles" SecSUBS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_timedtext.dll"
-SectionEnd
+  File "${GPAC_BIN}\OpenSVCDecoder.dll"
 
-Section "ISO File Format" SecISOFF
-  SectionIn 1
-  File "${GPAC_BIN}\gm_isom_in.dll"
-SectionEnd
+  ;copy GUI
+  SetOutPath $INSTDIR\share
+  File "${GPAC_ROOT}\share\default.cfg"
+  SetOutPath $INSTDIR\share\res
+  File "${GPAC_ROOT}\share\res\gpac.mp4"
+  File "${GPAC_ROOT}\share\res\gpac_cfg_test.mp4"
+  File "${GPAC_ROOT}\share\res\gpac.png"
+  SetOutPath $INSTDIR\share\gui
+  File "${GPAC_ROOT}\share\gui\gui.bt"
+  File "${GPAC_ROOT}\share\gui\gui.js"
+  File "${GPAC_ROOT}\share\gui\gwlib.js"
+  File "${GPAC_ROOT}\share\gui\mpegu-core.js"
+  SetOutPath $INSTDIR\share\gui\icons
+  File /r /x .git ${GPAC_ROOT}\share\gui\icons\*
+  SetOutPath $INSTDIR\share\gui\extensions
+  File /r /x .git ${GPAC_ROOT}\share\gui\extensions\*
+
+  ;copy scripts
+  SetOutPath $INSTDIR\share\scripts
+  File /r /x .git ${GPAC_ROOT}\share\scripts\*
 
-Section "MPEG-2 TS" SecM2TS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mpegts_in.dll"
-SectionEnd
+  ;copy shaders
+  SetOutPath $INSTDIR\share\shaders
+  File /r /x .git ${GPAC_ROOT}\share\shaders\*
 
-Section "RTP/RTSP" SecRTP
-  SectionIn 1
-  File "${GPAC_BIN}\gm_rtp_in.dll"
-SectionEnd
+  ;copy lang
+  SetOutPath $INSTDIR\share\lang
+  File /r /x .git ${GPAC_ROOT}\share\lang\*
 
-Section "SVG" SecSVG
-  SectionIn 1
-  File "${GPAC_BIN}\gm_svg_in.dll"
-SectionEnd
+  ;copy vis
+  SetOutPath $INSTDIR\share\vis
+  File /r /x .git ${GPAC_ROOT}\share\vis\*
 
-Section "WebVTT" SecWebVTT
-  SectionIn 1
-  File "${GPAC_BIN}\gm_vtt_in.dll"
+  SetOutPath $INSTDIR
 SectionEnd
 
-Section "GDI+" SecGDIP
-  SectionIn 1
-  call InsertGDIPLUS
-SectionEnd
+SubSection "GPAC Plugins" SecPlugins
 
-Section "GPAC 2D Raster" SecG2DS
-  SectionIn 1
-  File "${GPAC_BIN}\gm_soft_raster.dll"
-SectionEnd
 
 Section "FreeType" SecFT
   SectionIn 1
   File "${GPAC_BIN}\gm_ft_font.dll"
 SectionEnd
 
-Section "ATSC" SecATSC
-  SectionIn 1
-  File "${GPAC_BIN}\gm_atsc_in.dll"
-SectionEnd
-
 Section "Windows MME Audio" SecWAVE
   SectionIn 1
   File "${GPAC_BIN}\gm_wav_out.dll"
 SectionEnd
 
-Section "Xiph" SecXIPH
+Section "SDL" SecSDL
   SectionIn 1
-  File "${GPAC_BIN}\gm_ogg.dll"
-SectionEnd
-
-Section "OpenSVC Decoder" SecOSVC
-  SectionIn 1
-  File "${GPAC_BIN}\OpenSVCDecoder.dll"
-  File "${GPAC_BIN}\gm_opensvc_dec.dll"
+  File "${GPAC_BIN}\SDL.dll"
+  File "${GPAC_BIN}\gm_sdl_out.dll"
 SectionEnd
 
 Section "OpenHEVC Decoder" SecOHEVC
   SectionIn 1
   File "${GPAC_BIN}\openhevc-1.dll"
-  File "${GPAC_BIN}\gm_openhevc_dec.dll"
-SectionEnd
-
-Section "NVidia Hardware Decoder" SecNVDEC
-  SectionIn 1
-  File "${GPAC_BIN}\gm_nvdec.dll"
+  File "${GPAC_BIN}\gf_ohevcdec.dll"
 SectionEnd
 
-Section "MPEG DASH Support" SecDASH
+Section "Validator" SecValidator
   SectionIn 1
-  File "${GPAC_BIN}\gm_mpd_in.dll"
-SectionEnd
-
-Section "RAW audio-video output" SecRAW
-  SectionIn 1
-  File "${GPAC_BIN}\gm_raw_out.dll"
-SectionEnd
-
-Section "HTML 5 Media Source Extensions Support" SecMSE
-  SectionIn 1
-  File "${GPAC_BIN}\gm_mse_in.dll"
-SectionEnd
-
-Section "UPnP Support" SecUPnP
-  SectionIn 1
-  File "${GPAC_BIN}\gm_platinum.dll"
-SectionEnd
-
-Section "Widget Manager" SecMPEGU
-  SectionIn 1
-  File "${GPAC_BIN}\gm_widgetman.dll"
-SectionEnd
-
-;Section "MobileIP Framework" SecMobIP
-;  SectionIn 1
-;  File "..\gm_mobile_ip.dll"
-;  File "..\MobileSession.dll"
-;SectionEnd
-
-Section "DekTec output" SecDecTek
-  SectionIn 1
-  File "${GPAC_BIN}\gm_dektec_out.dll"
+  File "${GPAC_BIN}\gm_validator.dll"
 SectionEnd
 
 SubSectionEnd
@@ -502,18 +364,10 @@
   Call AddToPath
 SectionEnd
 
-Section "MP42TS" SecMP42TS
-  SectionIn 1
-  SetOutPath $INSTDIR
-  File "${GPAC_BIN}\MP42TS.exe"
-  Push $INSTDIR
-  Call AddToPath
-SectionEnd
-
-Section "DashCast" SecDC
+Section "gpac" SecGPACBIN
   SectionIn 1
   SetOutPath $INSTDIR
-  File "${GPAC_BIN}\dashcast.exe"
+  File "${GPAC_BIN}\gpac.exe"
   Push $INSTDIR
   Call AddToPath
 SectionEnd
@@ -525,7 +379,6 @@
   File /r ${GPAC_ROOT}\include\*.h
   SetOutPath $INSTDIR\sdk\lib
   File ${GPAC_BIN}\libgpac.lib
-  File ${GPAC_EXTRA_LIB}\js.lib
 SectionEnd
 
 !if /FileExists "${GPAC_BIN}\GPAX.dll"
@@ -545,7 +398,6 @@
 ;  File "${GPAC_BIN}\mfc100.dll"
 ;SectionEnd
 
-
 !ifdef IS_WIN64
 !define TARGET_ARCHITECTURE "x64"
 !else
@@ -591,48 +443,16 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAC} "GPAC Core"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmo4} "GPAC Player"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "GPAC Plugins"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecBIFS} "MPEG-4 BIFS Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecODF} "MPEG-4 Object Descriptor Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecLASeR} "MPEG-4 LASeR Scene Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTextLoad} "Support for uncompressed MPEG-4 (BT and XMT), VRML and X3D textual formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSAF} "MPEG-4 SAF Demultiplexer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecIMG} "Support for PNG, JPEG, BMP and JPEG2000 images"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAAC} "Support for MPEG-4 Audio HE-AAC decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP3} "Support for MPEG-1/2 Audio (inc. MP3) decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAC3} "Support for Dolby AC3 decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecFFMPEG} "Support for FFMPEG libraries for various format decoding and demultiplexing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXVID} "Support for XVID library for MPEG-4 Video Part 2 decoding"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecAMRFT} "Support for AMR and AMR WideBand decoder and web radios"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSUBS} "Subtitle support include SRT, SUB, 3GPP and MPEG-4 Text formats"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecISOFF} "Support for ISO-based file formats (3GP, MP4, MJ2K)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebVTT} "Support for WebVTT subtitles"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecATSC} "ATSC3 support"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecWAVE} "Windows MME Audio output support"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecXIPH} "Support for XIPP OGG, Vorbis and Theora media"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOSVC} "Support for SVC decoding through OpenSVC Decoder"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOHEVC} "Support for HEVC decoding through OpenHEVC Decoder"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecNVDEC} "Support for hardware decoding through NVidia cuvid"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDASH} "HTTP Streaming using MPEG DASH"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMSE}  "HTTP Streaming using HTML 5 Media Source Extensions"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMobIP} "UNIGE Mobile IP Framework"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDecTek} "DekTek 3G SDI output support"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRAW} "RAW audio-video output support"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecOffisComp} "OFFIS Audio Compressor"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for various multimedia operations"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP42TS} "MP42TS command-line tool for MPEG-2 TS multiplexing"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDC} "DashCast offline and live MPEG-DASH Encoder"
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SecUPnP} "Support for UPnP based on Platinum"
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SecMPEGU} "Support for W3C and MPEG-U Widgets"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4B} "MP4Box command-line tool for MP4 file manipulation"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPACBIN} "gpac command-line tool for various multimedia operations"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSDK} "GPAC SDK: headers and library files needed to develop modules for GPAC or appllication based on GPAC"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecZILLA} "GPAC playback support NPAPI-based browsers (FireFox/Gecko, Safari/WebKit)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPAX} "GPAC playback support using ActiveX component (Internet Explorer)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMP4C} "GPAC command-line player and AVI dumper"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSDL} "GPAC SDL support"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecValidator} "GPAC Test Validator"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

gpac-1.0.0.tar.gz/share Added

gpac-1.0.0.tar.gz/share/default.cfg Added

gpac-1.0.0.tar.gz/share/doc Added

gpac-1.0.0.tar.gz/share/doc/CODING_STYLE Added

@@ -0,0 +1,137 @@
+GPAC coding style
+
+Introduction
+  coding styles only concern the GPAC core library (libgpac), and should be used for external filters and modules development.
+  
+  AStyle is a code beautifier tool. Code should be compliant with the following pattern provided by AStyle :
+  AStyle -r --indent=tab '*.c' '*.h' '*.cpp' '*.hpp'
+    
+1 Exported symbols 
+
+  1.0 Informative note
+  The GF_ or gf_ stands for "gpac framework"
+
+  1.1 typedef of structures - typedef of base types - typedef of functions
+
+All symbols defined within libgpac library and exported for application development purposes shall begin with GF_* 
+with the first character of "*" being in capital, regardless of their functionality.
+For example, GF_Thread (structure), GF_Err (redefined type), GF_LineCap (enum typedef)
+    
+All structure typedefs, whether defined (declaration exported through ehaders) or not (declaration intern to the GPAC core lib), must follow
+this principle.
+Furthermore, typedef of non-exported structure shall only apply to the structure itself, not a pointer to it. 
+    typedef struct _my_gpac_thingy *GF_LPMYGPACSTUFF;    /*this is FORBIDDEN*/
+    typedef struct _my_gpac_thingy GF_MyGPACStuff;    /*this is OK*/
+This will allow easy exporting of structure declaration if needed at some point in the development.
+
+
+  1.2 constants
+
+All constants (whether #defines or enums) shall be in capital letters and begin with "GF_" and use "_" for word separation
+For example, error code GF_BAD_PARAM.
+
+Enums names shall refer to the main module they are used in through a keyword right after the GF_ .
+For example, 
+  * enums refering to file format (isomedia) will be prefixed by GF_ISOM_
+  * enums refering to MPEG-4 OD tools (odf) will be prefixed by GF_ODF_
+  
+  1.3 functions
+
+All exported functions and pointer to functions shall begin with "gf_". The name shall refer to the main module they are sued in 
+through a keyword right after the gf_ when reasonable (gf_isom_, gf_odf_, gf_filter_), or to the tool they refer to (gf_bs_, gf_url, ...)
+  
+2 Miscalleanous
+
+All exported functions' names shall be in lower case exclusively.
+All exported functions' parameters should be in lower case exclusively.
+Exported structures may use case in any fashion as long as they respect the rules expressed in section 1 above.
+Exported structures member should preferably all be lower case - this may not be feasible for scene graph nodes & like...
+
+All exported header files shall be in lower case
+All source files within the gpac core shall be in lower case
+
+All comments should be C-like ones (/**/) not C++ ones (//)
+All exported headers documentation should be written with doxygen syntax
+All constructor-like functions should be of style gf_zzz_new
+All destructor like functions should be of style gf_zzz_del
+
+3 Current structure of the GPAC repository
+  
+This is a short overview of the gpac source repository. 
+
+- *gpac/applications/*
+    various apps of GPAC, including MP4Box, MP4Client, gpac and other players for iOS and Android
+- *gpac/bin/*
+    output path of build system
+- *gpac/build/*
+    various build systems (MSVC, Android, XCode, ...)
+- *gpac/debian/*
+    files for debian packaging
+- *gpac/extra_lib/*
+    external lib directory used by different build systems
+- *gpac/include/gpac/*
+    all exported files of the lib (high level APIs, full documentation available).
+- *gpac/include/gpac/internal/*
+    all development files of the lib (low level access).
+- *gpac/include/gpac/modules/*
+    all module APIs defined in GPAC.
+- *gpac/packagers/*
+    installer scripts for Windows and OSX
+- *gpac/modules/*
+    various modules of GPAC (video and audio output, font engine,  sensors, ...)
+- *gpac/share/doc*
+    doxygen for GPAC
+- *gpac/share/doc/idl
+    doxygen for JS APIs developped in GPAC
+- *gpac/share/doc/man*
+    man pages for GPAC
+- *gpac/share/gui/*
+    BIFS+SVG based GUI used by client.
+- *gpac/share/lang/*
+    Language files (under development) for GPAC options and help
+- *gpac/share/res/*
+    various resource files used in installers
+- *gpac/share/scripts/*
+    various JS scripts used by GPAC.
+- *gpac/share/shaders/*
+    GLSL shaders used by the compositor.
+- *gpac/share/vis/*
+    Remotery web client.
+- *gpac/src/bifs/*
+    BInary Format for Scene coding (decoder and encoder) (BIFS tables are with MPEG4Gen application in gpac/applications/generators/MPEG4)
+- *gpac/src/compositor/*
+    interactive composition engine  for 2D & 3D drawing - handles MPEG-4, X3D/VRML and SVG.
+- *gpac/src/crypto/*
+    cryptographic tools (AES 128 CBC and CTR only)
+- *gpac/src/evg/*
+    anti-aliased software rasterizer for 2D vector graphics
+- *gpac/src/filter_core/*
+    filter engine of GPAC, in charge of filter graph resolution, filter scheduling, packets handling.
+- *gpac/src/filters/*
+    filters defined in GPAC. This include encoders, decoders, av output, wrapper for GPAC's compositor, ISOBMF, RTP, M2TS muxers and demuxers, etc ...
+- *gpac/src/ietf/*
+    small RTP/RTSP/SDP library, plus media packetizers.
+- *gpac/src/isomedia/*
+    ISOBMFF (Iso Base Media File Format), features file reading/writing/editing, precise interleaving, hint track creation and movie fragments (read/write). Includes 3GPP/3GPP2 ,  AVC/SVC, HEVC/L-HEVC and JPEG2000 support.
+- *gpac/src/jsmods/*
+    Various JavaScript modules
+- *gpac/src/laser/*
+    MPEG-4 LAsER (Lightweight Application Scene Representation)
+- *gpac/src/media_tools/*
+    media tools for authoring: ISMA & 3GPP tools, AV parsers, media importing and exporting, hinting ...
+- *gpac/src/odf/*
+    MPEG-4 Object Descriptor Framework: encoding/decoding of all descriptors, OD codec and OCI codec
+- *gpac/src/quickjs/*
+    QuickJS javascript engine sources
+- *gpac/src/scene_manager/*
+    memory representation of the scene, importers (BT/XMT/SWF/QT), dumpers and encoding
+- *gpac/src/scenegraph/*
+    scene Graph API (MPEG4/VRML/X3D/SVG) - BIFS/VRML/X3D nodes are generated using gpac/applications/generators/*
+- *gpac/src/terminal/*
+    client application engine. This is a simple wrapper around the filter engine of GPAC.
+- *gpac/src/utils/*
+    all generic objects used throughout the lib (list, bitstream, thread, mutex...). The OS specific files are prefixed os_* .
+- *gpac/testsuite/*
+    tests suite for GPAC - this is a GIT submodulen repository URL is https://github.com/gpac/testsuite.
+
+

gpac-1.0.0.tar.gz/share/doc/GPAC UPnP.doc Changed

gpac-1.0.0.tar.gz/share/doc/ISO 639-2 codes.txt Changed

gpac-1.0.0.tar.gz/share/doc/SceneGenerators Changed

gpac-1.0.0.tar.gz/share/doc/configuration.html Added

@@ -0,0 +1,103 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>GPAC Configuration documentation </title>
+</head>
+
+<p style="text-align: center; Font-Size: 24pt">
+<br/>
+<b>GPAC Configuration file documentation
+<br/>GPAC Version 1.0.0</b>
+</p>
+
+<br/><br/>
+
+<a name="Overview"></a><span style="text-decoration: underline;"><b>Overview</b></span>
+<p>Applications in the GPAC framework use a configuration file common to libgpac and modules (video and audio output, compositor modules). This configuration file is called  <i>GPAC.cfg</i>. It is located:
+<ul>
+<li>on Windows platforms, in C:\\Users\\FOO\\AppData\\Roaming\\GPAC, or in C:\\Program Files\\GPAC.</li>
+<li>on iOS platforms, in a .gpac folder in the app storage directory.</li>
+<li>on Android platforms, in <i>/sdcard/osmo/</i> or, if not found there, created in <i>/data/data/com.gpac.Osmo4</i>.</li>
+<li>on other platforms, in a .gpac folder in the user home directory (for ex, /home/foo/.gpac/ or /Users/foo/.gpac/).</li>
+</ul>
+GPAC can use different configuration profiles other than the default, check <a href="https://github.com/gpac/gpac/wiki/core_config">GPAC wiki</a>.
+<br/>
+The config file is structured in sections, each made of one or more keys. A section is declared as <b><i>[SectionName]</i></b>, and key is declared as <b><i>keyName</i></b>=<i>value</i>. The key value is not interpreted and always handled as ASCII text.
+
+<p>This document describes player-specific options defined in section <a href="#General" style="text-decoration: underline;">General</a> and old DirectFB options described in section <a href="#DirectFB" style="text-decoration: underline;">DirectFB</a>.
+<br/>
+Check GPAC wiki for the documentation of <a href="https://github.com/gpac/gpac/wiki/core_options">libgpac core options</a> and <a href="https://github.com/gpac/gpac/wiki/core_config">filter options</a> configuration.
+</p>
+<br/>
+
+
+<i>Note on module names</i>
+<br/>Module names as given in the config file are names exported by each interface and not name of the physical library file (<i>.dll, .so, ...</i>). The physical file name can however be used to identify a module - it will then be replaced by the module name.
+
+
+<br/><br/>
+
+<a name="General"></a>
+<span style="text-decoration: underline;"><b>Section "General"</b></span> <i><a href="#Overview">Back to top</a></i>
+<p>
+The <b>General</b> section of the config file holds player-specific options.
+</p>
+<b>StartupFile</b> [value: <i>filename</i>]
+<p style="text-indent: 5%">
+Specifies file to load upon startup of most clients (Osmo4/MP4Client). If not specified, no file is loaded.
+</p>
+
+<b>LogFile</b> [value: <i>filename</i>, <b>Android only</b>]
+<p style="text-indent: 5%">
+Specifies where to output GPAC's log. By default, the logs are written to stdout. Note that GPAC may be compiled without log support. This is not used by MP4Client.
+</p>
+<b>Logs</b> [value: <i>tool[:tool]@level:tool[:tool]@level</i>, <b>Android only</b>]
+<p style="text-indent: 5%">
+Specifies log level for each tool. For more information on available tools and levels, check <a href=-"https://github.com/gpac/gpac/wiki/core_logs">GPAC wiki</a>.
+</p>
+
+
+<b>NoMIMETypeFetch</b> [value: <i>"yes" "no"</i>]
+<p style="text-indent: 5%">
+Specifies whether mime type should be fetched when checking a link to a new file (currently deprecated).
+</p>
+<b>LastWorkingDir</b> [value: <i>string</i>]
+<p style="text-indent: 5%">
+Indicates the last directory from which a file was opened.
+</p>
+<b>iOSDocumentsDir</b> [value: <i>string</i>, <b>iOS only</b>]
+<p style="text-indent: 5%">
+Path to the iOS document directory for the client (automatically set upon first launch of the player).
+</p>
+
+<br/><br/>
+
+<a name="DirectFB"></a>
+<span style="text-decoration: underline;"><b>Section "DirectFB"</b></span> <i><a href="#Overview">Back to top</a></i>
+<p>
+The "DirectFB" section of the config file holds the configuration options for the DirectFB output module. You may also  want to check the <a href="http://directfb.org/wiki/index.php/Configuring_DirectFB">official documentation</a>.
+</p>
+<b>DisableAcceleration</b> [value: <i>"yes"</i> <i>"no"</i>]
+<p style="text-indent: 5%">
+Forces to disable hardware acceleration.</p>
+<b>DisableDisplay</b> [value: <i>"yes"</i> <i>"no"</i>]
+<p style="text-indent: 5%">
+Specifies the DisableDisplay parameter value.</p>
+<b>FlipSyncMode</b> [value: <i>"waitsync"</i> <i>"wait"</i> <i>"sync"</i> <i>"swap"</i>]
+<p style="text-indent: 5%">
+Specifies the flip sync mode.</p>
+<b>DisableBlit</b> [value: <i>"yes"</i> <i>"no"</i>]
+<p style="text-indent: 5%">
+Forces to disable hardware blitting.</p>
+<b>WindowMode</b> [value: <i>"X11"</i> <i>"SDL"</i>]
+<p style="text-indent: 5%">
+Specifies the underlying windowing library.</p>
+
+
+<br/><br/>
+
+
+</body>
+</html>

gpac-1.0.0.tar.gz/share/doc/doxyfile Added

@@ -0,0 +1,2433 @@
+# Doxyfile 1.8.10
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = libgpac
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Documentation of the core library of GPAC"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = ../res/gpac.png
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = YES
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = YES
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = NO
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = YES
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = doxygen_warnings.txt
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# 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/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
+
+# 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
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd,
+# *.vhdl, *.ucf, *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = ../../include/gpac/nodes_mpeg4.h \
+				../../include/gpac/nodes_svg.h \
+				../../include/gpac/nodes_x3d.h \
+				../../include/gpac/nodes_xbl.h \
+				../../include/gpac/configuration.h \
+				../../include/gpac/revision.h \
+				../../include/gpac/ait.h \
+				../../include/gpac/dsmcc.h \
+				../../include/gpac/dvb_mpe.h 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = */doc/* \
+                         */tests/* \
+                         */build/* \
+                         */bin/* \
+                         */applications/* \
+                         */modules/*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = ../../README.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html-libgpac
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = ../../include
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 100
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES

gpac-1.0.0.tar.gz/share/doc/doxyfile-full Added

@@ -0,0 +1,2321 @@
+# Doxyfile 1.8.5
+# Doxyfile 1.8.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = GPAC
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Open Source Multimedia Framework. For more information, check out http://gpac.wp.mines-telecom.fr"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           = ..\regression_tests\auxiliary_files\logo.jpg
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = .
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
+# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
+# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = NO
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = NO
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = YES
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = YES
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = NO
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note the this
+# will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = NO
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = doxygen_warnings.txt
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = ../../applications/mp4box \
+						 ../../applications/mp4client \
+						 ../../include  \
+						 ../../src \
+						 ../../modules
+
+# 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
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html-gpac
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = YES
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = NO
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = ../../include
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = YES
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = svg
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = YES
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 3
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES

gpac-1.0.0.tar.gz/share/doc/idl Added

gpac-1.0.0.tar.gz/share/doc/idl/evg.idl Added

@@ -0,0 +1,1828 @@
+/*
+\file
+\brief silence !
+*/
+
+/*!
+
+\defgroup jsevg_grp EVG JS API
+\ingroup jsapi_grp
+\brief Embedded Vector Graphics JavaScript API.
+
+This module provides bindings for GPAC \ref evg_grp engine called EVG (for Embedded Vector Graphics).
+
+The API is loaded as a JS module with the name "evg":
+
+\code
+import * as evg from 'evg'
+
+...
+\endcode
+
+The API supports all Vector Graphics from \ref evg_grp, \ref path_grp, bindings for 2D and 3D matrices and text rendering as used by the \ref compose_grp.
+
+The API is a low level access to the software rasterizer and does not follow the Canvas2D API (https://www.w3.org/TR/2dcontext/) but most of the tools required
+to implement Canvas2D are present in the evg API. 
+
+It allows a filter to:
+- generate new video frames from scratch
+- use input video frames to generate new frames
+- generate vector graphics and text directly on input video frames
+
+Whenever pixel coordinates are indicated, 0,0 indicates:
+- the center of the surface if the surface uses centered coordinates
+- the top-left of the surface if the surface does not use centered coordinates
+
+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 Canvas object is used to draw vectorial 2D path */
+interface Canvas {
+	/*! Canvas 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
+	 */
+	Canvas(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
+	 */
+	Canvas(unsigned long width, unsigned long height, DOMString pixfmt, ArrayBuffer data, optional unsigned long stride=0, optional unsigned long stride_uv=0);
+
+/*! indicates if surface coordinates are centered or not - see \ref gf_evg_surface_set_center_coords*/
+attribute boolean centered;
+
+/*! path to draw - see \ref gf_evg_surface_set_path. The path object is either a Path or a Text*/
+writeonly Path path;
+
+/*! matrix to apply to path - see \ref gf_evg_surface_set_matrix. 
+\note A same path can be drawn several times with different matrices, null means no matrix. */
+writeonly Matrix2D matrix;
+
+/*! 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;
+
+/*! composite operation for alpha surfaces - see \ref gf_evg_surface_set_composite_mode*/
+attribute unsigned long compositeOperation;
+
+/*! 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;
+
+/*! 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);
+
+/*! fills the path with the given solid brush or gradient stencil - see \ref gf_evg_surface_fill
+\param stencil the stencil to use*/
+void fill(Stencil stencil);
+
+/*! fills the path with the given texture - see \ref gf_evg_surface_fill
+\param texture the texture to use*/
+void fill(Texture texture);
+
+/*! 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);
+
+};
+
+
+/*! rectangle object, pixel coordinate */
+interface IRect
+{
+	/*! x coordinate in pixels of top-left corner*/
+	unsigned long x;
+	/*! y coordinate in pixels of top-left corner*/
+	unsigned long x;
+	/*! width of rectangle in pixels*/
+	unsigned long w;
+	/*! height of rectangle in pixels*/
+	unsigned long h;
+};
+
+/*! rectangle object */
+interface Rect
+{
+	/*! x coordinate of top-left corner*/
+	unsigned long x;
+	/*! y coordinate  of top-left corner*/
+	unsigned long x;
+	/*! width of rectangle*/
+	unsigned long w;
+	/*! height of rectangle*/
+	unsigned long h;
+};
+
+/*! point object */
+interface Point2D
+{
+	/*! x coordinate of point*/
+	unsigned long x;
+	/*! y coordinate of point*/
+	unsigned long x;
+};
+
+/*! alpha callback type*/
+interface AlphaCallback {
+	/*! alpha callback functions
+	\param source_alpha value of alpha of source color at the given pixel coordinate. Values are between 0 and 255
+	\param x horizontal pixel coordinate, 0 meaning first column of raster surface
+	\param y vertical pixel coordinate, 0 meaning first row of raster surface
+	\return the alpha value to use. 
+
+	\warning the return value is not checked for clamping, it should therefore be between 0 and 255
+	\warning the coordinates are not relative to the centered mode of the surface, 0,0 is always the top-left corner
+	*/
+	unsigned long on_alpha(unsigned long source_alpha, unsigned long x, unsigned long y);
+}
+
+/*! Path object to describe vector graphics.
+Most path functions return the path object itself, so that the operations can be chained:
+\code
+path.move_to(0,0).line_to(0,100).line_to(10, 10).close();
+\endcode
+*/
+interface Path {
+	/*! Constructor*/
+	Path();
+
+	/*! empty path flag - see \ref gf_path_is_empty*/
+	readonly attribute boolean empty;
+	/*! if true, path will use zero_non_zero fill rule otherwise odd/even rule*/
+	readonly attribute boolean zero_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;
+
+	/*! checks if point is over a path - see \ref gf_path_point_over
+	\param pt point to test
+	\return true if over*/
+	boolean point_over(Point2D pt);
+	/*! checks if point is over a path - see \ref gf_path_point_over
+	\param x x-coord of point to test
+	\param y y-coord of point to test
+	\return true if over*/
+	boolean point_over(double x, double y);
+	/*! gets a flatten version of the path - see \ref gf_path_get_flatten
+	\return the created flatten path*/
+	Path get_flatten();
+
+	/*! flattens  the path - see \ref gf_path_flatten
+	\return the path*/
+	Path flatten();
+
+	/*! adds a path to the path - see \ref gf_path_add_subpath
+	\param subpath path to add
+	\return the path*/
+	Path add_path(Path subpath);
+
+	/*! adds an arc to the path - see \ref gf_path_add_arc
+	\param radius radius of the arc
+	\param start start angle of the arc in radians
+	\param end end angle of the arc in radians
+	\param close closing type: 0 for open arc, 1 for close arc, 2 for pie
+	\return the path*/
+	Path arc(double radius, double start, double end, optional unsigned long close=0);
+
+	/*! adds an SVG arc to the path - see \ref gf_path_add_svg_arc_to
+	\param end_x x-coordinate of the arc end point
+	\param end_y y-coordinate of the arc end point
+	\param r_x x-axis radius
+	\param r_y y-axis radius
+	\return the path*/
+	Path arc_svg(double end_x, double end_y, double r_x, double r_y);
+	/*! adds an SVG arc to the path - see \ref gf_path_add_svg_arc_to
+	\param end_x x-coordinate of the arc end point
+	\param end_y y-coordinate of the arc end point
+	\param r_x x-axis radius
+	\param r_y y-axis radius
+	\param x_axis_rotation angle for the x-axis
+	\param large_arc_flag large or short arc selection
+	\param sweep_flag if 1, the arc will be clockwise, otherwise counter-clockwise.
+	\return the path*/
+	Path arc_svg(double end_x, double end_y, double r_x, double r_y, optional double x_axis_rotation=0, optional boolean large_arc_flag=false, optional boolean sweep_flag=false);
+
+	/*! adds an arc to the path - see \ref gf_path_add_arc_to
+	\param end_x x-coordinate of the arc end point
+	\param end_y y-coordinate of the arc end point
+	\param fa_x x-coordinate of the arc first focal point
+	\param fa_y y-coordinate of the arc first focal point
+	\param fb_x x-coordinate of the arc second focal point
+	\param fb_y y-coordinate of the arc second focal point
+	\param cw if 1, the arc will be clockwise, otherwise counter-clockwise.
+	\return the path*/
+	Path arc_bifs(double end_x, double end_y, double fa_x, double fa_y, double fb_x, double fb_y, optional boolean cw=false);
+
+	/*! adds N-1 bezier curve - see gf_path_add_bezier. The function can take any number of points
+	\param pt1 first control point of the bezier curve
+	\param pt2 second control point of the bezier curve
+	\param pt3 last point of the curve if last point defined, otherwise next control point
+	\return the path*/
+	Path n_bezier(Point2D pt1, Point2D pt2, Point2D pt3, ...);
+
+	/*! adds an ellipse - see \ref gf_path_add_ellipse
+	\param cx x-coordinate of the ellipse center
+	\param cy y-coordinate of the ellipse center
+	\param a_axis length of the horizontal ellipse axis
+	\param b_axis length of the vertical ellipse axis
+	\return the path*/
+	Path ellipse(double cx, double cy, double a_axis, double b_axis);
+
+	/*! adds an ellipse - see \ref gf_path_add_ellipse
+	\param center ellipse center
+	\param a_axis length of the horizontal ellipse axis
+	\param b_axis length of the vertical ellipse axis
+	\return the path*/
+	Path ellipse(Point2D center, double a_axis, double b_axis);
+
+	/*! adds a rectangle - see \ref gf_path_add_rect and \ref gf_path_add_rect_center
+	\param ox x-coordinate of the rectangle center or top-left
+	\param oy y-coordinate of the rectangle center or top-left
+	\param width width of the rectangle
+	\param height height of the rectangle
+	\param centered indicates if the given coordinates are the top-left one (false) or the center ones (true)
+	\return the path*/
+	Path rectangle(double ox, double oy, double width, double height, optional boolean centered=false);
+
+	/*! adds a rectangle - see \ref gf_path_add_rect and \ref gf_path_add_rect_center
+	\param o rectangle center or top-left
+	\param width width of the rectangle
+	\param height height of the rectangle
+	\param centered indicates if the given coordinates are the top-left one (false) or the center ones (true)
+	\return the path*/
+	Path rectangle(Point2D o, double width, double height, optional boolean centered=false);
+
+	/*! adds a quadratic  see \ref gf_path_add_quadratic_to 
+	\param c_x x-coordinate of the control point of the quadratic curve
+	\param c_y y-coordinate of the control point of the quadratic curve
+	\param x x-coordinate of the end point of the cubic quadratic
+	\param y y-coordinate of the end point of the cubic quadratic
+	\return the path*/
+	Path quadratic_to(double c_x, double c_y, double x, double y);
+
+	/*! adds a cubic bezier curve to the current contour, starting from the current path point - see \ref gf_path_add_cubic_to
+	\param c1_x x-coordinate of the first control point of the cubic curve
+	\param c1_y y-coordinate of the first control point of the cubic curve
+	\param c2_x x-coordinate of the second control point of the cubic curve
+	\param c2_y y-coordinate of the second control point of the cubic curve
+	\param x x-coordinate of the end point of the cubic curve
+	\param y y-coordinate of the end point of the cubic curve
+	\return the path*/
+	*/
+	Path cubic_to(double c1_x, double c1_y, double c2_x, double c2_y, double x, double y);
+
+
+	/*! adds a line - see \ref gf_path_add_line_to 
+	\param x x-coordinate of the point
+	\param y y-coordinate of the point
+	\return the path*/
+	Path line_to(double x, double y);
+
+	/*! adds a move to - see \ref gf_path_add_move_to 
+	\param x x-coordinate of the point
+	\param y y-coordinate of the point
+	\return the path*/
+	Path move_to(double x, double y);
+
+	/*! close the path - see \ref gf_path_close
+	\return the path*/
+	Path close();
+
+	/*! reset the path - see \ref gf_path_reset
+	\return the path*/
+	Path reset();
+
+	/*! clone the path - see \ref gf_path_clone
+	\return the cloned path*/
+	Path clone();
+
+	/*! generates a path outline - see \ref gf_path_get_outline
+	\param ps the pen settings used to produce the outline
+	\return the outline path*/
+	*/
+	Path outline(PenSettings ps);
+
+};
+
+/*! Pen settings, see \ref GF_PenSettings*/
+interface PenSettings {
+	/*! pen line width*/
+	attribute double width;
+	/*! The miter limit of the line joins*/
+	attribute double miter;
+	/*! The initial dash offset in the outline. All points before this offset will be
+	* ignored when building the outline*/
+	attribute double offset;
+	/*! The author-specified path length. Ignored if <= 0*/
+	attribute double length;
+	/*! The style of the lines ends*/
+	attribute unsigned long cap;
+	/*! The style of the lines joins*/
+	attribute unsigned long join;
+	/*! The alignment of the outline with regard to the path*/
+	attribute unsigned long align;
+	/*! The dash style of the line*/
+	attribute unsigned long dash;
+	/*! The dash pattern used for custom dashing*/
+	attribute Array dashes;
+};
+
+/*! 2D matrix, see \ref GF_Matrix2D
+the transformation of (x, y) into (x', y') is:
+\code
+x' = x * m.xx + y * m.xy + m.tx;
+y' = x * m.yx + y * m.yy + m.ty;
+\endcode
+
+Most matrix functions return the path object itself, so that the operations can be chained:
+\code
+mx.rotate(0).translate(10, 20).scale(2, 2);
+\endcode
+
+All objects (Point2D, Rect) used in the API do not use constructors, their type is inferred if the expected attributes (eg x y, ...) are present in the object
+
+\code
+let res = max.apply({x:0,y: 0});
+print(`transformed ${res.x} ${res.y});`
+\endcode
+
+
+*/
+interface Matrix2D {
+	/*! constructor*/
+	Matrix2D();
+	/*! constructor
+	\param from the color matrix to use*/
+	Matrix2D(Matrix2D from);
+	/*! constructor
+	\param coefs the matrix coeficients
+	*/
+	Matrix2D(double coefs...);
+
+	/*! xx */
+	attribute double xx;
+	/*! xy */
+	attribute double xy;
+	/*! tx */
+	attribute double tx;
+	/*! yx */
+	attribute double yx;
+	/*! yy */
+	attribute double yy;
+	/*! ty */
+	attribute double tx;
+	/*! matrix is identity*/
+	attribute boolean identity;
+
+	/*! get scale part of the matrix after decomposition - see \ref gf_mx2d_decompose
+	\return {x, y} object, or null if matrix cannot be decomposed*/
+	Point2D get_scale();
+	/*! get translate part of the matrix after decomposition - see \ref gf_mx2d_decompose
+	\return {x, y} object, or null if matrix cannot be decomposed*/
+	Point2D get_translate();
+	/*! get rotation part of the matrix after decomposition - see \ref gf_mx2d_decompose
+	\return rotation, or null if matrix cannot be decomposed*/
+	double get_rotate();
+
+	/*! inverse matrix - see \ref gf_mx2d_inverse
+	\return the matrix*/
+	Matrix2D inverse();
+	/*! copies the matrix 
+	\return the new copy matrix*/
+	Matrix2D copy();
+	/*! 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
+	\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
+	\param vec translation vector
+	\return the matrix*/	
+	Matrix2D translate(Point2D vec);
+
+	/*! add a rotation - see \ref gf_mx2d_add_rotation
+	\param cx center x coordinate
+	\param cy center y coordinate
+	\param a rotation angle
+	\return the matrix*/	
+	Matrix2D rotate(double cx, double cy, double a);
+	/*! adds scale - see \ref gf_mx2d_add_scale
+	\param sx horizontal scale factor
+	\param sy vertical scale factor
+	\return the matrix*/	
+	Matrix2D scale(double sx, double sy);
+
+	/*! adds scale - see \ref gf_mx2d_add_scale_at
+	\param sx horizontal scale factor
+	\param sy vertical scale factor
+	\param cx horizontal scaling center coordinate
+	\param cy vertical scaling center coordinate
+	\param angle scale orienttion angle in radians
+	\return the matrix*/	
+	Matrix2D scale(double sx, double sy, double cx, double cy, double angle);
+	/*! adds skew - see gf_mx2d_add_skew
+	\param skew_x horizontal skew factor
+	\param skew_y vertical skew factor
+	\return the matrix*/	
+	Matrix2D skew(double skew_x, double skew_y);
+	/*! adds horizontal skew - see gf_mx2d_add_skew_x
+	\param skew horizontal skew factor
+	\return the matrix*/	
+	Matrix2D skew_x(double skew);
+	/*! adds vertical skew - see gf_mx2d_add_skew_y
+	\param skew vertical skew factor
+	\return the matrix*/	
+	Matrix2D skew_y(double skew);
+
+	/*! transforms a point with a matrix - see gf_mx2d_apply_point
+	\param in input point to transform
+	\return the transformed point*/
+	Point2D apply(Point2D in);
+	/*! transforms a rectangle with a matrix - see gf_mx2d_apply_rect
+	\param in input rectangle to transform
+	\return the transformed rectangle*/
+	Rect apply(Rect in);
+};
+
+/*! color matrix*/
+interface ColorMatrix {
+	/*! constructor*/
+	ColorMatrix();
+	/*! constructor
+	\param from the color matrix to use */
+	ColorMatrix(ColorMatrix from);
+	/*! constructor
+	\param coefs the matrix coeficients
+	 */
+	ColorMatrix(double coefs...);
+	
+	/*! rr*/
+	attribute double rr;
+	/*! rg*/
+	attribute double rg;
+	/*! rb*/
+	attribute double rb;
+	/*! ra*/
+	attribute double ra;
+	/*! tr*/
+	attribute double tr;
+	/*! gr*/
+	attribute double gr;
+	/*! gg*/
+	attribute double gg;
+	/*! gb*/
+	attribute double gb;
+	/*! ga*/
+	attribute double ga;
+	/*! tg*/
+	attribute double tg;
+	/*! br*/
+	attribute double br;
+	/*! bg*/
+	attribute double bg;
+	/*! bb*/
+	attribute double bb;
+	/*! bb*/
+	attribute double ba;
+	/*! tb*/
+	attribute double tb;
+	/*! ar*/
+	attribute double ar;
+	/*! ag*/
+	attribute double ag;
+	/*! ab*/
+	attribute double ab;
+	/*! aa*/
+	attribute double aa;
+	/*! ta*/
+	attribute double ta;
+	/*! identity*/
+	attribute boolean identity;
+	/*! multiplies two color matrix this * with
+	\param with color matrix to multiply with
+	\return the ColorMatrix*/
+	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
+	\return transformed color*/
+	Color apply(DOMString color);
+
+	/*! apply a color transformation as 8bit RGB
+	\param color a color interface
+	\return transformed color*/
+	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
+	\return transformed color*/
+	Colorf applyf(DOMString color);
+
+	/*! apply a color transformation as float RGB
+	\param colorf a color interface
+	\return transformed color*/
+	Colorf apply(Color colorf);
+};
+
+/*! color object*/
+interface Color
+{
+	/*! red component - if absent, default to 0*/
+	unsigned long r;	
+	/*! green component - if absent, default to 0*/
+	unsigned long g;	
+	/*! blue component - if absent, default to 0*/
+	unsigned long b;	
+	/*! alpha component - if absent, default to 255*/
+	unsigned long a;	
+};
+
+/*! color object*/
+interface Colorf
+{
+	/*! red component - if absent, default to 0*/
+	double r;	
+	/*! green component - if absent, default to 0*/
+	double g;	
+	/*! blue component - if absent, default to 0*/
+	double b;	
+	/*! alpha component - if absent, default to 1.0*/
+	double a;	
+};
+
+/*! interface object to solid brush, linear gradient and radial gradient stencils*/
+interface Stencil {
+	/*! constructor for solid color stencil*/
+	SolidBrush();
+	/*! constructor for linear gradient stencil*/
+	LinearGradient();
+	/*! constructor for radial gradient stencil*/
+	RadialGradient();
+
+	/*! padding mode of gradient - see \ref gf_evg_stencil_set_gradient_mode*/
+	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;
+
+	/*! 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*/
+	void set_color(DOMString color);
+
+	/*! set color for solid brush stencil - see \ref gf_evg_stencil_set_brush_color.
+	\note Omitting the last values will assume 0xFF for alpha, and 0x00 for other values
+	\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 set_color(unsigned long r, unsigned long g, unsigned long b, unsigned long a);
+
+	/*! set color for solid brush stencil
+	\param color the color to set*/
+	void set_colorf(Colorf color);
+
+	/*! set color for solid brush stencil
+	\note Omitting the last values will assume 0xFF for alpha, and 0x00 for other values
+	\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 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
+	\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
+	\param alpha the alpha to set, between 0.0 and 1.0*/
+	void set_alpha(double alpha);
+
+	/*! 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:
+	\code
+	gra.set_points(0, 0, {x:1.0:, y:1.0});
+	gra.set_points({x:0, y:0}, {x:1.0:, y:1.0});
+	gra.set_points({x:0, y:0}, 1.0, 1.0);
+	gra.set_points(0, 0, 1.0, 1.0);
+	\endcode
+
+	\param start gradient line start point
+	\param end gradient line end point
+	*/
+	void set_points(Point2D start, optional Point2D end={0,0} );
+
+
+	/*! sets radial graident center, focal and radius points - see \ref gf_evg_stencil_set_radial_gradient
+	\note Point2D can be replaced with 2 number x, y, i.e. these syntaxes are all equivalent:
+	\code
+	gra.set_points(0, 0, {x:1.0:, y:1.0}, 0, 0);
+	gra.set_points({x:0, y:0}, 1.0, 1.0, {x:0, y:0});
+	...
+	\endcode
+
+	\param center coordinates of center
+	\param focal coordinates of focal
+	\param radius size of horizintal and vertical radius
+	*/
+	void set_points(Point2D center, Point2D focal, Point2D radius);
+
+	/*! 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
+	*/
+	void set_stop(double pos, DOMString color);
+
+	/*! 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 a color object
+	*/
+	void set_stop(double pos, Color color);
+
+	/*! 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 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 set_stop(double pos, unsigned long r, unsigned long g, unsigned long b, unsigned long a);
+
+
+	/*! 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 a color object
+	*/
+	void set_stopf(double pos, Colorf color);
+
+	/*! 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 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 set_stopf(double pos, double r, double g, double b, double a);
+};
+
+/*! texture stencil*/
+interface Texture {
+	/*! pixel data constructor.
+	\param width width of the texture
+	\param height height of the texture
+	\param pixfmt pixel format of the texture
+	\param data texture data to use
+	\param stride stride of pixel buffer or of first plane for planar formats
+	\param stride_uv stride of second plane for planar formats
+	*/
+	Texture(unsigned long width, unsigned long height, DOMString pixfmt, ArrayBuffer data, optional unsigned long stride=0, optional unsigned long stride_uv=0);
+	
+	/*! image file constructor. Only JPEG and PNG local files are supported. This constructor is used to quickly load an image file without using a filter chain for that
+	\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
+	*/
+	Texture(DOMString filename, optional boolean is_rel_script=false);
+	
+	/*! ArrayBuffer. Only JPEG and PNG local files are supported. This constructor is used to quickly load an image file without using a filter chain for that
+	\param img_data array buffer containing the compressed image data
+	*/
+	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. 
+	\param width width of the texture
+	\param height height of the texture
+	\param pixfmt pixel format of the texture
+	\param param_fun texture data to use. This function is called on the texture object with two parameters x and y indicating the desired pixel in the texture, where (0,0) is top-left; the function shall return a Colorf interface 
+	\param use_screen_coords if set, the calbback function is passed screen coordinates rather than texture coordinates (and width/height of texture are ignored)
+	*/
+	Texture(unsigned long width, unsigned long height, DOMString pixfmt, Function param_fun, optional boolean use_screen_coords=false);
+
+	/*! canvas constructor.
+	\note There is no restriction on the source canvas, you can even use the target drawing canvas as a source to produce nice effects.
+	\param canvas the canvas to use as a texture
+	*/
+	Texture(Canvas canvas);
+
+	/*! packet constructor. This is usually needed for planar YUV format where planes are not contiguous in memory (eg output of hardware decoder). 
+	The size of the pixel buffer will be derived from the packet's PID properties
+	\param packet the source packet to use as a source for the data
+	*/
+	Texture(FilterPacket packet);
+
+	/*! 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;
+	/*! horizontal repeat flag*/
+	attribute boolean repeat_s;
+	/*! vertical repeat flag*/
+	attribute boolean repeat_t;
+	/*! vertical flip flag*/
+	attribute boolean flip;
+
+	/*! width in pixels of image (RGB width or luma plane width)*/
+	readonly attribute boolean width;
+	/*! height in pixels of image (RGB height or luma plane height)*/
+	readonly attribute boolean height;
+	/*! pixel format*/
+	readonly attribute DOMString pixfmt;
+	/*! number of components*/
+	readonly attribute unsigned long comp;
+	/*! texture data*/
+	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
+	\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
+	\param alpha the alpha to set, between 0.0 and 1.0*/
+	void set_alpha(double alpha);
+
+	/*! converts texture from RGB/YUV to new HSV texture
+	\warning experimental, slow
+	\return new texture*/
+	Texture rgb2hsv();
+
+	/*! converts texture from HSV to new RGB texture
+	\warning experimental, slow
+	\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 
+	\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 
+	\return new texture*/
+	Texture yuv2rgb(Canvas surf);
+
+
+	/*! performs a convolution on the texture
+	\warning experimental, slow
+	\param k the convolution kernel to use
+	\return new texture*/
+	Texture convolution(ConvolutionKernel k);
+
+	/*! splits the given component into a new texture
+	\warning experimental, slow (uses pixel by pixel access)
+	\param idx the component index. 0 is red or greyscale, 1 is alpha (alhpagrey formats) or green, 2 is green and 4 is alpha
+	\return new texture*/
+	Texture split(unsigned long idx);
+
+
+	/*! gets RGB pixel value in a texture
+	\param s horizontal normalized texture coordinate of pixel, between 0 (left) and 1.0 (right)
+	\param t vertical normalized texture coordinate of pixel, between 0 (top) and 1.0 (bottom)
+	\param as_array if true, the return object is an array of 4 components, otherwise it is a Color object
+	\return the converted value
+	*/
+	Object get_pixelf(Float s, Float t, optional bool as_array=false);
+
+	/*! gets RGB pixel value in a texture
+	\param x horizontal coordinate of pixel, between 0 (left) and width (right)
+	\param y vertical coordinate of pixel, between 0 (top) and height (bottom)
+	\param as_array if true, the return object is an array of 4 components, otherwise it is a Color object
+	\return the converted value
+	*/
+	Object get_pixel(unsigned long x, unsigned long y, optional bool as_array=false);
+};
+
+/*! convolution kernel interface*/
+interface ConvolutionKernel
+{
+	/*! kernel width - shall be an odd number*/
+	attribute unsigned long w;
+	/*! kernel height - shall be an odd number*/
+	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*/
+	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;
+	/*! 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
+	 - GF_TEXT_ALIGN_START: left if text is left to right, right otherwise 
+	 - GF_TEXT_ALIGN_END: right if text is left to right, left otherwise
+	 - GF_TEXT_ALIGN_LEFT: left
+	 - GF_TEXT_ALIGN_RIGHT: right
+	 - GF_TEXT_ALIGN_CENTER: center
+	*/
+	attribute unsigned long align;
+	/*! baseline flag for vertical positioning (see Canvas2D):
+		- GF_TEXT_BASELINE_TOP: top of EM box
+		- GF_TEXT_BASELINE_HANGING: hanging (usually not available in fonts)
+		- GF_TEXT_BASELINE_MIDDLE: middle of EM box
+		- GF_TEXT_BASELINE_ALPHABETIC: baseline of font (default value)
+		- GF_TEXT_BASELINE_IDEOGRAPHIC: not supported, same as GF_TEXT_BASELINE_ALPHABETIC.
+		- GF_TEXT_BASELINE_BOTTOM: bottom of EM box
+	*/
+	attribute unsigned long baseline;
+	/*! text is horizontal*/
+	attribute boolean horizontal;
+	/*! text shoud be filpped while drawing*/
+	attribute boolean flip;
+	/*! text shoud be underlined while drawing (not supported)*/
+	attribute boolean underline;
+	/*! text shoud be bold (used when checking for font alternates)*/
+	attribute boolean bold;
+	/*! text shoud be italic (used when checking for font alternates)*/
+	attribute boolean italic;
+	/*! maximum width of text in local coordinate system (with no matrix transformations)*/
+	attribute double maxWidth;
+	/*! line spacing. If 0, the font's default line spacing is used*/
+	attribute double lineSpacing;
+
+	/*! sets text. Each argument is processed as follows:
+	- if the argument is an Array, process each item of the array as an element
+	- otherwise process argument as an element
+
+	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.
+	*/
+	void set_text(...);
+
+	/*! gets metrics for the text lines
+	\return text metrics*/
+	TextMeasure measure();
+
+	/*! gets a copy of the path data of the text. Usually only needed to do some path outlining of glyphs
+	\param centered_coords indicate of the path will be drawn on a centered coords surface. This is needed to perform final layout of text 
+	\return copy of text path data*/
+	Path get_path(optional bool centered_coords=true);
+};
+
+/*! text measurement interface*/
+interface TextMeasure
+{
+	/*! measured width of text*/
+	double width;
+	/*! measured height of text*/
+	double height;
+	/*! size of EM box of font*/
+	unsigned long em_size;
+	/*! ascent of font*/
+	unsigned long ascent;
+	/*! descent of font*/
+	unsigned long descent;
+	/*! line spacing of font*/
+	unsigned long line_spacing;
+	/*! underline position in EM box*/
+	unsigned long underlined;
+	/*! baseline position in EM box*/
+	unsigned long baseline;
+	/*! max horizontal advance of any glyphs in font*/
+	unsigned long max_advance_h;
+	/*! max vertical advance of any glyphs in font*/
+	unsigned long max_advance_v;
+};
+
+
+/*! Matrix 4x4 object. 
+
+
+The Matrix object can be imported using:
+\code
+import {Matrix} from 'webgl'
+
+...
+\endcode
+
+
+Most transformation values return the matrix object so that transformations can be chained:
+\code
+let mat = new Matrix().scale(1, 1, 2).translate(0, -10, 5);
+\endcode
+
+All objects (Vec3f, Vec4f, Rectf) used in the API do not use constructors, their type is inferred if the expected attributes (eg x y, ...) are present in the object
+
+\code
+let res = mat.apply({x:0,y: 0, z:10});
+print(`transformed ${res.x} ${res.y} ${res.z});`
+\endcode
+
+
+*/
+interface Matrix {
+/*! indicates if matrix is identity. If set to true, resets matrix*/
+attribute boolean identity;
+/*! float buffer of coeficients (typically use matrix.m to pass matrices uniforms)*/
+attribute Array<float> m;
+/*! yaw value of matrix*/
+attribute readonly float yaw;
+/*! pitch value of matrix*/
+attribute readonly float pitch;
+/*! roll value of matrix*/
+attribute readonly float roll;
+
+/*! translation value of decomposed matrix*/
+attribute readonly Vec3f dec_translate;
+/*! scale value of decomposed matrix*/
+attribute readonly Vec3f dec_scale;
+/*! rotation value of decomposed matrix*/
+attribute readonly Vec4f dec_rotate;
+/*! shear value of decomposed matrix*/
+attribute readonly Vec3f dec_shear;
+
+/*! copies matrix
+\param from matrix to copy coeficient from
+\return the matrix object
+*/
+Matrix copy(Matrix from);
+/*! check matrices are equal
+\param other matrix to compare with
+\return true if same matrices
+*/
+boolean equal(Matrix other);
+/*! translate a matrix
+\param x X translation value
+\param y Y translation value
+\param z Z translation value
+\return the matrix object
+*/
+Matrix translate(float x, float y, float z);
+
+/*! translate a matrix
+\param v translation vector
+\return the matrix object
+*/
+Matrix translate(Vec3f v);
+
+/*! scale a matrix
+\param x X scale value
+\param y Y scale value
+\param z Z scale value
+\return the matrix object
+*/
+Matrix scale(float x, float y, float z);
+
+/*! scale a matrix
+\param v scale vector
+\return the matrix object
+*/
+Matrix scale(Vec3f v);
+
+
+/*! rotate a matrix
+\param x X value of rotation axis vector
+\param y Y value of rotation axis vector
+\param z Z value of rotation axis vector
+\param angle rotation angle in radians
+\return the matrix object
+*/
+Matrix rotate(float x, float y, float z, float angle);
+
+/*! scale a matrix
+\param v rotation vector+angle
+\return the matrix object
+*/
+Matrix rotate(Vec4f v);
+
+
+/*! multiplies with another matrix (mx = mx * mul)
+\param mul the matrix
+\param do_4x4 if true, performs full multiplication on each row/col, otherwise handles last row as 0 0 0 1
+\return the matrix object
+*/
+Matrix add(Matrix mul, optional boolean do_4x4=false);
+
+/*! inverse the matrix
+\param do_4x4 if true, performs full inversion on each row/col, otherwise handles last row as 0 0 0 1
+\return the matrix object
+*/
+Matrix inverse(optional boolean do_4x4=false);
+
+/*! transposes the matrix
+\return the matrix object
+*/
+Matrix transpose();
+/*! Loads an orthogonal projection matrix
+\param left min horizontal coordinate of viewport
+\param right max horizontal coordinate of viewport
+\param bottom min vertical coordinate of viewport
+\param top max vertical coordinate of viewport
+\param z_near min depth coordinate of viewport
+\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);
+
+/*! loads a perspective projection matrix
+\param fov camera field of view angle in radian
+\param aspect_ratio viewport aspect ratio
+\param z_near min depth coordinate of viewport
+\param z_far max depth coordinate of viewport
+\return the matrix object
+*/
+Matrix perspective(float fov, float aspect_ratio, float z_near, float z_far);
+
+/*! loads a lookat matrix
+\param position position
+\param target look direction
+\param up_vector vector describing the up direction
+\return the matrix object
+*/
+Matrix lookat(Vec3f position, Vec3f target, Vec3f up_vector);
+
+/*! transforms a rectangle
+\param rc the rectangle to transform
+\return the transformed rectangle
+*/
+Rectf apply(Rectf rc);
+
+/*! transforms a 4D vector
+\param v the 4D vector to transform
+\return the transformed 4D vector
+*/
+Vec4f apply(Vec4f v);
+
+/*! transforms a 3D vector
+\param v the 3D vector to transform
+\return the transformed 3D vector
+*/
+Vec3f apply(Vec3f v);
+
+};
+
+/*! 3D vector object*/
+interface Vec3f {
+	/*! X coordinate*/
+	attribute float x;
+	/*! Y coordinate*/
+	attribute float y;
+	/*! Z coordinate*/
+	attribute float z;
+};
+
+/*! rectangle object*/
+interface Rectf {
+	/*! X coordinate*/
+	attribute float x;
+	/*! Y coordinate*/
+	attribute float y;
+	/*! width*/
+	attribute float width;
+	/*! height*/
+	attribute float height;
+};
+
+/*! 4D vector object*/
+interface Vec4f {
+	/*! X coordinate*/
+	attribute float x;
+	/*! Y coordinate*/
+	attribute float y;
+	/*! Z coordinate*/
+	attribute float z;
+	/*! 4th dimension same as 'q' or 'alpha'*/
+	attribute float w;
+	/*! 4th dimension same as 'w' or 'alpha'*/
+	attribute float q;
+	/*! 4th dimension same as 'q' or 'w'*/
+	attribute float alpha;
+};
+
+
+/*! 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
+{
+	/*! shader is a fragment shader*/
+	GF_EVG_SHADER_FRAGMENT=1,
+	/*! shader is a vertex*/
+	GF_EVG_SHADER_VERTEX,	
+} ShaderType;
+
+/*! Map type for vertex attributes and vertex attribute interpolators*/
+typedef enum
+{
+	/*! one vertex attribute is given for each vertex index*/
+	GF_EVG_VAI_VERTEX_INDEX=0,
+	/*! one vertex attribute is given for each vertex*/
+	GF_EVG_VAI_VERTEX,
+	/*! one vertex attribute is given for each primitive*/
+	GF_EVG_VAI_PRIMITIVE,
+} AttributeMapType;
+
+/*! Vertex attribute interpolator used by fragment shaders*/
+interface VertexAttribInterpolator
+{
+/*! constructor
+
+This constructor is typically used for vertex attributes that do not need any modification at the vertex shader stage and are directly interpolated in the fragment shader
+\param data float buffer containing the vertex attribute data
+\param nb_components number of floats per attribute
+\param map mapping mode of attribute per vertex or primitive
+*/
+VertexAttribInterpolator(Float32Buffer data, long nb_components, optional AttributeMapType map=GF_EVG_VAI_VERTEX_INDEX);
+
+/*! constructor
+
+This constructor is used for vertex attributes that are fetched through VertexAttrib in the vertex shader and need to be passed to the fragment shader
+\param nb_components number of floats per attribute
+*/
+VertexAttribInterpolator(long nb_components);
+
+/*! if set, the attribute value will be normalized upon fetch by the shader*/
+writeonly boolean normalize;
+	
+};
+
+/*! Vertex attribute buffer used by vertex shaders*/
+interface VertexAttrib
+{
+/*! constructor
+\param data float buffer containing the vertex attribute data
+\param nb_components number of floats per attribute
+\param map mapping mode of attribute per vertex or primitive
+*/
+VertexAttrib(Float32Buffer data, long nb_components, optional AttributeMapType map=GF_EVG_VAI_VERTEX_INDEX);
+
+/*! if set, the attribute value will be normalized upon fetch by the shader*/
+writeonly boolean normalize;
+};
+
+/*! Shader object common to vertex and fragment shaders
+
+Although QuickJS is an amazing piece of software, calling JavaScript for each fragment is just too costly. The shader object provides a simple
+set of tools to produce a vertex or fragment output at reasonnable speed, without interacting with JavaScript.
+
+# Generic principles 
+
+The working principles of the shader object is as follows:
+- no complex language processing (eg GLSL) and basic validation only (at least for the time being)
+- instructions and variables are pushed onto a stack of instructions
+- native EVG objects (Matrix, VertexAttrib, VertexAttribInterpolator, Texture) are stored as pointers to the native objects
+- 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. 
+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
+- A javascript object with properties {x, y, z, q/w} or {r,g,b,a} is converted to a 4 component vector
+- A javascript object with properties {x, y, z} or {r,g,b} is converted to a 3 component vector
+- A javascript object with properties {x, y} or {r,g} or {s,t} is converted to a 2 component vector
+- A javascript array is converted to a 1, 2, 3 or 4 float vector
+- A Matrix object is kept as a pointer
+- A VertexAttribInterpolator object is converted to a 2D, 3D or 4D vector depending on the number of components in the object
+- A Texture sample is converted to a 4D vector
+
+\note There is no support for structures nor arrays in the shader instructions.
+
+\warning A local variable can only be of type bool, integer, float or vector of float (up to 4 dimension). It is not possible to store an EVG object (Matrix, VertexAttrib, VertexAttribInterpolator, Texture) as a local variable.
+
+
+The assignment of vectors can use masking of components, using a combination of `x`, `y`, `z`, `q` (or `r`, `g`, `b`, `a` or `s`,`t) values:
+\code
+shader.push('foo', '=', 'val.xy');
+shader.push('foo.xy', '=', 'val.xz');
+\endcode
+\warning there is no swizzling , `.xy` is equivalent to `.yx`
+
+# Fragment shader reserved variables
+
+These variables names are reserved in a fragment shader, and their type cannot be modified:
+
+Variable name | type | Semantic
+------------- | ------------- | ------------- 
+fragColor | Vec4f | the fragment output color in RGBA colorspace
+fragRGBA | Vec4f | the fragment output color in RGBA colorspace
+fragYUVA | Vec4f | the fragment output color in YUVA colorspace
+fragX | float | the fragment X coordinate
+fragY | float | the fragment Y coordinate
+fragDepth | float | the fragment depth value - can be overwritten by shader 
+fragZ | float | the fragment Z coordinate
+fragW | float | the fragment W coordinate
+
+
+# Vertex shader reserved variables 
+
+These variables names are reserved in a vertex shader, and their type cannot be modified:
+
+Variable name | type | Semantic
+------------- | ------------- | ------------- 
+vertex | Vec4f | the input vertex coordinates 
+vertexOut | Vec4f | the output vertex coordinates 
+
+# Uniforms variables
+Uniforms variables are variables whose values need to be updated but do not require a change in the shader logic. Since some of these variables may be native JS interpreter types, they cannot be kept by reference in the stack. Instead, these variables are passed by names, and correspond to properties of the shader object. These properties are evaluated whenever the \ref Shader.update function is called.
+
+Uniforms are referenced in the shader as string variables prefixed with '.'; for example '.foo' will correspond to the 'foo' property of the shader object.
+The associated JS values can be:
+- boolean
+- integer
+- float
+- array of float, which is converted to Vec2f, Vec3f or Vec4f
+- Float32Array or ArrayBuffer, which is converted to Vec2f, Vec3f or Vec4f
+
+Example:
+
+\code
+//shader creation part
+...
+shader.push('my_var', '=', '.somevar');
+... do something with my_var
+shader.push('fragRGBA', '=', 'myvar');
+
+
+//setup draw
+canvas.fragment = shader
+shader.somevar = [0.5, 0.5, 0.5, 1.0];
+shader.update();
+//draw
+\endcode
+
+
+# Operations
+
+
+Operations take zero, one or two right values and assign the result to a left value.
+
+The left value can only be:
+- a built-in variable or a local variable in a fragment shader.
+- a built-in variable, a local variable or a VertexAttribInterpolator in a vertex shader.
+
+The first right value can be a built-in variable, a local variable, a uniform, a Texture, a VertexAttrib (vertex shader only), a VertexAttribInterpolator (fragment shader only) or a Matrix.
+
+\note There is currently no support for matrix product in the shaders
+
+Single-dimension operations on vectors are done component-wise, eg res.x = sin(rv1.x), res.y = sin(rv1.y), ... 
+
+\note in the following table, rv1 means first right value, rv2 means second right value if present for the operation
+
+Whenever rv2 is allowed, this can only be an already locally defined variable, and cannot be a uniform or a JS Object.
+
+Whenever rv2 is allowed, this can only be an already locally defined variable, and cannot be a uniform or a JS Object.
+
+Both the left value and the right value can be assigned a component mask:
+
+Name | rv1 | rv2 | Semantic
+------------- | ------------- | -------------  | ------------- 
+'=' | any | none | assigns rv1 to left value (1)
+'*=' | any | none | multiplies left value by rv1 (1)
+'*=' | Matrix | none | multiplies left value by the given matrix
+'/=' | any | none | divides left value by rv1 (1)
+'+=' | any | none | adds right value to rv1 (1)
+'=!' | any | none | assigns not rv1 to left value (left = !right) (1)
+'normalize' | Vec3f | none | assigns normalize value of right vector to left value
+'length' | Vec3f | none | assigns length of right vector to left value (float type)
+'distance' | Vec3f | Vec3f | assigns distance between the two right values to left value (float type)
+'dot' | Vec3f | Vec3f | assigns dot product of rv1 by rv2  to left value (float type)
+'cross' | Vec3f | Vec3f | assigns cross product of rv1 by rv2 to left value (Vec3f)
+'pow' | any | same as rv1 | assigns pow of rv1 by rv2 to left value
+'sin' | any | none | assigns sin(rv1) to left value
+'asin' | any | none | assigns asin(rv1) to left value
+'cos' | any | none | assigns cos(rv1) to left value
+'acos' | any | none | assigns acos(rv1) to left value
+'tan' | any | none | assigns tan(rv1) to left value
+'atan' | any | any | assigns atan(rv1, rv2) to left value
+'log' | any | none | assigns log(rv1) to left value
+'exp' | any | none | assigns exp(rv1) to left value
+'log2' | any | none | assigns log2(rv1) to left value
+'exp2' | any | none | assigns exp2(rv1) to left value
+'sinh' | any | none | assigns sinh(rv1) to left value
+'cosh' | any | none | assigns cosh(rv1) to left value
+'sqrt' | any | none | assigns sqrt(rv1) to left value
+'inversesqrt' | any | none | assigns 1/sqrt(rv1) to left value
+'abs' | any | none | assigns absolute value (ABS) of rv1 to left value
+'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
+'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
+'clamp' | any | any | clamps left value with rv1 as minimum and rv2 as maximum
+'sampler' | Texture | Vec2f | sets left value to the pixel value of the texture rv1 at coordinate rv2, as an RGBA Vec4f 
+'samplerYUV' | Texture | Vec2f | sets left value to the pixel value of the texture rv1 at coordinate rv2, as a YUVA Vec4f 
+'discard' | none | none | discards the current fragment and exits shader processing (fragment shader only)
+'print' | any | none | prints the given variable rv1 to stderr
+'toRGB' | Vec3f, Vec4f | none | converts rv1 to RGB
+'toYUV' | Vec3f, Vec4f | none | converts rv1 to YUV
+
+
+ (1): these operations accept component masks on both left value and right value. Example
+ \code
+ shader.push('myval.xy', '*=' 'otherval.zq');
+ \endcode
+
+If the right value has less component indicated in the mask than left value components, the last indicated component of the right value will be used for the remaining left value components.
+Example
+ \code
+ //myval will be assigned to {x:otherval.z, y:otherval.q, z:otherval.q}
+ shader.push('if', 'myval.xyz', '=' 'otherval.zq');
+ \endcode
+
+# 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
+- 'else': no additional parameters
+- 'end': no additional parameters
+
+Conditions can be nested.
+
+Name | Right Value | Semantic
+------------- | ------------- | ------------- 
+'<' | any | evaluate to true if left is strictly less than right
+'<=' | any | evaluate to true if left is less than or equal to right
+'>' | any | evaluate to true if left is strictly greater than right
+'>=' | any | evaluate to true if left is greater than or equal to right
+'==' | any | evaluate to true if left is equal to right
+'!=' | any | evaluate to true if left is different from right
+
+Example:
+
+\code
+...
+shader.push('if', 'my_var.x', '<=', 0.5);
+shader.push('if', 'my_var.y', '>=', 0.5);
+...
+shader.push('end');
+shader.push('elseif', 'my_var.x', '<=', '.uniform');
+...
+shader.push('else');
+...
+shader.push('end');
+...
+\endcode
+
+
+Conditions accept component masks on both left value and right value, resulting in a per-component of the mask test. 
+Example
+ \code
+ shader.push('if', 'myval.xy', '<' 'otherval.zq');
+ \endcode
+
+If the right value has less component indicated in the mask than left value components, the last indicated component of the right value will be used for the remaining left value components.
+Example
+ \code
+ //myval will be tested against {x:otherval.z, y:otherval.q, z:otherval.q}
+ shader.push('if', 'myval.xyz', '<' 'otherval.zq');
+ \endcode
+
+
+
+# Stack jumping
+
+The `goto` statement allows jumping in the stack. 
+The `goto` statement takes a single parameter which can either be an integer or a uniform name resolving to an integer. This integer gives the 1-based index of the instruction to jump to.
+Example:
+
+\code
+...
+shader.label_start = shader.push('if', 'my_var.x', '<=', 0.5);
+shader.push('if', 'my_var.y', '>=', 0.5);
+...
+shader.push('goto', '.label_end'); //go to the instruction at position label_end
+...
+shader.push('end');
+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.label_end = shader.push('end');
+...
+\endcode
+
+The value of the jump position is not checked while assigning the `goto` instruction, it is checked while processing the fragment: this allows jumping anywhere in the stack. 
+
+\warning You must make sure that your shader state is correct when jumping in the stack of instructions !
+
+\note There is no provision for `while` and `for` statements in the shader. This can however be emulated with the `goto` statement.
+
+
+# Vertex attribute interpolation
+
+The rasterizer performs perspective-correct interpolation of attributes, and provides two objects, VertexAttrib and VertexAttribInterpolator, to handle interpolation. The attribute interpolation can be done:
+- at the fragment shader stage only
+- at both vertex and fragment shader stages
+
+## Fragment-shader only interpolation
+In this configuration, the attributes to interpolate do not depend on the state of the vertex shader (eg for example vertices colors or texture coordinates).
+To interpolate the attribute, a VertexAttribInterpolator object is used to wrap the attributes to interpolate.
+
+Example:
+
+\code
+  let txi = new evg.VertexAttribInterpolator(cube_txcoords, 2, GF_EVG_VAI_VERTEX);
+  frag_shader=canvas.new_shader(GF_EVG_SHADER_FRAGMENT);
+
+  frag_shader.push('txc', '=', txi);
+  frag_shader.push('txc', '*=', 2);
+  frag_shader.push('txval', 'sampler', texture, 'txc');
+  frag_shader.push('fragColor', '=', 'txval');
+
+\endcode
+
+
+## Per-vertex  interpolation
+In this configuration, the attributes to interpolate depend on the state of the vertex shader.
+To interpolate the attribute, a VertexAttrib object is used to wrap the attributes to interpolate at the vertex shader, and a VertexAttribInterpolator object is used to perform the interpolation at the fragment shader.
+
+Example:
+
+\code
+  let ni = new evg.VertexAttribInterpolator(3);
+  ni.normalize=true;
+  let normals = new evg.VertexAttrib(cube_normals_face, 3, GF_EVG_VAI_PRIMITIVE);
+
+  vert_shader=canvas.new_shader(GF_EVG_SHADER_VERTEX);
+  vert_shader.push('normal', '=', normals);
+  vert_shader.push('normal', '*=', normal_matrix);
+  vert_shader.push(ni, '=', 'normal');
+  vert_shader.push('vertex', '*=', matrix);
+  vert_shader.push('vertexOut', '=', 'vertex');
+
+  frag_shader=canvas.new_shader(GF_EVG_SHADER_FRAGMENT);
+
+  frag_shader.push('normal', '=', ni);
+  frag_shader.push('normal.q', '=', 1.0);
+  frag_shader.push('fragColor', '=', 'normal');
+
+\endcode
+
+
+# RGB and YUV color spaces
+The rasterizer can work on both RGB and YUV output color buffers. 
+- When a fragment output value is given in RGB and the output color buffer is in YUV, conversion is performed
+- When a fragment output value is given in YUV and the output color buffer is in RGB, conversion is performed
+- Otherwise, no conversion is done
+
+Texture sampling can also work on both RGB and YUV texture maps.
+- When a `sampler` call is made on a YUV texture, conversion is performed
+- 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. 
+
+*/
+interface Shader {
+/*! resets the stack of instructions*/
+void push();
+
+/*! pushes a new instruction on the stack
+\param left_val the name of the left value to be assigned or modified
+\param operand the name of the operand to use
+\param right_val the name of the right value to use by the operand
+\param right_val2 the name of the second right value to use by the operand, if any
+\return the 1-based index of the added instruction
+*/
+long push(DOMString left_val, DOMString operand, DOMString right_val, optional DOMString right_val2 = null);
+
+/*! pushes a new condition instruction on the stack
+\param cond_val the name of the condition. Allowed values are `if`, `elseif`
+\param left_val the name of the left value to be assigned or modified
+\param operand the name of the operand to use
+\param right_val the name of the right value to use by the operand
+\return the 1-based index of the added instruction
+*/
+long push(DOMString cond_val, DOMString left_val, DOMString operand, DOMString right_val);
+
+/*! pushes an end of condition instruction on the stack
+\param end_cond_val the name of the end of condition. Allowed values are `else`, `end`
+\return the 1-based index of the added instruction
+*/
+long push(DOMString end_cond_val);
+
+
+/*! pushes a goto instruction on the stack
+\param goto_val the name of the goto. Allowed values are `goto`
+\param stack_index the 1-based index of the stack instruction to go to
+\return the 1-based index of the added instruction
+*/
+long push(DOMString goto_val, long stack_index);
+
+/*! pushes a goto instruction on the stack
+\param goto_val the name of the goto. Allowed values are `goto`
+\param stack_index_uniform name if the uniform giving the 1-based index of the stack instruction to go to
+\return the 1-based index of the added instruction
+*/
+long push(DOMString goto_val, DOMString stack_index_uniform);
+
+/*! updates uniforms in the shader*/
+void update();
+};
+
+/*! queries size in bytes of a pixel for a given pixel format
+\param pixel_format the desired pixel format
+\return the size in bytes
+*/
+long PixelSize(DOMString pixel_format);
+
+
+/*! @} */

gpac-1.0.0.tar.gz/share/doc/idl/jsf.idl Added

@@ -0,0 +1,906 @@
+/*
+\file
+\brief silence !
+*/
+
+typedef char *DOMString;
+
+/*!
+
+\defgroup jsf_grp JS Filter API
+\ingroup jsapi_grp
+\brief JavaScript API for filters.
+
+This section documents the JavaScript API used when developing JavaScript-based filters.
+JavaScript filters support all tools from native filters, see \ref filters_grp.
+
+Errors are handled through exceptions, except for callback function return values of the Filter object.
+
+@{
+
+*/
+
+/*! global context property containing the launch arguments*/
+attribute Array args;
+
+/*! global context property representing the one and only JSFilter object attached to the loaded filter*/
+attribute JSFilter filter;
+
+/*! global context function for printing
+\param log the string to write
+*/
+void print(DOMString log);
+/*! global context function for printing 
+\param log_level the log level to use: GF_LOG_DEBUG, GF_LOG_INFO, GF_LOG_WARNING, GF_LOG_ERROR. The special value -2 means print as gf_sys_format_help without highlight, the special value -1 means print as gf_sys_format_help with hightlight of first)
+\param log_str the string to write
+*/
+void print(long log_level, DOMString log_str);
+
+
+/*!\brief JSFilter API
+
+The JSFilter interface has a single instance exposed to the script under the name "filter".
+It implements binding to the underlying filter object, see \ref GF_Filter.
+The JSFilter provides callback functions mapping the functionnalities of \ref __gf_filter_register.
+*/
+interface JSFilter {
+/*! initialize the filter. This is a callback function assignable by the script. It is called once all filter arguments have been parsed.
+See \ref __gf_filter_register.initialize.
+\return error code if any
+*/
+attribute GF_Err initialize();
+/*! finalize the filter. This is a callback function assignable by the script. It is called immediately before destruction of the JavaScript context.
+See \ref __gf_filter_register.finalize.
+\return void
+*/
+attribute void finalize();
+/*! configures or reconfigures an input pid
+See \ref __gf_filter_register.configure_pid.
+\param pid pid to (re)configure
+\return error code if any
+*/
+attribute GF_Err configure_pid(FilterPid pid);
+/*! removes an input pid
+See \ref __gf_filter_register.configure_pid.
+\param pid pid to remove
+\return error code if any
+*/
+attribute GF_Err remove_pid(FilterPid pid);
+/*! process
+See \ref __gf_filter_register.process.
+\return error code if any
+*/
+attribute GF_Err process();
+/*! process an event on a given pid
+See \ref __gf_filter_register.process_event.
+\param pid pid on which the event is received
+\param evt event tp process
+\return error code if any
+*/
+attribute boolean process_event(FilterPid pid, FilterEvent evt);
+/*! process an event on a given pid
+See \ref __gf_filter_register.process_event.
+\param arg_name argument name
+\param arg_val argument value
+\return error code if any
+*/
+attribute GF_Err update_arg(DOMString arg_name, DOMString arg_val);
+
+/*! see \ref gf_filter_get_max_extra_input_pids*/
+attribute long max_pids;
+/*! see \ref gf_filter_block_enabled*/
+readonly attribute boolean block_enabled;
+/*! see \ref gf_filter_get_output_buffer_max*/
+readonly attribute unsigned long output_buffer;
+/*! see \ref gf_filter_get_output_buffer_max*/
+readonly attribute unsigned long output_playout;
+/*! see \ref gf_filter_get_sep*/
+readonly attribute DOMString sep_args;
+/*! see \ref gf_filter_get_sep*/
+readonly attribute DOMString sep_name;
+/*! see \ref gf_filter_get_sep*/
+readonly attribute DOMString sep_list;
+/*! see \ref gf_filter_get_dst_args*/
+readonly attribute DOMString dst_args;
+/*! see \ref gf_filter_get_dst_name*/
+readonly attribute DOMString dst_name;
+/*! see \ref gf_filter_all_sinks_done*/
+readonly attribute boolean sinks_done;
+/*! see \ref gf_filter_reporting_enabled*/
+attribute boolean reports_on;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_screen_width;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_screen_height;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_screen_depth;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_screen_fps;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_screen_views;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_audio_channels;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_audio_samplerate;
+/*! see \ref gf_filter_get_session_caps and \ref gf_filter_set_session_caps*/
+attribute unsigned long max_audio_depth;
+/*! see \ref gf_filter_get_num_events_queued*/
+readonly attribute unsigned long events_queued;
+/*! see \ref gf_filter_get_clock_hint*/
+readonly attribute unsigned long long readonly clock_hint_us;
+/*! see \ref gf_filter_get_clock_hint*/
+readonly attribute unsigned long long clock_hint_mediatime;
+/*! see \ref gf_filter_connections_pending*/
+readonly attribute unsigned long long connections_pending;
+
+/*! sets filter desciption 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
+\param author author of filter*/
+void set_author(DOMString author);
+/*! sets filter version as visible when checking filter info
+\param version version of filter*/
+void set_version(DOMString version);
+/*! sets filter help as visible when checking filter info
+\param help help of filter - can use the usual MarkDown syntax of GPAC help*/
+void set_help(DOMString help);
+
+/*! adds an argument to the filter. JavaScript Filter arguments can be specified from command line in the same way as reguar filters.
+The argument is then exposed as a property of the "filter" object of the javascript context.
+\param arg object exposing the same interface as the JSArgDesc interface
+*/
+void set_arg(JSArgDesc arg);
+
+/*! sets a new capability for the filter. If no argument, starts a new capability bundle.
+\param cap_desc capability descriptor object
+*/
+void set_cap(optional JSCapDesc cap_desc = null);
+
+/*! sets the name of the filter, used for logs
+\param name the filter 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
+*/
+void send_event(FilterEvent evt, optional boolean upstream=false);
+
+/*! queries info on a filter
+ an event on the filter - see \ref gf_filter_get_info and \ref gf_filter_get_info_str 
+\param info_name the property name or ID of the info to query
+\param is_string indicate if the name describes a built-in property or a user-defined property
+\return the property if found, null otherwise
+*/
+FilterProperty get_info(DOMString info_name, optional boolean is_string = false);
+
+/*! checks 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);
+
+/*! 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);
+
+/*! update filter status string - see \ref gf_filter_update_status
+\param status the status string, may be null to reset the status string
+\param percent percent of processing, if known
+*/
+void update_status(DOMString status, optional long percent=0);
+
+/*! reschedule filter - see \ref gf_filter_ask_rt_reschedule and \ref gf_filter_post_process_task
+\param reschedule_us if not 0, reschedule the filter in the given amount of microseconds. Otherwise post a filter processing task*/
+void reschedule(optional long reschedule_us=0);
+
+
+/*! posts a task to the main scheduler - see \ref gf_filter_post_task
+\param task_callback the callback function to use. This callback returns -1 or an exception to abort the task, or a reschedule time in milliseconds
+\param task_this optional value for this object of the callback function. If not set, the filter object is used
+*/
+void post_task(function task_callback, optional Object task_this=null);
+
+/*! notify a failure of the filter upon source connections - see \ref gf_filter_notification_failure, \ref gf_filter_notification_failure
+\param error the error code
+\param error_type the type of notification.\n
+- If JSF_NOTIF_ERROR_AND_DISCONNECT, calls \ref gf_filter_notification_failure and disconnect the filter
+- If JSF_NOTIF_ERROR, calls \ref gf_filter_notification_failure and does not disconnect the filter
+- If JSF_SETUP_ERROR, calls \ref gf_filter_setup_failure
+*/
+void notify_failure(GF_Err error, optional long error_type=JSF_SETUP_ERROR);
+
+/*! checks if a MIME type is supported - see \ref gf_filter_is_supported_mime
+\param source_url the URL to check
+\return true if supported
+*/
+boolean is_supported_source(DOMString source_url);
+
+/*! checks if a MIME type is supported - see \ref gf_filter_hint_single_clock
+\param time_in_microseconds time in microseconds
+\param media_time_sec media timestamp inseconds
+*/
+void hint_clock(unsigned long long time_in_microseconds, double media_time_sec);
+
+/*! sends an update to a filter - see \ref gf_filter_send_update
+\param filter_id ID of the filter
+\param arg_name name of the argument
+\param arg_value value of the argument
+\param propagate_mask propagate mask
+*/
+void send_update(DOMString filter_id, DOMString arg_name, DOMString arg_value, long propagate_mask);
+
+/*! 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
+\return new loaded source filter or null
+*/
+FilterInstance add_source(DOMString source, optional DOMString parent = null);
+
+/*! adds a destination filter in the media session - see \ref gf_filter_connect_destination
+\param destination URL of destination to instantiate
+\param mux_mime mime identifying destination format. If not set or null, format will be guessed from URL
+\return new loaded destination filter or null
+*/
+FilterInstance add_destination(DOMString destination, optional DOMString mux_mime=null);
+
+/*! loads a new filter in the media session - see \ref gf_filter_load_filter
+\param args name and arguments of the filter to load
+\return new loaded filter or null
+*/
+FilterInstance add_filter(DOMString args);
+
+/*! makes the filter sticky - see \ref gf_filter_make_sticky*/
+void make_sticky();
+
+/*! makes the filter unblocking - see \ref gf_filter_prevent_blocking
+\param do_prevent if true, filter will not be blocking if all its output pids are blocking
+*/
+void prevent_blocking(boolean do_prevent);
+
+/*! makes the filter prevent EOS queries - see \ref gf_filter_block_eos
+\param do_block if true, filter input pids cannot be checked for end of stream during EOS queries
+*/
+void prevent_blocking(boolean do_block);
+
+};
+
+/*! FilterInstance wraps the set of functions available for filters loaded by the script*/
+interface FilterInstance {
+
+/*! setup failure notification. This is a callback function assignable by the script. It is when loading a source or destination filter fails asynchronously
+\param e error code if any
+\return void
+*/
+attribute void on_setup_failure(GF_Err e);
+
+/*! sends an event on the filter - see \ref gf_filter_send_event
+\param evt the event to send
+*/
+void send_event(FilterEvent evt);
+
+/*! queries info on a filter
+ an event on the filter - see \ref gf_filter_get_info and \ref gf_filter_get_info_str 
+\param info_name the property name or ID of the info to query
+\param is_string indicate if the name describes a built-in property or a user-defined property
+\return the property if found, null otherwise
+*/
+FilterProperty get_info(DOMString info_name, optional boolean is_string = false);
+
+/*! sends an update to a filter - see gf_filter_send_update
+\param filter_id ID of the filter
+\param arg_name name of the argument
+\param arg_value value of the argument
+\param propagate_mask propagate mask
+*/
+void send_update(DOMString filter_id, DOMString arg_name, DOMString arg_value, long propagate_mask);
+
+/*! 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);
+
+/*! removes a source filter - see \ref gf_filter_remove_src*/
+void remove();
+
+/*! checks if a filter and its connected output chain(s) have PID connection pending 
+\param stop_at a Filter or a FilterInstance object indicating where to stop the analysis. If not set and the filter is a source filter, automatically set to the Filter running the script
+\return true if pid connections are pending
+*/
+boolean has_pid_connections_pending(optional Filter stop_at=null);
+
+/*! gets the value of a filter instance argument
+\param arg_name the argument name to query
+\param as_string if true, returns the value as a string, otherwise as a property object
+\return the argument value as string or object, or null if no such argument*/
+FilterProperty get_arg(DOMString arg_name, optional boolean as_string=false);
+
+/*! disables data probing on the filter - see \ref gf_filter_disable_probe*/
+void disable_probe();
+
+/*! disables input on the filter - see \ref gf_filter_disable_inputs*/
+void disable_inputs();
+
+/*! reset source identifier for the filter - see \ref gf_filter_reset_source*/
+void reset_source();
+};
+
+/*! The FilterPid object is a binding for \ref GF_FilterPid*/
+interface FilterPid {
+
+/*! name of the PID*/
+attribute DOMString name;
+/*! end of stream state - see \ref gf_filter_pid_set_eos and \ref gf_filter_pid_is_eos*/
+attribute boolean eos;
+/*! end of stream pending state - see \ref gf_filter_pid_has_seen_eos*/
+readonly attribute boolean eos_seen;
+/*! blocking state - see \ref gf_filter_pid_would_block*/
+readonly attribute boolean would_block;
+/*! name of parent filter*/
+readonly attribute DOMString filter_name;
+/*! name of source filter*/
+readonly attribute DOMString src_name;
+/*! arguments of parent filter*/
+readonly attribute DOMString args;
+/*! argument of source filter*/
+readonly attribute DOMString src_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*/
+writeonly boolean loose_connect;
+/*! sets framin mode of the pid - see \ref gf_filter_pid_set_framing_mode*/
+writeonly boolean framing;
+/*! buffer duration of the pid - see \ref gf_filter_pid_query_buffer_duration*/
+readonly attribute long long buffer;
+/*! pid buffer full flag - see \ref gf_filter_pid_query_buffer_duration */
+readonly attribute boolean full;
+/*! indicates if no valid packet with data is pending - see \ref gf_filter_pid_first_packet_is_empty*/
+readonly attribute boolean first_empty;
+/*! CTS of the first packet in packet queue - see \ref gf_filter_pid_get_first_packet_cts*/
+readonly attribute long long first_cts;
+/*! number of packets in pid buffer - see \ref gf_filter_pid_get_packet_count*/
+readonly attribute unsigned long nb_pck_queued;
+/*! current timescale for the pid - see \ref gf_filter_pid_get_timescale */
+readonly attribute unsigned long timescale;
+/*! sets clock mode of pid - see \ref gf_filter_pid_set_clock_mode*/
+writeonly unsigned long clock_mode;
+/*! sets discard mode of pid - see \ref gf_filter_pid_set_discard*/
+writeonly unsigned boolean discard;
+/*! source URL of input pids*/
+readonly attribute DOMString src_url;
+/*! destination URL of output pids*/
+readonly attribute DOMString dst_url;
+/*! requires source ID for the pid - see \ref gf_filter_pid_require_source_id*/
+writeonly unsigned boolean require_source_id;
+/*! enables DTS recomputing on the pid - see \ref gf_filter_pid_recompute_dts*/
+writeonly unsigned boolean recompute_dts;
+/*! gets minimum packet duration observed on the pid - see \ref gf_filter_pid_get_min_pck_duration*/
+readonly attribute unsigned long min_pck_dur;
+/*! playing state - see \ref gf_filter_pid_is_playing*/
+readonly attribute unsigned long playing;
+
+/*! sends an event on the pid - see \ref gf_filter_pid_send_event
+\param evt the event to send*/
+void send_event(FilterEvent evt);
+
+/*! enumerates properties or info on the pid - see \ref gf_filter_pid_enum_properties and \ref gf_filter_pid_enum_info
+\param index the 0-based index of the property. 
+\param enum_info if set, enumerates info instead of properties
+\return null if no more properties to enumerate; otherwise an object:
+\code
+{
+   DOMString name;
+   unsigned long type;
+   FilterProperty value;
+}
+\endcode
+
+*/
+Object enum_properties(unsigned long index, optional boolean enum_info=false);
+
+/*! gets a property by name/id - see \ref gf_filter_pid_get_property and \ref gf_filter_pid_get_property_str
+\param name the ID or name of the builtin property
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+\return property if found, null otherwise
+*/
+FilterProperty get_prop(DOMString name, optional boolean is_user=false);
+
+/*! gets info by name/id - see \ref gf_filter_pid_get_info and \ref gf_filter_pid_get_info_str
+\param name the ID or name of the builtin property
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+\return the property if found, null otherwise
+*/
+FilterProperty get_info(DOMString name, optional boolean is_user=false);
+
+/*! gets first packet in pid buffer - see \ref gf_filter_pid_get_packet
+\return first packet of buffer or null*/
+FilterPaquet get_packet();
+/*! drops first packet in pid buffer - see \ref gf_filter_pid_drop_packet
+*/
+void drop_packet();
+
+/*! checks if a filter is in parent chain of pid - see \ref gf_filter_pid_get_buffer_occupancy
+\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
+\param filter the Filter or FilterInstance object to check 
+\return a buffer occupancy object:
+\code
+{
+   unsigned long max_units;
+   unsigned long nb_pck;
+   unsigned long max_dur;
+   unsigned long dur;
+   boolean final_flush;
+}
+\endcode
+*/
+boolean is_filter_in_parents(GF_Filter filter);
+
+/*! clears EOS on pid - see \ref gf_filter_pid_clear_eos*/
+void clear_eos();
+
+/*! clears capability of pid - see \ref gf_filter_pid_check_caps
+\return true if all caps are honored by the PID properties, false otherwise*/
+boolean check_caps();
+/*! discard blocking mode of pid - see \ref gf_filter_pid_discard_block*/
+void discard_block();
+
+/*! allow direct disatch to next filter in chain - see \ref gf_filter_pid_allow_direct_dispatch*/
+void allow_direct_dispatch();
+
+/*! resolves a file template string - see \ref gf_filter_pid_resolve_file_template
+\param template the template string to resolve
+\param file_idx the file index for segmented outputs
+\param suffix the file suffix to append
+\return the resolved template
+*/
+DOMString resolve_file_template(DOMString template, unsigned long file_idx, optional DOMString suffix=null);
+
+/*! queries a capability marked for negotiation - see \ref gf_filter_pid_caps_query
+\param name the ID or name of the builtin property
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+\return property if found, null otherwise*/
+FilterProperty query_caps(DOMString name, optional boolean is_user);
+
+
+/*! gets statistics for the pid 
+\return A statistics object
+\code
+boolean disconnected;
+unsigned long average_process_rate;
+unsigned long max_process_rate;
+unsigned long avgerage_bitrate;
+unsigned long max_bitrate;
+unsigned long nb_processed;
+unsigned long max_process_time;
+unsigned long long total_process_time;
+unsigned long long first_process_time;
+unsigned long long last_process_time;
+unsigned long min_frame_dur;
+unsigned long nb_saps;
+unsigned long max_sap_process_time;
+unsigned long long total_sap_process_time;
+unsigned long long max_buffer_time;
+unsigned long long max_playout_time;
+unsigned long long min_playout_time;
+unsigned long long buffer_time;
+unsigned long nb_buffer_units;
+\endcode
+*/
+Object get_stats();
+
+/*! gets clock info for the pid 
+\return A clock info object:
+\code
+unsigned long type;
+unsigned long timescale;
+unsigned long long value;
+\endcode
+*/
+Object get_clock_info();
+
+/*! sets property on a pid - see \ref gf_filter_pid_set_property and \ref gf_filter_pid_set_property_str
+\param name the ID or name of the builtin property
+\param prop the property to set
+\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);
+
+/*! sets info on a pid - see \ref gf_filter_pid_set_info and \ref gf_filter_pid_set_info_str
+\param name the ID or name of the builtin property
+\param prop the property to set
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+*/
+void set_info(DOMString name, FilterProperty prop, optional boolean is_user=false);
+
+/*! negociates property on an output pid - see \ref gf_filter_pid_negociate_property and \ref gf_filter_pid_negociate_property_str
+\param name the ID or name of the builtin property
+\param prop the property to set
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+*/
+void negociate_prop(DOMString name, FilterProperty prop, optional boolean is_user=false);
+/*! removes an output pid - see \ref gf_filter_pid_remove*/
+void remove();
+
+/*! reset properties of a pid - see gf_filter_pid_reset_properties*/
+void reset_props();
+
+/*! copy properties of a pid - see gf_filter_pid_copy_properties*
+\param from source pid
+*/
+void copy_props(FilterPid from);
+
+/*! creates a new output packet with no associated data
+\return new packet or null*/
+FilterPacket new_packet();
+
+/*! creates a new output packet using string as payload
+\param str the string to use
+\param use_shared creates a shared packet, holding a GC reference to the string until release - see gf_filter_pck_new_shared
+\param destroy_callback_fun when shared mode is used, specify a callback function to be used upon destruction of the packet. The function takes no parameter and uses the pid as this object
+\return new packet or null*/
+FilterPacket new_packet(DOMString str, optional boolean use_shared=false, optional function destroy_callback_fun=null);
+
+/*! creates a new output packet of the given size, zero the payload
+\param size the desired size
+\return new packet or null*/
+FilterPacket new_packet(unsigned long size);
+
+/*! creates a new output packet using ArrayBuffer as payload
+\param ab the ArrayBuffer to use (views are also allowed)
+\param use_shared creates a shared packet, holding a GC reference to the array buffer until release - see gf_filter_pck_new_shared
+\param destroy_callback_fun when shared mode is used, specify a callback function to be used upon destruction of the packet. The function takes no parameter and uses the pid as this object
+\return new packet or null*/
+FilterPacket new_packet(ArrayBuffer ab, optional boolean use_shared=false, optional function destroy_callback_fun=null);
+
+
+/*! creates a new output packet from a source packet
+\param pck the source packet to use
+\param use_shared creates a shared packet - see gf_filter_pck_new_shared
+\param do_copy if set, indicates that the packet shall be copied rather than cloned (\ref gf_filter_pck_new_copy) otherwise clones the packet (\ref gf_filter_pck_new_clone). Ignored if use_shared is true
+\return new packet or null
+*/
+FilterPacket new_packet(FilterPacket pck, optional boolean use_shared=false, optional boolean do_copy=false);
+
+
+/*! creates a new output packet from a source packet
+\param pck the source packet to use
+\param use_shared creates a shared packet - see gf_filter_pck_new_shared
+\param destroy_callback_fun when shared mode is used, specify a callback function to be used upon destruction of the packet. The function takes no parameter and uses the pid as this object. Ignored if use_shared is false
+\return new packet or null
+*/
+FilterPacket new_packet(FilterPacket pck, optional boolean use_shared=false, optional function destroy_callback_fun=false);
+
+
+/*! forwards a source packet to outout - see \ref gf_filter_pck_forward
+\param pck the source packet to forward
+*/
+void forward(FilterPacket pck);
+
+};
+
+/*! FilterPacket provides binding for \ref GF_FilterPacket
+
+Packet data is made accessible through an ArrayBuffer object. This object is destroyed when truncating or expanding the data, you must get it again using pck.data.   
+*/
+interface FilterPacket {
+/*!start flag*/
+attribute boolean start;
+/*!end flag*/
+attribute boolean end;
+/*!DTS*/
+attribute signed long long dts;
+/*!CTS*/
+attribute signed long long cts;
+/*!duration*/
+attribute unsigned long dur;
+/*!SAP type \ref GF_FilterSAPType*/
+attribute unsigned long sap;
+/*! timescale*/
+attribute unsigned long timescale;
+/*! interlaced flag*/
+attribute boolean interlaced;
+/*! corrupted flag*/
+attribute boolean corrupted;
+/*! seek flag*/
+attribute boolean seek;
+/*! byte offset in source*/
+attribute signed long long byte_offset;
+/*! roll distance*/
+attribute unsigned long roll;
+/*! crypt flag*/
+attribute unsigned long crypt;
+/*! clock type*/
+attribute unsigned long clock_type;
+/*! carousel version number*/
+attribute unsigned long carousel;
+/*! sequence number*/
+attribute unsigned long seqnum;
+/*! set if the packet is a blocking reference to a packet reference*/
+attribute boolean blocking_ref;
+/*! see \ref gf_filter_pck_set_dependency_flags*/
+attribute unsigned long is_leading;
+/*! see \ref gf_filter_pck_set_dependency_flags*/
+attribute unsigned long depends_on;
+/*! see \ref gf_filter_pck_set_dependency_flags*/
+attribute unsigned long depended_on;
+/*! see \ref gf_filter_pck_set_dependency_flags*/
+attribute unsigned long redundant;
+/*! size in bytes of the packet*/
+readonly attribute unsigned long size;
+/*! data of the packet if any
+	\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;
+
+/*! sets packet readonly - see gf_filter_pck_set_readonly*/
+void set_readonly();
+
+
+/*! enumerates properties of the packet
+
+\param index the 0-based index of the property. 
+\return null if no more properties to enumerate; otherwise an object:
+\code
+{
+   DOMString name;
+   unsigned long type;
+   FilterProperty value;
+}
+\endcode
+
+*/
+Object enum_properties(unsigned long index);
+
+
+/*! gets a property by name/id - see \ref gf_filter_pid_get_property and \ref gf_filter_pid_get_property_str
+\param name the ID or name of the builtin property
+\param is_user if set, indicates the queried property is a user-defined property rather than a built-in property
+\return property if found, null otherwise*/
+FilterProperty get_prop(DOMString name, optional boolean is_user=false);
+
+/*! references a filter packet reference for later usage after drop from pid buffer - see \ref gf_filter_pck_ref and \ref gf_filter_pck_ref_props
+\param props_only if set, only packet properties are references, packet data is not
+\return the new packet reference*/
+FilterPacket ref(optional boolean props_only=false);
+
+/*! dereferences a filter packet reference - see gf_filter_pck_unref. Throws exception if object is not a packet reference. The object is no longer a valid packet after this.*/
+void unref();
+
+/*! sends packet - gf_filter_pck_send*/
+void send();
+
+/*! discard packet - gf_filter_pck_discard*/
+void discard();
+
+/*! sets a property on packet - see \ref gf_filter_pck_set_property 
+\param name the ID or name of the builtin 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, optional boolean is_user=false);
+
+/*! appends data to packet - see \ref gf_filter_pck_expand. New data can be accessed by through the data field.
+\warning any previous access to the packet data will be in detached state (no more data in the array buffer) after the call. 
+\param str the string to append
+\return an arraybuffer containing the corresponding appended packet data. Full packet data is available through FilterPacket.data
+*/
+ArrayBuffer append(DOMString str);
+
+/*! appends data to packet - see \ref gf_filter_pck_expand. New data can be accessed by through the data field.
+\warning any previous access to the packet data will be in detached state (no more data in the array buffer) after the call. 
+\param size the number of bytes to append
+\return an arraybuffer containing the corresponding appended packet data. Full packet data is available through FilterPacket.data
+*/
+ArrayBuffer append(unsigned long size);
+
+
+/*! appends data to packet - see \ref gf_filter_pck_expand. New data can be accessed by through the data field.
+\warning any previous access to the packet data will be in detached state (no more data in the array buffer) after the call. 
+\param ab the array buffer to append
+\return an arraybuffer containing the corresponding appended packet data. Full packet data is available through FilterPacket.data
+*/
+ArrayBuffer append(ArrayBuffer ab);
+
+/*! truncates the packet to the indicated size - \ref gf_filter_pck_truncate
+\warning any previous access to the packet data will be in detached state (no more data in the array buffer) after the call. 
+\param size new packet size*/
+void truncate(unsigned long size);
+
+/*! copy properties of source packet
+\param from the source packet to copy properties from
+*/
+void copy_props(FilterPacket from);
+
+};
+
+/*! FilterEvent expose a filter event object, either for processing a received event or triggering a new event.
+The read access to the members of the structure is cross-checked with the event type and throw an error when attempting to access the wrong field 
+*/
+
+interface FilterEvent {
+/*! constructor
+\param type the type of event. This type cannot be changed
+
+\code 
+let evt = new FilterEvent(GF_FEVT_PLAY);
+\endcode
+*/
+FilterEvent(unsigned long type);
+
+/*! event type - see GF_FilterEvent*/
+attribute unsigned long type;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute double start_range;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute double speed;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute boolean hw_buffer_reset;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute boolean initial_broadcast_play;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute boolean timestamp_based;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute boolean full_file_only;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute boolean forced_dash_segment_switch;
+/*! play event - see \ref GF_FEVT_Play*/
+attribute unsigned long from_pck;
+
+/*! source switch and source seek - see \ref GF_FEVT_SourceSeek*/
+attribute unsigned long long start_offset;
+/*! source switch and source seek - see \ref GF_FEVT_SourceSeek*/
+attribute unsigned long long end_offset;
+/*! source switch and source seek - see \ref GF_FEVT_SourceSeek*/
+attribute DOMString switch_url;
+/*! source switch and source seek - see \ref GF_FEVT_SourceSeek*/
+attribute boolean skip_cache_exp;
+/*! source switch and source seek - see \ref GF_FEVT_SourceSeek*/
+attribute unsigned long hint_block_size;
+
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute DOMString seg_url;
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute boolean is_init;
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute unsigned long long media_start_range;
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute unsigned long long media_end_range;
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute unsigned long long index_start_range;
+/*! segment size - see \ref GF_FEVT_SegmentSize*/
+attribute unsigned long long index_end_range;
+
+/*! quality switch - see \ref GF_FEVT_QualitySwitch*/
+attribute boolean up;
+/*! quality switch - see \ref GF_FEVT_QualitySwitch*/
+attribute unsigned long dependent_group_index;
+/*! quality switch - see \ref GF_FEVT_QualitySwitch*/
+attribute long q_idx;
+/*! quality switch - see \ref GF_FEVT_QualitySwitch*/
+attribute unsigned long set_tile_mode_plus_one;
+/*! quality switch - see \ref GF_FEVT_QualitySwitch*/
+attribute unsigned long quality_degradation;
+
+/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+attribute unsigned long min_x;
+/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+attribute unsigned long min_y;
+/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+attribute unsigned long max_x;
+/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+attribute unsigned long max_y;
+/*! visibility hint - see \ref GF_FEVT_VisibililityHint*/
+attribute boolean is_gaze;
+
+/*! buffer reqs - see \ref GF_FEVT_BufferRequirement*/
+attribute unsigned long max_buffer_us;
+/*! buffer reqs - see \ref GF_FEVT_BufferRequirement*/
+attribute unsigned long max_playout_us;
+/*! buffer reqs - see \ref GF_FEVT_BufferRequirement*/
+attribute unsigned long min_playout_us;
+/*! buffer reqs - see \ref GF_FEVT_BufferRequirement*/
+attribute boolean pid_only;
+
+/*! ui event type of a \ref GF_Event
+only mouse and keyboard events are currently exposed
+*/
+attribute unsigned long ui_type;
+/*! see \ref GF_EventMouse*/
+attribute unsigned long mouse_x;
+/*! see \ref GF_EventMouse*/
+attribute unsigned long mouse_y;
+/*! see \ref GF_EventMouse*/
+attribute unsigned float wheel;
+/*! see \ref GF_EventMouse*/
+attribute unsigned long button;
+
+/*! see \ref GF_EventKey*/
+attribute unsigned long keycode;
+/*! see \ref GF_EventKey*/
+attribute unsigned long hwkey;
+
+/*! array of DOMString - see \ref GF_EventOpenFile*/
+attribute Array dropfiles;
+
+};
+
+/*! interface used to describe filter arguments*/
+interface JSArgDesc {
+    /*! name of the argument*/
+    attribute DOMString name;
+    /*! description of the argument*/
+    attribute DOMString desc;
+    /*! type of the argument*/
+    attribute unsigned long type;
+    /*! default value of the argument*/
+    optional attribute DOMString default=null;
+    /*! min/max or enum values of the argument*/
+    optional attribute DOMString minmax_enum=null;
+};
+
+/*! interface used to describe filter capability*/
+interface JSCapDesc {
+    /*! PropertyID of the capability - mandatory*/
+    attribute DOMString id;
+    /*! value of the property - mandatory*/
+    attribute DOMString value;
+    /*! input and output flag of the capability - if true, the output flag is ignored*/
+    attribute boolean inout;
+    /*! output flag of the capability - if undefined, the capability is an input one*/
+    attribute boolean output;
+    /*! excluded flag of the capability*/
+    optional attribute boolean excluded=false;
+    /*! loaded filter only flag of the capability*/
+    optional attribute boolean loaded_filter_only=false;
+    /*! static flag of the capability*/
+    optional attribute boolean static=false;
+    /*! optional flag of the capability*/
+    optional attribute boolean optional=false;
+};
+
+/*! Properties are mapped to JavaScript values as follows:
+
+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_SINT: integer\n
+GF_PROP_LUINT: large integer\n
+GF_PROP_LSINT: large integer\n
+GF_PROP_FLOAT: double\n
+GF_PROP_FLOAT: double\n
+GF_PROP_STRING: string\n
+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_STRING_LIST: array of strings\n
+*/
+typedef Object FilterProperty;
+
+
+/*! @} */
+

gpac-1.0.0.tar.gz/share/doc/idl/scenejs.idl Added

@@ -0,0 +1,449 @@
+/*
+\file
+\brief silence !
+*/
+
+/*!
+
+\defgroup scenejs_grp Compositor API
+\ingroup jsapi_grp
+\brief GPAC Compositor and Scene API.
+
+This section documents the API used to access and control the compositor and scene media objects when using interactive BIFS/VRML/X3D/SVG rendering.
+This API is not loaded by default when playing a scene and shall be loaded by a scene script using:
+\code
+import {gpac} from 'scenejs'
+\endcode
+
+This API cannot be loaded from a JSFilter.
+It exports a single object "gpac", instance of JSGPAC class.
+
+
+@{
+
+*/
+
+/*! JSGPAC is the interface to compositor*/
+interface JSGPAC {
+/*! last working directory */
+attribute DOMString last_working_directory;
+/*! indicates if running on battery or with power charge*/
+readonly attribute boolean batteryOn;
+/*! indicates if battery is charging*/
+readonly attribute boolean batteryCharging;
+/*! battery percent (0 to 100)*/
+readonly attribute unsigned long batteryPercent;
+/*! estimated battery lifetime - see \ref gf_sys_get_battery_state*/
+readonly attribute unsigned long batteryLifeTime;
+/*! estimated battery lifetime in full charge - see \ref gf_sys_get_battery_state*/
+readonly attribute unsigned long batteryFullLifeTime;
+/*! host name*/
+readonly DOMString hostname;
+/*! fullscreen status*/
+attribute boolean fullscreen;
+/*! current working directory*/
+readonly DOMString current_path;
+/*! audio output volume*/
+attribute unsigned long volume;
+/*! navigation mode*/
+attribute unsigned long navigation;
+/*! checks if navigation is off, 2D or 3D mode*/
+attribute unsigned long navigation_type;
+/*! true if display has hardware yuv 2D blit*/
+readonly attribute boolean hardware_yuv;
+/*! true if display has hardware rgb 2D blit*/
+readonly attribute boolean hardware_rgb;
+/*! true if display has hardware rgba 2D blit*/
+readonly attribute boolean hardware_rgba;
+/*! true if display has hardware stretch blit*/
+readonly attribute boolean hardware_stretch;
+/*! display width*/
+readonly attribute unsigned long screen_width;
+/*! display height*/
+readonly attribute unsigned long screen_height;
+/*! max capped HTTP download rate - used for DASH simulations mostly*/
+attribute unsigned long http_max_bitrate;
+/*! current http download rate averaged on all active resources*/
+readonly attribute unsigned long http_bitrate;
+/*! current output fps*/
+readonly attribute double fps;
+/*! desired output fps for animations*/
+readonly attribute double sim_fps;
+/*! true if display has opengl support*/
+readonly attribute boolean has_opengl;
+/*! cpu usage*/
+readonly attribute double cpu;
+/*! number of cores*/
+readonly attribute unsigned long nb_cores;
+/*! system memory*/
+readonly attribute unsigned long system_memory;
+/*! memory usage*/
+readonly attribute unsigned long memory;
+/*! number of arguments of launch command*/
+readonly attribute unsigned long argc;
+/*! window title*/
+attribute DOMString caption;
+/*! enables or disable focus highlighting*/
+attribute boolean focus_highlight;
+/*! sceen horizontal dpi*/
+readonly attribute unsigned long dpi_x;
+/*! sceen vertical dpi*/
+readonly attribute unsigned long dpi_y;
+/*! sensor active state (gyroscope) */
+attribute boolean sensors_active;
+/*! compositor zoom factor*/
+readonly attribute double zoom;
+/*! current text selection*/
+readonly attribute DOMString text_selection;
+
+/*! see \ref gf_opts_get_key
+\param section the section name
+\param key the key name
+\return the key value
+*/
+DOMString get_option(DOMString section, DOMString key);
+/*! see \ref gf_opts_get_key_name
+\param section the section name
+\param key_idx the key index in the section
+\return the key name
+*/
+*/
+DOMString get_option(DOMString section, unsigned key_idx);
+/*! see \ref gf_opts_set_key
+\param section the section name
+\param key the key name
+\param value the key value, null to remove the key
+*/
+void set_option(DOMString section, DOMString key, optional DOMString value=null);
+/*! get program argument by index
+\param idx the argument index
+\return the argument*/
+DOMString get_arg(unsigned long idx);
+/*! enumerate directories
+\param dir the directory to enumerate
+\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);
+/*! set output window size
+\param width desired width
+\param height desired height
+*/
+void set_size(unsigned long width, unsigned long height);
+/*! post quit message*/
+void exit();
+/*! turns 3D rendering on/off
+\param use_3d if true, uses 3D for all content, otherwise use 3D based on content type
+*/
+void set_3d(Boolean use_3d);
+
+/*! moves output window
+\param x the horizontal position or delta
+\param y the vertical position or delta
+\param relative if true, use relative (delta) positioning; otherwise use absolute
+*/
+void move_window(unsigned long x, unsigned long y, optional boolean relative=false);
+/*! assigns event filter
+\param filter_event_func the filter event function to use, or null to deactivate event filtering*/
+void set_event_filter(GPACEventFilter filter_event_func);
+/*! moves focus
+\param focus "next" for next element in focus ring, "prev" for previous*/
+void set_focus(DOMString focus);
+/*! sets focus on element
+\param elt the node on which focus should be set */
+void set_focus(Node elt);
+/*! gets string for error
+\param e the error code
+\return the corresponding string*/
+DOMString error_string(GF_Err e);
+/*! show or hide virtual keyboard
+\param do_show if true, show keyboard, otherwise hide it*/
+void show_keyboard(boolean do_show);
+/*! triggers JS garbage collection pass*/
+void trigger_gc();
+/*! gets object manager for the given service URL loaded in the root scene of the compositor
+\param url url of service for which the object manager is queried
+\return the object manager, or null if not found*/
+MediaObject get_object_manager(DOMString url);
+/*! switches quality
+\param up switches quality up (true) or down (false)*/
+void switch_quality(boolean up);
+/*! checks if navigation type is supported for the current content
+\param nav_type the navigation type to check
+\return true if supported, false otherwise*/
+boolean navigation_supported(unsigned long nav_type);
+/*! sets default back color of player
+\param r red component between 0.0 and 1.0
+\param g green component between 0.0 and 1.0
+\param b blue component between 0.0 and 1.0
+\param a alpha component between 0.0 and 1.0
+*/
+void set_back_color(double r, double g, double b, double a);
+/*! allocates a new storage
+\param storage_name the storage name
+\return the storage object*/
+Storage new_storage(DOMString storage_name);
+
+};
+
+/*! event filter callback*/
+interface GPACEventFilter{
+	/*! filters an event
+	\param evt the event to process
+	\return true if event has been consumed and should no longer be forwarded, false otherwise
+	*/
+	boolean filter_event(GPACEVT evt);	
+};
+
+/*! object used for file enumeration*/
+interface FileInformation {
+	/*! file name*/
+	DOMString name;	
+	/*! file path*/
+	DOMString path;
+	/*! true if directory*/
+	boolean directory;
+	/*! true if drive root (local HDD, USB or other mount points)*/
+	boolean drive;
+	/*! true if hidden file*/
+	boolean hidden;
+	/*! true if system file*/
+	boolean system;
+	/*! file size in bytes*/
+	unsigned long long size;
+	/*! last modification UTC time*/
+	unsigned long long last_modified;
+};
+
+/*! interface to user event - see \ref GF_Event*/
+interface GPACEVT {
+/*! event type - see \ref GF_Event*/
+readonly atttribute unsigned long type;
+/*! event name - see \ref gf_dom_event_get_name*/
+readonly atttribute DOMString name;
+/*! mouse X position*/
+readonly atttribute unsigned long mouse_x;
+/*! mouse Y position*/
+readonly atttribute unsigned long mouse_y;
+/*! true if a node is currently picked*/
+readonly atttribute boolean picked;
+/*! mouse wheel position*/
+readonly atttribute double wheel;
+/*! mouse button see \ref GF_EventMouse*/
+readonly atttribute unsigned long button;
+/* translated key character code*/
+readonly atttribute unsigned long keycode;
+/*! hardware key code*/
+readonly atttribute unsigned long hwkey;
+/*! target URL for navigation events*/
+readonly atttribute DOMString url;
+/*! array of file paths to open in drop operation*/
+readonly atttribute Array dropfiles;
+};
+
+/*! interface to Object Managet - see \ref mobj_grp*/
+interface MediaObject {
+/*! Object ID*/
+readonly atttribute unsigned long ID;
+/*! number of ODM in subscene*/
+readonly atttribute unsigned long nb_resources;
+/*! URL of parent network service*/
+readonly atttribute DOMString service_url;
+/*! duration in sec*/
+readonly atttribute double duration;
+/*! clock time in sec*/
+readonly atttribute double clock_time;
+/*! clock drif in milliseconds (how late the last frame was compared to its theoretical CTS)*/
+readonly atttribute unsigned long clock_drift;
+/*! playback status: "Stopped" , "Playing", "Paused", "Not Setup", "Setup Failed" */
+readonly atttribute DOMString status;
+/*! buffer in ms*/
+readonly atttribute unsigned long buffer;
+/*! number of AUs in decoder input buffer*/
+readonly atttribute unsigned long db_unit_count;
+/*! number of decoded AUs in decoder output buffer*/
+readonly atttribute unsigned long cb_unit_count;
+/*! maxumum allowed number of decoded AUs in decoder output buffer*/
+readonly atttribute unsigned long cb_capacity;
+/*! stream type*/
+readonly atttribute unsigned long type;
+/*! audio sample rate*/
+readonly atttribute unsigned long samplerate;
+/*! number audio channels*/
+readonly atttribute unsigned long channels;
+/*! language*/
+readonly atttribute DOMString lang;
+/*! width in pixels */
+readonly atttribute unsigned long width;
+/*! height in pixels */
+readonly atttribute unsigned long height;
+/*! pixel format */
+readonly atttribute unsigned long pixelformt;
+/*! pixel aspect ratio*/
+readonly atttribute unsigned long par;
+/*! number of decoded frames*/
+readonly atttribute unsigned long dec_frames;
+/*! number of drop frames*/
+readonly atttribute unsigned long drop_frames;
+/*! max decode of an AU time in microseconds*/
+readonly atttribute unsigned long max_dec_time;
+/*! cumultaed AU decode time in microseconds*/
+readonly atttribute unsigned long long total_dec_time;
+/*! average rate in bits per second*/
+readonly atttribute unsigned long avg_bitrate;
+/*! max rate in bits per second*/
+readonly atttribute unsigned long max_bitrate;
+/*! name of filter handling demuxer*/
+readonly atttribute DOMString service_handler;
+/*! name of decoder*/
+readonly atttribute DOMString codec;
+/*! number of qualities for this object (http streaming and co)*/
+readonly atttribute unsigned long nb_qualities;
+/*! max playout buffer in milliseconds*/
+readonly atttribute unsigned long max_buffer;
+/*! min rebuffer lvel in milliseconds*/
+readonly atttribute unsigned long min_buffer;
+/*! frame duration in milliseconds*/
+readonly atttribute unsigned long frame_duration;
+/*! number of frames with SAP != 0  seen*/
+readonly atttribute unsigned long irap_frames;
+/*! cumulated time of decoding of frames with SAP != 0, in microseconds*/
+readonly atttribute unsigned long irap_dec_time;
+/*! maximum decoding of frames with SAP != 0, in microseconds*/
+readonly atttribute unsigned long long irap_max_time;
+/*! service ID*/
+readonly atttribute unsigned long service_id;
+/*! ID of the selected service in the main scene*/
+readonly atttribute unsigned long selected_service;
+/*! download bandwidth in bits per second*/
+readonly atttribute unsigned long bandwidth_down;
+/*! number of HTTP sessions for this object*/
+readonly atttribute unsigned long nb_http;
+/*! timeshift buffer depth in seconds*/
+readonly atttribute double timeshift_depth;
+/*! timeshift time in seconds, 0 being live edge*/
+readonly atttribute double timeshift_time;
+/*! true if object is an addon media (added externally from the main service delivering the scene, eg TEMI-like)*/
+readonly atttribute boolean is_addon;
+/*! checks if main addon is enabled (typically the timeshift addon DASH object for a live broadcast)*/
+readonly atttribute boolean main_addon_on;
+/*! end of stream state*/
+readonly atttribute boolean is_over;
+/*! if false, the scene, in which the object is, is an SVG/BIFS/VRML*/
+readonly atttribute boolean dynamic_scene;
+/*! name of the service if known*/
+readonly atttribute DOMString service_name;
+/*! current NTP diff between composition of a frame and indicated NTP target*/
+readonly atttribute unsigned long ntp_diff;
+/*! NTP diff last packet reception time and its sent time. If unknown, attribute value is null*/
+readonly atttribute unsigned long ntp_sender_diff;
+/*! URL of main addon*/
+readonly atttribute DOMString main_addon_url;
+/*! indicates reverse playback is supported*/
+readonly atttribute boolean reverse_playback_supported;
+/*! indicates if scalable enhancements (SVC, SHVC) are available for the object*/
+readonly atttribute boolean scalable_enhancement;
+/*! media time in seconds of main addon*/
+readonly atttribute double main_addon_media_time;
+/*! true if object has dependent groups (tile streaming in DASH)*/
+readonly atttribute unsigned long dependent_groups;
+/*! true if scene is a VR scene*/
+readonly atttribute boolean vr_scene;
+/*! true if object is disabled (such objects are only used to describe redirections)*/
+readonly atttribute boolean disabled;
+
+/*! gets MediaObject in this object subscene by index
+\param index the 0-based index of the media object to query
+\return the MediaObject or null if error*/
+MediaObject get_resource(unsigned long index);
+/*! gets quality by index
+\param index the 0-based index of the quality to query
+\return the quality description or null if error*/
+*/
+QualityDesc get_quality(unsigned long index);
+/*! selects service ID
+\param serviceID ID of the service to select*/
+void select_service(unsigned long serviceID);
+/*! selects object quality by index. 
+\param quality_index if "auto", turns on automatic rate adaptation. Otherwise selects quality by index (0-based) and turn off rate adaptation
+*/
+void select_quality(unsigned long quality_index);
+/*! select this MediaObject*/
+void select();
+/*! gets SRD information if any this MediaObject
+\return the SRD information, or null*/
+SRDDesc get_srd();
+
+
+/*! declares an addon
+\param addon_url URL of addon to insert
+*/
+void declare_addon(DOMString addon_url);
+/*! enables an addon
+\param addon_url URL of addon to insert
+*/
+void enable_addon(DOMString addon_url);
+/*! set addon size and position in main window 
+\param addon_url URL of addon to insert
+\param pos code for addon position on screen:  bottom-left(0), top-left (1) bottom-right (2) or top-right (3)
+\param size code for addon size on screen:  1/2 height (0), 1/3 (1) or 1/4 (2)
+*/
+void addon_layout(DOMString addon_url, optional unsigned long pos=0, optional unsigned long size=0);
+/*! disable main addon*/
+void disable_main_addon();
+};
+
+/*! spatial relationship descriptor*/
+interface SRDDesc
+{
+	/*! x position*/
+	unsigned long x;
+	/*! y position*/
+	unsigned long h;
+	/*! width*/
+	unsigned long w;
+	/*! height*/
+	unsigned long h;
+};
+
+/*! quality descriptor*/
+interface QualityDesc
+{
+	/*! quality ID*/
+	attributeDOMString ID;
+	/*! mime type*/
+	DOMString mime;
+	/*! codec parameter*/
+	DOMString codec;
+	/*! pixel width*/
+	unsigned long width;
+	/*! pixel heigth*/
+	unsigned long height;
+	/*! quality rate in bps*/
+	unsigned long bandwidth;
+	/*! interlaced video*/
+	boolean interlaced;
+	/*! video FPS*/
+	double fps;
+	/*! audio sample rate*/
+	unsigned long samplerate;
+	/*! number of audio channels*/
+	unsigned long channels;
+	/*! numerator of pixel aspect ratio*/
+	unsigned long par_num;
+	/*! denominator of pixel aspect ratio*/
+	unsigned long par_den;
+	/*! quality is disabled*/
+	boolean disabled;
+	/*! quality is selected*/
+	boolean is_selected;
+	/*! automatic rate adaptation is enabled*/
+	boolean automatic;
+	/*! tile adaptation mode - see \ref GF_DASHTileAdaptationMode*/
+	unsigned long tile_mode;
+	/*! number of dependent groups for this quality*/
+	unsigned long dependent_groups;
+};
+
+
+/*! @} */

gpac-1.0.0.tar.gz/share/doc/idl/storage.idl Added

@@ -0,0 +1,57 @@
+/*
+\file
+\brief silence !
+*/
+
+
+/*!
+
+\defgroup storage_grp Storage API
+\ingroup jsapi_grp
+\brief Storage API.
+
+This storage API allows creating a configuration file in JS for persistent storage of data.
+See \ref cfg_grp for more info on the config file.
+
+This API shall be loaded by a scene script using:
+\code
+import {Storage} from 'storage'
+\endcode
+@{
+
+*/
+
+/*! interface to storage */
+interface Storage {
+	/*! creates a new storage
+	\param store_name storage name to use*/
+	Storage(DOMString store_name);
+
+	/*! get storage key
+	\param section the section name
+	\param key the key name
+	\return the key value
+	*/
+	DOMString get_option(DOMString section, DOMString key);
+
+	/*! get storage key name by index
+	\param section the section name
+	\param key_idx the key index in the section
+	\return the key name
+	*/
+	DOMString get_option(DOMString section, unsigned key_idx);
+	
+	/*! sets storage key
+	\param section the section name
+	\param key the key name
+	\param value the key value, null to remove the key
+	*/
+	void set_option(DOMString section, DOMString key, optional DOMString value=null);
+
+	/*! saves associated storage*/
+	void save();
+
+};
+
+
+/*! @} */

gpac-1.0.0.tar.gz/share/doc/idl/webgl.idl Added

@@ -0,0 +1,457 @@
+/*
+\file
+\brief silence !
+*/
+
+/*!
+
+\defgroup webgl_grp WebGL API
+\ingroup jsapi_grp
+\brief WebGL API.
+
+# Foreword  
+GPAC supports the WebGL 1.0 Core API. For more documentation, please check https://www.khronos.org/registry/webgl/specs/latest/1.0
+
+The WebGL API cannot currently be loaded when using SVG or VRML scripts. It is only available for JSFilter, and shall be loaded as a JS module with the name "webgl":
+
+\code
+import * as webgl from 'webgl'
+
+...
+\endcode
+
+or 
+
+\code
+import {WebGLContext} from 'webgl'
+
+...
+\endcode
+
+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 
+
+The WebGL API in GPAC does not use any canvas element, since it is designed to run outside of a DOM. The WebGL context shall therefore be created using a constructor call.
+
+A filter is responsible for deciding when to issue GL calls: this can be in a process function or in a task callback (see  \ref JSFilter.post_task). There is no such thing as requestAnimationFrame in GPAC. Consequently, the owning filter is responsible for:
+- activating and deactivating the context in order to make the associated GL context active and bind / unbind the underlying framebuffer
+- resizing the framebuffer when needed
+
+\warning it is unsafe to assume that your filter is owning the OpenGL context, there may be other filters operating on the context. This means that context state (viewport, clearColor, etc...) shall be restored when reactivating the context.
+\note WebGL filters always run on the main process to avoid concurrent usage of the OpenGL context, but this might change in the future.
+
+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 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.
+
+\note you can always use glReadPixels to read back the framebuffer and send packets using the usual FilterPacket tools.
+
+The WebGL API in GPAC can also be configured to run on the primary frame buffer; this is achieved by adding a "primary" attribute set to true to the WebGLContextAttributes object at creation. In this case:
+- depth buffer cannot be delivered as a texture 
+- video output SHALL be created before WebGL context creation (typically by loading the video output filter before the JS filter)
+
+
+
+# Texturing 
+
+WebGL offer two ways of creating textures:
+- regular texImage2D using ArrayBuffers created from the script. This is obviously supported in GPAC.
+- texImage2D from TexImageSource
+
+TexImageSource in WebGL can be ImageBitmap, ImageData, HTMLImageElement, HTMLCanvasElement, HTMLVideoElement or OffscreenCanvas.
+
+Since GPAC doesn't run WebGL in a DOM/browser, these objects are not available for creating textures. Instead, the following objects can be used:
+- EVG Texture
+- NamedTexture
+
+## Using EVG textures 
+
+EVG Texture can be used to quickly load JPG or PNG images:
+\code
+let texture = gl.createTexture();
+let tx = new evg.Texture('source.jpg');
+gl.bindtexture(gl.TEXTURE_2D, texture);
+gl.texImage2D(target, level, internalformat, format, type, tx);
+//at this point the data is uploaded on GPU, the EVG texture is no longer needed and can be GC'ed 
+\endcode 
+
+EVG Texture combined with EVG Canvas can be used to draw text and 2D shapes:
+\code
+let canvas = new evg.Canvas(200, 200, 'rgba');
+/* draw stuff on canvas
+...
+*/
+let texture = gl.createTexture();
+let tx = new evg.Texture(canvas);
+gl.bindtexture(gl.TEXTURE_2D, texture);
+gl.texImage2D(target, level, internalformat, format, type, tx);
+//at this point the data is uploaded on GPU, the EVG texture and canvas are no longer needed and can be GC'ed 
+\endcode 
+
+For more info on drawing with EVG, see \ref jsevg_grp
+## Using named textures 
+
+Dealing with pixel formats in OpenGL/WebGL/GLSL can be quite heavy:
+- some pixel formats come in various component ordering, where only a few subset are natively supported (eg RGBA is OK, but BGRA is not)
+- some pixel formats are not natively supported by OpenGL/WebGL (typically, most/all flavors of YUV)
+- some pixel formats are planar and require more than one texture to draw them, which is quite heavy to setup
+- some video decoders might output directly as a set of one or more OpenGL textures on the GPU (NVDec, iOS VideoToolbox, Android MediaCodec)
+
+In order to simplify your code and deal efficiently with most formats, the WebGL API in GPAC introduces the concept of named textures. 
+
+
+A named texture is a texture created with a name:
+\code
+let tx = gl.createTexture('myVidTex');
+\endcode
+
+The texture data is then associated using upload():
+\code
+//source data is in system memory or already in OpenGL textures
+let pck = input_pid.get_packet();
+tx.upload(pck);
+
+//or
+
+//source data is only in system memory
+tx.upload(some_evg_texture);
+\endcode
+
+Regular bindTexture and texImage2D can also be used if you don't like changing your code too much:
+\code
+let pck = input_pid.get_packet();
+gl.bindTexture(gl.TEXTURE_2D, tx);
+//source data is in system memory or already in OpenGL textures
+gl.texImage2D(target, level, internalformat, format, type, pck);
+
+//or
+
+gl.bindTexture(gl.TEXTURE_2D, tx);
+//source data is only in system memory
+gl.texImage2D(target, level, internalformat, format, type, some_evg_texture);
+\endcode
+
+The magic comes in when creating your shaders: any call to texture2D on a sampler2D using the same name as the NamedTexture is rewritten before compilation and replaced with GLSL code handling the pixel format conversion for you !
+\code
+varying vec2 vTextureCoord;
+uniform sampler2D myVidTex; //this will get replaced before compilation
+uniform sampler2D imageSampler; //this will NOT get replaced
+void main(void) {
+  vec2 tx = vTextureCoord;
+  vid = texture2D(myVidTex, tx); //this will get replaced before compilation
+  img = texture2D(imageSampler, tx); //this will NOT get replaced
+  vid.alpha = img.alpha;
+  gl_FragColor = vid;
+}
+\endcode
+
+The resulting fragment shader may contain one or more sampler2D and a few additional uniforms, but they are managed for you by GPAC!
+
+The named texture is then used as usual:
+\code
+  gl.activeTexture(gl.TEXTURE0);
+  gl.bindTexture(gl.TEXTURE_2D, tx);
+  //this one is ignored for named textures (the uniformlocation object exists but is deactivated) but you can just keep your code as usual
+  gl.uniform1i(myVidTexUniformLocation, 0);
+
+  gl.activeTexture(gl.TEXTURE0 + tx.nb_textures);
+  gl.bindTexture(gl.TEXTURE_2D, imageTexture);
+  gl.uniform1i(imageSamplerUniformLocation, 0);
+\endcode
+
+In the above code, note the usage of tx.nb_textures : this allows fetching the underlying number of texture units used by the named texture, and properly setting up multitexturing.
+
+\warning A consequence of this is that you cannot reuse a fragment shader for both a NamedTexture and a regular WebGLTexture, this will simply not work.
+
+\warning Using explicit location assignment in your shader on a named texture sampler2D is NOT supported: \code layout(location = N) \endcode
+
+
+The core concept for dealing with NamedTexture is that the fragment shader sources must be set AFTER the texture is being setup (upload / texImage2D). Doing it before will result in an unmodifed fragment shader and missing uniforms.
+
+To summarize, NamedTexture allows you to use existing glsl fragment shaders sources with any pixel format for your source, provided that:
+- you tag the texture with the name of the sampler2D you want to replace
+- you upload data to your texture before creating the program using it
+
+The NamedTexture does not track any pixel format or image width changes, mostly because the program needs recompiling anyway. This means that whenever the pixel format or source image width change for a NamedTexture, you must:
+- reset the NamedTexture by calling reconfigure()
+- destroy your GLSL program, 
+- upload the new data to your NamedTexture
+- resetup your fragment shader source and program
+
+\note The width must be checked, since for packed YUV it is needed and exposed as a uniform. You could also modify this uniform manually, see "Inside named textures" section
+
+## Example of using source FilterPacket with NamedTexture
+
+\code
+import {WebGLContext, Matrix} from 'webgl'
+
+//let our filter accept and produce only raw video
+filter.set_cap({id: "StreamType", value: "Video", inout: true} );
+filter.set_cap({id: "CodecID", value: "raw", inout: true} );
+
+//setup webGL
+let gl = new WebGLContext(1280, 720);
+//setup named texture
+let tx = gl.createTexture('MyVid');
+let program = null;
+
+let width=0;
+let height=0;
+let pix_fmt = '';
+let ipid = null;
+let opid = null;
+
+const vertexShaderSource = `
+...
+`;
+
+const fragmentShaderSource = `
+varying vec2 vTextureCoord;
+uniform sampler2D MyVid; //same as our named texture
+void main(void) {
+  vec2 tx= vTextureCoord;
+  //vertical flip 
+  tx.y = 1.0 - tx.y;
+  gl_FragColor = texture2D(MyVid, tx);
+}
+`;
+
+filter.configure_pid = function(pid) {
+  if (!opid) {
+    opid = this.new_pid();
+  }
+  ipid = pid;
+  //copy all props from input pid
+  opid.copy_props(pid);
+  //default pixel format for WebGL context framebuffer is RGBA
+  opid.set_prop('PixelFormat', 'rgba');
+  //drop these properties
+  opid.set_prop('Stride', null);
+  opid.set_prop('StrideUV', null);
+  //check if pixel format, width or height have changed by checking props
+  let n_width = pid.get_prop('Width');
+  let n_height = pid.get_prop('Height');
+  let pf = pid.get_prop('PixelFormat');
+  if ((n_width != width) || (n_height != height)) {
+    width = n_width;
+    height = n_height;
+    //you may want to resize your canvas here
+  }
+  if (pf != pix_fmt) {
+    pix_fmt = pf;
+    //dereference program (wait gor GC to kill it) or delete it using gl.deleteProgram
+    program = null;
+    //notify the texture it needs reconfiguring
+    tx.reconfigure();
+  }
+}
+
+filter.process = function()
+{
+  //previous frame is still being used by output(s), do not modify (although you technically can ...) ! 
+  if (filter.frame_pending) return GF_OK;
+  //get source packet
+  let ipck = ipid.get_packet();
+  if (!ipck) return GF_OK;
+
+  //request the OpenGL context to be the current one
+  gl.activate(true);
+
+  //upload texture - these are the same as tx.upload(ipck);
+  gl.bindTexture(gl.TEXTURE_2D, tx);
+  gl.texImage2D(gl.TEXTURE_2D, 0, 0, 0, 0, ipck);
+
+  //program not created, do it now that we know the texture format
+  if (!programInfo) programInfo = setupProgram(gl, vertexShaderSource, fragmentShaderSource);
+  /*draw scene
+  setup viewport, matrices, uniforms, etc.
+  ...
+  */
+  //set video texture
+  gl.activeTexture(gl.TEXTURE0);
+  gl.bindTexture(gl.TEXTURE_2D, tx);
+  //this one is ignored for gpac named textures, just kept to make sure we don't break usual webGL programming 
+  gl.uniform1i(programInfo.uniformLocations.txVid, 0);
+
+  /*
+  ...
+
+  drawElements / drawArray ...
+
+  end draw scene
+  */
+  //make sure all OpenGL calls are done before sending the packet
+  gl.flush();
+
+  //indicate we are done with the OpenGL context
+  gl.activate(false);
+
+  //create packet from webgl framebuffer, with a callback to get notified when the frambuffer is no longer in use by other filters
+  let opck = opid.new_packet(gl, () => { filter.frame_pending=false; } );
+
+  //remember we wait for the notif
+  this.frame_pending = true;
+  //copy all properties of the source packet
+  opck.copy_props(ipck);
+
+  //note that we drop the source after the draw in this example: since the source data could be OpenGL textures, we don't want to discard them until we are done
+  ipid.drop_packet();
+
+  //send packet !
+  opck.send();
+}
+\endcode
+
+## Inside named textures 
+
+NamedTexture allows supporting all pixel formats currently used in GPAC without any conversion before GPU upload. Namely:
+- YUV 420, 422 and 444 planar 8 bits (and 10 bits on desktop versions) 
+- YUYV, YVYU, UYVU, VYUY 422 8 bits 
+- NV12 and NV21 8 bits  (and 10 bits on desktop versions)
+- RGBA, ARGB, BGRA, ABGR, RGBX, XRGB, BGRX, XBGR
+- AlphaGrey and GreyAlpha
+- Greyscale
+- RGB 444, RGB 555, RGB 565
+
+If you want to have fun, the underlying uniforms are defined in the fragment shader, with $NAME$ being replaced by the name of the NamedTexture:
+-  uniform sampler2D \_gf\_$NAME$\_1: RGB (all variants), packed YUV (all variants) or Y plane, always defined
+- uniform sampler2D \_gf\_$NAME$\_2: U or UV plane, if any, undefined otherwise
+- uniform sampler2D \_gf\_$NAME$\_3: V plane, if any, undefined otherwise
+- uniform float \_gf\_$NAME$\_width: image width for packed YUV, undefined otherwise
+
+The texture formats are as follows:
+- RGB 444, RGB 555, RGB 565 are uploaded as alpha grey images
+- nv12 and nv21 are uploaded as greyscale image for Y and alpha grey image for UV
+- all planar formats are uploaded as one greyscale image per plane
+- All 10 bit support is done using 16 bits texture, GL_UNSIGNED_SHORT format and GL_RED_SCALE/GL_ALPHA_SCALE
+
+\note Currently 10 bit support is disabled on iOS and Android since GL_RED_SCALE/GL_ALPHA_SCALE are not supported in GLES2
+
+The YUV to RGB conversion values are currently hardcoded, we will expose them as uniforms soon.
+The YUV+alpha is yet to be implemented.
+
+
+# Matrices
+The 'evg' module comes with a Matrix object to avoid external dependencies for matrix manipulation.
+@{
+
+*/
+
+/*! Extensions for GPAC WebGL*/
+interface WebGLContext : implements WebGLRenderingContextBase {
+
+	/*! creates a new WebGL context
+	\param width the target width in pixels of the drawing buffer
+	\param height the target height in pixels of the drawing buffer
+	\param context_attributes the context attributes as defined by WebGL (see https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.2)
+	*/
+	WebGLContext(unsigned long width, unsigned long height, WebGLContextAttributes context_attributes);
+
+	/*! creates a new WebGL context (mainly defined for future canvas simulation)
+	\param canvas_obj an object exposing "width" and "height" properties
+	\param context_attributes the context attributes as defined by WebGL (see https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.2)
+	*/
+	WebGLContext(Object canvas_obj, WebGLContextAttributes context_attributes);
+
+
+	/*! activate or deactivate a WebGL context
+	\param activate if true, binds the associated frame buffer. If false, unbinds it
+	*/
+	void activate(boolean activate);
+
+
+	/*! resize the underlying frame buffer to the indicated size
+	\param width new width in pixels
+	\param height new height in pixels
+	*/
+	void resize(unsigned long width, unsigned long height);
+
+	/*! uploads the content of the EVG Texture to the bound texture. The bound texture can be a WebGLTexture or a NamedTexture
+	\param target ignored, default to gl.TEXTURE_2D
+	\param level target same as regular texImage2D
+	\param internalformat ignored, overloaded during upload based on input data
+	\param format ignored, overloaded during upload based on input data
+	\param type ignored, overloaded during upload based on input data
+	\param source the source Texture to use
+	*/
+	void texImage2D(GLenum target, GLint level, GLint internalformat, GLenum format, GLenum type, Texture source);
+
+	/*! uploads the content of the FilterPacket to the bound texture. The bound texture shall be a NamedTexture
+	\param target ignored, default to gl.TEXTURE_2D
+	\param level target same as regular texImage2D
+	\param internalformat ignored, overloaded during upload based on input data
+	\param format ignored, overloaded during upload based on input data
+	\param type ignored, overloaded during upload based on input data
+	\param source the source FilterPacket to use
+	*/
+	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
+	\return a new named texture
+	*/
+	NamedTexture createTexture(DOMString name);
+
+	/*!
+	\param target ignored, default to gl.TEXTURE_2D
+	\param texture the named texture to bind, or null to unbind textures
+	*/
+	void bindTexture(GLenum target, 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)
+  \return an array of strings, each entry being the name of a supported extension
+  */
+  sequence<DOMString>? getSupportedExtensions(optional boolean use_gl_exts=false);
+};
+
+/*! 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:
+\code
+nextActiveTexture = gl.TEXTURE0 + named_tx.nb_textures;
+\endcode
+*/
+attribute readonly unsigned long nb_textures;
+/*! set to true if the input to this named texture is a set of one or more OpenGL textures rather than system memory data*/
+attribute readonly unsigned long is_gl_input;
+/*! name of the texture, as passed upon creation*/
+attribute readonly DOMString name;
+/*! indicates if PBO is used for data transfer. By default named textures are created with no PBO transfer. To enable it, set this to true before the first texture upload*/
+attribute unsigned long pbo;
+
+/*! indicates the underlying picel format has been modified and that the texture should be reevaluated*/
+void reconfigure();
+/*! builds named texture from input filter packet
+\param pck the filter packet to use as source for texture data*/
+void upload(FilterPacket pck);
+/*! builds named texture from EVG texture
+\param tx the EVG texture to use as source for texture data
+\warning do NOT use a Texture object constructed from a FilterPacket, this will fail and throw an exception. Use upload(FilterPacket) instead*/
+void upload(Texture tx);
+
+};
+
+/*! 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 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.0.tar.gz/share/doc/idl/xhr.idl Added

@@ -0,0 +1,56 @@
+/*
+\file
+\brief silence !
+*/
+
+/*!
+
+\defgroup xhr_grp XMLHttpRequest API
+\ingroup jsapi_grp
+\brief XMLHttpRequest API.
+
+GPAC supports XMLHttpRequest. For more documentation, please check  https://xhr.spec.whatwg.org/
+
+The XMLHttpRequest API is loaded by default when using SVG or VRML scripts.
+For other cases (e.g. JS filters), the API is loaded as a JS module with the name "xhr":
+
+\code
+import {XMLHttpRequest} from 'xhr'
+
+...
+\endcode
+
+The API currently supports all response types except blob response (WIP).
+
+
+The API allows access to the response body while downloading the content, except for responseType "Document" and responseXML.
+
+For XML progressive acesss, the specific responseType "sax" must be set before sending the request in order to enable on-the-fly SAX parsing of the content.
+
+For ArrayBuffer response type, note that the underlying data object may change asynchronously during transfer, so the arraybuffer fetched might get detached at any time which may lead to unpredictable results. 
+
+To avoid this, the specific responseType "push" may be used in GPAC. The responseType must be set before sending the request. 
+In "push" mode, the onprogress event triggered by new data reception contains an aditionnal arraybuffer object holding the last received data chunk. This arraybuffer is only valid for the execution of the onprogress callback, but can be used to parse on the fly or to append data in another arraybuffer. In "push" mode, data is NOT available through "response" and access to XHR.response will throw an exception. This avoids storing the data internally in the XHR object.
+
+The progress event object during data transfer is defined in ProgressEvent.
+
+@{
+
+*/
+
+/*! event interface for progress events in GPAC XHR*/
+interface ProgressEvent {
+/*! indicates if total length is known */
+attribute boolean lengthComputable;
+/*! indicates amount of bytes loaded */
+attribute unsigned long long loaded;
+/*! indicates total amount of bytes in response */
+attribute unsigned long long total;
+/*! indicates current bits per second download rate when onprogress is triggered by new data arrival, undefined otherwise */
+attribute unsigned long bps;
+/*! arraybuffer containing the currently downloaded chunk when onprogress is triggered by new data arrival, undefined otherwise */
+attribute ArrayBuffer buffer;
+
+};
+
+/*! @} */

gpac-1.0.0.tar.gz/share/doc/ipmpx_syntax.bt Added

@@ -0,0 +1,237 @@
+#this is an example BT file for most supported IPMPX descriptors and data in MP4Box. 
+#Some of the IPMPX_Data used will likely never be sent on the wire (only sent through tools) but 
+#their coding is still supported
+#for XMT syntax, do as usual in gpac: MP4Box -xmt file.bt
+#As a general note, it is almost useless to try to use IPMPX without the spec :)
+#Please be aware that the IPMPX data described in this file is useless in terms of protection & IPMPX usage in MPEG-4 content, it is
+#just here for IPMPX encoding/decoding testing...
+
+InitialObjectDescriptor {
+ esDescr [
+  ES_Descriptor {
+  	ES_ID 1
+   decConfigDescr DecoderConfigDescriptor {
+    streamType 3
+   }
+  }
+  ES_Descriptor {
+  	ES_ID 2
+   decConfigDescr DecoderConfigDescriptor {
+    streamType 1
+   }
+  }
+ ]
+ ipmpDescr [
+	IPMP_Descriptor {
+		IPMP_DescriptorID	0xff
+		IPMPS_Type		0xffff
+		IPMP_DescriptorIDEx	69
+		IPMP_ToolID		123
+		controlPointCode	0x01 
+		sequenceCode		0x00
+	}
+ ]
+ toolListDescr IPMP_ToolListDescriptor {
+	ipmpTool [
+	 #GPAC DOES NOT support alternativeTools and ParametricDescription in IPMP_Tool yet !!
+	 IPMP_Tool {
+		IPMP_ToolID	128
+		ToolURL "http://gpac.io/ipmp/tools/gpac_decrypt"
+	 }
+  ]
+ }
+}
+
+OrderedGroup {
+    children [
+		Sound2D {
+			source AudioSource {
+				url "myfile.avi#audio"
+			} 
+		}
+		Shape {
+			geometry Bitmap {}
+			appearance Appearance {
+				texture MovieTexture {
+					url "myfile.avi#video"
+				}
+			}
+		}
+	 ]
+}
+
+UPDATE IPMPDX [
+	IPMP_Descriptor {
+		IPMP_DescriptorID	0xff
+		IPMPS_Type		0xffff
+		IPMP_DescriptorIDEx	79
+		IPMP_ToolID		123
+		controlPointCode	0x01
+		sequenceCode		0x00
+		IPMPX_Data [
+			IPMP_KeyData {
+				#GPAC also accepts the syntax: keyBody "snclsdjlvksjdls" for IPMPX ByteArray in BT format. This is what will be used later on
+				keyBody {
+				  array  "keybody_bytearray"
+				}
+		    hasStartDTS		FALSE
+		    hasStartPacketID  	FALSE
+		    hasExpireDTS      	FALSE
+		    hasExpirePacketID	FALSE
+		    opaqueData "IPMPkey-opaquedata byte array"
+      }
+			IPMP_SecureContainer {
+				encryptedData "the encrypted data"
+				MAC "the mac data"
+			}
+			IPMP_InitAuthentication {
+				Context 32
+				AuthType 5
+			}
+			IPMP_MutualAuthentication {
+				candidateAlgorithms [
+					IPMP_AlgorithmDescriptor { regAlgoID 102 }
+					IPMP_AlgorithmDescriptor { regAlgoID 103 }
+				]
+				AuthenticationData "dbs,qbdjsqbxkjqsl"
+				
+				trustData IPMP_TrustSecurityMetadata {
+					trustedTools [
+						IPMP_TrustedTool {
+							toolID 1245
+							trustSpecifications [
+								IPMP_TrustSpecification {
+									attackerProfile 98
+									trustedDuration 123258
+								}
+							]
+						}
+					]
+				}
+				#the syntax here is a bit weird, the list of IPMPX_ByteArray is just the list of each array content. XMT syntax is cleaner
+				certificates [
+					"khdhskncksdnfk",
+					"vghjxdbjzhfkjerunxinqms"
+				]
+				publicKey IPMP_KeyDescriptor {
+					keyBody "key descriptor body data"
+			  }
+			  opaque "mutual authentication opaque data"
+			  authCodes "mutual authentication codes"
+			}
+			IPMP_ToolParamCapabilitiesQuery {
+				description IPMP_ParametricDescription {
+					majorVersion 2
+					minorVersion 1
+					descriptionComment "This is a parametric description"
+					descriptions [
+						IPMP_ParametricDescriptionItem {
+							class "encryption"
+							subClass "DES"
+							typeData "char"
+							type "algo"
+							addedData "fgsdjkjé"
+						}
+					]
+				}
+			}
+			IPMP_ToolParamCapabilitiesResponse {
+				capabilitiesSupported FALSE
+			}
+			IPMP_ConnectTool {
+				toolDescriptor IPMP_Descriptor {
+					IPMP_DescriptorID	0xff
+					IPMPS_Type		0xffff
+					IPMP_DescriptorIDEx	71
+					IPMP_ToolID		122
+					controlPointCode	0x01
+					sequenceCode		0x00
+				}
+			}
+			IPMP_DisconnectTool {
+				IPMP_ToolContextID 325
+			}
+			IPMP_GetToolContext {
+				scope 2
+				IPMP_DescriptorIDEx 127
+			}
+			IPMP_GetToolContextResponse {
+				OD_ID 10
+				ESD_ID 5
+				IPMP_ToolContextID 325
+			}
+			#eventType is a comma-separated list - this should not be needed for authoring, this msg is typically sent by loaded tools (runtime only)
+			IPMP_AddToolNotificationListener {
+				eventType "0,1,2"
+				scope 2
+			}
+			#eventType is a comma-separated list - this should not be needed for authoring, this msg is typically sent by loaded tools (runtime only)
+			IPMP_RemoveToolNotificationListener {
+				eventType "0,1,2"
+			}
+			IPMP_NotifyToolEvent {
+				OD_ID 10
+				ESD_ID 5
+				IPMP_ToolContextID 325
+				eventType 2
+			}
+			IPMP_CanProcess {
+			 canProcess TRUE
+			}
+			IPMP_RightsData {
+				rightsInfo "rightsdataarray"
+			}
+			IPMP_OpaqueData {
+				opaqueData "opaquedataarray"
+			}
+			IPMP_ToolAPI_Config {
+				Instantiation_API_ID 10
+				Messaging_API_ID 20
+				opaqueData "APIopaquedata"
+			}
+			IPMP_AudioWatermarkingInit {
+				inputFormat 0x01
+				requiredOp	2
+				nChannels 2
+				bitPerSample 16
+				frequency 44100
+				wmPayload "gduhxwksjkeochxb"
+			}
+			IPMP_SendAudioWatermark {
+				wm_status 0x01
+				compression_status	2
+				payload "gduhxwksjkeochxb"
+				opaqueData "op_wm"
+			}
+       IPMP_SelectiveDecryptionInit {
+				mediaTypeExtension 0
+				mediaTypeIndication 0x40
+				profileLevelIndication 0xF
+				compliance 1
+				SelectiveBuffers [
+					IPMP_SelectiveBuffer {
+						cipher_id 1233546
+						mode 123
+						blockSize 32
+						keySize 32
+					}
+					IPMP_SelectiveBuffer {
+						cipher_id 1233555
+						StreamCipher "jqsyjnxsq,hdkq"
+					}
+				]
+				SelectiveFields[
+					IPMP_SelectiveField {
+						field_id 12
+						field_scope 3
+						buf 1
+						#mappingTable is a comma-separated list of u16 integers
+						mappingTable "1,2,1,3,4,5"
+						shuffleSpecificInfo "shuffle_BA"
+					}
+				]
+       }
+		]
+	}
+]
+

gpac-1.0.0.tar.gz/share/doc/man Added

gpac-1.0.0.tar.gz/share/doc/man/gpac-filters.1 Added

@@ -0,0 +1,5855 @@
+.TH gpac 1 2019 gpac GPAC
+.
+.SH NAME
+.LP
+gpac \- GPAC command-line filter session manager
+.SH SYNOPSIS
+.LP
+.B gpac
+.RI [options] FILTER [LINK] FILTER [...]
+.br
+.
+.SH DESCRIPTION
+.LP
+This page describes all filters usually present in GPAC
+
+To check for help on a filter not listed here, use gpac -h myfilter
+
+.SH inspect
+.LP
+.br
+Description: Inspect packets
+.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.
+.br
+The packet inspector can be configured to dump specific properties of packets using -fmt.
+.br
+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:
+.br
+* pn: packet (frame in framed mode) number
+.br
+* dts: decoding time stamp in stream timescale, N/A if not available
+.br
+* ddts: difference between current and previous packets decoding time stamp in stream timescale, N/A if not available
+.br
+* cts: composition time stamp in stream timescale, N/A if not available
+.br
+* dcts: difference between current and previous packets composition time stamp in stream timescale, N/A if not available
+.br
+* ctso: difference between composition time stamp and decoding time stamp in stream timescale, N/A if not available
+.br
+* dur: duration in stream timescale
+.br
+* frame: framing status
+.br
+  * interface: complete AU, interface object (no size info). Typically a GL texture
+.br
+  * frame_full: complete AU
+.br
+  * frame_start: begining of frame
+.br
+  * frame_end: end of frame
+.br
+  * frame_cont: frame continuation (not begining, not end)
+.br
+* sap or rap: SAP type of the frame
+.br
+* ilace: interlacing flag (0: progressive, 1: top field, 2: bottom field)
+.br
+* corr: corrupted packet flag
+.br
+* seek: seek flag
+.br
+* bo: byte offset in source, N/A if not available
+.br
+* roll: roll info
+.br
+* crypt: crypt flag
+.br
+* vers: carrousel version number
+.br
+* size: size of packet
+.br
+* crc: 32 bit CRC of packet
+.br
+* lf: insert linefeed
+.br
+* cr: insert carriage return
+.br
+* t: insert tab
+.br
+* data: hex dump of packet ( WARNING, BIG OUTPUT !! )
+.br
+* lp: leading picture flag
+.br
+* depo: depends on other packet flag
+.br
+* depf: is depended on other packet flag
+.br
+* red: redundant coding flag
+.br
+* ck: clock type used for PCR discontinuities
+.br
+* P4CC: 4CC of packet property
+.br
+* PropName: Name of packet property
+.br
+* pid.P4CC: 4CC of PID property
+.br
+* pid.PropName: Name of PID property
+.br
+
+.br
+Example
+.br
+fmt="PID $pid.ID$ packet $pn$ DTS $dts$ CTS $cts$ $lf$"
+.br
+
+.br
+This dumps packet number, cts and dts as follows: PID 1 packet 10 DTS 100 CTS 108 \n
+.br
+  
+.br
+An unrecognized keywork or missing property will resolve to an empty string.
+.br
+
+.br
+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.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+log (str, default: stderr, minmax: fileName, stderr or stdout, updatable): 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
+.br
+* raw: dump source packets without demuxing
+.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 -fmt is set
+.br
+props (bool, default: true, updatable): dump packet properties, ignored when -fmt is set (see filter help)
+.br
+dump_data (bool, default: false, updatable): enable full data dump (WARNING heavy!), ignored when -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 -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
+* 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
+.br
+
+.br
+
+.br
+.SH probe
+.LP
+.br
+Description: Probe source
+.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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+log (str, default: stderr, minmax: fileName, stderr or stdout, updatable): 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
+.br
+* raw: dump source packets without demuxing
+.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 -fmt is set
+.br
+props (bool, default: true, updatable): dump packet properties, ignored when -fmt is set (see filter help)
+.br
+dump_data (bool, default: false, updatable): enable full data dump (WARNING heavy!), ignored when -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 -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
+* 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
+.br
+
+.br
+
+.br
+.SH compositor
+.LP
+.br
+Description: Compositor
+.br
+
+.br
+The GPAC compositor allows mixing audio, video, text and graphics in a timed fashion.
+.br
+The compositor operates either in media-client or filter-only mode.
+.br
+
+.br
+.SH Media-client mode
+.LP
+.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.
+.br
+The audio part acts as a regular filter, potentially mixing and resampling the audio inputs to generate its output.
+.br
+User events are directly processed by the filter in this mode.
+.br
+
+.br
+.SH Filter mode
+.LP
+.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.
+.br
+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.
+.br
+It will stop generating frames as soon as all input streams are done, unless extended/reduced by -dur.
+.br
+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
+.br
+- rgba when the filter is loaded during a link resolution
+.br
+This can be changed by assigning the -opfmt option.
+.br
+
+.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.
+.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.
+.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
+
+.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.
+.br
+
+.br
+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.
+.br
+
+.br
+.SH Specific URL syntaxes
+.LP
+.br
+The compositor accepts any URL type supported by GPAC. It also accepts the following syntaxes for URLs:
+.br
+* views: creates an auto-stereo scene of N views from views://v1:.:vN. vN can be any type of URL supported by GPAC.
+.br
+* mosaic: creates a mosaic of N views from mosaic://v1:.:vN. vN can be any type of URL supported by GPAC.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+aa (enum, default: all, updatable): set anti-aliasing mode for raster graphics - whether the setting is applied or not depends on the graphics module / graphic card.
+.br
+* none: no anti-aliasing
+.br
+* text: anti-aliasing for text only
+.br
+* all: complete anti-aliasing
+.br
+
+.br
+hlfill (uint, default: 0x0, updatable): set highlight fill color (ARGB)
+.br
+hlline (uint, default: 0xFF000000, updatable): set highlight stroke color (ARGB)
+.br
+hllinew (flt, default: 1.0, updatable): set highlight stroke width
+.br
+sz (bool, default: true, updatable): 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.
+.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
+.br
+blitp (bool, default: true, updatable): partial hardware blits (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
+stress (bool, default: false, updatable): enable stress mode of compositor (rebuild all vector graphics and texture states at each frame)
+.br
+fast (bool, default: false, updatable): enable speed optimization - whether the setting is applied or not depends on the graphics module / graphic card
+.br
+bvol (enum, default: no, updatable): draw bounding volume of objects.
+.br
+* no: disable bounding box
+.br
+* box: draws a rectangle (2D) or box (3D mode)
+.br
+* aabb: draws axis-aligned bounding-box tree (3D only)
+.br
+
+.br
+textxt (enum, default: default, updatable): 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
+.br
+* default: use texturing for OpenGL rendering, no texture for 2D rasterizer
+.br
+* never: never uses text textures
+.br
+* always: always render text to texture before drawing
+.br
+
+.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
+.br
+sclock (bool, default: false, updatable): force synchronizing all streams on a single clock
+.br
+sgaze (bool, default: false, updatable): simulate gaze events through mouse
+.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
+.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.
+.br
+autofps (bool, default: true): use video input fps for output. If no video or not set, uses -fps. Ignored in player mode
+.br
+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
+fsize (bool, default: false, updatable): force the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration
+.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).
+.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
+.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
+.br
+asr (uint, default: 0):        force output sample rate - 0 for auto
+.br
+ach (uint, default: 0):        force output channels - 0 for auto
+.br
+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
+.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
+.br
+avol (uint, default: 100, updatable): audio volume in percent
+.br
+apan (uint, default: 50, updatable): audio pan in percent, 50 is no pan
+.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
+.br
+max_vspeed (dbl, default: 4.0, updatable): move to i-frame only decoding if playback speed is greater than sepcified value
+.br
+buf (uint, default: 3000, updatable): playout buffer in ms. Overriden by BufferLenth property of input pid
+.br
+rbuf (uint, default: 1000, updatable): rebuffer trigger in ms. Overriden by RebufferLenth property of input pid
+.br
+mbuf (uint, default: 3000, updatable): max buffer in ms (must be greater than playout buffer). Overriden by BufferMaxOccupancy property of input pid
+.br
+ntpsync (uint, default: 0, updatable): ntp resync threshold (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)
+.br
+ogl (enum, default: auto, updatable): specify 2D rendering mode
+.br
+* auto: automatically decides betwwen on, off and hybrid based on content.
+.br
+* off: disables OpenGL - 3D will not be rendered.
+.br
+* on: uses OpenGL for all graphics - this will involve polygon tesselation and 2D graphics will not look as nice as 2D mode.
+.br
+* 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.
+.br
+
+.br
+pbo (bool, default: false, updatable): enable PixelBufferObjects to push YUV textures to GPU in OpenGL Mode. This may slightly increase the performances of the playback.
+.br
+nav (enum, default: none, updatable): override the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine)
+.br
+* none: disables navigation
+.br
+* walk: 3D world walk
+.br
+* fly: 3D world fly (no ground detection)
+.br
+* pan: 2D/3D world zomm/pan
+.br
+* game: 3D world game (mouse gives walk direction)
+.br
+* slide: 2D/3D world slide
+.br
+* exam: 2D/3D object examine
+.br
+* orbit: 3D object orbit
+.br
+* vr: 3D world VR (yaw/pitch/roll)
+.br
+
+.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
+.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
+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
+.br
+* on: enables backface culling
+.br
+* off: disables backface culling
+.br
+* alpha: only enables backface culling for transparent meshes
+.br
+
+.br
+wire (enum, default: none, updatable): wireframe mode.
+.br
+* none: objects are drawn as solid
+.br
+* only: objects are drawn as wireframe only
+.br
+* solid: objects are drawn as solid and wireframe is then drawn
+.br
+
+.br
+norms (enum, default: none, updatable): normal vector drawing for debug
+.br
+* none: no normals drawn
+.br
+* face: one normal per face drawn
+.br
+* vertex: one normal per vertex drawn
+.br
+
+.br
+rext (bool, default: true, updatable): use non power of two (rectangular) texture GL extension
+.br
+cull (bool, default: true, updatable): use aabb culling: large objects are rendered in multiple calls when not fully in viewport
+.br
+depth_gl_scale (flt, default: 100, updatable): set depth scaler
+.br
+depth_gl_type (enum, default: none, updatable): set geometry type used to draw depth video
+.br
+* none: no geometric conversion
+.br
+* point: compute point cloud from pixel+depth
+.br
+* strip: same as point but thins point set
+.br
+
+.br
+nbviews (uint, default: 0, updatable): number of views to use in stereo mode
+.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
+* side: images are displayed side by side from left to right.
+.br
+* top: images are displayed from top (laft view) to bottom (right view).
+.br
+* hmd: same as side except that view aspect ratio is not changed.
+.br
+* ana: standard color anaglyph (red for left view, green and blue for right view) is used (forces views=2).
+.br
+* cols: images are interleaved by columns, left view on even columns and left view on odd columns (forces views=2).
+.br
+* rows: images are interleaved by columns, left view on even rows and left view on odd rows (forces views=2).
+.br
+* spv5: images are interleaved by for SpatialView 5 views display, fullscreen mode (forces views=5).
+.br
+* alio8: images are interleaved by for Alioscopy 8 views displays, fullscreen mode (forces views=8).
+.br
+* 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
+.br
+
+.br
+mvshader (str, updatable):     file path to the custom multiview interleaving shader
+.br
+fpack (enum, default: none, updatable): default frame packing of input video
+.br
+* none: no frame packing
+.br
+* top: top bottom frame packing
+.br
+* side: side by side packing
+.br
+
+.br
+camlay (enum, default: offaxis, updatable): camera layout in multiview modes
+.br
+* straight: camera is moved along a straight line, no rotation
+.br
+* offaxis: off-axis projection is used
+.br
+* linear: camera is moved along a straight line with rotation
+.br
+* circular: camera is moved along a circle with rotation
+.br
+
+.br
+iod (flt, default: 6.4, updatable): inter-occular 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
+.br
+tvtt (uint, default: 0, updatable): number of points above which the tile is considered visible
+.br
+tvtd (bool, default: false, updatable): disable the tile having full coverage of the SRD, only displaying partial tiles
+.br
+tvtf (bool, default: false, updatable): force all tiles to be considered visible, regardless of viewpoint
+.br
+fov (flt, default: 1.570796326794897, updatable): default field of view for VR
+.br
+vertshader (str):              path to vertex shader file
+.br
+fragshader (str):              path to fragment shader file
+.br
+autocal (bool, default: false, updatable): auto callibration of znear/zfar in depth rendering mode
+.br
+dispdepth (sint, default: -1, updatable): display depth, negative value uses default screen height
+.br
+dispdist (flt, default: 50, updatable): distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC
+.br
+focdist (flt, default: 0, updatable): distance of focus point
+.br
+osize (v2di, default: 0x0, updatable): force output size. If not set, size is derived from inputs
+.br
+dpi (v2di, default: 96x96, updatable): default dpi if not indicated by video output
+.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
+.br
+* no: regular mode
+.br
+* base: player mode
+.br
+* gui: player mode with GUI auto-start
+.br
+
+.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 -player mode
+.br
+drv (enum, default: auto):     indicate if graphics driver should be used. Ignored in player mode
+.br
+* no: never loads a graphics driver (software blitting used, no 3D possible)
+.br
+* yes: always loads a graphics driver. Output pixel format will be RGB
+.br
+* auto: decides based on the loaded content
+.br
+
+.br
+
+.br
+.SH mp4dmx
+.LP
+.br
+Description: ISOBMFF/QT demuxer
+.br
+
+.br
+This filter demultiplexes ISOBMF and QT files (regular or fragmented).
+.br
+.SH Track Selection
+.LP
+.br
+The filter can use fragment identifiers of source to select a single track for playback. The allowed fragments are:
+.br
+ * #audio: only use the first audio track
+.br
+ * #video: only use the first video track
+.br
+ * #auxv: only use the first auxiliary video track
+.br
+ * #pict: only use the first picture track
+.br
+ * #text: only use the first text track
+.br
+ * #trackID=VAL: only use the track with given ID
+.br
+ * #ID=VAL: only use the track with given ID
+.br
+ * #VAL: only use the track with given ID
+.br
+
+.br
+.SH Scalable Tracks
+.LP
+.br
+When scalable tracks are present in a file, the reader can operate in 3 modes using -smode option:
+.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
+.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
+and an enhancement decoder config.
+.br
+* 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
+.br
+ (copied from base) and an enhancement decoder config. This is mostly used for DASHing content.
+.br
+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
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+allt (bool, default: false):   load all tracks even if unknown
+.br
+noedit (bool, default: false): do not use edit lists
+.br
+itt (bool, default: false):    convert all items of root meta into a single PID
+.br
+itemid (bool, default: true):  keep item IDs in PID properties
+.br
+smode (enum, default: split):  load mode for scalable/tile tracks
+.br
+* split: each track is declared, extractors are removed
+.br
+* splitx: each track is declared, extractors are kept
+.br
+* single: a single track is declared (highest level for scalable, tile base for tiling)
+.br
+
+.br
+alltk (bool, default: false):  declare all tracks even disabled ones
+.br
+frame_size (uint, default: 1024): frame size for raw audio samples (dispatches frame_size samples per packet)
+.br
+expart (bool, default: true):  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
+.br
+* audio: declares first audio track
+.br
+* video: declares first video track
+.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
+nocrypt (bool):                signal encrypted tracks as non encrypted (mostly used for export)
+.br
+mstore_size (uint, default: 1000000): target buffer size in bytes
+.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
+.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
+
+.br
+.SH bifsdec
+.LP
+.br
+Description: MPEG-4 BIFS decoder
+.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.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH odfdec
+.LP
+.br
+Description: MPEG-4 OD decoder
+.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.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH fin
+.LP
+.br
+Description: File input
+.br
+
+.br
+This filter dispatch raw blocks from input file into a filter chain.
+.br
+Block size can be adjusted using -block_size.
+.br
+Content format can be forced through -mime and file extension can be changed through -ext.
+.br
+Note: Unless disabled at session level (see -no-probe ), file extensions are usually ignored and format probing is done on the first data block.
+.br
+The special file name null is used for creating a file with no data, needed by some filters such as dasher.
+.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).
+.br
+
+.br
+The filter handles both files and GF_FileIO objects as input URL.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+block_size (uint, default: 0): block size used to read file. 0 means 5000 if file less than 500m, 1M otherwise
+.br
+range (lfrac, default: 0-0):   byte range
+.br
+ext (cstr):                    override file extension
+.br
+mime (cstr):                   set file mime type
+.br
+
+.br
+.SH btplay
+.LP
+.br
+Description: BT/XMT/X3D loader
+.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.
+.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
+.br
+
+.br
+.SH httpin
+.LP
+.br
+Description: HTTP input
+.br
+
+.br
+This filter dispatch raw blocks from a remote HTTP resource into a filter chain.
+.br
+Block size can be adjusted using -block_size, and disk caching policies can be adjusted.
+.br
+Content format can be forced through -mime and file extension can be changed through -ext.
+.br
+Note: Unless disabled at session level (see -no-probe ), file extensions are usually ignored and format probing is done on the first data block.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+block_size (uint, default: 100000): block size used to read file
+.br
+cache (enum, default: disk):   set cache mode
+.br
+* disk: cache to disk,  discard once session is no longer used
+.br
+* disk: cache to disk and keep
+.br
+* mem: stores to memory, discard once session is no longer used
+.br
+* none: no cache
+.br
+
+.br
+range (lfrac, default: 0-0):   set byte range, as fraction
+.br
+ext (cstr):                    override file extension
+.br
+mime (cstr):                   set file mime type
+.br
+
+.br
+.SH svgplay
+.LP
+.br
+Description: SVG loader
+.br
+
+.br
+This filter parses SVG files directly into the scene graph of the compositor. It cannot be used to dump content.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+sax_dur (uint, default: 0):    loading duration for SAX parsing, 0 disables SAX parsing
+.br
+
+.br
+.SH rfimg
+.LP
+.br
+Description: JPG/J2K/PNG/BMP reframer
+.br
+
+.br
+This filter parses JPG/J2K/PNG/BMP files/data and outputs corresponding visual PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+
+.br
+.SH imgdec
+.LP
+.br
+Description: PNG/JPG decoder
+.br
+
+.br
+This filter decodes JPEG and PNG images.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH rfadts
+.LP
+.br
+Description: ADTS reframer
+.br
+
+.br
+This filter parses AAC files/data and outputs corresponding audio PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+frame_size (uint, default: 1024): size of AAC frame in audio samples
+.br
+index (dbl, default: 1.0):     indexing window length
+.br
+ovsbr (bool, default: false):  force oversampling SBR (does not multiply timescales by 2)
+.br
+sbr (enum, default: no):       set SBR signaling
+.br
+* no: no SBR signaling at all
+.br
+* imp: backward-compatible SBR signaling (audio signaled as AAC-LC)
+.br
+* exp: explicit SBR signaling (audio signaled as AAC-SBR)
+.br
+
+.br
+ps (enum, default: no):        set PS signaling
+.br
+* no: no PS signaling at all
+.br
+* imp: backward-compatible PS signaling (audio signaled as AAC-LC)
+.br
+* exp: explicit PS signaling (audio signaled as AAC-PS)
+.br
+
+.br
+expart (bool, default: false): expose pictures as a dedicated video pid
+.br
+
+.br
+.SH rflatm
+.LP
+.br
+Description: LATM reframer
+.br
+
+.br
+This filter parses AAC in LATM files/data and outputs corresponding audio PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+frame_size (uint, default: 1024): size of AAC frame in audio samples
+.br
+index (dbl, default: 1.0):     indexing window length
+.br
+
+.br
+.SH rfmp3
+.LP
+.br
+Description: MP3 reframer
+.br
+
+.br
+This filter parses MPEG-1/2 audio 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
+expart (bool, default: false): expose pictures as a dedicated video pid
+.br
+
+.br
+.SH faad
+.LP
+.br
+Description: FAAD decoder
+.br
+
+.br
+This filter decodes AAC streams through faad library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH maddec
+.LP
+.br
+Description: MAD decoder
+.br
+
+.br
+This filter decodes MPEG 1/2 audio streams through libmad library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH xviddec
+.LP
+.br
+Description: XVid decoder
+.br
+
+.br
+This filter decodes MPEG-4 part 2 (and DivX) through libxvidcore library.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+deblock_y (bool, default: false): enable Y deblocking
+.br
+deblock_uv (bool, default: false): enable UV deblocking
+.br
+film_effect (bool, default: false): enable film effect
+.br
+dering_y (bool, default: false): enable Y deblocking
+.br
+dering_uv (bool, default: false): enable UV deblocking
+.br
+
+.br
+.SH j2kdec
+.LP
+.br
+Description: OpenJPEG2000 decoder
+.br
+Version: 2.x
+.br
+
+.br
+This filter decodes JPEG2000 streams through OpenJPEG2000 library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH rfac3
+.LP
+.br
+Description: AC3 reframer
+.br
+
+.br
+This filter parses AC3 and E-AC3 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 a52dec
+.LP
+.br
+Description: A52 decoder
+.br
+
+.br
+This filter decodes AC3 streams through a52dec library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH rfamr
+.LP
+.br
+Description: AMR/EVRC reframer
+.br
+
+.br
+This filter parses AMR, AMR Wideband, EVRC and SMV 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 oggdmx
+.LP
+.br
+Description: OGG demuxer
+.br
+
+.br
+This filter demultiplexes OGG files/data into a set of media PIDs and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+index (dbl, default: 1.0):     indexing window length (unimplemented, only 0 disables stream probing for duration), 
+.br
+
+.br
+.SH vorbisdec
+.LP
+.br
+Description: Vorbis decoder
+.br
+
+.br
+This filter decodes Vorbis streams through libvorbis library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH theoradec
+.LP
+.br
+Description: Theora decoder
+.br
+
+.br
+This filter decodes Theora streams through libtheora library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH m2tsdmx
+.LP
+.br
+Description: MPEG-2 TS demuxer
+.br
+
+.br
+This filter demultiplexes MPEG-2 Transport Stream files/data into a set of media PIDs and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+temi_url (cstr):               force TEMI URL
+.br
+dsmcc (bool, default: no):     enable DSMCC receiver
+.br
+seeksrc (bool, default: true): seek local source file back to origin once all programs are setup
+.br
+
+.br
+.SH sockin
+.LP
+.br
+Description: UDP/TCP input
+.br
+
+.br
+This filter handles generic TCP and UDP input sockets. It can also probe for MPEG-2 TS over RTP input. Probing of MPEG-2 TS over UDP/RTP is enabled by default but can be turned off.
+.br
+
+.br
+Data format can be specified by setting either -ext or -mime options. If not set, the format will be guessed by probing the first data packet
+.br
+
+.br
+- UDP sockets are used for source URLs formatted as udp://NAME
+.br
+- TCP sockets are used for source URLs formatted as tcp://NAME
+.br
+- UDP unix domain sockets are used for source URLs formatted as udpu://NAME
+.br
+- TCP unix domain sockets are used for source URLs formatted as tcpu://NAME
+.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
+.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
+.br
+sockbuf (uint, default: 65536): socket max buffer size
+.br
+port (uint, default: 1234):    default port if not specified
+.br
+ifce (cstr):                   default multicast interface
+.br
+listen (bool, default: false): indicate the input socket works in server mode
+.br
+ka (bool, default: false):     keep socket alive if no more connections
+.br
+maxc (uint, default: +I):      max number of concurrent connections
+.br
+tsprobe (bool, default: true): probe for MPEG-2 TS data, either RTP or raw UDP. Disabled if mime or ext are given and do not match MPEG-2 TS mimes/extensions
+.br
+ext (str):                     indicate file extension of udp data
+.br
+mime (str):                    indicate mime type of udp data
+.br
+block (bool, default: false):  set blocking mode for socket(s)
+.br
+timeout (uint, default: 5000): set timeout in ms for UDP socket(s)
+.br
+reorder_pck (uint, default: 100): number of packets delay for RTP reordering (M2TS over RTP) 
+.br
+reorder_delay (uint, default: 10): number of ms delay for RTP reordering (M2TS over RTP)
+.br
+
+.br
+.SH dvbin
+.LP
+.br
+Description: DVB for Linux
+.br
+
+.br
+Experimental DVB support for linux, requires a channel config file through -chcfg
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+block_size (uint, default: 65536): block size used to read file
+.br
+chcfg (cstr):                  path to channels.conf file
+.br
+
+.br
+.SH osvcdec
+.LP
+.br
+Description: OpenSVC decoder
+.br
+
+.br
+This filter decodes scalable AVC|H264 streams through OpenSVC library.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH vtbdec
+.LP
+.br
+Description: VideoToolBox decoder
+.br
+
+.br
+This filter decodes MPEG-2, H263, AVC|H264 and HEVC streams through VideoToolBox. It allows GPU frame dispatch or direct frame copy.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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)
+.br
+ofmt (pfmt, default: nv12):    set default pixel format for decoded video. If not matched default to nv12
+.br
+disable_hw (bool, default: false): disable hardware decoding
+.br
+
+.br
+.SH mcdec
+.LP
+.br
+Description: MediaCodec decoder
+.br
+
+.br
+This filter decodes video streams using hardware decoder on android devices
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+disable_gl (bool, default: false): disable OpenGL texture transfer
+.br
+
+.br
+.SH lsrdec
+.LP
+.br
+Description: MPEG-4 LASeR decoder
+.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.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH safdmx
+.LP
+.br
+Description: SAF demuxer
+.br
+
+.br
+This filter demultiplexes SAF (MPEG-4 Simple Aggregation Format for LASeR) files/data into a set of media PIDs and frames.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH dashin
+.LP
+.br
+Description: MPEG-DASH and HLS client
+.br
+
+.br
+This filter reads MPEG-DASH, HLS and MS Smooth (on demand only for now) manifests and produces media PIDs and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+auto_switch (uint, default: 0): switch quality every N segments, disabled if 0
+.br
+store (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
+.br
+* cache: all files are stored to disk and kept
+.br
+
+.br
+algo (enum, default: gbuf):    adaptation algorithm to use
+.br
+* none: no adaptation logic
+.br
+* grate: GAPC legacy algo based on available rate
+.br
+* gbuf: GAPC legacy algo based on buffer occupancy
+.br
+* bba0: BBA-0
+.br
+* bolaf: BOLA Finite
+.br
+* bolab: BOLA Basic
+.br
+* bolau: BOLA-U
+.br
+* bolao: BOLA-O
+.br
+
+.br
+start_with (enum, default: max_bw): initial selection criteria
+.br
+* min_q: start with lowest quality
+.br
+* max_q: start with highest quality
+.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
+.br
+* max_bw_tiles: start with highest bitrate; for tiles 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
+.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
+.br
+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
+timeshift (uint, default: 0):  set initial timshift in ms (if >0) or in %% of timeshift buffer (if <0)
+.br
+tile_mode (enum, default: none): tile adaptation mode
+.br
+* none: bitrate is shared equaly accross all tiles
+.br
+* rows: bitrate decreases for each row of tiles starting from the top, same rate for each tile on the row
+.br
+* rrows: bitrate decreases for each row of tiles starting from the bottom, same rate for each tile on the row
+.br
+* mrows: bitrate decreased for top and bottom rows only, same rate for each tile on the row
+.br
+* cols: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns
+.br
+* rcols: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns
+.br
+* mcols: bitrate decreased for left and right columns only, same rate for each tile on the columns
+.br
+* center: bitrate decreased for all tiles on the edge of the picture
+.br
+* edges: bitrate decreased for all tiles on the center of the picture
+.br
+
+.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
+.br
+exp_threshold (uint, default: 100): delay in millisconds 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)
+.br
+debug_as (uint, default: -1):  play only the adaptation set indicated by its index in the MPD; if negative, all sets are used
+.br
+speedadapt (bool, default: no): enable adaptation based on playback speed
+.br
+noxlink (bool, default: no):   disable xlink if period has both xlink and adaptation sets
+.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
+.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
+.br
+
+.br
+
+.br
+.SH cdcrypt
+.LP
+.br
+Description: CENC decryptor
+.br
+
+.br
+The CENC decryptor supports decrypting CENC, ISMA and Adobe streams. It uses a configuration file for retrieving keys.
+.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 -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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+cfile (str):                   crypt file location - see filter help
+.br
+
+.br
+.SH cecrypt
+.LP
+.br
+Description: CENC  encryptor
+.br
+
+.br
+The CENC encryptor supports CENC, ISMA and Adobe encryption. It uses a DRM config file for declaring keys.
+.br
+The syntax is available at https://wiki.gpac.io/Common-Encryption
+.br
+The DRM config file can be set per PID using the property CryptInfo, or set at the filter level using -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.
+.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 -allc is specified.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+cfile (str):                   crypt file location - see filter help
+.br
+allc (str):                    throw error if no DRM config file is found for a PID - see filter help
+.br
+
+.br
+.SH mp4mx
+.LP
+.br
+Description: ISOBMFF/QT muxer
+.br
+
+.br
+Muxes file according 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.
+.br
+To prevent source items to be muxed as items, use -itemid option from ISOBMF demuxer.
+.br
+Example
+.br
+-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:
+.br
+Example
+.br
+-i source.jpg:#ItemID=1 -o file.mp4
+.br
+
+.br
+  
+.br
+.SH Storage
+.LP
+.br
+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.
+.br
+  
+.br
+The -vodcache option allows controling 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.
+.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
+  
+.br
+.SH Custom boxes
+.LP
+.br
+Custom boxes can be specified as box patches:
+.br
+For movie-level patch, the -boxpatch option of the filter should be used.
+.br
+Per PID box patch can be specified through the PID property boxpatch.
+.br
+Example
+.br
+src=source:#boxpatch=myfile.xml dst=mux.mp4
+.br
+
+.br
+Per Item box patch can be specified through the PID property boxpatch.
+.br
+Example
+.br
+src=source:1ItemID=1:#boxpatch=myfile.xml dst=mux.mp4
+.br
+
+.br
+  
+.br
+The box patch is applied before writing the initial moov box in fragmented mode, or when writing the complete file otherwise.
+.br
+The box patch can either be a filename or the full XML string.
+.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.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+ctmode (enum, default: edit):  set composition offset mode for video tracks.
+.br
+* edit: uses edit lists to shift first frame to presentation time 0
+.br
+* noedit: ignore edit lists and does not shift timeline
+.br
+* negctts: uses ctts v1 with possibly negative offsets and no edit lists
+.br
+
+.br
+idur (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
+importer (bool, default: false): compatibility with old importer, displays import progress
+.br
+pack_nal (bool, default: false): repack NALU size length to minimum possible size for AVC/HEVC/...
+.br
+xps_inband (enum, default: no): use inband (in sample data) param set for AVC/HEVC/...
+.br
+* no: paramater sets are not inband, several sample descriptions might be created
+.br
+* all: paramater sets are inband, no param sets in sample description
+.br
+* both: paramater sets are inband, signaled as inband, and also first set is kept in sample descripton
+.br
+* mix: creates non-standard files using single sample entry with first PSs found, and moves other PS inband
+.br
+
+.br
+store (enum, default: inter):  file storage mode
+.br
+* inter: perform precise interleave of the file using -cdur (requires temporary storage of all media)
+.br
+* flat: write samples as they arrive and moov at end (fastest mode)
+.br
+* fstart: write samples as they arrive and moov before mdat
+.br
+* tight:  uses per-sample interleaving of all tracks (requires temporary storage of all media)
+.br
+* frag: fragments the file using cdur duration
+.br
+* sfrag: framents 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
+.br
+* 0: no specific interleaving but moov first
+.br
+* negative: defaults to 1.0 unless overriden by storage profile
+.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
+.br
+abs_offset (bool, default: false): use absolute file offset in fragments rather than offsets from moof
+.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
+.br
+m4cc (str):                    4 character code of empty box to appen 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
+.br
+tfdt (lfrac, default: 0):      set TFDT of first traf
+.br
+tfdt_traf (bool, default: false): set TFDT 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)
+.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
+.br
+* moof: in first moof of each segments
+.br
+* moov: in movie box
+.br
+* none: pssh is discarded
+.br
+
+.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
+.br
+* on: use temp storage of complete file for sidx and ssix injection
+.br
+* insert: insert sidx and ssix by shifting bytes in output file
+.br
+* replace: precompute pace requirements for sidx and ssix and rewrite file range at end
+.br
+
+.br
+noinit (bool, default: false): do not produce initial moov, used for DASH bitstream switching mode
+.br
+tktpl (enum, default: yes):    use track box from input if any as a template to create new track
+.br
+* no: disables template
+.br
+* yes: clones the track (except edits and decoder config)
+.br
+* udta: only loads udta
+.br
+
+.br
+mudta (enum, default: yes):    use udta and other moov extension boxes from input if any
+.br
+* no: disables import
+.br
+* yes: clones all extension boxes
+.br
+* udta: only loads udta
+.br
+
+.br
+tmpd (str):                    set temp directory for intermediate file(s)
+.br
+mvex (bool, default: false):   set mvex after tracks
+.br
+sdtp_traf (enum, default: no): use sdtp in traf 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
+.br
+* both: use sdtp box to indicate sample dependencies and also write info in trun sample flags
+.br
+
+.br
+trackid (uint, default: 0):    track ID of created track for single track. Default 0 uses next available trackID
+.br
+fragdur (bool, default: false): fragment based on fragment duration rather than CTS. Mostly used for MP4Box -frag option
+.br
+btrt (bool, default: true):    set btrt box in sample description
+.br
+styp (str):                    set segment styp major brand 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
+.br
+ase (enum, default: v0):       set audio sample entry mode for more than stereo layouts
+.br
+* v0: use v0 signaling but channel count from stream, recommended for backward compatibility
+.br
+* v0s: use v0 signaling and force channel count to 2 (stereo) if more than 2 channels
+.br
+* v1: use v1 signaling, ISOBMFF style (will mux raw PCM as ISOBMFF style)
+.br
+* v1qt: use v1 signaling, QTFF style
+.br
+
+.br
+ssix (bool, default: false):   create ssix when sidx is present, level 1 mappping I-frames byte ranges, level 0xFF mapping the rest
+.br
+ccst (bool, default: false):   insert coding constraint box for video tracks
+.br
+maxchunk (uint, default: 0):   set max chunk size in bytes for runs (only used in non-fragmented mode). 0 means no constraints
+.br
+noroll (bool, default: false): disable roll sample grouping
+.br
+saio32 (bool, default: false): set single segment mode for dash
+.br
+compress (enum, default: no):  set top-level box compression mode
+.br
+* no: disable box compression
+.br
+* moov: compress only moov box
+.br
+* moof: compress only moof boxes
+.br
+* sidx: compress moof and sidx boxes
+.br
+* ssix: compress moof, sidx and ssix boxes
+.br
+* all: compress moov, moof, sidx and ssix boxes
+.br
+
+.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
+.br
+block_size (uint, default: 10000): target output block size, 0 for default internal value (10k)
+.br
+boxpatch (str):                apply box patch before writing
+.br
+deps (bool, default: true):    add samples dependencies information
+.br
+
+.br
+.SH rfqcp
+.LP
+.br
+Description: QCP reframer
+.br
+
+.br
+This filter parses QCP 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 rfh263
+.LP
+.br
+Description: H263 reframer
+.br
+
+.br
+This filter parses H263 files/data and outputs corresponding visual PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+fps (frac, default: 15000/1000): import frame rate
+.br
+index (dbl, default: 1.0):     indexing window length
+.br
+
+.br
+.SH rfmpgvid
+.LP
+.br
+Description: M1V/M2V/M4V reframer
+.br
+
+.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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+vfr (bool, default: false):    set variable frame rate import
+.br
+importer (bool, default: false): compatibility with old importer, displays import results
+.br
+
+.br
+.SH nhntr
+.LP
+.br
+Description: NHNT reader
+.br
+
+.br
+This filter reads NHNT files/data to produce a media PID and frames.
+.br
+NHNT documentation is available at https://wiki.gpac.io/NHNT-Format
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+reframe (bool, default: false): force reparsing of referenced content
+.br
+index (dbl, default: 1.0):     indexing window length
+.br
+
+.br
+.SH nhmlr
+.LP
+.br
+Description: NHML parser
+.br
+
+.br
+This filter reads NHML files/data to produce a media PID and frames.
+.br
+NHML documentation is available at https://wiki.gpac.io/NHML-Format
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+reframe (bool, default: false): force reparsing of referenced content
+.br
+index (dbl, default: 1.0):     indexing window length
+.br
+
+.br
+.SH rfnalu
+.LP
+.br
+Description: AVC/HEVC reframer
+.br
+
+.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.
+.br
+Note: The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS greater than CTS.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+explicit (bool, default: false): use explicit layered (SVC/LHVC) import
+.br
+strict_poc (bool, default: false): delay frame output of an entire GOP to ensure CTS info is correct when POC suddenly changes
+.br
+nosei (bool, default: false):  remove all sei messages
+.br
+nosvc (bool, default: false):  remove all SVC/MVC/LHVC data
+.br
+novpsext (bool, default: false): remove all VPS extensions
+.br
+importer (bool, default: false): compatibility with old importer, displays import results
+.br
+nal_length (uint, default: 4): set number of bytes used to code length field: 1, 2 or 4
+.br
+subsamples (bool, default: false): import subsamples information
+.br
+deps (bool, default: false):   import samples dependencies 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
+
+.br
+.SH m2psdmx
+.LP
+.br
+Description: MPEG PS demuxer
+.br
+
+.br
+This filter demultiplexes MPEG-2 program stream files/data to produce media PIDs and frames.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH avidmx
+.LP
+.br
+Description: AVI demuxer
+.br
+
+.br
+This filter demultiplexes AVI files/data to produce media PIDs and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+fps (frac, default: 1/0):      import frame rate, default is AVI one
+.br
+importer (bool, default: false): compatibility with old importer, displays import results
+.br
+
+.br
+.SH txtin
+.LP
+.br
+Description: Subtitle loader
+.br
+
+.br
+This filter reads subtitle data (srt/webvtt/ttxt/sub) to produce media PIDs and frames.
+.br
+The TTXT documentation is available at https://wiki.gpac.io/TTXT-Format-Documentation
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+webvtt (bool, default: false): force WebVTT import of SRT files
+.br
+nodefbox (bool, default: false): skip default text box
+.br
+noflush (bool, default: false): skip final sample flush for srt
+.br
+fontname (str):                default font to use
+.br
+fontsize (uint, default: 18):  default font size
+.br
+lang (str):                    default language to use
+.br
+width (uint, default: 0):      default width of text area, set to 0 to resolve against visual PIDs
+.br
+height (uint, default: 0):     default height of text area, set to 0 to resolve against visual PIDs
+.br
+txtx (uint, default: 0):       default horizontal offset of text area: -1 (left), 0 (center) or 1 (right)
+.br
+txty (uint, default: 0):       default vertical offset of text area: -1 (bottom), 0 (center) or 1 (top)
+.br
+zorder (sint, default: 0):     default z-order of the PID
+.br
+timescale (uint, default: 1000): default timescale of the PID
+.br
+
+.br
+.SH ttxtdec
+.LP
+.br
+Description: TTXT/TX3G decoder
+.br
+
+.br
+This filter decodes TTXT/TX3G streams into a BIFS scene graph of the compositor filter.
+.br
+The TTXT documentation is available at https://wiki.gpac.io/TTXT-Format-Documentation
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+texture (bool, default: false): use texturing for output text
+.br
+outline (bool, default: false): draw text outline
+.br
+txtw (uint, default: 400):     default width in standalone rendering
+.br
+txth (uint, default: 200):     default height in standalone rendering
+.br
+
+.br
+.SH vttdec
+.LP
+.br
+Description: WebVTT decoder
+.br
+
+.br
+This filter decodes WebVTT streams into a SVG scene graph of the compositor filter.
+.br
+The scene graph creation is done through JavaScript.
+.br
+The filter options are used to override the JS global variables of the WebVTT renderer.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+script (str, default: $GSHARE/scripts/webvtt-renderer.js): location of WebVTT SVG JS renderer
+.br
+font (str, default: SANS, updatable): font to use
+.br
+fontSize (flt, default: 20, updatable): font size to use
+.br
+color (str, default: white, updatable): color to use
+.br
+lineSpacing (flt, default: 1.0, updatable): line spacing as scaling factor to font size
+.br
+txtx (flt, default: 5, updatable): horizontal offset
+.br
+txty (flt, default: 5, updatable): vertical offset
+.br
+txtw (uint, default: 400):     default width in standalone rendering
+.br
+txth (uint, default: 200):     default height in standalone rendering
+.br
+
+.br
+.SH ttmldec
+.LP
+.br
+Description: TTML decoder
+.br
+
+.br
+This filter decodes TTML streams into a SVG scene graph of the compositor filter.
+.br
+The scene graph creation is done through JavaScript.
+.br
+The filter options are used to override the JS global variables of the TTML renderer.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+script (str, default: $GSHARE/scripts/ttml-renderer.js): location of TTML SVG JS renderer
+.br
+font (str, default: SANS, updatable): font to use
+.br
+fontSize (flt, default: 20, updatable): font size to use
+.br
+color (str, default: white, updatable): color to use
+.br
+valign (enum, default: bottom, updatable): vertical alignment
+.br
+* bottom: align text at bottom of text area
+.br
+* center: align text at center of text area
+.br
+* top: align text at top of text area
+.br
+
+.br
+lineSpacing (flt, default: 1.0, updatable): line spacing as scaling factor to font size
+.br
+txtx (flt, default: 5, updatable): horizontal offset
+.br
+txty (flt, default: 5, updatable): vertical offset
+.br
+txtw (uint, default: 400):     default width in standalone rendering
+.br
+txth (uint, default: 200):     default height in standalone rendering
+.br
+
+.br
+.SH rtpin
+.LP
+.br
+Description: RTP/RTSP/SDP input
+.br
+
+.br
+This filter handles SDP/RTSP/RTP input reading. It supports:
+.br
+- SDP file reading
+.br
+- RTP direct url through rtp:// protocol scheme
+.br
+- RTSP session processing through rtsp:// and satip:// protocol schemes
+.br
+ 
+.br
+The filter produces either media PIDs and compressed media frames, or file PIDs and multiplex data (e.g., MPEG-2 TS).
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+ifce (str):                    default interface IP to use for multicast. If NULL, the default system interface will be used
+.br
+ttl (uint, default: 127, minmax: 0-127): multicast TTL
+.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
+.br
+block_size (uint, default: 0x200000): buffer size fur RTP/UDP or RTSP when interleaved
+.br
+disable_rtcp (bool, default: false): disable RTCP reporting
+.br
+nat_keepalive (uint, default: 0): delay in ms of NAT keepalive, disabled by default (except for SatIP, set to 30s by default)
+.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)
+.br
+bandwidth (uint, default: 0):  set bandwidth param for RTSP requests
+.br
+default_port (uint, default: 554, minmax: 0-65535): set default RTSP port
+.br
+satip_port (uint, default: 1400, minmax: 0-65535): set default port for SATIP
+.br
+interleave (bool, default: false): set RTP over RTSP
+.br
+udp_timeout (uint, default: 10000): default timeout before considering UDP is down
+.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
+.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
+.br
+frequency_drop (uint, default: 0): drop 1 out of N packet - 0 disable droping
+.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
+.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
+.br
+rtcpsync (bool, default: true): use RTCP to adjust synchronization
+.br
+
+.br
+.SH fout
+.LP
+.br
+Description: File output
+.br
+
+.br
+The file output filter is used to write output 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.
+.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 -cat mode.
+.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.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file - see filter help 
+.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
+.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
+.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
+.br
+ow (bool, default: true):      overwrite output if existing
+.br
+mvbk (uint, default: 8192):    block size used when moving parts of the file around in patch mode
+.br
+redund (bool, default: false): keep redundant packet in output file
+.br
+
+.br
+.SH uflatm
+.LP
+.br
+Description: Raw AAC to LATM writer
+.br
+
+.br
+This filter converts AAC streams into LATM encapsulated data.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+fdsi (frac, default: 0):       set delay between two LATM Audio Config
+.br
+
+.br
+.SH ufadts
+.LP
+.br
+Description: ADTS writer
+.br
+
+.br
+This filter converts AAC streams into ADTS encapsulated data.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+mpeg2 (enum, default: auto):   signal as MPEG2 AAC
+.br
+* auto: selects based on AAC profile
+.br
+* no: always signals as MPEG-4 AAC
+.br
+* yes: always signals as MPEG-2 AAC
+.br
+
+.br
+
+.br
+.SH reframer
+.LP
+.br
+Description: Media Reframer
+.br
+
+.br
+This filter provides various compressed domain tools on inputs:
+.br
+- ensure reframing
+.br
+- optionally force decoding
+.br
+- real-time regulation
+.br
+- packet filtering based on SAP types or frame numbers
+.br
+- time-range extraction and spliting
+.br
+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.
+.br
+  
+.br
+.SH SAP filtering
+.LP
+.br
+The filter can remove packets based on their SAP types using -saps option.
+.br
+For example, this can be used to extract only the key frame (SAP 1,2,3) of a video to create a trick mode version.
+.br
+  
+.br
+.SH Frame filtering
+.LP
+.br
+This filter can keep only specific Access Units of the source using -frames option.
+.br
+For example, this can be used to extract only specific key frame of a video to create a HEIF collection.
+.br
+  
+.br
+.SH Frame decoding
+.LP
+.br
+This filter can force input media streams to be decoded using the -raw option.
+.br
+Example
+.br
+gpac src=m.mp4 reframer:raw @ [dst]
+.br
+
+.br
+.SH Real-time Regulation
+.LP
+.br
+The filter can perform real-time regulation of input packets, based on their timescale and timestamps.
+.br
+For example to simulate a live DASH:
+.br
+Example
+.br
+gpac src=m.mp4 reframer:rt=on @ dst=live.mpd:dynamic
+.br
+
+.br
+  
+.br
+.SH Range extraction
+.LP
+.br
+The filter can perform time range extraction of the source using -xs and -xe options.
+.br
+The formats allowed for times specifiers are:
+.br
+* 'T'H:M:S: specify time in hours, minutes, seconds
+.br
+* 'T'H:M:S.MS: specify time in hours, minutes, seconds and milliseconds
+.br
+* INT: specify time in millisecond
+.br
+* NUM/DEN: specify time in seconds as fraction
+.br
+* FNUM: specify time as frame number
+.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.
+.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]
+.br
+
+.br
+This will extract the time ranges [10s,20s], [1m10s,1m20s] and all media starting from 2m
+.br
+
+.br
+It is possible to signal range boundaries in output packets using -splitrange.
+.br
+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
+.br
+* 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
+.br
+
+.br
+This will create two output files dump_T00.00.10_T00.02.00.264 and dump_T00.01.10.264.
+.br
+Note: The : and / characters are replaced by . in FileSuffix property.
+.br
+
+.br
+.SH Other split actions
+.LP
+.br
+The filter can perform splitting of the source using -xs option.
+.br
+The additional formats allowed for -xs option are:
+.br
+* 'SAP': split source at each SAP/RAP
+.br
+* 'D'VAL: split source by chunks of VAL ms
+.br
+* '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
+.br
+
+.br
+Note: In these modes, -splitrange and -xadjust are implicitly set.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+exporter (bool, default: false): compatibility with old exporter, displays export results
+.br
+rt (enum, default: off):       real-time regulation mode of input
+.br
+* off: disables real-time regulation
+.br
+* on: enables real-time regulation, one clock per pid
+.br
+* 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
+.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
+.br
+raw (bool, default: false):    force input streams to be in raw format (i.e. forces decoding of input)
+.br
+frames (uintl):                drop all except listed frames (first being 1), off by default
+.br
+xs (strl):                     extraction start time(s), see filter help
+.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
+.br
+* before: use first I-frame preceeding or equal to start range
+.br
+* after: use first I-frame (if any) following or equal to start range
+.br
+* closest: use I-frame closest to start range
+.br
+
+.br
+xadjust (bool, default: false): adjust end time of extraction range to be before next I-frame
+.br
+nosap (bool, default: false):  do not cut at SAP when extracting range (may result in broken streams)
+.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)
+.br
+
+.br
+.SH writegen
+.LP
+.br
+Description: Stream to file
+.br
+
+.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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.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
+.br
+decinfo (enum, default: auto): decoder config insert mode
+.br
+* no: never inserted
+.br
+* first: inserted on first packet
+.br
+* sap: inserted at each SAP
+.br
+* auto: selects between no and first based on media type
+.br
+
+.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
+.br
+sstart (uint, default: 0):     start number of frame to forward. If 0, all samples are forwarded
+.br
+send (uint, default: 0):       end number of frame to forward. If less than start frame, all samples after start are forwarded
+.br
+dur (frac, default: 0):        duration of media to forward after first sample. If 0, all samples are forwarded
+.br
+
+.br
+.SH ufnalu
+.LP
+.br
+Description: AVC/HEVC to AnnexB writer
+.br
+
+.br
+This filter converts AVC|H264 and HEVC streams into AnnexB format, with inband parameter sets and start codes.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+rcfg (bool, default: true):    force repeating decoder config at each I-frame
+.br
+extract (enum, default: all):  layer extraction mode
+.br
+* full: extracts all layers
+.br
+* base: extract base layer only
+.br
+* layer: extract non-base layer(s) only
+.br
+
+.br
+delim (bool, default: true):   insert AU Delimiter NAL
+.br
+
+.br
+.SH writeqcp
+.LP
+.br
+Description: QCP writer
+.br
+
+.br
+This filter converts a single stream to a QCP output file.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+exporter (bool, default: false): compatibility with old exporter, displays export results
+.br
+
+.br
+.SH writevtt
+.LP
+.br
+Description: WebVTT writer
+.br
+
+.br
+This filter converts a single stream to a WebVTT output file.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+exporter (bool, default: false): compatibility with old exporter, displays export results
+.br
+merge (bool, default: false):  merge VTT cue if needed
+.br
+
+.br
+.SH nhntw
+.LP
+.br
+Description: NHNT writer
+.br
+
+.br
+This filter converts a single stream to an NHNT output file.
+.br
+NHNT documentation is available at https://wiki.gpac.io/NHNT-Format
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+exporter (bool, default: false): compatibility with old exporter, displays export results
+.br
+large (bool, default: false):  use large file mode
+.br
+
+.br
+.SH nhmlw
+.LP
+.br
+Description: NHML writer
+.br
+
+.br
+This filter converts a single stream to an NHML output file.
+.br
+NHML documentation is available at https://wiki.gpac.io/NHML-Format
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+exporter (bool, default: false): compatibility with old exporter, displays export results
+.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
+.br
+nhmlonly (bool, default: false): only dump NHML info, not media
+.br
+pckp (bool, default: false):   full NHML dump
+.br
+chksum (enum, default: none):  insert frame checksum
+.br
+* none: no checksum
+.br
+* crc: CRC32 checksum
+.br
+* sha1: SHA1 checksum
+.br
+
+.br
+
+.br
+.SH vobsubdmx
+.LP
+.br
+Description: VobSub demuxer
+.br
+
+.br
+This filter demultiplexes VobSub files/data to produce media PIDs and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+blankframe (bool, default: true): force inserting a blank frame if first subpic is not at 0
+.br
+
+.br
+.SH avimx
+.LP
+.br
+Description: AVI muxer
+.br
+
+.br
+This filter multiplexes raw or compressed audio and video to produce an AVI output.
+.br
+
+.br
+Unlike other multiplexing filters in GPAC, this filter is a sink filter and does not produce any PID to be redirected in the graph.
+.br
+The filter can however use template names for its output, using the first input PID to resolve the final name.
+.br
+The filter watches the property FileNumber on incoming packets to create new files.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file
+.br
+fps (frac, default: 25/1):     default framerate if none indicated in stream
+.br
+noraw (bool, default: false):  disable raw output in AVI, only compressed ones allowed
+.br
+
+.br
+.SH aout
+.LP
+.br
+Description: Audio output
+.br
+
+.br
+This filter outputs a single uncompressed audio PID to a soundcard.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+drv (cstr):                    audio driver name
+.br
+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
+.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
+.br
+speed (dbl, default: 1.0):     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
+.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
+.br
+adelay (frac, default: 0, updatable): set audio delay in sec
+.br
+
+.br
+.SH ufm4v
+.LP
+.br
+Description: M4V writer
+.br
+
+.br
+This filter converts MPEG-4 part 2 visual streams into dumpable format (reinsert decoder config).
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+rcfg (bool, default: true):    force repeating decoder config at each I-frame
+.br
+
+.br
+.SH resample
+.LP
+.br
+Description: Audio resampler
+.br
+
+.br
+This filter resamples raw audio to a target sample rate, number of channels or audio format.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+ch (uint, default: 0):         desired number of output audio channels - 0 for auto
+.br
+sr (uint, default: 0):         desired sample rate of output audio - 0 for auto
+.br
+fmt (afmt, default: none):     desired format of output audio - none for auto
+.br
+
+.br
+.SH vout
+.LP
+.br
+Description: Video output
+.br
+
+.br
+This filter displays a single visual 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
+The output uses GPAC video output module indicated in -drv option or in the config file (see GPAC core help).
+.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.
+.br
+The filter can be used do dump frames as written on the grapics card.
+.br
+In this case, the window is not visible and only the listed frames are drawn to the GPU.
+.br
+The pixel format of the dumped frame is always RGB in OpenGL and matches the video backbuffer format in 2D mode.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+drv (cstr):                    video driver name
+.br
+vsync (bool, default: true):   enable video screen sync
+.br
+drop (bool, default: false):   enable droping late frames
+.br
+disp (enum, default: gl):      display mode
+.br
+* gl: OpenGL
+.br
+* pbo: OpenGL with PBO
+.br
+* blit: 2D hardware blit
+.br
+* soft: software blit
+.br
+
+.br
+start (dbl, default: 0.0):     set playback start offset. Negative value means percent of media dur with -1 <=> dur
+.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
+.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
+.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
+.br
+wpos (v2di, default: -1x-1):   default position (0,0 top-left)
+.br
+vdelay (frac, default: 0, updatable): set delay in sec, positive value displays after audio clock
+.br
+hide (bool, default: false):   hide output window
+.br
+fullscreen (bool, default: false): use fullcreen
+.br
+buffer (uint, default: 100):   set 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.
+.br
+out (str, default: dump):      radical of dump frame filenames. If no extension is provided, frames are exported as $OUT_%d.PFMT.
+.br
+
+.br
+.SH vcrop
+.LP
+.br
+Description: Video crop
+.br
+
+.br
+This filter is used to crop raw video data.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+wnd (str):                     size of output to crop, indicated as TxLxWxH. If % is indicated after a number, the value is in percent of the source width (for L and W) or height (for T and H). An absolute offset (+x, -x) can be added after percent
+.br
+copy (bool, default: false):   copy the source pixels. By default the filter will try to forward crop frames by adjusting offsets and strides of the source if possible (window contained in frame)
+.br
+round (enum, default: up):     adjust dimension to be a multiple of 2.
+.br
+* up: up rounding
+.br
+* down: down rounding
+.br
+* allup: up rounding on formats that do not require it (RGB, YUV444)
+.br
+* alldown: down rounding on formats that do not require it (RGB, YUV444)
+.br
+
+.br
+
+.br
+.SH vflip
+.LP
+.br
+Description: Video flip
+.br
+
+.br
+Filter used to flip video frames vertically, horizontally, in both directions or no flip
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+mode (enum, default: vert, updatable): flip mode
+.br
+* off: no flipping (passthrough)
+.br
+* vert: vertical flip
+.br
+* horiz: horizontal flip
+.br
+* both: horizontal and vertical flip
+.br
+
+.br
+
+.br
+.SH rfrawvid
+.LP
+.br
+Description: RAW video reframer
+.br
+
+.br
+This filter parses raw YUV and RGB files/data and outputs corresponding raw video PID and frames.
+.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
+.br
+fps (frac, default: 25/1):     number of frames per second
+.br
+copy (bool, default: false):   copy source bytes into output frame. If not set, source bytes are referenced only
+.br
+
+.br
+.SH rfpcm
+.LP
+.br
+Description: PCM reframer
+.br
+
+.br
+This filter parses raw PCM file/data and outputs corresponding raw audio PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+ch (uint, default: 2):         number of channels
+.br
+framelen (uint, default: 1024): number of samples to put in one audio frame. For planar formats, indicate plane size in samples
+.br
+
+.br
+.SH jpgenc
+.LP
+.br
+Description: JPG encoder
+.br
+
+.br
+This filter encodes a single uncompressed video PID to JPEG using libjpeg.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dctmode (enum, default: fast): type of DCT used
+.br
+* slow: precise but slow integer DCT
+.br
+* fast: less precise but faster integer DCT
+.br
+* float: float DCT
+.br
+
+.br
+quality (uint, default: 100, minmax: 0-100, updatable): compression quality
+.br
+
+.br
+.SH pngenc
+.LP
+.br
+Description: PNG encoder
+.br
+
+.br
+This filter encodes a single uncompressed video PID to PNG using libpng.
+.br
+
+.br
+No options
+.br
+
+.br
+.SH rewind
+.LP
+.br
+Description: Audio/Video rewinder
+.br
+
+.br
+This filter reverses audio and video frames in negative playback speed.
+.br
+The filter is in passthrough if speed is positive. Otherwise, it reverts decoded GOPs for video, or revert samples in decoded frame for audio (not really nice for most codecs).
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+rbuffer (uint, default: 100):  size of video rewind buffer in frames. If more frames than this, flush is performed
+.br
+
+.br
+.SH flist
+.LP
+.br
+Description: Sources concatenator
+.br
+
+.br
+This filter can be used to play playlist files or a list of sources.
+.br
+
+.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.
+.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
+
+.br
+.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.
+.br
+The syntax for directory enum is:
+.br
+* dir/*: enumerates everything in dir
+.br
+* foo/*.png: enumerates all files with extension png in foo
+.br
+* foo/*.png;*.jpg: enumerates all files with extension png or jpg in foo
+.br
+
+.br
+The resulting file list can be sorted using -fsort.
+.br
+If the sort mode is datex and source files are images or single frame files, the following applies:
+.br
+- options -floop, -revert and -dur are ignored
+.br
+- the files are sorted by modification time
+.br
+- the first frame is assigned a timestamp of 0
+.br
+- each frame (coming from each file) is assigned a duration equal to the difference of modification time between the file and the next file
+.br
+- the last frame is assigned the same duration as the previous one
+.br
+
+.br
+.SH Playlist mode
+.LP
+.br
+The playlist mode is activated when opening a playlist file (extension txt or m3u).
+.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
+The following directives, separated with space or comma, are supported:
+.br
+* repeat=N: repeats N times the content (hence played N+1)
+.br
+* start=T: tries to play the file from start time T seconds (double format only)
+.br
+Warning: This may not work with some files/formats not supporting seeking
+.br
+* stop=T: stops source playback after T seconds (double format only)
+.br
+This works on any source (implemented independently from seek support).
+.br
+
+.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.
+.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
+Example
+.br
+audio.mp4 && video.mp4
+.br
+
+.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
+
+.br
+.SH Options (expert):
+.LP
+.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
+.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!
+.br
+revert (bool, default: false): revert list of files (not playlist)
+.br
+timescale (uint, default: 0):  force output timescale on all pids. 0 uses the timescale of the first pid found
+.br
+fsort (enum, default: no):     sort list of files
+.br
+* no: no sorting, use default directory enumeration of OS
+.br
+* name: sort by alphabetical name
+.br
+* size: sort by increasing size
+.br
+* date: sort by increasing modification time
+.br
+* datex: sort by increasing modification time - see filter help
+.br
+
+.br
+
+.br
+.SH m2tsmx
+.LP
+.br
+Description: MPEG-2 TS muxer
+.br
+
+.br
+GPAC TS multiplexer selects M2TS PID for media streams using the PID of the PMT plus the stream index.
+.br
+For example, 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 -sid option.
+.br
+-name option is overriden by input PID property ServiceName.
+.br
+-provider option is overriden by input PID property ServiceProvider.
+.br
+
+.br
+.SH Time and External Media Information (TEMI)
+.LP
+.br
+The -temi option allows specifying a list of URLs or timeline IDs to insert in the program.
+.br
+Only a single TEMI timeline can be specified per PID.
+.br
+The syntax is a comma-separated list of one or more TEMI description, each of them separated by '#'
+.br
+Each TEMI description is formated as #ServiceID#ID_OR_URL, with:
+.br
+* ServiceID: optional, number indicating the target serviceID
+.br
+* ID_OR_URL: If numbern indicates the TEMI ID to use for external timeline. Otherwise, gives the URL to insert
+.br
+Each comma-separated description designs a stream index in the target service.
+.br
+Example
+.br
+temi="url"
+.br
+
+.br
+Iinserts a TEMI URL+timecode in the first stream of all programs.
+.br
+Example
+.br
+temi="url,4"
+.br
+
+.br
+Inserts a TEMI URL+timecode in the first stream of all programs and an external TEMI with ID 4 in the second stream of all programs.
+.br
+Example
+.br
+temi="#20#4,#10#URL"
+.br
+
+.br
+Inserts an external TEMI with ID 4 in the first stream of program with ServiceID 20 and a TEMI URL to the second stream of program with ServiceID 10.
+.br
+Example
+.br
+temi="#20#4,,#10#URL"
+.br
+
+.br
+Inserts an external TEMI with ID 4 in the first stream of program with ServiceID 20 and a TEMI URL to the third stream of program with ServiceID 10 (and nothing on second stream).
+.br
+
+.br
+.SH Notes
+.LP
+.br
+In DASH mode, the PCR is always initialized at 0, and -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.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+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
+rate (uint, default: 0):       target rate in bps of the multiplex. If not set, variable rate is used
+.br
+pmt_rate (uint, default: 200): interval between PMT in ms
+.br
+pat_rate (uint, default: 200): interval between PAT in ms
+.br
+pcr_offset (uint, 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
+* none: disables 4on2
+.br
+* full: sends AUs as SL packets over section for OD, section/pes for scene (cf bifs_pes)
+.br
+* scene: sends only scene streams as 4on2 but uses regular PES without SL for audio and video
+.br
+
+.br
+pmt_version (uint, default: 200): set version number of the PMT
+.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 overriden by carousel duration PID property if defined
+.br
+repeat_img (uint, default: 0): interval in ms between resending (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
+nb_pack (uint, default: 4):    pack N TS packets in output packets
+.br
+pes_pack (enum, default: audio): set AU to PES packing mode.
+.br
+* audio: will pack only multiple audio AUs in a PES
+.br
+* none: make exactly one AU per PES
+.br
+* all: will pack multiple AUs per PES for all streams
+.br
+
+.br
+realtime (bool, default: false): use real-time output
+.br
+bifs_pes (enum, default: off): select BIFS streams packetization (PES vs sections)
+.br
+* on: uses BIFS PES
+.br
+* off: uses BIFS sections
+.br
+* copy: uses BIFS PES but removes timestamps in BIFS SL and only carries PES timestamps
+.br
+
+.br
+flush_rap (bool, default: false): force flushing mux program when RAP is found on video, and injects PAT and PMT before the next video PES begin
+.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
+.br
+sid (uint, default: 0):        set service ID for the program - see filter help
+.br
+name (str):                    set service name for the program - see filter help
+.br
+provider (str):                set service provider name for the program - see filter help
+.br
+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
+.br
+temi_delay (uint, default: 1000): set delay in ms between two TEMI url descriptors
+.br
+temi_offset (uint, default: 0): set offset in ms  to add to TEMI timecodes
+.br
+temi_ntp (bool, default: false): insert NTP timestamp in TEMI timeline descriptor
+.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
+.br
+
+.br
+.SH dasher
+.LP
+.br
+Description: DASH and HLS segmenter
+.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:
+.br
+- MPD and m3u8 generation (potentially in parallel)
+.br
+- ISOBMFF, MPEG-2 TS, MKV and raw bitstream segment formats
+.br
+- override of profiles and levels in manifest for common codecs (aac, hevc, vp9, av1, aac)
+.br
+- most MPEG-DASH profiles
+.br
+- static and dynamic (live) manifest offering
+.br
+- context store and reload for batch processing of live/dynamic sessions
+.br
+
+.br
+Warning: the filter does not perform any real-time regulation, even in dynamic offering mode.
+.br
+If your inputs are not real-time, insert a reframer before to perform real-time regulation.
+.br
+Example
+.br
+src=file.mp4 reframer:rt=on @ -o live.mpd:dmode=dynamic
+.br
+
+.br
+.P
+.B
+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
+Example
+.br
+template=Great_$File$_$Width$_$Number$
+.br
+
+.br
+If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640_$Number$ for the DASH template.
+.br
+Example
+.br
+template=Great_$File$_$Width$
+.br
+
+.br
+If input is foo.mp4 with 640x360 video, this will resolve in Great_foo_640.mp4 for onDemand case.
+.br
+
+.br
+Standard DASH replacement strings: 
+.br
+* $Number[%%0Nd]$: replaced by the segment number, possibly prefixed with 0
+.br
+* $RepresentationID$: replaced by representation name
+.br
+* $Time$: replaced by segment start time
+.br
+* $Bandwidth$: replaced by representation bandwidth.
+.br
+Note: these strings are not replaced in the manifest templates elements.
+.br
+
+.br
+Additional replacement strings (not DASH, not generic GPAC replacements but may occur multiple times in template):
+.br
+* $Init=NAME$: replaced by NAME for init segment, ignored otherwise
+.br
+* $Index=NAME$: replaced by NAME for index segments, ignored otherwise
+.br
+* $Path=PATH$: replaced by PATH when creating segments, ignored otherwise
+.br
+* $Segment=NAME$: replaced by NAME for media segments, ignored for init segments
+.br
+* $FS$ (FileSuffix): replaced by _trackN in case the input is an AV multiplex, or kept empty otherwise
+.br
+Note: these strings are replaced in the manifest templates elements.
+.br
+
+.br
+.P
+.B
+PID assignment
+.br
+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)
+.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
+.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
+.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
+.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
+.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 -template for this PID
+.br
+* DashDur: overrides segmenter segment duration for this PID
+.br
+* StartNumber: sets the start number for the first segment in the PID, default is 1
+.br
+* Non-dash properties: Bitrate, SAR, Language, Width, Height, SampleRate, NumChannels, Language, ID, DependencyID, FPS, Interlaced. These properties are used to setup each representation and can be overriden on input PIDs using the general PID property settings (cf global help).
+.br
+  
+.br
+Example
+.br
+src=test.mp4:#Bitrate=1M dst=test.mpd
+.br
+
+.br
+This will force declaring a bitrate of 1M for the representation, regardless of actual input bitrate.
+.br
+Example
+.br
+src=muxav.mp4 dst=test.mpd
+.br
+
+.br
+This will create unmuxed DASH segments.
+.br
+Example
+.br
+src=muxav.mp4:#Representation=1 dst=test.mpd
+.br
+
+.br
+This will create muxed DASH segments.
+.br
+Example
+.br
+src=m1.mp4 src=m2.mp4:#Period=Yep dst=test.mpd
+.br
+
+.br
+This will put src m1.mp4 in first period, m2.mp4 in second period.
+.br
+Example
+.br
+src=m1.mp4:#BUrl=http://foo/bar dst=test.mpd
+.br
+
+.br
+This will assign a baseURL to src m1.mp4.
+.br
+Example
+.br
+src=m1.mp4:#ASCDesc=<ElemName val="attval">text</ElemName> dst=test.mpd
+.br
+
+.br
+This will assign the specified XML descriptor to the adaptation set.
+.br
+Note:  this can be used to inject most DASH descriptors not natively handled by the segmenter.
+.br
+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:
+.br
+Example
+.br
+src=m1.mp4:#RDesc=<Elem attribute="1"/>,<Elem2>text</Elem2> dst=test.mpd
+.br
+
+.br
+This will insert two descriptors in the representation(s) of m1.mp4.
+.br
+Example
+.br
+src=video.mp4:#Template=foo$Number$ src=audio.mp4:#Template=bar$Number$ dst=test.mpd
+.br
+
+.br
+This will assign different templates to the audio and video sources.
+.br
+Example
+.br
+src=null:#xlink=http://foo/bar.xml:#PDur=4 src=m.mp4:#PStart=-1
+.br
+
+.br
+This will insert an create an MPD with first a remote period then a regular one.
+.br
+Example
+.br
+src=null:#xlink=http://foo/bar.xml:#PStart=6 src=m.mp4
+.br
+
+.br
+This will create an MPD with first a regular period, dashing ony 6s of content, then a remote one.
+.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.
+.br
+
+.br
+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
+.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 -sbound:
+.br
+* 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
+.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
+The segmenter can also be configured to:
+.br
+- completely ignore SAP when segmenting using -sap.
+.br
+- ignore SAP on non-video streams when segmenting using -strict_sap.
+.br
+
+.br
+.P
+.B
+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.
+.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
+.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
+
+.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
+.br
+* dts: long integer giving the decoding time stamp of a sample at which spliting shall happen
+.br
+* cts: long integer giving the composition / presentation time stamp of a sample at which spliting shall happen
+.br
+Warning: Cues shall be listed in decoding order.
+.br
+
+.br
+.P
+.B
+Manifest Generation only mode
+.br
+The segmenter can try to generate manifests from already fragmented ISOBMFF inputs using -sigfrag.
+.br
+In this case, segment boundaries are attached to each packet starting a segment and used to drive the segmentation.
+.br
+This should only be used with single-track ISOBMFF sources. If onDemand -profile is requested, sources have to be formatted as a DASH self-initializing media segment with the proper sidx.
+.br
+This mode automatically disables templates and forces -sseg for all profiles except onDemand ones.
+.br
+The manifest generation-only mode supports both MPD and HLS generation.
+.br
+
+.br
+.P
+.B
+Muxer development considerations
+.br
+Output muxers allowing segmented output must obey the following:
+.br
+- inspect packet properties
+.br
+ * FileNumber: if set, indicate the start of a new DASH segment
+.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
+.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 -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
+.br
+- the following filter options are passed to muxers, 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)
+.br
+ * frag: indicates muxer shall used 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
+ * xps_inband=all|no: indicates AVC/HEVC/... parameter sets shall be sent inband or out of band
+.br
+ * nofragdef: indicates fragment defaults should be set in each segment rather than in init segment
+.br
+
+.br
+The segmenter will add 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
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+segdur (dbl, default: 1.0):    target segment duration in seconds
+.br
+tpl (bool, default: true):     use template mode (multiple segment, template URLs)
+.br
+stl (bool, default: false):    use segment timeline (ignored in on_demand mode)
+.br
+dmode (enum, default: static, updatable): dash content mode
+.br
+* static: static content
+.br
+* dynamic: live generation
+.br
+* dynlast: last call for live, will turn the MPD into static
+.br
+
+.br
+sseg (bool, default: false):   single segment is used
+.br
+sfile (bool, default: false):  use a single file for all segments (default in on_demand)
+.br
+align (bool, default: true):   enable segment time alignment between representations
+.br
+sap (bool, default: true):     enable spliting 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
+.br
+* rem: removes NTP from all input packets
+.br
+* yes: inserts NTP at each segment start
+.br
+* keep: leaves input packet NTP untouched.
+.br
+
+.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
+forcep (bool, default: false): force profile string for avc/hevc/aac
+.br
+bs_switch (enum, default: def): bitstream switching mode (single init segment)
+.br
+* def: resolves to off for onDemand and inband for live
+.br
+* off: disables BS switching
+.br
+* on: enables it if same decoder configuration is possible
+.br
+* inband: moves decoder config inband if possible
+.br
+* force: enables it even if only one representation
+.br
+* multi: uses multiple stsd entries in ISOBMFF
+.br
+
+.br
+avcp (str):                    profile to use for AVC|H264 if no profile could be found. If forcep is set, enforces this profile
+.br
+hvcp (str):                    profile to use for HEVC if no profile could be found. If forcep is set, enforces this profile
+.br
+aacp (str):                    profile to use for AAC if no profile could be found. If forcep is set, enforces this profile
+.br
+av1p (str):                    profile to use for AV1 if no profile could be found. If forcep is set, enforces this profile
+.br
+vpxp (str):                    profile to use for VP8/9 if no profile could be found. If forcep is set, enforces this profile
+.br
+template (str):                template string to use to generate segment name - see filter help
+.br
+segext (str):                  file extension to use for segments
+.br
+initext (str):                 file extension to use for the init segment
+.br
+muxtype (enum, default: auto): muxtype to use for the segments
+.br
+* mp4: uses ISOBMFF format
+.br
+* ts: uses MPEG-2 TS format
+.br
+* mkv: uses Matroska format
+.br
+* webm: uses WebM format
+.br
+* raw: uses raw media format (disables muxed representations)
+.br
+* auto: guess format based on extension, default to mp4 if no extension
+.br
+
+.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.
+.br
+* auto: turns profile to live for dynamic and full for non-dynamic
+.br
+* live: DASH live profile, using segment template
+.br
+* onDemand: MPEG-DASH live profile
+.br
+* main: MPEG-DASH main profile, using segment list
+.br
+* full: MPEG-DASH full profile
+.br
+* hbbtv1.5.live: HBBTV 1.5 DASH profile
+.br
+* dashavc264.live: DASH-IF live profile
+.br
+* dashavc264.onDemand: DASH-IF onDemand profile
+.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
+.br
+cp (enum, default: set):       content protection element location
+.br
+* set: in adaptation set element
+.br
+* rep: in representation element
+.br
+* both: in both adaptation set and representation elements
+.br
+
+.br
+pssh (enum, default: v):       storage mode for PSSH box
+.br
+* f: stores in movie fragment only
+.br
+* v: stores in movie only
+.br
+* m: stores in mpd only
+.br
+* mf: stores in mpd and movie fragment
+.br
+* mv: stores in mpd and movie
+.br
+* n: discard pssh from mpd and segments
+.br
+
+.br
+buf (sint, default: -100):     min buffer duration in ms. negative value means percent of segment duration (eg -150 = 1.5*seg_dur)
+.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
+check_dur (bool, default: true): check duration of sources in period, trying to have roughly equal duration. Enforced whenever period start times are used
+.br
+skip_seg (bool, default: false): increment segment number whenever an empty segment would be produced - NOT DASH COMPLIANT
+.br
+title (str):                   MPD title
+.br
+source (str):                  MPD Source
+.br
+info (str):                    MPD info url
+.br
+cprt (str):                    MPD copyright string
+.br
+lang (str):                    language of MPD Info
+.br
+location (strl):               set MPD locations to given URL
+.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
+.br
+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 !!
+.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
+loop (bool, default: false):   loop sources when dashing with subdur and state. If not set, a new period is created once the sources are over
+.br
+split (bool, default: true):   enable cloning samples for text/metadata/scene description streams, marking further clones as redundant
+.br
+hlsc (bool, default: false):   insert clock reference in variant playlist in live HLS
+.br
+cues (str):                    set cue file - see filter help
+.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
+.br
+strict_sap (enum, default: off): strict mode for sap
+.br
+* off: ignore SAP types for PID other than video, enforcing _startsWithSAP=1_
+.br
+* sig: same as -off but keep _startsWithSAP_ to the true SAP value
+.br
+* on: warn if any PID uses SAP 3 or 4 and switch to FULL profile
+.br
+
+.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
+.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
+.br
+sbound (enum, default: out):   indicate how the theoretical segment start TSS (= segment_number * duration) should be handled
+.br
+* out: segment split as soon as TSS is exceeded (TSS <= segment_start)
+.br
+* closest: segment split at closest SAP to theoretical bound
+.br
+* in: TSS is always in segment (TSS >= segment_start)
+.br
+
+.br
+reschedule (bool, default: false): reschedule sources with no period ID assigned once done (dynamic mode only)
+.br
+sreg (bool, default: false):   regulate the session when using subdur to only generate segments from the past up to live edge
+.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
+
+.br
+.SH tileagg
+.LP
+.br
+Description: HEVC tile aggregator
+.br
+
+.br
+This filter reaggregates 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, default: , updatable): specify indexes of tiles to drop
+.br
+
+.br
+.SH pin
+.LP
+.br
+Description: pipe input
+.br
+
+.br
+This filter handles generic input pipes (mono-directional) in blocking or non blocking mode.
+.br
+Warning: Input pipes cannot seek.
+.br
+Data format of the pipe may be specified using extension (either in file name or through -ext) or MIME type through -mime.
+.br
+Note: Unless disabled at session level (see -no-probe ), file extensions are usually ignored and format probing is done on the first data block.
+.br
+
+.br
+.SH stdin pipe
+.LP
+.br
+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
+
+.br
+
+.br
+.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).
+.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
+
+.br
+Input pipes are created by default in non-blocking mode.
+.br
+
+.br
+The filter can create the pipe if not found using -mkp. On windows hosts, this will create a pipe server.
+.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 -ka. In this case, any potential pipe close on the writing side and end of stream will only be triggered upon session close.
+.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. If the filter creates the pipe, blocking mode is always enabled.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+block_size (uint, default: 5000): buffer size used to read pipe
+.br
+ext (str):                     indicate file extension of pipe data
+.br
+mime (str):                    indicate mime type of pipe data
+.br
+blk (bool, default: false):    open pipe in block mode - see filter help
+.br
+ka (bool, default: false):     keep-alive pipe when end of input is detected - see filter help
+.br
+mkp (bool, default: false):    create pipe if not found - see filter help
+.br
+
+.br
+.SH pout
+.LP
+.br
+Description: pipe output
+.br
+
+.br
+This filter handles generic output pipes (mono-directional) in blocking mode only.
+.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).
+.br
+Data format of the pipe shall be specified using extension (either in filename or through -ext option) or MIME type through -mime
+.br
+The pipe name indicated in -dst can use template mechanisms from gpac, e.g. dst=pipe_$ServiceID$
+.br
+
+.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
+
+.br
+The pipe input can create the pipe if not found using -mkp. On windows hosts, this will create a pipe server.
+.br
+On non windows hosts, the created pipe will delete the pipe file upon filter destruction.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file
+.br
+ext (str):                     indicate file extension of pipe data
+.br
+mime (str):                    indicate mime type of pipe data
+.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
+.br
+speed (dbl, default: 1.0):     set playback speed. If speed is negative and start is 0, start is set to -1
+.br
+mkp (bool, default: false):    create pipe if not found - see filter help
+.br
+block_size (uint, default: 5000): buffer size used to write to pipe, windows only
+.br
+
+.br
+.SH gsfmx
+.LP
+.br
+Description: GSF Muxer
+.br
+
+.br
+This filter provides GSF (GPAC Super/Simple/Serialized/Stream/State 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.
+.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.
+.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.
+.br
+For data packets, each fragment is encrypted individually to avoid error propagation in case of losses.
+.br
+For other packets, the entire packet is encrypted before fragmentation (fragments cannot be processed individually).
+.br
+For header/tunein packets, the first 25 bytes after the header are in the clear (signature,version,IV and pattern).
+.br
+The -IV is constant to avoid packet overhead, randomly generated if not set and sent in the initial stream header. Pattern mode can be used (cf CENC cbcs) to encrypt K block and leave N blocks in the clear.
+.br
+
+.br
+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.
+.br
+The -skp option may also be used to specify which property to drop:
+.br
+Example
+.br
+skp="4CC1,Name2
+.br
+
+.br
+This will remove properties of type 4CC1 and properties (built-in or not) of name Name2.
+.br
+
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+sigsn (bool, default: false):  signal packet sequence number after header field and before size field. Sequence number is per PID, encoded on 16 bits. Header packet does not have a SN
+.br
+sigdur (bool, default: true):  signal duration
+.br
+sigbo (bool, default: false):  signal byte offset
+.br
+sigdts (bool, default: true):  signal decoding timestamp
+.br
+dbg (enum, default: no):       set debug mode
+.br
+* no: disable debug
+.br
+* nodata: force packet size to 0
+.br
+* nopck: skip packet
+.br
+
+.br
+key (mem):                     encrypt packets using given key - see filter helps
+.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
+.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
+.br
+minp (bool, default: false):   include only the minimum set of properties required for stream processing - see filter help
+.br
+crate (dbl, default: 0):       carousel period for tune-in info in seconds - see filter help
+.br
+
+.br
+.SH gsfdmx
+.LP
+.br
+Description: GSF Demuxer
+.br
+
+.br
+This filter provides GSF (GPAC Super/Simple/Serialized/Stream/State Format) demultiplexing.
+.br
+It deserializes the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs.
+.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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+key (mem):                     key for decrypting packets
+.br
+magic (str):                   magic string to check in setup packet
+.br
+mq (uint, default: 4):         set max packet queue length for loss detection. 0 will flush incomplete packet when a new one starts
+.br
+pad (uint, default: 0, minmax: 0-255): byte value used to pad lost packets
+.br
+
+.br
+.SH sockout
+.LP
+.br
+Description: UDP/TCP output
+.br
+
+.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.
+.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 -kp option, however there is no realtime regulation of how fast packets are droped.
+.br
+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.
+.br
+
+.br
+- UDP sockets are used for destinations URLs formatted as udp://NAME
+.br
+- TCP sockets are used for destinations URLs formatted as tcp://NAME
+.br
+- UDP unix domain sockets are used for destinations URLs formatted as udpu://NAME
+.br
+- TCP unix domain sockets are used for destinations URLs formatted as tcpu://NAME
+.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/
+.br
+If the numerator is 0, a packet is randomly chosen in that window.
+.br
+Example
+.br
+:pckd=4/10
+.br
+
+.br
+This drops every 4th packet of each 10 packet window.
+.br
+Example
+.br
+:pckr=0/100
+.br
+
+.br
+This reverts the send order of one random packet in each 100 packet window.
+.br
+
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file
+.br
+sockbuf (uint, default: 65536): block size used to read file
+.br
+port (uint, default: 1234):    default port if not specified
+.br
+ifce (cstr):                   default multicast interface
+.br
+ext (str):                     file extension of pipe data - see filter help
+.br
+mime (str):                    mime type of pipe data - see filter help
+.br
+listen (bool, default: false): indicate the output socket works in server mode
+.br
+maxc (uint, default: +I):      max number of concurrent connections
+.br
+ka (bool, default: false):     keep socket alive if no more connections
+.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
+.br
+speed (dbl, default: 1.0):     set playback speed. If speed is 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
+.br
+pckd (frac, default: 0/0):     drop packet every N - see filter help
+.br
+
+.br
+.SH rfav1
+.LP
+.br
+Description: AV1/IVF/VP9 reframer
+.br
+
+.br
+This filter parses AV1 OBU, AV1 AnnexB or IVF with AV1 or VP9 files/data and outputs corresponding visual PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+importer (bool, default: false): compatibility with old importer
+.br
+deps (bool, default: false):   import samples dependencies information
+.br
+
+.br
+.SH ufobu
+.LP
+.br
+Description: IVF/OBU/annexB writer
+.br
+
+.br
+This filter is used to rewrite AV1 OBU bitstream into IVF, annex B or OBU sequence, reinserting the temporal delimiter OBU.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+rcfg (bool, default: true):    force repeating decoder config at each I-frame
+.br
+
+.br
+.SH nvdec
+.LP
+.br
+Description: NVidia decoder
+.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.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+num_surfaces (uint, default: 20): number of hardware surfaces to allocate
+.br
+unload (enum, default: no):    decoder unload mode
+.br
+* no: keep inactive decoder alive
+.br
+* destroy: destroy inactive decoder
+.br
+* reuse: detach decoder from inactive PIDs and reattach to active ones
+.br
+
+.br
+vmode (enum, default: cuvid):  video decoder backend
+.br
+* cuvid: use dedicated video engines directly
+.br
+* cuda: use a CUDA-based decoder if faster than dedicated engines
+.br
+* dxva: go through DXVA internally if possible (requires D3D9 interop)
+.br
+
+.br
+fmode (enum, default: gl):     frame output mode
+.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)
+.br
+* gl: frame data is mapped to an OpenGL texture
+.br
+
+.br
+
+.br
+.SH atscin
+.LP
+.br
+Description: ATSC input
+.br
+
+.br
+This filter is a receiver for ATSC 3.0 ROUTE sessions. Source is identified using the string atsc://.
+.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.
+.br
+In cached mode, repeated files are always send.
+.br
+  
+.br
+The cached MPD is assigned the following headers:
+.br
+* x-dash-atsc: integer value, indicates the ATSC service ID.
+.br
+* x-dash-first-seg: string value, indicates the name of the first segment completely retrieved from the broadcast.
+.br
+* x-atsc-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.
+.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.
+.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).
+.br
+Example
+.br
+gpac -i atsc://cache=false -o $ServiceID$/$File$:dynext
+.br
+
+.br
+This will grab the files and forward them as output PIDs, consumed by the fout filter.
+.br
+
+.br
+.SH Standalone mode
+.LP
+.br
+In standalone mode, the filter does not produce any output pid and writes received files to the -odir directory.
+.br
+Example
+.br
+gpac -i atsc://odir=output
+.br
+
+.br
+This will grab the files and write them to output directory.
+.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):
+.br
+Example
+.br
+route add -net 224.0.23.60/32 -interface vboxnet0
+.br
+
+.br
+and on each service multicast:
+.br
+Example
+.br
+route add -net 239.255.1.4/32 -interface vboxnet0
+.br
+
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content - see filter help
+.br
+ifce (str):                    default interface to use for multicast. If NULL, the default system interface will be used
+.br
+cache (bool, default: true):   indicate the files should populate GPAC HTTP cache - see filter help
+.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
+.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
+kc (bool, default: false):     keep corrupted file
+.br
+sr (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
+.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
+.br
+odir (str):                    output directory for stand-alone mode - see filter help
+.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
+
+.br
+.SH rtpout
+.LP
+.br
+Description: RTP Streamer
+.br
+
+.br
+The RTP streamer handles SDP/RTP output streaming.
+.br
+.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 -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 -port configured.
+.br
+In this mode, it is usually needed to specify the desired format using -ext or -mime.
+.br
+Example
+.br
+gpac -i src -o rtp://localhost:1234/:ext=ts
+.br
+
+.br
+This will indicate that the RTP streamer expects a MPEG-2 TS mux as an input.
+.br
+.SH RTP Packets
+.LP
+.br
+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).
+.br
+The real-time scheduling algorithm works as follows:
+.br
+- first initialize the clock by:
+.br
+ - computing the smallest timestamp for all input pids
+.br
+ - mapping this media time to the system clock
+.br
+- determine the earliest packet to send next on each input pid, adding -delay if any
+.br
+- 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
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+ip (str):                      destination IP address (NULL is 127.0.0.1)
+.br
+port (uint, default: 7000):    port for first stream in session
+.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
+.br
+mtu (uint, default: 1460):     size of RTP MTU in bytes
+.br
+ttl (uint, default: 2):        time-to-live for muticast packets
+.br
+ifce (str):                    default network inteface to use
+.br
+payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic configs.
+.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
+.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
+.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
+.br
+ext (str):                     file extension for direct RTP mode - see filter help
+.br
+mime (cstr):                   set mime type for direct RTP mode - see filter help
+.br
+
+.br
+.SH rtspout
+.LP
+.br
+Description: RTSP Server
+.br
+
+.br
+The RTSP server partially implements RTSP 1.0, with support for OPTIONS, DESCRIBE, SETUP, PLAY, PAUSE and TEARDOWN.
+.br
+Multiple PLAY ranges are not supported, PLAY range end is not supported, PAUSE range is not supported.
+.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).
+.br
+The server supports both RTP over UDP delivery and RTP interleaved over RTSP delivery.
+.br
+
+.br
+The filter can work as a simple output filter by specifying the -dst option:
+.br
+Example
+.br
+gpac -i source -o rtsp://myip/sessionname
+.br
+
+.br
+Example
+.br
+gpac -i source dst=rtsp://myip/sessionname
+.br
+
+.br
+In this mode, only one session is possible. It is possible to -loop the input source(s).
+.br
+
+.br
+The filter can work as a regular RTSP server by specifying the -mounts option to indicate paths of media file to be served:
+.br
+Example
+.br
+gpac rtspout:mounts=mydir1,mydir2
+.br
+
+.br
+In server mode, it is possible to load any source supported by gpac by setting the option -dynurl.
+.br
+The expected syntax of the dynamic RTSP URLs is rtsp://servername/?URL1[&URLN] or rtsp://servername/@URL1[@URLN] 
+.br
+Each URL can be absolute or local, in which case it is resolved against the mount point(s).
+.br
+Example
+.br
+gpac -i rtsp://localhost/?pipe://mynamepipe&myfile.mp4 [dst filters]
+.br
+
+.br
+The server will resolve this URL in a new session containing streams from myfile.mp4 and streams from pipe mynamepipe.
+.br
+When setting -runfor in server mode, the server will exit at the end of the last session being closed.
+.br
+
+.br
+In both modes, clients can setup multicast if the -mcast option is on or mirror.
+.br
+When -mcast is set to mirror mode, any DESCRIBE command on a resource already delivered through a multicast session will use that multicast.
+.br
+Consequently, only DESCRIBE methods are processed for such sessions, other methods will return Unauthorized.
+.br
+
+.br
+The scheduling algorithm and RTP options are the same as the RTP output filter, see gpac -h rtpout
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file - see filter help 
+.br
+port (uint, default: 554):     server port
+.br
+firstport (uint, default: 6000): port for first stream in session
+.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
+.br
+ifce (str):                    default network inteface to use
+.br
+payt (uint, default: 96, minmax: 96-127): payload type to use for dynamic configs.
+.br
+mpeg4 (bool, default: false):  send all streams using MPEG-4 generic payload format if posible
+.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
+.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
+.br
+tso (sint, default: -1):       set timestamp offset in microsecs. 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
+mounts (strl):                 list of directories to expose in server mode
+.br
+block_size (uint, default: 10000): block size used to read TCP socket
+.br
+maxc (uint, default: 100):     maximum number of connections
+.br
+user_agent (str, default: $GUA): user agent string, by default solved from GPAC preferences
+.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.
+.br
+dynurl (bool, default: false): allow dynamic service assembly - see filter help.
+.br
+mcast (enum, default: off):    control multicast setup of a session.
+.br
+* off: clients are never allowed to create a multicast
+.br
+* on: clients can create multicast sessions
+.br
+* mirror: clients can create a multicast session. Any later request to the same URL will use that multicast session
+.br
+
+.br
+
+.br
+.SH httpout
+.LP
+.br
+Description: HTTP Server
+.br
+
+.br
+The HTTP output filter can act as:
+.br
+- a simple HTTP server
+.br
+- an HTTP server sink
+.br
+- an HTTP server file sink
+.br
+- an HTTP client sink
+.br
+- an HTTP server source
+.br
+  
+.br
+The server currently handles GET, HEAD, PUT, POST, DELETE methods.
+.br
+Single or multiple byte ranges are supported for both GET and PUT/POST methods.
+.br
+- for GET, the resulting body is a single-part body formed by the concatenated byte ranges as requested (no overlap checking).
+.br
+- for PUT/POST, the received data is pushed to the target file according to the byte ranges specified in the client request.
+.br
+  
+.br
+Warning: the partial PUT request is RFC2616 compliant but not compliant with RFC7230. PATCH method is not yet implemented in GPAC.
+.br
+  
+.br
+When a single read directory is specified, the server root / is the content of this directory.
+.br
+When multiple read directories are specified, the server root / contains the list of the mount points with their directory names.
+.br
+When a write directory is specified, the upload resource name identifies a file in this directory (the write directory name is not present in the URL).
+.br
+  
+.br
+Listing can be enabled on server using -dlist.
+.br
+When disabled, a GET on a directory will fail.
+.br
+When enabled, a GET on a directory will return a simple HTML listing of the content inspired from Apache.
+.br
+  
+.br
+.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 -rdirs.
+.br
+PUT and POST methods are only supported if a write directory is specified by -wdir option.
+.br
+Example
+.br
+gpac httpout:rdirs=outcoming
+.br
+
+.br
+This sets up a read-only server.
+.br
+  
+.br
+Example
+.br
+gpac httpout:wdir=incoming
+.br
+
+.br
+This sets up a write-only server.
+.br
+  
+.br
+Example
+.br
+gpac httpout:rdirs=outcoming:wdir=incoming:port=8080
+.br
+
+.br
+This sets up a read-write server running on -port 8080.
+.br
+  
+.br
+.SH HTTP server sink
+.LP
+.br
+In this mode, the filter will forward input PIDs to connected clients, trashing the data if no client is connected unless -hold is specified.
+.br
+The filter doesn't 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:
+.br
+Example
+.br
+gpac -i MP3_SOURCE -o http://localhost/live.mp3 --hold
+.br
+
+.br
+In this example, the server waits for client requests on /live.mp3 and will then push each input packet to all connected clients.
+.br
+If the source is not real-time, you can inject a reframer filter performing realtime regulation.
+.br
+Example
+.br
+gpac -i MP3_SOURCE reframer:rt=on @ -o http://localhost/live.mp3
+.br
+
+.br
+In this example, the server will push each input packet to all connected clients, or trash the packet if no connected clients.
+.br
+  
+.br
+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.
+.br
+The server will also look for any property called ice-* on the input pid and inject them.
+.br
+Example
+.br
+gpac -i source.mp3:#ice-Genre=CoolRock -o http://IP/live.mp3:ice
+.br
+
+.br
+This will inject the header ice-Genre: CoolRock in the response.  
+.br
+.SH HTTP server file sink
+.LP
+.br
+In this mode, the filter will write input PIDs to files in the first read directory specified, acting as a file output sink.
+.br
+The filter uses a read directory in this mode, which must be writable.
+.br
+Upon client GET request, the server will check if the requested file matches the name of a file currently being written by the server.
+.br
+If so, the server will keep refreshing the source size until the associated input file is closed.
+.br
+This mode is typically used for origin server in HAS sessions where clients may request files while they are being produced (low latency DASH).
+.br
+Example
+.br
+gpac -i SOURCE -o http://localhost/live.mpd --rdirs=temp
+.br
+
+.br
+  
+.br
+.SH HTTP client sink
+.LP
+.br
+In this mode, the filter will upload input PIDs data to remote server using PUT (or POST if -post is set).
+.br
+This mode must be explicitly activated using -hmode.
+.br
+The filter uses no read or write directories in this mode.
+.br
+Example
+.br
+gpac -i SOURCE -o http://targethost:8080/live.mpd:gpac:hmode=push
+.br
+
+.br
+In this example, the filter will send PUT methods to the server running on -port 8080 at targethost location (IP address or name).
+.br
+  
+.br
+.SH HTTP server source
+.LP
+.br
+In this mode, the server acts as a source rather than a sink. It declares incoming PUT or POST methods as output PIDs
+.br
+This mode must be explicitly activated using -hmode.
+.br
+The filter uses no read or write directories in this mode, and uploaded data is NOT stored by the server.
+.br
+Example
+.br
+gpac httpout:hmode=source vout aout
+.br
+
+.br
+In this example, the filter will try to play uploaded files through video and audio output.
+.br
+  
+.br
+.SH HTTPS server
+.LP
+.br
+The server can run over TLS (https) for all the server modes. TLS is enabled by specifying -cert and -pkey options.
+.br
+Both certificate and key must be in PEM format.
+.br
+Note: 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
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of destination file - see filter help 
+.br
+port (uint, default: 80):      server port
+.br
+ifce (str):                    default network inteface to use
+.br
+rdirs (strl):                  list of directories to expose for read - see filter help
+.br
+wdir (str):                    directory to expose for write - see filter help
+.br
+cert (str):                    certificate file in PEM format to use for TLS mode
+.br
+pkey (str):                    private key file in PEM format to use for TLS mode
+.br
+block_size (uint, default: 10000): block size used to read and write TCP socket
+.br
+user_agent (str, default: $GUA): user agent string, by default solved from GPAC preferences
+.br
+close (bool, default: false):  close HTTP connection after each request
+.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
+.br
+cache_control (str):           specify the Cache-Control string to add; none disable ETag
+.br
+hold (bool, default: false):   hold packets until one client connects
+.br
+hmode (enum, default: default): filter operation mode, ignored if -wdir is set. See filter help for more details. Mode can be
+.br
+* default: run in server mode (see filter help)
+.br
+* push: run in client mode using PUT or POST (see filter help)
+.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
+.br
+ext (cstr):                    set extension for graph resolution, regardless of file extension
+.br
+mime (cstr):                   set mime type for graph resolution
+.br
+quit (bool, default: false):   exit server once all input PIDs are done and client disconnects (for test purposes)
+.br
+post (bool, default: false):   use POST instead of PUT for uploading files
+.br
+dlist (bool, default: false):  enable HTML listing for GET requests on directories
+.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
+.br
+reqlog (str):                  provide short log of the requests indicated in this option (comma separated list, * for all) regardless of HTTP log settings
+.br
+ice (bool, default: false):    insert ICE meta-data in response headers in sink mode - see filter help
+.br
+
+.br
+.SH hevcsplit
+.LP
+.br
+Description: HEVC tile spliter
+.br
+
+.br
+This filter splits a motion-constrained tiled HEVC PID into N independent HEVC PIDs.
+.br
+Use hevcmerge filter to merge initially motion-constrained tiled HEVC PID in a single output.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+
+.br
+.SH hevcmerge
+.LP
+.br
+Description: HEVC Tile merger
+.br
+
+.br
+This filter merges a set of HEVC PIDs into a single motion-constrained tiled HEVC PID.
+.br
+The filter creates a tiling grid with a single row and as many columns as needed.
+.br
+If -mrows is set and tiles properly align on the final grid, multiple rows will be declared in the PPS.
+.br
+Positioning of tiles can be automatic (implicit) or explicit.
+.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 -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.
+.br
+.P
+.B
+Implicit Positioning
+.br
+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
+.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
+If CropOrigin is used, it shall be set on all input sources.
+.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).
+.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
+- If an horizontal blank is detected in the layout, an empty column in the tiling grid will be inserted.
+.br
+- If a vertical blank is detected in the layout, it is ignored.
+.br
+  
+.br
+.P
+.B
+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.
+.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.
+.br
+The input SRDRef and SRD are usually specified in DASH MPD, but can be manually assigned to inputs.
+.br
+- SRDRef gives the size of the referential used for the input SRD (usually matches the original video size, but not always)
+.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
+.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
+Example
+.br
+src2:SRD=640x0x640x480:SRDRef=1280x720
+.br
+
+.br
+This indicates that src1 contains a video located at 640,0, with a size of 640x480 pixels in a virtual source of 1280x720 pixels.
+.br
+ 
+.br
+Each merged input is described by 8 intergers 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
+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.
+.br
+
+.br
+Alternatively to using SRD and SRDRef, it is possible to specify CropOrigin property on the inputs, in which case:
+.br
+- the CropOrigin gives the location in the source
+.br
+- the input size gives the size in the source, and no rescaling of referential is done
+.br
+Example
+.br
+src1:CropOrigin=0x0  src1:CropOrigin=640x0 
+.br
+
+.br
+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}
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+strict (bool, default: false): strict comparison of SPS and PPS of input pids - see filter help
+.br
+mrows (bool, default: false):  signal multiple rows in tile grid when possible
+.br
+
+.br
+.SH rfflac
+.LP
+.br
+Description: FLAC reframer
+.br
+
+.br
+This filter parses FLAC 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 rfprores
+.LP
+.br
+Description: ProRes reframer
+.br
+
+.br
+This filter parses ProRes raw files/data and outputs corresponding visual PID and frames.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+fps (frac, default: 0/1000):   import frame rate (0 default to FPS from bitstream or 25 Hz)
+.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
+.br
+
+.br
+.SH tssplit
+.LP
+.br
+Description: MPEG Transport Stream splitter
+.br
+
+.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.
+.br
+In -full mode, global DVB tables of the input multiplex are forwarded to each output mux; otherwise these tables are discarded.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dvb (bool, default: true):     forward all packets from global DVB PIDs
+.br
+mux_id (sint, default: -1):    set initial ID of output mux; the first program will use mux_id, the second mux_id+1, etc. If not set, this value will be set to sourceMuxId*255
+.br
+avonly (bool, default: true):  do not forward programs with no AV component
+.br
+nb_pack (uint, default: 10):   pack N packets before sending
+.br
+
+.br
+.SH bsrw
+.LP
+.br
+Description: Compressed bitstream rewriter
+.br
+
+.br
+This filter rewrites some metadata of various bitstream formats.
+.br
+The filter can currently modify the following properties in the bitstream:
+.br
+* MPEG-4 Visual: aspect ratio and profile/level
+.br
+* AVC|H264: aspect ratio, profile, level, profile compatibility
+.br
+* HEVC: aspect ratio
+.br
+* ProRes: aspect ratio, color primaries, transfer characteristics and matrix coefficients
+.br
+  
+.br
+The filter can currently modify the following properties in the stream configuration but not in the bitstream:
+.br
+* HEVC: profile IDC, profile space, general compatibility flags
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+sar (frac, default: 0/0, updatable): aspect ratio to rewrite
+.br
+m4vpl (sint, default: -1, updatable): set ProfileLevel for MPEG-4 video part two
+.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
+.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
+.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
+.br
+prof (sint, default: -1, updatable): profile indication for AVC|H264
+.br
+lev (sint, default: -1, updatable): level indication for AVC|H264
+.br
+pcomp (sint, default: -1, updatable): profile compatibility for AVC|H264
+.br
+pidc (sint, default: -1, updatable): profile IDC for HEVC
+.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
+.br
+
+.br
+.SH ffdmx
+.LP
+.br
+Description: FFMPEG demuxer
+.br
+Version: Lavf58.42.101
+.br
+
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+src (cstr):                    location of source content
+.br
+* (str):                       any possible options defined for AVFormatContext and sub-classes. See gpac -hx ffdmx and gpac -hx ffdmx:*
+.br
+
+.br
+.SH ffdec
+.LP
+.br
+Description: FFMPEG decoder
+.br
+Version: Lavc58.81.100
+.br
+
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+* (str):                       any possible options defined for AVCodecContext and sub-classes. See gpac -hx ffdec and gpac -hx ffdec:*
+.br
+
+.br
+.SH ffavin
+.LP
+.br
+Description: FFMPEG AV Capture
+.br
+Version: Lavd58.9.103
+.br
+
+.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
+.br
+screen-capture-recorder, see http://screencapturer.sf.net/ on windows
+.br
+Capture screen 0 on OSX (0=first screen), or screenN for short
+.br
+X display name (eg :0.0) on linux
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+.SH Options (expert):
+.LP
+.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
+.br
+dev (str, default: 0):         name of device or index of device - see filter help
+.br
+copy (enum, default: A):       set copy mode of raw frames
+.br
+* N: frames are only forwarded (shared memory, no copy)
+.br
+* A: audio frames are copied, video frames are forwarded
+.br
+* V: video frames are copied, audio frames are forwarded
+.br
+* AV: all frames are copied
+.br
+
+.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
+.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:*
+.br
+
+.br
+.SH ffsws
+.LP
+.br
+Description: FFMPEG video rescaler
+.br
+Version: SwS5.6.101
+.br
+
+.br
+For bicubic, to tune the shape of the basis function, -p1 tunes f(1) and -p2 f´(1)
+.br
+For gauss -p1 tunes the exponent and thus cutoff frequency
+.br
+For lanczos -p1 tunes the width of the window function
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+osize (v2di):                  osize of output video. When not set, input osize is used
+.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
+.br
+scale (enum, default: bicubic): scaling mode - see filter info
+.br
+
+.br
+p1 (dbl, default: +I):         scaling algo param1 - see filter info
+.br
+p2 (dbl, default: +I):         scaling algo param2 - see filter info
+.br
+
+.br
+.SH ffenc
+.LP
+.br
+Description: FFMPEG encoder
+.br
+Version: Lavc58.81.100
+.br
+
+.br
+Encodes audio and video streams.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+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.
+.br
+
+.br
+The encoder will force a closed gop boundary at each packet with a FileNumber property set.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+c (str):                       codec identifier. Can be any supported GPAC ID or ffmpeg ID or filter subclass 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
+.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)
+.br
+* (str):                       any possible options defined for AVCodecContext and sub-classes. see gpac -hx ffenc and gpac -hx ffenc:*
+.br
+
+.br
+.SH ffmx
+.LP
+.br
+Description: FFMPEG muxer
+.br
+Version: Lavf58.42.101
+.br
+
+.br
+FFMPEG output for files and streamers.
+.br
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+Note: Some URL formats may not be sufficient to derive the multiplexing format, you must then use -ffmt to specify the desired format.
+.br
+
+.br
+Unlike other multiplexing filters in GPAC, this filter is a sink filter and does not produce any PID to be redirected in the graph.
+.br
+The filter can however use template names for its output, using the first input PID to resolve the final name.
+.br
+The filter watches the property FileNumber on incoming packets to create new files.
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+dst (cstr):                    location of source content
+.br
+start (dbl, default: 0.0):     set playback start offset. Negative value means percent of media dur with -1 <=> dur
+.br
+speed (dbl, default: 1.0):     set playback speed. If speed is 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
+.br
+mime (cstr):                   set mime type for graph resolution
+.br
+ffiles (bool, default: false): force complete files to be created for each segment in DASH modes
+.br
+ffmt (str):                    force ffmpeg output format for the given URL
+.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:*
+.br
+
+.br
+.SH ffavf
+.LP
+.br
+Description: FFMPEG AVFilter
+.br
+Version: Lavf58.42.101
+.br
+
+.br
+This filter provides libavfilter raw audio and video tools. See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more details
+.br
+
+.br
+.SH Declaring a filter
+.LP
+.br
+The filter loads a filter or a filter chain description from the -f option.
+.br
+Example
+.br
+ffavf:f=showspectrum
+.br
+
+.br
+
+.br
+Unlike other FFMPEG bindings in GPAC, this filter does not parse other libavfilter options, you must specify them directly in the filter chain, and the -f option will have to be escaped.
+.br
+Example
+.br
+ffavf::f=showspectrum=size=320x320 or ffavf::f=showspectrum=size=320x320::pfmt=rgb
+.br
+
+.br
+
+.br
+The filter will automatically create buffer and buffersink AV filters for data exchange between GPAC and libavfilter.
+.br
+The builtin options ( -pfmt, -afmt ...) can be used to configure the buffersink filter to set the output format of the filter.
+.br
+
+.br
+.SH Naming of PIDs
+.LP
+.br
+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
+.br
+
+.br
+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.
+.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
+.br
+
+.br
+In this example:
+.br
+- the video source is identified as a
+.br
+- the logo source is identified as b
+.br
+- 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)
+.br
+
+.br
+When a graph has several outputs, output PIDs will be identified using the ffid property set to the output avfilter name.
+.br
+Example
+.br
+src=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
+.br
+- the inspecter only process stream with ffid out0
+.br
+- the video output only displays stream with ffid out1
+.br
+
+.br
+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.
+.br
+
+.br
+.SH Filter graph commands
+.LP
+.br
+The filter handles option updates as commands passed to the AV filter graph. The syntax expected in the option name is:
+.br
+* com_name=value: sends command com_name with value value to all filters
+.br
+* name#com_name=value: sends command com_name with value value to filter named name
+.br
+
+.br
+
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+f (str):                       filter or filter chain description - see filter help
+.br
+pfmt (pfmt, default: none):    pixel format of output. If not set, let AVFilter decide
+.br
+afmt (afmt, default: none):    audio format of output. If not set, let AVFilter decide
+.br
+sr (uint, default: 0):         sample rate of output. If not set, let AVFilter decide
+.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
+.br
+* (str):                       any possible options defined for AVFilter and sub-classes. See gpac -hx ffavf and gpac -hx ffavf:*
+.br
+
+.br
+.SH jsf
+.LP
+.br
+Description: JavaScript filter
+.br
+
+.br
+This filter runs a javascript file specified in -js defining a new JavaScript filter.
+.br
+  
+.br
+For more information on how to use JS filters, please check https://wiki.gpac.io/jsfilter
+.br
+
+.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
+.br
+
+.br
+.SH dtout
+.LP
+.br
+Description: DekTec SDIOut
+.br
+
+.br
+This filter provides SDI output to be used with DTA 2174 or DTA 2154 cards.
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+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
+.br
+fps (frac, default: 30/1):     default FPS to use if input stream fps cannot be detected
+.br
+clip (bool, default: false):   clip YUV data to valid SDI range, slower
+.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
+.br
+
+.br
+.SH ohevcdec
+.LP
+.br
+Description: OpenHEVC decoder
+.br
+
+.br
+This filter decodes HEVC and LHVC (HEVC scalable extensions) from one or more PIDs through the OpenHEVC library
+.br
+
+.br
+.SH Options (expert):
+.LP
+.br
+threading (enum, default: frame): set threading mode
+.br
+* frameslice: parallel decoding of both frames and slices
+.br
+* frame: parallel decoding of frames
+.br
+* slice: parallel decoding of slices
+.br
+
+.br
+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
+pack_hfr (bool, default: false): pack 4 consecutive frames in a single output
+.br
+seek_reset (bool, default: false): reset decoder when seeking
+.br
+force_stereo (bool, default: false): force stereo output for multiview (top-bottom only)
+.br
+reset_switch (bool, default: false): reset decoder at config change
+.br
+
+.br
+.SH EXAMPLES
+.TP
+Basic and advanced examples are available at https://wiki.gpac.io/Filters
+.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
+.br
+build: 1.0.0-rev0-g747808797-master
+.br
+Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+.br
+.SH SEE ALSO
+.LP
+gpac(1), MP4Client(1), MP4Box(1)

gpac-1.0.0.tar.gz/share/doc/man/gpac.1 Added

@@ -0,0 +1,3626 @@
+.TH gpac 1 2019 gpac GPAC
+.
+.SH NAME
+.LP
+gpac \- GPAC command-line filter session manager
+.SH SYNOPSIS
+.LP
+.B gpac
+.RI [options] FILTER [LINK] FILTER [...]
+.br
+.
+gpac is GPAC's command line tool for setting up and running filter chains.
+.br
+
+.br
+FILTER: a single filter declaration (eg, -i file, -o dump, inspect, ...), see gpac -h doc.
+.br
+[LINK]: a link instruction (eg, @, @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)
+.br
+
+.br
+  Options do not require any specific order, and may be present anywhere, including between link statements or filter declarations.
+.br
+boolean values do not need any value specified. Other types shall be formatted as opt=val, except -i, -src, -o, -dst and -h options.
+.br
+
+.br
+The possible options for gpac are:
+.br
+
+.br
+.TP
+.B \-ltf
+.br
+load test-unit filters (used for for unit tests only)
+.br
+.TP
+.B \-sloop (int)
+.br
+loop execution of session, creating a session at each loop, mainly used for testing. If no value is given, loops forever
+.br
+.TP
+.B \-runfor (int)
+.br
+run for the given amount of milliseconds
+.br
+.TP
+.B \-runforx (int)
+.br
+run for the given amount of milliseconds and exit with no cleanup
+.br
+.TP
+.B \-stats
+.br
+print stats after execution
+.br
+.TP
+.B \-graph
+.br
+print graph after execution
+.br
+.TP
+.B \-k
+.br
+enable keyboard interaction from command line
+.br
+.TP
+.B \-r (string)
+.br
+enable reporting
+.br
+* r: runtime reporting
+.br
+* r=FA[,FB]: runtime reporting but only print given filters, eg r=mp4mxfor ISOBMFF muxer only
+.br
+* r=: only print final report
+.br
+.TP
+.B \-seps (string, default: :=#,!@)
+.br
+set the default character sets used to separate various arguments
+.br
+- the first char is used to separate argument names
+.br
+- the second char, if present, is used to separate names and values
+.br
+- the third char, if present, is used to separate fragments for PID sources
+.br
+- the fourth char, if present, is used for list separators (sourceIDs, gfreg, ...)
+.br
+- the fifth char, if present, is used for boolean negation
+.br
+- the sixth char, if present, is used for LINK directives (see filters help (-h doc))
+.br
+.TP
+.B \-i,-src (string)
+.br
+specify an input file - see filters help (-h doc)
+.br
+.TP
+.B \-o,-dst (string)
+.br
+specify an output file - see filters help (-h doc)
+.br
+.TP
+.B \-ib (string)
+.br
+specify an input file to wrap as GF_FileIO object (testing of GF_FileIO)
+.br
+.TP
+.B \-ob (string)
+.br
+specify an output file to wrap as GF_FileIO object (testing of GF_FileIO)
+.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.
+.br
+Note: The @ character can be used in place of the * character.
+.br
+ String parameter can be:
+.br
+* empty: print command line options help
+.br
+* doc: print the general filter info
+.br
+* alias: print the gpac alias syntax
+.br
+* log: print the log system help
+.br
+* core: print the supported libgpac core options. Use -ha/-hx/-hh for advanced/expert options
+.br
+* cfg: print the GPAC configuration help
+.br
+* prompt: print the GPAC prompt help when running in interactive mode (see -k )
+.br
+* modules: print available modules
+.br
+* filters: print name of all available filters
+.br
+* filters:*: print name of all available filters, including meta filters
+.br
+* codecs: print the supported builtin codecs
+.br
+* props: print the supported builtin PID and packet properties
+.br
+* links: print possible connections between each supported filters.
+.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.
+.br
+  - Use * to print info on all filters (big output!), *:* to print info on all filters including meta filter instances (really big output!).
+.br
+  - 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.
+.br
+* FNAME.OPT: print option OPT in filter FNAME
+.br
+.TP
+.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. Appending :reload to the profile name will force recreating a new configuration file
+.br
+.TP
+.B \-alias (string)
+.br
+assign a new alias or remove an alias. Can be specified several times. See alias usage (-h alias)
+.br
+.TP
+.B \-aliasdoc (string)
+.br
+assign documentation for a given alias (optional). Can be specified several times
+.br
+.TP
+.B \-uncache
+.br
+revert all items in GPAC cache directory to their original name and server path
+.br
+.TP
+.B \-wc
+.br
+write all core options in the config file unless already set
+.br
+.TP
+.B \-we
+.br
+write all file extensions in the config file unless already set (useful to change some default file extensions)
+.br
+.TP
+.B \-wf
+.br
+write all filter options in the config file unless already set
+.br
+.TP
+.B \-wfx
+.br
+write all filter options and all meta filter arguments in the config file unless already set (large config file !)
+.br
+.TP
+.B \-xopt
+.br
+do not throw error on any unrecognized options following this option - used to pass arguments to GUI
+.br
+
+.br
+  
+.br
+The following libgpac core options allow customizing the filter session:
+.br
+  
+.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)
+.br
+.TP
+.B \-full-link
+.br
+throw error if any pid in the filter graph cannot be linked
+.br
+.TP
+.B \-no-block (Enum, default: no)
+.br
+disable blocking mode of filters
+.br
+* no: enable blocking mode
+.br
+* fanout: disable blocking on fanout, unblocking the PID as soon as one of its destinations requires a packet
+.br
+* all: disable blocking
+.br
+.TP
+.B \-no-reg
+.br
+disable regulation (no sleep) in session
+.br
+.TP
+.B \-no-reassign
+.br
+disable source filter reassignment in pid graph resolution
+.br
+.TP
+.B \-sched (Enum, default: free)
+.br
+set scheduler mode
+.br
+* free: lock-free queues except for task list (default)
+.br
+* lock: mutexes for queues when several threads
+.br
+* freex: lock-free queues including for task lists (experimental)
+.br
+* flock: mutexes for queues even when no thread (debug mode)
+.br
+* direct: no threads and direct dispatch of tasks whenever possible (debug mode)
+.br
+.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
+.br
+.TP
+.B \-max-sleep (int, default: 50)
+.br
+set maximum sleep time slot in milliseconds when regulation is enabled
+.br
+.TP
+.B \-threads (int)
+.br
+set N extra thread for the session. -1 means use all available cores
+.br
+.TP
+.B \-no-probe
+.br
+disable data probing on sources and relies on extension (faster load but more error-prone)
+.br
+.TP
+.B \-no-argchk
+.br
+disable tracking of argument usage (all arguments will be considered as used)
+.br
+.TP
+.B \-blacklist (string)
+.br
+blacklist the filters listed in the given string (comma-separated list)
+.br
+.TP
+.B \-no-graph-cache
+.br
+disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (lower memory usage but slower)
+.br
+.TP
+.B \-no-reservoir
+.br
+disable memory recycling for packets and properties. This uses much less memory but stresses the system memory allocator much more
+.br
+.SH Using Aliases
+.PL
+The gpac command line can become quite complex when many sources or filters are used. In order to simplify this, an alias system is provided.
+.br
+
+.br
+To assign an alias, use the syntax gpac -alias="NAME VALUE".
+.br
+* `NAME`: shall be a single string, with no space.
+.br
+* `VALUE`: the list of argument this alias replaces. If not set, the alias is destroyed
+.br
+
+.br
+When parsing arguments, the alias will be replace by its value.
+.br
+Example
+.br
+gpac -alias="output aout vout"
+.br
+
+.br
+This allows later audio and video playback using gpac -i src.mp4 output
+.br
+
+.br
+Aliases can use arguments from the command line. The allowed syntaxes are:
+.br
+* `@{a}`: replaced by the value of the argument with index a after the alias
+.br
+* `@{a,b}`: replaced by the value of the arguments with index a and b
+.br
+* `@{a:b}`: replaced by the value of the arguments between index a and b
+.br
+* `@{-a,b}`: replaced by the value of the arguments with index a and b, inserting a list separator (comma by default) between them
+.br
+* `@{-a:b}`: replaced by the value of the arguments between index a and b, inserting a list separator (comma by default) between them
+.br
+* `@{+a,b}`: clones the parent word in the alias for a and b, replacing this pattern in each clone by the corresponding argument
+.br
+* `@{+a:b}`: clones the parent word in the alias for each argument between index a and b, replacing this pattern in each clone by the corresponding argument
+.br
+
+.br
+The specified index can be:
+.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)
+.br
+
+.br
+Arguments not used by any aliases are kept on the command line, other ones are removed
+.br
+
+.br
+Example
+.br
+-alias="foo src=@{N} dst=test.mp4"
+.br
+
+.br
+The command gpac foo f1 f2 expands to gpac src=f2 dst=test.mp4 f1
+.br
+Example
+.br
+-alias="list: inspect src=@{+:N}"
+.br
+
+.br
+The command gpac list f1 f2 f3 expands to gpac inspect src=f1 src=f2 src=f3
+.br
+Example
+.br
+-alias="list inspect src=@{+2:N}"
+.br
+
+.br
+The command gpac list f1 f2 f3 expands to gpac inspect src=f2 src=f3 f1
+.br
+Example
+.br
+-alias="plist aout vout flist:srcs=@{-,N}"
+.br
+
+.br
+The command gpac plist f1 f2 f3 expands to gpac aout vout plist:srcs="f1,f2,f3"  
+.br
+
+.br
+Alias documentation can be set using gpac -aliasdoc="NAME VALUE", with NAME the alias name and VALUE the documentation.
+.br
+Alias documentation will then appear in gpac help.
+.br
+
+.br
+.SH Configuration file
+.LP
+.br
+GPAC uses a configuration file to modify default options of libgpac and filters. This configuration file is located in $HOME/.gpac/GPAC.cfg.
+.br
+Applications in GPAC can also specify a different configuration file through the -p option to indicate a profile. This allows different configurations for different usages and simplifies command line typing.
+.br
+Example
+.br
+gpac -p=foo []
+.br
+
+.br
+This will load configuration from $HOME/.gpac/foo/GPAC.cfg, creating it if needed.
+.br
+The reserved name 0 is used to disable configuration file writing.
+.br
+By default the configuration file only holds a few system specific options and directories. It is possible to serialize the entire set of options to the configuration file, using -wc -wf. This should be avoided as the resulting configuration file size will be quite large, hence larger memory usage for the applications.
+.br
+The options specified in the configuration file may be overriden by the values in restrict.cfg file located in GPAC share system directory (e.g. /usr/share/gpac), if present; this allows enforcing system-wide configuration values.
+.br
+Note: The methods describe in this section apply to any application in GPAC transferring their arguments to libgpac. This is the case for gpac, MP4Box, MP4Client/Osmo4.
+.br
+.SH Core options
+.LP
+.br
+The options from libgpac core can also be assigned though the config file from section core using option name without initial dash as key name.
+.br
+Example
+.br
+[core]threads=2
+.br
+
+.br
+Setting this in the config file is equivalent to using -threads=2.
+.br
+The options specified at prompt overrides the value of the config file.
+.br
+.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.
+.br
+Example
+.br
+[filter@rtpin]interleave=yes
+.br
+
+.br
+This will force the rtp input filter to always request RTP over RTSP by default.
+.br
+To generate a configuration file with all filters options serialized, use -wf.
+.br
+.SH Global filter options
+.LP
+.br
+It is possible to specify options global to multiple filters using --OPTNAME=VAL. Global options do not override filter options but take precedence over options loaded from configuration file.
+.br
+This will set option OPTNAME, when present, to VAL in any loaded filter.
+.br
+Example
+.br
+--buffer=100 -i file vout aout
+.br
+
+.br
+This is equivalent to specifying vout:buffer=100 aout:buffer=100.
+.br
+Example
+.br
+--buffer=100 -i file vout aout:buffer=10
+.br
+
+.br
+This is equivalent to specifying vout:buffer=100 aout:buffer=10.
+.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.
+.br
+Example
+.br
+-+profile=Baseline -i file.cmp -o dump.264
+.br
+
+.br
+This is equivalent to specifying -o dump.264:profile=Baseline.
+.br
+.SH libgpac core options:
+.LP
+.br
+.TP
+.B \-noprog
+.br
+disable progress messages
+.br
+.TP
+.B \-quiet
+.br
+disable all messages, including errors
+.br
+.TP
+.B \-strict-error,-se
+.br
+exit after the first error is reported
+.br
+.TP
+.B \-store-dir (string)
+.br
+set storage directory
+.br
+.TP
+.B \-mod-dirs (string list)
+.br
+set module directories
+.br
+.TP
+.B \-js-dirs (string list)
+.br
+set javascript directories
+.br
+.TP
+.B \-no-js-mods (string list)
+.br
+disable javascript module loading
+.br
+.TP
+.B \-ifce (string)
+.br
+set default multicast interface through interface IP address
+.br
+.TP
+.B \-lang (string)
+.br
+set preferred language
+.br
+.TP
+.B \-cfg,-opt (string)
+.br
+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
+.br
+.TP
+.B \-no-save
+.br
+discard any changes made to the config file upon exit
+.br
+.TP
+.B \-mod-reload
+.br
+unload / reload module shared libs when no longer used
+.br
+.TP
+.B \-for-test
+.br
+disable all creation/modif dates and GPAC versions in files
+.br
+.TP
+.B \-old-arch
+.br
+enable compatibility with pre-filters versions of GPAC
+.br
+.TP
+.B \-ntp-shift (int)
+.br
+shift NTP clock by given amount in seconds
+.br
+.TP
+.B \-bs-cache-size (int, default: 512)
+.br
+cache size for bitstream read and write from file (0 disable cache, slower IOs)
+.br
+.TP
+.B \-cache (string)
+.br
+cache directory location
+.br
+.TP
+.B \-proxy-on
+.br
+enable HTTP proxy
+.br
+.TP
+.B \-proxy-name (string)
+.br
+set HTTP proxy address
+.br
+.TP
+.B \-proxy-port (int, default: 80)
+.br
+set HTTP proxy port
+.br
+.TP
+.B \-maxrate (int)
+.br
+set max HTTP download rate in bits per sec. 0 means unlimited
+.br
+.TP
+.B \-no-cache
+.br
+disable HTTP caching
+.br
+.TP
+.B \-offline-cache
+.br
+enable offline HTTP caching (no revalidation of existing resource in cache)
+.br
+.TP
+.B \-clean-cache
+.br
+indicate if HTTP cache should be clean upon launch/exit
+.br
+.TP
+.B \-cache-size (int, default: 100M)
+.br
+specify cache size in bytes
+.br
+.TP
+.B \-head-timeout (int, default: 5000)
+.br
+set HTTP head request timeout in milliseconds
+.br
+.TP
+.B \-req-timeout (int, default: 20000)
+.br
+set HTTP/RTSP request timeout in milliseconds
+.br
+.TP
+.B \-broken-cert
+.br
+enable accepting broken SSL certificates
+.br
+.TP
+.B \-user-agent,-ua (string)
+.br
+set user agent name for HTTP/RTSP
+.br
+.TP
+.B \-user-profileid (string)
+.br
+set user profile ID (through X-UserProfileID entity header) in HTTP requests
+.br
+.TP
+.B \-user-profile (string)
+.br
+set user profile filename. Content of file is appended as body to HTTP HEAD/GET requests, associated Mime is text/xml
+.br
+.TP
+.B \-query-string (string)
+.br
+insert query string (without ?) to URL on requests
+.br
+.TP
+.B \-dm-threads
+.br
+force using threads for async download requests rather than session scheduler
+.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)
+.br
+.TP
+.B \-full-link
+.br
+throw error if any pid in the filter graph cannot be linked
+.br
+.TP
+.B \-no-block (Enum, default: no)
+.br
+disable blocking mode of filters
+.br
+* no: enable blocking mode
+.br
+* fanout: disable blocking on fanout, unblocking the PID as soon as one of its destinations requires a packet
+.br
+* all: disable blocking
+.br
+.TP
+.B \-no-reg
+.br
+disable regulation (no sleep) in session
+.br
+.TP
+.B \-no-reassign
+.br
+disable source filter reassignment in pid graph resolution
+.br
+.TP
+.B \-sched (Enum, default: free)
+.br
+set scheduler mode
+.br
+* free: lock-free queues except for task list (default)
+.br
+* lock: mutexes for queues when several threads
+.br
+* freex: lock-free queues including for task lists (experimental)
+.br
+* flock: mutexes for queues even when no thread (debug mode)
+.br
+* direct: no threads and direct dispatch of tasks whenever possible (debug mode)
+.br
+.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
+.br
+.TP
+.B \-max-sleep (int, default: 50)
+.br
+set maximum sleep time slot in milliseconds when regulation is enabled
+.br
+.TP
+.B \-threads (int)
+.br
+set N extra thread for the session. -1 means use all available cores
+.br
+.TP
+.B \-no-probe
+.br
+disable data probing on sources and relies on extension (faster load but more error-prone)
+.br
+.TP
+.B \-no-argchk
+.br
+disable tracking of argument usage (all arguments will be considered as used)
+.br
+.TP
+.B \-blacklist (string)
+.br
+blacklist the filters listed in the given string (comma-separated list)
+.br
+.TP
+.B \-no-graph-cache
+.br
+disable internal caching of filter graph connections. If disabled, the graph will be recomputed at each link resolution (lower memory usage but slower)
+.br
+.TP
+.B \-no-reservoir
+.br
+disable memory recycling for packets and properties. This uses much less memory but stresses the system memory allocator much more
+.br
+.TP
+.B \-switch-vres
+.br
+select smallest video resolution larger than scene size, otherwise use current video resolution
+.br
+.TP
+.B \-hwvmem (Enum, default: auto)
+.br
+specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed.
+.br
+* always: always on hardware
+.br
+* never: always on system memory
+.br
+* auto: selected by GPAC based on content type (graphics or video)
+.br
+.TP
+.B \-pref-yuv4cc (string)
+.br
+set prefered YUV 4CC for overlays (used by DirectX only)
+.br
+.TP
+.B \-offscreen-yuv
+.br
+indicate if offscreen yuv->rgb is enabled. can be set to false to force disabling
+.br
+.TP
+.B \-overlay-color-key (string)
+.br
+color to use for overlay keying, hex format
+.br
+.TP
+.B \-gl-bits-comp (int, default: 8)
+.br
+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
+.br
+.TP
+.B \-gl-doublebuf
+.br
+enable openGL double buffering
+.br
+.TP
+.B \-sdl-defer
+.br
+use defer rendering for SDL
+.br
+.TP
+.B \-no-colorkey
+.br
+disable color keying at the video output level
+.br
+.TP
+.B \-glfbo-txid (int)
+.br
+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
+.br
+.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 -glfbo-txid.  In this mode, the application is responsible for sending event to the terminal
+.br
+.TP
+.B \-audio-output (string)
+.br
+indicate the name of the audio output module to use
+.br
+.TP
+.B \-alsa-devname (string)
+.br
+set ALSA dev name
+.br
+.TP
+.B \-force-alsarate (int)
+.br
+force ALSA and OSS output sample rate
+.br
+.TP
+.B \-ds-disable-notif
+.br
+disable DirectSound audio buffer notifications when supported
+.br
+.TP
+.B \-font-reader (string)
+.br
+indicate name of font reader module
+.br
+.TP
+.B \-font-dirs (string)
+.br
+indicate comma-separated list of directories to scan for fonts
+.br
+.TP
+.B \-rescan-fonts
+.br
+indicate the font directory must be rescanned
+.br
+.TP
+.B \-wait-fonts
+.br
+wait for SVG fonts to be loaded before displaying frames
+.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
+.br
+.TP
+.B \-rmt-port (int, default: 17815)
+.br
+set remotery port
+.br
+.TP
+.B \-rmt-reuse
+.br
+allow remotery to reuse port
+.br
+.TP
+.B \-rmt-localhost
+.br
+make remotery only accepts localhost connection
+.br
+.TP
+.B \-rmt-sleep (int, default: 10)
+.br
+set remotery sleep (ms) between server updates
+.br
+.TP
+.B \-rmt-nmsg (int, default: 10)
+.br
+set remotery number of messages per update
+.br
+.TP
+.B \-rmt-qsize (int, default: 131072)
+.br
+set remotery message queue size in bytes
+.br
+.TP
+.B \-rmt-log
+.br
+redirect logs to remotery (experimental, usually not well handled by browser)
+.br
+.TP
+.B \-rmt-ogl
+.br
+make remotery sample opengl calls
+.br
+.SH libgpac logs options:
+.LP
+.br
+.TP
+.B \-noprog
+.br
+disable progress messages
+.br
+.TP
+.B \-quiet
+.br
+disable all messages, including errors
+.br
+.TP
+.B \-log-file,-lf (string)
+.br
+set output log file
+.br
+.TP
+.B \-log-clock,-lc
+.br
+log time in micro sec since start time of GPAC before each log line
+.br
+.TP
+.B \-log-utc,-lu
+.br
+log UTC time in ms before each log line
+.br
+.TP
+.B \-logs (string)
+.br
+set log tools and levels.  
+.br
+  
+.br
+You can independently log different tools involved in a session.
+.br
+log_args is formatted as a ':'-separated list of toolX[:toolZ]@levelX
+.br
+levelX can be one of:
+.br
+* quiet: skip logs
+.br
+* error: logs only error messages
+.br
+* warning: logs error+warning messages
+.br
+* info: logs error+warning+info messages
+.br
+* debug: logs all messages
+.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, ...)
+.br
+* network: network data except RTP trafic
+.br
+* http: HTTP trafic
+.br
+* rtp: RTP trafic
+.br
+* author: authoring tools (hint, import, export)
+.br
+* sync: terminal sync layer
+.br
+* codec: terminal codec messages
+.br
+* parser: scene parsers (svg, xmt, bt) and other
+.br
+* media: terminal media object management
+.br
+* scene: scene graph and scene manager
+.br
+* script: scripting engine messages
+.br
+* interact: interaction engine (events, scripts, etc)
+.br
+* smil: SMIL timing engine
+.br
+* compose: composition engine (2D, 3D, etc)
+.br
+* mmio: Audio/Video HW I/O management
+.br
+* rti: various run-time stats
+.br
+* cache: HTTP cache subsystem
+.br
+* audio: Audio renderer and mixers
+.br
+* mem: GPAC memory tracker
+.br
+* dash: HTTP streaming logs
+.br
+* module: GPAC modules (av out, font engine, 2D rasterizer)
+.br
+* filter: filters debugging
+.br
+* sched: filter session scheduler debugging
+.br
+* mutex: log all mutex calls
+.br
+* atsc: ATSC3 debugging
+.br
+* all: all tools logged - other tools can be specified afterwards.  
+.br
+The special keyword ncl can be set to disable color logs.  
+.br
+The special keyword strict can be set to exit at first error.  
+.br
+Example
+.br
+-logs all@info:dash@debug:ncl
+.br
+
+.br
+This moves all log to info level, dash to debug level and disable color logs
+.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).
+.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 -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.
+.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 -seps to change them.
+.br
+.SH Property format
+.LP
+.br
+* 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.
+.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.
+.br
+* N-dimension (vectors): formatted as DIM1xDIM2[xDIM3[xDIM4]] values, without unit multiplier.
+.br
+* string: formatted as:
+.br
+ * `value`: copies value to string.
+.br
+ * `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.
+.br
+* data: formatted as:
+.br
+ * `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.
+.br
+ * `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.
+.br
+* pointer: are formatted as address giving the pointer address (32 or 64 bit depending on platforms).
+.br
+* string lists: formatted as val1,val2[,...]. Each value can also use file@FILE syntax.
+.br
+* integer lists: formatted as val1,val2[,...]
+.br
+Note: The special characters in property formats (0x,/,-,+I,-I,x) cannot be configured.
+.br
+.SH Filter declaration [FILTER]
+.LP
+.br
+.P
+.B
+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)
+.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.
+.br
+
+.br
+  
+.br
+When string parameters are used (eg URLs), it is recommended to escape the string using the keyword gpac.  
+.br
+Example
+.br
+filter:ARG=http://foo/bar?yes:gpac:opt=VAL
+.br
+
+.br
+This will properly extract the URL.
+.br
+Example
+.br
+filter:ARG=http://foo/bar?yes:opt=VAL
+.br
+
+.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://)
+.br
+For tcp:// and udp:// protocols, the escape is not needed if a trailing / is appended after the port number.
+.br
+Example
+.br
+-i tcp://127.0.0.1:1234:OPT
+.br
+
+.br
+This will fail to extract the URL and options.
+.br
+Example
+.br
+-i tcp://127.0.0.1:1234/:OPT
+.br
+
+.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.
+.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
+.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
+Example
+.br
+"src=file.mp4" or "-src file.mp4" or  "-i file.mp4"
+.br
+
+.br
+This will find a filter (for example fin) able to load file.mp4. The same result can be achieved by using fin:src=file.mp4.
+.br
+Example
+.br
+"dst=dump.yuv" or "-dst dump.yuv" or "-o dump.yuv"
+.br
+
+.br
+This will dump the video content in dump.yuv. The same result can be achieved by using fout:dst=dump.yuv.
+.br
+
+.br
+Specific source or sink filters may also be specified using filterName:src=URL or filterName:dst=URL.
+.br
+
+.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
+There is a special option called gfreg which allows specifying preferred filters to use when handling URLs.
+.br
+Example
+.br
+src=file.mp4:gfreg=ffdmx,ffdec
+.br
+
+.br
+This will use ffdmx to read file.mp4 and ffdec to decode it.
+.br
+This can be used to test a specific filter when alternate filter chains are possible.
+.br
+.P
+.B
+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:
+.br
+* c=NAME: identifes 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
+* g=UINT, gop=UINT: indicates the GOP size in frames
+.br
+* pfmt=NAME: indicates the target pixel format name (see properties (-h props) ) of the source, if supported by codec
+.br
+* all_intra=BOOL: indicates all frames should be intra frames, if supported by codec
+.br
+
+.br
+  
+.br
+Other options will be passed to the filter if it accepts generic argument parsing (as is the case for ffmpeg).
+.br
+Example
+.br
+src=dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true dst=raw.264
+.br
+
+.br
+This creates a 25 fps AVC at 175kbps with a gop duration of 2 seconds, using closed gop and fast encoding settings for ffmpeg.
+.br
+
+.br
+The inverse operation (forcing a decode to happen) is possible using the reframer filter.
+.br
+Example
+.br
+src=file.mp4 reframer:raw @ -o null
+.br
+
+.br
+This will force decoding media from file.mp4 and trash (send to null) the result (doing a decoder benchmark for example).
+.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).
+.br
+Example
+.br
+f:a=foo:b=bar
+.br
+
+.br
+This will set option a to foo and option b to bar on the filter.
+.br
+Example
+.br
+f::a=foo:b=bar
+.br
+
+.br
+This will set option a to foo:b=bar on the filter.
+.br
+Example
+.br
+f:a=foo::b=bar:c::d=fun
+.br
+
+.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]
+.LP
+.br
+.P
+.B
+Quick links
+.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, ...).
+.br
+Only the last link directive occuring before a filter is used to setup links for that filter.
+.br
+Example
+.br
+fA fB @1 fC
+.br
+
+.br
+This indicates to direct fA outputs to fC.
+.br
+Example
+.br
+fA fB @1 @0 fC
+.br
+
+.br
+This indicates to direct fB outputs to fC, @1 is ignored.
+.br
+
+.br
+If no link directives are given, the links will be dynamically solved to fullfill as many connections as possible (see below).
+.br
+Warning: This means that fA fB fC and fA fB @ fC will likely not give the same result.
+.br
+
+.br
+.P
+.B
+Complex links
+.br
+The link directive is just a quick shortcut to set the following arguments:
+.br
+- FID=name, which assigns an identifier to the filter
+.br
+- SID=name1[,name2...], which set a list of filter identifiers , or sourceIDs, restricting the list of possible inputs for a filter.
+.br
+
+.br
+Example
+.br
+fA fB @1 fC
+.br
+
+.br
+This is equivalent to fA:FID=1 fB fC:SID=1.
+.br
+Link directives specify which source a filter can accept connections from. They do not specifiy which destination a filter can connect to.
+.br
+Example
+.br
+fA:FID=1 fB fC:SID=1
+.br
+
+.br
+This indicates that fC only accpets input from fA, but fB might accept inputs from fA.
+.br
+Example
+.br
+fA:FID=1 fB:FID=2 fC:SID=1 fD:SID=1,2
+.br
+
+.br
+This indicates that fD only accepts input from fA and fB and fC only from fA
+.br
+Note: A filter with sourceID set cannot get input from filters with no IDs.
+.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
+.br
+* name#P4CC=VAL: accepts only PIDs with property matching VAL.
+.br
+* name#PName=VAL: same as above, using the builtin name corresponding to the property.
+.br
+* name#AnyName=VAL: same as above, using the name of a non built-in property.
+.br
+If the property is not defined on the PID, the property is matched. Otherwise, its value is checked against the given value.
+.br
+
+.br
+The following modifiers for comparisons are allowed (for both P4CC=, PName= and AnyName=):
+.br
+* name#P4CC=!VAL: accepts only PIDs with property NOT matching VAL.
+.br
+* name#P4CC-VAL: accepts only PIDs with property strictly less than VAL (only for 1-dimension number properties).
+.br
+* name#P4CC+VAL: accepts only PIDs with property strictly greater than VAL (only for 1-dimension number properties).
+.br
+
+.br
+A sourceID name can also use wildcard or be empty to match a property regardless of the source filter.
+.br
+Example
+.br
+fA fB:SID=*#ServiceID=2
+.br
+
+.br
+Example
+.br
+fA fB:SID=#ServiceID=2
+.br
+
+.br
+This indicates to match connection between fA and fB only for PIDs with a ServiceID property of 2.
+.br
+These extensions also work with the LINK @ shortcut.
+.br
+Example
+.br
+fA fB @1#video fC
+.br
+
+.br
+This indicates to direct fA video outputs to fC.
+.br
+Example
+.br
+src=img.heif @#ItemID=200 vout
+.br
+
+.br
+This indicates to connect to vout only PIDs with ItemID property equal to 200.
+.br
+Example
+.br
+src=vid.mp4 @#PID=1 vout
+.br
+
+.br
+This indicates to connect to vout only PIDs with ID property equal to 1.
+.br
+Example
+.br
+src=vid.mp4 @#Width=640 vout
+.br
+
+.br
+This indicates to connect to vout only PIDs with Width property equal to 640.
+.br
+Example
+.br
+src=vid.mp4 @#Width-640 vout
+.br
+
+.br
+This indicates to connect to vout only PIDs with Width property less than 640
+.br
+
+.br
+Multiple fragment can be specified to check for multiple PID properties.
+.br
+Example
+.br
+src=vid.mp4 @#Width=640#Height+380 vout
+.br
+
+.br
+This indicates to connect to vout only PIDs with Width property equal to 640 and Height greater than 380.
+.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.
+.br
+Example
+.br
+src=file.mp4 @ reframer dst=dump.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.
+.br
+Example
+.br
+src=file.mp4 reframer @ dst=dump.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.
+.br
+.SH Arguments inheriting
+.LP
+.br
+Unless explicitly disabled (see -max-chain), 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.
+.br
+Example
+.br
+src=file.mp4:OPT dst=file.aac dst=file.264
+.br
+
+.br
+This will pass the :OPT to all filters loaded between the source and the two destinations.
+.br
+Example
+.br
+src=file.mp4 dst=file.aac:OPT dst=file.264
+.br
+
+.br
+This will pass the :OPT to all filters loaded between the source and the file.aac destination.
+.br
+Note: the destination arguments inherited are the arguments placed AFTER the dst= option.
+.br
+Example
+.br
+src=file.mp4 fout:OPTFOO:dst=file.aac:OPTBAR
+.br
+
+.br
+This will pass the :OPTBAR to all filters loaded between file.mp4 source and file.aac destination, but not OPTFOO.
+.br
+Arguments inheriting can be stopped by using the keyword gfloc: arguments after the keyword will not be inherited.
+.br
+Example
+.br
+src=file.mp4 dst=file.aac:OPTFOO:gfloc:OPTBAR dst=file.264
+.br
+
+.br
+This will pass the :OPTFOO to all filters loaded between file.mp4source 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.
+.br
+Example
+.br
+src=file.mp4 dst=file.aac:OPTFOO:gfopt:OPTBAR dst=file.264
+.br
+
+.br
+This will warn if OPTFOO is not consumed, but will not track OPTBAR.
+.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 $
+.br
+KEYWORD is case sensitive, and may be present multiple times in the string. Supported KEYWORD are:
+.br
+* num: replaced by file number if defined, 0 otherwise
+.br
+* PID: ID of the source PID
+.br
+* URL: URL of source file
+.br
+* File: path on disk for source file
+.br
+* p4cc=ABCD: uses PID property with 4CC value ABCD
+.br
+* pname=VAL: uses PID property with name VAL
+.br
+* OTHER: locates property 4CC for the given name, or property name if no 4CC matches.
+.br
+
+.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
+.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.
+.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:
+.br
+Example
+.br
+src=img.heif dst=dump_$ItemID$.jpg
+.br
+
+.br
+In this case, only one item (likely the first declared in the file) will connect to the destination.
+.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:
+.br
+Example
+.br
+src=img.heif dst=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
+.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.
+.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.
+.br
+Example
+.br
+src=source.ts dst=file_$ServiceID$.mp4:SID=*#ServiceID=*
+.br
+
+.br
+Example
+.br
+src=source.ts dst=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
+.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.
+.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).
+.br
+Non built-in properties are parsed as follows:
+.br
+- file@FOO will be declared as string with a value set to the content of FOO.
+.br
+- bxml@FOO will be declared as data with a value set to the binarized content of FOO.
+.br
+- FOO will be declared as string with a value set to FOO.
+.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
+Example
+.br
+-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.
+.br
+
+.br
+PID properties may be conditionally assigned by checking other PID properties. The syntax uses paranthesis (not configurable) after the property assignment sign:
+.br
+#Prop=(CP=CV)VAL
+.br
+This will assign PID property Prop to VAL for PIDs with property CP equal to CV.
+.br
+#Prop=(CP=CV)VAL,(CP2=CV2)VAL2
+.br
+This will assign PID property Prop to VAL for PIDs with property CP equal to CV, and to VAL2 for PIDs with property CP2 equal to CV2.
+.br
+#Prop=(CP=CV)(CP2=CV2)VAL
+.br
+This will assign PID property Prop to VAL for PIDs with property CP equal to CV and property CP2 equal to CV2.
+.br
+#Prop=(CP=CV)VAL,()DEFAULT
+.br
+This will assign PID property Prop to VAL for PIDs with property CP equal to CV, or to DEFAULT for other PIDs.
+.br
+The condition syntax is the same as source ID fragment syntax.
+.br
+Note: When set, the default value (empty condition) always matches the PID, therefore it should be placed last in the list of conditions.
+.br
+Example
+.br
+gpac -i source.mp4:#MyProp=(audio)"Super Audio",(video)"Super Video"
+.br
+
+.br
+This will assign property MyProp to Super Audio for audio PIDs and to Super Video for video PIDs.
+.br
+Example
+.br
+gpac -i source.mp4:#MyProp=(audio1)"Super Audio"
+.br
+
+.br
+This will assign property MyProp to Super Audio for first audio PID declared.
+.br
+Example
+.br
+gpac -i source.mp4:#MyProp=(Width+1280)HD
+.br
+
+.br
+This will assign property MyProp to HD for PIDs with property Width greater than 1280.
+.br
+.SH Using option files
+.LP
+.br
+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.
+.br
+Warning: Only local files are allowed.
+.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.
+.br
+Options in an option file may point to other option files, with a maximum redirection level of 5.
+.br
+An option file declaration (filter:myopts.txt) follows the same inheritance rules as regular options.
+.br
+Example
+.br
+src=source.mp4:myopts.txt:foo=bar dst
+.br
+
+.br
+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.
+.br
+.SH Specific filter options
+.LP
+.br
+Some specific keywords are replaced when processing filter options.
+.br
+Warning: These keywords do not apply to PID properties. Multiple keywords cannot be defined for a single option.
+.br
+Defined keywords:
+.br
+* $GSHARE: replaced by system path to GPAC shared directory (e.g. /usr/share)
+.br
+* $GJS: replaced by the first path specified by global config option -js-dirs that contains the file name following the macro, e.g. $GJS/source.js
+.br
+* $GLANG: replaced by the global config language option -lang
+.br
+* $GUA: replaced by the global config user agent option -user-agent
+.br
+* $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.
+.br
+
+.br
+The $GINC construct can be used to dynamically assign numbers in filter chains:
+.br
+Example
+.br
+gpac -i source.ts tssplit @#ServiceID= -o dump_$GINC(10,2).ts
+.br
+
+.br
+This will dump first service in dump_10.ts, second service in dump_12.ts, etc...
+.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 -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.
+.br
+
+.br
+.SH GPAC Built-in properties
+.LP
+.br
+Built-in property types
+.br
+.TP
+.B sint
+.br
+signed 32 bit integer
+.br
+.TP
+.B uint
+.br
+unsigned 32 bit integer
+.br
+.TP
+.B lsint
+.br
+signed 64 bit integer
+.br
+.TP
+.B luint
+.br
+unsigned 32 bit integer
+.br
+.TP
+.B bool
+.br
+boolean
+.br
+.TP
+.B frac
+.br
+32/32 bit fraction
+.br
+.TP
+.B lfrac
+.br
+64/64 bit fraction
+.br
+.TP
+.B flt
+.br
+32 bit float number
+.br
+.TP
+.B dbl
+.br
+64 bit float number
+.br
+.TP
+.B v2di
+.br
+2D 32-bit integer vector
+.br
+.TP
+.B v2df
+.br
+2D 32-bit float vector
+.br
+.TP
+.B v3di
+.br
+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
+.br
+.TP
+.B mem
+.br
+data buffer
+.br
+.TP
+.B cstr
+.br
+const UTF-8 string
+.br
+.TP
+.B cmem
+.br
+const data buffer
+.br
+.TP
+.B ptr
+.br
+32 or 64 bit pointer
+.br
+.TP
+.B strl
+.br
+UTF-8 string list
+.br
+
+.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)
+.br
+.TP
+.B ID (PIDI,uint,  )
+.br
+Stream ID
+.br
+.TP
+.B ESID (ESID,uint,D )
+.br
+MPEG-4 ESID of pid
+.br
+.TP
+.B ItemID (ITID,uint,  )
+.br
+ID of image item in HEIF, same value as ID
+.br
+.TP
+.B ServiceID (PSID,uint,D )
+.br
+ID of parent service
+.br
+.TP
+.B ClockID (CKID,uint,D )
+.br
+ID of clock reference pid
+.br
+.TP
+.B DependencyID (DPID,uint,  )
+.br
+ID of layer dependended on
+.br
+.TP
+.B SubLayer (DPSL,bool,  )
+.br
+pid is a sublayer of the stream depended on rather than an enhancement layer
+.br
+.TP
+.B PlaybackMode (PBKM,uint,D )
+.br
+Playback mode supported:
+.br
+* 0: no time control
+.br
+* 1: play/pause/seek,speed=1
+.br
+* 2: play/pause/seek,speed>=0
+.br
+* 3: play/pause/seek, reverse playback
+.br
+.TP
+.B Scalable (SCAL,bool,  )
+.br
+Scalable stream
+.br
+.TP
+.B TileBase (SABT,bool,  )
+.br
+Tile base stream
+.br
+.TP
+.B Language (LANG,cstr,  )
+.br
+Language code: ISO639 2/3 character code or RFC 4646
+.br
+.TP
+.B ServiceName (SNAM,str,D )
+.br
+Name of parent service
+.br
+.TP
+.B ServiceProvider (SPRO,str,D )
+.br
+Provider of parent service
+.br
+.TP
+.B StreamType (PMST,uint,  )
+.br
+Media stream type
+.br
+.TP
+.B StreamSubtype (PSST,uint,D )
+.br
+Media subtype 4CC (auxiliary, pic sequence, etc ..)
+.br
+.TP
+.B ISOMSubtype (PIST,uint,D )
+.br
+ISOM media subtype 4CC (avc1 avc2...)
+.br
+.TP
+.B OrigStreamType (POST,uint,  )
+.br
+Original stream type before encryption
+.br
+.TP
+.B CodecID (POTI,uint,  )
+.br
+Codec ID (MPEG-4 OTI or ISOBMFF 4CC)
+.br
+.TP
+.B InitialObjectDescriptor (PIOD,bool,  )
+.br
+Indicates if 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)
+.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)
+.br
+.TP
+.B LATM (LATM,bool,  )
+.br
+Indicates media is unframed AAC in LATM format
+.br
+.TP
+.B Duration (PDUR,lfrac,  )
+.br
+Media duration
+.br
+.TP
+.B NumFrames (NFRM,uint,D )
+.br
+Number of frames in the stream
+.br
+.TP
+.B ConstantFrameSize (CFRS,uint,  )
+.br
+Size of the frames for constant frame size streams
+.br
+.TP
+.B TimeshiftDepth (PTSD,frac,D )
+.br
+Depth of the timeshift buffer
+.br
+.TP
+.B TimeshiftTime (PTST,dbl,D )
+.br
+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)
+.br
+.TP
+.B Timescale (TIMS,uint,  )
+.br
+Media timescale (a timestamp delta of N is N/timescale seconds)
+.br
+.TP
+.B ProfileLevel (PRPL,uint,D )
+.br
+MPEG-4 profile and level
+.br
+.TP
+.B DecoderConfig (DCFG,mem,  )
+.br
+Decoder configuration data
+.br
+.TP
+.B DecoderConfigEnhancement (ECFG,mem,  )
+.br
+Decoder configuration data of the enhancement layer(s). Also used by 3GPP/Apple text streams to give the full sample description table used in SDP.
+.br
+.TP
+.B DecoderConfigIndex (ICFG,uint,  )
+.br
+1-based index of decoder config for ISO base media files
+.br
+.TP
+.B SampleRate (AUSR,uint,  )
+.br
+Audio sample rate
+.br
+.TP
+.B SamplesPerFrame (FRMS,uint,  )
+.br
+Number of audio sample in one coded frame
+.br
+.TP
+.B NumChannels (CHNB,uint,  )
+.br
+Number of audio channels
+.br
+.TP
+.B BPS (ABPS,uint,  )
+.br
+Number of bits per sample in compressed source
+.br
+.TP
+.B ChannelLayout (CHLO,luint,  )
+.br
+Channel Layout mask
+.br
+.TP
+.B AudioFormat (AFMT,afmt,  )
+.br
+Audio sample format
+.br
+.TP
+.B AudioPlaybackSpeed (ASPD,dbl,D )
+.br
+Audio playback speed, only used for audio output reconfiguration
+.br
+.TP
+.B Delay (MDLY,sint,  )
+.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
+.TP
+.B CTSShift (MDTS,uint,  )
+.br
+CTS offset to apply in case of negative ctts
+.br
+.TP
+.B Width (WIDT,uint,  )
+.br
+Visual Width (video / text / graphics)
+.br
+.TP
+.B Height (HEIG,uint,  )
+.br
+Visual Height (video / text / graphics)
+.br
+.TP
+.B PixelFormat (PFMT,pfmt,  )
+.br
+Pixel format
+.br
+.TP
+.B PixelFormatWrapped (PFMW,pfmt,  )
+.br
+Underlying pixel format of video stream if pixel format is external GL texture
+.br
+.TP
+.B Stride (VSTY,uint,  )
+.br
+Image or Y/alpha plane stride
+.br
+.TP
+.B StrideUV (VSTC,uint,  )
+.br
+UV plane or U/V planes stride
+.br
+.TP
+.B BitDepthLuma (YBPS,uint,  )
+.br
+Bit depth for luma components
+.br
+.TP
+.B BitDepthChroma (CBPS,uint,  )
+.br
+Bit depth for chroma components
+.br
+.TP
+.B FPS (VFPF,frac,  )
+.br
+Video framerate
+.br
+.TP
+.B Interlaced (VILC,bool,  )
+.br
+Video is interlaced
+.br
+.TP
+.B SAR (PSAR,frac,  )
+.br
+Sample (ie pixel) aspect ratio
+.br
+.TP
+.B PAR (VPAR,frac,D )
+.br
+Picture aspect ratio
+.br
+.TP
+.B MaxWidth (MWID,uint,  )
+.br
+Maximum width (video / text / graphics) of all enhancement layers
+.br
+.TP
+.B MaxHeight (MHEI,uint,  )
+.br
+Maximum height (video / text / graphics) of all enhancement layers
+.br
+.TP
+.B ZOrder (VZIX,uint,  )
+.br
+Z-order of the video, from 0 (first) to max int (last)
+.br
+.TP
+.B TransX (VTRX,sint,  )
+.br
+Horizontal translation of the video
+.br
+.TP
+.B TransY (VTRY,sint,  )
+.br
+Vertical translation of the video
+.br
+.TP
+.B Hidden (HIDE,bool,  )
+.br
+Indicates the PID is hidden in visual/audio rendering
+.br
+.TP
+.B CropOrigin (VCXY,v2di,  )
+.br
+Position in source window, X,Y indicates coord in source
+.br
+.TP
+.B OriginalSize (VOWH,v2di,  )
+.br
+Original resolution of video
+.br
+.TP
+.B SRD (SRD ,v4di,  )
+.br
+Position and size of the video in the referential given by SRDRef
+.br
+.TP
+.B SRDRef (SRDR,v2di,  )
+.br
+Width and Height of the SRD referential
+.br
+.TP
+.B SRDMap (SRDM,uintl,  )
+.br
+Mapping of input videos in reconstructed video, expressed as {Ox,Oy,Ow,Oh,Dx,Dy,Dw,Dh} per input, with:
+.br
+* Ox,Oy,Ow,Oh: position and size of the input video (usually matching its SRD property), expressed in the output referential given by SRDRef
+.br
+* Dx,Dy,Dw,Dh: Position and Size of the input video in the reconstructed output, expressed in the output referential given by SRDRef
+.br
+.TP
+.B Alpha (VALP,bool,  )
+.br
+Indicates the video in this pid is an alpha map
+.br
+.TP
+.B Bitrate (RATE,uint,  )
+.br
+Bitrate in bps
+.br
+.TP
+.B Maxrate (MRAT,uint,  )
+.br
+Max bitrate in bps
+.br
+.TP
+.B DBSize (DBSZ,uint,  )
+.br
+Decode buffer size in bytes
+.br
+.TP
+.B MediaDataSize (MDSZ,luint,D )
+.br
+Size in bytes of media data
+.br
+.TP
+.B DataRef (DREF,bool,D )
+.br
+Data referencing is possible (each compressed frame is a continuous set of bytes in source, with no transformation)
+.br
+.TP
+.B URL (FURL,str,D )
+.br
+URL of source
+.br
+.TP
+.B RemoteURL (RURL,str,D )
+.br
+Remote URL of source - used for MPEG-4 systems
+.br
+.TP
+.B RedirectURL (RELO,str,D )
+.br
+Redirection URL of source
+.br
+.TP
+.B SourcePath (FSRC,str,D )
+.br
+Path of source file on file system
+.br
+.TP
+.B MIMEType (MIME,str,D )
+.br
+MIME type of source
+.br
+.TP
+.B Extension (FEXT,str,D )
+.br
+File extension of source
+.br
+.TP
+.B Cached (CACH,bool,D )
+.br
+indicates the 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)
+.br
+.TP
+.B DownloadSize (DLSZ,luint,D )
+.br
+Size of resource in bytes
+.br
+.TP
+.B DownBytes (DLBD,luint,D )
+.br
+Number of bytes downloaded - changes are signaled through pid info (no reconfigure)
+.br
+.TP
+.B ByteRange (FBRA,lfrac,D )
+.br
+Byte range of resource
+.br
+.TP
+.B DisableProgressive (NPRG,uint,  )
+.br
+indicates that some blocks in file need patching (replace or insertion) upon closing, potentially disabling progressive upload
+.br
+.TP
+.B IsoAltBrands (ABRD,uintl,D )
+.br
+indicates ISOBMFF brands associated with PID/file
+.br
+.TP
+.B IsoBrand (MBRD,uint,D )
+.br
+indicates ISOBMFF major brand associated with PID/file
+.br
+.TP
+.B MovieTime (MHTS,lfrac,D )
+.br
+indicates ISOBMFF movie header duration and timescale
+.br
+.TP
+.B HasSync (PSYN,bool,D )
+.br
+indicates ISOBMFF track has sync points
+.br
+.TP
+.B ServiceWidth (DWDT,uint,D )
+.br
+Display width of service
+.br
+.TP
+.B ServiceHeight (DHGT,uint,D )
+.br
+Display height of service
+.br
+.TP
+.B CarouselRate (CARA,uint,D )
+.br
+Repeat rate in ms for systems carousel data
+.br
+.TP
+.B UTC (UTCD,luint,D )
+.br
+UTC date and time of PID
+.br
+.TP
+.B UTCTimestamp (UTCT,luint,D )
+.br
+Timestamp corresponding to UTC date and time
+.br
+.TP
+.B AudioVolume (AVOL,uint,D )
+.br
+Volume of audio
+.br
+.TP
+.B AudioPan (APAN,uint,D )
+.br
+Balance/Pan of audio
+.br
+.TP
+.B AudioPriority (APRI,uint,D )
+.br
+Audio thread priority
+.br
+.TP
+.B ProtectionScheme (SCHT,uint,  )
+.br
+Protection scheme type (4CC) used
+.br
+.TP
+.B SchemeVersion (SCHV,uint,  )
+.br
+Protection scheme version used
+.br
+.TP
+.B SchemeURI (SCHU,str,  )
+.br
+Protection scheme URI
+.br
+.TP
+.B KMS_URI (KMSU,str,  )
+.br
+URI for key management system
+.br
+.TP
+.B SelectiveEncryption (ISSE,bool,  )
+.br
+Indicates if ISMA/OMA selective encryption is used
+.br
+.TP
+.B IVLength (ISIV,uint,  )
+.br
+ISMA IV size
+.br
+.TP
+.B KILength (ISKI,uint,  )
+.br
+ISMA KeyIndication size
+.br
+.TP
+.B CryptType (OMCT,uint,  )
+.br
+OMA encryption type
+.br
+.TP
+.B ContentID (OMID,str,  )
+.br
+OMA Content ID
+.br
+.TP
+.B TextualHeaders (OMTH,str,  )
+.br
+OMA textual headers
+.br
+.TP
+.B PlaintextLen (OMPT,luint,  )
+.br
+OMA size of plaintext data
+.br
+.TP
+.B CryptInfo (ECRI,str,D )
+.br
+URL (local file only) of crypt info file for this pid
+.br
+.TP
+.B DecryptInfo (EDRI,str,D )
+.br
+URL (local file only) of crypt info file for this pid - see decrypter help
+.br
+.TP
+.B SenderNTP (NTPS,luint,DP)
+.br
+NTP time at sender side or grabber side
+.br
+.TP
+.B ReceiverNTP (NTPR,luint,DP)
+.br
+Receiver NTP time (usually associated with the sender NTP property)
+.br
+.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)
+.br
+.TP
+.B OMAPreview (ODPR,luint,  )
+.br
+OMA Preview range 
+.br
+.TP
+.B CENC_PSSH (PSSH,mem,  )
+.br
+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]
+.br
+.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]
+.br
+.TP
+.B KID (SKID,mem,  )
+.br
+Key ID for packets of the PID - changes are signaled through pid_set_info (no reconfigure)
+.br
+.TP
+.B IVSize (SAIV,uint,  )
+.br
+IV size for packets of the PID
+.br
+.TP
+.B ConstantIV (CBIV,mem,  )
+.br
+Constant IV for packets of the PID
+.br
+.TP
+.B CENCPattern (CPTR,frac,  )
+.br
+CENC crypt pattern, CENC pattern, skip as frac.num crypt as frac.den
+.br
+.TP
+.B CENCStore (CSTR,uint,  )
+.br
+Storage location 4CC of SAI data
+.br
+.TP
+.B CENCstsdMode (CSTM,uint,  )
+.br
+Mode for CENC sample description when using clear samples:
+.br
+* 0: single sample description is used
+.br
+* 1: a clear clone of the sample description is created, inserted before the CENC sample description
+.br
+* 2: a clear clone of the sample description is created, inserted after the CENC sample description
+.br
+.TP
+.B AMRModeSet (AMST,uint,  )
+.br
+ModeSet for AMR and AMR-WideBand
+.br
+.TP
+.B SubSampleInfo (SUBS,mem,  )
+.br
+Binary blob describing N subsamples of the sample, formatted as N [(u32)flags(u32)size(u32)reserved(u8)priority(u8) discardable]
+.br
+.TP
+.B NALUMaxSize (NALS,uint,  )
+.br
+Max size of NAL units in stream - changes are signaled through pid_set_info (no reconfigure)
+.br
+.TP
+.B FileNumber (FNUM,uint, P)
+.br
+Index of file when dumping to files
+.br
+.TP
+.B FileName (FNAM,str, P)
+.br
+Name of output file when dumping / dashing. Must be set on first packet belonging to new file
+.br
+.TP
+.B IDXName (INAM,str, P)
+.br
+Name of index file when dashing MPEG-2 TS. Must be set on first packet belonging to new file
+.br
+.TP
+.B FileSuffix (FSUF,str, P)
+.br
+File suffix name, replacement for $FS$ in tile templates
+.br
+.TP
+.B EODS (EODS,bool, P)
+.br
+End of DASH segment
+.br
+.TP
+.B MaxFrameSize (MFRS,uint,D )
+.br
+Max size of frame in stream - changes are signaled through pid_set_info (no reconfigure)
+.br
+.TP
+.B AvgFrameSize (AFRS,uint,D )
+.br
+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)
+.br
+.TP
+.B MaxCTSOffset (MCTO,uint,D )
+.br
+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)
+.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
+.br
+.TP
+.B TrexTemplate (ITXT,mem,D )
+.br
+ISOBMFF serialized trex box for this PID - used by isomuxer to remux empty init segments
+.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
+.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
+.br
+.TP
+.B TrackHandler (IHDL,str,D )
+.br
+ISOBMFF track handler name
+.br
+.TP
+.B TrackFlags (ITKF,uint,D )
+.br
+ISOBMFF track header flags
+.br
+.TP
+.B TrackMatrix (ITKM,uintl,D )
+.br
+ISOBMFF track header matrix
+.br
+.TP
+.B Period (PEID,str,D )
+.br
+ID of DASH period
+.br
+.TP
+.B PStart (PEST,dbl,D )
+.br
+DASH Period start - cf dasher help
+.br
+.TP
+.B PDur (PEDU,dbl,D )
+.br
+DASH Period duration - cf dasher help
+.br
+.TP
+.B Representation (DRID,str,D )
+.br
+ID of DASH representation
+.br
+.TP
+.B ASID (DAID,uint,D )
+.br
+ID of parent DASH AS
+.br
+.TP
+.B MuxSrc (MSRC,str,D )
+.br
+Name of mux source(s), set by dasher to direct its outputs
+.br
+.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
+.br
+.TP
+.B DashDur (DDUR,dbl,D )
+.br
+DASH target segment duration in seconds to muxer if any, set by dasher
+.br
+.TP
+.B Role (ROLE,strl,D )
+.br
+List of roles for this pid
+.br
+.TP
+.B PDesc (PDES,strl,D )
+.br
+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
+.br
+.TP
+.B ASCDesc (AADS,strl,D )
+.br
+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
+.br
+.TP
+.B BUrl (BURL,strl,D )
+.br
+List of base URLs for this pid
+.br
+.TP
+.B Template (DTPL,str,D )
+.br
+Template to use for DASH generation for this pid
+.br
+.TP
+.B StartNumber (DRSN,uint,D )
+.br
+Start number to use for this pid - cf dasher help
+.br
+.TP
+.B xlink (XLNK,str,D )
+.br
+Remote period URL for DASH - cf dasher help
+.br
+.TP
+.B CDur (DCMD,dbl,D )
+.br
+Max media duration to process from pid in DASH mode
+.br
+.TP
+.B HLSPL (HLVP,str,D )
+.br
+Name of the HLS variant playlist for this media
+.br
+.TP
+.B DCue (DCUE,str,D )
+.br
+Name of a cue list file for this pid - see dasher help
+.br
+.TP
+.B DSegs (DCNS,uint,D )
+.br
+Number of DASH segments defined by the DASH cue info
+.br
+.TP
+.B SingleScale (DSTS,bool,D )
+.br
+Indicates the 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)
+.br
+.TP
+.B Primary (PITM,bool,D )
+.br
+Indicates this is a primary item in isobmf
+.br
+.TP
+.B ColorPrimaries (CPRM,uint,D )
+.br
+Indicate color primaries for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+.br
+.TP
+.B ColorTransfer (CTRC,uint,D )
+.br
+Indicate color transfer characteristics for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+.br
+.TP
+.B ColorMatrixCoef (CMXC,uint,D )
+.br
+Indicate color matrix coeficient for a visual pid (see ISO/IEC 23001-8 / 23091-2)
+.br
+.TP
+.B FullRange (CFRA,uint,D )
+.br
+Indicate color full range flag for a visual pid (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)
+.br
+.TP
+.B SrcMagic (PSMG,luint,D )
+.br
+Indicate a magic number to store in the track, only used by importers
+.br
+.TP
+.B TrackIndex (TIDX,luint,D )
+.br
+Indicate target track index in destination file, stored by lowest value first (not set by demuxers)
+.br
+.TP
+.B NoTSLoop (NTSL,bool,  )
+.br
+Indicate the timestamps on this PID are adjusted in case of loops (used by TS muxer output)
+.br
+.TP
+.B FragStart (PFRB,uint,D )
+.br
+Indicate if packet is a fragment start (value 1) or a segment start (value 2)
+.br
+.TP
+.B FragRange (PFRR,lfrac,D )
+.br
+Indicate start and end position in bytes of fragment if packet is a fragment or segment start
+.br
+.TP
+.B SIDXRange (PFSR,lfrac,D )
+.br
+Indicate start and end position in bytes of sidx if packet is a fragment or segment start
+.br
+.TP
+.B MoofTemplate (MFTP,mem,D )
+.br
+Serialized moof box corresponding to the start of a movie fragment or segment (with styp and optionally sidx)
+.br
+.TP
+.B RawGrab (PGRB,bool,D )
+.br
+Indicate 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)
+.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
+.br
+.SH Pixel formats
+.LP
+.br
+.TP
+.B yuv420 (ext *.yuv)
+.br
+Planar YUV 420 8 bit
+.br
+.TP
+.B yuv420_10 (ext *.yuvl)
+.br
+Planar YUV 420 10 bit
+.br
+.TP
+.B yuv422 (ext *.yuv2)
+.br
+Planar YUV 422 8 bit
+.br
+.TP
+.B yuv422_10 (ext *.yp2l)
+.br
+Planar YUV 422 10 bit
+.br
+.TP
+.B yuv444 (ext *.yuv4)
+.br
+Planar YUV 444 8 bit
+.br
+.TP
+.B yuv444_10 (ext *.yp4l)
+.br
+Planar YUV 444 10 bit
+.br
+.TP
+.B uyvy (ext *.uyvy)
+.br
+Planar UYVY 422 8 bit
+.br
+.TP
+.B vyuy (ext *.vyuy)
+.br
+Planar VYUV 422 8 bit
+.br
+.TP
+.B yuyv (ext *.yuyv)
+.br
+Planar YUYV 422 8 bit
+.br
+.TP
+.B yvyu (ext *.yvyu)
+.br
+Planar YVYU 422 8 bit
+.br
+.TP
+.B nv12 (ext *.nv12)
+.br
+Semi-planar YUV 420 8 bit, Y plane and UV plane
+.br
+.TP
+.B nv21 (ext *.nv21)
+.br
+Semi-planar YUV 420 8 bit, Y plane and VU plane
+.br
+.TP
+.B nv1l (ext *.nv1l)
+.br
+Semi-planar YUV 420 10 bit, Y plane and UV plane
+.br
+.TP
+.B nv2l (ext *.nv2l)
+.br
+Semi-planar YUV 420 8 bit, Y plane and VU plane
+.br
+.TP
+.B yuva (ext *.yuva)
+.br
+Planar YUV+alpha 420 8 bit
+.br
+.TP
+.B yuvd (ext *.yuvd)
+.br
+Planar YUV+depth  420 8 bit
+.br
+.TP
+.B yuv444a (ext *.yp4a)
+.br
+Planar YUV+alpha 444 8 bit
+.br
+.TP
+.B grey (ext *.grey)
+.br
+Greyscale 8 bit
+.br
+.TP
+.B algr (ext *.algr)
+.br
+Alpha+Grey 8 bit
+.br
+.TP
+.B gral (ext *.gral)
+.br
+Grey+Alpha 8 bit
+.br
+.TP
+.B rgb4 (ext *.rgb4)
+.br
+RGB 444, 12 bits (16 stored) / pixel
+.br
+.TP
+.B rgb5 (ext *.rgb5)
+.br
+RGB 555, 15 bits (16 stored) / pixel
+.br
+.TP
+.B rgb6 (ext *.rgb6)
+.br
+RGB 555, 16 bits / pixel
+.br
+.TP
+.B rgba (ext *.rgba)
+.br
+RGBA 32 bits (8 bits / component)
+.br
+.TP
+.B argb (ext *.argb)
+.br
+ARGB 32 bits (8 bits / component)
+.br
+.TP
+.B bgra (ext *.bgra)
+.br
+BGRA 32 bits (8 bits / component)
+.br
+.TP
+.B abgr (ext *.abgr)
+.br
+ABGR 32 bits (8 bits / component)
+.br
+.TP
+.B rgb (ext *.rgb)
+.br
+RGB 24 bits (8 bits / component)
+.br
+.TP
+.B bgr (ext *.bgr)
+.br
+BGR 24 bits (8 bits / component)
+.br
+.TP
+.B xrgb (ext *.xrgb)
+.br
+xRGB 32 bits (8 bits / component)
+.br
+.TP
+.B rgbx (ext *.rgbx)
+.br
+RGBx 32 bits (8 bits / component)
+.br
+.TP
+.B xbgr (ext *.xbgr)
+.br
+xBGR 32 bits (8 bits / component)
+.br
+.TP
+.B bgrx (ext *.bgrx)
+.br
+BGRx 32 bits (8 bits / component)
+.br
+.TP
+.B rgbd (ext *.rgbd)
+.br
+RGB+depth 32 bits (8 bits / component)
+.br
+.TP
+.B rgbds (ext *.rgbds)
+.br
+RGB+depth+bit shape (8 bits / RGB component, 7 bit depth (low bits) + 1 bit shape)
+.br
+.TP
+.B rgbs (ext *.rgbs)
+.br
+RGB 24 bits stereo (side-by-side) - to be removed
+.br
+
+.br
+.TP
+.B rgbas (ext *.rgbas)
+.br
+RGBA 32 bits stereo (side-by-side) - to be removed
+.br
+
+.br
+.TP
+.B extgl (ext *.extgl)
+.br
+External OpenGL texture of unknown format, to be used with samplerExternalOES
+.br
+
+.br
+.SH Audio formats
+.LP
+.br
+.TP
+.B u8 (ext *.pc8)
+.br
+8 bit PCM
+.br
+.TP
+.B s16 (ext *.pcm)
+.br
+16 bit PCM Little Endian
+.br
+.TP
+.B s24 (ext *.s24)
+.br
+24 bit PCM
+.br
+.TP
+.B s32 (ext *.s32)
+.br
+32 bit PCM Little Endian
+.br
+.TP
+.B flt (ext *.flt)
+.br
+32-bit floating point PCM
+.br
+.TP
+.B dbl (ext *.dbl)
+.br
+64-bit floating point PCM
+.br
+.TP
+.B u8p (ext *.pc8p)
+.br
+8 bit PCM planar
+.br
+.TP
+.B s16p (ext *.pcmp)
+.br
+16 bit PCM Little Endian planar
+.br
+.TP
+.B s24p (ext *.s24p)
+.br
+24 bit PCM planar
+.br
+.TP
+.B s32p (ext *.s32p)
+.br
+32 bit PCM Little Endian planar
+.br
+.TP
+.B fltp (ext *.fltp)
+.br
+32-bit floating point PCM planar
+.br
+.TP
+.B dblp (ext *.dblp)
+.br
+64-bit floating point PCM planar
+.br
+.SH Stream types
+.LP
+.br
+.TP
+.B Visual
+.br
+Video or Image stream
+.br
+.TP
+.B Audio
+.br
+Audio stream
+.br
+.TP
+.B SceneDescription
+.br
+Scene stream
+.br
+.TP
+.B Text
+.br
+Text or subtitle stream
+.br
+.TP
+.B Metadata
+.br
+Metadata stream
+.br
+.TP
+.B File
+.br
+Raw file stream
+.br
+.TP
+.B Encrypted
+.br
+Encrypted media stream
+.br
+.TP
+.B ObjectDescriptor
+.br
+MPEG-4 ObjectDescriptor stream
+.br
+.TP
+.B ClockReference
+.br
+MPEG-4 Clock Reference stream
+.br
+.TP
+.B MPEG7
+.br
+MPEG-7 description stream
+.br
+.TP
+.B IPMP
+.br
+MPEG-4 IPMP/DRM stream
+.br
+.TP
+.B OCI
+.br
+MPEG-4 ObjectContentInformation stream
+.br
+.TP
+.B MPEGJ
+.br
+MPEG-4 JAVA stream
+.br
+.TP
+.B Interaction
+.br
+MPEG-4 Interaction Sensor stream
+.br
+.TP
+.B Font
+.br
+MPEG-4 Font stream
+.br
+.SH Codecs
+.LP
+.br
+.TP
+.B bifs
+.br
+MPEG-4 BIFS v1 Scene Description
+.br
+.TP
+.B bifs2
+.br
+MPEG-4 BIFS v2 Scene Description
+.br
+.TP
+.B bifsX
+.br
+MPEG-4 BIFS Extended Scene Description
+.br
+.TP
+.B od
+.br
+MPEG-4 ObjectDescriptor v1
+.br
+.TP
+.B od2
+.br
+MPEG-4 ObjectDescriptor v2
+.br
+.TP
+.B interact
+.br
+MPEG-4 Interaction Stream
+.br
+.TP
+.B afx
+.br
+MPEG-4 AFX Stream
+.br
+.TP
+.B font
+.br
+MPEG-4 Font Stream
+.br
+.TP
+.B syntex
+.br
+MPEG-4 Synthetized Texture
+.br
+.TP
+.B m4txt
+.br
+MPEG-4 Streaming Text
+.br
+.TP
+.B laser
+.br
+MPEG-4 LASeR
+.br
+.TP
+.B saf
+.br
+MPEG-4 Simple Aggregation Format
+.br
+.TP
+.B cmp|m4vp2
+.br
+MPEG-4 Visual part 2
+.br
+.TP
+.B 264|avc|h264
+.br
+MPEG-4 AVC|H264 Video
+.br
+.TP
+.B avcps
+.br
+MPEG-4 AVC|H264 Video Parameter Sets
+.br
+.TP
+.B svc|avc|264|h264
+.br
+MPEG-4 AVC|H264 Scalable Video Coding
+.br
+.TP
+.B mvc
+.br
+MPEG-4 AVC|H264 Multiview Video Coding
+.br
+.TP
+.B hvc|hevc|h265
+.br
+HEVC Video
+.br
+.TP
+.B lhvc|shvc|mhvc
+.br
+HEVC Video Layered Extensions
+.br
+.TP
+.B m2vs
+.br
+MPEG-2 Visual Simple
+.br
+.TP
+.B m2v
+.br
+MPEG-2 Visual Main
+.br
+.TP
+.B m2v|m2vsnr
+.br
+MPEG-2 Visual SNR
+.br
+.TP
+.B m2v|m2vspat
+.br
+MPEG-2 Visual Spatial
+.br
+.TP
+.B m2v|m2vh
+.br
+MPEG-2 Visual High
+.br
+.TP
+.B m2v|m2v4
+.br
+MPEG-2 Visual 422
+.br
+.TP
+.B m1v
+.br
+MPEG-1 Video
+.br
+.TP
+.B jpg|jpeg
+.br
+JPEG Image
+.br
+.TP
+.B png
+.br
+PNG Image
+.br
+.TP
+.B jp2|j2k
+.br
+JPEG200 Image
+.br
+.TP
+.B aac
+.br
+MPEG-4 AAC Audio
+.br
+.TP
+.B aac|aac2m
+.br
+MPEG-2 AAC Audio Main
+.br
+.TP
+.B aac|aac2l
+.br
+MPEG-2 AAC Audio Low Complexity
+.br
+.TP
+.B aac|aac2s
+.br
+MPEG-2 AAC Audio Scalable Sampling Rate
+.br
+.TP
+.B mp3|m1a
+.br
+MPEG-1 Audio
+.br
+.TP
+.B mp3|m2a
+.br
+MPEG-2 Audio
+.br
+.TP
+.B h263
+.br
+H263 Video
+.br
+.TP
+.B h263
+.br
+H263 Video
+.br
+.TP
+.B hvt1
+.br
+HEVC tiles Video
+.br
+.TP
+.B evc|evrc
+.br
+EVRC Voice
+.br
+.TP
+.B smv
+.br
+SMV Voice
+.br
+.TP
+.B qcp|qcelp
+.br
+QCELP Voice
+.br
+.TP
+.B amr
+.br
+AMR Audio
+.br
+.TP
+.B amr|amrwb
+.br
+AMR WideBand Audio
+.br
+.TP
+.B qcp|evrcpv
+.br
+EVRC (PacketVideo MUX) Audio
+.br
+.TP
+.B vc1
+.br
+SMPTE VC-1 Video
+.br
+.TP
+.B dirac
+.br
+Dirac Video
+.br
+.TP
+.B ac3
+.br
+AC3 Audio
+.br
+.TP
+.B eac3
+.br
+Enhanced AC3 Audio
+.br
+.TP
+.B dra
+.br
+DRA Audio
+.br
+.TP
+.B g719
+.br
+G719 Audio
+.br
+.TP
+.B dstca
+.br
+DTS Coherent Acoustics Audio
+.br
+.TP
+.B dtsh
+.br
+DTS-HD High Resolution Audio
+.br
+.TP
+.B dstm
+.br
+DTS-HD Master Audio
+.br
+.TP
+.B dtsl
+.br
+DTS Express low bit rate Audio
+.br
+.TP
+.B opus
+.br
+Opus Audio
+.br
+.TP
+.B eti
+.br
+DVB Event Information
+.br
+.TP
+.B svgr
+.br
+SVG over RTP
+.br
+.TP
+.B svgzr
+.br
+SVG+gz over RTP
+.br
+.TP
+.B dims
+.br
+3GPP DIMS Scene
+.br
+.TP
+.B vtt
+.br
+WebVTT Text
+.br
+.TP
+.B txt
+.br
+Simple Text Stream
+.br
+.TP
+.B mtxt
+.br
+Metadata Text Stream
+.br
+.TP
+.B mxml
+.br
+Metadata XML Stream
+.br
+.TP
+.B subs
+.br
+Subtitle text Stream
+.br
+.TP
+.B subx
+.br
+Subtitle XML Stream
+.br
+.TP
+.B tx3g
+.br
+Subtitle/text 3GPP/Apple Stream
+.br
+.TP
+.B theo|theora
+.br
+Theora Video
+.br
+.TP
+.B vorb|vorbis
+.br
+Vorbis Audio
+.br
+.TP
+.B opus
+.br
+Opus Audio
+.br
+.TP
+.B flac
+.br
+Flac Audio
+.br
+.TP
+.B spx|speex
+.br
+Speex Audio
+.br
+.TP
+.B vobsub
+.br
+VobSub Subtitle
+.br
+.TP
+.B vobsub
+.br
+VobSub Subtitle
+.br
+.TP
+.B adpcm
+.br
+AD-PCM
+.br
+.TP
+.B csvd
+.br
+IBM CSVD
+.br
+.TP
+.B alaw
+.br
+ALAW
+.br
+.TP
+.B mulaw
+.br
+MULAW
+.br
+.TP
+.B okiadpcm
+.br
+OKI ADPCM
+.br
+.TP
+.B dviadpcm
+.br
+DVI ADPCM
+.br
+.TP
+.B digistd
+.br
+DIGISTD
+.br
+.TP
+.B yamadpcm
+.br
+YAMAHA ADPCM
+.br
+.TP
+.B truespeech
+.br
+DSP TrueSpeech
+.br
+.TP
+.B g610
+.br
+GSM 610
+.br
+.TP
+.B imulaw
+.br
+IBM MULAW
+.br
+.TP
+.B ialaw
+.br
+IBM ALAW
+.br
+.TP
+.B iadpcl
+.br
+IBM ADPCL
+.br
+.TP
+.B swf
+.br
+Adobe Flash
+.br
+.TP
+.B raw
+.br
+Raw media
+.br
+.TP
+.B av1|ivf|obu|av1b
+.br
+AOM AV1 Video
+.br
+.TP
+.B vp8|ivf
+.br
+VP8 Video
+.br
+.TP
+.B vp9|ivf
+.br
+VP9 Video
+.br
+.TP
+.B vp10|ivf
+.br
+VP10 Video
+.br
+.TP
+.B prores|apch
+.br
+ProRes Video 422 HQ
+.br
+.TP
+.B prores|apco
+.br
+ProRes Video 422 Proxy
+.br
+.TP
+.B prores|apcn
+.br
+ProRes Video 422 STD
+.br
+.TP
+.B prores|apcs
+.br
+ProRes Video 422 LT
+.br
+.TP
+.B prores|ap4x
+.br
+ProRes Video 4444 XQ
+.br
+.TP
+.B prores|ap4h
+.br
+ProRes Video 4444
+.br
+.TP
+.B ffmpeg
+.br
+FFMPEG unmapped codec
+.br
+.TP
+.B tmcd
+.br
+QT TimeCode
+.br
+.SH EXAMPLES
+.TP
+Basic and advanced examples are available at https://wiki.gpac.io/Filters
+.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
+.br
+build: 1.0.0-rev0-g747808797-master
+.br
+Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+.br
+.SH SEE ALSO
+.LP
+gpac-filters(1), MP4Client(1), MP4Box(1)

gpac-1.0.0.tar.gz/share/doc/man/mp4box.1 Added

@@ -0,0 +1,2044 @@
+.TH MP4Box 1 2019 MP4Box GPAC
+.
+.SH NAME
+.LP
+MP4Box \- GPAC command-line media packager
+.SH SYNOPSIS
+.LP
+.B MP4Box
+.RI [options] \ [file] \ [options]
+.br
+.
+.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.
+.br
+MP4Box provides a large set of options, classified by categories (see -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 -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 -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 -tmp.
+.br
+Note: Track operations identify tracks through their ID (usually refered as tkID in the help), not their order.
+.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
+.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.
+.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.
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-p
+.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
+.TP
+.B \-inter (number, default: 0.5)
+.br
+interleave file, producing track chunks with given duration in ms. A value of 0 disables interleaving 
+.br
+.TP
+.B \-old-inter (number)
+.br
+same as -inter but wihout drift correction
+.br
+.TP
+.B \-tight (number)
+.br
+tight interleaving (sample based) of the file. This reduces disk seek operations but increases file size
+.br
+.TP
+.B \-flat
+.br
+store file with all media data first, non-interleaved. This speeds up writing time when creating new files
+.br
+.TP
+.B \-frag (number)
+.br
+fragment file, producing track fragments of given duration in ms. This disables interleaving
+.br
+.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
+.br
+.TP
+.B \-co64
+.br
+force usage of 64-bit chunk offsets for ISOBMF files
+.br
+.TP
+.B \-new
+.br
+force creation of a new destination file
+.br
+.TP
+.B \-newfs
+.br
+force creation of a new destination file without temp file but interleaving support
+.br
+.TP
+.B \-no-sys
+.br
+remove all MPEG-4 Systems info except IOD, kept for profiles. This is the default when creating regular AV content
+.br
+.TP
+.B \-no-iod
+.br
+remove MPEG-4 InitialObjectDescriptor from file
+.br
+.TP
+.B \-mfra
+.br
+insert movie fragment random offset when fragmenting file (ignored in dash mode)
+.br
+.TP
+.B \-isma
+.br
+rewrite the file as an ISMA 1.0 file
+.br
+.TP
+.B \-ismax
+.br
+same as -isma and remove all clock references
+.br
+.TP
+.B \-3gp
+.br
+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
+.br
+.TP
+.B \-ipod
+.br
+rewrite the file for iPod/old iTunes
+.br
+.TP
+.B \-psp
+.br
+rewrite the file for PSP devices
+.br
+.TP
+.B \-brand (string)
+.br
+set major brand of file (ABCD) or brand with optional version (ABCD:v)
+.br
+.TP
+.B \-ab (string)
+.br
+add given brand to file's alternate brand list
+.br
+.TP
+.B \-rb (string)
+.br
+remove given brand to file's alternate brand list
+.br
+.TP
+.B \-cprt (string)
+.br
+add copyright string to file
+.br
+.TP
+.B \-chap (string)
+.br
+set chapter information from given file
+.br
+.TP
+.B \-chapqt (string)
+.br
+set chapter information from given file, using QT signaling for text tracks
+.br
+.TP
+.B \-set-track-id  id1:id2 (string)
+.br
+change id of track with id1 to id2
+.br
+.TP
+.B \-swap-track-id  id1:id2 (string)
+.br
+swap the id between tracks with id1 to id2
+.br
+.TP
+.B \-rem (int)
+.br
+remove given track from file
+.br
+.TP
+.B \-rap (int)
+.br
+remove all non-RAP samples from given track
+.br
+.TP
+.B \-refonly (int)
+.br
+remove all non-reference pictures from given track
+.br
+.TP
+.B \-enable (int)
+.br
+enable given track
+.br
+.TP
+.B \-disable (int)
+.br
+disable given track
+.br
+.TP
+.B \-timescale (int, default: 600)
+.br
+set movie timescale to given value (ticks per second)
+.br
+.TP
+.B \-lang  [tkID=]LAN (string)
+.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)
+.br
+set track start delay in ms
+.br
+.TP
+.B \-par  tkID=PAR (string)
+.br
+set visual track pixel aspect ratio. PAR is:
+.br
+  * N:D: set PAR to N:D in track, do not modify the bitstream
+.br
+  * wN:D: set PAR to N:D in track and try to modify the bitstream
+.br
+  * none: remove PAR info from track, do not modify the bitstream
+.br
+  * auto: retrieve PAR info from bitstream and set it in track
+.br
+  * force: force 1:1 PAR in track, do not modify the bitstream
+.br
+.TP
+.B \-clap  tkID=CLAP (string)
+.br
+set visual track clean aperture. CLAP is Wn,Wd,Hn,Hd,HOn,HOd,VOn,VOd or none
+.br
+* n, d: numerator, denominator
+.br
+* W, H, HO, VO: clap width, clap height, clap horizontal offset, clap vertical offset
+.br
+
+.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 -tag-list
+.br
+.TP
+.B \-tag-list
+.br
+print the set of supported iTunes tags
+.br
+.TP
+.B \-split (string)
+.br
+split in files of given max duration
+.br
+.TP
+.B \-split-size,-splits (string)
+.br
+split in files of given max size (in kb)
+.br
+.TP
+.B \-split-rap,-splitr (string)
+.br
+split in files at each new RAP
+.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
+.br
+* `S-E`: start and end dates, each formatted as HH:MM:SS.ms or MM:SS.ms
+.br
+.TP
+.B \-splitz  S:E (string)
+.br
+same as -split-chunk, but adjust the end time to be before the last RAP sample
+.br
+.TP
+.B \-group-add (string)
+.br
+create a new grouping information in the file. Format is a colon-separated list of following options:
+.br
+* 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
+.br
+* switchID=ID: ID of the switch group to create. If 0, a new ID will be computed for you. If <0, disables SwitchGroup
+.br
+* criteria=string: list of space-separated 4CCs.
+.br
+* trackID=ID: ID of the track to add to this group.
+.br
+  
+.br
+Warning: Options modify state as they are parsed, trackID=1:criteria=lang:trackID=2 is different from criteria=lang:trackID=1:trackID=2
+.br
+
+.br
+.TP
+.B \-group-rem-track (int)
+.br
+remove given track from its group
+.br
+.TP
+.B \-group-rem (int)
+.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)
+.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)
+.br
+set udta for given track or movie if tkID is 0. OPTS is a colon separated list of:
+.br
+* type=CODE: 4CC code of the UDTA (not needed for box= option)
+.br
+* box=FILE: location of the udta data, formatted as serialized boxes
+.br
+* box=base64,DATA: base64 encoded udta data, formatted as serialized boxes
+.br
+* src=FILE: location of the udta data (will be stored in a single box of type CODE)
+.br
+* src=base64,DATA: base64 encoded udta data (will be stored in a single box of type CODE)
+.br
+Note: If no source is set, UDTA of type CODE will be removed
+.br
+
+.br
+.TP
+.B \-patch  [tkID=]FILE (string)
+.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
+
+.br
+.SH Extracting Options
+.LP
+.br
+MP4Box can be used to extract media tracks from MP4 files. If you need to convert these tracks however, please check the filters doc.
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-raw (string)
+.br
+extract given track in raw format when supported. Use tkID:output=FileName to set output file name
+.br
+.TP
+.B \-raws (string)
+.br
+extract each sample of the given track to a file. Use tkID:Nto extract the Nth sample
+.br
+.TP
+.B \-nhnt (int)
+.br
+extract given track to NHNT format
+.br
+.TP
+.B \-nhml (string)
+.br
+extract given track to NHML format. Use tkID:full for full NHML dump with all packet properties
+.br
+.TP
+.B \-webvtt-raw (string)
+.br
+extract given track as raw media in WebVTT as metadata. Use tkID:embedded to include media data in the WebVTT file
+.br
+.TP
+.B \-single (int)
+.br
+extract given track to a new mp4 file
+.br
+.TP
+.B \-six (int)
+.br
+extract given track as raw media in experimental XML streaming instructions
+.br
+.TP
+.B \-avi (int)
+.br
+extract given track to an avi file
+.br
+.TP
+.B \-avi (int)
+.br
+same as -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
+.br
+.TP
+.B \-dvbhdemux
+.br
+demux DVB-H file into IP Datagrams sent on the network
+.br
+.TP
+.B \-raw-layer (int)
+.br
+same as -raw but skips SVC/MVC/LHVC extractors when extracting
+.br
+.TP
+.B \-diod
+.br
+extract file IOD in raw format
+.br
+.SH DASH Options
+.LP
+.br
+Also see:
+.br
+- the dasher `gpac -h dash` filter documentation
+.br
+- [[online DASH Intro doc|DASH Introduction]].
+.br
+
+.br
+.SH Specifying input files
+.LP
+.br
+Input media files to dash can use the following modifiers
+.br
+* #trackID=N: only use the track ID N from the source file
+.br
+* #N: only use the track ID N from the source file (mapped to -tkid)
+.br
+* #video: only use the first video track from the source file
+.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
+.br
+* :dur=VALUE: process VALUE seconds 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
+* :BaseURL=NAME: set the BaseURL. Set multiple times for multiple BaseURLs
+.br
+Warning: This does not modify generated files location (see segment template).
+.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
+.br
+* :duration=VALUE: override target DASH segment duration for this input
+.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
+* :asID=VALUE: set the AdaptationSet ID to NAME
+.br
+* :role=VALUE: set the role of this representation (cf DASH spec). Media with different roles belong to different adaptation sets.
+.br
+* :desc_p=VALUE: add a descriptor at the Period level. Value must be a properly formatted XML element.
+.br
+* :desc_as=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Two input files with different values will be in different AdaptationSet elements.
+.br
+* :desc_as_c=VALUE: add a descriptor at the AdaptationSet level. Value must be a properly formatted XML element. Value is ignored while creating AdaptationSet elements.
+.br
+* :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.
+.br
+* :sscale: force movie timescale to match media timescale of the first track in the segment.
+.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.
+.br
+
+.br
+Note: @@f must be placed after all other options.
+.br
+
+.br
+.SH Options
+.LP
+.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
+.TP
+.B \-dash,--dash-strict (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
+.br
+.TP
+.B \-ddbg-live (number)
+.br
+same as -dash-live without time regulation for debug purposes
+.br
+.TP
+.B \-frag (number)
+.br
+specify the fragment duration in ms. If not set, this is the DASH duration (one fragment per segment)
+.br
+.TP
+.B \-out (string)
+.br
+specify the output MPD file name
+.br
+.TP
+.B \-tmp (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
+.br
+.TP
+.B \-profile-ext (string)
+.br
+specify a list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used
+.br
+.TP
+.B \-rap
+.br
+ensure that segments begin with random access points, segment durations might vary depending on the source encoding
+.br
+.TP
+.B \-frag-rap
+.br
+ensure that all fragments begin with random access points (duration might vary depending on the source encoding)
+.br
+.TP
+.B \-segment-name (string)
+.br
+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:
+.br
+- $Number[%%0Nd]$ is replaced by the segment number, possibly prefixed with 0.
+.br
+- $RepresentationID$ is replaced by representation name.
+.br
+- $Time$ is replaced by segment start time.
+.br
+- $Bandwidth$ is replaced by representation bandwidth.
+.br
+- $Init=NAME$ is replaced by NAME for init segment, ignored otherwise. May occur multiple times.
+.br
+- $Index=NAME$ is replaced by NAME for index segments, ignored otherwise. May occur multiple times.
+.br
+- $Path=PATH$ is replaced by PATH when creating segments, ignored otherwise. May occur multiple times.
+.br
+- $Segment=NAME$ is replaced by NAME for media segments, ignored for init segments. May occur multiple times
+.br
+.TP
+.B \-segment-ext (string, default: m4s)
+.br
+set the segment extension, null means no extension
+.br
+.TP
+.B \-init-segment-ext (string, default: mp4)
+.br
+set the segment extension for init, index and bitstream switching segments, null means no extension
+.br
+
+.br
+.TP
+.B \-segment-timeline
+.br
+use SegmentTimeline when generating segments
+.br
+.TP
+.B \-segment-marker  MARK (string)
+.br
+add a box of type MARK (4CC) at the end of each DASH segment
+.br
+.TP
+.B \-insert-utc
+.br
+insert UTC clock at the beginning of each ISOBMF segment
+.br
+.TP
+.B \-base-url (string)
+.br
+set Base url at MPD level. Can be used several times.
+.br
+Warning: this does not  modify generated files location
+.br
+.TP
+.B \-mpd-title (string)
+.br
+set MPD title
+.br
+.TP
+.B \-mpd-source (string)
+.br
+set MPD source
+.br
+.TP
+.B \-mpd-info-url (string)
+.br
+set MPD info url
+.br
+.TP
+.B \-cprt (string)
+.br
+add copyright string to MPD
+.br
+.TP
+.B \-dash-ctx (string)
+.br
+store/restore DASH timing from indicated file
+.br
+.TP
+.B \-dynamic
+.br
+use dynamic MPD type instead of static
+.br
+.TP
+.B \-last-dynamic (string)
+.br
+same as -dynamic but close the period (insert lmsg brand if needed and update duration)
+.br
+.TP
+.B \-mpd-duration (number, default: 0)
+.br
+set the duration in second of a live session (if 0, you must use -mpd-refresh)
+.br
+.TP
+.B \-mpd-refresh (number)
+.br
+specify MPD update time in seconds
+.br
+.TP
+.B \-time-shift (number)
+.br
+specify MPD time shift buffer depth in seconds, -1 to keep all files)
+.br
+.TP
+.B \-subdur (int)
+.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 -no-loop is used which triggers a period end
+.br
+.TP
+.B \-run-for (int)
+.br
+run for given ms  the dash-live session then exits
+.br
+.TP
+.B \-min-buffer (int)
+.br
+specify MPD min buffer time in ms
+.br
+.TP
+.B \-ast-offset (int, default: 0)
+.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 -dash and -frag are expressed in given timexale (units per seconds)
+.br
+.TP
+.B \-mem-frags
+.br
+fragmentation happens in memory rather than on disk before flushing to disk
+.br
+.TP
+.B \-pssh= (Enum)
+.br
+set pssh store mode.
+.br
+* v: initial movie
+.br
+* f: movie fragments
+.br
+* m: MPD
+.br
+* mv, vm: in initial movie and MPD
+.br
+* mf, fm: in movie fragments and MPD
+.br
+.TP
+.B \-sample-groups-traf
+.br
+store sample group descriptions in traf (duplicated for each traf). If not set, sample group descriptions are stored in the initial movie
+.br
+.TP
+.B \-mvex-after-traks
+.br
+store mvex box after trak boxes within the moov box. If not set, mvex is before
+.br
+.TP
+.B \-sdtp-traf (Enum)
+.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
+.br
+* both: use sdtp box to indicate sample dependencies and also write info in trun sample flags
+.br
+
+.br
+.TP
+.B \-no-cache
+.br
+disable file cache for dash inputs
+.br
+.TP
+.B \-no-loop
+.br
+disable looping content in live mode and uses period switch instead
+.br
+.TP
+.B \-hlsc
+.br
+insert UTC in variant playlists for live HLS
+.br
+.TP
+.B \-bound
+.br
+enable video segmentation with same method as audio (i.e.: always try to split before or at the segment boundary - not after)
+.br
+.TP
+.B \-closest
+.br
+enable video segmentation closest to the segment boundary (before or after)
+.br
+.TP
+.B \-subsegs-per-sidx (int)
+.br
+set the number of subsegments to be written in each SIDX box
+.br
+* 0: a single SIDX box is used per segment
+.br
+* -1: no SIDX box is used
+.br
+.TP
+.B \-ssix
+.br
+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
+.br
+.TP
+.B \-url-template
+.br
+use SegmentTemplate instead of explicit sources in segments. Ignored if segments are stored in the output file
+.br
+.TP
+.B \-daisy-chain
+.br
+use daisy-chain SIDX instead of hierarchical. Ignored if frags/sidx is 0
+.br
+.TP
+.B \-single-segment
+.br
+use a single segment for the whole file (OnDemand profile)
+.br
+.TP
+.B \-single-file
+.br
+use a single file for the whole file (default)
+.br
+.TP
+.B \-bs-switching (string, default: inband, values: inband|merge|multi|no|single)
+.br
+set bitstream switching mode
+.br
+* inband: use inband param set and a single init segment
+.br
+* merge: try to merge param sets in a single sample description, fallback to no
+.br
+* multi: use several sample description, one per quality
+.br
+* no: use one init segment per quality
+.br
+* single: to test with single input
+.br
+.TP
+.B \-moof-sn (int)
+.br
+set sequence number of first moof to given value
+.br
+.TP
+.B \-tfdt (int)
+.br
+set TFDT of first traf to given value in SCALE units (cf -dash-scale)
+.br
+.TP
+.B \-no-frags-default
+.br
+disable default fragments flags in trex (required by some dash-if profiles and CMAF/smooth streaming compatibility)
+.br
+.TP
+.B \-single-traf
+.br
+use a single track fragment per moof (smooth streaming and derived specs may require this)
+.br
+.TP
+.B \-tfdt-traf
+.br
+use a tfdt per track fragment (when -single-traf is used)
+.br
+.TP
+.B \-dash-ts-prog (int)
+.br
+program_number to be considered in case of an MPTS input file
+.br
+.TP
+.B \-frag-rt
+.br
+when using fragments in live mode, flush fragments according to their timing
+.br
+.TP
+.B \-cp-location (string, values: as|rep&#x8;oth)
+.br
+set ContentProtection element location
+.br
+* as: sets ContentProtection in AdaptationSet element
+.br
+* rep: sets ContentProtection in Representation element
+.br
+* both: sets ContentProtection in both elements
+.br
+.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
+.br
+Warning: Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size
+.br
+.TP
+.B \-cues (string)
+.br
+ignore dash duration and segment according to cue times in given XML file (tests/media/dash_cues for examples)
+.br
+.TP
+.B \-strict-cues
+.br
+throw error if something is wrong while parsing cues or applying cue-based segmentation
+.br
+.SH File Dumping
+.LP
+.br
+  
+.br
+MP4Box has many dump functionalities, from simple track listing to more complete reporting of special tracks.
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-stdb
+.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
+.br
+.TP
+.B \-tracks
+.br
+print the number of tracks on stdout
+.br
+.TP
+.B \-info (string)
+.br
+print movie info (no parameter) or track info with specified ID
+.br
+.TP
+.B \-infon (string)
+.br
+print track info for given track number, 1 being the first track in the file
+.br
+.TP
+.B \-diso
+.br
+dump IsoMedia file boxes in XML output
+.br
+.TP
+.B \-dxml
+.br
+dump IsoMedia file boxes and known track samples in XML output
+.br
+.TP
+.B \-disox
+.br
+dump IsoMedia file boxes except sample tables in XML output
+.br
+.TP
+.B \-keep-ods
+.br
+do not translate ISOM ODs and ESDs tags (debug purpose only)
+.br
+.TP
+.B \-bt
+.br
+dump scene to BT format
+.br
+.TP
+.B \-xmt
+.br
+dump scene to XMT format
+.br
+.TP
+.B \-wrl
+.br
+dump scene to VRML format
+.br
+.TP
+.B \-x3d
+.br
+dump scene to X3D XML format
+.br
+.TP
+.B \-x3dc
+.br
+dump scene to X3D VRML format
+.br
+.TP
+.B \-lsr
+.br
+dump scene to LASeR XML (XSR) format
+.br
+.TP
+.B \-drtp
+.br
+dump rtp hint samples structure to XML output
+.br
+.TP
+.B \-dts
+.br
+print sample timing, size and position in file to text output
+.br
+.TP
+.B \-dtsx
+.br
+same as -dts but does not print offset
+.br
+.TP
+.B \-dtsc
+.br
+same as -dts but analyse each sample for duplicated dts/cts (slow !)
+.br
+.TP
+.B \-dtsxc
+.br
+same as -dtsc but does not print offset (slow !)
+.br
+.TP
+.B \-dnal (int)
+.br
+print NAL sample info of given track
+.br
+.TP
+.B \-dnalc (int)
+.br
+print NAL sample info of given track, adding CRC for each nal
+.br
+.TP
+.B \-dnald (int)
+.br
+print NAL sample info of given track without DTS and CTS info
+.br
+.TP
+.B \-dnalx (int)
+.br
+print NAL sample info of given track without DTS and CTS info and adding CRC for each nal
+.br
+.TP
+.B \-sdp
+.br
+dump SDP description of hinted file
+.br
+.TP
+.B \-dsap (int)
+.br
+dump DASH SAP cues (see -cues) for a given track
+.br
+.TP
+.B \-dsaps (int)
+.br
+same as -dsap but only print sample number
+.br
+.TP
+.B \-dsapc (int)
+.br
+same as -dsap but only print CTS
+.br
+.TP
+.B \-dsapd (int)
+.br
+same as -dsap but only print DTS, -dsapp to only print presentation time
+.br
+.TP
+.B \-dsapp (int)
+.br
+same as -dsap but only print presentation time
+.br
+.TP
+.B \-dcr
+.br
+dump ISMACryp samples structure to XML output
+.br
+.TP
+.B \-dump-cover
+.br
+extract cover art
+.br
+.TP
+.B \-dump-chap
+.br
+extract chapter file
+.br
+.TP
+.B \-dump-chap-ogg
+.br
+extract chapter file as OGG format
+.br
+.TP
+.B \-dump-udta  [tkID:]4cc (string)
+.br
+extract udta for the given 4CC. If tkID is given, dumps from UDTA of the given track ID, otherwise moov is used
+.br
+.TP
+.B \-mergevtt
+.br
+merge vtt cues while dumping
+.br
+.TP
+.B \-ttxt (int)
+.br
+convert input subtitle to GPAC TTXT format if no parameter. Otherwise, dump given text track to GPAC TTXT format
+.br
+.TP
+.B \-srt
+.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
+.br
+generate node/field statistics for scene
+.br
+.TP
+.B \-stats
+.br
+generate node/field statistics per Access Unit
+.br
+.TP
+.B \-statx
+.br
+generate node/field statistics for scene after each AU
+.br
+.TP
+.B \-hash
+.br
+generate SHA-1 Hash of the input file
+.br
+.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]
+.br
+.TP
+.B \-bin
+.br
+convert input XML file using NHML bitstream syntax to binary
+.br
+.TP
+.B \-topcount (string)
+.br
+print to stdout the number of top-level boxes matching box types given as parameter, formated 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, formated as 4cc_1,4cc_2N or all for all boxes
+.br
+.SH Importing Options
+.LP
+.br
+.SH File importing
+.LP
+.br
+Syntax is -add / -cat filename[#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 -new.
+.br
+The supported input media types depend on your installation, check filters documentation for more info.
+.br
+  
+.br
+To select a desired media track, the following syntax is used:
+.br
+* `-add inputFile#video`: adds the first video track in inputFile.
+.br
+* `-add inputFile#audio`: adds the first audio track in inputFile.
+.br
+* `-add inputFile#trackID=ID` or `-add inputFile#ID`: adds the specified track. For IsoMedia files, ID is the track ID. For other media files, ID is the value indicated by MP4Box -info inputFile.
+.br
+  
+.br
+By default all imports are performed sequentially, and final interleaving is done at the end; this however requires a temporary file holding input 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 option, but this disables media interleaving.
+.br
+  
+.br
+If you wish to create an interleaved new file with no temporary storage, use the -newfs 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). 
+.br
+ - Some muxing options (marked with * below) will be activated for all inputs (i.e. in this mode, it is not possible to import one AVC track with xps_inband and another without).
+.br
+ - Some muxing options (marked as ! below) cannot be used in this mode as they require temporary storage for file edition.
+.br
+ - Usage of -cat is possible in this mode, 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.
+.br
+  
+.br
+MP4Box can import a desired amount of the input file rather than the whole file. To do this, use the syntax -add inputFile:dur=N, where N is the number of seconds you wish to import from input. MP4Box cannot start importing from a random point in the input, it always import from the begining.
+.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). Check TTXT doc for more details.
+.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].
+.br
+  
+.br
+Allowed per-file options:
+.br
+* #video, #audio: base import for most AV files
+.br
+* #trackID=ID: track import for IsoMedia and other files
+.br
+* #pid=ID: stream import from MPEG-2 TS
+.br
+* :dur=D: * import only the specified duration from the media. D can be:
+.br
+  * positive float: specifies duration in seconds
+.br
+  * fraction: specifies duration as NUM/DEN fraction
+.br
+  * negative integer: specifies duration in number of coded frames
+.br
+* :lang=LAN: set imported media language code
+.br
+* :delay=delay_ms: set imported media initial delay in ms
+.br
+* :par=PAR: set visual pixel aspect ratio (see -par )
+.br
+* :clap=CLAP: set visual clean aperture (see -clap )
+.br
+* :mx=MX: sets track matrix (see -mx )
+.br
+* :name=NAME: set track handler name
+.br
+* :ext=EXT: override file extension when importing
+.br
+* :hdlr=code: set track handler type to the given code point (4CC)
+.br
+* :disable: imported track(s) will be disabled
+.br
+* :group=G: add the track as part of the G alternate group. If G is 0, the first available GroupID will be picked.
+.br
+* :fps=VAL: same as -fps
+.br
+* :rap: ! import only RAP samples
+.br
+* :refs: ! import only reference pictures
+.br
+* :trailing: keep trailing 0-bytes in AVC/HEVC samples
+.br
+* :agg=VAL: * same as -agg
+.br
+* :dref: * same as -dref
+.br
+* :keep_refs: keeps track reference when importing a single track
+.br
+* :nodrop: same as -nodrop
+.br
+* :packed: * same as -packed
+.br
+* :sbr: same as -sbr
+.br
+* :sbrx: same as -sbrx
+.br
+* :ovsbr: same as -ovsbr
+.br
+* :ps: same as -ps
+.br
+* :psx: same as -psx
+.br
+* :asemode=MODE: * set the mode to create the AudioSampleEntry
+.br
+  * v0-bs: use MPEG AudioSampleEntry v0 and the channel count from the bitstream (even if greater than 2) - default
+.br
+  * v0-2: use MPEG AudioSampleEntry v0 and the channel count is forced to 2
+.br
+  * v1: use MPEG AudioSampleEntry v1 and the channel count from the bitstream
+.br
+  * 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
+.br
+* :audio_roll=N: add a roll sample group with roll_distance N
+.br
+* :mpeg4: * same as -mpeg4 option
+.br
+* :nosei: discard all SEI messages during import
+.br
+* :svc: import SVC/LHVC with explicit signaling (no AVC base compatibility)
+.br
+* :nosvc: discard SVC/LHVC data when importing
+.br
+* :svcmode=MODE: ! set SVC/LHVC import mode
+.br
+  * split: each layer is in its own track
+.br
+  * merge: all layers are merged in a single track
+.br
+  * splitbase: all layers are merged in a track, and the AVC base in another
+.br
+  * splitnox: each layer is in its own track, and no extractors are written
+.br
+  * splitnoxib: each layer is in its own track, no extractors are written, using inband param set signaling
+.br
+* :temporal: ! set HEVC/LHVC temporal sublayer import mode
+.br
+  * split: each sublayer is in its own track
+.br
+  * splitbase: all sublayers are merged in a track, and the HEVC base in another
+.br
+  * splitnox: each layer is in its own track, and no extractors are written
+.br
+* :subsamples: add SubSample information for AVC+SVC
+.br
+* :deps: import sample dependency information for AVC and HEVC
+.br
+* :ccst: add default HEIF ccst box to visual sample entry
+.br
+* :forcesync: force non IDR samples with I slices to be marked as sync points (AVC GDR)
+.br
+Warning: RESULTING FILE IS NOT COMPLIANT WITH THE SPEC but will fix seeking in most players
+.br
+* :xps_inband: * set xPS inband for AVC/H264 and HEVC (for reverse operation, re-import from raw media)
+.br
+* :xps_inbandx: * same as xps_inband and also keep first xPS in sample desciption
+.br
+* :au_delim: keep AU delimiter NAL units in the imported file
+.br
+* :max_lid=N: set HEVC max layer ID to be imported to N (by default imports all layers)
+.br
+* :max_tid=N: set HEVC max temporal ID to be imported to N (by default imports all temporal sublayers)
+.br
+* :tiles: add HEVC tiles signaling and NALU maps without splitting the tiles into different tile tracks
+.br
+* :split_tiles: ! split HEVC tiles into different tile tracks, one tile (or all tiles of one slice) per track.
+.br
+* :negctts: use negative CTS-DTS offsets (ISO4 brand)
+.br
+* :chap: specify the track is a chapter track
+.br
+* :chapter=NAME: add a single chapter (old nero format) with given name lasting the entire file
+.br
+* :chapfile=file: adds a chapter file (old nero format)
+.br
+* :layout=WxHxXxY: specify the track layout
+.br
+  * if W (resp H) = 0: the max width (resp height) of the tracks in the file are used
+.br
+  * if Y=-1: the layout is moved to the bottom of the track area
+.br
+  * X and Y can be omitted: :layout=WxH
+.br
+* :rescale=TS: force media timescale to TS !! changes the media duration
+.br
+* :timescale=TS: set imported media timescale to TS.
+.br
+* :moovts=TS: set movie timescale to TS. A negative value picks the media timescale of the first track imported.
+.br
+* :noedit: * do not set edit list when importing B-frames video tracks
+.br
+* :rvc=FILENAME: set RVC configuration for the media
+.br
+* :fmt=FORMAT: override format detection with given format (cf BT/XMTA doc)
+.br
+* :profile=INT: override AVC profile
+.br
+* :level=INT: override AVC level
+.br
+* :novpsext: remove VPS extensions from HEVC VPS
+.br
+* :keepav1t: keep AV1 temporal delimiter OBU in samples, might help if source file had losses
+.br
+* :font=name: specify font name for text import (default Serif)
+.br
+* :size=s: specify font size for text import (default 18)
+.br
+* :text_layout=WxHxXxY: specify the track text layout
+.br
+  * if W (resp H) = 0: the max width (resp height) of the tracks in the file are used.
+.br
+  * if Y=-1: the layout is moved to the bottom of the track area
+.br
+  * X and Y can be omitted: :layout=WxH
+.br
+* :swf-global: all SWF defines are placed in first scene replace rather than when needed
+.br
+* :swf-no-ctrl: use a single stream for movie control and dictionary (this will disable ActionScript)
+.br
+* :swf-no-text: remove all SWF text
+.br
+* :swf-no-font: remove all embedded SWF Fonts (local playback host fonts used)
+.br
+* :swf-no-line: remove all lines from SWF shapes
+.br
+* :swf-no-grad: remove all gradients from SWF shapes
+.br
+* :swf-quad: use quadratic bezier curves instead of cubic ones
+.br
+* :swf-xlp: support for lines transparency and scalability
+.br
+* :swf-ic2d: use indexed curve 2D hardcoded proto
+.br
+* :swf-same-app: appearance nodes are reused
+.br
+* :swf-flatten=ang: complementary angle below which 2 lines are merged, 0 means no flattening
+.br
+* :kind=schemeURI=value: set kind for the track
+.br
+* :txtflags=flags: set display flags (hexa number) of text track
+.br
+* :txtflags+=flags: add display flags (hexa number) to text track
+.br
+* :txtflags-=flags: remove display flags (hexa number) from text track
+.br
+* :rate=VAL: force average rate and max rate to VAL (in bps) in btrt box. If 0, removes btrt box
+.br
+* :stz2: use compact size table (for low-bitrates)
+.br
+* :bitdepth=VAL: set bit depth to VAL for imported video content (default is 24)
+.br
+* :colr=OPT: set color profile for imported video content (see ISO/IEC 23001-8). OPT is formatted as:
+.br
+  * nclc,p,t,m: with p colour primary, t transfer characteristics and m matrix coef
+.br
+  * nclx,p,t,m,r: same as nclx with r full range flag
+.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
+* :dv-profile=VAL: set the Dolby Vision profile
+.br
+* :tc=VAL: inject a single QT timecode. VAL is formated 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
+  * : d is an optional flag used to indicate that the counter is in drop-frame format
+.br
+  * : the framespertick is optional and defaults to round(framerate); it indicates the number of frames per counter tick
+.br
+- :lastsampdur[=VAL]" sets duration of the last sample. VAL is formated as:
+.br
+  * no value: use the previous sample duration
+.br
+  * integer: indicate the duration in milliseconds
+.br
+  * N/D: indicate the duration as fractional second
+.br
+* :fstat: print filter session stats after import
+.br
+* :fgraph: print filter session graph after import
+.br
+* :sopt:[OPTS]: set OPTS as additional arguments to source filter. OPTS can be any usual filter argument, see filter doc `gpac -h doc`
+.br
+* :dopt:[OPTS]: * set OPTS as additional arguments to destination filter. OPTS can be any usual filter argument, see filter doc `gpac -h doc`
+.br
+* @@f1[:args][@@fN:args]: 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
+.br
+
+.br
+Note: sopt, dopt and @@f must be placed after all other options.
+.br
+.SH Global import options
+.LP
+.br
+.TP
+.B \-add (string)
+.br
+add given file tracks to file. Multiple inputs can be specified using +, eg -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).
+.br
+Note: Note: This aligns initial timestamp of the file to be concatenated
+.br
+.TP
+.B \-catx (string)
+.br
+same as -cat but new tracks can be imported before concatenation by specifying +ADD_COMMAND where ADD_COMMAND is a regular -add syntax
+.br
+.TP
+.B \-catpl (string)
+.br
+concatenate files listed in the given playlist file (one file per line, lines starting with # are comments).
+.br
+Note: Each listed file is concatenated as if called with -cat
+.br
+.TP
+.B \-unalign-cat (string)
+.br
+do not attempt to align timestamps of samples inbetween tracks
+.br
+.TP
+.B \-force-cat (string)
+.br
+skip media configuration check when concatenating file.
+.br
+Warning: THIS MAY BREAK THE CONCATENATED TRACK(S)
+.br
+.TP
+.B \-keep-sys
+.br
+keep all MPEG-4 Systems info when using -add and -cat (only used when adding IsoMedia files)
+.br
+.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.
+.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)
+.br
+.TP
+.B \-no-drop
+.br
+force constant FPS when importing AVI video
+.br
+.TP
+.B \-packed
+.br
+force packed bitstream when importing raw MPEG-4 part 2 Advanced Simple Profile
+.br
+.TP
+.B \-sbr
+.br
+backward compatible signaling of AAC-SBR
+.br
+.TP
+.B \-sbrx
+.br
+non-backward compatible signaling of AAC-SBR
+.br
+.TP
+.B \-ps
+.br
+backward compatible signaling of AAC-PS
+.br
+.TP
+.B \-psx
+.br
+non-backward compatible signaling of AAC-PS
+.br
+.TP
+.B \-ovsbr
+.br
+oversample SBR import (SBR AAC, PS AAC and oversampled SBR cannot be detected at import time)
+.br
+.TP
+.B \-fps (string, default: 25)
+.br
+force frame rate for video and SUB subtitles import to the given value, expressed as a number or as timescale-increment.
+.br
+Note: For raw H263 import, default FPS is 15, otherwise 25
+.br
+Warning: This is ignored for ISOBMFF import, use :rescale option for that
+.br
+.TP
+.B \-mpeg4
+.br
+force MPEG-4 sample descriptions when possible. For AAC, forces MPEG-4 AAC signaling even if MPEG-2
+.br
+.TP
+.B \-agg (int)
+.br
+aggregate N audio frames in 1 sample (3GP media only).
+.br
+Note: Maximum value is 15
+.br
+.SH Hinting Options
+.LP
+.br
+IsoMedia hinting consists in creating special tracks in the file that contain transport protocol specific information and optionally multiplexing information. These tracks are then used by the server to create the actual packets being sent over the network, in other words they provide the server with hints on how to build packets, hence their names hint tracks.
+.br
+MP4Box supports creation of hint tracks for RTSP servers supporting these such as QuickTime Streaming Server, DarwinStreaming Server or 3GPP-compliant RTSP servers.
+.br
+Note: GPAC streaming tools rtp output and rtsp server do not use hint tracks, they use on-the-fly packetization from any media sources, not just MP4
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-hint
+.br
+hint the file for RTP/RTSP
+.br
+.TP
+.B \-hint (int, default: 1450)
+.br
+specify RTP MTU (max size) in bytes (this includes 12 bytes RTP header)
+.br
+.TP
+.B \-copy
+.br
+copy media data to hint track rather than reference (speeds up server but takes much more space)
+.br
+.TP
+.B \-multi  [maxptime] (int)
+.br
+enable frame concatenation in RTP packets if possible (with max duration 100 ms or maxptime ms if given)
+.br
+.TP
+.B \-rate (int, default: 90000)
+.br
+specify rtp rate in Hz when no default for payload
+.br
+.TP
+.B \-mpeg4
+.br
+force MPEG-4 generic payload whenever possible
+.br
+.TP
+.B \-latm
+.br
+force MPG4-LATM transport for AAC streams
+.br
+.TP
+.B \-static
+.br
+enable static RTP payload IDs whenever possible (by default, dynamic payloads are always used)
+.br
+.TP
+.B \-add-sdp (string)
+.br
+add given SDP string to hint track (tkID:string) or movie (string)
+.br
+.TP
+.B \-unhint
+.br
+remove all hinting information from file
+.br
+.TP
+.B \-group-single
+.br
+put all tracks in a single hint group
+.br
+.TP
+.B \-ocr
+.br
+force all MPEG-4 streams to be synchronized (MPEG-4 Systems only)
+.br
+.TP
+.B \-rap
+.br
+signal random access points in RTP packets (MPEG-4 Systems)
+.br
+.TP
+.B \-ts
+.br
+signal AU Time Stamps in RTP packets (MPEG-4 Systems)
+.br
+.TP
+.B \-size
+.br
+signal AU size in RTP packets (MPEG-4 Systems)
+.br
+.TP
+.B \-idx
+.br
+signal AU sequence numbers in RTP packets (MPEG-4 Systems)
+.br
+.TP
+.B \-iod
+.br
+prevent systems tracks embedding in IOD (MPEG-4 Systems), not compatible with -isma
+.br
+.SH MPEG-4 Scene Encoding Options
+.LP
+.br
+.P
+.B
+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
+Any media track specified through a MuxInfo element will be imported in the resulting MP4 file.
+.br
+See https://wiki.gpac.io/MPEG-4-BIFS-Textual-Format and related pages.
+.br
+.P
+.B
+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.
+.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
+Commands with a timing of 0 in the input will modify the carousel version only (i.e. output context).
+.br
+Commands with a timing different from 0 in the input will generate new AUs.
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-mp4
+.br
+specify input file is for encoding
+.br
+.TP
+.B \-def
+.br
+encode DEF names in BIFS
+.br
+.TP
+.B \-sync (int)
+.br
+force BIFS sync sample generation every given time in ms.
+.br
+Note: cannot be used with -shadow
+.br
+.TP
+.B \-shadow (int)
+.br
+force BIFS sync shadow sample generation every given time in ms.
+.br
+Note: cannot be used with -sync
+.br
+.TP
+.B \-log
+.br
+generate scene codec log file if available
+.br
+.TP
+.B \-ms (string)
+.br
+import tracks from the given file
+.br
+.TP
+.B \-ctx-in (string)
+.br
+specify initial context (MP4/BT/XMT) file for chunk processing. Input file must be a commands-only file
+.br
+.TP
+.B \-ctx-out (string)
+.br
+specify storage of updated context (MP4/BT/XMT) file for chunk processing, optional
+.br
+.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)
+.br
+.TP
+.B \-coord-bits (int)
+.br
+number of bits used for encoding truncated coordinates (0 to 31, default 12) (LASeR encoding)
+.br
+.TP
+.B \-scale-bits (int)
+.br
+extra bits used for encoding truncated scales (0 to 4, default 0) (LASeR encoding)
+.br
+.TP
+.B \-auto-quant (int)
+.br
+resolution is given as if using -resolution but coord-bits and scale-bits are infered (LASeR encoding)
+.br
+.SH Encryption/Decryption Options
+.LP
+.br
+MP4Box supports encryption and decryption of ISMA, OMA and CENC content, see encryption filter `gpac -h cecrypt`.
+.br
+It requires a specific XML file called CryptFile, whose syntax is available at https://wiki.gpac.io/Common-Encryption
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-crypt (string)
+.br
+encrypt the input file using the given CryptFile
+.br
+.TP
+.B \-decrypt (string)
+.br
+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)
+.br
+change ISMA/OMA KMS location for all tracks, or for a given one if ID=kms_uri is used
+.br
+.SH Meta and HEIF Options
+.LP
+.br
+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.
+.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.  
+.br
+  
+.br
+.TP
+.B \-set-meta  ABCD[:tk=tkID] (string)
+.br
+set meta box type, with ABCD the four char meta type (NULL or 0 to remove meta)
+.br
+* tk not set: use root (file) meta
+.br
+* tkID == 0: use moov meta
+.br
+* tkID != 0: use meta of given track
+.br
+.TP
+.B \-add-items (string)
+.br
+add resource to meta, with parameter syntax file_path[:opt1:optN]
+.br
+* file_path `this` or `self`: item is the file itself
+.br
+* tk=tkID: meta location (file, moov, track)
+.br
+* name=str: item name
+.br
+* type=itype: item 4cc type (not needed if mime is provided)
+.br
+* mime=mtype: item mime type
+.br
+* encoding=enctype: item content-encoding type
+.br
+* id=ID: item ID
+.br
+* ref=4cc,id: reference of type 4cc to an other item
+.br
+.TP
+.B \-add-image (string)
+.br
+add the given file (with parameters) as HEIF image item. Same syntax as -add-item
+.br
+* name=str: see -add-item
+.br
+* id=id: see -add-item
+.br
+* ref=4cc, id: see -add-item
+.br
+* primary: indicate that this item should be the primary item
+.br
+* time=t: use the next sync sample after time t (float, in sec, default 0). A negative time imports ALL frames as items
+.br
+* split_tiles: for an HEVC tiled image, each tile is stored as a separate item
+.br
+* rotation=a: set the rotation angle for this image to 90*a degrees anti-clockwise
+.br
+* hidden: indicate that this image item should be hidden
+.br
+* icc_path: path to icc to add as colr
+.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 -add
+.br
+.TP
+.B \-rem-item  item_ID[:tk=tkID] (string)
+.br
+remove resource from meta
+.br
+.TP
+.B \-set-primary  item_ID[:tk=tkID] (string)
+.br
+set item as primary for meta
+.br
+.TP
+.B \-set-xml  xml_file_path[:tk=tkID][:binary] (string)
+.br
+set meta XML data
+.br
+.TP
+.B \-rem-xml  [tk=tkID] (string)
+.br
+remove meta XML data
+.br
+.TP
+.B \-dump-xml  file_path[:tk=tkID] (string)
+.br
+dump meta XML to file
+.br
+.TP
+.B \-dump-item  item_ID[:tk=tkID][:path=fileName] (string)
+.br
+dump item to file
+.br
+.TP
+.B \-package (string)
+.br
+package input XML file into an ISO container, all media referenced except hyperlinks are added to file
+.br
+.TP
+.B \-package (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
+.SH SWF Importer Options
+.LP
+.br
+
+.br
+MP4Box can import simple Macromedia Flash files (".SWF")
+.br
+You can specify a SWF input file with '-bt', '-xmt' and '-mp4' options
+.br
+  
+.br
+Options:
+.br
+.TP
+.B \-global
+.br
+all SWF defines are placed in first scene replace rather than when needed
+.br
+.TP
+.B \-no-ctrl
+.br
+use a single stream for movie control and dictionary (this will disable ActionScript)
+.br
+.TP
+.B \-no-text
+.br
+remove all SWF text
+.br
+.TP
+.B \-no-font
+.br
+remove all embedded SWF Fonts (local playback host fonts used)
+.br
+.TP
+.B \-no-line
+.br
+remove all lines from SWF shapes
+.br
+.TP
+.B \-no-grad
+.br
+remove all gradients from swf shapes
+.br
+.TP
+.B \-quad
+.br
+use quadratic bezier curves instead of cubic ones
+.br
+.TP
+.B \-xlp
+.br
+support for lines transparency and scalability
+.br
+.TP
+.B \-flatten (number)
+.br
+complementary angle below which 2 lines are merged, value 0means no flattening
+.br
+.SH Live Scene Encoder Options
+.LP
+.br
+The options shall be specified as òpt_name=opt_val.
+.br
+Options:
+.br
+
+.br
+.TP
+.B \-dst (string)
+.br
+destination IP
+.br
+.TP
+.B \-port (int, default: 7000)
+.br
+destination port
+.br
+.TP
+.B \-mtu (int, default: 1450)
+.br
+path MTU for RTP packets
+.br
+.TP
+.B \-ifce (string)
+.br
+IP address of the physical interface to use
+.br
+.TP
+.B \-ttl (int, default: 1)
+.br
+time to live for multicast packets
+.br
+.TP
+.B \-sdp (string, default: session.sdp)
+.br
+output SDP file
+.br
+.TP
+.B \-dims
+.br
+turn on DIMS mode for SVG input
+.br
+.TP
+.B \-no-rap
+.br
+disable RAP sending and carousel generation
+.br
+.TP
+.B \-src (string)
+.br
+source of scene updates
+.br
+.TP
+.B \-rap (int)
+.br
+duration in ms of base carousel; you can specify the RAP period of a single ESID (not in DIMS) using ESID=X:time
+.br
+  
+.br
+Runtime options:
+.br
+* q: quits
+.br
+* u: inputs some commands to be sent
+.br
+* U: same as u but signals the updates as critical
+.br
+* e: inputs some commands to be sent without being aggregated
+.br
+* E: same as e but signals the updates as critical
+.br
+* f: forces RAP sending
+.br
+* F: forces RAP regeneration and sending
+.br
+* p: dumps current scene
+.br
+.SH EXAMPLES
+.TP
+Basic and advanced examples are available at https://wiki.gpac.io/MP4Box-Introduction
+.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
+.br
+build: 1.0.0-rev0-g747808797-master
+.br
+Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+.br
+.SH SEE ALSO
+.LP
+gpac(1), MP4Client(1)

gpac-1.0.0.tar.gz/share/doc/man/mp4client.1 Added

@@ -0,0 +1,260 @@
+.TH MP4Client 1 2019 MP4Client GPAC
+.
+.SH NAME
+.LP
+MP4Client \- GPAC command-line media player
+.SH SYNOPSIS
+.LP
+.B MP4Client
+.RI [options] \ [file]
+.br
+.
+.SH "DESCRIPTION"
+.LP
+MP4Client is GPAC command-line media player. It supports all GPAC playback features (2D and 3D support, local playback, RTP streaming, HTTP faststart, many audio and video codecs ...).
+.br
+Specific URLs shortcuts are available, see gpac -h compositor
+.
+.
+.SH OPTIONS
+.TP
+.B \-rti (string)
+.br
+log run-time info (FPS, CPU, Mem usage) to given file
+.br
+.TP
+.B \-rtix (string)
+.br
+same as -rti but driven by GPAC logs
+.br
+.TP
+.B \-size (string)
+.br
+specify visual size WxH. If not set, scene size or video size is used
+.br
+.TP
+.B \-rti-refresh (int)
+.br
+set refresh time in ms between two runt-time counters queries (default is 200)
+.br
+.TP
+.B \-no-thread
+.br
+disable thread usage (except for depending on driver audio)
+.br
+.TP
+.B \-no-audio
+.br
+disable audio
+.br
+.TP
+.B \-pause
+.br
+pause at first frame
+.br
+.TP
+.B \-play-from (number)
+.br
+start playback from given time in seconds in media
+.br
+.TP
+.B \-speed (number)
+.br
+start playback wit given speed
+.br
+.TP
+.B \-loop
+.br
+loop playback
+.br
+.TP
+.B \-fs
+.br
+start in fullscreen mode
+.br
+.TP
+.B \-exit
+.br
+exit when presentation is over
+.br
+.TP
+.B \-run-for
+.br
+run for indicated time in seconds and exits
+.br
+.TP
+.B \-service (int)
+.br
+auto-tune to given service ID in a multiplex
+.br
+.TP
+.B \-no-save
+.br
+do not save configuration file on exit
+.br
+.TP
+.B \-no-addon
+.br
+disable automatic loading of media addons declared in source URL
+.br
+.TP
+.B \-gui
+.br
+start in GUI mode. The GUI is indicated in the configuration file [General]StartupFile
+.br
+.TP
+.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
+.TP
+.B \-stats
+.br
+dump filter session stats after playback
+.br
+.TP
+.B \-graph
+.br
+dump filter session graph after playback
+.br
+.TP
+.B \-nk
+.br
+disable keyboard interaction
+.br
+.TP
+.B \-h,-help
+.br
+show this help. Use -hx to show expert help
+.br
+.TP
+.B \-hc
+.br
+show libgpac core options
+.br
+.TP
+.B \-hr
+.br
+show runtime options when keybard interaction is enabled
+.br
+.SH MP4Client runtime commands
+.LP
+.br
+.P
+.B
+Prompt Interaction
+.br
+The following keys are used for prompt interaction:
+.br
+q: quit
+.br
+X: kill
+.br
+r: reload current presentation
+.br
+o: connect to the specified URL
+.br
+O: connect to the specified playlist
+.br
+N: switch to the next URL in the playlist. Also works with \n
+.br
+P: jump to a given number ahead in the playlist
+.br
+D: disconnect the current presentation
+.br
+G: select object or service ID
+.br
+p: play/pause the presentation
+.br
+s: step one frame ahead
+.br
+z: seek into presentation by percentage
+.br
+T: seek into presentation by time
+.br
+t: print current timing
+.br
+u: send a command (BIFS or LASeR) to the main scene
+.br
+e: evaluate JavaScript code in the main scene
+.br
+Z: dump current output frame to PNG
+.br
+w: view world info
+.br
+v: view list of active media objects in scene
+.br
+i: view Object Descriptor info (by ID)
+.br
+j: view Object Descriptor info (by number)
+.br
+b: view media objects timing and buffering info
+.br
+m: view media objects buffering and memory info
+.br
+d: dump scene graph
+.br
+k: turn stress mode on/off
+.br
+n: change navigation mode
+.br
+x: reset to last active viewpoint
+.br
+3: switch OpenGL on or off for 2D scenes
+.br
+4: force 4/3 Aspect Ratio
+.br
+5: force 16/9 Aspect Ratio
+.br
+6: force no Aspect Ratio (always fill screen)
+.br
+7: force original Aspect Ratio (default)
+.br
+H: set HTTP max download rate
+.br
+E: force reload of compositor options
+.br
+L: change to new log tool/level. CF MP4Client usage for possible values
+.br
+R: toggle run-time info display in window title bar on/off
+.br
+F: toggle displaying of FPS in stderr on/off
+.br
+f: print filter session stats
+.br
+g: print filter session graph
+.br
+h: print this message
+.br
+M: specify video cache memory for 2D objects ! experimental !
+.br
+
+.br
+.P
+.B
+Content interaction
+.br
+It is possible to interact with content (interactive or not) using mouse and keyboard.
+.br
+The following commands are available:
+.br
+TODO
+.br
+
+.br
+.SH EXAMPLES
+.TP
+Basic and advanced examples are available at https://wiki.gpac.io/mp4client
+.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
+.br
+build: 1.0.0-rev0-g747808797-master
+.br
+Copyright: (c) 2000-2020 Telecom Paris distributed under LGPL v2.1+ - http://gpac.io
+.br
+.SH SEE ALSO
+.LP
+gpac(1), MP4Box(1)

gpac-1.0.0.tar.gz/share/doc/osmo4.ico Changed

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

gpac-1.0.0.tar.gz/share/gui Added

gpac-1.0.0.tar.gz/share/gui/extensions Added

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS Added

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS/H2B2VS.png Changed

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS/h2b2vs.js Added

@@ -0,0 +1,462 @@
+extension = {
+    setup: false,
+    dialog: null,
+    uhd_demo_enabled: false,
+    uhd_demo_on: false,
+    uhd_state_on: true,
+    addon_url: null,
+    scene_url: null,
+    overlay_position: 0,
+    icon_width: 0,
+    icon_height: 0,
+    movie_width: 0,
+    movie_height: 0,
+    disable_save_session: false,
+    disable_addons: false,
+
+    toggle_uhd_demo: function (val) {
+        this.uhd_demo_on = val;
+        var notif = null;
+        if (this.uhd_demo_on) {
+            notif = gw_new_message(null, 'UHD Demo Enbaled', 'Click to toggle quality');
+        } else {
+            notif = gw_new_message(null, 'UHD Demo Disabled', 'Double-click to re-enable');
+            this.logo.children[0].url[0] = '';
+        }
+        this.do_layout();
+        notif.set_size(20 * gwskin.default_text_font_size, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+        notif.show();
+    },
+
+    ext_filter_event: function (evt) {
+        switch (evt.type) {
+            case GF_EVENT_ADDON_DETECTED:
+                this.confirm_addon(evt);
+                return true;
+            case GF_EVENT_QUIT:
+                this.save_session();
+                return false;
+            case GF_EVENT_DBLCLICK:
+                if (this.uhd_demo_enabled) {
+                    this.toggle_uhd_demo(!this.uhd_demo_on);
+                }
+                return false;
+            case GF_EVENT_MOUSEUP:
+                if (this.uhd_demo_on) {
+                    this.uhd_state_on = !this.uhd_state_on;
+                    gpac.switch_quality(this.uhd_state_on);
+                    return true;
+                }
+                return false;
+
+            case GF_EVENT_MOUSEDOWN:
+                if (this.uhd_demo_on) {
+                    return true;
+                }
+                return false;
+
+            case GF_EVENT_SCENE_SIZE:
+                if (typeof evt.width != 'undefined') {
+                    this.movie_width = evt.width;
+                    this.movie_height = evt.height;
+                    if (this.movie_height > 1080) this.uhd_state_on = true;
+
+                    if (this.uhd_demo_on) {
+                        this.do_layout();
+                    }
+                }
+                return false;
+            case GF_EVENT_KEYDOWN:
+                //alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
+
+                var odm = gpac.get_object_manager(this.scene_url);
+                if (!odm || odm.main_addon_url) return false;
+
+                if (evt.keycode == 'F7') {
+                    this.uhd_state_on = !this.uhd_state_on;
+                    gpac.switch_quality(this.uhd_state_on);
+                    return true;
+                }
+
+                if (evt.keycode == 'F6') {
+                    this.overlay_position++;
+                    if (this.overlay_position == 4) {
+                        this.do_deactivate_addon();
+
+                    } else {
+                        if (this.overlay_position == 5) {
+                            this.do_activate_addon();
+                            this.overlay_position = 0;
+                        }
+                        this.set_option('OverlayPosition', '' + this.overlay_position);
+                        this.refresh_addon();
+                    }
+                    return true;
+                }
+/*
+                if (evt.keycode == 'F12') {
+                    gpac.exit();
+                    return true;
+                }
+*/
+                return false;
+			case GF_JS_EVENT_PLAYBACK:
+				//whenever paused, store pause time
+				if (! evt.is_playing) {
+					this.save_session();
+				}
+				return false;
+				
+            default:
+                return false;
+        }
+    },
+
+    create_event_filter: function (__anobj) {
+        return function (evt) {
+            return __anobj.ext_filter_event(evt);
+        }
+    },
+
+    do_layout: function () {
+        if (this.uhd_demo_enabled && this.uhd_demo_on) {
+            var url = this.get_option('path');
+            if (this.movie_height > 1080) {
+                url += 'logo_uhd.png';
+                this.logo.scale.x = 1;
+                this.logo.scale.y = 1;
+            } else {
+                url += 'logo_hd.png';
+                this.logo.scale.x = 2;
+                this.logo.scale.y = 2;
+            }
+            this.logo.children[0].url[0] = url;
+        } else {
+            this.logo.children[0].url[0] = '';
+        }
+    },
+
+    start: function () {
+        //first launch - register event filter and exit
+        if (!this.setup) {
+            gwlib_add_event_filter(this.create_event_filter(this), true);
+            this.setup = true;
+
+            this.overlay_position = parseInt(this.get_option('OverlayPosition', '0'));
+
+            /*create media nodes element for playback*/
+            this.logo = gw_new_container();
+            this.logo.children[0] = new SFNode('Inline');
+            this.logo.children[0].extension = this;
+            this.logo.children[0].url[0] = '';
+            this.logo.children[0].on_scene_size = function (evt) {
+                this.extension.icon_width = evt.width;
+                this.extension.icon_height = evt.height;
+                this.extension.do_layout();
+            };
+
+            gw_add_child(null, this.logo);
+
+            this.logo.children[0].addEventListener('gpac_scene_attached', this.logo.children[0].on_scene_size, 0);
+
+            this.restore_session();
+
+            //check our args
+            var i, argc = gpac.argc;
+            for (i = 1; i < argc; i++) {
+                var arg = gpac.get_arg(i);
+                if (arg == '-demo-uhd') {
+                    this.uhd_demo_enabled = true;
+                    this.toggle_uhd_demo(true);
+                    gwlog(l_war, 'UHD Demo enabled');
+                }
+                else if (arg == '-no-addon') {
+                    this.disable_addons = true;
+                }
+            }
+            return;
+        }
+
+        gw_hide_dock();
+        var wnd = gw_new_window_full(null, true, 'H2B2VS Preferences');
+
+        this.dialog = wnd;
+        this.dialog.extension = this;
+
+        wnd.area = gw_new_grid_container(wnd);
+        wnd.area.spread_h = true;
+        wnd.area.break_at_hidden = true;
+
+        wnd.txt1 = gw_new_text(wnd.area, 'Overlay Position');
+        gw_new_separator(wnd.area);
+
+
+        wnd.check_pos = function (value) {
+            this.chk_pos1.set_checked((value == 0) ? true : false);
+            this.chk_pos2.set_checked((value == 1) ? true : false);
+            this.chk_pos3.set_checked((value == 2) ? true : false);
+            this.chk_pos4.set_checked((value == 3) ? true : false);
+
+            this.extension.set_option('OverlayPosition', '' + value);
+            this.extension.refresh_addon();
+        }
+        wnd.chk_pos4 = gw_new_checkbox(wnd.area, 'Top-Left');
+        wnd.chk_pos4.on_check = function (value) {
+            this.parent.parent.check_pos(3);
+        }
+        wnd.chk_pos2 = gw_new_checkbox(wnd.area, 'Top-Right');
+        wnd.chk_pos2.on_check = function (value) {
+            this.parent.parent.check_pos(1);
+        }
+        wnd.chk_pos3 = gw_new_checkbox(wnd.area, 'Bottom-Left');
+        wnd.chk_pos3.on_check = function (value) {
+            this.parent.parent.check_pos(2);
+        }
+        wnd.chk_pos1 = gw_new_checkbox(wnd.area, 'Bottom-Right');
+        wnd.chk_pos1.on_check = function (value) {
+            this.parent.parent.check_pos(0);
+        }
+
+        wnd.txt2 = gw_new_text(wnd.area, 'Overlay Size');
+        gw_new_separator(wnd.area);
+
+
+        wnd.check_size = function (value) {
+            this.chk_size1.set_checked((value == 0) ? true : false);
+            this.chk_size2.set_checked((value == 1) ? true : false);
+            this.chk_size3.set_checked((value == 2) ? true : false);
+            this.extension.set_option('OverlaySize', '' + value);
+            this.extension.refresh_addon();
+        }
+        wnd.chk_size1 = gw_new_checkbox(wnd.area, '1/2 Height');
+        wnd.chk_size1.on_check = function (value) {
+            this.parent.parent.check_size(0);
+        }
+        wnd.chk_size2 = gw_new_checkbox(wnd.area, '1/3 Height');
+        wnd.chk_size2.on_check = function (value) {
+            this.parent.parent.check_size(1);
+        }
+        wnd.chk_size3 = gw_new_checkbox(wnd.area, '1/4 Height');
+        wnd.chk_size3.on_check = function (value) {
+            this.parent.parent.check_size(2);
+        }
+
+        wnd.txt3 = gw_new_text(wnd.area, 'User Identifier');
+        gw_new_separator(wnd.area);
+        wnd.edit = gw_new_text_edit(wnd.area, this.get_option('UserID', 'H2B2VSUser'));
+        gpac.set_focus(wnd.edit);
+        wnd.edit.on_text = function (val) {
+            if (val != '') {
+                this.parent.parent.extension.set_option('UserID', val);
+            }
+        }
+
+        gw_new_separator(wnd.area);
+        wnd.chk_addon = gw_new_checkbox(wnd.area, 'Auto-select addon');
+        wnd.chk_addon.on_check = function (value) {
+            this.parent.parent.extension.set_option('AutoSelect', value ? 'yes' : 'no');
+        }
+        var do_sel = this.get_option('AutoSelect', 'no');
+        wnd.chk_addon.set_checked((do_sel == 'yes') ? true : false);
+
+        wnd.dbg_addon = gw_new_checkbox(wnd.area, 'Debug PVR addon');
+        wnd.dbg_addon.on_check = function (value) {
+            gpac.set_option('Compositor', 'dbgpvr', value ? 'yes' : 'no');
+        }
+        do_sel = gpac.get_option('Compositor', 'dbgpvr');
+        wnd.dbg_addon.set_checked((do_sel == 'yes') ? true : false);
+
+        gw_new_separator(wnd.area);
+        wnd.uhd_demo = gw_new_checkbox(wnd.area, 'UHD Demo');
+        wnd.uhd_demo.on_check = function (value) {
+            this.parent.parent.extension.uhd_demo_enabled = value;
+            this.parent.parent.extension.set_option('UHDDemo', value ? 'yes' : 'no');
+        }
+        do_sel = this.get_option('UHDDemo', 'no');
+        this.uhd_demo_enabled = (do_sel == 'yes') ? true : false;
+        wnd.uhd_demo.set_checked(this.uhd_demo_enabled);
+        if (this.uhd_demo_enabled) this.uhd_demo_on = true;
+
+        wnd.on_display_size = function (width, height) {
+            w = 0.9 * width;
+            if (w > 500) w = 500;
+            this.txt1.set_size(w / 3, gwskin.default_icon_height);
+
+            this.chk_pos1.set_size(w / 2, gwskin.default_control_height);
+            this.chk_pos2.set_size(w / 2, gwskin.default_control_height);
+            this.chk_pos3.set_size(w / 2, gwskin.default_control_height);
+            this.chk_pos4.set_size(w / 2, gwskin.default_control_height);
+
+            this.txt2.set_size(w / 3, gwskin.default_icon_height);
+
+            this.chk_size1.set_size(w / 3, gwskin.default_control_height);
+            this.chk_size2.set_size(w / 3, gwskin.default_control_height);
+            this.chk_size3.set_size(w / 3, gwskin.default_control_height);
+
+            this.txt3.set_size(w / 3, gwskin.default_icon_height);
+            this.edit.set_size(w / 2, gwskin.default_icon_height);
+            this.chk_addon.set_size(w / 2, gwskin.default_icon_height);
+            this.dbg_addon.set_size(w / 2, gwskin.default_icon_height);
+            this.uhd_demo.set_size(w / 2, gwskin.default_icon_height);
+
+            this.set_size(w, 13 * gwskin.default_icon_height);
+        }
+
+        wnd.check_pos(this.overlay_position);
+        wnd.check_size(parseInt(this.get_option('OverlaySize', '0')));
+
+
+        wnd.on_display_size(gw_display_width, gw_display_height);
+        wnd.set_alpha(0.9);
+        wnd.show();
+
+
+        wnd.on_close = function () {
+            gw_show_dock();
+            wnd.extension.dialog = null;
+        };
+    },
+
+    refresh_addon: function () {
+        if (this.scene_url) {
+            var odm = gpac.get_object_manager(this.scene_url);
+            if (odm) {
+                odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+            }
+        }
+    },
+
+    do_activate_addon: function () {
+        var odm = gpac.get_object_manager(this.scene_url);
+        if (odm) {
+            odm.enable_addon(this.addon_url);
+            odm.addon_layout(parseInt(this.get_option('OverlayPosition', '0')), parseInt(this.get_option('OverlaySize', '0')));
+        }
+    },
+
+    do_deactivate_addon: function () {
+        var odm = gpac.get_object_manager(this.scene_url);
+        if (odm) {
+            odm.enable_addon(this.addon_url, true);
+        }
+    },
+
+
+    confirm_addon: function (evt) {
+
+        if (this.disable_addons) return;
+
+        if (this.get_option('AutoSelect', 'no') == 'yes') {
+            this.scene_url = evt.scene_url;
+            this.addon_url = evt.addon_url;
+            this.do_activate_addon();
+            return;
+        }
+
+        var names = ext = evt.addon_url.split('/');
+        if (names.length == 0) names = f.url.split('\\');
+
+        var dlg = gw_new_confirm_wnd(null, 'Addon detected (' + names.pop() + '), enable it ?');
+        dlg.set_alpha(0.95);
+        dlg.show();
+        dlg.extension = this;
+        dlg.scene_url = evt.scene_url;
+        dlg.addon_url = evt.addon_url;
+
+        dlg.on_confirm = function (value) {
+            if (!value) return;
+            this.extension.scene_url = evt.scene_url;
+            this.extension.addon_url = evt.addon_url;
+            this.extension.do_activate_addon();
+        }
+    },
+
+    do_xhr: function (url, cmd) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('POST', url, false);
+
+        xhr.setRequestHeader('Content-Type', 'application/json');
+        xhr.setRequestHeader('Content-Length', cmd.length);
+        xhr.send(cmd);
+
+        if ((xhr.status != 200) || (xhr.readyState != 4)) {
+            if (xhr.status) {
+                gwlog(l_err, '[H2B2VS] Failed to query server: ' + xhr.responseText);
+            } else {
+                gwlog(l_err, '[H2B2VS] Failed to send request');
+            }
+            return null;
+        }
+        gwlog(l_deb, 'Command sent is ' + cmd + ' - response is ' + xhr.responseText);
+
+        var obj = gwskin.parse(xhr.responseText);
+        if (typeof obj.result == 'undefined') {
+            gwlog(l_err, '[H2B2VS] Non conformant response object ' + xhr.responseText);
+            return null;
+        }
+        if (obj.result != 0) {
+            gwlog(l_inf, '[H2B2VS] No session found for user - ' + xhr.responseText);
+            return null;
+        }
+        return obj;
+    },
+
+    restore_session: function () {
+
+        if (gwskin.media_url) {
+            gwlog(l_inf, 'URL was given when opening, skipping session restore');
+            return;
+        }
+        //this.disable_save_session = true;
+
+        var server = this.get_option('SessionServer', null);
+        var user = this.get_option('UserID', null);
+        if (!server || !user) return;
+
+        var url = server + 'getData';
+        var cmd = 'ID=' + user;
+
+        var obj = this.do_xhr(url, cmd);
+        if (!obj || !obj.data || !obj.data.url || (obj.data.url== '') ) return;
+
+        var dlg = gw_new_confirm_wnd(null, 'Restore last session ?');
+        dlg.set_alpha(0.95);
+        dlg.show();
+        dlg.sess = obj.data;
+
+        gwlog(l_deb, 'H2B2VS state to restore: ' + gwskin.stringify(obj.data));
+
+        dlg.on_confirm = function (value) {
+            if (!value) return;
+            gwskin.restore_session(this.sess.url, this.sess.media_time, this.sess.media_clock);
+        }
+    },
+
+    save_session: function () {
+
+        if (this.disable_save_session) return;
+
+        var obj = {};
+        var url = gwskin.pvr_url;
+        if (url === '') url = gwskin.media_url;
+
+        obj.url = url.replace(/\\/g, "/");
+        obj.media_time = 0;
+        obj.media_clock = 0;
+        if (typeof gwskin.media_time != 'undefined') obj.media_time = gwskin.media_time;
+        if (typeof gwskin.media_clock != 'undefined') obj.media_clock = gwskin.media_clock;
+
+        var str = gwskin.stringify(obj);
+        gwlog(l_deb, 'H2B2VS storing state: ' + str);
+
+		var server = this.get_option('SessionServer', null);
+		var user = this.get_option('UserID', null);
+		if (!server || !user) return;
+
+		var url = server + 'setData';
+        var cmd = 'ID=' + user + '&Data=' + str;
+        this.do_xhr(url, cmd);
+
+    }
+};
+

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS/init.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS/logo_hd.png Changed

gpac-1.0.0.tar.gz/share/gui/extensions/H2B2VS/logo_uhd.png Changed

gpac-1.0.0.tar.gz/share/gui/extensions/about Added

gpac-1.0.0.tar.gz/share/gui/extensions/about/info.js Added

gpac-1.0.0.tar.gz/share/gui/extensions/about/info.svg Changed

gpac-1.0.0.tar.gz/share/gui/extensions/about/init.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/bifs_tests Added

gpac-1.0.0.tar.gz/share/gui/extensions/bifs_tests/applications-other.svg Changed

gpac-1.0.0.tar.gz/share/gui/extensions/bifs_tests/bifs_tests.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/bifs_tests/init.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/player Added

gpac-1.0.0.tar.gz/share/gui/extensions/player/applications-multimedia.svg Changed

gpac-1.0.0.tar.gz/share/gui/extensions/player/fileopen.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/player/init.js Added

gpac-1.0.0.tar.gz/share/gui/extensions/player/player.js Added

@@ -0,0 +1,1859 @@
+
+extension = {
+    GF_STATE_PLAY: 0,
+    GF_STATE_PAUSE: 1,
+    GF_STATE_STOP: 2,
+    GF_STATE_TRICK: 3,
+
+    GF_VIEW_MONO: 0,
+    GF_VIEW_STEREO: 1,
+    GF_VIEW_STEREO_SIDE: 2,
+    GF_VIEW_STEREO_TOP: 3,
+
+    movie: null,
+    movie_control: null,
+    movie_sensor: null,
+    UPnP_Enabled: false,
+    dynamic_scene: false,
+    movie_connected: false,
+    controlled_renderer: null,
+    current_url: null,
+    local_url: false,
+    initial_play_done: false,
+    dictionary: null,
+    icon_pause: 1,
+    icon_play: 0,
+    controler: null,
+    buffer_wnd: null,
+    current_time: 0,
+    duration: 0,
+    timeshift_depth: 0,
+    time_in_tsb: 0,
+    muted: 0,
+    file_open_dlg: false,
+    stoped_url: null,
+    initial_service_id: 0,
+    default_addon: null,
+    history: [],
+    bookmarks: [],
+    root_odm: null,
+    navigation_wnd: null,
+    initial_loop: false,
+    initial_speed: 1,
+    initial_start: 0,
+    show_stats_init: false,
+	def_width: 600,
+	def_height: 600,
+	disabled: false,
+    services: [],
+    channels_wnd: null,
+	medialist_wnd: null,
+    reverse_playback_supported: false,
+	view_stereo: 0,
+
+    stats_wnd: null,
+    stats_data: [],
+    stats_window: 100,
+    stats_resources: [],
+    nb_objs_at_last_scan: 0,
+    stats_timer: null,
+    test_mode: false,
+
+    do_show_controler: function () {
+		if (this.file_open_dlg) {
+            alert('Cannot show - File dialog is open');
+            return false;
+        }
+        gw_hide_dock();
+        if (this.controler.visible) {
+            this.controler.hide();
+        } else {
+            this.controler.show();
+        }
+    },
+
+    ext_filter_event: function (evt) {
+		if (this.disabled) return false;
+		
+        switch (evt.type) {
+		case GF_EVENT_MOUSEUP:
+			if ((gwskin.last_hit_x == evt.mouse_x) && (gwskin.last_hit_y == evt.mouse_y)) {
+				this.do_show_controler();
+			}
+			//we always return false so that the event is handled by the navigation logic of the player, otherwise
+			//the mouse would never be released and navigation would stay always on
+			return false;
+		case GF_EVENT_KEYUP:
+			if (evt.keycode == gwskin.keys.close) {
+				this.do_show_controler();
+				return true;
+			}
+			return false;
+		case GF_EVENT_QUALITY_SWITCHED:
+			if (this.stats_wnd) {
+				this.stats_wnd.quality_changed();
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_UPDATE:
+			if (this.timeshift_depth) {
+				this.set_time(0);
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_OVERFLOW:
+			var msg = '';
+			if ((this.state == this.GF_STATE_PAUSE) || (this.movie_control.mediaSpeed != 1)) {
+				this.set_state(this.GF_STATE_PLAY);
+				this.set_speed(1);
+
+				msg = gw_new_message(null, 'Timeshift Overflow', 'Falling outside of timeshift buffer: resuming playback');
+				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+				msg.show();
+			}
+			return true;
+		case GF_EVENT_TIMESHIFT_UNDERRUN:
+			if (this.movie_control.mediaSpeed > 1) {
+				this.set_speed(1);
+				var msg = gw_new_message(null, 'Timeshift Underrun', 'Resuming to normal speed');
+				msg.set_size(380, gwskin.default_icon_height + 2 * gwskin.default_text_font_size);
+				msg.show();
+			}
+			return true;
+		case GF_EVENT_NAVIGATE:
+			this.set_movie_url(evt.target_url);
+			return true;
+		case GF_EVENT_KEYDOWN:
+			//alert('key is '+evt.keycode + ' hw code is ' + evt.hwkey);
+			if (evt.keycode == 'F1') {
+				this.controler.rewind.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F2') {
+				this.controler.play.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F3') {
+				this.controler.forward.on_click();
+				return true;
+			}
+			if (evt.keycode == 'F4') {
+				this.controler.back_live.on_click();
+				return true;
+			}
+			/*
+			if (evt.keycode == 'F7') {
+			 this.controler.fullscreen.on_click();
+			 return true;
+			}
+			*/
+			return false;
+
+		default:
+			return false;
+        }
+    },
+
+    init_extension: function () {
+
+        /*create media nodes element for playback*/
+        var a_movie = new SFNode('OrderedGroup');
+        this.movie = new SFNode('Transform2D');
+        a_movie.children[0] = this.movie;
+        a_movie.children[0].children[0] = new SFNode('Inline');
+        a_movie.children[0].children[0].url[0] = '';
+        this.movie_control = new SFNode('MediaControl')
+        a_movie.children[0].children[1] = this.movie_control;
+        this.movie_sensor = new SFNode('MediaSensor')
+        a_movie.children[0].children[2] = this.movie_sensor;
+
+        gw_insert_media_node(a_movie);
+        //dictionary of resources to load 
+        this.dictionary = gw_new_container(null);
+        this.dictionary.hide();
+
+        this.movie.children[0].extension = this;
+
+        this.movie.children[0].on_scene_size = function (evt) {
+            var ext = this.extension;
+
+            if (!this.callback_done) {
+                this.callback_done = true;
+
+                //process the error or connect service
+                if (evt.error) {
+                    if (ext.test_mode) {
+                        gpac.exit(1);                    
+                    }
+
+                    var notif = gw_new_message(null, 'Error opening file!', 'Failed to open ' + this.url[0] + '\n\nReason: ' + gpac.error_string(evt.error));
+                    notif.show();
+
+                    var url = ext.movie.children[0].url.length ? ext.movie.children[0].url[0] : '';
+                    //reassign old inline URL
+                    this.url[0] = url;
+                    if (url == '') {
+                        ext.controler.show();
+						ext.set_state(ext.GF_STATE_STOP);
+                    } else {
+                        ext.movie_connected = true;
+						ext.set_state(ext.GF_STATE_PLAY);
+                    }
+                }
+				//reset stats objects and data
+				ext.root_odm=null;
+				ext.nb_objs_at_last_scan = 0;
+				ext.stats_resources = [];
+				ext.stats_data = [];
+
+                //switch back inline nodes and remove from dictionary
+                gw_detach_child(this);
+                let old_inline = ext.movie.children[0];
+                ext.movie.children[0] = this;
+                //force detach, we don't know when GC will be done
+                old_inline.url[0] = '';
+                if (evt.error) return;
+
+
+                //success !
+                ext.current_url = this.url[0];
+                ext.set_speed(ext.initial_speed);
+                if (ext.initial_start >= 0) {
+                    ext.movie_control.mediaStartTime = ext.initial_start;
+                } else {
+                    ext.movie_control.mediaStartTime = 0;
+                    ext.movie_control.mediaStopTime = ext.initial_start;
+                }
+                ext.movie_control.loop = ext.initial_loop;
+                ext.controler.loop.switch_icon(ext.movie_control.loop ? 1 : 0);
+
+
+                ext.movie_control.url[0] = ext.current_url;
+                ext.movie_sensor.url[0] = ext.current_url;
+
+                ext.timeshift_depth = 0;
+                ext.time_in_tsb = 0;
+                ext.initial_loop = false;
+                ext.initial_speed = 1;
+                ext.initial_start = 0;
+
+                gwlog(l_deb, 'URL connected');
+
+                if ((ext.current_url.indexOf('gpac://') == 0) && ((ext.current_url.indexOf('://') < 0) || (ext.current_url.indexOf('file://') == 0))) {
+                    ext.local_url = true;
+                } else {
+                    ext.local_url = false;
+                }
+
+                ext.root_odm = gpac.get_object_manager(ext.current_url);
+                ext.reverse_playback_supported = ext.root_odm.reverse_playback_supported;
+
+                ext.controler.hide();
+
+				var names = ext.current_url.split('/');
+				if (names.length == 0) names = ext.current_url.split('\\');
+				gpac.caption = names.pop();
+				
+                ext.add_bookmark(ext.current_url, true);
+
+				gwskin.enable_background(false);
+                ext.declare_addons();
+
+                if (ext.initial_service_id && ext.root_odm) {
+                    ext.root_odm.select_service(ext.initial_service_id);
+                    ext.initial_service_id = 0;
+                }
+
+                /* Start collecting statistics on media resources */
+                ext.gather_stats_resources(ext.root_odm, ext.root_odm.selected_service);
+                ext.stats_timer = gw_new_timer(false);
+                ext.stats_timer.ext = ext;
+                ext.stats_timer.set_timeout(1, true);
+                ext.stats_timer.on_event = ext.stats_timer_on_event;
+                if (ext.show_stats_init) {
+                    ext.view_stats();
+                }
+                if (ext.test_mode) {
+                    ext.coverage_tests();                    
+                }
+                ext.stats_timer.start();
+            }
+
+            if (!ext.movie_connected) {
+                ext.movie_connected = true;
+                gpac.set_3d(evt.type3d ? 1 : 0);
+                ext.controler.play.switch_icon(ext.icon_pause);
+                ext.dynamic_scene = evt.dynamic_scene;
+                //force display size notif on controler to trigger resize of the window
+                ext.controler.on_display_size(ext.controler.width, ext.controler.height);
+            }
+
+//            ext.root_odm = gpac.get_object_manager(ext.current_url);
+            ext.set_state(ext.GF_STATE_PLAY);
+
+            //override scene size info
+            gpac.set_size(evt.width, evt.height, true);
+
+            if (!gpac.fullscreen && evt.width && evt.height) {
+                var w, h;
+                w = evt.width;
+                h = evt.height;
+
+                if (w > gpac.screen_width) w = gpac.screen_width;
+                if (h > gpac.screen_height) h = gpac.screen_height;
+
+				if (w<this.extension.def_width)
+                    w = this.extension.def_width;
+
+                gwlog(l_deb, 'set output size to ' + w + 'x' + h);
+                gpac.set_size(w, h);
+            }
+            ext.streamlist_changed();
+
+            if (evt.width) {
+                var e = {};
+                e.type = GF_EVENT_SCENE_SIZE;
+                e.width = evt.width;
+                e.height = evt.height;
+                gwlib_filter_event(e);
+            }
+        }
+        this.movie.children[0].on_addon_found = function (evt) {
+            var e = {};
+            e.type = GF_EVENT_ADDON_DETECTED;
+            e.addon_url = evt.url;
+            e.scene_url = this.url[0];
+            e.discarded = false;
+            gwlib_filter_event(e);
+        }
+
+        this.movie.children[0].on_streamlist_changed = function (evt) {
+            this.extension.streamlist_changed();
+        }
+        this.movie.children[0].on_scene_size_modify = function (evt) {
+            var e = {};
+            e.type = GF_EVENT_SCENE_SIZE;
+            e.width = evt.width;
+            e.height = evt.height;
+            gwlib_filter_event(e);
+        }
+
+        this.movie.children[0].addEventListener('gpac_scene_attached', this.movie.children[0].on_scene_size, 0);
+        this.movie.children[0].addEventListener('gpac_addon_found', this.movie.children[0].on_addon_found, 0);
+        this.movie.children[0].addEventListener('gpac_streamlist_changed', this.movie.children[0].on_streamlist_changed, 0);
+        this.movie.children[0].addEventListener('gpac_scene_size', this.movie.children[0].on_scene_size_modify, 0);
+
+
+        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;
+                if (percent_dload >= 100) percent_dload = 0;
+                this.extension.controler.media_line.set_progress(percent_dload);
+            } else if (evt.bufferLevel && (evt.bufferRemainingTime>1000) ) {
+                var buf_lev = evt.bufferLevel;
+                if (evt.bufferLevel >= 100) buf_lev = 0;
+                this.extension.controler.media_line.set_progress(buf_lev);
+            }
+        }
+
+        this.movie.children[0].on_media_playing = function (evt) {
+            this.extension.show_buffer(-1);
+
+            if (!this.extension.initial_play_done) {
+                this.extension.initial_play_done = true;
+
+                this.extension.controler.play.switch_icon(this.extension.icon_pause);
+
+                if (this.extension.root_odm) {
+                    this.extension.declare_addons();
+                }
+            }
+
+            if (this.extension.root_odm) {
+                this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+            }
+        }
+
+        this.movie.children[0].on_media_end = function (evt) {
+            if (this.extension.duration>1) {
+                if (this.extension.movie_control.loop) {
+                    this.extension.movie_control.mediaStartTime = 0;
+                    this.extension.current_time = 0;
+                } else if (this.extension.playlist_mode && (this.extension.playlist_idx + 1 < this.extension.playlist.length)) {
+                    this.extension.playlist_next();
+                } else {
+                    this.extension.set_state(this.extension.GF_STATE_STOP);
+                }
+            }
+        }
+
+        this.movie.children[0].on_media_waiting = function (evt) {
+            //            alert('URL is now buffering');
+        }
+        this.movie.children[0].on_tsb_change = function (evt) {
+            if (this.extension.root_odm) {
+                this.extension.set_timeshift_depth(this.extension.root_odm.timeshift_depth);
+
+                var main_addon_url = this.extension.root_odm.main_addon_url;
+                if (main_addon_url != null) gwskin.pvr_url = main_addon_url;
+
+            }
+        }
+        this.movie.children[0].on_main_addon = function (evt) {
+            this.extension.reload_stats();
+            this.extension.controler.layout();
+        }
+
+
+        this.movie.children[0].addEventListener('progress', this.movie.children[0].on_media_progress, 0);
+        this.movie.children[0].addEventListener('playing', this.movie.children[0].on_media_playing, 0);
+        this.movie.children[0].addEventListener('canplay', this.movie.children[0].on_media_playing, 0);
+        this.movie.children[0].addEventListener('waiting', this.movie.children[0].on_media_waiting, 0);
+        this.movie.children[0].addEventListener('ended', this.movie.children[0].on_media_end, 0);
+        this.movie.children[0].addEventListener('gpac_timeshift_depth_changed', this.movie.children[0].on_tsb_change, 0);
+        this.movie.children[0].addEventListener('gpac_main_addon_state', this.movie.children[0].on_main_addon, 0);
+
+
+        this.on_movie_duration = function (value) {
+            if (value < 0) value = 0;
+            this.current_duration = value;
+            this.set_duration(value);
+            if (this.UPnP_Enabled) UPnP.MovieDuration = value;
+        }
+
+        this.on_movie_active = function (value) {
+            if (!value) {
+                this.movie_control.mediaStartTime = -1;
+            }
+        }
+
+        this.on_movie_time = function (value) {
+            var diff = this.current_time - value;
+            if (diff < 0) diff = -diff;
+            /*filter out every 1/2 seconds*/
+            if (diff < 0.5) return;
+            this.current_time = value;
+            this.set_time(value);
+            if (this.UPnP_Enabled) UPnP.MovieTime = value;
+        }
+
+        Browser.addRoute(this.movie_sensor, 'mediaDuration', this, this.on_movie_duration);
+        Browser.addRoute(this.movie_sensor, 'mediaCurrentTime', this, this.on_movie_time);
+        Browser.addRoute(this.movie_sensor, 'isActive', this, this.on_movie_active);
+
+        var hist = this.get_option('PlaybackHistory');
+        if ((hist != null) && (hist != '')) {
+            this.history = gwskin.parse(hist);
+        }
+
+        var bmarks = this.get_option('Bookmarks');
+        if ((bmarks != null) && (bmarks != '')) {
+            this.bookmarks = gwskin.parse(bmarks);
+        }
+		
+        /*create player control UI*/
+        var wnd = gw_new_window(null, true, true);
+        //remember it !
+        this.controler = wnd;
+        wnd.extension = this;
+
+        wnd.set_corners(true, true, false, false);
+        wnd.set_alpha(0.9);
+
+		/*create default interactive zone in case the content grabs all mouse events*/
+		this.safe_interact = gw_new_rectangle('button', 'invisible');
+		gw_add_child(null, this.safe_interact);
+		this.safe_interact.show();
+		
+		
+        /*first set of controls*/
+        wnd.infobar = gw_new_grid_container(wnd);
+        wnd.infobar.spread_h = true;
+
+        /*add our controls in order*/
+
+        wnd.media_line = gw_new_progress_bar(wnd.infobar, false, true);
+        wnd.media_line.extension = this;
+        wnd.media_line.on_slide = function (value, type) {
+            if (!this.extension.movie_connected && !this.extension.controlled_renderer) {
+                this.set_value(0);
+                return;
+            }
+
+            var duration = this.extension.duration;
+            var time;
+            if (duration) {
+                time = value * duration / 100;
+            } else if (this.extension.timeshift_depth) {
+                time = (100 - value) * this.extension.timeshift_depth / 100;
+
+                if (this.extension.controlled_renderer) {
+                    return;
+                }
+                if (type != 2) return;
+
+                this.extension.movie_control.mediaStopTime = -time;
+                this.extension.controler.layout();
+                return;
+            }
+
+            if (this.extension.controlled_renderer) {
+                this.extension.controlled_renderer.Seek(time);
+                return;
+            }
+            switch (type) {
+                //start sliding                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+                case 1:
+                    this.extension.set_state(this.extension.GF_STATE_PAUSE);
+                    this.extension.set_speed(0);
+                    break;
+                //done sliding                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+                case 2:
+                    this.extension.set_state(this.extension.GF_STATE_PLAY);
+                    this.extension.movie_control.mediaStartTime = time;
+                    this.extension.set_speed(1);
+                    break;
+                //init slide, go in play mode                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   
+                default:
+                    if (this.extension.state == this.extension.GF_STATE_STOP)
+                        this.extension.set_state(this.extension.GF_STATE_PLAY);
+
+                    this.extension.set_state(this.extension.GF_STATE_PAUSE);
+                    break;
+            }
+        }
+
+        wnd.time = gw_new_text(wnd.infobar, '00:00:00');
+        gw_object_set_hitable(wnd.time);
+        wnd.time.extension = this;
+        wnd.time.reversed = false;
+        wnd.time.on_down = function (val) {
+            if (!val) return;
+
+            if (this.extension.timeshift_depth) {
+                return;
+                //                if (this.extension.movie_control.mediaStopTime < 0)
+                //                    this.extension.movie_control.mediaStopTime = 0;
+            } else {
+                this.reversed = !this.reversed;
+                this.extension.set_time(this.extension.current_time);
+            }
+        }
+
+        wnd.back_live = gw_new_icon(wnd.infobar, 'live');
+        wnd.back_live.extension = this;
+        wnd.back_live.on_click = function () {
+            if (this.extension.movie_control.mediaStopTime < 0) {
+                this.extension.set_time(0);
+                this.extension.movie_control.mediaStopTime = 0;
+                this.extension.set_state(this.extension.GF_STATE_PLAY);
+                //this.extension.controler.layout();
+            }
+        }
+
+        gw_new_separator(wnd.infobar);
+
+
+        wnd.stop = gw_new_icon(wnd.infobar, 'stop');
+        wnd.stop.extension = this;
+        wnd.stop.on_click = function () {
+            this.extension.set_state(this.extension.GF_STATE_STOP);
+        }
+
+        wnd.rewind = gw_new_icon(wnd.infobar, 'rewind');
+        wnd.rewind.extension = this;
+        wnd.rewind.on_click = function () {
+            if (!this.extension.movie_control.mediaSpeed) {
+                this.extension.set_state(this.extension.GF_STATE_PLAY);
+            }
+            this.extension.set_state(this.extension.GF_STATE_TRICK);
+            if (this.extension.movie_control.mediaSpeed > 0) {
+                this.extension.set_speed(-1.0);
+                this.extension.controler.layout();
+            } else {
+                this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
+            }
+        }
+
+        wnd.play = gw_new_icon(wnd.infobar, 'play');
+        wnd.play.extension = this;
+        this.state = this.GF_STATE_PLAY;
+        wnd.play.add_icon(gwskin.images.pause);
+        wnd.play.on_click = function () {
+            this.extension.set_state((this.extension.state == this.extension.GF_STATE_PLAY) ? this.extension.GF_STATE_PAUSE : this.extension.GF_STATE_PLAY);
+        }
+
+
+        wnd.forward = gw_new_icon_button(wnd.infobar, 'seek_forward', '', true, 'icon_label');
+        wnd.forward.extension = this;
+        wnd.forward.on_click = function () {
+            if (!this.extension.movie_control.mediaSpeed) {
+                this.extension.set_state(this.extension.GF_STATE_PLAY);
+            }
+            this.extension.set_state(this.extension.GF_STATE_TRICK);
+            if (this.extension.movie_control.mediaSpeed < 0) {
+                this.extension.set_speed(1.0);
+            } else {
+                this.extension.set_speed(2 * this.extension.movie_control.mediaSpeed);
+            }
+        }
+        wnd.forward.on_long_click = function () {
+            if (this.extension.movie_control.mediaSpeed > 0) {
+                this.extension.set_state(this.extension.GF_STATE_TRICK);
+                this.extension.set_speed(this.extension.movie_control.mediaSpeed / 2);
+            }
+        }
+
+        wnd.loop = gw_new_icon(wnd.infobar, 'play_once');
+        wnd.loop.extension = this;
+        wnd.loop.add_icon(gwskin.images.play_loop);
+        //            wnd.loop.add_icon(gwskin.images.play_shuffle);
+        wnd.loop.on_click = function () {
+            this.extension.movie_control.loop = this.extension.movie_control.loop ? FALSE : TRUE;
+            this.switch_icon(this.extension.movie_control.loop ? 1 : 0);
+        }
+
+        wnd.media_list = gw_new_icon(wnd.infobar, 'media');
+        wnd.media_list.extension = this;
+        wnd.media_list.hide();
+
+        wnd.channels = gw_new_icon(wnd.infobar, 'channels');
+        wnd.channels.extension = this;
+        wnd.channels.hide();
+
+
+        wnd.navigate = gw_new_icon(wnd.infobar, 'navigation');
+        wnd.navigate.add_icon('sensors');
+        wnd.navigate.extension = this;
+        wnd.navigate.on_click = function () {
+            this.extension.select_navigation_type();
+        }
+
+        wnd.stats = gw_new_icon(wnd.infobar, 'statistics');
+        wnd.stats.extension = this;
+        wnd.stats.on_click = function () {
+            this.extension.view_stats();
+        }
+
+        gw_new_separator(wnd.infobar);
+
+        wnd.snd_low = gw_new_icon(wnd.infobar, 'audio');
+        wnd.snd_low.extension = this;
+        wnd.snd_ctrl = gw_new_slider(wnd.infobar);
+        wnd.snd_ctrl.extension = this;
+        wnd.snd_ctrl.stick_to_previous = true;
+        wnd.snd_low.add_icon('audio_mute');
+        wnd.snd_low.on_click = function () {
+            if (this.extension.muted) {
+                gpac.volume = this.extension.muted;
+                this.extension.muted = 0;
+                this.switch_icon(0);
+            } else {
+                this.extension.muted = gpac.volume ? gpac.volume : 1;
+                gpac.volume = 0;
+                this.switch_icon(1);
+            }
+        }
+        wnd.snd_ctrl.on_slide = function (value, type) {
+            if (this.extension.muted) this.extension.controler.snd_low.on_click();
+            gpac.volume = value;
+        }
+        wnd.snd_ctrl.set_value(gpac.volume);
+
+        wnd.open = null;
+        if (!gwskin.browser_mode) {
+            wnd.open = gw_new_icon(wnd.infobar, 'file_open');
+            wnd.open.extension = this;
+            wnd.open.on_click = function () {
+                this.extension.open_local_file();
+            }
+        }
+
+        wnd.playlist = gw_new_icon(wnd.infobar, 'playlist');
+        wnd.playlist.extension = this;
+        wnd.playlist.on_click = function () {
+            this.extension.view_playlist();
+        }
+
+        wnd.playlist_prev = gw_new_icon(wnd.infobar, 'playlist_prev');
+        wnd.playlist_prev.extension = this;
+        wnd.playlist_prev.on_click = function () {
+            this.extension.playlist_prev();
+        }
+
+        wnd.playlist_next = gw_new_icon(wnd.infobar, 'playlist_next');
+        wnd.playlist_next.extension = this;
+        wnd.playlist_next.on_click = function () {
+            this.extension.playlist_next();
+        }
+
+
+        wnd.home = null;
+        if (!gwskin.browser_mode) {
+            wnd.home = gw_new_icon(wnd.infobar, 'osmo');
+            wnd.home.extension = this;
+            wnd.home.on_click = function () {
+                this.extension.controler.hide();
+                if (this.extension._evt_filter != null) {
+                    gwlib_remove_event_filter(this.extension._evt_filter);
+                    this.extension._evt_filter = null;
+                }
+				gwskin.enable_background(true);
+				gw_show_dock();
+				this.extension.disabled = true;
+            }
+        }
+
+
+        if (this.UPnP_Enabled) {
+            wnd.remote = gw_new_icon(wnd.infobar, 'remote_display');
+            wnd.remote.on_click = function () { select_remote_display('push'); }
+        } else {
+            wnd.remote = null;
+        }
+
+        if (gwskin.mobile_device) {
+            wnd.fullscreen = null;
+            wnd.exit = null;
+        } else {
+            wnd.fullscreen = gw_new_icon(wnd.infobar, 'fullscreen');
+            wnd.fullscreen.add_icon(gwskin.images.fullscreen_back);
+            wnd.fullscreen.on_click = function () {
+                gpac.fullscreen = !gpac.fullscreen;
+            }
+            wnd.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
+
+            if (!gwskin.browser_mode) {
+                wnd.exit = gw_new_icon(wnd.infobar, 'exit');
+                wnd.exit.on_click = function () { gpac.exit(); }
+            } else {
+                wnd.exit = null;
+            }
+        }
+
+
+        wnd.on_size = function (width, height) {
+            var control_icon_size = gwskin.default_icon_height;
+            var children = this.infobar.get_children();
+            for (i = 0; i < children.length; i++) {
+                children[i].set_size(control_icon_size, control_icon_size);
+            }
+            if (this.time) this.time.set_size(4 * wnd.time.font_size(), control_icon_size);
+            if (this.snd_ctrl) {
+                this.snd_ctrl.set_size(2 * control_icon_size, control_icon_size / 2, control_icon_size / 3, control_icon_size / 2);
+                this.snd_ctrl.set_value(gpac.volume);
+            }
+
+            var speed = this.extension.movie_control.mediaSpeed;
+            if (speed < 0) speed = -speed;
+            if (speed && (speed != 1)) {
+                if ((speed > 100) || (speed < 1))
+                    this.forward.set_size(3 * control_icon_size, control_icon_size);
+                else
+                    this.forward.set_size(2 * control_icon_size, control_icon_size);
+            } else {
+                this.forward.set_size(control_icon_size, control_icon_size);
+            }
+        }
+
+        wnd.layout = function (width, height) {
+            var min_w, full_w, time_w;
+            var control_icon_size = gwskin.default_icon_height;
+            var is_over = true;
+            var show_navigate = false;
+            if (arguments.length == 0) {
+                width = this.width;
+                height = this.height;
+            }
+            this.move(0, Math.floor((height - gw_display_height) / 2));
+
+            this.on_size(width, height);
+
+            if (this.fullscreen)
+                this.fullscreen.switch_icon(gpac.fullscreen ? 1 : 0);
+
+            width -= control_icon_size / 2;
+            min_w = control_icon_size;
+            if (this.time.visible) min_w += this.time.width;
+            if (this.open) min_w += control_icon_size;
+            if (this.home) min_w += control_icon_size;
+            if (this.exit && gpac.fullscreen) min_w += control_icon_size;
+            full_w = 0;
+            if (this.snd_low) full_w += control_icon_size;
+            if (this.snd_ctrl) full_w += this.snd_ctrl.width;
+            if (this.fullscreen) full_w += control_icon_size;
+
+            if (this.navigate) {
+                this.navigate.hide();
+
+				if (this.extension.root_odm && this.extension.root_odm.vr_scene) {
+                    show_navigate = true;
+                    full_w += control_icon_size;
+				
+					wnd.navigate.on_click = function () {
+//						var sensors_active = gpac.sensors_active;
+//						gpac.sensors_active = !sensors_active;
+//						this.switch_icon(sensors_active ? 1 : 0);
+                        this.extension.select_navigation_vr();
+					}
+				} else if ( (this.extension.dynamic_scene != 1) && this.extension.movie_connected && (gpac.navigation_type != GF_NAVIGATE_TYPE_NONE)) {
+                    show_navigate = true;
+                    full_w += control_icon_size;
+
+					wnd.navigate.on_click = function () {
+						this.extension.select_navigation_type();
+					}
+                }
+            }
+
+            if (this.extension.movie_connected) {
+                if (this.extension.state == this.extension.GF_STATE_STOP) {
+                    this.stats.hide();
+                } else {
+                    full_w += control_icon_size;
+                    this.stats.show();
+                }
+                if (this.extension.duration || this.extension.timeshift_depth) {
+                    full_w += control_icon_size;
+                    this.stop.show();
+                    full_w += control_icon_size;
+                    this.play.show();
+                } else {
+                    full_w += control_icon_size;
+                    //this.play.show();
+                    if (this.extension.state == this.extension.GF_STATE_STOP) {
+                        this.stop.hide();
+                        this.play.show();
+                    } else {
+                        this.play.hide();
+                        this.stop.show();
+                    }
+                }
+
+                if (this.extension.root_odm && !this.extension.dynamic_scene && !this.extension.root_odm.is_over)
+                    is_over = false;
+
+            } else {
+                this.stats.hide();
+                this.stop.hide();
+                this.play.hide();
+            }
+ 
+            if (this.extension.duration) {
+				if (this.forward) full_w += control_icon_size;
+				if (this.extension.duration>1) {
+					if (this.extension.reverse_playback_supported && this.rewind) full_w += control_icon_size;
+					if (this.loop) full_w += control_icon_size;
+				}
+            }
+            else if (this.extension.movie_control.mediaStopTime < 0) {
+                if (this.forward) full_w += control_icon_size;
+            } else if (!is_over) {
+                if (this.forward) full_w += control_icon_size;
+            }
+
+            if ((this.extension.root_odm && this.extension.root_odm.main_addon_on) || this.extension.movie_control.mediaStopTime < 0) {
+                full_w += control_icon_size;
+                this.back_live.show();
+            } else {
+                this.back_live.hide();
+            }
+
+            if (this.remote && UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
+                full_w += control_icon_size;
+            }
+            time_w = this.media_line.visible ? 2 * control_icon_size : 0;
+
+            if (this.exit) {
+                if (gpac.fullscreen) {
+                    this.exit.show();
+                } else {
+                    this.exit.hide();
+                }
+            }
+
+            if (this.media_line.visible)
+                this.media_line.set_size(width - min_w - full_w, control_icon_size / 3);
+
+            if (this.snd_low) this.snd_low.show();
+            if (this.snd_ctrl) this.snd_ctrl.show();
+
+            if (this.extension.duration) {
+                if (this.forward) this.forward.show();
+				if (this.extension.duration>1) {
+					if (this.loop) this.loop.show();
+				}
+                if (this.stop) this.stop.show();
+            }
+            else if ((this.extension.movie_control.mediaStopTime < 0) || (this.extension.movie_control.mediaSpeed < 0)) {
+                if (this.extension.time_in_tsb > 2) {
+                    if (this.forward) this.forward.show();
+                } else {
+                    if (this.forward) this.forward.hide();
+                }
+            } else if (!is_over) {
+                if (this.forward) this.forward.show();
+            } else {
+                if (this.forward) this.forward.hide();
+            }
+            if (wnd.fullscreen) wnd.fullscreen.show();
+
+            if (this.remote) {
+                if (UPnP.MediaRenderersCount && (this.extension.current_url != '')) {
+                    this.remote.show();
+                } else {
+                    this.remote.hide();
+                }
+            }
+
+            if (show_navigate) {
+                this.navigate.show();
+            }
+
+            if ((this.extension.duration>1.0) || this.extension.timeshift_depth) {
+                this.media_line.show();
+                this.time.show();
+            } else {
+                this.media_line.hide();
+                this.time.hide();
+            }
+            //this.time.set_size(width - 6*control_icon_size, control_icon_size / 3);
+            this.media_line.set_size(width - this.time.width - 2 * control_icon_size, control_icon_size / 3);
+
+            //            this.infobar.set_size(width, control_icon_size);
+            this.infobar.set_size(width, height);
+            this.infobar.move(0, -0.1 * control_icon_size);
+        }
+
+        wnd.on_display_size = function (width, height) {
+			var h;
+
+			if (!gpac.fullscreen) {
+                if (width < this.extension.def_width) {
+                    gpac.set_size(this.extension.def_width, height);
+                    return;
+                }
+            } else {
+                if (width < this.extension.def_width) {
+                    this.extension.def_width = width;
+                }
+            }
+
+            //            this.set_size(w, 1.2 * gwskin.default_icon_height);
+
+            if (this.extension.movie_connected) {
+                h = 3.3 * gwskin.default_icon_height;
+                if (!this.media_line.visible) {
+                    h -= gwskin.default_icon_height;
+                }
+            }
+            else h = 1.1 * gwskin.default_icon_height;
+
+
+            this.set_size(this.extension.def_width, h);
+
+			this.extension.safe_interact.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+			this.extension.safe_interact.show();
+			this.extension.safe_interact.move((-gwskin.default_icon_height+width)/2, (gwskin.default_icon_height-height)/2);
+			
+            this.layout();
+        }
+
+        wnd.on_event = function (evt) {
+            if (this.infobar.on_event(evt)) return true;
+            return false;
+        }
+        //make the bar hitable so that clicking on it does not make it disappear
+        gw_object_set_hitable(wnd);
+        wnd.set_size(gw_display_width, 2.2 * gwskin.default_icon_height);
+        this.set_duration(0);
+        this.set_time(0);
+
+
+        this._evt_filter = null;
+    },
+
+    start: function () {
+        if (!this._evt_filter) {
+            this._evt_filter = this.create_event_filter(this);
+            gwlib_add_event_filter(this._evt_filter);
+        }
+
+		this.disabled = false;
+		
+        if (!this.movie) {
+            this.init_extension();
+
+            //check our args
+            var i, argc = gpac.argc;
+            var url_arg = null;
+            var prog_name = gpac.get_arg(0); 
+            var check_gpac_args = 1;
+            //check mp4client or MP4Client
+            if (prog_name && (prog_name.indexOf('lient')>=0))
+                check_gpac_args = 0;
+            
+            for (i = 1; i < argc; i++) {
+                var arg = gpac.get_arg(i);
+                if (!arg) break;
+
+                if (check_gpac_args==1) {
+                    if (arg=='-xopt') check_gpac_args=2;
+                    continue;
+                }
+
+                //that's our file
+                if (arg.charAt(0) != '-') {
+                    //do not reopen ourselves !
+                    if (arg.indexOf('gui.bt') >= 0) continue;
+
+                    if (arg.indexOf('://') < 0) url_arg = 'gpac://' + arg;
+                    else url_arg = arg;
+                    continue;
+                }
+
+                //MP4Client options taking 2 args
+                if (!check_gpac_args) {
+                    if ((arg == '-rti') || (arg == '-rtix') || (arg == '-p') || (arg == '-size') || (arg == '-lf') || (arg == '-log-file') || (arg == '-logs')
+                        || (arg == '-opt') || (arg == '-ifce') || (arg == '-views') || (arg == '-mosaic') || (arg == '-avi') || (arg == '-out') || (arg == '-ntp-shift')
+                        || (arg == '-fps') || (arg == '-scale') || (arg == '-run-for') || (arg == '-bl')
+                    ) {
+                        i++;
+                        continue;
+                    }
+                }
+
+                if (arg.startsWith('-service=')) {
+                    this.initial_service_id = parseInt(arg.substring(9));
+                } else if (arg.startsWith('-addon=')) {
+                    this.default_addon = arg.substring(7);
+                } else if (arg == '-loop') {
+                    this.initial_loop = true;
+                } else if ((arg == '-stats') || (arg == '-stat')) {
+                    this.show_stats_init = true;
+                } else if (arg == '-gui-test') {
+                    this.test_mode = true;
+                    this.show_stats_init = true;
+                } else if (arg.startsWith('-speed=')) {
+                    this.initial_speed = Number(arg.substring(7));
+                } else if (arg.startsWith('-play-from=')) {
+                    this.initial_start = Number(arg.substring(11));
+                } else {
+                    continue;
+                }
+                gpac.set_arg_used(i, true);
+            }
+
+            gwskin.media_url = '';
+            gwskin.pvr_url = '';
+            gwskin.media_time = 0;
+            gwskin.media_clock = 0;
+            gwskin.restore_session = this.create_restore_session(this);
+
+            if (url_arg != null) {
+                this.set_playlist_mode(false);
+                var def_addon = this.default_addon;
+                this.set_movie_url(url_arg);
+                gw_hide_dock();
+                this.default_addon = def_addon;
+                return;
+            }
+            this.set_playlist_mode(true);
+
+            /*
+            var label = '';
+            for (i = 1; i < argc; i++) {
+            label += '#'+i + ': ' + gpac.get_arg(i) + '\n';
+            }
+            var notif = gw_new_message(null, 'GPAC Arguments', label);
+            notif.show();
+            */
+
+        }
+
+        this.controler.show();
+        gw_hide_dock();
+
+    },
+
+    coverage_tests: function() {
+        gpac.trigger_gc();
+        gpac.navigation_supported(GF_NAVIGATE_EXAMINE);
+        gpac.move_window(0,0, true);
+        gpac.error_string(-1);
+        gpac.show_keyboard(true);
+        gpac.switch_quality(true);
+        var z = gpac.zoom;
+        z = gpac.text_selection;
+
+        var m = this.stats_resources[0];
+        //m.gui.info.on_click();
+        m.disable_main_addon();
+        m.select_service(0);
+        m.addon_layout(0,0);
+        m.declare_addon('gtest');
+        m.enable_addon('gtest');
+        m.select();
+        m.select_quality('0', 0);
+        m.select_quality('auto', 0);
+    },
+
+    create_event_filter: function (__anobj) {
+        return function (evt) {
+            return __anobj.ext_filter_event(evt);
+        }
+    },
+
+    create_restore_session: function (__anobj) {
+        return function (url, media_time, media_clock) {
+			__anobj.movie_connected = false;
+			__anobj.disabled = false;
+            __anobj.set_movie_url(url);
+            if (media_clock) {
+                var time_in_tsb = (new Date()).getTime() - media_clock;
+                if (time_in_tsb >= 0) {
+                    __anobj.initial_start = -time_in_tsb / 1000;
+                }
+
+            } else {
+                __anobj.initial_start = media_time;
+            }
+			if (!__anobj.movie_connected) {
+				__anobj.reverse_playback_supported = false;
+				__anobj.duration = 0;
+				__anobj.root_odm = null;
+			}
+			__anobj.controler.on_display_size(gw_display_width, gw_display_height);
+        }
+    },
+
+    declare_addons: function () {
+        if (this.default_addon && (this.default_addon != '')) {
+            var addon_url = this.default_addon;
+            if (addon_url.indexOf('://') < 0) addon_url = 'gpac://' + addon_url;
+            this.root_odm.declare_addon(addon_url);
+        }
+    },
+
+    set_time: function (value) {
+        var h, m, s, str;
+        str = '';
+        if (this.timeshift_depth) {
+            var pos = 100;
+            this.time_in_tsb = 0;
+
+            if ((this.movie_control.mediaStopTime < 0) || (this.movie_control.mediaSpeed <= 0)) {
+                this.time_in_tsb = this.root_odm.timeshift_time;
+                if (this.timeshift_depth > this.time_in_tsb) {
+                    pos = 100 * (this.timeshift_depth - this.time_in_tsb) / this.timeshift_depth;
+                } else if (this.time_in_tsb) {
+                    pos = 0;
+                }
+            }
+            this.controler.media_line.set_value(pos);
+
+            //we need to figure out if the main addon is on-demand content, in which case we have to store media time for session restore
+            var addon_media_time = this.root_odm.main_addon_media_time;
+            if (addon_media_time >= 0) {
+                gwskin.media_clock = 0;
+                gwskin.media_time = addon_media_time;
+            }
+            //if not, we will restore the session based on wallclock 
+            else {
+                gwskin.media_clock = (new Date()).getTime() - this.time_in_tsb * 1000;
+            }
+
+            if (!this.time_in_tsb) {
+                this.controler.time.set_label('');
+                this.controler.time.hide();
+                this.controler.layout();
+                return;
+            }
+
+            if (!this.controler.time.visible) {
+                this.controler.time.show();
+                this.controler.layout();
+            }
+            if (!this.controler.forward.visible) {
+                this.controler.forward.show();
+                this.controler.layout();
+            }
+            str = '-';
+            value = this.time_in_tsb;
+
+        } else {
+            if (!this.duration) {
+                if (this.controler.time.visible) {
+                    this.controler.time.hide();
+                    this.controler.layout();
+                }
+                return;
+            }
+
+            this.current_time = value;
+            gwskin.media_time = value;
+
+            if (this.duration) {
+                this.controler.media_line.set_value(100 * value / this.duration);
+            }
+            if (this.controler.time.reversed) {
+                value = this.duration - value;
+                str = '-';
+            }
+        }
+        if (this.test_mode && (value>3)) {
+            gpac.exit(3);                    
+        }
+
+        h = Math.floor(value / 3600);
+        value -= h * 3600;
+        m = Math.floor(value / 60);
+        value -= m * 60;
+        s = Math.floor(value);
+        if (h) {
+            if (h < 10) str += '0';
+            str += h + ':';
+        }
+        if (m < 10) str += '0';
+        str += m + ':';
+        if (s < 10) str += '0';
+        str += s;
+        this.controler.time.set_label(str);
+    },
+
+    set_duration: function (value) {
+        this.duration = value;
+        var dlg = this.controler;
+        if (!value) {
+            if (this.timeshift_depth > 0) {
+                return;
+            }
+            dlg.time.hide();
+            dlg.media_line.hide();
+            dlg.rewind.hide();
+            dlg.play.hide();
+            dlg.forward.hide();
+            dlg.loop.hide();
+            dlg.time.set_size(0, gwskin.default_icon_height);
+            dlg.time.set_width(0);
+        } else {
+			if (value>1) {
+				dlg.time.show();
+				dlg.media_line.show();
+				if (this.reverse_playback_supported) dlg.rewind.show();
+				dlg.loop.show();
+				if (value < 3600) {
+					dlg.time.set_size(gwskin.default_icon_height / 2, gwskin.default_icon_height);
+					dlg.time.set_width(3 * dlg.time.font_size());
+				} else {
+					dlg.time.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+					dlg.time.set_width(4 * dlg.time.font_size());
+				}
+			} else {
+				dlg.time.hide();
+				dlg.media_line.hide();
+				dlg.rewind.hide();
+				dlg.loop.hide();
+			}
+			dlg.stop.show();
+            dlg.forward.show();
+        }
+        dlg.on_display_size(gw_display_width, gw_display_height);
+    },
+    set_timeshift_depth: function (value) {
+        if (this.timeshift_depth == value) return;
+
+        this.timeshift_depth = value;
+        var dlg = this.controler;
+
+        this.reverse_playback_supported = this.root_odm.reverse_playback_supported;
+
+        if (!value) {
+            dlg.time.hide();
+            dlg.media_line.hide();
+            if (dlg.rewind) dlg.rewind.hide();
+            if (dlg.forward) dlg.forward.hide();
+            dlg.time.set_size(0, gwskin.default_icon_height);
+            dlg.time.set_width(0);
+        } else {
+            dlg.time.show();
+            dlg.media_line.show();
+
+            var w = 3 * dlg.time.font_size();
+            if (value > 3600) w += dlg.time.font_size();
+
+            dlg.time.set_size(w, gwskin.default_icon_height);
+            dlg.time.set_width(w);
+        }
+        dlg.on_display_size(gw_display_width, gw_display_height);
+    },
+
+    set_state: function (state) {
+        if (!this.movie_connected && !this.controlled_renderer) return;
+
+        if (state == this.state) return;
+
+        if (state == this.GF_STATE_STOP) {
+            if (this.stats_wnd) this.stats_wnd.close_all();
+            this.stoped_url = '' + this.current_url;
+            if (this.controlled_renderer) this.controlled_renderer.Stop();
+            else {
+                this.set_movie_url('');
+                /*override movie_connected to avoid auto-resizing*/
+                this.movie_connected = true;
+            }
+            this.movie_control.mediaStartTime = 0;
+            this.controler.media_line.set_value(0);
+            this.controler.play.switch_icon(this.icon_play);
+            this.state = this.GF_STATE_STOP;
+            this.set_speed(1);
+            this.stats_resources = [];
+            this.nb_objs_at_last_scan = 0;
+
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = false;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+            this.root_odm = null;
+			return;
+        }
+        if (state == this.GF_STATE_PAUSE) {
+            if (this.state == this.GF_STATE_STOP) return;
+            if (this.controlled_renderer) this.controlled_renderer.Pause();
+            this.state = this.GF_STATE_PAUSE;
+            this.controler.play.switch_icon(this.icon_play);
+            this.set_speed(0);
+
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = false;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+			return;
+        }
+        //we are playing, resume from stop if needed
+        if (this.stoped_url) {
+            if (this.controlled_renderer) {
+                this.controlled_renderer.Play();
+            } else {
+                this.set_movie_url(this.stoped_url, true);
+            }
+            this.stoped_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;
+        }
+
+
+        if (state == this.GF_STATE_PLAY) {
+            if (this.controlled_renderer) this.controlled_renderer.Play();
+            this.state = state;
+            this.controler.play.switch_icon(this.icon_pause);
+            if (this.movie_control.mediaSpeed != 1)
+                this.movie_control.mediaStartTime = -1;
+
+            if (this.timeshift_depth && (this.movie_control.mediaSpeed < 0)) {
+                this.movie_control.mediaStopTime = -this.root_odm.timeshift_time;
+            }
+
+            this.set_speed(1);
+			var e = {};
+			e.type = GF_JS_EVENT_PLAYBACK;
+			e.is_playing = true;
+			e.index = this.playlist_idx;
+			gwlib_filter_event(e);
+            return;
+        }
+        if (state == this.GF_STATE_TRICK) {
+            this.state = state;
+            this.controler.play.switch_icon(this.icon_play);
+            this.movie_control.mediaStartTime = -1;
+            return;
+        }
+    },
+
+
+    set_speed: function (value) {
+        this.movie_control.mediaSpeed = value;
+
+        if (!this.duration && this.timeshift_depth && !value) {
+            this.movie_control.mediaStopTime = -0.1;
+            //
+            this.movie_control.mediaStartTime = -1;
+        }
+        if (value && value != 1) {
+            if (value > 1)
+                this.controler.forward.set_label('x' + value);
+            else
+                this.controler.forward.set_label('x' + Math.round(100 * value) / 100);
+        } else {
+            this.controler.forward.set_label('');
+        }
+        this.controler.layout();
+    },
+
+    set_movie_url: function (url) {
+        this.initial_play_done = false;
+
+        gwskin.media_url = url;
+        gwskin.pvr_url = '';
+        if ((url == '') || (url == this.current_url)) {
+            this.movie.children[0].url[0] = url;
+            this.movie_control.url[0] = url;
+            this.movie_sensor.url[0] = url;
+            if (this.UPnP_Enabled) UPnP.MovieURL = url;
+            this.movie_connected = (url == '') ? false : true;
+            gpac.caption = url;
+            this.root_odm = null;
+			this.controler.layout();
+
+        } else if (this.controlled_renderer == null) {
+            //resume from stop  
+            if ((arguments.length == 2) && (arguments[1] == true)) {
+                this.current_url = url;
+                this.set_speed(1);
+                this.movie_control.mediaStartTime = 0;
+                this.movie_control.url[0] = url;
+                this.movie_sensor.url[0] = url;
+                this.movie.children[0].url[0] = url;
+                this.root_odm = null;
+                return;
+            }
+
+            this.default_addon = null;
+            this.root_odm = null;
+            this.stoped_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*/
+            var movie_inline = this.movie.children[0];
+            var temp_inline = new SFNode('Inline');
+
+            if (movie_inline.url[0] && (typeof movie_inline.url[0] != 'undefined')) {
+                temp_inline.url[0] = movie_inline.url[0];
+            }
+            this.movie.children[0] = temp_inline;
+            movie_inline.callback_done = false;
+            this.movie_connected = false;
+
+            /*handle navigation between local files*/
+            if ((this.current_url && this.current_url.indexOf('gpac://') >= 0) && (url.indexOf('://') < 0)) {
+                movie_inline.url[0] = "gpac://" + url;
+            } else {
+                movie_inline.url[0] = url;
+            }
+            if (!movie_inline.callback_done) {
+                gw_add_child(this.dictionary, movie_inline);
+            }
+
+            return;
+
+        } else {
+            var uri = UPnP.ShareResource(url);
+            this.controlled_renderer.Open(uri);
+        }
+        this.current_url = url;
+
+		if (this.disabled) return;
+        if (url == '') this.controler.show();
+        else this.controler.hide();
+
+    },
+
+
+    show_buffer: function (level) {
+        if (level < 0) return;
+        if (level >= 98) {
+            if (this.buffer_wnd) {
+                this.buffer_wnd.close();
+                this.buffer_wnd = null;
+            }
+            return;
+        }
+
+        if (!this.buffer_wnd) {
+            this.buffer_wnd = gw_new_window(null, true, true);
+            this.buffer_wnd.show_effect = 'notif';
+            this.buffer_wnd.txt = gw_new_text(this.buffer_wnd, '');
+            this.buffer_wnd.on_display_size = function (w, h) {
+                this.set_size(20 * gwskin.default_text_font_size, 2 * gwskin.default_text_font_size);
+                this.txt.set_width(20 * gwskin.default_text_font_size);
+                this.move(0, h / 2 - gwskin.default_text_font_size);
+            }
+            this.buffer_wnd.on_display_size(gw_display_width, gw_display_height);
+            this.buffer_wnd.set_alpha(0.9);
+            this.buffer_wnd.show();
+
+            this.buffer_wnd.timer = gw_new_timer(false);
+            this.buffer_wnd.timer.wnd = this.buffer_wnd;
+            this.buffer_wnd.timer.set_timeout(gwskin.default_message_timeout, false);
+            this.buffer_wnd.timer.start(0);
+            this.buffer_wnd.ext = this;
+            this.buffer_wnd.timer.on_active = function (val) {
+                if (!val) {
+                    this.wnd.ext.buffer_wnd = null;
+                    this.wnd.close();
+                }
+            }
+        }
+        this.buffer_wnd.timer.stop(gwskin.default_message_timeout);
+        this.buffer_wnd.txt.set_label('Buffering ' + level + ' %');
+    },
+
+    select_navigation_vr: function () {
+        var sensors_active = gpac.sensors_active;
+        var extension = this;
+//                      gpac.sensors_active = !sensors_active;
+//                      this.switch_icon(sensors_active ? 1 : 0);
+  
+        var nb_items = 0;
+        if (this.navigation_wnd) {
+            this.navigation_wnd.close();
+            return;
+        }
+        var wnd = gw_new_popup(this.controler.navigate, 'up');
+        this.navigation_wnd = wnd;
+        wnd.extension = this;
+
+        wnd.on_close = function () {
+            this.extension.navigation_wnd = null;
+        }
+        wnd.add_menu_item(sensors_active ? "Keyboard+mouse" : "Sensors", function () { gpac.sensors_active = !sensors_active; } );
+
+        if (this.view_stereo==extension.GF_VIEW_MONO) {
+            wnd.add_menu_item("Stereo", function () {
+                extension.view_stereo = extension.GF_VIEW_STEREO; 
+                gpac.set_option("Compositor", "stereo", "hmd"); 
+              }
+             );
+        } else if (this.view_stereo==extension.GF_VIEW_STEREO) {
+            wnd.add_menu_item("Stereo Side", function () {
+               extension.view_stereo = extension.GF_VIEW_STEREO_SIDE;
+               gpac.set_option("Compositor", "fpack", "side");
+               gpac.set_option("Compositor", "stereo", "hmd");
+              }
+             );
+        } else if (this.view_stereo==extension.GF_VIEW_STEREO_SIDE) {
+            wnd.add_menu_item("Stereo Top", function () {
+                 extension.view_stereo = extension.GF_VIEW_STEREO_TOP;
+                 gpac.set_option("Compositor", "fpack", "top");  
+                 gpac.set_option("Compositor", "stereo", "hmd");  
+                }
+            );
+        } else {
+            wnd.add_menu_item("Mono", function () {
+                extension.view_stereo = extension.GF_VIEW_MONO;
+                gpac.set_option("Compositor", "fpack", "none");  
+                gpac.set_option("Compositor", "stereo", "none");  
+            }
+            );
+        }
+        
+        wnd.on_display_size(gw_display_width, gw_display_height);
+        wnd.show();
+
+    },
+
+    select_navigation_type: function () {
+        var nb_items = 0;
+        var type = gpac.navigation;
+        if (this.navigation_wnd) {
+            this.navigation_wnd.close();
+            return;
+        }
+        var wnd = gw_new_popup(this.controler.navigate, 'up');
+        this.navigation_wnd = wnd;
+        wnd.extension = this;
+
+        wnd.on_close = function () {
+            this.extension.navigation_wnd = null;
+        }
+
+        wnd.select = function (type) {
+            this.extension.navigation_wnd = null;
+            if (type == 'reset') {
+                gpac.navigation_type = 0;
+            } else {
+                gpac.navigation = type;
+            }
+        }
+        wnd.make_select_item = function (text, type, current_type) {
+            if (current_type == type) text = '* ' + text;
+            if (gpac.navigation_supported(type)) {
+                wnd.add_menu_item(text, function () { this.select(type); });
+            }
+        }
+        wnd.add_menu_item('Reset', function () { this.select('reset'); });
+
+        wnd.make_select_item('None', GF_NAVIGATE_NONE, type);
+        wnd.make_select_item('Slide', GF_NAVIGATE_SLIDE, type);
+        wnd.make_select_item('Examine', GF_NAVIGATE_EXAMINE, type);
+
+        if (gpac.navigation_type == GF_NAVIGATE_TYPE_3D) {
+            wnd.make_select_item('Walk', GF_NAVIGATE_WALK, type);
+            wnd.make_select_item('Fly', GF_NAVIGATE_FLY, type);
+            wnd.make_select_item('Pan', GF_NAVIGATE_PAN, type);
+            wnd.make_select_item('Game', GF_NAVIGATE_GAME, type);
+            wnd.make_select_item('Orbit', GF_NAVIGATE_ORBIT, type);
+            wnd.make_select_item('VR', GF_NAVIGATE_VR, type);
+        }
+        wnd.on_display_size(gw_display_width, gw_display_height);
+        wnd.show();
+    },
+
+    streamlist_changed: function () {
+        this.services = [];
+
+        var root_odm = this.root_odm;
+
+        if (root_odm) {
+            for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+                var m = root_odm.get_resource(res_i);
+                if (!m || !m.service_id) continue;
+                var res = null;
+                for (var k = 0; k < this.services.length; k++) {
+                    if (this.services[k].service_id == m.service_id) {
+                        res = this.services[k];
+                        break;
+                    }
+                }
+                if (res == null) {
+                    this.services.push(m);
+                }
+            }
+        }
+
+        if (this.services.length <= 1) {
+            this.controler.channels.hide();
+            this.controler.channels.on_click = function () { }
+            this.controler.layout();
+		} else {
+			if (!this.controler.channels.visible) {
+				this.controler.channels.show();
+				this.controler.layout();
+			}
+
+			this.controler.channels.on_click = function () {
+
+				if (this.extension.channels_wnd) {
+					this.extension.channels_wnd.close();
+					return;
+				}
+				var wnd = gw_new_popup(this.extension.controler.channels, 'up');
+				this.extension.channels_wnd = wnd;
+				wnd.extension = this.extension;
+
+				wnd.on_close = function () {
+					this.extension.channels_wnd = null;
+				}
+
+				wnd.make_item = function (text, i) {
+					wnd.add_menu_item(text, function () {
+        			    this.extension.stats_resources = [];
+        			    this.extension.nb_objs_at_last_scan = 0;
+						this.extension.root_odm.select_service(this.extension.services[i].service_id);
+					});
+				}
+				for (var i = 0; i < this.extension.services.length; i++) {
+					var text = '';
+					var n = this.extension.services[i].service_name;
+					if (this.extension.root_odm.selected_service == this.extension.services[i].service_id) text += '* ';
+					if (n == null) n = 'Service ' + this.extension.services[i].service_id;
+					text += n;
+					wnd.make_item(text, i);
+				}
+				wnd.on_display_size(gw_display_width, gw_display_height);
+				wnd.show();
+			}
+		}
+		this.update_media_list();
+    },
+	
+	update_media_list: function() {
+		var root_odm = this.root_odm;
+		var nb_video = 0, nb_audio = 0, nb_subs = 0;
+		if (root_odm && this.dynamic_scene) {
+			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+				var m = root_odm.get_resource(res_i);
+				if (!m) continue;
+				if (root_odm.selected_service != m.service_id) continue;
+				if (m.get_srd() != null) continue;
+				
+				if (m.type == 'Video') nb_video++;
+				else if (m.type == 'Audio') nb_audio++;
+				else if (m.type == 'Text') nb_subs++;
+			}
+		}
+		if ((nb_video > 1) || (nb_audio > 1) || (nb_subs > 1)) {
+			this.controler.media_list.show();
+		} else {
+			this.controler.media_list.hide();
+			this.controler.layout();
+			return;
+		}
+
+		this.controler.media_list.on_click = function () {
+			
+			if (this.extension.medialist_wnd) {
+				this.extension.medialist_wnd.close();
+				return;
+			}
+			var wnd = gw_new_popup(this.extension.controler.media_list, 'up');
+			this.extension.medialist_wnd = wnd;
+			wnd.extension = this.extension;
+			
+            //todo - cleanup the rest of the code to use closures to pass the extension object
+			wnd.on_close = ( function (e) {
+                return function () { e.medialist_wnd = null; }
+			} ) (extension);
+
+			wnd.make_item = function (text, obj) {
+				wnd.add_menu_item(text, function () {
+								  obj.select()
+								  });
+			}
+			
+			for (var res_i = 0; res_i < root_odm.nb_resources; res_i++) {
+				var m = root_odm.get_resource(res_i);
+				if (root_odm.selected_service != m.service_id) continue;
+
+				if ((m.type == 'Video') && (nb_video>1)) {
+					var text = 'Video #'+m.id;
+					wnd.make_item(text, m);
+				} else if (m.type=='Audio' && (nb_audio>1)) {
+					var text = 'Audio '+m.lang;
+					wnd.make_item(text, m);
+				} else if (m.type=='Text' && (nb_subs>1)) {
+					var text = 'Subtitle '+m.lang;
+					wnd.make_item(text, m);
+				}
+			}
+			wnd.on_display_size(gw_display_width, gw_display_height);
+			wnd.show();
+		}
+	
+	},
+
+    gather_stats_resources: function (root, selected_service) {
+        //if not dynamic scene, add main OD to stats
+        if (!root.dynamic_scene) {
+            this.stats_resources.push(root);
+		}
+
+	
+        for (var res_i = 0; res_i < root.nb_resources; res_i++) {
+            var m = root.get_resource(res_i);
+            if (!m) continue;
+            if (m.disabled) continue;
+            if (m.service_id && (m.service_id != selected_service)) continue;
+
+			m.dependent_group_id=0;
+			this.stats_resources.push(m);
+			
+			var nb_deps = m.dependent_groups;
+			for (var dep_j=0; dep_j < nb_deps; dep_j++) {
+				var copy_m = root.get_resource(res_i);
+				copy_m.dependent_group_id = dep_j + 1;
+				this.stats_resources.push(copy_m);
+			}
+
+            if (m.type == 'Scene' || m.type == 'Subscene') {
+                this.gather_stats_resources(m);
+			}
+        }
+        this.nb_objs_at_last_scan = root.nb_resources;
+    },
+
+    stats_timer_on_event: function (val) {
+        var ext = this.ext;
+        var wnd = ext.stats_wnd;
+        var nb_buff = 0;
+        if (!ext.root_odm) return;
+
+        if (ext.nb_objs_at_last_scan != ext.root_odm.nb_resources) {
+          ext.stats_resources = [];
+          ext.gather_stats_resources(ext.root_odm, ext.root_odm.selected_service);
+          ext.reload_stats();
+        }
+        if (ext.stats_data.length >= ext.stats_window) {
+            ext.stats_data.splice(0, 1);
+        }
+
+        var stat_obj = {};
+        ext.stats_data.push(stat_obj);
+
+        var t = new Date()
+        stat_obj.time = Math.round(t.getTime() / 1000);
+        stat_obj.fps = Math.round(100 * gpac.fps) / 100;
+        stat_obj.cpu = gpac.cpu;
+        stat_obj.memory = Math.round(100 * gpac.memory / 1000 / 1000) / 100;
+        stat_obj.http_bandwidth = Math.round(gpac.http_bitrate);
+        stat_obj.bitrate = 0;
+        stat_obj.buffer = 0;
+        stat_obj.ntp_diff = 0;
+        stat_obj.quality = 0;
+
+        for (var i = 0; i < ext.stats_resources.length; i++) {
+            var m = ext.stats_resources[i];
+
+            var bl;
+            if (m.max_buffer) {
+                var speed = ext.movie_control.mediaSpeed;
+                if (speed < 0) speed = 1;
+                else if (speed == 0) speed = 1;
+                var buf = m.buffer / speed;
+                bl = 100 * buf / m.max_buffer;
+
+                if (stat_obj) {
+                    if (!stat_obj.buffer || (buf && buf < stat_obj.buffer)) {
+                        stat_obj.buffer = buf;
+                    }
+                }
+            }
+            else bl = 100;
+
+			if (m.dependent_group_id) {
+				var dq_idx=0;
+				while (1) {
+					var q = m.get_quality(dq_idx, m.dependent_group_id);
+					if (!q) break;
+					if (q.is_selected) {
+						stat_obj.quality += Math.round(q.bandwidth / 1000);
+					}
+					dq_idx++;
+				}
+			} else {
+				var nb_qual = m.nb_qualities;
+				for (var j = 0; j < nb_qual; j++) {
+					var q = m.get_quality(j);
+					if (q && q.is_selected) {
+						stat_obj.quality += Math.round(q.bandwidth / 1000);
+					}
+				}
+			}
+
+            if (stat_obj) {
+                stat_obj.ntp_diff = m.ntp_diff >= 0 ? m.ntp_diff : m.ntp_diff/1000;
+            }        
+
+            if (wnd) {
+                wnd.update_resource_gui(m, bl);
+            }
+
+            if (stat_obj) {
+                if (m.status != 'Stopped')
+                    stat_obj.bitrate += Math.round(m.avg_bitrate/1000);
+            }
+        }
+
+        if (wnd && stat_obj && ext.stats_data.length) {
+            wnd.update_series();
+        }
+    }
+	
+};
+

gpac-1.0.0.tar.gz/share/gui/extensions/player/playlist.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/player/stats.js Added

@@ -0,0 +1,615 @@
+
+extension.reload_stats = function () {
+    if (this.stats_wnd) {
+        this.stats_wnd.reload_request = true;
+        this.stats_wnd.close();
+    }
+}
+
+extension.view_stats = function () {
+
+    if (this.stats_wnd) {
+        this.stats_wnd.close();
+        this.stats_wnd = null;
+        return;
+    }
+
+    var wnd = gw_new_window_full(null, true, 'Stats');
+    gw_object_set_dragable(wnd);
+    this.stats_wnd = wnd;
+    wnd.extension = this;
+    wnd.reload_request = false;
+
+    wnd.area = gw_new_grid_container(wnd);
+    wnd.area.break_at_hidden = true;
+    wnd.area.spread_h = false;
+    wnd.area.spread_v = true;
+
+    var root_odm = this.root_odm;
+    var nb_http = root_odm.nb_http;
+    var nb_buffering = 0;
+    var nb_ntp_diff = 0;
+    var srd_obj = null;
+
+    wnd.has_select = false;
+
+    for (var res_i = 0; res_i < wnd.extension.stats_resources.length; res_i++) {
+        var m = wnd.extension.stats_resources[res_i];
+		var num_qualities;
+		var odm_srd = m.get_srd();
+        m.gui = {};
+		if (!srd_obj && odm_srd) srd_obj = m;
+		if (m.dependent_group_id) {
+			srd_obj = m;
+			odm_srd = m.get_srd(m.dependent_group_id);
+		}
+
+        var label = '' + m.type;
+		if (m.dependent_group_id) label += '(Dep. Group)';
+        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)';
+		
+		if (odm_srd) {
+		 label += ' (SRD ' + odm_srd.x + ',' + odm_srd.y + ',' + odm_srd.w + ',' + odm_srd.h + ')';
+		}
+
+        m.gui.txt = gw_new_text(wnd.area, label, 'lefttext');
+
+		num_qualities = m.nb_qualities;
+		if (m.dependent_group_id) {
+			var q = m.get_quality(1, m.dependent_group_id);
+			if (q) num_qualities=2;
+		}
+
+        if (num_qualities > 1) {
+            wnd.has_select = true;
+            m.gui.select_label = gw_new_button(wnd.area, 'Quality');
+            m.gui.select_label.odm = m;
+            m.gui.select_label.on_click = function () {
+                var idx = this.odm.gui.select.value;
+                if (this.odm.gui.selected_idx == idx) {
+                    this.on_long_click();
+                    return;
+                }
+
+                if (idx) {
+                    if (this.odm.gui.qualities[idx - 1].disabled) {
+                        var notif = gw_new_message(null, 'Cannot select representation', 'Representation has been disabled');
+                        notif.set_size(20 * gwskin.default_text_font_size, (2 * gwskin.default_icon_height + gwskin.default_text_font_size));
+                        notif.show();
+                        return;
+                    }
+                    this.odm.select_quality('' + (idx - 1), this.odm.dependent_group_id);
+                } else {
+                    this.odm.select_quality('auto', this.odm.dependent_group_id);
+
+                    this.odm.update_qualities();
+                }
+            }
+            m.gui.select_label.on_long_click = function () {
+                var idx = this.odm.gui.select.value;
+                if (!idx) return;
+                var q = this.odm.gui.qualities[idx - 1];
+
+                var iw = gw_new_window_full(null, true, 'Representation ' + q.ID + ' info');
+                gw_object_set_dragable(iw);
+                iw.area = gw_new_text_area(iw, '');
+
+                var label = 'Mime ' + q.mime + ' - codecs ' + q.codec;
+                label += '\n';
+                label += 'Bandwidth: ' + q.bandwidth;
+                label += '\n';
+                label += 'Enabled: ' + !q.disabled;
+                label += '\n';
+                if (q.width) {
+                    label += 'Size ' + q.width + 'x' + q.height + (q.interlaced ? ' interlaced @' : ' progressive @') + q.fps + ' FPS - SAR ' + q.par_num + '/' + q.par_den;
+                } else if (q.samplerate) {
+                    label += 'Samplerate ' + q.samplerate + ' Hz - ' + q.channels + ' channels';
+                }
+
+                iw.area.set_content(label);
+
+                iw.on_display_size = function (width, height) {
+                    var w = 25 * gwskin.default_text_font_size;
+                    var h = 2 * gwskin.default_icon_height + 5 * gwskin.default_text_font_size;
+                    this.set_size(w, h);
+                }
+
+                iw.on_display_size(gw_display_width, gw_display_height);
+                iw.set_alpha(0.9);
+                iw.show();
+            }
+
+            m.gui.select = gw_new_spincontrol(wnd.area, true);
+            m.gui.select.odm = m;
+            m.gui.select.on_click = function (val) {
+                this.odm.show_select(val);
+            }
+
+
+            m.update_qualities = function () {
+                var sel_idx = 0;
+                this.gui.qualities = [];
+				if (this.dependent_group_id) {
+					var dqidx=0;
+					while (1) {
+						var q = this.get_quality(dqidx, this.dependent_group_id);
+						if (!q) break;
+						this.gui.qualities.push(q);
+						dqidx++;
+					}
+				} else {
+					for (i = 0; i < this.nb_qualities; i++) {
+						var q = this.get_quality(i);
+						if (q) {
+							this.gui.qualities.push(q);
+						}
+					}
+				}
+                this.gui.qualities.sort(function (a, b) { return a.bandwidth - b.bandwidth });
+
+                for (i = 0; i < this.gui.qualities.length; i++) {
+                    if (this.gui.qualities[i].is_selected)
+                        sel_idx = i + 1;
+                }
+
+                this.gui.select.min = 0;
+                this.gui.select.max = this.gui.qualities.length;
+                if (this.gui.selected_idx != sel_idx) {
+                    this.show_select(sel_idx);
+                    this.gui.selected_idx = sel_idx;
+                    this.gui.select.value = sel_idx;
+                }
+            }
+
+            m.show_select = function (idx) {
+                if (!idx) {
+                    this.gui.select_label.set_label('Auto');
+                } else {
+                    var label = '';
+                    var q = this.gui.qualities[idx - 1];
+                    if (!q) return;
+
+                    if (q.is_selected) label += '*';
+
+                    if (q.width) {
+                        label += q.height + (q.interlaced ? 'i' : 'p');
+                    } else if (q.samplerate) {
+                        label += q.samplerate;
+                        if (q.channels) label += '/' + q.channels;
+                    }
+                    label += '@' + Math.round(q.bandwidth / 1000) + 'Kbps';
+
+                    this.gui.select_label.set_label(label);
+                }
+            }
+            m.update_qualities();
+        } else {
+            m.gui.select = null;
+            m.gui.select_label = null;
+            m.update_qualities = function () { }
+        }
+
+		m.gui.info = null;
+		if (!m.dependent_group_id) {
+		
+        m.gui.info = gw_new_icon(wnd.area, 'information');
+        m.gui.info.odm = m;
+        m.gui.info.on_click = function () {
+            if (this.odm.gui.info_wnd) {
+                this.odm.gui.info_wnd.close();
+                return;
+            }
+            var odm = this.odm;
+            var iw = gw_new_window_full(null, true, '' + odm.type + ' ' + odm.ID + ' statistics:');
+            odm.gui.info_wnd = iw;
+            gw_object_set_dragable(iw);
+            iw.odm = odm;
+
+            iw.on_close = function (width, height) {
+                this.timer.stop();
+                this.odm.gui.info_wnd = null;
+            }
+
+            iw.area = gw_new_text_area(iw, '');
+
+            iw.on_display_size = function (width, height) {
+                var w = 30 * gwskin.default_text_font_size;
+                var h = 2 * gwskin.default_icon_height + 11 * gwskin.default_text_font_size;
+                this.set_size(w, h);
+            }
+
+            iw.timer = gw_new_timer(false);
+            iw.timer.wnd = iw;
+            iw.timer.set_timeout(0.1, true);
+            iw.timer.on_event = function (val) {
+                var bw;
+                var m = this.wnd.odm;
+                if (!m) return;
+                var label = '';
+
+                this.wnd.children[0].spacing = 1.2;
+
+                if (m.width) {
+                    var fps = m.frame_duration;
+                    label += 'Size:' + m.width + 'x' + m.height;
+                    if (m.pixelformat) label += ' (' + m.par + ' ' + m.pixelformat + ')';
+                } else if (m.samplerate) {
+                    label += '' + m.samplerate + 'Hz ' + m.channels + ' channels';
+                }
+                label += '\n'
+                label += 'Status: ' + m.status + ' - clock time: ' + m.clock_time; // + ' (drift ' + m.clock_drift + ')';
+
+                label += '\n'
+                label += 'Composition Memory: ' + m.cb_unit_count + '/' + m.cb_capacity;
+
+                label += '\n'
+                label += 'Buffer: ' + m.buffer + ' ms (min ' + m.min_buffer + ' - max ' + m.max_buffer + ') ' + m.db_unit_count + ' AUs in DB';
+
+                label += '\n'
+                var dec_time = m.total_dec_time / m.dec_frames / 1000;
+                var max_time = m.max_dec_time / 1000;
+                label += '' + m.dec_frames + ' frames (' + m.drop_frames + ' dropped) - ' + Math.round(100 * dec_time) / 100 + ' ms/frame (max ' + Math.round(m.max_dec_time / 10) / 100 + ') ';
+
+                if (m.irap_frames && (m.dec_frames != m.irap_frames)) {
+                    label += '\n'
+                    dec_time = m.irap_dec_time / m.irap_frames / 1000;
+                    label += 'Average GOP size: ' + Math.round(m.dec_frames / m.irap_frames) + ' - ' + Math.round(100 * dec_time) / 100 + ' ms/irap (max ' + Math.round(m.irap_max_time / 10) / 100 + ') ';
+                }
+                label += '\n'
+                label += 'Average bitrate: ';
+                bw = m.avg_bitrate;
+                if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' Kbps';
+                else label += '' + Math.round(bw / 1000 / 1000) + ' Mbps';
+
+                label += ' - Maximum ';
+                bw = m.max_bitrate;
+                if (bw < 8000000) label += '' + Math.round(bw / 1000) + ' Kbps';
+                else label += '' + Math.round(bw / 1000 / 1000) + ' Mbps';
+
+                var bw = m.bandwidth_down;
+                if (bw) {
+                    label += '\n'
+                    label += 'Download bandwidth: ';
+                    if (bw < 8000) label += '' + bw + ' Kbps';
+                    else label += '' + Math.round(bw / 1000) + ' Mbps';
+                }
+                var sender_diff = odm.ntp_sender_diff;
+                if (sender_diff != null) {
+                    label += '\n'
+                    label += 'NTP transmission diff: ' + sender_diff + ' ms';                    
+                }
+
+                label += '\n'
+                label += 'Codec: ' + m.codec;
+
+                label += '\n'
+
+                var myurl;
+                if (m.service_url.indexOf('\\') >= 0) {
+                    myurl = m.service_url.split('\\');
+                } else {
+                    myurl = m.service_url.split('/');
+                }
+
+                label += 'Service: ' + myurl.pop();
+                if (m.service_id)
+                    label += ' - ID ' + m.service_id;
+
+                this.wnd.area.set_content(label);
+            }
+            iw.timer.start(0);
+            odm.gui.info_wnd.on_display_size(gw_display_width, gw_display_height);
+            odm.gui.info_wnd.set_alpha(0.9);
+            odm.gui.info_wnd.show();
+        }
+		}
+		
+        m.gui.buffer = null;
+        m.gui.play = null;
+
+        if (m.selected_service == m.service_id) {
+            if (m.max_buffer && !m.dependent_group_id) {
+                nb_buffering++;
+                m.gui.buffer = gw_new_gauge(wnd.area, 'Buffer');
+            }
+            if (m.ntp_diff || this.show_stats_init) nb_ntp_diff++;
+        } else if (!m.is_addon) {
+            m.gui.play = gw_new_icon(wnd.area, 'play');
+            m.gui.play.odm = m;
+            m.gui.play.wnd = wnd;
+            m.gui.play.on_click = function () {
+                this.odm.select_service(this.odm.service_id);
+                this.wnd.close_all();
+            }
+        }
+
+        nb_http += m.nb_http;
+
+        gw_new_separator(wnd.area);
+    }
+
+    wnd.http_control = null;
+    if (nb_http || wnd.has_select) {
+        wnd.http_text = gw_new_text(wnd.area, 'HTTP rate', 'lefttext');
+
+        wnd.http_control = gw_new_slider(wnd.area);
+
+        if (gpac.http_max_bitrate) {
+            var br = Math.round(100 * gpac.http_max_bitrate / 1000 / 1000) / 100;
+            if (br > 200) br = 200;
+            if (br <= 1) {
+                v = 30 * br;
+            } else if (br <= 10) {
+                v = 30 + 30 * br / 10;
+            } else if (br < 50) {
+                v = 60 + 20 * (br - 10) / 40;
+            } else {
+                v = 80 + 20 * (br - 50) / 150;
+            }
+            wnd.http_control.set_value(v);
+
+            wnd.http_text.set_label('HTTP cap ' + Math.round(gpac.http_max_bitrate / 10000)/100 + ' Mbps');
+        } else {
+            wnd.http_control.set_value(100);
+            wnd.http_text.set_label('HTTP cap off');
+        }
+
+        wnd.http_control.text = wnd.http_text;
+        wnd.http_control.on_slide = function (val) {
+            var br = 0;
+            if (val <= 30) {
+                br = val / 30;
+            } else if (val <= 60) {
+                br = 1 + 10 * (val - 30) / 30;
+            } else if (val < 80) {
+                br = 10 + 40 * (val - 60) / 20;
+            } else {
+                br = 50 + 150 * (val - 80) / 20;
+            }
+            if (br == 200) {
+                this.text.set_label('HTTP cap off');
+                gpac.http_max_bitrate = Math.round(0);
+            } else if (br == 0) {
+                this.text.set_label('HTTP disable');
+                gpac.http_max_bitrate = -1;
+            } else {
+                this.text.set_label('HTTP cap ' + Math.round(100 * br) / 100 + ' Mbps');
+                gpac.http_max_bitrate = Math.round(br * 1000000);
+            }
+        }
+
+        gw_new_separator(wnd.area);
+    }
+
+    wnd.srd_modes = null;
+	if (srd_obj) {
+        wnd.srd_text = gw_new_text(wnd.area, 'SRD Control', 'lefttext');
+        wnd.srd_modes = gw_new_button(wnd.area, 'Modes');
+		wnd.srd_modes.wnd = wnd;
+		wnd.srd_modes.srd_obj = srd_obj;
+		wnd.srd_modes.on_click = function() {
+			this.wnd.srd_selected_mode = this.wnd.srd_current_mode;
+			this.wnd.srd_set_mode(this.wnd.srd_current_mode);
+			this.srd_obj.select_quality(this.wnd.srd_selected_mode);
+		}
+		wnd.srd_select = gw_new_spincontrol(wnd.area, true);
+		wnd.srd_select.wnd = wnd;
+		wnd.srd_select.on_click = function (val) {
+			this.wnd.srd_set_mode(val);
+		}
+        wnd.srd_select.min = 0;
+        wnd.srd_select.max = 8;
+        wnd.srd_selected_mode = 0;
+		if (srd_obj.gui.qualities != null)
+			srd_obj.gui.qualities[0].tile_mode;
+        wnd.srd_current_mode = 0;
+		
+		wnd.srd_set_mode = function(mode) {
+		 var label = '';
+		 this.srd_current_mode = mode;
+		 if (this.srd_current_mode == this.srd_selected_mode) label='* ';
+
+		 switch (mode) {
+		 case 0: label+='Equal'; break;
+		 case 1: label+='Top Rows'; break;
+		 case 2: label+='Bottom Rows'; break;
+		 case 3: label+='Middle Rows'; break;
+		 case 4: label+='Left Column'; break;
+		 case 5: label+='Right Column'; break;
+		 case 6: label+='Middle Column'; break;
+		 case 7: label+='Center'; break;
+		 case 8: label+='Edges'; break;
+		 }
+		 this.srd_modes.set_label(label);
+		}
+		wnd.srd_set_mode(wnd.srd_selected_mode);
+	}
+
+    wnd.plot = gw_new_plotter(wnd.area);
+
+
+    wnd.on_display_size = function (width, height) {
+        var w;
+        var h = 2 * gwskin.default_icon_height;
+
+        w = 20 * gwskin.default_text_font_size;
+        w += 4 * gwskin.default_icon_height;
+        if (this.has_select)
+            w += 6 * gwskin.default_icon_height;
+
+        for (var i = 0; i < this.extension.stats_resources.length; i++) {
+            var res = this.extension.stats_resources[i];
+            var aw = w;
+
+            if (res.gui.info) {
+				res.gui.info.set_size(1.5 * gwskin.default_icon_height, gwskin.default_icon_height);
+				aw -= res.gui.info.width;
+			}
+            if (res.gui.buffer) {
+                res.gui.buffer.set_size(2 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+            }
+            if (res.gui.play) {
+                res.gui.play.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+            }
+            aw -= 4 * gwskin.default_icon_height;
+
+            if (res.gui.select) {
+                res.gui.select.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+                aw -= gwskin.default_icon_height;
+                res.gui.select_label.set_size(6 * gwskin.default_icon_height, 0.75 * gwskin.default_icon_height);
+                aw -= 4 * gwskin.default_icon_height;
+            }
+
+
+            res.gui.txt.set_size(aw, gwskin.default_icon_height);
+            res.gui.txt.set_width(aw);
+            h += gwskin.default_icon_height;
+        }
+
+        if (this.plot) {
+            this.plot.set_size(w, 8 * gwskin.default_icon_height);
+            h += 8 * gwskin.default_icon_height;
+        }
+
+        if (this.http_control) {
+            this.http_text.set_size(11 * gwskin.default_text_font_size, gwskin.default_icon_height);
+            var ch = 0.5 * gwskin.default_icon_height;
+            this.http_control.set_size(w - 11 * gwskin.default_text_font_size, ch, ch, ch);
+            h += gwskin.default_icon_height;
+        }
+		
+		if (this.srd_modes) {
+			var cw = 0.75 * gwskin.default_icon_height;
+			this.srd_text.set_size(12 * gwskin.default_text_font_size, gwskin.default_icon_height);
+			this.srd_modes.set_size(w - 12 * gwskin.default_text_font_size - gwskin.default_icon_height, cw);
+			this.srd_select.set_size(gwskin.default_icon_height, cw);
+		}
+
+        this.set_size(w, h);
+        this.move((w - width) / 2, (height - h) / 2);
+    }
+    wnd.on_close = function () {
+        //this.timer.stop();
+        //this.objs = [];
+        if (this.reload_request) {
+            var translation = this.extension.stats_wnd.translation;
+            this.extension.stats_wnd = null;
+            this.extension.view_stats();
+            this.extension.stats_wnd.translation = translation;
+        } else {
+            this.extension.stats_wnd = null;
+        }
+    }
+
+    var label = 'Statistics (' + gpac.nb_cores + ' cores - ';
+    if (gpac.system_memory > 1000000000) label += '' + Math.round(gpac.system_memory / 1000 / 1000 / 1000) + ' GB RAM)';
+    else label += '' + Math.round(gpac.system_memory / 1000 / 1000) + ' MB RAM)';
+
+    wnd.set_label(label);
+
+    if (wnd.plot) {
+        wnd.s_fps = wnd.plot.add_serie('FPS', 'Hz', 0.8, 0, 0);
+        if (nb_http) {
+            wnd.s_bw = wnd.plot.add_serie('BW', 'Kbps', 0.8, 0, 0.8);
+        } else {
+            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_buffering)
+            wnd.s_buf = wnd.plot.add_serie('Buffer', 'ms', 0, 0, 0.8);
+        else
+            wnd.s_buf = null;
+
+        if (nb_ntp_diff)
+            wnd.s_ntp = wnd.plot.add_serie('E2E delay', 'ms', 0, 0.3, 0.8);
+        else
+            wnd.s_ntp = null;
+
+        wnd.s_cpu = wnd.plot.add_serie('CPU', '%', 0, 0.5, 0.5);
+        wnd.s_mem = wnd.plot.add_serie('MEM', 'MB', 0.5, 0.5, 0);
+
+    }
+
+    wnd.update_series = function() {
+        var ext = this.extension;
+        var length = (ext.stats_data.length > ext.stats_window ? stats_window : ext.stats_data.length);
+
+        this.s_fps.refresh_serie(ext.stats_data, 'time', 'fps', length, 4);
+        if (this.s_bw) {
+            this.s_bw.refresh_serie(ext.stats_data, 'time', 'http_bandwidth', length, 1);
+        }
+        if (this.s_buf) {
+            this.s_buf.refresh_serie(ext.stats_data, 'time', 'buffer', length, 1.5);
+        }
+        var stat_obj = ext.stats_data[ext.stats_data.length-1];
+        if (stat_obj.bitrate) {
+            this.s_bitrate.refresh_serie(ext.stats_data, 'time', 'bitrate', length, 2);
+        }
+        if (this.s_ntp) {
+            this.s_ntp.refresh_serie(ext.stats_data, 'time', 'ntp_diff', length, 3);
+        }
+        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);
+    }
+
+    wnd.quality_changed = function () {
+        for (var i = 0; i < this.extension.stats_resources.length; i++) {
+            var m = this.extension.stats_resources[i];
+            m.update_qualities();
+        }
+    }
+    wnd.close_all = function () {
+        for (var i = 0; i < this.extension.stats_resources.length; i++) {
+            if (this.extension.stats_resources[i].gui.info_wnd) {
+                this.extension.stats_resources[i].gui.info_wnd.odm = null;
+                this.extension.stats_resources[i].gui.info_wnd.close();
+            }
+        }
+        this.extension.stats_resources.length = 0;
+        this.close();
+    }
+
+    wnd.update_resource_gui = function(m, bl) {
+        if (m.gui && m.gui.buffer) {
+			var odm_srd = m.get_srd();
+
+			if (m.dependent_group_id) {
+				odm_srd = m.get_srd(m.dependent_group_id);
+			}
+
+            var label = ' ' + m.type;
+
+			if (m.dependent_group_id) label += '(Dep. Group)';
+			else if (m.scalable_enhancement) label += ' (Enh. Layer)';
+            else if (m.width) label += ' (' + m.width + 'x' + m.height + ')';
+            else if (m.samplerate) label += ' (' + Math.round(m.samplerate / 10) / 100 + ' kHz ' + m.channels + ' ch)';
+            else if (m.scalable_enhancement) label += ' (Enh. Layer)';
+
+			if (odm_srd) {
+				label += ' (SRD ' + odm_srd.x + ',' + odm_srd.y + ',' + odm_srd.w + ',' + odm_srd.h + ')';
+			}
+
+            var url = m.service_url;
+/*
+            if ((url.indexOf('udp://') >= 0) || (url.indexOf('rtp://') >= 0) || (url.indexOf('dvb://') >= 0))
+                label += ' Broadcast';
+            else if ((url.indexOf('file://') >= 0) || (url.indexOf('://') < 0))
+                label += ' File';
+            else
+                label += ' Broadband';
+*/
+            m.gui.txt.set_label(label);
+            m.gui.buffer.set_value(bl);
+            m.gui.buffer.set_label('' + Math.round(m.buffer / 10) / 100 + ' s');
+        }
+    }
+
+    wnd.on_display_size(gw_display_width, gw_display_height);
+    wnd.set_alpha(0.9);
+    wnd.show();
+};
+

gpac-1.0.0.tar.gz/share/gui/extensions/showroom Added

gpac-1.0.0.tar.gz/share/gui/extensions/showroom/init.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/showroom/osmo.bt Changed

gpac-1.0.0.tar.gz/share/gui/extensions/showroom/showroom.js Changed

gpac-1.0.0.tar.gz/share/gui/extensions/widget_manager Added

gpac-1.0.0.tar.gz/share/gui/extensions/widget_manager/applications-system.svg Changed

gpac-1.0.0.tar.gz/share/gui/extensions/widget_manager/init.js Added

@@ -0,0 +1,927 @@
+/*container for widgets*/
+widget_display = gw_new_container();
+widget_display.on_event = function(evt) 
+{
+ if(!widget_display.children.length) return false;
+ return widget_display.children[widget_display.children.length-1].on_event(evt);
+}
+
+widget_tool_size = 18;
+widget_min_size = 5*widget_tool_size;
+widget_default_size = 100;
+
+
+function check_widget_display(width, height) 
+{
+	var count = WidgetManager.num_widgets;
+	for (var i=0; i<count; i++) {
+	  var x, y;
+		var wid = WidgetManager.get(i);
+		if (wid == null) continue;
+		if (!wid.visible) continue;
+		
+	  x = wid.x;
+    y = wid.y;
+		if (x-wid.width/2 <= -width/2) x = wid.width/2-width/2;
+		else if (x+wid.width/2 >= width/2) x = width/2 - wid.width/2;
+		
+		if (y + wid.height/2 >= height/2) y = height/2 - wid.height/2;
+		else if (y  - wid.height/2 <= - height/2) y = -height/2 + wid.height/2;
+
+		if (wid.widget_control) wid.widget_control.move(x, y);
+	}
+}
+
+function scan_directory(dir)
+{
+	var i, j, count, list, new_wid, uri;
+	list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
+	for (i=0; i<list.length; i++) {
+		uri = list[i].path + list[i].name;
+		if (list[i].directory) {
+			scan_directory(uri);
+		} else {
+			count = WidgetManager.num_widgets;
+			for (j=0; j<count; j++) {
+				var wid = WidgetManager.get(j);
+				if (wid.url==uri) break;
+			}
+			if (j==count) {
+				new_wid = WidgetManager.open(uri, null);
+				if (new_wid!=null) {
+					widget_insert_icon(new_wid);
+				}
+			}
+		}
+	}
+}
+
+widman_cfg_dlg = null; 
+
+function open_widget_manager(extension)
+{
+  if (widman_cfg_dlg) return;
+
+  widman_cfg_dlg = gw_new_window_full(null, true, 'Widget Manager');
+  widman_cfg_dlg.area = gw_new_grid_container(widman_cfg_dlg);
+
+  var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.add, 'Add widget', 'icon_label');
+  icon.on_click = function() {
+    widman_cfg_dlg.close();
+    widman_cfg_dlg = null;
+    
+    var filebrowse = gw_new_file_open();
+    filebrowse.show_directory = true;
+    filebrowse.filter = '*.xml;*.wgt;*.mgt';
+    filebrowse.browse(WidgetManager.last_widget_dir);  
+  
+    filebrowse.on_browse = function(value, directory) {
+  		var new_wid = WidgetManager.open(value, null);
+	  	if (new_wid==null) return;
+		  WidgetManager.last_widget_dir = directory;
+		  widget_insert_icon(new_wid);
+		  dock.layout(dock.width, dock.height);
+		  show_dock(true);
+    }
+    filebrowse.on_directory = function(directory) {
+  		WidgetManager.last_widget_dir = directory;
+   		scan_directory(directory);
+		  show_dock(true);
+    }
+    filebrowse.set_size(320 , 240);
+    gpacui_show_window(filebrowse);
+  }
+var icon = gw_new_icon_button(widman_cfg_dlg.area, gwskin.images.trash, 'Remove all widgets', 'icon_label');
+  icon.on_click = function() {
+		while (1) {
+			var wid = WidgetManager.get(0);
+			if (wid==null) break;
+			widget_remove(wid);
+		}
+    widman_cfg_dlg.close();
+    widman_cfg_dlg = null;
+	  dock.layout(dock.width, dock.height);
+	  show_dock(true);
+  }
+  widman_cfg_dlg.on_close = function() {
+   widman_cfg_dlg = null;
+  }
+  widman_cfg_dlg.set_size(320 , 240);
+  gpacui_show_window(widman_cfg_dlg);
+}
+
+function widget_insert_icon(new_wid) {
+	var icon = gpacui_insert_dock_icon(new_wid.name, widget_get_icon(new_wid) );
+	new_wid.in_panel = true;
+	new_wid.visible = false;
+	new_wid.icon_dock = icon;
+	icon.on_click = on_widget_launch;
+	icon.widget = new_wid;
+}
+
+function collapsable_list(info_dlg, title)
+{
+	var info = gw_new_button(info_dlg.area, title, 'button');
+	var children = info_dlg.area.get_children();
+	
+	info.first_idx = children.length;
+	info.dlg = info_dlg;
+	info.displayed = true;
+  info.on_click = function() {
+   var children = this.dlg.area.get_children();
+   this.displayed = !this.displayed;
+	 for (var i=this.first_idx; i<this.last_idx; i++) {
+    if (this.displayed) children[i].show();
+    else children[i].hide();
+  	
+    if (typeof children[i].last_idx != 'undefined') {
+      if (!children[i].displayed) children[i].on_click();
+     }
+   }
+   this.dlg.area.layout_changed();
+  }
+  return info;
+}
+
+//widget information dialog
+function display_widget_info(wid)
+{
+	var i, j, k, info;
+	var y, txt, pref;
+
+	var info_dlg = gw_new_window_full(null, true, 'Widget ' + wid.name + ' Information', 'window', null);
+//  info_dlg.area = gw_new_grid_container(info_dlg);
+  info_dlg.area = gw_new_listbox(info_dlg);
+ 
+	var info = collapsable_list(info_dlg, 'Widget Metadata');
+	
+  gw_new_text(info_dlg.area, 'id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'text');
+  gw_new_text(info_dlg.area, 'version: '+wid.version, 'text');
+  gw_new_text(info_dlg.area, 'content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'text');
+  gw_new_text(info_dlg.area, 'default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'text');
+  gw_new_text(info_dlg.area, 'license: '+wid.license, 'text');
+  gw_new_text(info_dlg.area, 'license ref: '+wid.licenseHref, 'text');
+  gw_new_text(info_dlg.area, 'description: '+wid.description, 'text');
+  gw_new_text(info_dlg.area, 'author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'text');
+  gw_new_text(info_dlg.area, 'author href: '+wid.authorHref, 'text');
+  gw_new_text(info_dlg.area, 'view modes: '+wid.viewmodes, 'text');
+  gw_new_text(info_dlg.area, 'UUID: '+wid.uuid, 'text');
+  gw_new_text(info_dlg.area, 'Discardable: '+wid.discardable, 'text');
+  gw_new_text(info_dlg.area, 'Muliple Instances: '+wid.discardable, 'text');
+	var icons = wid.icons;
+	for (j=0; j<icons.length; j++) {
+    gw_new_text(info_dlg.area, 'Icon #'+(j+1)+': ' + icons[j].src, 'text');
+	}
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+	info = collapsable_list(info_dlg, 'Widget Manager Info');
+
+	gw_new_text(info_dlg.area, 'nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'text' );
+	gw_new_text(info_dlg.area, 'Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'text' );
+	if (wid.is_component) {
+		gw_new_text(info_dlg.area, 'parent widget name' + wid.parent.name, 'text');
+	}
+	if (wid.originating_device_ip) {
+		gw_new_text(info_dlg.area, 'Widget was pushed from device IP '+wid.originating_device_ip, 'text' );
+	}
+	gw_new_text(info_dlg.area, 'Section name in GPAC config file: '+wid.section, 'text' );
+	gw_new_text(info_dlg.area, 'UA Locale: ' + gpac.get_option('core', 'lang'), 'text');
+	gw_new_text(info_dlg.area, 'widget src: ' + wid.url , 'text');
+	gw_new_text(info_dlg.area, 'config src: ' + wid.manifest , 'text');
+	gw_new_text(info_dlg.area, 'content src : '+wid.localizedSrc, 'text' );
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+	pref = wid.features;
+	if (pref.length) {
+  	info = collapsable_list(info_dlg, 'Features');
+  	for (j=0; j<pref.length; j++) {
+  		gw_new_text(info_dlg.area, 'Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'text');
+  	}
+  	info.last_idx = info_dlg.area.get_children().length;
+  	info.on_click();
+  }
+
+	pref = wid.preferences;
+	if (pref.length) {
+  	info = collapsable_list(info_dlg, 'Preferences');
+  	for (j=0; j<pref.length; j++) {
+  		var val = pref[j].value;
+  		if (val == '') val = gpac.get_option(wid.section, pref[j].name);
+  		gw_new_text(info_dlg.area, 'Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'text');
+  	}
+  	info.last_idx = info_dlg.area.get_children().length;
+  	info.on_click();
+  }
+
+	info = collapsable_list(info_dlg, 'MPEG-U Migration Context');
+	txt=wid.get_context();
+	if (!txt) txt='';
+
+	while (1) {
+		var idx = txt.indexOf('\n', 0);
+		if (idx>0) {
+			gw_new_text(info_dlg.area, txt.substring(0, idx), 'text');
+			txt = txt.substring(idx+1, txt.length);
+		} else {
+			gw_new_text(info_dlg.area, txt, 'text');
+			break;
+		}
+	}
+	info.last_idx = info_dlg.area.get_children().length;
+	info.on_click();
+
+  if (wid.num_interfaces) {
+  	info = collapsable_list(info_dlg, 'MPEG-U Interfaces', 'button');
+ 		var spacer = gw_new_text(info_dlg.area, '', 'text');
+  	spacer.hide();
+  	info.first_idx = info_dlg.area.get_children().length;
+    for (j=0; j<wid.num_interfaces; j++) {
+  		var idx;
+  		var ifce = wid.get_interface(j);
+    	var item = collapsable_list(info_dlg, 'Interface #' + (j+1) + ' type: '+ifce.type);
+      item.sublist = true;
+  		gw_new_text(info_dlg.area, 'Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'text');
+  		for (k=0; k<ifce.num_messages; k++) {
+  			var string, l;
+  			var msg = ifce.get_message(k);
+  			string = '  Message #'+ (k+1) + ':   ' + msg.name + '(';
+  			for (l=0; l<msg.num_params; l++) {
+  				par = msg.get_param(l);
+  				string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
+  			}
+  			string += ')';
+  			gw_new_text(info_dlg.area, string, 'text');
+  		}
+  	  item.last_idx = info_dlg.area.get_children().length;
+    	item.on_click();
+    	item.hide();
+  	}
+  	info.last_idx = info_dlg.area.get_children().length;
+  	info.on_click();
+  }
+
+  info_dlg.area.spread_h = true;
+  info_dlg.area.break_at_hidden = true;
+  
+  info_dlg.on_size = function(width, height) {
+   var i;
+   var children = this.area.get_children();
+   for (i=0; i<children.length; i++) {
+    if ((typeof children[i].first_idx != 'undefined') && (typeof children[i].sublist== 'undefined')) {
+      children[i].set_size( (width>200) ? 200 : width, 20);
+    } else {
+      children[i].set_size(width, 16);
+    }
+   }
+  }
+  
+  info_dlg.on_event = function(evt) {
+   if (this.area && this.area.on_event(evt)) return true;
+   return false;
+  }
+
+  info_dlg.set_size(320, 240);
+  gpacui_show_window(info_dlg);
+}
+
+
+//widget close function
+function widget_close(widget, force_remove)
+{
+	var is_comp = widget.is_component;
+
+	if (widget.visible) {
+		widget.visible = false;
+		WidgetManager.corein_message(widget, 'hide');
+		WidgetManager.corein_message(widget, 'deactivate');
+		widget.deactivate();
+		/*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
+		if (widget.widget_control) {
+			widget.widget_control.set_url('');
+			widget.widget_control.close();
+		}
+	}
+	if (!is_comp && (!widget.permanent || force_remove)) {
+		WidgetManager.unload(widget, force_remove ? true : false);
+	}
+}
+
+//widget remove function (close and unregister)
+function widget_remove(wid) {
+	if (typeof(wid.icon_dock) != 'undefined') {
+		wid.icon_dock.close();
+    wid.icon_dock = null;
+	}		
+	widget_close(wid, 1);
+}
+
+function new_migrate_callback(widget) {
+ return function(renderer) {
+  WidgetManager.migrate_widget(renderer, widget);
+	widget_close(widget, 0);
+ }
+}
+
+function on_widget_load() 
+{
+	WidgetManager.corein_message(this, 'activate');
+	WidgetManager.corein_message(this, 'show');
+	WidgetManager.corein_message(this, 'setSize', 'width', this.width, 'height', this.height, 'dpi', screen_dpi);
+}
+
+
+mpegu_targets = null;
+
+function select_mpegu_target(callback)
+{ 
+  if (mpegu_targets) return;
+  mpegu_targets = gw_new_file_open();
+  mpegu_targets.set_label('Select Remote Display');
+  mpegu_targets.callback = callback;
+
+  mpegu_targets.on_close = function() {
+   mpegu_targets = null;
+  }
+  /*override browse function*/
+  mpegu_targets._on_mpegu_click = function() {
+   	var target = (this.render_idx<0) ? null : WidgetManager.get_mpegu_service_providers(this.render_idx);
+
+		mpegu_targets.callback(target);
+		mpegu_targets.callback = null;
+    mpegu_targets.close();
+    mpegu_targets = null;
+  }
+  mpegu_targets._browse = function(dir, up) {
+   var w, h, i, y;
+   this.area.reset_children();
+ 
+   for (i=0; ; i++) {
+		var target = WidgetManager.get_mpegu_service_providers(i);
+		if (!target) break;
+		var	icon = 'icons/applications-internet.svg';
+    var item = gw_new_icon_button(this.area, icon, target.Name);
+    item.set_size(item.width, item.height);
+    item.render_idx = i;
+    item.on_click = this._on_mpegu_click;
+   }  
+   this.layout(this.width, this.height);
+ }
+ mpegu_targets.browse('');  
+ mpegu_targets.go_up.hide();
+ mpegu_targets.set_size(display_width, display_height);
+ gpacui_show_window(mpegu_targets);
+}
+
+
+function new_widget_control(widget)
+{
+  var ctrl;
+  
+
+  var inline = gw_new_subscene(null);
+  ctrl = gw_new_window_full(widget_display, true, null, 'offscreen', inline);
+	ctrl.set_size(widget.width, widget.height);
+
+  ctrl.inline = inline;
+  ctrl.tools.spread_h = true;
+  
+	ctrl.component_bound = false;
+	ctrl.widget = widget;
+	widget.widget_control = ctrl;  
+	widget.visible = true;
+  
+  ctrl.on_close = function() {
+  	this.inline.url[0] = '';
+  	this.widget.widget_control = null;  
+		if (this.widget.discardable) widget_remove(this.widget);
+		else widget_close(this.widget, 0);
+		this.widget = null;
+  }
+
+  ctrl.tools.hide();
+  gw_object_set_dragable(ctrl);
+
+  gw_object_set_hitable(ctrl);
+  ctrl.controls_visible = false;
+
+	this.maximized = false;
+  ctrl.on_double_click = function() {
+   if (this.maximized) {
+		this.maximized = false;
+		this.move(this.widget.x, this.widget.y);
+		this.set_size(this.prev_width, this.prev_height);
+   } else {
+		this.maximized = true;
+		this.prev_width = this.widget.width;
+		this.prev_height = this.widget.height;
+		this.move(0, 0);
+		this.set_size(display_width, display_height);
+   }   
+   this.controls_visible = false;
+   this.tools.hide();
+  }
+
+  ctrl.on_click = function() {
+    this.controls_visible = ! this.controls_visible;
+    if (this.controls_visible) this.tools.show();
+    else this.tools.hide();
+  }
+  /*push on top*/
+  ctrl.on_down = function(value) {
+		if (value) return;
+		if (this.widget==null) return;
+
+		//widget is a component, do not push on top but hide some controls
+		if (this.widget.is_component) {
+			if (this.component_bound) {
+			  var chldren = this.tools.get_children();
+				children[0].hide(); //close
+				children[1].hide(); //remove
+				children[4].hide(); //resize
+			}
+			return;
+		}
+		//otherwise push widget on top
+		widget_display.push_to_top(this);
+		//and push components
+		comps = this.widget.components;
+		for (i=0; i<comps.length; i++) {
+			if (comps[i].widget_control && comps[i].widget_control.component_bound) {
+				widget_display.push_to_top(comps[i].widget_control);
+			}
+		}
+  }
+
+  ctrl._orig_move = ctrl.move;
+  ctrl.move = function(x, y) {
+    this.widget.x = x;
+		this.widget.y = y;
+		this._orig_move(x, y);
+	}
+
+  ctrl.on_drag = function(x, y) {
+		if (this.maximized) return;
+    this.move(x, y);
+  }
+  ctrl.on_event = function(evt) {
+   var x, y;
+   if (evt.type != GF_EVENT_KEYDOWN) return false;
+   if (!this.controls_visible) return false;
+
+   x = this.widget.x;
+   y = this.widget.y;
+   if (evt.keycode=='Up') y += 10;
+   else if (evt.keycode=='Down') y -= 10;
+   else if (evt.keycode=='Left') x -= 10;
+   else if (evt.keycode=='Right') x += 10;
+   else return false;
+   this.move(x, y);
+   return true;
+  }
+ 
+  /*widget is not temporary*/
+	if (!widget.discardable && widget.icon_dock) {
+    var icon = ctrl.add_tool(gwskin.images.trash, gwskin.labels.trash);
+    icon.on_click = function() { widget_remove(this.dlg.widget); };  
+  }
+  
+  if (UPnP_Enabled) {
+    ctrl.remote = ctrl.add_tool(gwskin.images.remote_display, gwskin.labels.remote_display);
+    ctrl.remote.on_click = function() { 
+      var dlg = select_mpegu_target(new_migrate_callback(this.dlg.widget) );    
+    };  
+  	
+    ctrl.show_remote = function(show) {
+     if (show) this.remote.show();
+     else this.remote.hide();
+    }
+  }  
+
+  var icon = ctrl.add_tool(gwskin.images.information, gwskin.labels.information);
+  icon.on_click = function() { 
+    display_widget_info(this.dlg.widget); 
+  };  
+
+  var icon = ctrl.add_tool(gwskin.images.resize, gwskin.labels.resize);
+  gw_object_set_dragable(icon);
+	ctrl.prev_x=0;
+	ctrl.prev_y=0;
+  icon.begin_drag = function() {
+  	this.dlg.prev_x=this.startx;
+	  this.dlg.prev_y=this.starty;
+  }
+  icon.on_drag = function(valx, valy) {
+    var _dlg = this.dlg;
+		if (_dlg.widget.width + 2*(valx - _dlg.prev_x) < widget_min_size) return;
+		if (_dlg.widget.height + 2*(valy-_dlg.prev_y) < widget_min_size) return;
+
+		_dlg.widget.width += 2*(valx - _dlg.prev_x);
+		_dlg.prev_x = valx;
+		_dlg.widget.height += 2*(valy - _dlg.prev_y);
+		_dlg.prev_y = valy;
+		_dlg.set_size(_dlg.widget.width, _dlg.widget.height);
+  }
+  
+  ctrl.set_url = function(url) {
+ 	 ctrl.inline.url[0] = url;
+  }
+  ctrl.predestroy = function() {
+   this.inline = null;
+   this.remote = null;
+   this.widget = null;
+  }
+		
+	ctrl.sub_w = 0;
+	ctrl.sub_h = 0;
+	ctrl.sub_x = 0;
+	ctrl.sub_y = 0;
+	ctrl.sub_vp_w = 0;
+	ctrl.sub_vp_h = 0;
+
+  ctrl.on_widget_vp_changed = function(evt) {
+		this.sub_vp_w = evt.width;
+		this.sub_vp_h = evt.height;
+		this.sub_vp_x = evt.offset_x;
+		this.sub_vp_y = evt.offset_y;
+		this.sub_w = evt.vp_width;
+		this.sub_h = evt.vp_height;
+  }
+	ctrl.inline.addEventListener('gpac_vp_changed', ctrl.on_widget_vp_changed, 0);
+		
+//  ctrl.set_tool_size(widget_tool_size);  
+	ctrl.set_size(widget.width, widget.height);
+	if (widget.x < -display_width/2) widget.x = 0;
+	else if (widget.x > display_width/2) widget.x = 0;
+	if (widget.y < -display_height/2) widget.y = 0;
+	else if (widget.y > display_height/2) widget.y = 0;
+	ctrl.move(widget.x, widget.y);
+
+	/*this will setup the scene graph for the widget in order to filter input and output communication pins*/
+	widget.activate(ctrl.inline);
+
+	ctrl.set_url(widget.main);
+
+	/*send notifications once the widget scene is loaded*/
+	widget.on_load = on_widget_load;
+
+  ctrl.show();
+  return ctrl;
+}
+
+function flash_window(wnd) {
+	wnd.time = gw_new_timer(true);
+	wnd.time.set_timeout(0.25, true);
+	wnd.time.ctrl = wnd;
+	wnd.time.on_fraction = function(val) {
+		var scale = (val<0.5) ? 1+val/2 : 1.5-val/2;
+		this.ctrl.scale.x = this.ctrl.scale.y = scale;
+	}
+	wnd.time.on_active = function (val) {
+		 if (!val) {
+      this.ctrl.time = null;
+      this.ctrl = null;
+     }
+  }
+	wnd.time.stop(1);
+	wnd.time.start(0);
+}
+
+//widget launcher function
+function widget_launch(wid) {
+	var widg_ctrl;
+
+	//assign default size to the widget
+	if (wid.width == undefined) {
+		wid.width = wid.defaultWidth;
+		if (wid.width == 0) wid.width = widget_default_size;
+	}
+	if (wid.height == undefined) {
+		wid.height = wid.defaultHeight;
+		if (wid.height == 0) wid.height = widget_default_size;
+	}
+	if (wid.x== undefined) wid.x = 0;
+	if (wid.y== undefined) wid.y = 0;
+
+	widg_ctrl = new_widget_control(wid);
+}
+
+
+//starts a widget
+function on_widget_launch() {
+	if (this.widget.visible) {
+		var awid;
+		if (!this.widget.multipleInstances) return;
+		awid = WidgetManager.open(this.widget.manifest, null);
+		widget_launch(awid);
+	} else {
+		widget_launch(this.widget);
+	}
+  show_dock(false);
+}
+
+
+function widget_get_icon(widget)
+{
+	var icon = 'icons/image-missing.svg';
+	var preferredIconType = '.svg';
+
+	for (var i = 0; i < widget.icons.length; i++) {
+		icon = widget.icons[i].relocated_src;
+		if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
+			break;
+		}
+	}
+	return icon;
+}
+
+function widget_insert(widget)
+{
+	/*insert the widget icon*/
+	if (widget.permanent && !widget.is_component)
+		widget_insert_icon(widget);
+
+	/*and load the widget - comment this line to disable auto load of widget*/
+	widget_launch(widget);
+}
+
+function __get_int(arg)
+{
+		return (typeof arg == 'string') ? parseInt(arg) : arg;
+}
+
+function widget_request_size(widget, args)
+{
+	if (args.length==2) {
+		w = __get_int(args[0]);
+		h = __get_int(args[1]);
+		widget.widget_control.set_size(w, h);
+	}
+}
+
+function widget_request_show(widget, args)
+{
+	widget.widget_control.show();
+}
+function widget_request_hide(widget, args)
+{
+	widget.widget_control.hide();
+}
+function widget_request_activate(widget, args)
+{
+	if (!widget.visible)
+		widget_launch(widget);
+}
+function widget_request_deactivate(widget, args)
+{
+	if (widget.visible)
+		widget_close(widget, 0);
+}
+
+function widget_request_attention(widget, args)
+{
+	if (widget.visible) {
+		widget_display.push_to_top(widget.widget_control);
+		flash_window(widget.widget_control);
+	}
+}
+
+function widget_request_notification(widget, args)
+{
+  var notif = gw_new_message(null, ''+widget.name+' Alert!', args[0]);
+//	widget_display.push_to_top(notif);
+  gpacui_show_window(notif);
+	notif.set_size(240, 120);
+}
+
+function widget_refresh_components_layout(ctrl, send_resize, comp_target)
+{
+	var i;
+	var x, y, w, h, scale_x, scale_y;
+	var comps;
+
+	/*local to subscene transformation not known*/
+	if (!ctrl.sub_w) return;
+	if (!ctrl.sub_h) return;
+
+	comps = ctrl.widget.components;
+	for (i=0; i<comps.length; i++) {
+		var comp = comps[i];
+		if (!comp.widget_control || !comp.widget_control.component_bound) continue;
+
+		//compute scale from Widget Manager coord system to widget internal coordinate system
+		scale_x = ctrl.sub_vp_w / ctrl.sub_w;
+		scale_y = ctrl.sub_vp_h / ctrl.sub_h;
+
+		w = comp.widget_control.place_w * scale_x;
+		h = comp.widget_control.place_h * scale_y;
+
+		x = ctrl.translation.x - ctrl.widget.width/2 + ctrl.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
+		comp.widget_control.translation.x = x;
+
+		y = ctrl.widget.height/2 + ctrl.translation.y - h/2 - ctrl.sub_vp_y - comp.widget_control.place_y * scale_y;
+		comp.widget_control.translation.y = y;
+
+		if (send_resize || (comp_target==comp))
+			comp.widget_control.set_size(w, h);
+	}
+}
+
+function widget_place_component(widget, args)
+{
+	var comp = widget.get_component(args[0]);
+
+	if (comp==null) {
+		log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
+		return;
+	}
+	comp.widget_control.place_x = __get_int(args[1]);
+	comp.widget_control.place_y = __get_int(args[2]);
+	comp.widget_control.place_w = __get_int(args[3]);
+	comp.widget_control.place_h = __get_int(args[4]);
+	comp.widget_control.place_z = __get_int(args[5]);
+	comp.widget_control.component_bound = true;
+	widget_refresh_components_layout(widget.widget_control, false, comp);
+}
+
+
+
+//
+// implementation of core:out install widget
+//
+function widget_request_install(wid, args)
+{
+	var wid_url = args[0];
+	/*locate widget with same URL*/
+	var j, count = WidgetManager.num_widgets;
+	for (j = 0; j < count; j++) {
+		var wid = WidgetManager.get(j);
+		if (wid.url == wid_url) {
+			if (!wid.in_panel) {
+				widget_insert_icon(wid);
+			}
+			break;
+		}
+	}
+	alert('opening widget '+wid_url);
+	/*not found, install new widget*/
+	if (j == count) {
+		var new_wid = WidgetManager.open(wid_url, null, wid);
+		if (new_wid==null) return;
+		widget_insert_icon(new_wid);
+	}
+
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"), wid, 1); // send return code 1 = success
+	}
+}
+function widget_migrate_component(wid, args)
+{
+	var comp = wid.get_component(args[0], true);
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+
+	if (comp==null) {
+		log(l_err, 'Component '+args[0]+' cannot be found in widget '+wid.name);
+		if (ifce != null) {
+			wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
+		}
+		return;
+	}
+	comp.widget_control = null;
+	if (args.length > 1 && args[1] != null) {
+		alert('Migrating component to ' + UPnP.GetMediaRenderer(parseInt(args[1])).Name);
+		WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
+		widget_close(comp);
+	} else {
+    var dlg = select_mpegu_target(new_migrate_callback(comp) );    
+	}
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
+	}
+}
+
+function widget_migration_targets(wid, args)
+{
+	var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i, i;
+
+	for (i = 0; i < count; i++) {
+		var render = UPnP.GetMediaRenderer(i);
+		codes.push(""+i);
+		names.push(render.Name);
+		descriptions.push(render.HostName +" "+ render.UUID);
+	}
+	i = null;
+	var ifce_count = wid.num_interfaces, j;
+	for (j = 0; j < ifce_count; j++) {
+		var ifce = wid.get_interface(j);
+		if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
+			i = ifce;
+			break;
+		}
+	}
+	if (i != null) {
+		wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
+			wid, codes, names, descriptions);
+	}
+}
+
+
+//
+// implementation of core:out activate temporary widget
+//
+function widget_activate_temporary_widget(wid, args) {
+	var w = WidgetManager.open(args[0], null);
+	if (w != null) widget_launch(w);
+	var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+	if (ifce != null) {
+		wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
+			wid, (w != null ? 1 : 0)); // send return code 1 = success
+	}
+}
+
+function setup_extension(extension)
+{ 
+  var count, i;
+
+  /*WidgetManager module not present*/ 
+  if (typeof(WidgetManager) == 'undefined') return 0;
+  
+  /*load MPEG-U*/ 
+  Browser.loadScript('mpegu-core.js', true); 
+  widget_manager_init();
+   
+  extension.icon = 'applications-system.svg';
+  extension.label = 'Widget Manager';
+  extension.desc = 'Configure Widgets';
+  extension.launch = open_widget_manager;
+  
+  extension.initialize = function(extension) {
+		WidgetManager.on_widget_remove = widget_remove;
+		WidgetManager.on_widget_add = widget_insert;
+		WidgetManager.coreOutSetSize = widget_request_size;
+		WidgetManager.coreOutShow = widget_request_show;
+		WidgetManager.coreOutHide = widget_request_hide;
+		WidgetManager.coreOutRequestActivate = widget_request_activate;
+		WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
+		WidgetManager.coreOutShowNotification = widget_request_notification;
+		WidgetManager.coreOutPlaceComponent = widget_place_component;
+		WidgetManager.coreOutGetAttention = widget_request_attention;
+		WidgetManager.coreOutInstallWidget = widget_request_install;
+		WidgetManager.coreOutMigrateComponent = widget_migrate_component;
+		WidgetManager.coreOutRequestMigrationTargets = widget_migration_targets;
+		WidgetManager.coreOutActivateTemporaryWidget = widget_activate_temporary_widget;
+
+
+   	gpacui_show_window(widget_display);
+   	
+  	/*restore our widgets*/
+  	count = WidgetManager.num_widgets;
+  	for (i=0; i<count; i++) {
+  		var wid = WidgetManager.get(i);
+  		if (wid == null) continue;
+  		wid.device = null;
+  		wid.device_ip = null;
+
+  		if (wid.in_panel == true) {
+        var icon = gpacui_insert_dock_icon(wid.name, widget_get_icon(wid));
+  			icon.widget = wid;
+  			icon.on_click = on_widget_launch;
+  			wid.icon_dock = icon;
+  		}
+
+  		if (wid.visible) {
+  			widget_launch(wid);
+  		}
+  	}
+  	check_widget_display(display_width, display_height);
+  }	
+
+  if (UPnP_Enabled) {  
+    extension.on_upnp_add = function(name, uuid, is_add) {
+    	var i, count;
+    	var show = UPnP.MediaRenderersCount ? 1 : 0;
+    	count = WidgetManager.num_widgets;
+    	for (i=0; i<count; i++) {
+    		wid = WidgetManager.get(i);
+    		if (wid == null) continue;
+    		if (!wid.widget_control) continue;
+    		wid.widget_control.show_remote(show);
+    	}
+    }
+    extension.on_media_open = function(url, src_ip) {
+    	if (! WidgetManager.probe(url)) return 0;
+   		var new_wid = WidgetManager.open(url, src_ip);
+  		if (new_wid!=null) {
+  	     widget_insert(new_wid);
+  		}
+  		return 1;
+    }
+  }
+  extension.on_resize = check_widget_display;
+  
+  /*setup all widgets*/
+  return 1;
+}
+

gpac-1.0.0.tar.gz/share/gui/gui.bt Changed

gpac-1.0.0.tar.gz/share/gui/gui.js Added

@@ -0,0 +1,307 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//          Jean Le Feuvre, (c) 2010-2020 Telecom Paris
+//
+/////////////////////////////////////////////////////////////////////////////////
+import {gpac} from 'scenejs'
+import {Storage} from 'storage'
+globalThis.gpac = gpac;
+
+let all_extensions = [];
+
+globalThis.gw_insert_media_node = function(node) 
+{
+    media_root.children[media_root.children.length] = node;
+}
+
+globalThis.gw_hide_dock = function() {
+    dock.hide();
+}
+
+globalThis.gw_show_dock = function() {
+    dock.show();
+}
+
+//insert an offscreen image + text
+globalThis.insert_dock_icon = function(label, icon)
+{
+    var wnd = gw_new_window(dock, true, false);
+    var icon = gw_new_icon_button(wnd, icon, (label=='') ? null : label, 'root_icon');
+    wnd.set_size(icon.width, icon.height);
+    wnd.show();
+    return icon;
+}
+
+function extension_option_setter(_ext) {
+    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
+        return function (key_name, value) {
+        }
+    } else {
+        return function (key_name, value) {
+            this.__gpac_storage.set_option('Config', key_name, value);
+            this.__gpac_storage.save();
+        }
+    }
+}
+
+function extension_option_getter(_ext) {
+    if ((typeof _ext.config_id == 'undefined') || !_ext.config_id || (_ext.config_id == '')) {
+        return function (key_name, default_val) {
+        }
+    } else {
+        return function (key_name, default_val) {
+			if (key_name=='path') return _ext.path;
+            var value = this.__gpac_storage.get_option('Config', key_name);
+            if (value == null) {
+                this.set_option(key_name, default_val);
+                value = default_val;
+            }
+            return value;
+        }
+    }
+}
+
+function setup_extension_storage(extension) {
+    var storage_name = 'config:' + extension.path + '' + extension.name;
+    gwlog(l_deb, 'loading storage for extension ' + storage_name);
+
+    extension.jsobj.__gpac_storage = new Storage(storage_name);
+
+    extension.jsobj.get_option = extension_option_getter(extension);
+    extension.jsobj.set_option = extension_option_setter(extension);
+}
+
+//declare global vars (we are in strict mode)
+globalThis.gw_display_width = 0;
+globalThis.gw_display_height = 0;
+globalThis.dock = null;
+
+//Initialize our GUI
+globalThis.initialize = function () {
+    //var icon;
+    var i, count, wid;
+
+    gpac.caption = 'Osmo4';
+
+    gw_display_width = parseInt(gpac.get_option('General', 'LastWidth'));
+    gw_display_height = parseInt(gpac.get_option('General', 'LastHeight'));
+    if (!gpac.fullscreen && (!gw_display_width || !gw_display_height)) {
+        gw_display_width = 320;
+        gw_display_height = 240;
+    }
+    if (!gpac.fullscreen && gw_display_width && gw_display_height) {
+        gpac.set_size(gw_display_width, gw_display_height);
+    } else {
+        gw_display_width = gpac.screen_width;
+        gw_display_height = gpac.screen_height;
+    }
+    //request event listeners on the window - GPAC specific BIFS extensions !!! We don't allow using the event proc for size events
+    root.addEventListener('resize', on_resize, 0);
+
+    
+    /*load the UI lib*/
+    Browser.loadScript('gwlib.js', false);
+    gwlib_init(ui_root);
+
+    gwskin.enable_focus(false);    
+	  gwskin.enable_background(true);
+
+    //what do we do with tooltips ?
+//    gwskin.tooltip_callback = function(over, label) { alert('' + over ? label : ''); };
+
+    //create the dock containing all launchers            
+    dock = gw_new_grid_container(null);
+
+    dock.on_display_size = function (w, h) {
+        this.on_size(w, h);
+        this.set_size(w, h);
+    }
+    dock.on_size = function (w, h) {
+        var children = dock.get_children();
+        for (var i = 0; i < children.length; i++) {
+            children[i].set_size(2 * gwskin.default_control_height, gwskin.default_control_height);
+        }
+    }
+
+
+    /*init all extensions*/
+    var list = gpac.enum_directory('extensions', '*', 0);
+
+    for (i=0; i<list.length; i++) {
+        if (!list[i].directory) continue;
+
+      if (list[i].name.indexOf('.')==0) continue;
+      
+      var extension = Browser.loadScript('extensions/'+list[i].name+'/init.js', true);
+      if (extension == null) {
+          gwlog(l_deb, 'Loading UI extension ' + list[i].name + ' failed' );
+          continue;
+      }
+
+      if (typeof extension.whoami != 'string') continue;
+      if (extension.whoami != 'GPAC-GUI-Extension') continue;
+      if ( (typeof extension.requires_gl == 'boolean') && extension.requires_gl && !gwskin.has_opengl) continue;
+
+      extension.path = 'extensions/' + list[i].name + '/';
+      extension.jsobj = null;
+
+      gwlog(l_deb, 'Loading UI extension ' + extension.name + ' ' + ' icon ' + extension.path + extension.icon + ' Author ' + extension.author);
+
+      if (extension.name == 'Player') {
+          all_extensions.unshift(extension);
+      } else {
+          all_extensions.push(extension);
+      }
+    }
+
+    for (i = 0; i < all_extensions.length; i++) {
+      var extension = all_extensions[i];
+
+      extension.icon = insert_dock_icon(extension.name, extension.path + extension.icon);
+      extension.icon.ext_description = extension;
+      extension.icon.on_close = function () {
+        this.ext_description.icon = null;
+        this.ext_description = null;
+      }
+      extension.icon.on_click = function () {
+          var extension = this.ext_description;
+          if (!extension.jsobj) {
+              for (var i = 0; i < extension.execjs.length; i++) {
+                  gwlog(l_deb, 'Loading UI extension ' + extension.name + ' - Executing JS ' + extension.path + extension.execjs[i]);
+                  if (!i) {
+                      extension.jsobj = Browser.loadScript(extension.path + extension.execjs[i]);
+                      extension.compatible = (extension.jsobj != null) ? true : false;
+                      if (!extension.compatible) break;
+
+                      setup_extension_storage(extension);
+                  } else {
+                      Browser.loadScript(extension.path + extension.execjs[i]);
+                  }
+              }
+          }
+          if (!extension.compatible) {
+              var w = gw_new_message(null, 'Error', 'Extension ' + extension.name + ' is not compatible');
+              w.show();
+              alert('Error');
+              this.parent.disable();
+              return;
+          }
+
+          if (extension.jsobj && (typeof extension.jsobj.start != 'undefined')) extension.jsobj.start();
+      } 
+    }
+
+    var i, argc = gpac.argc;
+          
+    for (i = 1; i < argc; i++) {
+      var arg = gpac.get_arg(i);
+      if (arg=='-h') {
+          print_help();
+          gpac.exit();                    
+          return;
+        }
+    }
+
+    dock.set_size(gw_display_width, gw_display_height);
+    dock.show();
+
+    //launch all default ext
+    for (i=0; i<all_extensions.length; i++) {
+      if ((typeof all_extensions[i].icon.ext_description.autostart != 'undefined')
+            && (all_extensions[i].icon.ext_description.autostart)) {
+         
+        gwlog(l_deb, 'Auto start extension ' + all_extensions[i].icon.ext_description.name);
+        all_extensions[i].icon.on_click();
+      }
+    }
+
+     //let's do the layout   
+    layout();
+    gwskin.enable_focus(true);    
+
+}
+
+function print_help()
+{
+    globalThis._gpac_log_name = "";
+    print(-2, "GPAC GUI Help\nOptions are specified as '-opt' or '-opt=value'.\n");
+
+    //launch all default ext
+    var i;
+    for (i=0; i<all_extensions.length; i++) {
+      if ((typeof all_extensions[i].icon.ext_description.autostart != 'undefined')
+          && (typeof all_extensions[i].clopts != 'undefined')
+          && all_extensions[i].icon.ext_description.autostart) {
+         
+        print(-2, '' + all_extensions[i].icon.ext_description.name + ' extension');
+
+        if (typeof all_extensions[i].clusage != 'undefined')
+          print(-2, 'Usage: ' + all_extensions[i].clusage);
+
+        print(-2, 'Options: ');
+
+        all_extensions[i].clopts.forEach( (opt) => {
+          var s = "" + opt.name;
+          if (opt.type.length)
+            s += " (" + opt.type + ")";
+          s += ": ";
+          let olen = s.length;
+          while (olen<=30) {
+            olen++;
+            s+= ' ';
+          }
+          s += opt.description;
+          print(-1, s);
+        });
+      }
+    }
+    globalThis._gpac_log_name = null;
+} 
+
+//performs layout on all contents
+function layout() 
+{
+    gwlib_notify_display_size(gw_display_width, gw_display_height);
+}
+
+//resize event callback
+function on_resize(evt) {
+    if ((gw_display_width == evt.width) && (gw_display_height == evt.height)) return;
+    if (evt.width <=100) {
+        gpac.set_size(100, gw_display_height);
+        return;
+    }
+    if (evt.height <=80) {
+        gpac.set_size(gw_display_width, 40);
+        return;
+    }
+
+    gw_display_width = evt.width;
+    gw_display_height = evt.height;
+    if (!gpac.fullscreen) {
+        gpac.set_option('General', 'LastWidth', '' + gw_display_width);
+        gpac.set_option('General', 'LastHeight', '' + gw_display_height);
+    }
+/*
+    var v = 12;
+    if (gw_display_height<160) {
+    }
+    else if (gw_display_height<576) {
+        v = 24;
+    }
+    else if (gw_display_height<720) {
+        v = 32;
+    }
+    else {
+        v = 48;
+    }
+    gwskin_set_default_control_height(v*2);
+    gwskin_set_default_icon_height(v);
+    gwlib_refresh_layout();
+    
+*/
+
+    layout();
+}
+

gpac-1.0.0.tar.gz/share/gui/gwlib.js Added

@@ -0,0 +1,3630 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//					Jean Le Feuvre, (c) 2010-2020 Telecom Paris
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/*log function*/
+function gwlog(lev, str) {
+    alert(lev, str);
+}
+
+/*log levels*/
+let l_err = 1;
+let l_war = 2;
+let l_inf = 3;
+let l_deb = 4;
+
+/*default log level*/
+let gw_log_level = l_inf;
+
+let GF_JS_EVENT_BASE = 20000;
+
+//playback event
+//@param is_playing boolean giving the playback status;
+let GF_JS_EVENT_PLAYBACK = GF_JS_EVENT_BASE;
+
+//playlist insert event
+//@param url string giving URL to append
+let GF_JS_EVENT_PLAYLIST_ADD = GF_JS_EVENT_BASE + 1;
+
+//playlist reset event
+//@param none
+let GF_JS_EVENT_PLAYLIST_RESET = GF_JS_EVENT_BASE + 2;
+
+
+//playlist reset event
+//@param index item index in playlist
+let GF_JS_EVENT_PLAYLIST_PLAY = GF_JS_EVENT_BASE + 3;
+
+function gw_new_timer(progressive) {
+    let obj = new SFNode('TimeSensor');
+
+    obj.set_timeout = function (time, loop) {
+        this.cycleInterval = time ? time : 1;
+        this.loop = loop;
+    }
+    obj.startTime = -1;
+    obj.start = function (when) {
+        if (arguments.length==0) this.startTime = this.getTime();
+        else this.startTime = when + this.getTime();
+    }
+    obj.stop = function (when) {
+        if (arguments.length==0) this.stopTime = this.getTime();
+        else this.stopTime = when + this.getTime();
+    }
+    obj.on_event = function (val) { };
+    obj._event = function (val) {
+        this.on_event(Math.floor(val / this.cycleInterval));
+    }
+    Browser.addRoute(obj, 'cycleTime', obj, obj._event);
+
+    if (progressive) {
+        obj.on_fraction = function (val) { }
+        obj._fraction = function (frac) {
+            this.on_fraction(frac);
+        }
+        Browser.addRoute(obj, 'fraction_changed', obj, obj._fraction);
+    }
+    obj.on_active = function (val) { }
+    obj._active = function (val) {
+        this.on_active(val);
+    }
+    Browser.addRoute(obj, 'isActive', obj, obj._active);
+    return obj;
+}
+
+//static
+function setup_gw_object(obj, name) {
+    obj._name = name;
+    obj.set_color = function () { }
+    obj.set_size = function (width, height) {
+        this.width = width;
+        this.height = height;
+    }
+    obj.hide = function () {
+        this.scale.x = this.scale.y = 0;
+        this.visible = false;
+        if (arguments.length == 1) {
+            arguments[0].apply(this);
+        }
+    }
+    obj.show = function () { this.scale.x = this.scale.y = 1; this.visible = true; }
+    obj.visible = true;
+    obj.set_size = function (width, height) {
+        this.width = width;
+        this.height = height;
+    }
+    obj.move = function (x, y) {
+        this.translation.x = x;
+        this.translation.y = y;
+    }
+    obj.width = obj.height = 0;
+
+    obj.close = function () {
+        if (typeof this._pre_destroy != 'undefined') this._pre_destroy();
+        gw_detach_child(this);
+    };
+}
+
+function gw_object_set_dragable(obj) {
+    if (typeof (obj.on_drag) != 'undefined') return;
+
+    var ps2d = new SFNode('PlaneSensor2D');
+    obj._ps2d_idx = obj.children.length;
+    obj.children[obj.children.length] = ps2d;
+    ps2d.maxPosition.x = ps2d.maxPosition.y = -1;
+    ps2d.autoOffset = FALSE;
+    obj._drag = false;
+    obj.begin_drag = null;
+    obj.end_drag = null;
+    obj._drag_active = function (val) {
+        if (val) {
+            this.startx = this.translation.x;
+            this.starty = this.translation.y;
+            if (this.begin_drag) this.begin_drag();
+        } else {
+            if (this.end_drag) this.end_drag();
+        }
+    }
+    obj.on_drag = null;
+    obj._on_drag = function (val) {
+        if (this.on_drag) {
+            this.on_drag(this.startx + val.x, this.starty + val.y);
+        } else {
+            this.translation.x = this.startx + val.x;
+            this.translation.y = this.starty + val.y;
+        }
+        if (!this._drag && (val.x || val.y)) this._drag = true;
+    }
+    Browser.addRoute(ps2d, 'isActive', obj, obj._drag_active);
+    Browser.addRoute(ps2d, 'translation_changed', obj, obj._on_drag);
+}
+
+//static
+function gw_object_set_hitable(obj) {
+    if (typeof (obj._active) != 'undefined') return;
+
+    var ts = new SFNode('TouchSensor');
+    obj._ts_idx = obj.children.length;
+    obj.children[obj.children.length] = ts;
+    obj._drag = false;
+    obj._over = false;
+    obj.on_over = null;
+    obj._on_over = function (val) {
+        this._over = val;
+        gw_reset_hit(this, val);
+        if (this.on_over) this.on_over(val);
+    }
+    obj.last_click = 0;
+    obj._nb_click = 0;
+    obj.on_long_click = null;
+    obj.on_click = null;
+    obj.on_down = null;
+    obj._on_active = function (val, timestamp) {
+        if (!this._over) return;
+
+        if (this.on_down) this.on_down(val);
+
+        if (!val) {
+            if (this._drag) {
+                this._drag = false;
+                return;
+            }
+            if (this.on_long_click && (timestamp - this.last_click > gwskin.long_click_delay)) this.on_long_click();
+            else if (this.on_click && this._over) this.on_click();
+        } else {
+            this.last_click = timestamp;
+        }
+    }
+    Browser.addRoute(ts, 'isOver', obj, obj._on_over);
+    Browser.addRoute(ts, 'isActive', obj, obj._on_active);
+
+    obj._disable_touch = function () {
+        this.children[this._ts_idx].enabled = false;
+    }
+    obj._enable_touch = function () {
+        this.children[this._ts_idx].enabled = true;
+    }
+    obj.new_over_handler = function(callback) {
+        Browser.addRoute(this.children[this._ts_idx], 'isOver', this, callback);
+    }
+}
+
+//static
+function gw_new_appearance(r, g, b) {
+    var appearance = new SFNode('Appearance');
+    appearance.material = new SFNode('Material2D');
+    appearance.material.filled = TRUE;
+    appearance.material.emissiveColor = new SFColor(r, g, b);
+    return appearance;
+}
+//static
+function gw_new_lineprops(red, green, blue) {
+    var lineProps = new SFNode('LineProperties');
+    lineProps.lineColor.r = red;
+    lineProps.lineColor.g = green;
+    lineProps.lineColor.b = blue;
+    return lineProps;
+}
+
+//static
+function gw_make_gradient(type, keys, colors, opacities) {
+    var i;
+    var obj = new SFNode(type == 'radial' ? 'RadialGradient' : 'LinearGradient');
+    for (i = 0; i < keys.length; i++) {
+        obj.key[i] = keys[i];
+    }
+    for (i = 0; i < colors.length / 3; i++) {
+        obj.keyValue[i] = new SFColor(colors[3 * i], colors[3 * i + 1], colors[3 * i + 2]);
+        if (arguments.length == 4) {
+            obj.opacity[i] = opacities[i];
+        }
+    }
+    if (type == 'vertical') {
+        obj.endPoint.x = 0;
+        obj.endPoint.y = 1;
+    }
+    return obj;
+}
+
+//static
+function gw_new_fontstyle(size, align) {
+    var fs = new SFNode('FontStyle');
+    fs.size = size;
+    fs.family[0] = gwskin.default_font_family;
+    switch (align) {
+        case 0:
+            fs.justify[0] = 'BEGIN';
+            break;
+        case 1:
+            fs.justify[0] = 'MIDDLE';
+            break;
+        case 2:
+            fs.justify[0] = 'END';
+            break;
+        default:
+            fs.justify[0] = 'MIDDLE';
+            break;
+    }
+    fs.justify[1] = 'MIDDLE';
+    return fs;
+}
+
+let gw_resources_bank = [];
+
+//static
+function gw_load_resource(url, is_icon) {
+    var new_res;
+
+    if (gwskin.use_resource_bank) {
+        for (var i in gw_resources_bank) {
+            if (gw_resources_bank[i].res_url == url) {
+                gw_resources_bank[i].nb_instances++;
+                return gw_resources_bank[i];
+            }
+        }
+    }
+
+    if (is_icon) {
+        new_res = new SFNode('StyleGroup');
+        new_res.children[0] = new SFNode('Inline');
+        new_res.children[0].url[0] = url;
+        new_res.set_style = function (app) {
+            this.appearance = app;
+        };
+        new_res.set_style(gwskin.styles[0].normal);
+    } else {
+//        new_res = new SFNode('OffscreenGroup');
+//        new_res.offscreen_mode = 2;
+//        new_res.children[0] = new SFNode('Inline');
+//        new_res.children[0].url[0] = url;
+           new_res = new SFNode('Inline');
+           new_res.url[0] = url;
+
+        new_res.set_style = function () { };
+    }
+
+    new_res.nb_instances = 1;
+    if (gwskin.use_resource_bank) {
+        new_res.res_url = url;
+        gw_resources_bank.push(new_res);
+    }
+    return new_res;
+}
+
+//static
+function gw_unload_resource(res) {
+    if (!gwskin.use_resource_bank) return;
+
+    if (!res.nb_instances) return;
+    res.nb_instances--;
+    if (res.nb_instances) return;
+
+    for (var i in gw_resources_bank) {
+        if (gw_resources_bank[i] == res) {
+            gw_resources_bank.splice(i, 1);
+            return;
+        }
+    }
+    gwlog(l_err, 'Unloading resource for url ' + res.children[0].url[0] + ' not found in resource bank');
+}
+
+//static
+function gw_appy_effect_scale(timer, val) {
+    if (!timer.wnd.visible) {
+        timer.wnd.scale.x = 1 - val;
+        timer.wnd.scale.y = 1 - val;
+          timer.wnd.set_alpha((1 - val) * timer.target_alpha);
+    } else {
+        timer.wnd.scale.x = val;
+        timer.wnd.scale.y = val;
+          timer.wnd.set_alpha(val * timer.target_alpha);
+    }
+}
+
+//static
+function gw_appy_effect_notif(timer, val) {
+    var final_x = gw_display_width / 2 - timer.wnd.width / 2;
+    var final_y = gw_display_height / 2 - timer.wnd.height/2;
+    if (!timer.wnd.visible) {
+        timer.wnd.translation.x = final_x;
+        timer.wnd.translation.y = final_y + val * timer.wnd.height;
+        timer.wnd.set_alpha((1 - val) * timer.target_alpha);
+    } else {
+        timer.wnd.translation.x = final_x;
+        timer.wnd.translation.y = final_y + (1-val) * timer.wnd.height;
+        timer.wnd.set_alpha(val * timer.target_alpha);
+    }
+}
+
+//static
+function gw_window_show_hide() {
+
+	if (typeof this.show_effect == 'string') {
+		if (this.show_effect == 'none') {
+			this.visible = !this.visible;
+			this.scale.x = this.visible ? 1 : 0;
+			this.scale.y = this.visible ? 1 : 0;
+			return;
+		}
+	}
+
+    if (typeof this._wnd_timer == 'undefined') {
+        this._wnd_timer = gw_new_timer(1);
+        this._wnd_timer.wnd = null;
+
+        this._wnd_timer.effect = 0;
+        this._wnd_timer.set_timeout(0.25, false);
+        this._wnd_timer.on_fraction = function (val) {
+            if (!this.wnd) return;
+
+            switch (this.effect) {
+            case 0:
+                gw_appy_effect_scale(this, val);
+                break;
+            case 1:
+                gw_appy_effect_notif(this, val);
+                break;
+            }
+        }
+        this._wnd_timer.on_active = function (val) {
+            var fun;
+            if (val || !this.wnd) return;
+            var wnd = this.wnd;
+            this.wnd = null;
+            wnd.scale.x = wnd.visible ? 1 : 0;
+            wnd.scale.y = wnd.visible ? 1 : 0;
+            wnd.set_alpha(this.target_alpha);
+            if (wnd.visible) {
+                gw_ui_root.set_focus(wnd);
+            } else {
+                gw_ui_root.remove_focus(wnd);
+            }
+            fun = this.call_on_end;
+            this.call_on_end = null;
+            if (fun) {
+                fun.apply(wnd);
+            }
+        }
+    }
+    /*not done yet! This can happen when the function is called faster than the animation duration*/
+    if (this._wnd_timer.wnd) return;
+
+    this.visible = !this.visible;
+    if (this.visible) {
+        this._wnd_timer.target_alpha = this.get_alpha();
+        this._wnd_timer.target_x = this.translation.x;
+        this._wnd_timer.target_y = this.translation.y;
+        this._wnd_timer.target_w = this.width;
+        this._wnd_timer.target_h = this.height;
+    }
+
+    if (typeof this.show_effect == 'string') {
+        if (this.show_effect == 'notif') this._wnd_timer.effect = 1;
+    }
+    this._wnd_timer.wnd = this;
+    this._wnd_timer.start(0);
+    this._wnd_timer.call_on_end = null;
+    if (arguments.length) {
+        this._wnd_timer.call_on_end = arguments[0];
+    }
+}
+
+//static
+function gw_window_show() {
+    if (this.visible) return;
+    gw_window_show_hide.call(this);
+}
+
+//static
+function gw_window_hide() {
+    if (!this.visible) return;
+    gw_window_show_hide.apply(this, arguments);
+}
+
+//Skin definition
+var gwskin = new Object();
+gwskin.back_color = new SFColor(0.2, 0.2, 0.2);
+gwskin.pointing_device = true;
+gwskin.long_click_delay = 0.5;
+gwskin.use_resource_bank = false;
+gwskin.default_window_alpha = 0.5;
+gwskin.default_message_timeout = 3.0;
+gwskin.default_tooltip_timeout = 0.75;
+gwskin.default_tooltip_delay = 1;
+
+gwskin.appearance_transparent = gw_new_appearance(0, 0, 0);
+gwskin.appearance_transparent.material.transparency = 1;
+gwskin.appearance_transparent.skin = true;
+
+gwskin.no_gl_window_back = new SFNode('Background2D')
+gwskin.no_gl_window_back.backColor = new SFColor(0, 0, 0);
+
+gwskin.last_hit_x = 0;
+gwskin.last_hit_y = 0;
+
+gwskin.enable_background = function(do_enable) {
+ if (do_enable) {
+  gpac.set_back_color(gwskin.back_color.r, gwskin.back_color.g, gwskin.back_color.b, 1.0);
+ } else {
+  gpac.set_back_color(0, 0, 0, 1.0);
+ }
+}
+
+gwskin.enable_focus = function(do_enable) {
+    this.focus_on = do_enable;
+}
+
+//static
+function gw_get_abs_pos(child) {
+    var pos = new SFVec2f(0, 0);
+    while (child != null) {
+        if (typeof (child.translation) != 'undefined') {
+            pos.x += child.translation.x;
+            pos.y += child.translation.y;
+        }
+        if (typeof (child.parent) == 'undefined') break;
+        if (typeof (child._is_window) == 'boolean') break;
+        child = child.parent;
+    }
+    return pos;
+}
+
+function gw_get_adjusted_abs_pos(child, width, height, type)
+{
+    var pos = gw_get_abs_pos(child);
+    
+    if (type == 0) {
+        pos.y += child.height/2 + height/2; 
+    } else if (type==1) {
+        pos.y -= child.height/2 + height/2; 
+    }
+    
+    
+    if (pos.x - width / 2 < - gw_display_width / 2)
+        pos.x = - gw_display_width / 2 + width / 2;
+    else if (pos.x + width / 2 > gw_display_width / 2)
+        pos.x = gw_display_width / 2 - width / 2;
+    
+    if (pos.y + height/2 > gw_display_height / 2) {
+        if (type == 0) {
+            pos.y -= child.height + height;
+        } else {
+            pos.y = gw_display_height / 2 - height/2;
+        }
+    }
+    else if (pos.y - height/2 < -gw_display_height / 2) {
+        if (type==1) {
+            pos.y += child.height + height;
+        } else {
+            pos.y = height/2 - gw_display_height / 2;
+        }
+    }
+
+    return pos;
+}
+
+
+gwskin.tooltip_wnd = null;
+gwskin.tooltip_timeout = gw_new_timer(false);
+
+gwskin.tooltip_exec = function (obj, show) {
+
+    if (!show) return;
+
+    if (!gwskin.tooltip_wnd) {
+        wnd = gw_new_window(null, true, true, 'tooltip', true);
+        wnd.label = '';
+        gwskin.tooltip_wnd = wnd;
+        wnd.txt = gw_new_text(gwskin.tooltip_wnd, '');
+        wnd.on_display_size = function (w, h) {
+            if (! this.label) return;
+
+            width = this.label.length * gwskin.default_text_font_size;
+            this.set_size(width, 2 * gwskin.default_text_font_size);
+            this.txt.set_width(width);
+            this.move(-w / 2 + width / 2, h / 2 - gwskin.default_text_font_size);
+        }
+        wnd.on_close = function () {
+            this.timer = null;
+            gwskin.tooltip_wnd = null;
+        }
+        wnd.on_display_size(gw_display_width, gw_display_height);
+        wnd.set_alpha(0.9);
+        wnd.show();
+
+        wnd.timer = gw_new_timer(false);
+        wnd.timer.set_timeout(gwskin.default_tooltip_timeout, false);
+        wnd.timer.start(0);
+        wnd.timer.on_active = function (val) {
+            if (!val) gwskin.tooltip_wnd.close();
+        }
+    }
+
+    gwskin.tooltip_wnd.label = obj.get_label();
+    gwskin.tooltip_wnd.txt.set_label(gwskin.tooltip_wnd.label);
+    gwskin.tooltip_wnd.on_display_size(gw_display_width, gw_display_height);
+
+
+    var tt = gwskin.tooltip_wnd;
+    var dy = 1.2 * tt.height;
+    var pos = gw_get_adjusted_abs_pos(obj, tt.width, 1.2 * tt.height, 0);
+    tt.move(pos.x, pos.y);
+}
+
+gwskin.tooltip_callback = function (obj, show) {
+
+    if (! obj._tooltip) return;
+    if (!show) {
+        gwskin.tooltip_timeout.obj = null;
+        gwskin.tooltip_timeout.stop(0);
+        return;
+    }
+    gwskin.tooltip_timeout.set_timeout(gwskin.default_tooltip_delay, false);
+    gwskin.tooltip_timeout.obj = obj;
+    gwskin.tooltip_timeout.on_active = function (val) {
+        if (!val && gwskin.tooltip_timeout.obj) {
+            //deactivate tooltip after first run
+            obj._tooltip = false;
+            gwskin.tooltip_exec(gwskin.tooltip_timeout.obj, true);
+        }
+    }
+    gwskin.tooltip_timeout.start(0);
+}
+gwskin.default_label_font_size = 18;
+gwskin.default_text_font_size = 18;
+gwskin.default_font_family = 'SANS';
+gwskin.default_icon_text_spacing = 8;
+gwskin.default_control_height = 48;
+gwskin.default_icon_height = 32;
+
+//create styles
+gwskin.styles = [];
+let s = { name: 'default' };
+gwskin.styles.push(s);
+
+s.normal = gw_new_appearance(0.4, 0.6, 1);
+s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.4, 0.6]);
+s.normal.skin = true;
+if (gwskin.pointing_device) {
+    s.over = gw_new_appearance(0.0, 1.0, 1);
+    s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+    s.over.skin = true;
+} else {
+    s.over = null;
+}
+s.down = gw_new_appearance(0, 0, 1);
+s.down.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 1, 1]);
+s.down.skin = true;
+s.disable = gw_new_appearance(0.4, 0.4, 0.4);
+s.disable.skin = true;
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+s.font.skin = true;
+
+//overrite style for button to have its own text color
+s = { name: 'button' };
+gwskin.styles.push(s);
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+
+//override style for checkbox to have text alignment to 'begin'
+s = { name: 'checkbox' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+s.over = gw_new_appearance(0.0, 1.0, 1);
+s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
+s.over.skin = true;
+
+//override style for icon to have no text not fonts
+s = { name: 'icon' };
+gwskin.styles.push(s);
+s.text = null;
+s.font = null;
+
+s = { name: 'root_icon' };
+gwskin.styles.push(s);
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+
+
+//override listitems to have text alignment to 'begin'
+s = { name: 'listitem' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'edit' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(1, 1, 1);
+s.normal.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over = gw_new_appearance(1, 1, 1);
+s.over.texture = gw_make_gradient('vertical', [0, 1], [0.0, 0.2, 0.4, 0.0, 0.8, 1]);
+s.over.material.lineProps = gw_new_lineprops(0.0, 0.8, 1);
+s.text = gw_new_appearance(0, 0, 0);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.style += ' SIMPLE_EDIT';
+s.font.skin = true;
+
+s = { name: 'window' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.6, 0.6, 0.6);
+s.normal.texture = gw_make_gradient('vertical', [0, 0.1, 0.9, 1], [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6]);
+s.normal.skin = true;
+//override font to have middle alignment
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+s.font.skin = true;
+s.hide = gw_window_hide;
+s.show = gw_window_show;
+
+let tt_s = { name: 'tooltip' };
+gwskin.styles.push(tt_s);
+tt_s.normal = gw_new_appearance(0.6, 0.6, 0.6);
+tt_s.normal.texture = s.normal.texture;
+//tt_s.normal.material.lineProps = gw_new_lineprops(0, 0, 0);
+//tt_s.normal.material.lineProps.width = 0.5;
+tt_s.font = s.font;
+//tt_s.hide = gw_window_hide;
+//tt_s.show = gw_window_show;
+
+s = { name: 'progress' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.6, 0.6, 0.6);
+s.normal.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6]);
+s.normal.skin = true;
+s.over = gw_new_appearance(0.7, 0.7, 0.8);
+s.over.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1]);
+s.over.skin = true;
+s.down = gw_new_appearance(0.7, 0.7, 0.8);
+s.down.texture = gw_make_gradient('vertical', [0, 0.5, 1], [0.8, 1, 1, 0, 0.4, 0.6, 0.8, 1, 1]);
+s.down.skin = true;
+//for gauge
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_label_font_size, 0);
+s.font.skin = true;
+
+
+s = { name: 'plot' };
+gwskin.styles.push(s);
+s.normal = gw_new_appearance(0.9, 0.9, 0.9);
+s.normal.skin = true;
+s.text = gw_new_appearance(0, 0, 0);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+
+s = { name: 'text' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.justify[1] = 'END';
+s.font.skin = true;
+
+s = { name: 'lefttext' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'righttext' };
+gwskin.styles.push(s);
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.skin = true;
+
+s = { name: 'float_text' };
+gwskin.styles.push(s);
+s.text = gw_new_appearance(1, 1, 1);
+s.text.skin = true;
+s.font = gw_new_fontstyle(gwskin.default_text_font_size, 0);
+s.font.justify[1] = 'END';
+s.font.skin = true;
+
+gwskin.images = new Object();
+gwskin.labels = new Object();
+
+gwskin.images.trash = 'icons/trash.svg';
+gwskin.labels.trash = 'Delete';
+gwskin.images.add = 'icons/add.svg';
+gwskin.labels.add = 'Add';
+gwskin.images.remove = 'icons/remove.svg';
+gwskin.labels.remove = 'Remove';
+gwskin.images.remote_display = 'icons/monitor.svg';
+gwskin.labels.remote_display = 'Push to remote device';
+gwskin.images.information = 'icons/info.svg';
+gwskin.labels.information = 'Information';
+gwskin.images.resize = 'icons/resize.svg';
+gwskin.labels.resize = 'Resize';
+gwskin.images.cancel = 'icons/cross.svg';
+gwskin.labels.cancel = 'Cancel';
+gwskin.images.close = 'icons/cross.svg';
+gwskin.labels.close = 'Close';
+gwskin.images.previous = 'icons/previous.svg';
+gwskin.labels.previous = 'Previous';
+gwskin.images.next = 'icons/next.svg';
+gwskin.labels.next = 'Next';
+gwskin.images.left = 'icons/left.svg';
+gwskin.labels.left = 'Left';
+gwskin.images.right = 'icons/right.svg';
+gwskin.labels.right = 'Right';
+gwskin.images.up = 'icons/up.svg';
+gwskin.labels.up = 'Up';
+gwskin.images.down = 'icons/down.svg';
+gwskin.labels.down = 'Down';
+gwskin.images.scan_directory = 'icons/overflowing.svg';
+gwskin.labels.scan_directory = 'Select directory';
+gwskin.images.history = 'icons/overflowing.svg';
+gwskin.labels.history = 'History';
+gwskin.images.media_next = 'icons/media_next.svg';
+gwskin.labels.media_next = 'Next Item';
+gwskin.images.media_prev = 'icons/media_prev.svg';
+gwskin.labels.media_prev = 'Previous Clip';
+gwskin.images.seek_forward = 'icons/seek_forward.svg';
+gwskin.labels.seek_forward = 'Fast Forward';
+gwskin.images.rewind = 'icons/rewind.svg';
+gwskin.labels.rewind = 'Rewind';
+gwskin.images.folder = 'icons/folder.svg';
+gwskin.labels.folder = 'Directory';
+gwskin.images.check = 'icons/check.svg';
+gwskin.labels.check = 'Check';
+gwskin.images.drive = 'icons/harddrive.svg';
+gwskin.labels.drive = 'Storage Drive';
+gwskin.images.device = 'icons/laptop.svg';
+gwskin.labels.device = 'Device';
+gwskin.images.home = 'icons/home.svg';
+gwskin.labels.home = 'Home';
+gwskin.images.osmo = 'icons/osmo.svg';
+gwskin.labels.osmo = 'Home';
+gwskin.images.media = 'icons/more.svg';
+gwskin.labels.media = 'Media';
+gwskin.images.favorite = 'icons/heart.svg';
+gwskin.labels.favorite = 'Favorites';
+gwskin.images.audio = 'icons/audio.svg';
+gwskin.labels.audio = 'Audio On';
+gwskin.images.audio_mute = 'icons/audio_mute.svg';
+gwskin.labels.audio_mute = 'Audio Mute';
+gwskin.images.play = 'icons/play.svg';
+gwskin.labels.play = 'Play';
+gwskin.images.pause = 'icons/pause.svg';
+gwskin.labels.pause = 'Pause';
+gwskin.images.stop = 'icons/stop2.svg';
+gwskin.labels.stop = 'Stop';
+gwskin.images.fullscreen = 'icons/expand.svg';
+gwskin.labels.fullscreen = 'Fullscreen';
+gwskin.images.fullscreen_back = 'icons/shrink.svg';
+gwskin.labels.fullscreen_back = 'Exit Fullscreen';
+gwskin.images.play_once = 'icons/play_single.svg';
+gwskin.labels.play_once = 'Play once';
+gwskin.images.play_loop = 'icons/play_loop.svg';
+gwskin.labels.play_loop = 'Loop';
+gwskin.images.play_shuffle = 'icons/play_shuffle.svg';
+gwskin.labels.play_shuffle = 'Shuffle';
+gwskin.images.navigation = 'icons/navigation.svg';
+gwskin.labels.navigation = 'Navigation';
+gwskin.images.network = 'icons/network.svg';
+gwskin.labels.network = 'Network';
+gwskin.images.file_open = 'icons/tray.svg';
+gwskin.labels.file_open = 'Open';
+gwskin.images.exit = 'icons/power.svg';
+gwskin.labels.exit = 'Exit';
+gwskin.images.remote_location = 'icons/world.svg';
+gwskin.labels.remote_location = 'Enter URL';
+gwskin.images.statistics = 'icons/speed.svg';
+gwskin.labels.statistics = 'Statistics';
+gwskin.images.live = 'icons/live.svg';
+gwskin.labels.live = 'Back to live';
+gwskin.images.sort = 'icons/sort.svg';
+gwskin.labels.sort = 'Sort';
+gwskin.images.playlist = 'icons/list.svg';
+gwskin.labels.playlist = 'Playlist';
+gwskin.images.playlist_next = 'icons/pl_next.svg';
+gwskin.labels.playlist_next = 'Next';
+gwskin.images.playlist_prev = 'icons/pl_prev.svg';
+gwskin.labels.playlist_prev = 'Previous';
+gwskin.images.channels = 'icons/tv.svg';
+gwskin.labels.channels = 'TV Channels';
+gwskin.images.view360 = 'icons/image.svg';
+gwskin.labels.view360 = 'VR';
+gwskin.images.sensors = 'icons/compass.svg';
+gwskin.labels.sensors = 'Orientation';
+
+
+gwskin.mime_video_default_ext = " mp4 mp4s m4s 3gp 3gpp m2ts ts trp m3u8 mpd avi mov ";
+gwskin.mime_audio_default_ext = " m4a mp3 aac wav ";
+gwskin.mime_image_default_ext = " jpg jpeg png ";
+gwskin.mime_model_default_ext = " bt xmt svg ";
+
+gwskin.images.mime_video = 'icons/film.svg';
+gwskin.images.mime_audio = 'icons/musical.svg';
+gwskin.images.mime_model = 'icons/app.svg';
+gwskin.images.mime_generic = 'icons/file.svg';
+gwskin.images.mime_image = 'icons/image.svg';
+
+
+
+gwskin.keys = new Object();
+gwskin.keys.close = 'U+0008';
+gwskin.keys.validate = 'Enter';
+
+gwskin.last_hitable_obj = null;
+
+//static
+function gwskin_set_white_blue()
+{
+	var s = gwskin.get_class('default');
+
+ 	//s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.4, 0.6];
+	//if (s.over && s.over.texture) s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+	//s.down.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 1, 1];
+
+	s.text.material.emissiveColor = new SFColor(0, 0, 0);
+
+	//override style for checkbox to have text alignment to 'begin'
+	s = gwskin.get_class('checkbox');
+//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+
+	s = gwskin.get_class('edit');
+//	s.normal.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+//	s.over.texture.keyValue = [0.0, 0.2, 0.4, 0.0, 0.8, 1];
+	s.over.material.lineProps.lineColor = new SFColor(0.0, 0.8, 1);
+	s.text.material.emissiveColor = new SFColor(0, 0, 0);
+
+	s = gwskin.get_class('window');
+	s.normal.material.emissiveColor = new SFColor(1, 1, 1);
+	gwskin.no_gl_window_back.backColor = new SFColor(1, 1, 1);
+//	s.normal.texture.keyValue = [0.6, 0.6, 0.6, 0, 0, 0, 0, 0, 0, 0.6, 0.6, 0.6];
+	if (s.normal.texture) {
+		s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
+		s.normal.texture.keyValue[2] = new SFColor(1, 1, 1);
+	}
+
+	s = gwskin.get_class('progress');
+//	s.normal.texture.keyValue = [0.0, 0.4, 0.6, 0, 0, 0, 0.0, 0.4, 0.6];
+//	s.normal.texture.keyValue[1] = new SFColor(1, 1, 1);
+//	s.over.texture.keyValue = [0.0, 1, 1, 0, 0.2, 0.4, 0.0, 1, 1];
+//	s.over.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
+//	s.down.texture.keyValue = [0.0, 0.4, 0.6, 0, 0.2, 0.4, 0.0, 0.4, 0.6];
+//	s.down.texture.keyValue[1] = new SFColor(0.4, 0.8, 1);
+	s.text.material.emissiveColor = new SFColor(1, 1, 1);
+
+	s = gwskin.get_class('root_icon');
+	s.text.material.emissiveColor = new SFColor(1, 1, 1);
+
+}
+
+
+function gwskin_set_default_control_height(value) {
+    gwskin.default_control_height = value;
+}
+
+function gwskin_set_default_icon_height(value) {
+    gwskin.default_icon_height = value;
+    
+    var fsize = 1;
+    if (value>50) fsize = 32;
+    else if (value>30) fsize = 22;
+    else if (value > 10) fsize = value - 10;
+             
+    gwskin.default_label_font_size = fsize;
+    gwskin.default_text_font_size = fsize;
+    
+    for (var i = 0; i < gwskin.styles.length; i++) {
+        if ((typeof gwskin.styles[i].font != 'undefined') && gwskin.styles[i].font) {
+            gwskin.styles[i].font.size = fsize;
+        }
+    }
+}
+
+
+//static
+function gwlib_filter_event(evt) {
+
+	if (evt.type == GF_EVENT_MOUSEDOWN) {
+		if (gw_ui_root.has_popup) {
+			//close all open popups
+			var count = gw_ui_root.children.length;
+			for (var i = count; i > 0; i--) {
+				var c = gw_ui_root.children[i - 1];
+				if (typeof c._popup != 'undefined') {
+					c.close();
+					if (count>gw_ui_root.children.length) i--;
+				}
+			}
+			gw_ui_root.has_popup = false;
+		}
+		gwskin.last_hit_x = evt.mouse_x;
+		gwskin.last_hit_y = evt.mouse_y;
+	}
+
+    if (gw_ui_top_wnd && gw_ui_top_wnd.on_event(evt)) return true;
+
+/*
+ if ((evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')))
+        return false;
+*/
+	
+    for (var i = 0; i < gw_event_filters.length; i++) {
+        if (gw_event_filters[i](evt) == true) return true;
+    }
+    return false;
+}
+
+function gwlib_init(root_node) {
+    gw_ui_root = gw_new_container();
+    gw_ui_root._name = 'Root Display';
+    gw_ui_root.has_popup = false;
+    gw_add_child(root_node, gw_ui_root);
+    gw_ui_root.set_focus = function(wnd) {
+        gw_ui_top_wnd = null;
+        if (typeof wnd.on_event != 'undefined') {
+            gw_ui_top_wnd = wnd;
+        }
+        if (typeof (wnd._no_focus) == 'boolean') return;
+        if (gwskin.focus_on)
+            gpac.set_focus(gw_ui_top_wnd);
+    }
+
+    gw_ui_root.remove_focus = function(wnd) {
+        gw_ui_top_wnd = null;
+        for (var i = this.children.length; i > 0; i--) {
+            var c = this.children[i - 1];
+            if (c == wnd) continue;
+            if (!c.visible) continue;
+            
+            if (typeof c.on_event != 'undefined') {
+                gw_ui_top_wnd = c;
+                break;
+            }
+        }
+        if (typeof (wnd._no_focus) == 'boolean') return;
+        if (gwskin.focus_on)
+            gpac.set_focus(gw_ui_top_wnd);
+    }
+    
+    gw_ui_root.add_child = function (child) {
+        this.children[this.children.length] = child;
+        this.set_focus(child);
+    }
+
+    gw_ui_root.remove_child = function (child) {
+        this.remove_focus(child);
+        this.removeChildren[0] = child;
+    }
+    gw_ui_top_wnd = null;
+    gw_event_filters = [];
+
+    gpac.set_event_filter(gwlib_filter_event);
+    gwskin.has_opengl = gpac.has_opengl;
+
+    gwskin.browser_mode = (gpac.get_option('Temp', 'BrowserMode') == 'yes') ? true : false;
+
+    gpac.focus_highlight = false;
+
+    gwskin.disable_transparency = false;
+    //remove window gradients 
+    if (!gwskin.has_opengl && !gpac.hardware_rgba) {
+        s = gwskin.get_style('window', 'normal');
+        s.texture = null;
+        gwskin.disable_transparency = true;
+        gwskin.default_window_alpha = 1;
+    }
+    var device = gpac.get_option('core', 'devclass');
+
+    if ((device == 'ios') || (device == 'android')) gwskin.mobile_device = true;
+    else gwskin.mobile_device = false;
+    
+    if (gwskin.mobile_device) {
+        var size = gw_display_width;
+        if (size> gw_display_height) size = gw_display_height;
+        gwskin_set_default_control_height(size/3);
+        gwskin_set_default_icon_height(size/3);
+    }
+    
+	gwskin_set_white_blue();
+
+    gwskin._to_string = function (obj) {
+            var res = '';
+            if (obj instanceof Array) {
+                res = '[';
+                for (var i = 0; i < obj.length; i++) {
+                    if (i) res += ', ';
+                    res += gwskin._to_string(obj[i]);
+                }
+                res += ']';
+            } else {
+                var first = true;
+                res = '{';
+                for (var prop in obj) {
+                    if (!first) res += ', ';
+                    res += '' + prop;
+                    res += ': ';
+                    if (typeof obj[prop] == 'string') {
+                        res += '"';
+                        res += obj[prop];
+                        res += '"';
+                    } else if (typeof obj[prop] == 'function') {
+                    } else if (typeof obj[prop] == 'object') {
+                        res += gwskin._to_string(obj[prop]);
+                    } else {
+                        res += obj[prop];
+                    }
+                    first = false;
+                }
+                res += '}';
+            }
+            return res;
+        }
+
+        gwskin.stringify = function (obj) {
+            return this._to_string(obj);
+        }
+        gwskin.parse = function (serial_obj) {
+            gwlog(l_deb, 'JSON eval ' + serial_obj);
+            return eval(serial_obj);
+        }
+}
+
+function gwlib_add_event_filter(evt_filter) {
+	if ((arguments.length==2) && (arguments[1]==true)) {
+		gw_event_filters.unshift(evt_filter);
+	} else {
+		gw_event_filters.push(evt_filter);
+	}
+}
+
+function gwlib_remove_event_filter(evt_filter) {
+    var idx = gw_event_filters.indexOf(evt_filter);
+    if (idx > -1) gw_event_filters.splice(idx, 1);
+}
+
+function gwlib_notify_display_size(width, height) {
+    for (var i = 0; i < gw_ui_root.children.length; i++) {
+        if (typeof gw_ui_root.children[i].on_display_size != 'undefined') {
+            gw_ui_root.children[i].on_display_size(width, height);
+        }
+    }
+}
+
+function gwlib_refresh_layout() {
+    for (var i = 0; i < gw_ui_root.children.length; i++) {
+        if (typeof gw_ui_root.children[i].layout != 'undefined') {
+            gw_ui_root.children[i].layout(gw_ui_root.children[i].width, gw_ui_root.children[i].height);
+        }
+    }
+}
+
+
+//static
+function gw_reset_hit(obj, is_over) {
+    if (is_over) {
+        if (gwskin.last_hitable_obj && (gwskin.last_hitable_obj != obj)) {
+            //reset isOver value of previous touch sensor
+            if (typeof (gwskin.last_hitable_obj._ts_idx) != 'undefined') {
+                gwskin.last_hitable_obj.children[gwskin.last_hitable_obj._ts_idx].isOver = false;
+            }
+            gwskin.last_hitable_obj._on_over(false);
+        }
+        gwskin.last_hitable_obj = obj;
+    } else if (gwskin.last_hitable_obj == obj) {
+        gwskin.last_hitable_obj = null;
+    }
+}
+
+//static
+function gw_add_child(container, child) {
+    if (container == null) container = gw_ui_root;
+
+    if (typeof (container.add_child) != 'undefined') {
+        container.add_child(child);
+    } else {
+        container.children[container.children.length] = child;
+    }
+    child.parent = container;
+}
+
+//static
+function gw_detach_child(child) {
+    /*detach all default routes*/
+    Browser.deleteRoute(child, 'ALL', null, null);
+    if (typeof (child._ps2d_idx) != 'undefined') {
+        Browser.deleteRoute(child.children[child._ps2d_idx], 'ALL', null, null);
+    }
+    if (typeof (child._ts_idx) != 'undefined') {
+        Browser.deleteRoute(child.children[child._ts_idx], 'ALL', null, null);
+    }
+    if (typeof (child.dlg) != 'undefined') child.dlg = null;
+    if (typeof (child.parent) == 'undefined') return;
+
+    var p = child.parent;
+    child.parent = null;
+    if (typeof (p.remove_child) != 'undefined') {
+        p.remove_child(child);
+    } else {
+        p.removeChildren[0] = child;
+    }
+    if (gwskin.last_hitable_obj == child) gwskin.last_hitable_obj = null;
+}
+
+//static
+function gw_close_child_list(list) {
+    var count = list.length;
+    if (!count) return;
+    for (var i = 0; i < count; i++) {
+        var child = list[i];
+        if (typeof child.close != 'undefined') child.close();
+        else gw_detach_child(child);
+
+        if (list.length < count) {
+            i -= (count - list.length);
+            count = list.length;
+        }
+    }
+    //trigger GC whenever we have closed a child list
+    gpac.trigger_gc();
+}
+
+
+//static
+gwskin.get_class = function (class_name) {
+    if (arguments.length < 1) class_name = 'default';
+
+    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+    if (styles.length > 0) {
+        return styles[0];
+	}
+	return null;
+}
+
+//static
+gwskin.get_style = function (class_name, style_name) {
+    if (arguments.length < 1) class_name = 'default';
+    if (arguments.length < 2) style_name = 'normal';
+    if (style_name == 'invisible') return gwskin.appearance_transparent;
+
+    var style = null;
+    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+    if (styles.length > 0) {
+        if (typeof styles[0][style_name] != 'undefined')
+            return styles[0][style_name];
+    } else {
+        gwlog(l_err, 'Non-existing class ' + class_name);
+    }
+
+    style = gwskin.styles[0];
+    if (typeof style[style_name] != 'undefined')
+        return style[style_name];
+
+    gwlog(l_err, 'Non-existing style ' + style_name + ' in default class');
+    return null;
+}
+
+//static
+gwskin.get_font = function (class_name) {
+    if (arguments.length < 1) class_name = 'default';
+
+    var styles = gwskin.styles.filter(function (obj) { return obj.name == class_name; });
+    if (styles.length > 0) {
+        if (typeof styles[0].font != 'undefined') {
+            return styles[0].font;
+        }
+    } else {
+        gwlog(l_err, 'Non-existing class ' + class_name);
+    }
+    return gwskin.styles[0].font;
+}
+
+function gw_new_container() {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Container');
+    obj.push_to_top = function (wnd) {
+        this.removeChildren[0] = wnd;
+        this.addChildren[0] = wnd;
+    }
+    return obj;
+}
+
+function gw_new_curve2d(class_name) 
+{
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Curve2D');
+    var shape = new SFNode('Shape');
+    obj.children[0] = shape;
+    shape.appearance = gw_new_appearance(0, 0, 0);
+    obj.children[0].appearance.material.filled = false;
+    obj.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+
+    obj.set_color = function (r, g, b) {
+        this.children[0].appearance.material.lineProps.lineColor.r = r;
+        this.children[0].appearance.material.lineProps.lineColor.g = g;
+        this.children[0].appearance.material.lineProps.lineColor.b = b;
+    }
+    obj.set_line_width = function (width) {
+        if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+        this.children[0].appearance.material.lineProps.width = width;
+    }
+    shape.geometry = new SFNode('Curve2D');
+    shape.geometry.point = new SFNode('Coordinate2D');
+
+    obj.reset = function () {
+        this.children[0].geometry.point.point.length = 0;
+        this.children[0].geometry.type.length = 0;
+    }
+    obj._add_coord = function (x, y) {
+        var pts = this.children[0].geometry.point.point;
+        pts[pts.length] = new SFVec2f(x, y);
+    }
+    obj.add_move_to = function (x, y) {
+        this._add_coord(x, y);
+        //first moveto is implicit
+        if (this.children[0].geometry.type.length)
+            this.children[0].geometry.type[this.children[0].geometry.type.length] = 0;
+    }
+    obj.add_line_to = function (x, y) {
+        this._add_coord(x, y);
+        this.children[0].geometry.type[this.children[0].geometry.type.length] = 1;
+    }
+    obj.remove_first = function () {
+        var pts = this.children[0].geometry.point.point;
+        if (pts.length < 2) pts.length = 0;
+        else {
+            for (var i = 0; i < pts.length - 1; i++) {
+                pts[i] = pts[i + 1];
+            }
+            pts.length = i;
+            
+            pts = this.children[0].geometry.type;
+
+            for (var i = 0; i < pts.length - 1; i++) {
+                pts[i] = pts[i + 1];
+            }
+            pts.length = i;
+        }
+    }
+    obj.get_num_points = function() {
+        return this.children[0].geometry.point.point.length;
+    }
+    return obj;
+}
+
+
+function gw_new_rectangle(class_name, style) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Rectangle');
+    var shape = new SFNode('Shape');
+    obj.children[0] = shape;
+    if (arguments.length == 1) style = 'normal';
+
+    shape.appearance = gwskin.get_style(class_name, style);
+
+    if (shape.appearance && (typeof (shape.appearance.skin) == 'undefined')) {
+        obj.set_alpha = function (alpha) {
+            this.children[0].appearance.material.transparency = 1 - alpha;
+        }
+        obj.get_alpha = function () {
+            return 1 - this.children[0].appearance.material.transparency;
+        }
+        obj.set_fill_color = function (r, g, b) {
+            this.children[0].appearance.material.emissiveColor.r = r;
+            this.children[0].appearance.material.emissiveColor.g = g;
+            this.children[0].appearance.material.emissiveColor.b = b;
+        }
+        obj.set_strike_color = function (r, g, b) {
+            if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+            this.children[0].appearance.material.lineProps.lineColor.r = r;
+            this.children[0].appearance.material.lineProps.lineColor.g = g;
+            this.children[0].appearance.material.lineProps.lineColor.b = b;
+        }
+        obj.set_line_width = function (width) {
+            if (!this.children[0].appearance.material.lineProps) this.children[0].appearance.material.lineProps = new SFNode('LineProperties');
+            this.children[0].appearance.material.lineProps.width = width;
+        }
+    } else {
+        obj.set_alpha = function (alpha) { }
+        obj.set_fill_color = function (r, g, b) { }
+        obj.set_strike_color = function (r, g, b) { }
+        obj.set_line_width = function (width) { }
+        obj.get_alpha = function () { return 1; }
+    }
+
+    obj.set_style = function (classname, style) {
+        var app = gwskin.get_style(classname, style);
+        if (app) this.children[0].appearance = app;
+    }
+
+
+    shape.geometry = new SFNode('Curve2D');
+    shape.geometry.point = new SFNode('Coordinate2D');
+
+    obj.corner_tl = true;
+    obj.corner_tr = true;
+    obj.corner_bl = true;
+    obj.corner_br = true;
+    obj.set_corners = function (tl, tr, br, bl) {
+        this.corner_tl = tl;
+        this.corner_tr = tr;
+        this.corner_bl = bl;
+        this.corner_br = br;
+    }
+    obj.sfv = new SFVec2f(0, 0);
+
+    obj.set_size = function (w, h) {
+        var hw, hh, rx_bl, ry_bl, rx_br, ry_br, rx_tl, ry_tl, rx_tr, ry_tr, rx, ry;
+        let shape = this.children[0];
+        var temp = shape.geometry.type;
+        hw = w / 2;
+        hh = h / 2;
+        this.width = w;
+        this.height = h;
+        temp[0] = 7;
+        temp[1] = 1;
+        temp[2] = 7;
+        temp[3] = 1;
+        temp[4] = 7;
+        temp[5] = 1;
+        temp[6] = 7;
+        temp[7] = 6; /*close*/
+
+        /*compute default rx/ry*/
+        ry = rx = 10;
+        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;
+        if (!this.corner_tl) rx_tl = ry_tl = 0;
+        if (!this.corner_tr) rx_tr = ry_tr = 0;
+        if (!this.corner_bl) rx_bl = ry_bl = 0;
+        if (!this.corner_br) rx_br = ry_br = 0;
+
+        if (shape.geometry.point.point.length < 12) {
+            shape.geometry.point.point.length = 12;
+            for (var i = 0; i < 12; i++) {
+                shape.geometry.point.point[i].x = 0;
+            }
+        }
+        temp = this.children[0].geometry.point.point;
+
+        this.sfv.x = hw - rx_tr;
+        this.sfv.y = hh;
+        temp[0] = this.sfv;
+        this.sfv.x = hw; 
+        this.sfv.y = hh; /*bezier ctrl point or line-to*/
+        temp[1] = this.sfv;
+        this.sfv.x = hw;
+        this.sfv.y = hh - ry_tr;
+        temp[2] = this.sfv;
+        this.sfv.x = hw; 
+        this.sfv.y = -hh + ry_br;
+        temp[3] = this.sfv;
+        this.sfv.x = hw;
+        this.sfv.y = -hh; /*bezier control point*/
+        temp[4] = this.sfv;
+        this.sfv.x = hw - rx_br;
+        this.sfv.y = -hh;
+        temp[5] = this.sfv;
+        this.sfv.x = -hw + rx_bl;
+        this.sfv.y = -hh;
+        temp[6] = this.sfv;
+        this.sfv.x = -hw;
+        this.sfv.y = -hh; /*bezier control point*/
+        temp[7] = this.sfv;
+        this.sfv.x = -hw;
+        this.sfv.y = -hh + ry_bl;
+        temp[8] = this.sfv;
+        this.sfv.x = -hw;
+        this.sfv.y = hh - ry_tl;
+        temp[9] = this.sfv;
+        this.sfv.x = -hw;
+        this.sfv.y = hh; /*bezier control point*/
+        temp[10] = this.sfv;
+        this.sfv.x = -hw + rx_tl;
+        this.sfv.y = hh;
+        temp[11] = this.sfv;
+    }
+    return obj;
+}
+
+function gw_new_text(parent, label, class_name) {
+    var obj = new SFNode('Transform2D');
+    if (arguments.length < 3) class_name = 'default';
+
+    setup_gw_object(obj, 'Text');
+    gw_add_child(parent, obj);
+    obj.children[0] = new SFNode('Transform2D');
+    obj.children[0].children[0] = new SFNode('Shape');
+    obj.children[0].children[0].geometry = new SFNode('Text');
+
+    if (class_name == 'custom') {
+        class_name = 'default';
+        obj.children[0].children[0].appearance = gw_new_appearance(0, 0, 0);
+        obj.children[0].children[0].geometry.fontStyle = gw_new_fontstyle(gwskin.default_label_font_size, 1);
+    } else {
+        obj.children[0].children[0].appearance = gwskin.get_style(class_name, 'text');
+        obj.children[0].children[0].geometry.fontStyle = gwskin.get_font(class_name);
+    }
+
+
+
+    obj.set_label = function (value) {
+        this.children[0].children[0].geometry.string.length = 0;
+        this.children[0].children[0].geometry.string[0] = value;
+    }
+
+    obj.set_labels = function () {
+        this.children[0].children[0].geometry.string.length = 0;
+        for (var i = 0; i < arguments.length; i++) {
+            this.children[0].children[0].geometry.string[i] = '' + arguments[i];
+        }
+    }
+    obj.get_label = function () {
+        var mfs = this.children[0].children[0].geometry.string;
+        return mfs.length ? this.children[0].children[0].geometry.string[0] : '';
+    }
+    obj.set_width = function (value) {
+        this.children[0].children[0].geometry.maxExtent = -value;
+        this.width = value;
+    }
+    obj.font_size = function (value) {
+        return this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.size : 1;
+    }
+
+    if (obj.children[0].children[0].appearance && (typeof (obj.children[0].children[0].appearance.skin) == 'undefined')) {
+        obj.set_color = function (r, g, b) {
+            this.children[0].children[0].appearance.material.emissiveColor = new SFColor(r, g, b);
+        }
+        obj.children[0].set_alpha = function (a) {
+            this.children[0].children[0].appearance.material.transparency = 1 - a;
+        }
+        obj.set_align = function (val) {
+            this.children[0].children[0].geometry.fontStyle.justify[0] = val;
+        }
+        obj.set_font_size = function (val) {
+            this.children[0].children[0].geometry.fontStyle.size = val;
+        }
+    } else {
+        obj.set_color = function (r, g, b) { }
+        obj.set_alpha = function (a) { }
+        obj.set_align = function (a) { }
+        obj.set_font_size = function (a) { }
+    }
+    obj.set_size = function (width, height) {
+        var justify = this.children[0].children[0].geometry.fontStyle ? this.children[0].children[0].geometry.fontStyle.justify[0] : '';
+        if (justify == 'BEGIN') {
+            this.children[0].translation.x = -width / 2;
+        } else if (justify == 'END') {
+            this.children[0].translation.x = width / 2;
+        } else {
+            this.children[0].translation.x = 0;
+        }
+        this.children[0].children[0].geometry.maxExtent = -width;
+        this.width = width;
+        this.height = height;
+    }
+    if (label) obj.set_label(label);
+    return obj;
+}
+
+
+function gw_new_window(parent, offscreen, background, class_name, no_focus) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Window');
+    obj.background = null;
+    obj._is_window = true;
+
+    if (arguments.length < 4) class_name = 'window';
+    else if ((arguments.length == 4) && typeof (arguments[3]) == 'boolean') {
+        obj._no_focus = true;
+        class_name = 'window';
+    }
+    else if (arguments.length == 5) obj._no_focus = true;
+
+    if (class_name == 'popup') {
+        class_name = 'window';
+        obj._popup = true;
+    }
+
+    if (background)
+        obj.background = gw_new_rectangle(class_name);
+    obj.visible = false;
+    obj.scale.x = obj.scale.y = 0;
+    obj._disable_rect = gw_new_rectangle(class_name, 'invisible');
+
+    obj.on_event = function (evt) { return 0; }
+
+    obj.set_style = function (classname, style) {
+        if (this.background)
+            this.background.set_style(classname, style);
+    }
+    if (!offscreen) {
+        if (obj.background) gw_add_child(obj, obj.background);
+        var item = new SFNode('Layer2D');
+        setup_gw_object(item, 'Layer');
+        gw_add_child(obj, item);
+        obj.set_size = function (width, height) {
+            this.width = width;
+            this.height = height;
+            var idx = 0;
+            if (this.background) {
+                this.children[0].set_size(width, height);
+                idx++;
+            }
+            this.children[idx].size.x = width;
+            this.children[idx].size.y = height;
+            this.layout(width, height);
+        }
+        obj.set_alpha = function (alpha) {
+            if (this.background) {
+                this.children[0].set_alpha(alpha);
+            }
+        }
+        obj.get_alpha = function () {
+            if (this.background) {
+                return this.children[0].get_alpha();
+            }
+            return 0.0;
+        }
+        obj.add_child = function (child) {
+            var idx = this.background ? 1 : 0;
+            this.children[idx].children[this.children[idx].children.length] = child;
+        }
+        obj.remove_child = function (child) {
+            var idx = this.background ? 1 : 0;
+            this.children[idx].removeChildren[0] = child;
+        }
+        obj._wnd_close = function () {
+            obj.background = null;
+            obj._disable_rect = null;
+            gw_close_child_list(this.children);
+        }
+    } else {
+        var shape = new SFNode('Shape');
+        shape.appearance = new SFNode('Appearance');
+        shape.appearance.material = new SFNode('Material2D');
+        shape.appearance.material.filled = TRUE;
+        shape.appearance.texture = new SFNode('CompositeTexture2D');
+
+        if (obj.background) {
+            //use background to make sure the underlying texture is RGB, not RGBA
+            if (!gwskin.disable_transparency) {
+                shape.appearance.texture.children[0] = obj.background;
+            } else {
+                shape.appearance.texture.background = gwskin.no_gl_window_back;
+
+            }
+        }
+        shape.geometry = new SFNode('Bitmap');
+        obj.children[0] = shape;
+
+        obj.set_size = function (width, height) {
+            this.width = width;
+            this.height = height;
+            this.children[0].appearance.texture.pixelWidth = width;
+            this.children[0].appearance.texture.pixelHeight = height;
+            this.children[0].appearance.texture.children[0].set_size(width, height);
+            this.layout(width, height);
+        }
+
+        obj.set_alpha = function (alpha) {
+            //disable image blending for offscreens with backgrounds
+            if (this.background && gwskin.disable_transparency) alpha = 1;
+
+            this.children[0].appearance.material.transparency = 1 - alpha;
+        }
+        obj.get_alpha = function () {
+            return 1 - this.children[0].appearance.material.transparency;
+        }
+
+        obj.add_child = function (child) {
+            this.children[0].appearance.texture.children[this.children[0].appearance.texture.children.length] = child;
+        }
+        obj.remove_child = function (child) {
+            this.children[0].appearance.texture.removeChildren[0] = child;
+        }
+        obj._wnd_close = function () {
+            obj.background = null;
+            obj._disable_rect = null;
+            gw_close_child_list(this.children[0].appearance.texture.children);
+        }
+    }
+    obj._pre_destroy = obj._wnd_close;
+    obj.set_corners = function (tl, tr, br, bl) {
+        if (this.background)
+            this.background.set_corners(tl, tr, br, bl);
+    }
+
+    obj._is_disable = false;
+    obj.disable = function () {
+        if (this._is_disable) return;
+        this._is_disable = true;
+        this._disable_rect.set_size(this.width, this.height);
+        this.add_child(this._disable_rect);
+    }
+    obj.enable = function () {
+        if (!this._is_disable) return;
+        this._is_disable = false;
+        this.remove_child(this._disable_rect);
+    }
+
+    if (typeof obj._popup != 'boolean') {
+        var s = gwskin.get_class(class_name);
+
+        if (s) {
+            if (typeof s.show != 'undefined') obj.show = s.show;
+            if (typeof s.hide != 'undefined') obj.hide = s.hide;
+        }
+    }
+
+    obj.on_close = null;
+    obj._orig_close = obj.close;
+    obj._on_wnd_close = function () {
+        if (this.on_close != null) this.on_close();
+        this._orig_close();
+    }
+    obj.close = function () {
+        this.hide(this._on_wnd_close);
+    }
+    obj.layout = function (w, h) { }
+
+    obj.set_alpha(gwskin.default_window_alpha);
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_image(parent, src_url) {
+	var obj = new SFNode('Transform2D');
+	setup_gw_object(obj, 'Image');
+	obj.children[0] = new SFNode('Layer2D');
+	obj.children[0].children[0] = new SFNode('Inline');
+	obj.children[1] = gw_new_rectangle('default', 'invisible');
+	gw_object_set_hitable(obj.children[1]);
+
+	obj.on_click = null;
+	obj.children[1]._par = obj;
+	obj.children[1].on_click = function() {
+		if (this._par.on_click) this._par.on_click();
+	}
+	obj.set_image = function(src_url) {
+		var inl = gw_load_resource(src_url, false);
+		this.children[0].children[0] = inl;
+	}
+	obj.set_size = function(width, height) {
+		this.children[0].size.x = width;
+		this.children[0].size.y = height;
+		this.width = width;
+		this.height = height;
+		this.children[1].set_size(width, height);
+	}
+	obj._pre_destroy = function () {
+		this.children[0].children.length = 0;
+	}
+	obj.on_event = function () { return false; }
+
+	obj.set_image(src_url);
+	
+	gw_add_child(parent, obj);
+	return obj;
+}
+
+
+function gw_new_icon_button(parent, icon_url, label, horizontal, class_name) {
+    var touch;
+    
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'IconButton');
+
+    if (arguments.length == 3) {
+        horizontal = false;
+        class_name = 'default';
+    }
+    else if (arguments.length == 4) {
+        if (typeof arguments[3] == 'string') {
+            class_name = arguments[3];
+            horizontal = false;
+        } else {
+            class_name = 'default';
+        }
+    }
+
+    obj._icon_root = new SFNode('Transform2D');
+    obj._icon_root.children[0] = new SFNode('Layer2D');
+    obj._touch = new SFNode('TouchSensor');
+
+    obj._show_highlight = false;
+    obj._is_icon = false;
+    obj._tooltip = true;
+    if (class_name == 'image') {
+		obj._is_icon = false;
+		obj._tooltip = false;
+		class_name = 'default';
+    }
+	else if (class_name == 'icon') {
+		obj._is_icon = true;
+		obj._highlight = gw_new_rectangle(class_name, 'invisible');
+	}
+    else if (class_name == 'icon_label') {
+        obj._is_icon = true;
+        obj._show_highlight = false;
+        class_name = 'checkbox';
+    }
+    else if (class_name == 'listitem') {
+        obj._is_icon = true;
+        obj._show_highlight = true;
+		obj._highlight = gw_new_rectangle(class_name, 'invisible');
+        obj._tooltip = false;
+    } else {
+        obj._highlight = gw_new_rectangle(class_name, 'invisible');
+        obj._show_highlight = true;
+    }
+
+    if (obj._highlight)
+        obj.children[0] = obj._highlight;
+
+    obj.children[obj.children.length] = obj._icon_root;
+    obj.children[obj.children.length] = obj._touch;
+    obj._label = null;
+
+    var skip_label = (label == null) ? true : false;
+
+    if (!skip_label && gwskin.get_font(class_name) != null) {
+        obj._label = gw_new_text(obj, label, class_name);
+        if (horizontal) {
+            obj.set_size = function (width, height) {
+                this._icon_root.children[0].size.x = height;
+                this._icon_root.children[0].size.y = height;
+                this._icon_root.translation.x = (height - width) / 2;
+                if (this._highlight)
+                    this._highlight.set_size(width, height);
+                this._label.set_width(width - height);
+                this._label.translation.x = height - width / 2;
+                this.width = width;
+                this.height = height;
+            };
+        } else {
+            obj.set_size = function (width, height) {
+                var fsize = this._label.font_size();
+
+                var h = height - fsize - gwskin.default_icon_text_spacing;
+                this._icon_root.children[0].size.x = h;
+                this._icon_root.children[0].size.y = h;
+                this._icon_root.translation.y = (height - h) / 2;
+                var w = width;
+                if (this._highlight)
+                    this._highlight.set_size(w, height);
+                this._label.set_width(w);
+                this._label.translation.y = -height / 2 + fsize / 2;
+                this.width = w;
+                this.height = height;
+            };
+        }
+        obj.set_label = function (label) {
+            this._label.set_label(label);
+        }
+        obj.get_label = function () {
+			return this._label ? this._label.get_label() : null;
+        }
+    } else {
+        obj.set_size = function (width, height) {
+            this._icon_root.children[0].size.x = width;
+            this._icon_root.children[0].size.y = height;
+            if (this._highlight)
+                this._highlight.set_size(width, height);
+            this.width = width;
+            this.height = height;
+        };
+        obj.set_label = function (label) {
+            this.label = label;
+        }
+        obj.get_label = function () {
+            return this.label;
+        }
+    }
+
+    obj._last_ts = 0;
+    obj.on_long_click = NULL;
+    obj.on_click = NULL;
+    obj.on_over = null;
+    obj.down = false;
+    obj.over = false;
+    obj._on_active = function (value, timestamp) {
+        if (value) {
+            this.down = true;
+            if (this._is_icon) {
+                var app = gwskin.get_style(class_name, 'down');
+                this._icon_root.children[0].children[0].set_style(app);
+            }
+
+            if (this._show_highlight) {
+                this._highlight.set_style(class_name, 'down');
+            }
+
+            this._last_ts = timestamp;
+        } else {
+            if (this._is_icon) {
+                var app = gwskin.get_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'normal');
+                this._icon_root.children[0].children[0].set_style(app);
+            }
+
+            if (this._show_highlight) {
+                this._highlight.set_style(class_name, (this.over && gwskin.pointing_device) ? 'over' : 'invisible');
+            }
+
+            if (this.down) {
+                if (this.on_long_click && (timestamp - this._last_ts > gwskin.long_click_delay)) this.on_long_click();
+                else if (this.on_click) this.on_click();
+            }
+            this.down = false;
+        }
+    };
+    obj._on_over = function (value) {
+        this.over = value;
+        gw_reset_hit(this, value);
+
+        if (gwskin.pointing_device) {
+            if (this._is_icon) {
+                var app = gwskin.get_style(class_name, value ? 'over' : 'normal');
+                if (app) {
+                    this._icon_root.children[0].children[0].set_style(app);
+                }
+            }
+
+            if (this._show_highlight) {
+                this._highlight.set_style(class_name, value ? 'over' : 'invisible');
+            }
+
+            if (this.on_over) this.on_over(value);
+            if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+        }
+    };
+    Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
+    Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
+
+    obj.icons = [];
+    obj.add_icon = function (url) {
+
+        if (typeof url == 'string') {
+            var inl;
+            if (typeof gwskin.images[url] != 'undefined') {
+                inl = gw_load_resource(gwskin.images[url], this._is_icon);
+            } else {
+                inl = gw_load_resource(url, this._is_icon);
+            }
+        } else {
+            var inl = url;
+        }
+        this.icons[this.icons.length] = inl;
+
+        if (this._icon_root.children[0].children.length == 0) {
+            this._icon_root.children[0].children[0] = this.icons[0];
+        }
+    }
+    obj.switch_icon = function (idx) {
+        while (idx > this.icons.length) idx -= this.icons.length;
+        this._icon_root.children[0].children[0] = this.icons[idx];
+    }
+		
+    obj._pre_destroy = function () {
+        for (var i in this.icons) {
+            gw_unload_resource(this.icons[i]);
+        }
+        this.icons.length = 0;
+        this._highlight = null;
+        this._icons = null;
+        this._label = null;
+        Browser.deleteRoute(this._touch, 'ALL', null, null);
+        this._touch = null;
+    }
+
+    if (icon_url) obj.add_icon(icon_url);
+    obj.set_label(label);
+
+    obj.enable = function() {
+		this._touch.enabled = true;
+		this._on_over(false);
+	}
+    obj.disable = function() {
+		this._touch.enabled = false;
+		var app = gwskin.get_style(class_name, 'disable');
+		if (app) {
+			this._icon_root.children[0].children[0].set_style(app);
+		}
+	}
+
+
+    obj.on_event = function () { return false; }
+
+    if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
+        obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
+    } else {
+        obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
+    }
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_icon(parent, icon_name) {
+    return gw_new_icon_button(parent, gwskin.images[icon_name], gwskin.labels[icon_name], false, 'icon');
+}
+
+function gw_new_checkbox(parent, label) {
+    var touch;
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'CheckBox');
+
+    obj._icon_root = new SFNode('Transform2D');
+    obj._icon_root.children[0] = new SFNode('Layer2D');
+    obj._touch = new SFNode('TouchSensor');
+
+    var class_name = 'checkbox';
+
+    obj.children[0] = gw_new_rectangle(class_name, 'invisible');
+    obj.children[1] = obj._icon_root;
+    gw_new_text(obj, label, class_name);
+    obj.children[3] = obj._touch;
+
+    obj.set_size = function (width, height) {
+        this._icon_root.children[0].size.x = height;
+        this._icon_root.children[0].size.y = height;
+        this._icon_root.translation.x = (height - width) / 2;
+        this.children[0].set_size(width, height);
+        this.children[2].set_width(width - height);
+        this.children[2].translation.x = (height - width) / 2 + height;
+        this.width = width;
+        this.height = height;
+    };
+
+    obj.set_label = function (label) {
+        this.children[2].set_label(label);
+    }
+    obj.get_label = function () {
+        return this.children[2].get_label();
+    }
+    obj.on_check = NULL;
+    obj.down = false;
+    obj.over = false;
+    obj._checked = false;
+    obj._on_active = function (value, timestamp) {
+        if (value) {
+            this.down = true;
+        } else {
+            if (this.down && this.over) {
+                this._set_checked(!this._checked);
+                if (this.on_check) this.on_check(this._checked);
+            }
+            this.down = false;
+        }
+    };
+    obj._on_over = function (value) {
+        this.over = value;
+        gw_reset_hit(this, value);
+
+        if (gwskin.pointing_device) {
+                        var app = gwskin.get_style(class_name, value ? 'over' : (this._checked ? 'down' : 'normal') );
+                        if (app) {
+                            this._icon_root.children[0].children[0].set_style(app);
+                        }
+            if (this.on_over) this.on_over(value);
+            if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+        }
+    };
+    Browser.addRoute(obj._touch, 'isOver', obj, obj._on_over);
+    Browser.addRoute(obj._touch, 'isActive', obj, obj._on_active);
+
+
+    obj._set_checked = function (value) {
+        this._checked = value;
+        var app = gwskin.get_style(class_name, value ? 'down' : 'normal');
+        this._icon_root.children[0].children[0].set_style(app);
+    }
+    obj.set_checked = function (value) {
+        this._set_checked(value);
+    }
+    obj._icon_root.children[0].children[0] = gw_load_resource(gwskin.images.check, true);
+
+    obj._pre_destroy = function () {
+        for (var i in this.icons) {
+            gw_unload_resource(this.icons[i]);
+        }
+        Browser.deleteRoute(this._touch, 'ALL', null, null);
+        this._touch = null;
+        this._icon_root = null;
+    }
+    obj.set_label(label);
+
+    obj.on_event = function () { return false; }
+
+    if (0 && (typeof gwskin[class_name] != 'undefined') && (typeof gwskin[class_name].height != 'undefined')) {
+        obj.set_size(gwskin[class_name].height, gwskin[class_name].height);
+    } else {
+        obj.set_size(gwskin.default_control_height, gwskin.default_control_height);
+    }
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+
+function gw_new_spincontrol(parent, horizontal) {
+    var touch;
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'SpinControl');
+
+    obj.value = 0;
+    if (arguments.length < 2) horizontal = false;
+    obj._horizontal = horizontal;
+    obj.on_click = function () { }
+    var tool = gw_new_icon(obj, horizontal ? 'right' : 'up');
+
+    obj.min = 0;
+    obj.max = -1;
+    tool.on_click = function () {
+        if (this.parent.min < this.parent.max) {
+            if (this.parent.value >= this.parent.max) {
+                return;
+            }
+        }
+        this.parent.value++;
+        this.parent.on_click(this.parent.value);
+    }
+    tool = gw_new_icon(obj, horizontal ? 'left' : 'down');
+    tool.on_click = function () {
+        if (this.parent.min < this.parent.max) {
+            if (this.parent.value <= this.parent.min) {
+                return;
+            }
+        }
+        this.parent.value--;
+        this.parent.on_click(this.parent.value);
+    }
+
+    obj.set_size = function (width, height) {
+        if (this._horizontal) {
+            this.children[0].set_size(width / 2, height);
+            this.children[1].set_size(width / 2, height);
+            this.children[0].translation.x = width / 4;
+            this.children[1].translation.x = -width / 4;
+        } else {
+            this.children[0].set_size(width, height / 2);
+            this.children[1].set_size(width, height / 2);
+            this.children[0].translation.y = height / 4;
+            this.children[1].translation.y = -height / 4;
+        }
+        this.width = width;
+        this.height = height;
+    };
+    obj._idx = 0;
+    obj.on_event = function (evt) {
+        if (evt.type == GF_EVENT_KEYDOWN) {
+            var idx = this._idx;
+            if (this._horizontal) {
+                if (evt.keycode == 'Left') idx--;
+                else if (evt.keycode == 'Right') idx++;
+                else return false;
+            } else {
+                if (evt.keycode == 'Up') idx--;
+                else if (evt.keycode == 'Down') idx++;
+                else return false;
+            }
+            if (idx < 0) {
+                return false;
+            }
+            if (idx > 1) {
+                return false;
+            }
+            this._idx = idx;
+            gpac.set_focus(this.children[idx]);
+            return true;
+        }
+        return false;
+    }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+
+
+function gw_new_subscene(parent) {
+    var inline = new SFNode('Inline');
+    inline._name = 'Subscene';
+    inline._pre_destroy = function () {
+        this.url[0] = '';
+        this.url.length = 0;
+    }
+    inline.connect = function (url) {
+        this.url.length = 0;
+        this.url[0] = url;
+    }
+    gw_add_child(parent, inline);
+    return inline;
+}
+
+function gw_new_button(parent, text, class_name) {
+    var label;
+    if (arguments.length < 3) class_name = 'button';
+    obj = gw_new_rectangle(class_name, 'normal');
+    label = gw_new_text(obj, text, class_name);
+    gw_object_set_hitable(obj);
+    obj.on_over = function (value) {
+        if (gwskin.pointing_device) {
+            this.set_style(class_name, value ? 'over' : 'normal');
+        }
+        //if (gwskin.tooltip_callback) gwskin.tooltip_callback(this, value);
+    }
+    obj.on_down = function (val) {
+        this.set_style(class_name, val ? 'down' : (this._over ? 'over' : 'normal'));
+    }
+
+    obj._set_size = obj.set_size;
+    obj.set_size = function (width, height) {
+        this._set_size(width, height);
+        this.children[1].set_size(width, height);
+        this.children[1].set_width(width);
+    };
+    obj.set_label = function (label) {
+        this.children[1].set_label(label);
+    }
+    obj.get_label = function () {
+        return this.children[1].get_label();
+    }
+    obj.set_labels = function () {
+        this.children[1].set_labels.apply(this.children[1], arguments);
+    }
+    obj.on_event = function (x, y) { return false; }
+
+    obj.disable = function () {
+        this._disable_touch();
+    }
+    obj.enable = function () {
+        this._enable_touch();
+    }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+function gw_new_gauge(parent, text) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'ProgressBar');
+
+    if (arguments.length <= 3) class_name = 'progress';
+
+    obj.children[0] = gw_new_rectangle(class_name, 'normal');
+    obj.children[1] = gw_new_rectangle(class_name, 'over');
+    gw_new_text(obj, text, class_name);
+
+
+    obj._value = 75;
+    obj._set_size = obj.set_size;
+    obj.set_size = function (width, height) {
+        this._set_size(width, height);
+        this.children[0].set_size(width, height);
+
+        this.children[1].set_size(this._value * width / 100, height);
+        this.children[1].move((this._value - 100) * width / 200, 0);
+
+        this.children[2].set_size(width, height);
+        this.children[2].set_width(width);
+    };
+    obj.set_label = function (label) {
+        this.children[2].set_label(label);
+    }
+    obj.get_label = function () {
+        return this.children[2].get_label();
+    }
+
+    obj.set_value = function (val) {
+        this._value = (val > 100) ? 100 : ((val < 0) ? 0 : val);
+        this.set_size(this.width, this.height);
+    }
+
+    obj.on_event = function (x, y) { return false; }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+
+function grid_event_navigate(dlg, children, type) {
+    var i;
+    if (dlg.current_focus == -1) {
+        if (type == 'Left') return false;
+        dlg.current_focus = 0;
+        gpac.set_focus(children[0]);
+        return true;
+    }
+
+    if (type == 'Right') {
+        var orig_focus = dlg.current_focus;
+        var switch_page = 0;
+        var tr = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
+        if (dlg.current_focus + 1 == children.length) {
+            dlg.current_focus = orig_focus;
+            gpac.set_focus(children[dlg.current_focus]);
+            return false;
+        }
+        /*goto right item*/
+        dlg.current_focus++;
+        /*check we are not going down*/
+        while (1) {
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > tr))
+                break;
+            if (dlg.current_focus + 1 == children.length) {
+                dlg.current_focus = orig_focus;
+                gpac.set_focus(children[dlg.current_focus]);
+                return false;
+            }
+            dlg.current_focus++;
+            switch_page = 1;
+        }
+        /*check we haven't move to a new page*/
+        if (children[orig_focus].translation.y + children[orig_focus].height / 2 <= children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2) {
+            switch_page = 1;
+        }
+
+    }
+    else if (type == 'Left') {
+        var orig_focus = dlg.current_focus;
+        var switch_page = 0;
+        var tr = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+        if (!dlg.current_focus) {
+            dlg.current_focus = -1;
+            gpac.set_focus(null);
+            return false;
+        }
+        /*goto left item*/
+        dlg.current_focus--;
+        /*check we are not going up*/
+        while (1) {
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < tr))
+                break;
+            if (!dlg.current_focus) {
+                dlg.current_focus = orig_focus;
+                return false;
+            }
+            dlg.current_focus--;
+            switch_page = -1;
+        }
+        /*check we haven't move to a new page*/
+        if (children[orig_focus].translation.y - children[orig_focus].height / 2 >= children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2) {
+            switch_page = -1;
+        }
+    }
+    else if (type == 'Down') {
+        var orig_focus = dlg.current_focus;
+        var switch_page = 0;
+        var bottom_y = children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2;
+        var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+        if (dlg.current_focus + 1 == children.length) return false;
+        dlg.current_focus++;
+        /*goto next line*/
+        while (1) {
+            //next child below current
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y - children[dlg.current_focus].height / 2 < bottom_y))
+                break;
+            //next child above current - we need a page swicth
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y)) {
+                switch_page = 1;
+                break;
+            }
+            //not found
+            if (dlg.current_focus + 1 == children.length) {
+                dlg.current_focus = orig_focus;
+                return false;
+            }
+            dlg.current_focus++;
+        }
+        /*find closest item on the left*/
+        var tx = children[orig_focus].translation.x - children[orig_focus].width / 2;
+        while (1) {
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x + children[dlg.current_focus].width / 2 > tx))
+                break;
+            if (dlg.current_focus + 1 == children.length) break;
+            dlg.current_focus++;
+        }
+    }
+    else if (type == 'Up') {
+        var orig_focus = dlg.current_focus;
+        var switch_page = 0;
+        var bottom_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+        var top_y = children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2;
+        if (!dlg.current_focus) return false;
+        dlg.current_focus--;
+        /*goto previous line*/
+        while (1) {
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 > top_y))
+                break;
+            //next child below current - we need a page swicth
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.y + children[dlg.current_focus].height / 2 < bottom_y)) {
+                switch_page = -1;
+                break;
+            }
+            if (!dlg.current_focus) {
+                dlg.current_focus = orig_focus;
+                return false;
+            }
+            dlg.current_focus--;
+        }
+        /*goto above child*/
+        var tx = children[orig_focus].translation.x + children[orig_focus].width / 2;
+        while (1) {
+            if (children[dlg.current_focus].visible && (children[dlg.current_focus].translation.x - children[dlg.current_focus].width / 2 < tx))
+                break;
+            if (!dlg.current_focus) {
+                dlg.current_focus = orig_focus;
+                return false;
+            }
+            dlg.current_focus--;
+        }
+    } else {
+        return false;
+    }
+    if (switch_page == 1) return dlg.on_next_page();
+    else if (switch_page == -1) return dlg.on_prev_page();
+    if (typeof children[dlg.current_focus].on_event == 'undefined') {
+        return grid_event_navigate(dlg, children, type);
+    }
+
+    gpac.set_focus(children[dlg.current_focus]);
+    return true;
+}
+
+
+
+function gw_new_grid_container(parent) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Layout');
+
+    obj.children[0] = new SFNode('Layer2D');
+    obj._container = new SFNode('Transform2D');
+    obj.children[0].children[0] = obj._container;
+    obj._all_children = [];
+    obj._pages = [];
+
+    obj.on_page_changed = null;
+
+    obj.on_prev_page = function () {
+        this._move_page(-1);
+        return true;
+    };
+    obj.on_next_page = function () {
+        this._move_page(1);
+        return true;
+    };
+
+    obj.is_first_page = function () {
+        return this._page_idx == 0 ? true : false;
+    }
+    obj.is_last_page = function () {
+        return this._page_idx == (this._pages.length - 1) ? true : false;
+    }
+    obj._page_idx = 0;
+    obj._max_page_idx = 0;
+    obj._move_page = function (value) {
+        this._page_idx += value;
+        var i, child, last_child = 0;
+
+        if (this._page_idx <= 0) {
+            this._page_idx = 0;
+        }
+
+        if (this._page_idx * this.width >= this.max_width) {
+            this._page_idx = this.max_width / this.width;
+        }
+
+        this._container.translation.x = -this._page_idx * this.width;
+        this._container.children.length = 0;
+        if (this._page_idx + 1 >= this._pages.length) {
+            last_child = this._all_children.length;
+        } else {
+            last_child = this._pages[this._page_idx + 1];
+        }
+
+        i = 0;
+        child = this._pages[this._page_idx];
+        if (this.current_focus >= 0) {
+            if (this.current_focus < child) this.current_focus = child;
+            else if (this.current_focus >= last_child) this.current_focus = last_child - 1;
+            gpac.set_focus(this._all_children[this.current_focus]);
+        }
+
+
+        while (child < last_child) {
+            this._container.children[i] = this._all_children[child];
+            child++;
+            i++;
+        }
+        if (this.on_page_changed) this.on_page_changed();
+
+    }
+
+    obj.spread_h = false;
+    obj.spread_v = false;
+    obj.break_at_hidden = false;
+    obj.break_at_line = 0;
+
+    obj.set_focus_last = function () {
+        this._page_idx = this._pages.length ? this._pages.length - 1 : 0;
+        this.current_focus = this._all_children.length;
+        this._move_page(0);
+    }
+    obj.set_focus_first = function () {
+        this._page_idx = 0;
+        this.current_focus = 0;
+        this._move_page(0);
+    }
+
+    obj.set_size = function (width, height) {
+        this.width = width;
+        this.height = height;
+        this.children[0].size.x = width;
+        this.children[0].size.y = height;
+        this.nb_visible = 0;
+        this.current_focus = -1;
+        this.layout();
+    }
+    obj.max_width = 0;
+    obj.layout = function () {
+        var spread_x, nb_wid_h, start_x, start_y, maxh, width, height, page_x, nb_on_line;
+        var children = this._all_children;
+        var width = this.width;
+        var height = this.height;
+
+        if (width <= 0) return;
+        if (height <= 0) return;
+
+        if (typeof this.on_size != 'undefined')
+            this.on_size(width, height);
+
+        var page_x = 0;
+        var maxh = 0;
+        var spread_x = -1;
+        var start_x = -width / 2;
+        var init_y = this.height / 2;
+        var start_y = init_y;
+        var nb_on_line = 0;
+
+        this._pages = [0];
+
+        for (var i = 0; i < children.length; i++) {
+            
+            //start of line: compute H spread and max V size
+            if (spread_x == -1) {
+                var j = 0, len = 0, maxh = 0, nb_child = 0, nb_spread_child = 0;
+                start_x = -width / 2 + page_x;
+                while (1) {
+                    if (!children[i + j].visible) {
+                        j++;
+                        if (i + j == children.length) break;
+                        if (this.break_at_hidden) break;
+                        if (typeof (children[i+j-1].__separator) == 'boolean') break;
+                        continue;
+                    }
+                    if (len + children[i + j].width > width) break;
+                    len += children[i + j].width;
+                    if (maxh < children[i + j].height) maxh = children[i + j].height;
+                    j++;
+                    nb_child++;
+                    if ((i + j < children.length) && (typeof children[i+j].stick_to_previous == 'boolean') && children[i+j].stick_to_previous) {
+                    } else {
+                        nb_spread_child++;
+                    }
+
+                    if (this.break_at_line) break;
+                    if (i + j == children.length) break;
+                }
+                if (nb_child <= 1) {
+                    maxh = children[i].height;
+                    if (this.spread_h && !this.break_at_line) start_x = -len / 2;
+                }
+                else if (this.spread_h && nb_spread_child) {
+                    spread_x = (width - len) / (nb_spread_child);
+                    start_x += spread_x / 2;
+                } else {
+                    spread_x = 0;
+                }
+            }
+
+            if (!children[i].visible) {
+                if (nb_on_line && ( this.break_at_hidden || (typeof (children[i].__separator) == 'boolean')) ) {
+
+                    nb_on_line = 0;
+                    spread_x = -1;
+                    start_y -= maxh / 2;
+                    start_x = -width / 2;
+                }
+                continue;
+            }
+            if (start_y - maxh < -height / 2) {
+                //push new page only if not empty! (otherwise we've been asked to layout in a too small grid ...)
+                if (!this._pages.length || this._pages[this._pages.length - 1] < i) {
+                    nb_on_line = 0;
+                    page_x += width;
+                    spread_x = -1;
+                    start_y = init_y;
+                    this._pages.push(i);
+                    i--;
+                    continue;
+                }
+            }
+            children[i].translation.x = start_x + children[i].width / 2;
+            children[i].translation.y = start_y - maxh / 2;
+
+            if ((i + 1 < children.length) && (typeof children[i + 1].stick_to_previous == 'boolean') && children[i+1].stick_to_previous) {
+                start_x += children[i].width;
+            } else {
+                start_x += children[i].width + spread_x;
+            }
+
+            nb_on_line++;
+
+            if (i + 1 == children.length) {
+                break;
+            }
+            if ((nb_on_line == nb_child) || (start_x - page_x + children[i + 1].width > width / 2)) {
+                nb_on_line = 0;
+                spread_x = -1;
+                start_y -= maxh;
+                start_x = -width / 2;
+            }
+        }
+        this.max_width = page_x;
+        this._move_page(0);
+    }
+
+    obj.add_child = function (child) {
+        this._all_children.push(child);
+    }
+    obj.remove_child = function (child) {
+        var index = this._all_children.indexOf(child);
+        if (index > -1) this._all_children.splice(index, 1);
+    }
+
+    obj.get_children = function () {
+        return this._all_children;
+    }
+    obj.reset_children = function () {
+        gw_close_child_list(this._all_children);
+        this._all_children.length = 0;
+        this._container.children.length = 0;
+        this._page_idx = 0;
+        this._max_page_idx = 0;
+    }
+
+
+    obj.on_event = function (evt) {
+        switch (evt.type) {
+            case GF_EVENT_MOUSEWHEEL:
+		var inc = -evt.wheel;
+                if (this._pages.length <= 1) return 0;
+                if ((inc < 0) && (this._page_idx == 0)) return 0;
+                if ((inc > 0) && (this._page_idx >= this._pages.length - 1)) return 0;
+                this._move_page((inc < 0) ? -1 : 1);
+                return 1;
+            case GF_EVENT_KEYDOWN:
+                if ((evt.keycode == 'Up') || (evt.keycode == 'Down') || (evt.keycode == 'Right') || (evt.keycode == 'Left')) {
+
+                    if ((this.current_focus >= 0) && typeof this._all_children[this.current_focus].on_event != 'undefined') {
+                        var res = this._all_children[this.current_focus].on_event(evt);
+                        if (res) return res;
+                    }
+
+                    return grid_event_navigate(this, this._all_children, evt.keycode);
+                }
+                if ((evt.keycode == 'PageUp') && (this._page_idx > 0)) {
+                    if (this._pages.length <= 1) return 0;
+                    return this.on_prev_page();
+                }
+                if ((evt.keycode == 'PageDown') && (this._page_idx < this._pages.length)) {
+                    if (this._pages.length <= 1) return 0;
+                    return this.on_next_page();
+                }
+                return 0;
+        }
+        return 0;
+    }
+
+    obj._pre_destroy = function () {
+        this.reset_children();
+        this._container = null;
+        this._all_children.length = 0;
+    }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_separator(parent) {
+    var obj = gw_new_container();
+    obj.hide();
+    obj.show = function() {};
+    obj.__separator = true;
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_progress_bar(parent, vertical, with_progress, class_name) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'ProgressBar');
+    var ps2d;
+
+    if (arguments.length <= 3) class_name = 'progress';
+    if (arguments.length <= 2) with_progress = false;
+    if (arguments.length <= 1) vertical = false;
+
+    obj.children[0] = gw_new_rectangle(class_name, 'normal');
+
+    if (with_progress) {
+        obj.children[1] = gw_new_rectangle(class_name, 'down');
+        if (vertical) {
+            obj.children[1].set_corners(true, false, false, true);
+        } else {
+            obj.children[1].set_corners(true, false, false, true);
+        }
+        obj.set_progress = function (prog) {
+            if (prog < 0) prog = 0;
+            else if (prog > 100) prog = 100;
+            this.prog = prog;
+            prog /= 100;
+            if (this.vertical) {
+                var pheight = prog * this.height;
+                this.children[1].set_size(this.width, pheight);
+                this.children[1].move(0, (this.height - pheight) / 2, 0);
+            } else {
+                var pwidth = prog * this.width;
+                this.children[1].set_size(pwidth, this.height/3);
+                this.children[1].move((pwidth - this.width) / 2, 0);
+            }
+        }
+    } else {
+        obj.set_progress = function (prog) { }
+    }
+    obj.slide_idx = obj.children.length;
+    obj.children[obj.slide_idx] = gw_new_rectangle(class_name, 'over');
+    if (vertical) {
+        obj.children[obj.slide_idx].set_corners(true, false, false, true);
+    } else {
+        obj.children[obj.slide_idx].set_corners(true, false, false, true);
+    }
+    obj.children[obj.slide_idx + 1] = gw_new_rectangle(class_name, 'invisible');
+    ps2d = new SFNode('PlaneSensor2D');
+    obj.children[obj.slide_idx + 1].children[1] = ps2d;
+    ps2d.maxPosition.x = -1;
+    ps2d.maxPosition.y = -1;
+
+    obj.on_slide = function (value, type) { }
+
+    obj._with_progress = with_progress;
+    obj._sliding = false;
+    obj._slide_active = function (val) {
+        obj._sliding = val;
+        this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
+    }
+    Browser.addRoute(ps2d, 'isActive', obj, obj._slide_active);
+
+    obj._set_trackpoint = function (value) {
+        if (this.vertical) {
+            this.frac = value.y / this.height;
+        } else {
+            this.frac = value.x / this.width;
+        }
+        this.frac += 0.5;
+        if (this.frac > 1) this.frac = 1;
+        else if (this.frac < 0) this.frac = 0;
+
+        this._set_frac();
+        this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
+    }
+    Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj._set_trackpoint);
+
+    obj._set_frac = function () {
+        if (this.vertical) {
+            var pheight = this.frac * this.height;
+            if (pheight < this.width) pheight = this.width;
+            this.children[this.slide_idx].set_size(this.width, pheight);
+            this.children[this.slide_idx].move(0, (this.height - pheight) / 2, 0);
+        } else {
+            var pwidth = this.frac * this.width;
+            if (pwidth < this.height) pwidth = this.height;
+            this.children[this.slide_idx].set_size(pwidth, this.height);
+            this.children[this.slide_idx].move((pwidth - this.width) / 2, 0);
+        }
+    }
+
+    obj.set_value = function (value) {
+        if (this._sliding) return;
+
+        value -= this.min;
+        if (value < 0) value = 0;
+        else if (value > this.max - this.min) value = this.max - this.min;
+        if (this.max == this.min) value = 0;
+        else value /= (this.max - this.min);
+
+        this.frac = value;
+        this._set_frac();
+    }
+
+
+    obj.vertical = vertical;
+    obj.set_size = function (w, h) {
+        this.width = w;
+        this.height = h;
+        this.children[0].set_size(w, h);
+        if (this._with_progress) {
+            this.children[3].set_size(w, h);
+        } else {
+            this.children[2].set_size(w, h);
+        }
+        this._set_frac();
+        this.set_progress(this.prog);
+    }
+    obj.min = 0;
+    obj.max = 100;
+
+    obj.move = function (x, y) {
+        this.translation.x = x;
+        this.translation.y = y;
+    }
+    obj.on_event = function (x, y) { return false; }
+
+    obj.prog = 0;
+    obj.frac = 0;
+    obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10);
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_slider(parent, vertical, class_name) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Slider');
+
+    if (arguments.length <= 2) class_name = 'progress';
+    if (arguments.length <= 1) vertical = false;
+
+    obj.children[0] = gw_new_rectangle(class_name, 'normal');
+    obj.children[1] = gw_new_rectangle(class_name, 'over');
+    obj.children[2] = gw_new_rectangle(class_name, 'invisible');
+
+    var ps2d = new SFNode('PlaneSensor2D');
+    obj.children[2].children[1] = ps2d;
+    ps2d.maxPosition.x = -1;
+    ps2d.maxPosition.y = -1;
+    obj.on_slide = function (value, type) { }
+    
+    obj.slide_active = function (val) {
+        this.on_slide(this.min + (this.max - this.min) * this.frac, val ? 1 : 2);
+    }
+    Browser.addRoute(ps2d, 'isActive', obj, obj.slide_active);
+    obj.set_trackpoint = function (value) {
+        if (vertical) {
+            if (this.height == this.children[1].height) return;
+            this.frac = value.y / (this.height - this.children[1].height);
+        } else {
+            if (this.width == this.children[1].width) return;
+
+            this.frac = value.x / (this.width - this.children[1].width);
+        }
+        this.frac += 0.5;
+        if (this.frac > 1) this.frac = 1;
+        else if (this.frac < 0) this.frac = 0;
+        if (vertical) {
+            value.y = (this.frac - 0.5) * (this.height - this.children[1].height);
+            value.x = 0;
+        } else {
+            value.x = (this.frac - 0.5) * (this.width - this.children[1].width);
+            value.y = 0;
+        }
+        this.children[1].translation = value;
+        this.on_slide(this.min + (this.max - this.min) * this.frac, 0);
+    }
+    Browser.addRoute(ps2d, 'trackPoint_changed', obj, obj.set_trackpoint);
+
+    obj.set_value = function (value) {
+        if (this.children[2].isActive) return;
+
+        value -= this.min;
+        if (value < 0) value = 0;
+        else if (value > this.max - this.min) value = this.max - this.min;
+        if (this.max == this.min) value = 0;
+        else value /= (this.max - this.min);
+
+        this.frac = value;
+
+        value -= 0.5;
+        value *= (vertical ? this.height : this.width);
+
+        if (vertical) {
+            this.children[1].translation.y = value;
+        } else {
+            this.children[1].translation.x = value;
+        }
+    }
+    obj.vertical = vertical;
+    obj.set_size = function (w, h, cursor_w, cursor_h) {
+        if (this.height && this.width) {
+            if (this.vertical) {
+                this.children[1].translation.y *= h;
+                this.children[1].translation.y /= this.height;
+            } else {
+                this.children[1].translation.x *= w;
+                this.children[1].translation.x /= this.width;
+            }
+        }
+
+        this.width = w;
+        this.height = h;
+        this.children[0].set_size(w, h);
+
+        if (typeof (cursor_w) == 'undefined') cursor_w = this.children[1].width;
+        if (typeof (cursor_h) == 'undefined') cursor_h = this.children[1].height;
+        this.children[1].set_size(cursor_w, cursor_h);
+
+        if (this.vertical) {
+            this.children[2].set_size(this.children[1].width, h);
+        } else {
+            this.children[2].set_size(w, this.children[1].height);
+        }
+    }
+    obj.set_cursor_size = function (w, h) {
+        this.children[1].set_size(w, h);
+    }
+    obj.min = 0;
+    obj.max = 100;
+    obj.frac = 0.0;
+    obj.height = 0;
+    obj.width = 0;
+    obj.set_size(vertical ? 10 : 200, vertical ? 200 : 10, 10, 10);
+
+    obj.set_trackpoint(0);
+
+    obj.move = function (x, y) {
+        this.translation.x = x;
+        this.translation.y = y;
+    }
+    obj.on_event = function (x, y) { return false; }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+function gw_new_text_edit(parent, text_data) {
+    var obj = new SFNode('Transform2D');
+    var rect, edit;
+    setup_gw_object(obj, 'TextEdit');
+    rect = gw_new_rectangle('edit');
+    gw_add_child(obj, rect);
+    gw_object_set_hitable(rect);
+    rect.on_down = function (val) {
+        if (val) gpac.set_focus(this.parent.children[1]);
+    }
+
+    edit = gw_new_text(obj, text_data, 'edit')
+    //    gw_add_child(obj, edit);
+    obj.on_text = null;
+    obj._text_edited = function (val) {
+        if (this.on_text) this.on_text(val[0]);
+    };
+    Browser.addRoute(obj.children[1].children[0].children[0].geometry, 'string', obj, obj._text_edited);
+
+    obj.set_size = function (w, h) {
+        this.width = w;
+        this.height = h;
+        this.children[0].set_size(w, h);
+        this.children[1].move(5 - w / 2, 0);
+    };
+    obj.on_event = function (x, y) { return false; }
+
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_text_area(parent, text_data, class_name) {
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'TextArea');
+
+    obj.children[0] = new SFNode('Layout');
+    obj.children[0].parent = obj;
+    obj.children[0].wrap = true;
+    obj.children[0].spacing = 1.1;
+    obj.children[0].justify[0] = "JUSTIFY";
+    obj.children[0].justify[1] = "FIRST";
+
+	if (arguments.length==2) class_name = 'text';
+    gw_new_text(obj.children[0], text_data, class_name);
+    obj.set_size = function (width, height) {
+        this.children[0].size.x = width;
+        this.children[0].size.y = height;
+        this.width = width;
+        this.height = height;
+    }
+    obj.set_content = function (text) {
+        this.children[0].children[0].set_label(text);
+    }
+
+    obj.on_event = function (x, y) { return false; }
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+
+
+function gw_new_scrolltext_area(parent, text_data) {
+    var obj = gw_new_text_area(parent, text_data);
+    /*erase the resize routine*/
+    obj._orig_set_size = obj.set_size;
+    obj.set_size = function (width, height) {
+        var bounds = this._bounds;
+        this.width = width;
+        this.height = Math.ceil(bounds.height);
+        this._orig_set_size(width, height);
+    }
+
+    obj.set_content = function (text) {
+        this.set_label(text);
+    }
+    return obj;
+}
+
+function gw_new_window_full(parent, offscreen, the_label, child_to_insert) {
+    var wnd = gw_new_window(parent, offscreen, true);
+
+    if (arguments.length <= 3) child_to_insert = null;
+    if (child_to_insert) {
+        gw_add_child(wnd, child_to_insert);
+    }
+
+    wnd.area = null;
+
+    wnd.tools = gw_new_grid_container(wnd);
+    wnd.tools._name = 'ToolBar';
+    wnd._has_extra_tools = false;
+
+    wnd.label = null;
+    if (the_label) {
+        wnd.label = gw_new_text(wnd.tools, the_label, 'window');
+        wnd.label._name = 'Label';
+    }
+
+    wnd.set_label = function (label) {
+        if (wnd.label) wnd.label.set_label(label);
+    }
+
+
+    wnd.add_tool = function (icon, name) {
+        var tool;
+        if (typeof gwskin.images[icon] != 'undefined') {
+            tool = gw_new_icon(this.tools, icon);
+        } else {
+            tool = gw_new_icon_button(this.tools, icon, name, false, 'icon');
+        }
+        if (this.label) {
+            this.tools.remove_child(this.label);
+            this.tools.add_child(this.label);
+        }
+        tool.set_size(gwskin.default_icon_height, gwskin.default_icon_height);
+        tool._name = name;
+        tool.dlg = this;
+        this._has_extra_tools = true;
+        return tool;
+    }
+
+
+    var icon = wnd.add_tool('close');
+    icon.on_click = function () {
+        this.dlg.close();
+    }
+    wnd._has_extra_tools = false;
+
+    wnd._pre_destroy = function () {
+        if (typeof this.predestroy != 'undefined') this.predestroy();
+        this.tools = null;
+        this.label = null;
+        this.area = null;
+        this._wnd_close();
+    }
+
+    wnd.on_size = null;
+    wnd.layout = function (width, height) {
+        var i;
+        var tools = this.tools.get_children();
+        var tool_size = gwskin.default_icon_height;
+
+        if (this.on_size) this.on_size(width, height - tool_size);
+
+        if (this.area) {
+            this.area.set_size(width, height - tool_size);
+            this.area.move(0, (this.area.height - height) / 2);
+        }
+        for (i = 0; i < tools.length; i++) {
+            tools[i].set_size(tool_size, tool_size);
+        }
+
+        if (this.label) {
+            var textw = width;
+            for (i = 0; i < tools.length; i++) {
+                if ((tools[i] != this.label) && tools[i].visible)
+                    textw -= tools[i].width;
+            }
+            textw -= tool_size;
+            if (textw < 0) textw = 0;
+            this.label.set_size(textw, tool_size);
+            this.label.set_width(textw);
+        }
+
+        this.tools.move(0, (height - tool_size) / 2);
+        this.tools.set_size(width, tool_size);
+    }
+
+    wnd.on_event = function (evt) {
+        if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.close)) {
+            this.close();
+            return 1;
+        }
+        if ((evt.type == GF_EVENT_KEYUP) && (evt.keycode == gwskin.keys.validate)) {
+			if (typeof this.on_validate == 'function') {
+				this.on_validate();
+				return 1;
+			}
+			return 0;
+        }
+        if (!this._has_extra_tools) {
+            if (this.area) return this.area.on_event(evt);
+            return false;
+        }
+
+        if (!this.area) {
+            return this.tools.on_event(evt);
+        }
+
+        var is_left_or_right = (evt.type == GF_EVENT_KEYDOWN) && ((evt.keycode == 'Left') || (evt.keycode == 'Right')) ? 1 : 0;
+        if (this._focus_is_tools) {
+            if (this.tools.on_event(evt)) return 1;
+            if (this.area.on_event(evt)) {
+                //focus no longer on toolbar but on main content (means this is 'right'), switch order 
+                if (is_left_or_right) {
+                    this._focus_is_tools = false;
+                }
+                return 1;
+            }
+        } else {
+            if (this.area.on_event(evt)) return 1;
+            if (this.tools.on_event(evt)) {
+                //focus no longer on main but on toolbar content (means this is 'left'), switch order 
+                if (is_left_or_right) {
+                    this._focus_is_tools = true;
+                }
+                return 1;
+            }
+        }
+        return 0;
+    }
+    wnd._focus_is_tools = true;
+    return wnd;
+}
+
+function gw_new_message(container, label, content) {
+    var notif = gw_new_window_full(container, true, label);
+    notif.area = gw_new_text_area(notif, content);
+    notif.on_size = function (width, height) {
+        this.area.set_size(width - 10, height);
+    }
+    notif.set_size(0.8 * gw_display_width, 120);
+
+    if (arguments.length < 4) {
+        notif.timer = gw_new_timer(false);
+        notif.timer.wnd = notif;
+        notif.timer.set_timeout(gwskin.default_message_timeout, false);
+        notif.timer.start(0);
+        notif.timer.on_active = function (val) {
+            if (!val) this.wnd.close();
+        }
+        notif.show_effect = 'notif';
+        notif._no_focus = true;
+    }
+    return notif;
+}
+
+function gw_new_confirm_wnd(container, label, confirm_yes, confirm_no) {
+    if (arguments.length < 4) confirm_no = 'no';
+    if (arguments.length < 3) confirm_yes = 'yes';
+
+    var notif = gw_new_window_full(container, true, label);
+    notif.area = gw_new_grid_container(notif);
+    notif.area.spread_h = true;
+    
+    notif.on_confirm = null;
+    notif.btn_yes = gw_new_button(notif.area, confirm_yes);
+    notif.btn_yes.dlg = notif;
+    notif.btn_yes.on_click = function () {
+        if (this.dlg.on_confirm) this.dlg.on_confirm(true);
+        this.dlg.close();
+    }
+
+    notif.btn_no = gw_new_button(notif.area, confirm_no);
+    notif.btn_no.dlg = notif;
+    notif.btn_no.on_click = function () {
+        if (this.dlg.on_confirm) this.dlg.on_confirm(false);
+        this.dlg.close();
+    }
+    notif.on_close = function () {
+        if (this.on_confirm) this.on_confirm(false);
+    }
+
+    notif.on_display_size = function (width, height) {
+        var w = 0.9*width;
+        if (w>500) w=500;
+        this.btn_yes.set_size(w / 3, gwskin.default_control_height);
+        this.btn_no.set_size(w / 3, gwskin.default_control_height);
+        this.set_size(w, 2 * gwskin.default_control_height);
+    }
+    notif.on_display_size(gw_display_width, gw_display_height);
+    return notif;
+}
+
+
+function gw_guess_mime_icon(name)
+{
+
+    var ext = name.split('.').pop();
+    var reg = new RegExp(' ' + ext + ' ', "gi");
+    //check default extensions
+    if (gwskin.mime_video_default_ext.match(reg)) return gwskin.images.mime_video;
+    else if (gwskin.mime_audio_default_ext.match(reg)) return gwskin.images.mime_audio;
+    else if (gwskin.mime_image_default_ext.match(reg)) return gwskin.images.mime_image;
+    else if (gwskin.mime_model_default_ext.match(reg)) return gwskin.images.mime_model;
+
+    var idx = 0;
+    while (1) {
+        var mime = gpac.get_option('MimeTypes', idx);
+        if (mime == null) break;
+        idx++;
+        var mime_ext = gpac.get_option('MimeTypes', mime).split('"')[1];
+        if (!mime_ext.match(reg)) continue;
+                
+        if (mime.indexOf('video') != -1) return gwskin.images.mime_video;
+        else if (mime.indexOf('audio') != -1) return gwskin.images.mime_audio;
+        else if (mime.indexOf('model') != -1) return gwskin.images.mime_model;
+        else if (mime.indexOf('image') != -1) return gwskin.images.mime_image;
+        else if (mime.indexOf('application') != -1) return gwskin.images.mime_model;
+
+        break;
+    }
+    return gwskin.images.mime_generic;
+}
+
+
+function gw_new_file_dialog(container, label) {
+    var dlg = gw_new_window_full(container, true, label);
+
+    dlg.area = gw_new_grid_container(dlg);
+    dlg.area.break_at_line = true;
+	dlg.area.dlg = dlg;
+
+    dlg.on_close = function () {
+        if (this.do_sort_wnd) {
+            this.do_sort_wnd.close();
+        }
+        if (this.on_browse) {
+            this.on_browse(null, false);
+        }
+    }
+
+
+	dlg._name_sort_only = false;
+    dlg._sort_type = 0;
+    dlg.do_sort = function (value) {
+        this._page_idx = 0;
+        this._max_page_idx = 0;
+
+        switch (value) {
+            case 0:
+                this.area._all_children.sort(function (a, b) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
+                break;
+            case 1:
+                this.area._all_children.sort(function (b, a) { var A = a.filename.toLowerCase(); var B = b.filename.toLowerCase(); if (A > B) { return 1; } else if (A < B) { return -1; } else return 0; });
+                break;
+            case 2:
+                this.area._all_children.sort(function (a, b) { return a.size - b.size });
+                break;
+            case 3:
+                this.area._all_children.sort(function (a, b) { return b.size - a.size });
+                break;
+            case 4:
+                this.area._all_children.sort(function (a, b) { return a.date - b.date });
+                break;
+            case 5:
+                this.area._all_children.sort(function (a, b) { return b.date - a.date });
+                break;
+        }
+        this.area.layout();
+    }
+
+    dlg.go_up = dlg.add_tool('up');
+    dlg.go_up.on_click = function () {
+        this.dlg._browse(null, true);
+    }
+
+    dlg.go_prev = dlg.add_tool('previous');
+    dlg.go_prev.on_click = function () {
+        this.dlg.area._move_page(-1);
+    }
+
+    dlg.go_next = dlg.add_tool('next');
+    dlg.go_next.on_click = function () {
+        this.dlg.area._move_page(1);
+    }
+
+    dlg.go_root = dlg.add_tool('device');
+    dlg.go_root.on_click = function () {
+        this.dlg._browse('/');
+    }
+
+    dlg.sort = dlg.add_tool('sort');
+    dlg.sort_wnd = null;
+    dlg.sort.on_click = function() {
+		
+		if (this.dlg._name_sort_only) {
+			var wnd = this.dlg;
+			if (wnd._sort_type==0) wnd._sort_type = 1;
+			else wnd._sort_type = 0;
+			wnd.do_sort(wnd._sort_type);
+			return;
+		}
+		
+        if (this.dlg.sort_wnd) {
+            this.dlg.sort_wnd.close();
+            this.dlg.sort_wnd = null;
+            return;
+        }
+        var wnd = gw_new_popup(this.dlg.sort, 'down');
+        this.dlg.sort_wnd = wnd;
+            
+        wnd.dlg = this.dlg;
+        wnd.on_close = function() {
+            this.dlg.sort_wnd = null;
+        }
+        wnd.add_menu_item('by Name',  function () { 
+            var wnd = this.dlg;
+            if (wnd._sort_type==0) wnd._sort_type = 1;
+            else wnd._sort_type = 0;
+            wnd.do_sort(wnd._sort_type);
+        } );
+
+        wnd.add_menu_item('by Size',  function () { 
+            var wnd = this.dlg;
+            if (wnd._sort_type==2) wnd._sort_type = 3;
+            else wnd._sort_type = 2;
+            wnd.do_sort(wnd._sort_type);
+        } );
+
+        wnd.add_menu_item('by Date',  function () { 
+            var wnd = this.dlg;
+            if (wnd._sort_type==4) wnd._sort_type = 5;
+            else wnd._sort_type = 4;
+            wnd.do_sort(wnd._sort_type);
+        } );
+
+        wnd.on_display_size(gw_display_width, gw_display_height);
+        wnd.show();
+    }
+
+    dlg.predestroy = function () {
+        this.go_up = null;
+        this.go_next = null;
+        this.go_prev = null;
+        this.go_root = null;
+        this.area.dlg = null;
+    }
+
+    dlg.directory = '';
+    dlg.show_directory = false;
+    dlg.filter = '*';
+
+    dlg._on_dir_browse = function () {
+		if (this.path) {
+			this.dlg._browse(this.path, false);
+		} else {
+			this.dlg._browse(this.dlg.path + this.filename, false);
+		}
+    }
+    dlg._on_file_select = function () {
+        if (this.dlg.on_browse) {
+			if (this.path) {
+				this.dlg.on_browse(this.path, null);
+			} else {
+				this.dlg.on_browse(this.dlg.path + this.filename, this.dlg.directory);
+			}
+        }
+        this.dlg.close();
+    }
+
+    dlg.area.on_page_changed = function () {
+        if (this.is_first_page()) this.dlg.go_prev.disable();
+        else this.dlg.go_prev.enable();
+
+        if (this.is_last_page()) this.dlg.go_next.disable();
+        else this.dlg.go_next.enable();
+
+        this.dlg.tools.layout(this.dlg.tools.width, this.dlg.tools.height);
+    }
+
+    dlg.on_long_click = null;
+
+    dlg.browse = function (dir) {
+		if (typeof dir == 'string') this.directory = dir;
+		
+        this._browse(dir, false);
+    }
+    dlg._browse = function (dir, up) {
+        var w, h, i, y;
+        var filelist;
+        var is_listing = ((dir==null) || (typeof dir == 'string')) ? false : true;
+
+        if (is_listing) {
+            filelist = dir;
+            this.path = null;
+        } else {
+            if (dir) this.directory = dir;
+            if (up && !this.path) up = false;
+            filelist = gpac.enum_directory(this.directory, this.filter, up);
+
+            if (filelist.length) {
+                this.directory = filelist[0].path;
+                this.set_label(this.directory);
+            } else {
+                this.set_label('');
+            }
+            this.path = filelist.length ? filelist[0].path : '';
+        }
+
+        this.area.reset_children();
+
+        for (i = 0; i < filelist.length; i++) {
+			var f_path, f_name;
+            if (!is_listing && (filelist[i].hidden || filelist[i].system)) continue;
+
+			var icon_name = gwskin.images.mime_generic;
+			if (is_listing && typeof filelist[i].icon == 'string') {
+				if (filelist[i].icon != '') {
+					icon_name = filelist[i].icon;
+				}
+			}
+
+			if (is_listing && typeof filelist[i] == 'string') {
+				f_path = f_name = filelist[i];
+				this._name_sort_only = true;
+			} else {
+				f_path = filelist[i].path;
+				f_name = filelist[i].name;
+			}
+			
+            if ( (!is_listing || (typeof filelist[i].directory == 'boolean'))  && (filelist[i].directory || (filelist[i].name.indexOf('.') < 0))) {
+                if (filelist[i].drive) icon_name = gwskin.images.drive;
+                else icon_name = gwskin.images.folder;
+            } else {
+                icon_name = gw_guess_mime_icon(is_listing ? f_path : f_name);
+            }
+
+            var item = gw_new_icon_button(this.area, icon_name, f_name, true, 'listitem');
+            item.dlg = this;
+            item.filename = f_name;
+			item.directory = typeof filelist[i].directory != 'undefined' ? filelist[i].directory : false;
+            item.set_size(this.width, gwskin.default_control_height);
+            item.path = is_listing ? f_path : null;
+            item.size = typeof filelist[i].size != 'undefined' ? filelist[i].size : 0;
+            item.date = typeof filelist[i].last_modified != 'undefined' ? filelist[i].last_modified : 0;
+
+            if (item.directory) {
+                item.on_click = this._on_dir_browse;
+            } else {
+                item.on_click = this._on_file_select;
+            }
+            item.on_long_click = function () {
+                if (this.dlg.on_long_click) {
+					var path = this.path ? this.path : (this.dlg.directory + this.filename);
+					this.dlg.on_long_click(this.filename, path, this.dlg.directory);
+				}
+            }
+
+        }
+        this.do_sort(this._sort_type);
+
+        if (this.directory == '/') this.go_up.disable();
+        else this.go_up.enable();
+
+        this.tools.layout(this.tools.width, this.tools.height);
+    }
+
+    dlg.on_size = function (width, height) {
+        var __children = this.area.get_children();
+        for (var i = 0; i < __children.length; i++) {
+            __children[i].set_size(width, gwskin.default_control_height);
+        }
+        this.area.set_size(width, height);
+    }
+
+    return dlg;
+}
+
+
+function gw_new_plotter(parent) {
+    var touch;
+    var obj = new SFNode('Transform2D');
+    setup_gw_object(obj, 'Plotter');
+
+    obj.children[0] = new SFNode('Layer2D');
+
+    var class_name = 'plot';
+
+    obj.children[0].children[0] = gw_new_rectangle(class_name, 'normal');
+
+    obj.set_size = function (width, height) {
+        this.children[0].size.x = width;
+        this.children[0].size.y = height;
+        this.children[0].children[0].set_size(width, height);
+
+        var w = 1;
+        var h = 1;
+
+        for (var i = 0; i < this.series.length; i++) {
+            var s = this.series[i];
+            s.scale = new SFVec2f(width - this.label_width, height);
+            s.but.set_size(2*this.label_width, 0.9*gwskin.default_text_font_size);
+            s.but.set_font_size(0.9 * gwskin.default_text_font_size);
+            s.translation.x = -this.label_width / 2;
+        }
+        this.width = width;
+        this.height = height;
+    }
+
+    obj.label_width = 120;
+
+    obj.series = [];
+    obj.add_serie = function (legend, units, r, g, b) {
+        var s = gw_new_curve2d('plot');
+        s.set_color(r, g, b);
+
+        s.dlg = this;
+        s.legend = legend;
+        s.units = units;
+        s.max_y = 0;
+        s.nb_refresh = 0;
+
+        s.refresh_serie = function (serie, name_x, name_y, nb_x, factor) {
+            var s = serie[0];
+            var count = serie.length;
+
+            var first_x = s[name_x];
+ 
+            this.nb_refresh += 1;
+            if (this.nb_refresh == 50) {
+                this.max_y = 0;
+                this.nb_refresh += 1;
+            }
+            var max_y = this.max_y;
+ 
+
+            if (!factor) factor = 1;
+            for (var i = 0; i < serie.length; i++) {
+                var s = serie[i];
+                if (max_y < s[name_y]) max_y = s[name_y];
+            }
+            s = serie[0];
+
+            this.reset();
+            for (var i = 0; i < count; i++) {
+                s = serie[i];
+                //get x and y between -0.5 and 0.5, and scale to width
+                var x = s[name_x] - first_x;
+                x /= nb_x;
+                x -= 0.5;
+                //x *= 0.9;
+
+                var y = s[name_y];
+                if (max_y) y /= max_y;
+                y = -0.9 / 2 + 0.9 * y / factor;
+
+                if (i) {
+                    this.add_line_to(x, y);
+                } else {
+                    this.add_move_to(x, y);
+                }
+
+                if (i + 1 == count) {
+                    this.but.move(0.5 * this.dlg.width - this.but.width / 2, (-0.9 / 2 + 0.9 / factor) * this.dlg.height);
+                    this.but.set_label('' + this.legend + ':' + s[name_y] + ' ' + units);
+                    this.but.show();
+                }
+            }
+        }
+        this.children[0].children[this.children[0].children.length] = s;
+        this.series.push(s);
+
+        s.scale.x = this.width;
+        s.scale.y = this.height;
+
+
+        s.but = gw_new_text(this, '' + legend, 'custom');
+        s.but.set_align('END');
+        s.but.set_color(r, g, b);
+        s.but.set_size(2*this.label_width, gwskin.default_text_font_size);
+        s.but.hide();
+        return s;
+
+    }
+
+
+    gw_add_child(parent, obj);
+    return obj;
+}
+
+function gw_new_popup(anchor, type)
+{
+    var popup = gw_new_window(null, true, false, 'popup');
+    popup.area = gw_new_grid_container(popup);
+    popup.anchor = anchor;
+    popup.type = (type=='up') ? 0 : 1;
+    
+    popup._nb_over = 0;
+    popup.add_menu_item = function (label, callback) {
+        var item = gw_new_button(this.area, label, 'window');
+        item.wnd = this;
+        item.on_click = function () {
+            callback.call(this.wnd);
+            this.wnd.close();
+        }
+        item.on_over_ex = function (value) {
+            this.wnd.update_visibility();
+        }
+        item.new_over_handler(item.on_over_ex);
+
+        item.set_corners(false, false, false, false);
+        return item;
+    }
+    popup.reposition = function() {
+        var pos = gw_get_adjusted_abs_pos(this.anchor, this.width, this.height, this.type);
+        this.move(pos.x, pos.y);
+    }
+
+    popup.update_visibility = function() {
+        var nb_over = 0;
+        var children = this.area.get_children();
+        for (var i=0; i<children.length; i++) {
+            if (children[i]._over) nb_over++;
+        }
+        if (!nb_over) this.close();
+    }
+
+    
+    popup.on_display_size = function (w, h) {
+        var children = this.area.get_children();
+        var max_s = 0;
+        for (var i=0; i<children.length; i++) {
+          var s = children[i].get_label().length;
+          if (s>max_s) max_s = s;
+        }
+
+        for (var i=0; i<children.length; i++) {
+            children[i].set_size(max_s * gwskin.default_text_font_size, gwskin.default_icon_height);
+        }
+        this.area.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+        this.set_size(max_s * gwskin.default_text_font_size, children.length * gwskin.default_icon_height);
+        this.reposition();
+    }
+    gw_ui_root.has_popup = true;
+          
+     
+    popup.set_alpha(0.9);
+    return popup;
+}
+

gpac-1.0.0.tar.gz/share/gui/icons Added

gpac-1.0.0.tar.gz/share/gui/icons/add.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/app.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/audio.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/audio_full.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/audio_mute.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/check.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/close.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/compass.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/cross.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/down.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/expand.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/file.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/film.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/folder.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/harddrive.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/heart.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/home.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/image.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/info.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/laptop.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/left.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/list.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/live.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/media_next.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/media_prev.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/monitor.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/more.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/musical.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/navigation.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/network.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/next.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/osmo.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/overflowing.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/pause.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/pl_next.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/pl_prev.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/play.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/play_loop.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/play_shuffle.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/play_single.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/power.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/previous.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/remove.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/resize.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/rewind.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/right.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/seek_forward.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/shrink.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/sort.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/speed.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/star.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/stop.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/stop2.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/trash.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/tray.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/tv.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/up.svg Changed

gpac-1.0.0.tar.gz/share/gui/icons/world.svg Changed

gpac-1.0.0.tar.gz/share/gui/iphone_wm_gui.js Added

@@ -0,0 +1,1651 @@
+// 01122011 AMD1 startWidget listWidgets getWidget implemented
+/* wrapper as a module
+ var iphone_wm_gui = (function () {
+ */
+// to make sure the initialization is done only once
+var init = true;
+
+// constant
+var xlinkns = 'http://www.w3.org/1999/xlink';
+//var evns = 'http://www.w3.org/2001/xml-events';
+
+// state of the widget manager: displays homepage (value=home) or executes widget (value="exec")
+var state = 'home';
+
+// convenience variables for SVG elements
+var homepage = null, arrows = null, icons = null, widgetContainer = null, homebar = null, execbar = null;
+
+// where is the index into pages of icons on the home page
+var where = 0,maxwhere = 0,whereW = 0;
+
+// array of activated widgets
+var activatedWidgets = new Array();
+var numActivatedWidgets = 0;
+
+// variables for flexible layout
+// variables for flexible layout
+var totalWidth = 0,totalHeight = 0,iconNbHoriz = 0,iconNbVert = 0,iconsPerPage = 0;
+
+//previous size
+var previousWidth = 0,previousHeight = 0;
+
+// to differentiate between install icon and scan dir for icons
+var isThisAScan = null;
+
+// preferred icon type
+var preferredIconType = '.svg';
+
+// adapt layout to the size of the screen
+function adaptLayoutToSize() {
+    if (l_deb < log_level) {
+        alert("[UI] adaptLayoutToSize");
+    }
+    display_width = parseInt(gpac.get_option('General', 'LastWidth'));
+    display_height = parseInt(gpac.get_option('General', 'LastHeight'));
+    alert("display "+display_width+" "+display_height);
+    if (!gpac.fullscreen && display_width && display_height) {
+     gpac.set_size(display_width, display_height);
+    }
+    var tmpObject, tmpObj2;
+    // get size to adapt to
+    totalWidth = document.documentElement.viewport.width;
+    totalHeight = document.documentElement.viewport.height;
+    if (totalWidth == 0) {
+        totalWidth = 160;
+    }
+    if (totalHeight == 0) {
+        totalHeight = 280;
+    }
+    while (totalWidth < 160 || totalHeight < 280) {
+        totalWidth *= 4;
+        totalHeight *= 4;
+    }
+    // min size is 160 by 280
+    if (totalWidth < 160) {
+        totalWidth = 160;
+    }
+    if (totalHeight < 280) {
+        totalHeight = 280;
+    }
+    // round to lower multiple of 80
+    totalWidth -= totalWidth % 80;
+    var iconHeight = totalHeight - 120;
+    iconHeight -= iconHeight % 80;
+    // how many lines and columns of icons
+    iconNbHoriz = totalWidth / 80;
+    iconNbVert = iconHeight / 80;
+    totalHeight = iconHeight + 120;
+    // 120 is upper bar (60) + lower bar (60)
+    iconsPerPage = iconNbHoriz * iconNbVert;
+    // fix svg viewbox
+    document.getElementById("svg").setAttribute("viewBox", "0 0 " + totalWidth + " " + totalHeight);
+    // fix odd line
+    tmpObj2 = document.getElementById("odd");
+    var i, already = tmpObj2.getElementsByTagName("use").length;
+    //alert("odd line "+already+" "+iconNbHoriz);
+    for (i = already; i < iconNbHoriz; i++) {
+        tmpObject = document.createElement("use");
+        tmpObject.setAttribute("x", i * 80);
+        tmpObject.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#lightRect" : "#darkRect" ));
+        tmpObj2.appendChild(tmpObject);
+    }
+    // fix even line
+    tmpObj2 = document.getElementById("even");
+    already = tmpObj2.getElementsByTagName("use").length;
+    //alert("even line "+already+" "+iconNbHoriz);
+    for (i = already; i < iconNbHoriz; i++) {
+        tmpObject = document.createElement("use");
+        tmpObject.setAttribute("x", i * 80);
+        tmpObject.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#darkRect" : "#lightRect" ));
+        tmpObj2.appendChild(tmpObject);
+    }
+    // fix frame (black with rounded corners)
+    tmpObject = document.getElementById("frame");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight);
+    tmpObject = document.getElementById("frame2");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight);
+    // fix screen (white)
+    tmpObject = document.getElementById("screen");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight - 120);
+    // fix grid back (gray)
+    tmpObject = document.getElementById("gridback");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight - 120);
+    // fix icon background grid
+    tmpObject = document.getElementById("grid");
+    already = tmpObject.getElementsByTagName("use").length;
+    for (i = already; i < iconNbVert; i++) {
+        tmpObj2 = document.createElement("use");
+        tmpObj2.setAttribute("y", i * 80);
+        tmpObj2.setAttributeNS(xlinkns, "href", (((i % 2) == 0) ? "#odd" : "#even" ));
+        tmpObject.appendChild(tmpObj2);
+    }
+    // if there are already too many lines, remove the extra ones otherwise they are rendered on top of the lower
+    // part of the decoration
+    if (already > iconNbVert) {
+        while (already-- > iconNbVert) {
+            tmpObject.removeChild(tmpObject.lastChild);
+        }
+    }
+    // fix commands (lower bar)
+    document.getElementById("commands").setAttribute("transform", "translate(0, " + (totalHeight - 60) + ")");
+    document.getElementById("homeButton").setAttribute("transform", "translate(" + (totalWidth / 2) + ", 30)");
+    document.getElementById("right").setAttribute("transform", "translate(" + (totalWidth - 50) + ", 10)");
+    document.getElementById("rightW").setAttribute("transform", "translate(" + (totalWidth - 50) + ", 10)");
+    // fix the cuts (white rects left and right because we have no clipping)
+    tmpObject = document.getElementById("leftCut");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight);
+    tmpObject.setAttribute("x", -1 - totalWidth);
+    tmpObject = document.getElementById("rightCut");
+    tmpObject.setAttribute("width", totalWidth);
+    tmpObject.setAttribute("height", totalHeight);
+    tmpObject.setAttribute("x", 1 + totalWidth);
+    // respace executing widgets if any
+    tmpObject = widgetContainer.getElementsByTagName("g");
+    for (i = 0; i < tmpObject.length; i++) {
+        var gg = tmpObject.item(i);
+        gg.setAttribute("transform", "translate(" + (totalWidth * (i - 1)) + ", 0)");
+        if (gg.firstElementChild != null) {
+            gg.firstElementChild.setAttribute("width", totalWidth);
+            gg.firstElementChild.setAttribute("height", totalHeight - 120);
+        }
+    }
+}
+
+//
+// widget close on click at "Kill" button
+//
+function on_kill_widget() {
+    if (state == 'exec') {
+        widget_close(activatedWidgets[whereW]);
+    }
+}
+
+//
+// widget get on click at "GetW" button
+//
+function on_get_widget() {
+    alert("on_get_widget " + WidgetManager.MPEGUStandardServiceProviders.length);
+    if (WidgetManager.MPEGUStandardServiceProviders.length != 0) {
+        upnp_renders = selector_window1();
+        upnp_renders.on_select = function(item) {
+            upnp_renders.unregister(root);
+            upnp_renders = null;
+            if (item == -1) {
+                return;
+            }
+            alert("upnp_renders.on_select(" + item + ")");
+            var device = WidgetManager.MPEGUStandardServiceProviders[item];
+            device.standardService.SetActionListener("listWidgets", get_widget_callback(device), true);
+            device.standardService.CallAction("listWidgets", new Array());
+        }
+        upnp_renders.register(root);
+    }
+}
+
+function get_widget_callback(device) {
+    return function() {
+        //alert("get_widget_callback");
+        // msgHandler is the first argument, the next arguments are from the reply to listWidgets
+        var act = arguments[0];
+        var act1 = act.GetArgumentValue("widgetCodes");
+        var act2 = act.GetArgumentValue("widgetNames");
+        //alert(act1+" "+act2);
+        target_widgets = selector_window2(act1.split(" "), act2.split(" "));
+        target_widgets.on_select = function(item) {
+            alert("target_widgets.on_select");
+            target_widgets.unregister(root);
+            target_widgets = null;
+            if (item == -1) {
+                return;
+            }
+            alert("target_widgets.on_select(" + item + ")");
+            var args = new Array();
+            args[0] = "widgetCode";
+            args[1] = item;
+            device.standardService.SetActionListener("getWidget", get_widget_callback2, true);
+            device.standardService.CallAction("getWidget", args);
+        }
+        target_widgets.register(root);
+    }
+}
+
+function get_widget_callback2() {
+    // msgHandler is the first argument, the next arguments are from the reply to listWidgets
+    alert("callback2-1");
+    var act = arguments[0];
+    var act1 = act.GetArgumentValue("widgetUrl");
+    var act2 = act.GetArgumentValue("widgetContext");
+    alert("callback2-2 " + act1 + " " + act2);
+    var wid = WidgetManager.load(act1, null, act2);
+    WidgetManager.on_widget_add(wid);
+}
+
+//
+// creates the menu of available targets for pushing a widget elsewhere
+//
+function selector_window1() {
+    var i, count, render;
+    var selector = document.createElement('g'), obj, child;
+    selector.setAttribute('transform', 'translate(10,10)');
+    count = WidgetManager.MPEGUStandardServiceProviders.length;
+    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black', null));
+    for (i = 0; i < count; i++) {
+        render = WidgetManager.MPEGUStandardServiceProviders[i];
+        obj = createtext(render.Name, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
+        obj.setAttribute('id', "select" + i);
+        selector.appendChild(obj);
+        obj.addEventListener('mouseover', sw1("select" + i), false);
+        obj.addEventListener('mouseout', sw2("select" + i), false);
+        obj.addEventListener('click', sw4(i), false);
+    }
+    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
+    obj.setAttribute('id', "canc");
+    selector.appendChild(obj);
+    obj.addEventListener('mouseover', function() { document.getElementById("canc").setAttribute("fill", "red"); }, false);
+    obj.addEventListener('mouseout', function() { document.getElementById("canc").setAttribute("fill", "black"); }, false);
+    obj.addEventListener('click', function() { upnp_renders.on_select(-1); }, false);
+    selector.register = function(disp) {
+        disp.appendChild(this);
+    };
+    selector.unregister = function(disp) {
+        disp.removeChild(this);
+    };
+    return selector;
+}
+
+//
+// creates the menu of available targets for pushing a widget elsewhere
+//
+function selector_window2(codes, names) {
+    alert("selector_window2");
+    var i, count, render;
+    var selector = document.createElement('g'), obj, child;
+    selector.setAttribute('transform', 'translate(10,10)');
+    count = codes.length;
+    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black', null));
+    for (i = 0; i < count; i++) {
+        render = names[i];
+        obj = createtext(render, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
+        obj.setAttribute('id', "selecto" + i);
+        selector.appendChild(obj);
+        obj.addEventListener('mouseover', sw1("selecto" + i), false);
+        obj.addEventListener('mouseout', sw2("selecto" + i), false);
+        obj.addEventListener('click', sw5(i), false);
+    }
+    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
+    obj.setAttribute('id', "cance");
+    selector.appendChild(obj);
+    obj.addEventListener('mouseover', function() { document.getElementById("cance").setAttribute("fill", "red"); }, false);
+    obj.addEventListener('mouseout', function() { document.getElementById("cance").setAttribute("fill", "black"); }, false);
+    obj.addEventListener('click', function() { target_widgets.on_select(-1); }, false);
+    selector.register = function(disp) {
+        disp.appendChild(this);
+    };
+    selector.unregister = function(disp) {
+        disp.removeChild(this);
+    };
+    return selector;
+}
+
+function sw4(si) {
+    return function() { upnp_renders.on_select(si); };
+}
+
+function sw5(si) {
+    return function() { target_widgets.on_select(si); };
+}
+
+//
+// when deleting an executing widgets, all executing widgets to its right are moved to the left
+//
+function recurseMoveAfterDelete(target) {
+    if (target != null && target.nextElementSibling != null) {
+        var v = target.nextElementSibling;
+        recurseMoveAfterDelete(v);
+        v.setAttribute("transform", target.getAttribute("transform"));
+    }
+}
+
+//
+// click on home button to switch from icons to executing widgets
+//
+function home_button(evt) {
+    if (l_deb < log_level) {
+        alert("[UI] home_button");
+    }
+    if (state != 'home') {
+        state = 'home';
+        widgetContainer.setAttribute('display', 'none');
+        homepage.setAttribute('display', 'inline');
+        homebar.setAttribute('display', 'inline');
+        execbar.setAttribute('display', 'none');
+        arrows.setAttribute('display', 'inline');
+        arrowsW.setAttribute('display', 'none');
+        widgetAddList.setAttribute('display', 'none');
+    } else {
+        state = 'exec';
+        widgetContainer.setAttribute('display', 'inline');
+        homepage.setAttribute('display', 'none');
+        homebar.setAttribute('display', 'none');
+        execbar.setAttribute('display', 'inline');
+        arrows.setAttribute('display', 'none');
+        arrowsW.setAttribute('display', 'inline');
+        widgetAddList.setAttribute('display', 'none');
+    }
+}
+
+// constants
+var adjustFrom = "0,0";
+var animDue = true;
+
+//
+// after each change of icon page, this function adjusts the visibility of arrows in the lower bar
+//
+function adjustwhere(animDue) {
+    if (l_deb < log_level) {
+        alert("[UI] adjust " + where + " 0 " + maxwhere);
+    }
+    document.getElementById("left").setAttribute("display", ((where > 0) ? "inline" : "none"));
+    document.getElementById("right").setAttribute("display", ((where < maxwhere) ? "inline" : "none"));
+    if (!animDue) {
+        icons.setAttribute("transform", 'translate(' + (-80 * iconNbHoriz * where) + ',0)');
+    } else {
+        var aw = document.createElement("animateTransform");
+        aw.setAttribute("attributeName", "transform");
+        aw.setAttribute("type", "translate");
+        //alert('time '+document.documentElement.getCurrentTime());
+        aw.setAttribute("begin", document.documentElement.getCurrentTime());
+        aw.setAttribute("dur", "1s");
+        aw.setAttribute("fill", "freeze");
+        aw.setAttributeNS(xlinkns, "href", "#icons");
+        aw.setAttribute("from", adjustFrom);
+        aw.setAttribute("to", (-80 * iconNbHoriz * where) + ",0");
+        document.documentElement.appendChild(aw);
+    }
+    adjustFrom = (-80 * iconNbHoriz * where) + ",0";
+}
+
+//
+// action of the left button on the lower bar
+//
+function left_button() {
+    if (l_deb < log_level) {
+        alert("[UI] left button " + where + " 0");
+    }
+    if (where > 0) {
+        where--;
+        adjustwhere(true);
+    }
+}
+
+//
+// action of the right button of the lower bar
+//
+function right_button() {
+    if (l_deb < log_level) {
+        alert("[UI] right button " + where + " " + maxwhere);
+    }
+    if (where < maxwhere) {
+        where++;
+        adjustwhere(true);
+    }
+}
+
+var adjustFromW = "0,0";
+var oldwhereW = -1;
+
+//
+// after each change of icon page, this function adjusts the visibility of arrows in the lower bar
+//
+function adjustWhereWidgets(animDue) {
+    if (oldwhereW != whereW) {
+        // hide oldwhereW
+        if (oldwhereW >= 0 && activatedWidgets[oldwhereW] != null) {
+            WidgetManager.corein_message(activatedWidgets[oldwhereW], "hide");
+        }
+    }
+    if (l_deb < log_level) {
+        alert("[UI] adjustW " + whereW + " 0 " + (numActivatedWidgets - 1));
+    }
+    document.getElementById("leftW").setAttribute("display", ((whereW > 0) ? "inline" : "none"));
+    document.getElementById("rightW").setAttribute("display", ((whereW < (numActivatedWidgets - 1)) ? "inline" : "none"));
+    if (!animDue) {
+        widgetContainer.setAttribute("transform", "translate(" + (-totalWidth * whereW) + ",0)");
+    } else {
+        var aw = document.createElement("animateTransform");
+        aw.setAttribute("attributeName", "transform");
+        aw.setAttribute("type", "translate");
+        aw.setAttribute("begin", document.documentElement.getCurrentTime());
+        aw.setAttribute("dur", "1s");
+        aw.setAttribute("fill", "freeze");
+        aw.setAttributeNS(xlinkns, "href", "#widget");
+        aw.setAttribute("from", adjustFromW);
+        aw.setAttribute("to", (-totalWidth * whereW) + ",0");
+        document.documentElement.appendChild(aw);
+    }
+    adjustFromW = (-totalWidth * whereW) + ",0";
+    document.getElementById("widgetName").textContent =
+            (whereW >= 0 && activatedWidgets[whereW] != null ? activatedWidgets[whereW].shortName : '-');
+    if (oldwhereW != whereW) {
+        // show whereW
+        if (whereW >= 0 && activatedWidgets[whereW] != null) {
+            WidgetManager.corein_message(activatedWidgets[whereW], "show");
+        }
+        oldwhereW = whereW;
+    }
+}
+
+//
+// action of the left button on the lower bar
+//
+function left_buttonW() {
+    if (l_deb < log_level) {
+        alert("[UI] left button " + whereW);
+    }
+    if (whereW > 0) {
+        whereW--;
+        adjustWhereWidgets(animDue);
+    }
+}
+
+//
+// action of the right button of the lower bar
+//
+function right_buttonW() {
+    if (l_deb < log_level) {
+        alert("[UI] right button " + whereW + " " + (numActivatedWidgets - 1));
+    }
+    if (whereW < (numActivatedWidgets - 1)) {
+        whereW++;
+        adjustWhereWidgets(animDue);
+    }
+}
+
+//
+// action of each icon, starting the matching widget
+//
+function activating_widget(w) {
+    if (l_deb < log_level) {
+        alert("[UI] activating widget: " + w.name);
+    }
+    widget_add(w);
+}
+
+//
+// main initialization function
+// init variables, then init the widget manager C code, then inits UPnP
+//
+function initialize() {
+    if (l_deb < log_level) {
+        alert("[UI] initialize");
+    }
+    init = false;
+    var display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
+    var display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
+    if (display_width && display_height) {
+        gpac.set_size(display_width, display_height);
+    }
+    root = document.documentElement;
+    homepage = document.getElementById('homepage');
+    homebar = document.getElementById('homebar');
+    execbar = document.getElementById('execbar');
+    arrows = document.getElementById('arrows');
+    arrowsW = document.getElementById('arrowsW');
+    icons = document.getElementById('icons');
+    widgetContainer = document.getElementById('widget');
+    widgetAddList = document.getElementById('widgetAddList');
+    /* Setup the GPAC Widget Manager - this will also scan the available widgets */
+    log_level = l_inf;
+    widget_manager_init();
+    WidgetManager.on_widget_remove = widget_remove;
+    WidgetManager.on_widget_add = widget_add;
+    /* register the callback to be notified of incoming widgets */
+    has_upnp = (typeof UPnP != 'undefined');
+    if (has_upnp) {
+        /* setting the callback to allow other devices to push their widgets */
+        UPnP.onMediaConnect = onMediaConnect;
+        /* Tell GPAC that the calls to the main Renderer (like open, ...) must be forwared to this scene */
+        UPnP.BindRenderer();
+    }
+    WidgetManager.coreOutShow = coreOutShowImplementation;
+    WidgetManager.coreOutGetAttention = coreOutGetAttentionImplementation;
+    WidgetManager.coreOutHide = coreOutHideImplementation;
+    WidgetManager.coreOutRequestDeactivate = coreOutRequestDeactivateImplementation;
+    WidgetManager.coreOutInstallWidget = coreOutInstallWidgetImplementation;
+    WidgetManager.coreOutActivateTemporaryWidget = coreOutActivateTemporaryWidgetImplementation;
+    WidgetManager.coreOutMigrateComponent = coreOutMigrateComponentImplementation;
+    WidgetManager.coreOutRequestMigrationTargets = coreOutRequestMigrationTargetsImplementation;
+}
+
+//
+// implementation of core:out install widget
+//
+function coreOutInstallWidgetImplementation(wid, args) {
+    var w = widgetInstall(args[0], true, false, wid);
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.installWidgetMessage, ifce.get_message("installWidget"),
+                wid, (w != null ? 1 : 0)); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out activate temporary widget
+//
+function coreOutActivateTemporaryWidgetImplementation(wid, args) {
+    var w = widgetInstall(args[0], true, true, null);
+    if (w != null) {
+        activating_widget(w);
+    }
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.activateTemporaryWidgetMessage, ifce.get_message("activateTemporaryWidget"),
+                wid, (w != null ? 1 : 0)); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out migrate component
+//
+function coreOutMigrateComponentImplementation(wid, args) {
+    //alert("coreOutMigrateComponent "+wid.name+" "+args.length);
+    var comp = wid.get_component(args[0], true);
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (comp == null) {
+        log(l_err, 'Component ' + args[0] + ' cannot be found in widget ' + wid.name);
+        if (ifce != null) {
+            wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 0);
+        }
+        return;
+    }
+    if (args.length > 1 && args[1] != null) {
+        //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(parseInt(args[1])), comp);
+        WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(parseInt(args[1])), comp);
+        widget_close(comp);
+    } else {
+        upnp_renders = selector_window(comp);
+        upnp_renders.on_select = function(item, wid) {
+            upnp_renders.unregister(root);
+            upnp_renders = null;
+            if (item == -1) {
+                return;
+            }
+            if (comp != null) {
+                alert("upnp_renders.on_select(" + item + "," + comp.name + ")");
+                //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(item), comp);
+                WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(item), comp);
+                widget_close(comp);
+            }
+        };
+        upnp_renders.register(root);
+    }
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.migrateComponentMessage, ifce.get_message("migrateComponent"), wid, 1); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out request migration targets
+//
+function coreOutRequestMigrationTargetsImplementation(wid, args) {
+    var count = UPnP.MediaRenderersCount, codes = new Array(), names = new Array(), descriptions = new Array(), i;
+    for (i = 0; i < count; i++) {
+        var render = UPnP.GetMediaRenderer(i);
+        codes.push("" + i);
+        names.push(render.Name);
+        descriptions.push(render.HostName + " " + render.UUID);
+    }
+    i = null;
+    var ifce_count = wid.num_interfaces, j;
+    for (j = 0; j < ifce_count; j++) {
+        var ifce = wid.get_interface(j);
+        if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
+            i = ifce;
+            break;
+        }
+    }
+    if (i != null) {
+        wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
+                wid, codes, names, descriptions);
+    }
+}
+
+//
+// implementation of core:out Show message
+// this is a request by the widget to be shown
+//
+function coreOutShowImplementation(wid, args) {
+    //alert("core:out show "+wid.name);
+    var target = widgetContainer.firstElementChild;
+    var i;
+    for (i = 0; i < numActivatedWidgets; i++) {
+        //alert("is it "+activatedWidgets[i].name);
+        if (activatedWidgets[i] == wid) {
+            break;
+        }
+        target = target.nextElementSibling;
+    }
+    // here, i is the index of the current widget
+    //alert(" "+i+" "+numActivatedWidgets);
+    if (i < numActivatedWidgets) {
+        whereW = i;
+        adjustWhereWidgets(false);
+    }
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.showMessage, ifce.get_message("show"), wid, 1); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out GetAttention message
+// this is a request by the widget to be shown and some special signal is given
+//
+function coreOutGetAttentionImplementation(wid, args) {
+    //alert("core:out getAttention "+wid.name);
+    var target = widgetContainer.firstElementChild;
+    var i;
+    for (i = 0; i < numActivatedWidgets; i++) {
+        //alert("is it "+activatedWidgets[i].name);
+        if (activatedWidgets[i] == wid) {
+            break;
+        }
+        target = target.nextElementSibling;
+    }
+    // here, i is the index of the current widget
+    //alert(" "+i+" "+numActivatedWidgets);
+    if (i < numActivatedWidgets) {
+        whereW = i;
+        adjustWhereWidgets(false);
+    }
+    document.getElementById("getAttention").beginElement();
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.getAttentionMessage, ifce.get_message("getAttention"), wid, 1); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out hide message
+// this is a request by the widget to be hidden (some other widget (if any) is shown)
+//
+function coreOutHideImplementation(wid, args) {
+    //alert("core:out hide "+wid.name);
+    var target = widgetContainer.firstElementChild;
+    var i;
+    for (i = 0; i < numActivatedWidgets; i++) {
+        //alert("is it "+activatedWidgets[i].name);
+        if (activatedWidgets[i] == wid) {
+            break;
+        }
+        target = target.nextElementSibling;
+    }
+    // here, i is the index of the current widget
+    //alert("hide "+i+" "+numActivatedWidgets);
+    if (i < numActivatedWidgets) {
+        if (whereW > 0) {
+            whereW--;
+        }
+        else if (whereW < numActivatedWidgets - 1) {
+            whereW++;
+        }
+        else {
+            return;
+        }
+        adjustWhereWidgets(false);
+    }
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.hideMessage, ifce.get_message("hide"), wid, 1); // send return code 1 = success
+    }
+}
+
+//
+// implementation of core:out requestDeactivate message
+// this is a request by the widget to be stopped
+//
+function coreOutRequestDeactivateImplementation(wid, args) {
+    //alert("core:out hide "+wid.name);
+    var target = widgetContainer.firstElementChild;
+    var i;
+    for (i = 0; i < numActivatedWidgets; i++) {
+        //alert("is it "+activatedWidgets[i].name);
+        if (activatedWidgets[i] == wid) {
+            break;
+        }
+        target = target.nextElementSibling;
+    }
+    // here, i is the index of the current widget
+    //alert("hide "+i+" "+numActivatedWidgets);
+    if (i < numActivatedWidgets) {
+        widget_close(activatedWidgets[i]);
+    }
+    var ifce = getInterfaceByType(wid, "urn:mpeg:mpegu:schema:widgets:core:out:2010");
+    if (ifce != null) {
+        wmjs_core_out_invoke_reply(coreOut.requestDeactivateMessage, ifce.get_message("requestDeactivate"), wid, 1); // send return code 1 = success
+    }
+}
+
+//
+// WM callback for when a component is activated by its parent
+//
+function widget_add(w) {
+    log(l_inf, "widget add " + w.name);
+    if (!w.activated) {
+        if (sameFileIgnoringSVGView(w.icon, w.main)) {
+            // same file in icon and main
+        } else {
+            widget_launch(w, document.createElement("animation"));
+        }
+    } else if (w.multipleInstances) {
+        var newwid = WidgetManager.open(w.manifest, null);
+        widget_launch(newwid, document.createElement("animation"));
+    } else {
+        return false;
+    }
+    state = 'exec';
+    widgetContainer.setAttribute('display', 'inline');
+    homepage.setAttribute('display', 'none');
+    homebar.setAttribute('display', 'none');
+    execbar.setAttribute('display', 'inline');
+    arrows.setAttribute('display', 'none');
+    arrowsW.setAttribute('display', 'inline');
+    widgetAddList.setAttribute('display', 'none');
+    return true;
+}
+
+function sameFileIgnoringSVGView(name1, name2) {
+    if (name1 == name2) {
+        return true;
+    }
+    if (name1 == null) {
+        return false;
+    }
+    var i1 = name1.indexOf("#");
+    var i2 = name2.indexOf("#");
+    if (i1 < 0) {
+        i1 = name1.length;
+    }
+    else {
+        i1--;
+    }
+    if (i2 < 0) {
+        i2 = name2.length;
+    }
+    else {
+        i2--;
+    }
+    return name1.substring(0, i1) == name2.substring(0, i2);
+}
+
+//
+// recompute the number of widgets loaded currently
+//
+function getNbWidgets() {
+    var i, nbWidgets = 0;
+    for (i = 0; i < WidgetManager.num_widgets; i++) {
+        var w = WidgetManager.get(i);
+        if (w != null && w.loaded) {
+            nbWidgets++;
+        }
+    }
+    return nbWidgets;
+}
+
+//
+// just resize the window and viewport, and initialize the first time this is called
+//
+function resize() {
+    if (init) {
+        initialize();
+    }
+    if (document.documentElement.viewport.width == previousWidth && document.documentElement.viewport.height == previousHeight) {
+        return;
+    }
+    if (l_deb < log_level) {
+        alert("[UI] start initialize() w:" + document.documentElement.viewport.width + " h:" + document.documentElement.viewport.height);
+    }
+    adaptLayoutToSize();
+    // start by filling the "home page" with known icons
+    where = 0;
+    var nbWidgets = getNbWidgets();
+    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
+    var wid;
+    var iconIterator = document.getElementById("icons").firstElementChild;
+    var position = 0;
+    for (i = 1; i <= WidgetManager.num_widgets; i++) {
+        wid = WidgetManager.get(i - 1);
+        // alert("build:"+wid.main+" "+wid.loaded);
+        if (wid.loaded) {
+            insert_icon(wid, position, i - 1, iconIterator);
+            WidgetManager.corein_message(wid, 'setSize', 'width', totalWidth, 'height', totalHeight - 120, 'dpi', 96);
+            position++;
+            if (iconIterator != null) {
+                iconIterator = iconIterator.nextElementSibling;
+            }
+        }
+    }
+    adjustwhere(false);
+    adjustWhereWidgets(false);
+    previousWidth = document.documentElement.viewport.width;
+    previousHeight = document.documentElement.viewport.height;
+    gpac.set_option("Widgets", "LastWMWidth", '' + previousWidth);
+    gpac.set_option("Widgets", "LastWMHeight", '' + previousHeight);
+}
+
+//
+// function inserting an icon on the home page
+//
+function insert_icon(widget, position, widgetIndex, previousIcon) {
+    if (l_deb < log_level) {
+        alert("[UI] insert_icon: " + widget.shortName + " " + position + " " + widgetIndex + " WMnw:" + WidgetManager.num_widgets);
+    }
+    widget.loaded = true;
+    if (l_deb < log_level) {
+        alert("[UI] widget name: " + widget.name);
+    }
+    var icon = null, original = null;
+    for (var i = 0; i < widget.icons.length; i++) {
+        // default to the first icon even if not of the preferred type
+        if (i == 0) {
+            icon = widget.icons[0].relocated_src;
+            //original = widget.icons[0].original;
+            // alert("choosing default icon " + icon);
+        }
+        // check for preferred type
+        if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
+            icon = widget.icons[i].relocated_src;
+            //original = widget.icons[i].original;
+            break;
+        }
+    }
+    var shortName = widget.shortName;
+    if (typeof shortName == 'undefined') {
+        shortName = widget.name.substring(0, 9);
+    }
+    createIconSVGdecoration(previousIcon, widget, (((position % iconNbHoriz) * 80) + ((80 * (position - (position % iconsPerPage))) / iconNbVert)),
+            ((((position % iconsPerPage) - (position % iconNbHoriz)) / iconNbHoriz) * 80), "icons", icon,
+            shortName, widgetIndex);
+}
+
+// constant
+// const corein = "urn:mpeg:mpegu:schema:widgets:core:in:2010";
+
+//
+// commodity method to empty a list of children
+//
+function removeAllChildren(o) {
+    if (o != null && o.hasChildNodes()) {
+        while (o.childNodes.length >= 1) {
+            o.removeChild(o.firstChild);
+        }
+    }
+}
+
+//
+// create the home page icon with all its behaviours
+//
+function createIconSVGdecoration(previousIcon, widget, x, y, fatherId, iconUrl, name, widIndex) {
+    var g, g2;
+    if (l_inf < log_level) {
+        alert("[UI] createIconSVGdecoration " + iconUrl + " " + x + " " + y);
+    }
+    if (previousIcon != null) {
+        g = previousIcon;
+    } else {
+        g = document.createElement("g");
+        document.getElementById(fatherId).appendChild(g);
+    }
+    g.setAttribute("transform", 'translate(' + x + ',' + y + ')');
+    if (previousIcon != null) {
+        g2 = g.firstElementChild;
+    } else {
+        g2 = document.createElement("g");
+        g2.setAttribute("transform", 'translate(15,10)');
+        g.appendChild(g2);
+    }
+    if (iconUrl == null || iconUrl == "") {
+        iconUrl = "icons/face-surprise.svg";
+    }
+    //
+    // process differently cases where widget.icon == widget.main
+    //
+    var container;
+    if (sameFileIgnoringSVGView(iconUrl, widget.main) && widget.main.indexOf('.svg') >= 0) {
+        // see if the animation already exists
+        container = document.getElementById(name);
+        if (container == null) {
+            // if the animation does not exist yet, create it
+            container = media('animation', iconUrl, 50, 50);
+            // store the animation in the main defs
+            document.getElementById("mainDefs").appendChild(container);
+            container.setAttribute('id', name);
+        }
+        if (previousIcon == null) {
+            // put the container in a use
+            var use = document.createElement("use");
+            use.setAttribute('id', 'iconContainer' + name);
+            use.setAttributeNS(xlinkns, 'href', '#' + name);
+            g2.appendChild(use);
+        }
+    } else {
+        if (previousIcon == null) {
+            container = appropriateElementForMedia(iconUrl, 50, 50);
+            container.setAttribute('id', name);
+            g2.appendChild(container);
+        }
+    }
+    if (previousIcon == null) {
+        g2 = document.createElement("g");
+        g2.setAttribute("transform", 'translate(40,70)');
+        g.appendChild(g2);
+        var anim = createtext(name, 'white', 0, 0, 14, 'Arial Unicode MS');
+        anim.setAttribute("text-anchor", "middle");
+        anim.setAttribute("display-align", "center");
+        g2.appendChild(anim);
+        var rect = invisible_rect(80, 80);
+        g.appendChild(rect);
+        rect.addEventListener("click", csi(widget), false);
+    }
+}
+
+function csi(widget) {
+    return function(evt) { activating_widget(widget);};
+}
+
+//
+// widget closing action (WM callback)
+//
+function widget_close(wid) {
+    if (wid == null) {
+        return;
+    }
+    if (l_inf <= log_level) {
+        alert('[UI] widget_close:' + wid.name);
+    }
+    // maybe inform the widget that it is going to be deactivated
+    WidgetManager.corein_message(wid, "deactivate");
+    var target = widgetContainer.firstElementChild;
+    var i;
+    for (i = 0; i < numActivatedWidgets; i++) {
+        if (activatedWidgets[i] == wid) {
+            break;
+        }
+        target = target.nextElementSibling;
+    }
+    if (target != null) {
+        // move next widgets back one slot
+        recurseMoveAfterDelete(target);
+        // stop the subscene
+        if (target.firstElementChild != null) {
+            target.firstElementChild.setAttributeNS(xlinkns, "href", "");
+        }
+        // end trying
+        widgetContainer.removeChild(target);
+    }
+    wid.deactivate();
+    wid.activated = false;
+    activatedWidgets.splice(i, 1);
+    numActivatedWidgets--;
+    whereW = (whereW >= i ? (whereW > 0 ? whereW - 1 : 0) : whereW);
+    adjustWhereWidgets(false);
+    // if no more widgets, go back to the icons
+    if (numActivatedWidgets == 0) {
+        state = 'home';
+        widgetContainer.setAttribute('display', 'none');
+        homepage.setAttribute('display', 'inline');
+        homebar.setAttribute('display', 'inline');
+        execbar.setAttribute('display', 'none');
+        arrows.setAttribute('display', 'inline');
+        arrowsW.setAttribute('display', 'none');
+        widgetAddList.setAttribute('display', 'none');
+    }
+    if (!wid.permanent) {
+        WidgetManager.unload(wid, false);
+    }
+}
+
+//
+// widget unloading action (WM callback)
+//
+function widget_remove(wid) {
+    if (l_deb <= log_level) {
+        alert('[UI] widget_remove:' + wid.name);
+    }
+    widget_close(wid);
+    WidgetManager.unload(wid, false);
+}
+
+//
+// widget launcher action
+//
+function widget_launch(wid, scene_container) {
+    if (l_inf <= log_level) {
+        alert('[UI] widget_launch:' + wid.name);
+    }
+    var tmp = document.createElement("g");
+    tmp.setAttribute("transform", "translate(" + (totalWidth * numActivatedWidgets) + ", 0)");
+    widgetContainer.appendChild(tmp);
+    var icon = null;
+    alert("wid: " + wid.name + "|" + wid.shortName);
+    if (typeof wid.shortName != 'undefined') {
+        var container = document.getElementById(wid.shortName);
+        if (container != null) {
+            icon = container.getAttributeNS(xlinkns, 'href');
+        }
+    }
+    if (icon != null &&
+            sameFileIgnoringSVGView(icon, wid.main) &&
+            endsWith(wid.main, '.svg')) {
+        // get the animation with id=shortName stored in mainDefs
+        scene_container = document.getElementById(wid.shortName);
+        // get the original use on it, used in the icon
+        var iconContainer = document.getElementById('iconContainer' + wid.shortName);
+        // create a new use
+        var use = document.createElement('use');
+        // point to the animation
+        use.setAttributeNS(xlinkns, 'href', '#' + wid.shortName);
+        // resize the animation
+        scene_container.setAttribute("width", totalWidth);
+        scene_container.setAttribute("height", totalHeight - 120);
+        // resize the original use
+        //should do: fix the aspect ratio conservation
+        var m, t = Math.abs(totalHeight - 120 - totalWidth) / 2;
+        if (totalWidth > totalHeight - 120) {
+            m = 50 / (totalHeight - 120);
+            iconContainer.setAttribute('transform', 'scale(' + m + ',' + m + ') translate(' + (-t) + ',0)');
+        } else {
+            m = 50 / totalWidth;
+            iconContainer.setAttribute('transform', 'scale(' + m + ',' + m + ') translate(0,' + (-t) + ') ');
+        }
+        // add the new use as widget execution container
+        tmp.appendChild(use);
+        wid.activate(scene_container);
+    } else {
+        scene_container.setAttribute("width", totalWidth);
+        scene_container.setAttribute("height", totalHeight - 120);
+        tmp.appendChild(scene_container);
+        scene_container.setAttributeNS(xlinkns, 'href', wid.main);
+        wid.activate(scene_container);
+    }
+    wid.activated = true;
+    activatedWidgets.splice(numActivatedWidgets, 0, wid);
+    whereW = numActivatedWidgets;
+    numActivatedWidgets++;
+    adjustWhereWidgets(false);
+    wid.load_component = widget_load_component;
+    wid.permanent = true;
+    wid.on_load = function () {
+        WidgetManager.corein_message(this, 'setSize', 'width', totalWidth, 'height', totalHeight - 120, 'dpi', 96);
+    };
+    //
+    if (log_level > l_inf) {
+        var i = 0;
+        alert(">>>>>>>>>>>>> " + wid.name + " interfaces:");
+        for (; i < wid.num_interfaces; i++) {
+            alert("" + wid.get_interface(i).type);
+        }
+    }
+    //
+}
+
+//
+// widget load component (WM callback)
+//
+function widget_load_component(comp, is_unload) {
+    if (l_deb <= log_level) {
+        alert('[UI] widget_load_component:' + comp.name);
+    }
+    if (is_unload) {
+        widget_close(comp);
+        comp.parent = null;
+    } else {
+        widget_add(comp);
+        comp.permanent = false;
+        comp.parent = this;
+    }
+}
+
+var upnp_renders = null, target_widgets = null;
+
+//
+// widget remoting function
+//
+function on_widget_remote() {
+    if (WidgetManager.MPEGUStandardServiceProviders.length != 0 && numActivatedWidgets > 0) {
+        upnp_renders = selector_window(activatedWidgets[whereW]);
+        upnp_renders.on_select = function(item, wid) {
+            upnp_renders.unregister(root);
+            upnp_renders = null;
+            if (item == -1) {
+                return;
+            }
+            if (wid != null) {
+                alert("upnp_renders.on_select(" + item + "," + wid.name + ")");
+                //WidgetManager.migrate_widget(UPnP.GetMediaRenderer(item), wid);
+                WidgetManager.migrate_widget(WidgetManager.get_mpegu_service_providers(item), wid);
+                widget_close(wid);
+            }
+        };
+        upnp_renders.register(root);
+    }
+}
+
+//
+// creates the menu of available targets for pushing a widget elsewhere
+//
+function selector_window(widget) {
+    var i, count, render;
+    var selector = document.createElement('g'), obj, child;
+    selector.setAttribute('transform', 'translate(10,10)');
+    count = WidgetManager.MPEGUStandardServiceProviders.length;
+    selector.appendChild(rect(0, 0, 300, 20 * (count + 1), 'white', 'black'));
+    for (i = 0; i < count; i++) {
+        render = WidgetManager.MPEGUStandardServiceProviders[i];
+        obj = createtext(render.Name, 'black', 5, 17 + (20 * i), 15, 'sans-serif');
+        obj.setAttribute('id', "selector" + i);
+        selector.appendChild(obj);
+        obj.addEventListener('mouseover', sw1("selector" + i), false);
+        obj.addEventListener('mouseout', sw2("selector" + i), false);
+        obj.addEventListener('click', sw3(i, widget), false);
+    }
+    obj = createtext('Cancel', 'rgb(0,0,120)', 55, 17 + (20 * i), 15, 'sans-serif');
+    obj.setAttribute('id', "cancel");
+    selector.appendChild(obj);
+    obj.addEventListener('mouseover', function(evt) { document.getElementById("cancel").setAttribute("fill", "red"); }, false);
+    obj.addEventListener('mouseout', function(evt) { document.getElementById("cancel").setAttribute("fill", "black"); }, false);
+    obj.addEventListener('click', function(evt) { upnp_renders.on_select(-1, null); }, false);
+    selector.register = function(disp) {
+        disp.appendChild(this);
+    };
+    selector.unregister = function(disp) {
+        disp.removeChild(this);
+    };
+    return selector;
+}
+
+function sw1(s) {
+    return function(evt) { document.getElementById(s).setAttribute("fill", "blue"); };
+}
+
+function sw2(s) {
+    return function(evt) { document.getElementById(s).setAttribute("fill", "black"); };
+}
+
+function sw3(si, widget) {
+    return function(evt) { upnp_renders.on_select(si, widget); };
+}
+
+//
+// when a widget is pushed to here, install the widget and execute it
+//
+function onMediaConnect(url, src_ip) {
+    if (l_inf <= log_level) {
+        alert('[UI] onMediaConnect :\"' + url + '\"');
+    }
+    if (WidgetManager.probe(url)) {
+        var w = WidgetManager.open(url, src_ip);
+        if (w == null) {
+            return;
+        }
+        widget_add(w);
+        adjustWhereWidgets(false);
+        w.permanent = false;
+    }
+}
+
+//
+// file list vars
+//
+var flstart = 0,fllist = null,maxFileNames = 14;
+
+//
+// create a file menu in the main screen, allowing to navigate directories and choose widget config files
+//
+function on_widget_add_menu() {
+    state = 'list';
+    widgetContainer.setAttribute('display', 'none');
+    homepage.setAttribute('display', 'none');
+    homebar.setAttribute('display', 'none');
+    execbar.setAttribute('display', 'inline');
+    arrows.setAttribute('display', 'none');
+    arrowsW.setAttribute('display', 'none');
+    widgetAddList.setAttribute('display', 'inline');
+    maxFileNames = Math.round(((iconNbVert * 80) / 25) - 1.4);
+    isThisAScan = false;
+    refillWidgetAddList(false);
+}
+
+//
+// create a file menu in the main screen, allowing to navigate directories and choose a directory to scan for widgets
+// and load all their icons
+//
+function on_dir_scan() {
+    state = 'list';
+    widgetContainer.setAttribute('display', 'none');
+    homepage.setAttribute('display', 'none');
+    homebar.setAttribute('display', 'none');
+    execbar.setAttribute('display', 'inline');
+    arrows.setAttribute('display', 'none');
+    arrowsW.setAttribute('display', 'none');
+    widgetAddList.setAttribute('display', 'inline');
+    maxFileNames = Math.round(((iconNbVert * 80) / 25) - 1.4);
+    isThisAScan = true;
+    refillWidgetAddList(true);
+}
+
+//
+// remove all installed icons
+//
+function on_clean_up() {
+    var i;
+    //if (l_inf <= log_level) alert('[UI] unloading ' + WidgetManager.num_widgets + ' widgets');
+    for (i = WidgetManager.num_widgets - 1; i >= 0; i--) {
+        var w = WidgetManager.get(i);
+        if (w.loaded) {
+            alert("unloading " + w.name);
+            w.loaded = false;
+            WidgetManager.unload(w, false);
+        }
+    }
+    where = 0;
+    maxwhere = 0;
+    removeAllChildren(document.getElementById("icons"));
+    adjustwhere(false);
+}
+
+//
+// install, but do not launch, the widget whose config.xml has been chosen, and return to the home page
+//
+function widgetInstall(uri, manual, temporary, parent_wid) {
+    var wid, j, count = WidgetManager.num_widgets, nbWidgets = getNbWidgets();
+    for (j = 0; j < count; j++) {
+        wid = WidgetManager.get(j);
+        if (wid.url == uri) {
+            if (wid.loaded) {
+                break;
+            }
+            if (temporary) {
+                wid.permanent = false;
+            }
+            else {
+                insert_icon(wid, nbWidgets, nbWidgets);
+            }
+        }
+    }
+    if (j == count) {
+        wid = WidgetManager.open(uri, null, parent_wid);
+        if (wid != null) {
+            if (temporary) {
+                wid.permanent = false;
+            }
+            else {
+                insert_icon(wid, nbWidgets, nbWidgets);
+            }
+        }
+    }
+    if (manual) {
+        return wid;
+    }
+    state = 'home';
+    widgetContainer.setAttribute('display', 'none');
+    homepage.setAttribute('display', 'inline');
+    homebar.setAttribute('display', 'inline');
+    execbar.setAttribute('display', 'none');
+    arrows.setAttribute('display', 'inline');
+    arrowsW.setAttribute('display', 'none');
+    removeAllChildren(widgetAddList);
+    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
+    where = maxwhere;
+    adjustwhere(false);
+    return wid;
+}
+
+//
+// clean up file list space and refill it
+//
+function refillWidgetAddList(flag) {
+    removeAllChildren(widgetAddList);
+    fllist = null;
+    flstart = 0;
+    fllist = gpac.enum_directory(gpac.last_working_directory, "", false);
+    fillWidgetAddList(flag);
+}
+
+//
+// go to parent directory
+//
+function flUpDir(evt) {
+    var s = gpac.last_working_directory;
+    if (l_inf <= log_level) {
+        alert("[UI] lwd:" + gpac.last_working_directory);
+    }
+    var index = s.lastIndexOf("\\");
+    if (index != -1) {
+        gpac.last_working_directory = s.substring(0, index);
+        refillWidgetAddList(isThisAScan);
+    } else {
+        index = s.lastIndexOf("/");
+        if (index != -1) {
+            gpac.last_working_directory = s.substring(0, index);
+            refillWidgetAddList(isThisAScan);
+        } else {
+            gpac.last_working_directory = "/";
+            refillWidgetAddList(isThisAScan);
+        }
+    }
+}
+
+//
+// go to a named directory
+//
+function flGoTo(newDir) {
+    //alert("goto "+newDir);
+    var s = gpac.last_working_directory;
+    if (s == "/") {
+        gpac.last_working_directory = newDir;
+    } else {
+        var c = s.charAt(s.length - 1);
+        if (c != '\\' && c != '/') {
+            s += "/";
+        }
+        gpac.last_working_directory = s + newDir;
+    }
+    //alert(gpac.last_working_directory);
+    refillWidgetAddList(isThisAScan);
+}
+
+//
+// if the directory contains more files that can be shown, show previous page of file names
+//
+function flPrevFiles(evt) {
+    if (flstart == 0) {
+        return;
+    }
+    flstart -= maxFileNames;
+    if (flstart < 0) {
+        flstart = 0;
+    }
+    removeAllChildren(widgetAddList);
+    fillWidgetAddList(isThisAScan);
+}
+
+//
+// if the directory contains more files that can be shown, show next page of file names
+//
+function flNextFiles(evt) {
+    if (flstart + maxFileNames < fllist.length) {
+        flstart += maxFileNames;
+        removeAllChildren(widgetAddList);
+        fillWidgetAddList(isThisAScan);
+    }
+}
+
+//
+// scan the current directory recursively for widgets, clean up and return to home page
+//
+function flScanDir(evt) {
+    scan_directory(gpac.last_working_directory);
+    state = 'home';
+    var nbWidgets = getNbWidgets();
+    widgetContainer.setAttribute('display', 'none');
+    homepage.setAttribute('display', 'inline');
+    homebar.setAttribute('display', 'inline');
+    execbar.setAttribute('display', 'none');
+    arrows.setAttribute('display', 'inline');
+    arrowsW.setAttribute('display', 'none');
+    removeAllChildren(widgetAddList);
+    maxwhere = ((nbWidgets - 1) - ((nbWidgets - 1) % iconsPerPage)) / iconsPerPage;
+    where = maxwhere;
+    adjustwhere(false);
+}
+
+//
+// scanning
+//
+function scan_directory(dir) {
+    var ii, j, count, list, w, uri, loadedWidgets = 0;
+    list = gpac.enum_directory(dir, '.xml;.wgt', 0);
+    for (ii = 0; ii < list.length; ii++) {
+        uri = list[ii].path + list[ii].name;
+        if (list[ii].directory) {
+            scan_directory(uri);
+        } else {
+            count = WidgetManager.num_widgets;
+            for (j = 0; j < count; j++) {
+                var wid = WidgetManager.get(j);
+                if (wid.loaded) {
+                    loadedWidgets++;
+                }
+                if (wid.url == uri) {
+                    if (wid.loaded) {
+                        break;
+                    }
+                    insert_icon(wid, getNbWidgets(), j);
+                    break;
+                }
+            }
+            if (j == count) {
+                w = WidgetManager.open(uri, null);
+                if (w != null) {
+                    insert_icon(w, loadedWidgets, WidgetManager.num_widgets - 1);
+                }
+            }
+        }
+    }
+}
+
+//
+// create the up, prev, next button, show current directory and as many file names as possible
+// the file names are active: clicking on a directory name goes to that directory
+// clicking on a file tries to load that file as a widget
+//
+function fillWidgetAddList(flag) {
+    if (flag) {
+        widgetAddList.appendChild(use("cartoucheflag"));
+        document.getElementById("dirflag").textContent = gpac.last_working_directory;
+    } else {
+        widgetAddList.appendChild(use("cartouche"));
+        document.getElementById("dir").textContent = gpac.last_working_directory;
+    }
+    // next lines are file names
+    var obj;
+    for (i = 0; i < (fllist.length - flstart) && i < maxFileNames; i++) {
+        obj = use("fileMenuElement" + i);
+        obj.setAttribute('transform', 'translate(0,' + (25 * (i + 1)) + ')');
+        widgetAddList.appendChild(obj);
+        document.getElementById("fileMenuElement" + i + "u").setAttributeNS(xlinkns, 'href', "#" + (fllist[i + flstart].directory ? 'folder' : 'new'));
+        document.getElementById("fileMenuElement" + i + "t").textContent = fllist[i + flstart].name;
+        if (obj.listener != null) {
+            obj.removeEventListener("click", obj.listener);
+        }
+        if (fllist[i + flstart].directory) {
+            obj.listener = createGoto(escaping(fllist[i + flstart].name));
+            obj.addEventListener("click", obj.listener, false);
+        } else if (isWidgetFileName(fllist[i + flstart].name)) {
+            obj.listener = createWidgetInstall(escaping(gpac.last_working_directory + '/' + fllist[i + flstart].name));
+            obj.addEventListener("click", obj.listener, false);
+        }
+    }
+}
+
+function createGoto(s) {
+    return function () {
+        flGoTo(s);
+    };
+}
+
+function createWidgetInstall(s) {
+    return function () {
+        widgetInstall(s, false, false, null);
+    };
+}
+
+// // // // // // // // // // // // // // //
+// function library
+// // // // // // // // // // // // // // //
+
+function isWidgetFileName(s) {
+    if (endsWith(s, 'config.xml')) {
+        return true;
+    }
+    if (endsWith(s, '.wgt')) {
+        return true;
+    }
+    return false;
+}
+
+//
+// replace globally \ with / in a string
+//
+function escaping(s) {
+    s = s.replace(/\\/g, '/');
+    return s;
+}
+
+//
+// create rect
+//
+function rect(x, y, w, h, fill, stroke, id) {
+    var child = document.createElement('rect');
+    if (id != null) {
+        child.setAttribute('id', id);
+    }
+    child.setAttribute('x', x);
+    child.setAttribute('y', y);
+    child.setAttribute('width', w);
+    child.setAttribute('height', h);
+    child.setAttribute('fill', fill);
+    child.setAttribute('stroke', stroke);
+    return child;
+}
+
+//
+// create text
+//
+function createtext(content, fill, x, y, size, family) {
+    var child = document.createElement('text');
+    child.setAttribute('fill', fill);
+    child.textContent = content;
+    child.setAttribute('x', x);
+    child.setAttribute('y', y);
+    child.setAttribute('font-size', size);
+    child.setAttribute('font-family', family);
+    return child;
+}
+
+//
+// create invisible rect getting all events
+//
+function invisible_rect(w, h) {
+    var child = document.createElement('rect');
+    child.setAttribute('width', w);
+    child.setAttribute('height', h);
+    child.setAttribute('fill', 'none');
+    child.setAttribute('stroke', 'none');
+    child.setAttribute('pointer-events', 'all');
+    return child;
+}
+
+//
+// create animation
+//
+function media(etype, uri, w, h) {
+    var child = document.createElement(etype);
+    child.setAttributeNS(xlinkns, 'href', uri);
+    child.setAttribute('width', w);
+    child.setAttribute('height', h);
+    if (etype == 'animation') {
+        child.setAttributeNS('http://gpac.io/svg-extensions', 'use-as-primary', 'false');
+    }
+    return child;
+}
+
+//
+// create use
+//
+function use(uri) {
+    var child = document.createElement('use');
+    child.setAttributeNS(xlinkns, 'href', '#' + uri);
+    return child;
+}
+
+//
+// create appropriate element for media reference by the given uri
+//
+function appropriateElementForMedia(uri, w, h) {
+    if (uri.indexOf('#') != -1) {
+        return media('animation', uri, w, h);
+    }
+    if (endsWith(uri, '.svg')) {
+        return media('animation', uri, w, h);
+    }
+    if (endsWith(uri, '.bt')) {
+        return media('animation', uri, w, h);
+    }
+    if (endsWith(uri, '.png')) {
+        return media('image', uri, w, h);
+    }
+    if (endsWith(uri, '.jpg')) {
+        return media('image', uri, w, h);
+    }
+    if (endsWith(uri, '.gif')) {
+        return media('image', uri, w, h);
+    }
+    if (l_war <= log_level) {
+        alert("[UI] WARNING: bad suffix for an icon URI: " + uri);
+    }
+    return media('image', uri, w, h);
+}
+
+//
+// substitute for the useful predefined function endsWith
+//
+function endsWith(s1, s2) {
+    return s1.toLowerCase().substring(s1.length - s2.length) == s2;
+}
+
+/* wrapper as a module
+ // export the resize function as the resize member of iphone_wm_gui, as well as other functions
+ return {
+ resize: resize,
+ left_button: left_button,
+ right_button: right_button,
+ left_buttonW: left_buttonW,
+ right_buttonW: right_buttonW,
+ home_button: home_button,
+ on_dir_scan: on_dir_scan,
+ on_clean_up: on_clean_up,
+ on_widget_add_menu: on_widget_add_menu,
+ on_kill_widget: on_kill_widget,
+ on_get_widget: on_get_widget,
+ on_widget_remote: on_widget_remote,
+ flUpDir: flUpDir,
+ flPrevFiles: flPrevFiles,
+ flNextFiles: flNextFiles,
+ flScanDir: flScanDir,
+ get_widget_callback2: get_widget_callback2
+ }
+
+ }());*/
+
+function widget_activated_and_bound(wid) {
+    WidgetManager.corein_message(wid, "activate");
+}
+
+function printAllFieldsOf(obj, printableName) {
+    var details = "fields of " + printableName + ":\n";
+    for (var field in obj) {
+        fieldContents = obj[field];
+        if (typeof(fieldContents) == "function") {
+            fieldContents = "(function)";
+        }
+        details += "  " + field + ": " + fieldContents + "\n";
+    }
+    alert(details);
+}

gpac-1.0.0.tar.gz/share/gui/iphone_wm_gui.svg Changed

gpac-1.0.0.tar.gz/share/gui/mpegu-core.js Added

@@ -0,0 +1,1794 @@
+//This software module was originally developed by Telecom Paris in the
+//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+//
+//This software module is an implementation of a part of one or 
+//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+//(ISO/IEC 23007-1) free license to this software module or modifications
+//thereof for use in hardware or software products claiming conformance to
+//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+//module in hardware or software products are advised that its use may
+//infringe existing patents.
+//The original developer of this software module and his/her company, the
+//subsequent editors and their companies, and ISO/IEC have no liability 
+//for use of this software module or modifications thereof in an implementation. 
+//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming 
+//products. 
+//Telecom Paris retains full right to use the code for his/her own purpose, 
+//assign or donate the code to a third party and to inhibit third parties from 
+//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products. 
+//
+//This copyright notice must be included in all copies or derivative works.
+//
+//Copyright (c) 2009.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//					Jean Le Feuvre, Telecom Paris
+//					Jean-Claude Dufourd, Telecom Paris
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+// 01122011 AMD1 startWidget listWidgets getWidget implemented
+
+/*
+ The widget manager in MPEG-U reference software is implemented in 2 parts:
+ - a native GPAC module called gm_widgetman implementing
+   * W3C widget loading (download, unzip, manifest parsing)
+   * W3C Widget APIs
+   * MPEG Widgets interfaces, messages and parameters listing
+
+ - a script module (this file) implementing
+  * MPEG Widget interface binding with UPnP services (UPnP is implemented in another module)
+  * MPEG Widget interface binding with other local widgets
+  * MPEG Widget discovery through UPnP devices announcement. The discovery is done by setting the device presentationURL to the widget URL
+
+
+ A typical user of the widget manager will therefore see the following interfaces:
+
+interface WidgetManager {
+ readonly unsigned integer num_widgets;
+ string last_widget_dir;
+
+ Widget open(string url, string source_ip);
+ void bind(Widget wid);
+ Widget get(unsigned int idx);
+ void unload(Widget wid);
+ void migrate_widget(upnp_renderer, widget);
+ void corein_message(widget, msg_name, arg1name, arg1val, ....);
+ 
+ //callback functions for the GUI to be notifed of widgets added / removed when UPnP devices are appearing/disappearing
+ void on_widget_add(widget);
+ void on_widget_remove(widget);
+
+ //callback functions for core:out
+ void coreOutSetSize(wid, args);
+ void coreOutShow(wid, args);
+ void coreOutHide(wid, args);
+ void coreOutRequestActivate(wid, args);
+ void coreOutRequestDeactivate(wid, args);
+ void coreOutShowNotification(wid, args);
+ void coreOutPlaceComponent(wid, args);
+ void coreOutGetAttention(wid, args);
+
+ }
+
+
+interface Widget {
+ //exported meta-data from MPEG-U Manifest
+ readonly string mainEncoding;
+ readonly string mainMimeType;
+ readonly integer defaultWidth;
+ readonly integer defaultHeight;
+ 
+ readonly Array icons;
+ readonly Array features;
+ readonly Array preferences;
+
+
+ readonly string identifier;
+ readonly string name;
+ readonly string shortName;
+ readonly string authorName;
+ readonly string authorEmail;
+ readonly string authorHref;
+ readonly string description;
+ readonly string viewmodes;
+ readonly string licence;
+ readonly string licenceHref;
+ readonly string version;
+ readonly string uuid;
+ readonly boolean discardable;
+ readonly boolean multipleInstances;
+
+ //widget-manager specific data
+ readonly string manifest;
+ readonly string main;
+ readonly string localizedSrc;
+ readonly Array components; //array of widget objects used as component
+ boolean permanent;
+ readonly boolean is_component;
+ readonly Widget parent;
+ readonly boolean activated;
+ readonly string section;
+ readonly integer num_section;
+ readonly integer num_interfaces;
+ readonly integer num_bound_interfaces;
+ readonly integer num_components;
+ 
+
+ device = local UPnP device created in order to publish interfaces of this widget as upnp services
+ originating_device = the device who sent the widget, either through migration or device discovery (presentationURL)
+ originating_device_ip = the IP of the device who sent the widget
+
+
+
+ void activate(Element node_with_ref_to_main);
+ void deactivate();
+ }
+
+interface Icon {
+ readonly string src;
+ readonly string relocated_src;
+ readonly integer width;
+ readonly integer height;
+}
+
+interface Preference {
+ readonly string name;
+ readonly string value;
+ readonly boolean readonly;
+}
+
+interface Features {
+ readonly string name;
+ readonly boolean required;
+ readonly Array params
+}
+
+interface FeatureParam {
+ readonly string name;
+ readonly string value;
+}
+ */
+
+/*log function*/
+function log(lev, str) {
+    if (lev <= log_level) alert('[WM] ' + str);
+}
+
+/*log levels*/
+l_err = 0;
+l_war = 1;
+l_inf = 2;
+l_deb = 3;
+
+/*default log level*/
+log_level = l_deb;
+
+whiteSpaceRegExp = new RegExp(' ', 'g');
+
+/*initializes the widget manager*/
+function widget_manager_init() {
+    log(l_inf, 'Initializing MPEG-U Widgets');
+    /*if UPnP is enabled, override the deviceAdd callback*/
+    WidgetManager.upnp = false;
+    WidgetManager.migrate_widget = wmjs_migrate_widget;
+    WidgetManager.probe = wmjs_probe_widget;
+    WidgetManager.open = wmjs_open_widget;
+    WidgetManager.bind = wmjs_bind_widget;
+
+    WidgetManager.on_widget_add = wmjs_on_widget_add;
+    WidgetManager.on_widget_remove = wmjs_on_widget_remove;
+
+    WidgetManager.check_bindings = wmjs_bind_widgets;
+    WidgetManager.unbind_widget = wmjs_unbind_widget;
+    WidgetManager.corein_message = wmjs_corein_message;
+
+    WidgetManager.get_mpegu_service_providers = wmjs_get_mpegu_service_providers;
+    WidgetManager.initialize();
+
+    if (typeof(UPnP) != 'undefined') {
+        WidgetManager.upnp = true;
+        log(l_inf, 'Enabling Widget UPnP Discovery')
+        UPnP.onDeviceAdd = wmjs_on_device_add;
+        log(l_inf, 'Creating the standard MPEG-U Service')
+        wmjs_create_standard_service();
+    }
+    log(l_inf, 'MPEG-U Widgets successfully initialized');
+    initCore();
+}
+
+function wmjs_on_widget_add(widget) {}
+
+function wmjs_on_widget_remove(widget) {}
+
+function wmjs_probe_widget(url) {
+    if ((url.lastIndexOf('.wgt') >= 0) || (url.lastIndexOf('.mgt') >= 0) || (url.lastIndexOf('.xml') >= 0)) return 1;
+    return 0;
+}
+
+function wmjs_bind_output_trigger(widget, msg, callback, udta)
+{
+  var res = widget.bind_output_trigger(msg, callback, udta);
+  if (!res) {
+   log(l_err, 'Cannot bind output trigger of message '+msg.name+' in widget '+widget.name);
+  }
+}
+
+function wmjs_open_widget(url, src_ip, parent_widget) {
+    log(l_deb, "wmjs_open_widget");
+    var wid;
+    if (arguments.length>=3) {
+      wid = WidgetManager.load(url, parent_widget);
+    } else {
+      wid = WidgetManager.load(url);
+    }
+    if (wid == null) {
+        log(l_err, 'File ' + url + ' is not a valid widget');
+        return null;
+    }
+    wid.device = null;
+    wid.originating_device = null;
+    wid.originating_device_ip = null;
+    if (src_ip) {
+        wid.permanent = false;
+        wid.originating_device_ip = src_ip;
+        log(l_inf, 'Widget received - ip ' + wid.originating_device_ip);
+    } else {
+        wid.permanent = true;
+        wid.originating_device_ip = null;
+    }
+    return wid;
+}
+
+/*performs an unbind check on all widgets*/
+function wmjs_unbind_widget(widget) {
+    var i, count, wid, ifce_count, j;
+    log(l_inf, 'wmjs_unbind_widget ' + widget.name);
+
+    if (WidgetManager.upnp && widget.device) {
+        UPnP.DeleteDevice(widget.device);
+        widget.device = null;
+    }
+
+    count = WidgetManager.num_widgets;
+    ifce_count = widget.num_interfaces;
+    for (i = 0; i < count; i++) {
+        wid = WidgetManager.get(i);
+        if (!wid) continue;
+        if (wid == widget) continue;
+        if (!wid.activated) continue;
+
+        for (j = 0; j < ifce_count; j++) {
+            var an_ifce = widget.get_interface(j);
+            wid.unbind_interface(an_ifce, widget);
+        }
+    }
+    wmjs_bind_widgets();
+}
+
+
+/*performs a bind check on all widgets*/
+function wmjs_bind_widgets() {
+    log(l_deb, 'wmjs_bind_widgets');
+    var i, wid, count;
+    count = WidgetManager.num_widgets;
+    for (i = 0; i < count; i++) {
+        wid = WidgetManager.get(i);
+        if (!wid) continue;
+        if (!wid.activated) continue;
+        WidgetManager.bind(wid);
+    }
+}
+
+
+/*performs a bind on the given widget*/
+function wmjs_bind_widget(wid) {
+    var i, j, ifce_count, device, service, msg, do_bind;
+
+    if (!wid.activated) {
+        log(l_inf, 'widget not activated - cannot bind');
+        return;
+    }
+    ifce_count = wid.num_interfaces;
+
+    log(l_inf, 'Binding widget ' + wid.name + ' - Nb Interfaces ' + ifce_count);
+
+    /*browse all interfaces and locate services*/
+    for (i = 0; i < ifce_count; i++) {
+        var ifce = wid.get_interface(i);
+        log(l_inf, 'Binding interface ' + ifce.type);
+
+        /*look for a core:* service for this interface and setup*/
+        if (wmjs_bind_interface_to_core_service(wid, ifce)) {
+            continue;
+        }
+        /*if our widget is already bound to this widget, skip it*/
+        if (!ifce.multipleBinding && wid.is_interface_bound(ifce)) {
+            log(l_deb, 'Widget ' + wid.name + ' interface ' + ifce.type + ' already bound');
+            continue;
+        }
+        /*if the widget is the provider of the service, create the service*/
+        if (ifce.serviceProvider) {
+            log(l_inf, 'widget is a service provider');
+            if (WidgetManager.upnp) wmjs_create_upnp_service(wid, ifce);
+            continue;
+        }
+        /*look for a UPnP service for this interface and setup*/
+        if (WidgetManager.upnp && wmjs_bind_interface_to_upnp(wid, ifce)) {
+            continue;
+        }
+        /*look for a local service for this interface*/
+        if (wmjs_bind_interface_to_local(wid, ifce)) {
+            continue;
+        }
+        /*no service found*/
+        log(l_inf, 'Cannot find service for widget ' + wid.name + ' interface ' + ifce.type);
+    }
+}
+
+/*called when a new UPnP device has been added or removed in the network*/
+function wmjs_on_device_add(device, is_add) {
+    log(l_deb, 'wmjs_on_device_add');
+    if (!is_add) {
+        //TODO JCD: this is wrong, sometimes a device is not "is_add" but is not to be removed either
+        /*log(l_inf, 'Device Removed ' + device.Name);
+        wmjs_standard_service_remove(device);
+        wmjs_unbind_upnp_device(device);
+        if (device.widget != null) {
+            log(l_inf, 'Widget Removed ' + device.widget.name);
+            WidgetManager.on_widget_remove(device.widget);
+            device.widget.originating_device = null;
+            device.widget = null;
+        }
+        WidgetManager.check_bindings();*/
+        return;
+    }
+    log(l_inf, 'Device Added ' + device.Name + ' URL ' + device.PresentationURL);
+    wmjs_standard_service_add(device);
+    WidgetManager.check_bindings();
+    /*look for a presentation url - if not given or not identifying a widget, don't do anything*/
+    var url = device.PresentationURL;
+    if (!url || (url == '')) return;
+    if (! WidgetManager.probe(url)) return;
+    /*OK load the widget*/
+    var widget = WidgetManager.load(url);
+    widget.newBorn = true;
+    if (widget == null) {
+        log(l_err, 'File ' + url + ' is not a valid widget');
+        return;
+    }
+    widget.originating_device = device;
+    device.widget = widget;
+    /*indicate our widget is not to be stored*/
+    widget.permanent = false;
+    WidgetManager.on_widget_add(widget);
+}
+
+
+/*
+ LOCAL INTERFACE BINDING ROUTINES
+
+ In this implementation, widgets-to-widget communication in the same widget manager are called "local" communications.
+ The implementation do not rely on any service description for that and directly matches the widgets interfaces
+ */
+
+function wmjs_output_trigger_callback_local(msg_out, wid_src, msg_in, wid_dst) {
+    log(l_deb, "wmjs_output_trigger_callback_local");
+    return function(value) {
+        log(l_deb, "wmjs_output_trigger_callback_local/function " + value + " '" + wid_src.name + "'" + wid_dst.name + "'");
+        var param_count = msg_out.num_params;
+        var args = new Array();
+        var is_script = 0;
+        var ai = 0, i;
+        if (msg_in.has_script_input) is_script = 1;
+        log(l_inf, 'Invoking Widget(' + wid_src.name + ').' + msg_out.name);
+        for (i = 0; i < param_count; i++) {
+            var param = msg_out.get_param(i);
+            if (param.is_input) continue;
+
+            if (is_script) {
+                args[ai] = wid_src.get_param_value(param);
+                ai++;
+            } else {
+                wid_dst.set_input(msg_in.get_param(param.name), wid_src.get_param_value(param));
+            }
+        }
+        log(l_inf, 'Calling Widget(' + wid_dst.name + ').' + msg_in.name);
+
+        if (msg_in.has_input_action) {
+            wid_dst.call_input_action(msg_in);
+        } else if (is_script) {
+            wid_dst.call_input_script(msg_in, args);
+        }
+    };
+}
+
+
+function wmjs_interface_invoke_callback_local(wid_dst, ifce_dst, is_reply) {
+    log(l_deb, "wmjs_interface_invoke_callback_local '" + wid_dst.name + "' '" + ifce_dst.type + "' - reply " + is_reply);
+    return function() {
+        log(l_deb, "wmjs_interface_invoke_callback_local/function '" + wid_dst.name + "' '" + ifce_dst.type + "' - reply " + is_reply);
+        var j, i, ai, param_count, msgHandler, msg_src, msg_dst, is_script;
+        var args = new Array();
+        is_script = 0;
+        msgHandler = arguments[0];
+        /*get msg from source interface (this object)*/
+        msg_src = this.get_message(msgHandler.msgName);
+        // JCD: take into account message repetition, if any
+        for (j = 0; j < ifce_dst.num_messages; j++) {
+            msg_dst = ifce_dst.get_message(j);
+            if (msg_dst.name == msgHandler.msgName) {
+                log(l_deb, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on ' + wid_dst.name + '.' + msg_dst.name);
+                if (msg_dst.has_script_input) is_script = 1;
+                param_count = msg_src.num_params;
+                ai = 1;
+                for (i = 0; i < param_count; i++) {
+                    var param = msg_dst.get_param(i);
+                    if (! param.is_input) continue;
+                    if (is_script) {
+                        args[ai - 1] = arguments[ai];
+                    } else {
+                        wid_dst.set_input(param, arguments[ai]);
+                    }
+                    ai++;
+                }
+                if (msg_dst.has_input_action) {
+                    wid_dst.call_input_action(msg_dst);
+                } else if (is_script) {
+                    wid_dst.call_input_script(msg_dst, args);
+                }
+            }
+        }
+    };
+}
+
+/*
+ END OF LOCAL INTERFACE BINDING ROUTINES
+ */
+
+
+function wmjs_bind_interface_to_local(wid, ifce) {
+    log(l_deb, "wmjs_bind_interface_to_local '" + wid.name + "' " + ifce.type);
+    var i, count, count2, j, a_ifce, a_msg, par, a_par, k, nb_ok, ret, set_bind, a_wid;
+    count = WidgetManager.num_widgets;
+    ret = false;
+    // this is the main loop to try to bind a widget to any other
+    for (i = 0; i < count; i++) {
+        a_wid = WidgetManager.get(i);
+        if (!a_wid) continue;
+        if (a_wid == wid) continue;
+        if (!a_wid.activated) continue;
+        count2 = a_wid.num_interfaces;
+        // now that we know this is a valid widget and not the same as wid
+        // loop on all its interfaces to find one of the right type
+        for (j = 0; j < count2; j++) {
+            a_ifce = a_wid.get_interface(j);
+            if (a_ifce.type == ifce.type) break;
+        }
+        if (j == count2) continue;
+
+        /*if our widget is already bound to this widget (multiple binding==true) or to any widget (multiple binding==false), skip it*/
+        if (wid.is_interface_bound(ifce, ifce.multipleBinding ? a_wid : null)) {
+            log(l_inf, 'Widget ' + wid.name + ' interface ' + ifce.type + ' is already bound');
+            continue;
+        }
+        /*if our widget is already bound to this widget (multiple binding==true) or to any widget (multiple binding==false), skip it*/
+        if (a_wid.is_interface_bound(a_ifce, a_ifce.multipleBinding ? wid : null)) {
+            log(l_inf, 'Widget ' + a_wid.name + ' interface ' + a_ifce.type + ' is already bound');
+            continue;
+        }
+
+        set_bind = 0;
+        // we have found an interface of the right type in the other widget
+        log(l_inf, 'Checking local widget ' + a_wid.name + ' for interface ' + ifce.type);
+        // loop on the messages to check if they match
+        for (j = 0; j < ifce.num_messages; j++) {
+            var msg = ifce.get_message(j), l;
+            //if (msg.is_input) continue;  // JCD: remove test
+            // does the other interface have this message
+            // JCD: remove next line and take repetition of messages into account
+            // a_msg = a_ifce.get_message(msg.name);
+            for (l = 0; l < a_ifce.num_messages; l++) {
+                a_msg = a_ifce.get_message(l);
+                //alert(msg.name+" "+a_msg.name);
+                if (a_msg.name == msg.name) {
+                    // the messages have matching names, check direction
+                    if (msg.is_input == a_msg.is_input) {
+                        log(l_inf, 'Local widget message for ' + msg.name + ' is not in direction ' + (msg.is_input ? 'output' : 'input'));
+                        continue;
+                    }
+                    // the messages have matching names and directions, check params
+                    if (msg.num_params != a_msg.num_params) {
+                        log(l_war, 'Local widget message ' + msg.name + ' does not have the same number of parameters');
+                        continue;
+                    }
+                    /*check all params*/
+                    nb_ok = 0;
+                    for (k = 0; k < msg.num_params; k++) {
+                        par = msg.get_param(k);
+                        a_par = a_msg.get_param(par.name);
+                        if (a_par != null && par.is_input != a_par.is_input) nb_ok ++;
+                    }
+                    if (nb_ok != msg.num_params) {
+                        log(l_war, 'Local widget message ' + msg.name + ' does not have the same input/output parameters');
+                        continue;
+                    }
+                    set_bind ++;
+                    // the messages match
+                    log(l_inf, 'Binding ' + wid.name + '.' + msg.name + ' to ' + a_wid.name + '.' + a_msg.name);
+                    /*OK let's bind this action: we only need to assign the output trigger, the input action will be called from the other widget*/
+                    if (msg.has_output_trigger) {
+                        wmjs_bind_output_trigger(wid, msg, wmjs_output_trigger_callback_local(msg, wid, a_msg, a_wid), a_wid);
+                    }
+                    /*OK let's bind this action: we only need to assign the output trigger, the input action will be called from the other widget*/
+                    if (a_msg.has_output_trigger) {
+                        wmjs_bind_output_trigger(a_wid, a_msg, wmjs_output_trigger_callback_local(a_msg, a_wid, msg, wid), wid);
+                    }
+                }
+            }
+        }
+        if (!set_bind) continue;
+
+        /*create callback for programmatic action triggers*/
+        ifce.invoke = wmjs_interface_invoke_callback_local(a_wid, a_ifce, 0);
+        ifce.invokeReply = wmjs_interface_invoke_callback_local(a_wid, a_ifce, 1);
+        /*create callback for programmatic action triggers*/
+        a_ifce.invoke = wmjs_interface_invoke_callback_local(wid, ifce, 0);
+        a_ifce.invokeReply = wmjs_interface_invoke_callback_local(wid, ifce, 1);
+        a_wid.bind_interface(a_ifce, wid, 'localhost');
+        wid.bind_interface(ifce, a_wid, 'localhost');
+        ret = true;
+    }
+    return ret;
+}
+
+
+/*
+ INTERFACE BINDING TO UPNP SERVICES ROUTINES
+
+ This implemntation supports binding interfaces to existing UPnP services
+ */
+
+/*create a listener function for input parameters*/
+function wmjs_upnp_action_listener(widget, par, msg) {
+    log(l_deb, "wmjs_upnp_action_listener '" + widget.name + "' " + (par != null ? par.name : 'noPar') + " " + (msg != null ? msg.name : 'noMsg'));
+    return function(value) {
+        log(l_deb, "wmjs_upnp_action_listener/function '" + widget.name + "' " + (par != null ? par.name : 'noPar') + " " +
+                   (msg != null ? msg.name : 'noMsg') + " " + value);
+        if (par != null) widget.set_input(par, value);
+        if (msg != null) widget.call_input_action(msg);
+    }
+}
+
+/*create a listener function for input parameters*/
+function wmjs_upnp_action_listener_script(widget, msg) {
+    log(l_deb, 'wmjs_upnp_action_listener_script');
+    return function() {
+        var i, count, act, par, rval, msgHandler, args;
+        act = arguments[0];
+        log(l_deb, 'wmjs_upnp_action_listener_script/function:nb args ' + arguments.length);
+        msgHandler = arguments[1];
+        log(l_deb, 'wmjs_upnp_action_listener_script/function:msgh ' + msgHandler);
+        args = new Array();
+        count = msg.num_params;
+        for (i = 0; i < count; i++) {
+            par = msg.get_param(i);
+            if (!par.is_input) continue;
+            rval = act.GetArgumentValue(par.name);
+            if (par.script_type == 'number') {
+                args.push(parseInt(rval));
+            } else if (par.script_type == 'boolean') {
+                args.push(rval == 'true');
+            } else {
+                args.push(rval);
+            }
+        }
+        msgHandler.onInvokeReply(args);
+    }
+}
+
+
+/**/
+function wmjs_output_trigger_callback_upnp(service, widget, msg) {
+    log(l_deb, 'wmjs_output_trigger_callback_upnp');
+    return function(value) {
+        log(l_deb, 'wmjs_output_trigger_callback_upnp/function ' + value);
+        var i, pi, param_count = msg.num_params;
+        var args = new Array();
+        pi = 0;
+        for (i = 0; i < param_count; i++) {
+            var param = msg.get_param(i);
+            if (param.is_input) continue;
+            args[pi] = param.name;
+            args[pi + 1] = widget.get_param_value(param);
+            pi += 2;
+        }
+        log(l_inf, 'Calling UPnP Action ' + msg.name + " " + param_count);
+        service.CallAction(msg.name, args);
+    };
+}
+
+
+/*create the action callback*/
+function wmjs_message_setup_upnp(widget, service, msg) {
+    log(l_deb, 'wmjs_message_setup_upnp ' + msg.name);
+    /*first let's browse all the message params*/
+    var rad, i, param_count, has_script_input;
+    has_script_input = false;
+    param_count = msg.num_params;
+    for (i = 0; i < param_count; i++) {
+        var param = msg.get_param(i);
+        /*interface not valid for this service*/
+        if (!service.HasAction(msg.name, param.name)) {
+            if (!param.is_input) {
+                log(l_war, 'Output param ' + param.name + ' not found in action - cannot bind action');
+                return false;
+            }
+            continue;
+        }
+        /*this is a service -> widget param */
+        if (param.is_input) {
+            if (msg.has_input_action) {
+                service.SetActionListener(msg.name, wmjs_upnp_action_listener(widget, param, null), param.name);
+            } else {
+                has_script_input = true;
+                // todo: pas vrai d'apres JCD
+            }
+        }
+        /*this is a widget -> service param , used in callback function*/
+    }
+    /*assign the output trigger*/
+    if (msg.has_output_trigger) {
+        var fun_name = 'call_' + msg.name;
+        widget[fun_name] = wmjs_output_trigger_callback_upnp(service, widget, msg);
+        wmjs_bind_output_trigger(widget, msg, widget[fun_name], service);
+    }
+    /*assign the input action*/
+    if (msg.has_input_action) {
+        service.SetActionListener(msg.name, wmjs_upnp_action_listener(widget, null, msg));
+    } else if (has_script_input) {
+        service.SetActionListener(msg.name, wmjs_upnp_action_listener_script(widget, msg), true);
+    }
+    return true;
+}
+
+
+function wmjs_interface_invoke_callback_upnp(service) {
+    log(l_deb, 'wmjs_interface_invoke_callback_upnp');
+    return function() {
+        log(l_deb, 'wmjs_interface_invoke_callback_upnp/function');
+        var args = new Array();
+        var i, pi, ai, param_count, msg, ifce_msg;
+
+        msg = arguments[0];
+        ifce_msg = this.get_message(msg.msgName);
+        param_count = ifce_msg.num_params;
+        log(l_inf, 'UPnP invoke action ' + ifce_msg.name + ' - ' + msg.msgName);
+
+        pi = 0;
+        ai = 1;
+        for (i = 0; i < param_count; i++) {
+            var param = ifce_msg.get_param(i);
+            if (param.is_input) continue;
+
+            args[pi] = param.name;
+            args[pi + 1] = arguments[ai];
+            pi += 2;
+            ai++;
+        }
+        service.CallAction(msg.msgName, args, msg);
+    };
+}
+
+
+function wmjs_bind_interface_to_upnp(wid, ifce) {
+    log(l_deb, "wmjs_bind_interface_to_upnp");
+    var do_bind, is_upnp = false;
+    var service = null;
+
+    if (wid.originating_device) {
+        service = wid.originating_device.FindService(ifce.type);
+    } else if (wid.originating_device_ip) {
+        service = UPnP.FindService(wid.originating_device_ip, ifce.type);
+    } else {
+        var j, dev_count = UPnP.DevicesCount;
+        log(l_deb, 'wmjs_bind_interface_to_upnp nb ' + dev_count);
+        for (j = 0; j < dev_count; j++) {
+            device = UPnP.GetDevice(j);
+            log(l_deb, "wmjs_bind_interface_to_upnp " + device.Name + ' - type: ' + ifce.type);
+            /*do we have a UPnP service with the same interface type ?*/
+            service = device.FindService(ifce.type);
+
+            /*our widget is not bound to this service*/
+            if (service) {
+                if (!wid.is_interface_bound(ifce, service)) break;
+                service = null;
+                is_upnp = true;
+            }
+        }
+    }
+    if (!service) return is_upnp;
+
+    /*our widget is already bound to this service*/
+    if (wid.is_interface_bound(ifce, service)) {
+        log(l_inf, 'Found UPnP Service for interface ' + ifce.type);
+        return true;
+    }
+
+    log(l_inf, 'Found UPnP Service for interface ' + ifce.type);
+    do_bind = 0;
+    for (j = 0; j < ifce.num_messages; j++) {
+        var msg = ifce.get_message(j);
+        /*if we have a state variable in the service with the same name as the pin, bind it*/
+        if (service.HasStateVariable(msg.name)) {
+            var param = msg.get_param(0);
+            if (param && (param.name == msg.name)) {
+                /*set listeners for declarative action triggers*/
+                log(l_deb, 'Found UPnP state variable for message ' + msg.name);
+                service.SetStateVariableListener(wmjs_upnp_action_listener(wid, param, msg), param.name);
+                do_bind = 1;
+            }
+        }
+        /*if we have an action in the service with the same name as the pin, bind it*/
+        else if (service.HasAction(msg.name)) {
+            /*set listeners for declarative action triggers*/
+            log(l_deb, 'Found UPnP action for message ' + msg.name);
+            wmjs_message_setup_upnp(wid, service, msg);
+            do_bind = 1;
+        }
+        /*NOTE: UPnP actions are only messageOut, messageIn are UPnP events and don't have output paramaters. We therefore never need to setup
+         the invokeReply callback for interfaces matching UPnP services. !! This is not true for UPnP services created to publish an interface, eg serviceProvider="true".*/
+    }
+    if (do_bind) {
+        /*create callback for programmatic action triggers*/
+        log(l_inf, 'Binding widget ' + wid.name + ' interface ' + ifce.type + ' to host ' + service.Hostname);
+        ifce.invoke = wmjs_interface_invoke_callback_upnp(service);
+        /*bind interface*/
+        wid.bind_interface(ifce, service, service.Hostname);
+    }
+    return true;
+}
+
+function wmjs_unbind_upnp_device(device)
+{
+    var i, count, j, ifce_count;
+    count = WidgetManager.num_widgets;
+
+    for (i = 0; i < count; i++) {
+        wid = WidgetManager.get(i);
+        if (!wid) continue;
+        if (!wid.activated) continue;
+
+        ifce_count = wid.num_interfaces;
+        for (j = 0; j < ifce_count; j++) {
+            var ifce = wid.get_interface(j);
+            /*do we have a UPnP service with the same interface type ?*/
+            var service = device.FindService(ifce.type);
+            if (!service) continue;
+
+            /*unbind this interface*/
+            if (wid.is_interface_bound(ifce, service)) {
+                wid.unbind_interface(ifce, service);
+            }
+        }
+    }
+}
+
+/*
+ END OF INTERFACE BINDING TO UPNP SERVICES ROUTINES
+ */
+
+//
+// section on widget migration
+//
+
+header = '<scpd xmlns="urn:schemas-upnp-org:service-1-0"><specVersion><major>1</major><minor>0</minor></specVersion><actionList>';
+middler = '</actionList><serviceStateTable>';
+footer = '</serviceStateTable></scpd>';
+standard_service_scpd = header+'<action><name>startWidget</name><argumentList><argument><name>widgetUrl</name><direction>in</direction><relatedStateVariable>s1</relatedStateVariable></argument><argument><name>widgetUUID</name><direction>in</direction><relatedStateVariable>s2</relatedStateVariable></argument><argument><name>widgetContext</name><direction>in</direction><relatedStateVariable>s3</relatedStateVariable></argument><argument><name>errorCode</name><direction>out</direction><relatedStateVariable>s4</relatedStateVariable></argument></argumentList></action>';
+{
+    standard_service_scpd += '<action><name>requestCapabilitiesList</name><argumentList><argument><name>capabilitiesType</name><direction>out</direction><relatedStateVariable>s5</relatedStateVariable></argument><argument><name>capabilities</name><direction>out</direction><relatedStateVariable>s6</relatedStateVariable></argument></argumentList></action>';
+    standard_service_scpd += '<action><name>listWidgets</name><argumentList><argument><name>widgetCodes</name><direction>out</direction><relatedStateVariable>s7</relatedStateVariable></argument><argument><name>widgetNames</name><direction>out</direction><relatedStateVariable>s8</relatedStateVariable></argument><argument><name>widgetIdentifiers</name><direction>out</direction><relatedStateVariable>s9</relatedStateVariable></argument></argumentList></action>';
+    standard_service_scpd += '<action><name>getWidget</name><argumentList><argument><name>widgetCode</name><direction>in</direction><relatedStateVariable>s10</relatedStateVariable></argument><argument><name>errorCode</name><direction>out</direction><relatedStateVariable>s11</relatedStateVariable></argument>';
+    standard_service_scpd += '<argument><name>widgetUrl</name><direction>out</direction><relatedStateVariable>s41</relatedStateVariable></argument><argument><name>widgetUUID</name><direction>out</direction><relatedStateVariable>s42</relatedStateVariable></argument><argument><name>widgetContext</name><direction>out</direction><relatedStateVariable>s43</relatedStateVariable></argument></argumentList></action>';
+    standard_service_scpd += middler+'<stateVariable><name>s1</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s2</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s3</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s4</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s5</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s6</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s7</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s8</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s9</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s10</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s11</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s41</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s42</name><dataType>string</dataType></stateVariable>';
+    standard_service_scpd += '<stateVariable><name>s43</name><dataType>string</dataType></stateVariable>'+footer;
+}
+
+//
+// migrate a widget by calling the appropriate startWidget message of the target
+// migration service
+//
+function wmjs_migrate_widget(render, widget) {
+    if (WidgetManager.upnp) {
+        var url, ctx, uri;
+
+        url = widget.url;
+        /*share the widget*/
+        uri = UPnP.ShareResource(url, render.HostName);
+
+        ctx = widget.get_context();
+
+        if (ctx == null) ctx = "";
+        log(l_inf, 'Migrating widget ' + url + ' to renderer ' + render.Name + ' as resource ' + uri);
+        log(l_inf, 'Migration Context ' + ctx);
+
+        // envoyer la methode startWidget sur render
+        var args = new Array();
+        args.push("widgetUrl");
+        args.push(uri);
+        args.push("widgetUUID");
+        args.push(null);
+        args.push("widgetContext");
+        args.push(ctx);
+        log(l_inf, "startWidget "+uri);
+        log(l_inf, "startWidgetCtx "+ctx);
+        alert("call StdServ "+render.Name+" "+render.standardService);
+        var code = render.standardService.CallAction("startWidget", args);
+        log(l_inf, "return code from standardService.CallAction is "+code);
+    }
+}
+
+//
+// check whether the removed device was a publisher of MPEGUStandardService
+// if yes, remove it from the list
+//
+function wmjs_standard_service_remove(device) {
+    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
+    if (service != null) {
+        var i = WidgetManager.MPEGUStandardServiceProviders.indexOf(device);
+        if (i >= 0) {
+            log(l_err, "migration service remove "+device.Name);
+            WidgetManager.MPEGUStandardServiceProviders.splice(i, 1);
+        } else log(l_err, "Trying to remove a standard service device which was not added first: "+device);
+    }
+}
+
+//
+// add a migration service provider to the list and remember the service in the device
+//
+function wmjs_standard_service_add(device) {
+    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
+    if (service != null) {
+        log(l_err, "migration service add "+device.Name);
+        WidgetManager.MPEGUStandardServiceProviders.push(device);
+        device.standardService = service;
+        alert("add StdServ "+device.Name+" "+device.standardService);
+    }
+}
+
+//
+// get the nth standard service provider (migration service)
+//
+function wmjs_get_mpegu_service_providers(index) {
+    if (!WidgetManager.MPEGUStandardServiceProviders) {
+        log(l_err, "uninitialized MPEGUStandardServiceProviders");
+        return null;
+    }
+    if (index < 0 || index > WidgetManager.MPEGUStandardServiceProviders.length) {
+        log(l_err, "index of MPEGUStandardServiceProviders out of bounds:"+index);
+        return null;
+    }
+    return WidgetManager.MPEGUStandardServiceProviders[index];
+}
+
+function wmjs_create_standard_service() {
+    //alert("create_standard_service");
+    var name = "MPEG-U";
+    var option = gpac.get_option('General', 'DeviceName');
+    if (option) name = option;
+    WidgetManager.device = UPnP.CreateDevice("urn:mpeg-u:device:widget-manager:1", name+"@"+gpac.hostname);
+    WidgetManager.device.enabled = 1;
+    /* implement the response to a external call (messageOut of another widget) */
+    WidgetManager.device.OnAction = wmjs_widget_standard_service_process_action;
+    log(l_err, 'wmjs_create_standard_service');
+    //log(l_inf, 'Service scpd ' + standard_service_scpd);
+    /* WidgetManager.standardService = */
+    var service = WidgetManager.device.SetupService("MPEG-U_Standard_Service", "urn:mpeg-u:service:widget-manager:1",
+            "urn:mpeg-u:serviceId:widget-manager:1.001", standard_service_scpd);
+    WidgetManager.device.Start();
+    WidgetManager.MPEGUStandardServiceProviders = new Array();
+    //alert("create_standard_service end");
+}
+
+/* generic processing of any action from outside for the standard MPEG-U service */
+function wmjs_widget_standard_service_process_action(action) {
+    log(l_err, 'wmjs_widget_standard_service_process_action Action ' + action.Name);
+    /* find the message matching the action in the interface */
+    if (action.Name == "startWidget") {
+        process_startWidget_action(action);
+    } else if (action.Name == "requestCapabilitiesList"){
+        process_requestCapabilitiesList_action(action);
+    } else if (action.Name == "listWidgets") {
+        process_listWidgets_action(action);
+    } else if (action.Name == "getWidget") {
+        process_getWidget_action(action);
+    } else {
+        log(l_inf, 'wmjs_widget_standard_service_process_action Action not found: ' + action.Name);
+    }
+}
+
+//
+// processing of a request to start a widget (push migration or predefined "activateWidgetByUrl")
+//
+function process_startWidget_action(action) {
+    log(l_err,"process start widget");
+    // get action arguments
+    var widgetUrl = action.GetArgument("widgetUrl");
+    var widgetUUID = action.GetArgument("widgetUUID");
+    var widgetContext = action.GetArgument("widgetContext");
+    log(l_err,"start:"+widgetUrl+" "+widgetUUID+" "+widgetContext);
+    // get widget
+    if (widgetUrl == null && widgetUUID != null) {
+        log(l_err, "unable to load a widget by UUID: unimplemented");
+        action.SendReply(["errorCode", 1]);
+        return;
+    }
+    var wid = WidgetManager.load(widgetUrl, null, widgetContext);
+    WidgetManager.on_widget_add(wid);
+    action.SendReply(["errorCode", 0]);
+}
+
+//
+// processing of a request for the list of capabilities
+//
+function process_requestCapabilitiesList_action(action) {
+    //TODO
+    alert("UNIMPLEMENTED in mpegu-core.js: request capabilities list");
+}
+
+//
+// processing of a request for the list of widgets (prelude to a pull migration)
+//
+function process_listWidgets_action(action) {
+    log(l_err,"process list widgets");
+    // list widget
+    var count = WidgetManager.num_widgets, i, r1 = "", r2 = "", includeSpace = false;
+    for (i = 0; i < count; i++) {
+        var wid = WidgetManager.get(i);
+        if (wid.activated) {
+            if (includeSpace) {
+                r1 += " ";
+            } else {
+                includeSpace = true;
+            }
+            r1 += i+1;
+            r2 += wid.name.replace(whiteSpaceRegExp, '_')+" ";
+        }
+    }
+    alert("sendReply widgetCodes=|"+r1+"| widgetNames=|"+r2+"|");
+    action.SendReply(["widgetCodes", r1, "widgetNames", r2]);
+}
+
+//
+// processing of a pull migration request
+//
+function process_getWidget_action(action) {
+    log(l_deb, "process get widget "+action+" "+action.Name);
+    // get action arguments
+    var widgetCode = action.GetArgument("widgetCode");
+    log(l_deb, "get:"+widgetCode);
+    // get widget
+    var wid = WidgetManager.get(parseInt(widgetCode) - 1);
+    var url, ctx, uri;
+    url = wid.url;
+    /*share the widget*/
+    uri = UPnP.ShareResource(url);
+    ctx = wid.get_context();
+    if (ctx == null) ctx = "";
+    log(l_inf, 'sendReply widget ' + url + ' as resource ' + uri);
+    log(l_inf, 'with context ' + ctx);
+    var args = new Array();
+    args.push("errorCode");
+    args.push(0);
+    args.push("widgetUrl");
+    args.push(uri);
+    args.push("widgetUUID");
+    args.push(null);
+    args.push("widgetContext");
+    args.push(ctx);
+    action.SendReply(args);
+    WidgetManager.on_widget_remove(wid);
+}
+
+//
+// end of migration service
+//
+
+/*
+ INTERFACE PUBLISHING AS UPNP SERVICES ROUTINES
+
+ This implementation supports publishing a widget interface in the network as a UPnP service. This is done
+ by generating on the fly a new device associated with a widget, and one UPnP service per widget interface.
+ The UPnP service description (SCPD) is generated on the fly from the interface description
+ */
+
+function wmjs_make_interface_scpd(widget, ifce) {
+    log(l_deb, "wmjs_make_interface_scpd");
+    var variables = '', actions = '', vars, j, msg, k, param, numstatevar = 0;
+    /*do actions*/
+    for (j = 0; j < ifce.num_messages; j++) {
+        msg = ifce.get_message(j);
+        actions += '<action><name>' + msg.name + '</name><argumentList>';
+        for (k = 0; k < msg.num_params; k++) {
+            param = msg.get_param(k);
+            actions += '<argument><name>' + param.name + '</name><direction>' + (param.is_input ? 'in' : 'out');
+            actions += '</direction><relatedStateVariable>v' + numstatevar + '</relatedStateVariable></argument>';
+            numstatevar++;
+        }
+        actions += '</argumentList></action>';
+    }
+    /*do variables*/
+    for (k = 0; k < numstatevar; k++) {
+        variables += '<stateVariable><name>v' + k + '</name><dataType>string</dataType></stateVariable>';
+    }
+    return header + actions + middler + variables + footer;
+}
+
+/* generic processing of any action from outside */
+function wmjs_widget_upnp_process_action(action) {
+    log(l_err, 'wmjs_widget_upnp_process_action Action ' + action.Name + ' invoked on ' + action.Service.ifce.type);
+    var i, ai, args, msg, has_output = false;
+    /* find the message matching the action in the interface */
+    msg = null;
+    for (i = 0; i < action.Service.ifce.num_messages; i++) {
+        msg = action.Service.ifce.get_message(i);
+        if (msg.name == action.Name) break;
+        msg = null;
+    }
+    if (msg == null) {
+        log(l_inf, 'wmjs_widget_upnp_process_action Action not found: ' + action.Name + ' invoked on ' + action.Service.name);
+        return;
+    }
+    args = new Array();
+    ai = 0;
+    /*assign action for any async callback from the scene (cf wmjs_upnp_action_response)*/
+    action.Service.action = action;
+    /* for each param in the found message */
+    for (i = 0; i < msg.num_params; i++) {
+        var param = msg.get_param(i);
+        /* only process input params */
+        if (!param.is_input) {
+            has_output = true;
+            continue;
+        }
+        if (msg.has_script_input) {
+            /* input param is scripted, store argument value in args array */
+            args[ai] = action.GetArgument(param.name);
+        } else {
+            /* input param is not scripted but declarative, store argument value directly in scene tree */
+            this.widget.set_input(param, action.GetArgument(param.name));
+        }
+        ai++;
+    }
+    if (msg.has_input_action) {
+        /* message is not scripted, call input action */
+        this.widget.call_input_action(msg);
+    } else if (msg.has_script_input) {
+        /* message is scripted, call the script function specified in inputAction */
+        this.widget.call_input_script(msg, args);
+    }
+    if (!has_output) {
+        log(l_inf, 'wmjs_widget_upnp_process_action sending empty reply');
+        action.SendReply();
+        action.Service.action = null;
+    }
+}
+
+function wmjs_upnp_event_sender(service, widget, msg) {
+    return function(value) {
+        log(l_deb, 'wmjs_upnp_event_sender/function ' + service.ifce.type + " " + widget.name + " " + msg.name);
+        var i, pi, param_count = msg.num_params;
+        var args = new Array();
+        pi = 0;
+        for (i = 0; i < param_count; i++) {
+            var param = msg.get_param(i);
+            if (param.is_input) continue;
+            args[pi] = param.name;
+            args[pi + 1] = widget.get_param_value(param);
+            pi += 2;
+        }
+        log(l_inf, 'sending UPnP event ' + msg.name);
+        service.CallAction(msg.name, args);
+    };
+}
+
+function wmjs_upnp_action_response(service, widget, msg) {
+    return function(value) {
+        if (service.action == null) {
+            // TODO this code avoids the bug that this function is called twice: find out why it is called twice!
+            log(l_inf, 'wmjs_upnp_action_response/function DUPL(return) ' + service.ifce.type + " '" + widget.name + "' " + msg.name);
+            return;
+        }
+        var i, pi, param_count = msg.num_params;
+        var args = new Array();
+        pi = 0;
+        for (i = 0; i < param_count; i++) {
+            var param = msg.get_param(i);
+            if (param.is_input) continue;
+            args[pi] = param.name;
+            args[pi + 1] = widget.get_param_value(param);
+            pi += 2;
+        }
+        log(l_inf, 'UPnP sending reply on action ' + service.action + ': ' + service.ifce.type + " '" + widget.name + "' " + msg.name);
+        service.action.SendReply(args);
+        service.action = null;
+    };
+}
+
+
+function wmjs_upnp_action_response_script(service) {
+    return function() {
+        if (service.action == null) {
+            // this code avoids the bug that this function is called twice: find out why it is called twice!
+            return;
+        }
+        var i, pi, ai, param_count;
+        var args = new Array();
+        var msgHandler = arguments[0];
+        var msg = service.ifce.get_message(msgHandler.msgName);
+
+        pi = 0;
+        ai = 1;
+        for (i = 0; i < param_count; i++) {
+            var param = msg.get_param(i);
+            if (param.is_input) continue;
+            args[pi] = param.name;
+            args[pi + 1] = arguments[ai];
+            pi += 2;
+            ai++;
+        }
+        log(l_inf, 'UPnP sending reply on action ' + service.action);
+        service.action.SendReply(args);
+        service.action = null;
+    };
+}
+
+
+function wmjs_create_upnp_service(widget, ifce) {
+    var i, service, scpd, start_device = 0;
+    var name;
+
+    log(l_deb, 'widget device : ' + widget.device);
+
+    /* at least one interface is a provider, so create a device - service or device names SHALL NOT CONTAIN SPACES*/
+    name = widget.name.replace(whiteSpaceRegExp, '_');
+    if (!widget.device) {
+        //log(l_inf,'creating device');
+        widget.device = UPnP.CreateDevice("urn:mpeg-u:device:provider-" + name + ":1", name);
+        /* remember the widget in the device */
+        widget.device.widget = widget;
+        widget.device.enabled = 1;
+        start_device = 1;
+        /* implement the response to a external call (messageOut of another widget) */
+        widget.device.OnAction = wmjs_widget_upnp_process_action;
+    }
+
+    /*service has already been created*/
+    if (typeof(ifce.started) != 'undefined') return;
+
+    log(l_inf, 'wmjs_create_upnp_service');
+    scpd = wmjs_make_interface_scpd(widget, ifce);
+    //log(l_inf, 'Service scpd ' + scpd);
+    service = widget.device.SetupService(name, ifce.type, ifce.type + ".001", scpd);
+    service.ifce = ifce;
+
+    /* for each message in a provider interface */
+    for (i = 0; i < ifce.num_messages; i++) {
+        msg = ifce.get_message(i);
+        /* if there is an output_trigger, a reply may be triggered after a call */
+        if (msg.has_output_trigger) {
+            if (msg.is_input) {
+                /* output in an input message => this is a reply */
+                var fun_name1 = 'respond_' + msg.name;
+                widget[fun_name1] = wmjs_upnp_action_response(service, widget, msg);
+                wmjs_bind_output_trigger(widget, msg, widget[fun_name1], service);
+            } else {
+                /* output in an output message => this is an event */
+                var fun_name2 = 'send_event_' + msg.name;
+                widget[fun_name2] = wmjs_upnp_event_sender(service, widget, msg);
+                wmjs_bind_output_trigger(widget, msg, widget[fun_name2], service);
+            }
+        }
+        /*if message is input, a reply may be sent*/
+        else if (msg.is_input) {
+            var j, has_out;
+            has_out = 0;
+            for (j = 0; j < msg.num_params; j++) {
+                var param = msg.get_param(j);
+                if (param.is_input) continue;
+                has_out = 1;
+                break;
+            }
+            if (has_out) {
+                ifce.invokeReply = wmjs_upnp_action_response_script(service);
+            }
+        }
+    }
+    ifce.started = true;
+
+    if (start_device) {
+        //log(l_inf,"device start");
+        widget.device.Start();
+    }
+}
+
+
+/*
+ END OF INTERFACE PUBLISHING AS UPNP SERVICES ROUTINES
+ */
+
+/*********************************************************
+ Start of implementation of core:in and core:out interfaces
+ *********************************************************/
+
+coreIn = null, coreOut = null;
+
+//
+// function defining messages for the core:* interfaces implemented by the WM
+//
+function defineMessage(name, direction, executeFunction, params1, params2) {
+    var msg = new Object();
+    msg.name = name;
+    msg.is_input = !direction; // the standard defines the point of view of the widget, not that of the WM
+    msg.num_params = 0;
+    // the executeFunction is the function implemented by widman.js and
+    // which passes the buck to a function of the widget manager, if there is one
+    if (executeFunction != null) msg.execute = executeFunction;
+    // in a messageOut, params1 contains outputs and params2 contains inputs
+    // in a messageIn, params1 contains inputs and params2 contains outputs
+    if (direction) {
+        if (params1 != null) {
+            msg.paramsOut = params1;
+            msg.num_params += params1.length;
+        }
+        if (params2 != null) {
+            msg.paramsIn = params2;
+            msg.num_params += params2.length;
+        }
+    } else {
+        if (params1 != null) {
+            msg.paramsIn = params1;
+            msg.num_params += params1.length;
+        }
+        if (params2 != null) {
+            msg.paramsOut = params2;
+            msg.num_params += params2.length;
+        }
+    }
+    //alert("Message defined: "+msg.name+' '+msg.num_params+' '+msg.is_input+' '+
+    //      (msg.paramsIn != null ? msg.paramsIn.length : 0)+' '+
+    //      (msg.paramsOut != null ? msg.paramsOut.length : 0));
+    return msg;
+}
+
+//
+// function defining the parameter lists for messages
+// the direction of a parameter is implicit in its position in the paramsIn or paramsOut of a message
+//
+function defineParams() {
+    var params = new Array();
+    var i = 0;
+    for (; i < arguments.length; i++) {
+        params[i] = arguments[i];
+    }
+    return params;
+}
+
+//
+// get message by name in a core interface (core:in or core:out
+//
+function getMessage(core, s) {
+    var i = 0;
+    for (; i < core.length; i++) {
+        if (core[i].name == s) return core[i];
+    }
+    return null;
+}
+
+//
+// get a parameter from a message by name
+//
+function hasParam(msg, name) {
+    var i = 0;
+    if (msg.paramsIn) {
+        for (i = 0; i < msg.paramsIn.length; i++) {
+            if (msg.paramsIn[i] == name) return true;
+        }
+    }
+    if (msg.paramsOut) {
+        for (i = 0; i < msg.paramsOut.length; i++) {
+            if (msg.paramsOut[i] == name) return true;
+        }
+    }
+    return false;
+}
+
+//
+// get a parameter from a message by index
+//
+/*function getParam(msg, i) {
+    if (!msg.is_input) {
+        if (msg.paramsIn) {
+            if (i < msg.paramsIn.length) {
+                return msg.paramsIn[i];
+            } else {
+                i -= msg.paramsIn.length;
+            }
+        }
+        if (msg.paramsOut) {
+            if (i < msg.paramsOut.length) {
+                return msg.paramsOut[i];
+            }
+        }
+    } else {
+        if (msg.paramsOut) {
+            if (i < msg.paramsOut.length) {
+                return msg.paramsOut[i];
+            } else {
+                i -= msg.paramsOut.length;
+            }
+        }
+        if (msg.paramsIn) {
+            if (i < msg.paramsIn.length) {
+                return msg.paramsIn[i];
+            }
+        }
+    }
+    return null;
+}*/
+
+//
+// get a parameter from a message by index
+//
+function getInputParam(msg, i) {
+    if (!msg.is_input) {
+        if (msg.paramsIn) {
+            if (i < msg.paramsIn.length) {
+                return msg.paramsIn[i];
+            } else {
+                return null;
+            }
+        }
+    } else {
+        if (msg.paramsOut) {
+            if (i < msg.paramsOut.length) {
+                return null;
+            } else {
+                i -= msg.paramsOut.length;
+            }
+        }
+        if (msg.paramsIn) {
+            if (i < msg.paramsIn.length) {
+                return msg.paramsIn[i];
+            }
+        }
+    }
+    return null;
+}
+
+//
+// reconstruct the direction of a parameter of a message by its position
+//
+function paramDirection(msg, name) {
+    var i = 0;
+    if (msg.paramsIn) {
+        for (i = 0; i < msg.paramsIn.length; i++) {
+            if (msg.paramsIn[i] == name) return true;
+        }
+    }
+    if (msg.paramsOut) {
+        for (i = 0; i < msg.paramsOut.length; i++) {
+            if (msg.paramsOut[i] == name) return false;
+        }
+    }
+    return false;
+}
+
+function initCore() {
+    /*
+     Methods implementing messageIn of the core interfaces
+     In these methods, this is the message and args is the list of arguments of the message
+     widman.js, as the common part of all widget managers, does not implement these methods directly
+     but passes the buck to specific WM implementations.
+     In specific WM implementation, an initializer function should contain
+     WidgetManager.coreOutSetSize = function (...) {...};
+     or similar.
+     */
+    WidgetManager.coreOutSetSize = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.setSize" + argsString);
+    };
+
+    WidgetManager.coreOutShow = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.show" + argsString);
+    };
+
+    WidgetManager.coreOutHide = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.hide" + argsString);
+    };
+
+    WidgetManager.coreOutRequestActivate = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.requestActivate" + argsString);
+    };
+
+    WidgetManager.coreOutRequestDeactivate = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.requestDeactivate" + argsString);
+    };
+
+    WidgetManager.coreOutShowNotification = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.showNotification" + argsString);
+    };
+
+    WidgetManager.coreOutPlaceComponent = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.placeComponent" + argsString);
+    };
+
+    WidgetManager.coreOutGetAttention = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.getAttention" + argsString);
+    };
+    WidgetManager.coreOutInstallWidget = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.installWidget" + argsString);
+    };
+    WidgetManager.coreOutMigrateComponent = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.migrateComponent" + argsString);
+    };
+    WidgetManager.coreOutRequestMigrationTargets = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.requestMigrationTargets" + argsString);
+    };
+    WidgetManager.coreOutActivateTemporaryWidget = function(wid, args) {
+        var i = 0, argsString = "";
+        for (; i < args.length; i++) argsString += " " + args[i];
+        log(l_deb, "*** defCoreOutImpl.activateTemporaryWidget" + argsString);
+    };
+    /*
+     Define the core:* interfaces that the widget manager implements and provides to widgets
+     The structure of messages is simplified.
+     messageIn have first an array of paramsIn, then an array of paramsOut for a reply
+     messageOut have first an array of paramsOut, then an array of paramsIn for reply
+     Because of this simplification, getParam and defineMessage are dependent on the direction of the message
+     The direction of a parameter is implicit in the fact that it is stored in paramsIn or paramsOut of the message
+     */
+    coreIn = new Array();
+    coreOut = new Array();
+    coreIn[0] = defineMessage("setSize", true, null, defineParams("width", "height", "dpi"));
+    coreIn.setSizeMessage = coreIn[0];
+    coreIn[1] = defineMessage("show", true, null);
+    coreIn.showMessage = coreIn[1];
+    coreIn[2] = defineMessage("hide", true, null);
+    coreIn.hideMessage = coreIn[2];
+    coreIn[3] = defineMessage("activate", true, null);
+    coreIn.activateMessage = coreIn[3];
+    coreIn[4] = defineMessage("deactivate", true, null);
+    coreIn.deactivateMessage = coreIn[4];
+    coreIn.type = "urn:mpeg:mpegu:schema:widgets:core:in:2010";
+    coreOut[0] = defineMessage("setSize", false, coreOutSetSize, defineParams("width", "height"));
+    coreOut.setSizeMessage = coreOut[0];
+    coreOut[1] = defineMessage("show", false, coreOutShow);
+    coreOut.showMessage = coreOut[1];
+    coreOut[2] = defineMessage("hide", false, coreOutHide);
+    coreOut.hideMessage = coreOut[2];
+    coreOut[3] = defineMessage("requestActivate", false, coreOutRequestActivate, null,
+            defineParams("returnCode"));
+    coreOut.requestActivateMessage = coreOut[3];
+    coreOut[4] = defineMessage("requestDeactivate", false, coreOutRequestDeactivate, null,
+            defineParams("returnCode"));
+    coreOut.requestDeactivateMessage = coreOut[4];
+    coreOut[5] = defineMessage("showNotification", false, coreOutShowNotification,
+            defineParams("message"), defineParams("returnCode"));
+    coreOut.showNotificationMessage = coreOut[5];
+    coreOut[6] = defineMessage("placeComponent", false, coreOutPlaceComponent,
+            defineParams("componentID", "x", "y", "w", "h", "z-index", "transparency"),
+            defineParams("returnCode"));
+    coreOut.placeComponentMessage = coreOut[6];
+    coreOut[7] = defineMessage("getAttention", false, coreOutGetAttention,
+            null, defineParams("returnCode"));
+    coreOut.getAttentionMessage = coreOut[7];
+    coreOut[8] = defineMessage("installWidget", false, coreOutInstallWidget,
+            defineParams("url"), defineParams("returnCode"));
+    coreOut.installWidgetMessage = coreOut[8];
+    coreOut[9] = defineMessage("migrateComponent", false, coreOutMigrateComponent,
+            defineParams("componentId", "targetCode"), defineParams("returnCode"));
+    coreOut.migrateComponentMessage = coreOut[9];
+    coreOut[10] = defineMessage("requestMigrationTargets", false, coreOutRequestMigrationTargets,
+            null, defineParams("targetCodes", "targetNames", "targetDescriptions"));
+    coreOut.requestMigrationTargetsMessage = coreOut[10];
+    coreOut[11] = defineMessage("activateTemporaryWidget", false, coreOutActivateTemporaryWidget,
+            defineParams("url"), defineParams("returnCode"));
+    coreOut.activateTemporaryWidget = coreOut[11];
+    coreOut.type = "urn:mpeg:mpegu:schema:widgets:core:out:2010";
+}
+
+function coreOutRequestMigrationTargets(wid, args) {
+    WidgetManager.coreOutRequestMigrationTargets(wid, args);
+}
+
+function coreOutSetSize(wid, args) {
+    WidgetManager.coreOutSetSize(wid, args);
+}
+
+function coreOutShow(wid, args) {
+    WidgetManager.coreOutShow(wid, args);
+}
+
+function coreOutHide(wid, args) {
+    WidgetManager.coreOutHide(wid, args);
+}
+
+function coreOutRequestActivate(wid, args) {
+    WidgetManager.coreOutRequestActivate(wid, args);
+}
+
+function coreOutRequestDeactivate(wid, args) {
+    WidgetManager.coreOutRequestDeactivate(wid, args);
+}
+
+function coreOutShowNotification(wid, args) {
+    WidgetManager.coreOutShowNotification(wid, args);
+}
+
+function coreOutPlaceComponent(wid, args) {
+    WidgetManager.coreOutPlaceComponent(wid, args);
+}
+
+function coreOutGetAttention(wid, args) {
+    WidgetManager.coreOutGetAttention(wid, args);
+}
+
+function coreOutInstallWidget(wid, args) {
+    WidgetManager.coreOutInstallWidget(wid, args);
+}
+
+function coreOutActivateTemporaryWidget(wid, args) {
+    WidgetManager.coreOutActivateTemporaryWidget(wid, args);
+}
+
+function coreOutMigrateComponent(wid, args) {
+    WidgetManager.coreOutMigrateComponent(wid, args);
+}
+
+/*
+ Methods of binding and callback of core:* interfaces
+ */
+function wmjs_interface_invoke_callback_core(wid_src, ifce_dst, is_reply) {
+    log(l_inf, "wmjs_interface_invoke_callback_core '" + ifce_dst.type + "' - reply " + is_reply);
+    return function() {
+        var i, ai = 0, param_count, msgHandler, msg_src, msg_dst;
+        var args = new Array();
+        msgHandler = arguments[0];
+        /*get msg from source interface (this object)*/
+        msg_src = this.get_message(msgHandler.msgName);
+        msg_dst = getMessage(ifce_dst, msgHandler.msgName);
+        //var argstring = "";
+        //for (i = 0; i < msg_dst.num_params; i++) argstring += " "+getParam(msg_dst, i);
+        //log(l_inf, argstring);
+        //log(l_inf, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on core.' + msg_dst.name + " nbpar:"+msg_src.num_params);
+        param_count = msg_src.num_params;
+        for (i = 0; i < param_count; i++) {
+            var param = getInputParam(msg_dst, i);
+            if (param == null) continue;
+            args[ai] = arguments[ai+1];
+            ai++;
+        }
+        log(l_inf, (is_reply ? 'invokeReply ' : 'invoke ') + msg_src.name + ' on core.' + msg_dst.name + " nb:"+ai);
+        // call the method that implements the core:* message
+        msg_dst.execute(wid_src, args);
+    };
+}
+
+// function invokeReply for a reply from within a coreOut message
+function wmjs_core_out_invoke_reply() {
+    var i, ai, param_count, is_script, msg_src, msg_dst, wid_dst;
+    var args = new Array();
+    is_script = 0;
+    msg_src = arguments[0];
+    msg_dst = arguments[1];
+    wid_dst = arguments[2];
+    log(l_inf, 'coreOut/invokeReply ' + msg_src.name + ' on core.' + msg_dst.name + ' to ' +wid_dst.name+ " nb:"+ai);
+    if (msg_dst.has_script_input) is_script = 1;
+    param_count = msg_src.num_params;
+    ai = 3;
+    for (i = 0; i < param_count; i++) {
+        var param = msg_dst.get_param(i);
+        if (! param.is_input) continue;
+        if (is_script) {
+            args[ai - 3] = arguments[ai];
+        } else {
+            wid_dst.set_input(param, arguments[ai]);
+        }
+        ai++;
+    }
+    if (msg_dst.has_input_action) {
+        wid_dst.call_input_action(msg_dst);
+    } else if (is_script) {
+        wid_dst.call_input_script(msg_dst, args);
+    }
+}
+
+// get an interface by type in WidgetManager, since getInterfaceHandlersByType is not accessible
+function getInterfaceByType(widget, type) {
+    for (var i = 0; i < widget.num_interfaces; i++) {
+      var ifce = widget.get_interface(i);
+      if (ifce.type == type) return ifce;
+    }
+    return null;
+}
+
+function wmjs_bind_interface_to_core_service(wid, ifce) {
+    if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:in:2010") {
+        // core:in
+        return wmjs_bind_interface_to_core_service1(wid, ifce, coreIn);
+    } else if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
+        // core:out
+        return wmjs_bind_interface_to_core_service1(wid, ifce, coreOut);
+    }
+    // not an interface to core services
+    return false;
+}
+
+function wmjs_bind_interface_to_core_service1(wid, ifce, core) {
+    // loop on the messages to check if they match
+    log(l_inf, 'Bind interface to core service ' + wid.name + " " + ifce.type);
+    var set_bind = 0, nb_ok, j, k, a_msg;
+    for (j = 0; j < ifce.num_messages; j++) {
+        var msg = ifce.get_message(j);
+        // does the other interface have this message
+        a_msg = getMessage(core, msg.name);
+        if (!a_msg) {
+            // no, it does not have this message, so leave
+            log(l_inf, 'No core message for ' + msg.name);
+            continue;
+        }
+        // the messages have matching names, check direction
+        if (msg.is_input == a_msg.is_input) {
+            log(l_inf, 'core message for ' + msg.name + ' is not in direction ' + (msg.is_input ? 'output' : 'input'));
+            continue;
+        }
+        // the messages have matching names and directions, check params
+        if (msg.num_params != a_msg.num_params) {
+            log(l_war, 'core message ' + msg.name + ' does not have the same number of parameters '
+                    + msg.num_params + ' ' + a_msg.num_params);
+            var paramstring = "";
+            for (k = 0; k < msg.num_params; k++) {
+                par = msg.get_param(k);
+                paramstring += " " + par.name;
+            }
+            log(l_deb, paramstring);
+            continue;
+        }
+        /*check all params*/
+        nb_ok = 0;
+        for (k = 0; k < msg.num_params; k++) {
+            par = msg.get_param(k);
+            //log(l_inf, " "+par.name+" "+hasParam(a_msg, par.name)+" "+par.is_input+" "+paramDirection(a_msg, par.name));
+            if (hasParam(a_msg, par.name) != null && par.is_input != paramDirection(a_msg, par.name)) nb_ok ++;
+        }
+        if (nb_ok != msg.num_params) {
+            log(l_war, 'core message ' + msg.name + ' does not have the same input/output parameters '+nb_ok+" "+msg.num_params);
+            continue;
+        }
+        set_bind ++;
+        // the messages match
+        log(l_inf, 'Binding ' + wid.name + '.' + msg.name + ' to core.' + a_msg.name);
+        /*OK let's bind this action: we only need to assign the output trigger, the input
+         action will be called from the other widget*/
+        if (msg.has_output_trigger) {
+            wmjs_bind_output_trigger(wid, msg, wmjs_output_trigger_callback_core(msg, wid, a_msg), WidgetManager);
+        }
+    }
+    if (!set_bind) return false;
+    /*create callback for programmatic action triggers*/
+    ifce.invoke = wmjs_interface_invoke_callback_core(wid, core, 0);
+    // ifce.invokeReply = wmjs_interface_invoke_callback_core(wid, core, 1);
+    wid.bind_interface(ifce, null, 'localhost');
+    return true;
+}
+
+function wmjs_output_trigger_callback_core(msg_out, wid_src, msg_in) {
+    log(l_deb, "wmjs_output_trigger_callback_core");
+    return function() {
+        log(l_deb, "wmjs_output_trigger_callback_core/function '" + wid_src.name + "'");
+        var param_count = msg_out.num_params;
+        var args = new Array();
+        var ai = 0, i;
+        log(l_inf, 'Invoking Widget(' + wid_src.name + ').' + msg_out.name);
+        for (i = 0; i < param_count; i++) {
+            var param = msg_out.get_param(i);
+            if (param.is_input) continue;
+            args[ai] = wid_src.get_param_value(param);
+            ai++;
+        }
+        msg_in.execute(wid_src, args);
+    };
+}
+
+
+//
+// send a core:in message with no parameter
+//
+function wmjs_corein_message() {
+  if (arguments.length < 2) return;
+  var widget = arguments[0];
+  var message = arguments[1];
+  
+  for (var i=0; i<widget.num_interfaces; i++) {
+    var ifce = widget.get_interface(i);
+    if (ifce.type != 'urn:mpeg:mpegu:schema:widgets:core:in:2010') continue;
+    
+    for (var j=0; j<ifce.num_messages; j++) {
+      var msg = ifce.get_message(j);
+      if (msg.name == message) {
+        if (msg.has_script_input) {
+          var jsargs = new Array();
+          /*for each input descibed in the manifest, get the input script value and stack it in the argument list*/
+          for (var k=0; k<msg.num_params; k++) {
+            par = msg.get_param(k);
+            if (!par.is_input) continue;
+            for (var l=2; l<arguments.length; l+=2) {
+             if (arguments[l]==par.name) {
+               jsargs.push(arguments[l+1]);
+               break;
+             }
+            }
+          }
+          widget.call_input_script(msg, jsargs);
+        } else if (msg.has_input_action) {
+          /*for each input descibed in the manifest, set the widget input value*/
+          for (var k=0; k<msg.num_params; k++) {
+            par = msg.get_param(k);
+            if (!par.is_input) continue;
+            for (var l=2; l<arguments.length; l+=2) {
+             if (arguments[l]==par.name) {
+               widget.set_input(par, arguments[l+1]);
+               break;
+             }
+            }
+          }
+          widget.call_input_action(msg);
+        }
+      }
+    }
+  }
+}
+
+/*
+ End of implementation of core:in and core:out interfaces
+ */

gpac-1.0.0.tar.gz/share/gui/mpegu-wm.bt Changed

gpac-1.0.0.tar.gz/share/gui/mpegu-wm.js Added

@@ -0,0 +1,1723 @@
+//This software module was originally developed by Telecom Paris in the
+//course of the development of MPEG-U Widgets (ISO/IEC 23007-1) standard.
+//
+//This software module is an implementation of a part of one or 
+//more MPEG-U Widgets (ISO/IEC 23007-1) tools as specified by the MPEG-U Widgets
+//(ISO/IEC 23007-1) standard. ISO/IEC gives users of the MPEG-U Widgets
+//(ISO/IEC 23007-1) free license to this software module or modifications
+//thereof for use in hardware or software products claiming conformance to
+//the MPEG-U Widgets (ISO/IEC 23007-1). Those intending to use this software
+//module in hardware or software products are advised that its use may
+//infringe existing patents.
+//The original developer of this software module and his/her company, the
+//subsequent editors and their companies, and ISO/IEC have no liability 
+//for use of this software module or modifications thereof in an implementation. 
+//Copyright is not released for non MPEG-U Widgets (ISO/IEC 23007-1) conforming 
+//products. 
+//Telecom Paris retains full right to use the code for his/her own purpose, 
+//assign or donate the code to a third party and to inhibit third parties from 
+//using the code for non MPEG-U Widgets (ISO/IEC 23007-1) conforming products. 
+//
+//This copyright notice must be included in all copies or derivative works.
+//
+//Copyright (c) 2009.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////////
+//
+//	Authors:	
+//					Jean Le Feuvre, (c) 2007-2010 Telecom Paris
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+// 01122011 AMD1 startWidget implemented
+// TODO AMD1 listWidgets getWidget requestCapabilitiesList
+
+//Initialize the main UI script
+function initialize() {
+    //var icon;
+    var i, count, wid;
+
+    gpac.caption = 'MPEG-U @ Osmo4';
+
+    display_width = parseInt(gpac.get_option('Widgets', 'LastWMWidth'));
+    display_height = parseInt(gpac.get_option('Widgets', 'LastWMHeight'));
+    
+    if (display_width && display_height) {
+     gpac.set_size(display_width, display_height);
+    } else {
+     display_width = gpac.get_screen_width();
+     display_height = gpac.get_screen_height();
+    }
+
+    //request event listeners on the window - GPAC specific extensions !!!     
+    root.addEventListener('resize', on_resize, 0);
+    root.addEventListener('zoom', on_zoom, 0);
+    root.addEventListener('scroll', on_scroll, 0);
+
+    widget_default_size = 200;
+    scene_width = 0;
+    
+    wctl_iconsize = new SFVec2f(24, 24);
+    icon_size = 48;
+    dock_height = 48;
+    info_height = 32;
+    toggle_bar_height = 16;
+    screen_dpi = gpac.get_horizontal_dpi();
+     
+    widget_remote_candidate = null;
+    has_upnp = eval("(typeof(UPnP) != 'undefined');");
+    if (has_upnp) {
+     UPnP.onMediaRendererAdd = onMediaRendererAdd;
+     UPnP.onMediaConnect = onMediaConnect;
+     UPnP.BindRenderer();
+     upnp_renders = null;
+    }
+     
+    /*setup dock*/
+    widget_screen_visible = false;
+        
+    /*widget subtree*/
+    widget_display = new SFNode('Transform2D');
+    ui_root.children[0] = widget_display;  
+
+    /*widget manager page*/
+    widget_screen = new SFNode('Layer2D');
+    ui_root.children[1] = widget_screen;  
+    
+    /*all other UI elements subtree*/
+    dlg_display = new SFNode('Transform2D');
+    ui_root.children[2] = dlg_display;  
+
+    infobar = text_label('', 'MIDDLE');
+    ui_root.children[3] = infobar;
+
+    /*our dock*/
+    dock = new SFNode('Transform2D');
+    ui_root.children[4] = dock;  
+        
+    /*init the widget manager*/
+    Browser.loadScript('mpegu-core.js', true);
+    log_level = l_inf;
+    widget_manager_init();
+
+    WidgetManager.on_widget_remove = widget_remove;
+    WidgetManager.on_widget_add = widget_insert;
+    WidgetManager.coreOutSetSize = widget_request_size;
+    WidgetManager.coreOutShow = widget_request_show;
+    WidgetManager.coreOutHide = widget_request_hide;
+    WidgetManager.coreOutRequestActivate = widget_request_activate;
+    WidgetManager.coreOutRequestDeactivate = widget_request_deactivate;
+    WidgetManager.coreOutShowNotification = widget_request_notification;
+    WidgetManager.coreOutPlaceComponent = widget_place_component;
+    WidgetManager.coreOutGetAttention = widget_request_attention;
+    WidgetManager.coreOutInstallWidget = widget_install_widget;
+    WidgetManager.coreOutMigrateComponent = widget_migrate_component;
+    WidgetManager.coreOutRequestMigrationTargets = widget_request_migration_targets;
+
+    nb_widgets_on_screen = 0;
+    first_visible_widget = 0;
+    setup_icons();
+    
+    /*restore our widgets*/    
+    widgets_init();
+
+    //let's do the layout   
+    layout();
+}
+
+function new_timeout(time)
+{
+ var obj = new SFNode('TimeSensor');
+ 
+ obj.cycleInterval = time;
+ obj.start = function(when) {
+  var t = this.getTime();
+  this.startTime = when + this.getTime();
+ };
+ obj.stop = function(when) {
+  this.stopTime = when + this.getTime();
+ };
+ obj.on_event = null;
+ obj.event = function(val) {
+  if (this.on_event) this.on_event(val);
+ };
+ Browser.addRoute(obj, 'fraction_changed', obj, obj.event); 
+ return obj;
+}
+
+function rectangle()
+{
+  var obj = new SFNode('Shape');
+
+  obj.appearance = new SFNode('Appearance');
+  obj.appearance.material = new SFNode('Material2D');
+  obj.appearance.material.filled = TRUE;
+  obj.appearance.material.emissiveColor = new SFColor(0.7, 0.7, 0.8);
+  obj.appearance.material.lineProps = new SFNode('LineProperties');
+  obj.appearance.material.lineProps.width = 2;
+  obj.appearance.material.lineProps.lineColor = new SFColor(0, 0, 0);
+
+  obj.geometry = new SFNode('Curve2D');
+  obj.geometry.point = new SFNode('Coordinate2D');
+  temp = obj.geometry.type;
+  temp[0] = 7;
+  temp[1] = 1;
+  temp[2] = 7;
+  temp[3] = 1;
+  temp[4] = 7;
+  temp[5] = 1;
+  temp[6] = 7;
+  temp[7] = 6;/*close*/
+
+  obj.set_size = function(w, h) {
+   var hw, hh, rx, ry;
+   var temp;
+   hw = w/2;
+   hh = h/2;
+
+   /*compute default rx/ry*/   
+   ry = rx = 10;
+   if ( (2*rx>=hw) || (2*ry>=hh)) rx = ry = 6;
+
+   temp = this.geometry.point.point;
+   temp[0] = new SFVec2f(hw-rx, hh);
+   temp[1] = new SFVec2f(hw, hh);/*bezier ctrl point*/
+   temp[2] = new SFVec2f(hw, hh-ry);
+   temp[3] = new SFVec2f(hw, -hh+ry);
+   temp[4] = new SFVec2f(hw, -hh);/*bezier control point*/
+   temp[5] = new SFVec2f(hw-rx, -hh);
+   temp[6] = new SFVec2f(-hw+rx, -hh);
+   temp[7] = new SFVec2f(-hw, -hh);/*bezier control point*/
+   temp[8] = new SFVec2f(-hw, -hh+ry);
+   temp[9] = new SFVec2f(-hw, hh-ry);
+   temp[10] = new SFVec2f(-hw, hh);/*bezier control point*/
+   temp[11] = new SFVec2f(-hw+rx, hh);
+  };
+  obj.set_color = function(r, g, b) {
+   this.appearance.material.emissiveColor.r = r;
+   this.appearance.material.emissiveColor.g = g;
+   this.appearance.material.emissiveColor.b = b;
+  };
+  return obj;
+}
+
+function icon_button(url, label, no_back)
+{
+    var obj = new SFNode('Transform2D');
+    obj.children[0] = new SFNode('Transform2D');
+    obj.children[0].scale.x = 0;
+    obj.children[0].children[0] = rectangle();
+    
+    obj.children[1] = new SFNode('Layer2D');
+    obj.children[1].size.x = icon_size;
+    obj.children[1].size.y = icon_size;
+    obj.children[1].children[0] = new SFNode('Inline');
+    obj.children[1].children[0].url[0] = url;
+    
+    obj.touch = new SFNode('TouchSensor');
+    obj.children[1].children[1] = obj.touch;
+    obj.button_click = NULL;
+    obj.down = false;
+    obj.over = false;
+    obj.on_active = function(value) { 
+     if (value) {
+      this.down = true;
+     } else {
+      if (this.down && this.over && this.button_click) this.button_click(); 
+      this.down = false;
+     }
+    };
+    obj.button_over = on_icon_over;
+    obj.on_over = function(value) { 
+     this.over = value; 
+     if (!no_back)
+      this.children[0].scale.x = value ? 1 : 0;
+     if (this.button_over) this.button_over(value); 
+    };
+    Browser.addRoute(obj.touch, 'isOver', obj, obj.on_over); 
+    Browser.addRoute(obj.touch, 'isActive', obj, obj.on_active); 
+    obj.label = label;
+    obj.hide = function() { this.scale.x = this.scale.y = 0;};
+    obj.show = function() { this.scale.x = this.scale.y = 1;};
+    obj.set_size = function(x, y) { 
+     this.children[0].children[0].set_size(x, y);
+     this.children[1].size.x = x; 
+     this.children[1].size.y = y;
+    };
+    return obj;
+}
+
+function text_label(label, justify)
+{
+    var obj = new SFNode('Transform2D');
+    obj.children[0] = new SFNode('Shape');
+    obj.children[0].appearance = new SFNode('Appearance');
+    obj.children[0].appearance.material = new SFNode('Material2D');
+    obj.children[0].appearance.material.filled = TRUE;
+    obj.children[0].appearance.material.emissiveColor = new SFColor(0, 0, 0);
+    obj.children[0].geometry = new SFNode('Text');
+    obj.children[0].geometry.string[0] = label;
+    obj.children[0].geometry.fontStyle = new SFNode('FontStyle');
+    obj.children[0].geometry.fontStyle.justify[0] = justify;
+    obj.children[0].geometry.fontStyle.justify[1] = 'MIDDLE';
+    obj.children[0].geometry.fontStyle.size = 20;
+    obj.set_label = function(value) {
+     this.children[0].geometry.string[0] = value;
+    };
+    return obj;
+}
+
+
+function text_rect(label)
+{
+  var obj = new SFNode('Transform2D');
+  obj.children[0] = rectangle();
+  obj.children[0].set_color(0.7, 0.7, 0.8);
+
+  obj.children[1] = new SFNode('Shape');
+  obj.children[1].appearance = new SFNode('Appearance');
+  obj.children[1].appearance.material = new SFNode('Material2D');
+  obj.children[1].appearance.material.filled = TRUE;
+  obj.children[1].appearance.material.emissiveColor = new SFColor(0, 0, 0);
+  obj.children[1].geometry = new SFNode('Text');
+  obj.children[1].geometry.string[0] = label;
+  obj.children[1].geometry.fontStyle = new SFNode('FontStyle');
+  obj.children[1].geometry.fontStyle.justify[0] = 'MIDDLE';
+  obj.children[1].geometry.fontStyle.justify[1] = 'MIDDLE';
+  obj.children[1].geometry.fontStyle.size = 20;
+  obj.children[2] = new SFNode('TouchSensor');
+
+  obj.set_size = function(w, h) { 
+   this.children[0].set_size(w, h);
+  };
+
+
+  obj.over = false;
+  obj.on_over = function(value) { 
+    this.children[0].set_color(0.7, value ? 0.5 : 0.7, 0.8);
+    this.over = value;
+  };
+  Browser.addRoute(obj.children[2], 'isOver', obj, obj.on_over); 
+
+  obj.down = false;
+  obj.button_click = null;
+  obj.on_active = function(value) { 
+   if (value) {
+    this.down = true;
+   } else {
+    if (this.down && this.over && this.button_click) this.button_click(); 
+    this.down = false;
+   }
+  };
+  Browser.addRoute(obj.children[2], 'isActive', obj, obj.on_active); 
+
+  return obj;  
+}
+
+function new_widget_control(widget)
+{
+  var obj = new SFNode('Transform2D');
+  
+  obj.children[0] = new SFNode('Transform2D');
+  
+  obj.children[0].children[0] = rectangle();
+
+  obj.children[0].children[1] = new SFNode('TouchSensor');
+
+
+  obj.component_bound=false;
+  obj.show_ctrl = true;
+  obj.onClick = function(value) {
+   if (!value) return;
+   this.show_ctrl = !this.show_ctrl;
+   if (this.show_ctrl) {
+    var i, comps, idx;
+    this.children[0].children[0].appearance.material.transparency = 0;
+    this.children[1].scale.x = 1;
+    this.children[3].scale.x = 1;
+
+    for (i=0; i<widget_display.children.length; i++) {
+     if (widget_display.children[i]==this) continue;
+     if (widget_display.children[i].show_ctrl) {
+       widget_display.children[i].onClick(true);
+      }
+    }
+    //widget is a component, do not push on top but hide some controls
+    if (widget.is_component) {
+     if (this.component_bound) {
+      this.children[1].children[0].hide(); //close
+      this.children[1].children[1].hide(); //remove
+      this.children[1].children[4].hide(); //resize
+     }
+     return;
+    }
+    //otherwise push widget on top
+    idx=0;
+    widget_display.removeChildren[idx++] = this;
+    widget_display.addChildren[idx++] = this;
+    //and push components    
+    comps = widget.components;
+    for (i=0; i<comps.length; i++) {
+     if (comps[i].widget_control.component_bound) {
+      widget_display.removeChildren[idx++] = comps[i].widget_control;
+      widget_display.addChildren[idx++] = comps[i].widget_control;
+     }
+    }
+    
+   } else {
+    this.children[0].children[0].appearance.material.transparency = 1;
+    this.children[1].scale.x = 0;
+    this.children[3].scale.x = 0;
+   }
+  };
+  Browser.addRoute(obj.children[0].children[1], 'isActive', obj, obj.onClick);
+  
+  obj.children[1] = new SFNode('Transform2D');
+  obj.children[1].children[0] = icon_button('icons/process-stop.svg', 'Close', 0);
+  obj.children[1].children[0].button_click = function() {
+    if (widget.discardable) widget_remove(widget);
+    else widget_close(widget, 0);
+  };
+  
+  obj.children[1].children[1] = icon_button('icons/user-trash.svg', 'Uninstall', 0);
+  obj.children[1].children[1].button_click = function() { widget_remove(widget);  }
+  
+  obj.children[1].children[2] = icon_button('icons/applications-internet.svg', 'Push to remote display', 0);
+  obj.children[1].children[2].button_click = function() { 
+    if (has_upnp && UPnP.MediaRenderersCount) {
+     widget_remote_candidate = widget;
+     on_upnpopen();
+    }
+  };
+
+  obj.children[1].children[3] = icon_button('icons/dialog-information.svg', 'Widget Information', 0);
+  obj.children[1].children[3].button_click = function() { 
+   display_widget_info(widget);
+  };
+
+  obj.children[1].children[4] = icon_button('icons/media-record.svg', 'Resize', 1);
+  obj.children[1].children[4].children[1].children[2] = new SFNode('PlaneSensor2D');  
+  obj.children[1].children[4].children[1].children[2].maxPosition = new SFVec2f(-1, -1);
+
+  obj.prev_x=0;
+  obj.prev_y=0;
+  obj.onSize = function(value) {
+   if (widget.width + 2*(value.x - this.prev_x)<0) return;
+   if (widget.height + 2*(this.prev_y-value.y)<0) return;
+   
+   widget.width += 2*(value.x - this.prev_x);
+   this.prev_x = value.x;
+   widget.height += 2*(this.prev_y - value.y);
+   this.prev_y = value.y;
+   this.set_size(widget.width, widget.height);
+  };
+  Browser.addRoute(obj.children[1].children[4].children[1].children[2], 'translation_changed', obj, obj.onSize);
+  
+  obj.children[2] = new SFNode('Layer2D');
+  obj.inline = new SFNode('Inline');
+  obj.children[2].children[0] = obj.inline;
+
+
+  obj.children[3] = new SFNode('Transform2D');
+  obj.children[3].children[0] = new SFNode('Shape');
+  obj.children[3].children[0].appearance = new SFNode('Appearance');
+  obj.children[3].children[0].appearance.material = new SFNode('Material2D');
+  obj.children[3].children[0].appearance.material.filled = TRUE;
+  obj.children[3].children[0].appearance.material.transparency = 0.5;
+  obj.children[3].children[0].appearance.material.emissiveColor = new SFColor(0.6, 0.6, 0.6);
+  obj.children[3].children[0].geometry = new SFNode('Rectangle');
+  obj.children[3].children[0].geometry.size = new SFVec2f(50, 50);
+  obj.children[3].children[1] = new SFNode('PlaneSensor2D');
+  obj.children[3].children[1].maxPosition = new SFVec2f(-1, -1);
+  obj.children[3].children[1].offset = new SFVec2f(widget.x, widget.y);  
+  obj.onMove = function(value) {
+   if (this.maximized) return;
+   this.translation = value;
+   widget.x = value.x;
+   widget.y = value.y;
+   this.refresh_layout(false, null);
+  };
+  Browser.addRoute(obj.children[3].children[1], 'translation_changed', obj, obj.onMove);
+
+  obj.children[3].children[2] = new SFNode('TouchSensor');
+  obj.last_ts = 0;
+  obj.onMaximize = function(value, timestamp) {
+   if (!value) return;
+   if (timestamp - this.last_ts < 0.5) {
+    if (this.maximized) {
+     this.maximized = false; 
+     this.translation.x = widget.x;
+     this.translation.y = widget.y;
+     this.set_size(this.prev_width, this.prev_height);
+    } else {
+     this.maximized = true;
+     this.prev_width = widget.width;
+     this.prev_height = widget.height;
+     this.translation.x = 0;
+     this.translation.y = -info_height;
+     this.set_size(display_width, display_height - 2*info_height);
+    }   
+   }
+   this.last_ts = timestamp;
+  };
+  Browser.addRoute(obj.children[3].children[2], 'isActive', obj, obj.onMaximize);
+
+  obj.set_size = function(w, h) {
+   var i, x, s;
+   s = 24;
+   this.children[2].size.x = w;
+   this.children[2].size.y = h;
+   
+   this.children[1].children[0].translation.y = this.children[1].children[1].translation.y = this.children[1].children[2].translation.y = this.children[1].children[3].translation.y = this.children[1].children[4].translation.y = h/2 + s/2;
+
+   this.children[0].children[0].set_size(w+s, h+s);
+   this.children[3].children[0].geometry.size.x = w;
+   this.children[3].children[0].geometry.size.y = h;
+
+   this.children[1].children[0].set_size(s, s);
+   this.children[1].children[1].set_size(s, s);
+   this.children[1].children[2].set_size(s, s);
+   this.children[1].children[3].set_size(s, s);
+   this.children[1].children[4].set_size(s, s);
+   this.children[1].children[0].translation.x = -w/2;
+   this.children[1].children[1].translation.x = -w/4;
+   this.children[1].children[2].translation.x = 0;
+   this.children[1].children[3].translation.x = w/4;
+   this.children[1].children[4].translation.x = w/2;
+
+   //set widget input params
+   widget.width = w;
+   widget.height = h;
+   widget.set_input('width', w);
+   widget.set_input('height', h);
+   this.refresh_layout(true, null);
+   //call core:in
+   WidgetManager.corein_message(widget, 'setSize', 'width', w, 'height', w, 'dpi', screen_dpi);
+  };
+  obj.refresh_layout = function(send_resize, comp_target) {
+   var i;
+   var x, y, w, h, scale_x, scale_y;
+   var comps;
+
+   /*local to subscene transformation not known*/
+   if (!this.sub_w) return;
+   if (!this.sub_h) return;
+
+   comps = widget.components;
+   for (i=0; i<comps.length; i++) {
+    var comp = comps[i];
+    if (!comp.widget_control.component_bound) continue;
+
+    //compute scale from Widget Manager coord system to widget internal coordinate system
+    scale_x = this.sub_vp_w / this.sub_w;
+    scale_y = this.sub_vp_h / this.sub_h;
+
+    w = comp.widget_control.place_w * scale_x;
+    h = comp.widget_control.place_h * scale_y;
+ 
+    x = this.translation.x - widget.width/2 + this.sub_vp_x + comp.widget_control.place_x * scale_x + w/2;
+    comp.widget_control.translation.x = x;
+
+    y = widget.height/2 + this.translation.y - h/2 - this.sub_vp_y - comp.widget_control.place_y * scale_y;
+    comp.widget_control.translation.y = y;
+
+    if (send_resize || (comp_target==comp)) 
+     comp.widget_control.set_size(w, h);
+   }
+  };
+  
+  obj.hide = function() { 
+   this.scale.x = 0;
+   WidgetManager.corein_message(widget, 'hide');
+  };
+  obj.show = function() { 
+    this.scale.x = 1; 
+    WidgetManager.corein_message(widget, 'show');
+  };
+
+  obj.show_remote = function () {
+   if (WidgetManager.upnp && UPnP.MediaRenderersCount) {
+    this.children[1].children[2].show();
+   } else {
+    this.children[1].children[2].hide();
+   }
+  };
+  obj.show_remove = function(show) {
+    if (show) this.children[1].children[1].show();
+    else this.children[1].children[1].hide();
+  };
+
+  obj.flash = function() {
+    var time = new_timeout(0.25);
+    time.loop = true;
+    time.ctrl = this;
+    time.on_event = function(val) {
+     var scale = (val<0.5) ? 1+val : 2-val;
+     this.ctrl.scale.x = this.ctrl.scale.y = scale;
+    };
+    time.stop(1);
+    time.start(0);
+  };
+  obj.maximized = false;
+  obj.show_remote();
+  obj.onClick(true);
+  return obj;
+}
+
+
+
+function on_icon_over(value)
+{
+ infobar.set_label(value ? this.label : '');
+}
+
+function display_widget_info(wid)
+{
+ var info_dlg = new SFNode('Transform2D');
+ var i, j, k, info;
+ var y, txt, pref;
+
+ infobar.set_label('Widget ' + wid.name + ' Information');
+
+ info = text_rect('Close');
+ info_dlg.children[0] = info;
+ info.button_click = function() {
+  dlg_display.children.length = 0;
+  widget_display.scale.x = 1;
+  infobar.set_label('');
+  layout();
+ };
+ 
+ info = text_rect('Widget Metadata');
+ info_dlg.children[info_dlg.children.length] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ info.children[i++] = text_label('id: ' + wid.identifier + ' - shortname: '+wid.shortName + ' - name: '+wid.name, 'BEGIN');
+ info.children[i++] = text_label('version: '+wid.version, 'BEGIN');
+ info.children[i++] = text_label('content type: ' + wid.mainMimeType + ' - content encoding: '+wid.mainEncoding, 'BEGIN');
+ info.children[i++] = text_label('default size: Width = ' + wid.defaultWidth + ' Height = '+wid.defaultHeight, 'BEGIN');
+ info.children[i++] = text_label('license: '+wid.license, 'BEGIN');
+ info.children[i++] = text_label('license ref: '+wid.licenseHref, 'BEGIN');
+ info.children[i++] = text_label('description: '+wid.description, 'BEGIN');
+ info.children[i++] = text_label('author name: '+wid.authorName + ' (mail: '+wid.authorEmail+')', 'BEGIN');
+ info.children[i++] = text_label('author href: '+wid.authorHref, 'BEGIN');
+ info.children[i++] = text_label('view modes: '+wid.viewmodes, 'BEGIN');
+ info.children[i++] = text_label('UUID: '+wid.uuid, 'BEGIN');
+ info.children[i++] = text_label('Discardable: '+wid.discardable, 'BEGIN');
+ info.children[i++] = text_label('Muliple Instances: '+wid.discardable, 'BEGIN');
+ var icons = wid.icons;
+ for (j=0; j<icons.length; j++) {
+  info.children[i++] = text_label('icon #'+(j+1)+': ' + icons[j].src, 'BEGIN');
+ }
+
+ info = text_rect('Widget Manager Info');
+ info_dlg.children[info_dlg.children.length] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ info.children[i++] = text_label('nb instances: '+wid.num_instances + ' nb components: '+wid.num_components, 'BEGIN' );
+ info.children[i++] = text_label('Permanently installed: '+wid.permanent + ' - is component: '+wid.is_component, 'BEGIN' );
+ if (wid.is_component) {
+   info.children[i++] = text_label('parent widget name' + wid.parent.name, 'BEGIN');
+ }
+ if (wid.originating_device_ip) {
+  info.children[i++] = text_label('Widget was pushed from device IP '+wid.originating_device_ip, 'BEGIN' );
+ }
+ info.children[i++] = text_label('Section name in GPAC config file: '+wid.section, 'BEGIN' );
+ info.children[i++] = text_label('UA Locale: ' + gpac.get_option('core', 'lang'), 'BEGIN');
+ info.children[i++] = text_label('widget src: ' + wid.url , 'BEGIN');
+ info.children[i++] = text_label('config src: ' + wid.manifest , 'BEGIN');
+ info.children[i++] = text_label('content src : '+wid.localizedSrc, 'BEGIN' );
+
+ pref = wid.features;
+ info = text_rect('Features (' + pref.length + ')' ); 
+ info_dlg.children[info_dlg.children.length] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ for (j=0; j<pref.length; j++) {
+  info.children[i++] = text_label('Feature #'+(j+1)+' name=\''+pref[j].name+'\' required=\''+pref[j].required+'\'', 'BEGIN');
+ }
+
+
+ pref = wid.preferences;
+ info = text_rect('Preferences ('+pref.length+')'); 
+ info_dlg.children[info_dlg.children.length] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ for (j=0; j<pref.length; j++) {
+  var val = pref[j].value;
+  if (val == '') val = gpac.get_option(wid.section, pref[j].name);
+  info.children[i++] = text_label('Preference #'+(j+1)+' name=\''+pref[j].name+'\' value=\''+val+'\' readOnly=\''+pref[j].readonly +'\'', 'BEGIN');
+ }
+
+ info = text_rect('Migration Context', 'BEGIN'); 
+ info_dlg.children[info_dlg.children.length] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ txt=wid.get_context();
+ while (1) {
+  var idx = txt.indexOf('\n', 0);
+  if (idx>0) {
+   info.children[i++] = text_label(txt.substring(0, idx), 'BEGIN'); 
+   txt = txt.substring(idx+1, txt.length); 
+  } else {
+   info.children[i++] = text_label(txt, 'BEGIN'); 
+   break;
+  }
+ }
+
+ info_dlg.ifce_idx = info_dlg.children.length;
+ info = text_rect('Interfaces (count: ' + wid.num_interfaces + ' - bound: ' + wid.num_bound_interfaces+')', 'BEGIN'); 
+ info_dlg.children[info_dlg.ifce_idx] = info;
+ info.visible = false;
+ info.button_click = function() { 
+   this.visible = !this.visible;
+   layout();
+ };
+ i=3;
+ for (j=0; j<wid.num_interfaces; j++) {
+  var idx;
+  var ifce = wid.get_interface(j);
+  var item = text_rect('Interface #' + (j+1) + ' type: '+ifce.type);
+  info.children[i++] = item;
+  item.visible = false;
+  item.button_click = function() { 
+    this.visible = !this.visible;
+    layout();
+  };
+  idx=3;
+  item.children[idx++] = text_label('Multiple Binding: '+ifce.multipleBinding + ' - Service provider: '+ ifce.serviceProvider + ' - bound: ' + wid.is_interface_bound(ifce) , 'BEGIN');
+  for (k=0; k<ifce.num_messages; k++) {
+    var string, l;
+    var msg = ifce.get_message(k);
+    string = '  Message #'+ (k+1) + ':   ' + msg.name + '(';
+    for (l=0; l<msg.num_params; l++) {
+        par = msg.get_param(l);
+        string += (par.is_input ? 'in' : 'out') + ':' +par.name + ' ';
+    }
+    string += ')';
+    item.children[idx++] = text_label(string, 'BEGIN'); 
+  }
+ }
+ 
+ info_dlg.set_size = function(w, h) {
+  var i, j, y, dy;
+  y = h/2 - 20;
+
+  for (i=0; i<this.children.length; i++) {
+   var item = this.children[i];
+   item.translation.x = 0;
+   item.translation.y = y;
+   item.set_size(w, 20);
+   y -= 20;
+   if (!i) continue;
+   
+   dy = 0;
+   for (j=3; j<item.children.length; j++) {
+    if (item.visible) {
+     item.children[j].scale.x = 1;
+     dy -= 20;
+     item.children[j].translation.y = dy;
+     if (i<this.ifce_idx) {
+      item.children[j].translation.x = -w/2+10;
+     } else {
+      item.children[j].set_size(w-20, 20);
+      var ddy=0;
+      var k, sitem;
+      sitem = item.children[j];
+      for (k=3; k<sitem.children.length; k++) {
+       if (item.children[j].visible) {
+        sitem.children[k].scale.x = 1;
+        sitem.children[k].translation.x = -w/2+10;
+        ddy -= 20;
+        sitem.children[k].translation.y = ddy;
+       } else {
+        sitem.children[k].scale.x = 0;
+       } 
+      }
+      dy+=ddy;
+     }
+    } else {
+     item.children[j].scale.x = 0;
+    }
+   }
+   y += dy;
+  }
+ };
+
+ dlg_display.children[0] = info_dlg;
+ widget_display.scale.x = 0;
+ layout();
+}
+
+
+function widget_insert(widget)
+{
+  /*insert the widget icon*/
+  if (widget.permanent && !widget.is_component)
+    insert_widget_icon(widget, 0);
+    
+  /*and load the widget - comment this line to disable auto load of widget*/
+  widget_launch(widget);
+}
+
+function setup_icons()
+{
+    var icon;
+      
+    //Widgets Icon
+    icon = icon_button('icons/applications-system.svg', 'Available Widgets', 0);
+    icon.button_click = function () {
+     widget_screen_visible = !widget_screen_visible;
+     layout();
+    };
+    dock.children[0] = icon;
+
+    //Get Widget Icon
+    icon = icon_button('icons/document-save.svg', 'Get Widget', 0);
+    icon.button_click = function () {
+     widget_get();
+    };
+    dock.children[1] = icon;
+
+    //Widgets add Icon
+    icon = icon_button('icons/list-add.svg', 'Add Widgets', 0);
+    icon.button_click = function () {
+     widget_browse();
+    };
+    dock.children[2] = icon;
+
+
+    icon = icon_button('icons/user-trash.svg', 'Remove all widgets', 0);
+    icon.button_click = function () {
+      while (1) {
+        var wid = WidgetManager.get(0);
+        if (wid==null) break;
+        widget_close(wid, 1);
+      }
+      widget_screen.children.length = 0;
+      layout();
+    };
+    dock.children[3] = icon;
+
+    //exit Icon
+    icon = icon_button('icons/emblem-unreadable.svg', 'Exit', 0);
+    icon.button_click = function() { gpac.exit(); };
+    dock.children[4] = icon;
+}
+
+
+
+/*dock layout*/
+function dock_layout() {
+  var i;
+      
+  dock.translation.y = (dock_height - display_height)/2;
+  infobar.translation.y = display_height/2 - info_height/2;
+  
+  num_in_dock = dock.children.length;
+  tot_len = num_in_dock*icon_size;
+  
+  if (tot_len>display_width) {
+   start_x = (icon_size-display_width)/2;
+  } else {
+   start_x = (icon_size-tot_len)/2;
+  }
+  /*translate / size all items in the dock*/
+  for (i=0;i<num_in_dock; i++) {
+   dock.children[i].set_size(icon_size, icon_size);
+   dock.children[i].translation.x = start_x + i*icon_size;
+  }
+}
+
+function widget_screen_layout(dir)
+{
+  var count, i, start_x, start_y, spread_x, nb_wid_h, nb_wid_v, nb_wid;
+  
+  if (!widget_screen_visible) {
+    widget_screen.size.x = 0;
+    widget_screen.size.y = 0;
+    return;
+  }
+
+  widget_screen.size.x = display_width;
+  widget_screen.size.y = display_height;
+
+  start_x = (icon_size/2-display_width)/2;
+  start_y = (display_height-icon_size/2)/2 - info_height;
+  start_x = (icon_size-display_width)/2;
+  start_y = (display_height-icon_size)/2 - icon_size/2 - info_height;
+    
+  count = widget_screen.children.length;
+  if (first_visible_widget<0) first_visible_widget=0;
+    
+  for (i=0; i<count; i++) {
+   var wid = widget_screen.children[i];
+   wid.hide();
+  }
+
+  nb_wid_h = Math.floor(display_width / icon_size);
+  if (!nb_wid_h) nb_wid_h=1;
+
+  nb_wid_v = Math.floor((display_height-dock_height-icon_size) / icon_size);
+  if (!nb_wid_v) nb_wid_v=1;
+  
+  spread_x = (display_width / nb_wid_h) - icon_size;
+  start_x += spread_x/2;
+  
+  nb_wid = (nb_wid_h*nb_wid_v);
+  if (dir<0) {
+   first_visible_widget -= nb_wid;
+   if (first_visible_widget < 0) first_visible_widget = 0;
+  }
+  else if (dir>0) {
+   first_visible_widget += nb_wid;
+  }
+  
+  for (i=0; i<count; i++) {
+   var wid;
+   if (i +first_visible_widget >= count) {
+    break;
+   }
+   wid = widget_screen.children[i +first_visible_widget];
+   wid.show();
+   wid.set_size(icon_size, icon_size);
+   wid.translation.x = start_x;
+   wid.translation.y = start_y;
+   start_x += icon_size + spread_x;
+   if (start_x + icon_size / 2 >= display_width/2) {
+    start_x = (icon_size-display_width)/2 + spread_x/2;
+    start_y -= icon_size;
+   }
+   nb_widgets_on_screen = i+1;
+   if (start_y - icon_size < (dock_height-display_height)/2) {
+    i++;
+    break;
+   }
+  }
+}
+
+//performs layout on all contents
+function layout() {
+  var i, list, start_x;
+
+  gpac.set_option('Widgets', 'LastWMWidth', '' + display_width);
+  gpac.set_option('Widgets', 'LastWMHeight', '' + display_height);
+
+
+  if (WidgetManager.num_widgets) {
+    dock.children[0].show();
+  } else {
+    dock.children[0].hide();
+  }
+  if (dlg_display.children.length) {
+    widget_display.scale.x = 0;
+    widget_screen_visible = false;
+  }
+  //layout all icons in the dock
+  dock_layout();
+  widget_screen_layout(0);
+
+  if (dlg_display.children.length) {
+    list = dlg_display.children;
+    for (i=0; i<list.length; i++) {
+     var dlg = list[i];
+     if (typeof (dlg.set_size) != 'undefined') dlg.set_size(display_width, display_height-icon_size-info_height);
+     dlg.translation.y = (icon_size-info_height)/2;
+    }
+  }
+  else if (widget_screen_visible) {
+    widget_display.scale.x = 0;
+  } else {
+    widget_display.scale.x = 1;
+    list = widget_display.children;
+    for (i=0; i<list.length; i++) {
+     var widctrl = list[i];
+     if (widctrl.maximized) {
+      widctrl.translation.y = - info_height;
+      widctrl.set_size(display_width, display_height - 2*info_height);
+     }
+    }
+  }
+}
+
+//resize event callback
+function on_resize(evt) {
+    display_width = evt.width;
+    display_height = evt.height;
+    layout();
+}
+//zoom event callback
+function on_zoom(evt) {
+    display_width = evt.width;
+    display_height = evt.height;
+    layout();
+}
+//scroll event callback
+function on_scroll(evt) {
+  layout();
+}
+
+//starts a widget
+function on_widget_launch() {
+ if (this.widget.visible) {
+  var awid;
+  if (!this.widget.multipleInstances) return;
+  awid = WidgetManager.open(this.widget.manifest, null);
+  widget_launch(awid);
+ } else {
+   widget_launch(this.widget);
+ }
+}
+      
+function widget_get_icon(widget) 
+{
+  var icon = 'icons/process-stop.svg';
+  var preferredIconType = '.svg';
+  for (var i = 0; i < widget.icons.length; i++) {
+      icon = widget.icons[i].relocated_src;
+      if (widget.icons[i].relocated_src.indexOf(preferredIconType) > 0) {
+          break;
+      }
+  }
+ return icon;
+}
+
+//initialize GPAC widget manager and load all widgets
+function widgets_init() {
+    
+    count = WidgetManager.num_widgets;      
+    for (i=0; i<count; i++) {
+     wid = WidgetManager.get(i);
+     if (wid == null) continue;
+     wid.device = null;
+     wid.device_ip = null;
+     if (wid.in_panel == true) {
+       icon = icon_button(widget_get_icon(wid), wid.name, 0);
+       icon.tooltip = wid.name;
+       icon.widget = wid;
+       icon.button_click = on_widget_launch;
+  
+       wid.icon_dock = icon;
+       widget_screen.children[widget_screen.children.length] = wid.icon_dock;
+     }
+     if (wid.visible) {
+      widget_launch(wid);
+     }        
+    }
+}
+
+function on_widget_size(value) {
+  //remember variables
+  this.width = value.x;
+  this.height = value.y;
+  //and set widget input params
+  this.set_input('width', value.x);
+  this.set_input('height', value.y);
+}
+
+function on_widget_move(value) {
+  this.x = value.x;
+  this.y = value.y;
+}
+
+//widget close function
+function widget_close(widget, force_remove) 
+{
+    var is_comp = widget.is_component;
+    if (widget.visible) {
+      widget.visible = false;
+      WidgetManager.corein_message(widget, 'hide');
+      WidgetManager.corein_message(widget, 'deactivate');
+      widget.deactivate();
+      widget.scene_container.removeChildren[0] = widget.widget_control;
+      /*force disconnect of main resource - we do this because we are not sure when the widget_control will be destroyed due to JS GC*/
+      widget.widget_control.inline.url.length = 0;
+    }
+    if (!is_comp && (!widget.permanent || force_remove)) {
+      WidgetManager.unload(widget, false);
+    }
+}
+   
+function on_widget_close(value) {
+    widget_close(this, 0);
+}
+   
+//widget remove function (close and unregister)
+function widget_remove(wid) {
+  if (typeof(wid.icon_dock) != 'undefined')
+    widget_screen.removeChildren[0] = wid.icon_dock;
+  widget_close(wid, 0);
+  layout();
+}
+
+function on_widget_control(value)
+{
+ var i, count;
+ if (!value) return;
+ count = this.scene_container.children.length;
+ for (i=0; i<count; i++) {
+  if (this.scene_container.children[i] == this.widget_control) {
+   this.scene_container.removeChildren[0] = this.widget_control;
+   this.scene_container.children[this.scene_container.children.length] = this.widget_control;
+   return;
+  }
+ }
+}
+
+//widget launcher function
+function widget_launch(wid) {
+    var widg_ctrl;
+
+   //assign default size to the widget
+   if (wid.width == undefined) {
+    wid.width = wid.defaultWidth;
+    if (wid.width == 0) wid.width = widget_default_size;
+   }
+   if (wid.height == undefined) {
+    wid.height = wid.defaultHeight;
+    if (wid.height == 0) wid.height = widget_default_size;
+   }
+   if (wid.x== undefined) wid.x = 0;
+   if (wid.y== undefined) wid.y = 0;
+
+   widg_ctrl = new_widget_control(wid);
+   widg_ctrl.component_bound = false;
+
+   wid.visible = true;
+
+   widg_ctrl.set_size(wid.width, wid.height);
+   widg_ctrl.translation.x = wid.x;
+   widg_ctrl.translation.y = wid.y;
+    
+   wid.widget_control = widg_ctrl;
+   wid.scene_container = widget_display;
+
+   widg_ctrl.show_remove( (!wid.discardable && wid.icon_dock) ? 1 : 0);
+
+   widg_ctrl.sub_width = 0;
+   widg_ctrl.sub_height = 0;
+   widg_ctrl.sub_x = 0;
+   widg_ctrl.sub_y = 0;
+   widg_ctrl.sub_vp_w = 0;
+   widg_ctrl.sub_vp_h = 0;
+
+   widg_ctrl.inline.addEventListener('gpac_vp_changed', 
+                                  function(evt) { 
+                                   widg_ctrl.sub_vp_w = evt.width;
+                                   widg_ctrl.sub_vp_h = evt.height;
+                                   widg_ctrl.sub_vp_x = evt.offset_x;
+                                   widg_ctrl.sub_vp_y = evt.offset_y;
+                                   widg_ctrl.sub_w = evt.vp_width;
+                                   widg_ctrl.sub_h = evt.vp_height;
+                                   widg_ctrl.refresh_layout(true, null);
+                                  }, 
+                                0);
+    
+   /*this will setup the scene graph for the widget in order to filter input and output communication pins*/
+   wid.activate(widg_ctrl.inline);
+
+   widg_ctrl.inline.url[0] = wid.main;
+   widget_display.addChildren[0] = widg_ctrl;
+
+    /*send notifications once the widget scene is loaded*/
+    wid.on_load = function () {
+      WidgetManager.corein_message(this, 'activate');
+      WidgetManager.corein_message(this, 'show');
+      WidgetManager.corein_message(this, 'setSize', 'width', 50, 'height', 50, 'dpi', 96);
+    };
+
+  if (widget_screen_visible) {
+   widget_screen_visible = 0;
+   layout();
+  }
+    //
+    if (log_level > l_inf) {
+        var i = 0;
+        alert(">>>>>>>>>>>>> "+wid.name+" interfaces:");
+        for (;i < wid.num_interfaces; i++) {
+            alert(""+wid.get_interface(i).type);
+        }
+    }
+    //
+}
+
+
+//core out install widget implementation JCD
+function widget_install_widget(widget, args)
+{
+    var uri = args[0], j;
+    var count = WidgetManager.num_widgets;
+    for (j=0; j<count; j++) {
+        var wid = WidgetManager.get(j);
+        if (wid.url==uri) break;
+    }
+    if (j==count) {
+        new_wid = WidgetManager.open(uri, null);
+        if (new_wid!=null) {
+            insert_widget_icon(new_wid, 1);
+        }
+    }
+}
+
+//core out migrate component implementation JCD
+function widget_migrate_component(widget, args)
+{
+    if (has_upnp && UPnP.MediaRenderersCount) {
+        widget_remote_candidate = widget.get_component(args[0]);
+        if (widget_remote_candidate==null) {
+         log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
+         return;
+        }
+        if (args.length > 1 && args[1] != null) {
+            var render = WidgetManager.MPEGUStandardServiceProviders[parseInt(args[1])];
+            WidgetManager.migrate_widget(render, widget_remote_candidate);
+            widget_close(widget_remote_candidate, 0);
+            widget_remote_candidate = null;
+        } else {
+            on_upnpopen();
+        }
+    }
+}
+
+// core out request migration targets JCD
+function widget_request_migration_targets(wid, args)
+{
+    var count = WidgetManager.MPEGUStandardServiceProviders.length,
+        codes = new Array(), names = new Array(), descriptions = new Array(), i;
+    for (i = 0; i < count; i++) {
+        var render = WidgetManager.MPEGUStandardServiceProviders[i];
+        codes.push(""+i);
+        names.push(render.Name);
+        descriptions.push(render.HostName +" "+ render.UUID);
+    }
+    i = null;
+    var ifce_count = wid.num_interfaces, j;
+    for (j = 0; j < ifce_count; j++) {
+        var ifce = wid.get_interface(j);
+        if (ifce.type == "urn:mpeg:mpegu:schema:widgets:core:out:2010") {
+            i = ifce;
+            break;
+        }
+    }
+    if (i != null) {
+        wmjs_core_out_invoke_reply(coreOut.requestMigrationTargetsMessage, i.get_message("requestMigrationTargets"),
+                wid, codes, names, descriptions);
+    }
+
+}
+
+function widget_request_size(widget, args)
+{
+  if (args.length==2) {
+   w = (typeof args[0] == 'string') ? parseInt(args[0]) : args[0];
+   h = (typeof args[1] == 'string') ? parseInt(args[1]) : args[1];
+   widget.widget_control.set_size(w, h);
+  }
+}
+
+function widget_request_show(widget, args)
+{
+ widget.widget_control.show();
+}
+
+function widget_request_hide(widget, args)
+{
+ widget.widget_control.hide();
+}
+
+function widget_request_activate(widget, args)
+{
+ if (!widget.visible)
+  widget_launch(widget);
+}
+
+function widget_request_deactivate(widget, args)
+{
+ if (widget.visible)
+  widget_close(widget, 0);
+}
+
+function widget_request_attention(widget, args)
+{
+ if (widget.visible) {
+  widget_display.removeChildren[0] = widget.widget_control;
+  widget_display.addChildren[0] = widget.widget_control;
+  widget.widget_control.flash();
+ }
+}
+
+function widget_request_notification(widget, args)
+{
+ var notif = text_rect('');
+ notif.children[1].geometry.string[0] = 'Notification from widget';
+ notif.children[1].geometry.string[1] = ' '+widget.name;
+ notif.children[1].geometry.string[2] = ' ';
+ notif.children[1].geometry.string[3] = args[0];
+ dlg_display.children[0] = notif;
+ notif.set_size(320, 240);
+ notif.button_click = function() {
+  dlg_display.removeChildren[0] = this;
+ } 
+}
+
+function widget_place_component(widget, args)
+{
+ var comp = widget.get_component(args[0]);
+ 
+ if (comp==null) {
+  log(l_err, 'Component '+args[0]+' cannot be found in widget '+widget.name);
+  return;
+ }
+ comp.widget_control.place_x = args[1];
+ comp.widget_control.place_y = args[2];
+ comp.widget_control.place_w = args[3];
+ comp.widget_control.place_h = args[4];
+ comp.widget_control.place_z = args[5];
+ comp.widget_control.component_bound = true;
+ widget.widget_control.refresh_layout(false, comp);
+}
+
+ 
+     
+function insert_widget_icon(new_wid, no_layout) {
+ var icon;
+ icon = icon_button(widget_get_icon(new_wid), new_wid.name, 0);
+ icon.tooltip = new_wid.name;
+ new_wid.in_panel = true;
+ new_wid.visible = false;
+ new_wid.icon_dock = icon;
+ icon.button_click = on_widget_launch;
+ icon.widget = new_wid;
+ widget_screen.addChildren[0] = new_wid.icon_dock; 
+ if (!no_layout) layout();    
+}
+
+function scan_directory(dir)
+{
+  var i, j, count, list, new_wid, uri;
+  list = gpac.enum_directory(dir, '.xml;.wgt;.mgt', 0);
+  for (i=0; i<list.length; i++) {
+   uri = list[i].path + list[i].name;
+   if (list[i].directory) {
+    scan_directory(uri);
+   } else {
+    count = WidgetManager.num_widgets;
+    for (j=0; j<count; j++) {
+     var wid = WidgetManager.get(j);
+     if (wid.url==uri) break;
+    }
+    if (j==count) {
+     new_wid = WidgetManager.open(uri, null);
+     if (new_wid!=null) {
+      insert_widget_icon(new_wid, 1);
+     }
+    }
+   }
+  }
+}
+
+function widget_browse()
+{
+  filebrowse = new SFNode('Transform2D');
+  infobar.set_label('Select widget');
+  dlg_display.children[0] = filebrowse;
+  
+  filebrowse.children[0] = icon_button('icons/emblem-unreadable.svg', 'Close', 0);
+  filebrowse.children[0].button_click = function() {
+   dlg_display.children.length = 0;
+   widget_display.scale.x = 1;
+   layout();
+  }
+  
+  filebrowse.children[1] = icon_button('icons/go-previous.svg', 'Previous', 0);
+  filebrowse.children[1].filebrowse = filebrowse;
+  filebrowse.children[1].button_click = function () { this.filebrowse.layout(0) };
+  
+  filebrowse.children[2] = icon_button('icons/go-next.svg', 'Next', 0);
+  filebrowse.children[2].filebrowse = filebrowse;
+  filebrowse.children[2].button_click = function () { this.filebrowse.layout(1) };
+  
+  filebrowse.children[3] = icon_button('icons/go-up.svg', 'Up', 0);
+  filebrowse.children[3].filebrowse = filebrowse;
+  filebrowse.children[3].button_click = function () { this.filebrowse.browse(true) };
+  
+  filebrowse.children[4] = icon_button('icons/Folder.svg', 'Scan Directory', 0);
+  filebrowse.children[4].filebrowse = filebrowse;
+  filebrowse.children[4].button_click = function () {
+   scan_directory(this.filebrowse.directory);
+   WidgetManager.last_widget_dir = this.filebrowse.directory;
+   dlg_display.children.length = 0;
+   widget_display.scale.x = 0;
+   widget_screen_visible = true;
+   layout();
+  }
+  filebrowse.children[5] = text_label('', 'BEGIN');
+  filebrowse.set_label = function(label) {
+    filebrowse.children[5].set_label(label);
+  }
+  filebrowse.nb_tools = filebrowse.children.length;
+
+  filebrowse.browse = function(go_up) {
+   this.list = gpac.enum_directory(this.directory, '*.xml;*.wgt;*.mgt', go_up);
+   if (this.list.length) {
+    this.directory = this.list[0].path;
+    this.set_label(this.directory);
+   } else {
+    this.set_label('');
+   }
+   this.first = 0;
+   this.layout(0);
+  }
+  filebrowse.layout = function(type) {
+   var w, h, i, y;
+   this.children.length = this.nb_tools;
+
+   this.children[1].hide();
+   this.children[2].hide();
+   if (this.directory == '') 
+    this.children[3].hide();
+   else
+    this.children[3].show();
+
+   if (type==0) {
+    this.first -= this.nb_items;
+    if (this.first<0) this.first = 0;
+   }
+   else if (type) {
+    this.first += this.nb_items;
+    if (this.first + this.nb_items > this.list.length) this.first = this.list.length - this.nb_items;
+   }
+   if (this.first) this.children[1].show();
+   if (this.first+this.nb_items < this.list.length) this.children[2].show();
+
+   for (i=0; i<this.nb_items; i++) {
+    var item;
+    if (i+this.first>=this.list.length) break;
+    item = text_rect(this.list[i+this.first].name);
+    item.path = this.list[i+this.first].path;
+    item.name = this.list[i+this.first].name;
+    item.directory = this.list[i+this.first].directory;
+    item.filebrowse = this;
+    item.button_click = function() {
+     if (this.directory) {
+      this.filebrowse.directory = this.path + this.name;
+      this.filebrowse.browse(false);
+     } else {
+      var value = this.path + this.name;
+      dlg_display.children.length = 0;
+      widget_display.scale.x = 1;
+      widget_screen_visible = true;
+      layout();
+
+      var new_wid = WidgetManager.open(value, null);
+      if (new_wid==null) return;
+
+      WidgetManager.last_widget_dir = this.filebrowse.directory;
+      insert_widget_icon(new_wid, 0);
+     }
+    }
+    this.children[this.nb_tools+i] = item;
+   }   
+   this.set_size(this.width, this.height);
+  }
+  
+  
+  filebrowse.set_size = function(w, h) {
+   var i, x, y, isize, nbi;
+   isize = 24;
+   if (w>display_width - isize) w = display_width - isize;
+
+   this.width = w;
+   this.height = h;
+
+   i = 1;
+   while ((i+1)*isize <= h - isize) i++;
+   
+   if (i != this.nb_items) {
+    this.nb_items = i;
+    this.layout(0);
+    return;
+   }
+   x = -w/2 + isize/2;
+   y = h/2 - isize/2;
+
+   for (i=0;i<this.nb_tools;i++) {
+     if (this.nb_tools>i+1) {
+       this.children[i].set_size(isize, isize);
+     }
+     this.children[i].translation.x = x;
+     this.children[i].translation.y = y;
+     x += isize;
+   }
+   y-=isize;
+   while (i<this.children.length) {
+     this.children[i].set_size(w, isize);
+     this.children[i].translation.x = 0;
+     this.children[i].translation.y = y;
+     y-=isize;
+     i++;
+   }
+  }  
+  filebrowse.nb_items = 0;
+  filebrowse.directory = WidgetManager.last_widget_dir;
+  filebrowse.browse(0);
+
+  widget_display.scale.x = 0;
+  layout();
+}
+
+function onMediaRendererAdd(name, uuid, is_add)
+{
+ var i, count;
+
+ count = WidgetManager.num_widgets;
+ for (i=0; i<count; i++) {
+  wid = WidgetManager.get(i);
+  if (wid == null) continue;
+  if (!wid.widget_control) continue;
+  wid.widget_control.show_remote();
+ }
+
+ if (upnp_renders) upnp_renders.refresh();
+}
+
+function on_upnpopen()
+{
+  upnp_renders = new SFNode('Transform2D');
+  upnp_renders.nb_items = 0;
+  upnp_renders.refresh = function () {
+    var i, count, render, item, start_y, w;
+    this.children.length = 0;
+    count = WidgetManager.MPEGUStandardServiceProviders.length;
+    if (count+1>this.nb_items) count = this.nb_items-1;
+
+    item = text_rect('Close');
+    item.button_click = function() {
+     dlg_display.children.length = 0;
+     upnp_renders=null;
+     widget_display.scale.x = 1;
+     infobar.set_label('');
+    }
+    this.children[this.children.length] = item;
+
+    for (i=0; i<count; i++) {
+      render = WidgetManager.MPEGUStandardServiceProviders[i];
+      item = text_rect(render.Name);
+      item.render = render;
+  
+      item.button_click = function() {
+       dlg_display.children.length = 0;
+       upnp_renders=null;
+       widget_display.scale.x = 1;
+       infobar.set_label('');
+  
+       WidgetManager.migrate_widget(this.render, widget_remote_candidate);
+       widget_close(widget_remote_candidate, 0);
+       widget_remote_candidate = null;   
+      }  
+      this.children[this.children.length] = item;
+    }
+    this.set_size(this.width, this.height);
+  }
+
+  upnp_renders.set_size = function (w, h) {
+    var i, count, start_y, w;   
+
+    this.width = w<300 ? w : 300;
+    this.height = h;
+    
+    i = 1;
+    while ((i+1)*icon_size <= h - icon_size) i++;
+    if (i != this.nb_items) {
+      this.nb_items = i;
+      this.refresh();
+      return;
+    }
+    count = this.children.length;
+    start_y = this.height/2 - icon_size - 4;
+    for (i=0; i<count; i++) {
+      this.children[i].set_size(this.width, icon_size);
+      this.children[i].translation.y = start_y;
+      start_y-=icon_size+2;
+    }
+  }
+
+  infobar.set_label('Select remote display');
+  dlg_display.children[0] = upnp_renders;
+  widget_display.scale.x = 0;
+  layout();
+}
+
+
+function onMediaConnect(url, src_ip)
+{
+ if (WidgetManager.probe(url)) {
+  var new_wid = WidgetManager.open(url, src_ip);
+  if (new_wid==null) {
+   return;
+  }
+  widget_insert(new_wid); 
+ }
+}
+
+// widget get: UI for listWidgets and getWidget
+// added by Jean-Claude Dufourd, modeled on filebrowse
+function widget_get() {
+    alert("widget_get");
+    widgetbrowse = new SFNode('Transform2D');
+    infobar.set_label('Select widget manager');
+    dlg_display.children[0] = widgetbrowse;
+
+    widgetbrowse.children[0] = icon_button('icons/emblem-unreadable.svg', 'Close', 0);
+    widgetbrowse.children[0].button_click = function() {
+        dlg_display.children.length = 0;
+        widget_display.scale.x = 1;
+        layout();
+    };
+
+    widgetbrowse.children[1] = text_label('', 'BEGIN');
+    widgetbrowse.set_label = function(label) {
+        widgetbrowse.children[1].set_label(label);
+    };
+
+    widgetbrowse.nb_tools = widgetbrowse.children.length;
+
+    // this function builds the whole UI the first time
+    widgetbrowse.layout = function() {
+        alert("widgetbrowse.layout");
+        var w, h, i, y;
+        this.children.length = this.nb_tools;
+        for (i = 0; i < this.nb_items; i++) {
+            var item;
+            if (i >= this.list.length) {
+                break;
+            }
+            item = text_rect(this.list[i].Name);
+            item.wm = this.list[i];
+            item.widgetbrowse = this;
+            item.button_click = function() {
+                alert("click to select wm: "+this.wm.Name);
+                this.widgetbrowse.wm = this.wm;
+                this.wm.standardService.SetActionListener("listWidgets", get_widget_callback(this.wm, this.widgetbrowse), true);
+                this.wm.standardService.CallAction("listWidgets", new Array());
+            };
+            this.children[this.nb_tools + i] = item;
+        }
+        this.set_size(this.width, this.height);
+    };
+
+    widgetbrowse.set_size = function(w, h) {
+        alert("widgetbrowse.set_size "+w+" "+h);
+        var i, x, y, isize, nbi;
+        isize = 24;
+        if (w > display_width - isize) {
+            w = display_width - isize;
+        }
+        this.width = w;
+        this.height = h;
+        i = 1;
+        while ((i + 1) * isize <= h - isize) {
+            i++;
+        }
+        if (i != this.nb_items) {
+            this.nb_items = i;
+            this.layout(0);
+            return;
+        }
+        x = -w / 2 + isize / 2;
+        y = h / 2 - isize / 2;
+        for (i = 0; i < this.nb_tools; i++) {
+            if (this.nb_tools > i + 1) {
+                this.children[i].set_size(isize, isize);
+            }
+            this.children[i].translation.x = x;
+            this.children[i].translation.y = y;
+            x += isize;
+        }
+        y -= isize;
+        while (i < this.children.length) {
+            this.children[i].set_size(w, isize);
+            this.children[i].translation.x = 0;
+            this.children[i].translation.y = y;
+            y -= isize;
+            i++;
+        }
+    };
+
+    widgetbrowse.nb_items = WidgetManager.MPEGUStandardServiceProviders.length;
+    widgetbrowse.list = WidgetManager.MPEGUStandardServiceProviders;
+    widgetbrowse.set_label('Select Widget Manager');
+    widgetbrowse.layout(0);
+    widget_display.scale.x = 0;
+    layout();
+}
+
+function get_widget_callback(device, widgetbrowse) {
+    alert("get_widget_callback "+device.Name+" "+widgetbrowse);
+    return function() {
+        // msgHandler is the first argument, the next arguments are from the reply to listWidgets
+        var act = arguments[0];
+        var act1 = act.GetArgumentValue("widgetCodes");
+        var act2 = act.GetArgumentValue("widgetNames");
+        alert("callback |"+act1+"| |"+act2+"|");
+        widgetbrowse.set_label("Select Widget");
+        var w, h, i, y;
+        act1 = act1.split(" ");
+        act2 = act2.split(" ");
+        widgetbrowse.children.length = widgetbrowse.nb_tools;
+        for (i = 0; i < act2.length; i++) {
+            if (act1[i]=="" || act2[i]=="") continue;
+            var item = text_rect(act2[i]);
+            item.widgetCode = act1[i];
+            item.widgetName = act2[i];
+            item.widgetbrowse = widgetbrowse;
+            item.button_click = function() {
+                alert("selected widget: "+this.widgetName);
+                dlg_display.children.length = 0;
+                widget_display.scale.x = 1;
+                widget_screen_visible = true;
+                layout();
+                var arr = new Array();
+                arr[0] = "widgetCode";
+                arr[1] = this.widgetCode;
+                this.widgetbrowse.wm.standardService.SetActionListener("getWidget", get_widget_callback2, true);
+                this.widgetbrowse.wm.standardService.CallAction("getWidget", arr);
+            };
+            widgetbrowse.children[this.nb_tools + i] = item;
+        }
+        widgetbrowse.set_size(widgetbrowse.width, widgetbrowse.height);
+    }
+}
+
+function get_widget_callback2() {
+    // msgHandler is the first argument, the next arguments are from the reply to listWidgets
+    alert("callback2-1");
+    var act = arguments[0];
+    var act1 = act.GetArgumentValue("widgetUrl");
+    var act2 = act.GetArgumentValue("widgetContext");
+    alert("callback2-2 " + act1 + " " + act2);
+    var wid = WidgetManager.load(act1, null, act2);
+    WidgetManager.on_widget_add(wid);
+}

gpac-1.0.0.tar.gz/share/gui/mpegu-wm.xmt Added

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<XMT-A xmlns="urn:mpeg:mpeg4:xmta:schema:2002" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:mpeg:mpeg4:xmta:schema:2002 xmt-a.xsd">
+ <Header>
+ </Header>
+ <Body>
+  <Replace>
+   <Scene>
+       
+    <ProtoDeclare name="Untransform" protoID="1" locations="&quot;urn:inet:gpac:builtin:Untransform&quot;">
+     <field name="children" type="Nodes" vrml97Hint="exposedField">
+      <nodes/>
+     </field>
+    </ProtoDeclare>
+   
+    
+    <OrderedGroup DEF="GPAC_UI">
+     <children>
+      <Background2D backColor="1 1 1"/>
+      <ProtoInstance name="Untransform" DEF="UI_ROOT"/>
+      <Script DEF="GUIScript" url="mpegu-wm.js">
+       <field name="root" type="Node" vrml97Hint="field">
+        <node>
+         <OrderedGroup USE="GPAC_UI"/>
+        </node>
+       </field>
+       <field name="ui_root" type="Node" vrml97Hint="field">
+        <node>
+         <ProtoInstance name="Untransform" USE="UI_ROOT"/>
+        </node>
+       </field>
+      </Script>
+     </children>
+    </OrderedGroup>
+   </Scene>
+  </Replace>
+ </Body>
+</XMT-A>

gpac-1.0.0.tar.gz/share/gui/tv_wm_gui.js Changed

gpac-1.0.0.tar.gz/share/gui/tv_wm_gui.svg Changed

gpac-1.0.0.tar.gz/share/lang Added

gpac-1.0.0.tar.gz/share/lang/fr.txt Added

@@ -0,0 +1,2440 @@
+[gpac]
+mem-track=active le suivi de mémoire
+mem-track_crc=3153737396
+mem-track-stack= active le suivi de mémoire avec analyse de la pile
+mem-track-stack_crc=335838253
+p=utilise le profil indiqué pour la configuration globale de GPAC. Si non trouvé, un fichier de configuration est créé. Si un chemin de fichier est indiqué, le profil est charger à partir de ce fichier
+p_crc=3615791768
+ltf=active les filtres unitaires de tests (utilisés uniquement pour les tests unitaires)
+ltf_crc=2218501803
+loop=boucle l'exécution de la session, créant une session à chaque boucle (principalement utilisée pour les tests). Si aucune valeur n'est donnée, boucle pour toujours
+loop_crc=2404405591
+wp=écrit toutes les options de filtres dans le fichier de configuration
+wp_crc=2059005166
+wpx=écrit toutes les options de filtres et tous les arguments de méta-filtres dans le fichier de configuration (fichier de configuration volumineux!)
+wpx_crc=2002959884
+stats=affiche les statistiques après exécution. Les statistiques peuvent être visualisées à l'exécution en tapant 's' dans l'invite.
+stats_crc=247941264
+graph=affiche le graphe après exécution. Le graphique peut être visualisé à l'exécution en tapant 'g' dans l'invite
+graph_crc=4042996408
+seps=@définit les jeux de caractères par défaut utilisés pour séparer différents arguments.
+	Le premier caractère est utilisé pour séparer les noms d'arguments
+	Le deuxième caractère, s'il est présent, est utilisé pour séparer les noms et les valeurs
+	Le troisième caractère, s'il est présent, est utilisé pour séparer les fragments des sources pid
+	Le quatrième caractère, s'il est présent, est utilisé pour les séparateurs de liste (sourceIDs, gfreg, ...)
+	Le cinquième caractère, s'il est présent, est utilisé pour la négation booléenne
+	Le sixième caractère, s'il existe, est utilisé pour les directives LINK (cf -h doc)@
+seps_crc=3475228674
+i=spécifie un fichier d'entrée - voir la documentation générale -h doc
+i_crc=1595699293
+o=spécifie un fichier de sortie - voir la documentation générale -h doc
+o_crc=3724167134
+h=@affiche l'aide. Par défaut, seules les options de base sont imprimées. -ha affiche les options avancées, -hx imprime les options expertes et -hh imprime toutes les options. Le paramètre de chaîne peut être:
+	vide: affiche l'aide de base de la ligne de commande.
+	doc: affiche les informations générales sur le filtre.
+	log: affiche l'aide du système de journalisation.
+	core: affiche les options de base de libgpac supportées. Utilisez -ha / -hx / -hh pour les options en mode avancé / expert / complet.
+	filtres: affiche le nom de tous les filtres disponibles.
+	filtres: *: affiche le nom de tous les filtres disponibles, y compris les méta-filtres.
+	codecs: affiche les codecs pris en charge.
+	props: affiche les propriétés de pid intégrées prises en charge.
+	links: affiche les connexions possibles entre chaque filtre.
+	FNAME: imprime les informations de filtre FNAME (plusieurs FNAME peuvent être spécifiés). Pour les méta-filtres, utilisez FNAME: INST, par exemple ffavin: avfoundation. Utilisez * pour imprimer des informations sur tous les filtres (avertissement, grande sortie!), *: * Pour imprimer des informations sur tous les filtres, y compris les instances de méta filtres (avertissement, grande sortie!). Par défaut, seules les options de filtre de base et la description sont affichées. Utilisez -ha pour afficher les options avancées et filtrer les capacités d'E / S, -hx pour les options expertes, -hh pour toutes les options@
+h_crc=4136223486
+doc=@Aide de l'outil en ligne de commande de GPAC pour la mise en place et l'execution de chaînes de filtres.
+Voir -h pour les options disponibles.
+
+Général
+
+Les filtres dans GPAC sont des unités de traitement configurables consommant et produisant des paquets de données. Ces paquets sont acheminés entre les filtres via un canal de données appelé pid.
+Un pid est responsable de l'allocation / suivi des paquets de données et du passage des paquets au(x) filtre(s) de destination.
+Un pid de sortie de filtre peut être connecté à zéro ou plusieurs filtres. Une connexion multiple en sortie est gérée en interne par le moteur de filtres (pas besoin de filter spécifique pour cela dans GPAC).
+Lorsqu'un pid ne peut être connecté à aucun filtre, un avertissement est émis et tous les paquets envoyés sur ce pid seront immédiatement détruits. La session peut toutefois encore être exécutée.
+Chaque pid en sortie porte un ensemble de propriétés décrivant les données qu'il fournit (par exemple, largeur, hauteur, codec, ...).
+Les propriétés peuvent être intégrées (identifiées par un code à 4 caractères dans GPAC) ou définies par l'utilisateur (identifiées par une chaîne).
+Chaque pid suit ses modifications de propriétés et déclenche la reconfiguration du filtre lors du traitement des paquets.
+Cela permet à la chaîne de filtres d'être reconfigurée au moment de l'exécution, ce qui permet de recharger une partie de la chaîne (par exemple, décharger un décodeur vidéo lors du passage de sources compressées à des sources non compressées).
+Chaque filtre expose un ou plusieurs ensembles de fonctionnalités, appelés ensembles de fonctionnalités, qui sont un type de propriété et des valeurs qui doivent être mises en correspondance ou exclues dans les connexions pid.
+Chaque filtre expose également un ensemble d'arguments à configurer, à l'aide de types de propriété et de chaîne de charactères.
+
+Cette aide est fournie avec les séparateurs par défaut :=#,@ pour spécifier les filtres, les propriétés et les options. Voir -seps pour les changer.
+
+Format des propriétés de PID
+
+Les propriétés booléennes sont au format yes/true/1 ou no/false/0
+Les propriétés d'énumération (pour les arguments) doivent utiliser la syntaxe donnée dans la description de l'argument, sinon la valeur 0 (première de l'énumération) est prise en compte.
+Les propriétés à 1 dimension (nombres, flottants, entiers ...) sont formatées en valeur[unité], où unité peut être k/K (x1000) ou m/M (x1000000) ou g/G (x1000000000).
+Pour de telles propriétés, valeur +I signifie valeur maximale possible, -I valeur minimale possible.
+Les propriétés des fractions sont au format num/den ou num-den ou num, auquel cas le dénominateur est 1.
+Les propriétés d'entier 32 bits non signées peuvent être spécifiées en hexadécimal au format 0xAABBCCDD.
+Les propriétés de dimension N (vecteurs) sont au format DIM1xDIM2 [xDIM3 [xDIM4]], sans multiplicateur.
+Les propriétés de données sont formatées comme suit:
+"taille@adresse": bloc de données constant, non copié en interne; taille donne la taille du bloc, adresse le pointeur de données.
+"0xBYTESTRING": bloc de données spécifié en hexadécimal, copié en interne.
+Les propriétés du pointeur sont au format "adresse", adresse donnant l'adresse du pointeur (32 ou 64 bits selon les plateformes).
+Les listes de chaînes et d'entiers sont formatées comme suit: val1, val2 [, ...]
+
+Remarque: Les caractères spéciaux dans les formats de propriété (0x, /, -, + I, -I, x) ne peuvent pas être configurés.
+
+Déclaration de filtre [FILTER_DECL]
+
+Les filtres sont répertoriés par nom, avec les options ajoutées sous forme de liste de paires Nom = Valeur séparées par des deux-points.
+La valeur peut être omise pour les booléens, la valeur par défaut étant true (par exemple, noedit). Utiliser '!' Avant le nom, annule le résultat (par exemple: !moof_first)
+Le nom peut être omis pour les énumérations (par exemple :disp=pbo est équivalent à :pbo), à condition que les développeurs de filtres fassent attention à ne pas réutiliser les noms d'énumérations dans un même filtre!
+
+Lorsque des paramètres textes sont utilisés (par exemple, des URL), il est recommandé d'utiliser le mot-clé "gpac" pour séparer les arguments.
+EX: filtre: ARG=http://foo/bar?yes:gpac:opt=VAL
+Cela permettra d'extraire correctement l'URL
+EX: filtre: ARG=http://foo/bar?yes:opt=VAL
+Cela ne parviendra pas à l'extraire l'option et conservera :opt=VAL dans l'URL
+Remarque: le mécanisme d'échappement n'est pas nécessaire pour les sources locales, pour lesquelles l'existence du fichier est recherchée lors de l'analyse des arguments
+Il n'est également pas nécessaire pour les procotoles intégrés (avin://, video://, audio://, pipe://)
+Pour les protocoles tcp:// et udp://, l'échappement n'est pas nécessaire si un / final est ajouté après le port
+EX: -i tcp: //127.0.0.1: 1234:OPT
+Cela n'arrivera pas à extraire l'URL et les options
+EX: -i tcp: //127.0.0.1: 1234/:OPT
+Cela va extraire l'URL et les options
+Remarque: une astuce pour éviter la séquence d'échappement consiste à déclarer l'option urls à la fin, par exemple, f1:opt1=foo:url=http:// bar, à condition que vous n'ayez qu'une seule URL. Voir les arguments héritant ci-dessous.
+
+Les filtres source et destination n'ont pas besoin d'être adressés par le nom du filtre, il suffit de spécifier src= ou dst=.
+Vous pouvez également utiliser la syntaxe -src URL ou -i URL pour les sources et -dst URL ou -o URL pour les destinations.
+Cela permet d'utiliser la complétion automatique de votre invite de commande.
+EX: src=fichier.mp4 EX: -src fichier.mp4 EX: -i fichier.mp4
+Ceci trouvera un filtre (par exemple "fin") capable de charger fichier.mp4
+Le même résultat peut être obtenu en utilisant "fin:src=fichier.mp4"
+EX: src=fichier.mp4 dst=dump.yuv
+Cela décodera le contenu vidéo de file.mp4 et l'écrira dans dump.yuv
+Des filtres source ou destination spécifiques peuvent également être spécifiés à l'aide de filterName:src=URL ou filterName:dst=URL.
+
+Il existe une option spéciale appelée "gfreg" qui permet de spécifier les filtres à utiliser lors de la gestion des URL.
+EX: src=fichier.mp4:gfreg=ffdmx,ffdec
+Cela utilisera ffdmx pour gérer le fichier et ffdec pour décoder
+Cela peut être utilisé pour tester un filtre spécifique lorsque d'autres chaînes de filtres sont possibles.
+
+Par défaut, la chaîne de filtres sera résolue sans décodage / encodage si la destination accepte le format souhaité. Sinon, les décodeurs / encodeurs seront chargés dynamiquement pour effectuer la conversion, à moins que la résolution dynamique ne soit désactivée. Il existe un nom de filtre spécial pour les encodeurs, "enc", permettant de charger un filtre fournissant le codage souhaité. Les paramètres pour "enc" sont:
+c=NAME identifie le codec souhaité. NOM peut être le nom du codec gpac ou l'instance du codeur pour ffmpeg ...
+b=UINT ou débit=UINT ou débit=UINT indique le débit en bits par seconde
+g=UINT ou gop=UINT indique la taille du groupe d'images dans les cadres
+pfmt=4CC indique le format de pixel cible de la source, si supporté par le codec
+all_intra=BOOL indique que toutes les images doivent être intra-images, si supporté par le codec
+D'autres options peuvent être transmises aux filtres acceptant des arguments génériques (comme c'est le cas pour ffmpeg).
+EX: src=dump.yuv:size=320x240:fps=25 enc:c=avc:b=150000:g=50:cgop=true:fast=true dst=raw.264
+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
+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]
+
+Le lien entre les filtres peut être spécifié manuellement. La syntaxe est un caractère '@' optionnellement suivi d'un entier (0 si omis).
+Cela indique quels filtres spécifiés antérieurement (le précédent étant associé à 0) doivent être liés au prochain filtre indiqué.
+Seule la dernière directive de liaison avant un filtre est utilisée pour configurer des liens pour ce filtre.
+EX: fA fB @1 fC
+Ceci indique de diriger les sorties fA vers fC
+EX: fA fB @1 @0 fC
+Cela indique de diriger les sorties du fB vers le fC, @1 est ignoré
+
+Si aucune directive de lien n'est donnée, les liens seront résolus dynamiquement pour générer autant de connexions que possible.
+Par exemple, "fA fB fC" peut connecter fA à fB et fC si fB et fC acceptent les sorties fA
+
+La directive LINK est juste un raccourci rapide pour définir des arguments de filtre génériques:
+- FID=nom, qui définit l'ID de filtre
+- SID=nom1[,nom2...], qui définit les ID sources restreignant la liste des entrées possibles pour un filtre.
+
+EX: fA fB @1 fC
+Ceci est équivalent à "fA fB:FID=1 fC:SID=1"
+EX: fA: FID = 1 fB fC: SID = 1
+Ceci indique de diriger les sorties fA vers fC
+EX: fA:FID=1 fB:FID=2 fC:SID=1 fD:SID=1,2
+Cela indique de diriger les sorties fA vers fC et les sorties fA et fB vers fD
+
+REMARQUE: Un filtre avec ID source défini ne peut pas être connecté en entrée de filtres sans ID.
+Le nom peut être étendu à l'aide de l'identifiant de fragment (# par défaut):
+name#PIDNAME: accepte uniquement les pids nommés PIDNAME.
+name#TYPE: accepte uniquement les pids du type média correspondant. TYPE peut être 'audio' 'video' 'scene' 'text' 'font'
+name#TYPEN: accepte uniquement le Nème pid du type média correspondant.
+name#P4CC=VAL: accepte uniquement les pids dont la propriété prédéfinie avec le code donné vaut VAL.
+name#PName=VAL: comme ci-dessus, en utilisant le nom d'une propriété prédéfinie.
+name#AnyName=VAL: comme ci-dessus, en utilisant le nom d'une propriété non prédéfinie.
+
+Si la propriété n'est pas définie sur le pid, elle est considérée comme valide. Sinon, sa valeur est vérifiée par rapport à la valeur donnée.
+
+Les modificateurs suivants pour les comparaisons sont autorisés (pour P4CC=, PName= et AnyName=):
+nom#P4CC=!VAL: accepte uniquement les pids dont la propriété ne correspond pas à VAL.
+nom#P4CC-VAL: accepte uniquement les pids dont la propriété est strictement inférieure à VAL (uniquement pour les propriétés à 1 dimension).
+nom#P4CC+VAL: accepte uniquement les pids avec une propriété strictement supérieure à VAL (uniquement pour les propriétés à 1 dimension).
+
+Un ID source peut aussi utiliser le charactère * pour faire correspondre une ou plusieurs propriétés, quel que soit le filtre source:\n"
+EX: fA fB:SID=*#ServiceID=2
+Ceci indique fB n'accepte comme entrée que des pids avec une propriété ServiceID égale à 2, indépendemment des identifiant de filtres de ces pids.
+
+REMARQUE: Ces extensions fonctionnent également avec le raccourci LINK:
+EX: fA fB @1#video fC
+Ceci indique de diriger les sorties vidéo fA vers fC
+
+EX: src=img.heif @#ItemID=200 vout
+Cela indique de connecter à vout uniquement les pids avec une propriété ItemID égale à 200.
+EX: src=vid.mp4 @#PID=1 vout
+Cela indique de connecter à vout uniquement les pids avec une propriété ID égale à 1.
+EX: src=vid.mp4 @#Width=640 vout
+Cela indique de connecter à vout uniquement les pids avec une propriété Width égale à 640.
+EX: src=vid.mp4 @#Width-640 vout
+Cela indique de connecter à vout uniquement les pids dont la propriété Width est inférieure à 640.
+
+Plusieurs fragments peuvent être spécifiés pour tester plusieurs propriétés de pid
+EX: src=vid.mp4 @#Width=640#Height+380 vout
+Cela indique de connecter à vout uniquement les pids avec une largeur égale à 640 et une hauteur supérieure à 380.
+
+Notez que si un pid est connecté à un filtre chargé explicitement, aucune résolution de lien dynamique supplémentaire ne sera effectuée pour le connecter à d'autres filtres. Les directives de liaison doivent être soigneusement établies
+EX: src=fichier.mp4 @ reframer dst=dump.mp4
+Cela connectera le pid src (type fichier) à dst (type fichier) car dst n'a pas de sourceID et acceptera donc l'entrée de src. Comme le pid est connecté, le moteur de filtres n'essaiera pas de résoudre le lien entre src et reframer. Le résultat est une copie directe du fichier source, le reframer étant inutilisé
+EX: src=fichier.mp4 reframer @ dst=dump.mp4
+Cela forcera dst à n'accepter que les pids de reframer, un multiplexeur sera chargé pour résoudre ce lien et src pid sera connecté à reframer (aucun ID de source), chargeant un démultiplexeur pour résoudre le lien. Le résultat est un remux complet du fichier source
+
+
+Héritage d'arguments
+
+Sauf si explicitement désactivé (option -max-chain), le moteur de filtres résoudra les connexions implicites ou explicites (LINK) entre les filtres et allouera toute chaîne de filtres intermédiaires nécessaires à la connexion des filtres. Ce faisant, il charge de nouveaux filtres avec des arguments hérités à la fois de la source et de la destination.
+EX: src=fichier.mp4:OPT dst=fichier.aac dst=fichier.264
+Ceci passera les arguments ":OPT" à tous les filtres chargés entre la source et les deux destinations
+EX: src=fichier.mp4 dst=fichier.aac:OPT dst=fichier.264
+Cela passera les arguments ":OPT" à tous les filtres chargés entre la source et la destination file.aac
+REMARQUE: les arguments de destination hérités sont les arguments placés APRÈS l'option dst=
+EX: src=fichier.mp4 fout:OPTFOO:dst=fichier.aac:OPTBAR
+Cela passera les arguments ":OPTBAR" à tous les filtres chargés entre la source et la destination file.aac, mais pas ":OPTFOO"
+
+Modèles d'URL de destination
+
+Les URL de destination peuvent être modélisées en utilisant le même mécanisme que MPEG-DASH (template ou modèles):
+$KEYWORD$ est remplacé dans le modèle par la valeur résolue,
+$KEYWORD%%0Nd $ est remplacé dans le modèle par l'entier résolu, complété avec N zéros si nécessaire,
+$$ est un méchanisme d'échappement pour $
+
+KEYWORD peut être présent plusieurs fois dans la chaîne. KEYWORD pris en charge (!! sensible à la casse !!):
+num: remplacé par numéro de fichier si défini, 0 sinon
+PID: ID du pid source
+URL: URL du fichier source
+File: chemin sur le disque pour le fichier source
+p4cc=ABCD: utilise la propriété du pid avec le code 4CC ABCD
+pname=VAL: utilise la propriété du pid avec le nom VAL
+AUTRE: utilise la propriété du pid dont le nom correspond au nom donné (résolution de 4CC ou nom donné si aucune correspondance 4CC).
+
+L'utilisation de modèles d'URL peut être utile lors du codage de plusieurs qualités en une seule passe:
+EX: src=dump.yuv:taille=640x360 vcrop:wnd=0x0x320x180 enc:c=avc:b=1M @2 enc:c=avc:b=750k dst=dump_$CropOrigin$x$Width$x$Height$.264
+Cela créera une version recadrée de la source, codée en AVC à 1M et une version non recadrée en AVC à 750 Ko. Les sorties sont dump_0x0x320x180.264 pour la version recadrée et dump_0x0x640x360.264 pour la version non recadrée.
+
+Duplication de filtres
+
+Lorsqu'un filtre accepte une seule connexion et possède une entrée connectée, la résolution dynamique n'est plus possible pour cette destination. Il peut y avoir des cas où ce comportement est indésirable. Soit un fichier HEIF avec N items:
+EX: src=img.heif dst=dump_$ItemID$.jpg
+Dans ce cas, un seul item (probablement le premier déclaré dans le fichier) se connectera à la destination.
+Les autres items ne seront pas connectés car la destination n'accepte qu'un seul pid d'entrée.
+Il existe une option spéciale "clone" permettant de cloner les filtres de destination avec les mêmes arguments:
+EX: src=img.heif dst=dump_$ItemID$.jpg:clone
+Dans ce cas, la destination sera clonée pour chaque item et tous seront exportés vers différents fichiers JPEG grâce au modèle d'URL.
+
+Modèles de chaînes de filtres
+
+Dans certains cas, le nombre de sorties désirées dépend de la source; par exemple, extraire N fichiers d'un multiplex de N services.
+Il est possible d'utiliser un nom de propriété de pid dans l'ID source d'un filtre avec la valeur '*'.
+Dans ce cas, chaque fois qu'un nouveau PID avec une nouvelle valeur pour la propriété est trouvé, le filtre avec un tel ID source sera automatiquement cloné.
+EX: src=source.ts dst=fichier_$ServiceID$.mp4:SID=*#ServiceID=*
+Dans cet example, chaque nouvelle valeur ServiceID trouvée lors de la connexion des PID à la destination créera un nouveau fichier de destination.
+AVERTISSEMENT: cette fonctionnalité ne doit être utilisée qu'avec une seule propriétéà '*' par ID source, les résultats ne sont pas définis sinon.
+
+Assigner des propriétés aux PID
+
+Il est possible de définir des propriétés sur des pids de sortie déclarés par un filtre. Cela permet de marquer des parties du graphe avec des propriétés différentes de celles des autres parties (par exemple, ServiceID). La syntaxe utilise le séparateur de fragments pour identifier les propriétés, par exemple #Nom=Valeur, afin de définir la propriété voulue (4cc, nom intégré ou tout nom) avec une valeur donnée.
+Si une propriété non prédéfinie est utilisée, la valeur sera définie sous forme de chaîne.
+AVERTISSEMENT: les propriétés ne sont pas filtrées et remplacent les propriétés source. Veillez à ne pas corrompre la session en substituant des propriétés essentielles telles que Width, Height, SampleRate !
+EX: -i v1.mp4:# ServiceID=4 -i v2.mp4:# ServiceID=2 -o dump.ts
+Cela multiplexera les flux dans dump.ts, en utilisant ServiceID 4 pour les pids de v1.mp4 et ServiceID 2 pour les pids de v2.mp4.
+
+Filtres externes
+
+GPAC est fourni avec un ensemble de filtres intégrés à libgpac. Il peut également charger des filtres externes dans des bibliothèques dynamiques, situées dans
+les dossiers répertoriés par la clé mod-dirs" dans la section "core" du fichier de configuration GPAC. Les fichiers doivent être nommés gf_* et exporter une seule fonction
+retournant un registre de filtre - voir la documentation de libgpac pour plus de détails.
+@
+doc_crc=1035749621
+[core]
+log-file=définit le fichier journal de sortie
+log-file_crc=4024112903
+log-clock=insert le temps en microsecondes depuis l'heure de démarrage de GPAC avant chaque ligne du journal
+log-clock_crc=1770718812
+log-utc=insert le temps UTC en ms avant chaque ligne du journal
+log-utc_crc=2584821995
+logs=@définit les niveaux d'erreurs et les outils pour la journalisation.
+Les niveux de journalisation peuvent être spécifiés indépendamment par outils impliqués dans une session.
+Le format est une liste de toolX[:toolZ]@levelX, séparés par ':'. levelX peut être l'un des suivants:
+	quiet: ignore les messages
+	error: enregistre uniquement les messages d'erreurs
+	warning: enregistre les messages d'erreurs et d'avertissement
+	info: enregistre les messages d'erreur, d'avertissement et d'information
+	debug: enregistre tous les messages
+toolX peut être l'un des suivants:
+	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
+	author: outils de création (hint, import, export)
+	sync: messages de synchro
+	codec: messages des encodeurs/décodeurs
+	parser: scene parsers (svg, xmt, bt) 
+	media: gestion des objets media dans le compositor
+	scene: arbre de scene et gestionnaire de scene
+	script: scripts
+	interact: interaction (événements, scripts, etc.)
+	smil: moteur de synchronisation SMIL
+	compose: moteur de composition (2D, 3D, etc.)
+	mmio: Gestion Entrées/Sorties matérielles audio et vidéo
+	rti: diverses statistiques d'exécution
+	cache: HTTP cache
+	audio: Rendu audio et mixeurs
+	mem: traqueur de mémoire GPAC
+	dash: HTTP streaming
+	module: GPAC modules (av out, font engine, 2D rasterizer)
+	filter: gestionnaire de filtres
+	sched: ordonnanceur des filtres
+	mutex: mutex calls
+	all: tous les outils enregistrés - d'autres outils peuvent être spécifiés ultérieurement.
+Le mot clé spécial "ncl" peut être défini pour désactiver les couleurs.
+Le mot clé spécial "strict" peut être défini pour quitter à la première erreur.
+	EX: -logs all@info:dash@debug:ncl
+Cela passe tous les outils en niveau information, dash en niveau débogage et désactive les couleurs.@
+logs_crc=3235072836
+noprog=désactive les messages de progression
+noprog_crc=2201226299
+quiet=désactive tous les messages, y compris les erreurs
+quiet_crc=1639470913
+strict-error=quitte après la première erreur signalée
+strict-error_crc=199866164
+store-dir=définit le répertoire de stockage
+store-dir_crc=2166696791
+mod-dirs=définit les répertoires du module
+mod-dirs_crc=1202590521
+ifce=définit l'interface de multicast par défaut via l'adresse IP de l'interface
+ifce_crc=949588258
+lang=définit la langue préférée
+lang_crc=231363827
+cfg=@définit la valeur du fichier de configuration. Le paramètre de chaîne peut être formaté comme suit:
+	section:key=val: définit la clé sur une nouvelle valeur
+	section:key=null or section:key: supprime la clé
+	section:*=null: supprime la section@
+cfg_crc=2886273405
+version=définit la version de GPAC, utilisée pour vérifier l'actualisation du fichier de configuration
+version_crc=4248641509
+64bits=indique si la version GPAC est 64 bits, utilisée pour vérifier l'actualisation du fichier de configuration
+64bits_crc=3330035881
+mod-reload=libère les bibliothèques partagées lors du déchargement d'un module plus utilisé
+mod-reload_crc=1890630922
+mobile-ip=définit l'adresse IP pour mobileIP
+mobile-ip_crc=2363993664
+cache=définit l'emplacement du répertoire de cache
+cache_crc=3096764065
+proxy-on=active le proxy HTTP
+proxy-on_crc=1445819246
+proxy-name=définit l'adresse proxy HTTP
+proxy-name_crc=413963449
+proxy-port=définit le port du proxy HTTP
+proxy-port_crc=4281085677
+maxrate=définit le débit de téléchargement HTTP maximal en bits par seconde. 0 signifie illimité
+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_crc=2358998211
+clean-cache=indique si le cache HTTP doit être propre au lancement / à la sortie
+clean-cache_crc=3957340416
+cache-size=spécifie la taille du cache en octets
+cache-size_crc=3383563296
+head-timeout=définit le délai d'expiration de la requête HTTP en millisecondes
+head-timeout_crc=160271390
+req-timeout=définit le délai d'expiration de la requête HTTP / RTSP en millisecondes
+req-timeout_crc=1825497635
+broken-cert=accepte les certificats SSL cassés
+broken-cert_crc=402885164
+user-agent=définit le nom de l'agent utilisateur pour HTTP / RTSP
+user-agent_crc=4077155122
+user-profileid=définit l'ID du profil utilisateur (via l'entête de l'entité "X-UserProfileID")
+user-profileid_crc=3934422946
+user-profile=définit le nom de fichier du profil utilisateur. Le contenu du fichier est ajouté en tant que corps aux demandes HEAD / GET
+user-profile_crc=2635012117
+query-string=insère la chaîne de requête (sans '?'') dans l'URL des requêtes
+query-string_crc=2502193860
+dbg-edges=enregistre l'état des arêtes dans le graphe de filtre avant la résolution de dijkstra (pour le débogage). Les arêtes sont affichées sous la forme source(status, weight, src_cap_idx, dst_cap_idx)
+dbg-edges_crc=1993009596
+no-block=désactive le mode bloquant des filtres
+no-block_crc=3173249070
+no-reg=désactiver la régulation de temps (pas de veille des threads)
+no-reg_crc=4238392638
+sched=@définir le mode de l'ordonnanceur de filtres. Les modes possibles sont:
+	free: utilise des files d'attente sans mutex, sauf pour la liste des tâches (par défaut)
+	lock: utilise des mutex pour les files d'attente lorsque plusieurs threads
+	freex: utilise des files d'attente sans mutex, y compris pour les listes de tâches (expérimental)
+	flock: utilise des mutex pour les files d'attente même sans thread (mode débogage)
+	direct: pas de threads et éxecution directe des tâches autant que possible (mode débogage)@
+sched_crc=2961967838
+max-chain=définit la longueur maximale de la chaîne lors de la résolution des liens de filtre. La valeur par défaut est prévue pour ([in ->] demux -> reframer -> decoder -> encoder -> unframer -> mux [-> out]. Les chaînes de filtres chargées pour l'adaptation de capabilités (par exemple, changement de format de pixel) sont chargés après la résolution du lien. Définir la valeur sur 0 désactive la résolution du lien dynamique, toute la chaîne doit être spécifiée manuellement
+max-chain_crc=3076294763
+threads=définir N thread supplémentaire pour la session. -1 signifie utiliser tous les cœurs disponibles
+threads_crc=1234876614
+no-probe=désactive l'analyse des données source, l'extension de fichier doit alors être valide
+no-probe_crc=1719555319
+blacklist=liste des filtres à ne pas charger (liste séparée par des virgules)
+blacklist_crc=2069525485
+no-graph-cache=désactive la mise en cache des connexions du graphe de filtre. Si désactivé, le graphe sera recalculé à chaque résolution de lien (moins de mémoire, mais plus lent)
+no-graph-cache_crc=111720336
+switch-vres=sélectionne la résolution d'écran vidéo la plus petite supérieure à la taille de la scène, sinon utilise la résolution vidéo actuelle
+switch-vres_crc=2081476962
+hwvmem=spécifie (moteur de rendu 2D uniquement) si le backbuffer vidéo principal est toujours en mémoire matérielle, en mémoire système ou sélectionné par GPAC (mode par défaut). Selon le type de scène, cela peut modifier considérablement la vitesse d'affichage'.
+hwvmem_crc=3676454290
+vert-shader=spécifie le fichier contenant le vertex shader
+vert-shader_crc=3278130108
+frag-shader=spécifie le fichier contenant le fragment shader
+frag-shader_crc=3278130108
+pref-yuv4cc=définit le YUV 4CC préféré pour les incrustations (utilisé par DirectX uniquement)
+pref-yuv4cc_crc=3820182704
+yuv-overlay= indique que la superposition YUV est possible sur la carte vidéo. Toujours surchargé par le module de sortie vidéo
+yuv-overlay_crc=1889387323
+offscreen-yuv=indique si yuv-> rgb hors écran est activé. peut être réglé sur false pour forcer la désactivation
+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.
+	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_crc=1796229199
+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
+sdl-defer=utiliser le rendu différé pour SDL
+sdl-defer_crc=3643921758
+no-colorkey=désactive la transparence par couleur au niveau de la sortie vidéo
+no-colorkey_crc=2171123044
+video-output=indique le nom du module de sortie vidéo à utiliser
+video-output_crc=475278293
+raster2d=indique le nom du module de rastériseur 2D à utiliser
+raster2d_crc=333251869
+gapi-fbaccess=définit le mode d'accès GAPI sur le tampon de stockage
+gapi-fbaccess_crc=379965248
+audio-output= indique le nom du module de sortie audio à utiliser
+audio-output_crc=51792132
+alsa-devname=définit le nom du périhérique audio pour ALSA
+alsa-devname_crc=3267261435
+force-alsarate=force la fréquence d'échantillonnage de sortie ALSA et OSS
+force-alsarate_crc=3120558955
+ds-disable-notif=désactive les notifications de tampon audio DirectSound lorsqu'elles sont prises en charge
+ds-disable-notif_crc=1023699628
+font-reader=indique le nom du module de chargement de polices de charactères
+font-reader_crc=1884429091
+font-dirs=indique une liste de répertoires (séparés par des virgules) où trouver les polices de charactères
+font-dirs_crc=111907503
+rescan-fonts=ndique que le(s) répertoire(s) des polices de charactères doit être réanalysé
+rescan-fonts_crc=3797274707
+rmt=active le profilage via Remotery (https://github.com/Celtoys/Remotery). Une copie du visualiseur Remotery se trouve dans gpac/share/vis, généralement installée dans /usr/share/gpac/vis ou Program Files/GPAC/vis
+rmt_crc=2323200474
+rmt-port=définit le port de Remotery
+rmt-port_crc=3708528921
+rmt-reuse=autorise la réutilisation de port ouvert par Remotery
+rmt-reuse_crc=3607580606
+rmt-localhost=force Remotery à n'autoriser que les connections depuis localhost
+rmt-localhost_crc=1239978781
+rmt-sleep=temps de veille de Remotery en ms entre deux mise à jours serveur
+rmt-sleep_crc=3230696886
+rmt-nmsg=définit le nombre de messages par mise à jour pour Remotery
+rmt-nmsg_crc=4237510619
+rmt-qsize=définit la taille de la queue de message pour Remotery
+rmt-qsize_crc=1971622359
+rmt-log=redirige les journaux vers remotery (expérimental, généralement mal géré par le navigateur)
+rmt-log_crc=3311201781
+rmt-ogl=analyse aussi les performances OpenGL pour Remotery
+rmt-ogl_crc=978980191
+[properties]
+ID=ID du flux
+ID_crc=131976233
+ESID=MPEG-4 ESID du flux - obligatoire si  MPEG-4 Systems est utilisé
+ESID_crc=3337700331
+ItemID=ID de l'item d'image dans HEIF, même valeur que l'ID
+ItemID_crc=4166642518
+ServiceID=ID du service associé
+ServiceID_crc=1785575902
+ClockID=ID du flux servant de référence d'horloge
+ClockID_crc=3926148669
+DependencyID=ID du flux portant la couche de base pour ce pid
+DependencyID_crc=3756022933
+SubLayer=indique si le flux est sublayer temporel du flux de base
+SubLayer_crc=3086888640
+PlaybackMode=@Mode de lecture supporté:
+	0: pas de contrôle du temps
+	1: lecture, pause, navigation, vitesse=1
+	2: lecture, pause, navigation, vitesse>=0
+	3: lecture, pause, navigation, lecture inversée@
+PlaybackMode_crc=667732373
+Scalable=Flux scalable
+Scalable_crc=2353017342
+TileBase=Flux de base de tuiles HEVC
+TileBase_crc=2036085341
+Language=language du flux, code ISO639 2/3 ou RFC 4646
+Language_crc=1368763779
+ServiceName=Nom du service associé
+ServiceName_crc=3726282591
+ServiceProvider=Fournisseur du service associé
+ServiceProvider_crc=1262612664
+StreamType=type du flux (audio,vidéo,etc.)
+StreamType_crc=2499440779
+StreamSubtype=sous-type (4CC) du flux (auxiliaire, séquence d'images, etc.)
+StreamSubtype_crc=1313758233
+ISOMSubtype=sous-type (4CC) du flux ISOBMFF  (avc1 avc2 ...)
+ISOMSubtype_crc=554474985
+OrigStreamType=Type d'origine du flux avant chiffrement
+OrigStreamType_crc=1422368035
+CodecID=Identifiant du format de codage
+CodecID_crc=214443429
+InitialObjectDescriptor=Indique si le pid est déclaré dans l'IOD pour MPEG-4 Systems
+InitialObjectDescriptor_crc=2512088943
+Unframed=indique les paquets média ne sont pas des trame / Access Units / images complète ou ne sont pas au format interne de libgpac (par exemple, annexeB pour avc / hevc, adts pour aac)
+Unframed_crc=4245733010
+Duration=durée du flux
+Duration_crc=275428770
+NumFrames=Nombre de trames dans le flux
+NumFrames_crc=2432356885
+ConstantFrameSize=Taille des trames pour des flux de taille de trame constante
+ConstantFrameSize_crc=3500637503
+TimeshiftDepth=Longueur de la mémoire de décallage temporel
+TimeshiftDepth_crc=196570138
+Timescale=échelle de temps du flux (un delta d'horodatage de N vaut N / Timescale secondes)
+Timescale_crc=3120776720
+ProfileLevel=MPEG-4 profile et niveaux
+ProfileLevel_crc=2025902585
+DecoderConfig=Données de configuration du décodeur
+DecoderConfig_crc=2434212694
+DecoderConfigEnhancement=Données de configuration du décodeur de la ou des couches d'amélioration
+DecoderConfigEnhancement_crc=571289940
+SampleRate=Taux d'échantillonnage audio
+SampleRate_crc=2503304202
+SamplesPerFrame=Nombre d'échantillons audio dans une trame compréssée
+SamplesPerFrame_crc=1144622965
+NumChannels=Nombre de canaux audio
+NumChannels_crc=58247240
+ChannelLayout=Disposition des canaux
+ChannelLayout_crc=367517492
+AudioFormat=format des échantillons audio
+AudioFormat_crc=94232868
+AudioPlaybackSpeed=Vitesse de lecture audio, utilisée uniquement pour la reconfiguration de la sortie audio
+AudioPlaybackSpeed_crc=2194364450
+Delay=Retard de présentation comparé aux horodatages de composition, en échelle de temps du flux. Une valeur positive implique un retard du flux. Une valeur négative implique de passer/ne pas présenter le début du flux
+Delay_crc=4030425587
+CTSShift=décalage CTS à appliquer en cas de CTS négatif
+CTSShift_crc=1698165121
+Width=Largeur visuelle (video / text / graphics)
+Width_crc=3627736268
+Height=Heuteur visuelle (video / text / graphics)
+Height_crc=2645395397
+PixelFormat=Format de pixel des données décompréssées
+PixelFormat_crc=1678811690
+Stride=Largeur de ligne en octet d'un plan Y/alpha ou de l'image (formats non planaire)
+Stride_crc=76106405
+StrideUV=Largeur de ligne en octet d'un plan U/V 
+StrideUV_crc=1964825709
+BitDepthLuma=Nombre de bits pour les composants luma
+BitDepthLuma_crc=4028264643
+BitDepthChroma=Nombre de bits pour les composants de chrominance
+BitDepthChroma_crc=692587320
+FPS=Nombre de trames par secondes pour vidéo/animation
+FPS_crc=1602187961
+Interlaced=indicateur de vidéo entrelacée
+Interlaced_crc=587376242
+SAR=Ratio largeur/hauteur d'un pixel
+SAR_crc=3890989426
+PAR=Ratio largeur/hauteur de l'image
+PAR_crc=2532599547
+MaxWidth=Largeur maximale (vidéo / texte / graphiques) de toutes les couches d'amélioration
+MaxWidth_crc=2141354912
+MaxHeight=Hauteur maximale (vidéo / texte / graphiques) de toutes les couches d'amélioration
+MaxHeight_crc=1878599899
+ZOrder=ordre visuel de présentation du flux, de 0 (premier, devant) à max int (dernier, derrière)
+ZOrder_crc=2087381540
+TransX=Translation horizontale du flux
+TransX_crc=2257155539
+TransY=Translation verticale du flux
+TransY_crc=2794883389
+CropOrigin=Position dans la fenêtre source, X, Y indiquent les coordonnées dans la source
+CropOrigin_crc=1458354593
+OriginalSize=Résolution de la vidéo d'origine pour une vidéo croppée
+OriginalSize_crc=1797949194
+Bitrate=Débit en bps
+Bitrate_crc=2629756747
+Maxrate=Max bitrate en bps
+Maxrate_crc=742329135
+DBSize=Taille de la mémoire de decodage en octets
+DBSize_crc=3674125247
+MediaDataSize=Taille en octets des données média du flux
+MediaDataSize_crc=246979115
+DataRef=Le référencement externe des données en ISOBMFF est possible (chaque trame compressée est un ensemble continu d'octets dans la source, sans transformation)
+DataRef_crc=2333294061
+URL=URL de la source
+URL_crc=110605863
+RemoteURL=URL distant de la source - utilisé pour MPEG-4 systems
+RemoteURL_crc=348519343
+RedirectURL=URL de redirection de la source
+RedirectURL_crc=1188029026
+SourcePath=Chemin du fichier source sur le système de fichiers
+SourcePath_crc=499802723
+MIME Type=Type MIME de la source
+MIME Type_crc=2372232615
+Extension=Extension du fichier source
+Extension_crc=638625124
+Cached=Indique que le fichier est complètement mis en cache - les modifications sont signalées via pid info (pas de reconfiguration)
+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_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_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
+IsoAltBrands=indique les marques ISOBMFF associées au PID/fichier
+IsoAltBrands_crc=1745643599
+IsoBrand=indique la marque principale ISOBMFF associée à un PID/fichier
+IsoBrand_crc=90889367
+ServiceWidth=Largeur d'affichage du service
+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_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_crc=2648424488
+AudioVolume=Volume audio
+AudioVolume_crc=2905216846
+AudioPan=Balance/Pan audio
+AudioPan_crc=4102812374
+AudioPriority=Priorité du thread audio
+AudioPriority_crc=1729537029
+ProtectionScheme=Type de schéma de protection (4CC) utilisé
+ProtectionScheme_crc=2184009129
+SchemeVersion=Version du schéma de protection utilisée
+SchemeVersion_crc=772159803
+SchemeURI=URI du schéma de protection
+SchemeURI_crc=2450678833
+KMS_URI=URI du système de gestion de clés (ISMA, OMA)
+KMS_URI_crc=1235676637
+SelectiveEncryption=Indique si le cryptage sélectif ISAM / OMA est utilisé
+SelectiveEncryption_crc=432794341
+IVLength=Taille du vecteur d'initialisation ISMA
+IVLength_crc=2455230602
+KILength=Taille de l'indicateur de clé ISMA
+KILength_crc=9936747
+CryptType=Type d'encryption OMA
+CryptType_crc=3417288242
+ContentID=Identifiant OMA du contenu
+ContentID_crc=3951478426
+TextualHeaders=En-têtes textuelles OMA
+TextualHeaders_crc=3209612233
+PlaintextLen=Taille des données en clair pour OMA
+PlaintextLen_crc=1882107497
+CryptInfo=Chemin local vers le fichier d'information de crypto pour ce pid - voir l'aide du filtre cecrypt
+CryptInfo_crc=3546178372
+DecryptInfo=Chemin local vers le fichier d'information de crypto pour ce pid - voir l'aide du filtre cdcrypt
+DecryptInfo_crc=396626559
+SenderNTP=Temps d'envoi NTP
+SenderNTP_crc=618552461
+Encrypted=Les paquets du flux sont cryptés par défaut (mais l'état de cryptage est indiqué par  paquet) - les modifications sont signalées via pid_set_info (pas de reconfiguration)
+Encrypted_crc=18696922
+OMAPreview=Plage d'aperçu en clair pour OMA 
+OMAPreview_crc=112468299
+CENC_PSSH=Blob binaire PSSH pour CENC, au format (u32)NbSystems [(bin128)SystemID(u32)version(u32)KID_count[(bin128)keyID](u32)priv_size(char*priv_size)priv_data]
+CENC_PSSH_crc=297854741
+CENC_SAI=SAI CENC pour le paquet, au format (char(IV_Size))IV(u16)NbSubSamples [(u16)ClearBytes(u32)CryptedBytes]
+CENC_SAI_crc=2119074303
+KID=ID de clé pour les paquets du PID - les modifications sont signalées par pid_set_info (pas de reconfiguration)
+KID_crc=523421652
+IVSize=taille d'IV pour les paquets du PID
+IVSize_crc=937084584
+ConstantIV=Constant IV pour les paquets du PID
+ConstantIV_crc=1178937174
+CENCPattern=CENC crypt pattern, nb blocs skip dans frac.num et nb blocs crypt dans frac.den
+CENCPattern_crc=2923640643
+CENCStore=4CC de l'emplacement de stockage ISOBMFF des données SAI
+CENCStore_crc=988911565
+AMRModeSet=ModeSet pour AMR et AMR-WideBand
+AMRModeSet_crc=688511568
+SubSampleInfo=blob binaire décrivant N plages du paquet, au format N [(u32)flags(u32)size(u32)reserved(u8)priority(u8) discardable]
+SubSampleInfo_crc=4180379905
+NALUMaxSize=Taille maximale des unités NAL dans le flux - les modifications sont signalées via pid_set_info (pas de reconfiguration)
+NALUMaxSize_crc=180584814
+FileNumber=Index du fichier utilisé lors de l'écriture de fichiers
+FileNumber_crc=1736957882
+FileName=Nom du fichier de sortie lors de l'écriture. Doit être défini sur le premier paquet appartenant au nouveau fichier
+FileName_crc=2609297906
+IDXName=Nom du fichier d'index pour la segmentation MPEG-2 TS. Doit être défini sur le premier paquet appartenant au nouveau fichier
+IDXName_crc=3294858970
+EODS=Fin du segment DASH
+EODS_crc=987469045
+MaxFrameSize=Taille maximale de la trame dans le flux - les modifications sont signalées par pid_set_info (pas de reconfiguration)
+MaxFrameSize_crc=2398021276
+TrackTemplate=Track Box ISOBMFF sérialisée pour ce PID, sans aucune information de paquet (stbl et dref vide) - utilisé par le muxer ISOBMFF pour réinjecter les box d'entrées
+TrackTemplate_crc=900009873
+MovieUserData=UDTA et autres box du moov sérialisées sous forme de liste pour ce PID - utilisé par le muxer ISOBMFF pour réinjecter les box d'entrées
+MovieUserData_crc=319518667
+Period=ID de la période DASH
+Period_crc=2945576102
+PStart=début de la période DASH - voir aide du filtre dasher
+PStart_crc=1307682613
+PDur=Durée de la période DASH - voir aide du filtre dasher
+PDur_crc=779454483
+Representation=ID de la représentation DASH
+Representation_crc=239910461
+ASID=ID de l'adaptation set parent en DASH
+ASID_crc=4060058902
+MuxSrc=Nom de la ou des sources de multiplexage, défini par le filtre dasher pour diriger ses sorties vers les multiplexeurs
+MuxSrc_crc=2795310043
+DashMode=mode DASH à utiliser par le multiplexeur, le cas échéant. 0: le mux n'est pas un fichier DASH, 1: le mux est un fichier DASH normal, 2: le mux est un fichier DASH onDemand (un seul segment)
+DashMode_crc=2881652700
+DashDur=durée du segment cible DASH en secondes pour ce PID
+DashDur_crc=3066345473
+Role=Liste des rôles pour ce PID
+Role_crc=180282755
+PDesc=Liste des descripteurs pour la période DASH contenant ce PID
+PDesc_crc=468366391
+ASDesc=Liste des descripteurs conditionnels pour l'AdaptationSet DASH contenant ce PID. Si un PID avec le même nom de descripteur mais une valeur différente est trouvé, les PIDs seront dans différents AdaptationSets
+ASDesc_crc=107869132
+ASCDesc=Liste des descripteurs communs pour l'AdaptationSet DASH contenant ce PID
+ASCDesc_crc=2337131008
+RDesc=Liste des descripteurs pour la représentation DASH contenant ce PID
+RDesc_crc=3509600818
+BUrl=Liste des URL de base pour ce PID
+BUrl_crc=2685057823
+Template=Modèle (template) de noms de segment à utiliser pour la génération DASH pour ce PID
+Template_crc=4158847963
+StartNumber=Numéro du premier segment généré pour ce PID - voir aide du filtre dasher
+StartNumber_crc=3894646022
+xlink=URL de période distante pour DASH - voir aide du filtre dasher
+xlink_crc=1236222573
+CDur=Durée maximale de média à traiter pour ce PID en mode DASH
+CDur_crc=3648161947
+HLSPL=Nom de la liste de lecture variante HLS pour ce PID
+HLSPL_crc=305561589
+DCue=Nom d'un fichier de cues pour ce PID - voir l'aide du filtre dasher
+DCue_crc=2643542980
+RequireReorder=Indique que les paquets de ce PID proviennent d'une source avec pertes et réordonnances de paquets (UDP)
+RequireReorder_crc=2282219477
+[inspect]
+desc=Inspect packets on pids
+desc_crc=4287839563
+help=@The inspector filter can be used to dump pid and packets. Te default options load only pid changes.
+The packet inspector mode can be configured to dump specific properties of packets using the fmt option.
+When the option is not present, all properties are dumped. Otherwise, only properties identified by $TOKEN$ are printed use $, @ or % for TOKEN separator. TOKEN can be:
+	pn: packet (frame in framed mode) number
+	dts: decoding time stamp in stream timescale, N/A if not available
+	cts: composition time stamp in stream timescale, N/A if not available
+	dur: duration in stream timescale
+	frame: framing status: frame_full (complete AU), frame_start, , frame_end, frame_cont
+	sap: SAP type of the frame
+	ilace: interlacing flag (0: progressive, 1: top field, 2: bottom field)
+	corr: corrupted packet flag
+	seek: seek flag
+	bo: byte offset in source, N/A if not available
+	roll: roll info
+	crypt: crypt flag
+	vers: carrousel version number
+	size: size of packet
+	crc: 32 bit CRC of packet
+	lf: insert linefeed
+	cr: insert carriage return
+	data: hex dump of packet - WARNING, THIS IS BIG !!
+	lp: leading picture flag
+	depo: depends on other packet flag
+	depf: is depended on other packet flag
+	red: redundant coding flag
+	ck: clock type (used for PCR discontinuities)
+	Property name or 4cc.
+	pid.P4CC: PID property 4CC
+	pid.PropName: PID property name
+
+EX: fmt="PID $pid.ID$ packet $pn$ DTS $dts$ CTS $cts$ $lf$" dumps packet number, cts and dts, eg "PID 1 packet 10 DTS 100 CTS 108 \n" 
+
+An unrecognized keywork or missing property will resolve to an empty string
+
+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
+@
+help_crc=1598221440
+log=Sets inspect log filename
+log_crc=3563849341
+mode=Dump mode: au dumps full frame, blk dumps packets before AU reconstruction, raw dumps source packets without demuxing
+mode_crc=4021149978
+interleave=Dumps packets as they are received on each pid. If false, report per pid is generated
+interleave_crc=1103173539
+pck=Dumps packets along with PID state change - implied when fmt is set
+pck_crc=1677973575
+props=Dumps packet properties - ignored when fmt is set, see filter help
+props_crc=2778276055
+dump_data=Enables full data dump, WARNING heavy - ignored when fmt is set, see filter help
+dump_data_crc=2188302190
+fmt=sets packet dump format - see filter help
+fmt_crc=4290652087
+hdr=prints a header corresponding to fmt string without '$ 'or "pid."
+hdr_crc=1641642031
+[probe]
+desc=Inspect packets on demux pids (not file)
+desc_crc=4187457874
+log=Sets inspect log filename
+log_crc=3563849341
+mode=Dump mode: au dumps full frame, blk dumps packets before AU reconstruction, raw dumps source packets without demuxing
+mode_crc=4021149978
+interleave=Dumps packets as they are received on each pid. If false, report per pid is generated
+interleave_crc=1103173539
+pck=Dumps packets along with PID state change - implied when fmt is set
+pck_crc=1677973575
+props=Dumps packet properties - ignored when fmt is set, see filter help
+props_crc=2778276055
+dump_data=Enables full data dump, WARNING heavy - ignored when fmt is set, see filter help
+dump_data_crc=2188302190
+fmt=sets packet dump format - see filter help
+fmt_crc=4290652087
+hdr=prints a header corresponding to fmt string without '$ 'or "pid."
+hdr_crc=1641642031
+[compositor]
+desc=GPAC interactive media compositor
+desc_crc=1475395797
+help=@The GPAC compositor allows mixing audio, video, text and graphics in a timed fashion. The compositor acts as a pseudo-sink for the video side and creates its own output window.
+The video frames are however dispatched to an output video pid in the form of frame pointers requiring later GPU read if used.
+The audio part acts as a regular filter.@
+help_crc=780203760
+aa=@Set anti-aliasing mode for raster graphics - whether the setting is applied or not depends on the graphics module / graphic card.
+	none: no anti-aliasing
+	text: anti-aliasing for text only
+	all: complete anti-aliasing@
+aa_crc=1071704873
+hlfill=Set highlight fill color (ARGB)
+hlfill_crc=2517950793
+hlline=Set highlight stroke color (ARGB)
+hlline_crc=1115719061
+hllinew=Set highlight stroke width
+hllinew_crc=2662633524
+sz=specifies whether scalable zoom should be used or not. When scalable zoom is enabled, resizing the output window will also recompute all vectorial objects. Otherwise only the final buffer is stretched.
+sz_crc=863905088
+bc=default background color to use when displaying transparent images or video with no scene composition instructions
+bc_crc=1364931934
+yuvhw=enables YUV hardware for 2D blits
+yuvhw_crc=286936651
+blitp=partial hardware blits (if not set, will force more redraw)
+blitp_crc=2294562105
+stress=enables stress mode of compositor (rebuild all vector graphics and texture states at each frame)
+stress_crc=3471029662
+fast=enables speed optimization - whether the setting is applied or not depends on the graphics module / graphic card
+fast_crc=1107410525
+bvol=@draws bounding volume of objects.
+	no: disable bounding box
+	box: draws a rectangle (2D) or box (3D mode)
+	aabb: draws axis-aligned bounding-box tree (3D only)@
+bvol_crc=4290969438
+textxt=specifies 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. Default value will use texturing for OpenGL rendering.
+textxt_crc=621473674
+out8b=converts 10-bit video to 8 bit texture before GPU upload.
+out8b_crc=2444281991
+drop=drops late frame when drawing. By default frames are not droped until a heavy desync of 1 sec is observed
+drop_crc=909051951
+sclock=forces synchronizing all streams on a single clock
+sclock_crc=423984299
+sgaze=simulate gaze events through mouse
+sgaze_crc=330294849
+ckey=color key to use in windowless mode (0xFFRRGGBB). GPAC currently doesn't 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 GPAC's output, if supported.
+ckey_crc=423354452
+timeout=timeout in ms after which a source is considered dead
+timeout_crc=1766072551
+fps=simulation frame rate when animation-only sources are played (ignored when video is present).
+fps_crc=2750658324
+fsize=Forces the scene to resize to the biggest bitmap available if no size info is given in the BIFS configuration
+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_crc=1601428466
+asr=forces output sample rate - 0 for auto
+asr_crc=1603958301
+ach=forces output channels - 0 for auto
+ach_crc=2643820771
+alayout=forces output channel layout - 0 for auto
+alayout_crc=451080130
+afmt=forces output channel format - 0 for auto
+afmt_crc=233586354
+asize=audio output packet size in samples
+asize_crc=40294656
+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
+abuf_crc=1640494189
+avol=audio volume in percent
+avol_crc=2361349938
+apan=audio pan in percent, 50 is no pan
+apan_crc=485972319
+async=audio resynchronization; if disabled, audio data is never dropped but may get out of sync
+async_crc=3135160244
+buf=playout buffer in ms. Overriden by BufferLenth property of input pid
+buf_crc=2203983687
+rbuf=rebuffer trigger in ms. Overriden by RebufferLenth property of input pid
+rbuf_crc=271064352
+mbuf=max buffer in ms (must be greater than playout buffer). Overriden by BufferMaxOccupancy property of input pid
+mbuf_crc=4276787499
+ogl=specifies 2D rendering mode. When on, this will involve polygon tesselation which may not be supported on all platforms, and 2D graphics will not look as nice as 2D mode. In hybrid mode, the compositor performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all textures. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation) (slow, mainly for test purposes).
+ogl_crc=3373719114
+pbo=enables PixelBufferObjects to push YUV textures to GPU in OpenGL Mode. This may slightly increase the performances of the playback.
+pbo_crc=3490920568
+nav=overrides the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine)
+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
+	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
+paa=specifies whether polygon antialiasing should be used in full antialiasing mode. If not set, only lines and points antialiasing are used.
+paa_crc=1786425518
+bcull=specifies whether backface culling shall be disable or not.
+bcull_crc=3893702626
+wire=@enables wireframe mode.
+"none": objects are drawn as solid
+"only": objects are drawn as wireframe only
+"solid": objects are drawn as solid and wireframe is then drawn@
+wire_crc=4252552551
+norms=enables normal drawing
+norms_crc=363654300
+glus=use GLU scale, which may be slower but nicer than GPAC's software stretch routines.
+glus_crc=2105210268
+rext=use non power of two (rectangular) texture GL extension
+rext_crc=2372984472
+cull=use aabb culling: large objects are rendered in multiple calls when not fully in viewport
+cull_crc=1939091489
+yuvgl=enables YUV open GL pixel format support
+yuvgl_crc=2022018780
+depth_gl_scale=sets depth scaler
+depth_gl_scale_crc=3877449784
+depth_gl_type=sets geometry type used to draw depth video
+depth_gl_type_crc=47962644
+views=specifies the number of views to use in stereo mode
+views_crc=2085138016
+stereo=@specifies the stereo output type (default "none"). If your graphic card does not support OpenGL shaders, only "top" and "side" modes will be available.
+"side": images are displayed side by side from left to right.
+"top": images are displayed from top (laft view) to bottom (right view).
+"hmd": same as side except that view aspect ratio is not changed.
+"ana": standard color anaglyph (red for left view, green and blue for right view) is used (forces views=2).
+"cols": images are interleaved by columns, left view on even columns and left view on odd columns (forces views=2).
+"rows": images are interleaved by columns, left view on even rows and left view on odd rows (forces views=2).
+"spv5": images are interleaved by for SpatialView 19'' 5 views display, fullscreen mode (forces views=5).
+"alio8": images are interleaved by for Alioscopy 8 views displays, fullscreen mode (forces views=8).
+"custom": images are interleaved according to the shader file indicated in gpac config section Video, key InterleaverShader. The shader is exposed each view as uniform sampler2D gfViewX, where X is the view number starting from the left@
+stereo_crc=789458126
+fpack=indicates default frame packing of input video
+fpack_crc=2619447659
+camlay=sets camera layout in multiview modes
+camlay_crc=4152486677
+iod=specifies the eye separation in cm (distance between the cameras). 
+iod_crc=1720965022
+rview=reverse view order
+rview_crc=591231777
+tvtn=number of point sampling for tile visibility algo
+tvtn_crc=3890017384
+tvtt=number of points above which the tile is considered visible
+tvtt_crc=1126892718
+tvtd=disables the tile having full coverage of the SRD, only displaying partial tiles
+tvtd_crc=2657353927
+tvtf=force all tiles to be considered visible, regardless of viewpoint
+tvtf_crc=387976198
+fov=default field of view for VR
+fov_crc=214746862
+autocal=auto callibrates znear/zfar in depth rendering mode
+autocal_crc=2157309113
+dispdepth=sets display depth, negative value uses default screen height
+dispdepth_crc=4113138537
+dispdist=specifies the distance in cm between the camera and the zero-disparity plane. There is currently no automatic calibration of depth in GPAC
+dispdist_crc=1518690589
+focdist=sets focus distance
+focdist_crc=4011636888
+wfont=forces to wait for SVG fonts to be loaded before displaying frames
+wfont_crc=3547111042
+defsz=default size
+defsz_crc=2322452950
+dpi=default dpi if not indicated by video output
+dpi_crc=2481033276
+dbgpvr=debugs scene used by PVR addon
+dbgpvr_crc=4127459732
+[mp4dmx]
+desc=ISOBMFF and QT demuxer
+desc_crc=93151095
+help=@When scalable tracks are present in a file, the reader can operate in 3 modes using smode option:
+	smode=single: resolves all extractors to extract a single bitstream from a scalable set. The highest level is used
+In this mode, there is no enhancement decoder config, only a base one resulting from the merge of the configs
+	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
+and an enhancement decoder config.
+	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
+ (copied from base) and an enhancement decoder config. This is mostly used for DASHing content.
+	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
+@
+help_crc=3155400072
+src=location of source content
+src_crc=3972578009
+allt=@loads all tracks even if unknown
+	@
+allt_crc=1967417000
+noedit=do not use edit lists
+noedit_crc=4288054093
+itt=(items-to-track) converts all items of root meta into a single PID
+itt_crc=2291805652
+smode=@Load mode for scalable/tile tracks
+	split: each track is declared, extractors are removed
+	splitx: each track is declared, extractors are kept
+	single: a single track is declared (highest level for scalable, tile base for tiling)@
+smode_crc=1367399273
+stsd=only extract sample mapped to the given sample desciption index. 0 means no filter
+stsd_crc=2429693299
+mov=pointer to a read/edit ISOBMF file used internally by importers and exporters
+mov_crc=3090765908
+[bifsdec]
+desc=MPEG-4 BIFS decoder
+desc_crc=3597962957
+[odfdec]
+desc=MPEG-4 OD decoder
+desc_crc=2749565704
+[fin]
+desc=Generic file input
+desc_crc=1432646539
+src=location of source content
+src_crc=3972578009
+block_size=block size used to read file
+block_size_crc=29840651
+range=byte range
+range_crc=2116497769
+ext=overrides file extension
+ext_crc=1085665433
+mime=sets file mime type
+mime_crc=1774517341
+[btplay]
+desc=Textual BT/XMT/X3D loader for playback
+desc_crc=3099725038
+progressive=enable progressive loading
+progressive_crc=3818602383
+sax_dur=SAX loading duration
+sax_dur_crc=1802111958
+[httpin]
+desc=HTTP input
+desc_crc=2945195665
+src=location of source content
+src_crc=3972578009
+block_size=block size used to read file
+block_size_crc=29840651
+cache=Sets cache mode: disk, disk without discarding, memory or none
+cache_crc=1955261685
+range=Sets byte range, as fraction
+range_crc=3506772796
+ext=overrides file extension
+ext_crc=1085665433
+mime=sets file mime type
+mime_crc=1774517341
+[svgplay]
+desc=SVG loader for playback
+desc_crc=1396251963
+sax_dur=SAX loading duration, 0 disables SAX parsing
+sax_dur_crc=3513062436
+[rfimg]
+desc=JPG/J2K/PNG/BMP Image reframer
+desc_crc=1596853371
+timescale=timescale for media timestamps when loading from file not stream
+timescale_crc=992061343
+dur=duration of image when loading from file not stream
+dur_crc=1719404674
+[imgdec]
+desc=PNG/JPG decoder
+desc_crc=3552311705
+[rfadts]
+desc=ADTS reframer
+desc_crc=338359499
+frame_size=size of AAC frame in audio samples
+frame_size_crc=1976232832
+index_dur=indexing window length
+index_dur_crc=400520
+mpeg4=forces signaling as MPEG-4 AAC
+mpeg4_crc=66846242
+ovsbr=forces oversampling SBR (does not multiply timescales by 2)
+ovsbr_crc=1287852570
+sbr=@set SBR signaling:
+	no: no SBR signaling at all
+	imp: backward-compatible SBR signaling (audio signaled as AAC-LC)
+	exp: explicit SBR signaling (audio signaled as AAC-SBR)@
+sbr_crc=107785050
+ps=@set PS signaling:
+	no: no PS signaling at all
+	imp: backward-compatible PS signaling (audio signaled as AAC-LC)
+	exp: explicit PS signaling (audio signaled as AAC-PS)
+@
+ps_crc=3200918403
+[rfmp3]
+desc=MPEG-1/2 audio reframer
+desc_crc=3201472508
+index_dur=indexing window length
+index_dur_crc=400520
+[faad]
+desc=FAAD decoder
+desc_crc=2730188650
+[maddec]
+desc=MAD decoder
+desc_crc=2999506261
+[xviddec]
+desc=XVid decoder
+desc_crc=3424175961
+deblock_y=enable Y deblocking
+deblock_y_crc=565202633
+deblock_uv=enable UV deblocking
+deblock_uv_crc=4030753028
+film_effect=enable film effect
+film_effect_crc=1374082604
+dering_y=enable Y deblocking
+dering_y_crc=565202633
+dering_uv=enable UV deblocking
+dering_uv_crc=4030753028
+[j2kdec]
+desc=OpenJPEG2000 decoder
+desc_crc=2046398867
+[rfac3]
+desc=AC3 reframer
+desc_crc=608396785
+index_dur=indexing window length
+index_dur_crc=400520
+[a52]
+desc=A52 decoder
+desc_crc=546058210
+[rfamr]
+desc=AMR/EVRC reframer
+desc_crc=893249618
+index_dur=indexing window length
+index_dur_crc=400520
+[oggdmx]
+desc=OGG demuxer
+desc_crc=209586963
+index_dur=indexing window length (unimplemented, only 0 disables stream probing for duration), 
+index_dur_crc=4269948406
+[vorbisdec]
+desc=OGG/Vorbis decoder
+desc_crc=1312885232
+[theoradec]
+desc=OGG/Theora decoder
+desc_crc=3220665371
+[m2tsdmx]
+desc=MPEG-2 Transport Stream demuxer
+desc_crc=526700568
+temi_url=force TEMI URL
+temi_url_crc=3916788266
+dsmcc=enable DSMCC receiver
+dsmcc_crc=279393923
+[sockin]
+desc=UDP / TCP socket input
+desc_crc=3624252474
+help=@This filter handles generic TCP and UDP input sockets. It can also probe for MPEG-2 TS over RTP input. Probing of MPEG-2 TS over UDP/RTP is enabled by default but can be turned off.
+
+Format of data can be specified by setting either ext or mime option. If not set, the format will be guessed by probing the first data packet
+Your platform supports unix domain sockets, use tcpu://NAME and udpu://NAME
+On OSX with VM packet replay you will need to force multicast routing, eg: route add -net 239.255.1.4/32 -interface vboxnet0@
+help_crc=830918544
+src=location of source content
+src_crc=3972578009
+block_size=block size used to read socket
+block_size_crc=1575913241
+sockbuf=socket max buffer size
+sockbuf_crc=3655720801
+port=default port if not specified
+port_crc=3919277725
+ifce=default multicast interface
+ifce_crc=2634186680
+listen=indicate the input socket works in server mode
+listen_crc=942997240
+ka=keep socket alive if no more connections
+ka_crc=3219833474
+maxc=max number of concurrent connections
+maxc_crc=2929003351
+np=disables TS probe on input data. Implied if mime or ext are given
+np_crc=3094894051
+ext=indicates file extension of udp data
+ext_crc=4011058385
+mime=indicates mime type of udp data
+mime_crc=2546177900
+block=set blocking mode for socket(s)
+block_crc=3267148328
+reorder_pck=number of packets delay for RTP reordering (M2TS over RTP) 
+reorder_pck_crc=2530740796
+reorder_delay=number of ms delay for RTP reordering (M2TS over RTP)
+reorder_delay_crc=3603041699
+[osvcdec]
+desc=OpenSVC decoder
+desc_crc=3449928440
+[vtbdec]
+desc=VideoToolBox decoder
+desc_crc=3644050121
+reorder=number of frames to wait for temporal re-ordering
+reorder_crc=761831010
+no_copy=dispatch VTB frames into filter chain (no copy)
+no_copy_crc=2198326826
+pfmt=sets default pixel format for decoded video. If not matched default to nv12
+pfmt_crc=32157086
+disable_hw=Disables hardware decoding
+disable_hw_crc=2484006419
+[lsrdec]
+desc=MPEG-4 LASeR decoder
+desc_crc=4044168197
+[safdmx]
+desc=SAF demuxer
+desc_crc=1779159991
+[dashin]
+desc=MPEG-DASH & HLS access engine
+desc_crc=2374307118
+max_buffer=max content buffer in ms. If 0 uses default player settings
+max_buffer_crc=799920983
+auto_switch=switch quality every N segments, disabled if 0
+auto_switch_crc=2094101418
+store=enables file caching
+store_crc=3848075024
+algo=@adaptation algorithm to use. The following algorithms are defined:
+	none: no adaptation logic
+	grate: GAPC legacy algo based on available rate
+	gbuf: GAPC legacy algo based on buffer occupancy
+	bba0: BBA-0
+	bolaf: BOLA Finite
+	bolab: BOLA Basic
+	bolau: BOLA-U
+	bolao: BOLA-O@
+algo_crc=3083473991
+start_with=@specifies the initial representation criteria:
+	min_q: start with lowest quality
+	max_q: start with highest quality
+	min_bw: start with lowest bitrate
+	max_bw: start with highest bitrate; for tiles are used, all low priority tiles will have the lower (below max) bandwidth selected
+	max_bw_tiles: start with highest bitrate; for tiles all low priority tiles will have their lowest bandwidth selected@
+start_with_crc=4179083279
+max_res=use max media resolution to configure display
+max_res_crc=1978124953
+immediate=when interactive switching is requested and immediate is set, the buffer segments are trashed
+immediate_crc=3562300308
+abort=allow abort during a segment download
+abort_crc=1958241568
+use_bmin=Uses the indicated min buffer time of the MPD if true, otherwise uses default player settings
+use_bmin_crc=2864488242
+shift_utc=shifts DASH UTC clock
+shift_utc_crc=3068346272
+atsc_shift=shifts ATSC requests time by given ms
+atsc_shift_crc=4237691186
+server_utc=Uses ServerUTC: or Date: http headers instead of local UTC
+server_utc_crc=2699367787
+screen_res=Uses screen resolution in selection phase
+screen_res_crc=3526471735
+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
+	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
+	cols: bitrate decreases for each columns of tiles starting from the left, same rate for each tile on the columns
+	rcols: bitrate decreases for each columns of tiles starting from the right, same rate for each tile on the columns
+	mcols: bitrate decreased for left and right columns only, same rate for each tile on the columns
+	center: bitrate decreased for all tiles on the edge of the picture
+	edges: bitrate decreased for all tiles on the center of the picture@
+tile_mode_crc=11481146
+tiles_rate=Indicates 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.
+tiles_rate_crc=1471056937
+delay40X=Delay in millisconds to wait between two 40X on the same segment
+delay40X_crc=3744917353
+exp_threshold=Delay in millisconds to wait after the segment AvailabilityEndDate before considering the segment lost
+exp_threshold_crc=834945235
+switch_count=Indicates 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
+switch_count_crc=1861836865
+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)
+aggressive_crc=685396106
+debug_as=Plays only the adaptation set indicated by its index in the MPD; if negative, all sets are used
+debug_as_crc=2073744584
+speed=Enables adaptation based on playback speed
+speed_crc=4202574190
+[cdcrypt]
+desc=CENC, ISMA and adobe decryptor
+desc_crc=3286015280
+help=@The CENC/ISMA decryptor uses a configuration file for retrieving keys. The syntax is available at:
+https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+The file can be set per PID using the property DecryptFile (highest priority), CryptFile (lower priority)
+or set at the filter option level (lowest priority).
+When the file set per PID, the first CrypTrack with the same ID is used, otherwise the first CrypTrack is used.@
+help_crc=3355643697
+cfile=Crypt file - see filter help
+cfile_crc=3044696728
+[cecrypt]
+desc=CENC and ISMA encryptor
+desc_crc=2608147056
+help=@The CENC/ISMA encryptor uses a configuration file for declaring keys. The syntax is available at:
+https://gpac.wp.imt.fr/mp4box/encryption/common-encryption/
+The file can be set per PID using the property CryptFile, or set at the filter option level.
+When the file is set per PID, the first CrypTrack with the same ID is used, otherwise the first CrypTrack is used.@
+help_crc=1527605354
+cfile=Crypt file - see filter help
+cfile_crc=3044696728
+[mxisom]
+desc=ISOBMFF muxer
+desc_crc=3174169042
+m4sys=force MPEG-4 Systems signaling of tracks
+m4sys_crc=1831069778
+dref=only references data from source file - not compatible with all media sources
+dref_crc=775055314
+ctmode=sets cts mode for video tracks. edit uses edit lists to shift first frame to presentation time 0. noedit doesn't shift timeline. negctts uses ctts v1 and no edit lists
+ctmode_crc=3336851185
+idur=only imports the specified duration
+idur_crc=2105903843
+pack3gp=packs a given number of 3GPP audio frames in one sample
+pack3gp_crc=3970001969
+importer=compatibility with old importer, displays import progress
+importer_crc=556485467
+pack_nal=repacks NALU size length to minimum possible size for AVC/HEVC/...
+pack_nal_crc=2589428755
+xps_inband=Use inband param set for AVC/HEVC/.... If mix, creates non-standard files using single sample entry with first PSs found, and moves other PS inband
+xps_inband_crc=131735851
+store=Write mode. inter uses cdur to interleave the file. flat writes a flat file, file at end. cap flushes to disk as soon as samples are added. tight uses per-sample interleaving of all tracks. frag framents the file using cdur duration. sfrag framents the file using cdur duration but adjusting to start with SAP1/3.  
+store_crc=809072118
+cdur=chunk duration for interleaving and fragmentation modes
+cdur_crc=3889103669
+for_test=sets all dates and version info to 0 to enforce same binary result generation
+for_test_crc=591187781
+timescale=timescale to use for movie edit lists
+timescale_crc=1020713727
+moof_first=generates fragments starting with moof then mdat
+moof_first_crc=2226525148
+abs_offset=uses absolute file offset in fragments rather than offsets from moof
+abs_offset_crc=2126032520
+fsap=splits truns in video fragments at SAPs to reduce file size
+fsap_crc=10664029
+file=pointer to a write/edit ISOBMF file used internally by importers and exporters
+file_crc=725371499
+subs_sidx=number of subsegments per sidx. negative value disables sidx
+subs_sidx_crc=2940657399
+m4cc=4 character code of empty box to appen at the end of a segment
+m4cc_crc=2324258074
+chain_sidx=Uses daisy-chaining of SIDX
+chain_sidx_crc=2945874345
+msn=Sets sequence number of first moof to N
+msn_crc=1935169908
+msninc=Sets sequence number increase between moofs
+msninc_crc=1182819374
+tfdt=sets TFDT of first traf
+tfdt_crc=446145329
+tfdt_traf=sets TFDT in each traf
+tfdt_traf_crc=1977654141
+nofragdef=disables default flags in fragments
+nofragdef_crc=389153258
+straf=uses a single traf per moov (smooth streaming and co)
+straf_crc=1179979078
+strun=uses a single traf per moov (smooth streaming and co)
+strun_crc=1179979078
+psshs=@PSSH boxes store mode:
+	moof: in first moof of each segments
+	moov: in movie box
+	none: discarded@
+psshs_crc=1139148565
+sgpd_traf=stores sample group descriptions in traf (duplicated for each traf). If not used, sample group descriptions are stored in the movie box
+sgpd_traf_crc=2972375000
+cache=Enables temp storage for VoD dash modes. When disabled, SIDX size will be estimated based on duration and DASH segment length, and padding will be used in the file before the final SIDX. When enabled, file data is stored to a cache and flushed upon completion
+cache_crc=3264208109
+noinit=does not send initial moov, used for DASH bitstream switching mode
+noinit_crc=1715651077
+tktpl=use track box from input if any as a template to create new track. no disables template, yes clones the track (except edits and decoder config), udta only loads udta
+tktpl_crc=4009584019
+mudta=use udta and other moov extension boxes from input if any. no disables import, yes clones all extension boxes, udta only loads udta
+mudta_crc=3373712603
+tmpd=sets temp dire for intermediate file(s)
+tmpd_crc=3648307615
+mvex=sets mvex after tracks
+mvex_crc=4110963461
+tkid=track ID of created track for single track. Default 0 uses next available trackID
+tkid_crc=810495435
+fdur=fragments based on fragment duration rather than CTS. Mostly used for MP4Box -frag option
+fdur_crc=1875532844
+btrt=sets btrt box in sample description
+btrt_crc=3335833695
+block_size=target output block size, 0 for default internal value (10k)
+block_size_crc=2554453340
+[rfqcp]
+desc=QCP reframer
+desc_crc=1012125759
+index_dur=indexing window length
+index_dur_crc=400520
+[rfh263]
+desc=H263 reframer
+desc_crc=416498604
+fps=import frame rate
+fps_crc=894530348
+index_dur=indexing window length
+index_dur_crc=400520
+[rfmpgvid]
+desc=MPEG-1 MPEG-2 MPEG-4(Part2) video reframer
+desc_crc=2766981857
+help=The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS > CTS
+help_crc=3334498548
+fps=import frame rate
+fps_crc=894530348
+index_dur=indexing window length
+index_dur_crc=400520
+vfr=set variable frame rate import
+vfr_crc=2959659910
+importer=compatibility with old importer, displays import results
+importer_crc=2953354326
+[nhntr]
+desc=NHNT reader
+desc_crc=2986867744
+reframe=force reparsing of referenced content
+reframe_crc=4149990424
+index_dur=indexing window length
+index_dur_crc=400520
+[nhmlr]
+desc=NHML parser
+desc_crc=1087761555
+reframe=force reparsing of referenced content
+reframe_crc=4149990424
+index_dur=indexing window length
+index_dur_crc=400520
+[rfnalu]
+desc=NALU Video (AVC & HEVC) reframer
+desc_crc=2496497286
+help=@This demuxer only produces ISOBMFF-compatible output: start codes are removed, NALU length field added and avcC/hvcC config created.
+	The demux uses negative CTS offsets: CTS is corrrect, but some frames may have DTS > CTS.@
+help_crc=758087815
+fps=import frame rate
+fps_crc=894530348
+autofps=detect FPS from bitstream, fallback to fps option if not possible
+autofps_crc=2459069437
+index_dur=indexing window length. If 0, bitstream is not probed for duration
+index_dur_crc=3784349922
+explicit=use explicit layered (SVC/LHVC) import
+explicit_crc=868793531
+strict_poc=delay frame output of an entire GOP to ensure CTS info is correct when POC suddenly changes
+strict_poc_crc=3867758617
+nosei=removes all sei messages
+nosei_crc=1667863153
+nosvc=removes all SVC/MVC/LHVC data
+nosvc_crc=3551677409
+novpsext=removes all VPS extensions
+novpsext_crc=2586533869
+importer=compatibility with old importer, displays import results
+importer_crc=2953354326
+nal_length=Sets number of bytes used to code length field: 1, 2 or 4
+nal_length_crc=3090395915
+subsamples=Import subsamples information
+subsamples_crc=351036105
+[m2psdmx]
+desc=MPEG Program Stream demuxer
+desc_crc=1302440712
+[avidmx]
+desc=AVI demuxer
+desc_crc=3345334732
+fps=import frame rate, default is AVI one
+fps_crc=2934746080
+importer=compatibility with old importer, displays import results
+importer_crc=2953354326
+[txtin]
+desc=Timed text  SRT, SUB, TTXT, QT-TeXML, WebVTT, TTML and SWF2SVG loader
+desc_crc=3978069602
+webvtt=force WebVTT import of SRT files
+webvtt_crc=876324549
+nodefbox=skip default text box
+nodefbox_crc=3177451349
+noflush=skip final sample flush for srt
+noflush_crc=2679838919
+fontname=default font to use
+fontname_crc=3544177182
+fontsize=default font size
+fontsize_crc=2176459882
+lang=default language to use
+lang_crc=3648271996
+width=default width of text area, set to 0 to resolve against visual PIDs
+width_crc=3837674580
+height=default height of text area, set to 0 to resolve against visual PIDs
+height_crc=3790348457
+x=default horizontal offset of text area: -1 (left), 0 (center) or 1 (right)
+x_crc=2094383566
+y=default vertical offset of text area: -1 (bottom), 0 (center) or 1 (top)
+y_crc=4101522951
+zorder=default z-order of the PID
+zorder_crc=1497795429
+timescale=default timescale of the PID
+timescale_crc=499577735
+[ttxtdec]
+desc=TTXT/TX3G decoder
+desc_crc=2081073929
+texture=Use texturing for output text
+texture_crc=2371597645
+outline=Draw text outline
+outline_crc=2990065825
+width=Default width when standalone rendering
+width_crc=3801502871
+height=Default height when standalone rendering
+height_crc=2770052284
+[vttdec]
+desc=WebVTT decoder
+desc_crc=1539593896
+script=Location of WebVTT SVG JS renderer
+script_crc=4025437757
+[rtpin]
+desc=RTP/RTSP/SDP input
+desc_crc=2133681016
+src=RTSP location of source content
+src_crc=851598752
+firstport=default first port number to use. 0 lets the filter decide
+firstport_crc=3962131718
+ifce=IP of the default interface to use for multicast. If NULL, the default system interface will be used
+ifce_crc=2720424345
+mcast_ttl=Sets multicast TTL
+mcast_ttl_crc=3285186258
+reorder_len=RTP reorder length in packets
+reorder_len_crc=3754139702
+reorder_delay=Max delay in RTP reorderer, packets will be dispatched after that
+reorder_delay_crc=3227104775
+block_size=buffer size fur RTP/UDP or RTSP when interleaved
+block_size_crc=4004462100
+disable_rtcp=Disables RTCP reporting
+disable_rtcp_crc=65189633
+nat_keepalive=NAT keepalive delay in ms, disabled by default (except for SatIP, set to 30s by default)
+nat_keepalive_crc=1499219508
+force_mcast=Force multicast on indicated IP in RTSP setup
+force_mcast_crc=1763484740
+use_client_ports=Force using client ports  (hack for some RTSP servers overriding client ports)
+use_client_ports_crc=3888971245
+bandwidth=sets bandwidth param for RTSP requests
+bandwidth_crc=3135130812
+default_port=Sets default RTSP port
+default_port_crc=418455079
+satip_port=Sets default port for SATIP
+satip_port_crc=2699168017
+interleave=Sets RTP over RTSP; critcial uses interleave only for MPEG-4 systems streams
+interleave_crc=2052584898
+udp_timeout=Default timeout before considering UDP is down
+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_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_crc=3638295141
+user_agent=User agent string, by default solved from GPAC preferences
+user_agent_crc=4142140091
+languages=User languages, by default solved from GPAC preferences
+languages_crc=2224109611
+stats=Updates statistics to the user every given MS, 0 disables reporting
+stats_crc=1414847348
+[fout]
+desc=Generic file output
+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.@
+help_crc=606079466
+dst=location of destination file - see filter help 
+dst_crc=2944539646
+append=open in append mode
+append_crc=3838208913
+dynext=indicates the file extension is set by filter chain, not dst
+dynext_crc=1468217109
+start=sets playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start_crc=867548297
+speed=sets playback speed when vsync is on
+speed_crc=1777817047
+fext=sets extension for graph resolution, regardless of file extension
+fext_crc=3290862661
+cat=cats each file of input pid rather than creating one file per filename
+cat_crc=522567284
+ow=always overwrite output if existing
+ow_crc=2937308660
+[ufadts]
+desc=Raw AAC to ADTS writer
+desc_crc=2296886488
+mpeg2=Signals as MPEG2 AAC
+mpeg2_crc=3374704675
+[reframer]
+desc=Passthrough filter ensuring reframing, and optionnally decoding, of inputs
+desc_crc=2516726260
+help=@This filter forces input pids to be properly framed (1 packet = 1 Access Unit). It is mostly used for file to file operations.
+The filter can be used to filter out packets based on SAP types, for example to extract only the key frames (SAP 1,2,3) of a video
+The filter can be used to add real-time regulation of input packets. For example to simulate a live DASH:
+	EX "src=m.mp4 reframer:rt=on dst=live.mpd:dynamic"
+@
+help_crc=1592204113
+exporter=compatibility with old exporter, displays export results
+exporter_crc=4138638672
+sap=Drops non-SAP packets, off by default. The string contains the list (whitespace or comma-separated) of SAP types (0,1,2,3,4) to forward. Note that forwarding only sap 0 will break the decoding ...
+sap_crc=113824472
+rt=real-time regulation mode of input. off disables it, on enables it on each pid, sync enables it on all pid
+rt_crc=1085635204
+speed=speed for real-time regulation mode - only positive value
+speed_crc=2337596272
+raw=forces input streams to be in raw format (i.e. forces decoding of input)
+raw_crc=1389623929
+[writegen]
+desc=Generic single stream to file converter, used when extracting/converting PIDs
+desc_crc=3830938964
+exporter=compatibility with old exporter, displays export results
+exporter_crc=4138638672
+pfmt=Pixel format for raw extract. If not set, derived from extension
+pfmt_crc=3535145677
+afmt=Audio format for raw extract. If not set, derived from extension
+afmt_crc=4166772011
+decinfo=Decoder config insert mode: no means never, first means on first packet, sap means at each SAP, auto selects between no and first based on media type
+decinfo_crc=588707814
+split=Force one file per decoded frame.
+split_crc=2842677878
+frame=Force single frame dump with no rewrite. In this mode, all codecids are supported
+frame_crc=1701807790
+sstart=Start number of frame to dump
+sstart_crc=2458104567
+send=End number of frame to dump. If start<end, all samples after start are dumped
+send_crc=2482204419
+[ufnalu]
+desc=ISOBMFF to AnnexB (start codes) writer for AVC|H264 and HEVC
+desc_crc=554168029
+rcfg=Force repeating decoder config at each I-frame
+rcfg_crc=1063479090
+extract=Extracts full, base or layer only
+extract_crc=3403295392
+delim=Inserts AU NAL Delimiter
+delim_crc=1755308942
+[writeqcp]
+desc=QCP file writer
+desc_crc=4002996549
+exporter=compatibility with old exporter, displays export results
+exporter_crc=4138638672
+[writevtt]
+desc=WebVTT file writer
+desc_crc=3958797601
+exporter=compatibility with old exporter, displays export results
+exporter_crc=4138638672
+merge=merges VTT cue if needed
+merge_crc=1535119373
+[nhntw]
+desc=NHNT file writer
+desc_crc=4129389049
+exporter=compatibility with old exporter, displays export results
+exporter_crc=4138638672
+large=Uses large file mode
+large_crc=4000641212
+[nhmlw]
+desc=NHML file writer
+desc_crc=3549891277
+exporter=compatibility with old exporter, displays export results
+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_crc=943156470
+nhmlonly=Only dumps NHML info, not media
+nhmlonly_crc=1508283746
+full=Full NHML dump
+full_crc=777811214
+chksum=Insert frame checksum
+chksum_crc=2795002488
+filep=dumps directly to FILE (used by MP4Box)
+filep_crc=456174012
+[vobsubdmx]
+desc=VobSub demuxer
+desc_crc=110568039
+blankframe=force inserting a blank frame if first subpic is not at 0
+blankframe_crc=2932384686
+[avimx]
+desc=AVI muxer
+desc_crc=386683005
+dst=location of destination file
+dst_crc=821593475
+fps=default framerate if none indicated in stream
+fps_crc=2564330776
+noraw=disables raw output in AVI, only compressed ones allowed
+noraw_crc=3753222271
+[aout]
+desc=Audio soundcard output
+desc_crc=1376824746
+drv=audio driver name
+drv_crc=1650019960
+bnum=number of audio buffers - 0 for auto
+bnum_crc=2449541998
+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
+bdur_crc=1855300149
+threaded=force dedicated thread creation if sound card driver is not threaded
+threaded_crc=1543685745
+dur=only plays the specified duration
+dur_crc=2547512057
+clock=hints audio clock for this stream (reports system time and CTS), for other modules to use
+clock_crc=3418256433
+speed=Sets playback speed
+speed_crc=136760481
+start=Sets playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start_crc=4022740387
+[ufm4v]
+desc=ISOBMFF to MPEG-4(Part2) writer
+desc_crc=905978234
+rcfg=Force repeating decoder config at each I-frame
+rcfg_crc=1063479090
+[resample]
+desc=Audio resampling
+desc_crc=1810930849
+[vout]
+desc=Video graphics card output
+desc_crc=1337852835
+drv=video driver name
+drv_crc=1693149976
+vsync=enables video screen sync
+vsync_crc=2823729754
+drop=enables droping late frames
+drop_crc=1318529139
+disp=Display mode, gl: OpenGL, pbo: OpenGL with PBO, blit: 2D HW blit, soft: software blit
+disp_crc=2153025248
+start=Sets playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start_crc=4022740387
+dur=only plays the specified duration
+dur_crc=2547512057
+speed=sets playback speed when vsync is on
+speed_crc=1777817047
+hold=specifies the number of seconds to hold display for single-frame streams
+hold_crc=1581096815
+linear=uses linear filtering instead of nearest pixel for GL mode
+linear_crc=753320510
+back=specifies back color for transparent images
+back_crc=4291592618
+size=Default init size, 0x0 holds the size of the first frame. Default is video media size
+size_crc=2248196327
+pos=Default position (0,0 top-left)
+pos_crc=401629220
+hide=Hide output window
+hide_crc=1805599243
+fullscreen=Use fullcreen
+fullscreen_crc=4076015646
+[vcrop]
+desc=Video croping fiter
+desc_crc=2505996701
+wnd=Size of output to crop, indicated as TxLxWxH. If % is indicated after a number, the value is in percent of the source width (for L and W) or height (for T and H). An absolute offset (+x, -x) can be added after percent
+wnd_crc=3630155311
+copy=Always copy the source pixels. By default the filter will try to forward crop frames by adjusting offsets and strides of the source if possible (window contained in frame)
+copy_crc=575340830
+round=Rounds dimension to be a multiple of 2. all_up,all_down activate rounding on formats that do not require it (RGB, YUV444)
+round_crc=16694495
+[rfrawvid]
+desc=RAW video (YUV, RGB) reframer
+desc_crc=3121281961
+size=video resolution
+size_crc=1892185337
+pfmt=pixel format
+pfmt_crc=2597110506
+fps=Video frames per second
+fps_crc=2074396616
+[rfpcm]
+desc=PCM audio reframer
+desc_crc=3467961394
+samplerate=Audio sample rate
+samplerate_crc=2503304202
+afmt=audio format
+afmt_crc=3970124081
+channels=Number of audio channels
+channels_crc=58247240
+framelen=Number of audio samples to put in one audio frame
+framelen_crc=1640355169
+[jpgenc]
+desc=JPG encoder
+desc_crc=1362150746
+dctmode=DCT mode
+dctmode_crc=1242235194
+quality=Quality, between 0 and 100
+quality_crc=4020088444
+[pngenc]
+desc=PNG encoder
+desc_crc=3786343102
+[rewind]
+desc=Audio and video rewinder
+desc_crc=2498322312
+help=The filter is in passthrough if speed is positive. Otherwise, it reverts decoded GOPs for video, or revert samples in decoded frame for audio.
+help_crc=1398822953
+rbuffer=size of video rewind buffer in frames. If more frames than this, flush is performed
+rbuffer_crc=3166283004
+[flist]
+desc=sources concatenator
+desc_crc=3670015842
+help=@This filter can be used to play playlist files (extension txt or m3u) or a list of sources using flist:l="f1[,f2]", where f1 can be a file or a directory to enum.
+Syntax for directory is:
+	dir/*: enumerates everything in dir
+	foo/*.png: enumerates all files with extension png in foo
+	foo/*.png;*.jpg: enumerates all files with extension png or jpg in foo
+
+The filter loads any source supported by GPAC, files (remote or local) or other.
+The filter forces input demultiplex (no streamtype FILE) and recomputes the input timestamps into a continuous timeline.
+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.
+
+When using a playlist, directives can be given in a comment line (starting with '#' before the file name)
+The following directives (separated with space or comma) are supported:
+	repeat=N: repeats N times the content (hence played N+1)
+	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
+	stop=T: stops source playback after T seconds (double format only)
+		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
+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
+@
+help_crc=2219017046
+loop=continuously loop playlist/list of files - see filter help
+loop_crc=273951774
+in=list of files to play - see filter help
+in_crc=2275938862
+dur=for source files with a single frame, sets frame duration. 0/NaN fraction means reuse source timing which is usually not set!
+dur_crc=2576765477
+revert=revert list of files (not playlist)
+revert_crc=3272719505
+timescale=forces output timescale on all pids. 0 uses the timescale of the first pid found
+timescale_crc=4215138947
+[mxts]
+desc=MPEG-2 Transport Stream muxer
+desc_crc=869983974
+help=@GPAC TS multiplexer selects M2TS PID for media streams using the PID of the PMT plus the stream index.
+For example, default config creates the first program with a PMT PID 100, the first stream will have a PID of 101.
+Streams are grouped in programs based on input PID property ServiceID if present. If absent, stream will go in program with service ID inidcated by sid option
+name option is overriden by input PID property ServiceName
+provider option is overriden by input PID property ServiceProvider
+
+The temi option allows specifying a list of URLs or timeline IDs to insert in the program.
+Only a single TEMI timeline can be specified per PID.
+The syntax is
+temi="url,4": inserts a temi URL+timecode to the first stream of all progrrams and an external temi to the second stream of all programs
+temi="#20#,4#10#URL": inserts a temi URL+timecode to the first stream of program with ServiceID 10 and an external temi to the second stream of program with ServiceID 20
+temi="#20#4#10#,,URL": inserts a temi URL+timecode to the third stream of program with ServiceID 10 and an external temi to the first stream of program with ServiceID 20
+
+In DASH mode, the PCR is always initialized at 0, and flush_rap is automatically set.
+@
+help_crc=1976783491
+breq=buffer requirements in ms for input pids
+breq_crc=3144932373
+pmt_id=defines the ID of the first PMT to use in the mux.
+pmt_id_crc=2452980513
+rate=target rate in bps of the multiplex. If not set, variable rate is used
+rate_crc=928841654
+pmt_rate=interval between PMT in ms
+pmt_rate_crc=3003250014
+pat_rate=interval between PAT in ms
+pat_rate_crc=231425791
+pcr_offset=offsets all timestamps from PCR by V, in 90kHz. Default value is computed based on input media
+pcr_offset_crc=160121454
+mpeg4=@forces usage of MPEG-4 signaling (IOD and SL Config).
+none disables 4on2. full sends AUs as SL packets over section for OD, section/pes for scene (cf bifs_pes)
+scene sends only scene streams as 4on2 but uses regular PES without SL for audio and video
+@
+mpeg4_crc=3971344227
+pmt_version=sets version number of the PMT
+pmt_version_crc=4041161259
+disc=sets the discontinuity marker for the first packet of each stream
+disc_crc=2802223434
+repeat_rate=interval in ms between two carousel send for MPEG-4 systems. Is overriden by carousel duration PID property if defined
+repeat_rate_crc=468619753
+repeat_img=interval in ms between resending (as PES) of single-image streams. If 0, image data is sent once only
+repeat_img_crc=2366709629
+max_pcr=sets max interval in ms between 2 PCR
+max_pcr_crc=1351533666
+nb_pack=packs N TS packets in output packets
+nb_pack_crc=1864869903
+pes_pack=Sets AU to PES packing mode. audio will pack only multiple audio AUs in a PES, none make exactly one AU per PES, all will pack multiple AUs per PES for all streams
+pes_pack_crc=2328465599
+rt=Forces real-time output
+rt_crc=2620212930
+bifs_pes=force sending BIFS streams as PES packets and not sections. copy mode disables timestamps in BIFS SL and only carries PES timestamps
+bifs_pes_crc=2641200739
+flush_rap=force flushing mux program when RAP is found on video, and injects PAT and PMT before the next video PES begin
+flush_rap_crc=1404608085
+pcr_only=enables PCR-only TS packets
+pcr_only_crc=3078124483
+pcr_init=sets initial PCR value for the programs. Negative value implies random value is picked
+pcr_init_crc=2019787148
+sid=sets service ID for the program - see filter help
+sid_crc=2388997828
+name=sets service name for the program - see filter help
+name_crc=1486912750
+provider=sets service provider name for the program - see filter help
+provider_crc=2008049683
+sdt_rate=interval in ms between two DVB SDT tables. If 0, SDT is disabled
+sdt_rate_crc=1508035582
+temi=inserts TEMI time codes in adaptation field - see filter help
+temi_crc=3608902645
+temi_delay=sets delay in ms between two TEMI url descriptors
+temi_delay_crc=2812609679
+temi_offset=sets offset in ms  to add to TEMI timecodes
+temi_offset_crc=1165796497
+temi_ntp=inserts NTP timestamp in TEMI timeline descriptor
+temi_ntp_crc=87164260
+log_freq=delay between logs for realtime mux
+log_freq_crc=1190234781
+latm=uses LATM AAC encapsulation instead of regular ADTS
+latm_crc=2249803244
+subs_sidx=number of subsegments per sidx. negative value disables sidx
+subs_sidx_crc=2940657399
+[dasher]
+desc=MPEG-DASH and HLS segmenter
+desc_crc=839712355
+help=@GPAC DASH and HLS segmenter
+The segmenter uses template strings to derive output file names, regardless of the DASH mode (even when templates are not used)
+The default template is $File$_dash for ondemand and single file modes, and $File$_$Number$ for seperate segment files
+	EX: template=Great_$File$_$Width$_$Number$
+If source is foo.mp4 with 640x360 video, this will resolve in Great_foo_640_$Number$ for the DASH template
+	EX: template=Great_$File$_$Width$
+If source is foo.mp4 with 640x360 video, this will resolve in Great_foo_640.mp4 for onDemand case
+
+Standard DASH replacement strings
+	$Number[%%0Nd]$: is replaced by the segment number, possibly prefixed with 0
+	$RepresentationID$ is replaced by representation name
+	$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):
+	$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
+	$Segment=NAME$ is replaced by NAME for media segments, ignored for init segments
+	$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
+	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
+		If multiple streams in source, only the first stream will have an AS ID assigned
+	xlink: for remote periods, only checked for null pid
+	Role, PDesc, ASDesc, ASCDesc, RDesc: various descriptors to set for period, AS or representation
+	BUrl: base URLs to use for the pid (per representation)
+	Template: overrides dasher template for this PID
+	DashDur: overrides dasher segment duration for this PID
+	StartNumber: sets the start number for the first segment in the PID, default is 1
+	Non-dash properties: Bitrate, SAR, Language, Width, Height, SampleRate, NumChannels, Language, ID, DependencyID, FPS, Interlaced. These properties are used to setup each representation and can be overriden on input PIDs using the general PID property settings (cf global help).
+	EX: src=test.mp4:#Bitrate=1M dst=test.mpd
+This will force declaring a bitrate of 1M for the representation, regardless of actual source bitrate
+	EX: src=muxav.mp4 dst=test.mpd
+This will create unmuxed DASH segments
+	EX: src=muxav.mp4:#Representation=1 dst=test.mpd
+This will create muxed DASH segments
+	EX: src=m1.mp4 src=m2.mp4:#Period=Yep dst=test.mpd
+This will put src m1.mp4 in first period, m2.mp4 in second period
+	EX: src=m1.mp4:#BUrl=http://foo/bar dst=test.mpd
+This will assign a base URL to src m1.mp4
+	EX: src=m1.mp4:#ASCDesc=<ElemName val="attval">text</ElemName> dst=test.mpd
+This will assign the specified XML descriptor to the adaptation set.
+		Note that this can be used to inject most DASH descriptors not natively handled by the dasher
+		The dasher handles the XML descriptor as a string and does not attempt to validate it.
+		Descriptors, as well as some dasher filter arguments, are string lists (comma-separated by default), so that multiple descriptors can be added:
+	EX: src=m1.mp4:#RDesc=<Elem attribute="1"/>,<Elem2>text</Elem2> dst=test.mpd
+This will insert two descriptors in the representation(s) of m1.mp4
+	EX: src=video.mp4:#Template=foo$Number$ src=audio.mp4:#Template=bar$Number$ dst=test.mpd
+This will assign different templates to the audio and video sources.
+	EX: src=null:#xlink=http://foo/bar.xml:#PDur=4 src=m.mp4:#PStart=-1
+This will insert an create an MPD with first a remote period then a regular one
+	EX: src=null:#xlink=http://foo/bar.xml:#PStart=6 src=m.mp4
+This will insert an create an MPD with first a regular period, dashing ony 6s of content, then a remote one
+
+The dasher will request 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
+
+For HLS, the output pid will deliver the master playlist and the variant playlists
+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
+
+The segmenter can take a list of cues to use for the segmentation process, in which case only these cues are used to derive segment boundaries.
+Cues are given in an XML file with a root element called <DASHCues>, with currently no attribute specified. The children are <Stream> elements, with attributes:
+	"id": integer for stream/track/pid ID
+	"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
+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:
+* add a "DashMode" capability to their input caps (value of the cap is ignored, only its presence is required)
+* inspect packet properties
+	"FileNumber" gives the signal of a new DASH segment
+	"FileName" gives the optional file name (if not present, output shall be a single file)
+		"FileName" property is only set for packet carrying the "FileNumber" property
+		"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)
+* 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:
+		noinit: disables output of init segment for the muxer (used to handle bitstream switching with single init in DASH)
+		frag: indicates muxer shall used fragmented format (used for ISOBMFF mostly)
+		subs_sidx=0: indicates an SIDX shall be generated - only added if not already specified by user
+		xps_inband=all|no: indicates AVC/HEVC/... parameter sets shall be sent inband or out of band
+		nofragdef: indicates fragment defaults should be set in each segment rather than in init segment
+
+The dasher will add the following properties to the output PIDs:
+	DashMode: identifies VoD (single file with global index) or regular DASH mode used by dasher
+	DashDur: identifies target DASH segment duration - this can be used to estimate the SIDX size for example
+@
+help_crc=936572930
+dur=DASH target duration in seconds
+dur_crc=1801857532
+tpl=use template mode (multiple segment, template URLs)
+tpl_crc=2166577778
+stl=use segment timeline (ignored in on_demand mode)
+stl_crc=2793559708
+dmode=MPD mode static: not live, dynamic: live generation, dynlast: last call for live, will turn the MPD into static)
+dmode_crc=1937279415
+sseg=single segment is used
+sseg_crc=133775808
+sfile=Segments are contained in a single file (default in on_demand)
+sfile_crc=2818224601
+align=Enables segment time alignment between representations
+align_crc=2358410793
+sap=Enables spliting 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_crc=1312122791
+no_sar=Does not check for identical sample aspect ratio for adaptation sets
+no_sar_crc=2264793386
+m2ts=generates MPEG-2 TS output
+m2ts_crc=2958227042
+for_test=sets all dates and version info to 0 to enforce same binary result generation
+for_test_crc=591187781
+forcep=forces profile string for avc/hevc/aac
+forcep_crc=4186129562
+bs_switch=@Bitstream switching mode (single init segment):
+	def: resolves to off for onDemand and inband for live
+	off: disables BS switching
+	on: enables it if same decoder configuration is possible
+	inband: moves decoder config inband if possible
+	force: enables it even if only one representation
+	multi: uses multiple stsd entries in ISOBMFF@
+bs_switch_crc=3434520549
+avcp=AVC|H264 profile to use if no profile could be found. If forcep is set, enforces this profile
+avcp_crc=3693654408
+hvcp=HEVC profile to use if no profile could be found. If forcep is set, enforces this profile
+hvcp_crc=299411363
+aacp=AAC profile to use if no profile could be found. If forcep is set, enforces this profile
+aacp_crc=3461489333
+av1p=AV1 profile to use if no profile could be found. If forcep is set, enforces this profile
+av1p_crc=2069855053
+vpxp=VP8/9 profile to use if no profile could be found. If forcep is set, enforces this profile
+vpxp_crc=2561442118
+template=DASH template string to use to generate segment name - see filter help
+template_crc=1225336935
+ext=File extension to use for segments
+ext_crc=2247294486
+asto=availabilityStartTimeOffset to use. A negative value simply increases the AST, a positive value sets the ASToffset to representations
+asto_crc=22785783
+profile=Specifies the target DASH profile. This will set default option values to ensure conformance to the desired profile. Auto turns profile to live for dynamic and full for non-dynamic. For MPEG-2 TS, only main and live are used, others default to main.
+profile_crc=1613542548
+profX=specifies a list of profile extensions, as used by DASH-IF and DVB. The string will be colon-concatenated with the profile used
+profX_crc=3638857297
+cp=Specifies the content protection element location
+cp_crc=2541146739
+pssh=@sets PSSH storage mode:
+	f: stores in movie fragment only
+	v: stores in movie only
+	m: stores in mpd only
+	mf: stores in mpd and movie fragment
+	mv: stores in mpd and movie
+	n: discard pssh from mpd and segments@
+pssh_crc=867436926
+buf=DASH min buffer duration in ms. negative value means percent of segment duration (eg -150 = 1.5*seg_dur)
+buf_crc=2337722010
+timescale=sets timescales 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
+timescale_crc=2194275231
+check_dur=checks duration of sources in period, trying to have roughly equal duration. Enforced whenever period start times are used
+check_dur_crc=2701873344
+skip_seg=increments segment number whenever an empty segment would be produced - NOT DASH COMPLIANT
+skip_seg_crc=2300060293
+title=sets MPD title
+title_crc=2316929427
+source=sets MPD Source
+source_crc=1362922919
+info=sets MPD info url
+info_crc=3848134995
+cprt=adds copyright string to MPD
+cprt_crc=1310849082
+lang=sets lang of MPD Info
+lang_crc=4119305264
+location=sets MPD locations to given URL
+location_crc=2493686601
+base=sets base URLs of MPD
+base_crc=824861713
+refresh=MPD refresh rate for dynamic, in seconds. A negative value sets the MPD duration. If 0, uses dash duration
+refresh_crc=4029772805
+tsb=Sets time-shift buffer depth in seconds. A negative value means infinity
+tsb_crc=3643999879
+subdur=specifies maximum duration of the input file to be segmentated. This does not change the segment duration, segmentation stops once segments produced exceeded the duration.
+subdur_crc=881872903
+ast=for live mode, sets start date (as xs:date, eg YYYY-MM-DDTHH:MM:SSZ. Default is now. !! Do not use with multiple periods, nor when DASH duration is not a multiple of GOP size !!
+ast_crc=3116941388
+state=path to file used to store/reload state info when simulating live. This is stored as a valid MPD with GPAC XML extensions
+state_crc=230281675
+loop=loops source file when dashing with subdur and state. If not set, a new period is created once the source is over
+loop_crc=3713770963
+split=enables cloning samples for text/metadata/scene description streams, marking further clones as redundant
+split_crc=1586303016
+hlsc=inserts clock reference in variant playlist in live HLS
+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_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
+cmpd=skips line feed and spaces in MPD XML for more compacity
+cmpd_crc=3957816220
+_p_gentime=pointer to u64 holding the ntp clock in ms of next DASH generation in live mode
+_p_gentime_crc=2500516562
+_p_mpdtime=pointer to u64 holding the mpd time in ms of the last generated segment
+_p_mpdtime_crc=2221099631
+[tileagg]
+desc=Video tile aggregator for HEVC
+desc_crc=2683596396
+drop=Specify indexes of tiles to drop
+drop_crc=4121476755
+[pin]
+desc=pipe input
+desc_crc=896381415
+help=@This filter handles generic input pipes (mono-directionnal) in blocking or non blocking mode.
+Input pipes cannot seek
+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)
+It can be set to run forever (until the session is closed), ignoring any potential pipe close on the writing side
+Data format of the pipe should be specified using extension (either in file name or through ext option) or mime type.
+If neither is set, data format probing will be done
+
+On Windows hosts, the default pipe prefix is "\\.\pipe\gpac\" if no prefix is set 
+	EX dst=mypipe resolves in \\.\pipe\gpac\mypipe
+	EX dst=\\.\pipe\myapp\mypipe resolves in \\.\pipe\myapp\mypipe
+Any destination name starting with \\ is used as is, with \ translated in /
+
+Input pipes are created by default in non-blocking mode
+
+The pipe input can create the pipe if not found using mkp option. On windows hosts, this will create a pipe server.
+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:
+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
+src=location of source content
+src_crc=3972578009
+block_size=buffer size used to read pipe
+block_size_crc=3061152364
+ext=indicates file extension of pipe data
+ext_crc=700124000
+mime=indicates mime type of pipe data
+mime_crc=1064584767
+blk=opens pipe in block mode - see filter help
+blk_crc=2775489198
+ka=keep-alive pipe when end of input is detected - see filter help
+ka_crc=423639628
+mkp=create pipe if not found - see filter help
+mkp_crc=627091973
+[pout]
+desc=pipe output
+desc_crc=3061618447
+help=@This filter handles generic output pipes (mono-directionnal) in blocking mode only.
+Output pipes don't currently support non blocking mode
+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)
+Data format of the pipe must currently be specified using extension (either in filename or through ext option) or mime type
+The pipe name indicated in dst can use template mechanisms from gpac, e.g. dst=pipe_$ServiceID$
+
+On Windows hosts, the default pipe prefix is "\\.\pipe\gpac\" if no prefix is set 
+	EX dst=mypipe resolves in \\.\pipe\gpac\mypipe
+	EX dst=\\.\pipe\myapp\mypipe resolves in \\.\pipe\myapp\mypipe
+Any destination name starting with \\ is used as is, with \ translated in /
+
+The pipe input can create the pipe if not found using mkp option. On windows hosts, this will create a pipe server.
+On non windows hosts, the created pipe will delete the pipe file upon filter destruction@
+help_crc=2537976292
+dst=location of destination file
+dst_crc=821593475
+ext=indicates file extension of pipe data
+ext_crc=700124000
+mime=indicates mime type of pipe data
+mime_crc=1064584767
+dynext=indicates the file extension is set by filter chain, not dst
+dynext_crc=1468217109
+start=sets playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start_crc=867548297
+speed=sets playback speed
+speed_crc=1335286326
+mkp=create pipe if not found - see filter help
+mkp_crc=627091973
+block_size=buffer size used to write to pipe, windows only
+block_size_crc=1196031025
+[gsfm]
+desc=GPAC Super/Simple/Serialized/Stream/State Format multiplexer
+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 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.
+For data packets, each fragment is encrypted individually to avoid error propagation in case of losses.
+For other packets, the entire packet is encrypted before fragmentation (fragments cannot be processed individually).
+For header/tunein packets, the first 25 bytes after the header are in the clear (signature,version,IV and pattern).
+The IV is constant to avoid packet overhead, randomly generated if not set and sent in the initial stream header. Pattern mode can be used (cf CENC cbcs) to encrypt K block and leave N blocks in the clear
+
+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.
+The skp option may also be used to specify which property to drop:
+	EX: skp="4CC1,Name2
+This will remove properties of type 4CC1 and properties (built-in or not) of name Name2
+
+@
+help_crc=674252074
+sigsn=signal packet sequence number after header field and before size field. Sequence number is per PID, encoded on 16 bits. Header packet does not have a SN
+sigsn_crc=2881341237
+sigdur=signal duration
+sigdur_crc=2956144634
+sigbo=signal byte offset
+sigbo_crc=712939432
+sigdts=signal decoding timestamp
+sigdts_crc=2272876547
+dbg=debug mode, skips packet or force packet size to 0
+dbg_crc=276458543
+key=encrypts packets using given key - see filter helps
+key_crc=761663705
+IV=sets IV for encryption - a constant IV is used to keep packet overhead small (cbcs-like)
+IV_crc=4150683076
+pattern=sets nb crypt / nb_skip block pattern. default is all encrypted
+pattern_crc=1443111083
+mpck=sets max packet size. 0 means no fragmentation (each AU is sent in one packet)
+mpck_crc=3469220762
+magic=magic string to append in setup packet
+magic_crc=950225201
+skp=comma separated list of pid property names to skip - see filter help
+skp_crc=649594567
+minp=includes only the minimum set of properties required for stream processing - see filter help
+minp_crc=3288650696
+crate=carousel period for tune-in info in seconds - see filter help
+crate_crc=233595902
+[gsfd]
+desc=GPAC Super/Simple/Serialized/Stream/State Format demultiplexer
+desc_crc=3195342797
+help=@This filter deserialize the stream states (config/reconfig/info update/remove/eos) and packets of input PIDs.
+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
+
+The stream format can be encrypted in AES 128 CBC mode, in which case the demux filters has to be given a 128 bit key.@
+help_crc=2170380418
+key=key for decrypting packets
+key_crc=3137419262
+magic=magic string to check in setup packet
+magic_crc=1086934258
+mq=sets max packet queue length for loss detection. 0 will flush incomplete packet when a new one starts
+mq_crc=3948056643
+pad=byte value used to pad lost packets
+pad_crc=567022909
+[sockout]
+desc=UDP / TCP socket output
+desc_crc=706603685
+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.
+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
+The socket output can be configured to drop or revert packet order for test purposes. In both cases, 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
+If the numerator is 0, a packet is randomly chosen in that window
+	EX: :pckd=4/10
+This drops every 4th packet of each 10 packet window
+	EX: :pckr=0/100
+This reverts the send order of one random packet in each 100 packet window
+
+@
+help_crc=2884219652
+dst=location of destination file
+dst_crc=821593475
+sockbuf=block size used to read file
+sockbuf_crc=29840651
+port=default port if not specified
+port_crc=3919277725
+ifce=default multicast interface
+ifce_crc=2634186680
+ext=indicates file extension of pipe data
+ext_crc=700124000
+mime=indicates mime type of pipe data
+mime_crc=1064584767
+listen=indicates the output socket works in server mode
+listen_crc=1400617944
+maxc=max number of concurrent connections
+maxc_crc=2929003351
+ka=keep socket alive if no more connections
+ka_crc=3219833474
+kp=keep packets in queue if no more clients
+kp_crc=989374280
+start=sets playback start offset, [-1, 0] means percent of media dur, eg -1 == dur
+start_crc=867548297
+speed=sets playback speed
+speed_crc=1335286326
+rate=sets send rate, disabled by default (as fast as possible)
+rate_crc=1201178208
+pckr=reverse packet every N - see filter help
+pckr_crc=1266362871
+pckd=drop packet every N - see filter help
+pckd_crc=141742775
+[rfav1]
+desc=AV1 reframer
+desc_crc=2440643930
+fps=import frame rate
+fps_crc=894530348
+autofps=detect FPS from bitstream, fallback to fps option if not possible
+autofps_crc=2459069437
+index_dur=indexing window length
+index_dur_crc=400520
+[ufobu]
+desc=OBU to IVF/OBU/annexB writer
+desc_crc=1909868685
+help=The OBU rewrite filter is used to rewrite the OBU bitstream into IVF, annex B or OBU sequence, reinserting the temporal delimiter OBU
+help_crc=3160818170
+rcfg=Force repeating decoder config at each I-frame
+rcfg_crc=1063479090
+[atscin]
+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.
+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
+	"x-dash-first-seg: NAME" indicates the name of the first segment completely retrieved from the broadcast
+	"x-atsc-loop: yes" indicates a loop in the service has been detected
+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.
+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"@
+help_crc=2438370667
+src=location of source content - see filter help
+src_crc=2057671206
+ifce=IP of the default interface to use for multicast. If NULL, the default system interface will be used
+ifce_crc=2720424345
+cache=indicates the files should populate GPAC HTTP cache - see filter help
+cache_crc=3991612955
+service=ID of service to bootstrap on. 0 means tune to no service, -1 tune all services -2 means tune on first service found
+service_crc=2153960510
+buffer=UDP socket receive buffer size to use in bytes
+buffer_crc=3107696634
+timeout=timeout in ms after which tunein fails
+timeout_crc=52156333
+kc=keeps corrupted file
+kc_crc=2656289289
+sr=skips repeated files - ignored in cache mode
+sr_crc=3811532847
+stsi=defines one output pid per tsi/serviceID - ignored in cache mode, see filter help
+stsi_crc=1919500824
+[ffdmx]
+desc=FFMPEG demuxer Lavf58.19.100
+desc_crc=3623408448
+help=See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more detailed info on demuxers options
+help_crc=2773937765
+src=location of source content
+src_crc=3972578009
+*=Any possible args defined for AVFormatContext and sub-classes
+*_crc=3038444400
+[ffdec]
+desc=FFMPEG decoder Lavc58.33.100
+desc_crc=1676202269
+help=See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more detailed info on decoder options
+help_crc=3645840873
+*=Any possible args defined for AVCodecContext and sub-classes
+*_crc=3590061128
+[ffavin]
+desc=FFMPEG Audio Video Capture Lavd58.4.105
+desc_crc=1713481961
+help=@Typical classes ar 'dshow' on windows, 'avfoundation' on OSX, 'video4linux2' or 'x11grab' on linux
+
+Typical device name can be the webcam name:
+'FaceTime HD Camera' on OSX, device name on windows, '/dev/video0' on linux
+'screen-capture-recorder', see http://screencapturer.sf.net/ on windows
+'Capture screen 0' on OSX (0=first screen)
+X display name (eg ':0.0') on linux
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more detailed info on capture devices options@
+help_crc=3558347629
+src=url of device, video:// audio:// or av://
+src_crc=498597052
+fmt=name of device class - see filter help. If not set, defaults to first device class
+fmt_crc=984977400
+dev=name of device or index of device - see filter help
+dev_crc=1788567366
+copy=Copy raw frames rather instead of sharing them
+copy_crc=2380977802
+sclock=Use system clock (us) instead of device timestamp (for buggy devices)
+sclock_crc=4121739073
+probes=Probes a given number of video frames before emitting - this usually helps with bad timing of the first frames
+probes_crc=2991822157
+*=Any possible args defined for AVInputFormat and AVFormatContext
+*_crc=2282268849
+[ffsws]
+desc=FFMPEG video rescaler SwS5.2.100
+desc_crc=2667761521
+help=@For bicubic, to tune the shape of the basis function, p1 tunes f(1) and p2 f´(1)
+For gauss p1 tunes the exponent and thus cutoff frequency
+For lanczos p1 tunes the width of the window function
+See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more detailed info on rescaler options@
+help_crc=1152263406
+size=size of output video. When not set, input size is used
+size_crc=3013168504
+pfmt=pixel format for output video. When not set, input format is used
+pfmt_crc=3385868644
+scale=scaling mode
+scale_crc=1787905575
+p1=scaling algo param1 - see filter info
+p1_crc=3248942273
+p2=scaling algo param2 - see filter info
+p2_crc=3750392874
+[ffenc]
+desc=FFMPEG encoder Lavc58.33.100
+desc_crc=1585704748
+help=See FFMPEG documentation (https://ffmpeg.org/documentation.html) for more detailed info on encoder options
+help_crc=4200915646
+c=codec identifier. Can be any supported GPAC ID or ffmpeg ID or filter subclass name
+c_crc=555030123
+pfmt=pixel format for input video. When not set, input format is used
+pfmt_crc=1510696702
+all_intra=only produces intra frames
+all_intra_crc=95202502
+ls=outputs log
+ls_crc=2313182371
+*=Any possible args defined for AVCodecContext and sub-classes
+*_crc=3590061128
+[ohevcdec]
+desc=OpenHEVC decoder
+desc_crc=946975516
+threading=Set threading mode
+threading_crc=3260668799
+nb_threads=Set number of threads. If 0, uses number of cores minus one
+nb_threads_crc=3233565253
+no_copy=Directly dispatch internal decoded frame without copy
+no_copy_crc=1587072150
+pack_hfr=Packs 4 consecutive frames in a single output
+pack_hfr_crc=3457532627
+seek_reset=Resets decoder when seeking
+seek_reset_crc=2431770610
+force_stereo=Forces stereo output for multiview (top-bottom only)
+force_stereo_crc=1504896698

gpac-1.0.0.tar.gz/share/res Added

gpac-1.0.0.tar.gz/share/res/gpac.mp4 Added

gpac-1.0.0.tar.gz/share/res/gpac.png Changed

gpac-1.0.0.tar.gz/share/res/gpac_cfg_test.mp4 Added

gpac-1.0.0.tar.gz/share/scripts Added

gpac-1.0.0.tar.gz/share/scripts/ttml-renderer.js Added

@@ -0,0 +1,237 @@
+/* JavaScript Renderer for TTML tracks
+   Generates GPAC Scene Graph (SVG) to display TTML docs
+
+The renderer is currently extremely basic:
+- only displays text samples in a single view area
+- no backcolor, no highlight, limited font support
+- no image attachments
+
+The SVG scenegraph uses uDOM for scripting
+
+The native code will look for the following functions:
+
+function on_ttml_sample(ttmldoc, scene_time, pck_dur)
+ @ttmldoc: DOM document representing the TTML doc
+ @scene_time: scene time in milliseconds as int
+ @pck_dur: packet duration in seconds as double, if known, or 0 otherwise
+
+ The function may return a positive value in milliseconds indicating to call back the on_ttml_clock in the given amount of time (for animations and text off toggle)
+If the return value is <=0, on_ttml_clock will not be called
+
+The ttmldoc may be kept alive in the script for later usage (it is not destroyed by the native code after the on_ttml_sample function is called).
+
+A TTML sample will contain a valid TTML document containing typically a single TTML <p>
+
+function on_ttml_clock(scene_time)
+ @scene_time: scene time in milliseconds as int
+
+The function may return a positive value in milliseconds indicating to call back the on_ttml_clock in the given amount of time (for animations and text off toggle)
+If the return value is <=0, on_ttml_clock will not be called
+ */
+
+var ttml_dbg = false;
+var ttml_view_area = false;
+
+function ttml_dbg_msg(msg) {
+	if (ttml_dbg) {
+		alert(msg);
+	}
+}
+
+var rect = document.documentElement.getRectPresentationTrait("viewBox");
+var width = rect.width;
+var height = rect.height;
+
+ttml_dbg_msg("TTML Rendered Loaded size: " + width + "x" + height);
+
+//filter-assignable variables - if changing names, also do it in filters/dec_webvtt.c
+var xOffset = 5;
+var yOffset = 5;
+var fontSize = 20;
+var textColor = "white";
+var fontFamily = "SANS";
+var lineSpaceFactor = 1.0;
+var v_align = 0;
+//end of filter-assignable variables
+
+//for now only one
+var display_area = document.createElement("g");
+document.documentElement.appendChild(display_area);
+
+function create_text_area(settings) {
+	var t = document.createElement("textArea");
+	t.setAttribute("x", xOffset + settings.x_offset);
+	t.setAttribute("y", yOffset);
+	var w, h;
+	if (settings.align_top==2) {
+		t.setAttribute("display-align", "before");
+		h=height - 2*yOffset;
+	} else if (settings.align_top==1) {
+		t.setAttribute("display-align", "center");
+		h=height - 2*yOffset;
+	} else {
+		t.setAttribute("display-align", "after");
+		h = height - 2*yOffset - settings.linePosition;
+	}
+	w = settings.size - 2*(xOffset + settings.x_offset);
+	t.setAttribute("height", h);
+	t.setAttribute("width", w);
+	ttml_dbg_msg("Creating textArea size " + w + " x " + h + " - xoffset: " + xOffset);
+	
+	t.setAttribute("fill", textColor);
+	t.setAttribute("font-size", fontSize);
+	t.setAttribute("font-family", fontFamily);
+	t.setAttribute("text-align", settings.align);
+	t.setAttribute("line-increment", lineSpaceFactor*fontSize);
+
+	if (ttml_view_area) {
+		var r = document.createElement("rect");
+		r.setAttribute("x", xOffset+settings.x_offset);
+		r.setAttribute("y", yOffset);
+		r.setAttribute("fill", "cyan");
+		r.setAttribute("width", w);
+		r.setAttribute("height", h);
+		display_area.appendChild(r);
+	}
+
+	display_area.appendChild(t);
+	ttml_dbg_msg("textArea created: "+t);
+	return t;
+}
+
+function add_text_span(parent, text, styles) {
+	var i;
+	var span = document.createElement('tspan');
+
+	if (styles != undefined) {
+		if (styles.italic) span.setAttribute("font-style", "italic");
+		if (styles.underlined) span.setAttribute("text-decoration", "underline");
+		if (styles.bold) span.setAttribute("font-weight", "bold");
+	}
+	span.textContent = text;
+	parent.appendChild(span);
+	ttml_dbg_msg("tspan created "+span + " in " + parent);
+	return span;
+}
+
+function parse_sample_settings(ttmldoc, tsample)
+{
+	ttml_dbg_msg("Parsing sample settings");
+	var obj = {};
+	obj.linePosition = lineSpaceFactor*fontSize;
+	obj.align_top = v_align;
+	obj.x_offset = 0;
+	obj.size = 100;
+	obj.size *= width/100;
+	
+	obj.align = "center";
+	return obj;
+}
+
+function parse_time(timestamp)
+{
+	var result = 0;
+	if (timestamp.indexOf(':')>0) {
+		var nums = timestamp.split(':');
+		result = parseInt(nums[0]) * 3600; 
+		result += parseInt(nums[1]) * 60;
+		result*= 1000;
+		result += 1000 * Number.parseFloat(nums[2]); 
+	}
+	else if (timestamp.indexOf('s')>0) {
+		result = 1000 * Number.parseFloat(timestamp); 
+	}
+	return result;
+}
+
+function push_ttml_text_node(textArea, node, styles)
+{
+	var children = node.childNodes;
+		ttml_dbg_msg("child " + node.nodeName + " children " + children.length);
+
+	for (var i=0; i<children.length; i++) {
+		var t = children.item(i);
+		if (t.nodeName ==='br') {
+			ttml_dbg_msg("line break");
+			textArea.appendChild(document.createElement('tbreak'));
+			continue;
+		}
+		if (t.nodeName ==='i') {
+			styles.italic++;
+			push_ttml_text_node(textArea, t, styles);
+			styles.italic--;
+			continue;
+		}
+		if (t.nodeName ==='b') {
+			styles.bold++;
+			push_ttml_text_node(textArea, t, styles);
+			styles.bold--;
+			continue;
+		}
+		if (t.nodeName ==='u') {
+			styles.underlined++;
+			push_ttml_text_node(textArea, t, styles);
+			styles.underlined--;
+			continue;
+		}
+		if (t.nodeName ==='span') {
+			push_ttml_text_node(textArea, t, styles);
+			continue;
+		}
+		ttml_dbg_msg("child " + t.nodeName + " txt " + t.textContent);
+		add_text_span(textArea, t.textContent, styles);
+	}
+}
+
+let sample_end = 0;
+
+function on_ttml_sample(ttmldoc, scene_time, pck_dur)
+{
+	ttml_dbg_msg("TTML sample at " + scene_time + " pck dur " + pck_dur);
+
+	display_area.textContent = '';
+	var samples = ttmldoc.getElementsByTagName("p");
+	var styles = {"italic": 0, "underlined": 0, "bold": 0};
+
+	if (samples.length>1) {
+		alert("TTML sample has " + samples.length + " defined, only the last sample will be displayed");
+	}
+	ttml_dbg_msg(samples.length + " text samples");
+	for (var i=0; i<samples.length; i++) {
+		var sample_start = 0;
+		var s = samples.item(i);
+		var begin = s.getAttribute('begin');
+		var end = s.getAttribute('end');
+		var region = s.getAttribute('region');
+		var id = s.getAttribute('id');
+
+		sample_end = parse_time(end);
+		if (begin)
+			sample_start = parse_time(begin);
+
+		ttml_dbg_msg("sample start: " + sample_start + " end: " + sample_end + " region " + region + " id " + id);
+
+		if (sample_start < scene_time)
+			break;
+
+		if (sample_end < scene_time) 
+			continue;
+
+		var settings = parse_sample_settings(ttmldoc, s);
+		var tA = create_text_area(settings);
+		push_ttml_text_node(tA, s, styles);
+	}
+	if (sample_end > scene_time) return sample_end - scene_time;
+	return 0;
+}
+
+function on_ttml_clock(scene_time)
+{
+	if (sample_end > scene_time) {
+		ttml_dbg_msg("not over yet: " + scene_time + " vs last end " + sample_end);
+		return sample_end - scene_time;
+	}
+	ttml_dbg_msg("sample is over ");
+	display_area.textContent = '';
+	return 0;
+}

gpac-1.0.0.tar.gz/share/scripts/webvtt-renderer.js Added

@@ -0,0 +1,289 @@
+/* JavaScript Renderer for WebVTT tracks
+   Generates GPAC Scene Graph (SVG, BIFS) to display WebVTT cues */
+alert("WebVTT Rendered Loaded");
+
+var DEBUG = false;
+
+var rect = document.documentElement.getRectPresentationTrait("viewBox");
+var width = rect.width;
+var height = rect.height;
+
+//filter-assignable variables - if changing names, also do it in filters/dec_webvtt.c
+var xOffset = 5;
+var yOffset = 5;
+var fontSize = 20;
+var textColor = "white";
+var fontFamily = "SANS";
+var lineSpaceFactor = 1.0;
+//end of filter-assignable variables
+
+var nbCues = 0;
+
+var cueArea = document.createElement("g");
+document.documentElement.appendChild(cueArea);
+
+function reportMessage(msg) {
+	if (DEBUG) {
+		alert(msg);
+	}
+}
+
+function createTextArea(settingsObj) {
+	var t = document.createElement("textArea");
+	t.setAttribute("x", xOffset+settingsObj.xPosition);
+	t.setAttribute("y", yOffset);
+	var w, h;
+	if (settingsObj.fromTop) {
+		t.setAttribute("display-align", "before");
+		h=height-2*yOffset;
+	} else {
+		t.setAttribute("display-align", "after");
+		h = height-2*yOffset-settingsObj.linePosition;
+	}
+	w = settingsObj.size-2*xOffset;
+	t.setAttribute("height", h);
+	t.setAttribute("width", w);
+	reportMessage("Creating textArea size " + w + " x " + h);
+	
+	t.setAttribute("fill", textColor);
+	t.setAttribute("font-size", fontSize);
+	t.setAttribute("font-family", fontFamily);
+	t.setAttribute("text-align", settingsObj.align);
+	t.setAttribute("line-increment", lineSpaceFactor*fontSize);
+	cueArea.appendChild(t);
+	reportMessage("textArea created: "+t);
+	return t;
+}
+
+function printObj(o) {
+  for (var p in o) {
+	if (o.hasOwnProperty(p)) {
+	  alert(""+p+": "+o[p]);
+    }
+  }
+}
+
+function addSpan(parent, cuePart) {
+	reportMessage("adding tspan to "+parent+" with cuePart: "+ cuePart);
+	var i;
+	var span = document.createElement('tspan');
+	//alert('adding span for '+parent+': '+cuePart+' token:'+cuePart.token);
+	if (cuePart.token === undefined) {
+		span.textContent = cuePart;
+	} else {
+		if (cuePart.token === 'i') {
+			span.setAttribute("font-style", "italic");
+		} else if (cuePart.token === 'u') {
+			span.setAttribute("text-decoration", "underline");
+		} else if (cuePart.token === 'b') {
+			span.setAttribute("font-weight", "bold");
+		}
+		for (i in cuePart.children) {
+			addSpan(span, cuePart.children[i]);
+		}
+	}
+	parent.appendChild(span);
+	reportMessage("tspan created "+span);
+	return span;
+}
+
+function parseCueSettings(cueSettings){
+	reportMessage("Parsing cue settings: "+cueSettings);
+	var obj = {};
+	var settingsArray = cueSettings.split(/\s/g);
+	//.filter(function(set) { return set && !!set.length; });
+
+	// Convert the Array into an object 
+	var compositeCueSettings = {};
+	for (var settingsIndex in settingsArray) {
+		var nvArray = settingsArray[settingsIndex].split(":");
+		compositeCueSettings[nvArray[0]] = nvArray[1];
+	}
+
+	// Compute real values
+	if (compositeCueSettings.line !== undefined) {
+		if (compositeCueSettings.line.match(/\%/)) {
+			obj.linePosition = parseFloat(compositeCueSettings.line.replace(/\%/ig,""));
+			if (isNaN(obj.linePosition)) {
+				obj.linePosition = nbCues*lineSpaceFactor*fontSize;
+			} else {
+				obj.linePosition *= height/100;
+			}
+		} else {
+			obj.linePosition = parseFloat(compositeCueSettings.line)*lineIncrement;
+			if (isNaN(obj.linePosition)) {
+				obj.linePosition = nbCues*lineSpaceFactor*fontSize;
+			} else {
+				if (obj.linePosition > 0) {
+					obj.fromTop = true;
+				} else {
+					obj.fromTop = false;
+					obj.linePosition = -obj.linePosition;
+				}
+			}
+		}
+	} else {
+		obj.linePosition = nbCues*lineSpaceFactor*fontSize;
+	}
+	reportMessage("linePosition: "+obj.linePosition);
+	if (compositeCueSettings.position !== undefined) {
+		obj.xPosition = parseFloat(compositeCueSettings.position.replace(/\%/ig,""));
+		if (isNaN(obj.xPosition)) {
+			obj.xPosition = 50;
+		} else {
+			obj.xPosition *= width/100;
+		}
+	} else {
+		obj.xPosition = 50;
+	}
+	reportMessage("xPosition: "+obj.xPosition);
+	if (compositeCueSettings.size !== undefined) {
+		obj.size = parseFloat(compositeCueSettings.size.replace(/\%/ig,""));
+		if (isNaN(obj.size)) {
+			obj.size = 100;
+		}
+	} else {
+		obj.size = 100;
+	}
+	obj.size *= width/100;
+	
+	reportMessage("size: "+obj.size);
+	if (compositeCueSettings.align !== undefined) {
+		if (compositeCueSettings.align === "middle") {
+			obj.align = "center";
+		} else if (compositeCueSettings.align === "left") {
+			obj.align = "start";
+		} else if (compositeCueSettings.align === "right") {
+			obj.align = "end";
+		} else if (compositeCueSettings.align === "start") {
+			obj.align = "start";
+		} else if (compositeCueSettings.align === "end") {
+			obj.align = "end";
+		} else {
+			obj.align = "center";
+		}
+	} else {
+		obj.align = "center";
+	}
+	reportMessage("align: "+obj.align);
+	reportMessage("cue settings parsed: "+obj);
+	return obj;
+}
+
+function removeCues() {
+	cueArea.textContent = '';
+	nbCues = 0;
+}
+
+function addCue(id, start, end, settings, payload) {
+	reportMessage("adding cue: "+id+","+start+","+end+","+settings+","+payload);
+	var lines = payload.split('\n');
+	var settingObj = parseCueSettings(settings);
+	var tA = createTextArea(settingObj);
+	for (var lineIndex in lines) {
+		var parsedCue = parseCue(lines[lineIndex]);
+		for (var cuePartIndex in parsedCue) {
+			addSpan(tA, parsedCue[cuePartIndex]);
+		}
+		tA.appendChild(document.createElement('tbreak'));
+	}
+	nbCues++;
+	reportMessage("cue added: "+tA);
+}
+
+/* Code adapted from https://raw.github.com/cgiffard/Captionator/master/js/captionator.js */
+var SRTChunkTimestampParser		= /(\d{2})?:?(\d{2}):(\d{2})[\.\,](\d+)/; 
+function parseCue(cueText) {
+	reportMessage("Parsing cue text: "+cueText);
+
+	var cueStructure = new Array,
+		cueSplit = [],
+		splitIndex,
+		currentToken,
+		currentContext,
+		stack = [],
+		stackIndex = 0,
+		chunkTimestamp,
+		timeData,
+		lastCueTime;
+					
+	cueSplit = cueText.split(/(<\/?[^>]+>)/ig);
+				
+	currentContext = cueStructure;
+	for (splitIndex in cueSplit) {
+		if (cueSplit.hasOwnProperty(splitIndex)) {
+			currentToken = cueSplit[splitIndex];
+			
+			if (currentToken.substr(0,1) === "<") {
+				if (currentToken.substr(1,1) === "/") {
+					// Closing tag
+					var TagName = currentToken.substr(2).split(/[\s>]+/g)[0];
+					if (stack.length > 0) {
+						// Scan backwards through the stack to determine whether we've got an open tag somewhere to close.
+						var stackScanDepth = 0;
+						for (stackIndex = stack.length-1; stackIndex >= 0; stackIndex --) {
+							var parentContext = stack[stackIndex][stack[stackIndex].length-1];
+							stackScanDepth = stackIndex;
+							if (parentContext.token === TagName) { break; }
+						}
+					
+						currentContext = stack[stackScanDepth];
+						stack = stack.slice(0,stackScanDepth);
+					} else {
+						// Tag mismatch!
+						alert("Tag mismatch when parsing WebVTT cue: "+cueText);
+					}
+				} else {
+					// Opening Tag
+					// Check whether the tag is valid according to the WebVTT specification
+					// If not, don't allow it (unless the sanitiseCueHTML option is explicitly set to false)
+				
+					if ((	currentToken.substr(1).match(SRTChunkTimestampParser)	||
+							currentToken.match(/^<v\s+[^>]+>/i)						||
+							currentToken.match(/^<c[a-z0-9\-\_\.]+>/)				||
+							currentToken.match(/^<(b|i|u|ruby|rt)>/))				) {
+						
+						var tmpObject = {
+							"token":	currentToken.replace(/[<\/>]+/ig,"").split(/[\s\.]+/)[0],
+							"rawToken":	currentToken,
+							"children":	[]
+						};
+						
+						if (tmpObject.token === "v") {
+							tmpObject.voice = currentToken.match(/^<v\s*([^>]+)>/i)[1];
+						} else if (tmpObject.token === "c") {
+							tmpObject.classes = currentToken
+													.replace(/[<\/>\s]+/ig,"")
+													.split(/[\.]+/ig)
+													.slice(1)
+													.filter(hasRealTextContent);
+						} else if (!!(chunkTimestamp = tmpObject.rawToken.match(SRTChunkTimestampParser))) {
+							cueStructure.isTimeDependent = true;
+							timeData = chunkTimestamp.slice(1);
+							tmpObject.timeIn =	parseInt((timeData[0]||0) * 60 * 60,10) +	// Hours
+												parseInt((timeData[1]||0) * 60,10) +		// Minutes
+												parseInt((timeData[2]||0),10) +				// Seconds
+												parseFloat("0." + (timeData[3]||0));		// MS
+						}
+					
+						currentContext.push(tmpObject);
+						stack.push(currentContext);
+						currentContext = tmpObject.children;
+					}
+				}
+			} else {
+				// Text string
+				currentToken = currentToken
+								.replace(/</g,"&lt;")
+								.replace(/>/g,"&gt;")
+								.replace(/\&/g,"&amp;");
+					
+				currentToken = currentToken.replace(/\n+/g,"<br />");
+			
+				currentContext.push(currentToken);
+			}
+		}
+	}
+	reportMessage("cue text parsed: "+cueStructure);
+	return cueStructure;
+}

gpac-1.0.0.tar.gz/share/shaders Added

gpac-1.0.0.tar.gz/share/shaders/fragment.glsl Added

@@ -0,0 +1,335 @@
+/**
+ * Shader implementing: Clipping, Texturing (RGB and YUV), Lighting, Fog
+ **/
+
+//version defined first, at shader compilation
+#ifdef GF_GL_IS_ExternalOES
+#extension GL_OES_EGL_image_external : require
+#endif
+#if defined(GL_ES)
+#if defined(GL_FRAGMENT_PRECISION_HIGH)
+precision highp float;	//ES2.0 supporting highp
+#else
+precision mediump float;	//Default
+#endif
+#endif
+
+//#pragma STDGL invariant(all)	//removed due to incompatibility with the emulator
+
+//LIGHTS_MAX and CLIP_MAX defined at shader compilation
+
+
+#ifdef GF_GL_HAS_LIGHT
+
+#define FOG_TYPE_LINEAR 0
+#define FOG_TYPE_EXP    1
+#define FOG_TYPE_EXP2   2
+
+#define L_DIRECTIONAL	0
+#define L_SPOT		    1
+#define L_POINT			2
+
+//Light Structure
+struct gfLight{
+#if defined(GL_ES)
+	lowp int type;
+#else
+	int type;
+#endif
+	vec4 position;
+	vec4 direction;
+	vec3 attenuation;
+	vec4 color;
+	float ambientIntensity;	//it is not used - we calculate it inside the shader
+	float intensity;
+	float beamWidth;	//it is not used - we calculate it inside the shader
+	float cutOffAngle;
+};
+
+//Generic (Scene) Uniforms
+#if defined(GL_ES)
+uniform lowp int gfNumLights;
+#else
+uniform int gfNumLights;
+#endif
+uniform bool gfLightTwoSide;
+uniform gfLight lights[LIGHTS_MAX];
+
+//Material and Lighting Properties
+uniform vec4 gfAmbientColor;
+uniform vec4 gfDiffuseColor;
+uniform vec4 gfSpecularColor;
+uniform float gfShininess;	//a.k.a. specular exponent
+uniform vec4 gfLightDiffuse;
+uniform vec4 gfLightAmbient;
+uniform vec4 gfLightSpecular;
+
+//Fog
+uniform bool gfFogEnabled;
+uniform vec3 gfFogColor;
+
+#endif
+
+uniform bool hasMaterial2D;
+uniform vec4 gfEmissionColor;
+
+#ifdef GF_GL_HAS_COLOR
+uniform bool hasMeshColor;
+#endif
+
+#ifdef GF_GL_HAS_CLIP
+#if defined(GL_ES)
+uniform lowp int gfNumClippers;
+#else
+uniform int gfNumClippers;
+#endif
+#endif
+
+//Color Matrix
+uniform mat4 gfColorMatrix;
+uniform bool hasColorMatrix;
+uniform vec4 gfTranslationVector;
+	
+//Color Key
+uniform vec3 gfKeyColor;
+uniform float gfKeyAlpha;
+uniform float gfKeyLow;
+uniform float gfKeyHigh;
+uniform bool hasColorKey;
+
+//Varyings
+#ifdef GF_GL_HAS_LIGHT
+varying vec3 m_normal;
+varying vec4 gfEye;
+varying vec3 lightVector[LIGHTS_MAX];
+varying float gfFogFactor;
+#endif
+
+#ifdef GF_GL_HAS_TEXTURE
+varying vec2 TexCoord;
+#endif
+
+#ifdef GF_GL_HAS_COLOR
+varying vec4 m_color;
+#endif
+
+#ifdef GF_GL_HAS_CLIP
+varying float clipDistance[CLIPS_MAX];
+#endif
+
+//constants
+const float zero_float = 0.0;
+const float one_float = 1.0;
+
+
+#ifdef GF_GL_HAS_LIGHT
+vec4 doLighting(int i){
+
+	vec4 lightColor = vec4(zero_float, zero_float, zero_float, zero_float);
+	float att = zero_float;
+	gfLight tempLight;	//we use a temp gfLight, because array of straucts in fragment are not supported in android
+	vec3 lightVnorm; //normalized lightVector
+	vec3 lightV; //temp lightVector
+	vec3 halfVnorm; //temp lightVector
+
+	//FIXME - couldn't we use a light[i]. something here ?
+	if(i==0) {	//ES2 does not support switch() statements
+		tempLight = lights[0];
+		lightV = lightVector[0];
+		halfVnorm = normalize( lightVector[0] + gfEye.xyz );
+	} else if (i==1) {
+		tempLight = lights[1];
+		lightV = lightVector[1];
+		halfVnorm = normalize( lightVector[1] + gfEye.xyz );
+	} else if(i==2) {
+		tempLight = lights[2];
+		lightV = lightVector[2];
+		halfVnorm = normalize( lightVector[2] + gfEye.xyz );
+	}
+	
+	lightVnorm = normalize(lightV);
+	vec3 normal = normalize(m_normal);
+
+	if (gfLightTwoSide && (!gl_FrontFacing)){//light back face
+		//originally: normal *=-1; -> Not compliant with Shading Language v1.0
+		normal *= vec3(-1.0, -1.0, -1.0);
+	}
+	
+	float light_cos = max(zero_float, dot(normal, lightVnorm));	//ndotl
+	float half_cos = dot(normal, halfVnorm);
+
+	if (tempLight.type == L_POINT) {	//we have a point
+		float distance = length(lightV);	
+		att = 1.0 / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
+
+		if (att <= 0.0)
+			return lightColor;
+			
+		lightColor += light_cos * tempLight.color * gfDiffuseColor;
+		
+		if (light_cos > 0.0) {
+			float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
+			lightColor += (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
+			lightColor *= att;
+		}
+		lightColor.a = gfDiffuseColor.a;
+		return lightColor;
+		
+	} else if (tempLight.type == L_SPOT) {	//we have a spot
+		if (light_cos > 0.0) {
+			float spot = dot(normalize(tempLight.direction.xyz), lightVnorm);	//it should be -direction, but we invert it before parsing
+			if (spot > tempLight.cutOffAngle) {
+				float distance = length(lightV);	
+				float dotNormHalf = max(dot(normal, halfVnorm),0.0);	//ndoth
+				spot = pow(spot, tempLight.intensity);
+				att = spot / (tempLight.attenuation.x + tempLight.attenuation.y * distance + tempLight.attenuation.z * distance * distance);
+				lightColor += att * (light_cos * tempLight.color * gfDiffuseColor);
+				lightColor += att * (pow(dotNormHalf, gfShininess) * gfSpecularColor * tempLight.color);
+			}
+		}
+		return lightColor;
+
+	} else if(tempLight.position.w == zero_float || tempLight.type == L_DIRECTIONAL) { //we have a direction
+		vec3 lightDirection = vec3(tempLight.position);
+		lightColor = (gfDiffuseColor * gfLightDiffuse) * light_cos; 
+		if (half_cos > zero_float) {
+			lightColor += (gfSpecularColor * gfLightSpecular) * pow(half_cos, gfShininess);
+		}
+		lightColor.a = gfDiffuseColor.a;
+		return lightColor;
+	}
+
+	return vec4(zero_float);
+}
+#endif //GF_GL_HAS_LIGHT
+
+void main()
+{
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	bool do_clip=false;
+#endif
+	int i;
+	vec2 texc;
+	vec3 yuv, rgb;
+	vec4 rgba, fragColor;
+
+#ifdef GF_GL_HAS_CLIP
+	//clipping
+	for (int i=0; i<CLIPS_MAX; i++) {
+		if (i==gfNumClippers) break;
+		if (clipDistance[i]<0.0) {
+			//do not discard on GLES too slow on most devices
+#if defined(GL_ES)
+			do_clip=true;
+			break;
+#else
+			discard;
+#endif
+		}
+	}
+#endif
+	
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	if (do_clip) {
+		gl_FragColor = vec4(zero_float);
+	} else {
+#endif
+		
+		
+#ifdef GF_GL_HAS_COLOR
+	fragColor = m_color;
+#else
+	fragColor = vec4(zero_float);
+#endif
+
+	if (hasMaterial2D) {
+		fragColor = gfEmissionColor;
+	}
+
+#if defined (GF_GL_HAS_LIGHT)
+	if (gfNumLights>0) {
+#ifdef GF_GL_HAS_COLOR
+		fragColor += (gfAmbientColor * gfLightAmbient);
+#else
+		fragColor = gfEmissionColor + (gfAmbientColor * gfLightAmbient);
+#endif
+	}
+#endif
+
+#ifdef GF_GL_HAS_LIGHT
+	if (gfNumLights > 0) {
+		for (int i=0; i<LIGHTS_MAX; i++) {
+			if (i==gfNumLights) break;
+			fragColor += doLighting(i);
+		}
+		fragColor.a = gfDiffuseColor.a;
+	}
+#endif
+	
+	fragColor = clamp(fragColor, zero_float, one_float);
+
+#ifdef GF_GL_HAS_TEXTURE
+	
+	//currently supporting 1 texture
+	rgba = maintx_sample(TexCoord);
+
+#ifdef GF_GL_HAS_LIGHT
+	if (gfNumLights>0) {	//RGB texture
+		fragColor *= rgba;
+	}
+	//RGB texture with material 2D [TODO: check]
+	else if(gfNumLights==0)
+#endif
+	{
+		fragColor = rgba;
+	}
+
+		//we have mat 2D + texture
+#ifndef GF_GL_IS_ExternalOES
+	if (hasMaterial2D) {
+		if (gfEmissionColor.a > 0.0) {
+			fragColor *= gfEmissionColor;
+		}
+		//hack - if full transparency on texture with material2D, use material color
+		else if (fragColor.rgb == vec3(0.0, 0.0, 0.0)){
+			fragColor.rgb = gfEmissionColor.rgb;
+		}
+	}
+#endif // GF_GL_IS_ExternalOES
+
+	
+#endif // GF_GL_HAS_TEXTURE
+	
+	
+	if (hasColorMatrix) {
+		fragColor = gfColorMatrix * fragColor;
+		fragColor += gfTranslationVector;
+		fragColor = clamp(fragColor, zero_float, one_float);
+	}
+	
+	if (hasColorKey) {
+		vec3 tempColour = vec3(0.0, 0.0, 0.0);
+		float mean = 0.0;
+		
+		tempColour.r = abs(gfKeyColor.r-fragColor.r);
+		tempColour.g = abs(gfKeyColor.g-fragColor.g);
+		tempColour.b = abs(gfKeyColor.b-fragColor.b);
+		mean = (tempColour.r + tempColour.g + tempColour.b)/3.0;
+		
+		if (mean<gfKeyLow) {
+			fragColor.a =0.0;
+		} else if(mean<=gfKeyHigh) {
+			fragColor.a = (mean-gfKeyLow) * gfKeyAlpha / (gfKeyHigh - gfKeyLow);
+		}
+	}
+	
+#ifdef GF_GL_HAS_LIGHT
+	if (gfFogEnabled)
+		fragColor = fragColor * gfFogFactor + vec4(gfFogColor, zero_float) * (one_float - gfFogFactor);
+#endif
+	gl_FragColor = fragColor;
+
+#if defined(GF_GL_HAS_CLIP) && defined(GL_ES)
+	}
+#endif
+}

gpac-1.0.0.tar.gz/share/shaders/vertex.glsl Changed

gpac-1.0.0.tar.gz/share/vis Added

gpac-1.0.0.tar.gz/share/vis/Code Added

gpac-1.0.0.tar.gz/share/vis/Code/Console.js Added

@@ -0,0 +1,194 @@
+
+Console = (function()
+{
+	var BORDER = 10;
+	var HEIGHT = 200;
+
+
+	function Console(wm, server)
+	{
+		// Create the window and its controls
+		this.Window = wm.AddWindow("Console", 10, 10, 100, 100);
+		this.PageContainer = this.Window.AddControlNew(new WM.Container(10, 10, 400, 160));
+		DOM.Node.AddClass(this.PageContainer.Node, "ConsoleText");
+		this.AppContainer = this.Window.AddControlNew(new WM.Container(10, 10, 400, 160));
+		DOM.Node.AddClass(this.AppContainer.Node, "ConsoleText");
+		this.UserInput = this.Window.AddControlNew(new WM.EditBox(10, 5, 400, 30, "Input", ""));
+		this.UserInput.SetChangeHandler(Bind(ProcessInput, this));
+		this.Window.ShowNoAnim();
+
+		// This accumulates log text as fast as is required
+		this.PageTextBuffer = "";
+		this.LastPageTextBufferLen = 0;
+		this.AppTextBuffer = "";
+		this.LastAppTextBufferLen = 0;
+
+		// Setup command history control
+		this.CommandHistory = LocalStore.Get("App", "Global", "CommandHistory", [ ]);
+		this.CommandIndex = 0;
+		this.MaxNbCommands = 200;
+		DOM.Event.AddHandler(this.UserInput.EditNode, "keydown", Bind(OnKeyPress, this));
+		DOM.Event.AddHandler(this.UserInput.EditNode, "focus", Bind(OnFocus, this));
+
+		// At a much lower frequency this will update the console window
+		window.setInterval(Bind(UpdateHTML, this), 500);
+
+		// Setup log requests from the server
+		this.Server = server;
+		server.SetConsole(this);
+		server.AddMessageHandler("LOGM", Bind(OnLog, this));
+	}
+
+
+	Console.prototype.Log = function(text)
+	{
+		this.PageTextBuffer = LogText(this.PageTextBuffer, text);
+	}
+
+
+	Console.prototype.WindowResized = function(width, height)
+	{
+		// Place window
+		this.Window.SetPosition(BORDER, height - BORDER - 200);
+		this.Window.SetSize(width - 2 * BORDER, HEIGHT);
+
+		// Place controls
+		var parent_size = this.Window.Size;
+		var mid_w = parent_size[0] / 3;
+		this.UserInput.SetPosition(BORDER, parent_size[1] - 2 * BORDER - 30);
+		this.UserInput.SetSize(parent_size[0] - 100, 18);
+		var output_height = this.UserInput.Position[1] - 2 * BORDER;
+		this.PageContainer.SetPosition(BORDER, BORDER);
+		this.PageContainer.SetSize(mid_w - 2 * BORDER, output_height);
+		this.AppContainer.SetPosition(mid_w, BORDER);
+		this.AppContainer.SetSize(parent_size[0] - mid_w - BORDER, output_height);
+	}
+
+
+	function OnLog(self, socket, data_view)
+	{
+	    var data_view_reader = new DataViewReader(data_view, 4);
+	    var text = data_view_reader.GetString();
+	    self.AppTextBuffer = LogText(self.AppTextBuffer, text);
+	}
+
+
+	function LogText(existing_text, new_text)
+	{
+		// Filter the text a little to make it safer
+		if (new_text == null)
+			new_text = "NULL";
+
+		// Find and convert any HTML entities, ensuring the browser doesn't parse any embedded HTML code
+		// This also allows the log to contain arbitrary C++ code (e.g. assert comparison operators)
+		new_text = Convert.string_to_html_entities(new_text);
+
+		// Prefix date and end with new line
+		var d = new Date();
+		new_text = "[" + d.toLocaleTimeString() + "] " + new_text + "<br>";
+
+		// Append to local text buffer and ensure clip the oldest text to ensure a max size
+		existing_text = existing_text + new_text;
+		var max_len = 10 * 1024;
+		var len = existing_text.length;
+		if (len > max_len)
+			existing_text = existing_text.substr(len - max_len, max_len);
+
+		return existing_text;
+	}
+
+
+	function UpdateHTML(self)
+	{
+		// Reset the current text buffer as html
+
+		if (self.LastPageTextBufferLen != self.PageTextBuffer.length)
+		{
+			var page_node = self.PageContainer.Node;
+			page_node.innerHTML = self.PageTextBuffer;
+			page_node.scrollTop = page_node.scrollHeight;
+			self.LastPageTextBufferLen = self.PageTextBuffer.length;
+		}
+
+		if (self.LastAppTextBufferLen != self.AppTextBuffer.length)
+		{		
+			var app_node = self.AppContainer.Node;
+			app_node.innerHTML = self.AppTextBuffer;
+			app_node.scrollTop = app_node.scrollHeight;
+			self.LastAppTextBufferLen = self.AppTextBuffer.length;
+		}
+	}
+
+
+	function ProcessInput(self, node)
+	{
+		// Send the message exactly
+		var msg = node.value;
+		self.Server.Send("CONI" + msg);
+
+		// Emit to console and clear
+		self.Log("> " + msg);
+		self.UserInput.SetValue("");
+
+		// Keep track of recently issued commands, with an upper bound
+		self.CommandHistory.push(msg);
+		var extra_commands = self.CommandHistory.length - self.MaxNbCommands;
+		if (extra_commands > 0)
+			self.CommandHistory.splice(0, extra_commands);
+
+		// Set command history index to the most recent command
+		self.CommandIndex = self.CommandHistory.length;
+
+		// Backup to local store
+		LocalStore.Set("App", "Global", "CommandHistory", self.CommandHistory);
+
+		// Keep focus with the edit box
+		return true;
+	}
+
+
+	function OnKeyPress(self, evt)
+	{
+		evt = DOM.Event.Get(evt);
+
+		if (evt.keyCode == Keyboard.Codes.UP)
+		{
+			if (self.CommandHistory.length > 0)
+			{
+				// Cycle backwards through the command history
+				self.CommandIndex--;
+				if (self.CommandIndex < 0)
+					self.CommandIndex = self.CommandHistory.length - 1;
+				var command = self.CommandHistory[self.CommandIndex];
+				self.UserInput.SetValue(command);
+			}
+
+			// Stops default behaviour of moving cursor to the beginning
+			DOM.Event.StopDefaultAction(evt);
+		}
+
+		else if (evt.keyCode == Keyboard.Codes.DOWN)
+		{
+			if (self.CommandHistory.length > 0)
+			{
+				// Cycle fowards through the command history
+				self.CommandIndex = (self.CommandIndex + 1) % self.CommandHistory.length;
+				var command = self.CommandHistory[self.CommandIndex];
+				self.UserInput.SetValue(command);
+			}
+
+			// Stops default behaviour of moving cursor to the end
+			DOM.Event.StopDefaultAction(evt);
+		}
+	}
+
+
+	function OnFocus(self)
+	{
+		// Reset command index on focus
+		self.CommandIndex = self.CommandHistory.length;
+	}
+
+
+	return Console;
+})();

gpac-1.0.0.tar.gz/share/vis/Code/DataViewReader.js Added

@@ -0,0 +1,47 @@
+
+//
+// Simple wrapper around DataView that auto-advances the read offset and provides
+// a few common data type conversions specific to this app
+//
+DataViewReader = (function ()
+{
+    function DataViewReader(data_view, offset)
+    {
+        this.DataView = data_view;
+        this.Offset = offset;
+    }
+
+    DataViewReader.prototype.GetUInt32 = function ()
+    {
+        var v = this.DataView.getUint32(this.Offset, true);
+        this.Offset += 4;
+        return v;
+    }
+
+    DataViewReader.prototype.GetUInt64 = function ()
+    {
+        var v = this.DataView.getFloat64(this.Offset, true);
+        this.Offset += 8;
+        return v;
+    }
+
+    DataViewReader.prototype.GetStringOfLength = function (string_length)
+    {
+        var string = "";
+        for (var i = 0; i < string_length; i++)
+        {
+            string += String.fromCharCode(this.DataView.getInt8(this.Offset));
+            this.Offset++;
+        }
+
+        return string;
+    }
+
+    DataViewReader.prototype.GetString = function ()
+    {
+        var string_length = this.GetUInt32();
+        return this.GetStringOfLength(string_length);
+    }
+
+    return DataViewReader;
+})();

gpac-1.0.0.tar.gz/share/vis/Code/PixelTimeRange.js Added

@@ -0,0 +1,61 @@
+
+
+PixelTimeRange = (function()
+{
+	function PixelTimeRange(start_us, span_us, span_px)
+	{
+		this.Span_px = span_px;
+		this.Set(start_us, span_us);
+	}
+
+
+	PixelTimeRange.prototype.Set = function(start_us, span_us)
+	{
+		this.Start_us = start_us;
+		this.Span_us = span_us;
+		this.End_us = this.Start_us + span_us;
+		this.usPerPixel = this.Span_px / this.Span_us;
+	}
+
+
+	PixelTimeRange.prototype.SetStart = function(start_us)
+	{
+		this.Start_us = start_us;
+		this.End_us = start_us + this.Span_us;
+	}
+
+
+	PixelTimeRange.prototype.SetEnd = function(end_us)
+	{
+		this.End_us = end_us;
+		this.Start_us = end_us - this.Span_us;
+	}
+
+
+	PixelTimeRange.prototype.SetPixelSpan = function(span_px)
+	{
+		this.Span_px = span_px;
+		this.usPerPixel = this.Span_px / this.Span_us;
+	}
+
+
+	PixelTimeRange.prototype.PixelOffset = function(time_us)
+	{
+		return Math.floor((time_us - this.Start_us) * this.usPerPixel);
+	}
+
+
+	PixelTimeRange.prototype.PixelSize = function(time_us)
+	{
+		return Math.floor(time_us * this.usPerPixel);
+	}
+
+
+	PixelTimeRange.prototype.Clone = function()
+	{
+		return new PixelTimeRange(this.Start_us, this.Span_us, this.Span_px);
+	}
+
+
+	return PixelTimeRange;
+})();

gpac-1.0.0.tar.gz/share/vis/Code/Remotery.js Added

@@ -0,0 +1,338 @@
+
+//
+// TODO: Window resizing needs finer-grain control
+// TODO: Take into account where user has moved the windows
+// TODO: Controls need automatic resizing within their parent windows
+//
+
+
+Settings = (function()
+{
+    function Settings()
+    {
+        this.IsPaused = false;
+    }
+
+    return Settings;
+
+})();
+
+
+Remotery = (function()
+{
+    // crack the url and get the parameter we want
+    var getUrlParameter = function getUrlParameter( search_param) 
+    {
+        var page_url = decodeURIComponent( window.location.search.substring(1) ),
+                        url_vars = page_url.split('&'),
+                        param_name,
+                        i;
+
+        for (i = 0; i < url_vars.length; i++) 
+        {
+            param_name = url_vars[i].split('=');
+
+            if (param_name[0] === search_param) 
+            {
+                return param_name[1] === undefined ? true : param_name[1];
+            }
+        }
+    };
+
+    function Remotery()
+    {
+        this.WindowManager = new WM.WindowManager();
+        this.Settings = new Settings();
+
+        // "addr" param is ip:port and will override the local store version if passed in the URL
+        var addr = getUrlParameter( "addr" );
+        if ( addr != null )
+            this.ConnectionAddress = "ws://" + addr + "/rmt";
+        else
+            this.ConnectionAddress = LocalStore.Get("App", "Global", "ConnectionAddress", "ws://127.0.0.1:17815/rmt");
+
+        this.Server = new WebSocketConnection();
+        this.Server.AddConnectHandler(Bind(OnConnect, this));
+
+        // Create the console up front as everything reports to it
+        this.Console = new Console(this.WindowManager, this.Server);
+
+        // Create required windows
+        this.TitleWindow = new TitleWindow(this.WindowManager, this.Settings, this.Server, this.ConnectionAddress);
+        this.TitleWindow.SetConnectionAddressChanged(Bind(OnAddressChanged, this));
+        this.TimelineWindow = new TimelineWindow(this.WindowManager, this.Settings, this.Server, Bind(OnTimelineCheck, this));
+        this.TimelineWindow.SetOnHover(Bind(OnSampleHover, this));
+        this.TimelineWindow.SetOnSelected(Bind(OnSampleSelected, this));
+
+        this.NbSampleWindows = 0;
+        this.SampleWindows = { };
+        this.FrameHistory = { };
+        this.SelectedFrames = { };
+        this.NameMap = { };
+
+        this.Server.AddMessageHandler("SMPL", Bind(OnSamples, this));
+        this.Server.AddMessageHandler("SSMP", Bind(OnSampleName, this));
+
+        // Kick-off the auto-connect loop
+        AutoConnect(this);
+
+        // Hook up resize event handler
+        DOM.Event.AddHandler(window, "resize", Bind(OnResizeWindow, this));
+        OnResizeWindow(this);
+
+        // Hook up browser-native canvas refresh
+        this.DisplayFrame = 0;
+        this.LastKnownPause = this.Settings.IsPaused;
+        var self = this;
+        (function display_loop()
+        {
+            window.requestAnimationFrame(display_loop);
+            DrawTimeline(self);
+        })();
+    }
+
+
+    function AutoConnect(self)
+    {
+        // Only attempt to connect if there isn't already a connection or an attempt to connect
+        if (!self.Server.Connected())
+            self.Server.Connect(self.ConnectionAddress);
+
+        // Always schedule another check
+        window.setTimeout(Bind(AutoConnect, self), 2000);
+    }
+
+
+    function OnConnect(self)
+    {
+        // Connection address has been validated
+        LocalStore.Set("App", "Global", "ConnectionAddress", self.ConnectionAddress);
+    }
+
+
+    function OnAddressChanged(self, node)
+    {
+        // Update and disconnect, relying on auto-connect to reconnect
+        self.ConnectionAddress = node.value;
+        self.Server.Disconnect();
+
+        // Give input focus away
+        return false;
+    }
+
+
+    function DrawTimeline(self)
+    {
+        // Has pause state changed?
+        if (self.Settings.IsPaused != self.LastKnownPaused)
+        {
+            // When switching TO paused, draw one last frame to ensure the sample text gets drawn
+            self.LastKnownPaused = self.Settings.IsPaused;
+            self.TimelineWindow.DrawAllRows();
+            return;
+        }
+
+        // Don't waste time drawing the timeline when paused
+        if (self.Settings.IsPaused)
+            return;
+
+        // requestAnimationFrame can run up to 60hz which is way too much for drawing the timeline
+        // Assume it's running at 60hz and skip frames to achieve 10hz instead
+        // Doing this instead of using setTimeout because it's better for browser rendering (or; will be once WebGL is in use)
+        // TODO: Expose as config variable because high refresh rate is great when using a separate viewiing machine
+        if ((self.DisplayFrame % 10) == 0)
+            self.TimelineWindow.DrawAllRows();
+
+        self.DisplayFrame++;
+    }
+
+
+    function DecodeSample(self, data_view_reader)
+    {
+        var sample = {};
+
+        // Get name hash and lookup name it map
+        sample.name_hash = data_view_reader.GetUInt32();
+        sample.name = self.NameMap[sample.name_hash];
+
+        // If the name doesn't exist in the map yet, request it from the server
+        if (sample.name == undefined)
+        {
+            // Meanwhile, store the hash as the name
+            sample.name = { "string": sample.name_hash };
+            self.NameMap[sample.name_hash] = sample.name;
+            self.Server.Send("GSMP" + sample.name_hash);
+        }
+
+        // Get the rest of the sample data
+        sample.id = data_view_reader.GetUInt32();
+        sample.colour = data_view_reader.GetStringOfLength(7);
+        sample.us_start = data_view_reader.GetUInt64();
+        sample.us_length = data_view_reader.GetUInt64();
+        sample.us_self = data_view_reader.GetUInt64();
+        sample.call_count = data_view_reader.GetUInt32();
+        sample.recurse_depth = data_view_reader.GetUInt32();
+
+        // Calculate dependent properties
+        sample.ms_length = (sample.us_length / 1000.0).toFixed(3);
+        sample.ms_self = (sample.us_self / 1000.0).toFixed(3);
+
+        // Recurse into children
+        sample.children = [];
+        DecodeSampleArray(self, data_view_reader, sample.children);
+
+        return sample;
+    }
+
+
+    function DecodeSampleArray(self, data_view_reader, samples)
+    {
+        var nb_samples = data_view_reader.GetUInt32();
+        for (var i = 0; i < nb_samples; i++)
+        {
+            var sample = DecodeSample(self, data_view_reader);
+            samples.push(sample)
+        }
+    }
+
+
+    function DecodeSamples(self, data_view_reader)
+    {
+        // Message-specific header
+        var message = { };
+        message.thread_name = data_view_reader.GetString();
+        message.nb_samples = data_view_reader.GetUInt32();
+        message.sample_digest = data_view_reader.GetUInt32();
+
+        // Read samples
+        message.samples = [];
+        message.samples.push(DecodeSample(self, data_view_reader));
+
+        return message;
+    }
+
+
+    function OnSamples(self, socket, data_view)
+    {
+        // Discard any new samples while paused
+        if (self.Settings.IsPaused)
+            return;
+
+        // Binary decode incoming sample data
+        var message = DecodeSamples(self, new DataViewReader(data_view, 8));
+        var name = message.thread_name;
+
+        // Add to frame history for this thread
+        var thread_frame = new ThreadFrame(message);
+        if (!(name in self.FrameHistory))
+            self.FrameHistory[name] = [ ];
+        var frame_history = self.FrameHistory[name];
+        frame_history.push(thread_frame);
+
+        // Discard old frames to keep memory-use constant
+        var max_nb_frames = 10000;
+        var extra_frames = frame_history.length - max_nb_frames;
+        if (extra_frames > 0)
+            frame_history.splice(0, extra_frames);
+
+        // Create sample windows on-demand
+        if (!(name in self.SampleWindows))
+        {
+            self.SampleWindows[name] = new SampleWindow(self.WindowManager, name, self.NbSampleWindows);
+            self.SampleWindows[name].WindowResized(self.TimelineWindow.Window, self.Console.Window);
+            self.NbSampleWindows++;
+            MoveSampleWindows(this);
+        }
+
+        // Set on the window and timeline
+        self.SampleWindows[name].OnSamples(message.nb_samples, message.sample_digest, message.samples);
+        self.TimelineWindow.OnSamples(name, frame_history);
+    }
+
+
+    function OnSampleName(self, socket, data_view)
+    {
+        // Add any names sent by the server to the local map
+        var data_view_reader = new DataViewReader(data_view, 4);
+        var name_hash = data_view_reader.GetUInt32();
+        var name = data_view_reader.GetString();
+        self.NameMap[name_hash].string = name;
+    }
+
+
+    function OnTimelineCheck(self, name, evt)
+    {
+        // Show/hide the equivalent sample window and move all the others to occupy any left-over space
+        var target = DOM.Event.GetNode(evt);
+        self.SampleWindows[name].SetVisible(target.checked);
+        MoveSampleWindows(self);
+    }
+
+
+    function MoveSampleWindows(self)
+    {
+        // Stack all windows next to each other
+        var xpos = 0;
+        for (var i in self.SampleWindows)
+        {
+            var sample_window = self.SampleWindows[i];
+            if (sample_window.Visible)
+                sample_window.SetXPos(xpos++, self.TimelineWindow.Window, self.Console.Window);
+        }
+    }
+
+
+    function OnSampleHover(self, thread_name, hover)
+    {
+        // Hover only changes sample window contents when paused
+        var sample_window = self.SampleWindows[thread_name];
+        if (sample_window && self.Settings.IsPaused)
+        {
+            if (hover == null)
+            {
+                // When there's no hover, go back to the selected frame
+                if (self.SelectedFrames[thread_name])
+                {
+                    var frame = self.SelectedFrames[thread_name];
+                    sample_window.OnSamples(frame.NbSamples, frame.SampleDigest, frame.Samples);
+                }
+            }
+
+            else
+            {
+                // Populate with sample under hover
+                var frame = hover[0];
+                sample_window.OnSamples(frame.NbSamples, frame.SampleDigest, frame.Samples);
+            }
+        }
+    }
+
+
+    function OnSampleSelected(self, thread_name, select)
+    {
+        // Lookup sample window set the frame samples on it
+        if (select && thread_name in self.SampleWindows)
+        {
+            var sample_window = self.SampleWindows[thread_name];
+            var frame = select[0];
+            self.SelectedFrames[thread_name] = frame;
+            sample_window.OnSamples(frame.NbSamples, frame.SampleDigest, frame.Samples);
+        }
+    }
+
+
+    function OnResizeWindow(self)
+    {
+        // Resize windows
+        var w = window.innerWidth;
+        var h = window.innerHeight;
+        self.Console.WindowResized(w, h);
+        self.TitleWindow.WindowResized(w, h);
+        self.TimelineWindow.WindowResized(w, h, self.TitleWindow.Window);
+        for (var i in self.SampleWindows)
+            self.SampleWindows[i].WindowResized(self.TimelineWindow.Window, self.Console.Window);
+    }
+
+
+    return Remotery;
+})();
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/Code/SampleWindow.js Added

@@ -0,0 +1,215 @@
+
+SampleWindow = (function()
+{
+    function SampleWindow(wm, name, offset)
+    {
+        // Sample digest for checking if grid needs to be repopulated
+        this.NbSamples = 0;
+        this.SampleDigest = null;
+
+        // Source sample reference to reduce repopulation
+        this.Samples = null;
+
+        this.XPos = 10 + offset * 410;
+        this.Window = wm.AddWindow(name, 100, 100, 100, 100);
+        this.Window.Show();
+        this.Visible = true;
+
+        // Create a grid that's indexed by the unique sample ID
+        this.Grid = this.Window.AddControlNew(new WM.Grid(0, 0, 380, "calc( 100% - 17px )"));
+        var cell_data =
+        {
+            Name: "Samples",
+            Length: "Time (ms)",
+            Self: "Self (ms)",
+            Calls: "Calls",
+            Recurse: "Recurse",
+        };
+        var cell_classes =
+        {
+            Name: "SampleTitleNameCell",
+            Length: "SampleTitleTimeCell",
+            Self: "SampleTitleTimeCell",
+            Calls: "SampleTitleCountCell",
+            Recurse: "SampleTitleCountCell",
+        };
+        this.RootRow = this.Grid.Rows.Add(cell_data, "GridGroup", cell_classes);
+        this.RootRow.Rows.AddIndex("_ID");
+    }
+
+
+    SampleWindow.prototype.SetXPos = function(xpos, top_window, bottom_window)
+    {
+        Anim.Animate(
+            Bind(AnimatedMove, this, top_window, bottom_window),
+            this.XPos, 10 + xpos * 410, 0.25);
+    }
+
+
+    function AnimatedMove(self, top_window, bottom_window, val)
+    {
+        self.XPos = val;
+        self.WindowResized(top_window, bottom_window);
+    }
+
+
+    SampleWindow.prototype.SetVisible = function(visible)
+    {
+        if (visible != this.Visible)
+        {
+            if (visible == true)
+                this.Window.Show();
+            else
+                this.Window.Hide();
+
+            this.Visible = visible;
+        }
+    }
+
+
+    SampleWindow.prototype.WindowResized = function(top_window, bottom_window)
+    {
+        var top = top_window.Position[1] + top_window.Size[1] + 10;
+        this.Window.SetPosition(this.XPos, top_window.Position[1] + top_window.Size[1] + 10);
+        this.Window.SetSize(400, bottom_window.Position[1] - 10 - top);
+    }
+
+
+    SampleWindow.prototype.OnSamples = function(nb_samples, sample_digest, samples)
+    {
+        if (!this.Visible)
+            return;
+        
+        // If the source hasn't changed, don't repopulate
+        if (this.Samples == samples)
+            return;
+        this.Samples = samples;
+
+        // Recreate all the HTML if the number of samples gets bigger
+        if (nb_samples > this.NbSamples)
+        {
+            GrowGrid(this.RootRow, nb_samples);
+            this.NbSamples = nb_samples;
+        }
+
+        // If the content of the samples changes from previous update, update them all
+        if (this.SampleDigest != sample_digest)
+        {
+            this.RootRow.Rows.ClearIndex("_ID");
+            var index = UpdateAllSampleFields(this.RootRow, samples, 0, "");
+            this.SampleDigest = sample_digest;
+
+            // Clear out any left-over rows
+            for (var i = index; i < this.RootRow.Rows.Rows.length; i++)
+            {
+                var row = this.RootRow.Rows.Rows[i];
+                DOM.Node.Hide(row.Node);
+            }
+        }
+
+        else if (this.Visible)
+        {
+            // Otherwise just update the existing sample fields
+            UpdateChangedSampleFields(this.RootRow, samples, "");
+        }
+    }
+
+
+    function GrowGrid(parent_row, nb_samples)
+    {
+        parent_row.Rows.Clear();
+
+        for (var i = 0; i < nb_samples; i++)
+        {
+            var cell_data =
+            {
+                _ID: i,
+                Name: "",
+                Length: "",
+                Self: "",
+                Calls: "",
+                Recurse: "",
+            };
+
+            var cell_classes =
+            {
+                Name: "SampleNameCell",
+                Length: "SampleTimeCell",
+                Self: "SampleTimeCell",
+                Calls: "SampleCountCell",
+                Recurse: "SampleCountCell",
+            };
+
+            parent_row.Rows.Add(cell_data, null, cell_classes);
+        }
+    }
+
+
+    function UpdateAllSampleFields(parent_row, samples, index, indent)
+    {
+        for (var i in samples)
+        {
+            var sample = samples[i];
+
+            // Match row allocation in GrowGrid
+            var row = parent_row.Rows.Rows[index++];
+
+            // Sample row may have been hidden previously
+            DOM.Node.Show(row.Node);
+            
+            // Assign unique ID so that the common fast path of updating sample times only
+            // can lookup target samples in the grid
+            row.CellData._ID = sample.id;
+            parent_row.Rows.AddRowToIndex("_ID", sample.id, row);
+
+            // Record sample name for later comparison
+            row.CellData.Name = sample.name.string;
+            
+            // Set sample name and colour
+            var name_node = row.CellNodes["Name"];
+            name_node.innerHTML = indent + sample.name.string;
+            DOM.Node.SetColour(name_node, sample.colour);
+
+            row.CellNodes["Length"].innerHTML = sample.ms_length;
+            row.CellNodes["Self"].innerHTML = sample.ms_self;
+            row.CellNodes["Calls"].innerHTML = sample.call_count;
+            row.CellNodes["Recurse"].innerHTML = sample.recurse_depth;
+
+            index = UpdateAllSampleFields(parent_row, sample.children, index, indent + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+        }
+
+        return index;
+    }
+
+
+    function UpdateChangedSampleFields(parent_row, samples, indent)
+    {
+        for (var i in samples)
+        {
+            var sample = samples[i];
+
+            var row = parent_row.Rows.GetBy("_ID", sample.id);
+            if (row)
+            {
+                row.CellNodes["Length"].innerHTML = sample.ms_length;
+                row.CellNodes["Self"].innerHTML = sample.ms_self;
+                row.CellNodes["Calls"].innerHTML = sample.call_count;
+                row.CellNodes["Recurse"].innerHTML = sample.recurse_depth;
+
+                // Sample name will change when it switches from hash ID to network-retrieved 
+                // name. Quickly check that before re-applying the HTML for the name.
+                if (row.CellData.Name != sample.name.string)
+                {
+                    var name_node = row.CellNodes["Name"];
+                    row.CellData.Name = sample.name.string;
+                    name_node.innerHTML = indent + sample.name.string;
+                }
+            }
+
+            UpdateChangedSampleFields(parent_row, sample.children, indent + "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
+        }
+    }
+
+
+    return SampleWindow;
+})();

gpac-1.0.0.tar.gz/share/vis/Code/ThreadFrame.js Added

gpac-1.0.0.tar.gz/share/vis/Code/TimelineRow.js Added

@@ -0,0 +1,379 @@
+
+
+TimelineRow = (function()
+{
+    var row_template = function(){/*
+        <div class='TimelineRow'>
+            <div class='TimelineRowCheck TimelineBox'>
+                <input class='TimelineRowCheckbox' type='checkbox' />
+            </div>
+            <div class='TimelineRowExpand TimelineBox NoSelect'>
+                <div class='TimelineRowExpandButton'>+</div>
+            </div>
+            <div class='TimelineRowExpand TimelineBox NoSelect'>
+                <div class='TimelineRowExpandButton'>-</div>
+            </div>
+            <div class='TimelineRowLabel TimelineBox'></div>
+            <canvas class='TimelineRowCanvas'></canvas>
+            <div style="clear:left"></div>
+        </div>
+*/}.toString().split(/\n/).slice(1, -1).join("\n");
+
+
+    var CANVAS_Y_OFFSET = 0;
+    var CANVAS_BORDER = 1;
+    var SAMPLE_HEIGHT = 16;
+    var SAMPLE_BORDER = 1;
+    var SAMPLE_Y_SPACING = SAMPLE_HEIGHT + SAMPLE_BORDER * 2;
+    var SAMPLE_Y_OFFSET = CANVAS_Y_OFFSET + CANVAS_BORDER + 1;
+
+
+    function TimelineRow(name, width, parent_node, frame_history, check_handler)
+    {
+        this.Name = name;
+
+        // Create the row HTML and add to the parent
+        this.ContainerNode = DOM.Node.CreateHTML(row_template);
+        this.Node = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowData");
+        this.LabelNode = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowLabel");
+        this.LabelNode.innerHTML = name;
+        this.CheckboxNode = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowCheckbox");
+        var expand_node_0 = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowExpand", 0);
+        var expand_node_1 = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowExpand", 1);
+        this.IncNode = DOM.Node.FindWithClass(expand_node_0, "TimelineRowExpandButton");
+        this.DecNode = DOM.Node.FindWithClass(expand_node_1, "TimelineRowExpandButton");
+        this.CanvasNode = DOM.Node.FindWithClass(this.ContainerNode, "TimelineRowCanvas");
+        parent_node.appendChild(this.ContainerNode);
+
+        // All sample view windows visible by default
+        this.CheckboxNode.checked = true;
+        DOM.Event.AddHandler(this.CheckboxNode, "change", function(evt) { check_handler(name, evt); });
+
+        // Manually hook-up events to simulate div:active
+        // I can't get the equivalent CSS to work in Firefox, so...
+        DOM.Event.AddHandler(this.IncNode, "mousedown", ExpandButtonDown);
+        DOM.Event.AddHandler(this.IncNode, "mouseup", ExpandButtonUp);
+        DOM.Event.AddHandler(this.IncNode, "mouseleave", ExpandButtonUp);
+        DOM.Event.AddHandler(this.DecNode, "mousedown", ExpandButtonDown);
+        DOM.Event.AddHandler(this.DecNode, "mouseup", ExpandButtonUp);
+        DOM.Event.AddHandler(this.DecNode, "mouseleave", ExpandButtonUp);
+
+        // Pressing +/i increases/decreases depth
+        DOM.Event.AddHandler(this.IncNode, "click", Bind(IncDepth, this));
+        DOM.Event.AddHandler(this.DecNode, "click", Bind(DecDepth, this));
+
+        // Setup the canvas
+        this.Depth = 1;
+        this.Ctx = this.CanvasNode.getContext("2d");
+        this.SetSize(width);
+        this.Clear();
+
+        // Frame index to start at when looking for first visible sample
+        this.StartFrameIndex = 0;
+
+        this.FrameHistory = frame_history;
+        this.VisibleFrames = [ ];
+        this.VisibleTimeRange = null;
+
+        // Sample the mouse is currently hovering over
+        this.HoverSample = null;
+        this.HoverSampleDepth = 0;
+
+        // Currently selected sample
+        this.SelectedSample = null;
+        this.SelectedSampleDepth = 0;
+    }
+
+
+    TimelineRow.prototype.SetSize = function(width)
+    {
+        // Must ALWAYS set the width/height properties together. Setting one on its own has weird side-effects.
+        this.CanvasNode.width = width;
+        this.CanvasNode.height = CANVAS_BORDER + SAMPLE_BORDER + SAMPLE_Y_SPACING * this.Depth;
+        this.Draw(true);
+    }
+
+
+    TimelineRow.prototype.Clear = function()
+    {
+        // Fill box that shows the boundary between thread rows
+        this.Ctx.fillStyle = "#666"
+        var b = CANVAS_BORDER;
+        this.Ctx.fillRect(b, b, this.CanvasNode.width - b * 2, this.CanvasNode.height - b * 2);
+    }
+
+
+    TimelineRow.prototype.SetVisibleFrames = function(time_range)
+    {
+        // Clear previous visible list
+        this.VisibleFrames = [ ];
+        if (this.FrameHistory.length == 0)
+            return;
+
+        // Store a copy of the visible time range rather than referencing it
+        // This prevents external modifications to the time range from affecting rendering/selection
+        time_range = time_range.Clone();
+        this.VisibleTimeRange = time_range;
+
+        // The frame history can be reset outside this class
+        // This also catches the overflow to the end of the frame list below when a thread stops sending samples
+        var max_frame = Math.max(this.FrameHistory.length - 1, 0);
+        var start_frame_index = Math.min(this.StartFrameIndex, max_frame);
+
+        // First do a back-track in case the time range moves negatively
+        while (start_frame_index > 0)
+        {
+            var frame = this.FrameHistory[start_frame_index];
+            if (time_range.Start_us > frame.StartTime_us)
+                break;
+            start_frame_index--;
+        }
+
+        // Then search from this point for the first visible frame
+        while (start_frame_index < this.FrameHistory.length)
+        {
+            var frame = this.FrameHistory[start_frame_index];
+            if (frame.EndTime_us > time_range.Start_us)
+                break;
+            start_frame_index++;
+        }
+
+        // Gather all frames up to the end point
+        this.StartFrameIndex = start_frame_index;
+        for (var i = start_frame_index; i < this.FrameHistory.length; i++)
+        {
+            var frame = this.FrameHistory[i];
+            if (frame.StartTime_us > time_range.End_us)
+                break;
+            this.VisibleFrames.push(frame);
+        }
+    }
+
+
+    TimelineRow.prototype.Draw = function(draw_text)
+    {
+        this.Clear();
+
+        // Draw all root samples in the visible frame set
+        for (var i in this.VisibleFrames)
+        {
+            var frame = this.VisibleFrames[i];
+            DrawSamples(this, frame.Samples, 1, draw_text);
+        }
+    }
+
+
+    function DrawSamples(self, samples, depth, draw_text)
+    {
+        for (var i in samples)
+        {
+            var sample = samples[i];
+            DrawSample(self, sample, depth, draw_text);
+
+            if (depth < self.Depth && sample.children != null)
+                DrawSamples(self, sample.children, depth + 1, draw_text);
+        }
+    }
+
+
+    TimelineRow.prototype.UpdateHoverSample = function(mouse_state, x_offset)
+    {
+        var hover = GetSampleAtPosition(this, mouse_state, x_offset);
+        if (hover)
+            this.SetHoverSample(hover[1], hover[2]);
+        return hover;
+    }
+
+
+    TimelineRow.prototype.UpdateSelectedSample = function(mouse_state, x_offset)
+    {
+        var select = GetSampleAtPosition(this, mouse_state, x_offset);
+        if (select)
+            this.SetSelectedSample(select[1], select[2]);
+        return select;
+    }
+
+
+    TimelineRow.prototype.SetHoverSample = function(sample, sample_depth)
+    {
+        if (sample != this.HoverSample)
+        {
+            // Discard old highlight
+            // TODO: When zoomed right out, tiny samples are anti-aliased and this becomes inaccurate
+            var old_sample = this.HoverSample;
+            var old_sample_depth = this.HoverSampleDepth;
+            this.HoverSample = null;
+            this.HoverSampleDepth = 0;
+            DrawSample(this, old_sample, old_sample_depth, true);
+
+            // Add new highlight
+            this.HoverSample = sample;
+            this.HoverSampleDepth = sample_depth;
+            DrawSample(this, sample, sample_depth, true);
+        }
+    }
+
+
+    TimelineRow.prototype.SetSelectedSample = function(sample, sample_depth)
+    {
+        if (sample != this.SelectedSample)
+        {
+            // Discard old highlight
+            // TODO: When zoomed right out, tiny samples are anti-aliased and this becomes inaccurate
+            var old_sample = this.SelectedSample;
+            var old_sample_depth = this.SelectedSampleDepth;
+            this.SelectedSample = null;
+            this.SelectedSampleDepth = 0;
+            DrawSample(this, old_sample, old_sample_depth, true);
+
+            // Add new highlight
+            this.SelectedSample = sample;
+            this.SelectedSampleDepth = sample_depth;
+            DrawSample(this, sample, sample_depth, true);
+        }
+    }
+
+
+    function ExpandButtonDown(evt)
+    {
+        var node = DOM.Event.GetNode(evt);
+        DOM.Node.AddClass(node, "TimelineRowExpandButtonActive");
+    }
+
+
+    function ExpandButtonUp(evt)
+    {
+        var node = DOM.Event.GetNode(evt);
+        DOM.Node.RemoveClass(node, "TimelineRowExpandButtonActive");
+    }
+
+
+    function IncDepth(self)
+    {
+        self.Depth++;
+        self.SetSize(self.CanvasNode.width);
+    }
+
+
+    function DecDepth(self)
+    {
+        if (self.Depth > 1)
+        {
+            self.Depth--;
+            self.SetSize(self.CanvasNode.width);
+        }
+    }
+
+
+    function GetSampleAtPosition(self, mouse_state, x_offset)
+    {
+        // Mouse movement can occur before any data is sent to a timeline row
+        var time_range = self.VisibleTimeRange;
+        if (time_range == null)
+            return;
+
+        // Get the time the mouse is over
+        var x = mouse_state.Position[0] - x_offset;
+        var time_us = time_range.Start_us + x / time_range.usPerPixel;
+
+        var canvas_y_offset = DOM.Node.GetPosition(self.CanvasNode)[1];
+        var mouse_y_offset = mouse_state.Position[1] - canvas_y_offset;
+        mouse_y_offset = Math.min(Math.max(mouse_y_offset, 0), self.CanvasNode.height);
+        var depth = Math.floor(mouse_y_offset / SAMPLE_Y_SPACING) + 1;
+        
+        // Search for the first frame to intersect this time
+        for (var i in self.VisibleFrames)
+        {
+            var frame = self.VisibleFrames[i];
+            if (time_us >= frame.StartTime_us && time_us < frame.EndTime_us)
+            {
+                var found_sample = FindSample(self, frame.Samples, time_us, depth, 1);
+                if (found_sample != null)
+                    return [ frame, found_sample[0], found_sample[1] ];
+            }
+        }
+
+        return null;
+    }
+
+
+    function FindSample(self, samples, time_us, target_depth, depth)
+    {
+        for (var i in samples)
+        {
+            var sample = samples[i];
+            if (depth == target_depth)
+            {
+                if (time_us >= sample.us_start && time_us < sample.us_start + sample.us_length)
+                    return [ sample, depth ];
+            }
+
+            else if (depth < target_depth && sample.children != null)
+            {
+                var found_sample = FindSample(self, sample.children, time_us, target_depth, depth + 1);
+                if (found_sample != null)
+                    return found_sample;
+            }
+        }
+
+        return null;
+    }
+
+
+    function DrawSample(self, sample, depth, draw_text)
+    {
+        if (sample == null)
+            return;
+
+        // Determine pixel range of the sample
+        var time_range = self.VisibleTimeRange;
+        var x0 = time_range.PixelOffset(sample.us_start);
+        var x1 = x0 + time_range.PixelSize(sample.us_length);
+
+        // Clip to padded timeline row
+        var min_x = 3;
+        var max_x = self.CanvasNode.width - 5;
+        x0 = Math.min(Math.max(x0, min_x), max_x);
+        x1 = Math.min(Math.max(x1, min_x), max_x);
+
+        var offset_x = x0;
+        var offset_y = SAMPLE_Y_OFFSET + (depth - 1) * SAMPLE_Y_SPACING;
+        var size_x = x1 - x0;
+        var size_y = SAMPLE_HEIGHT;
+
+        // Normal rendering
+        var ctx = self.Ctx;
+        ctx.fillStyle = sample.colour;
+        ctx.fillRect(offset_x, offset_y, size_x, size_y);
+
+        // Highlight rendering
+        var b = (sample == self.HoverSample) ? 255 : 0;
+        var r = (sample == self.SelectedSample) ? 255 : 0;
+        if (b + r > 0)
+        {
+            ctx.lineWidth = 1;
+            ctx.strokeStyle = "rgb(" + r + ", 0, " + b + ")";
+            ctx.strokeRect(offset_x + 0.5, offset_y + 0.5, size_x - 1, size_y - 1);
+        }
+
+        // Draw sample names clipped to the bounds of the sample
+        // Also reject tiny samples with no space to render text
+        if (draw_text && size_x > 8)
+        {
+            ctx.save();
+            ctx.beginPath();
+            ctx.rect(offset_x + 2.5, offset_y + 1.5, size_x - 5, size_y - 3);
+            ctx.clip();
+            ctx.font = "9px verdana";
+            ctx.fillStyle = "black";
+            var text = sample.name.string
+            text += " (" + sample.ms_length + "ms";
+            text += ", " + sample.call_count + "c)";
+            ctx.fillText(text, offset_x + 5.5, offset_y + 1.5 + 9);
+            ctx.restore();
+        }
+    }
+
+
+    return TimelineRow;
+})();

gpac-1.0.0.tar.gz/share/vis/Code/TimelineWindow.js Added

@@ -0,0 +1,270 @@
+
+//
+// TODO: Use WebGL and instancing for quicker renders
+//
+
+
+TimelineWindow = (function()
+{
+	var BORDER = 10;
+
+	var ROW_START_SIZE = 210;
+
+	var ROW_END_SIZE = 20;  // make room for scrollbar
+
+	var box_template = "<div class='TimelineBox'></div>";
+
+
+	function TimelineWindow(wm, settings, server, check_handler)
+	{
+		this.Settings = settings;
+
+		// Ordered list of thread rows on the timeline
+		this.ThreadRows = [ ];
+
+		// Create window and containers
+		this.Window = wm.AddWindow("Timeline", 10, 20, 100, 100);
+		this.Window.ShowNoAnim();
+		this.TimelineContainer = this.Window.AddControlNew(new WM.Container(10, 10, 800, 160));
+		DOM.Node.AddClass(this.TimelineContainer.Node, "TimelineContainer");
+
+		var mouse_wheel_event = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel";
+		DOM.Event.AddHandler(this.TimelineContainer.Node, mouse_wheel_event, Bind(OnMouseScroll, this));
+
+		// Setup timeline manipulation
+		this.MouseDown = false;
+		this.TimelineMoved = false;
+		this.OnHoverHandler = null;
+		this.OnSelectedHandler = null;
+		DOM.Event.AddHandler(this.TimelineContainer.Node, "mousedown", Bind(OnMouseDown, this));
+		DOM.Event.AddHandler(this.TimelineContainer.Node, "mouseup", Bind(OnMouseUp, this));
+		DOM.Event.AddHandler(this.TimelineContainer.Node, "mousemove", Bind(OnMouseMove, this));		
+
+		// Set time range AFTER the window has been created, as it uses the window to determine pixel coverage
+		this.TimeRange = new PixelTimeRange(0, 200 * 1000, RowWidth(this));
+
+		this.CheckHandler = check_handler;
+	}
+
+
+	TimelineWindow.prototype.SetOnHover = function(handler)
+	{
+		this.OnHoverHandler = handler;
+	}
+
+
+	TimelineWindow.prototype.SetOnSelected = function(handler)
+	{
+		this.OnSelectedHandler = handler;
+	}
+
+
+	TimelineWindow.prototype.WindowResized = function(width, height, top_window)
+	{
+		// Resize window
+		var top = top_window.Position[1] + top_window.Size[1] + 10;
+		this.Window.SetPosition(10, top);
+		this.Window.SetSize(width - 2 * 10, 200);
+
+		// Resize controls
+		var parent_size = this.Window.Size;
+		this.TimelineContainer.SetPosition(BORDER, 10);
+		this.TimelineContainer.SetSize(parent_size[0] - 2 * BORDER, 160);
+
+		// Resize rows
+		var row_width = RowWidth(this);
+		for (var i in this.ThreadRows)
+		{
+			var row = this.ThreadRows[i];
+			row.SetSize(row_width);
+		}
+
+		// Adjust time range to new width
+		this.TimeRange.SetPixelSpan(row_width);
+		this.DrawAllRows();
+	}
+
+
+	TimelineWindow.prototype.ResetTimeRange = function()
+	{
+		this.TimeRange.SetStart(0);
+	}
+
+
+	TimelineWindow.prototype.OnSamples = function(thread_name, frame_history)
+	{
+		// Shift the timeline to the last entry on this thread
+		// As multiple threads come through here with different end frames, only do this for the latest
+		var last_frame = frame_history[frame_history.length - 1];
+		if (last_frame.EndTime_us > this.TimeRange.End_us)
+			this.TimeRange.SetEnd(last_frame.EndTime_us);
+
+		// Search for the index of this thread
+		var thread_index = -1;
+		for (var i in this.ThreadRows)
+		{
+			if (this.ThreadRows[i].Name == thread_name)
+			{
+				thread_index = i;
+				break;
+			}
+		}
+
+		// If this thread has not been seen before, add a new row to the list and re-sort
+		if (thread_index == -1)
+		{
+			var row = new TimelineRow(thread_name, RowWidth(this), this.TimelineContainer.Node, frame_history, this.CheckHandler);
+			this.ThreadRows.push(row);
+			this.ThreadRows.sort(function(a, b) { return b.Name.localeCompare(a.Name); });
+		}
+	}
+
+
+	TimelineWindow.prototype.DrawAllRows = function()
+	{
+		var time_range = this.TimeRange;
+		var draw_text = this.Settings.IsPaused;
+		for (var i in this.ThreadRows)
+		{
+			var thread_row = this.ThreadRows[i];
+			thread_row.SetVisibleFrames(time_range);
+			thread_row.Draw(draw_text);
+		}
+	}
+
+
+	function RowXOffset(self)
+	{
+		// Add sizing of the label
+		// TODO: Use computed size
+		return DOM.Node.GetPosition(self.TimelineContainer.Node)[0] + ROW_START_SIZE;
+	}
+
+
+	function RowWidth(self)
+	{
+		// Subtract sizing of the label
+		// TODO: Use computed size
+		return self.TimelineContainer.Size[0] - (ROW_START_SIZE + ROW_END_SIZE);
+	}
+
+
+	function OnMouseScroll(self, evt)
+	{
+		var mouse_state = new Mouse.State(evt);
+		var scale = 1.11;
+			if (mouse_state.WheelDelta > 0)
+				scale = 1 / scale;
+
+		// What time is the mouse hovering over?
+		var x = mouse_state.Position[0] - RowXOffset(self);
+		var time_us = self.TimeRange.Start_us + x / self.TimeRange.usPerPixel;
+
+		// Calculate start time relative to the mouse hover position
+		var time_start_us = self.TimeRange.Start_us - time_us;
+
+		// Scale and offset back to the hover time
+		self.TimeRange.Set(time_start_us * scale + time_us, self.TimeRange.Span_us * scale);
+		self.DrawAllRows();
+
+		// Prevent vertical scrolling on mouse-wheel
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	function OnMouseDown(self, evt)
+	{
+		// Only manipulate the timelime when paused
+		if (!self.Settings.IsPaused)
+			return;
+
+		self.MouseDown = true;
+		self.TimelineMoved = false;
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	function OnMouseUp(self, evt)
+	{
+		// Only manipulate the timelime when paused
+		if (!self.Settings.IsPaused)
+			return;
+
+		var mouse_state = new Mouse.State(evt);
+
+		self.MouseDown = false;
+
+		if (!self.TimelineMoved)
+		{
+			// Search for the row being clicked and update its selection
+			var row_node = DOM.Event.GetNode(evt);
+			for (var i in self.ThreadRows)
+			{
+				var thread_row = self.ThreadRows[i];
+				if (thread_row.CanvasNode == row_node)
+				{
+					var select = thread_row.UpdateSelectedSample(mouse_state, RowXOffset(self));
+
+					// Call any selection handlers
+					if (self.OnSelectedHandler)
+						self.OnSelectedHandler(thread_row.Name, select);
+
+					break;
+				}
+			}
+		}
+	}
+
+
+	function OnMouseMove(self, evt)
+	{
+		// Only manipulate the timelime when paused
+		if (!self.Settings.IsPaused)
+			return;
+
+		var mouse_state = new Mouse.State(evt);
+
+		if (self.MouseDown)
+		{
+			// Get the time the mouse is over
+			var x = mouse_state.Position[0] - RowXOffset(self);
+			var time_us = self.TimeRange.Start_us + x / self.TimeRange.usPerPixel;
+
+			// Shift the visible time range with mouse movement
+			var time_offset_us = mouse_state.PositionDelta[0] / self.TimeRange.usPerPixel;
+			if (time_offset_us)
+			{
+				self.TimeRange.SetStart(self.TimeRange.Start_us - time_offset_us);
+				self.DrawAllRows();
+				self.TimelineMoved = true;
+			}
+		}
+
+		else
+		{
+			// Highlight any samples the mouse moves over
+			var row_node = DOM.Event.GetNode(evt);
+			for (var i in self.ThreadRows)
+			{
+				var thread_row = self.ThreadRows[i];
+				if (thread_row.CanvasNode == row_node)
+				{
+					var hover = thread_row.UpdateHoverSample(mouse_state, RowXOffset(self));
+
+					if (self.OnHoverHandler)
+						self.OnHoverHandler(thread_row.Name, hover);
+				}
+				else
+				{
+					thread_row.SetHoverSample(null, 0);
+					if (self.OnHoverHandler)
+						self.OnHoverHandler(thread_row.Name, null);
+				}
+			}
+		}
+	}
+
+
+	return TimelineWindow;
+})();
+

gpac-1.0.0.tar.gz/share/vis/Code/TitleWindow.js Added

@@ -0,0 +1,59 @@
+
+TitleWindow = (function()
+{
+	function TitleWindow(wm, settings, server, connection_address)
+	{
+		this.Settings = settings;
+
+		this.Window = wm.AddWindow("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Remotery", 10, 10, 100, 100);
+		this.Window.ShowNoAnim();
+
+		this.PingContainer = this.Window.AddControlNew(new WM.Container(4, -13, 10, 10));
+		DOM.Node.AddClass(this.PingContainer.Node, "PingContainer");
+
+		this.EditBox = this.Window.AddControlNew(new WM.EditBox(10, 5, 300, 18, "Connection Address", connection_address));
+
+		// Setup pause button
+		this.PauseButton = this.Window.AddControlNew(new WM.Button("Pause", 5, 5, { toggle: true }));
+		this.PauseButton.SetOnClick(Bind(OnPausePressed, this));
+
+		server.AddMessageHandler("PING", Bind(OnPing, this));
+	}
+
+
+	TitleWindow.prototype.SetConnectionAddressChanged = function(handler)
+	{
+		this.EditBox.SetChangeHandler(handler);
+	}
+
+
+	TitleWindow.prototype.WindowResized = function(width, height)
+	{
+		this.Window.SetSize(width - 2 * 10, 50);
+		this.PauseButton.SetPosition(width - 80, 5);
+	}
+
+
+	function OnPausePressed(self)
+	{
+		self.Settings.IsPaused = self.PauseButton.IsPressed();
+		if (self.Settings.IsPaused)
+			self.PauseButton.SetText("Paused");
+		else
+			self.PauseButton.SetText("Pause");
+	}
+
+
+	function OnPing(self, server)
+	{
+		// Set the ping container as active and take it off half a second later
+		DOM.Node.AddClass(self.PingContainer.Node, "PingContainerActive");
+		window.setTimeout(Bind(function(self)
+		{
+			DOM.Node.RemoveClass(self.PingContainer.Node, "PingContainerActive");
+		}, self), 500);
+	}
+
+
+	return TitleWindow;
+})();
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/Code/WebSocketConnection.js Added

@@ -0,0 +1,137 @@
+
+WebSocketConnection = (function()
+{
+	function WebSocketConnection()
+	{
+		this.MessageHandlers = { };
+		this.Socket = null;
+		this.Console = null;
+	}
+
+
+	WebSocketConnection.prototype.SetConsole = function(console)
+	{
+		this.Console = console;
+	}
+
+
+	WebSocketConnection.prototype.Connected = function()
+	{
+		// Will return true if the socket is also in the process of connecting
+		return this.Socket != null;
+	}
+
+
+	WebSocketConnection.prototype.AddConnectHandler = function(handler)
+	{
+		this.AddMessageHandler("__OnConnect__", handler);
+	}
+
+
+	WebSocketConnection.prototype.AddDisconnectHandler = function(handler)
+	{
+		this.AddMessageHandler("__OnDisconnect__", handler);
+	}
+
+
+	WebSocketConnection.prototype.AddMessageHandler = function(message_name, handler)
+	{
+		// Create the message handler array on-demand
+		if (!(message_name in this.MessageHandlers))
+			this.MessageHandlers[message_name] = [ ];
+		this.MessageHandlers[message_name].push(handler);
+	}
+
+
+	WebSocketConnection.prototype.Connect = function(address)
+	{
+		// Disconnect if already connected
+		if (this.Connected())
+			this.Disconnect();
+
+		Log(this, "Connecting to " + address);
+
+		this.Socket = new WebSocket(address);
+		this.Socket.binaryType = "arraybuffer";
+		this.Socket.onopen = Bind(OnOpen, this);
+		this.Socket.onmessage = Bind(OnMessage, this);
+		this.Socket.onclose = Bind(OnClose, this);
+		this.Socket.onerror = Bind(OnError, this);
+	}
+
+
+	WebSocketConnection.prototype.Disconnect = function()
+	{
+		Log(this, "Disconnecting");
+		if (this.Connected())
+			this.Socket.close();
+	}
+
+
+	WebSocketConnection.prototype.Send = function(msg)
+	{
+		if (this.Connected())
+			this.Socket.send(msg);
+	}
+
+
+	function Log(self, message)
+	{
+		self.Console.Log(message);
+	}
+
+
+	function CallMessageHandlers(self, message_name, data_view)
+	{
+		if (message_name in self.MessageHandlers)
+		{
+			var handlers = self.MessageHandlers[message_name];
+			for (var i in handlers)
+			    handlers[i](self, data_view);
+		}
+	}
+
+
+	function OnOpen(self, event)
+	{
+		Log(self, "Connected");
+		CallMessageHandlers(self, "__OnConnect__");
+	}
+
+
+	function OnClose(self, event)
+	{
+		// Clear all references
+		self.Socket.onopen = null;
+		self.Socket.onmessage = null;
+		self.Socket.onclose = null;
+		self.Socket.onerror = null;
+		self.Socket = null;
+
+		Log(self, "Disconnected");
+		CallMessageHandlers(self, "__OnDisconnect__");
+	}
+
+
+	function OnError(self, event)
+	{
+		Log(self, "Connection Error ");
+	}
+
+
+	function OnMessage(self, event)
+	{
+	    var data_view = new DataView(event.data);
+
+	    var id = String.fromCharCode(
+            data_view.getInt8(0),
+            data_view.getInt8(1),
+            data_view.getInt8(2),
+            data_view.getInt8(3));
+
+        CallMessageHandlers(self, id, data_view);
+	}
+
+
+	return WebSocketConnection;
+})();

gpac-1.0.0.tar.gz/share/vis/Styles Added

gpac-1.0.0.tar.gz/share/vis/Styles/Remotery.css Added

@@ -0,0 +1,265 @@
+
+body
+{
+    /* Take up the full page */
+    width: 100%;
+    height: 100%;
+    margin: 0px;
+
+    background-color: #AAA;
+}
+
+
+.NoSelect
+{
+    /* Disable text selection so that it doesn't interfere with faux-button clicking */
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+
+    /* Stops the text cursor over the label */
+    cursor:default;
+}
+
+
+/* Override default window styles to remove 3D effect */
+.Window
+{
+    background: #555;
+    box-shadow: none;
+    border-radius: 3px;
+}
+/*.WindowTitleBar
+{
+    border-bottom: none;
+    border-radius: 0px;
+}
+.WindowBody
+{
+    border-top: none;
+}*/
+
+
+/* Override default container style to remove 3D effect */
+.Container
+{
+    border: none;
+    box-shadow: none;
+}
+
+
+/* Override default edit box style to remove 3D effect */
+.EditBox
+{
+    border: none;
+    box-shadow: none;
+    width:200;
+}
+
+
+
+.ConsoleText
+{
+    overflow:auto;
+    color: #BBB;
+    font: 9px Verdana;
+    margin: 2px;
+    white-space: pre;
+}
+
+
+.PingContainer
+{
+    background-color: #F55;
+    border-radius: 2px;
+
+    /* Transition from green is gradual */
+    transition: background-color 0.25s ease-in;
+}
+
+
+.PingContainerActive
+{
+    background-color: #5F5;
+
+    /* Transition to green is instant */
+    transition: none;
+}
+
+
+.SampleNameCell
+{
+    width:243px;
+}
+.SampleTimeCell
+{
+    width:52px;
+}
+.SampleCountCell
+{
+    width:43px;
+}
+.SampleTitleNameCell
+{
+    width:238px;
+    
+	padding: 1px 1px 1px 2px;
+	border: 1px solid;
+	border-radius: 2px;
+
+	border-top-color:#555;
+	border-left-color:#555;
+	border-bottom-color:#111;
+	border-right-color:#111;
+
+	background: #222;
+}
+.SampleTitleTimeCell
+{
+    width:47px;
+    
+	padding: 1px 1px 1px 2px;
+	border: 1px solid;
+	border-radius: 2px;
+
+	border-top-color:#555;
+	border-left-color:#555;
+	border-bottom-color:#111;
+	border-right-color:#111;
+
+	background: #222;
+}
+.SampleTitleCountCell
+{
+    width:38px;
+    
+	padding: 1px 1px 1px 2px;
+	border: 1px solid;
+	border-radius: 2px;
+
+	border-top-color:#555;
+	border-left-color:#555;
+	border-bottom-color:#111;
+	border-right-color:#111;
+
+	background: #222;
+}
+
+
+.TimelineBox
+{
+    /* Following style generally copies GridRowCell.GridGroup from BrowserLib */
+
+    padding: 1px 1px 1px 2px;
+    margin: 1px;
+
+    border: 1px solid;
+    border-radius: 2px;
+    border-top-color:#555;
+    border-left-color:#555;
+    border-bottom-color:#111;
+    border-right-color:#111;
+
+    background: #222;
+
+    font: 9px Verdana;
+    color: #BBB;
+}
+.TimelineRow
+{
+    width: 100%;
+}
+.TimelineRowCheckbox
+{
+    width: 12px;
+    height: 12px;
+    margin: 0px;
+}
+.TimelineRowCheck
+{
+    /* Pull .TimelineRowExpand to the right of the checkbox */
+    float:left;
+
+    width: 14px;
+    height: 14px;
+}
+.TimelineRowExpand
+{
+    /* Pull .TimelineRowLabel to the right of +/- buttons */
+    float:left;
+
+    width: 14px;
+    height: 14px;
+}
+.TimelineRowExpandButton
+{
+    width: 11px;
+    height: 12px;
+
+    color: #333;
+
+    border: 1px solid;
+
+    border-top-color:#F4F4F4;
+    border-left-color:#F4F4F4;
+    border-bottom-color:#8E8F8F;
+    border-right-color:#8E8F8F;
+
+    /* Top-right to bottom-left grey background gradient */
+    background: #f6f6f6; /* Old browsers */
+    background: -moz-linear-gradient(-45deg,  #f6f6f6 0%, #abaeb2 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#f6f6f6), color-stop(100%,#abaeb2)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(-45deg,  #f6f6f6 0%,#abaeb2 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(-45deg,  #f6f6f6 0%,#abaeb2 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(-45deg,  #f6f6f6 0%,#abaeb2 100%); /* IE10+ */
+    background: linear-gradient(135deg,  #f6f6f6 0%,#abaeb2 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f6f6f6', endColorstr='#abaeb2',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
+
+    text-align: center;
+    vertical-align: center;
+}
+.TimelineRowExpandButton:hover
+{
+    border-top-color:#79C6F9;
+    border-left-color:#79C6F9;
+    border-bottom-color:#385D72;
+    border-right-color:#385D72;
+
+    /* Top-right to bottom-left blue background gradient, matching border */
+    background: #f3f3f3; /* Old browsers */
+    background: -moz-linear-gradient(-45deg,  #f3f3f3 0%, #79c6f9 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#f3f3f3), color-stop(100%,#79c6f9)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(-45deg,  #f3f3f3 0%,#79c6f9 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(-45deg,  #f3f3f3 0%,#79c6f9 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(-45deg,  #f3f3f3 0%,#79c6f9 100%); /* IE10+ */
+    background: linear-gradient(135deg,  #f3f3f3 0%,#79c6f9 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f3f3f3', endColorstr='#79c6f9',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */
+}
+.TimelineRowExpandButtonActive
+{
+    /* Simple means of shifting text within a div to the bottom-right */
+    padding-left:1px;
+    padding-top:1px;
+    width:10px;
+    height:11px;
+}
+.TimelineRowLabel
+{
+    /* Pull .TimelineRowCanvas to the right of the label */
+    float:left;
+
+    width: 140px;
+    height: 14px;
+}
+.TimelineRowCanvas
+{
+}
+
+/* enable vertical scrollbar in TimelineContainer (useful for many threads) */
+.TimelineContainer
+{
+    overflow-y: auto;
+}

gpac-1.0.0.tar.gz/share/vis/extern Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Animation.js Added

@@ -0,0 +1,65 @@
+
+// 
+// Very basic linear value animation system, for now.
+//
+
+
+namespace("Anim");
+
+
+Anim.Animation = (function()
+{
+	var anim_hz = 60;
+
+	
+	function Animation(anim_func, start_value, end_value, time, end_callback)
+	{
+		// Setup initial parameters
+		this.StartValue = start_value;
+		this.EndValue = end_value;
+		this.ValueInc = (end_value - start_value) / (time * anim_hz);
+		this.Value = start_value;
+		this.Complete = false;
+		this.EndCallback = end_callback;
+
+		// Cache the update function to prevent recreating the closure
+		var self = this;
+		this.AnimFunc = anim_func;
+		this.AnimUpdate = function() { Update(self); }
+
+		// Call for the start value
+		this.AnimUpdate();
+	}
+
+
+	function Update(self)
+	{
+		// Queue up the next frame immediately
+		var id = window.setTimeout(self.AnimUpdate, 1000 / anim_hz);
+
+		// Linear step the value and check for completion
+		self.Value += self.ValueInc;
+		if (Math.abs(self.Value - self.EndValue) < 0.01)
+		{
+			self.Value = self.EndValue;
+			self.Complete = true;
+
+			if (self.EndCallback)
+				self.EndCallback();
+
+			window.clearTimeout(id);
+		}
+
+		// Pass to the animation function
+		self.AnimFunc(self.Value);
+	}
+
+
+	return Animation;
+})();
+
+
+Anim.Animate = function(anim_func, start_value, end_value, time, end_callback)
+{
+	return new Anim.Animation(anim_func, start_value, end_value, time, end_callback);
+}

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Bind.js Added

@@ -0,0 +1,92 @@
+//
+// This will generate a closure for the given function and optionally bind an arbitrary number of
+// its initial arguments to specific values.
+//
+// Parameters:
+//
+//    0: Either the function scope or the function.
+//    1: If 0 is the function scope, this is the function.
+//       Otherwise it's the start of the optional bound argument list.
+//    2: Start of the optional bound argument list if 1 is the function.
+//
+// Examples:
+//
+//    function GlobalFunction(p0, p1, p2) { }
+//    function ThisFunction(p0, p1, p2) { }
+//
+//    var a = Bind("GlobalFunction");
+//    var b = Bind(this, "ThisFunction");
+//    var c = Bind("GlobalFunction", BoundParam0, BoundParam1);
+//    var d = Bind(this, "ThisFunction", BoundParam0, BoundParam1);
+//    var e = Bind(GlobalFunction);
+//    var f = Bind(this, ThisFunction);
+//    var g = Bind(GlobalFunction, BoundParam0, BoundParam1);
+//    var h = Bind(this, ThisFunction, BoundParam0, BoundParam1);
+//
+//    a(0, 1, 2);
+//    b(0, 1, 2);
+//    c(2);
+//    d(2);
+//    e(0, 1, 2);
+//    f(0, 1, 2);
+//    g(2);
+//    h(2);
+//
+function Bind()
+{
+	// No closure to define?
+	if (arguments.length == 0)
+		return null;
+
+	// Figure out which of the 4 call types is being used to bind
+	// Locate scope, function and bound parameter start index
+
+	if (typeof(arguments[0]) == "string")
+	{
+		var scope = window;
+		var func = window[arguments[0]];
+		var start = 1;
+	}
+
+	else if (typeof(arguments[0]) == "function")
+	{
+		var scope = window;
+		var func = arguments[0];
+		var start = 1;
+	}
+
+	else if (typeof(arguments[1]) == "string")
+	{
+		var scope = arguments[0];
+		var func = scope[arguments[1]];
+		var start = 2;
+	}
+
+	else if (typeof(arguments[1]) == "function")
+	{
+		var scope = arguments[0];
+		var func = arguments[1];
+		var start = 2;
+	}
+
+	else
+	{
+		// unknown
+		console.log("Bind() ERROR: Unknown bind parameter configuration");
+		return;
+	}
+
+	// Convert the arguments list to an array
+	var arg_array = Array.prototype.slice.call(arguments, start);
+	start = arg_array.length;
+
+	return function()
+	{
+		// Concatenate incoming arguments
+		for (var i = 0; i < arguments.length; i++)
+			arg_array[start + i] = arguments[i];
+
+		// Call the function in the given scope with the new arguments
+		return func.apply(scope, arg_array);
+	}
+}

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Convert.js Added

@@ -0,0 +1,218 @@
+
+namespace("Convert");
+
+
+//
+// Convert between utf8 and b64 without raising character out of range exceptions with unicode strings
+// Technique described here: http://monsur.hossa.in/2012/07/20/utf-8-in-javascript.html
+//
+Convert.utf8string_to_b64string = function(str)
+{
+	return btoa(unescape(encodeURIComponent(str)));
+}
+Convert.b64string_to_utf8string = function(str)
+{
+	return decodeURIComponent(escape(atob(str)));
+}
+
+
+//
+// More general approach, converting between byte arrays and b64
+// Info here: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+//
+Convert.b64string_to_Uint8Array = function(sBase64, nBlocksSize)
+{
+	function b64ToUint6 (nChr)
+	{
+		return nChr > 64 && nChr < 91 ?
+			nChr - 65
+		: nChr > 96 && nChr < 123 ?
+		nChr - 71
+		: nChr > 47 && nChr < 58 ?
+		nChr + 4
+		: nChr === 43 ?
+		62
+		: nChr === 47 ?
+		63
+		:
+		0;
+	}
+
+	var
+		sB64Enc = sBase64.replace(/[^A-Za-z0-9\+\/]/g, ""),
+		nInLen = sB64Enc.length,
+		nOutLen = nBlocksSize ? Math.ceil((nInLen * 3 + 1 >> 2) / nBlocksSize) * nBlocksSize : nInLen * 3 + 1 >> 2,
+		taBytes = new Uint8Array(nOutLen);
+
+	for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++)
+	{
+		nMod4 = nInIdx & 3;
+		nUint24 |= b64ToUint6(sB64Enc.charCodeAt(nInIdx)) << 18 - 6 * nMod4;
+		if (nMod4 === 3 || nInLen - nInIdx === 1)
+		{
+			for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++)
+				taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
+			nUint24 = 0;
+		}
+	}
+
+	return taBytes;
+}
+Convert.Uint8Array_to_b64string = function(aBytes)
+{
+	function uint6ToB64 (nUint6)
+	{
+		return nUint6 < 26 ?
+			nUint6 + 65
+			: nUint6 < 52 ?
+			nUint6 + 71
+			: nUint6 < 62 ?
+			nUint6 - 4
+			: nUint6 === 62 ?
+			43
+			: nUint6 === 63 ?
+			47
+			:
+			65;
+	}
+
+	var nMod3, sB64Enc = "";
+
+	for (var nLen = aBytes.length, nUint24 = 0, nIdx = 0; nIdx < nLen; nIdx++)
+	{
+		nMod3 = nIdx % 3;
+		if (nIdx > 0 && (nIdx * 4 / 3) % 76 === 0)
+			sB64Enc += "\r\n";
+		nUint24 |= aBytes[nIdx] << (16 >>> nMod3 & 24);
+		if (nMod3 === 2 || aBytes.length - nIdx === 1)
+		{
+			sB64Enc += String.fromCharCode(uint6ToB64(nUint24 >>> 18 & 63), uint6ToB64(nUint24 >>> 12 & 63), uint6ToB64(nUint24 >>> 6 & 63), uint6ToB64(nUint24 & 63));
+			nUint24 = 0;
+		}
+	}
+
+	return sB64Enc.replace(/A(?=A$|$)/g, "=");
+}
+
+
+//
+// Unicode and arbitrary value safe conversion between strings and Uint8Arrays
+//
+Convert.Uint8Array_to_string = function(aBytes)
+{
+	var sView = "";
+
+	for (var nPart, nLen = aBytes.length, nIdx = 0; nIdx < nLen; nIdx++)
+	{
+		nPart = aBytes[nIdx];
+		sView += String.fromCharCode(
+			nPart > 251 && nPart < 254 && nIdx + 5 < nLen ? /* six bytes */
+			/* (nPart - 252 << 32) is not possible in ECMAScript! So...: */
+			(nPart - 252) * 1073741824 + (aBytes[++nIdx] - 128 << 24) + (aBytes[++nIdx] - 128 << 18) + (aBytes[++nIdx] - 128 << 12) + (aBytes[++nIdx] - 128 << 6) + aBytes[++nIdx] - 128
+			: nPart > 247 && nPart < 252 && nIdx + 4 < nLen ? /* five bytes */
+			(nPart - 248 << 24) + (aBytes[++nIdx] - 128 << 18) + (aBytes[++nIdx] - 128 << 12) + (aBytes[++nIdx] - 128 << 6) + aBytes[++nIdx] - 128
+			: nPart > 239 && nPart < 248 && nIdx + 3 < nLen ? /* four bytes */
+			(nPart - 240 << 18) + (aBytes[++nIdx] - 128 << 12) + (aBytes[++nIdx] - 128 << 6) + aBytes[++nIdx] - 128
+			: nPart > 223 && nPart < 240 && nIdx + 2 < nLen ? /* three bytes */
+			(nPart - 224 << 12) + (aBytes[++nIdx] - 128 << 6) + aBytes[++nIdx] - 128
+			: nPart > 191 && nPart < 224 && nIdx + 1 < nLen ? /* two bytes */
+			(nPart - 192 << 6) + aBytes[++nIdx] - 128
+			: /* nPart < 127 ? */ /* one byte */
+			nPart
+		);
+	}
+
+	return sView;
+}
+Convert.string_to_Uint8Array = function(sDOMStr)
+{
+	var aBytes, nChr, nStrLen = sDOMStr.length, nArrLen = 0;
+
+	/* mapping... */
+
+	for (var nMapIdx = 0; nMapIdx < nStrLen; nMapIdx++)
+	{
+		nChr = sDOMStr.charCodeAt(nMapIdx);
+		nArrLen += nChr < 0x80 ? 1 : nChr < 0x800 ? 2 : nChr < 0x10000 ? 3 : nChr < 0x200000 ? 4 : nChr < 0x4000000 ? 5 : 6;
+	}
+
+	aBytes = new Uint8Array(nArrLen);
+
+	/* transcription... */
+
+	for (var nIdx = 0, nChrIdx = 0; nIdx < nArrLen; nChrIdx++)
+	{
+		nChr = sDOMStr.charCodeAt(nChrIdx);
+		if (nChr < 128)
+		{
+			/* one byte */
+			aBytes[nIdx++] = nChr;
+		}
+		else if (nChr < 0x800)
+		{
+			/* two bytes */
+			aBytes[nIdx++] = 192 + (nChr >>> 6);
+			aBytes[nIdx++] = 128 + (nChr & 63);
+		}
+		else if (nChr < 0x10000)
+		{
+			/* three bytes */
+			aBytes[nIdx++] = 224 + (nChr >>> 12);
+			aBytes[nIdx++] = 128 + (nChr >>> 6 & 63);
+			aBytes[nIdx++] = 128 + (nChr & 63);
+		}
+		else if (nChr < 0x200000)
+		{
+			/* four bytes */
+			aBytes[nIdx++] = 240 + (nChr >>> 18);
+			aBytes[nIdx++] = 128 + (nChr >>> 12 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 6 & 63);
+			aBytes[nIdx++] = 128 + (nChr & 63);
+		}
+		else if (nChr < 0x4000000)
+		{
+			/* five bytes */
+			aBytes[nIdx++] = 248 + (nChr >>> 24);
+			aBytes[nIdx++] = 128 + (nChr >>> 18 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 12 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 6 & 63);
+			aBytes[nIdx++] = 128 + (nChr & 63);
+		}
+		else /* if (nChr <= 0x7fffffff) */
+		{
+			/* six bytes */
+			aBytes[nIdx++] = 252 + /* (nChr >>> 32) is not possible in ECMAScript! So...: */ (nChr / 1073741824);
+			aBytes[nIdx++] = 128 + (nChr >>> 24 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 18 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 12 & 63);
+			aBytes[nIdx++] = 128 + (nChr >>> 6 & 63);
+			aBytes[nIdx++] = 128 + (nChr & 63);
+		}
+	}
+
+	return aBytes;
+}
+
+
+//
+// Converts all characters in a string that have equivalent entities to their ampersand/entity names.
+// Based on https://gist.github.com/jonathantneal/6093551
+//
+Convert.string_to_html_entities = (function()
+{
+	'use strict';
+
+	var data = '34quot38amp39apos60lt62gt160nbsp161iexcl162cent163pound164curren165yen166brvbar167sect168uml169copy170ordf171laquo172not173shy174reg175macr176deg177plusmn178sup2179sup3180acute181micro182para183middot184cedil185sup1186ordm187raquo188frac14189frac12190frac34191iquest192Agrave193Aacute194Acirc195Atilde196Auml197Aring198AElig199Ccedil200Egrave201Eacute202Ecirc203Euml204Igrave205Iacute206Icirc207Iuml208ETH209Ntilde210Ograve211Oacute212Ocirc213Otilde214Ouml215times216Oslash217Ugrave218Uacute219Ucirc220Uuml221Yacute222THORN223szlig224agrave225aacute226acirc227atilde228auml229aring230aelig231ccedil232egrave233eacute234ecirc235euml236igrave237iacute238icirc239iuml240eth241ntilde242ograve243oacute244ocirc245otilde246ouml247divide248oslash249ugrave250uacute251ucirc252uuml253yacute254thorn255yuml402fnof913Alpha914Beta915Gamma916Delta917Epsilon918Zeta919Eta920Theta921Iota922Kappa923Lambda924Mu925Nu926Xi927Omicron928Pi929Rho931Sigma932Tau933Upsilon934Phi935Chi936Psi937Omega945alpha946beta947gamma948delta949epsilon950zeta951eta952theta953iota954kappa955lambda956mu957nu958xi959omicron960pi961rho962sigmaf963sigma964tau965upsilon966phi967chi968psi969omega977thetasym978upsih982piv8226bull8230hellip8242prime8243Prime8254oline8260frasl8472weierp8465image8476real8482trade8501alefsym8592larr8593uarr8594rarr8595darr8596harr8629crarr8656lArr8657uArr8658rArr8659dArr8660hArr8704forall8706part8707exist8709empty8711nabla8712isin8713notin8715ni8719prod8721sum8722minus8727lowast8730radic8733prop8734infin8736ang8743and8744or8745cap8746cup8747int8756there48764sim8773cong8776asymp8800ne8801equiv8804le8805ge8834sub8835sup8836nsub8838sube8839supe8853oplus8855otimes8869perp8901sdot8968lceil8969rceil8970lfloor8971rfloor9001lang9002rang9674loz9824spades9827clubs9829hearts9830diams338OElig339oelig352Scaron353scaron376Yuml710circ732tilde8194ensp8195emsp8201thinsp8204zwnj8205zwj8206lrm8207rlm8211ndash8212mdash8216lsquo8217rsquo8218sbquo8220ldquo8221rdquo8222bdquo8224dagger8225Dagger8240permil8249lsaquo8250rsaquo8364euro';
+	var charCodes = data.split(/[A-z]+/);
+	var entities = data.split(/\d+/).slice(1);
+
+	return function encodeHTMLEntities(text)
+	{
+		return text.replace(/[\u00A0-\u2666<>"'&]/g, function (match)
+		{
+			var charCode = String(match.charCodeAt(0));
+			var index = charCodes.indexOf(charCode);
+			return '&' + (entities[index] ? entities[index] : '#' + charCode) + ';';
+		});
+	};
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Core.js Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/DOM.js Added

@@ -0,0 +1,499 @@
+
+namespace("DOM.Node");
+namespace("DOM.Event");
+namespace("DOM.Applet");
+
+
+
+//
+// =====================================================================================================================
+// ----- DOCUMENT NODE/ELEMENT EXTENSIONS ------------------------------------------------------------------------------
+// =====================================================================================================================
+//
+
+
+
+DOM.Node.Get = function(id)
+{
+	return document.getElementById(id);
+}
+
+
+//
+// Set node position
+//
+DOM.Node.SetPosition = function(node, position)
+{
+	node.style.left = position[0];
+	node.style.top = position[1];
+}
+DOM.Node.SetX = function(node, x)
+{
+	node.style.left = x;
+}
+DOM.Node.SetY = function(node, y)
+{
+	node.style.top = y;
+}
+
+
+//
+// Get the absolute position of a HTML element on the page
+//
+DOM.Node.GetPosition = function(element, account_for_scroll)
+{
+	// Recurse up through parents, summing offsets from their parent
+	var x = 0, y = 0;
+	for (var node = element; node != null; node = node.offsetParent)
+	{
+		x += node.offsetLeft;
+		y += node.offsetTop;
+	}
+
+	if (account_for_scroll)
+	{
+		// Walk up the hierarchy subtracting away any scrolling
+		for (var node = element; node != document.body; node = node.parentNode)
+		{
+			x -= node.scrollLeft;
+			y -= node.scrollTop;
+		}
+	}
+
+	return [x, y];
+}
+
+
+//
+// Set node size
+//
+DOM.Node.SetSize = function(node, size)
+{
+	node.style.width = size[0];
+	node.style.height = size[1];
+}
+DOM.Node.SetWidth = function(node, width)
+{
+	node.style.width = width;
+}
+DOM.Node.SetHeight = function(node, height)
+{
+	node.style.height = height;
+}
+
+
+//
+// Get node OFFSET size:
+//    clientX includes padding
+//    offsetX includes padding and borders
+//    scrollX includes padding, borders and size of contained node
+//
+DOM.Node.GetSize = function(node)
+{
+	return [ node.offsetWidth, node.offsetHeight ];
+}
+DOM.Node.GetWidth = function(node)
+{
+	return node.offsetWidth;
+}
+DOM.Node.GetHeight = function(node)
+{
+	return node.offsetHeight;
+}
+
+
+//
+// Set node opacity
+//
+DOM.Node.SetOpacity = function(node, value)
+{
+	node.style.opacity = value;
+}
+
+
+DOM.Node.SetColour = function(node, colour)
+{
+	node.style.color = colour;
+}
+
+
+//
+// Hide a node by completely disabling its rendering (it no longer contributes to document layout)
+//
+DOM.Node.Hide = function(node)
+{
+	node.style.display = "none";
+}
+
+
+//
+// Show a node by restoring its influcen in document layout
+//
+DOM.Node.Show = function(node)
+{
+	node.style.display = "block";
+}
+
+
+//
+// Add a CSS class to a HTML element, specified last
+//
+DOM.Node.AddClass = function(node, class_name)
+{
+	// Ensure the class hasn't already been added
+	DOM.Node.RemoveClass(node, class_name);
+	node.className += " " + class_name;
+}
+
+
+//
+// Remove a CSS class from a HTML element
+//
+DOM.Node.RemoveClass = function(node, class_name)
+{
+	// Remove all variations of where the class name can be in the string list
+	var regexp = new RegExp("\\b" + class_name + "\\b");
+	node.className = node.className.replace(regexp, "");
+}
+
+
+
+//
+// Check to see if a HTML element contains a class
+//
+DOM.Node.HasClass = function(node, class_name)
+{
+	var regexp = new RegExp("\\b" + class_name + "\\b");
+	return regexp.test(node.className);
+}
+
+
+//
+// Recursively search for a node with the given class name
+//
+DOM.Node.FindWithClass = function(parent_node, class_name, index)
+{
+	// Search the children looking for a node with the given class name
+	for (var i in parent_node.childNodes)
+	{
+		var node = parent_node.childNodes[i];
+		if (DOM.Node.HasClass(node, class_name))
+		{
+			if (index === undefined || index-- == 0)
+				return node;
+		}
+
+		// Recurse into children
+		node = DOM.Node.FindWithClass(node, class_name);
+		if (node != null)
+			return node;
+	}
+
+	return null;
+}
+
+
+//
+// Check to see if one node logically contains another
+//
+DOM.Node.Contains = function(node, container_node)
+{
+	while (node != null && node != container_node)
+		node = node.parentNode;
+	return node != null;
+}
+
+
+//
+// Create the HTML nodes specified in the text passed in
+// Assumes there is only one root node in the text
+//
+DOM.Node.CreateHTML = function(html)
+{
+	var div = document.createElement("div");
+	div.innerHTML = html;
+
+	// First child may be a text node, followed by the created HTML
+	var child = div.firstChild;
+	if (child != null && child.nodeType == 3)
+		child = child.nextSibling;
+	return child;
+}
+
+
+//
+// Make a copy of a HTML element, making it visible and clearing its ID to ensure it's not a duplicate
+//
+DOM.Node.Clone = function(name)
+{
+	// Get the template element and clone it, making sure it's renderable
+	var node = DOM.Node.Get(name);
+	node = node.cloneNode(true);
+	node.id = null;
+	node.style.display = "block";
+	return node;
+}
+
+
+//
+// Append an arbitrary block of HTML to an existing node
+//
+DOM.Node.AppendHTML = function(node, html)
+{
+	var child = DOM.Node.CreateHTML(html);
+	node.appendChild(child);
+	return child;
+}
+
+
+//
+// Append a div that clears the float style
+//
+DOM.Node.AppendClearFloat = function(node)
+{
+	var div = document.createElement("div");
+	div.style.clear = "both";
+	node.appendChild(div);
+}
+
+
+//
+// Check to see that the object passed in is an instance of a DOM node
+//
+DOM.Node.IsNode = function(object)
+{
+	return object instanceof Element;
+}
+
+
+//
+// Create an "iframe shim" so that elements within it render over a Java Applet
+// http://web.archive.org/web/20110707212850/http://www.oratransplant.nl/2007/10/26/using-iframe-shim-to-partly-cover-a-java-applet/
+//
+DOM.Node.CreateShim = function(parent)
+{
+	var shimmer = document.createElement("iframe");
+
+	// Position the shimmer so that it's the same location/size as its parent
+	shimmer.style.position = "fixed";
+	shimmer.style.left = parent.style.left;
+	shimmer.style.top = parent.style.top;
+	shimmer.style.width = parent.offsetWidth;
+	shimmer.style.height = parent.offsetHeight;
+
+	// We want the shimmer to be one level below its contents
+	shimmer.style.zIndex = parent.style.zIndex - 1;
+
+	// Ensure its empty
+	shimmer.setAttribute("frameborder", "0");
+	shimmer.setAttribute("src", "");
+
+	// Add to the document and the parent
+	document.body.appendChild(shimmer);
+	parent.Shimmer = shimmer;
+	return shimmer;
+}
+
+
+
+//
+// =====================================================================================================================
+// ----- EVENT HANDLING EXTENSIONS -------------------------------------------------------------------------------------
+// =====================================================================================================================
+//
+
+
+
+//
+// Retrieves the event from the first parameter passed into an HTML event
+//
+DOM.Event.Get = function(evt)
+{
+	// Internet explorer doesn't pass the event
+	return window.event || evt;
+}
+
+
+//
+// Retrieves the element that triggered an event from the event object
+//
+DOM.Event.GetNode = function(evt)
+{
+	evt = DOM.Event.Get(evt);
+
+	// Get the target element
+	var element;
+	if (evt.target)
+		element = evt.target;
+	else if (e.srcElement)
+		element = evt.srcElement;
+
+	// Default Safari bug
+	if (element.nodeType == 3)
+		element = element.parentNode;
+
+	return element;
+}
+
+
+//
+// Stop default action for an event
+//
+DOM.Event.StopDefaultAction = function(evt)
+{
+	if (evt && evt.preventDefault)
+		evt.preventDefault();
+	else if (window.event && window.event.returnValue)
+		window.event.returnValue = false;
+}
+
+
+//
+// Stops events bubbling up to parent event handlers
+//
+DOM.Event.StopPropagation = function(evt)
+{
+	evt = DOM.Event.Get(evt);
+	if (evt)
+	{
+		evt.cancelBubble = true;
+		if (evt.stopPropagation)
+			evt.stopPropagation();
+	}
+}
+
+
+//
+// Stop both event default action and propagation
+//
+DOM.Event.StopAll = function(evt)
+{
+	DOM.Event.StopDefaultAction(evt);
+	DOM.Event.StopPropagation(evt);
+}
+
+
+//
+// Adds an event handler to an event
+//
+DOM.Event.AddHandler = function(obj, evt, func)
+{
+	if (obj)
+	{
+		if (obj.addEventListener)
+			obj.addEventListener(evt, func, false);
+		else if (obj.attachEvent)
+			obj.attachEvent("on" + evt, func);
+	}
+}
+
+
+//
+// Removes an event handler from an event
+//
+DOM.Event.RemoveHandler = function(obj, evt, func)
+{
+	if (obj)
+	{
+		if (obj.removeEventListener)
+			obj.removeEventListener(evt, func, false);
+		else if (obj.detachEvent)
+			obj.detachEvent("on" + evt, func);
+	}
+}
+
+
+//
+// Get the position of the mouse cursor, page relative
+//
+DOM.Event.GetMousePosition = function(evt)
+{
+	evt = DOM.Event.Get(evt);
+
+	var px = 0;
+	var py = 0;
+	if (evt.pageX || evt.pageY)
+	{
+		px = evt.pageX;
+		py = evt.pageY;
+	}
+	else if (evt.clientX || evt.clientY)
+	{
+		px = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
+		py = e.clientY + document.body.scrollTop + document.documentElement.scrollTop;
+	}
+
+	return [px, py];
+}
+
+
+
+//
+// =====================================================================================================================
+// ----- JAVA APPLET EXTENSIONS ----------------------------------------------------------------------------------------
+// =====================================================================================================================
+//
+
+
+
+//
+// Create an applet element for loading a Java applet, attaching it to the specified node
+//
+DOM.Applet.Load = function(dest_id, id, code, archive)
+{
+	// Lookup the applet destination
+	var dest = DOM.Node.Get(dest_id);
+	if (!dest)
+		return;
+
+	// Construct the applet element and add it to the destination
+	Debug.Log("Injecting applet DOM code");
+	var applet = "<applet id='" + id + "' code='" + code + "' archive='" + archive + "'";
+	applet += " width='" + dest.offsetWidth + "' height='" + dest.offsetHeight + "'>";
+	applet += "</applet>";
+	dest.innerHTML = applet;
+}
+
+
+//
+// Moves and resizes a named applet so that it fits in the destination div element.
+// The applet must be contained by a div element itself. This container div is moved along
+// with the applet.
+//
+DOM.Applet.Move = function(dest_div, applet, z_index, hide)
+{
+	if (!applet || !dest_div)
+		return;
+
+	// Before modifying any location information, hide the applet so that it doesn't render over
+	// any newly visible elements that appear while the location information is being modified.
+	if (hide)
+		applet.style.visibility = "hidden";
+
+	// Get its view rect
+	var pos = DOM.Node.GetPosition(dest_div);
+	var w = dest_div.offsetWidth;
+	var h = dest_div.offsetHeight;
+
+	// It needs to be embedded in a <div> for correct scale/position adjustment
+	var container = applet.parentNode;
+	if (!container || container.localName != "div")
+	{
+		Debug.Log("ERROR: Couldn't find source applet's div container");
+		return;
+	}
+
+	// Reposition and resize the containing div element
+	container.style.left = pos[0];
+	container.style.top = pos[1];
+	container.style.width = w;
+	container.style.height = h;
+	container.style.zIndex = z_index;
+
+	// Resize the applet itself
+	applet.style.width = w;
+	applet.style.height = h;
+
+	// Everything modified, safe to show
+	applet.style.visibility = "visible";
+}

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Keyboard.js Added

@@ -0,0 +1,149 @@
+
+namespace("Keyboard")
+
+
+// =====================================================================================================================
+// Key codes copied from closure-library
+// https://code.google.com/p/closure-library/source/browse/closure/goog/events/keycodes.js
+// ---------------------------------------------------------------------------------------------------------------------
+// Copyright 2006 The Closure Library Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS-IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Keyboard.Codes = {
+	WIN_KEY_FF_LINUX	: 0,
+	MAC_ENTER			: 3,
+	BACKSPACE			: 8,
+	TAB					: 9,
+	NUM_CENTER			: 12,	// NUMLOCK on FF/Safari Mac
+	ENTER				: 13,
+	SHIFT				: 16,
+	CTRL				: 17,
+	ALT					: 18,
+	PAUSE				: 19,
+	CAPS_LOCK			: 20,
+	ESC					: 27,
+	SPACE				: 32,
+	PAGE_UP				: 33,	// also NUM_NORTH_EAST
+	PAGE_DOWN			: 34,	// also NUM_SOUTH_EAST
+	END					: 35,	// also NUM_SOUTH_WEST
+	HOME				: 36,	// also NUM_NORTH_WEST
+	LEFT				: 37,	// also NUM_WEST
+	UP					: 38,	// also NUM_NORTH
+	RIGHT				: 39,	// also NUM_EAST
+	DOWN				: 40,	// also NUM_SOUTH
+	PRINT_SCREEN		: 44,
+	INSERT				: 45,	// also NUM_INSERT
+	DELETE				: 46,	// also NUM_DELETE
+	ZERO				: 48,
+	ONE					: 49,
+	TWO					: 50,
+	THREE				: 51,
+	FOUR				: 52,
+	FIVE				: 53,
+	SIX					: 54,
+	SEVEN				: 55,
+	EIGHT				: 56,
+	NINE				: 57,
+	FF_SEMICOLON		: 59,	// Firefox (Gecko) fires this for semicolon instead of 186
+	FF_EQUALS			: 61,	// Firefox (Gecko) fires this for equals instead of 187
+	FF_DASH				: 173,	// Firefox (Gecko) fires this for dash instead of 189
+	QUESTION_MARK		: 63,	// needs localization
+	A					: 65,
+	B					: 66,
+	C					: 67,
+	D					: 68,
+	E					: 69,
+	F					: 70,
+	G					: 71,
+	H					: 72,
+	I					: 73,
+	J					: 74,
+	K					: 75,
+	L					: 76,
+	M					: 77,
+	N					: 78,
+	O					: 79,
+	P					: 80,
+	Q					: 81,
+	R					: 82,
+	S					: 83,
+	T					: 84,
+	U					: 85,
+	V					: 86,
+	W					: 87,
+	X					: 88,
+	Y					: 89,
+	Z					: 90,
+	META				: 91,	// WIN_KEY_LEFT
+	WIN_KEY_RIGHT		: 92,
+	CONTEXT_MENU		: 93,
+	NUM_ZERO			: 96,
+	NUM_ONE				: 97,
+	NUM_TWO				: 98,
+	NUM_THREE			: 99,
+	NUM_FOUR			: 100,
+	NUM_FIVE			: 101,
+	NUM_SIX				: 102,
+	NUM_SEVEN			: 103,
+	NUM_EIGHT			: 104,
+	NUM_NINE			: 105,
+	NUM_MULTIPLY		: 106,
+	NUM_PLUS			: 107,
+	NUM_MINUS			: 109,
+	NUM_PERIOD			: 110,
+	NUM_DIVISION		: 111,
+	F1					: 112,
+	F2					: 113,
+	F3					: 114,
+	F4					: 115,
+	F5					: 116,
+	F6					: 117,
+	F7					: 118,
+	F8					: 119,
+	F9					: 120,
+	F10					: 121,
+	F11					: 122,
+	F12					: 123,
+	NUMLOCK				: 144,
+	SCROLL_LOCK			: 145,
+
+	// OS-specific media keys like volume controls and browser controls.
+	FIRST_MEDIA_KEY		: 166,
+	LAST_MEDIA_KEY		: 183,
+
+	SEMICOLON			: 186,	// needs localization
+	DASH				: 189,	// needs localization
+	EQUALS				: 187,	// needs localization
+	COMMA				: 188,	// needs localization
+	PERIOD				: 190,	// needs localization
+	SLASH				: 191,	// needs localization
+	APOSTROPHE			: 192,	// needs localization
+	TILDE				: 192,	// needs localization
+	SINGLE_QUOTE		: 222,	// needs localization
+	OPEN_SQUARE_BRACKET	: 219,	// needs localization
+	BACKSLASH			: 220,	// needs localization
+	CLOSE_SQUARE_BRACKET: 221,	// needs localization
+	WIN_KEY				: 224,
+	MAC_FF_META			: 224,	// Firefox (Gecko) fires this for the meta key instead of 91
+	MAC_WK_CMD_LEFT		: 91,	// WebKit Left Command key fired, same as META
+	MAC_WK_CMD_RIGHT	: 93,	// WebKit Right Command key fired, different from META
+	WIN_IME				: 229,
+
+	// We've seen users whose machines fire this keycode at regular one
+	// second intervals. The common thread among these users is that
+	// they're all using Dell Inspiron laptops, so we suspect that this
+	// indicates a hardware/bios problem.
+	// http://en.community.dell.com/support-forums/laptop/f/3518/p/19285957/19523128.aspx
+	PHANTOM				: 255
+};
+// =====================================================================================================================

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/LocalStore.js Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/Mouse.js Added

@@ -0,0 +1,83 @@
+
+namespace("Mouse");
+
+
+Mouse.State =(function()
+{
+	function State(event)
+	{
+		// Get button press states
+		if (typeof event.buttons != "undefined")
+		{
+			// Firefox
+			this.Left = (event.buttons & 1) != 0;
+			this.Right = (event.buttons & 2) != 0;
+			this.Middle = (event.buttons & 4) != 0;
+		}
+		else
+		{
+			// Chrome
+			this.Left = (event.button == 0);
+			this.Middle = (event.button == 1);
+			this.Right = (event.button == 2);
+		}
+
+		// Get page-relative mouse position
+		this.Position = DOM.Event.GetMousePosition(event);
+
+		// Get wheel delta
+		var delta = 0;
+		if (event.wheelDelta)
+			delta = event.wheelDelta / 120;		// IE/Opera
+		else if (event.detail)
+			delta = -event.detail / 3;			// Mozilla
+		this.WheelDelta = delta;
+
+		// Get the mouse position delta
+		// Requires Pointer Lock API support
+		this.PositionDelta = [
+			event.movementX || event.mozMovementX || event.webkitMovementX || 0,
+			event.movementY || event.mozMovementY || event.webkitMovementY || 0
+		];
+	}
+
+	return State;
+})();
+
+
+//
+// Basic Pointer Lock API support
+// https://developer.mozilla.org/en-US/docs/WebAPI/Pointer_Lock
+// http://www.chromium.org/developers/design-documents/mouse-lock
+//
+// Note that API has not been standardised yet so browsers can implement functions with prefixes
+//
+
+
+Mouse.PointerLockSupported = function()
+{
+	return 'pointerLockElement' in document || 'mozPointerLockElement' in document || 'webkitPointerLockElement' in document;
+}
+
+
+Mouse.RequestPointerLock = function(element)
+{
+	element.requestPointerLock = element.requestPointerLock || element.mozRequestPointerLock || element.webkitRequestPointerLock;
+	if (element.requestPointerLock)
+		element.requestPointerLock();
+}
+
+
+Mouse.ExitPointerLock = function()
+{
+	document.exitPointerLock = document.exitPointerLock || document.mozExitPointerLock || document.webkitExitPointerLock;
+	if (document.exitPointerLock)
+		document.exitPointerLock();
+}
+
+
+// Can use this element to detect whether pointer lock is enabled (returns non-null)
+Mouse.PointerLockElement = function()
+{
+	return document.pointerLockElement || document.mozPointerLockElement || document.webkitPointerLockElement;
+}

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/Core/Code/MurmurHash3.js Added

@@ -0,0 +1,68 @@
+
+namespace("Hash");
+
+/**
+ * JS Implementation of MurmurHash3 (r136) (as of May 20, 2011)
+ * 
+ * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
+ * @see http://github.com/garycourt/murmurhash-js
+ * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
+ * @see http://sites.google.com/site/murmurhash/
+ * 
+ * @param {string} key ASCII only
+ * @param {number} seed Positive integer only
+ * @return {number} 32-bit positive integer hash 
+ */
+
+Hash.Murmur3 = function(key, seed)
+{
+	var remainder, bytes, h1, h1b, c1, c1b, c2, c2b, k1, i;
+	
+	remainder = key.length & 3; // key.length % 4
+	bytes = key.length - remainder;
+	h1 = seed;
+	c1 = 0xcc9e2d51;
+	c2 = 0x1b873593;
+	i = 0;
+	
+	while (i < bytes) {
+	  	k1 = 
+	  	  ((key.charCodeAt(i) & 0xff)) |
+	  	  ((key.charCodeAt(++i) & 0xff) << 8) |
+	  	  ((key.charCodeAt(++i) & 0xff) << 16) |
+	  	  ((key.charCodeAt(++i) & 0xff) << 24);
+		++i;
+		
+		k1 = ((((k1 & 0xffff) * c1) + ((((k1 >>> 16) * c1) & 0xffff) << 16))) & 0xffffffff;
+		k1 = (k1 << 15) | (k1 >>> 17);
+		k1 = ((((k1 & 0xffff) * c2) + ((((k1 >>> 16) * c2) & 0xffff) << 16))) & 0xffffffff;
+
+		h1 ^= k1;
+        h1 = (h1 << 13) | (h1 >>> 19);
+		h1b = ((((h1 & 0xffff) * 5) + ((((h1 >>> 16) * 5) & 0xffff) << 16))) & 0xffffffff;
+		h1 = (((h1b & 0xffff) + 0x6b64) + ((((h1b >>> 16) + 0xe654) & 0xffff) << 16));
+	}
+	
+	k1 = 0;
+	
+	switch (remainder) {
+		case 3: k1 ^= (key.charCodeAt(i + 2) & 0xff) << 16;
+		case 2: k1 ^= (key.charCodeAt(i + 1) & 0xff) << 8;
+		case 1: k1 ^= (key.charCodeAt(i) & 0xff);
+		
+		k1 = (((k1 & 0xffff) * c1) + ((((k1 >>> 16) * c1) & 0xffff) << 16)) & 0xffffffff;
+		k1 = (k1 << 15) | (k1 >>> 17);
+		k1 = (((k1 & 0xffff) * c2) + ((((k1 >>> 16) * c2) & 0xffff) << 16)) & 0xffffffff;
+		h1 ^= k1;
+	}
+	
+	h1 ^= key.length;
+
+	h1 ^= h1 >>> 16;
+	h1 = (((h1 & 0xffff) * 0x85ebca6b) + ((((h1 >>> 16) * 0x85ebca6b) & 0xffff) << 16)) & 0xffffffff;
+	h1 ^= h1 >>> 13;
+	h1 = ((((h1 & 0xffff) * 0xc2b2ae35) + ((((h1 >>> 16) * 0xc2b2ae35) & 0xffff) << 16))) & 0xffffffff;
+	h1 ^= h1 >>> 16;
+
+	return h1 >>> 0;
+}
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Button.js Added

@@ -0,0 +1,131 @@
+
+namespace("WM");
+
+
+WM.Button = (function()
+{
+	var template_html = "<div class='Button notextsel'></div>";
+
+
+	function Button(text, x, y, opts)
+	{
+		this.OnClick = null;
+		this.Toggle = opts && opts.toggle;
+
+		this.Node = DOM.Node.CreateHTML(template_html);
+
+		// Set node dimensions
+		this.SetPosition(x, y);
+		if (opts && opts.w && opts.h)
+			this.SetSize(opts.w, opts.h);
+
+		// Override the default class name
+		if (opts && opts.class)
+			this.Node.className = opts.class;
+
+		this.SetText(text);
+
+		// Create the mouse press event handlers
+		DOM.Event.AddHandler(this.Node, "mousedown", Bind(OnMouseDown, this));
+		this.OnMouseOutDelegate = Bind(OnMouseUp, this, false);
+		this.OnMouseUpDelegate = Bind(OnMouseUp, this, true);
+	}
+
+
+	Button.prototype.SetPosition = function(x, y)
+	{
+		this.Position = [ x, y ];
+		DOM.Node.SetPosition(this.Node, this.Position);
+	}
+
+
+	Button.prototype.SetSize = function(w, h)
+	{
+		this.Size = [ w, h ];
+		DOM.Node.SetSize(this.Node, this.Size);
+	}
+
+
+	Button.prototype.SetText = function(text)
+	{
+		this.Node.innerHTML = text;
+	}
+
+
+	Button.prototype.SetOnClick = function(on_click)
+	{
+		this.OnClick = on_click;
+	}
+
+
+	Button.prototype.SetState = function(pressed)
+	{
+		if (pressed)
+			DOM.Node.AddClass(this.Node, "ButtonHeld");
+		else
+			DOM.Node.RemoveClass(this.Node, "ButtonHeld");
+	}
+
+
+	Button.prototype.ToggleState = function()
+	{
+		if (DOM.Node.HasClass(this.Node, "ButtonHeld"))
+			this.SetState(false);
+		else
+			this.SetState(true);
+	}
+
+
+	Button.prototype.IsPressed = function()
+	{
+		return DOM.Node.HasClass(this.Node, "ButtonHeld");
+	}
+
+
+	function OnMouseDown(self, evt)
+	{
+		// Decide how to set the button state
+		if (self.Toggle)
+			self.ToggleState();
+		else
+			self.SetState(true);
+
+		// Activate release handlers
+		DOM.Event.AddHandler(self.Node, "mouseout", self.OnMouseOutDelegate);
+		DOM.Event.AddHandler(self.Node, "mouseup", self.OnMouseUpDelegate);
+
+		DOM.Event.StopAll(evt);
+	}
+
+
+	function OnMouseUp(self, confirm, evt)
+	{
+		if (confirm)
+		{
+			// Only release for non-toggles
+			if (!self.Toggle)
+				self.SetState(false);
+		}
+		else
+		{
+			// Decide how to set the button state
+			if (self.Toggle)
+				self.ToggleState();
+			else
+				self.SetState(false);
+		}
+
+		// Remove release handlers
+		DOM.Event.RemoveHandler(self.Node, "mouseout", self.OnMouseOutDelegate);
+		DOM.Event.RemoveHandler(self.Node, "mouseup", self.OnMouseUpDelegate);
+
+		// Call the click handler if this is a button press
+		if (confirm && self.OnClick)
+			self.OnClick(self);
+
+		DOM.Event.StopAll(evt);
+	}
+
+
+	return Button;
+})();
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/ComboBox.js Added

@@ -0,0 +1,237 @@
+
+namespace("WM");
+
+
+WM.ComboBoxPopup = (function()
+{
+	var body_template_html = "<div class='ComboBoxPopup'></div>";
+
+	var item_template_html = "																	\
+		<div class='ComboBoxPopupItem notextsel'>												\
+			<div class='ComboBoxPopupItemText'></div>											\
+			<div class='ComboBoxPopupItemIcon'><img src='BrowserLibImages/tick.gif'></div>		\
+			<div style='clear:both'></div>														\
+		</div>";
+
+
+	function ComboBoxPopup(combo_box)
+	{
+		this.ComboBox = combo_box;
+		this.ParentNode = combo_box.Node;
+		this.ValueNodes = [ ];
+
+		// Create the template node
+		this.Node = DOM.Node.CreateHTML(body_template_html);
+
+		DOM.Event.AddHandler(this.Node, "mousedown", Bind(SelectItem, this));
+		this.CancelDelegate = Bind(this, "Cancel");
+	}
+
+
+	ComboBoxPopup.prototype.SetValues = function(values)
+	{
+		// Clear existing values
+		this.Node.innerHTML = "";
+
+		// Generate HTML nodes for each value
+		this.ValueNodes = [ ];
+		for (var i in values)
+		{
+			var item_node = DOM.Node.CreateHTML(item_template_html);
+			var text_node = DOM.Node.FindWithClass(item_node, "ComboBoxPopupItemText");
+
+			item_node.Value = values[i];
+			text_node.innerHTML = values[i];
+
+			this.Node.appendChild(item_node);
+			this.ValueNodes.push(item_node);
+		}
+	}
+
+
+	ComboBoxPopup.prototype.Show = function(selection_index)
+	{
+		// Initially match the position of the parent node
+		var pos = DOM.Node.GetPosition(this.ParentNode);
+		DOM.Node.SetPosition(this.Node, pos);
+
+		// Take the width/z-index from the parent node
+		this.Node.style.width = this.ParentNode.offsetWidth;
+		this.Node.style.zIndex = this.ParentNode.style.zIndex + 1;
+
+		// Setup event handlers
+		DOM.Event.AddHandler(document.body, "mousedown", this.CancelDelegate);
+
+		// Show the popup so that the HTML layout engine kicks in before
+		// the layout info is used below
+		this.ParentNode.appendChild(this.Node);
+
+		// Show/hide the tick image based on which node is selected
+		for (var i in this.ValueNodes)
+		{
+			var node = this.ValueNodes[i];
+			var icon_node = DOM.Node.FindWithClass(node, "ComboBoxPopupItemIcon");
+
+			if (i == selection_index)
+			{
+				icon_node.style.display = "block";
+
+				// Also, shift the popup up so that the mouse is over the selected item and is highlighted
+				var item_pos = DOM.Node.GetPosition(this.ValueNodes[selection_index]);
+				var diff_pos = [ item_pos[0] - pos[0], item_pos[1] - pos[1] ];
+				pos = [ pos[0] - diff_pos[0], pos[1] - diff_pos[1] ];
+			}
+			else
+			{
+				icon_node.style.display = "none";
+			}
+		}
+
+		DOM.Node.SetPosition(this.Node, pos);
+	}
+
+
+	ComboBoxPopup.prototype.Hide = function()
+	{
+		DOM.Event.RemoveHandler(document.body, "mousedown", this.CancelDelegate);
+		this.ParentNode.removeChild(this.Node);
+	}
+
+
+	function SelectItem(self, evt)
+	{
+		// Search for which item node is being clicked on
+		var node = DOM.Event.GetNode(evt);
+		for (var i in self.ValueNodes)
+		{
+			var value_node = self.ValueNodes[i];
+			if (DOM.Node.Contains(node, value_node))
+			{
+				// Set the value on the combo box
+				self.ComboBox.SetValue(value_node.Value);
+				self.Hide();
+				break;
+			}
+		}
+	}
+
+
+	function Cancel(self, evt)
+	{
+		// Don't cancel if the mouse up is anywhere on the popup or combo box
+		var node = DOM.Event.GetNode(evt);
+		if (!DOM.Node.Contains(node, self.Node) &&
+			!DOM.Node.Contains(node, self.ParentNode))
+		{
+			self.Hide();
+		}
+
+
+		DOM.Event.StopAll(evt);
+	}
+
+
+	return ComboBoxPopup;
+})();
+
+
+WM.ComboBox = (function()
+{
+	var template_html = "																\
+		<div class='ComboBox'>															\
+			<div class='ComboBoxText notextsel'></div>									\
+			<div class='ComboBoxIcon'><img src='BrowserLibImages/up_down.gif'></div>	\
+			<div style='clear:both'></div>												\
+		</div>";
+
+
+	function ComboBox()
+	{
+		this.OnChange = null;
+
+		// Create the template node and locate key nodes
+		this.Node = DOM.Node.CreateHTML(template_html);
+		this.TextNode = DOM.Node.FindWithClass(this.Node, "ComboBoxText");
+
+		// Create a reusable popup
+		this.Popup = new WM.ComboBoxPopup(this);
+
+		// Set an empty set of values
+		this.SetValues([]);
+		this.SetValue("&lt;empty&gt;");
+
+		// Create the mouse press event handlers
+		DOM.Event.AddHandler(this.Node, "mousedown", Bind(OnMouseDown, this));
+		this.OnMouseOutDelegate = Bind(OnMouseUp, this, false);
+		this.OnMouseUpDelegate = Bind(OnMouseUp, this, true);
+	}
+
+
+	ComboBox.prototype.SetOnChange = function(on_change)
+	{
+		this.OnChange = on_change;
+	}
+
+
+	ComboBox.prototype.SetValues = function(values)
+	{
+		this.Values = values;
+		this.Popup.SetValues(values);
+	}
+
+
+	ComboBox.prototype.SetValue = function(value)
+	{
+		// Set the value and its HTML rep
+		var old_value = this.Value;
+		this.Value = value;
+		this.TextNode.innerHTML = value;
+
+		// Call change handler
+		if (this.OnChange)
+			this.OnChange(value, old_value);
+	}
+
+
+	ComboBox.prototype.GetValue = function()
+	{
+		return this.Value;
+	}
+
+
+	function OnMouseDown(self, evt)
+	{
+		// If this check isn't made, the click will trigger from the popup, too
+		var node = DOM.Event.GetNode(evt);
+		if (DOM.Node.Contains(node, self.Node))
+		{
+			// Add the depression class and activate release handlers
+			DOM.Node.AddClass(self.Node, "ComboBoxPressed");
+			DOM.Event.AddHandler(self.Node, "mouseout", self.OnMouseOutDelegate);
+			DOM.Event.AddHandler(self.Node, "mouseup", self.OnMouseUpDelegate);
+
+			DOM.Event.StopAll(evt);
+		}
+	}
+
+
+	function OnMouseUp(self, confirm, evt)
+	{
+		// Remove depression class and remove release handlers
+		DOM.Node.RemoveClass(self.Node, "ComboBoxPressed");
+		DOM.Event.RemoveHandler(self.Node, "mouseout", self.OnMouseOutDelegate);
+		DOM.Event.RemoveHandler(self.Node, "mouseup", self.OnMouseUpDelegate);
+
+		// If this is a confirmed press and there are some values in the list, show the popup
+		if (confirm && self.Values.length > 0)
+		{
+			var selection_index = self.Values.indexOf(self.Value);
+			self.Popup.Show(selection_index);
+		}
+
+		DOM.Event.StopAll(evt);
+	}
+
+
+	return ComboBox;
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Container.js Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/EditBox.js Added

@@ -0,0 +1,119 @@
+
+namespace("WM");
+
+
+WM.EditBox = (function()
+{
+	var template_html = "							\
+		<div class='EditBoxContainer'>				\
+			<div class='EditBoxLabel'>Label</div>	\
+			<input class='EditBox'>					\
+		</div>";
+
+
+	function EditBox(x, y, w, h, label, text)
+	{
+		this.ChangeHandler = null;
+
+		// Create node and locate its internal nodes
+		this.Node = DOM.Node.CreateHTML(template_html);
+		this.LabelNode = DOM.Node.FindWithClass(this.Node, "EditBoxLabel");
+		this.EditNode = DOM.Node.FindWithClass(this.Node, "EditBox");
+
+		// Set label and value
+		this.LabelNode.innerHTML = label;
+		this.SetValue(text);
+
+		this.SetPosition(x, y);
+		this.SetSize(w, h);
+
+		this.PreviousValue = "";
+
+		// Hook up the event handlers
+		DOM.Event.AddHandler(this.EditNode, "focus", Bind(OnFocus, this));
+		DOM.Event.AddHandler(this.EditNode, "keypress", Bind(OnKeyPress, this));
+		DOM.Event.AddHandler(this.EditNode, "keydown", Bind(OnKeyDown, this));
+	}
+
+
+	EditBox.prototype.SetPosition = function(x, y)
+	{
+		this.Position = [ x, y ];
+		DOM.Node.SetPosition(this.Node, this.Position);
+	}
+
+
+	EditBox.prototype.SetSize = function(w, h)
+	{
+		this.Size = [ w, h ];
+		DOM.Node.SetSize(this.EditNode, this.Size);
+	}
+
+
+	EditBox.prototype.SetChangeHandler = function(handler)
+	{
+		this.ChangeHandler = handler;
+	}
+
+
+	EditBox.prototype.SetValue = function(value)
+	{
+		if (this.EditNode)
+			this.EditNode.value = value;
+	}
+
+
+	EditBox.prototype.GetValue = function()
+	{
+		if (this.EditNode)
+			return this.EditNode.value;
+		
+		return null;
+	}
+
+
+	EditBox.prototype.LoseFocus = function()
+	{
+		if (this.EditNode)
+			this.EditNode.blur();
+	}
+
+
+	function OnFocus(self, evt)
+	{
+		// Backup on focus
+		self.PreviousValue = self.EditNode.value;
+	}
+
+
+	function OnKeyPress(self, evt)
+	{
+		// Allow enter to confirm the text only when there's data
+		if (evt.keyCode == 13 && self.EditNode.value != "" && self.ChangeHandler)
+		{
+			var focus = self.ChangeHandler(self.EditNode);
+			if (!focus)
+				self.EditNode.blur();
+			self.PreviousValue = "";
+		}
+	}
+
+
+	function OnKeyDown(self, evt)
+	{
+		// Allow escape to cancel any text changes
+		if (evt.keyCode == 27)
+		{
+			// On initial edit of the input, escape should NOT replace with the empty string
+			if (self.PreviousValue != "")
+			{
+				self.EditNode.value = self.PreviousValue;
+			}
+
+			self.EditNode.blur();
+		}
+	}
+
+
+	return EditBox;
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Grid.js Added

@@ -0,0 +1,252 @@
+
+namespace("WM");
+
+
+WM.GridRows = (function()
+{
+	function GridRows(parent_object)
+	{
+		this.ParentObject = parent_object;
+
+		// Array of rows in the order they were added
+		this.Rows = [ ];
+
+		// Collection of custom row indexes for fast lookup
+		this.Indexes = { };
+	}
+
+
+	GridRows.prototype.AddIndex = function(cell_field_name)
+	{
+		var index = { };
+
+		// Go through existing rows and add to the index
+		for (var i in this.Rows)
+		{
+			var row = this.Rows[i];
+			if (cell_field_name in row.CellData)
+			{
+				var cell_field = row.CellData[cell_field_name];
+				index[cell_field] = row;
+			}
+		}
+
+		this.Indexes[cell_field_name] = index;
+	}
+
+
+	GridRows.prototype.ClearIndex = function(index_name)
+	{
+		this.Indexes[index_name] = { };
+	}
+
+	GridRows.prototype.AddRowToIndex = function(index_name, cell_data, row)
+	{
+		this.Indexes[index_name][cell_data] = row;
+	}
+
+
+	GridRows.prototype.Add = function(cell_data, row_classes, cell_classes)
+	{
+		var row = new WM.GridRow(this.ParentObject, cell_data, row_classes, cell_classes);
+		this.Rows.push(row);
+		return row;
+	}
+
+
+	GridRows.prototype.GetBy = function(cell_field_name, cell_data)
+	{
+		var index = this.Indexes[cell_field_name];
+		return index[cell_data];
+	}
+
+
+	GridRows.prototype.Clear = function()
+	{
+		// Remove all node references from the parent
+		for (var i in this.Rows)
+		{
+			var row = this.Rows[i];
+			row.Parent.BodyNode.removeChild(row.Node);
+		}
+
+		// Clear all indexes
+		for (var i in this.Indexes)
+			this.Indexes[i] = { };
+
+		this.Rows = [ ];
+	}
+
+
+	return GridRows;
+})();
+
+
+WM.GridRow = (function()
+{
+	var template_html = "<div class='GridRow'></div>";
+
+
+	//
+	// 'cell_data' is an object with a variable number of fields.
+	// Any fields prefixed with an underscore are hidden.
+	//
+	function GridRow(parent, cell_data, row_classes, cell_classes)
+	{
+		// Setup data
+		this.Parent = parent;
+		this.IsOpen = true;
+		this.AnimHandle = null;
+		this.Rows = new WM.GridRows(this);
+		this.CellData = cell_data;
+		this.CellNodes = { }
+
+		// Create the main row node
+		this.Node = DOM.Node.CreateHTML(template_html);
+		if (row_classes)
+			DOM.Node.AddClass(this.Node, row_classes);
+
+		// Embed a pointer to the row in the root node so that it can be clicked
+		this.Node.GridRow = this;
+
+		// Create nodes for each required cell
+		for (var attr in this.CellData)
+		{
+			if (this.CellData.hasOwnProperty(attr))
+			{
+				var data = this.CellData[attr];
+
+				// Update any grid row index references
+				if (attr in parent.Rows.Indexes)
+					parent.Rows.AddRowToIndex(attr, data, this);
+
+				// Hide any cells with underscore prefixes
+				if (attr[0] == "_")
+					continue;
+
+				// Create a node for the cell and add any custom classes
+				var node = DOM.Node.AppendHTML(this.Node, "<div class='GridRowCell'></div>");
+				if (cell_classes && attr in cell_classes)
+					DOM.Node.AddClass(node, cell_classes[attr]);
+				this.CellNodes[attr] = node;
+
+				// If this is a Window Control, add its node to the cell
+				if (data instanceof Object && "Node" in data && DOM.Node.IsNode(data.Node))
+				{
+					data.ParentNode = node;
+					node.appendChild(data.Node);
+				}
+
+				else
+				{
+					// Otherwise just assign the data as text
+					node.innerHTML = data;
+				}
+			}
+		}
+
+		// Add the body node for any children
+		if (!this.Parent.BodyNode)
+			this.Parent.BodyNode = DOM.Node.AppendHTML(this.Parent.Node, "<div class='GridRowBody'></div>");
+
+		// Add the row to the parent
+		this.Parent.BodyNode.appendChild(this.Node);
+	}
+
+
+	GridRow.prototype.Open = function()
+	{
+		// Don't allow open while animating
+		if (this.AnimHandle == null || this.AnimHandle.Complete)
+		{
+			this.IsOpen = true;
+
+			// Kick off open animation
+			var node = this.BodyNode;
+			this.AnimHandle = Anim.Animate(
+				function (val) { DOM.Node.SetHeight(node, val) },
+				0, this.Height, 0.2);
+		}
+	}
+
+
+	GridRow.prototype.Close = function()
+	{
+		// Don't allow close while animating
+		if (this.AnimHandle == null || this.AnimHandle.Complete)
+		{
+			this.IsOpen = false;
+
+			// Record height for the next open request
+			this.Height = this.BodyNode.offsetHeight;
+
+			// Kick off close animation
+			var node = this.BodyNode;
+			this.AnimHandle = Anim.Animate(
+				function (val) { DOM.Node.SetHeight(node, val) },
+				this.Height, 0, 0.2);
+		}
+	}
+
+
+	GridRow.prototype.Toggle = function()
+	{
+		if (this.IsOpen)
+			this.Close();
+		else
+			this.Open();
+	}
+
+
+	return GridRow;
+})();
+
+
+WM.Grid = (function()
+{
+	var template_html = "					\
+		<div class='Grid'>					\
+			<div class='GridBody'></div>	\
+		</div>";
+
+
+	function Grid(x, y, width, height)
+	{
+		this.Rows = new WM.GridRows(this);
+
+		this.Node = DOM.Node.CreateHTML(template_html);
+		this.BodyNode = DOM.Node.FindWithClass(this.Node, "GridBody");
+
+		DOM.Node.SetPosition(this.Node, [ x, y ]);
+		DOM.Node.SetSize(this.Node, [ width, height ]);
+
+		DOM.Event.AddHandler(this.Node, "dblclick", OnDblClick);
+
+		var mouse_wheel_event = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel";
+		DOM.Event.AddHandler(this.Node, mouse_wheel_event, Bind(OnMouseScroll, this));
+	}
+
+
+	function OnDblClick(evt)
+	{
+		// Clicked on a header?
+		var node = DOM.Event.GetNode(evt);
+		if (DOM.Node.HasClass(node, "GridRowName"))
+		{
+			// Toggle rows open/close
+			var row = node.parentNode.GridRow;
+			if (row)
+				row.Toggle();
+		}
+	}
+
+
+	function OnMouseScroll(self, evt)
+	{
+		var mouse_state = new Mouse.State(evt);
+		self.Node.scrollTop -= mouse_state.WheelDelta * 20;
+	}
+
+
+	return Grid;
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Label.js Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Treeview.js Added

@@ -0,0 +1,352 @@
+
+namespace("WM");
+
+
+WM.Treeview = (function()
+{
+	var Margin = 10;
+
+
+	var tree_template_html = "																							\
+		<div class='Treeview'>																							\
+			<div class='TreeviewItemChildren' style='width:90%;float:left'></div>										\
+			<div class='TreeviewScrollbarInset'>																		\
+				<div class='TreeviewScrollbar'></div>																	\
+			</div>																										\
+			<div style='clear:both'></div>																				\
+		</div>";
+
+
+	var item_template_html = "																							\
+		<div class='TreeViewItem basicfont notextsel'>																	\
+			<img src='' class='TreeviewItemImage'>																		\
+			<div class='TreeviewItemText'></div>																		\
+			<div style='clear:both'></div>																				\
+			<div class='TreeviewItemChildren'></div>																	\
+			<div style='clear:both'></div>																				\
+		</div>";
+
+
+	// TODO: Remove parent_node (required for stuff that doesn't use the WM yet)
+	function Treeview(x, y, width, height, parent_node)
+	{
+		// Cache initialisation options
+		this.ParentNode = parent_node;
+		this.Position = [ x, y ];
+		this.Size = [ width, height ];
+
+		this.Node = null;
+		this.ScrollbarNode = null;
+		this.SelectedItem = null;
+		this.ContentsNode = null;
+
+		// Setup options
+		this.HighlightOnHover = false;
+		this.EnableScrollbar = true;
+		this.HorizontalLayoutDepth = 1;
+
+		// Generate an empty tree
+		this.Clear();
+	}
+
+
+	Treeview.prototype.SetHighlightOnHover = function(highlight)
+	{
+		this.HighlightOnHover = highlight;
+	}
+
+
+	Treeview.prototype.SetEnableScrollbar = function(enable)
+	{
+		this.EnableScrollbar = enable;
+	}
+
+
+	Treeview.prototype.SetHorizontalLayoutDepth = function(depth)
+	{
+		this.HorizontalLayoutDepth = depth;
+	}
+
+
+	Treeview.prototype.SetNodeSelectedHandler = function(handler)
+	{
+		this.NodeSelectedHandler = handler;
+	}
+
+
+	Treeview.prototype.Clear = function()
+	{
+		this.RootItem = new WM.TreeviewItem(this, null, null, null, null);
+		this.GenerateHTML();
+	}
+
+
+	Treeview.prototype.Root = function()
+	{
+		return this.RootItem;
+	}
+
+
+	Treeview.prototype.ClearSelection = function()
+	{
+		if (this.SelectedItem != null)
+		{
+			DOM.Node.RemoveClass(this.SelectedItem.Node, "TreeviewItemSelected");
+			this.SelectedItem = null;
+		}
+	}
+
+
+	Treeview.prototype.SelectItem = function(item, mouse_pos)
+	{
+		// Notify the select handler
+		if (this.NodeSelectedHandler)
+			this.NodeSelectedHandler(item.Node, this.SelectedItem, item, mouse_pos);
+
+		// Remove highlight from the old selection
+		this.ClearSelection();
+
+		// Swap in new selection and apply highlight
+		this.SelectedItem = item;
+		DOM.Node.AddClass(this.SelectedItem.Node, "TreeviewItemSelected");
+	}
+
+
+	Treeview.prototype.GenerateHTML = function()
+	{
+		// Clone the template and locate important nodes
+		var old_node = this.Node;
+		this.Node = DOM.Node.CreateHTML(tree_template_html);
+		this.ChildrenNode = DOM.Node.FindWithClass(this.Node, "TreeviewItemChildren");
+		this.ScrollbarNode = DOM.Node.FindWithClass(this.Node, "TreeviewScrollbar");
+
+		DOM.Node.SetPosition(this.Node, this.Position);
+		DOM.Node.SetSize(this.Node, this.Size);
+
+		// Generate the contents of the treeview
+		GenerateTree(this, this.ChildrenNode, this.RootItem.Children, 0);
+
+		// Cross-browser (?) means of adding a mouse wheel handler
+		var mouse_wheel_event = (/Firefox/i.test(navigator.userAgent)) ? "DOMMouseScroll" : "mousewheel";
+		DOM.Event.AddHandler(this.Node, mouse_wheel_event, Bind(OnMouseScroll, this));
+
+		DOM.Event.AddHandler(this.Node, "dblclick", Bind(OnMouseDoubleClick, this));
+		DOM.Event.AddHandler(this.Node, "mousedown", Bind(OnMouseDown, this));
+		DOM.Event.AddHandler(this.Node, "mouseup", OnMouseUp);
+
+		// Swap in the newly generated control node if it's already been attached to a parent
+		if (old_node && old_node.parentNode)
+		{
+			old_node.parentNode.removeChild(old_node);
+			this.ParentNode.appendChild(this.Node);
+		}
+
+		if (this.EnableScrollbar)
+		{
+			this.UpdateScrollbar();
+			DOM.Event.AddHandler(this.ScrollbarNode, "mousedown", Bind(OnMouseDown_Scrollbar, this));
+			DOM.Event.AddHandler(this.ScrollbarNode, "mouseup", Bind(OnMouseUp_Scrollbar, this));
+			DOM.Event.AddHandler(this.ScrollbarNode, "mouseout", Bind(OnMouseUp_Scrollbar, this));
+			DOM.Event.AddHandler(this.ScrollbarNode, "mousemove", Bind(OnMouseMove_Scrollbar, this));
+		}
+
+		else
+		{
+			DOM.Node.Hide(DOM.Node.FindWithClass(this.Node, "TreeviewScrollbarInset"));
+		}
+	}
+
+	
+	Treeview.prototype.UpdateScrollbar = function()
+	{
+		if (!this.EnableScrollbar)
+			return;
+
+		var scrollbar_scale = Math.min((this.Node.offsetHeight - Margin * 2) / this.ChildrenNode.offsetHeight, 1);
+		this.ScrollbarNode.style.height = parseInt(scrollbar_scale * 100) + "%";
+
+		// Shift the scrollbar container along with the parent window
+		this.ScrollbarNode.parentNode.style.top = this.Node.scrollTop;
+
+		var scroll_fraction = this.Node.scrollTop / (this.Node.scrollHeight - this.Node.offsetHeight);
+		var max_height = this.Node.offsetHeight - Margin;
+		var max_scrollbar_offset = max_height - this.ScrollbarNode.offsetHeight;
+		var scrollbar_offset = scroll_fraction * max_scrollbar_offset;
+		this.ScrollbarNode.style.top = scrollbar_offset;
+	}
+
+
+	function GenerateTree(self, parent_node, items, depth)
+	{
+		if (items.length == 0)
+			return null;
+
+		for (var i in items)
+		{
+			var item = items[i];
+
+			// Create the node for this item and locate important nodes
+			var node = DOM.Node.CreateHTML(item_template_html);
+			var img = DOM.Node.FindWithClass(node, "TreeviewItemImage");
+			var text = DOM.Node.FindWithClass(node, "TreeviewItemText");
+			var children = DOM.Node.FindWithClass(node, "TreeviewItemChildren");
+
+			// Attach the item to the node
+			node.TreeviewItem = item;
+			item.Node = node;
+
+			// Add the class which highlights selection on hover
+			if (self.HighlightOnHover)
+				DOM.Node.AddClass(node, "TreeviewItemHover");
+
+			// Instruct the children to wrap around
+			if (depth >= self.HorizontalLayoutDepth)
+				node.style.cssFloat = "left";
+
+			if (item.OpenImage == null || item.CloseImage == null)
+			{
+				// If there no images, remove the image node
+				node.removeChild(img);
+			}
+			else
+			{
+				// Set the image source to open
+				img.src = item.OpenImage.src;
+				img.style.width = item.OpenImage.width;
+				img.style.height = item.OpenImage.height;
+				item.ImageNode = img;
+			}
+
+			// Setup the text to display
+			text.innerHTML = item.Label;
+
+			// Add the div to the parent and recurse into children
+			parent_node.appendChild(node);
+			GenerateTree(self, children, item.Children, depth + 1);
+			item.ChildrenNode = children;
+		}
+
+		// Clear the wrap-around
+		if (depth >= self.HorizontalLayoutDepth)
+			DOM.Node.AppendClearFloat(parent_node.parentNode);
+	}
+
+
+	function OnMouseScroll(self, evt)
+	{
+		// Get mouse wheel movement
+		var delta = evt.detail ? evt.detail * -1 : evt.wheelDelta;
+		delta *= 8;
+
+		// Scroll the main window with wheel movement and clamp
+		self.Node.scrollTop -= delta;
+		self.Node.scrollTop = Math.min(self.Node.scrollTop, (self.ChildrenNode.offsetHeight - self.Node.offsetHeight) + Margin * 2);
+
+		self.UpdateScrollbar();
+	}
+
+
+	function OnMouseDoubleClick(self, evt)
+	{
+		DOM.Event.StopDefaultAction(evt);
+
+		// Get the tree view item being clicked, if any
+		var node = DOM.Event.GetNode(evt);
+		var tvitem = GetTreeviewItemFromNode(self, node);
+		if (tvitem == null)
+			return;
+
+		if (tvitem.Children.length)
+			tvitem.Toggle();
+	}
+
+
+	function OnMouseDown(self, evt)
+	{
+		DOM.Event.StopDefaultAction(evt);
+
+		// Get the tree view item being clicked, if any
+		var node = DOM.Event.GetNode(evt);
+		var tvitem = GetTreeviewItemFromNode(self, node);
+		if (tvitem == null)
+			return;
+
+		// If clicking on the image, expand any children
+		if (node.tagName == "IMG" && tvitem.Children.length)
+		{
+			tvitem.Toggle();
+		}
+
+		else
+		{
+			var mouse_pos = DOM.Event.GetMousePosition(evt);
+			self.SelectItem(tvitem, mouse_pos);
+		}
+	}
+
+
+	function OnMouseUp(evt)
+	{
+		// Event handler used merely to stop events bubbling up to containers
+		DOM.Event.StopPropagation(evt);
+	}
+
+
+	function OnMouseDown_Scrollbar(self, evt)
+	{
+		self.ScrollbarHeld = true;
+
+		// Cache the mouse height relative to the scrollbar
+		self.LastY = evt.clientY;
+		self.ScrollY = self.Node.scrollTop;
+
+		DOM.Node.AddClass(self.ScrollbarNode, "TreeviewScrollbarHeld");
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	function OnMouseUp_Scrollbar(self, evt)
+	{
+		self.ScrollbarHeld = false;
+		DOM.Node.RemoveClass(self.ScrollbarNode, "TreeviewScrollbarHeld");
+	}
+
+
+	function OnMouseMove_Scrollbar(self, evt)
+	{
+		if (self.ScrollbarHeld)
+		{
+			var delta_y = evt.clientY - self.LastY;
+			self.LastY = evt.clientY;
+
+			var max_height = self.Node.offsetHeight - Margin;
+			var max_scrollbar_offset = max_height - self.ScrollbarNode.offsetHeight;
+			var max_contents_scroll = self.Node.scrollHeight - self.Node.offsetHeight;
+			var scale = max_contents_scroll / max_scrollbar_offset;
+
+			// Increment the local float variable and assign, as scrollTop is of type int
+			self.ScrollY += delta_y * scale;			
+			self.Node.scrollTop = self.ScrollY;
+			self.Node.scrollTop = Math.min(self.Node.scrollTop, (self.ChildrenNode.offsetHeight - self.Node.offsetHeight) + Margin * 2);
+
+			self.UpdateScrollbar();
+		}
+	}
+
+
+	function GetTreeviewItemFromNode(self, node)
+	{
+		// Walk up toward the tree view node looking for this first item
+		while (node && node != self.Node)
+		{
+			if ("TreeviewItem" in node)
+				return node.TreeviewItem;
+
+			node = node.parentNode;
+		}
+
+		return null;
+	}
+
+	return Treeview;
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/TreeviewItem.js Added

@@ -0,0 +1,109 @@
+
+namespace("WM");
+
+
+WM.TreeviewItem = (function()
+{
+	function TreeviewItem(treeview, name, data, open_image, close_image)
+	{
+		// Assign members
+		this.Treeview = treeview;
+		this.Label = name;
+		this.Data = data;
+		this.OpenImage = open_image;
+		this.CloseImage = close_image;
+
+		this.Children = [ ];
+
+		// The HTML node wrapping the item and its children
+		this.Node = null;
+
+		// The HTML node storing the image for the open/close state feedback
+		this.ImageNode = null;
+
+		// The HTML node storing just the children
+		this.ChildrenNode = null;
+
+		// Animation handle for opening and closing the child nodes, only used
+		// if the tree view item as children
+		this.AnimHandle = null;
+
+		// Open state of the item
+		this.IsOpen = true;
+	}
+
+
+	TreeviewItem.prototype.AddItem = function(name, data, open_image, close_image)
+	{
+		var item = new WM.TreeviewItem(this.Treeview, name, data, open_image, close_image);
+		this.Children.push(item);
+		return item;
+	}
+
+
+	TreeviewItem.prototype.Open = function()
+	{
+		if (this.AnimHandle == null || this.AnimHandle.Complete)
+		{
+			// Swap to the open state
+			this.IsOpen = true;
+			if (this.ImageNode != null && this.OpenImage != null)
+				this.ImageNode.src = this.OpenImage.src;
+			
+			// Cache for closure binding
+			var child_node = this.ChildrenNode;
+			var end_height = this.StartHeight;
+			var treeview = this.Treeview;
+
+			// Reveal the children and animate their height to max
+			this.ChildrenNode.style.display = "block";
+			this.AnimHandle = Anim.Animate(
+				function (val) { DOM.Node.SetHeight(child_node, val) },
+				0, end_height, 0.2,
+				function() { treeview.UpdateScrollbar(); });
+
+			// Fade the children in
+			Anim.Animate(function(val) { DOM.Node.SetOpacity(child_node, val) }, 0, 1, 0.2);
+		}
+	}
+
+
+	TreeviewItem.prototype.Close = function()
+	{
+		if (this.AnimHandle == null || this.AnimHandle.Complete)
+		{
+			// Swap to the close state
+			this.IsOpen = false;
+			if (this.ImageNode != null && this.CloseImage != null)
+				this.ImageNode.src = this.CloseImage.src;
+
+			// Cache for closure binding
+			var child_node = this.ChildrenNode;
+			var treeview = this.Treeview;
+
+			// Mark the height of the item for reload later
+			this.StartHeight = child_node.offsetHeight;
+
+			// Shrink the height of the children and hide them upon completion
+			this.AnimHandle = Anim.Animate(
+				function (val) { DOM.Node.SetHeight(child_node, val) },
+				this.ChildrenNode.offsetHeight, 0, 0.2,
+				function() { child_node.style.display = "none"; treeview.UpdateScrollbar(); });
+
+			// Fade the children out
+			Anim.Animate(function(val) { DOM.Node.SetOpacity(child_node, val) }, 1, 0, 0.2);
+		}
+	}
+
+
+	TreeviewItem.prototype.Toggle = function()
+	{
+		if (this.IsOpen)
+			this.Close();
+		else
+			this.Open();
+	}
+
+
+	return TreeviewItem;
+})();

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/Window.js Added

@@ -0,0 +1,243 @@
+
+namespace("WM");
+
+
+WM.Window = (function()
+{
+	var template_html = "																								\
+		<div class='Window'>																							\
+			<div class='WindowTitleBar'>																				\
+				<div class='WindowTitleBarText notextsel' style='float:left'>Window Title Bar</div>						\
+				<div class='WindowTitleBarClose notextsel' style='float:right'>O</div>									\
+			</div>																										\
+			<div class='WindowBody'>																					\
+			</div>																										\
+		</div>";
+
+
+	function Window(manager, title, x, y, width, height, parent_node)
+	{
+		this.Manager = manager;
+		this.ParentNode = parent_node || document.body;
+		this.OnMove = null;
+		this.Visible = false;
+		this.AnimatedShow = false;
+
+		// Clone the window template and locate key nodes within it
+		this.Node = DOM.Node.CreateHTML(template_html);
+		this.TitleBarNode = DOM.Node.FindWithClass(this.Node, "WindowTitleBar");
+		this.TitleBarTextNode = DOM.Node.FindWithClass(this.Node, "WindowTitleBarText");
+		this.TitleBarCloseNode = DOM.Node.FindWithClass(this.Node, "WindowTitleBarClose");
+		this.BodyNode = DOM.Node.FindWithClass(this.Node, "WindowBody");
+
+		// Setup the position and dimensions of the window
+		this.SetPosition(x, y);
+		this.SetSize(width, height);
+
+		// Set the title text
+		this.TitleBarTextNode.innerHTML = title;
+
+		// Hook up event handlers
+		DOM.Event.AddHandler(this.Node, "mousedown", Bind(this, "SetTop"));
+		DOM.Event.AddHandler(this.TitleBarNode, "mousedown", Bind(this, "BeginMove"));
+		DOM.Event.AddHandler(this.TitleBarCloseNode, "mousedown", Bind(this, "Hide"));
+
+		// Create delegates for removable handlers
+		this.MoveDelegate = Bind(this, "Move");
+		this.EndMoveDelegate = Bind(this, "EndMove");		
+	}
+
+
+	Window.prototype.SetOnMove = function(on_move)
+	{
+		this.OnMove = on_move;
+	}
+
+
+	Window.prototype.Show = function()
+	{
+		if (this.Node.parentNode != this.ParentNode)
+		{
+			this.ShowNoAnim();
+			Anim.Animate(Bind(this, "OpenAnimation"), 0, 1, 1);
+		}
+	}
+
+
+	Window.prototype.ShowNoAnim = function()
+	{
+		// Add to the document
+		this.ParentNode.appendChild(this.Node);
+		this.AnimatedShow = false;
+		this.Visible = true;
+	}
+
+
+	Window.prototype.Hide = function()
+	{
+		if (this.Node.parentNode == this.ParentNode)
+		{
+			if (this.AnimatedShow)
+			{
+				// Trigger animation that ends with removing the window from the document
+				Anim.Animate(
+					Bind(this, "CloseAnimation"),
+					0, 1, 0.25,
+					Bind(this, "HideNoAnim"));
+			}
+			else
+			{
+				this.HideNoAnim();
+			}
+		}
+	}
+
+	
+	Window.prototype.HideNoAnim = function()
+	{
+		// Remove node
+		this.ParentNode.removeChild(this.Node);
+		this.Visible = false;
+	}
+
+
+	Window.prototype.SetTop = function()
+	{
+		this.Manager.SetTopWindow(this);
+	}
+
+
+
+	Window.prototype.SetTitle = function(title)
+	{
+		this.TitleBarTextNode.innerHTML = title;
+	}
+
+
+	// TODO: Update this
+	Window.prototype.AddControl = function(control)
+	{
+		// Get all arguments to this function and replace the first with this window node
+		var args = [].slice.call(arguments);
+		args[0] = this.BodyNode;
+
+		// Create the control and call its Init method with the modified arguments
+		var instance = new control();
+		instance.Init.apply(instance, args);
+
+		return instance;
+	}
+
+
+	Window.prototype.AddControlNew = function(control)
+	{
+		control.ParentNode = this.BodyNode;
+		this.BodyNode.appendChild(control.Node);
+		return control;
+	}
+
+
+	Window.prototype.Scale = function(t)
+	{
+		// Calculate window bounds centre/extents
+		var ext_x = this.Size[0] / 2;
+		var ext_y = this.Size[1] / 2;
+		var mid_x = this.Position[0] + ext_x;
+		var mid_y = this.Position[1] + ext_y;
+
+		// Scale from the mid-point
+		DOM.Node.SetPosition(this.Node, [ mid_x - ext_x * t, mid_y - ext_y * t ]);
+		DOM.Node.SetSize(this.Node, [ this.Size[0] * t, this.Size[1] * t ]);
+	}
+
+
+	Window.prototype.OpenAnimation = function(val)
+	{
+		// Power ease in
+		var t = 1 - Math.pow(1 - val, 8);
+		this.Scale(t);
+		DOM.Node.SetOpacity(this.Node, 1 - Math.pow(1 - val, 8));
+		this.AnimatedShow = true;
+	}
+
+
+	Window.prototype.CloseAnimation = function(val)
+	{
+		// Power ease out
+		var t = 1 - Math.pow(val, 4);
+		this.Scale(t);
+		DOM.Node.SetOpacity(this.Node, t);
+	}
+
+
+	Window.prototype.NotifyChange = function()
+	{
+		if (this.OnMove)
+		{
+			var pos = DOM.Node.GetPosition(this.Node);
+			this.OnMove(this, pos);
+		}
+	}
+
+
+	Window.prototype.BeginMove = function(evt)
+	{
+		// Calculate offset of the window from the mouse down position
+		var mouse_pos = DOM.Event.GetMousePosition(evt);
+		this.Offset = [ mouse_pos[0] - this.Position[0], mouse_pos[1] - this.Position[1] ];
+
+		// Dynamically add handlers for movement and release
+		DOM.Event.AddHandler(document, "mousemove", this.MoveDelegate);
+		DOM.Event.AddHandler(document, "mouseup", this.EndMoveDelegate);
+
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	Window.prototype.Move = function(evt)
+	{
+		// Use the offset at the beginning of movement to drag the window around
+		var mouse_pos = DOM.Event.GetMousePosition(evt);
+		var offset = this.Offset;
+		var pos = [ mouse_pos[0] - offset[0], mouse_pos[1] - offset[1] ];
+		this.SetPosition(pos[0], pos[1]);
+
+		if (this.OnMove)
+			this.OnMove(this, pos);
+
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	Window.prototype.EndMove = function(evt)
+	{
+		// Remove handlers added during mouse down
+		DOM.Event.RemoveHandler(document, "mousemove", this.MoveDelegate);
+		DOM.Event.RemoveHandler(document, "mouseup", this.EndMoveDelegate);
+
+		DOM.Event.StopDefaultAction(evt);
+	}
+
+
+	Window.prototype.SetPosition = function(x, y)
+	{
+		this.Position = [ x, y ];
+		DOM.Node.SetPosition(this.Node, this.Position);
+	}
+
+
+	Window.prototype.SetSize = function(w, h)
+	{
+		this.Size = [ w, h ];
+		DOM.Node.SetSize(this.Node, this.Size);
+	}
+
+
+	Window.prototype.GetZIndex = function()
+	{
+		return parseInt(this.Node.style.zIndex);
+	}
+
+
+	return Window;
+})();
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Code/WindowManager.js Added

@@ -0,0 +1,54 @@
+
+namespace("WM");
+
+
+WM.WindowManager = (function()
+{
+	function WindowManager()
+	{
+		// An empty list of windows under window manager control
+		this.Windows = [ ];
+	}
+
+
+	WindowManager.prototype.AddWindow = function(title, x, y, width, height, parent_node)
+	{
+		// Create the window and add it to the list of windows
+		var wnd = new WM.Window(this, title, x, y, width, height, parent_node);
+		this.Windows.push(wnd);
+
+		// Always bring to the top on creation
+		wnd.SetTop();
+
+		return wnd;
+	}
+
+
+	WindowManager.prototype.SetTopWindow = function(top_wnd)
+	{
+		// Bring the window to the top of the window list
+		var top_wnd_index = this.Windows.indexOf(top_wnd);
+		if (top_wnd_index != -1)
+			this.Windows.splice(top_wnd_index, 1);
+		this.Windows.push(top_wnd);
+
+		// Set a CSS z-index for each visible window from the bottom up
+		for (var i in this.Windows)
+		{
+			var wnd = this.Windows[i];
+			if (!wnd.Visible)
+				continue;
+
+			// Ensure there's space between each window for the elements inside to be sorted
+			var z = (parseInt(i) + 1) * 10;
+			wnd.Node.style.zIndex = z;
+
+			// Notify window that its z-order has changed
+			wnd.NotifyChange();
+		}
+	}
+
+
+	return WindowManager;
+
+})();
\ No newline at end of file

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Styles Added

gpac-1.0.0.tar.gz/share/vis/extern/BrowserLib/WindowManager/Styles/WindowManager.css Added

@@ -0,0 +1,552 @@
+
+
+.notextsel
+{
+	/* Disable text selection so that it doesn't interfere with button-clicking */
+	user-select:none;
+
+	/* Stops the text cursor over the label */
+	cursor:default;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Window Styles                                                                                                      */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Window
+{
+	/* Allows movement of the window to exceed browser region without triggering scroll bars */
+	position:fixed;
+
+	/* Clip all contents to the window border */
+	overflow: hidden;
+
+	background: #404040;
+
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+
+	-webkit-box-shadow: 3px 3px 3px #111, 1px 1px 1px #606060 inset;
+	box-shadow: 3px 3px 3px #111, 1px 1px 1px #606060 inset;
+}
+
+.Window_Transparent
+{
+	/* Set transparency changes to fade in/out */
+	opacity: 0.5;
+	transition: opacity 0.5s ease-out;
+	-moz-transition: opacity 0.5s ease-out;
+	-webkit-transition: opacity 0.5s ease-out;
+}
+
+.Window_Transparent:hover
+{
+	opacity: 1;
+}
+
+.WindowTitleBar
+{
+	height: 17px;
+	cursor: move;
+
+	border-bottom: 1px solid #303030;
+	border-radius: 5px;
+}
+
+.WindowTitleBarText
+{
+	color: #BBB;
+	font: 9px Verdana;
+
+	padding: 3px;
+	cursor: move;
+}
+
+.WindowTitleBarClose
+{
+	color: #999999;
+	font: 9px Verdana;
+
+	padding: 3px;
+	cursor: default;
+}
+
+.WindowBody
+{
+	/* Turns this node into a "positioned node" so that its children can be placed relative to it */
+	position: absolute;
+
+	/* Fill the parent window node */
+	width: 100%;
+	height: 100%;
+
+	padding:10px;
+	border-top: 1px solid #606060;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Container Styles                                                                                                   */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Container
+{
+	/* Position relative to the parent window */
+	position: absolute;
+
+	background:#2C2C2C;
+
+	border: 1px black solid;
+
+	/* Two inset box shadows to simulate depressing */
+	-webkit-box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+	box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Treeview Styles                                                                                                    */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Treeview
+{
+	position: absolute;
+
+	background:#2C2C2C;
+	border: 1px solid black;
+	overflow:hidden;
+
+	/* Two inset box shadows to simulate depressing */
+	-webkit-box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+	box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+}
+
+.TreeviewItem
+{
+	margin:1px;
+	padding:2px;
+	border:solid 1px #2C2C2C;
+	background-color:#2C2C2C;
+}
+
+.TreeviewItemImage
+{
+	float: left;
+}
+
+.TreeviewItemText
+{
+	float: left;
+	margin-left:4px;
+}
+
+.TreeviewItemChildren
+{
+	overflow: hidden;
+}
+
+.TreeviewItemSelected
+{
+	background-color:#444;
+	border-color:#FFF;
+
+	-webkit-transition: background-color 0.2s ease-in-out;
+	-moz-transition: background-color 0.2s ease-in-out;
+	-webkit-transition: border-color 0.2s ease-in-out;
+	-moz-transition: border-color 0.2s ease-in-out;
+}
+
+/* Used to populate treeviews that want highlight on hover behaviour */
+.TreeviewItemHover
+{
+}
+
+.TreeviewItemHover:hover
+{
+	background-color:#111;
+	border-color:#444;
+
+	-webkit-transition: background-color 0.2s ease-in-out;
+	-moz-transition: background-color 0.2s ease-in-out;
+	-webkit-transition: border-color 0.2s ease-in-out;
+	-moz-transition: border-color 0.2s ease-in-out;
+}
+
+.TreeviewScrollbarInset
+{
+	float: right;
+
+	position:relative;
+
+	height: 100%;
+
+	/* CRAZINESS PART A: Trying to get the inset and scrollbar to have 100% height match its container */
+	margin: -8px -8px 0 0;
+	padding: 0 1px 14px 1px;
+
+	width:20px;
+	background:#2C2C2C;
+	border: 1px solid black;
+
+	/* Two inset box shadows to simulate depressing */
+	-webkit-box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+	box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+}
+
+.TreeviewScrollbar
+{
+	position:relative;
+
+	background:#2C2C2C;
+	border: 1px solid black;
+
+	/* CRAZINESS PART B: Trying to get the inset and scrollbar to have 100% height match its container */
+	padding: 0 0 10px 0;
+	margin: 1px 0 0 0;
+
+	width: 18px;
+	height: 100%;
+
+	border-radius:6px;
+	border-color:#000;
+	border-width:1px;
+	border-style:solid;
+
+	/* The gradient for the button background */
+	background-color:#666;
+	background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#383838));
+	background: -moz-linear-gradient(top, #666, #383838);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#383838');
+
+	/* A box shadow and inset box highlight */
+	-webkit-box-shadow: 1px 1px 1px #222, 1px 1px 1px #777 inset;
+	box-shadow: 1px 1px 1px #222, 1px 1px 1px #777 inset;
+}
+
+.TreeviewScrollbarHeld
+{
+	/* Reset the gradient to a full-colour background */
+	background:#383838;
+
+	/* Two inset box shadows to simulate depressing */
+	-webkit-box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+	box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+}
+
+
+ 
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Treeview Styles                                                                                                    */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.EditBoxContainer
+{
+	position: absolute;
+	padding:2px 10px 2px 10px;
+}
+
+.EditBoxLabel
+{
+	float:left;
+	padding: 3px 4px 4px 4px;
+	font: 9px Verdana;
+}
+
+.EditBox
+{
+	float:left;
+
+	background:#666;
+	border: 1px solid;
+	border-radius: 6px;
+	padding: 3px 4px 3px 4px;
+	height: 20px;
+
+	box-shadow: 1px 1px 1px #222 inset;
+
+	transition: all 0.3s ease-in-out;
+}
+
+.EditBox:focus
+{
+	background:#FFF;
+	outline:0;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Label Styles                                                                                                       */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Label
+{
+	/* Position relative to the parent window */
+	position:absolute;
+
+	color: #BBB;
+	font: 9px Verdana;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Combo Box Styles                                                                                                   */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.ComboBox
+{
+	position:absolute;
+
+	/* TEMP! */
+	width:90px;
+
+	/* Height is fixed to match the font */
+	height:14px;
+
+	/* Align the text within the combo box */
+	padding: 1px 0 0 5px;
+
+	/* Solid, rounded border */
+	border: 1px solid #111;
+	border-radius: 5px;
+
+	/* http://www.colorzilla.com/gradient-editor/#e3e3e3+0,c6c6c6+22,b7b7b7+33,afafaf+50,a7a7a7+67,797979+82,414141+100;Custom */    
+	background: #e3e3e3;
+	background: -moz-linear-gradient(top,  #e3e3e3 0%, #c6c6c6 22%, #b7b7b7 33%, #afafaf 50%, #a7a7a7 67%, #797979 82%, #414141 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e3e3e3), color-stop(22%,#c6c6c6), color-stop(33%,#b7b7b7), color-stop(50%,#afafaf), color-stop(67%,#a7a7a7), color-stop(82%,#797979), color-stop(100%,#414141));
+	background: -webkit-linear-gradient(top,  #e3e3e3 0%,#c6c6c6 22%,#b7b7b7 33%,#afafaf 50%,#a7a7a7 67%,#797979 82%,#414141 100%);
+	background: -o-linear-gradient(top,  #e3e3e3 0%,#c6c6c6 22%,#b7b7b7 33%,#afafaf 50%,#a7a7a7 67%,#797979 82%,#414141 100%);
+	background: -ms-linear-gradient(top,  #e3e3e3 0%,#c6c6c6 22%,#b7b7b7 33%,#afafaf 50%,#a7a7a7 67%,#797979 82%,#414141 100%);
+	background: linear-gradient(top,  #e3e3e3 0%,#c6c6c6 22%,#b7b7b7 33%,#afafaf 50%,#a7a7a7 67%,#797979 82%,#414141 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e3e3e3', endColorstr='#414141',GradientType=0 );
+}
+
+.ComboBoxPressed
+{
+	/* The reverse of the default background, simulating depression */
+	background: #414141;
+	background: -moz-linear-gradient(top,  #414141 0%, #797979 18%, #a7a7a7 33%, #afafaf 50%, #b7b7b7 67%, #c6c6c6 78%, #e3e3e3 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#414141), color-stop(18%,#797979), color-stop(33%,#a7a7a7), color-stop(50%,#afafaf), color-stop(67%,#b7b7b7), color-stop(78%,#c6c6c6), color-stop(100%,#e3e3e3));
+	background: -webkit-linear-gradient(top,  #414141 0%,#797979 18%,#a7a7a7 33%,#afafaf 50%,#b7b7b7 67%,#c6c6c6 78%,#e3e3e3 100%);
+	background: -o-linear-gradient(top,  #414141 0%,#797979 18%,#a7a7a7 33%,#afafaf 50%,#b7b7b7 67%,#c6c6c6 78%,#e3e3e3 100%);
+	background: -ms-linear-gradient(top,  #414141 0%,#797979 18%,#a7a7a7 33%,#afafaf 50%,#b7b7b7 67%,#c6c6c6 78%,#e3e3e3 100%);
+	background: linear-gradient(top,  #414141 0%,#797979 18%,#a7a7a7 33%,#afafaf 50%,#b7b7b7 67%,#c6c6c6 78%,#e3e3e3 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#414141', endColorstr='#e3e3e3',GradientType=0 );
+}
+
+.ComboBoxText
+{
+	/* Text info */
+	color: #000;
+	font: 9px Verdana;
+
+	float:left;
+}
+
+.ComboBoxIcon
+{
+	/* Push the image to the far right */
+	float:right;
+
+	/* Align the image with the combo box */
+	padding: 2px 5px 0 0;
+}
+
+.ComboBoxPopup
+{
+	position: fixed;
+
+	background: #CCC;
+
+	border-radius: 5px;
+
+	padding: 1px 0 1px 0;
+}
+
+.ComboBoxPopupItem
+{
+	/* Text info */
+	color: #000;
+	font: 9px Verdana;
+
+	padding: 1px 1px 1px 5px;
+
+	border-bottom: 1px solid #AAA;
+	border-top: 1px solid #FFF;
+}
+
+.ComboBoxPopupItemText
+{
+	float:left;
+}
+
+.ComboBoxPopupItemIcon
+{
+	/* Push the image to the far right */
+	float:right;
+
+	/* Align the image with the combo box */
+	padding: 2px 5px 0 0;
+}
+
+.ComboBoxPopupItem:first-child
+{
+	border-top: 0px;
+}
+
+.ComboBoxPopupItem:last-child
+{
+	border-bottom: 0px;
+}
+
+.ComboBoxPopupItem:hover
+{
+	color:#FFF;
+	background: #2036E1;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Grid Styles                                                                                                        */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Grid
+{
+	/* Clip contents */
+	overflow: hidden;
+
+	position: relative;
+
+	background: #333;
+
+	border-radius: 2px;
+}
+
+.GridBody
+{
+	overflow-x: auto;
+	overflow-y: auto;
+	height: inherit;
+}
+
+.GridRow
+{
+	display: inline-block;
+	white-space: nowrap;
+
+	background:#303030;
+
+	color: #BBB;
+	font: 9px Verdana;
+
+	padding: 2px;
+}
+
+.GridRow.GridGroup
+{
+	padding: 0px;
+}
+
+.GridRow:nth-child(odd)
+{
+	background:#333;
+}
+
+.GridRowCell
+{
+	display: inline-block;
+}
+.GridRowCell.GridGroup
+{
+	color: #BBB;
+
+	/* Override default from name */
+	width: 100%;
+
+	padding: 1px 1px 1px 2px;
+	border: 1px solid;
+	border-radius: 2px;
+
+	border-top-color:#555;
+	border-left-color:#555;
+	border-bottom-color:#111;
+	border-right-color:#111;
+
+	background: #222;
+}
+
+.GridRowBody
+{
+	/* Clip all contents for show/hide group*/
+	overflow: hidden;
+
+	/* Crazy CSS rules: controls for properties don't clip if this isn't set on this parent */
+	position: relative;
+}
+
+
+
+/* ------------------------------------------------------------------------------------------------------------------ */
+/* Button Styles                                                                                                      */
+/* ------------------------------------------------------------------------------------------------------------------ */
+
+
+
+.Button
+{
+	/* Position relative to the parent window */
+	position:absolute;
+
+	border-radius:6px;
+	border-color:#000;
+	border-width:1px;
+	border-style:solid;
+
+	/* Padding at the top includes 2px for the text drop-shadow */
+	padding: 2px 5px 3px 5px;
+
+	color: #BBB;
+	font: 9px Verdana;
+	text-shadow: 1px 1px 1px black;
+	text-align: center;
+
+	/* The gradient for the button background */
+	background-color:#666;
+	background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#383838));
+	background: -moz-linear-gradient(top, #666, #383838);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#383838');
+
+	/* A box shadow and inset box highlight */
+	-webkit-box-shadow: 1px 1px 1px #222, 1px 1px 1px #777 inset;
+	box-shadow: 1px 1px 1px #222, 1px 1px 1px #777 inset;
+}
+
+.ButtonHeld
+{
+	/* Reset the gradient to a full-colour background */
+	background:#383838;
+
+	/* Two inset box shadows to simulate depressing */
+	-webkit-box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+	box-shadow: -1px -1px 1px #222 inset, 1px 1px 1px #222 inset;
+}

gpac-1.0.0.tar.gz/share/vis/index.html Added

@@ -0,0 +1,55 @@
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+	<head>
+
+		<title>Remotery Viewer</title>
+
+		
+		<link rel="stylesheet" type="text/css" href="extern/BrowserLib/WindowManager/Styles/WindowManager.css" />
+		<link rel="stylesheet" type="text/css" href="Styles/Remotery.css" />
+
+		
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Core.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/DOM.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Bind.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Animation.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Convert.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/LocalStore.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Mouse.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/Core/Code/Keyboard.js"></script>
+
+		
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/WindowManager.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/Window.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/Container.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/EditBox.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/Grid.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/Label.js"></script>
+		<script type="text/javascript" src="extern/BrowserLib/WindowManager/Code/Button.js"></script>
+
+		
+        <script type="text/javascript" src="Code/DataViewReader.js"></script>
+		<script type="text/javascript" src="Code/Console.js"></script>
+		<script type="text/javascript" src="Code/WebSocketConnection.js"></script>
+		<script type="text/javascript" src="Code/TitleWindow.js"></script>
+		<script type="text/javascript" src="Code/SampleWindow.js"></script>
+		<script type="text/javascript" src="Code/PixelTimeRange.js"></script>
+		<script type="text/javascript" src="Code/TimelineRow.js"></script>
+		<script type="text/javascript" src="Code/TimelineWindow.js"></script>
+		<script type="text/javascript" src="Code/ThreadFrame.js"></script>
+		<script type="text/javascript" src="Code/Remotery.js"></script>
+
+	</head>
+
+	<body>
+
+		<script type="text/javascript">
+
+			var remotery = new Remotery();
+
+		</script>
+
+	</body>
+
+</html>
\ No newline at end of file

gpac-0.8.0.tar.gz/src/Makefile -> gpac-1.0.0.tar.gz/src/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/src
 
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+CFLAGS=-I"$(SRC_PATH)/include" $(OPTFLAGS)
 
 ifeq ($(DEBUGBUILD), yes)
 CFLAGS+=-g
@@ -15,13 +15,13 @@
 endif
 
 ## libgpac objects gathering: src/utils
-LIBGPAC_UTILS=utils/os_divers.o utils/os_file.o utils/list.o utils/bitstream.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o 
+LIBGPAC_UTILS=utils/os_divers.o utils/os_file.o utils/list.o utils/bitstream.o utils/constants.o utils/error.o utils/alloc.o utils/url.o utils/configfile.o utils/gltools.o utils/gzio.o
 ifeq ($(DISABLE_CORE_TOOLS), no)
-LIBGPAC_UTILS+=utils/sha1.o utils/base_encoding.o utils/math.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/xml_parser.o utils/utf.o utils/token.o utils/color.o 
+LIBGPAC_UTILS+=utils/sha1.o utils/base_encoding.o utils/math.o utils/os_net.o utils/os_thread.o utils/os_config_init.o utils/cache.o utils/downloader.o utils/xml_parser.o utils/utf.o utils/token.o utils/color.o utils/Remotery.o
 endif
 
 ifeq ($(DISABLE_PLAYER), no)
-LIBGPAC_UTILS+=utils/os_module.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/ringbuffer.o utils/unicode.o utils/map.o 
+LIBGPAC_UTILS+=utils/os_module.o utils/path2d.o utils/path2d_stroker.o utils/module.o utils/uni_bidi.o utils/unicode.o
 endif
 
 ## libgpac objects gathering: src/ietf
@@ -37,22 +37,19 @@
 endif
 
 ## libgpac objects gathering: src/isomedia
-LIBGPAC_ISOM=isomedia/avc_ext.o isomedia/box_code_3gpp.o isomedia/box_code_apple.o isomedia/box_code_base.o isomedia/box_code_drm.o isomedia/box_code_meta.o isomedia/box_dump.o isomedia/box_funcs.o isomedia/data_map.o isomedia/drm_sample.o isomedia/isom_intern.o isomedia/isom_read.o isomedia/isom_store.o isomedia/isom_write.o isomedia/media.o isomedia/media_odf.o isomedia/meta.o isomedia/movie_fragments.o isomedia/sample_descs.o isomedia/stbl_read.o isomedia/stbl_write.o isomedia/track.o isomedia/tx3g.o isomedia/iff.o   
+LIBGPAC_ISOM=isomedia/avc_ext.o isomedia/box_code_3gpp.o isomedia/box_code_apple.o isomedia/box_code_base.o isomedia/box_code_drm.o isomedia/box_code_meta.o isomedia/box_dump.o isomedia/box_funcs.o isomedia/data_map.o isomedia/drm_sample.o isomedia/isom_intern.o isomedia/isom_read.o isomedia/isom_store.o isomedia/isom_write.o isomedia/media.o isomedia/media_odf.o isomedia/meta.o isomedia/movie_fragments.o isomedia/sample_descs.o isomedia/stbl_read.o isomedia/stbl_write.o isomedia/track.o isomedia/tx3g.o isomedia/iff.o
 ifeq ($(DISABLE_ISOFF_HINT), no)
 LIBGPAC_ISOM+=isomedia/hint_track.o isomedia/hinting.o
 endif
 ifeq ($(DISABLE_ISOM_ADOBE), no)
 LIBGPAC_ISOM+=isomedia/box_code_adobe.o
 endif
-ifeq ($(DISABLE_TTML), no)
-LIBGPAC_ISOM+=isomedia/ttml.o
-endif
 
 
 ## 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/qos.o odf/slc.o
 ifeq ($(MINIMAL_OD), no)
-LIBGPAC_ODF+=odf/ipmpx_code.o odf/oci_codec.o 
+LIBGPAC_ODF+=odf/ipmpx_code.o odf/oci_codec.o
 
 ifeq ($(DISABLE_OD_DUMP), no)
 LIBGPAC_ODF+=odf/ipmpx_dump.o
@@ -72,7 +69,7 @@
 endif
 
 ## libgpac objects gathering: src/scenegraph
-LIBGPAC_SCENE=scenegraph/base_scenegraph.o scenegraph/mpeg4_animators.o scenegraph/commands.o scenegraph/mpeg4_nodes.o scenegraph/mpeg4_valuator.o scenegraph/vrml_interpolators.o scenegraph/vrml_proto.o scenegraph/vrml_route.o scenegraph/vrml_script.o scenegraph/vrml_smjs.o scenegraph/vrml_tools.o scenegraph/x3d_nodes.o scenegraph/svg_attributes.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o scenegraph/dom_events.o  scenegraph/dom_smjs.o scenegraph/xbl_process.o scenegraph/xml_ns.o scenegraph/html5_media_smjs.o scenegraph/html5_mse_smjs.o scenegraph/webvtt_smjs.o
+LIBGPAC_SCENE=scenegraph/base_scenegraph.o scenegraph/mpeg4_animators.o scenegraph/commands.o scenegraph/mpeg4_nodes.o scenegraph/mpeg4_valuator.o scenegraph/vrml_interpolators.o scenegraph/vrml_proto.o scenegraph/vrml_route.o scenegraph/vrml_script.o scenegraph/vrml_js.o scenegraph/vrml_tools.o scenegraph/x3d_nodes.o scenegraph/svg_attributes.o scenegraph/svg_types.o scenegraph/svg_js.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o scenegraph/dom_events.o  scenegraph/dom_js.o scenegraph/xml_ns.o
 
 ## libgpac objects gathering: src/crypto
 LIBGPAC_CRYPTO=
@@ -80,6 +77,8 @@
 LIBGPAC_CRYPTO+=crypto/g_crypt.o crypto/g_crypt_openssl.o crypto/g_crypt_tinyaes.o crypto/tiny_aes.o
 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
 
@@ -96,7 +95,7 @@
 LIBGPAC_MEDIATOOLS+=media_tools/m3u8.o media_tools/mpd.o
 endif
 ifeq ($(DISABLE_DASH_CLIENT), no)
-LIBGPAC_MEDIATOOLS+=media_tools/dash_client.o 
+LIBGPAC_MEDIATOOLS+=media_tools/dash_client.o
 endif
 ifeq ($(DISABLE_MEDIA_EXPORT), no)
 LIBGPAC_MEDIATOOLS+=media_tools/media_export.o
@@ -104,9 +103,6 @@
 ifeq ($(DISABLE_M2TS_MUX), no)
 LIBGPAC_MEDIATOOLS+=media_tools/m2ts_mux.o
 endif
-ifeq ($(DISABLE_STREAMING), no)
-LIBGPAC_MEDIATOOLS+=media_tools/filestreamer.o
-endif
 ifeq ($(DISABLE_DVBX), no)
 LIBGPAC_MEDIATOOLS+=media_tools/ait.o media_tools/dsmcc.o media_tools/dvb_mpe.o media_tools/reedsolomon.o
 endif
@@ -120,7 +116,7 @@
 LIBGPAC_MEDIATOOLS+=media_tools/gpac_ogg.o
 endif
 ifeq ($(DISABLE_CRYPTO), no)
-LIBGPAC_MEDIATOOLS+=media_tools/ismacryp.o
+LIBGPAC_MEDIATOOLS+=media_tools/crypt_tools.o
 endif
 ifeq ($(DISABLE_ISOFF_HINT), no)
 LIBGPAC_MEDIATOOLS+=media_tools/isom_hinter.o
@@ -135,16 +131,17 @@
 ifeq ($(DISABLE_VOBSUB), no)
 LIBGPAC_MEDIATOOLS+=media_tools/vobsub.o
 endif
-ifeq ($(DISABLE_TTXT), no)
-LIBGPAC_MEDIATOOLS+=media_tools/text_import.o
-endif
-
-ifeq ($(DISABLE_PLAYER), no)
-LIBGPAC_MEDIATOOLS+=media_tools/html5_media.o media_tools/html5_mse.o
-endif
 
 LIBGPAC_MEDIATOOLS+=media_tools/webvtt.o
 
+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
+
+LIBGPAC_QUICKJS=
+ifeq ($(CONFIG_JS), yes)
+LIBGPAC_QUICKJS=quickjs/cutils.o quickjs/libbf.o quickjs/libregexp.o quickjs/libunicode.o quickjs/quickjs.o
+LIBGPAC_QUICKJS+=jsmods/evg.o jsmods/scene_js.o jsmods/storage.o jsmods/webgl.o jsmods/xhr.o
+endif
+
 
 ## libgpac objects gathering: src/scene_manager
 LIBGPAC_SCENEMANAGER=
@@ -164,10 +161,10 @@
 LIBGPAC_SCENEMANAGER+=scene_manager/loader_qt.o
 endif
 ifeq ($(DISABLE_SVG), no)
-LIBGPAC_SCENEMANAGER+=scene_manager/loader_svg.o 
+LIBGPAC_SCENEMANAGER+=scene_manager/loader_svg.o
 endif
 ifeq ($(DISABLE_LOADER_SWF), no)
-LIBGPAC_SCENEMANAGER+=scene_manager/swf_parse.o scene_manager/swf_bifs.o scene_manager/swf_svg.o 
+LIBGPAC_SCENEMANAGER+=scene_manager/swf_parse.o scene_manager/swf_bifs.o scene_manager/swf_svg.o
 endif
 ifeq ($(DISABLE_SCENE_DUMP), no)
 LIBGPAC_SCENEMANAGER+=scene_manager/scene_dump.o
@@ -176,17 +173,18 @@
 LIBGPAC_SCENEMANAGER+=scene_manager/scene_stats.o
 endif
 ifeq ($(DISABLE_SENG), no)
-LIBGPAC_SCENEMANAGER+=scene_manager/scene_engine.o 
+LIBGPAC_SCENEMANAGER+=scene_manager/scene_engine.o
 endif
 ifeq ($(DISABLE_SCENE_ENCODE), no)
 LIBGPAC_SCENEMANAGER+=scene_manager/encode_isom.o
 endif
 
 ## libgpac objects gathering: src/terminal
-LIBGPAC_TERMINAL=terminal/channel.o terminal/clock.o terminal/decoder.o terminal/term_node_init.o terminal/input_sensor.o terminal/media_control.o terminal/media_manager.o terminal/media_memory.o terminal/media_object.o terminal/media_sensor.o terminal/mpeg4_inline.o terminal/network_service.o terminal/object_browser.o terminal/object_manager.o terminal/scene.o terminal/terminal.o terminal/svg_external.o
+LIBGPAC_TERMINAL=terminal/terminal.o
+
 
 ## 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
+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
 
 ifeq ($(DISABLE_PLAYER), yes)
 LIBGPAC_COMPOSITOR=
@@ -204,8 +202,8 @@
 LIBGPAC_LASER=laser/lsr_enc.o laser/lsr_dec.o laser/lsr_tables.o
 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 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)
 
 SCENEGRAPH_CFLAGS=
 MEDIATOOLS_CFLAGS=$(JS_FLAGS)
@@ -213,6 +211,70 @@
 ##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
+
+FILTERS_CFLAGS+=$(JS_FLAGS)
+
+LIBGPAC_FILTERS_OHEVC+=filters/dec_openhevc.o
+
+FILTERS_OHEVC_CFLAGS=$(OHEVC_CFLAGS)
+
+LIBGPAC_FILTERS_SVC+=filters/dec_opensvc.o
+
+FILTERS_SVC_CFLAGS=$(OSVC_CFLAGS)
+
+ifneq ($(CONFIG_FFMPEG),no)
+FILTERS_CFLAGS+=$(ffmpeg_cflags)
+EXTRALIBS+=$(ffmpeg_lflags)
+endif
+
+ifneq ($(CONFIG_FAAD),no)
+EXTRALIBS+=-lfaad
+endif
+
+ifneq ($(CONFIG_MAD),no)
+EXTRALIBS+=-lmad
+endif
+
+ifneq ($(CONFIG_XVID),no)
+EXTRALIBS+=-lxvidcore
+endif
+
+ifneq ($(CONFIG_A52),no)
+EXTRALIBS+=-la52
+endif
+
+ifneq ($(CONFIG_VORBIS),no)
+EXTRALIBS+=-lvorbis
+endif
+
+ifneq ($(CONFIG_THEORA),no)
+EXTRALIBS+=-ltheora
+endif
+
+ifneq ($(CONFIG_JP2),no)
+EXTRALIBS+=$(JP2_LDFLAGS)
+ifeq ($(CONFIG_JP2), local)
+CFLAGS+= -DOPJ_STATIC -I"$(LOCAL_INC_PATH)/openjpeg"
+else
+CFLAGS+=$(JP2_CFLAGS)
+endif
+endif
+
+ifeq ($(CONFIG_OPENHEVC),yes)
+#EXTRALIBS+=-lopenhevc
+EXTRALIBS+=$(OHEVC_LDFLAGS)
+endif
+
+ifeq ($(CONFIG_OPENSVC),yes)
+#EXTRALIBS+=-lOpenSVCDec
+EXTRALIBS+=$(OSVC_LDFLAGS)
+endif
+
+ifeq ($(CONFIG_VTB),yes)
+EXTRALIBS+=$(vtb_ldflags)
+endif
+
 
 
 ##libgpac library output
@@ -237,7 +299,7 @@
 endif
 
 
-SRCS := $(OBJS:.o=.c) 
+SRCS := $(OBJS:.o=.c)
 
 all: lib
 
@@ -262,8 +324,21 @@
 .deps/compositor/%: CFLAGS += $(COMPOSITOR_CFLAGS)
 .deps/compositor/%: CFLAGS += $(COMPOSITOR_CFLAGS)
 
+filters: CFLAGS += $(FILTERS_CFLAGS)
+filters: $(LIBGPAC_FILTERS)
+.deps/filters/%: CFLAGS += $(FILTERS_CFLAGS)
+.deps/filters/%: CFLAGS += $(FILTERS_CFLAGS)
+
+filters_ohevc: CFLAGS += $(FILTERS_OHEVC_CFLAGS)
+filters_ohevc: $(LIBGPAC_FILTERS_OHEVC)
+.deps/filters/dec_openhevc.dep: CFLAGS += $(FILTERS_OHEVC_CFLAGS)
+
+filters_svc: CFLAGS += $(FILTERS_SVC_CFLAGS)
+filters_svc: $(LIBGPAC_FILTERS_SVC)
+.deps/filters/dec_opensvc.dep: CFLAGS += $(FILTERS_SVC_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 $(OBJS)
+../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)"
 
@@ -305,7 +380,7 @@
 	@mkdir -p $(dir $@)
 	$(CC) -MM $(CFLAGS) "$<" -MT "$*.o" -MF "$@"
 
-clean: 
+clean:
 	rm -f $(OBJS) ../bin/gcc/$(LIB)
 	rm -rf ../bin/gcc/libgpac_static.a ../bin/gcc/libgpac.so \
 		../bin/gcc/libgpac.so.$(VERSION_MAJOR) \

gpac-0.8.0.tar.gz/src/bifs/arith_decoder.c -> gpac-1.0.0.tar.gz/src/bifs/arith_decoder.c Changed

gpac-0.8.0.tar.gz/src/bifs/bifs_codec.c -> gpac-1.0.0.tar.gz/src/bifs/bifs_codec.c Changed

@@ -123,10 +123,11 @@
 }
 
 GF_EXPORT
-GF_Err gf_bifs_decoder_configure_stream(GF_BifsDecoder * codec, u16 ESID, char *DecoderSpecificInfo, u32 DecoderSpecificInfoLength, u32 objectTypeIndication)
+GF_Err gf_bifs_decoder_configure_stream(GF_BifsDecoder * codec, u16 ESID, u8 *DecoderSpecificInfo, u32 DecoderSpecificInfoLength, u32 objectTypeIndication)
 {
 	GF_BitStream *bs;
 	BIFSStreamInfo *pInfo;
+	Bool new_cfg = GF_FALSE;
 	GF_Err e;
 
 	if (!DecoderSpecificInfo) {
@@ -140,15 +141,16 @@
 		assert( codec->streamInfo );
 		return gf_list_add(codec->streamInfo, pInfo);
 	}
-//	gf_mx_p(codec->mx);
+
 	assert( codec );
-	if (gf_bifs_dec_get_stream(codec, ESID) != NULL) {
-//		gf_mx_v(codec->mx);
-		return GF_BAD_PARAM;
+	pInfo = gf_bifs_dec_get_stream(codec, ESID);
+	//we allow reconfigure of the BIFS stream
+	if (pInfo == NULL) {
+		GF_SAFEALLOC(pInfo, BIFSStreamInfo);
+		if (!pInfo) return GF_OUT_OF_MEM;
+		new_cfg = GF_TRUE;
 	}
 	bs = gf_bs_new(DecoderSpecificInfo, DecoderSpecificInfoLength, GF_BITSTREAM_READ);
-	GF_SAFEALLOC(pInfo, BIFSStreamInfo);
-	if (!pInfo) return GF_OUT_OF_MEM;
 	pInfo->ESID = ESID;
 
 	pInfo->config.version = objectTypeIndication;
@@ -176,18 +178,20 @@
 		gf_sg_set_scene_size_info(codec->scenegraph, pInfo->config.Width, pInfo->config.Height, pInfo->config.PixelMetrics);
 	}
 
-	gf_list_add(codec->streamInfo, pInfo);
-//	gf_mx_v(codec->mx);
+	if (new_cfg)
+		gf_list_add(codec->streamInfo, pInfo);
 	return GF_OK;
 }
 
+
+
+#if 0	//deprecated
 GF_EXPORT
 void gf_bifs_decoder_ignore_size_info(GF_BifsDecoder *codec)
 {
 	if (codec) codec->ignore_size = GF_TRUE;
 }
 
-
 GF_EXPORT
 GF_Err gf_bifs_decoder_remove_stream(GF_BifsDecoder *codec, u16 ESID)
 {
@@ -204,6 +208,8 @@
 	}
 	return GF_BAD_PARAM;
 }
+#endif
+
 
 GF_EXPORT
 void gf_bifs_decoder_del(GF_BifsDecoder *codec)
@@ -225,10 +231,6 @@
 		gf_list_rem(codec->command_buffers, 0);
 	}
 	gf_list_del(codec->command_buffers);
-
-	if (codec->extraction_path) gf_free(codec->extraction_path);
-	if (codec->service_url) gf_free(codec->service_url);
-//	gf_mx_del(codec->mx);
 	gf_free(codec);
 }
 
@@ -241,24 +243,30 @@
 void gf_bs_set_eos_callback(GF_BitStream *bs, void (*EndOfStream)(void *par), void *par);
 
 GF_EXPORT
-GF_Err gf_bifs_decode_au(GF_BifsDecoder *codec, u16 ESID, const char *data, u32 data_length, Double ts_offset)
+Bool gf_bifs_decode_has_conditionnals(GF_BifsDecoder *codec)
+{
+	return codec && codec->has_conditionnals ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+GF_Err gf_bifs_decode_au(GF_BifsDecoder *codec, u16 ESID, const u8 *data, u32 data_length, Double ts_offset)
 {
 	GF_BitStream *bs;
 	GF_Err e;
 
 	if (!codec || !data || codec->dec_memory_mode) return GF_BAD_PARAM;
+	if (!data_length) return GF_OK;
 
-//	gf_mx_p(codec->mx);
 	codec->info = gf_bifs_dec_get_stream(codec, ESID);
 	if (!codec->info) {
-//		gf_mx_v(codec->mx);
 		return GF_BAD_PARAM;
 	}
 	/*setup current scene graph*/
 	codec->current_graph = codec->scenegraph;
 	codec->cts_offset = ts_offset;
 
-	bs = gf_bs_new(data, data_length, GF_BITSTREAM_READ);
+	bs = gf_bs_new((u8 *)data, data_length, GF_BITSTREAM_READ);
+	if (!bs) return GF_OUT_OF_MEM;
 	gf_bs_set_eos_callback(bs, BD_EndOfStream, codec);
 
 	if (codec->info->config.elementaryMasks) {
@@ -270,17 +278,10 @@
 	/*reset current config*/
 	codec->info = NULL;
 	codec->current_graph = NULL;
-//	gf_mx_v(codec->mx);
 	return e;
 }
 
 
-void gf_bifs_decoder_set_time_offset(GF_BifsDecoder *codec, Double ts)
-{
-	codec->cts_offset = ts;
-}
-
-
 #ifndef GPAC_DISABLE_BIFS_ENC
 
 GF_Node *gf_bifs_enc_find_node(GF_BifsEncoder *codec, u32 nodeID)
@@ -384,7 +385,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_bifs_encode_au(GF_BifsEncoder *codec, u16 ESID, GF_List *command_list, char **out_data, u32 *out_data_length)
+GF_Err gf_bifs_encode_au(GF_BifsEncoder *codec, u16 ESID, GF_List *command_list, u8 **out_data, u32 *out_data_length)
 {
 	GF_BitStream *bs;
 	GF_Err e;
@@ -413,7 +414,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_bifs_encoder_get_config(GF_BifsEncoder *codec, u16 ESID, char **out_data, u32 *out_data_length)
+GF_Err gf_bifs_encoder_get_config(GF_BifsEncoder *codec, u16 ESID, u8 **out_data, u32 *out_data_length)
 {
 	GF_BitStream *bs;
 
@@ -490,7 +491,7 @@
 
 #endif /*GPAC_DISABLE_BIFS_ENC*/
 
-
+GF_EXPORT
 u32 gf_bifs_get_child_table(GF_Node *Node)
 {
 	assert(Node);
@@ -527,16 +528,5 @@
 	}
 }
 
-GF_EXPORT
-void gf_bifs_decoder_set_extraction_path(GF_BifsDecoder *codec, const char *path, const char *service_url)
-{
-	if (!codec) return;
-	if (codec->extraction_path) gf_free(codec->extraction_path);
-	codec->extraction_path = path ? gf_strdup(path) : NULL;
-	if (codec->service_url) gf_free(codec->service_url);
-	codec->service_url = service_url ? gf_strdup(service_url) : NULL;
-
-}
-
 #endif /*GPAC_DISABLE_BIFS*/

gpac-0.8.0.tar.gz/src/bifs/com_dec.c -> gpac-1.0.0.tar.gz/src/bifs/com_dec.c Changed

@@ -285,7 +285,7 @@
 static GF_Err BD_DecMultipleIndexReplace(GF_BifsDecoder * codec, GF_BitStream *bs)
 {
 	u32 ID, ind, field_ind, NumBits, lenpos, lennum, count, pos;
-	GF_Node *node, *new_node;
+	GF_Node *node;
 	GF_Err e;
 	GF_FieldInfo field, sffield;
 
@@ -307,6 +307,7 @@
 	/*cf index value replace */
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
 		while (count) {
+			GF_Node *new_node;
 			pos = gf_bs_read_int(bs, lenpos);
 			/*first decode*/
 			new_node = gf_bifs_dec_node(codec, bs, field.NDTtype);
@@ -584,7 +585,7 @@
 	u32 NumBits, ind, field_ind;
 	u8 type;
 	s32 pos;
-	GF_Node *def, *node;
+	GF_Node *def;
 	GF_FieldInfo field, sffield;
 
 	NodeID = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
@@ -621,7 +622,7 @@
 
 	/*rescale the MFField and parse the SFField*/
 	if (field.fieldType==GF_SG_VRML_MFNODE) {
-		node = gf_bifs_dec_node(codec, bs, field.NDTtype);
+		GF_Node *node = gf_bifs_dec_node(codec, bs, field.NDTtype);
 		if (!node) return codec->LastError;
 
 		e = gf_node_register(node, def);
@@ -1023,10 +1024,14 @@
 		if (codec->UseName) {
 			gf_bifs_dec_name(bs, name);
 		} else {
-			sprintf(name, "Proto%d", numProtos);
+			sprintf(name, "Proto%d", gf_list_count(codec->current_graph->protos) );
 		}
 		/*create a proto in the current graph*/
 		proto = gf_sg_proto_new(codec->current_graph, ID, name, proto_list ? GF_TRUE : GF_FALSE);
+		if (!proto) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto exit;
+		}
 		if (proto_list) gf_list_add(proto_list, proto);
 
 		/*during parsing, this proto is the current active one - all nodes/proto defined/declared
@@ -1233,7 +1238,10 @@
 
 exit:
 	if (e) {
-		if (proto) gf_sg_proto_del(proto);
+		if (proto) {
+			if (proto_list) gf_list_del_item(proto_list, proto);
+			gf_sg_proto_del(proto);
+		}
 		codec->current_graph = rootSG;
 	}
 	/*restore original parent proto at codec level*/

gpac-0.8.0.tar.gz/src/bifs/com_enc.c -> gpac-1.0.0.tar.gz/src/bifs/com_enc.c Changed

@@ -408,11 +408,13 @@
 
 GF_Err BE_NodeReplace(GF_BifsEncoder *codec, GF_Command *com, GF_BitStream *bs)
 {
-	GF_CommandField *inf;
-	if (!gf_list_count(com->command_fields)) return GF_OK;
-	inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
+	GF_Node *new_node = NULL;
+	if (gf_list_count(com->command_fields)) {
+		GF_CommandField *inf = (GF_CommandField *)gf_list_get(com->command_fields, 0);
+		if (inf) new_node = inf->new_node;
+	}
 	GF_BIFS_WRITE_INT(codec, bs, gf_node_get_id(com->node) - 1, codec->info->config.NodeIDBits, "NodeID", NULL);
-	return gf_bifs_enc_node(codec, inf->new_node, NDT_SFWorldNode, bs, NULL);
+	return gf_bifs_enc_node(codec, new_node, NDT_SFWorldNode, bs, NULL);
 }
 
 GF_Err BE_FieldReplace(GF_BifsEncoder *codec, GF_Command *com, GF_BitStream *bs)
@@ -955,7 +957,7 @@
 
 
 GF_EXPORT
-GF_Err gf_bifs_encoder_get_rap(GF_BifsEncoder *codec, char **out_data, u32 *out_data_length)
+GF_Err gf_bifs_encoder_get_rap(GF_BifsEncoder *codec, u8 **out_data, u32 *out_data_length)
 {
 	GF_BitStream *bs;
 	GF_Err e;

gpac-0.8.0.tar.gz/src/bifs/conditional.c -> gpac-1.0.0.tar.gz/src/bifs/conditional.c Changed

gpac-0.8.0.tar.gz/src/bifs/field_decode.c -> gpac-1.0.0.tar.gz/src/bifs/field_decode.c Changed

@@ -26,6 +26,7 @@
 
 
 #include <gpac/internal/bifs_dev.h>
+#include <gpac/scene_manager.h>
 #include "quant.h"
 #include "script.h"
 
@@ -247,7 +248,7 @@
 		*((GF_Node **) field->far_ptr) = new_node;
 		break;
 	case GF_SG_VRML_SFSCRIPT:
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 		codec->LastError = SFScript_Parse(codec, (SFScript*)field->far_ptr, bs, node);
 #else
 		return GF_NOT_SUPPORTED;
@@ -370,7 +371,6 @@
 	u32 i;
 	GF_ChildNodeItem *last;
 	u8 qp_local, qp_on, initial_qp;
-	GF_Node *new_node;
 	GF_FieldInfo sffield;
 
 	memset(&sffield, 0, sizeof(GF_FieldInfo));
@@ -403,7 +403,7 @@
 	} else {
 		last = NULL;
 		for (i=0; i<nbFields; i++) {
-			new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
+			GF_Node *new_node = gf_bifs_dec_node(codec, bs, field->NDTtype);
 			if (new_node) {
 				e = gf_node_register(new_node, is_mem_com ? NULL : node);
 				if (e) return e;
@@ -506,10 +506,10 @@
 		if (codec->info->config.UsePredictiveMFField) {
 			flag = gf_bs_read_int(bs, 1);
 			if (flag) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[BIFS] Stream uses Predictive Field Coding!\n"));
 #ifdef GPAC_ENABLE_BIFS_PMF
 				return gf_bifs_dec_pred_mf_field(codec, bs, node, field);
 #else
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BIFS] Stream uses Predictive Field Coding, disabled in this build!\n"));
 				return GF_NOT_SUPPORTED;
 #endif
 			}
@@ -721,9 +721,16 @@
 		/*NULL node is encoded as USE with ID = all bits to 1*/
 		if (nodeID == (u32) (1<<codec->info->config.NodeIDBits))
 			return NULL;
-		//find node and return it
+		//find node
 		new_node = gf_sg_find_node(codec->current_graph, nodeID);
 
+		//check node is allowed for the given NDT
+		if (new_node && !gf_node_in_table(new_node, NDT_Tag)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[BIFS] Node %s not allowed as field/child of NDT type %d\n", gf_node_get_class_name(new_node), NDT_Tag));
+			codec->LastError = GF_SG_UNKNOWN_NODE;
+			return NULL;
+		}
+
 		if (!new_node) {
 			codec->LastError = GF_SG_UNKNOWN_NODE;
 		} else {
@@ -845,9 +852,10 @@
 			}
 		}
 	}
+	if (!new_node)
 #endif
 
-	if (!new_node) {
+	{
 		if (proto) {
 			/*create proto interface*/
 			new_node = gf_sg_proto_create_instance(codec->current_graph, proto);

gpac-0.8.0.tar.gz/src/bifs/field_encode.c -> gpac-1.0.0.tar.gz/src/bifs/field_encode.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 / BIFS codec sub-project
@@ -106,31 +106,36 @@
 				return GF_URL_ERROR;
 			}
 			if (res_src) gf_free(res_src);
-			gf_fseek(f, 0, SEEK_END);
-			size = (u32) gf_ftell(f);
+			size = (u32) gf_fsize(f);
 			val = gf_get_bit_size(size);
 			GF_BIFS_WRITE_INT(codec, bs, val, 5, "nbBits", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, size, val, "length", NULL);
-			gf_fseek(f, 0, SEEK_SET);
+
 			while (size) {
-				u32 read = (u32) fread(buf, 1, 4096, f);
+				u32 read = (u32) gf_fread(buf, 4096, f);
 				gf_bs_write_data(bs, buf, read);
 				size -= read;
 			}
 			gf_fclose(f);
 		} else {
 			u32 i, val, len;
+			char *dump_str = NULL;
 			char *str = (char *) ((SFString*)field->far_ptr)->buffer;
 			if (node && (node->sgprivate->tag==TAG_MPEG4_BitWrapper) ) {
 				len = ((M_BitWrapper*)node)->buffer_len;
 			} else {
 				len = str ? (u32) strlen(str) : 0;
+				dump_str = str;
 			}
 			val = gf_get_bit_size(len);
 			GF_BIFS_WRITE_INT(codec, bs, val, 5, "nbBits", NULL);
 			GF_BIFS_WRITE_INT(codec, bs, len, val, "length", NULL);
 			for (i=0; i<len; i++) gf_bs_write_int(bs, str[i], 8);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] string\t\t%d\t\t%s\n", 8*len, str) );
+			if (dump_str) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] string\t\t%d\t\t%s\n", 8*len, str) );
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] string\t\t%d\n", 8*len) );
+			}
 		}
 		break;
 
@@ -190,7 +195,7 @@
 			GF_BitStream *bs_cond = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] /*SFCommandBuffer*/\n" ));
 			e = gf_bifs_enc_commands(codec, cb->commandList, bs_cond);
-			if (!e) gf_bs_get_content(bs_cond, (char**)&cb->buffer, &cb->bufferSize);
+			if (!e) gf_bs_get_content(bs_cond, &cb->buffer, &cb->bufferSize);
 			gf_bs_del(bs_cond);
 			if (e) return e;
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[BIFS] /*End SFCommandBuffer*/\n"));
@@ -210,7 +215,7 @@
 		return gf_bifs_enc_node(codec, *((GF_Node **)field->far_ptr), field->NDTtype, bs, node);
 
 	case GF_SG_VRML_SFSCRIPT:
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 		codec->LastError = SFScript_Encode(codec, (SFScript *)field->far_ptr, bs, node);
 #else
 		return GF_NOT_SUPPORTED;
@@ -561,7 +566,6 @@
 	u32 NDTBits, node_type, node_tag, BVersion, node_id;
 	const char *node_name;
 	Bool flag, reset_qp14;
-	GF_Node *new_node;
 	GF_Err e;
 
 	assert(codec->info);
@@ -578,6 +582,7 @@
 	GF_BIFS_WRITE_INT(codec, bs, flag ? 1 : 0, 1, "USE", (char*)gf_node_get_class_name(node));
 
 	if (flag) {
+		GF_Node *new_node;
 		gf_bs_write_int(bs, gf_node_get_id(node) - 1, codec->info->config.NodeIDBits);
 		new_node = gf_bifs_enc_find_node(codec, gf_node_get_id(node) );
 		if (!new_node)

gpac-0.8.0.tar.gz/src/bifs/memory_decoder.c -> gpac-1.0.0.tar.gz/src/bifs/memory_decoder.c Changed

@@ -177,7 +177,7 @@
 	codec->ActiveQP = NULL;
 	codec->scenegraph->global_qp = NULL;
 
-	if (node && (gf_node_get_tag(node) != TAG_MPEG4_QuantizationParameter)) {
+	if (gf_node_get_tag(node) != TAG_MPEG4_QuantizationParameter) {
 		gf_node_unregister(node, NULL);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
@@ -186,10 +186,10 @@
 	codec->ActiveQP = (M_QuantizationParameter *) node;
 	codec->ActiveQP->isLocal = 0;
 	codec->scenegraph->global_qp = node;
-	if (node) {
-		/*register TWICE: once for the command, and for the scenegraph globalQP*/
-		node->sgprivate->num_instances = 2;
-	}
+
+	/*register TWICE: once for the command, and for the scenegraph globalQP*/
+	node->sgprivate->num_instances = 2;
+
 	com = gf_sg_command_new(codec->current_graph, GF_SG_GLOBAL_QUANTIZER);
 	inf = gf_sg_command_field_new(com);
 	inf->new_node = node;
@@ -230,7 +230,7 @@
 static GF_Err BM_XReplace(GF_BifsDecoder *codec, GF_BitStream *bs, GF_List *com_list)
 {
 	GF_FieldInfo targetField, fromField, decfield;
-	GF_Node *target, *n, *fromNode;
+	GF_Node *target, *fromNode;
 	s32 pos = -2;
 	u32 id, nbBits, ind, aind;
 	GF_Err e;
@@ -243,6 +243,7 @@
 
 	com = gf_sg_command_new(codec->current_graph, GF_SG_XREPLACE);
 	BM_SetCommandNode(com, target);
+	gf_list_add(com_list, com);
 
 	nbBits = gf_get_bit_size(gf_node_get_num_fields_in_mode(target, GF_SG_FIELD_CODING_IN)-1);
 	ind = gf_bs_read_int(bs, nbBits);
@@ -259,6 +260,7 @@
 		if (gf_bs_read_int(bs, 1)) {
 			/*index is dynamic*/
 			if (gf_bs_read_int(bs, 1)) {
+				GF_Node *n;
 				id = 1 + gf_bs_read_int(bs, codec->info->config.NodeIDBits);
 				n = gf_sg_find_node(codec->current_graph, id);
 				if (!n) return GF_SG_UNKNOWN_NODE;
@@ -344,11 +346,7 @@
 		decfield.far_ptr = inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 	}
 	e = gf_bifs_dec_sf_field(codec, bs, target, &decfield, GF_TRUE);
-	if (e) return e;
-
-	gf_list_add(com_list, com);
-
-	return GF_OK;
+	return e;
 }
 
 static GF_Err BM_ParseExtendedUpdates(GF_BifsDecoder *codec, GF_BitStream *bs, GF_List *com_list)
@@ -401,7 +399,6 @@
 GF_Err BM_ParseNodeInsert(GF_BifsDecoder *codec, GF_BitStream *bs, GF_List *com_list)
 {
 	u32 NodeID, NDT;
-	GF_Command *com;
 	GF_CommandField *inf;
 	s32 type, pos;
 	GF_Node *node, *def;
@@ -429,7 +426,7 @@
 	}
 	node = gf_bifs_dec_node(codec, bs, NDT);
 	if (!codec->LastError) {
-		com = gf_sg_command_new(codec->current_graph, GF_SG_NODE_INSERT);
+		GF_Command *com = gf_sg_command_new(codec->current_graph, GF_SG_NODE_INSERT);
 		BM_SetCommandNode(com, def);
 		inf = gf_sg_command_field_new(com);
 		inf->pos = pos;
@@ -890,14 +887,11 @@
 GF_Err BM_ParseCommand(GF_BifsDecoder *codec, GF_BitStream *bs, GF_List *com_list)
 {
 	u8 go, type;
-	u32 count;
 	GF_Err e;
 	go = 1;
 	e = GF_OK;
 
 	codec->LastError = GF_OK;
-	count = 0;
-
 	while (go) {
 		type = gf_bs_read_int(bs, 2);
 		switch (type) {
@@ -915,10 +909,7 @@
 			break;
 		}
 		if (e) return e;
-
 		go = gf_bs_read_int(bs, 1);
-		count++;
-
 	}
 	while (gf_list_count(codec->QPs)) {
 		gf_bifs_dec_qp_remove(codec, GF_TRUE);
@@ -994,7 +985,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_bifs_decode_command_list(GF_BifsDecoder *codec, u16 ESID, char *data, u32 data_length, GF_List *com_list)
+GF_Err gf_bifs_decode_command_list(GF_BifsDecoder *codec, u16 ESID, u8 *data, u32 data_length, GF_List *com_list)
 {
 	GF_BitStream *bs;
 	GF_Err e;

gpac-0.8.0.tar.gz/src/bifs/predictive_mffield.c -> gpac-1.0.0.tar.gz/src/bifs/predictive_mffield.c Changed

gpac-0.8.0.tar.gz/src/bifs/quantize.c -> gpac-1.0.0.tar.gz/src/bifs/quantize.c Changed

gpac-0.8.0.tar.gz/src/bifs/script.h -> gpac-1.0.0.tar.gz/src/bifs/script.h Changed

gpac-0.8.0.tar.gz/src/bifs/script_dec.c -> gpac-1.0.0.tar.gz/src/bifs/script_dec.c Changed

gpac-0.8.0.tar.gz/src/bifs/script_enc.c -> gpac-1.0.0.tar.gz/src/bifs/script_enc.c Changed

@@ -31,7 +31,7 @@
 
 #include <gpac/internal/scenegraph_dev.h>
 
-#if !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_BIFS_ENC) && defined(GPAC_HAS_SPIDERMONKEY)
+#if !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_BIFS_ENC) && defined(GPAC_HAS_QJS)
 
 typedef struct
 {
@@ -57,7 +57,7 @@
 
 #define SFE_WRITE_INT(sc_enc, val, nbBits, str1, str2)	\
 		if (!sc_enc->emul) GF_BIFS_WRITE_INT(sc_enc->codec, sc_enc->bs, val, nbBits, str1, str2);	\
- 
+
 
 static GF_Err EncScriptFields(ScriptEnc *sc_enc)
 {
@@ -1175,7 +1175,7 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: Token %s read, %s expected\n", tok_names[curTok], tok_names[x])); \
 		sc_enc->err = GF_BAD_PARAM;	\
 	}	\
- 
+
 
 u32 TOK_To_ET(u32 tok)
 {
@@ -1262,6 +1262,7 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_LOG
 static const char *expr_name[] = {
 	"ET_CURVED_EXPR",
 	"ET_NEGATIVE",
@@ -1315,6 +1316,8 @@
 	"ET_VAR",
 	"NUMBER_OF_EXPR_TYPE"
 };
+#endif
+
 
 #define NUMBER_OF_RANK	15
 static s32 ET_Rank[NUMBER_OF_EXPR_TYPE] =
@@ -1708,7 +1711,7 @@
 		SFE_CheckToken(sc_enc, TOK_SEMICOLON);
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: illegal expression type %s\n", expr_name[expr]));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: illegal expression type %s\n", expr < GF_ARRAY_LENGTH(expr_name) ? expr_name[expr] : ""));
 		sc_enc->err = GF_BAD_PARAM;
 		break;
 	}
@@ -1830,4 +1833,4 @@
 	}
 }
 
-#endif	/* !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_BIFS_ENC) && defined(GPAC_HAS_SPIDERMONKEY) */
+#endif	/* !defined(GPAC_DISABLE_BIFS) && !defined(GPAC_DISABLE_BIFS_ENC) && defined(GPAC_HAS_QJS) */

gpac-0.8.0.tar.gz/src/bifs/unquantize.c -> gpac-1.0.0.tar.gz/src/bifs/unquantize.c Changed

gpac-0.8.0.tar.gz/src/compositor/audio_input.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -34,25 +34,8 @@
 //introduce oscillations in the clock and non-smooth playback
 #define MIN_DRIFT_ADJUST	75
 
-struct __audiofilteritem
-{
-	GF_AudioInterface input;
-	GF_AudioInterface *src;
-
-	u32 out_chan, out_ch_cfg;
-
-	u32 nb_used, nb_filled;
-
-	GF_AudioFilterChain filter_chain;
-};
-
-
-GF_AudioFilterItem *gf_af_new(GF_Compositor *compositor, GF_AudioInterface *src, char *filter_name);
-void gf_af_del(GF_AudioFilterItem *af);
-void gf_af_reset(GF_AudioFilterItem *af);
-
 
-static char *gf_audio_input_fetch_frame(void *callback, u32 *size, u32 audio_delay_ms)
+static u8 *gf_audio_input_fetch_frame(void *callback, u32 *size, u32 *planar_size, u32 audio_delay_ms)
 {
 	char *frame;
 	u32 obj_time, ts;
@@ -64,7 +47,9 @@
 	if (!ai->stream) return NULL;
 
 	done = ai->stream_finished;
-	frame = gf_mo_fetch_data(ai->stream, ai->compositor->audio_renderer->step_mode ? GF_MO_FETCH_PAUSED : GF_MO_FETCH, 0, &ai->stream_finished, &ts, size, NULL, NULL, NULL);
+	ai->input_ifce.is_buffering = GF_FALSE;
+
+	frame = gf_mo_fetch_data(ai->stream, ai->compositor->audio_renderer->non_rt_output ? GF_MO_FETCH_PAUSED : GF_MO_FETCH, 0, &ai->stream_finished, &ts, size, NULL, NULL, NULL, planar_size);
 	/*invalidate scene on end of stream to refresh audio graph*/
 	if (done != ai->stream_finished) {
 		gf_sc_invalidate(ai->compositor, NULL);
@@ -72,17 +57,18 @@
 
 	/*no more data or not enough data, reset syncro drift*/
 	if (!frame) {
-		if (!ai->stream_finished && gf_mo_is_started(ai->stream)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUDIO, ("[Audio Input] No data in audio object\n"));
+		if (!ai->stream_finished && gf_mo_is_started(ai->stream) && (ai->stream->odm->ck->speed == FIX_ONE)) {
+			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);
 		*size = 0;
 		return NULL;
 	}
 	ai->need_release = GF_TRUE;
 
 	//step mode, return the frame without sync check
-	if (ai->compositor->audio_renderer->step_mode) {
+	if (ai->compositor->audio_renderer->non_rt_output) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[Audio Input] audio frame CTS %u %d bytes fetched\n", ts, *size));
 		return frame;
 	}
@@ -97,6 +83,25 @@
 		drift = (s32)obj_time;
 		drift -= (s32)ts;
 	}
+	if (ai->stream->odm->prev_clock_at_discontinuity_plus_one) {
+		s32 drift_old = drift;
+		s32 diff;
+		drift_old -= (s32) ai->stream->odm->ck->init_timestamp;
+		drift_old += (s32) ai->stream->odm->prev_clock_at_discontinuity_plus_one - 1;
+		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));
+			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));
+			ai->stream->odm->prev_clock_at_discontinuity_plus_one = 0;
+			if (drift<0) {
+				drift = 0;
+			}
+		}
+	}
 
 #ifdef ENABLE_EARLY_FRAME_DETECTION
 	/*too early (silence insertions), skip*/
@@ -116,9 +121,13 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] Audio data too late obj time %d - CTS %d - drift %d ms - resync forced\n", obj_time - audio_delay_ms, ts, drift));
 			gf_mo_release_data(ai->stream, *size, 2);
 			ai->need_release = GF_FALSE;
-			return gf_audio_input_fetch_frame(callback, size, audio_delay_ms);
+			return gf_audio_input_fetch_frame(callback, size, planar_size, audio_delay_ms);
 		}
-		resync_delay = gf_mo_get_clock_drift(ai->stream) - drift;
+		if (ai->stream->odm && ai->stream->odm->ck)
+			resync_delay = ai->stream->odm->ck->audio_delay - drift;
+		else
+			resync_delay = -drift;
+			
 		if (resync_delay < 0) resync_delay = -resync_delay;
 
 		if (resync_delay > MIN_DRIFT_ADJUST) {
@@ -149,7 +158,10 @@
 	if (ai->snd && ai->snd->GetChannelVolume) {
 		return ai->snd->GetChannelVolume(ai->snd->owner, vol);
 	} else {
-		vol[0] = vol[1] = vol[2] = vol[3] = vol[4] = vol[5] = ai->intensity;
+		u32 i;
+		for (i=0; i<GF_AUDIO_MIXER_MAX_CHANNELS; i++)
+			vol[i] = ai->intensity;
+			
 		return (ai->intensity==FIX_ONE) ? GF_FALSE : GF_TRUE;
 	}
 }
@@ -158,6 +170,9 @@
 {
 	GF_AudioInput *ai = (GF_AudioInput *) callback;
 	if (!ai->stream) return GF_TRUE;
+
+	if (ai->stream->odm->nb_buffering)
+		gf_odm_check_buffering(ai->stream->odm, NULL);
 	if (ai->is_muted)
 		return GF_TRUE;
 	return gf_mo_is_muted(ai->stream);
@@ -168,18 +183,19 @@
 	GF_AudioInput *ai = (GF_AudioInput *) aifc->callback;
 	if (!ai->stream) return GF_FALSE;
 	/*watchout for object reuse*/
-	if (aifc->samplerate && (gf_mo_get_flags(ai->stream) & GF_MO_IS_INIT)) return GF_TRUE;
+	if (aifc->samplerate &&  !ai->stream->config_changed) return GF_TRUE;
 
-	gf_mo_get_audio_info(ai->stream, &aifc->samplerate, &aifc->bps , &aifc->chan, &aifc->ch_cfg, &aifc->forced_layout);
+	gf_mo_get_audio_info(ai->stream, &aifc->samplerate, &aifc->afmt , &aifc->chan, &aifc->ch_layout, &aifc->forced_layout);
 
 	if (!for_recf)
 		return aifc->samplerate ? GF_TRUE : GF_FALSE;
 
-	if (aifc->samplerate * aifc->chan * aifc->bps && ((aifc->chan<=2) || aifc->ch_cfg))  {
-		gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_TRUE);
+	if (aifc->samplerate && aifc->chan && aifc->afmt && ((aifc->chan<=2) || aifc->ch_layout))  {
+		ai->stream->config_changed = GF_FALSE;
 		return GF_TRUE;
 	}
-	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_FALSE);
+	//still not ready !
+	ai->stream->config_changed=GF_TRUE;
 	return GF_FALSE;
 }
 
@@ -208,14 +224,11 @@
 {
 	gf_sc_audio_stop(ai);
 	gf_sc_audio_unregister(ai);
-
-	if (ai->filter) gf_af_del(ai->filter);
 }
 
 GF_EXPORT
 GF_Err gf_sc_audio_open(GF_AudioInput *ai, MFURL *url, Double clipBegin, Double clipEnd, Bool lock_timeline)
 {
-	u32 i;
 	if (ai->is_open) return GF_BAD_PARAM;
 
 	/*get media object*/
@@ -228,18 +241,9 @@
 
 	ai->stream_finished = GF_FALSE;
 	ai->is_open = 1;
-	gf_mo_set_flag(ai->stream, GF_MO_IS_INIT, GF_FALSE);
-
-	if (ai->filter) gf_af_del(ai->filter);
-	ai->filter = NULL;
+	//force reload of audio props
+	ai->stream->config_changed = GF_TRUE;
 
-	for (i=0; i<url->count; i++) {
-		if (url->vals[i].url && !strnicmp(url->vals[i].url, "#filter=", 8)) {
-			ai->filter = gf_af_new(ai->compositor, &ai->input_ifce, url->vals[i].url+8);
-			if (ai->filter)
-				break;
-		}
-	}
 	return GF_OK;
 }
 
@@ -253,14 +257,11 @@
 
 	assert(!ai->need_release);
 
-	gf_mo_stop(ai->stream);
+	gf_mo_stop(&ai->stream);
 	ai->is_open = 0;
 	gf_mo_unregister(ai->owner, ai->stream);
 	ai->stream = NULL;
 
-	if (ai->filter) gf_af_del(ai->filter);
-	ai->filter = NULL;
-
 	gf_mixer_lock(ai->compositor->audio_renderer->mixer, GF_FALSE);
 
 }
@@ -272,7 +273,7 @@
 	if (ai->need_release) gf_mo_release_data(ai->stream, 0xFFFFFFFF, 2);
 	ai->need_release = GF_FALSE;
 	ai->stream_finished = GF_FALSE;
-	if (ai->filter) gf_af_reset(ai->filter);
+
 	gf_mo_restart(ai->stream);
 }
 
@@ -287,7 +288,6 @@
 void gf_sc_audio_register(GF_AudioInput *ai, GF_TraverseState *tr_state)
 {
 	GF_AudioInterface *aifce;
-
 	/*check interface is valid*/
 	if (!ai->input_ifce.FetchFrame
 	        || !ai->input_ifce.GetChannelVolume
@@ -298,7 +298,6 @@
 	   ) return;
 
 	aifce = &ai->input_ifce;
-	if (ai->filter) aifce = &ai->filter->input;
 
 	if (tr_state->audio_parent) {
 		/*this assume only one parent may use an audio node*/
@@ -328,7 +327,6 @@
 void gf_sc_audio_unregister(GF_AudioInput *ai)
 {
 	GF_AudioInterface *aifce = &ai->input_ifce;
-	if (ai->filter) aifce = &ai->filter->input;
 
 	if (ai->register_with_renderer) {
 		ai->register_with_renderer = GF_FALSE;
@@ -339,114 +337,3 @@
 	}
 }
 
-
-static char *gf_af_fetch_frame(void *callback, u32 *size, u32 audio_delay_ms)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)callback;
-
-	*size = 0;
-	if (!af->nb_used) {
-		/*force filling the filter chain output until no data is available, otherwise we may end up
-		with data in input and no data as output because of block framing of the filter chain*/
-		while (!af->nb_filled) {
-			u32 nb_bytes;
-			char *data = af->src->FetchFrame(af->src->callback, &nb_bytes, audio_delay_ms + af->filter_chain.delay_ms);
-			/*no input data*/
-			if (!data || !nb_bytes)
-				return NULL;
-
-			if (nb_bytes > af->filter_chain.min_block_size) nb_bytes = af->filter_chain.min_block_size;
-			memcpy(af->filter_chain.tmp_block1, data, nb_bytes);
-			af->src->ReleaseFrame(af->src->callback, nb_bytes);
-
-			af->nb_filled = gf_afc_process(&af->filter_chain, nb_bytes);
-		}
-	}
-
-	*size = af->nb_filled - af->nb_used;
-	return af->filter_chain.tmp_block1 + af->nb_used;
-}
-static void gf_af_release_frame(void *callback, u32 nb_bytes)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)callback;
-	/*mark used bytes of filter output*/
-	af->nb_used += nb_bytes;
-	if (af->nb_used==af->nb_filled) {
-		af->nb_used = 0;
-		af->nb_filled = 0;
-	}
-}
-
-static Fixed gf_af_get_speed(void *callback)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)callback;
-	return af->src->GetSpeed(af->src->callback);
-}
-static Bool gf_af_get_channel_volume(void *callback, Fixed *vol)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)callback;
-	return af->src->GetChannelVolume(af->src->callback, vol);
-}
-
-static Bool gf_af_is_muted(void *callback)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)callback;
-	return af->src->IsMuted(af->src->callback);
-}
-
-static Bool gf_af_get_config(GF_AudioInterface *ai, Bool for_reconf)
-{
-	GF_AudioFilterItem *af = (GF_AudioFilterItem *)ai->callback;
-
-	Bool res = af->src->GetConfig(af->src, for_reconf);
-	if (!res) return GF_FALSE;
-	if (!for_reconf) return GF_TRUE;
-
-
-	af->input.bps = af->src->bps;
-	af->input.samplerate = af->src->samplerate;
-
-	af->input.ch_cfg = af->src->ch_cfg;
-	af->input.chan = af->src->chan;
-
-	if (gf_afc_setup(&af->filter_chain, af->input.bps, af->input.samplerate, af->src->chan, af->src->ch_cfg, &af->input.chan, &af->input.ch_cfg)!=GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[Audio Input] Failed to configure audio filter chain\n"));
-
-		return GF_FALSE;
-	}
-	return GF_TRUE;
-}
-
-GF_AudioFilterItem *gf_af_new(GF_Compositor *compositor, GF_AudioInterface *src, char *filter_name)
-{
-	GF_AudioFilterItem *filter;
-	if (!src || !filter_name) return NULL;
-
-	GF_SAFEALLOC(filter, GF_AudioFilterItem);
-	if (!filter) return NULL;
-	
-	filter->src = src;
-	filter->input.FetchFrame = gf_af_fetch_frame;
-	filter->input.ReleaseFrame = gf_af_release_frame;
-	filter->input.GetSpeed = gf_af_get_speed;
-	filter->input.GetChannelVolume = gf_af_get_channel_volume;
-	filter->input.IsMuted = gf_af_is_muted;
-	filter->input.GetConfig = gf_af_get_config;
-	filter->input.callback = filter;
-
-	gf_afc_load(&filter->filter_chain, compositor->user, filter_name);
-	return filter;
-}
-
-void gf_af_del(GF_AudioFilterItem *af)
-{
-	gf_afc_unload(&af->filter_chain);
-	gf_free(af);
-}
-
-void gf_af_reset(GF_AudioFilterItem *af)
-{
-	gf_afc_reset(&af->filter_chain);
-
-	af->nb_filled = af->nb_used = 0;
-}

gpac-0.8.0.tar.gz/src/compositor/audio_mixer.c -> gpac-1.0.0.tar.gz/src/compositor/audio_mixer.c Changed

gpac-0.8.0.tar.gz/src/compositor/audio_render.c -> gpac-1.0.0.tar.gz/src/compositor/audio_render.c Changed

gpac-0.8.0.tar.gz/src/compositor/bindable.c -> gpac-1.0.0.tar.gz/src/compositor/bindable.c Changed

gpac-0.8.0.tar.gz/src/compositor/camera.c -> gpac-1.0.0.tar.gz/src/compositor/camera.c Changed

@@ -30,20 +30,6 @@
 
 #define FORCE_CAMERA_3D
 
-GF_Camera *new_camera()
-{
-	GF_Camera *tmp;
-	GF_SAFEALLOC(tmp, GF_Camera);
-	if (!tmp) return NULL;
-	tmp->speed = 1;
-
-	return tmp;
-}
-void delete_camera(GF_Camera *cam)
-{
-	if (cam) gf_free(cam);
-}
-
 void camera_invalidate(GF_Camera *cam)
 {
 	/*forces recompute of default viewpoint*/
@@ -210,7 +196,7 @@
 #endif
 }
 
-void camera_update_stereo(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords, Fixed horizontal_shift, Fixed nominal_view_distance, Fixed view_distance_offset, u32 camera_layout)
+void camera_update_stereo(GF_Camera *cam, GF_Matrix2D *user_transform, Bool center_coords, Fixed horizontal_shift, Fixed nominal_view_distance, Fixed view_distance_offset, u32 camlay)
 {
 	Fixed vlen, h, w, ar;
 	SFVec3f corner, center;
@@ -222,8 +208,12 @@
 	gf_mx_init(post_model_view);
 
 	if (cam->is_3D) {
+		if (!cam->z_far) {
+			cam->z_near = FIX_ONE / 100;
+			cam->z_far = FIX_ONE * 100;
+		}
 		/*setup perspective*/
-		if (camera_layout==GF_3D_CAMERA_OFFAXIS) {
+		if (camlay==GF_3D_CAMERA_OFFAXIS) {
 			Fixed left, right, top, bottom, shift, wd2, ndfl, viewing_distance;
 			SFVec3f eye, pos, tar, disp;
 
@@ -338,11 +328,11 @@
 		cam->center = b.center;
 		cam->radius = b.radius;
 
-		if (camera_layout==GF_3D_CAMERA_OFFAXIS)
-			camera_layout=GF_3D_CAMERA_LINEAR;
+		if (camlay==GF_3D_CAMERA_OFFAXIS)
+			camlay=GF_3D_CAMERA_LINEAR;
 	}
 
-	if (camera_layout == GF_3D_CAMERA_CIRCULAR) {
+	if (camlay == GF_3D_CAMERA_CIRCULAR) {
 		GF_Matrix mx;
 		Fixed viewing_distance = nominal_view_distance;
 		SFVec3f pos, target;
@@ -367,7 +357,7 @@
 		gf_mx_apply_vec(&mx, &pos);
 
 		gf_mx_lookat(&cam->modelview, pos, target, cam->up);
-	} else if (camera_layout == GF_3D_CAMERA_LINEAR) {
+	} else if (camlay == GF_3D_CAMERA_LINEAR) {
 		Fixed viewing_distance = nominal_view_distance + view_distance_offset;
 		GF_Vec eye, disp, pos, tar;
 
@@ -496,22 +486,25 @@
 }
 
 
-Bool camera_animate(GF_Camera *cam)
+Bool camera_animate(GF_Camera *cam, void *_compositor)
 {
 	u32 now;
 	Fixed frac;
+	GF_Compositor *compositor = (GF_Compositor *) _compositor;
 	if (!cam->anim_len) return GF_FALSE;
 
+	now = gf_sc_get_clock(compositor);
+
 	if (cam->jumping) {
 		if (!cam->anim_start) {
-			cam->anim_start = gf_sys_clock();
+			cam->anim_start = now;
 			cam->dheight = 0;
 			return GF_TRUE;
 		}
 		cam->position.y -= cam->dheight;
 		cam->target.y -= cam->dheight;
 
-		now = gf_sys_clock() - cam->anim_start;
+		now -= cam->anim_start;
 		if (now > cam->anim_len) {
 			cam->anim_len = 0;
 			cam->jumping = GF_FALSE;
@@ -528,10 +521,10 @@
 	}
 
 	if (!cam->anim_start) {
-		cam->anim_start = gf_sys_clock();
+		cam->anim_start = now;
 		frac = 0;
 	} else {
-		now = gf_sys_clock() - cam->anim_start;
+		now -= cam->anim_start;
 		if (now > cam->anim_len) {
 			cam->anim_len = 0;
 #ifndef FORCE_CAMERA_3D

gpac-1.0.0.tar.gz/src/compositor/clock.c Added

@@ -0,0 +1,298 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file scene part of GPAC / Scene Compositor sub-project
+ *
+ *  GPAC scene 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 scene 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/internal/compositor_dev.h>
+
+static GF_Clock *gf_clock_new(GF_Compositor *compositor)
+{
+	GF_Clock *tmp;
+	GF_SAFEALLOC(tmp, GF_Clock);
+	if (!tmp) return NULL;
+	tmp->mx = gf_mx_new("Clock");
+	tmp->compositor = compositor;
+	tmp->speed = FIX_ONE;
+	tmp->timeline_id = 1;
+	return tmp;
+}
+
+void gf_clock_del(GF_Clock *ck)
+{
+	gf_mx_del(ck->mx);
+	gf_free(ck);
+}
+
+GF_Clock *gf_clock_find(GF_List *Clocks, u16 clock_id, u16 ES_ID)
+{
+	u32 i;
+	GF_Clock *tmp;
+	i=0;
+	while ((tmp = (GF_Clock *)gf_list_enum(Clocks, &i))) {
+		//first check the clock ID
+		if (tmp->clock_id == clock_id) return tmp;
+		//then check the ES ID
+		if (ES_ID && (tmp->clock_id == ES_ID)) return tmp;
+	}
+	//no clocks found...
+	return NULL;
+}
+
+static GF_Clock *gf_ck_look_for_clock_dep(GF_Scene *scene, u16 clock_id)
+{
+	u32 i, j;
+	GF_ODMExtraPid *xpid;
+	GF_ObjectManager *odm;
+
+	/*check in top OD*/
+	if (scene->root_od->pid_id == clock_id) return scene->root_od->ck;
+	i=0;
+	while ((xpid = (GF_ODMExtraPid*)gf_list_enum(scene->root_od->extra_pids, &i))) {
+		if (xpid->pid_id == clock_id) return scene->root_od->ck;
+	}
+	/*check in sub ODs*/
+	j=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &j))) {
+		if (odm->pid_id == clock_id) return odm->ck;
+		i=0;
+		while ((xpid = (GF_ODMExtraPid*)gf_list_enum(odm->extra_pids, &i))) {
+			if (xpid->pid_id == clock_id) return odm->ck;
+		}
+	}
+	return NULL;
+}
+
+/*remove clocks created due to out-of-order OCR dependencies*/
+static void gf_ck_resolve_clock_dep(GF_List *clocks, GF_Scene *scene, GF_Clock *new_ck, u16 Clock_ESID)
+{
+	u32 i;
+	GF_Clock *clock;
+	GF_ObjectManager *odm;
+
+	/*check all objects - if any uses a clock which ID == the clock_ESID then
+	this clock shall be removed*/
+	if (scene->root_od->ck && (scene->root_od->ck->clock_id == Clock_ESID)) {
+		scene->root_od->ck = new_ck;
+	}
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+		if (odm->ck && (odm->ck->clock_id == Clock_ESID)) {
+			odm->ck = new_ck;
+		}
+	}
+	/*destroy clock*/
+	i=0;
+	while ((clock = (GF_Clock*)gf_list_enum(clocks, &i))) {
+		if (clock->clock_id == Clock_ESID) {
+			gf_list_rem(clocks, i-1);
+			gf_clock_del(clock);
+			return;
+		}
+	}
+}
+
+GF_Clock *gf_clock_attach(GF_List *clocks, GF_Scene *scene, u16 clock_id, u16 ES_ID, s32 hasOCR)
+{
+	Bool check_dep;
+	GF_Clock *tmp = gf_clock_find(clocks, clock_id, ES_ID);
+	/*ck dep can only be solved if in the main service*/
+	check_dep = (scene->root_od->scene_ns && scene->root_od->scene_ns->clocks==clocks) ? GF_TRUE : GF_FALSE;
+
+	/*this partly solves a->b->c*/
+	if (!tmp && check_dep) tmp = gf_ck_look_for_clock_dep(scene, clock_id);
+	if (!tmp) {
+		tmp = gf_clock_new(scene->compositor);
+		tmp->clock_id = clock_id;
+		gf_list_add(clocks, tmp);
+	} else {
+		if (tmp->clock_id == ES_ID) tmp->clock_id = clock_id;
+		/*this finally solves a->b->c*/
+		if (check_dep && (tmp->clock_id != ES_ID)) gf_ck_resolve_clock_dep(clocks, scene, tmp, ES_ID);
+	}
+	return tmp;
+}
+
+void gf_clock_reset(GF_Clock *ck)
+{
+	ck->clock_init = 0;
+	ck->audio_delay = 0;
+	ck->speed_set_time = 0;
+	//do NOT reset buffering flag, because RESET scene called only
+	//for the stream owning the clock, and other streams may
+	//have signaled buffering on this clock
+	ck->init_timestamp = 0;
+	ck->start_time = 0;
+	ck->has_seen_eos = 0;
+	ck->media_time_at_init = 0;
+	ck->has_media_time_shift = 0;
+	ck->timeline_id++;
+}
+
+void gf_clock_set_time(GF_Clock *ck, u32 TS)
+{
+	if (!ck->clock_init) {
+		ck->init_timestamp = TS;
+		ck->clock_init = 1;
+		ck->audio_delay = 0;
+		/*update starttime and pausetime even in pause mode*/
+		ck->pause_time = ck->start_time = gf_sc_get_clock(ck->compositor);
+	}
+}
+
+
+
+void gf_clock_pause(GF_Clock *ck)
+{
+	gf_mx_p(ck->mx);
+	if (!ck->nb_paused)
+		ck->pause_time = gf_sc_get_clock(ck->compositor);
+	ck->nb_paused += 1;
+	gf_mx_v(ck->mx);
+}
+
+void gf_clock_resume(GF_Clock *ck)
+{
+	gf_mx_p(ck->mx);
+	assert(ck->nb_paused);
+	if (!ck->nb_paused) {
+		assert(!ck->nb_buffering);
+	}
+	ck->nb_paused -= 1;
+	//in player mode, increment the start time to reflect how long we have been buffering
+	//in non-player mode, since we don't care about real-time, don't update the clock start time
+	//this avoids cases where the first composed frame is dispatched while the object(s) are buffering
+	//updating the clock would rewind the timebase in the past and won't trigger next frame fetch on these objects
+	if (!ck->nb_paused && ck->compositor->player)
+		ck->start_time += gf_sc_get_clock(ck->compositor) - ck->pause_time;
+	gf_mx_v(ck->mx);
+}
+
+
+u32 gf_clock_real_time(GF_Clock *ck)
+{
+	u32 time;
+	assert(ck);
+	if (!ck->clock_init) return ck->start_time;
+	time = ck->nb_paused > 0 ? ck->pause_time : gf_sc_get_clock(ck->compositor);
+
+#ifdef GPAC_FIXED_POINT
+
+	if ((ck->speed < 0) && ((s32) ck->init_timestamp < FIX2INT( (-ck->speed * 100) * (time - ck->start_time)) / 100 ) ) {
+		time = 0;
+	} else {
+		time = ck->speed_set_time + ck->init_timestamp + (time - ck->start_time) * FIX2INT(100*ck->speed) / 100;
+	}
+
+#else
+
+	if ((ck->speed < 0) && ((s32) ck->init_timestamp < (-ck->speed) * (time - ck->start_time))) {
+		time = 0;
+	} else {
+		//DO NOT CHANGE the position of cast float->u32, otherwise we have precision issues when ck->init_timestamp
+		//is >= 0x40000000. We know for sure that ck->speed * (time - ck->start_time) is positive
+		time = ck->speed_set_time + ck->init_timestamp + (u32) (ck->speed * (time - ck->start_time) );
+	}
+
+#endif
+
+	return time;
+}
+
+GF_EXPORT
+u32 gf_clock_time(GF_Clock *ck)
+{
+	u32 time = gf_clock_real_time(ck);
+	if ((ck->audio_delay>0) && (time < (u32) ck->audio_delay)) return 0;
+	return time - ck->audio_delay;
+}
+
+u32 gf_clock_to_media_time(GF_Clock *ck, u32 clock_val)
+{
+	u32 t = clock_val;
+	if (ck && ck->has_media_time_shift) {
+		if (t>ck->init_timestamp) t -= ck->init_timestamp;
+		else t=0;
+		t += ck->media_time_at_init;
+	}
+	return t;
+}
+
+u32 gf_clock_media_time(GF_Clock *ck)
+{
+	u32 t;
+	if (!ck) return 0;
+	if (!ck->has_seen_eos && ck->last_ts_rendered) t = ck->last_ts_rendered;
+	else t = gf_clock_time(ck);
+	return gf_clock_to_media_time(ck, t);
+}
+
+u32 gf_clock_elapsed_time(GF_Clock *ck)
+{
+	if (!ck || ck->nb_buffering || ck->nb_paused) return 0;
+	return gf_sys_clock() - ck->start_time;
+}
+
+Bool gf_clock_is_started(GF_Clock *ck)
+{
+	if (!ck || !ck->clock_init || ck->nb_buffering || ck->nb_paused) return 0;
+	return 1;
+}
+
+/*buffering scene protected by a mutex because it may be triggered by composition memory (audio or visual threads)*/
+void gf_clock_buffer_on(GF_Clock *ck)
+{
+	gf_mx_p(ck->mx);
+	if (!ck->nb_buffering) gf_clock_pause(ck);
+	ck->nb_buffering += 1;
+	gf_mx_v(ck->mx);
+}
+
+void gf_clock_buffer_off(GF_Clock *ck)
+{
+	gf_mx_p(ck->mx);
+	//assert(ck->nb_buffering);
+	if (ck->nb_buffering) {
+		ck->nb_buffering -= 1;
+		if (!ck->nb_buffering)
+			gf_clock_resume(ck);
+	}
+	gf_mx_v(ck->mx);
+}
+
+
+void gf_clock_set_speed(GF_Clock *ck, Fixed speed)
+{
+	u32 time;
+	if (speed==ck->speed) return;
+	time = gf_sc_get_clock(ck->compositor);
+	/*adjust start time*/
+	ck->speed_set_time = gf_clock_time(ck) - ck->init_timestamp;
+	ck->pause_time = ck->start_time = time;
+	ck->speed = speed;
+}
+
+void gf_clock_set_audio_delay(GF_Clock *ck, s32 ms_delay)
+{
+	if (ck) ck->audio_delay = ms_delay;
+}
+

gpac-0.8.0.tar.gz/src/compositor/compositor.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -24,11 +24,10 @@
  */
 
 #include <gpac/internal/compositor_dev.h>
-/*for user and terminal API (options and InputSensor)*/
-#include <gpac/internal/terminal_dev.h>
 #include <gpac/options.h>
 #include <gpac/utf.h>
 #include <gpac/modules/hardcoded_proto.h>
+#include <gpac/modules/compositor_ext.h>
 
 #include "nodes_stacks.h"
 
@@ -40,13 +39,21 @@
 #define SC_DEF_WIDTH	320
 #define SC_DEF_HEIGHT	240
 
+
+GF_EXPORT
+Bool gf_sc_send_event(GF_Compositor *compositor, GF_Event *evt)
+{
+	return gf_filter_forward_gf_event(compositor->filter, evt, GF_FALSE, GF_FALSE);
+}
+
+
 void gf_sc_next_frame_state(GF_Compositor *compositor, u32 state)
 {
-//	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Forcing frame redraw state: %d\n", state));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Forcing frame redraw state: %d\n", state));
 	if (state==GF_SC_DRAW_FLUSH) {
 		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 (!compositor->frame_draw_type
 #ifndef GPAC_DISABLE_3D
@@ -95,7 +102,7 @@
 		evt.type = GF_EVENT_MESSAGE;
 		evt.message.message = "Cannot switch to fullscreen";
 		evt.message.error = e;
-		gf_term_send_event(compositor->term, &evt);
+		gf_sc_send_event(compositor, &evt);
 		compositor->fullscreen = 0;
 		compositor->video_out->SetFullScreen(compositor->video_out, 0, &compositor->display_width, &compositor->display_height);
 	}
@@ -119,43 +126,41 @@
 	u32 width,height;
 
 	/*reconfig audio if needed (non-threaded compositors)*/
-	if (compositor->audio_renderer && !compositor->audio_renderer->th) gf_sc_ar_reconfig(compositor->audio_renderer);
-
+	if (compositor->audio_renderer
+#ifdef ENABLE_AOUT
+	 	&& !compositor->audio_renderer->th
+#endif
+	)
 	if (compositor->msg_type) {
 
 		compositor->msg_type |= GF_SR_IN_RECONFIG;
 
 		if (compositor->msg_type & GF_SR_CFG_INITIAL_RESIZE) {
-			GF_Event evt;
 			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_VIDEO_SETUP;
 			evt.setup.width = compositor->new_width;
 			evt.setup.height = compositor->new_height;
 			evt.setup.system_memory = compositor->video_memory ? GF_FALSE : GF_TRUE;
-			
-#ifdef OPENGL_RASTER
-			if (compositor->opengl_raster) {
-				evt.setup.opengl_mode = 1;
-				evt.setup.system_memory = GF_FALSE;
-				evt.setup.back_buffer = GF_TRUE;
-			}
-#endif
-			
+			evt.setup.disable_vsync = compositor->bench_mode ? GF_TRUE : GF_FALSE;
+
 #ifndef GPAC_DISABLE_3D
 			if (compositor->hybrid_opengl || compositor->force_opengl_2d) {
-				evt.setup.opengl_mode = 1;
+				evt.setup.use_opengl = GF_TRUE;
 				evt.setup.system_memory = GF_FALSE;
 				evt.setup.back_buffer = GF_TRUE;
 			}
-			
+
 #endif
-			compositor->video_out->ProcessEvent(compositor->video_out, &evt);		
+			compositor->video_out->ProcessEvent(compositor->video_out, &evt);
+
+			if (evt.setup.use_opengl) {
+				gf_opengl_init();
+			}
+
 			compositor->msg_type &= ~GF_SR_CFG_INITIAL_RESIZE;
 		}
 		/*scene size has been overriden*/
 		if (compositor->msg_type & GF_SR_CFG_OVERRIDE_SIZE) {
-			GF_Event evt;
-
 			assert(!(compositor->override_size_flags & 2));
 			compositor->msg_type &= ~GF_SR_CFG_OVERRIDE_SIZE;
 			compositor->override_size_flags |= 2;
@@ -167,7 +172,7 @@
 			evt.type = GF_EVENT_SIZE;
 			evt.size.width = width;
 			evt.size.height = height;
-			gf_term_send_event(compositor->term, &evt);
+			gf_sc_send_event(compositor, &evt);
 		}
 		/*size changed from scene cfg: resize window first*/
 		if (compositor->msg_type & GF_SR_CFG_SET_SIZE) {
@@ -177,7 +182,7 @@
 			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Changing display size to %d x %d\n", compositor->new_width, compositor->new_height));
 			fs_width = fs_height = 0;
 			if (restore_fs) {
-#if defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
+#if defined(GPAC_CONFIG_ANDROID) || defined(GPAC_CONFIG_IOS)
 				if ((compositor->new_width>compositor->display_width) || (compositor->new_height>compositor->display_height)) {
 					u32 w = compositor->display_width;
 					compositor->display_width = compositor->display_height;
@@ -196,7 +201,7 @@
 			if ( !(compositor->msg_type & GF_SR_CFG_WINDOWSIZE_NOTIF)) {
 				compositor->video_out->ProcessEvent(compositor->video_out, &evt);
 			}
-			
+
 			compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 
 			if (restore_fs) {
@@ -235,15 +240,9 @@
 		}
 		compositor->msg_type &= ~GF_SR_IN_RECONFIG;
 	}
-	if (notif_size && compositor->video_listeners) {
-		u32 k=0;
-		GF_VideoListener *l;
-		while ((l = gf_list_enum(compositor->video_listeners, &k))) {
-			if ( compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT) )
-				l->on_video_reconfig(l->udta, compositor->display_width, compositor->display_height, 4);
-			else
-				l->on_video_reconfig(l->udta, compositor->display_width, compositor->display_height, 3);
-		}
+	if (notif_size) {
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_WIDTH, &PROP_UINT(compositor->display_width));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_HEIGHT, &PROP_UINT(compositor->display_height));
 	}
 
 	/*3D driver changed message, recheck extensions*/
@@ -263,13 +262,82 @@
 	}
 }
 
+
+static void gf_sc_frame_ifce_done(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	GF_Compositor *compositor = gf_filter_get_udta(filter);
+	if (frame_ifce) {
+		compositor->frame_ifce.user_data = NULL;
+		if (compositor->fb.video_buffer) {
+			gf_sc_release_screen_buffer(compositor, &compositor->fb);
+			compositor->fb.video_buffer = NULL;
+		}
+	}
+	compositor->flush_pending = (compositor->skip_flush!=1) ? GF_TRUE : GF_FALSE;
+	compositor->skip_flush = 0;
+}
+
+GF_Err gf_sc_frame_ifce_get_plane(GF_FilterFrameInterface *frame_ifce, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	GF_Err e = GF_BAD_PARAM;
+	GF_Compositor *compositor = frame_ifce->user_data;
+
+	if (plane_idx==0) {
+		e = GF_OK;
+		if (!compositor->fb.video_buffer)
+			e = gf_sc_get_screen_buffer(compositor, &compositor->fb, 0);
+	}
+	*outPlane = compositor->fb.video_buffer;
+	*outStride = compositor->fb.pitch_y;
+	return e;
+}
+#ifndef GPAC_DISABLE_3D
+GF_Err gf_sc_frame_ifce_get_gl_texture(GF_FilterFrameInterface *frame_ifce, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_Matrix_unexposed * texcoordmatrix)
+{
+	GF_Compositor *compositor = frame_ifce->user_data;
+	if (!compositor->fbo_tx_id) return GF_BAD_PARAM;
+	if (plane_idx) return GF_BAD_PARAM;
+	if (gl_tex_id) *gl_tex_id = compositor->fbo_tx_id;
+	if (gl_tex_format) *gl_tex_format = compositor_3d_get_fbo_pixfmt();
+	//framebuffer is already oriented as a GL texture not as an image
+	if (texcoordmatrix)
+		gf_mx_add_scale(texcoordmatrix, FIX_ONE, -FIX_ONE, FIX_ONE);
+	return GF_OK;
+}
+#endif
+
+static void gf_sc_flush_video(GF_Compositor *compositor, Bool locked)
+{
+	GF_Window rc;
+
+	//release compositor in case we have vsync
+	if (locked) gf_sc_lock(compositor, 0);
+	rc.x = rc.y = 0;
+	rc.w = compositor->display_width;
+	rc.h = compositor->display_height;
+	compositor->video_out->Flush(compositor->video_out, &rc);
+	compositor->flush_pending = GF_FALSE;
+	if (locked) gf_sc_lock(compositor, 1);
+}
+
+void gf_sc_render_frame(GF_Compositor *compositor);
+
 GF_EXPORT
 Bool gf_sc_draw_frame(GF_Compositor *compositor, Bool no_flush, s32 *ms_till_next)
 {
 	Bool ret = GF_FALSE;
 
-	if (no_flush)
-		compositor->skip_flush=1;
+	gf_sc_ar_send_or_reconfig(compositor->audio_renderer);
+
+	//frame still pending
+	if (compositor->frame_ifce.user_data)
+		return GF_TRUE;
+
+	if (compositor->flush_pending) {
+		gf_sc_flush_video(compositor, GF_FALSE);
+	}
+	compositor->skip_flush = no_flush ? 1 : 0;
 
 	gf_sc_render_frame(compositor);
 
@@ -282,7 +350,7 @@
 	//next frame is late, we should redraw
 	if (compositor->ms_until_next_frame < 0) ret = GF_TRUE;
 	else if (compositor->frame_draw_type) ret = GF_TRUE;
-	else if (compositor->fonts_pending) ret = GF_TRUE;
+	else if (compositor->fonts_pending>0) ret = GF_TRUE;
 
 	return ret;
 }
@@ -306,56 +374,451 @@
 	compositor->current_frame = 0;
 }
 
-static Bool gf_sc_on_event(void *cbck, GF_Event *event);
 
-static Bool gf_sc_set_check_raster2d(GF_Compositor *compositor, GF_Raster2D *ifce)
+enum
 {
-	/*check base*/
-	if (!ifce->stencil_new || !ifce->surface_new) return 0;
-	/*if these are not set we cannot draw*/
-	if (!ifce->surface_clear || !ifce->surface_set_path || !ifce->surface_fill) return 0;
-	/*check we can init a surface with the current driver (the rest is optional)*/
-	if (ifce->surface_attach_to_buffer) return 1;
-	return GF_FALSE;
+	GF_COMPOSITOR_THREAD_START = 0,
+	GF_COMPOSITOR_THREAD_RUN,
+	GF_COMPOSITOR_THREAD_ABORTING,
+	GF_COMPOSITOR_THREAD_DONE,
+	GF_COMPOSITOR_THREAD_INIT_FAILED,
+};
+
+static GF_Err nullvout_setup(struct _video_out *vout, void *os_handle, void *os_display, u32 init_flags)
+{
+	return GF_OK;
+}
+static void nullvout_shutdown(struct _video_out *vout)
+{
+	return;
+}
+static GF_Err nullvout_flush(struct _video_out *vout, GF_Window *dest)
+{
+	return GF_OK;
+}
+static GF_Err nullvout_fullscreen(struct _video_out *vout, Bool fs_on, u32 *new_disp_width, u32 *new_disp_height)
+{
+	return GF_OK;
+}
+static GF_Err nullvout_evt(struct _video_out *vout, GF_Event *event)
+{
+	return GF_OK;
+}
+static GF_Err nullvout_lock(struct _video_out *vout, GF_VideoSurface *video_info, Bool do_lock)
+{
+	return GF_IO_ERR;
+}
+static GF_Err nullvout_blit(struct _video_out *vout, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+{
+	return GF_OK;
+}
+
+GF_VideoOutput null_vout = {
+	.Setup = nullvout_setup,
+	.Shutdown = nullvout_shutdown,
+	.Flush = nullvout_flush,
+	.SetFullScreen = nullvout_fullscreen,
+	.ProcessEvent = nullvout_evt,
+	.LockBackBuffer = nullvout_lock,
+	.Blit = nullvout_blit,
+	.hw_caps = GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_HAS_YUV_OVERLAY | GF_VIDEO_HW_HAS_STRETCH
+};
+
+static GF_Err gl_vout_evt(struct _video_out *vout, GF_Event *evt)
+{
+	GF_Compositor *compositor = (GF_Compositor *)vout->opaque;
+	if (!evt || (evt->type != GF_EVENT_VIDEO_SETUP)) return GF_OK;
+
+	if (!compositor->player && (compositor->passthrough_pfmt != GF_PIXEL_RGB)) {
+		u32 pfmt = compositor->dyn_filter_mode ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
+		compositor->passthrough_pfmt = pfmt;
+		compositor->opfmt = pfmt;
+		if (compositor->vout) {
+			u32 stride = compositor->output_width * ( (pfmt == GF_PIXEL_RGBA) ? 4 : 3 );
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt));
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
+		}
+	}
+
+	
+#ifndef GPAC_DISABLE_3D
+	return compositor_3d_setup_fbo(evt->setup.width, evt->setup.height, &compositor->fbo_id, &compositor->fbo_tx_id, &compositor->fbo_depth_id);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_VideoOutput gl_vout = {
+	.Setup = nullvout_setup,
+	.Shutdown = nullvout_shutdown,
+	.Flush = nullvout_flush,
+	.SetFullScreen = nullvout_fullscreen,
+	.ProcessEvent = gl_vout_evt,
+	.LockBackBuffer = NULL,
+	.Blit = NULL,
+	.hw_caps = GF_VIDEO_HW_OPENGL
+};
+
+static GF_Err rawvout_lock(struct _video_out *vout, GF_VideoSurface *vi, Bool do_lock)
+{
+	GF_Compositor *compositor = (GF_Compositor *)vout->opaque;
+
+	if (do_lock) {
+		u32 pfmt;
+		if (!vi) return GF_BAD_PARAM;
+		pfmt = compositor->opfmt;
+		if (!pfmt && compositor->passthrough_txh) pfmt = compositor->passthrough_txh->pixelformat;
+
+		if (!pfmt) {
+			pfmt = compositor->dyn_filter_mode ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
+		}
+
+		memset(vi, 0, sizeof(GF_VideoSurface));
+		vi->width = compositor->display_width;
+		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)
+				compositor->passthrough_pck = gf_filter_pck_new_clone(compositor->vout, compositor->passthrough_txh->stream->pck, &compositor->passthrough_data);
+
+			vi->video_buffer = compositor->passthrough_data;
+			vi->pitch_y = compositor->passthrough_txh->stride;
+		} else {
+			vi->video_buffer = compositor->framebuffer;
+		}
+		vi->pitch_x = gf_pixel_get_bytes_per_pixel(pfmt);
+		vi->pixel_format = pfmt;
+		compositor->passthrough_pfmt = pfmt;
+	}
+	return GF_OK;
+}
+
+static GF_Err rawvout_evt(struct _video_out *vout, GF_Event *evt)
+{
+	u32 pfmt, stride, stride_uv;
+	GF_Compositor *compositor = (GF_Compositor *)vout->opaque;
+	if (!evt || (evt->type != GF_EVENT_VIDEO_SETUP)) return GF_OK;
+
+	pfmt = compositor->opfmt;
+	if (!pfmt) {
+		pfmt = compositor->dyn_filter_mode ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
+	}
+
+	compositor->passthrough_pfmt = pfmt;
+	stride=0;
+	stride_uv = 0;
+	gf_pixel_get_size_info(pfmt, evt->setup.width, evt->setup.height, &compositor->framebuffer_size, &stride, &stride_uv, NULL, NULL);
+
+	if (compositor->vout) {
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_STRIDE_UV, stride_uv ? &PROP_UINT(stride_uv) : NULL);
+	}
+
+	if (compositor->framebuffer_size > compositor->framebuffer_alloc) {
+		compositor->framebuffer_alloc = compositor->framebuffer_size;
+		compositor->framebuffer = gf_realloc(compositor->framebuffer, sizeof(char)*compositor->framebuffer_size);
+	}
+	if (!compositor->framebuffer) return GF_OUT_OF_MEM;
+	memset(compositor->framebuffer, 0, sizeof(char)*compositor->framebuffer_size);
+
+#ifndef GPAC_DISABLE_3D
+	if (compositor->needs_offscreen_gl && (compositor->ogl != GF_SC_GLMODE_OFF))
+		return compositor_3d_setup_fbo(evt->setup.width, evt->setup.height, &compositor->fbo_id, &compositor->fbo_tx_id, &compositor->fbo_depth_id);
+#endif
+
+	evt->setup.use_opengl = GF_FALSE;
+	return GF_OK;
 }
 
-static GF_Err gf_sc_load(GF_Compositor *compositor)
+GF_VideoOutput raw_vout = {
+	.Setup = nullvout_setup,
+	.Shutdown = nullvout_shutdown,
+	.Flush = nullvout_flush,
+	.SetFullScreen = nullvout_fullscreen,
+	.ProcessEvent = rawvout_evt,
+	.LockBackBuffer = rawvout_lock,
+	.Blit = NULL,
+	.hw_caps = GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA
+};
+
+void gf_sc_setup_passthrough(GF_Compositor *compositor)
 {
+	u32 timescale;
+	Bool is_raw_out = GF_FALSE;
+	u32 update_pfmt = 0;
+	compositor->passthrough_inplace = GF_FALSE;
+
+	if (!compositor->passthrough_txh) {
+		compositor->passthrough_timescale = 0;
+		return;
+	}
+
+	timescale = gf_filter_pck_get_timescale(compositor->passthrough_txh->stream->pck);
+	if (compositor->passthrough_timescale != timescale) {
+
+		compositor->passthrough_timescale = timescale;
+		gf_filter_pid_copy_properties(compositor->vout, compositor->passthrough_txh->stream->odm->pid);
+		if  (compositor->video_out==&raw_vout) {
+			update_pfmt = compositor->opfmt ? compositor->opfmt :  compositor->passthrough_txh->pixelformat;
+		} else {
+			update_pfmt = GF_PIXEL_RGB;
+		}
+	}
+	if (compositor->video_out == &raw_vout) {
+		is_raw_out = GF_TRUE;
+		if (!compositor->opfmt || (compositor->opfmt == compositor->passthrough_txh->pixelformat) ) {
+			if (!compositor->passthrough_txh->frame_ifce) {
+				compositor->passthrough_inplace = GF_TRUE;
+				update_pfmt = GF_FALSE;
+			}
+			if (!compositor->opfmt && (compositor->passthrough_pfmt != compositor->passthrough_txh->pixelformat)) {
+				compositor->passthrough_pfmt = compositor->passthrough_txh->pixelformat;
+				gf_filter_pid_copy_properties(compositor->vout, compositor->passthrough_txh->stream->odm->pid);
+			}
+		}
+	}
+
+	if (update_pfmt) {
+		u32 stride=0, stride_uv=0, out_size=0;
+		gf_pixel_get_size_info(update_pfmt, compositor->display_width, compositor->display_width, &out_size, &stride, &stride_uv, NULL, NULL);
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_PIXFMT, &PROP_UINT(update_pfmt));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_STRIDE, &PROP_UINT(stride));
+		gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_STRIDE_UV, stride_uv ? &PROP_UINT(stride_uv) : NULL);
+
+		if (is_raw_out && !compositor->passthrough_inplace && (compositor->framebuffer_size != out_size) ) {
+			compositor->framebuffer_size = out_size;
+			if (out_size > compositor->framebuffer_alloc) {
+				compositor->framebuffer_alloc = out_size;
+				compositor->framebuffer = gf_realloc(compositor->framebuffer, out_size);
+			}
+		}
+	}
+}
+
+static GF_Err gf_sc_load_driver(GF_Compositor *compositor)
+{
+	GF_Err e;
+	const char *sOpt;
+	void *os_disp=NULL;
+
+	//filter mode
+	if (!compositor->player) {
+		compositor->video_out = &null_vout;
+
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			nullvout_setup(NULL, NULL, NULL, 0);
+			nullvout_fullscreen(NULL, GF_FALSE, NULL, NULL);
+			nullvout_evt(NULL, NULL);
+			nullvout_lock(NULL, NULL, GF_FALSE);
+			nullvout_blit(NULL, NULL, NULL, NULL, 0);
+		}
+#endif
+
+		e = gf_filter_request_opengl(compositor->filter);
+		if (e) return e;
+#ifndef GPAC_DISABLE_3D
+		gf_sc_load_opengl_extensions(compositor, GF_TRUE);
+		if (!compositor->gl_caps.fbo)
+#endif
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] No support for OpenGL framebuffer object, cannot run in GL mode.\n"));
+			compositor->drv = GF_SC_DRV_OFF;
+			return GF_NOT_SUPPORTED;
+		}
+		compositor->video_out = &gl_vout;
+		compositor->video_out->opaque = compositor;
+		return GF_OK;
+	}
+
+	//player mode
+#ifndef GPAC_DISABLE_3D
+	sOpt = gf_opts_get_key("core", "video-output");
+	if (sOpt && !strcmp(sOpt, "glfbo")) {
+		compositor->video_out = &gl_vout;
+		compositor->video_out->opaque = compositor;
+		sOpt = gf_opts_get_key("core", "glfbo-txid");
+		if (sOpt) {
+		 	compositor->fbo_tx_id = atoi(sOpt);
+		 	compositor->external_tx_id = GF_TRUE;
+		}
+		if (!compositor->fbo_tx_id) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] glfbo driver specified but no target texture ID found, cannot initialize\n"));
+			compositor->drv = GF_SC_DRV_OFF;
+			return GF_BAD_PARAM;
+		}
+		gf_sc_load_opengl_extensions(compositor, GF_TRUE);
+		if (!compositor->gl_caps.fbo) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] No support for OpenGL framebuffer object, cannot run in glfbo mode.\n"));
+			compositor->drv = GF_SC_DRV_OFF;
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+#endif
+
+	compositor->video_out = (GF_VideoOutput *) gf_module_load(GF_VIDEO_OUTPUT_INTERFACE, NULL);
+
+	if (!compositor->video_out ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] Failed to load a video output module.\n"));
+		return GF_IO_ERR;
+	}
+
+	sOpt = gf_opts_get_key("Temp", "OSDisp");
+	if (sOpt) sscanf(sOpt, "%p", &os_disp);
+
+	compositor->video_out->evt_cbk_hdl = compositor;
+	compositor->video_out->on_event = gf_sc_on_event;
+	/*init hw*/
+	e = compositor->video_out->Setup(compositor->video_out, compositor->os_wnd, os_disp, compositor->init_flags);
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] Error setuing up video output: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+	if (!gf_opts_get_key("core", "video-output")) {
+		gf_opts_set_key("core", "video-output", compositor->video_out->module_name);
+	}
+	gf_filter_register_opengl_provider(compositor->filter, GF_TRUE);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_3D
+static void gf_sc_check_video_driver(GF_Compositor *compositor)
+{
+	Bool force_gl_out = GF_FALSE;
+	if (compositor->player) return;
+	if (compositor->video_out == &null_vout) return;
+
+	if (compositor->visual->type_3d || compositor->hybrid_opengl) {
+		force_gl_out = GF_TRUE;
+	} else if (compositor->needs_offscreen_gl && (compositor->ogl!=GF_SC_GLMODE_OFF) ) {
+		force_gl_out = GF_TRUE;
+	}
+
+	if (force_gl_out) {
+		GF_Err e;
+		if (compositor->video_out != &raw_vout) return;
+		e = gf_sc_load_driver(compositor);
+		if (e) {
+			compositor->video_out = &raw_vout;
+			compositor->video_memory = 2;
+		}
+		return;
+	}
+
+	if (compositor->video_out == &raw_vout) {
+		if (compositor->needs_offscreen_gl) {
+			gf_filter_request_opengl(compositor->filter);
+		}
+		return;
+	}
+	compositor->video_out = &raw_vout;
+	compositor->video_memory = 2;
+}
+#endif
+
+GF_Err gf_sc_load(GF_Compositor *compositor)
+{
+	u32 i;
+	const char *sOpt;
+
+	compositor->mx = gf_mx_new("Compositor");
+	if (!compositor->mx) return GF_OUT_OF_MEM;
+
+	/*load proto modules*/
+	compositor->proto_modules = gf_list_new();
+	if (!compositor->proto_modules) return GF_OUT_OF_MEM;
+	for (i=0; i< gf_modules_count(); i++) {
+		GF_HardcodedProto *ifce = (GF_HardcodedProto *) gf_modules_load(i, GF_HARDCODED_PROTO_INTERFACE);
+		if (ifce) gf_list_add(compositor->proto_modules, ifce);
+	}
+
+	compositor->init_flags = 0;
+	compositor->os_wnd = NULL;
+	sOpt = gf_opts_get_key("Temp", "OSWnd");
+	if (sOpt) sscanf(sOpt, "%p", &compositor->os_wnd);
+	sOpt = gf_opts_get_key("Temp", "InitFlags");
+	if (sOpt) compositor->init_flags = atoi(sOpt);
+
+	if (compositor->noaudio)
+		compositor->init_flags |= GF_TERM_NO_AUDIO;
+
+	/*force initial for 2D/3D setup*/
+	compositor->msg_type |= GF_SR_CFG_INITIAL_RESIZE;
+	/*set default size if owning output*/
+	if (!compositor->os_wnd) {
+		compositor->new_width = compositor->osize.x>0 ? compositor->osize.x : SC_DEF_WIDTH;
+		compositor->new_height = compositor->osize.y>0 ? compositor->osize.y : SC_DEF_HEIGHT;
+		compositor->msg_type |= GF_SR_CFG_SET_SIZE;
+	}
+
+	if (!compositor->player)
+		compositor->init_flags = GF_TERM_INIT_HIDE;
+
+	if (gf_opts_get_bool("temp", "gpac-help")) {
+		compositor->init_flags |= GF_TERM_NO_VIDEO | GF_TERM_NO_AUDIO;
+	}
+
+	if (compositor->init_flags & GF_TERM_NO_VIDEO) {
+		compositor->video_out = &null_vout;
+		compositor->ogl = GF_SC_GLMODE_OFF;
+	} else if (compositor->player || (compositor->drv==GF_SC_DRV_ON)  || (compositor->ogl==GF_SC_GLMODE_HYBRID) ){
+		GF_Err e;
+
+		e = gf_sc_load_driver(compositor);
+		if (e) return e;
+	} else {
+		raw_vout.opaque = compositor;
+		compositor->video_out = &raw_vout;
+		compositor->video_memory = 2;
+	}
+
 	compositor->strike_bank = gf_list_new();
+	if (!compositor->strike_bank) return GF_OUT_OF_MEM;
 	compositor->visuals = gf_list_new();
+	if (!compositor->visuals) return GF_OUT_OF_MEM;
 
 	GF_SAFEALLOC(compositor->traverse_state, GF_TraverseState);
-	if (!compositor->traverse_state) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to initilaize compositor\n"));
-		return GF_OUT_OF_MEM;
-	}
+	if (!compositor->traverse_state) return GF_OUT_OF_MEM;
 
 	compositor->traverse_state->vrml_sensors = gf_list_new();
+	if (!compositor->traverse_state->vrml_sensors) return GF_OUT_OF_MEM;
 	compositor->traverse_state->use_stack = gf_list_new();
+	if (!compositor->traverse_state->use_stack) return GF_OUT_OF_MEM;
 #ifndef GPAC_DISABLE_3D
 	compositor->traverse_state->local_lights = gf_list_new();
+	if (!compositor->traverse_state->local_lights) return GF_OUT_OF_MEM;
 #endif
 	compositor->sensors = gf_list_new();
+	if (!compositor->sensors) return GF_OUT_OF_MEM;
 	compositor->previous_sensors = gf_list_new();
+	if (!compositor->previous_sensors) return GF_OUT_OF_MEM;
 	compositor->hit_use_stack = gf_list_new();
+	if (!compositor->hit_use_stack) return GF_OUT_OF_MEM;
 	compositor->prev_hit_use_stack = gf_list_new();
+	if (!compositor->prev_hit_use_stack) return GF_OUT_OF_MEM;
 	compositor->focus_ancestors = gf_list_new();
+	if (!compositor->focus_ancestors) return GF_OUT_OF_MEM;
 	compositor->focus_use_stack = gf_list_new();
+	if (!compositor->focus_use_stack) return GF_OUT_OF_MEM;
 
 	compositor->env_tests = gf_list_new();
+	if (!compositor->env_tests) return GF_OUT_OF_MEM;
 
 	/*setup main visual*/
 	compositor->visual = visual_new(compositor);
+	if (!compositor->visual) return GF_OUT_OF_MEM;
 	compositor->visual->GetSurfaceAccess = compositor_2d_get_video_access;
 	compositor->visual->ReleaseSurfaceAccess = compositor_2d_release_video_access;
 	compositor->visual->CheckAttached = compositor_2d_check_attached;
 	compositor->visual->ClearSurface = compositor_2d_clear_surface;
 
+	compositor_2d_init_callbacks(compositor);
+
 	if (compositor->video_out->FlushRectangles)
 		compositor->visual->direct_flush = GF_TRUE;
 
-	compositor_2d_init_callbacks(compositor);
-
 	// default value for depth gain is not zero
 #ifdef GF_SR_USE_DEPTH
 	compositor->traverse_state->depth_gain = FIX_ONE;
@@ -367,8 +830,10 @@
 
 	/*create a drawable for focus highlight*/
 	compositor->focus_highlight = drawable_new();
+	if (!compositor->focus_highlight) return GF_OUT_OF_MEM;
 	/*associate a dummy node for traversing*/
 	compositor->focus_highlight->node = gf_node_new(NULL, TAG_UndefinedNode);
+	if (!compositor->focus_highlight->node) return GF_OUT_OF_MEM;
 	gf_node_register(compositor->focus_highlight->node, NULL);
 	gf_node_set_callback_function(compositor->focus_highlight->node, drawable_traverse_focus);
 
@@ -377,149 +842,84 @@
 	/*default collision mode*/
 	compositor->collide_mode = GF_COLLISION_DISPLACEMENT; //GF_COLLISION_NORMAL
 	compositor->gravity_on = GF_TRUE;
-	
+
 	/*create default unit sphere and box for bounds*/
 	compositor->unit_bbox = new_mesh();
+	if (!compositor->unit_bbox) return GF_OUT_OF_MEM;
 	mesh_new_unit_bbox(compositor->unit_bbox);
 	gf_mx_init(compositor->traverse_state->model_matrix);
 #endif
 
 	compositor->was_system_memory=1;
-	return GF_OK;
-}
-
-
-static GF_Err gf_sc_create(GF_Compositor *compositor)
-{
-	const char *sOpt;
-
-	/*load video out*/
-	sOpt = gf_cfg_get_key(compositor->user->config, "Video", "DriverName");
-	if (sOpt) {
-		compositor->video_out = (GF_VideoOutput *) gf_modules_load_interface_by_name(compositor->user->modules, sOpt, GF_VIDEO_OUTPUT_INTERFACE);
-		if (compositor->video_out) {
-			compositor->video_out->evt_cbk_hdl = compositor;
-			compositor->video_out->on_event = gf_sc_on_event;
-			/*init hw*/
-			if (!compositor->video_out->Setup || compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags) != GF_OK) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Failed to Setup Video Driver %s!\n", sOpt));
-				gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
-				compositor->video_out = NULL;
-			}
-		}
-	}
-
-	if (!compositor->video_out) {
-		GF_VideoOutput *raw_out = NULL;
-		u32 i, count = gf_modules_get_count(compositor->user->modules);
-		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Trying to find a suitable video driver amongst %d modules...\n", count));
-		for (i=0; i<count; i++) {
-			compositor->video_out = (GF_VideoOutput *) gf_modules_load_interface(compositor->user->modules, i, GF_VIDEO_OUTPUT_INTERFACE);
-			if (!compositor->video_out) continue;
-			compositor->video_out->evt_cbk_hdl = compositor;
-			compositor->video_out->on_event = gf_sc_on_event;
-			//in enum mode, only use raw out if everything else failed ...
-			if (!stricmp(compositor->video_out->module_name, "Raw Video Output")) {
-				raw_out = compositor->video_out;
-				compositor->video_out = NULL;
-				continue;
-			}
-
-			/*init hw*/
-			if (compositor->video_out->Setup && compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags)==GF_OK) {
-				gf_cfg_set_key(compositor->user->config, "Video", "DriverName", compositor->video_out->module_name);
-				break;
-			}
-			gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
-			compositor->video_out = NULL;
-		}
-		if (raw_out) {
-			if (compositor->video_out) gf_modules_close_interface((GF_BaseInterface *)raw_out);
-			else {
-				compositor->video_out = raw_out;
-				compositor->video_out ->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags);
-			}
-		}
-	}
-	if (!compositor->video_out ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to create compositor->video_out, did not find any suitable driver.\n"));
-		return GF_IO_ERR;
-	}
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Video", "DPI");
-	if (sOpt) {
-		compositor->video_out->dpi_x = compositor->video_out->dpi_y = atoi(sOpt);
-	}
-
-	/*try to load a raster driver*/
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "Raster2D");
-	if (sOpt) {
-		compositor->rasterizer = (GF_Raster2D *) gf_modules_load_interface_by_name(compositor->user->modules, sOpt, GF_RASTER_2D_INTERFACE);
-		if (!compositor->rasterizer) {
-			sOpt = NULL;
-		} else if (!gf_sc_set_check_raster2d(compositor, compositor->rasterizer)) {
-			gf_modules_close_interface((GF_BaseInterface *)compositor->rasterizer);
-			compositor->rasterizer = NULL;
-			sOpt = NULL;
-		}
-	}
-	if (!compositor->rasterizer) {
-		u32 i, count;
-		count = gf_modules_get_count(compositor->user->modules);
-		for (i=0; i<count; i++) {
-			compositor->rasterizer = (GF_Raster2D *) gf_modules_load_interface(compositor->user->modules, i, GF_RASTER_2D_INTERFACE);
-			if (!compositor->rasterizer) continue;
-			if (gf_sc_set_check_raster2d(compositor, compositor->rasterizer)) break;
-			gf_modules_close_interface((GF_BaseInterface *)compositor->rasterizer);
-			compositor->rasterizer = NULL;
-		}
-		if (compositor->rasterizer) gf_cfg_set_key(compositor->user->config, "Compositor", "Raster2D", compositor->rasterizer->module_name);
-	}
-	if (!compositor->rasterizer) {
-		if (compositor->video_out->Shutdown) compositor->video_out->Shutdown(compositor->video_out);
-		gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
-		compositor->video_out = NULL;
-		return GF_IO_ERR;
-	}
-
-	/*and init*/
-	if (gf_sc_load(compositor) != GF_OK) {
-		gf_modules_close_interface((GF_BaseInterface *)compositor->rasterizer);
-		compositor->rasterizer = NULL;
-		compositor->video_out->Shutdown(compositor->video_out);
-		gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
-		compositor->video_out = NULL;
-		return GF_IO_ERR;
-	}
 
+	compositor->systems_pids = gf_list_new();
+	if (!compositor->systems_pids) return GF_OUT_OF_MEM;
 	compositor->textures = gf_list_new();
+	if (!compositor->textures) return GF_OUT_OF_MEM;
 	compositor->textures_gc = gf_list_new();
-	compositor->frame_rate = 30.0;
-	compositor->frame_duration = 33;
+	if (!compositor->textures_gc) return GF_OUT_OF_MEM;
+	if (!compositor->fps.num || !compositor->fps.den) {
+		compositor->fps.num = 30;
+		compositor->fps.den = 1;
+	}
+	compositor->frame_duration = compositor->fps.num * 1000;
+	compositor->frame_duration /= compositor->fps.den;
+
 	compositor->time_nodes = gf_list_new();
+	if (!compositor->time_nodes) return GF_OUT_OF_MEM;
 	compositor->event_queue = gf_list_new();
+	if (!compositor->event_queue) return GF_OUT_OF_MEM;
 	compositor->event_queue_back = gf_list_new();
+	if (!compositor->event_queue_back) return GF_OUT_OF_MEM;
 	compositor->evq_mx = gf_mx_new("EventQueue");
+	if (!compositor->evq_mx) return GF_OUT_OF_MEM;
 
 #ifdef GF_SR_USE_VIDEO_CACHE
 	compositor->cached_groups = gf_list_new();
+	if (!compositor->cached_groups) return GF_OUT_OF_MEM;
 	compositor->cached_groups_queue = gf_list_new();
+	if (!compositor->cached_groups_queue) return GF_OUT_OF_MEM;
 #endif
 
 	/*load audio renderer*/
 	if (!compositor->audio_renderer)
-		compositor->audio_renderer = gf_sc_ar_load(compositor->user);
+		compositor->audio_renderer = gf_sc_ar_load(compositor, compositor->init_flags);
 
 	gf_sc_reset_framerate(compositor);
-	compositor->font_manager = gf_font_manager_new(compositor->user);
+	compositor->font_manager = gf_filter_get_font_manager(compositor->filter);
+	if (!compositor->font_manager) return GF_OUT_OF_MEM;
 
 	compositor->extra_scenes = gf_list_new();
+	if (!compositor->extra_scenes) return GF_OUT_OF_MEM;
 	compositor->interaction_level = GF_INTERACT_NORMAL | GF_INTERACT_INPUT_SENSOR | GF_INTERACT_NAVIGATION;
 
 	compositor->scene_sampled_clock = 0;
 	compositor->video_th_id = gf_th_id();
 
-	gf_sc_set_option(compositor, GF_OPT_RELOAD_CONFIG, 1);
+	/*load extensions*/
+	compositor->extensions = gf_list_new();
+	if (!compositor->extensions) return GF_OUT_OF_MEM;
+	compositor->unthreaded_extensions = gf_list_new();
+	if (!compositor->unthreaded_extensions) return GF_OUT_OF_MEM;
+	for (i=0; i< gf_modules_count(); i++) {
+		GF_CompositorExt *ifce = (GF_CompositorExt *) gf_modules_load(i, GF_COMPOSITOR_EXT_INTERFACE);
+		if (ifce) {
+
+			if (!ifce->process(ifce, GF_COMPOSITOR_EXT_START, compositor)) {
+				gf_modules_close_interface((GF_BaseInterface *) ifce);
+				continue;
+			}
+			gf_list_add(compositor->extensions, ifce);
+			if (ifce->caps & GF_COMPOSITOR_EXTENSION_NOT_THREADED)
+				gf_list_add(compositor->unthreaded_extensions, ifce);
+		}
+	}
+
+	if (!gf_list_count(compositor->unthreaded_extensions)) {
+		gf_list_del(compositor->unthreaded_extensions);
+		compositor->unthreaded_extensions = NULL;
+	}
+
 	compositor->display_width = 320;
 	compositor->display_height = 240;
 	compositor->recompute_ar = GF_TRUE;
@@ -532,151 +932,26 @@
 	gf_sc_load_opengl_extensions(compositor, GF_FALSE);
 #endif
 
-	return GF_OK;
-}
+	gf_sc_reload_config(compositor);
 
-enum
-{
-	GF_COMPOSITOR_THREAD_START = 0,
-	GF_COMPOSITOR_THREAD_RUN,
-	GF_COMPOSITOR_THREAD_ABORTING,
-	GF_COMPOSITOR_THREAD_DONE,
-	GF_COMPOSITOR_THREAD_INIT_FAILED,
-};
-
-static u32 gf_sc_proc(void *par)
-{
-	GF_Err e;
-	GF_Compositor *compositor = (GF_Compositor *) par;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Compositor] Entering thread ID %d\n", gf_th_id() ));
-
-	compositor->video_th_state = GF_COMPOSITOR_THREAD_START;
-	e = gf_sc_create(compositor);
-	if (e != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Compositor] Failed to initialize compositor: %s\n", gf_error_to_string(e) ));
-		compositor->video_th_state = GF_COMPOSITOR_THREAD_INIT_FAILED;
-		return 1;
-	}
-
-	compositor->video_th_state = GF_COMPOSITOR_THREAD_RUN;
-	while (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
-		//simulation tick is self-regulating. Call it regardless of the visibility status
-		gf_sc_render_frame(compositor);
-	}
-
-#ifndef GPAC_DISABLE_3D
-	visual_3d_reset_graphics(compositor->visual);
-	compositor_2d_reset_gl_auto(compositor);
-#endif
-	gf_sc_texture_cleanup_hw(compositor);
-
-
-	/*destroy video out here if we're using openGL, to avoid threading issues*/
-	compositor->video_out->Shutdown(compositor->video_out);
-	gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
-	compositor->video_out = NULL;
-	compositor->video_th_state = GF_COMPOSITOR_THREAD_DONE;
-	return 0;
-}
-
-GF_EXPORT
-GF_Compositor *gf_sc_new(GF_User *user, Bool self_threaded, GF_Terminal *term)
-{
-	GF_Err e;
-	GF_Compositor *tmp;
-
-	GF_SAFEALLOC(tmp, GF_Compositor);
-	if (!tmp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to allocate compositor : OUT OF MEMORY!\n"));
-		return NULL;
-	}
-	tmp->user = user;
-	tmp->term = term;
-	tmp->mx = gf_mx_new("Compositor");
-
-	/*load proto modules*/
-	if (user) {
-		u32 i;
-		tmp->proto_modules = gf_list_new();
-		for (i=0; i< gf_modules_get_count(user->modules); i++) {
-			GF_HardcodedProto *ifce = (GF_HardcodedProto *) gf_modules_load_interface(user->modules, i, GF_HARDCODED_PROTO_INTERFACE);
-			if (ifce) gf_list_add(tmp->proto_modules, ifce);
-		}
-	}
-
-	/*force initial for 2D/3D setup*/
-	tmp->msg_type |= GF_SR_CFG_INITIAL_RESIZE;
-	/*set default size if owning output*/
-	if (tmp->user && !tmp->user->os_window_handler) {
-		const char *opt;
-		tmp->new_width = SC_DEF_WIDTH;
-		tmp->new_height = SC_DEF_HEIGHT;
-		opt = gf_cfg_get_key(user->config, "Compositor", "DefaultWidth");
-		if (opt) tmp->new_width = atoi(opt);
-		opt = gf_cfg_get_key(user->config, "Compositor", "DefaultHeight");
-		if (opt) tmp->new_height = atoi(opt);
-
-		tmp->msg_type |= GF_SR_CFG_SET_SIZE;
-	}
-
-
-	if (self_threaded) {
-
-		tmp->VisualThread = gf_th_new("Compositor");
-		gf_th_run(tmp->VisualThread, gf_sc_proc, tmp);
-
-		/*wait until init is done*/
-		while (tmp->video_th_state < GF_COMPOSITOR_THREAD_RUN) {
-			gf_sleep(1);
-		}
-		/*init failure*/
-		if (tmp->video_th_state == GF_COMPOSITOR_THREAD_INIT_FAILED) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("GF_COMPOSITOR_THREAD_INIT_FAILED : Deleting compositor.\n"));
-			gf_sc_del(tmp);
-			return NULL;
-		}
-	} else {
-		e = gf_sc_create(tmp);
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error while calling gf_sc_create() : %s, deleting compositor.\n", gf_error_to_string(e)));
-			gf_sc_del(tmp);
-			return NULL;
-		}
-	}
 
-	if ((tmp->user->init_flags & GF_TERM_NO_REGULATION) || !tmp->VisualThread)
-		tmp->no_regulation = GF_TRUE;
-	
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI]\tCompositor Cycle Log\tNetworks\tDecoders\tFrame\tDirect Draw\tVisual Config\tEvent\tRoute\tSMIL Timing\tTime node\tTexture\tSMIL Anim\tTraverse setup\tTraverse (and direct Draw)\tTraverse (and direct Draw) without anim\tIndirect Draw\tTraverse And Draw (Indirect or Not)\tFlush\tCycle\n"));
-	return tmp;
+	return GF_OK;
 }
 
-GF_EXPORT
-void gf_sc_del(GF_Compositor *compositor)
+void gf_sc_unload(GF_Compositor *compositor)
 {
+	u32 i;
 	if (!compositor) return;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroying\n"));
 	compositor->discard_input_events = GF_TRUE;
 	gf_sc_lock(compositor, GF_TRUE);
 
-	if (compositor->VisualThread) {
-		if (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
-			compositor->video_th_state = GF_COMPOSITOR_THREAD_ABORTING;
-			while (compositor->video_th_state != GF_COMPOSITOR_THREAD_DONE) {
-				gf_sc_lock(compositor, GF_FALSE);
-				gf_sleep(1);
-				gf_sc_lock(compositor, GF_TRUE);
-			}
-		}
-		gf_th_del(compositor->VisualThread);
-	} else {
 #ifndef GPAC_DISABLE_3D
-		compositor_2d_reset_gl_auto(compositor);
+	compositor_2d_reset_gl_auto(compositor);
 #endif
-		gf_sc_texture_cleanup_hw(compositor);
-	}
+	gf_sc_texture_cleanup_hw(compositor);
 
 	if (compositor->video_out) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Closing video output\n"));
@@ -702,6 +977,7 @@
 	if (compositor->focus_ancestors) gf_list_del(compositor->focus_ancestors);
 	if (compositor->focus_use_stack) gf_list_del(compositor->focus_use_stack);
 	if (compositor->env_tests) gf_list_del(compositor->env_tests);
+	if (compositor->systems_pids) gf_list_del(compositor->systems_pids);
 
 	if (compositor->traverse_state) {
 		gf_list_del(compositor->traverse_state->vrml_sensors);
@@ -716,7 +992,9 @@
 	if (compositor->unit_bbox) mesh_free(compositor->unit_bbox);
 
 	if (compositor->screen_buffer) gf_free(compositor->screen_buffer);
+	if (compositor->line_buffer) gf_free(compositor->line_buffer);
 #endif
+	if (compositor->framebuffer) gf_free(compositor->framebuffer);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Unloading visual compositor module\n"));
 
@@ -725,7 +1003,6 @@
 
 	/*unload proto modules*/
 	if (compositor->proto_modules) {
-		u32 i;
 		for (i=0; i< gf_list_count(compositor->proto_modules); i++) {
 			GF_HardcodedProto *ifce = gf_list_get(compositor->proto_modules, i);
 			gf_modules_close_interface((GF_BaseInterface *) ifce);
@@ -743,13 +1020,13 @@
 		gf_list_rem(compositor->event_queue, 0);
 		gf_free(qev);
 	}
-	if (compositor->evq_mx) gf_mx_v(compositor->evq_mx);
-	if (compositor->evq_mx) gf_mx_del(compositor->evq_mx);
+	if (compositor->evq_mx) {
+		gf_mx_v(compositor->evq_mx);
+		gf_mx_del(compositor->evq_mx);
+	}
 	gf_list_del(compositor->event_queue);
 	gf_list_del(compositor->event_queue_back);
 
-	if (compositor->font_manager) gf_font_manager_del(compositor->font_manager);
-
 #ifdef GF_SR_USE_VIDEO_CACHE
 	gf_list_del(compositor->cached_groups);
 	gf_list_del(compositor->cached_groups_queue);
@@ -759,30 +1036,50 @@
 	if (compositor->textures_gc) gf_list_del(compositor->textures_gc);
 	if (compositor->time_nodes) gf_list_del(compositor->time_nodes);
 	if (compositor->extra_scenes) gf_list_del(compositor->extra_scenes);
-	if (compositor->video_listeners) gf_list_del(compositor->video_listeners);
+	if (compositor->input_streams) gf_list_del(compositor->input_streams);
+	if (compositor->x3d_sensors) gf_list_del(compositor->x3d_sensors);
+
+
+	/*unload extensions*/
+	for (i=0; i< gf_list_count(compositor->extensions); i++) {
+		GF_CompositorExt *ifce = gf_list_get(compositor->extensions, i);
+		ifce->process(ifce, GF_COMPOSITOR_EXT_STOP, NULL);
+	}
+
+	/*remove all event filters*/
+//	gf_list_reset(term->event_filters);
+
+	/*unload extensions*/
+	for (i=0; i< gf_list_count(compositor->extensions); i++) {
+		GF_CompositorExt *ifce = gf_list_get(compositor->extensions, i);
+		gf_modules_close_interface((GF_BaseInterface *) ifce);
+	}
+	gf_list_del(compositor->extensions);
+	gf_list_del(compositor->unthreaded_extensions);
 
 	gf_sc_lock(compositor, GF_FALSE);
 	gf_mx_del(compositor->mx);
-	gf_free(compositor);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Destroyed\n"));
 }
 
-GF_EXPORT
-void gf_sc_set_fps(GF_Compositor *compositor, Double fps)
+void gf_sc_set_fps(GF_Compositor *compositor, GF_Fraction fps)
 {
-	if (fps) {
-		compositor->frame_rate = fps;
-		compositor->frame_duration = (u32) (1000 / fps);
+	if (fps.den) {
+		u64 dur;
+		compositor->fps = fps;
+		dur = fps.den;
+		dur *= 1000;
+		dur /= fps.num;
+
+		compositor->frame_duration = (u32) dur;
 		gf_sc_reset_framerate(compositor);
-	}
-}
 
-u32 gf_sc_get_audio_buffer_length(GF_Compositor *compositor)
-{
-	if (!compositor || !compositor->audio_renderer || !compositor->audio_renderer->audio_out) return 0;
-	return compositor->audio_renderer->audio_out->GetTotalBufferTime(compositor->audio_renderer->audio_out);
-}
+		if (compositor->vout && !compositor->timescale) {
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_TIMESCALE, &PROP_UINT(fps.num) );
 
+		}
+	}
+}
 
 static void gf_sc_set_play_state(GF_Compositor *compositor, u32 PlayState)
 {
@@ -793,7 +1090,6 @@
 	/*step mode*/
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		compositor->step_mode = GF_TRUE;
-		gf_sc_flush_next_audio(compositor);
 		compositor->paused = 1;
 	} else {
 		compositor->step_mode = GF_FALSE;
@@ -805,7 +1101,7 @@
 GF_EXPORT
 u32 gf_sc_get_clock(GF_Compositor *compositor)
 {
-	if (!compositor->bench_mode) {
+	if (!compositor->bench_mode && compositor->player) {
 		return gf_sc_ar_get_clock(compositor->audio_renderer);
 	}
 	return compositor->scene_sampled_clock;
@@ -833,13 +1129,6 @@
 	return GF_OK;
 }
 
-Bool gf_sc_get_size(GF_Compositor *compositor, u32 *Width, u32 *Height)
-{
-	*Height = compositor->scene_height;
-	*Width = compositor->scene_width;
-	return 1;
-}
-
 #ifndef GPAC_DISABLE_SVG
 GF_EXPORT
 Fixed gf_sc_svg_convert_length_to_display(GF_Compositor *compositor, SVG_Length *length)
@@ -891,10 +1180,14 @@
 
 static void gf_sc_reset(GF_Compositor *compositor, Bool has_scene)
 {
-	Bool draw_mode;
-
+	Bool mode2d;
 	GF_VisualManager *visual;
 	u32 i=0;
+
+	//init failed
+	if (!compositor->traverse_state)
+		return;
+
 	while ((visual = (GF_VisualManager *)gf_list_enum(compositor->visuals, &i))) {
 		/*reset display list*/
 		visual->cur_context = visual->context;
@@ -908,7 +1201,7 @@
 		visual->to_redraw.count = 0;
 
 		/*reset the surface as well*/
-		if (visual->raster_surface) compositor->rasterizer->surface_delete(visual->raster_surface);
+		if (visual->raster_surface) gf_evg_surface_delete(visual->raster_surface);
 		visual->raster_surface = NULL;
 	}
 
@@ -916,24 +1209,26 @@
 	gf_list_reset(compositor->previous_sensors);
 
 	/*reset traverse state*/
-	draw_mode = compositor->traverse_state->immediate_draw;
+	mode2d = compositor->traverse_state->immediate_draw;
 	gf_list_del(compositor->traverse_state->vrml_sensors);
 	gf_list_del(compositor->traverse_state->use_stack);
 #ifndef GPAC_DISABLE_3D
 	gf_list_del(compositor->traverse_state->local_lights);
+
+	compositor_3d_delete_fbo(&compositor->fbo_id, &compositor->fbo_tx_id, &compositor->fbo_depth_id, compositor->external_tx_id);
 #endif
-	
+
 	memset(compositor->traverse_state, 0, sizeof(GF_TraverseState));
-	
+
 	compositor->traverse_state->vrml_sensors = gf_list_new();
 	compositor->traverse_state->use_stack = gf_list_new();
 #ifndef GPAC_DISABLE_3D
 	compositor->traverse_state->local_lights = gf_list_new();
 #endif
-	
+
 	gf_mx2d_init(compositor->traverse_state->transform);
 	gf_cmx_init(&compositor->traverse_state->color_mat);
-	compositor->traverse_state->immediate_draw = draw_mode;
+	compositor->traverse_state->immediate_draw = mode2d;
 
 #ifdef GF_SR_USE_DEPTH
 	compositor->traverse_state->depth_gain = FIX_ONE;
@@ -957,7 +1252,8 @@
 	compositor->focus_node = NULL;
 	compositor->focus_text_type = 0;
 	compositor->frame_number = 0;
-	compositor->video_memory = compositor->was_system_memory ? 0 : 1;
+	if (compositor->video_memory!=2)
+		compositor->video_memory = compositor->was_system_memory ? 0 : 1;
 	compositor->rotation = 0;
 
 	gf_list_reset(compositor->focus_ancestors);
@@ -1010,6 +1306,7 @@
 	compositor->scene = scene_graph;
 	do_notif = GF_FALSE;
 	if (scene_graph) {
+		GF_Scene *scene_ctx = gf_sg_get_private(scene_graph);
 #ifndef GPAC_DISABLE_SVG
 		SVG_Length *w, *h;
 		SVG_ViewBox *vb;
@@ -1017,23 +1314,28 @@
 		u32 tag;
 		GF_Node *top_node;
 #endif
-		const char *opt;
 		Bool had_size_info = compositor->has_size_info;
+
+		compositor->timed_nodes_valid = GF_TRUE;
+		if (scene_ctx && scene_ctx->is_dynamic_scene)
+			compositor->timed_nodes_valid = GF_FALSE;
+
 		/*get pixel size if any*/
 		gf_sg_get_scene_size_info(compositor->scene, &width, &height);
 		compositor->has_size_info = (width && height) ? 1 : 0;
 		if (compositor->has_size_info != had_size_info) compositor->scene_width = compositor->scene_height = 0;
 
-		compositor->video_memory = gf_scene_is_dynamic_scene(scene_graph);
+		if (compositor->video_memory!=2)
+			compositor->video_memory = gf_scene_is_dynamic_scene(scene_graph);
 
 #ifndef GPAC_DISABLE_3D
 		compositor->visual->camera.world_bbox.is_set = 0;
 #endif
 
 		/*default back color is black*/
-		if (! (compositor->user->init_flags & GF_TERM_WINDOWLESS)) {
-			if (compositor->default_back_color) {
-				compositor->back_color = compositor->default_back_color;
+		if (! (compositor->init_flags & GF_TERM_WINDOWLESS)) {
+			if (compositor->bc) {
+				compositor->back_color = compositor->bc;
 			} else {
 				compositor->back_color = 0xFF000000;
 			}
@@ -1057,7 +1359,7 @@
 				vb = info.far_ptr;
 		}
 		/*default back color is white*/
-		if (is_svg && ! (compositor->user->init_flags & GF_TERM_WINDOWLESS)) compositor->back_color = 0xFFFFFFFF;
+		if (is_svg && ! (compositor->init_flags & GF_TERM_WINDOWLESS)) compositor->back_color = 0xFFFFFFFF;
 
 		/*hack for SVG where size is set in % - negotiate a canvas size*/
 		if (!compositor->has_size_info && w && h && vb) {
@@ -1091,13 +1393,8 @@
 		}
 
 		/*default back color is key color*/
-		if (compositor->user->init_flags & GF_TERM_WINDOWLESS) {
-			opt = gf_cfg_get_key(compositor->user->config, "Compositor", "ColorKey");
-			if (opt) {
-				u32 r, g, b, a;
-				sscanf(opt, "%02X%02X%02X%02X", &a, &r, &g, &b);
-				compositor->back_color = GF_COL_ARGB(0xFF, r, g, b);
-			}
+		if (compositor->init_flags & GF_TERM_WINDOWLESS) {
+			if (compositor->ckey) compositor->back_color = compositor->ckey;
 		}
 
 		/*set scene size only if different, otherwise keep scaling/FS*/
@@ -1109,12 +1406,7 @@
 			width = compositor->scene_width;
 			height = compositor->scene_height;
 
-			opt = gf_cfg_get_key(compositor->user->config, "Compositor", "ScreenWidth");
-			if (opt) width = atoi(opt);
-			opt = gf_cfg_get_key(compositor->user->config, "Compositor", "ScreenHeight");
-			if (opt) height = atoi(opt);
-
-			if (!compositor->user->os_window_handler) {
+			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))
@@ -1125,6 +1417,9 @@
 				gf_sc_set_size(compositor,width, height);
 			}
 		}
+	} else {
+		gf_sc_ar_reset(compositor->audio_renderer);
+		compositor->needs_offscreen_gl = GF_FALSE;
 	}
 
 	gf_sc_reset_framerate(compositor);
@@ -1144,18 +1439,11 @@
 		evt.type = GF_EVENT_SCENE_SIZE;
 		evt.size.width = width;
 		evt.size.height = height;
-		gf_term_send_event(compositor->term, &evt);
+		gf_sc_send_event(compositor, &evt);
 	}
 	return GF_OK;
 }
 
-void gf_sc_lock_audio(GF_Compositor *compositor, Bool doLock)
-{
-	if (compositor->audio_renderer) {
-		gf_mixer_lock(compositor->audio_renderer->mixer, doLock);
-	}
-}
-
 GF_EXPORT
 void gf_sc_lock(GF_Compositor *compositor, Bool doLock)
 {
@@ -1173,6 +1461,10 @@
 	Bool lock_ok;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("sc_set_size %dx%d\n", NewWidth, NewHeight));
+	if (compositor->osize.x && compositor->osize.y) {
+		NewWidth = compositor->osize.x;
+		NewHeight = compositor->osize.y;
+	}
 
 	if ((compositor->display_width == NewWidth) && (compositor->display_height == NewHeight))
 		return GF_OK;
@@ -1205,7 +1497,7 @@
 		evt.type = GF_EVENT_SCENE_SIZE;
 		evt.size.width = NewWidth;
 		evt.size.height = NewHeight;
-		gf_term_send_event(compositor->term, &evt);
+		gf_sc_send_event(compositor, &evt);
 	}
 
 	return GF_OK;
@@ -1214,265 +1506,60 @@
 GF_EXPORT
 void gf_sc_reload_config(GF_Compositor *compositor)
 {
-	const char *sOpt;
-
-
 	/*changing drivers needs exclusive access*/
 	gf_sc_lock(compositor, 1);
 
+	gf_sc_set_fps(compositor, compositor->fps);
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FrameRate");
-	if (!sOpt) {
-		sOpt = "30.0";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "FrameRate", "30.0");
-	}
-	gf_sc_set_fps(compositor, atof(sOpt));
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ForceSceneSize");
-	if (sOpt && ! stricmp(sOpt, "yes")) {
-		compositor->override_size_flags = 1;
-	} else {
-		compositor->override_size_flags = 0;
-	}
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "AntiAlias");
-	if (sOpt) {
-		if (! stricmp(sOpt, "None")) gf_sc_set_option(compositor, GF_OPT_ANTIALIAS, GF_ANTIALIAS_NONE);
-		else if (! stricmp(sOpt, "Text")) gf_sc_set_option(compositor, GF_OPT_ANTIALIAS, GF_ANTIALIAS_TEXT);
-		else gf_sc_set_option(compositor, GF_OPT_ANTIALIAS, GF_ANTIALIAS_FULL);
-	} else {
-		gf_cfg_set_key(compositor->user->config, "Compositor", "AntiAlias", "All");
-		gf_sc_set_option(compositor, GF_OPT_ANTIALIAS, GF_ANTIALIAS_FULL);
-	}
-
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FocusHighlightFill");
-	if (sOpt) sscanf(sOpt, "%x", &compositor->highlight_fill);
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FocusHighlightStroke");
-	if (sOpt) sscanf(sOpt, "%x", &compositor->highlight_stroke);
-	else compositor->highlight_stroke = 0xFF000000;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FocusHighlightStrokeWidth");
-	if (sOpt) {
-		Float v;
-		sscanf(sOpt, "%f", &v);
-		compositor->highlight_stroke_width = FLT2FIX(v);
-	}
-	else compositor->highlight_stroke_width = FIX_ONE;
-
-
-	compositor->text_sel_color = 0xFFAAAAFF;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TextSelectHighlight");
-	if (sOpt) sscanf(sOpt, "%x", &compositor->text_sel_color);
-	if (!compositor->text_sel_color) compositor->text_sel_color = 0xFFAAAAFF;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ScalableZoom");
-	compositor->scalable_zoom = (!sOpt || !stricmp(sOpt, "yes") ) ? 1 : 0;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableYUV");
-	compositor->enable_yuv_hw = (sOpt && !stricmp(sOpt, "yes") ) ? 0 : 1;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisablePartialHardwareBlit");
-	compositor->disable_partial_hw_blit = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "StressMode");
-	gf_sc_set_option(compositor, GF_OPT_STRESS_MODE, (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "HighSpeed");
-	gf_sc_set_option(compositor, GF_OPT_HIGHSPEED, (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0);
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "BoundingVolume");
-	if (sOpt) {
-		if (! stricmp(sOpt, "Box")) gf_sc_set_option(compositor, GF_OPT_DRAW_BOUNDS, GF_BOUNDS_BOX);
-		else if (! stricmp(sOpt, "AABB")) gf_sc_set_option(compositor, GF_OPT_DRAW_BOUNDS, GF_BOUNDS_AABB);
-		else gf_sc_set_option(compositor, GF_OPT_DRAW_BOUNDS, GF_BOUNDS_NONE);
-	} else {
-		gf_cfg_set_key(compositor->user->config, "Compositor", "BoundingVolume", "None");
-		gf_sc_set_option(compositor, GF_OPT_DRAW_BOUNDS, GF_BOUNDS_NONE);
-	}
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TextureTextMode");
-	if (sOpt && !stricmp(sOpt, "Always")) compositor->texture_text_mode = GF_TEXTURE_TEXT_ALWAYS;
-	else if (sOpt && !stricmp(sOpt, "Never")) compositor->texture_text_mode = GF_TEXTURE_TEXT_NEVER;
-	else compositor->texture_text_mode = GF_TEXTURE_TEXT_DEFAULT;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "Output8bit");
-	if (!sOpt) {
-		sOpt = (compositor->video_out->max_screen_bpp > 8) ? "no" : "yes";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "Output8bit", sOpt);
-	}
-	if (compositor->video_out->max_screen_bpp <= 8) {
-		if (sOpt && !strcmp(sOpt, "yes")) compositor->output_as_8bit = GF_TRUE;
-	} else if (sOpt && !strcmp(sOpt, "forced")) {
-		compositor->output_as_8bit = GF_TRUE;
-	}
-
-	if (compositor->audio_renderer) {
-		sOpt = gf_cfg_get_key(compositor->user->config, "Audio", "NoResync");
-		compositor->audio_renderer->disable_resync = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-
-		sOpt = gf_cfg_get_key(compositor->user->config, "Audio", "DisableMultiChannel");
-		compositor->audio_renderer->disable_multichannel = (sOpt && !stricmp(sOpt, "yes")) ? 1 : 0;
-	}
-
-#ifdef GF_SR_USE_VIDEO_CACHE
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "VideoCacheSize");
-	compositor->video_cache_max_size = sOpt ? atoi(sOpt) : 0;
-	compositor->video_cache_max_size *= 1024;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "CacheScale");
-	compositor->cache_scale = sOpt ? atoi(sOpt) : 100;
-	if (!compositor->cache_scale) compositor->cache_scale = 100;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "CacheTolerance");
-	compositor->cache_tolerance = sOpt ? atoi(sOpt) : 30;
-#endif
+	if (compositor->fsize)
+		compositor->override_size_flags |= 1;
+	else
+		compositor->override_size_flags &= ~1;
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TextureFromDecoderMemory");
-	compositor->texture_from_decoder_memory = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	if (!sOpt)
-		gf_cfg_set_key(compositor->user->config, "Compositor", "TextureFromDecoderMemory", "no");
 
 #ifndef GPAC_DISABLE_3D
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLMode");
-
 	if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL)) {
-		if (sOpt && strcmp(sOpt, "disable")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL mode %s requested but no opengl-capable output - disabling openGL\n", sOpt));
+		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"));
 		}
 		compositor->force_opengl_2d = 0;
 		compositor->autoconfig_opengl = 0;
 		compositor->hybrid_opengl = 0;
 	} else {
-		compositor->force_opengl_2d = (sOpt && !strcmp(sOpt, "always")) ? 1 : 0;
-		if (!sOpt) {
+		compositor->force_opengl_2d = (compositor->ogl==GF_SC_GLMODE_ON) ? 1 : 0;
+		if (compositor->ogl == GF_SC_GLMODE_AUTO) {
 			compositor->recompute_ar = 1;
 			compositor->autoconfig_opengl = 1;
 		} else {
-			compositor->hybrid_opengl = !strcmp(sOpt, "hybrid") ? 1 : 0;
-#ifdef OPENGL_RASTER
-			compositor->opengl_raster = !strcmp(sOpt, "raster") ? 1 : 0;
-			if (compositor->opengl_raster) compositor->traverse_state->immediate_draw = GF_TRUE;
-#endif
+			compositor->hybrid_opengl = (compositor->ogl==GF_SC_GLMODE_HYBRID) ? 1 : 0;
 		}
 	}
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EnablePBO");
-	if (!sOpt) gf_cfg_set_key(compositor->user->config, "Compositor", "EnablePBO", "no");
-	compositor->enable_pbo = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DefaultNavigationMode");
-	if (sOpt && !strcmp(sOpt, "Walk")) compositor->default_navigation_mode = GF_NAVIGATE_WALK;
-	else if (sOpt && !strcmp(sOpt, "Examine")) compositor->default_navigation_mode = GF_NAVIGATE_EXAMINE;
-	else if (sOpt && !strcmp(sOpt, "Fly")) compositor->default_navigation_mode = GF_NAVIGATE_FLY;
-
-#ifdef GPAC_HAS_GLU
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "RasterOutlines");
-	compositor->raster_outlines = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-#endif
-	/*currently:
-	- no support for npow2 textures, and no support for DrawPixels
-	*/
-#ifndef GPAC_USE_GLES1X
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EmulatePOW2");
-	compositor->emul_pow2 = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-#else
-	compositor->raster_outlines = 1;
-	compositor->emul_pow2 = 1;
+#ifdef GPAC_USE_GLES1X
+	compositor->linegl = 1;
+	compositor->epow2 = 1;
 #endif
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "PolygonAA");
-	compositor->poly_aa = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "BackFaceCulling");
-	if (sOpt && !stricmp(sOpt, "Off")) compositor->backcull = GF_BACK_CULL_OFF;
-	else if (sOpt && !stricmp(sOpt, "Alpha")) compositor->backcull = GF_BACK_CULL_ALPHA;
-	else compositor->backcull = GF_BACK_CULL_ON;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "Wireframe");
-	if (sOpt && !stricmp(sOpt, "WireOnly")) compositor->wiremode = GF_WIREFRAME_ONLY;
-	else if (sOpt && !stricmp(sOpt, "WireOnSolid")) compositor->wiremode = GF_WIREFRAME_SOLID;
-	else compositor->wiremode = GF_WIREFRAME_NONE;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DrawNormals");
-	if (sOpt && !stricmp(sOpt, "PerFace")) compositor->draw_normals = GF_NORMALS_FACE;
-	else if (sOpt && !stricmp(sOpt, "PerVertex")) compositor->draw_normals = GF_NORMALS_VERTEX;
-	else compositor->draw_normals = GF_NORMALS_NONE;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableGLUScale");
-	compositor->disable_glu_scale = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableRectExt");
-	compositor->disable_rect_ext = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableGLCulling");
-	compositor->disable_gl_cull = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisableYUVGL");
-	compositor->disable_yuvgl = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DepthScale");
-	if (!sOpt) {
-		sOpt = "100";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "DepthScale", sOpt);
-	}
-	compositor->depth_gl_scale = FLT2FIX( (Float) atof(sOpt) );
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DepthType");
-	if (!sOpt) {
-		sOpt = "VertexArray";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "DepthType", sOpt);
-	}
-	if (sOpt && !strcmp(sOpt, "Points")) compositor->depth_gl_type = GF_SC_DEPTH_GL_POINTS;
-	else if (sOpt && !strnicmp(sOpt, "Strips", 6)) {
-		compositor->depth_gl_type = GF_SC_DEPTH_GL_STRIPS;
-		compositor->depth_gl_strips_filter = 0;
-		if (strlen(sOpt)>7) compositor->depth_gl_strips_filter = FLT2FIX( (Float) atof(sOpt+7) );
-	}
-	else if (sOpt && !strcmp(sOpt, "VertexArray")) compositor->depth_gl_type = GF_SC_DEPTH_GL_VBO;
-	else compositor->depth_gl_type = GF_SC_DEPTH_GL_NONE;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "NumViews");
-	if (!sOpt) {
-		sOpt = "1";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "1");
-	}
-	compositor->visual->nb_views = atoi(sOpt);
-	if (!compositor->visual->nb_views) compositor->visual->nb_views = 1;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "StereoType");
-	if (!sOpt) {
-		sOpt = "none";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "StereoType", "none");
-	}
-	if (!strcmp(sOpt, "SideBySide")) compositor->visual->autostereo_type = GF_3D_STEREO_SIDE;
-	else if (!strcmp(sOpt, "TopToBottom")) compositor->visual->autostereo_type = GF_3D_STEREO_TOP;
-	else if (!strcmp(sOpt, "Custom")) compositor->visual->autostereo_type = GF_3D_STEREO_CUSTOM;
-	/*built-in interleavers*/
-	else if (!strcmp(sOpt, "Anaglyph")) compositor->visual->autostereo_type = GF_3D_STEREO_ANAGLYPH;
-	else if (!strcmp(sOpt, "Columns")) compositor->visual->autostereo_type = GF_3D_STEREO_COLUMNS;
-	else if (!strcmp(sOpt, "Rows")) compositor->visual->autostereo_type = GF_3D_STEREO_ROWS;
-	else if (!strcmp(sOpt, "SPV19")) {
-		compositor->visual->autostereo_type = GF_3D_STEREO_5VSP19;
+	compositor->visual->nb_views = compositor->nbviews;
+	compositor->visual->camlay = compositor->camlay;
+	compositor->visual->autostereo_type = compositor->stereo;
+	if (compositor->visual->autostereo_type == GF_3D_STEREO_5VSP19) {
 		if (compositor->visual->nb_views != 5) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] SPV19 interleaving used but only %d views indicated - adjusting to 5 view\n", compositor->visual->nb_views ));
+			if (compositor->visual->nb_views) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] SPV19 interleaving used but only %d views indicated - adjusting to 5 view\n", compositor->visual->nb_views ));
+			}
 			compositor->visual->nb_views = 5;
-			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "5");
 		}
 	}
-	else if (!strcmp(sOpt, "ALIO")) {
-		compositor->visual->autostereo_type = GF_3D_STEREO_8VALIO;
+	else if (compositor->visual->autostereo_type == GF_3D_STEREO_8VALIO) {
 		if (compositor->visual->nb_views != 8) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] ALIO interleaving used but only %d views indicated - adjusting to 8 view\n", compositor->visual->nb_views ));
-			compositor->visual->nb_views = 8;
-			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "8");
+			if (compositor->visual->nb_views) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] ALIO interleaving used but only %d views indicated - adjusting to 8 view\n", compositor->visual->nb_views ));
+				compositor->visual->nb_views = 8;
+			}
 		}
 	}
-	else if (!strcmp(sOpt, "StereoHeadset")) compositor->visual->autostereo_type = GF_3D_STEREO_HEADSET;
-	else {
-		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
-		compositor->visual->nb_views = 1;
-		gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "1");
-	}
 
 	if ((compositor->visual->autostereo_type!=GF_3D_STEREO_NONE) && (compositor->visual->autostereo_type <= GF_3D_STEREO_HEADSET)) {
 		compositor->visual->nb_views = 2;
@@ -1486,123 +1573,60 @@
 	case GF_3D_STEREO_COLUMNS:
 	case GF_3D_STEREO_ROWS:
 		if (compositor->visual->nb_views != 2) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Stereo interleaving used but %d views indicated - adjusting to 2 view\n", compositor->visual->nb_views ));
+			if (compositor->visual->nb_views) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Stereo interleaving used but %d views indicated - adjusting to 2 view\n", compositor->visual->nb_views ));
+			}
 			compositor->visual->nb_views = 2;
-			gf_cfg_set_key(compositor->user->config, "Compositor", "NumViews", "2");
 		}
 		break;
 	}
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FramePacking");
-	if (!sOpt) {
-		sOpt = "None";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "FramePacking", "None");
-	}
-	if (!strcmp(sOpt, "Side")) compositor->frame_packing = GF_3D_STEREO_SIDE;
-	else if (!strcmp(sOpt, "Top")) compositor->frame_packing = GF_3D_STEREO_TOP;
-	else compositor->frame_packing = GF_3D_STEREO_NONE;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "CameraLayout");
-	if (!sOpt) {
-		sOpt = "Straight";
-		gf_cfg_set_key(compositor->user->config, "Compositor", "CameraLayout", "Straight");
-	}
-	if (!strcmp(sOpt, "Linear")) compositor->visual->camera_layout = GF_3D_CAMERA_LINEAR;
-	else if (!strcmp(sOpt, "Circular")) compositor->visual->camera_layout = GF_3D_CAMERA_CIRCULAR;
-	else if (!strcmp(sOpt, "OffAxis")) compositor->visual->camera_layout = GF_3D_CAMERA_OFFAXIS;
-	else compositor->visual->camera_layout = GF_3D_CAMERA_STRAIGHT;
-
-	compositor->interoccular_distance = FLT2FIX(6.3f);
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EyeSeparation");
-	if (sOpt) compositor->interoccular_distance = FLT2FIX( atof(sOpt)) ;
-	else gf_cfg_set_key(compositor->user->config, "Compositor", "EyeSeparation", "6.3");
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ReverseViews");
-	if (sOpt && !strcmp(sOpt, "yes")) compositor->visual->reverse_views = 1;
-
-	compositor->tile_visibility_nb_tests = 30;
-	compositor->tile_visibility_threshold = 0;
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityTest");
-	if (!sOpt || !strstr(sOpt, "-")) {
-		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityTest", "30-0");
-	} else {
-		sscanf(sOpt, "%u-%u", &compositor->tile_visibility_nb_tests, &compositor->tile_visibility_threshold);
-	}
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityDebug");
-	if (!sOpt) {
-		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityDebug", "no");
-	} else if (!strcmp(sOpt, "yes")) {
-		compositor->tile_visibility_debug = GF_TRUE;
-	}
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TileVisibilityForced");
-	if (!sOpt) {
-		gf_cfg_set_key(compositor->user->config, "Compositor", "TileVisibilityForced", "no");
-	} else if (!strcmp(sOpt, "yes")) {
-		compositor->force_all_tiles_visible = GF_TRUE;
-	}
+	if (!compositor->visual->nb_views) compositor->visual->nb_views = 1;
 
 #endif //GPAC_DISABLE_3D
 
-
 	/*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 {
-		sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DrawMode");
-		if (!sOpt) {
-			sOpt = "defer";
-			gf_cfg_set_key(compositor->user->config, "Compositor", "DrawMode", sOpt);
-		}
-
-		if (!strcmp(sOpt, "immediate")) compositor->traverse_state->immediate_draw = 1;
-		else if (!strcmp(sOpt, "defer-debug")) {
+		if (compositor->mode2d==GF_DRAW_MODE_IMMEDIATE)
+			compositor->traverse_state->immediate_draw = 1;
+		else if (compositor->mode2d==GF_DRAW_MODE_DEFER_DEBUG) {
 			compositor->traverse_state->immediate_draw = 0;
 			compositor->debug_defer = 1;
+		} else {
+		 	compositor->traverse_state->immediate_draw = 0;
 		}
-		else compositor->traverse_state->immediate_draw = 0;
 	}
 
 
 #ifdef GF_SR_USE_DEPTH
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "AutoStereoCalibration");
-	compositor->auto_calibration = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
-
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DisplayDepth");
-	compositor->display_depth = sOpt ? (!strcmp(sOpt, "auto") ? -1 : atoi(sOpt)) : 0;
 
 #ifndef GPAC_DISABLE_3D
 	/*if auto-stereo mode, turn on display depth by default*/
-	if (compositor->visual->autostereo_type && !compositor->display_depth) {
-		compositor->display_depth = -1;
+	if (compositor->visual->autostereo_type && !compositor->dispdepth) {
+		compositor->dispdepth = -1;
 	}
 #endif
 
-	if (!compositor->video_out->view_distance) {
-		sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ViewDistance");
-		compositor->video_out->view_distance = FLT2FIX( sOpt ? (Float) atof(sOpt) : 50.0f );
-	}
-
-#ifndef GPAC_DISABLE_3D
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "FocusDistance");
-	compositor->focus_distance = 0;
-	if (sOpt)
-		compositor->focus_distance = FLT2FIX( atof(sOpt) );
-	else
-		gf_cfg_set_key(compositor->user->config, "Compositor", "FocusDistance", "0");
-#endif
-
 #endif
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "SimulateGaze");
-	if (!sOpt) gf_cfg_set_key(compositor->user->config, "Compositor", "SimulateGaze", "no");
-	compositor->simulate_gaze = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
-	if (compositor->simulate_gaze) compositor->gazer_enabled = GF_TRUE;
+	if (!compositor->video_out->dispdist) {
+		compositor->video_out->dispdist = compositor->dispdist;
+	}
+	if (compositor->sgaze) compositor->gazer_enabled = GF_TRUE;
 
+	if (!compositor->video_out->dpi_x) {
+		compositor->video_out->dpi_x = compositor->dpi.x;
+		compositor->video_out->dpi_y = compositor->dpi.y;
+	}
 
 	gf_sc_reset_graphics(compositor);
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 
+	if (compositor->audio_renderer) {
+		gf_sc_ar_set_volume(compositor->audio_renderer, compositor->avol);
+		gf_sc_ar_set_pan(compositor->audio_renderer, compositor->apan);
+	}
 	gf_sc_lock(compositor, 0);
 }
 
@@ -1631,22 +1655,22 @@
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_STRESS_MODE:
-		compositor->stress_mode = value;
+		compositor->stress = value;
 		break;
 	case GF_OPT_ANTIALIAS:
-		compositor->antiAlias = value;
+		compositor->aa = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_HIGHSPEED:
-		compositor->high_speed = value;
+		compositor->fast = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_DRAW_BOUNDS:
-		compositor->draw_bvol = value;
+		compositor->bvol = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_TEXTURE_TEXT:
-		compositor->texture_text_mode = value;
+		compositor->textxt = value;
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_ASPECT_RATIO:
@@ -1704,7 +1728,7 @@
 		}
 		break;
 	case GF_OPT_SCALABLE_ZOOM:
-		compositor->scalable_zoom = value;
+		compositor->sz = value;
 		/*emulate size message to force AR recompute*/
 		compositor->msg_type |= GF_SR_CFG_AR;
 		break;
@@ -1724,7 +1748,7 @@
 		break;
 
 	case GF_OPT_YUV_HARDWARE:
-		compositor->enable_yuv_hw = value;
+		compositor->yuvhw = value;
 		break;
 	case GF_OPT_NAVIGATION_TYPE:
 		compositor->rotation = 0;
@@ -1768,29 +1792,29 @@
 #ifndef GPAC_DISABLE_3D
 
 	case GF_OPT_EMULATE_POW2:
-		compositor->emul_pow2 = value;
+		compositor->epow2 = value;
 		break;
 	case GF_OPT_POLYGON_ANTIALIAS:
-		compositor->poly_aa = value;
+		compositor->paa = value;
 		break;
 	case GF_OPT_BACK_CULL:
-		compositor->backcull = value;
+		compositor->bcull = value;
 		break;
 	case GF_OPT_WIREFRAME:
-		compositor->wiremode = value;
+		compositor->wire = value;
 		break;
 	case GF_OPT_NORMALS:
-		compositor->draw_normals = value;
+		compositor->norms = value;
 		break;
 #ifdef GPAC_HAS_GLU
 	case GF_OPT_RASTER_OUTLINES:
-		compositor->raster_outlines = value;
+		compositor->linegl = value;
 		break;
 #endif
 
 	case GF_OPT_NO_RECT_TEXTURE:
-		if (value != compositor->disable_rect_ext) {
-			compositor->disable_rect_ext = value;
+		if (value != compositor->rext) {
+			compositor->rext = value;
 			/*RECT texture support - we must reload HW*/
 			gf_sc_reset_graphics(compositor);
 		}
@@ -1816,6 +1840,10 @@
 		e = GF_NOT_SUPPORTED;
 #endif
 		break;
+	case GF_OPT_MULTIVIEW_MODE:
+		compositor->multiview_mode = value;
+		break;
+
 
 	default:
 		e = GF_BAD_PARAM;
@@ -1882,7 +1910,7 @@
 	case GF_OPT_IS_OVER:
 		return gf_sc_is_over(compositor, NULL);
 	case GF_OPT_STRESS_MODE:
-		return compositor->stress_mode;
+		return compositor->stress;
 	case GF_OPT_AUDIO_VOLUME:
 		return compositor->audio_renderer->volume;
 	case GF_OPT_AUDIO_PAN:
@@ -1891,9 +1919,9 @@
 		return compositor->audio_renderer->mute;
 
 	case GF_OPT_ANTIALIAS:
-		return compositor->antiAlias;
+		return compositor->aa;
 	case GF_OPT_HIGHSPEED:
-		return compositor->high_speed;
+		return compositor->fast;
 	case GF_OPT_ASPECT_RATIO:
 		return compositor->aspect_ratio;
 	case GF_OPT_FULLSCREEN:
@@ -1905,7 +1933,7 @@
 	case GF_OPT_FREEZE_DISPLAY:
 		return compositor->freeze_display;
 	case GF_OPT_TEXTURE_TEXT:
-		return compositor->texture_text_mode;
+		return compositor->textxt;
 	case GF_OPT_USE_OPENGL:
 		return compositor->force_opengl_2d;
 
@@ -1914,11 +1942,11 @@
 		if (compositor->debug_defer) return GF_DRAW_MODE_DEFER_DEBUG;
 		return GF_DRAW_MODE_DEFER;
 	case GF_OPT_SCALABLE_ZOOM:
-		return compositor->scalable_zoom;
+		return compositor->sz;
 	case GF_OPT_YUV_HARDWARE:
-		return compositor->enable_yuv_hw;
+		return compositor->yuvhw;
 	case GF_OPT_YUV_FORMAT:
-		return compositor->enable_yuv_hw ? compositor->video_out->yuv_pixel_format : 0;
+		return compositor->yuvhw ? compositor->video_out->yuv_pixel_format : 0;
 	case GF_OPT_NAVIGATION_TYPE:
 #ifndef GPAC_DISABLE_3D
 		if (compositor->navigation_disabled) return GF_NAVIGATE_TYPE_NONE;
@@ -1951,7 +1979,7 @@
 
 	case GF_OPT_VIDEO_CACHE_SIZE:
 #ifdef GF_SR_USE_VIDEO_CACHE
-		return compositor->video_cache_max_size/1024;
+		return compositor->vcsize/1024;
 #else
 		return 0;
 #endif
@@ -2001,7 +2029,7 @@
 	return e;
 }
 
-GF_Err gf_sc_get_offscreen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer, u32 view_idx, u32 depth_dump_mode)
+GF_Err gf_sc_get_offscreen_buffer(GF_Compositor *compositor, GF_VideoSurface *framebuffer, u32 view_idx, GF_CompositorGrabMode depth_dump_mode)
 {
 	if (!compositor || !framebuffer) return GF_BAD_PARAM;
 #ifndef GPAC_DISABLE_3D
@@ -2070,7 +2098,7 @@
 
 	gf_mx_v(compositor->mx);
 
-	if (!run_time) return (Double) compositor->frame_rate;
+	if (!run_time) return ((Double) compositor->fps.num)/compositor->fps.den;
 	fps = 1000*frames;
 	fps /= run_time;
 	return fps;
@@ -2092,17 +2120,10 @@
 	gf_list_del_item(compositor->time_nodes, tn);
 }
 
-
-GF_EXPORT
-GF_Node *gf_sc_pick_node(GF_Compositor *compositor, s32 X, s32 Y)
-{
-	return NULL;
-}
-
 static void gf_sc_recompute_ar(GF_Compositor *compositor, GF_Node *top_node)
 {
 	Bool force_pause;
-	
+
 //	force_pause = compositor->audio_renderer->Frozen ? 0 : 1;
 	force_pause = GF_FALSE;
 
@@ -2129,24 +2150,36 @@
 		}
 		if (compositor->visual->type_3d) {
 			compositor_3d_set_aspect_ratio(compositor);
-			gf_sc_load_opengl_extensions(compositor, compositor->visual->type_3d);
+			gf_sc_load_opengl_extensions(compositor, compositor->visual->type_3d ? GF_TRUE : GF_FALSE);
 #ifndef GPAC_USE_GLES1X
 			visual_3d_init_shaders(compositor->visual);
 #endif
 			if (compositor->autoconfig_opengl) {
+				u32 mode = compositor->ogl;
 				compositor->autoconfig_opengl = 0;
 				compositor->force_opengl_2d = 0;
+				compositor->hybrid_opengl = GF_FALSE;
 				compositor->visual->type_3d = prev_type_3d;
 
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 				//enable hybrid mode by default
-				if (compositor->visual->compositor->shader_only_mode) {
-					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "hybrid");
-					compositor->hybrid_opengl = 1;
-				} else {
-					gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLMode", "disable");
+				if (compositor->visual->compositor->shader_mode_disabled && (mode==GF_SC_GLMODE_HYBRID) ) {
+					mode = GF_SC_GLMODE_OFF;
 				}
 #endif
+				switch (mode) {
+				case GF_SC_GLMODE_OFF:
+					break;
+				case GF_SC_GLMODE_ON:
+					compositor->force_opengl_2d = 1;
+					if (!compositor->visual->type_3d)
+						compositor->visual->type_3d = 1;
+					break;
+				case GF_SC_GLMODE_AUTO:
+				case GF_SC_GLMODE_HYBRID:
+					compositor->hybrid_opengl = GF_TRUE;
+					break;
+				}
 			}
 
 		}
@@ -2185,6 +2218,11 @@
 			compositor->msg_type |= GF_SR_CFG_FULLSCREEN;
 		}
 
+		if (compositor->vout) {
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_WIDTH, &PROP_UINT(compositor->output_width) );
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_HEIGHT, &PROP_UINT(compositor->output_height) );
+			gf_filter_pid_set_property(compositor->vout, GF_PROP_PID_FPS, &PROP_FRAC(compositor->fps) );
+		}
 	}
 }
 
@@ -2214,7 +2252,7 @@
 #ifndef GPAC_DISABLE_3D
 			/*move to perspective 3D when simulating depth*/
 #ifdef GF_SR_USE_DEPTH
-			if (compositor->display_depth) {
+			if (compositor->dispdepth) {
 				compositor->visual->type_3d = 0;
 				compositor->visual->camera.is_3D = 0;
 			} else
@@ -2251,7 +2289,7 @@
 		case TAG_SVG_svg:
 #ifndef GPAC_DISABLE_3D
 #ifdef GF_SR_USE_DEPTH
-			if (compositor->display_depth) {
+			if (compositor->dispdepth>=0) {
 				compositor->visual->type_3d = 2;
 				compositor->visual->camera.is_3D = 1;
 			} else
@@ -2285,6 +2323,9 @@
 			if (compositor->force_opengl_2d==2) force_navigate=1;
 		}
 
+		if (compositor->drv==GF_SC_DRV_AUTO)
+			gf_sc_check_video_driver(compositor);
+
 		if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL)) {
 			compositor->visual->type_3d = 0;
 			compositor->visual->camera.is_3D = 0;
@@ -2311,7 +2352,7 @@
 }
 
 
-static void gf_sc_draw_scene(GF_Compositor *compositor)
+static Bool gf_sc_draw_scene(GF_Compositor *compositor)
 {
 	u32 flags;
 
@@ -2321,11 +2362,11 @@
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Scene has no root node, nothing to draw\n"));
 		//nothing to draw, skip flush
 		compositor->skip_flush = 1;
-		return;
+		return GF_FALSE;
 	}
 
 #ifdef GF_SR_USE_VIDEO_CACHE
-	if (!compositor->video_cache_max_size)
+	if (!compositor->vcsize)
 		compositor->traverse_state->in_group_cache = 1;
 #endif
 
@@ -2333,17 +2374,38 @@
 	if (compositor->video_setup_failed) {
 		compositor->skip_flush = 1;
 	}
-	else if (! visual_draw_frame(compositor->visual, top_node, compositor->traverse_state, 1)) {
-		/*android backend uses opengl without telling it to us, we need an ugly hack here ...*/
-#ifdef GPAC_ANDROID
-		compositor->skip_flush = 0;
-#else
-		if (compositor->skip_flush==2) {
+	else {
+		if (compositor->nodes_pending) {
+			u32 i, count, n_count;
+			i=0;
+			count = gf_list_count(compositor->nodes_pending);
+			while (i<count) {
+				GF_Node *n = (GF_Node *)gf_list_get(compositor->nodes_pending, i);
+				gf_node_traverse(n, NULL);
+				if (!compositor->nodes_pending) break;
+				n_count = gf_list_count(compositor->nodes_pending);
+				if (n_count==count) i++;
+				else count=n_count;
+			}
+		}
+		if (compositor->passthrough_txh) {
+			gf_sc_setup_passthrough(compositor);
+			compositor->traverse_state->immediate_draw = 1;
+		}
+
+		if (! visual_draw_frame(compositor->visual, top_node, compositor->traverse_state, 1)) {
+			/*android backend uses opengl without telling it to us, we need an ugly hack here ...*/
+#ifdef GPAC_CONFIG_ANDROID
 			compositor->skip_flush = 0;
-		} else {
-			compositor->skip_flush = 1;
-		}
+#else
+			if (compositor->skip_flush==2) {
+				compositor->skip_flush = 0;
+			} else {
+				compositor->skip_flush = 1;
+			}
 #endif
+		}
+
 	}
 
 
@@ -2359,10 +2421,13 @@
 		compositor->recompute_ar = 0;
 	}
 	compositor->zoom_changed = 0;
+	compositor->audio_renderer->scene_ready = GF_TRUE;
+	return GF_TRUE;
 }
 
 
 #ifndef GPAC_DISABLE_LOG
+//defined in smil_anim ...
 extern u32 time_spent_in_anim;
 #endif
 
@@ -2381,28 +2446,16 @@
 	}
 }
 
-void gf_sc_flush_video(GF_Compositor *compositor)
-{
-	GF_Window rc;
 
-	//release compositor in case we have vsync
-	gf_sc_lock(compositor, 0);
-	rc.x = rc.y = 0;
-	rc.w = compositor->display_width;
-	rc.h = compositor->display_height;
-	compositor->video_out->Flush(compositor->video_out, &rc);
-	gf_sc_lock(compositor, 1);
-}
-
-GF_EXPORT
 void gf_sc_render_frame(GF_Compositor *compositor)
 {
 #ifndef GPAC_DISABLE_SCENEGRAPH
 	GF_SceneGraph *sg;
 #endif
 	GF_List *temp_queue;
-	u32 in_time, end_time, i, count, frame_duration;
-	Bool frame_drawn, has_timed_nodes=GF_FALSE, all_tx_done=GF_TRUE;
+	u32 in_time, end_time, i, count, frame_duration, frame_ts, frame_draw_type_bck;
+	Bool frame_drawn, has_timed_nodes=GF_FALSE, has_tx_streams=GF_FALSE, all_tx_done=GF_TRUE;
+
 #ifndef GPAC_DISABLE_LOG
 	s32 event_time, route_time, smil_timing_time=0, time_node_time, texture_time, traverse_time, flush_time, txtime;
 #endif
@@ -2418,12 +2471,20 @@
 	/*first thing to do, let the video output handle user event if it is not threaded*/
 	compositor->video_out->ProcessEvent(compositor->video_out, NULL);
 
+	//handle all unthreaded extensions
+	if (compositor->unthreaded_extensions) {
+		count = gf_list_count(compositor->unthreaded_extensions);
+		for (i=0; i<count; i++) {
+			GF_CompositorExt *ifce = gf_list_get(compositor->unthreaded_extensions, i);
+			ifce->process(ifce, GF_COMPOSITOR_EXT_PROCESS, NULL);
+		}
+	}
+
 	if (compositor->freeze_display) {
 		gf_sc_lock(compositor, 0);
-		if (!compositor->bench_mode) {
+		if (!compositor->bench_mode && compositor->player) {
 			compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
 		}
-		if (!compositor->no_regulation) gf_sleep(compositor->frame_duration);
 		return;
 	}
 
@@ -2432,22 +2493,32 @@
 	/* if there is no scene*/
 	if (!compositor->scene && !gf_list_count(compositor->extra_scenes) ) {
 		gf_sc_draw_scene(compositor);
-		//increase clock in bench mode before releasing mutex
-		if (compositor->bench_mode && (compositor->force_bench_frame==1)) {
-			compositor->scene_sampled_clock += compositor->frame_duration;
+		if (compositor->player) {
+			//increase clock in bench mode before releasing mutex
+			if (compositor->bench_mode && (compositor->force_bench_frame==1)) {
+				compositor->scene_sampled_clock += compositor->frame_duration;
+			}
+		} else {
+			if (compositor->root_scene && compositor->root_scene->graph_attached) {
+				compositor->check_eos_state = 2;
+			}
 		}
 		gf_sc_lock(compositor, 0);
-		if (!compositor->no_regulation) {
-			gf_sleep(compositor->bench_mode ? 2 : compositor->frame_duration);
-		}
 		compositor->force_bench_frame=0;
 		compositor->frame_draw_type = 0;
+		compositor->recompute_ar = 0;
+		compositor->ms_until_next_frame = compositor->frame_duration;
 		return;
 	}
 
 	if (compositor->reset_graphics) {
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		visual_reset_graphics(compositor->visual);
+
+#ifndef GPAC_DISABLE_3D
+		compositor_3d_delete_fbo(&compositor->fbo_id, &compositor->fbo_tx_id, &compositor->fbo_depth_id, compositor->external_tx_id);
+#endif
+
 	}
 
 	/*process pending user events*/
@@ -2481,15 +2552,16 @@
 	event_time = gf_sys_clock() - event_time;
 #endif
 
-
-	if (!compositor->bench_mode) {
-		compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
-	} else {
-		if (compositor->force_bench_frame==1) {
-			//a system frame is pending on a future frame - we must increase our time
-			compositor->scene_sampled_clock += compositor->frame_duration;
+	if (compositor->player) {
+		if (!compositor->bench_mode) {
+			compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
+		} else {
+			if (compositor->force_bench_frame==1) {
+				//a system frame is pending on a future frame - we must increase our time
+				compositor->scene_sampled_clock += compositor->frame_duration;
+			}
+			compositor->force_bench_frame = 0;
 		}
-		compositor->force_bench_frame = 0;
 	}
 
 
@@ -2498,46 +2570,13 @@
 	compositor->ms_until_next_frame = GF_INT_MAX;
 	frame_duration = compositor->frame_duration;
 
-	if (compositor->auto_rotate) 
+	if (compositor->auto_rotate)
 		compositor_handle_auto_navigation(compositor);
 
-#ifndef GPAC_DISABLE_LOG
-	texture_time = gf_sys_clock();
-#endif
-	/*update all video textures*/
-	count = gf_list_count(compositor->textures);
-	for (i=0; i<count; i++) {
-		GF_TextureHandler *txh = (GF_TextureHandler *)gf_list_get(compositor->textures, i);
-		if (!txh) break;
-		//this is not a natural (video) texture
-		if (! txh->stream) continue;
-
-		/*signal graphics reset before updating*/
-		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
-		txh->update_texture_fcnt(txh);
-
-		if (!txh->stream_finished) {
-			u32 d = gf_mo_get_min_frame_dur(txh->stream);
-			if (d && (d < frame_duration)) frame_duration = d;
-
-			all_tx_done=0;
-		}
-	}
-
-	//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) {
-		gf_sc_lock(compositor, 0);
-		return;
-	}
+	/*first update time nodes since they may trigger play/stop request*/
 
 	compositor->force_late_frame_draw = GF_FALSE;
 
-#ifndef GPAC_DISABLE_LOG
-	texture_time = gf_sys_clock() - texture_time;
-#endif
-
-
 #ifndef GPAC_DISABLE_SVG
 
 #ifndef GPAC_DISABLE_LOG
@@ -2578,19 +2617,92 @@
 			count--;
 			continue;
 		}
-		has_timed_nodes = GF_TRUE;
+		has_timed_nodes = compositor->timed_nodes_valid;
 	}
 #ifndef GPAC_DISABLE_LOG
 	time_node_time = gf_sys_clock() - time_node_time;
 #endif
 
+
+	compositor->passthrough_txh = NULL;
+#ifndef GPAC_DISABLE_LOG
+	texture_time = gf_sys_clock();
+#endif
+	//compute earliest frame TS in all textures that need refresh (skip textures with same timing)
+	frame_ts = (u32) -1;
+
+	/*update all video textures*/
+	frame_draw_type_bck = compositor->frame_draw_type;
+	compositor->frame_draw_type = 0;
+	has_tx_streams = GF_FALSE;
+	count = gf_list_count(compositor->textures);
+	for (i=0; i<count; i++) {
+		GF_TextureHandler *txh = (GF_TextureHandler *)gf_list_get(compositor->textures, i);
+		if (!txh) break;
+		//this is not a natural (video) texture
+		if (! txh->stream) continue;
+		has_tx_streams = GF_TRUE;
+
+		/*signal graphics reset before updating*/
+		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
+		txh->update_texture_fcnt(txh);
+
+		if (!txh->stream_finished) {
+			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
+			if (txh->needs_refresh) {
+				u32 ts = gf_mo_map_timestamp_to_sys_clock(txh->stream, txh->stream->timestamp);
+				if (ts<frame_ts) frame_ts = ts;
+			}
+			all_tx_done=0;
+		}
+	}
+#ifndef GPAC_DISABLE_LOG
+	texture_time = gf_sys_clock() - texture_time;
+#endif
+	if (compositor->player) {
+		if (frame_draw_type_bck)
+			compositor->frame_draw_type = frame_draw_type_bck;
+	}
+	//in non player mode, don't redraw frame if due to end of streams on textures
+	else if (!frame_draw_type_bck && compositor->frame_draw_type && all_tx_done)
+		compositor->frame_draw_type = 0;
+
+
+	if (!compositor->player) {
+		if (compositor->passthrough_txh && compositor->passthrough_txh->frame_ifce && !compositor->passthrough_txh->frame_ifce->get_plane) {
+			compositor->passthrough_txh = NULL;
+		}
+		if (!compositor->passthrough_txh && frame_draw_type_bck)
+			compositor->frame_draw_type = frame_draw_type_bck;
+
+		if (compositor->passthrough_txh && compositor->passthrough_txh->width && compositor->passthrough_txh->needs_refresh) {
+			compositor->scene_sampled_clock = compositor->passthrough_txh->last_frame_time/* + dur*/;
+		}
+		//we were buffering and are now no longer, update scene clock
+		if (compositor->passthrough_txh && compositor->passthrough_check_buffer && !gf_mo_is_buffering(compositor->passthrough_txh->stream)) {
+			u32 dur = gf_mo_get_min_frame_dur(compositor->passthrough_txh->stream);
+			compositor->passthrough_check_buffer = GF_FALSE;
+			compositor->scene_sampled_clock = compositor->passthrough_txh->last_frame_time + dur;
+		}
+	}
+	
+	//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) {
+		gf_sc_lock(compositor, 0);
+		return;
+	}
+
+
 	if (compositor->focus_text_type) {
 		if (!compositor->caret_next_draw_time) {
 			compositor->caret_next_draw_time = gf_sys_clock();
 			compositor->show_caret = 1;
 		}
 		if (compositor->caret_next_draw_time <= compositor->last_frame_time) {
-			compositor->frame_draw_type=GF_SC_DRAW_FRAME;
+			compositor->frame_draw_type = GF_SC_DRAW_FRAME;
 			compositor->caret_next_draw_time+=500;
 			compositor->show_caret = !compositor->show_caret;
 			compositor->text_edit_changed = 1;
@@ -2676,18 +2788,59 @@
 
 	if (compositor->force_next_frame_redraw) {
 		compositor->force_next_frame_redraw=0;
-		compositor->frame_draw_type=GF_SC_DRAW_FRAME;
+		compositor->frame_draw_type = GF_SC_DRAW_FRAME;
 	}
 
-	//if hidden and no listener, do not draw the scene
-	if (compositor->is_hidden && !compositor->video_listeners) {
+	//if hidden and player mode, do not draw the scene
+	if (compositor->is_hidden && compositor->player) {
 		compositor->frame_draw_type = 0;
 	}
 
+	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
+			if (!compositor->passthrough_txh) {
+				if (!compositor->vfr) {
+					//in CFR and no texture associated, always force a redraw
+					if (!has_tx_streams && has_timed_nodes)
+						compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+					//otherwise if texture(s) but not all done, force a redraw
+					else if (!all_tx_done)
+						compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+					//we still have active system pids (BIFS/LASeR/DIMS commands), force a redraw
+					if (gf_list_count(compositor->systems_pids))
+						compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+					//validator always triggers redraw to make sure the scene clock is incremented so that events can be fired
+					if (compositor->validator_mode)
+						compositor->frame_draw_type = GF_SC_DRAW_FRAME;
+				}
+			}
+			//we have a passthrough texture, only generate an output frame when we have a new input on the passthrough
+			else {
+				//still waiting for initialization either from the passthrough stream or a texture used in the scene
+				if (!compositor->passthrough_txh->width || !compositor->passthrough_txh->stream->pck || (compositor->ms_until_next_frame<0) ) {
+					compositor->frame_draw_type = GF_SC_DRAW_NONE;
+					//prevent release of frame
+					if (compositor->passthrough_txh->needs_release)
+						compositor->passthrough_txh->needs_release = 2;
+				}
+				//done
+				else if ((compositor->passthrough_txh->stream_finished) && (compositor->ms_until_next_frame >= 0)) {
+					compositor->check_eos_state = 2;
+				}
+			}
+		}
+
+	}
+
 	frame_drawn = (compositor->frame_draw_type==GF_SC_DRAW_FRAME) ? 1 : 0;
 
 	/*if invalidated, draw*/
 	if (compositor->frame_draw_type) {
+		Bool emit_frame = GF_FALSE;
 		Bool textures_released = 0;
 
 #ifndef GPAC_DISABLE_LOG
@@ -2702,45 +2855,142 @@
 		/*video flush only*/
 		if (compositor->frame_draw_type==GF_SC_DRAW_FLUSH) {
 			compositor->frame_draw_type = 0;
-
 		}
 		/*full render*/
 		else {
+			Bool scene_drawn;
 			compositor->frame_draw_type = 0;
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Redrawing scene - STB %d\n", compositor->scene_sampled_clock));
-			gf_sc_draw_scene(compositor);
+
+			scene_drawn = gf_sc_draw_scene(compositor);
+
 #ifndef GPAC_DISABLE_LOG
 			traverse_time = gf_sys_clock() - traverse_time;
 #endif
 
-			if (compositor->video_listeners && compositor->skip_flush!=1) {
-				u32 k=0;
-				GF_VideoListener *l;
-				while ((l = gf_list_enum(compositor->video_listeners, &k))) {
-					l->on_video_frame(l->udta, gf_sc_ar_get_clock(compositor->audio_renderer) );
-				}
-			}
-
+			if (compositor->ms_until_next_frame < 0) {
+				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;
 		}
 		/*and flush*/
 #ifndef GPAC_DISABLE_LOG
 		flush_time = gf_sys_clock();
 #endif
 
-		if(compositor->user->init_flags & GF_TERM_INIT_HIDE)
+		if (compositor->init_flags & GF_TERM_INIT_HIDE)
 			compositor->skip_flush = 1;
 
+		//new frame generated, emit packet
+		if (emit_frame) {
+			u64 pck_frame_ts=0;
+			GF_FilterPacket *pck;
+			frame_ts = 0;
+			if (compositor->passthrough_pck) {
+				pck = compositor->passthrough_pck;
+				compositor->passthrough_pck = NULL;
+				pck_frame_ts = gf_filter_pck_get_cts(pck);
+			} else {
+				if (compositor->video_out==&raw_vout) {
+					pck = gf_filter_pck_new_shared(compositor->vout, compositor->framebuffer, compositor->framebuffer_size, gf_sc_frame_ifce_done);
+				} else {
+					compositor->frame_ifce.user_data = compositor;
+					compositor->frame_ifce.get_plane = gf_sc_frame_ifce_get_plane;
+					compositor->frame_ifce.get_gl_texture = NULL;
+#ifndef GPAC_DISABLE_3D
+					if (compositor->fbo_tx_id) {
+						compositor->frame_ifce.get_gl_texture = gf_sc_frame_ifce_get_gl_texture;
+					}
+#endif
+					compositor->frame_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+					pck = gf_filter_pck_new_frame_interface(compositor->vout, &compositor->frame_ifce, gf_sc_frame_ifce_done);
+				}
+
+				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);
+				} else {
+					//no texture found/updated, use scene sampled clock
+					if (compositor->timescale) {
+						frame_ts = compositor->frame_number * compositor->fps.den * compositor->timescale;
+						frame_ts /= compositor->fps.num;
+					} else {
+						frame_ts = compositor->frame_number * compositor->fps.den;
+					}
+					gf_filter_pck_set_cts(pck, frame_ts);
+				}
+			}
+			if (pck_frame_ts) {
+				u64 ts = pck_frame_ts;
+				ts *= 1000;
+				ts /= compositor->passthrough_timescale;
+				frame_ts = (u32) ts;
+			}
+			gf_filter_pck_send(pck);
+			gf_sc_ar_update_video_clock(compositor->audio_renderer, frame_ts);
+
+			if (!compositor->player) {
+				if (compositor->passthrough_txh) {
+					// update clock if not buffering
+					if (!gf_mo_is_buffering(compositor->passthrough_txh->stream))
+					{
+						u64 next_frame;
+						next_frame = pck_frame_ts + gf_filter_pck_get_duration(pck);
+						next_frame *= 1000;
+						next_frame /= compositor->passthrough_timescale;
+						assert(next_frame>=compositor->scene_sampled_clock);
+						compositor->scene_sampled_clock = (u32) next_frame;
+					}
+					// if buffering, remember to update clock at next frame
+					else {
+						compositor->passthrough_check_buffer = GF_TRUE;
+					}
+					if (compositor->passthrough_txh->stream_finished)
+						compositor->check_eos_state = 2;
+				} else {
+					u64 res;
+					compositor->last_frame_ts = frame_ts;
+					res = (compositor->frame_number+1);
+					res *= compositor->fps.den;
+					res *= 1000;
+					res /= compositor->fps.num;
+					assert(res>=compositor->scene_sampled_clock);
+					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));
+			} 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) {
+					compositor->force_bench_frame = 1;
+				}
+				compositor->frame_was_produced = GF_TRUE;
+			}
+		} else if (!compositor->player) {
+			frame_drawn = GF_FALSE;
+			//prevent release of frame
+			if (compositor->passthrough_txh && compositor->passthrough_txh->needs_release)
+				compositor->passthrough_txh->needs_release = 2;
+		}
+
+		if (compositor->passthrough_pck) {
+		 	gf_filter_pck_discard(compositor->passthrough_pck);
+		 	compositor->passthrough_pck = NULL;
+		}
+
 		//if no overlays, release textures before flushing, otherwise we might loose time waiting for vsync
 		if (!compositor->visual->has_overlays) {
 			compositor_release_textures(compositor, frame_drawn);
 			textures_released = 1;
 		}
 
-		if (compositor->skip_flush!=1) {
-			gf_sc_flush_video(compositor);
-		} else {
-			compositor->skip_flush = 0;
+		//no flush pending
+		if (!compositor->flush_pending && !compositor->skip_flush) {
+			gf_sc_flush_video(compositor, GF_TRUE);
 		}
 
 #ifndef GPAC_DISABLE_LOG
@@ -2756,7 +3006,7 @@
 			compositor_release_textures(compositor, frame_drawn);
 		}
 
-		if (compositor->stress_mode) {
+		if (compositor->stress) {
 			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 			gf_sc_reset_graphics(compositor);
 		}
@@ -2775,6 +3025,25 @@
 		compositor->traverse_and_direct_draw_time = 0;
 		compositor->indirect_draw_time = 0;
 #endif
+
+		if (!compositor->player) {
+			//if systems frames are pending (not executed because too early), increase clock
+			if ((compositor->sys_frames_pending && (compositor->ms_until_next_frame>=0) )
+			//if timed nodes or validator mode (which acts as a timed node firing events), increase scene clock
+			//in vfr mode
+			|| (compositor->vfr && (has_timed_nodes || compositor->validator_mode) )
+			) {
+				u64 res;
+				compositor->sys_frames_pending = GF_FALSE;
+				compositor->frame_number++;
+				res = compositor->frame_number;
+				res *= compositor->fps.den;
+				res *= 1000;
+				res /= compositor->fps.num;
+				assert(res >= compositor->scene_sampled_clock);
+				compositor->scene_sampled_clock = (u32) res;
+			}
+		}
 	}
 	compositor->reset_graphics = 0;
 
@@ -2811,11 +3080,12 @@
 		//in bench mode we always increase the clock of the fixed target simulation rate - this needs refinement if video is used ...
 		compositor->scene_sampled_clock += frame_duration;
 	}
-	compositor->video_frame_pending=0;
 	gf_sc_lock(compositor, 0);
 
 	if (frame_drawn) compositor->step_mode = GF_FALSE;
 
+	/*old arch code kept for reference*/
+#if 0
 	/*let the owner decide*/
 	if (compositor->no_regulation)
 		return;
@@ -2842,13 +3112,13 @@
 			u64 start = gf_sys_clock_high_res();
 			u64 diff=0;
 			u64 wait_for = 1000 * (u64) compositor->ms_until_next_frame;
-			while (! compositor->msg_type && ! compositor->video_frame_pending) {
+			while (! compositor->msg_type) {
 				gf_sleep(1);
 				diff = gf_sys_clock_high_res() - start;
 				if (diff >= wait_for)
 					break;
 			}
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept %d ms until next frame (msg type %d - frame pending %d)\n", diff/1000, compositor->msg_type, compositor->video_frame_pending));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept %d ms until next frame (msg type %d)\n", diff/1000, compositor->msg_type));
 		}
 		return;
 	}
@@ -2862,6 +3132,8 @@
 	end_time %= frame_duration;
 	gf_sleep(frame_duration - end_time);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept for %d ms\n", frame_duration - end_time));
+#endif
+
 }
 
 Bool gf_sc_visual_is_registered(GF_Compositor *compositor, GF_VisualManager *visual)
@@ -3051,9 +3323,9 @@
 {
 	Bool ret;
 
-	if (compositor->term && (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) && (event->type<=GF_EVENT_MOUSEWHEEL)) {
+	if ( (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) && (event->type<=GF_EVENT_MOUSEWHEEL)) {
 		GF_Event evt = *event;
-		gf_term_mouse_input(compositor->term, &evt.mouse);
+		gf_sc_input_sensor_mouse_input(compositor, &evt.mouse);
 	}
 
 	/*	if (!compositor->interaction_level || (compositor->interaction_level==GF_INTERACT_INPUT_SENSOR) ) {
@@ -3129,11 +3401,11 @@
 	break;
 	case GF_EVENT_SIZE:
 		/*user consummed the resize event, do nothing*/
-		if ( gf_term_send_event(compositor->term, event) )
+		if ( gf_sc_send_event(compositor, event) )
 			return GF_TRUE;
 
 		/*not consummed and compositor "owns" the output window (created by the output module), resize*/
-		if (!compositor->user->os_window_handler) {
+		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)!!
 			*/
@@ -3145,7 +3417,7 @@
 				) {
 
 				//OSX bug with SDL when requesting 4k window we get max screen height but 4k width ...
-#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
+#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_CONFIG_IOS)
 				if (compositor->display_width==event->size.width) {
 					if (compositor->display_height > 2*event->size.height) {
 						event->size.width = compositor->display_width * event->size.height / compositor->display_height;
@@ -3197,16 +3469,16 @@
 		ret = GF_FALSE;
 		event->key.flags |= compositor->key_states;
 		/*key sensor*/
-		if (compositor->term && (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) ) {
-			ret = gf_term_keyboard_input(compositor->term, event->key.key_code, event->key.hw_code, (event->type==GF_EVENT_KEYUP) ? GF_TRUE : GF_FALSE);
+		if ((compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) ) {
+			ret = gf_sc_input_sensor_keyboard_input(compositor, event->key.key_code, event->key.hw_code, (event->type==GF_EVENT_KEYUP) ? GF_TRUE : GF_FALSE);
 		}
 		ret += gf_sc_handle_event_intern(compositor, event, from_user);
 		return ret;
 	}
 
 	case GF_EVENT_TEXTINPUT:
-		if (compositor->term && (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) )
-			gf_term_string_input(compositor->term , event->character.unicode_char);
+		if (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR)
+			gf_sc_input_sensor_string_input(compositor , event->character.unicode_char);
 
 		return gf_sc_handle_event_intern(compositor, event, from_user);
 	/*switch fullscreen off!!!*/
@@ -3221,6 +3493,7 @@
 	case GF_EVENT_MOUSEWHEEL:
 		event->mouse.key_states = compositor->key_states;
 	case GF_EVENT_SENSOR_ORIENTATION:
+	case GF_EVENT_MULTITOUCH:
 		return gf_sc_handle_event_intern(compositor, event, from_user);
 
 	case GF_EVENT_PASTE_TEXT:
@@ -3233,18 +3506,16 @@
 			event->message.message = NULL;
 		}
 		break;
-	case GF_EVENT_SYNC_LOST:
-		compositor->force_late_frame_draw = GF_TRUE;
-		break;
 	/*when we process events we don't forward them to the user*/
 	default:
-		return gf_term_send_event(compositor->term, event);
+		return gf_sc_send_event(compositor, event);
 	}
 	/*if we get here, event has been consumed*/
 	return GF_TRUE;
 }
 
-static Bool gf_sc_on_event(void *cbck, GF_Event *event)
+GF_EXPORT
+Bool gf_sc_on_event(void *cbck, GF_Event *event)
 {
 	return gf_sc_on_event_ex((GF_Compositor *)cbck, event, GF_FALSE);
 }
@@ -3258,10 +3529,6 @@
 	case GF_EVENT_SET_CAPTION:
 		compositor->video_out->ProcessEvent(compositor->video_out, event);
 		return GF_FALSE;
-
-//	case GF_EVENT_SET_CAPTION:
-//		gf_sc_queue_event(compositor, event);
-//		return GF_FALSE;
 	default:
 		return gf_sc_on_event_ex(compositor, event, GF_TRUE);
 	}
@@ -3276,14 +3543,7 @@
 	gf_sc_lock(compositor, GF_FALSE);
 }
 
-
-u32 gf_sc_get_audio_delay(GF_Compositor *compositor)
-{
-	return compositor->audio_renderer ? compositor->audio_renderer->audio_delay : 0;
-}
-
-
-Bool gf_sc_script_action(GF_Compositor *compositor, u32 type, GF_Node *n, GF_JSAPIParam *param)
+Bool gf_sc_script_action(GF_Compositor *compositor, GF_JSAPIActionType type, GF_Node *n, GF_JSAPIParam *param)
 {
 	switch (type) {
 	case GF_JSAPI_OP_GET_SCALE:
@@ -3351,11 +3611,13 @@
 		if (type==GF_JSAPI_OP_GET_LOCAL_BBOX) {
 #ifndef GPAC_DISABLE_SVG
 			GF_SAFEALLOC(tr_state.svg_props, SVGPropertiesPointers);
-			gf_svg_properties_init_pointers(tr_state.svg_props);
-			tr_state.abort_bounds_traverse = GF_TRUE;
-			gf_node_traverse(n, &tr_state);
-			gf_svg_properties_reset_pointers(tr_state.svg_props);
-			gf_free(tr_state.svg_props);
+			if (tr_state.svg_props) {
+				gf_svg_properties_init_pointers(tr_state.svg_props);
+				tr_state.abort_bounds_traverse = GF_TRUE;
+				gf_node_traverse(n, &tr_state);
+				gf_svg_properties_reset_pointers(tr_state.svg_props);
+				gf_free(tr_state.svg_props);
+			}
 #endif
 		} else {
 			gf_node_traverse(gf_sg_get_root_node(compositor->scene), &tr_state);
@@ -3446,6 +3708,8 @@
 	case GF_JSAPI_OP_GET_DPI_Y:
 		param->opt = compositor->video_out->dpi_y;
 		return GF_TRUE;
+	default:
+		return GF_FALSE;
 	}
 	return GF_FALSE;
 }
@@ -3486,6 +3750,7 @@
 	return (compositor->store_text_state==GF_SC_TSEL_FROZEN) ? GF_TRUE : GF_FALSE;
 }
 
+GF_EXPORT
 const char *gf_sc_get_selected_text(GF_Compositor *compositor)
 {
 	const u16 *srcp;
@@ -3505,7 +3770,7 @@
 	compositor->traverse_state->traversing_mode = 0;
 	if (compositor->sel_buffer) compositor->sel_buffer[compositor->sel_buffer_len]=0;
 	srcp = compositor->sel_buffer;
-	
+
 	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);
@@ -3533,51 +3798,7 @@
 	if (compositor->hit_text==n) compositor->hit_text = NULL;
 }
 
-GF_EXPORT
-GF_Err gf_sc_add_video_listener(GF_Compositor *sc, GF_VideoListener *vl)
-{
-	if (!sc|| !vl || !vl->on_video_frame || !vl->on_video_reconfig) return GF_BAD_PARAM;
-
-	gf_sc_lock(sc, GF_TRUE);
-	if (!sc->video_listeners) sc->video_listeners = gf_list_new();
-	gf_list_add(sc->video_listeners, vl);
-	gf_sc_lock(sc, GF_FALSE);
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_sc_remove_video_listener(GF_Compositor *sc, GF_VideoListener *vl)
-{
-	if (!sc|| !vl) return GF_BAD_PARAM;
-
-	gf_sc_lock(sc, GF_TRUE);
-	gf_list_del_item(sc->video_listeners, vl);
-	if (!gf_list_count(sc->video_listeners)) {
-		gf_list_del(sc->video_listeners);
-		sc->video_listeners = NULL;
-	}
-	gf_sc_lock(sc, GF_FALSE);
-	return GF_OK;
-}
-
-Bool gf_sc_use_raw_texture(GF_Compositor *compositor)
-{
-	if (!compositor) return 0;
-//	if (!compositor->visual->type_3d && !compositor->force_opengl_2d) return 0;
-	return compositor->texture_from_decoder_memory;
-}
-
-void gf_sc_get_av_caps(GF_Compositor *compositor, u32 *width, u32 *height, u32 *display_bit_depth, u32 *audio_bpp, u32 *channels, u32 *sample_rate)
-{
-	if (width) *width = compositor->video_out->max_screen_width;
-	if (height) *height = compositor->video_out->max_screen_height;
-	if (display_bit_depth) *display_bit_depth = compositor->video_out->max_screen_bpp ? compositor->video_out->max_screen_bpp : 8;
-	//to do
-	if (audio_bpp) *audio_bpp = 8;
-	if (channels) *channels = 0;
-	if (sample_rate) *sample_rate = 48000;
-}
-
+#if 0 //unused
 void gf_sc_set_system_pending_frame(GF_Compositor *compositor, Bool frame_pending)
 {
 	if (frame_pending) {
@@ -3589,11 +3810,6 @@
 	}
 }
 
-void gf_sc_set_video_pending_frame(GF_Compositor *compositor)
-{
-	compositor->video_frame_pending = GF_TRUE;
-}
-
 void gf_sc_queue_event(GF_Compositor *compositor, GF_Event *evt)
 {
 	u32 i, count;
@@ -3618,6 +3834,8 @@
 	}
 	gf_mx_v(compositor->evq_mx);
 }
+#endif
+
 
 void gf_sc_queue_dom_event(GF_Compositor *compositor, GF_Node *node, GF_DOM_Event *evt)
 {
@@ -3655,7 +3873,10 @@
 	for (i=0; i<count; i++) {
 		qev = gf_list_get(compositor->event_queue, i);
 		if ((qev->target==target) && (qev->dom_evt.type==evt->type) && (qev->sg==sg) ) {
-			qev->dom_evt = *evt;
+			//do not override any pending dowload progress event by new buffer state events
+			if ((evt->type!=GF_EVENT_MEDIA_PROGRESS) || !qev->dom_evt.media_event.loaded_size) {
+				qev->dom_evt = *evt;
+			}
 			gf_mx_v(compositor->evq_mx);
 			return;
 		}
@@ -3747,12 +3968,85 @@
 	return GF_TRUE;
 }
 
-Bool gf_sc_use_3d(GF_Compositor *compositor)
+
+u32 gf_sc_check_end_of_scene(GF_Compositor *compositor, Bool skip_interactions)
 {
-#ifndef GPAC_DISABLE_3D
-	return (compositor->visual->type_3d || compositor->hybrid_opengl) ? 1 : 0;
+	if (!compositor->root_scene || !compositor->root_scene->root_od || !compositor->root_scene->root_od->scene_ns) return 1;
+
+	if (!skip_interactions) {
+		/*if input sensors consider the scene runs forever*/
+		if (gf_list_count(compositor->input_streams)) return 0;
+		if (gf_list_count(compositor->x3d_sensors)) return 0;
+	}
+
+	/*check no clocks are still running*/
+	if (!gf_scene_check_clocks(compositor->root_scene->root_od->scene_ns, compositor->root_scene, 0)) return 0;
+	if (compositor->root_scene->is_dynamic_scene) return 1;
+
+	/*ask compositor if there are sensors*/
+	return gf_sc_get_option(compositor, skip_interactions ? GF_OPT_IS_OVER : GF_OPT_IS_FINISHED);
+}
+
+void gf_sc_queue_node_traverse(GF_Compositor *compositor, GF_Node *node)
+{
+	gf_sc_lock(compositor, GF_TRUE);
+	if (!compositor->nodes_pending) compositor->nodes_pending = gf_list_new();
+	gf_list_add(compositor->nodes_pending, node);
+	gf_sc_lock(compositor, GF_FALSE);
+}
+void gf_sc_unqueue_node_traverse(GF_Compositor *compositor, GF_Node *node)
+{
+	gf_sc_lock(compositor, GF_TRUE);
+	if (compositor->nodes_pending) {
+		gf_list_del_item(compositor->nodes_pending, node);
+		if (!gf_list_count(compositor->nodes_pending)) {
+			gf_list_del(compositor->nodes_pending);
+			compositor->nodes_pending = NULL;
+		}
+	}
+	gf_sc_lock(compositor, GF_FALSE);
+}
+
+GF_EXPORT
+GF_DownloadManager *gf_sc_get_downloader(GF_Compositor *compositor)
+{
+	return gf_filter_get_download_manager(compositor->filter);
+}
+
+void gf_sc_sys_frame_pending(GF_Compositor *compositor, Double ts_offset, u32 obj_time, GF_Filter *from_filter)
+{
+	if (!compositor->player) {
+		compositor->sys_frames_pending = GF_TRUE;
+		if (from_filter)
+			gf_filter_ask_rt_reschedule(from_filter, 0);
+	} else {
+		u32 wait_ms = (u32) (ts_offset * 1000 - obj_time);
+
+		if (!compositor->ms_until_next_frame || ((s32) wait_ms < compositor->ms_until_next_frame)) {
+			compositor->ms_until_next_frame = (s32) wait_ms;
+		}
+		if (from_filter) {
+			gf_filter_ask_rt_reschedule(from_filter, wait_ms*500);
+		}
+	}
+}
+
+Bool gf_sc_check_gl_support(GF_Compositor *compositor)
+{
+#ifdef GPAC_DISABLE_3D
+	return GF_FALSE;
 #else
-	return 0;
+	if (!compositor->player && !compositor->is_opengl) {
+		if (compositor->drv==GF_SC_DRV_OFF) {
+			return GF_FALSE;
+		}
+		compositor->needs_offscreen_gl = GF_TRUE;
+		compositor->autoconfig_opengl = 1;
+		compositor->recompute_ar = 1;
+		return GF_TRUE;
+	}
+	return GF_TRUE;
 #endif
+
 }

gpac-0.8.0.tar.gz/src/compositor/compositor_2d.c -> gpac-1.0.0.tar.gz/src/compositor/compositor_2d.c Changed

gpac-0.8.0.tar.gz/src/compositor/compositor_3d.c -> gpac-1.0.0.tar.gz/src/compositor/compositor_3d.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 / Scene Compositor sub-project
@@ -52,11 +52,10 @@
 	compositor->vp_y = 0;
 
 	scaleX = scaleY = FIX_ONE;
-	if (!compositor->has_size_info) {
+	if (!compositor->has_size_info || compositor->inherit_type_3d) {
 		compositor->visual->width = compositor->vp_width;
 		compositor->visual->height = compositor->vp_height;
 	} else {
-
 		switch (compositor->aspect_ratio) {
 		case GF_ASPECT_RATIO_FILL_SCREEN:
 			break;
@@ -106,10 +105,11 @@
 	evt.setup.width = compositor->display_width;
 	evt.setup.height = compositor->display_height;
 	evt.setup.back_buffer = GF_TRUE;
+	evt.setup.disable_vsync = compositor->bench_mode ? GF_TRUE : GF_FALSE;
 #ifdef GPAC_USE_TINYGL
-	evt.setup.opengl_mode = 0;
+	evt.setup.use_opengl = GF_FALSE;
 #else
-	evt.setup.opengl_mode = 1;
+	evt.setup.use_opengl = GF_TRUE;
 	compositor->is_opengl = GF_TRUE;
 #endif
 
@@ -117,6 +117,9 @@
 		gf_sc_reset_graphics(compositor);
 		return GF_OK;
 	}
+	if (evt.setup.use_opengl) {
+		gf_opengl_init();
+	}
 
 #if defined(GPAC_USE_TINYGL)
 	{
@@ -125,12 +128,12 @@
 		GF_Err e = compositor->video_out->LockBackBuffer(compositor->video_out, &bb, 1);
 		if (e==GF_OK) {
 			switch (bb.pixel_format) {
-			case GF_PIXEL_RGB_32:
+			case GF_PIXEL_RGBX:
 			case GF_PIXEL_ARGB:
 				bpp = 32;
 				break;
-			case GF_PIXEL_RGB_24:
-			case GF_PIXEL_BGR_24:
+			case GF_PIXEL_RGB:
+			case GF_PIXEL_BGR:
 				bpp = 24;
 				break;
 			case GF_PIXEL_RGB_565:
@@ -205,7 +208,7 @@
 	visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
 
 	visual_3d_set_material_2d_argb(tr_state->visual, GF_COL_ARGB(alpha, 0xFF, 0xFF, 0xFF));
-	
+		
 	if (alpha && (alpha != 0xFF)) {
 		gf_sc_texture_set_blend_mode(txh, TX_MODULATE);
 	} else if (gf_sc_texture_is_transparent(txh)) {
@@ -232,7 +235,7 @@
 			if (tr_state->depth_offset) {
 				GF_Matrix mx;
 				Fixed offset;
-				Fixed disp_depth = (compositor->display_depth<0) ? INT2FIX(tr_state->visual->height) : INT2FIX(compositor->display_depth);
+				Fixed disp_depth = (compositor->dispdepth<0) ? INT2FIX(tr_state->visual->height) : INT2FIX(compositor->dispdepth);
 				if (disp_depth) {
 					GF_Matrix bck_mx;
 					if (!tr_state->pixel_metrics) disp_depth = gf_divfix(disp_depth, tr_state->min_hsize);
@@ -260,6 +263,5 @@
 	}
 }
 
-
 #endif

gpac-0.8.0.tar.gz/src/compositor/compositor_node_init.c -> gpac-1.0.0.tar.gz/src/compositor/compositor_node_init.c Changed

gpac-0.8.0.tar.gz/src/compositor/drawable.c -> gpac-1.0.0.tar.gz/src/compositor/drawable.c Changed

@@ -167,15 +167,15 @@
 void drawable_del_ex(Drawable *dr, GF_Compositor *compositor)
 {
 	StrikeInfo2D *si;
-	Bool is_reg = 0;
-	DRInfo *dri, *cur;
+	DRInfo *dri;
 	BoundInfo *bi, *_cur;
 
 
 	/*remove node from all visuals it's on*/
 	dri = dr->dri;
 	while (dri) {
-		is_reg = compositor ? gf_sc_visual_is_registered(compositor, dri->visual) : 0;
+		DRInfo *cur;
+		Bool is_reg = compositor ? gf_sc_visual_is_registered(compositor, dri->visual) : 0;
 
 		bi = dri->current_bounds;
 		while (bi) {
@@ -320,7 +320,7 @@
 }
 
 /*move current bounds to previous bounds*/
-Bool drawable_flush_bounds(Drawable *drawable, GF_VisualManager *on_visual, u32 draw_mode)
+Bool drawable_flush_bounds(Drawable *drawable, GF_VisualManager *on_visual, u32 mode2d)
 {
 	Bool was_drawn;
 	DRInfo *dri;
@@ -342,9 +342,9 @@
 
 	was_drawn = (dri->current_bounds && dri->current_bounds->clip.width) ? 1 : 0;
 
-	if (draw_mode) {
+	if (mode2d) {
 		/*permanent direct drawing mode, destroy previous bounds*/
-		if (draw_mode==1) {
+		if (mode2d==1) {
 			if (dri->previous_bounds) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor2D] Destroying previous bounds info for drawable %s\n", gf_node_get_class_name(drawable->node)));
 				while (dri->previous_bounds) {
@@ -584,7 +584,7 @@
 				asp->fill_color &= 0x00FFFFFF;
 				break;
 			case TAG_MPEG4_PointSet2D:
-				asp->fill_color |= FIX2INT(255 * (m ? (FIX_ONE - m->transparency) : FIX_ONE)) << 24;
+				asp->fill_color |= ((u32 )(FIX2INT(255 * (m ? (FIX_ONE - m->transparency) : FIX_ONE))) ) << 24;
 				asp->pen_props.width = 0;
 				break;
 			default:
@@ -760,7 +760,8 @@
 	/*FIXME - only needed for texture*/
 	if (!tr_state->color_mat.identity) {
 		GF_SAFEALLOC(ctx->col_mat, GF_ColorMatrix);
-		gf_cmx_copy(ctx->col_mat, &tr_state->color_mat);
+		if (ctx->col_mat)
+			gf_cmx_copy(ctx->col_mat, &tr_state->color_mat);
 	}
 
 	/*IndexedLineSet2D and PointSet2D ignores fill flag and texturing*/
@@ -907,7 +908,6 @@
 	} else {
 		gf_path_get_bounds(ctx->drawable->path, &store_orig_bounds);
 	}
-	//if (store_orig_bounds) fprintf(stderr, "store_orig_bounds: %d\n", (int) store_orig_bounds.width );
 	ctx->bi->unclip = store_orig_bounds;
 	gf_mx2d_apply_rect(&tr_state->transform, &ctx->bi->unclip);
 
@@ -984,7 +984,6 @@
 	Drawable *hlight;
 	GF_Node *prev_node;
 	u32 prev_mode;
-	GF_Rect *bounds;
 	GF_Matrix2D cur;
 	GF_Compositor *compositor = tr_state->visual->compositor;
 
@@ -1006,6 +1005,7 @@
 	/*check if focus node has changed*/
 	prev_node = gf_node_get_private(hlight->node);
 	if (prev_node != node) {
+		GF_Rect *bounds;
 		/*this is a grouping node, get its bounds*/
 		if (!orig_bounds) {
 			gf_mx2d_copy(cur, tr_state->transform);
@@ -1031,10 +1031,10 @@
 	}
 	hl_ctx = visual_2d_get_drawable_context(tr_state->visual);
 	hl_ctx->drawable = hlight;
-	hl_ctx->aspect.fill_color = compositor->highlight_fill;
-	hl_ctx->aspect.line_color = compositor->highlight_stroke;
+	hl_ctx->aspect.fill_color = compositor->hlfill;
+	hl_ctx->aspect.line_color = compositor->hlline;
 	hl_ctx->aspect.line_scale = 0;
-	hl_ctx->aspect.pen_props.width = compositor->highlight_stroke_width;
+	hl_ctx->aspect.pen_props.width = compositor->hllinew;
 	hl_ctx->aspect.pen_props.join = GF_LINE_JOIN_BEVEL;
 	hl_ctx->aspect.pen_props.dash = GF_DASH_STYLE_DOT;
 
@@ -1042,7 +1042,7 @@
 	if (compositor->edited_text) {
 		hl_ctx->aspect.pen_props.width = 2*FIX_ONE;
 		hl_ctx->aspect.pen_props.dash = 1;
-		hl_ctx->aspect.line_color = compositor->highlight_stroke;
+		hl_ctx->aspect.line_color = compositor->hlline;
 	}
 
 
@@ -1081,7 +1081,9 @@
 {
 	StrikeInfo2D *si, *prev;
 	GF_Node *lp;
+#ifndef GPAC_DISABLE_VRML
 	Bool dirty;
+#endif
 	if (!asp->pen_props.width) return NULL;
 	if (path && !path->n_points) return NULL;
 
@@ -1145,11 +1147,13 @@
 	/*node changed or outline not build*/
 #ifndef GPAC_DISABLE_VRML
 	dirty = lp ? drawable_lineprops_dirty(lp) : 0;
-#else
-	dirty = 0;
 #endif
 
-	if (!si->outline || dirty || (si->line_scale != asp->line_scale) || (si->path_length != asp->pen_props.path_length) || (svg_flags & CTX_SVG_OUTLINE_GEOMETRY_DIRTY)) {
+	if (!si->outline
+#ifndef GPAC_DISABLE_VRML
+		|| dirty
+#endif
+		|| (si->line_scale != asp->line_scale) || (si->path_length != asp->pen_props.path_length) || (svg_flags & CTX_SVG_OUTLINE_GEOMETRY_DIRTY)) {
 		u32 i;
 		Fixed w = asp->pen_props.width;
 		Fixed dash_o = asp->pen_props.dash_offset;
@@ -1518,7 +1522,8 @@
 	/*FIXME - only needed for texture*/
 	if (!tr_state->color_mat.identity) {
 		GF_SAFEALLOC(ctx->col_mat, GF_ColorMatrix);
-		gf_cmx_copy(ctx->col_mat, &tr_state->color_mat);
+		if (ctx->col_mat)
+			gf_cmx_copy(ctx->col_mat, &tr_state->color_mat);
 	}
 
 	switch (gf_node_get_tag(ctx->drawable->node) ) {

gpac-0.8.0.tar.gz/src/compositor/drawable.h -> gpac-1.0.0.tar.gz/src/compositor/drawable.h Changed

gpac-0.8.0.tar.gz/src/compositor/events.c -> gpac-1.0.0.tar.gz/src/compositor/events.c Changed

@@ -27,7 +27,6 @@
 #include "nodes_stacks.h"
 #include "mpeg4_grouping.h"
 #include <gpac/options.h>
-#include <gpac/internal/terminal_dev.h>
 #include <gpac/utf.h>
 
 static GF_Node *browse_parent_for_focus(GF_Compositor *compositor, GF_Node *elt, Bool prev_focus);
@@ -70,8 +69,6 @@
 static void flush_text_node_edit(GF_Compositor *compositor, Bool final_flush)
 {
 	Bool signal;
-	char *txt;
-	size_t len;
 	if (!compositor->edited_text) return;
 
 	/* if this is the final editing and there is text,
@@ -88,6 +85,8 @@
 		*compositor->edited_text = NULL;
 	}
 	if (compositor->sel_buffer_len) {
+		char *txt;
+		size_t len;
 		const u16 *lptr;
 		txt = (char*)gf_malloc(sizeof(char)*2*compositor->sel_buffer_len);
 		lptr = compositor->sel_buffer;
@@ -267,8 +266,7 @@
 					if (append) {
 						u16 end;
 						const u16 *srcp;
-						size_t len;
-						GF_DOMText *cur, *ntext;
+						GF_DOMText *ntext;
 						GF_ChildNodeItem *children = ((GF_ParentNode *) compositor->focus_node)->children;
 						GF_Node *t = gf_node_new(gf_node_get_graph(child->node), TAG_SVG_tbreak);
 
@@ -282,6 +280,9 @@
 							gf_node_list_insert_child(&children, t, pos);
 							res = &((GF_DOMText *)child->node)->textContent;
 						} else {
+							size_t len;
+							GF_DOMText *cur;
+
 							gf_node_list_insert_child(&children, t, pos+1);
 							ntext = (GF_DOMText*) gf_node_new(gf_node_get_graph(child->node), TAG_DOMText);
 							gf_node_init(t);
@@ -340,18 +341,6 @@
 						}
 						res = &((GF_DOMText *)child->node)->textContent;
 					}
-					/*				if (1) {
-										GF_ChildNodeItem *child = ((GF_ParentNode *) compositor->focus_node)->children;
-										fprintf(stderr, "Dumping text tree:\n");
-										while (child) {
-											switch (gf_node_get_tag(child->node)) {
-											case TAG_SVG_tbreak: fprintf(stderr, "\ttbreak\n"); break;
-											case TAG_DOMText: fprintf(stderr, "\ttext: %s\n", ((GF_DOMText *)child->node)->textContent); break;
-											}
-											child = child->next;
-										}
-									}
-					*/
 					break;
 				}
 				child = child->next;
@@ -551,9 +540,7 @@
 		GF_Err e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
 		if (e == GF_OK) return;
 	}
-	if (compositor->term) {
-		gf_term_user_event(compositor->term, &evt);
-	}
+	gf_sc_user_event(compositor, &evt);
 }
 
 static Bool hit_node_editable(GF_Compositor *compositor, Bool check_focus_node)
@@ -662,9 +649,7 @@
 
 	cursor_type = GF_CURSOR_NORMAL;
 	/*all mouse events*/
-	if ((event->type<=GF_EVENT_MOUSEWHEEL)
-	        // && (gf_node_get_dom_event_filter(gf_sg_get_root_node(compositor->scene)) & GF_DOM_EVENT_MOUSE)
-	   ) {
+	if (event->type<=GF_EVENT_MOUSEWHEEL) {
 		Fixed X = compositor->hit_world_point.x;
 		Fixed Y = compositor->hit_world_point.y;
 		/*flip back to origin at top-left*/
@@ -738,7 +723,7 @@
 				TODO quick- fix for iPhone as well
 				TODO clean: figure out whether we use a mouse or a touch device - if touch device, remove this test
 				*/
-#if !defined(_WIN32_WCE) || !defined(GPAC_ANDROID)
+#if !defined(_WIN32_WCE) || !defined(GPAC_CONFIG_ANDROID)
 				if ((compositor->grab_x == X) && (compositor->grab_y == Y))
 #endif
 				{
@@ -1374,7 +1359,6 @@
 #endif
 		{
 			s32 i, wc;
-			GF_ChildNodeItem *child;
 #ifndef GPAC_DISABLE_X3D
 			if (tag==TAG_X3D_Switch) {
 				child = ((X_Switch*)elt)->children;
@@ -1913,7 +1897,7 @@
 		if (ev->type==GF_EVENT_KEYDOWN) {
 			switch (ev->key.key_code) {
 			case GF_KEY_ENTER:
-				if (0&&compositor->focus_text_type) {
+				if ((0) && compositor->focus_text_type) {
 					exec_text_input(compositor, NULL);
 					ret = GF_TRUE;
 #ifndef GPAC_DISABLE_VRML
@@ -1932,9 +1916,10 @@
 			case GF_KEY_RIGHT:
 				if (compositor->focus_uses_dom_events) {
 					ret += gf_sc_svg_focus_navigate(compositor, ev->key.key_code);
-				} else if (compositor->keynav_node) {
-					GF_Node *next_nav = NULL;
+				}
 #ifndef GPAC_DISABLE_VRML
+				else if (compositor->keynav_node) {
+					GF_Node *next_nav = NULL;
 					switch (ev->key.key_code) {
 					case GF_KEY_UP:
 						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->up;
@@ -1949,12 +1934,12 @@
 						next_nav = ((M_KeyNavigator*)compositor->keynav_node)->right;
 						break;
 					}
-#endif
 					if (next_nav) {
 						gf_sc_change_key_navigator(compositor, next_nav);
 						ret = GF_TRUE;
 					}
 				}
+#endif
 				break;
 			}
 		}
@@ -1966,7 +1951,8 @@
 
 static Bool forward_event(GF_Compositor *compositor, GF_Event *ev, Bool consumed)
 {
-	Bool ret = gf_term_forward_event(compositor->term, ev, consumed, GF_FALSE);
+	Bool ret = gf_filter_forward_gf_event(compositor->filter, ev, consumed, GF_FALSE);
+
 	if (consumed) return GF_FALSE;
 
 	if ((ev->type==GF_EVENT_MOUSEUP) && (ev->mouse.button==GF_MOUSE_LEFT)) {
@@ -1979,7 +1965,7 @@
 			event.mouse.key_states = compositor->key_states;
 			event.mouse.x = ev->mouse.x;
 			event.mouse.y = ev->mouse.y;
-			ret += gf_term_send_event(compositor->term, &event);
+			ret += gf_sc_send_event(compositor, &event);
 		}
 		compositor->last_click_time = now;
 	}
@@ -1993,7 +1979,7 @@
 	Bool switch_coords = GF_FALSE;
 	Bool ret = GF_FALSE;
 	if (evt->type<=GF_EVENT_MOUSEWHEEL) {
-		if (compositor->simulate_gaze) {
+		if (compositor->sgaze) {
 			compositor->gaze_x = evt->mouse.x;
 			compositor->gaze_y = evt->mouse.y;
 		}
@@ -2037,11 +2023,10 @@
 	if (!ret) {
 #ifndef GPAC_DISABLE_3D
 		/*remember active layer on mouse click - may be NULL*/
-		if ((evt->type==GF_EVENT_MOUSEDOWN) && (evt->mouse.button==GF_MOUSE_LEFT)) compositor->active_layer = compositor->traverse_state->layer3d;
+		if ((evt->type==GF_EVENT_MOUSEDOWN) && (evt->mouse.button==GF_MOUSE_LEFT))
+			compositor->active_layer = compositor->traverse_state->layer3d;
 #endif
-	}
 
-    if (!ret) {
         ret = forward_event(compositor, evt, ret);
     }
     //if event is consumed before forwarding don't apply navigation

gpac-0.8.0.tar.gz/src/compositor/font_engine.c -> gpac-1.0.0.tar.gz/src/compositor/font_engine.c Changed

@@ -44,40 +44,17 @@
 };
 
 GF_EXPORT
-GF_FontManager *gf_font_manager_new(GF_User *user)
+GF_FontManager *gf_font_manager_new()
 {
 	char *def_font = "SERIF";
-	u32 i, count;
 	GF_FontManager *font_mgr;
 	GF_FontReader *ifce;
-	const char *opt;
-
-	ifce = NULL;
-	opt = gf_cfg_get_key(user->config, "FontEngine", "FontReader");
-	if (opt) {
-		ifce = (GF_FontReader *) gf_modules_load_interface_by_name(user->modules, opt, GF_FONT_READER_INTERFACE);
-		if (ifce && ifce->init_font_engine(ifce) != GF_OK) {
-			gf_modules_close_interface((GF_BaseInterface *)ifce);
-			ifce = NULL;
-		}
-	}
+	Bool wait_for_fonts = gf_opts_get_bool("core", "wait-fonts");
 
-	if (!ifce) {
-		count = gf_modules_get_count(user->modules);
-		for (i=0; i<count; i++) {
-			ifce = (GF_FontReader *) gf_modules_load_interface(user->modules, i, GF_FONT_READER_INTERFACE);
-			if (!ifce) continue;
+	ifce = (GF_FontReader *) gf_module_load(GF_FONT_READER_INTERFACE, NULL);
+	if (ifce) ifce->init_font_engine(ifce);
 
-			if (ifce->init_font_engine(ifce) != GF_OK) {
-				gf_modules_close_interface((GF_BaseInterface *)ifce);
-				ifce = NULL;
-				continue;
-			}
 
-			gf_cfg_set_key(user->config, "FontEngine", "FontReader", ifce->module_name);
-			break;
-		}
-	}
 	GF_SAFEALLOC(font_mgr, GF_FontManager);
 	if (!font_mgr) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate font manager\n"));
@@ -96,9 +73,8 @@
 	gf_path_add_line_to(font_mgr->line_path, -FIX_ONE/2, -FIX_ONE/2);
 	gf_path_close(font_mgr->line_path);
 
-	opt = gf_cfg_get_key(user->config, "FontEngine", "WaitForFontLoad");
-	if (!opt) gf_cfg_set_key(user->config, "FontEngine", "WaitForFontLoad", "no");
-	if (opt && !strcmp(opt, "yes")) font_mgr->wait_font_load = 1;
+
+	font_mgr->wait_font_load = wait_for_fonts;
 
 	return font_mgr;
 }
@@ -207,15 +183,15 @@
 		font_name = alt_fonts[i];
 
 		if (!stricmp(font_name, "SERIF")) {
-			opt = gf_modules_get_option((GF_BaseInterface *)fm->reader, "FontEngine", "FontSerif");
+			opt = gf_opts_get_key("FontCache", "FontSerif");
 			if (opt) font_name = (char*)opt;
 		}
 		else if (!stricmp(font_name, "SANS") || !stricmp(font_name, "sans-serif")) {
-			opt = gf_modules_get_option((GF_BaseInterface *)fm->reader, "FontEngine", "FontSans");
+			opt = gf_opts_get_key("FontCache", "FontSans");
 			if (opt) font_name = (char*)opt;
 		}
 		else if (!stricmp(font_name, "TYPEWRITER") || !stricmp(font_name, "monospace")) {
-			opt = gf_modules_get_option((GF_BaseInterface *)fm->reader, "FontEngine", "FontFixed");
+			opt = gf_opts_get_key("FontCache", "FontFixed");
 			if (opt) font_name = (char*)opt;
 		}
 
@@ -672,12 +648,10 @@
 	Fixed cx, cy, sx, sy, max, min;
 	u32 tw, th;
 	GF_Matrix2D mx;
-	GF_STENCIL stencil, brush;
-	GF_SURFACE surface;
+	GF_EVGStencil *stencil, *brush;
+	GF_EVGSurface *surface;
 	u32 width, height;
 	Fixed scale;
-	GF_Raster2D *raster = compositor->rasterizer;
-
 	span_alloc_extensions(span);
 
 	/*something failed*/
@@ -747,7 +721,7 @@
 	gf_sc_texture_setup(span->ext->txh, compositor, NULL);
 	gf_sc_texture_allocate(span->ext->txh);
 	stencil = gf_sc_texture_get_stencil(span->ext->txh);
-	if (!stencil) stencil = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
+	if (!stencil) stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 
 	/*FIXME - make it work with alphagrey...*/
 	span->ext->txh->width = width;
@@ -757,7 +731,7 @@
 	span->ext->txh->transparent = 1;
 	span->ext->txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
 
-	surface = raster->surface_new(raster, 1);
+	surface = gf_evg_surface_new(1);
 	if (!surface) {
 		gf_sc_texture_release(span->ext->txh);
 		return 0;
@@ -765,11 +739,11 @@
 	span->ext->txh->data = (char *) gf_malloc(sizeof(char)*span->ext->txh->stride*span->ext->txh->height);
 	memset(span->ext->txh->data, 0, sizeof(char)*span->ext->txh->stride*span->ext->txh->height);
 
-	raster->stencil_set_texture(stencil, span->ext->txh->data, span->ext->txh->width, span->ext->txh->height, span->ext->txh->stride, span->ext->txh->pixelformat, span->ext->txh->pixelformat, 1);
-	raster->surface_attach_to_texture(surface, stencil);
+	gf_evg_stencil_set_texture(stencil, span->ext->txh->data, span->ext->txh->width, span->ext->txh->height, span->ext->txh->stride, span->ext->txh->pixelformat);
+	gf_evg_surface_attach_to_texture(surface, stencil);
 
-	brush = raster->stencil_new(raster, GF_STENCIL_SOLID);
-	raster->stencil_set_brush_color(brush, 0xFF000000);
+	brush = gf_evg_stencil_new(GF_STENCIL_SOLID);
+	gf_evg_stencil_set_brush_color(brush, for_3d ? 0xFFFFFFFF : tr_state->ctx->aspect.fill_color);
 
 	cx = bounds.x + bounds.width/2;
 	cy = bounds.y - bounds.height/2;
@@ -779,14 +753,14 @@
 	gf_mx2d_add_scale(&mx, sx, sy);
 //	gf_mx2d_add_scale(&mx, 99*FIX_ONE/100, 99*FIX_ONE/100);
 
-	raster->surface_set_matrix(surface, &mx);
-	raster->surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
+	gf_evg_surface_set_matrix(surface, &mx);
+	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
 	span_path = gf_font_span_create_path(span);
-	raster->surface_set_path(surface, span_path);
+	gf_evg_surface_set_path(surface, span_path);
 
-	raster->surface_fill(surface, brush);
-	raster->stencil_delete(brush);
-	raster->surface_delete(surface);
+	gf_evg_surface_fill(surface, brush);
+	gf_evg_stencil_delete(brush);
+	gf_evg_surface_delete(surface);
 	gf_path_del(span_path);
 
 	if (span->font->baseline) {
@@ -863,7 +837,7 @@
 	Bool fill_2d, vect_outline, can_texture_text;
 	GF_Compositor *compositor = (GF_Compositor*)tr_state->visual->compositor;
 
-	vect_outline = !compositor->raster_outlines;
+	vect_outline = !compositor->linegl;
 
 	visual_3d_set_state(tr_state->visual, V3D_STATE_BLEND, 0);
 
@@ -927,7 +901,7 @@
 	can_texture_text = 0;
 	if (fill_2d || !asp) {
 		/*check if we can use text texturing*/
-		if (force_texturing || (compositor->texture_text_mode != GF_TEXTURE_TEXT_NEVER) ) {
+		if (force_texturing || (compositor->textxt != GF_TEXTURE_TEXT_NEVER) ) {
 			if (fill_2d && asp->pen_props.width) {
 				can_texture_text = 0;
 			} else {
@@ -936,18 +910,19 @@
 		}
 	}
 
-	visual_3d_enable_antialias(tr_state->visual, compositor->antiAlias);
+	visual_3d_enable_antialias(tr_state->visual, compositor->aa);
 	if (fill_2d || !asp || tr_state->mesh_num_textures) {
-		if (fill_2d) visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
+		if (fill_2d && asp) visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
 
 		i = tr_state->text_split_idx ? tr_state->text_split_idx-1 : 0;
 		while ((span = (GF_TextSpan *)gf_list_enum(spans, &i))) {
 			if (text_hl) {
 				visual_3d_fill_rect(tr_state->visual, span->bounds, hl_color);
 
-				if (fill_2d)
-					visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
-				else
+				if (fill_2d) {
+					if (asp)
+						visual_3d_set_material_2d_argb(tr_state->visual, asp->fill_color);
+				} else
 					visual_3d_setup_appearance(tr_state);
 			}
 
@@ -966,7 +941,7 @@
 
 			if (tr_state->text_split_idx) break;
 		}
-		tr_state->visual->has_material_2d = 0;
+		tr_state->visual->has_material_2d = GF_FALSE;
 
 		/*reset texturing in case of line texture*/
 		if (!asp) visual_3d_disable_texture(tr_state);
@@ -1285,12 +1260,11 @@
 
 void gf_font_spans_get_selection(GF_Node *node, GF_List *spans, GF_TraverseState *tr_state)
 {
-	GF_TextSpan *span;
 	u32 i, count;
 	GF_Rect rc;
 	count = gf_list_count(spans);
 	for (i=0; i<count; i++) {
-		span = (GF_TextSpan *)gf_list_get(spans, i);
+		GF_TextSpan *span = (GF_TextSpan *)gf_list_get(spans, i);
 		gf_font_spans_select(span, tr_state, NULL, (i+1<count) ? 1 : 0, (i==0) ? 1 : 0, &rc);
 	}
 }
@@ -1306,7 +1280,7 @@
 	GF_Rect rc;
 
 	use_texture_text = 0;
-	if (force_texture_text || (compositor->texture_text_mode==GF_TEXTURE_TEXT_ALWAYS) ) {
+	if (force_texture_text || (compositor->textxt==GF_TEXTURE_TEXT_ALWAYS) ) {
 		use_texture_text = !ctx->aspect.fill_texture && !ctx->aspect.pen_props.width;
 	}
 
@@ -1332,6 +1306,7 @@
 		if (GF_COL_A(hl_color) == 0) hl_color = 0;
 	}
 
+	memset(&rc, 0, sizeof(GF_Rect));
 	count = gf_list_count(spans);
 	i=ctx->sub_path_index ? ctx->sub_path_index-1 : 0;
 	for(; i<count; i++) {
@@ -1442,13 +1417,6 @@
 			gf_path_get_bounds(span->glyphs[j]->path, &rc);
 			rc.height = INT2FIX(span->font->ascent + span->font->descent);
 
-			if (0&&span->rot) {
-				GF_Matrix2D r;
-				gf_mx2d_init(r);
-				gf_mx2d_add_rotation(&r, 0, 0, span->rot[i]);
-				gf_mx2d_apply_coords(&r, &loc_x, &loc_y);
-			}
-
 			if (use_dom_events && !compositor->sel_buffer) {
 				if (svg_drawable_is_over(drawable, loc_x, loc_y, &asp, tr_state, &rc))
 					goto picked;

gpac-0.8.0.tar.gz/src/compositor/gl_inc.h -> gpac-1.0.0.tar.gz/src/compositor/gl_inc.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -27,89 +27,102 @@
 #define _GL_INC_H_
 
 #ifdef WIN32
-#include <windows.h>
+# include <windows.h>
 #endif
 
 
 #ifndef _GF_SETUP_H_
-#error "Missing gpac/setup.h include"
+# error "Missing gpac/setup.h include"
 #endif
 
 #ifndef GPAC_DISABLE_3D
 
 #ifdef GPAC_USE_GLES1X
+# ifdef GPAC_CONFIG_ANDROID
+#  include "GLES/gl.h"
+# elif defined(GPAC_CONFIG_IOS)
+#  include "OpenGLES/ES1/gl.h"
+#  include "OpenGLES/ES1/glext.h"
+#  include "glues.h"
+# else
+/*non standard include on linux/windows, usually not used*/
+#  include "GLES/egl.h"
+# endif
+
+# if defined(GPAC_HAS_GLU) && !defined (GPAC_CONFIG_IOS)
+/*WARNING - this is NOT a standard include, GLU is not supported by GLES*/
+#  include <GLES/glu.h>
+# endif
 
-#ifdef GPAC_ANDROID
-#include "GLES/gl.h"
-#elif defined(GPAC_IPHONE)
-#include "OpenGLES/ES1/gl.h"
-#include "OpenGLES/ES1/glext.h"
-#include "glues.h"
-#else
-#include "GLES/egl.h"
-#endif
+# ifndef EGL_VERSION_1_0
+#  define EGL_VERSION_1_0		1
+# endif
 
-#if defined(GPAC_HAS_GLU) && !defined (GPAC_IPHONE)
-/*WARNING - this is NOT a standard include, GLU is not supported by GLES*/
-#include <GLES/glu.h>
-#endif
+# ifndef EGL_VERSION_1_1
+#  ifdef GL_OES_VERSION_1_1
+#   define EGL_VERSION_1_1		1
+#  endif
+# endif
 
+//end GPAC_USE_GLES1X
 
-#ifndef EGL_VERSION_1_0
-#define EGL_VERSION_1_0		1
-#endif
+# elif defined(GPAC_USE_GLES2)
+#  ifdef GPAC_CONFIG_IOS
+#   include "OpenGLES/ES2/gl.h"
+#   include "glues.h"
+#  else
+#   include <GLES2/gl2.h>
+#   include <GLES2/gl2ext.h>
+#  endif
 
-#ifndef EGL_VERSION_1_1
-#ifdef GL_OES_VERSION_1_1
-#define EGL_VERSION_1_1		1
-#endif
-#endif
+//end GPAC_USE_GLES2
 
 #elif defined (CONFIG_DARWIN_GL)
 
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 
-#else
+//end CONFIG_DARWIN_GL
 
-
-#define GL_GLEXT_PROTOTYPES
-
-#ifdef GPAC_USE_OGLES1X
-#include <GLES/gl.h>
-#include <GLES/glext.h>
-
-#elif defined(GPAC_USE_GLES2)
-
-#ifdef GPAC_IPHONE
-#include "OpenGLES/ES2/gl.h"
-#include "glues.h"
 #else
+//generic windows/linux config
 
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-#endif
-
-#else
+//in case the versions are defined, get the prototypes
+# define GL_GLEXT_PROTOTYPES
+# include <GL/gl.h>
+# ifdef GPAC_HAS_GLU
+#  include <GL/glu.h>
+# endif
 
-#include <GL/gl.h>
+//end generic windows/linux config
 
-#ifdef GPAC_HAS_GLU
-#include <GL/glu.h>
 #endif
 
+#if 0
+#define GL_CHECK_ERR()  {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
+#else
+#define GL_CHECK_ERR()
 #endif
 
+#ifdef GPAC_USE_TINYGL
+# define GLTEXENV	glTexEnvi
+# define GLTEXPARAM	glTexParameteri
+# define TexEnvType u32
+#elif defined (GPAC_USE_GLES1X)
+# define GLTEXENV	glTexEnvx
+# define GLTEXPARAM	glTexParameterx
+# define TexEnvType Fixed
+#else
+# define GLTEXENV	glTexEnvf
+# define GLTEXPARAM	glTexParameteri
+# define TexEnvType Float
 #endif
 
 
-#define GL_CHECK_ERR  {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
-
 /*macros for GL proto and fun declaration*/
 #ifdef _WIN32_WCE
 #define GLAPICAST *
 #elif defined(WIN32)
-#include <windows.h>
 #define GLAPICAST APIENTRY *
 #else
 #define GLAPICAST *
@@ -118,8 +131,11 @@
 #define GLDECL(ret, funname, args)	\
 typedef ret (GLAPICAST proc_ ## funname)args;	\
 extern proc_ ## funname funname;	\
- 
-#define GLDECL_STATIC(funname) proc_ ## funname funname = NULL
+
+
+#define GLDECL_FUNC(funname) proc_ ## funname funname = NULL
+#define GLDECL_FUNC_STATIC(funname) static proc_ ## funname funname = NULL
+#define GLDECL_EXTERN(funname) extern proc_ ## funname funname;
 
 #if defined GPAC_USE_TINYGL
 //no extensions with TinyGL
@@ -129,8 +145,7 @@
 #define LOAD_GL_FUNCS
 #define GET_GLFUN(funname) funname = (proc_ ## funname) wglGetProcAddress(#funname)
 #elif defined(CONFIG_DARWIN_GL)
-extern void (*glutGetProcAddress(const GLubyte *procname))( void );
-#define GET_GLFUN(funname) funname = (proc_ ## funname) glutGetProcAddress(#funname)
+//no extensions with OpenGL on OSX/IOS, glext.h is present
 #else
 #define LOAD_GL_FUNCS
 extern void (*glXGetProcAddress(const GLubyte *procname))( void );
@@ -152,6 +167,10 @@
 #endif
 
 
+#if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
+#  define GPAC_GL_NO_STRIDE
+#endif
+
 #if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
 
 /*redefine all ext needed*/
@@ -316,7 +335,15 @@
 GLDECL(void, glClientActiveTexture, (GLenum texture) )
 
 
-GLDECL(void, glBlendEquation, (GLint mode) )
+GLDECL(void, glBlendColor, (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha))
+GLDECL(void, glBlendEquation, (GLenum mode))
+GLDECL(void, glBlendEquationSeparate, (GLenum modeRGB, GLenum modeAlpha))
+GLDECL(void, glBlendFuncSeparate, (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) )
+
+GLDECL(void, glCompressedTexImage2D, (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data) )
+GLDECL(void, glCompressedTexSubImage2D, (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data) )
+GLDECL(void, glGenerateMipmap, (GLenum target ) )
+
 #endif	//GL_VERSION_1_3
 
 #ifndef GL_VERSION_1_4
@@ -335,7 +362,7 @@
 GLDECL(void, glPointParameterf, (GLenum , GLfloat) )
 GLDECL(void, glPointParameterfv, (GLenum, const GLfloat *) )
 
-#endif
+#endif //GL_VERSION_1_4
 
 
 
@@ -355,7 +382,7 @@
 GLDECL(void, glDeleteBuffers, (GLsizei , GLuint *) )
 GLDECL(void, glBindBuffer, (GLenum, GLuint ) )
 GLDECL(void, glBufferData, (GLenum, int, void *, GLenum) )
-GLDECL(void, glBufferSubData, (GLenum, int, int, void *) )
+GLDECL(void, glBufferSubData, (GLenum, size_t, int, void *) )
 GLDECL(void *, glMapBuffer, (GLenum, GLenum) )
 GLDECL(void *, glUnmapBuffer, (GLenum) )
 
@@ -456,6 +483,113 @@
 #define GL_WRITE_ONLY_ARB   0x88B9
 #define GL_DYNAMIC_DRAW_ARB   0x88E8
 
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION                     0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING             0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE             0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE                   0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE                 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE                  0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE                 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE                 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE               0x8217
+#define GL_FRAMEBUFFER_DEFAULT                               0x8218
+#define GL_FRAMEBUFFER_UNDEFINED                             0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT                          0x821A
+#define GL_MAX_RENDERBUFFER_SIZE                             0x84E8
+#define GL_DEPTH_STENCIL                                     0x84F9
+#define GL_UNSIGNED_INT_24_8                                 0x84FA
+#define GL_DEPTH24_STENCIL8                                  0x88F0
+#define GL_TEXTURE_STENCIL_SIZE                              0x88F1
+#define GL_TEXTURE_RED_TYPE                                  0x8C10
+#define GL_TEXTURE_GREEN_TYPE                                0x8C11
+#define GL_TEXTURE_BLUE_TYPE                                 0x8C12
+#define GL_TEXTURE_ALPHA_TYPE                                0x8C13
+#define GL_TEXTURE_DEPTH_TYPE                                0x8C16
+#define GL_UNSIGNED_NORMALIZED                               0x8C17
+#define GL_FRAMEBUFFER_BINDING                               0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING                          GL_FRAMEBUFFER_BINDING
+#define GL_RENDERBUFFER_BINDING                              0x8CA7
+#define GL_READ_FRAMEBUFFER                                  0x8CA8
+#define GL_DRAW_FRAMEBUFFER                                  0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING                          0x8CAA
+#define GL_RENDERBUFFER_SAMPLES                              0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE                0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME                0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL              0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE      0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER              0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE                              0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT                 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT         0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER                0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER                0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED                           0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS                             0x8CDF
+#define GL_COLOR_ATTACHMENT0                                 0x8CE0
+#define GL_COLOR_ATTACHMENT1                                 0x8CE1
+#define GL_COLOR_ATTACHMENT2                                 0x8CE2
+#define GL_COLOR_ATTACHMENT3                                 0x8CE3
+#define GL_COLOR_ATTACHMENT4                                 0x8CE4
+#define GL_COLOR_ATTACHMENT5                                 0x8CE5
+#define GL_COLOR_ATTACHMENT6                                 0x8CE6
+#define GL_COLOR_ATTACHMENT7                                 0x8CE7
+#define GL_COLOR_ATTACHMENT8                                 0x8CE8
+#define GL_COLOR_ATTACHMENT9                                 0x8CE9
+#define GL_COLOR_ATTACHMENT10                                0x8CEA
+#define GL_COLOR_ATTACHMENT11                                0x8CEB
+#define GL_COLOR_ATTACHMENT12                                0x8CEC
+#define GL_COLOR_ATTACHMENT13                                0x8CED
+#define GL_COLOR_ATTACHMENT14                                0x8CEE
+#define GL_COLOR_ATTACHMENT15                                0x8CEF
+#define GL_DEPTH_ATTACHMENT                                  0x8D00
+#define GL_STENCIL_ATTACHMENT                                0x8D20
+#define GL_FRAMEBUFFER                                       0x8D40
+#define GL_RENDERBUFFER                                      0x8D41
+#define GL_RENDERBUFFER_WIDTH                                0x8D42
+#define GL_RENDERBUFFER_HEIGHT                               0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT                      0x8D44
+#define GL_STENCIL_INDEX1                                    0x8D46
+#define GL_STENCIL_INDEX4                                    0x8D47
+#define GL_STENCIL_INDEX8                                    0x8D48
+#define GL_STENCIL_INDEX16                                   0x8D49
+#define GL_RENDERBUFFER_RED_SIZE                             0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE                           0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE                            0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE                           0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE                           0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE                         0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE                0x8D56
+#define GL_MAX_SAMPLES                                       0x8D57
+
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_ARRAY_BUFFER_BINDING                        0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING                0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING          0x889F
+#define GL_BLEND_COLOR                    0x8005
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
 
 GLDECL(GLuint, glCreateProgram, (void) )
 GLDECL(void, glDeleteProgram, (GLuint ) )
@@ -470,6 +604,9 @@
 GLDECL(void, glGetShaderiv, (GLuint shader, GLenum type, GLint *res) )
 GLDECL(void, glGetInfoLogARB, (GLuint shader, GLint size, GLsizei *rsize, const char *logs) )
 GLDECL(GLint, glGetUniformLocation, (GLuint prog, const char *name) )
+GLDECL(GLint, glGetUniformfv, (GLuint program, GLint location, GLfloat *params))
+GLDECL(GLint, glGetUniformiv, (GLuint program, GLint location, GLint *params))
+
 GLDECL(void, glUniform1f, (GLint location, GLfloat v0) )
 GLDECL(void, glUniform2f, (GLint location, GLfloat v0, GLfloat v1) )
 GLDECL(void, glUniform3f, (GLint location, GLfloat v0, GLfloat v1, GLfloat v2) )
@@ -497,14 +634,63 @@
 GLDECL(void, glUniformMatrix4x3fv, (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value) )
 GLDECL(void, glGetProgramiv, (GLuint program, GLenum pname, GLint *params) )
 GLDECL(void, glGetProgramInfoLog, (GLuint program,  GLsizei maxLength,  GLsizei *length,  char *infoLog) )
-
-#ifndef GPAC_ANDROID
+GLDECL(void, glGetShaderInfoLog, (GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog) )
+GLDECL(void, glGetShaderSource, (GLuint shader, GLsizei bufSize, GLsizei *length, char *source) )
+
+GLDECL(void, glGetActiveAttrib, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, const char *name))
+GLDECL(void, glGetActiveUniform, (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, const char *name))
+GLDECL(void, glGetAttachedShaders, (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders))
+GLDECL(void, glBindAttribLocation, (GLuint program, GLuint index, const char *name))
+
+GLDECL(GLboolean, glIsBuffer, (GLuint buffer) )
+GLDECL(GLboolean, glIsFramebuffer, (GLuint framebuffer))
+GLDECL(GLboolean, glIsProgram, (GLuint program))
+GLDECL(GLboolean, glIsRenderbuffer, (GLuint rbuffer))
+GLDECL(GLboolean, glIsShader, (GLuint shader))
+GLDECL(void, glSampleCoverage, (GLclampf value, GLboolean invert) )
+GLDECL(void, glStencilFuncSeparate, (GLenum face, GLenum func, GLint ref, GLuint mask) )
+GLDECL(void, glStencilOpSeparate, (GLenum face, GLenum fail, GLenum zfail, GLenum zpass) )
+GLDECL(void, glStencilMaskSeparate, (GLenum face, GLuint mask) )
+GLDECL(void, glValidateProgram, (GLuint program) )
+
+GLDECL(void, glVertexAttrib1fv, (GLuint index, const GLfloat *v) )
+GLDECL(void, glVertexAttrib1f, (GLuint index, GLfloat x))
+GLDECL(void, glVertexAttrib2f, (GLuint index, GLfloat x, GLfloat y))
+GLDECL(void, glVertexAttrib2fv, (GLuint index, const GLfloat *v))
+GLDECL(void, glVertexAttrib3f, (GLuint index, GLfloat x, GLfloat y, GLfloat z))
+GLDECL(void, glVertexAttrib3fv, (GLuint index, const GLfloat *v))
+GLDECL(void, glVertexAttrib4f, (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w))
+GLDECL(void, glVertexAttrib4fv, (GLuint index, const GLfloat *v))
+
+GLDECL(void, glGetBufferParameteriv, (GLenum target, GLenum pname, GLint *params) )
+GLDECL(void, glGetFramebufferAttachmentParameteriv, (GLenum target, GLenum attachment, GLenum pname, GLint *params) )
+
+GLDECL(void, glGetVertexAttribiv, (GLuint index, GLenum pname, GLint *params) )
+GLDECL(void, glGetVertexAttribfv, (GLuint index, GLenum pname, GLfloat *params) )
+GLDECL(void, glGetVertexAttribPointerv, (GLuint index, GLenum pname, GLvoid **pointer) )
+
+#ifndef GPAC_CONFIG_ANDROID
 GLDECL(void, glEnableVertexAttribArray, (GLuint index) )
 GLDECL(void, glDisableVertexAttribArray, (GLuint index) )
 GLDECL(void, glVertexAttribPointer, (GLuint  index,  GLint  size,  GLenum  type,  GLboolean  normalized,  GLsizei  stride,  const GLvoid *  pointer) )
 GLDECL(void, glVertexAttribIPointer, (GLuint  index,  GLint  size,  GLenum  type,  GLsizei  stride,  const GLvoid *  pointer) )
 GLDECL(GLint, glGetAttribLocation, (GLuint prog, const char *name) )
-#endif
+
+GLDECL(void, glBindFramebuffer, (GLenum target, GLuint framebuffer))
+GLDECL(void, glFramebufferTexture2D, (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level))
+GLDECL(void, glGenFramebuffers, (GLsizei n, GLuint *ids))
+GLDECL(void, glGenRenderbuffers, (GLsizei n, GLuint *renderbuffers))
+GLDECL(void, glBindRenderbuffer, (GLenum target, GLuint renderbuffer))
+GLDECL(void, glRenderbufferStorage, (GLenum target, GLenum internalformat, GLsizei width, GLsizei height))
+GLDECL(void, glFramebufferRenderbuffer, (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer))
+GLDECL(void, glDeleteFramebuffers, (GLsizei n, const GLuint * framebuffers))
+GLDECL(void, glDeleteRenderbuffers, (GLsizei n, const GLuint * renderbuffers))
+GLDECL(void, glGetRenderbufferParameteriv, (GLenum target, GLenum pname, GLint *params) )
+
+GLDECL(GLenum, glCheckFramebufferStatus, (GLenum target))
+
+
+#endif //GPAC_CONFIG_ANDROID
 
 
 #endif //GL_VERSION_2_0

gpac-0.8.0.tar.gz/src/compositor/hardcoded_protos.c -> gpac-1.0.0.tar.gz/src/compositor/hardcoded_protos.c Changed

@@ -30,7 +30,6 @@
 #include "mpeg4_grouping.h"
 
 #include <gpac/modules/hardcoded_proto.h>
-#include <gpac/internal/terminal_dev.h>
 #include "texturing.h"
 
 
@@ -40,7 +39,7 @@
 		return GF_FALSE; \
 	}\
 	if (field.fieldType != __type) {\
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[HardcodedProtos] %s field idx %d (%s) is not of type %s\n", __name, field.fieldIndex, field.name, gf_sg_vrml_get_field_type_by_name(__type) ));\
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[HardcodedProtos] %s field idx %d (%s) is not of type %s\n", __name, field.fieldIndex, field.name, gf_sg_vrml_get_field_type_name(__type) ));\
 		return GF_FALSE;\
 	}
 
@@ -99,7 +98,6 @@
 static void TraversePathExtrusion(GF_Node *node, void *rs, Bool is_destroy)
 {
 	PathExtrusion path_ext;
-	Drawable *stack_2d;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	Drawable3D *stack = (Drawable3D *)gf_node_get_private(node);
 
@@ -112,6 +110,7 @@
 
 
 	if (gf_node_dirty_get(node)) {
+		Drawable *stack_2d;
 		u32 mode = tr_state->traversing_mode;
 		tr_state->traversing_mode = TRAVERSE_GET_BOUNDS;
 		gf_node_traverse(path_ext.geometry, tr_state);
@@ -207,13 +206,6 @@
 static void TraversePlanarExtrusion(GF_Node *node, void *rs, Bool is_destroy)
 {
 	PlanarExtrusion plane_ext;
-	Drawable *stack_2d;
-	u32 i, j, k;
-	MFVec3f spine_vec;
-	SFVec3f d;
-	Fixed spine_len;
-	GF_Rect bounds;
-	GF_Path *geo, *spine;
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
 	Drawable3D *stack = (Drawable3D *)gf_node_get_private(node);
 
@@ -227,8 +219,15 @@
 
 
 	if (gf_node_dirty_get(node)) {
+		Drawable *stack_2d;
+		u32 i, j, k;
+		MFVec3f spine_vec;
+		SFVec3f d;
+		Fixed spine_len;
+		GF_Rect bounds;
 		u32 cur, nb_pts;
 		u32 mode = tr_state->traversing_mode;
+		GF_Path *geo, *spine;
 		geo = spine = NULL;
 
 		tr_state->traversing_mode = TRAVERSE_GET_BOUNDS;
@@ -424,7 +423,7 @@
 
 	if (gf_node_dirty_get(node)) {
 		PlaneClipper_GetNode(node, &stack->pc);
-		gf_node_dirty_clear(node, 0);
+		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 	}
 
 	if (tr_state->num_clip_planes==MAX_USER_CLIP_PLANES) {
@@ -635,12 +634,10 @@
 	CHECK_FIELD("DepthGroup", 0, GF_SG_VRML_MFNODE);
 	dg->children = *(GF_ChildNodeItem **) field.far_ptr;
 
-	CHECK_FIELD("DepthGroup", 1, GF_SG_VRML_SFINT32);
-
-	CHECK_FIELD("DepthGroup", 2, GF_SG_VRML_SFFLOAT);
+	CHECK_FIELD("DepthGroup", 1, GF_SG_VRML_SFFLOAT);
 	dg->depth_gain = * (SFFloat *) field.far_ptr;
 
-	CHECK_FIELD("DepthGroup", 3, GF_SG_VRML_SFFLOAT);
+	CHECK_FIELD("DepthGroup", 2, GF_SG_VRML_SFFLOAT);
 	dg->depth_offset = * (SFFloat *) field.far_ptr;
 
 	return GF_TRUE;
@@ -1178,6 +1175,7 @@
     CustomTexture tx;
     GF_TextureHandler txh;
     u32 gl_id;
+    Bool disabled;
 } CustomTextureStack;
 
 static Bool CustomTexture_GetNode(GF_Node *node, CustomTexture *tx)
@@ -1212,7 +1210,7 @@
 static void CustomTexture_update(GF_TextureHandler *txh)
 {
 #ifndef GPAC_DISABLE_3D
-    char data[12];
+    u8 data[12];
 #endif
     CustomTextureStack *stack = gf_node_get_private(txh->owner);
     //alloc texture
@@ -1221,6 +1219,8 @@
         gf_sc_texture_allocate(txh);
         if (!txh->tx_io) return;
     }
+    if (stack->disabled) return;
+    
 #ifndef GPAC_DISABLE_3D
     //texture not setup, do it
     if (! gf_sc_texture_get_gl_id(txh)) {
@@ -1229,7 +1229,7 @@
         //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_24;
+        txh->pixelformat = GF_PIXEL_RGB;
 
         //signaling we modified associated data (even if no data in our case) to mark texture as dirty
         gf_sc_texture_set_data(txh);
@@ -1249,9 +1249,9 @@
 #ifndef GPAC_DISABLE_3D
     //setup our texture data
     memset(data, 0, sizeof(char)*12);
-    data[0] = (char) (0xFF * FIX2FLT(stack->tx.intensity)); //first pixel red modulated by intensity
-    data[4] = (char) (0xFF * FIX2FLT(stack->tx.intensity)); //second pixel green
-    data[8] = (char) (0xFF * FIX2FLT(stack->tx.intensity)); //third pixel blue
+    data[0] = (u8) (0xFF * FIX2FLT(stack->tx.intensity)); //first pixel red modulated by intensity
+    data[4] = (u8) (0xFF * FIX2FLT(stack->tx.intensity)); //second pixel green
+    data[8] = (u8) (0xFF * FIX2FLT(stack->tx.intensity)); //third pixel blue
     //last pixel black
     
     glBindTexture( GL_TEXTURE_2D, stack->gl_id);
@@ -1275,6 +1275,11 @@
         gf_node_set_callback_function(node, TraverseCustomTexture);
         stack->tx = tx;
 
+		if (!gf_sc_check_gl_support(compositor)) {
+			stack->disabled = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Driver disabled, cannot render custom texture test\n"));
+			return;
+		}
         //register texture object
         gf_sc_texture_setup(&stack->txh, compositor, node);
         stack->txh.update_texture_fcnt = CustomTexture_update;
@@ -1351,15 +1356,15 @@
 			} else if ((vrinfo.srd_w==vrinfo.srd_max_x) && (vrinfo.srd_h==vrinfo.srd_max_y)) {
 				visible = GF_TRUE;
 			}
-			else if (txh->compositor->force_all_tiles_visible) {
+			else if (txh->compositor->tvtf) {
 				visible = GF_TRUE;
 			//estimate visibility asap, even if texture not yet ready (we have SRD info):
 			//this allows sending stop commands which will free inactive decoder HW context
 			} else {
 				u32 i, j;
 				u32 nb_visible=0;
-				u32 nb_tests = tr_state->visual->compositor->tile_visibility_nb_tests;
-				u32 min_visible_threshold = tr_state->visual->compositor->tile_visibility_threshold;
+				u32 nb_tests = tr_state->visual->compositor->tvtn;
+				u32 min_visible_threshold = tr_state->visual->compositor->tvtt;
 				u32 stride;
 
 				//pick nb_tests vertices spaced every stride in the mesh
@@ -1427,7 +1432,7 @@
 					if (txh->data) {
 						visual_3d_enable_depth_buffer(tr_state->visual, GF_FALSE);
 						visual_3d_enable_antialias(tr_state->visual, GF_FALSE);
-						if (!tr_state->visual->compositor->tile_visibility_debug || (vrinfo.srd_w != vrinfo.srd_max_x)) {
+						if (!tr_state->visual->compositor->tvtd || (vrinfo.srd_w != vrinfo.srd_max_x)) {
 							visual_3d_draw(tr_state, stack->mesh);
 						}
 						visual_3d_enable_depth_buffer(tr_state->visual, GF_TRUE);
@@ -1477,7 +1482,6 @@
 	u32 mode, i, cull_bck;
 	Fixed angle_yaw/*, angle_pitch*/;
 	SFVec3f axis;
-	Fixed dlen;
 	GF_Node *subtree = gf_node_get_private(node);
 	if (is_destroy) return;
 
@@ -1492,10 +1496,14 @@
 	/*target = tr_state->camera->target;*/
 	orig_vp = tr_state->camera->proj_vp;
 
+/*
 	//compute pitch (elevation)
 	dlen = tr_state->camera->target.x*tr_state->camera->target.x + tr_state->camera->target.z*tr_state->camera->target.z;
 	dlen = gf_sqrt(dlen);
+*/
+
 	/*angle_pitch = gf_atan2(tr_state->camera->target.y, dlen);*/
+
 	//compute yaw (rotation Y)
 	angle_yaw = gf_atan2(tr_state->camera->target.z, tr_state->camera->target.x);
 
@@ -1684,10 +1692,6 @@
             return;
         }
 #endif
-		if (!strcmp(url, "urn:inet:gpac:builtin:TextureText")) {
-			compositor_init_texture_text(compositor, node);
-			return;
-		}
 		if (!strcmp(url, "urn:inet:gpac:builtin:OffscreenGroup")) {
 			compositor_init_offscreen_group(compositor, node);
 			return;
@@ -1709,7 +1713,9 @@
 			return;
 		}
 		if (!strcmp(url, "urn:inet:gpac:builtin:FlashShape")) {
+#ifdef GPAC_ENABLE_FLASHSHAPE
 			compositor_init_hc_flashshape(compositor, node);
+#endif
 			return;
 		}
 		if (!strcmp(url, "urn:inet:gpac:builtin:StyleGroup")) {

gpac-0.8.0.tar.gz/src/compositor/hc_flash_shape.c -> gpac-1.0.0.tar.gz/src/compositor/hc_flash_shape.c Changed

gpac-1.0.0.tar.gz/src/compositor/media_object.c Added

@@ -0,0 +1,1544 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/internal/compositor_dev.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/nodes_x3d.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/network.h>
+
+
+#ifndef GPAC_DISABLE_SVG
+static GF_MediaObject *get_sync_reference(GF_Scene *scene, XMLRI *iri, u32 o_type, GF_Node *orig_ref, Bool *post_pone)
+{
+	MFURL mfurl;
+	SFURL sfurl;
+	GF_MediaObject *res;
+	GF_Node *ref = NULL;
+
+	u32 stream_id = 0;
+	if (post_pone) *post_pone = GF_FALSE;
+	
+	if (iri->type==XMLRI_STREAMID) {
+		stream_id = iri->lsr_stream_id;
+	} else if (!iri->string) {
+		return NULL;
+	} else {
+		if (iri->target) ref = (GF_Node *)iri->target;
+		else if (iri->string[0]=='#') ref = gf_sg_find_node_by_name(scene->graph, iri->string+1);
+		else ref = gf_sg_find_node_by_name(scene->graph, iri->string);
+
+		if (ref) {
+			GF_FieldInfo info;
+			/*safety check, break cyclic references*/
+			if (ref==orig_ref) return NULL;
+
+			switch (ref->sgprivate->tag) {
+			case TAG_SVG_audio:
+				o_type = GF_MEDIA_OBJECT_AUDIO;
+				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
+				}
+				return NULL;
+			case TAG_SVG_video:
+				o_type = GF_MEDIA_OBJECT_VIDEO;
+				if (gf_node_get_attribute_by_tag(ref, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+					return get_sync_reference(scene, (XMLRI *)info.far_ptr, o_type, orig_ref ? orig_ref : ref, post_pone);
+				}
+				return NULL;
+			default:
+				return NULL;
+			}
+		}
+	}
+	*post_pone = GF_FALSE;
+	mfurl.count = 1;
+	mfurl.vals = &sfurl;
+	mfurl.vals[0].OD_ID = stream_id;
+	mfurl.vals[0].url = iri->string;
+
+	res = gf_scene_get_media_object(scene, &mfurl, o_type, GF_FALSE);
+	if (!res) *post_pone = GF_TRUE;
+	return res;
+}
+#endif
+
+
+GF_EXPORT
+GF_MediaObject *gf_mo_register(GF_Node *node, MFURL *url, Bool lock_timelines, Bool force_new_res)
+{
+	u32 obj_type;
+#ifndef GPAC_DISABLE_SVG
+	Bool post_pone;
+	GF_FieldInfo info;
+#endif
+	GF_Scene *scene;
+	GF_MediaObject *res, *syncRef;
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	if (!sg) return NULL;
+	scene = (GF_Scene*)gf_sg_get_private(sg);
+	if (!scene) return NULL;
+
+	syncRef = NULL;
+
+	/*keep track of the kind of object expected if URL is not using OD scheme*/
+	switch (gf_node_get_tag(node)) {
+#ifndef GPAC_DISABLE_VRML
+	/*MPEG-4 / VRML / X3D only*/
+	case TAG_MPEG4_AudioClip:
+	case TAG_MPEG4_AudioSource:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_AudioClip:
+#endif
+		obj_type = GF_MEDIA_OBJECT_AUDIO;
+		break;
+	case TAG_MPEG4_SBVCAnimation:
+	case TAG_MPEG4_AnimationStream:
+		obj_type = GF_MEDIA_OBJECT_UPDATES;
+		break;
+	case TAG_MPEG4_BitWrapper:
+		obj_type = GF_MEDIA_OBJECT_SCENE;
+		break;
+	case TAG_MPEG4_InputSensor:
+		obj_type = GF_MEDIA_OBJECT_INTERACT;
+		break;
+	case TAG_MPEG4_Background2D:
+	case TAG_MPEG4_Background:
+	case TAG_MPEG4_ImageTexture:
+	case TAG_MPEG4_CacheTexture:
+	case TAG_MPEG4_MovieTexture:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Background:
+	case TAG_X3D_ImageTexture:
+	case TAG_X3D_MovieTexture:
+#endif
+		obj_type = GF_MEDIA_OBJECT_VIDEO;
+		break;
+	case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Inline:
+#endif
+		obj_type = GF_MEDIA_OBJECT_SCENE;
+		break;
+#endif /*GPAC_DISABLE_VRML*/
+
+		/*SVG*/
+#ifndef GPAC_DISABLE_SVG
+	case TAG_SVG_audio:
+		obj_type = GF_MEDIA_OBJECT_AUDIO;
+		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
+			/*syncRef is specified but doesn't exist yet, post-pone*/
+			if (post_pone) return NULL;
+		}
+		break;
+	case TAG_SVG_video:
+		obj_type = GF_MEDIA_OBJECT_VIDEO;
+		if (gf_node_get_attribute_by_tag(node, TAG_SVG_ATT_syncReference, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			syncRef = get_sync_reference(scene, (XMLRI *)info.far_ptr, GF_MEDIA_OBJECT_UNDEF, node, &post_pone);
+			/*syncRef is specified but doesn't exist yet, post-pone*/
+			if (post_pone) return NULL;
+		}
+		break;
+	case TAG_SVG_image:
+		obj_type = GF_MEDIA_OBJECT_VIDEO;
+		break;
+	case TAG_SVG_foreignObject:
+	case TAG_SVG_animation:
+		obj_type = GF_MEDIA_OBJECT_SCENE;
+		break;
+	case TAG_LSR_updates:
+		obj_type = GF_MEDIA_OBJECT_UPDATES;
+		break;
+#endif
+
+	default:
+		obj_type = GF_MEDIA_OBJECT_UNDEF;
+		break;
+	}
+
+	/*move to primary resource handler*/
+	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);
+	return res;
+}
+
+GF_EXPORT
+void gf_mo_unregister(GF_Node *node, GF_MediaObject *mo)
+{
+	if (mo && node) {
+		gf_mo_event_target_remove_by_node(mo, node);
+	}
+}
+
+GF_MediaObject *gf_mo_new()
+{
+	GF_MediaObject *mo;
+	mo = (GF_MediaObject *) gf_malloc(sizeof(GF_MediaObject));
+	memset(mo, 0, sizeof(GF_MediaObject));
+	mo->speed = FIX_ONE;
+	mo->URLs.count = 0;
+	mo->URLs.vals = NULL;
+	mo->evt_targets = gf_list_new();
+	return mo;
+}
+
+GF_EXPORT
+Bool gf_mo_get_visual_info(GF_MediaObject *mo, u32 *width, u32 *height, u32 *stride, u32 *pixel_ar, u32 *pixelFormat, Bool *is_flipped)
+{
+	if ((mo->type != GF_MEDIA_OBJECT_VIDEO) && (mo->type!=GF_MEDIA_OBJECT_TEXT)) return GF_FALSE;
+
+	if (mo->config_changed) {
+		gf_mo_update_caps(mo);
+	}
+	if (width) *width = mo->width;
+	if (height) *height = mo->height;
+	if (stride) *stride = mo->stride;
+	if (pixel_ar) *pixel_ar = mo->pixel_ar;
+	if (pixelFormat) *pixelFormat = mo->pixelformat;
+	if (is_flipped) *is_flipped = mo->is_flipped;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_mo_get_nb_views(GF_MediaObject *mo, u32 *nb_views)
+{
+	if (mo) *nb_views = mo->nb_views;
+}
+
+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;
+
+	if (mo->odm->pid && (!mo->sample_rate || !mo->num_channels))
+		gf_filter_pid_get_packet(mo->odm->pid);
+
+	if (mo->config_changed) {
+		gf_mo_update_caps(mo);
+	}
+
+	if (sample_rate) *sample_rate = mo->sample_rate;
+	if (bits_per_sample) *bits_per_sample = mo->afmt;
+	if (num_channels) *num_channels = mo->num_channels;
+	if (channel_config) *channel_config = mo->channel_config;
+	if (forced_layout) *forced_layout = GF_FALSE;
+
+	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 ));
+		} else {
+			if (num_channels) *num_channels = 1;
+			if (channel_config) *channel_config = (u64) ( 1 << (mo->odm->ambi_ch_id - 1) );
+			if (forced_layout) *forced_layout = GF_TRUE;
+
+		}
+	}
+
+	return GF_TRUE;
+}
+
+
+void gf_mo_update_caps(GF_MediaObject *mo)
+{
+	const GF_PropertyValue *v, *v2;
+	if (!mo->odm || !mo->odm->pid) return;
+
+	mo->planar_audio = GF_FALSE;
+
+	if (mo->odm->type==GF_STREAM_VISUAL) {
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_WIDTH);
+		if (v) mo->width = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_HEIGHT);
+		if (v) mo->height = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_STRIDE);
+		if (v) mo->stride = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_PIXFMT);
+		if (v) mo->pixelformat = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SAR);
+		if (v) mo->pixel_ar = (v->value.frac.num) << 16 | (v->value.frac.den);
+
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SRD);
+		v2 = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SRD_REF);
+		if (v && v->value.vec4i.w && v->value.vec4i.z) {
+			mo->srd_x = v->value.vec4i.x;
+			mo->srd_y = v->value.vec4i.y;
+			mo->srd_w = v->value.vec4i.z;
+			mo->srd_h = v->value.vec4i.w;
+			if (v2) {
+				mo->srd_full_w = v2->value.vec2i.x;
+				mo->srd_full_h = v2->value.vec2i.y;
+			}
+
+			if (mo->odm->parentscene->is_dynamic_scene) {
+				u32 old_type = mo->odm->parentscene->srd_type;
+				if ((mo->srd_w == mo->srd_full_w) && (mo->srd_h == mo->srd_full_h)) {
+					mo->odm->parentscene->srd_type = 2;
+				} else if (!mo->odm->parentscene->srd_type) {
+					mo->odm->parentscene->srd_type = 1;
+				}
+				if (old_type != mo->odm->parentscene->srd_type) {
+					//reset scene graph but prevent object stop/start
+					u32 i, count = gf_list_count(mo->odm->parentscene->scene_objects);
+					for (i=0; i<count; i++) {
+						GF_MediaObject *an_mo = gf_list_get(mo->odm->parentscene->scene_objects, i);
+						an_mo->num_open++;
+					}
+					gf_sg_reset(mo->odm->parentscene->graph);
+					for (i=0; i<count; i++) {
+						GF_MediaObject *an_mo = gf_list_get(mo->odm->parentscene->scene_objects, i);
+						an_mo->num_open--;
+					}
+					gf_scene_regenerate(mo->odm->parentscene);
+				}
+			}
+		}
+		// SRD object with no size but global scene size: HEVC tiled based object
+		else if (v2 && v2->value.vec2i.x && v2->value.vec2i.y) {
+			if (mo->odm->parentscene->is_dynamic_scene && !mo->odm->parentscene->srd_type) {
+				mo->odm->parentscene->is_tiled_srd = GF_TRUE;
+				mo->srd_full_w = v2->value.vec2i.x;
+				mo->srd_full_h = v2->value.vec2i.y;
+			}
+		}
+	} else if (mo->odm->type==GF_STREAM_AUDIO) {
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_SAMPLE_RATE);
+		if (v) mo->sample_rate = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_NUM_CHANNELS);
+		if (v) mo->num_channels = v->value.uint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (v) mo->channel_config = v->value.longuint;
+		v = gf_filter_pid_get_property(mo->odm->pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (v) mo->afmt = v->value.uint;
+		else mo->afmt = GF_AUDIO_FMT_S16;
+
+		mo->bytes_per_sec = gf_audio_fmt_bit_depth(mo->afmt) * mo->num_channels * mo->sample_rate / 8;
+		mo->planar_audio = gf_audio_fmt_is_planar(mo->afmt);
+	} else if (mo->odm->type==GF_STREAM_OD) {
+		//nothing to do
+	} else if (mo->odm->type==GF_STREAM_OCR) {
+		//nothing to do
+	} else if (mo->odm->type==GF_STREAM_SCENE) {
+		//nothing to do
+	} 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));
+	}
+}
+
+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) {
+			*discard = GF_TRUE;
+			return 0;
+		} else {
+			ts -= -mo->odm->delay;
+		}
+	}
+	ts *= 1000;
+	ts /= timescale;
+	return ts;
+}
+
+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)
+{
+	Bool discard=GF_FALSE;
+	u32 force_decode_mode = 0;
+	u32 obj_time, obj_time_orig;
+	s64 diff;
+	Bool skip_resync;
+	u32 timescale=0;
+	u64 pck_ts=0, next_ts=0;
+	u32 retry_pull;
+	Bool is_first = GF_FALSE;
+	Bool move_to_next_only = GF_FALSE;
+
+	*eos = GF_FALSE;
+	*timestamp = mo->timestamp;
+	*size = mo->framesize;
+	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 = NULL;
+
+	if (!mo->odm || !mo->odm->pid)
+		return NULL;
+
+	/*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));
+		mo->nb_fetch ++;
+		if (planar_size) *planar_size = mo->framesize / mo->num_channels;
+		return mo->frame;
+	}
+
+	if (mo->pck && mo->frame_ifce && (mo->frame_ifce->flags & GF_FRAME_IFCE_BLOCKING) ) {
+		gf_filter_pck_unref(mo->pck);
+		mo->pck = NULL;
+	}
+
+	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)
+			return NULL;
+	}
+
+retry:
+	discard = GF_FALSE;
+	if (!mo->pck) {
+		mo->pck = gf_filter_pid_get_packet(mo->odm->pid);
+		if (!mo->pck) {
+			if (gf_filter_pid_is_eos(mo->odm->pid)) {
+				if (!mo->is_eos) {
+					mo->is_eos = GF_TRUE;
+					mediasensor_update_timing(mo->odm, GF_TRUE);
+					gf_odm_on_eos(mo->odm, mo->odm->pid);
+					gf_odm_signal_eos_reached(mo->odm);
+				}
+			} else {
+				mo->odm->ck->has_seen_eos = GF_FALSE;
+			}
+			*eos = mo->is_eos;
+			return NULL;
+		} else {
+			gf_filter_pck_ref(&mo->pck);
+			gf_filter_pid_drop_packet(mo->odm->pid);
+		}
+		is_first = GF_TRUE;
+	}
+	assert(mo->pck);
+	mo->first_frame_fetched = GF_TRUE;
+	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));
+			return NULL;
+		} else if (mo->odm->ck->nb_buffering && mo->odm->type==GF_STREAM_AUDIO) {
+			return NULL;
+		}
+	}
+
+	/*data = */gf_filter_pck_get_data(mo->pck, size);
+	timescale = gf_filter_pck_get_timescale(mo->pck);
+
+	pck_ts = convert_ts_to_ms(mo, gf_filter_pck_get_cts(mo->pck), timescale, &discard);
+	if (discard) {
+		gf_filter_pck_unref(mo->pck);
+		mo->pck = NULL;
+		goto retry;
+	}
+
+	if (resync==GF_MO_FETCH_PAUSED)
+		resync=GF_MO_FETCH;
+
+	retry_pull = 1;
+	/*fast forward, bench mode with composition memory: force one decode if no data is available*/
+	if (! *eos && ((mo->odm->ck->speed > FIX_ONE) || mo->odm->parentscene->compositor->bench_mode || (mo->odm->type==GF_STREAM_AUDIO) ) ) {
+		retry_pull = 10;
+		force_decode_mode=1;
+	}
+
+	while (retry_pull) {
+		retry_pull--;
+		next_ts = 0;
+		if (gf_filter_pid_get_first_packet_cts(mo->odm->pid, &next_ts) ) {
+			next_ts = 1 + convert_ts_to_ms(mo, next_ts, timescale, &discard);
+			break;
+		} else {
+			if (gf_filter_pid_is_eos(mo->odm->pid)) {
+				if (!mo->is_eos) {
+					mo->is_eos = GF_TRUE;
+					*eos = mo->is_eos;
+					mediasensor_update_timing(mo->odm, GF_TRUE);
+					gf_odm_on_eos(mo->odm, mo->odm->pid);
+					force_decode_mode=0;
+				}
+				break;
+			}
+		}
+		*eos = mo->is_eos;
+		if (!retry_pull) break;
+
+		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));
+	}
+
+	/*resync*/
+	obj_time = obj_time_orig = gf_clock_time(mo->odm->ck);
+
+	if (mo->odm->prev_clock_at_discontinuity_plus_one) {
+		s32 diff_new, diff_old, diff_pck_old, diff_pck_new;
+		s32 old_timebase_time = (s32) obj_time;
+		old_timebase_time -= (s32) mo->odm->ck->init_timestamp;
+		old_timebase_time += (s32) mo->odm->prev_clock_at_discontinuity_plus_one;
+		diff_new = (s32) obj_time;
+		diff_new -= mo->last_fetch_time;
+		if (diff_new < 0) diff_new = -diff_new;
+		diff_old = (s32) old_timebase_time;
+		diff_old -= mo->last_fetch_time;
+		if (diff_old < 0) diff_old = -diff_old;
+
+		diff_pck_old = (s32) pck_ts - (s32) old_timebase_time;
+		diff_pck_new = (s32) pck_ts - (s32) obj_time;
+		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));
+				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));
+
+			obj_time = old_timebase_time;
+		}
+	}
+
+	skip_resync = mo->odm->parentscene->compositor->bench_mode ? GF_TRUE : GF_FALSE;
+	//no drop mode, only for speed = 1: all frames are presented, we discard the current output only if already presented and next frame time is mature
+	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
+	) {
+		assert(mo->odm->parentscene);
+		if (! mo->odm->parentscene->compositor->drop) {
+			if (mo->odm->parentscene->compositor->force_late_frame_draw) {
+				mo->flags |= GF_MO_IN_RESYNC;
+			}
+			else if (mo->flags & GF_MO_IN_RESYNC) {
+				if (next_ts >= 1 + obj_time) {
+					skip_resync = GF_TRUE;
+					mo->flags &= ~GF_MO_IN_RESYNC;
+				}
+			}
+			else if (next_ts && (next_ts < pck_ts) ) {
+				skip_resync = GF_TRUE;
+			}
+			//if the next AU is at most 300 ms from the current clock use no drop mode
+			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));
+				mo->flags |= GF_MO_IN_RESYNC;
+			}
+		}
+	}
+
+	if (skip_resync) {
+		resync=GF_MO_FETCH; //prevent resync code below
+		if (mo->odm->parentscene->compositor->use_step_mode) upload_time_ms=0;
+
+		//we are in no resync mode, drop current frame once played and object time just matured
+		//do it only if clock is started or if compositor step mode is set
+		//the time threshold for fetching is given by the caller
+		if ( (gf_clock_is_started(mo->odm->ck) || mo->odm->parentscene->compositor->use_step_mode)
+			&& (mo->timestamp==pck_ts) && next_ts && ( (next_ts <= 1 + obj_time + upload_time_ms) || (next_ts <= 1 + obj_time_orig + upload_time_ms) ) )
+		{
+			//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));
+		}
+	}
+	if (resync!=GF_MO_FETCH) {
+		u32 nb_dropped = 0;
+		while (next_ts) {
+			if (!move_to_next_only) {
+				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));
+
+				//nothing ready yet
+				if ( gf_filter_pid_first_packet_is_empty(mo->odm->pid) ) {
+					break;
+				}
+
+				/*figure out closest time*/
+				if (mo->odm->ck->speed > 0 ? next_ts > obj_time : next_ts < obj_time) {
+					*eos = GF_FALSE;
+					break;
+				}
+
+				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));
+
+					mo->odm->nb_dropped++;
+				}
+			}
+
+			//delete our packet
+			gf_filter_pck_unref(mo->pck);
+			mo->pck = gf_filter_pid_get_packet(mo->odm->pid);
+			gf_filter_pck_ref( &mo->pck);
+
+			pck_ts = convert_ts_to_ms(mo, gf_filter_pck_get_cts(mo->pck), timescale, &discard);
+			//drop next packet from pid
+			gf_filter_pid_drop_packet(mo->odm->pid);
+
+			if (obj_time != obj_time_orig) {
+				s32 diff_pck_old = (s32) pck_ts - (s32) obj_time;
+				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));
+					obj_time = obj_time_orig;
+					mo->odm->prev_clock_at_discontinuity_plus_one = 0;
+				}
+			}
+
+			next_ts = 0;
+			if (gf_filter_pid_get_first_packet_cts(mo->odm->pid, &next_ts)) {
+				next_ts = convert_ts_to_ms(mo, next_ts, timescale, &discard);
+			}
+			if (move_to_next_only)
+				break;
+		}
+	}
+
+
+	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;
+	}
+	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);
+
+	if (mo->is_eos) {
+		diff = 1000*gf_filter_pck_get_duration(mo->pck) / timescale;
+		if (!diff) diff = 100;
+	} else {
+		diff = next_ts ? next_ts : (pck_ts + 1000*gf_filter_pck_get_duration(mo->pck) / timescale);
+		diff = (s32) ( (mo->speed >= 0) ? ( (s64) diff - (s64) obj_time) : ( (s64) obj_time - (s64) diff) );
+
+		mo->odm->ck->has_seen_eos = GF_FALSE;
+	}
+	mo->ms_until_next = FIX2INT(diff * mo->speed);
+	if (mo->ms_until_next < 0)
+		mo->ms_until_next = 0;
+
+	//safe guard
+	if (mo->ms_until_next>500)
+		mo->ms_until_next=500;
+
+	if ((mo->timestamp != pck_ts) || is_first) {
+		const GF_PropertyValue *v;
+		u32 media_time;
+		u64 dur = gf_filter_pck_get_duration(mo->pck);
+		dur *= 1000;
+		dur /= timescale;
+		mo->frame_dur = (u32) dur;
+		mo->last_fetch_time = obj_time;
+
+		mo->timestamp = (u32) pck_ts;
+		media_time = gf_clock_to_media_time(mo->odm->ck, mo->timestamp);
+
+		if (mo->odm->media_current_time <= media_time)
+			mo->odm->media_current_time = media_time;
+
+		if (mo->odm->parentscene->is_dynamic_scene) {
+			GF_Scene *s = mo->odm->parentscene;
+			while (s && s->root_od->addon) {
+				s = s->root_od->parentscene;
+			}
+			if (s && (s->root_od->media_current_time < mo->odm->media_current_time) )
+				s->root_od->media_current_time = mo->odm->media_current_time;
+		}
+
+#ifndef GPAC_DISABLE_VRML
+		if (! *eos )
+			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 ));
+
+		v = gf_filter_pck_get_property(mo->pck, GF_PROP_PCK_SENDER_NTP);
+		if (v) {
+			GF_PropertyEntry *pe = NULL;
+
+			mo->odm->last_drawn_frame_ntp_sender = v->value.longuint;
+
+			v = gf_filter_pck_get_property(mo->pck, GF_PROP_PCK_RECEIVER_NTP);
+			if (v) {
+				mo->odm->last_drawn_frame_ntp_receive = v->value.longuint;
+			}
+
+			mo->odm->last_drawn_frame_ntp_diff = gf_net_get_ntp_diff_ms(mo->odm->last_drawn_frame_ntp_sender);
+			v = gf_filter_pid_get_info_str(mo->odm->pid, "ntpdiff", &pe);
+			if (v) {
+				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));
+
+			if (mo->odm->parentscene->compositor->ntpsync
+				&& (mo->odm->last_drawn_frame_ntp_diff > (s32) mo->odm->parentscene->compositor->ntpsync)
+//				&& first_ntp
+			) {
+//					first_ntp = GF_FALSE;
+					u32 ntp_diff = mo->odm->last_drawn_frame_ntp_diff - mo->odm->parentscene->compositor->ntpsync;
+					mo->odm->ck->init_timestamp += ntp_diff;
+					mo->flags |= GF_MO_IN_RESYNC;
+			}
+		}
+
+		/*signal EOS after rendering last frame, not while rendering it*/
+		*eos = GF_FALSE;
+
+	} else if (*eos) {
+		//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 ));
+
+		//if paused force a high value for next frame
+		if (!gf_clock_is_started(mo->odm->ck)) {
+			mo->ms_until_next = 100;
+		}
+	}
+
+	/*also adjust CU time based on consummed 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) {
+		mo->ms_until_pres = -1;
+		mo->ms_until_next = 1;
+	}
+
+	//TODO fixme, hack for clock signaling
+	if (!mo->frame && !mo->frame_ifce)
+		return NULL;
+
+	mo->nb_fetch ++;
+	*timestamp = mo->timestamp;
+	*size = mo->framesize;
+	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;
+
+//	gf_odm_service_media_event(mo->odm, GF_EVENT_MEDIA_TIME_UPDATE);
+
+	if (mo->frame_ifce)
+		return (char *) mo->frame_ifce;
+
+	return mo->frame;
+}
+
+
+GF_EXPORT
+void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode)
+{
+	if (!mo || !mo->odm || !mo->odm->pid || !mo->nb_fetch) return;
+
+	mo->nb_fetch--;
+	if (mo->nb_fetch) {
+		return;
+	}
+
+	if (nb_bytes==0xFFFFFFFF) {
+		mo->RenderedLength = mo->size;
+	} else {
+		assert(mo->RenderedLength + nb_bytes <= mo->size);
+		mo->RenderedLength += nb_bytes;
+	}
+
+	if (drop_mode<0) {
+		/*only allow for explicit last frame keeping if only one node is using the resource
+			otherwise this would block the composition memory*/
+		if (mo->num_open>1) {
+			drop_mode=0;
+		} else {
+			return;
+		}
+	}
+
+	/*discard frame*/
+	if (mo->RenderedLength >= mo->size) {
+		mo->RenderedLength = 0;
+
+		if (!mo->pck) return;
+		
+		if (drop_mode==3)
+			drop_mode=0;
+		else if (gf_filter_pck_is_blocking_ref(mo->pck) )
+			drop_mode = 1;
+
+		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));
+		} else {
+			/*we cannot drop since we don't know the speed of the playback (which can even be frame by frame)*/
+		}
+	}
+}
+
+GF_EXPORT
+void gf_mo_get_object_time(GF_MediaObject *mo, u32 *obj_time)
+{
+	/*get absolute clock (without drift) for audio*/
+	if (mo && mo->odm && mo->odm->ck) {
+		if (mo->odm->type==GF_STREAM_AUDIO)
+			*obj_time = gf_clock_real_time(mo->odm->ck);
+		else
+			*obj_time = gf_clock_time(mo->odm->ck);
+	}
+	/*unknown / unsupported object*/
+	else {
+		*obj_time = 0;
+	}
+}
+
+GF_EXPORT
+void gf_mo_play(GF_MediaObject *mo, Double clipBegin, Double clipEnd, Bool can_loop)
+{
+	if (!mo) return;
+
+	if (!mo->num_open && mo->odm) {
+		mo->is_eos = GF_FALSE;
+		if (mo->odm->state == GF_ODM_STATE_PLAY) {
+			if (mo->odm->flags & GF_ODM_PREFETCH) {
+				mo->odm->flags &= ~GF_ODM_PREFETCH;
+				mo->num_open++;
+				return;
+			}
+		}
+		if (mo->odm->flags & GF_ODM_NO_TIME_CTRL) {
+			mo->odm->media_start_time = 0;
+		} else {
+			mo->odm->media_start_time = (u64) (clipBegin*1000);
+			if (mo->odm->duration && (mo->odm->media_start_time > mo->odm->duration)) {
+				if (can_loop) {
+					mo->odm->media_start_time %= mo->odm->duration;
+				} else {
+					mo->odm->media_start_time = mo->odm->duration;
+				}
+			}
+			if (clipEnd>=clipBegin) {
+				mo->odm->media_stop_time = (u64) (clipEnd*1000);
+				if (mo->odm->duration && (mo->odm->media_stop_time >=0) && ((u64) mo->odm->media_stop_time > mo->odm->duration)) {
+					mo->odm->media_stop_time = 0;
+				}
+			} else {
+				mo->odm->media_stop_time = 0;
+			}
+		}
+		/*done prefetching*/
+		assert(! (mo->odm->flags & GF_ODM_PREFETCH) );
+
+		gf_odm_start(mo->odm);
+	} else if (mo->odm) {
+		if (mo->num_to_restart) mo->num_restart--;
+		if (!mo->num_restart && (mo->num_to_restart==mo->num_open+1) ) {
+			mediacontrol_restart(mo->odm);
+			mo->num_to_restart = mo->num_restart = 0;
+		}
+	}
+	mo->num_open++;
+}
+
+GF_EXPORT
+void gf_mo_stop(GF_MediaObject **_mo)
+{
+	GF_MediaObject *mo = _mo ? *_mo : NULL;
+	if (!mo || !mo->num_open) return;
+
+	mo->num_open--;
+	if (!mo->num_open && mo->odm) {
+		mo->first_frame_fetched = GF_FALSE;
+		if (mo->odm->flags & GF_ODM_DESTROYED) {
+			*_mo = NULL;
+			return;
+		}
+
+		/*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);
+			*_mo = NULL;
+		} else {
+			if ( gf_odm_stop_or_destroy(mo->odm) ) {
+				*_mo = NULL;
+			}
+		}
+	} else {
+		if (!mo->num_to_restart) {
+			mo->num_restart = mo->num_to_restart = mo->num_open + 1;
+		}
+	}
+}
+
+GF_EXPORT
+void gf_mo_restart(GF_MediaObject *mo)
+{
+	/*if no control and not root of a scene, check timelines are unlocked*/
+	if (!mo->odm->subscene
+#ifndef GPAC_DISABLE_VRML
+		&& !gf_odm_get_mediacontrol(mo->odm)
+#endif
+	) {
+		/*don't restart if sharing parent scene clock*/
+		if (gf_odm_shares_clock(mo->odm, gf_odm_get_media_clock(mo->odm->parentscene->root_od))) {
+			return;
+		}
+	}
+	/*all other cases, call restart to take into account clock references*/
+	mediacontrol_restart(mo->odm);
+}
+
+u32 gf_mo_get_od_id(MFURL *url)
+{
+	u32 i, j, tmpid;
+	char *str, *s_url;
+	u32 id = 0;
+
+	if (!url) return 0;
+
+	for (i=0; i<url->count; i++) {
+		if (url->vals[i].OD_ID) {
+			/*works because OD ID 0 is forbidden in MPEG4*/
+			if (!id) {
+				id = url->vals[i].OD_ID;
+			}
+			/*bad url, only one object can be described in MPEG4 urls*/
+			else if (id != url->vals[i].OD_ID) return 0;
+		} else if (url->vals[i].url && strlen(url->vals[i].url)) {
+			/*format: od:ID or od:ID#segment - also check for "ID" in case...*/
+			str = url->vals[i].url;
+			if (!strnicmp(str, "od:", 3)) str += 3;
+			/*remove segment info*/
+			s_url = gf_strdup(str);
+			j = 0;
+			while (j<strlen(s_url)) {
+				if (s_url[j]=='#') {
+					s_url[j] = 0;
+					break;
+				}
+				j++;
+			}
+			j = sscanf(s_url, "%u", &tmpid);
+			/*be carefull, an url like "11-regression-test.mp4" will return 1 on sscanf :)*/
+			if (j==1) {
+				char szURL[20];
+				sprintf(szURL, "%u", tmpid);
+				if (stricmp(szURL, s_url)) j = 0;
+			}
+			gf_free(s_url);
+
+			if (j!= 1) {
+				/*dynamic OD if only one URL specified*/
+				if (!i) return GF_MEDIA_EXTERNAL_ID;
+				/*otherwise ignore*/
+				continue;
+			}
+			if (!id) {
+				id = tmpid;
+				continue;
+			}
+			/*bad url, only one object can be described in MPEG4 urls*/
+			else if (id != tmpid) return 0;
+		}
+	}
+	return id;
+}
+
+
+Bool gf_mo_is_same_url(GF_MediaObject *obj, MFURL *an_url, Bool *keep_fragment, u32 obj_hint_type)
+{
+	Bool include_sub_url = GF_FALSE;
+	u32 i;
+	char szURL1[GF_MAX_PATH], szURL2[GF_MAX_PATH], *ext;
+
+	if (!obj->URLs.count) {
+		if (!obj->odm) return GF_FALSE;
+		strcpy(szURL1, obj->odm->scene_ns->url);
+	} else {
+		strcpy(szURL1, obj->URLs.vals[0].url);
+	}
+
+	/*don't analyse audio/video to locate segments or viewports*/
+	if ((obj->type==GF_MEDIA_OBJECT_AUDIO) || (obj->type==GF_MEDIA_OBJECT_VIDEO)) {
+		if (keep_fragment) *keep_fragment = GF_FALSE;
+		include_sub_url = GF_TRUE;
+	} else if ((obj->type==GF_MEDIA_OBJECT_SCENE) && keep_fragment && obj->odm) {
+		u32 j;
+		/*for remoteODs/dynamic ODs, check if one of the running service cannot be used*/
+		for (i=0; i<an_url->count; i++) {
+			GF_Scene *scene;
+			GF_SceneNamespace *sns;
+			char *frag = strrchr(an_url->vals[i].url, '#');
+			j=0;
+			/*this is the same object (may need some refinement)*/
+			if (!stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
+
+			/*fragment is a media segment, same URL*/
+			if (frag ) {
+				Bool same_res;
+				frag[0] = 0;
+				same_res = !strncmp(an_url->vals[i].url, szURL1, strlen(an_url->vals[i].url)) ? GF_TRUE : GF_FALSE;
+				frag[0] = '#';
+
+				/*if we're talking about the same resource, check if the fragment can be matched*/
+				if (same_res) {
+					/*if the fragment is a node which can be found, this is the same resource*/
+					if (obj->odm->subscene && (gf_sg_find_node_by_name(obj->odm->subscene->graph, frag+1)!=NULL) )
+						return GF_TRUE;
+
+					/*if the expected type is an existing segment (undefined media type), this is the same resource*/
+					if (!obj_hint_type && gf_odm_find_segment(obj->odm, frag+1))
+						return GF_TRUE;
+				}
+			}
+
+			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;
+				}
+#endif
+			}
+		}
+	}
+
+	/*check on full URL without removing fragment IDs*/
+	if (include_sub_url) {
+		for (i=0; i<an_url->count; i++) {
+			if (an_url->vals[i].url && !stricmp(szURL1, an_url->vals[i].url)) return GF_TRUE;
+		}
+		if (obj->odm && (obj->odm->flags & GF_ODM_PASSTHROUGH) && an_url->count && an_url->vals[0].url && !strncmp(an_url->vals[0].url, "gpid://", 7))
+			return GF_TRUE;
+		/*not same resource, we will have to check fragment as URL might point to a sub-service or single stream of a mux*/
+		if (keep_fragment) *keep_fragment = GF_TRUE;
+
+		return GF_FALSE;
+	}
+	ext = strrchr(szURL1, '#');
+	if (ext) ext[0] = 0;
+	for (i=0; i<an_url->count; i++) {
+		if (!an_url->vals[i].url) return GF_FALSE;
+		strcpy(szURL2, an_url->vals[i].url);
+		ext = strrchr(szURL2, '#');
+		if (ext) ext[0] = 0;
+		if (!stricmp(szURL1, szURL2)) return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+Bool gf_mo_url_changed(GF_MediaObject *mo, MFURL *url)
+{
+	u32 od_id;
+	Bool ret = GF_FALSE;
+	if (!mo) return (url ? GF_TRUE : GF_FALSE);
+	od_id = gf_mo_get_od_id(url);
+	if ( (mo->OD_ID == GF_MEDIA_EXTERNAL_ID) && (od_id == GF_MEDIA_EXTERNAL_ID)) {
+		ret = !gf_mo_is_same_url(mo, url, NULL, 0);
+	} else {
+		ret = (mo->OD_ID == od_id) ? GF_FALSE : GF_TRUE;
+	}
+	/*special case for 3GPP text: if not playing and user node changed, force removing it*/
+	if (ret && mo->odm && !mo->num_open && (mo->type == GF_MEDIA_OBJECT_TEXT)) {
+		mo->flags |= GF_MO_DISPLAY_REMOVE;
+	}
+	return ret;
+}
+
+GF_EXPORT
+void gf_mo_pause(GF_MediaObject *mo)
+{
+#ifndef GPAC_DISABLE_VRML
+	if (!mo || !mo->num_open || !mo->odm) return;
+	mediacontrol_pause(mo->odm);
+#endif
+}
+
+GF_EXPORT
+void gf_mo_resume(GF_MediaObject *mo)
+{
+#ifndef GPAC_DISABLE_VRML
+	if (!mo || !mo->num_open || !mo->odm) return;
+	mediacontrol_resume(mo->odm, 0);
+#endif
+}
+
+GF_EXPORT
+void gf_mo_set_speed(GF_MediaObject *mo, Fixed speed)
+{
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+#endif
+
+	if (!mo) return;
+	if (!mo->odm) {
+		mo->speed = speed;
+		return;
+	}
+	//override startup speed if asked to
+	if (mo->odm->set_speed) {
+		speed = mo->odm->set_speed;
+		mo->odm->set_speed = 0;
+	}
+#ifndef GPAC_DISABLE_VRML
+	/*if media control forbidd that*/
+	ctrl = gf_odm_get_mediacontrol(mo->odm);
+	if (ctrl) return;
+#endif
+
+	if (mo->odm->scene_ns && mo->odm->scene_ns->owner && (mo->odm->scene_ns->owner->flags & GF_ODM_INHERIT_TIMELINE))
+		return;
+
+	gf_odm_set_speed(mo->odm, speed, GF_TRUE);
+}
+
+GF_EXPORT
+Fixed gf_mo_get_current_speed(GF_MediaObject *mo)
+{
+	return (mo && mo->odm && mo->odm->ck) ? mo->odm->ck->speed : FIX_ONE;
+}
+
+GF_EXPORT
+u32 gf_mo_get_min_frame_dur(GF_MediaObject *mo)
+{
+	return mo ? mo->frame_dur : 0;
+}
+GF_EXPORT
+u32 gf_mo_map_timestamp_to_sys_clock(GF_MediaObject *mo, u32 ts)
+{
+	return (mo && mo->odm)? mo->odm->ck->start_time + ts : 0;
+}
+
+Bool gf_mo_is_buffering(GF_MediaObject *mo)
+{
+	return (mo && mo->odm && mo->odm->ck->nb_buffering) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+Fixed gf_mo_get_speed(GF_MediaObject *mo, Fixed in_speed)
+{
+	Fixed res = in_speed;
+	if (!mo || !mo->odm) return in_speed;
+
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+
+	/*get control*/
+	ctrl = gf_odm_get_mediacontrol(mo->odm);
+	if (ctrl) res = ctrl->control->mediaSpeed;
+
+#endif
+
+	return res;
+}
+
+GF_EXPORT
+Bool gf_mo_get_loop(GF_MediaObject *mo, Bool in_loop)
+{
+	GF_Clock *ck;
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+#endif
+	if (!mo || !mo->odm) return in_loop;
+
+	/*get control*/
+#ifndef GPAC_DISABLE_VRML
+	ctrl = gf_odm_get_mediacontrol(mo->odm);
+	if (ctrl) in_loop = ctrl->control->loop;
+#endif
+
+	/*otherwise looping is only accepted if not sharing parent scene clock*/
+	ck = gf_odm_get_media_clock(mo->odm->parentscene->root_od);
+	if (gf_odm_shares_clock(mo->odm, ck)) {
+		in_loop = GF_FALSE;
+#ifndef GPAC_DISABLE_VRML
+		/*
+			if (ctrl && ctrl->stream->odm && ctrl->stream->odm->subscene)
+					gf_term_invalidate_compositor(mo->odm->term);
+		*/
+#endif
+	}
+	return in_loop;
+}
+
+GF_EXPORT
+Double gf_mo_get_duration(GF_MediaObject *mo)
+{
+	Double dur;
+	dur = ((Double) (s64)mo->odm->duration)/1000.0;
+	return dur;
+}
+
+GF_EXPORT
+Bool gf_mo_should_deactivate(GF_MediaObject *mo)
+{
+	Bool res = GF_FALSE;
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+#endif
+
+	if (!mo || !mo->odm) return GF_TRUE;
+	if (!mo->odm->state) return GF_FALSE;
+	//if dynamic scene we can deactivate
+	if (mo->odm->parentscene && mo->odm->parentscene->is_dynamic_scene) {
+		return GF_TRUE;
+	}
+
+#ifndef GPAC_DISABLE_VRML
+	/*get media control and see if object owning control is running*/
+	ctrl = gf_odm_get_mediacontrol(mo->odm);
+	if (!ctrl) res = GF_TRUE;
+	/*if ctrl and ctrl not ruling this mediaObject, deny deactivation*/
+	else if (ctrl->stream->odm != mo->odm) res = GF_FALSE;
+	/*this is currently under discussion in MPEG. for now we deny deactivation as soon as a mediaControl is here*/
+	else if (ctrl->stream->odm->state) res = GF_FALSE;
+	/*otherwise allow*/
+	else
+#endif
+		res = GF_TRUE;
+
+	return res;
+}
+
+GF_EXPORT
+Bool gf_mo_is_muted(GF_MediaObject *mo)
+{
+#ifndef GPAC_DISABLE_VRML
+	return mo->odm->media_ctrl ? mo->odm->media_ctrl->control->mute : GF_FALSE;
+#else
+	return GF_FALSE;
+#endif
+}
+
+GF_EXPORT
+Bool gf_mo_is_started(GF_MediaObject *mo)
+{
+	if (mo && mo->odm && gf_clock_is_started(mo->odm->ck)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+GF_EXPORT
+Bool gf_mo_is_done(GF_MediaObject *mo)
+{
+	GF_Clock *ck;
+	u64 dur;
+	if (!mo || !mo->odm) return GF_FALSE;
+
+	if (! mo->odm->has_seen_eos) return GF_FALSE;
+
+	if ((mo->odm->type==GF_STREAM_AUDIO) || (mo->odm->type==GF_STREAM_VISUAL)) {
+		return GF_TRUE;
+	}
+
+	/*check time - technically this should also apply to video streams since we could extend the duration
+	of the last frame - to further test*/
+	dur = (mo->odm->subscene && mo->odm->subscene->duration) ? mo->odm->subscene->duration : mo->odm->duration;
+	/*codec is done, check by duration*/
+	ck = gf_odm_get_media_clock(mo->odm);
+	if (gf_clock_time(ck) > dur)
+		return GF_TRUE;
+
+	return GF_FALSE;
+}
+
+/*resyncs clock - only audio objects are allowed to use this*/
+GF_EXPORT
+void gf_mo_adjust_clock(GF_MediaObject *mo, s32 ms_drift)
+{
+	if (!mo || !mo->odm) return;
+	if (mo->odm->type != GF_STREAM_AUDIO) return;
+	gf_clock_set_audio_delay(mo->odm->ck, ms_drift);
+}
+
+GF_EXPORT
+void gf_mo_set_flag(GF_MediaObject *mo, GF_MOUserFlags flag, Bool set_on)
+{
+	if (mo) {
+		if (set_on)
+			mo->flags |= flag;
+		else
+			mo->flags &= ~flag;
+	}
+}
+
+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;
+	if (!mo || !mo->odm) return 0;
+	if (mo->type != GF_MEDIA_OBJECT_VIDEO) return 0;
+	if (!mo->odm->scene_ns) return 2;
+
+	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;
+	}
+	return 0;
+}
+
+GF_EXPORT
+GF_SceneGraph *gf_mo_get_scenegraph(GF_MediaObject *mo)
+{
+	if (!mo || !mo->odm || !mo->odm->subscene) return NULL;
+	return mo->odm->subscene->graph;
+}
+
+
+GF_EXPORT
+GF_DOMEventTarget *gf_mo_event_target_add_node(GF_MediaObject *mo, GF_Node *n)
+{
+#ifndef GPAC_DISABLE_SVG
+	GF_DOMEventTarget *target = NULL;
+	if (!mo ||!n) return NULL;
+	target = gf_dom_event_get_target_from_node(n);
+	gf_list_add(mo->evt_targets, target);
+	return target;
+#else
+	return NULL;
+#endif
+}
+
+GF_Err gf_mo_event_target_remove_by_index(GF_MediaObject *mo, u32 i)
+{
+	if (!mo) return GF_BAD_PARAM;
+	gf_list_rem(mo->evt_targets, i);
+	return GF_OK;
+}
+
+GF_Node *gf_mo_event_target_enum_node(GF_MediaObject *mo, u32 *i)
+{
+	GF_DOMEventTarget *target;
+	if (!mo || !i) return NULL;
+	target = (GF_DOMEventTarget *)gf_list_enum(mo->evt_targets, i);
+	if (!target) return NULL;
+	//if (target->ptr_type != GF_DOM_EVENT_TARGET_NODE) return NULL;
+	return (GF_Node *)target->ptr;
+}
+
+s32 gf_mo_event_target_find_by_node(GF_MediaObject *mo, GF_Node *node)
+{
+	u32 i, count;
+	count = gf_list_count(mo->evt_targets);
+	for (i = 0; i < count; i++) {
+		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+		if (target->ptr == node) {
+			return i;
+		}
+	}
+	return -1;
+}
+
+GF_EXPORT
+GF_Err gf_mo_event_target_remove_by_node(GF_MediaObject *mo, GF_Node *node)
+{
+	u32 i, count;
+	count = gf_list_count(mo->evt_targets);
+	for (i = 0; i < count; i++) {
+		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+		if (target->ptr == node) {
+			gf_list_del_item(mo->evt_targets, target);
+			i--;
+			count--;
+			//return GF_OK;
+		}
+	}
+	return GF_BAD_PARAM;
+}
+
+GF_EXPORT
+GF_Node *gf_event_target_get_node(GF_DOMEventTarget *target)
+{
+	if (target && (target->ptr_type == GF_DOM_EVENT_TARGET_NODE)) {
+		return (GF_Node *)target->ptr;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+GF_DOMEventTarget *gf_mo_event_target_get(GF_MediaObject *mo, u32 i)
+{
+	GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
+	return target;
+}
+
+void gf_mo_event_target_reset(GF_MediaObject *mo)
+{
+	if (mo->evt_targets) gf_list_reset(mo->evt_targets);
+}
+
+u32 gf_mo_event_target_count(GF_MediaObject *mo)
+{
+	if (!mo) return 0;
+	return gf_list_count(mo->evt_targets);
+}
+
+void gf_mo_del(GF_MediaObject *mo)
+{
+	assert(gf_list_count(mo->evt_targets) == 0);
+	gf_list_del(mo->evt_targets);
+	if (mo->pck) gf_filter_pck_unref(mo->pck);
+	gf_sg_mfurl_del(mo->URLs);
+	gf_free(mo);
+}
+
+
+Bool gf_mo_get_srd_info(GF_MediaObject *mo, GF_MediaObjectVRInfo *vr_info)
+{
+	GF_Scene *scene;
+	if (!vr_info || !mo->odm) return GF_FALSE;
+
+	scene = mo->odm->subscene ? mo->odm->subscene : mo->odm->parentscene;
+	memset(vr_info, 0, sizeof(GF_MediaObjectVRInfo));
+
+	vr_info->srd_x = mo->srd_x;
+	vr_info->srd_y = mo->srd_y;
+	vr_info->srd_w = mo->srd_w;
+	vr_info->srd_h = mo->srd_h;
+	vr_info->srd_min_x = scene->srd_min_x;
+	vr_info->srd_min_y = scene->srd_min_y;
+	vr_info->srd_max_x = scene->srd_max_x;
+	vr_info->srd_max_y = scene->srd_max_y;
+	vr_info->is_tiled_srd = scene->is_tiled_srd;
+	vr_info->has_full_coverage = (scene->srd_type==2) ? GF_TRUE : GF_FALSE;
+	
+	gf_sg_get_scene_size_info(scene->graph, &vr_info->scene_width, &vr_info->scene_height);
+
+	if (mo->srd_w && mo->srd_h) return GF_TRUE;
+	if (mo->srd_full_w && mo->srd_full_h) return GF_TRUE;
+	return GF_FALSE;
+}
+
+/*sets quality hint for this media object  - quality_rank is between 0 (min quality) and 100 (max quality)*/
+void gf_mo_hint_quality_degradation(GF_MediaObject *mo, u32 quality_degradation)
+{
+	if (!mo || !mo->odm || !mo->odm->pid) {
+		return;
+	}
+	if (mo->quality_degradation_hint != quality_degradation) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_QUALITY_SWITCH, mo->odm->pid);
+		evt.quality_switch.quality_degradation = quality_degradation;
+		gf_filter_pid_send_event(mo->odm->pid, &evt);
+
+		mo->quality_degradation_hint = quality_degradation;
+	}
+}
+
+void gf_mo_hint_visible_rect(GF_MediaObject *mo, u32 min_x, u32 max_x, u32 min_y, u32 max_y)
+{
+	if (!mo || !mo->odm || !mo->odm->pid) {
+		return;
+	}
+
+	if ((mo->view_min_x!=min_x) || (mo->view_max_x!=max_x) || (mo->view_min_y!=min_y) || (mo->view_max_y!=max_y)) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_VISIBILITY_HINT, mo->odm->pid);
+		mo->view_min_x = min_x;
+		mo->view_max_x = max_x;
+		mo->view_min_y = min_y;
+		mo->view_max_y = max_y;
+		
+		evt.visibility_hint.min_x = min_x;
+		evt.visibility_hint.max_x = max_x;
+		evt.visibility_hint.min_y = min_y;
+		evt.visibility_hint.max_y = max_y;
+
+		gf_filter_pid_send_event(mo->odm->pid, &evt);
+	}
+}
+
+void gf_mo_hint_gaze(GF_MediaObject *mo, u32 gaze_x, u32 gaze_y)
+{
+	if (!mo || !mo->odm || !mo->odm->pid) {
+		return;
+	}
+
+	if ((mo->view_min_x!=gaze_x) || (mo->view_min_y!=gaze_y) ) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_VISIBILITY_HINT, mo->odm->pid);
+		mo->view_min_x = gaze_x;
+		mo->view_min_y = gaze_y;
+
+		evt.visibility_hint.min_x = gaze_x;
+		evt.visibility_hint.min_y = gaze_y;
+		evt.visibility_hint.is_gaze = GF_TRUE;
+
+		gf_filter_pid_send_event(mo->odm->pid, &evt);
+	}
+}
+
+
+

gpac-0.8.0.tar.gz/src/compositor/mesh.c -> gpac-1.0.0.tar.gz/src/compositor/mesh.c Changed

@@ -1145,7 +1145,7 @@
                          GF_Node *__texCoords, MFInt32 *texCoordIndex,
                          Fixed creaseAngle)
 {
-	u32 i, n, count, c_count, nor_count;
+	u32 i, idx, count, c_count, nor_count;
 	u32 index;
 	Bool smooth_normals;
 	SFVec2f tx;
@@ -1249,7 +1249,7 @@
 			has_color = (colorRGB->color.count) ? 1 : 0;
 		}
 	}
-	n = 0;
+	idx = 0;
 	if (has_color) {
 		if (!colorPerVertex) {
 			index = colorIndex->count ? colorIndex->vals[0] : 0;
@@ -1303,15 +1303,15 @@
 	cur_face = 0;
 	for (i=0; i<count; i++) {
 		if (has_coord && coordIndex->vals[i] == -1) {
-			n++;
+			idx++;
 			if (has_color && !colorPerVertex) {
-				GET_IDX(n, colorIndex);
+				GET_IDX(idx, colorIndex);
 #ifndef GPAC_DISABLE_X3D
 				MESH_GET_COL(colRGBA, index);
 #endif
 			}
 			if (has_normal && !normalPerVertex) {
-				GET_IDX(n, normalIndex);
+				GET_IDX(idx, normalIndex);
 				if (index < nor_count) nor = normal->vector.vals[index];
 			}
 			if (faces[cur_face]->v_count<3) faces[cur_face]->v_count=0;
@@ -1558,11 +1558,15 @@
 	/*alloc face & normals tables*/
 	if (smooth_normals) {
 		faces = (GF_Mesh **)gf_malloc(sizeof(GF_Mesh *)*face_count);
+		if (!faces) return;
 		faces_info = (struct face_info*)gf_malloc(sizeof(struct face_info)*face_count);
+		if (!faces_info) return;
 		memset(faces_info, 0, sizeof(struct face_info)*face_count);
 		pts_info = (struct pt_info*)gf_malloc(sizeof(struct pt_info)*pt_count);
+		if (!pts_info) return;
 		memset(pts_info, 0, sizeof(struct pt_info)*pt_count);
 		faces[cur_face] = new_mesh();
+		if (!faces[cur_face]) return;
 	}
 
 	for (j=0; j<zDimension-1; j++) {
@@ -1580,7 +1584,7 @@
 			if (has_normal && !eg->normalPerVertex) {
 				idx = i + j * (xDimension-1);
 				if (idx<norm->vector.count) {
-					SFVec3f n = norm->vector.vals[idx];
+					n = norm->vector.vals[idx];
 					gf_vec_norm(&n);
 					MESH_SET_NORMAL(vx, n);
 				}
@@ -1613,7 +1617,7 @@
 					if (has_normal && eg->normalPerVertex) {
 						idx = (i+l) + (j+k) * xDimension;
 						if (idx<norm->vector.count) {
-							SFVec3f n = norm->vector.vals[idx];
+							n = norm->vector.vals[idx];
 							gf_vec_norm(&n);
 							MESH_SET_NORMAL(vx, n);
 						}
@@ -1640,7 +1644,10 @@
 				gf_vec_norm(&faces_info[cur_face].nor);
 				/*done with face*/
 				cur_face++;
-				if (cur_face<face_count) faces[cur_face] = new_mesh();
+				if (cur_face<face_count) {
+					faces[cur_face] = new_mesh();
+					if (!faces[cur_face]) return;
+				}
 			} else {
 				mesh_set_triangle(mesh, pt_idx+0, pt_idx+2, pt_idx+3);
 				mesh_set_triangle(mesh, pt_idx+0, pt_idx+3, pt_idx+1);
@@ -1669,7 +1676,7 @@
 
 		for (i=0; i<face_count; i++) {
 			for (j=0; j<faces[i]->v_count; j++) {
-				SFVec3f n = smooth_face_normals(pts_info, pt_count, faces_info, face_count, j, i, cosCrease);
+				n = smooth_face_normals(pts_info, pt_count, faces_info, face_count, j, i, cosCrease);
 				MESH_SET_NORMAL(faces[i]->vertices[j], n);
 			}
 		}
@@ -2131,7 +2138,6 @@
 
 	/*generate begin cap*/
 	if (begin_face) {
-		SFVec3f n;
 		scale.x = scale.y = FIX_ONE;
 		if (spine_scale && spine_scale->count) scale = spine_scale->vals[0];
 
@@ -2193,7 +2199,6 @@
 
 	/*generate end cap*/
 	if (end_face) {
-		SFVec3f n;
 		scale.x = scale.y = FIX_ONE;
 		if (spine_scale && (nb_spine-1<spine_scale->count)) scale = spine_scale->vals[nb_spine-1];
 		/*get last SCP after rotation*/
@@ -2259,7 +2264,7 @@
 
 		for (i=0; i<face_count; i++) {
 			for (j=0; j<faces[i]->v_count; j++) {
-				SFVec3f n = smooth_face_normals(pts_info, pt_count, faces_info, face_count, j, i, cosCrease);
+				n = smooth_face_normals(pts_info, pt_count, faces_info, face_count, j, i, cosCrease);
 				MESH_SET_NORMAL(faces[i]->vertices[j], n);
 			}
 		}

gpac-0.8.0.tar.gz/src/compositor/mesh_collide.c -> gpac-1.0.0.tar.gz/src/compositor/mesh_collide.c Changed

gpac-0.8.0.tar.gz/src/compositor/mesh_tesselate.c -> gpac-1.0.0.tar.gz/src/compositor/mesh_tesselate.c Changed

@@ -39,7 +39,7 @@
 
 #ifdef GPAC_HAS_GLU
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #define GLdouble GLfloat
 #endif
 
@@ -58,10 +58,14 @@
 static void CALLBACK mesh_tess_begin(GLenum which) {
 	assert(which==GL_TRIANGLES);
 }
-static void CALLBACK mesh_tess_end(void) { }
-static void CALLBACK mesh_tess_error(GLenum error_code) {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Mesh] Tesselate error %s\n", gluErrorString(error_code)));
+static void CALLBACK mesh_tess_end(void) {
 }
+static void CALLBACK mesh_tess_error(GLenum error_code)
+{
+	if (error_code)
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Mesh] Tesselate error %s\n", gluErrorString(error_code)));
+}
+
 /*only needed to force GL_TRIANGLES*/
 static void CALLBACK mesh_tess_edgeflag(GLenum flag) { }
 
@@ -219,6 +223,13 @@
 	mesh->bounds.max_edge.y = rc.y;
 	mesh->bounds.min_edge.z = mesh->bounds.max_edge.z = 0;
 	gf_bbox_refresh(&mesh->bounds);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		mesh_tess_error(0);
+	}
+#endif
+
 }
 
 #else
@@ -284,8 +295,6 @@
 	pThird = pSecond;
 
 	GetPoint2D(pThird, pts[0]);
-	/* Get different point, return if less than 3 diff points. */
-	if (len < 3 ) return GF_POLYGON_CONVEX_LINE;
 	iread = 1;
 	ConvGetPointDelta(dprev, pThird, pSecond);
 	pSaveSecond = pSecond;
@@ -304,8 +313,9 @@
 	GetPoint2D(pThird, pts[0]);
 	dcur.x = pThird.x - pSecond.x;
 	dcur.y = pThird.y - pSecond.y;
-	if ( ConvCompare(dcur) ) ConvCheckTriple;
-
+	if ( ConvCompare(dcur) ) {
+		ConvCheckTriple;
+	}
 	/* and check for direction changes back to second vertex */
 	dcur.x = pSaveSecond.x - pSecond.x;
 	dcur.y = pSaveSecond.y - pSecond.y;

gpac-0.8.0.tar.gz/src/compositor/mpeg4_animstream.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_animstream.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_audio.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_audio.c Changed

@@ -28,14 +28,6 @@
 
 #ifndef GPAC_DISABLE_VRML
 
-typedef struct
-{
-	GF_AudioInput input;
-	GF_TimeNode time_handle;
-	Double start_time;
-	Bool set_duration, failure;
-} AudioClipStack;
-
 
 static void audioclip_activate(AudioClipStack *st, M_AudioClip *ac)
 {
@@ -88,7 +80,7 @@
 	if (ac->isActive) {
 		gf_sc_audio_register(&st->input, (GF_TraverseState*)rs);
 	}
-	if (st->set_duration && st->input.stream) {
+	if (st->set_duration && st->input.stream && st->input.stream->odm) {
 		ac->duration_changed = gf_mo_get_duration(st->input.stream);
 		gf_node_event_out(node, 6/*"duration_changed"*/);
 		st->set_duration = GF_FALSE;
@@ -104,7 +96,10 @@
 	M_AudioClip *ac = (M_AudioClip *)tn->udta;
 	AudioClipStack *st = (AudioClipStack *)gf_node_get_private((GF_Node*)tn->udta);
 
-	if (st->failure) return;
+	if (st->failure) {
+		st->time_handle.needs_unregister = GF_TRUE;
+		return;
+	}
 	if (! ac->isActive) {
 		st->start_time = ac->startTime;
 		st->input.speed = ac->pitch;
@@ -176,14 +171,6 @@
 }
 
 
-typedef struct
-{
-	GF_AudioInput input;
-	GF_TimeNode time_handle;
-	Bool is_active;
-	Double start_time;
-} AudioSourceStack;
-
 static void audiosource_activate(AudioSourceStack *st, M_AudioSource *as)
 {
 	if (gf_sc_audio_open(&st->input, &as->url, 0, -1, GF_FALSE) != GF_OK)
@@ -449,7 +436,7 @@
 
 
 
-static char *audiobuffer_fetch_frame(void *callback, u32 *size, u32 audio_delay_ms)
+static u8 *audiobuffer_fetch_frame(void *callback, u32 *size, u32 *planar_stride, u32 audio_delay_ms)
 {
 	u32 blockAlign;
 	AudioBufferStack *st = (AudioBufferStack *) gf_node_get_private( ((GF_AudioInput *) callback)->owner);
@@ -458,7 +445,7 @@
 	if (!st->is_init) return NULL;
 	if (!st->buffer) {
 		st->done = GF_FALSE;
-		st->buffer_size = (u32) ceil(FIX2FLT(ab->length) * st->output.input_ifce.bps*st->output.input_ifce.samplerate*st->output.input_ifce.chan/8);
+		st->buffer_size = (u32) ceil(FIX2FLT(ab->length) * gf_audio_fmt_bit_depth(st->output.input_ifce.afmt) * st->output.input_ifce.samplerate*st->output.input_ifce.chan/8);
 		blockAlign = gf_mixer_get_block_align(st->am);
 		/*BLOCK ALIGN*/
 		while (st->buffer_size%blockAlign) st->buffer_size++;
@@ -518,7 +505,8 @@
 	if (ai->snd->GetChannelVolume) {
 		return ai->snd->GetChannelVolume(ai->snd->owner, vol);
 	} else {
-		vol[0] = vol[1] = vol[2] = vol[3] = vol[4] = vol[5] = FIX_ONE;
+//		u32 i;
+//		for (i=0; i<GF_AUDIO_MIXER_MAX_CHANNELS; i++) vol[i] = FIX_ONE;
 		return GF_FALSE;
 	}
 }
@@ -534,16 +522,47 @@
 	AudioBufferStack *st = (AudioBufferStack *) gf_node_get_private( ((GF_AudioInput *) aifc->callback)->owner);
 
 	if (gf_mixer_must_reconfig(st->am)) {
+		Bool force_config = GF_TRUE;
 		if (gf_mixer_reconfig(st->am)) {
 			if (st->buffer) gf_free(st->buffer);
 			st->buffer = NULL;
 			st->buffer_size = 0;
 		}
 
-		gf_mixer_get_config(st->am, &aifc->samplerate, &aifc->chan, &aifc->bps, &aifc->ch_cfg);
-		st->is_init = (aifc->samplerate && aifc->chan && aifc->bps) ? GF_TRUE : GF_FALSE;
+		gf_mixer_get_config(st->am, &aifc->samplerate, &aifc->chan, &aifc->afmt, &aifc->ch_layout);
+		//we only work with packed formats
+		switch (aifc->afmt) {
+		case GF_AUDIO_FMT_U8P:
+			aifc->afmt = GF_AUDIO_FMT_U8;
+			break;
+		case GF_AUDIO_FMT_S16P:
+			aifc->afmt = GF_AUDIO_FMT_S16;
+			break;
+		case GF_AUDIO_FMT_S24P:
+			aifc->afmt = GF_AUDIO_FMT_S24;
+			break;
+		case GF_AUDIO_FMT_S32P:
+			aifc->afmt = GF_AUDIO_FMT_S32;
+			break;
+		case GF_AUDIO_FMT_FLTP:
+			aifc->afmt = GF_AUDIO_FMT_FLT;
+			break;
+		case GF_AUDIO_FMT_DBLP:
+			aifc->afmt = GF_AUDIO_FMT_DBL;
+			break;
+		default:
+			force_config = GF_FALSE;
+			break;
+		}
+		if (force_config) {
+			gf_mixer_set_config(st->am, aifc->samplerate, aifc->chan, aifc->afmt, aifc->ch_layout);
+		}
+		st->is_init = (aifc->samplerate && aifc->chan && aifc->afmt) ? GF_TRUE : GF_FALSE;
 		assert(st->is_init);
-		if (!st->is_init) aifc->samplerate = aifc->chan = aifc->bps = aifc->ch_cfg = 0;
+		if (!st->is_init) {
+			aifc->samplerate = aifc->chan = aifc->afmt = 0;
+			aifc->ch_layout = 0;
+		}
 		/*this will force invalidation*/
 		return (for_reconf && st->is_init) ? GF_TRUE : GF_FALSE;
 	}

gpac-0.8.0.tar.gz/src/compositor/mpeg4_background.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_background.c Changed

@@ -132,14 +132,15 @@
 	mesh_reset(mesh);
 
 	start_col.red = start_col.green = start_col.blue = 0;
+	start_col.alpha = FIX_ONE;
 	end_col = start_col;
+
 	if (color->count) {
 		COL_TO_RGBA(start_col, color->vals[0]);
 		end_col = start_col;
 		if (color->count>1) COL_TO_RGBA(end_col, color->vals[1]);
 	}
 
-	start_col.alpha = end_col.alpha = FIX_ONE;
 	vx.texcoords.x = vx.texcoords.y = 0;
 	vx.color = MESH_MAKE_COL(start_col);
 	vx.pos.x = vx.pos.z = 0;
@@ -278,6 +279,8 @@
 		DestroyBackground(node);
 		return;
 	}
+	if (tr_state->visual->compositor->noback)
+		return;
 
 	gf_node_dirty_clear(node, 0);
 	bck = (M_Background *)node;
@@ -316,8 +319,8 @@
 		if (tr_state->traversing_mode == TRAVERSE_SORT) {
 			gf_mx_copy(st->current_mx, tr_state->model_matrix);
 			if (!tr_state->pixel_metrics && tr_state->visual->compositor->inherit_type_3d) {
-				Fixed scale = gf_divfix(FIX_ONE, tr_state->min_hsize);
-				gf_mx_add_scale(&st->current_mx, scale, scale, scale);
+				Fixed pix_scale = gf_divfix(FIX_ONE, tr_state->min_hsize);
+				gf_mx_add_scale(&st->current_mx, pix_scale, pix_scale, pix_scale);
 
 			}
 		}

gpac-0.8.0.tar.gz/src/compositor/mpeg4_background2d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_background2d.c Changed

@@ -126,7 +126,7 @@
 		stack->txh.width = 2;
 		stack->txh.height = 2;
 		stack->txh.stride = 6;
-		stack->txh.pixelformat = GF_PIXEL_RGB_24;
+		stack->txh.pixelformat = GF_PIXEL_RGB;
 	}
 
 	if (use_texture) {
@@ -322,6 +322,8 @@
 		DestroyBackground2D(node);
 		return;
 	}
+	if (tr_state->visual->compositor->noback)
+		return;
 
 	bck = (M_Background2D *)node;
 
@@ -338,7 +340,8 @@
 
 	/*first traverse, bound if needed*/
 	if (gf_list_find(tr_state->backgrounds, node) < 0) {
-		M_Background2D *top_bck = (M_Background2D *)node;
+		M_Background2D *top_bck;
+
 		gf_list_add(tr_state->backgrounds, node);
 		assert(gf_list_find(stack->reg_stacks, tr_state->backgrounds)==-1);
 		gf_list_add(stack->reg_stacks, tr_state->backgrounds);
@@ -444,6 +447,14 @@
 static void UpdateBackgroundTexture(GF_TextureHandler *txh)
 {
 	gf_sc_texture_update_frame(txh, 0);
+
+	if (!txh->compositor->player && !txh->compositor->passthrough_txh && txh->stream && txh->stream->odm && (txh->stream->odm->flags & GF_ODM_PASSTHROUGH)) {
+		if (!txh->width || ((txh->width==txh->compositor->display_width) && (txh->height==txh->compositor->display_height)))
+			txh->compositor->passthrough_txh = txh;
+		else
+			txh->compositor->passthrough_txh = NULL;
+	}
+
 	/*restart texture if needed (movie background controled by MediaControl)*/
 	if (txh->stream_finished && gf_mo_get_loop(txh->stream, 0))
 		gf_sc_texture_restart(txh);
@@ -497,6 +508,7 @@
 	gf_sc_invalidate(st->txh.compositor, NULL);
 }
 
+#if 0 //unused
 Bool compositor_background_transparent(GF_Node *node)
 {
 	if (node && (gf_node_get_tag(node) == TAG_MPEG4_Background2D)) {
@@ -510,5 +522,7 @@
 	/*consider all other background nodes transparent*/
 	return 1;
 }
+#endif
+
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_bitmap.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_bitmap.c Changed

@@ -37,7 +37,7 @@
 	/*cached size for 3D mode*/
 	SFVec2f size, scale;
 	u32 prev_tx_w, prev_tx_h;
-	GF_Rect rc;
+	GF_Rect rc, unclip_rc;
 } BitmapStack;
 
 
@@ -185,9 +185,11 @@
 		gf_mx2d_copy(_mat, ctx->transform);
 		gf_mx2d_inverse(&_mat);
 		gf_mx2d_apply_rect(&_mat, &rc);
-
-		drawable_reset_path(st->graph);
-		gf_path_add_rect_center(st->graph->path, 0, 0, rc.width, rc.height);
+		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);
+			st->unclip_rc = rc;
+		}
 		ctx->flags |= CTX_NO_ANTIALIAS;
 		visual_2d_texture_path(tr_state->visual, st->graph->path, ctx, tr_state);
 	}
@@ -197,6 +199,7 @@
 static void TraverseBitmap(GF_Node *node, void *rs, Bool is_destroy)
 {
 	GF_Rect rc;
+	Bool rectangle_check_adaptation(GF_Node *node, Drawable *stack, GF_TraverseState *tr_state);
 	DrawableContext *ctx;
 	BitmapStack *st = (BitmapStack *)gf_node_get_private(node);
 	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
@@ -206,6 +209,8 @@
 		gf_free(st);
 		return;
 	}
+	if (! rectangle_check_adaptation(node, st->graph, tr_state))
+		return;
 
 	switch (tr_state->traversing_mode) {
 	case TRAVERSE_DRAW_2D:

gpac-0.8.0.tar.gz/src/compositor/mpeg4_composite.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -47,8 +47,12 @@
 	GF_List *sensors, *previous_sensors, *temp_sensors, *temp_previous_sensors;
 	GF_Node *prev_hit_appear;
 
+	GF_TraverseState *tr_state;
+
 #ifdef GPAC_USE_TINYGL
 	ostgl_context *tgl_ctx;
+#else
+	Bool use_fbo;
 #endif
 } CompositeTextureStack;
 
@@ -92,7 +96,7 @@
 	video_src.pitch_y = ctx->aspect.fill_texture->stride;
 	video_src.pixel_format = ctx->aspect.fill_texture->pixelformat;
 #ifdef GF_SR_USE_DEPTH
-	if (ctx->aspect.fill_texture->pixelformat==GF_PIXEL_YUVD) video_src.pixel_format = GF_PIXEL_YV12;
+	if (ctx->aspect.fill_texture->pixelformat==GF_PIXEL_YUVD) video_src.pixel_format = GF_PIXEL_YUV;
 #endif
 	video_src.video_buffer = ctx->aspect.fill_texture->data;
 
@@ -143,6 +147,9 @@
 		gf_list_del(st->sensors);
 		gf_list_del(st->previous_sensors);
 
+		gf_list_del(st->tr_state->vrml_sensors);
+		gf_free(st->tr_state);
+
 		gf_free(st);
 	} else {
 		gf_node_traverse_children(node, rs);
@@ -249,18 +256,18 @@
 static void composite_update(GF_TextureHandler *txh)
 {
 	s32 w, h;
-	GF_STENCIL stencil;
+	GF_EVGStencil *stencil;
+#ifndef GPAC_USE_GLES1X
 	M_Background2D *back;
-	GF_TraverseState *tr_state;
+#endif
+	GF_List *sensor_bck;
 	Bool invalidate_all;
 	u32 new_pixel_format;
 	GF_Compositor *compositor = (GF_Compositor *)txh->compositor;
 	CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(txh->owner);
-	GF_Raster2D *raster = st->visual->compositor->rasterizer;
 
 	if (st->unsupported) return;
 
-
 	/*
 		if (compositor->recompute_ar) {
 			gf_node_dirty_set(txh->owner, 0, 0);
@@ -273,28 +280,27 @@
 	}
 	gf_node_dirty_clear(st->txh.owner, 0);
 
+	/*in OpenGL_ES, only RGBA can be safelly used with glReadPixels*/
+#if defined(GPAC_USE_GLES1X)
+	new_pixel_format = GF_PIXEL_RGBA;
+
+#else
+
 	back = gf_list_get(st->visual->back_stack, 0);
-	if (back && back->isBound) new_pixel_format = GF_PIXEL_RGB_24;
+	if (back && back->isBound) new_pixel_format = GF_PIXEL_RGB;
 	else new_pixel_format = GF_PIXEL_RGBA;
 
-
 #ifdef GPAC_USE_TINYGL
 	/*TinyGL pixel format is fixed at compile time, we cannot override it !*/
 	if (st->visual->type_3d) new_pixel_format = GF_PIXEL_RGBA;
-#else
 
-#ifndef GPAC_DISABLE_3D
+#elif !defined(GPAC_DISABLE_3D)
 	/*no alpha support in offscreen rendering*/
-	if (!compositor->visual->type_3d && !compositor->hybrid_opengl && (st->visual->type_3d) && !(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
-		new_pixel_format = GF_PIXEL_RGB_24;
-#endif
-
-	/*in OpenGL_ES, only RGBA can be safelly used with glReadPixels*/
-#ifdef GPAC_USE_GLES1X
-	new_pixel_format = GF_PIXEL_RGBA;
+	if (!compositor->visual->type_3d && !compositor->hybrid_opengl && !compositor->fbo_id && (st->visual->type_3d) && !(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
+		new_pixel_format = GF_PIXEL_RGB;
 #endif
 
-#endif
+#endif //GPAC_USE_GLES1X
 
 	/*FIXME - we assume RGB+Depth+bitshape, we should check with the video out module*/
 #if defined(GF_SR_USE_DEPTH) && !defined(GPAC_DISABLE_3D)
@@ -321,18 +327,18 @@
 			if (new_pixel_format==GF_PIXEL_RGBA) {
 				new_pixel_format=GF_PIXEL_ARGB;
 			} else {
-				new_pixel_format=GF_PIXEL_BGR_24;
+				new_pixel_format=GF_PIXEL_BGR;
 			}
 		} else {
-			if (new_pixel_format==GF_PIXEL_RGB_24) {
-				new_pixel_format=GF_PIXEL_RGB_32;
+			if (new_pixel_format==GF_PIXEL_RGB) {
+				new_pixel_format=GF_PIXEL_RGBX;
 			}
 		}
 	}
 	else if (h<-1) {
 		h = -h;
-		if (new_pixel_format==GF_PIXEL_RGB_24) {
-			new_pixel_format=GF_PIXEL_RGB_32;
+		if (new_pixel_format==GF_PIXEL_RGB) {
+			new_pixel_format=GF_PIXEL_RGBX;
 		}
 	}
 
@@ -372,7 +378,7 @@
 		}
 
 		/*we don't use rect ext because of no support for texture transforms*/
-		if (1
+		if ((1)
 #ifndef GPAC_DISABLE_3D
 		        || compositor->gl_caps.npot_texture
 #endif
@@ -406,7 +412,7 @@
 			txh->stride = txh->width * 4;
 			txh->transparent = 1;
 			break;
-		case GF_PIXEL_RGB_24:
+		case GF_PIXEL_RGB:
 			txh->stride = txh->width * 3;
 			txh->transparent = 0;
 			break;
@@ -414,36 +420,21 @@
 
 		st->visual->width = txh->width;
 		st->visual->height = txh->height;
+		st->use_fbo = GF_FALSE;
 
-		stencil = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
+		stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 
 #ifndef GPAC_DISABLE_3D
 		if (st->visual->type_3d) {
-			GF_Compositor *compositor = st->visual->compositor;
 			/*figure out what to do if main visual (eg video out) is not in OpenGL ...*/
 			if (!compositor->visual->type_3d && !compositor->hybrid_opengl) {
 				/*create an offscreen window for OpenGL rendering*/
-				if ((compositor->offscreen_width < st->txh.width) || (compositor->offscreen_height < st->txh.height)) {
-#ifndef GPAC_USE_TINYGL
-					GF_Err e;
-					GF_Event evt;
-					compositor->offscreen_width = MAX(compositor->offscreen_width, st->txh.width);
-					compositor->offscreen_height = MAX(compositor->offscreen_height, st->txh.height);
-
-					evt.type = GF_EVENT_VIDEO_SETUP;
-					evt.setup.width = compositor->offscreen_width;
-					evt.setup.height = compositor->offscreen_height;
-					evt.setup.back_buffer = 0;
-					evt.setup.opengl_mode = 2;
-					e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
-					if (e) {
-						gf_sc_texture_release(txh);
-						st->unsupported = 1;
-						return;
-					}
-					/*reload openGL ext*/
-					gf_sc_load_opengl_extensions(compositor, 1);
-#endif
+				if (!compositor->fbo_id
+					&& ((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"));
+					st->unsupported = GF_TRUE;
 				}
 			} else {
 				needs_stencil = 0;
@@ -457,7 +448,7 @@
 
 			/*set stencil texture - we don't check error as an image could not be supported by the rasterizer
 			but still supported by the blitter (case of RGBD/RGBDS)*/
-			raster->stencil_set_texture(stencil, txh->data, txh->width, txh->height, txh->stride, txh->pixelformat, txh->pixelformat, 0);
+			gf_evg_stencil_set_texture(stencil, txh->data, txh->width, txh->height, txh->stride, txh->pixelformat);
 
 #ifdef GPAC_USE_TINYGL
 			if (st->visual->type_3d && !compositor->visual->type_3d) {
@@ -465,8 +456,14 @@
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Creating TinyGL Offscreen context %p (%d %d - pf %s)\n", st->tgl_ctx, txh->width, txh->width, gf_4cc_to_str(txh->pixelformat)));
 			}
 #endif
-
 		}
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_DISABLE_3D)
+		else if (compositor->gl_caps.fbo) {
+			if (gf_sc_texture_setup_fbo(&st->txh)==GF_OK)
+				st->use_fbo = GF_TRUE;
+		}
+#endif
+
 		invalidate_all = 1;
 		gf_sc_texture_set_stencil(txh, stencil);
 	}
@@ -479,423 +476,442 @@
 #else
 		if (compositor->visual->type_3d) {
 			st->visual->type_3d = 2;
-		} else if (compositor->hybrid_opengl) {
+		} else if (compositor->hybrid_opengl || compositor->fbo_id) {
 			st->visual->type_3d = 2;
 		} else if (! (compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN)) {
 			st->visual->type_3d = 0;
 		} else {
 			st->visual->type_3d = 2;
 		}
-	}
 #endif
-
+	}
 #endif
 
-		stencil = gf_sc_texture_get_stencil(txh);
-		if (!stencil) return;
+	stencil = gf_sc_texture_get_stencil(txh);
+	if (!stencil) return;
 
 #ifdef GPAC_USE_TINYGL
-		if (st->tgl_ctx) ostgl_make_current(st->tgl_ctx, 0);
+	if (st->tgl_ctx)
+		ostgl_make_current(st->tgl_ctx, 0);
+#elif !defined(GPAC_DISABLE_3D)
+	if (st->use_fbo) {
+		gf_sc_texture_enable_fbo(&st->txh, GF_TRUE);
+	}
 #endif
 
-		GF_SAFEALLOC(tr_state, GF_TraverseState);
-		if (!tr_state) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate traverse state for composite texture\n"));
-			return;
-		}
-		tr_state->vrml_sensors = gf_list_new();
-		tr_state->visual = st->visual;
-		tr_state->invalidate_all = invalidate_all;
+	sensor_bck = st->tr_state->vrml_sensors;
+	memset(st->tr_state, 0, sizeof(GF_TraverseState));
+	st->tr_state->vrml_sensors = sensor_bck;
+	st->tr_state->visual = st->visual;
+	st->tr_state->invalidate_all = invalidate_all;
 
-		tr_state->immediate_draw = st->visual->compositor->traverse_state->immediate_draw;
+	st->tr_state->immediate_draw = st->visual->compositor->traverse_state->immediate_draw;
 
-		gf_mx2d_init(tr_state->transform);
-		gf_cmx_init(&tr_state->color_mat);
+	gf_mx2d_init(st->tr_state->transform);
+	gf_cmx_init(&st->tr_state->color_mat);
 
-		tr_state->backgrounds = st->visual->back_stack;
-		tr_state->viewpoints = st->visual->view_stack;
-		tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(st->txh.owner));
-		tr_state->min_hsize = INT2FIX( MIN(txh->width, txh->height) ) / 2;
-		tr_state->vp_size.x = INT2FIX(txh->width);
-		tr_state->vp_size.y = INT2FIX(txh->height);
+	st->tr_state->backgrounds = st->visual->back_stack;
+	st->tr_state->viewpoints = st->visual->view_stack;
+	st->tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(st->txh.owner));
+	st->tr_state->min_hsize = INT2FIX( MIN(txh->width, txh->height) ) / 2;
+	st->tr_state->vp_size.x = INT2FIX(txh->width);
+	st->tr_state->vp_size.y = INT2FIX(txh->height);
 
-		composite_do_bindable(st->txh.owner, tr_state, st->first);
-		st->first = 0;
+	composite_do_bindable(st->txh.owner, st->tr_state, st->first);
+	st->first = 0;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Entering draw cycle\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Entering draw cycle\n"));
 
-		txh->needs_refresh = visual_draw_frame(st->visual, st->txh.owner, tr_state, 0);
-		txh->transparent = (st->visual->last_had_back==2) ? 0 : 1;
+	txh->needs_refresh = visual_draw_frame(st->visual, st->txh.owner, st->tr_state, 0);
+	txh->transparent = (st->visual->last_had_back==2) ? 0 : 1;
 
-		if (!compositor->edited_text && st->visual->has_text_edit)
-			st->visual->has_text_edit = 0;
+	if (!compositor->edited_text && st->visual->has_text_edit)
+		st->visual->has_text_edit = 0;
 
 
-		/*set active viewport in image coordinates top-left=(0, 0), not in BIFS*/
-		if (0 && gf_list_count(st->visual->view_stack)) {
-			M_Viewport *vp = (M_Viewport *)gf_list_get(st->visual->view_stack, 0);
+#if 0
+	/*set active viewport in image coordinates top-left=(0, 0), not in BIFS*/
+	if (gf_list_count(st->visual->view_stack)) {
+		M_Viewport *vp = (M_Viewport *)gf_list_get(st->visual->view_stack, 0);
 
-			if (vp->isBound) {
-				SFVec2f size = vp->size;
-				if (size.x >=0 && size.y>=0) {
-					/*FIXME - we need tracking of VP changes*/
-					txh->needs_refresh = 1;
-				}
+		if (vp->isBound) {
+			SFVec2f size = vp->size;
+			if (size.x >=0 && size.y>=0) {
+				/*FIXME - we need tracking of VP changes*/
+				txh->needs_refresh = 1;
 			}
 		}
+	}
+#endif
 
-		if (txh->needs_refresh) {
+	if (txh->needs_refresh) {
 #ifndef GPAC_DISABLE_3D
-			//for composite 3D, store current buffer to texture - TODO: use FBOs to avoid the copy ...
-			if (st->visual->camera.is_3D && (st->visual->compositor->visual->type_3d || st->visual->compositor->hybrid_opengl)) {
+
 #ifndef GPAC_USE_TINYGL
-				gf_sc_copy_to_texture(&st->txh);
+		if (st->use_fbo) {
+			gf_sc_texture_enable_fbo(&st->txh, GF_FALSE);
+		} else
 #endif
-			}
-			else if (st->visual->camera.is_3D) {
-				if (st->visual->compositor->visual->type_3d) {
+		//no FBO, for composite 3D, store current buffer to texture
+		if (st->visual->camera.is_3D && (st->visual->compositor->visual->type_3d || st->visual->compositor->hybrid_opengl)) {
 #ifndef GPAC_USE_TINYGL
-					gf_sc_copy_to_texture(&st->txh);
-#else
-					/*in TinyGL we only need to push associated bitmap to the texture*/
-					gf_sc_texture_push_image(&st->txh, 0, 0);
+			gf_sc_copy_to_texture(&st->txh);
 #endif
-				} else {
-
+		}
+		else if (st->visual->camera.is_3D) {
+			if (st->visual->compositor->visual->type_3d) {
 #ifndef GPAC_USE_TINYGL
-					gf_sc_copy_to_stencil(&st->txh);
-
+				gf_sc_copy_to_texture(&st->txh);
 #else
-
-					if (txh->pixelformat==GF_PIXEL_RGBDS) gf_get_tinygl_depth(&st->txh);
+				/*in TinyGL we only need to push associated bitmap to the texture*/
+				gf_sc_texture_push_image(&st->txh, 0, 0);
 #endif
-				}
-			} else
+			} else {
+#ifndef GPAC_USE_TINYGL
+				gf_sc_copy_to_stencil(&st->txh);
+#else
+				if (txh->pixelformat==GF_PIXEL_RGBDS)
+					gf_get_tinygl_depth(&st->txh);
 #endif
-			{
-				if (raster->stencil_texture_modified) raster->stencil_texture_modified(stencil);
-				gf_sc_texture_set_stencil(txh, stencil);
 			}
-			gf_sc_invalidate(st->txh.compositor, NULL);
+		} else
+#endif
+		{
+			gf_sc_texture_set_stencil(txh, stencil);
 		}
-		gf_list_del(tr_state->vrml_sensors);
-		gf_free(tr_state);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Leaving draw cycle\n"));
+		gf_sc_invalidate(st->txh.compositor, NULL);
 	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[CompositeTexture] Leaving draw cycle\n"));
+}
 
 
-	GF_Err composite_get_video_access(GF_VisualManager *visual)
-	{
-		GF_STENCIL stencil;
-		GF_Err e;
-		CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(visual->offscreen);
-
-		if (!st->txh.tx_io || !visual->raster_surface) return GF_BAD_PARAM;
-		stencil = gf_sc_texture_get_stencil(&st->txh);
-		if (!stencil) return GF_BAD_PARAM;
-		e = visual->compositor->rasterizer->surface_attach_to_texture(visual->raster_surface, stencil);
-		if (!e) visual->is_attached = 1;
-		return e;
-	}
+GF_Err composite_get_video_access(GF_VisualManager *visual)
+{
+	GF_EVGStencil *stencil;
+	GF_Err e;
+	CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(visual->offscreen);
+
+	if (!st->txh.tx_io || !visual->raster_surface) return GF_BAD_PARAM;
+	stencil = gf_sc_texture_get_stencil(&st->txh);
+	if (!stencil) return GF_BAD_PARAM;
+	e = gf_evg_surface_attach_to_texture(visual->raster_surface, stencil);
+	if (!e) visual->is_attached = 1;
+	return e;
+}
 
-	void composite_release_video_access(GF_VisualManager *visual)
-	{
-		visual->compositor->rasterizer->surface_detach(visual->raster_surface);
+void composite_release_video_access(GF_VisualManager *visual)
+{
+}
+
+Bool composite_check_visual_attached(GF_VisualManager *visual)
+{
+	return visual->is_attached;
+}
+
+void compositor_init_compositetexture2d(GF_Compositor *compositor, GF_Node *node)
+{
+	M_CompositeTexture2D *c2d = (M_CompositeTexture2D *)node;
+	CompositeTextureStack *st;
+	GF_SAFEALLOC(st, CompositeTextureStack);
+
+	if (!st) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture stack\n"));
+		return;
 	}
 
-	Bool composite_check_visual_attached(GF_VisualManager *visual)
-	{
-		return visual->is_attached;
+	GF_SAFEALLOC(st->tr_state, GF_TraverseState);
+	if (!st->tr_state) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture state\n"));
+		return;
 	}
+	st->tr_state->vrml_sensors = gf_list_new();
 
-	void compositor_init_compositetexture2d(GF_Compositor *compositor, GF_Node *node)
-	{
-		M_CompositeTexture2D *c2d = (M_CompositeTexture2D *)node;
-		CompositeTextureStack *st;
-		GF_SAFEALLOC(st, CompositeTextureStack);
+	st->sensors = gf_list_new();
+	st->previous_sensors = gf_list_new();
+	gf_sc_texture_setup(&st->txh, compositor, node);
+	/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
+	gf_list_del_item(compositor->textures, &st->txh);
+	gf_list_add(compositor->textures, &st->txh);
 
-		if (!st) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture stack\n"));
-			return;
-		}
-		st->sensors = gf_list_new();
-		st->previous_sensors = gf_list_new();
-		gf_sc_texture_setup(&st->txh, compositor, node);
-		/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
-		gf_list_del_item(compositor->textures, &st->txh);
-		gf_list_add(compositor->textures, &st->txh);
-
-		st->txh.update_texture_fcnt = composite_update;
-
-		if ((c2d->repeatSandT==1) || (c2d->repeatSandT==3) ) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
-		if (c2d->repeatSandT>1) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
-
-		/*create composite visual*/
-		st->visual = visual_new(compositor);
-		st->visual->offscreen = node;
-		st->visual->GetSurfaceAccess = composite_get_video_access;
-		st->visual->ReleaseSurfaceAccess = composite_release_video_access;
-		st->visual->DrawBitmap = composite2d_draw_bitmap;
-		st->visual->CheckAttached = composite_check_visual_attached;
-
-		st->visual->raster_surface = compositor->rasterizer->surface_new(compositor->rasterizer, 1);
-
-
-		st->first = 1;
-		st->visual->compositor = compositor;
-		gf_node_set_private(node, st);
-		gf_node_set_callback_function(node, composite_traverse);
-		gf_sc_visual_register(compositor, st->visual);
-	}
+	st->txh.update_texture_fcnt = composite_update;
+
+	if ((c2d->repeatSandT==1) || (c2d->repeatSandT==3) ) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
+	if (c2d->repeatSandT>1) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
+
+	/*create composite visual*/
+	st->visual = visual_new(compositor);
+	st->visual->offscreen = node;
+	st->visual->GetSurfaceAccess = composite_get_video_access;
+	st->visual->ReleaseSurfaceAccess = composite_release_video_access;
+	st->visual->DrawBitmap = composite2d_draw_bitmap;
+	st->visual->CheckAttached = composite_check_visual_attached;
+
+	st->visual->raster_surface = gf_evg_surface_new(1);
+
+
+	st->first = 1;
+	st->visual->compositor = compositor;
+	gf_node_set_private(node, st);
+	gf_node_set_callback_function(node, composite_traverse);
+	gf_sc_visual_register(compositor, st->visual);
+}
 
 
 #ifndef GPAC_DISABLE_3D
-	void compositor_init_compositetexture3d(GF_Compositor *compositor, GF_Node *node)
-	{
-		M_CompositeTexture3D *c3d = (M_CompositeTexture3D *)node;
-		CompositeTextureStack *st;
-		GF_SAFEALLOC(st, CompositeTextureStack);
-		if (!st) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture stack\n"));
-			return;
-		}
-		st->sensors = gf_list_new();
-		st->previous_sensors = gf_list_new();
-		gf_sc_texture_setup(&st->txh, compositor, node);
-		/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
-		gf_list_del_item(compositor->textures, &st->txh);
-		gf_list_add(compositor->textures, &st->txh);
-
-		st->txh.update_texture_fcnt = composite_update;
-
-		if (c3d->repeatS) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
-		if (c3d->repeatT) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
-
-		/*create composite visual*/
-		st->visual = visual_new(compositor);
-		st->visual->offscreen = node;
-		st->visual->GetSurfaceAccess = composite_get_video_access;
-		st->visual->ReleaseSurfaceAccess = composite_release_video_access;
-		st->visual->CheckAttached = composite_check_visual_attached;
-
-		st->visual->camera.is_3D = 1;
-		st->first = 1;
-		st->visual->compositor = compositor;
-		gf_node_set_private(node, st);
-		gf_node_set_callback_function(node, composite_traverse);
-		gf_sc_visual_register(compositor, st->visual);
-
-		camera_invalidate(&st->visual->camera);
+void compositor_init_compositetexture3d(GF_Compositor *compositor, GF_Node *node)
+{
+	M_CompositeTexture3D *c3d = (M_CompositeTexture3D *)node;
+	CompositeTextureStack *st;
+
+	if (!gf_sc_check_gl_support(compositor)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Driver disabled, cannot render 3D composite textures\n"));
+		return;
 	}
-#endif
 
-	GF_TextureHandler *compositor_get_composite_texture(GF_Node *node)
-	{
-		CompositeTextureStack *st = (CompositeTextureStack*) gf_node_get_private(node);
-		return &st->txh;
+	GF_SAFEALLOC(st, CompositeTextureStack);
+	if (!st) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture stack\n"));
+		return;
+	}
+	GF_SAFEALLOC(st->tr_state, GF_TraverseState);
+	if (!st->tr_state) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture state\n"));
+		return;
 	}
 
-	Bool compositor_compositetexture_handle_event(GF_Compositor *compositor, GF_Node *composite_appear, GF_Event *ev, Bool is_flush)
-	{
-		GF_Ray ray;
-		Fixed dist;
-		Bool had_text_sel=0;
-		GF_Matrix mx;
-		GF_TraverseState *tr_state;
-		GF_ChildNodeItem *children, *l;
-		Bool res;
-		SFVec3f txcoord, loc_pt, world_pt;
-		GF_Matrix l2w_mx, w2l_mx;
-		CompositeTextureStack *stack;
-		GF_Node *appear, *prev_appear;
-		M_Appearance *ap = (M_Appearance *)composite_appear;
-		assert(ap && ap->texture);
-
-		if (ev->type > GF_EVENT_MOUSEMOVE) return 0;
-		stack = gf_node_get_private(ap->texture);
-		if (!stack->txh.tx_io) return 0;
-
-		tr_state = NULL;
-		children = NULL;
-
-
-		if (!is_flush) {
-			txcoord.x = compositor->hit_texcoords.x;
-			txcoord.y = compositor->hit_texcoords.y;
-			txcoord.z = 0;
-			if (gf_sc_texture_get_transform(&stack->txh, ap->textureTransform, &mx, 1)) {
-				/*tx coords are inverted when mapping, thus applying directly the matrix will give us the
-				untransformed coords*/
-				gf_mx_apply_vec(&mx, &txcoord);
-				while (txcoord.x<0) txcoord.x += FIX_ONE;
-				while (txcoord.x>FIX_ONE) txcoord.x -= FIX_ONE;
-				while (txcoord.y<0) txcoord.y += FIX_ONE;
-				while (txcoord.y>FIX_ONE) txcoord.y -= FIX_ONE;
-			}
+	st->tr_state->vrml_sensors = gf_list_new();
 
-			/*convert to tx space*/
-			ev->mouse.x = FIX2INT( (txcoord.x - FIX_ONE/2) * stack->visual->width + FIX_ONE/2);
-			ev->mouse.y = FIX2INT( (txcoord.y - FIX_ONE/2) * stack->visual->height + FIX_ONE/2);
+	st->sensors = gf_list_new();
+	st->previous_sensors = gf_list_new();
+	gf_sc_texture_setup(&st->txh, compositor, node);
+	/*remove texture from compositor and add it at the end, so that any sub-textures are handled before*/
+	gf_list_del_item(compositor->textures, &st->txh);
+	gf_list_add(compositor->textures, &st->txh);
 
+	st->txh.update_texture_fcnt = composite_update;
 
-			GF_SAFEALLOC(tr_state, GF_TraverseState);
-			if (!tr_state) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate composite texture state\n"));
-				return 0;
-			}
-			tr_state->vrml_sensors = gf_list_new();
-			tr_state->visual = stack->visual;
-			tr_state->traversing_mode = TRAVERSE_PICK;
-			tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(ap->texture));
-			tr_state->vp_size.x = INT2FIX(stack->txh.width);
-			tr_state->vp_size.y = INT2FIX(stack->txh.height);
-			tr_state->color_mat.identity = 1;
-
-			gf_mx2d_init(tr_state->transform);
+	if (c3d->repeatS) st->txh.flags |= GF_SR_TEXTURE_REPEAT_S;
+	if (c3d->repeatT) st->txh.flags |= GF_SR_TEXTURE_REPEAT_T;
+
+	/*create composite visual*/
+	st->visual = visual_new(compositor);
+	st->visual->offscreen = node;
+	st->visual->GetSurfaceAccess = composite_get_video_access;
+	st->visual->ReleaseSurfaceAccess = composite_release_video_access;
+	st->visual->CheckAttached = composite_check_visual_attached;
+
+	st->visual->camera.is_3D = 1;
+	st->first = 1;
+	st->visual->compositor = compositor;
+	gf_node_set_private(node, st);
+	gf_node_set_callback_function(node, composite_traverse);
+	gf_sc_visual_register(compositor, st->visual);
+
+	camera_invalidate(&st->visual->camera);
+}
+#endif
+
+GF_TextureHandler *compositor_get_composite_texture(GF_Node *node)
+{
+	CompositeTextureStack *st = (CompositeTextureStack*) gf_node_get_private(node);
+	return &st->txh;
+}
+
+Bool compositor_compositetexture_handle_event(GF_Compositor *compositor, GF_Node *composite_appear, GF_Event *ev, Bool is_flush)
+{
+	GF_Ray ray;
+	Fixed dist;
+	Bool had_text_sel=0;
+	GF_Matrix mx;
+	GF_ChildNodeItem *children, *l;
+	Bool res;
+	SFVec3f txcoord, loc_pt, world_pt;
+	GF_Matrix l2w_mx, w2l_mx;
+	CompositeTextureStack *stack;
+	GF_Node *appear, *prev_appear;
+	GF_List *sensor_bck;
+	M_Appearance *ap = (M_Appearance *)composite_appear;
+	assert(ap && ap->texture);
+
+	if (ev->type > GF_EVENT_MOUSEMOVE) return 0;
+	stack = gf_node_get_private(ap->texture);
+	if (!stack->txh.tx_io) return 0;
+
+	children = NULL;
+
+
+	if (!is_flush) {
+		txcoord.x = compositor->hit_texcoords.x;
+		txcoord.y = compositor->hit_texcoords.y;
+		txcoord.z = 0;
+		if (gf_sc_texture_get_transform(&stack->txh, ap->textureTransform, &mx, 1)) {
+			/*tx coords are inverted when mapping, thus applying directly the matrix will give us the
+			untransformed coords*/
+			gf_mx_apply_vec(&mx, &txcoord);
+			while (txcoord.x<0) txcoord.x += FIX_ONE;
+			while (txcoord.x>FIX_ONE) txcoord.x -= FIX_ONE;
+			while (txcoord.y<0) txcoord.y += FIX_ONE;
+			while (txcoord.y>FIX_ONE) txcoord.y -= FIX_ONE;
+		}
+
+		/*convert to tx space*/
+		ev->mouse.x = FIX2INT( (txcoord.x - FIX_ONE/2) * stack->visual->width + FIX_ONE/2);
+		ev->mouse.y = FIX2INT( (txcoord.y - FIX_ONE/2) * stack->visual->height + FIX_ONE/2);
+
+		sensor_bck = stack->tr_state->vrml_sensors;
+		memset(stack->tr_state, 0, sizeof(GF_TraverseState));
+		stack->tr_state->vrml_sensors = sensor_bck;
+
+		stack->tr_state->visual = stack->visual;
+		stack->tr_state->traversing_mode = TRAVERSE_PICK;
+		stack->tr_state->pixel_metrics = gf_sg_use_pixel_metrics(gf_node_get_graph(ap->texture));
+		stack->tr_state->vp_size.x = INT2FIX(stack->txh.width);
+		stack->tr_state->vp_size.y = INT2FIX(stack->txh.height);
+		stack->tr_state->color_mat.identity = 1;
+
+		gf_mx2d_init(stack->tr_state->transform);
 #ifndef GPAC_DISABLE_3D
-			gf_mx_init(tr_state->model_matrix);
+		gf_mx_init(stack->tr_state->model_matrix);
 #endif
-			/*collect sensors but not anchors*/
-			l = children = ((M_CompositeTexture2D*)ap->texture)->children;
-			while (l) {
-				GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
-				if (hsens) gf_list_add(tr_state->vrml_sensors, hsens);
-				l = l->next;
-			}
+		/*collect sensors but not anchors*/
+		l = children = ((M_CompositeTexture2D*)ap->texture)->children;
+		while (l) {
+			GF_SensorHandler *hsens = compositor_mpeg4_get_sensor_handler_ex(l->node, GF_TRUE);
+			if (hsens) gf_list_add(stack->tr_state->vrml_sensors, hsens);
+			l = l->next;
 		}
+	}
 
-		stack->temp_sensors = compositor->sensors;
-		stack->temp_previous_sensors = compositor->previous_sensors;
-		compositor->sensors = stack->sensors;
-		compositor->previous_sensors = stack->previous_sensors;
+	stack->temp_sensors = compositor->sensors;
+	stack->temp_previous_sensors = compositor->previous_sensors;
+	compositor->sensors = stack->sensors;
+	compositor->previous_sensors = stack->previous_sensors;
 
-		ray = compositor->hit_world_ray;
-		dist = compositor->hit_square_dist;
-		prev_appear = compositor->prev_hit_appear;
+	ray = compositor->hit_world_ray;
+	dist = compositor->hit_square_dist;
+	prev_appear = compositor->prev_hit_appear;
 
-		/*protect against destrucion in case of self-destroy*/
-		if (prev_appear) {
-			gf_node_register(prev_appear, NULL);
-		}
-		compositor->prev_hit_appear = stack->prev_hit_appear;
-		appear = compositor->hit_appear;
-		compositor->hit_appear = NULL;
-
-		/*also backup current hit state in case we hit a node in the texture but don't consume the event*/
-		loc_pt = compositor->hit_local_point;
-		world_pt = compositor->hit_world_point;
-		gf_mx_copy(l2w_mx, compositor->hit_local_to_world);
-		gf_mx_copy(w2l_mx, compositor->hit_world_to_local);
-
-		if (compositor->text_selection) had_text_sel=1;
-
-		if (is_flush) {
-			res = 0;
-			gf_list_reset(stack->sensors);
-			gf_sc_exec_event_vrml(compositor, ev);
-		} else {
-			res = visual_execute_event(stack->visual, tr_state, ev, children);
-		}
+	/*protect against destrucion in case of self-destroy*/
+	if (prev_appear) {
+		gf_node_register(prev_appear, NULL);
+	}
+	compositor->prev_hit_appear = stack->prev_hit_appear;
+	appear = compositor->hit_appear;
+	compositor->hit_appear = NULL;
+
+	/*also backup current hit state in case we hit a node in the texture but don't consume the event*/
+	loc_pt = compositor->hit_local_point;
+	world_pt = compositor->hit_world_point;
+	gf_mx_copy(l2w_mx, compositor->hit_local_to_world);
+	gf_mx_copy(w2l_mx, compositor->hit_world_to_local);
+
+	if (compositor->text_selection) had_text_sel=1;
+
+	if (is_flush) {
+		res = 0;
+		gf_list_reset(stack->sensors);
+		gf_sc_exec_event_vrml(compositor, ev);
+	} else {
+		res = visual_execute_event(stack->visual, stack->tr_state, ev, children);
+	}
 
-		if (!had_text_sel && compositor->edited_text) {
-			stack->visual->has_text_edit = 1;
-		} else if (!compositor->text_selection) {
-			stack->visual->has_text_edit = 0;
-		}
+	if (!had_text_sel && compositor->edited_text) {
+		stack->visual->has_text_edit = 1;
+	} else if (!compositor->text_selection) {
+		stack->visual->has_text_edit = 0;
+	}
 
-		if (!res) {
-			compositor->hit_local_point = loc_pt;
-			gf_mx_copy(compositor->hit_local_to_world, l2w_mx);
-			gf_mx_copy(compositor->hit_world_to_local, w2l_mx);
-		}
+	if (!res) {
+		compositor->hit_local_point = loc_pt;
+		gf_mx_copy(compositor->hit_local_to_world, l2w_mx);
+		gf_mx_copy(compositor->hit_world_to_local, w2l_mx);
+	}
 
-		compositor->hit_world_point = world_pt;
-		compositor->hit_world_ray = ray;
-		compositor->hit_square_dist = dist;
+	compositor->hit_world_point = world_pt;
+	compositor->hit_world_ray = ray;
+	compositor->hit_square_dist = dist;
 
-		stack->sensors = compositor->sensors;
-		stack->previous_sensors = compositor->previous_sensors;
-		compositor->sensors = stack->temp_sensors;
-		stack->temp_sensors = NULL;
-		compositor->previous_sensors = stack->temp_previous_sensors;
-		stack->temp_previous_sensors = NULL;
+	stack->sensors = compositor->sensors;
+	stack->previous_sensors = compositor->previous_sensors;
+	compositor->sensors = stack->temp_sensors;
+	stack->temp_sensors = NULL;
+	compositor->previous_sensors = stack->temp_previous_sensors;
+	stack->temp_previous_sensors = NULL;
 
 
-		if (!is_flush) {
-			gf_list_del(tr_state->vrml_sensors);
+	if (!is_flush) {
 #ifndef GPAC_DISABLE_3D
-			if (tr_state->layer3d) compositor->traverse_state->layer3d = tr_state->layer3d;
+		if (stack->tr_state->layer3d) compositor->traverse_state->layer3d = stack->tr_state->layer3d;
 #endif
-			gf_free(tr_state);
-		}
+	}
 
-		stack->prev_hit_appear = compositor->prev_hit_appear;
+	stack->prev_hit_appear = compositor->prev_hit_appear;
 
-		//finally unregister the node, this may destroy the stack !
-		if (prev_appear) {
-			if (prev_appear->sgprivate->num_instances>1) {
-				compositor->prev_hit_appear = prev_appear;
-				compositor->hit_appear = appear;
-			} else {
-				compositor->prev_hit_appear = NULL;
-				compositor->hit_appear = NULL;
-			}
-			gf_node_unregister(prev_appear, NULL);
-		} else {
+	//finally unregister the node, this may destroy the stack !
+	if (prev_appear) {
+		if (prev_appear->sgprivate->num_instances>1) {
 			compositor->prev_hit_appear = prev_appear;
 			compositor->hit_appear = appear;
+		} else {
+			compositor->prev_hit_appear = NULL;
+			compositor->hit_appear = NULL;
 		}
-
-		return res;
+		gf_node_unregister(prev_appear, NULL);
+	} else {
+		compositor->prev_hit_appear = prev_appear;
+		compositor->hit_appear = appear;
 	}
 
-	void compositor_compositetexture_sensor_delete(GF_Node *composite_appear, GF_SensorHandler *hdl)
-	{
-		CompositeTextureStack *stack = gf_node_get_private(composite_appear);
-		gf_list_del_item(stack->previous_sensors, hdl);
-		gf_list_del_item(stack->sensors, hdl);
-		if (stack->temp_sensors)
-			gf_list_del_item(stack->temp_sensors, hdl);
-		if (stack->temp_previous_sensors)
-			gf_list_del_item(stack->temp_previous_sensors, hdl);
-	}
+	return res;
+}
+
+void compositor_compositetexture_sensor_delete(GF_Node *composite_appear, GF_SensorHandler *hdl)
+{
+	CompositeTextureStack *stack = gf_node_get_private(composite_appear);
+	gf_list_del_item(stack->previous_sensors, hdl);
+	gf_list_del_item(stack->sensors, hdl);
+	if (stack->temp_sensors)
+		gf_list_del_item(stack->temp_sensors, hdl);
+	if (stack->temp_previous_sensors)
+		gf_list_del_item(stack->temp_previous_sensors, hdl);
+}
 
 
-	void compositor_adjust_scale(GF_Node *node, Fixed *sx, Fixed *sy)
+void compositor_adjust_scale(GF_Node *node, Fixed *sx, Fixed *sy)
+{
+	switch (gf_node_get_tag(node)) {
+	case TAG_MPEG4_CompositeTexture2D:
+	case TAG_MPEG4_CompositeTexture3D:
 	{
-		switch (gf_node_get_tag(node)) {
-		case TAG_MPEG4_CompositeTexture2D:
-		case TAG_MPEG4_CompositeTexture3D:
-		{
-			CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(node);
-			(*sx) = gf_divfix(*sx, st->sx);
-			(*sy) = gf_divfix(*sy, st->sy);
-			break;
-		}
-		default:
-			return;
-		}
+		CompositeTextureStack *st = (CompositeTextureStack *) gf_node_get_private(node);
+		(*sx) = gf_divfix(*sx, st->sx);
+		(*sy) = gf_divfix(*sy, st->sy);
+		break;
+	}
+	default:
+		return;
 	}
+}
 
-	Bool compositor_is_composite_texture(GF_Node *appear)
-	{
-		M_Appearance *ap = NULL;
-		u32 tag;
-		if (!appear) return 0;
+Bool compositor_is_composite_texture(GF_Node *appear)
+{
+	M_Appearance *ap = NULL;
+	u32 tag;
+	if (!appear) return 0;
 
-		tag = gf_node_get_tag(appear);
-		if (tag==TAG_MPEG4_Appearance) ap = (M_Appearance *)appear;
+	tag = gf_node_get_tag(appear);
+	if (tag==TAG_MPEG4_Appearance) ap = (M_Appearance *)appear;
 #ifndef GPAC_DISABLE_X3D
-		else if (tag==TAG_X3D_Appearance) ap = (M_Appearance *)appear;
+	else if (tag==TAG_X3D_Appearance) ap = (M_Appearance *)appear;
 #endif
-		if (!ap) return 0;
-		if (!ap->texture) return 0;
-		switch (gf_node_get_tag(((M_Appearance *)appear)->texture)) {
-		case TAG_MPEG4_CompositeTexture2D:
-		case TAG_MPEG4_CompositeTexture3D:
-			return 1;
-		}
-		return 0;
+	if (!ap) return 0;
+	if (!ap->texture) return 0;
+	switch (gf_node_get_tag(((M_Appearance *)appear)->texture)) {
+	case TAG_MPEG4_CompositeTexture2D:
+	case TAG_MPEG4_CompositeTexture3D:
+		return 1;
 	}
+	return 0;
+}
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_form.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_form.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_geometry_2d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_geometry_2d.c Changed

@@ -27,7 +27,6 @@
 
 #include "nodes_stacks.h"
 #include "visual_manager.h"
-#include <gpac/internal/terminal_dev.h>
 
 Bool compositor_get_2d_plane_intersection(GF_Ray *ray, SFVec3f *res)
 {
@@ -76,7 +75,6 @@
 
 	/*check traverse mode, and take care of switch-off flag*/
 	if (tr_state->traversing_mode==TRAVERSE_GET_BOUNDS) {
-		GF_Node *m;
 		tr_state->appear = (GF_Node *) shape->appearance;
 
 		/*this is done regardless of switch flag*/
@@ -84,7 +82,7 @@
 
 		if (tr_state->appear) {
 			/*apply line width*/
-			m = ((M_Appearance *)tr_state->appear)->material;
+			GF_Node *m = ((M_Appearance *)tr_state->appear)->material;
 			if (m && (gf_node_get_tag(m)==TAG_MPEG4_Material2D) ) {
 				DrawAspect2D asp;
 				Fixed width = 0;
@@ -182,7 +180,7 @@
 		if (!stack->mesh) {
 			Fixed a = ((M_Circle *) node)->radius * 2;
 			stack->mesh = new_mesh();
-			mesh_new_ellipse(stack->mesh, a, a, tr_state->visual->compositor->high_speed);
+			mesh_new_ellipse(stack->mesh, a, a, tr_state->visual->compositor->fast);
 		}
 		visual_3d_draw_2d(stack, tr_state);
 		return;
@@ -237,7 +235,7 @@
 	case TRAVERSE_DRAW_3D:
 		if (!stack->mesh) {
 			stack->mesh = new_mesh();
-			mesh_new_ellipse(stack->mesh, ((M_Ellipse *) node)->radius.x * 2, ((M_Ellipse *) node)->radius.y * 2, tr_state->visual->compositor->high_speed);
+			mesh_new_ellipse(stack->mesh, ((M_Ellipse *) node)->radius.x * 2, ((M_Ellipse *) node)->radius.y * 2, tr_state->visual->compositor->fast);
 		}
 		visual_3d_draw_2d(stack, tr_state);
 		return;
@@ -324,7 +322,7 @@
 {
 	GF_TextureHandler *txh;
 	GF_MediaObjectVRInfo vrinfo;
-	s32 tx, ty;
+	s32 gaze_x, gaze_y;
 	Bool is_visible = GF_FALSE;
 	if (! tr_state->visual->compositor->gazer_enabled)
 		return GF_TRUE;
@@ -338,16 +336,32 @@
 	if (! gf_mo_get_srd_info(txh->stream, &vrinfo))
 		return GF_TRUE;
 
-	tx = tr_state->visual->compositor->gaze_x;
-	tx *= vrinfo.srd_max_x;
-	tx /= tr_state->visual->width;
+	if (!vrinfo.srd_w && !vrinfo.srd_h && vrinfo.is_tiled_srd) {
+		if (txh->stream->srd_full_w && txh->stream->srd_full_h) {
+			gaze_x = tr_state->visual->compositor->gaze_x;
+			gaze_x *= txh->stream->srd_full_w;
+			gaze_x /= tr_state->visual->width;
 
-	ty = tr_state->visual->compositor->gaze_y;
-	ty *= vrinfo.srd_max_y;
-	ty /= tr_state->visual->height;
+			gaze_y = tr_state->visual->compositor->gaze_y;
+			gaze_y *= txh->stream->srd_full_h;
+			gaze_y /= tr_state->visual->height;
+
+			gf_mo_hint_gaze(txh->stream, gaze_x, gaze_y);
+		}
+
+		return GF_TRUE;
+	}
+
+	gaze_x = tr_state->visual->compositor->gaze_x;
+	gaze_x *= vrinfo.srd_max_x;
+	gaze_x /= tr_state->visual->width;
+
+	gaze_y = tr_state->visual->compositor->gaze_y;
+	gaze_y *= vrinfo.srd_max_y;
+	gaze_y /= tr_state->visual->height;
 
 	//simple test condition: only keep the first row
-	if ((tx>=vrinfo.srd_x) && (tx<=vrinfo.srd_x+vrinfo.srd_w) && (ty>=vrinfo.srd_y) && (ty<=vrinfo.srd_y+vrinfo.srd_h)) {
+	if ((gaze_x>=vrinfo.srd_x) && (gaze_x<=vrinfo.srd_x+vrinfo.srd_w) && (gaze_y>=vrinfo.srd_y) && (gaze_y<=vrinfo.srd_y+vrinfo.srd_h)) {
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Texture %d Partial plane is under gaze coord %d %d\n", txh->stream->OD_ID, tr_state->visual->compositor->gaze_x, tr_state->visual->compositor->gaze_y));
 		is_visible = GF_TRUE;
@@ -479,7 +493,7 @@
 	if (!coord) return;
 
 	stack->path->fineness = c2D->fineness;
-	if (tr_state->visual->compositor->high_speed)  stack->path->fineness /= 2;
+	if (tr_state->visual->compositor->fast)  stack->path->fineness /= 2;
 
 
 	pts = coord->point.vals;
@@ -776,6 +790,9 @@
 		gf_node_set_private(node, NULL);
 		return;
 	}
+#ifdef GPAC_ENABLE_COVERAGE
+	if (!rs) return;
+#endif
 
 	tr_state = (GF_TraverseState *)rs;
 	// Traverse the node here
@@ -787,8 +804,15 @@
 {
 	M_BitWrapper *bit;
 	bit = (M_BitWrapper *)node;
+	if (!bit->node) return;
 	gf_node_set_private(node, gf_node_get_private(bit->node));
 	gf_node_set_callback_function(node, TraverseBitWrapper);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		TraverseBitWrapper(node, NULL, GF_FALSE);
+	}
+#endif
 }

gpac-0.8.0.tar.gz/src/compositor/mpeg4_geometry_3d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_geometry_3d.c Changed

@@ -89,7 +89,7 @@
 static void build_shape_cone(GF_Node *n, Drawable3D *stack, GF_TraverseState *tr_state)
 {
 	M_Cone *co = (M_Cone *)n;
-	mesh_new_cone(stack->mesh, co->height, co->bottomRadius, co->bottom, co->side, tr_state->visual->compositor->high_speed);
+	mesh_new_cone(stack->mesh, co->height, co->bottomRadius, co->bottom, co->side, tr_state->visual->compositor->fast);
 }
 
 static void TraverseCone(GF_Node *n, void *rs, Bool is_destroy)
@@ -106,7 +106,7 @@
 static void build_shape_cylinder(GF_Node *n, Drawable3D *stack, GF_TraverseState *tr_state)
 {
 	M_Cylinder *cy = (M_Cylinder *)n;
-	mesh_new_cylinder(stack->mesh, cy->height, cy->radius, cy->bottom, cy->side, cy->top, tr_state->visual->compositor->high_speed);
+	mesh_new_cylinder(stack->mesh, cy->height, cy->radius, cy->bottom, cy->side, cy->top, tr_state->visual->compositor->fast);
 }
 
 static void TraverseCylinder(GF_Node *n, void *rs, Bool is_destroy)
@@ -123,7 +123,7 @@
 static void build_shape_sphere(GF_Node *n, Drawable3D *stack, GF_TraverseState *tr_state)
 {	
 	M_Sphere *sp = (M_Sphere *)n;
-	mesh_new_sphere(stack->mesh, sp->radius, tr_state->visual->compositor->high_speed, NULL);
+	mesh_new_sphere(stack->mesh, sp->radius, tr_state->visual->compositor->fast, NULL);
 }
 
 static void get_tx_coords_from_angle(GF_TraverseState *tr_state, GF_TextureHandler *txh, Bool horizontal, u32 *min_coord, u32 *max_coord)
@@ -187,8 +187,6 @@
 	}
 	*min_coord= (u32) (min_tx*dim);
 	*max_coord= (u32) (max_tx*dim);
-
-//	fprintf(stderr, "%s Angle is %g (%g <-> %g) - min tx %g (%u) - max tx %g (%u)\n", horizontal ? "X" : "Y", theta_angle, angle_start, angle_end, min_tx, *min_coord, max_tx, *max_coord);
 }
 
 static void TraverseSphere(GF_Node *n, void *rs, Bool is_destroy)
@@ -250,29 +248,37 @@
 static void IFS_SetColorIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet *ifs = (M_IndexedFaceSet *)node;
-	gf_sg_vrml_field_copy(&ifs->colorIndex, &ifs->set_colorIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs->set_colorIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs->colorIndex, &ifs->set_colorIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs->set_colorIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void IFS_SetCoordIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet *ifs = (M_IndexedFaceSet *)node;
-	gf_sg_vrml_field_copy(&ifs->coordIndex, &ifs->set_coordIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs->set_coordIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs->coordIndex, &ifs->set_coordIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs->set_coordIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void IFS_SetNormalIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet *ifs = (M_IndexedFaceSet *)node;
-	gf_sg_vrml_field_copy(&ifs->normalIndex, &ifs->set_normalIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs->set_normalIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs->normalIndex, &ifs->set_normalIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs->set_normalIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void IFS_SetTexCoordIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet *ifs = (M_IndexedFaceSet *)node;
-	gf_sg_vrml_field_copy(&ifs->texCoordIndex, &ifs->set_texCoordIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs->set_texCoordIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs->texCoordIndex, &ifs->set_texCoordIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs->set_texCoordIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_ifs(GF_Compositor *compositor, GF_Node *node)
@@ -284,6 +290,16 @@
 	ifs->on_set_coordIndex = IFS_SetCoordIndex;
 	ifs->on_set_normalIndex = IFS_SetNormalIndex;
 	ifs->on_set_texCoordIndex = IFS_SetTexCoordIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		IFS_SetCoordIndex(NULL, NULL);
+		IFS_SetColorIndex(NULL, NULL);
+		IFS_SetNormalIndex(NULL, NULL);
+		IFS_SetTexCoordIndex(NULL, NULL);
+	}
+#endif
+
 }
 
 static void build_shape_ils(GF_Node *n, Drawable3D *stack, GF_TraverseState *tr_state)
@@ -300,15 +316,19 @@
 static void ILS_SetColorIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedLineSet *ils = (M_IndexedLineSet *)node;
-	gf_sg_vrml_field_copy(&ils->colorIndex, &ils->set_colorIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ils->set_colorIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ils->colorIndex, &ils->set_colorIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ils->set_colorIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void ILS_SetCoordIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedLineSet *ils = (M_IndexedLineSet *)node;
-	gf_sg_vrml_field_copy(&ils->coordIndex, &ils->set_coordIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ils->set_coordIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ils->coordIndex, &ils->set_coordIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ils->set_coordIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_ils(GF_Compositor *compositor, GF_Node *node)
@@ -318,6 +338,14 @@
 	gf_node_set_callback_function(node, TraverseILS);
 	ils->on_set_colorIndex = ILS_SetColorIndex;
 	ils->on_set_coordIndex = ILS_SetCoordIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ILS_SetCoordIndex(NULL, NULL);
+		ILS_SetColorIndex(NULL, NULL);
+	}
+#endif
+
 }
 
 
@@ -334,8 +362,10 @@
 static void ElevationGrid_SetHeight(GF_Node *node, GF_Route *route)
 {
 	M_ElevationGrid *eg = (M_ElevationGrid *)node;
-	gf_sg_vrml_field_copy(&eg->height, &eg->set_height, GF_SG_VRML_MFFLOAT);
-	gf_sg_vrml_mf_reset(&eg->set_height, GF_SG_VRML_MFFLOAT);
+	if (node) {
+		gf_sg_vrml_field_copy(&eg->height, &eg->set_height, GF_SG_VRML_MFFLOAT);
+		gf_sg_vrml_mf_reset(&eg->set_height, GF_SG_VRML_MFFLOAT);
+	}
 }
 
 void compositor_init_elevation_grid(GF_Compositor *compositor, GF_Node *node)
@@ -344,6 +374,11 @@
 	drawable_3d_new(node);
 	gf_node_set_callback_function(node, TraverseElevationGrid);
 	eg->on_set_height = ElevationGrid_SetHeight;
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ElevationGrid_SetHeight(NULL, NULL);
+	}
+#endif
 }
 
 static void build_shape_extrusion(GF_Node *n, Drawable3D *stack, GF_TraverseState *tr_state)
@@ -359,26 +394,34 @@
 static void Extrusion_SetCrossSection(GF_Node *node, GF_Route *route)
 {
 	M_Extrusion *eg = (M_Extrusion *)node;
-	gf_sg_vrml_field_copy(&eg->crossSection, &eg->set_crossSection, GF_SG_VRML_MFVEC2F);
-	gf_sg_vrml_mf_reset(&eg->set_crossSection, GF_SG_VRML_MFVEC2F);
+	if (node) {
+		gf_sg_vrml_field_copy(&eg->crossSection, &eg->set_crossSection, GF_SG_VRML_MFVEC2F);
+		gf_sg_vrml_mf_reset(&eg->set_crossSection, GF_SG_VRML_MFVEC2F);
+	}
 }
 static void Extrusion_SetOrientation(GF_Node *node, GF_Route *route)
 {
 	M_Extrusion *eg = (M_Extrusion *)node;
-	gf_sg_vrml_field_copy(&eg->orientation, &eg->set_orientation, GF_SG_VRML_MFROTATION);
-	gf_sg_vrml_mf_reset(&eg->set_orientation, GF_SG_VRML_MFROTATION);
+	if (node) {
+		gf_sg_vrml_field_copy(&eg->orientation, &eg->set_orientation, GF_SG_VRML_MFROTATION);
+		gf_sg_vrml_mf_reset(&eg->set_orientation, GF_SG_VRML_MFROTATION);
+	}
 }
 static void Extrusion_SetScale(GF_Node *node, GF_Route *route)
 {
 	M_Extrusion *eg = (M_Extrusion *)node;
-	gf_sg_vrml_field_copy(&eg->scale, &eg->set_scale, GF_SG_VRML_MFVEC2F);
-	gf_sg_vrml_mf_reset(&eg->set_scale, GF_SG_VRML_MFVEC2F);
+	if (node) {
+		gf_sg_vrml_field_copy(&eg->scale, &eg->set_scale, GF_SG_VRML_MFVEC2F);
+		gf_sg_vrml_mf_reset(&eg->set_scale, GF_SG_VRML_MFVEC2F);
+	}
 }
 static void Extrusion_SetSpine(GF_Node *node, GF_Route *route)
 {
 	M_Extrusion *eg = (M_Extrusion *)node;
-	gf_sg_vrml_field_copy(&eg->spine, &eg->set_spine, GF_SG_VRML_MFVEC3F);
-	gf_sg_vrml_mf_reset(&eg->set_spine, GF_SG_VRML_MFVEC3F);
+	if (node) {
+		gf_sg_vrml_field_copy(&eg->spine, &eg->set_spine, GF_SG_VRML_MFVEC3F);
+		gf_sg_vrml_mf_reset(&eg->set_spine, GF_SG_VRML_MFVEC3F);
+	}
 }
 void compositor_init_extrusion(GF_Compositor *compositor, GF_Node *node)
 {
@@ -389,6 +432,16 @@
 	ext->on_set_orientation = Extrusion_SetOrientation;
 	ext->on_set_scale = Extrusion_SetScale;
 	ext->on_set_spine = Extrusion_SetSpine;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		Extrusion_SetCrossSection(NULL, NULL);
+		Extrusion_SetOrientation(NULL, NULL);
+		Extrusion_SetScale(NULL, NULL);
+		Extrusion_SetSpine(NULL, NULL);
+	}
+#endif
+
 }

gpac-0.8.0.tar.gz/src/compositor/mpeg4_geometry_ifs2d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_geometry_ifs2d.c Changed

@@ -79,17 +79,17 @@
 static void IFS2D_Draw(GF_Node *node, GF_TraverseState *tr_state)
 {
 	u32 i, count, ci_count;
+#if 0 //unused
 	u32 j, ind_col, num_col;
 	SFVec2f center, end;
 	SFColor col_cen;
-	GF_STENCIL grad;
+	GF_EVGStencil *grad;
 	u32 *colors;
-	GF_Path *path;
+#endif
 	SFVec2f start;
 	SFVec2f *pts;
 	SFColor col;
 	Fixed alpha;
-	GF_Raster2D *raster;
 	DrawableContext *ctx = tr_state->ctx;
 	M_IndexedFaceSet2D *ifs2D = (M_IndexedFaceSet2D *)node;
 	M_Coordinate2D *coord = (M_Coordinate2D*) ifs2D->coord;
@@ -124,7 +124,7 @@
 
 	/*we have color per faces so we need N path :(*/
 	if (! ifs2D->colorPerVertex) {
-		path = gf_path_new();
+		GF_Path *path = gf_path_new();
 
 		count = 0;
 		i = 0;
@@ -166,16 +166,13 @@
 	}
 
 	/*final case, color per vertex means gradient fill/strike*/
-	raster = tr_state->visual->compositor->rasterizer;
-	grad = raster->stencil_new(raster, GF_STENCIL_VERTEX_GRADIENT);
 	/*not supported, fill default*/
-	if (!grad) {
-		visual_2d_texture_path(tr_state->visual, ctx->drawable->path, ctx, tr_state);
-		visual_2d_draw_path(tr_state->visual, ctx->drawable->path, ctx, NULL, NULL, tr_state);
-		return;
-	}
+	visual_2d_texture_path(tr_state->visual, ctx->drawable->path, ctx, tr_state);
+	visual_2d_draw_path(tr_state->visual, ctx->drawable->path, ctx, NULL, NULL, tr_state);
+	return;
 
 
+#if 0 //deprecated
 	path = gf_path_new();
 
 	ind_col = 0;
@@ -225,8 +222,8 @@
 		col_cen.green += col.green;
 		col_cen.red += col.red;
 
-		raster->stencil_set_vertex_path(grad, path);
-		raster->stencil_set_vertex_colors(grad, colors, num_col);
+		gf_evg_stencil_set_vertex_path(grad, path);
+		gf_evg_stencil_set_vertex_colors(grad, colors, num_col);
 
 		gf_free(colors);
 
@@ -235,24 +232,27 @@
 		col_cen.red /= num_col;
 		center.x /= num_col;
 		center.y /= num_col;
-		raster->stencil_set_vertex_center(grad, center.x, center.y, GF_COL_ARGB_FIXED(alpha, col_cen.red, col_cen.green, col_cen.blue) );
+		gf_evg_stencil_set_vertex_center(grad, center.x, center.y, GF_COL_ARGB_FIXED(alpha, col_cen.red, col_cen.green, col_cen.blue) );
 
-		raster->stencil_set_matrix(grad, &ctx->transform);
+		gf_evg_stencil_set_matrix(grad, &ctx->transform);
 
 		/*draw*/
 		visual_2d_draw_path(tr_state->visual, ctx->drawable->path, ctx, grad, grad, tr_state);
 
-		raster->stencil_delete(grad);
+		gf_evg_stencil_delete(grad);
 
 		//goto next point
 		i++;
 		ind_col += num_col + 1;
 		if (i >= ci_count) break;
-		grad = raster->stencil_new(raster, GF_STENCIL_VERTEX_GRADIENT);
+		grad = gf_evg_stencil_new(GF_STENCIL_VERTEX_GRADIENT);
 		ctx->flags &= ~CTX_PATH_FILLED;
 		ctx->flags &= ~CTX_PATH_STROKE;
 	}
 	gf_path_del(path);
+#endif
+
+
 }
 
 static void TraverseIFS2D(GF_Node *node, void *rs, Bool is_destroy)
@@ -321,15 +321,19 @@
 static void IFS2D_SetColorIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet2D *ifs2D = (M_IndexedFaceSet2D *)node;
-	gf_sg_vrml_field_copy(&ifs2D->colorIndex, &ifs2D->set_colorIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs2D->set_colorIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs2D->colorIndex, &ifs2D->set_colorIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs2D->set_colorIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void IFS2D_SetCoordIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedFaceSet2D *ifs2D = (M_IndexedFaceSet2D *)node;
-	gf_sg_vrml_field_copy(&ifs2D->coordIndex, &ifs2D->set_coordIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ifs2D->set_coordIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ifs2D->coordIndex, &ifs2D->set_coordIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ifs2D->set_coordIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_indexed_face_set2d(GF_Compositor *compositor, GF_Node *node)
@@ -340,6 +344,14 @@
 	gf_node_set_callback_function(node, TraverseIFS2D);
 	ifs2D->on_set_colorIndex = IFS2D_SetColorIndex;
 	ifs2D->on_set_coordIndex = IFS2D_SetCoordIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		IFS2D_SetCoordIndex(NULL, NULL);
+		IFS2D_SetColorIndex(NULL, NULL);
+	}
+#endif
+
 }
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_geometry_ils2d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_geometry_ils2d.c Changed

@@ -77,11 +77,13 @@
 	SFColor col;
 	Fixed alpha;
 	u32 i, count, col_ind, ind, end_at;
-	u32 linear[2], *colors;
+	u32 linear[2];
+#if 0 //unused
+	u32 *colors, j;
+#endif
 	SFVec2f start, end;
-	u32 j, num_col;
-	GF_STENCIL grad;
-	GF_Raster2D *raster;
+	u32 num_col;
+	GF_EVGStencil *grad;
 	DrawableContext *ctx = tr_state->ctx;
 	M_IndexedLineSet2D *ils2D = (M_IndexedLineSet2D *)node;
 	M_Coordinate2D *coord = (M_Coordinate2D*) ils2D->coord;
@@ -137,7 +139,6 @@
 		return;
 	}
 
-	raster = NULL;
 	end_at = ils2D->coordIndex.count;
 	if (!end_at) end_at = coord->point.count;
 
@@ -169,11 +170,10 @@
 			}
 		}
 
-		raster = tr_state->visual->compositor->rasterizer;
 		/*use linear gradient*/
 		if (num_col==2) {
 			Fixed pos[2];
-			grad = raster->stencil_new(raster, GF_STENCIL_LINEAR_GRADIENT);
+			grad = gf_evg_stencil_new(GF_STENCIL_LINEAR_GRADIENT);
 			if (ils2D->colorIndex.count) {
 				col = color->color.vals[ils2D->colorIndex.vals[col_ind]];
 				linear[0] = GF_COL_ARGB_FIXED(alpha, col.red, col.green, col.blue);
@@ -192,12 +192,14 @@
 			}
 			pos[0] = 0;
 			pos[1] = FIX_ONE;
-			raster->stencil_set_linear_gradient(grad, start.x, start.y, end.x, end.y);
-			raster->stencil_set_gradient_interpolation(grad, pos, linear, 2);
+			gf_evg_stencil_set_linear_gradient(grad, start.x, start.y, end.x, end.y);
+			gf_evg_stencil_set_gradient_interpolation(grad, pos, linear, 2);
 		} else {
-			grad = raster->stencil_new(raster, GF_STENCIL_VERTEX_GRADIENT);
+            grad = NULL;
+#if 0 //unused
+			grad = gf_evg_stencil_new(GF_STENCIL_VERTEX_GRADIENT);
 			if (grad) {
-				raster->stencil_set_vertex_path(grad, path);
+				gf_evg_stencil_set_vertex_path(grad, path);
 
 				colors = (u32*)gf_malloc(sizeof(u32) * num_col);
 				for (j=0; j<num_col; j++) {
@@ -210,13 +212,15 @@
 					}
 					colors[j] = GF_COL_ARGB_FIXED(alpha, col.red, col.green, col.blue);
 				}
-				raster->stencil_set_vertex_colors(grad, colors, num_col);
+				gf_evg_stencil_set_vertex_colors(grad, colors, num_col);
 				gf_free(colors);
 			}
+#endif
+
 		}
-		raster->stencil_set_matrix(grad, &ctx->transform);
+		gf_evg_stencil_set_matrix(grad, &ctx->transform);
 		visual_2d_draw_path(tr_state->visual, path, ctx, NULL, grad, tr_state);
-		if (grad) raster->stencil_delete(grad);
+		if (grad) gf_evg_stencil_delete(grad);
 
 		i ++;
 		col_ind += num_col + 1;
@@ -289,15 +293,19 @@
 static void ILS2D_SetColorIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedLineSet2D *ils2D = (M_IndexedLineSet2D *)node;
-	gf_sg_vrml_field_copy(&ils2D->colorIndex, &ils2D->set_colorIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ils2D->set_colorIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ils2D->colorIndex, &ils2D->set_colorIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ils2D->set_colorIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 static void ILS2D_SetCoordIndex(GF_Node *node, GF_Route *route)
 {
 	M_IndexedLineSet2D *ils2D = (M_IndexedLineSet2D *)node;
-	gf_sg_vrml_field_copy(&ils2D->coordIndex, &ils2D->set_coordIndex, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&ils2D->set_coordIndex, GF_SG_VRML_MFINT32);
+	if (node) {
+		gf_sg_vrml_field_copy(&ils2D->coordIndex, &ils2D->set_coordIndex, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&ils2D->set_coordIndex, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_indexed_line_set2d(GF_Compositor *compositor, GF_Node *node)
@@ -308,6 +316,14 @@
 	gf_node_set_callback_function(node, TraverseILS2D);
 	ils2D->on_set_colorIndex = ILS2D_SetColorIndex;
 	ils2D->on_set_coordIndex = ILS2D_SetCoordIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ILS2D_SetCoordIndex(NULL, NULL);
+		ILS2D_SetColorIndex(NULL, NULL);
+	}
+#endif
+
 }
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_gradients.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_gradients.c Changed

@@ -92,7 +92,7 @@
 	u32 i, *cols;
 	Fixed a;
 	Bool const_a;
-	GF_STENCIL stencil;
+	GF_EVGStencil *stencil;
 	M_LinearGradient *lg = (M_LinearGradient *) txh->owner;
 	GradientStack *st = (GradientStack *) gf_node_get_private(txh->owner);
 
@@ -109,7 +109,7 @@
 	}
 
 	stencil = gf_sc_texture_get_stencil(txh);
-	if (!stencil) stencil = txh->compositor->rasterizer->stencil_new(txh->compositor->rasterizer, GF_STENCIL_LINEAR_GRADIENT);
+	if (!stencil) stencil = gf_evg_stencil_new(GF_STENCIL_LINEAR_GRADIENT);
 	/*set stencil even if assigned, this invalidates the associated bitmap state in 3D*/
 	gf_sc_texture_set_stencil(txh, stencil);
 
@@ -124,15 +124,15 @@
 		cols[i] = GF_COL_ARGB_FIXED(a, lg->keyValue.vals[i].red, lg->keyValue.vals[i].green, lg->keyValue.vals[i].blue);
 		if (a != FIX_ONE) txh->transparent = 1;
 	}
-	txh->compositor->rasterizer->stencil_set_gradient_interpolation(stencil, lg->key.vals, cols, lg->key.count);
+	gf_evg_stencil_set_gradient_interpolation(stencil, lg->key.vals, cols, lg->key.count);
 	gf_free(cols);
-	txh->compositor->rasterizer->stencil_set_gradient_mode(stencil, (GF_GradientMode) lg->spreadMethod);
+	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) lg->spreadMethod);
 }
 
 
 static void LG_ComputeMatrix(GF_TextureHandler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d)
 {
-	GF_STENCIL stencil;
+	GF_EVGStencil *stencil;
 	M_LinearGradient *lg = (M_LinearGradient *) txh->owner;
 
 	stencil = gf_sc_texture_get_stencil(txh);
@@ -152,7 +152,7 @@
 	i order to avoid overflows in fixed point*/
 	gf_mx2d_add_scale(mat, bounds->width, bounds->height);
 
-	txh->compositor->rasterizer->stencil_set_linear_gradient(stencil, lg->startPoint.x, lg->startPoint.y, lg->endPoint.x, lg->endPoint.y);
+	gf_evg_stencil_set_linear_gradient(stencil, lg->startPoint.x, lg->startPoint.y, lg->endPoint.x, lg->endPoint.y);
 }
 
 //TODO - replace this with shader-based code ...
@@ -165,16 +165,15 @@
 	Fixed a;
 	Bool const_a;
 	GF_Matrix2D mat;
-	GF_STENCIL stenc;
-	GF_SURFACE surface;
-	GF_STENCIL texture2D;
+	GF_EVGStencil * stenc;
+	GF_EVGSurface *surface;
+	GF_EVGStencil * texture2D;
 	GF_Path *path;
 	GF_Err e;
 	Bool transparent;
 	u32 pix_fmt = 0;
 	M_LinearGradient *lg = (M_LinearGradient *) txh->owner;
 	GradientStack *st = (GradientStack *) gf_node_get_private(txh->owner);
-	GF_Raster2D *raster = txh->compositor->rasterizer;
 
 	if (!txh->tx_io) return;
 
@@ -193,11 +192,11 @@
 	transparent = (lg->opacity.count==1) ? (lg->opacity.vals[0]!=FIX_ONE) : 1;
 
 	/*init our 2D graphics stuff*/
-	texture2D = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
+	texture2D = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 	if (!texture2D) return;
-	surface = raster->surface_new(raster, 1);
+	surface = gf_evg_surface_new(1);
 	if (!surface) {
-		raster->stencil_delete(texture2D);
+		gf_evg_stencil_delete(texture2D);
 		return;
 	}
 
@@ -215,16 +214,16 @@
 		memset(st->tx_data, 0, sizeof(char)*txh->stride*txh->height);
 
 		pix_fmt = GF_PIXEL_RGBA;
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+		e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt);
 		if (e) {
 			pix_fmt = GF_PIXEL_ARGB;
-			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+			e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt);
 		}
 	} else {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
 		}
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB_24, GF_PIXEL_RGB_24, 1);
+		e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB);
 		/*try with ARGB (it actually is needed for GDIplus module since GDIplus cannot handle native RGB texture (it works in BGR)*/
 		if (e) {
 			/*remember for later use*/
@@ -232,29 +231,29 @@
 			transparent = 1;
 			gf_free(st->tx_data);
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+			e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB);
 		}
 	}
 	st->txh.transparent = transparent;
 
 	if (e) {
 		gf_free(st->tx_data);
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
-	e = raster->surface_attach_to_texture(surface, texture2D);
+	e = gf_evg_surface_attach_to_texture(surface, texture2D);
 	if (e) {
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
 
 	/*create & setup gradient*/
-	stenc = raster->stencil_new(raster, GF_STENCIL_LINEAR_GRADIENT);
+	stenc = gf_evg_stencil_new(GF_STENCIL_LINEAR_GRADIENT);
 	if (!stenc) {
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
 	/*move line to object space*/
@@ -262,16 +261,16 @@
 	end.x *= GRAD_TEXTURE_SIZE;
 	start.y *= GRAD_TEXTURE_SIZE;
 	end.y *= GRAD_TEXTURE_SIZE;
-	raster->stencil_set_linear_gradient(stenc, start.x, start.y, end.x, end.y);
+	gf_evg_stencil_set_linear_gradient(stenc, start.x, start.y, end.x, end.y);
 	const_a = (lg->opacity.count == 1) ? 1 : 0;
 	cols = (u32*)gf_malloc(sizeof(u32) * lg->key.count);
 	for (i=0; i<lg->key.count; i++) {
 		a = (const_a ? lg->opacity.vals[0] : lg->opacity.vals[i]);
 		cols[i] = GF_COL_ARGB_FIXED(a, lg->keyValue.vals[i].red, lg->keyValue.vals[i].green, lg->keyValue.vals[i].blue);
 	}
-	raster->stencil_set_gradient_interpolation(stenc, lg->key.vals, cols, lg->key.count);
+	gf_evg_stencil_set_gradient_interpolation(stenc, lg->key.vals, cols, lg->key.count);
 	gf_free(cols);
-	raster->stencil_set_gradient_mode(stenc, (GF_GradientMode)lg->spreadMethod);
+	gf_evg_stencil_set_gradient_mode(stenc, (GF_GradientMode)lg->spreadMethod);
 
 	/*fill surface*/
 	path = gf_path_new();
@@ -291,14 +290,14 @@
 	gf_mx2d_add_translation(&mat, -INT2FIX(GRAD_TEXTURE_HSIZE), -INT2FIX(GRAD_TEXTURE_HSIZE));
 	/*back to GL bottom->up order*/
 	gf_mx2d_add_scale(&mat, FIX_ONE, -FIX_ONE);
-	raster->stencil_set_matrix(stenc, &mat);
-
-	raster->surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
-	raster->surface_set_path(surface, path);
-	raster->surface_fill(surface, stenc);
-	raster->stencil_delete(stenc);
-	raster->surface_delete(surface);
-	raster->stencil_delete(texture2D);
+	gf_evg_stencil_set_matrix(stenc, &mat);
+
+	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
+	gf_evg_surface_set_path(surface, path);
+	gf_evg_surface_fill(surface, stenc);
+	gf_evg_stencil_delete(stenc);
+	gf_evg_surface_delete(surface);
+	gf_evg_stencil_delete(texture2D);
 	gf_path_del(path);
 
 	txh->data = st->tx_data;
@@ -325,7 +324,7 @@
 		}
 	} else {
 		txh->stride = GRAD_TEXTURE_SIZE*3;
-		txh->pixelformat = GF_PIXEL_RGB_24;
+		txh->pixelformat = GF_PIXEL_RGB;
 	}
 	txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
 	gf_sc_texture_set_data(txh);
@@ -361,17 +360,15 @@
 	Fixed a, radius;
 	Bool const_a;
 	GF_Matrix2D mat;
-	GF_STENCIL stenc;
-	GF_SURFACE surface;
-	GF_STENCIL texture2D;
+	GF_EVGStencil * stenc;
+	GF_EVGSurface *surface;
+	GF_EVGStencil * texture2D;
 	GF_Path *path;
 	GF_Err e;
 	u32 pix_fmt = 0;
 	Bool transparent;
 	M_RadialGradient *rg = (M_RadialGradient*) txh->owner;
 	GradientStack *st = (GradientStack *) gf_node_get_private(txh->owner);
-	GF_Raster2D *raster = txh->compositor->rasterizer;
-
 
 	if (!txh->tx_io) return;
 
@@ -387,11 +384,11 @@
 	transparent = (rg->opacity.count==1) ? ((rg->opacity.vals[0]!=FIX_ONE) ? 1 : 0) : 1;
 
 	/*init our 2D graphics stuff*/
-	texture2D = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
+	texture2D = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 	if (!texture2D) return;
-	surface = raster->surface_new(raster, 1);
+	surface = gf_evg_surface_new(1);
 	if (!surface) {
-		raster->stencil_delete(texture2D);
+		gf_evg_stencil_delete(texture2D);
 		return;
 	}
 
@@ -410,17 +407,17 @@
 
 		pix_fmt = GF_PIXEL_RGBA;
 
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+		e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt);
 
 		if (e) {
 			pix_fmt = GF_PIXEL_ARGB;
-			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt, pix_fmt, 1);
+			e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, pix_fmt);
 		}
 	} else {
 		if (!st->tx_data) {
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
 		}
-		e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB_24, GF_PIXEL_RGB_24, 1);
+		e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB);
 		/*try with ARGB (it actually is needed for GDIplus module since GDIplus cannot handle native RGB texture (it works in BGR)*/
 		if (e) {
 			/*remember for later use*/
@@ -428,29 +425,29 @@
 			transparent = 1;
 			gf_free(st->tx_data);
 			st->tx_data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-			e = raster->stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, 1);
+			e = gf_evg_stencil_set_texture(texture2D, st->tx_data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB);
 		}
 	}
 	st->txh.transparent = transparent;
 
 	if (e) {
 		gf_free(st->tx_data);
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
-	e = raster->surface_attach_to_texture(surface, texture2D);
+	e = gf_evg_surface_attach_to_texture(surface, texture2D);
 	if (e) {
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
 
 	/*create & setup gradient*/
-	stenc = raster->stencil_new(raster, GF_STENCIL_RADIAL_GRADIENT);
+	stenc = gf_evg_stencil_new(GF_STENCIL_RADIAL_GRADIENT);
 	if (!stenc) {
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 	}
 
 	center = rg->center;
@@ -464,7 +461,7 @@
 	focal.y *= GRAD_TEXTURE_SIZE;
 	radius *= GRAD_TEXTURE_SIZE;
 
-	raster->stencil_set_radial_gradient(stenc, center.x, center.y, focal.x, focal.y, radius, radius);
+	gf_evg_stencil_set_radial_gradient(stenc, center.x, center.y, focal.x, focal.y, radius, radius);
 
 	const_a = (rg->opacity.count == 1) ? 1 : 0;
 	cols = (u32*) gf_malloc(sizeof(u32) * rg->key.count);
@@ -472,9 +469,9 @@
 		a = (const_a ? rg->opacity.vals[0] : rg->opacity.vals[i]);
 		cols[i] = GF_COL_ARGB_FIXED(a, rg->keyValue.vals[i].red, rg->keyValue.vals[i].green, rg->keyValue.vals[i].blue);
 	}
-	raster->stencil_set_gradient_interpolation(stenc, rg->key.vals, cols, rg->key.count);
+	gf_evg_stencil_set_gradient_interpolation(stenc, rg->key.vals, cols, rg->key.count);
 	gf_free(cols);
-	raster->stencil_set_gradient_mode(stenc, (GF_GradientMode)rg->spreadMethod);
+	gf_evg_stencil_set_gradient_mode(stenc, (GF_GradientMode)rg->spreadMethod);
 
 	/*fill surface*/
 	path = gf_path_new();
@@ -493,14 +490,14 @@
 	gf_mx2d_add_translation(&mat, -INT2FIX(GRAD_TEXTURE_HSIZE), -INT2FIX(GRAD_TEXTURE_HSIZE));
 	/*back to GL bottom->up order*/
 	gf_mx2d_add_scale(&mat, FIX_ONE, -FIX_ONE);
-	raster->stencil_set_matrix(stenc, &mat);
-
-	raster->surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
-	raster->surface_set_path(surface, path);
-	raster->surface_fill(surface, stenc);
-	raster->stencil_delete(stenc);
-	raster->surface_delete(surface);
-	raster->stencil_delete(texture2D);
+	gf_evg_stencil_set_matrix(stenc, &mat);
+
+	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
+	gf_evg_surface_set_path(surface, path);
+	gf_evg_surface_fill(surface, stenc);
+	gf_evg_stencil_delete(stenc);
+	gf_evg_surface_delete(surface);
+	gf_evg_stencil_delete(texture2D);
 	gf_path_del(path);
 
 	txh->data = st->tx_data;
@@ -517,17 +514,21 @@
 			for (i=0; i<txh->height; i++) {
 				char *data = txh->data + i*txh->stride;
 				for (j=0; j<txh->width; j++) {
-					u32 val = *(u32 *) &data[4*j];
-					data[4*j] = (val>>16) & 0xFF;
-					data[4*j+1] = (val>>8) & 0xFF;
-					data[4*j+2] = (val) & 0xFF;
-					data[4*j+3] = (val>>24) & 0xFF;
+					u8 pa, pr, pg, pb;
+					pa = data[4*j];
+					pr = data[4*j+1];
+					pg = data[4*j+2];
+					pb = data[4*j+3];
+					data[4*j] = pr;
+					data[4*j+1] = pg;
+					data[4*j+2] = pb;
+					data[4*j+3] = pa;
 				}
 			}
 		}
 	} else {
 		txh->stride = GRAD_TEXTURE_SIZE*3;
-		txh->pixelformat = GF_PIXEL_RGB_24;
+		txh->pixelformat = GF_PIXEL_RGB;
 	}
 //	tx_set_blend_enable(txh, 1);
 	txh->flags |= GF_SR_TEXTURE_NO_GL_FLIP;
@@ -538,7 +539,7 @@
 static void UpdateRadialGradient(GF_TextureHandler *txh)
 {
 	Bool const_a;
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	u32 i, *cols;
 	Fixed a;
 	M_RadialGradient *rg = (M_RadialGradient*) txh->owner;
@@ -553,7 +554,7 @@
 	if (!txh->tx_io) gf_sc_texture_allocate(txh);
 
 	stencil = gf_sc_texture_get_stencil(txh);
-	if (!stencil)stencil = txh->compositor->rasterizer->stencil_new(txh->compositor->rasterizer, GF_STENCIL_RADIAL_GRADIENT);
+	if (!stencil) stencil = gf_evg_stencil_new(GF_STENCIL_RADIAL_GRADIENT);
 	/*set stencil even if assigned, this invalidates the associated bitmap state in 3D*/
 	gf_sc_texture_set_stencil(txh, stencil);
 
@@ -574,16 +575,16 @@
 		a = (const_a ? rg->opacity.vals[0] : rg->opacity.vals[i]);
 		cols[i] = GF_COL_ARGB_FIXED(a, rg->keyValue.vals[i].red, rg->keyValue.vals[i].green, rg->keyValue.vals[i].blue);
 	}
-	txh->compositor->rasterizer->stencil_set_gradient_interpolation(stencil, rg->key.vals, cols, rg->key.count);
+	gf_evg_stencil_set_gradient_interpolation(stencil, rg->key.vals, cols, rg->key.count);
 	gf_free(cols);
 
-	txh->compositor->rasterizer->stencil_set_gradient_mode(stencil, (GF_GradientMode) rg->spreadMethod);
+	gf_evg_stencil_set_gradient_mode(stencil, (GF_GradientMode) rg->spreadMethod);
 
 }
 
 static void RG_ComputeMatrix(GF_TextureHandler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d)
 {
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	M_RadialGradient *rg = (M_RadialGradient *) txh->owner;
 
 	if (rg->key.count<2) return;
@@ -596,7 +597,7 @@
 
 	GradientGetMatrix((GF_Node *) rg->transform, mat);
 
-	txh->compositor->rasterizer->stencil_set_radial_gradient(stencil, rg->center.x, rg->center.y, rg->focalPoint.x, rg->focalPoint.y, rg->radius, rg->radius);
+	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

gpac-0.8.0.tar.gz/src/compositor/mpeg4_grouping.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_grouping.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_grouping_2d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_grouping_2d.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_grouping_3d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_grouping_3d.c Changed

gpac-1.0.0.tar.gz/src/compositor/mpeg4_inline.c Added

@@ -0,0 +1,782 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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.
+ *
+ */
+
+
+
+/*for OD service types*/
+#include <gpac/constants.h>
+/*for URL concatenation*/
+#include <gpac/network.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/compositor.h>
+#include <gpac/nodes_x3d.h>
+#include <gpac/crypt.h>
+
+/*SVG properties*/
+#ifndef GPAC_DISABLE_SVG
+#include <gpac/scenegraph_svg.h>
+#endif
+
+
+
+#ifndef GPAC_DISABLE_VRML
+
+void gf_inline_restart(GF_Scene *scene)
+{
+	scene->needs_restart = 1;
+	gf_sc_invalidate(scene->compositor, NULL);
+}
+
+
+static Bool gf_inline_set_scene(M_Inline *root)
+{
+	GF_MediaObject *mo;
+	GF_Scene *parent;
+	GF_SceneGraph *graph = gf_node_get_graph((GF_Node *) root);
+	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);
+	if (!mo) return GF_FALSE;
+	//invalidate as soon as we have an mo (eg something is attached to the scene)
+	gf_sc_invalidate(parent->compositor, NULL);
+
+	if (!mo->odm) return GF_FALSE;
+
+	if (!mo->odm->subscene) {
+		gf_sc_invalidate(parent->compositor, NULL);
+		return GF_FALSE;
+	}
+	/*assign inline scene as private stack of inline node, and remember inline node for event propagation*/
+	gf_node_set_private((GF_Node *)root, mo->odm->subscene);
+	mo->odm->subscene->object_attached = GF_TRUE;
+
+	/*play*/
+	gf_mo_play(mo, 0, -1, GF_FALSE);
+
+	return GF_TRUE;
+}
+
+void gf_inline_on_modified(GF_Node *node)
+{
+	u32 ODID;
+	GF_MediaObject *mo;
+	M_Inline *pInline = (M_Inline *) node;
+	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
+
+	ODID = gf_mo_get_od_id(&pInline->url);
+	if (scene) {
+		mo = (scene->root_od) ? scene->root_od->mo : NULL;
+
+		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
+		if (mo) {
+			Bool changed = GF_TRUE;
+			if (ODID != GF_MEDIA_EXTERNAL_ID) {
+				if (ODID && (ODID==scene->root_od->ID)) changed = GF_FALSE;
+			} else {
+				if (gf_mo_is_same_url(mo, &pInline->url, NULL, 0) ) changed = GF_FALSE;
+			}
+			if (mo->num_open) {
+				if (!changed) return;
+
+				gf_scene_notify_event(scene, GF_EVENT_UNLOAD, node, NULL, GF_OK, GF_TRUE);
+				gf_node_dirty_parents(node);
+				gf_mo_event_target_remove_by_node(mo, node);
+
+				/*reset the scene pointer as it may get destroyed*/
+				switch (gf_node_get_tag(node)) {
+				case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+				case TAG_X3D_Inline:
+#endif
+					gf_node_set_private(node, NULL);
+					break;
+				}
+
+				scene->object_attached = GF_FALSE;
+				mo->num_open --;
+				if (!mo->num_open) {
+					if (ODID == GF_MEDIA_EXTERNAL_ID) {
+						GF_Scene *parent = scene->root_od->parentscene;
+						/*!!! THIS WILL DESTROY THE INLINE SCENE OBJECT !!!*/
+						gf_odm_disconnect(scene->root_od, GF_TRUE);
+						/*and force removal of the media object*/
+						if (parent) {
+							if (gf_list_del_item(parent->scene_objects, mo)>=0) {
+								gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
+								gf_mo_del(mo);
+							}
+						}
+					} else {
+
+						/*external media are completely unloaded, except addons which are only declared once */
+						if (!scene->root_od->addon && (scene->root_od->ID==GF_MEDIA_EXTERNAL_ID)) {
+							gf_odm_disconnect(scene->root_od, 2);
+						} else {
+							gf_odm_stop_or_destroy(scene->root_od);
+						}
+					}
+				}
+			}
+		}
+	}
+	/*force a redraw and load scene at next pass - we cannot load the scene now because
+		- we can be in a JS call (eg JS mutex blocked)
+		- locating scene objects matching the new url needs exclusive access to the MediaObject list, achieved with the term net mutex
+		- another service may already be setting up objects (eg exclusive access to the net mutex grabbed), which can trigger event forwarding
+		- some event forwarders may request JS context (eg access to JS mutex)
+
+		In such a case we would end up in a deadlock - this needs urgent fixing ...
+	*/
+	if (ODID) {
+		/*if no parent we must process the url change as we may not be traversed later on (not in the scene tree)*/
+		if (gf_node_get_parent(node, 0)==NULL) {
+			gf_inline_set_scene(pInline);
+		} else {
+			gf_node_dirty_parents(node);
+		}
+	}
+}
+
+static void gf_inline_check_restart(GF_Scene *scene)
+{
+	/*no ctrl if no duration*/
+	if (!scene->duration) return;
+	if (!scene->needs_restart) gf_odm_check_segment_switch(scene->root_od);
+	if (scene->needs_restart) return;
+
+	if (scene->root_od->media_ctrl && scene->root_od->media_ctrl->control->loop) {
+		GF_Clock *ck = gf_odm_get_media_clock(scene->root_od);
+		if (ck->has_seen_eos && !ck->nb_paused) {
+			u32 now = gf_clock_time(ck);
+			u64 dur = scene->duration;
+			if (scene->root_od->media_ctrl->current_seg) {
+				/*only process when all segments are played*/
+				if (gf_list_count(scene->root_od->media_ctrl->seg) <= scene->root_od->media_ctrl->current_seg) {
+					scene->needs_restart = 1;
+					scene->root_od->media_ctrl->current_seg = 0;
+				}
+			}
+			else {
+				Double s, e;
+				s = now;
+				s/=1000;
+				e = -1;
+				MC_GetRange(scene->root_od->media_ctrl, &s, &e);
+				if ((e>=0) && (e<GF_MAX_FLOAT)) dur = (u32) (e*1000);
+				if (dur<=now) {
+					scene->needs_restart = 1;
+					scene->root_od->media_ctrl->current_seg = 0;
+				} else {
+					/*trigger render until to watch for restart...*/
+					gf_sc_invalidate(scene->compositor, NULL);
+				}
+			}
+		}
+	}
+}
+
+void gf_scene_mpeg4_inline_check_restart(GF_Scene *scene)
+{
+	gf_inline_check_restart(scene);
+	
+	if (scene->needs_restart) {
+		gf_sc_invalidate(scene->compositor, NULL);
+		return;
+	}
+}
+
+void gf_scene_mpeg4_inline_restart(GF_Scene *scene)
+{
+	u32 current_seg = 0;
+
+	if (scene->root_od->media_ctrl) current_seg = scene->root_od->media_ctrl->current_seg;
+
+	if (scene->is_dynamic_scene) {
+		s64 from = 0;
+		if (scene->root_od->media_ctrl) {
+			if (scene->root_od->media_ctrl->media_stop<=0) {
+				from = (s64) (scene->root_od->media_ctrl->media_stop * 1000) - 1;
+			}
+			else if (scene->root_od->media_ctrl->media_start>=0) {
+				scene->root_od->media_ctrl->current_seg = current_seg;
+				from = (s64) (scene->root_od->media_ctrl->media_start * 1000);
+			}
+		}
+		gf_scene_restart_dynamic(scene, from, 0, 0);
+	} else {
+		/*we cannot use gf_mo_restart since it only sets the needs_restart for inline scenes.
+		The rational is that gf_mo_restart can be called from the parent scene (OK) or from the scene itself, in
+		which case shutting down the graph would crash the compositor. We therefore need two render passes to
+		safely restart an inline scene*/
+
+		/*1- stop main object from playing but don't disconnect channels*/
+		gf_odm_stop(scene->root_od, GF_TRUE);
+		/*2- close all ODs inside the scene and reset the graph*/
+		gf_scene_disconnect(scene, GF_FALSE);
+		if (scene->root_od->media_ctrl) scene->root_od->media_ctrl->current_seg = current_seg;
+		/*3- restart the scene*/
+		gf_odm_start(scene->root_od);
+	}
+}
+
+static void gf_inline_traverse(GF_Node *n, void *rs, Bool is_destroy)
+{
+	MFURL *current_url;
+	GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
+
+	if (is_destroy) {
+		GF_MediaObject *mo;
+		if (!scene) return;
+		mo = scene->root_od ? scene->root_od->mo : NULL;
+
+		gf_scene_notify_event(scene, GF_EVENT_UNLOAD, n, NULL, GF_OK, GF_TRUE);
+		if (!mo) return;
+		gf_mo_event_target_remove_by_node(mo, n);
+
+		/*disconnect current inline if we're the last one using it (same as regular OD session leave/join)*/
+		if (mo->num_open) {
+			mo->num_open --;
+			if (!mo->num_open) {
+				/*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
+					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) {
+						gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
+						if (mo->odm) {
+							gf_odm_reset_media_control(mo->odm, 1);
+							mo->odm->mo = NULL;
+						}
+						gf_mo_del(mo);
+					}
+					gf_odm_disconnect(scene->root_od, 2);
+				} else {
+					gf_odm_stop(scene->root_od, 1);
+					gf_scene_disconnect(scene->root_od->subscene, GF_TRUE);
+				}
+			}
+		}
+		return;
+	}
+
+
+	//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;
+		gf_inline_set_scene(inl);
+		scene = (GF_Scene *)gf_node_get_private(n);
+		if (!scene) {
+			/*just like protos, we must invalidate parent graph until attached*/
+			if (inl->url.count) {
+				if (!inl->url.vals[0].OD_ID && (!inl->url.vals[0].url || !strlen(inl->url.vals[0].url) ) ) {
+					gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
+				} else {
+					gf_node_dirty_set(n, 0, GF_TRUE);
+				}
+			}
+			return;
+		}
+	}
+
+	/*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);
+		return;
+	}
+	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
+	gf_node_dirty_clear(n, 0);
+
+	current_url = scene->current_url;
+	scene->current_url = & ((M_Inline*)n)->url;
+	gf_sc_traverse_subscene(scene->compositor, n, scene->graph, rs);
+	scene->current_url = current_url;
+
+	//do we have to restart for next frame ? If so let's do it
+	gf_inline_check_restart(scene);
+
+	/*if we need to restart, shutdown graph and do it*/
+	if (scene->needs_restart) {
+		/*special case: scene change*/
+		if (scene->needs_restart==2) {
+			scene->needs_restart = 0;
+			gf_inline_on_modified(n);
+			return;
+		}
+
+		scene->needs_restart = 0;
+		gf_scene_mpeg4_inline_restart(scene);
+		gf_node_dirty_set(n, 0, GF_TRUE);
+		return;
+	}
+
+}
+
+
+static Bool gf_inline_is_hardcoded_proto(GF_Compositor *compositor, MFURL *url)
+{
+	u32 i;
+	for (i=0; i<url->count; i++) {
+		if (!url->vals[i].url) continue;
+		if (strstr(url->vals[i].url, "urn:inet:gpac:builtin")) return GF_TRUE;
+
+		if (gf_sc_uri_is_hardcoded_proto(compositor, url->vals[i].url))
+			return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_SceneGraph *gf_inline_get_proto_lib(void *_is, MFURL *lib_url)
+{
+	GF_ProtoLink *pl;
+	u32 i;
+	GF_Scene *scene = (GF_Scene *) _is;
+	if (!scene) return NULL;
+
+	//this is a scene reset, destroy all proto links
+	if (!lib_url) {
+		while (gf_list_count(scene->extern_protos)) {
+			pl = gf_list_pop_back(scene->extern_protos);
+			if (pl->mo) {
+				//proto link was not attached, manual discard
+				if (!pl->mo->odm) {
+					gf_sg_vrml_mf_reset(&pl->mo->URLs, GF_SG_VRML_MFURL);
+					gf_list_del_item(scene->scene_objects, pl->mo);
+					gf_mo_del(pl->mo);
+				}
+			}
+			gf_free(pl);
+		}
+		return NULL;
+	}
+	if (!lib_url->count)
+		return NULL;
+
+	if (gf_inline_is_hardcoded_proto(scene->compositor, lib_url)) return (void *) GF_SG_INTERNAL_PROTO;
+
+	i=0;
+	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i))) {
+		/*not ready yet*/
+		if (!pl->mo || !pl->mo->odm) continue;
+
+		if (gf_mo_get_od_id(pl->url) != GF_MEDIA_EXTERNAL_ID) {
+			if (gf_mo_get_od_id(pl->url) == gf_mo_get_od_id(lib_url)) {
+				if (!pl->mo->odm || !pl->mo->odm->subscene) return NULL;
+				return pl->mo->odm->subscene->graph;
+			}
+		}
+	}
+
+	/*for string URL based protos, recursively check until top if the proto lib is not already present*/
+	if (lib_url->vals[0].url) {
+		GF_Scene *check_scene = scene;
+		while (check_scene) {
+			i=0;
+			while ((pl = (GF_ProtoLink*)gf_list_enum(check_scene->extern_protos, &i))) {
+				char *url1, *url2;
+				Bool ok;
+				if (!pl->mo || !pl->mo->odm) continue;
+
+				if (gf_mo_get_od_id(pl->url) != GF_MEDIA_EXTERNAL_ID) continue;
+				/*not the same url*/
+				if (!gf_mo_is_same_url(pl->mo, lib_url, NULL, 0)) continue;
+				ok = GF_FALSE;
+
+				/*check the url path is the same*/
+				url1 = gf_url_concatenate(pl->mo->odm->scene_ns->url, lib_url->vals[0].url);
+				url2 = gf_url_concatenate(scene->root_od->scene_ns->url, lib_url->vals[0].url);
+				if (url1 && url2 && !strcmp(url1, url2)) ok=GF_TRUE;
+				if (url1) gf_free(url1);
+				if (url2) gf_free(url2);
+
+				if (!ok) continue;
+				if (!pl->mo->odm || !pl->mo->odm->subscene) return NULL;
+				return pl->mo->odm->subscene->graph;
+			}
+			check_scene = check_scene->root_od->parentscene;
+		}
+	}
+
+	/*not found, let's try to load it*/
+
+	if (!lib_url || !lib_url->count) return NULL;
+
+	/*internal, don't waste ressources*/
+	if (gf_inline_is_hardcoded_proto(scene->compositor, lib_url)) return NULL;
+
+	i=0;
+	while ((pl = (GF_ProtoLink*)gf_list_enum(scene->extern_protos, &i)) ) {
+		if (pl->url == lib_url) return NULL;
+		if (pl->url->vals[0].OD_ID && (pl->url->vals[0].OD_ID == lib_url->vals[0].OD_ID)) return NULL;
+		if (pl->url->vals[0].url && lib_url->vals[0].url && !stricmp(pl->url->vals[0].url, lib_url->vals[0].url) ) return NULL;
+	}
+	pl = (GF_ProtoLink*)gf_malloc(sizeof(GF_ProtoLink));
+	pl->url = lib_url;
+	gf_list_add(scene->extern_protos, pl);
+	pl->mo = gf_scene_get_media_object(scene, lib_url, GF_MEDIA_OBJECT_SCENE, GF_FALSE);
+	/*this may already be destroyed*/
+	if (pl->mo) gf_mo_play(pl->mo, 0, -1, GF_FALSE);
+
+	/*and return NULL*/
+	return NULL;
+}
+
+
+GF_EXPORT
+Bool gf_inline_is_default_viewpoint(GF_Node *node)
+{
+	const char *nname, *seg_name;
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
+	if (!scene) return GF_FALSE;
+
+	nname = gf_node_get_name(node);
+	if (!nname) return GF_FALSE;
+
+	/*check any viewpoint*/
+	seg_name = strrchr(scene->root_od->scene_ns->url, '#');
+
+	/*check the URL of the parent*/
+	if (!seg_name && scene->current_url) {
+		if (scene->current_url->count && scene->current_url->vals[0].url)
+			seg_name = strrchr(scene->current_url->vals[0].url, '#');
+	} else if (!seg_name && scene->root_od->mo && scene->root_od->mo->URLs.count && scene->root_od->mo->URLs.vals[0].url) {
+		seg_name = strrchr(scene->root_od->mo->URLs.vals[0].url, '#');
+	}
+	if (!seg_name) return GF_FALSE;
+	seg_name += 1;
+	/*look for a media segment with this name - if none found, this is a viewpoint name*/
+	if (gf_odm_find_segment(scene->root_od, (char *) seg_name) != NULL) return GF_FALSE;
+
+	return (!strcmp(nname, seg_name) ? GF_TRUE : GF_FALSE);
+}
+
+
+void gf_init_inline(GF_Scene *scene, GF_Node *node)
+{
+	gf_node_set_callback_function(node, gf_inline_traverse);
+}
+
+static char *storage_get_section(M_Storage *storage)
+{
+	GF_Scene *scene;
+	char *szPath;
+	u8 hash[20];
+	char name[50];
+	u32 i;
+	size_t len;
+
+	scene = (GF_Scene *)gf_node_get_private((GF_Node*)storage);
+
+	len = strlen(scene->root_od->scene_ns->url)+strlen(storage->name.buffer)+2;
+	szPath = (char *)gf_malloc(sizeof(char)* len);
+	strcpy(szPath, scene->root_od->scene_ns->url);
+	strcat(szPath, "@");
+	strcat(szPath, storage->name.buffer);
+	gf_sha1_csum((u8*)szPath, (u32) strlen(szPath), hash);
+	gf_free(szPath);
+
+	strcpy(name, "@cache=");
+	for (i=0; i<20; i++) {
+		char t[3];
+		t[2] = 0;
+		sprintf(t, "%02X", hash[i]);
+		strcat(name, t);
+	}
+	return gf_strdup(name);
+}
+
+static void storage_parse_sf(void *ptr, u32 fieldType, char *opt)
+{
+	Float v1, v2, v3;
+	switch (fieldType) {
+	case GF_SG_VRML_SFBOOL:
+		sscanf(opt, "%d", ((SFBool *)ptr));
+		break;
+	case GF_SG_VRML_SFINT32:
+		sscanf(opt, "%d",  ((SFInt32 *)ptr) );
+		break;
+	case GF_SG_VRML_SFTIME:
+		sscanf(opt, "%lf", ((SFTime *)ptr) );
+		break;
+	case GF_SG_VRML_SFFLOAT:
+		sscanf(opt, "%g", &v1);
+		* (SFFloat *)ptr = FLT2FIX(v1);
+		break;
+	case GF_SG_VRML_SFVEC2F:
+		sscanf(opt, "%g %g", &v1, &v2);
+		((SFVec2f*)ptr)->x = FLT2FIX(v1);
+		((SFVec2f*)ptr)->y = FLT2FIX(v2);
+		break;
+	case GF_SG_VRML_SFVEC3F:
+		sscanf(opt, "%g %g %g", &v1, &v2, &v3);
+		((SFVec3f*)ptr)->x = FLT2FIX(v1);
+		((SFVec3f*)ptr)->y = FLT2FIX(v2);
+		((SFVec3f*)ptr)->z = FLT2FIX(v3);
+		break;
+	case GF_SG_VRML_SFSTRING:
+		if ( ((SFString *)ptr)->buffer) gf_free(((SFString *)ptr)->buffer);
+		((SFString *)ptr)->buffer = gf_strdup(opt);
+		break;
+	default:
+		break;
+	}
+}
+
+static void gf_storage_load(M_Storage *storage)
+{
+	const char *opt;
+	char szID[20];
+	u32 i, count;
+	u32 sec, exp, frac;
+	char *section = storage_get_section(storage);
+	if (!section) return;
+
+	if (!gf_opts_get_key_count(section)) {
+		gf_free(section);
+		return;
+	}
+	opt = gf_opts_get_key(section, "expireAfterNTP");
+	gf_net_get_ntp(&sec, &frac);
+	sscanf(opt, "%u", &exp);
+	if (exp && (exp<=sec)) {
+		gf_opts_del_section(section);
+		gf_free(section);
+		return;
+	}
+
+	count = gf_opts_get_key_count(section)-1;
+	if (!count || (count!=storage->storageList.count)) {
+		gf_opts_del_section(section);
+		gf_free(section);
+		return;
+	}
+
+	for (i=0; i<count; i++) {
+		GF_FieldInfo info;
+		sprintf(szID, "%d", i);
+		opt = gf_opts_get_key(section, szID);
+		if (!opt) break;
+		if (!storage->storageList.vals[i].node) break;
+		if (gf_node_get_field(storage->storageList.vals[i].node, storage->storageList.vals[i].fieldIndex, &info) != GF_OK) break;
+
+		if (gf_sg_vrml_is_sf_field(info.fieldType)) {
+			storage_parse_sf(info.far_ptr, info.fieldType, (char *) opt);
+		} else {
+			u32 sftype = gf_sg_vrml_get_sf_type(info.fieldType);
+			char *sep, *val;
+			void *slot;
+			gf_sg_vrml_mf_reset(info.far_ptr, info.fieldType);
+			while (1) {
+				val = (char *)strchr(opt, '\'');
+				sep = val ? strchr(val+1, '\'') : NULL;
+				if (!val || !sep) break;
+
+				sep[0] = 0;
+				gf_sg_vrml_mf_append(info.far_ptr, info.fieldType, &slot);
+				storage_parse_sf(slot, sftype, val+1);
+				sep[0] = '\'';
+				opt = sep+1;
+			}
+		}
+		gf_node_changed(storage->storageList.vals[i].node, &info);
+	}
+	gf_free(section);
+}
+
+char *storage_serialize_sf(void *ptr, u32 fieldType)
+{
+	char szVal[50];
+	switch (fieldType) {
+	case GF_SG_VRML_SFBOOL:
+		sprintf(szVal, "%d", *((SFBool *)ptr) ? 1 : 0);
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFINT32:
+		sprintf(szVal, "%d",  *((SFInt32 *)ptr) );
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFTIME:
+		sprintf(szVal, "%g", *((SFTime *)ptr) );
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFFLOAT:
+		sprintf(szVal, "%g", FIX2FLT( *((SFFloat *)ptr) ) );
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFVEC2F:
+		sprintf(szVal, "%g %g", FIX2FLT( ((SFVec2f *)ptr)->x), FIX2FLT( ((SFVec2f *)ptr)->y) );
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFVEC3F:
+		sprintf(szVal, "%g %g %g", FIX2FLT( ((SFVec3f *)ptr)->x), FIX2FLT( ((SFVec3f *)ptr)->y) , FIX2FLT( ((SFVec3f *)ptr)->z) );
+		return gf_strdup(szVal);
+	case GF_SG_VRML_SFSTRING:
+		return gf_strdup( ((SFString *)ptr)->buffer ? ((SFString *)ptr)->buffer : "");
+
+	default:
+		break;
+	}
+	return NULL;
+}
+
+void gf_storage_save(M_Storage *storage)
+{
+	char szID[20];
+	u32 i, j;
+	char *section = storage_get_section(storage);
+	if (!section) return;
+
+	gf_opts_del_section(section);
+
+	if (storage->expireAfter) {
+		u32 sec, frac;
+		char szNTP[100];
+		gf_net_get_ntp(&sec, &frac);
+		sec += storage->expireAfter;
+		sprintf(szNTP, "%u", sec);
+		gf_opts_set_key(section, "expireAfterNTP", szNTP);
+	} else {
+		gf_opts_set_key(section, "expireAfterNTP", "0");
+	}
+
+	for (i=0; i<storage->storageList.count; i++) {
+		char *val;
+		GF_FieldInfo info;
+		sprintf(szID, "%d", i);
+
+		if (!storage->storageList.vals[i].node) break;
+		if (gf_node_get_field(storage->storageList.vals[i].node, storage->storageList.vals[i].fieldIndex, &info) != GF_OK) break;
+
+		if (gf_sg_vrml_is_sf_field(info.fieldType)) {
+			val = storage_serialize_sf(info.far_ptr, info.fieldType);
+		} else {
+			//u32 sftype = gf_sg_vrml_get_sf_type(info.fieldType);
+			val = NULL;
+			for (j=0; j<((GenMFField *)info.far_ptr)->count; j++) {
+				char *slotval;
+				void *slot;
+				if (gf_sg_vrml_mf_get_item(info.far_ptr, info.fieldType, &slot, j) != GF_OK) break;
+				slotval = storage_serialize_sf(info.far_ptr, info.fieldType);
+				if (!slotval) break;
+				if (val) {
+					val = (char *)gf_realloc(val, strlen(val) + 3 + strlen((const char *)slot));
+				} else {
+					val = (char *)gf_malloc(3 + strlen((const char *)slot));
+					val[0] = 0;
+				}
+				strcat(val, "'");
+				strcat(val, slotval);
+				strcat(val, "'");
+				gf_free(slot);
+			}
+		}
+		if (val) {
+			gf_opts_set_key(section, szID, val);
+			gf_free(val);
+		}
+	}
+	gf_free(section);
+}
+
+
+static void gf_storage_traverse(GF_Node *n, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
+		GF_SceneNamespace *scene_ns = scene->root_od->scene_ns;
+		while (scene->root_od->parentscene) {
+			if (scene->root_od->parentscene->root_od->scene_ns != scene_ns)
+				break;
+			scene = scene->root_od->parentscene;
+		}
+		gf_list_del_item(scene->storages, n);
+	}
+}
+
+static void on_force_restore(GF_Node *n, struct _route *_route)
+{
+	if (n) gf_storage_load((M_Storage *)n);
+}
+static void on_force_save(GF_Node *n, struct _route *_route)
+{
+	if (n) gf_storage_save((M_Storage *)n);
+}
+
+void gf_scene_init_storage(GF_Scene *scene, GF_Node *node)
+{
+	GF_SceneNamespace *scene_ns;
+	M_Storage *storage = (M_Storage *) node;
+
+	if (!storage->name.buffer || !strlen(storage->name.buffer) ) return;
+	if (!storage->storageList.count) return;
+
+	storage->on_forceSave = on_force_save;
+	storage->on_forceRestore = on_force_restore;
+	gf_node_set_callback_function(node, gf_storage_traverse);
+	gf_node_set_private(node, scene);
+
+	scene_ns = scene->root_od->scene_ns;
+	while (scene->root_od->parentscene) {
+		if (scene->root_od->parentscene->root_od->scene_ns != scene_ns)
+			break;
+		scene = scene->root_od->parentscene;
+	}
+
+	gf_list_add(scene->storages, node);
+	if (storage->_auto) gf_storage_load(storage);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		Bool aptr;
+		on_force_save(NULL, NULL);
+		on_force_restore(NULL, NULL);
+		storage_parse_sf(&aptr, GF_SG_VRML_SFBOOL, "true");
+
+	}
+#endif
+}
+
+#endif // GPAC_DISABLE_VRML
+
+GF_Node *gf_scene_get_keynav(GF_SceneGraph *sg, GF_Node *sensor)
+{
+#ifndef GPAC_DISABLE_VRML
+	u32 i, count;
+	GF_Scene *scene = (GF_Scene *)gf_sg_get_private(sg);
+	if (!scene) return NULL;
+	if (!sensor) return (GF_Node *)gf_list_get(scene->keynavigators, 0);
+
+	count = gf_list_count(scene->keynavigators);
+	for (i=0; i<count; i++) {
+		M_KeyNavigator *kn = (M_KeyNavigator *)gf_list_get(scene->keynavigators, i);
+		if (kn->sensor==sensor) return (GF_Node *) kn;
+	}
+#endif
+	return NULL;
+}
+
+

gpac-1.0.0.tar.gz/src/compositor/mpeg4_inputsensor.c Added

@@ -0,0 +1,993 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/internal/compositor_dev.h>
+#include <gpac/modules/codec.h>
+#include <gpac/utf.h>
+#include <gpac/nodes_x3d.h>
+#include <gpac/constants.h>
+
+#ifndef GPAC_DISABLE_VRML
+
+enum
+{
+	IS_KeySensor = 1,
+	IS_StringSensor,
+	IS_Mouse,
+	IS_HTKSensor,
+};
+
+typedef struct
+{
+	/*object for this input stream*/
+	GF_ObjectManager *odm;
+
+	/*list of attached nodes*/
+	GF_List *is_nodes;
+	/*stream ID*/
+	u16 ES_ID;
+	/*uncompressed data frame*/
+	GF_List *ddf;
+
+	GF_InputSensorDevice *io_dev;
+
+	u32 type;
+
+	/*string sensor sep char */
+	s16 termChar, delChar;
+	/*current typed text in UTF-8*/
+	unsigned short enteredText[5000];
+	u32 text_len;
+} GF_InputSensorCtx;
+
+
+void gf_isdec_del(GF_BaseDecoder *plug);
+
+static GF_Err IS_ProcessData(GF_InputSensorCtx *is_ctx, const char *inBuffer, u32 inBufferLength);
+
+typedef struct
+{
+	/*stream context*/
+	u16 ES_ID;
+	Bool registered;
+	GF_MediaObject *mo;
+	M_InputSensor *is;
+} ISStack;
+
+
+
+typedef struct
+{
+	u16 enteredText[5000];
+	u32 text_len;
+	GF_Compositor *compositor;
+} StringSensorStack;
+
+
+
+/*
+				input sensor decoder(s) handling
+*/
+
+
+static void add_field(GF_InputSensorCtx *priv, u32 fieldType, const char *fieldName)
+{
+	GF_FieldInfo *field = (GF_FieldInfo *) gf_malloc(sizeof(GF_FieldInfo));
+	memset(field, 0, sizeof(GF_FieldInfo));
+	field->fieldType = fieldType;
+	field->far_ptr = gf_sg_vrml_field_pointer_new(fieldType);
+	field->name = (const char *) fieldName;
+	field->fieldIndex = gf_list_count(priv->ddf);
+	gf_list_add(priv->ddf, field);
+}
+
+static void isdev_add_field(GF_InputSensorDevice *dev, u32 fieldType, const char *fieldName)
+{
+	if (dev) {
+		GF_InputSensorCtx *is = (GF_InputSensorCtx *)dev->input_stream_context;
+		add_field(is, fieldType, fieldName);
+	}
+}
+
+static void isdev_dispatch_frame(struct __input_device *dev, const u8 *data, u32 data_len)
+{
+	u32 i;
+	GF_InputSensorCtx *is_ctx;
+	GF_InputSensorCtx *priv;
+	if (!dev || !data) return;
+
+	priv = (GF_InputSensorCtx *)dev->input_stream_context;
+
+	/*get all decoders and send frame*/
+	i=0;
+	while ((is_ctx = gf_list_enum(priv->odm->parentscene->compositor->input_streams, &i))) {
+		if (is_ctx->type==priv->type) {
+			IS_ProcessData(is_ctx, data, data_len);
+		}
+	}
+}
+
+static GF_InputSensorCtx *locate_is_ctx_for_odm(GF_Scene *scene, GF_ObjectManager *for_odm)
+{
+	u32 i, count;
+	count = gf_list_count(scene->compositor->input_streams);
+	for (i=0; i<count; i++) {
+		GF_InputSensorCtx *is_ctx = gf_list_get(scene->compositor->input_streams, i);
+		if (is_ctx->odm == for_odm) return is_ctx;
+	}
+	return NULL;
+}
+
+GF_Err gf_input_sensor_setup_object(GF_ObjectManager *odm, GF_ESD *esd)
+{
+	u32 i;
+	GF_InputSensorCtx *is_ctx;
+	GF_BitStream *bs;
+	u32 len, size;
+	char devName[255];
+	u16 termSeq[20];
+	GF_Scene *scene = odm->parentscene;
+
+	if (esd->URLString) return GF_NOT_SUPPORTED;
+
+	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->dataLength) return GF_NON_COMPLIANT_BITSTREAM;
+
+	if (!scene->compositor->input_streams) {
+		scene->compositor->input_streams = gf_list_new();
+		if (!scene->compositor->input_streams) return GF_OUT_OF_MEM;
+	}
+	is_ctx = locate_is_ctx_for_odm(scene, odm);
+	if (is_ctx) return GF_OK;
+
+	GF_SAFEALLOC(is_ctx, GF_InputSensorCtx);
+	if (!is_ctx) return GF_OUT_OF_MEM;
+
+	is_ctx->odm = odm;
+	is_ctx->is_nodes = gf_list_new();
+	is_ctx->ddf = gf_list_new();
+
+	is_ctx->ES_ID = esd->ESID;
+	/*parse config*/
+	bs = gf_bs_new(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, GF_BITSTREAM_READ);
+	len = gf_bs_read_int(bs, 8);
+	for (i=0; i<len; i++) {
+		devName[i] = gf_bs_read_int(bs, 8);
+	}
+	gf_bs_del(bs);
+	devName[i] = 0;
+	is_ctx->type = gf_crc_32(devName, len);
+	size = len + 1;
+
+	if (!stricmp(devName, "KeySensor")) {
+		is_ctx->type = IS_KeySensor;
+		add_field(is_ctx, GF_SG_VRML_SFINT32, "keyPressed");
+		add_field(is_ctx, GF_SG_VRML_SFINT32, "keyReleased");
+		add_field(is_ctx, GF_SG_VRML_SFINT32, "actionKeyPressed");
+		add_field(is_ctx, GF_SG_VRML_SFINT32, "actionKeyReleased");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "shiftKeyPressed");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "controlKeyPressed");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "altKeyPressed");
+
+	} else if (!stricmp(devName, "StringSensor")) {
+		is_ctx->type = IS_StringSensor;
+		add_field(is_ctx, GF_SG_VRML_SFSTRING, "enteredText");
+		add_field(is_ctx, GF_SG_VRML_SFSTRING, "finalText");
+
+		is_ctx->termChar = '\r';
+		is_ctx->delChar = '\b';
+
+		/*get escape chars if any specified*/
+		if (size<esd->decoderConfig->decoderSpecificInfo->dataLength) {
+			const char *src = esd->decoderConfig->decoderSpecificInfo->data + size;
+			gf_utf8_mbstowcs(termSeq, esd->decoderConfig->decoderSpecificInfo->dataLength - size, &src);
+			is_ctx->termChar = termSeq[0];
+			is_ctx->delChar = termSeq[1];
+		}
+	} else if (!stricmp(devName, "Mouse")) {
+		is_ctx->type = IS_Mouse;
+		add_field(is_ctx, GF_SG_VRML_SFVEC2F, "position");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "leftButtonDown");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "middleButtonDown");
+		add_field(is_ctx, GF_SG_VRML_SFBOOL, "rightButtonDown");
+		add_field(is_ctx, GF_SG_VRML_SFFLOAT, "wheel");
+	}
+	else {
+		GF_InputSensorDevice *ifce;
+		/*not found, check all modules*/
+		u32 plugCount = gf_modules_count();
+		for (i = 0; i < plugCount ; i++) {
+			ifce = (GF_InputSensorDevice *) gf_modules_load(i, GF_INPUT_DEVICE_INTERFACE);
+			if (!ifce) continue;
+			ifce->input_stream_context = is_ctx;
+			if (ifce->RegisterDevice && ifce->RegisterDevice(ifce, devName, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, isdev_add_field) ) {
+				is_ctx->io_dev = ifce;
+				break;
+			}
+			gf_modules_close_interface((GF_BaseInterface *) ifce);
+		}
+		if (!is_ctx->io_dev) {
+			gf_free(is_ctx);
+			return GF_NOT_SUPPORTED;
+		}
+		is_ctx->io_dev->DispatchFrame = isdev_dispatch_frame;
+	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		isdev_add_field(NULL, 0, NULL);
+		isdev_dispatch_frame(NULL, NULL, 0);
+	}
+#endif
+
+	gf_list_add(is_ctx->odm->parentscene->compositor->input_streams, is_ctx);
+	return GF_OK;
+}
+
+void gf_input_sensor_delete(GF_ObjectManager *odm)
+{
+	/*get IS dec*/
+	GF_InputSensorCtx *is_ctx = locate_is_ctx_for_odm(odm->parentscene, odm);
+	if (!is_ctx) return;
+
+	gf_list_del(is_ctx->is_nodes);
+
+	while (gf_list_count(is_ctx->ddf)) {
+		GF_FieldInfo *fi = (GF_FieldInfo *)gf_list_get(is_ctx->ddf, 0);
+		gf_list_rem(is_ctx->ddf, 0);
+		gf_sg_vrml_field_pointer_del(fi->far_ptr, fi->fieldType);
+		gf_free(fi);
+	}
+	gf_list_del(is_ctx->ddf);
+	gf_list_del_item(odm->parentscene->compositor->input_streams, is_ctx);
+	gf_free(is_ctx);
+}
+
+
+
+static GF_Err IS_ProcessData(GF_InputSensorCtx *is_ctx, const char *inBuffer, u32 inBufferLength)
+{
+	u32 i, j, count;
+	Double scene_time;
+	GF_BitStream *bs;
+	GF_FieldInfo *field;
+	ISStack *st;
+	GF_Err e = GF_OK;
+
+	/*decode data frame except if local stringSensor*/
+	bs = gf_bs_new((u8 *)inBuffer, inBufferLength, GF_BITSTREAM_READ);
+	i=0;
+	while ((field = (GF_FieldInfo *)gf_list_enum(is_ctx->ddf, &i))) {
+		/*store present flag in eventIn for command skip - this is an ugly hack but it works since DDF don't have event types*/
+		field->eventType = gf_bs_read_int(bs, 1);
+		/*parse val ourselves (we don't want to depend on bifs codec)*/
+		if (field->eventType) {
+			switch (field->fieldType) {
+			case GF_SG_VRML_SFBOOL:
+				* ((SFBool *) field->far_ptr) = (SFBool) gf_bs_read_int(bs, 1);
+				break;
+			case GF_SG_VRML_SFFLOAT:
+				*((SFFloat *)field->far_ptr) = FLT2FIX( gf_bs_read_float(bs) );
+				break;
+			case GF_SG_VRML_SFINT32:
+				*((SFInt32 *)field->far_ptr) = (s32) gf_bs_read_int(bs, 32);
+				break;
+			case GF_SG_VRML_SFTIME:
+				*((SFTime *)field->far_ptr) = gf_bs_read_double(bs);
+				break;
+			case GF_SG_VRML_SFVEC2F:
+				((SFVec2f *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
+				((SFVec2f *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
+				break;
+			case GF_SG_VRML_SFVEC3F:
+				((SFVec3f *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
+				((SFVec3f *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
+				((SFVec3f *)field->far_ptr)->z = FLT2FIX( gf_bs_read_float(bs) );
+				break;
+			case GF_SG_VRML_SFCOLOR:
+				((SFColor *)field->far_ptr)->red = FLT2FIX( gf_bs_read_float(bs) );
+				((SFColor *)field->far_ptr)->green = FLT2FIX( gf_bs_read_float(bs) );
+				((SFColor *)field->far_ptr)->blue = FLT2FIX( gf_bs_read_float(bs) );
+				break;
+			case GF_SG_VRML_SFVEC4F:
+			case GF_SG_VRML_SFROTATION:
+				((SFRotation *)field->far_ptr)->x = FLT2FIX( gf_bs_read_float(bs) );
+				((SFRotation *)field->far_ptr)->y = FLT2FIX( gf_bs_read_float(bs) );
+				((SFRotation *)field->far_ptr)->z = FLT2FIX( gf_bs_read_float(bs) );
+				((SFRotation *)field->far_ptr)->q = FLT2FIX( gf_bs_read_float(bs) );
+				break;
+
+			case GF_SG_VRML_SFSTRING:
+			{
+				u32 size, length;
+				size = gf_bs_read_int(bs, 5);
+				length = gf_bs_read_int(bs, size);
+				if (gf_bs_available(bs) < length) return GF_NON_COMPLIANT_BITSTREAM;
+
+				if ( ((SFString *)field->far_ptr)->buffer ) gf_free( ((SFString *)field->far_ptr)->buffer);
+				((SFString *)field->far_ptr)->buffer = (char*)gf_malloc(sizeof(char)*(length+1));
+				if ( ((SFString *)field->far_ptr)->buffer) {
+					for (j=0; j<length; j++) {
+						((SFString *)field->far_ptr)->buffer[j] = gf_bs_read_int(bs, 8);
+					}
+					((SFString *)field->far_ptr)->buffer[length] = 0;
+				} else {
+					gf_bs_del(bs);
+					return GF_OUT_OF_MEM;
+				}
+			}
+			break;
+			}
+		}
+	}
+	gf_bs_del(bs);
+
+	/*special case for StringSensor in local mode: lookup for special chars*/
+	if (is_ctx->type == IS_StringSensor) {
+		char tmp_utf8[5000];
+		const unsigned short *ptr;
+		u32 len;
+		GF_FieldInfo *field1 = (GF_FieldInfo *)gf_list_get(is_ctx->ddf, 0);
+		GF_FieldInfo *field2 = (GF_FieldInfo *)gf_list_get(is_ctx->ddf, 1);
+		SFString *inText = (SFString *) field1->far_ptr;
+		SFString *outText = (SFString *) field2->far_ptr;
+
+		field1->eventType = field2->eventType = 0;
+		is_ctx->enteredText[is_ctx->text_len] = (short) '\0';
+
+		len = (u32) 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);
+			if (outText->buffer) gf_free(outText->buffer);
+			outText->buffer = (char*)gf_malloc(sizeof(char) * (len));
+			memcpy(outText->buffer, tmp_utf8, sizeof(char) * len-1);
+			outText->buffer[len-1] = 0;
+			if (inText->buffer) gf_free(inText->buffer);
+			inText->buffer = NULL;
+			is_ctx->text_len = 0;
+
+			field1->eventType = field2->eventType = 1;
+		} else {
+			if (is_ctx->delChar) {
+				/*remove chars*/
+				if ((len>1) && (is_ctx->enteredText[len-1] == is_ctx->delChar)) {
+					is_ctx->enteredText[len-1] = (short) '\0';
+					len--;
+					is_ctx->enteredText[len-1] = (short) '\0';
+					len--;
+				}
+			}
+			is_ctx->text_len = len;
+			ptr = is_ctx->enteredText;
+			len = (u32) gf_utf8_wcstombs(tmp_utf8, 5000, &ptr);
+			if (inText->buffer) gf_free(inText->buffer);
+			inText->buffer = (char*)gf_malloc(sizeof(char) * (len+1));
+			memcpy(inText->buffer, tmp_utf8, sizeof(char) * len);
+			inText->buffer[len] = 0;
+			field1->eventType = 1;
+		}
+	}
+
+	//we still need this since we have no clue when the device sensor is calling us
+	//TO CLEANUP (define PIDs and filters for input sensors and put them in the main thread ?)
+	gf_sc_lock(is_ctx->odm->parentscene->compositor, GF_TRUE);
+
+	/*apply it*/
+	i=0;
+	while ((st = (ISStack*)gf_list_enum(is_ctx->is_nodes, &i))) {
+		assert(st->is);
+		assert(st->mo);
+		if (!st->is->enabled) continue;
+
+		count = gf_list_count(st->is->buffer.commandList);
+		scene_time = gf_scene_get_time(is_ctx->odm->parentscene);
+		for (j=0; j<count; j++) {
+			GF_Command *com = (GF_Command *)gf_list_get(st->is->buffer.commandList, j);
+			GF_CommandField *info = (GF_CommandField *)gf_list_get(com->command_fields, 0);
+			field = (GF_FieldInfo *)gf_list_get(is_ctx->ddf, j);
+			if (info && field && field->eventType) {
+				gf_sg_vrml_field_copy(info->field_ptr, field->far_ptr, field->fieldType);
+				gf_sg_command_apply(is_ctx->odm->parentscene->graph, com, scene_time);
+			}
+		}
+	}
+	gf_sc_lock(is_ctx->odm->parentscene->compositor, GF_FALSE);
+	return e;
+}
+
+
+/*
+				input sensor node handling
+*/
+static void InputSensorUnregister(GF_Node *node, ISStack *st)
+{
+	GF_ObjectManager *odm;
+	GF_InputSensorCtx *is_ctx;
+
+	gf_mo_unregister(node, st->mo);
+
+	odm = st->mo->odm;
+	if (!odm) return;
+
+	assert(odm->type == GF_STREAM_INTERACT);
+
+	/*get IS dec*/
+	is_ctx = locate_is_ctx_for_odm(odm->parentscene, odm);
+	if (!is_ctx) return;
+
+	gf_list_del_item(is_ctx->is_nodes, st);
+
+
+	/*stop stream*/
+	if (st->mo->num_open) gf_mo_stop(&st->mo);
+	st->mo = NULL;
+	if (st->registered) {
+		st->registered = 0;
+		if (is_ctx->io_dev && is_ctx->io_dev->Stop) is_ctx->io_dev->Stop(is_ctx->io_dev);
+	}
+}
+
+static void InputSensorRegister(GF_Node *n)
+{
+	GF_ObjectManager *odm;
+	GF_InputSensorCtx *is_ctx;
+	u32 i;
+	ISStack *st = (ISStack *)gf_node_get_private(n);
+	odm = st->mo->odm;
+	if (!odm || (odm->type != GF_STREAM_INTERACT)) return;
+
+	assert(odm->type == GF_STREAM_INTERACT);
+
+	/*get IS dec*/
+	is_ctx = locate_is_ctx_for_odm(odm->parentscene, odm);
+	if (!is_ctx) return;
+
+	if ( gf_list_find(is_ctx->is_nodes, st) == -1 )
+		gf_list_add(is_ctx->is_nodes, st);
+
+	/*start stream*/
+	gf_mo_play(st->mo, 0, -1, 0);
+
+	gf_sc_unqueue_node_traverse(is_ctx->odm->parentscene->compositor, n);
+
+	/*we want at least one sensor enabled*/
+	i=0;
+	while ((st = gf_list_enum(is_ctx->is_nodes, &i))) {
+		if (st->is->enabled) {
+			st->registered = 1;
+			if (is_ctx->io_dev && is_ctx->io_dev->Start) is_ctx->io_dev->Start(is_ctx->io_dev);
+			break;
+		}
+	}
+}
+
+static void TraverseInputSensor(GF_Node *node, void *rs, Bool is_destroy)
+{
+	ISStack *st = (ISStack*)gf_node_get_private(node);
+	M_InputSensor *is = (M_InputSensor *)node;
+
+	if (is_destroy) {
+		GF_Scene *scene;
+		if (st->registered) InputSensorUnregister(node, st);
+		scene = (GF_Scene*)gf_sg_get_private(gf_node_get_graph(node));
+		gf_sc_unqueue_node_traverse(scene->compositor, node);
+		gf_free(st);
+	} else if (!st->registered) {
+		/*get decoder object */
+		if (!st->mo) st->mo = gf_mo_register(node, &is->url, 0, 0);
+		/*register with decoder*/
+		if (st->mo) InputSensorRegister(node);
+	}
+}
+
+
+void InitInputSensor(GF_Scene *scene, GF_Node *node)
+{
+	ISStack *stack;
+	GF_SAFEALLOC(stack, ISStack);
+	if (!stack) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate input sensor stack\n"));
+		return;
+	}
+	stack->is = (M_InputSensor *) node;
+	gf_node_set_private(node, stack);
+	gf_node_set_callback_function(node, TraverseInputSensor);
+
+	gf_sc_queue_node_traverse(scene->compositor, node);
+}
+
+/*check only URL changes*/
+void InputSensorModified(GF_Node *node)
+{
+	GF_MediaObject *mo;
+	ISStack *st = (ISStack *)gf_node_get_private(node);
+
+	mo = gf_mo_register(node, &st->is->url, 0, 0);
+	if ((mo!=st->mo) || !st->registered) {
+		if (mo!=st->mo) {
+			if (st->mo) InputSensorUnregister(node, st);
+			st->mo = mo;
+		}
+		if (st->is->enabled)
+			InputSensorRegister(node);
+		else
+			return;
+	} else if (!st->is->enabled) {
+		InputSensorUnregister(node, st);
+		return;
+	}
+}
+
+
+
+/*
+				input sensor DDF generations (user interface)
+*/
+GF_EXPORT
+void gf_sc_input_sensor_mouse_input(GF_Compositor *compositor, GF_EventMouse *event)
+{
+	s32 X, Y;
+	u32 left_but_down, middle_but_down, right_but_down;
+	SFFloat wheel_pos;
+	u32 i;
+	GF_BitStream *bs;
+	u8 *buf;
+	u32 buf_size;
+	Fixed bX, bY;
+	GF_InputSensorCtx *is_ctx;
+
+	if ( !gf_list_count(compositor->input_streams)) return;
+
+	X = event->x;
+	Y = event->y;
+	left_but_down = middle_but_down = right_but_down = 0;
+	wheel_pos = 0;
+	switch (event->type) {
+	case GF_EVENT_MOUSEDOWN:
+		if (event->button==GF_MOUSE_RIGHT) right_but_down = 2;
+		else if (event->button==GF_MOUSE_MIDDLE) middle_but_down = 2;
+		else if (event->button==GF_MOUSE_LEFT) left_but_down = 2;
+		break;
+	case GF_EVENT_MOUSEUP:
+		if (event->button==GF_MOUSE_RIGHT) right_but_down = 1;
+		else if (event->button==GF_MOUSE_MIDDLE) middle_but_down = 1;
+		else if (event->button==GF_MOUSE_LEFT) left_but_down = 1;
+		break;
+	case GF_EVENT_MOUSEWHEEL:
+		wheel_pos = event->wheel_pos;
+		break;
+	case GF_EVENT_MOUSEMOVE:
+		break;
+	default:
+		return;
+	}
+
+	/*get BIFS coordinates*/
+	gf_sc_map_point(compositor, X, Y, &bX, &bY);
+	bX = gf_divfix(bX, compositor->scale_x);
+	bY = gf_divfix(bY, compositor->scale_y);
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	/*If wheel is specified disable X and Y (bug from MS wheel handling)*/
+	if (wheel_pos) {
+		gf_bs_write_int(bs, 0, 1);
+	} else {
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, FIX2FLT(bX));
+		gf_bs_write_float(bs, FIX2FLT(bY));
+	}
+	gf_bs_write_int(bs, left_but_down ? 1 : 0, 1);
+	if (left_but_down) gf_bs_write_int(bs, left_but_down-1, 1);
+	gf_bs_write_int(bs, middle_but_down ? 1 : 0, 1);
+	if (middle_but_down) gf_bs_write_int(bs, middle_but_down-1, 1);
+	gf_bs_write_int(bs, right_but_down ? 1 : 0, 1);
+	if (right_but_down) gf_bs_write_int(bs, right_but_down-1, 1);
+	if (wheel_pos==0) {
+		gf_bs_write_int(bs, 0, 1);
+	} else {
+		gf_bs_write_int(bs, 1, 1);
+		gf_bs_write_float(bs, FIX2FLT(wheel_pos) );
+	}
+
+	gf_bs_align(bs);
+	gf_bs_get_content(bs, &buf, &buf_size);
+	gf_bs_del(bs);
+
+	/*get all IS Mouse decoders and send frame*/
+	i=0;
+	while ((is_ctx = gf_list_enum(compositor->input_streams, &i))) {
+		if (is_ctx->type==IS_Mouse) {
+			IS_ProcessData(is_ctx, buf, buf_size);
+		}
+	}
+	gf_free(buf);
+}
+
+GF_EXPORT
+Bool gf_sc_input_sensor_keyboard_input(GF_Compositor *compositor, u32 key_code, u32 hw_code, Bool isKeyUp)
+{
+	u32 i;
+	GF_BitStream *bs;
+	GF_SLHeader slh;
+	u8 *buf;
+#ifndef GPAC_DISABLE_X3D
+	X_KeySensor *n;
+#endif
+	GF_InputSensorCtx *is_ctx;
+	u32 buf_size;
+	u32 actionKey = 0;
+	u32 shiftKeyDown, controlKeyDown, altKeyDown;
+	s32 keyPressed, keyReleased, actionKeyPressed, actionKeyReleased;
+
+	if (!gf_list_count(compositor->input_streams) && !gf_list_count(compositor->x3d_sensors)) return 0;
+
+	memset(&slh, 0, sizeof(GF_SLHeader));
+	slh.accessUnitStartFlag = slh.accessUnitEndFlag = 1;
+	slh.compositionTimeStampFlag = 1;
+	/*cf above*/
+	slh.compositionTimeStamp = 0;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	shiftKeyDown = controlKeyDown = altKeyDown = 0;
+	keyPressed = keyReleased = actionKeyPressed = actionKeyReleased = 0;
+	/*key-sensor codes*/
+	switch (key_code) {
+	case GF_KEY_F1:
+		actionKey = 1;
+		break;
+	case GF_KEY_F2:
+		actionKey = 2;
+		break;
+	case GF_KEY_F3:
+		actionKey = 3;
+		break;
+	case GF_KEY_F4:
+		actionKey = 4;
+		break;
+	case GF_KEY_F5:
+		actionKey = 5;
+		break;
+	case GF_KEY_F6:
+		actionKey = 6;
+		break;
+	case GF_KEY_F7:
+		actionKey = 7;
+		break;
+	case GF_KEY_F8:
+		actionKey = 8;
+		break;
+	case GF_KEY_F9:
+		actionKey = 9;
+		break;
+	case GF_KEY_F10:
+		actionKey = 10;
+		break;
+	case GF_KEY_F11:
+		actionKey = 11;
+		break;
+	case GF_KEY_F12:
+		actionKey = 12;
+		break;
+	case GF_KEY_HOME:
+		actionKey = 13;
+		break;
+	case GF_KEY_END:
+		actionKey = 14;
+		break;
+	case GF_KEY_PAGEUP:
+		actionKey = 15;
+		break;
+	case GF_KEY_PAGEDOWN:
+		actionKey = 16;
+		break;
+	case GF_KEY_UP:
+		actionKey = 17;
+		break;
+	case GF_KEY_DOWN:
+		actionKey = 18;
+		break;
+	case GF_KEY_LEFT:
+		actionKey = 19;
+		break;
+	case GF_KEY_RIGHT:
+		actionKey = 20;
+		break;
+	case GF_KEY_SHIFT:
+		actionKey = 0;
+		shiftKeyDown = isKeyUp ? 1 : 2;
+		break;
+	case GF_KEY_CONTROL:
+		actionKey = 0;
+		controlKeyDown = isKeyUp ? 1 : 2;
+		break;
+	case GF_KEY_ALT:
+		actionKey = 0;
+		altKeyDown = isKeyUp ? 1 : 2;
+		break;
+
+	default:
+		actionKey = 0;
+		break;
+	}
+	if (actionKey) {
+		if (isKeyUp)
+			actionKeyReleased = actionKey;
+		else
+			actionKeyPressed = actionKey;
+	} else {
+		/*handle numeric pad*/
+		if ((key_code>=GF_KEY_0) && (key_code<=GF_KEY_9) ) {
+			key_code = key_code + 0x30 - GF_KEY_0;
+		}
+		else
+			key_code = hw_code;
+
+		if (isKeyUp) keyReleased = key_code;
+		else keyPressed = key_code;
+	}
+
+	gf_bs_write_int(bs, keyPressed ? 1 : 0, 1);
+	if (keyPressed) gf_bs_write_int(bs, keyPressed, 32);
+	gf_bs_write_int(bs, keyReleased ? 1 : 0, 1);
+	if (keyReleased) gf_bs_write_int(bs, keyReleased, 32);
+	gf_bs_write_int(bs, actionKeyPressed ? 1 : 0, 1);
+	if (actionKeyPressed) gf_bs_write_int(bs, actionKeyPressed, 32);
+	gf_bs_write_int(bs, actionKeyReleased ? 1 : 0, 1);
+	if (actionKeyReleased) gf_bs_write_int(bs, actionKeyReleased, 32);
+	gf_bs_write_int(bs, shiftKeyDown ? 1 : 0 , 1);
+	if (shiftKeyDown) gf_bs_write_int(bs, shiftKeyDown-1, 1);
+	gf_bs_write_int(bs, controlKeyDown ? 1 : 0 , 1);
+	if (controlKeyDown) gf_bs_write_int(bs, controlKeyDown-1, 1);
+	gf_bs_write_int(bs, altKeyDown ? 1 : 0 , 1);
+	if (altKeyDown) gf_bs_write_int(bs, altKeyDown, 1);
+
+	gf_bs_align(bs);
+	gf_bs_get_content(bs, &buf, &buf_size);
+	gf_bs_del(bs);
+
+	/*get all IS keySensor decoders and send frame*/
+	i=0;
+	while ((is_ctx = gf_list_enum(compositor->input_streams, &i))) {
+		if (is_ctx->type==IS_KeySensor) {
+			IS_ProcessData(is_ctx, buf, buf_size);
+		}
+	}
+	gf_free(buf);
+
+#ifndef GPAC_DISABLE_X3D
+	i=0;
+	while ((n = (X_KeySensor*)gf_list_enum(compositor->x3d_sensors, &i))) {
+		u16 tc[2];
+		u32 len;
+		char szStr[10];
+		const unsigned short *ptr;
+		if (gf_node_get_tag((GF_Node*)n) != TAG_X3D_KeySensor) continue;
+		if (!n->enabled) return 0;
+
+		if (keyPressed) {
+			if (n->keyPress.buffer) gf_free(n->keyPress.buffer);
+			tc[0] = keyPressed;
+			tc[1] = 0;
+			ptr = tc;
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			n->keyPress.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
+			memcpy(n->keyPress.buffer, szStr, sizeof(char) * len);
+			n->keyPress.buffer[len] = 0;
+			gf_node_event_out_str((GF_Node *)n, "keyPress");
+		}
+		if (keyReleased) {
+			if (n->keyRelease.buffer) gf_free(n->keyRelease.buffer);
+			tc[0] = keyReleased;
+			tc[1] = 0;
+			ptr = tc;
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			n->keyRelease.buffer = (char*)gf_malloc(sizeof(char) * (len+1));
+			memcpy(n->keyRelease.buffer, szStr, sizeof(char) * len);
+			n->keyRelease.buffer[len] = 0;
+			gf_node_event_out_str((GF_Node *)n, "keyRelease");
+		}
+		if (actionKeyPressed) {
+			n->actionKeyPress = actionKeyPressed;
+			gf_node_event_out_str((GF_Node *)n, "actionKeyPress");
+		}
+		if (actionKeyReleased) {
+			n->actionKeyRelease = actionKeyReleased;
+			gf_node_event_out_str((GF_Node *)n, "actionKeyRelease");
+		}
+		if (shiftKeyDown) {
+			n->shiftKey = (shiftKeyDown-1) ? 1 : 0;
+			gf_node_event_out_str((GF_Node *)n, "shiftKey");
+		}
+		if (controlKeyDown) {
+			n->controlKey = (controlKeyDown-1) ? 1 : 0;
+			gf_node_event_out_str((GF_Node *)n, "controlKey");
+		}
+		if (altKeyDown) {
+			n->altKey= (altKeyDown-1) ? 1 : 0;
+			gf_node_event_out_str((GF_Node *)n, "altKey");
+		}
+		if (keyPressed || actionKeyPressed || (shiftKeyDown-1) || (controlKeyDown-1) || (altKeyDown-1)) {
+			if (!n->isActive) {
+				n->isActive = 1;
+				gf_node_event_out_str((GF_Node *)n, "isActive");
+			}
+		} else if (n->isActive) {
+			n->isActive = 0;
+			gf_node_event_out_str((GF_Node *)n, "isActive");
+		}
+	}
+#endif
+	/*with KeySensor, we don't know if the key will be consumed or not, assume it is*/
+	return 1;
+}
+
+GF_EXPORT
+void gf_sc_input_sensor_string_input(GF_Compositor *compositor, u32 character)
+{
+	u32 i;
+	GF_BitStream *bs;
+#ifndef GPAC_DISABLE_X3D
+	X_StringSensor *n;
+#endif
+	GF_InputSensorCtx *is_ctx;
+	u8 *buf;
+	u32 buf_size;
+
+	if (!character) return;
+	if (!gf_list_count(compositor->input_streams) && !gf_list_count(compositor->x3d_sensors)) return;
+
+	/*get all IS StringSensor decoders and send frame*/
+	i=0;
+	while ((is_ctx = gf_list_enum(compositor->input_streams, &i))) {
+		if (is_ctx->type==IS_StringSensor) {
+			is_ctx->enteredText[is_ctx->text_len] = character;
+			is_ctx->text_len += 1;
+
+			/*write empty DDF*/
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_int(bs, 0, 1);
+			gf_bs_write_int(bs, 0, 1);
+			gf_bs_align(bs);
+			gf_bs_get_content(bs, &buf, &buf_size);
+			gf_bs_del(bs);
+
+			IS_ProcessData(is_ctx, buf, buf_size);
+
+			gf_free(buf);
+		}
+	}
+
+
+#ifndef GPAC_DISABLE_X3D
+	/*get all X3D StringSensors*/
+	i=0;
+	while ((n = (X_StringSensor*)gf_list_enum(compositor->x3d_sensors, &i))) {
+		StringSensorStack *st;
+		char szStr[5000];
+		const unsigned short *ptr;
+		u32 len;
+		if (gf_node_get_tag((GF_Node*)n) != TAG_X3D_StringSensor) continue;
+		if (!n->enabled) continue;
+
+		st = (StringSensorStack *) gf_node_get_private((GF_Node *)n);
+
+		if (character=='\b') {
+			if (n->deletionAllowed && st->text_len) {
+				st->text_len -= 1;
+				st->enteredText[st->text_len] = 0;
+				ptr = st->enteredText;
+				len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+				if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
+				szStr[len] = 0;
+				n->enteredText.buffer = gf_strdup(szStr);
+				gf_node_event_out_str((GF_Node *)n, "enteredText");
+			}
+		} else if (character=='\r') {
+			if (n->finalText.buffer) gf_free(n->finalText.buffer);
+			n->finalText.buffer = n->enteredText.buffer;
+			n->enteredText.buffer = gf_strdup("");
+			st->text_len = 0;
+			gf_node_event_out_str((GF_Node *)n, "enteredText");
+			gf_node_event_out_str((GF_Node *)n, "finalText");
+		} else {
+			st->enteredText[st->text_len] = character;
+			st->text_len += 1;
+			st->enteredText[st->text_len] = 0;
+			ptr = st->enteredText;
+			len = (u32) gf_utf8_wcstombs(szStr, 10, &ptr);
+			if (n->enteredText.buffer) gf_free(n->enteredText.buffer);
+			szStr[len] = 0;
+			n->enteredText.buffer = gf_strdup(szStr);
+			gf_node_event_out_str((GF_Node *)n, "enteredText");
+		}
+	}
+#endif
+}
+
+#ifndef GPAC_DISABLE_X3D
+
+void DestroyKeySensor(GF_Node *node, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		GF_Compositor *compositor = (GF_Compositor *) gf_node_get_private(node);
+		gf_list_del_item(compositor->x3d_sensors, node);
+	}
+}
+void InitKeySensor(GF_Scene *scene, GF_Node *node)
+{
+	gf_node_set_private(node, scene->compositor);
+	gf_node_set_callback_function(node, DestroyKeySensor);
+	if (!scene->compositor->x3d_sensors)
+		scene->compositor->x3d_sensors = gf_list_new();
+
+	gf_list_add(scene->compositor->x3d_sensors, node);
+}
+
+void DestroyStringSensor(GF_Node *node, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		StringSensorStack *st = (StringSensorStack *) gf_node_get_private(node);
+		gf_list_del_item(st->compositor->x3d_sensors, node);
+		gf_free(st);
+	}
+}
+void InitStringSensor(GF_Scene *scene, GF_Node *node)
+{
+	StringSensorStack*st;
+	GF_SAFEALLOC(st, StringSensorStack)
+	if (!st) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate string sensor stack\n"));
+		return;
+	}
+	st->compositor = scene->compositor;
+	gf_node_set_private(node, st);
+	gf_node_set_callback_function(node, DestroyStringSensor);
+
+	if (!scene->compositor->x3d_sensors)
+		scene->compositor->x3d_sensors = gf_list_new();
+
+	gf_list_add(scene->compositor->x3d_sensors, node);
+}
+
+#endif /*GPAC_DISABLE_X3D*/
+
+#else
+GF_EXPORT
+void gf_sc_input_sensor_mouse_input(GF_Compositor *compositor, GF_EventMouse *event)
+{
+}
+GF_EXPORT
+Bool gf_sc_input_sensor_keyboard_input(GF_Compositor *compositor, u32 key_code, u32 hw_code, Bool isKeyUp)
+{
+	return GF_TRUE;
+}
+GF_EXPORT
+void gf_sc_input_sensor_string_input(GF_Compositor *compositor, u32 character)
+{
+}
+
+#endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_layer_3d.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_layer_3d.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 / Scene Compositor sub-project
@@ -131,157 +131,6 @@
 }
 
 
-u32 layer3d_setup_offscreen(GF_Node *node, Layer3DStack *st, GF_TraverseState *tr_state, Fixed width, Fixed height)
-{
-	GF_STENCIL stencil;
-	u32 new_pixel_format, w, h;
-	GF_Compositor *compositor = (GF_Compositor *)st->visual->compositor;
-
-	if (st->unsupported) return 0;
-
-#ifndef GPAC_USE_TINYGL
-	/*no support for offscreen rendering*/
-	if (!(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN)) {
-		st->unsupported = 1;
-		return 0;
-	}
-#endif
-
-	/*
-		if (tr_state->visual->compositor->recompute_ar) {
-			gf_node_dirty_set(node, 0, 0);
-			return 0;
-		}
-	*/
-
-	new_pixel_format = GF_PIXEL_RGBA;
-#ifndef GPAC_USE_TINYGL
-//	if (!compositor_background_transparent(gf_list_get(tr_state->backgrounds, 0)) )
-//		new_pixel_format = GF_PIXEL_RGB_24;
-
-	/*in OpenGL_ES, only RGBA can be safelly used with glReadPixels*/
-#ifdef GPAC_USE_GLES1X
-	new_pixel_format = GF_PIXEL_RGBA;
-#else
-	/*no support for alpha in offscreen rendering*/
-	if (!(compositor->video_out->hw_caps & GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA))
-		new_pixel_format = GF_PIXEL_RGB_24;
-#endif
-
-#endif
-
-	/*FIXME - we assume RGB+Depth+bitshape, we should check with the video out module*/
-#if defined(GF_SR_USE_DEPTH) && !defined(GPAC_DISABLE_3D)
-	if (st->visual->type_3d && (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_DEPTH) ) new_pixel_format = GF_PIXEL_RGBDS;
-#endif
-
-	w = (u32) FIX2INT(gf_ceil(width));
-	h = (u32) FIX2INT(gf_ceil(height));
-
-	/*1- some implementation of glReadPixel crash if w||h are not multiple of 4*/
-	/*2- some implementation of glReadPixel don't behave properly here when texture is not a power of 2*/
-	w = gf_get_next_pow2(w);
-	if (w>1024) w = 1024;
-	h = gf_get_next_pow2(h);
-	if (h>1024) h = 1024;
-
-
-	if (!w || !h) return 0;
-
-	if (st->txh.tx_io
-	        && (new_pixel_format == st->txh.pixelformat)
-	        && (w == st->txh.width)
-	        && (h == st->txh.height)
-	        && (compositor->offscreen_width >= w)
-	        && (compositor->offscreen_height >= h)
-	   )
-		return 2;
-
-	if (st->txh.tx_io) {
-#ifdef GPAC_USE_TINYGL
-		if (st->tgl_ctx) ostgl_delete_context(st->tgl_ctx);
-#endif
-		gf_sc_texture_release(&st->txh);
-		if (st->txh.data) gf_free(st->txh.data);
-		st->txh.data = NULL;
-	}
-
-	st->vp = gf_rect_center(INT2FIX(w), INT2FIX(h) );
-
-	st->txh.width = w;
-	st->txh.height = h;
-
-	gf_sc_texture_allocate(&st->txh);
-	st->txh.pixelformat = new_pixel_format;
-
-	if (new_pixel_format==GF_PIXEL_RGBA) {
-		st->txh.stride = w * 4;
-		st->txh.transparent = 1;
-	}
-	else if (new_pixel_format==GF_PIXEL_RGBDS) {
-		st->txh.stride = w * 4;
-		st->txh.transparent = 1;
-	}
-	else {
-		st->txh.stride = w * 3;
-		st->txh.transparent = 0;
-	}
-
-	st->visual->width = w;
-	st->visual->height = h;
-
-
-	stencil = compositor->rasterizer->stencil_new(compositor->rasterizer, GF_STENCIL_TEXTURE);
-
-#ifndef GPAC_USE_TINYGL
-	/*create an offscreen window for OpenGL rendering*/
-	if ((compositor->offscreen_width < w) || (compositor->offscreen_height < h)) {
-		GF_Err e;
-		GF_Event evt;
-		compositor->offscreen_width = MAX(compositor->offscreen_width, w);
-		compositor->offscreen_height = MAX(compositor->offscreen_height, h);
-
-		evt.type = GF_EVENT_VIDEO_SETUP;
-		evt.setup.width = tr_state->visual->compositor->offscreen_width;
-		evt.setup.height = tr_state->visual->compositor->offscreen_height;
-		evt.setup.back_buffer = 0;
-		evt.setup.opengl_mode = 2;
-		e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
-		if (e) {
-			gf_sc_texture_release(&st->txh);
-			st->unsupported = 1;
-			return 0;
-		}
-		visual_3d_reset_graphics(compositor->visual);
-		/*reload openGL ext*/
-		gf_sc_load_opengl_extensions(compositor, 1);
-		/*load openGL shaders*/
-		visual_3d_init_shaders(compositor->visual);
-	}
-#endif
-	st->txh.data = (char*)gf_malloc(sizeof(unsigned char) * st->txh.stride * st->txh.height);
-	memset(st->txh.data, 0, sizeof(unsigned char) * st->txh.stride * st->txh.height);
-
-	/*set stencil texture - we don't check error as an image could not be supported by the rasterizer
-	but still supported by the blitter (case of RGBD/RGBDS)*/
-	compositor->rasterizer->stencil_set_texture(stencil, st->txh.data, st->txh.width, st->txh.height, st->txh.stride, st->txh.pixelformat, st->txh.pixelformat, 0);
-
-#ifdef GPAC_USE_TINYGL
-	/*create TinyGL offscreen context*/
-	st->tgl_ctx = ostgl_create_context(st->txh.width, st->txh.height, st->txh.transparent ? 32 : 24, &st->txh.data, 1);
-
-	st->scale_x = st->scale_y = FIX_ONE;
-#else
-	st->scale_x = INT2FIX(w) / tr_state->visual->compositor->offscreen_width;
-	st->scale_y = INT2FIX(h) / tr_state->visual->compositor->offscreen_height;
-#endif
-
-	gf_sc_texture_set_stencil(&st->txh, stencil);
-	drawable_reset_path(st->drawable);
-	gf_path_add_rect_center(st->drawable->path, 0, 0, st->clip.width, st->clip.height);
-	return 1;
-}
-
 static void layer3d_draw_2d(GF_Node *node, GF_TraverseState *tr_state)
 {
 	DrawableContext *ctx = tr_state->ctx;
@@ -338,7 +187,7 @@
 
 static void TraverseLayer3D(GF_Node *node, void *rs, Bool is_destroy)
 {
-	Bool prev_layer, changed = 0;
+	Bool prev_layer;//, changed;
 	GF_List *oldb, *oldv, *oldf, *oldn;
 	GF_Rect rc;
 	u32 cur_lights;
@@ -377,7 +226,7 @@
 		if (l->size.y>=0) st->clip.height = l->size.y;
 		st->clip = gf_rect_center(st->clip.width, st->clip.height);
 
-		changed = 1;
+//		changed = 1;
 	}
 
 	transform = &tr_state->transform;
@@ -476,29 +325,13 @@
 	if ((tr_state->traversing_mode==TRAVERSE_SORT) || (tr_state->traversing_mode==TRAVERSE_DRAW_2D)) {
 		u32 trav_mode = tr_state->traversing_mode;
 
-		if (gf_node_dirty_get(node)) changed = 1;
+//		if (gf_node_dirty_get(node)) changed = 1;
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY|GF_SG_VRML_BINDABLE_DIRTY);
 
-		/*!! we were in a 2D mode, setup associated texture !!*/
+		/*!! we were in a 2D mode without hybridGL, not supported !*/
 		if (!prev_cam) {
-			switch (layer3d_setup_offscreen(node, st, tr_state, rc.width, rc.height)) {
-			case 0:
-				goto l3d_exit;
-			case 2:
-				if (!changed && !(st->visual->camera.flags & CAM_IS_DIRTY) && !st->visual->camera.anim_len) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] No changes found , skipping 3D draw\n"));
-					goto layer3d_unchanged_2d;
-				}
-			default:
-				break;
-			}
-#ifdef GPAC_USE_TINYGL
-			if (st->tgl_ctx) ostgl_make_current(st->tgl_ctx, 0);
-#endif
-
-			rc = st->vp;
-			/*setup GL*/
-			visual_3d_setup(tr_state->visual);
+			st->unsupported = GF_TRUE;
+			goto l3d_exit;
 		}
 		/*note that we don't backup the state as a layer3D cannot be declared in a layer3D*/
 		tr_state->layer3d = node;
@@ -506,7 +339,7 @@
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Layer3D] Redrawing\n"));
 
-		layer3d_setup_clip(st, tr_state, prev_cam ? 1 : 0, rc);
+		layer3d_setup_clip(st, tr_state, 1, rc);
 
 		//this only happens in hybridGL mode
 		if (trav_mode==TRAVERSE_DRAW_2D) {
@@ -522,7 +355,7 @@
 		/*this will init projection. Note that we're binding the viewpoint in the current pixelMetrics context
 		even if the viewpoint was declared in an inline below
 		if no previous camera, we're using offscreen rendering, force clear */
-		visual_3d_init_draw(tr_state, prev_cam ? 1 : 2);
+		visual_3d_init_draw(tr_state, 1);
 
 		visual_3d_check_collisions(tr_state, NULL, l->children);
 		tr_state->traversing_mode = TRAVERSE_SORT;
@@ -548,6 +381,7 @@
 		tr_state->visual->type_3d = old_type_3d;
 		tr_state->layer3d = NULL;
 
+#if 0
 		/*!! we were in a 2D mode, create drawable context!!*/
 		if (!prev_cam ) {
 			DrawableContext *ctx;
@@ -559,13 +393,9 @@
 				gf_get_tinygl_depth(&st->txh);
 #endif
 
-			if (tr_state->visual->compositor->rasterizer->stencil_texture_modified)
-				tr_state->visual->compositor->rasterizer->stencil_texture_modified(gf_sc_texture_get_stencil(&st->txh) );
 			gf_sc_texture_set_stencil(&st->txh, gf_sc_texture_get_stencil(&st->txh) );
 			changed = 1;
 
-layer3d_unchanged_2d:
-
 			/*restore visual*/
 			tr_state->visual = old_visual;
 			tr_state->appear = NULL;
@@ -579,6 +409,8 @@
 			if (st->txh.transparent) ctx->flags |= CTX_IS_TRANSPARENT;
 			drawable_finalize_sort(ctx, tr_state, NULL);
 		}
+#endif
+
 	}
 	/*check picking - we must fall in our 2D clipper except when mvt is grabbed on layer*/
 	else if (!gf_node_dirty_get(node)  && (tr_state->traversing_mode==TRAVERSE_PICK)) {
@@ -709,12 +541,17 @@
 void compositor_init_layer3d(GF_Compositor *compositor, GF_Node *node)
 {
 	Layer3DStack *stack;
+
+	if (!gf_sc_check_gl_support(compositor)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Driver disabled, cannot render Layer 3D\n"));
+		return;
+	}
+
 	GF_SAFEALLOC(stack, Layer3DStack);
 	if (!stack) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate layer 3d stack\n"));
 		return;
 	}
-
 	stack->visual = visual_new(compositor);
 	stack->visual->type_3d = 2;
 	stack->visual->camera.is_3D = 1;

gpac-0.8.0.tar.gz/src/compositor/mpeg4_layout.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_layout.c Changed

@@ -66,8 +66,8 @@
 {
 	LineInfo *li;
 	GF_SAFEALLOC(li, LineInfo);
-
-	gf_list_add(st->lines, li);
+	if (li)
+		gf_list_add(st->lines, li);
 	return li;
 }
 
@@ -599,7 +599,7 @@
 	}
 	/*draw next frame*/
 	if (!stop_anim) {
-		tr_state->visual->compositor->force_next_frame_redraw = 1;
+		tr_state->visual->compositor->force_next_frame_redraw = GF_TRUE;
 		return;
 	}
 
@@ -747,8 +747,12 @@
 
 static Bool OnLayout(GF_SensorHandler *sh, Bool is_over, Bool is_cancel, GF_Event *ev, GF_Compositor *compositor)
 {
-	Bool vertical = ((M_Layout *)sh->sensor)->scrollVertical;
-	LayoutStack *st = (LayoutStack *) gf_node_get_private(sh->sensor);
+	Bool vertical;
+	LayoutStack *st;
+	if (!sh || !ev) return GF_FALSE;
+
+	st = (LayoutStack *) gf_node_get_private(sh->sensor);
+	vertical = ((M_Layout *)sh->sensor)->scrollVertical;
 
 	if (!is_over) {
 		st->is_scrolling = 0;
@@ -800,7 +804,7 @@
 static Bool layout_is_enabled(GF_Node *node)
 {
 	M_Layout *l = (M_Layout *)node;
-	if (l->scrollRate != 0) return 0;
+	if (node && (l->scrollRate != 0)) return 0;
 	return 1;
 }
 
@@ -820,6 +824,14 @@
 	stack->hdl.sensor = node;
 	stack->hdl.IsEnabled = layout_is_enabled;
 	stack->hdl.OnUserEvent = OnLayout;
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		OnLayout(NULL, GF_FALSE, GF_FALSE, NULL, compositor);
+		layout_is_enabled(node);
+		compositor_mpeg4_layout_get_sensor_handler(node);
+	}
+#endif
+
 }
 
 void compositor_layout_modified(GF_Compositor *compositor, GF_Node *node)
@@ -839,7 +851,9 @@
 
 GF_SensorHandler *compositor_mpeg4_layout_get_sensor_handler(GF_Node *node)
 {
-	LayoutStack *st = (LayoutStack *) gf_node_get_private(node);
+	LayoutStack *st;
+	if (!node) return NULL;
+	st = (LayoutStack *) gf_node_get_private(node);
 	return &st->hdl;
 }

gpac-1.0.0.tar.gz/src/compositor/mpeg4_mediacontrol.c Added

@@ -0,0 +1,704 @@
+
+
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/constants.h>
+#include <gpac/internal/compositor_dev.h>
+
+
+void mediacontrol_restart(GF_ObjectManager *odm)
+{
+	GF_List *to_restart;
+	GF_ObjectManager *ctrl_od;
+	GF_Clock *ck, *scene_ck;
+	u32 i;
+	u32 current_seg;
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+#endif
+
+	if (!odm || (odm->flags & GF_ODM_NO_TIME_CTRL) ) return;
+
+#ifndef GPAC_DISABLE_VRML
+	ctrl = gf_odm_get_mediacontrol(odm);
+	if (ctrl) {
+		/*we have a control - filter calls to only handle objects owning media control*/
+		ctrl_od = ctrl->stream->odm;
+		/*if media control owns the scene this OD refers to the scene is always restarted - TODO make that an option*/
+		if (!ctrl_od->subscene) {
+			if (ctrl->stream->odm != odm) return;
+		}
+		odm = ctrl->stream->odm;
+
+		/*this is inline restart - only possible through media control*/
+		if (odm->subscene && odm->subscene->root_od==ctrl->stream->odm) {
+			gf_inline_restart(odm->subscene);
+			return;
+		}
+	}
+#endif
+
+	/*if clock is main scene clock do nothing*/
+	scene_ck = gf_odm_get_media_clock(odm->parentscene->root_od);
+	if (gf_odm_shares_clock(odm, scene_ck)) {
+		if (odm->parentscene->is_dynamic_scene)
+			gf_scene_restart_dynamic(odm->parentscene, 0, 0, 0);
+		return;
+	}
+
+	/*otherwise locate all objects sharing the clock*/
+	ck = gf_odm_get_media_clock(odm);
+	if (!ck) return;
+
+	current_seg = 0;
+#ifndef GPAC_DISABLE_VRML
+	/*store current segment idx*/
+	if (ctrl) {
+		current_seg = ctrl->current_seg;
+		/*if last segment is passed restart*/
+		if (gf_list_count(ctrl->seg) == current_seg) current_seg = 0;
+	}
+#endif
+
+	to_restart = gf_list_new();
+	/*do stop/start in 2 pass, it's much cleaner for servers*/
+	i=0;
+	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(odm->parentscene->resources, &i))) {
+		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
+		/*if running, stop and collect for restart*/
+		if (ctrl_od->state) {
+			gf_odm_stop(ctrl_od, 1);
+			gf_list_add(to_restart, ctrl_od);
+		}
+	}
+	/*force clock reset since we don't know how OD ordering is done*/
+	gf_clock_reset(ck);
+#ifndef GPAC_DISABLE_VRML
+	if (ctrl) ctrl->current_seg = current_seg;
+#endif
+
+	/*play on all ODs collected for restart*/
+	i=0;
+	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
+		//we want to make sure restart is clled right away with the current media control settings
+		gf_odm_start(ctrl_od);
+	}
+	gf_list_del(to_restart);
+}
+
+
+Bool MC_URLChanged(MFURL *old_url, MFURL *new_url)
+{
+	u32 i;
+	if (gf_mo_get_od_id(old_url) != gf_mo_get_od_id(new_url)) return 1;
+	
+	if ((new_url->count==1) && new_url->vals[0].url && !strlen(new_url->vals[0].url) ) new_url->count = 0;
+	
+	if (old_url->count != new_url->count) return 1;
+
+	for (i=0; i<old_url->count; i++) {
+		if (old_url->vals[i].url || new_url->vals[i].url) {
+			if (!old_url->vals[i].url || !new_url->vals[i].url) return 1;
+			if (strcmp(old_url->vals[i].url, new_url->vals[i].url)) return 1;
+		}
+	}
+	return 0;
+}
+
+
+
+
+/*resume all objects*/
+void mediacontrol_resume(GF_ObjectManager *odm, Bool resume_to_live)
+{
+	u32 i;
+	GF_ObjectManager *ctrl_od;
+	GF_Scene *in_scene;
+	GF_Clock *ck;
+
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+
+	/*otherwise locate all objects sharing the clock*/
+	ck = gf_odm_get_media_clock(odm);
+	if (!ck) return;
+
+	in_scene = odm->parentscene;
+	if (odm->subscene) {
+		assert(odm->subscene->root_od==odm);
+		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
+		/*resume root*/
+		gf_odm_resume(odm);
+		in_scene = odm->subscene;
+	}
+
+	i=0;
+	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
+		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
+			continue;
+
+		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			gf_clock_resume(ck);
+			if (resume_to_live)
+				gf_scene_select_main_addon(in_scene, ctrl_od, GF_FALSE, 0);
+		}
+
+		if (ctrl_od->subscene) {
+			mediacontrol_resume(ctrl_od, resume_to_live);
+		} else {
+			gf_odm_resume(ctrl_od);
+		}
+	}
+}
+
+
+/*pause all objects*/
+void mediacontrol_pause(GF_ObjectManager *odm)
+{
+	u32 i;
+	GF_ObjectManager *ctrl_od;
+	GF_Scene *in_scene;
+	GF_Clock *ck;
+
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+
+	/*otherwise locate all objects sharing the clock*/
+	ck = gf_odm_get_media_clock(odm);
+	if (!ck) {
+		odm->flags |= GF_ODM_PAUSE_QUEUED;
+		return;
+	}
+
+	in_scene = odm->parentscene;
+	if (odm->subscene) {
+		assert(odm->subscene->root_od==odm);
+		assert(odm->subscene->is_dynamic_scene || gf_odm_shares_clock(odm, ck) );
+		/*pause root*/
+		gf_odm_pause(odm);
+		in_scene = odm->subscene;
+	}
+
+	i=0;
+	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
+		if (!odm->subscene && !gf_odm_shares_clock(ctrl_od, ck))
+			continue;
+
+		if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+			gf_clock_pause(ck);
+			gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
+		}
+
+		if (ctrl_od->subscene) {
+			mediacontrol_pause(ctrl_od);
+		} else {
+			gf_odm_pause(ctrl_od);
+		}
+	}
+}
+
+
+/*pause all objects*/
+void mediacontrol_set_speed(GF_ObjectManager *odm, Fixed speed)
+{
+	u32 i;
+	GF_ObjectManager *ctrl_od;
+	GF_Scene *in_scene;
+	GF_Clock *ck;
+
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+
+	/*locate all objects sharing the clock*/
+	ck = gf_odm_get_media_clock(odm);
+	if (!ck) return;
+
+	in_scene = odm->parentscene;
+	if (odm->subscene) {
+		assert(odm->subscene->root_od==odm);
+		in_scene = odm->subscene;
+
+		//dynamic scene with speed direction, we need to re-start everything to issue new PLAY requests
+		if (in_scene->is_dynamic_scene && (gf_mulfix(ck->speed, speed) < 0)) {
+			u32 time = gf_clock_time(ck);
+			gf_clock_set_speed(ck, speed);
+
+			//enable main addon
+			if (speed<0) {
+				i=0;
+				while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
+					if (ctrl_od->addon && (ctrl_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+						gf_scene_select_main_addon(in_scene, ctrl_od, GF_TRUE, gf_clock_time(ck) );
+						break;
+					}
+				}
+			}
+			gf_scene_restart_dynamic(in_scene, time, 0, 1);
+			return;
+		}
+		gf_clock_set_speed(ck, speed);
+		gf_odm_set_speed(odm, speed, GF_TRUE);
+	}
+
+	i=0;
+	while ((ctrl_od = (GF_ObjectManager*)gf_list_enum(in_scene->resources, &i))) {
+		if (!gf_odm_shares_clock(ctrl_od, ck)) continue;
+
+		if (ctrl_od->subscene) {
+			mediacontrol_set_speed(ctrl_od, speed);
+		} else {
+			gf_odm_set_speed(ctrl_od, speed, GF_TRUE);
+		}
+	}
+}
+
+#ifndef GPAC_DISABLE_VRML
+
+void MC_GetRange(MediaControlStack *ctrl, Double *start_range, Double *end_range)
+{
+	u32 i;
+	Double duration;
+
+	if (gf_list_count(ctrl->seg)) {
+		GF_Segment *last_seg, *prev_seg;
+		GF_Segment *desc = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
+		if (!desc) {
+			*start_range = 0;
+			*end_range = 0;
+			return;
+		}
+		/*get last segment in consecutive range so that we never issue stop/play between consecutive segments*/
+		prev_seg = desc;
+		last_seg = NULL;
+		duration = desc->Duration;
+		i=1+ctrl->current_seg;
+		while ((last_seg = (GF_Segment *)gf_list_enum(ctrl->seg, &i))) {
+			if (prev_seg->startTime + prev_seg->Duration != last_seg->startTime) {
+				last_seg = NULL;
+				break;
+			}
+			prev_seg = last_seg;
+			duration += last_seg->Duration;
+		}
+//		if (!last_seg) last_seg = desc;
+
+		*start_range = desc->startTime;
+		if (ctrl->control->mediaStartTime>=0) *start_range += ctrl->control->mediaStartTime;
+
+		*end_range = desc->startTime;
+		if ((ctrl->control->mediaStopTime>=0) && ctrl->control->mediaStopTime<duration) {
+			*end_range += ctrl->control->mediaStopTime;
+		} else {
+			*end_range += duration;
+		}
+	} else {
+		if (ctrl->control->mediaStartTime>=0) *start_range = ctrl->control->mediaStartTime;
+		if (ctrl->control->mediaStopTime>=0) *end_range = ctrl->control->mediaStopTime;
+	}
+}
+
+
+void RenderMediaControl(GF_Node *node, void *rs, Bool is_destroy)
+{
+	Bool shall_restart, need_restart;
+	GF_ObjectManager *odm;
+	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
+	MediaControlStack *stack =(MediaControlStack *) gf_node_get_private(node);
+
+	if (is_destroy) {
+		/*reset ODM using this control*/
+		if (stack->stream) {
+			if (stack->stream->odm) {
+				odm = stack->stream->odm;
+				gf_odm_remove_mediacontrol(odm, stack);
+			}
+			/*also removes the association ck<->MC if the object has been destroyed before the node*/
+			if (stack->ck) stack->ck->mc = NULL;
+		}
+		gf_list_del(stack->seg);
+		gf_sg_vrml_mf_reset(&stack->url, GF_SG_VRML_MFURL);
+		gf_free(stack);
+		return;
+	}
+	//we need to disable culling otherwise we may never be called back again ...
+	tr_state->disable_cull = 1;
+
+	/*not changed nothing to do - note we need to register with stream yet for control switching...*/
+	if (stack->stream && (!stack->changed || !stack->control->enabled)) return;
+
+	need_restart = (stack->changed==2) ? 1 : 0;
+	shall_restart = (stack->control->mediaStartTime>=0) ? 1 : 0;
+
+	/*check url target*/
+	if (stack->stream) {
+		if (MC_URLChanged(&stack->url, &stack->control->url)) {
+			GF_MediaObject *prev;
+			gf_sg_vrml_mf_reset(&stack->url, GF_SG_VRML_MFURL);
+
+			prev = stack->stream;
+			if (gf_list_find(stack->parent->scene_objects, prev)<0)
+				prev = NULL;
+
+			stack->stream = gf_scene_get_media_object(stack->parent, &stack->control->url, GF_MEDIA_OBJECT_UNDEF, 0);
+			if (stack->stream) {
+				if (!stack->stream->odm) return;
+				/*MediaControl on inline: if dynamic scene, make sure it is connected before attaching...*/
+				if (stack->stream->odm->subscene) {
+					if (stack->stream->odm->subscene->is_dynamic_scene && !stack->stream->odm->ck) return;
+				}
+				gf_sg_vrml_field_copy(&stack->url, &stack->control->url, GF_SG_VRML_MFURL);
+
+				/*remove from prev*/
+				if (prev && prev->odm && (prev != stack->stream)) gf_odm_remove_mediacontrol(prev->odm, stack);
+				/*register with new*/
+				/*if we assigned the media control to an exiting object - force the state of the object*/
+				gf_odm_set_mediacontrol((GF_ObjectManager *) stack->stream->odm, stack);
+
+				while (gf_list_count(stack->seg)) gf_list_rem(stack->seg, 0);
+				gf_odm_init_segments((GF_ObjectManager *) stack->stream->odm, stack->seg, &stack->control->url);
+
+				stack->current_seg = 0;
+				//do not restart if no mediaStartTime and speed is 1
+				if ((stack->control->mediaStartTime>0) || gf_list_count(stack->seg) || (stack->control->mediaSpeed != FIX_ONE) ) {
+					shall_restart = need_restart = 1;
+				} else {
+					shall_restart = need_restart = 0;
+					//URL changed, we are by default in PLAY mode.
+					stack->media_speed = 1;
+				}
+
+				stack->ck = gf_odm_get_media_clock(stack->stream->odm);
+			}
+			/*control has been removed and we were paused, resume*/
+			else if (stack->paused) {
+				if (prev)
+					mediacontrol_resume((GF_ObjectManager *) prev->odm, 0);
+				
+				stack->paused = 0;
+			}
+			/*MediaControl has been detached*/
+			else {
+				if (prev)
+					gf_odm_remove_mediacontrol(prev->odm, stack);
+				return;
+			}
+		}
+	} else {
+		stack->stream = gf_scene_get_media_object(stack->parent, &stack->control->url, GF_MEDIA_OBJECT_UNDEF, 0);
+		if (!stack->stream || !stack->stream->odm) {
+			if (stack->control->url.count) gf_sc_invalidate(stack->parent->compositor, NULL);
+			stack->stream = NULL;
+			stack->changed = 0;
+			return;
+		}
+		stack->ck = gf_odm_get_media_clock(stack->stream->odm);
+		/*OD not ready yet*/
+		if (!stack->ck) {
+			stack->stream = NULL;
+			if (stack->control->url.count) {
+				stack->is_init = 0;
+				gf_sc_invalidate(stack->parent->compositor, NULL);
+			}
+			return;
+		}
+		gf_sg_vrml_field_copy(&stack->url, &stack->control->url, GF_SG_VRML_MFURL);
+		gf_odm_set_mediacontrol((GF_ObjectManager *) stack->stream->odm, stack);
+
+		while (gf_list_count(stack->seg)) gf_list_rem(stack->seg, 0);
+		gf_odm_init_segments((GF_ObjectManager *) stack->stream->odm, stack->seg, &stack->control->url);
+		stack->current_seg = 0;
+
+		/*we shouldn't have to restart unless start/stop times have been changed, which is tested below*/
+		need_restart = 0;
+	}
+
+	if ((stack->is_init && !stack->changed) || !stack->control->enabled || !stack->stream) return;
+
+
+	/*if not previously enabled and now enabled, switch all other controls off and reactivate*/
+	if (!stack->enabled) {
+		stack->enabled = 1;
+		need_restart = gf_odm_switch_mediacontrol(stack->stream->odm, stack);
+	}
+
+	stack->changed = 0;
+
+	if (!stack->control->mediaSpeed) shall_restart = 0;
+
+	odm = (GF_ObjectManager *)stack->stream->odm;
+
+	/*check for changes*/
+	if (!stack->is_init) {
+		need_restart = 0;
+		/*not linked yet*/
+		if (!odm) return;
+		stack->media_speed = stack->control->mediaSpeed;
+		stack->enabled = stack->control->enabled;
+		stack->media_start = stack->control->mediaStartTime;
+		if (stack->media_stop != stack->control->mediaStopTime) {
+			if (stack->control->mediaStopTime < 1000000000) need_restart  = 1;
+			stack->media_stop = stack->control->mediaStopTime;
+		}
+		stack->is_init = 1;
+		stack->paused = 0;
+		/*the object has already been started, and media start time is not 0, restart*/
+		if (stack->stream->num_open) {
+			if (need_restart  || (stack->media_start > 0) || (gf_list_count(stack->seg)>0 )  || (stack->media_speed!=FIX_ONE ) ) {
+				mediacontrol_restart(odm);
+			} else if (stack->media_speed == 0) {
+				mediacontrol_pause(odm);
+				stack->paused = 1;
+			}
+		}
+		return;
+	}
+
+	if (stack->media_speed != stack->control->mediaSpeed) {
+		/*if no speed pause*/
+		if (!stack->control->mediaSpeed && !stack->paused) {
+			mediacontrol_pause(odm);
+			stack->paused = 1;
+		}
+		/*else resume if paused*/
+		else if (stack->control->mediaSpeed && stack->paused) {
+			mediacontrol_resume(odm, 0);
+			stack->paused = 0;
+			need_restart += shall_restart;
+		}
+		/*else set speed*/
+		else if (stack->media_speed && stack->control->mediaSpeed) {
+			/*don't set speed if we have to restart the media ...*/
+			if (!shall_restart) mediacontrol_set_speed(odm, stack->control->mediaSpeed);
+			need_restart += shall_restart;
+		}
+		/*init state was paused*/
+		else if (!stack->media_speed) {
+			need_restart ++;
+		}
+		stack->media_speed = stack->control->mediaSpeed;
+	}
+	/*check start/stop changes*/
+	if (stack->media_start != stack->control->mediaStartTime) {
+		stack->media_start = stack->control->mediaStartTime;
+		need_restart += shall_restart;
+	}
+	/*stop change triggers restart no matter what (new range) if playing*/
+	if (stack->media_stop != stack->control->mediaStopTime) {
+		stack->media_stop = stack->control->mediaStopTime;
+		if (stack->control->mediaSpeed) need_restart = 1;
+	}
+
+	if (need_restart) {
+		mediacontrol_restart(odm);
+	}
+
+	/*handle preroll*/
+
+}
+
+void InitMediaControl(GF_Scene *scene, GF_Node *node)
+{
+	MediaControlStack *stack;
+	GF_SAFEALLOC(stack, MediaControlStack);
+	if (!stack) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_INTERACT, ("[Terminal] Failed to allocate media control stack\n"));
+		return;
+	}
+	stack->changed = 1;
+	stack->parent = scene;
+	stack->control = (M_MediaControl *)node;
+	stack->seg = gf_list_new();
+
+	/*default values are stored on first render*/
+	gf_node_set_callback_function(node, RenderMediaControl);
+	gf_node_set_private(node, stack);
+}
+
+
+void MC_Modified(GF_Node *node)
+{
+	MediaControlStack *stack =(MediaControlStack *) gf_node_get_private(node);
+	if (!stack) return;
+	if (stack->changed!=2) {
+		/*check URL*/
+		if (MC_URLChanged(&stack->url, &stack->control->url))
+			stack->changed = 2;
+		/*check speed (play/pause)*/
+		else if (stack->media_speed != stack->control->mediaSpeed)
+			stack->changed = 1;
+		/*check mediaStartTime (seek)*/
+		else if (stack->media_start != stack->control->mediaStartTime) {
+			/*do not reevaluate if mediaStartTime is reset to -1 (current time)*/
+			if (stack->control->mediaStartTime!=-1.0)
+				stack->changed = 2;
+			/*check mediaStopTime <0 (timeshift buffer control)*/
+		} else if (stack->media_stop != stack->control->mediaStopTime) {
+			if (stack->control->mediaStopTime<=0)
+				stack->changed = 2;
+		}
+//		else stack->changed = 1;
+	}
+
+	gf_node_dirty_set( gf_sg_get_root_node(gf_node_get_graph(node)), 0, 1);
+	/*invalidate scene, we recompute MC state in render*/
+	gf_sc_invalidate(stack->parent->compositor, NULL);
+}
+
+
+void gf_odm_set_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
+{
+	/*keep track of it*/
+	if (ctrl && (gf_list_find(odm->mc_stack, ctrl) < 0)) gf_list_add(odm->mc_stack, ctrl);
+	if (ctrl && !ctrl->control->enabled) return;
+
+	if (odm->subscene && odm->subscene->is_dynamic_scene) {
+		if (odm->ck) {
+			/*deactivate current control*/
+			if (ctrl && odm->ck->mc) {
+				odm->ck->mc->control->enabled = 0;
+				gf_node_event_out((GF_Node *)odm->ck->mc->control, 7/*"enabled"*/);
+			}
+			odm->ck->mc = ctrl;
+		}
+	} else {
+		/*for each clock in the controled OD*/
+		if (odm->ck && (odm->ck->mc != ctrl)) {
+			/*deactivate current control*/
+			if (ctrl && odm->ck->mc) {
+				odm->ck->mc->control->enabled = 0;
+				gf_node_event_out((GF_Node *)odm->ck->mc->control, 7/*"enabled"*/);
+			}
+			/*and attach this control to the clock*/
+			odm->ck->mc = ctrl;
+		}
+	}
+	/*store active control on media*/
+	odm->media_ctrl = gf_odm_get_mediacontrol(odm);
+}
+
+
+
+MediaControlStack *gf_odm_get_mediacontrol(GF_ObjectManager *odm)
+{
+	GF_Clock *ck;
+	ck = gf_odm_get_media_clock(odm);
+	if (!ck) return NULL;
+	return ck->mc;
+}
+
+
+void gf_odm_remove_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
+{
+	gf_list_del_item(odm->mc_stack, ctrl);
+	/*removed. Note the spec doesn't say what to do in this case...*/
+	if (odm->media_ctrl == ctrl) {
+		/*we're about to release the media control from this object - if paused, force a resume (as if no MC was set)*/
+		if (ctrl->paused)
+			mediacontrol_resume(odm, 0);
+		gf_odm_set_mediacontrol(odm, NULL);
+	}
+}
+
+Bool gf_odm_switch_mediacontrol(GF_ObjectManager *odm, MediaControlStack *ctrl)
+{
+	u32 i;
+	MediaControlStack *st2;
+	if (!ctrl->control->enabled) return 0;
+
+	/*for all media controls other than this one force enable to false*/
+	i=0;
+	while ((st2 = (MediaControlStack *)gf_list_enum(odm->mc_stack, &i))) {
+		if (st2 == ctrl) continue;
+		if (st2->control->enabled) {
+			st2->control->enabled = 0;
+			gf_node_event_out((GF_Node *) st2->control, 7/*"enabled"*/);
+		}
+		st2->enabled = 0;
+	}
+	if (ctrl == odm->media_ctrl) return 0;
+	gf_odm_set_mediacontrol(odm, ctrl);
+	return 1;
+}
+
+Bool gf_odm_check_segment_switch(GF_ObjectManager *odm)
+{
+	u32 count, i;
+	GF_Segment *cur, *next;
+	MediaControlStack *ctrl = gf_odm_get_mediacontrol(odm);
+
+	/*if no control or control not on this object ignore segment switch*/
+	if (!ctrl || (ctrl->stream->odm != odm)) return 0;
+
+	count = gf_list_count(ctrl->seg);
+	/*reached end of controled stream (no more segments)*/
+	if (ctrl->current_seg>=count) return 0;
+
+	/*synth media, trigger if end of segment run-time*/
+	if (!odm->type || ((odm->type!=GF_STREAM_VISUAL) && (odm->type!=GF_STREAM_AUDIO))) {
+		GF_Clock *ck = gf_odm_get_media_clock(odm);
+		u32 now = gf_clock_time(ck);
+		u64 dur = odm->subscene ? odm->subscene->duration : odm->duration;
+		cur = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
+		if (odm->subscene && odm->subscene->needs_restart) return 0;
+		if (cur) dur = (u32) ((cur->Duration+cur->startTime)*1000);
+		//if next frame is after current segment trigger switch now
+		if (now + odm->parentscene->compositor->frame_duration < dur)
+			return 0;
+	} else {
+		/*FIXME - for natural media with scalability, we should only process when all streams of the object are done*/
+	}
+
+	/*get current segment and move to next one*/
+	cur = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
+	ctrl->current_seg ++;
+
+	/*resync in case we have been issuing a play range over several segments*/
+	for (i=ctrl->current_seg; i<count; i++) {
+		next = (GF_Segment *)gf_list_get(ctrl->seg, i);
+		if (
+		    /*if next seg start is after cur seg start*/
+		    (cur->startTime < next->startTime)
+		    /*if next seg start is before cur seg end*/
+		    && (cur->startTime + cur->Duration > next->startTime)
+		    /*if next seg start is already passed*/
+		    && (1000*next->startTime < odm->media_current_time)
+		    /*then next segment was taken into account when requesting play*/
+		) {
+			cur = next;
+			ctrl->current_seg ++;
+		}
+	}
+	/*if last segment in ctrl is done, end of stream*/
+	if (ctrl->current_seg >= count) return 0;
+	next = (GF_Segment *)gf_list_get(ctrl->seg, ctrl->current_seg);
+
+	/*if next seg start is not in current seg, media needs restart*/
+	if ((next->startTime < cur->startTime) || (cur->startTime + cur->Duration < next->startTime))
+		mediacontrol_restart(odm);
+
+	return 1;
+}
+
+
+#endif /*GPAC_DISABLE_VRML*/

gpac-1.0.0.tar.gz/src/compositor/mpeg4_mediasensor.c Added

@@ -0,0 +1,288 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/constants.h>
+#include <gpac/internal/compositor_dev.h>
+
+#ifndef GPAC_DISABLE_VRML
+
+/*render : setup media sensor and update timing in case of inline scenes*/
+void RenderMediaSensor(GF_Node *node, void *rs, Bool is_destroy)
+{
+	GF_TraverseState *tr_state = (GF_TraverseState *)rs;
+	GF_Clock *ck;
+	Bool do_update_clock = 1;
+	MediaSensorStack *st = (MediaSensorStack *)gf_node_get_private(node);
+
+	if (is_destroy) {
+		/*unlink from OD*/
+		if (st->stream && st->stream->odm)
+			gf_list_del_item(st->stream->odm->ms_stack, st);
+
+		gf_list_del(st->seg);
+		gf_free(st);
+		return;
+	}
+	//we need to disable culling otherwise we may never be called back again ...
+	tr_state->disable_cull = 1;
+
+	if (!st->is_init) {
+		if (!st->stream) {
+			st->stream = gf_mo_register(node, &st->sensor->url, 0, 0);
+			if (!st->stream) return;
+		}
+		if (!st->stream->odm) return;
+		
+		gf_list_add(st->stream->odm->ms_stack, st);
+		gf_odm_init_segments(st->stream->odm, st->seg, &st->sensor->url);
+		st->is_init = 1;
+		st->active_seg = 0;
+	}
+	//st->stream may be NULL when destroying the ODM
+	if (!st->stream || !st->stream->odm) return;
+
+	/*media sensor bound to natural media (audio, video) is updated when fetching the stream
+	data for rendering.*/
+
+	ck = NULL;
+	/*check inline scenes - if the scene is set to restart DON'T MODIFY SENSOR: since we need a 2 render
+	passes to restart inline, scene is considered as not running*/
+	if (st->stream->odm->subscene && !st->stream->odm->subscene->needs_restart) {
+		if (! st->stream->odm->subscene->is_dynamic_scene) ck = st->stream->odm->subscene->root_od->ck;
+		/*dynamic scene*/
+		else ck = st->stream->odm->ck;
+
+		if (st->stream->odm->subscene->is_dynamic_scene) do_update_clock = 0;
+	}
+	/*check anim or OCR streams*/
+	else if (st->stream->odm->type==GF_STREAM_SCENE) ck = st->stream->odm->ck;
+	/*check OCR streams*/
+	else if (st->stream->odm->ck) ck = st->stream->odm->ck;
+
+	if (ck && ck->clock_init ) {
+		if (do_update_clock)
+			st->stream->odm->media_current_time = gf_clock_media_time(ck);
+		mediasensor_update_timing(st->stream->odm, GF_FALSE);
+	}
+	//if main addon is VoD , fire a timeshift update
+	else if (st->stream->odm->subscene && st->stream->odm->subscene->sys_clock_at_main_activation) {
+		GF_Event evt;
+		memset(&evt, 0, sizeof(evt));
+		evt.type = GF_EVENT_TIMESHIFT_UPDATE;
+		gf_sc_send_event(st->stream->odm->parentscene->compositor, &evt);
+	}
+}
+
+void InitMediaSensor(GF_Scene *scene, GF_Node *node)
+{
+	MediaSensorStack *st;
+	GF_SAFEALLOC(st, MediaSensorStack);
+	if (!st) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media sensor stack\n"));
+		return;
+	}
+
+	st->parent = scene;
+	st->sensor = (M_MediaSensor *)node;
+	st->seg = gf_list_new();
+	gf_node_set_callback_function(node, RenderMediaSensor);
+	gf_node_set_private(node, st);
+
+}
+
+/*only URL can be changed, so reset and get new URL*/
+void MS_Modified(GF_Node *node)
+{
+	MediaSensorStack *st = (MediaSensorStack *)gf_node_get_private(node);
+	if (!st) return;
+
+	while (gf_list_count(st->seg)) gf_list_rem(st->seg, 0);
+
+	if (st->stream) {
+		/*unlink from OD*/
+		if (st->stream->odm && st->stream->odm->ms_stack)
+			gf_list_del_item(st->stream->odm->ms_stack, st);
+
+		gf_mo_unregister(node, st->stream);
+		if (st->sensor->isActive) {
+			st->sensor->isActive = 0;
+			gf_node_event_out((GF_Node *) st->sensor, 4/*"isActive"*/);
+		}
+	}
+	st->stream = NULL;
+	st->is_init = 0;
+	gf_sc_invalidate(st->parent->compositor, NULL);
+}
+
+void mediasensor_update_timing(GF_ObjectManager *odm, Bool is_eos)
+{
+	GF_Segment *desc;
+	u32 i, count, j, ms_count;
+	Double time;
+	ms_count = gf_list_count(odm->ms_stack);
+	if (!ms_count) return;
+
+	time = odm->media_current_time / 1000.0;
+	//dirty hack to get timing of frame when very late (openhevc debug)
+	if (odm->subscene && odm->ck && odm->ck->last_ts_rendered)
+		time = odm->ck->last_ts_rendered / 1000.0;
+
+	for (j=0; j<ms_count; j++) {
+		MediaSensorStack *media_sens = (MediaSensorStack *)gf_list_get(odm->ms_stack, j);
+		if (!media_sens->is_init) continue;
+		count = gf_list_count(media_sens->seg);
+
+		/*full object controled*/
+		if (!media_sens->active_seg && !count) {
+			/*check for end of scene (MediaSensor on inline)*/
+			if (odm->subscene && odm->subscene->duration) {
+				GF_Clock *ck = gf_odm_get_media_clock(odm);
+				if (ck->has_seen_eos && (1000*time>=(Double) (s64)odm->subscene->duration)) {
+					if (media_sens->sensor->isActive) {
+						/*force notification of time (ntify the scene duration rather than the current clock*/
+						media_sens->sensor->mediaCurrentTime = (Double) odm->subscene->duration;
+						media_sens->sensor->mediaCurrentTime /= 1000;
+						gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
+						media_sens->sensor->isActive = 0;
+						gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor\n", odm->ID));
+					}
+					continue;
+				}
+			}
+
+			if (!is_eos && !media_sens->sensor->isActive) {
+				media_sens->sensor->isActive = 1;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+
+				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+				if (odm->subscene) {
+					media_sens->sensor->mediaDuration = (Double) (s64)odm->subscene->duration;
+				} else {
+					media_sens->sensor->mediaDuration = (Double) (s64)odm->duration;
+				}
+				if (media_sens->sensor->mediaDuration)
+					media_sens->sensor->mediaDuration /= 1000;
+				else
+					media_sens->sensor->mediaDuration = -FIX_ONE;
+
+				gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
+			}
+
+			if (is_eos && media_sens->sensor->isActive) {
+				if (media_sens->sensor->mediaDuration>=0) {
+					media_sens->sensor->mediaCurrentTime = media_sens->sensor->mediaDuration;
+				} else {
+					media_sens->sensor->mediaCurrentTime = time;
+				}
+				gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
+				media_sens->sensor->isActive = 0;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+			} else {
+				if (media_sens->sensor->isActive && (media_sens->sensor->mediaCurrentTime != time)) {
+					media_sens->sensor->mediaCurrentTime = time;
+					gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
+				}
+			}
+			continue;
+		}
+
+		/*locate segment*/
+		for (i=media_sens->active_seg; i<count; i++) {
+			desc = (GF_Segment*)gf_list_get(media_sens->seg, i);
+			/*not controled*/
+			if (desc->startTime > time) {
+				if (media_sens->sensor->isActive) {
+					media_sens->sensor->isActive = 0;
+					gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor at time %g - segment %s\n", odm->ID, time, desc->SegmentName));
+				}
+				continue;
+			}
+			if (desc->startTime + desc->Duration < time) continue;
+			if (desc->startTime + desc->Duration == time) {
+				continue;
+			}
+			/*segment switch, force activation (isActive TRUE send at each seg)*/
+			if (media_sens->active_seg != i) {
+				media_sens->active_seg = i;
+				media_sens->sensor->isActive = 0;
+			}
+
+			if (!media_sens->sensor->isActive) {
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Activating media sensor time %g - segment %s\n", odm->ID, time, desc->SegmentName));
+
+				media_sens->sensor->isActive = 1;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+				/*set info*/
+				gf_sg_vrml_mf_reset(& media_sens->sensor->info, GF_SG_VRML_MFSTRING);
+				gf_sg_vrml_mf_alloc(& media_sens->sensor->info, GF_SG_VRML_MFSTRING, 1);
+				media_sens->sensor->info.vals[0] = desc->SegmentName ? gf_strdup(desc->SegmentName) : NULL;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 5/*"info"*/);
+				/*set duration*/
+				media_sens->sensor->mediaDuration = desc->Duration;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
+				/*set seg start time*/
+				media_sens->sensor->streamObjectStartTime = desc->startTime;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 2/*"streamObjectStartTime"*/);
+
+			}
+
+			/*set media time - relative to segment start time*/
+			time -= desc->startTime;
+			if (media_sens->sensor->mediaCurrentTime != time) {
+				media_sens->sensor->mediaCurrentTime = time;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 1/*"mediaCurrentTime"*/);
+			}
+			break;
+		}
+		if (i==count) {
+			/*we're after last segment, deactivate*/
+			if (media_sens->sensor->isActive) {
+				media_sens->sensor->isActive = 0;
+				gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+				media_sens->active_seg = count;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor at time %g: no more segments\n", odm->ID, time));
+			}
+		}
+	}
+}
+
+void MS_Stop(MediaSensorStack *st)
+{
+	if (st->sensor->isActive) {
+		st->sensor->isActive = 0;
+		gf_node_event_out((GF_Node *) st->sensor, 4/*"isActive"*/);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[ODM%d] Deactivating media sensor\n", st->stream->odm->ID));
+	}
+	st->active_seg = 0;
+}
+
+#endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_path_layout.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_path_layout.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_sensors.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_sensors.c Changed

@@ -29,8 +29,6 @@
 #include "visual_manager.h"
 /*for anchor*/
 #include "mpeg4_grouping.h"
-/*for anchor processing, which needs to be filtered at the inline scene level*/
-#include <gpac/internal/terminal_dev.h>
 
 #ifndef GPAC_DISABLE_VRML
 
@@ -105,9 +103,6 @@
 		if (url && url->count && url->vals[0].url && strlen(url->vals[0].url) )
 			st->enabled = 1;
 
-		if (!tr_state->visual->compositor->user->EventProc) {
-			st->enabled = 0;
-		}
 		gf_node_dirty_clear(node, GF_SG_NODE_DIRTY);
 	}
 
@@ -147,11 +142,9 @@
 				Bindable_SetSetBind(bindable, 1);
 				break;
 			}
-		} else if (compositor->term) {
+		} else {
 			if (gf_scene_process_anchor(node, &evt))
 				break;
-		} else if (gf_term_send_event(compositor->term, &evt)) {
-			break;
 		}
 		i++;
 	}
@@ -172,23 +165,22 @@
 		if (!is_cancel) anchor_activation(sh->sensor, st, compositor);
 	} else if (is_over && !st->over) {
 		st->over = 1;
-		if (compositor->user->EventProc) {
-			evt.type = GF_EVENT_NAVIGATE_INFO;
-			switch (gf_node_get_tag(sh->sensor)) {
-			case TAG_MPEG4_Anchor:
-				evt.navigate.to_url = ((M_Anchor *)sh->sensor)->description.buffer;
-				url = & ((M_Anchor *)sh->sensor)->url;
-				break;
+		evt.type = GF_EVENT_NAVIGATE_INFO;
+		switch (gf_node_get_tag(sh->sensor)) {
+		case TAG_MPEG4_Anchor:
+			evt.navigate.to_url = ((M_Anchor *)sh->sensor)->description.buffer;
+			url = & ((M_Anchor *)sh->sensor)->url;
+			break;
 #ifndef GPAC_DISABLE_X3D
-			case TAG_X3D_Anchor:
-				evt.navigate.to_url = ((X_Anchor *)sh->sensor)->description.buffer;
-				url = & ((X_Anchor *)sh->sensor)->url;
-				break;
+		case TAG_X3D_Anchor:
+			evt.navigate.to_url = ((X_Anchor *)sh->sensor)->description.buffer;
+			url = & ((X_Anchor *)sh->sensor)->url;
+			break;
 #endif
-			}
-			if (url && (!evt.navigate.to_url || !strlen(evt.navigate.to_url))) evt.navigate.to_url = url->vals[0].url;
-			gf_term_send_event(compositor->term, &evt);
 		}
+		if (url && (!evt.navigate.to_url || !strlen(evt.navigate.to_url))) evt.navigate.to_url = url->vals[0].url;
+		gf_sc_send_event(compositor, &evt);
+
 	} else if (!is_over) {
 		st->over = 0;
 	}
@@ -1233,13 +1225,12 @@
 				sphere->trackPoint_changed = compositor->hit_local_point;
 				gf_node_event_out(sh->sensor, 5/*"trackPoint_changed"*/);
 			} else {
-				GF_Ray r;
-				r = compositor->hit_world_ray;
-				gf_mx_apply_ray(&compositor->hit_world_to_local, &r);
-				if (!gf_ray_hit_sphere(&r, NULL, st->radius, &compositor->hit_local_point)) {
+				GF_Ray ray = compositor->hit_world_ray;
+				gf_mx_apply_ray(&compositor->hit_world_to_local, &ray);
+				if (!gf_ray_hit_sphere(&ray, NULL, st->radius, &compositor->hit_local_point)) {
 					vec.x = vec.y = vec.z = 0;
 					/*doesn't work properly...*/
-					compositor->hit_local_point = gf_closest_point_to_line(r.orig, r.dir, vec);
+					compositor->hit_local_point = gf_closest_point_to_line(ray.orig, ray.dir, vec);
 				}
 			}
 
@@ -1550,25 +1541,25 @@
 		break;
 	/*automotive situation - fixme we should use a profile doc ?*/
 	case 6:
-		opt = gf_cfg_get_key(compositor->user->config, "Profile", "Automotive");
+		opt = gf_opts_get_key("Profile", "Automotive");
 		equal = (opt && !strcmp(opt, "yes")) ? 1 : 2;
 		strcpy(par_value, (equal==1) ? "TRUE" : "FALSE");
 		break;
 	/*visually challenged - fixme we should use a profile doc ?*/
 	case 7:
-		opt = gf_cfg_get_key(compositor->user->config, "Profile", "VisuallyChallenged");
+		opt = gf_opts_get_key("Profile", "VisuallyChallenged");
 		equal = (opt && !strcmp(opt, "yes")) ? 1 : 2;
 		strcpy(par_value, (equal==1) ? "TRUE" : "FALSE");
 		break;
 	/*has touch - fixme we should find out by ourselves*/
 	case 8:
-		opt = gf_cfg_get_key(compositor->user->config, "Profile", "HasTouchScreen");
+		opt = gf_opts_get_key("Profile", "HasTouchScreen");
 		equal = (!opt || !strcmp(opt, "yes")) ? 1 : 2;
 		strcpy(par_value, (equal==1) ? "TRUE" : "FALSE");
 		break;
 	/*has key - fixme we should find out by ourselves*/
 	case 9:
-		opt = gf_cfg_get_key(compositor->user->config, "Profile", "HasKeyPad");
+		opt = gf_opts_get_key("Profile", "HasKeyPad");
 		equal = (!opt || !strcmp(opt, "yes")) ? 1 : 2;
 		strcpy(par_value, (equal==1) ? "TRUE" : "FALSE");
 		break;
@@ -1620,6 +1611,11 @@
 	}
 }
 
+void compositor_envtest_modified(GF_Node *node)
+{
+	envtest_evaluate(node, NULL);
+}
+
 void compositor_init_envtest(GF_Compositor *compositor, GF_Node *node)
 {
 	M_EnvironmentTest *envtest = (M_EnvironmentTest *)node;
@@ -1628,12 +1624,14 @@
 	gf_node_set_callback_function(node, traverse_envtest);
 
 	envtest->on_evaluate = envtest_evaluate;
-}
 
-void compositor_envtest_modified(GF_Node *node)
-{
-	envtest_evaluate(node, NULL);
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		compositor_envtest_modified(node);
+	}
+#endif
 }
 
 
+
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/compositor/mpeg4_sound.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_sound.c Changed

@@ -69,15 +69,14 @@
 }
 static Bool SND2D_GetChannelVolume(GF_Node *node, Fixed *vol)
 {
+	u32 i;
 	Fixed volume = ((M_Sound2D *)node)->intensity;
-	vol[0] = vol[1] = vol[2] = vol[3] = vol[4] = vol[5] = volume;
+	for (i=0; i<GF_AUDIO_MIXER_MAX_CHANNELS; i++) {
+		vol[i] = volume;
+	}
 	return (volume==FIX_ONE) ? 0 : 1;
 }
 
-static u8 SND2D_GetPriority(GF_Node *node)
-{
-	return 255;
-}
 
 void compositor_init_sound2d(GF_Compositor *compositor, GF_Node *node)
 {
@@ -87,7 +86,6 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to allocate sound 2d stack\n"));
 		return;
 	}
-	snd->snd_ifce.GetPriority = SND2D_GetPriority;
 	snd->snd_ifce.GetChannelVolume = SND2D_GetChannelVolume;
 	snd->snd_ifce.owner = node;
 	gf_node_set_private(node, snd);
@@ -226,7 +224,7 @@
 		st->identity = (st->intensity==FIX_ONE) ? 1 : 0;
 
 		if (snd->spatialize) {
-			Fixed ang, sign;
+			Fixed sign;
 			SFVec3f cross;
 			pos = snd->location;
 			gf_mx_apply_vec(&tr_state->model_matrix, &pos);
@@ -258,10 +256,12 @@
 }
 static Bool SND_GetChannelVolume(GF_Node *node, Fixed *vol)
 {
+	u32 i;
 	M_Sound *snd = (M_Sound *)node;
 	SoundStack *st = (SoundStack *)gf_node_get_private(node);
+	for (i=2; i<GF_AUDIO_MIXER_MAX_CHANNELS; i++)
+		vol[i] = st->intensity;
 
-	vol[2] = vol[3] = vol[4] = vol[5] = st->intensity;
 	if (snd->spatialize) {
 		vol[0] = st->lgain;
 		vol[1] = st->rgain;
@@ -270,10 +270,6 @@
 	}
 	return !st->identity;
 }
-static u8 SND_GetPriority(GF_Node *node)
-{
-	return (u8) ((M_Sound *)node)->priority*255;
-}
 
 void compositor_init_sound(GF_Compositor *compositor, GF_Node *node)
 {
@@ -284,7 +280,6 @@
 		return;
 	}
 	snd->snd_ifce.GetChannelVolume = SND_GetChannelVolume;
-	snd->snd_ifce.GetPriority = SND_GetPriority;
 	snd->snd_ifce.owner = node;
 	gf_node_set_private(node, snd);
 	gf_node_set_callback_function(node, TraverseSound);

gpac-0.8.0.tar.gz/src/compositor/mpeg4_text.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_text.c Changed

@@ -61,10 +61,9 @@
 
 void text_clean_paths(GF_Compositor *compositor, TextStack *stack)
 {
-	GF_TextSpan *span;
 	/*delete all path objects*/
 	while (gf_list_count(stack->spans)) {
-		span = (GF_TextSpan*) gf_list_get(stack->spans, 0);
+		GF_TextSpan *span = (GF_TextSpan*) gf_list_get(stack->spans, 0);
 		gf_list_rem(stack->spans, 0);
 		gf_font_manager_delete_span(compositor->font_manager, span);
 	}
@@ -164,7 +163,7 @@
 					span->bounds.width += tspan->font_scale * (span->glyphs[k] ? span->glyphs[k]->horiz_advance : tspan->font->max_advance_h);
 				}
 			} else {
-				span->glyphs[0] = tspan->glyphs[FSLTR ? j : (len - j - 1) ];
+				//span->glyphs[0] = tspan->glyphs[FSLTR ? j : (len - j - 1) ];
 				span->glyphs[0] = tspan->glyphs[j];
 				span->bounds.width = tspan->font_scale * (span->glyphs[0] ? span->glyphs[0]->horiz_advance : tspan->font->max_advance_h);
 			}
@@ -272,7 +271,6 @@
 				}
 				/*word is bigger than allowed extent, rewrite 3 previous chars*/
 				if ((s32)size*tspan->font_scale >= -maxExtent) {
-					u32 k;
 					u32 nb_chars = (j<2) ? j : 3;
 
 					for (k=0; k<nb_chars; k++) {
@@ -486,7 +484,6 @@
 	*hl_color = 0;
 
 	fs_style = FSSTYLE;
-	hlight = NULL;
 	hlight = strstr(fs_style, "HIGHLIGHT");
 	if (hlight) hlight = strchr(hlight, '#');
 	if (hlight) {
@@ -700,32 +697,6 @@
 	gf_node_set_callback_function(node, Text_Traverse);
 }
 
-
-static void TraverseTextureText(GF_Node *node, void *rs, Bool is_destroy)
-{
-	TextStack *stack;
-	GF_Node *text;
-	GF_FieldInfo field;
-	if (is_destroy) return;
-	if (gf_node_get_field(node, 0, &field) != GF_OK) return;
-	if (field.fieldType != GF_SG_VRML_SFNODE) return;
-	text = *(GF_Node **)field.far_ptr;
-	if (!text) return;
-
-	if (gf_node_get_field(node, 1, &field) != GF_OK) return;
-	if (field.fieldType != GF_SG_VRML_SFBOOL) return;
-
-	if (gf_node_get_tag(text) != TAG_MPEG4_Text) return;
-	stack = (TextStack *) gf_node_get_private(text);
-	stack->texture_text_flag = *(SFBool*)field.far_ptr ? 1 : 0;
-}
-
-
-void compositor_init_texture_text(GF_Compositor *compositor, GF_Node *node)
-{
-	gf_node_set_callback_function(node, TraverseTextureText);
-}
-
 #ifndef GPAC_DISABLE_3D
 void compositor_extrude_text(GF_Node *node, GF_TraverseState *tr_state, GF_Mesh *mesh, MFVec3f *thespine, Fixed creaseAngle, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool txAlongSpine)
 {

gpac-0.8.0.tar.gz/src/compositor/mpeg4_textures.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_textures.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_timesensor.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_timesensor.c Changed

gpac-0.8.0.tar.gz/src/compositor/mpeg4_viewport.c -> gpac-1.0.0.tar.gz/src/compositor/mpeg4_viewport.c Changed

@@ -25,8 +25,7 @@
 
 #include "nodes_stacks.h"
 #include "visual_manager.h"
-/*for default scene view*/
-#include <gpac/internal/terminal_dev.h>
+
 #include <gpac/options.h>
 
 
@@ -44,18 +43,25 @@
 	n = (GF_Node*)gf_list_get(compositor->visual->view_stack, viewpoint_idx-1);
 	switch (gf_node_get_tag(n)) {
 	case TAG_MPEG4_Viewport:
-		*outName = ((M_Viewport*)n)->description.buffer;
-		*is_bound = ((M_Viewport*)n)->isBound;
+		if (outName)
+			*outName = ((M_Viewport*)n)->description.buffer;
+		if (is_bound)
+			*is_bound = ((M_Viewport*)n)->isBound;
 		return GF_OK;
 	case TAG_MPEG4_Viewpoint:
 #ifndef GPAC_DISABLE_X3D
 	case TAG_X3D_Viewpoint:
 #endif
-		*outName = ((M_Viewpoint*)n)->description.buffer;
-		*is_bound = ((M_Viewpoint*)n)->isBound;
+		if (outName)
+			*outName = ((M_Viewpoint*)n)->description.buffer;
+		if (is_bound)
+			*is_bound = ((M_Viewpoint*)n)->isBound;
 		return GF_OK;
 	default:
-		*outName = NULL;
+		if (outName)
+			*outName = NULL;
+		if (is_bound)
+			*is_bound = GF_FALSE;
 		return GF_OK;
 	}
 #else
@@ -114,7 +120,7 @@
 #ifndef GPAC_DISABLE_VRML
 
 
-#define VPCHANGED(__rend) { GF_Event evt; evt.type = GF_EVENT_VIEWPOINTS; gf_term_send_event(__rend->term, &evt); }
+#define VPCHANGED(__comp) { GF_Event evt; evt.type = GF_EVENT_VIEWPOINTS; gf_sc_send_event(__comp, &evt); }
 
 
 static void DestroyViewStack(GF_Node *node)
@@ -428,9 +434,11 @@
 
 static void navinfo_set_bind(GF_Node *node, GF_Route *route)
 {
-	ViewStack *st = (ViewStack *) gf_node_get_private(node);
-	Bindable_OnSetBind(node, st->reg_stacks, NULL);
-	gf_sc_invalidate( gf_sc_get_compositor(node), NULL);
+	if (node) {
+		ViewStack *st = (ViewStack *) gf_node_get_private(node);
+		Bindable_OnSetBind(node, st->reg_stacks, NULL);
+		gf_sc_invalidate( gf_sc_get_compositor(node), NULL);
+	}
 }
 
 static void TraverseNavigationInfo(GF_Node *node, void *rs, Bool is_destroy)
@@ -525,7 +533,8 @@
 	if (ni->avatarSize.count>1) tr_state->camera->avatar_size.y = gf_mulfix(scale, ni->avatarSize.vals[1]);
 	if (ni->avatarSize.count>2) tr_state->camera->avatar_size.z = gf_mulfix(scale, ni->avatarSize.vals[2]);
 
-	if (0 && tr_state->pixel_metrics) {
+#if 0
+	if (tr_state->pixel_metrics) {
 		u32 s = MAX(tr_state->visual->width, tr_state->visual->height);
 		s /= 2;
 //		tr_state->camera->speed = ni->speed;
@@ -536,6 +545,8 @@
 	}
 #endif
 
+#endif
+
 }
 
 void compositor_init_navigation_info(GF_Compositor *compositor, GF_Node *node)
@@ -551,6 +562,12 @@
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, TraverseNavigationInfo);
 	((M_NavigationInfo*)node)->on_set_bind = navinfo_set_bind;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		navinfo_set_bind(NULL, NULL);
+	}
+#endif
 }

gpac-0.8.0.tar.gz/src/compositor/navigate.c -> gpac-1.0.0.tar.gz/src/compositor/navigate.c Changed

@@ -26,7 +26,6 @@
 #include "nodes_stacks.h"
 #include "visual_manager.h"
 #include <gpac/options.h>
-#include <gpac/terminal.h>
 
 
 #ifndef GPAC_DISABLE_3D
@@ -274,6 +273,11 @@
 	camera_set_vectors(cam, pos, cam->vp_orientation, cam->fieldOfView);
 	cam->position = diff;
 	camera_move_to(cam, pos, cam->target, cam->up);
+	if (!compositor->player) {
+		camera_stop_anim(cam);
+		camera_set_vectors(cam, cam->end_pos, cam->end_ori, cam->end_fov);
+	}
+
 	cam->examine_center = tr_state.bbox.center;
 	cam->flags |= CF_STORE_VP;
 	if (cam->z_far < dist) cam->z_far = 10*dist;
@@ -394,7 +398,7 @@
 		key_trans*=4;
 	}
 
-	if (!gf_term_get_option(compositor->term, GF_OPT_ORIENTATION_SENSORS_ACTIVE)) {
+	if (! compositor->orientation_sensors_active) {
 		Fixed yaw, pitch, roll;
 		gf_mx_get_yaw_pitch_roll(&compositor->visual->camera.modelview, &yaw, &pitch, &roll);
 		compositor->audio_renderer->yaw = yaw;
@@ -432,7 +436,8 @@
 		break;
 
 	case GF_EVENT_MOUSEMOVE:
-		if (gf_term_get_option(compositor->term, GF_OPT_ORIENTATION_SENSORS_ACTIVE)) return 0;
+		if (compositor->orientation_sensors_active) return 0;
+
 		if (!compositor->navigation_state) {
 			if (cam->navigate_mode==GF_NAVIGATE_GAME) {
 				/*init mode*/
@@ -479,6 +484,34 @@
 		}
 		return 1;
 
+	case GF_EVENT_MULTITOUCH:
+		compositor->auto_rotate=0;
+		compositor->navigation_state = 0;
+		if (ev->mtouch.num_fingers==2) {
+			if( ABS(ev->mtouch.pinch) * 100 > 2 ) {
+				if (cam->is_3D) {
+					view_translate_z(compositor, cam, gf_mulfix(cam->width, compositor->visual->width* ev->mtouch.pinch));
+				} else {
+					nav_set_zoom_trans_2d(compositor->visual, zoom + gf_mulfix(trans_scale, ev->mtouch.pinch), 0, 0);
+				}
+				return 1;
+			}
+			if( ABS(ev->mtouch.rotation) > GF_PI/40 ) {
+				view_roll(compositor, cam, gf_mulfix(ev->mtouch.rotation, trans_scale));
+				return 1;
+			}
+		} else if (ev->mtouch.num_fingers==3) {
+			compositor->visual->camera.start_zoom = compositor->zoom;
+			compositor->zoom = FIX_ONE;
+			compositor->interoccular_offset = 0;
+			compositor->focdist = 0;
+			compositor->interoccular_offset = 0;
+			compositor->focdist = 0;
+			compositor_3d_reset_camera(compositor);
+			return 1;
+		}
+		return 0;
+
 	case GF_EVENT_MOUSEUP:
 		compositor->auto_rotate=0;
 		if (ev->mouse.button==GF_MOUSE_LEFT) compositor->navigation_state = 0;
@@ -504,9 +537,9 @@
 				compositor->visual->camera.start_zoom = compositor->zoom;
 				compositor->zoom = FIX_ONE;
 				compositor->interoccular_offset = 0;
-				compositor->focus_distance = 0;
+				compositor->focdist = 0;
 				compositor->interoccular_offset = 0;
-				compositor->focus_distance = 0;
+				compositor->focdist = 0;
 				compositor_3d_reset_camera(compositor);
 			}
 			break;
@@ -523,9 +556,9 @@
 			if (keys & GF_KEY_MOD_ALT) {
 				if ( (keys & GF_KEY_MOD_SHIFT) && (compositor->visual->nb_views > 1) ) {
 					/*+ or - 10 cm*/
-					compositor->focus_distance += INT2FIX(key_inv);
+					compositor->focdist += INT2FIX(key_inv);
 					cam->flags |= CAM_IS_DIRTY;
-					fprintf(stderr, "AutoStereo view distance %f - focus %f\n", FIX2FLT(compositor->video_out->view_distance)/100, FIX2FLT(compositor->focus_distance)/100);
+					fprintf(stderr, "AutoStereo view distance %f - focus %f\n", FIX2FLT(compositor->video_out->dispdist)/100, FIX2FLT(compositor->focdist)/100);
 					gf_sc_invalidate(compositor, NULL);
 					return 1;
 				}
@@ -565,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->interoccular_distance + compositor->interoccular_offset));
+					fprintf(stderr, "AutoStereo interoccular distance %f\n", FIX2FLT(compositor->iod + compositor->interoccular_offset));
 					cam->flags |= CAM_IS_DIRTY;
 					gf_sc_invalidate(compositor, NULL);
 					return 1;
@@ -618,7 +651,7 @@
 			break;
 		case GF_KEY_D:
 			if (keys & GF_KEY_MOD_CTRL) {
-				compositor->tile_visibility_debug = !compositor->tile_visibility_debug;
+				compositor->tvtd = !compositor->tvtd;
 				gf_sc_invalidate(compositor, NULL);
 				return 1;
 			}
@@ -633,7 +666,7 @@
 			break;
 		case GF_KEY_A:
 			if (keys & GF_KEY_MOD_CTRL) {
-				compositor->force_all_tiles_visible = !compositor->force_all_tiles_visible;
+				compositor->tvtf = !compositor->tvtf;
 				gf_sc_invalidate(compositor, NULL);
 				return 1;
 			}
@@ -642,7 +675,7 @@
 		break;
 	case GF_EVENT_SENSOR_ORIENTATION:
 	{
-		Fixed x, y, z, w, yaw, /*pitch, */roll;
+		Fixed z, w, yaw, /*pitch, */roll;
 		GF_Vec target;
 		GF_Matrix mx;
 
@@ -758,6 +791,26 @@
 			return 0;
 		}
 		break;
+	case GF_EVENT_MULTITOUCH:
+		if (ev->mtouch.num_fingers==2) {
+			if( ABS(ev->mtouch.pinch) * 100 > 2 ) {
+				new_zoom = zoom + ev->mtouch.pinch * MIN(visual->width, visual->height)/100;
+				nav_set_zoom_trans_2d(visual, new_zoom, 0, 0);
+				return 1;
+			}
+			if( ABS(ev->mtouch.rotation) > GF_PI/40 ) {
+				visual->compositor->rotation -= ev->mtouch.rotation;
+				nav_set_zoom_trans_2d(visual, zoom, 0, 0);
+				return 1;
+			}
+		} else if (ev->mtouch.num_fingers==3) {
+			visual->compositor->trans_x = visual->compositor->trans_y = 0;
+			visual->compositor->rotation = 0;
+			visual->compositor->zoom = FIX_ONE;
+			nav_set_zoom_trans_2d(visual, FIX_ONE, 0, 0);
+			return 1;
+		}
+		return 0;
 
 	case GF_EVENT_MOUSEWHEEL:
 		switch (navigation_mode) {
@@ -836,7 +889,7 @@
 		case GF_KEY_UP:
 			if (navigation_mode == GF_NAVIGATE_SLIDE) {
 				if (keys & GF_KEY_MOD_CTRL) {
-					Fixed new_zoom = zoom;
+					new_zoom = zoom;
 					if (new_zoom > FIX_ONE) new_zoom += key_inv*FIX_ONE/10;
 					else new_zoom += key_inv*FIX_ONE/20;
 					nav_set_zoom_trans_2d(visual, new_zoom, 0, 0);

gpac-0.8.0.tar.gz/src/compositor/nodes_stacks.h -> gpac-1.0.0.tar.gz/src/compositor/nodes_stacks.h Changed

@@ -131,6 +131,27 @@
 } BackgroundStack;
 #endif
 
+#ifndef GPAC_DISABLE_SVG
+typedef struct
+{
+	GF_TextureHandler txh;
+	Drawable *drawable;
+	MFURL txurl;
+	Bool first_frame_fetched;
+	GF_Node *audio;
+	Bool audio_dirty;
+	Bool stop_requested;
+} SVG_video_stack;
+
+typedef struct
+{
+	GF_AudioInput input;
+	Bool is_active, is_error;
+	MFURL aurl;
+} SVG_audio_stack;
+
+#endif
+
 
 typedef struct
 {
@@ -270,13 +291,13 @@
 void compositor_extrude_text(GF_Node *node, GF_TraverseState *tr_state, GF_Mesh *mesh, MFVec3f *thespine, Fixed creaseAngle, Bool begin_cap, Bool end_cap, MFRotation *spine_ori, MFVec2f *spine_scale, Bool txAlongSpine);
 #endif
 
-void compositor_init_texture_text(GF_Compositor *compositor, GF_Node *node);
-
 void compositor_init_envtest(GF_Compositor *compositor, GF_Node *node);
 void compositor_envtest_modified(GF_Node *node);
 void compositor_evaluate_envtests(GF_Compositor *compositor, u32 param_type);
 
+#ifdef GPAC_ENABLE_FLASHSHAPE
 void compositor_init_hc_flashshape(GF_Compositor *compositor, GF_Node *node);
+#endif
 
 #endif /*GPAC_DISABLE_VRML*/
 
@@ -318,8 +339,11 @@
 
 void compositor_init_svg_updates(GF_Compositor *compositor, GF_Node *node);
 
+#ifdef GPAC_ENABLE_SVG_FILTERS
 void compositor_init_svg_filter(GF_Compositor *compositor, GF_Node *node);
 void svg_draw_filter(GF_Node *filter, GF_Node *node, GF_TraverseState *tr_state);
+#endif
+
 
 GF_TextureHandler *compositor_svg_get_gradient_texture(GF_Node *node);
 GF_TextureHandler *compositor_svg_get_image_texture(GF_Node *node);

gpac-1.0.0.tar.gz/src/compositor/object_manager.c Added

@@ -0,0 +1,1967 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/internal/compositor_dev.h>
+#include <gpac/constants.h>
+
+GF_EXPORT
+GF_ObjectManager *gf_odm_new()
+{
+	GF_ObjectManager *tmp;
+	GF_SAFEALLOC(tmp, GF_ObjectManager);
+	if (!tmp) return NULL;
+
+#ifndef GPAC_DISABLE_VRML
+	tmp->ms_stack = gf_list_new();
+	tmp->mc_stack = gf_list_new();
+#endif
+	return tmp;
+}
+
+void gf_odm_reset_media_control(GF_ObjectManager *odm, Bool signal_reset)
+{
+#ifndef GPAC_DISABLE_VRML
+	MediaSensorStack *media_sens;
+	MediaControlStack *media_ctrl;
+
+	while ((media_sens = (MediaSensorStack *)gf_list_last(odm->ms_stack))) {
+		MS_Stop(media_sens);
+		/*and detach from stream object*/
+		media_sens->stream = NULL;
+		gf_list_rem_last(odm->ms_stack);
+	}
+
+	while ((media_ctrl = (MediaControlStack *)gf_list_last(odm->mc_stack))) {
+		if (signal_reset)
+			gf_odm_remove_mediacontrol(odm, media_ctrl);
+		media_ctrl->stream = NULL;
+		media_ctrl->ck = NULL;
+		gf_list_rem_last(odm->mc_stack);
+	}
+#endif
+}
+
+
+void gf_odm_del(GF_ObjectManager *odm)
+{
+	if (odm->addon && (odm->addon->root_od==odm)) {
+		odm->addon->root_od = NULL;
+		odm->addon->started = 0;
+	}
+	if (odm->upper_layer_odm) {
+		odm->upper_layer_odm->lower_layer_odm = NULL;
+	}
+	if (odm->lower_layer_odm) {
+		odm->lower_layer_odm->upper_layer_odm = NULL;
+	}
+
+	/*detach media object as referenced by the scene - this should ensures that any attempt to lock the ODM from the
+	compositor will fail as the media object is no longer linked to object manager*/
+	if (odm->mo) odm->mo->odm = NULL;
+
+#ifndef GPAC_DISABLE_VRML
+	gf_odm_reset_media_control(odm, 0);
+	gf_list_del(odm->ms_stack);
+	gf_list_del(odm->mc_stack);
+#endif
+
+	if (odm->type == GF_STREAM_INTERACT)
+		gf_input_sensor_delete(odm);
+
+	if (odm->raw_frame_sema) gf_sema_del(odm->raw_frame_sema);
+
+	if (odm->pid) gf_filter_pid_set_udta(odm->pid, NULL);
+	if (odm->extra_pids) {
+		while (gf_list_count(odm->extra_pids)) {
+			GF_ODMExtraPid *xpid = gf_list_pop_back(odm->extra_pids);
+			if (xpid->pid) gf_filter_pid_set_udta(xpid->pid, NULL);
+			gf_free(xpid);
+		}
+		gf_list_del(odm->extra_pids);
+	}
+	gf_free(odm);
+}
+
+
+void gf_odm_register_pid(GF_ObjectManager *odm, GF_FilterPid *pid, Bool register_only)
+{
+	u32 es_id=0;
+	const GF_PropertyValue *prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+	if (!prop) prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (prop) es_id = prop->value.uint;
+
+	if (! odm->pid) {
+		odm->pid = pid;
+		odm->pid_id = es_id;
+	} else {
+		GF_ODMExtraPid *xpid;
+		if (!odm->extra_pids) odm->extra_pids = gf_list_new();
+		GF_SAFEALLOC(xpid, GF_ODMExtraPid);
+		if (xpid) {
+			xpid->pid = pid;
+			xpid->pid_id = es_id;
+			gf_list_add(odm->extra_pids, xpid);
+		}
+	}
+
+	if (register_only) return;
+
+	gf_odm_setup_object(odm, odm->subscene ? odm->scene_ns : odm->parentscene->root_od->scene_ns, pid);
+}
+
+//this function is not exposed and shall only be used for the reset scene event
+//it sends the event synchronously, as needed for gf_term_disconnect()
+void gf_filter_pid_exec_event(GF_FilterPid *pid, GF_FilterEvent *evt);
+
+GF_EXPORT
+void gf_odm_disconnect(GF_ObjectManager *odm, u32 do_remove)
+{
+	GF_Compositor *compositor = odm->parentscene ? odm->parentscene->compositor : odm->subscene->compositor;
+
+	if (odm->skip_disconnect_state) {
+		if (do_remove) odm->skip_disconnect_state = 2;
+		return;
+	}
+	gf_odm_stop(odm, GF_TRUE);
+
+	/*disconnect sub-scene*/
+	if (odm->subscene) {
+		//send a scene reset
+		if (odm->pid) {
+			GF_FilterEvent fevt;
+
+			GF_FEVT_INIT(fevt, GF_FEVT_RESET_SCENE, odm->pid);
+			fevt.attach_scene.object_manager = odm;
+			gf_filter_pid_exec_event(odm->pid, &fevt);
+		}
+		gf_scene_disconnect(odm->subscene, do_remove ? GF_TRUE : GF_FALSE);
+	}
+	else if (odm->pid) {
+		GF_FilterEvent fevt;
+		switch (odm->type) {
+		case GF_STREAM_SCENE:
+		case GF_STREAM_OD:
+		case GF_STREAM_PRIVATE_SCENE:
+		case GF_STREAM_TEXT:
+			GF_FEVT_INIT(fevt, GF_FEVT_RESET_SCENE, odm->pid);
+			fevt.attach_scene.object_manager = odm;
+			fevt.attach_scene.on_pid = odm->pid;
+			gf_filter_pid_exec_event(odm->pid, &fevt);
+			break;
+		}
+	}
+	/*no destroy*/
+	if (!do_remove) return;
+
+	/*unload the decoders before deleting the channels to prevent any access fault*/
+	if (odm->type==GF_STREAM_INTERACT) {
+		u32 i, count;
+		// Remove all Registered InputSensor nodes -> shut down the InputSensor threads -> prevent illegal access on deleted pointers
+		GF_MediaObject *obj = odm->mo;
+		count = gf_mo_event_target_count(obj);
+		for (i=0; i<count; i++) {
+			GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, i));
+			switch (gf_node_get_tag(n)) {
+#ifndef GPAC_DISABLE_VRML
+			case TAG_MPEG4_InputSensor:
+				((M_InputSensor*)n)->enabled = 0;
+				InputSensorModified(n);
+				break;
+#endif
+			default:
+				break;
+			}
+		}
+	}
+
+	/*detach from network service */
+	if (odm->scene_ns) {
+		GF_Scene *scene = odm->parentscene;
+		GF_SceneNamespace *ns = odm->scene_ns;
+		if (ns->nb_odm_users) ns->nb_odm_users--;
+		if (ns->owner == odm) {
+			/*detach it!!*/
+			ns->owner = NULL;
+			/*try to assign a new root in case this is not scene shutdown*/
+			if (ns->nb_odm_users && odm->parentscene) {
+				GF_ObjectManager *new_root;
+				u32 i = 0;
+				while ((new_root = (GF_ObjectManager *)gf_list_enum(odm->parentscene->resources, &i)) ) {
+					if (new_root == odm) continue;
+					if (new_root->scene_ns != ns) continue;
+
+					ns->owner = new_root;
+					break;
+				}
+			}
+			if (!ns->owner) ns->nb_odm_users=0;
+		}
+		scene = scene ? gf_scene_get_root_scene(scene) : NULL;
+		odm->scene_ns = NULL;
+		if (!ns->nb_odm_users && scene) gf_scene_ns_del(ns, scene);
+	}
+
+
+	/*delete from the parent scene.*/
+	if (odm->parentscene) {
+		GF_Event evt;
+		if ((odm->type == GF_STREAM_AUDIO) && odm->parentscene->compositor->audio_renderer->nb_audio_objects)
+			odm->parentscene->compositor->audio_renderer->nb_audio_objects--;
+
+		if (odm->addon) {
+			gf_list_del_item(odm->parentscene->declared_addons, odm->addon);
+			gf_scene_reset_addon(odm->addon, GF_FALSE);
+			odm->addon = NULL;
+		}
+
+		evt.type = GF_EVENT_CONNECT;
+		evt.connect.is_connected = GF_FALSE;
+		gf_filter_forward_gf_event(odm->parentscene->compositor->filter, &evt, GF_FALSE, GF_TRUE);
+
+		gf_scene_remove_object(odm->parentscene, odm, do_remove);
+		if (odm->subscene) gf_scene_del(odm->subscene);
+		gf_odm_del(odm);
+		return;
+	}
+
+	/*this is the scene root OD (may be a remote OD ..) */
+	if (odm->subscene) {
+		GF_Event evt;
+
+		evt.type = GF_EVENT_CONNECT;
+		evt.connect.is_connected = GF_FALSE;
+		gf_sc_send_event(compositor, &evt);
+		gf_scene_del(odm->subscene);
+	}
+
+	/*delete the ODMan*/
+	gf_odm_del(odm);
+}
+
+static Bool gf_odm_should_auto_select(GF_ObjectManager *odm)
+{
+	u32 i, count;
+	if (odm->type == GF_STREAM_SCENE) return GF_TRUE;
+	//TODO- detect image media to start playback right away
+	//if (odm->type == GF_STREAM_VISUAL) return GF_TRUE;
+
+	if (odm->parentscene && !odm->parentscene->is_dynamic_scene) {
+		return GF_TRUE;
+	}
+
+	if (odm->parentscene && odm->parentscene->root_od->addon) {
+		if (odm->parentscene->root_od->addon->addon_type == GF_ADDON_TYPE_MAIN)
+			return GF_FALSE;
+	}
+
+	count = gf_list_count(odm->parentscene->resources);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *an_odm = gf_list_get(odm->parentscene->resources, i);
+		if (an_odm==odm) continue;
+		if (an_odm->type != odm->type) continue;
+		//same type - if the first one has been autumatically activated, do not activate this one
+		if (an_odm->state == GF_ODM_STATE_PLAY) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+
+void gf_odm_setup_remote_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, char *remote_url)
+{
+	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));
+		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));
+			return;
+		}
+
+		odm->scene_ns = parent_ns ? parent_ns : odm->parentscene->root_od->scene_ns;
+		if (odm->scene_ns)
+			odm->scene_ns->nb_odm_users++;
+	}
+
+	/*store original OD ID */
+	if (!odm->media_current_time)
+		odm->media_current_time = odm->ID;
+
+	//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));
+
+	/*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)) {
+		odm->subscene = gf_scene_new(NULL, odm->parentscene);
+		odm->subscene->root_od = odm;
+		//scenes are by default dynamic
+		odm->subscene->is_dynamic_scene = GF_TRUE;
+	}
+	parent_url = parent_ns ? parent_ns->url : NULL;
+	if (parent_url && !strnicmp(parent_url, "views://", 8))
+		parent_url = NULL;
+
+	//make sure we don't have an ID before attempting to connect
+	if (odm->ID == GF_MEDIA_EXTERNAL_ID) {
+		odm->ID = 0;
+	}
+	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_EXPORT
+void gf_odm_setup_object(GF_ObjectManager *odm, GF_SceneNamespace *parent_ns, GF_FilterPid *for_pid)
+{
+	GF_Err e;
+
+	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));
+			return;
+		}
+		odm->scene_ns = parent_ns;
+		odm->scene_ns->nb_odm_users++;
+	}
+
+	/*restore OD ID */
+	if (odm->media_current_time) {
+		odm->ID = odm->media_current_time;
+		odm->media_current_time = 0;
+		odm->flags |= GF_ODM_REMOTE_OD;
+	}
+
+	if (odm->scene_ns->owner &&  (odm->scene_ns->owner->flags & GF_ODM_INHERIT_TIMELINE)) {
+		odm->flags |= GF_ODM_INHERIT_TIMELINE;
+	}
+
+	/*empty object, use a dynamic scene*/
+	if (! odm->pid && odm->subscene) {
+		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"));
+
+		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) ));
+		}
+	}
+
+	if (odm->pid && !odm->buffer_playout_us) {
+		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;
+
+		//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_TIMESHIFT_DEPTH);
+		if (prop && prop->value.frac.den) {
+			tsdepth = (u32) ( ((u64)prop->value.frac.num) * 1000  / prop->value.frac.den);
+		}
+		gf_odm_set_timeshift_depth(odm, tsdepth);
+
+		if (odm->buffer_playout_us > odm->buffer_max_us) odm->buffer_max_us = odm->buffer_playout_us;
+
+		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;
+		}
+		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;
+		gf_filter_pid_send_event(NULL, &evt);
+
+		if (odm->buffer_min_us>evt.buffer_req.max_playout_us)
+			odm->buffer_min_us = 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);
+		}
+
+		/*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);
+		}
+#endif
+		if (odm->pid && (odm->pid==for_pid)) {
+			evt.type = GF_EVENT_CONNECT;
+			evt.connect.is_connected = GF_TRUE;
+			gf_filter_forward_gf_event(odm->parentscene->compositor->filter, &evt, GF_FALSE, GF_TRUE);
+		}
+	} 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));
+		if (odm->subscene) {
+			GF_Event evt;
+			evt.type = GF_EVENT_CONNECT;
+			evt.connect.is_connected = GF_TRUE;
+			gf_sc_send_event(odm->subscene->compositor, &evt);
+		}
+	}
+
+
+	/* start object*/
+	/*object is already started (new PID was inserted for this object)*/
+	if (odm->state==GF_ODM_STATE_PLAY) {
+		if (odm->pid==for_pid)
+			odm->state = GF_ODM_STATE_STOP;
+		gf_odm_start(odm);
+	}
+	/*object is the root, always start*/
+	else if (!odm->parentscene) {
+		assert(odm->subscene && (odm->subscene->root_od==odm));
+		odm->flags &= ~GF_ODM_NOT_SETUP;
+		gf_odm_start(odm);
+	}
+	/*object is a pure OCR object - connect*/
+	else if (odm->type==GF_STREAM_OCR) {
+		odm->flags &= ~GF_ODM_NOT_SETUP;
+		gf_odm_start(odm);
+	}
+	/*if the object is inserted from a broadcast, start it if not already done. This covers cases where the scene (BIFS, LASeR) and
+	the media (images) are both carrouseled and the carrousels are interleaved. If we wait for the scene to trigger a PLAY, we will likely
+	have to wait for an entire image carousel period to start filling the buffers, which is sub-optimal
+	we also force a prefetch for object declared outside the OD stream to make sure we don't loose any data before object declaration and play
+	as can be the case with MPEG2 TS (first video packet right after the PMT) - this should be refined*/
+	else if ( ((odm->flags & GF_ODM_NO_TIME_CTRL) || (odm->flags & GF_ODM_NOT_IN_OD_STREAM)) && gf_odm_should_auto_select(odm) && (odm->parentscene->selected_service_id == odm->ServiceID)) {
+		Bool force_play = GF_FALSE;
+
+		if (odm->state==GF_ODM_STATE_STOP) {
+			odm->flags |= GF_ODM_PREFETCH;
+			force_play = GF_TRUE;
+		}
+
+		if (force_play) {
+			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));
+			odm->flags &= ~GF_ODM_NOT_SETUP;
+			gf_odm_start(odm);
+		}
+	}
+
+	odm->flags &= ~GF_ODM_NOT_SETUP;
+
+	/*for objects inserted by user (subs & co), auto select*/
+	if (odm->parentscene && odm->parentscene->is_dynamic_scene
+	        && (odm->ID==GF_MEDIA_EXTERNAL_ID)
+	        && (odm->flags & GF_ODM_REMOTE_OD)
+	   ) {
+		GF_Event evt;
+
+		if (odm->addon) {
+			Bool role_set = 0;
+
+			if (odm->addon->addon_type >= GF_ADDON_TYPE_MAIN) return;
+
+			//check role - for now look into URL, we need to inspect DASH roles
+			if (odm->mo && odm->mo->URLs.count && odm->mo->URLs.vals[0].url) {
+				char *sep = strchr(odm->mo->URLs.vals[0].url, '?');
+				if (sep && strstr(sep, "role=main")) {
+					odm->addon->addon_type = GF_ADDON_TYPE_MAIN;
+					role_set = 1;
+				}
+			}
+
+			if (!role_set) {
+				const GF_PropertyValue *prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_ROLE);
+				if (prop && prop->value.string && !strcmp(prop->value.string, "main")) {
+					odm->addon->addon_type = GF_ADDON_TYPE_MAIN;
+				}
+			}
+
+
+			if (odm->addon->addon_type == GF_ADDON_TYPE_ADDITIONAL) {
+				gf_scene_select_object(odm->parentscene, odm);
+			}
+			return;
+		}
+
+		if (!odm->parentscene) {
+			evt.type = GF_EVENT_STREAMLIST;
+			gf_sc_send_event(odm->parentscene->compositor, &evt);
+			return;
+		}
+	} else if (odm->parentscene) {
+		const GF_PropertyValue *prop = gf_filter_pid_get_property(for_pid ? for_pid : odm->pid, GF_PROP_PID_ROLE);
+		if (prop && prop->value.string && !strncmp(prop->value.string, "ambi", 4)) {
+			odm->ambi_ch_id = atoi(prop->value.string + 4);
+			if (odm->ambi_ch_id > odm->parentscene->ambisonic_type)
+				odm->parentscene->ambisonic_type = odm->ambi_ch_id;
+		}
+	}
+}
+
+/*setup channel, clock and query caps*/
+GF_EXPORT
+GF_Err gf_odm_setup_pid(GF_ObjectManager *odm, GF_FilterPid *pid)
+{
+	GF_Clock *ck;
+	GF_List *ck_namespace;
+	s8 flag;
+	u32 clockID;
+	GF_Scene *scene;
+	Bool clock_inherited = GF_TRUE;
+	const GF_PropertyValue *prop;
+	u32 OD_OCR_ID=0;
+	u32 es_id=0;
+
+	/*find the clock for this new channel*/
+	ck = NULL;
+	flag = (s8) -1;
+	if (!pid) pid = odm->pid;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode() && pid) {
+		GF_FilterPidStatistics stats;
+		gf_filter_pid_get_statistics(pid, &stats, GF_STATS_DECODER_SOURCE);
+		gf_filter_pid_get_packet_count(pid);
+	}
+#endif
+
+	if (odm->ck) {
+		ck = odm->ck;
+		goto clock_setup;
+	}
+
+	/*sync reference*/
+	if (odm->sync_ref && odm->sync_ref->odm) {
+		ck = odm->sync_ref->odm->ck;
+		goto clock_setup;
+	}
+	/*timeline override*/
+	if (odm->flags & GF_ODM_INHERIT_TIMELINE) {
+		ck = odm->parentscene->root_od->ck;
+
+		/**/
+		if (!ck) {
+			GF_ObjectManager *odm_par = odm->parentscene->root_od->parentscene->root_od;
+			while (odm_par) {
+				ck = odm_par->ck;
+
+				if (ck) break;
+
+				odm_par = (odm_par->parentscene && odm_par->parentscene->root_od->parentscene ) ? odm_par->parentscene->root_od->parentscene->root_od : NULL;
+			}
+		}
+		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));
+	}
+
+	/*get clocks namespace (eg, parent scene)*/
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
+	if (!scene) return GF_BAD_PARAM;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CLOCK_ID);
+	if (prop) OD_OCR_ID = prop->value.uint;
+
+	ck_namespace = odm->scene_ns->clocks;
+	odm->set_speed = odm->scene_ns->set_speed;
+
+	/*little trick for non-OD addressing: if object is a remote one, and service owner already has clocks,
+	override OCR. This will solve addressing like file.avi#audio and file.avi#video*/
+	if (!OD_OCR_ID && (odm->flags & GF_ODM_REMOTE_OD) && (gf_list_count(ck_namespace)==1) ) {
+		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)*/
+	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)) {
+			ck = (GF_Clock*)gf_list_get(parent_od->scene_ns->clocks, 0);
+			if (!odm->ServiceID || (odm->ServiceID==ck->service_id)) {
+				goto clock_setup;
+			}
+		}
+	}
+
+	/*do we have an OCR specified*/
+	clockID = OD_OCR_ID;
+	/*if OCR stream force self-synchro !!*/
+	if (odm->type == GF_STREAM_OCR) clockID = odm->ID;
+	if (!clockID) {
+		if (odm->ID == GF_MEDIA_EXTERNAL_ID) {
+			clockID = (u32) (intptr_t) odm->scene_ns;
+		} else {
+			clockID = odm->ID;
+		}
+	}
+
+	/*override clock dependencies if specified*/
+	if (scene->compositor->sclock) {
+		GF_Scene *parent = gf_scene_get_root_scene(scene);
+		clockID = scene->root_od->ck->clock_id;
+		ck_namespace = parent->root_od->scene_ns->clocks;
+		assert(ck_namespace);
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+	if (!prop) prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (prop) es_id = prop->value.uint;
+
+	ck = gf_clock_attach(ck_namespace, scene, clockID, es_id, flag);
+	if (!ck) return GF_OUT_OF_MEM;
+
+	ck->service_id = odm->ServiceID;
+	clock_inherited = GF_FALSE;
+
+	if (es_id==ck->clock_id)
+		odm->owns_clock = GF_TRUE;
+
+	if (scene->root_od->subscene && scene->root_od->subscene->is_dynamic_scene && !scene->root_od->ck)
+		scene->root_od->ck = ck;
+
+clock_setup:
+	assert(ck);
+	odm->ck = ck;
+	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;
+		}
+	}
+
+	gf_odm_update_duration(odm, pid);
+	/*regular setup*/
+	return GF_OK;
+}
+
+void gf_odm_update_duration(GF_ObjectManager *odm, GF_FilterPid *pid)
+{
+	u64 dur=0;
+	GF_PropertyEntry *pe = NULL;
+	const GF_PropertyValue *prop;
+	prop = gf_filter_pid_get_info(pid, GF_PROP_PID_DURATION, &pe);
+	if (prop) {
+		dur = prop->value.lfrac.num;
+		dur *= 1000;
+		if (prop->value.lfrac.den) dur /= prop->value.lfrac.den;
+	}
+	gf_filter_release_property(pe);
+	
+	if ((u32) dur > odm->duration) {
+		odm->duration = (u32) dur;
+		/*update scene duration*/
+		gf_scene_set_duration(odm->subscene ? odm->subscene : odm->parentscene);
+	}
+}
+
+/*this is the tricky part: make sure the net is locked before doing anything since an async service
+reply could destroy the object we're queuing for play*/
+void gf_odm_start(GF_ObjectManager *odm)
+{
+	/*object is not started - issue channel setup requests*/
+	if (!odm->state) {
+		/*look for a given segment name to play*/
+		if (odm->subscene) {
+			char *url, *frag=NULL;
+			assert(odm->subscene->root_od==odm);
+
+			url = (odm->mo && odm->mo->URLs.count) ? odm->mo->URLs.vals[0].url : odm->scene_ns->url;
+			frag = strrchr(url, '#');
+
+			if (frag) {
+				GF_Segment *seg = gf_odm_find_segment(odm, frag+1);
+				if (seg) {
+					odm->media_start_time = (u64) ((s64) seg->startTime*1000);
+					odm->media_stop_time =  (u64) ((s64) (seg->startTime + seg->Duration)*1000);
+				}
+			}
+		}
+	}
+	gf_odm_play(odm);
+}
+
+void gf_odm_play(GF_ObjectManager *odm)
+{
+	u64 range_end;
+	Bool media_control_paused = 0;
+	Bool start_range_is_clock = 0;
+	Double ck_time;
+	GF_Clock *clock = odm->ck;
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+#endif
+	GF_FilterEvent com;
+	GF_Clock *parent_ck = NULL;
+
+	if (!scene) return;
+	
+	if (odm->mo && odm->mo->pck && !(odm->flags & GF_ODM_PREFETCH)) {
+		/*reset*/
+		gf_filter_pck_unref(odm->mo->pck);
+		odm->mo->pck = NULL;
+	}
+
+	if (odm->parentscene) {
+		parent_ck = gf_odm_get_media_clock(odm->parentscene->root_od);
+		if (!gf_odm_shares_clock(odm, parent_ck)) parent_ck = NULL;
+	}
+
+	//PID not yet attached, mark as state_play and wait for error or OK
+	if (!odm->pid ) {
+		odm->state = GF_ODM_STATE_PLAY;
+		return;
+	}
+
+	if ( !(odm->flags & GF_ODM_INHERIT_TIMELINE) && odm->owns_clock ) {
+		gf_clock_reset(clock);
+	}
+
+	range_end = odm->media_stop_time;
+
+	/*send play command*/
+	GF_FEVT_INIT(com, GF_FEVT_PLAY, odm->pid)
+
+	if (odm->flags & GF_ODM_INITIAL_BROADCAST_PLAY) {
+		odm->flags &= ~GF_ODM_INITIAL_BROADCAST_PLAY;
+		com.play.initial_broadcast_play = 1;
+	}
+
+	/*play from requested time (seeking or non-mpeg4 media control)*/
+	if (odm->media_start_time && !clock->clock_init) {
+		ck_time = (Double) (s64) odm->media_start_time;
+		ck_time /= 1000;
+	}
+	else if (odm->parentscene && odm->parentscene->root_od->media_start_time && !clock->clock_init) {
+		ck_time = (Double) (s64) odm->parentscene->root_od->media_start_time;
+		ck_time /= 1000;
+	}
+	/*play from current time*/
+	else {
+		ck_time = gf_clock_media_time(clock);
+		ck_time /= 1000;
+		start_range_is_clock = 1;
+	}
+
+	/*handle initial start - MPEG-4 is a bit annoying here, streams are not started through OD but through
+	scene nodes. If the stream runs on the BIFS/OD clock, the clock is already started at this point and we're
+	sure to get at least a one-frame delay in PLAY, so just remove it - note we're generous but this shouldn't hurt*/
+	if (ck_time<=0.5) ck_time = 0;
+
+
+	/*adjust time for addons*/
+	if (odm->parentscene && odm->parentscene->root_od->addon) {
+		com.play.initial_broadcast_play = 0;
+		//addon timing is resolved against timestamps, not media time
+		if (start_range_is_clock) {
+			if (!gf_clock_is_started(clock)) {
+				ck_time = (Double) odm->parentscene->root_od->addon->media_pts;
+				ck_time /= 90000;
+			} else {
+				ck_time = gf_clock_time(clock);
+				ck_time /= 1000;
+			}
+		}
+		ck_time = gf_scene_adjust_time_for_addon(odm->parentscene->root_od->addon, ck_time, &com.play.timestamp_based);
+		//we are having a play request for an addon without the main content being active - we no longer have timestamp info from the main content
+		if (!clock->clock_init && com.play.timestamp_based)
+			com.play.timestamp_based = 2;
+
+		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;
+
+	if (range_end) {
+		com.play.end_range = (s64) range_end / 1000.0;
+	} else {
+		if (!odm->subscene && odm->parentscene && gf_odm_shares_clock(odm->parentscene->root_od, clock)
+				&& (odm->parentscene->root_od->media_stop_time != odm->parentscene->root_od->duration)
+		) {
+			com.play.end_range = (s64) odm->parentscene->root_od->media_stop_time / 1000.0;
+		} else {
+			com.play.end_range = 0;
+		}
+	}
+
+	com.play.speed = clock->speed;
+	if (ABS(com.play.speed)>scene->compositor->max_vspeed)
+		com.play.drop_non_ref = GF_TRUE;
+
+#ifndef GPAC_DISABLE_VRML
+	ctrl = parent_ck ? parent_ck->mc : gf_odm_get_mediacontrol(odm);
+	/*override range and speed with MC*/
+	if (ctrl && !odm->disable_buffer_at_next_play) {
+		//for addon, use current clock settings (media control is ignored)
+		if (!odm->parentscene || !odm->parentscene->root_od->addon) {
+			//this is fake timeshift, eg we are playing a VoD as a timeshift service: stop and start times have already been adjusted
+			if (ctrl->control->mediaStopTime<0 && !odm->timeshift_depth) {
+			} else {
+				MC_GetRange(ctrl, &com.play.start_range, &com.play.end_range);
+			}
+		}
+
+		com.play.speed = FIX2FLT(ctrl->control->mediaSpeed);
+		if (ABS(com.play.speed)>scene->compositor->max_vspeed)
+			com.play.drop_non_ref = GF_TRUE;
+		/*if the channel doesn't control the clock, jump to current time in the controled range, not just the beginning*/
+		if ((ctrl->stream != odm->mo) && (ck_time>com.play.start_range) && (com.play.end_range>com.play.start_range)
+		&& (ck_time<com.play.end_range)) {
+			com.play.start_range = ck_time;
+		}
+		if (ctrl->paused) media_control_paused = 1;
+
+		gf_clock_set_speed(clock, ctrl->control->mediaSpeed);
+		if (odm->mo) odm->mo->speed = ctrl->control->mediaSpeed;
+
+#if 0
+		/*if requested seek time AND media control, adjust start range to current play time*/
+		if ((com.play.speed>=0) && odm->media_start_time) {
+			if ((com.play.start_range>=0) && (com.play.end_range>com.play.start_range)) {
+				if (ctrl->control->loop) {
+					Double active_dur = com.play.end_range - com.play.start_range;
+					while (ck_time>active_dur) ck_time -= active_dur;
+				} else {
+					ck_time = 0;
+					//com.play.start_range = com.play.end_range;
+				}
+			}
+			com.play.start_range += ck_time;
+		}
+#endif
+
+	}
+#endif //GPAC_DISABLE_VRML
+
+	/*full object playback*/
+	if (com.play.end_range<=0) {
+		if (com.play.speed<0) {
+			odm->media_stop_time = 0;
+		} else {
+			odm->media_stop_time = odm->subscene ? 0 : odm->duration;
+		}
+	} else {
+		odm->media_stop_time = (u64) -1;
+		if (com.play.end_range < FLT_MAX) {
+			/*segment playback - since our timing is in ms whereas segment ranges are double precision,
+			make sure we have a LARGER range in ms, otherwise media sensors won't deactivate properly*/
+			odm->media_stop_time = (u64) ceil(1000 * com.play.end_range);
+		}
+	}
+
+	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));
+
+
+	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)) {
+			if (gf_list_find(scene->compositor->systems_pids, odm->pid)<0)
+				gf_list_add(scene->compositor->systems_pids, odm->pid);
+		}
+
+		gf_filter_pid_send_event(odm->pid, &com);
+	}
+	if (odm->extra_pids) {
+		u32 k, count = gf_list_count(odm->extra_pids);
+		for (k=0; k<count; k++) {
+			GF_ODMExtraPid *xpid = gf_list_get(odm->extra_pids, k);
+			if (xpid->state != GF_ODM_STATE_PLAY) {
+				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
+				gf_clock_buffer_on(odm->ck);
+
+				if ((odm->type!=GF_STREAM_VISUAL) && (odm->type!=GF_STREAM_AUDIO)) {
+					if (gf_list_find(scene->compositor->systems_pids, xpid->pid)<0)
+						gf_list_add(scene->compositor->systems_pids, xpid->pid);
+				}
+				
+				gf_filter_pid_send_event(xpid->pid, &com);
+			}
+		}
+	}
+
+	if (odm->parentscene) {
+		if (odm->parentscene->root_od->addon) {
+			odm->parentscene->root_od->addon->started = 1;
+		}
+		if (odm->parentscene->first_frame_pause_type) {
+			media_control_paused = GF_TRUE;
+		}
+	} else if (odm->subscene && odm->subscene->first_frame_pause_type) {
+		media_control_paused = GF_TRUE;
+	}
+
+	gf_odm_service_media_event(odm, GF_EVENT_MEDIA_LOAD_START);
+	gf_odm_service_media_event(odm, GF_EVENT_MEDIA_TIME_UPDATE);
+
+	odm->disable_buffer_at_next_play = GF_FALSE;
+
+	if (odm->flags & GF_ODM_PAUSE_QUEUED) {
+		odm->flags &= ~GF_ODM_PAUSE_QUEUED;
+		media_control_paused = 1;
+	}
+
+	if (media_control_paused) {
+		gf_odm_pause(odm);
+	}
+}
+
+void gf_odm_stop(GF_ObjectManager *odm, Bool force_close)
+{
+	u32 i;
+	GF_ODMExtraPid *xpid;
+#ifndef GPAC_DISABLE_VRML
+	MediaControlStack *ctrl;
+	MediaSensorStack *media_sens;
+#endif
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	GF_FilterEvent com;
+
+	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;
+
+	//PID not yet attached, mark as state_stop and wait for error or OK
+	if (!odm->pid ) {
+		odm->state = GF_ODM_STATE_STOP;
+		return;
+	}
+
+
+	if (force_close && odm->mo) odm->mo->flags |= GF_MO_DISPLAY_REMOVE;
+	/*stop codecs*/
+	if (odm->subscene) {
+		GF_ObjectManager *sub_odm;
+
+		/*stops all resources of the subscene as well*/
+		i=0;
+		while ((sub_odm=(GF_ObjectManager *)gf_list_enum(odm->subscene->resources, &i))) {
+			gf_odm_stop(sub_odm, force_close);
+		}
+	}
+
+	/*send stop command*/
+	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_filter_pid_send_event(odm->pid, &com);
+	gf_list_del_item(scene->compositor->systems_pids, odm->pid);
+	i=0;
+	while ((xpid = (GF_ODMExtraPid*)gf_list_enum(odm->extra_pids, &i)) ) {
+		xpid->has_seen_eos = GF_FALSE;
+		xpid->state = GF_ODM_STATE_STOP;
+		com.base.on_pid = xpid->pid;
+		gf_list_del_item(scene->compositor->systems_pids, xpid->pid);
+		gf_filter_pid_send_event(xpid->pid, &com);
+
+	}
+
+	if (odm->parentscene && odm->parentscene->root_od->addon) {
+		odm->parentscene->root_od->addon->started = 0;
+	}
+	if (odm->nb_buffering) {
+		assert(scene->nb_buffering>=odm->nb_buffering);
+		scene->nb_buffering -= odm->nb_buffering;
+		while (odm->nb_buffering && odm->ck) {
+			gf_clock_buffer_off(odm->ck);
+			odm->nb_buffering --;
+		}
+		if (!scene->nb_buffering) {
+			gf_scene_buffering_info(scene);
+		}
+	}
+
+	gf_odm_service_media_event(odm, GF_EVENT_ABORT);
+
+	/*stops clock if this is a scene stop*/
+	if (!(odm->flags & GF_ODM_INHERIT_TIMELINE) && odm->subscene && odm->ck && odm->owns_clock) {
+		gf_clock_reset(odm->ck);
+	}
+	odm->media_current_time = 0;
+
+#ifndef GPAC_DISABLE_VRML
+	/*reset media sensor(s)*/
+	i = 0;
+	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))) {
+		MS_Stop(media_sens);
+	}
+	/*reset media control state*/
+	ctrl = gf_odm_get_mediacontrol(odm);
+	if (ctrl) ctrl->current_seg = 0;
+#endif
+
+}
+
+void gf_odm_on_eos(GF_ObjectManager *odm, GF_FilterPid *pid)
+{
+	u32 i, count;
+	Bool all_done = GF_TRUE;
+#ifndef GPAC_DISABLE_VRML
+	if (gf_odm_check_segment_switch(odm)) return;
+#endif
+
+	if (odm->pid==pid) {
+		odm->has_seen_eos = GF_TRUE;
+	}
+	if (!odm->has_seen_eos) all_done = GF_FALSE;
+
+	count = gf_list_count(odm->extra_pids);
+	for (i=0; i<count; i++) {
+		GF_ODMExtraPid *xpid = gf_list_get(odm->extra_pids, i);
+		if (xpid->pid == pid) {
+			xpid->has_seen_eos = GF_TRUE;
+		}
+		if (!xpid->has_seen_eos) all_done = GF_FALSE;
+	}
+	if (!all_done) return;
+
+	if (odm->addon && odm->addon->is_splicing)
+		odm->addon->is_over = 1;
+	if (odm->parentscene && odm->parentscene->root_od->addon && odm->parentscene->root_od->addon->is_splicing)
+		odm->parentscene->root_od->addon->is_over = 1;
+
+	if (odm->ck->has_seen_eos) return;
+
+	odm->ck->has_seen_eos = 1;
+	gf_odm_check_buffering(odm, pid);
+
+#ifndef GPAC_DISABLE_VRML
+	//check for scene restart upon end of stream
+	if (odm->subscene) {
+		gf_scene_mpeg4_inline_check_restart(odm->subscene);
+	}
+#endif
+
+	gf_odm_service_media_event(odm, GF_EVENT_MEDIA_LOAD_DONE);
+	//a little optimization here: for scene with no associated resources (no audio, video, images), unload
+	//the filter chain once the scene is loaded
+	//TODO: further optimize to disconnect scenes with static resources (images, logo, ...)
+	if (odm->subscene && !gf_list_count(odm->subscene->resources)) {
+		Bool skip = GF_FALSE;
+		GF_PropertyEntry *pe=NULL;
+		const GF_PropertyValue *p = gf_filter_pid_get_info(odm->pid, GF_PROP_PID_KEEP_AFTER_EOS, &pe);
+		if (p && p->value.boolean) skip = GF_TRUE;
+		gf_filter_release_property(pe);
+
+		//if PID disabled auto-remove, do not destroy filter chain
+		if (!skip) {
+			GF_FilterEvent fevt;
+
+			GF_FEVT_INIT(fevt, GF_FEVT_RESET_SCENE, odm->pid);
+			fevt.attach_scene.object_manager = odm;
+			gf_filter_pid_exec_event(odm->pid, &fevt);
+
+			gf_filter_pid_set_udta(odm->pid, NULL);
+			odm->pid = NULL;
+			for (i=0; i<count; i++) {
+				GF_ODMExtraPid *xpid = gf_list_get(odm->extra_pids, i);
+				gf_filter_pid_set_udta(xpid->pid, NULL);
+				xpid->pid = NULL;
+			}
+			gf_filter_remove_src(odm->subscene->compositor->filter, odm->scene_ns->source_filter);
+			odm->scene_ns->source_filter = NULL;
+		}
+	}
+
+	gf_odm_signal_eos_reached(odm);
+
+}
+
+void gf_odm_signal_eos_reached(GF_ObjectManager *odm)
+{
+	if (odm->parentscene && !gf_scene_is_root(odm->parentscene) ) {
+		GF_ObjectManager *root = odm->parentscene->root_od;
+		Bool is_over = 0;
+
+		if (!gf_scene_check_clocks(root->scene_ns, root->subscene, 0)) return;
+		if (root->subscene->is_dynamic_scene)
+			is_over = 1;
+		else
+			is_over = gf_sc_is_over(odm->parentscene->compositor, root->subscene->graph);
+
+		if (is_over) {
+			gf_odm_service_media_event(root, GF_EVENT_MEDIA_ENDED);
+		}
+	} else {
+		GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+		if (scene && odm->parentscene && gf_sc_check_end_of_scene(scene->compositor, 0)) {
+			GF_Event evt;
+			evt.type = GF_EVENT_EOS;
+			gf_sc_send_event(odm->parentscene->compositor, &evt);
+		}
+	}
+}
+
+
+void gf_odm_set_timeshift_depth(GF_ObjectManager *odm, u32 stream_timeshift)
+{
+	GF_Scene *scene;
+	if (odm->timeshift_depth == stream_timeshift)
+		return;
+
+	odm->timeshift_depth = stream_timeshift;
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
+
+	/*update scene duration*/
+	gf_scene_set_timeshift_depth(scene);
+}
+
+
+GF_Clock *gf_odm_get_media_clock(GF_ObjectManager *odm)
+{
+	while (odm->lower_layer_odm) {
+		odm = odm->lower_layer_odm;
+	}
+	if (odm->ck) return odm->ck;
+	return NULL;
+}
+
+
+Bool gf_odm_shares_clock(GF_ObjectManager *odm, GF_Clock *ck)
+{
+	if (odm->ck == ck) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+void gf_odm_pause(GF_ObjectManager *odm)
+{
+	u32 i;
+#ifndef GPAC_DISABLE_VRML
+	MediaSensorStack *media_sens;
+#endif
+	GF_ODMExtraPid *xpid;
+	GF_FilterEvent com;
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	//postpone until the PLAY request
+	if (odm->state != GF_ODM_STATE_PLAY) {
+		odm->flags |= GF_ODM_PAUSE_QUEUED;
+		return;
+	}
+
+	if (odm->flags & GF_ODM_PAUSED) return;
+	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;
+
+	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_FEVT_INIT(com, GF_FEVT_PAUSE, odm->pid);
+	gf_clock_pause(odm->ck);
+
+	if ((odm->state == GF_ODM_STATE_PLAY) && (scene->first_frame_pause_type!=2)) {
+		gf_filter_pid_send_event(odm->pid, &com);
+	}
+
+	i=0;
+	while ((xpid = (GF_ODMExtraPid*)gf_list_enum(odm->extra_pids, &i))) {
+		gf_clock_pause(odm->ck);
+		if (xpid->state != GF_ODM_STATE_PLAY) continue;
+
+		//if we are in dump mode, the clocks are paused (step-by-step render), but we don't send the pause commands to
+		//the network !
+		if (scene->first_frame_pause_type!=2) {
+			com.base.on_pid = xpid->pid;
+			gf_filter_pid_send_event(xpid->pid, &com);
+		}
+	}
+
+	//if we are in dump mode, only the clocks are paused (step-by-step render), the media object is still in play state
+	if (scene->first_frame_pause_type==2) {
+		return;
+	}
+
+#ifndef GPAC_DISABLE_VRML
+	/*mediaSensor  shall generate isActive false when paused*/
+	i=0;
+	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i)) ) {
+		if (media_sens->sensor->isActive) {
+			media_sens->sensor->isActive = 0;
+			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+		}
+	}
+#endif
+
+}
+
+void gf_odm_resume(GF_ObjectManager *odm)
+{
+	u32 i;
+
+#ifndef GPAC_DISABLE_VRML
+	MediaSensorStack *media_sens;
+	MediaControlStack *ctrl;
+#endif
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+	GF_ODMExtraPid *xpid;
+	GF_FilterEvent com;
+
+	if (odm->flags & GF_ODM_PAUSE_QUEUED) {
+		odm->flags &= ~GF_ODM_PAUSE_QUEUED;
+		return;
+	}
+
+	if (!(odm->flags & GF_ODM_PAUSED)) return;
+	odm->flags &= ~GF_ODM_PAUSED;
+
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+
+#ifndef GPAC_DISABLE_VRML
+	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_FEVT_INIT(com, GF_FEVT_RESUME, odm->pid);
+	com.play.speed = odm->ck->speed;
+	if (ctrl) com.play.speed  = ctrl->control->mediaSpeed;
+	if (ABS(com.play.speed)>scene->compositor->max_vspeed)
+		com.play.drop_non_ref = GF_TRUE;
+
+	gf_clock_resume(odm->ck);
+	if (odm->state == GF_ODM_STATE_PLAY)
+		gf_filter_pid_send_event(odm->pid, &com);
+
+	i=0;
+	while ((xpid = (GF_ODMExtraPid*)gf_list_enum(odm->extra_pids, &i)) ) {
+		gf_clock_resume(odm->ck);
+
+		if (odm->state != GF_ODM_STATE_PLAY) continue;
+
+		com.base.on_pid = xpid->pid;
+		gf_filter_pid_send_event(odm->pid, &com);
+	}
+
+#ifndef GPAC_DISABLE_VRML
+	/*override speed with MC*/
+	if (ctrl) {
+		gf_clock_set_speed(odm->ck, ctrl->control->mediaSpeed);
+	}
+
+	/*mediaSensor shall generate isActive TRUE when resumed*/
+	i=0;
+	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i)) ) {
+		if (!media_sens->sensor->isActive) {
+			media_sens->sensor->isActive = 1;
+			gf_node_event_out((GF_Node *) media_sens->sensor, 4/*"isActive"*/);
+		}
+	}
+#endif
+}
+
+void gf_odm_set_speed(GF_ObjectManager *odm, Fixed speed, Bool adjust_clock_speed)
+{
+	u32 i;
+	GF_ODMExtraPid *xpid;
+	GF_FilterEvent com;
+	GF_Scene *scene = odm->subscene ? odm->subscene : odm->parentscene;
+
+	if (odm->flags & GF_ODM_NO_TIME_CTRL) return;
+	if (!odm->pid) return;
+
+	if (adjust_clock_speed)
+		gf_clock_set_speed(odm->ck, speed);
+
+	GF_FEVT_INIT(com, GF_FEVT_SET_SPEED, odm->pid);
+
+	com.play.speed = FIX2FLT(speed);
+	if (ABS(com.play.speed)>scene->compositor->max_vspeed)
+		com.play.drop_non_ref = GF_TRUE;
+
+	gf_filter_pid_send_event(odm->pid, &com);
+
+	i=0;
+	while ((xpid = (GF_ODMExtraPid*)gf_list_enum(odm->extra_pids, &i)) ) {
+
+		com.play.on_pid = xpid->pid;
+		gf_filter_pid_send_event(xpid->pid, &com);
+	}
+}
+
+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;
+	while ( (desc = (GF_Segment *)gf_list_enum(odm->OD->OCIDescriptors, &i)) ) {
+		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))) {
+		if (desc == seg) return;
+		if (seg->startTime + seg->Duration <= desc->startTime) {
+			gf_list_insert(list, seg, i);
+			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;
+	u32 i, j;
+
+	/*browse all URLs*/
+	for (i=0; i<url->count; i++) {
+		if (!url->vals[i].url) continue;
+		str = strstr(url->vals[i].url, "#");
+		if (!str) continue;
+		str++;
+		strcpy(seg_url, str);
+		/*segment closed range*/
+		if ((sep = strstr(seg_url, "-")) ) {
+			strcpy(seg2, sep+1);
+			sep[0] = 0;
+			strcpy(seg1, seg_url);
+			first_seg = gf_odm_find_segment(odm, seg1);
+			if (!first_seg) continue;
+			last_seg = gf_odm_find_segment(odm, seg2);
+		}
+		/*segment open range*/
+		else if ((sep = strstr(seg_url, "+")) ) {
+			sep[0] = 0;
+			strcpy(seg1, seg_url);
+			first_seg = gf_odm_find_segment(odm, seg_url);
+			if (!first_seg) continue;
+			last_seg = NULL;
+		}
+		/*single segment*/
+		else {
+			first_seg = gf_odm_find_segment(odm, seg_url);
+			if (!first_seg) continue;
+			gf_odm_insert_segment(odm, first_seg, list);
+			continue;
+		}
+		/*segment range process*/
+		gf_odm_insert_segment(odm, first_seg, list);
+		j=0;
+		while ( (seg = (GF_Segment *)gf_list_enum(odm->OD->OCIDescriptors, &j)) ) {
+			if (seg->tag != GF_ODF_SEGMENT_TAG) continue;
+			if (seg==first_seg) continue;
+			if (seg->startTime + seg->Duration <= first_seg->startTime) continue;
+			/*this also includes last_seg insertion !!*/
+			if (last_seg && (seg->startTime + seg->Duration > last_seg->startTime + last_seg->Duration) ) continue;
+			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);
+	if (odm->ck && ! odm->ck->clock_init) {
+		u64 time;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) return GF_TRUE;
+		timescale = gf_filter_pck_get_timescale(pck);
+
+		time = gf_filter_pck_get_cts(pck);
+		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"));
+			time = 0;
+		}
+		if (odm->delay<0) {
+			if (time < (u64) -odm->delay) {
+				gf_filter_pid_drop_packet(pid);
+				return GF_TRUE;
+			}
+			time-= -odm->delay;
+		}
+
+		time *= 1000;
+		time /= timescale;
+		gf_clock_set_time(odm->ck, (u32) time);
+		odm->media_current_time = 0;
+		if (odm->parentscene) {
+			odm->parentscene->root_od->media_start_time = 0;
+			odm->parentscene->root_od->media_current_time = 0;
+		}
+		gf_odm_check_clock_mediatime(odm);
+
+		if (pck && gf_filter_pck_is_blocking_ref(pck))
+			odm->blocking_media = GF_TRUE;
+	}
+
+	//TODO abort buffering when errors are found on the input chain !!
+	if (odm->blocking_media || (buffer_duration >= odm->buffer_playout_us)) {
+		odm->nb_buffering --;
+		assert(scene->nb_buffering);
+		scene->nb_buffering--;
+		if (!scene->nb_buffering) {
+			*signal_eob = GF_TRUE;
+		}
+		if (odm->ck)
+			gf_clock_buffer_off(odm->ck);
+	} else if (gf_filter_pid_has_seen_eos(pid) ) {
+		odm->nb_buffering --;
+		assert(scene->nb_buffering);
+		scene->nb_buffering--;
+		//if eos while buffering, consider the last rebuffer an error
+		//fixeme, we need a way to probe for eos being "close" but not yet detected
+		if (odm->nb_rebuffer)
+			odm->nb_rebuffer --;
+		if (!scene->nb_buffering) {
+			*signal_eob = GF_TRUE;
+			if (scene->nb_rebuffer) {
+				scene->nb_rebuffer--;
+			}
+		}
+		if (odm->ck)
+			gf_clock_buffer_off(odm->ck);
+	}
+	return GF_FALSE;
+}
+
+Bool gf_odm_check_buffering(GF_ObjectManager *odm, GF_FilterPid *pid)
+{
+	u32 timescale;
+	Bool signal_eob = GF_FALSE;
+	GF_Scene *scene;
+	GF_FilterClockType ck_type;
+	u64 clock_reference;
+	GF_FilterPacket *pck;
+
+	assert(odm);
+
+	if (!pid)
+		pid = odm->pid;
+
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
+	if (!scene) return GF_FALSE;
+	pck = gf_filter_pid_get_packet(pid);
+	ck_type = gf_filter_pid_get_clock_info(pid, &clock_reference, &timescale);
+
+	if (!odm->ck->clock_init && ck_type) {
+		clock_reference *= 1000;
+		clock_reference /= timescale;
+		gf_clock_set_time(odm->ck, (u32) clock_reference);
+		if (odm->parentscene)
+			odm->parentscene->root_od->media_start_time = 0;
+	}
+
+	if (odm->nb_buffering) {
+	 	GF_ODMExtraPid *xpid;
+	 	u32 i=0;
+	 	Bool ret = odm_update_buffer(scene, odm, pid, &signal_eob);
+	 	if (ret) return GF_TRUE;
+		while (odm->nb_buffering && (xpid = gf_list_enum(odm->extra_pids, &i))) {
+			ret = odm_update_buffer(scene, odm, xpid->pid, &signal_eob);
+			if (ret) return GF_TRUE;
+		}
+	}
+
+	if (scene->nb_buffering) {
+		GF_ObjectManager *an_odm;
+		u32 i=0;
+		while ((an_odm = gf_list_enum(scene->resources,&i))) {
+			if (odm==an_odm) continue;
+			if (!an_odm->pid) continue;
+
+			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) {
+			gf_clock_buffer_on(odm->ck);
+			odm->nb_buffering++;
+			odm->nb_rebuffer++;
+			if (!scene->nb_buffering) scene->nb_rebuffer++;
+			scene->nb_buffering++;
+		}
+	}
+
+	if (scene->nb_buffering || signal_eob)
+		gf_scene_buffering_info(scene);
+
+	//handle both PCR discontinuities or TS looping when no PCR disc is present/signaled
+	if (pck) {
+		s32 diff=0;
+		u64 pck_time = 0;
+		u32 clock_time = gf_clock_time(odm->ck);
+		s32 diff_to = 0;
+		if (ck_type) {
+			clock_reference *= 1000;
+			clock_reference /= timescale;
+			diff = (s32) clock_time + odm->buffer_playout_us/1000;
+			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));
+
+			//if explicit clock discontinuity, mark clock
+			if (ck_type==GF_FILTER_CLOCK_PCR_DISC)
+				odm->ck->ocr_discontinuity_time = (u32) (1+clock_reference);
+		}
+		pck_time = gf_filter_pck_get_cts(pck);
+		timescale = gf_filter_pck_get_timescale(pck);
+		if (pck_time != GF_FILTER_NO_TS) {
+			pck_time *= 1000;
+			pck_time /= timescale;
+			pck_time += 1;
+			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));
+
+		//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
+		if (diff_to && (ABS(diff) > diff_to) ) {
+			s64 diff_pck_old_clock, diff_pck_new_clock;
+			//compute diff to old clock and new clock
+			diff_pck_new_clock = pck_time-1 - (s64) clock_reference;
+			if (diff_pck_new_clock<0) diff_pck_new_clock = -diff_pck_new_clock;
+			diff_pck_old_clock = pck_time-1 - (s64) clock_time;
+			if (diff_pck_old_clock<0) diff_pck_old_clock = -diff_pck_old_clock;
+
+			//if the packet time is closer to the new clock than the old, switch to new clock
+			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));
+
+				count = gf_list_count(in_scene->resources);
+				for (i=0; i<count; i++) {
+					GF_ObjectManager *an_odm = gf_list_get(in_scene->resources, i);
+					if (an_odm->ck != odm->ck) continue;
+					an_odm->prev_clock_at_discontinuity_plus_one = 1 + clock_time;
+				}
+				odm->ck->clock_init = GF_FALSE;
+				gf_clock_set_time(odm->ck, odm->ck->ocr_discontinuity_time ? odm->ck->ocr_discontinuity_time - 1 : (u32) clock_reference);
+				odm->ck->ocr_discontinuity_time = 0;
+			}
+		}
+	} else if (ck_type) {
+		clock_reference *= 1000;
+		clock_reference /= timescale;
+		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)));
+	}
+	if (!odm->ck->nb_buffering) {
+		gf_odm_service_media_event(odm, GF_EVENT_MEDIA_PROGRESS);
+	}
+	return odm->ck->nb_buffering ? GF_TRUE : GF_FALSE;
+}
+
+#ifndef GPAC_DISABLE_SVG
+void gf_odm_collect_buffer_info(GF_SceneNamespace *scene_ns, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer)
+{
+	GF_ODMExtraPid *xpid;
+	u32 i, val;
+	u64 buf_val;
+
+	if (!odm->pid) return;
+	if (odm->scene_ns != scene_ns) return;
+	if (! odm->buffer_playout_us) {
+		media_event->bufferValid = GF_FALSE;
+		return;
+	}
+
+	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);
+	if (*min_buffer > val) (*min_buffer) = val;
+
+	if (*min_time > (u32) buf_val / 1000)
+		*min_time = (u32) buf_val / 1000;
+
+	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);
+		if (*min_buffer > val) (*min_buffer) = val;
+
+		if (*min_time > (u32) buf_val / 1000)
+			*min_time = (u32) buf_val / 1000;
+	}
+}
+#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)
+{
+#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;
+	if (odm->mo) {
+		count = gf_mo_event_target_count(odm->mo);
+
+		//for dynamic scenes, check if we have listeners on the root object of the scene containing this media
+		if (odm->parentscene
+		        && odm->parentscene->is_dynamic_scene
+		        && odm->parentscene->root_od->mo
+		        && (odm->parentscene->root_od->scene_ns==odm->scene_ns)
+		   ) {
+			odm = odm->parentscene->root_od;
+			count = gf_mo_event_target_count(odm->mo);
+		}
+		if (!count) return;
+	} else {
+		count = 0;
+	}
+
+
+	memset(&evt, 0, sizeof(GF_DOM_Event));
+
+	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 (min_buffer != (u32) -1) {
+		evt.media_event.level = min_buffer;
+	}
+	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;
+
+	evt.type = event_type;
+	evt.bubbles = 0;	/*the spec says yes but we force it to NO*/
+
+	//these events may be triggered from any input or decoding threads. Sync processing cannot be
+	//achieved in most cases, because we may run into deadlocks, especially if the event
+	//was triggered by a service opened by JS
+	for (i=0; i<count; i++) {
+		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(odm->mo->evt_targets, i);
+		if (target)
+			gf_sc_queue_dom_event_on_target(scene->compositor, &evt, target, scene->graph);
+	}
+	if (!count) {
+		GF_Node *root = gf_sg_get_root_node(scene->graph);
+		if (root) gf_sc_queue_dom_event(scene->compositor, root, &evt);
+	}
+#endif
+}
+
+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);
+}
+
+Bool gf_odm_stop_or_destroy(GF_ObjectManager *odm)
+{
+	Bool destroy = GF_FALSE;
+	if (odm->mo ) {
+		if (odm->addon) odm->flags |= GF_ODM_REGENERATE_SCENE;
+		else if (odm->mo->OD_ID==GF_MEDIA_EXTERNAL_ID) destroy = GF_TRUE;
+		else if (odm->ID==GF_MEDIA_EXTERNAL_ID) destroy = GF_TRUE;
+	}
+	if (destroy) {
+		gf_odm_disconnect(odm, 2);
+		return GF_TRUE;
+	}
+	gf_odm_stop(odm, 0);
+	return GF_FALSE;
+}
+
+
+static void get_codec_stats(GF_FilterPid *pid, GF_MediaInfo *info)
+{
+	GF_FilterPidStatistics stats;
+	gf_filter_pid_get_statistics(pid, &stats, GF_STATS_LOCAL_INPUTS);
+
+	info->avg_bitrate = stats.avgerage_bitrate;
+	info->max_bitrate = stats.max_bitrate;
+	info->nb_dec_frames = stats.nb_processed;
+	info->max_dec_time = stats.max_process_time;
+	info->total_dec_time = stats.total_process_time;
+	info->first_frame_time = (u32) stats.first_process_time/1000;
+	info->last_frame_time = (u32) stats.last_process_time/1000;
+	info->au_duration = (u32) stats.min_frame_dur/1000;
+	info->nb_iraps = stats.nb_saps;
+	info->irap_max_dec_time = stats.max_sap_process_time;
+	info->irap_total_dec_time = stats.total_sap_process_time;
+	info->avg_process_bitrate = stats.average_process_rate;
+	info->max_process_bitrate = stats.max_process_rate;
+	info->db_unit_count = stats.nb_buffer_units;
+}
+
+GF_EXPORT
+GF_Err gf_odm_get_object_info(GF_ObjectManager *odm, GF_MediaInfo *info)
+{
+	const GF_PropertyValue *prop;
+	GF_ObjectManager *an_odm;
+	GF_FilterPid *pid;
+
+	if (!odm || !info) return GF_BAD_PARAM;
+	memset(info, 0, sizeof(GF_MediaInfo));
+
+	info->ODID = odm->ID;
+	info->ServiceID = odm->ServiceID;
+	info->pid_id = odm->pid_id;
+	info->ocr_id = odm->ck ? odm->ck->clock_id : 0;
+	info->od_type = odm->type;
+
+	info->duration = (Double) (s64)odm->duration;
+	info->duration /= 1000;
+
+	pid = odm->pid;
+	an_odm = odm;
+	while (an_odm->lower_layer_odm) {
+		an_odm = an_odm->lower_layer_odm;
+		pid = an_odm->pid;
+	}
+
+	if (pid) {
+		/*since we don't remove ODs that failed setup, check for clock*/
+		if (odm->ck) {
+			info->current_time = odm->media_current_time;
+			info->ntp_diff = odm->last_drawn_frame_ntp_diff;
+			info->current_time = gf_clock_media_time(odm->ck);
+
+		}
+		info->current_time /= 1000;
+		info->nb_dropped = odm->nb_dropped;
+	} else if (odm->subscene) {
+		if (odm->subscene->root_od && odm->subscene->root_od->ck) {
+			info->current_time = gf_clock_media_time(odm->subscene->root_od->ck);
+			info->current_time /= 1000;
+		}
+		info->duration = (Double) (s64)odm->subscene->duration;
+		info->duration /= 1000;
+		info->nb_dropped = odm->subscene->root_od ? odm->subscene->root_od->nb_dropped : 0;
+		info->generated_scene = odm->subscene->is_dynamic_scene;
+	}
+	if (info->duration && info->current_time>info->duration)
+		info->current_time = info->duration;
+
+	info->buffer = -2;
+	info->db_unit_count = 0;
+
+	if (odm->state) {
+		GF_Clock *ck;
+
+		ck = gf_odm_get_media_clock(odm);
+		/*no clock means setup failed*/
+		if (!ck) {
+			info->status = 4;
+		} else {
+			info->status = gf_clock_is_started(ck) ? 1 : 2;
+			info->clock_drift = ck->audio_delay;
+
+			info->buffer = -1;
+			info->min_buffer = -1;
+			info->max_buffer = 0;
+
+			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;
+
+#ifdef FILTER_FIXME
+			info->protection = ch->ipmp_tool ? 1 : 2;
+#endif
+		}
+	}
+
+	if (odm->scene_ns) {
+		info->service_handler = odm->scene_ns->source_filter ? gf_filter_get_name(odm->scene_ns->source_filter) : "unloaded";
+
+		info->service_url = odm->scene_ns->url;
+		if (odm->scene_ns->owner == odm) info->owns_service = 1;
+	} else if ((odm->subscene && odm->subscene->graph_attached) || (odm->ID)) {
+		info->service_url = "No associated network Service";
+	} else {
+		info->service_url = "Service not found or error";
+	}
+
+	if (pid) {
+		info->codec_name = gf_filter_pid_get_filter_name(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);
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_LANGUAGE);
+		if (prop) info->lang_code = prop->value.string;
+	}
+
+	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;
+		}
+	}
+
+	if (odm->mo && odm->mo->URLs.count)
+		info->media_url = odm->mo->URLs.vals[0].url;
+	return GF_OK;
+}
+
+//adjust media time info in case the timestamp found at init is not media time 0
+void gf_odm_check_clock_mediatime(GF_ObjectManager *odm)
+{
+	u64 timestamp;
+	u32 timescale;
+	u32 i;
+	Double media_time, shift;
+	GF_Scene *scene;
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	if (!odm->owns_clock) return;
+
+	if (odm->ck->has_media_time_shift) return;
+
+	timescale = gf_filter_pid_get_timescale(odm->pid);
+	if (!timescale) return;
+
+	p = gf_filter_pid_get_info_str(odm->pid, "time:timestamp", &pe);
+	if (!p) return;
+	timestamp = p->value.longuint;
+	p = gf_filter_pid_get_info_str(odm->pid, "time:media", &pe);
+	if (!p) return;
+	gf_filter_release_property(pe);
+	media_time = p->value.number;
+
+	shift = (Double) timestamp;
+	shift /= timescale;
+	shift -= ((Double)odm->ck->init_timestamp)/1000;
+	media_time += shift;
+	odm->ck->media_time_at_init = (u32) (media_time * 1000);
+	odm->ck->has_media_time_shift = GF_TRUE;
+
+	scene = odm->subscene ? odm->subscene : odm->parentscene;
+	if (!scene) return;
+	if (scene->root_od)
+		scene->root_od->media_current_time = 0;
+
+	for (i=0; i<gf_list_count(scene->resources); i++) {
+		GF_ObjectManager *anodm = gf_list_get(scene->resources, i);
+		anodm->media_current_time = 0;
+	}
+}
+

gpac-0.8.0.tar.gz/src/compositor/offscreen_cache.c -> gpac-1.0.0.tar.gz/src/compositor/offscreen_cache.c Changed

@@ -102,7 +102,7 @@
 		gf_free(cache->txh.data);
 #ifdef CACHE_DEBUG_ALPHA
 	cache->txh.stride = pix_bounds->width * 3;
-	cache->txh.pixelformat = GF_PIXEL_RGB_24;
+	cache->txh.pixelformat = GF_PIXEL_RGB;
 	cache->txh.transparent = 0;
 #endif
 
@@ -139,13 +139,11 @@
 
 	/*we need to redraw the group in an offscreen visual*/
 	if (force_recompute) {
-		GF_Matrix2D backup;
 		GF_IRect rc1, rc2;
 		u32 prev_flags;
 		Bool prev_hybgl, visual_attached, for_3d=GF_FALSE;
 		GF_Rect cache_bounds;
-		GF_SURFACE offscreen_surface, old_surf;
-		GF_Raster2D *r2d = tr_state->visual->compositor->rasterizer;
+		GF_EVGSurface *offscreen_surface, *old_surf;
 		DrawableContext *child_ctx;
 		Fixed temp_x, temp_y, scale_x, scale_y;
 #ifndef GPAC_DISABLE_3D
@@ -214,7 +212,7 @@
 			setup top clipers
 		*/
 		old_surf = tr_state->visual->raster_surface;
-		offscreen_surface = r2d->surface_new(r2d, tr_state->visual->center_coords);	/*a new temp raster visual*/
+		offscreen_surface = gf_evg_surface_new(tr_state->visual->center_coords);	/*a new temp raster visual*/
 		tr_state->visual->raster_surface = offscreen_surface;
 #ifndef GPAC_DISABLE_3D
 		if (type_3d) {
@@ -230,8 +228,8 @@
 
 		/*use current surface coordinate scaling to compute the cache*/
 #ifdef GF_SR_USE_VIDEO_CACHE
-		scale_x = tr_state->visual->compositor->cache_scale * scale_x / 100;
-		scale_y = tr_state->visual->compositor->cache_scale * scale_y / 100;
+		scale_x = tr_state->visual->compositor->vcscale * scale_x / 100;
+		scale_y = tr_state->visual->compositor->vcscale * scale_y / 100;
 #endif
 
 		if (scale_x<0) scale_x = -scale_x;
@@ -256,7 +254,7 @@
 
 
 		/*attach the buffer to visual*/
-		r2d->surface_attach_to_buffer(offscreen_surface, cache->txh.data,
+		gf_evg_surface_attach_to_buffer(offscreen_surface, cache->txh.data,
 		                              cache->txh.width,
 		                              cache->txh.height,
 		                              0,
@@ -327,7 +325,7 @@
 		tr_state->visual->compositor->hybrid_opengl = prev_hybgl;
 		tr_state->visual->is_attached = visual_attached;
 
-		r2d->surface_delete(offscreen_surface);
+		gf_evg_surface_delete(offscreen_surface);
 		tr_state->visual->raster_surface = old_surf;
 		tr_state->traversing_mode = TRAVERSE_SORT;
 
@@ -448,7 +446,7 @@
 	                                    group->traverse_time));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Status (KB): Max: %d\tUsed: %d\tNb Groups: %d\n",
-	                                    tr_state->visual->compositor->video_cache_max_size,
+	                                    tr_state->visual->compositor->vcsize,
 	                                    tr_state->visual->compositor->video_cache_current_size,
 	                                    gf_list_count(tr_state->visual->compositor->cached_groups)
 	                                   ));
@@ -500,7 +498,7 @@
 	                                    FIX2FLT(group->traverse_time)));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Status (B): Max: %d\tUsed: %d\tNb Groups: %d\n",
-	                                    compositor->video_cache_max_size,
+	                                    compositor->vcsize,
 	                                    compositor->video_cache_current_size,
 	                                    gf_list_count(compositor->cached_groups)
 	                                   ));
@@ -605,9 +603,9 @@
 		else if (group->cache) {
 			Fixed scale = MAX(tr_state->transform.m[0], tr_state->transform.m[4]);
 
-			if (100*scale >= group->cache->scale*(100 + tr_state->visual->compositor->cache_tolerance))
+			if (100*scale >= group->cache->scale*(100 + tr_state->visual->compositor->vctol))
 				zoom_changed = 1;
-			else if ((100+tr_state->visual->compositor->cache_tolerance)*scale <= 100*group->cache->scale)
+			else if ((100+tr_state->visual->compositor->vctol)*scale <= 100*group->cache->scale)
 				zoom_changed = 1;
 			else
 				zoom_changed = 0;
@@ -648,7 +646,7 @@
 	DrawableContext *ctx;
 	u32 nb_segments, nb_objects;
 	u32 alpha_pixels, opaque_pixels, area_world;
-	u32 video_cache_max_size, cache_size, prev_cache_size;
+	u32 vcsize, cache_size, prev_cache_size;
 	u32 i;
 	GF_RectArray ra;
 
@@ -659,7 +657,7 @@
 	prev_cache_size = group->cached_size;
 	/*reset bounds*/
 	group_bounds.width = group_bounds.height = 0;
-	video_cache_max_size = tr_state->visual->compositor->video_cache_max_size;
+	vcsize = tr_state->visual->compositor->vcsize;
 
 	/*never cache root node - this should be refined*/
 	if (gf_node_get_parent(node, 0) == NULL) goto group_reject;
@@ -726,14 +724,14 @@
 	if (10*opaque_pixels < 7*area_world) goto group_reject;
 
 	/*the memory size allocated for the cache - cache is drawn in final coordinate system !!*/
-	group_bounds.width = tr_state->visual->compositor->cache_scale * group_bounds.width / 100;
-	group_bounds.height = tr_state->visual->compositor->cache_scale * group_bounds.height / 100;
+	group_bounds.width = tr_state->visual->compositor->vcscale * group_bounds.width / 100;
+	group_bounds.height = tr_state->visual->compositor->vcscale * group_bounds.height / 100;
 	cache_size = FIX2INT(group_bounds.width) * FIX2INT(group_bounds.height) * 4 /* pixelFormat is ARGB*/;
 
 	/*TEST 5: cache is less than 10x10 pixels: discard*/
 	if (cache_size < 400) goto group_reject;
 	/*TEST 6: cache is larger than our allowed memory: discard*/
-	if (cache_size>=video_cache_max_size) {
+	if (cache_size>=vcsize) {
 		tr_state->cache_too_small = 1;
 		goto group_reject;
 	}
@@ -795,7 +793,7 @@
 	                                   ));
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Status (B): Max: %d\tUsed: %d\tNb Groups: %d\n",
-	                                    tr_state->visual->compositor->video_cache_max_size,
+	                                    tr_state->visual->compositor->vcsize,
 	                                    tr_state->visual->compositor->video_cache_current_size,
 	                                    gf_list_count(tr_state->visual->compositor->cached_groups)
 	                                   ));
@@ -807,12 +805,11 @@
 void group_2d_cache_evaluate(GF_Node *node, GroupingNode2D *group, GF_TraverseState *tr_state, DrawableContext *first_child, Bool skip_first_child, u32 last_cache_idx)
 {
 	u32 nb_cache_added, i;
-	Fixed priority;
 	GF_Compositor *compositor = tr_state->visual->compositor;
 
 	/*first frame is unusable for stats because lot of time is being spent building the path and allocating
 	the drawable contexts*/
-	if (!compositor->video_cache_max_size || !compositor->frame_number || group->changed || tr_state->in_group_cache) {
+	if (!compositor->vcsize || !compositor->frame_number || group->changed || tr_state->in_group_cache) {
 		group->traverse_time = 0;
 		return;
 	}
@@ -852,10 +849,10 @@
 			cache->traverse_time = 0;
 			gf_list_rem(compositor->cached_groups_queue, last_cache_idx);
 		}
-		priority = INT2FIX (group->nb_objects*1024*1024*avg_time) / group->cached_size;
+		group->priority = INT2FIX (group->nb_objects*1024*1024*avg_time) / group->cached_size;
 
 		/*when the memory exceeds the constraint, remove the subgroups that have the lowest deltas*/
-		while (compositor->video_cache_current_size > compositor->video_cache_max_size)	{
+		while (compositor->video_cache_current_size > compositor->vcsize)	{
 			gf_cache_remove_entry(compositor, node, NULL);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Removing low priority cache - current total size %d\n", compositor->video_cache_current_size));
 		}
@@ -868,7 +865,7 @@
 	while (compositor->video_cache_current_size) {
 		gf_cache_remove_entry(compositor, NULL, NULL);
 	}
-	compositor->video_cache_max_size = memory;
+	compositor->vcsize = memory;
 	/*and force recompute*/
 	compositor->zoom_changed = 1;
 }

gpac-1.0.0.tar.gz/src/compositor/scene.c Added

@@ -0,0 +1,3356 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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.
+ *
+ */
+
+
+
+/*for OD service types*/
+#include <gpac/constants.h>
+/*for URL concatenation*/
+#include <gpac/network.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_x3d.h>
+#include <gpac/options.h>
+
+/*SVG properties*/
+#ifndef GPAC_DISABLE_SVG
+#include <gpac/scenegraph_svg.h>
+#endif
+
+GF_EXPORT
+Double gf_scene_get_time(void *_is)
+{
+	GF_Scene *scene = (GF_Scene *)_is;
+#if 1
+	u32 ret;
+	GF_Clock *ck;
+	assert(scene);
+	assert(scene->root_od);
+	ck = scene->root_od->ck;
+	if (!ck) return 0.0;
+	ret = gf_clock_time(ck);
+	if (scene->root_od->media_stop_time && (scene->root_od->media_stop_time<ret)) ret = (u32) scene->root_od->media_stop_time;
+	return ret/1000.0;
+#else
+	return scene->simulation_time;
+#endif
+}
+
+#ifndef GPAC_DISABLE_VRML
+
+void gf_storage_save(M_Storage *storage);
+#endif
+
+static void inline_on_media_event(GF_Scene *scene, u32 type)
+{
+	gf_odm_service_media_event(scene->root_od, type);
+}
+
+
+void gf_scene_message_ex(GF_Scene *scene, const char *service, const char *message, GF_Err error, Bool no_filtering)
+{
+	GF_Event evt;
+	if (!scene || !scene->compositor) return;
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_MESSAGE;
+	evt.message.service = service;
+	evt.message.message = message;
+	evt.message.error = error;
+
+	if (no_filtering) {
+		gf_filter_ui_event(scene->compositor->filter, &evt);
+	} else {
+		gf_filter_send_gf_event(scene->compositor->filter, &evt);
+	}
+}
+
+void gf_scene_message(GF_Scene *scene, const char *service, const char *message, GF_Err error)
+{
+	gf_scene_message_ex(scene, service, message, error, 0);
+}
+
+
+char *gf_scene_resolve_xlink(GF_Node *node, char *the_url)
+{
+	char *url;
+	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
+	if (!scene) return gf_strdup(the_url);
+
+	url = gf_strdup(the_url);
+#ifndef GPAC_DISABLE_SVG
+	/*apply XML:base*/
+	while (node) {
+		GF_FieldInfo info;
+		if (gf_node_get_attribute_by_tag(node, TAG_XML_ATT_base, 0, 0, &info)==GF_OK) {
+			char *new_url = gf_url_concatenate( ((XMLRI*)info.far_ptr)->string, url);
+			if (new_url) {
+				gf_free(url);
+				url = new_url;
+			}
+		}
+		node = gf_node_get_parent(node, 0);
+	}
+#endif
+
+	/*if this is a fragment and no XML:BASE was found, this is a fragment of the current document*/
+	if (url[0]=='#') return url;
+
+	if (scene->redirect_xml_base) {
+		the_url = gf_url_concatenate(scene->redirect_xml_base, url);
+	} else {
+//			the_url = gf_url_concatenate(is->root_od->net_service->url, url);
+		/*the root url of a document should be "." if not specified, so that the final URL resolve happens only once
+		at the service level*/
+		the_url = gf_strdup(url);
+	}
+	gf_free(url);
+	return the_url;
+}
+
+static Bool gf_scene_script_action(void *opaque, GF_JSAPIActionType type, GF_Node *n, GF_JSAPIParam *param)
+{
+	Bool ret;
+	GF_Scene *root_scene;
+	GF_Scene *scene = (GF_Scene *) opaque;
+	if (!scene) return GF_FALSE;
+	root_scene = gf_scene_get_root_scene(scene);
+
+	if (type==GF_JSAPI_OP_MESSAGE) {
+		gf_scene_message_ex(scene, scene->root_od->scene_ns->url, param->info.msg, param->info.e, 1);
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_GET_COMPOSITOR) {
+		param->compositor = scene->compositor;
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_RESOLVE_XLINK) {
+#ifndef GPAC_DISABLE_SVG
+		param->uri.url = (char *) gf_scene_resolve_xlink(n, (char *) param->uri.url);
+		return 1;
+#else
+		return 0;
+#endif
+	}
+	if (type==GF_JSAPI_OP_GET_OPT) {
+		param->gpac_cfg.key_val = gf_opts_get_key(param->gpac_cfg.section, param->gpac_cfg.key);
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_SET_OPT) {
+		gf_opts_set_key(param->gpac_cfg.section, param->gpac_cfg.key, param->gpac_cfg.key_val);
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_GET_DOWNLOAD_MANAGER) {
+		param->dnld_man = gf_filter_get_download_manager(scene->compositor->filter);
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_SET_TITLE) {
+		GF_Event evt;
+		evt.type = GF_EVENT_SET_CAPTION;
+		evt.caption.caption = param->uri.url;
+		gf_filter_send_gf_event(scene->compositor->filter, &evt);
+		return 1;
+	}
+	if (type==GF_JSAPI_OP_GET_SUBSCENE) {
+		GF_Scene *a_scene = (GF_Scene *)gf_node_get_private(n);
+		param->scene = a_scene->graph;
+		return 1;
+	}
+
+	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;
+		if (!url) {
+			param->uri.url = gf_strdup(a_scene->root_od->scene_ns->url);
+			param->uri.nb_params = 0;
+			return 1;
+		}
+
+		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
+		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;
+	}
+
+	/*special case for pause/stop/resume*/
+	if (type==GF_JSAPI_OP_PAUSE_SVG) {
+		GF_SceneGraph *graph = gf_node_get_graph(n);
+		if (n == gf_sg_get_root_node(graph)) {
+			GF_Scene *a_scene = (GF_Scene *)gf_sg_get_private(graph);
+			if (a_scene->root_od->ck) gf_clock_pause(a_scene->root_od->ck);
+			return 1;
+		}
+	}
+	if (type==GF_JSAPI_OP_RESUME_SVG) {
+		GF_SceneGraph *graph = gf_node_get_graph(n);
+		if (n == gf_sg_get_root_node(graph)) {
+			GF_Scene *a_scene = (GF_Scene *)gf_sg_get_private(graph);
+			if (a_scene->root_od->ck) gf_clock_resume(a_scene->root_od->ck);
+			return 1;
+		}
+	}
+	if (type==GF_JSAPI_OP_RESTART_SVG) {
+		GF_SceneGraph *graph = gf_node_get_graph(n);
+		if (n == gf_sg_get_root_node(graph)) {
+			GF_Scene *a_scene = (GF_Scene *)gf_sg_get_private(graph);
+			GF_Clock *ck = a_scene->root_od->ck;
+			if (ck) {
+				Bool is_paused = ck->nb_paused ? GF_TRUE : GF_FALSE;
+				if (is_paused) gf_clock_resume(ck);
+				gf_scene_restart_dynamic(a_scene, 0, 0, 0);
+				if (is_paused) gf_clock_pause(ck);
+			}
+			return 1;
+		}
+		return 0;
+	}
+	if (type==GF_JSAPI_OP_SET_SCENE_SPEED) {
+		GF_SceneGraph *graph = gf_node_get_graph(n);
+		if (n == gf_sg_get_root_node(graph)) {
+			GF_Scene *a_scene = (GF_Scene *)gf_sg_get_private(graph);
+			GF_Clock *ck = a_scene->root_od->ck;
+			if (ck) {
+				gf_clock_set_speed(ck, param->val);
+			}
+			return 1;
+		}
+		return 0;
+	}
+
+
+	ret = gf_sc_script_action(scene->compositor, type, n, param);
+	if (ret) return ret;
+
+	if (type==GF_JSAPI_OP_LOAD_URL) {
+		if (gf_sg_get_private(gf_node_get_graph(n)) == root_scene) {
+			GF_Event evt;
+			evt.type = GF_EVENT_NAVIGATE;
+			evt.navigate.to_url = param->uri.url;
+			evt.navigate.parameters = param->uri.params;
+			evt.navigate.param_count = param->uri.nb_params;
+			return gf_filter_send_gf_event(scene->compositor->filter, &evt);
+		} else {
+			/*TODO*/
+			return 0;
+		}
+	}
+	return 0;
+}
+
+
+Bool gf_scene_is_root(GF_Scene *scene)
+{
+	GF_Scene *s = scene;
+	while (s->root_od->parentscene) s = s->root_od->parentscene;
+	return (s==scene) ? GF_TRUE : GF_FALSE;
+}
+
+GF_Scene *gf_scene_get_root_scene(GF_Scene *scene)
+{
+	while (scene && scene->root_od && scene->root_od->parentscene)
+		scene = scene->root_od->parentscene;
+	return scene;
+}
+
+
+
+GF_EXPORT
+GF_Scene *gf_scene_new(GF_Compositor *compositor, GF_Scene *parentScene)
+{
+	GF_Scene *tmp;
+	if (!compositor && !parentScene) return NULL;
+
+	GF_SAFEALLOC(tmp, GF_Scene);
+	if (! tmp) return NULL;
+
+	tmp->resources = gf_list_new();
+	tmp->scene_objects = gf_list_new();
+	tmp->extra_scenes = gf_list_new();
+	tmp->declared_addons = gf_list_new();
+	/*init inline scene*/
+	if (parentScene) {
+		tmp->graph = gf_sg_new_subscene(parentScene->graph);
+		assert(!compositor || (compositor==parentScene->compositor));
+		tmp->compositor = parentScene->compositor;
+	} else {
+		tmp->graph = gf_sg_new();
+		tmp->compositor = compositor;
+		//only for the top scene
+		tmp->namespaces = gf_list_new();
+	}
+
+	gf_sg_set_private(tmp->graph, tmp);
+	gf_sg_set_node_callback(tmp->graph, gf_scene_node_callback);
+	gf_sg_set_scene_time_callback(tmp->graph, gf_scene_get_time);
+	if (tmp->compositor && !tmp->compositor->nojs)
+		gf_sg_set_script_action(tmp->graph, gf_scene_script_action, tmp);
+
+	//copy over pause_at_first_frame flag so that new subscene is not paused right away
+	if (parentScene)
+		tmp->first_frame_pause_type = parentScene->first_frame_pause_type;
+
+#ifndef GPAC_DISABLE_VRML
+	tmp->extern_protos = gf_list_new();
+	gf_sg_set_proto_loader(tmp->graph, gf_inline_get_proto_lib);
+
+	tmp->storages = gf_list_new();
+	tmp->keynavigators = gf_list_new();
+
+#endif
+	tmp->on_media_event = inline_on_media_event;
+	return tmp;
+}
+
+static void gf_scene_reset_urls(GF_Scene *scene)
+{
+#define SFURL_RESET(__url) if (__url.url) gf_free(__url.url);\
+	memset(&__url, 0, sizeof(SFURL));
+
+	SFURL_RESET(scene->audio_url);
+	SFURL_RESET(scene->visual_url);
+	SFURL_RESET(scene->text_url);
+	SFURL_RESET(scene->dims_url);
+}
+
+GF_EXPORT
+void gf_scene_del(GF_Scene *scene)
+{
+	gf_list_del(scene->resources);
+	assert(!gf_list_count(scene->extra_scenes) );
+	gf_list_del(scene->extra_scenes);
+
+#ifndef GPAC_DISABLE_VRML
+	while (gf_list_count(scene->extern_protos)) {
+		GF_ProtoLink *pl = (GF_ProtoLink *)gf_list_get(scene->extern_protos, 0);
+		gf_list_rem(scene->extern_protos, 0);
+		gf_free(pl);
+	}
+	gf_list_del(scene->extern_protos);
+#endif
+
+	/*delete the scene graph*/
+	gf_sg_del(scene->graph);
+
+	/*don't touch the root_od, will be deleted by the parent scene*/
+
+	/*clean all remaining associations*/
+	while (gf_list_count(scene->scene_objects)) {
+		GF_MediaObject *obj = (GF_MediaObject *)gf_list_get(scene->scene_objects, 0);
+		if (obj->odm) obj->odm->mo = NULL;
+		gf_list_rem(scene->scene_objects, 0);
+		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
+		gf_mo_del(obj);
+	}
+	gf_list_del(scene->scene_objects);
+#ifndef GPAC_DISABLE_VRML
+	gf_list_del(scene->storages);
+	gf_list_del(scene->keynavigators);
+#endif
+
+	gf_list_del(scene->declared_addons);
+
+	gf_scene_reset_urls(scene);
+
+	if (scene->fragment_uri) gf_free(scene->fragment_uri);
+	if (scene->redirect_xml_base) gf_free(scene->redirect_xml_base);
+
+	if (scene->namespaces) {
+		while (gf_list_count(scene->namespaces)) {
+			GF_SceneNamespace *sns = gf_list_pop_back(scene->namespaces);
+			gf_scene_ns_del(sns, scene);
+		}
+		gf_list_del(scene->namespaces);
+	}
+
+	if (scene->compositor->root_scene == scene)
+		scene->compositor->root_scene = NULL;
+
+	gf_free(scene);
+}
+
+GF_EXPORT
+GF_ObjectManager *gf_scene_find_odm(GF_Scene *scene, u16 OD_ID)
+{
+	GF_ObjectManager *odm;
+	u32 i=0;
+	while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
+		if (odm->ID == OD_ID) return odm;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+void gf_scene_disconnect(GF_Scene *scene, Bool for_shutdown)
+{
+	u32 i;
+	GF_MediaObject *obj;
+	GF_ObjectManager *odm;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] disconnecting\n"));
+
+
+	/*force unregistering of inline nodes (for safety)*/
+	if (for_shutdown && scene->root_od->mo) {
+		/*reset private stack of all inline nodes still registered*/
+		while (gf_mo_event_target_count(scene->root_od->mo)) {
+			gf_mo_event_target_remove_by_index(scene->root_od->mo, 0);
+#ifndef GPAC_DISABLE_VRML
+			GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, 0));
+			if (n) {
+				switch (gf_node_get_tag(n)) {
+				case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+				case TAG_X3D_Inline:
+#endif
+					gf_node_set_private(n, NULL);
+					break;
+				}
+			}
+#endif
+		}
+	}
+
+	//Ivica patch: Remove all Registered InputSensor nodes -> shut down the InputSensor threads -> prevent illegal access on deleted pointers
+#ifndef GPAC_DISABLE_VRML
+	if (for_shutdown) {
+		i = 0;
+		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
+			if (odm->mo) {
+				odm->ck = NULL;
+				obj = odm->mo;
+				while (gf_mo_event_target_count(obj)) {
+					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
+					if (n) {
+						switch (gf_node_get_tag(n)) {
+						case TAG_MPEG4_InputSensor:
+						{
+							M_InputSensor* is = (M_InputSensor*)n;
+							is->enabled = 0;
+							InputSensorModified(n);
+							break;
+						}
+						}
+					}
+					gf_mo_event_target_remove_by_index(obj, 0);
+				}
+			}
+		}
+	}
+#endif
+
+	/*remove all associated eventTargets*/
+	i=0;
+	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
+		gf_mo_event_target_reset(obj);
+	}
+
+#ifndef GPAC_DISABLE_VRML
+	while (gf_list_count(scene->storages)) {
+		M_Storage *storage = (M_Storage *)gf_list_get(scene->storages, 0);
+		gf_list_rem(scene->storages, 0);
+		if (storage->_auto) gf_storage_save(storage);
+	}
+#endif
+
+	if (!scene->root_od->parentscene) {
+		gf_sc_set_scene(scene->compositor, NULL);
+	}
+
+	gf_scene_reset_addons(scene);
+
+	/*release the scene - at this stage, we no longer have any node stack refering to our media objects */
+
+	gf_sc_node_destroy(scene->compositor, NULL, scene->graph);
+	gf_sg_reset(scene->graph);
+	scene->graph_attached = 0;
+
+
+	/*disconnect all objects*/
+	if (!for_shutdown) {
+		i=0;
+		/*stop all objects but DON'T DESTROY THEM*/
+		while ((odm = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
+			if (odm->state) gf_odm_disconnect(odm, GF_FALSE);
+			//reset OD ID until we get a new OD re-attaching this object
+			odm->ID = 0;
+		}
+		/*reset all stream associations*/
+		i=0;
+		while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
+			gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
+			gf_mo_event_target_reset(obj);
+		}
+	}
+	/*disconnect and remove all objects*/
+	else {
+		while (gf_list_count(scene->resources)) {
+			odm = (GF_ObjectManager *)gf_list_get(scene->resources, 0);
+			if (odm->skip_disconnect_state) {
+				gf_list_rem(scene->resources, 0);
+			} else {
+				gf_odm_disconnect(odm, for_shutdown ? 2 : 0);
+			}
+		}
+#ifndef GPAC_DISABLE_VRML
+		while (gf_list_count(scene->extern_protos)) {
+			GF_ProtoLink *pl = (GF_ProtoLink *)gf_list_get(scene->extern_protos, 0);
+			gf_list_rem(scene->extern_protos, 0);
+			gf_free(pl);
+		}
+#endif
+	}
+
+	/*remove stream associations*/
+	while (gf_list_count(scene->scene_objects)) {
+		obj = (GF_MediaObject*)gf_list_get(scene->scene_objects, 0);
+		gf_list_rem(scene->scene_objects, 0);
+		if (obj->odm) obj->odm->mo = NULL;
+		gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
+		gf_mo_del(obj);
+	}
+
+	//reset URLs
+	gf_scene_reset_urls(scene);
+
+	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)
+{
+	GF_ObjectManager *odm;
+	char *url, *final_url;
+	if (!mo || !scene) return;
+
+	odm = gf_odm_new();
+	/*remember OD*/
+	odm->mo = mo;
+	mo->odm = odm;
+	odm->parentscene = scene;
+	odm->ID = GF_MEDIA_EXTERNAL_ID;
+	if (scene->force_single_timeline) lock_timelines = GF_TRUE;
+
+	url = mo->URLs.vals[0].url;
+
+	if (!url) return;
+
+	if (!stricmp(url, "KeySensor")) {
+		final_url = "gpac://KeySensor";
+	} else if (!stricmp(url, "StringSensor")) {
+		final_url = "gpac://StringSensor";
+	} else if (!stricmp(url, "Mouse")) {
+		final_url = "gpac://Mouse";
+	} else {
+		final_url = mo->URLs.vals[0].url;
+		if (lock_timelines) odm->flags |= GF_ODM_INHERIT_TIMELINE;
+	}
+
+	/*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_list_add(scene->resources, odm);
+
+	gf_odm_setup_remote_object(odm, original_parent_scene ? original_parent_scene->root_od->scene_ns : NULL, final_url);
+}
+
+static void gf_scene_reinsert_object(GF_Scene *scene, GF_MediaObject *mo)
+{
+	u32 i;
+	gf_free(mo->URLs.vals[0].url);
+	mo->URLs.vals[0].url = NULL;
+	for (i=0; i<mo->URLs.count-1; i++) mo->URLs.vals[i].url = mo->URLs.vals[i+1].url;
+	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);
+}
+
+
+void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, u32 for_shutdown)
+{
+	u32 i;
+	GF_MediaObject *obj;
+
+	gf_list_del_item(scene->resources, odm);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Scene] removing ODM %d\n", odm->ID ));
+
+
+	i=0;
+	while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
+		if (
+		    /*assigned object*/
+		    (obj->odm==odm) ||
+		    /*remote OD*/
+		    ((obj->OD_ID!=GF_MEDIA_EXTERNAL_ID) && (obj->OD_ID == odm->ID) )
+		    /*dynamic OD*/
+		 ||   (obj->URLs.count && odm->scene_ns && (odm->scene_ns!=scene->root_od->scene_ns) && !stricmp(obj->URLs.vals[0].url, odm->scene_ns->url))
+		) {
+			u32 discard_obj = 0;
+
+			obj->flags = 0;
+			if (obj->odm) obj->odm->mo = NULL;
+			odm->mo = NULL;
+			obj->odm = NULL;
+			if (obj->pck) {
+				gf_filter_pck_unref(obj->pck);
+				obj->pck = NULL;
+			}
+
+			obj->frame = NULL;
+			obj->framesize = obj->timestamp = 0;
+			obj->config_changed = GF_TRUE;
+
+
+			/*if graph not attached we can remove the link (this is likely scene shutdown for some error)*/
+			if (!scene->graph_attached) {
+#ifndef GPAC_DISABLE_VRML
+				GF_ProtoLink *pl;
+				u32 j=0;
+				while ((pl = (GF_ProtoLink *)gf_list_enum(scene->extern_protos, &j))) {
+					if (pl->mo==obj) {
+						pl->mo = NULL;
+						break;
+					}
+				}
+#endif
+				discard_obj = 1;
+			} else if (!for_shutdown) {
+				/*if dynamic OD and more than 1 URLs resetup*/
+				if ((obj->OD_ID==GF_MEDIA_EXTERNAL_ID) && (obj->URLs.count>1)) {
+					discard_obj = 0;
+					gf_scene_reinsert_object(scene, obj);
+				} else {
+					discard_obj = 2;
+				}
+			}
+			/*discard media object*/
+			else if (for_shutdown==2)
+				discard_obj = 1;
+
+			/*reset private stack of all inline nodes still registered*/
+			if (discard_obj) {
+				while (gf_mo_event_target_count(obj)) {
+					gf_mo_event_target_remove_by_index(obj, 0);
+#ifndef GPAC_DISABLE_VRML
+					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
+					if (n) {
+						switch (gf_node_get_tag(n)) {
+						case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+						case TAG_X3D_Inline:
+#endif
+							if (obj->num_open) gf_mo_stop(&obj);
+							gf_node_set_private(n, NULL);
+							break;
+						default:
+							gf_sc_mo_destroyed(n);
+							break;
+						}
+					}
+#endif
+				}
+			}
+
+			if ((discard_obj==1) && !obj->num_open) {
+				gf_list_rem(scene->scene_objects, i-1);
+				gf_sg_vrml_mf_reset(&obj->URLs, GF_SG_VRML_MFURL);
+				gf_mo_del(obj);
+			}
+			return;
+		}
+	}
+}
+
+
+//browse all channels and update buffering info
+void gf_scene_buffering_info(GF_Scene *scene)
+{
+	GF_ODMExtraPid *xpid;
+	u32 i, j;
+	u64 max_buffer, cur_buffer, max_buff_val=0;
+	u64 buf_val;
+	GF_Event evt;
+	GF_ObjectManager *odm;
+	if (!scene) return;
+
+	max_buffer = cur_buffer = 0;
+
+	/*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 (odm->nb_buffering) {
+			max_buffer += odm->buffer_playout_us;
+			buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
+			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);
+				if (buf_val > max_buffer) buf_val = max_buffer;
+				cur_buffer += (buf_val>0) ? buf_val : 1;
+			}
+		}
+	}
+
+	/*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->nb_buffering) continue;
+
+		max_buffer += odm->buffer_playout_us;
+		buf_val = gf_filter_pid_query_buffer_duration(odm->pid, GF_FALSE);
+		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);
+			if (buf_val > max_buffer) buf_val = max_buffer;
+			cur_buffer += (buf_val>0) ? buf_val : 1;
+		}
+	}
+	//likely local file playback with buffer disabled
+	if (!max_buff_val)
+		return;
+	//destruction
+	if (!scene->root_od->scene_ns)
+		return;
+
+	evt.type = GF_EVENT_PROGRESS;
+	evt.progress.progress_type = 0;
+	evt.progress.service = scene->root_od->scene_ns->url;
+
+	if (!max_buffer || !cur_buffer || (max_buffer <= cur_buffer)) {
+		if (!max_buffer) max_buffer=max_buff_val;
+		evt.progress.done = evt.progress.total = (u32) (max_buffer / 1000);
+	} else {
+		evt.progress.done = (u32) (cur_buffer / 1000);
+		evt.progress.total = (u32) (max_buffer / 1000);
+	}
+	gf_sc_send_event(scene->compositor, &evt);
+}
+
+
+
+void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code, Bool no_queueing)
+{
+	/*fire resize event*/
+#ifndef GPAC_DISABLE_SVG
+	GF_Node *root;
+	u32 i, count;
+	u32 w, h;
+	GF_DOM_Event evt, *dom_event;
+	dom_event = (GF_DOM_Event *)_event;
+
+	if (!scene) return;
+	root = gf_sg_get_root_node(scene->graph);
+
+	if (!dom_event) {
+		memset(&evt, 0, sizeof(GF_DOM_Event));
+		dom_event = &evt;
+		w = h = 0;
+		gf_sg_get_scene_size_info(scene->graph, &w, &h);
+		evt.type = event_type;
+		evt.screen_rect.width = INT2FIX(w);
+		evt.screen_rect.height = INT2FIX(h);
+		evt.key_flags = scene->is_dynamic_scene ? (scene->vr_type ? 2 : 1) : 0;
+		if (root) {
+#ifndef GPAC_DISABLE_VRML
+			switch (gf_node_get_tag(root)) {
+			case TAG_MPEG4_Group:
+			case TAG_MPEG4_Layer3D:
+				evt.detail = 1;
+				break;
+#ifndef GPAC_DISABLE_X3D
+			case TAG_X3D_Group:
+				evt.detail = 2;
+				break;
+#endif
+			}
+#endif
+		}
+
+		evt.error_state = code;
+	}
+	if (n) {
+		if (no_queueing) {
+			gf_dom_event_fire(n, dom_event);
+		} else {
+			gf_sc_queue_dom_event(scene->compositor, n, dom_event);
+		}
+	} else {
+		if (root) {
+			if (no_queueing) {
+				gf_dom_event_fire(root, dom_event);
+			} else {
+				gf_sc_queue_dom_event(scene->compositor, root, dom_event);
+			}
+		}
+
+		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) {
+				gf_dom_event_fire(an, dom_event);
+			} else {
+				gf_sc_queue_dom_event(scene->compositor, an, dom_event);
+			}
+		}
+	}
+#endif
+}
+
+
+GF_EXPORT
+void gf_scene_attach_to_compositor(GF_Scene *scene)
+{
+	if (!scene->root_od) return;
+	if (scene->graph_attached==1) return;
+
+	scene->graph_attached = 1;
+	if (gf_sg_get_root_node(scene->graph)==NULL) {
+		gf_sc_invalidate(scene->compositor, NULL);
+		return;
+	}
+
+	/*locate fragment IRI*/
+	if (scene->root_od->scene_ns && scene->root_od->scene_ns->url) {
+		char *url;
+		if (scene->fragment_uri) {
+			gf_free(scene->fragment_uri);
+			scene->fragment_uri = NULL;
+		}
+		url = strchr(scene->root_od->scene_ns->url, '#');
+		if (url) scene->fragment_uri = gf_strdup(url+1);
+	}
+
+	/*main display scene, setup compositor*/
+	if (!scene->root_od->parentscene) {
+		gf_sc_set_scene(scene->compositor, scene->graph);
+	}
+	else {
+		u32 i, count;
+		count = scene->root_od->mo ? gf_mo_event_target_count(scene->root_od->mo) : 0;
+		for (i=0; i<count; i++) {
+			gf_node_dirty_parents( gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i)));
+		}
+		gf_sc_invalidate(scene->compositor, NULL);
+
+		if (scene->root_od->parentscene->is_dynamic_scene) {
+			u32 w, h;
+			gf_sg_get_scene_size_info(scene->graph, &w, &h);
+			gf_sc_set_size(scene->compositor, w, h);
+		}
+		/*trigger a scene attach event*/
+		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
+	}
+}
+
+static GF_MediaObject *IS_CheckExistingObject(GF_Scene *scene, MFURL *urls, u32 type)
+{
+	GF_MediaObject *obj;
+	u32 i = 0;
+	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
+		if (type && (type != obj->type)) continue;
+		if ((obj->OD_ID == GF_MEDIA_EXTERNAL_ID) && gf_mo_is_same_url(obj, urls, NULL, 0)) return obj;
+		else if ((obj->OD_ID != GF_MEDIA_EXTERNAL_ID) && (obj->OD_ID == urls->vals[0].OD_ID)) return obj;
+	}
+	return NULL;
+}
+
+static GFINLINE Bool is_match_obj_type(u32 type, u32 hint_type)
+{
+	if (!hint_type) return GF_TRUE;
+	if (type==hint_type) return GF_TRUE;
+	/*TEXT are used by animation stream*/
+	if ((type==GF_MEDIA_OBJECT_TEXT) && (hint_type==GF_MEDIA_OBJECT_UPDATES)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+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 *obj;
+	GF_Scene *original_parent_scene = NULL;
+	Bool keep_fragment = GF_TRUE;
+	Bool first_pass = force_new_if_not_attached ? GF_FALSE : GF_TRUE;
+	u32 i, OD_ID;
+
+	OD_ID = gf_mo_get_od_id(url);
+	if (!OD_ID) return NULL;
+
+	/*we may have overriden the time lines in parent scene, thus all objects in this scene have the same clock*/
+	if (scene->root_od->parentscene && scene->root_od->parentscene->force_single_timeline)
+		lock_timelines = GF_TRUE;
+
+	/*the first pass is needed to detect objects already inserted and registered with the given nodes, regardless of
+	the force_new_if_not_attached flag. This ty^pically occurs when a resource is first created then linked to an animation/inline*/
+restart:
+	obj = NULL;
+	i=0;
+	while ((obj = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
+		Bool odm_matches = GF_FALSE;
+
+		if (
+		    /*regular OD scheme*/
+		    (OD_ID != GF_MEDIA_EXTERNAL_ID && (obj->OD_ID==OD_ID))
+		    ||
+		    /*dynamic OD scheme - !! obj->OD_ID may different from GF_MEDIA_EXTERNAL_ID when ODs are
+		    directly added to the terminal by the service*/
+		    ((OD_ID == GF_MEDIA_EXTERNAL_ID)
+		     /*if object type unknown (media control, media sensor), return first obj matching URL
+		     otherwise check types*/
+		     && is_match_obj_type(obj->type, obj_type_hint)
+		     /*locate sub-url in given one and handle fragments (viewpoint/segments/...)*/
+		     && gf_mo_is_same_url(obj, url, &keep_fragment, obj_type_hint)
+		    )
+		) {
+			odm_matches = GF_TRUE;
+		}
+
+		if (!odm_matches) continue;
+
+		if (obj->odm) {
+			Bool can_reuse = GF_TRUE;
+			Bool timeline_locked = (obj->odm->flags & GF_ODM_INHERIT_TIMELINE) ? GF_TRUE : GF_FALSE;
+
+			//addon object always share the timeline
+			if (obj->odm->addon || obj->odm->parentscene->root_od->addon)
+				timeline_locked = lock_timelines = 1;
+
+			if (timeline_locked != lock_timelines)
+				continue;
+
+			if (obj->odm->flags & GF_ODM_DESTROYED) can_reuse = GF_FALSE;
+
+			if (!can_reuse) continue;
+
+		}
+
+		if (!first_pass && !force_new_if_not_attached) {
+			if (node && (gf_mo_event_target_find_by_node(obj, node)<0))
+				gf_mo_event_target_add_node(obj, node);
+			return obj;
+		}
+		/*special case where the URL is requested twice for the same node: use the existing resource*/
+		else if (node && (gf_mo_event_target_find_by_node(obj, node)>=0)) {
+			return obj;
+		}
+	}
+	if (first_pass) {
+		first_pass = GF_FALSE;
+		goto restart;
+	}
+
+	/*we cannot create an OD manager at this point*/
+	if (obj_type_hint==GF_MEDIA_OBJECT_UNDEF) {
+		return NULL;
+	}
+
+	/*create a new object identification*/
+	obj = gf_mo_new();
+	obj->OD_ID = OD_ID;
+	obj->type = obj_type_hint;
+
+	/*register node with object*/
+	if (node) {
+		gf_mo_event_target_add_node(obj, node);
+
+		original_parent_scene = (GF_Scene*) gf_sg_get_private(gf_node_get_graph(node));
+	}
+
+	/*if animation stream object, remember originating node
+		!! FIXME - this should be cleaned up !!
+	*/
+	if (obj->type == GF_MEDIA_OBJECT_UPDATES)
+		obj->node_ptr = node;
+
+	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);
+		/*safety check!!!*/
+		if (gf_list_find(scene->scene_objects, obj)<0) {
+			return NULL;
+		}
+
+		if (obj->odm==NULL) {
+			gf_list_del_item(scene->scene_objects, obj);
+			gf_mo_event_target_reset(obj);
+			gf_mo_del(obj);
+			return NULL;
+		}
+	} else {
+		u32 j;
+		for (j=0; j<gf_list_count(scene->resources); j++) {
+			GF_ObjectManager *odm = gf_list_get(scene->resources, j);
+			if (odm->ID == obj->OD_ID) {
+				obj->odm = odm;
+				break;
+			}
+		}
+	}
+	return obj;
+}
+
+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);
+}
+
+
+static void gf_scene_get_video_size(GF_MediaObject *mo, u32 *w, u32 *h)
+{
+	u32 pixel_ar;
+	if (!gf_mo_get_visual_info(mo, w, h, NULL, &pixel_ar, NULL, NULL)) return;
+	if (pixel_ar) {
+		u32 n, d;
+		n = (pixel_ar>>16) & 0x0000FFFF;
+		d = (pixel_ar) & 0x0000FFFF;
+		*w = (*w * n) / d;
+	}
+#ifndef GPAC_DISABLE_3D
+	if (mo->odm) {
+		if (mo->odm->parentscene->compositor->fpack==GF_3D_STEREO_TOP) *h /= 2;
+		else if (mo->odm->parentscene->compositor->fpack==GF_3D_STEREO_SIDE) *w /= 2;
+	}
+#endif
+}
+
+
+GF_EXPORT
+void gf_scene_setup_object(GF_Scene *scene, GF_ObjectManager *odm)
+{
+	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));
+
+	/*an object may already be assigned (when using ESD URLs, setup is performed twice)*/
+	if (odm->mo != NULL) goto existing;
+
+	i=0;
+	while ((obj = (GF_MediaObject*)gf_list_enum(scene->scene_objects, &i))) {
+		/*make sure services are different*/
+		if (obj->odm && (odm->source_id != obj->odm->source_id)) continue;
+
+		if (obj->OD_ID==GF_MEDIA_EXTERNAL_ID) {
+			//assert(obj->odm);
+			if (obj->odm == odm) {
+				/*assign FINAL OD, not parent*/
+				obj->odm = odm;
+				odm->mo = obj;
+				goto existing;
+			}
+		}
+		else if (obj->OD_ID == odm->ID) {
+			GF_ObjectManager *old_odm = NULL;
+			//OD update may trigger reassignment of ODM
+			if (obj->odm && (obj->odm != odm)) {
+				old_odm = obj->odm;
+			}
+			obj->odm = odm;
+			if (old_odm) {
+				if (old_odm->mo) old_odm->mo->odm = NULL;
+				old_odm->mo = NULL;
+				gf_odm_disconnect(old_odm, GF_TRUE);
+			}
+			odm->mo = obj;
+			goto existing;
+		}
+	}
+	/*newly created OD*/
+	odm->mo = gf_mo_new();
+	gf_list_add(scene->scene_objects, odm->mo);
+	odm->mo->odm = odm;
+	odm->mo->OD_ID = odm->ID;
+
+existing:
+	/*setup object type*/
+	if (!odm->type) odm->type = GF_MEDIA_OBJECT_SCENE;
+	else if (odm->type == GF_STREAM_VISUAL) odm->mo->type = GF_MEDIA_OBJECT_VIDEO;
+	else if (odm->type == GF_STREAM_AUDIO) odm->mo->type = GF_MEDIA_OBJECT_AUDIO;
+	else if (odm->type == GF_STREAM_TEXT) odm->mo->type = GF_MEDIA_OBJECT_TEXT;
+	else if (odm->type == GF_STREAM_SCENE) odm->mo->type = GF_MEDIA_OBJECT_UPDATES;
+
+	/*update info*/
+	gf_mo_update_caps(odm->mo);
+	/*media object playback has already been requested by the scene, trigger media start*/
+	if (odm->mo->num_open && !odm->state) {
+		gf_odm_start(odm);
+		if (odm->mo->speed != FIX_ONE) gf_odm_set_speed(odm, odm->mo->speed, GF_TRUE);
+	}
+	if ((odm->mo->type==GF_MEDIA_OBJECT_VIDEO) && scene->is_dynamic_scene && !odm->parentscene->root_od->addon) {
+		gf_scene_force_size_to_video(scene, odm->mo);
+	}
+	else if (!odm->scene_ns->source_filter && (odm->flags & GF_ODM_PASSTHROUGH))  {
+		u32 w, h;
+		gf_scene_get_video_size(odm->mo, &w, &h);
+		gf_sc_set_size(scene->compositor, w, h);
+	}
+	/*invalidate scene for all nodes using the OD*/
+	gf_sc_invalidate(odm->parentscene->compositor, NULL);
+}
+
+GF_EXPORT
+void gf_scene_set_duration(GF_Scene *scene)
+{
+	Double dur;
+	u32 i;
+	u64 max_dur;
+	GF_ObjectManager *odm;
+#ifndef GPAC_DISABLE_VRML
+	MediaSensorStack *media_sens;
+#endif
+	GF_Clock *ck;
+
+	/*this is not normative but works in so many cases... set the duration to the max duration
+	of all streams sharing the clock*/
+	ck = gf_odm_get_media_clock(scene->root_od);
+	max_dur = scene->root_od->duration;
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+		if (!ck || gf_odm_shares_clock(odm, ck)) {
+			if (odm->duration>max_dur) max_dur = odm->duration;
+		}
+	}
+	if (scene->duration == max_dur) return;
+
+	scene->duration = max_dur;
+	if (scene->is_dynamic_scene && !scene->root_od->duration) scene->root_od->duration = max_dur;
+
+	dur = (Double) (s64) scene->duration;
+	dur /= 1000;
+
+#ifndef GPAC_DISABLE_VRML
+	i=0;
+	while ((media_sens = (MediaSensorStack*)gf_list_enum(scene->root_od->ms_stack, &i))) {
+		if (media_sens->sensor->isActive) {
+			media_sens->sensor->mediaDuration = dur;
+			gf_node_event_out((GF_Node *) media_sens->sensor, 3/*"mediaDuration"*/);
+		}
+	}
+#endif
+
+	if (!scene->root_od->parentscene) {
+		GF_Event evt;
+		evt.type = GF_EVENT_DURATION;
+		evt.duration.duration = dur;
+		evt.duration.can_seek = (scene->root_od->flags & GF_ODM_NO_TIME_CTRL) ? GF_FALSE : GF_TRUE;
+		if (dur<1.0) evt.duration.can_seek = 0;
+		gf_sc_send_event(scene->compositor, &evt);
+	}
+}
+
+GF_EXPORT
+void gf_scene_set_timeshift_depth(GF_Scene *scene)
+{
+	u32 i;
+	u32 max_timeshift;
+	GF_ObjectManager *odm;
+	GF_Clock *ck;
+
+	ck = gf_odm_get_media_clock(scene->root_od);
+	max_timeshift = scene->root_od->timeshift_depth;
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+		if (!ck || gf_odm_shares_clock(odm, ck)) {
+			if (odm->timeshift_depth > max_timeshift) max_timeshift = odm->timeshift_depth;
+		}
+	}
+	if (scene->timeshift_depth == max_timeshift) return;
+
+	scene->timeshift_depth = max_timeshift;
+	if (scene->is_dynamic_scene && !scene->root_od->timeshift_depth) scene->root_od->timeshift_depth = max_timeshift;
+	if (scene->root_od->addon && (scene->root_od->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+		if (scene->root_od->parentscene->is_dynamic_scene && (scene->root_od->parentscene->timeshift_depth < max_timeshift)) {
+			scene->root_od->parentscene->timeshift_depth = max_timeshift;
+			scene->root_od->parentscene->root_od->timeshift_depth = max_timeshift;
+			gf_scene_notify_event(scene->root_od->parentscene, GF_EVENT_TIMESHIFT_DEPTH, NULL, NULL, GF_OK, GF_FALSE);
+		}
+	} else {
+		gf_scene_notify_event(scene, GF_EVENT_TIMESHIFT_DEPTH, NULL, NULL, GF_OK, GF_FALSE);
+	}
+}
+
+
+GF_MediaObject *gf_scene_find_object(GF_Scene *scene, u16 ODID, char *url)
+{
+	u32 i;
+	GF_MediaObject *mo;
+	if (!url && !ODID) return NULL;
+	i=0;
+	while ((mo = (GF_MediaObject *)gf_list_enum(scene->scene_objects, &i))) {
+		if ((ODID==GF_MEDIA_EXTERNAL_ID) && url) {
+			if (mo->URLs.count && !stricmp(mo->URLs.vals[0].url, url)) return mo;
+		} else if (mo->OD_ID==ODID) {
+			return mo;
+		}
+	}
+	return NULL;
+}
+
+
+GF_EXPORT
+void gf_scene_register_extra_graph(GF_Scene *scene, GF_SceneGraph *extra_scene, Bool do_remove)
+{
+	if (do_remove) {
+		if (gf_list_find(scene->extra_scenes, extra_scene)<0) return;
+		gf_list_del_item(scene->extra_scenes, extra_scene);
+		/*for root scene*/
+		if (! scene->root_od->parentscene) {
+			gf_sc_register_extra_graph(scene->compositor, extra_scene, 1);
+		}
+	} else {
+		if (gf_list_find(scene->extra_scenes, extra_scene)>=0) return;
+		gf_list_add(scene->extra_scenes, extra_scene);
+		/*for root scene*/
+		if (!scene->root_od->parentscene) {
+			gf_sc_register_extra_graph(scene->compositor, extra_scene, 0);
+		}
+	}
+}
+
+void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo)
+{
+	u32 w, h;
+	gf_scene_get_video_size(mo, &w, &h);
+
+	if (w && h) gf_scene_force_size(scene, w, h);
+}
+
+#ifndef GPAC_DISABLE_VRML
+
+static void IS_UpdateVideoPos(GF_Scene *scene)
+{
+	MFURL url;
+	M_Transform2D *tr;
+	GF_MediaObject *mo;
+	u32 w, h, v_w, v_h;
+	if (!scene->visual_url.OD_ID && !scene->visual_url.url) return;
+
+	if (scene->vr_type) return;
+
+	url.count = 1;
+	url.vals = &scene->visual_url;
+	mo = IS_CheckExistingObject(scene, &url, GF_MEDIA_OBJECT_VIDEO);
+	if (!mo) return;
+	tr = (M_Transform2D *) gf_sg_find_node_by_name(scene->graph, "DYN_TRANS");
+	if (!tr) return;
+
+	gf_sg_get_scene_size_info(scene->graph, &w, &h);
+	if (!w || !h) return;
+
+	gf_scene_get_video_size(mo, &v_w, &v_h);
+	if (scene->force_size_set) {
+		if (v_w && v_h) {
+			tr->scale.x = gf_divfix(INT2FIX(w), INT2FIX(v_w));
+			tr->scale.y = gf_divfix(INT2FIX(h), INT2FIX(v_h));
+		}
+		tr->translation.x = tr->translation.y = 0;
+	} else {
+		tr->scale.x = tr->scale.y = FIX_ONE;
+		tr->translation.x = INT2FIX((s32) (w - v_w)) / 2;
+		tr->translation.y = INT2FIX((s32) (h - v_h)) / 2;
+	}
+	gf_node_dirty_set((GF_Node *)tr, 0, 0);
+
+	gf_scene_set_addon_layout_info(scene, scene->addon_position, scene->addon_size_factor);
+
+}
+
+static GF_Node *is_create_node(GF_SceneGraph *sg, u32 tag, const char *def_name)
+{
+	GF_Node *n = gf_node_new(sg, tag);
+	if (n) {
+		if (def_name) gf_node_set_id(n, gf_sg_get_next_available_node_id(sg), def_name);
+		gf_node_init(n);
+	}
+	return n;
+}
+
+static Bool is_odm_url(SFURL *url, GF_ObjectManager *odm)
+{
+	if (!url->OD_ID && !url->url) return 0;
+	if (odm->ID != GF_MEDIA_EXTERNAL_ID) return (url->OD_ID==odm->ID) ? 1 : 0;
+
+	if (!url->url || !odm->scene_ns || !odm->scene_ns->url) return 0;
+	return !stricmp(url->url, odm->scene_ns->url);
+}
+
+static void set_media_url(GF_Scene *scene, SFURL *media_url, GF_Node *node,  MFURL *node_url, u32 type)
+{
+	u32 w, h;
+	SFURL *sfu;
+	Bool url_changed = 0;
+
+	/*scene url is not set, find the first one*/
+	if (!media_url->OD_ID  ) {
+		u32 count, i;
+		GF_ObjectManager *odm = NULL;
+		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)
+				continue;
+
+			if (type==GF_STREAM_TEXT) {
+				if (odm->type!=type) continue;
+			}
+			else if (type==GF_STREAM_SCENE) {
+				if (!odm->subscene || !odm->subscene->is_dynamic_scene) continue;
+
+				if (odm->subscene->root_od->addon)
+					continue;
+			}
+			else {
+				if (odm->type!=type) continue;
+				//todo: select preferred media format ?
+			}
+
+			if (scene->selected_service_id && (scene->selected_service_id != odm->ServiceID)) {
+				//objects inserted from broadcast may have been played but not yet registered with the scene, we need to force a stop
+				if ((odm->mo && !odm->mo->num_open) || !odm->mo) {
+					if (odm->state==GF_ODM_STATE_PLAY) {
+
+						gf_odm_stop(odm, GF_FALSE);
+					}
+				}
+				continue;
+			}
+
+
+			media_url->OD_ID = odm->ID;
+			if (media_url->OD_ID==GF_MEDIA_EXTERNAL_ID) media_url->url = gf_strdup(odm->scene_ns->url);
+
+			//happens when switching service in a TS multiplex
+			if (!scene->root_od->ck) {
+				scene->root_od->ck = odm->ck;
+			}
+
+			if (odm->mo && (type==GF_STREAM_VISUAL)) {
+				gf_scene_get_video_size(odm->mo, &w, &h);
+				if (w && h) {
+					scene->force_size_set = 0;
+					gf_sg_set_scene_size_info(scene->graph, w, h, 1);
+					gf_scene_force_size(scene, w, h);
+				}
+			}
+			break;
+		}
+		if (!odm) {
+			if (media_url->OD_ID ) url_changed = 1;
+			media_url->OD_ID = 0;
+			if (media_url->url) {
+				gf_free(media_url->url);
+				media_url->url = NULL;
+			}
+		}
+	}
+
+	if (media_url->OD_ID) {
+		if (!node_url->count) url_changed = 1;
+		else if (node_url->vals[0].OD_ID!=media_url->OD_ID) url_changed = 1;
+		else if (media_url->OD_ID==GF_MEDIA_EXTERNAL_ID) {
+			if (!node_url->vals[0].url || !media_url->url || strcmp(node_url->vals[0].url, media_url->url) ) url_changed = 1;
+		}
+	} else {
+		if (node_url->count) url_changed = 1;
+	}
+
+	if (url_changed) {
+		gf_sg_vrml_mf_reset(node_url, GF_SG_VRML_MFURL);
+		gf_sg_vrml_mf_append(node_url, GF_SG_VRML_MFURL, (void **) &sfu);
+		sfu->OD_ID = media_url->OD_ID;
+		if (media_url->url) sfu->url = gf_strdup(media_url->url);
+
+		gf_node_changed(node, NULL);
+	}
+
+}
+
+static void scene_video_mouse_move(void *param, GF_FieldInfo *field)
+{
+	u32 i, count;
+	Bool supported = GF_FALSE;
+	GF_Scene *scene = (GF_Scene *) param;
+	SFVec2f tx_coord = * ((SFVec2f *) field->far_ptr);
+	GF_Node *n = gf_sg_find_node_by_name(scene->graph, "DYN_TOUCH");
+
+	if (!scene->visual_url.OD_ID) return;
+
+	count = gf_list_count(scene->resources);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *prop;
+		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+		if (!odm->mo) continue;
+
+		prop = gf_filter_pid_get_property_str(odm->pid, "MouseEvents");
+		if (prop && prop->value.boolean) {
+			GF_FilterEvent evt;
+			supported = GF_TRUE;
+			GF_FEVT_INIT(evt, GF_FEVT_USER, odm->pid);
+
+			evt.user_event.event.type = ((M_TouchSensor *)n)->isActive ? GF_EVENT_MOUSEDOWN : GF_EVENT_MOUSEUP;
+			evt.user_event.event.mouse.x = FIX2INT( tx_coord.x * odm->mo->width);
+			evt.user_event.event.mouse.y = FIX2INT( tx_coord.y * odm->mo->height);
+
+			gf_filter_pid_send_event(odm->pid, &evt);
+
+		}
+	}
+	if (!supported) {
+		if (n) ((M_TouchSensor *)n)->enabled = GF_FALSE;
+	}
+}
+
+static GF_Node *load_vr_proto_node(GF_SceneGraph *sg, const char *name, const char *def_name)
+{
+	GF_Proto *proto;
+	GF_Node *node;
+	if (!name) name = "urn:inet:gpac:builtin:VRGeometry";
+
+	proto = gf_sg_find_proto(sg, 0, (char *) name);
+	if (!proto) {
+		MFURL *url;
+		proto = gf_sg_proto_new(sg, 0,  (char *) name, GF_FALSE);
+		url = gf_sg_proto_get_extern_url(proto);
+		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"));
+			return NULL;
+		}
+		url->count=1;
+		url->vals[0].url = gf_strdup(name);
+	}
+	node = gf_sg_proto_create_instance(sg, proto);
+	if (node) {
+		if (def_name) gf_node_set_id(node, gf_sg_get_next_available_node_id(sg), def_name);
+		gf_node_init(node);
+	}
+	return node;
+}
+
+
+static void create_movie(GF_Scene *scene, GF_Node *root, const char *tr_name, const char *texture_name, const char *name_geo)
+{
+	M_MovieTexture *mt;
+	GF_Node *n1, *n2;
+
+	/*create a shape and bitmap node*/
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Transform2D, tr_name);
+	gf_node_list_add_child( &((GF_ParentNode *)root)->children, n2);
+	gf_node_register(n2, root);
+	n1 = n2;
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
+	gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+	gf_node_register(n2, n1);
+	n1 = n2;
+	n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
+	((M_Shape *)n1)->appearance = n2;
+	gf_node_register(n2, n1);
+
+	/*note we create a movie texture even for images...*/
+	mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, texture_name);
+	mt->startTime = gf_scene_get_time(scene);
+	((M_Appearance *)n2)->texture = (GF_Node *)mt;
+	gf_node_register((GF_Node *)mt, n2);
+
+	if (scene->srd_type) {
+		GF_Node *app = n2;
+
+		if (scene->vr_type) {
+			n2 = load_vr_proto_node(scene->graph, NULL, name_geo);
+		} else {
+			n2 = is_create_node(scene->graph, TAG_MPEG4_Rectangle, name_geo);
+		}
+
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+		//force  appearance material2D.filled = TRUE
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Material2D, NULL);
+		((M_Material2D *)n2)->filled = GF_TRUE;
+		((M_Appearance *)app)->material = n2;
+		gf_node_register(n2, app);
+	} else if (scene->vr_type) {
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Sphere, name_geo);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+	} else {
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, name_geo);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+	}
+}
+/*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*/
+void gf_scene_regenerate(GF_Scene *scene)
+{
+	GF_Node *n1, *n2;
+	GF_Event evt;
+	M_AudioClip *ac;
+	M_MovieTexture *mt;
+	M_AnimationStream *as;
+	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));
+
+	ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
+
+	/*this is the first time, generate a scene graph*/
+	if (!ac) {
+		GF_Node *root;
+
+		/*create an OrderedGroup*/
+		n1 = is_create_node(scene->graph, scene->vr_type ? TAG_MPEG4_Group : TAG_MPEG4_OrderedGroup, NULL);
+		gf_sg_set_root_node(scene->graph, n1);
+		gf_node_register(n1, NULL);
+		root = n1;
+
+		if (! scene->root_od->parentscene && !scene->compositor->dyn_filter_mode) {
+			n2 = is_create_node(scene->graph, TAG_MPEG4_Background2D, "DYN_BACK");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+			gf_node_register(n2, n1);
+		}
+
+		//create VP info regardless of VR type
+		if (scene->vr_type) {
+			n2 = is_create_node(scene->graph, TAG_MPEG4_Viewpoint, "DYN_VP");
+			((M_Viewpoint *)n2)->position.z = 0;
+
+#ifndef GPAC_DISABLE_3D
+			((M_Viewpoint *)n2)->fieldOfView = scene->compositor->fov;
+#else
+			((M_Viewpoint *)n2)->fieldOfView = GF_PI/2;
+#endif
+
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+			gf_node_register(n2, n1);
+
+			n2 = is_create_node(scene->graph, TAG_MPEG4_NavigationInfo, NULL);
+			gf_free( ((M_NavigationInfo *)n2)->type.vals[0] );
+			((M_NavigationInfo *)n2)->type.vals[0] = gf_strdup("VR");
+			gf_free( ((M_NavigationInfo *)n2)->type.vals[1] );
+			((M_NavigationInfo *)n2)->type.vals[1] = gf_strdup("NONE");
+			((M_NavigationInfo *)n2)->type.count = 2;
+			((M_NavigationInfo *)n2)->avatarSize.count = 0;
+
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+			gf_node_register(n2, n1);
+		}
+
+		/*create an sound2D and an audioClip node*/
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
+		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+		gf_node_register(n2, n1);
+
+		ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, "DYN_AUDIO1");
+		ac->startTime = gf_scene_get_time(scene);
+		((M_Sound2D *)n2)->source = (GF_Node *)ac;
+		gf_node_register((GF_Node *)ac, n2);
+
+
+		/*transform for any translation due to scene resize (3GPP)*/
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Transform2D, "DYN_TRANS");
+		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+		gf_node_register(n2, n1);
+		n1 = n2;
+
+		/*create a touch sensor for the video*/
+		n2 = is_create_node(scene->graph, TAG_MPEG4_TouchSensor, "DYN_TOUCH");
+		gf_node_list_add_child( &((GF_ParentNode *)n1)->children, n2);
+		gf_node_register(n2, n1);
+		gf_sg_route_new_to_callback(scene->graph, n2, 3/*"hitTexCoord_changed"*/, scene, scene_video_mouse_move);
+
+		create_movie(scene, n1, "TR1", "DYN_VIDEO1", "DYN_GEOM1");
+
+		if (! scene->vr_type) {
+			M_Transform2D *addon_tr;
+			M_Layer2D *addon_layer;
+			M_Inline *addon_scene;
+
+			/*text streams controlled through AnimationStream*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			as = (M_AnimationStream *) is_create_node(scene->graph, TAG_MPEG4_AnimationStream, "DYN_TEXT");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)as);
+			gf_node_register((GF_Node *)as, n1);
+
+
+			/*3GPP DIMS streams controlled */
+			n1 = gf_sg_get_root_node(scene->graph);
+			dims = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "DIMS_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)dims);
+			gf_node_register((GF_Node *)dims, n1);
+
+			/*PVR version of live content*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "PVR_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_scene);
+			gf_node_register((GF_Node *)addon_scene, (GF_Node *)n1);
+
+			/*Media addon scene*/
+			n1 = gf_sg_get_root_node(scene->graph);
+			addon_tr = (M_Transform2D *) is_create_node(scene->graph, TAG_MPEG4_Transform2D, "ADDON_TRANS");
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, (GF_Node*)addon_tr);
+			gf_node_register((GF_Node *)addon_tr, n1);
+
+			addon_layer = (M_Layer2D *) is_create_node(scene->graph, TAG_MPEG4_Layer2D, "ADDON_LAYER");
+			gf_node_list_add_child( &((GF_ParentNode *)addon_tr)->children, (GF_Node*)addon_layer);
+			gf_node_register((GF_Node *)addon_layer, (GF_Node *)addon_tr);
+
+			addon_scene = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, "ADDON_SCENE");
+			gf_node_list_add_child( &((GF_ParentNode *)addon_layer)->children, (GF_Node*)addon_scene);
+			gf_node_register((GF_Node *)addon_scene, (GF_Node *)addon_layer);
+		}
+		//VR mode, add VR headup
+		else {
+			GF_Node *vrhud = load_vr_proto_node(scene->graph, "urn:inet:gpac:builtin:VRHUD", NULL);
+			gf_node_list_add_child( &((GF_ParentNode *)root)->children, (GF_Node*)vrhud);
+			gf_node_register(vrhud, root);
+		}
+
+		//send activation for sensors
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SENSOR_REQUEST;
+		evt.activate_sensor.activate = scene->vr_type;
+		evt.activate_sensor.sensor_type = GF_EVENT_SENSOR_ORIENTATION;
+		if (gf_sc_send_event(scene->compositor, &evt)==GF_TRUE) {
+			scene->compositor->orientation_sensors_active = scene->vr_type;
+		} else {
+			scene->compositor->orientation_sensors_active = GF_FALSE;
+		}
+	}
+
+	if (scene->ambisonic_type) {
+		char szName[20];
+		SFURL url;
+		u32 i, count;
+		GF_Node *an, *root = gf_sg_get_root_node(scene->graph);
+		url.url = NULL;
+		url.OD_ID = 0;
+
+		count = gf_list_count(scene->resources);
+		for (i=0; i<count; i++) {
+			GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+			if (!odm->ambi_ch_id) continue;
+
+			sprintf(szName, "DYN_AUDIO%d", odm->ambi_ch_id);
+			an = gf_sg_find_node_by_name(scene->graph, szName);
+			if (!an) {
+				/*create an sound2D and an audioClip node*/
+				an = is_create_node(scene->graph, TAG_MPEG4_Sound2D, NULL);
+				gf_node_list_add_child( &((GF_ParentNode *)root)->children, an);
+				gf_node_register(an, root);
+
+				ac = (M_AudioClip *) is_create_node(scene->graph, TAG_MPEG4_AudioClip, szName);
+				ac->startTime = gf_scene_get_time(scene);
+				((M_Sound2D *)an)->source = (GF_Node *)ac;
+				gf_node_register((GF_Node *)ac, an);
+			}
+			ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, szName);
+
+			url.OD_ID = odm->ID;
+			set_media_url(scene, &url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+		}
+	} else {
+		ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
+		set_media_url(scene, &scene->audio_url, (GF_Node*)ac, &ac->url, GF_STREAM_AUDIO);
+	}
+
+
+	if (scene->srd_type) {
+		char szName[20], szTex[20], szGeom[20];
+		u32 i, nb_srd = 0, srd_missing = 0;
+		GF_ObjectManager *a_odm;
+		SFURL url;
+		u32 sw, sh;
+		s32 min_x, max_x, min_y, max_y;
+		i=0;
+
+		//we use 0 (and not INT_MAX) to always display the same thing regardless of holes in the srd description
+		min_x = min_y = 0;
+		max_x = max_y = 0;
+
+		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			if (!a_odm->mo || !a_odm->mo->srd_w) {
+				srd_missing++;
+				continue;
+			}
+			if ((s32) a_odm->mo->srd_x < min_x) min_x = (s32) a_odm->mo->srd_x;
+			if ((s32) a_odm->mo->srd_y < min_y) min_y = (s32) a_odm->mo->srd_y;
+
+			if (!max_x)
+				max_x = a_odm->mo->srd_full_w;
+			if ((s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w > min_x + max_x)
+				max_x = (s32) a_odm->mo->srd_x + (s32) a_odm->mo->srd_w - min_x;
+
+			if (!max_y)
+				max_y = a_odm->mo->srd_full_h;
+
+			if ((s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h > min_y + max_y)
+				max_y = (s32) a_odm->mo->srd_y + (s32) a_odm->mo->srd_h - min_y;
+
+			nb_srd++;
+		}
+
+		n1 = gf_sg_find_node_by_name(scene->graph, "DYN_TRANS");
+		for (i=1; i<nb_srd+srd_missing; i++) {
+			sprintf(szName, "TR%d", i+1);
+			sprintf(szTex, "DYN_VIDEO%d", i+1);
+			sprintf(szGeom, "DYN_GEOM%d", i+1);
+			n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
+			if (!n2) {
+				create_movie(scene, n1, szName, szTex, szGeom);
+			}
+		}
+		assert(max_x>min_x);
+		assert(max_y>min_y);
+
+		scene->srd_min_x = min_x;
+		scene->srd_min_y = min_y;
+		scene->srd_max_x = max_x;
+		scene->srd_max_y = max_y;
+
+		url.url = NULL;
+		gf_sg_get_scene_size_info(scene->graph, &sw, &sh);
+		i=0;
+		while ((a_odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+			if (a_odm->mo && a_odm->mo->srd_w) {
+				Fixed tw, th, tx, ty;
+
+				sprintf(szName, "TR%d", i);
+				sprintf(szTex, "DYN_VIDEO%d", i);
+				sprintf(szGeom, "DYN_GEOM%d", i);
+				url.OD_ID = a_odm->ID;
+
+				mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, szTex);
+				if (!mt) continue;
+
+				set_media_url(scene, &url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
+
+				if (!scene->root_od->ck && a_odm->ck) {
+					scene->root_od->ck = a_odm->ck;
+				}
+
+				if (scene->vr_type) {
+					n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
+					gf_node_changed(n2, NULL);
+				} else {
+					M_Transform2D *addon_tr;
+
+					tw = INT2FIX( sw * a_odm->mo->srd_w) /  (max_x - min_x);
+					th = INT2FIX(sh * a_odm->mo->srd_h) / (max_y - min_y);
+
+					n2 = gf_sg_find_node_by_name(scene->graph, szGeom);
+					((M_Rectangle *)n2)->size.x = tw;
+					((M_Rectangle *)n2)->size.y = th;
+					gf_node_changed(n2, NULL);
+
+					tx = INT2FIX(a_odm->mo->srd_x * sw) / (max_x - min_x);
+					tx = tx - INT2FIX(sw) / 2 + INT2FIX(tw) / 2;
+
+					ty = INT2FIX(a_odm->mo->srd_y * sh) / (max_y - min_y);
+					ty = INT2FIX(sh) / 2 - ty - INT2FIX(th) / 2;
+
+					addon_tr = (M_Transform2D  *) gf_sg_find_node_by_name(scene->graph, szName);
+					addon_tr->translation.x = tx;
+					addon_tr->translation.y = ty;
+					gf_node_changed((GF_Node *)addon_tr, NULL);
+				}
+			}
+		}
+	} else {
+		mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
+		set_media_url(scene, &scene->visual_url, (GF_Node*)mt, &mt->url, GF_STREAM_VISUAL);
+	}
+
+
+	if (! scene->vr_type) {
+		as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
+		set_media_url(scene, &scene->text_url, (GF_Node*)as, &as->url, GF_STREAM_TEXT);
+
+		dims = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "DIMS_SCENE");
+		set_media_url(scene, &scene->dims_url, (GF_Node*)dims, &dims->url, GF_STREAM_SCENE);
+	}
+
+	/*disconnect to force resize*/
+	if (!scene->root_od->parentscene) {
+		gf_sc_set_scene(scene->compositor, scene->graph);
+		scene->graph_attached = 1;
+
+		evt.type = GF_EVENT_STREAMLIST;
+		gf_sc_send_event(scene->compositor, &evt);
+
+		IS_UpdateVideoPos(scene);
+	} else {
+		gf_scene_notify_event(scene, scene->graph_attached ? GF_EVENT_STREAMLIST : GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
+		scene->graph_attached = 1;
+		gf_sc_invalidate(scene->compositor, NULL);
+	}
+}
+
+void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons)
+{
+	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);
+	}
+	gf_node_changed((GF_Node *)dscene, NULL);
+}
+
+#else
+/*!!fixme - we would need an SVG scene in case no VRML support is present !!!*/
+GF_EXPORT
+void gf_scene_regenerate(GF_Scene *scene) {}
+GF_EXPORT
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check) {}
+GF_EXPORT
+void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm) {}
+GF_EXPORT
+void gf_scene_toggle_addons(GF_Scene *scene, Bool show_addons) { }
+GF_EXPORT
+void gf_scene_resume_live(GF_Scene *subscene) { }
+GF_EXPORT
+void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor) {}
+GF_EXPORT
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time) { }
+
+#endif	/*GPAC_DISABLE_VRML*/
+
+#ifndef GPAC_DISABLE_VRML
+
+static Bool check_odm_deactivate(SFURL *url, GF_ObjectManager *odm, GF_Node *n)
+{
+	GF_FieldInfo info;
+	MFURL *mfurl;
+	if (!is_odm_url(url, odm) || !n) return 0;
+
+	gf_node_get_field_by_name(n, "url", &info);
+	mfurl = (MFURL *)info.far_ptr;
+	if ((url->OD_ID!=GF_MEDIA_EXTERNAL_ID) && mfurl->count && (mfurl->vals[0].OD_ID==url->OD_ID))
+		return 1;
+
+	if (url->url) gf_free(url->url);
+	url->url = NULL;
+	url->OD_ID = 0;
+
+	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
+	gf_node_get_field_by_name(n, "stopTime", &info);
+	*((SFTime *)info.far_ptr) = gf_node_get_scene_time(n);
+	gf_node_changed(n, NULL);
+	return 1;
+}
+
+static void odm_deactivate(GF_Node *n)
+{
+	GF_FieldInfo info;
+
+	gf_node_get_field_by_name(n, "url", &info);
+	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
+	gf_node_get_field_by_name(n, "stopTime", &info);
+	*((SFTime *)info.far_ptr) = gf_node_get_scene_time(n);
+	gf_node_changed(n, NULL);
+}
+
+static void odm_activate(SFURL *url, GF_Node *n)
+{
+	SFURL *sfu;
+	GF_FieldInfo info;
+
+	gf_node_get_field_by_name(n, "url", &info);
+	gf_sg_vrml_mf_reset(info.far_ptr, GF_SG_VRML_MFURL);
+	if (url->OD_ID || url->url) {
+		gf_sg_vrml_mf_append(info.far_ptr, GF_SG_VRML_MFURL, (void **) &sfu);
+		sfu->OD_ID = url->OD_ID;
+		if (url->url) sfu->url = gf_strdup(url->url);
+
+		gf_node_get_field_by_name(n, "startTime", &info);
+		*((SFTime *)info.far_ptr) = 0.0;
+		gf_node_get_field_by_name(n, "stopTime", &info);
+		*((SFTime *)info.far_ptr) = 0.0;
+	}
+
+	gf_node_changed(n, NULL);
+}
+
+GF_EXPORT
+void gf_scene_set_service_id(GF_Scene *scene, u32 service_id)
+{
+	if (!scene->is_dynamic_scene) return;
+
+	gf_sc_lock(scene->compositor, 1);
+	if (scene->selected_service_id != service_id) {
+		u32 i;
+		GF_ObjectManager *odm, *remote_odm = NULL;
+		//delete all objects with given service ID
+		i=0;
+		while ((odm = gf_list_enum(scene->resources, &i))) {
+			if (odm->ServiceID != scene->selected_service_id) continue;
+			if (odm->redirect_url) {
+				remote_odm = odm;
+				assert(remote_odm->scene_ns->nb_odm_users);
+				remote_odm->scene_ns->nb_odm_users--;
+				remote_odm->scene_ns = scene->root_od->scene_ns;
+				remote_odm->scene_ns->nb_odm_users++;
+			}
+			//delete all objects from this service
+			else if (remote_odm) {
+				if (odm->scene_ns==remote_odm->scene_ns) odm->scene_ns->owner = odm;
+				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));
+
+		scene->selected_service_id = service_id;
+		scene->audio_url.OD_ID = 0;
+		scene->visual_url.OD_ID = 0;
+		scene->text_url.OD_ID = 0;
+		scene->dims_url.OD_ID = 0;
+		scene->force_size_set = 0;
+		//reset clock since we change service IDs, but request a PLAY from the current time
+		if (scene->root_od->ck) {
+			scene->root_od->media_start_time = gf_clock_media_time(scene->root_od->ck);
+			scene->root_od->ck = NULL;
+		}
+
+		if (remote_odm) {
+			i=0;
+			while ((odm = gf_list_enum(scene->resources, &i))) {
+				if (odm->ServiceID!=scene->selected_service_id) continue;
+				if (odm->redirect_url) {
+					//gf_odm_setup_object will increment the number of odms in net service (it's supposed to
+					//be called only upon startup, but we reuse the function). Since we are already registered
+					//with the service, decrement before calling
+					odm->scene_ns->nb_odm_users--;
+					gf_odm_setup_object(odm, odm->scene_ns, odm->pid);
+				}
+				break;
+			}
+		}
+		gf_scene_regenerate(scene);
+	}
+	gf_sc_lock(scene->compositor, 0);
+}
+
+GF_EXPORT
+void gf_scene_select_object(GF_Scene *scene, GF_ObjectManager *odm)
+{
+	char *url;
+	if (!scene->is_dynamic_scene || !scene->graph_attached || !odm) return;
+
+	if (!odm->ID) {
+		if (!odm->addon) return;
+	}
+
+	if (odm->ServiceID && scene->selected_service_id && (scene->selected_service_id != odm->ServiceID)) {
+		gf_scene_set_service_id(scene, odm->ServiceID);
+		return;
+	}
+
+
+	if (odm->state) {
+		if (check_odm_deactivate(&scene->audio_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1")) ) return;
+		if (check_odm_deactivate(&scene->visual_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1") )) return;
+		if (check_odm_deactivate(&scene->text_url, odm, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT") )) return;
+	}
+
+
+	if (!odm->ID && odm->subscene) {
+		M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, "ADDON_SCENE");
+
+		if (!dscene)
+			return;
+
+		if (odm->addon && odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
+			return;
+		}
+
+		gf_sg_vrml_field_copy(&dscene->url, &odm->mo->URLs, GF_SG_VRML_MFURL);
+		gf_node_changed((GF_Node *)dscene, NULL);
+		//do not update video pos for addons, this is done only when setting up the main video object
+		return;
+	}
+
+	if (odm->type == GF_STREAM_AUDIO) {
+		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
+		if (!ac) return;
+		if (scene->audio_url.url) gf_free(scene->audio_url.url);
+		scene->audio_url.url = NULL;
+		scene->audio_url.OD_ID = odm->ID;
+		if (!ac->url.count) gf_sg_vrml_mf_alloc(&ac->url, GF_SG_VRML_MFURL, 1);
+		ac->url.vals[0].OD_ID = odm->ID;
+		if (ac->url.vals[0].url) {
+			gf_free(ac->url.vals[0].url);
+			ac->url.vals[0].url = NULL;
+		}
+		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
+		if (url) {
+			scene->audio_url.url = gf_strdup(url);
+			ac->url.vals[0].url = gf_strdup(url);
+		}
+		ac->startTime = gf_scene_get_time(scene);
+		gf_node_changed((GF_Node *)ac, NULL);
+		return;
+	}
+
+	if (odm->type == GF_STREAM_VISUAL) {
+		M_MovieTexture *mt = (M_MovieTexture*) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
+		if (!mt) return;
+		if (scene->visual_url.url) gf_free(scene->visual_url.url);
+		scene->visual_url.url = NULL;
+		scene->visual_url.OD_ID = odm->ID;
+		if (!mt->url.count) gf_sg_vrml_mf_alloc(&mt->url, GF_SG_VRML_MFURL, 1);
+		mt->url.vals[0].OD_ID = odm->ID;
+		if (mt->url.vals[0].url) gf_free(mt->url.vals[0].url);
+		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
+		if (url) {
+			scene->visual_url.url = gf_strdup(url);
+			mt->url.vals[0].url = gf_strdup(url);
+		}
+		mt->startTime = gf_scene_get_time(scene);
+		gf_node_changed((GF_Node *)mt, NULL);
+		if (odm->mo) gf_scene_force_size_to_video(scene, odm->mo);
+		scene->selected_service_id = odm->ServiceID;
+		return;
+	}
+
+
+	if (odm->type == GF_STREAM_TEXT) {
+		M_AnimationStream *as = (M_AnimationStream*) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
+		if (!as) return;
+		if (scene->text_url.url) gf_free(scene->text_url.url);
+		scene->text_url.url = NULL;
+		scene->text_url.OD_ID = odm->ID;
+		if (!as->url.count) gf_sg_vrml_mf_alloc(&as->url, GF_SG_VRML_MFURL, 1);
+		as->url.vals[0].OD_ID = odm->ID;
+		if (as->url.vals[0].url) gf_free(as->url.vals[0].url);
+		url = odm->mo->URLs.count ? odm->mo->URLs.vals[0].url : NULL;
+		if (url) {
+			scene->text_url.url = gf_strdup(url);
+			as->url.vals[0].url = gf_strdup(url);
+		}
+		as->startTime = gf_scene_get_time(scene);
+		gf_node_changed((GF_Node *)as, NULL);
+		return;
+	}
+}
+
+void gf_scene_select_main_addon(GF_Scene *scene, GF_ObjectManager *odm, Bool set_on, u32 current_clock_time)
+{
+	GF_DOM_Event devt;
+	M_Inline *dscene = (M_Inline *) gf_sg_find_node_by_name(scene->graph, scene->compositor->dbgpvr ? "ADDON_SCENE" : "PVR_SCENE");
+
+	if (scene->main_addon_selected==set_on) return;
+	scene->main_addon_selected = set_on;
+
+	if (set_on) {
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
+		odm_deactivate(gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
+
+
+		if (!odm->subscene->graph_attached) {
+			odm->flags &= ~GF_ODM_REGENERATE_SCENE;
+			gf_scene_regenerate(odm->subscene);
+		} else {
+			odm->subscene->needs_restart = 1;
+		}
+
+		//main addon is vod not live, store clock
+		if (! odm->timeshift_depth &&  !scene->sys_clock_at_main_activation) {
+			scene->sys_clock_at_main_activation = gf_sys_clock();
+			scene->obj_clock_at_main_activation = current_clock_time;
+		}
+
+
+		gf_sg_vrml_field_copy(&dscene->url, &odm->mo->URLs, GF_SG_VRML_MFURL);
+		gf_node_changed((GF_Node *)dscene, NULL);
+	} else {
+		GF_Clock *ck = scene->root_od->ck;
+		//reactivating the main content will trigger a reset on the clock - remember where we are and resume from this point
+		scene->root_od->media_start_time = gf_clock_media_time(ck);
+
+		scene->sys_clock_at_main_activation = 0;
+		scene->obj_clock_at_main_activation = 0;
+
+		odm_activate(&scene->audio_url, gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1"));
+		odm_activate(&scene->visual_url, gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1"));
+		odm_activate(&scene->text_url, gf_sg_find_node_by_name(scene->graph, "DYN_TEXT"));
+
+		gf_sg_vrml_mf_reset(&dscene->url, GF_SG_VRML_MFURL);
+		gf_node_changed((GF_Node *)dscene, NULL);
+	}
+
+	memset(&devt, 0, sizeof(GF_DOM_Event));
+	devt.type = GF_EVENT_MAIN_ADDON_STATE;
+	devt.detail = set_on;
+	gf_scene_notify_event(scene, GF_EVENT_MAIN_ADDON_STATE, NULL, &devt, GF_OK, GF_FALSE);
+
+}
+
+GF_EXPORT
+void gf_scene_set_addon_layout_info(GF_Scene *scene, u32 position, u32 size_factor)
+{
+	MFURL url;
+	M_Transform2D *tr;
+	M_Layer2D *layer;
+	GF_MediaObject *mo;
+	s32 w, h, v_w, v_h;
+	if (!scene->visual_url.OD_ID && !scene->visual_url.url) return;
+
+	url.count = 1;
+	url.vals = &scene->visual_url;
+	mo = IS_CheckExistingObject(scene, &url, GF_MEDIA_OBJECT_VIDEO);
+	if (!mo) return;
+
+	scene->addon_position = position;
+	scene->addon_size_factor = size_factor;
+
+	gf_scene_get_video_size(mo, (u32 *) &v_w, (u32 *) &v_h);
+	w = v_w;
+	h = v_h;
+	switch (size_factor) {
+	case 0:
+		v_w /= 2;
+		v_h /= 2;
+		break;
+	case 1:
+		v_w /= 3;
+		v_h /= 3;
+		break;
+	case 2:
+	default:
+		v_w /= 4;
+		v_h /= 4;
+		break;
+	}
+
+	layer = (M_Layer2D *) gf_sg_find_node_by_name(scene->graph, "ADDON_LAYER");
+	if (!layer) return;
+	layer->size.x = INT2FIX(v_w);
+	layer->size.y = INT2FIX(v_h);
+	gf_node_dirty_set((GF_Node *)layer, 0, 0);
+
+	tr = (M_Transform2D *) gf_sg_find_node_by_name(scene->graph, "ADDON_TRANS");
+	if (!tr) return;
+	switch (position) {
+	case 0:
+		tr->translation.x = INT2FIX(w - v_w) / 2;
+		tr->translation.y = INT2FIX(v_h - h) / 2;
+		break;
+	case 1:
+		tr->translation.x = INT2FIX(w - v_w) / 2;
+		tr->translation.y = INT2FIX(h - v_h) / 2;
+		break;
+	case 2:
+		tr->translation.x = INT2FIX(v_w - w) / 2;
+		tr->translation.y = INT2FIX(v_h - h) / 2;
+		break;
+	case 3:
+		tr->translation.x = INT2FIX(v_w - w) / 2;
+		tr->translation.y = INT2FIX(h - v_h) / 2;
+		break;
+	}
+	gf_node_dirty_set((GF_Node *)tr, 0, 0);
+}
+
+GF_EXPORT
+void gf_scene_resume_live(GF_Scene *subscene)
+{
+	if (subscene->main_addon_selected)
+		mediacontrol_resume(subscene->root_od, 1);
+}
+
+void gf_scene_restart_dynamic(GF_Scene *scene, s64 from_time, Bool restart_only, Bool disable_addon_check)
+{
+	u32 i;
+	GF_Clock *ck;
+	GF_List *to_restart;
+	GF_ObjectManager *odm;
+	if (restart_only) {
+		from_time = 0;
+	}
+
+	ck = scene->root_od->ck;
+	if (!scene->is_dynamic_scene) ck = scene->root_od->ck;
+	if (!ck) return;
+
+	//first pass to check if we need to enable the addon acting as time shifting
+	if (!disable_addon_check) {
+		i=0;
+		while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+
+			if (odm->addon && (odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				//assign clock if not yet available
+				if (odm->addon->root_od->subscene && !odm->addon->root_od->ck)
+					odm->addon->root_od->ck = scene->root_od->ck;
+
+				//we're timeshifting through the main addon, activate it
+				if (from_time < -1) {
+					gf_scene_select_main_addon(scene, odm, GF_TRUE, gf_clock_time(ck));
+
+					/*no timeshift, this is a VoD associated with the live broadcast: get current time*/
+					if (! odm->timeshift_depth) {
+						s64 live_clock = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
+
+						from_time += 1;
+						if (live_clock + from_time < 0) from_time = 0;
+						else from_time = live_clock + from_time;
+					}
+				} else if (scene->main_addon_selected) {
+					gf_scene_select_main_addon(scene, odm, GF_FALSE, 0);
+				}
+			}
+		}
+	}
+
+	to_restart = gf_list_new();
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
+		//do not restart not selected objects
+		if (odm->state != GF_ODM_STATE_PLAY)
+			continue;
+
+		if (gf_odm_shares_clock(odm, ck)) {
+			//object is not an addon and main addon is selected, do not add
+			if (!odm->addon && scene->main_addon_selected) {
+			}
+			//object is an addon and enabled, restart if main and main is enabled, or if not main
+			else if (odm->addon && odm->addon->enabled) {
+				if (odm->addon->addon_type==GF_ADDON_TYPE_MAIN) {
+					if (scene->main_addon_selected) {
+						gf_list_add(to_restart, odm);
+					}
+				} else {
+					gf_list_add(to_restart, odm);
+				}
+			} else if (!scene->selected_service_id || (scene->selected_service_id==odm->ServiceID) ) {
+				gf_odm_stop(odm, 1);
+				gf_list_add(to_restart, odm);
+			}
+		}
+	}
+
+	if (!restart_only) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[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) ));
+	}
+
+
+	/*restart objects*/
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
+		if (from_time<0) {
+			odm->media_stop_time = from_time + 1;
+		} else {
+			odm->media_start_time = from_time;
+		}
+
+		if (odm->subscene && odm->subscene->is_dynamic_scene) {
+			gf_scene_restart_dynamic(odm->subscene, from_time, 0, 0);
+		} else {
+			gf_odm_start(odm);
+		}
+	}
+	gf_list_del(to_restart);
+
+	/*also check nodes since they may be deactivated (end of stream)*/
+	if (scene->is_dynamic_scene) {
+		M_AudioClip *ac = (M_AudioClip *) gf_sg_find_node_by_name(scene->graph, "DYN_AUDIO1");
+		M_MovieTexture *mt = (M_MovieTexture *) gf_sg_find_node_by_name(scene->graph, "DYN_VIDEO1");
+		M_AnimationStream *as = (M_AnimationStream *) gf_sg_find_node_by_name(scene->graph, "DYN_TEXT");
+		if (ac) {
+			ac->startTime = gf_scene_get_time(scene);
+			gf_node_changed((GF_Node *)ac, NULL);
+		}
+		if (mt) {
+			mt->startTime = gf_scene_get_time(scene);
+			gf_node_changed((GF_Node *)mt, NULL);
+		}
+		if (as) {
+			as->startTime = gf_scene_get_time(scene);
+			gf_node_changed((GF_Node *)as, NULL);
+		}
+	}
+}
+
+#endif /*GPAC_DISABLE_VRML*/
+
+
+GF_EXPORT
+void gf_scene_force_size(GF_Scene *scene, u32 width, u32 height)
+{
+	Bool skip_notif = GF_FALSE;
+
+	/*for now only allowed when no scene info*/
+	if (!scene->is_dynamic_scene) return;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Scene] Forcing scene size to %d x %d\n", width, height));
+
+	if (scene->vr_type) {
+		/*for 360 don't set scene size to full-size , only half of it*/
+		width /= 2;
+		height /= 2;
+		/*if we already processed a force size in 360, don't do it again*/
+		if (scene->force_size_set)
+			return;
+
+#ifndef GPAC_DISABLE_VRML
+		scene->force_size_set = GF_TRUE;
+		if (! scene->srd_type) {
+			GF_Node *node = gf_sg_find_node_by_name(scene->graph, "DYN_GEOM1");
+			if (node && (((M_Sphere *)node)->radius == FIX_ONE)) {
+				u32 radius = MAX(width, height)/4;
+
+				((M_Sphere *)node)->radius = - INT2FIX(radius);
+				gf_node_changed(node, NULL);
+			}
+		}
+#endif /* GPAC_DISABLE_VRML */
+	}
+
+	if (scene->is_dynamic_scene) {
+		u32 serv_w=0, serv_h=0;
+		GF_FilterPid *pid = gf_filter_get_ipid(scene->compositor->filter, 0);
+		const GF_PropertyValue *prop;
+		prop = gf_filter_pid_get_property(pid, GF_PROP_SERVICE_WIDTH);
+		if (prop) serv_w = prop->value.uint;
+		prop = gf_filter_pid_get_property(pid, GF_PROP_SERVICE_HEIGHT);
+		if (prop) serv_h = prop->value.uint;
+
+
+		if (!scene->root_od->parentscene) {
+			if (serv_w && serv_h) {
+				gf_sc_set_scene_size(scene->compositor, width, height, 1);
+				if (!scene->force_size_set) {
+					gf_sc_set_size(scene->compositor, serv_w, serv_h);
+					scene->force_size_set = 1;
+				} else {
+					gf_sc_set_size(scene->compositor, 0, 0);
+				}
+			} else {
+				if (scene->vr_type) {
+					width = MAX(width, height) / 2;
+					gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
+				} else {
+					/*need output resize*/
+					gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+					gf_sc_set_scene(scene->compositor, scene->graph);
+					gf_sc_set_size(scene->compositor, width, height);
+				}
+			}
+
+		} else if (!scene->force_size_set) {
+			if (serv_w && serv_h) {
+				width = serv_w;
+				height = serv_h;
+			}
+			if (scene->vr_type) {
+				gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
+			} else {
+				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+			}
+			scene->force_size_set = 1;
+		} else {
+			u32 w, h;
+			gf_sg_get_scene_size_info(scene->graph, &w, &h);
+			if (!serv_w && !serv_h && ((w<width) || (h<height)) ) {
+				gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+			} else {
+				GF_DOM_Event devt;
+				memset(&devt, 0, sizeof(GF_DOM_Event));
+				devt.type = GF_EVENT_SCENE_SIZE;
+				devt.screen_rect.width = INT2FIX(width);
+				devt.screen_rect.height = INT2FIX(height);
+
+				devt.key_flags = scene->is_dynamic_scene ? (scene->vr_type ? 2 : 1) : 0;
+
+				gf_scene_notify_event(scene, GF_EVENT_SCENE_SIZE, NULL, &devt, GF_OK, GF_FALSE);
+
+				skip_notif = GF_TRUE;
+
+				width = w;
+				height = h;
+			}
+		}
+	}
+	else if (scene->root_od->parentscene && scene->root_od->parentscene->is_dynamic_scene) {
+		gf_sg_set_scene_size_info(scene->root_od->parentscene->graph, width, height, gf_sg_use_pixel_metrics(scene->root_od->parentscene->graph));
+		if (!scene->root_od->parentscene) {
+			if (width && height) {
+				gf_sc_set_scene_size(scene->compositor, width, height, GF_TRUE);
+				gf_sc_set_size(scene->compositor, width, height);
+			}
+		}
+	}
+
+	if (scene->vr_type) {
+		gf_sg_set_scene_size_info(scene->graph, 0, 0, GF_TRUE);
+	} else {
+		gf_sg_set_scene_size_info(scene->graph, width, height, GF_TRUE);
+	}
+	if (scene->srd_type)
+		gf_scene_regenerate(scene);
+
+#ifndef GPAC_DISABLE_VRML
+	IS_UpdateVideoPos(scene);
+#endif
+
+	if (skip_notif) return;
+
+	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
+}
+
+
+GF_EXPORT
+Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt)
+{
+#ifndef GPAC_DISABLE_VRML
+	u32 i;
+	M_Inline *inl;
+#endif
+	GF_Scene *scene;
+	GF_SceneGraph *sg = gf_node_get_graph(caller);
+	if (!sg) return 1;
+	scene = (GF_Scene *)gf_sg_get_private(sg);
+	if (!scene) return 1;
+
+	/*if main scene forward to user. If no params or first one not "self" forward to user*/
+	if (! scene->root_od->parentscene || !evt->navigate.parameters || !evt->navigate.param_count || (stricmp(evt->navigate.parameters[0], "self") && stricmp(evt->navigate.parameters[0], "_self"))) {
+
+		return gf_filter_ui_event(scene->compositor->filter, evt);
+	}
+
+	if (!scene->root_od->mo) return 1;
+
+	/*FIXME this is too restrictive, we assume the navigate URL is really a presentation one...*/
+#ifndef GPAC_DISABLE_VRML
+	i=0;
+	while ((inl = (M_Inline*)gf_mo_event_target_enum_node(scene->root_od->mo, &i))) {
+		switch (gf_node_get_tag((GF_Node *)inl)) {
+		case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+		case TAG_X3D_Inline:
+#endif
+			gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
+			gf_sg_vrml_mf_alloc(&inl->url, GF_SG_VRML_MFURL, 1);
+			inl->url.vals[0].url = gf_strdup(evt->navigate.to_url ? evt->navigate.to_url : "");
+			/*signal URL change but don't destroy inline scene now since we got this event from inside the scene,
+			this could crash compositors*/
+			scene->needs_restart = 2;
+			break;
+		}
+	}
+#endif
+
+	return 1;
+}
+
+GF_EXPORT
+GF_Compositor *gf_sc_get_compositor(GF_Node *node)
+{
+	GF_Scene *scene;
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	if (!sg) return NULL;
+	scene = (GF_Scene *)gf_sg_get_private(sg);
+	if (!scene) return NULL;
+	return scene->compositor;
+}
+
+const char *gf_scene_get_fragment_uri(GF_Node *node)
+{
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
+	if (!scene) return NULL;
+	return scene->fragment_uri;
+}
+void gf_scene_set_fragment_uri(GF_Node *node, const char *uri)
+{
+	GF_SceneGraph *sg = gf_node_get_graph(node);
+	GF_Scene *scene = sg ? (GF_Scene *) gf_sg_get_private(sg) : NULL;
+	if (!scene) return;
+	if (scene->fragment_uri) {
+		gf_free(scene->fragment_uri);
+		scene->fragment_uri = NULL;
+	}
+	if (uri) scene->fragment_uri = gf_strdup(uri);
+}
+
+
+GF_Node *gf_scene_get_subscene_root(GF_Node *node)
+{
+	GF_Scene *scene;
+	if (!node) return NULL;
+	switch (gf_node_get_tag(node)) {
+#ifndef GPAC_DISABLE_VRML
+	case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Inline:
+#endif
+		break;
+#endif
+	default:
+		return NULL;
+	}
+	scene = (GF_Scene *)gf_node_get_private(node);
+	if (!scene) return NULL;
+	if (!scene->graph) return NULL;
+	return gf_sg_get_root_node(scene->graph);
+}
+
+/*returns 0 if any of the clock still hasn't seen EOS*/
+Bool gf_scene_check_clocks(GF_SceneNamespace *ns, GF_Scene *scene, Bool check_buffering)
+{
+	GF_Clock *ck;
+	Bool initialized = GF_FALSE;
+	u32 i;
+
+	if (scene) {
+		GF_ObjectManager *odm;
+		if (scene->root_od->scene_ns != ns) {
+			if (!gf_scene_check_clocks(scene->root_od->scene_ns, scene, check_buffering)) return 0;
+		}
+		i=0;
+		while ( (odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i)) ) {
+			switch (odm->type) {
+			case GF_STREAM_OCR:
+			case GF_STREAM_INTERACT:
+				continue;
+			default:
+				break;
+			}
+
+			if (odm->scene_ns && (odm->scene_ns != ns)) {
+				if (!gf_scene_check_clocks(odm->scene_ns, NULL, check_buffering)) return 0;
+			} else if (odm->ck) {
+				initialized = GF_TRUE;
+				if (!check_buffering) {
+					if (! odm->has_seen_eos && (odm->state != GF_ODM_STATE_STOP) ) {
+						return 0;
+					}
+				} else {
+					if (odm->ck->nb_buffering) {
+						return 0;
+					}
+				}
+			}
+		}
+	}
+
+	i=0;
+	while (ns->clocks && (ck = (GF_Clock *)gf_list_enum(ns->clocks, &i) ) ) {
+		initialized = GF_TRUE;
+		if (!check_buffering) {
+			Bool is_eos = ck->has_seen_eos;
+			//object not active consider it done
+			if (!is_eos && ns->owner->mo && !ns->owner->mo->num_open)
+				is_eos = GF_TRUE;
+
+			if (!is_eos) return 0;
+		} else {
+			if (ck->nb_buffering) return 0;
+		}
+
+	}
+
+	if (!check_buffering && scene) {
+		if (scene->root_od->ID) {
+			initialized = GF_TRUE;
+			if (scene->root_od->parentscene && (scene->root_od->state != GF_ODM_STATE_STOP)) return 0;
+		}
+	}
+	if (!initialized) return 0;
+
+	return 1;
+}
+
+const char *gf_scene_get_service_url(GF_SceneGraph *sg)
+{
+	GF_Scene *scene = gf_sg_get_private(sg);
+	if (scene) return scene->root_od->scene_ns->url;
+	return NULL;
+}
+
+Bool gf_scene_is_over(GF_SceneGraph *sg)
+{
+	u32 i, count;
+	GF_Scene *scene = gf_sg_get_private(sg);
+	if (!scene) return GF_FALSE;
+	if (scene->root_od->has_seen_eos)
+		return scene->root_od->ck->has_seen_eos;
+
+	count = gf_list_count(scene->resources);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
+		if (!odm->has_seen_eos || !odm->ck->has_seen_eos) return GF_FALSE;
+		if (odm->subscene && !gf_scene_is_over(odm->subscene->graph) ) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+GF_SceneGraph *gf_scene_enum_extra_scene(GF_SceneGraph *sg, u32 *i)
+{
+	GF_Scene *scene = gf_sg_get_private(sg);
+	if (!scene) return NULL;
+	return gf_list_enum(scene->extra_scenes, i);
+}
+
+Bool gf_scene_is_dynamic_scene(GF_SceneGraph *sg)
+{
+	GF_Scene *scene = gf_sg_get_private(sg);
+	if (!scene) return 0;
+	return scene->is_dynamic_scene ? 1 : 0;
+}
+
+#define USE_TEXTURES	0
+
+void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_path)
+{
+#ifndef GPAC_DISABLE_VRML
+	char *url_search;
+	Bool use_old_syntax = 1;
+	GF_Node *n1, *switcher;
+#if USE_TEXTURES
+	GF_Node *n2;
+	M_MovieTexture *mt;
+#else
+	M_Inline *inl;
+#endif
+	GF_Event evt;
+	gf_sc_node_destroy(scene->compositor, NULL, scene->graph);
+	gf_sg_reset(scene->graph);
+
+	scene->force_single_timeline = 1;
+	n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
+	gf_sg_set_root_node(scene->graph, n1);
+	gf_node_register(n1, NULL);
+
+	switcher = is_create_node(scene->graph, TAG_MPEG4_Switch, NULL);
+	gf_node_register(switcher, n1);
+	gf_node_list_add_child( &((GF_ParentNode *)n1)->children, switcher);
+	((M_Switch*)switcher)->whichChoice = -2;
+
+	if (strstr(url, "::")) use_old_syntax = 0;
+
+	url_search = url;
+	while (1) {
+		char *sep;
+
+		if (use_old_syntax) {
+			sep = gf_url_colon_suffix(url_search);
+		} else {
+			sep = strstr(url_search, "::");
+		}
+		if (sep) sep[0] = 0;
+
+#if USE_TEXTURES
+		/*create a shape and bitmap node*/
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Shape, NULL);
+		gf_node_list_add_child( &((M_Switch *)switcher)->choice, n2);
+		gf_node_register(n2, switcher);
+		n1 = n2;
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Appearance, NULL);
+		((M_Shape *)n1)->appearance = n2;
+		gf_node_register(n2, n1);
+
+		/*note we create a movie texture even for images...*/
+		mt = (M_MovieTexture *) is_create_node(scene->graph, TAG_MPEG4_MovieTexture, NULL);
+		mt->startTime = gf_scene_get_time(scene);
+		((M_Appearance *)n2)->texture = (GF_Node *)mt;
+		gf_node_register((GF_Node *)mt, n2);
+
+		n2 = is_create_node(scene->graph, TAG_MPEG4_Bitmap, NULL);
+		((M_Shape *)n1)->geometry = n2;
+		gf_node_register(n2, n1);
+
+		gf_sg_vrml_mf_reset(&mt->url, GF_SG_VRML_MFURL);
+		gf_sg_vrml_mf_append(&mt->url, GF_SG_VRML_MFURL, NULL);
+		mt->url.vals[0].url = gf_url_concatenate(parent_path, url);
+#else
+		inl = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, NULL);
+		gf_node_list_add_child( &((M_Switch *)switcher)->choice, (GF_Node *)inl);
+		gf_node_register((GF_Node*) inl, switcher);
+
+		gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
+		gf_sg_vrml_mf_append(&inl->url, GF_SG_VRML_MFURL, NULL);
+		inl->url.vals[0].url = gf_url_concatenate(parent_path, url);
+#endif
+
+		if (!sep) break;
+		sep[0] = ':';
+		if (use_old_syntax) {
+			url = sep+1;
+		} else {
+			url = sep+2;
+		}
+		url_search = url;
+	}
+
+	gf_sc_set_option(scene->compositor, GF_OPT_USE_OPENGL, 1);
+
+	scene->is_dynamic_scene = 2;
+	gf_sg_set_scene_size_info(scene->graph, 0, 0, 1);
+
+	gf_scene_attach_to_compositor(scene);
+
+	evt.type = GF_EVENT_CONNECT;
+	evt.connect.is_connected = 1;
+	gf_sc_send_event(scene->compositor, &evt);
+#endif
+}
+
+void gf_scene_generate_mosaic(GF_Scene *scene, char *url, char *parent_path)
+{
+#ifndef GPAC_DISABLE_VRML
+	char *url_search, *cur_url;
+	Bool use_old_syntax = 1;
+	GF_Node *n1;
+	M_Inline *inl;
+	Bool first_pass = GF_TRUE;
+	u32 nb_items=0, nb_rows=0, nb_cols=0;
+	s32 width=1920, height=1080, x=0, y=0, tw=1920, th=1080;
+
+	GF_Event evt;
+	gf_sc_node_destroy(scene->compositor, NULL, scene->graph);
+	gf_sg_reset(scene->graph);
+
+	scene->force_single_timeline = GF_FALSE;
+	n1 = is_create_node(scene->graph, TAG_MPEG4_OrderedGroup, NULL);
+	gf_sg_set_root_node(scene->graph, n1);
+	gf_node_register(n1, NULL);
+
+	if (strstr(url, "::")) use_old_syntax = 0;
+
+restart:
+	url_search = cur_url = url;
+	x = y = 0;
+	while (1) {
+		char *sep;
+
+		if (use_old_syntax) {
+			sep = strchr(url_search, ':');
+			/*if :// or :\ is found, skip it*/
+			if (sep && ( ((sep[1] == '/') && (sep[2] == '/')) || (sep[1] == '\\') ) ) {
+				url_search = sep+1;
+				continue;
+			}
+		} else {
+			sep = strstr(url_search, "::");
+		}
+		if (sep) sep[0] = 0;
+
+		if (first_pass) {
+			nb_items ++;
+		} else {
+			GF_Node *tr = is_create_node(scene->graph, TAG_MPEG4_Transform2D, NULL);
+			GF_Node *layer = is_create_node(scene->graph, TAG_MPEG4_Layer2D, NULL);
+			gf_node_register(tr, n1);
+			gf_node_list_add_child( &((GF_ParentNode *)n1)->children, tr);
+
+			((M_Transform2D *)tr)->translation.x = INT2FIX( -width/2 + tw/2 + x*tw);
+			((M_Transform2D *)tr)->translation.y = INT2FIX( height/2 - th/2 - y*th);
+
+			x++;
+			if (x==nb_cols) {
+				y++;
+				x=0;
+			}
+
+			gf_node_register(layer, tr);
+			gf_node_list_add_child( &((M_Transform2D *)tr)->children, layer);
+			((M_Layer2D *)layer)->size.x = INT2FIX(tw);
+			((M_Layer2D *)layer)->size.y = INT2FIX(th);
+
+			inl = (M_Inline *) is_create_node(scene->graph, TAG_MPEG4_Inline, NULL);
+			gf_node_list_add_child( &((M_Layer2D *)layer)->children, (GF_Node *)inl);
+			gf_node_register((GF_Node*) inl, layer);
+
+			gf_sg_vrml_mf_reset(&inl->url, GF_SG_VRML_MFURL);
+			gf_sg_vrml_mf_append(&inl->url, GF_SG_VRML_MFURL, NULL);
+			inl->url.vals[0].url = gf_url_concatenate(parent_path, cur_url);
+		}
+
+		if (!sep) break;
+		sep[0] = ':';
+		if (use_old_syntax) {
+			cur_url = sep+1;
+		} else {
+			cur_url = sep+2;
+		}
+		url_search = cur_url;
+	}
+	if (first_pass) {
+		first_pass = GF_FALSE;
+		nb_cols=(u32) gf_ceil( gf_sqrt(nb_items) );
+		nb_rows=nb_items/nb_cols;
+		if (nb_cols * nb_rows < nb_items) nb_rows++;
+		tw = width/nb_cols;
+		th = height/nb_rows;
+		goto restart;
+	}
+
+	scene->is_dynamic_scene = 2;
+	gf_sg_set_scene_size_info(scene->graph, width, height, 1);
+
+	gf_scene_attach_to_compositor(scene);
+
+	evt.type = GF_EVENT_CONNECT;
+	evt.connect.is_connected = 1;
+	gf_sc_send_event(scene->compositor, &evt);
+#endif
+}
+
+
+void gf_scene_reset_addon(GF_AddonMedia *addon, Bool disconnect)
+{
+	if (addon->root_od) {
+		addon->root_od->addon = NULL;
+		if (disconnect) {				
+			gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
+			gf_odm_disconnect(addon->root_od, 1);
+		}
+	}
+
+	if (addon->url) gf_free(addon->url);
+	gf_free(addon);
+}
+
+void gf_scene_reset_addons(GF_Scene *scene)
+{
+	while (gf_list_count(scene->declared_addons)) {
+		GF_AddonMedia *addon = gf_list_last(scene->declared_addons);
+		gf_list_rem_last(scene->declared_addons);
+
+		gf_scene_reset_addon(addon, GF_FALSE);
+	}
+}
+#ifdef FILTER_FIXME
+
+static void load_associated_media(GF_Scene *scene, GF_AddonMedia *addon)
+{
+	GF_MediaObject *mo;
+	MFURL url;
+	SFURL sfurl;
+
+	if (!addon->enabled) return;
+
+	url.count=1;
+	url.vals = &sfurl;
+	url.vals[0].OD_ID = GF_MEDIA_EXTERNAL_ID;
+	url.vals[0].url = (char *)addon->url;
+
+	//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);
+
+	if (!mo || !mo->odm) {
+		assert(0);
+		return;
+	}
+
+	addon->root_od = mo->odm;
+	mo->odm->addon = addon;
+}
+
+
+GF_EXPORT
+void gf_scene_register_associated_media(GF_Scene *scene, GF_AssociatedContentLocation *addon_info)
+{
+	GF_AddonMedia *addon = NULL;
+	GF_Event evt;
+	u32 i, count;
+	Bool new_addon = 0;
+
+	if (!scene->is_dynamic_scene) return;
+
+	count = gf_list_count(scene->declared_addons);
+	for (i=0; i<count; i++) {
+		Bool my_addon = 0;
+		addon = gf_list_get(scene->declared_addons, i);
+		if ((addon_info->timeline_id>=0) && addon->timeline_id==addon_info->timeline_id) {
+			my_addon = 1;
+		} else if (addon->url && addon_info->external_URL && !strcmp(addon->url, addon_info->external_URL)) {
+			my_addon = 1;
+			//send message to service handler
+		}
+		//this is an already received addon
+		if (my_addon) {
+			if (addon_info->disable_if_defined) {
+				addon->enabled = GF_FALSE;
+
+				if (addon->root_od) {
+					gf_scene_toggle_addons(scene, GF_FALSE);
+					gf_scene_remove_object(addon->root_od->parentscene, addon->root_od, 2);
+					gf_odm_disconnect(addon->root_od, 1);
+
+					addon->root_od->addon = NULL;
+				}
+				return;
+			}
+
+			if (addon_info->enable_if_defined)
+				addon->enabled = GF_TRUE;
+
+			//declaration of start time
+			if (addon->is_splicing && (addon->splice_start<0) && addon_info->is_splicing) {
+				addon->splice_in_pts = addon_info->splice_time_pts;
+
+				if (addon->splice_in_pts) {
+					addon->media_pts = (u64) (addon_info->splice_start_time);
+					addon->splice_start = addon_info->splice_start_time / 90;
+					addon->splice_end = addon_info->splice_end_time / 90;
+				} else {
+					addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
+					addon->splice_start = addon_info->splice_start_time * 1000;
+					addon->splice_end = addon_info->splice_end_time * 1000;
+				}
+			}
+			
+			//restart addon
+			if (!addon->root_od && addon->timeline_ready && addon->enabled) {
+				load_associated_media(scene, addon);
+			}
+			//nothing associated, deactivate addon
+			if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
+				gf_list_rem(scene->declared_addons, i);
+				gf_scene_reset_addon(addon, GF_TRUE);
+				gf_scene_toggle_addons(scene, GF_FALSE);
+			} else if (strcmp(addon_info->external_URL, addon->url)) {
+				//reconfigure addon
+				gf_free(addon->url);
+				addon->url = NULL;
+				break;
+			}
+			return;
+		}
+		addon = NULL;
+	}
+
+	if (!addon_info->external_URL || !strlen(addon_info->external_URL) ) {
+		return;
+	}
+
+	if (!addon) {
+		GF_SAFEALLOC(addon, GF_AddonMedia);
+		if (!addon) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media addon\n"));
+			return;
+		}
+		addon->timeline_id = addon_info->timeline_id;
+		gf_list_add(scene->declared_addons, addon);
+		new_addon = 1;
+	}
+
+	addon->is_splicing = addon_info->is_splicing;
+	addon->activation_time = gf_scene_get_time(scene)+addon_info->activation_countdown;
+	addon->url = gf_strdup(addon_info->external_URL);
+	addon->media_timescale = 1;
+	addon->timeline_ready = (addon_info->timeline_id<0) ? 1 : 0;
+	addon->splice_in_pts = addon_info->splice_time_pts;
+	if (addon_info->is_splicing) {
+		addon->addon_type = GF_ADDON_TYPE_SPLICED;
+		scene->has_splicing_addons = GF_TRUE;
+
+		if (addon->splice_in_pts) {
+			addon->media_pts = (u64) (addon_info->splice_start_time);
+			addon->splice_start = addon_info->splice_start_time / 90;
+			addon->splice_end = addon_info->splice_end_time / 90;
+		} else {
+			addon->media_pts = (u64)(addon_info->splice_start_time * 90000);
+
+			addon->splice_start = addon_info->splice_start_time * 1000;
+			addon->splice_end = addon_info->splice_end_time * 1000;
+		}
+	} else {
+		addon->splice_start = addon_info->splice_start_time;
+		addon->splice_end = addon_info->splice_end_time;
+	}
+
+	if (!new_addon) return;
+
+	//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 (addon->timeline_ready)
+			load_associated_media(scene, addon);
+	} else {
+		GF_DOM_Event devt;
+		memset(&devt, 0, sizeof(GF_DOM_Event));
+		devt.type = GF_EVENT_ADDON_DETECTED;
+		devt.addon_url = addon->url;
+		addon->enabled = 0;
+
+		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, &devt, GF_OK, GF_TRUE);
+	}
+
+}
+
+void gf_scene_notify_associated_media_timeline(GF_Scene *scene, GF_AssociatedContentTiming *addon_time)
+{
+	Double prev_time;
+	GF_AddonMedia *addon = NULL;
+
+	u32 i, count = gf_list_count(scene->declared_addons);
+	for (i=0; i<count; i++) {
+		addon = gf_list_get(scene->declared_addons, i);
+		if (addon->timeline_id==addon_time->timeline_id)
+			break;
+		addon = NULL;
+	}
+	if (!addon) return;
+
+	count = i;
+	for (i=0; i<count; i++) {
+		GF_AddonMedia *prev_addon = gf_list_get(scene->declared_addons, i);
+		//we are adding a non splicing point: discard all previously declared addons
+		if (!addon->is_splicing
+		        //this is a splicing point, discard all previsously declared splicing addons
+		        || prev_addon->is_splicing
+		   ) {
+			gf_scene_reset_addon(prev_addon, GF_TRUE);
+			gf_list_rem(scene->declared_addons, i);
+			i--;
+			count--;
+		}
+	}
+
+
+	prev_time = (Double) addon->media_timestamp;
+	prev_time /= addon->media_timescale;
+
+	//loop has been detected
+	if ( prev_time  * addon_time->media_timescale > addon_time->media_timestamp + 1.5 * addon_time->media_timescale ) {
+		if (!addon->loop_detected) {
+			addon->loop_detected = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Loop detected in addon - PTS "LLD" (CTS %d) - media time "LLD"\n", addon_time->media_pts, addon_time->media_pts/90, addon_time->media_timestamp));
+			addon->past_media_pts = addon_time->media_pts;
+			addon->past_media_timestamp = addon_time->media_timestamp;
+			addon->past_media_timescale = addon_time->media_timescale;
+			addon->past_media_pts_scaled = addon_time->media_pts/90;
+		}
+	} else if (!addon->loop_detected) {
+		addon->media_pts = addon_time->media_pts;
+		addon->media_timestamp = addon_time->media_timestamp;
+		addon->media_timescale = addon_time->media_timescale;
+		assert(addon_time->media_timescale);
+		assert(!addon->loop_detected);
+	}
+
+	if (!addon->timeline_ready) {
+		addon->timeline_ready = GF_TRUE;
+		load_associated_media(scene, addon);
+	}
+
+	if ((addon->addon_type==GF_ADDON_TYPE_MAIN) && addon->root_od && addon->root_od->duration && !addon->root_od->timeshift_depth) {
+		Double dur, tsb;
+		dur = (Double) addon->root_od->duration;
+		dur /= 1000;
+		tsb = (Double) addon->media_timestamp;
+		tsb /= addon->media_timescale;
+		if (tsb>dur) tsb = dur;
+		addon->root_od->parentscene->root_od->timeshift_depth = (u32) (1000*tsb);
+		gf_scene_set_timeshift_depth(scene);
+	}
+
+	//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);
+	}
+}
+
+#endif
+
+Bool gf_scene_check_addon_restart(GF_AddonMedia *addon, u64 cts, u64 dts)
+{
+	u32 i;
+	GF_ObjectManager*odm;
+	GF_Scene *subscene;
+	GF_List *to_restart = NULL;
+
+	if (!addon || !addon->loop_detected) return GF_FALSE;
+	//warning, we need to compare to media PTS/90 since we already rounded the media_ts to milliseconds (otherwise we would get rounding errors).
+	if ((cts == addon->past_media_pts_scaled) || (dts >= addon->past_media_pts_scaled) ) {
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Loop not yet active - CTS "LLD" DTS "LLD" media TS "LLD" \n", cts, dts, addon->past_media_pts_scaled));
+		return GF_FALSE;
+	}
+
+	addon->loop_detected = 0;
+	addon->media_pts = addon->past_media_pts;
+	addon->media_timestamp = addon->past_media_timestamp;
+	addon->media_timescale = addon->past_media_timescale;
+	assert(addon->past_media_timescale);
+	addon->past_media_pts = 0;
+	addon->past_media_timestamp = 0;
+	addon->past_media_timescale = 0;
+
+	subscene = addon->root_od->subscene;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Looping addon - CTS "LLD" - addon media TS "LLD" (CTS "LLD") addon media time "LLD"\n", cts, addon->media_pts, addon->media_pts/90, addon->media_timestamp));
+
+	to_restart = gf_list_new();
+
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(subscene->resources, &i))) {
+		if (odm->state == GF_ODM_STATE_PLAY) {
+			gf_list_add(to_restart, odm);
+		}
+		gf_odm_stop(odm, GF_FALSE);
+	}
+
+	i=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(to_restart, &i))) {
+		gf_odm_start(odm);
+	}
+	gf_list_del(to_restart);
+	return GF_TRUE;
+}
+
+Double gf_scene_adjust_time_for_addon(GF_AddonMedia *addon, Double clock_time, u8 *timestamp_based)
+{
+	Double media_time;
+	if (!addon->timeline_ready)
+		return clock_time;
+
+	if (timestamp_based)
+		*timestamp_based = (addon->timeline_id>=0) ? 0 : 1;
+
+	if (addon->is_splicing) {
+		return ((Double)addon->media_timestamp) / addon->media_timescale;
+	}
+
+	//get PTS diff (clock is in ms, pt is in 90k)
+	media_time = clock_time;
+	media_time -= addon->media_pts/90000.0;
+
+	media_time += ((Double)addon->media_timestamp) / addon->media_timescale;
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("Addon about to start - media time %g\n", media_time));
+	return media_time;
+}
+
+s64 gf_scene_adjust_timestamp_for_addon(GF_AddonMedia *addon, u64 orig_ts)
+{
+	s64 media_ts_ms;
+	assert(addon->timeline_ready);
+	if (addon->is_splicing) {
+		if (!addon->min_dts_set || (orig_ts<addon->splice_min_dts)) {
+			addon->splice_min_dts = orig_ts;
+			addon->min_dts_set = GF_TRUE;
+		}
+		orig_ts -= addon->splice_min_dts;
+	}
+	media_ts_ms = orig_ts;
+	media_ts_ms -= (addon->media_timestamp*1000) / addon->media_timescale;
+	media_ts_ms += (addon->media_pts/90);
+	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)
+{
+	u32 i;
+	GF_ObjectManager *odm;
+	GF_FilterEvent evt;
+
+	if (!scene) return;
+
+	GF_FEVT_INIT(evt, GF_FEVT_QUALITY_SWITCH, NULL);
+	evt.quality_switch.up = up;
+	
+	if (scene->root_od->pid) {
+		gf_filter_pid_send_event(scene->root_od->pid, &evt);
+		if (scene->root_od->extra_pids) {
+			GF_ODMExtraPid *xpid;
+			i=0;
+			while ( (xpid = gf_list_enum(scene->root_od->extra_pids, &i) ) ) {
+				gf_filter_pid_send_event(xpid->pid, &evt);
+			}
+		}
+	}
+
+	i=0;
+	while (NULL != (odm = gf_list_enum(scene->resources, &i))) {
+		if (odm->pid) {
+			gf_filter_pid_send_event(odm->pid, &evt);
+		}
+		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.0.tar.gz/src/compositor/scene_node_init.c Added

@@ -0,0 +1,361 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/internal/compositor_dev.h>
+/*includes X3D nodes for WorldInfo, Inline and Key/String sensors*/
+#include <gpac/nodes_x3d.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/options.h>
+#ifndef GPAC_DISABLE_VRML
+
+void InitMediaControl(GF_Scene *scene, GF_Node *node);
+void MC_Modified(GF_Node *node);
+
+void InitMediaSensor(GF_Scene *scene, GF_Node *node);
+void MS_Modified(GF_Node *node);
+
+void gf_init_inline(GF_Scene *scene, GF_Node *node);
+void gf_inline_on_modified(GF_Node *node);
+
+void gf_scene_init_storage(GF_Scene *scene, GF_Node *node);
+
+
+void TraverseWorldInfo(GF_Node *node, void *rs, Bool is_destroy)
+{
+	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
+	scene->world_info = is_destroy ? NULL : (M_WorldInfo *) node;
+}
+
+void TraverseKeyNavigator(GF_Node *node, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
+		gf_list_del_item(scene->keynavigators, node);
+		gf_sc_key_navigator_del(scene->compositor, node);
+	}
+}
+
+void on_kn_set_focus(GF_Node*node, GF_Route *_route)
+{
+	if (node) {
+		GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
+		gf_sc_change_key_navigator(scene->compositor, node);
+	}
+}
+
+void evaluate_scene_cap(GF_Node *node, GF_Route *route)
+{
+	GF_SystemRTInfo rti;
+	Double fps;
+	u32 height;
+	Bool b_on;
+	u32 b_charge, b_level;
+
+	M_TermCap *tc = (M_TermCap *)node;
+	GF_Scene *scene = gf_node_get_private(node);
+	tc->value = 0;
+	switch (tc->capability) {
+	case 0:	/*framerate*/
+		fps = gf_sc_get_fps(scene->compositor, 1);
+		if (fps<=5.0) tc->value = 1;
+		else if (fps<=10.0) tc->value = 2;
+		else if (fps<=20.0) tc->value = 3;
+		else if (fps<=40.0) tc->value = 4;
+		else tc->value = 5;
+		break;
+	case 1:	/*colordepth*/
+		return;
+	case 2:	/*screensize*/
+		height = scene->compositor->display_height;
+		if (height<200) tc->value = 1;
+		else if (height<400) tc->value = 2;
+		else if (height<800) tc->value = 3;
+		else if (height<1600) tc->value = 4;
+		else tc->value = 4;
+		break;
+	case 3:	/*graphics hardware*/
+		return;
+	case 32:/*audio out format*/
+		return;
+	case 33:/*audio out format*/
+		return;
+	case 34:/*spatial audio cap*/
+		return;
+	case 64:/*CPU load*/
+		if (!gf_sys_get_rti(200, &rti, 0) ) return;
+		if (rti.total_cpu_usage<20) tc->value = 1;
+		else if (rti.total_cpu_usage<40) tc->value = 2;
+		else if (rti.total_cpu_usage<60) tc->value = 3;
+		else if (rti.total_cpu_usage<80) tc->value = 4;
+		else tc->value = 5;
+		break;
+	case 65:/*mem load*/
+		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
+		rti.physical_memory_avail /= 1024;
+		if (rti.physical_memory_avail < 100) tc->value = 1;
+		else if (rti.physical_memory_avail < 512) tc->value = 2;
+		else if (rti.physical_memory_avail < 2048) tc->value = 3;
+		else if (rti.physical_memory_avail < 8192) tc->value = 4;
+		else if (rti.physical_memory_avail < 32768) tc->value = 5;
+		else if (rti.physical_memory_avail < 204800) tc->value = 6;
+		else tc->value = 7;
+		break;
+
+	/*GPAC extensions*/
+	case 100: /*display width*/
+		tc->value = scene->compositor->display_width;
+		break;
+	case 101: /*display height*/
+		tc->value = scene->compositor->display_height;
+		break;
+	case 102: /*frame rate*/
+		tc->value = (u32) gf_sc_get_fps(scene->compositor, 1);
+		break;
+	case 103: /*total CPU*/
+		if (!gf_sys_get_rti(200, &rti, 0) ) return;
+		tc->value = rti.total_cpu_usage;
+		break;
+	case 104: /*process CPU*/
+		if (!gf_sys_get_rti(200, &rti, 0) ) return;
+		tc->value = rti.process_cpu_usage;
+		break;
+	case 106: /*total memory in kB*/
+		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
+		tc->value = (u32) (rti.physical_memory/1024);
+		break;
+	case 107: /*total memory available in kB*/
+		if (!gf_sys_get_rti(200, &rti, GF_RTI_SYSTEM_MEMORY_ONLY) ) return;
+		tc->value = (u32) (rti.physical_memory_avail/1024);
+		break;
+	case 108: /*process memory in kB*/
+		if (!gf_sys_get_rti(200, &rti, 0) ) return;
+		tc->value = (u32) (rti.process_memory/1024);
+		break;
+	case 109: /*battery on/off*/
+		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
+		tc->value = b_on;
+		break;
+	case 110: /*battery charging*/
+		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
+		tc->value = b_charge;
+		break;
+	case 111: /*battery level*/
+		gf_sys_get_battery_state(&b_on, &b_charge, &b_level, NULL, NULL);
+		tc->value = b_level;
+		break;
+
+	case 112: /*audio vol*/
+		tc->value = gf_sc_get_option(scene->compositor, GF_OPT_AUDIO_VOLUME);
+		break;
+	case 113: /*audio pan*/
+		tc->value = gf_sc_get_option(scene->compositor, GF_OPT_AUDIO_PAN);
+		break;
+	default:
+		return;
+	}
+	gf_node_event_out(node, 2);
+}
+
+static void InitTermCap(GF_Scene *scene, GF_Node *node)
+{
+	M_TermCap *tc = (M_TermCap *)node;
+	tc->on_evaluate = evaluate_scene_cap;
+	gf_node_set_private(node, scene);
+	/*evaluate upon init (cf BIFS spec)*/
+	evaluate_scene_cap(node, NULL);
+}
+
+#endif /*GPAC_DISABLE_VRML*/
+
+
+#ifndef GPAC_DISABLE_SVG
+static void svg_traverse_title(GF_Node *node, void *rs, Bool is_destroy)
+{
+	GF_Scene *scene = (GF_Scene *)gf_node_get_private(node);
+	scene->world_info = is_destroy ? NULL : node;
+}
+#endif
+
+void gf_sc_on_node_init(GF_Compositor *sc, GF_Node *node);
+
+void gf_scene_on_node_init(void *_scene, GF_Node *node)
+{
+	GF_Scene *scene = (GF_Scene *)_scene;
+	if (!node || !scene) return;
+
+	switch (gf_node_get_tag(node)) {
+#ifndef GPAC_DISABLE_VRML
+
+	case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Inline:
+#endif
+		gf_init_inline(scene, node);
+		break;
+	case TAG_MPEG4_MediaBuffer:
+		break;
+	case TAG_MPEG4_MediaControl:
+		InitMediaControl(scene, node);
+		break;
+	case TAG_MPEG4_MediaSensor:
+		InitMediaSensor(scene, node);
+		break;
+	case TAG_MPEG4_InputSensor:
+		InitInputSensor(scene, node);
+		break;
+
+	/*BIFS nodes, get back to codec, but filter externProtos*/
+	case TAG_MPEG4_Conditional:
+		break;
+	case TAG_MPEG4_QuantizationParameter:
+		break;
+	/*world info is stored at the inline scene level*/
+	case TAG_MPEG4_WorldInfo:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_WorldInfo:
+#endif
+		gf_node_set_callback_function(node, TraverseWorldInfo);
+		gf_node_set_private(node, scene);
+		break;
+
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_KeySensor:
+		InitKeySensor(scene, node);
+		break;
+	case TAG_X3D_StringSensor:
+		InitStringSensor(scene, node);
+		break;
+#endif
+
+	case TAG_MPEG4_TermCap:
+		InitTermCap(scene, node);
+		break;
+
+	case TAG_MPEG4_Storage:
+		gf_scene_init_storage(scene, node);
+		break;
+
+	case TAG_MPEG4_KeyNavigator:
+		gf_node_set_callback_function(node, TraverseKeyNavigator);
+		gf_node_set_private(node, scene);
+		gf_list_add(scene->keynavigators, node);
+		((M_KeyNavigator*)node)->on_setFocus = on_kn_set_focus;
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			on_kn_set_focus(NULL, NULL);
+		}
+#endif
+		break;
+
+#endif
+
+
+#ifndef GPAC_DISABLE_SVG
+	case TAG_SVG_title:
+		gf_node_set_callback_function(node, svg_traverse_title);
+		gf_node_set_private(node, scene);
+		break;
+#endif
+
+	default:
+		gf_sc_on_node_init(scene->compositor, node);
+		break;
+	}
+}
+
+void gf_scene_on_node_modified(void *_is, GF_Node *node)
+{
+	GF_Scene *scene = (GF_Scene *)_is;
+	if (!scene) return;
+	if (!node) {
+		gf_sc_invalidate(scene->compositor, NULL);
+		return;
+	}
+
+	switch (gf_node_get_tag(node)) {
+#ifndef GPAC_DISABLE_VRML
+	case TAG_MPEG4_Inline:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Inline:
+#endif
+		gf_inline_on_modified(node);
+		break;
+	case TAG_MPEG4_MediaBuffer:
+		break;
+	case TAG_MPEG4_MediaControl:
+		MC_Modified(node);
+		break;
+	case TAG_MPEG4_MediaSensor:
+		MS_Modified(node);
+		break;
+	case TAG_MPEG4_InputSensor:
+		InputSensorModified(node);
+		break;
+	case TAG_MPEG4_Conditional:
+		break;
+	case TAG_MPEG4_Storage:
+		break;
+#endif
+	default:
+		gf_sc_invalidate(scene->compositor, node);
+		break;
+	}
+}
+
+static void gf_scene_on_node_destroyed(void *_is, GF_Node *node)
+{
+	GF_Scene *scene = (GF_Scene *)_is;
+	if (!scene) return;
+	gf_sc_node_destroy(scene->compositor, node, NULL);
+}
+
+GF_EXPORT
+void gf_scene_node_callback(void *_is, GF_SGNodeCbkType type, GF_Node *n, void *param)
+{
+	switch (type) {
+	case GF_SG_CALLBACK_MODIFIED:
+		gf_scene_on_node_modified(_is, n);
+		break;
+	case GF_SG_CALLBACK_NODE_DESTROY:
+		gf_scene_on_node_destroyed(_is, n);
+		break;
+	case GF_SG_CALLBACK_INIT:
+		gf_scene_on_node_init(_is, n);
+		break;
+	/*get all inline nodes using this subscene and bubble up...*/
+	case GF_SG_CALLBACK_GRAPH_DIRTY:
+	{
+		u32 i=0;
+		GF_Scene *scene = (GF_Scene *)_is;
+		if (scene->root_od->mo) {
+			GF_Node *root;
+			while ((root=(GF_Node*)gf_mo_event_target_enum_node(scene->root_od->mo, &i))) {
+				gf_node_dirty_set(root, GF_SG_CHILD_DIRTY, GF_TRUE);
+			}
+		}
+	}
+	break;
+	}
+}

gpac-1.0.0.tar.gz/src/compositor/scene_ns.c Added

@@ -0,0 +1,612 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/internal/compositor_dev.h>
+#include <gpac/network.h>
+
+
+void scene_ns_on_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+{
+	GF_SceneNamespace *scene_ns;
+	GF_Scene *scene;
+	GF_ObjectManager *root = (GF_ObjectManager *)udta;
+	assert(root);
+	scene_ns = root->scene_ns;
+	assert(scene_ns);
+	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) ));
+
+	if (root->scene_ns->owner != root) {
+		gf_scene_message(scene, scene_ns->url, "Incompatible module type", GF_SERVICE_ERROR);
+		return;
+	}
+	/*this is service connection*/
+	gf_odm_service_media_event(root, GF_EVENT_MEDIA_SETUP_DONE);
+
+	scene_ns->connect_ack = GF_TRUE;
+	if (err) {
+		char msg[5000];
+		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;
+		gf_odm_service_media_event(root, GF_EVENT_ERROR);
+
+		/*destroy service only if attached*/
+		if (root) {
+			GF_Scene *top_scene;
+			//notify before disconnecting
+			if (root->subscene) gf_scene_notify_event(root->subscene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, err, GF_FALSE);
+
+			//detach clocks before destroying namspace
+			root->ck = NULL;
+			if (root->subscene) {
+				u32 i, count = gf_list_count(root->subscene->resources);
+				for (i=0; i<count; i++) {
+					GF_ObjectManager *anodm = gf_list_get(root->subscene->resources, i);
+					anodm->ck = NULL;
+					if (anodm->scene_ns==root->scene_ns)
+					 	anodm->scene_ns = NULL;
+				}
+			}
+
+			root->scene_ns = NULL;
+			if (scene_ns->owner && scene_ns->nb_odm_users) scene_ns->nb_odm_users--;
+			scene_ns->owner = NULL;
+
+			top_scene = gf_scene_get_root_scene(scene);
+
+			//source filter no longer exists
+			scene_ns->source_filter = NULL;
+			gf_scene_ns_del(scene_ns, top_scene);
+
+			if (!root->parentscene) {
+				GF_Event evt;
+				evt.type = GF_EVENT_CONNECT;
+				evt.connect.is_connected = 0;
+				gf_filter_send_gf_event(scene->compositor->filter, &evt);
+			} else {
+				/*try to reinsert OD for VRML/X3D with multiple URLs:
+				1- first remove from parent scene without destroying object, this will trigger a re-setup
+					if other URLs are present
+					2- then destroy object*/
+				gf_scene_remove_object(root->parentscene, root, 0);
+				gf_odm_disconnect(root, 1);
+			}
+			return;
+		}
+	}
+}
+
+
+
+#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;
+	GF_MediaObject *the_mo;
+	GF_ObjectManager *odm, *root;
+	const GF_PropertyValue *v;
+	u32 mtype=0;
+	u32 pid_odid=0;
+	u32 pid_id=0;
+	u32 ServiceID=0;
+
+	root = sns->owner;
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[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));
+		return;
+	}
+	scene = root->subscene ? root->subscene : root->parentscene;
+	if (scene->root_od->addon && (scene->root_od->addon->addon_type == GF_ADDON_TYPE_MAIN)) {
+		scene->root_od->flags |= GF_ODM_REGENERATE_SCENE;
+	}
+
+	if (scene->is_dynamic_scene) {
+		if (!root->ID)
+			root->ID = 1;
+	}
+
+	v = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!v) return;
+	mtype = v->value.uint;
+
+	v = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_ID);
+	if (v) ServiceID = v->value.uint;
+
+	v = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (v) pid_id = v->value.uint;
+
+	if (scene->compositor->autofps && (mtype==GF_STREAM_VISUAL) ) {
+		v = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (v && v->value.frac.den && v->value.frac.num && (v->value.frac.den!=v->value.frac.num)) {
+			scene->compositor->autofps = GF_FALSE;
+			gf_sc_set_fps(scene->compositor, v->value.frac);
+		}
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[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; */
+
+	/*check if we have a mediaObject in the scene not attached and matching this object*/
+	the_mo = NULL;
+	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;
+		GF_MediaObject *mo = gf_list_get(scene->scene_objects, i);
+
+		if ((mo->OD_ID != GF_MEDIA_EXTERNAL_ID) && (min_od_id<mo->OD_ID))
+			min_od_id = mo->OD_ID;
+
+		//got the service, check the type
+		/*match type*/
+		switch (mtype) {
+		case GF_STREAM_VISUAL:
+			if (mo->type == GF_MEDIA_OBJECT_VIDEO) type_matched = GF_TRUE;
+			break;
+		case GF_STREAM_AUDIO:
+			if (mo->type == GF_MEDIA_OBJECT_AUDIO) type_matched = GF_TRUE;
+			break;
+		case GF_STREAM_SCENE:
+			if (mo->type == GF_MEDIA_OBJECT_UPDATES) type_matched = GF_TRUE;
+			break;
+		default:
+			break;
+		}
+		if (!mo->odm) {
+			u32 j;
+			//if not external OD, look for ODM with same ID
+			if (mo->OD_ID != GF_MEDIA_EXTERNAL_ID) {
+				for (j=0; j<gf_list_count(scene->resources); j++) {
+					GF_ObjectManager *an_odm = gf_list_get(scene->resources, j);
+					if (an_odm->ID == mo->OD_ID) {
+						mo->odm = an_odm;
+						break;
+					}
+				}
+			}
+			if (!mo->odm) {
+				continue;
+			}
+		}
+		/*if object is attached to a service, don't bother looking in a different one*/
+		if (mo->odm->scene_ns && (mo->odm->scene_ns != sns)) {
+			Bool mine = 0;
+			if (mo->odm->scene_ns->source_filter) {
+				mine = gf_filter_pid_is_filter_in_parents(pid, mo->odm->scene_ns->source_filter);
+			}
+			//passthrough ODM not yet assigned, consider it ours
+			else if (!mo->odm->pid && (mo->odm->flags & GF_ODM_PASSTHROUGH)) {
+				mine = GF_TRUE;
+			}
+			if (!mine) continue;
+
+			if (type_matched) {
+				the_mo = mo;
+				odm = mo->odm;
+				pid_odid = odm->ID = mo->OD_ID;
+				break;
+			}
+		}
+
+		/*already assigned object*/
+		if (mo->odm->ID) continue;
+
+		/*we cannot match yet the object, we need the OD command for that*/
+		if (mo->OD_ID != GF_MEDIA_EXTERNAL_ID) {
+			continue;
+		}
+		if (!mo->URLs.count || !mo->URLs.vals[0].url) continue;
+
+		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;
+		if (!strnicmp(url, "file://localhost", 16)) url += 16;
+		else if (!strnicmp(url, "file://", 7)) url += 7;
+		else if (!strnicmp(url, "gpac://", 7)) url += 7;
+		else if (!strnicmp(url, "pid://", 6)) match_esid = atoi(url+6);
+
+		if (!match_esid && mo->odm->scene_ns && !strstr(mo->odm->scene_ns->url, url)) {
+			if (ext) ext[0] = '#';
+			continue;
+		}
+		if (ext) ext[0] = '#';
+
+		if (match_esid && (pid_id != match_esid))
+			continue;
+
+		/*match type*/
+		switch (mtype) {
+		case GF_STREAM_VISUAL:
+			if (mo->type != GF_MEDIA_OBJECT_VIDEO) continue;
+			break;
+		case GF_STREAM_AUDIO:
+			if (mo->type != GF_MEDIA_OBJECT_AUDIO) continue;
+			break;
+		case GF_STREAM_SCENE:
+			if (mo->type != GF_MEDIA_OBJECT_UPDATES) continue;
+			break;
+		default:
+			continue;
+		}
+#if FILTER_FIXME
+		if (frag) {
+			u32 frag_id = 0;
+			u32 ID = od->objectDescriptorID;
+			if (ID==GF_MEDIA_EXTERNAL_ID) ID = esd->ESID;
+			frag++;
+			frag_id = atoi(frag);
+			if (ID!=frag_id) continue;
+		}
+#endif
+		the_mo = mo;
+		odm = mo->odm;
+		pid_odid = odm->ID = mo->OD_ID;
+		if (mo->OD_ID == GF_MEDIA_EXTERNAL_ID)
+			odm->flags |= GF_ODM_NOT_IN_OD_STREAM;
+		break;
+	}
+
+	/*add a pass on scene->resource to check for min_od_id,
+	otherwise we may have another modules declaring an object with ID 0 from
+	another thread, which will assert (only one object with a givne OD ID)*/
+	for (i=0; i<gf_list_count(scene->resources); i++) {
+		GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+
+		if (an_odm->ID == GF_MEDIA_EXTERNAL_ID) continue;
+
+		if (min_od_id < an_odm->ID)
+			min_od_id = an_odm->ID;
+
+		if (odm) continue;
+		//check for OD replacement, look for ODMs with no PID assigned and a source filter origin for this pid
+		if (an_odm->pid) continue;
+
+		if (!an_odm->scene_ns->source_filter) continue;
+		if (! gf_filter_pid_is_filter_in_parents(pid, an_odm->scene_ns->source_filter))
+			continue;
+
+		odm = an_odm;
+		pid_odid = an_odm->ID;
+		break;
+	}
+
+	if (is_in_iod) {
+		odm = scene->root_od;
+		//for inline cases, the media object may already be setup
+		the_mo = odm->mo;
+		if (the_mo) pid_odid = the_mo->OD_ID;
+	}
+
+	if (!odm) {
+		odm = gf_odm_new();
+		odm->parentscene = scene;
+		gf_list_add(scene->resources, odm);
+	}
+	odm->flags |= GF_ODM_NOT_SETUP;
+	if (!pid_odid) {
+		pid_odid = min_od_id + 1;
+	}
+	odm->ID = pid_odid;
+	odm->mo = the_mo;
+	odm->ServiceID = ServiceID;
+	if (!odm->pid) {
+		odm->type = mtype;
+		if (mtype == GF_STREAM_AUDIO) {
+			scene->compositor->audio_renderer->nb_audio_objects++;
+			scene->compositor->audio_renderer->scene_ready = GF_FALSE;
+		}
+	}
+
+	//register PID with ODM, but don't call setup object
+	gf_odm_register_pid(odm, pid, GF_TRUE);
+
+	gf_filter_pid_set_udta(pid, odm);
+
+	v = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
+	if (!v || !v->value.uint) odm->flags |= GF_ODM_NO_TIME_CTRL;
+
+	if (the_mo) the_mo->OD_ID = odm->ID;
+	if (!scene->selected_service_id)
+		scene->selected_service_id = ServiceID;
+
+	if (odm->parentscene && odm->parentscene->is_dynamic_scene)
+		odm->flags |= GF_ODM_NOT_IN_OD_STREAM;
+
+	//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_odm_setup_object(odm, sns, pid);
+	} else {
+		//cannot setup until we get the associated OD_Update
+		odm->ID = 0;
+	}
+
+	if (scene->is_dynamic_scene && !root->scene_ns->connect_ack) {
+		/*othewise send a connect ack for top level*/
+		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));
+
+		evt.type = GF_EVENT_CONNECT;
+		evt.connect.is_connected = GF_TRUE;
+		gf_sc_send_event(scene->compositor, &evt);
+	}
+}
+
+GF_SceneNamespace *gf_scene_ns_new(GF_Scene *scene, GF_ObjectManager *owner, const char *url, const char *parent_url)
+{
+	char *frag;
+	GF_SceneNamespace *sns;
+
+	GF_SAFEALLOC(sns, GF_SceneNamespace);
+	if (!sns) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Compose] Failed to allocate namespace\n"));
+		return NULL;
+	}
+	sns->owner = owner;
+	sns->url = gf_url_concatenate(parent_url, url);
+	sns->clocks = gf_list_new();
+	frag = strchr(sns->url, '#');
+	if (frag) {
+		sns->url_frag = gf_strdup(frag+1);
+		frag[0] = 0;
+	}
+
+	//move to top scene
+	scene = gf_scene_get_root_scene(scene);
+	gf_list_add(scene->namespaces, sns);
+
+	return sns;
+}
+
+
+
+void gf_scene_ns_del(GF_SceneNamespace *sns, GF_Scene *root_scene)
+{
+	gf_list_del_item(root_scene->namespaces, sns);
+
+	if (sns->source_filter) {
+		gf_filter_remove_src(root_scene->compositor->filter, sns->source_filter);
+	}
+	if (sns->clocks) {
+		while (gf_list_count(sns->clocks)) {
+			GF_Clock *ck = gf_list_pop_back(sns->clocks);
+			gf_clock_del(ck);
+		}
+		gf_list_del(sns->clocks);
+	}
+	if (sns->url) gf_free(sns->url);
+	if (sns->url_frag) gf_free(sns->url_frag);
+	gf_free(sns);
+}
+
+
+Bool scene_ns_remove_object(GF_Filter *filter, void *callback, u32 *reschedule_ms)
+{
+	GF_ObjectManager *odm = (GF_ObjectManager *)callback;
+	gf_odm_disconnect(odm, 2);
+	return GF_FALSE;
+}
+
+/*connects given OD manager to its URL*/
+void gf_scene_ns_connect_object(GF_Scene *scene, GF_ObjectManager *odm, char *serviceURL, char *parent_url)
+{
+	GF_Err e;
+	char *frag;
+	Bool reloc_result=GF_FALSE;
+
+	/*check cache*/
+	if (parent_url) {
+		u32 i, count;
+		count = gf_opts_get_section_count();
+		for (i=0; i<count; i++) {
+			u32 exp, sec, frac;
+			const char *opt, *service_cache;
+			const char *name = gf_opts_get_section_name(i);
+			if (strncmp(name, "@cache=", 7)) continue;
+			opt = gf_opts_get_key(name, "serviceURL");
+			if (!opt || stricmp(opt, parent_url)) continue;
+			opt = gf_opts_get_key(name, "cacheName");
+			if (!opt || stricmp(opt, serviceURL)) continue;
+
+			service_cache = (char*)gf_opts_get_key(name, "cacheFile");
+			opt = gf_opts_get_key(name, "expireAfterNTP");
+			if (opt) {
+				sscanf(opt, "%u", &exp);
+				gf_net_get_ntp(&sec, &frac);
+				if (exp && (exp<sec)) {
+					opt = gf_opts_get_key(name, "cacheFile");
+					if (opt) gf_file_delete((char*) opt);
+					gf_opts_del_section(name);
+					service_cache = NULL;
+				}
+			}
+			if (service_cache) serviceURL = (char *)service_cache;
+			break;
+		}
+	}
+
+	frag = strchr(serviceURL, '#');
+	if (frag) {
+		frag[0] = 0;
+		u32 i, count = gf_list_count(scene->compositor->root_scene->namespaces);
+		for (i=0; i<count; i++) {
+			GF_SceneNamespace *sns = gf_list_get(scene->compositor->root_scene->namespaces, i);
+			if (sns->url && !strcmp(sns->url, serviceURL)) {
+				frag[0] = '#';
+				odm->scene_ns = sns;
+				sns->nb_odm_users++;
+				return;
+			}
+		}
+	}
+
+	odm->scene_ns = gf_scene_ns_new(scene->compositor->root_scene, odm, serviceURL, (odm->addon || reloc_result) ? NULL : parent_url);
+
+	if (!odm->scene_ns) {
+		gf_scene_message(scene, serviceURL, "Cannot create scene service", GF_OUT_OF_MEM);
+		gf_odm_disconnect(odm, 1);
+		if (frag) frag[0] = '#';
+		return;
+	}
+	odm->scene_ns->nb_odm_users++;
+	assert(odm->scene_ns->owner == odm);
+
+	if (frag && !odm->scene_ns->url_frag) {
+		odm->scene_ns->url_frag = gf_strdup(frag+1);
+	}
+
+	if (!strncmp(serviceURL, "gpid://", 7)) {
+		gf_odm_service_media_event(odm, GF_EVENT_MEDIA_SETUP_BEGIN);
+		gf_odm_service_media_event(odm, GF_EVENT_MEDIA_SETUP_DONE);
+		odm->scene_ns->connect_ack = GF_TRUE;
+		odm->flags |= GF_ODM_NOT_IN_OD_STREAM | GF_ODM_PASSTHROUGH;
+		if (frag) frag[0] = '#';
+		return;
+	}
+	if (!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, &e);
+
+	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;
+		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;
+		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, e, GF_TRUE);
+		gf_scene_message(scene, serviceURL, "Cannot find filter for service", e);
+		odm->skip_disconnect_state = 0;
+
+		if (target_scene) {
+			if (target_scene->root_od->skip_disconnect_state==2) remove_scene = GF_TRUE;
+			target_scene->root_od->skip_disconnect_state = 0;
+		}
+		if (remove_scene) {
+			gf_filter_post_task(scene->compositor->filter, scene_ns_remove_object, target_scene->root_od, "remove_odm");
+		} else {
+			gf_filter_post_task(scene->compositor->filter, scene_ns_remove_object, odm, "remove_odm");
+		}
+		return;
+	}
+    //make sure we only connect this filter to ourselves 
+    gf_filter_set_source(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);
+
+	/*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-0.8.0.tar.gz/src/compositor/svg_base.c -> gpac-1.0.0.tar.gz/src/compositor/svg_base.c Changed

@@ -27,6 +27,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 #include "nodes_stacks.h"
+#include <gpac/iso639.h>
 
 
 /*
@@ -229,7 +230,7 @@
 {
 	u32 i, count;
 	Bool found;
-	const char *lang_3cc, *lang_2cc;
+	s32 lang_idx;
 
 	/*process required features*/
 	count = atts->requiredFeatures ? gf_list_count(*atts->requiredFeatures) : 0;
@@ -250,8 +251,8 @@
 		else if (!strnicmp(iri->string, "http://www.w3.org/TR/SVG11/feature", 34)) {
 			feat = iri->string+35;
 			if (feat) {
-				Bool found = GF_FALSE;
 				u32 j, nbf;
+				found = GF_FALSE;
 				nbf  = sizeof(svg11_features) / sizeof(struct svg_11_feature);
 				for (j=0; j<nbf; j++) {
 					if (!strcmp(svg11_features[j].name, feat)) {
@@ -266,8 +267,8 @@
 		else if (!strnicmp(iri->string, "http://www.w3.org/Graphics/SVG/feature/1.2/", 43)) {
 			feat = iri->string+44;
 			if (feat) {
-				Bool found = GF_FALSE;
 				u32 j, nbf;
+				found = GF_FALSE;
 				nbf  = sizeof(svg12_features) / sizeof(struct svg_12_feature);
 				for (j=0; j<nbf; j++) {
 					if (!strcmp(svg12_features[j].name, feat)) {
@@ -293,27 +294,17 @@
 	count = atts->systemLanguage ? gf_list_count(*atts->systemLanguage) : 0;
 	if (count) {
 		found = GF_FALSE;
-		lang_3cc = gf_cfg_get_key(compositor->user->config, "Systems", "Language3CC");
-		if (!lang_3cc) lang_3cc = "und";
-		lang_2cc = gf_cfg_get_key(compositor->user->config, "Systems", "Language2CC");
-		if (!lang_2cc) lang_2cc = "un";
+		const char *lang = gf_opts_get_key("core", "lang");
+		lang_idx = lang ? gf_lang_find(lang) : -1;
 	} else {
-		lang_3cc = "und";
-		lang_2cc = "un";
+		lang_idx = -1;
 		found = GF_TRUE;
 	}
 
 	for (i=0; i<count; i++) {
 		char *lang = (char*)gf_list_get(*atts->systemLanguage, i);
-		/*3 char-code*/
-		if (strlen(lang)==3) {
-			if (!stricmp(lang, lang_3cc)) {
-				found = GF_TRUE;
-				break;
-			}
-		}
-		/*2 char-code, only check first 2 chars - TODO FIXME*/
-		else if (!strnicmp(lang, lang_2cc, 2)) {
+		s32 pref_lang_idx = lang ? gf_lang_find(lang) : -1;
+		if (pref_lang_idx==lang_idx) {
 			found = GF_TRUE;
 			break;
 		}
@@ -324,13 +315,13 @@
 	count = atts->requiredFormats ? gf_list_count(*atts->requiredFormats) : 0;
 	if (count) {
 		for (i=0; i<count; i++) {
-			const char *opt;
+			Bool mime_ok;
 			char *mime = (char*)gf_list_get(*atts->requiredFormats, i);
 			char *sep = strchr(mime, ';');
 			if (sep) sep[0] = 0;
-			opt = gf_cfg_get_key(compositor->user->config, "MimeTypes", mime);
+			mime_ok = gf_filter_is_supported_mime(compositor->filter, mime);
 			if (sep) sep[0] = ';';
-			if (!opt) return GF_FALSE;
+			if (!mime_ok) return GF_FALSE;
 		}
 	}

gpac-1.0.0.tar.gz/src/compositor/svg_external.c Added

@@ -0,0 +1,187 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato - Jean le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Compositor 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/constants.h>
+#include <gpac/mediaobject.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/compositor.h>
+#include <gpac/network.h>
+
+GF_EXPORT
+GF_Err gf_term_get_mfurl_from_xlink(GF_Node *node, MFURL *mfurl)
+{
+	u32 stream_id = 0;
+	GF_Err e = GF_OK;
+	SFURL *sfurl = NULL;
+	GF_FieldInfo info;
+	XMLRI *iri;
+	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
+	if (!scene) return GF_BAD_PARAM;
+
+	gf_sg_vrml_mf_reset(mfurl, GF_SG_VRML_MFURL);
+
+	e = gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, 0, 0, &info);
+	if (e) return e;
+
+	iri = (XMLRI*)info.far_ptr;
+
+	if (iri->type==XMLRI_STREAMID) {
+		stream_id = iri->lsr_stream_id;
+	} else if (!iri->string) return GF_OK;
+
+	mfurl->count = 1;
+	GF_SAFEALLOC(mfurl->vals, SFURL)
+	if (!mfurl->vals) return GF_BAD_PARAM;
+	sfurl = mfurl->vals;
+	sfurl->OD_ID = stream_id;
+	if (stream_id) return GF_OK;
+
+	if (!strncmp(iri->string, "data:", 5)) {
+		const char *cache_dir = gf_opts_get_key("core", "cache");
+		e = gf_node_store_embedded_data(iri, cache_dir, "embedded_");
+		if (e) return e;
+		sfurl->url = gf_strdup(iri->string);
+		return GF_OK;
+	}
+	sfurl->url = gf_scene_resolve_xlink(node, iri->string);
+	return e;
+}
+
+
+/* Creates a subscene from the xlink:href */
+static GF_Scene *gf_svg_get_subscene(GF_Node *elt, XLinkAttributesPointers *xlinkp, SMILSyncAttributesPointers *syncp, Bool use_sync, Bool primary_resource)
+{
+	MFURL url;
+	Bool lock_timelines = 0;
+	GF_MediaObject *mo;
+	GF_SceneGraph *graph = gf_node_get_graph(elt);
+	GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
+	if (!scene) return NULL;
+
+	if (use_sync && syncp) {
+		switch ((syncp->syncBehavior?*syncp->syncBehavior:SMIL_SYNCBEHAVIOR_DEFAULT)) {
+		case SMIL_SYNCBEHAVIOR_LOCKED:
+		case SMIL_SYNCBEHAVIOR_CANSLIP:
+			lock_timelines = 1;
+			break;
+		case SMIL_SYNCBEHAVIOR_DEFAULT:
+		{
+#if 0
+			if (svg && syncp) {
+				switch ((syncp->syncBehaviorDefault ? *syncp->syncBehaviorDefault : SMIL_SYNCBEHAVIOR_LOCKED)) {
+				case SMIL_SYNCBEHAVIOR_LOCKED:
+				case SMIL_SYNCBEHAVIOR_CANSLIP:
+					lock_timelines = 1;
+					break;
+				default:
+					break;
+				}
+			}
+#endif
+		}
+		default:
+			break;
+		}
+	}
+	memset(&url, 0, sizeof(MFURL));
+	if (!xlinkp->href) return NULL;
+
+	gf_term_get_mfurl_from_xlink(elt, &url);
+
+	while (scene->secondary_resource && scene->root_od->parentscene)
+		scene = scene->root_od->parentscene;
+
+	mo = gf_scene_get_media_object_ex(scene, &url, GF_MEDIA_OBJECT_SCENE, lock_timelines, NULL, primary_resource, elt);
+	gf_sg_vrml_mf_reset(&url, GF_SG_VRML_MFURL);
+
+	if (!mo || !mo->odm) return NULL;
+	mo->odm->subscene->secondary_resource = primary_resource ? 0 : 1;
+	return mo->odm->subscene;
+}
+
+GF_EXPORT
+GF_MediaObject *gf_mo_load_xlink_resource(GF_Node *node, Bool primary_resource, Double clipBegin, Double clipEnd)
+{
+	GF_Scene *new_resource;
+	SVGAllAttributes all_atts;
+	XLinkAttributesPointers xlinkp;
+	SMILSyncAttributesPointers syncp;
+	GF_Scene *scene = gf_sg_get_private(gf_node_get_graph(node));
+	if (!scene) return NULL;
+
+	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
+	xlinkp.actuate = all_atts.xlink_actuate;
+	xlinkp.arcrole = all_atts.xlink_arcrole;
+	xlinkp.href = all_atts.xlink_href;
+	xlinkp.role = all_atts.xlink_role;
+	xlinkp.show = all_atts.xlink_show;
+	xlinkp.title = all_atts.xlink_title;
+	xlinkp.type = all_atts.xlink_type;
+	syncp.syncBehavior = all_atts.syncBehavior;
+	syncp.syncBehaviorDefault = all_atts.syncBehaviorDefault;
+	syncp.syncMaster = all_atts.syncMaster;
+	syncp.syncReference = all_atts.syncReference;
+	syncp.syncTolerance = all_atts.syncTolerance;
+	syncp.syncToleranceDefault = all_atts.syncToleranceDefault;
+
+	if (!xlinkp.href) return NULL;
+
+	if (xlinkp.href->type == XMLRI_ELEMENTID) return NULL;
+//	else if (xlinkp.href->string && (xlinkp.href->string[0]=='#')) return NULL;
+
+	new_resource = gf_svg_get_subscene(node, &xlinkp, &syncp, primary_resource ? 1 : 0, primary_resource);
+	if (!new_resource) return NULL;
+
+	/*play*/
+	gf_mo_play(new_resource->root_od->mo, 0, -1, 0);
+
+	return new_resource->root_od->mo;
+}
+
+GF_EXPORT
+void gf_mo_unload_xlink_resource(GF_Node *node, GF_MediaObject *mo)
+{
+	if (!mo || !mo->odm || !mo->odm->subscene) {
+		return;
+	}
+
+	if (mo->num_open) {
+		mo->num_open--;
+		if (!mo->num_open) {
+			/*do we simply stop the associated document or unload it??? to check*/
+//			gf_mo_stop(&mo);
+			gf_odm_disconnect(mo->odm, 2);
+			return;
+		}
+	}
+}
+
+#endif //GPAC_DISABLE_SVG
+

gpac-0.8.0.tar.gz/src/compositor/svg_filters.c -> gpac-1.0.0.tar.gz/src/compositor/svg_filters.c Changed

@@ -29,6 +29,8 @@
 #include "nodes_stacks.h"
 #include "texturing.h"
 
+#ifdef GPAC_ENABLE_SVG_FILTERS
+
 typedef struct
 {
 	GF_TextureHandler txh;
@@ -195,7 +197,7 @@
 	GF_IRect txrc;
 	Fixed scale_x, scale_y, temp_x, temp_y;
 	DrawableContext *ctx, *child_ctx;
-	GF_SURFACE offscreen_surface, old_surf;
+	GF_EVGSurface *offscreen_surface, *old_surf;
 	GF_Rect bounds, local_bounds, rc;
 	GF_Matrix2D backup;
 	SVGAllAttributes all_atts;
@@ -260,14 +262,14 @@
 
 
 	old_surf = tr_state->visual->raster_surface;
-	offscreen_surface = tr_state->visual->compositor->rasterizer->surface_new(tr_state->visual->compositor->rasterizer, tr_state->visual->center_coords);
+	offscreen_surface = gf_evg_surface_new(tr_state->visual->center_coords);
 	tr_state->visual->raster_surface = offscreen_surface;
 
 	gf_mx2d_copy(backup, tr_state->transform);
 	gf_mx2d_init(tr_state->transform);
 
 	/*attach the buffer to visual*/
-	tr_state->visual->compositor->rasterizer->surface_attach_to_buffer(offscreen_surface, st->txh.data,
+	gf_evg_surface_attach_to_buffer(offscreen_surface, st->txh.data,
 	        st->txh.width,
 	        st->txh.height,
 	        0,
@@ -333,7 +335,7 @@
 	/*restore state and destroy whatever needs to be cleaned*/
 	tr_state->in_svg_filter = 0;
 	tr_state->immediate_draw = prev_flags;
-	tr_state->visual->compositor->rasterizer->surface_delete(offscreen_surface);
+	gf_evg_surface_delete(offscreen_surface);
 	tr_state->visual->raster_surface = old_surf;
 	tr_state->traversing_mode = TRAVERSE_SORT;
 	tr_state->visual->surf_rect = rc1;
@@ -442,6 +444,8 @@
 	gf_sc_texture_allocate(&stack->txh);
 }
 
+#endif //GPAC_ENABLE_SVG_FILTERS
+
 #endif

gpac-0.8.0.tar.gz/src/compositor/svg_font.c -> gpac-1.0.0.tar.gz/src/compositor/svg_font.c Changed

@@ -194,18 +194,16 @@
 
 static void svg_font_on_load(GF_Node *handler, GF_DOM_Event *event, GF_Node *observer)
 {
-	GF_Compositor *compositor;
 	GF_Font *font;
 	assert(event->currentTarget->ptr_type==GF_DOM_EVENT_TARGET_NODE);
 	assert(gf_node_get_tag((GF_Node*)event->currentTarget->ptr)==TAG_SVG_font);
 	font = gf_node_get_private((GF_Node*)event->currentTarget->ptr);
 	font->not_loaded = 0;
-	compositor = (GF_Compositor *)gf_node_get_private((GF_Node *)handler);
 
 	/*brute-force signaling that all fonts have changed and texts must be recomputed*/
-	compositor->reset_fonts = 1;
-	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-	compositor->fonts_pending--;
+	font->compositor->reset_fonts = 1;
+	gf_sc_next_frame_state(font->compositor, GF_SC_DRAW_FRAME);
+	font->compositor->fonts_pending--;
 }
 
 void compositor_init_svg_font(GF_Compositor *compositor, GF_Node *node)
@@ -234,6 +232,7 @@
 		return;
 	}
 	font->ft_mgr = compositor->font_manager;
+	font->compositor = compositor;
 
 	font->get_glyphs = svg_font_get_glyphs;
 	font->load_glyph = svg_font_load_glyph;
@@ -318,7 +317,6 @@
 	/*wait for onLoad event before activating the font, otherwise we may not have all the glyphs*/
 	handler = gf_dom_listener_build(node_font, GF_EVENT_LOAD, 0);
 	handler->handle_event = svg_font_on_load;
-	gf_node_set_private((GF_Node *)handler, compositor);
 }
 
 
@@ -443,17 +441,33 @@
 		if (!font_name) return 0;
 		if (!st->mo) {
 			st->mo = gf_mo_load_xlink_resource(node, 0, 0, -1);
-			if (!st->mo) return 0;
+			if (!st->mo) {
+				st->compositor->fonts_pending--;
+				return 0;
+			}
 		}
 		ext_sg = gf_mo_get_scenegraph(st->mo);
-		if (!ext_sg) return 0;
+		if (!ext_sg) {
+			st->compositor->fonts_pending--;
+			return 0;
+		}
 		atts.xlink_href->target = gf_sg_find_node_by_name(ext_sg, font_name+1);
-		if (!atts.xlink_href->target) return 0;
+		if (!atts.xlink_href->target) {
+			st->compositor->fonts_pending--;
+			return 0;
+		}
 	}
 	font_elt = atts.xlink_href->target;
-	if (gf_node_get_tag(font_elt) != TAG_SVG_font) return 0;
+	if (gf_node_get_tag(font_elt) != TAG_SVG_font) {
+		st->compositor->fonts_pending--;
+		return 0;
+	}
 	font = gf_node_get_private(font_elt);
-	if (!font) return 0;
+	if (!font) {
+		st->compositor->fonts_pending--;
+		return 0;
+	}
+
 	st->alias = font;
 
 	gf_mo_is_done(st->mo);

gpac-0.8.0.tar.gz/src/compositor/svg_geometry.c -> gpac-1.0.0.tar.gz/src/compositor/svg_geometry.c Changed

gpac-0.8.0.tar.gz/src/compositor/svg_grouping.c -> gpac-1.0.0.tar.gz/src/compositor/svg_grouping.c Changed

@@ -29,7 +29,6 @@
 #include "nodes_stacks.h"
 #include "offscreen_cache.h"
 
-#include <gpac/internal/terminal_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/mediaobject.h>
 
@@ -116,7 +115,7 @@
 			else {
 				GF_Node *target = gf_sg_find_node_by_name(gf_node_get_graph(node), (char *) frag_uri);
 				if (target) {
-					GF_Matrix2D mx;
+					GF_Matrix2D vp_mx;
 					GF_TraverseState bounds_state;
 					memset(&bounds_state, 0, sizeof(bounds_state));
 					bounds_state.traversing_mode = TRAVERSE_GET_BOUNDS;
@@ -127,8 +126,8 @@
 					gf_mx2d_init(bounds_state.mx_at_node);
 					gf_mx_init(tr_state->visual->compositor->hit_world_to_local);
 					gf_sc_get_nodes_bounds(node, ((GF_ParentNode *)node)->children, &bounds_state, NULL);
-					gf_mx2d_from_mx(&mx, &tr_state->visual->compositor->hit_world_to_local);
-					gf_mx2d_apply_rect(&mx, &bounds_state.bounds);
+					gf_mx2d_from_mx(&vp_mx, &tr_state->visual->compositor->hit_world_to_local);
+					gf_mx2d_apply_rect(&vp_mx, &bounds_state.bounds);
 					ext_vb.x = bounds_state.bounds.x;
 					ext_vb.y = bounds_state.bounds.y-bounds_state.bounds.height;
 					ext_vb.width = bounds_state.bounds.width;
@@ -254,21 +253,18 @@
 		stack->vpw = vp_w;
 		stack->vph = vp_h;
 
+#if 0
 		/*we need a clipper*/
 		if (stack->root_svg && !tr_state->parent_anim_atts && (par.meetOrSlice==SVG_MEETORSLICE_SLICE)) {
 			GF_Rect rc;
 			rc.width = parent_width;
 			rc.height = parent_height;
-			if (!stack->root_svg) {
-				rc.x = 0;
-				rc.y = parent_height;
-				gf_mx2d_apply_rect(&stack->viewbox_mx, &rc);
-			} else {
-				rc.x = dx;
-				rc.y = dy + parent_height;
-			}
-//			tr_state->visual->top_clipper = gf_rect_pixelize(&rc);
+			rc.x = dx;
+			rc.y = dy + parent_height;
+			tr_state->visual->top_clipper = gf_rect_pixelize(&rc);
 		}
+#endif
+
 	}
 	gf_mx2d_add_matrix(&stack->viewbox_mx, &mx);
 }
@@ -368,6 +364,10 @@
 			vp_fill = tr_state->svg_props->viewport_fill;
 			vp_opacity = tr_state->svg_props->viewport_fill_opacity ? tr_state->svg_props->viewport_fill_opacity->value : FIX_ONE;
 		}
+		if (tr_state->visual->compositor->noback) {
+			vp_fill = NULL;
+			vp_opacity = 0;
+		}
 
 		if (vp_fill && (vp_fill->type != SVG_PAINT_NONE) && vp_opacity) {
 			Bool col_dirty = 0;
@@ -503,7 +503,7 @@
 Bool compositor_svg_get_viewport(GF_Node *n, GF_Rect *rc)
 {
 	SVGsvgStack *stack;
-	if (gf_node_get_tag(n) != TAG_SVG_svg) return 0;
+	if (!n || (gf_node_get_tag(n) != TAG_SVG_svg)) return 0;
 	stack = gf_node_get_private(n);
 	rc->width = stack->parent_vp.x;
 	rc->height = stack->parent_vp.y;
@@ -583,7 +583,9 @@
 		SVGgStack *group;
 
 		if (!tr_state->in_svg_filter && all_atts.filter && all_atts.filter->iri.target) {
+#ifdef GPAC_ENABLE_SVG_FILTERS
 			svg_draw_filter(all_atts.filter->iri.target, node, tr_state);
+#endif
 			return;
 		}
 		group = gf_node_get_private(node);
@@ -686,12 +688,14 @@
 {
 	SVGgStack *stack;
 	GF_SAFEALLOC(stack, SVGgStack);
+	if (!stack) return;
 	gf_node_set_private(node, stack);
 
 	gf_node_set_callback_function(node, svg_traverse_g);
 }
 
 
+#if 0 //unused
 static void svg_traverse_defs(GF_Node *node, void *rs, Bool is_destroy)
 {
 	SVGPropertiesPointers backup_props;
@@ -725,6 +729,7 @@
 {
 	gf_node_set_callback_function(node, svg_traverse_defs);
 }
+#endif
 
 
 
@@ -778,7 +783,7 @@
 		compositor_svg_apply_local_transformation(tr_state, &all_atts, &backup_matrix, &mx_3d);
 		if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
 			gf_sc_get_nodes_bounds(node, ((SVG_Element *)node)->children, tr_state, selected_idx);
-		} else if (*selected_idx >= 0) {
+		} else {
 			GF_Node *child = gf_node_list_get_child(((SVG_Element *)node)->children, *selected_idx);
 			gf_node_traverse(child, tr_state);
 
@@ -848,24 +853,6 @@
 	tr_state->svg_flags = backup_flags;
 }
 
-static Bool is_timing_target(GF_Node *n)
-{
-	if (!n) return 0;
-	switch (gf_node_get_tag(n)) {
-	case TAG_SVG_set:
-	case TAG_SVG_animate:
-	case TAG_SVG_animateColor:
-	case TAG_SVG_animateTransform:
-	case TAG_SVG_animateMotion:
-	case TAG_SVG_discard:
-	case TAG_SVG_animation:
-	case TAG_SVG_video:
-	case TAG_SVG_audio:
-		return 1;
-	}
-	return 0;
-}
-
 static void svg_a_set_view(GF_Node *handler, GF_Compositor *compositor, const char *url)
 {
 	gf_scene_set_fragment_uri(handler, url);
@@ -892,9 +879,8 @@
 	a = (SVG_Element *) event->currentTarget->ptr;
 	gf_svg_flatten_attributes(a, &all_atts);
 
-	compositor = (GF_Compositor *)gf_node_get_private((GF_Node *)handler);
+	compositor = (GF_Compositor *)gf_node_get_private((GF_Node *)a);
 
-	if (!compositor->user->EventProc) return;
 	if (!all_atts.xlink_href) return;
 
 	if (event->type==GF_EVENT_MOUSEOVER) {
@@ -907,14 +893,14 @@
 			if (!evt.navigate.to_url) evt.navigate.to_url = "document internal link";
 		}
 
-		gf_term_send_event(compositor->term, &evt);
+		gf_sc_send_event(compositor, &evt);
 		return;
 	}
 
 	evt.type = GF_EVENT_NAVIGATE;
 
 	if (all_atts.xlink_href->type == XMLRI_STRING) {
-		evt.navigate.to_url = gf_term_resolve_xlink(handler, all_atts.xlink_href->string);
+		evt.navigate.to_url = gf_scene_resolve_xlink(handler, all_atts.xlink_href->string);
 		if (evt.navigate.to_url) {
 			if (all_atts.target) {
 				evt.navigate.parameters = (const char **) &all_atts.target;
@@ -925,11 +911,7 @@
 			}
 
 			if (evt.navigate.to_url[0] != '#') {
-				if (compositor->term) {
-					gf_scene_process_anchor(handler, &evt);
-				} else {
-					gf_term_send_event(compositor->term, &evt);
-				}
+				gf_scene_process_anchor(handler, &evt);
 				gf_free((char *)evt.navigate.to_url);
 				return;
 			}
@@ -948,12 +930,22 @@
 		return;
 	}
 	/*this is a time event*/
-	if (is_timing_target(all_atts.xlink_href->target)) {
+	switch (gf_node_get_tag(all_atts.xlink_href->target)) {
+	case TAG_SVG_set:
+	case TAG_SVG_animate:
+	case TAG_SVG_animateColor:
+	case TAG_SVG_animateTransform:
+	case TAG_SVG_animateMotion:
+	case TAG_SVG_discard:
+	case TAG_SVG_animation:
+	case TAG_SVG_video:
+	case TAG_SVG_audio:
 		gf_smil_timing_insert_clock(all_atts.xlink_href->target, 0, gf_node_get_scene_time((GF_Node *)handler) );
-	}
-	/*this is an implicit SVGView event*/
-	else {
+		break;
+	default:
+		/*this is an implicit SVGView event*/
 		svg_a_set_view(handler, compositor, gf_node_get_name(all_atts.xlink_href->target));
+		break;
 	}
 }
 
@@ -961,24 +953,22 @@
 {
 	SVG_handlerElement *handler;
 	gf_node_set_callback_function(node, svg_traverse_a);
+	gf_node_set_private((GF_Node *)node, compositor);
 
 	/*listener for onClick event*/
 	handler = gf_dom_listener_build(node, GF_EVENT_CLICK, 0);
 	/*and overwrite handler*/
 	handler->handle_event = svg_a_handle_event;
-	gf_node_set_private((GF_Node *)handler, compositor);
 
 	/*listener for activate event*/
 	handler = gf_dom_listener_build(node, GF_EVENT_ACTIVATE, 0);
 	/*and overwrite handler*/
 	handler->handle_event = svg_a_handle_event;
-	gf_node_set_private((GF_Node *)handler, compositor);
 
 	/*listener for mousemove event*/
 	handler = gf_dom_listener_build(node, GF_EVENT_MOUSEOVER, 0);
 	/*and overwrite handler*/
 	handler->handle_event = svg_a_handle_event;
-	gf_node_set_private((GF_Node *)handler, compositor);
 
 }
 
@@ -1049,7 +1039,7 @@
 			is_fragment = 1;
 		} else if (stack->resource) {
 			stack->inline_sg = gf_mo_get_scenegraph(stack->resource);
-			if (!is_foreign_object) {
+			if (!is_foreign_object && all_atts.xlink_href->string) {
 				stack->fragment_id = strchr(all_atts.xlink_href->string, '#');
 			}
 		}
@@ -1136,6 +1126,7 @@
 {
 	SVGlinkStack *stack;
 	GF_SAFEALLOC(stack, SVGlinkStack);
+	if (!stack) return;
 	gf_node_set_private(node, stack);
 	gf_node_set_callback_function(node, svg_traverse_use);
 	/*force first processing of xlink-href*/
@@ -1179,15 +1170,9 @@
 	}
 }
 
-static void svg_reset_xlink_target(GF_Node *node)
-{
-	SVGAllAttributes all_atts;
-	gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
-	if (all_atts.xlink_href) all_atts.xlink_href->target=NULL;
-}
-
-static void svg_animation_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status)
+static void svg_animation_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, GF_SGSMILTimingEvalState status)
 {
+	Bool reset_target = GF_FALSE;
 	GF_Node *node = gf_smil_get_element(rti);
 	SVGlinkStack *stack = gf_node_get_private(node);
 	switch (status) {
@@ -1196,13 +1181,13 @@
 		break;
 	case SMIL_TIMING_EVAL_FREEZE:
 		if (stack->resource) {
-			gf_mo_stop(stack->resource);
+			gf_mo_stop(&stack->resource);
 			stack->needs_play = 1;
 		}
 		break;
 	case SMIL_TIMING_EVAL_REMOVE:
 		if (stack->resource) {
-			svg_reset_xlink_target(node);
+			reset_target = GF_TRUE;
 			gf_mo_unload_xlink_resource(node, stack->resource);
 			stack->resource = NULL;
 			stack->fragment_id = NULL;
@@ -1212,12 +1197,19 @@
 		break;
 	case SMIL_TIMING_EVAL_REPEAT:
 		if (stack->resource) {
-			svg_reset_xlink_target(node);
+			reset_target = GF_TRUE;
 			stack->fragment_id = NULL;
 			stack->inline_sg = NULL;
 			gf_mo_restart(stack->resource);
 		}
 		break;
+	default:
+		break;
+	}
+	if (reset_target) {
+		SVGAllAttributes all_atts;
+		gf_svg_flatten_attributes((SVG_Element *)node, &all_atts);
+		if (all_atts.xlink_href) all_atts.xlink_href->target=NULL;
 	}
 }
 
@@ -1316,7 +1308,7 @@
 		if (subroot) tr_state->visual->compositor->focus_node = subroot;
 	}
 
-	if (stack->inline_sg) {
+	if (stack->inline_sg && stack->resource->odm) {
 		gf_sc_traverse_subscene(tr_state->visual->compositor, node, stack->inline_sg, tr_state);
 	}
 
@@ -1343,6 +1335,7 @@
 	SVGlinkStack *stack;
 
 	GF_SAFEALLOC(stack, SVGlinkStack);
+	if (!stack) return;
 	gf_node_set_private(node, stack);
 	gf_node_set_callback_function(node, svg_traverse_animation);
 
@@ -1369,6 +1362,7 @@
 {
 	SVGlinkStack *stack;
 	GF_SAFEALLOC(stack, SVGlinkStack);
+	if (!stack) return;
 	gf_node_set_private(node, stack);
 	gf_node_set_callback_function(node, svg_traverse_foreign_object);
 	/*force first processing of xlink-href*/
@@ -1391,7 +1385,7 @@
 	return NULL;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_SceneGraph *gf_sc_animation_get_scenegraph(GF_Node *node)
 {
 	SVGlinkStack *stack;
@@ -1399,6 +1393,7 @@
 	stack = gf_node_get_private(node);
 	return stack->inline_sg;
 }
+#endif
 
 
 #endif

gpac-0.8.0.tar.gz/src/compositor/svg_media.c -> gpac-1.0.0.tar.gz/src/compositor/svg_media.c Changed

@@ -28,24 +28,10 @@
 #ifndef GPAC_DISABLE_SVG
 #include "nodes_stacks.h"
 
-#include <gpac/internal/terminal_dev.h>
-
 static void svg_audio_smil_evaluate_ex(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status, GF_Node *audio, GF_Node *video);
 static void svg_traverse_audio_ex(GF_Node *node, void *rs, Bool is_destroy, SVGPropertiesPointers *props);
 
 
-typedef struct
-{
-	GF_TextureHandler txh;
-	Drawable *drawable;
-	MFURL txurl;
-	Bool first_frame_fetched;
-	GF_Node *audio;
-	Bool audio_dirty;
-	Bool stop_requested;
-} SVG_video_stack;
-
-
 
 static Bool svg_video_get_transform_behavior(GF_TraverseState *tr_state, SVGAllAttributes *atts, Fixed *cx, Fixed *cy, Fixed *angle)
 {
@@ -206,7 +192,7 @@
 	drawable_reset_path(stack->drawable);
 	gf_path_add_rect_center(stack->drawable->path, rectx, recty, rectwidth, rectheight);
 	gf_path_get_bounds(stack->drawable->path, &new_rc);
-	if (!gf_rect_equal(rc, new_rc))
+	if (!gf_rect_equal(&rc, &new_rc))
 		drawable_mark_modified(stack->drawable, tr_state);
 	else if (stack->txh.flags & GF_SR_TEXTURE_PRIVATE_MEDIA)
 		drawable_mark_modified(stack->drawable, tr_state);
@@ -223,7 +209,7 @@
 {
 	SVGAllAttributes all_atts;
 	Bool lock_scene = GF_FALSE;
-	if (stack->txh.is_open) gf_sc_texture_stop(&stack->txh);
+	if (stack->txh.is_open) gf_sc_texture_stop_no_unregister(&stack->txh);
 
 	if (!atts) {
 		gf_svg_flatten_attributes((SVG_Element*)stack->txh.owner, &all_atts);
@@ -312,7 +298,6 @@
 			gf_node_dirty_clear(node, 0);
 			SVG_Build_Bitmap_Graph((SVG_video_stack*)gf_node_get_private(node), tr_state);
 		}
-
 	}
 
 	if (tr_state->traversing_mode == TRAVERSE_GET_BOUNDS) {
@@ -486,7 +471,7 @@
 			stack->first_frame_fetched = GF_TRUE;
 			/*stop stream if needed*/
 			if (!gf_smil_timing_is_active(txh->owner)) {
-				gf_sc_texture_stop(txh);
+				gf_sc_texture_stop_no_unregister(txh);
 				//make sure the refresh flag is not cleared
 				txh->needs_refresh = GF_TRUE;
 			}
@@ -519,11 +504,11 @@
 
 	if (stack->stop_requested) {
 		stack->stop_requested = GF_FALSE;
-		gf_sc_texture_stop(&stack->txh);
+		gf_sc_texture_stop_no_unregister(&stack->txh);
 	}
 }
 
-static void svg_video_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status)
+static void svg_video_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, GF_SGSMILTimingEvalState status)
 {
 	SVG_video_stack *stack = (SVG_video_stack *)gf_node_get_private(gf_smil_get_element(rti));
 
@@ -550,6 +535,8 @@
 	case SMIL_TIMING_EVAL_REPEAT:
 		gf_sc_texture_restart(&stack->txh);
 		break;
+	default:
+		break;
 	}
 	if (stack->audio) svg_audio_smil_evaluate_ex(rti, normalized_scene_time, status, stack->audio, stack->txh.owner);
 }
@@ -619,12 +606,6 @@
 /*********************/
 /* SVG audio element */
 /*********************/
-typedef struct
-{
-	GF_AudioInput input;
-	Bool is_active, is_error;
-	MFURL aurl;
-} SVG_audio_stack;
 
 static void svg_audio_smil_evaluate_ex(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status, GF_Node *slave_audio, GF_Node *video)
 {
@@ -661,7 +642,7 @@
 		else if (!slave_audio && stack->input.stream_finished && (gf_smil_get_media_duration(rti) < 0) ) {
 			Double dur = gf_mo_get_duration(stack->input.stream);
 			if (dur <= 0) {
-				dur = gf_mo_get_last_frame_time(stack->input.stream);
+				dur = stack->input.stream ? stack->input.stream->timestamp : 0;
 				dur /= 1000;
 			}
 			gf_smil_set_media_duration(rti, dur);
@@ -689,7 +670,7 @@
 	}
 }
 
-static void svg_audio_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status)
+static void svg_audio_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, GF_SGSMILTimingEvalState status)
 {
 	svg_audio_smil_evaluate_ex(rti, normalized_scene_time, status, NULL, NULL);
 }
@@ -775,7 +756,7 @@
 {
 	SVG_audio_stack *stack;
 	GF_SAFEALLOC(stack, SVG_audio_stack)
-
+	if (!stack) return;
 	gf_sc_audio_setup(&stack->input, compositor, node);
 
 	/*force first processing of xlink-href*/
@@ -813,7 +794,7 @@
 	Double clipBegin, clipEnd;
 } SVG_updates_stack;
 
-static void svg_updates_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 status)
+static void svg_updates_smil_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, GF_SGSMILTimingEvalState status)
 {
 	SVG_updates_stack *stack = (SVG_updates_stack *)gf_node_get_private(gf_smil_get_element(rti));
 
@@ -832,11 +813,13 @@
 	case SMIL_TIMING_EVAL_REMOVE:
 		stack->is_open = GF_FALSE;
 		gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, GF_TRUE);
-		gf_mo_stop(stack->resource);
+		gf_mo_stop(&stack->resource);
 		break;
 	case SMIL_TIMING_EVAL_REPEAT:
 		gf_mo_restart(stack->resource);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -853,7 +836,7 @@
 		if (stack->resource) {
 			if (stack->is_open) {
 				gf_mo_set_flag(stack->resource, GF_MO_DISPLAY_REMOVE, GF_TRUE);
-				gf_mo_stop(stack->resource);
+				gf_mo_stop(&stack->resource);
 			}
 			gf_mo_unregister(node, stack->resource);
 		}
@@ -888,7 +871,7 @@
 
 			if (stack->resource!=new_res) {
 				if (stack->resource) {
-					gf_mo_stop(stack->resource);
+					gf_mo_stop(&stack->resource);
 					gf_mo_unregister(node, stack->resource);
 				}
 				stack->resource = new_res;

gpac-0.8.0.tar.gz/src/compositor/svg_paint_servers.c -> gpac-1.0.0.tar.gz/src/compositor/svg_paint_servers.c Changed

@@ -109,7 +109,6 @@
 
 static void svg_gradient_traverse(GF_Node *node, GF_TraverseState *tr_state, Bool real_traverse)
 {
-	GF_STENCIL stencil;
 	u32 count, nb_col;
 	Bool is_dirty, all_dirty;
 	Fixed alpha, max_offset;
@@ -214,10 +213,11 @@
 
 	if (is_dirty) {
 		u32 i;
+		GF_EVGStencil * stencil;
 
 		if (!st->txh.tx_io) gf_sc_texture_allocate(&st->txh);
 		stencil = gf_sc_texture_get_stencil(&st->txh);
-		if (!stencil) stencil = st->txh.compositor->rasterizer->stencil_new(st->txh.compositor->rasterizer, st->linear ? GF_STENCIL_LINEAR_GRADIENT : GF_STENCIL_RADIAL_GRADIENT);
+		if (!stencil) stencil = gf_evg_stencil_new(st->linear ? GF_STENCIL_LINEAR_GRADIENT : GF_STENCIL_RADIAL_GRADIENT);
 		/*set stencil even if assigned, this invalidates the associated bitmap state in 3D*/
 		gf_sc_texture_set_stencil(&st->txh, stencil);
 
@@ -229,8 +229,8 @@
 			}
 		}
 
-		st->txh.compositor->rasterizer->stencil_set_gradient_interpolation(stencil, st->keys, st->cols, nb_col);
-		st->txh.compositor->rasterizer->stencil_set_gradient_mode(stencil, /*lg->spreadMethod*/ GF_GRADIENT_MODE_PAD);
+		gf_evg_stencil_set_gradient_interpolation(stencil, st->keys, st->cols, nb_col);
+		gf_evg_stencil_set_gradient_mode(stencil, /*lg->spreadMethod*/ GF_GRADIENT_MODE_PAD);
 
 		st->txh.needs_refresh = GF_TRUE;
 	} else {
@@ -257,13 +257,15 @@
 
 	if (!tr_state->svg_props) {
 		GF_SAFEALLOC(svgp, SVGPropertiesPointers);
-		gf_svg_properties_init_pointers(svgp);
-		tr_state->svg_props = svgp;
+		if (svgp) {
+			gf_svg_properties_init_pointers(svgp);
+			tr_state->svg_props = svgp;
 
-		svg_gradient_traverse(node, tr_state, GF_FALSE);
+			svg_gradient_traverse(node, tr_state, GF_FALSE);
 
-		gf_svg_properties_reset_pointers(svgp);
-		gf_free(svgp);
+			gf_svg_properties_reset_pointers(svgp);
+			gf_free(svgp);
+		}
 		tr_state->svg_props = NULL;
 	} else {
 		svg_gradient_traverse(node, tr_state, GF_FALSE);
@@ -341,16 +343,14 @@
 	u32 i;
 	Fixed size;
 	GF_Matrix2D mat;
-	GF_STENCIL stencil;
-	GF_SURFACE surface;
-	GF_STENCIL texture2D;
+	GF_EVGStencil * stencil;
+	GF_EVGSurface *surface;
+	GF_EVGStencil * texture2D;
 	GF_Path *path;
 	GF_Err e;
 	Bool transparent;
 	SVGAllAttributes all_atts;
 	SVG_GradientStack *st = (SVG_GradientStack *) gf_node_get_private(txh->owner);
-	GF_Raster2D *raster = txh->compositor->rasterizer;
-
 
 	if (!txh->tx_io) return;
 
@@ -368,11 +368,11 @@
 	if (!stencil) return;
 
 	/*init our 2D graphics stuff*/
-	texture2D = raster->stencil_new(raster, GF_STENCIL_TEXTURE);
+	texture2D = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
 	if (!texture2D) return;
-	surface = raster->surface_new(raster, GF_TRUE);
+	surface = gf_evg_surface_new(GF_TRUE);
 	if (!surface) {
-		raster->stencil_delete(texture2D);
+		gf_evg_stencil_delete(texture2D);
 		return;
 	}
 
@@ -385,12 +385,12 @@
 		} else {
 			memset(txh->data, 0, sizeof(char)*txh->stride*txh->height);
 		}
-		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, GF_TRUE);
+		e = gf_evg_stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB);
 	} else {
 		if (!txh->data) {
 			txh->data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*3);
 		}
-		e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB_24, GF_PIXEL_RGB_24, GF_TRUE);
+		e = gf_evg_stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 3*GRAD_TEXTURE_SIZE, GF_PIXEL_RGB);
 		/*try with ARGB (it actually is needed for GDIplus module since GDIplus cannot handle native RGB texture (it works in BGR)*/
 		if (e) {
 			/*remember for later use*/
@@ -398,21 +398,21 @@
 			transparent = GF_TRUE;
 			gf_free(txh->data);
 			txh->data = (char *) gf_malloc(sizeof(char)*GRAD_TEXTURE_SIZE*GRAD_TEXTURE_SIZE*4);
-			e = raster->stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB, GF_PIXEL_ARGB, GF_TRUE);
+			e = gf_evg_stencil_set_texture(texture2D, txh->data, GRAD_TEXTURE_SIZE, GRAD_TEXTURE_SIZE, 4*GRAD_TEXTURE_SIZE, GF_PIXEL_ARGB);
 		}
 	}
 
 	if (e) {
 		gf_free(txh->data);
 		txh->data = NULL;
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
-	e = raster->surface_attach_to_texture(surface, texture2D);
+	e = gf_evg_surface_attach_to_texture(surface, texture2D);
 	if (e) {
-		raster->stencil_delete(texture2D);
-		raster->surface_delete(surface);
+		gf_evg_stencil_delete(texture2D);
+		gf_evg_surface_delete(surface);
 		return;
 	}
 
@@ -444,12 +444,12 @@
 		gf_mx2d_add_translation(&mat, -size, -size);
 	}
 
-	raster->stencil_set_matrix(stencil, &mat);
-	raster->surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
-	raster->surface_set_path(surface, path);
-	raster->surface_fill(surface, stencil);
-	raster->surface_delete(surface);
-	raster->stencil_delete(texture2D);
+	gf_evg_stencil_set_matrix(stencil, &mat);
+	gf_evg_surface_set_raster_level(surface, GF_RASTER_HIGH_QUALITY);
+	gf_evg_surface_set_path(surface, path);
+	gf_evg_surface_fill(surface, stencil);
+	gf_evg_surface_delete(surface);
+	gf_evg_stencil_delete(texture2D);
 	gf_path_del(path);
 
 	txh->width = GRAD_TEXTURE_SIZE;
@@ -475,7 +475,7 @@
 		}
 	} else {
 		txh->stride = GRAD_TEXTURE_SIZE*3;
-		txh->pixelformat = GF_PIXEL_RGB_24;
+		txh->pixelformat = GF_PIXEL_RGB;
 	}
 	gf_sc_texture_set_data(txh);
 	return;
@@ -495,7 +495,7 @@
 
 static void SVG_LG_ComputeMatrix(GF_TextureHandler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d)
 {
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	SFVec2f start, end;
 	SVGAllAttributes all_atts;
 	SVG_Element *lg = (SVG_Element *) txh->owner;
@@ -555,7 +555,7 @@
 		end.y = 0;
 	}
 
-	txh->compositor->rasterizer->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)) ) {
@@ -563,7 +563,7 @@
 		gf_mx2d_add_scale(mat, bounds->width, bounds->height);
 		gf_mx2d_add_translation(mat, bounds->x, bounds->y  - bounds->height);
 	}
-	txh->compositor->rasterizer->stencil_set_linear_gradient(stencil, start.x, start.y, end.x, end.y);
+	gf_evg_stencil_set_linear_gradient(stencil, start.x, start.y, end.x, end.y);
 }
 
 void compositor_init_svg_linearGradient(GF_Compositor *compositor, GF_Node *node)
@@ -601,7 +601,7 @@
 
 static void SVG_RG_ComputeMatrix(GF_TextureHandler *txh, GF_Rect *bounds, GF_Matrix2D *mat, Bool for_3d)
 {
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	SFVec2f center, focal;
 	Fixed radius;
 	SVGAllAttributes all_atts;
@@ -618,7 +618,7 @@
 
 	gf_svg_flatten_attributes((SVG_Element*)txh->owner, &all_atts);
 
-	/*get "transfered" attributed from xlink:href if any*/
+	/*get transfered attributed from xlink:href if any*/
 	svg_copy_gradient_attributes_from(txh->owner, &all_atts);
 
 	gf_mx2d_init(*mat);
@@ -660,7 +660,7 @@
 		center.y = FIX_ONE/2;
 	}
 
-	txh->compositor->rasterizer->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;
@@ -677,9 +677,9 @@
 
 	/* clamping fx/fy according to:
 	http://www.w3.org/TR/SVG11/pservers.html#RadialGradients
-	If the point defined by fx and fy lies outside the circle defined by cx, cy and r,
-	then the user agent shall set the focal point to the intersection of the line from (cx, cy)
-	to (fx, fy) with the circle defined by cx, cy and r.*/
+	If the point defined by fx and fy lies outside the circle defined by cx, cy and r,
+	then the user agent shall set the focal point to the intersection of the line from (cx, cy)
+	to (fx, fy) with the circle defined by cx, cy and r.*/
 	{
 		Fixed norm = gf_v2d_distance(&focal, &center);
 		if (norm > radius) {
@@ -695,7 +695,7 @@
 		gf_mx2d_add_scale(mat, bounds->width, bounds->height);
 		gf_mx2d_add_translation(mat, bounds->x, bounds->y  - bounds->height);
 	}
-	txh->compositor->rasterizer->stencil_set_radial_gradient(stencil, center.x, center.y, focal.x, focal.y, radius, radius);
+	gf_evg_stencil_set_radial_gradient(stencil, center.x, center.y, focal.x, focal.y, radius, radius);
 }
 
 void compositor_init_svg_radialGradient(GF_Compositor *compositor, GF_Node *node)
@@ -779,6 +779,7 @@
 {
 	GF_SolidColorStack *st;
 	GF_SAFEALLOC(st, GF_SolidColorStack);
+	if (!st) return;
 	gf_node_set_private(node, st);
 	gf_node_set_callback_function(node, svg_traverse_solidColor);
 }

gpac-0.8.0.tar.gz/src/compositor/svg_text.c -> gpac-1.0.0.tar.gz/src/compositor/svg_text.c Changed

@@ -360,7 +360,7 @@
 	u32 i, count;
 	count = gf_list_count(tr_state->x_anchors);
 	for (i=0; i<count; i++) {
-		textArea_state *st = (textArea_state*)gf_list_get(tr_state->x_anchors, i);
+		st = (textArea_state*)gf_list_get(tr_state->x_anchors, i);
 		if (st->span==span) {
 			st->last_glyph = last_glyph;
 			return;
@@ -393,7 +393,7 @@
 static void svg_traverse_dom_text_area(GF_Node *node, SVGAllAttributes *atts, GF_TraverseState *tr_state, GF_List *spans)
 {
 	GF_DOMText *dom_text = (GF_DOMText *)node;
-	u32 word_start, word_end;
+	u32 word_start;
 	u32 i, j;
 	Fixed line_spacing;
 	GF_Font *font;
@@ -424,7 +424,7 @@
 
 	line_spacing = gf_mulfix(span->font_size, FLT2FIX(1.0) );
 
-	word_start = word_end = 0;
+	word_start = 0;
 	i = 0;
 	/* boucle principale: mot par mot */
 	while (i<span->nb_glyphs) {
@@ -556,7 +556,6 @@
 		if ((tr_state->count_x==1)||(tr_state->count_y==1)
 		        || !gf_list_count(tr_state->x_anchors) ) {
 			entry = (Fixed*)gf_malloc(sizeof(Fixed));
-			*entry = block_width;
 
 			if (span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT) *entry = -block_width;
 			else *entry = block_width;
@@ -843,7 +842,6 @@
 	SVG_Element *text = (SVG_Element *)node;
 	SVGAllAttributes atts;
 	u32 i,imax;
-	Fixed * lw;
 
 	if (is_destroy) {
 		drawable_del(st->drawable);
@@ -949,7 +947,7 @@
 		/*apply justification of all blocks*/
 		imax=gf_list_count(tr_state->x_anchors);
 		for (i=0; i<imax; i++) {
-			lw=gf_list_get(tr_state->x_anchors, i);
+			Fixed *lw = gf_list_get(tr_state->x_anchors, i);
 			svg_apply_text_anchor(tr_state, lw);
 		}
 
@@ -1344,11 +1342,11 @@
 		tr_state->text_end_x = 0;
 		tr_state->text_end_y = (tr_state->svg_props->line_increment->type == SVG_NUMBER_AUTO ? 0 : tr_state->svg_props->line_increment->value);
 
-		tr_state->x_anchors = gf_list_new();
-
 		if (tr_state->svg_props->font_size && (tr_state->svg_props->font_size->value <= tr_state->max_height)) {
 			Fixed remain;
 			u32 c, refresh_to_idx, prev_refresh;
+			tr_state->x_anchors = gf_list_new();
+
 			/*switch to bounds mode, and recompute children*/
 			mode = tr_state->traversing_mode;
 			tr_state->traversing_mode = TRAVERSE_GET_BOUNDS;

gpac-0.8.0.tar.gz/src/compositor/texturing.c -> gpac-1.0.0.tar.gz/src/compositor/texturing.c Changed

gpac-0.8.0.tar.gz/src/compositor/texturing.h -> gpac-1.0.0.tar.gz/src/compositor/texturing.h Changed

@@ -42,20 +42,18 @@
 /*push data to hardware if needed, creating the hardware handle(s)*/
 Bool gf_sc_texture_push_image(GF_TextureHandler *txh, Bool generate_mipmaps, Bool for2d);
 
-/*refreshes hardware data for given rect (eg glTexSubImage)*/
-void gf_sc_texture_refresh_area(GF_TextureHandler *, GF_IRect *rc, void *mem);
 /*gets texture transform matrix - returns 1 if not identity
 @tx_transform: texture transform node from appearance*/
 Bool gf_sc_texture_get_transform(GF_TextureHandler *txh, GF_Node *tx_transform, GF_Matrix *mx, Bool for_picking);
 
 /*gets the associated raster2D stencil handler*/
-GF_STENCIL gf_sc_texture_get_stencil(GF_TextureHandler *hdl);
+GF_EVGStencil * gf_sc_texture_get_stencil(GF_TextureHandler *hdl);
 /*sets the associated raster2D stencil handler (used by gradients)*/
-void gf_sc_texture_set_stencil(GF_TextureHandler *hdl, GF_STENCIL stencil);
+void gf_sc_texture_set_stencil(GF_TextureHandler *hdl, GF_EVGStencil * stencil);
 
 Bool gf_sc_texture_is_transparent(GF_TextureHandler *txh);
 
-void gf_sc_texture_check_pause_on_first_load(GF_TextureHandler *txh);
+void gf_sc_texture_check_pause_on_first_load(GF_TextureHandler *txh, Bool do_freeze);
 
 /* configures conversion parameters and allocates the conv data buffer*/
 GF_Err gf_sc_texture_configure_conversion(GF_TextureHandler *txh);
@@ -79,6 +77,9 @@
 #ifndef GPAC_USE_TINYGL
 /*copy current GL window to the texture - the viewport used is the texture one (0,0,W,H) */
 void gf_sc_copy_to_texture(GF_TextureHandler *txh);
+
+GF_Err gf_sc_texture_setup_fbo(GF_TextureHandler *txh);
+void gf_sc_texture_enable_fbo(GF_TextureHandler *txh, Bool enable);
 #endif
 
 Bool gf_sc_texture_convert(GF_TextureHandler *txh);

gpac-0.8.0.tar.gz/src/compositor/texturing_gl.c -> gpac-1.0.0.tar.gz/src/compositor/texturing_gl.c Changed

gpac-0.8.0.tar.gz/src/compositor/visual_manager.c -> gpac-1.0.0.tar.gz/src/compositor/visual_manager.c Changed

@@ -53,11 +53,18 @@
 	tmp->view_stack = gf_list_new();
 #endif
 
-	tmp->raster_brush = compositor->rasterizer->stencil_new(compositor->rasterizer, GF_STENCIL_SOLID);
+	tmp->raster_brush = gf_evg_stencil_new(GF_STENCIL_SOLID);
 
 	tmp->DrawBitmap = visual_draw_bitmap_stub;
 	tmp->ClearSurface = visual_2d_clear_surface;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		visual_draw_bitmap_stub(tmp, NULL, NULL);
+		visual_reset_graphics(NULL);
+	}
+#endif
+
 #ifndef GPAC_DISABLE_3D
 
 #ifndef GPAC_DISABLE_VRML
@@ -65,6 +72,7 @@
 	tmp->fog_stack = gf_list_new();
 #endif /*GPAC_DISABLE_VRML*/
 	tmp->alpha_nodes_to_draw = gf_list_new();
+	tmp->compiled_programs = gf_list_new();
 #endif
 
 	return tmp;
@@ -74,9 +82,9 @@
 {
 	ra_del(&visual->to_redraw);
 
-	if (visual->raster_surface) visual->compositor->rasterizer->surface_delete(visual->raster_surface);
+	if (visual->raster_surface) gf_evg_surface_delete(visual->raster_surface);
 	visual->raster_surface = NULL;
-	if (visual->raster_brush) visual->compositor->rasterizer->stencil_delete(visual->raster_brush);
+	if (visual->raster_brush) gf_evg_stencil_delete(visual->raster_brush);
 	visual->raster_brush = NULL;
 
 	while (visual->context) {
@@ -105,6 +113,7 @@
 #endif /*GPAC_DISABLE_VRML*/
 
 	gf_list_del(visual->alpha_nodes_to_draw);
+	gf_list_del(visual->compiled_programs);
 #endif
 	gf_free(visual);
 }
@@ -187,6 +196,8 @@
 		visual_clean_contexts(visual);
 		return res;
 	}
+	if (visual->compositor->hybrid_opengl)
+		visual_3d_clean_state(visual);
 #endif
 	return visual_2d_draw_frame(visual, root, tr_state, is_root_visual);
 }
@@ -294,6 +305,7 @@
 
 void visual_reset_graphics(GF_VisualManager *visual)
 {
+	if (!visual) return;
 #ifndef GPAC_DISABLE_3D
 	if (visual->type_3d) {
 		visual_3d_reset_graphics(visual);

gpac-0.8.0.tar.gz/src/compositor/visual_manager.h -> gpac-1.0.0.tar.gz/src/compositor/visual_manager.h Changed

@@ -39,11 +39,11 @@
 
 /* number of preprocessor flags for GL3/ES2.0 */
 #define GF_GL_NUM_OF_FLAGS			6
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 #define GF_GL_NB_FRAG_SHADERS		(1<<(GF_GL_NUM_OF_FLAGS) )	//=2^GF_GL_NUM_OF_FLAGS
 #else
 #define GF_GL_NB_FRAG_SHADERS		(1<<(GF_GL_NUM_OF_FLAGS-1) )	//=2^GF_GL_NUM_OF_FLAGS-1 ( ExternalOES ignored in fragment shader when the platform is not Android)
-#endif // GPAC_ANDROID
+#endif // GPAC_CONFIG_ANDROID
 #define GF_GL_NB_VERT_SHADERS		(1<<(GF_GL_NUM_OF_FLAGS-2) )	//=2^GF_GL_NUM_OF_FLAGS-2 (YUV and ExternalOES ignored in vertex shader)
 
 /* setting preprocessor flags for GL3/ES2.0 shaders */
@@ -66,6 +66,26 @@
 	GF_3D_CAMERA_CIRCULAR,
 };
 
+
+#ifndef GPAC_DISABLE_3D
+
+#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
+#define GF_SHADERID u64
+#else
+#define GF_SHADERID u32
+#endif
+
+typedef struct _gl_prog
+{
+	GF_SHADERID vertex;
+	GF_SHADERID fragment;
+	GF_SHADERID prog;
+	u32 flags;
+	u32 pix_fmt;
+} GF_GLProgInstance;
+#endif
+
+
 struct _visual_manager
 {
 	GF_Compositor *compositor;
@@ -140,9 +160,9 @@
 	Bool (*CheckAttached)(GF_VisualManager *visual);
 
 	/*raster surface interface*/
-	GF_SURFACE raster_surface;
+	GF_EVGSurface *raster_surface;
 	/*raster brush interface*/
-	GF_STENCIL raster_brush;
+	GF_EVGStencil *raster_brush;
 
 	/*node owning this visual manager (composite textures) - NULL for root visual*/
 	GF_Node *offscreen;
@@ -160,12 +180,6 @@
 	 *	Visual Manager part for 3D drawing
 	 */
 
-#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
-#define GF_SHADERID u64
-#else
-#define GF_SHADERID u32
-#endif
-
 #ifndef GPAC_DISABLE_VRML
 	/*navigation stack*/
 	GF_List *navigation_stack;
@@ -195,8 +209,7 @@
 	GF_RectArray hybgl_drawn;
 	u32 nb_objects_on_canvas_since_last_ogl_flush;
 
-	u32 nb_views, current_view, autostereo_type, camera_layout;
-	Bool reverse_views;
+	u32 nb_views, current_view, autostereo_type, camlay;
 
 	GF_SHADERID base_glsl_vertex;
 
@@ -206,9 +219,6 @@
 	GF_SHADERID autostereo_glsl_program;
 	GF_SHADERID autostereo_glsl_fragment;
 
-	GF_SHADERID current_texture_glsl_program;
-
-
 	Bool needs_projection_matrix_reload;
 
 	/*GL state to emulate with GLSL [ES2.0]*/
@@ -236,22 +246,12 @@
 
 	/*end of GL state to emulate with GLSL*/
 
-//startof GL3/ES2.0 elements
 	/* shaders used for shader-only drawing */
 	GF_SHADERID glsl_program;
+	GF_List *compiled_programs;
+	u32 bound_tx_pix_fmt; //only one texture currently supported
 
-	/* Storing Compiled Shaders */
-	GF_SHADERID glsl_programs[GF_GL_NB_FRAG_SHADERS];
-	GF_SHADERID glsl_vertex_shaders[GF_GL_NB_VERT_SHADERS];
-	GF_SHADERID glsl_fragment_shaders[GF_GL_NB_FRAG_SHADERS];
-
-	/* If GF_TRUE the Array of Shaders is built */
-	Bool glsl_has_shaders;
-
-	/* Compilation/Features Flags for dynamic shader */
-	u32 glsl_flags;
-//endof
-
+	u32 active_glsl_flags;
 #endif	//!GPAC_DISABLE_3D
 
 #ifdef GF_SR_USE_DEPTH
@@ -279,5 +279,9 @@
 
 void visual_reset_graphics(GF_VisualManager *visual);
 
+#ifndef GPAC_DISABLE_3D
+GF_GLProgInstance *visual_3d_check_program_exists(GF_VisualManager *root_visual, u32 flags, u32 pix_fmt);
+#endif
+
 #endif	/*_VISUAL_MANAGER_H_*/

gpac-0.8.0.tar.gz/src/compositor/visual_manager_2d.c -> gpac-1.0.0.tar.gz/src/compositor/visual_manager_2d.c Changed

@@ -169,6 +169,7 @@
 	}
 }
 
+#if 0 //unused
 Bool visual_2d_node_cull(GF_TraverseState *tr_state, GF_Rect *bounds)
 {
 	GF_Rect rc;
@@ -179,6 +180,7 @@
 	if (gf_irect_overlaps(&tr_state->visual->top_clipper, &i_rc)) return 1;
 	return 0;
 }
+#endif
 
 void visual_2d_setup_projection(GF_VisualManager *visual, GF_TraverseState *tr_state)
 {
@@ -193,7 +195,7 @@
 	/*setup clipper*/
 	if (visual->center_coords) {
 		if (!visual->offscreen) {
-			if (visual->compositor->scalable_zoom)
+			if (visual->compositor->sz)
 				rc = gf_rect_center(INT2FIX(visual->compositor->display_width), INT2FIX(visual->compositor->display_height));
 			else
 				rc = gf_rect_center(INT2FIX(visual->compositor->output_width + 2*visual->compositor->vp_x), INT2FIX(visual->compositor->output_height + 2*visual->compositor->vp_y));
@@ -257,7 +259,7 @@
 	DrawableContext *ctx;
 	M_Background2D *bck;
 #endif
-	u32 draw_mode;
+	u32 mode2d;
 
 	/*reset display list*/
 	visual->cur_context = visual->context;
@@ -278,15 +280,15 @@
 		return e;
 
 	tr_state->immediate_for_defer = GF_FALSE;
-	draw_mode = 0;
+	mode2d = 0;
 	if (tr_state->immediate_draw) {
-		draw_mode = 1;
+		mode2d = 1;
 	}
 	/*if we're requested to invalidate everything, switch to direct drawing but don't reset bounds*/
 	else if (tr_state->invalidate_all) {
 		tr_state->immediate_draw = 1;
 		tr_state->immediate_for_defer = GF_TRUE;
-		draw_mode = 2;
+		mode2d = 2;
 	}
 	tr_state->invalidate_all = 0;
 
@@ -296,7 +298,7 @@
 	it = visual->prev_nodes;
 	while (it) {
 		/*node was not drawn on this visual*/
-		if (!drawable_flush_bounds(it->drawable, visual, draw_mode)) {
+		if (!drawable_flush_bounds(it->drawable, visual, mode2d)) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Unregistering previously drawn node %s from visual\n", gf_node_get_class_name(it->drawable->node)));
 
 			/*remove all bounds info related to this visual and unreg node */
@@ -316,8 +318,8 @@
 			count++;
 		}
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Top visual initialized - %d nodes registered and %d removed - using %s rendering\n", count, rem, draw_mode ? "direct" : "dirty-rect"));
-	if (!draw_mode) return GF_OK;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Top visual initialized - %d nodes registered and %d removed - using %s rendering\n", count, rem, mode2d ? "direct" : "dirty-rect"));
+	if (!mode2d) return GF_OK;
 
 #ifndef GPAC_DISABLE_VRML
 	/*direct mode, draw background*/
@@ -735,7 +737,7 @@
 	tr_state->traversing_mode = TRAVERSE_DRAW_2D;
 
 	//if only one opaque object has changed and not moved, skip background unless hybgl mode
-	if (!visual->compositor->hybrid_opengl && !hyb_force_redraw && !hyb_force_background && first_opaque && (visual->to_redraw.count==1) && gf_rect_equal(first_opaque->bi->clip, visual->to_redraw.list[0].rect)) {
+	if (!visual->compositor->hybrid_opengl && !hyb_force_redraw && !hyb_force_background && first_opaque && (visual->to_redraw.count==1) && irect_rect_equal(&first_opaque->bi->clip, &visual->to_redraw.list[0].rect)) {
 		visual->has_modif=0;
 		goto skip_background;
 	}
@@ -842,14 +844,13 @@
 
 	if (visual->direct_flush) {
 		GF_DirtyRectangles dr;
-		u32 i;
 		dr.count = visual->to_redraw.count;
 		dr.list = gf_malloc(sizeof(GF_IRect)*dr.count);
 		for (i=0; i<dr.count; i++) {
 			dr.list[i] = visual->to_redraw.list[i].rect;
 		}
 		visual->compositor->video_out->FlushRectangles(visual->compositor->video_out, &dr);
-		visual->compositor->skip_flush=1;
+		visual->compositor->skip_flush = 1;
 		gf_free(dr.list);
 	}
 
@@ -864,7 +865,6 @@
 
 Bool visual_2d_draw_frame(GF_VisualManager *visual, GF_Node *root, GF_TraverseState *tr_state, Bool is_root_visual)
 {
-	GF_SceneGraph *sg;
 	GF_Matrix2D backup;
 	u32 i;
 	Bool res;
@@ -876,10 +876,21 @@
 	gf_mx2d_copy(backup, tr_state->transform);
 	visual->bounds_tracker_modif_flag = DRAWABLE_HAS_CHANGED;
 
+#ifndef GPAC_DISABLE_3D
+	if (visual->compositor->hybrid_opengl && visual->compositor->fbo_id) {
+		compositor_3d_enable_fbo(visual->compositor, GF_TRUE);
+	}
+#endif
+
 	e = visual_2d_init_draw(visual, tr_state);
 	if (e) {
 		gf_mx2d_copy(tr_state->transform, backup);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Visual2D] Cannot init draw phase: %s\n", gf_error_to_string(e)));
+#ifndef GPAC_DISABLE_3D
+		if (visual->compositor->hybrid_opengl && visual->compositor->fbo_id) {
+			compositor_3d_enable_fbo(visual->compositor, GF_FALSE);
+		}
+#endif
 		return 0;
 	}
 
@@ -892,6 +903,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Traversing scene subtree (root node %s)\n", root ? gf_node_get_class_name(root) : "none"));
 
 	if (is_root_visual) {
+		GF_SceneGraph *sg;
 		gf_node_traverse(root, tr_state);
 
 		i=0;
@@ -917,6 +929,11 @@
 	}
 #endif
 
+#ifndef GPAC_DISABLE_3D
+	if (visual->compositor->hybrid_opengl && visual->compositor->fbo_id) {
+		compositor_3d_enable_fbo(visual->compositor, GF_FALSE);
+	}
+#endif
 	return res;
 }

gpac-0.8.0.tar.gz/src/compositor/visual_manager_2d.h -> gpac-1.0.0.tar.gz/src/compositor/visual_manager_2d.h Changed

@@ -34,7 +34,7 @@
 Bool gf_irect_inside(GF_IRect *rc1, GF_IRect *rc2);
 
 /*@rc1 equales @rc2*/
-#define gf_rect_equal(rc1, rc2) ((rc1.width == rc2.width) && (rc1.height == rc2.height) && (rc1.x == rc2.x)  && (rc1.y == rc2.y))
+#define irect_rect_equal(rc1, rc2) ((rc1.width == rc2.width) && (rc1.height == rc2.height) && (rc1.x == rc2.x)  && (rc1.y == rc2.y))
 
 //#define TRACK_OPAQUE_REGIONS
 
@@ -91,8 +91,6 @@
  */
 Bool visual_2d_draw_frame(GF_VisualManager *visual, GF_Node *root, GF_TraverseState *tr_state, Bool is_root_visual);
 
-Bool visual_2d_node_cull(GF_TraverseState *tr_state, GF_Rect *bounds);
-
 void visual_2d_pick_node(GF_VisualManager *visual, GF_TraverseState *tr_state, GF_Event *ev, GF_ChildNodeItem *children);
 
 void visual_2d_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor, u32 is_offscreen);
@@ -113,7 +111,7 @@
 void visual_2d_texture_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_TraverseState *tr_state);
 /*draw the path (fill and strike) - if brushes are NULL they are created if needed based on the context aspect
 DrawPath shall always be called after TexturePath*/
-void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state);
+void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_EVGStencil * brush, GF_EVGStencil * pen, GF_TraverseState *tr_state);
 /*special texturing extension for text, using a given path (text rectangle) and texture*/
 void visual_2d_texture_path_text(GF_VisualManager *visual, DrawableContext *txt_ctx, GF_Path *path, GF_Rect *object_bounds, GF_TextureHandler *txh, GF_TraverseState *tr_state);
 /*fill given rect with given color with given ctx transform and clipper (used for text hilighting only)
@@ -123,7 +121,7 @@
 
 /*extended version of above function to override texture transforms - needed for proper texturing of glyphs*/
 void visual_2d_texture_path_extended(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state);
-void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase);
+void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_EVGStencil * brush, GF_EVGStencil * pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase);
 
 
 /*video overlay context*/

gpac-0.8.0.tar.gz/src/compositor/visual_manager_2d_draw.c -> gpac-1.0.0.tar.gz/src/compositor/visual_manager_2d_draw.c Changed

@@ -33,9 +33,8 @@
 
 GF_Err visual_2d_init_raster(GF_VisualManager *visual)
 {
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 	if (!visual->raster_surface) {
-		visual->raster_surface = raster->surface_new(raster, visual->center_coords);
+		visual->raster_surface = gf_evg_surface_new(visual->center_coords);
 		if (!visual->raster_surface) return GF_IO_ERR;
 	}
 	return visual->GetSurfaceAccess(visual);
@@ -44,9 +43,6 @@
 void visual_2d_release_raster(GF_VisualManager *visual)
 {
 	if (visual->raster_surface) {
-		if (visual->compositor->rasterizer->surface_flush)
-			visual->compositor->rasterizer->surface_flush(visual->raster_surface);
-
 		visual->ReleaseSurfaceAccess(visual);
 	}
 }
@@ -59,20 +55,19 @@
 #endif
 	if (! visual->CheckAttached(visual) ) return;
 
-	if (!BackColor && !visual->offscreen) {
-		if (!visual->compositor->user || !(visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
+	if (!BackColor && !visual->offscreen && !visual->compositor->dyn_filter_mode) {
+		if ( !(visual->compositor->init_flags & GF_TERM_WINDOW_TRANSPARENT)) {
 			BackColor = visual->compositor->back_color;
 		}
 	}
 
-	visual->compositor->rasterizer->surface_clear(visual->raster_surface, rc, BackColor);
+	gf_evg_surface_clear(visual->raster_surface, rc, BackColor);
 }
 
 static void draw_clipper(GF_VisualManager *visual, struct _drawable_context *ctx)
 {
 	GF_PenSettings clipset;
 	GF_Path *clippath, *cliper;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 
 	if (ctx->flags & CTX_IS_BACKGROUND) return;
 
@@ -83,30 +78,29 @@
 	gf_path_add_rect_center(clippath, ctx->bi->unclip.x + ctx->bi->unclip.width/2, ctx->bi->unclip.y - ctx->bi->unclip.height/2, ctx->bi->unclip.width, ctx->bi->unclip.height);
 	cliper = gf_path_get_outline(clippath, clipset);
 	gf_path_del(clippath);
-	raster->surface_set_matrix(visual->raster_surface, NULL);
-	raster->surface_set_clipper(visual->raster_surface, NULL);
-	raster->surface_set_path(visual->raster_surface, cliper);
-	raster->stencil_set_brush_color(visual->raster_brush, 0xFF000000);
-	raster->surface_fill(visual->raster_surface, visual->raster_brush);
+	gf_evg_surface_set_matrix(visual->raster_surface, NULL);
+	gf_evg_surface_set_clipper(visual->raster_surface, NULL);
+	gf_evg_surface_set_path(visual->raster_surface, cliper);
+	gf_evg_stencil_set_brush_color(visual->raster_brush, 0xFF000000);
+	gf_evg_surface_fill(visual->raster_surface, visual->raster_brush);
 	gf_path_del(cliper);
 }
 
-static void visual_2d_fill_path(GF_VisualManager *visual, DrawableContext *ctx, GF_STENCIL stencil, GF_TraverseState *tr_state, Bool is_erase)
+static void visual_2d_fill_path(GF_VisualManager *visual, DrawableContext *ctx, GF_EVGStencil * stencil, GF_TraverseState *tr_state, Bool is_erase)
 {
 	Bool has_modif = GF_FALSE;
 	GF_IRect clip;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 
-	/*background & direct drawing : use ctx clip*/
-	if ((ctx->flags & CTX_IS_BACKGROUND) || tr_state->immediate_draw) {
+	/*direct drawing : use ctx clip*/
+	if (tr_state->immediate_draw) {
 		if (ctx->bi->clip.width && ctx->bi->clip.height) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s [%s] (direct draw)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node) ));
 
 			if (stencil) {
-				raster->surface_set_clipper(visual->raster_surface, &ctx->bi->clip);
-				raster->surface_fill(visual->raster_surface, stencil);
+				gf_evg_surface_set_clipper(visual->raster_surface, &ctx->bi->clip);
+				gf_evg_surface_fill(visual->raster_surface, stencil);
 			} else {
-				raster->surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
+				gf_evg_surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
 			}
 
 			has_modif = GF_TRUE;
@@ -125,10 +119,10 @@
 			if (clip.width && clip.height) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s [%s] (indirect draw @ dirty rect idx %d)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node), i));
 				if (stencil) {
-					raster->surface_set_clipper(visual->raster_surface, &clip);
-					raster->surface_fill(visual->raster_surface, stencil);
+					gf_evg_surface_set_clipper(visual->raster_surface, &clip);
+					gf_evg_surface_fill(visual->raster_surface, stencil);
 				} else {
-					raster->surface_clear(visual->raster_surface, &clip, 0);
+					gf_evg_surface_clear(visual->raster_surface, &clip, 0);
 				}
 				has_modif = 1;
 			}
@@ -147,26 +141,25 @@
 	}
 }
 
-static void visual_2d_set_options(GF_Compositor *compositor, GF_SURFACE rend, Bool forText, Bool no_antialias)
+static void visual_2d_set_options(GF_Compositor *compositor, GF_EVGSurface *rend, Bool forText, Bool no_antialias)
 {
-	GF_Raster2D *raster = compositor->rasterizer;
 	if (no_antialias) {
-		raster->surface_set_raster_level(rend, GF_RASTER_HIGH_SPEED);
+		gf_evg_surface_set_raster_level(rend, GF_RASTER_HIGH_SPEED);
 	} else {
-		switch (compositor->antiAlias) {
+		switch (compositor->aa) {
 		case GF_ANTIALIAS_NONE:
-			raster->surface_set_raster_level(rend, GF_RASTER_HIGH_SPEED);
+			gf_evg_surface_set_raster_level(rend, GF_RASTER_HIGH_SPEED);
 			break;
 		case GF_ANTIALIAS_TEXT:
 			if (forText) {
-				raster->surface_set_raster_level(rend, GF_RASTER_HIGH_QUALITY);
+				gf_evg_surface_set_raster_level(rend, GF_RASTER_HIGH_QUALITY);
 			} else {
-				raster->surface_set_raster_level(rend, compositor->high_speed ? GF_RASTER_HIGH_QUALITY : GF_RASTER_MID);
+				gf_evg_surface_set_raster_level(rend, compositor->fast ? GF_RASTER_HIGH_QUALITY : GF_RASTER_MID);
 			}
 			break;
 		case GF_ANTIALIAS_FULL:
 		default:
-			raster->surface_set_raster_level(rend, GF_RASTER_HIGH_QUALITY);
+			gf_evg_surface_set_raster_level(rend, GF_RASTER_HIGH_QUALITY);
 			break;
 		}
 	}
@@ -228,9 +221,8 @@
 static void visual_2d_draw_gradient(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_TraverseState *tr_state, GF_Matrix2D *ext_mx, GF_Rect *orig_bounds)
 {
 	GF_Rect rc;
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	GF_Matrix2D g_mat;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 
 	if (!txh) txh = ctx->aspect.fill_texture;
 
@@ -259,21 +251,21 @@
 
 	gf_mx2d_add_matrix(&g_mat, &ctx->transform);
 
-	raster->stencil_set_matrix(stencil, &g_mat);
-	raster->stencil_set_color_matrix(stencil, ctx->col_mat);
+	gf_evg_stencil_set_matrix(stencil, &g_mat);
+	gf_evg_stencil_set_color_matrix(stencil, ctx->col_mat);
 
 	/*MPEG-4/VRML context or no fill info*/
 	if (ctx->flags & CTX_HAS_APPEARANCE || !ctx->aspect.fill_color)
-		raster->stencil_set_alpha(stencil, 0xFF);
+		gf_evg_stencil_set_alpha(stencil, 0xFF);
 	else
-		raster->stencil_set_alpha(stencil, GF_COL_A(ctx->aspect.fill_color) );
+		gf_evg_stencil_set_alpha(stencil, GF_COL_A(ctx->aspect.fill_color) );
 
-	raster->surface_set_matrix(visual->raster_surface, &ctx->transform);
+	gf_evg_surface_set_matrix(visual->raster_surface, &ctx->transform);
 	txh->flags |= GF_SR_TEXTURE_USED;
 
-	raster->surface_set_path(visual->raster_surface, path);
+	gf_evg_surface_set_path(visual->raster_surface, path);
 	visual_2d_fill_path(visual, ctx, stencil, tr_state, 0);
-	raster->surface_set_path(visual->raster_surface, NULL);
+	gf_evg_surface_set_path(visual->raster_surface, NULL);
 
 	ctx->flags |= CTX_PATH_FILLED;
 }
@@ -282,17 +274,15 @@
 
 void visual_2d_texture_path_text(GF_VisualManager *visual, DrawableContext *txt_ctx, GF_Path *path, GF_Rect *object_bounds, GF_TextureHandler *txh, GF_TraverseState *tr_state)
 {
-	GF_STENCIL stencil;
+	GF_EVGStencil * stencil;
 	Fixed sS, sT;
 	GF_Matrix2D gf_mx2d_txt;
 	GF_Rect orig_rc;
 	u8 alpha, r, g, b;
 	GF_ColorMatrix cmat;
-	GF_Raster2D *raster;
 
 	if (! visual->CheckAttached(visual) ) return;
 
-	raster = visual->compositor->rasterizer;
 
 	stencil = gf_sc_texture_get_stencil(txh);
 	if (!stencil) return;
@@ -316,7 +306,7 @@
 	gf_mx2d_add_matrix(&gf_mx2d_txt, &txt_ctx->transform);
 
 	/*set path transform, except for background2D node which is directly build in the final coord system*/
-	raster->stencil_set_matrix(stencil, &gf_mx2d_txt);
+	gf_evg_stencil_set_matrix(stencil, &gf_mx2d_txt);
 
 	alpha = GF_COL_A(txt_ctx->aspect.fill_color);
 	r = GF_COL_R(txt_ctx->aspect.fill_color);
@@ -325,26 +315,26 @@
 
 	/*if col do a cxmatrix*/
 	if (!r && !g && !b) {
-		raster->stencil_set_alpha(stencil, alpha);
+		gf_evg_stencil_set_alpha(stencil, alpha);
 	} else {
-		raster->stencil_set_alpha(stencil, 0xFF);
+		gf_evg_stencil_set_alpha(stencil, 0xFF);
 		memset(cmat.m, 0, sizeof(Fixed) * 20);
 		cmat.m[4] = INT2FIX(r)/255;
 		cmat.m[9] = INT2FIX(g)/255;
 		cmat.m[14] = INT2FIX(b)/255;
 		cmat.m[18] = INT2FIX(alpha)/255;
 		cmat.identity = 0;
-		raster->stencil_set_color_matrix(stencil, &cmat);
+		gf_evg_stencil_set_color_matrix(stencil, &cmat);
 	}
 
-	raster->surface_set_matrix(visual->raster_surface, &txt_ctx->transform);
+	gf_evg_surface_set_matrix(visual->raster_surface, &txt_ctx->transform);
 	txh->flags |= GF_SR_TEXTURE_USED;
 
 	/*push path*/
-	raster->surface_set_path(visual->raster_surface, path);
+	gf_evg_surface_set_path(visual->raster_surface, path);
 
 	visual_2d_fill_path(visual, txt_ctx, stencil, tr_state, 0);
-	raster->surface_set_path(visual->raster_surface, NULL);
+	gf_evg_surface_set_path(visual->raster_surface, NULL);
 	txt_ctx->flags |= CTX_PATH_FILLED;
 }
 
@@ -401,13 +391,13 @@
 			}
 			//immediate mode flush, erase all canvas (we just completely flusged it)
 			if (tr_state->immediate_draw && had_flush && !tr_state->immediate_for_defer) {
-				visual->compositor->rasterizer->surface_clear(visual->raster_surface, NULL, 0);
+				gf_evg_surface_clear(visual->raster_surface, NULL, 0);
 			}
 			//defer mode, erase all part of the canvas below us
 			else if (txh) {
 				visual_2d_draw_path_extended(visual, ctx->drawable->path, ctx, NULL, NULL, tr_state, NULL, NULL, GF_TRUE);
 			} else {
-				visual->compositor->rasterizer->surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
+				gf_evg_surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
 			}
 		}
 		ctx->bi->clip = rc;
@@ -428,7 +418,7 @@
 void visual_2d_texture_path_opengl_auto(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state)
 {
 	GF_Rect clipper;
-	GF_Matrix mx;
+	GF_Matrix mx, bck_mx;
 	u32 prev_mode = tr_state->traversing_mode;
 	u32 prev_type_3d = tr_state->visual->type_3d;
 
@@ -437,6 +427,7 @@
 	tr_state->visual->type_3d = 4;
 	tr_state->appear = ctx->appear;
 	if (ctx->col_mat) gf_cmx_copy(&tr_state->color_mat, ctx->col_mat);//
+	gf_mx_copy(bck_mx, tr_state->model_matrix);
 
 	tr_state->traversing_mode=TRAVERSE_DRAW_3D;
 	//in hybridGL the 2D camera is always setup as centered-coords, we have to insert flip+translation in case of top-left origin 
@@ -467,6 +458,7 @@
 	ctx->flags |= CTX_PATH_FILLED;
 
 	visual_3d_reset_clipper_2d(tr_state->visual);
+	gf_mx_copy(tr_state->model_matrix, bck_mx);
 }
 #endif
 
@@ -475,18 +467,15 @@
 {
 	Fixed sS, sT;
 	u32 tx_tile;
-	GF_STENCIL tx_raster;
+	GF_EVGStencil * tx_raster;
 	GF_Matrix2D mx_texture;
 	GF_Rect orig_rc;
-	GF_Raster2D *raster;
 
 	if (! visual->CheckAttached(visual) ) return;
 
-	raster = visual->compositor->rasterizer;
-
 	if (!txh) txh = ctx->aspect.fill_texture;
 	if (!txh) return;
-	if (!txh->tx_io) {
+	if (!txh->tx_io && !txh->data) {
 		gf_node_dirty_set(txh->owner, 0, 1);
 
 		txh->needs_refresh=1;
@@ -519,17 +508,7 @@
 			gf_node_dirty_set(ctx->drawable->node, GF_SG_NODE_DIRTY, 1);
 		}
 
-		if (compositor_texture_rectangles(visual, txh, &ctx->bi->clip, &ctx->bi->unclip, &src, &dst, NULL, NULL)) {
-			if (txh->stream && gf_mo_set_position(txh->stream, &src, &dst)) {
-				gf_mo_get_visual_info(txh->stream, &txh->width, &txh->height, &txh->stride, &txh->pixel_ar, &txh->pixelformat, &txh->is_flipped);
-				/*force dirty flag to get called again*/
-				gf_node_dirty_set(ctx->drawable->node, GF_SG_NODE_DIRTY, 1);
-				gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
-			}
-		}
-
-
-
+		compositor_texture_rectangles(visual, txh, &ctx->bi->clip, &ctx->bi->unclip, &src, &dst, NULL, NULL);
 		return;
 	}
 
@@ -571,33 +550,33 @@
 	if (!(ctx->flags & CTX_IS_BACKGROUND) ) gf_mx2d_add_matrix(&mx_texture, &ctx->transform);
 
 	/*set path transform*/
-	raster->stencil_set_matrix(tx_raster, &mx_texture);
+	gf_evg_stencil_set_matrix(tx_raster, &mx_texture);
 
 
 	tx_tile = 0;
 	if (txh->flags & GF_SR_TEXTURE_REPEAT_S) tx_tile |= GF_TEXTURE_REPEAT_S;
 	if (txh->flags & GF_SR_TEXTURE_REPEAT_T) tx_tile |= GF_TEXTURE_REPEAT_T;
 	if (ctx->flags & CTX_FLIPED_COORDS)
-		tx_tile |= GF_TEXTURE_FLIP;
-	raster->stencil_set_tiling(tx_raster, (GF_TextureTiling) tx_tile);
+		tx_tile |= GF_TEXTURE_FLIP_Y;
+	gf_evg_stencil_set_mapping(tx_raster, (GF_TextureMapFlags) tx_tile);
 
 	if (!(ctx->flags & CTX_IS_BACKGROUND) ) {
 		u8 a = GF_COL_A(ctx->aspect.fill_color);
 		if (!a) a = GF_COL_A(ctx->aspect.line_color);
 		/*texture alpha scale is the original material transparency, NOT the one after color transform*/
-		raster->stencil_set_alpha(tx_raster, a );
-		raster->stencil_set_color_matrix(tx_raster, ctx->col_mat);
+		gf_evg_stencil_set_alpha(tx_raster, a );
+		gf_evg_stencil_set_color_matrix(tx_raster, ctx->col_mat);
 
-		raster->surface_set_matrix(visual->raster_surface, &ctx->transform);
+		gf_evg_surface_set_matrix(visual->raster_surface, &ctx->transform);
 	} else {
-		raster->surface_set_matrix(visual->raster_surface, NULL);
+		gf_evg_surface_set_matrix(visual->raster_surface, NULL);
 	}
 	txh->flags |= GF_SR_TEXTURE_USED;
 
 	/*push path & draw*/
-	raster->surface_set_path(visual->raster_surface, path);
+	gf_evg_surface_set_path(visual->raster_surface, path);
 	visual_2d_fill_path(visual, ctx, tx_raster, tr_state, 0);
-	raster->surface_set_path(visual->raster_surface, NULL);
+	gf_evg_surface_set_path(visual->raster_surface, NULL);
 
 
 
@@ -628,17 +607,16 @@
 #define ADAPTATION_SIZE		0
 
 
-void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase)
+void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_EVGStencil * brush, GF_EVGStencil * pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase)
 {
 	Bool dofill, dostrike;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 #ifdef SKIP_DRAW
 	return;
 #endif
 	if (! visual->CheckAttached(visual) ) return;
 
 	if ((ctx->flags & CTX_PATH_FILLED) && (ctx->flags & CTX_PATH_STROKE) ) {
-		if (visual->compositor->draw_bvol) draw_clipper(visual, ctx);
+		if (visual->compositor->bvol) draw_clipper(visual, ctx);
 		return;
 	}
 
@@ -650,7 +628,7 @@
 		dofill = 1;
 		if (!brush) {
 			brush = visual->raster_brush;
-			raster->stencil_set_brush_color(brush, ctx->aspect.fill_color);
+			gf_evg_stencil_set_brush_color(brush, ctx->aspect.fill_color);
 		}
 	}
 
@@ -663,20 +641,20 @@
 	}
 
 	/*set path transform, except for background2D node which is directly build in the final coord system*/
-	raster->surface_set_matrix(visual->raster_surface, (ctx->flags & CTX_IS_BACKGROUND) ? NULL : &ctx->transform);
+	gf_evg_surface_set_matrix(visual->raster_surface, (ctx->flags & CTX_IS_BACKGROUND) ? NULL : &ctx->transform);
 
 	/*fill path*/
 	if (dofill) {
 #if ADAPTATION_SIZE
 		if ((ctx->bi->clip.width<ADAPTATION_SIZE) && (ctx->bi->clip.height<ADAPTATION_SIZE)) {
-			raster->surface_clear(visual->raster_surface, &ctx->bi->clip, ctx->aspect.fill_color);
+			gf_evg_surface_clear(visual->raster_surface, &ctx->bi->clip, ctx->aspect.fill_color);
 		} else
 #endif
 		{
 			/*push path*/
-			raster->surface_set_path(visual->raster_surface, path);
+			gf_evg_surface_set_path(visual->raster_surface, path);
 			visual_2d_fill_path(visual, ctx, brush, tr_state, is_erase);
-			raster->surface_set_path(visual->raster_surface, NULL);
+			gf_evg_surface_set_path(visual->raster_surface, NULL);
 		}
 	}
 
@@ -690,7 +668,7 @@
 
 			if (!pen) {
 				pen = visual->raster_brush;
-				raster->stencil_set_brush_color(pen, ctx->aspect.line_color);
+				gf_evg_stencil_set_brush_color(pen, ctx->aspect.line_color);
 			}
 
 			si = drawable_get_strikeinfo(visual->compositor, ctx->drawable, &ctx->aspect, ctx->appear, path, ctx->flags, NULL);
@@ -698,7 +676,7 @@
 				if (ctx->aspect.line_texture) {
 					visual_2d_texture_path_extended(visual, si->outline, ctx->aspect.line_texture, ctx, orig_bounds, ext_mx, tr_state);
 				} else {
-					raster->surface_set_path(visual->raster_surface, si->outline);
+					gf_evg_surface_set_path(visual->raster_surface, si->outline);
 					visual_2d_fill_path(visual, ctx, pen, tr_state, 0);
 				}
 				/*that's ugly, but we cannot cache path outline for IFS2D/ILS2D*/
@@ -711,10 +689,10 @@
 		}
 	}
 
-	if (visual->compositor->draw_bvol) draw_clipper(visual, ctx);
+	if (visual->compositor->bvol) draw_clipper(visual, ctx);
 }
 
-void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state)
+void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_EVGStencil * brush, GF_EVGStencil * pen, GF_TraverseState *tr_state)
 {
 	visual_2d_draw_path_extended(visual, path, ctx, brush, pen, tr_state, NULL, NULL, GF_FALSE);
 }
@@ -723,7 +701,6 @@
 {
 	GF_Path *path;
 	GF_Rect *rc;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 #ifdef SKIP_DRAW
 	return;
 #endif
@@ -733,7 +710,7 @@
 	if (!color && !strike_color) return;
 
 	if ((ctx->flags & CTX_PATH_FILLED) && (ctx->flags & CTX_PATH_STROKE) ) {
-		if (visual->compositor->draw_bvol) draw_clipper(visual, ctx);
+		if (visual->compositor->bvol) draw_clipper(visual, ctx);
 		return;
 	}
 
@@ -741,11 +718,11 @@
 	visual_2d_set_options(visual->compositor, visual->raster_surface, 0, 1);
 	if (_rc) {
 		rc = _rc;
-		raster->surface_set_matrix(visual->raster_surface, &ctx->transform);
+		gf_evg_surface_set_matrix(visual->raster_surface, &ctx->transform);
 	}
 	else {
 		rc = &ctx->bi->unclip;
-		raster->surface_set_matrix(visual->raster_surface, NULL);
+		gf_evg_surface_set_matrix(visual->raster_surface, NULL);
 	}
 
 	path = gf_path_new();
@@ -758,10 +735,10 @@
 
 	if (color) {
 		/*push path*/
-		raster->surface_set_path(visual->raster_surface, path);
-		raster->stencil_set_brush_color(visual->raster_brush, color);
+		gf_evg_surface_set_path(visual->raster_surface, path);
+		gf_evg_stencil_set_brush_color(visual->raster_brush, color);
 		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state, 0);
-		raster->surface_set_path(visual->raster_surface, NULL);
+		gf_evg_surface_set_path(visual->raster_surface, NULL);
 	}
 	if (strike_color) {
 		GF_Path *outline;
@@ -770,24 +747,24 @@
 		pen.width = 1;
 		pen.join = GF_LINE_JOIN_BEVEL;
 		pen.dash = GF_DASH_STYLE_DOT;
-		raster->stencil_set_brush_color(visual->raster_brush, strike_color);
+		gf_evg_stencil_set_brush_color(visual->raster_brush, strike_color);
 		outline = gf_path_get_outline(path,  pen);
 		outline->flags &= ~GF_PATH_FILL_ZERO_NONZERO;
-		raster->surface_set_path(visual->raster_surface, outline);
+		gf_evg_surface_set_path(visual->raster_surface, outline);
 		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state, 0);
-		raster->surface_set_path(visual->raster_surface, NULL);
+		gf_evg_surface_set_path(visual->raster_surface, NULL);
 		gf_path_del(outline);
 	}
 
 	gf_path_del(path);
 }
 
+#if 0 //unused
 void visual_2d_fill_irect(GF_VisualManager *visual, GF_IRect *rc, u32 fill, u32 strike)
 {
 	GF_Path *path;
 	GF_Path *outline;
 	GF_PenSettings pen;
-	GF_Raster2D *raster = visual->compositor->rasterizer;
 #ifdef SKIP_DRAW
 	return;
 #endif
@@ -800,10 +777,10 @@
 
 	/*no aa*/
 	visual_2d_set_options(visual->compositor, visual->raster_surface, 0, 1);
-	raster->surface_set_matrix(visual->raster_surface, NULL);
+	gf_evg_surface_set_matrix(visual->raster_surface, NULL);
 
-	raster->surface_set_raster_level(visual->raster_surface, GF_RASTER_HIGH_SPEED);
-	raster->surface_set_matrix(visual->raster_surface, NULL);
+	gf_evg_surface_set_raster_level(visual->raster_surface, GF_RASTER_HIGH_SPEED);
+	gf_evg_surface_set_matrix(visual->raster_surface, NULL);
 
 	path = gf_path_new();
 	gf_path_add_move_to(path, INT2FIX(rc->x-1), INT2FIX(rc->y+2-rc->height));
@@ -813,13 +790,13 @@
 	gf_path_close(path);
 
 	if (fill) {
-		raster->surface_set_path(visual->raster_surface, path);
-		raster->stencil_set_brush_color(visual->raster_brush, fill);
+		gf_evg_surface_set_path(visual->raster_surface, path);
+		gf_evg_stencil_set_brush_color(visual->raster_brush, fill);
 
-		raster->surface_set_clipper(visual->raster_surface, rc);
-		raster->surface_fill(visual->raster_surface, visual->raster_brush);
+		gf_evg_surface_set_clipper(visual->raster_surface, rc);
+		gf_evg_surface_fill(visual->raster_surface, visual->raster_brush);
 
-		raster->surface_set_path(visual->raster_surface, NULL);
+		gf_evg_surface_set_path(visual->raster_surface, NULL);
 	}
 
 	if (strike) {
@@ -830,13 +807,13 @@
 		outline = gf_path_get_outline(path, pen);
 		outline->flags &= ~GF_PATH_FILL_ZERO_NONZERO;
 
-		raster->surface_set_path(visual->raster_surface, outline);
-		raster->stencil_set_brush_color(visual->raster_brush, strike);
+		gf_evg_surface_set_path(visual->raster_surface, outline);
+		gf_evg_stencil_set_brush_color(visual->raster_brush, strike);
 
-		raster->surface_set_clipper(visual->raster_surface, rc);
-		raster->surface_fill(visual->raster_surface, visual->raster_brush);
+		gf_evg_surface_set_clipper(visual->raster_surface, rc);
+		gf_evg_surface_fill(visual->raster_surface, visual->raster_brush);
 
-		raster->surface_set_path(visual->raster_surface, NULL);
+		gf_evg_surface_set_path(visual->raster_surface, NULL);
 		gf_path_del(outline);
 	}
 	gf_path_del(path);
@@ -845,3 +822,5 @@
 		ra_union_rect(&visual->hybgl_drawn, rc);
 #endif
 }
+#endif
+

gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d.c -> gpac-1.0.0.tar.gz/src/compositor/visual_manager_3d.c Changed

@@ -99,7 +99,7 @@
 	} else {
 		bounds = orig_bounds;
 	}
-	visual_3d_draw_bbox(tr_state, bounds);
+	visual_3d_draw_bbox(tr_state, bounds, GF_FALSE);
 }
 
 
@@ -218,16 +218,18 @@
 		}
 	}
 	if (vp) {
+#if 0
 		/*now check if vp is in pixel metrics. If not then:
 		- either it's in the main scene, there's nothing to do
 		- or it's in an inline, and the inline has been scaled if main scene is in pm: nothing to do*/
-		if (0 && gf_sg_use_pixel_metrics(gf_node_get_graph(vp))) {
+		if ( gf_sg_use_pixel_metrics(gf_node_get_graph(vp))) {
 			GF_Matrix mx;
 			gf_mx_init(mx);
 			gf_mx_add_scale(&mx, tr_state->min_hsize, tr_state->min_hsize, tr_state->min_hsize);
 			gf_mx_apply_vec(&mx, &position);
 			gf_mx_apply_vec(&mx, &local_center);
 		}
+#endif
 	}
 	/*default VP setup - this is undocumented in the spec. Default VP pos is (0, 0, 10) but not really nice
 	in pixel metrics. We set z so that we see just the whole visual*/
@@ -240,46 +242,46 @@
 	}
 #ifdef GF_SR_USE_DEPTH
 	/* 3D world calibration for stereoscopic screen */
-	if (tr_state->visual->compositor->auto_calibration && tr_state->visual->compositor->video_out->view_distance) {
-		Fixed view_distance, disparity;
+	if (tr_state->visual->compositor->autocal && tr_state->visual->compositor->video_out->dispdist) {
+		Fixed dispdist, disparity;
 
 		/*get view distance in pixels*/
-		view_distance = tr_state->visual->compositor->video_out->view_distance * tr_state->visual->compositor->video_out->dpi_x;
-		view_distance = gf_divfix(view_distance , FLT2FIX(2.54f) );
+		dispdist = tr_state->visual->compositor->video_out->dispdist * tr_state->visual->compositor->video_out->dpi_x;
+		dispdist = gf_divfix(dispdist , FLT2FIX(2.54f) );
 		disparity = INT2FIX(tr_state->visual->compositor->video_out->disparity);
 
 		if (tr_state->visual->depth_vp_range) {
-			position.z = view_distance;
-			tr_state->camera->z_near = view_distance - tr_state->visual->depth_vp_position + tr_state->visual->depth_vp_range/2;
-			tr_state->camera->z_far = view_distance - tr_state->visual->depth_vp_position - tr_state->visual->depth_vp_range/2;
+			position.z = dispdist;
+			tr_state->camera->z_near = dispdist - tr_state->visual->depth_vp_position + tr_state->visual->depth_vp_range/2;
+			tr_state->camera->z_far = dispdist - tr_state->visual->depth_vp_position - tr_state->visual->depth_vp_range/2;
 		}
 		else if (disparity) {
 			/*3,4 cm = 1,3386 inch -> pixels*/
 			Fixed half_interocular_dist_pixel = FLT2FIX(1.3386) * tr_state->visual->compositor->video_out->dpi_x;
 
 			//frustum placed to match user's real viewpoint
-			position.z = view_distance;
+			position.z = dispdist;
 
 			//near plane will match front side of the display's stereoscopic box
 			//-> n=D- (dD)/(e+d)
-			tr_state->camera->z_near = view_distance -
-			                           gf_divfix( gf_mulfix(disparity,view_distance), (half_interocular_dist_pixel + disparity));
+			tr_state->camera->z_near = dispdist -
+			                           gf_divfix( gf_mulfix(disparity,dispdist), (half_interocular_dist_pixel + disparity));
 		}
-		else if (tr_state->visual->compositor->display_depth) {
-			Fixed dist = INT2FIX(tr_state->visual->compositor->display_depth);
+		else if (tr_state->visual->compositor->dispdepth) {
+			dist = INT2FIX(tr_state->visual->compositor->dispdepth);
 			if (dist<0) dist = INT2FIX(tr_state->visual->height);
 
 #if 1
-			view_distance = gf_divfix(tr_state->visual->height, 2*gf_tan(fieldOfView/2) );
+			dispdist = gf_divfix(tr_state->visual->height, 2*gf_tan(fieldOfView/2) );
 #else
-			view_distance = gf_muldiv(view_distance, tr_state->visual->height, tr_state->visual->compositor->video_out->max_screen_height);
-			fieldOfView = 2*gf_atan2(tr_state->visual->height/2, view_distance);
+			dispdist = gf_muldiv(dispdist, tr_state->visual->height, tr_state->visual->compositor->video_out->max_screen_height);
+			fieldOfView = 2*gf_atan2(tr_state->visual->height/2, dispdist);
 #endif
 
 			//frustum placed to match user's real viewpoint
-			position.z = view_distance;
-			tr_state->camera->z_near = view_distance - 2*dist/3;
-			tr_state->camera->z_far = view_distance + dist/2;
+			position.z = dispdist;
+			tr_state->camera->z_near = dispdist - 2*dist/3;
+			tr_state->camera->z_far = dispdist + dist/2;
 		}
 	}
 #endif
@@ -331,12 +333,12 @@
 				Fixed fov = GF_PI/4;
 #ifdef GF_SR_USE_DEPTH
 				/* 3D world calibration for stereoscopic screen */
-				if (tr_state->visual->compositor->auto_calibration && tr_state->visual->compositor->video_out->view_distance) {
+				if (tr_state->visual->compositor->autocal && tr_state->visual->compositor->video_out->dispdist) {
 					/*get view distance in pixels*/
-					Fixed view_distance = tr_state->visual->compositor->video_out->view_distance * tr_state->visual->compositor->video_out->dpi_x;
-					view_distance = gf_divfix(view_distance , FLT2FIX(2.54f) );
+					Fixed dispdist = tr_state->visual->compositor->video_out->dispdist * tr_state->visual->compositor->video_out->dpi_x;
+					dispdist = gf_divfix(dispdist , FLT2FIX(2.54f) );
 
-					fov = 2*gf_atan2( INT2FIX(tr_state->visual->compositor->video_out->max_screen_width)/2, view_distance);
+					fov = 2*gf_atan2( INT2FIX(tr_state->visual->compositor->video_out->max_screen_width)/2, dispdist);
 				}
 #endif
 
@@ -355,6 +357,7 @@
 					/*scene not yet ready, force a recompute of world bounds at next frame*/
 					if (!is_layer && gf_sc_fit_world_to_screen(tr_state->visual->compositor) == 0) {
 						tr_state->camera->had_viewpoint = 2;
+						gf_sc_invalidate(tr_state->visual->compositor, NULL);
 					}
 				}
 			} else {
@@ -371,7 +374,7 @@
 		Fixed interocular_dist_pixel;
 		Fixed delta = 0;
 
-		interocular_dist_pixel = tr_state->visual->compositor->interoccular_distance + tr_state->visual->compositor->interoccular_offset;
+		interocular_dist_pixel = tr_state->visual->compositor->iod + tr_state->visual->compositor->interoccular_offset;
 
 		view_idx = tr_state->visual->current_view;
 		view_idx -= tr_state->visual->nb_views/2;
@@ -379,11 +382,11 @@
 		if (! (tr_state->visual->nb_views % 2)) {
 			delta += interocular_dist_pixel/2;
 		}
-		if (tr_state->visual->reverse_views) delta = - delta;
+		if (tr_state->visual->compositor->rview) delta = - delta;
 
 		tr_state->camera->flags |= CAM_IS_DIRTY;
 		tr_state->camera_was_dirty = GF_TRUE;
-		camera_update_stereo(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords, delta, tr_state->visual->compositor->video_out->view_distance, tr_state->visual->compositor->focus_distance, tr_state->visual->camera_layout);
+		camera_update_stereo(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords, delta, tr_state->visual->compositor->video_out->dispdist, tr_state->visual->compositor->focdist, tr_state->visual->camlay);
 	} else {
 		if (tr_state->camera->flags & CAM_IS_DIRTY) tr_state->camera_was_dirty = GF_TRUE;
 		camera_update(tr_state->camera, &tr_state->transform, tr_state->visual->center_coords);
@@ -442,7 +445,9 @@
 			/*if composite visual, clear with alpha = 0*/
 			if (tr_state->visual==tr_state->visual->compositor->visual) {
 				alpha = FIX_ONE;
-				if (tr_state->visual->compositor->user && (tr_state->visual->compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT) ) {
+				if (tr_state->visual->compositor->init_flags & GF_TERM_WINDOW_TRANSPARENT) {
+					alpha = 0;
+				} else if (tr_state->visual->compositor->dyn_filter_mode) {
 					alpha = 0;
 				}
 			}
@@ -461,7 +466,7 @@
 	GF_Camera *cam = &tr_state->visual->camera;
 	Fixed ar = gf_divfix(cam->width, cam->height);
 
-	tr_state->visual->camera_layout = 0;
+	tr_state->visual->camlay = 0;
 	gf_mx_copy(proj, cam->projection);
 	gf_mx_copy(model, cam->modelview);
 
@@ -473,7 +478,7 @@
 
 	visual_3d_draw_background(tr_state, layer_type);
 
-	tr_state->visual->camera_layout = GF_3D_CAMERA_OFFAXIS;
+	tr_state->visual->camlay = GF_3D_CAMERA_OFFAXIS;
 	gf_mx_copy(cam->projection, proj);
 	gf_mx_copy(cam->modelview, model);
 
@@ -485,7 +490,7 @@
 #ifndef GPAC_DISABLE_VRML
 	GF_Node *bindable;
 #endif
-	Bool off_axis_background = (tr_state->camera->is_3D && (tr_state->visual->camera_layout==GF_3D_CAMERA_OFFAXIS)) ? 1 : 0;
+	Bool off_axis_background = (tr_state->camera->is_3D && (tr_state->visual->camlay==GF_3D_CAMERA_OFFAXIS)) ? 1 : 0;
 
 	/*if not in layer, traverse navigation node
 	FIXME: we should update the nav info according to the world transform at the current viewpoint (vrml)*/
@@ -511,15 +516,15 @@
 			} else {
 				tr_state->camera->navigation_flags = NAV_ANY | NAV_HEADLIGHT;
 				if (tr_state->camera->is_3D) {
-					if (tr_state->visual->compositor->default_navigation_mode != GF_NAVIGATE_NONE) {
-						tr_state->camera->navigate_mode = tr_state->visual->compositor->default_navigation_mode;
+					if (tr_state->visual->compositor->nav != GF_NAVIGATE_NONE) {
+						tr_state->camera->navigate_mode = tr_state->visual->compositor->nav;
 					} else {
 						/*X3D is by default examine, VRML/MPEG4 is WALK*/
 						tr_state->camera->navigate_mode = (tr_state->visual->type_3d==3) ? GF_NAVIGATE_EXAMINE : GF_NAVIGATE_WALK;
 					}
 
 #ifdef GF_SR_USE_DEPTH
-					/*				if (tr_state->visual->compositor->display_depth)
+					/*				if (tr_state->visual->compositor->dispdepth)
 										tr_state->camera->navigate_mode = GF_NAVIGATE_NONE;
 					*/
 #endif
@@ -538,9 +543,10 @@
 		}
 
 	/*animate current camera - if returns TRUE draw next frame*/
-	if (camera_animate(tr_state->camera)) {
+	if (camera_animate(tr_state->camera, tr_state->visual->compositor)) {
 		if (tr_state->visual->compositor->active_layer) gf_node_dirty_set(tr_state->visual->compositor->active_layer, 0, 1);
-		gf_sc_invalidate(tr_state->visual->compositor, NULL);
+
+		tr_state->visual->compositor->force_next_frame_redraw = GF_TRUE;
 	}
 
 
@@ -653,7 +659,7 @@
 	}
 
 	/*regular background draw*/
-	if (!tr_state->camera->is_3D || tr_state->visual->camera_layout != GF_3D_CAMERA_OFFAXIS) {
+	if (!tr_state->camera->is_3D || tr_state->visual->camlay != GF_3D_CAMERA_OFFAXIS) {
 		visual_3d_draw_background(tr_state, layer_type);
 	}
 
@@ -669,12 +675,10 @@
 
 static GFINLINE Bool visual_3d_has_alpha(GF_TraverseState *tr_state, GF_Node *geom)
 {
-	Bool is_mat3D;
 	Drawable3D *stack;
 
-
-	is_mat3D = 0;
 #ifndef GPAC_DISABLE_VRML
+	Bool is_mat3D = GF_FALSE;
 	if (tr_state->appear) {
 		GF_Node *mat = ((M_Appearance *)tr_state->appear)->material;
 		if (mat) {
@@ -688,7 +692,7 @@
 #ifndef GPAC_DISABLE_X3D
 			case TAG_X3D_Material:
 #endif
-				is_mat3D = 1;
+				is_mat3D = GF_TRUE;
 				if ( ((M_Material *)mat)->transparency) return 1;
 				break;
 			case TAG_MPEG4_MaterialKey:
@@ -720,7 +724,7 @@
 void visual_3d_register_context(GF_TraverseState *tr_state, GF_Node *geometry)
 {
 	u32 i, count;
-	DirectionalLightContext *nl, *ol;
+	DirectionalLightContext *ol;
 	Drawable3DContext *ctx;
 	Drawable3D *drawable;
 
@@ -771,7 +775,7 @@
 
 	i=0;
 	while ((ol = (DirectionalLightContext*)gf_list_enum(tr_state->local_lights, &i))) {
-		nl = (DirectionalLightContext*)gf_malloc(sizeof(DirectionalLightContext));
+		DirectionalLightContext *nl = (DirectionalLightContext*)gf_malloc(sizeof(DirectionalLightContext));
 		memcpy(nl, ol, sizeof(DirectionalLightContext));
 		gf_list_add(ctx->directional_lights, nl);
 	}
@@ -865,7 +869,7 @@
 		/*reset directional lights*/
 		tr_state->local_light_on = 0;
 		for (i=gf_list_count(ctx->directional_lights); i>0; i--) {
-			DirectionalLightContext *dl = (DirectionalLightContext*)gf_list_get(ctx->directional_lights, i-1);
+			dl = (DirectionalLightContext*)gf_list_get(ctx->directional_lights, i-1);
 			gf_node_traverse(dl->dlight, tr_state);
 			gf_free(dl);
 		}
@@ -954,8 +958,11 @@
 	u32 time = gf_sys_clock();
 #endif
 
+	if (visual->compositor->fbo_id)
+		compositor_3d_enable_fbo(visual->compositor, GF_TRUE);
+
 	visual_3d_setup(visual);
-	visual->glsl_flags = 0;
+	visual->active_glsl_flags = 0;
 
 	/*setup our traversing state*/
 	visual_3d_setup_traversing_state(visual, tr_state);
@@ -990,7 +997,7 @@
 				visual_3d_end_auto_stereo_pass(visual);
 			}
 
-			if (is_root_visual) visual->compositor->reset_graphics = 0;
+			visual->compositor->reset_graphics = 0;
 		}
 
 	} else {
@@ -998,6 +1005,9 @@
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("[RTI] Frame\t%d\t3D drawn in \t%d\tms\n", visual->compositor->frame_number, gf_sys_clock() - time));
 
+	if (visual->compositor->fbo_id)
+		compositor_3d_enable_fbo(visual->compositor, GF_FALSE);
+
 	return 1;
 }
 
@@ -1111,12 +1121,13 @@
 		} else {
 			/*camera displacement collision*/
 			if (tr_state->camera->collide_dist) {
-				if (tr_state->camera->collide_dist>=tr_state->camera->avatar_size.x)
+				if (tr_state->camera->collide_dist>=tr_state->camera->avatar_size.x) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Collision] Collision distance %g greater than avatar collide size %g\n", FIX2FLT(tr_state->camera->collide_dist), FIX2FLT(tr_state->camera->avatar_size.x)));
 
-				/*safety check due to precision, always stay below collide dist*/
-				if (tr_state->camera->collide_dist>=tr_state->camera->avatar_size.x) tr_state->camera->collide_dist = tr_state->camera->avatar_size.x;
-
+					/*safety check due to precision, always stay below collide dist*/
+					tr_state->camera->collide_dist = tr_state->camera->avatar_size.x;
+				}
+				
 				gf_vec_diff(n, tr_state->camera->position, tr_state->camera->collide_point);
 				gf_vec_norm(&n);
 				n = gf_vec_scale(n, tr_state->camera->avatar_size.x - tr_state->camera->collide_dist);
@@ -1277,6 +1288,7 @@
 		y = gf_mulfix(y, scale);
 	}
 
+#if 0
 	start.z = visual->camera.z_near;
 	end.z = visual->camera.z_far;
 	if (!tr_state->camera->is_3D && !tr_state->pixel_metrics) {
@@ -1286,6 +1298,7 @@
 		start.x = end.x = x;
 		start.y = end.y = y;
 	}
+#endif
 
 	/*unproject to world coords*/
 	in_x = 2*x/ (s32) visual->width;
@@ -1681,7 +1694,7 @@
 	if (!si) return;
 
 	if (!si->mesh_outline) {
-		si->is_vectorial = asp->line_texture ? GF_TRUE : !tr_state->visual->compositor->raster_outlines;
+		si->is_vectorial = asp->line_texture ? GF_TRUE : !tr_state->visual->compositor->linegl;
 		si->mesh_outline = new_mesh();
 #ifdef GPAC_HAS_GLU
 		if (si->is_vectorial) {
@@ -1900,7 +1913,7 @@
 		Fixed v[4];
 		switch (txh->pixelformat) {
 		/*override diffuse color with full intensity, but keep material alpha (cf VRML lighting)*/
-		case GF_PIXEL_RGB_24:
+		case GF_PIXEL_RGB:
 			if (tr_state->visual->has_material_2d) {
 				SFColor c;
 				c.red = c.green = c.blue = FIX_ONE;
@@ -1919,10 +1932,6 @@
 			}
 			tr_state->mesh_is_transparent = 1;
 			break;
-			/*			case GF_PIXEL_GREYSCALE:
-							tr_state->mesh_num_textures = 2;
-							break;
-			*/
 		}
 	}
 	return tr_state->mesh_num_textures ? GF_TRUE : GF_FALSE;
@@ -1997,8 +2006,8 @@
 
 void visual_3d_set_material_2d(GF_VisualManager *visual, SFColor col, Fixed alpha)
 {
-	visual->has_material_2d = alpha ? 1 : 0;
-	visual->has_material=0;
+	visual->has_material_2d = alpha ? GF_TRUE : GF_FALSE;
+	visual->has_material = 0;
 	if (visual->has_material_2d) {
 		visual->mat_2d.red = col.red;
 		visual->mat_2d.green = col.green;
@@ -2011,8 +2020,8 @@
 void visual_3d_set_material_2d_argb(GF_VisualManager *visual, u32 col)
 {
 	u32 a = GF_COL_A(col);
-	visual->has_material_2d = a ? 1 : 0;
-	visual->has_material=0;
+	visual->has_material_2d = a ? GF_TRUE : GF_FALSE;
+	visual->has_material = 0;
 	if (visual->has_material_2d) {
 		visual->mat_2d.red = INT2FIX( GF_COL_R(col) ) / 255;
 		visual->mat_2d.green = INT2FIX( GF_COL_G(col) ) / 255;

gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d.h -> gpac-1.0.0.tar.gz/src/compositor/visual_manager_3d.h Changed

gpac-0.8.0.tar.gz/src/compositor/visual_manager_3d_gl.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Compositor sub-project
@@ -65,89 +65,9 @@
 #undef GL_MAX_CLIP_PLANES
 #endif
 
-
 #define CHECK_GL_EXT(name) ((strstr(ext, name) != NULL) ? 1 : 0)
 
 
-#ifdef LOAD_GL_1_3
-
-GLDECL_STATIC(glActiveTexture);
-GLDECL_STATIC(glClientActiveTexture);
-GLDECL_STATIC(glBlendEquation);
-
-#endif //LOAD_GL_1_3
-
-#ifdef LOAD_GL_1_4
-
-GLDECL_STATIC(glPointParameterf);
-GLDECL_STATIC(glPointParameterfv);
-
-#endif //LOAD_GL_1_4
-
-
-#ifdef LOAD_GL_1_5
-GLDECL_STATIC(glGenBuffers);
-GLDECL_STATIC(glDeleteBuffers);
-GLDECL_STATIC(glBindBuffer);
-GLDECL_STATIC(glBufferData);
-GLDECL_STATIC(glBufferSubData);
-GLDECL_STATIC(glMapBuffer);
-GLDECL_STATIC(glUnmapBuffer);
-#endif //LOAD_GL_1_5
-
-#ifdef LOAD_GL_2_0
-
-GLDECL_STATIC(glCreateProgram);
-GLDECL_STATIC(glDeleteProgram);
-GLDECL_STATIC(glLinkProgram);
-GLDECL_STATIC(glUseProgram);
-GLDECL_STATIC(glCreateShader);
-GLDECL_STATIC(glDeleteShader);
-GLDECL_STATIC(glShaderSource);
-GLDECL_STATIC(glCompileShader);
-GLDECL_STATIC(glAttachShader);
-GLDECL_STATIC(glDetachShader);
-GLDECL_STATIC(glGetShaderiv);
-GLDECL_STATIC(glGetInfoLogARB);
-GLDECL_STATIC(glGetUniformLocation);
-GLDECL_STATIC(glUniform1f);
-GLDECL_STATIC(glUniform2f);
-GLDECL_STATIC(glUniform3f);
-GLDECL_STATIC(glUniform4f);
-GLDECL_STATIC(glUniform1i);
-GLDECL_STATIC(glUniform2i);
-GLDECL_STATIC(glUniform3i);
-GLDECL_STATIC(glUniform4i);
-GLDECL_STATIC(glUniform1fv);
-GLDECL_STATIC(glUniform2fv);
-GLDECL_STATIC(glUniform3fv);
-GLDECL_STATIC(glUniform4fv);
-GLDECL_STATIC(glUniform1iv);
-GLDECL_STATIC(glUniform2iv);
-GLDECL_STATIC(glUniform3iv);
-GLDECL_STATIC(glUniform4iv);
-GLDECL_STATIC(glUniformMatrix2fv);
-GLDECL_STATIC(glUniformMatrix3fv);
-GLDECL_STATIC(glUniformMatrix4fv);
-GLDECL_STATIC(glUniformMatrix2x3fv);
-GLDECL_STATIC(glUniformMatrix3x2fv);
-GLDECL_STATIC(glUniformMatrix2x4fv);
-GLDECL_STATIC(glUniformMatrix4x2fv);
-GLDECL_STATIC(glUniformMatrix3x4fv);
-GLDECL_STATIC(glUniformMatrix4x3fv);
-GLDECL_STATIC(glGetProgramiv);
-GLDECL_STATIC(glGetProgramInfoLog);
-GLDECL_STATIC(glGetAttribLocation);
-
-#ifndef GPAC_ANDROID
-GLDECL_STATIC(glEnableVertexAttribArray);
-GLDECL_STATIC(glDisableVertexAttribArray);
-GLDECL_STATIC(glVertexAttribPointer);
-GLDECL_STATIC(glVertexAttribIPointer);
-#endif
-
-#endif //LOAD_GL_2_0
-
 void gf_sc_load_opengl_extensions(GF_Compositor *compositor, Bool has_gl_context)
 {
 #ifdef GPAC_USE_TINYGL
@@ -157,13 +77,13 @@
 #else
 	const char *ext = NULL;
 
-	if (compositor->visual->type_3d || compositor->hybrid_opengl)
+	if (has_gl_context)
 		ext = (const char *) glGetString(GL_EXTENSIONS);
 
-	if (!ext) ext = gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLExtensions");
+	if (!ext) ext = gf_opts_get_key("core", "glext");
 	/*store OGL extension to config for app usage*/
-	else if (gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLExtensions")==NULL)
-		gf_cfg_set_key(compositor->user->config, "Compositor", "OpenGLExtensions", ext ? ext : "None");
+	else if (gf_opts_get_key("core", "glext")==NULL)
+		gf_opts_set_key("core", "glext", ext ? ext : "None");
 
 	if (!ext) return;
 
@@ -177,6 +97,11 @@
 		compositor->gl_caps.abgr_texture = 1;
 	if (CHECK_GL_EXT("GL_EXT_bgra"))
 		compositor->gl_caps.bgra_texture = 1;
+	if (CHECK_GL_EXT("GL_EXT_framebuffer_object") || CHECK_GL_EXT("GL_ARB_framebuffer_object"))
+		compositor->gl_caps.fbo = 1;
+	if (CHECK_GL_EXT("GL_ARB_texture_non_power_of_two"))
+		compositor->gl_caps.npot = 1;
+
 
 	if (CHECK_GL_EXT("GL_ARB_point_parameters")) {
 		compositor->gl_caps.point_sprite = 1;
@@ -197,8 +122,6 @@
 #ifndef GPAC_USE_GLES1X
 	if (CHECK_GL_EXT("GL_EXT_texture_rectangle") || CHECK_GL_EXT("GL_NV_texture_rectangle")) {
 		compositor->gl_caps.rect_texture = 1;
-		if (CHECK_GL_EXT("GL_MESA_ycbcr_texture")) compositor->gl_caps.yuv_texture = YCBCR_MESA;
-		else if (CHECK_GL_EXT("GL_APPLE_ycbcr_422")) compositor->gl_caps.yuv_texture = YCBCR_422_APPLE;
 	}
 #endif
 
@@ -212,138 +135,55 @@
 	/*we have a GL context, init the rest (proc addresses & co)*/
 	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &compositor->gl_caps.max_texture_size);
 
-#ifdef LOAD_GL_1_3
-	if (CHECK_GL_EXT("GL_ARB_multitexture")) {
-		GET_GLFUN(glActiveTexture);
-		GET_GLFUN(glClientActiveTexture);
-	}
-	GET_GLFUN(glBlendEquation);
-#endif
-
-#ifdef LOAD_GL_1_4
-	if (compositor->gl_caps.point_sprite) {
-		GET_GLFUN(glPointParameterf);
-		GET_GLFUN(glPointParameterfv);
-	}
-#endif
-
-#ifdef LOAD_GL_1_5
-	if (compositor->gl_caps.vbo) {
-		GET_GLFUN(glGenBuffers);
-		GET_GLFUN(glDeleteBuffers);
-		GET_GLFUN(glBindBuffer);
-		GET_GLFUN(glBufferData);
-		GET_GLFUN(glBufferSubData);
-	}
 	if (CHECK_GL_EXT("GL_ARB_pixel_buffer_object")) {
-		GET_GLFUN(glMapBuffer);
-		GET_GLFUN(glUnmapBuffer);
-
 		compositor->gl_caps.pbo=1;
 	}
-#endif
-
-
-
 
 #ifdef LOAD_GL_2_0
-	GET_GLFUN(glCreateProgram);
-
 	if (glCreateProgram != NULL) {
-		GET_GLFUN(glDeleteProgram);
-		GET_GLFUN(glLinkProgram);
-		GET_GLFUN(glUseProgram);
-		GET_GLFUN(glCreateShader);
-		GET_GLFUN(glDeleteShader);
-		GET_GLFUN(glShaderSource);
-		GET_GLFUN(glCompileShader);
-		GET_GLFUN(glAttachShader);
-		GET_GLFUN(glDetachShader);
-		GET_GLFUN(glGetShaderiv);
-		GET_GLFUN(glGetInfoLogARB);
-		GET_GLFUN(glGetUniformLocation);
-		GET_GLFUN(glUniform1f);
-		GET_GLFUN(glUniform2f);
-		GET_GLFUN(glUniform3f);
-		GET_GLFUN(glUniform4f);
-		GET_GLFUN(glUniform1i);
-		GET_GLFUN(glUniform2i);
-		GET_GLFUN(glUniform3i);
-		GET_GLFUN(glUniform4i);
-		GET_GLFUN(glUniform1fv);
-		GET_GLFUN(glUniform2fv);
-		GET_GLFUN(glUniform3fv);
-		GET_GLFUN(glUniform4fv);
-		GET_GLFUN(glUniform1iv);
-		GET_GLFUN(glUniform2iv);
-		GET_GLFUN(glUniform3iv);
-		GET_GLFUN(glUniform4iv);
-		GET_GLFUN(glUniformMatrix2fv);
-		GET_GLFUN(glUniformMatrix3fv);
-		GET_GLFUN(glUniformMatrix4fv);
-		GET_GLFUN(glUniformMatrix2x3fv);
-		GET_GLFUN(glUniformMatrix3x2fv);
-		GET_GLFUN(glUniformMatrix2x4fv);
-		GET_GLFUN(glUniformMatrix4x2fv);
-		GET_GLFUN(glUniformMatrix3x4fv);
-		GET_GLFUN(glUniformMatrix4x3fv);
-		GET_GLFUN(glGetProgramiv);
-		GET_GLFUN(glGetProgramInfoLog);
-
 		compositor->gl_caps.has_shaders = 1;
 
-#ifndef GPAC_ANDROID
-		GET_GLFUN(glEnableVertexAttribArray);
-		GET_GLFUN(glDisableVertexAttribArray);
-		GET_GLFUN(glVertexAttribPointer);
-		GET_GLFUN(glVertexAttribIPointer);
-		GET_GLFUN(glGetAttribLocation);
-
-		if (glGetAttribLocation != NULL) {
-			compositor->shader_only_mode = GF_TRUE;
+#ifndef GPAC_CONFIG_ANDROID
+		if (glGetAttribLocation == NULL) {
+			compositor->shader_mode_disabled = GF_TRUE;
 		}
 #endif
 
-
 	} else {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported\n"));
 	}
-#endif //LOAD_GL_FUNCS
+#endif //LOAD_GL_2_0
 
 #endif //GPAC_USE_TINYGL
 
 #ifdef GPAC_USE_GLES2
 	compositor->gl_caps.has_shaders = GF_TRUE;
-	compositor->shader_only_mode = GF_TRUE;
 #elif defined (GL_VERSION_2_0)
 	compositor->gl_caps.has_shaders = GF_TRUE;
-	compositor->shader_only_mode = GF_TRUE;
 #endif
-
-	if (!compositor->gl_caps.has_shaders && (compositor->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported - disabling auto-stereo output\n"));
-		compositor->visual->nb_views=1;
-		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
-		compositor->visual->camera_layout = GF_3D_CAMERA_STRAIGHT;
+	if (!compositor->gl_caps.has_shaders) {
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+		compositor->shader_mode_disabled = GF_TRUE;
+#endif
+		if (compositor->visual->autostereo_type > GF_3D_STEREO_LAST_SINGLE_BUFFER) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported - disabling auto-stereo output\n"));
+			compositor->visual->nb_views=1;
+			compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
+			compositor->visual->camlay = GF_3D_CAMERA_STRAIGHT;
+		}
 	}
 
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
-	if (compositor->shader_only_mode) {
-		const char *shader = gf_cfg_get_key(compositor->user->config, "Compositor", "VertexShader");
-		FILE *t = shader ? gf_fopen(shader, "rt") : NULL;
-		if (!t) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Vertex shader not found, disabling shaders\n"));
-			compositor->shader_only_mode = GF_FALSE;
-		}
-		if (t) gf_fclose(t);
-
-		shader = gf_cfg_get_key(compositor->user->config, "Compositor", "FragmentShader");
-		t = shader ? gf_fopen(shader, "rt") : NULL;
-		if (!t) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Fragment shader not found, disabling shaders\n"));
-			compositor->shader_only_mode = GF_FALSE;
+	if (!compositor->shader_mode_disabled && compositor->vertshader && compositor->fragshader) {
+		if (!gf_file_exists(compositor->vertshader)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Vertex shader %s not found, disabling shaders\n", compositor->vertshader));
+			compositor->shader_mode_disabled = GF_TRUE;
+		}
+
+		if (!gf_file_exists(compositor->fragshader)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] GLES Fragment shader %s not found, disabling shaders\n", compositor->fragshader));
+			compositor->shader_mode_disabled = GF_TRUE;
 		}
-		if (t) gf_fclose(t);
 	}
 #endif
 }
@@ -512,7 +352,7 @@
 
 /**
  parses (glShaderSource) and compiles (glCompileShader) shader source
- \return GF_TRUE if successful
+\return GF_TRUE if successful
  */
 Bool visual_3d_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
 {
@@ -546,44 +386,34 @@
 }
 static GF_SHADERID visual_3d_shader_from_source_file(const char *src_path, u32 shader_type)
 {
-	FILE *src = gf_fopen(src_path, "rt");
 	GF_SHADERID shader = 0;
-	if (src) {
-		size_t size;
-		char *shader_src;
-		gf_fseek(src, 0, SEEK_END);
-		size = (size_t) gf_ftell(src);
-		gf_fseek(src, 0, SEEK_SET);
-		shader_src = gf_malloc(sizeof(char)*(size+1));
-		size = fread(shader_src, 1, size, src);
-		gf_fclose(src);
-		if (size != (size_t) -1) {
-			shader_src[size]=0;
-			shader = glCreateShader(shader_type);
-			if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", shader_src)==GF_FALSE) {
-				glDeleteShader(shader);
-				shader = 0;
-			}
+	u32 size;
+	char *shader_src;
+
+	GF_Err e = gf_file_load_data(src_path, (u8 **) &shader_src, &size);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s: %s\n", src_path, gf_error_to_string(e) ));
+	} else {
+		shader = glCreateShader(shader_type);
+		if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", shader_src)==GF_FALSE) {
+			glDeleteShader(shader);
+			shader = 0;
 		}
 		gf_free(shader_src);
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s\n", src_path));
 	}
 	return shader;
 }
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #include <errno.h>
 #include <sys/sysctl.h>
 #endif
 
 
-static GF_SHADERID visual_3d_shader_with_flags(const char *src_path, u32 shader_type, u32 flags) {
+static GF_SHADERID visual_3d_shader_with_flags(const char *src_path, u32 shader_type, u32 flags, u32 pixfmt) {
 
-	FILE *src = gf_fopen(src_path, "rt");
 	GF_SHADERID shader = 0;
-	char *shader_src;
-	char *defs, *tmp, szKey[100];
+	char *defs, szKey[100];
 	size_t str_size;
 
 	defs = (char *) gf_strdup(GLES_VERSION_STRING);
@@ -629,68 +459,45 @@
 		}
 	}
 
-	if (src) {
-		size_t size;
-		gf_fseek(src, 0, SEEK_END);
-		size = (size_t) gf_ftell(src);
-		gf_fseek(src, 0, SEEK_SET);
-		shader_src = gf_malloc(sizeof(char)*(size+1));
-		size = fread(shader_src, 1, size, src);
-		tmp = (char *) gf_malloc(sizeof(char)*(size+str_size+2));
-		strcpy(tmp, defs);
-		strncat(tmp, shader_src, (size));
-		gf_fclose(src);
-		if (size != (size_t) -1) {
-			tmp[size+str_size]=0;
-			shader = glCreateShader(shader_type);
-			if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", tmp)==GF_FALSE) {
-				glDeleteShader(shader);
-				shader = 0;
-			}
-		}
-		gf_free(shader_src);
-		gf_free(tmp);
-		gf_free(defs);
+	char *shader_src;
+	u32 size;
+	GF_Err e = gf_file_load_data(src_path ,(u8 **) &shader_src, &size);
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s: %s\n", src_path, gf_error_to_string(e)));
 	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s\n", src_path));
-	}
-	return shader;
-}
+		char *final_src = NULL;
 
-static void visual_3d_set_tx_planes(GF_VisualManager *visual)
-{
-	GLint i,j, loc;
+		gf_dynstrcat(&final_src, defs, NULL);
 
-	for(i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
-		if (! (i & GF_GL_HAS_TEXTURE))
-			continue;
+		if ((shader_type==GL_FRAGMENT_SHADER) && (flags & GF_GL_HAS_TEXTURE)) {
+			char *sep = strstr(shader_src, "void main(");
+			if (sep) sep[0] = 0;
+			gf_dynstrcat(&final_src, shader_src, NULL);
 
-		glUseProgram(visual->glsl_programs[i]);
-		if (i & GF_GL_IS_YUV) {
-			for (j=0; j<3; j++) {
-				const char *txname = (j==0) ? "y_plane" : (j==1) ? "u_plane" : "v_plane";
-				loc = glGetUniformLocation(visual->glsl_programs[i], txname);
-				if (loc == -1) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
-					continue;
-				}
-				glUniform1i(loc, j);
-			}
-		} else if (i & GF_GL_IS_ExternalOES)  {
-			loc = glGetUniformLocation(visual->glsl_programs[i], "imgOES");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture imgOES in ExternalOES shader\n"));
+			//add texture code
+			gf_gl_txw_insert_fragment_shader(pixfmt, "maintx", &final_src);
+
+			//append the rest
+			if (sep) {
+				sep[0] = 'v';
+				gf_dynstrcat(&final_src, sep, "\n");
 			}
-			glUniform1i(loc, 0);
 		} else {
-			loc = glGetUniformLocation(visual->glsl_programs[i], "img");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture img in RGB shader\n"));
-			}
-			glUniform1i(loc, 0);
+			gf_dynstrcat(&final_src, shader_src, "\n");
+		}
+		shader = glCreateShader(shader_type);
 
+		if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", final_src)==GF_FALSE) {
+			glDeleteShader(shader);
+			shader = 0;
 		}
+
+		gf_free(shader_src);
+		gf_free(final_src);
+		gf_free(defs);
 	}
+	return shader;
 }
 
 void visual_3d_init_stereo_shaders(GF_VisualManager *visual)
@@ -732,14 +539,9 @@
 			break;
 
 		case GF_3D_STEREO_CUSTOM:
-		{
-			const char *sOpt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "InterleaverShader");
-			if (sOpt) {
-				visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(sOpt, GL_FRAGMENT_SHADER);
-				if (visual->autostereo_glsl_fragment) res = GF_TRUE;
-			}
-		}
-		break;
+			visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(visual->compositor->mvshader, GL_FRAGMENT_SHADER);
+			if (visual->autostereo_glsl_fragment) res = GF_TRUE;
+			break;
 		}
 	}
 
@@ -757,7 +559,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
 			res = GF_FALSE;
 		}
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	}
 
 	if (!res) {
@@ -772,6 +574,7 @@
 
 
 
+#if 0
 static GLint gf_glGetUniformLocation(GF_SHADERID glsl_program, const char *uniform_name)
 {
 	GLint loc = glGetUniformLocation(glsl_program, uniform_name);
@@ -780,7 +583,10 @@
 	}
 	return loc;
 }
+#endif
+
 
+#if 0
 static GLint gf_glGetAttribLocation(GF_SHADERID glsl_program, const char *attrib_name)
 {
 	GLint loc = glGetAttribLocation(glsl_program, attrib_name);
@@ -789,15 +595,16 @@
 	}
 	return loc;
 }
+#endif
 
 //The following functions were used for shader testing [in ES2.0]
 #if 0
 static void gf_glQueryProgram(GF_SHADERID progObj)
 {
 	GLint err_log = -10;
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 	glValidateProgram(progObj);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 	glGetProgramiv(progObj, GL_VALIDATE_STATUS, &err_log);
 	printf("GL_VALIDATE_STATUS: %d \n ",err_log);
 	glGetProgramiv(progObj, GL_LINK_STATUS, &err_log);
@@ -813,7 +620,7 @@
 	GLint loc, i;
 	GLfloat res[16];
 
-	loc = gf_glGetUniformLocation(progObj, name);
+	loc = glGetUniformLocation(progObj, name);
 	if(loc<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("failed to locate uniform. exiting\n"));
 		return;
@@ -830,7 +637,7 @@
 	GLint loc, i;
 	GLfloat res[16];
 
-	loc = gf_glGetAttribLocation(progObj, name);
+	loc = glGetAttribLocation(progObj, name);
 	if (loc<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("failed to locate attribute. exiting\n"));
 		return;
@@ -961,119 +768,80 @@
 }
 #endif
 
-static Bool visual_3d_init_generic_shaders(GF_VisualManager *visual)
+static GF_GLProgInstance *visual_3d_build_program(GF_VisualManager *visual, u32 flags, u32 pix_fmt)
 {
-	u32 i;
-	GLint err_log = -10;
-	const char *shader_file;
+	s32 linked;
+	GF_GLProgInstance *pi;
 
-	GF_Config *cfg = visual->compositor->user->config;
+	GF_SAFEALLOC(pi, GF_GLProgInstance);
+	if (!pi) return NULL;
+	pi->flags = flags;
+	pi->pix_fmt = pix_fmt;
 
-	//FIXME: Clear error log - for Android we will always have an GL_INVALID_VALUE error
 	glGetError();
-
-	/* test if programs exist (by using flags 0)
-	 *  this check was introduced due to losing program objects when switching rasterization modes
-	 *  (hit '3' in runtime to recreate issue)
-	 *  the program objects were not deleted though
-	 */
-	if (visual->glsl_programs[0]) {
-		glGetProgramiv(visual->glsl_programs[0], GL_VALIDATE_STATUS, &err_log);
-		if(err_log==-10) {
-			for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
-				DEL_SHADER(visual->glsl_vertex_shaders[i]);
-			}
-			for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
-				DEL_SHADER(visual->glsl_fragment_shaders[i]);
-				DEL_PROGRAM(visual->glsl_programs[i]);
-			}
-			visual->glsl_has_shaders=0;
-			//Clear error log (if the program is lost we will always have an GL_INVALID_VALUE error)
-			glGetError();
-		}
-	} else {
-		visual->glsl_has_shaders=0;
-		GL_CHECK_ERR;
+	pi->prog = glCreateProgram();
+	if (!pi->prog) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to create program\n"));
+		gf_free(pi);
+		return NULL;
+	}
+	pi->vertex = visual_3d_shader_with_flags(visual->compositor->vertshader , GL_VERTEX_SHADER, flags, 0);
+	if (!pi->vertex) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile vertex shader\n"));
+		DEL_PROGRAM(pi->prog)
+		gf_free(pi);
+		return NULL;
+	}
+	pi->fragment = visual_3d_shader_with_flags(visual->compositor->fragshader , GL_FRAGMENT_SHADER, flags, pix_fmt);
+	if (!pi->fragment) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile fragment shader\n"));
+		DEL_PROGRAM(pi->prog)
+		DEL_SHADER(pi->vertex);
+		gf_free(pi);
+		return NULL;
+	}
+	glAttachShader(pi->prog, pi->vertex);
+	GL_CHECK_ERR();
+	glAttachShader(pi->prog, pi->fragment);
+	GL_CHECK_ERR();
+
+	glLinkProgram(pi->prog);
+	GL_CHECK_ERR();
+
+	glGetProgramiv(pi->prog, GL_LINK_STATUS, &linked);
+	if (!linked) {
+		int i32CharsWritten, i32InfoLogLength;
+		char pszInfoLog[2048];
+		glGetProgramiv(pi->prog, GL_INFO_LOG_LENGTH, &i32InfoLogLength);
+		glGetProgramInfoLog(pi->prog, i32InfoLogLength, &i32CharsWritten, pszInfoLog);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
+		DEL_PROGRAM(pi->prog)
+		DEL_SHADER(pi->vertex);
+		DEL_SHADER(pi->fragment);
+		gf_free(pi);
+		return NULL;
 	}
+	return pi;
+}
 
-	//nothing to do
-	if (visual->glsl_has_shaders) {
+static Bool visual_3d_init_generic_shaders(GF_VisualManager *visual)
+{
+	GF_GLProgInstance *pi;
+	if (gf_list_count(visual->compiled_programs))
 		return GF_TRUE;
-	}
+	if (!gf_file_exists(visual->compositor->vertshader))
+		return GF_FALSE;
+	if (!gf_file_exists(visual->compositor->fragshader))
+		return GF_FALSE;
 
-	GL_CHECK_ERR
-	//Creating Program for the shaders
-	for(i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
-		visual->glsl_programs[i] = glCreateProgram();
-	}
-	visual->glsl_has_shaders = GF_TRUE;
-	GL_CHECK_ERR
-
-	shader_file =(char *) gf_cfg_get_key(cfg, "Compositor", "VertexShader");
-	if (!shader_file) return GF_FALSE;
-
-	for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
-		GL_CHECK_ERR;
-		visual->glsl_vertex_shaders[i] = visual_3d_shader_with_flags(shader_file , GL_VERTEX_SHADER, i);
-		if (!visual->glsl_vertex_shaders[i]) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile vertex shader\n"));
-			return GF_FALSE;
-		}
-	}
-
-	shader_file =(char *) gf_cfg_get_key(cfg, "Compositor", "FragmentShader");
-	if (!shader_file) return GF_FALSE;
-
-	for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
-		GLint linked;
-		u32 vert_id;
-		GL_CHECK_ERR;
-		//discard unused flags combination (ie YUV with no texture)
-		if ( (i& (GF_GL_IS_YUV | GF_GL_IS_ExternalOES)) && ! (i & GF_GL_HAS_TEXTURE)) {
-			DEL_PROGRAM(visual->glsl_programs[i]);
-			visual->glsl_programs[i]=0;
-			visual->glsl_fragment_shaders[i] = 0;
-			continue;
-		}
-
-		visual->glsl_fragment_shaders[i] = visual_3d_shader_with_flags(shader_file , GL_FRAGMENT_SHADER, i);
-		if (!visual->glsl_fragment_shaders[i]) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to compile fragment shader\n"));
-			continue;
-		}
-		GL_CHECK_ERR;
-
-		//compute vertex shader for this fragment: all YUV frag shaders are texture vert shaders
-		vert_id = i;
-		if (i & (GF_GL_IS_YUV | GF_GL_IS_ExternalOES)) {
-			vert_id &= ~(GF_GL_IS_YUV | GF_GL_IS_ExternalOES);
-			vert_id |= GF_GL_HAS_TEXTURE;
-			assert(vert_id<GF_GL_NB_VERT_SHADERS);
-		}
-		glAttachShader(visual->glsl_programs[i], visual->glsl_vertex_shaders[vert_id]);
-		GL_CHECK_ERR;
-
-		glAttachShader(visual->glsl_programs[i], visual->glsl_fragment_shaders[i]);
-		GL_CHECK_ERR;
 
-		glLinkProgram(visual->glsl_programs[i]);
-		GL_CHECK_ERR;
-
-		glGetProgramiv(visual->glsl_programs[i], GL_LINK_STATUS, &linked);
-		if (!linked) {
-			int i32CharsWritten, i32InfoLogLength;
-			char pszInfoLog[2048];
-			glGetProgramiv(visual->glsl_programs[i], GL_INFO_LOG_LENGTH, &i32InfoLogLength);
-			glGetProgramInfoLog(visual->glsl_programs[i], i32InfoLogLength, &i32CharsWritten, pszInfoLog);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, (pszInfoLog));
-		}
-
-		glUseProgram(visual->glsl_programs[i]);
-		GL_CHECK_ERR;
-	}
-
-	/* Set texture planes*/
-	visual_3d_set_tx_planes(visual);
+	pi = visual_3d_build_program(visual, 0, 0);
+	if (!pi) return GF_FALSE;
+
+	glDeleteShader(pi->vertex);
+	glDeleteShader(pi->fragment);
+	glDeleteProgram(pi->prog);
+	gf_free(pi);
 	return GF_TRUE;
 }
 
@@ -1085,7 +853,7 @@
 	if (!visual->compositor->gl_caps.has_shaders)
 		return;
 
-	if (visual->compositor->shader_only_mode) {
+	if (!visual->compositor->shader_mode_disabled) {
 		//If we fail to configure shaders, force 2D mode
 		if (! visual_3d_init_generic_shaders(visual)) {
 			visual->compositor->hybrid_opengl = GF_FALSE;
@@ -1106,9 +874,6 @@
 void visual_3d_reset_graphics(GF_VisualManager *visual)
 {
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
-
-	u32 i;
-
 	if (visual->compositor->visual != visual)
 		return;
 
@@ -1126,15 +891,13 @@
 		visual->autostereo_mesh = NULL;
 	}
 
-	for (i=0; i<GF_GL_NB_VERT_SHADERS; i++) {
-		DEL_SHADER(visual->glsl_vertex_shaders[i]);
-	}
-	for (i=0; i<GF_GL_NB_FRAG_SHADERS; i++) {
-		DEL_SHADER(visual->glsl_fragment_shaders[i]);
-		DEL_PROGRAM(visual->glsl_programs[i]);
+	while (gf_list_count(visual->compiled_programs)) {
+		GF_GLProgInstance *gi = gf_list_pop_back(visual->compiled_programs);
+		DEL_SHADER(gi->vertex);
+		DEL_SHADER(gi->fragment);
+		DEL_PROGRAM(gi->prog);
+		gf_free(gi);
 	}
-	visual->glsl_has_shaders=0;
-
 #endif
 }
 
@@ -1179,12 +942,12 @@
 	u32 i;
 #endif
 
-	loc = gf_glGetUniformLocation(program, name);
+	loc = glGetUniformLocation(program, name);
 	if(loc<0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error (file %s line %d): Invalid matrix name", __FILE__, __LINE__));
 		return;
 	}
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 #ifdef GPAC_FIXED_POINT
 	for (i=0; i<16; i++) _mat[i] = FIX2FLT(mat[i]);
@@ -1192,7 +955,7 @@
 #else
 	glUniformMatrix4fv(loc, 1, GL_FALSE, mat);
 #endif
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 }
 
 #endif
@@ -1262,14 +1025,13 @@
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 	u32 i;
 	GLint loc, loc_vertex_attrib, loc_texcoord_attrib;
-	char szTex[100];
 	Fixed hw, hh;
 	GF_Matrix mx;
 
 
 	glFlush();
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 #ifndef GPAC_USE_GLES2
 	glEnable(GL_TEXTURE_2D);
@@ -1293,14 +1055,14 @@
 #endif
 
 	glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, visual->auto_stereo_width, visual->auto_stereo_height, 0);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 #ifndef GPAC_USE_GLES2
 	glDisable(GL_TEXTURE_2D);
 #endif
 
 	glClear(GL_DEPTH_BUFFER_BIT);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	if (visual->current_view+1<visual->nb_views) return;
 	hw = INT2FIX(visual->width);
@@ -1331,19 +1093,21 @@
 
 	loc_texcoord_attrib = -1;
 	//setup vertex attrib
-	loc_vertex_attrib = gf_glGetAttribLocation(visual->autostereo_glsl_program, "gfVertex");
+	loc_vertex_attrib = glGetAttribLocation(visual->autostereo_glsl_program, "gfVertex");
 	if (loc_vertex_attrib>=0) {
 		glVertexAttribPointer(loc_vertex_attrib, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].pos);
 		glEnableVertexAttribArray(loc_vertex_attrib);
 
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
+
 		//setup texcoord location
-		loc_texcoord_attrib = gf_glGetAttribLocation(visual->autostereo_glsl_program, "gfTextureCoordinates");
+		loc_texcoord_attrib = glGetAttribLocation(visual->autostereo_glsl_program, "gfTextureCoordinates");
 		if (loc_texcoord_attrib>=0) {
+			char szTex[100];
 			glVertexAttribPointer(loc_texcoord_attrib, 2, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), &visual->autostereo_mesh->vertices[0].texcoords);
 			glEnableVertexAttribArray(loc_texcoord_attrib);
 
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 
 			/*bind all our textures*/
 			for (i=0; i<visual->nb_views; i++) {
@@ -1361,15 +1125,15 @@
 				glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 #endif
 
-				GL_CHECK_ERR
+				GL_CHECK_ERR()
 
 				glBindTexture(GL_TEXTURE_2D, visual->gl_textures[i]);
 
-				GL_CHECK_ERR
+				GL_CHECK_ERR()
 
 				glUniform1i(loc, i);
 
-				GL_CHECK_ERR
+				GL_CHECK_ERR()
 			}
 
 			//draw
@@ -1379,27 +1143,27 @@
 			glDrawElements(GL_TRIANGLES, visual->autostereo_mesh->i_count, GL_UNSIGNED_INT, visual->autostereo_mesh->indices);
 #endif
 
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 		}
 	}
 
 
 	if (loc_vertex_attrib>=0) glDisableVertexAttribArray(loc_vertex_attrib);
 	if (loc_texcoord_attrib>=0) glDisableVertexAttribArray(loc_texcoord_attrib);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	glUseProgram(0);
 
 #ifndef GPAC_USE_GLES2
 	/*not sure why this is needed but it prevents a texturing bug on XP on parallels*/
 	glActiveTexture(GL_TEXTURE0);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	glBindTexture(GL_TEXTURE_2D, 0);
 	glDisable(GL_TEXTURE_2D);
 #endif
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
 
 }
@@ -1409,7 +1173,7 @@
 {
 #ifndef GPAC_USE_GLES2
 
-	if (visual->compositor->high_speed) {
+	if (visual->compositor->fast) {
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
 		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
 		glHint(GL_LINE_SMOOTH_HINT, GL_FASTEST);
@@ -1425,10 +1189,10 @@
 #endif
 	}
 
-	if (visual->compositor->antiAlias == GF_ANTIALIAS_FULL) {
+	if (visual->compositor->aa == GF_ANTIALIAS_FULL) {
 		glEnable(GL_LINE_SMOOTH);
 #ifndef GPAC_USE_GLES1X
-		if (visual->compositor->poly_aa)
+		if (visual->compositor->paa)
 			glEnable(GL_POLYGON_SMOOTH);
 		else
 			glDisable(GL_POLYGON_SMOOTH);
@@ -1446,8 +1210,8 @@
 
 void visual_3d_setup(GF_VisualManager *visual)
 {
-
-	if (visual->gl_setup) {
+	//in non-player mode, we might not be the only ones using the gl context !!
+	if (visual->compositor->player && visual->gl_setup) {
 		visual->has_fog = GF_FALSE;
 		glClear(GL_DEPTH_BUFFER_BIT);
 		return;
@@ -1546,7 +1310,7 @@
 	if (bOn) {
 		glEnable(GL_LINE_SMOOTH);
 #ifndef GPAC_USE_GLES1X
-		if (visual->compositor->poly_aa)
+		if (visual->compositor->paa)
 			glEnable(GL_POLYGON_SMOOTH);
 		else
 			glDisable(GL_POLYGON_SMOOTH);
@@ -1699,6 +1463,9 @@
 	u32 i;
 	GF_Matrix inv_mx;
 
+	if (!visual->num_clips)
+		return;
+
 	gf_mx_copy(inv_mx, tr_state->model_matrix);
 	gf_mx_inverse(&inv_mx);
 
@@ -1800,7 +1567,7 @@
 		glEnable(iLight);
 
 		switch (li->type) {
-		//directionnal light
+		//directional light
 		case 0:
 		case 3:
 #if defined(GPAC_USE_GLES1X) && defined(GPAC_FIXED_POINT)
@@ -2015,7 +1782,7 @@
 	vals[2] = visual->fog_color.blue;
 	vals[3] = FIX_ONE;
 	glFogxv(GL_FOG_COLOR, vals);
-	glHint(GL_FOG_HINT, visual->compositor->high_speed ? GL_FASTEST : GL_NICEST);
+	glHint(GL_FOG_HINT, visual->compositor->fast ? GL_FASTEST : GL_NICEST);
 #else
 	Float vals[4];
 	glEnable(GL_FOG);
@@ -2038,7 +1805,7 @@
 	vals[2] = FIX2FLT(visual->fog_color.blue);
 	vals[3] = 1;
 	glFogfv(GL_FOG_COLOR, vals);
-	glHint(GL_FOG_HINT, visual->compositor->high_speed ? GL_FASTEST : GL_NICEST);
+	glHint(GL_FOG_HINT, visual->compositor->fast ? GL_FASTEST : GL_NICEST);
 #endif
 
 #endif
@@ -2077,7 +1844,7 @@
 
 
 	/*if inside or no aabb for the mesh draw vertex array*/
-	if (tr_state->visual->compositor->disable_gl_cull || (tr_state->cull_flag==CULL_INSIDE) || !mesh->aabb_root || !mesh->aabb_root->pos)	{
+	if (!tr_state->visual->compositor->cull || (tr_state->cull_flag==CULL_INSIDE) || !mesh->aabb_root || !mesh->aabb_root->pos)	{
 #if defined(GPAC_USE_GLES1X) || defined(GPAC_USE_GLES2)
 		glDrawElements(prim_type, mesh->i_count, GL_UNSIGNED_SHORT, idx_addr);
 #else
@@ -2191,18 +1958,18 @@
 	GF_VisualManager *visual = tr_state->visual;
 	char szName[100];
 
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+	loc = glGetUniformLocation(visual->glsl_program, "gfNumLights");
 	if (loc>=0)
 		glUniform1i(loc, visual->num_lights);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	/*
 	 * Equivalent to glLightModel(GL_LIGHTMODEL_TWO_SIDE, GL_TRUE);
 	 */
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightTwoSide");
+	loc = glGetUniformLocation(visual->glsl_program, "gfLightTwoSide");
 	if (loc>=0)
 		glUniform1i(loc, 1);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	li = &visual->lights[0];
 
@@ -2229,7 +1996,7 @@
 		}
 
 		sprintf(szName, "%s%d%s", "lights[", i, "].type");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);		//Uniform name lights[i].type
+		loc = glGetUniformLocation(visual->glsl_program, szName);		//Uniform name lights[i].type
 		if (loc>=0) {
 			if (li->type==3) {
 				glUniform1i(loc, 0); //headlight; Set type 0-directional
@@ -2251,7 +2018,7 @@
 		vals[2] = -FIX2FLT(pt.z);
 		vals[3] = 0;
 		sprintf(szName, "%s%d%s", "lights[", i, "].direction");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform4fv(loc, 1, vals); //Set direction
 
@@ -2261,7 +2028,6 @@
 			vals[1] = -FIX2FLT(pt.y);
 			vals[2] = -FIX2FLT(pt.z);
 			vals[3] = 0;
-			pt = li->position;
 		} else {	//we have a spot or point light
 			pt = li->position;
 			gf_mx_apply_vec(&mx, &pt);
@@ -2271,7 +2037,7 @@
 			vals[3] = 1.0;
 		}
 		sprintf(szName, "%s%d%s", "lights[", i, "].position");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform4fv(loc, 1, vals);
 
@@ -2284,7 +2050,7 @@
 		vals[1] = FIX2FLT(pt.y);
 		vals[2] = FIX2FLT(pt.z);
 		sprintf(szName, "%s%d%s", "lights[", i, "].attenuation");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform3fv(loc, 1, vals);
 
@@ -2293,17 +2059,17 @@
 		vals[2] = FIX2FLT(li->color.blue);
 		vals[3] = 0;
 		sprintf(szName, "%s%d%s", "lights[", i, "].color");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform4fv(loc, 1, vals);
 
 		sprintf(szName, "%s%d%s", "lights[", i, "].intensity");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform1f(loc, li->intensity);
 
 		sprintf(szName, "%s%d%s", "lights[", i, "].cutOffAngle");
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0)
 			glUniform1f(loc, li->cutOffAngle);
 
@@ -2314,43 +2080,43 @@
 	vals[1] = FIX2FLT(li->color.green)*intensity;
 	vals[2] = FIX2FLT(li->color.blue)*intensity;
 	vals[3] = 1;
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightDiffuse");
+	loc = glGetUniformLocation(visual->glsl_program, "gfLightDiffuse");
 	if (loc>=0) glUniform4fv(loc, 1, vals);
 
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightSpecular");
+	loc = glGetUniformLocation(visual->glsl_program, "gfLightSpecular");
 	if (loc>=0) glUniform4fv(loc, 1, vals);
 
 	vals[0] = FIX2FLT(li->color.red)*ambientIntensity;
 	vals[1] = FIX2FLT(li->color.green)*ambientIntensity;
 	vals[2] = FIX2FLT(li->color.blue)*ambientIntensity;
 	vals[3] = 1;
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfLightAmbient");
+	loc = glGetUniformLocation(visual->glsl_program, "gfLightAmbient");
 	if (loc>=0) glUniform4fv(loc, 1, vals);
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 }
 
 static void visual_3d_set_fog_shaders(GF_VisualManager *visual)
 {
 	GLint loc;
 	if (visual->has_fog) {
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogEnabled");
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogEnabled");
 		if(loc>=0)
 			glUniform1i(loc, GL_TRUE);
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogColor");
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogColor");
 		if(loc>=0)
 			glUniform3fv(loc, 1, (GLfloat *) &visual->fog_color);
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogDensity");
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogDensity");
 		if(loc>=0)
 			glUniform1f(loc, visual->fog_density );
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogType");
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogType");
 		if(loc>=0)
 			glUniform1i(loc, (GLuint) visual->fog_type );
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfFogVisibility");
+		loc = glGetUniformLocation(visual->glsl_program, "gfFogVisibility");
 		if(loc>=0)
 			glUniform1f(loc, visual->fog_visibility);
 	} else {
@@ -2359,7 +2125,7 @@
 			glUniform1i(loc, GL_FALSE);
 
 	}
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 }
 
 static void visual_3d_set_clippers_shaders(GF_VisualManager *visual, GF_TraverseState *tr_state)
@@ -2378,7 +2144,7 @@
 	gf_mx_copy(eye_mx, tr_state->camera->modelview);
 	gf_mx_add_matrix(&eye_mx, &tr_state->model_matrix);
 
-	loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumClippers");
+	loc = glGetUniformLocation(visual->glsl_program, "gfNumClippers");
 	if (loc>=0)
 		glUniform1i(loc, visual->num_clips);
 
@@ -2400,7 +2166,7 @@
 		}
 
 		sprintf(szName, "%s%d%s", "clipPlane[", i, "]");	//parse plane values
-		loc = gf_glGetUniformLocation(visual->glsl_program, szName);
+		loc = glGetUniformLocation(visual->glsl_program, szName);
 		if (loc>=0) {
 			vals[0] = p.normal.x;
 			vals[1] = p.normal.y;
@@ -2411,6 +2177,28 @@
 	}
 }
 
+GF_GLProgInstance *visual_3d_check_program_exists(GF_VisualManager *root_visual, u32 flags, u32 pix_fmt)
+{
+	u32 i, count;
+	GF_GLProgInstance *prog = NULL;
+	if (root_visual->compositor->shader_mode_disabled)
+		return NULL;
+
+	count = gf_list_count(root_visual->compiled_programs);
+	for (i=0; i<count; i++) {
+		prog = gf_list_get(root_visual->compiled_programs, i);
+		if ((prog->flags==flags) && (prog->pix_fmt==pix_fmt)) break;
+		prog = NULL;
+	}
+
+	if (!prog) {
+		prog = visual_3d_build_program(root_visual, flags, pix_fmt);
+		if (!prog) return NULL;
+		gf_list_add(root_visual->compiled_programs, prog);
+	}
+	return prog;
+}
+
 static void visual_3d_draw_mesh_shader_only(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
 	void *vertex_buffer_address;
@@ -2419,8 +2207,16 @@
 	GLint loc, loc_vertex_array, loc_color_array, loc_normal_array, loc_textcoord_array;
 	u32 flags;
 	u32 num_lights = visual->num_lights;
-	
-	flags = root_visual->glsl_flags;
+	Bool is_debug_bounds = GF_FALSE;
+	GF_GLProgInstance *prog = NULL;
+
+	flags = root_visual->active_glsl_flags;
+
+	if (!mesh) {
+		is_debug_bounds = GF_TRUE;
+		mesh = tr_state->visual->compositor->unit_bbox;
+		flags = 0;
+	}
 
 	if (visual->has_material_2d) {
 		num_lights = 0;
@@ -2439,7 +2235,7 @@
 
 	}
 
-	if (num_lights) {
+	if (num_lights && !is_debug_bounds) {
 		flags |= GF_GL_HAS_LIGHT;
 	} else {
 		flags &= ~GF_GL_HAS_LIGHT;
@@ -2451,18 +2247,21 @@
 		flags &= ~GF_GL_HAS_CLIP;
 	}
 
-	root_visual->glsl_flags = visual->glsl_flags = flags;
+	root_visual->active_glsl_flags = visual->active_glsl_flags = flags;
+
+	prog = visual_3d_check_program_exists(root_visual, flags, root_visual->bound_tx_pix_fmt);
+	if (!prog) return;
 
 	//check if we are using a different program than last time, if so force matrices updates
-	if ((visual->glsl_program != root_visual->glsl_programs[visual->glsl_flags])
-	        || !root_visual->glsl_programs[visual->glsl_flags]) {
+	if (visual->glsl_program != prog->prog) {
 		tr_state->visual->needs_projection_matrix_reload = GF_TRUE;
 	}
 
-	GL_CHECK_ERR
-	visual->glsl_program = root_visual->glsl_programs[visual->glsl_flags];
+	GL_CHECK_ERR()
+	visual->glsl_program = prog->prog;
+
 	glUseProgram(visual->glsl_program);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	if (! visual_3d_bind_buffer(visual->compositor, mesh, &vertex_buffer_address)) {
 		glUseProgram(0);
@@ -2477,12 +2276,12 @@
 	loc_color_array = loc_normal_array = loc_textcoord_array = -1;
 
 	//setup vertext array location (always true)
-	loc_vertex_array = gf_glGetAttribLocation(visual->glsl_program, "gfVertex");
+	loc_vertex_array = glGetAttribLocation(visual->glsl_program, "gfVertex");
 	if (loc_vertex_array<0)
 		return;
 
 	glEnableVertexAttribArray(loc_vertex_array);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 #if defined(GPAC_FIXED_POINT)
 	glVertexAttribPointer(loc_vertex_array, 3, GL_FIXED, GL_TRUE, sizeof(GF_Vertex), vertex_buffer_address);
 #else
@@ -2495,11 +2294,27 @@
 	//setup clippers
 	visual_3d_set_clippers_shaders(visual, tr_state);
 
+	if (is_debug_bounds) {
+		Float cols[4];
+		loc = glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+		cols[0] = 1.0f - FIX2FLT(visual->mat_2d.red);
+		cols[1] = 1.0f - FIX2FLT(visual->mat_2d.green);
+		cols[2] = 1.0f - FIX2FLT(visual->mat_2d.blue);
+		cols[3] = 1.0f;
+		if (loc>=0)
+			glUniform4fv(loc, 1, (GLfloat *) cols);
+		GL_CHECK_ERR()
+
+		loc = glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
+		if (loc>=0)
+			glUniform1i(loc, 1);
+		GL_CHECK_ERR()
+	}
 	/* Material2D does not have any lights, color used is "gfEmissionColor" uniform */
-	if (visual->has_material_2d) {
+	else if (visual->has_material_2d) {
 		//for YUV manually set alpha
 		if (flags & GF_GL_IS_YUV) {
-			loc = gf_glGetUniformLocation(visual->glsl_program, "alpha");
+			loc = glGetUniformLocation(visual->glsl_program, "alpha");
 			if(loc>=0)
 				glUniform1f(loc, FIX2FLT(visual->mat_2d.alpha));
 		}
@@ -2512,29 +2327,29 @@
 			}
 		}
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+		loc = glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
 		if (loc>=0)
 			glUniform4fv(loc, 1, (GLfloat *) & visual->mat_2d);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
+		loc = glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
 		if (loc>=0)
 			glUniform1i(loc, 1);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 
 	} else {
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
+		loc = glGetUniformLocation(visual->glsl_program, "hasMaterial2D");
 		if (loc>=0)
 			glUniform1i(loc, 0);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 
 		//for YUV manually set alpha
 		if (flags & GF_GL_IS_YUV) {
-			loc = gf_glGetUniformLocation(visual->glsl_program, "alpha");
+			loc = glGetUniformLocation(visual->glsl_program, "alpha");
 			if(loc>=0)
 				glUniform1f(loc, 1.0);
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 		}
 	}
 
@@ -2556,16 +2371,16 @@
 #endif
 			switch (i) {
 			case 0:
-				loc = gf_glGetUniformLocation(visual->glsl_program, "gfAmbientColor");
+				loc = glGetUniformLocation(visual->glsl_program, "gfAmbientColor");
 				break;
 			case 1:
-				loc = gf_glGetUniformLocation(visual->glsl_program, "gfDiffuseColor");
+				loc = glGetUniformLocation(visual->glsl_program, "gfDiffuseColor");
 				break;
 			case 2:
-				loc = gf_glGetUniformLocation(visual->glsl_program, "gfSpecularColor");
+				loc = glGetUniformLocation(visual->glsl_program, "gfSpecularColor");
 				break;
 			case 3:
-				loc = gf_glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
+				loc = glGetUniformLocation(visual->glsl_program, "gfEmissionColor");
 				break;
 			}
 
@@ -2573,7 +2388,7 @@
 				glUniform4fv(loc, 1, _rgba);
 		}
 		//TO CHECK:  if this does not work as it is supposed to, try: visual->shininess * 128
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfShininess");
+		loc = glGetUniformLocation(visual->glsl_program, "gfShininess");
 		if (loc>=0)
 			glUniform1f(loc, FIX2FLT(visual->shininess));
 
@@ -2581,8 +2396,8 @@
 	}
 
 	//setup mesh color vertex attribute - only available for some shaders
-	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR)) {
-		loc_color_array = gf_glGetAttribLocation(visual->glsl_program, "gfMeshColor");
+	if (!tr_state->mesh_num_textures && (mesh->flags & MESH_HAS_COLOR) && !is_debug_bounds) {
+		loc_color_array = glGetAttribLocation(visual->glsl_program, "gfMeshColor");
 		if (loc_color_array >= 0) {
 
 			//for now colors are 8bit/comp RGB(A), so used GL_UNSIGNED_BYTE and GL_TRUE for normalizing values
@@ -2595,7 +2410,7 @@
 			}
 			glEnableVertexAttribArray(loc_color_array);
 		}
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	}
 
 	if (flags & GF_GL_HAS_LIGHT) {
@@ -2617,7 +2432,7 @@
 
 		visual_3d_load_matrix_shaders(tr_state->visual->glsl_program, (Fixed *) &normal_mx.m, "gfNormalMatrix");
 
-		loc_normal_array = gf_glGetAttribLocation(visual->glsl_program, "gfNormal");
+		loc_normal_array = glGetAttribLocation(visual->glsl_program, "gfNormal");
 		if (loc_normal_array>=0) {
 #ifdef MESH_USE_FIXED_NORMAL
 			glVertexAttribPointer(loc_normal_array, 3, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex),  ((char *)vertex_buffer_address + MESH_NORMAL_OFFSET) );
@@ -2626,47 +2441,41 @@
 #endif
 			glEnableVertexAttribArray(loc_normal_array);
 		}
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+		loc = glGetUniformLocation(visual->glsl_program, "gfNumLights");
 		if (loc>=0)
 			glUniform1i(loc, num_lights);
 		visual_3d_set_lights_shaders(tr_state);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	}
 
 	//setup mesh normal vertex attribute - only available for some shaders
 	if (tr_state->mesh_num_textures && (mesh->mesh_type==MESH_TRIANGLES) && !(mesh->flags & MESH_NO_TEXTURE)) {
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumTextures");
-		if (loc>=0) {
-			glUniform1i(loc, tr_state->mesh_num_textures);
-		}
-		GL_CHECK_ERR
-
 		if (visual->has_tx_matrix) {
 			//parsing texture matrix
-			loc = gf_glGetUniformLocation(visual->glsl_program, "gfTextureMatrix");
+			loc = glGetUniformLocation(visual->glsl_program, "gfTextureMatrix");
 			if (loc>=0)
 				glUniformMatrix4fv(loc, 1, GL_FALSE, visual->tx_matrix.m);
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 
-			loc = gf_glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
+			loc = glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
 			if (loc>=0) glUniform1i(loc, 1);
 		} else {
-			loc = gf_glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
+			loc = glGetUniformLocation(visual->glsl_program, "hasTextureMatrix");
 			if (loc>=0) glUniform1i(loc, 0);
 		}
 
 		//parsing texture coordinates
-		loc_textcoord_array = gf_glGetAttribLocation(visual->glsl_program, "gfMultiTexCoord");
+		loc_textcoord_array = glGetAttribLocation(visual->glsl_program, "gfMultiTexCoord");
 		if (loc_textcoord_array>=0) {
 			glVertexAttribPointer(loc_textcoord_array, 2, GL_FLOAT, GL_FALSE, sizeof(GF_Vertex), ((char *)vertex_buffer_address + MESH_TEX_OFFSET));
 			glEnableVertexAttribArray(loc_textcoord_array);
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 		}
 
 		if (flags & GF_GL_IS_YUV) {
-			loc = gf_glGetUniformLocation(visual->glsl_program, "yuvPixelFormat");
+			loc = glGetUniformLocation(visual->glsl_program, "yuvPixelFormat");
 			if (loc>=0) {
 				int yuv_mode = 0;
 				switch (visual->yuv_pixelformat_type) {
@@ -2680,7 +2489,7 @@
 			
 				glUniform1i(loc, yuv_mode);
 			}
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 		}
 	}
 
@@ -2688,7 +2497,7 @@
 	if (mesh->mesh_type != MESH_TRIANGLES) {
 		//According to the spec we should pass a 0,0,1 Normal and disable lights. we just disable lights
 		if(flags & GF_GL_HAS_LIGHT) {
-			loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+			loc = glGetUniformLocation(visual->glsl_program, "gfNumLights");
 			if (loc>=0)	glUniform1i(loc, 0);
 
 		}
@@ -2699,8 +2508,8 @@
 #endif
 
 	} else {
-		if (visual->compositor->backcull
-		        && (!tr_state->mesh_is_transparent || (visual->compositor->backcull ==GF_BACK_CULL_ALPHA) )
+		if (visual->compositor->bcull
+		        && (!tr_state->mesh_is_transparent || (visual->compositor->bcull ==GF_BACK_CULL_ALPHA) )
 		        && (mesh->flags & MESH_IS_SOLID)) {
 			glEnable(GL_CULL_FACE);
 			if (tr_state->reverse_backface) {
@@ -2713,7 +2522,7 @@
 		}
 	}
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	//We have a Colour Matrix to be applied
 	if(!tr_state->color_mat.identity) {
@@ -2732,18 +2541,18 @@
 		}
 
 		//the rest of the values form the translation vector
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfTranslationVector");
+		loc = glGetUniformLocation(visual->glsl_program, "gfTranslationVector");
 		if (loc>=0)
 			glUniform4fv(loc, 1, (GLfloat *) &translateV);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 
 		loc = glGetUniformLocation(visual->glsl_program, "hasColorMatrix");
 		if(loc>=0) glUniform1i(loc, 1);
 
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfColorMatrix");
+		loc = glGetUniformLocation(visual->glsl_program, "gfColorMatrix");
 		if (loc>=0)
 			glUniformMatrix4fv(loc, 1, GL_FALSE, toBeParsed.m);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	} else {
 		loc = glGetUniformLocation(visual->glsl_program, "hasColorMatrix");
 		if(loc>=0) glUniform1i(loc, 0);
@@ -2787,41 +2596,38 @@
 
 	visual_3d_do_draw_mesh(tr_state, mesh);
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 	//We drawn, now we Reset
 
 	if (mesh->vbo)
 		glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-	if (mesh->vbo)
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-
 	if (loc_vertex_array>=0) glDisableVertexAttribArray(loc_vertex_array);
 	if (loc_color_array>=0) glDisableVertexAttribArray(loc_color_array);
 	if (loc_normal_array>=0) glDisableVertexAttribArray(loc_normal_array);
 	if (loc_textcoord_array>=0) glDisableVertexAttribArray(loc_textcoord_array);
 
 	//instead of visual_3d_reset_lights(visual);
-	if(visual->compositor->visual->glsl_flags & GF_GL_HAS_LIGHT) {
-		loc = gf_glGetUniformLocation(visual->glsl_program, "gfNumLights");
+	if(root_visual->active_glsl_flags & GF_GL_HAS_LIGHT) {
+		loc = glGetUniformLocation(visual->glsl_program, "gfNumLights");
 		if (loc>=0)	glUniform1i(loc, 0);
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	}
 
 	if (visual->has_clipper_2d) {
 		glDisable(GL_SCISSOR_TEST);
 	}
 
-	visual->has_material_2d = 0;
-	visual->glsl_flags = visual->compositor->visual->glsl_flags;
-	root_visual->glsl_flags &= ~ (GF_GL_IS_ExternalOES | GF_GL_IS_YUV | GF_GL_HAS_COLOR);
+	visual->has_material_2d = GF_FALSE;
+	visual->active_glsl_flags = root_visual->active_glsl_flags;
+	root_visual->active_glsl_flags &= ~ GF_GL_HAS_COLOR;
 	visual->has_material = 0;
 	visual->state_color_on = 0;
 	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
 	tr_state->mesh_is_transparent = 0;
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 	glUseProgram(0);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 }
 
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
@@ -2836,6 +2642,7 @@
 	GF_VisualManager *visual = tr_state->visual;
 	Bool has_col, has_tx, has_norm;
 	void *base_address = NULL;
+	Bool is_debug_bounds = GF_FALSE;
 
 #if defined(GPAC_FIXED_POINT) && !defined(GPAC_USE_GLES1X)
 	Float *color_array = NULL;
@@ -2845,23 +2652,31 @@
 
 #endif
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
+	if (mesh) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
+	}
+
 	//clear error
 	glGetError();
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 #ifdef GPAC_USE_GLES2
 	visual_3d_draw_mesh_shader_only(tr_state, mesh);
 	return;
 #else
 
-#if !defined(GPAC_ANDROID) && !defined(GPAC_IPHONE) && !defined(GPAC_FIXED_POINT)
-	if (visual->compositor->shader_only_mode) {
+#if !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_CONFIG_IOS) && !defined(GPAC_FIXED_POINT)
+	if (!visual->compositor->shader_mode_disabled) {
 		visual_3d_draw_mesh_shader_only(tr_state, mesh);
 		return;
 	}
 #endif
 
+	if (!mesh) {
+		mesh = tr_state->visual->compositor->unit_bbox;
+		is_debug_bounds = GF_TRUE;
+	}
+
 	if (! visual_3d_bind_buffer(compositor, mesh, &base_address)) {
 #if! defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
 		glUseProgram(0);
@@ -2870,24 +2685,28 @@
 	}
 	has_col = has_tx = has_norm = 0;
 
-	//set lights before pushing modelview matrix
-	visual_3d_set_lights(visual);
+	if (!is_debug_bounds) {
+		//set lights before pushing modelview matrix
+		visual_3d_set_lights(visual);
+	}
 
 	visual_3d_update_matrices(tr_state);
 
 	/*enable states*/
-	if (visual->has_fog) visual_3d_enable_fog(visual);
+	if (!is_debug_bounds) {
+		if (visual->has_fog) visual_3d_enable_fog(visual);
 
-	if (visual->state_color_on) glEnable(GL_COLOR_MATERIAL);
-	else glDisable(GL_COLOR_MATERIAL);
+		if (visual->state_color_on) glEnable(GL_COLOR_MATERIAL);
+		else glDisable(GL_COLOR_MATERIAL);
+
+		if (visual->state_blend_on) glEnable(GL_BLEND);
+	}
 
-	if (visual->state_blend_on) glEnable(GL_BLEND);
 
 	//setup scissor
 	visual_3d_set_clipper_scissor(visual, tr_state);
 
-	if (visual->num_clips)
-		visual_3d_set_clippers(visual, tr_state);
+	visual_3d_set_clippers(visual, tr_state);
 
 	glEnableClientState(GL_VERTEX_ARRAY);
 #if defined(GPAC_USE_GLES1X)
@@ -2908,53 +2727,28 @@
 	*/
 	if (visual->has_material_2d) {
 		glDisable(GL_LIGHTING);
-
-#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
-		if (visual->compositor->visual->current_texture_glsl_program) {
-			int loc = glGetUniformLocation(visual->compositor->visual->current_texture_glsl_program, "alpha");
-			if (loc == -1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"alpha\" in YUV shader\n"));
-			} else {
-				glUniform1f(loc, FIX2FLT(visual->mat_2d.alpha) );
-			}
-		} else
-#endif
-		{
-			if (visual->mat_2d.alpha != FIX_ONE) {
-				glEnable(GL_BLEND);
-				visual_3d_enable_antialias(visual, 0);
-			} else {
-				//disable blending only if no texture !
-				if (!tr_state->mesh_num_textures)
-					glDisable(GL_BLEND);
-				visual_3d_enable_antialias(visual, visual->compositor->antiAlias ? 1 : 0);
-			}
+		if (visual->mat_2d.alpha != FIX_ONE) {
+			glEnable(GL_BLEND);
+			visual_3d_enable_antialias(visual, 0);
+		} else {
+			//disable blending only if no texture !
+			if (!tr_state->mesh_num_textures)
+				glDisable(GL_BLEND);
+			visual_3d_enable_antialias(visual, visual->compositor->aa ? 1 : 0);
+		}
 #ifdef GPAC_USE_GLES1X
-			glColor4x( FIX2INT(visual->mat_2d.red * 255), FIX2INT(visual->mat_2d.green * 255), FIX2INT(visual->mat_2d.blue * 255), FIX2INT(visual->mat_2d.alpha * 255));
+		glColor4x( FIX2INT(visual->mat_2d.red * 255), FIX2INT(visual->mat_2d.green * 255), FIX2INT(visual->mat_2d.blue * 255), FIX2INT(visual->mat_2d.alpha * 255));
 #elif defined(GPAC_FIXED_POINT)
-			glColor4f(FIX2FLT(visual->mat_2d.red), FIX2FLT(visual->mat_2d.green), FIX2FLT(visual->mat_2d.blue), FIX2FLT(visual->mat_2d.alpha));
+		glColor4f(FIX2FLT(visual->mat_2d.red), FIX2FLT(visual->mat_2d.green), FIX2FLT(visual->mat_2d.blue), FIX2FLT(visual->mat_2d.alpha));
 #else
-			glColor4f(visual->mat_2d.red, visual->mat_2d.green, visual->mat_2d.blue, visual->mat_2d.alpha);
+		glColor4f(visual->mat_2d.red, visual->mat_2d.green, visual->mat_2d.blue, visual->mat_2d.alpha);
 #endif
-		}
 	}
 
-#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL)
-	else if (visual->compositor->visual->current_texture_glsl_program) {
-		int loc = glGetUniformLocation(visual->compositor->visual->current_texture_glsl_program, "alpha");
-		if (loc == -1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"alpha\" in YUV shader\n"));
-		} else {
-			glUniform1f(loc, 1.0 );
-		}
-	}
-#endif
-
-
 	//setup material color
 	if (visual->has_material) {
 		u32 i;
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 		for (i=0; i<4; i++) {
 			GLenum mode;
 			Fixed *rgba = (Fixed *) & visual->materials[i];
@@ -2990,14 +2784,14 @@
 #else
 			glMaterialfv(GL_FRONT_AND_BACK, mode, _rgba);
 #endif
-			GL_CHECK_ERR
+			GL_CHECK_ERR()
 		}
 #ifdef GPAC_USE_GLES1X
 		glMaterialx(GL_FRONT_AND_BACK, GL_SHININESS, visual->shininess * 128);
 #else
 		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, FIX2FLT(visual->shininess) * 128);
 #endif
-		GL_CHECK_ERR
+		GL_CHECK_ERR()
 	}
 
 	//otherwise setup mesh color
@@ -3154,8 +2948,8 @@
 		glNormalPointer(normal_type, sizeof(GF_Vertex), ((char *)base_address + MESH_NORMAL_OFFSET));
 
 		if (mesh->mesh_type==MESH_TRIANGLES) {
-			if (compositor->backcull
-			        && (!tr_state->mesh_is_transparent || (compositor->backcull ==GF_BACK_CULL_ALPHA) )
+			if (compositor->bcull
+			        && (!tr_state->mesh_is_transparent || (compositor->bcull ==GF_BACK_CULL_ALPHA) )
 			        && (mesh->flags & MESH_IS_SOLID)) {
 				glEnable(GL_CULL_FACE);
 				glFrontFace((mesh->flags & MESH_IS_CW) ? GL_CW : GL_CCW);
@@ -3165,9 +2959,9 @@
 		}
 	}
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 	visual_3d_do_draw_mesh(tr_state, mesh);
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 
 	glDisableClientState(GL_VERTEX_ARRAY);
 	if (has_col) glDisableClientState(GL_COLOR_ARRAY);
@@ -3198,15 +2992,14 @@
 	glDisable(GL_COLOR_MATERIAL);
 
 	//reset all our states
-	if (visual->num_clips)
-		visual_3d_reset_clippers(visual);
-	visual->has_material_2d = 0;
+	visual_3d_reset_clippers(visual);
+	visual->has_material_2d = GF_FALSE;
 	visual->has_material = 0;
 	visual->state_color_on = 0;
 	if (tr_state->mesh_is_transparent) glDisable(GL_BLEND);
 	tr_state->mesh_is_transparent = 0;
 
-	GL_CHECK_ERR
+	GL_CHECK_ERR()
 #endif
 }
 
@@ -3242,7 +3035,15 @@
 
 	visual_3d_set_debug_color(0);
 
-	if (tr_state->visual->compositor->draw_normals==GF_NORMALS_VERTEX) {
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+	//in shader mode force pushing projection and modelview using fixed pipeline API
+	if (!tr_state->visual->compositor->shader_mode_disabled) {
+		tr_state->visual->needs_projection_matrix_reload=GF_TRUE;
+		visual_3d_update_matrices(tr_state);
+	}
+#endif
+
+	if (tr_state->visual->compositor->norms==GF_NORMALS_VERTEX) {
 		IDX_TYPE *idx = mesh->indices;
 		for (i=0; i<mesh->i_count; i+=3) {
 			for (j=0; j<3; j++) {
@@ -3316,19 +3117,19 @@
 		gf_mx_add_translation(&tr_state->model_matrix, c.x, c.y, c.z);
 		gf_mx_add_scale(&tr_state->model_matrix, s.x, s.y, s.z);
 
-		visual_3d_draw_mesh(tr_state, tr_state->visual->compositor->unit_bbox);
+		visual_3d_draw_mesh(tr_state, NULL);
 
 		gf_mx_copy(tr_state->model_matrix, mx);
 	}
 }
 
-void visual_3d_draw_bbox_ex(GF_TraverseState *tr_state, GF_BBox *box, Bool is_debug)
+void visual_3d_draw_bbox(GF_TraverseState *tr_state, GF_BBox *box, Bool is_debug)
 {
 	GF_Matrix mx;
 	SFVec3f c, s;
 
 	if (! is_debug) {
-		visual_3d_set_debug_color(tr_state->visual->compositor->highlight_stroke);
+		visual_3d_set_debug_color(tr_state->visual->compositor->hlline);
 	}
 
 	gf_vec_diff(s, box->max_edge, box->min_edge);
@@ -3340,23 +3141,18 @@
 	gf_mx_add_translation(&tr_state->model_matrix, c.x, c.y, c.z);
 	gf_mx_add_scale(&tr_state->model_matrix, s.x, s.y, s.z);
 
-	visual_3d_draw_mesh(tr_state, tr_state->visual->compositor->unit_bbox);
+	visual_3d_draw_mesh(tr_state, NULL);
 	gf_mx_copy(tr_state->model_matrix, mx);
 }
 
-void visual_3d_draw_bbox(GF_TraverseState *tr_state, GF_BBox *box)
-{
-	visual_3d_draw_bbox_ex(tr_state, box, 0);
-}
-
 static void visual_3d_draw_bounds(GF_TraverseState *tr_state, GF_Mesh *mesh)
 {
 	visual_3d_set_debug_color(0);
 
-	if (mesh->aabb_root && (tr_state->visual->compositor->draw_bvol==GF_BOUNDS_AABB)) {
+	if (mesh->aabb_root && (tr_state->visual->compositor->bvol==GF_BOUNDS_AABB)) {
 		visual_3d_draw_aabb_nodeBounds(tr_state, mesh->aabb_root);
 	} else {
-		visual_3d_draw_bbox_ex(tr_state, &mesh->bounds, 1);
+		visual_3d_draw_bbox(tr_state, &mesh->bounds, GF_TRUE);
 	}
 }
 
@@ -3365,8 +3161,14 @@
 #if !defined(GPAC_USE_GLES2)
 	Bool mesh_drawn = 0;
 #endif
+
+	GL_CHECK_ERR()
+
+	gf_rmt_begin_gl(visual_3d_mesh_paint);
+	glGetError();
+
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Drawing mesh %p\n", mesh));
-	if (tr_state->visual->compositor->wiremode != GF_WIREFRAME_ONLY) {
+	if (tr_state->visual->compositor->wire != GF_WIREFRAME_ONLY) {
 		visual_3d_draw_mesh(tr_state, mesh);
 #if !defined(GPAC_USE_GLES2)
 		mesh_drawn = 1;
@@ -3374,7 +3176,7 @@
 	}
 
 #if !defined(GPAC_USE_GLES2)
-	if (tr_state->visual->compositor->draw_normals) {
+	if (tr_state->visual->compositor->norms) {
 		if (!mesh_drawn) {
 			visual_3d_update_matrices(tr_state);
 			mesh_drawn=1;
@@ -3382,7 +3184,7 @@
 		visual_3d_draw_normals(tr_state, mesh);
 	}
 
-	if ((mesh->mesh_type==MESH_TRIANGLES) && (tr_state->visual->compositor->wiremode != GF_WIREFRAME_NONE)) {
+	if ((mesh->mesh_type==MESH_TRIANGLES) && (tr_state->visual->compositor->wire != GF_WIREFRAME_NONE)) {
 		glDisable(GL_LIGHTING);
 		visual_3d_set_debug_color(0xFFFFFFFF);
 
@@ -3403,10 +3205,13 @@
 
 #endif
 
-	if (tr_state->visual->compositor->draw_bvol)
+	if (tr_state->visual->compositor->bvol)
 		visual_3d_draw_bounds(tr_state, mesh);
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[V3D] Done drawing mesh %p\n", mesh));
+
+	gf_rmt_end_gl();
+	glGetError();
 }
 
 #if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES2)
@@ -3678,14 +3483,11 @@
 #endif
 }
 
+//note that we always use glReadPixel even if the actual rendering target is a texture
+//this is the recommended way by khronos any way
 GF_Err compositor_3d_get_screen_buffer(GF_Compositor *compositor, GF_VideoSurface *fb, u32 depth_dump_mode)
 {
-	/*FIXME*/
 	u32 i;
-#ifndef GPAC_USE_TINYGL
-	char*tmp;
-	u32 hy;
-#endif //GPAC_USE_TINYGL
 
 	fb->width = compositor->display_width;
 	fb->height = compositor->display_height;
@@ -3768,7 +3570,6 @@
 		glReadPixels(0, 0, fb->width, fb->height, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, depth_data);
 
 		if (depth_dump_mode==2) {
-			u32 i;
 			fb->pixel_format = GF_PIXEL_RGBDS;
 
 			/*this corresponds to the RGBDS ordering*/
@@ -3784,7 +3585,6 @@
 			}
 			/*this corresponds to RGBD ordering*/
 		} else if (depth_dump_mode==3) {
-			u32 i;
 			fb->pixel_format = GF_PIXEL_RGBD;
 			for (i=0; i<fb->height*fb->width; i++)
 				fb->video_buffer[i*4+3] = depth_data[i];
@@ -3797,23 +3597,37 @@
 #endif /*GPAC_USE_GLES1X*/
 	} else { /*if (compositor->user && (compositor->user->init_flags & GF_TERM_WINDOW_TRANSPARENT))*/
 		u32 size;
-		fb->pitch_x = 4;
-		fb->pitch_y = 4*compositor->vp_width;
+		fb->pitch_x = 3;
+		if (!compositor->opfmt && compositor->dyn_filter_mode) {
+			fb->pitch_x = 4;
+		} else if (compositor->opfmt==GF_PIXEL_RGBA) {
+			fb->pitch_x = 4;
+		}
+
+		fb->pitch_y = fb->pitch_x * compositor->vp_width;
 		size = fb->pitch_y * fb->height;
 		if (compositor->screen_buffer_alloc_size < size) {
 			compositor->screen_buffer_alloc_size = size;
 			compositor->screen_buffer = gf_realloc(compositor->screen_buffer, compositor->screen_buffer_alloc_size);
+			compositor->line_buffer = gf_realloc(compositor->line_buffer, fb->pitch_y);
+
 		}
 
 		fb->video_buffer = compositor->screen_buffer;
-		fb->pixel_format = GF_PIXEL_RGBA;
 
-		glReadPixels(0, 0, fb->width, fb->height, GL_RGBA, GL_UNSIGNED_BYTE, fb->video_buffer);
+		fb->pixel_format = (fb->pitch_x == 4) ? GF_PIXEL_RGBA : GF_PIXEL_RGB;
+
+		if (compositor->fbo_id) compositor_3d_enable_fbo(compositor, GF_TRUE);
+
+		glReadPixels(0, 0, fb->width, fb->height, (fb->pitch_x == 4) ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE, fb->video_buffer);
+
+		if (compositor->fbo_id) compositor_3d_enable_fbo(compositor, GF_FALSE);
+
 		/*	} else {
 				fb->pitch_x = 3;
 				fb->pitch_y = 3*compositor->vp_width;
 				fb->video_buffer = (char*)gf_malloc(sizeof(char) * fb->pitch_y * fb->height);
-				fb->pixel_format = GF_PIXEL_RGB_24;
+				fb->pixel_format = GF_PIXEL_RGB;
 
 				glReadPixels(compositor->vp_x, compositor->vp_y, fb->width, fb->height, GL_RGB, GL_UNSIGNED_BYTE, fb->video_buffer);
 		*/
@@ -3821,14 +3635,12 @@
 
 #ifndef GPAC_USE_TINYGL
 	/*flip image (openGL always handle image data bottom to top) */
-	tmp = (char*)gf_malloc(sizeof(char)*fb->pitch_y);
-	hy = fb->height/2;
+	u32 hy = fb->height/2;
 	for (i=0; i<hy; i++) {
-		memcpy(tmp, fb->video_buffer+ i*fb->pitch_y, fb->pitch_y);
+		memcpy(compositor->line_buffer, fb->video_buffer+ i*fb->pitch_y, fb->pitch_y);
 		memcpy(fb->video_buffer + i*fb->pitch_y, fb->video_buffer + (fb->height - 1 - i) * fb->pitch_y, fb->pitch_y);
-		memcpy(fb->video_buffer + (fb->height - 1 - i) * fb->pitch_y, tmp, fb->pitch_y);
+		memcpy(fb->video_buffer + (fb->height - 1 - i) * fb->pitch_y, compositor->line_buffer, fb->pitch_y);
 	}
-	gf_free(tmp);
 #endif
 	return GF_OK;
 }
@@ -3851,7 +3663,7 @@
 	if (view_idx>=compositor->visual->nb_views) return GF_BAD_PARAM;
 	fb->width = compositor->visual->auto_stereo_width;
 	fb->height = compositor->visual->auto_stereo_height;
-	fb->pixel_format = GF_PIXEL_RGB_24;
+	fb->pixel_format = GF_PIXEL_RGB;
 	fb->pitch_y = 3*fb->width;
 	fb->video_buffer = gf_malloc(sizeof(char)*3*fb->width*fb->height);
 	if (!fb->video_buffer) return GF_OUT_OF_MEM;
@@ -3887,8 +3699,6 @@
 	Fixed x, y;
 	Float inc, scale;
 	Bool in_strip;
-	Float delta = 0;
-	Bool first_pass = 2;
 	GF_Node *txtrans = NULL;
 
 	if ((visual->compositor->depth_gl_type==GF_SC_DEPTH_GL_POINTS) && visual->compositor->gl_caps.point_sprite) {
@@ -3946,7 +3756,8 @@
 	}
 
 	if (visual->compositor->depth_gl_type==GF_SC_DEPTH_GL_STRIPS) {
-		delta = FIX2FLT(visual->compositor->depth_gl_strips_filter);
+		u32 first_pass;
+		Float delta = FIX2FLT(visual->compositor->depth_gl_strips_filter);
 		if (!delta) first_pass = 2;
 		else first_pass = 1;
 
@@ -3988,10 +3799,12 @@
 				if (first_pass==1) {
 					if ((z1>delta) || (z2>delta))
 					{
-						if (0 && in_strip) {
+#if 0
+						if (in_strip) {
 							glEnd();
 							in_strip = 0;
 						}
+#endif
 						x += FLT2FIX(inc);
 						continue;
 					}
@@ -4094,7 +3907,7 @@
 
 		data = (u8 *) gf_sc_texture_get_data(txh, &pixel_format);
 		if (!data) return;
-		if (pixel_format!=GF_PIXEL_RGB_24_DEPTH) return;
+		if (pixel_format!=GF_PIXEL_RGB_DEPTH) return;
 		data += txh->height*txh->width*3;
 
 		for (h=0; h<txh->height; h++) {
@@ -4119,4 +3932,93 @@
 
 }
 
+
+
+GF_Err compositor_3d_setup_fbo(u32 width, u32 height, u32 *fbo_id, u32 *tx_id, u32 *depth_id)
+{
+#if defined(GPAC_USE_GLES1X)
+	GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to setup FBO object: not supported on OpenGL ES 1.x\n"));
+	return GF_NOT_SUPPORTED;
+#else
+	if (! *tx_id) {
+		glGenTextures(1, tx_id);
+	}
+	glBindTexture(GL_TEXTURE_2D, *tx_id);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+
+	if (! *fbo_id)
+		 glGenFramebuffers(1, fbo_id);
+
+	glBindFramebuffer(GL_FRAMEBUFFER, *fbo_id);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, *tx_id, 0);
+
+	if (! *depth_id)
+		glGenRenderbuffers(1, depth_id);
+
+	glBindRenderbuffer(GL_RENDERBUFFER, *depth_id);
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
+#else
+	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
+#endif
+	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, *depth_id);
+
+   	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+   	switch (status) {
+   	case GL_FRAMEBUFFER_COMPLETE:
+   		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to setup FBO object: FBO status %08x\n", status));
+		return GF_NOT_SUPPORTED;
+   }
+
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	return GF_OK;
+#endif
+
+}
+
+void compositor_3d_delete_fbo(u32 *fbo_id, u32 *fbo_tx_id, u32 *fbo_depth_id, Bool keep_tx_id)
+{
+#ifndef GPAC_USE_GLES1X
+	if (*fbo_id) {
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+		glDeleteFramebuffers(1, fbo_id);
+		*fbo_id = 0;
+	}
+	if (*fbo_depth_id) {
+		glDeleteRenderbuffers(1, fbo_depth_id);
+		*fbo_depth_id = 0;
+	}
+	if (*fbo_tx_id && !keep_tx_id) {
+		glDeleteTextures(1, fbo_tx_id);
+		*fbo_tx_id = 0;
+	}
+#endif
+}
+
+u32 compositor_3d_get_fbo_pixfmt()
+{
+	return GL_TEXTURE_2D;
+}
+
+void compositor_3d_enable_fbo(GF_Compositor *compositor, Bool enable)
+{
+#ifndef GPAC_USE_GLES1X
+	glBindFramebuffer(GL_FRAMEBUFFER, enable ? compositor->fbo_id : 0);
+	if (!enable)
+		glBindTexture(GL_TEXTURE_2D, 0);
+#endif
+
+}
+
+void visual_3d_clean_state(GF_VisualManager *visual)
+{
+	glGetError();
+}
+
 #endif // GPAC_DISABLE_3D

gpac-0.8.0.tar.gz/src/compositor/x3d_geometry.c -> gpac-1.0.0.tar.gz/src/compositor/x3d_geometry.c Changed

@@ -551,9 +551,11 @@
 
 static void ITS_SetIndex(GF_Node *node, GF_Route *route)
 {
-	X_IndexedTriangleSet *its = (X_IndexedTriangleSet*)node;
-	gf_sg_vrml_field_copy(&its->index, &its->set_index, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&its->set_index, GF_SG_VRML_MFINT32);
+	if (node) {
+		X_IndexedTriangleSet *its = (X_IndexedTriangleSet*)node;
+		gf_sg_vrml_field_copy(&its->index, &its->set_index, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&its->set_index, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_indexed_triangle_set(GF_Compositor *compositor, GF_Node *node)
@@ -562,6 +564,13 @@
 	drawable_3d_new(node);
 	gf_node_set_callback_function(node, TraverseIndexedTriangleSet);
 	its->on_set_index = ITS_SetIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ITS_SetIndex(NULL, NULL);
+	}
+#endif
+
 }
 
 
@@ -808,9 +817,11 @@
 
 static void ITSS_SetIndex(GF_Node *node, GF_Route *route)
 {
-	X_IndexedTriangleStripSet *itss = (X_IndexedTriangleStripSet*)node;
-	gf_sg_vrml_field_copy(&itss->index, &itss->set_index, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&itss->set_index, GF_SG_VRML_MFINT32);
+	if (node) {
+		X_IndexedTriangleStripSet *itss = (X_IndexedTriangleStripSet*)node;
+		gf_sg_vrml_field_copy(&itss->index, &itss->set_index, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&itss->set_index, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_indexed_triangle_strip_set(GF_Compositor *compositor, GF_Node *node)
@@ -819,6 +830,12 @@
 	drawable_3d_new(node);
 	gf_node_set_callback_function(node, TraverseIndexedTriangleStripSet);
 	itss->on_set_index = ITSS_SetIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ITSS_SetIndex(NULL, NULL);
+	}
+#endif
 }
 
 
@@ -1037,9 +1054,11 @@
 
 static void ITFS_SetIndex(GF_Node *node, GF_Route *route)
 {
-	X_IndexedTriangleFanSet *itfs = (X_IndexedTriangleFanSet *)node;
-	gf_sg_vrml_field_copy(&itfs->index, &itfs->set_index, GF_SG_VRML_MFINT32);
-	gf_sg_vrml_mf_reset(&itfs->set_index, GF_SG_VRML_MFINT32);
+	if (node) {
+		X_IndexedTriangleFanSet *itfs = (X_IndexedTriangleFanSet *)node;
+		gf_sg_vrml_field_copy(&itfs->index, &itfs->set_index, GF_SG_VRML_MFINT32);
+		gf_sg_vrml_mf_reset(&itfs->set_index, GF_SG_VRML_MFINT32);
+	}
 }
 
 void compositor_init_indexed_triangle_fan_set(GF_Compositor *compositor, GF_Node *node)
@@ -1048,6 +1067,12 @@
 	drawable_3d_new(node);
 	gf_node_set_callback_function(node, TraverseIndexedTriangleFanSet);
 	itfs->on_set_index = ITFS_SetIndex;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ITFS_SetIndex(NULL, NULL);
+	}
+#endif
 }
 
 #endif /*GPAC_DISABLE_3D*/

gpac-0.8.0.tar.gz/src/crypto/g_crypt_openssl.c -> gpac-1.0.0.tar.gz/src/crypto/g_crypt_openssl.c Changed

gpac-0.8.0.tar.gz/src/crypto/g_crypt_tinyaes.c -> gpac-1.0.0.tar.gz/src/crypto/g_crypt_tinyaes.c Changed

gpac-0.8.0.tar.gz/src/crypto/tiny_aes.c -> gpac-1.0.0.tar.gz/src/crypto/tiny_aes.c Changed

gpac-1.0.0.tar.gz/src/evg Added

gpac-1.0.0.tar.gz/src/evg/ftgrays.c Added

@@ -0,0 +1,694 @@
+/***************************************************************************/
+/*                                                                         */
+/*  ftgrays.c                                                              */
+/*                                                                         */
+/*    A new `perfect' anti-aliasing renderer (body).                       */
+/*                                                                         */
+/*  Copyright 2000-2001, 2002 by                                           */
+/*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
+/*                                                                         */
+/*  This file is part of the FreeType project, and may only be used,       */
+/*  modified, and distributed under the terms of the FreeType project      */
+/*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
+/*  this file you indicate that you have read the license and              */
+/*  understand and accept it fully.                                        */
+/*                                                                         */
+/***************************************************************************/
+
+/*************************************************************************/
+/*                                                                       */
+/* This is a new anti-aliasing scan-converter for FreeType 2.  The       */
+/* algorithm used here is _very_ different from the one in the standard  */
+/* `ftraster' module.  Actually, `ftgrays' computes the _exact_          */
+/* coverage of the outline on each pixel cell.                           */
+/*                                                                       */
+/* It is based on ideas that I initially found in Raph Levien's          */
+/* excellent LibArt graphics library (see http://www.levien.com/libart   */
+/* for more information, though the web pages do not tell anything       */
+/* about the renderer; you'll have to dive into the source code to       */
+/* understand how it works).                                             */
+/*                                                                       */
+/* Note, however, that this is a _very_ different implementation         */
+/* compared to Raph's.  Coverage information is stored in a very         */
+/* different way, and I don't use sorted vector paths.  Also, it doesn't */
+/* use floating point values.                                            */
+/*                                                                       */
+/* This renderer has the following advantages:                           */
+/*                                                                       */
+/* - It doesn't need an intermediate bitmap.  Instead, one can supply a  */
+/*   callback function that will be called by the renderer to draw gray  */
+/*   spans on any target surface.  You can thus do direct composition on */
+/*   any kind of bitmap, provided that you give the renderer the right   */
+/*   callback.                                                           */
+/*                                                                       */
+/* - A perfect anti-aliaser, i.e., it computes the _exact_ coverage on   */
+/*   each pixel cell.                                                    */
+/*                                                                       */
+/* - It performs a single pass on the outline (the `standard' FT2        */
+/*   renderer makes two passes).                                         */
+/*                                                                       */
+/* - It can easily be modified to render to _any_ number of gray levels  */
+/*   cheaply.                                                            */
+/*                                                                       */
+/* - For small (< 20) pixel sizes, it is faster than the standard        */
+/*   renderer.                                                           */
+/*                                                                       */
+/*************************************************************************/
+
+
+/*
+	GPAC version modifications:
+		* removed all cubic/quadratic support (present in GPAC path objects)
+		* moved span data memory to dynamic allocation
+		* bypassed Y-sorting of cells by using an array of scanlines: a bit more consuming
+		in memory, but faster cell sorting (X-sorting only)
+		* deferred coverage push for 3D
+*/
+
+#include "rast_soft.h"
+
+
+void gray_record_cell( TRaster *raster )
+{
+	if (( raster->area | raster->cover) && (raster->ey<raster->max_ey)) {
+		long y = raster->ey - raster->min_ey;
+		if (y>=0) {
+			AACell *cell;
+			AAScanline *sl = &raster->scanlines[y];
+
+			if (sl->num >= sl->alloc) {
+				sl->cells = (AACell*)gf_realloc(sl->cells, sizeof(AACell)* (sl->alloc + AA_CELL_STEP_ALLOC));
+				sl->alloc += AA_CELL_STEP_ALLOC;
+			}
+			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;
+		}
+	}
+}
+
+void gray_set_cell( TRaster *raster, 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;
+	}
+}
+
+
+static GFINLINE void evg_translate_point(GF_Matrix2D *mx, EVG_Vector *pt, TPos *x, TPos *y)
+{
+	Fixed _x, _y;
+	_x = pt->x;
+	_y = pt->y;
+	gf_mx2d_apply_coords(mx, &_x, &_y);
+#ifdef GPAC_FIXED_POINT
+	*x = UPSCALE(_x);
+	*y = UPSCALE(_y);
+#else
+	*x = (s32) (_x * ONE_PIXEL);
+	*y = (s32) (_y * ONE_PIXEL);
+#endif
+}
+
+static GFINLINE int gray_move_to( EVG_Vector*  to, EVG_Raster   raster)
+{
+	TPos  x, y;
+	TCoord  ex, ey;
+
+	/* record current cell, if any */
+	gray_record_cell(raster);
+
+	evg_translate_point(raster->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 (ey<0) ey=0;
+	raster->last_ey = SUBPIXELS( ey );
+
+	raster->x = x;
+	raster->y = y;
+	return 0;
+}
+
+/*************************************************************************/
+/*                                                                       */
+/* 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)
+{
+	TCoord  ex1, ex2, fx1, fx2, delta;
+	long    p, first;
+	long dx;
+	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 ) );
+
+	/* trivial case.  Happens often */
+	if ( y1 == y2 ) {
+		gray_set_cell( raster, 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;
+		return;
+	}
+
+	/* ok, we'll have to render a run of adjacent cells on the same */
+	/* scanline...                                                  */
+	p     = ( ONE_PIXEL - fx1 ) * ( y2 - y1 );
+	first = ONE_PIXEL;
+	incr  = 1;
+
+	if ( dx < 0 ) {
+		p     = fx1 * ( y2 - y1 );
+		first = 0;
+		incr  = -1;
+		dx    = -dx;
+	}
+	delta = (TCoord)( p / dx );
+	mod   = (TCoord)( p % dx );
+	if ( mod < 0 ) {
+		delta--;
+		mod += (TCoord)dx;
+	}
+	raster->area  += (TArea)( fx1 + first ) * delta;
+	raster->cover += delta;
+
+	ex1 += incr;
+	gray_set_cell( raster, ex1, ey );
+	y1  += delta;
+
+	if ( ex1 != ex2 ) {
+		int lift, rem;
+		p     = ONE_PIXEL * ( y2 - y1 + delta );
+		lift  = (TCoord)( p / dx );
+		rem   = (TCoord)( p % dx );
+		if ( rem < 0 ) {
+			lift--;
+			rem += (TCoord)dx;
+		}
+		mod -= (int) dx;
+
+		while ( ex1 != ex2 ) {
+			delta = lift;
+			mod  += rem;
+			if ( mod >= 0 ) {
+				mod -= (TCoord)dx;
+				delta++;
+			}
+
+			raster->area  += (TArea)ONE_PIXEL * delta;
+			raster->cover += delta;
+			y1        += delta;
+			ex1       += incr;
+			gray_set_cell( raster, ex1, ey );
+		}
+	}
+	delta      = y2 - y1;
+	raster->area  += (TArea)( fx2 + ONE_PIXEL - first ) * delta;
+	raster->cover += delta;
+}
+
+
+/*************************************************************************/
+/*                                                                       */
+/* Render a given line as a series of scanlines.                         */
+void gray_render_line(TRaster *raster, TPos  to_x, TPos  to_y)
+{
+	TCoord  min, max;
+	TCoord  ey1, ey2, fy1, fy2;
+	TPos    x, x2;
+	long dx, dy;
+	long    p, first;
+	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; */
+	if (ey2<0) ey2=0;
+	fy1 = (TCoord)( raster->y - raster->last_ey );
+	fy2 = (TCoord)( to_y - SUBPIXELS( ey2 ) );
+
+	dx = to_x - raster->x;
+	dy = to_y - raster->y;
+
+	/* perform vertical clipping */
+	min = ey1;
+	max = ey2;
+	if ( ey1 > ey2 ) {
+		min = ey2;
+		max = ey1;
+	}
+	if ( min >= raster->max_ey || max < raster->min_ey ) goto End;
+
+	/* everything is on a single scanline */
+	if ( ey1 == ey2 ) {
+		gray_render_scanline( raster, ey1, raster->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 );
+		TPos    area;
+
+		first = ONE_PIXEL;
+		if ( dy < 0 ) {
+			first = 0;
+			incr  = -1;
+		}
+
+		delta      = (int)( first - fy1 );
+		raster->area  += (TArea)two_fx * delta;
+		raster->cover += delta;
+		ey1       += incr;
+
+		gray_set_cell( raster, ex, ey1 );
+
+		delta = (int)( first + first - ONE_PIXEL );
+		area  = (TArea)two_fx * delta;
+		while ( ey1 != ey2 ) {
+			raster->area  += area;
+			raster->cover += delta;
+			ey1       += incr;
+			gray_set_cell( raster, ex, ey1 );
+		}
+		delta      = (int)( fy2 - ONE_PIXEL + first );
+		raster->area  += (TArea)two_fx * delta;
+		raster->cover += delta;
+		goto End;
+	}
+	/* ok, we have to render several scanlines */
+	p     = ( ONE_PIXEL - fy1 ) * dx;
+	first = ONE_PIXEL;
+	incr  = 1;
+
+	if ( dy < 0 ) {
+		p     = fy1 * dx;
+		first = 0;
+		incr  = -1;
+		dy    = -dy;
+	}
+
+	delta = (int)( p / dy );
+	mod   = (int)( p % dy );
+	if ( mod < 0 ) {
+		delta--;
+		mod += (TCoord)dy;
+	}
+	x = raster->x + delta;
+	gray_render_scanline( raster, ey1, raster->x, fy1, x, (TCoord)first );
+
+	ey1 += incr;
+	gray_set_cell( raster, TRUNC( x ), ey1 );
+
+	if ( ey1 != ey2 ) {
+		p     = ONE_PIXEL * dx;
+		lift  = (int)( p / dy );
+		rem   = (int)( p % dy );
+		if ( rem < 0 ) {
+			lift--;
+			rem += (int)dy;
+		}
+		mod -= (int)dy;
+
+		while ( ey1 != ey2 ) {
+			delta = lift;
+			mod  += rem;
+			if ( mod >= 0 )	{
+				mod -= (int)dy;
+				delta++;
+			}
+
+			x2 = x + delta;
+			gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), x2, (TCoord)first );
+			x = x2;
+
+			ey1 += incr;
+			gray_set_cell( raster, TRUNC( x ), ey1 );
+		}
+	}
+
+	gray_render_scanline( raster, ey1, x, (TCoord)( ONE_PIXEL - first ), to_x, fy2 );
+
+End:
+	raster->x       = to_x;
+	raster->y       = to_y;
+	raster->last_ey = SUBPIXELS( ey2 );
+}
+
+
+
+static int EVG_Outline_Decompose(EVG_Outline *outline, TRaster *user)
+{
+	EVG_Vector   v_start;
+	int   n;         /* index of contour in outline     */
+	int   first;     /* index of first point in contour */
+	TPos _x, _y;
+
+	first = 0;
+	for ( n = 0; n < outline->n_contours; n++ ) {
+		EVG_Vector *point;
+		EVG_Vector *limit;
+		int  last;  /* index of last point in contour */
+		last  = outline->contours[n];
+		limit = outline->points + last;
+		v_start = outline->points[first];
+		point = outline->points + first;
+		gray_move_to(&v_start, user);
+		while ( point < limit ) {
+			point++;
+			evg_translate_point(user->mx, point, &_x, &_y);
+			gray_render_line(user, _x, _y);
+		}
+		/* close the contour with a line segment */
+		evg_translate_point(user->mx, &v_start, &_x, &_y);
+		gray_render_line(user, _x, _y);
+		first = last + 1;
+	}
+	return 0;
+}
+
+
+
+#define SWAP_CELLS( a, b, temp )  {              \
+                                    temp = *(a); \
+                                    *(a) = *(b); \
+                                    *(b) = temp; \
+                                  }
+
+
+/* This is a non-recursive quicksort that directly process our cells     */
+/* array.  It should be faster than calling the stdlib qsort(), and we   */
+/* can even tailor our insertion threshold...                            */
+
+#define QSORT_THRESHOLD  9  /* below this size, a sub-array will be sorted */
+/* through a normal insertion sort             */
+
+void gray_quick_sort( AACell *cells, int    count )
+{
+	AACell *stack[80];  /* should be enough ;-) */
+	AACell **top;        /* top of stack */
+	AACell *base, *limit;
+	AACell temp;
+
+	limit = cells + count;
+	base  = cells;
+	top   = stack;
+
+	for (;;) {
+		int    len = (int)( limit - base );
+		AACell *i, *j;
+		if ( len > QSORT_THRESHOLD ) {
+			AACell *pivot;
+			/* we use base + len/2 as the pivot */
+			pivot = base + len / 2;
+			SWAP_CELLS( base, pivot, temp );
+
+			i = base + 1;
+			j = limit - 1;
+
+			/* now ensure that *i <= *base <= *j */
+			if(j->x < i->x)
+				SWAP_CELLS( i, j, temp );
+
+			if(base->x < i->x)
+				SWAP_CELLS( base, i, temp );
+
+			if(j->x < base->x)
+				SWAP_CELLS( base, j, temp );
+
+			for (;;) {
+				int x = base->x;
+				do i++;
+				while( i->x < x );
+				do j--;
+				while( x < j->x );
+
+				if ( i > j )
+					break;
+
+				SWAP_CELLS( i, j, temp );
+			}
+
+			SWAP_CELLS( base, j, temp );
+
+			/* now, push the largest sub-array */
+			if ( j - base > limit - i ) {
+				top[0] = base;
+				top[1] = j;
+				base   = i;
+			} else {
+				top[0] = i;
+				top[1] = limit;
+				limit  = j;
+			}
+			top += 2;
+		} else {
+			/* the sub-array is small, perform insertion sort */
+			j = base;
+			i = j + 1;
+
+			for ( ; i < limit; j = i, i++ ) {
+				for ( ; j[1].x < j->x; j-- ) {
+					SWAP_CELLS( j + 1, j, temp );
+					if ( j == base )
+						break;
+				}
+			}
+			if ( top > stack ) {
+				top  -= 2;
+				base  = top[0];
+				limit = top[1];
+			} else
+				break;
+		}
+	}
+}
+
+static void gray_hline( TRaster *raster, TCoord  x, TCoord  y, TPos area, int acount, Bool zero_non_zero_rule, u32 idx1, u32 idx2)
+{
+	int        coverage;
+	EVG_Span*   span;
+	int        count;
+
+	x += (TCoord)raster->min_ex;
+	if (x>=raster->max_ex) return;
+	y += (TCoord)raster->min_ey;
+
+	/* compute the coverage line's coverage, depending on the    */
+	/* outline fill rule                                         */
+	/*                                                           */
+	/* the coverage percentage is area/(PIXEL_BITS*PIXEL_BITS*2) */
+	/*                                                           */
+	coverage = (int)( area >> ( PIXEL_BITS * 2 + 1 - 8 ) );
+	/* use range 0..256 */
+	if ( coverage < 0 )
+		coverage = -coverage;
+
+	if (zero_non_zero_rule) {
+		/* normal non-zero winding rule */
+		if ( coverage >= 256 )
+			coverage = 255;
+	} else {
+		coverage &= 511;
+
+		if ( coverage > 256 )
+			coverage = 512 - coverage;
+		else if ( coverage == 256 )
+			coverage = 255;
+	}
+
+	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 )
+	{
+		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->num_gray_spans = 0;
+
+		span = raster->gray_spans;
+	} else {
+		if (count==raster->alloc_gray_spans) {
+			raster->alloc_gray_spans*=2;
+			raster->gray_spans = gf_realloc(raster->gray_spans, sizeof(EVG_Span)*raster->alloc_gray_spans);
+			span = raster->gray_spans + count - 1;
+		}
+		span++;
+	}
+
+	/* add a gray span to the current list */
+	span->x        = (short)x;
+	span->len      = (unsigned short)acount;
+	span->coverage = (unsigned char)coverage;
+	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)
+{
+	TCoord  cover;
+	AACell *start, *cur;
+
+	cur = sl->cells;
+	cover = 0;
+	raster->num_gray_spans = 0;
+
+	while (sl->num) {
+		TCoord  x;
+		TArea   area;
+		start  = cur;
+		x      = start->x;
+		area   = start->area;
+		cover += start->cover;
+		/* accumulate all start cells */
+		while(--sl->num) {
+			++cur ;
+			if (cur->x != start->x )
+				break;
+
+			area  += cur->area;
+			cover += cur->cover;
+		}
+
+		/* 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);
+			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);
+	}
+	raster->render_span((int) (y + raster->min_ey), raster->num_gray_spans, raster->gray_spans, raster->render_span_data );
+}
+
+
+int evg_raster_render(GF_EVGSurface *surf)
+{
+	Bool zero_non_zero_rule;
+	u32 i, size_y;
+	EVG_Raster raster = surf->raster;
+	EVG_Outline*  outline = (EVG_Outline*)&surf->ftoutline;
+
+	/* return immediately if the outline is empty */
+	if ( outline->n_points == 0 || outline->n_contours <= 0 ) 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;
+
+	raster->mx = surf->mx;
+
+	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;
+	}
+
+	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;
+
+	EVG_Outline_Decompose(outline, raster);
+	gray_record_cell( raster );
+
+	/*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;
+		}
+	}
+
+	return 0;
+}
+
+
+
+
+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;
+}
+
+void evg_raster_del(EVG_Raster raster)
+{
+	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);
+	}
+	gf_free(raster->gray_spans);
+
+	gf_free(raster->scanlines);
+	gf_free(raster);
+}
+
+/* END */

gpac-1.0.0.tar.gz/src/evg/rast_soft.h Added

@@ -0,0 +1,524 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer
+ *
+ *  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_EVG_DEV_H_
+#define _GF_EVG_DEV_H_
+
+#include <gpac/evg.h>
+
+/*base stencil stack*/
+#define EVGBASESTENCIL	\
+	u32 type;	\
+	void (*fill_run)(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count);	\
+	GF_Matrix2D pmat;					\
+	GF_Matrix2D smat;					\
+	GF_Rect frame;					\
+	GF_ColorMatrix cmat;
+
+
+
+struct _gf_evg_base_stencil
+{
+	EVGBASESTENCIL
+};
+
+typedef struct __vec2f EVG_Vector;
+
+typedef struct
+{
+	s32 n_contours;
+	s32 n_points;
+	EVG_Vector *points;
+	u8 *tags;
+	s32 *contours;
+	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;
+	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
+
+
+EVG_Raster evg_raster_new();
+void evg_raster_del(EVG_Raster raster);
+int 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);
+
+typedef struct
+{
+	GF_Matrix proj;
+	GF_Matrix modelview;
+	//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;
+	Float min_depth;
+	Float depth_range;
+	Float point_size, line_size;
+	Bool smooth_points;
+	Bool disable_aa, write_depth, early_depth_test, run_write_depth;
+	Bool (*depth_test)(Float depth_buf_value, Float frag_value);
+	Bool mode2d;
+	Bool clip_zero;
+	Float zw_factor, zw_offset;
+	/*internal variables for triangle rasterization*/
+	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;
+	Float pt_radius;
+	Float v1v2_length, v1v3_length, v2v3_length;
+	GF_Vec v1v2, v1v3, v2v3;
+
+	struct _gf_evg_base_stencil yuv_sten;
+
+	u32 *pix_vals;
+} EVG_Surface3DExt;
+
+typedef enum
+{
+	EVG_YUV_NONE=0,
+	EVG_YUV_444,
+	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;
+} EVG_Brush;
+
+/*max number of interpolation points*/
+#define EVGGRADIENTSLOTS		12
+
+/*(2^EVGGRADIENTBITS)-1 colors in gradient. Below 6 bits the gradient is crappy */
+#define EVGGRADIENTBITS		10
+
+
+/*base gradient stencil*/
+#define EVGGRADIENT	\
+		s32	mod;	\
+		u32	precomputed_argb[(1<<EVGGRADIENTBITS)];	\
+		u32	col[EVGGRADIENTSLOTS];		\
+		Fixed pos[EVGGRADIENTSLOTS];	\
+		u32	precomputed_dest[(1<<EVGGRADIENTBITS)];	\
+		u32 yuv_prof; \
+		u8 alpha;		\
+		u8 updated;		\
+
+typedef struct
+{
+	EVGBASESTENCIL
+	EVGGRADIENT
+} EVG_BaseGradient;
+
+/*linear gradient*/
+typedef struct
+{
+	EVGBASESTENCIL
+	EVGGRADIENT
+
+	GF_Point2D start, end;
+	GF_Matrix2D vecmat;
+	s32	curp;
+	Fixed pos_ft;
+} EVG_LinearGradient;
+
+/*radial gradient*/
+typedef struct
+{
+	EVGBASESTENCIL
+	EVGGRADIENT
+
+	GF_Point2D center, focus, radius;
+	/*drawing state vars*/
+	GF_Point2D cur_p, d_f, d_i;
+	Fixed rad;
+} EVG_RadialGradient;
+
+/*texture stencil - should be reworked, is very slow*/
+typedef struct __evg_texture
+{
+	EVGBASESTENCIL
+	u32 width, height, stride, stride_uv, stride_alpha;
+	u32 pixel_format, Bpp;
+	char *pixels;
+	char *pix_u, *pix_v, *pix_a;
+
+	GF_Point2D cur_pt;
+	Fixed cur_y, inc_x, inc_y;
+
+	u32 mod, filter;
+	u32 replace_col;
+	Bool cmat_is_replace;
+
+	u8 alpha;
+	Bool is_yuv;
+
+	Bool owns_texture;
+
+	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);
+
+	gf_evg_texture_callback tx_callback;
+	void *tx_callback_udta;
+	Bool tx_callback_screen_coords;
+} EVG_Texture;
+
+#define GF_TEXTURE_FILTER_DEFAULT	GF_TEXTURE_FILTER_HIGH_SPEED
+
+void evg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count);
+
+#define evg_make_col_wide(_a, _r, _g, _b)\
+	((u64)(_a)) << 48 | ((u64)(_r))<<32 | ((u64)(_g))<<16 | ((u64)(_b))
+
+u64 evg_col_to_wide( u32 col);
+
+void evg_gradient_precompute(EVG_BaseGradient *grad, GF_EVGSurface *surf);
+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);
+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);
+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);
+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);
+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);
+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);
+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);
+
+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);
+
+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_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);
+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);
+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);
+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);
+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_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);
+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);
+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);
+
+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);
+
+
+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_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);
+GF_Err evg_surface_clear_yuv444p_10(GF_EVGSurface *surf, GF_IRect rc, GF_Color col);
+
+
+void evg_grey_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_grey_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_alphagrey_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_alphagrey_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_rgb_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_rgb_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_rgbx_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_rgbx_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_argb_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_argb_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_565_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_565_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_555_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_555_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+void evg_444_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf);
+void evg_444_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf);
+
+#include <limits.h>
+
+#define ErrRaster_MemoryOverflow   -4
+#define ErrRaster_Invalid_Mode     -2
+#define ErrRaster_Invalid_Outline  -1
+
+
+#define GPAC_FIX_BITS		16
+#define PIXEL_BITS  8
+#define PIXEL_BITS_DIFF 8	/*GPAC_FIX_BITS - PIXEL_BITS*/
+
+#define ONE_PIXEL       ( 1L << PIXEL_BITS )
+#define PIXEL_MASK      ( -1L << PIXEL_BITS )
+#define TRUNC( x )      ( (TCoord)((x) >> PIXEL_BITS) )
+#define SUBPIXELS( x )  ( (TPos)(x) << PIXEL_BITS )
+#define FLOOR( x )      ( (x) & -ONE_PIXEL )
+#define CEILING( x )    ( ( (x) + ONE_PIXEL - 1 ) & -ONE_PIXEL )
+#define ROUND( x )      ( ( (x) + ONE_PIXEL / 2 ) & -ONE_PIXEL )
+#define UPSCALE( x )    ( (x) >> ( PIXEL_BITS_DIFF) )
+#define DOWNSCALE( x )  ( (x) << ( PIXEL_BITS_DIFF) )
+
+
+/*************************************************************************/
+/*                                                                       */
+/*   TYPE DEFINITIONS                                                    */
+/*                                                                       */
+
+/* don't change the following types to FT_Int or FT_Pos, since we might */
+/* need to define them to "float" or "double" when experimenting with   */
+/* new algorithms                                                       */
+
+typedef int   TCoord;   /* integer scanline/pixel coordinate */
+typedef long  TPos;     /* sub-pixel coordinate              */
+
+/* determine the type used to store cell areas.  This normally takes at */
+/* least PIXEL_BYTES*2 + 1.  On 16-bit systems, we need to use `long'   */
+/* instead of `int', otherwise bad things happen                        */
+
+/* approximately determine the size of integers using an ANSI-C header */
+#if UINT_MAX == 0xFFFFU
+typedef long  TArea;
+#else
+typedef int  TArea;
+#endif
+
+
+/* maximal number of gray spans in a call to the span callback */
+#define FT_MAX_GRAY_SPANS  64
+
+#define AA_CELL_STEP_ALLOC	8
+
+typedef struct  TCell_
+{
+	TCoord  x;
+	int     cover;
+	TArea   area;
+	u32 idx1, idx2;
+} AACell;
+
+typedef struct
+{
+	TCoord  x;
+	u32 color;
+	int cover;
+	Float depth;
+	Float write_depth;
+	u32 idx1, idx2;
+} PatchPixel;
+
+typedef struct
+{
+	//current cells in sweep
+	AACell *cells;
+	int alloc, num;
+
+	/*list of candidates for border pixels (visible edges), flushed at end of shape
+	 this ensures that a pixel is draw once and only once
+	*/
+	PatchPixel *pixels;
+	u32 palloc, pnum;
+} AAScanline;
+
+
+typedef struct  TRaster_
+{
+	AAScanline *scanlines;
+	u32 max_lines;
+	TPos min_ex, max_ex, min_ey, max_ey;
+	TCoord ex, ey;
+	TPos x,  y, last_ey;
+	TArea area;
+	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;
+
+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.0.tar.gz/src/evg/raster3d.c Added

@@ -0,0 +1,1480 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre
+*			Copyright (c) Telecom ParisTech 2019
+*					All rights reserved
+*
+*  This file is part of GPAC / software 3D rasterizer module
+*
+*  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 "rast_soft.h"
+
+
+
+#if defined(WIN32) && !defined(__GNUC__)
+# include <intrin.h>
+# define GPAC_HAS_SSE2
+#else
+# ifdef __SSE2__
+#  include <emmintrin.h>
+#  define GPAC_HAS_SSE2
+# endif
+#endif
+
+#ifdef GPAC_HAS_SSE2
+
+static Float float_clamp(Float val, Float minval, Float maxval)
+{
+    _mm_store_ss( &val, _mm_min_ss( _mm_max_ss(_mm_set_ss(val),_mm_set_ss(minval)), _mm_set_ss(maxval) ) );
+    return val;
+}
+#else
+
+#define float_clamp(_val, _minval, _maxval)\
+	(_val<_minval) ? _minval : (_val>_maxval) ? _maxval : _val;
+
+#endif
+
+
+
+static GFINLINE Bool evg3d_persp_divide(GF_Vec4 *pt)
+{
+	//perspective divide
+	if (!pt->q) return GF_FALSE;
+	pt->q = gf_divfix(FIX_ONE, pt->q);
+	pt->x = gf_mulfix(pt->x, pt->q);
+	pt->y = gf_mulfix(pt->y, pt->q);
+	pt->z = gf_mulfix(pt->z, pt->q);
+	return GF_TRUE;
+}
+
+static GFINLINE void evg_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->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;
+	//idem but flip Y
+	pt->y = (FIX_ONE - (pt->y + FIX_ONE)/2) * surf->ext3d->vp_h + surf->ext3d->vp_y;
+	/*compute depth*/
+	if (!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;
+
+#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 int gray3d_move_to(EVG_Raster raster, TPos x, TPos y)
+{
+	TCoord  ex, ey;
+
+	/* record current cell, if any */
+	gray_record_cell(raster);
+
+	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 (ey<0) ey=0;
+	raster->last_ey = SUBPIXELS( ey );
+
+	raster->x = x;
+	raster->y = y;
+	return 0;
+}
+
+GF_Err evg_raster_render_path_3d(GF_EVGSurface *surf)
+{
+	EVG_Vector   v_start;
+	int   n;         /* index of contour in outline     */
+	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;
+	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;
+
+
+	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->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;
+
+	dir.x = dir.y = 0;
+	dir.z = -FIX_ONE;
+
+	first = 0;
+	for ( n = 0; n < outline->n_contours; n++ ) {
+		GF_Vec4 pt;
+		EVG_Vector *point;
+		EVG_Vector *limit;
+		int  last;  /* index of last point in contour */
+		last  = outline->contours[n];
+		limit = outline->points + last;
+		v_start = outline->points[first];
+		point = outline->points + first;
+
+		pt.x = v_start.x;
+		pt.y = v_start.y;
+		pt.z = 0;
+		pt.q = 1;
+		gf_mx_apply_vec_4x4(&surf->mx3d, &pt);
+		if (!evg3d_persp_divide(&pt)) {
+			continue;
+		}
+		evg_ndc_to_raster(surf, &pt, &_sx, &_sy);
+		gray3d_move_to(raster, _sx, _sy);
+		while ( point < limit ) {
+			point++;
+
+			pt.x = point->x;
+			pt.y = point->y;
+			pt.z = 0;
+			pt.q = 1;
+			gf_mx_apply_vec_4x4(&surf->mx3d, &pt);
+			if (!evg3d_persp_divide(&pt)) {
+				break;
+			}
+			evg_ndc_to_raster(surf, &pt, &_x, &_y);
+			gray_render_line(raster, _x, _y);
+		}
+		gray_render_line(raster, _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;
+}
+
+
+Bool evg3d_get_fragment(GF_EVGSurface *surf, GF_EVGFragmentParam *frag_param, 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 0
+	frag_param->color.x = float_clamp(frag_param->color.x, 0.0, 1.0);
+	frag_param->color.y = float_clamp(frag_param->color.y, 0.0, 1.0);
+	frag_param->color.z = float_clamp(frag_param->color.z, 0.0, 1.0);
+	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);
+	} 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 (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);
+			}
+		} 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);
+			}
+		}
+	} 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);
+			}
+		} else {
+			if (frag_param->frag_valid==GF_EVG_FRAG_YUV) {
+				surf->fill_col = gf_evg_ayuv_to_argb(surf, surf->fill_col);
+			}
+		}
+	}
+	return GF_TRUE;
+}
+
+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)
+{
+	u32 i;
+	PatchPixel *pp;
+	for (i=0; i<sl->pnum; i++) {
+		if (sl->pixels[i].x>x) break;
+		if (sl->pixels[i].x<x) continue;
+		sl->pixels[i].color = col;
+		sl->pixels[i].cover = coverage;
+		sl->pixels[i].depth = depth;
+		sl->pixels[i].write_depth = write_depth;
+		sl->pixels[i].idx1 = idx1;
+		sl->pixels[i].idx2 = idx2;
+		return;
+	}
+	if (coverage==0xFF) return;
+
+	if (sl->pnum == sl->palloc) {
+		sl->palloc += AA_CELL_STEP_ALLOC;
+		sl->pixels = gf_realloc(sl->pixels, sizeof(PatchPixel) * sl->palloc);
+	}
+	if (i==sl->pnum) {
+		pp = &sl->pixels[sl->pnum];
+	} else {
+		memmove(&sl->pixels[i+1], &sl->pixels[i], sizeof(PatchPixel)*(sl->pnum - i));
+		pp = &sl->pixels[i];
+	}
+	sl->pnum++;
+	pp->color = col;
+	pp->cover = coverage;
+	pp->x = x;
+	pp->depth = depth;
+	pp->write_depth = write_depth;
+	pp->idx1 = idx1;
+	pp->idx2 = idx2;
+}
+
+static PatchPixel *get_patch_pixel(AAScanline *sl, s32 x)
+{
+	u32 i;
+	for (i=0; i<sl->pnum; i++) {
+		if (sl->pixels[i].x>x) break;
+		if (sl->pixels[i].x<x) continue;
+		return &sl->pixels[i];
+	}
+	return NULL;
+}
+
+
+static void remove_patch_pixel(AAScanline *sl, s32 x)
+{
+	u32 i;
+	for (i=0; i<sl->pnum; i++) {
+		if (sl->pixels[i].x>x) break;
+		if (sl->pixels[i].x<x) continue;
+		if (i+1<sl->pnum)
+			memmove(&sl->pixels[i], &sl->pixels[i+1], sizeof(PatchPixel)*(sl->pnum-i-1));
+		sl->pnum--;
+		return;
+	}
+}
+
+void EVG3D_SpanFunc(int y, int count, EVG_Span *spans, void *user)
+{
+	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];
+	Float *depth_line = s3d->depth_buffer ? &s3d->depth_buffer[y*surf->width] : NULL;
+	Float depth_buf_val;
+
+	pix.z=0;
+	pix.q=1;
+
+	for (i=0; i<count; i++) {
+		u8 coverage = spans[i].coverage;
+		u32 j, len = spans[i].len;
+		s32 sx = spans[i].x;
+		for (j=0; j<len; j++) {
+
+
+	Bool transparent=GF_FALSE;
+	Float depth, bc1, bc2, bc3;
+	Bool full_cover=GF_TRUE;
+	Bool edge_merge=GF_FALSE;
+	s32 x = sx + j;
+	PatchPixel *prev_partial = NULL;
+
+	/*no AA, force full opacity and test pixel/line below*/
+	if (s3d->disable_aa)
+		coverage = 0xFF;
+	else if (!s3d->mode2d)
+		prev_partial = get_patch_pixel(sl, x);
+
+	pix.x = (Float)x + 0.5f;
+	pix.y = (Float)y + 0.5f;
+
+	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 *=dx;
+			dy *=dy;
+			if (dx+dy > s3d->pt_radius) {
+				spans[i].coverage=0;
+				continue;
+			}
+		}
+		depth = s3d->s_v1.z;
+
+		bc1 = bc2 = bc3 = 0;
+		if (coverage!=0xFF) {
+			full_cover = GF_FALSE;
+		}
+	} else if (s3d->prim_type==GF_EVG_LINES) {
+		GF_Vec pt;
+
+		gf_vec_diff(pt, pix, s3d->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;
+
+		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;
+
+		/* 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 ((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;
+					}
+				}
+//				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;
+		}
+		depth = s3d->s_v1.z * bc1 + s3d->s_v2.z * bc2 + s3d->s_v3.z * bc3;
+	}
+
+	//clip by depth
+	if ((depth<s3d->min_depth) || (depth>s3d->max_depth)) {
+		spans[i].coverage=0;
+		continue;
+	}
+
+	depth_buf_val = depth_line ? depth_line[x] : s3d->max_depth;
+	if (prev_partial) {
+		if ((spans[i].idx1==prev_partial->idx1)
+			|| (spans[i].idx1==prev_partial->idx2)
+			|| (spans[i].idx2==prev_partial->idx1)
+			|| (spans[i].idx2==prev_partial->idx2)
+		) {
+			depth = prev_partial->depth;
+			edge_merge = GF_TRUE;
+		} else {
+			edge_merge = GF_FALSE;
+			if (!s3d->depth_test(prev_partial->write_depth, depth_buf_val))
+				depth_buf_val = prev_partial->write_depth;
+		}
+	}
+
+
+	//do depth test except for edges
+	if (! edge_merge && s3d->early_depth_test) {
+		if (! s3d->depth_test(depth_buf_val, depth)) {
+			spans[i].coverage=0;
+			continue;
+		}
+	}
+
+	frag_param->screen_x = pix.x;
+	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;
+	/*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;
+
+	frag_param->persp_denum = frag_param->pbc1 + frag_param->pbc2 + frag_param->pbc3;
+
+	if (!evg3d_get_fragment(surf, frag_param, &transparent)) {
+		spans[i].coverage=0;
+		continue;
+	}
+	if (!s3d->early_depth_test) {
+		if (! s3d->depth_test(depth_buf_val, frag_param->depth)) {
+			spans[i].coverage=0;
+			continue;
+		}
+	}
+	//we overwrite a partial
+	if (prev_partial) {
+		if (edge_merge) {
+			u32 ncov = coverage;
+
+			ncov += prev_partial->cover;
+			if (!s3d->depth_test(depth_buf_val, depth)) {
+				remove_patch_pixel(sl, prev_partial->x);
+				spans[i].coverage=0;
+				continue;
+			}
+			if (ncov>=0xFF) {
+				if (prev_partial->cover==0xFF) {
+					spans[i].coverage=0;
+					continue;
+				}
+				remove_patch_pixel(sl, prev_partial->x);
+				full_cover = GF_TRUE;
+				coverage = 0xFF;
+			} else {
+				prev_partial->cover = ncov;
+				prev_partial->color = surf->fill_col;
+				spans[i].coverage=0;
+				continue;
+			}
+		}
+		else if (s3d->depth_test(prev_partial->write_depth, depth)) {
+			prev_partial->write_depth = depth;
+		}
+	}
+
+	//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);
+		spans[i].coverage=0;
+		continue;
+	}
+	//full opacity, write
+	else {
+		if (surf->fill_single) {
+			if (transparent) {
+				surf->fill_single_a(y, x, coverage, surf->fill_col, surf);
+			} else {
+				surf->fill_single(y, x, surf->fill_col, surf);
+			}
+		} else {
+			spans[i].coverage = 0xFF;
+			s3d->pix_vals[x] = surf->fill_col;
+		}
+	}
+
+	//write depth
+	if (s3d->run_write_depth)
+		depth_line[x] = frag_param->depth;
+
+
+		}	//end span.len loop
+	} //end spans count loop
+
+	if (!surf->fill_single) {
+		surf->gray_spans(y, count, spans, surf);
+	}
+}
+
+static GFINLINE Bool precompute_tri(EVG_Surface3DExt *s3d, EVGFragCallback *frag_ckck, 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
+)
+{
+	/*completely outside viewport*/
+	if ((_x1<xmin) && (_x2<xmin) && (_x3<xmin))
+		return GF_FALSE;
+	if ((_y1<ymin) && (_y2<ymin) && (_y3<ymin))
+		return GF_FALSE;
+	if ((_x1>=xmax) && (_x2>=xmax) && (_x3>=xmax))
+		return GF_FALSE;
+	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;
+
+
+	//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;
+
+	return GF_TRUE;
+}
+
+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)
+{
+	u32 i, li, size_y, nb_comp_1, idx_inc;
+	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_EVGVertexParam vparam;
+	int hpw=0;
+	int hlw=0;
+	if (!surf->ext3d->frag_shader) return GF_BAD_PARAM;
+
+	raster->render_span  = (EVG_Raster_Span_Func) EVG3D_SpanFunc;
+	raster->render_span_data = &frag_ckck;
+
+	/* 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;
+
+	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;
+	}
+	for (li=0; li<size_y; li++) {
+		raster->scanlines[li].pnum = 0;
+	}
+	first_patch = 0xFFFFFFFF;
+	last_patch = 0;
+
+	gf_mx_copy(projModeView, s3d->proj);
+	gf_mx_add_matrix_4x4(&projModeView, &s3d->modelview);
+
+	switch (prim_type) {
+	case GF_EVG_LINE_STRIP:
+		is_strip_fan = 1;
+	case GF_EVG_LINES:
+		idx_inc = 2;
+		hlw = (int) (s3d->line_size*ONE_PIXEL/2);
+		prim_type = GF_EVG_LINES;
+		break;
+	case GF_EVG_TRIANGLES:
+		idx_inc = 3;
+		break;
+	case GF_EVG_TRIANGLE_STRIP:
+		is_strip_fan = 1;
+		idx_inc = 3;
+		prim_type = GF_EVG_TRIANGLES;
+		break;
+	case GF_EVG_POLYGON:
+	case GF_EVG_TRIANGLE_FAN:
+		is_strip_fan = 2;
+		idx_inc = 3;
+		prim_type = GF_EVG_TRIANGLES;
+		break;
+	case GF_EVG_QUADS:
+		idx_inc = 4;
+		glob_quad_done = GF_FALSE;
+		break;
+	case GF_EVG_QUAD_STRIP:
+		idx_inc = 4;
+		glob_quad_done = GF_FALSE;
+		is_strip_fan = 1;
+		prim_type = GF_EVG_QUADS;
+		break;
+	default:
+		idx_inc = 1;
+		hpw = (int) (s3d->point_size*ONE_PIXEL/2);
+		s3d->pt_radius = (Float) (s3d->point_size*s3d->point_size) / 4;
+
+		break;
+	}
+	if (!is_strip_fan && (nb_idx % idx_inc))
+		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;
+
+	xmin = raster->min_ex * ONE_PIXEL;
+	xmax = raster->max_ex * ONE_PIXEL;
+	ymin = raster->min_ey * ONE_PIXEL;
+	ymax = raster->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;
+	/*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, s_pt4, prev_s_pt2;
+	u32 idx1=0, idx2=0, idx3=0, idx4=0;
+	u32 vidx1=0, vidx2=0, vidx3=0, vidx4=0, prev_vidx2=0;
+
+	memset(&vparam, 0, sizeof(GF_EVGVertexParam));
+	vparam.ptype = prim_type;
+
+	nb_comp_1 = nb_comp-1;
+	for (i=0; i<nb_idx; i += idx_inc) {
+		Bool quad_done = glob_quad_done;
+		GF_Vec4 *vx = &vparam.in_vertex;
+
+		if (s3d->vert_shader) {
+			vparam.prim_index = prim_index;
+		}
+		prim_index++;
+		
+#define GETVEC(_name, _idx)\
+		vx->x = vertices[_idx];\
+		vx->y = vertices[_idx+1];\
+		if (_idx+nb_comp_1>=nb_vertices) return GF_BAD_PARAM;\
+		vx->z = (nb_comp>2) ? vertices[_idx+2] : 0.0f;\
+		vx->q = 1.0;\
+		if (s3d->vert_shader) {\
+			s3d->vert_shader(s3d->vert_shader_udta, &vparam); \
+			s_##_name = vparam.out_vertex;\
+		} else {\
+			s_##_name.x = vx->x;\
+			s_##_name.y = vx->y;\
+			s_##_name.z = vx->z;\
+			s_##_name.q = 1;\
+			gf_mx_apply_vec_4x4(&projModeView, &s_##_name);\
+		}\
+		if (!evg3d_persp_divide(&s_##_name)) continue;\
+
+		/*get vertice, apply transform and perspective divide and translate to raster*/
+		if (is_strip_fan && i) {
+			idx_inc=1;
+			if (prim_type==GF_EVG_LINES) {
+				_x1 = _x2;
+				_y1 = _y2;
+				s_pt1 = s_pt2;
+				vidx1 = vidx2;
+				vidx2 = indices[i];
+				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);
+			}
+			//triangle strip
+			else if (is_strip_fan==1) {
+				/*triangle strip*/
+				if (prim_type==GF_EVG_TRIANGLES) {
+					/*swap v2 to v1 and v3 to v2*/
+					_x1 = _x2;
+					_y1 = _y2;
+					s_pt1 = s_pt2;
+					vidx1 = vidx2;
+
+					_x2 = _x3;
+					_y2 = _y3;
+					s_pt2 = s_pt3;
+					vidx2 = vidx3;
+
+					vidx3 = indices[i];
+					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);
+				}
+				//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
+				else {
+					_x1 = _prev_x2;
+					_y1 = _prev_y2;
+					s_pt1 = prev_s_pt2;
+					vidx1 = prev_vidx2;
+
+					vidx4 = indices[i];
+					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);
+				}
+			}
+			//triangle fan
+			else {
+				//keep center and move 3rd vertex as second
+				_x2 = _x3;
+				_y2 = _y3;
+				s_pt2 = s_pt3;
+				vidx2 = vidx3;
+
+				vidx3 = indices[i];
+				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);
+			}
+		} else {
+			vidx1 = indices[i];
+			idx1 = vidx1 * nb_comp;
+			vparam.vertex_idx = vidx1;
+			vparam.vertex_idx_in_prim = 0;
+			GETVEC(pt1, idx1)
+			evg3d_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);
+				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);
+					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);
+					}
+				}
+			}
+		}
+#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;
+
+
+		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))
+				continue;
+
+			//check backcull
+			if (s3d->is_ccw) {
+				if (s3d->area<0) {
+					if (s3d->backface_cull)
+						continue;
+				}
+			} else {
+				if (s3d->area>0) {
+					if (s3d->backface_cull)
+						continue;
+				}
+			}
+		} else {
+			s3d->s_v1 = s_pt1;
+			frag_ckck.frag_param.idx1 = vidx1;
+			if (prim_type==GF_EVG_LINES) {
+				GF_Vec lv;
+				s3d->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;
+			}
+		}
+		frag_ckck.frag_param.prim_index = prim_index-1;
+
+		if (prim_type==GF_EVG_POINTS) {
+			raster->idx1 = raster->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);
+			//and close
+			gray_render_line(raster, _x1-hpw, _y1-hpw);
+			gray_record_cell( raster );
+		} 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);
+			//and close
+			gray_render_line(raster, _x1+hlw, _y1+hlw);
+			gray_record_cell( raster );
+		} 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);
+
+			//and close
+			raster->idx1 = idx3;
+			raster->idx2 = idx1;
+			gray_render_line(raster, _x1, _y1);
+			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 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);
+
+			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;
+				_prev_y2 = _y2;
+				prev_s_pt2 = s_pt2;
+				prev_vidx2 = vidx2;
+			}
+			quad_done = GF_TRUE;
+			_x2 = _x3;
+			_y2 = _y3;
+			_x3 = _x4;
+			_y3 = _y4;
+			s_pt2 = s_pt3;
+			s_pt3 = s_pt4;
+			vidx2 = vidx3;
+			vidx3 = vidx4;
+			s3d->s_v1 = s3d->s_v2;
+			s3d->s_v2 = s3d->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];
+		Float *depth_line = &surf->ext3d->depth_buffer[li];
+		for (i=0; i<sl->pnum; i++) {
+			PatchPixel *pi = &sl->pixels[i];
+
+			if (pi->cover == 0xFF) continue;
+			if (!surf->ext3d->depth_test(pi->write_depth, pi->depth)) continue;
+
+			if (surf->fill_single) {
+				surf->fill_single_a(li, pi->x, pi->cover, pi->color, surf);
+			} else {
+				span.coverage = pi->cover;
+				span.x = pi->x;
+				surf->gray_spans(li, 1, &span, surf);
+			}
+			if (surf->ext3d->run_write_depth)
+				depth_line[pi->x] = pi->depth;
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err evg_raster_render3d_path(GF_EVGSurface *surf, GF_Path *path, Float z)
+{
+
+	EVG_Vector   v_start;
+	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;
+	EVG_Outline *outline;
+	GF_Matrix projModeView;
+	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;
+
+	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;
+
+	/* 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;
+	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;
+	}
+
+	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;
+
+	xmin = raster->min_ex * ONE_PIXEL;
+	xmax = raster->max_ex * ONE_PIXEL;
+	ymin = raster->min_ey * ONE_PIXEL;
+	ymax = raster->max_ey * ONE_PIXEL;
+
+	//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;
+
+	/*get bounds, and compute interpolation from (top-left, top-right, bottom-right) vertices*/
+	gf_path_get_bounds(path, &rc);
+	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 + rc.width; s_pt3.y = rc.y - rc.height ; s_pt3.z = z; s_pt3.q = 1;
+
+	gf_mx_apply_vec_4x4(&projModeView, &s_pt1);
+	evg3d_persp_divide(&s_pt1);
+	evg3d_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);
+	gf_mx_apply_vec_4x4(&projModeView, &s_pt3);
+	evg3d_persp_divide(&s_pt3);
+	evg3d_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))
+		return GF_OK;
+
+	s3d->mode2d = GF_TRUE;
+	first = 0;
+	for ( n = 0; n < outline->n_contours; n++ ) {
+		GF_Vec4 pt;
+		EVG_Vector *point;
+		EVG_Vector *limit;
+		int  last;  /* index of last point in contour */
+		last  = outline->contours[n];
+		limit = outline->points + last;
+		v_start = outline->points[first];
+		point = outline->points + first;
+
+		pt.x = v_start.x;
+		pt.y = v_start.y;
+		pt.z = z;
+		pt.q = 1;
+		gf_mx_apply_vec_4x4(&projModeView, &pt);
+		if (!evg3d_persp_divide(&pt)) {
+			continue;
+		}
+		evg3d_ndc_to_raster(surf, &pt, &_sx, &_sy);
+		gray3d_move_to(raster, _sx, _sy);
+		while ( point < limit ) {
+			point++;
+
+			pt.x = point->x;
+			pt.y = point->y;
+			pt.z = z;
+			pt.q = 1;
+			gf_mx_apply_vec_4x4(&projModeView, &pt);
+			if (!evg3d_persp_divide(&pt)) {
+				break;
+			}
+			evg3d_ndc_to_raster(surf, &pt, &_x, &_y);
+			gray_render_line(raster, _x, _y);
+		}
+		gray_render_line(raster, _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;
+
+}
+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 (!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
+GF_Err gf_evg_surface_clear_depth(GF_EVGSurface *surf, Float depth)
+{
+	u32 i, lsize;
+	Float *depths;
+	u8 *depth_p;
+	if (!surf->ext3d) return GF_BAD_PARAM;
+
+	depths = surf->ext3d->depth_buffer;
+	if (!depths) return GF_OK; //GF_BAD_PARAM;
+	//copy first line
+	for (i=0; i<surf->width; i++) {
+		depths[i] = depth;
+	}
+	//copy first line
+	depth_p = (u8 *) surf->ext3d->depth_buffer;
+	lsize = sizeof(Float) * surf->width;
+	for (i=1; i<surf->height; i++) {
+		u8 *depth_l = depth_p + i*lsize;
+		memcpy(depth_l, depth_p, lsize);
+	}
+	return GF_OK;
+}
+
+
+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;
+	return GF_OK;
+}
+
+static Bool depth_test_never(Float depth_buf_value, Float frag_value)
+{
+	return GF_FALSE;
+}
+static Bool depth_test_always(Float depth_buf_value, Float frag_value)
+{
+	return GF_TRUE;
+}
+static Bool depth_test_less(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value<depth_buf_value) return GF_TRUE;
+	return GF_FALSE;
+}
+static Bool depth_test_less_equal(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value<=depth_buf_value) return GF_TRUE;
+	return GF_FALSE;
+}
+static Bool depth_test_equal(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value==depth_buf_value) return GF_TRUE;
+	return GF_FALSE;
+}
+static Bool depth_test_greater(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value>depth_buf_value) return GF_TRUE;
+	return GF_FALSE;
+}
+static Bool depth_test_greater_equal(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value>=depth_buf_value) return GF_TRUE;
+	return GF_FALSE;
+}
+static Bool depth_test_not_equal(Float depth_buf_value, Float frag_value)
+{
+	if (frag_value==depth_buf_value) return GF_FALSE;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+GF_Err gf_evg_set_depth_test(GF_EVGSurface *surf, GF_EVGDepthTest mode)
+{
+	if (!surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->write_depth = GF_TRUE;
+	switch (mode) {
+	case GF_EVGDEPTH_NEVER:
+		surf->ext3d->depth_test = depth_test_never;
+		return GF_OK;
+	case GF_EVGDEPTH_ALWAYS:
+		surf->ext3d->depth_test = depth_test_always;
+		return GF_OK;
+	case GF_EVGDEPTH_EQUAL:
+		surf->ext3d->depth_test = depth_test_equal;
+		return GF_OK;
+	case GF_EVGDEPTH_NEQUAL:
+		surf->ext3d->depth_test = depth_test_not_equal;
+		return GF_OK;
+	case GF_EVGDEPTH_LESS:
+		surf->ext3d->depth_test = depth_test_less;
+		return GF_OK;
+	case GF_EVGDEPTH_LESS_EQUAL:
+		surf->ext3d->depth_test = depth_test_less_equal;
+		return GF_OK;
+	case GF_EVGDEPTH_GREATER:
+		surf->ext3d->depth_test = depth_test_greater;
+		return GF_OK;
+	case GF_EVGDEPTH_GREATER_EQUAL:
+		surf->ext3d->depth_test = depth_test_greater_equal;
+		return GF_OK;
+	case GF_EVGDEPTH_DISABLE:
+		surf->ext3d->depth_test = depth_test_always;
+		surf->ext3d->write_depth = GF_FALSE;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+
+}
+
+GF_Err evg_3d_update_depth_range(GF_EVGSurface *surf)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->depth_range = surf->ext3d->max_depth - surf->ext3d->min_depth;
+	if (surf->ext3d->clip_zero) {
+		surf->ext3d->zw_factor = surf->ext3d->depth_range;
+		surf->ext3d->zw_offset = surf->ext3d->min_depth;
+	} else {
+		surf->ext3d->zw_factor = surf->ext3d->depth_range / 2;
+		surf->ext3d->zw_offset = (surf->ext3d->min_depth+surf->ext3d->max_depth)/2;
+
+	}
+	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)
+{
+	EVG_Surface3DExt *ext3d;
+	GF_SAFEALLOC(ext3d, EVG_Surface3DExt);
+	if (!ext3d) return NULL;
+	gf_mx_init(ext3d->proj);
+	gf_mx_init(ext3d->modelview);
+	ext3d->backface_cull = GF_TRUE;
+	ext3d->is_ccw = GF_TRUE;
+	ext3d->min_depth = 0;
+	ext3d->max_depth = FIX_ONE;
+	ext3d->depth_range = FIX_ONE;
+	ext3d->point_size = FIX_ONE;
+	ext3d->line_size = FIX_ONE;
+	ext3d->clip_zero = GF_FALSE;
+	ext3d->disable_aa = GF_FALSE;
+	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)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->frag_shader = shader;
+	surf->ext3d->frag_shader_udta = shader_udta;
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_disable_early_depth(GF_EVGSurface *surf, Bool disable)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->early_depth_test = !disable;
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_set_vertex_shader(GF_EVGSurface *surf, gf_evg_vertex_shader shader, void *shader_udta)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->vert_shader = shader;
+	surf->ext3d->vert_shader_udta = shader_udta;
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_set_ccw(GF_EVGSurface *surf, Bool is_ccw)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->is_ccw = is_ccw;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_backcull(GF_EVGSurface *surf, Bool backcull)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->backface_cull = backcull;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_antialias(GF_EVGSurface *surf, Bool antialias)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->disable_aa = antialias ? GF_FALSE : GF_TRUE;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_min_depth(GF_EVGSurface *surf, Float min_depth)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->min_depth = min_depth;
+	evg_3d_update_depth_range(surf);
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_max_depth(GF_EVGSurface *surf, Float max_depth)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->max_depth = max_depth;
+	evg_3d_update_depth_range(surf);
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_set_clip_zero(GF_EVGSurface *surf, Bool clip_zero)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->clip_zero = clip_zero;
+	evg_3d_update_depth_range(surf);
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_set_point_size(GF_EVGSurface *surf, Float size)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->point_size = size;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_line_size(GF_EVGSurface *surf, Float size)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->line_size = size;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_point_smooth(GF_EVGSurface *surf, Bool smooth)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->smooth_points = smooth;
+	return GF_OK;
+}
+
+GF_Err gf_evg_surface_write_depth(GF_EVGSurface *surf, Bool do_write)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->write_depth = do_write;
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_depth_buffer(GF_EVGSurface *surf, Float *depth)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	surf->ext3d->depth_buffer = depth;
+	return GF_OK;
+}

gpac-1.0.0.tar.gz/src/evg/raster_565.c Added

@@ -0,0 +1,662 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer
+ *
+ *  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 "rast_soft.h"
+
+
+/*
+	FIXME / WARNING - this code only works for little endian platfoms
+		not seen any big endian platform using RGB565/RGB555 output
+*/
+
+
+static GFINLINE s32
+mul255(s32 a, s32 b)
+{
+	return ((a + 1) * b) >> 8;
+}
+
+
+/*
+			RGB 565 part
+*/
+
+static void write_565(u8 *dst, u8 r, u8 g, u8 b)
+{
+	r>>=3;
+	g>>=2;
+	b>>=3;
+
+	dst[0] = r;
+	dst[0] <<= 3;
+	dst[0] |= ((g >> 3) & 0x7);
+	dst[1] = (g & 0x7);
+	dst[1] <<= 5;
+	dst[1] |= b;
+}
+
+static void overmask_565(u32 src, u8 *dst, u32 alpha)
+{
+	u32 resr, resg, resb;
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src >> 0) & 0xff;
+
+	s32 dstr = (dst[0] >> 3) & 0x1f;
+	s32 dstg = (dst[0]) & 0x7;
+	dstg <<= 3;
+	dstg |= (dst[1]>>3) & 0x7;
+	s32 dstb = (dst[1]) & 0x1f;
+
+	dstr<<=3;
+	dstg<<=2;
+	dstb<<=3;
+
+	srca = mul255(srca, alpha);
+	resr = mul255(srca, srcr - dstr) + dstr;
+	resg = mul255(srca, srcg - dstg) + dstg;
+	resb = mul255(srca, srcb - dstb) + dstb;
+	write_565(dst, resr, resg, resb);
+}
+
+void overmask_565_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
+{
+	u32 resr, resg, resb;
+	u8 srca = (src >> 24) & 0xff;
+	u8 srcr = (src >> 16) & 0xff;
+	u8 srcg = (src >> 8) & 0xff;
+	u8 srcb = (src >> 0) & 0xff;
+
+	while (count) {
+		s32 dstr = (dst[0] >> 3) & 0x1f;
+		s32 dstg = (dst[0]) & 0x7;
+		dstg <<= 3;
+		dstg |= (dst[1]>>3) & 0x7;
+		s32 dstb = (dst[1]) & 0x1f;
+
+		dstr<<=3;
+		dstg<<=2;
+		dstb<<=3;
+
+		resr = mul255(srca, srcr - dstr) + dstr;
+		resg = mul255(srca, srcg - dstg) + dstg;
+		resb = mul255(srca, srcb - dstb) + dstb;
+		write_565(dst, resr, resg, resb);
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+
+void evg_565_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 r = GF_COL_R(col);
+	u8 g = GF_COL_G(col);
+	u8 b = GF_COL_B(col);
+	write_565(dst, r, g, b);
+}
+
+void evg_565_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_565(col, dst, coverage);
+}
+
+
+void evg_565_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	u8 r, g, b;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	register s32 i;
+	u32 len;
+	s32 x;
+
+	col_no_a = col&0x00FFFFFF;
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	for (i=0; i<count; i++) {
+		x = spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			fin = (a<<24) | (col_no_a);
+			overmask_565_const_run(fin, dst+x, surf->pitch_x, len);
+		} else {
+			while (len--) {
+				write_565(dst+x, r, g, b);
+				x+=surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_565_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	register u32 a, fin, col_no_a;
+	register s32 i;
+
+	a = (col>>24)&0xFF;
+	col_no_a = col&0x00FFFFFF;
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | col_no_a;
+				overmask_565_const_run(fin, dst + x * surf->pitch_x, surf->pitch_x, 1);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | col_no_a;
+			overmask_565_const_run(fin, dst + spans[i].x * surf->pitch_x, surf->pitch_x, spans[i].len);
+		}
+	}
+}
+
+
+void evg_565_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	register s32 i;
+
+	for (i=0; i<count; i++) {
+		register u8 spanalpha, col_a;
+		register s32 x;
+		register u32 len;
+		register u32 *col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				u32 _col = *col;
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_565(_col, dst+x, spanalpha);
+				} else {
+					write_565(dst+x, GF_COL_R(_col), GF_COL_G(_col), GF_COL_B(_col));
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_565(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	register u32 x, y, w, h, sx, sy;
+	register u8 r, g, b;
+	u8 *data_o;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	/*convert to 565*/
+	r = GF_COL_R(col);
+	g = GF_COL_R(col);
+	b = GF_COL_R(col);
+
+	data_o = NULL;
+	for (y=0; y<h; y++) {
+		u8 *data = (u8 *) surf->pixels + (sy+y) * surf->pitch_y + surf->pitch_x*sx;
+		if (!y) {
+			data_o = data;
+			for (x=0; x<w; x++)  {
+				write_565(data, r, g, b);
+				data += surf->pitch_x;
+			}
+		} else {
+			memcpy(data, data_o, w*surf->pitch_x);
+		}
+	}
+	return GF_OK;
+}
+
+
+
+/*
+			RGB 555 part
+*/
+
+static void write_555(u8 *dst, u8 r, u8 g, u8 b)
+{
+	r>>=3;
+	g>>=3;
+	b>>=3;
+
+	dst[0] = r;
+	dst[0] <<= 2;
+	dst[0] |= ((g >> 3) & 0x3);
+	dst[1] = (g & 0x7);
+	dst[1] <<= 5;
+	dst[1] |= b;
+}
+
+static void overmask_555(u32 src, u8 *dst, u32 alpha)
+{
+	u32 resr, resg, resb;
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src >> 0) & 0xff;
+
+	s32 dstr = (dst[0] >> 2) & 0x1f;
+	s32 dstg = (dst[0] ) & 0x3;
+	dstg <<= 3;
+	dstg |= (dst[1]>>5 ) & 0x7;
+	s32 dstb = (dst[1] ) & 0x1f;
+	dstr<<=3;
+	dstg<<=3;
+	dstb<<=3;
+
+	srca = mul255(srca, alpha);
+	resr = mul255(srca, srcr - dstr) + dstr;
+	resg = mul255(srca, srcg - dstg) + dstg;
+	resb = mul255(srca, srcb - dstb) + dstb;
+	write_555(dst, resr, resg, resb);
+}
+
+static void overmask_555_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
+{
+	u32 resr, resg, resb;
+	u8 srca = (src >> 24) & 0xff;
+	u8 srcr = (src >> 16) & 0xff;
+	u8 srcg = (src >> 8) & 0xff;
+	u8 srcb = (src >> 0) & 0xff;
+
+	while (count) {
+		s32 dstr = (dst[0] >> 2) & 0x1f;
+		s32 dstg = (dst[0] ) & 0x3;
+		dstg <<= 3;
+		dstg |= (dst[1]>>5 ) & 0x7;
+		s32 dstb = (dst[1] ) & 0x1f;
+		dstr<<=3;
+		dstg<<=3;
+		dstb<<=3;
+
+		resr = mul255(srca, srcr - dstr) + dstr;
+		resg = mul255(srca, srcg - dstg) + dstg;
+		resb = mul255(srca, srcb - dstb) + dstb;
+		write_555(dst, resr, resg, resb);
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+
+void evg_555_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 r = GF_COL_R(col);
+	u8 g = GF_COL_G(col);
+	u8 b = GF_COL_B(col);
+	write_555(dst, r, g, b);
+}
+
+void evg_555_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_555(col, dst, coverage);
+}
+
+void evg_555_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 r, g, b;
+	s32 i, x;
+	u32 len;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	col_no_a = col&0x00FFFFFF;
+	for (i=0; i<count; i++) {
+		x = spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			fin = (a<<24) | col_no_a;
+			overmask_555_const_run(fin, dst+x, surf->pitch_x, len);
+		} else {
+			while (len--) {
+				write_555(dst+x, r, g, b);
+				x+=surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_555_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	s32 i;
+
+	a = (col>>24)&0xFF;
+	col_no_a = col & 0x00FFFFFF;
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | col_no_a;
+				overmask_555_const_run(fin, dst + x*surf->pitch_x, surf->pitch_x, 1);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | col_no_a;
+			overmask_555_const_run(fin, dst + spans[i].x*surf->pitch_x, surf->pitch_x, spans[i].len);
+		}
+	}
+}
+
+
+void evg_555_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				u32 _col = *col;
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_555(*col, dst+x, spanalpha);
+				} else {
+					write_555(dst+x, GF_COL_R(_col), GF_COL_G(_col), GF_COL_B(_col) );
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_555(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u32 x, y, w, h, sx, sy;
+	u8 r, g, b;
+	u8 *data_o;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	data_o = NULL;
+	for (y=0; y<h; y++) {
+		u8 *data = surf->pixels + (sy+y) * surf->pitch_y + surf->pitch_x*sx;
+		if (!y) {
+			data_o = data;
+			for (x=0; x<w; x++)  {
+				write_555(data, r, g, b);
+				data += surf->pitch_x;
+			}
+		} else {
+			memcpy(data, data_o, w*surf->pitch_x);
+		}
+	}
+	return GF_OK;
+}
+
+
+/*
+			RGB 444 part
+*/
+
+static void write_444(u8 *dst, u8 r, u8 g, u8 b)
+{
+	dst[0] = r >> 4;
+	dst[1] = g >> 4;
+	dst[1]<<=4;
+	dst[1] |= b >> 4;
+}
+
+static void overmask_444(u8 *dst, u32 src, u32 alpha)
+{
+	u32 resr, resg, resb;
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src >> 0) & 0xff;
+
+	s32 dstr = (dst[0] & 0x0f) << 4;
+	s32 dstg = ((dst[1] >> 4) & 0x0f) << 4;
+	s32 dstb = (dst[1] & 0x0f) << 4;
+
+	srca = mul255(srca, alpha);
+	resr = mul255(srca, srcr - dstr) + dstr;
+	resg = mul255(srca, srcg - dstg) + dstg;
+	resb = mul255(srca, srcb - dstb) + dstb;
+	write_444(dst, resr, resg, resb);
+}
+
+static void overmask_444_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count)
+{
+	u32 resr, resg, resb;
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src >> 0) & 0xff;
+
+	while (count) {
+		s32 dstr = dst[0] & 0x0f;
+		s32 dstg = (dst[1]>>4) & 0x0f;
+		s32 dstb = (dst[1]) & 0x0f;
+
+		dstr<<=4;
+		dstg<<=4;
+		dstb<<=4;
+
+		resr = mul255(srca, srcr - dstr) + dstr;
+		resg = mul255(srca, srcg - dstg) + dstg;
+		resb = mul255(srca, srcb - dstb) + dstb;
+		write_444(dst, resr, resg, resb);
+
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+
+void evg_444_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 r = GF_COL_R(col);
+	u8 g = GF_COL_G(col);
+	u8 b = GF_COL_B(col);
+	write_444(dst, r, g, b);
+}
+
+void evg_444_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_444(dst, col, coverage);
+}
+
+void evg_444_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u8 r, g, b;
+	s32 i, x;
+	u32 len;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	col_no_a = col&0x00FFFFFF;
+	for (i=0; i<count; i++) {
+		x = spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			fin = (a<<24) | col_no_a;
+			overmask_444_const_run(fin, dst+x, surf->pitch_x, len);
+		} else {
+			while (len--) {
+				write_444(dst+x, r, g, b);
+				x+=surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_444_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	s32 i;
+
+	a = (col>>24)&0xFF;
+	col_no_a = col & 0x00FFFFFF;
+
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | col_no_a;
+				overmask_444_const_run(fin, dst + x*surf->pitch_x, surf->pitch_x, 1);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | col_no_a;
+			overmask_444_const_run(fin, dst + spans[i].x*surf->pitch_x, surf->pitch_x, spans[i].len);
+		}
+	}
+}
+
+
+void evg_444_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				u32 _col = *col;
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_444(dst+x, _col, spanalpha);
+				} else {
+					write_444(dst+x, GF_COL_R(_col), GF_COL_G(_col), GF_COL_B(_col) );
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_444(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u32 x, y, w, h, sx, sy;
+	u8 r, g, b;
+	u8 *data_o;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	data_o = NULL;
+	for (y=0; y<h; y++) {
+		u8 *data = surf->pixels + (sy+y) * surf->pitch_y + surf->pitch_x*sx;
+		if (!y) {
+			data_o = data;
+			for (x=0; x<w; x++)  {
+				write_444(data, r, g, b);
+				data += surf->pitch_x;
+			}
+		} else {
+			memcpy(data, data_o, w * surf->pitch_x);
+		}
+	}
+	return GF_OK;
+}
+

gpac-1.0.0.tar.gz/src/evg/raster_argb.c Added

@@ -0,0 +1,758 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer
+ *
+ *  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 "rast_soft.h"
+
+
+static GFINLINE s32
+mul255(s32 a, s32 b)
+{
+	return ((a+1) * b) >> 8;
+}
+
+
+/*
+		32 bit ARGB/BGRA/RGBA
+*/
+
+u32 do_composite_mode(GF_EVGCompositeMode comp_mode, s32 *srca, s32 *dsta)
+{
+	switch (comp_mode) {
+	case GF_EVG_SRC_ATOP:
+		if (*srca && *dsta) {}
+		else if (*dsta) { *srca = 0; }
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_SRC_IN:
+		if (*srca && *dsta) {}
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_SRC_OUT:
+		if (*srca && !*dsta) {}
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_DST_ATOP:
+		if (*srca && *dsta) { *srca = 0;}
+		else if (*srca) { *dsta = 0; }
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_DST_IN:
+		if (*srca && *dsta) { *srca = 0; }
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_DST_OUT:
+		if (!*srca && *dsta) {*srca = 0;}
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_DST_OVER:
+		if (*dsta) {*srca = 0;}
+		else { *dsta = *srca = 0; }
+		break;
+	case GF_EVG_LIGHTER:
+		return 1;
+	case GF_EVG_COPY:
+		*dsta = 0;
+		break;
+	case GF_EVG_XOR:
+		return 2;
+	case GF_EVG_SRC_OVER:
+		return 0;
+	}
+	return 0;
+}
+
+GFINLINE static void overmask_argb(u32 src, u8 *dst, u32 alpha, GF_EVGSurface *surf)
+{
+	u32 cmode;
+	s32 srca = GF_COL_A(src);
+	s32 srcr = GF_COL_R(src);
+	s32 srcg = GF_COL_G(src);
+	s32 srcb = GF_COL_B(src);
+	s32 dsta = dst[surf->idx_a];
+
+	srca = mul255(srca, alpha);
+
+	cmode = do_composite_mode(surf->comp_mode, &srca, &dsta);
+	if (cmode==1) {
+		u8 dstr = dst[surf->idx_r];
+		u8 dstg = dst[surf->idx_g];
+		u8 dstb = dst[surf->idx_b];
+//		dsta += srca;
+//		if (srca>0xFF) srca = 0xFF;
+		dstr += srcr;
+		if (dstr>0xFF) dstr = 0xFF;
+		dstg += srcg;
+		if (dstg>0xFF) dstg = 0xFF;
+		dstb += srcb;
+		if (dstb>0xFF) dstb = 0xFF;
+		dst[surf->idx_a] = (u8) srca;
+		dst[surf->idx_r] = (u8) dstr;
+		dst[surf->idx_g] = (u8) dstg;
+		dst[surf->idx_b] = (u8) dstb;
+		return;
+	}
+	if (cmode==2) {
+		u8 dstr = dst[surf->idx_r];
+		u8 dstg = dst[surf->idx_g];
+		u8 dstb = dst[surf->idx_b];
+		dst[surf->idx_a] = (u8) srca;
+		dst[surf->idx_r] = (u8) (dstr^srcr);
+		dst[surf->idx_g] = (u8) (dstg^srcg);
+		dst[surf->idx_b] = (u8) (dstb^srcb);
+		return;
+	}
+
+	/*special case for RGBA:
+		if dst alpha is 0, consider the surface is empty and copy pixel
+		if source alpha is 0xFF erase the entire pixel
+	*/
+	if (dsta && (srca!=0xFF) ) {
+		s32 final_a;
+		s32 dstr = dst[surf->idx_r];
+		s32 dstg = dst[surf->idx_g];
+		s32 dstb = dst[surf->idx_b];
+
+		//do the maths , so that the result of the blend follows the same DST = SRC*apha + DST(1-alpha)
+		//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
+		//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
+		final_a = dsta + srca - mul255(dsta, srca);
+		if (final_a) {
+			s32 res;
+			dst[surf->idx_a] = final_a;
+			res = (srcr*srca + dstr*(dsta-srca)) / final_a;
+			if (res<0) res=0;
+			dst[surf->idx_r] = (u8) (res);
+			res = (srcg*srca + dstg*(dsta-srca)) / final_a;
+			if (res<0) res=0;
+			dst[surf->idx_g] = (u8) (res);
+			res = (srcb*srca + dstb*(dsta-srca)) / final_a;
+			if (res<0) res=0;
+			dst[surf->idx_b] = (u8) (res);
+		}
+	} else {
+		dst[surf->idx_a] = (u8) srca;
+		dst[surf->idx_r] = (u8) srcr;
+		dst[surf->idx_g] = (u8) srcg;
+		dst[surf->idx_b] = (u8) srcb;
+	}
+}
+
+GFINLINE static void overmask_argb_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count, GF_EVGSurface *surf)
+{
+	u8 const_srca = GF_COL_A(src);
+	s32 srcr = GF_COL_R(src);
+	s32 srcg = GF_COL_G(src);
+	s32 srcb = GF_COL_B(src);
+
+	while (count) {
+		s32 srca = const_srca;
+		s32 dsta = dst[surf->idx_a];
+
+		do_composite_mode(surf->comp_mode, &srca, &dsta);
+
+		/*special case for RGBA:
+			if dst alpha is 0, consider the surface is empty and copy pixel
+			if source alpha is 0xFF erase the entire pixel
+		*/
+		if ((dsta != 0) && (srca != 0xFF)) {
+			s32 final_a;
+			s32 dstr = dst[surf->idx_r];
+			s32 dstg = dst[surf->idx_g];
+			s32 dstb = dst[surf->idx_b];
+
+			//do the maths , so that the result of the blend follows the same DST = SRC*apha + DST(1-alpha)
+			//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
+			//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
+			final_a = dsta + srca - mul255(dsta, srca);
+			if (final_a) {
+				s32 res;
+				dst[surf->idx_a] = final_a;
+				res = (srcr*srca + dstr*(dsta-srca)) / final_a;
+				if (res<0) res=0;
+				dst[surf->idx_r] = (u8) (res);
+				res = (srcg*srca + dstg*(dsta-srca)) / final_a;
+				if (res<0) res=0;
+				dst[surf->idx_g] = (u8) (res);
+				res = (srcb*srca + dstb*(dsta-srca)) / final_a;
+				if (res<0) res=0;
+				dst[surf->idx_b] = (u8) (res);
+			}
+		} else {
+			dst[surf->idx_a] = (u8) srca;
+			dst[surf->idx_r] = (u8) srcr;
+			dst[surf->idx_g] = (u8) srcg;
+			dst[surf->idx_b] = (u8) srcb;
+		}
+		dst+=dst_pitch_x;
+		count--;
+	}
+}
+
+void evg_argb_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_argb(col, dst, 0xFF, surf);
+}
+
+void evg_argb_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_argb(col, dst, coverage, surf);
+}
+
+
+void evg_argb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 col_no_a;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	col_no_a = col & 0x00FFFFFF;
+
+	for (i=0; i<count; i++) {
+		u32 new_a, fin;
+		u8 *p;
+		u32 len;
+		p = dst + spans[i].x*surf->pitch_x;
+		len = spans[i].len;
+
+		new_a = spans[i].coverage;
+		fin = (new_a<<24) | col_no_a;
+		//we must blend in all cases since we have to merge with the dst alpha
+		overmask_argb_const_run(fin, p, surf->pitch_x, len, surf);
+	}
+}
+
+void evg_argb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u32 a, fin, col_no_a;
+	s32 i;
+
+	a = GF_COL_A(surf->fill_col);
+	col_no_a = surf->fill_col & 0x00FFFFFF;
+	if (surf->get_alpha) {
+		u32 j;
+		for (i=0; i<count; i++) {
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x+j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | col_no_a;
+				overmask_argb_const_run(fin, dst + x * surf->pitch_x, surf->pitch_x, 1, surf);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | col_no_a;
+			overmask_argb_const_run(fin, dst + spans[i].x*surf->pitch_x, surf->pitch_x, spans[i].len, surf);
+		}
+	}
+}
+
+void evg_argb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 *p;
+		u8 spanalpha;
+		u32 len;
+		u32 *col;
+		p = dst + spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+		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);
+			col++;
+			p += surf->pitch_x;
+		}
+	}
+}
+
+
+void evg_argb_fill_erase(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 *p;
+		u32 len;
+		p = dst + spans[i].x*surf->pitch_x;
+		len = spans[i].len;
+		if (spans[i].coverage != 0xFF) {
+		} else {
+			while (len--) {
+				*(u32 *)p = 0;
+				p += surf->pitch_x;
+			}
+		}
+	}
+}
+
+GF_Err evg_surface_clear_argb(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u8 *data, *o_data;
+	u8 a, r, g, b;
+	u32 x, y, w, h, sy;
+	s32 st;
+	GF_EVGSurface *_this = (GF_EVGSurface *)surf;
+	st = _this->pitch_y;
+
+	h = rc.height;
+	w = rc.width;
+	sy = rc.y;
+
+	if (sy+h > _this->height) {
+		h = _this->height - sy;
+	}
+	if (rc.x + w > _this->width) {
+		w = _this->width - rc.x;
+	}
+
+	a = GF_COL_A(col);
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	o_data = NULL;
+	for (y = 0; y < h; y++) {
+		data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x * rc.x;
+		if (!y) {
+			o_data = data;
+			for (x = 0; x < w; x++) {
+				data[surf->idx_a] = a;
+				data[surf->idx_r] = r;
+				data[surf->idx_g] = g;
+				data[surf->idx_b] = b;
+				data += 4;
+			}
+		} else {
+			memcpy(data, o_data, w*4);
+		}
+	}
+	return GF_OK;
+}
+
+/*
+		32 bit RGBX/XRGB/BGRX/XBGR
+*/
+
+static void overmask_rgbx(u32 src, u8 *dst, u32 alpha, GF_EVGSurface *surf)
+{
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src >> 0) & 0xff;
+
+	s32 dstr = dst[surf->idx_r];
+	s32 dstg = dst[surf->idx_g];
+	s32 dstb = dst[surf->idx_b];
+
+	srca = mul255(srca, alpha);
+	dst[surf->idx_r] = mul255(srca, srcr - dstr) + dstr;
+	dst[surf->idx_g] = mul255(srca, srcg - dstg) + dstg;
+	dst[surf->idx_b] = mul255(srca, srcb - dstb) + dstb;
+}
+
+GFINLINE static void overmask_rgbx_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count, GF_EVGSurface *surf)
+{
+	s32 srca = (src>>24) & 0xff;
+	u32 srcr = mul255(srca, ((src >> 16) & 0xff)) ;
+	u32 srcg = mul255(srca, ((src >> 8) & 0xff)) ;
+	u32 srcb = mul255(srca, ((src) & 0xff)) ;
+	while (count) {
+		u32 dstc;
+		dstc = dst[surf->idx_r];
+		dst[surf->idx_r] = mul255(srca, srcr - dstc) + dstc;
+		dstc = dst[surf->idx_g];
+		dst[surf->idx_g] = mul255(srca, srcg - dstc) + dstc;
+		dstc = dst[surf->idx_b];
+		dst[surf->idx_b] = mul255(srca, srcb - dstc) + dstc;
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+
+void evg_rgbx_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 r = GF_COL_R(col);
+	u8 g = GF_COL_G(col);
+	u8 b = GF_COL_B(col);
+	dst[surf->idx_r] = r;
+	dst[surf->idx_g] = g;
+	dst[surf->idx_b] = b;
+}
+
+void evg_rgbx_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_rgbx(col, dst, coverage, surf);
+}
+
+void evg_rgbx_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 fin, col_no_a, spana;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u8 r, g, b;
+	s32 i, x;
+	u32 len;
+
+	col_no_a = col & 0x00FFFFFF;
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	for (i=0; i<count; i++) {
+		spana = spans[i].coverage;
+		x = spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+
+		if (spana != 0xFF) {
+			fin = (spana<<24) | col_no_a;
+			overmask_rgbx_const_run(fin, dst + x, surf->pitch_x, len, surf);
+		} else {
+			while (len--) {
+				dst[x+surf->idx_r] = r;
+				dst[x+surf->idx_g] = g;
+				dst[x+surf->idx_b] = b;
+				x += surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_rgbx_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	u32 a, fin, col_no_a;
+	s32 i;
+
+	a = (col>>24)&0xFF;
+	col_no_a = col & 0x00FFFFFF;
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | col_no_a;
+				overmask_rgbx_const_run(fin, dst + surf->pitch_x * x, surf->pitch_x, 1, surf);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | col_no_a;
+			overmask_rgbx_const_run(fin, dst + surf->pitch_x*spans[i].x, surf->pitch_x, spans[i].len, surf);
+		}
+	}
+}
+
+
+void evg_rgbx_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col, _col;
+		len = spans[i].len;
+		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 = *col;
+			col_a = GF_COL_A(_col);
+			if (col_a) {
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_rgbx(*col, dst+x, spanalpha, surf);
+				} else {
+					dst[x+surf->idx_r] = GF_COL_R(_col);
+					dst[x+surf->idx_g] = GF_COL_G(_col);
+					dst[x+surf->idx_b] = GF_COL_B(_col);
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_rgbx(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u32 x, y, w, h, sx, sy;
+	u8 r,g,b;
+	s32 st;
+	char *o_data;
+	GF_EVGSurface *_this = (GF_EVGSurface *)surf;
+	st = _this->pitch_x;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	o_data = NULL;
+	for (y = 0; y < h; y++) {
+		u8 *data = (u8 *) _this ->pixels + (y + sy) * _this->pitch_y + st*sx;
+		if (!y) {
+			o_data = data;
+			for (x = 0; x < w; x++) {
+				data[surf->idx_r] = r;
+				data[surf->idx_g] = g;
+				data[surf->idx_b] = b;
+				data[surf->idx_a] = 0xFF;
+				data += st;
+			}
+		} else {
+			memcpy(data, o_data, w*4);
+		}
+	}
+	return GF_OK;
+}
+
+
+
+
+/*
+		alpha grey
+*/
+
+static void overmask_alphagrey(u32 src, u8 *dst, u32 alpha, u32 grey_type, u32 idx_g, u32 idx_a)
+{
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcc;
+	s32 dsta = dst[idx_a];
+
+	if (grey_type==0) srcc = (src >> 16) & 0xff;
+	else if (grey_type==1) srcc = (src >> 8) & 0xff;
+	else srcc = (src >> 0) & 0xff;
+	srca = mul255(srca, alpha);
+
+	if (dsta) {
+		s32 dstc = dst[idx_g];
+		dst[idx_g] = mul255(srca, srcc - dstc) + dstc;
+		dst[idx_a] = mul255(srca, srca) + mul255(255-srca, dsta);
+	} else {
+		dst[idx_g] = srcc;
+		dst[idx_a] = srca;
+	}
+}
+
+static void overmask_alphagrey_const_run(u32 src_a, u32 src_c, u8 *dst, s32 dst_pitch_x, u32 count, u32 idx_g, u32 idx_a)
+{
+	while (count) {
+		s32 dsta = dst[idx_a];
+		/*special case : if dst alpha is 0, consider the surface is empty and copy pixel*/
+		if (dsta) {
+			s32 dstc = dst[idx_g];
+			dst[idx_g] = mul255(src_a, src_c - dstc) + dstc;
+			dst[idx_a] = mul255(src_a, src_a) + mul255(255-src_a, dsta);
+		} else {
+			dst[idx_g] = src_c;
+			dst[idx_a] = src_a;
+		}
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+
+void evg_alphagrey_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 col_c;
+
+	if (surf->grey_type==0) col_c = GF_COL_R(col);
+	else if (surf->grey_type==1) col_c = GF_COL_G(col);
+	else col_c = GF_COL_B(col);
+	dst[surf->idx_g] = col_c;
+}
+
+void evg_alphagrey_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	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)
+{
+	u32 col = surf->fill_col;
+	u32 a;
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i, x;
+	u32 len;
+	u8 col_a, col_c;
+
+	col_a = GF_COL_A(col);
+	if (surf->grey_type==0) col_c = GF_COL_R(col);
+	else if (surf->grey_type==1) col_c = GF_COL_G(col);
+	else col_c = GF_COL_B(col);
+
+	for (i=0; i<count; i++) {
+		x = spans[i].x * surf->pitch_x;
+		len = spans[i].len;
+
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			overmask_alphagrey_const_run(a, col_c, dst + x, surf->pitch_x, len, surf->idx_g, surf->idx_a);
+		} else {
+			while (len--) {
+				dst[x+surf->idx_g] = col_c;
+				dst[x+surf->idx_a] = col_a;
+				x += surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_alphagrey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	u32 a, fin, col_c;
+	s32 i;
+
+	a = GF_COL_A(col);
+	if (surf->grey_type==0) col_c = GF_COL_R(col);
+	else if (surf->grey_type==1) col_c = GF_COL_G(col);
+	else col_c = GF_COL_B(col);
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; i++) {
+				s32 x = spans[i].x+j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				overmask_alphagrey_const_run(fin, col_c, dst + surf->pitch_x * x, surf->pitch_x, 1, surf->idx_g, surf->idx_a);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			overmask_alphagrey_const_run(fin, col_c, dst + surf->pitch_x*spans[i].x, surf->pitch_x, spans[i].len, surf->idx_g, surf->idx_a);
+		}
+	}
+}
+
+
+void evg_alphagrey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col, _col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_alphagrey(*col, (dst + x) , spanalpha, surf->grey_type, surf->idx_g, surf->idx_a);
+				} else {
+					u8 dstc;
+
+					if (surf->grey_type==0) dstc = GF_COL_R(_col);
+					else if (surf->grey_type==1) dstc = GF_COL_G(_col);
+					else dstc = GF_COL_B(_col);
+
+					dst[x+surf->idx_g] = dstc;
+					dst[x+surf->idx_a] = col_a;
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_alphagrey(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u8 *data, *data_o;
+	u8 col_a, col_c;
+	u32 x, y, w, h, sx, sy;
+	s32 st;
+	GF_EVGSurface *_this = (GF_EVGSurface *)surf;
+	st = _this->pitch_y;
+
+	col_a = GF_COL_A(col);
+	if (surf->grey_type==0) col_c = GF_COL_R(col);
+	else if (surf->grey_type==1) col_c = GF_COL_G(col);
+	else col_c = GF_COL_B(col);
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	data_o = NULL;
+
+	for (y = 0; y < h; y++) {
+		data = (u8 *) _this ->pixels + (sy+y)* st + _this->pitch_x*sx;
+		if (!y) {
+			data_o = data;
+			for (x = 0; x < w; x++) {
+				data[surf->idx_a] = col_c;
+				data[surf->idx_g] = col_a;
+				data += _this->pitch_x;
+			}
+		} else {
+			memcpy(data, data_o, w*_this->BPP);
+		}
+	}
+	return GF_OK;
+}

gpac-1.0.0.tar.gz/src/evg/raster_rgb.c Added

@@ -0,0 +1,389 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer module
+ *
+ *  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 "rast_soft.h"
+
+static s32
+mul255(s32 a, s32 b)
+{
+	return ((a + 1) * b) >> 8;
+}
+
+
+/*
+			RGB part
+*/
+
+void overmask_rgb(u32 src, u8 *dst, u32 alpha, GF_EVGSurface *surf)
+{
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src) & 0xff;
+
+	s32 dstr = dst[surf->idx_r] & 0xFF;
+	s32 dstg = dst[surf->idx_g] & 0xFF;
+	s32 dstb = dst[surf->idx_b] & 0xFF;
+
+	srca = mul255(srca, alpha);
+	dst[surf->idx_r] = mul255(srca, srcr - dstr) + dstr;
+	dst[surf->idx_g] = mul255(srca, srcg - dstg) + dstg;
+	dst[surf->idx_b] = mul255(srca, srcb - dstb) + dstb;
+}
+
+static void overmask_rgb_const_run(u32 src, u8 *dst, s32 dst_pitch_x, u32 count, GF_EVGSurface *surf)
+{
+	s32 srca = (src >> 24) & 0xff;
+	s32 srcr = (src >> 16) & 0xff;
+	s32 srcg = (src >> 8) & 0xff;
+	s32 srcb = (src) & 0xff;
+
+	while (count) {
+		s32 dstr = dst[surf->idx_r];
+		s32 dstg = dst[surf->idx_g];
+		s32 dstb = dst[surf->idx_b];
+		dst[surf->idx_r] = (u8) mul255(srca, srcr - dstr) + dstr;
+		dst[surf->idx_g] = (u8) mul255(srca, srcg - dstg) + dstg;
+		dst[surf->idx_b] = (u8) mul255(srca, srcb - dstb) + dstb;
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+void evg_rgb_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 r = GF_COL_R(col);
+	u8 g = GF_COL_G(col);
+	u8 b = GF_COL_B(col);
+	dst[surf->idx_r] = r;
+	dst[surf->idx_g] = g;
+	dst[surf->idx_b] = b;
+}
+
+void evg_rgb_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_rgb(col, dst, coverage, surf);
+}
+
+void evg_rgb_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+	u32 col_no_a, r, g, b;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+
+	col_no_a = col & 0x00FFFFFF;
+	for (i=0; i<count; i++) {
+		u32 a, fin, len;
+		char *p;
+		len = spans[i].len;
+		p = dst + spans[i].x * surf->pitch_x;
+
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			fin = (a<<24) | col_no_a;
+			overmask_rgb_const_run(fin, p, surf->pitch_x, len, surf);
+		} else {
+			while (len--) {
+				p[surf->idx_r] = r;
+				p[surf->idx_g] = g;
+				p[surf->idx_b] = b;
+				p += surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_rgb_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u32 col = surf->fill_col;
+	u32 a, fin;
+	s32 i;
+
+	a = (col>>24)&0xFF;
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				fin = (fin<<24) | (col&0x00FFFFFF);
+				overmask_rgb_const_run(fin, dst + surf->pitch_x * x, surf->pitch_x, 1, surf);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			fin = (fin<<24) | (col&0x00FFFFFF);
+			overmask_rgb_const_run(fin, dst + surf->pitch_x * spans[i].x, surf->pitch_x, spans[i].len, surf);
+		}
+	}
+}
+
+
+void evg_rgb_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_rgb(*col, dst + x, spanalpha, surf);
+				} else {
+					dst[x + surf->idx_r] = GF_COL_R(*col);
+					dst[x + surf->idx_g] = GF_COL_G(*col);
+					dst[x + surf->idx_b] = GF_COL_B(*col);
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_rgb(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u32 x, y, w, h, sx, sy;
+	s32 st;
+	u8 r, g, b;
+	u8 *o_data;
+	GF_EVGSurface *_this = (GF_EVGSurface *)surf;
+	st = _this->pitch_y;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	r = GF_COL_R(col);
+	g = GF_COL_G(col);
+	b = GF_COL_B(col);
+	o_data = NULL;
+	for (y = 0; y < h; y++) {
+		u8 *data = _this ->pixels + (y + sy) * st + _this->pitch_x*sx;
+		if (!y) {
+			o_data = data;
+			for (x = 0; x < w; x++) {
+				data[surf->idx_r] = r;
+				data[surf->idx_g] = g;
+				data[surf->idx_b] = b;
+				data += _this->pitch_x;
+			}
+		} else {
+			memcpy(data, o_data, w*3);
+		}
+	}
+	return GF_OK;
+}
+
+
+
+
+/*
+			grey part
+*/
+
+static void overmask_grey(u32 src, char *dst, u32 alpha, u32 grey_type)
+{
+	s32 srca = (src >> 24) & 0xff;
+	u32 srcc;
+	s32 dstc = *dst;
+
+	if (grey_type==0) srcc = (src >> 16) & 0xff;
+	else if (grey_type==1) srcc = (src >> 8) & 0xff;
+	else srcc = (src) & 0xff;
+
+
+	srca = mul255(srca, alpha);
+	*dst = mul255(srca, srcc - dstc) + dstc;
+}
+
+static void overmask_grey_const_run(u8 srca, u8 srcc, char *dst, s32 dst_pitch_x, u32 count)
+{
+	while (count) {
+		u8 dstc = *(dst);
+		*dst = (u8) mul255(srca, srcc - dstc) + dstc;
+		dst += dst_pitch_x;
+		count--;
+	}
+}
+
+void evg_grey_fill_single(s32 y, s32 x, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	u8 c;
+
+	if (surf->grey_type==0) c = GF_COL_R(col);
+	else if (surf->grey_type==1) c = GF_COL_G(col);
+	else c = GF_COL_B(col);
+	*dst = c;
+}
+
+void evg_grey_fill_single_a(s32 y, s32 x, u8 coverage, u32 col, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y + x * surf->pitch_x;
+	overmask_grey(col, dst, coverage, surf->grey_type);
+}
+
+void evg_grey_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 col = surf->fill_col;
+	u32 c;
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	if (surf->grey_type==0) c = GF_COL_R(col);
+	else if (surf->grey_type==1) c = GF_COL_G(col);
+	else c = GF_COL_B(col);
+
+	for (i=0; i<count; i++) {
+		u32 a, len;
+		char *p;
+		len = spans[i].len;
+		p = dst + spans[i].x * surf->pitch_x;
+
+		if (spans[i].coverage != 0xFF) {
+			a = mul255(0xFF, spans[i].coverage);
+			overmask_grey_const_run(a, c, p, surf->pitch_x, len);
+		} else {
+			while (len--) {
+				*(p) = c;
+				p += surf->pitch_x;
+			}
+		}
+	}
+}
+
+void evg_grey_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	u32 a, fin;
+	s32 i;
+	u8 c;
+
+	if (surf->grey_type==0) c = GF_COL_R(surf->fill_col);
+	else if (surf->grey_type==1) c = GF_COL_G(surf->fill_col);
+	else c = GF_COL_B(surf->fill_col);
+
+ 	a = GF_COL_A(surf->fill_col);
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+				overmask_grey_const_run(fin, c, dst + surf->pitch_x * x, surf->pitch_x, 1);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			fin = mul255(a, spans[i].coverage);
+			overmask_grey_const_run(fin, c, dst + surf->pitch_x * spans[i].x, surf->pitch_x, spans[i].len);
+		}
+	}
+}
+
+
+void evg_grey_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u8 *dst = surf->pixels + y * surf->pitch_y;
+	s32 i;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		s32 x;
+		u32 len;
+		u32 *col;
+		len = spans[i].len;
+		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);
+			if (col_a) {
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_grey(*col, dst + x, spanalpha, surf->grey_type);
+				} else {
+					u8 c;
+
+					if (surf->grey_type==0) c = GF_COL_R(*col);
+					else if (surf->grey_type==1) c = GF_COL_G(*col);
+					else c = GF_COL_B(*col);
+
+					*(dst + x) = c;
+				}
+			}
+			col++;
+			x += surf->pitch_x;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_grey(GF_EVGSurface *surf, GF_IRect rc, GF_Color col)
+{
+	u32 y, w, h, sx, sy;
+	s32 st;
+	u8 r;
+	st = surf->pitch_y;
+
+	h = rc.height;
+	w = rc.width;
+	sx = rc.x;
+	sy = rc.y;
+
+	if (surf->grey_type==0) r = GF_COL_R(col);
+	else if (surf->grey_type==1) r = GF_COL_G(col);
+	else r = GF_COL_B(col);
+
+	for (y = 0; y < h; y++) {
+		char *data = surf ->pixels + (y + sy) * st + surf->pitch_x*sx;
+		memset(data, r, w*surf->pitch_x);
+	}
+	return GF_OK;
+}

gpac-1.0.0.tar.gz/src/evg/raster_yuv.c Added

@@ -0,0 +1,2228 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer module
+ *
+ *  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 "rast_soft.h"
+
+//TODO: support for color spaces, support for more than 10 bits and BigEndian format ?
+
+#if 1
+
+#define mul255(_a, _b)  ( (((u32)(_a) + 1) * (u32)(_b) ) >> 8)
+
+#else
+static s32
+mul255(s32 a, s32 b)
+{
+	return ((a + 1) * b) >> 8;
+}
+#endif
+
+static s32
+mul255_zero(s32 a, s32 b)
+{
+	if (!a) return 0;
+	return ((a + 1) * b) >> 8;
+}
+
+//RGB <-> YUV full range conversion, using integer (1024 factor)
+#define YUV_USE_INT
+
+void gf_evg_rgb_to_yuv(GF_EVGSurface *surf, GF_Color col, u8*y, u8*cb, u8*cr)
+{
+	u32 r = GF_COL_R(col);
+	u32 g = GF_COL_G(col);
+	u32 b = GF_COL_B(col);
+
+#ifndef YUV_USE_INT
+	*y = (u8) (0.299*r + 0.587 * g + 0.114 * b);
+	*cb = (u8) (-0.169*(s32)r - 0.331*(s32)g + 0.499*b + 128);
+	*cr = (u8) (0.499 * r - 0.418*(s32)g - 0.0813*(s32)b + 128);
+#else
+	u32 _v = 306*r + 601 * g + 117 * b;
+	*y = (u8) (_v >> 10);
+	_v = (-173*(s32)r - 339*(s32)g + 511*b + 131072);
+	*cb = (u8) (_v >> 10);
+	_v = (511 * r - 428*(s32)g - 83*(s32)b + 131072);
+	*cr = (u8) (_v >> 10);
+#endif
+}
+GF_Color gf_evg_argb_to_ayuv(GF_EVGSurface *surf, GF_Color col)
+{
+	u8 a, y, cb, cr;
+	a = GF_COL_A(col);
+	u32 r = GF_COL_R(col);
+	u32 g = GF_COL_G(col);
+	u32 b = GF_COL_B(col);
+
+#ifndef YUV_USE_INT
+	y = (u8) (0.299*r + 0.587 * g + 0.114 * b);
+	cb = (u8) (-0.169*(s32)r - 0.331*(s32)g + 0.499*b + 128);
+	cr = (u8) (0.499 * r - 0.418*(s32)g - 0.0813*(s32)b + 128);
+#else
+	u32 _v = 306*r + 601 * g + 117 * b;
+	y = (u8) (_v >> 10);
+	_v = (-173*(s32)r - 339*(s32)g + 511*b + 131072);
+	cb = (u8) (_v >> 10);
+	_v = (511 * r - 428*(s32)g - 83*(s32)b + 131072);
+	cr = (u8) (_v >> 10);
+#endif
+	return GF_COL_ARGB(a, y, cb, cr);
+}
+
+GF_Err gf_gf_evg_rgb_to_yuv_f(GF_EVGSurface *surf, Float r, Float g, Float b, Float *y, Float *cb, Float *cr)
+{
+	*y = (0.299f * r + 0.587f * g + 0.114f * b);
+	*cb = (-0.169f * (s32)r - 0.331f * (s32)g + 0.499f * b + 128.0f);
+	*cr = (0.499f * r - 0.418f * (s32)g - 0.0813f * (s32)b + 128.0f);
+	return GF_OK;
+}
+GF_Err gf_evg_yuv_to_rgb_f(GF_EVGSurface *surf, Float y, Float cb, Float cr, Float *r, Float *g, Float *b)
+{
+	*r = (y + 1.402f * (cr - 128.0f));
+	*g = (y - 0.344136f * (cb - 128.0f) - 0.714136f * (cr-128.0f) );
+	*b = (y + 1.772f * (cb - 128.0f) );
+	return GF_OK;
+}
+
+GF_Color gf_evg_ayuv_to_argb(GF_EVGSurface *surf, GF_Color col)
+{
+	u32 a;
+	s32 y, cb, cr;
+	s32 r, g, b;
+	a = GF_COL_A(col);
+	y = GF_COL_R(col);
+	cb = GF_COL_G(col);
+	cr = GF_COL_B(col);
+
+#ifndef YUV_USE_INT
+	r = (s32) (y + 1.402 * (cr - 128));
+	g = (s32) (y - 0.344136 * (cb - 128) - 0.714136*(cr-128) );
+	b = (s32) (y + 1.772 * (cb - 128) );
+
+#define TRUNC_8BIT(_a) if (_a<0) {_a = 0;} else if (_a>255) {_a=255;}
+	TRUNC_8BIT(r)
+	TRUNC_8BIT(g)
+	TRUNC_8BIT(b)
+
+#else
+	y *= 1024;
+	r = (s32) (y + 1436 * (cr - 128));
+	g = (s32) (y - 352 * (cb - 128) - 731*(cr-128) );
+	b = (s32) (y + 1814 * (cb - 128) );
+
+#define TRUNC_8BIT(_a) if (_a<0) {_a = 0;} else { u32 __a = (u32) _a; __a>>=10; if (__a>255) {__a=255;} _a = __a; }
+	TRUNC_8BIT(r)
+	TRUNC_8BIT(g)
+	TRUNC_8BIT(b)
+
+#endif
+
+
+	return GF_COL_ARGB(a, r, g, b);
+}
+
+u64 gf_evg_argb_to_ayuv_wide(GF_EVGSurface *surf, u64 col)
+{
+	u16 a, y, cb, cr;
+	u32 r, g, b;
+
+	a = (col>>48)&0xFFFF;
+	r = (col>>32)&0xFFFF;
+	g = (col>>16)&0xFFFF;
+	b = (col)&0xFFFF;
+
+#ifndef YUV_USE_INT
+	y = (u16) (0.299*r + 0.587 * g + 0.114 * b);
+	cb = (u16) (-0.169*(s32)r - 0.331*(s32)g + 0.499*b + 32768);
+	cr = (u16) (0.499 * r - 0.418*(s32)g - 0.0813*(s32)b + 32768);
+#else
+	u32 _v = 306*r + 601 * g + 117 * b;
+	y = (u16) (_v >> 10);
+	_v = (-173*(s32)r - 339*(s32)g + 511*b + 33554432);
+	cb = (u16) (_v >> 10);
+	_v = (511 * r - 428*(s32)g - 83*(s32)b + 33554432);
+	cr = (u16) (_v >> 10);
+#endif
+
+
+	return evg_make_col_wide(a, y, cb, cr);
+}
+u64 gf_evg_ayuv_to_argb_wide(GF_EVGSurface *surf, u64 col)
+{
+	u32 a;
+	s64 y, cb, cr;
+	s32 r, g, b;
+	a = (col>>48)&0xFFFF;
+	y = (col>>32)&0xFFFF;
+	cb = (col>>16)&0xFFFF;
+	cr = (col)&0xFFFF;
+
+#ifndef YUV_USE_INT
+	r = (s32) (y + 1.402 * (cr - 32768));
+	g = (s32) (y - 0.344136 * (cb - 32768) - 0.714136*(cr-32768) );
+	b = (s32) (y + 1.772 * (cb - 32768) );
+#define TRUNC_16BIT(_a) if (_a<0) {_a = 0;} else if (_a>32768) {_a=32768;}
+	TRUNC_16BIT(r)
+	TRUNC_16BIT(g)
+	TRUNC_16BIT(b)
+
+#else
+	y *= 1024;
+	r = (s32) (y + 1436 * (cr - 32768));
+	g = (s32) (y - 352 * (cb - 32768) - 731*(cr-32768) );
+	b = (s32) (y + 1814 * (cb - 32768) );
+
+#define TRUNC_16BIT(_a) if (_a<0) {_a = 0;} else { u32 __a = (u32) _a; __a>>=10; if (__a>32768) {__a=32768;} _a = __a; }
+	TRUNC_16BIT(r)
+	TRUNC_16BIT(g)
+	TRUNC_16BIT(b)
+
+#endif
+
+	return evg_make_col_wide(a, r, g, b);
+}
+
+void evg_make_ayuv_color_mx(GF_ColorMatrix *cmat, GF_ColorMatrix *yuv_cmat)
+{
+	GF_ColorMatrix cmx_y2r, cmx_r2y;
+	gf_cmx_init(&cmx_r2y);
+	gf_cmx_init(&cmx_y2r);
+	cmx_r2y.identity = cmx_y2r.identity = GF_FALSE;
+
+	//r = (s32) (y + 1.402 * (cr - 128));
+	cmx_y2r.m[0] = FIX_ONE; //y
+	cmx_y2r.m[2] = FLT2FIX(1.402); //cr
+	cmx_y2r.m[4] = FLT2FIX(-1.402 * 0.504); //tr
+
+	//g = (s32) (y - 0.344136 * (cb - 128) - 0.714136*(cr-128) );
+	cmx_y2r.m[5] = FIX_ONE; //y
+	cmx_y2r.m[6] = FLT2FIX(- 0.344136); //cb
+	cmx_y2r.m[7] = FLT2FIX(- 0.714136); //cr
+	cmx_y2r.m[9] = FLT2FIX(0.344136 * 0.504 + 0.714136*0.504); //tr
+
+	//b = (s32) (y + 1.772 * (cb - 128) );
+	cmx_y2r.m[10] = FIX_ONE; //y
+	cmx_y2r.m[11] = FLT2FIX(1.772); //cb
+	cmx_y2r.m[14] = FLT2FIX(-1.772 * 0.504); //tr
+
+
+	//y = (u8) (0.299*r + 0.587 * g + 0.114 * b);
+	cmx_r2y.m[0] = FLT2FIX(0.299); //r
+	cmx_r2y.m[1] = FLT2FIX(0.587); //g
+	cmx_r2y.m[2] = FLT2FIX(0.114); //b
+
+
+	//cb = (u8) (-0.169*(s32)r - 0.331*(s32)g + 0.499*b + 128);
+	cmx_r2y.m[5] = FLT2FIX(-0.169); //r
+	cmx_r2y.m[6] = FLT2FIX(-0.331); //g
+	cmx_r2y.m[7] = FLT2FIX(0.499); //b
+	cmx_r2y.m[9] = FLT2FIX(0.504); //tr
+
+	//cr = (u8) (0.499 * r - 0.418*(s32)g - 0.0813*(s32)b + 128);
+	cmx_r2y.m[10] = FLT2FIX(0.499); //r
+	cmx_r2y.m[11] = FLT2FIX(-0.418); //g
+	cmx_r2y.m[12] = FLT2FIX(-0.0813); //b
+	cmx_r2y.m[14] = FLT2FIX(0.504); //tr
+
+	gf_cmx_copy(yuv_cmat, &cmx_r2y);
+	gf_cmx_multiply(yuv_cmat, cmat);
+	gf_cmx_multiply(yuv_cmat, &cmx_y2r);
+}
+
+
+/*
+			YUV420p part
+*/
+
+static void overmask_yuv420p(u8 col_a, u8 cy, char *dst, u32 alpha)
+{
+	s32 srca = col_a;
+	u32 srcc = cy;
+	s32 dstc = (*dst) & 0xFF;
+
+	srca = mul255(srca, alpha);
+	*dst = mul255(srca, srcc - dstc) + dstc;
+}
+
+static void overmask_yuv420p_const_run(u8 a, u8 val, u8 *ptr, u32 count, short x)
+{
+	while (count) {
+		u8 dst = *(ptr);
+		*ptr = (u8) mul255(a, val - dst) + dst;
+		ptr ++;
+		count--;
+	}
+}
+void evg_yuv420p_flush_uv_const(GF_EVGSurface *surf, 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;
+
+	//we are at an odd line, write uv
+	for (i=0; i<surf->width; i+=2) {
+		u8 dst;
+
+		//even line
+		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+		//odd line
+		a += surf_uv_alpha[i] + surf_uv_alpha[i+1];
+
+		if (a) {
+			char *s_ptr_u, *s_ptr_v;
+
+			a /= 4;
+
+			s_ptr_u = pU + i / 2;
+			s_ptr_v = pV + i / 2;
+			if (a==0xFF) {
+				*s_ptr_u = (u8) cu;
+				*s_ptr_v = (u8) cv;
+			} else {
+				dst = *(s_ptr_u);
+				*s_ptr_u = (u8) mul255(a, cu - dst) + dst;
+
+				dst = *(s_ptr_v);
+				*s_ptr_v = (u8) mul255(a, cv - dst) + dst;
+			}
+		}
+	}
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+void evg_yuv420p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	char *pY = surf->pixels;
+	u8 *surf_uv_alpha;
+	s32 i;
+	u8 cy, cu, cv;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = surf->uv_alpha;
+	}
+	else if (write_uv) {
+		surf_uv_alpha = surf->uv_alpha + surf->width;
+	} else {
+		surf_uv_alpha = surf->uv_alpha;
+	}
+
+	pY +=  y * surf->pitch_y;
+
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+
+	for (i=0; i<count; i++) {
+		u32 a;
+		char *s_pY;
+		u32 len;
+		len = spans[i].len;
+		s_pY = pY + spans[i].x;
+
+		a = spans[i].coverage;
+		if (a != 0xFF) {
+			overmask_yuv420p_const_run((u8)a, cy, s_pY, len, 0);
+			memset(surf_uv_alpha + spans[i].x, (u8)a, len);
+		} else  {
+			while (len--) {
+				*(s_pY) = cy;
+				s_pY ++;
+			}
+			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);
+	}
+
+}
+
+void evg_yuv420p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 a;
+	char *pY = surf->pixels;
+	u8 *surf_uv_alpha;
+	s32 i;
+	u8 cy, cu, cv;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = surf->uv_alpha;
+	} else if (write_uv) {
+		surf_uv_alpha = surf->uv_alpha + surf->width;
+	} else {
+		surf_uv_alpha = surf->uv_alpha;
+	}
+
+	pY +=  y * surf->pitch_y;
+
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+	a = GF_COL_A(surf->fill_col);
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 fin, j;
+			for (j=0; j<spans[i].len; j++) {
+				s32 x = spans[i].x + j;
+				char *s_pY = pY + x;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+
+				overmask_yuv420p_const_run((u8)fin, cy, s_pY, 1, 0);
+
+				memset(surf_uv_alpha + x, (u8)fin, 1);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			char *s_pY;
+			u32 fin, len;
+			len = spans[i].len;
+			s_pY = pY + spans[i].x;
+			fin = mul255(a, spans[i].coverage);
+
+			overmask_yuv420p_const_run((u8)fin, cy, s_pY, len, 0);
+
+			memset(surf_uv_alpha + spans[i].x, (u8)fin, len);
+		}
+	}
+	//we are at an odd line, write uv
+	if (write_uv)
+		surf->yuv_flush_uv(surf, 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)
+{
+	u32 i;
+	char *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;
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a11, a12, a21, a22;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+		//get alpha
+		a11 = (u32)surf->uv_alpha[idx1];
+		a12 = (u32)surf->uv_alpha[idx2];
+		a21 = (u32)surf_uv_alpha[idx1];
+		a22 = (u32)surf_uv_alpha[idx2];
+
+		a = a11 + a12 + a21 + a22;
+		if (a) {
+			u8 cdst=0;
+			u32 chroma_u, chroma_v, c11, c12, c21, c22;
+
+			a /= 4;
+			//get cb
+			idx1 += 1;
+			idx2 += 1;
+
+			if (a!=0xFF) {
+ 				cdst = *pU;
+			}
+			c11 = (u32)surf->uv_alpha[idx1];
+			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf->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;
+			c22 = (u32)surf_uv_alpha[idx2];
+			if (a22!=0xFF) c22 = mul255_zero(a22, c22 - cdst) + cdst;
+
+			chroma_u = c11 + c12 + c21 + c22;
+			chroma_u /= 4;
+
+			//get cr
+			idx1 += 1;
+			idx2 += 1;
+
+			if (a!=0xFF) {
+ 				cdst = *pV;
+			}
+			c11 = (u32)surf->uv_alpha[idx1];
+			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf->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;
+			c22 = (u32)surf_uv_alpha[idx2];
+			if (a22!=0xFF) c22 = mul255_zero(a22, c22 - cdst) + cdst;
+
+			chroma_v = c11 + c12 + c21 + c22;
+			chroma_v /= 4;
+
+			*pU = chroma_u;
+			*pV = chroma_v;
+		}
+		pU++;
+		pV++;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+
+}
+
+void evg_yuv420p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	s32 i;
+	char *pY = surf->pixels;
+	u8 *surf_uv_alpha;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = surf->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;
+	} else {
+		//first line of storage
+		surf_uv_alpha = surf->uv_alpha;
+	}
+
+	pY +=  y * surf->pitch_y;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		char *s_pY;
+		short x;
+		u32 *p_col;
+		u32 len;
+		len = spans[i].len;
+		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;
+
+		while (len--) {
+			u32 col = *p_col;
+			col_a = GF_COL_A(col);
+			if (col_a) {
+				u8 cy, cb, cr;
+				u32 idx=3*x;
+				//col is directly packed as AYCbCr
+				cy = GF_COL_R(col);
+				cb = GF_COL_G(col);
+				cr = GF_COL_B(col);
+
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_yuv420p(col_a, cy, s_pY, spanalpha);
+
+					u8 a = mul255(col_a, spanalpha);
+					surf_uv_alpha[idx] = a;
+				} else {
+					*s_pY = cy;
+					surf_uv_alpha[idx] = 0xFF;
+				}
+				surf_uv_alpha[idx+1] = cb;
+				surf_uv_alpha[idx+2] = cr;
+			}
+			s_pY++;
+			p_col++;
+			x++;
+		}
+	}
+	//compute final u,v for both lines
+	if (write_uv) {
+		surf->yuv_flush_uv(surf, surf_uv_alpha, 0, 0, y);
+	}
+}
+
+GF_Err evg_surface_clear_yuv420p(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i;
+	u8 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *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;
+
+	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
+
+	for (i = 0; i < rc.height; i++) {
+		memset(pY, cy, rc.width);
+		pY += surf->pitch_y;
+		if (i%2) {
+			memset(pU, cb, rc.width/2);
+			pU += surf->pitch_y/2;
+			memset(pV, cr, rc.width/2);
+			pV += surf->pitch_y/2;
+		}
+	}
+	return GF_OK;
+}
+
+
+/*
+			NV12 / NV21 part
+*/
+
+
+void evg_nv12_flush_uv_const(GF_EVGSurface *surf, u8 *surf_uv_alpha, s32 cu, s32 cv, s32 y)
+{
+	u32 i, a;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	pU +=  y/2 * surf->pitch_y;
+
+	for (i=0; i<surf->width; i+=2) {
+		u8 dst;
+
+		//even line
+		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+		//odd line
+		a += surf_uv_alpha[i] + surf_uv_alpha[i+1];
+
+		if (a) {
+			char *s_ptr;
+			a /= 4;
+
+			s_ptr = pU + i;
+			if (a==0xFF) {
+				*s_ptr = cu;
+
+				s_ptr++;
+				*s_ptr = cv;
+			} else {
+				dst = *(s_ptr);
+				*s_ptr = (u8) mul255(a, cu - dst) + dst;
+
+				s_ptr++;
+				dst = *(s_ptr);
+				*s_ptr = (u8) mul255(a, cv - dst) + dst;
+			}
+		}
+	}
+	memset(surf->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)
+{
+	u32 i;
+	char *pU;
+	pU = surf->pixels + surf->height *surf->pitch_y;
+	pU += y/2 * surf->pitch_y;
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a11, a12, a21, a22;
+
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+
+		//get alpha
+		a11 = (u32)surf->uv_alpha[idx1];
+		a12 = (u32)surf->uv_alpha[idx2];
+		a21 = (u32)surf_uv_alpha[idx1];
+		a22 = (u32)surf_uv_alpha[idx2];
+		a = a11+a12+a21+a22;
+
+		if (a) {
+			u8 cdst=0;
+			u32 chroma_u, chroma_v, c11, c12, c21, c22;
+
+			a /= 4;
+
+			//get cb
+			idx1 += 1;
+			idx2 += 1;
+			if (a!=0xFF)
+				cdst = pU[surf->idx_u];
+
+			c11 = (u32)surf->uv_alpha[idx1];
+			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf->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;
+			c22 = (u32)surf_uv_alpha[idx2];
+			if (a22!=0xFF) c22 = mul255_zero(a22, c22 - cdst) + cdst;
+
+			chroma_u = c11 + c12 + c21 + c22;
+			chroma_u /= 4;
+
+			//get cr
+			idx1 += 1;
+			idx2 += 1;
+
+			if (a!=0xFF)
+				cdst = pU[surf->idx_v];
+
+			c11 = (u32)surf->uv_alpha[idx1];
+			if (a11!=0xFF) c11 = mul255_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf->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;
+			c22 = (u32)surf_uv_alpha[idx2];
+			if (a22!=0xFF) c22 = mul255_zero(a22, c22 - cdst) + cdst;
+
+			chroma_v = c11 + c12 + c21 + c22;
+			chroma_v /= 4;
+
+			pU[surf->idx_u] = chroma_u;
+			pU[surf->idx_v] = chroma_v;
+		}
+		pU+=2;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+
+GF_Err evg_surface_clear_nv12(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col, Bool swap_uv)
+{
+	s32 i;
+	u8 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pU_first;
+
+	pY += rc.y * surf->pitch_y;
+	pU +=  rc.y/2 * surf->pitch_y;
+
+	pY += rc.x;
+	pU += rc.x/2;
+	pU_first = pU;
+
+	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
+
+	if (swap_uv) {
+		u8 t = cb;
+		cb = cr;
+		cr = t;
+	}
+	for (i = 0; i < rc.height; i++) {
+		memset(pY, cy, rc.width);
+		pY += surf->pitch_y;
+		if (i%2) {
+			//first uv line, build it
+			if (i==1) {
+				s32 j;
+				for (j=0; j<rc.width/2; j++) {
+					*pU = cb;
+					pU++;
+					*pU = cr;
+					pU++;
+				}
+			}
+			//non-first uv line recopy from first
+			else {
+				memcpy(pU, pU_first, rc.width);
+				pU += surf->pitch_y;
+			}
+		}
+	}
+	return GF_OK;
+}
+
+
+/*
+			YUV422 part
+*/
+
+void evg_yuv422p_flush_uv_const(GF_EVGSurface *surf, 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 * surf->pitch_y/2;
+	pV = pU + surf->height * surf->pitch_y/2;
+
+	for (i=0; i<surf->width; i+=2) {
+		u8 dst;
+
+		a = surf->uv_alpha[i] + surf->uv_alpha[i+1];
+
+		if (a) {
+			char *s_ptr_u, *s_ptr_v;
+
+			a /= 2;
+			s_ptr_u = pU + i / 2;
+			s_ptr_v = pV + i / 2;
+			if (a==0xFF) {
+				*s_ptr_u = (u8) cu;
+				*s_ptr_v = (u8) cv;
+			} else {
+				dst = *(s_ptr_u);
+				*s_ptr_u = (u8) mul255(a, cu - dst) + dst;
+
+				dst = *(s_ptr_v);
+				*s_ptr_v = (u8) mul255(a, cv - dst) + dst;
+			}
+		}
+	}
+	memset(surf->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)
+{
+	u32 i;
+	char *pU, *pV;
+	pU = surf->pixels + surf->height *surf->pitch_y;
+	pU += y * surf->pitch_y/2;
+	pV = pU + surf->height * surf->pitch_y/2;
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a1, a2;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+		//get alpha
+		a1 = (u32)surf->uv_alpha[idx1];
+		a2 = (u32)surf->uv_alpha[idx2];
+		a = a1+a2;
+		if (a) {
+			u8 cdst=0;
+			u32 chroma_u, chroma_v, c1, c2;
+
+			a /= 2;
+
+			//get cb
+			if (a != 0xFF)
+				cdst = *pU;
+
+			c1 = (u32)surf->uv_alpha[idx1+1];
+			if (a1!=0xFF) c1 = mul255_zero(a1, c1 - cdst) + cdst;
+			c2 = (u32)surf->uv_alpha[idx2+1];
+			if (a2!=0xFF) c2 = mul255_zero(a2, c1 - cdst) + cdst;
+			chroma_u = c1 + c2;
+			chroma_u /= 2;
+
+			//get cb
+			if (a != 0xFF)
+				cdst = *pV;
+
+			c1 = (u32)surf->uv_alpha[idx1+2];
+			if (a1!=0xFF) c1 = mul255_zero(a1, c1 - cdst) + cdst;
+			c2 = (u32)surf->uv_alpha[idx2+2];
+			if (a2!=0xFF) c2 = mul255_zero(a2, c1 - cdst) + cdst;
+			chroma_v = c1 + c2;
+			chroma_v /= 2;
+
+
+			*pU = chroma_u;
+			*pV = chroma_v;
+		}
+		pU++;
+		pV++;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+
+GF_Err evg_surface_clear_yuv422p(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i;
+	u8 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pV;
+
+	pY += rc.y * surf->pitch_y;
+	pU +=  rc.y/2 * surf->pitch_y/2;
+	pV = pU + surf->height/2 * surf->pitch_y/2;
+
+	pY += rc.x;
+	pU += rc.x/2;
+	pV += rc.x/2;
+
+	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
+
+	for (i = 0; i < rc.height; i++) {
+		memset(pY, cy, rc.width);
+		pY += surf->pitch_y;
+		memset(pU, cb, rc.width/2);
+		pU += surf->pitch_y/2;
+		memset(pV, cr, rc.width/2);
+		pV += surf->pitch_y/2;
+	}
+	return GF_OK;
+}
+
+/*
+			YUV444 part
+*/
+
+void evg_yuv444p_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	char *pY, *pU, *pV;
+	s32 i;
+	u8 cy, cu, cv;
+
+	pY = surf->pixels + y * surf->pitch_y;
+	pU = surf->pixels + surf->height*surf->pitch_y + y * surf->pitch_y;
+	pV = surf->pixels + 2*surf->height*surf->pitch_y + y * surf->pitch_y;
+
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+
+	for (i=0; i<count; i++) {
+		u32 a;
+		char *s_pY, *s_pU, *s_pV;
+		u32 len;
+		len = spans[i].len;
+		s_pY = pY + spans[i].x;
+		s_pU = pU + spans[i].x;
+		s_pV = pV + spans[i].x;
+
+		a = spans[i].coverage;
+		if (a != 0xFF) {
+			overmask_yuv420p_const_run((u8)a, cy, s_pY, len, 0);
+			overmask_yuv420p_const_run((u8)a, cu, s_pU, len, 0);
+			overmask_yuv420p_const_run((u8)a, cv, s_pV, len, 0);
+		} else  {
+			while (len--) {
+				*(s_pY) = cy;
+				s_pY ++;
+				*(s_pU) = cu;
+				s_pU ++;
+				*(s_pV) = cv;
+				s_pV ++;
+			}
+		}
+	}
+}
+
+void evg_yuv444p_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 a;
+	char *pY, *pU, *pV;
+	s32 i;
+	u8 cy, cu, cv;
+
+	pY = surf->pixels + y * surf->pitch_y;
+	pU = surf->pixels + surf->height*surf->pitch_y + y * surf->pitch_y;
+	pV = surf->pixels + 2*surf->height*surf->pitch_y + y * surf->pitch_y;
+
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+	a = GF_COL_A(surf->fill_col);
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				char *s_pY, *s_pU, *s_pV;
+				u32 fin;
+				s32 x = spans[i].x + j;
+				s_pY = pY + x;
+				s_pU = pU + x;
+				s_pV = pV + x;
+				u8 aa = surf->get_alpha(surf->get_alpha_udta, a, x, y);
+				fin = mul255(aa, spans[i].coverage);
+
+				overmask_yuv420p_const_run((u8)fin, cy, s_pY, 1, 0);
+				overmask_yuv420p_const_run((u8)fin, cu, s_pU, 1, 0);
+				overmask_yuv420p_const_run((u8)fin, cv, s_pV, 1, 0);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			char *s_pY, *s_pU, *s_pV;
+			u32 fin, len;
+			len = spans[i].len;
+			s_pY = pY + spans[i].x;
+			s_pU = pU + spans[i].x;
+			s_pV = pV + spans[i].x;
+			fin = mul255(a, spans[i].coverage);
+
+			overmask_yuv420p_const_run((u8)fin, cy, s_pY, len, 0);
+			overmask_yuv420p_const_run((u8)fin, cu, s_pU, len, 0);
+			overmask_yuv420p_const_run((u8)fin, cv, s_pV, len, 0);
+		}
+	}
+}
+
+void evg_yuv444p_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	s32 i;
+	char *pY, *pU, *pV;
+
+	pY = surf->pixels + y * surf->pitch_y;
+	pU = pY + surf->height*surf->pitch_y;
+	pV = pU + surf->height*surf->pitch_y;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		u32 len;
+		u32 *p_col;
+		char *s_pY, *s_pU, *s_pV;
+		len = spans[i].len;
+		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;
+		s_pV = pV + spans[i].x;
+
+		while (len--) {
+			u32 col = *p_col;
+			col_a = GF_COL_A(col);
+			if (col_a) {
+				u8 cy, cb, cr;
+				cy = GF_COL_R(col);
+				cb = GF_COL_G(col);
+				cr = GF_COL_B(col);
+
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_yuv420p(col_a, cy, s_pY, spanalpha);
+					overmask_yuv420p(col_a, cb, s_pU, spanalpha);
+					overmask_yuv420p(col_a, cr, s_pV, spanalpha);
+				} else {
+					*s_pY = cy;
+					*s_pU = cb;
+					*s_pV = cr;
+				}
+			}
+			s_pY++;
+			s_pU++;
+			s_pV++;
+			p_col++;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_yuv444p(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i;
+	u8 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pV;
+
+	pY += rc.y * surf->pitch_y;
+	pU += rc.y * surf->pitch_y;
+	pV = pU + surf->height * surf->pitch_y;
+
+	pY += rc.x;
+	pU += rc.x;
+	pV += rc.x;
+
+	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
+
+	for (i = 0; i < rc.height; i++) {
+		memset(pY, cy, rc.width);
+		pY += surf->pitch_y;
+		memset(pU, cb, rc.width);
+		pU += surf->pitch_y;
+		memset(pV, cr, rc.width);
+		pV += surf->pitch_y;
+	}
+	return GF_OK;
+}
+
+
+/*
+			YUYV part
+*/
+
+static void overmask_yuvy(char *dst, u8 c, u32 alpha)
+{
+	s32 srca = alpha;
+	u32 srcc = c;
+	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)
+{
+	char *pY;
+	s32 i;
+	u8 cy, cu, cv;
+
+	if (!count) return;
+
+	pY = surf->pixels + y * surf->pitch_y;
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+
+	for (i=0; i<count; i++) {
+		char *s_pY;
+		u32 len;
+		len = spans[i].len;
+		//get start of yuyv block: devide x by 2, multiply by 4 (two Y pix packed in 4 bytes)
+		s_pY = pY + (spans[i].x/2) * 4;
+		//move to first Y in block
+		s_pY += surf->idx_y1;
+		//if odd pixel move to next one
+		if (spans[i].x%2) s_pY += 2;
+
+		if (spans[i].coverage != 0xFF) {
+			memset(surf->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);
+
+			while (len--) {
+				*s_pY = cy;
+				s_pY += 2;
+			}
+		}
+	}
+
+	for (i=0; i<(s32) surf->width; i+=2) {
+		u32 a = (u32)surf->uv_alpha[i];
+		a += (u32)surf->uv_alpha[i + 1];
+		if (a) {
+			a /=2;
+			if (a==0xFF) {
+				pY[surf->idx_u] = cu;
+				pY[surf->idx_v] = cv;
+			} else if (a) {
+				overmask_yuvy(pY + surf->idx_u, cu, a);
+				overmask_yuvy(pY + surf->idx_v, cv, a);
+			}
+		}
+		pY+=4;
+	}
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+void evg_yuyv_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	char *pY;
+	s32 i;
+	u8 cy, cu, cv, a;
+
+	pY = surf->pixels + y * surf->pitch_y;
+	cy = GF_COL_R(surf->fill_col);
+	cu = GF_COL_G(surf->fill_col);
+	cv = GF_COL_B(surf->fill_col);
+	a = GF_COL_A(surf->fill_col);
+
+	for (i=0; i<count; i++) {
+		char *s_pY;
+		u32 fin, len;
+		len = spans[i].len;
+		s_pY = pY + (spans[i].x/2) * 4;
+		if (spans[i].x%2) s_pY += 2;
+
+		fin = mul255(a, spans[i].coverage);
+
+		memset(surf->uv_alpha + spans[i].x, (u8)fin, len);
+		while (len--) {
+			overmask_yuvy(s_pY + surf->idx_y1, cy, fin);
+			s_pY += 2;
+		}
+	}
+	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];
+		p_a /=2;
+		if (p_a==0xFF) {
+			pY[surf->idx_u] = cu;
+			pY[surf->idx_v] = cv;
+		} else if (p_a) {
+			overmask_yuvy(pY + surf->idx_u, cu, p_a);
+			overmask_yuvy(pY + surf->idx_v, cv, p_a);
+		}
+		pY+=4;
+	}
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+
+}
+
+void evg_yuyv_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	s32 i;
+	char *pY;
+
+	pY = surf->pixels + y * surf->pitch_y;
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha, col_a;
+		u32 *p_col;
+		char *s_pY;
+		u32 len, x;
+		len = spans[i].len;
+		s_pY = pY + (spans[i].x/2) * 4;
+		if (spans[i].x%2) s_pY += 2;
+
+		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;
+
+		while (len--) {
+			u32 col = *p_col;
+			col_a = GF_COL_A(col);
+			if (col_a) {
+				u32 idx=3*x;
+				u8 cy, cb, cr;
+				cy = GF_COL_R(col);
+				cb = GF_COL_G(col);
+				cr = GF_COL_B(col);
+
+				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
+					overmask_yuv420p(col_a, cy, s_pY + surf->idx_y1, spanalpha);
+
+					u8 a = mul255(col_a, spanalpha);
+					surf->uv_alpha[idx] = a;
+				} else {
+					s_pY[surf->idx_y1] = cy;
+					surf->uv_alpha[idx] = 0xFF;
+				}
+				surf->uv_alpha[idx+1] = cb;
+				surf->uv_alpha[idx+2] = cr;
+			}
+			s_pY+=2;
+			p_col++;
+			x++;
+		}
+	}
+	pY = surf->pixels + y * surf->pitch_y;
+	for (i=0; i<(s32)surf->width; i+=2) {
+		u32 a;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+		//get alpha
+		a = (u32)surf->uv_alpha[idx1] + (u32)surf->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 /= 2;
+			if (a==0xFF) {
+				pY[surf->idx_u] = chroma;
+			} else {
+				overmask_yuvy(pY + surf->idx_u, chroma, a);
+			}
+			//get cr
+			chroma = (u32)surf->uv_alpha[idx1+2] + (u32)surf->uv_alpha[idx2+2];
+			chroma /= 2;
+			if (a==0xFF) {
+				pY[surf->idx_v] = chroma;
+			} else {
+				overmask_yuvy(pY + surf->idx_v, chroma, a);
+			}
+		}
+		pY+=4;
+	}
+
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+
+}
+
+GF_Err evg_surface_clear_yuyv(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	u32 i;
+	s32 j;
+	u8 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *o_pY;
+	char *pY = surf->pixels;
+	pY += rc.y * surf->pitch_y;
+	pY += (rc.x/2) * 4;
+
+	gf_evg_rgb_to_yuv(surf, col, &cy, &cb, &cr);
+	o_pY = pY;
+	for (i = 0; i <(u32)rc.height; i++) {
+		if (!i) {
+			char *dst = pY;
+			for (j = 0; j < rc.width/2; j++) {
+				dst[surf->idx_y1] = cy;
+				dst[surf->idx_u] = cb;
+				dst[surf->idx_y1 + 2] = cy;
+				dst[surf->idx_v] = cr;
+				dst += 4;
+			}
+		} else {
+			memcpy(pY, o_pY, rc.width*2);
+		}
+		pY += surf->pitch_y;
+	}
+	return GF_OK;
+}
+
+
+#ifdef GPAC_BIG_ENDIAN
+
+#define set_u16_le(_ptr, val) { ((u8 *)_ptr)[0] = (val>>8)&0xFF;  ((u8 *)_ptr)[1] = (val&0xFF); }
+#define set_u16_be(_ptr, val) { *(u16 *) _ptr = (u16) val; }
+
+#define get_u16_le(val, _ptr) { val = ((u32) (*(u8 *) ptr+1)<< 8) | *(u8 *) ptr; }
+#define get_u16_be(val, _ptr) { val = *(u16 *) (_ptr); }
+
+#else
+
+#define set_u16_le(_ptr, val) { (*(u16 *) _ptr) = (u16) val; }
+#define set_u16_be(_ptr, val) { ((u8 *)_ptr)[0] = (val>>8)&0xFF;  ((u8 *)_ptr)[1] = (val&0xFF); }
+
+#define get_u16_le(val, _ptr) { val = *(u16 *) (_ptr); }
+#define get_u16_be(val, _ptr) { val = ((u32) (*(u8 *) ptr)<< 8) | *(u8 *) ptr+1; }
+
+#endif
+
+
+/*
+			YUV420p-10 part
+*/
+static s32
+mul_10(s64 a, s64 b)
+{
+	return (s32) ( ((a + 1) * b) >> 16);
+}
+
+static s32
+mul_10_zero(s64 a, s64 b)
+{
+	if (!a) return 0;
+	return (s32) ( ((a + 1) * b) >> 16);
+}
+
+static void overmask_yuv420p_10(u16 col_a, u16 cy, u16 *dst, u32 alpha)
+{
+	s32 srca = col_a;
+	u32 srcc = cy;
+	s32 dstc;
+	get_u16_le(dstc, dst);
+
+	srca = mul_10(srca, alpha);
+	set_u16_le(dst, (mul_10(srca, srcc - dstc) + dstc) );
+}
+
+static void overmask_yuv420p_10_const_run(u16 a, u16 val, u16 *ptr, u32 count, short x)
+{
+	while (count) {
+		u16 dst;
+		get_u16_le(dst, ptr);
+		set_u16_le(ptr, (u16) (mul_10(a, val - dst) + dst));
+		ptr ++;
+		count--;
+	}
+}
+
+void evg_yuv420p_10_flush_uv_const(GF_EVGSurface *surf, 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_odd = (u16 *) _surf_uv_alpha;
+	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;
+
+	//we are at an odd line, write uv
+	for (i=0; i<surf->width; i+=2) {
+		u16 dst;
+
+		//even line
+		a = surf_uv_alpha_even[i] + surf_uv_alpha_even[i+1];
+		//odd line
+		a += surf_uv_alpha_odd[i] + surf_uv_alpha_odd[i+1];
+
+		if (a) {
+			u16 *s_ptr_u, *s_ptr_v;
+
+			a /= 4;
+
+			s_ptr_u = ((u16 *) pU) + i/2;
+			s_ptr_v = ((u16 *) pV) + i/2;
+			if (a==0xFFFF) {
+				set_u16_le(s_ptr_u, cu);
+				set_u16_le(s_ptr_v, cv);
+			} else {
+				get_u16_le(dst, s_ptr_u);
+				set_u16_le(s_ptr_u, (u16) (mul_10(a, cu - dst) + dst) );
+				get_u16_le(dst, s_ptr_v);
+				set_u16_le(s_ptr_v, (u16) (mul_10(a, cv - dst) + dst) );
+			}
+		}
+	}
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+void evg_yuv420p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u16 *pY;
+	u16 *surf_uv_alpha;
+	s32 i;
+	u16 cy, cu, cv;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = (u16 *)surf->uv_alpha;
+	}
+	else if (write_uv) {
+		surf_uv_alpha = ((u16 *)surf->uv_alpha) + surf->width;
+	} else {
+		surf_uv_alpha = (u16 *)surf->uv_alpha;
+	}
+
+	pY =  (u16 *) (surf->pixels + y * surf->pitch_y);
+
+	cy = (surf->fill_col_wide>>32) & 0xFFFF;
+	cy >>=6;
+	cu = (surf->fill_col_wide>>16) & 0xFFFF;
+	cu >>=6;
+	cv = (surf->fill_col_wide) & 0xFFFF;
+	cv >>=6;
+
+	for (i=0; i<count; i++) {
+		u32 a;
+		u16 *s_pY;
+		u32 j, len;
+		len = spans[i].len;
+		s_pY = pY + spans[i].x;
+
+		a = 0xFF * spans[i].coverage;
+		for (j=0; j<len; j++) {
+			surf_uv_alpha[spans[i].x + j] = a;
+		}
+
+		if (spans[i].coverage != 0xFF) {
+			overmask_yuv420p_10_const_run(a, cy, s_pY, len, 0);
+		} else  {
+			while (len--) {
+				set_u16_le(s_pY, cy);
+				s_pY ++;
+			}
+		}
+	}
+	if (write_uv) {
+		surf->yuv_flush_uv(surf, (u8 *)surf_uv_alpha, cu, cv, y);
+	}
+
+}
+
+void evg_yuv420p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 a;
+	u16 *pY;
+	u16 *surf_uv_alpha;
+	s32 i;
+	u16 cy, cu, cv;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = (u16 *)surf->uv_alpha;
+	} else if (write_uv) {
+		surf_uv_alpha = (u16 *)surf->uv_alpha + surf->width;
+	} else {
+		surf_uv_alpha = (u16 *)surf->uv_alpha;
+	}
+
+	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
+
+
+	a = (surf->fill_col_wide>>48) & 0xFFFF;
+	cy = (surf->fill_col_wide>>32) & 0xFFFF;
+	cy >>=6;
+	cu = (surf->fill_col_wide>>16) & 0xFFFF;
+	cu >>=6;
+	cv = (surf->fill_col_wide) & 0xFFFF;
+	cv >>=6;
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				u16 *s_pY;
+				u32 fin;
+				s32 x = spans[i].x + j;
+				s_pY = pY + x;
+				fin = surf->get_alpha(surf->get_alpha_udta, a, x, y) * spans[i].coverage;
+				fin /= 0xFF;
+
+				overmask_yuv420p_10_const_run(fin, cy, s_pY, 1, 0);
+				surf_uv_alpha[x] = fin;
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			u16 *s_pY;
+			u32 fin, len, j;
+			len = spans[i].len;
+			s_pY = pY + spans[i].x;
+			fin = a * spans[i].coverage;
+			fin /= 0xFF;
+
+			overmask_yuv420p_10_const_run(fin, cy, s_pY, len, 0);
+
+			for (j=0; j<len; j++) {
+				surf_uv_alpha[spans[i].x + j] = fin;
+			}
+		}
+	}
+	//we are at an odd line, write uv
+	if (write_uv)
+		surf->yuv_flush_uv(surf, (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)
+{
+	u32 i;
+	u16 *surf_uv_alpha_even = (u16 *) surf->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);
+	pV = (u16 *) (surf->pixels + 5*surf->height *surf->pitch_y/4 + y/2 * surf->pitch_y/2);
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a11, a12, a21, a22;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+
+		//get alpha
+		a11 = (u32)surf_uv_alpha_even[idx1];
+		a12 = (u32)surf_uv_alpha_even[idx2];
+		a21 = (u32)surf_uv_alpha_odd[idx1];
+		a22 = (u32)surf_uv_alpha_odd[idx2];
+
+		a = a11+a12+a21+a22;
+		if (a) {
+			s32 cdst=0;
+			s32 chroma_u, chroma_v, c11, c12, c21, c22;
+
+			a /= 4;
+
+			//get cb
+			idx1 += 1;
+			idx2 += 1;
+
+			if (a!=0xFFFF) {
+				get_u16_le(cdst, pU);
+			}
+			c11 = (u32)surf_uv_alpha_even[idx1];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha_even[idx2];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+			c21 = (u32)surf_uv_alpha_odd[idx1];
+			if (a21!=0xFFFF) c21 = mul_10_zero(a21, c21 - cdst) + cdst;
+			c22 = (u32)surf_uv_alpha_odd[idx2];
+			if (a22!=0xFFFF) c22 = mul_10_zero(a22, c22 - cdst) + cdst;
+
+			chroma_u = c11 + c12 + c21 + c22;
+			chroma_u /= 4;
+			set_u16_le(pU, (u16) chroma_u);
+
+			//get cr
+			idx1 += 1;
+			idx2 += 1;
+
+			if (a!=0xFFFF) {
+				get_u16_le(cdst, pV);
+			}
+			c11 = (u32)surf_uv_alpha_even[idx1];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha_even[idx2];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+			c21 = (u32)surf_uv_alpha_odd[idx1];
+			if (a21!=0xFFFF) c21 = mul_10_zero(a21, c21 - cdst) + cdst;
+			c22 = (u32)surf_uv_alpha_odd[idx2];
+			if (a22!=0xFFFF) c22 = mul_10_zero(a22, c22 - cdst) + cdst;
+
+			chroma_v = c11 + c12 + c21 + c22;
+			chroma_v /= 4;
+			set_u16_le(pV, (u16) chroma_v);
+		}
+		pU++;
+		pV++;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+
+}
+
+void evg_yuv420p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	s32 i;
+	u16 *pY;
+	u16 *surf_uv_alpha;
+	Bool write_uv = (y%2) ? GF_TRUE : GF_FALSE;
+
+	if (surf->is_422) {
+		write_uv = GF_TRUE;
+		surf_uv_alpha = (u16 *) surf->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;
+	} else {
+		//first line of storage
+		surf_uv_alpha =  (u16 *) surf->uv_alpha;
+	}
+
+	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha;
+		u32 len;
+		u64 *p_col;
+		u16 *s_pY;
+		short x;
+		len = spans[i].len;
+		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;
+
+		while (len--) {
+			u64 col = *p_col;
+			u32 col_a = (col>>48)&0xFFFF;
+			if (col_a) {
+				u16 cy, cb, cr;
+				u32 idx=3*x;
+				//col is directly packed as AYCbCr
+				cy = ((col>>32) & 0xFFFF) >> 6;
+				cb = ((col>>16) & 0xFFFF) >> 6;
+				cr = ((col) & 0xFFFF) >> 6;
+
+				if ((spanalpha!=0xFF) || (col_a != 0xFFFF)) {
+					u16 spana = spanalpha;
+					spana <<= 8;
+					overmask_yuv420p_10(col_a, cy, s_pY, spana);
+					surf_uv_alpha[idx] = mul_10(col_a, spana);
+				} else {
+					set_u16_le(s_pY, cy);
+					surf_uv_alpha[idx] = 0xFFFF;
+				}
+				surf_uv_alpha[idx+1] = cb;
+				surf_uv_alpha[idx+2] = cr;
+			}
+			s_pY++;
+			p_col++;
+			x++;
+		}
+	}
+	//compute final u,v for both lines
+	if (write_uv) {
+		surf->yuv_flush_uv(surf, (u8 *)surf_uv_alpha, 0, 0, y);
+	}
+}
+
+GF_Err evg_surface_clear_yuv420p_10(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i, j;
+	u8 _cy, _cb, _cr;
+	u16 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	u16 *pY, *pU, *pV, *o_pY, *o_pU, *o_pV;
+
+	pY = (u16 *) (surf->pixels + rc.y * surf->pitch_y + 2*rc.x);
+	pU = (u16 *) (surf->pixels + surf->height * surf->pitch_y + rc.y/2 * surf->pitch_y/2 + rc.x);
+	pV = (u16 *) (surf->pixels + 5*surf->height * surf->pitch_y/4 + rc.y/2 * surf->pitch_y/2 + rc.x);
+
+	gf_evg_rgb_to_yuv(surf, col, &_cy, &_cb, &_cr);
+	cy = ((u16)_cy) << 2;
+	cb = ((u16)_cb) << 2;
+	cr = ((u16)_cr) << 2;
+	o_pY = pY;
+	o_pU = pU;
+	o_pV = pV;
+	for (i = 0; i <rc.height; i++) {
+		if (!i) {
+			if (cy) {
+				for (j=0; j<rc.width; j++)
+					set_u16_le(&pY[j] , cy);
+			} else {
+				memset(pY, 0, rc.width*2);
+			}
+		} else {
+			memcpy(pY, o_pY, rc.width*2);
+		}
+		//pitch is in bytes, we are in short
+		pY += surf->pitch_y/2;
+
+		if (i%2) continue;
+
+		if (!i) {
+			for (j=0; j<rc.width/2; j++) {
+				set_u16_le(&pU[j], cb);
+				set_u16_le(&pV[j], cr);
+			}
+		} else {
+			memcpy(pU, o_pU, rc.width);//half width at 2 bytes per short
+			memcpy(pV, o_pV, rc.width);
+		}
+		//pitch is in bytes, we are in short
+		pU += surf->pitch_y/4;
+		pV += surf->pitch_y/4;
+	}
+	return GF_OK;
+}
+
+/*
+			NV12 / NV21 10 bit part
+*/
+
+
+void evg_nv12_10_flush_uv_const(GF_EVGSurface *surf, 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_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;
+	u8 *pV = pUV + 2*surf->idx_v;
+
+	for (i=0; i<surf->width; i+=2) {
+		//even line
+		a = surf_uv_alpha_even[i] + surf_uv_alpha_even[i+1];
+		//odd line
+		a += surf_uv_alpha_odd[i] + surf_uv_alpha_odd[i+1];
+
+		if (a) {
+			s32 dst;
+			a /= 4;
+
+			if (a==0xFFFF) {
+				set_u16_le(pU, cu);
+				set_u16_le(pV, cv);
+			} else {
+				get_u16_le(dst, pU);
+				set_u16_le(pU, (u16) (mul_10(a, cu - dst) + dst) );
+				get_u16_le(dst, pV);
+				set_u16_le(pV, (u16) (mul_10(a, cv - dst) + dst) );
+			}
+		}
+		pU += 4;
+		pV += 4;
+	}
+	memset(surf->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)
+{
+	u32 i;
+	u16 *surf_uv_alpha_even = (u16 *) surf->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;
+	u8 *pV = pUV + 2*surf->idx_v;
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a11, a12, a21, a22;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+		//get alpha
+		a11 = (u32)surf_uv_alpha_even[idx1];
+		a12 = (u32)surf_uv_alpha_even[idx2];
+		a21 = (u32)surf_uv_alpha_odd[idx1];
+		a22 = (u32)surf_uv_alpha_odd[idx2];
+		a = a11+a12+a21+a22;
+
+		if (a) {
+			s32 cdst=0, chroma_u, chroma_v, c11, c12, c21, c22;
+
+			a /= 4;
+
+			//get cb
+			idx1 += 1;
+			idx2 += 1;
+			if (a!=0xFFFF)
+				get_u16_le(cdst, pU);
+
+			c11 = (u32)surf_uv_alpha_even[idx1];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha_even[idx2];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+			c21 = (u32)surf_uv_alpha_odd[idx1];
+			if (a21!=0xFFFF) c21 = mul_10_zero(a21, c21 - cdst) + cdst;
+			c22 = (u32)surf_uv_alpha_odd[idx2];
+			if (a22!=0xFFFF) c22 = mul_10_zero(a22, c22 - cdst) + cdst;
+
+			chroma_u = c11+c12+c21+c22;
+			chroma_u /= 4;
+
+			//get cr
+			idx1 += 1;
+			idx2 += 1;
+			if (a!=0xFFFF)
+				get_u16_le(cdst, pV);
+
+			c11 = (u32)surf_uv_alpha_even[idx1];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha_even[idx2];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+			c21 = (u32)surf_uv_alpha_odd[idx1];
+			if (a21!=0xFFFF) c21 = mul_10_zero(a21, c21 - cdst) + cdst;
+			c22 = (u32)surf_uv_alpha_odd[idx2];
+			if (a22!=0xFFFF) c22 = mul_10_zero(a22, c22 - cdst) + cdst;
+
+			chroma_v = c11+c12+c21+c22;
+			chroma_v /= 4;
+
+
+			set_u16_le(pU, chroma_u);
+			set_u16_le(pV, chroma_v);
+		}
+		pU += 4;
+		pV += 4;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+
+GF_Err evg_surface_clear_nv12_10(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col, Bool swap_uv)
+{
+	s32 i, j;
+	u8 _cy, _cb, _cr;
+	u16 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	u16 *s_pY, *s_pU;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pU_first, *pY_first;
+
+	pY += rc.y * surf->pitch_y;
+	pU +=  rc.y/2 * surf->pitch_y;
+
+	pY += 2*rc.x;
+	pU += 2*rc.x;
+	pU_first = pU;
+	pY_first = pY;
+
+	gf_evg_rgb_to_yuv(surf, col, &_cy, &_cb, &_cr);
+
+	if (swap_uv) {
+		u8 t = _cb;
+		_cb = _cr;
+		_cr = t;
+	}
+	cy = ((u16)_cy) << 2;
+	cb = ((u16)_cb) << 2;
+	cr = ((u16)_cr) << 2;
+
+	s_pY = (u16 *) pY;
+	s_pU = (u16 *) pU;
+
+	//init first lines
+	if (cy) {
+		for (j=0; j<rc.width;j++) {
+			set_u16_le(&s_pY[j], cy);
+		}
+	} else {
+		memset(s_pY, 0, 2*rc.width);
+	}
+	s_pY += surf->pitch_y/2;
+
+	for (j=0; j<rc.width/2; j++) {
+		set_u16_le(&s_pU[2*j], cb);
+		set_u16_le(&s_pU[2*j + 1], cr);
+	}
+	s_pU += surf->pitch_y/2;
+
+	for (i = 1; i < rc.height; i++) {
+
+		memcpy(s_pY, pY_first, 2*rc.width);
+		s_pY += surf->pitch_y/2;
+
+		if (i%2) continue;
+
+		//non-first uv line recopy from first (half width, U and V mix, 2 bytes = width*2)
+		memcpy(s_pU, pU_first, 2*rc.width);
+		s_pU += surf->pitch_y/2;
+	}
+	return GF_OK;
+}
+
+
+
+/*
+			YUV422 10 part
+*/
+
+void evg_yuv422p_10_flush_uv_const(GF_EVGSurface *surf, 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;
+	pU +=  y * surf->pitch_y/2;
+	pV = pU + surf->height * surf->pitch_y/2;
+
+	for (i=0; i<surf->width; i+=2) {
+		a = surf_uv_alpha[i] + surf_uv_alpha[i+1];
+
+		if (a) {
+			s32 dst;
+			u16 *s_ptr_u, *s_ptr_v;
+
+			a /= 2;
+
+			s_ptr_u = (u16*)pU + i / 2;
+			s_ptr_v = (u16*)pV + i / 2;
+			if (a==0xFFFF) {
+				set_u16_le(s_ptr_u, (u16) cu);
+				set_u16_le(s_ptr_v, (u16) cv);
+
+			} else {
+				get_u16_le(dst, s_ptr_u);
+				set_u16_le(s_ptr_u, (u16) (mul_10(a, cu - dst) + dst) );
+
+				get_u16_le(dst, s_ptr_v);
+				set_u16_le(s_ptr_v, (u16) (mul_10(a, cv - dst) + dst));
+			}
+		}
+	}
+	memset(surf->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)
+{
+	u32 i;
+	u16 *surf_uv_alpha = (u16 *) surf->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);
+
+	for (i=0; i<surf->width; i+=2) {
+		u32 a, a11, a12;
+		u32 idx1=3*i;
+		u32 idx2=3*i + 3;
+		//get alpha
+		a11 = surf_uv_alpha[idx1];
+		a12 = surf_uv_alpha[idx2];
+		a=a11+a12;
+
+		if (a) {
+			s32 cdst=0, chroma_u, chroma_v, c11, c12;
+
+			a /= 2;
+
+			//get cb
+			if (a!=0xFFFF)
+				get_u16_le(cdst, pU);
+
+			c11 = (u32)surf_uv_alpha[idx1+1];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha[idx2+1];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+
+			chroma_u = c11 + c12;
+			chroma_u /= 2;
+			set_u16_le(pU, (u16) chroma_u);
+
+			//get cr
+			if (a!=0xFFFF)
+				get_u16_le(cdst, pV);
+
+			c11 = (u32)surf_uv_alpha[idx1+2];
+			if (a11!=0xFFFF) c11 = mul_10_zero(a11, c11 - cdst) + cdst;
+			c12 = (u32)surf_uv_alpha[idx2+2];
+			if (a12!=0xFFFF) c12 = mul_10_zero(a12, c12 - cdst) + cdst;
+
+			chroma_v = c11 + c12;
+			chroma_v /= 2;
+			set_u16_le(pV, (u16) chroma_v);
+		}
+		pU++;
+		pV++;
+	}
+	//reset for next pass
+	memset(surf->uv_alpha, 0, surf->uv_alpha_alloc);
+}
+
+
+GF_Err evg_surface_clear_yuv422p_10(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i, j;
+	u8 _cy, _cb, _cr;
+	u16 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pV;
+	char *o_pY, *o_pU, *o_pV;
+
+	pY += rc.y * surf->pitch_y;
+	pU +=  rc.y/2 * surf->pitch_y/2;
+	pV = pU + surf->height/2 * surf->pitch_y/2;
+
+	pY += 2*rc.x;
+	pU += rc.x;
+	pV += rc.x;
+
+	o_pY = pY;
+	o_pU = pU;
+	o_pV = pV;
+	gf_evg_rgb_to_yuv(surf, col, &_cy, &_cb, &_cr);
+
+	cy = ((u16)_cy) << 2;
+	cb = ((u16)_cb) << 2;
+	cr = ((u16)_cr) << 2;
+
+	for (i = 0; i < rc.height; i++) {
+		if (!i) {
+			for (j=0; j<rc.width; j++) {
+				set_u16_le(&((u16 *)pY)[j], cy);
+				if (j%2) {
+					set_u16_le(&((u16 *)pU)[j/2], cb);
+					set_u16_le(& ((u16 *)pV)[j/2], cr);
+				}
+			}
+		} else {
+			memcpy(pY, o_pY, 2*rc.width);
+			memcpy(pU, o_pU, rc.width);
+			memcpy(pV, o_pV, rc.width);
+		}
+		pY += surf->pitch_y;
+		pU += surf->pitch_y/2;
+		pV += surf->pitch_y/2;
+	}
+	return GF_OK;
+}
+
+
+/*
+			YUV444 10bits part
+*/
+
+void evg_yuv444p_10_fill_const(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u16 *pY, *pU, *pV;
+	s32 i;
+	u32 cy, cu, cv;
+
+	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
+	pU = (u16 *) (surf->pixels + surf->height*surf->pitch_y + y * surf->pitch_y);
+	pV = (u16 *) (surf->pixels + 2*surf->height*surf->pitch_y + y * surf->pitch_y);
+
+	cy = (surf->fill_col_wide>>32) & 0xFFFF;
+	cy >>=6;
+	cu = (surf->fill_col_wide>>16) & 0xFFFF;
+	cu >>=6;
+	cv = (surf->fill_col_wide) & 0xFFFF;
+	cv >>=6;
+
+	for (i=0; i<count; i++) {
+		u32 a;
+		u16 *s_pY, *s_pU, *s_pV;
+		u32 len;
+		len = spans[i].len;
+		s_pY = pY + spans[i].x;
+		s_pU = pU + spans[i].x;
+		s_pV = pV + spans[i].x;
+
+		if (spans[i].coverage != 0xFF) {
+			a = 0xFF * spans[i].coverage;
+
+			overmask_yuv420p_10_const_run(a, cy, s_pY, len, 0);
+			overmask_yuv420p_10_const_run(a, cu, s_pU, len, 0);
+			overmask_yuv420p_10_const_run(a, cv, s_pV, len, 0);
+		} else {
+			while (len--) {
+				set_u16_le(s_pY, cy);
+				s_pY ++;
+				set_u16_le(s_pU, cu);
+				s_pU ++;
+				set_u16_le(s_pV, cv);
+				s_pV ++;
+			}
+		}
+	}
+}
+
+void evg_yuv444p_10_fill_const_a(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	u32 a;
+	u16 *pY, *pU, *pV;
+	s32 i;
+	u32 cy, cu, cv;
+
+	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
+	pU = (u16 *) (surf->pixels + surf->height*surf->pitch_y + y * surf->pitch_y);
+	pV = (u16 *) (surf->pixels + 2*surf->height*surf->pitch_y + y * surf->pitch_y);
+
+	a = (surf->fill_col_wide>>48) & 0xFFFF;
+	cy = (surf->fill_col_wide>>32) & 0xFFFF;
+	cy >>=6;
+	cu = (surf->fill_col_wide>>16) & 0xFFFF;
+	cu >>=6;
+	cv = (surf->fill_col_wide) & 0xFFFF;
+	cv >>=6;
+
+	if (surf->get_alpha) {
+		for (i=0; i<count; i++) {
+			u32 j;
+			for (j=0; j<spans[i].len; j++) {
+				u16 *s_pY, *s_pU, *s_pV;
+				u32 fin;
+				s32 x = spans[i].x + j;
+				s_pY = pY + x;
+				s_pU = pU + x;
+				s_pV = pV + x;
+
+				fin = surf->get_alpha(surf->get_alpha_udta, a, x, y) * spans[i].coverage;
+				fin /= 0xFF;
+
+				overmask_yuv420p_10_const_run(fin, cy, s_pY, 1, 0);
+				overmask_yuv420p_10_const_run(fin, cu, s_pU, 1, 0);
+				overmask_yuv420p_10_const_run(fin, cv, s_pV, 1, 0);
+			}
+		}
+	} else {
+		for (i=0; i<count; i++) {
+			u16 *s_pY, *s_pU, *s_pV;
+			u32 fin, len;
+			len = spans[i].len;
+			s_pY = pY + spans[i].x;
+			s_pU = pU + spans[i].x;
+			s_pV = pV + spans[i].x;
+
+			fin = a * spans[i].coverage;
+			fin /= 0xFF;
+
+			overmask_yuv420p_10_const_run(fin, cy, s_pY, len, 0);
+			overmask_yuv420p_10_const_run(fin, cu, s_pU, len, 0);
+			overmask_yuv420p_10_const_run(fin, cv, s_pV, len, 0);
+		}
+	}
+}
+
+void evg_yuv444p_10_fill_var(s32 y, s32 count, EVG_Span *spans, GF_EVGSurface *surf)
+{
+	s32 i;
+	u16 *pY, *pU, *pV;
+
+	pY = (u16 *) (surf->pixels + y * surf->pitch_y);
+	pU = (u16 *) (surf->pixels + surf->height*surf->pitch_y + y * surf->pitch_y);
+	pV = (u16 *) (surf->pixels + 2*surf->height*surf->pitch_y + y * surf->pitch_y);
+
+	for (i=0; i<count; i++) {
+		u8 spanalpha;
+		u32 len;
+		u64 *p_col;
+		u16 *s_pY, *s_pU, *s_pV;
+		len = spans[i].len;
+		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;
+		s_pV = pV + spans[i].x;
+
+		while (len--) {
+			u64 col = *p_col;
+			u32 col_a = (col>>48)&0xFFFF;
+			if (col_a) {
+				u16 cy, cb, cr;
+				//col is directly packed as AYCbCr
+				cy = ((col>>32) & 0xFFFF) >> 6;
+				cb = ((col>>16) & 0xFFFF) >> 6;
+				cr = ((col) & 0xFFFF) >> 6;
+
+				if ((spanalpha!=0xFF) || (col_a != 0xFFFF)) {
+					u16 spana = spanalpha;
+					spana <<= 8;
+					overmask_yuv420p_10(col_a, cy, s_pY, spana);
+					overmask_yuv420p_10(col_a, cb, s_pU, spana);
+					overmask_yuv420p_10(col_a, cr, s_pV, spana);
+				} else {
+					set_u16_le(s_pY, cy);
+					set_u16_le(s_pU, cb);
+					set_u16_le(s_pV, cr);
+				}
+			}
+			s_pY++;
+			s_pU++;
+			s_pV++;
+			p_col++;
+		}
+	}
+}
+
+GF_Err evg_surface_clear_yuv444p_10(GF_EVGSurface *_surf, GF_IRect rc, GF_Color col)
+{
+	s32 i;
+	u8 _cy, _cb, _cr;
+	u16 cy, cb, cr;
+	GF_EVGSurface *surf = (GF_EVGSurface *)_surf;
+	char *pY = surf->pixels;
+	char *pU = surf->pixels + surf->height *surf->pitch_y;
+	char *pV, *o_pY, *o_pU, *o_pV;
+
+	pY += rc.y * surf->pitch_y;
+	pU += rc.y * surf->pitch_y;
+	pV = pU + surf->height * surf->pitch_y;
+
+	pY += 2*rc.x;
+	pU += 2*rc.x;
+	pV += 2*rc.x;
+
+	gf_evg_rgb_to_yuv(surf, col, &_cy, &_cb, &_cr);
+
+	cy = ((u16)_cy) << 2;
+	cb = ((u16)_cb) << 2;
+	cr = ((u16)_cr) << 2;
+
+	o_pY = pY;
+	o_pU = pU;
+	o_pV = pV;
+
+	for (i = 0; i < rc.height; i++) {
+		if (!i) {
+			s32 j;
+			for (j=0; j<rc.width; j++) {
+				set_u16_le(& ((u16 *)pY)[j], cy);
+				set_u16_le(& ((u16 *)pU)[j], cb);
+				set_u16_le(& ((u16 *)pV)[j], cr);
+			}
+		} else {
+			memcpy(pY, o_pY, 2*rc.width);
+			memcpy(pU, o_pU, 2*rc.width);
+			memcpy(pV, o_pV, 2*rc.width);
+		}
+		pY += surf->pitch_y;
+		pU += surf->pitch_y;
+		pV += surf->pitch_y;
+	}
+	return GF_OK;
+}

gpac-1.0.0.tar.gz/src/evg/stencil.c Added

@@ -0,0 +1,2021 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer module
+ *
+ *  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 "rast_soft.h"
+
+static GF_EVGStencil *evg_solid_brush();
+static GF_EVGStencil *evg_texture_brush();
+static GF_EVGStencil *evg_linear_gradient_brush();
+static GF_EVGStencil *evg_radial_gradient_brush();
+
+
+
+GF_Color color_interpolate(u32 a, u32 b, u8 pos)
+{
+	u32 ca = ((a>>24)     )*(u32)(0xFF-pos)+((b>>24)     )*(u32)pos;
+	u32 cr = ((a>>16)&0xFF)*(u32)(0xFF-pos)+((b>>16)&0xFF)*(u32)pos;
+	u32 cg = ((a>> 8)&0xFF)*(u32)(0xFF-pos)+((b>> 8)&0xFF)*(u32)pos;
+	u32 cb = ((a    )&0xFF)*(u32)(0xFF-pos)+((b    )&0xFF)*(u32)pos;
+	return	(((ca+(ca>>8)+1)>>8)<<24)|
+	        (((cr+(cr>>8)+1)>>8)<<16)|
+	        (((cg+(cg>>8)+1)>>8)<< 8)|
+	        (((cb+(cb>>8)+1)>>8)    );
+}
+
+
+
+
+/*
+	Generic gradient tools
+*/
+
+#define EVGGRADIENTBUFFERSIZE	(1<<EVGGRADIENTBITS)
+#define EVGGRADIENTMAXINTPOS		EVGGRADIENTBUFFERSIZE - 1
+
+static void gradient_update(EVG_BaseGradient *_this)
+{
+	s32 i, c;
+	s32 start, end, diff;
+	Fixed maxPos = INT2FIX(EVGGRADIENTMAXINTPOS);
+
+	_this->updated = 1;
+
+	if (_this->pos[0]>=0) {
+		if(_this->pos[0]>0) {
+			end = FIX2INT(gf_mulfix(_this->pos[0], maxPos));
+			for (i=0; i<= end; i++) {
+				_this->precomputed_argb[i] = _this->col[0];
+			}
+		}
+		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));
+				diff = end-start;
+
+				if (diff) {
+					for (i=start; i<=end; i++) {
+						_this->precomputed_argb[i] = color_interpolate(_this->col[c], _this->col[c+1],
+						                                  (u8) ( ( (i-start) * 255) / diff) );
+					}
+				}
+			} else {
+				start = FIX2INT(gf_mulfix(_this->pos[c+0], maxPos));
+				for(i=start; i<=EVGGRADIENTMAXINTPOS; i++) {
+					_this->precomputed_argb[i] = _this->col[c];
+				}
+			}
+		}
+	}
+}
+
+static u32 gradient_get_color(EVG_BaseGradient *_this, s32 pos)
+{
+	s32 max_pos = 1 << EVGGRADIENTBITS;
+
+	switch (_this->mod) {
+	case GF_GRADIENT_MODE_SPREAD:
+		if (pos<0) pos = -pos;
+		return _this->precomputed_dest[(pos & max_pos) ?  EVGGRADIENTMAXINTPOS - (pos % max_pos) :  pos % max_pos];
+
+	case GF_GRADIENT_MODE_REPEAT:
+		while (pos < 0) pos += max_pos;
+		return _this->precomputed_dest[pos % max_pos];
+
+	case GF_GRADIENT_MODE_PAD:
+	default:
+		return _this->precomputed_dest[ MIN(EVGGRADIENTMAXINTPOS, MAX((s32) 0, pos))];
+	}
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_gradient_interpolation(GF_EVGStencil * p, Fixed *pos, GF_Color *col, u32 count)
+{
+	EVG_BaseGradient *_this = (EVG_BaseGradient *) p;
+	if ( (_this->type != GF_STENCIL_LINEAR_GRADIENT) && (_this->type != GF_STENCIL_RADIAL_GRADIENT) ) return GF_BAD_PARAM;
+	if (count>=EVGGRADIENTSLOTS-1) return GF_OUT_OF_MEM;
+	if (count) {
+		memcpy(_this->col, col, sizeof(GF_Color) * count);
+		memcpy(_this->pos, pos, sizeof(Fixed) * count);
+	}
+	_this->col[count] = 0;
+	_this->pos[count] = -FIX_ONE;
+	gradient_update(_this);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_stencil_push_gradient_interpolation(GF_EVGStencil * p, Fixed pos, GF_Color col)
+{
+	u32 count=0;
+	EVG_BaseGradient *_this = (EVG_BaseGradient *) p;
+	if ( (_this->type != GF_STENCIL_LINEAR_GRADIENT) && (_this->type != GF_STENCIL_RADIAL_GRADIENT) ) return GF_BAD_PARAM;
+	while (count<EVGGRADIENTSLOTS-1) {
+		if (_this->pos[count]==-FIX_ONE) break;
+		count++;
+	}
+	if (count>=EVGGRADIENTSLOTS-1) return GF_OUT_OF_MEM;
+	_this->col[count] = col;
+	_this->pos[count] = pos;
+	count++;
+	_this->col[count] = 0;
+	_this->pos[count] = -FIX_ONE;
+	gradient_update(_this);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_gradient_mode(GF_EVGStencil * p, GF_GradientMode mode)
+{
+	EVG_BaseGradient *_this = (EVG_BaseGradient *) p;
+	if ( (_this->type != GF_STENCIL_LINEAR_GRADIENT) && (_this->type != GF_STENCIL_RADIAL_GRADIENT) ) return GF_BAD_PARAM;
+	_this->mod = mode;
+	return GF_OK;
+}
+
+/*
+	Generic stencil
+*/
+
+GF_EXPORT
+GF_EVGStencil * gf_evg_stencil_new(GF_StencilType type)
+{
+	GF_EVGStencil *st;
+	switch (type) {
+	case GF_STENCIL_SOLID:
+		st = evg_solid_brush();
+		break;
+	case GF_STENCIL_LINEAR_GRADIENT:
+		st = evg_linear_gradient_brush();
+		break;
+	case GF_STENCIL_RADIAL_GRADIENT:
+		st = evg_radial_gradient_brush();
+		break;
+	case GF_STENCIL_TEXTURE:
+		st = evg_texture_brush();
+		break;
+	default:
+		return 0L;
+	}
+	if (st) {
+		gf_mx2d_init(st->pmat);
+		gf_mx2d_init(st->smat);
+		gf_cmx_init(&st->cmat);
+	}
+	return st;
+}
+
+GF_EXPORT
+void gf_evg_stencil_delete(GF_EVGStencil * st)
+{
+	GF_EVGStencil *_this = (GF_EVGStencil *) st;
+	switch(_this->type) {
+	case GF_STENCIL_SOLID:
+	case GF_STENCIL_LINEAR_GRADIENT:
+	case GF_STENCIL_RADIAL_GRADIENT:
+		gf_free(_this);
+		return;
+	case GF_STENCIL_TEXTURE:
+	{
+		EVG_Texture *tx = (EVG_Texture *)_this;
+		/*destroy local texture iof any*/
+		if (tx->owns_texture && tx->pixels) gf_free(tx->pixels);
+		gf_free(_this);
+	}
+	return;
+	}
+}
+
+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 (mx) {
+		gf_mx2d_copy(_this->smat, *mx);
+	} else {
+		gf_mx2d_init(_this->smat);
+	}
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_StencilType gf_evg_stencil_type(GF_EVGStencil *sten)
+{
+	return sten ? sten->type : 0;
+}
+
+/*
+	Solid color stencil
+*/
+
+static GF_EVGStencil *evg_solid_brush()
+{
+	EVG_Brush *tmp;
+	GF_SAFEALLOC(tmp, EVG_Brush);
+	if (!tmp) return 0L;
+	tmp->fill_run = NULL;
+	tmp->color = 0xFF000000;
+	tmp->type = GF_STENCIL_SOLID;
+	return (GF_EVGStencil *) tmp;
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_brush_color(GF_EVGStencil * st, GF_Color c)
+{
+	EVG_Brush *_this = (EVG_Brush *) st;
+	if (!_this  || (_this ->type != GF_STENCIL_SOLID) ) return GF_BAD_PARAM;
+	_this->color = c;
+	return GF_OK;
+}
+
+
+/*
+	linear gradient stencil
+*/
+
+static void lg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, 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;
+	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];
+
+		col = gradient_get_color((EVG_BaseGradient *)_this, val );
+		if (data_wide) *data_wide++ = evg_col_to_wide(col);
+		else *data++ = col;
+
+		count--;
+	}
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_linear_gradient(GF_EVGStencil * st, Fixed start_x, Fixed start_y, Fixed end_x, Fixed end_y)
+{
+	GF_Matrix2D mtx;
+	GF_Point2D s;
+	Fixed f;
+	EVG_LinearGradient *_this = (EVG_LinearGradient *) st;
+	if (_this->type != GF_STENCIL_LINEAR_GRADIENT) return GF_BAD_PARAM;
+
+	_this->start.x = start_x;
+	_this->start.y = start_y;
+	_this->end.x = end_x;
+	_this->end.y = end_y;
+	s.x = end_x - start_x;
+	s.y = end_y - start_y;
+	f = gf_v2d_len(&s);
+	if (f) f = gf_invfix(f);
+
+	gf_mx2d_init(mtx);
+	mtx.m[2] = - _this->start.x;
+	mtx.m[5] = - _this->start.y;
+	_this->vecmat = mtx;
+
+	gf_mx2d_init(mtx);
+	gf_mx2d_add_rotation(&mtx, 0, 0, - gf_atan2(s.y, s.x));
+	gf_mx2d_add_matrix(&_this->vecmat, &mtx);
+
+	gf_mx2d_init(mtx);
+	gf_mx2d_add_scale(&mtx, f, f);
+	gf_mx2d_add_matrix(&_this->vecmat, &mtx);
+	return GF_OK;
+}
+
+static GF_EVGStencil *evg_linear_gradient_brush()
+{
+	s32 i;
+	EVG_LinearGradient *tmp;
+	GF_SAFEALLOC(tmp, EVG_LinearGradient);
+	if (!tmp) return 0L;
+	gf_mx2d_init(tmp->vecmat);
+	tmp->fill_run = lg_fill_run;
+	tmp->type = GF_STENCIL_LINEAR_GRADIENT;
+	for(i=0; i<EVGGRADIENTSLOTS; i++) tmp->pos[i]=-1;
+
+	tmp->alpha = 0xFF;
+	gf_evg_stencil_set_linear_gradient((GF_EVGStencil *)tmp, 0, 0, FIX_ONE, 0);
+	return (GF_EVGStencil *) tmp;
+}
+
+
+/*
+	radial gradient stencil
+*/
+
+static void rg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, 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;
+	EVG_RadialGradient *_this = (EVG_RadialGradient *) p;
+
+	assert(data);
+	
+	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--;
+	}
+}
+
+void evg_radial_init(EVG_RadialGradient *_this)
+{
+	GF_Point2D p0, p1;
+	p0.x = p0.y = p1.y = 0;
+	p1.x = FIX_ONE;
+
+	gf_mx2d_apply_point(&_this->smat, &p0);
+	gf_mx2d_apply_point(&_this->smat, &p1);
+	_this->d_i.x = p1.x - p0.x;
+	_this->d_i.y = p1.y - p0.y;
+
+	_this->rad = FIX_ONE - gf_mulfix(_this->d_f.x, _this->d_f.x) - gf_mulfix(_this->d_f.y, _this->d_f.y);
+	if (_this->rad) {
+		_this->rad = gf_invfix(_this->rad);
+	} else {
+		_this->rad = EVGGRADIENTBUFFERSIZE;
+	}
+}
+
+static GF_EVGStencil *evg_radial_gradient_brush()
+{
+	s32 i;
+	EVG_RadialGradient *tmp;
+	GF_SAFEALLOC(tmp, EVG_RadialGradient);
+	if (!tmp) return 0L;
+
+	tmp->fill_run = rg_fill_run;
+	tmp->type = GF_STENCIL_RADIAL_GRADIENT;
+	for(i=0; i<EVGGRADIENTSLOTS; i++) tmp->pos[i]=-1;
+
+	tmp->center.x = tmp->center.y = FIX_ONE/2;
+	tmp->focus = tmp->center;
+	tmp->radius = tmp->center;
+	tmp->alpha = 0xFF;
+	return (GF_EVGStencil *) tmp;
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_radial_gradient(GF_EVGStencil * st, Fixed cx, Fixed cy, Fixed fx, Fixed fy, Fixed x_radius, Fixed y_radius)
+{
+	EVG_RadialGradient *_this = (EVG_RadialGradient *) st;
+	if (_this->type != GF_STENCIL_RADIAL_GRADIENT) return GF_BAD_PARAM;
+
+	_this->center.x = cx;
+	_this->center.y = cy;
+	_this->focus.x = fx;
+	_this->focus.y = fy;
+	_this->radius.x = x_radius;
+	_this->radius.y = y_radius;
+	return GF_OK;
+}
+
+
+void evg_gradient_precompute(EVG_BaseGradient *grad, GF_EVGSurface *surf)
+{
+	Bool do_cmat, do_yuv, has_a, has_changed;
+	u32 i, nb_col;
+
+	has_changed = grad->updated;
+
+	if (surf->yuv_type) {
+		if (grad->yuv_prof != surf->yuv_prof) {
+			grad->yuv_prof = surf->yuv_prof;
+			has_changed = GF_TRUE;
+		}
+	} else {
+		if (grad->yuv_prof) {
+			grad->yuv_prof = 0;
+			has_changed = GF_TRUE;
+		}
+	}
+	if (!has_changed) {
+		return;
+	}
+	grad->updated = 0;
+
+	do_yuv = (surf->yuv_type==EVG_YUV_NONE) ? GF_FALSE : GF_TRUE;
+
+	do_cmat = (grad->cmat.identity) ? GF_FALSE : GF_TRUE;
+	has_a = (grad->alpha==0xFF) ? GF_FALSE : GF_TRUE;
+	nb_col = (1<<EVGGRADIENTBITS);
+
+	for (i=0; i<nb_col; i++) {
+		u32 argb = grad->precomputed_argb[i];
+		if (has_a) {
+			u32 ca = ((u32) (GF_COL_A(argb) + 1) * grad->alpha) >> 8;
+			argb = ( ((ca<<24) & 0xFF000000) ) | (argb & 0x00FFFFFF);
+		}
+		if (do_cmat)
+			argb = gf_cmx_apply(&grad->cmat, argb);
+
+		if (do_yuv)
+			argb = gf_evg_argb_to_ayuv(surf, argb);
+
+		grad->precomputed_dest[i] = argb;
+	}
+}
+
+
+/*
+	Texture stencil
+	 	FIXME: add filtering , check bilinear
+*/
+
+static GFINLINE s32 mul255(s32 a, s32 b)
+{
+	return ((a+1) * b) >> 8;
+}
+static u32 EVG_LERP(u32 c0, u32 c1, u8 t)
+{
+	s32 a0, r0, g0, b0;
+	s32 a1, r1, g1, b1;
+	s32 a2, r2, g2, b2;
+
+	if (!t) return c0;
+
+	a0 = GF_COL_A(c0);
+	r0 = GF_COL_R(c0);
+	g0 = GF_COL_G(c0);
+	b0 = GF_COL_B(c0);
+	a1 = GF_COL_A(c1);
+	r1 = GF_COL_R(c1);
+	g1 = GF_COL_G(c1);
+	b1 = GF_COL_B(c1);
+
+	a2 = a0 + mul255(t, (a1 - a0));
+	r2 = r0 + mul255(t, (r1 - r0));
+	g2 = g0 + mul255(t, (g1 - g0));
+	b2 = b0 + mul255(t, (b1 - b0));
+	return GF_COL_ARGB(a2, r2, g2, b2);
+}
+
+static GFINLINE s64 mul_wide(s64 a, s64 b)
+{
+	return ((a+1) * b) >> 16;
+}
+static u64 EVG_LERP_WIDE(u64 c0, u64 c1, u8 t)
+{
+	s64 a0, r0, g0, b0;
+	s64 a1, r1, g1, b1;
+	s64 a2, r2, g2, b2;
+
+	if (!t) return c0;
+
+	a0 = (c0>>48) & 0xFFFF;
+	r0 = (c0>>32) & 0xFFFF;
+	g0 = (c0>>16) & 0xFFFF;
+	b0 = (c0) & 0xFFFF;
+
+	a1 = (c1>>48) & 0xFFFF;
+	r1 = (c1>>32) & 0xFFFF;
+	g1 = (c1>>16) & 0xFFFF;
+	b1 = (c1) & 0xFFFF;
+
+	a2 = a0 + mul_wide(t, (a1 - a0));
+	r2 = r0 + mul_wide(t, (r1 - r0));
+	g2 = g0 + mul_wide(t, (g1 - g0));
+	b2 = b0 + mul_wide(t, (b1 - b0));
+
+	return evg_make_col_wide(a2, r2, g2, b2);
+}
+
+static void tex_untransform_coord(EVG_Texture *_this, s32 _x, s32 _y, Fixed *outx, Fixed *outy)
+{
+	u32 checkx, checky;
+	Fixed x, y, dim;
+
+	/* reverse to texture coords*/
+	x = INT2FIX(_x);
+	y = INT2FIX(_y);
+	gf_mx2d_apply_coords(&_this->smat, &x, &y);
+
+	checkx = checky = 0;
+	if (ABS(x)< FIX_ONE/20) checkx = 1;
+	if (ABS(y)< FIX_ONE/20) checky = 1;
+
+	/*we may have a numerical stability issues, try to figure out whether we are close from 0 or width/height*/
+	if ( checkx || checky) {
+		Fixed tx, ty;
+		tx = INT2FIX(_x+1);
+		ty = INT2FIX(_y+1);
+		gf_mx2d_apply_coords(&_this->smat, &tx, &ty);
+
+		if (checkx) {
+			if (tx<0) x = INT2FIX(_this->width - 1);
+			else x = 0;
+		}
+		if (checky) {
+			if (ty<0) y = INT2FIX(_this->height - 1);
+			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;
+	}
+
+	*outx=x;
+	*outy=y;
+}
+
+
+static u32 evg_paramtx_get_pixel(struct __evg_texture *_this, u32 x, u32 y)
+{
+	Float a, r, g, b;
+	_this->tx_callback(_this->tx_callback_udta, x, y, &r, &g, &b, &a);
+	r*=255;
+	g*=255;
+	b*=255;
+	a*=255;
+	return GF_COL_ARGB(a, r, g, b);
+}
+u64 evg_paramtx_get_pixel_wide(struct __evg_texture *_this, u32 x, u32 y)
+{
+	Float a, r, g, b;
+	_this->tx_callback(_this->tx_callback_udta, x, y, &r, &g, &b, &a);
+	r*=0xFFFF;
+	g*=0xFFFF;
+	b*=0xFFFF;
+	a*=0xFFFF;
+	return evg_make_col_wide(a, r, g, b);
+}
+
+static void tex_fill_run_callback(EVG_Texture *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+{
+	u32 *data = surf->stencil_pix_run;
+	while (count) {
+		*data = evg_paramtx_get_pixel(p, _x, _y);
+		data++;
+		count--;
+		_x++;
+	}
+}
+
+static void tex_fill_run_callback_wide(EVG_Texture *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+{
+	u64 *data = surf->stencil_pix_run;
+	while (count) {
+		*data = evg_paramtx_get_pixel_wide(p, _x, _y);
+		data++;
+		count--;
+	}
+}
+
+//bilinear used fo 2D graphics ?
+#define USE_BILINEAR	0
+
+static void tex_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, 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;
+#if USE_BILINEAR
+	s32 incx, incy;
+#endif
+	u32 *data = surf->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
+	incx = (_this->inc_x>0) ? 1 : -1;
+	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;
+
+	replace_col = _this->replace_col;
+
+	while (count) {
+		x0 = FIX2INT(x);
+		assert((s32)x0 >=0);
+		if (repeat_s) {
+			x0 = (x0) % _this->width;
+		} else {
+			x0 = MIN(x0, (s32) _this->width - 1);
+		}
+
+		y0 = FIX2INT(y);
+		assert((s32)y0 >=0);
+		if (repeat_t) {
+			y0 = (y0) % _this->height;
+		} else if (y0 >= (s32) _this->height) {
+			y0 = _this->height-1;
+		}
+
+		pix = _this->tx_get_pixel(_this, x0, y0);
+
+		_x++;
+		tex_untransform_coord(_this, _x, _y, &x, &y);
+
+		if (x<0) x+=INT2FIX(_this->width);
+		if (y<0) y+=INT2FIX(_this->height);
+
+		/*bilinear filtering - disabled (too slow and not precise enough)*/
+#if USE_BILINEAR
+		if (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) {
+			u32 p00, p01, p10, p11;
+			s32 x1, y1;
+			u8 tx, ty;
+
+			tx = FIX2INT(gf_muldiv(x, 255, _this->width) );
+			ty = FIX2INT(gf_muldiv(y, 255, _this->height) );
+
+			x1 = (x0+incx);
+			if (x1<0) {
+				while (x1<0) x1 += _this->width;
+			} else {
+				x1 = x1 % _this->width;
+			}
+			y1 = (y0+incy);
+			if (y1<0) {
+				while (y1<0) y1+=_this->height;
+			} 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;
+			p01 = _this->tx_get_pixel(_this, x1, y0);
+			p10 = _this->tx_get_pixel(_this, x0, y1);
+			p11 = _this->tx_get_pixel(_this, x1, y1);
+
+			p00 = EVG_LERP(p00, p01, tx);
+			p10 = EVG_LERP(p10, p11, tx);
+			pix = EVG_LERP(p00, p10, ty);
+
+		}
+#endif
+
+		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));
+		}
+		//move pixel to target pixel format, applying color transform matrix
+		else if (_this->is_yuv) {
+			//if surf is rgb, transform
+			if (!surf->yuv_type) {
+				pix = gf_evg_ayuv_to_argb(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 (surf->yuv_type)
+				pix = gf_evg_argb_to_ayuv(surf, pix);
+		}
+
+		*data++ = pix;
+		count--;
+	}
+}
+
+
+/*just a little faster...*/
+static void tex_fill_run_straight(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+{
+	s32 x0, y0;
+	u32 pix;
+	u32 __a;
+	Bool repeat_s = GF_FALSE;
+	Fixed x, y, _fdim;
+	u32 *data = surf->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];
+
+	/*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);
+		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);
+		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;
+	
+	while (count) {
+		x0 = FIX2INT(x);
+		if (repeat_s) {
+			x0 = (x0) % _this->width;
+		} else if (x0 >= (s32) _this->width) x0 = _this->width-1;
+
+		x += _this->inc_x;
+		pix = _this->tx_get_pixel(_this, x0, y0);
+
+		//replace_col is in destination format
+		if (_this->replace_col) {
+			__a = GF_COL_A(pix);
+			pix = ((__a<<24) | (_this->replace_col & 0x00FFFFFF));
+		}
+		//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);
+		}
+
+		*data++ = pix;
+		count--;
+	}
+}
+
+u64 evg_col_to_wide( u32 col)
+{
+	u32 a = GF_COL_A(col) << 8 | 0xFF;
+	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);
+}
+
+static void tex_fill_run_wide(GF_EVGStencil *p, GF_EVGSurface *surf, 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;
+#if USE_BILINEAR
+	s32 incx, incy;
+#endif
+	u64 *data = surf->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
+	incx = (_this->inc_x>0) ? 1 : -1;
+	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;
+
+	replace_col = evg_col_to_wide(_this->replace_col);
+
+	while (count) {
+		x0 = FIX2INT(x);
+		assert((s32)x0 >=0);
+		if (repeat_s) {
+			x0 = (x0) % _this->width;
+		} else {
+			x0 = MIN(x0, (s32) _this->width - 1);
+		}
+
+		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 (_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) );
+		}
+		_x++;
+		tex_untransform_coord(_this, _x, _y, &x, &y);
+
+		if (x<0) x+=INT2FIX(_this->width);
+		if (y<0) y+=INT2FIX(_this->height);
+
+		/*bilinear filtering - disabled (too slow and not precise enough)*/
+#if USE_BILINEAR
+		if (_this->filter==GF_TEXTURE_FILTER_HIGH_QUALITY) {
+			u64 p00, p01, p10, p11;
+			s32 x1, y1;
+			u8 tx, ty;
+
+			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) {
+					while (x1<0) x1 += _this->width;
+				} else {
+					x1 = x1 % _this->width;
+				}
+				y1 = (y0+incy);
+				if (y1<0) {
+					while (y1<0) y1+=_this->height;
+				} 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);
+			}
+		}
+#endif
+
+		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 surf is rgb, transform
+			if (!surf->yuv_type) {
+				pix = gf_evg_ayuv_to_argb_wide(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 (surf->yuv_type)
+				pix = gf_evg_argb_to_ayuv_wide(surf, pix);
+		}
+
+		*data++ = pix;
+		count--;
+	}
+}
+
+
+/*just a little faster...*/
+static void tex_fill_run_straight_wide(GF_EVGStencil *p, GF_EVGSurface *surf, s32 _x, s32 _y, u32 count)
+{
+	s32 x0, y0;
+	u64 pix;
+	Bool repeat_s = GF_FALSE;
+	Fixed x, y, _fdim;
+	u64 *data = surf->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];
+
+	/*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);
+		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);
+		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;
+
+	while (count) {
+		x0 = FIX2INT(x);
+		if (repeat_s) {
+			x0 = (x0) % _this->width;
+		} else if (x0 >= (s32) _this->width) x0 = _this->width-1;
+
+		x += _this->inc_x;
+
+		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) );
+		}
+
+		//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);
+		}
+		//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 (!_this->is_yuv && surf->yuv_type) {
+			pix = gf_evg_argb_to_ayuv_wide(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_DEFAULT);
+	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)
+{
+	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);
+}
+u32 get_pix_rgb_24(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_bgr_24(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);
+}
+u32 get_pix_444(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	u32 r = pix[0]&0x0f;
+	u32 g = (pix[1]>>4)&0x0f;
+	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)
+{
+	u8 *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	u32 r = (pix[0]>>2) & 0x1f;
+	u32 g = (pix[0])&0x3;
+	g<<=3;
+	g |= (pix[1]>>5) & 0x7;
+	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)
+{
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	u32 r = (pix[0]>>3) & 0x1f;
+	u32 g = (pix[0])&0x7;
+	g<<=3;
+	g |= (pix[1]>>5) & 0x7;
+	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)
+{
+	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)
+{
+	u8 a, g;
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	a = *pix;
+	g = *(pix+1);
+	return GF_COL_ARGB(a, g, g, g);
+}
+u32 get_pix_greyalpha(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 a, g;
+	char *pix = _this->pixels + y * _this->stride + _this->Bpp*x;
+	g = *pix;
+	a = *(pix+1);
+	return GF_COL_ARGB(a, g, g, g);
+}
+u32 get_pix_yuv420p(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 *pY = _this->pixels + y * _this->stride + x;
+	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + x/2;
+	u8 *pV = _this->pix_v + y/2 * _this->stride/2 + x/2;
+	return GF_COL_ARGB(0xFF, *pY, *pU, *pV);
+}
+
+#ifdef GPAC_BIG_ENDIAN
+
+#define GET_LE_10BIT_AS_8(_ptr) ( (((u16)(_ptr)[1])<<8 | (u16)(_ptr)[0] ) >> 2 )
+#define GET_LE_10BIT_AS_16(_ptr) ( (((u16)(_ptr)[1])<<8 | (u16)(_ptr)[0] ) << 6 )
+
+#define GET_BE_10BIT_AS_8(_ptr) ( (*(u16 *)(_ptr)) >> 2 )
+#define GET_BE_10BIT_AS_16(_ptr) ( (*(u16 *)(_ptr)) << 6 )
+
+#else
+
+#define GET_LE_10BIT_AS_8(_ptr) ( (*(u16 *)(_ptr)) >> 2 )
+#define GET_LE_10BIT_AS_16(_ptr) ( (*(u16 *)(_ptr)) << 6 )
+
+#define GET_BE_10BIT_AS_8(_ptr) ( (((u16)(_ptr)[0])<<8 | (u16)(_ptr)[1] ) >> 2 )
+#define GET_BE_10BIT_AS_16(_ptr) ( (((u16)(_ptr)[0])<<8 | (u16)(_ptr)[1] ) << 6 )
+
+#endif
+
+
+u32 get_pix_yuv420p_10(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + (x/2)*2;
+	u8 *pV = _this->pix_v + y/2 * _this->stride/2 + (x/2)*2;
+
+	vy = GET_LE_10BIT_AS_8(pY);
+	vu = GET_LE_10BIT_AS_8(pU);
+	vv = GET_LE_10BIT_AS_8(pV);
+
+	return GF_COL_ARGB(0xFF, vy, vu, vv);
+}
+
+u64 get_pix_yuv420p_10_wide(EVG_Texture *_this, u32 x, u32 y)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + (x/2)*2;
+	u8 *pV = _this->pix_v + y/2 * _this->stride/2 + (x/2)*2;
+
+	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);
+}
+u32 get_pix_yuv420p_a(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 *pY = _this->pixels + y * _this->stride + x;
+	u8 *pU = _this->pix_u + y/2 * _this->stride/2 + x/2;
+	u8 *pV = _this->pix_v + y/2 * _this->stride/2 + x/2;
+	u8 *pA = _this->pix_a  + y * _this->stride + x;
+
+	return GF_COL_ARGB(*pA, *pY, *pU, *pV);
+}
+u32 get_pix_yuv422p(EVG_Texture *_this, u32 x, u32 y)
+{
+	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)
+{
+	u8 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y * _this->stride/2 + (x/2)*2;
+	u8 *pV = _this->pix_v + y * _this->stride/2 + (x/2)*2;
+
+	vy = GET_LE_10BIT_AS_8(pY);
+	vu = GET_LE_10BIT_AS_8(pU);
+	vv = GET_LE_10BIT_AS_8(pV);
+	return GF_COL_ARGB(0xFF, vy, vu, vv);
+}
+
+u64 get_pix_yuv422p_10_wide(EVG_Texture *_this, u32 x, u32 y)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y * _this->stride/2 + (x/2)*2;
+	u8 *pV = _this->pix_v + y * _this->stride/2 + (x/2)*2;
+
+	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);
+}
+
+u32 get_pix_yuv444p(EVG_Texture *_this, u32 x, u32 y)
+{
+	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)
+{
+	u8 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y * _this->stride + x*2;
+	u8 *pV = _this->pix_v + y * _this->stride + x*2;
+
+	vy = GET_LE_10BIT_AS_8(pY);
+	vu = GET_LE_10BIT_AS_8(pU);
+	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)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y * _this->stride + x*2;
+	u8 *pV = _this->pix_v + y * _this->stride + x*2;
+
+	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);
+}
+u32 get_pix_yuv444p_a(EVG_Texture *_this, u32 x, u32 y)
+{
+	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;
+	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)
+{
+	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)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u  + y/2 * _this->stride + (x/2)*4;
+	vy = GET_LE_10BIT_AS_8(pY);
+	vu = GET_LE_10BIT_AS_8(pU);
+	vv = GET_LE_10BIT_AS_8(pU+2);
+
+	return GF_COL_ARGB(0xFF, vy, vu, vv);
+}
+u64 get_pix_yuv_nv12_10_wide(EVG_Texture *_this, u32 x, u32 y)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y/2 * _this->stride + (x/2)*4;
+
+	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, vu, vv);
+}
+u32 get_pix_yuv_nv21(EVG_Texture *_this, u32 x, u32 y)
+{
+	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)
+{
+	u8 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y/2 * _this->stride + (x/2)*4;
+
+	vy = GET_LE_10BIT_AS_8(pY);
+	vu = GET_LE_10BIT_AS_8(pU);
+	vv = GET_LE_10BIT_AS_8(pU+2);
+
+	return GF_COL_ARGB(0xFF, vy, vv, vu);
+}
+u64 get_pix_yuv_nv21_10_wide(EVG_Texture *_this, u32 x, u32 y)
+{
+	u16 vy, vu, vv;
+	u8 *pY = _this->pixels + y * _this->stride + x*2;
+	u8 *pU = _this->pix_u + y/2 * _this->stride + (x/2)*4;
+
+	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);
+}
+u32 get_pix_yuyv(EVG_Texture *_this, u32 x, u32 y)
+{
+	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
+	u8 u = pY[1];
+	u8 v = pY[3];
+	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)
+{
+	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
+	u8 u = pY[3];
+	u8 v = pY[1];
+	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)
+{
+	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
+	u8 u = pY[0];
+	u8 v = pY[2];
+	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)
+{
+	u8 *pY = _this->pixels + y * _this->stride + (x/2)*4;
+	u8 u = pY[2];
+	u8 v = pY[0];
+	u8 luma = (x%2) ? pY[3] : pY[1];
+	return GF_COL_ARGB(0xFF, luma, u, v);
+}
+
+static void texture_set_callbacks(EVG_Texture *_this)
+{
+	if (_this->tx_callback)
+		return;
+	switch (_this->pixel_format) {
+	case GF_PIXEL_RGBA:
+		_this->tx_get_pixel = get_pix_rgba;
+		return;
+	case GF_PIXEL_ARGB:
+		_this->tx_get_pixel = get_pix_argb;
+		return;
+	case GF_PIXEL_ABGR:
+		_this->tx_get_pixel = get_pix_abgr;
+		return;
+	case GF_PIXEL_BGRA:
+		_this->tx_get_pixel = get_pix_bgra;
+		return;
+	case GF_PIXEL_RGBX:
+		_this->tx_get_pixel = get_pix_rgbx;
+		return;
+	case GF_PIXEL_BGRX:
+		_this->tx_get_pixel = get_pix_bgrx;
+		return;
+	case GF_PIXEL_XRGB:
+		_this->tx_get_pixel = get_pix_xrgb;
+		return;
+	case GF_PIXEL_XBGR:
+		_this->tx_get_pixel = get_pix_xbgr;
+		return;
+	case GF_PIXEL_RGB:
+		_this->tx_get_pixel = get_pix_rgb_24;
+		return;
+	case GF_PIXEL_BGR:
+		_this->tx_get_pixel = get_pix_bgr_24;
+		return;
+	case GF_PIXEL_RGB_444:
+		_this->tx_get_pixel = get_pix_444;
+		return;
+	case GF_PIXEL_RGB_555:
+		_this->tx_get_pixel = get_pix_555;
+		return;
+	case GF_PIXEL_RGB_565:
+		_this->tx_get_pixel = get_pix_565;
+		return;
+	case GF_PIXEL_GREYSCALE:
+		_this->tx_get_pixel = get_pix_grey;
+		return;
+	case GF_PIXEL_ALPHAGREY:
+		_this->tx_get_pixel = get_pix_alphagrey;
+		return;
+	case GF_PIXEL_GREYALPHA:
+		_this->tx_get_pixel = get_pix_greyalpha;
+		return;
+	case GF_PIXEL_YUV:
+		_this->tx_get_pixel = get_pix_yuv420p;
+		break;
+	case GF_PIXEL_YUVA:
+		_this->tx_get_pixel = get_pix_yuv420p_a;
+		break;
+	case GF_PIXEL_YUV422:
+		_this->tx_get_pixel = get_pix_yuv422p;
+		break;
+	case GF_PIXEL_YUV444:
+		_this->tx_get_pixel = get_pix_yuv444p;
+		break;
+	case GF_PIXEL_YUVA444:
+		_this->tx_get_pixel = get_pix_yuv444p_a;
+		break;
+	case GF_PIXEL_NV12:
+		_this->tx_get_pixel = get_pix_yuv_nv12;
+		break;
+	case GF_PIXEL_NV21:
+		_this->tx_get_pixel = get_pix_yuv_nv21;
+		break;
+	case GF_PIXEL_YUYV:
+		_this->tx_get_pixel = get_pix_yuyv;
+		return;
+	case GF_PIXEL_YVYU:
+		_this->tx_get_pixel = get_pix_yvyu;
+		return;
+	case GF_PIXEL_UYVY:
+		_this->tx_get_pixel = get_pix_uyvy;
+		return;
+	case GF_PIXEL_VYUY:
+		_this->tx_get_pixel = get_pix_vyuy;
+		return;
+	case GF_PIXEL_YUV_10:
+		_this->tx_get_pixel = get_pix_yuv420p_10;
+		_this->tx_get_pixel_wide = get_pix_yuv420p_10_wide;
+		break;
+	case GF_PIXEL_YUV422_10:
+		_this->tx_get_pixel = get_pix_yuv422p_10;
+		_this->tx_get_pixel_wide = get_pix_yuv422p_10_wide;
+		break;
+	case GF_PIXEL_YUV444_10:
+		_this->tx_get_pixel = get_pix_yuv444p_10;
+		_this->tx_get_pixel_wide = get_pix_yuv444p_10_wide;
+		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;
+		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;
+		break;
+	default:
+		return;
+	}
+	//assign image planes
+	if (_this->pix_u) return;
+
+	switch (_this->pixel_format) {
+	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;
+		return;
+	case GF_PIXEL_YUVA:
+		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;
+		_this->pix_a = _this->pix_v + _this->stride_uv * _this->height/2;
+		return;
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV422:
+		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;
+		return;
+	case GF_PIXEL_YUV444_10:
+	case GF_PIXEL_YUV444:
+		if (!_this->stride_uv) _this->stride_uv = _this->stride;
+		_this->pix_u = _this->pixels + _this->stride*_this->height;
+		_this->pix_v = _this->pix_u + _this->stride_uv * _this->height;
+		return;
+	case GF_PIXEL_YUVA444:
+		if (!_this->stride_uv) _this->stride_uv = _this->stride;
+		_this->pix_u = _this->pixels + _this->stride*_this->height;
+		_this->pix_v = _this->pix_u + _this->stride_uv * _this->height;
+		_this->pix_a = _this->pix_v + _this->stride_uv * _this->height;
+		return;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		if (!_this->stride_uv) _this->stride_uv = _this->stride;
+		_this->pix_u = _this->pixels + _this->stride*_this->height;
+		return;
+	}
+}
+
+static GF_Err gf_evg_stencil_set_texture_internal(GF_EVGStencil * st, u32 width, u32 height, GF_PixelFormat pixelFormat, const char *pixels, u32 stride, const char *u_plane, const char *v_plane, u32 uv_stride, const char *alpha_plane, u32 alpha_stride)
+{
+	EVG_Texture *_this = (EVG_Texture *) st;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE) || !pixels || !width || !height || _this->owns_texture)
+		return GF_BAD_PARAM;
+
+	_this->pixels = NULL;
+	_this->is_yuv = GF_FALSE;
+
+	switch (pixelFormat) {
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+	case GF_PIXEL_BGRX:
+		_this->Bpp = 4;
+		break;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+		_this->Bpp = 3;
+		break;
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		_this->Bpp = 2;
+		break;
+	case GF_PIXEL_GREYSCALE:
+		_this->Bpp = 1;
+		break;
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVA444:
+		_this->is_yuv = GF_TRUE;
+		_this->Bpp = 1;
+		break;
+	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:
+		_this->is_yuv = GF_TRUE;
+		_this->Bpp = 2;
+		break;
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		_this->is_yuv = GF_TRUE;
+		_this->Bpp = 1;
+		if (!stride)
+			stride = 4 * width;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+	if (!stride)
+		stride = _this->Bpp * width;
+		
+	_this->pixel_format = pixelFormat;
+	_this->width = width;
+	_this->height = height;
+	_this->stride = stride;
+	_this->stride_uv = uv_stride;
+	_this->stride_alpha = alpha_stride ? alpha_stride : stride;
+	_this->pixels = (char *) pixels;
+	_this->pix_u = (char *) u_plane;
+	_this->pix_v = (char *) v_plane;
+	texture_set_callbacks(_this);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_texture_planes(GF_EVGStencil *stencil, u32 width, u32 height, GF_PixelFormat pixelFormat, const u8 *y_or_rgb, u32 stride, const u8 *u_plane, const u8 *v_plane, u32 uv_stride, const u8 *alpha_plane, u32 stride_alpha)
+{
+ 	return gf_evg_stencil_set_texture_internal(stencil, width, height, pixelFormat, y_or_rgb, stride, u_plane, v_plane, uv_stride, alpha_plane, stride_alpha);
+}
+GF_EXPORT
+GF_Err gf_evg_stencil_set_texture(GF_EVGStencil *stencil, u8 *pixels, u32 width, u32 height, u32 stride, GF_PixelFormat pixelFormat)
+{
+	return gf_evg_stencil_set_texture_internal(stencil, width, height, pixelFormat, pixels, stride, NULL, NULL, 0, NULL, 0);
+}
+
+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;
+	u8 data=0;
+	GF_Err e;
+	if (!callback) return GF_BAD_PARAM;
+	e = gf_evg_stencil_set_texture_internal(stencil, width, height, pixelFormat, &data, width, NULL, NULL, 0, NULL, 0);
+	if (e) return e;
+	_this->pixels = NULL;
+	_this->tx_get_pixel = evg_paramtx_get_pixel;
+	_this->tx_get_pixel_wide = evg_paramtx_get_pixel_wide;
+
+	_this->tx_callback = callback;
+	_this->tx_callback_udta = cbk_data;
+	_this->tx_callback_screen_coords = use_screen_coords;
+	return GF_OK;
+}
+
+void evg_texture_init(GF_EVGStencil *p, GF_EVGSurface *surf)
+{
+	GF_Point2D p0, p1;
+	EVG_Texture *_this = (EVG_Texture *) p;
+
+	p0.x = p0.y = p1.y = 0;
+	p1.x = FIX_ONE;
+	gf_mx2d_apply_point(&_this->smat, &p0);
+	gf_mx2d_apply_point(&_this->smat, &p1);
+	_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 ((_this->alpha == 255) && !_this->smat.m[1] && !_this->smat.m[3] && (_this->cmat.identity || _this->cmat_is_replace)) {
+		if (surf->not_8bits) {
+			_this->fill_run = tex_fill_run_straight_wide;
+		} else {
+			_this->fill_run = tex_fill_run_straight;
+		}
+	} else {
+		if (!_this->cmat.identity && _this->is_yuv && surf->yuv_type) {
+			evg_make_ayuv_color_mx(&_this->cmat, &_this->yuv_cmat);
+		}
+		if (surf->not_8bits) {
+			_this->fill_run = tex_fill_run_wide;
+		} else {
+			_this->fill_run = tex_fill_run;
+		}
+	}
+
+	texture_set_callbacks(_this);
+}
+
+
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_mapping(GF_EVGStencil * st, GF_TextureMapFlags mode)
+{
+	EVG_Texture *_this = (EVG_Texture *) st;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
+	_this->mod = mode;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_filter(GF_EVGStencil * st, GF_TextureFilter filter_mode)
+{
+	EVG_Texture *_this = (EVG_Texture *) st;
+	if (!_this || (_this->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
+	_this->filter = filter_mode;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_color_matrix(GF_EVGStencil * st, GF_ColorMatrix *cmat)
+{
+	Bool is_grad;
+	GF_EVGStencil *_this = (GF_EVGStencil *)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;
+		gf_cmx_init(&_this->cmat);
+	} else {
+		if (is_grad && memcmp(&_this->cmat.m, &cmat->m, sizeof(Fixed)*20))
+			((EVG_BaseGradient *) _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)
+{
+	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;
+
+	if (y<0) y=0;
+	else if ((u32) y>=_this->height) y = _this->height-1;
+
+	col = _this->tx_get_pixel(_this, x, y);
+	if (_this->is_yuv) {
+		if (!want_yuv) return gf_evg_ayuv_to_argb(NULL, col);
+	} else {
+		if (want_yuv) return gf_evg_argb_to_ayuv(NULL, col);
+	}
+	return col;
+}
+
+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);
+}
+
+#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);
+}
+#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)
+{
+	u32 col;
+	if (!_this->tx_get_pixel) return GF_BAD_PARAM;
+
+	if (_this->mod & GF_TEXTURE_FLIP_X) x = -x;
+	if (_this->mod & GF_TEXTURE_FLIP_Y) y = -y;
+
+	x*=_this->width;
+	y*=_this->height;
+	if (_this->mod & GF_TEXTURE_REPEAT_S) {
+		while (x<0) x += _this->width;
+		while (x>=_this->width) x -= _this->width;
+	} else {
+		if (x<0) x=0;
+		else if (x>=_this->width) x = (Float)_this->width-1;
+	}
+
+	if (_this->mod & GF_TEXTURE_REPEAT_T) {
+		while (y<0) y += _this->height;
+		while (y>=_this->height) y -= _this->height;
+	} else {
+		if (y<0) y=0;
+		else if (y>=_this->height) y = (Float)_this->height-1;
+	}
+
+	//10-bit or more texture, use wide and convert to float
+	if (_this->tx_get_pixel_wide) {
+		u64 colw;
+		if (_this->filter==GF_TEXTURE_FILTER_HIGH_SPEED) {
+			colw = _this->tx_get_pixel_wide(_this, (s32) x, (s32) y);
+		} 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);
+			} else {
+				u64 col01, col11, col10;
+				s32 _x1 = _x+1;
+				s32 _y1 = _y+1;
+				u8 diff_x = (u8) (255 * (x - _x));
+				u8 diff_y = (u8) (255 * (y - _y));
+
+				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 = EVG_LERP_WIDE(colw, col10, diff_x);
+				col11 = EVG_LERP_WIDE(col01, col11, diff_x);
+				colw = EVG_LERP_WIDE(colw, col11, diff_y);
+			}
+		}
+		if (_this->is_yuv) {
+			if (!want_yuv) colw = gf_evg_ayuv_to_argb_wide(NULL, colw);
+		} else {
+			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;
+	}
+
+	//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);
+	} 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);
+		} else {
+			u32 col01, col11, col10;
+			s32 _x1 = _x+1;
+			s32 _y1 = _y+1;
+			u8 diff_x = (u8) (255 * (x - _x));
+			u8 diff_y = (u8) (255 * (y - _y));
+
+			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 = EVG_LERP(col, col10, diff_x);
+			col11 = EVG_LERP(col01, col11, diff_x);
+			col = EVG_LERP(col, col11, diff_y);
+		}
+	}
+	if (_this->is_yuv) {
+		if (!want_yuv) col = gf_evg_ayuv_to_argb(NULL, col);
+	} 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;
+}
+
+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)
+{
+	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);
+}
+
+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)
+{
+	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);
+}
+
+GF_EXPORT
+GF_Err gf_evg_stencil_set_alpha(GF_EVGStencil * st, u8 alpha)
+{
+	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_TEXTURE)
+		_this->alpha = alpha;
+	else {
+		if ( ((EVG_BaseGradient*)st)->alpha != alpha) {
+			((EVG_BaseGradient*)st)->updated = 1;
+		}
+		((EVG_BaseGradient*)st)->alpha = alpha;
+	}
+	return GF_OK;
+}
+
+void evg_fill_run(GF_EVGStencil *p, GF_EVGSurface *surf, s32 x, s32 y, u32 count)
+{
+	p->fill_run(p, surf, x, y, count);
+	if (surf->get_alpha) {
+		u32 i;
+		EVG_Texture *_p = (EVG_Texture *)p;
+		if (_p->Bpp>8) {
+			u64 *coll = (u64 *)surf->stencil_pix_run;
+			for (i=0; i<count; i++) {
+				u64 a = (*coll>>48)&0xFFFF;
+				a = 0xFF * surf->get_alpha(surf->get_alpha_udta, (u8) (a/0xFF), 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);
+				*col = (a<<24) | ((*col) & 0x00FFFFFF);
+				col ++;
+			}
+		}
+	}
+}

gpac-1.0.0.tar.gz/src/evg/surface.c Added

@@ -0,0 +1,1111 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / software 2D rasterizer module
+ *
+ *  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 "rast_soft.h"
+
+static void get_surface_world_matrix(GF_EVGSurface *surf, GF_Matrix2D *mat)
+{
+	gf_mx2d_init(*mat);
+	if (surf->center_coords) {
+		gf_mx2d_add_scale(mat, FIX_ONE, -FIX_ONE);
+		gf_mx2d_add_translation(mat, INT2FIX(surf->width / 2), INT2FIX(surf->height / 2));
+	}
+}
+
+GF_EXPORT
+GF_EVGSurface *gf_evg_surface_new(Bool center_coords)
+{
+	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;
+	}
+	return surf;
+}
+
+EVG_Surface3DExt *evg_init_3d_surface(GF_EVGSurface *surf);
+
+GF_EXPORT
+GF_EVGSurface *gf_evg_surface3d_new()
+{
+	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;
+		}
+	}
+	return surf;
+}
+
+GF_EXPORT
+void gf_evg_surface_set_center_coords(GF_EVGSurface *surf, Bool center_coords)
+{
+	if (surf) surf->center_coords = center_coords;
+}
+
+GF_EXPORT
+void gf_evg_surface_delete(GF_EVGSurface *surf)
+{
+	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);
+
+	if (surf->ext3d) {
+		if (surf->ext3d->pix_vals)
+			gf_free(surf->ext3d->pix_vals);
+		gf_free(surf->ext3d);
+	}
+	gf_free(surf);
+}
+
+GF_EXPORT
+GF_Err gf_evg_surface_set_matrix(GF_EVGSurface *surf, GF_Matrix2D *mat)
+{
+	GF_Matrix2D tmp;
+	if (!surf) return GF_BAD_PARAM;
+	get_surface_world_matrix(surf, &surf->mat);
+	surf->is_3d_matrix = GF_FALSE;
+	if (!mat) return GF_OK;
+
+	gf_mx2d_init(tmp);
+	gf_mx2d_add_matrix(&tmp, mat);
+	gf_mx2d_add_matrix(&tmp, &surf->mat);
+	gf_mx2d_copy(surf->mat, tmp);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_evg_surface_set_matrix_3d(GF_EVGSurface *surf, GF_Matrix *mat)
+{
+	if (!surf) return GF_BAD_PARAM;
+	get_surface_world_matrix(surf, &surf->mat);
+	surf->is_3d_matrix = GF_FALSE;
+	if (!mat) return GF_OK;
+	gf_mx_copy(surf->mx3d, *mat);
+	surf->is_3d_matrix = GF_TRUE;
+	return GF_OK;
+}
+
+static void evg_surface_set_components_idx(GF_EVGSurface *surf)
+{
+	surf->idx_y1=surf->idx_u=surf->idx_v=0;
+	surf->idx_a=surf->idx_r=surf->idx_g=surf->idx_b=0;
+	switch (surf->pixelFormat) {
+	case GF_PIXEL_YUYV:
+		surf->idx_y1=0;
+		surf->idx_u=1;
+		surf->idx_v=3;
+		break;
+	case GF_PIXEL_YVYU:
+		surf->idx_y1=0;
+		surf->idx_u=3;
+		surf->idx_v=1;
+		break;
+	case GF_PIXEL_UYVY:
+		surf->idx_y1=1;
+		surf->idx_u=0;
+		surf->idx_v=2;
+		break;
+	case GF_PIXEL_VYUY:
+		surf->idx_y1=1;
+		surf->idx_u=2;
+		surf->idx_v=0;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+		surf->idx_a = 0;
+		surf->idx_g = 1;
+		break;
+	case GF_PIXEL_GREYALPHA:
+		surf->idx_a = 1;
+		surf->idx_g = 0;
+		break;
+	case GF_PIXEL_ARGB:
+		surf->idx_a=0;
+		surf->idx_r=1;
+		surf->idx_g=2;
+		surf->idx_b=3;
+		break;
+	case GF_PIXEL_RGBA:
+		surf->idx_a=3;
+		surf->idx_r=0;
+		surf->idx_g=1;
+		surf->idx_b=2;
+		break;
+	case GF_PIXEL_BGRA:
+		surf->idx_a=3;
+		surf->idx_r=2;
+		surf->idx_g=1;
+		surf->idx_b=0;
+		break;
+	case GF_PIXEL_ABGR:
+		surf->idx_a=0;
+		surf->idx_r=3;
+		surf->idx_g=2;
+		surf->idx_b=1;
+		break;
+	case GF_PIXEL_RGBX:
+		surf->idx_r=0;
+		surf->idx_g=1;
+		surf->idx_b=2;
+		surf->idx_a=3;
+		break;
+	case GF_PIXEL_BGRX:
+		surf->idx_r=2;
+		surf->idx_g=1;
+		surf->idx_b=0;
+		surf->idx_a=3;
+		break;
+	case GF_PIXEL_XRGB:
+		surf->idx_a=0;
+		surf->idx_r=1;
+		surf->idx_g=2;
+		surf->idx_b=3;
+		break;
+	case GF_PIXEL_XBGR:
+		surf->idx_a=0;
+		surf->idx_r=3;
+		surf->idx_g=2;
+		surf->idx_b=1;
+		break;
+	case GF_PIXEL_RGB:
+		surf->idx_r=0;
+		surf->idx_g=1;
+		surf->idx_b=2;
+		break;
+	case GF_PIXEL_BGR:
+		surf->idx_r=2;
+		surf->idx_g=1;
+		surf->idx_b=0;
+		break;
+	}
+}
+
+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)
+{
+	u32 BPP;
+	Bool size_changed=GF_FALSE;
+	if (!surf || !pixels) return GF_BAD_PARAM;
+
+	surf->is_transparent = GF_FALSE;
+	surf->not_8bits = GF_FALSE;
+	switch (pixelFormat) {
+	case GF_PIXEL_GREYSCALE:
+		BPP = 1;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		BPP = 2;
+		surf->is_transparent = GF_TRUE;
+		break;
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+		BPP = 2;
+		break;
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_ABGR:
+		surf->is_transparent = GF_TRUE;
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+		BPP = 4;
+		break;
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_RGB:
+		BPP = 3;
+		break;
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		BPP = 1;
+		break;
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444_10:
+		BPP = 2;
+		surf->not_8bits = GF_TRUE;
+		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)) {
+		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);
+	}
+	if (surf->width != width) {
+		surf->width = width;
+		size_changed = GF_TRUE;
+	}
+	if (surf->height != height) {
+		surf->height = height;
+		size_changed = GF_TRUE;
+	}
+	surf->pixels = (char*)pixels;
+	surf->pixelFormat = pixelFormat;
+	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);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_surface_attach_to_texture(GF_EVGSurface *surf, GF_EVGStencil * sten)
+{
+	EVG_Texture *tx = (EVG_Texture *) sten;
+	if (!surf || (tx->type != GF_STENCIL_TEXTURE)) return GF_BAD_PARAM;
+
+	return gf_evg_surface_attach_to_buffer(surf, tx->pixels, tx->width, tx->height, 0, tx->stride, tx->pixel_format);
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_surface_clear(GF_EVGSurface *surf, GF_IRect *rc, u32 color)
+{
+	GF_IRect clear;
+	if (!surf) return GF_BAD_PARAM;
+
+	if (rc) {
+		s32 _x, _y;
+		if (surf->center_coords) {
+			_x = rc->x + surf->width / 2;
+			_y = surf->height / 2 - rc->y;
+		} else {
+			_x = rc->x;
+			_y = rc->y - rc->height;
+		}
+		/*clip is outside our bounds, ignore*/
+		if ((_x>=(s32) surf->width) || (_x + rc->width < 0))
+			return GF_OK;
+		if ((_y>= (s32) surf->height) || (_y + rc->height < 0))
+			return GF_OK;
+
+		clear.width = (u32) rc->width;
+		if (_x>=0) {
+			clear.x = (u32) _x;
+		} else {
+			if ( (s32) clear.width + _x < 0) return GF_BAD_PARAM;
+			clear.width += _x;
+			clear.x = 0;
+		}
+		if (clear.x + clear.width > (s32) surf->width)
+			clear.width = surf->width - clear.x;
+
+		if (!clear.width)
+			return GF_OK;
+
+		clear.height = (u32) rc->height;
+		if (_y>=0) {
+			clear.y = _y;
+		} else {
+			if ( (s32) clear.height + _y < 0) return GF_BAD_PARAM;
+			clear.height += _y;
+			clear.y = 0;
+		}
+		if (clear.y + clear.height > (s32) surf->height)
+			clear.height = surf->height - clear.y;
+
+		if (!clear.height)
+			return GF_OK;
+	} else {
+		clear.x = clear.y = 0;
+		clear.width = surf->width;
+		clear.height = surf->height;
+	}
+
+	switch (surf->pixelFormat) {
+	/*RGB formats*/
+	case GF_PIXEL_GREYSCALE:
+		return evg_surface_clear_grey(surf, clear, color);
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		return evg_surface_clear_alphagrey(surf, clear, color);
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_ABGR:
+		return evg_surface_clear_argb(surf, clear, color);
+
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+		return evg_surface_clear_rgbx(surf, clear, color);
+
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+		return evg_surface_clear_rgb(surf, clear, color);
+	case GF_PIXEL_RGB_444:
+		return evg_surface_clear_444(surf, clear, color);
+	case GF_PIXEL_RGB_555:
+		return evg_surface_clear_555(surf, clear, color);
+	case GF_PIXEL_RGB_565:
+		return evg_surface_clear_565(surf, clear, color);
+
+	/*YUV formats*/
+	case GF_PIXEL_YUV:
+		return evg_surface_clear_yuv420p(surf, clear, color);
+	case GF_PIXEL_YUV422:
+		return evg_surface_clear_yuv422p(surf, clear, color);
+	case GF_PIXEL_NV12:
+		return evg_surface_clear_nv12(surf, clear, color, GF_FALSE);
+	case GF_PIXEL_NV21:
+		return evg_surface_clear_nv12(surf, clear, color, GF_TRUE);
+	case GF_PIXEL_YUV444:
+		return evg_surface_clear_yuv444p(surf, clear, color);
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		return evg_surface_clear_yuyv(surf, clear, color);
+	case GF_PIXEL_YUV_10:
+		return evg_surface_clear_yuv420p_10(surf, clear, color);
+	case GF_PIXEL_NV12_10:
+		return evg_surface_clear_nv12_10(surf, clear, color, GF_FALSE);
+	case GF_PIXEL_NV21_10:
+		return evg_surface_clear_nv12_10(surf, clear, color, GF_TRUE);
+	case GF_PIXEL_YUV422_10:
+		return evg_surface_clear_yuv422p_10(surf, clear, color);
+	case GF_PIXEL_YUV444_10:
+		return evg_surface_clear_yuv444p_10(surf, clear, color);
+	default:
+		return GF_BAD_PARAM;
+	}
+}
+
+GF_EXPORT
+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;
+	}
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_surface_set_clipper(GF_EVGSurface *surf , GF_IRect *rc)
+{
+	if (!surf) return GF_BAD_PARAM;
+	if (rc) {
+		surf->clipper = *rc;
+		surf->useClipper = 1;
+		/*clipper was given in BIFS like coords, we work with bottom-min for rect, (0,0) top-left of surface*/
+		if (surf->center_coords) {
+			surf->clipper.x += surf->width / 2;
+			surf->clipper.y = surf->height / 2 - rc->y;
+		} else {
+			surf->clipper.y -= rc->height;
+		}
+
+		if (surf->clipper.x <=0) {
+			if (surf->clipper.x + (s32) surf->clipper.width < 0) return GF_BAD_PARAM;
+			surf->clipper.width += surf->clipper.x;
+			surf->clipper.x = 0;
+		}
+		if (surf->clipper.y <=0) {
+			if (surf->clipper.y + (s32) surf->clipper.height < 0) return GF_BAD_PARAM;
+			surf->clipper.height += surf->clipper.y;
+			surf->clipper.y = 0;
+		}
+		if (surf->clipper.x + surf->clipper.width > (s32) surf->width) {
+			surf->clipper.width = surf->width - surf->clipper.x;
+		}
+		if (surf->clipper.y + surf->clipper.height > (s32) surf->height) {
+			surf->clipper.height = surf->height - surf->clipper.y;
+		}
+	} else {
+		surf->useClipper = 0;
+	}
+	return GF_OK;
+}
+
+
+static Bool setup_grey_callback(GF_EVGSurface *surf, Bool for_3d)
+{
+	u32 a, uv_alpha_size=0;
+	Bool use_const = 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;
+		a = GF_COL_A(surf->fill_col);
+	} else {
+		a = 0;
+		use_const = GF_FALSE;
+	}
+
+	if (use_const && !a && !surf->is_transparent) return GF_FALSE;
+
+	surf->is_422 = GF_FALSE;
+	surf->yuv_type = 0;
+	surf->swap_uv = GF_FALSE;
+	surf->yuv_flush_uv = NULL;
+
+	if (surf->comp_mode) a=100;
+	else if (surf->get_alpha) a=100;
+	surf->fill_single = NULL;
+	surf->fill_single_a = NULL;
+	
+	switch (surf->pixelFormat) {
+	case GF_PIXEL_GREYSCALE:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_grey_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_grey_fill_single;
+			surf->fill_single_a = evg_grey_fill_single_a;
+		}
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_alphagrey_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_alphagrey_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) 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_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;
+			} else if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_argb_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_argb_fill_single;
+			surf->fill_single_a = evg_argb_fill_single_a;
+		}
+		break;
+
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_rgbx_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_rgbx_fill_single;
+			surf->fill_single_a = evg_rgbx_fill_single_a;
+		}
+		break;
+
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_rgb_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_rgb_fill_single;
+			surf->fill_single_a = evg_rgb_fill_single_a;
+		}
+		break;
+
+	case GF_PIXEL_RGB_565:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_565_fill_var;
+			assert(surf->sten->fill_run);
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_565_fill_single;
+			surf->fill_single_a = evg_565_fill_single_a;
+		}
+		break;
+	case GF_PIXEL_RGB_444:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_444_fill_var;
+		}
+		if (surf->ext3d) {
+			surf->fill_single = evg_444_fill_single;
+			surf->fill_single_a = evg_444_fill_single_a;
+		}
+		break;
+	case GF_PIXEL_RGB_555:
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_555_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) 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_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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 2 * 3*surf->width;
+			if (for_3d)
+				surf->sten = &surf->ext3d->yuv_sten;
+		}
+		break;
+	case GF_PIXEL_NV21:
+		surf->swap_uv = GF_TRUE;
+	case GF_PIXEL_NV12:
+		surf->yuv_type = EVG_YUV;
+
+		if (surf->swap_uv) {
+			surf->idx_u = 1;
+			surf->idx_v = 0;
+		} else {
+			surf->idx_u = 0;
+			surf->idx_v = 1;
+		}
+
+		if (use_const && !for_3d) {
+			surf->yuv_flush_uv = evg_nv12_flush_uv_const;
+
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 2 * 3*surf->width;
+		}
+		break;
+	case GF_PIXEL_YUV422:
+		surf->yuv_type = EVG_YUV;
+		surf->is_422 = GF_TRUE;
+		if (use_const && !for_3d) {
+			surf->yuv_flush_uv = evg_yuv422p_flush_uv_const;
+
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv420p_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 2 * 3*surf->width;
+		}
+		break;
+	case GF_PIXEL_YUV444:
+		surf->yuv_type = EVG_YUV_444;
+		if (use_const) {
+			if (a!=0xFF) {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_const_a;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_fill_var;
+		}
+		break;
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuyv_fill_const;
+			}
+			uv_alpha_size = 2*surf->width;
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuyv_fill_var;
+			uv_alpha_size = 2 * 3*surf->width;
+		}
+		break;
+
+	case GF_PIXEL_YUV_10:
+		surf->yuv_type = EVG_YUV;
+		if (use_const && !for_3d) {
+			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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 4*3*surf->width;
+		}
+		break;
+	case GF_PIXEL_NV21_10:
+		surf->swap_uv = GF_TRUE;
+	case GF_PIXEL_NV12_10:
+		surf->yuv_type = EVG_YUV;
+
+		if (surf->swap_uv) {
+			surf->idx_u = 1;
+			surf->idx_v = 0;
+		} else {
+			surf->idx_u = 0;
+			surf->idx_v = 1;
+		}
+
+		if (use_const && !for_3d) {
+			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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 4 * 3*surf->width;
+		}
+		break;
+	case GF_PIXEL_YUV422_10:
+		surf->yuv_type = EVG_YUV;
+		surf->is_422 = GF_TRUE;
+		if (use_const && !for_3d) {
+			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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) 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;
+			uv_alpha_size = 4 * 3*surf->width;
+		}
+		break;
+	case GF_PIXEL_YUV444_10:
+		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;
+			} else {
+				surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_10_fill_const;
+			}
+		} else {
+			surf->gray_spans = (EVG_Raster_Span_Func) evg_yuv444p_10_fill_var;
+		}
+		break;
+	default:
+		return GF_FALSE;
+	}
+
+	if (uv_alpha_size) {
+		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);
+		}
+		memset(surf->uv_alpha, 0, sizeof(char)*surf->uv_alpha_alloc);
+	}
+	if (surf->yuv_type && for_3d)
+		surf->sten = &surf->ext3d->yuv_sten;
+
+	if (use_const && surf->yuv_type) {
+		u8 y, cb, cr;
+		gf_evg_rgb_to_yuv(surf, surf->fill_col, &y, &cb, &cr);
+		if (surf->swap_uv) {
+			u8 t = cb;
+			cb = cr;
+			cr = (u8) t;
+			surf->swap_uv = GF_FALSE;
+		}
+
+		surf->fill_col = GF_COL_ARGB(a, y, cb, cr);
+		surf->fill_col_wide = evg_col_to_wide(surf->fill_col);
+	}
+
+	return GF_TRUE;
+}
+
+
+GF_EXPORT
+GF_Err gf_evg_surface_set_path(GF_EVGSurface *surf, GF_Path *gp)
+{
+	if (!surf) return GF_BAD_PARAM;
+	if (!gp || !gp->n_points) {
+		surf->ftoutline.n_points = 0;
+		surf->ftoutline.n_contours = 0;
+		return GF_OK;
+	}
+	gf_path_flatten(gp);
+	surf->ftoutline.n_points = gp->n_points;
+	surf->ftoutline.n_contours = gp->n_contours;
+
+	surf->ftoutline.tags = gp->tags;
+	surf->ftoutline.contours = (s32*) gp->contours;
+
+	/*store path bounds for gradient/textures*/
+	gf_path_get_bounds(gp, &surf->path_bounds);
+	/*invert Y (ft uses min Y)*/
+	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;
+
+	surf->ftoutline.n_points = gp->n_points;
+	surf->ftoutline.points = gp->points;
+	surf->mx = &surf->mat;
+	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)
+{
+	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;
+
+	/*setup ft raster calllbacks*/
+	if (!setup_grey_callback(surf, GF_FALSE)) return GF_OK;
+
+	/*	surf->gray_spans = gray_spans_stub; */
+
+	/*TODO, check matrix with 3D transform*/
+
+	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);
+		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_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);
+			} else {
+				if (surf->center_coords) gf_mx2d_add_scale(&sten->smat, FIX_ONE, -FIX_ONE);
+			}
+			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;
+			}
+
+			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_inverse(&sten->smat);
+			/*and finalize matrix in gradient coord system*/
+			gf_mx2d_add_matrix(&sten->smat, &lin->vecmat);
+			gf_mx2d_add_scale(&sten->smat, INT2FIX(1<<EVGGRADIENTBITS), INT2FIX(1<<EVGGRADIENTBITS));
+
+			/*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_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;
+		}
+	}
+	max_gray = surf->raster->max_gray_spans;
+	/*force complete line callback for YUV 420/422*/
+	if (surf->yuv_type==EVG_YUV)
+		surf->raster->max_gray_spans = 0xFFFFFFFF;
+
+	if (surf->useClipper) {
+		surf->clip_xMin = surf->clipper.x;
+		surf->clip_yMin = surf->clipper.y;
+		surf->clip_xMax = (surf->clipper.x + surf->clipper.width);
+		surf->clip_yMax = (surf->clipper.y + surf->clipper.height);
+	} else {
+		surf->clip_xMin = 0;
+		surf->clip_yMin = 0;
+		surf->clip_xMax = (surf->width);
+		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);
+
+	surf->raster->max_gray_spans = max_gray;
+
+	/*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;
+	}
+	surf->sten = 0L;
+	return e;
+}
+
+
+
+void gf_evg_surface_set_composite_mode(GF_EVGSurface *surf, GF_EVGCompositeMode comp_mode)
+{
+	if (surf) surf->comp_mode = comp_mode;
+}
+
+void gf_evg_surface_set_alpha_callback(GF_EVGSurface *surf, u8 (*get_alpha)(void *udta, u8 src_alpha, s32 x, s32 y), void *cbk)
+{
+	if (surf) {
+		surf->get_alpha = get_alpha;
+		surf->get_alpha_udta = cbk;
+	}
+}
+
+GF_Err gf_evg_surface_set_projection(GF_EVGSurface *surf, GF_Matrix *mx)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	gf_mx_copy(surf->ext3d->proj, *mx);
+	return GF_OK;
+}
+GF_Err gf_evg_surface_set_modelview(GF_EVGSurface *surf, GF_Matrix *mx)
+{
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+	gf_mx_copy(surf->ext3d->modelview, *mx);
+	return GF_OK;
+}
+
+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);
+
+GF_Err gf_evg_surface_draw_array(GF_EVGSurface *surf, u32 *indices, u32 nb_idx, Float *vertices, u32 nb_vertices, u32 nb_comp, GF_EVGPrimitiveType prim_type)
+{
+	GF_Err e;
+	u32 max_gray;
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+
+	/*setup ft raster calllbacks*/
+	if (!setup_grey_callback(surf, GF_TRUE)) return GF_OK;
+
+	if (surf->useClipper) {
+		surf->clip_xMin = surf->clipper.x;
+		surf->clip_yMin = surf->clipper.y;
+		surf->clip_xMax = (surf->clipper.x + surf->clipper.width);
+		surf->clip_yMax = (surf->clipper.y + surf->clipper.height);
+	} else {
+		surf->clip_xMin = 0;
+		surf->clip_yMin = 0;
+		surf->clip_xMax = (surf->width);
+		surf->clip_yMax = (surf->height);
+	}
+	max_gray = surf->raster->max_gray_spans;
+	/*force complete line callback for YUV 420/422*/
+	if (surf->yuv_type==EVG_YUV)
+		surf->raster->max_gray_spans = 0xFFFFFFFF;
+
+	/*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;
+	return e;
+}
+
+GF_Err evg_raster_render3d_path(GF_EVGSurface *surf, GF_Path *path, Float z);
+
+GF_Err gf_evg_surface_draw_path(GF_EVGSurface *surf, GF_Path *path, Float z)
+{
+	GF_Err e;
+	u32 max_gray;
+	if (!surf || !surf->ext3d) return GF_BAD_PARAM;
+
+	/*setup ft raster calllbacks*/
+	if (!setup_grey_callback(surf, GF_TRUE)) return GF_OK;
+
+	if (surf->useClipper) {
+		surf->clip_xMin = surf->clipper.x;
+		surf->clip_yMin = surf->clipper.y;
+		surf->clip_xMax = (surf->clipper.x + surf->clipper.width);
+		surf->clip_yMax = (surf->clipper.y + surf->clipper.height);
+	} else {
+		surf->clip_xMin = 0;
+		surf->clip_yMin = 0;
+		surf->clip_xMax = (surf->width);
+		surf->clip_yMax = (surf->height);
+	}
+	max_gray = surf->raster->max_gray_spans;
+	/*force complete line callback for YUV 420/422*/
+	if (surf->yuv_type==EVG_YUV)
+		surf->raster->max_gray_spans = 0xFFFFFFFF;
+
+	/*and call the raster*/
+	e = evg_raster_render3d_path(surf, path, z);
+	surf->raster->max_gray_spans =  max_gray;
+	return e;
+}

gpac-0.8.0.tar.gz/src/export.cpp -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC
@@ -38,12 +38,26 @@
 #endif
 
 
-#pragma comment (linker, EXPORT_SYMBOL(gpac_features) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_close) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_set_args) )
 #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_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_sys_features) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_sleep) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mkdir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
@@ -53,6 +67,21 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock_high_res) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_rti) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_battery_state) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_options) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_is_gpac_arg) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_print_arg) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_print_core_help) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_set_cfg_option) )
+#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) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_profiler_send) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_default_cache_directory) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_4cc_to_str) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_error_to_string) )
@@ -60,36 +89,51 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rand) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_user_name) )
 #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_gmtime) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_modify_tools_levels) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_set_tools_levels) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_set_tool_level) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_log_get_tool_level) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_set_strict_error) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_set_callback) )
 #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) )
 
 #ifndef GPAC_DISABLE_LOG
-#pragma comment (linker, EXPORT_SYMBOL(gf_log_tool_level_on) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_va_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_log_lt) )
 #endif
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_fsize) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fileio_new) )
+#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_set_stats) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_set_progress_callback) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_delete_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_move_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_temp_file_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_file_delete) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_file_move) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_file_temp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_modification_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_fread) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fwrite) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fopen) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fclose) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_fseek) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ftell) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fread) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fgets) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_exists) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_basename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_file_ext_start) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_url_colon_suffix) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_has_input) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_get_char) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_prompt_set_echo_off) )
@@ -118,21 +162,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_strdup) )
 #endif /*GPAC_MEMORY_TRACKING*/
 
-/* Print */
-#pragma comment (linker, EXPORT_SYMBOL(gf_asprintf) )
-
-/* Ring Buffer */
-#ifndef GPAC_DISABLE_PLAYER
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_read) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_write) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_read ) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_read) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_available_for_write) )
-#endif
-
-
 /* Sound */
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_mixer_set_config) )
@@ -163,28 +192,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_rem_last) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_swap) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_transfer) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_list_reverse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_clone) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_list_rev_enum) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_pop_front) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_pop_back) )
 
 
-/* Map */
-#ifndef GPAC_DISABLE_PLAYER
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_reset) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_find) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_insert) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_rem) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_has_key) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_set) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_has_next) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_reset) )
-#endif
-
 /* Bitstream */
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_from_file) )
@@ -193,7 +205,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_int) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_long_int) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u8) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u8_until_delimiter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u16) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u24) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u32) )
@@ -221,17 +232,16 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_position) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_refreshed_size) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bs_set_output_buffering) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_transfer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_flush) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_bits_available) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_bit_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_bit_position) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_content_no_truncate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_output_buffering) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_vluimsbf5) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u16_le) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_read_u32_le) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bs_rewind_bits) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_truncate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_byte) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_write_u16_le) )
@@ -253,13 +263,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_v) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_p) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_try_lock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mx_get_num_locks) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_notify) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_wait) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_wait_for) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_global_resource_lock) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_global_resource_unlock) )
 
 /* Socket */
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_new) )
@@ -279,26 +288,28 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_get_local_ip) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_get_local_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_get_remote_address) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sk_send_to) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_setup_multicast) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_is_multicast_address) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_send_wait) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_receive_wait) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sk_receive_no_select) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sk_set_usec_wait) )
+
 #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_get_resource_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_url_remove_last_delimiter) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_url_get_ressource_extension) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_url_to_fs_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utc_time_since_1970) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_gettimeofday) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp_ts) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp_diff_ms) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_set_ntp_shift) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc_ts) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_errno_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_blob_get_data) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_utc) )
@@ -306,7 +317,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_timezone) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_has_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_is_ipv6) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_net_mobileip_set_callback) )
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 #pragma comment (linker, EXPORT_SYMBOL(gf_base64_encode) )
@@ -320,47 +330,54 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_get_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_find) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_token_get_strip) )
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_force_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_remove) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_save) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_key) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_sub_key) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_set_key) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_section_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_section_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_key_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_key_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_insert_key) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_del_section) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_filename) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_set_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_discard_changes) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_ikey) )
+
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_key) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_set_key) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_key_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_del_section) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_section_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_section_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_key_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_discard_changes) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_bool) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_int) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_get_filename) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_opts_default_shared_directory) )
+
 
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_refresh) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_count) )
+#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) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_interface) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_interface_by_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_modules_load) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_modules_load_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_close_interface) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_option) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_set_option) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_modules_get_config) )
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_wcstombs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_mbstowcs) )
 #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) )
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_is_right_to_left) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_utf8_reorder_bidi) )
@@ -387,40 +404,23 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_fetch_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_last_error) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_resource_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_mime_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_header) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_header_sizes_and_times) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_enum_headers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_data_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_get_data_rate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_reassign) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_cache_filename) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_create_entry) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_mime_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_append_http_headers) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_open_write_cache) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_last_modified_on_server) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_etag_on_server) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_content_length) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_set_mime_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cache_get_cache_filename_range) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_auth_callback) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_delete_cached_file_entry_session) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_url_info_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_get_url_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_url_info_init) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dm_is_thread_dead) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_abort) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_set_range) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_setup_from_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dm_get_file_memory) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_get_global_rate) )
-
-
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_can_be_cached_on_disk) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_wget) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_new) )
@@ -430,8 +430,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_suspend) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_parse_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_get_line) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_get_file_size) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_get_file_pos) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_peek_node) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_binary_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_sax_get_error) )
@@ -441,12 +439,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_parse) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_create_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_get_attribute) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_set_attribute) )
+#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_node_new) )
 #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) )
@@ -456,7 +451,6 @@
 #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_parse_bit_sequence) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_detach_root) )
 #endif
 
 #ifndef GPAC_DISABLE_SVG
@@ -507,6 +501,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx2d_apply_coords) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx2d_apply_point) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx2d_apply_rect) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mx2d_decompose) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_bit_size) )
 
 /*exported for 3D tools*/
@@ -516,6 +512,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_vec_norm) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_vec_scale) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_vec_cross) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_vec_scale_p) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_vec_cross_p) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_quat_to_rotation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_quat_from_matrix) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_quat_from_rotation) )
@@ -561,27 +559,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_closest_point_to_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_plane_get_p_vertex_idx) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_plane_exists_intersection) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_plane) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_plane_intersect_planes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bbox_plane_relation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mx_apply_ray) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ray) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ray_hit_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ray_hit_sphere) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ray_hit_triangle) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ray_hit_triangle_backcull) )
 
 /*color.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_stretch_bits) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yv12_10_to_yuv) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yuv422_10_to_yuv422) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yuv444_10_to_yuv444) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yuv422_10_to_yuv) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yuv444_10_to_yuv) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_set) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cmx_set_all) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_copy) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_multiply) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_apply) )
@@ -644,20 +632,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_codec_get_com) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_com_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_com_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_afx_get_type_description) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_esd_get_textual_description) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_slc_set_pref) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_get_bifs_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_get_text_config) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_get_ui_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_get_laser_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_encode_ui_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sl_depacketize) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_size) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_stream_type_by_name) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_avc_cfg_new) )
@@ -682,6 +665,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_read_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_vp_cfg_write_bs) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_txtcfg) )
 
 #ifndef GPAC_MINIMAL_ODF
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_desc_add_desc) )
@@ -722,7 +706,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_open) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_write) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_bs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_delete) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_file_size) )
@@ -730,18 +713,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_parse) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_xml_metadata_description) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_ac3_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_dims_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_stxt_get_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_new_xml_subtitle_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_xml_subtitle_get_description) )
-#ifndef GPAC_DISABLE_ISOM_WRITE
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_size) )
-#endif
 #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_is_fragmented) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragmented_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragments_count) )
@@ -761,6 +741,7 @@
 #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) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_encrypted) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_media_type) )
@@ -790,17 +771,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_sync) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_list_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_segment_count) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edits_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_edit) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_copyright_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_copyright) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_watermark) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_sync_points) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_time_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_cts_to_dts_shift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sync_point_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_root_od) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_root_od) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_disable_odf_conversion) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_in_root_od) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_esd) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_decoder_config) )
@@ -813,6 +794,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_alternate_brand) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_padding_bits) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_visual_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_visual_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_visual_bit_depth) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pixel_aspect_ratio) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_audio_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_chapter_count) )
@@ -868,10 +851,9 @@
 #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_no_version_date_info) )
 #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_for_track) )
+#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_get_media_data_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_omadrm_info) )
@@ -898,20 +880,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_adobe_protection_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_group_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_tile_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_drop_date_version_info_enabled) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_oinf_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_udta_type) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_video_subtype) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_was_traf_start) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_video_handler_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_is_fragment_start) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_constant_sample_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_constant_sample_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_enable_raw_pack) )
-
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_table) )
-#endif
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_magic) )
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -927,8 +904,6 @@
 #ifndef GPAC_DISABLE_ISOM_HINTING
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_payt_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_payt_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_hint_reader) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_next_hint_packet) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_sdp_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_sdp_track_get) )
 # ifndef GPAC_DISABLE_ISOM_DUMP
@@ -944,6 +919,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_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) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_rewrite_track_dependencies) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample) )
@@ -952,32 +928,29 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_refresh_size_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_last_sample_duration) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_last_sample_duration_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_reference) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_references) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_sample_reference) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_final_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_storage_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_enable_compression) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_force_64bit_chunk_offset) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_storage_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_interleave_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_interleave_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_copyright) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_subtype) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_copyright) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_track_kind) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_kind) )
 #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_watermark) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_edit_segment) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_edit_segment) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_append_edit_segment) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edit_segments) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edit_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_edit) )
+#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) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_edits) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_edit_list_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_language) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_handler_name) )
@@ -990,21 +963,16 @@
 #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_set_sample_padding_bits) )
 #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) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_dolby_vision_profile) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_pixel_aspect_ratio) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_layout_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_matrix) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_audio_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_cts_packing) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_modify_cts_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_shift_cts_offset) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_cts_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_pl_indication) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_root_od_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_root_od_url) )
@@ -1016,27 +984,17 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_change_mpeg4_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_desc_to_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_new_generic_sample_description) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_change_generic_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_bitrate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_pl_indications) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_root_od) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_same_sample_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_chapter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_chapter) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sync_shadows) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sync_shadow) )
 #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_set_extraction_slc) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_extraction_slc) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_group) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_priority_in_group) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_store_movie_config) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_load_movie_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_make_interleave) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_update) )
@@ -1054,7 +1012,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_box) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_add_blink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_wrap) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_to_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_display_flags) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_ismacryp_protection) )
@@ -1090,18 +1047,24 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_switch_parameter) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_alternate_group_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_new_dims_description) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_update_dims_description) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_rvc_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_rap_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_roll_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_cenc_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_composition_offset_mode) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_output_buffering) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_group_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_add_sample_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_copy_sample_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_sample_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_track_group) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_progress_callback) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_apply_box_patch) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_ac3_config_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_size) )
+#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) )
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
@@ -1137,7 +1100,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_single_moof_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_append_data) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sai) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_pssh) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_start_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_segment) )
@@ -1149,16 +1111,14 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /*isomedia_dev.h exports*/
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_texte_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_text_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_delete_text_sample) )
 
 #ifndef GPAC_DISABLE_STREAMING
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_new_extended) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp_extended) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_append_sdp_decoding_dependency) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_au_with_sn) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_data) )
@@ -1166,14 +1126,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_disable_auto_rtcp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_send_rtcp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_get_payload_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_streamer_set_interleave_callbacks) )
 
-
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_write_sdp) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_get_sdp) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_send_next_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_reset) )
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_map_esd) )
@@ -1185,28 +1139,20 @@
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_av1_config_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_add_default) )
 #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_delete_xml_subtitle_sample) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item_extended) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_bitrate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pssh) )
 #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) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_xml_subtitle_sample) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_sample_set_dep_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_JPEG2000) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_hdr) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_high_dynamic_range_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_clean_aperture) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_image_sequence_alpha) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_image_sequence_coding_constraints) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_cenc_default) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_streamer_get_current_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_vp_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_vp_config_new) )
@@ -1216,19 +1162,6 @@
 
 /*service.h exports*/
 #ifndef GPAC_DISABLE_PLAYER
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_connect_ack) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_disconnect_ack) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_command) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_send_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_get_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_declare_media) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_get_interface) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_register_mime) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_check_mime_register) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_download_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_download_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_download_update_stats) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_service_command) )
 
 /*mediaobject.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_register) )
@@ -1250,22 +1183,15 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_muted) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_done) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_adjust_clock) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_last_frame_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_visual_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_audio_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_current_speed) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_has_audio) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_private_media) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_set_position) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_flags) )
 #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_get_clock_drift) )
 #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_get_raw_image_planes) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_raw_memory) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_is_started) )
 
 #ifndef GPAC_DISABLE_SVG
@@ -1292,16 +1218,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_response_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_session_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_session_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_set_mobile_ip) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_set_buffer_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_session_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_is_my_session) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_last_session_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_server_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_service_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_response) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_session_state) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_last_request) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_reset_aggregation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_send_command) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_set_interleave_callback) )
@@ -1310,13 +1232,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_unregister_interleave) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_session_new_server) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_command) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_load_service_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_generate_session_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_send_response) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_session_ip) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_next_interleave_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_remote_address) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_get_session_port) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_session_write_interleaved) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtsp_http_tunnel_start) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_setup_transport) )
@@ -1335,15 +1257,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_send_rtcp_report) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_send_bye) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_send_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_set_info_rtcp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_is_unicast) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_is_interleaved) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_clockrate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_is_active) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_low_interleave_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_hight_interleave_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_transport) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_local_ssrc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_loss) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_tcp_bytes_sent) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_get_ports) )
@@ -1351,8 +1270,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_info_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_info_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_info_parse) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sdp_info_check) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sdp_info_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_media_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_media_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sdp_conn_new) )
@@ -1365,17 +1282,20 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_builder_process) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_builder_format_sdp) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_builder_get_payload_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_builder_set_cryp_info) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_process) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_depacketizer_get_slconfig) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_add) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reorderer_get) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_rtp_reset_ssrc) )
+
 #endif /*GPAC_DISABLE_STREAMING*/
 
 
@@ -1414,9 +1334,7 @@
 #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_nalu_next_start_code_bs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_nalu_payload_end_bs) )
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_rewrite_samples) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_svc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_merge_svc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_hevc_tiles) )
@@ -1425,6 +1343,11 @@
 
 #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) )
+
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_change_par) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_remove_non_rap) )
@@ -1450,7 +1373,6 @@
 #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_pps) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_sps_info) )
 #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) )
@@ -1464,7 +1386,6 @@
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_export) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_media_export_nhml) )
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
 
 /*crypto exports*/
@@ -1479,7 +1400,6 @@
 #endif GPAC_DISABLE_CRYPTO
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum_hexa) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_file) )
 
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -1488,7 +1408,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_parse_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_parse_frame) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_get_object_start) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m4v_is_valid_object_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_get_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_rewrite_pl) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_num_channels) )
@@ -1520,8 +1439,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_jpeg_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_png_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_png_enc) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_img_png_enc_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_img_file_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_get_profile_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version_name) )
@@ -1532,15 +1449,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4a_get_profile) )
 #endif
 
-#if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)
-/*ismacryp.h exports*/
+#if !defined(GPAC_DISABLE_CRYPTO) && !defined(GPAC_DISABLE_ISOM_WRITE)
+/*crypt_tools.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_file) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_decrypt_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_encrypt_track) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_decrypt_track) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_gpac_get_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_mpeg4ip_get_info) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_decrypt_fragment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_info_load) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_info_del) )
 
 #endif
 
@@ -1560,15 +1476,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_stream_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sm_stream_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_stream_au_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_aggregate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sm_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_done) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_string) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_run) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sm_load_suspend) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_import_bifs_subtitle) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_get_mux_info) )
 #endif
@@ -1589,7 +1502,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_dump_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sm_dumper_set_extra_graph) )
 #ifndef GPAC_DISABLE_OD_DUMP
-#pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_com) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_desc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odf_dump_com_list) )
@@ -1603,14 +1515,11 @@
 #ifndef GPAC_DISABLE_SENG
 /*bifsengine exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_init) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_seng_init_from_string) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_seng_init_from_context) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_get_stream_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_get_stream_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_encode_context) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_encode_from_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_encode_from_string) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_seng_encode_from_commands) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_save_context) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_enable_aggregation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_aggregate_context) )
@@ -1618,17 +1527,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_get_iod) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_terminate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_seng_get_stream_carousel_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_seng_dump_rap_on) )
 #endif
 
 /*bifs.h exports*/
 #ifndef GPAC_DISABLE_BIFS
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_set_extraction_path) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_ignore_size_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_configure_stream) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decoder_remove_stream) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decode_au) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_decode_command_list) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_get_aq_info) )
@@ -1641,6 +1546,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_get_version) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_get_rap) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bifs_encoder_set_source_url) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bifs_get_child_table) )
+
+
 #endif
 #endif /*GPAC_DISABLE_BIFS*/
 
@@ -1702,7 +1610,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_command_field_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_get_next_available_node_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_get_max_node_id) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_node_get_tag_by_class_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_field_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_add_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_add_child_last) )
@@ -1712,14 +1619,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_get_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_get_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_list_del_child_idx) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_script_get_field_index) )
+
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_dump_attribute) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_dirty_parent_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_dirty_parents) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_get_proto_parent) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_proto_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_is_proto_root) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_list_append_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_proto_is_grouping) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_proto_set_grouping) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_remove_id) )
@@ -1757,7 +1662,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_is_animation_tag) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_apply_animations) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_svg_attributes_copy) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_svg_path_build) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_xml_get_element_tag) )
 
 
@@ -1781,11 +1685,9 @@
 #ifndef GPAC_DISABLE_VRML
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_get_num_fields_in_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_insert_child) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_node_remove_child) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_event_out) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_node_event_out_str) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_get_event_type_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_get_field_type_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_pointer_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_field_pointer_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_vrml_is_sf_field) )
@@ -1806,16 +1708,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_find) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_find_by_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_set_id) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_get_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_set_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_route_get_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_activate_routes) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_set_in_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_get_graph) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_set_private) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_get_private) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_get_extern_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_add_node_code) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_get_field_count) )
@@ -1823,8 +1721,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_find) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_set_ised) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_set_private) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_get_private) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_field_get_field) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_create_instance) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_proto_load_code) )
@@ -1847,6 +1743,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_set_proto_loader) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_sfcolor_to_rgba) )
 #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
 #pragma comment (linker, EXPORT_SYMBOL(gf_js_vrml_flush_event_out) )
 #endif
@@ -1908,30 +1806,19 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_dump_scene) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_set_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_user_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_mouse_input) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_keyboard_input) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_string_input) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_connect_from_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_add_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_is_supported_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_attach_service) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_set_simulation_frame_rate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_simulation_frame_rate) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_step_clocks) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_flush) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_flush_video) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_service_get_interface) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_service_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_text_selection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_paste_text) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_relocate_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_connect_with_path) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_register) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_unregister) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_get_scenegraph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_send_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_compositor) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_visual_output_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_scene_update) )
@@ -1939,16 +1826,10 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_screen_buffer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_release_screen_buffer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_offscreen_buffer) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_process_shortcut) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_set_speed) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_relocate_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_add_event_filter) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_remove_event_filter) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_media_queue) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_get_current_service_id) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_clock) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_forward_event) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_mfurl_from_xlink) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_print_graph) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_is_type_supported) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1962,16 +1843,11 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_force_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_process_anchor) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_disconnect) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_scene_register_associated_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_set_addon_layout_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_select_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_setup_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_odm_disconnect) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odm_setup_es) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_odm_remove_es) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_node_callback) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_term_message) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_clock_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_get_media_object_ex) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_resume_live) )
@@ -1981,12 +1857,11 @@
 
 #ifndef GPAC_DISABLE_PLAYER
 /*compositor.h exports*/
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_load) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_unload) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_set_fps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_set_scene) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_draw_frame) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_on_node_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_invalidate) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_clock) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_lock) )
@@ -1997,25 +1872,20 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_fps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_screen_buffer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_release_screen_buffer) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_render_frame) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_reset_graphics) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_pick_node) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_viewpoint) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_set_viewpoint) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_set_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_register_extra_graph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_compositor) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_reload_audio_filters) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_add_video_listener) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_remove_video_listener) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_add_audio_listener) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_remove_audio_listener) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_focus_switch_ring) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_is_over) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_navigation_supported) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_on_event) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sc_get_selected_text) )
+
 
 #ifndef GPAC_DISABLE_SVG
-#pragma comment (linker, EXPORT_SYMBOL(gf_sc_animation_get_scenegraph) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sc_svg_convert_length_to_display) )
 #endif
 
@@ -2053,23 +1923,15 @@
 
 /*mpegts.h exports*/
 #ifndef GPAC_DISABLE_MPEG2TS
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_esd) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_process_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_reset_parsers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_reset_parsers_for_program) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_es_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_set_pes_framing) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_stream_name) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_crc32_check) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_restamp) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_pes_get_framing_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_sdt_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_abort_parsing) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_pause_demux) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_probe_file) )
 
 
 /* carousel.h */
@@ -2080,6 +1942,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_dmscc_overlord) )
 #endif
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_dmscc_init) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_probe_file) )
+
 
 
 #ifndef GPAC_DISABLE_MPEG2TS_MUX
@@ -2088,7 +1952,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_set_pcr_max_interval) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_program_add) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_program_stream_add) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_program_stream_update_ts_scale) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_update_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_mux_process) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_sys_clock) )
@@ -2106,6 +1969,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_init_from_dom) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_to_mpd) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_smooth_to_mpd) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_m3u8_solve_representation_xlink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_solve_segment_list_xlink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_delete_segment_list) )
@@ -2114,19 +1979,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_write_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_base_url_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_url) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_getter_del_session) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_resolve_segment_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_init_smooth_from_dom) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_complete_from_dom) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mpd_get_segment_start_time_with_timescale) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_seek_in_period) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mpd_seek_to_time) )
 
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_setup))
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_play) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demuxer_close) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_socket) )
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
@@ -2196,11 +2054,9 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_start_date) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_cached_inputs) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_enable_loop_inputs) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_split_on_bound) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_split_on_closest) )
+#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_set_isobmff_options) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_set_test_mode) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dasher_print_session_info) )
 
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_dasher_next_update_time) )
@@ -2234,7 +2090,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_time_shift_buffer_depth) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_check_mpd_root_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_mime) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_url) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_segment_init_keys) )
@@ -2245,6 +2100,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_period_switch_status) )
 #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) )
@@ -2255,17 +2111,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_seek) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_start_range) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_segment_switch_forced) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_current_segment_start_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_presentation_time_offset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_video_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_get_representation_info) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_buffer_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_check_bandwidth) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_resync_to_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_loop_detected) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_dynamic_mpd) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_min_buffer_time) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_idle_interval) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_utc_shift) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_enable_utc_drift_compensation) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_max_resolution) )
@@ -2300,7 +2151,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_tile_adaptation_mode) )
 #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_set_threaded_download) )
 #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) )
@@ -2314,23 +2164,12 @@
 #endif
 
 #if !defined(GPAC_DISABLE_ISOM_WRITE) && !defined(GPAC_DISABLE_VTT)
-#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_js_addCue) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_js_removeCues) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_parse_cues_from_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_parse_iso_cues) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_cue_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_dump_iso_track) )
 #endif
 
-#ifndef GPAC_DISABLE_MSE
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_track_buffer_get_next_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_track_buffer_release_packet) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_open) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_close) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_end) )
-#endif
-
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_atsc3_dmx_new) )
@@ -2354,10 +2193,261 @@
 
 #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_term_service_get_dm) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_localcache_provider) )
 
-#pragma comment (linker, EXPORT_SYMBOL(av1_get_obu_name) )
+/*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_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_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_fs_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_new_defaults) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_load_filter) )
+#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_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_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_filter_set_source ) )
+#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_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_get_last_connect_error ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_get_last_process_error ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_filter_exists ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_enable_reporting) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_fs_set_ui_callback) )
+#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_filter_reconnect_output) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_add_event_listener ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_remove_event_listener ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_description) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_version) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_get_author) )
+#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_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_pck_discard ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_ref_props ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_unref ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_data ) )
+#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_get_property ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_property_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_enum_properties ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_framing ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_framing ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_dts ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_dts ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_cts ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_cts ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_timescale ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_sap ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_sap ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_roll_info ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_roll_info ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_interlaced ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_interlaced ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_corrupted ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_corrupted ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_duration ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_duration ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_seek_flag ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_seek_flag ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_dependency_flags ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_dependency_flags ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_carousel_version ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_carousel_version ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_byte_offset ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_byte_offset ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_crypt_flags ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_crypt_flags ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_seq_num ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_seq_num ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_set_clock_type ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_clock_type ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_get_frame_interface ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_expand ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_truncate ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_merge_properties_filter ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_merge_properties ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_alloc ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_alloc_destructor ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_shared_internal ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_shared ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pck_new_ref ) )
+#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_pid_check_caps ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_copy_properties ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_drop_packet ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_filter_name ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_orig_src_args ) )
+#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_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 ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_first_packet_is_empty ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_is_eos ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_eos ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_enum_properties ) )
+#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_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 ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_remove ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_try_pull ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_clock_info ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_timescale ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_clear_eos ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_clock_mode ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_args ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_max_buffer ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_max_buffer ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_loose_connect ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_caps_query ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_caps_query_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_resolve_file_template ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_discard ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_destination ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_source ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_property ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_property_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_get_info_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_property ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_property_str ) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_info_str) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_filter_pid_set_framing_mode ) )
+#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) )
@@ -2366,7 +2456,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_tohs) )
 #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_text_import_swf) )
 
 #pragma comment (linker, EXPORT_SYMBOL(gf_smil_set_media_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_smil_timing_init_runtime_info) )

gpac-1.0.0.tar.gz/src/filter_core Added

gpac-1.0.0.tar.gz/src/filter_core/filter.c Added

@@ -0,0 +1,3747 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+#include <gpac/network.h>
+
+//helper functions
+void gf_void_del(void *p)
+{
+	gf_free(p);
+}
+void gf_filterpacket_del(void *p)
+{
+	GF_FilterPacket *pck=(GF_FilterPacket *)p;
+	if (pck->data) gf_free(pck->data);
+	gf_free(p);
+}
+
+static void gf_filter_parse_args(GF_Filter *filter, const char *args, GF_FilterArgType arg_type, Bool for_script);
+
+const char *gf_fs_path_escape_colon(GF_FilterSession *sess, const char *path)
+{
+	if (!path) return NULL;
+	if (sess->sep_args != ':')
+		return strchr(path, sess->sep_args);
+
+	return gf_url_colon_suffix(path);
+}
+
+static const char *gf_filter_get_args_stripped(GF_FilterSession *fsess, const char *in_args, Bool is_dst)
+{
+	char szEscape[7];
+	char *args_striped = NULL;
+	if (in_args) {
+		char szDst[5];
+		if (is_dst) {
+			sprintf(szDst, "dst%c", fsess->sep_name);
+		} else {
+			sprintf(szDst, "src%c", fsess->sep_name);
+		}
+		args_striped = strstr(in_args, szDst);
+		if (args_striped) {
+			args_striped = (char *)gf_fs_path_escape_colon(fsess, args_striped+4);
+			if (args_striped) args_striped ++;
+		} else {
+			args_striped = (char *)in_args;
+		}
+	}
+	sprintf(szEscape, "gpac%c", fsess->sep_args);
+	if (args_striped && !strncmp(args_striped, szEscape, 5))
+		return args_striped + 5;
+
+	return args_striped;
+}
+
+const char *gf_filter_get_dst_args(GF_Filter *filter)
+{
+	return gf_filter_get_args_stripped(filter->session, filter->dst_args, GF_TRUE);
+}
+
+char *gf_filter_get_dst_name(GF_Filter *filter)
+{
+	char szDst[5];
+	char *dst, *arg_sep, *res, *dst_args;
+	sprintf(szDst, "dst%c", filter->session->sep_name);
+
+	dst_args = filter->dst_args;
+	if (!dst_args) {
+		GF_FilterPid *outpid = gf_list_get(filter->output_pids, 0);
+		if (outpid) dst_args = outpid->filter->dst_args;
+
+		if (!dst_args) {
+			GF_Filter *outf = gf_list_get(filter->destination_links, 0);
+			if (!outf || !outf->dst_args)
+				outf = gf_list_get(filter->destination_filters, 0);
+			if (outf)
+				dst_args = filter->dst_args;
+		}
+	}
+	dst = dst_args ? strstr(dst_args, szDst) : NULL;
+	if (!dst) return NULL;
+
+	arg_sep = (char*) gf_fs_path_escape_colon(filter->session, dst+4);
+
+	if (arg_sep) {
+		arg_sep[0] = 0;
+		res = gf_strdup(dst+4);
+		arg_sep[0] = filter->session->sep_args;
+	} else {
+		res = gf_strdup(dst+4);
+	}
+	return res;
+}
+
+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];
+	const char *dst_striped = NULL;
+	const char *src_striped = NULL;
+	GF_Filter *filter;
+	GF_Err e;
+	u32 i;
+	assert(fsess);
+
+	GF_SAFEALLOC(filter, GF_Filter);
+	if (!filter) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to alloc filter for %s\n", freg->name));
+		return NULL;
+	}
+	filter->freg = freg;
+	filter->session = fsess;
+	filter->max_extra_pids = freg->max_extra_pids;
+	filter->dynamic_filter = is_dynamic_filter;
+
+	if (fsess->use_locks) {
+		snprintf(szName, 200, "Filter%sPackets", filter->freg->name);
+		filter->pcks_mx = gf_mx_new(szName);
+	}
+
+	//for now we always use a lock on the filter task lists
+	//this mutex protects the task list and the number of process virtual tasks
+	//we cannot remove it in non-threaded mode since we have no garantee that a filter won't use threading on its own
+	snprintf(szName, 200, "Filter%sTasks", filter->freg->name);
+	filter->tasks_mx = gf_mx_new(szName);
+
+	filter->tasks = gf_fq_new(filter->tasks_mx);
+
+	if (! (filter->session->flags & GF_FS_FLAG_NO_RESERVOIR)) {
+		filter->pcks_shared_reservoir = gf_fq_new(filter->pcks_mx);
+		filter->pcks_alloc_reservoir = gf_fq_new(filter->pcks_mx);
+		filter->pcks_inst_reservoir = gf_fq_new(filter->pcks_mx);
+	}
+
+	filter->pending_pids = gf_fq_new(NULL);
+
+	filter->blacklisted = gf_list_new();
+	filter->destination_filters = gf_list_new();
+	filter->destination_links = 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_list_add(fsess->filters, filter);
+	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+
+	filter->multi_sink_target = multi_sink_target;
+
+	src_striped = src_args;
+	dst_striped = NULL;
+	switch (arg_type) {
+	case GF_FILTER_ARG_EXPLICIT_SOURCE_NO_DST_INHERIT:
+		filter->arg_type = arg_type = GF_FILTER_ARG_EXPLICIT_SOURCE;
+		filter->no_dst_arg_inherit = GF_TRUE;
+		break;
+	case GF_FILTER_ARG_INHERIT_SOURCE_ONLY:
+		filter->arg_type = arg_type = GF_FILTER_ARG_INHERIT;
+		filter->no_dst_arg_inherit = GF_TRUE;
+		break;
+	default:
+		filter->arg_type = arg_type;
+		dst_striped = gf_filter_get_args_stripped(fsess, dst_args, GF_TRUE);
+		break;
+	}
+
+	if ((arg_type!=GF_FILTER_ARG_EXPLICIT_SOURCE) && (arg_type!=GF_FILTER_ARG_EXPLICIT)) {
+		src_striped = gf_filter_get_args_stripped(fsess, src_args, GF_FALSE);
+	}
+
+	//if we already concatenated our dst args to this source filter (eg this is an intermediate dynamically loaded one)
+	//don't reappend the args
+	if (dst_striped && src_striped && strstr(src_striped, dst_striped) != NULL) {
+		dst_striped = NULL;
+	}
+
+	if (src_striped && dst_striped) {
+		char *all_args;
+		const char *dbsep;
+		char *localarg_marker;
+		u32 nb_db_sep=0;
+		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
+		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;
+		dbsep = src_striped;
+		while (dbsep) {
+			char *next_dbsep = strstr(dbsep, szDBSep);
+			if (!next_dbsep) break;
+			nb_db_sep++;
+			dbsep = next_dbsep+2;
+		}
+		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;
+		}
+
+		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);
+		}
+		localarg_marker = strstr(all_args, "gfloc");
+		if (localarg_marker) {
+			localarg_marker[0]=0;
+			if (strlen(all_args) && (localarg_marker[-1]==fsess->sep_args))
+				localarg_marker[-1]=0;
+		}
+		e = gf_filter_new_finalize(filter, all_args, arg_type);
+		filter->orig_args = all_args;
+		src_striped = NULL;
+	} else if (dst_striped) {
+		e = gf_filter_new_finalize(filter, dst_striped, arg_type);
+		filter->orig_args = gf_strdup(dst_striped);
+		src_striped = NULL;
+	} else {
+		e = gf_filter_new_finalize(filter, src_striped, arg_type);
+	}
+	filter->dst_args = dst_args ? gf_strdup(dst_args) : NULL;
+
+	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_filter_setup_failure(filter, e);
+		}
+		if (err) *err = e;
+		//filter requested cancelation of filter session upon init
+		if (e==GF_EOS) {
+			fsess->run_status = GF_EOS;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s requested cancelation of filter session\n", freg->name));
+		}
+		return NULL;
+	}
+	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) {
+			filter->has_out_caps = GF_TRUE;
+			break;
+		}
+	}
+	if (filter) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Created filter register %s args %s\n", freg->name, filter->orig_args ? filter->orig_args : "none"));
+	}
+	return filter;
+}
+
+GF_Err gf_filter_new_finalize(GF_Filter *filter, const char *args, GF_FilterArgType arg_type)
+{
+	gf_filter_set_name(filter, NULL);
+
+	gf_filter_parse_args(filter, args, arg_type, GF_FALSE);
+
+	if (filter->freg->initialize) {
+		GF_Err e;
+		FSESS_CHECK_THREAD(filter)
+		e = filter->freg->initialize(filter);
+		if (e) return e;
+	}
+	if ((filter->freg->flags & GF_FS_REG_SCRIPT) && filter->freg->update_arg) {
+		GF_Err e;
+		gf_filter_parse_args(filter, args, arg_type, GF_TRUE);
+		e = filter->freg->update_arg(filter, NULL, NULL);
+		if (e) return e;
+	}
+
+	//flush all pending pid init requests
+	if (filter->has_pending_pids) {
+		filter->has_pending_pids=GF_FALSE;
+		while (gf_fq_count(filter->pending_pids)) {
+			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
+			gf_filter_pid_post_init_task(filter, pid);
+		}
+	}
+	return GF_OK;
+}
+
+void gf_filter_reset_pending_packets(GF_Filter *filter)
+{
+	//may happen when a filter is removed from the chain
+	if (filter->postponed_packets) {
+		while (gf_list_count(filter->postponed_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_front(filter->postponed_packets);
+			gf_filter_packet_destroy(pck);
+		}
+		gf_list_del(filter->postponed_packets);
+		filter->postponed_packets = NULL;
+	}
+}
+
+static void reset_filter_args(GF_Filter *filter);
+
+//when destroying the filter queue we have to skip tasks marked as notified, since they are also present in the
+//session task list
+void task_del(void *_task)
+{
+	GF_FSTask *task = _task;
+	if (!task->notified) gf_free(task);
+}
+
+void gf_filter_del(GF_Filter *filter)
+{
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s destruction\n", filter->name));
+	assert(filter);
+//	assert(!filter->detached_pid_inst);
+	assert(!filter->detach_pid_tasks_pending);
+//	assert(!filter->swap_pidinst_dst);
+	assert(!filter->swap_pidinst_src);
+
+#ifndef GPAC_DISABLE_3D
+	gf_list_del_item(filter->session->gl_providers, filter);
+	gf_fs_check_gl_provider(filter->session);
+#endif
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (filter->session->check_allocs) {
+		if (filter->max_nb_process>10 && (filter->max_nb_consecutive_process * 10 < filter->max_nb_process)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("\nFilter %s extensively uses memory alloc/free in process(): \n", filter->name));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("\tmax stats of over %d calls (%d consecutive calls with no alloc/free):\n", filter->max_nb_process, filter->max_nb_consecutive_process));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("\t\t%d allocs %d callocs %d reallocs %d free\n", filter->max_stats_nb_alloc, filter->max_stats_nb_calloc, filter->max_stats_nb_realloc, filter->max_stats_nb_free));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("\tPlease consider rewriting the code\n"));
+		}
+	}
+#endif
+
+	//may happen when a filter is removed from the chain
+	if (filter->postponed_packets) {
+		while (gf_list_count(filter->postponed_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_front(filter->postponed_packets);
+			gf_filter_packet_destroy(pck);
+		}
+		gf_list_del(filter->postponed_packets);
+		filter->postponed_packets = NULL;
+	}
+
+	//delete output pids before the packet reservoir
+	while (gf_list_count(filter->output_pids)) {
+		gf_filter_pid_del(gf_list_pop_back(filter->output_pids));
+	}
+	gf_list_del(filter->output_pids);
+
+	gf_list_del(filter->blacklisted);
+	gf_list_del(filter->destination_filters);
+	gf_list_del(filter->destination_links);
+	gf_list_del(filter->source_filters);
+	gf_list_del(filter->input_pids);
+	gf_fq_del(filter->tasks, task_del);
+	gf_fq_del(filter->pending_pids, NULL);
+
+	reset_filter_args(filter);
+	if (filter->src_args) gf_free(filter->src_args);
+
+	if (filter->pcks_shared_reservoir)
+		gf_fq_del(filter->pcks_shared_reservoir, gf_void_del);
+	if (filter->pcks_inst_reservoir)
+		gf_fq_del(filter->pcks_inst_reservoir, gf_void_del);
+	if (filter->pcks_alloc_reservoir)
+		gf_fq_del(filter->pcks_alloc_reservoir, gf_filterpacket_del);
+
+	gf_mx_del(filter->pcks_mx);
+	if (filter->tasks_mx)
+		gf_mx_del(filter->tasks_mx);
+
+	if (filter->id) gf_free(filter->id);
+	if (filter->source_ids) gf_free(filter->source_ids);
+	if (filter->dynamic_source_ids) gf_free(filter->dynamic_source_ids);
+	if (filter->filter_udta) gf_free(filter->filter_udta);
+	if (filter->orig_args) gf_free(filter->orig_args);
+	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->session->in_final_flush && !filter->session->run_status) {
+		u32 i, count;
+		gf_mx_p(filter->session->filters_mx);
+		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_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);
+			if (a_filter->cap_dst_filter==filter)
+				a_filter->cap_dst_filter = NULL;
+			if (a_filter->cloned_from == filter)
+				a_filter->cloned_from = NULL;
+			if (a_filter->on_setup_error_filter == filter)
+				a_filter->on_setup_error_filter = NULL;
+			if (a_filter->target_filter == filter)
+				a_filter->target_filter = NULL;
+			if (a_filter->dst_filter == filter)
+				a_filter->dst_filter = NULL;
+		}
+		gf_mx_v(filter->session->filters_mx);
+	}
+	if (filter->instance_description)
+		gf_free(filter->instance_description);
+	if (filter->instance_version)
+		gf_free(filter->instance_version);
+	if (filter->instance_author)
+		gf_free(filter->instance_author);
+	if (filter->instance_help)
+		gf_free(filter->instance_help);
+
+	gf_free(filter);
+}
+
+GF_EXPORT
+void *gf_filter_get_udta(GF_Filter *filter)
+{
+	assert(filter);
+
+	return filter->filter_udta;
+}
+
+GF_EXPORT
+const char * gf_filter_get_name(GF_Filter *filter)
+{
+	assert(filter);
+	if (filter->name)
+		return (const char *)filter->name;
+	return (const char *)filter->freg->name;
+}
+
+GF_EXPORT
+void gf_filter_set_name(GF_Filter *filter, const char *name)
+{
+	assert(filter);
+
+	if (filter->name) gf_free(filter->name);
+	filter->name = gf_strdup(name ? name : filter->freg->name);
+}
+
+static void gf_filter_set_id(GF_Filter *filter, const char *ID)
+{
+	assert(filter);
+
+	if (filter->id) gf_free(filter->id);
+	filter->id = ID ? gf_strdup(ID) : NULL;
+}
+
+GF_EXPORT
+void gf_filter_reset_source(GF_Filter *filter)
+{
+	if (filter && filter->source_ids) {
+		gf_free(filter->source_ids);
+		filter->source_ids = NULL;
+	}
+}
+
+static void gf_filter_set_sources(GF_Filter *filter, const char *sources_ID)
+{
+	assert(filter);
+	if (!sources_ID) {
+		if (filter->source_ids) gf_free(filter->source_ids);
+		filter->source_ids = NULL;
+		return;
+	}
+	if (!filter->source_ids) {
+		filter->source_ids = gf_strdup(sources_ID);
+		return;
+	}
+	gf_dynstrcat(&filter->source_ids, sources_ID, ",");
+}
+
+static void gf_filter_set_arg(GF_Filter *filter, const GF_FilterArgs *a, GF_PropertyValue *argv)
+{
+#ifdef WIN32
+	void *ptr = (void *) (((char*) filter->filter_udta) + a->offset_in_private);
+#else
+	void *ptr = filter->filter_udta + a->offset_in_private;
+#endif
+	Bool res = GF_FALSE;
+	if (a->offset_in_private<0) return;
+
+	switch (argv->type) {
+	case GF_PROP_BOOL:
+		if (a->offset_in_private + sizeof(Bool) <= filter->freg->private_size) {
+			*(Bool *)ptr = argv->value.boolean;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_SINT:
+		if (a->offset_in_private + sizeof(s32) <= filter->freg->private_size) {
+			*(s32 *)ptr = argv->value.sint;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_UINT:
+	case GF_PROP_PIXFMT:
+	case GF_PROP_PCMFMT:
+		if (a->offset_in_private + sizeof(u32) <= filter->freg->private_size) {
+			*(u32 *)ptr = argv->value.uint;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_LSINT:
+		if (a->offset_in_private + sizeof(s64) <= filter->freg->private_size) {
+			*(s64 *)ptr = argv->value.longsint;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_LUINT:
+		if (a->offset_in_private + sizeof(u64) <= filter->freg->private_size) {
+			*(u64 *)ptr = argv->value.longuint;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_FLOAT:
+		if (a->offset_in_private + sizeof(Fixed) <= filter->freg->private_size) {
+			*(Fixed *)ptr = argv->value.fnumber;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_DOUBLE:
+		if (a->offset_in_private + sizeof(Double) <= filter->freg->private_size) {
+			*(Double *)ptr = argv->value.number;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_FRACTION:
+		if (a->offset_in_private + sizeof(GF_Fraction) <= filter->freg->private_size) {
+			*(GF_Fraction *)ptr = argv->value.frac;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_FRACTION64:
+		if (a->offset_in_private + sizeof(GF_Fraction64) <= filter->freg->private_size) {
+			*(GF_Fraction64 *)ptr = argv->value.lfrac;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_VEC2I:
+		if (a->offset_in_private + sizeof(GF_PropVec2i) <= filter->freg->private_size) {
+			*(GF_PropVec2i *)ptr = argv->value.vec2i;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_VEC2:
+		if (a->offset_in_private + sizeof(GF_PropVec2) <= filter->freg->private_size) {
+			*(GF_PropVec2 *)ptr = argv->value.vec2;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_VEC3I:
+		if (a->offset_in_private + sizeof(GF_PropVec3i) <= filter->freg->private_size) {
+			*(GF_PropVec3i *)ptr = argv->value.vec3i;
+			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:
+		if (a->offset_in_private + sizeof(char *) <= filter->freg->private_size) {
+			if (*(char **)ptr) gf_free( * (char **)ptr);
+			//we don't strdup since we don't free the string at the caller site
+			*(char **)ptr = argv->value.string;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_DATA:
+	case GF_PROP_DATA_NO_COPY:
+	case GF_PROP_CONST_DATA:
+		if (a->offset_in_private + sizeof(GF_PropData) <= filter->freg->private_size) {
+			GF_PropData *pd = (GF_PropData *) ptr;
+			if ((argv->type!=GF_PROP_CONST_DATA) && pd->ptr) gf_free(pd->ptr);
+			//we don't free/alloc  since we don't free the string at the caller site
+			pd->size = argv->value.data.size;
+			pd->ptr = argv->value.data.ptr;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_POINTER:
+		if (a->offset_in_private + sizeof(void *) <= filter->freg->private_size) {
+			*(void **)ptr = argv->value.ptr;
+			res = GF_TRUE;
+		}
+		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);
+			}
+			//we don't clone since we don't free the string at the caller site
+			*(GF_List **)ptr = argv->value.string_list;
+			res = GF_TRUE;
+		}
+		break;
+	case GF_PROP_UINT_LIST:
+		if (a->offset_in_private + sizeof(void *) <= filter->freg->private_size) {
+			GF_PropUIntList *l = (GF_PropUIntList *)ptr;
+			if (l->vals) gf_free(l->vals);
+			*l = argv->value.uint_list;
+			res = GF_TRUE;
+		}
+		break;
+	default:
+		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));
+	}
+}
+
+
+static void filter_translate_autoinc(GF_Filter *filter, char *value)
+{
+	u32 ainc_crc, i;
+	GF_FSAutoIncNum *auto_int=NULL;
+	u32 inc_count;
+	Bool assigned=GF_FALSE;
+	s32 max_int = 0;
+	s32 increment=1;
+	char szInt[100];
+
+	while (1) {
+		char *step_sep;
+		char *inc_end, *inc_sep;
+		inc_sep = strstr(value, "$GINC(");
+		if (!inc_sep) return;
+		inc_end = strstr(inc_sep, ")");
+		if (!inc_end) return;
+
+		inc_sep[0] = 0;
+		inc_end[0] = 0;
+		inc_end+=1;
+		strcpy(szInt, inc_sep+6);
+		ainc_crc = (u32) gf_crc_32(szInt, (u32) strlen(szInt) );
+		step_sep = strchr(szInt, ',');
+		if (step_sep) {
+			step_sep[0] = 0;
+			sscanf(step_sep+1, "%d", &increment);
+		}
+
+		inc_count = gf_list_count(filter->session->auto_inc_nums);
+		for (i=0; i<inc_count; i++) {
+			auto_int = gf_list_get(filter->session->auto_inc_nums, i);
+			if (auto_int->crc != ainc_crc) {
+				auto_int=NULL;
+				continue;
+			}
+			if (auto_int->filter == filter) {
+				sprintf(szInt, "%d", auto_int->inc_val);
+				break;
+			}
+			if (!assigned)
+				max_int = auto_int->inc_val;
+			else if ((increment>0) && (max_int < auto_int->inc_val))
+				max_int = auto_int->inc_val;
+			else if ((increment<0) && (max_int > auto_int->inc_val))
+				max_int = auto_int->inc_val;
+
+			assigned = GF_TRUE;
+			auto_int = NULL;
+		}
+		if (!auto_int) {
+			GF_SAFEALLOC(auto_int, GF_FSAutoIncNum);
+			if (auto_int) {
+				auto_int->filter = filter;
+				auto_int->crc = ainc_crc;
+				if (assigned) auto_int->inc_val = max_int + increment;
+				else sscanf(szInt, "%d", &auto_int->inc_val);
+				gf_list_add(filter->session->auto_inc_nums, auto_int);
+			}
+		}
+		if (auto_int) {
+			sprintf(szInt, "%d", auto_int->inc_val);
+			strcat(value, szInt);
+			strcat(value, inc_end);
+		}
+	}
+}
+
+static GF_PropertyValue gf_filter_parse_prop_solve_env_var(GF_Filter *filter, u32 type, const char *name, const char *value, const char *enum_values)
+{
+	char szPath[GF_MAX_PATH];
+	GF_PropertyValue argv;
+
+	if (!value) return gf_props_parse_value(type, name, NULL, enum_values, filter->session->sep_list);
+
+
+	if (!strnicmp(value, "$GSHARE", 7)) {
+		if (gf_opts_default_shared_directory(szPath)) {
+			strcat(szPath, value+7);
+			value = szPath;
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to query GPAC shared resource directory location\n"));
+		}
+	}
+	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"));
+		}
+	}
+	else if (!strnicmp(value, "$GLANG", 6)) {
+		value = gf_opts_get_key("core", "lang");
+		if (!value) value = "en";
+	}
+	else if (!strnicmp(value, "$GUA", 4)) {
+		value = gf_opts_get_key("core", "user-agent");
+		if (!value) value = "GPAC " GPAC_VERSION;
+	} else if (strstr(value, "$GINC(")) {
+		char *a_value = gf_strdup(value);
+		filter_translate_autoinc(filter, a_value);
+		argv = gf_props_parse_value(type, name, a_value, enum_values, filter->session->sep_list);
+		gf_free(a_value);
+		return argv;
+	}
+	argv = gf_props_parse_value(type, name, value, enum_values, filter->session->sep_list);
+	return argv;
+}
+
+void gf_filter_update_arg_task(GF_FSTask *task)
+{
+	u32 i=0;
+	Bool found = GF_FALSE;
+	GF_FilterUpdate *arg=task->udta;
+	//find arg
+	i=0;
+	while (task->filter->freg->args) {
+		GF_PropertyValue argv;
+		const GF_FilterArgs *a = &task->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)
+				continue;
+			is_meta = GF_TRUE;
+		} else if (strcmp(a->arg_name, arg->name)) {
+			continue;
+		}
+
+		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;
+		}
+
+		argv = gf_filter_parse_prop_solve_env_var(task->filter, a->arg_type, a->arg_name, arg->val, a->min_max_enum);
+
+		if (argv.type != GF_PROP_FORBIDEN) {
+			GF_Err e = GF_OK;
+			FSESS_CHECK_THREAD(task->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 (e==GF_OK) {
+				if (!is_meta)
+					gf_filter_set_arg(task->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) ));
+			}
+		} 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;
+	}
+
+	if (!found) {
+		if (arg->recursive) {
+			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") ));
+
+			GF_List *flist = gf_list_new();
+			if (arg->recursive & GF_FILTER_UPDATE_UPSTREAM) {
+				for (i=0; i<task->filter->num_output_pids; i++) {
+					GF_FilterPid *pid = gf_list_get(task->filter->output_pids, i);
+					if (gf_list_find(flist, pid->filter)<0) gf_list_add(flist, pid->filter);
+				}
+				for (i=0; i<gf_list_count(flist); i++) {
+					GF_Filter *a_f = gf_list_get(flist, i);
+					//only allow upstream propagation
+					gf_fs_send_update(task->filter->session, NULL, a_f, arg->name, arg->val, GF_FILTER_UPDATE_UPSTREAM);
+				}
+				gf_list_reset(flist);
+
+			}
+			if (arg->recursive & GF_FILTER_UPDATE_DOWNSTREAM) {
+				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);
+				}
+
+				for (i=0; i<gf_list_count(flist); i++) {
+					GF_Filter *a_f = gf_list_get(flist, i);
+					//only allow downstream propagation
+					gf_fs_send_update(task->filter->session, NULL, a_f, arg->name, arg->val, GF_FILTER_UPDATE_DOWNSTREAM);
+				}
+			}
+
+			gf_list_del(flist);
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Failed to locate argument %s in filter %s\n", arg->name, task->filter->freg->name));
+		}
+	}
+	gf_free(arg->name);
+	gf_free(arg->val);
+	gf_free(arg);
+}
+
+static const char *gf_filter_load_arg_config(GF_FilterSession *session, const char *sec_name, const char *arg_name, const char *arg_val)
+{
+	Bool gf_sys_has_filter_global_args();
+	const char *opt;
+
+	//look in global args
+	if (gf_sys_has_filter_global_args()) {
+		u32 alen = (u32) strlen(arg_name);
+		u32 i, nb_args = gf_sys_get_argc();
+		for (i=0; i<nb_args; i++) {
+			const char *arg = gf_sys_get_arg(i);
+			if (arg[0]!='-') continue;
+			if (arg[1]!='-') continue;
+
+			if (!strncmp(arg+2, arg_name, alen)) {
+				u32 len=0;
+				char *sep = strchr(arg, '=');
+				if (sep) {
+					len = (u32) (sep - (arg+2));
+				} else {
+					len = (u32) strlen(arg+2);
+				}
+				if (len != alen) continue;
+				gf_fs_push_arg(session, arg_name, GF_TRUE, 0);
+
+				if (sep) return sep+1;
+				//no arg value means boolean true
+				else return "true";
+			}
+		}
+	}
+
+	//look in config file
+	opt = gf_opts_get_key(sec_name, arg_name);
+	if (opt)
+		return opt;
+
+	//ifce (used by socket and keep MP4Client behaviour: 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 arg_val;
+}
+
+static void gf_filter_load_meta_args_config(const char *sec_name, GF_Filter *filter)
+{
+	GF_PropertyValue argv;
+	Bool gf_sys_has_filter_global_meta_args();
+	u32 i, key_count = gf_opts_get_key_count(sec_name);
+
+	FSESS_CHECK_THREAD(filter)
+
+	for (i=0; i<key_count; i++) {
+		Bool arg_found = GF_FALSE;
+		u32 k=0;
+		const char *arg_val, *arg_name = gf_opts_get_key_name(sec_name, i);
+		//check if this is a regular arg, if so don't process it
+		while (filter->freg->args) {
+			const GF_FilterArgs *a = &filter->freg->args[k];
+			if (!a || !a->arg_name) break;
+			k++;
+			if (!strcmp(a->arg_name, arg_name)) {
+				arg_found = GF_TRUE;
+				break;
+			}
+		}
+		if (arg_found) continue;
+
+		arg_val = gf_opts_get_key(sec_name, arg_name);
+		if (!arg_val) continue;
+
+		memset(&argv, 0, sizeof(GF_PropertyValue));
+		argv.type = GF_PROP_STRING;
+		argv.value.string = (char *) arg_val;
+		filter->freg->update_arg(filter, arg_name, &argv);
+	}
+	if (!gf_sys_has_filter_global_meta_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;
+		const char *sep, *arg = gf_sys_get_arg(i);
+		if (arg[0] != '-') continue;
+		if (arg[1] != '+') continue;
+		arg+=2;
+		sep = strchr(arg, '=');
+		memset(&argv, 0, sizeof(GF_PropertyValue));
+		argv.type = GF_PROP_STRING;
+		if (sep) {
+			u32 cplen = (u32) (sep - arg);
+			if (cplen>=META_MAX_ARG) cplen=META_MAX_ARG;
+			strncpy(szArg, arg, cplen);
+			szArg[META_MAX_ARG] = 0;
+			argv.value.string = (char *) sep+1;
+		} else {
+			u32 cplen = (u32) strlen(arg);
+			if (cplen>=META_MAX_ARG) cplen=META_MAX_ARG;
+			strncpy(szArg, arg, cplen);
+			szArg[META_MAX_ARG] = 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);
+	}
+}
+
+static void filter_parse_dyn_args(GF_Filter *filter, const char *args, GF_FilterArgType arg_type, Bool for_script, char *szSrc, char *szDst, char *szEscape, char *szSecName, Bool has_meta_args, u32 argfile_level)
+{
+	char *szArg=NULL;
+	u32 i=0;
+	u32 alloc_len=1024;
+	const GF_FilterArgs *f_args = NULL;
+	Bool opts_optional = GF_FALSE;
+
+	if (args)
+		szArg = gf_malloc(sizeof(char)*1024);
+
+	//parse each arg
+	while (args) {
+		char *value;
+		u32 len;
+		Bool found=GF_FALSE;
+		char *escaped = NULL;
+		Bool opaque_arg = GF_FALSE;
+		Bool absolute_url = GF_FALSE;
+		Bool internal_url = GF_FALSE;
+		Bool internal_arg = GF_FALSE;
+		char *sep = NULL;
+
+		//look for our arg separator - if arg[0] is also a separator, consider the entire string until next double sep as the parameter
+		if (args[0] != filter->session->sep_args)
+			sep = strchr(args, filter->session->sep_args);
+		else {
+			while (args[0] == filter->session->sep_args) {
+				args++;
+			}
+			sep = (char *) args + 1;
+			while (1) {
+				sep = strchr(sep, filter->session->sep_args);
+				if (!sep) break;
+				if (sep[1]==filter->session->sep_args) {
+					break;
+				}
+				sep = sep+1;
+			}
+			opaque_arg = GF_TRUE;
+		}
+
+		if (!opaque_arg) {
+			//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 == ':') {
+				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)
+						|| !strncmp(args+4, "audio://", 8)
+						|| !strncmp(args+4, "av://", 5)
+						|| !strncmp(args+4, "gmem://", 7)
+						|| !strncmp(args+4, "gpac://", 7)
+						|| !strncmp(args+4, "pipe://", 7)
+						|| !strncmp(args+4, "tcp://", 6)
+						|| !strncmp(args+4, "udp://", 6)
+						|| !strncmp(args+4, "tcpu://", 7)
+						|| !strncmp(args+4, "udpu://", 7)
+						|| !strncmp(args+4, "rtp://", 6)
+						|| !strncmp(args+4, "atsc://", 7)
+						|| !strncmp(args+4, "gfio://", 7)
+						)
+					) {
+						internal_url = GF_TRUE;
+						sep = strchr(sep+3, ':');
+						if (!strncmp(args+4, "tcp://", 6)
+							|| !strncmp(args+4, "udp://", 6)
+							|| !strncmp(args+4, "tcpu://", 7)
+							|| !strncmp(args+4, "udpu://", 7)
+							|| !strncmp(args+4, "rtp://", 6)
+						) {
+							char *sep2 = sep ? strchr(sep+1, ':') : NULL;
+							if (sep2) {
+								u32 port = 0;;
+								sep2[0] = 0;
+								if (sscanf(sep+1, "%d", &port)!=1) {
+									port = 0;
+								}
+								sep2[0] = ':';
+								if (port) sep = sep2;
+							}
+						}
+
+					} else {
+						char *sep2 = strstr(sep+3, "::");
+						//escape sequence present after this argument, use it
+						if (sep2) {
+							sep = sep2;
+						} else {
+							//get root /
+							sep = strchr(sep+3, '/');
+							//get first : after root
+							if (sep) sep = strchr(sep+1, ':');
+						}
+					}
+				}
+
+				//watchout for "C:\\" or "C:/"
+				while (sep && (sep[1]=='\\' || sep[1]=='/')) {
+					sep = strchr(sep+1, ':');
+				}
+				//escape data/time
+				if (sep) {
+					char *prev_date = sep-3;
+					if (prev_date[0]=='T') {}
+					else if (prev_date[1]=='T') { prev_date ++; }
+					else { prev_date = NULL; }
+
+skip_date:
+					if (prev_date) {
+						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;
+
+						if (search_after) {
+							//take care of lists
+							char *next_date = strchr(search_after, 'T');
+							char *next_sep = strchr(search_after, ':');
+							if (next_date && next_sep && (next_date<next_sep)) {
+								prev_date = next_date - 1;
+								if (prev_date[0] == filter->session->sep_list) {
+									prev_date = next_date;
+									goto skip_date;
+								}
+							}
+							sep = strchr(search_after, ':');
+						}
+					}
+				}
+			}
+			if (sep) {
+				escaped = strstr(sep, szEscape);
+				if (escaped) sep = escaped;
+			}
+
+			if (sep && !strncmp(args, szSrc, 4) && !escaped && absolute_url && !internal_url) {
+				Bool file_exists;
+				sep[0]=0;
+				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 file_exists = gf_file_exists(args+4);
+
+				if (!file_exists) {
+					char *fsep = strchr(args+4, filter->session->sep_frag);
+					if (fsep) {
+						fsep[0] = 0;
+						file_exists = gf_file_exists(args+4);
+						fsep[0] = filter->session->sep_frag;
+					}
+				}
+				sep[0]= filter->session->sep_args;
+				if (!file_exists) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Non-escaped argument pattern \"%s\" in src %s, assuming arguments are part of source URL. Use src=PATH:gpac:ARGS to differentiate, or change separators\n", sep, args));
+					sep = NULL;
+				}
+			}
+		}
+
+
+		//escape some XML inputs
+		if (sep) {
+			char *xml_start = strchr(args, '<');
+			len = (u32) (sep-args);
+			if (xml_start) {
+				u32 xlen = (u32) (xml_start-args);
+				if ((xlen < len) && (args[len-1] != '>')) {
+					while (1) {
+						sep = strchr(sep+1, filter->session->sep_args);
+						if (!sep) {
+							len = (u32) strlen(args);
+							break;
+						}
+						len = (u32) (sep-args);
+						if (args[len-1] != '>') break;
+					}
+				}
+
+			}
+		}
+		else len = (u32) strlen(args);
+
+		if (len>=alloc_len) {
+			alloc_len = len+1;
+			szArg = gf_realloc(szArg, sizeof(char)*len);
+		}
+		strncpy(szArg, args, len);
+		szArg[len]=0;
+
+		value = strchr(szArg, filter->session->sep_name);
+		if (value) {
+			value[0] = 0;
+			value++;
+		}
+
+		if (szArg[0] == filter->session->sep_frag) {
+			filter->user_pid_props = GF_TRUE;
+			goto skip_arg;
+		}
+
+		if ((arg_type == GF_FILTER_ARG_INHERIT) && (!strcmp(szArg, "src") || !strcmp(szArg, "dst")) )
+			goto skip_arg;
+
+		i=0;
+		f_args = filter->freg->args;
+		if (for_script)
+		 	f_args = filter->instance_args;
+
+		while (filter->filter_udta && f_args) {
+			Bool is_my_arg = GF_FALSE;
+			Bool reverse_bool = GF_FALSE;
+			const char *restricted=NULL;
+			const GF_FilterArgs *a = &f_args[i];
+			i++;
+			if (!a || !a->arg_name) break;
+
+			if (!strcmp(a->arg_name, szArg))
+				is_my_arg = GF_TRUE;
+			else if ( (szArg[0]==filter->session->sep_neg) && !strcmp(a->arg_name, szArg+1)) {
+				is_my_arg = GF_TRUE;
+				reverse_bool = GF_TRUE;
+			}
+			//little optim here, if no value check for enums
+			else if (!value && a->min_max_enum && strchr(a->min_max_enum, '|') ) {
+				char *arg_found = strstr(a->min_max_enum, szArg);
+				if (arg_found) {
+					char c = arg_found[strlen(szArg)];
+					if (!c || (c=='|')) {
+						is_my_arg = GF_TRUE;
+						value = szArg;
+					}
+				}
+			}
+
+			if (is_my_arg) restricted = gf_opts_get_key_restricted(szSecName, a->arg_name);
+			if (restricted) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Argument %s of filter %s is restricted to %s by system-wide configuration, ignoring\n", szArg, filter->freg->name, restricted));
+				found=GF_TRUE;
+				break;
+			}
+
+			if (is_my_arg) {
+				GF_PropertyValue argv;
+				found=GF_TRUE;
+
+				argv = gf_filter_parse_prop_solve_env_var(filter, (a->flags & GF_FS_ARG_META) ? GF_PROP_STRING : a->arg_type, a->arg_name, value, a->min_max_enum);
+
+				if (reverse_bool && (argv.type==GF_PROP_BOOL))
+					argv.value.boolean = !argv.value.boolean;
+
+				if (argv.type != GF_PROP_FORBIDEN) {
+					if (!for_script && (a->offset_in_private>=0)) {
+						gf_filter_set_arg(filter, a, &argv);
+					} else if (filter->freg->update_arg) {
+						FSESS_CHECK_THREAD(filter)
+						filter->freg->update_arg(filter, a->arg_name, &argv);
+						opaque_arg = GF_FALSE;
+
+						if ((argv.type==GF_PROP_STRING) && argv.value.string)
+							gf_free(argv.value.string);
+					}
+				}
+				break;
+			}
+		}
+		if (!strlen(szArg)) {
+			found = GF_TRUE;
+		} else if (!found) {
+			if (!strcmp("FID", szArg)) {
+				if (arg_type != GF_FILTER_ARG_INHERIT)
+					gf_filter_set_id(filter, value);
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			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;
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			//codec for generic enc load
+			else if (!strcmp("c", szArg)) {
+				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))
+
+					gf_filter_set_name(filter, value);
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			//codec for generic enc load
+			else if (!strcmp("gfreg", szArg)) {
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+			}
+			//codec for generic enc load
+			else if (!strcmp("gfopt", szArg)) {
+				found = GF_TRUE;
+				internal_arg = GF_TRUE;
+				opts_optional = GF_TRUE;
+			}
+			else if (gf_file_exists(szArg)) {
+				if (!for_script && (argfile_level<5) ) {
+					char szLine[2001];
+					FILE *arg_file = gf_fopen(szArg, "rt");
+					szLine[2000]=0;
+					while (!gf_feof(arg_file)) {
+						u32 llen;
+						char *subarg, *res_line;
+						szLine[0] = 0;
+						res_line = gf_fgets(szLine, 2000, arg_file);
+						if (!res_line) break;
+						llen = (u32) strlen(szLine);
+						while (llen && strchr(" \n\r\t", szLine[llen-1])) {
+							szLine[llen-1]=0;
+							llen--;
+						}
+						if (!llen)
+							continue;
+
+						subarg = szLine;
+						while (subarg[0] && strchr(" \n\r\t", subarg[0]))
+							subarg++;
+						if ((subarg[0] == '/') && (subarg[1] == '/'))
+							continue;
+
+						filter_parse_dyn_args(filter, subarg, arg_type, for_script, szSrc, szDst, szEscape, szSecName, has_meta_args, argfile_level+1);
+					}
+					gf_fclose(arg_file);
+				} else if (!for_script) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter argument file has too many nested levels of sub-files, maximum allowed is 5\n"));
+				}
+				internal_arg = GF_TRUE;
+			}
+			else if (has_meta_args && filter->freg->update_arg && value) {
+				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);
+					if (argv.value.string) gf_free(argv.value.string);
+				}
+				if (!(filter->freg->flags&GF_FS_REG_SCRIPT))
+					found = GF_TRUE;
+			}
+		}
+
+		if (!internal_arg && !opaque_arg && !opts_optional)
+			gf_fs_push_arg(filter->session, szArg, found, 0);
+
+skip_arg:
+		if (escaped) {
+			args=sep+6;
+		} else if (sep) {
+			args=sep+1;
+			if (opaque_arg)
+				args += 1;
+		} else {
+			args=NULL;
+		}
+	}
+	if (szArg) gf_free(szArg);
+}
+
+
+static void gf_filter_parse_args(GF_Filter *filter, const char *args, GF_FilterArgType arg_type, Bool for_script)
+{
+	u32 i=0;
+	char szSecName[200];
+	char szEscape[7];
+	char szSrc[5], szDst[5];
+	Bool has_meta_args = GF_FALSE;
+	const GF_FilterArgs *f_args = NULL;
+	if (!filter) return;
+
+	if (!for_script) {
+		if (!filter->freg->private_size) {
+			if (filter->freg->args && filter->freg->args[0].arg_name) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter with arguments but no private stack size, no arg passing\n"));
+			}
+		} else {
+			filter->filter_udta = gf_malloc(filter->freg->private_size);
+			if (!filter->filter_udta) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate private data stack\n"));
+				return;
+			}
+			memset(filter->filter_udta, 0, filter->freg->private_size);
+		}
+	}
+
+	sprintf(szEscape, "%cgpac%c", filter->session->sep_args, filter->session->sep_args);
+	sprintf(szSrc, "src%c", filter->session->sep_name);
+	sprintf(szDst, "dst%c", filter->session->sep_name);
+
+	snprintf(szSecName, 200, "filter@%s", filter->freg->name);
+
+	//instantiate all args with defauts value
+	f_args = filter->freg->args;
+	if (for_script)
+		f_args = filter->instance_args;
+	i=0;
+	while (f_args) {
+		GF_PropertyValue argv;
+		const char *def_val;
+		const GF_FilterArgs *a = &f_args[i];
+		if (!a || !a->arg_name) break;
+		i++;
+		if (a->flags & GF_FS_ARG_META) {
+			has_meta_args = GF_TRUE;
+			continue;
+		}
+
+		def_val = gf_filter_load_arg_config(filter->session, szSecName, a->arg_name, a->arg_default_val);
+
+		if (!def_val) continue;
+
+		argv = gf_filter_parse_prop_solve_env_var(filter, a->arg_type, a->arg_name, def_val, a->min_max_enum);
+
+		if (argv.type != GF_PROP_FORBIDEN) {
+			if (!for_script && (a->offset_in_private>=0)) {
+				gf_filter_set_arg(filter, a, &argv);
+			} else if (filter->freg->update_arg) {
+				FSESS_CHECK_THREAD(filter)
+				filter->freg->update_arg(filter, a->arg_name, &argv);
+				gf_props_reset_single(&argv);
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to parse argument %s value %s\n", a->arg_name, a->arg_default_val));
+		}
+	}
+	//handle meta filter options, not exposed in registry
+	if (has_meta_args && filter->freg->update_arg && !for_script)
+		gf_filter_load_meta_args_config(szSecName, filter);
+
+
+	filter_parse_dyn_args(filter, args, arg_type, for_script, szSrc, szDst, szEscape, szSecName, has_meta_args, 0);
+}
+
+static void reset_filter_args(GF_Filter *filter)
+{
+	u32 i=0;
+	//removed or no stack
+	if (!filter->filter_udta) return;
+
+	//instantiate all args with defauts value
+	while (filter->freg->args) {
+		GF_PropertyValue argv;
+		const GF_FilterArgs *a = &filter->freg->args[i];
+		i++;
+		if (!a || !a->arg_name) break;
+
+		if (a->arg_type != GF_PROP_FORBIDEN) {
+			memset(&argv, 0, sizeof(GF_PropertyValue));
+			argv.type = a->arg_type;
+			gf_filter_set_arg(filter, a, &argv);
+		}
+	}
+}
+
+void gf_filter_check_output_reconfig(GF_Filter *filter)
+{
+	u32 i, j;
+	//not needed
+	if (!filter->reconfigure_outputs) return;
+	filter->reconfigure_outputs = GF_FALSE;
+	//check destinations of all output pids
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			//PID was reconfigured, update props
+			if (pidi->reconfig_pid_props) {
+				assert(pidi->props);
+				if (pidi->props != pidi->reconfig_pid_props) {
+					//unassign old property list and set the new one
+					assert(pidi->props->reference_count);
+					if (safe_int_dec(& pidi->props->reference_count) == 0) {
+						//see \ref gf_filter_pid_merge_properties_internal for mutex
+						gf_mx_p(pidi->pid->filter->tasks_mx);
+						gf_list_del_item(pidi->pid->properties, pidi->props);
+						gf_mx_v(pidi->pid->filter->tasks_mx);
+						gf_props_del(pidi->props);
+					}
+					pidi->props = pidi->reconfig_pid_props;
+					safe_int_inc( & pidi->props->reference_count );
+				}
+				pidi->reconfig_pid_props = NULL;
+				gf_fs_post_task(filter->session, gf_filter_pid_reconfigure_task, pidi->filter, pid, "pidinst_reconfigure", NULL);
+			}
+		}
+	}
+}
+
+static GF_FilterPidInst *filter_relink_get_upper_pid(GF_FilterPidInst *cur_pidinst, Bool *needs_flush)
+{
+	GF_FilterPidInst *pidinst = cur_pidinst;
+	*needs_flush = GF_FALSE;
+	//locate the true destination
+	while (1) {
+		GF_FilterPid *opid;
+		if (pidinst->filter->num_input_pids != 1) break;
+		if (pidinst->filter->num_output_pids != 1) break;
+		//filter was explicitly loaded, cannot go beyond
+		if (! pidinst->filter->dynamic_filter) break;
+		opid = gf_list_get(pidinst->filter->output_pids, 0);
+		assert(opid);
+		//we have a fan-out, we cannot replace the filter graph after that point
+		//this would affect the other branches of the upper graph
+		if (opid->num_destinations != 1) break;
+		pidinst = gf_list_get(opid->destinations, 0);
+
+		if (gf_fq_count(pidinst->packets))
+			(*needs_flush) = GF_TRUE;
+	}
+	return pidinst;
+}
+
+void gf_filter_relink_task(GF_FSTask *task)
+{
+	Bool needs_flush;
+	GF_FilterPidInst *cur_pidinst = task->udta;
+	/*GF_FilterPidInst *pidinst = */filter_relink_get_upper_pid(cur_pidinst, &needs_flush);
+	if (needs_flush) {
+		task->requeue_request = GF_TRUE;
+		return;
+	}
+	//good do go, unprotect pid
+	assert(cur_pidinst->detach_pending);
+	safe_int_dec(&cur_pidinst->detach_pending);
+	task->filter->removed = GF_FALSE;
+
+ 	gf_filter_relink_dst(cur_pidinst);
+}
+
+void gf_filter_relink_dst(GF_FilterPidInst *from_pidinst)
+{
+	GF_Filter *filter_dst;
+	GF_FilterPid *link_from_pid = NULL;
+	u32 min_chain_len = 0;
+	Bool needs_flush = GF_FALSE;
+	GF_FilterPidInst *src_pidinst = from_pidinst;
+	GF_FilterPidInst *dst_pidinst;
+	GF_Filter *cur_filter = from_pidinst->filter;
+
+	//locate the true destination
+	dst_pidinst = filter_relink_get_upper_pid(src_pidinst, &needs_flush);
+	assert(dst_pidinst);
+
+	//make sure we flush the end of the pipeline  !
+	if (needs_flush) {
+		cur_filter->removed = GF_TRUE;
+		//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);
+		return;
+	}
+	filter_dst = dst_pidinst->filter;
+
+	gf_fs_check_graph_load(cur_filter->session, GF_TRUE);
+
+	//walk down the filter chain and find the shortest path to our destination
+	//stop when the current filter is not a one-to-one filter
+	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;
+
+		an_inpid = gf_list_get(cur_filter->input_pids, 0);
+		if (!an_inpid)
+			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;
+			break;
+		}
+		fchain_len = gf_filter_pid_resolve_link_length(an_inpid->pid, filter_dst);
+		if (fchain_len && (!min_chain_len || (min_chain_len > fchain_len))) {
+			min_chain_len = fchain_len;
+			link_from_pid = an_inpid->pid;
+		}
+		cur_filter = an_inpid->pid->filter;
+	}
+
+	if (!link_from_pid) {
+		gf_fs_check_graph_load(cur_filter->session, GF_FALSE);
+		return;
+	}
+	//detach the pidinst, and relink from the new input pid
+	gf_filter_renegociate_output_dst(link_from_pid, link_from_pid->filter, filter_dst, dst_pidinst, src_pidinst);
+}
+
+void gf_filter_renegociate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi)
+{
+	Bool is_new_chain = GF_TRUE;
+	GF_Filter *new_f;
+	Bool reconfig_only = src_pidi ? GF_FALSE: GF_TRUE;
+
+	assert(filter);
+
+	if (!filter_dst) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Internal error, lost destination for pid %s in filter %s while negotiating caps !!\n", pid->name, filter->name));
+		return;
+	}
+
+	//try to load filters to reconnect output pid
+	//we pass the source pid if given, so that we are sure the active property set is used to match the caps
+	if (!reconfig_only && gf_filter_pid_caps_match(src_pidi ? (GF_FilterPid *)src_pidi : pid, filter_dst->freg, filter_dst, NULL, NULL, NULL, -1)) {
+		GF_FilterPidInst *a_dst_pidi;
+		new_f = pid->filter;
+		assert(pid->num_destinations==1);
+		a_dst_pidi = gf_list_get(pid->destinations, 0);
+		//we are replacing the chain, remove filters until dest, keeping the final PID connected since we will detach
+		// and reattach it
+		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;
+
+	}
+	//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);
+		gf_list_del_item(pid->filter->blacklisted, (void *)pid->filter->freg);
+	}
+	//we are inserting a new chain
+	else {
+		Bool reassigned;
+		gf_fs_check_graph_load(filter_dst->session, GF_TRUE);
+		new_f = gf_filter_pid_resolve_link(pid, filter_dst, &reassigned);
+	}
+
+	gf_fs_check_graph_load(filter_dst->session, GF_FALSE);
+
+	if (! new_f) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("No suitable filter to adapt caps between pid %s in filter %s to filter %s, disconnecting pid!\n", pid->name, filter->name, filter_dst->name));
+		filter->session->last_connect_error = GF_FILTER_NOT_FOUND;
+
+		if (pid->adapters_blacklist) {
+			gf_list_del(pid->adapters_blacklist);
+			pid->adapters_blacklist = NULL;
+		}
+		if (dst_pidi) {
+			gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, dst_pidi->filter, dst_pidi->pid, "pidinst_disconnect", NULL);
+		}
+		return;
+	}
+	//detach pid instance from its source pid
+	if (dst_pidi) {
+		//signal as detached, this will prevent any further packet access
+		safe_int_inc(&dst_pidi->detach_pending);
+
+		//we need to first reconnect the pid and then detach the output
+		if (is_new_chain) {
+			//signal a stream reset is pending to prevent filter entering endless loop
+			safe_int_inc(&dst_pidi->filter->stream_reset_pending);
+			//keep track of the pidinst being detached in the target filter
+			new_f->swap_pidinst_dst = dst_pidi;
+			//keep track of the pidinst being detached from the source filter
+			new_f->swap_pidinst_src = src_pidi;
+			new_f->swap_needs_init = GF_TRUE;
+		}
+		//we directly detach the pid
+		else {
+			safe_int_inc(&dst_pidi->pid->filter->detach_pid_tasks_pending);
+			safe_int_inc(&filter_dst->detach_pid_tasks_pending);
+			gf_fs_post_task(filter->session, gf_filter_pid_detach_task, filter_dst, dst_pidi->pid, "pidinst_detach", filter_dst);
+		}
+	}
+
+	if (reconfig_only) {
+		assert(pid->caps_negociate);
+		new_f->caps_negociate = pid->caps_negociate;
+		safe_int_inc(&new_f->caps_negociate->reference_count);
+	}
+
+	if (is_new_chain) {
+		//mark this filter has having pid connection pending to prevent packet dispatch until the connection is done
+		safe_int_inc(&pid->filter->out_pid_connection_pending);
+		gf_filter_pid_post_connect_task(new_f, pid);
+	} else {
+		gf_fs_post_task(filter->session, gf_filter_pid_reconfigure_task, filter_dst, pid, "pidinst_reconfigure", NULL);
+	}
+}
+
+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;
+	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 (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);
+		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));
+
+	gf_filter_check_output_reconfig(filter);
+
+	//success !
+	if (src_pid->adapters_blacklist) {
+		gf_list_del(pid->adapters_blacklist);
+		src_pid->adapters_blacklist = NULL;
+	}
+	assert(pid->caps_negociate->reference_count);
+	if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
+		gf_props_del(pid->caps_negociate);
+	}
+	pid->caps_negociate = NULL;
+	if (filter->is_pid_adaptation_filter) {
+		filter->dst_filter = NULL;
+	}
+	return GF_TRUE;
+}
+
+void gf_filter_reconfigure_output_task(GF_FSTask *task)
+{
+	GF_Filter *filter = task->filter;
+	GF_FilterPid *pid;
+	assert(filter->num_output_pids==1);
+	pid = gf_list_get(filter->output_pids, 0);
+	gf_filter_reconf_output(filter, pid);
+}
+
+
+static void gf_filter_renegociate_output(GF_Filter *filter, Bool force_afchain_insert)
+{
+	u32 i, j;
+	assert(filter->nb_caps_renegociate );
+	safe_int_dec(& filter->nb_caps_renegociate );
+
+	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;
+
+			//the property map is create with ref count 1
+
+			//we cannot reconfigure output if more than one destination
+			if ((pid->num_destinations<=1) && filter->freg->reconfigure_output && !force_afchain_insert) {
+				GF_Err e = filter->freg->reconfigure_output(filter, pid);
+				if (e) {
+					if (filter->is_pid_adaptation_filter) {
+						GF_FilterPidInst *src_pidi = gf_list_get(filter->input_pids, 0);
+						GF_FilterPidInst *pidi = gf_list_get(pid->destinations, 0);
+
+						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)));
+
+						assert(filter->num_input_pids==1);
+
+						gf_filter_pid_retry_caps_negotiate(src_pidi->pid, pid, pidi->filter);
+
+						continue;
+					}
+					GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s output reconfiguration error %s, loading filter chain for renegociation\n", filter->name, gf_error_to_string(e)));
+				} else {
+					is_ok = GF_TRUE;
+					gf_filter_check_output_reconfig(filter);
+				}
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s cannot reconfigure output pids, loading filter chain for renegociation\n", filter->name));
+			}
+
+			if (!is_ok) {
+				GF_Filter *filter_dst;
+				//we are currently connected to output
+				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;
+						filter_dst = pidi->filter;
+
+						if (filter_dst->freg->reconfigure_output) {
+							assert(!filter_dst->caps_negociate);
+							filter_dst->caps_negociate = pid->caps_negociate;
+							safe_int_inc(&filter_dst->caps_negociate->reference_count);
+
+							gf_fs_post_task(filter->session, gf_filter_reconfigure_output_task, filter_dst, NULL, "filter reconfigure output", NULL);
+						} else {
+							//disconnect pid, but prevent filter from unloading
+							if (!filter_dst->sticky) filter_dst->sticky = 2;
+							gf_filter_renegociate_output_dst(pid, filter, filter_dst, pidi, NULL);
+						}
+					}
+				}
+				//we are deconnected (unload of a previous adaptation filter)
+				else {
+					filter_dst = pid->caps_dst_filter;
+					assert(pid->num_destinations==0);
+					pid->caps_dst_filter = NULL;
+					gf_filter_renegociate_output_dst(pid, filter, filter_dst, NULL, NULL);
+				}
+			}
+			assert(pid->caps_negociate->reference_count);
+			if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
+				gf_props_del(pid->caps_negociate);
+			}
+			pid->caps_negociate = NULL;
+			pid->caps_negociate_pidi = NULL;
+		}
+	}
+}
+
+void gf_filter_renegociate_output_task(GF_FSTask *task)
+{
+	//it is possible that the cap renegociation was already done at the time we process this task
+	if (task->filter->nb_caps_renegociate)
+		gf_filter_renegociate_output(task->filter, GF_TRUE);
+}
+
+static void gf_filter_check_pending_tasks(GF_Filter *filter, GF_FSTask *task)
+{
+	if (filter->session->run_status!=GF_OK) {
+		return;
+	}
+
+	//lock task mx to take the decision whether to requeue a new task or not (cf gf_filter_post_process_task)
+	//TODO: find a way to bypass this mutex ?
+	gf_mx_p(filter->tasks_mx);
+
+	assert(filter->scheduled_for_next_task || filter->session->direct_mode);
+	assert(filter->process_task_queued);
+	if (safe_int_dec(&filter->process_task_queued) == 0) {
+		//we have pending packets, auto-post and requeue
+		if (filter->pending_packets) {
+			safe_int_inc(&filter->process_task_queued);
+			task->requeue_request = GF_TRUE;
+		}
+		//special case here: no more pending packets, filter has detected eos on one of its input but is still generating packet,
+		//we reschedule (typically flush of decoder)
+		else if (filter->eos_probe_state == 2) {
+			safe_int_inc(&filter->process_task_queued);
+			task->requeue_request = GF_TRUE;
+			filter->eos_probe_state = 0;
+		}
+		//we are done for now
+		else {
+			task->requeue_request = GF_FALSE;
+		}
+	} else {
+		//we have some more process() requests queued, requeue
+		task->requeue_request = GF_TRUE;
+	}
+	if (task->requeue_request) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filter] %s kept in scheduler blocking %d\n", filter->name, filter->would_block));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filter] %s removed from scheduler - blocking %d\n", filter->name, filter->would_block));
+	}
+	gf_mx_v(filter->tasks_mx);
+}
+
+#ifdef GPAC_MEMORY_TRACKING
+static GF_Err gf_filter_process_check_alloc(GF_Filter *filter)
+{
+	GF_Err e;
+	u32 nb_allocs=0, nb_callocs=0, nb_reallocs=0, nb_free=0;
+	u32 prev_nb_allocs=0, prev_nb_callocs=0, prev_nb_reallocs=0, prev_nb_free=0;
+
+	//reset alloc/realloc stats of filter
+	filter->session->nb_alloc_pck = 0;
+	filter->session->nb_realloc_pck = 0;
+	//get current alloc state
+	gf_mem_get_stats(&prev_nb_allocs, &prev_nb_callocs, &prev_nb_reallocs, &prev_nb_free);
+	e = filter->freg->process(filter);
+
+	//get new alloc state
+	gf_mem_get_stats(&nb_allocs, &nb_callocs, &nb_reallocs, &nb_free);
+	//remove prev alloc stats
+	nb_allocs -= prev_nb_allocs;
+	nb_callocs -= prev_nb_callocs;
+	nb_reallocs -= prev_nb_reallocs;
+	nb_free -= prev_nb_free;
+
+	//remove internal allocs/reallocs due to filter lib
+	if (nb_allocs>filter->session->nb_alloc_pck)
+		nb_allocs -= filter->session->nb_alloc_pck;
+	else
+		nb_allocs = 0;
+
+	if (nb_reallocs>filter->session->nb_realloc_pck)
+		nb_reallocs -= filter->session->nb_realloc_pck;
+	else
+		nb_reallocs = 0;
+
+	//we now have nomber of allocs/realloc used by the filter internally during its process
+	if (nb_allocs || nb_callocs || nb_reallocs /* || nb_free */) {
+		filter->stats_nb_alloc += nb_allocs;
+		filter->stats_nb_calloc += nb_callocs;
+		filter->stats_nb_realloc += nb_reallocs;
+		filter->stats_nb_free += nb_free;
+	} else {
+		filter->nb_consecutive_process ++;
+	}
+	filter->nb_process_since_reset++;
+	return e;
+
+}
+#endif
+
+static GFINLINE void check_filter_error(GF_Filter *filter, GF_Err e, Bool for_reconnection)
+{
+	GF_Err out_e = e;
+	Bool kill_filter = GF_FALSE;
+	if (e>GF_OK) e = GF_OK;
+	else if (e==GF_IP_NETWORK_EMPTY) e = GF_OK;
+
+	if (e) {
+		u64 diff;
+		filter->session->last_process_error = e;
+
+		filter->nb_errors ++;
+		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;
+		//give it at most one second
+		diff = gf_sys_clock_high_res() - filter->time_at_first_error;
+		if (diff >= 1000000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("[Filter] %s in error / not responding properly: %d consecutive errors in "LLU" us with no packet discarded or sent\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors, diff));
+			kill_filter = GF_TRUE;
+		}
+	} else {
+		if ((!filter->nb_pck_io && filter->pending_packets && (filter->nb_pids_playing>0) ) || for_reconnection) {
+			filter->nb_consecutive_errors++;
+
+			out_e = GF_SERVICE_ERROR;
+			if (filter->nb_consecutive_errors >= 100000) {
+				if (for_reconnection) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("[Filter] %s not responding properly: %d consecutive attempts at reconfiguring\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors));
+				} else if (!filter->session->in_final_flush) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("[Filter] %s not responding properly: %d consecutive process with no packet discarded or sent, but %d packets pending\n\tdiscarding all inputs and notifying end of stream on all outputs\n", filter->name, filter->nb_consecutive_errors, filter->pending_packets));
+				} else {
+					out_e = GF_OK;
+				}
+				kill_filter = GF_TRUE;
+			}
+		} else {
+			filter->nb_consecutive_errors = 0;
+			filter->nb_pck_io = 0;
+		}
+	}
+
+	if (kill_filter) {
+		u32 i;
+		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);
+		}
+		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->session->last_process_error = out_e;
+		filter->disabled = GF_TRUE;
+	}
+}
+
+static void gf_filter_process_task(GF_FSTask *task)
+{
+	GF_Err e;
+	Bool skip_block_mode = GF_FALSE;
+	GF_Filter *filter = task->filter;
+	Bool force_block_state_check=GF_FALSE;
+	assert(task->filter);
+	assert(filter->freg);
+	assert(filter->freg->process);
+	task->can_swap = GF_TRUE;
+
+	filter->schedule_next_time = 0;
+
+	if (filter->disabled) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s is disabled, cancelling process\n", filter->name));
+		gf_mx_p(task->filter->tasks_mx);
+		task->filter->process_task_queued = 0;
+		gf_mx_v(task->filter->tasks_mx);
+		return;
+	}
+
+	if (filter->out_pid_connection_pending || filter->detached_pid_inst || filter->caps_negociate) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has %s pending, requeuing process\n", filter->name, filter->out_pid_connection_pending ? "connections" : filter->caps_negociate ? "caps negociation" : "input pid reassignments"));
+		//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);
+		return;
+	}
+	if (filter->removed || filter->finalized) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has been %s, skipping process\n", filter->name, filter->finalized ? "finalized" : "removed"));
+		return;
+	}
+
+	if (filter->prevent_blocking) skip_block_mode = GF_TRUE;
+	else if (filter->session->in_final_flush) skip_block_mode = GF_TRUE;
+
+	//blocking filter: remove filter process task - task will be reinserted upon unblock()
+	if (!skip_block_mode && filter->would_block && (filter->would_block + filter->num_out_pids_not_connected == filter->num_output_pids ) ) {
+		gf_mx_p(task->filter->tasks_mx);
+		//it may happen that by the time we get the lock, the filter has been unblocked by another thread. If so, don't skip task
+		if (filter->would_block) {
+			filter->nb_tasks_done--;
+			task->filter->process_task_queued = 0;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s blocked, skipping process\n", filter->name));
+			gf_mx_v(task->filter->tasks_mx);
+			return;
+		}
+		gf_mx_v(task->filter->tasks_mx);
+	}
+	if (filter->stream_reset_pending) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has stream reset pending, postponing process\n", filter->name));
+		filter->nb_tasks_done--;
+		task->requeue_request = GF_TRUE;
+		assert(filter->process_task_queued);
+		return;
+	}
+	assert(filter->process_task_queued);
+	assert(!filter->multi_sink_target);
+
+	//the following breaks demuxers where PIDs are not all known from start: if we filter some pids due to user request,
+	//we may end up with the following test true but not all PIDs yet declared, hence no more processing
+	//we could add a filter cap for that, but for now we simply rely on the blocking mode algo only
+#if 0
+	if (filter->num_output_pids && (filter->num_out_pids_not_connected==filter->num_output_pids)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no valid connected outputs, skipping process\n", filter->name));
+		return;
+	}
+#endif
+
+	//we have postponed packets on filter, flush them
+	if (task->filter->postponed_packets) {
+		while (gf_list_count(task->filter->postponed_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_front(task->filter->postponed_packets);
+			e = gf_filter_pck_send_internal(pck, GF_FALSE);
+			if (e==GF_PENDING_PACKET) {
+				//packet is pending so was added at the end of our postponed queue - remove from queue and reinsert in front
+				gf_list_del_item(task->filter->postponed_packets, pck);
+				gf_list_insert(task->filter->postponed_packets, pck, 0);
+				task->requeue_request = GF_TRUE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s still has postponed packets, postponing process\n", filter->name));
+				return;
+			}
+		}
+		gf_list_del(task->filter->postponed_packets);
+		task->filter->postponed_packets = NULL;
+	}
+	FSESS_CHECK_THREAD(filter)
+
+	filter->nb_pck_io = 0;
+
+	if (filter->nb_caps_renegociate) {
+		gf_filter_renegociate_output(filter, GF_FALSE);
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s process\n", filter->name));
+	gf_rmt_begin_hash(filter->name, GF_RMT_AGGREGATE, &filter->rmt_hash);
+
+	filter->in_process_callback = GF_TRUE;
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (filter->session->check_allocs)
+		e = gf_filter_process_check_alloc(filter);
+	else
+#endif
+		e = filter->freg->process(filter);
+
+	filter->in_process_callback = GF_FALSE;
+	gf_rmt_end();
+
+	//flush all pending pid init requests following the call to init
+	if (filter->has_pending_pids) {
+		filter->has_pending_pids=GF_FALSE;
+		while (gf_fq_count(filter->pending_pids)) {
+			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
+			gf_filter_pid_post_init_task(filter, pid);
+		}
+	}
+	//no requeue if end of session
+	if (filter->session->run_status != GF_OK) {
+		return;
+	}
+	//if eos but we still have pending packets or process tasks queued, move to GF_OK so that
+	//we evaluate the blocking state
+	if (e==GF_EOS) {
+		if (filter->postponed_packets) {
+		 	e = GF_OK;
+		} else if (filter->process_task_queued) {
+			e = GF_OK;
+			force_block_state_check = GF_TRUE;
+		}
+	}
+
+	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);
+		return;
+	}
+
+	if ((e==GF_PROFILE_NOT_SUPPORTED) && filter->has_out_caps && !(filter->session->flags & GF_FS_FLAG_NO_REASSIGN)) {
+		u32 i;
+		//disconnect all other inputs, and post a re-init
+		gf_mx_p(filter->tasks_mx);
+		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_list_add(a_pidinst->pid->filter->blacklisted, (void *) filter->freg);
+
+			gf_filter_relink_dst(a_pidinst);
+		}
+		filter->process_task_queued = 0;
+		gf_mx_v(filter->tasks_mx);
+		return;
+	}
+	check_filter_error(filter, e, GF_FALSE);
+
+	//source filters, flush data if enough space available.
+	if ( (!filter->num_output_pids || (filter->would_block + filter->num_out_pids_not_connected < filter->num_output_pids) )
+		&& !filter->input_pids
+		&& (e!=GF_EOS)
+		&& !force_block_state_check
+	) {
+		if (filter->schedule_next_time)
+			task->schedule_next_time = filter->schedule_next_time;
+		task->requeue_request = GF_TRUE;
+		assert(filter->process_task_queued);
+	}
+	//filter requested a requeue
+	else if (filter->schedule_next_time) {
+		if (!filter->session->in_final_flush) {
+			task->schedule_next_time = filter->schedule_next_time;
+			task->requeue_request = GF_TRUE;
+			assert(filter->process_task_queued);
+		}
+	}
+	//last task for filter but pending packets and not blocking, requeue in main scheduler
+	else if ((filter->would_block < filter->num_output_pids)
+			&& filter->pending_packets
+			&& (gf_fq_count(filter->tasks)<=1)
+	) {
+		task->requeue_request = GF_TRUE;
+		assert(filter->process_task_queued);
+	}
+	else {
+		assert (!filter->schedule_next_time);
+		gf_filter_check_pending_tasks(filter, task);
+		if (task->requeue_request) {
+			assert(filter->process_task_queued);
+		}
+	}
+}
+
+void gf_filter_process_inline(GF_Filter *filter)
+{
+	GF_Err e;
+	if (filter->out_pid_connection_pending || filter->removed || filter->stream_reset_pending || filter->multi_sink_target) {
+		return;
+	}
+	if (filter->would_block && (filter->would_block == filter->num_output_pids) ) {
+		return;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s inline process\n", filter->name));
+
+	if (filter->postponed_packets) {
+		while (gf_list_count(filter->postponed_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_front(filter->postponed_packets);
+			gf_filter_pck_send(pck);
+		}
+		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);
+			return;
+		}
+	}
+	FSESS_CHECK_THREAD(filter)
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (filter->session->check_allocs)
+		e = gf_filter_process_check_alloc(filter);
+	else
+#endif
+		e = filter->freg->process(filter);
+
+	//flush all pending pid init requests following the call to init
+	if (filter->has_pending_pids) {
+		filter->has_pending_pids=GF_FALSE;
+		while (gf_fq_count(filter->pending_pids)) {
+			GF_FilterPid *pid=gf_fq_pop(filter->pending_pids);
+			gf_filter_pid_post_init_task(filter, pid);
+		}
+	}
+	//no requeue if end of session
+	if (filter->session->run_status != GF_OK) {
+		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);
+		return;
+	}
+	check_filter_error(filter, e, GF_FALSE);
+}
+
+GF_EXPORT
+void gf_filter_send_update(GF_Filter *filter, const char *fid, const char *name, const char *val, GF_EventPropagateType propagate_mask)
+{
+	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 *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"));
+
+	return new_filter;
+}
+
+GF_EXPORT
+u32 gf_filter_get_ipid_count(GF_Filter *filter)
+{
+	return filter->num_input_pids;
+}
+
+GF_EXPORT
+GF_FilterPid *gf_filter_get_ipid(GF_Filter *filter, u32 idx)
+{
+	return gf_list_get(filter->input_pids, idx);
+}
+
+GF_EXPORT
+u32 gf_filter_get_opid_count(GF_Filter *filter)
+{
+	return filter->num_output_pids;
+}
+
+GF_EXPORT
+GF_FilterPid *gf_filter_get_opid(GF_Filter *filter, u32 idx)
+{
+	return gf_list_get(filter->output_pids, idx);
+}
+
+void gf_filter_post_process_task_internal(GF_Filter *filter, Bool use_direct_dispatch)
+{
+	if (filter->finalized || filter->removed)
+		return;
+
+	//although this is theoretically OK, it breaks quite some tests. Need further investigation
+#if 0
+	//if regular posting (not direct) and our caller is the main process function, no need to lock task mutex, just increase
+	//the next scheduled time
+	if (!use_direct_dispatch && filter->in_process_callback) {
+		filter->schedule_next_time = 1 + gf_sys_clock_high_res();
+		return;
+	}
+#endif
+
+	//lock task mx to take the decision whether to post a new task or not (cf gf_filter_check_pending_tasks)
+	gf_mx_p(filter->tasks_mx);
+	assert((s32)filter->process_task_queued>=0);
+
+	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);
+	} 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);
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s skip post process task\n", filter->freg->name));
+		assert(filter->session->run_status
+		 		|| filter->session->in_final_flush
+		 		|| filter->disabled
+				|| filter->scheduled_for_next_task
+				|| filter->session->direct_mode
+		 		|| gf_fq_count(filter->tasks)
+		);
+	}
+	if (!filter->session->direct_mode && !use_direct_dispatch) {
+		assert(filter->process_task_queued);
+	}
+	gf_mx_v(filter->tasks_mx);
+}
+
+GF_EXPORT
+void gf_filter_post_process_task(GF_Filter *filter)
+{
+	gf_filter_post_process_task_internal(filter, GF_FALSE);
+}
+GF_EXPORT
+void gf_filter_ask_rt_reschedule(GF_Filter *filter, u32 us_until_next)
+{
+	if (!filter->in_process) {
+		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));
+		return;
+	}
+	if (filter->session->in_final_flush)
+		us_until_next = 0;
+
+	//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) {
+		return;
+	}
+	filter->schedule_next_time = 1+us_until_next + gf_sys_clock_high_res();
+	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)
+{
+	if (!filter) return;
+	if (!source_filter) return;
+	source_filter->on_setup_error = on_setup_error;
+	source_filter->on_setup_error_filter = filter;
+	source_filter->on_setup_error_udta = udta;
+}
+
+struct _gf_filter_setup_failure
+{
+	GF_Err e;
+	GF_Filter *filter;
+	GF_Filter *notify_filter;
+	Bool do_disconnect;
+} filter_setup_failure;
+
+static void gf_filter_setup_failure_task(GF_FSTask *task)
+{
+	s32 res;
+	GF_Err e;
+	GF_Filter *f = ((struct _gf_filter_setup_failure *)task->udta)->filter;
+	if (task->udta) {
+		e = ((struct _gf_filter_setup_failure *)task->udta)->e;
+		gf_free(task->udta);
+
+		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);
+
+	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_filter_del(f);
+}
+
+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->do_disconnect) {
+		gf_fs_post_task(st->filter->session, gf_filter_setup_failure_task, NULL, NULL, "setup_failure", st);
+	} else {
+		gf_free(st);
+	}
+}
+
+GF_EXPORT
+void gf_filter_notification_failure(GF_Filter *filter, GF_Err reason, Bool force_disconnect)
+{
+	struct _gf_filter_setup_failure *stack;
+	if (!filter->on_setup_error_filter && !force_disconnect) return;
+
+	stack = gf_malloc(sizeof(struct _gf_filter_setup_failure));
+	stack->e = reason;
+	stack->notify_filter = filter->on_setup_error_filter;
+	stack->filter = filter;
+	stack->do_disconnect = force_disconnect;
+	if (force_disconnect) {
+		filter->removed = GF_TRUE;
+	}
+	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);
+	}
+}
+
+GF_EXPORT
+void gf_filter_setup_failure(GF_Filter *filter, GF_Err reason)
+{
+
+	if (filter->in_connect_err) {
+		filter->in_connect_err = reason;
+		return;
+	}
+
+	//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;
+		while (filter->num_input_pids) {
+			GF_FilterPidInst *pidinst = gf_list_get(filter->input_pids, 0);
+			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);
+
+			//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;
+		return;
+	}
+
+	//don't accept twice a notif
+	if (filter->setup_notified) return;
+	filter->setup_notified = GF_TRUE;
+
+	gf_filter_notification_failure(filter, reason, GF_TRUE);
+}
+
+#ifndef GPAC_DISABLE_LOG
+static Bool task_postponed_log(void *udta, void *item)
+{
+	GF_FSTask *at = (GF_FSTask *)item;
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("\ttask %s\n", at->log_name));
+	return GF_FALSE;
+}
+#endif
+
+void gf_filter_remove_task(GF_FSTask *task)
+{
+	s32 res;
+	GF_Filter *f = task->filter;
+	u32 count = gf_fq_count(f->tasks);
+
+	if (f->out_pid_connection_pending || f->detach_pid_tasks_pending) {
+		task->requeue_request = GF_TRUE;
+		return;
+	}
+
+	assert(f->finalized);
+
+	if (count!=1) {
+		task->requeue_request = GF_TRUE;
+		task->can_swap = GF_TRUE;
+#ifndef GPAC_DISABLE_LOG
+		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));
+
+	//avoid destruction of the 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);
+
+	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);
+
+	//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_filter_del(f);
+	task->filter = NULL;
+	task->requeue_request = GF_FALSE;
+}
+
+void gf_filter_post_remove(GF_Filter *filter)
+{
+	assert(!filter->swap_pidinst_dst);
+	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);
+}
+
+static void gf_filter_tag_remove(GF_Filter *filter, GF_Filter *source_filter, GF_Filter *until_filter)
+{
+	u32 i, count, j, nb_inst;
+	u32 nb_rem_inst=0;
+	Bool mark_only = GF_FALSE;
+	if (filter==until_filter) return;
+
+	count = gf_list_count(filter->input_pids);
+	for (i=0; i<count; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
+		if (pidi->pid->filter==source_filter) nb_rem_inst++;
+	}
+	if (!nb_rem_inst)
+		return;
+	filter->marked_for_removal = GF_TRUE;
+	if (nb_rem_inst != count)
+		mark_only = GF_TRUE;
+	//already removed
+	if (filter->removed) return;
+	
+	//filter will be removed, propagate on all output pids
+	if (!mark_only)
+		filter->removed = GF_TRUE;
+
+	count = gf_list_count(filter->output_pids);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		pid->has_seen_eos = GF_TRUE;
+		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_fs_post_task(filter->session, gf_filter_pid_disconnect_task, pidi->filter, pid, "pidinst_disconnect", NULL);
+		}
+	}
+}
+
+void gf_filter_remove_internal(GF_Filter *filter, GF_Filter *until_filter, Bool keep_end_connections)
+{
+	u32 i, j, count;
+
+	if (!filter) return;
+
+	if (filter->removed) 
+		return;
+
+	if (filter==until_filter)
+		return;
+
+	if (until_filter) {
+		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;
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		count = pid->num_destinations;
+		for (j=0; j<count; j++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+
+			if (until_filter) {
+				gf_filter_tag_remove(pidi->filter, filter, until_filter);
+			}
+
+			if (keep_end_connections && (pidi->filter == until_filter)) {
+
+			} else {
+				gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, pidi->filter, pid, "pidinst_disconnect", NULL);
+			}
+		}
+	}
+	if (keep_end_connections) return;
+
+	//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;
+		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, i);
+		Bool can_remove = GF_TRUE;
+		//check all output pids of the filter owning this pid are connected to ourselves
+		pid = pidi->pid;
+		count = pid->num_destinations;
+		for (j=0; j<count; j++) {
+			GF_FilterPidInst *pidi_o = gf_list_get(pid->destinations, j);
+			if (pidi_o->filter != filter) {
+				can_remove = GF_FALSE;
+				break;
+			}
+		}
+		if (can_remove && !pid->filter->removed) {
+			gf_filter_remove_internal(pid->filter, NULL, GF_FALSE);
+		}
+	}
+}
+
+GF_EXPORT
+void gf_filter_remove_src(GF_Filter *filter, GF_Filter *src_filter)
+{
+	gf_filter_remove_internal(src_filter, filter, GF_FALSE);
+}
+
+GF_EXPORT
+void gf_filter_remove(GF_Filter *filter)
+{
+	u32 i;
+	if (!filter) return;
+
+	//locate source filter(s)
+	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
+		if (pidi->pid->num_destinations>1) {
+			//post disconnect
+			gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, filter, pidi->pid, "pidinst_disconnect", NULL);
+		}
+		//this is a source for the chain
+		else if (!pidi->pid->filter->num_input_pids) {
+			gf_filter_remove_internal(pidi->pid->filter, NULL, GF_FALSE);
+		}
+		//otherwise walk down the chain
+		else {
+			gf_filter_remove(pidi->pid->filter);
+		}
+	}
+}
+
+#if 0
+GF_EXPORT
+void gf_filter_remove_dst(GF_Filter *filter, GF_Filter *dst_filter)
+{
+	u32 i, j;
+	Bool removed;
+	if (!filter) return;
+	removed = filter->removed;
+	filter->removed = GF_TRUE;
+	gf_filter_remove_internal(dst_filter, filter, GF_FALSE);
+	filter->removed = removed;
+
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			if (pidi->filter->removed) {
+				gf_fs_post_task(pidi->filter->session, gf_filter_pid_disconnect_task, pidi->filter, pidi->pid, "pidinst_disconnect", NULL);
+			}
+		}
+	}
+}
+#endif
+
+Bool gf_filter_swap_source_register(GF_Filter *filter)
+{
+	u32 i;
+	char *src_url=NULL;
+	GF_Filter *target_filter=NULL;
+	GF_Err e;
+	const GF_FilterArgs *src_arg=NULL;
+
+	while (gf_list_count(filter->postponed_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_front(filter->postponed_packets);
+		gf_filter_packet_destroy(pck);
+	}
+
+	while (gf_list_count(filter->output_pids)) {
+		GF_FilterPid *pid = gf_list_pop_back(filter->output_pids);
+		pid->destroyed = GF_TRUE;
+		gf_fs_post_task(filter->session, gf_filter_pid_del_task, filter, pid, "pid_delete", NULL);
+	}
+	gf_mx_p(filter->tasks_mx);
+	filter->num_output_pids = 0;
+	gf_mx_v(filter->tasks_mx);
+
+	if (filter->freg->finalize) {
+		FSESS_CHECK_THREAD(filter)
+		filter->freg->finalize(filter);
+		filter->finalized = GF_TRUE;
+	}
+	gf_list_add(filter->blacklisted, (void *)filter->freg);
+
+	i=0;
+	while (filter->freg->args) {
+		src_arg = &filter->freg->args[i];
+		if (!src_arg || !src_arg->arg_name) {
+			src_arg=NULL;
+			break;
+		}
+		i++;
+		if (strcmp(src_arg->arg_name, "src")) continue;
+		//found it, get the url
+		if (src_arg->offset_in_private<0) continue;
+
+#ifdef WIN32
+		src_url = *(char **)( ((char *)filter->filter_udta) + src_arg->offset_in_private);
+		*(char **)(((char *)filter->filter_udta) + src_arg->offset_in_private) = NULL;
+#else
+		src_url = *(char **) (filter->filter_udta + src_arg->offset_in_private);
+		*(char **)(filter->filter_udta + src_arg->offset_in_private) = NULL;
+#endif
+		 break;
+	}
+
+	gf_free(filter->filter_udta);
+	filter->filter_udta = NULL;
+	if (!src_url) return GF_FALSE;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Swaping source filter for URL %s\n", src_url));
+
+	target_filter = filter->target_filter;
+	filter->finalized = GF_FALSE;
+	gf_fs_load_source_dest_internal(filter->session, src_url, NULL, NULL, &e, filter, filter->target_filter ? filter->target_filter : filter->dst_filter, GF_TRUE, filter->no_dst_arg_inherit, NULL);
+	//we manage to reassign an input registry
+	if (e==GF_OK) {
+		gf_free(src_url);
+		if (target_filter) filter->dst_filter = NULL;
+		return GF_TRUE;
+	}
+	if (!filter->finalized) {
+		gf_free(src_url);
+		return gf_filter_swap_source_register(filter);
+	}
+
+	for (i=0; i<gf_list_count(filter->destination_links); i++) {
+		GF_Filter *af = gf_list_get(filter->destination_links, i);
+		if (af->num_input_pids) {
+			u32 j;
+			for (j=0; j<af->num_input_pids; j++) {
+				GF_FilterPidInst *pidi = gf_list_get(af->input_pids, j);
+				pidi->is_end_of_stream = GF_TRUE;
+			}
+		}
+		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;
+		}
+	}
+	if (e==GF_NOT_SUPPORTED)
+		e = GF_FILTER_NOT_FOUND;
+	//nope ...
+	gf_filter_setup_failure(filter, e);
+	gf_free(src_url);
+	return GF_FALSE;
+}
+
+void gf_filter_forward_clock(GF_Filter *filter)
+{
+	u32 i;
+	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;
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		GF_PropertyMap *map;
+
+		//see \ref gf_filter_pid_merge_properties_internal for mutex
+		gf_mx_p(pid->filter->tasks_mx);
+		map = gf_list_last(pid->properties);
+		gf_mx_v(pid->filter->tasks_mx);
+
+		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;
+		}
+		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);
+		gf_filter_pck_set_cts(pck, clock_val);
+		gf_filter_pck_set_clock_type(pck, filter->next_clock_dispatch_type);
+
+		//do not let the clock packet carry the props/info change flags since it is an internal
+		//packet discarded before processing these flags
+		req_props_map = pid->request_property_map;
+		pid->request_property_map = GF_TRUE;
+		info_modified = pid->pid_info_changed;
+		pid->pid_info_changed = GF_FALSE;
+
+		gf_filter_pck_send(pck);
+		pid->request_property_map = req_props_map;
+		pid->pid_info_changed = info_modified;
+	}
+	filter->next_clock_dispatch_type = 0;
+}
+
+GF_EXPORT
+Bool gf_filter_is_supported_source(GF_Filter *filter, const char *url, const char *parent_url)
+{
+	GF_Err e;
+	Bool is_supported = GF_FALSE;
+	gf_fs_load_source_dest_internal(filter->session, url, NULL, parent_url, &e, NULL, filter, GF_TRUE, GF_TRUE, &is_supported);
+	return is_supported;
+}
+
+GF_EXPORT
+GF_Filter *gf_filter_connect_source(GF_Filter *filter, const char *url, const char *parent_url, GF_Err *err)
+{
+	GF_Filter *filter_src = gf_fs_load_source_dest_internal(filter->session, url, NULL, parent_url, err, NULL, filter, GF_TRUE, GF_TRUE, NULL);
+	if (!filter_src) return NULL;
+
+	if (!filter->source_filters)
+		filter->source_filters = gf_list_new();
+	gf_list_add(filter->source_filters, filter_src);
+	return filter_src;
+}
+
+GF_EXPORT
+GF_Filter *gf_filter_connect_destination(GF_Filter *filter, const char *url, GF_Err *err)
+{
+	return gf_fs_load_source_dest_internal(filter->session, url, NULL, NULL, err, NULL, filter, GF_FALSE, GF_FALSE, NULL);
+}
+
+
+GF_EXPORT
+void gf_filter_get_output_buffer_max(GF_Filter *filter, u32 *max_buf, u32 *max_playout_buf)
+{
+	u32 i;
+	u32 buf_max = 0;
+	u32 buf_play_max = 0;
+	for (i=0; i<filter->num_output_pids; i++) {
+		u32 j;
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		if (buf_max < pid->user_max_buffer_time) buf_max = (u32) pid->user_max_buffer_time;
+		if (buf_max < pid->max_buffer_time) buf_max = (u32) pid->max_buffer_time;
+
+		if (buf_play_max < pid->user_max_playout_time) buf_play_max = pid->user_max_playout_time;
+		if (buf_play_max < pid->max_buffer_time) buf_play_max = (u32) pid->max_buffer_time;
+
+		for (j=0; j<pid->num_destinations; j++) {
+			u32 mb, pb;
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			gf_filter_get_output_buffer_max(pidi->filter, &mb, &pb);
+			if (buf_max < mb) buf_max = mb;
+			if (buf_play_max < pb) buf_play_max = pb;
+		}
+	}
+	if (max_buf) *max_buf = buf_max;
+	if (max_playout_buf) *max_playout_buf = buf_play_max;
+	return;
+}
+
+GF_EXPORT
+void gf_filter_make_sticky(GF_Filter *filter)
+{
+	if (filter) filter->sticky = 1;
+}
+
+static u32 gf_filter_get_num_events_queued_internal(GF_Filter *filter)
+{
+	u32 i;
+	u32 nb_events = 0;
+	if (!filter) return 0;
+	nb_events = filter->num_events_queued;
+
+	for (i=0; i<filter->num_output_pids; i++) {
+		u32 k;
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		for (k=0; k<pid->num_destinations; k++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, k);
+			nb_events += gf_filter_get_num_events_queued(pidi->filter);
+		}
+	}
+	return nb_events;
+}
+GF_EXPORT
+u32 gf_filter_get_num_events_queued(GF_Filter *filter)
+{
+	u32 res;
+	GF_FilterSession *fsess;
+	if (!filter) return 0;
+	fsess = filter->session;
+
+	if (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);
+
+	return res;
+}
+
+GF_EXPORT
+void gf_filter_hint_single_clock(GF_Filter *filter, u64 time_in_us, GF_Fraction64 media_timestamp)
+{
+	//for now only one clock hint possible ...
+	filter->session->hint_clock_us = time_in_us;
+	filter->session->hint_timestamp = media_timestamp;
+}
+
+GF_EXPORT
+void gf_filter_get_clock_hint(GF_Filter *filter, u64 *time_in_us, GF_Fraction64 *media_timestamp)
+{
+	//for now only one clock hint possible ...
+	if (time_in_us) *time_in_us = filter->session->hint_clock_us;
+	if (media_timestamp) *media_timestamp = filter->session->hint_timestamp;
+}
+
+GF_EXPORT
+GF_Err gf_filter_assign_id(GF_Filter *filter, const char *id)
+{
+	if (!filter || filter->id) return GF_BAD_PARAM;
+
+	if (!id) {
+		char szID[1024];
+		sprintf(szID, "_%p_", filter);
+		filter->id = gf_strdup(szID);
+	} else {
+		filter->id = gf_strdup(id);
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+const char *gf_filter_get_id(GF_Filter *filter)
+{
+	if (filter) return filter->id;
+	return NULL;
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_source(GF_Filter *filter, GF_Filter *link_from, const char *link_ext)
+{
+	if (!filter || !link_from) return GF_BAD_PARAM;
+	if (filter == link_from) return GF_OK;
+	//don't allow loops
+	if (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);
+	} else {
+		gf_filter_set_sources(filter, 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;
+	}
+	filter->forced_caps = nb_caps ? caps : NULL;
+	filter->nb_forced_caps = nb_caps;
+	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;
+	const GF_PropertyValue *p;
+	Bool was_end = GF_FALSE;
+	memset(evt, 0, sizeof(GF_FilterEvent));
+	evt->base.type = GF_FEVT_PLAY;
+	evt->base.on_pid = pid;
+
+	evt->play.speed = 1.0;
+
+	if ((speed<0) && !start) start = -1.0;
+
+	p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_PLAYBACK_MODE);
+	if (p) pmode = p->value.uint;
+
+	evt->play.start_range = start;
+	if (start<0) {
+		was_end = GF_TRUE;
+		p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_DURATION);
+		if (p && p->value.lfrac.den) {
+			evt->play.start_range *= -100;
+			evt->play.start_range *= p->value.lfrac.num;
+			evt->play.start_range /= 100 * p->value.lfrac.den;
+		}
+	}
+	switch (pmode) {
+	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));
+		}
+		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));
+		}
+		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));
+			if (was_end) evt->play.start_range = 0;
+		} else {
+			evt->play.speed = speed;
+		}
+		break;
+	default:
+		evt->play.speed = speed;
+		break;
+	}
+}
+
+void gf_filter_set_max_extra_input_pids(GF_Filter *filter, u32 max_extra_pids)
+{
+	if (filter) filter->max_extra_pids = max_extra_pids;
+}
+GF_EXPORT
+u32 gf_filter_get_max_extra_input_pids(GF_Filter *filter)
+{
+	if (filter) return filter->max_extra_pids;
+	return 0;
+}
+
+Bool gf_filter_block_enabled(GF_Filter *filter)
+{
+	if (!filter) return GF_FALSE;
+	return (filter->session->blocking_mode==GF_FS_NOBLOCK) ? GF_FALSE : GF_TRUE;
+}
+
+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)
+{
+	char tmp_ext[50];
+	u32 ext_len=0;
+	Bool ext_not_trusted, is_new_pid = GF_FALSE;
+	GF_FilterPid *pid = *out_pid;
+	if (!pid) {
+		pid = gf_filter_pid_new(filter);
+		if (!pid) {
+			return GF_OUT_OF_MEM;
+		}
+		pid->max_buffer_unit = 1;
+		is_new_pid = GF_TRUE;
+		*out_pid = pid;
+	}
+
+	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));
+
+
+	if (url) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(url));
+
+		if (!strnicmp(url, "isobmff://", 10)) {
+			gf_filter_pid_set_name(pid, "isobmff://");
+			fext = "mp4";
+			mime_type = "video/mp4";
+			if (is_new_pid)
+				gf_filter_pid_set_eos(pid);
+		} else {
+			char *sep = gf_file_basename(url);
+
+			gf_filter_pid_set_name(pid, sep);
+		}
+
+		if (fext) {
+			strncpy(tmp_ext, fext, 20);
+			tmp_ext[20] = 0;
+			strlwr(tmp_ext);
+			gf_filter_pid_set_property(pid, GF_PROP_PID_FILE_EXT, &PROP_STRING(tmp_ext));
+			ext_len = (u32) strlen(tmp_ext);
+		} else {
+			char *ext = gf_file_ext_start(url);
+			if (ext) ext++;
+
+			if (ext) {
+				char *s = strchr(ext, '#');
+				if (s) s[0] = 0;
+
+				strncpy(tmp_ext, ext, 20);
+				tmp_ext[20] = 0;
+				strlwr(tmp_ext);
+				gf_filter_pid_set_property(pid, GF_PROP_PID_FILE_EXT, &PROP_STRING(tmp_ext));
+				ext_len = (u32) strlen(tmp_ext);
+				if (s) s[0] = '#';
+			}
+		}
+	}
+	
+	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)) {
+		u32 i, count;
+		GF_FilterProbeScore score, max_score = GF_FPROBE_NOT_SUPPORTED;
+		const char *probe_mime = NULL;
+		gf_mx_p(filter->session->filters_mx);
+		count = gf_list_count(filter->session->registry);
+		for (i=0; i<count; i++) {
+			const char *a_mime;
+			const GF_FilterRegister *freg = gf_list_get(filter->session->registry, i);
+			if (!freg || !freg->probe_data) continue;
+			score = GF_FPROBE_NOT_SUPPORTED;
+			a_mime = freg->probe_data(probe_data, probe_size, &score);
+			if (score==GF_FPROBE_NOT_SUPPORTED) {
+				u32 k;
+				for (k=0;k<freg->nb_caps && !ext_not_trusted && ext_len; k++) {
+					const char *value;
+					const GF_FilterCapability *cap = &freg->caps[k];
+					if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) continue;
+					if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
+					if (cap->code != GF_PROP_PID_FILE_EXT) continue;
+					value = cap->val.value.string;
+					while (value && ext_len) {
+						const char *match = strstr(value, tmp_ext);
+						if (!match) break;
+						if (!match[ext_len] || (match[ext_len]=='|')) {
+							ext_not_trusted = GF_TRUE;
+							break;
+						}
+						value = match+ext_len;
+					}
+				}
+			} else if (score==GF_FPROBE_EXT_MATCH) {
+				if (a_mime && ext_len && strstr(a_mime, tmp_ext)) {
+					ext_not_trusted = GF_FALSE;
+					probe_mime = NULL;
+					break;
+				}
+			} 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));
+				}
+				if (a_mime && (score > max_score)) {
+					probe_mime = a_mime;
+					max_score = score;
+				}
+			}
+		}
+		gf_mx_v(filter->session->filters_mx);
+
+		pid->ext_not_trusted = ext_not_trusted;
+
+		if (probe_mime) {
+			mime_type = probe_mime;
+		}
+	}
+	//we ignore mime type on pid reconfigure - some server will overwrite valid type to application/octet-string or binary/octet-string
+	//on a byte-range request or secondary fetch
+	//this is safe for now as the only reconfig we do is in HTTP streaming context
+	//we furthermore blacklist *octet-* mimes
+	if (mime_type && is_new_pid && !strstr(mime_type, "/octet-")) {
+		strncpy(tmp_ext, mime_type, 50);
+		tmp_ext[49] = 0;
+		strlwr(tmp_ext);
+		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;
+	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+const char *gf_filter_probe_data(GF_Filter *filter, u8 *data, u32 size)
+{
+	u32 i, count;
+	GF_FilterProbeScore score, max_score = GF_FPROBE_NOT_SUPPORTED;
+	const char *probe_mime = NULL;
+	if (!size) return NULL;
+	gf_mx_p(filter->session->filters_mx);
+	count = gf_list_count(filter->session->registry);
+	for (i=0; i<count; i++) {
+		const char *a_mime;
+		const GF_FilterRegister *freg = gf_list_get(filter->session->registry, i);
+		if (!freg || !freg->probe_data) continue;
+		score = GF_FPROBE_NOT_SUPPORTED;
+		a_mime = freg->probe_data(data, size, &score);
+		if (score==GF_FPROBE_NOT_SUPPORTED) {
+		} else if (score==GF_FPROBE_EXT_MATCH) {
+			probe_mime = NULL;
+		} else {
+			if (a_mime && (score > max_score)) {
+				probe_mime = a_mime;
+				max_score = score;
+			}
+		}
+	}
+	gf_mx_v(filter->session->filters_mx);
+	return probe_mime;
+}
+
+static Bool gf_filter_get_arg_internal(GF_Filter *filter, const char *arg_name, GF_PropertyValue *prop, const char **min_max_enum)
+{
+	u32 i=0;
+	if (!filter || !arg_name) return GF_FALSE;
+
+	while (1) {
+		GF_PropertyValue p;
+		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;
+
+		p.type = arg->arg_type;
+		switch (arg->arg_type) {
+		case GF_PROP_BOOL:
+			p.value.boolean = * (Bool *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_UINT:
+			p.value.uint = * (u32 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_SINT:
+			p.value.sint = * (s32 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_LUINT:
+			p.value.longuint = * (u64 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_LSINT:
+			p.value.longsint = * (s64 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_FLOAT:
+			p.value.fnumber = * (Fixed *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_DOUBLE:
+			p.value.number = * (Double *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_VEC2I:
+			p.value.vec2i = * (GF_PropVec2i *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_VEC2:
+			p.value.vec2 = * (GF_PropVec2 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		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;
+		case GF_PROP_FRACTION64:
+			p.value.lfrac = * (GF_Fraction64 *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_DATA:
+		case GF_PROP_DATA_NO_COPY:
+		case GF_PROP_CONST_DATA:
+			p.value.data = * (GF_PropData *) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_POINTER:
+			p.value.ptr = * (void **) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		case GF_PROP_STRING_NO_COPY:
+		case GF_PROP_STRING:
+		case GF_PROP_NAME:
+			p.value.ptr = * (char **) ((char *)filter->filter_udta + arg->offset_in_private);
+			break;
+		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:
+			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:
+			return GF_FALSE;
+		}
+		if (min_max_enum) *min_max_enum = arg->min_max_enum;
+		*prop = p;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+const char *gf_filter_get_arg_str(GF_Filter *filter, const char *arg_name, char dump[GF_PROP_DUMP_ARG_SIZE])
+{
+	GF_PropertyValue p;
+	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);
+}
+
+GF_EXPORT
+Bool gf_filter_get_arg(GF_Filter *filter, const char *arg_name, GF_PropertyValue *prop)
+{
+	const char *arg_min_max = NULL;
+	if (!prop) return GF_FALSE;
+	return gf_filter_get_arg_internal(filter, arg_name, prop, &arg_min_max);
+}
+
+GF_EXPORT
+Bool gf_filter_is_supported_mime(GF_Filter *filter, const char *mime)
+{
+	return gf_fs_mime_supported(filter->session, mime);
+}
+
+GF_EXPORT
+Bool gf_filter_ui_event(GF_Filter *filter, GF_Event *uievt)
+{
+	return gf_fs_ui_event(filter->session, uievt);
+}
+
+GF_EXPORT
+Bool gf_filter_all_sinks_done(GF_Filter *filter)
+{
+	u32 i, count;
+	Bool res = GF_TRUE;
+	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;
+		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;
+				goto exit;
+			}
+		}
+	}
+exit:
+	gf_mx_v(filter->session->filters_mx);
+	return res;
+}
+
+
+GF_EXPORT
+void gf_filter_register_opengl_provider(GF_Filter *filter, Bool do_register)
+{
+#ifndef GPAC_DISABLE_3D
+	GF_Err e;
+	if (filter->removed || filter->finalized) return;
+
+	if (do_register) {
+		if (gf_list_find(filter->session->gl_providers, filter)<0)
+			gf_list_add(filter->session->gl_providers, filter);
+		return;
+	}
+	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);
+	}
+#endif
+
+}
+
+GF_EXPORT
+GF_Err gf_filter_request_opengl(GF_Filter *filter)
+{
+#ifndef GPAC_DISABLE_3D
+	GF_Err e;
+	if (filter->finalized || filter->removed) return GF_OK;
+
+	filter->session->nb_gl_filters++;
+	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;
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_EXPORT
+GF_Err gf_filter_set_active_opengl_context(GF_Filter *filter)
+{
+#ifndef GPAC_DISABLE_3D
+	if (filter->finalized || filter->removed) return GF_OK;
+	return gf_fs_set_gl(filter->session);
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+
+GF_EXPORT
+u32 gf_filter_count_source_by_protocol(GF_Filter *filter, const char *protocol_scheme, Bool expand_proto, GF_FilterPid * (*enum_pids)(void *udta, u32 *idx), void *udta)
+{
+	u32 i, count, len, res=0;
+	if (!filter || !protocol_scheme) return 0;
+	gf_mx_p(filter->session->filters_mx);
+	len = (u32) strlen(protocol_scheme);
+	count = gf_list_count(filter->session->filters);
+	for (i=0; i<count; i++) {
+		const char *args;
+		GF_Filter *src = gf_list_get(filter->session->filters, i);
+		//check only sinks
+		if (src->freg->configure_pid) continue;
+		args = src->src_args;
+		if (!args) args = src->orig_args;
+		if (!args || (strlen(args)<5) ) continue;
+
+		if (strncmp(args + 4, protocol_scheme, len)) continue;
+		if (!expand_proto && (args[len] != ':')) continue;
+
+		if (! filter_in_parent_chain(filter, src)) {
+			u32 j=0;
+			Bool found=GF_FALSE;
+			if (!enum_pids) continue;
+			while (1) {
+				GF_FilterPid *pid = enum_pids(udta, &j);
+				if (!pid) break;
+				j++;
+				if ( filter_in_parent_chain(pid->pid->filter, src)) {
+					found=GF_TRUE;
+					break;
+				}
+			}
+			if (!found) continue;
+		}
+
+		res++;
+	}
+
+	gf_mx_v(filter->session->filters_mx);
+	return res;
+}
+
+GF_EXPORT
+void gf_filter_disable_probe(GF_Filter *filter)
+{
+	if (filter)
+	 	filter->no_probe = GF_TRUE;
+}
+
+GF_EXPORT
+void gf_filter_disable_inputs(GF_Filter *filter)
+{
+	if (filter)
+	 	filter->no_inputs = GF_TRUE;
+}
+
+static Bool gf_filter_has_pid_connection_pending_internal(GF_Filter *filter, GF_Filter *stop_at_filter)
+{
+	u32 i, j;
+	if (filter == stop_at_filter) return GF_FALSE;
+
+	if (filter->has_pending_pids) return GF_TRUE;
+
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		if (pid->init_task_pending) return GF_TRUE;
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			Bool res = gf_filter_has_pid_connection_pending_internal(pidi->filter, stop_at_filter);
+			if (res) return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+Bool gf_filter_has_pid_connection_pending(GF_Filter *filter, GF_Filter *stop_at_filter)
+{
+	GF_FilterSession *fsess;
+	Bool res;
+	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);
+	res = gf_filter_has_pid_connection_pending_internal(filter, stop_at_filter);
+	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	return res;
+}
+
+GF_EXPORT
+Bool gf_filter_reporting_enabled(GF_Filter *filter)
+{
+	if (filter) return filter->session->reporting_on;
+	return GF_FALSE;
+}
+
+GF_EXPORT
+GF_Err gf_filter_update_status(GF_Filter *filter, u32 percent, char *szStatus)
+{
+	GF_Event evt;
+	u32 len;
+	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;
+	}
+	len = (u32) strlen(szStatus);
+	if (len>=filter->status_str_alloc) {
+		filter->status_str_alloc = len+1;
+		filter->status_str = gf_realloc(filter->status_str, filter->status_str_alloc);
+		if (!filter->status_str) {
+			filter->status_str_alloc = 0;
+			return GF_OUT_OF_MEM;
+		}
+	}
+	memcpy(filter->status_str, szStatus, len+1);
+	filter->status_percent = percent;
+	filter->report_updated = GF_TRUE;
+
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_PROGRESS;
+	evt.progress.progress_type = 3;
+	evt.progress.done = percent;
+	evt.progress.total = ((s32)percent>0) ? 10000 : 0;
+	evt.progress.filter_idx = gf_list_find(filter->session->filters, filter);
+	gf_fs_ui_event(filter->session, &evt);
+	return GF_OK;
+}
+
+void gf_filter_report_unused_meta_option(GF_Filter *filter, const char *arg)
+{
+	if (!filter->session || filter->removed || filter->finalized) return;
+	if (filter->orig_args) {
+		char *opt_arg = strstr(filter->orig_args, "gfopt");
+		if (opt_arg) {
+			char *arg_pos = strstr(filter->orig_args, arg);
+			if (arg_pos && (arg_pos>opt_arg))
+				return;
+		}
+	}
+	gf_mx_p(filter->session->filters_mx);
+	gf_fs_push_arg(filter->session, arg, GF_FALSE, 2);
+	gf_mx_v(filter->session->filters_mx);
+}
+
+GF_Err gf_filter_set_description(GF_Filter *filter, const char *new_desc)
+{
+	if (!filter) return GF_BAD_PARAM;
+	if (filter->instance_description)
+		gf_free(filter->instance_description);
+
+	filter->instance_description = new_desc ? gf_strdup(new_desc) : NULL;
+	return GF_OK;
+}
+GF_EXPORT
+const char *gf_filter_get_description(GF_Filter *filter)
+{
+	return filter ? filter->instance_description : NULL;
+}
+
+GF_Err gf_filter_set_version(GF_Filter *filter, const char *new_desc)
+{
+	if (!filter) return GF_BAD_PARAM;
+	if (filter->instance_version)
+		gf_free(filter->instance_version);
+
+	filter->instance_version = new_desc ? gf_strdup(new_desc) : NULL;
+	return GF_OK;
+}
+GF_EXPORT
+const char *gf_filter_get_version(GF_Filter *filter)
+{
+	return filter ? filter->instance_version : NULL;
+}
+
+GF_Err gf_filter_set_author(GF_Filter *filter, const char *new_desc)
+{
+	if (!filter) return GF_BAD_PARAM;
+	if (filter->instance_author)
+		gf_free(filter->instance_author);
+
+	filter->instance_author = new_desc ? gf_strdup(new_desc) : NULL;
+	return GF_OK;
+}
+GF_EXPORT
+const char *gf_filter_get_author(GF_Filter *filter)
+{
+	return filter ? filter->instance_author : NULL;
+}
+
+GF_Err gf_filter_set_help(GF_Filter *filter, const char *new_desc)
+{
+	if (!filter) return GF_BAD_PARAM;
+	if (filter->instance_help)
+		gf_free(filter->instance_help);
+
+	filter->instance_help = new_desc ? gf_strdup(new_desc) : NULL;
+	return GF_OK;
+}
+GF_EXPORT
+const char *gf_filter_get_help(GF_Filter *filter)
+{
+	return filter ? filter->instance_help : NULL;
+}
+
+GF_Err gf_filter_define_args(GF_Filter *filter, GF_FilterArgs *args)
+{
+	if (!filter) return GF_BAD_PARAM;
+	filter->instance_args = args;
+	return GF_OK;
+}
+GF_EXPORT
+GF_FilterArgs *gf_filter_get_args(GF_Filter *filter)
+{
+	return filter ? filter->instance_args : NULL;
+}
+
+GF_EXPORT
+GF_Filter *gf_filter_load_filter(GF_Filter *filter, const char *name, GF_Err *err_code)
+{
+	if (!filter) return NULL;
+	return gf_fs_load_filter(filter->session, name, err_code);
+}
+
+GF_EXPORT
+Bool gf_filter_end_of_session(GF_Filter *filter)
+{
+	if (!filter) return GF_TRUE;
+	return filter->session->in_final_flush;
+}
+
+GF_EXPORT
+Bool gf_filter_is_alias(GF_Filter *filter)
+{
+	if (filter && filter->multi_sink_target) return GF_TRUE;
+	return GF_FALSE;
+}
+
+/*! checks if the some PID connection tasks are still pending at the session level
+\param filter target filter
+\return GF_TRUE if some connection tasks are pending, GF_FALSE otherwise
+*/
+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;
+	gf_mx_p(filter->session->filters_mx);
+	count = gf_list_count(filter->session->filters);
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(filter->session->filters, i);
+		if (f==filter) continue;
+
+		gf_mx_p(filter->tasks_mx);
+		if (f->num_input_pids && ! f->num_output_pids) {
+			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);
+		if (res)
+			break;
+	}
+	gf_mx_v(filter->session->filters_mx);
+
+	return res;
+}
+
+GF_EXPORT
+GF_Err gf_filter_prevent_blocking(GF_Filter *filter, Bool prevent_blocking_enabled)
+{
+	if (!filter) return GF_BAD_PARAM;
+	filter->prevent_blocking = prevent_blocking_enabled;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_filter_is_dynamic(GF_Filter *filter)
+{
+	return filter ? filter->dynamic_filter : GF_FALSE;
+}
+
+GF_EXPORT
+void gf_filter_block_eos(GF_Filter *filter, Bool do_block)
+{
+	if (filter) filter->block_eos = do_block;
+}
+
+GF_EXPORT
+GF_Err gf_filter_reconnect_output(GF_Filter *filter)
+{
+	u32 i;
+	if (!filter) return GF_BAD_PARAM;
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		gf_filter_pid_post_init_task(filter, pid);
+	}
+	return GF_OK;
+}

gpac-1.0.0.tar.gz/src/filter_core/filter_pck.c Added

@@ -0,0 +1,1658 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+
+static void gf_filter_pck_reset_props(GF_FilterPacket *pck, GF_FilterPid *pid)
+{
+	memset(&pck->info, 0, sizeof(GF_FilterPckInfo));
+	pck->info.dts = pck->info.cts = GF_FILTER_NO_TS;
+	pck->info.byte_offset =  GF_FILTER_NO_BO;
+	pck->info.flags = GF_PCKF_BLOCK_START | GF_PCKF_BLOCK_END;
+	pck->pid = pid;
+	pck->src_filter = pid->filter;
+	pck->session = pid->filter->session;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_merge_properties_filter(GF_FilterPacket *pck_src, GF_FilterPacket *pck_dst, gf_filter_prop_filter filter_prop, void *cbk)
+{
+	if (PCK_IS_INPUT(pck_dst)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set property on an input packet in filter %s\n", pck_dst->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	//we allow copying over properties from dest packets to dest packets
+	//get true packet pointer
+	pck_src=pck_src->pck;
+	pck_dst=pck_dst->pck;
+
+	pck_dst->info = pck_src->info;
+	pck_dst->info.flags &= ~GF_PCKF_PROPS_REFERENCE;
+
+	if (!pck_src->props) {
+		return GF_OK;
+	}
+	if (!pck_dst->props) {
+		pck_dst->props = gf_props_new(pck_dst->pid->filter);
+
+		if (!pck_dst->props) return GF_OUT_OF_MEM;
+	}
+	return gf_props_merge_property(pck_dst->props, pck_src->props, filter_prop, cbk);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_merge_properties(GF_FilterPacket *pck_src, GF_FilterPacket *pck_dst)
+{
+	return gf_filter_pck_merge_properties_filter(pck_src, pck_dst, NULL, NULL);
+}
+
+typedef struct
+{
+	u32 data_size;
+	GF_FilterPacket *pck;
+	GF_FilterPacket *closest;
+} GF_PckQueueEnum;
+
+static Bool pck_queue_enum(void *udta, void *item)
+{
+	GF_PckQueueEnum *enum_state = (GF_PckQueueEnum *) udta;
+	GF_FilterPacket *cur = (GF_FilterPacket *) item;
+
+	if (cur->alloc_size >= enum_state->data_size) {
+		if (!enum_state->pck || (enum_state->pck->alloc_size > cur->alloc_size)) {
+			enum_state->pck = cur;
+		}
+	}
+	else if (!enum_state->closest) enum_state->closest = cur;
+	//small data blocks, find smaller one
+	else if (enum_state->data_size<1000) {
+		if (enum_state->closest->alloc_size > cur->alloc_size) enum_state->closest = cur;
+	}
+	//otherwise find largest one below our target size
+	else if (enum_state->closest->alloc_size < cur->alloc_size) enum_state->closest = cur;
+	return GF_FALSE;
+}
+
+static GF_FilterPacket *gf_filter_pck_new_alloc_internal(GF_FilterPid *pid, u32 data_size, u8 **data, Bool no_block_check)
+{
+	GF_FilterPacket *pck=NULL;
+	GF_FilterPacket *closest=NULL;
+	u32 count, max_reservoir_size;
+
+	if (PID_IS_INPUT(pid)) {
+		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) {
+		GF_PckQueueEnum pck_enum_state;
+		memset(&pck_enum_state, 0, sizeof(GF_PckQueueEnum));
+		pck_enum_state.data_size = data_size;
+		gf_fq_enum(pid->filter->pcks_alloc_reservoir, pck_queue_enum, &pck_enum_state);
+		pck = pck_enum_state.pck;
+		closest = pck_enum_state.closest;
+	}
+
+	//stop allocating after a while - TODO we for sur can design a better algo...
+	max_reservoir_size = pid->num_destinations ? 10 : 1;
+	//if pid is file, force 1 max
+	if (!pck && (pid->stream_type==GF_STREAM_FILE))
+		max_reservoir_size = 1;
+
+	if (!pck && (count>=max_reservoir_size)) {
+		assert(closest);
+		closest->alloc_size = data_size;
+		closest->data = gf_realloc(closest->data, closest->alloc_size);
+		pck = closest;
+#ifdef GPAC_MEMORY_TRACKING
+		pid->filter->session->nb_realloc_pck++;
+#endif
+	}
+
+	if (!pck) {
+		GF_SAFEALLOC(pck, GF_FilterPacket);
+		if (!pck)
+			return NULL;
+		pck->data = gf_malloc(sizeof(char)*data_size);
+		pck->alloc_size = data_size;
+#ifdef GPAC_MEMORY_TRACKING
+		pid->filter->session->nb_alloc_pck+=2;
+#endif
+	} else {
+		//pop first item and swap pointers. We can safely do this since this filter
+		//is the only one accessing the queue in pop mode, all others are just pushing to it
+		//this may however imply that we don't get the best matching block size if new packets
+		//were added to the list
+
+		GF_FilterPacket *head_pck = gf_fq_pop(pid->filter->pcks_alloc_reservoir);
+		char *pck_data = pck->data;
+		u32 alloc_size = pck->alloc_size;
+		pck->data = head_pck->data;
+		pck->alloc_size = head_pck->alloc_size;
+		head_pck->data = pck_data;
+		head_pck->alloc_size = alloc_size;
+		pck = head_pck;
+	}
+
+	pck->pck = pck;
+	pck->data_length = data_size;
+	if (data) *data = pck->data;
+	pck->filter_owns_mem = 0;
+
+	gf_filter_pck_reset_props(pck, pid);
+	return pck;
+}
+
+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);
+}
+
+static GF_FilterPacket *clone_frame_interface(GF_FilterPid *pid, GF_FilterPacket *pck_source, u8 **data)
+{
+	u32 i, w, h, stride, stride_uv, pf, osize;
+	u32 nb_planes, uv_height;
+	GF_FilterPacket *dst, *ref;
+	GF_FilterPacketInstance *pcki = (GF_FilterPacketInstance *) pck_source;
+	const GF_PropertyValue *p;
+
+	ref = pcki->pck;
+
+	p = gf_filter_pid_get_property(ref->pid , GF_PROP_PID_WIDTH);
+	w = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(ref->pid, GF_PROP_PID_HEIGHT);
+	h = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(ref->pid, GF_PROP_PID_PIXFMT);
+	pf = p ? p->value.uint : 0;
+	//not supported
+	if (!w || !h || !pf) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing width/height/pf in frame interface cloning, not supported\n"));
+		return NULL;
+	}
+	stride = stride_uv = 0;
+
+	if (gf_pixel_get_size_info(pf, w, h, &osize, &stride, &stride_uv, &nb_planes, &uv_height) == GF_FALSE) {
+		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));
+	}
+
+	dst = gf_filter_pck_new_alloc(pid, osize, data);
+	if (!dst) return NULL;
+	
+	u8 *out_ptr = *data;
+	for (i=0; i<nb_planes; i++) {
+		u32 j, write_h, dst_stride;
+		const u8 *in_ptr;
+		u32 src_stride = i ? stride_uv : stride;
+		GF_Err e = ref->frame_ifce->get_plane(ref->frame_ifce, i, &in_ptr, &src_stride);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to fetch plane data from hardware frame, cannot clone\n"));
+			break;
+		}
+		if (i) {
+			write_h = uv_height;
+			dst_stride = stride_uv;
+		} else {
+			write_h = h;
+			dst_stride = stride;
+		}
+		for (j=0; j<write_h; j++) {
+			memcpy(out_ptr, in_ptr, dst_stride);
+			in_ptr += src_stride;
+			out_ptr += 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)
+{
+	GF_FilterPacket *dst, *ref;
+	u32 max_ref = 0;
+	GF_FilterPacketInstance *pcki;
+	if (!pck_source) return NULL;
+
+	pcki = (GF_FilterPacketInstance *) pck_source;
+	if (pcki->pck->frame_ifce)
+		return clone_frame_interface(pid, pck_source, data);
+
+	if (force_copy) {
+		max_ref = 2;
+	} else {
+		ref = pcki->pck;
+		while (ref) {
+			if (ref->filter_owns_mem==2) {
+				max_ref = 2;
+				break;
+			}
+			if (ref->reference_count>max_ref)
+				max_ref = ref->reference_count;
+			ref = ref->reference;
+		}
+	}
+	
+	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);
+		}
+		if (dst) gf_filter_pck_merge_properties(pck_source, dst);
+		return dst;
+	}
+	dst = gf_filter_pck_new_ref(pid, NULL, 0, pck_source);
+	if (dst) {
+		gf_filter_pck_merge_properties(pck_source, dst);
+		*data = dst->data;
+	}
+	return dst;
+}
+
+
+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);
+}
+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);
+}
+
+
+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;
+	return pck;
+}
+
+GF_EXPORT
+GF_FilterPacket *gf_filter_pck_new_shared_internal(GF_FilterPid *pid, const u8 *data, u32 data_size, gf_fsess_packet_destructor destruct, Bool intern_pck)
+{
+	GF_FilterPacket *pck;
+
+	if (PID_IS_INPUT(pid)) {
+		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;
+	}
+
+	pck = gf_fq_pop(pid->filter->pcks_shared_reservoir);
+	if (!pck) {
+		GF_SAFEALLOC(pck, GF_FilterPacket);
+		if (!pck)
+			return NULL;
+	}
+	pck->pck = pck;
+	pck->data = (char *) data;
+	pck->data_length = data_size;
+	pck->destructor = destruct;
+	pck->filter_owns_mem = 1;
+	if (!intern_pck) {
+		safe_int_inc(&pid->nb_shared_packets_out);
+		safe_int_inc(&pid->filter->nb_shared_packets_out);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s has %d shared packets out\n", pid->filter->name, pid->name, pid->nb_shared_packets_out));
+	}
+	gf_filter_pck_reset_props(pck, pid);
+
+	assert(pck->pid);
+	return pck;
+}
+
+GF_EXPORT
+GF_FilterPacket *gf_filter_pck_new_shared(GF_FilterPid *pid, const u8 *data, u32 data_size, gf_fsess_packet_destructor destruct)
+{
+	return gf_filter_pck_new_shared_internal(pid, data, data_size, destruct, GF_FALSE);
+
+}
+
+GF_EXPORT
+GF_FilterPacket *gf_filter_pck_new_ref(GF_FilterPid *pid, const u8 *data, 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 (!pck) return NULL;
+	pck->reference = reference;
+	assert(reference->reference_count);
+	safe_int_inc(&reference->reference_count);
+	if (!data && !data_size) {
+		pck->data = reference->data;
+		pck->data_length = reference->data_length;
+		pck->frame_ifce = reference->frame_ifce;
+	}
+	safe_int_inc(&reference->pid->nb_shared_packets_out);
+	safe_int_inc(&reference->pid->filter->nb_shared_packets_out);
+	return pck;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_readonly(GF_FilterPacket *pck)
+{
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set readonly on an input packet in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	pck->filter_owns_mem = 2;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_FilterPacket *gf_filter_pck_new_frame_interface(GF_FilterPid *pid, GF_FilterFrameInterface *frame_ifce, gf_fsess_packet_destructor destruct)
+{
+	GF_FilterPacket *pck;
+	if (!frame_ifce) return NULL;
+	pck = gf_filter_pck_new_shared(pid, NULL, 0, NULL);
+	if (!pck) return NULL;
+	pck->destructor = destruct;
+	pck->frame_ifce = frame_ifce;
+	pck->filter_owns_mem = 2;
+	return pck;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_forward(GF_FilterPacket *reference, GF_FilterPid *pid)
+{
+	GF_FilterPacket *pck;
+	if (!reference) return GF_OUT_OF_MEM;
+	reference=reference->pck;
+	pck = gf_filter_pck_new_shared(pid, NULL, 0, NULL);
+	if (!pck) return GF_OUT_OF_MEM;
+	pck->reference = reference;
+	assert(reference->reference_count);
+	safe_int_inc(&reference->reference_count);
+	safe_int_inc(&reference->pid->nb_shared_packets_out);
+	safe_int_inc(&reference->pid->filter->nb_shared_packets_out);
+
+	gf_filter_pck_merge_properties(reference, pck);
+	pck->data = reference->data;
+	pck->data_length = reference->data_length;
+	pck->frame_ifce = reference->frame_ifce;
+
+	return gf_filter_pck_send(pck);
+}
+
+/*internal*/
+void gf_filter_packet_destroy(GF_FilterPacket *pck)
+{
+	Bool is_filter_destroyed = GF_FALSE;
+	GF_FilterPid *pid = pck->pid;
+	Bool is_ref_props_packet = GF_FALSE;
+
+	//this is a ref props packet, its destruction can happen at any time, included after destruction
+	//of source filter/pid.  pck->src_filter or pck->pid shall not be trusted !
+	if (pck->info.flags & GF_PCKF_PROPS_REFERENCE) {
+		is_ref_props_packet = GF_TRUE;
+		is_filter_destroyed = GF_TRUE;
+		pck->src_filter = NULL;
+		pck->pid = NULL;
+		assert(!pck->destructor);
+		assert(!pck->filter_owns_mem);
+		assert(!pck->reference);
+
+		if (pck->info.cts != GF_FILTER_NO_TS) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Destroying packet property reference CTS "LLU" size %d\n", pck->info.cts, pck->data_length));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Destroying packet property reference size %d\n", pck->data_length));
+		}
+	}
+	//if not null, we discard a non-sent packet
+	else if (pck->src_filter) {
+		is_filter_destroyed = pck->src_filter->finalized;
+	}
+
+	if (!is_filter_destroyed) {
+		assert(pck->pid);
+		if (pck->pid->filter) {
+			if (pck->info.cts != GF_FILTER_NO_TS) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s destroying packet CTS "LLU"\n", pck->pid->filter->name, pck->pid->name, pck->info.cts));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s destroying packet\n", pck->pid->filter->name, pck->pid->name));
+			}
+		}
+	}
+	if (pck->destructor) pck->destructor(pid->filter, pid, pck);
+
+	if (pck->pid_props) {
+		GF_PropertyMap *props = pck->pid_props;
+		pck->pid_props = NULL;
+
+		if (is_ref_props_packet) {
+			assert(props->pckrefs_reference_count);
+			if (safe_int_dec(&props->pckrefs_reference_count) == 0) {
+				gf_props_del(props);
+			}
+		} else {
+			assert(props->reference_count);
+			if (safe_int_dec(&props->reference_count) == 0) {
+				if (!is_filter_destroyed) {
+					if (pck->pid->filter) {
+						//see \ref gf_filter_pid_merge_properties_internal for mutex
+						gf_mx_p(pck->pid->filter->tasks_mx);
+						gf_list_del_item(pck->pid->properties, props);
+						gf_mx_v(pck->pid->filter->tasks_mx);
+					} else {
+						gf_list_del_item(pck->pid->properties, props);
+					}
+				}
+				gf_props_del(props);
+			}
+		}
+	}
+
+	if (pck->props) {
+		GF_PropertyMap *props = pck->props;
+		pck->props=NULL;
+		assert(props->reference_count);
+		if (safe_int_dec(&props->reference_count) == 0) {
+			gf_props_del(props);
+		}
+	}
+	if (pck->filter_owns_mem && !(pck->info.flags & GF_PCK_CMD_MASK) ) {
+		assert(pck->pid);
+		assert(pck->pid->nb_shared_packets_out);
+		assert(pck->pid->filter);
+		assert(pck->pid->filter->nb_shared_packets_out);
+		safe_int_dec(&pck->pid->nb_shared_packets_out);
+		safe_int_dec(&pck->pid->filter->nb_shared_packets_out);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s has %d shared packets out\n", pck->pid->filter->name, pck->pid->name, pck->pid->nb_shared_packets_out));
+	}
+
+	pck->data_length = 0;
+	pck->pid = NULL;
+
+	if (pck->reference) {
+		assert(pck->reference->pid->nb_shared_packets_out);
+		assert(pck->reference->pid->filter->nb_shared_packets_out);
+		safe_int_dec(&pck->reference->pid->nb_shared_packets_out);
+		safe_int_dec(&pck->reference->pid->filter->nb_shared_packets_out);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s has %d shared packets out\n", pck->reference->pid->filter->name, pck->reference->pid->name, pck->reference->pid->nb_shared_packets_out));
+		assert(pck->reference->reference_count);
+		if (safe_int_dec(&pck->reference->reference_count) == 0) {
+			gf_filter_packet_destroy(pck->reference);
+		}
+		pck->reference = NULL;
+	}
+	/*this is a property reference packet, its destruction may happen at ANY time*/
+	if (is_ref_props_packet) {
+		if (pck->session->pcks_refprops_reservoir) {
+			gf_fq_add(pck->session->pcks_refprops_reservoir, pck);
+		} else {
+			gf_free(pck);
+		}
+	} 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 ) {
+		if (pid->filter && pid->filter->pcks_shared_reservoir) {
+			gf_fq_add(pid->filter->pcks_shared_reservoir, pck);
+		} else {
+			gf_free(pck);
+		}
+	} else {
+		if (pid->filter && pid->filter->pcks_alloc_reservoir) {
+			gf_fq_add(pid->filter->pcks_alloc_reservoir, pck);
+		} else {
+			if (pck->data) gf_free(pck->data);
+			gf_free(pck);
+		}
+	}
+}
+
+static Bool gf_filter_aggregate_packets(GF_FilterPidInst *dst)
+{
+	u32 size=0, pos=0;
+	u64 byte_offset = 0;
+	u64 first_offset = 0;
+	u8 *data;
+	GF_FilterPacket *final;
+	u32 i, count;
+	GF_FilterPckInfo info;
+
+	//no need to lock the packet list since only the dispatch thread operates on it
+
+	count=gf_list_count(dst->pck_reassembly);
+	//no packet to reaggregate
+	if (!count) return GF_FALSE;
+	//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;
+			safe_int64_add(&dst->buffer_duration, duration);
+		}
+		pcki->pck->info.flags |= GF_PCKF_BLOCK_START | GF_PCKF_BLOCK_END;
+ 		gf_fq_add(dst->packets, pcki);
+		return GF_TRUE;
+	}
+
+	for (i=0; i<count; i++) {
+		GF_FilterPacketInstance *pck = gf_list_get(dst->pck_reassembly, i);
+		assert(pck);
+		assert(! (pck->pck->info.flags & GF_PCKF_BLOCK_START) || ! (pck->pck->info.flags & GF_PCKF_BLOCK_END) );
+		size += pck->pck->data_length;
+		if (!i) {
+			first_offset = byte_offset = pck->pck->info.byte_offset;
+			if (byte_offset != GF_FILTER_NO_BO) byte_offset += pck->pck->data_length;
+		}else if (byte_offset == pck->pck->info.byte_offset) {
+			byte_offset += pck->pck->data_length;
+		} else {
+			byte_offset = GF_FILTER_NO_BO;
+		}
+	}
+
+	final = gf_filter_pck_new_alloc(dst->pid, size, &data);
+	pos=0;
+
+	for (i=0; i<count; i++) {
+		GF_FilterPacket *pck;
+		GF_FilterPacketInstance *pcki = gf_list_get(dst->pck_reassembly, i);
+		assert(pcki);
+		pck = pcki->pck;
+
+		if (!pos) {
+			info = pck->info;
+		} else {
+			if (pcki->pck->info.duration > info.duration)
+				info.duration = pcki->pck->info.duration;
+			if ((pcki->pck->info.dts != GF_FILTER_NO_TS) && pcki->pck->info.dts > info.dts)
+				info.dts = pcki->pck->info.dts;
+			if ((pcki->pck->info.cts != GF_FILTER_NO_TS) && pcki->pck->info.cts > info.cts)
+				info.cts = pcki->pck->info.cts;
+
+			info.flags |= pcki->pck->info.flags;
+			if (pcki->pck->info.carousel_version_number > info.carousel_version_number)
+				info.carousel_version_number = pcki->pck->info.carousel_version_number;
+		}
+		if (final)
+			memcpy(data+pos, pcki->pck->data, pcki->pck->data_length);
+
+		pos += pcki->pck->data_length;
+
+		if (final) {
+			gf_filter_pck_merge_properties(pcki->pck, final);
+
+			//copy the first pid_props non null
+			if (pcki->pck->pid_props && !final->pid_props) {
+				final->pid_props = pcki->pck->pid_props;
+				safe_int_inc(&final->pid_props->reference_count);
+			}
+		}
+
+
+		gf_list_rem(dst->pck_reassembly, i);
+
+		//destroy pcki
+		if ((i+1<count) || !final) {
+			pcki->pck = NULL;
+			pcki->pid = NULL;
+
+			if (pck->pid->filter->pcks_inst_reservoir) {
+				gf_fq_add(pck->pid->filter->pcks_inst_reservoir, pcki);
+			} else {
+				gf_free(pcki);
+			}
+		} else {
+			pcki->pck = final;
+			safe_int_inc(&final->reference_count);
+			final->info = info;
+			final->info.flags |= GF_PCKF_BLOCK_START | GF_PCKF_BLOCK_END;
+
+			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;
+				safe_int64_add(&dst->buffer_duration, duration);
+			}
+			//not continous set of bytes reaggregated
+			if (byte_offset == GF_FILTER_NO_BO) final->info.byte_offset = GF_FILTER_NO_BO;
+			else final->info.byte_offset = first_offset;
+
+			gf_fq_add(dst->packets, pcki);
+
+		}
+		//unref pck
+		assert(pck->reference_count);
+		if (safe_int_dec(&pck->reference_count) == 0) {
+			gf_filter_packet_destroy(pck);
+		}
+
+		count--;
+		i--;
+	}
+	if (!final) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to allocate packet for fragment aggregation\n"));
+		return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_filter_pck_discard(GF_FilterPacket *pck)
+{
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to discard input packet on output PID in filter %s\n", pck->pid->filter->name));
+		return;
+	}
+	//function is only used to discard packets allocated but not dispatched, eg with no reference count
+	//so don't decrement the counter
+	if (pck->reference_count == 0) {
+		gf_filter_packet_destroy(pck);
+	}
+}
+
+GF_Err gf_filter_pck_send_internal(GF_FilterPacket *pck, Bool from_filter)
+{
+	u32 i, count, nb_dispatch=0, nb_discard=0;
+	GF_FilterPid *pid;
+	s64 duration=0;
+	u32 timescale=0;
+	GF_FilterClockType cktype;
+#ifdef GPAC_MEMORY_TRACKING
+	u32 nb_allocs=0, nb_reallocs=0, prev_nb_allocs=0, prev_nb_reallocs=0;
+#endif
+
+
+	if (!pck->src_filter) return GF_BAD_PARAM;
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (pck->pid->filter->nb_process_since_reset)
+		gf_mem_get_stats(&prev_nb_allocs, NULL, &prev_nb_reallocs, NULL);
+#endif
+
+	assert(pck);
+	assert(pck->pid);
+	pid = pck->pid;
+
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to dispatch input packet on output PID in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+
+	if (pid->discard_input_packets) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s reset pending, discarding input packet\n", pid->filter->name, pid->name));
+		safe_int_inc(&pck->reference_count);
+		assert(pck->reference_count);
+		if (safe_int_dec(&pck->reference_count) == 0) {
+			gf_filter_packet_destroy(pck);
+		}
+		return GF_OK;
+	}
+
+	//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) {
+		pid->initial_play_done = GF_TRUE;
+		pid->is_playing = GF_TRUE;
+		pid->filter->nb_pids_playing++;
+	}
+
+	if (pid->filter->eos_probe_state)
+		pid->filter->eos_probe_state = 2;
+
+	pid->filter->nb_pck_io++;
+
+	gf_rmt_begin(pck_send, GF_RMT_AGGREGATE);
+
+	//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 ) {
+			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));
+			}
+		} else if (pid->has_seen_eos && !is_cmd) {
+			pid->has_seen_eos = GF_FALSE;
+		}
+
+
+		if (pid->filter->pid_info_changed) {
+			pid->filter->pid_info_changed = GF_FALSE;
+			pid->pid_info_changed = GF_TRUE;
+		}
+
+		//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) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s properties modified, marking packet\n", pck->pid->filter->name, pck->pid->name));
+
+			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)) {
+			pid->request_property_map = GF_TRUE;
+			pid->props_changed_since_connect = GF_FALSE;
+		}
+		if (pid->pid_info_changed) {
+			pck->info.flags |= GF_PCKF_INFO_CHANGED;
+			pid->pid_info_changed = GF_FALSE;
+		}
+	}
+
+	if (pck->pid_props) {
+		timescale = pck->pid_props->timescale;
+	} else {
+		//pid properties applying to this packet are the last defined ones
+		pck->pid_props = gf_list_last(pid->properties);
+		if (pck->pid_props) {
+			safe_int_inc(&pck->pid_props->reference_count);
+			timescale = pck->pid_props->timescale;
+		}
+	}
+
+	if (pid->filter->out_pid_connection_pending || pid->filter->has_pending_pids || pid->init_task_pending) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s connection pending, queuing packet\n", pck->pid->filter->name, pck->pid->name));
+		if (!pid->filter->postponed_packets) pid->filter->postponed_packets = gf_list_new();
+		gf_list_add(pid->filter->postponed_packets, pck);
+
+#ifdef GPAC_MEMORY_TRACKING
+		if (pck->pid->filter->session->check_allocs) {
+			gf_mem_get_stats(&nb_allocs, NULL, &nb_reallocs, NULL);
+			pck->pid->filter->session->nb_alloc_pck += (nb_allocs - prev_nb_allocs);
+			pck->pid->filter->session->nb_realloc_pck += (nb_reallocs - prev_nb_reallocs);
+		}
+#endif
+		gf_rmt_end();
+		return GF_PENDING_PACKET;
+	}
+	//now dispatched
+	pck->src_filter = NULL;
+
+	assert(pck->pid);
+	if (! (pck->info.flags & GF_PCK_CMD_MASK) ) {
+		pid->nb_pck_sent++;
+		if (pck->data_length) {
+			pid->filter->nb_pck_sent++;
+			pid->filter->nb_bytes_sent += pck->data_length;
+		} else if (pck->frame_ifce) {
+			pid->filter->nb_hw_pck_sent++;
+		}
+	}
+
+	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;
+		pid->nb_unreliable_dts = 0;
+	}
+
+	if (!cktype) {
+		Bool unreliable_dts = GF_FALSE;
+		if (pck->info.dts==GF_FILTER_NO_TS) {
+			pck->info.dts = pck->info.cts;
+
+			if (pid->recompute_dts) {
+				if (pck->info.cts == pid->last_pck_cts) {
+					pck->info.dts = pid->last_pck_dts;
+				} else {
+					s64 min_dur = pck->info.cts;
+					min_dur -= (s64) pid->min_pck_cts;
+					if (min_dur<0) min_dur*= -1;
+					if ((u64) min_dur > pid->min_pck_duration) min_dur = pid->min_pck_duration;
+					if (!min_dur) {
+						min_dur = 1;
+						unreliable_dts = GF_TRUE;
+						pid->nb_unreliable_dts++;
+					} else if (pid->nb_unreliable_dts) {
+						pid->last_pck_dts -= pid->nb_unreliable_dts;
+						pid->last_pck_dts += min_dur * pid->nb_unreliable_dts;
+						pid->nb_unreliable_dts = 0;
+						if (pid->last_pck_dts + min_dur > pck->info.cts) {
+							if ((s64) pck->info.cts > min_dur)
+ 								pid->last_pck_dts = pck->info.cts - min_dur;
+							else
+								pid->last_pck_dts = 0;
+						}
+					}
+					if (pid->last_pck_dts)
+						pck->info.dts = pid->last_pck_dts + min_dur;
+				}
+			}
+		}
+		else if (pck->info.cts==GF_FILTER_NO_TS)
+			pck->info.cts = pck->info.dts;
+
+		if (pck->info.cts != GF_FILTER_NO_TS) {
+			if (! pid->duration_init) {
+				pid->last_pck_dts = pck->info.dts;
+				pid->last_pck_cts = pck->info.cts;
+				pid->max_pck_cts = pid->min_pck_cts = pck->info.cts;
+				pid->duration_init = GF_TRUE;
+			} else if (!pck->info.duration && !(pck->info.flags & GF_PCKF_DUR_SET) ) {
+				if (!unreliable_dts && (pck->info.dts!=GF_FILTER_NO_TS)) {
+					duration = pck->info.dts - pid->last_pck_dts;
+					if (duration<0) duration = -duration;
+				} else if (pck->info.cts!=GF_FILTER_NO_TS) {
+					duration = pck->info.cts - pid->last_pck_cts;
+					if (duration<0) duration = -duration;
+				}
+
+				if (pid->recompute_dts) {
+					if (pck->info.cts > pid->max_pck_cts)
+						pid->max_pck_cts = pck->info.cts;
+					if (pck->info.cts < pid->max_pck_cts) {
+						if (pck->info.cts <= pid->min_pck_cts) {
+							pid->min_pck_cts = pck->info.cts;
+						} else if (pck->info.cts>pid->last_pck_cts) {
+							pid->min_pck_cts = pck->info.cts;
+						}
+					}
+				}
+
+				pid->last_pck_dts = pck->info.dts;
+				pid->last_pck_cts = pck->info.cts;
+
+			} else {
+				duration = pck->info.duration;
+				pid->last_pck_dts = pck->info.dts;
+				pid->last_pck_cts = pck->info.cts;
+			}
+		} else {
+			duration = pck->info.duration;
+		}
+
+		if (duration) {
+			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;
+
+		//may happen if we don't have DTS, only CTS signaled and B-frames
+		if ((s32) pck->info.duration < 0) {
+			pck->info.duration = 0;
+		}
+
+#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;
+			u8 seek = (pck->info.flags & GF_PCKF_SEEK) ? 1 : 0;
+			u8 bstart = (pck->info.flags & GF_PCKF_BLOCK_START) ? 1 : 0;
+			u8 bend = (pck->info.flags & GF_PCKF_BLOCK_END) ? 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 sent packet DTS "LLU" CTS "LLU" SAP %d seek %d duration %d S/E %d/%d\n", pck->pid->filter->name, pck->pid->name, pck->info.dts, pck->info.cts, sap_type, seek, pck->info.duration, bstart, bend));
+			}
+			else if ((pck->info.cts != GF_FILTER_NO_TS) ) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s sent packet CTS "LLU" SAP %d seek %d duration %d S/E %d/%d\n", pck->pid->filter->name, pck->pid->name, pck->info.cts, sap_type, seek, pck->info.duration, bstart, bend));
+			}
+			else if ((pck->info.dts != GF_FILTER_NO_TS) ) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s sent packet DTS "LLU" SAP %d seek %d duration %d S/E %d/%d\n", pck->pid->filter->name, pck->pid->name, pck->info.dts, sap_type, seek, pck->info.duration, bstart, bend));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s sent packet no DTS/PTS SAP %d seek %d duration %d S/E %d/%d\n", pck->pid->filter->name, pck->pid->name, sap_type, seek, pck->info.duration, bstart, bend));
+			}
+		}
+#endif
+	} else {
+		pck->info.duration = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s sent clock reference "LLU"%s\n", pck->pid->filter->name, pck->pid->name, pck->info.cts, (cktype==GF_FILTER_CLOCK_PCR_DISC) ? " - discontinuity detected" : ""));
+	}
+
+
+
+	//protect packet from destruction - this could happen
+	//1) during aggregation of packets
+	//2) after dispatching to the packet queue of the next filter, that packet may be consumed
+	//by its destination before we are done adding to the other destination
+	safe_int_inc(&pck->reference_count);
+
+	assert(pck->pid);
+	count = pck->pid->num_destinations;
+	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->discard_inputs) {
+			//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
+				if (dst->props) {
+					assert(dst->props->reference_count);
+					if (safe_int_dec(& dst->props->reference_count) == 0) {
+						//see \ref gf_filter_pid_merge_properties_internal for mutex
+						gf_mx_p(dst->pid->filter->tasks_mx);
+						gf_list_del_item(dst->pid->properties, dst->props);
+						gf_mx_v(dst->pid->filter->tasks_mx);
+						gf_props_del(dst->props);
+					}
+				}
+				dst->props = pck->pid_props;
+				safe_int_inc( & dst->props->reference_count);
+
+				assert(dst->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
+				//now work, eg moving from formatA to formatB then back to formatA
+				gf_list_reset(dst->filter->blacklisted);
+				//and post a reconfigure task
+				gf_fs_post_task(dst->filter->session, gf_filter_pid_reconfigure_task, dst->filter, dst->pid, "pidinst_reconfigure", NULL);
+			}
+			nb_discard++;
+			continue;
+		}
+
+		inst = gf_fq_pop(pck->pid->filter->pcks_inst_reservoir);
+		if (!inst) {
+			GF_SAFEALLOC(inst, GF_FilterPacketInstance);
+			if (!inst) return GF_OUT_OF_MEM;
+		}
+		inst->pck = pck;
+		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 ((inst->pck->info.flags & GF_PCK_CMD_MASK) == GF_PCK_CMD_PID_EOS)  {
+			safe_int_inc(&inst->pid->nb_eos_signaled);
+		}
+
+		if (!inst->pid->handles_clock_references && cktype) {
+			safe_int_inc(&inst->pid->nb_clocks_signaled);
+		}
+
+		safe_int_inc(&pck->reference_count);
+		nb_dispatch++;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Dispatching packet from filter %s to filter %s - %d packet in PID %s buffer ("LLU" us buffer)\n", pid->filter->name, dst->filter->name, gf_fq_count(dst->packets), pid->name, dst->buffer_duration ));
+
+		if (cktype) {
+			safe_int_inc(&dst->filter->pending_packets);
+			gf_fq_add(dst->packets, inst);
+			post_task = GF_TRUE;
+		} else if (dst->requires_full_data_block) {
+			if (pck->info.flags & GF_PCKF_BLOCK_START) {
+				//missed end of previous, aggregate all before excluding this packet
+				if (!dst->last_block_ended) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s: Missed end of block signaling but got start of block - queuing for potential reaggregation\n", pid->filter->name));
+
+					//post process task if we have been reaggregating a packet
+					post_task = gf_filter_aggregate_packets(dst);
+					if (post_task && pid->nb_reaggregation_pending) pid->nb_reaggregation_pending--;
+				}
+				dst->last_block_ended = GF_TRUE;
+			}
+			//block end, aggregate all before and including this packet
+			if (pck->info.flags & GF_PCKF_BLOCK_END) {
+				//not starting at this packet, append and aggregate
+				if (!(pck->info.flags & GF_PCKF_BLOCK_START) && gf_list_count(dst->pck_reassembly) ) {
+					//insert packet into reassembly (no need to lock here)
+					gf_list_add(dst->pck_reassembly, inst);
+
+					gf_filter_aggregate_packets(dst);
+					if (pid->nb_reaggregation_pending) pid->nb_reaggregation_pending--;
+				}
+				//single block packet, direct dispatch in packet queue (aggregation done before)
+				else {
+					assert(dst->last_block_ended);
+
+					if (pck->info.duration && timescale) {
+						duration = ((u64)pck->info.duration) * 1000000;
+						duration /= timescale;
+						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);
+				}
+				dst->last_block_ended = GF_TRUE;
+				post_task = GF_TRUE;
+			}
+			//new block start or continuation
+			else {
+				if (pck->info.flags & GF_PCKF_BLOCK_START) {
+					pid->nb_reaggregation_pending++;
+				}
+
+				//if packet mem is hold by filter we must copy the packet since it is no longer
+				//consumable until end of block is received, and source might be waiting for this packet to be freed to dispatch further packets
+				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);
+					alloc_size = inst->pck->alloc_size;
+					memcpy(inst->pck, pck, sizeof(GF_FilterPacket));
+					inst->pck->pck = inst->pck;
+					inst->pck->data = data;
+					memcpy(inst->pck->data, pck->data, pck->data_length);
+					inst->pck->alloc_size = alloc_size;
+					inst->pck->filter_owns_mem = 0;
+					inst->pck->reference_count = 0;
+					inst->pck->reference = NULL;
+					inst->pck->destructor = NULL;
+					inst->pck->frame_ifce = NULL;
+					if (pck->props) {
+						GF_Err e;
+						inst->pck->props = gf_props_new(pck->pid->filter);
+						if (inst->pck->props) {
+							e = gf_props_merge_property(inst->pck->props, pck->props, NULL, NULL);
+						} else {
+							e = GF_OUT_OF_MEM;
+						}
+						if (e) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s: failed to copy properties for cloned packet: %s\n", pid->filter->name, gf_error_to_string(e) ));
+						}
+					}
+					if (inst->pck->pid_props) {
+						safe_int_inc(&inst->pck->pid_props->reference_count);
+					}
+					
+					assert(pck->reference_count);
+					safe_int_dec(&pck->reference_count);
+					safe_int_inc(&inst->pck->reference_count);
+				}
+				//insert packet into reassembly (no need to lock here)
+				gf_list_add(dst->pck_reassembly, inst);
+
+				dst->last_block_ended = GF_FALSE;
+				//block not complete, don't post process task
+			}
+
+		} else {
+			duration=0;
+			//store start of block info
+			if (pck->info.flags & GF_PCKF_BLOCK_START) {
+				dst->first_block_started = GF_TRUE;
+				duration = pck->info.duration;
+			}
+			if (pck->info.flags & GF_PCKF_BLOCK_END) {
+				//we didn't get a start for this end of block use the packet duration
+				if (!dst->first_block_started) {
+					duration=pck->info.duration;
+				}
+				dst->first_block_started = GF_FALSE;
+			}
+
+			if (duration && timescale) {
+				duration *= 1000000;
+				duration /= timescale;
+				safe_int64_add(&dst->buffer_duration, duration);
+			}
+
+			safe_int_inc(&dst->filter->pending_packets);
+//
+			gf_fq_add(dst->packets, inst);
+			post_task = GF_TRUE;
+		}
+		if (post_task) {
+
+			//make sure we lock the tasks mutex before getting the packet count, otherwise we might end up with a wrong number of packets
+			//if one thread consumes one packet while the dispatching thread  (the caller here) is still upddating the state for that pid
+			gf_mx_p(pid->filter->tasks_mx);
+			u32 nb_pck = gf_fq_count(dst->packets);
+			//update buffer occupancy before dispatching the task - if target pid is processed before we are done disptching his packet, pid buffer occupancy
+			//will be updated during packet drop of target
+			if (pid->nb_buffer_unit < nb_pck) pid->nb_buffer_unit = nb_pck;
+			if ((s64) pid->buffer_duration < dst->buffer_duration) pid->buffer_duration = dst->buffer_duration;
+			gf_mx_v(pid->filter->tasks_mx);
+
+			//post process task
+			gf_filter_post_process_task_internal(dst->filter, pid->direct_dispatch);
+		}
+	}
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (pck->pid->filter->session->check_allocs) {
+		gf_mem_get_stats(&nb_allocs, NULL, &nb_reallocs, NULL);
+		pck->pid->filter->session->nb_alloc_pck += (nb_allocs - prev_nb_allocs);
+		pck->pid->filter->session->nb_realloc_pck += (nb_reallocs - prev_nb_reallocs);
+	}
+#endif
+
+	gf_filter_pid_would_block(pid);
+
+	//unprotect the packet now that it is safely dispatched
+	assert(pck->reference_count);
+	if (safe_int_dec(&pck->reference_count) == 0) {
+		if (!nb_dispatch) {
+			if (nb_discard) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("All PID destinations on filter %s are in discard mode - discarding\n", pid->filter->name));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("No PID destination on filter %s for packet - discarding\n", pid->filter->name));
+			}
+		}
+		gf_filter_packet_destroy(pck);
+	}
+	gf_rmt_end();
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_send(GF_FilterPacket *pck)
+{
+	assert(pck->pid);
+	return gf_filter_pck_send_internal(pck, GF_TRUE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_ref(GF_FilterPacket **pck)
+{
+	if (! pck ) return GF_BAD_PARAM;
+	if (! *pck ) return GF_OK;
+
+	(*pck) = (*pck)->pck;
+	safe_int_inc(& (*pck)->reference_count);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_ref_props(GF_FilterPacket **pck)
+{
+	GF_FilterPacket *npck, *srcpck;
+	GF_FilterPid *pid;
+	if (! pck ) return GF_BAD_PARAM;
+	if (! *pck ) return GF_OK;
+
+	srcpck = (*pck)->pck;
+	pid = srcpck->pid;
+
+	npck = gf_fq_pop( pid->filter->session->pcks_refprops_reservoir);
+	if (!npck) {
+		GF_SAFEALLOC(npck, GF_FilterPacket);
+		if (!npck) return GF_OUT_OF_MEM;
+	}
+	npck->pck = npck;
+	npck->data = NULL;
+	npck->filter_owns_mem = 0;
+	npck->destructor = NULL;
+	gf_filter_pck_reset_props(npck, pid);
+	npck->info = srcpck->info;
+	npck->info.flags |= GF_PCKF_PROPS_REFERENCE;
+	//keep data size
+	npck->data_length = srcpck->data_length;
+
+	if (srcpck->props) {
+		npck->props = srcpck->props;
+		safe_int_inc(& npck->props->reference_count);
+	}
+	if (srcpck->pid_props) {
+		npck->pid_props = srcpck->pid_props;
+		safe_int_inc(& npck->pid_props->pckrefs_reference_count);
+	}
+
+	safe_int_inc(& npck->reference_count);
+	*pck = npck;
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_filter_pck_unref(GF_FilterPacket *pck)
+{
+	assert(pck);
+	pck=pck->pck;
+
+	assert(pck->reference_count);
+	if (safe_int_dec(&pck->reference_count) == 0) {
+		gf_filter_packet_destroy(pck);
+	}
+}
+
+GF_EXPORT
+const u8 *gf_filter_pck_get_data(GF_FilterPacket *pck, u32 *size)
+{
+	assert(pck);
+	assert(size);
+	//get true packet pointer
+	pck=pck->pck;
+	*size = pck->data_length;
+	return (const char *)pck->data;
+}
+
+static GF_Err gf_filter_pck_set_property_full(GF_FilterPacket *pck, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value)
+{
+	u32 hash;
+	assert(pck);
+	assert(pck->pid);
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set property on an input packet in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	//get true packet pointer
+	pck=pck->pck;
+	hash = gf_props_hash_djb2(prop_4cc, prop_name ? prop_name : dyn_name);
+
+	if (!pck->props) {
+		pck->props = gf_props_new(pck->pid->filter);
+	} else {
+		gf_props_remove_property(pck->props, hash, prop_4cc, prop_name ? prop_name : dyn_name);
+	}
+	if (!value) return GF_OK;
+	
+	return gf_props_insert_property(pck->props, hash, prop_4cc, prop_name, dyn_name, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_property(GF_FilterPacket *pck, u32 prop_4cc, const GF_PropertyValue *value)
+{
+	return gf_filter_pck_set_property_full(pck, prop_4cc, NULL, NULL, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_property_str(GF_FilterPacket *pck, const char *name, const GF_PropertyValue *value)
+{
+	return gf_filter_pck_set_property_full(pck, 0, name, NULL, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_property_dyn(GF_FilterPacket *pck, char *name, const GF_PropertyValue *value)
+{
+	return gf_filter_pck_set_property_full(pck, 0, NULL, name, value);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pck_get_property(GF_FilterPacket *pck, u32 prop_4cc)
+{
+	//get true packet pointer
+	pck = pck->pck;
+	if (!pck->props) return NULL;
+	return gf_props_get_property(pck->props, prop_4cc, NULL);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pck_get_property_str(GF_FilterPacket *pck, const char *prop_name)
+{
+	//get true packet pointer
+	pck = pck->pck;
+	if (!pck->props) return NULL;
+	return gf_props_get_property(pck->props, 0, prop_name);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pck_enum_properties(GF_FilterPacket *pck, u32 *idx, u32 *prop_4cc, const char **prop_name)
+{
+	if (!pck->pck->props) return NULL;
+	return gf_props_enum_property(pck->pck->props, idx, prop_4cc, prop_name);
+}
+
+#define PCK_SETTER_CHECK(_pname) \
+	if (PCK_IS_INPUT(pck)) { \
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set %s on an input packet in filter %s\n", _pname, pck->pid->filter->name));\
+		return GF_BAD_PARAM; \
+	} \
+
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_framing(GF_FilterPacket *pck, Bool is_start, Bool is_end)
+{
+	PCK_SETTER_CHECK("framing info")
+
+	if (is_start) pck->info.flags |= GF_PCKF_BLOCK_START;
+	else pck->info.flags &= ~GF_PCKF_BLOCK_START;
+
+	if (is_end) pck->info.flags |= GF_PCKF_BLOCK_END;
+	else pck->info.flags &= ~GF_PCKF_BLOCK_END;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_get_framing(GF_FilterPacket *pck, Bool *is_start, Bool *is_end)
+{
+	assert(pck);
+	//get true packet pointer
+	pck=pck->pck;
+	if (is_start) *is_start = (pck->info.flags & GF_PCKF_BLOCK_START) ? GF_TRUE : GF_FALSE;
+	if (is_end) *is_end = (pck->info.flags & GF_PCKF_BLOCK_END) ? GF_TRUE : GF_FALSE;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_dts(GF_FilterPacket *pck, u64 dts)
+{
+	PCK_SETTER_CHECK("DTS")
+	pck->info.dts = dts;
+	return GF_OK;
+}
+
+GF_EXPORT
+u64 gf_filter_pck_get_dts(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.dts;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_cts(GF_FilterPacket *pck, u64 cts)
+{
+	PCK_SETTER_CHECK("CTS")
+	pck->info.cts = cts;
+	return GF_OK;
+}
+
+GF_EXPORT
+u64 gf_filter_pck_get_cts(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.cts;
+}
+
+GF_EXPORT
+u32 gf_filter_pck_get_timescale(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->pid_props->timescale ? pck->pck->pid_props->timescale : 1000;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_sap(GF_FilterPacket *pck, GF_FilterSAPType sap_type)
+{
+	PCK_SETTER_CHECK("SAP")
+	pck->info.flags &= ~GF_PCK_SAP_MASK;
+	pck->info.flags |= (sap_type)<<GF_PCK_SAP_POS;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_FilterSAPType gf_filter_pck_get_sap(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return (GF_FilterSAPType) ( (pck->pck->info.flags & GF_PCK_SAP_MASK) >> GF_PCK_SAP_POS);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_roll_info(GF_FilterPacket *pck, s16 roll_count)
+{
+	PCK_SETTER_CHECK("ROLL")
+	pck->info.roll = roll_count;
+	return GF_OK;
+}
+
+GF_EXPORT
+s16 gf_filter_pck_get_roll_info(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.roll;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_interlaced(GF_FilterPacket *pck, u32 is_interlaced)
+{
+	PCK_SETTER_CHECK("interlaced")
+	pck->info.flags &= ~GF_PCK_ILACE_MASK;
+	if (is_interlaced)  pck->info.flags |= is_interlaced<<GF_PCK_ILACE_POS;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_filter_pck_get_interlaced(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return (pck->pck->info.flags & GF_PCK_ILACE_MASK) >> GF_PCK_ILACE_POS;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_corrupted(GF_FilterPacket *pck, Bool is_corrupted)
+{
+	PCK_SETTER_CHECK("corrupted")
+	pck->info.flags &= ~GF_PCKF_CORRUPTED;
+	if (is_corrupted) pck->info.flags |= GF_PCKF_CORRUPTED;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_filter_pck_get_corrupted(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return (pck->pck->info.flags & GF_PCKF_CORRUPTED) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_duration(GF_FilterPacket *pck, u32 duration)
+{
+	PCK_SETTER_CHECK("dur")
+	pck->info.duration = duration;
+	pck->info.flags |= GF_PCKF_DUR_SET;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_filter_pck_get_duration(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.duration;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_seek_flag(GF_FilterPacket *pck, Bool is_seek)
+{
+	PCK_SETTER_CHECK("seek")
+	pck->info.flags &= ~GF_PCKF_SEEK;
+	if (is_seek) pck->info.flags |= GF_PCKF_SEEK;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_filter_pck_get_seek_flag(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return (pck->pck->info.flags & GF_PCKF_SEEK) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_dependency_flags(GF_FilterPacket *pck, u8 dep_flags)
+{
+	PCK_SETTER_CHECK("dependency_flags")
+	pck->info.flags &= ~0xFF;
+	pck->info.flags |= dep_flags;
+	return GF_OK;
+}
+
+GF_EXPORT
+u8 gf_filter_pck_get_dependency_flags(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.flags & 0xFF;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_carousel_version(GF_FilterPacket *pck, u8 version_number)
+{
+	PCK_SETTER_CHECK("carousel_version")
+	pck->info.carousel_version_number = version_number;
+	return GF_OK;
+}
+
+GF_EXPORT
+u8 gf_filter_pck_get_carousel_version(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.carousel_version_number;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_byte_offset(GF_FilterPacket *pck, u64 byte_offset)
+{
+	PCK_SETTER_CHECK("byteOffset")
+	pck->info.byte_offset = byte_offset;
+	return GF_OK;
+}
+
+GF_EXPORT
+u64 gf_filter_pck_get_byte_offset(GF_FilterPacket *pck)
+{
+	assert(pck);
+	//get true packet pointer
+	return pck->pck->info.byte_offset;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_crypt_flags(GF_FilterPacket *pck, u8 crypt_flag)
+{
+	PCK_SETTER_CHECK("byteOffset")
+	pck->info.flags &= ~GF_PCK_CRYPT_MASK;
+	pck->info.flags |= crypt_flag << GF_PCK_CRYPT_POS;
+	return GF_OK;
+}
+
+GF_EXPORT
+u8 gf_filter_pck_get_crypt_flags(GF_FilterPacket *pck)
+{
+	//get true packet pointer
+	return (pck->pck->info.flags & GF_PCK_CRYPT_MASK) >> GF_PCK_CRYPT_POS;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_seq_num(GF_FilterPacket *pck, u32 seq_num)
+{
+	PCK_SETTER_CHECK("seqNum")
+	pck->info.seq_num = seq_num;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_filter_pck_get_seq_num(GF_FilterPacket *pck)
+{
+	//get true packet pointer
+	return pck->pck->info.seq_num;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_set_clock_type(GF_FilterPacket *pck, GF_FilterClockType ctype)
+{
+	PCK_SETTER_CHECK("clock_type")
+	pck->info.flags &= ~GF_PCK_CKTYPE_MASK;
+	pck->info.flags |= ctype << GF_PCK_CKTYPE_POS;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_FilterClockType gf_filter_pck_get_clock_type(GF_FilterPacket *pck)
+{
+	//get true packet pointer
+	return (pck->pck->info.flags & GF_PCK_CKTYPE_MASK) >> GF_PCK_CKTYPE_POS;
+}
+
+GF_EXPORT
+GF_FilterFrameInterface *gf_filter_pck_get_frame_interface(GF_FilterPacket *pck)
+{
+	assert(pck);
+	return pck->pck->frame_ifce;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_expand(GF_FilterPacket *pck, u32 nb_bytes_to_add, u8 **data_start, u8 **new_range_start, u32 *new_size)
+{
+	assert(pck);
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reallocate input packet on output PID in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (! pck->src_filter) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reallocate an already sent packet in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (pck->filter_owns_mem) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reallocate a shared memory packet in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (!data_start && !new_range_start)
+		return GF_BAD_PARAM;
+
+	if (pck->data_length + nb_bytes_to_add > pck->alloc_size) {
+		pck->alloc_size = pck->data_length + nb_bytes_to_add;
+		pck->data = gf_realloc(pck->data, pck->alloc_size);
+#ifdef GPAC_MEMORY_TRACKING
+		pck->pid->filter->session->nb_realloc_pck++;
+#endif
+	}
+	pck->info.byte_offset = GF_FILTER_NO_BO;
+	if (data_start) *data_start = pck->data;
+	if (new_range_start) *new_range_start = pck->data + pck->data_length;
+	pck->data_length += nb_bytes_to_add;
+	if (new_size) *new_size = pck->data_length;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_pck_truncate(GF_FilterPacket *pck, u32 size)
+{
+	assert(pck);
+	if (PCK_IS_INPUT(pck)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to truncate input packet on output PID in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (! pck->src_filter) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to truncate an already sent packet in filter %s\n", pck->pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (pck->data_length > size) pck->data_length = size;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_filter_pck_is_blocking_ref(GF_FilterPacket *pck)
+{
+	pck = pck->pck;
+
+	while (pck) {
+		if (pck->frame_ifce) {
+			if (pck->frame_ifce->flags & GF_FRAME_IFCE_BLOCKING)
+				return GF_TRUE;
+		} else {
+			if (pck->destructor && pck->filter_owns_mem)
+				return GF_TRUE;
+		}
+		pck = pck->reference;
+	}
+	return GF_FALSE;
+}
+

gpac-1.0.0.tar.gz/src/filter_core/filter_pid.c Added

@@ -0,0 +1,6796 @@
+	/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+#include <gpac/constants.h>
+
+void pcki_del(GF_FilterPacketInstance *pcki)
+{
+	assert(pcki->pck->reference_count);
+	if (safe_int_dec(&pcki->pck->reference_count) == 0) {
+		gf_filter_packet_destroy(pcki->pck);
+	}
+	gf_free(pcki);
+}
+
+void gf_filter_pid_inst_reset(GF_FilterPidInst *pidinst)
+{
+	assert(pidinst);
+	while (gf_fq_count(pidinst->packets)) {
+		GF_FilterPacketInstance *pcki = gf_fq_pop(pidinst->packets);
+		pcki_del(pcki);
+	}
+
+	while (gf_list_count(pidinst->pck_reassembly)) {
+		GF_FilterPacketInstance *pcki = gf_list_pop_back(pidinst->pck_reassembly);
+		pcki_del(pcki);
+	}
+}
+
+void gf_filter_pid_inst_del(GF_FilterPidInst *pidinst)
+{
+	assert(pidinst);
+	gf_filter_pid_inst_reset(pidinst);
+
+ 	gf_fq_del(pidinst->packets, (gf_destruct_fun) pcki_del);
+	gf_mx_del(pidinst->pck_mx);
+	gf_list_del(pidinst->pck_reassembly);
+	if (pidinst->props) {
+		assert(pidinst->props->reference_count);
+		if (safe_int_dec(&pidinst->props->reference_count) == 0) {
+			//see \ref gf_filter_pid_merge_properties_internal for mutex
+			gf_mx_p(pidinst->pid->filter->tasks_mx);
+			gf_list_del_item(pidinst->pid->properties, pidinst->props);
+			gf_mx_v(pidinst->pid->filter->tasks_mx);
+			gf_props_del(pidinst->props);
+		}
+	}
+	gf_free(pidinst);
+}
+
+static GF_FilterPidInst *gf_filter_pid_inst_new(GF_Filter *filter, GF_FilterPid *pid)
+{
+	GF_FilterPidInst *pidinst;
+	GF_SAFEALLOC(pidinst, GF_FilterPidInst);
+	if (!pidinst) return NULL;
+	pidinst->pid = pid;
+	pidinst->filter = filter;
+
+	if (filter->session->use_locks) {
+		char szName[200];
+		u32 pid_idx = 1 + gf_list_find(pid->filter->output_pids, pid);
+		u32 dst_idx = 1 + pid->num_destinations;
+		snprintf(szName, 200, "F%sPid%dDest%dPackets", filter->name, pid_idx, dst_idx);
+		pidinst->pck_mx = gf_mx_new(szName);
+	}
+
+	pidinst->packets = gf_fq_new(pidinst->pck_mx);
+
+	pidinst->pck_reassembly = gf_list_new();
+	pidinst->last_block_ended = GF_TRUE;
+	return pidinst;
+}
+
+static void gf_filter_pid_check_unblock(GF_FilterPid *pid)
+{
+	Bool unblock;
+
+	//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) {
+			safe_int_inc(&pid->would_block);
+			safe_int_inc(&pid->filter->would_block);
+			assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
+		}
+		return;
+	}
+
+	unblock=GF_FALSE;
+
+	assert(pid->playback_speed_scaler);
+
+	//we block according to the number of dispatched units (decoder output) or to the requested buffer duration
+	//for other streams - unblock accordingly
+	if (pid->max_buffer_unit) {
+		if (pid->nb_buffer_unit * GF_FILTER_SPEED_SCALER < pid->max_buffer_unit * pid->playback_speed_scaler) {
+			unblock=GF_TRUE;
+		}
+	} else if (pid->buffer_duration * GF_FILTER_SPEED_SCALER < pid->max_buffer_time * pid->playback_speed_scaler) {
+		unblock=GF_TRUE;
+	}
+
+	gf_mx_p(pid->filter->tasks_mx);
+	if (pid->would_block && unblock) {
+		assert(pid->would_block);
+		safe_int_dec(&pid->would_block);
+
+		assert(pid->filter->would_block);
+		safe_int_dec(&pid->filter->would_block);
+		assert((s32)pid->filter->would_block>=0);
+		assert(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 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));
+
+			//post a process task
+			gf_filter_post_process_task(pid->filter);
+		}
+	}
+	gf_mx_v(pid->filter->tasks_mx);
+}
+
+static void gf_filter_pid_inst_check_dependencies(GF_FilterPidInst *pidi)
+{
+	const GF_PropertyValue *p;
+	u32 i, dep_id = 0;
+	GF_FilterPid *pid = pidi->pid;
+	GF_Filter *filter = pid->filter;
+
+	//check pid dependency
+	p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) dep_id = p->value.uint;
+
+	if (!dep_id) return;
+
+	for (i=0; i<filter->num_output_pids; i++) {
+		u32 j;
+		GF_FilterPid *a_pid = gf_list_get(filter->output_pids, i);
+		if (a_pid==pid) continue;
+		p = gf_filter_pid_get_property_first(a_pid, GF_PROP_PID_ID);
+		if (!p) p = gf_filter_pid_get_property_first(a_pid, GF_PROP_PID_ESID);
+		if (!p || (p->value.uint != dep_id)) continue;
+
+		for (j=0; j<a_pid->num_destinations; j++) {
+			GF_FilterPidInst *a_pidi = gf_list_get(a_pid->destinations, j);
+			if (a_pidi == pidi) continue;
+			if (! a_pidi->is_decoder_input) continue;
+
+			if (a_pidi->filter == pidi->filter) continue;
+
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Filter %s PID %s connected to decoder %s, but dependent stream %s connected to %s - switching pid destination\n", a_pid->filter->name, a_pid->name, a_pidi->filter->name, pidi->pid->name, pidi->filter->name));
+
+			//disconnect this pid instance from its current decoder
+			gf_fs_post_task(filter->session, gf_filter_pid_disconnect_task, a_pidi->filter, a_pid, "pidinst_disconnect", NULL);
+
+			//reconnect this pid instance to the new decoder
+			safe_int_inc(&pid->filter->out_pid_connection_pending);
+			gf_filter_pid_post_connect_task(pidi->filter, a_pid);
+
+		}
+	}
+}
+
+static void gf_filter_pid_update_caps(GF_FilterPid *pid)
+{
+	u32 mtype=0, codecid=0;
+	u32 i, count;
+	const GF_PropertyValue *p;
+
+	pid->raw_media = GF_FALSE;
+	p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_CODECID);
+	if (p) codecid = p->value.uint;
+
+	p = gf_filter_pid_get_property_first(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) mtype = p->value.uint;
+
+	pid->stream_type = mtype;
+	pid->codecid = codecid;
+
+	if (pid->user_max_buffer_time) {
+		pid->max_buffer_time = pid->user_max_buffer_time;
+		pid->max_buffer_unit = 0;
+	} else {
+		pid->max_buffer_time = pid->filter->session->default_pid_buffer_max_us;
+		pid->max_buffer_unit = pid->filter->session->default_pid_buffer_max_units;
+	}
+	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);
+			u32 i_codecid=0, i_type=0;
+			p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_STREAM_TYPE);
+			if (p) i_type = p->value.uint;
+
+			p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_CODECID);
+			if (p) i_codecid = p->value.uint;
+			//same stream type but changing from raw to not raw: this is an encoder input pid
+			if ((mtype==i_type) && (i_codecid==GF_CODECID_RAW)) {
+				pidi->is_encoder_input = GF_TRUE;
+			}
+		}
+		return;
+	}
+
+	if (pid->user_max_buffer_time) {
+		pid->max_buffer_time = pid->user_max_buffer_time;
+		pid->max_buffer_unit = 0;
+	}
+
+
+	//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++) {
+		u32 i_codecid=0, i_type=0;
+		GF_FilterPidInst *pidi = gf_list_get(pid->filter->input_pids, i);
+
+		p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_STREAM_TYPE);
+		if (p) i_type = p->value.uint;
+
+		p = gf_filter_pid_get_property_first(pidi->pid, GF_PROP_PID_CODECID);
+		if (p) i_codecid = p->value.uint;
+
+		//same stream type but changing format type: this is a decoder input pid, set buffer req
+		if ((mtype==i_type) && (codecid != i_codecid)) {
+			//default decoder buffer
+			if (pidi->pid->user_max_buffer_time)
+				pidi->pid->max_buffer_time = pidi->pid->user_max_buffer_time;
+			else
+				pidi->pid->max_buffer_time = pidi->pid->filter->session->decoder_pid_buffer_max_us;
+			pidi->pid->max_buffer_unit = 0;
+
+
+			if (mtype==GF_STREAM_VISUAL) {
+				pid->max_buffer_unit = 4;
+			} else if (mtype==GF_STREAM_AUDIO) {
+				pid->max_buffer_unit = 20;
+			}
+
+			if (!pidi->is_decoder_input) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s pid instance %s marked as decoder input\n",  pidi->pid->filter->name, pidi->pid->name));
+				pidi->is_decoder_input = GF_TRUE;
+				safe_int_inc(&pidi->pid->nb_decoder_inputs);
+
+				if ((i_type == GF_STREAM_AUDIO) || (i_type == GF_STREAM_VISUAL))
+					gf_filter_pid_inst_check_dependencies(pidi);
+			}
+		}
+		//same media type, different codec if is raw stream
+		 else if (mtype==i_type) {
+			pid->raw_media = GF_TRUE;
+		}
+		//input is file, output is not and codec ID is raw, this is a raw media pid
+		 else if ((i_type==GF_STREAM_FILE) && (mtype!=GF_STREAM_FILE) && (codecid==GF_CODECID_RAW) ) {
+			pid->raw_media = GF_TRUE;
+		}
+	}
+	//source pid, mark raw media
+	if (!count && pid->num_destinations) {
+		pid->raw_media = GF_TRUE;
+	}
+}
+
+#define TASK_REQUEUE(_t) \
+	_t->requeue_request = GF_TRUE; \
+	_t->schedule_next_time = gf_sys_clock_high_res() + 50; \
+
+void gf_filter_pid_inst_delete_task(GF_FSTask *task)
+{
+	GF_FilterPid *pid = task->pid;
+	GF_FilterPidInst *pidinst = task->udta;
+	GF_Filter *filter = pid->filter;
+	Bool pid_still_alive = GF_FALSE;
+
+	assert(filter);
+	//reset in process
+	if ((pidinst->filter && pidinst->discard_packets) || filter->stream_reset_pending) {
+		TASK_REQUEUE(task)
+		return;
+	}
+
+	//reset PID instance buffers before checking number of output shared packets
+	//otherwise we may block because some of the shared packets are in the
+	//pid instance buffer (not consumed)
+	gf_filter_pid_inst_reset(pidinst);
+
+	//we still have packets out there!
+	if (pidinst->pid->nb_shared_packets_out) {
+		//special case for disconnect of fanouts, destroy even if shared packets out
+		if (!pid->num_destinations || ((pid->num_destinations>=1) && (gf_list_find(pid->destinations, pidinst)>=0))) {
+			TASK_REQUEUE(task)
+			return;
+		}
+	}
+
+	//WARNING at this point pidinst->filter may be destroyed
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid instance %s destruction (%d fan-out)\n",  filter->name, pid->name, pid->num_destinations));
+	gf_mx_p(filter->tasks_mx);
+	gf_list_del_item(pid->destinations, pidinst);
+	pid->num_destinations = gf_list_count(pid->destinations);
+	if (pidinst->pid->num_pidinst_del_pending) {
+		pidinst->pid->num_pidinst_del_pending--;
+		if (pidinst->pid->num_pidinst_del_pending)
+			pid_still_alive = GF_TRUE;
+	}
+	gf_mx_v(filter->tasks_mx);
+
+	if (pidinst->is_decoder_input) {
+		assert(pid->nb_decoder_inputs);
+		safe_int_dec(&pid->nb_decoder_inputs);
+	}
+	gf_filter_pid_inst_del(pidinst);
+	//recompute max buf dur and nb units to update blocking state
+	if (pid->num_destinations) {
+		u32 i;
+		u32 nb_pck = 0;
+		s64 buf_dur = 0;
+		for (i = 0; i < pid->num_destinations; i++) {
+			GF_FilterPidInst *apidi = gf_list_get(pid->destinations, i);
+			u32 npck = gf_fq_count(apidi->packets);
+			if (npck > nb_pck) nb_pck = npck;
+			if (apidi->buffer_duration > buf_dur) buf_dur = apidi->buffer_duration;
+		}
+		pid->nb_buffer_unit = nb_pck;
+		pid->buffer_duration = buf_dur;
+	} else {
+		pid->nb_buffer_unit = 0;
+		pid->buffer_duration = 0;
+	}
+
+	assert(pid->filter == filter);
+
+	if (pid_still_alive)
+		return;
+
+	//some more destinations on pid, update blocking state
+	if (pid->num_destinations || pid->init_task_pending) {
+		if (pid->would_block)
+			gf_filter_pid_check_unblock(pid);
+		else
+			gf_filter_pid_would_block(pid);
+
+		return;
+	}
+	//still some input to the filter, cannot destroy the output pid
+	if (gf_list_count(filter->input_pids))
+		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)) {
+		gf_filter_post_remove(filter);
+	}
+}
+
+void gf_filter_pid_inst_swap_delete(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPidInst *pidinst, GF_FilterPidInst *dst_swapinst)
+{
+	u32 i, j;
+
+	//reset PID instance buffers before checking number of output shared packets
+	//otherwise we may block because some of the shared packets are in the
+	//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_mx_p(filter->tasks_mx);
+	gf_list_del_item(filter->input_pids, pidinst);
+	filter->num_input_pids = gf_list_count(filter->input_pids);
+	gf_mx_v(filter->tasks_mx);
+
+	gf_mx_p(pid->filter->tasks_mx);
+	gf_list_del_item(pid->destinations, pidinst);
+	pid->num_destinations = gf_list_count(pid->destinations);
+	gf_mx_v(pid->filter->tasks_mx);
+
+
+	if (pidinst->is_decoder_input) {
+		assert(pid->nb_decoder_inputs);
+		safe_int_dec(&pid->nb_decoder_inputs);
+	}
+	//this pid instance is registered to destination filter for chain reconfigure, don't discard it
+	if (filter->detached_pid_inst && (gf_list_find(filter->detached_pid_inst, pidinst)>=0) )
+		return;
+
+	gf_filter_pid_inst_del(pidinst);
+
+	if (filter->num_input_pids) return;
+	//we still have other pid instances registered for chain reconfigure, don't discard the filter
+	if (filter->detached_pid_inst) return;
+
+	//filter no longer used, disconnect chain
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *a_pid = gf_list_get(filter->output_pids, i);
+		for (j=0; j<a_pid->num_destinations; j++) {
+			GF_FilterPidInst *a_pidi = gf_list_get(a_pid->destinations, j);
+			if (a_pidi == dst_swapinst) continue;
+
+			gf_filter_pid_inst_swap_delete(a_pidi->filter, a_pid, a_pidi, dst_swapinst);
+		}
+	}
+	filter->swap_pidinst_dst = NULL;
+	filter->swap_pidinst_src = NULL;
+	gf_filter_post_remove(filter);
+}
+
+void gf_filter_pid_inst_swap_delete_task(GF_FSTask *task)
+{
+	GF_FilterPidInst *pidinst = task->udta;
+	GF_Filter *filter = pidinst->filter;
+	GF_FilterPid *pid = task->pid ? task->pid : pidinst->pid;
+	GF_FilterPidInst *dst_swapinst = pidinst->filter->swap_pidinst_dst;
+
+	//reset in process
+	if ((pidinst->filter && pidinst->discard_packets)
+		|| filter->stream_reset_pending
+		|| filter->nb_shared_packets_out
+	) {
+		TASK_REQUEUE(task)
+		return;
+	}
+	if (pidinst->filter)
+		pidinst->filter->swap_pidinst_dst = NULL;
+
+	gf_filter_pid_inst_swap_delete(filter, pid, pidinst, dst_swapinst);
+}
+
+void gf_filter_pid_inst_swap(GF_Filter *filter, GF_FilterPidInst *dst)
+{
+	GF_PropertyMap *prev_dst_props;
+	u32 nb_pck_transfer=0;
+	GF_FilterPidInst *src = filter->swap_pidinst_src;
+	if (!src) src = filter->swap_pidinst_dst;
+	
+	if (src) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s swaping PID %s to PID %s\n", filter->name, src->pid->name, dst->pid->name));
+	}
+
+	
+	if (filter->swap_needs_init) {
+		//we are in detach state, the packet queue of the old PID is never read
+		assert(filter->swap_pidinst_dst && filter->swap_pidinst_dst->detach_pending);
+		//we are in pending stete, the origin of the old PID is never dispatching
+		assert(dst->pid && dst->pid->filter && dst->pid->filter->out_pid_connection_pending);
+		//we can therefore swap the packet queues safely and other important info
+	}
+	//otherwise we actually swap the pid instance on the same PID
+	else {
+		gf_mx_p(dst->pid->filter->tasks_mx);
+		if (src)
+			gf_list_del_item(dst->pid->destinations, src);
+		if (gf_list_find(dst->pid->destinations, dst)<0)
+			gf_list_add(dst->pid->destinations, dst);
+		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);
+		}
+		gf_mx_v(dst->pid->filter->tasks_mx);
+	}
+
+	if (src) {
+		GF_FilterPacketInstance *pcki;
+		while (1) {
+			pcki = gf_fq_pop(src->packets);
+			if (!pcki) break;
+			assert(src->filter->pending_packets);
+			safe_int_dec(&src->filter->pending_packets);
+
+			pcki->pid = dst;
+			gf_fq_add(dst->packets, pcki);
+			safe_int_inc(&dst->filter->pending_packets);
+			nb_pck_transfer++;
+		}
+		if (src->requires_full_data_block && gf_list_count(src->pck_reassembly)) {
+			dst->requires_full_data_block = src->requires_full_data_block;
+			dst->last_block_ended = src->last_block_ended;
+			dst->first_block_started = src->first_block_started;
+			if (!dst->pck_reassembly) dst->pck_reassembly = gf_list_new();
+			while (gf_list_count(src->pck_reassembly)) {
+				pcki = gf_list_pop_front(src->pck_reassembly);
+				pcki->pid = dst;
+				gf_list_add(dst->pck_reassembly, pcki);
+			}
+		}
+		//copy over state
+		dst->is_end_of_stream = src->is_end_of_stream;
+		dst->nb_eos_signaled = src->nb_eos_signaled;
+		dst->buffer_duration = src->buffer_duration;
+		dst->nb_clocks_signaled = src->nb_clocks_signaled;
+
+		//switch previous src property map to this new pid (this avoids rewriting props of already dispatched packets)
+		//it may happen that we already have props on dest, due to configure of the pid
+		//use the old props as new ones and merge the previous props of dst in the new props
+		prev_dst_props = dst->props;
+		dst->props = src->props;
+		dst->force_reconfig = GF_TRUE;
+		src->force_reconfig = GF_TRUE;
+		src->props = NULL;
+		if (prev_dst_props) {
+			gf_props_merge_property(dst->props, prev_dst_props, NULL, NULL);
+			assert(prev_dst_props->reference_count);
+			if (safe_int_dec(&prev_dst_props->reference_count) == 0) {
+				gf_props_del(prev_dst_props);
+			}
+		}
+
+		if (nb_pck_transfer && !dst->filter->process_task_queued) {
+			gf_filter_post_process_task(dst->filter);
+		}
+	}
+
+
+	src = filter->swap_pidinst_dst;
+	if (src) {
+		if (filter->swap_needs_init) {
+			//exit out special handling of the pid since we are ready to detach
+			assert(src->filter->stream_reset_pending);
+			safe_int_dec(&src->filter->stream_reset_pending);
+
+			//post detach task, we will reset the swap_pidinst only once truly deconnected from filter
+			safe_int_inc(&src->pid->filter->detach_pid_tasks_pending);
+			safe_int_inc(&filter->detach_pid_tasks_pending);
+			gf_fs_post_task(filter->session, gf_filter_pid_detach_task, src->filter, src->pid, "pidinst_detach", filter);
+		} else {
+			GF_Filter *src_filter = src->filter;
+			assert(!src->filter->sticky);
+			assert(src->filter->num_input_pids==1);
+
+			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);
+			gf_mx_v(src_filter->tasks_mx);
+
+			gf_list_del_item(src->pid->destinations, src);
+			src->pid->num_destinations = gf_list_count(src->pid->destinations);
+			gf_filter_pid_inst_del(src);
+
+			filter->swap_pidinst_dst = NULL;
+			filter->swap_pidinst_src = NULL;
+			gf_filter_post_remove(src_filter);
+		}
+	}
+	
+	if (filter->swap_pidinst_src) {
+		src = filter->swap_pidinst_src;
+		src->filter->swap_pidinst_dst = filter->swap_pidinst_dst;
+		gf_fs_post_task(filter->session, gf_filter_pid_inst_swap_delete_task, src->filter, src->pid, "pid_inst_delete", src);
+	}
+}
+
+
+typedef enum {
+	GF_PID_CONF_CONNECT,
+	GF_PID_CONF_RECONFIG,
+	GF_PID_CONF_REMOVE,
+} GF_PidConnectType;
+
+static GF_Err gf_filter_pid_configure(GF_Filter *filter, GF_FilterPid *pid, GF_PidConnectType ctype)
+{
+	u32 i, count;
+	GF_Err e;
+	Bool new_pid_inst=GF_FALSE;
+	GF_FilterPidInst *pidinst=NULL;
+	GF_Filter *alias_orig = NULL;
+
+	if (filter->multi_sink_target) {
+		alias_orig = filter;
+		filter = filter->multi_sink_target;
+	}
+
+	assert(filter->freg->configure_pid);
+	if (filter->finalized) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Trying to configure PID %s in finalized filter %s\n",  pid->name, filter->name));
+		if (ctype==GF_PID_CONF_CONNECT) {
+			assert(pid->filter->out_pid_connection_pending);
+			safe_int_dec(&pid->filter->out_pid_connection_pending);
+		}
+		return GF_SERVICE_ERROR;
+	}
+
+	if (filter->detached_pid_inst) {
+		count = gf_list_count(filter->detached_pid_inst);
+		for (i=0; i<count; i++) {
+			pidinst = gf_list_get(filter->detached_pid_inst, i);
+			if (pidinst->filter==filter) {
+				gf_list_rem(filter->detached_pid_inst, i);
+				//reattach new filter and pid
+				pidinst->filter = filter;
+				pidinst->pid = pid;
+
+				assert(!pidinst->props);
+
+				//and treat as new pid inst
+				if (ctype == GF_PID_CONF_CONNECT) {
+					new_pid_inst=GF_TRUE;
+				}
+				assert(pidinst->detach_pending);
+				safe_int_dec(&pidinst->detach_pending);
+				break;
+			}
+			pidinst=NULL;
+		}
+		if (! gf_list_count(filter->detached_pid_inst)) {
+			gf_list_del(filter->detached_pid_inst);
+			filter->detached_pid_inst = NULL;
+		}
+	}
+	if (!pidinst) {
+		count = pid->num_destinations;
+		for (i=0; i<count; i++) {
+			pidinst = gf_list_get(pid->destinations, i);
+			if (pidinst->filter==filter) {
+				break;
+			}
+			pidinst=NULL;
+		}
+	}
+
+	//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));
+			return GF_SERVICE_ERROR;
+		}
+		pidinst = gf_filter_pid_inst_new(filter, pid);
+		new_pid_inst=GF_TRUE;
+		pidinst->alias_orig = alias_orig;
+	}
+
+	//if new, add the PID to input/output before calling configure
+	if (new_pid_inst) {
+		assert(pidinst);
+		gf_mx_p(pid->filter->tasks_mx);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Registering %s:%s as destination for %s:%s\n", pid->filter->name, pid->name, pidinst->filter->name, pidinst->pid->name));
+		gf_list_add(pid->destinations, pidinst);
+		pid->num_destinations = gf_list_count(pid->destinations);
+
+		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);
+
+		//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
+		//processed here)
+		gf_filter_pid_update_caps(pid);
+	}
+
+	//we are swaping a PID instance (dyn insert of a filter), do it before reconnecting
+	//in order to have properties in place
+	//TODO: handle error case, we might need to re-switch the pid inst!
+	if (filter->swap_pidinst_src || filter->swap_pidinst_dst) {
+		gf_filter_pid_inst_swap(filter, pidinst);
+	}
+
+	filter->in_connect_err = GF_EOS;
+	//commented out: audio thread may be pulling packets out of the pid but not in the compositor:process, which
+	//could be called for video at the same time...
+#if 0
+	FSESS_CHECK_THREAD(filter)
+#endif
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s reconfigure\n", pidinst->filter->name, pidinst->pid->name));
+	e = filter->freg->configure_pid(filter, (GF_FilterPid*) pidinst, (ctype==GF_PID_CONF_REMOVE) ? GF_TRUE : GF_FALSE);
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (filter->session->check_allocs) {
+		if (filter->nb_consecutive_process >= filter->max_nb_consecutive_process) {
+			filter->max_nb_consecutive_process = filter->nb_consecutive_process;
+			filter->max_nb_process = filter->nb_process_since_reset;
+			filter->max_stats_nb_alloc = filter->stats_nb_alloc;
+			filter->max_stats_nb_calloc = filter->stats_nb_calloc;
+			filter->max_stats_nb_realloc = filter->stats_nb_realloc;
+			filter->max_stats_nb_free = filter->stats_nb_free;
+		}
+		filter->stats_mem_allocated = 0;
+		filter->stats_nb_alloc = filter->stats_nb_realloc = filter->stats_nb_free = 0;
+		filter->nb_process_since_reset = filter->nb_consecutive_process = 0;
+	}
+#endif
+	if ((e==GF_OK) && (filter->in_connect_err<GF_OK))
+		e = filter->in_connect_err;
+
+	filter->in_connect_err = GF_OK;
+	
+	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));
+		}
+	}
+	//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) {
+			filter->session->last_connect_error = e;
+		} else {
+			gf_filter_relink_dst(pidinst);
+		}
+	} else {
+
+		//error, remove from input and output
+		gf_mx_p(filter->tasks_mx);
+		gf_list_del_item(filter->input_pids, pidinst);
+		filter->num_input_pids = gf_list_count(filter->input_pids);
+		filter->freg->configure_pid(filter, (GF_FilterPid *) pidinst, GF_TRUE);
+		gf_mx_v(filter->tasks_mx);
+
+		gf_mx_p(pidinst->pid->filter->tasks_mx);
+		gf_list_del_item(pidinst->pid->destinations, pidinst);
+		pidinst->pid->num_destinations = gf_list_count(pidinst->pid->destinations);
+		//detach filter from pid instance
+		pidinst->filter = NULL;
+		gf_mx_v(pidinst->pid->filter->tasks_mx);
+
+		//if connect and error, direct delete of pid
+		if (new_pid_inst) {
+			gf_mx_p(pid->filter->tasks_mx);
+			gf_list_del_item(pid->destinations, pidinst);
+			pid->num_destinations = gf_list_count(pid->destinations);
+			//destroy pid instance
+			gf_filter_pid_inst_del(pidinst);
+			gf_mx_v(pid->filter->tasks_mx);
+		}
+
+
+		if (e==GF_REQUIRES_NEW_INSTANCE) {
+			//TODO: copy over args from current filter
+			GF_Filter *new_filter = gf_filter_clone(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);
+				return GF_OK;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to clone filter %s\n", filter->name));
+				e = GF_OUT_OF_MEM;
+			}
+		}
+		if (e && (ctype==GF_PID_CONF_REMOVE)) {
+			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_BAD_PARAM) || (e==GF_FILTER_NOT_SUPPORTED) || (filter->session->flags & GF_FS_FLAG_NO_REASSIGN)) {
+				if (e!=GF_FILTER_NOT_SUPPORTED) {
+					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 (ctype==GF_PID_CONF_CONNECT) {
+					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);
+
+					gf_filter_pid_set_eos(pid);
+
+					if (pid->filter->freg->process_event) {
+						GF_FEVT_INIT(evt, GF_FEVT_CONNECT_FAIL, pid);
+						gf_filter_pid_send_event_internal(pid, &evt, GF_TRUE);
+					}
+				}
+			} else if (filter->has_out_caps) {
+				Bool unload_filter = GF_TRUE;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Blacklisting %s as output from %s and retrying connections\n", filter->name, pid->filter->name));
+				//try to load another filter to handle that connection
+				//1-blacklist this filter
+				gf_list_add(pid->filter->blacklisted, (void *) filter->freg);
+				//2-disconnect all other inputs, and post a re-init
+				gf_mx_p(filter->tasks_mx);
+				while (gf_list_count(filter->input_pids)) {
+					GF_FilterPidInst *a_pidinst = gf_list_pop_back(filter->input_pids);
+					FSESS_CHECK_THREAD(filter)
+					filter->freg->configure_pid(filter, (GF_FilterPid *) a_pidinst, GF_TRUE);
+
+					gf_filter_pid_post_init_task(a_pidinst->pid->filter, a_pidinst->pid);
+					gf_fs_post_task(filter->session, gf_filter_pid_inst_delete_task, a_pidinst->pid->filter, a_pidinst->pid, "pid_inst_delete", a_pidinst);
+
+					unload_filter = GF_FALSE;
+				}
+				filter->num_input_pids = 0;
+				filter->removed = GF_TRUE;
+				filter->has_pending_pids = GF_FALSE;
+				gf_mx_v(filter->tasks_mx);
+
+				//do not assign session->last_connect_error since we are retrying a connection
+
+				if (ctype==GF_PID_CONF_CONNECT) {
+					assert(pid->filter->out_pid_connection_pending);
+					safe_int_dec(&pid->filter->out_pid_connection_pending);
+				}
+				//3- post a re-init on this pid
+				gf_filter_pid_post_init_task(pid->filter, pid);
+
+				if (unload_filter) {
+					assert(!gf_list_count(filter->input_pids));
+
+					if (filter->num_output_pids) {
+						for (i=0; i<filter->num_output_pids; i++) {
+							u32 j;
+							GF_FilterPid *opid = gf_list_get(filter->output_pids, i);
+							for (j=0; j< opid->num_destinations; j++) {
+								GF_FilterPidInst *a_pidi = gf_list_get(opid->destinations, j);
+								a_pidi->pid = NULL;
+							}
+							gf_list_reset(opid->destinations);
+							opid->num_destinations = 0;
+							gf_filter_pid_remove(opid);
+						}
+					}
+					filter->swap_pidinst_src = NULL;
+					if (filter->swap_pidinst_dst) {
+						GF_Filter *target = filter->swap_pidinst_dst->filter;
+						assert(target);
+						if (!target->detached_pid_inst) {
+							target->detached_pid_inst = gf_list_new();
+						}
+						//detach props but don't delete them
+						if (filter->swap_pidinst_dst->props) {
+							filter->swap_pidinst_dst->props = NULL;
+						}
+						filter->swap_pidinst_dst->pid = NULL;
+						if (gf_list_find(target->detached_pid_inst, filter->swap_pidinst_dst)<0)
+							gf_list_add(target->detached_pid_inst, filter->swap_pidinst_dst);
+					}
+					filter->swap_pidinst_dst = NULL;
+					if (filter->on_setup_error) {
+						gf_filter_notification_failure(filter, e, GF_TRUE);
+					} else {
+						gf_filter_post_remove(filter);
+					}
+				}
+				return e;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to reconfigure input of sink %s, cannot rebuild graph\n", filter->name));
+				if (pid->filter->freg->process_event) {
+					GF_FilterEvent evt;
+					GF_FEVT_INIT(evt, GF_FEVT_CONNECT_FAIL, pid);
+					pid->filter->freg->process_event(pid->filter, &evt);
+				}
+				filter->session->last_connect_error = e;
+			}
+		} else {
+			filter->session->last_connect_error = GF_OK;
+		}
+
+		//try to run filter no matter what
+		if (filter->session->requires_solved_graph)
+			return e;
+	}
+
+	//flush all pending pid init requests following the call to init
+	if (filter->has_pending_pids) {
+		filter->has_pending_pids = GF_FALSE;
+		while (gf_fq_count(filter->pending_pids)) {
+			GF_FilterPid *a_pid=gf_fq_pop(filter->pending_pids);
+
+			gf_filter_pid_post_init_task(filter, a_pid);
+		}
+	}
+
+	if (ctype==GF_PID_CONF_REMOVE) {
+		gf_mx_p(filter->tasks_mx);
+		gf_list_del_item(filter->input_pids, pidinst);
+		filter->num_input_pids = gf_list_count(filter->input_pids);
+		gf_mx_v(filter->tasks_mx);
+
+		//PID instance is no longer in graph, we must remove it from pid destination to avoid propagating events
+		//on to-be freed pid instance.
+		//however we must have fan-outs (N>1 pid instance per PID), and removing the pid inst would trigger a pid destruction
+		//on the first gf_filter_pid_inst_delete_task executed.
+		//we therefore track at the PID level the number of gf_filter_pid_inst_delete_task tasks pending and
+		//won't destroy the PID until that number is O
+		gf_mx_p(pidinst->pid->filter->tasks_mx);
+		pidinst->pid->num_pidinst_del_pending ++;
+		gf_list_del_item(pidinst->pid->destinations, pidinst);
+		pidinst->pid->num_destinations = gf_list_count(pidinst->pid->destinations);
+		pidinst->filter = NULL;
+		gf_mx_v(pidinst->pid->filter->tasks_mx);
+
+		//disconnected the last input, flag as removed
+		if (!filter->num_input_pids && !filter->sticky) {
+			gf_filter_reset_pending_packets(filter);
+			filter->removed = GF_TRUE;
+		}
+		//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);
+
+		return e;
+	}
+
+	if (ctype==GF_PID_CONF_CONNECT) {
+		assert(pid->filter->out_pid_connection_pending);
+		if (safe_int_dec(&pid->filter->out_pid_connection_pending) == 0) {
+
+			if (e==GF_OK) {
+				//postponed packets dispatched by source while setting up PID, flush through process()
+				//pending packets (not yet consumed but in PID buffer), start processing
+				if (pid->filter->postponed_packets || pid->filter->pending_packets || pid->filter->nb_caps_renegociate) {
+					gf_filter_post_process_task(pid->filter);
+				}
+			}
+		}
+	}
+	//once all pid have been (re)connected, update any internal caps
+	gf_filter_pid_update_caps(pid);
+	return e;
+}
+
+static void gf_filter_pid_connect_task(GF_FSTask *task)
+{
+	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));
+
+	//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);
+		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);
+			return;
+		}
+	}
+	if (task->pid->pid) {
+		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) {
+			task->pid->pid->request_property_map = GF_TRUE;
+			task->pid->pid->pid_info_changed = GF_FALSE;
+		}
+	}
+	
+	//filter may now be the clone, decrement on original filter
+	assert(task->filter->in_pid_connection_pending);
+	safe_int_dec(&task->filter->in_pid_connection_pending);
+
+	gf_fs_cleanup_filters(fsess);
+
+}
+
+void gf_filter_pid_reconfigure_task(GF_FSTask *task)
+{
+	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 (task->pid->pid) {
+		gf_filter_pid_configure(task->filter, task->pid->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;
+		}
+	}
+}
+
+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);
+
+	//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;
+	}
+}
+
+void gf_filter_pid_detach_task(GF_FSTask *task)
+{
+	u32 i, count;
+	GF_Filter *filter = task->filter;
+	GF_FilterPid *pid = task->pid->pid;
+	GF_FilterPidInst *pidinst=NULL;
+	GF_Filter *new_chain_input = task->udta;
+
+	//we may have concurrent reset (due to play/stop/seek) and caps renegotiation
+	//wait for the pid to be reset before detaching
+	if (pid->filter->stream_reset_pending) {
+		TASK_REQUEUE(task)
+		return;
+	}
+	if (new_chain_input->in_pid_connection_pending) {
+		TASK_REQUEUE(task)
+		return;
+	}
+
+	assert(filter->freg->configure_pid);
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s detach from %s\n", task->pid->pid->filter->name, task->pid->pid->name, task->filter->name));
+
+	assert(pid->filter->detach_pid_tasks_pending);
+	safe_int_dec(&pid->filter->detach_pid_tasks_pending);
+	count = pid->num_destinations;
+	for (i=0; i<count; i++) {
+		pidinst = gf_list_get(pid->destinations, i);
+		if (pidinst->filter==filter) {
+			break;
+		}
+		pidinst=NULL;
+	}
+
+	//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));
+		assert(!new_chain_input->swap_pidinst_dst);
+		assert(!new_chain_input->swap_pidinst_src);
+		new_chain_input->swap_needs_init = GF_FALSE;
+		return;
+	}
+
+	//detach props
+	if (pidinst->props) {
+		assert(pidinst->props->reference_count);
+		if (safe_int_dec(& pidinst->props->reference_count) == 0) {
+			//see \ref gf_filter_pid_merge_properties_internal for mutex
+			gf_mx_p(pidinst->pid->filter->tasks_mx);
+			gf_list_del_item(pidinst->pid->properties, pidinst->props);
+			gf_mx_v(pidinst->pid->filter->tasks_mx);
+			gf_props_del(pidinst->props);
+		}
+	}
+	pidinst->props = NULL;
+
+	gf_mx_p(filter->tasks_mx);
+	//detach pid - remove all packets in our pid instance and alos update filter pending_packets
+	count = gf_fq_count(pidinst->packets);
+	assert(!count || (count >= filter->pending_packets));
+	safe_int_sub(&filter->pending_packets, (s32) count);
+	gf_filter_pid_inst_reset(pidinst);
+	pidinst->pid = NULL;
+	gf_list_del_item(pid->destinations, pidinst);
+	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);
+	gf_mx_v(filter->tasks_mx);
+
+	if (!filter->detached_pid_inst) {
+		filter->detached_pid_inst = gf_list_new();
+	}
+	if (gf_list_find(filter->detached_pid_inst, pidinst)<0)
+		gf_list_add(filter->detached_pid_inst, pidinst);
+
+	//we are done, reset filter swap instance so that connection can take place
+	if (new_chain_input->swap_needs_init) {
+		new_chain_input->swap_pidinst_dst = NULL;
+		new_chain_input->swap_pidinst_src = NULL;
+		new_chain_input->swap_needs_init = GF_FALSE;
+	}
+	assert(new_chain_input->detach_pid_tasks_pending);
+	safe_int_dec(&new_chain_input->detach_pid_tasks_pending);
+}
+
+GF_EXPORT
+void gf_filter_pid_set_name(GF_FilterPid *pid, const char *name)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Attempt to assign name %s to input PID %s in filter %s - ignoring\n", name, pid->pid->name, pid->pid->filter->name));
+	} else if (name) {
+		if (pid->name && !strcmp(pid->name, name)) return;
+		if (pid->name) gf_free(pid->name);
+		pid->name = gf_strdup(name);
+	}
+}
+
+GF_EXPORT
+const char *gf_filter_pid_get_name(GF_FilterPid *pid)
+{
+	return pid->pid->name;
+}
+
+GF_EXPORT
+const char *gf_filter_pid_get_filter_name(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		return pid->pid->filter->name;
+	}
+	return pid->filter->name;
+}
+
+GF_EXPORT
+const char *gf_filter_pid_orig_src_args(GF_FilterPid *pid)
+{
+	u32 i;
+	const char *args;
+	//move to true source pid
+	pid = pid->pid;
+	args = pid->filter->src_args;
+	if (args && strstr(args, "src")) return args;
+	if (!pid->filter->num_input_pids) 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;
+	}
+	return args;
+}
+
+GF_EXPORT
+const char *gf_filter_pid_get_source_filter_name(GF_FilterPid *pid)
+{
+	GF_Filter *filter  = pid->pid->filter;
+	while (filter && filter->num_input_pids) {
+		GF_FilterPidInst *pidi = gf_list_get(filter->input_pids, 0);
+		filter = pidi->pid->filter;
+	}
+	if (!filter) return NULL;
+	return filter->name ? filter->name : filter->freg->name;
+}
+
+GF_EXPORT
+Bool gf_filter_pid_get_buffer_occupancy(GF_FilterPid *pid, u32 *max_slots, u32 *nb_pck, u32 *max_duration, u32 *duration)
+{
+	if (max_slots) *max_slots = pid->pid->max_buffer_unit;
+	if (max_duration) *max_duration = (u32) pid->pid->max_buffer_time;
+
+	if (pid->filter->session->in_final_flush) {
+		if (duration) *duration =  (u32) pid->pid->max_buffer_time;
+		if (nb_pck) *nb_pck = pid->pid->nb_buffer_unit;
+		return GF_FALSE;
+	}
+	if (nb_pck) *nb_pck = pid->pid->nb_buffer_unit;
+	if (duration) *duration = (u32) pid->pid->buffer_duration;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_filter_pid_set_udta(GF_FilterPid *pid, void *udta)
+{
+	if (PID_IS_INPUT(pid)) {
+		((GF_FilterPidInst *)pid)->udta = udta;
+	} else {
+		pid->udta = udta;
+	}
+}
+
+GF_EXPORT
+void *gf_filter_pid_get_udta(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		return ((GF_FilterPidInst *)pid)->udta;
+	} else {
+		return pid->udta;
+	}
+}
+
+static Bool filter_pid_check_fragment(GF_FilterPid *src_pid, char *frag_name, Bool *pid_excluded, Bool *needs_resolve, Bool *prop_not_found, char prop_dump_buffer[GF_PROP_DUMP_ARG_SIZE])
+{
+	char *psep;
+	u32 comp_type=0;
+	Bool is_neg = GF_FALSE;
+	const GF_PropertyEntry *pent;
+
+	*needs_resolve = GF_FALSE;
+	*prop_not_found = GF_FALSE;
+
+	if (frag_name[0] == src_pid->filter->session->sep_neg) {
+		frag_name++;
+		is_neg = GF_TRUE;
+	}
+	//special case for stream types filters
+	pent = gf_filter_pid_get_property_entry(src_pid, GF_PROP_PID_STREAM_TYPE);
+	if (pent) {
+		u32 matched=0;
+		u32 type=0;
+		if (!strnicmp(frag_name, "audio", 5)) {
+			matched=5;
+			type=GF_STREAM_AUDIO;
+		} else if (!strnicmp(frag_name, "video", 5)) {
+			matched=5;
+			type=GF_STREAM_VISUAL;
+		} else if (!strnicmp(frag_name, "scene", 5)) {
+			matched=5;
+			type=GF_STREAM_SCENE;
+		} else if (!strnicmp(frag_name, "font", 4)) {
+			matched=4;
+			type=GF_STREAM_FONT;
+		} else if (!strnicmp(frag_name, "text", 4)) {
+			matched=4;
+			type=GF_STREAM_TEXT;
+		}
+		if (matched && (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) {
+				*prop_not_found = GF_TRUE;
+				return GF_TRUE;
+			}
+			*pid_excluded = GF_TRUE;
+			return GF_FALSE;
+		}
+
+		if (matched) {
+			u32 idx=0;
+			u32 k, count_pid;
+			if (strlen(frag_name)==matched) return GF_TRUE;
+			idx = atoi(frag_name+matched);
+			count_pid = src_pid->filter->num_output_pids;
+			for (k=0; k<count_pid; k++) {
+				GF_FilterPid *p = gf_list_get(src_pid->filter->output_pids, k);
+				pent = gf_filter_pid_get_property_entry(src_pid, GF_PROP_PID_STREAM_TYPE);
+				if (pent && pent->prop.value.uint==type) {
+					idx--;
+					if (!idx) {
+						if (p==src_pid) return GF_TRUE;
+						break;
+					}
+				}
+			}
+			*pid_excluded = GF_TRUE;
+			return GF_FALSE;
+		}
+	}
+	//special case for codec type filters
+	if (!strcmp(frag_name, "raw")) {
+		pent = gf_filter_pid_get_property_entry(src_pid, GF_PROP_PID_CODECID);
+		if (pent) {
+			Bool is_eq = (pent->prop.value.uint==GF_CODECID_RAW) ? GF_TRUE : GF_FALSE;
+			if (is_neg) is_eq = !is_eq;
+			if (is_eq) return GF_TRUE;
+			*pid_excluded = GF_TRUE;
+			return GF_FALSE;
+		}
+		//not codec ID set for pid, assume match
+		return GF_TRUE;
+	}
+
+	//generic property addressing code(or builtin name)=val
+	psep = strchr(frag_name, src_pid->filter->session->sep_name);
+	if (!psep) {
+		psep = strchr(frag_name, '-');
+		if (psep) comp_type = 1;
+		else {
+			psep = strchr(frag_name, '+');
+			if (psep) comp_type = 2;
+		}
+	}
+
+	if (!psep) {
+		*prop_not_found = GF_TRUE;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("PID addressing %s not recognized, ignoring and assuming match\n", frag_name ));
+		return GF_TRUE;
+	}
+
+	Bool is_equal = GF_FALSE;
+	Bool use_not_equal = GF_FALSE;
+	GF_PropertyValue prop_val;
+	u32 p4cc = 0;
+	char c=psep[0];
+	psep[0] = 0;
+	pent=NULL;
+
+	//check for built-in property
+	p4cc = gf_props_get_id(frag_name);
+	if (!p4cc && !strcmp(frag_name, "PID") )
+		p4cc = GF_PROP_PID_ID;
+
+	if (!p4cc && (strlen(frag_name)==4))
+		p4cc = GF_4CC(frag_name[0], frag_name[1], frag_name[2], frag_name[3]);
+
+	if (p4cc) pent = gf_filter_pid_get_property_entry(src_pid, p4cc);
+	//not a built-in property, find prop by name
+	if (!pent) {
+		pent = gf_filter_pid_get_property_entry_str(src_pid, frag_name);
+	}
+
+	psep[0] = c;
+
+	//if the property is not found, we accept the connection
+	if (!pent) {
+		*prop_not_found = GF_TRUE;
+		return GF_TRUE;
+	}
+	//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);
+		return GF_FALSE;
+	}
+
+	//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;
+	}
+	//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);
+	} else {
+		prop_val = gf_props_parse_value(pent->prop.type, frag_name, psep+1, NULL, src_pid->filter->session->sep_list);
+	}
+	if (!comp_type) {
+		is_equal = gf_props_equal(&pent->prop, &prop_val);
+		if (use_not_equal) is_equal = !is_equal;
+	} else {
+		switch (prop_val.type) {
+		case GF_PROP_SINT:
+			if (pent->prop.value.sint<prop_val.value.sint) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_UINT:
+			if (pent->prop.value.uint<prop_val.value.uint) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_LSINT:
+			if (pent->prop.value.longsint<prop_val.value.longsint) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_LUINT:
+			if (pent->prop.value.longuint<prop_val.value.longuint) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_FLOAT:
+			if (pent->prop.value.fnumber<prop_val.value.fnumber) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_DOUBLE:
+			if (pent->prop.value.number<prop_val.value.number) is_equal = GF_TRUE;
+			if (comp_type==2) is_equal = !is_equal;
+			break;
+		case GF_PROP_FRACTION:
+			if (pent->prop.value.frac.num * prop_val.value.frac.den < pent->prop.value.frac.den * prop_val.value.frac.num) is_equal = GF_TRUE;
+			if (comp_type == 2) is_equal = !is_equal;
+			break;
+		case GF_PROP_FRACTION64:
+			if (pent->prop.value.lfrac.num * prop_val.value.lfrac.den < pent->prop.value.lfrac.den * prop_val.value.lfrac.num) is_equal = GF_TRUE;
+			if (comp_type == 2) is_equal = !is_equal;
+			break;
+		default:
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("PID addressing uses \'%s\' comparison on property %s which is not a number, defaulting to equal=true\n", (comp_type==1) ? "less than" : "more than", gf_props_4cc_get_name(p4cc) ));
+			is_equal = GF_TRUE;
+			break;
+		}
+	}
+	gf_props_reset_single(&prop_val);
+	if (!is_equal) *pid_excluded = GF_TRUE;
+
+	return is_equal;
+}
+
+static Bool filter_source_id_match(GF_FilterPid *src_pid, const char *id, GF_Filter *dst_filter, Bool *pid_excluded, Bool *needs_clone)
+{
+	const char *source_ids;
+	char *resolved_source_ids = NULL;
+	Bool result = GF_FALSE;
+	Bool first_pass = GF_TRUE;
+	Bool has_default_match;
+	Bool is_pid_excluded;
+	*pid_excluded = GF_FALSE;
+	if (!dst_filter->source_ids)
+		return GF_TRUE;
+	if (!id)
+		return GF_FALSE;
+
+sourceid_reassign:
+	source_ids = resolved_source_ids ? resolved_source_ids : dst_filter->source_ids;
+	if (!first_pass) {
+		assert(dst_filter->dynamic_source_ids);
+		source_ids = dst_filter->dynamic_source_ids;
+	}
+	has_default_match = GF_FALSE;
+	is_pid_excluded = GF_FALSE;
+
+	while (source_ids) {
+		Bool all_matched = GF_TRUE;
+		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;
+		if (sep) {
+			len = (u32) (sep - source_ids);
+		} else {
+			len = (u32) strlen(source_ids);
+			last=GF_TRUE;
+		}
+
+		frag_name = strchr(source_ids, src_pid->filter->session->sep_frag);
+		if (frag_name > source_ids + len) frag_name = NULL;
+		sublen = frag_name ? (u32) (frag_name - source_ids) : len;
+		//skip frag char
+		if (frag_name) frag_name++;
+
+		//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;
+		}
+		//no fragment or fragment match pid name, OK
+		if (!frag_name || !strcmp(src_pid->name, frag_name)) {
+			result = GF_TRUE;
+			break;
+		}
+		frag_clone = NULL;
+		if (!last) {
+			frag_clone = gf_strdup(frag_name);
+			char *nsep = strchr(frag_clone, src_pid->filter->session->sep_list);
+			assert(nsep);
+			nsep[0] = 0;
+			frag_name = frag_clone;
+		}
+
+		//for all listed fragment extensions
+		while (frag_name && all_matched) {
+			char prop_dump_buffer[GF_PROP_DUMP_ARG_SIZE];
+			Bool needs_resolve = GF_FALSE;
+			Bool prop_not_found = GF_FALSE;
+			Bool local_pid_excluded = GF_FALSE;
+			char *next_frag = strchr(frag_name, src_pid->filter->session->sep_frag);
+			if (next_frag) next_frag[0] = 0;
+
+			if (! filter_pid_check_fragment(src_pid, frag_name, &local_pid_excluded, &needs_resolve, &prop_not_found, prop_dump_buffer)) {
+				if (needs_resolve) {
+					if (first_pass) {
+						char *sid = resolved_source_ids ? resolved_source_ids : dst_filter->source_ids;
+						char *frag_sep = strchr(frag_name, dst_filter->session->sep_name);
+						assert(frag_sep);
+						if (next_frag) next_frag[0] = src_pid->filter->session->sep_frag;
+
+						char *new_source_ids = gf_malloc(sizeof(char) * (strlen(sid) + strlen(prop_dump_buffer)+1));
+						u32 clen = (u32) (1+frag_sep - sid);
+						strncpy(new_source_ids, sid, clen);
+						new_source_ids[clen]=0;
+						strcat(new_source_ids, prop_dump_buffer);
+						if (next_frag) strcat(new_source_ids, next_frag);
+
+						if (resolved_source_ids) gf_free(resolved_source_ids);
+						resolved_source_ids = new_source_ids;
+						if (frag_clone) gf_free(frag_clone);
+						goto sourceid_reassign;
+					}
+				}
+				else {
+					all_matched = GF_FALSE;
+					//remember we failed because PID was excluded by sourceID
+					if (local_pid_excluded)
+						is_pid_excluded = GF_TRUE;
+				}
+			} else {
+				//remember we succeed because PID has no matching property
+				if (!prop_not_found)
+					all_frags_not_found = GF_FALSE;
+			}
+
+			if (!next_frag) break;
+
+			next_frag[0] = src_pid->filter->session->sep_frag;
+			frag_name = next_frag+1;
+		}
+		if (frag_clone) gf_free(frag_clone);
+		if (all_matched) {
+			//exact match on one or more properties, don't look any further
+			if (!all_frags_not_found) {
+				result = GF_TRUE;
+				break;
+			}
+			//remember we had a default match, but don't set result yet and parse other SIDs
+			has_default_match = GF_TRUE;
+		}
+		*needs_clone = GF_FALSE;
+		if (!sep) break;
+		source_ids = sep+1;
+	}
+
+	if (!result) {
+		//we had a default match and pid was not excluded by any SIDs, consider we pass
+		if (has_default_match && !is_pid_excluded)
+			result = GF_TRUE;
+	}
+
+	if (!result) {
+		if (resolved_source_ids) gf_free(resolved_source_ids);
+		if (dst_filter->dynamic_source_ids && first_pass) {
+			first_pass = GF_FALSE;
+			goto sourceid_reassign;
+		}
+		*pid_excluded = is_pid_excluded;
+		return GF_FALSE;
+	}
+	if (resolved_source_ids) {
+		if (!dst_filter->dynamic_source_ids) {
+			dst_filter->dynamic_source_ids = dst_filter->source_ids;
+			dst_filter->source_ids = resolved_source_ids;
+		} else {
+			gf_free(dst_filter->source_ids);
+			dst_filter->source_ids = resolved_source_ids;
+		}
+	}
+	if (!first_pass) {
+		*needs_clone = GF_TRUE;
+	}
+	return GF_TRUE;
+}
+
+Bool filter_in_parent_chain(GF_Filter *parent, GF_Filter *filter)
+{
+	u32 i, count;
+	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 (filter_in_parent_chain(pid->pid->filter, filter)) return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+static Bool cap_code_match(u32 c1, u32 c2)
+{
+	if (c1==c2) return GF_TRUE;
+	/*we consider GF_PROP_PID_FILE_EXT and GF_PROP_PID_MIME are the same so that we check
+	if we have at least one match of file ext or mime in a given bundle*/
+	if ((c1==GF_PROP_PID_FILE_EXT) && (c2==GF_PROP_PID_MIME)) return GF_TRUE;
+	if ((c1==GF_PROP_PID_MIME) && (c2==GF_PROP_PID_FILE_EXT)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+Bool gf_filter_pid_caps_match(GF_FilterPid *src_pid_or_ipid, const GF_FilterRegister *freg, GF_Filter *filter_inst, u8 *priority, u32 *dst_bundle_idx, GF_Filter *dst_filter, s32 for_bundle_idx)
+{
+	u32 i=0;
+	u32 cur_bundle_start = 0;
+	u32 cap_bundle_idx = 0;
+	u32 nb_subcaps=0;
+	Bool skip_explicit_load = GF_FALSE;
+	Bool all_caps_matched = GF_TRUE;
+	Bool mime_matched = GF_FALSE;
+	Bool has_file_ext_cap = GF_FALSE;
+	Bool ext_not_trusted;
+	GF_FilterPid *src_pid = src_pid_or_ipid->pid;
+	const GF_FilterCapability *in_caps;
+	u32 nb_in_caps;
+
+	if (!freg) {
+		assert(dst_filter);
+		freg = dst_filter->freg;
+		skip_explicit_load = GF_TRUE;
+	}
+
+	in_caps = freg->caps;
+	nb_in_caps = freg->nb_caps;
+	if (filter_inst && (filter_inst->freg==freg)) {
+		skip_explicit_load = GF_TRUE;
+		if (filter_inst->forced_caps) {
+			in_caps = filter_inst->forced_caps;
+			nb_in_caps = filter_inst->nb_forced_caps;
+		}
+	}
+	ext_not_trusted = src_pid->ext_not_trusted;
+	if (ext_not_trusted) {
+		Bool has_mime_cap = GF_FALSE;
+
+		for (i=0; i<nb_in_caps; i++) {
+			const GF_FilterCapability *cap = &in_caps[i];
+			if (! (cap->flags & GF_CAPFLAG_INPUT) ) continue;
+			if (cap->code == GF_PROP_PID_MIME) {
+				has_mime_cap = GF_TRUE;
+				break;
+			}
+		}
+		if (!has_mime_cap) ext_not_trusted = GF_FALSE;
+	}
+
+	if (filter_inst && filter_inst->encoder_stream_type) {
+		const GF_PropertyValue *pid_st = gf_filter_pid_get_property_first(src_pid_or_ipid, GF_PROP_PID_STREAM_TYPE);
+		if (pid_st && (pid_st->value.uint != filter_inst->encoder_stream_type))
+			return GF_FALSE;
+	}
+
+	if (priority)
+		(*priority) = freg->priority;
+
+	if (dst_bundle_idx)
+		(*dst_bundle_idx) = 0;
+
+	//filters with no explicit input cap accept anything for now, this should be refined ...
+	if (!in_caps)
+		return GF_TRUE;
+
+	//check all input caps of dst filter
+	for (i=0; i<nb_in_caps; i++) {
+		const GF_PropertyValue *pid_cap=NULL;
+		const GF_FilterCapability *cap = &in_caps[i];
+
+		/*end of cap bundle*/
+		if (i && !(cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+			if (has_file_ext_cap && ext_not_trusted && !mime_matched)
+				all_caps_matched = GF_FALSE;
+
+			if (all_caps_matched) {
+				if (dst_bundle_idx)
+					(*dst_bundle_idx) = cap_bundle_idx;
+				return GF_TRUE;
+			}
+			all_caps_matched = GF_TRUE;
+			mime_matched = GF_FALSE;
+			has_file_ext_cap = GF_FALSE;
+			nb_subcaps=0;
+			cur_bundle_start = i;
+			cap_bundle_idx++;
+			if ((for_bundle_idx>=0) && (cap_bundle_idx > (u32) for_bundle_idx)) {
+				break;
+			}
+			continue;
+		}
+		if ((for_bundle_idx>=0) && (cap_bundle_idx < (u32) for_bundle_idx)) {
+			all_caps_matched = 0;
+			continue;
+		}
+
+		//not an input cap
+		if (! (cap->flags & GF_CAPFLAG_INPUT) ) {
+			if (!skip_explicit_load && (cap->flags & GF_CAPFLAG_LOADED_FILTER) ) {
+				all_caps_matched = 0;
+			}
+			continue;
+		}
+
+		nb_subcaps++;
+		//no match for this cap, go on until new one or end
+		if (!all_caps_matched) continue;
+
+		if (cap->code) {
+			pid_cap = gf_filter_pid_get_property_first(src_pid_or_ipid, cap->code);
+
+			//special case for file ext: the pid will likely have only one file extension defined, and the output as well
+			//we browse all caps of the filter owning the pid, looking for the original file extension property
+			if (pid_cap && (cap->code==GF_PROP_PID_FILE_EXT) ) {
+				u32 j;
+				for (j=0; j<src_pid->filter->freg->nb_caps; j++) {
+					const GF_FilterCapability *out_cap = &src_pid->filter->freg->caps[j];
+					if (!(out_cap->flags & GF_CAPFLAG_OUTPUT)) continue;
+					if (out_cap->code != GF_PROP_PID_FILE_EXT) continue;
+					if (! gf_props_equal(pid_cap, &out_cap->val)) continue;
+					pid_cap = &out_cap->val;
+					break;
+				}
+			}
+			/*if PID prop for this cap is not found and the cap is MIME (resp. file ext), fetch file_ext (resp MIME)
+			 so that we check if we have at least one match of file ext or mime in a given bundle*/
+			if (!pid_cap) {
+				if (cap->code==GF_PROP_PID_FILE_EXT)
+					pid_cap = gf_filter_pid_get_property_first(src_pid_or_ipid, GF_PROP_PID_MIME);
+				else if (cap->code==GF_PROP_PID_MIME)
+					pid_cap = gf_filter_pid_get_property_first(src_pid_or_ipid, GF_PROP_PID_FILE_EXT);
+			}
+		}
+
+		//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);
+
+		if (ext_not_trusted && (cap->code==GF_PROP_PID_FILE_EXT)) {
+			has_file_ext_cap = GF_TRUE;
+			continue;
+		}
+
+
+		//we found a property of that type and it is equal
+		if (pid_cap) {
+			u32 j;
+			Bool prop_excluded = GF_FALSE;
+			Bool prop_equal = GF_FALSE;
+
+			//this could be optimized by not checking several times the same cap
+			for (j=0; j<nb_in_caps; j++) {
+				const GF_FilterCapability *a_cap = &in_caps[j];
+
+				if ((j>cur_bundle_start) && ! (a_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+					break;
+				}
+				//not an input cap
+				if (! (a_cap->flags & GF_CAPFLAG_INPUT) ) continue;
+				//not a static and not in bundle
+				if (! (a_cap->flags & GF_CAPFLAG_STATIC)) {
+					if (j<cur_bundle_start)
+						continue;
+				}
+
+				if (cap->code) {
+					if (!cap_code_match(cap->code, a_cap->code) )
+						continue;
+				} else if (!cap->name || !a_cap->name || strcmp(cap->name, a_cap->name)) {
+					continue;
+				}
+				if (!skip_explicit_load && (a_cap->flags & GF_CAPFLAG_LOADED_FILTER) ) {
+					if (!dst_filter || (dst_filter != src_pid->filter->dst_filter)) {
+						prop_equal = GF_FALSE;
+						break;
+					}
+					if (dst_filter->freg != freg) {
+						prop_equal = GF_FALSE;
+						break;
+					}
+				}
+
+				if (!prop_equal) {
+					prop_equal = gf_props_equal(pid_cap, &a_cap->val);
+					//excluded cap: if value match, don't match this cap at all
+					if (a_cap->flags & GF_CAPFLAG_EXCLUDED) {
+						if (prop_equal) {
+							prop_equal = GF_FALSE;
+							prop_excluded = GF_FALSE;
+							break;
+						}
+						prop_excluded = GF_TRUE;
+					}
+					if (prop_equal) 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;
+		}
+		else if (! (cap->flags & (GF_CAPFLAG_EXCLUDED | GF_CAPFLAG_OPTIONAL) ) ) {
+			all_caps_matched=GF_FALSE;
+		}
+	}
+
+	if (has_file_ext_cap && ext_not_trusted && !mime_matched)
+		all_caps_matched = GF_FALSE;
+
+	if (nb_subcaps && all_caps_matched) {
+		if (dst_bundle_idx)
+			(*dst_bundle_idx) = cap_bundle_idx;
+		return GF_TRUE;
+	}
+
+	return GF_FALSE;
+}
+
+u32 gf_filter_caps_bundle_count(const GF_FilterCapability *caps, u32 nb_caps)
+{
+	u32 i, nb_bundles = 0, num_in_bundle=0;
+	for (i=0; i<nb_caps; i++) {
+		const GF_FilterCapability *cap = &caps[i];
+		if (! (cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+			if (num_in_bundle) nb_bundles++;
+			num_in_bundle=0;
+			continue;
+		}
+		num_in_bundle++;
+	}
+	if (num_in_bundle) nb_bundles++;
+	return nb_bundles;
+}
+
+static Bool gf_filter_has_in_out_caps(const GF_FilterCapability *caps, u32 nb_caps, Bool check_in)
+{
+	u32 i;
+	//check all input caps of dst filter, count bundles
+	for (i=0; i<nb_caps; i++) {
+		const GF_FilterCapability *a_cap = &caps[i];
+		if (check_in) {
+			if (a_cap->flags & GF_CAPFLAG_INPUT) {
+				return GF_TRUE;
+			}
+		} else {
+			if (a_cap->flags & GF_CAPFLAG_OUTPUT) {
+				return GF_TRUE;
+			}
+		}
+	}
+	return GF_FALSE;
+
+}
+Bool gf_filter_has_out_caps(const GF_FilterCapability *caps, u32 nb_caps)
+{
+	return gf_filter_has_in_out_caps(caps, nb_caps, GF_FALSE);
+}
+Bool gf_filter_has_in_caps(const GF_FilterCapability *caps, u32 nb_caps)
+{
+	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 i=0;
+	u32 cur_bundle_start = 0;
+	u32 cur_bundle_idx = 0;
+	u32 nb_matched=0;
+	u32 nb_out_caps=0;
+	u32 nb_in_bundles=0;
+	u32 bundle_score = 0;
+	u32 *bundles_in_ok = NULL;
+	u32 *bundles_cap_found = NULL;
+	u32 *bundles_in_scores = NULL;
+	//initialize caps matched to true for first cap bundle
+	Bool all_caps_matched = GF_TRUE;
+	const GF_FilterCapability *dst_caps = dst_reg->caps;
+	u32 nb_dst_caps = dst_reg->nb_caps;
+
+	if (dst_filter && dst_filter->freg==dst_reg && dst_filter->forced_caps) {
+		dst_caps = dst_filter->forced_caps;
+		nb_dst_caps = dst_filter->nb_forced_caps;
+	}
+
+	//check all input caps of dst filter, count bundles
+	if (! gf_filter_has_out_caps(src->caps, src->nb_caps)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no output caps, cannot match filter %s inputs\n", src->name, dst_reg->name));
+		return 0;
+	}
+
+	//check all input caps of dst filter, count bundles
+	nb_in_bundles = gf_filter_caps_bundle_count(dst_caps, nb_dst_caps);
+	if (!nb_in_bundles) {
+		if (dst_reg->configure_pid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps but pid configure possible, assuming possible connection\n", dst_reg->name));
+			return 1;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s has no caps and no pid configure, no possible connection\n", dst_reg->name));
+		return 0;
+	}
+	if (capstore->nb_allocs < nb_in_bundles) {
+		capstore->nb_allocs = nb_in_bundles;
+		capstore->bundles_in_ok = gf_realloc(capstore->bundles_in_ok, sizeof(u32) * nb_in_bundles);
+		capstore->bundles_cap_found = gf_realloc(capstore->bundles_cap_found, sizeof(u32) * nb_in_bundles);
+		capstore->bundles_in_scores = gf_realloc(capstore->bundles_in_scores,  sizeof(u32) * nb_in_bundles);
+	}
+	bundles_in_ok =	capstore->bundles_in_ok;
+	bundles_cap_found = capstore->bundles_cap_found;
+	bundles_in_scores = capstore->bundles_in_scores;
+
+	for (i=0; i<nb_in_bundles; i++) {
+		bundles_in_ok[i] = 1;
+		bundles_cap_found[i] = 0;
+		bundles_in_scores[i] = 0;
+	}
+
+	//check all output caps of src filter
+	for (i=0; i<src->nb_caps; i++) {
+		u32 j, k;
+		Bool already_tested = GF_FALSE;
+		const GF_FilterCapability *out_cap = &src->caps[i];
+
+		if (!(out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+			all_caps_matched = GF_TRUE;
+			cur_bundle_start = i+1;
+			cur_bundle_idx++;
+			if (src_bundle_idx < cur_bundle_idx)
+				break;
+
+			continue;
+		}
+
+		//not our selected output and not static cap
+		if ((src_bundle_idx != cur_bundle_idx) && ! (out_cap->flags & GF_CAPFLAG_STATIC) ) {
+			continue;
+		}
+
+		//not an output cap
+		if (!(out_cap->flags & GF_CAPFLAG_OUTPUT) ) continue;
+
+		//no match possible for this cap, wait until next cap start
+		if (!all_caps_matched) continue;
+
+		//check we didn't test a cap with same name/code before us
+		for (k=cur_bundle_start; k<i; k++) {
+			const GF_FilterCapability *an_out_cap = &src->caps[k];
+			if (! (an_out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+				break;
+			}
+			if (! (an_out_cap->flags & GF_CAPFLAG_OUTPUT) ) {
+				continue;
+			}
+			if (out_cap->code && (out_cap->code == an_out_cap->code) ) {
+				already_tested = GF_TRUE;
+				break;
+			}
+			if (out_cap->name && an_out_cap->name && !strcmp(out_cap->name, an_out_cap->name)) {
+				already_tested = GF_TRUE;
+				break;
+			}
+		}
+		if (already_tested) {
+			continue;
+		}
+		nb_out_caps++;
+
+		//set cap as OK in all bundles
+		for (k=0; k<nb_in_bundles; k++) {
+			bundles_cap_found[k] = 0;
+		}
+
+		//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++) {
+			u32 cur_dst_bundle=0;
+			Bool static_matched = GF_FALSE;
+			u32 nb_caps_tested = 0;
+			u32 cap_loaded_filter_only = 0;
+			Bool matched=GF_FALSE;
+			Bool exclude=GF_FALSE;
+			Bool prop_found=GF_FALSE;
+			const GF_FilterCapability *an_out_cap = &src->caps[k];
+			if (! (an_out_cap->flags & GF_CAPFLAG_IN_BUNDLE) ) {
+				break;
+			}
+			if (! (an_out_cap->flags & GF_CAPFLAG_OUTPUT) ) {
+				continue;
+			}
+			if (out_cap->code && !cap_code_match(out_cap->code, an_out_cap->code) )
+				continue;
+
+			if (out_cap->name && (!an_out_cap->name || strcmp(out_cap->name, an_out_cap->name)))
+				continue;
+
+			//not our selected output and not static cap
+			if ((src_bundle_idx != cur_bundle_idx) && ! (an_out_cap->flags & GF_CAPFLAG_STATIC) ) {
+				continue;
+			}
+
+			nb_matched = 0;
+			//check all input caps of dst filter, count ones that are matched
+			for (j=0; j<nb_dst_caps; j++) {
+				Bool prop_equal;
+				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;
+
+					//we found a prop, excluded but with != value hence acceptable, default matching to true
+					if (!matched && prop_found) matched = GF_TRUE;
+
+					//match, flag this bundle as ok
+					if (matched) {
+						if (!bundles_cap_found[cur_dst_bundle])
+							bundles_cap_found[cur_dst_bundle] = cap_loaded_filter_only ? 2 : 1;
+
+						nb_matched++;
+					}
+
+					matched = static_matched ? GF_TRUE : GF_FALSE;
+					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))
+						break;
+
+					continue;
+				}
+				//not an input cap
+				if (!(in_cap->flags & GF_CAPFLAG_INPUT) )
+					continue;
+
+				//optional cap, ignore
+				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))
+					continue;
+
+				//prop was excluded, cannot match in bundle
+				if (exclude) continue;
+				//prop was matched, no need to check other caps in the current bundle
+				if (matched) continue;
+
+				if (out_cap->code && !cap_code_match(out_cap->code, in_cap->code) )
+					continue;
+
+				if (out_cap->name && (!in_cap->name || strcmp(out_cap->name, in_cap->name)))
+					continue;
+
+				nb_caps_tested++;
+				//we found a property of that type , check if equal equal
+				prop_equal = gf_props_equal(&in_cap->val, &an_out_cap->val);
+				if ((in_cap->flags & GF_CAPFLAG_EXCLUDED) && !(an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+					//prop type matched, output includes it and input excludes it: no match, don't look any further
+					if (prop_equal) {
+						matched = GF_FALSE;
+						exclude = GF_TRUE;
+						prop_found = GF_FALSE;
+					} else {
+						//remember we found a prop of same type but excluded value
+						// we will match unless we match an excluded value
+						prop_found = GF_TRUE;
+					}
+				} else if (!(in_cap->flags & GF_CAPFLAG_EXCLUDED) && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+					//prop type matched, input includes it and output excludes it: no match, don't look any further
+					if (prop_equal) {
+						matched = GF_FALSE;
+						exclude = GF_TRUE;
+						prop_found = GF_FALSE;
+					} else {
+						//remember we found a prop of same type but excluded value
+						//we will match unless we match an excluded value
+						prop_found = GF_TRUE;
+					}
+				} else if (prop_equal) {
+					matched = GF_TRUE;
+//					if (an_out_cap->flags & GF_CAPFLAG_STATIC)
+//						static_matched = GF_TRUE;
+				} else if ((in_cap->flags & GF_CAPFLAG_EXCLUDED) && (an_out_cap->flags & GF_CAPFLAG_EXCLUDED) ) {
+					//prop type matched, input excludes it and output excludes it and no match, remmeber we found the prop type
+					prop_found = GF_TRUE;
+				}
+
+				if (prop_found && (in_cap->flags & GF_CAPFLAG_LOADED_FILTER))
+					cap_loaded_filter_only = 1;
+			}
+			if (nb_caps_tested) {
+				//we found a prop, excluded but with != value hence acceptable, default matching to true
+				if (!matched && prop_found) matched = GF_TRUE;
+				//not match, flag this bundle as not ok
+				if (matched) {
+					if (!bundles_cap_found[cur_dst_bundle])
+						bundles_cap_found[cur_dst_bundle] = cap_loaded_filter_only ? 2 : 1;
+
+					nb_matched++;
+				}
+			} 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) ) {
+				if (!bundles_cap_found[cur_dst_bundle])
+					bundles_cap_found[cur_dst_bundle] = cap_loaded_filter_only ? 2 : 1;
+
+				nb_matched++;
+			}
+		}
+		//merge bundle cap
+		nb_matched=0;
+		for (k=0; k<nb_in_bundles; k++) {
+			if (!bundles_cap_found[k])
+				bundles_in_ok[k] = 0;
+			else {
+				nb_matched += 1;
+				//we matched this property, keep score for the bundle
+				bundles_in_scores[k] ++;
+				//mark if connection is only valid for loaded inputs
+				if (bundles_cap_found[k]==2)
+				 	bundles_in_ok[k] |= 1<<1;
+				//mark if connection is only valid for loaded outputs
+				if (out_cap->flags & GF_CAPFLAG_LOADED_FILTER)
+					bundles_in_ok[k] |= 1<<2;
+			}
+		}
+		//not matched and not excluded, skip until next bundle
+		if (!nb_matched && !(out_cap->flags & GF_CAPFLAG_EXCLUDED)) {
+			all_caps_matched = GF_FALSE;
+		}
+	}
+
+	//get bundle with highest score
+	bundle_score = 0;
+	nb_matched = 0;
+
+	for (i=0; i<nb_in_bundles; i++) {
+		if (bundles_in_ok[i]) {
+			nb_matched++;
+			if (bundle_score < bundles_in_scores[i]) {
+				*dst_bundle_idx = i;
+				bundle_score = bundles_in_scores[i];
+				if (loaded_filter_flags) {
+					*loaded_filter_flags = (bundles_in_ok[i]>>1);
+				}
+			}
+			if ((for_dst_bundle>=0) && (for_dst_bundle==i)) {
+				*dst_bundle_idx = i;
+				if (loaded_filter_flags) {
+					*loaded_filter_flags = (bundles_in_ok[i]>>1);
+				}
+				return bundles_in_scores[i];
+			}
+		}
+	}
+	if (!bundle_score) {
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s outputs cap bundle %d do not match filter %s inputs\n", src->name, src_bundle_idx, dst_reg->name));
+	} else {
+//		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s outputs cap bundle %d matches filter %s inputs caps bundle %d (%d total bundle matches, bundle matched %d/%d caps)\n", src->name, src_bundle_idx, dst_reg->name, *dst_bundle_idx, nb_matched, bundle_score, nb_out_caps));
+	}
+	return bundle_score;
+}
+
+GF_EXPORT
+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;
+	return res;
+}
+
+
+static void concat_reg(GF_FilterSession *sess, char prefRegister[1001], const char *reg_key, const char *args)
+{
+	u32 len;
+	char *forced_reg, *sep;
+	if (!args) return;
+	forced_reg = strstr(args, reg_key);
+	if (!forced_reg) return;
+	forced_reg += 6;
+	sep = strchr(forced_reg, sess->sep_args);
+	len = sep ? (u32) (sep-forced_reg) : (u32) strlen(forced_reg);
+	if (len+2+strlen(prefRegister)>1000) {
+		return;
+	}
+	if (prefRegister[0]) {
+		char szSepChar[2];
+		szSepChar[0] = sess->sep_args;
+		szSepChar[1] = 0;
+		strcat(prefRegister, szSepChar);
+	}
+	strncat(prefRegister, forced_reg, len);
+}
+
+static Bool gf_filter_out_caps_solved_by_connection(const GF_FilterRegister *freg, u32 bundle_idx)
+{
+	u32 i, k, cur_bundle_idx = 0;
+    u32 nb_out_caps=0;
+	for (i=0; i<freg->nb_caps; i++) {
+		u32 nb_caps = 0;
+        u32 cap_bundle_idx = 0;
+		const GF_FilterCapability *cap = &freg->caps[i];
+		if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+			cur_bundle_idx++;
+			if (cur_bundle_idx>bundle_idx) return GF_FALSE;
+            continue;
+		}
+		if (!(cap->flags & GF_CAPFLAG_STATIC) && (bundle_idx>cur_bundle_idx)) continue;
+		if (!(cap->flags & GF_CAPFLAG_OUTPUT)) continue;
+
+		if (cap->flags & GF_CAPFLAG_OPTIONAL) continue;
+
+		for (k=0; k<freg->nb_caps; k++) {
+			const GF_FilterCapability *acap = &freg->caps[k];
+            if (!(acap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+                cap_bundle_idx++;
+                continue;
+            }
+			if (!(acap->flags & GF_CAPFLAG_OUTPUT)) continue;
+			if (acap->flags & GF_CAPFLAG_OPTIONAL) continue;
+			if (!(acap->flags & GF_CAPFLAG_STATIC) && (cap_bundle_idx!=bundle_idx) ) continue;
+
+			if (cap->code && (acap->code==cap->code)) {
+				nb_caps++;
+			} else if (cap->name && acap->name && !strcmp(cap->name, acap->name)) {
+				nb_caps++;
+			}
+			//if more than one cap with same code in same bundle, consider the filter is undecided
+			if (nb_caps>1)
+				return GF_TRUE;
+		}
+        if (nb_caps && !(cap->flags & GF_CAPFLAG_EXCLUDED))
+            nb_out_caps++;
+	}
+	if (!nb_out_caps)
+		return GF_TRUE;
+	return GF_FALSE;
+}
+
+static s32 gf_filter_reg_get_bundle_stream_type(const GF_FilterRegister *freg, u32 cap_idx, Bool for_output)
+{
+	u32 i, cur_bundle, stype=0, nb_stype=0;
+
+	cur_bundle = 0;
+	for (i=0; i<freg->nb_caps; i++) {
+		u32 cap_stype=0;
+		const GF_FilterCapability *cap = &freg->caps[i];
+		if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+			cur_bundle++;
+			continue;
+		}
+		if (for_output) {
+			if (!(cap->flags & GF_CAPFLAG_OUTPUT)) continue;
+		} else {
+			if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
+		}
+		if ((cur_bundle != cap_idx) && !(cap->flags & GF_CAPFLAG_STATIC) ) continue;
+		//output type is file or same media type, allow looking for filter chains
+		if (cap->flags & GF_CAPFLAG_EXCLUDED) continue;
+
+		if (cap->code == GF_PROP_PID_STREAM_TYPE)
+			cap_stype = cap->val.value.uint;
+		else if ((cap->code == GF_PROP_PID_MIME) || (cap->code == GF_PROP_PID_FILE_EXT) )
+			cap_stype = GF_STREAM_FILE;
+
+		if (!cap_stype) continue;
+
+		if (stype != cap_stype) {
+			stype = cap_stype;
+			nb_stype++;
+		}
+	}
+	if (nb_stype==1) return (s32) stype;
+	if (nb_stype) return -1;
+	return 0;
+}
+
+/*recursively enable edges of the graph.
+	returns 0 if subgraph shall be disabled (will marke edge at the root of the subgraph disabled)
+	returns 1 if subgraph shall be enabled (will marke edge at the root of the subgraph enabled)
+	returns 2 if no decision can be taken because the subgraph is too deep. We don't mark the parent edge as disabled because the same subgraph/edge can be used at other places in a shorter path
+*/
+static u32 gf_filter_pid_enable_edges(GF_FilterSession *fsess, GF_FilterRegDesc *reg_desc, u32 src_cap_idx, const GF_FilterRegister *src_freg, u32 rlevel, s32 dst_stream_type, GF_FilterRegDesc *parent_desc, GF_FilterPid *pid, u32 pid_stream_type)
+{
+	u32 i=0;
+	Bool enable_graph = GF_FALSE;
+	Bool aborted_graph_too_deep = GF_FALSE;
+
+	//we found the source reg we want to connect to!
+	if (src_freg == reg_desc->freg) {
+		return 1;
+	}
+	//the subgraph is too deep, abort marking edges but don't decide
+	if (rlevel > fsess->max_resolve_chain_len) {
+		return 2;
+	}
+	//we don't allow loops in dynamic chain resolution, so consider the parent edge invalid
+	if (reg_desc->in_edges_enabling)
+		return 0;
+
+	/*if dst type is FILE, reg_desc is a muxer or the loaded destination (a demuxer or a file)
+	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
+	*/
+	if ((rlevel>1) && (dst_stream_type==GF_STREAM_FILE))
+		return 0;
+
+	reg_desc->in_edges_enabling = 1;
+
+	for (i=0; i<reg_desc->nb_edges; i++) {
+		u32 res;
+		s32 source_stream_type;
+		GF_FilterRegEdge *edge = &reg_desc->edges[i];
+		//this edge is not for our target source cap bundle
+		if (edge->dst_cap_idx != src_cap_idx) continue;
+
+		//edge is already disabled (the subgraph doesn't match our source), don't test it
+		if (edge->status == EDGE_STATUS_DISABLED)
+			continue;
+
+		//if source is not edge origin and edge is only valid for explicitly loaded filters, disable edge
+		if (edge->loaded_filter_only && (edge->src_reg->freg != pid->filter->freg) ) {
+			edge->status = EDGE_STATUS_DISABLED;
+			edge->disabled_depth = rlevel+1;
+			continue;
+		}
+
+		//edge is already enabled (the subgraph matches our source), don't test it but remember to indicate the graph is valid
+		if (edge->status == EDGE_STATUS_ENABLED) {
+			enable_graph = GF_TRUE;
+			continue;
+		}
+
+		//candidate edge, check stream type
+		source_stream_type = edge->src_stream_type;
+
+		if (pid->filter->freg == edge->src_reg->freg)
+			source_stream_type = pid_stream_type;
+
+		//source edge cap indicates multiple stream types (demuxer/encoder/decoder dundle)
+		if (source_stream_type<0) {
+			//if destination type is known (>=0 and NOT file, inherit it
+			//otherwise, we we can't filter out yet
+			if ((dst_stream_type>0) && (dst_stream_type != GF_STREAM_FILE))
+				source_stream_type = dst_stream_type;
+		}
+		//inherit source type if not specified
+		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)
+			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)
+			dst_stream_type = source_stream_type;
+
+		//if stream types are know (>0) and not source files, do not mark the edges if they mismatch
+		//moving from non-file type A to non-file type B requires an explicit filter
+		if ((dst_stream_type>0) && (source_stream_type>0) && (source_stream_type != GF_STREAM_FILE) && (dst_stream_type != GF_STREAM_FILE) && (source_stream_type != dst_stream_type)) {
+
+			//exception: we allow text|scene|od ->video for dynamic compositor
+			if (!(reg_desc->freg->flags & GF_FS_REG_EXPLICIT_ONLY) && (dst_stream_type==GF_STREAM_VISUAL)
+				&& ((source_stream_type==GF_STREAM_TEXT) || (source_stream_type==GF_STREAM_SCENE) || (source_stream_type==GF_STREAM_OD) )
+			) {
+
+			} else {
+				edge->status = EDGE_STATUS_DISABLED;
+				edge->disabled_depth = rlevel+1;
+				continue;
+			}
+		}
+
+		res = gf_filter_pid_enable_edges(fsess, edge->src_reg, edge->src_cap_idx, src_freg, rlevel+1, source_stream_type, reg_desc, pid, pid_stream_type);
+		//if subgraph matches our source reg, mark the edge towards this subgraph as enabled
+		if (res==1) {
+			edge->status = EDGE_STATUS_ENABLED;
+			enable_graph = GF_TRUE;
+		}
+		//if sub-graph below is too deep, don't mark the edge since we might need to resolve it again with a shorter subgraph
+		else if (res==2) {
+			aborted_graph_too_deep = GF_TRUE;
+		}
+		//otherwise the subgraph doesn't match our source reg, mark as disaled and never test again
+		else if (res==0) {
+			edge->status = EDGE_STATUS_DISABLED;
+			edge->disabled_depth = rlevel+1;
+		}
+	}
+	reg_desc->in_edges_enabling = 0;
+	//we had enabled edges, the subgraph is valid
+	if (enable_graph) return 1;
+	//we aborted because too deep, indicate it to the caller so that the edge is not disabled
+	if (aborted_graph_too_deep) return 2;
+	//disable subgraph
+	return 0;
+}
+
+
+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)
+{
+	u32 nb_dst_caps, nb_regs, i, nb_caps;
+	Bool freg_has_output;
+
+	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)) {
+		caps = dst_filter->forced_caps;
+		nb_caps = dst_filter->nb_forced_caps;
+	}
+
+	freg_has_output = gf_filter_has_out_caps(caps, nb_caps);
+
+	GF_SAFEALLOC(reg_desc, GF_FilterRegDesc);
+	if (!reg_desc) return NULL;
+
+	reg_desc->freg = freg;
+
+	nb_dst_caps = gf_filter_caps_bundle_count(caps, nb_caps);
+
+
+	//we are building a register descriptor acting as destination, ignore any output caps
+	if (src_pid || dst_filter) freg_has_output = GF_FALSE;
+
+	//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);
+
+					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++;
+					}
+				}
+			}
+		}
+	}
+	return reg_desc;
+}
+
+void gf_filter_sess_build_graph(GF_FilterSession *fsess, const GF_FilterRegister *for_reg)
+{
+	u32 i, count;
+	GF_CapsBundleStore capstore;
+	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
+
+	if (!fsess->links) fsess->links = gf_list_new();
+
+	if (for_reg) {
+		GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, for_reg, &capstore, NULL, NULL);
+		if (!freg_desc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to build graph entry for filter %s\n", for_reg->name));
+		} else {
+			gf_list_add(fsess->links, freg_desc);
+		}
+	} else {
+#ifndef GPAC_DISABLE_LOG
+		u64 start_time = gf_sys_clock_high_res();
+#endif
+		count = gf_list_count(fsess->registry);
+		for (i=0; i<count; i++) {
+			const GF_FilterRegister *freg = gf_list_get(fsess->registry, i);
+			GF_FilterRegDesc *freg_desc = gf_filter_reg_build_graph(fsess->links, freg, &capstore, NULL, NULL);
+			if (!freg_desc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to build graph entry for filter %s\n", freg->name));
+			} else {
+				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));
+
+		if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+			u32 j;
+			count = gf_list_count(fsess->links);
+			for (i=0; i<count; i++) {
+				GF_FilterRegDesc *freg_desc = gf_list_get(fsess->links, i);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s sources:", freg_desc->freg->name));
+				for (j=0; j<freg_desc->nb_edges; j++ ) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s(%d,%d->%d)", freg_desc->edges[j].src_reg->freg->name, freg_desc->edges[j].weight, freg_desc->edges[j].src_cap_idx, freg_desc->edges[j].dst_cap_idx));
+				}
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\n"));
+			}
+		}
+	}
+	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
+	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
+	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+}
+
+void gf_filter_sess_reset_graph(GF_FilterSession *fsess, const GF_FilterRegister *freg)
+{
+	gf_mx_p(fsess->links_mx);
+	//explicit registry removal and not destroying the session
+	if (freg && fsess->filters) {
+		s32 reg_idx=-1;
+		u32 i, count = gf_list_count(fsess->links);
+		for (i=0; i<count; i++) {
+			u32 j;
+			GF_FilterRegDesc *rdesc = gf_list_get(fsess->links, i);
+			if (rdesc->freg == freg) {
+				reg_idx = i;
+				continue;
+			}
+			for (j=0; j<rdesc->nb_edges; j++) {
+				if (rdesc->edges[j].src_reg->freg == freg) {
+					if (rdesc->nb_edges > j + 1) {
+						memmove(&rdesc->edges[j], &rdesc->edges[j+1], sizeof (GF_FilterRegEdge) * (rdesc->nb_edges - j - 1));
+					}
+					j--;
+					rdesc->nb_edges--;
+				}
+			}
+		}
+		if (reg_idx>=0) {
+			GF_FilterRegDesc *rdesc = gf_list_get(fsess->links, reg_idx);
+			gf_list_rem(fsess->links, reg_idx);
+			gf_free(rdesc->edges);
+			gf_free(rdesc);
+		}
+	} else {
+		while (gf_list_count(fsess->links)) {
+			GF_FilterRegDesc *rdesc = gf_list_pop_back(fsess->links);
+			gf_free(rdesc->edges);
+			gf_free(rdesc);
+		}
+	}
+	gf_mx_v(fsess->links_mx);
+}
+
+#ifndef GPAC_DISABLE_LOG
+void dump_dijstra_edges(Bool is_before, GF_FilterRegDesc *reg_dst, GF_List *dijkstra_nodes)
+{
+	u32 i, count;
+	if (! gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG))
+		return;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Dijstra edges %s edge solving\n", is_before ? "before" : "after"));
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s sources: ", reg_dst->freg->name));
+	for (i=0; i<reg_dst->nb_edges; i++) {
+		GF_FilterRegEdge *edge = &reg_dst->edges[i];
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s(%d(%d),%d,%d->%d)", edge->src_reg->freg->name, edge->status, edge->disabled_depth, edge->weight, edge->src_cap_idx, edge->dst_cap_idx));
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\n"));
+
+	count = gf_list_count(dijkstra_nodes);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_FilterRegDesc *rdesc = gf_list_get(dijkstra_nodes, i);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s sources: ", rdesc->freg->name));
+		for (j=0; j<rdesc->nb_edges; j++) {
+			GF_FilterRegEdge *edge = &rdesc->edges[j];
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s(%d(%d),%d,%d->%d)", edge->src_reg->freg->name, edge->status, edge->disabled_depth, edge->weight, edge->src_cap_idx, edge->dst_cap_idx));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\n"));
+	}
+}
+#endif
+
+static void gf_filter_pid_resolve_link_dijkstra(GF_FilterPid *pid, GF_Filter *dst, const char *prefRegister, Bool reconfigurable_only, GF_List *out_reg_chain)
+{
+	GF_FilterRegDesc *reg_dst, *result;
+	GF_List *dijkstra_nodes;
+	GF_FilterSession *fsess = pid->filter->session;
+	//build all edges
+	u32 i, dijsktra_node_count, dijsktra_edge_count, count;
+	GF_CapsBundleStore capstore;
+	Bool first;
+	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;
+	if (!fsess->links || ! gf_list_count( fsess->links))
+	 	gf_filter_sess_build_graph(fsess, NULL);
+
+	dijkstra_nodes = gf_list_new();
+
+	result = NULL;
+
+	pid_stream_type = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) pid_stream_type = p->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;
+		GF_FilterRegDesc *reg_desc = gf_list_get(fsess->links, i);
+		const GF_FilterRegister *freg = reg_desc->freg;
+
+		//reset state, except for edges which are reseted after each dijkstra resolution
+		reg_desc->destination = NULL;
+		reg_desc->cap_idx = 0;
+		reg_desc->in_edges_enabling = 0;
+		//set node distance and priority to infinity, whether we are in the final dijsktra set or not
+		reg_desc->dist = -1;
+		reg_desc->priority = 0xFF;
+
+		//remember our source descriptor - it may be absent of the final node set in case we want reconfigurable only filters
+		//and the source is not reconfigurable
+		if (freg == pid->filter->freg)
+			result = reg_desc;
+
+		//don't add source filters except if PID is from source
+		if (!freg->configure_pid && (freg!=pid->filter->freg)) {
+			assert(freg != dst->freg);
+			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) ) {
+			assert(freg != dst->freg);
+			disable_filter = GF_TRUE;
+		}
+		//no output caps, cannot add
+		else if ((freg != dst->freg) && !gf_filter_has_out_caps(freg->caps, freg->nb_caps)) {
+			disable_filter = GF_TRUE;
+		}
+		//we only want reconfigurable output filters
+		else if (reconfigurable_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);
+			if (!reconfigurable_only) {
+				assert(freg != pid->filter->freg);
+			}
+			disable_filter = GF_TRUE;
+		}
+		//blacklisted adaptation filter
+		else if (pid->adapters_blacklist && (gf_list_find(pid->adapters_blacklist, (void *) freg)>=0)) {
+			assert(freg != dst->freg);
+			disable_filter = GF_TRUE;
+		}
+
+		//reset edge status
+		for (j=0; j<reg_desc->nb_edges; j++) {
+			GF_FilterRegEdge *edge = &reg_desc->edges[j];
+
+			edge->disabled_depth = 0;
+			if (disable_filter) {
+				edge->status = EDGE_STATUS_DISABLED;
+				continue;
+			}
+			edge->status = EDGE_STATUS_NONE;
+
+			//connection from source, disable edge if pid caps mismatch
+			if (edge->src_reg->freg == pid->filter->freg) {
+				u8 priority=0;
+				u32 dst_bundle_idx;
+				//check path weight for the given dst cap - we MUST give the target cap otherwise we might get a default match to another cap
+				path_weight = gf_filter_pid_caps_match(pid, freg, NULL, &priority, &dst_bundle_idx, pid->filter->dst_filter, edge->dst_cap_idx);
+				if (!path_weight) {
+					edge->status = EDGE_STATUS_DISABLED;
+					continue;
+				}
+			}
+
+			//if source is not edge origin and edge is only valid for explicitly loaded filters, disable edge
+			if ((edge->loaded_filter_only & EDGE_LOADED_SOURCE_ONLY) && (edge->src_reg->freg != pid->filter->freg) ) {
+				edge->status = EDGE_STATUS_DISABLED;
+				continue;
+			}
+
+			if ((u32) edge->weight + 1 > max_weight)
+				max_weight = (u32) edge->weight + 1;
+		}
+		//not in set
+		if (disable_filter)
+			continue;
+
+
+		//do not add destination filter
+		if (dst->freg == reg_desc->freg) {
+			reg_desc->dist = 0;
+			reg_desc->priority = 0;
+		} else {
+			gf_list_add(dijkstra_nodes, reg_desc);
+		}
+	}
+	//create a new node for the destination based on elligible filters in the graph
+	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
+	reg_dst = gf_filter_reg_build_graph(dijkstra_nodes, dst->freg, &capstore, pid, dst);
+	reg_dst->dist = 0;
+	reg_dst->priority = 0;
+	reg_dst->in_edges_enabling = 0;
+
+	//enable edges of destination, potentially disabling edges from source filters to dest
+	for (i=0; i<reg_dst->nb_edges; i++) {
+		GF_FilterRegEdge *edge = &reg_dst->edges[i];
+		edge->status = EDGE_STATUS_NONE;
+
+		//connection from source, disable edge if pid caps mismatch
+		if (edge->src_reg->freg == pid->filter->freg) {
+			u8 priority=0;
+			u32 dst_bundle_idx;
+			path_weight = gf_filter_pid_caps_match(pid, dst->freg, dst, &priority, &dst_bundle_idx, pid->filter->dst_filter, -1);
+			if (!path_weight) {
+				edge->status = EDGE_STATUS_DISABLED;
+				continue;
+			}
+			if (dst_bundle_idx != edge->dst_cap_idx) {
+				edge->status = EDGE_STATUS_DISABLED;
+				continue;
+			}
+		}
+		//the edge source filter is not loaded, disable edges marked for loaded filter only
+		if ( (edge->loaded_filter_only & EDGE_LOADED_SOURCE_ONLY) && (edge->src_reg->freg != pid->filter->freg) ) {
+			edge->status = EDGE_STATUS_DISABLED;
+			continue;
+		}
+		//we are relinking to a dynamically loaded filter, only accept edges connecting to the same bundle as when
+		//the initial resolution was done, unless the edge is marked as loaded destination filter only in which case
+		//we accept connection
+		if ((dst->bundle_idx_at_resolution>=0)
+			&& !(edge->loaded_filter_only & EDGE_LOADED_DEST_ONLY)
+			&& (edge->dst_cap_idx !=dst->bundle_idx_at_resolution)
+		) {
+			edge->status = EDGE_STATUS_DISABLED;
+			continue;
+		}
+
+		if ((u32) edge->weight + 1 > max_weight)
+			max_weight = edge->weight + 1;
+		//enable edge and propagate down the graph
+		edge->status = EDGE_STATUS_ENABLED;
+
+		gf_filter_pid_enable_edges(fsess, edge->src_reg, edge->src_cap_idx, pid->filter->freg, 1, edge->src_stream_type, reg_dst, pid, pid_stream_type);
+	}
+
+	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
+	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
+	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+
+#ifndef GPAC_DISABLE_LOG
+	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+		dump_dijstra_edges(GF_FALSE, reg_dst, dijkstra_nodes);
+	}
+#endif
+
+	//remove all filters not used for this resolution (no enabled edges), except source one
+	count = gf_list_count(dijkstra_nodes);
+	for (i=0; i<count; i++) {
+		u32 j, nb_edges;
+		GF_FilterRegDesc *rdesc = gf_list_get(dijkstra_nodes, i);
+		if (rdesc->freg == pid->filter->freg) continue;
+
+		nb_edges = 0;
+		for (j=0; j<rdesc->nb_edges; j++) {
+			GF_FilterRegEdge *edge = &rdesc->edges[j];
+			if (edge->status == EDGE_STATUS_ENABLED) {
+				nb_edges++;
+				break;
+			}
+		}
+
+		if (!nb_edges) {
+			gf_list_rem(dijkstra_nodes, i);
+			i--;
+			count--;
+		}
+	}
+#ifndef GPAC_DISABLE_LOG
+	if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filters in dijkstra set:"));
+		count = gf_list_count(dijkstra_nodes);
+		for (i=0; i<count; i++) {
+			GF_FilterRegDesc *rdesc = gf_list_get(dijkstra_nodes, i);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, (" %s", rdesc->freg->name));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\n"));
+	}
+#endif
+
+	sort_time_us = gf_sys_clock_high_res();
+
+
+	dijsktra_edge_count = 0;
+	dijsktra_node_count = gf_list_count(dijkstra_nodes)+1;
+	first = GF_TRUE;
+	//OK we have the weighted graph, perform a dijkstra on the graph - we assign by weight, and if same weight we check the priority
+	while (1) {
+		GF_FilterRegDesc *current_node = NULL;
+		u32 reg_idx = -1;
+		u32 min_dist = -1;
+
+		count = gf_list_count(dijkstra_nodes);
+		if (!count) break;
+
+		if (first) {
+			current_node = reg_dst;
+		} else {
+			//pick up shortest distance
+			for (i=0; i<count; i++) {
+				GF_FilterRegDesc *reg_desc = gf_list_get(dijkstra_nodes, i);
+				if (reg_desc->dist < min_dist) {
+					min_dist = reg_desc->dist;
+					current_node = reg_desc;
+					reg_idx = i;
+				}
+			}
+			//remove current
+			if (!current_node)
+				break;
+			gf_list_rem(dijkstra_nodes, reg_idx);
+		}
+
+		if (current_node->freg == pid->filter->freg) {
+			result = current_node;
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filters] Dijkstra: testing filter %s\n", current_node->freg->name));
+
+		//compute distances
+		for (i=0; i<current_node->nb_edges; i++) {
+			u8 priority=0;
+			GF_FilterRegEdge *redge = &current_node->edges[i];
+			u32 dist;
+			Bool do_switch = GF_FALSE;
+			dijsktra_edge_count++;
+
+			if (redge->status != EDGE_STATUS_ENABLED)
+				continue;
+
+			dist = current_node->dist + 1;//(max_weight - redge->weight);
+			if (current_node->freg->flags & GF_FS_REG_HIDE_WEIGHT) {
+				dist = current_node->dist;
+			}
+
+			priority = redge->priority;
+			if (redge->src_reg->freg == pid->filter->freg) {
+				s32 dst_bundle_idx;
+				if (gf_filter_pid_caps_match(pid, current_node->freg, NULL, &priority, &dst_bundle_idx, dst, redge->dst_cap_idx)) {
+
+				} else {
+					continue;
+				}
+			}
+
+			if (dist < redge->src_reg->dist) do_switch = GF_TRUE;
+			else if (dist == redge->src_reg->dist) {
+				if (prefRegister[0] && (redge->src_reg->destination != current_node) && strstr(prefRegister, current_node->freg->name)) {
+					do_switch = GF_TRUE;
+					priority = 0;
+				} else if ( (dist == redge->src_reg->dist) && (priority < redge->src_reg->priority) )
+					do_switch = GF_TRUE;
+			}
+
+			if (do_switch) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filters] Dijkstra: assign filter %s distance %d destination to %s in cap %d out cap %d priority %d (previous destination %s distance %d priority %d)\n", redge->src_reg->freg->name, dist, current_node->freg->name, redge->src_cap_idx, redge->dst_cap_idx, redge->priority, redge->src_reg->destination ? redge->src_reg->destination->freg->name : "none", redge->src_reg->dist, redge->src_reg->priority ));
+				redge->src_reg->dist = dist;
+				redge->src_reg->priority = priority;
+				redge->src_reg->destination = current_node;
+				redge->src_reg->cap_idx = redge->src_cap_idx;
+			} else if (fsess->flags & GF_FS_FLAG_PRINT_CONNECTIONS) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("[Filters] Dijkstra: no shorter path from filter %s distance %d from destination %s priority %d (tested %s dist %d priority %d)\n", redge->src_reg->freg->name, redge->src_reg->dist, redge->src_reg->destination ? redge->src_reg->destination->freg->name : "none", redge->priority, current_node->freg->name, dist, redge->src_reg->priority));
+			}
+		}
+		first = GF_FALSE;
+	}
+
+	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));
+
+	if (result && result->destination) {
+		GF_LOG(GF_LOG_INFO, 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_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));
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("[Filters] Dijkstra: no results found!\n"));
+	}
+	gf_list_del(dijkstra_nodes);
+
+	gf_free(reg_dst->edges);
+	gf_free(reg_dst);
+}
+
+
+/*
+	!Resolves a link between a PID and a destination filter
+
+\param pid source pid to connect
+\param dst destination filter to connect source PID to
+\param filter_reassigned indicates the filter has been destroyed and reassigned
+\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)
+{
+	GF_Filter *chain_input = NULL;
+	GF_FilterSession *fsess = pid->filter->session;
+	GF_List *filter_chain;
+	u32 i, count;
+	char prefRegister[1001];
+	char szForceReg[20];
+
+	if (!fsess->max_resolve_chain_len) return NULL;
+
+	filter_chain = gf_list_new();
+
+	if (!dst) return NULL;
+
+	sprintf(szForceReg, "gfreg%c", pid->filter->session->sep_name);
+	prefRegister[0]=0;
+	//look for reg given in
+	concat_reg(pid->filter->session, prefRegister, szForceReg, pid->filter->orig_args ? pid->filter->orig_args : pid->filter->src_args);
+	concat_reg(pid->filter->session, prefRegister, szForceReg, pid->filter->dst_args);
+	concat_reg(pid->filter->session, prefRegister, szForceReg, dst->src_args);
+	concat_reg(pid->filter->session, prefRegister, szForceReg, dst->dst_args);
+
+	gf_mx_p(fsess->links_mx);
+	gf_filter_pid_resolve_link_dijkstra(pid, dst, prefRegister, reconfigurable_only, filter_chain);
+	gf_mx_v(fsess->links_mx);
+
+	count = gf_list_count(filter_chain);
+	if (min_chain_len) {
+		*min_chain_len = count;
+	} else if (count==0) {
+		Bool can_reassign = GF_TRUE;
+
+		//reassign only for source filters
+		if (pid->filter->num_input_pids) can_reassign = GF_FALSE;
+		//sticky filters cannot be unloaded
+		else if (pid->filter->sticky) can_reassign = GF_FALSE;
+		//if we don't have pending PIDs to setup from the source
+		else if (pid->filter->out_pid_connection_pending) can_reassign = GF_FALSE;
+		//if we don't have pending PIDs to setup from the source
+		else if (pid->filter->num_output_pids) {
+			u32 k;
+			for (k=0; k<pid->filter->num_output_pids; k++) {
+				GF_FilterPid *apid = gf_list_get(pid->filter->output_pids, k);
+				if (apid->num_destinations) can_reassign = GF_FALSE;
+				else if ((apid==pid) && (apid->init_task_pending>1)) can_reassign = GF_FALSE;
+				else if ((apid!=pid) && apid->init_task_pending) can_reassign = GF_FALSE;
+				if (!can_reassign)
+					break;
+			}
+		}
+		//if source filter, try to load another filter - we should complete this with a cache of filter sources
+		if (filter_reassigned && can_reassign) {
+			if (! *filter_reassigned) {
+				if (! gf_filter_swap_source_register(pid->filter) ) {
+					//no filter found for this pid !
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("No suitable filter chain found\n"));
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Swap source demux to %s\n", pid->filter->freg->name));
+				}
+			}
+			*filter_reassigned = GF_TRUE;
+		} else if (!reconfigurable_only) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("No suitable filter found for pid %s from filter %s\n", pid->name, pid->filter->name));
+			if (filter_reassigned)
+				*filter_reassigned = GF_FALSE;
+		}
+	} 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 {
+		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;
+		GF_Filter *prev_af;
+
+		if (skip_if_in_filter_list) {
+			assert(skipped);
+			*skipped = GF_FALSE;
+			u32 nb_skip = gf_list_count(skip_if_in_filter_list);
+			const GF_FilterRegister *chain_start_freg = gf_list_get(filter_chain, 0);
+			for (i=0; i<nb_skip; i++) {
+				GF_Filter *f = gf_list_get(skip_if_in_filter_list, i);
+				u32 j;
+				GF_Filter *dest_f = NULL;
+				Bool true_skip = GF_FALSE;
+
+				for (j=0; j<gf_list_count(dst->destination_filters); j++) {
+					dest_f = gf_list_get(dst->destination_filters, j);
+					if ((gf_list_find(f->destination_filters, dest_f)>=0) || (gf_list_find(f->destination_links, dest_f)>=0)) {
+						true_skip = GF_TRUE;
+						break;
+					}
+					dest_f = NULL;
+				}
+
+				for (j=0; j<gf_list_count(dst->destination_links) && !true_skip; j++) {
+					dest_f = gf_list_get(dst->destination_links, j);
+					if ((gf_list_find(f->destination_filters, dest_f)>=0) || (gf_list_find(f->destination_links, dest_f)>=0)) {
+						true_skip = GF_TRUE;
+						break;
+					}
+					dest_f = NULL;
+				}
+				if (true_skip) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Skip link from %s:%s to %s because both filters share the same destination %s\n", pid->filter->name, pid->name, dst->name, dest_f->name));
+					*skipped = GF_TRUE;
+					gf_list_del(filter_chain);
+					return NULL;
+				}
+
+				if (f->freg == chain_start_freg) {
+					//store destination as future destination link for this new filter
+					if (gf_list_find(f->destination_links, dst)<0)
+						gf_list_add(f->destination_links, dst);
+
+					GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Skip link from %s:%s to %s because already connected to filter %s which can handle the connection\n", pid->filter->name, pid->name, dst->name, f->name));
+
+					*skipped = GF_TRUE;
+					gf_list_del(filter_chain);
+					return NULL;
+				}
+			}
+		}
+
+		dst_args = dst->src_args ? dst->src_args : dst->orig_args;
+
+		while (a_pid) {
+			GF_FilterPidInst *pidi;
+			args = a_pid->filter->src_args;
+			if (!args) args = a_pid->filter->orig_args;
+			if (args) break;
+			pidi = gf_list_get(a_pid->filter->input_pids, 0);
+			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));
+		}
+#endif
+		prev_af = NULL;
+		for (i=0; i<count; i++) {
+			GF_Filter *af;
+			Bool load_first_only = GF_FALSE;
+			s32 cap_idx = -1;
+			const GF_FilterRegister *freg;
+			const GF_FilterCapability *cap = NULL;
+			u32 k, cur_bundle, bundle_idx=0;
+			if (i%2) continue;
+			freg = gf_list_get(filter_chain, i);
+			cap = gf_list_get(filter_chain, i + 1);
+			//get the cap bundle index - the cap added to the list is the cap with the same index as the bundle start we want
+			//(this avoids allocating integers to store the bundle)
+			for (k=0; k<freg->nb_caps; k++) {
+				if (&freg->caps[k]==cap) {
+					bundle_idx = k;
+					break;
+				}
+			}
+			cur_bundle = 0;
+			for (k=0; k<freg->nb_caps; k++) {
+				cap = &freg->caps[k];
+				if (cur_bundle==bundle_idx) {
+					cap_idx = k;
+					break;
+				}
+				if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+					cur_bundle++;
+				}
+			}
+			//if first filter has multiple possible outputs, don't bother loading the entire chain since it is likely wrong
+			//(eg demuxers, we don't know yet what's in the file)
+			if (!i && gf_filter_out_caps_solved_by_connection(freg, bundle_idx)) {
+				load_first_only = GF_TRUE;
+			} else if (i) {
+				Bool break_chain = GF_FALSE;
+				u32 j, nb_filters = gf_list_count(fsess->filters);
+				for (j=0; j<nb_filters; j++) {
+					GF_Filter *afilter = gf_list_get(fsess->filters, j);
+					if (afilter->freg != freg) continue;
+					if (!afilter->dynamic_filter) continue;
+					if (gf_list_find(pid->filter->destination_links, dst)<0) continue;
+					if (!afilter->max_extra_pids) continue;
+
+					//we load the same dynamic filter and it can accept multiple inputs (probably a mux), we might reuse this filter so stop link resolution now
+					//not doing so would load e new mux filter which would accept the input pids but with potentially no possible output connections
+					break_chain = GF_TRUE;
+					if (prev_af) {
+						//store destination as future destination link for this new filter
+						if ( gf_list_find(pid->filter->destination_links, afilter)<0)
+							gf_list_add(pid->filter->destination_links, afilter);
+
+						//remember to which filter we are trying to connect for cap resolution
+						prev_af->cap_dst_filter = dst;
+					}
+					break;
+				}
+				if (break_chain) {
+					break;
+				}
+			}
+
+			GF_LOG(GF_LOG_INFO, 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;
+			//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)
+				af->source_ids = gf_strdup(dst->source_ids);
+
+			//remember our target filter
+			if (prev_af)
+				gf_list_add(prev_af->destination_filters, af);
+
+			//last in chain, add dst
+			if (i+2==count) {
+				gf_list_add(af->destination_filters, dst);
+			}
+			//we will load several filters in chain, add destination to each of the loaded filter so that we remember what was this filter target
+			//this avoids browing the chain of filters->destination_filters when doing link resolution
+			else if (!load_first_only) {
+				gf_list_add(af->destination_filters, dst);
+			}
+
+			//also remember our original target in case we got the link wrong
+			af->target_filter = pid->filter->target_filter;
+
+			prev_af = af;
+
+			if (reconfigurable_only) 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));
+				//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);
+
+				//in case we added it, remove the destination filter
+				gf_list_del_item(af->destination_filters, dst);
+
+				//remember to which filter we are trying to connect for cap resolution
+				af->cap_dst_filter = dst;
+				break;
+			}
+		}
+	}
+
+exit:
+	gf_list_del(filter_chain);
+	return chain_input;
+}
+
+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);
+}
+
+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);
+}
+
+GF_Filter *gf_filter_pid_resolve_link_for_caps(GF_FilterPid *pid, GF_Filter *dst)
+{
+	return gf_filter_pid_resolve_link_internal(pid, dst, NULL, GF_TRUE, 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);
+	return chain_len;
+}
+
+static void gf_filter_pid_set_args_internal(GF_Filter *filter, GF_FilterPid *pid, char *args, u32 argfile_level)
+{
+	//parse each arg
+	while (args) {
+		u32 p4cc=0;
+		u32 prop_type=GF_PROP_FORBIDEN;
+		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);
+
+		if (sep) {
+			char *xml_start = strchr(args, '<');
+			u32 len = (u32) (sep-args);
+			if (xml_start) {
+				u32 xlen = (u32) (xml_start-args);
+				if ((xlen < len) && (args[len-1] != '>')) {
+					while (1) {
+						sep = strchr(sep+1, filter->session->sep_args);
+						if (!sep) {
+							break;
+						}
+						len = (u32) (sep-args);
+						if (args[len-1] == '>')
+							break;
+					}
+				}
+
+			}
+		}
+
+		if (sep) sep[0]=0;
+
+		if (args[0] != filter->session->sep_frag) {
+			if (gf_file_exists(args)) {
+				if (argfile_level<5) {
+					char szLine[2001];
+					FILE *arg_file = gf_fopen(args, "rt");
+					szLine[2000]=0;
+					while (!gf_feof(arg_file)) {
+						u32 llen;
+						char *subarg, *res;
+						szLine[0] = 0;
+						res = gf_fgets(szLine, 2000, arg_file);
+						if (!res) break;
+						llen = (u32) strlen(szLine);
+						while (llen && strchr(" \n\r\t", szLine[llen-1])) {
+							szLine[llen-1]=0;
+							llen--;
+						}
+						if (!llen)
+							continue;
+
+						subarg = szLine;
+						while (subarg[0] && strchr(" \n\r\t", subarg[0]))
+							subarg++;
+						if ((subarg[0] == '/') && (subarg[1] == '/'))
+							continue;
+
+						gf_filter_pid_set_args_internal(filter, pid, subarg, argfile_level+1);
+					}
+					gf_fclose(arg_file);
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter argument file has too many nested levels of sub-files, maximum allowed is 5\n"));
+				}
+			}
+			goto skip_arg;
+		}
+
+		value = NULL;
+		value_sep = strchr(args, filter->session->sep_name);
+		if (value_sep) {
+			value_sep[0]=0;
+			value = value_sep+1;
+		}
+		name = args+1;
+
+		if (strlen(name)==4) {
+			p4cc = GF_4CC(name[0], name[1], name[2], name[3]);
+			if (p4cc) prop_type = gf_props_4cc_get_type(p4cc);
+		}
+		if (prop_type==GF_PROP_FORBIDEN) {
+			p4cc = gf_props_get_id(name);
+			if (p4cc) prop_type = gf_props_4cc_get_type(p4cc);
+		}
+
+		//look for conditional statements: "(PROP=VAL)VALUE"
+		while (value && (value[0]=='(')) {
+			Bool pid_excluded, needs_resolve, prop_not_found, prop_matched;
+			char prop_dump_buffer[GF_PROP_DUMP_ARG_SIZE];
+
+			char *next_val = NULL;
+			char *closing = strchr(value, ')');
+			if (!closing) break;
+
+			if (!strncmp(value, "()", 2)) {
+				value = closing+1;
+				parse_prop = GF_TRUE;
+				value_next_list = next_val;
+				break;
+			}
+
+			parse_prop = GF_FALSE;
+
+			next_val = strchr(closing, filter->session->sep_list);
+			if (next_val) next_val[0] = 0;
+
+			while (closing) {
+				char *next_closing;
+				closing[0] = 0;
+				prop_matched = filter_pid_check_fragment(pid, value+1, &pid_excluded, &needs_resolve, &prop_not_found, prop_dump_buffer);
+				if (prop_not_found) prop_matched = GF_FALSE;
+				closing[0] = ')';
+
+				if (!prop_matched)
+					break;
+				if (strncmp(closing, ")(", 2)) break;
+				next_closing = strchr(closing+2, ')');
+				if (!next_closing) break;
+
+				value = closing+1;
+				closing = next_closing;
+			}
+
+			if (prop_matched) {
+				value = closing+1;
+				parse_prop = GF_TRUE;
+				value_next_list = next_val;
+				break;
+			}
+			if (!next_val) break;
+			next_val[0] = filter->session->sep_list;
+			value = next_val+1;
+		}
+
+		if (!parse_prop)
+			goto skip_arg;
+
+
+		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);
+				p.type = GF_PROP_NAME;
+			} else {
+				gf_filter_pid_set_property(pid, p4cc, &p);
+			}
+			if (prop_type==GF_PROP_STRING_LIST) {
+				p.value.string_list = NULL;
+			}
+			else if (prop_type==GF_PROP_UINT_LIST) {
+				p.value.uint_list.vals = NULL;
+			}
+			gf_props_reset_single(&p);
+		} else if (value) {
+			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);
+			} else if (!strncmp(value, "file@", 5)) {
+				p = gf_props_parse_value(GF_PROP_STRING, name, value, NULL, pid->filter->session->sep_list);
+				p.type = GF_PROP_STRING_NO_COPY;
+			} else {
+				u32 ptype = GF_PROP_FORBIDEN;
+				char *type_sep = strchr(value, '@');
+				if (type_sep) {
+					type_sep[0] = 0;
+					ptype = gf_props_parse_type(value);
+					if (ptype==GF_PROP_FORBIDEN) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Unrecognized property type %s, defaulting to string\n", value));
+					} else {
+						value = type_sep+1;
+					}
+					type_sep[0] = '@';
+				}
+				memset(&p, 0, sizeof(GF_PropertyValue));
+				if (ptype == GF_PROP_FORBIDEN) {
+					p.type = GF_PROP_STRING;
+					p.value.string = value;
+				} else {
+					p = gf_props_parse_value(ptype, name, value, NULL, pid->filter->session->sep_list);
+					reset_prop = GF_TRUE;
+				}
+			}
+			gf_filter_pid_set_property_dyn(pid, name, &p);
+			if (reset_prop) gf_props_reset_single(&p);
+		}
+		if (value_next_list)
+			value_next_list[0] = filter->session->sep_list;
+
+skip_arg:
+		if (value_sep)
+			value_sep[0] = filter->session->sep_name;
+
+		if (sep) {
+			sep[0] = filter->session->sep_args;
+			args=sep+1;
+		} else {
+			break;
+		}
+	}
+}
+
+static void gf_filter_pid_set_args(GF_Filter *filter, GF_FilterPid *pid)
+{
+	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);
+
+}
+static const char *gf_filter_last_id_in_chain(GF_Filter *filter, Bool ignore_first)
+{
+	u32 i;
+	const char *id;
+	if (!ignore_first) {
+		if (filter->id) return filter->id;
+		if (!filter->dynamic_filter) return NULL;
+	}
+
+	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;
+		//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;
+	}
+	return NULL;
+}
+
+void gf_filter_pid_retry_caps_negotiate(GF_FilterPid *src_pid, GF_FilterPid *pid, GF_Filter *dst_filter)
+{
+	assert(dst_filter);
+	src_pid->caps_negociate = pid->caps_negociate;
+	pid->caps_negociate = NULL;
+	src_pid->caps_dst_filter = dst_filter;
+	//blacklist filter for adaptation
+	if (!src_pid->adapters_blacklist) src_pid->adapters_blacklist = gf_list_new();
+	gf_list_add(src_pid->adapters_blacklist, (void *) pid->filter->freg);
+	//once != 0 will trigger reconfiguration, so set this once all vars have been set
+	safe_int_inc(& src_pid->filter->nb_caps_renegociate );
+
+	//disconnect source pid from filter - this will unload the filter itself
+	gf_fs_post_task(src_pid->filter->session, gf_filter_pid_disconnect_task, pid->filter, src_pid, "pidinst_disconnect", NULL);
+}
+
+
+static Bool gf_filter_pid_needs_explicit_resolution(GF_FilterPid *pid, GF_Filter *dst)
+{
+	u32 i;
+	const GF_FilterCapability *caps;
+	u32 nb_caps;
+	Bool dst_has_raw_cid_in = GF_FALSE;
+	const GF_PropertyValue *stream_type = gf_filter_pid_get_property_first(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!stream_type) return GF_TRUE;
+
+	if (stream_type->value.uint==GF_STREAM_FILE) return GF_FALSE;
+	if (stream_type->value.uint==GF_STREAM_ENCRYPTED) {
+		stream_type = gf_filter_pid_get_property_first(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+		if (!stream_type) return GF_TRUE;
+	}
+
+	caps = dst->forced_caps ? dst->forced_caps : dst->freg->caps;
+	nb_caps = dst->forced_caps ? dst->nb_forced_caps : dst->freg->nb_caps;
+
+	for (i=0; i<nb_caps; i++) {
+		const GF_FilterCapability *cap = &caps[i];
+		if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
+
+		if (cap->code != GF_PROP_PID_CODECID) continue;
+		if (cap->val.value.uint==GF_CODECID_RAW)
+			dst_has_raw_cid_in = GF_TRUE;
+	}
+
+
+	for (i=0; i<nb_caps; i++) {
+		const GF_FilterCapability *cap = &caps[i];
+		if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
+
+		if (cap->code != GF_PROP_PID_STREAM_TYPE) continue;
+		//output type is file or same media type, allow looking for filter chains
+		if ((cap->val.value.uint==GF_STREAM_FILE) || (cap->val.value.uint==stream_type->value.uint)) return GF_FALSE;
+		//allow text|scene|video -> raw video for dynamic compositor
+		if (dst_has_raw_cid_in  && (cap->val.value.uint==GF_STREAM_VISUAL)) {
+			switch (stream_type->value.uint) {
+			case GF_STREAM_TEXT:
+			case GF_STREAM_SCENE:
+			case GF_STREAM_OD:
+				return GF_FALSE;
+			default:
+				break;
+			}
+		}
+	}
+	//no mathing type found, we will need an explicit filter to solve this link (ie the link will be to the explicit filter)
+	return GF_TRUE;
+}
+
+static void add_possible_link_destination(GF_List *possible_linked_resolutions, GF_Filter *filter_dst)
+{
+	u32 i;
+
+	for (i=0; i<gf_list_count(possible_linked_resolutions); i++) {
+		GF_Filter *parent = gf_list_get(possible_linked_resolutions, i);
+		if (parent->max_extra_pids) continue;
+
+		if ((gf_list_find(filter_dst->destination_links, parent)>=0) || (gf_list_find(filter_dst->destination_filters, parent)>=0)) {
+			gf_list_rem(possible_linked_resolutions, i);
+			gf_list_insert(possible_linked_resolutions, filter_dst, i);
+			return;
+		}
+		if ((gf_list_find(parent->destination_links, filter_dst)>=0) || (gf_list_find(parent->destination_filters, filter_dst)>=0)) {
+			return;
+		}
+	}
+	gf_list_add(possible_linked_resolutions, filter_dst);
+}
+
+#if 0
+static void dump_pid_props(GF_FilterPid *pid)
+{
+	u32 idx = 0;
+	char szDump[GF_PROP_DUMP_ARG_SIZE];
+	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) ));
+	}
+}
+#endif
+
+
+static void gf_filter_pid_init_task(GF_FSTask *task)
+{
+	u32 i, count;
+	Bool found_dest=GF_FALSE;
+	Bool found_matching_sourceid;
+	Bool can_reassign_filter = GF_FALSE;
+	Bool can_try_link_resolution=GF_FALSE;
+	u32 num_pass=0;
+	GF_List *loaded_filters = NULL;
+	GF_List *linked_dest_filters = NULL;
+    GF_List *force_link_resolutions = NULL;
+    GF_List *possible_linked_resolutions = NULL;
+	GF_Filter *filter = task->filter;
+	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;
+	const char *filter_id;
+
+	if (pid->destroyed || pid->removed) {
+		assert(pid->init_task_pending);
+		safe_int_dec(&pid->init_task_pending);
+		return;
+	}
+	pid->props_changed_since_connect = GF_FALSE;
+
+	//swap pid is pending on the possible destination filter
+	if (filter->swap_pidinst_src || filter->swap_pidinst_dst) {
+		task->requeue_request = GF_TRUE;
+		task->can_swap = GF_TRUE;
+		return;
+	}
+	if (filter->caps_negociate) {
+		if (! gf_filter_reconf_output(filter, pid))
+			return;
+	}
+
+	gf_fs_check_graph_load(filter->session, GF_TRUE);
+
+	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
+	//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);
+
+	linked_dest_filters = gf_list_new();
+	force_link_resolutions = gf_list_new();
+    possible_linked_resolutions = gf_list_new();
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s:%s init\n", pid->filter->name, pid->name));
+
+	//we use at max 3 passes:
+	//pass 1: try direct connections without loading intermediate filter chains. If PID gets connected, skip other passes
+	//pass 2: try loading intermediate filter chains, but disable filter register swapping. If PID gets connected, skip last
+	//pass 3: try loading intermediate filter chains, potentially swapping the source register
+restart:
+
+	if (num_pass) {
+		loaded_filters = gf_list_new();
+	}
+
+	found_matching_sourceid = GF_FALSE;
+	//try to connect pid to all running filters
+	count = gf_list_count(filter->session->filters);
+	for (i=0; i<count; i++) {
+		Bool needs_clone;
+		Bool cap_matched;
+		GF_Filter *filter_dst;
+
+single_retry:
+
+		filter_dst = gf_list_get(filter->session->filters, i);
+		//source filter
+		if (!filter_dst->freg->configure_pid) continue;
+		if (filter_dst->finalized || filter_dst->removed || 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)
+		if (pid->pid->filter->freg == filter_dst->freg) {
+			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));
+			continue;
+		}
+		if (gf_list_count(pid->filter->destination_filters)) {
+			s32 ours = gf_list_find(pid->filter->destination_filters, filter_dst);
+			if (ours<0) {
+				ours = num_pass ? gf_list_del_item(pid->filter->destination_links, filter_dst) : -1;
+				if (!filter_dst->source_ids && (ours<0)) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has destination filters, filter %s not one of them\n", pid->name, filter_dst->name));
+					continue;
+				}
+
+				pid->filter->dst_filter = NULL;
+			} else {
+				pid->filter->dst_filter = filter_dst;
+			}
+		}
+
+		if (num_pass && gf_list_count(filter->destination_links)) {
+			s32 ours = gf_list_find(pid->filter->destination_links, filter_dst);
+			if (ours<0) {
+				ours = gf_list_find(possible_linked_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;
+		}
+
+		if (gf_list_count(filter_dst->source_filters)) {
+			u32 j, count2 = gf_list_count(filter_dst->source_filters);
+			for (j=0; j<count2; j++) {
+				GF_Filter *srcf = gf_list_get(filter_dst->source_filters, j);
+				if (filter_in_parent_chain(pid->filter, srcf)) {
+					ignore_source_ids = GF_TRUE;
+					break;
+				}
+			}
+		}
+		
+		//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->swap_pidinst_dst || (filter->swap_pidinst_dst->filter != filter_dst))
+		) {
+			//not explicitly clonable, don't connect to it
+			if (!filter_dst->clonable) {
+				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)) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s caps does not match clonable filter %s\n", pid->name, filter_dst->name));
+				continue;
+			}
+		}
+
+		if (gf_list_find(pid->filter->blacklisted, (void *) filter_dst->freg)>=0) continue;
+
+		//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
+			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;
+			}
+			//dst was not set, we may try to connect to this filter if it allows several input
+			//this is typically the case for muxers instantiated dynamically
+			if (!filter_dst->max_extra_pids) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has explicit dest %s matching but no extra pid possible\n", pid->name, filter_dst->name));
+				continue;
+			}
+		}
+		//pid->filter->dst_filter NULL and pid->filter->target_filter is not: we had a wrong resolved chain to target
+		//so only attempt to relink the chain if dst_filter is the expected target
+		if (!pid->filter->dst_filter && pid->filter->target_filter && (filter_dst != pid->filter->target_filter)) {
+			if (filter_dst->target_filter != pid->filter->target_filter) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has target filter %s not matching %s->%s\n", pid->name, pid->filter->target_filter->name, filter_dst->name, filter_dst->target_filter ? filter_dst->target_filter->name : "null"));
+				continue;
+			}
+			//if the target filter of this filter is the same as ours, try to connect - typically scalable streams decoding
+		}
+
+		//dynamic filters only connect to their destination, unless explicit connections through sources
+		//we could remove this but this highly complicates PID resolution
+		if (!filter_dst->source_ids && pid->filter->dynamic_filter && pid->filter->dst_filter && (filter_dst!=pid->filter->dst_filter)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has dest filter %s not matching %s\n", pid->name, pid->filter->dst_filter->name, filter_dst->name));
+			continue;
+		}
+		//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 (filter_in_parent_chain(filter, filter_dst) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s has filter %s in its parent chain\n", pid->name, filter_dst->name));
+			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 (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 the filter is in the parent chain of this PID's original filter, don't connect (equivalent to re-entrant)
+		if (filter->cloned_from) {
+			if (filter_in_parent_chain(filter->cloned_from, filter_dst) ) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s filter is cloned and has filter %s in its clone parent chain\n", pid->name, filter_dst->name));
+				continue;
+			}
+		}
+
+		//if we have sourceID info on the destination, check them
+		needs_clone=GF_FALSE;
+		if (filter_id) {
+			if (filter_dst->source_ids) {
+				Bool pid_excluded=GF_FALSE;
+				if (!filter_source_id_match(pid, filter_id, filter_dst, &pid_excluded, &needs_clone)) {
+					Bool not_ours=GF_TRUE;
+					//if filter is a dynamic one with an ID set, fetch ID from previous filter in chain
+					//this is need for cases such as "-i source filterFoo @ -o live.mpd":
+					//the dasher filter will be dynamically loaded AND will also assign itself a filter ID
+					//due to internal filter (dasher) logic
+					//that dasher filter ID will be different from the ID assigned by '@' on dst file's sourceID,
+					//which is the filter ID of filterFoo
+					if (filter->dynamic_filter && filter->id) {
+						const char *src_filter_id = gf_filter_last_id_in_chain(filter, GF_TRUE);
+						if (filter_source_id_match(pid, src_filter_id, filter_dst, &pid_excluded, &needs_clone)) {
+							not_ours = GF_FALSE;
+						}
+					}
+					if (not_ours) {
+						if (pid_excluded && !num_pass) filter_found_but_pid_excluded = GF_TRUE;
+
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s does not match source ID for filter %s\n", pid->name, filter_dst->name));
+						continue;
+					}
+				}
+			}
+			//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
+			else if (pid->require_source_id) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s requires source ID, not set for filter %s\n", pid->name, filter_dst->name));
+				continue;
+			}
+		}
+		//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)) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s does not match filter %s source ID\n", pid->name, filter_dst->name));
+				continue;
+			}
+			if (!filter_source_id_match(pid, "*", filter_dst, &pid_excluded, &needs_clone)) {
+				if (pid_excluded && !num_pass) filter_found_but_pid_excluded = GF_TRUE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s is excluded by filter %s source ID\n", pid->name, filter_dst->name));
+				continue;
+			}
+		}
+		if (needs_clone) {
+			//remember this filter as clonable (dynamic source id scheme) if none yet found.
+			//If we had a matching sourceID, clone is not needed
+			if (!num_pass && !dynamic_filter_clone && !found_matching_sourceid) {
+				dynamic_filter_clone = filter_dst;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s needs cloning of filter %s\n", pid->name, filter_dst->name));
+			continue;
+		} else if (dynamic_filter_clone && dynamic_filter_clone->freg==filter_dst->freg) {
+			dynamic_filter_clone = NULL;
+		}
+		//remember we had a sourceid match
+		found_matching_sourceid = GF_TRUE;
+
+		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
+		//whose destination is this destination (typically mux > fout/pipe/sock case). If that's the case, swap the destination
+		//filter with the intermediate node before matching caps and resolving link
+		if (num_pass) {
+			u32 k, alt_count = gf_list_count(possible_linked_resolutions);
+			for (k=0; k<alt_count; k++) {
+				GF_Filter *adest = gf_list_get(possible_linked_resolutions, k);
+				//we only apply this if the destination filter has the GF_FS_REG_DYNAMIC_REDIRECT flag set.
+				//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
+				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) ) {
+					filter_dst = adest;
+					gf_list_rem(possible_linked_resolutions, k);
+					break;
+				}
+			}
+		}
+
+
+		//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) {
+			Bool skipped = GF_FALSE;
+			Bool reassigned=GF_FALSE;
+			GF_Filter *new_f;
+
+			//we don't load filter chains if we have a change of media type from anything except file to anything except file
+			//i.e. transmodality (eg video->audio) can only be done through explicit filters
+			if (gf_filter_pid_needs_explicit_resolution(pid, filter_dst)) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PID %s needs explicit resolution for linking to filter %s\n", pid->name, filter_dst->name));
+				continue;
+			}
+
+			//we had a destination set during link resolve, and we don't match that filter, consider the link resolution wrong
+			if (pid->filter->dst_filter && (filter_dst == pid->filter->dst_filter)) {
+				GF_Filter *old_dst = pid->filter->dst_filter;
+				pid->filter->dst_filter = NULL;
+				gf_list_del_item(pid->filter->destination_links, filter_dst);
+				gf_list_del_item(pid->filter->destination_filters, filter_dst);
+				//nobody using this filter, destroy
+				if (old_dst->dynamic_filter
+					&& !old_dst->has_pending_pids
+					&& !old_dst->num_input_pids
+					&& !old_dst->out_pid_connection_pending
+				) {
+					gf_filter_post_remove(old_dst);
+				}
+			}
+			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) {
+                    gf_list_add(force_link_resolutions, filter_dst);
+				} 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);
+				}
+				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));
+
+			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);
+
+			//try to load filters
+			if (! new_f) {
+				if (skipped) {
+					continue;
+				}
+				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);
+					assert(pid->init_task_pending);
+					safe_int_dec(&pid->init_task_pending);
+					if (loaded_filters) gf_list_del(loaded_filters);
+					gf_list_del(linked_dest_filters);
+                    gf_list_del(force_link_resolutions);
+                    gf_list_del(possible_linked_resolutions);
+					return;
+				}
+
+				//filter was reassigned (pid is destroyed), return
+				if (reassigned) {
+					if (num_pass==1) {
+						can_reassign_filter = GF_TRUE;
+						continue;
+					}
+					if (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);
+					gf_list_del(linked_dest_filters);
+                    gf_list_del(force_link_resolutions);
+                    gf_list_del(possible_linked_resolutions);
+					return;
+				}
+				//we might had it wrong solving the chain initially, break the chain
+				if (filter_dst->dynamic_filter && filter_dst->dst_filter) {
+					GF_Filter *new_dst = filter_dst;
+					while (new_dst->dst_filter && new_dst->dynamic_filter) {
+						GF_Filter *f = new_dst;
+						new_dst = new_dst->dst_filter;
+						if (!f->num_input_pids && !f->num_output_pids && !f->in_pid_connection_pending) {
+							gf_filter_post_remove(f);
+						}
+					}
+					
+					pid->filter->dst_filter = NULL;
+					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);
+							assert(pid->init_task_pending);
+							safe_int_dec(&pid->init_task_pending);
+							if (loaded_filters) gf_list_del(loaded_filters);
+							gf_list_del(linked_dest_filters);
+                            gf_list_del(force_link_resolutions);
+                            gf_list_del(possible_linked_resolutions);
+							return;
+						} else {
+							continue;
+						}
+					}
+					//good to go !
+				} else {
+					continue;
+				}
+			}
+			gf_list_del_item(filter->destination_links, filter_dst);
+			filter_dst = new_f;
+			gf_list_add(loaded_filters, new_f);
+		}
+
+		assert(pid->pid->filter->freg != filter_dst->freg);
+
+		safe_int_inc(&pid->filter->out_pid_connection_pending);
+		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) {
+			u32 k=0;
+			for (k=0; k<gf_list_count(filter_dst->destination_filters); k++) {
+				GF_Filter *dst_f = gf_list_get(filter_dst->destination_filters, k);
+				gf_list_del_item(filter->destination_links, dst_f);
+			}
+		}
+    }
+
+	if (!num_pass) {
+		//cleanup forced link resolution
+		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
+					filter_in_parent_chain(filter_dst, dst_link)
+					|| 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)
+					//if forced filter's target is the same as what we connected to, don't force a link
+					|| (dst_link->target_filter == filter_dst)
+				) {
+					gf_list_rem(force_link_resolutions, k);
+					k--;
+				}
+			}
+		}
+	}
+
+	if (loaded_filters) {
+		gf_list_del(loaded_filters);
+		loaded_filters = NULL;
+	}
+
+	//we still have possible destination links and we can try link resolution, do it
+	if (!num_pass && gf_list_count(filter->destination_links) && can_try_link_resolution && filter->session->max_resolve_chain_len) {
+		num_pass = 1;
+		goto restart;
+	}
+    //we must do the second pass if a filter has an explicit link set through source ID
+	if (!num_pass && gf_list_count(force_link_resolutions)) {
+		num_pass = 1;
+		goto restart;
+	}
+
+    //connection task posted, nothing left to do
+	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);
+		pid->filter->disabled = GF_FALSE;
+		gf_list_del(linked_dest_filters);
+        gf_list_del(force_link_resolutions);
+        gf_list_del(possible_linked_resolutions);
+		gf_fs_check_graph_load(filter->session, GF_FALSE);
+		return;
+	}
+
+	//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);
+		if (clone) {
+			assert(dynamic_filter_clone->dynamic_source_ids);
+			gf_free(clone->source_ids);
+			clone->source_ids = gf_strdup(dynamic_filter_clone->dynamic_source_ids);
+			clone->cloned_from = NULL;
+			count = gf_list_count(filter->session->filters);
+			gf_list_add(pid->filter->destination_links, clone);
+			i = count-1;
+			num_pass = 1;
+			goto single_retry;
+		}
+	}
+
+	//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;
+		goto restart;
+	}
+	if ((num_pass==1) && can_reassign_filter) {
+		if (filter->session->flags & GF_FS_FLAG_NO_REASSIGN) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("PID %s in filter %s not connected, source reassignment was possible but is disabled\n", pid->name, pid->filter->name));
+		} else {
+			num_pass = 2;
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("PID %s in filter %s not connected to any loaded filter, trying source reassignment\n", pid->name, pid->filter->name));
+			goto restart;
+		}
+	}
+
+	gf_fs_check_graph_load(filter->session, GF_FALSE);
+
+	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);
+
+
+	filter->num_out_pids_not_connected ++;
+
+	GF_FilterEvent evt;
+	if (filter_found_but_pid_excluded) {
+		//PID was not included in explicit connection lists
+		GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("PID %s in filter %s not connected to any loaded filter due to source directives\n", pid->name, pid->filter->name));
+		pid->not_connected = 1;
+	} else {
+		//no filter found for this pid !
+		if (!pid->not_connected_ok && (filter->session->flags & GF_FS_FLAG_FULL_LINK) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("No filter chain found for PID %s in filter %s to any loaded filters - ABORTING!\n", pid->name, pid->filter->name));
+			filter->session->last_connect_error = GF_FILTER_NOT_FOUND;
+			filter->session->run_status = GF_FILTER_NOT_FOUND;
+			filter->session->in_final_flush = GF_TRUE;
+			assert(pid->init_task_pending);
+			safe_int_dec(&pid->init_task_pending);
+			return;
+		}
+
+		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);
+		}
+		pid->not_connected = 1;
+	}
+	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);
+
+	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)) {
+		pid->filter->disabled = GF_TRUE;
+
+		if (can_reassign_filter) {
+			gf_filter_setup_failure(pid->filter, GF_FILTER_NOT_FOUND);
+		}
+	}
+
+	if (!filter_found_but_pid_excluded && !pid->not_connected_ok && !filter->session->max_resolve_chain_len) {
+		filter->session->last_connect_error = GF_FILTER_NOT_FOUND;
+	}
+
+	assert(pid->init_task_pending);
+	safe_int_dec(&pid->init_task_pending);
+	return;
+}
+
+void gf_filter_pid_post_connect_task(GF_Filter *filter, GF_FilterPid *pid)
+{
+	assert(pid->pid);
+	assert(pid->filter != filter);
+	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);
+}
+
+
+void gf_filter_pid_post_init_task(GF_Filter *filter, GF_FilterPid *pid)
+{
+	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);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_framing_mode(GF_FilterPid *pid, Bool requires_full_blocks)
+{
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set framing info on an output pid in filter %s\n", pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	pidinst->requires_full_data_block = requires_full_blocks;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_FilterPid *gf_filter_pid_new(GF_Filter *filter)
+{
+	char szName[30];
+	GF_FilterPid *pid;
+	GF_SAFEALLOC(pid, GF_FilterPid);
+	if (!pid) return NULL;
+	pid->filter = filter;
+	pid->destinations = gf_list_new();
+	pid->properties = gf_list_new();
+	if (!filter->output_pids) filter->output_pids = gf_list_new();
+	gf_mx_p(filter->tasks_mx);
+	gf_list_add(filter->output_pids, pid);
+	filter->num_output_pids = gf_list_count(filter->output_pids);
+	gf_mx_v(filter->tasks_mx);
+	pid->pid = pid;
+	pid->playback_speed_scaler = GF_FILTER_SPEED_SCALER;
+	
+	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);
+
+	//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);
+	}
+	return pid;
+}
+
+void gf_filter_pid_del(GF_FilterPid *pid)
+{
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s pid %s destruction (%p)\n", pid->filter->name, pid->name, pid));
+	while (gf_list_count(pid->destinations)) {
+		gf_filter_pid_inst_del(gf_list_pop_back(pid->destinations));
+	}
+	gf_list_del(pid->destinations);
+
+	while (gf_list_count(pid->properties)) {
+		GF_PropertyMap *prop = gf_list_pop_back(pid->properties);
+		assert(prop->reference_count);
+		if (safe_int_dec(&prop->reference_count) == 0) {
+			gf_props_del(prop);
+		}
+	}
+	gf_list_del(pid->properties);
+
+	if(pid->caps_negociate) {
+		assert(pid->caps_negociate->reference_count);
+		if (safe_int_dec(&pid->caps_negociate->reference_count) == 0) {
+			gf_props_del(pid->caps_negociate);
+		}
+	}
+
+	if (pid->adapters_blacklist)
+		gf_list_del(pid->adapters_blacklist);
+
+	if (pid->infos) {
+		assert(pid->infos->reference_count);
+		if (safe_int_dec(&pid->infos->reference_count) == 0) {
+			gf_props_del(pid->infos);
+		}
+	}
+	if (pid->name) gf_free(pid->name);
+	gf_free(pid);
+}
+
+void gf_filter_pid_del_task(GF_FSTask *task)
+{
+	gf_filter_pid_del(task->pid);
+}
+
+static GF_PropertyMap *check_new_pid_props(GF_FilterPid *pid, Bool merge_props)
+{
+	u32 i, nb_recf;
+	GF_PropertyMap *old_map;
+	GF_PropertyMap *map;
+
+	//see \ref gf_filter_pid_merge_properties_internal for mutex
+	gf_mx_p(pid->filter->tasks_mx);
+	old_map = gf_list_last(pid->properties);
+	gf_mx_v(pid->filter->tasks_mx);
+
+	pid->props_changed_since_connect = GF_TRUE;
+	if (old_map && !pid->request_property_map) {
+		return old_map;
+	}
+	map = gf_props_new(pid->filter);
+	if (!map)
+		return NULL;
+	//see \ref gf_filter_pid_merge_properties_internal for mutex
+	gf_mx_p(pid->filter->tasks_mx);
+	gf_list_add(pid->properties, map);
+	gf_mx_v(pid->filter->tasks_mx);
+
+	pid->request_property_map = GF_FALSE;
+	pid->pid_info_changed = GF_FALSE;
+
+	//when creating a new map, ref_count of old map is decremented
+	if (old_map) {
+		if (merge_props)
+			gf_props_merge_property(map, old_map, NULL, NULL);
+
+		assert(old_map->reference_count);
+		if (safe_int_dec(&old_map->reference_count) == 0) {
+			//see \ref gf_filter_pid_merge_properties_internal for mutex
+			gf_mx_p(pid->filter->tasks_mx);
+			gf_list_del_item(pid->properties, old_map);
+			gf_mx_v(pid->filter->tasks_mx);
+			gf_props_del(old_map);
+		}
+	}
+
+	//trick here: we may be reconfigured before any packet is being dispatched
+	//so we need to manually trigger reconfigure of outputs
+	nb_recf = 0;
+	for (i=0; i<pid->num_destinations; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+		if (!pidi->filter->process_task_queued) {
+			//remember the pid prop map to use
+			pidi->reconfig_pid_props = map;
+			nb_recf++;
+		}
+	}
+	if (nb_recf)
+		pid->filter->reconfigure_outputs = GF_TRUE;
+	return map;
+}
+
+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;
+
+	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;
+	}
+
+	//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);
+		}
+		pid->pid_info_changed = GF_TRUE;
+	} else {
+		//always merge properties
+		map = check_new_pid_props(pid, GF_TRUE);
+	}
+	if (!map) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties for destination pid in filter %s, ignoring reset\n", pid->filter->name));
+		return GF_OUT_OF_MEM;
+	}
+	if (value && (prop_4cc==GF_PROP_PID_TIMESCALE))
+		map->timescale = value->value.uint;
+
+	if (value && (prop_4cc == GF_PROP_PID_ID) && !pid->name) {
+		char szName[100];
+		sprintf(szName, "PID%d", value->value.uint);
+		gf_filter_pid_set_name(pid, szName);
+	}
+	return gf_props_set_property(map, prop_4cc, prop_name, dyn_name, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_property(GF_FilterPid *pid, u32 prop_4cc, const GF_PropertyValue *value)
+{
+	if (!prop_4cc) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, prop_4cc, NULL, NULL, value, GF_FALSE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_property_str(GF_FilterPid *pid, const char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, 0, name, NULL, value, GF_FALSE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_property_dyn(GF_FilterPid *pid, char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, 0, NULL, name, value, GF_FALSE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_info(GF_FilterPid *pid, u32 prop_4cc, const GF_PropertyValue *value)
+{
+	if (!prop_4cc) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, prop_4cc, NULL, NULL, value, GF_TRUE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_info_str(GF_FilterPid *pid, const char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, 0, name, NULL, value, GF_TRUE);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_info_dyn(GF_FilterPid *pid, char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_set_property_full(pid, 0, NULL, name, value, GF_TRUE);
+}
+
+static GF_Err gf_filter_pid_negociate_property_full(GF_FilterPid *pid, u32 prop_4cc, const char *prop_name, char *dyn_name, const GF_PropertyValue *value)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *) pid;
+	if (!prop_4cc) return GF_BAD_PARAM;
+
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to negociate property on output PID in filter %s - ignoring\n", pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	pid = pid->pid;
+	if (!pid->caps_negociate) {
+		assert(!pid->caps_negociate_pidi);
+		pid->caps_negociate = gf_props_new(pid->filter);
+		pid->caps_negociate_pidi = pidi;
+		//we start a new caps negotiation step, reset any blacklist on pid
+		if (pid->adapters_blacklist) {
+			gf_list_del(pid->adapters_blacklist);
+			pid->adapters_blacklist = NULL;
+		}
+		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
+	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);
+	}
+	return gf_props_set_property(pid->caps_negociate, prop_4cc, prop_name, dyn_name, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_negociate_property(GF_FilterPid *pid, u32 prop_4cc, const GF_PropertyValue *value)
+{
+	if (!prop_4cc) return GF_BAD_PARAM;
+	return gf_filter_pid_negociate_property_full(pid, prop_4cc, NULL, NULL, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_negociate_property_str(GF_FilterPid *pid, const char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_negociate_property_full(pid, 0, name, NULL, value);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_negociate_property_dyn(GF_FilterPid *pid, char *name, const GF_PropertyValue *value)
+{
+	if (!name) return GF_BAD_PARAM;
+	return gf_filter_pid_negociate_property_full(pid, 0, NULL, name, value);
+}
+
+
+static GF_PropertyMap *filter_pid_get_prop_map(GF_FilterPid *pid, Bool first_prop_if_output)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_FilterPidInst *pidi = (GF_FilterPidInst *) pid;
+		//first time we access the props, use the first entry in the property list
+		if (!pidi->props) {
+			//see \ref gf_filter_pid_merge_properties_internal for mutex
+			gf_mx_p(pid->filter->tasks_mx);
+			pidi->props = gf_list_get(pid->pid->properties, 0);
+			gf_mx_v(pid->filter->tasks_mx);
+			assert(pidi->props);
+			safe_int_inc(&pidi->props->reference_count);
+		}
+		return pidi->props;
+	} else {
+		GF_PropertyMap *res_map = NULL;
+		pid = pid->pid;
+		if (pid->local_props) return pid->local_props;
+
+		//see \ref gf_filter_pid_merge_properties_internal for mutex
+		gf_mx_p(pid->filter->tasks_mx);
+		if (first_prop_if_output)
+			res_map = gf_list_get(pid->properties, 0);
+		else
+			res_map = gf_list_last(pid->properties);
+		gf_mx_v(pid->filter->tasks_mx);
+		return res_map;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_get_property(GF_FilterPid *pid, u32 prop_4cc)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property(map, prop_4cc, NULL);
+}
+
+const GF_PropertyValue *gf_filter_pid_get_property_first(GF_FilterPid *pid, u32 prop_4cc)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_TRUE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property(map, prop_4cc, NULL);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_get_property_str(GF_FilterPid *pid, const char *prop_name)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property(map, 0, prop_name);
+}
+
+const GF_PropertyValue *gf_filter_pid_get_property_str_first(GF_FilterPid *pid, const char *prop_name)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_TRUE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property(map, 0, prop_name);
+}
+
+const GF_PropertyEntry *gf_filter_pid_get_property_entry(GF_FilterPid *pid, u32 prop_4cc)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property_entry(map, prop_4cc, NULL);
+}
+
+GF_EXPORT
+const GF_PropertyEntry *gf_filter_pid_get_property_entry_str(GF_FilterPid *pid, const char *prop_name)
+{
+	GF_PropertyMap *map = filter_pid_get_prop_map(pid, GF_FALSE);
+	if (!map)
+		return NULL;
+	return gf_props_get_property_entry(map, 0, prop_name);
+}
+
+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;
+	const GF_PropertyEntry *prop_ent = NULL;
+	GF_PropertyMap *map;
+	*propentry = NULL;
+	
+	if (first_call) {
+		gf_mx_p(pid->filter->session->info_mx);
+	}
+	map = filter_pid_get_prop_map(pid, GF_FALSE);
+
+	if (map) {
+		prop_ent = gf_props_get_property_entry(map, prop_4cc, prop_name);
+		if (prop_ent) goto exit;
+	}
+	if (pid->pid->infos) {
+		prop_ent = gf_props_get_property_entry(pid->pid->infos, prop_4cc, prop_name);
+		if (prop_ent) goto exit;
+	}
+	if (PID_IS_OUTPUT(pid)) {
+		prop_ent = NULL;
+		goto exit;
+	}
+	pid = pid->pid;
+	if (pid->infos) {
+		prop_ent = gf_props_get_property_entry(pid->infos, prop_4cc, prop_name);
+		if (prop_ent) goto exit;
+	}
+
+	count = gf_list_count(pid->filter->input_pids);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *prop;
+		GF_FilterPid *pidinst = gf_list_get(pid->filter->input_pids, i);
+		if (!pidinst->pid) continue;
+		
+		prop = gf_filter_pid_get_info_internal((GF_FilterPid *)pidinst, prop_4cc, prop_name, GF_FALSE, propentry);
+		if (prop) {
+			prop_ent = *propentry;
+			goto exit;
+		}
+	}
+	prop_ent = NULL;
+
+exit:
+	if (first_call) {
+		gf_mx_v(pid->filter->session->info_mx);
+	}
+	if (!prop_ent) {
+		*propentry = NULL;
+		return NULL;
+	}
+	if (! (*propentry)) {
+		*propentry = (GF_PropertyEntry *) prop_ent;
+		safe_int_inc(&prop_ent->reference_count);
+	}
+	return &prop_ent->prop;
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_get_info(GF_FilterPid *pid, u32 prop_4cc, GF_PropertyEntry **propentry)
+{
+	if (!propentry) return NULL;
+	if (*propentry) {
+		gf_filter_release_property(*propentry);
+		*propentry = NULL;
+	}
+	return gf_filter_pid_get_info_internal(pid, prop_4cc, NULL, GF_TRUE, propentry);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_get_info_str(GF_FilterPid *pid, const char *prop_name, GF_PropertyEntry **propentry)
+{
+	if (!propentry) return NULL;
+	if (*propentry) {
+		gf_filter_release_property(*propentry);
+		*propentry = NULL;
+	}
+	return gf_filter_pid_get_info_internal(pid, 0, prop_name, GF_TRUE, propentry);
+}
+
+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;
+
+	if (PID_IS_OUTPUT(pid)) {
+		return NULL;
+	}
+	pid = pid->pid;
+	cur_idx = *idx;
+	if (pid->infos) {
+		cur_idx = *idx;
+		const GF_PropertyValue *prop = gf_props_enum_property(pid->infos, &cur_idx, prop_4cc, prop_name);
+		if (prop) {
+			*idx = cur_idx;
+			return prop;
+		}
+		nb_in_pid = cur_idx;
+		cur_idx = *idx - nb_in_pid;
+	}
+
+	count = gf_list_count(pid->filter->input_pids);
+	for (i=0; i<count; 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;
+			return prop;
+		}
+		nb_in_pid += sub_idx;
+		cur_idx = *idx - nb_in_pid;
+	}
+	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;
+	const GF_PropertyValue *prop=NULL;
+
+	gf_mx_p(filter->session->info_mx);
+
+	//TODO avoid doing back and forth ...
+	count = gf_list_count(filter->output_pids);
+	for (i=0; i<count; 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->session->info_mx);
+			return prop;
+		}
+	}
+	count = gf_list_count(filter->input_pids);
+	for (i=0; i<count; 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->session->info_mx);
+			return prop;
+		}
+	}
+	gf_mx_v(filter->session->info_mx);
+	return NULL;
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_get_info(GF_Filter *filter, u32 prop_4cc, GF_PropertyEntry **propentry)
+{
+	if (!propentry) return NULL;
+	if (*propentry) {
+		gf_filter_release_property(*propentry);
+		*propentry = NULL;
+	}
+	return gf_filter_get_info_internal(filter, prop_4cc, NULL, propentry);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_get_info_str(GF_Filter *filter, const char *prop_name, GF_PropertyEntry **propentry)
+{
+	if (!propentry) return NULL;
+	if (*propentry) {
+		gf_filter_release_property(*propentry);
+		*propentry = NULL;
+	}
+	return gf_filter_get_info_internal(filter, 0, prop_name, propentry);
+}
+
+GF_EXPORT
+void gf_filter_release_property(GF_PropertyEntry *propentry)
+{
+	if (propentry) {
+		gf_props_del_property(propentry);
+	}
+}
+
+GF_Err gf_filter_pid_reset_properties(GF_FilterPid *pid)
+{
+	GF_PropertyMap *map;
+
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reset all properties on input PID in filter %s - ignoring\n", pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	//don't merge properties, we will reset them anyway
+	map = check_new_pid_props(pid, GF_FALSE);
+
+	if (!map) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties for destination pid in filter %s, ignoring reset\n", pid->filter->name));
+		return GF_OUT_OF_MEM;
+	}
+	gf_props_reset(map);
+	return GF_OK;
+
+}
+
+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 do_copy)
+{
+	GF_PropertyMap *dst_props, *src_props, *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;
+	}
+	if (do_copy) {
+		gf_mx_p(src_pid->filter->tasks_mx);
+		old_dst_props = gf_list_last(dst_pid->properties);
+		gf_mx_v(src_pid->filter->tasks_mx);
+	}
+
+	//don't merge properties with old state we merge with source pid
+	dst_props = check_new_pid_props(dst_pid, GF_FALSE);
+
+	if (!dst_props) {
+		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;
+	}
+
+	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);
+	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;
+	}
+	if (src_pid->name && !old_dst_props)
+		gf_filter_pid_set_name(dst_pid, src_pid->name);
+	
+	gf_props_reset(dst_props);
+	if (old_dst_props) {
+		GF_Err e = gf_props_merge_property(dst_props, old_dst_props, NULL, NULL);
+		if (e) return e;
+	}
+	return gf_props_merge_property(dst_props, src_props, filter_prop, cbk);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_merge_properties(GF_FilterPid *dst_pid, GF_FilterPid *src_pid, gf_filter_prop_filter filter_prop, void *cbk )
+{
+	return gf_filter_pid_merge_properties_internal(dst_pid, src_pid, filter_prop, cbk, GF_TRUE);
+}
+GF_EXPORT
+GF_Err gf_filter_pid_copy_properties(GF_FilterPid *dst_pid, GF_FilterPid *src_pid)
+{
+	return gf_filter_pid_merge_properties_internal(dst_pid, src_pid, NULL, NULL, GF_FALSE);
+}
+
+GF_EXPORT
+u32 gf_filter_pid_get_packet_count(GF_FilterPid *pid)
+{
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		pidinst = gf_list_get(pid->destinations, 0);
+		if (! pidinst) return 0;
+		return gf_fq_count(pidinst->packets) - pidinst->nb_eos_signaled - pidinst->nb_clocks_signaled;
+
+	} else {
+		if (pidinst->discard_packets) return 0;
+		return gf_fq_count(pidinst->packets) - pidinst->nb_eos_signaled - pidinst->nb_clocks_signaled;
+	}
+}
+
+static Bool gf_filter_pid_filter_internal_packet(GF_FilterPidInst *pidi, GF_FilterPacketInstance *pcki)
+{
+	Bool is_internal = GF_FALSE;
+	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));
+		assert(pcki->pid->nb_eos_signaled);
+		safe_int_dec(&pcki->pid->nb_eos_signaled);
+		is_internal = GF_TRUE;
+	} else if (ctype == GF_PCK_CMD_PID_REM) {
+		gf_fs_post_task(pidi->filter->session, gf_filter_pid_disconnect_task, pidi->filter, pidi->pid, "pidinst_disconnect", NULL);
+
+		is_internal = GF_TRUE;
+	}
+	ctype = (pcki->pck->info.flags & GF_PCK_CKTYPE_MASK) >> GF_PCK_CKTYPE_POS;
+
+	if (ctype) {
+		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);
+
+		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_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;
+		if (pcki->pid->last_clock_type != GF_FILTER_CLOCK_PCR_DISC)
+			pcki->pid->last_clock_type = ctype;
+
+		if (ctype == GF_FILTER_CLOCK_PCR_DISC) {
+			assert(pcki->pid->last_clock_type == GF_FILTER_CLOCK_PCR_DISC);
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Internal clock reference packet filtered - PID %s clock ref "LLU"/%d - type %d\n", pcki->pid->pid->name, pcki->pid->last_clock_value, pcki->pid->last_clock_timescale, pcki->pid->last_clock_type));
+		//the following call to drop_packet will trigger clock forwarding to all output pids
+		is_internal = GF_TRUE;
+	}
+
+	if (is_internal) gf_filter_pid_drop_packet((GF_FilterPid *)pidi);
+	return is_internal;
+}
+
+GF_EXPORT
+GF_FilterPacket *gf_filter_pid_get_packet(GF_FilterPid *pid)
+{
+	GF_FilterPacketInstance *pcki;
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to fetch a packet on an output PID in filter %s\n", pid->filter->name));
+		return NULL;
+	}
+	if (pidinst->discard_packets || pidinst->detach_pending) {
+		pidinst->filter->nb_pck_io++;
+		return NULL;
+	}
+
+	pcki = (GF_FilterPacketInstance *)gf_fq_head(pidinst->packets);
+	//no packets
+	if (!pcki) {
+		if (pidinst->pid->filter->disabled) {
+			pidinst->is_end_of_stream = pidinst->pid->has_seen_eos = GF_TRUE;
+		}
+		if (!pidinst->is_end_of_stream && pidinst->pid->filter->would_block)
+			gf_filter_pid_check_unblock(pidinst->pid);
+		pidinst->filter->nb_pck_io++;
+		return NULL;
+	}
+	assert(pcki->pck);
+
+	if (gf_filter_pid_filter_internal_packet(pidinst, pcki))  {
+		return gf_filter_pid_get_packet(pid);
+	}
+	pcki->pid->is_end_of_stream = GF_FALSE;
+
+	if ( (pcki->pck->info.flags & GF_PCKF_PROPS_CHANGED) && !pcki->pid_props_change_done) {
+		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:
+		//- the props are not set when querying the first packet (no prop queries on pid)
+		//- the new props are already set if filter_pid_get_property was queried before the first packet dispatch
+		if (pidinst->props) {
+			if (pidinst->force_reconfig || (pidinst->props != pcki->pck->pid_props)) {
+				//destroy if last occurence, removing it from pid as well
+				//only remove if last about to be destroyed, since we may have several pid instances consuming from this pid
+				assert(pidinst->props->reference_count);
+				if (safe_int_dec(& pidinst->props->reference_count) == 0) {
+					//see \ref gf_filter_pid_merge_properties_internal for mutex
+					gf_mx_p(pidinst->pid->filter->tasks_mx);
+					gf_list_del_item(pidinst->pid->properties, pidinst->props);
+					gf_mx_v(pidinst->pid->filter->tasks_mx);
+					gf_props_del(pidinst->props);
+				}
+				pidinst->force_reconfig = GF_FALSE;
+				//set new one
+				pidinst->props = pcki->pck->pid_props;
+				safe_int_inc( & pidinst->props->reference_count );
+			} else {
+				//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));
+			}
+		}
+		if (!skip_props) {
+			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
+			//now work, eg moving from formatA to formatB then back to formatA
+			gf_list_reset(pidinst->filter->blacklisted);
+
+			e = gf_filter_pid_configure(pidinst->filter, pidinst->pid, GF_PID_CONF_RECONFIG);
+			if (e != GF_OK) return NULL;
+			if (pidinst->pid->caps_negociate)
+				return NULL;
+		}
+	}
+	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
+		//we cannot go reentrant, we have to wait until the filter is not in use ...
+		if (pidinst->filter->freg->process_event && pidinst->filter->process_th_id && (pidinst->filter->process_th_id != gf_th_id()) ) {
+			return NULL;
+		}
+		pcki->pid_info_change_done = 1;
+
+		if (pidinst->filter->freg->process_event) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_INFO_UPDATE, pid);
+
+			//the following may fail when some filters use threading on their own
+			//FSESS_CHECK_THREAD(pidinst->filter)
+			res = pidinst->filter->freg->process_event(pidinst->filter, &evt);
+		}
+		
+		if (!res) {
+			pidinst->filter->pid_info_changed = GF_TRUE;
+		}
+	}
+	pidinst->last_pck_fetch_time = gf_sys_clock_high_res();
+
+	return (GF_FilterPacket *)pcki;
+}
+
+GF_EXPORT
+Bool gf_filter_pid_get_first_packet_cts(GF_FilterPid *pid, u64 *cts)
+{
+	GF_FilterPacketInstance *pcki;
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to read packet CTS on an output PID in filter %s\n", pid->filter->name));
+		return GF_FALSE;
+	}
+	if (pidinst->discard_packets) return GF_FALSE;
+
+	pcki = (GF_FilterPacketInstance *)gf_fq_head(pidinst->packets);
+	//no packets
+	if (!pcki) {
+		return GF_FALSE;
+	}
+	assert(pcki->pck);
+
+	if (gf_filter_pid_filter_internal_packet(pidinst, pcki))  {
+		return gf_filter_pid_get_first_packet_cts(pid, cts);
+	}
+
+	if (pidinst->requires_full_data_block && !(pcki->pck->info.flags & GF_PCKF_BLOCK_END))
+		return GF_FALSE;
+	*cts = pcki->pck->info.cts;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_filter_pid_first_packet_is_empty(GF_FilterPid *pid)
+{
+	GF_FilterPacketInstance *pcki;
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to read packet CTS on an output PID in filter %s\n", pid->filter->name));
+		return GF_TRUE;
+	}
+	if (pidinst->discard_packets) return GF_TRUE;
+
+	pcki = (GF_FilterPacketInstance *)gf_fq_head(pidinst->packets);
+	//no packets
+	if (!pcki) {
+		return GF_TRUE;
+	}
+	assert(pcki->pck);
+
+	if (pcki->pck->info.flags & (GF_PCK_CMD_MASK|GF_PCK_CKTYPE_MASK)) {
+		return GF_TRUE;
+	}
+	if (pidinst->requires_full_data_block && !(pcki->pck->info.flags & GF_PCKF_BLOCK_END))
+		return GF_TRUE;
+	return (pcki->pck->data_length || pcki->pck->frame_ifce) ? GF_FALSE : GF_TRUE;
+}
+
+
+static void gf_filter_pidinst_update_stats(GF_FilterPidInst *pidi, GF_FilterPacket *pck)
+{
+	u64 now = gf_sys_clock_high_res();
+	u64 dec_time = now - pidi->last_pck_fetch_time;
+	if (pck->info.flags & GF_PCK_CMD_MASK) return;
+	if (!pidi->filter || pidi->pid->filter->removed) return;
+
+	pidi->filter->nb_pck_processed++;
+	pidi->filter->nb_bytes_processed += pck->data_length;
+
+	pidi->total_process_time += dec_time;
+	if (!pidi->nb_processed) {
+		pidi->first_frame_time = pidi->last_pck_fetch_time;
+	}
+
+	pidi->nb_processed++;
+	if (pck->info.flags & GF_PCK_SAP_MASK) {
+		pidi->nb_sap_processed ++;
+		if (dec_time > pidi->max_sap_process_time) pidi->max_sap_process_time = dec_time;
+		pidi->total_sap_process_time += dec_time;
+	}
+
+	if (dec_time > pidi->max_process_time) pidi->max_process_time = dec_time;
+
+	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;
+		} else {
+			has_ts = GF_FALSE;
+		}
+		
+		if (!pidi->cur_bit_size) {
+			pidi->stats_start_ts = ts;
+			pidi->stats_start_us = now;
+			pidi->cur_bit_size = 8*pck->data_length;
+		} else {
+			Bool flush_stats = GF_FALSE;
+			pidi->cur_bit_size += 8*pck->data_length;
+
+			if (has_ts) {
+				if (pidi->stats_start_ts + 1000000 <= ts) flush_stats = GF_TRUE;
+			} else {
+				if (pidi->stats_start_us + 1000000 <= now) flush_stats = GF_TRUE;
+			}
+
+			if (flush_stats) {
+				u64 rate;
+				u64 diff_t;
+
+				if (has_ts) {
+					rate = pidi->cur_bit_size;
+					rate *= 1000000;
+					diff_t = ts - pidi->stats_start_ts;
+					if (!diff_t) diff_t = 1;
+ 					rate /= diff_t;
+					pidi->avg_bit_rate = (u32) rate;
+					if (pidi->avg_bit_rate > pidi->max_bit_rate) pidi->max_bit_rate = pidi->avg_bit_rate;
+				}
+
+				rate = pidi->cur_bit_size;
+				rate *= 1000000;
+				diff_t = now - pidi->stats_start_us;
+				if (!diff_t) diff_t = 1;
+				rate /= diff_t;
+				pidi->avg_process_rate = (u32) rate;
+				if (pidi->avg_process_rate > pidi->max_process_rate) pidi->max_process_rate = pidi->avg_process_rate;
+
+				//reset stats
+				pidi->cur_bit_size = 0;
+			}
+		}
+	}
+}
+
+static void gf_filter_pidinst_reset_stats(GF_FilterPidInst *pidi)
+{
+	pidi->last_pck_fetch_time = 0;
+	pidi->stats_start_ts = 0;
+	pidi->stats_start_us = 0;
+	pidi->cur_bit_size = 0;
+	pidi->avg_bit_rate = 0;
+	pidi->max_bit_rate = 0;
+	pidi->avg_process_rate = 0;
+	pidi->max_process_rate = 0;
+	pidi->nb_processed = 0;
+	pidi->nb_sap_processed = 0;
+	pidi->total_process_time = 0;
+	pidi->total_sap_process_time = 0;
+	pidi->max_process_time = 0;
+	pidi->max_sap_process_time = 0;
+	pidi->first_frame_time = 0;
+}
+
+GF_EXPORT
+void gf_filter_pid_drop_packet(GF_FilterPid *pid)
+{
+#ifdef GPAC_MEMORY_TRACKING
+	u32 prev_nb_allocs, prev_nb_reallocs, nb_allocs, nb_reallocs;
+#endif
+
+	u32 nb_pck=0;
+	GF_FilterPacket *pck=NULL;
+	GF_FilterPacketInstance *pcki;
+	GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to discard a packet on an output PID in filter %s\n", pid->filter->name));
+		return;
+	}
+	if (pidinst->filter)
+		pidinst->filter->nb_pck_io++;
+
+	//remove pck instance
+	pcki = gf_fq_pop(pidinst->packets);
+
+	if (!pcki) {
+		if (pidinst->filter && !pidinst->filter->finalized) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Attempt to discard a packet already discarded in filter %s\n", pid->filter->name));
+		}
+		return;
+	}
+
+	gf_rmt_begin(pck_drop, GF_RMT_AGGREGATE);
+	pck = pcki->pck;
+	//move to source pid
+	pid = pid->pid;
+
+	gf_filter_pidinst_update_stats(pidinst, pck);
+
+	//make sure we lock the tasks mutex before getting the packet count, otherwise we might end up with a wrong number of packets
+	//if one thread (the caller here) consumes one packet while the dispatching thread is still upddating the state for that pid
+	gf_mx_p(pid->filter->tasks_mx);
+	nb_pck = gf_fq_count(pidinst->packets);
+
+	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;
+		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));
+			d = pidinst->buffer_duration;
+		}
+		assert(d <= pidinst->buffer_duration);
+		safe_int64_sub(&pidinst->buffer_duration, (s32) d);
+	}
+
+	if ( (pid->num_destinations==1) || (pid->filter->session->blocking_mode==GF_FS_NOBLOCK_FANOUT)) {
+		if (nb_pck<pid->nb_buffer_unit) {
+			pid->nb_buffer_unit = nb_pck;
+		}
+		if (!pid->buffer_duration || (pidinst->buffer_duration < (s64) pid->buffer_duration)) {
+			pid->buffer_duration = pidinst->buffer_duration;
+		}
+	}
+	//handle fan-out: we must browse all other pid instances and compute max buffer/nb_pck per pids
+	//so that we don't unblock the PID if some instance is still blocking
+	else {
+		u32 i;
+		u32 min_pck = nb_pck;
+		s64 min_dur = pidinst->buffer_duration;
+		for (i=0; i<pid->num_destinations; i++) {
+			GF_FilterPidInst *a_pidi = gf_list_get(pid->destinations, i);
+			if (a_pidi==pidinst) continue;
+			if (a_pidi->buffer_duration > min_dur)
+				min_dur = a_pidi->buffer_duration;
+			nb_pck = gf_fq_count(a_pidi->packets);
+			if (nb_pck>min_pck)
+				min_pck = nb_pck;
+		}
+		pid->buffer_duration = min_dur;
+		pid->nb_buffer_unit = min_pck;
+	}
+	gf_filter_pid_check_unblock(pid);
+
+	gf_mx_v(pid->filter->tasks_mx);
+
+#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;
+
+		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));
+		} else if ((pck->info.cts != GF_FILTER_NO_TS) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s (%s) drop packet 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.cts, sap_type, seek_flag, nb_pck, pidinst->buffer_duration));
+		} else if ((pck->info.dts != GF_FILTER_NO_TS) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s (%s) drop packet DTS "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, sap_type, seek_flag, nb_pck, pidinst->buffer_duration));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s (%s) drop packet SAP %d Seek %d - %d packets remaining buffer "LLU" us\n", pidinst->filter ? pidinst->filter->name : "disconnected", pid->name, pid->filter->name, sap_type, seek_flag, nb_pck, pidinst->buffer_duration));
+		}
+	}
+#endif
+
+	//destroy pcki
+	pcki->pck = NULL;
+	pcki->pid = NULL;
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (pid->filter && pid->filter->session->check_allocs) {
+		gf_mem_get_stats(&prev_nb_allocs, NULL, &prev_nb_reallocs, NULL);
+	}
+#endif
+
+	if (pid->filter->pcks_inst_reservoir) {
+		gf_fq_add(pid->filter->pcks_inst_reservoir, pcki);
+	} else {
+		gf_free(pcki);
+	}
+	//unref pck
+	assert(pck->reference_count);
+	if (safe_int_dec(&pck->reference_count) == 0) {
+		gf_filter_packet_destroy(pck);
+	}
+
+#ifdef GPAC_MEMORY_TRACKING
+	if (pid->filter && pid->filter->session->check_allocs) {
+		gf_mem_get_stats(&nb_allocs, NULL, &nb_reallocs, NULL);
+
+		pid->filter->session->nb_alloc_pck += (nb_allocs - prev_nb_allocs);
+		pid->filter->session->nb_realloc_pck += (nb_reallocs - prev_nb_reallocs);
+	}
+#endif
+
+	//decrement number of pending packet on target filter if this is not a destroy
+	if (pidinst->filter) {
+		assert(pidinst->filter->pending_packets);
+		safe_int_dec(&pidinst->filter->pending_packets);
+
+		gf_filter_forward_clock(pidinst->filter);
+	}
+
+	gf_rmt_end();
+}
+
+GF_EXPORT
+Bool gf_filter_pid_is_eos(GF_FilterPid *pid)
+{
+	GF_FilterPacketInstance *pcki;
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+
+	if (pidi->detach_pending)
+		return GF_FALSE;
+		
+	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 && !pidi->discard_inputs && !pidi->discard_packets) {
+		((GF_FilterPidInst *)pid)->is_end_of_stream = GF_FALSE;
+		return GF_FALSE;
+	}
+	//peek next for eos
+	pcki = (GF_FilterPacketInstance *)gf_fq_head(pidi->packets);
+	if (pcki)
+		gf_filter_pid_filter_internal_packet(pidi, pcki);
+
+	if (pidi->discard_packets) return GF_FALSE;
+	if (!pidi->is_end_of_stream) return GF_FALSE;
+	if (!pidi->filter->eos_probe_state)
+		pidi->filter->eos_probe_state = 1;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+void gf_filter_pid_set_eos(GF_FilterPid *pid)
+{
+	GF_FilterPacket *pck;
+
+	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));
+		return;
+	}
+	if (pid->has_seen_eos) return;
+
+	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);
+	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+	pck->pck->info.flags |= GF_PCK_CMD_PID_EOS;
+	gf_filter_pck_send(pck);
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_enum_properties(GF_FilterPid *pid, u32 *idx, u32 *prop_4cc, const char **prop_name)
+{
+	GF_PropertyMap *props;
+
+	if (PID_IS_INPUT(pid)) {
+		gf_mx_p(pid->filter->tasks_mx);
+		props = gf_list_last(pid->pid->properties);
+		gf_mx_v(pid->filter->tasks_mx);
+	} else {
+		props = check_new_pid_props(pid, GF_FALSE);
+	}
+	if (!props) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("No properties for pid in filter %s, ignoring enum\n", pid->filter->name));
+		*idx = 0xFFFFFFFF;
+		return NULL;
+	}
+	return gf_props_enum_property(props, idx, prop_4cc, prop_name);
+}
+
+GF_EXPORT
+Bool gf_filter_pid_would_block(GF_FilterPid *pid)
+{
+	Bool would_block=GF_FALSE;
+	Bool blockmode_broken=GF_FALSE;
+
+	if (PID_IS_INPUT(pid)) {
+		return GF_FALSE;
+	}
+
+	if (pid->filter->session->blocking_mode==GF_FS_NOBLOCK)
+		return GF_FALSE;
+
+	gf_mx_p(pid->filter->tasks_mx);
+	//either block according to the number of dispatched units (decoder output) or to the requested buffer duration
+	if (pid->max_buffer_unit) {
+		if (pid->nb_buffer_unit * GF_FILTER_SPEED_SCALER >= pid->max_buffer_unit * pid->playback_speed_scaler) {
+			would_block = GF_TRUE;
+		}
+		if ((pid->num_destinations==1) && !pid->filter->blockmode_broken && ( (pid->nb_buffer_unit * GF_FILTER_SPEED_SCALER > 100 * pid->max_buffer_unit * pid->playback_speed_scaler) ) ) {
+			blockmode_broken = GF_TRUE;
+		}
+	} else if (pid->max_buffer_time) {
+		if (pid->buffer_duration * GF_FILTER_SPEED_SCALER > pid->max_buffer_time * pid->playback_speed_scaler) {
+			would_block = GF_TRUE;
+		}
+		if ((pid->num_destinations==1) && !pid->filter->blockmode_broken && (pid->buffer_duration * GF_FILTER_SPEED_SCALER > 100 * pid->max_buffer_time * pid->playback_speed_scaler) ) {
+			blockmode_broken = GF_TRUE;
+		}
+	}
+	if (blockmode_broken) {
+		//don't throw a warning since some filters may dispatch a large burst of packets (eg isom muxer)
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s block mode not respected: %u units "LLU" us vs %u max units "LLU" max buffer\n", pid->pid->filter->name, pid->pid->name, pid->nb_buffer_unit, pid->buffer_duration, pid->max_buffer_unit, pid->max_buffer_time));
+
+		pid->filter->blockmode_broken = GF_TRUE;
+	}
+
+	if (would_block && !pid->would_block) {
+		safe_int_inc(&pid->would_block);
+		safe_int_inc(&pid->filter->would_block);
+		assert(pid->filter->would_block + pid->filter->num_out_pids_not_connected <= pid->filter->num_output_pids);
+
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_FILTER, GF_LOG_DEBUG)) {
+			if (pid->max_buffer_unit) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s blocked (%d units vs %d max units) - %d filter PIDs blocked\n", pid->pid->filter->name, pid->pid->name, pid->nb_buffer_unit, pid->max_buffer_unit, pid->filter->would_block));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter %s PID %s blocked ("LLU" us vs "LLU" max buffer) - %d filter PIDs blocked\n", pid->pid->filter->name, pid->pid->name, pid->buffer_duration, pid->max_buffer_time, pid->filter->would_block));
+			}
+		}
+#endif
+	}
+	assert(pid->filter->would_block <= pid->filter->num_output_pids);
+	gf_mx_v(pid->filter->tasks_mx);
+	return would_block;
+}
+
+GF_EXPORT
+u64 gf_filter_pid_query_buffer_duration(GF_FilterPid *pid, Bool check_pid_full)
+{
+	u32 count, i, j;
+	u64 duration=0;
+	if (!pid || pid->filter->session->in_final_flush)
+		return GF_FILTER_NO_TS;
+
+	if (PID_IS_INPUT(pid)) {
+		GF_Filter *filter;
+		GF_FilterPidInst *pidinst = (GF_FilterPidInst *)pid;
+		if (!pidinst->pid) return 0;
+		filter = pidinst->pid->filter;
+		if (check_pid_full) {
+			Bool buffer_full = GF_FALSE;
+
+			if (pidinst->pid->max_buffer_unit && (pidinst->pid->max_buffer_unit<=pidinst->pid->nb_buffer_unit))
+				buffer_full = GF_TRUE;
+
+			if (pidinst->pid->max_buffer_time && (pidinst->pid->max_buffer_time<=pidinst->pid->buffer_duration))
+				buffer_full = GF_TRUE;
+
+			if (!buffer_full)
+				return 0;
+		}
+		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);
+			if (dur > duration)
+				duration = dur;
+		}
+		duration += pidinst->buffer_duration;
+		return duration;
+	} else {
+		u32 count2;
+		u64 max_dur=0;
+
+		if (check_pid_full) {
+			if (pid->max_buffer_unit && (pid->max_buffer_unit>pid->nb_buffer_unit))
+				return 0;
+			if (pid->max_buffer_time && (pid->max_buffer_time>pid->buffer_duration))
+				return 0;
+		}
+
+		count = pid->num_destinations;
+		for (i=0; i<count; i++) {
+			GF_FilterPidInst *pidinst = gf_list_get(pid->destinations, i);
+
+			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);
+				if (dur > max_dur ) max_dur = dur;
+			}
+		}
+		duration += max_dur;
+	}
+	return duration;
+}
+
+
+GF_EXPORT
+Bool gf_filter_pid_has_seen_eos(GF_FilterPid *pid)
+{
+	u32 i;
+	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;
+	if (pid->pid->filter->block_eos) return GF_FALSE;
+	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;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+const char *gf_filter_event_name(GF_FEventType type)
+{
+	switch (type) {
+	case GF_FEVT_PLAY: return "PLAY";
+	case GF_FEVT_SET_SPEED: return "SET_SPEED";
+	case GF_FEVT_STOP: return "STOP";
+	case GF_FEVT_SOURCE_SEEK: return "SOURCE_SEEK";
+	case GF_FEVT_SOURCE_SWITCH: return "SOURCE_SWITCH";
+	case GF_FEVT_ATTACH_SCENE: return "ATTACH_SCENE";
+	case GF_FEVT_RESET_SCENE: return "RESET_SCENE";
+	case GF_FEVT_PAUSE: return "PAUSE";
+	case GF_FEVT_RESUME: return "RESUME";
+	case GF_FEVT_QUALITY_SWITCH: return "QUALITY_SWITCH";
+	case GF_FEVT_VISIBILITY_HINT: return "VISIBILITY_HINT";
+	case GF_FEVT_INFO_UPDATE: return "INFO_UPDATE";
+	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_CAPS_CHANGE: return "CAPS_CHANGED";
+	case GF_FEVT_CONNECT_FAIL: return "CONNECT_FAIL";
+	case GF_FEVT_PLAY_HINT: return "PLAY_HINT";
+	default:
+		return "UNKNOWN";
+	}
+}
+
+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 ));
+	assert(pidi->pid->discard_input_packets);
+
+	if (had_eos) *had_eos = GF_FALSE;
+	
+	while (gf_fq_count(pidi->packets)) {
+		GF_FilterPacketInstance *pcki = gf_fq_head(pidi->packets);
+		if ( (pcki->pck->info.flags & GF_PCK_CMD_MASK) == GF_PCK_CMD_PID_EOS) {
+			if (had_eos)
+				*had_eos = GF_TRUE;
+		}
+		gf_filter_pid_drop_packet((GF_FilterPid *) pidi);
+	}
+	while (gf_list_count(pidi->pck_reassembly)) {
+		GF_FilterPacketInstance *pcki = gf_list_pop_back(pidi->pck_reassembly);
+		pcki_del(pcki);
+	}
+	gf_filter_pidinst_reset_stats(pidi);
+
+	pidi->discard_packets = GF_FALSE;
+	pidi->last_block_ended = GF_TRUE;
+	pidi->first_block_started = GF_FALSE;
+	pidi->is_end_of_stream = GF_FALSE;
+	pidi->buffer_duration = 0;
+	pidi->nb_eos_signaled = 0;
+	pidi->pid->has_seen_eos = GF_FALSE;
+
+	assert(pidi->pid->filter->stream_reset_pending);
+	safe_int_dec(& pidi->pid->filter->stream_reset_pending );
+
+	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)
+{
+	gf_filter_pid_reset_task_ex(task, NULL);
+}
+
+static void gf_filter_pid_reset_stop_task(GF_FSTask *task)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)task->udta;
+	Bool has_eos;
+	gf_filter_pid_reset_task_ex(task, &has_eos);
+	pidi->is_end_of_stream = has_eos;
+	pidi->pid->has_seen_eos = has_eos;
+}
+
+typedef struct
+{
+	u32 ref_count;
+	char string[1];
+} GF_RefString;
+
+#define TO_REFSTRING(_v) (GF_RefString *) (_v - offsetof(GF_RefString, string))
+
+static GF_RefString *evt_get_refstr(GF_FilterEvent *evt)
+{
+	if (evt->base.type == GF_FEVT_FILE_DELETE) {
+		return TO_REFSTRING(evt->file_del.url);
+	}
+	if (evt->base.type == GF_FEVT_SOURCE_SWITCH) {
+		return TO_REFSTRING(evt->seek.source_switch);
+	}
+	if (evt->base.type == GF_FEVT_SEGMENT_SIZE) {
+		return TO_REFSTRING(evt->seg_size.seg_url);
+	}
+	return NULL;
+}
+static GF_FilterEvent *dup_evt(GF_FilterEvent *evt)
+{
+	GF_FilterEvent *an_evt;
+	GF_RefString *rstr = evt_get_refstr(evt);
+	an_evt = gf_malloc(sizeof(GF_FilterEvent));
+	memcpy(an_evt, evt, sizeof(GF_FilterEvent));
+	if (rstr) {
+		safe_int_inc(&rstr->ref_count);
+	}
+	return an_evt;
+}
+
+static void free_evt(GF_FilterEvent *evt)
+{
+	GF_RefString *rstr = evt_get_refstr(evt);
+	if (rstr) {
+		assert(rstr->ref_count);
+		if (safe_int_dec(&rstr->ref_count) == 0) {
+			gf_free(rstr);
+		}
+	}
+	gf_free(evt);
+}
+
+static GF_FilterEvent *init_evt(GF_FilterEvent *evt)
+{
+	char **url_addr_src = NULL;
+	char **url_addr_dst = NULL;
+	GF_FilterEvent *an_evt = gf_malloc(sizeof(GF_FilterEvent));
+	memcpy(an_evt, evt, sizeof(GF_FilterEvent));
+
+	if (evt->base.type==GF_FEVT_FILE_DELETE) {
+		url_addr_src = (char **) &evt->file_del.url;
+		url_addr_dst = (char **) &an_evt->file_del.url;
+	} else if (evt->base.type==GF_FEVT_SOURCE_SWITCH) {
+		url_addr_src = (char **) &evt->seek.source_switch;
+		url_addr_dst = (char **) &an_evt->seek.source_switch;
+	} else if (evt->base.type==GF_FEVT_SEGMENT_SIZE) {
+		url_addr_src = (char **) &evt->seg_size.seg_url;
+		url_addr_dst = (char **) &an_evt->seg_size.seg_url;
+	}
+	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];
+	}
+	return an_evt;
+}
+
+void gf_filter_pid_send_event_downstream(GF_FSTask *task)
+{
+	u32 i, count;
+	Bool canceled = GF_FALSE;
+	GF_FilterEvent *evt = task->udta;
+	GF_Filter *f = task->filter;
+	GF_List *dispatched_filters = NULL;
+	Bool evt_reused=GF_FALSE;
+
+	//if stream reset task is posted, wait for it before processing this event
+	if (f->stream_reset_pending) {
+		TASK_REQUEUE(task)
+		return;
+	}
+	//if some pids are still detached, wait for the connection before processing this event
+	if (f->detached_pid_inst) {
+		TASK_REQUEUE(task)
+		task->can_swap = GF_TRUE;
+		return;
+	}
+
+	if (evt->base.on_pid) {
+		assert(evt->base.on_pid->filter->num_events_queued);
+		safe_int_dec(&evt->base.on_pid->filter->num_events_queued);
+	}
+
+	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) {
+			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;
+			evt->base.on_pid->max_buffer_unit = 0;
+			//update blocking state
+			if (evt->base.on_pid->would_block)
+				gf_filter_pid_check_unblock(evt->base.on_pid);
+			else
+				gf_filter_pid_would_block(evt->base.on_pid);
+			canceled = GF_TRUE;
+		}
+	} else if (evt->base.on_pid && (evt->base.type == GF_FEVT_PLAY)
+		&& (evt->base.on_pid->pid->is_playing || (((GF_FilterPid *) evt->base.on_pid->pid)->not_connected==2))
+		) {
+		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 already playing, discarding\n", f->name, evt->base.on_pid->name, gf_filter_event_name(evt->base.type)));
+		}
+		free_evt(evt);
+		return;
+	} else if (evt->base.on_pid && (evt->base.type == GF_FEVT_STOP) && !evt->base.on_pid->pid->is_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)));
+
+		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) {
+				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 (pid->not_connected)
+			pid->not_connected = 2;
+		return;
+	} else if (f->freg->process_event) {
+		FSESS_CHECK_THREAD(f)
+		canceled = f->freg->process_event(f, evt);
+	}
+
+	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
+		//phase
+		if (evt->base.type==GF_FEVT_PLAY) {
+			pid->is_playing = GF_TRUE;
+			pid->filter->nb_pids_playing++;
+			if (pid->initial_play_done) {
+				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;
+			}
+		} else if (evt->base.type==GF_FEVT_STOP) {
+			pid->is_playing = GF_FALSE;
+			pid->filter->nb_pids_playing--;
+
+			if (pid->not_connected)
+				pid->not_connected = 2;
+		} else if (evt->base.type==GF_FEVT_SOURCE_SEEK) {
+			pid->is_playing = GF_TRUE;
+			pid->filter->nb_pids_playing++;
+		}
+		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)
+				safe_int_inc(& pid->discard_input_packets );
+
+			safe_int_inc(& pid->filter->stream_reset_pending );
+
+			//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);
+			else
+				gf_fs_post_task(pidi->filter->session, gf_filter_pid_reset_task, pidi->filter, NULL, "reset_pid", pidi);
+		}
+		pid->nb_reaggregation_pending = 0;
+	}
+	
+	//after  play or seek, request a process task for source filters or filters having pending packets
+	if (!f->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);
+		}
+	}
+
+	//quick hack for filters with one input pid and one outout pid, set discard on/off on the input
+	//this avoids cases like TS demux dispatching data to inactive filters not checking their input
+	//which ends up in session deadlock (filter still flagged as active and with pending packets)
+	//if more than one input or more than one output, only the filter can decide what to do if some of the
+	//streams are active and other not
+	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) {
+			if (evt->base.type==GF_FEVT_STOP) {
+				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);
+			}
+		}
+	}
+
+	if ((evt->base.type==GF_FEVT_PLAY) || (evt->base.type==GF_FEVT_SET_SPEED)) {
+		if (evt->base.on_pid) {
+			u32 scaler = (u32)  ( (evt->play.speed<0) ? -evt->play.speed : evt->play.speed ) * GF_FILTER_SPEED_SCALER;
+			if (!scaler) scaler = GF_FILTER_SPEED_SCALER;
+			if (scaler != evt->base.on_pid->playback_speed_scaler) {
+				u32 prev_scaler = evt->base.on_pid->playback_speed_scaler;
+				evt->base.on_pid->playback_speed_scaler = scaler;
+				//lowering speed, we may need to trigger blocking
+				if (scaler<prev_scaler)
+					gf_filter_pid_would_block(evt->base.on_pid);
+				//increasing speed, we may want to unblock
+				else
+					gf_filter_pid_check_unblock(evt->base.on_pid);
+			}
+		}
+	}
+	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
+	count = f->num_input_pids;
+	if (count==0) canceled = GF_TRUE;
+
+	if (canceled) {
+		free_evt(evt);
+		return;
+	}
+	if (!task->pid) dispatched_filters = gf_list_new();
+
+	//otherwise forward event to each input PID
+	for (i=0; i<count; i++) {
+		GF_FilterEvent *an_evt;
+		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;
+
+			gf_list_add(dispatched_filters, pid_inst->pid->filter);
+		}
+
+		//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->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->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);
+	}
+	if (dispatched_filters) gf_list_del(dispatched_filters);
+	if (!evt_reused) free_evt(evt);
+	return;
+}
+
+void gf_filter_pid_send_event_upstream(GF_FSTask *task)
+{
+	u32 i, j;
+	Bool canceled = GF_FALSE;
+	GF_FilterEvent *evt = task->udta;
+	GF_Filter *f = task->filter;
+
+	if (f->stream_reset_pending) {
+		TASK_REQUEUE(task)
+		return;
+	}
+
+	canceled = f->freg->process_event ? f->freg->process_event(f, evt) : GF_TRUE;
+	if (!canceled) {
+		for (i=0; i<f->num_output_pids; i++) {
+			GF_FilterPid *apid = gf_list_get(f->output_pids, i);
+			for (j=0; j<apid->num_destinations; j++) {
+				GF_FilterEvent *an_evt;
+				GF_FilterPidInst *pidi = gf_list_get(apid->destinations, j);
+
+				an_evt = dup_evt(evt);
+				an_evt->base.on_pid = (GF_FilterPid *)pidi;
+				gf_fs_post_task(pidi->filter->session, gf_filter_pid_send_event_upstream, pidi->filter, NULL, "upstream_event", an_evt);
+			}
+		}
+	}
+	free_evt(evt);
+}
+
+void gf_filter_pid_send_event_internal(GF_FilterPid *pid, GF_FilterEvent *evt, Bool force_downstream)
+{
+	GF_FilterEvent *an_evt;
+	GF_FilterPid *target_pid=NULL;
+	Bool upstream=GF_FALSE;
+	if (!pid) {
+		pid = evt->base.on_pid;
+		if (!pid) return;
+	}
+	//filter is being shut down, prevent any event posting
+	if (pid->filter->finalized) return;
+
+	if ((evt->base.type==GF_FEVT_FILE_DELETE) && !evt->file_del.url) return;
+
+	if (!force_downstream && PID_IS_OUTPUT(pid)) {
+		upstream = GF_TRUE;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s PID %s queuing %s event %s\n", pid->pid->filter->name, pid->pid->name, upstream ? "upstream" : "downstream", gf_filter_event_name(evt->base.type) ));
+
+	if (upstream) {
+		u32 i, j;
+
+		an_evt = init_evt(evt);
+
+		for (i=0; i<pid->filter->num_output_pids; i++) {
+			GF_FilterPid *apid = gf_list_get(pid->filter->output_pids, i);
+			if (evt->base.on_pid && (apid != evt->base.on_pid)) continue;
+			for (j=0; j<apid->num_destinations; j++) {
+				GF_FilterEvent *up_evt;
+				GF_FilterPidInst *pidi = gf_list_get(apid->destinations, j);
+
+				up_evt = dup_evt(an_evt);
+				up_evt->base.on_pid = (GF_FilterPid *)pidi;
+				gf_fs_post_task(pidi->filter->session, gf_filter_pid_send_event_upstream, pidi->filter, NULL, "upstream_event", up_evt);
+			}
+		}
+		free_evt(an_evt);
+		return;
+	}
+
+
+	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++) {
+			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->pid->discard_input_packets );
+			}
+		}
+	}
+
+	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);
+	}
+	gf_fs_post_task(pid->pid->filter->session, gf_filter_pid_send_event_downstream, pid->pid->filter, target_pid, "downstream_event", an_evt);
+}
+
+GF_EXPORT
+void gf_filter_pid_send_event(GF_FilterPid *pid, GF_FilterEvent *evt)
+{
+	if (!evt) return;
+	if (evt->base.type==GF_FEVT_RESET_SCENE) return;
+	if (evt->base.type==GF_FEVT_INFO_UPDATE) return;
+
+	gf_filter_pid_send_event_internal(pid, evt, GF_FALSE);
+}
+
+GF_EXPORT
+void gf_filter_send_event(GF_Filter *filter, GF_FilterEvent *evt, Bool upstream)
+{
+	GF_FilterEvent *an_evt;
+	if (!filter) return;
+	if (filter->multi_sink_target)
+		filter = filter->multi_sink_target;
+
+	//filter is being shut down, prevent any event posting
+	if (filter->finalized) return;
+	if (!evt) return;
+	if ((evt->base.type==GF_FEVT_FILE_DELETE) && !evt->file_del.url) return;
+
+	if (evt->base.type==GF_FEVT_RESET_SCENE)
+		return;
+
+	if (evt->base.on_pid && PID_IS_OUTPUT(evt->base.on_pid)) {
+		gf_filter_pid_send_event_internal(evt->base.on_pid, evt, GF_FALSE);
+		return;
+	}
+
+	//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) {
+			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;
+		}
+	}
+
+	an_evt = init_evt(evt);
+
+	if (evt->base.on_pid) {
+		safe_int_inc(&evt->base.on_pid->filter->num_events_queued);
+	}
+
+	gf_fs_post_task(filter->session, gf_filter_pid_send_event_downstream, filter, evt->base.on_pid, "downstream_event", an_evt);
+}
+
+
+GF_EXPORT
+void gf_filter_pid_exec_event(GF_FilterPid *pid, GF_FilterEvent *evt)
+{
+	//filter is being shut down, prevent any event posting
+	if (pid->pid->filter->finalized) return;
+	if (! (pid->pid->filter->freg->flags &	GF_FS_REG_MAIN_THREAD)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Executing event on PID %s created by filter %s not running on main thread, not allowed\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+
+	if (pid->pid->filter->freg->process_event) {
+		if (evt->base.on_pid) evt->base.on_pid = evt->base.on_pid->pid;
+		FSESS_CHECK_THREAD(pid->pid->filter)
+		pid->pid->filter->freg->process_event(pid->pid->filter, evt);
+	}
+}
+
+
+GF_EXPORT
+Bool gf_filter_pid_is_filter_in_parents(GF_FilterPid *pid, GF_Filter *filter)
+{
+	if (!pid || !filter) return GF_FALSE;
+	pid = pid->pid;
+	return filter_in_parent_chain(pid->pid->filter, filter);
+}
+
+static void filter_pid_collect_stats(GF_List *pidi_list, GF_FilterPidStatistics *stats)
+{
+	u32 i;
+	for (i=0; i<gf_list_count(pidi_list); i++) {
+		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;
+	}
+}
+
+static GF_Filter *filter_locate_enc_dec_sink(GF_Filter *filter, Bool locate_decoder)
+{
+	u32 i, j;
+
+	for (i=0; i<filter->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(filter->output_pids, i);
+		for (j=0; j<pid->num_destinations; j++) {
+			GF_Filter *res;
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, j);
+			if (pidi->is_decoder_input) return pidi->filter;
+			res = filter_locate_enc_dec_sink(pidi->filter, locate_decoder);
+			if (res) return res;
+		}
+	}
+	return NULL;
+}
+
+static GF_Filter *filter_locate_enc_dec_src(GF_Filter *filter, Bool locate_decoder)
+{
+	u32 i;
+
+	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;
+
+		res = filter_locate_enc_dec_sink(pidi->pid->filter, locate_decoder);
+		if (res) return res;
+	}
+	return NULL;
+}
+
+
+GF_EXPORT
+GF_Err gf_filter_pid_get_statistics(GF_FilterPid *pid, GF_FilterPidStatistics *stats, GF_FilterPidStatsLocation location)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+	GF_Filter *filter=NULL;
+	Bool for_decoder=GF_TRUE;
+
+	memset(stats, 0, sizeof(GF_FilterPidStatistics) );
+	if (!pidi->pid) {
+		stats->disconnected = GF_TRUE;
+		return GF_OK;
+	}
+
+	switch (location) {
+	case GF_STATS_LOCAL:
+		if (PID_IS_OUTPUT(pid)) {
+			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;
+		return GF_OK;
+	case GF_STATS_LOCAL_INPUTS:
+		if (PID_IS_OUTPUT(pid)) {
+			filter_pid_collect_stats(pid->destinations, stats);
+			return GF_OK;
+		}
+		filter = pidi->pid->filter;
+		break;
+	case GF_STATS_ENCODER_SOURCE:
+		for_decoder = GF_FALSE;
+	case GF_STATS_DECODER_SOURCE:
+		filter = filter_locate_enc_dec_src(pidi->pid->filter, for_decoder);
+		break;
+	case GF_STATS_ENCODER_SINK:
+		for_decoder = GF_FALSE;
+	case GF_STATS_DECODER_SINK:
+		filter = filter_locate_enc_dec_sink(pidi->pid->filter, for_decoder);
+		break;
+	}
+	if (!filter) {
+		return GF_NOT_FOUND;
+	}
+	filter_pid_collect_stats(filter->input_pids, stats);
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_filter_pid_remove(GF_FilterPid *pid)
+{
+	GF_FilterPacket *pck;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Removing PID input filter (%s:%s) not allowed\n", pid->filter->name, pid->pid->name));
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Filter %s removed output PID %s\n", pid->filter->name, pid->pid->name));
+
+	if (pid->filter->removed) {
+		return;
+	}
+	if (pid->removed) {
+		return;
+	}
+	pid->removed = GF_TRUE;
+	if (pid->filter->marked_for_removal || (pid->has_seen_eos && !pid->nb_buffer_unit)) {
+		u32 i;
+		for (i=0; i<pid->num_destinations; i++) {
+			GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+			gf_fs_post_task(pidi->filter->session, gf_filter_pid_disconnect_task, pidi->filter, pidi->pid, "pidinst_disconnect", NULL);
+		}
+		return;
+	}
+
+	//we create a fake packet for removal signaling
+	pck = gf_filter_pck_new_shared_internal(pid, NULL, 0, NULL, GF_TRUE);
+	gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+	pck->pck->info.flags |= GF_PCK_CMD_PID_REM;
+	gf_filter_pck_send(pck);
+}
+
+GF_EXPORT
+void gf_filter_pid_try_pull(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to pull from output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid = pid->pid;
+	if (pid->filter->session->threads) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Filter pull in multithread mode not yet implementing - defaulting to 1 ms sleep\n", pid->pid->name, pid->filter->name));
+		gf_sleep(1);
+		return;
+	}
+
+	gf_filter_process_inline(pid->filter);
+}
+
+
+GF_EXPORT
+GF_FilterClockType gf_filter_pid_get_clock_info(GF_FilterPid *pid, u64 *clock_time, u32 *timescale)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+	GF_FilterClockType res;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Querying clock on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return GF_FILTER_CLOCK_NONE;
+	}
+	if (clock_time) *clock_time = pidi->last_clock_value;
+	if (timescale) *timescale = pidi->last_clock_timescale;
+	res = pidi->last_clock_type;
+	pidi->last_clock_type = 0;
+	return res;
+}
+
+GF_EXPORT
+u32 gf_filter_pid_get_timescale(GF_FilterPid *pid)
+{
+	GF_PropertyMap *map = pid ? gf_list_get(pid->pid->properties, 0) : 0;
+	return map ? map->timescale : 0;
+}
+
+GF_EXPORT
+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;
+
+		for (j=0; j<apid->num_destinations; j++) {
+			GF_FilterPidInst *apidi = gf_list_get(apid->destinations, j);
+			if (apidi->filter != pidi->filter) continue;
+
+			if (apidi->is_end_of_stream) {
+				apidi->is_end_of_stream = GF_FALSE;
+			}
+			if (apid->has_seen_eos) {
+				apid->has_seen_eos = GF_FALSE;
+				gf_filter_pid_check_unblock(apid);
+			}
+
+			if (apidi->pid->filter->would_block && apidi->pid->filter->num_input_pids) {
+				u32 k;
+				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);
+				}
+			}
+		}
+	}
+	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);
+	}
+
+}
+
+GF_EXPORT
+void gf_filter_pid_set_clock_mode(GF_FilterPid *pid, Bool filter_in_charge)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *)pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Changing clock mode on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pidi->handles_clock_references = filter_in_charge;
+}
+
+GF_EXPORT
+const char *gf_filter_pid_get_args(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Querying args on output PID %s in filter %s\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+	if (pid->pid->filter->src_args) return pid->pid->filter->src_args;
+	return pid->pid->filter->orig_args;
+}
+
+GF_EXPORT
+void gf_filter_pid_set_max_buffer(GF_FilterPid *pid, u32 total_duration_us)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Setting max buffer on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid->max_buffer_time = pid->user_max_buffer_time = total_duration_us;
+}
+
+GF_EXPORT
+u32 gf_filter_pid_get_max_buffer(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Querying max buffer on output PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return 0;
+	}
+	return pid->pid->user_max_buffer_time;
+}
+
+
+GF_EXPORT
+void gf_filter_pid_set_loose_connect(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Setting loose connect on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid->not_connected_ok = GF_TRUE;
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_caps_query(GF_FilterPid *pid, u32 prop_4cc)
+{
+	u32 i;
+	GF_PropertyMap *map = pid->pid->caps_negociate;
+	if (PID_IS_INPUT(pid)) {
+		u32 k;
+		GF_Filter *dst = pid->filter->cap_dst_filter;
+		//the first entry in destination filters may be the fnal destination and won't hold any caps query
+		//we therefore use the last entry which points to the next filter in the chain
+		if (!dst) dst = gf_list_last(pid->filter->destination_filters);
+		if (!dst) dst = gf_list_get(pid->filter->destination_links, 0);
+
+		if (!dst || (dst->cap_idx_at_resolution<0) ) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Reconfig caps query on input PID %s in filter %s with no destination filter set\n", pid->pid->name, pid->filter->name));
+			return NULL;
+		}
+		for (k=dst->cap_idx_at_resolution; k<dst->freg->nb_caps; k++) {
+			const GF_FilterCapability *cap = &dst->freg->caps[k];
+			if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) return NULL;
+
+			if (!(cap->flags & GF_CAPFLAG_INPUT)) continue;
+			if (cap->flags & GF_CAPFLAG_OPTIONAL) continue;
+			if (cap->code == prop_4cc) return &cap->val;
+		}
+		return NULL;
+	}
+	if (map) return gf_props_get_property(map, prop_4cc, NULL);
+	for (i=0; i<pid->num_destinations; i++) {
+		u32 j;
+		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+		for (j=0; j<pidi->filter->nb_forced_caps; j++) {
+			if (pidi->filter->forced_caps[j].code==prop_4cc)
+				return &pidi->filter->forced_caps[j].val;
+		}
+		//walk up the chain
+		for (j=0; j<pidi->filter->num_output_pids; j++) {
+			GF_FilterPid *apid = gf_list_get(pidi->filter->output_pids, j);
+			if (apid) {
+				const GF_PropertyValue *p = gf_filter_pid_caps_query(apid, prop_4cc);
+				if (p) return p;
+			}
+		}
+
+	}
+
+	//trick here: we may not be connected yet (called during a configure_pid), use the target destination
+	//of the filter as caps source
+	if (gf_list_count(pid->filter->destination_filters) ) {
+		GF_Filter *a_filter = gf_list_get(pid->filter->destination_filters, 0);
+		while (a_filter) {
+			for (i=0; i<a_filter->nb_forced_caps; i++) {
+				if (a_filter->forced_caps[i].code==prop_4cc)
+					return &a_filter->forced_caps[i].val;
+			}
+			a_filter = gf_list_get(a_filter->destination_filters, 0);
+		}
+	}
+
+	//second trick here: we may not be connected yet (called during a configure_pid), use the target destination
+	//of the filter as caps source
+	if (pid->filter->cap_dst_filter) {
+		GF_Filter *a_filter = pid->filter->cap_dst_filter;
+		for (i=0; i<a_filter->nb_forced_caps; i++) {
+			if (a_filter->forced_caps[i].code==prop_4cc)
+				return &a_filter->forced_caps[i].val;
+		}
+	}
+
+	return NULL;
+}
+
+GF_EXPORT
+const GF_PropertyValue *gf_filter_pid_caps_query_str(GF_FilterPid *pid, const char *prop_name)
+{
+	GF_PropertyMap *map = pid->caps_negociate;
+	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;
+	}
+	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)
+{
+	u32 k;
+	char szFormat[30], szTemplateVal[GF_MAX_PATH], szPropVal[GF_PROP_DUMP_ARG_SIZE];
+	char *name = szTemplate;
+	if (!strchr(szTemplate, '$')) {
+		strcpy(szFinalName, szTemplate);
+		return GF_OK;
+	}
+	
+	k = 0;
+	while (name[0]) {
+		char *sep=NULL;
+		char *fsep=NULL;
+		const char *str_val = NULL;
+		s64 value = 0;
+		Bool is_ok = GF_TRUE;
+		Bool do_skip = GF_FALSE;
+		Bool has_val = GF_FALSE;
+		Bool is_file_str = GF_FALSE;
+		u32 prop_4cc = 0;
+		GF_PropertyValue prop_val_patched;
+		const GF_PropertyValue *prop_val = NULL;
+
+		if (k+1==GF_MAX_PATH) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] Not enough memory to solve file template %s\n", szTemplate));
+			return GF_OUT_OF_MEM;
+		}
+		if (name[0] != '$') {
+			szFinalName[k] = name[0];
+			k++;
+			name++;
+			continue;
+		}
+		if (name[1]=='$') {
+			szFinalName[k] = '$';
+			name++;
+			k++;
+			continue;
+		}
+		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));
+			strcpy(szFinalName, szTemplate);
+			return GF_BAD_PARAM;
+		}
+		szFormat[0] = '%';
+		szFormat[1] = 'd';
+		szFormat[2] = 0;
+
+		szFinalName[k] = 0;
+		name++;
+		sep[0]=0;
+		fsep = strchr(name, '%');
+		if (fsep) {
+			strcpy(szFormat, fsep);
+			fsep[0]=0;
+		}
+
+		if (!strcmp(name, "num")) {
+			name += 3;
+			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);
+			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);
+			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 (!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));
+				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));
+					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));
+				is_ok = GF_FALSE;
+			}
+		} else if (!strncmp(name, "Number", 6)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "Time", 4)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "RepresentationID", 16)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "Bandwidth", 9)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "SubNumber", 9)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "Init", 4)) {
+			do_skip = GF_TRUE;
+		} else if (!strncmp(name, "Path", 4)) {
+			do_skip = GF_TRUE;
+		} else {
+			char *next_eq = strchr(name, '=');
+			char *next_sep = strchr(name, '$');
+			if (!next_eq || (next_eq - name < next_sep - name)) {
+				prop_4cc = gf_props_get_id(name);
+				//not matching, try with name
+				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));
+						is_ok = GF_FALSE;
+					}
+				} else {
+					prop_val = gf_filter_pid_get_property_first(pid, prop_4cc);
+					if (!prop_val) {
+						is_ok = GF_FALSE;
+					}
+				}
+			} else {
+				u32 i, len = (u32) (next_sep ? 1+(next_sep - name) : strlen(name) );
+				szFinalName[k]='$';
+				k++;
+				for (i=0; i<len; i++) {
+					szFinalName[k] = name[0];
+					k++;
+					name++;
+				}
+				szFinalName[k]='$';
+				k++;
+				sep[0] = '$';
+				name = sep+1;
+				continue;
+			}
+		}
+		if (fsep) fsep[0] = '%';
+		if (do_skip) {
+			sep[0] = '$';
+			szFinalName[k] = '$';
+			k++;
+			while (name[0] && (name[0] != '$')) {
+				szFinalName[k] = name[0];
+				k++;
+				name++;
+			}
+			szFinalName[k] = '$';
+			k++;
+			name++;
+
+
+			continue;
+
+		}
+
+
+		if (!is_ok && !prop_val && prop_4cc) {
+			if (prop_4cc==GF_PROP_PID_CROP_POS) {
+				prop_val_patched.type = GF_PROP_VEC2I;
+				prop_val_patched.value.vec2i.x = 0;
+				prop_val_patched.value.vec2i.y = 0;
+				prop_val = &prop_val_patched;
+				is_ok=GF_TRUE;
+			}
+			else if (prop_4cc==GF_PROP_PID_ORIG_SIZE) {
+				prop_val_patched.type = GF_PROP_VEC2I;
+				prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_WIDTH);
+				prop_val_patched.value.vec2i.x = prop_val ? prop_val->value.uint : 0;
+				prop_val = gf_filter_pid_get_property_first(pid, GF_PROP_PID_HEIGHT);
+				prop_val_patched.value.vec2i.y = prop_val ? prop_val->value.uint : 0;
+				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));
+				return GF_BAD_PARAM;
+			}
+		}
+
+		if (!is_ok) {
+			if (sep) sep[0] = '$';
+			return GF_BAD_PARAM;
+		}
+		if (prop_val) {
+			if ((prop_val->type==GF_PROP_UINT) || (prop_val->type==GF_PROP_SINT)) {
+				value = prop_val->value.uint;
+				has_val = GF_TRUE;
+			} else {
+				str_val = gf_props_dump_val(prop_val, szPropVal, GF_FALSE, NULL);
+			}
+		}
+		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;
+				} 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));
+			return GF_BAD_PARAM;
+		}
+		if (k + strlen(szTemplateVal) > GF_MAX_PATH) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("[Filter] Not enough memory to solve file template %s\n", szTemplate));
+			return GF_OUT_OF_MEM;
+		}
+
+		strcat(szFinalName, szTemplateVal);
+		k = (u32) strlen(szFinalName);
+
+		if (!sep) break;
+		sep[0] = '$';
+		name = sep+1;
+	}
+	szFinalName[k] = 0;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_filter_pid_set_discard(GF_FilterPid *pid, Bool discard_on)
+{
+	GF_FilterPidInst *pidi = (GF_FilterPidInst *) pid;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt at discarding packets on output PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	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));
+		while (gf_filter_pid_get_packet(pid)) {
+			gf_filter_pid_drop_packet(pid);
+		}
+		pidi->is_end_of_stream = GF_TRUE;
+	} else {
+		//no more packets in queue or postponed, we can trust the EOS signal on the PID
+		//otherwise even though the PID has seen the EOS, it is not yet processed by the pid instance, signaling it
+		//would break up filters (for example dash demux) relying on precise EOS signals which must be toggled at the EOS packet
+		//once all previous packets have been processed
+		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;
+	return GF_OK;
+}
+
+static char *gf_filter_pid_get_dst_string(GF_FilterSession *sess, const char *_args, Bool is_dst)
+{
+	char *target, *sep;
+	char szKey[6];
+	u32 len;
+	if (!_args) return NULL;
+
+	if (is_dst)
+		sprintf(szKey, "dst%c", sess->sep_name);
+	else
+		sprintf(szKey, "src%c", sess->sep_name);
+
+	target = strstr(_args, szKey);
+	if (!target) return NULL;
+
+	sep = (char *) gf_fs_path_escape_colon(sess, target + 4);
+	target += 4;
+	if (sep) len = (u32) (sep - target);
+	else len = (u32) strlen(target);
+
+	char *res = gf_malloc(sizeof(char)* (len+1));
+	memcpy(res, target, sizeof(char)* len);
+	res[len]=0;
+	return res;
+}
+
+
+GF_EXPORT
+char *gf_filter_pid_get_destination(GF_FilterPid *pid)
+{
+	const char *dst_args;
+	char *res;
+	u32 i, j;
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query destination on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+
+	dst_args = pid->filter->dst_args;
+	if (!dst_args) dst_args = pid->filter->src_args;
+	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
+	for (i=0; i<pid->num_destinations; i++) {
+		GF_FilterPidInst *pidi = gf_list_get(pid->destinations, i);
+
+		dst_args = pidi->filter->dst_args;
+		if (!dst_args) dst_args = pidi->filter->src_args;
+		res = gf_filter_pid_get_dst_string(pid->filter->session, dst_args, GF_TRUE);
+		if (res) return res;
+
+		for (j=0; j<pidi->filter->num_output_pids; j++) {
+			GF_FilterPid *a_pid = gf_list_get(pidi->filter->output_pids, j);
+			char *dst = gf_filter_pid_get_destination(a_pid);
+			if (dst) return dst;
+		}
+	}
+	return NULL;
+}
+
+GF_EXPORT
+char *gf_filter_pid_get_source(GF_FilterPid *pid)
+{
+	const char *src_args;
+	char *res;
+//	GF_FilterPidInst *pidi = (GF_FilterPidInst *) pid;
+	u32 i;
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query source on output PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return NULL;
+	}
+	pid = pid->pid;
+
+	src_args = pid->filter->src_args;
+	if (!src_args) src_args = pid->filter->dst_args;
+	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
+	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;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+void gf_filter_pid_discard_block(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to reset block mode on input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	if (!pid->has_seen_eos) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Attempt to reset block mode on PID %s in filter %s not in end of stream, ignoring\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	gf_mx_p(pid->filter->tasks_mx);
+	if (pid->would_block) {
+		safe_int_dec(&pid->would_block);
+		assert(pid->filter->would_block);
+		safe_int_dec(&pid->filter->would_block);
+	}
+	gf_mx_v(pid->filter->tasks_mx);
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_require_source_id(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set require_source_id input PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	pid->require_source_id = GF_TRUE;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_filter_pid_get_min_pck_duration(GF_FilterPid *pid)
+{
+	if (PID_IS_OUTPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query min_pck_duration on output pid PID %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return 0;
+	}
+	return pid->pid->min_pck_duration;
+}
+
+GF_EXPORT
+void gf_filter_pid_recompute_dts(GF_FilterPid *pid, Bool do_recompute)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set recompute_dts on input pid %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return;
+	}
+	pid->recompute_dts = do_recompute;
+}
+
+GF_EXPORT
+Bool gf_filter_pid_is_playing(GF_FilterPid *pid)
+{
+	if (!pid) return GF_FALSE;
+	return pid->pid->is_playing;
+
+}
+
+GF_EXPORT
+GF_Err gf_filter_pid_allow_direct_dispatch(GF_FilterPid *pid)
+{
+	if (PID_IS_INPUT(pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to set direct dispatch mode on input pid %s in filter %s not allowed\n", pid->pid->name, pid->filter->name));
+		return GF_BAD_PARAM;
+	}
+	if (pid->filter->session->threads)
+		return GF_OK;
+	pid->direct_dispatch = GF_TRUE;
+	return GF_OK;
+}
+
+GF_EXPORT
+void *gf_filter_pid_get_alias_udta(GF_FilterPid *_pid)
+{
+	GF_FilterPidInst *pidi;
+	if (PID_IS_OUTPUT(_pid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt to query multi_sink original filter context on output pid %s in filter %s not allowed\n", _pid->pid->name, _pid->filter->name));
+		return NULL;
+	}
+	pidi = (GF_FilterPidInst *) _pid;
+	if (!pidi->alias_orig) return NULL;
+	return pidi->alias_orig->filter_udta;
+}

gpac-1.0.0.tar.gz/src/filter_core/filter_props.c Added

@@ -0,0 +1,1589 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+#include <gpac/constants.h>
+//for binxml parsing
+#include <gpac/xml.h>
+
+GF_PropertyValue gf_props_parse_value(u32 type, const char *name, const char *value, const char *enum_values, char list_sep_char)
+{
+	GF_PropertyValue p;
+	char *unit_sep=NULL;
+	s32 unit = 0;
+	memset(&p, 0, sizeof(GF_PropertyValue));
+	p.value.data.size=0;
+	p.type=type;
+	if (!name) name="";
+
+	unit_sep = NULL;
+	if (value) {
+		u32 len = (u32) strlen(value);
+		unit_sep = len ? strrchr("kKgGmM", 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;
+		}
+	}
+
+	switch (p.type) {
+	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") ) {
+			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));
+			p.value.boolean = GF_FALSE;
+		}
+		break;
+	case GF_PROP_SINT:
+		if (value && !strcmp(value, "+I")) p.value.sint = GF_INT_MAX;
+		else if (value && !strcmp(value, "-I")) p.value.sint = GF_INT_MIN;
+		else if (!value || (sscanf(value, "%d", &p.value.sint)!=1)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for int arg %s - using 0\n", value, name));
+			p.value.sint = 0;
+		} else if (unit) {
+			p.value.sint *= unit;
+		}
+		break;
+	case GF_PROP_UINT:
+		if (value && !strcmp(value, "+I")) p.value.sint = 0xFFFFFFFF;
+		else if (!value) {
+			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);
+			u32 val = 0;
+			char *str_start = (char *) enum_values;
+			while (str_start) {
+				u32 len;
+				char *sep = strchr(str_start, '|');
+				if (sep) {
+					len = (u32) (sep - str_start);
+				} else {
+					len = (u32) strlen(str_start);
+				}
+				if ((a_len == len) && !strncmp(str_start, value, len))
+					break;
+				if (!sep) {
+					str_start = NULL;
+					break;
+				}
+				str_start = sep+1;
+				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;
+			} else {
+				p.value.uint = val;
+			}
+		} else if (!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 (unit) {
+			p.value.uint *= unit;
+		}
+		break;
+	case GF_PROP_LSINT:
+		if (value && !strcmp(value, "+I")) p.value.longsint = 0x7FFFFFFFFFFFFFFFUL;
+		else if (value && !strcmp(value, "-I")) p.value.longsint = 0x8000000000000000UL;
+		else if (!value || (sscanf(value, ""LLD, &p.value.longsint)!=1) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for long int arg %s - using 0\n", value, name));
+			p.value.uint = 0;
+		} else if (unit) {
+			p.value.longsint *= unit;
+		}
+		break;
+	case GF_PROP_LUINT:
+		if (value && !strcmp(value, "+I")) p.value.longuint = 0xFFFFFFFFFFFFFFFFUL;
+		else if (!value || (sscanf(value, ""LLU, &p.value.longuint)!=1) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for long unsigned int arg %s - using 0\n", value, name));
+			p.value.uint = 0;
+		} else if (unit) {
+			p.value.longuint *= unit;
+		}
+		break;
+	case GF_PROP_FRACTION:
+		if (!value) {
+			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) {
+			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;
+					}
+				}
+			}
+		}
+		break;
+	case GF_PROP_FLOAT:
+		if (value && !strcmp(value, "+I")) p.value.fnumber = FIX_MAX;
+		else if (value && !strcmp(value, "-I")) p.value.fnumber = FIX_MIN;
+		else if (!value) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for float arg %s - using 0\n", value, name));
+			p.value.fnumber = 0;
+		} else {
+			Float f;
+			if (sscanf(value, "%f", &f) != 1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for float arg %s - using 0\n", value, name));
+				p.value.fnumber = 0;
+			} else {
+				if (unit) f *= unit;
+				p.value.fnumber = FLT2FIX(f);
+			}
+		}
+		break;
+	case GF_PROP_DOUBLE:
+		if (value && !strcmp(value, "+I")) p.value.number = GF_MAX_DOUBLE;
+		else if (value && !strcmp(value, "-I")) p.value.number = GF_MIN_DOUBLE;
+		else if (!value || (sscanf(value, "%lg", &p.value.number) != 1) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for double arg %s - using 0\n", value, name));
+			p.value.number = 0;
+		} else if (unit) {
+			p.value.number *= unit;
+		}
+		break;
+	case GF_PROP_VEC2I:
+		if (!value || (sscanf(value, "%dx%d", &p.value.vec2i.x, &p.value.vec2i.y) != 2)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec2i arg %s - using {0,0}\n", value, name));
+			p.value.vec2i.x = p.value.vec2i.y = 0;
+		}
+		break;
+	case GF_PROP_VEC2:
+		if (!value || (sscanf(value, "%lgx%lg", &p.value.vec2.x, &p.value.vec2.y) != 2)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec2 arg %s - using {0,0}\n", value, name));
+			p.value.vec2.x = p.value.vec2.y = 0;
+		}
+		break;
+	case GF_PROP_VEC3I:
+		if (!value || (sscanf(value, "%dx%dx%d", &p.value.vec3i.x, &p.value.vec3i.y, &p.value.vec3i.z) != 3)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for vec3i arg %s - using {0,0,0}\n", value, name));
+			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:
+		p.type=GF_PROP_STRING;
+		if (value && !strnicmp(value, "file@", 5) ) {
+			u8 *data;
+			u32 len;
+			GF_Err e = gf_file_load_data(value+5, (u8 **) &data, &len);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot load data from file %s\n", value+5));
+			} else {
+				p.value.string = data;
+			}
+		} else if (value && !strnicmp(value, "bxml@", 5) ) {
+			GF_Err e;
+			GF_DOMParser *dom = gf_xml_dom_new();
+			e = gf_xml_dom_parse(dom, value+5, NULL, NULL);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot parse XML from file %s\n", value+5));
+			} else {
+				GF_XMLNode *root = gf_xml_dom_get_root_idx(dom, 0);
+				//if no root, assume NULL
+				if (root) {
+					e = gf_xml_parse_bit_sequence(root, value+5, &p.value.data.ptr, &p.value.data.size);
+				}
+				if (e<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to binarize XML file %s: %s\n", value+5, gf_error_to_string(e) ));
+				} else {
+					p.type=GF_PROP_DATA;
+				}
+			}
+			gf_xml_dom_del(dom);
+		} else {
+			p.value.string = value ? gf_strdup(value) : NULL;
+		}
+		break;
+	case GF_PROP_DATA:
+	case GF_PROP_CONST_DATA:
+	case GF_PROP_DATA_NO_COPY:
+		if (!value) {
+			p.value.data.ptr=NULL;
+			p.value.data.size=0;
+		} else if (sscanf(value, "%d@%p", &p.value.data.size,&p.value.data.ptr)==2) {
+			p.type = GF_PROP_CONST_DATA;
+		} else if (!strnicmp(value, "0x", 2) ) {
+			u32 i;
+			value += 2;
+			p.value.data.size = (u32) strlen(value) / 2;
+			p.value.data.ptr = gf_malloc(sizeof(char)*p.value.data.size);
+			for (i=0; i<p.value.data.size; i++) {
+				char szV[3];
+				u32 res;
+				szV[0] = value[2*i];
+				szV[1] = value[2*i + 1];
+				szV[2] = 0;
+				sscanf(szV, "%x", &res);
+				p.value.data.ptr[i] = res;
+			}
+		} else if (!strnicmp(value, "bxml@", 5) ) {
+			GF_Err e;
+			GF_DOMParser *dom = gf_xml_dom_new();
+			e = gf_xml_dom_parse(dom, value+5, NULL, NULL);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot parse XML from file %s\n", value+5));
+			} else {
+				GF_XMLNode *root = gf_xml_dom_get_root_idx(dom, 0);
+				//if no root, assume NULL
+				if (root) {
+					e = gf_xml_parse_bit_sequence(root, value+5, &p.value.data.ptr, &p.value.data.size);
+				}
+				if (e<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to binarize XML file %s: %s\n", value+5, gf_error_to_string(e) ));
+				}
+			}
+			gf_xml_dom_del(dom);
+		} 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) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Cannot load data from file %s\n", value+5));
+				p.value.data.ptr=NULL;
+				p.value.data.size=0;
+			}
+		} else {
+			p.value.data.size = (u32) strlen(value);
+			if (p.value.data.size)
+				p.value.data.ptr = gf_strdup(value);
+			else
+				p.value.data.ptr = NULL;
+			p.type = GF_PROP_DATA;
+		}
+		break;
+	case GF_PROP_POINTER:
+		if (!value || (sscanf(value, "%p", &p.value.ptr) != 1) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %s for pointer arg %s - using 0\n", value, name));
+		}
+		break;
+	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 = ',';
+		while (v) {
+			u32 len=0;
+			char *nv;
+			char *sep = strchr(v, list_sep_char);
+			if (sep && is_xml) {
+				char *xml_end = strchr(v, '>');
+				len = (u32) (sep - v);
+				if (xml_end) {
+					u32 xml_len = (u32) (xml_end - v);
+					if (xml_len > len) {
+						sep = strchr(xml_end, list_sep_char);
+						//assigned below
+//						if (sep)
+//							len = (u32) (sep - v);
+					}
+				}
+			}
+			if (!sep)
+			 	len = (u32) strlen(v);
+			else
+				len = (u32) (sep - v);
+
+			nv = gf_malloc(sizeof(char)*(len+1));
+			strncpy(nv, v, sizeof(char)*len);
+			nv[len] = 0;
+			if (!strnicmp(nv, "file@", 5) ) {
+				u8 *data;
+				u32 flen;
+				GF_Err e = gf_file_load_data(nv+5, (u8 **) &data, &flen);
+				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);
+				}
+				gf_free(nv);
+			} else {
+				gf_list_add(p.value.string_list, nv);
+			}
+			if (!sep) break;
+			v = sep+1;
+		}
+	}
+		break;
+	case GF_PROP_UINT_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;
+			char *sep = strchr(v, list_sep_char);
+			if (sep) {
+				len = (u32) (sep - v);
+			}
+			if (!sep)
+			 	len = (u32) strlen(v);
+			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;
+			p.value.uint_list.nb_items++;
+			if (!sep) break;
+			v = sep+1;
+		}
+	}
+		break;
+	case GF_PROP_FORBIDEN:
+	default:
+		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;
+	}
+//	if (unit_sep) unit_sep[0] = unit_char;
+
+	return p;
+}
+
+Bool gf_props_equal(const GF_PropertyValue *p1, const GF_PropertyValue *p2)
+{
+	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 {
+			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:
+	 	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;
+	case GF_PROP_BOOL: return (p1->value.boolean==p2->value.boolean) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_FRACTION:
+		return ((s64)p1->value.frac.num * (s64)p2->value.frac.den == (s64)p2->value.frac.num * (s64)p1->value.frac.den) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_FRACTION64:
+		return ((s64)p1->value.lfrac.num * (s64)p2->value.lfrac.den == (s64)p2->value.lfrac.num * (s64)p1->value.lfrac.den) ? GF_TRUE : GF_FALSE;
+
+	case GF_PROP_FLOAT: return (p1->value.fnumber==p2->value.fnumber) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_DOUBLE: return (p1->value.number==p2->value.number) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_VEC2I:
+		return ((p1->value.vec2i.x==p2->value.vec2i.x) && (p1->value.vec2i.y==p2->value.vec2i.y)) ? GF_TRUE : GF_FALSE;
+	case GF_PROP_VEC2:
+		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_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 (strchr(p2->value.string, '|')) {
+			u32 len = (u32) strlen(p1->value.string);
+			char *cur = p2->value.string;
+
+			while (cur) {
+				if (!strncmp(p1->value.string, cur, len) && (cur[len]=='|' || !cur[len]))
+					return GF_TRUE;
+				cur = strchr(cur, '|');
+				if (cur) cur++;
+			}
+			return GF_FALSE;
+		}
+		if (strchr(p1->value.string, '|')) {
+			u32 len = (u32) strlen(p2->value.string);
+			char *cur = p1->value.string;
+
+			while (cur) {
+				if (!strncmp(p2->value.string, cur, len) && (cur[len]=='|' || !cur[len]))
+					return GF_TRUE;
+				cur = strchr(cur, '|');
+				if (cur) cur++;
+			}
+			return GF_FALSE;
+		}
+		assert(strchr(p1->value.string, '|')==NULL);
+		return !strcmp(p1->value.string, p2->value.string) ? GF_TRUE : GF_FALSE;
+
+	case GF_PROP_DATA:
+	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;
+		if (p1->value.data.size != p2->value.data.size) return GF_FALSE;
+		return !memcmp(p1->value.data.ptr, p2->value.data.ptr, p1->value.data.size) ? GF_TRUE : GF_FALSE;
+
+	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);
+		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);
+			for (j=0; j<c2; j++) {
+				char *s2 = gf_list_get(p2->value.string_list, j);
+				if (s1 && s2 && !strcmp(s1, s2)) found++;
+			}
+			if (found!=1) return GF_FALSE;
+		}
+		return GF_TRUE;
+	}
+	case GF_PROP_UINT_LIST:
+	{
+		u32 i;
+		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;
+		}
+		return GF_TRUE;
+	}
+
+	//user-managed pointer
+	case GF_PROP_POINTER: return (p1->value.ptr==p2->value.ptr) ? GF_TRUE : GF_FALSE;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Comparing forbidden property type %d\n", p1->type));
+		break;
+	}
+	return GF_FALSE;
+}
+
+#if GF_PROPS_HASHTABLE_SIZE
+GFINLINE u32 gf_props_hash_djb2(u32 p4cc, const char *str)
+{
+	u32 hash = 5381;
+
+	if (p4cc) {
+		hash = ((hash << 5) + hash) + ((p4cc>>24)&0xFF);
+		hash = ((hash << 5) + hash) + ((p4cc>>16)&0xFF);
+		hash = ((hash << 5) + hash) + ((p4cc>>8)&0xFF);
+		hash = ((hash << 5) + hash) + (p4cc&0xFF);
+	} else {
+		int c;
+		while ( (c = *str++) )
+			hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+
+	}
+	return (hash % GF_PROPS_HASHTABLE_SIZE);
+}
+#endif
+
+GF_PropertyMap * gf_props_new(GF_Filter *filter)
+{
+	GF_PropertyMap *map;
+
+	map = gf_fq_pop(filter->session->prop_maps_reservoir);
+
+	if (!map) {
+		GF_SAFEALLOC(map, GF_PropertyMap);
+		if (!map) return NULL;
+		
+		map->session = filter->session;
+#if GF_PROPS_HASHTABLE_SIZE
+#else
+		map->properties = gf_list_new();
+#endif
+	}
+	assert(!map->reference_count);
+	map->reference_count = 1;
+	return map;
+}
+
+void gf_props_reset_single(GF_PropertyValue *p)
+{
+	if (p->type==GF_PROP_STRING) {
+		gf_free(p->value.string);
+		p->value.string = NULL;
+	}
+	else if (p->type==GF_PROP_DATA) {
+		gf_free(p->value.data.ptr);
+		p->value.data.ptr = NULL;
+		p->value.data.size = 0;
+	}
+	else if (p->type==GF_PROP_UINT_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);
+			gf_free(str);
+		}
+		gf_list_del(p->value.string_list);
+		p->value.string_list = NULL;
+	}
+}
+void gf_props_del_property(GF_PropertyEntry *it)
+{
+	assert(it->reference_count);
+	if (safe_int_dec(&it->reference_count) == 0 ) {
+		if (it->pname && it->name_alloc)
+			gf_free(it->pname);
+
+		it->name_alloc = GF_FALSE;
+
+		if (it->prop.type==GF_PROP_STRING) {
+			gf_free(it->prop.value.string);
+			it->prop.value.string = NULL;
+		}
+		else if (it->prop.type==GF_PROP_DATA) {
+			assert(it->alloc_size);
+			//DATA props are collected at session level for future reuse
+		}
+		//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);
+				gf_free(s);
+			}
+			gf_list_del(l);
+		}
+		//string list are destroyed
+		else if (it->prop.type==GF_PROP_UINT_LIST) {
+			if (it->prop.value.uint_list.vals)
+				gf_free(it->prop.value.uint_list.vals);
+			it->prop.value.uint_list.nb_items = 0;
+			it->prop.value.uint_list.vals = NULL;
+		}
+		it->prop.value.data.size = 0;
+		if (it->alloc_size) {
+			assert(it->prop.type==GF_PROP_DATA);
+			if (it->session->prop_maps_entry_data_alloc_reservoir) {
+				gf_fq_add(it->session->prop_maps_entry_data_alloc_reservoir, it);
+			} else {
+				if (it->prop.value.data.ptr) gf_free(it->prop.value.data.ptr);
+				gf_free(it);
+			}
+		} else {
+			if (it->session->prop_maps_entry_reservoir) {
+				gf_fq_add(it->session->prop_maps_entry_reservoir, it);
+			} else {
+				gf_free(it);
+			}
+		}
+	}
+}
+
+void gf_propmap_del(void *pmap)
+{
+#if GF_PROPS_HASHTABLE_SIZE
+	gf_free(pamp);
+#else
+	GF_PropertyMap *map = pmap;
+	gf_list_del(map->properties);
+	gf_free(map);
+#endif
+
+}
+void gf_props_reset(GF_PropertyMap *prop)
+{
+#if GF_PROPS_HASHTABLE_SIZE
+	u32 i;
+	for (i=0; i<GF_PROPS_HASHTABLE_SIZE; i++) {
+		if (prop->hash_table[i]) {
+			GF_List *l = prop->hash_table[i];
+			while (gf_list_count(l)) {
+				gf_props_del_property((GF_PropertyEntry *) gf_list_pop_back(l) );
+			}
+			prop->hash_table[i] = NULL;
+			if (prop->session->prop_maps_list_reservoir) {
+				gf_fq_add(prop->session->prop_maps_list_reservoir, l);
+			} else {
+				gf_list_del(l);
+			}
+		}
+	}
+#else
+	while (gf_list_count(prop->properties)) {
+		gf_props_del_property( (GF_PropertyEntry *) gf_list_pop_back(prop->properties) );
+	}
+#endif
+}
+
+void gf_props_del(GF_PropertyMap *map)
+{
+	assert(!map->pckrefs_reference_count || !map->reference_count);
+	//we still have a ref
+	if (map->pckrefs_reference_count || map->reference_count) return;
+
+	gf_props_reset(map);
+	map->reference_count = 0;
+	if (map->session->prop_maps_reservoir) {
+		gf_fq_add(map->session->prop_maps_reservoir, map);
+	} else {
+		gf_list_del(map->properties);
+		gf_free(map);
+	}
+}
+
+
+
+//purge existing property of same name
+void gf_props_remove_property(GF_PropertyMap *map, u32 hash, u32 p4cc, const char *name)
+{
+#if GF_PROPS_HASHTABLE_SIZE
+	if (map->hash_table[hash]) {
+		u32 i, count = gf_list_count(map->hash_table[hash]);
+		for (i=0; i<count; i++) {
+			GF_PropertyEntry *prop = gf_list_get(map->hash_table[hash], i);
+			if ((p4cc && (p4cc==prop->p4cc)) || (name && prop->pname && !strcmp(prop->pname, name)) ) {
+				gf_list_rem(map->hash_table[hash], i);
+				gf_props_del_property(prop);
+				break;
+			}
+		}
+	}
+#else
+	u32 i, count = gf_list_count(map->properties);
+	for (i=0; i<count; i++) {
+		GF_PropertyEntry *prop = gf_list_get(map->properties, i);
+		if ((p4cc && (p4cc==prop->p4cc)) || (name && prop->pname && !strcmp(prop->pname, name)) ) {
+			gf_list_rem(map->properties, i);
+			gf_props_del_property(prop);
+			break;
+		}
+	}
+#endif
+}
+
+
+#if GF_PROPS_HASHTABLE_SIZE
+GF_List *gf_props_get_list(GF_PropertyMap *map)
+{
+	GF_List *l;
+
+	l = gf_fq_pop(map->session->prop_maps_list_reservoir);
+
+	if (!l) l = gf_list_new();
+	return l;
+}
+#endif
+
+static void gf_props_assign_value(GF_PropertyEntry *prop, const GF_PropertyValue *value, Bool is_old_prop)
+{
+	char *src_ptr;
+	//remember source pointer
+	src_ptr = prop->prop.value.data.ptr;
+
+	if (is_old_prop) {
+		gf_props_reset_single(&prop->prop);
+	}
+
+	//copy prop value
+	memcpy(&prop->prop, value, sizeof(GF_PropertyValue));
+
+	if (prop->prop.type == GF_PROP_STRING) {
+		prop->prop.value.string = value->value.string ? gf_strdup(value->value.string) : NULL;
+	} else if (prop->prop.type == GF_PROP_STRING_NO_COPY) {
+		prop->prop.value.string = value->value.string;
+		prop->prop.type = GF_PROP_STRING;
+	} else if (prop->prop.type == GF_PROP_DATA) {
+		//restore source pointer, realloc if needed
+		prop->prop.value.data.ptr = src_ptr;
+		if (prop->alloc_size < value->value.data.size) {
+			prop->alloc_size = value->value.data.size;
+			prop->prop.value.data.ptr = gf_realloc(prop->prop.value.data.ptr, sizeof(char) * value->value.data.size);
+			assert(prop->alloc_size);
+		}
+		memcpy(prop->prop.value.data.ptr, value->value.data.ptr, value->value.data.size);
+	} else if (prop->prop.type == GF_PROP_DATA_NO_COPY) {
+		prop->prop.type = GF_PROP_DATA;
+		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);
+		prop->prop.value.uint_list.nb_items = value->value.uint_list.nb_items;
+	}
+}
+
+GF_Err gf_props_insert_property(GF_PropertyMap *map, u32 hash, u32 p4cc, const char *name, char *dyn_name, const GF_PropertyValue *value)
+{
+	GF_PropertyEntry *prop;
+#if GF_PROPS_HASHTABLE_SIZE
+	u32 i, count;
+#endif
+	if ((value->type == GF_PROP_DATA) || (value->type == GF_PROP_DATA_NO_COPY)) {
+		if (!value->value.data.ptr) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Attempt at defining data property %s with NULL pointer, not allowed\n", p4cc ? gf_4cc_to_str(p4cc) : name ? name : dyn_name ));
+			return GF_BAD_PARAM;
+		}
+	}
+#if GF_PROPS_HASHTABLE_SIZE
+	if (! map->hash_table[hash] ) {
+		map->hash_table[hash] = gf_props_get_list(map);
+		if (!map->hash_table[hash]) return GF_OUT_OF_MEM;
+	} else {
+		count = gf_list_count(map->hash_table[hash]);
+		if (count) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("PropertyMap hash collision for %s - %d entries before insertion:\n", p4cc ? gf_4cc_to_str(p4cc) : name ? name : dyn_name, gf_list_count(map->hash_table[hash]) ));
+			for (i=0; i<count; i++) {
+				GF_PropertyEntry *prop_c = gf_list_get(map->hash_table[hash], i);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("\t%s\n\n", prop_c->pname ? prop_c->pname : gf_4cc_to_str(prop_c->p4cc)  ));
+				assert(!prop_c->p4cc || (prop_c->p4cc != p4cc));
+			}
+		}
+	}
+#endif
+	if ((value->type == GF_PROP_DATA) && value->value.data.ptr) {
+		prop = gf_fq_pop(map->session->prop_maps_entry_data_alloc_reservoir);
+	} else {
+		prop = gf_fq_pop(map->session->prop_maps_entry_reservoir);
+	}
+
+	if (!prop) {
+		GF_SAFEALLOC(prop, GF_PropertyEntry);
+		if (!prop) return GF_OUT_OF_MEM;
+		prop->session = map->session;
+	}
+
+	prop->reference_count = 1;
+	prop->p4cc = p4cc;
+	prop->pname = (char *) name;
+	if (dyn_name) {
+		prop->pname = gf_strdup(dyn_name);
+		prop->name_alloc=GF_TRUE;
+	}
+
+	gf_props_assign_value(prop, value, GF_FALSE);
+
+#if GF_PROPS_HASHTABLE_SIZE
+	return gf_list_add(map->hash_table[hash], prop);
+#else
+	return gf_list_add(map->properties, prop);
+#endif
+
+}
+
+GF_Err gf_props_set_property(GF_PropertyMap *map, u32 p4cc, const char *name, char *dyn_name, const GF_PropertyValue *value)
+{
+	GF_Err e;
+	u32 hash = gf_props_hash_djb2(p4cc, name ? name : dyn_name);
+	gf_mx_p(map->session->info_mx);
+	gf_props_remove_property(map, hash, p4cc, name ? name : dyn_name);
+	if (!value)
+		e = GF_OK;
+	else
+		e = gf_props_insert_property(map, hash, p4cc, name, dyn_name, value);
+	gf_mx_v(map->session->info_mx);
+	return e;
+}
+
+const GF_PropertyEntry *gf_props_get_property_entry(GF_PropertyMap *map, u32 prop_4cc, const char *name)
+{
+	u32 i, count;
+	const GF_PropertyEntry *res=NULL;
+#if GF_PROPS_HASHTABLE_SIZE
+	u32 hash = gf_props_hash_djb2(prop_4cc, name);
+	if (map->hash_table[hash] ) {
+		count = gf_list_count(map->hash_table[hash]);
+		for (i=0; i<count; i++) {
+			GF_PropertyEntry *p = gf_list_get(map->hash_table[hash], i);
+
+			if ((prop_4cc && (p->p4cc==prop_4cc)) || (p->pname && name && !strcmp(p->pname, name)) ) {
+				res = p;
+				break;
+			}
+		}
+	}
+#else
+	count = gf_list_count(map->properties);
+	for (i=0; i<count; i++) {
+		GF_PropertyEntry *p = gf_list_get(map->properties, i);
+		if (!p) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Concurrent read/write access to property map, cannot query property now\n"));
+			return NULL;
+		}
+
+		if ((prop_4cc && (p->p4cc==prop_4cc)) || (p->pname && name && !strcmp(p->pname, name)) ) {
+			res = p;
+			break;
+		}
+	}
+#endif
+	return res;
+}
+
+const GF_PropertyValue *gf_props_get_property(GF_PropertyMap *map, u32 prop_4cc, const char *name)
+{
+	const GF_PropertyEntry *ent = gf_props_get_property_entry(map, prop_4cc, name);
+	if (ent) return &ent->prop;
+	return NULL;
+}
+
+GF_Err gf_props_merge_property(GF_PropertyMap *dst_props, GF_PropertyMap *src_props, gf_filter_prop_filter filter_prop, void *cbk)
+{
+	GF_Err e;
+	u32 i, count;
+#if GF_PROPS_HASHTABLE_SIZE
+	u32 idx;
+#endif
+	GF_List *list;
+	dst_props->timescale = src_props->timescale;
+
+#if GF_PROPS_HASHTABLE_SIZE
+	for (idx=0; idx<GF_PROPS_HASHTABLE_SIZE; idx++) {
+		if (src_props->hash_table[idx]) {
+			list = src_props->hash_table[idx];
+#else
+			list = src_props->properties;
+#endif
+			count = gf_list_count(list);
+			for (i=0; i<count; i++) {
+				GF_PropertyEntry *prop = gf_list_get(list, i);
+				assert(prop->reference_count);
+				if (!filter_prop || filter_prop(cbk, prop->p4cc, prop->pname, &prop->prop)) {
+					safe_int_inc(&prop->reference_count);
+
+#if GF_PROPS_HASHTABLE_SIZE
+					if (!dst_props->hash_table[idx]) {
+						dst_props->hash_table[idx] = gf_props_get_list(dst_props);
+						if (!dst_props->hash_table[idx]) return GF_OUT_OF_MEM;
+					}
+					e = gf_list_add(dst_props->hash_table[idx], prop);
+					if (e) return e;
+#else
+					e = gf_list_add(dst_props->properties, prop);
+					if (e) return e;
+#endif
+				}
+			}
+#if GF_PROPS_HASHTABLE_SIZE
+		}
+	}
+#endif
+	return GF_OK;
+}
+
+const GF_PropertyValue *gf_props_enum_property(GF_PropertyMap *props, u32 *io_idx, u32 *prop_4cc, const char **prop_name)
+{
+#if GF_PROPS_HASHTABLE_SIZE
+	u32 i, nb_items = 0;
+#endif
+	u32 idx, count;
+	
+	const GF_PropertyEntry *pe;
+	if (!io_idx) return NULL;
+
+	idx = *io_idx;
+	if (idx == 0xFFFFFFFF) return NULL;
+
+#if GF_PROPS_HASHTABLE_SIZE
+	for (i=0; i<GF_PROPS_HASHTABLE_SIZE; i++) {
+		if (props->hash_table[i]) {
+			count = gf_list_count(props->hash_table[i]);
+			nb_items+=count;
+			if (idx >= count) {
+				idx -= count;
+				continue;
+			}
+			pe = gf_list_get(props->hash_table[i], idx);
+			if (!pe) {
+				*io_idx = nb_items;
+				return NULL;
+			}
+			if (prop_4cc) *prop_4cc = pe->p4cc;
+			if (prop_name) *prop_name = pe->pname;
+			*io_idx = (*io_idx) + 1;
+			return &pe->prop;
+		}
+	}
+	*io_idx = nb_items;
+	return NULL;
+#else
+	count = gf_list_count(props->properties);
+	if (idx >= count) {
+		*io_idx = count;
+		return NULL;
+	}
+	pe = gf_list_get(props->properties, idx);
+	if (!pe) {
+		*io_idx = count;
+		return NULL;
+	}
+	if (prop_4cc) *prop_4cc = pe->p4cc;
+	if (prop_name) *prop_name = pe->pname;
+	*io_idx = (*io_idx) + 1;
+	return &pe->prop;
+#endif
+}
+
+typedef struct
+{
+	GF_PropType type;
+	const char *name;
+	const char *desc;
+} GF_PropTypeDef;
+
+GF_PropTypeDef PropTypes[] =
+{
+	{GF_PROP_SINT, "sint", "signed 32 bit integer"},
+	{GF_PROP_UINT, "uint", "unsigned 32 bit integer"},
+	{GF_PROP_LSINT, "lsint", "signed 64 bit integer"},
+	{GF_PROP_LUINT, "luint", "unsigned 32 bit integer"},
+	{GF_PROP_FRACTION, "frac", "32/32 bit fraction"},
+	{GF_PROP_FRACTION64, "lfrac", "64/64 bit fraction"},
+	{GF_PROP_BOOL, "bool", "boolean"},
+	{GF_PROP_FLOAT, "flt", "32 bit float number"},
+	{GF_PROP_DOUBLE, "dbl", "64 bit float number"},
+	{GF_PROP_NAME, "cstr", "const UTF-8 string"},
+	{GF_PROP_STRING, "str", "UTF-8 string"},
+	{GF_PROP_STRING_NO_COPY, "str", "UTF-8 string"},
+	{GF_PROP_DATA, "mem", "data buffer"},
+	{GF_PROP_DATA_NO_COPY, "mem", "data buffer"},
+	{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_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_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_EXPORT
+const char *gf_props_get_type_name(GF_PropType type)
+{
+	u32 i, nb_props = sizeof(PropTypes) / sizeof(GF_PropTypeDef);
+	for (i=0; i<nb_props; i++) {
+		if (PropTypes[i].type == type) return PropTypes[i].name;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unknown property type %d\n", type));
+	return "Undefined";
+}
+
+GF_EXPORT
+const char *gf_props_get_type_desc(GF_PropType type)
+{
+	u32 i, nb_props = sizeof(PropTypes) / sizeof(GF_PropTypeDef);
+	for (i=0; i<nb_props; i++) {
+		if (PropTypes[i].type == type) return PropTypes[i].desc;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unknown property type %d\n", type));
+	return "Undefined";
+}
+
+GF_EXPORT
+GF_PropType gf_props_parse_type(const char *name)
+{
+	u32 i, nb_props = sizeof(PropTypes) / sizeof(GF_PropTypeDef);
+	for (i=0; i<nb_props; i++) {
+		if (!strcmp(PropTypes[i].name, name)) return PropTypes[i].type;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unknown property type %s\n", name));
+	return GF_PROP_FORBIDEN;
+}
+
+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_ITEM_ID, "ItemID", "ID of image item in HEIF, same value as ID", 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_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_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_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_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_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_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},
+	{ GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, "DecoderConfigEnhancement", "Decoder configuration data of the enhancement layer(s). Also used by 3GPP/Apple text streams to give the full sample description table used in SDP.", GF_PROP_DATA},
+	{ GF_PROP_PID_CONFIG_IDX, "DecoderConfigIndex", "1-based index of decoder config for ISO base media files", GF_PROP_UINT},
+	{ GF_PROP_PID_SAMPLE_RATE, "SampleRate", "Audio sample rate", GF_PROP_UINT},
+	{ GF_PROP_PID_SAMPLES_PER_FRAME, "SamplesPerFrame", "Number of audio sample in one coded frame", GF_PROP_UINT},
+	{ GF_PROP_PID_NUM_CHANNELS, "NumChannels", "Number of audio channels", GF_PROP_UINT},
+	{ GF_PROP_PID_AUDIO_BPS, "BPS", "Number of bits per sample in compressed source", GF_PROP_UINT},
+	{ 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_CTS_SHIFT, "CTSShift", "CTS offset to apply in case of negative ctts", GF_PROP_UINT},
+	{ 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},
+	{ GF_PROP_PID_PIXFMT_WRAPPED, "PixelFormatWrapped", "Underlying pixel format of video stream if pixel format is external GL texture", GF_PROP_PIXFMT},
+	{ GF_PROP_PID_STRIDE, "Stride", "Image or Y/alpha plane stride", GF_PROP_UINT},
+	{ GF_PROP_PID_STRIDE_UV, "StrideUV", "UV plane or U/V planes stride", GF_PROP_UINT},
+	{ GF_PROP_PID_BIT_DEPTH_Y, "BitDepthLuma", "Bit depth for luma components", GF_PROP_UINT},
+	{ 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_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_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_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},
+	{ GF_PROP_PID_SRD, "SRD", "Position and size of the video in the referential given by SRDRef", GF_PROP_VEC4I},
+	{ GF_PROP_PID_SRD_REF, "SRDRef", "Width and Height of the SRD referential", GF_PROP_VEC2I},
+	{ GF_PROP_PID_SRD_MAP, "SRDMap", "Mapping of input videos in reconstructed video, expressed as {Ox,Oy,Ow,Oh,Dx,Dy,Dw,Dh} per input, with:\n"
+	"- 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_BITRATE, "Bitrate", "Bitrate in bps", GF_PROP_UINT},
+	{ GF_PROP_PID_MAXRATE, "Maxrate", "Max bitrate in bps", 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},
+	{ GF_PROP_PID_URL, "URL", "URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_REMOTE_URL, "RemoteURL", "Remote URL of source - used for MPEG-4 systems", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_REDIRECT_URL, "RedirectURL", "Redirection URL of source", GF_PROP_STRING, GF_PROP_FLAG_GSF_REM},
+	{ 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_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_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_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},
+	{ GF_PROP_PID_UTC_TIME, "UTC", "UTC date and time of PID", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ GF_PROP_PID_UTC_TIMESTAMP, "UTCTimestamp", "Timestamp corresponding to UTC date and time", GF_PROP_LUINT, GF_PROP_FLAG_GSF_REM},
+	{ 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_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_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_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_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_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_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)reserved(u8)priority(u8) discardable]", 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_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_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_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_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_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_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_HLS_PLAYLIST, "HLSPL", "Name of the HLS variant playlist for this media", 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_DASH_SEGMENTS, "DSegs", "Number of DASH segments defined by the DASH cue info", GF_PROP_UINT, 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_TRACK_INDEX, "TrackIndex", "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_EXPORT
+u32 gf_props_get_id(const char *name)
+{
+	u32 i, nb_props;
+	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;
+	}
+	return 0;
+}
+
+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;
+	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++) {
+		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].name;
+	}
+	return NULL;
+}
+
+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++) {
+		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].flags;
+	}
+	return 0;
+}
+
+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++) {
+		if (GF_BuiltInProps[i].type==prop_4cc) return GF_BuiltInProps[i].data_type;
+	}
+	return GF_PROP_FORBIDEN;
+}
+
+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++) {
+			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;
+			}
+		}
+	}
+	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)
+{
+	switch (att->type) {
+	case GF_PROP_NAME:
+	case GF_PROP_STRING:
+	case GF_PROP_STRING_NO_COPY:
+		break;
+	default:
+		if (!dump) return NULL;
+		break;
+	}
+
+	dump[0] = 0;
+	switch (att->type) {
+	case GF_PROP_SINT:
+		sprintf(dump, "%d", att->value.sint);
+		break;
+	case GF_PROP_UINT:
+		if (min_max_enum && strchr(min_max_enum, '|') ) {
+			u32 enum_val = 0;
+			char *str_start = (char *) min_max_enum;
+			while (str_start) {
+				u32 len;
+				char *sep = strchr(str_start, '|');
+				if (sep) {
+					len = (u32) (sep - str_start);
+				} else {
+					len = (u32) strlen(str_start);
+				}
+				if (att->value.uint == enum_val) {
+					strncpy(dump, str_start, len);
+					dump[len]=0;
+					break;
+				}
+				if (!sep) break;
+				str_start = sep+1;
+				enum_val++;
+			}
+			if (!str_start) {
+				sprintf(dump, "%u", att->value.uint);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Wrong argument value %d not found in enums %s - using integer dump\n", att->value.uint_list, min_max_enum));
+			}
+		} else {
+			sprintf(dump, "%u", att->value.uint);
+		}
+		break;
+	case GF_PROP_LSINT:
+		sprintf(dump, ""LLD, att->value.longsint);
+		break;
+	case GF_PROP_LUINT:
+		sprintf(dump, ""LLU, att->value.longuint);
+		break;
+	case GF_PROP_FRACTION:
+		//reduce fraction
+		if (att->value.frac.den && ((att->value.frac.num/att->value.frac.den) * att->value.frac.den == att->value.frac.num)) {
+			sprintf(dump, "%d", att->value.frac.num / att->value.frac.den);
+		} else {
+			sprintf(dump, "%d/%u", att->value.frac.num, att->value.frac.den);
+		}
+		break;
+	case GF_PROP_FRACTION64:
+		//reduce fraction
+		if (att->value.lfrac.den && ((att->value.lfrac.num/att->value.lfrac.den) * att->value.lfrac.den == att->value.lfrac.num)) {
+			sprintf(dump, LLD, att->value.lfrac.num / att->value.lfrac.den);
+		} else {
+			sprintf(dump, LLD"/"LLU, att->value.lfrac.num, att->value.lfrac.den);
+		}
+		break;
+	case GF_PROP_BOOL:
+		sprintf(dump, "%s", att->value.boolean ? "true" : "false");
+		break;
+	case GF_PROP_FLOAT:
+		sprintf(dump, "%f", FIX2FLT(att->value.fnumber) );
+		break;
+	case GF_PROP_DOUBLE:
+		sprintf(dump, "%g", att->value.number);
+		break;
+	case GF_PROP_VEC2I:
+		sprintf(dump, "%dx%d", att->value.vec2i.x, att->value.vec2i.y);
+		break;
+	case GF_PROP_VEC2:
+		sprintf(dump, "%lgx%lg", att->value.vec2.x, att->value.vec2.y);
+		break;
+	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:
+		return att->value.string;
+
+	case GF_PROP_DATA:
+	case GF_PROP_CONST_DATA:
+	case GF_PROP_DATA_NO_COPY:
+		if (dump_data && 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++) {
+				sprintf(dump, "%02X", (unsigned char) att->value.data.ptr[i]);
+			}
+		} else {
+			sprintf(dump, "%d bytes (CRC32 0x%08X)", att->value.data.size, gf_crc_32(att->value.data.ptr, att->value.data.size));
+		}
+		break;
+	case GF_PROP_POINTER:
+		sprintf(dump, "%p", att->value.ptr);
+		break;
+	case GF_PROP_STRING_LIST:
+	{
+		u32 i, count = gf_list_count(att->value.string_list);
+		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);
+			if (!i) {
+				strncpy(dump, s, len);
+			} else {
+				strcat(dump, ",");
+				strncat(dump, s, len-1);
+			}
+			len = GF_PROP_DUMP_ARG_SIZE - 1 - (u32) strlen(dump);
+			if (len<=1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("String list is too large to fit in predefined property dump buffer of %d bytes, truncating\n", GF_PROP_DUMP_ARG_SIZE));
+				return dump;
+			}
+		}
+		return dump;
+	}
+	case GF_PROP_UINT_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) {
+				sprintf(szItem, "%s", gf_4cc_to_str(att->value.uint_list.vals[i]) );
+			} else {
+				sprintf(szItem, "%u", att->value.uint_list.vals[i]);
+			}
+			if (!i) {
+				strncpy(dump, szItem, len);
+			} else {
+				strcat(dump, ",");
+				strncat(dump, szItem, len-1);
+			}
+			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));
+				return dump;
+			}
+		}
+		return dump;
+	}
+	case GF_PROP_FORBIDEN:
+		sprintf(dump, "forbiden");
+		break;
+	case GF_PROP_LAST_DEFINED:
+		sprintf(dump, "lastDefined");
+		break;
+	}
+	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)
+{
+	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);
+	}
+	return "";
+}
+

gpac-1.0.0.tar.gz/src/filter_core/filter_queue.c Added

@@ -0,0 +1,354 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+
+#ifdef WIN32
+
+#ifndef __GCC__
+#ifdef GPAC_64_BITS
+#define atomic_compare_and_swap(_ptr, _comparand, _replacement) (InterlockedCompareExchange64((__int64*)_ptr,(__int64)_replacement,(__int64)_comparand)==(__int64)_comparand)
+#else
+#define atomic_compare_and_swap(_ptr, _comparand, _replacement) (InterlockedCompareExchange((int *)_ptr,(int )_replacement,(int )_comparand)==(int)_comparand)
+#endif
+#endif
+
+#else
+#define atomic_compare_and_swap(_ptr, _comparand, _replacement)	__sync_bool_compare_and_swap(_ptr, _comparand, _replacement)
+#endif
+
+
+typedef struct __lf_item
+{
+	struct __lf_item *next;
+	void *data;
+} GF_LFQItem;
+
+struct __gf_filter_queue
+{
+	//head element is dummy, never swaped
+	GF_LFQItem *head;
+	GF_LFQItem *tail;
+
+	GF_LFQItem *res_head;
+	GF_LFQItem *res_tail;
+
+	volatile u32 nb_items;
+
+	GF_Mutex *mx;
+};
+
+
+
+
+GF_FilterQueue *gf_fq_new(const GF_Mutex *mx)
+{
+	GF_FilterQueue *q;
+	GF_SAFEALLOC(q, GF_FilterQueue);
+	if (!q) return NULL;
+
+	q->mx = (GF_Mutex *) mx;
+	if (mx) return q;
+
+
+	//lock-free mode, create dummuy slot for head
+	GF_SAFEALLOC(q->head, GF_LFQItem);
+	if (!q->head) {
+		gf_free(q);
+		return NULL;
+	}
+	q->tail = q->head;
+
+	//lock-free mode, create dummuy slot for reservoir head
+	GF_SAFEALLOC(q->res_head, GF_LFQItem);
+	if (!q->res_head) {
+		gf_free(q->head);
+		gf_free(q);
+		return NULL;
+	}
+	q->res_tail = q->res_head;
+	return q;
+}
+
+
+void gf_fq_del(GF_FilterQueue *q, void (*item_delete)(void *) )
+{
+	GF_LFQItem *it = q->head;
+	//first item is dummy if lock-free mode, doesn't hold a valid pointer
+	if (! q->mx) it->data=NULL;
+
+	while (it) {
+		GF_LFQItem *ptr = it;
+		it = it->next;
+		if (ptr->data && item_delete) item_delete(ptr->data);
+		gf_free(ptr);
+	}
+
+	it = q->res_head;
+	while (it) {
+		GF_LFQItem *ptr = it;
+		it = it->next;
+		gf_free(ptr);
+	}
+	gf_free(q);
+}
+
+static void gf_fq_lockfree_enqueue(GF_LFQItem *it, GF_LFQItem **tail_ptr)
+{
+	GF_LFQItem *tail;
+
+	while (1) {
+		GF_LFQItem *next;
+		tail = *tail_ptr;
+		next = tail->next;
+		if (next == tail->next) {
+			if (next==NULL) {
+				if (atomic_compare_and_swap(&tail->next, next, it)) {
+					break; // Enqueue is done.  Exit loop
+				}
+			} else {
+				//tail not pointing at last node, move it
+				atomic_compare_and_swap(tail_ptr, tail, next);
+			}
+		}
+	}
+	atomic_compare_and_swap(tail_ptr, tail, it);
+}
+
+static void *gf_fq_lockfree_dequeue(GF_LFQItem **head_ptr, GF_LFQItem **tail_ptr, GF_LFQItem **prev_head)
+{
+	void *data=NULL;
+	GF_LFQItem *next, *head;
+	next = NULL;
+	*prev_head = NULL;
+
+	while (1 ) {
+		GF_LFQItem *tail;
+		head = *head_ptr;
+		tail = *tail_ptr;
+		next = head->next;
+		//state seefsess OK
+		if (head == *head_ptr) {
+			//head is at tail, we have an empty queue or some state issue
+			if (head == tail) {
+				//empty queue (first slot is dummy, we need to check next)
+				if (next == NULL)
+					return NULL;
+
+				//swap back tail at next
+				atomic_compare_and_swap(tail_ptr, tail, next);
+			} else {
+				assert(next);
+				data = next->data;
+				//try to advance q->head to next
+				if (atomic_compare_and_swap(head_ptr, head, next))
+					break; //success!
+			}
+		}
+	}
+	*prev_head = head;
+	return data;
+}
+
+void gf_lfq_add(GF_FilterQueue *q, void *item)
+{
+	GF_LFQItem *it=NULL;
+	assert(q);
+
+	gf_fq_lockfree_dequeue( &q->res_head, &q->res_tail, &it);
+	if (!it) {
+		GF_SAFEALLOC(it, GF_LFQItem);
+		if (!it) return;
+	} else {
+		it->next = NULL;
+	}
+	it->data=item;
+	gf_fq_lockfree_enqueue(it, &q->tail);
+	safe_int_inc(&q->nb_items);
+}
+
+void *gf_lfq_pop(GF_FilterQueue *q)
+{
+	GF_LFQItem *slot=NULL;
+	if (!q) return NULL;
+
+	void *data = gf_fq_lockfree_dequeue( &q->head, &q->tail, &slot);
+	if (!data) return NULL;
+	safe_int_dec(&q->nb_items);
+	assert(slot);
+
+	slot->data = NULL;
+	slot->next = NULL;
+	gf_fq_lockfree_enqueue(slot, &q->res_tail);
+
+	return data;
+}
+
+u32 gf_fq_count(GF_FilterQueue *q)
+{
+	return q ? q->nb_items : 0;
+}
+
+//TODO - check performances vs function pointer
+void gf_fq_add(GF_FilterQueue *fq, void *item)
+{
+	GF_LFQItem *it;
+	assert(fq);
+
+	if (! fq->mx) {
+		gf_lfq_add(fq, item);
+	} else {
+		gf_mx_p(fq->mx);
+
+		it = fq->res_head;
+		if (it) {
+			fq->res_head = fq->res_head->next;
+			it->next = NULL;
+		} else {
+			GF_SAFEALLOC(it, GF_LFQItem);
+			if (!it) return;
+		}
+		if (! fq->res_head) fq->res_tail = NULL;
+
+		it->data = item;
+		if (!fq->tail) {
+			fq->tail = fq->head = it;
+		} else {
+			fq->tail->next = it;
+			fq->tail = it;
+		}
+		fq->nb_items++;
+		gf_mx_v(fq->mx);
+	}
+}
+
+void *gf_fq_pop(GF_FilterQueue *fq)
+{
+	GF_LFQItem *it;
+	if (!fq)
+		return NULL;
+
+	void *data=NULL;
+	if (! fq->mx) {
+		return gf_lfq_pop(fq);
+	}
+
+	gf_mx_p(fq->mx);
+	it = fq->head;
+	if (it) {
+		fq->head = it->next;
+		data = it->data;
+
+		it->data = NULL;
+		it->next = NULL;
+
+		if (fq->res_tail) {
+			fq->res_tail->next = it;
+			fq->res_tail = it;
+		} else {
+			fq->res_head = fq->res_tail = it;
+		}
+		assert(fq->nb_items);
+		fq->nb_items--;
+
+		if (! fq->head) fq->tail = NULL;
+
+	}
+	gf_mx_v(fq->mx);
+	return data;
+}
+
+
+void *gf_fq_head(GF_FilterQueue *fq)
+{
+	void *data;
+	if (!fq) return NULL;
+
+	if (fq->mx) {
+		gf_mx_p(fq->mx);
+		data = fq->head ? fq->head->data : NULL;
+		gf_mx_v(fq->mx);
+	} else {
+		data = fq->head->next ? fq->head->next->data : NULL;
+	}
+	return data;
+}
+
+
+void *gf_fq_get(GF_FilterQueue *fq, u32 idx)
+{
+	void *data;
+	GF_LFQItem *it;
+	assert(fq);
+
+	if (fq->mx) {
+		gf_mx_p(fq->mx);
+		it = fq->head;
+
+		while (it && idx) {
+			it = it->next;
+			idx--;
+			if (!it) break;
+		}
+		data = it ? it->data : NULL;
+		gf_mx_v(fq->mx);
+	} else {
+		it = fq->head->next;
+		while (it && idx) {
+			it = it->next;
+			idx--;
+			if (!it) break;
+		}
+		data = it ? it->data : NULL;
+	}
+
+	return data;
+}
+
+void gf_fq_enum(GF_FilterQueue *fq, Bool (*enum_func)(void *udta1, void *item), void *udta)
+{
+	GF_LFQItem *it;
+	if (!enum_func) return;
+	assert(fq);
+
+	if (fq->mx) {
+		gf_mx_p(fq->mx);
+		it = fq->head;
+
+		while (it) {
+			if (!enum_func(udta, it->data))
+				break;
+			it = it->next;
+		}
+		gf_mx_v(fq->mx);
+	} else {
+		it = fq->head->next;
+		while (it) {
+			if (!enum_func(udta, it->data))
+				break;
+			it = it->next;
+		}
+	}
+}

gpac-1.0.0.tar.gz/src/filter_core/filter_register.c Added

@@ -0,0 +1,293 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+#include <gpac/network.h>
+
+
+const GF_FilterRegister *ut_filter_register(GF_FilterSession *session);
+const GF_FilterRegister *ut_source_register(GF_FilterSession *session);
+const GF_FilterRegister *ut_sink_register(GF_FilterSession *session);
+const GF_FilterRegister *ut_sink2_register(GF_FilterSession *session);
+const GF_FilterRegister *ffdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *ffdec_register(GF_FilterSession *session);
+const GF_FilterRegister *ffenc_register(GF_FilterSession *session);
+const GF_FilterRegister *ffavin_register(GF_FilterSession *session);
+const GF_FilterRegister *ffsws_register(GF_FilterSession *session);
+const GF_FilterRegister *ffmx_register(GF_FilterSession *session);
+const GF_FilterRegister *ffavf_register(GF_FilterSession *session);
+const GF_FilterRegister *inspect_register(GF_FilterSession *session);
+const GF_FilterRegister *probe_register(GF_FilterSession *session);
+const GF_FilterRegister *compose_filter_register(GF_FilterSession *session);
+const GF_FilterRegister *isoffin_register(GF_FilterSession *session);
+const GF_FilterRegister *bifs_dec_register(GF_FilterSession *session);
+const GF_FilterRegister *odf_dec_register(GF_FilterSession *session);
+const GF_FilterRegister *filein_register(GF_FilterSession *session);
+const GF_FilterRegister *ctxload_register(GF_FilterSession *session);
+const GF_FilterRegister *httpin_register(GF_FilterSession *session);
+const GF_FilterRegister *svgin_register(GF_FilterSession *session);
+const GF_FilterRegister *img_reframe_register(GF_FilterSession *session);
+const GF_FilterRegister *imgdec_register(GF_FilterSession *session);
+const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *faad_register(GF_FilterSession *session);
+const GF_FilterRegister *maddec_register(GF_FilterSession *session);
+const GF_FilterRegister *xviddec_register(GF_FilterSession *session);
+const GF_FilterRegister *j2kdec_register(GF_FilterSession *session);
+const GF_FilterRegister *ac3dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *a52dec_register(GF_FilterSession *session);
+const GF_FilterRegister *amrdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *oggdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *vorbisdec_register(GF_FilterSession *session);
+const GF_FilterRegister *theoradec_register(GF_FilterSession *session);
+const GF_FilterRegister *m2tsdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *sockin_register(GF_FilterSession *session);
+const GF_FilterRegister *dvblin_register(GF_FilterSession *session);
+const GF_FilterRegister *vtbdec_register(GF_FilterSession *session);
+const GF_FilterRegister *lsrdec_register(GF_FilterSession *session);
+const GF_FilterRegister *safdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *osvcdec_register(GF_FilterSession *session);
+#ifdef GPAC_OPENHEVC_STATIC
+const GF_FilterRegister *ohevcdec_register(GF_FilterSession *session);
+#endif
+const GF_FilterRegister *dashdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *cenc_decrypt_register(GF_FilterSession *session);
+const GF_FilterRegister *cenc_encrypt_register(GF_FilterSession *session);
+const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session);
+const GF_FilterRegister *qcpdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *h263dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session);
+const GF_FilterRegister *nhntdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *nhmldmx_register(GF_FilterSession *session);
+const GF_FilterRegister *naludmx_register(GF_FilterSession *session);
+const GF_FilterRegister *m2psdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *avidmx_register(GF_FilterSession *session);
+const GF_FilterRegister *txtin_register(GF_FilterSession *session);
+const GF_FilterRegister *ttxtdec_register(GF_FilterSession *session);
+const GF_FilterRegister *vttdec_register(GF_FilterSession *session);
+const GF_FilterRegister *ttmldec_register(GF_FilterSession *session);
+const GF_FilterRegister *rtpin_register(GF_FilterSession *session);
+const GF_FilterRegister *fileout_register(GF_FilterSession *session);
+const GF_FilterRegister *adtsmx_register(GF_FilterSession *session);
+const GF_FilterRegister *latm_mx_register(GF_FilterSession *session);
+const GF_FilterRegister *reframer_register(GF_FilterSession *session);
+const GF_FilterRegister *writegen_register(GF_FilterSession *session);
+const GF_FilterRegister *nalumx_register(GF_FilterSession *session);
+const GF_FilterRegister *qcpmx_register(GF_FilterSession *session);
+const GF_FilterRegister *vttmx_register(GF_FilterSession *session);
+const GF_FilterRegister *nhntdump_register(GF_FilterSession *session);
+const GF_FilterRegister *nhmldump_register(GF_FilterSession *session);
+const GF_FilterRegister *vobsubdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *avimux_register(GF_FilterSession *session);
+const GF_FilterRegister *aout_register(GF_FilterSession *session);
+const GF_FilterRegister *m4vmx_register(GF_FilterSession *session);
+const GF_FilterRegister *resample_register(GF_FilterSession *session);
+#if !defined(GPAC_CONFIG_ANDROID)
+const GF_FilterRegister *vout_register(GF_FilterSession *session);
+#endif
+const GF_FilterRegister *vcrop_register(GF_FilterSession *session);
+const GF_FilterRegister *vflip_register(GF_FilterSession *session);
+const GF_FilterRegister *rawvidreframe_register(GF_FilterSession *session);
+const GF_FilterRegister *pcmreframe_register(GF_FilterSession *session);
+const GF_FilterRegister *jpgenc_register(GF_FilterSession *session);
+const GF_FilterRegister *pngenc_register(GF_FilterSession *session);
+const GF_FilterRegister *rewind_register(GF_FilterSession *session);
+const GF_FilterRegister *filelist_register(GF_FilterSession *session);
+const GF_FilterRegister *tsmux_register(GF_FilterSession *session);
+const GF_FilterRegister *dasher_register(GF_FilterSession *session);
+const GF_FilterRegister *tileagg_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);
+#endif
+const GF_FilterRegister *gsfmx_register(GF_FilterSession *session);
+const GF_FilterRegister *gsfdmx_register(GF_FilterSession *session);
+const GF_FilterRegister *sockout_register(GF_FilterSession *session);
+const GF_FilterRegister *av1dmx_register(GF_FilterSession *session);
+const GF_FilterRegister *obumx_register(GF_FilterSession *session);
+#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 *rtpout_register(GF_FilterSession *session);
+const GF_FilterRegister *rtspout_register(GF_FilterSession *session);
+const GF_FilterRegister *hevcsplit_register(GF_FilterSession *session);
+const GF_FilterRegister *hevcmerge_register(GF_FilterSession *session);
+
+const GF_FilterRegister *jsfilter_register(GF_FilterSession *session);
+const GF_FilterRegister *m2tssplit_register(GF_FilterSession *session);
+const GF_FilterRegister *httpout_register(GF_FilterSession *session);
+
+#if !defined(GPAC_CONFIG_IOS) && !defined(GPAC_CONFIG_ANDROID) && !defined(GPAC_HAVE_DTAPI) && !defined(WIN32) 
+const GF_FilterRegister *dtout_register(GF_FilterSession *session);
+#endif
+
+#if !defined(GPAC_CONFIG_IOS)
+const GF_FilterRegister *mcdec_register(GF_FilterSession *session);
+#endif
+
+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);
+
+void gf_fs_reg_all(GF_FilterSession *fsess, GF_FilterSession *a_sess)
+{
+	gf_fs_add_filter_register(fsess, inspect_register(a_sess) );
+	gf_fs_add_filter_register(fsess, probe_register(a_sess) );
+	gf_fs_add_filter_register(fsess, compose_filter_register(a_sess) );
+	gf_fs_add_filter_register(fsess, isoffin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, bifs_dec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, odf_dec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, filein_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ctxload_register(a_sess) );
+	gf_fs_add_filter_register(fsess, httpin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, svgin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, img_reframe_register(a_sess) );
+	gf_fs_add_filter_register(fsess, imgdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, adts_dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, latm_dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, mp3_dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, faad_register(a_sess) );
+	gf_fs_add_filter_register(fsess, maddec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, xviddec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, j2kdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ac3dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, a52dec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, amrdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, oggdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vorbisdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, theoradec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, m2tsdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, sockin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, dvblin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, osvcdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vtbdec_register(a_sess) );
+
+#if !defined(GPAC_CONFIG_IOS)
+	gf_fs_add_filter_register(fsess, mcdec_register(a_sess) );
+#endif
+
+	gf_fs_add_filter_register(fsess, lsrdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, safdmx_register(a_sess) );
+#ifdef GPAC_OPENHEVC_STATIC
+	gf_fs_add_filter_register(fsess, ohevcdec_register(a_sess) );
+#endif
+	gf_fs_add_filter_register(fsess, dashdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, cenc_decrypt_register(a_sess) );
+	gf_fs_add_filter_register(fsess, cenc_encrypt_register(a_sess) );
+	gf_fs_add_filter_register(fsess, mp4_mux_register(a_sess) );
+	gf_fs_add_filter_register(fsess, qcpdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, h263dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, mpgviddmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, nhntdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, nhmldmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, naludmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, m2psdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, avidmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, txtin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ttxtdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vttdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ttmldec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, rtpin_register(a_sess) );
+	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, reframer_register(a_sess) );
+	gf_fs_add_filter_register(fsess, writegen_register(a_sess) );
+	gf_fs_add_filter_register(fsess, nalumx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, qcpmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vttmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, nhntdump_register(a_sess) );
+	gf_fs_add_filter_register(fsess, nhmldump_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vobsubdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, avimux_register(a_sess) );
+	gf_fs_add_filter_register(fsess, aout_register(a_sess) );
+	gf_fs_add_filter_register(fsess, m4vmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, resample_register(a_sess) );
+#if !defined(GPAC_CONFIG_ANDROID)
+	gf_fs_add_filter_register(fsess, vout_register(a_sess) );
+#endif
+	gf_fs_add_filter_register(fsess, vcrop_register(a_sess) );
+	gf_fs_add_filter_register(fsess, vflip_register(a_sess) );
+	gf_fs_add_filter_register(fsess, rawvidreframe_register(a_sess) );
+	gf_fs_add_filter_register(fsess, pcmreframe_register(a_sess) );
+	gf_fs_add_filter_register(fsess, jpgenc_register(a_sess) );
+	gf_fs_add_filter_register(fsess, pngenc_register(a_sess) );
+	gf_fs_add_filter_register(fsess, rewind_register(a_sess) );
+	gf_fs_add_filter_register(fsess, filelist_register(a_sess) );
+	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) );
+#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) );
+#endif
+	gf_fs_add_filter_register(fsess, gsfmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, gsfdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, sockout_register(a_sess) );
+	gf_fs_add_filter_register(fsess, av1dmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, obumx_register(a_sess) );
+#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, rtpout_register(a_sess));
+	gf_fs_add_filter_register(fsess, rtspout_register(a_sess));
+	gf_fs_add_filter_register(fsess, httpout_register(a_sess));
+
+	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, 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, ffdmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffdec_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffavin_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffsws_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffenc_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffmx_register(a_sess) );
+	gf_fs_add_filter_register(fsess, ffavf_register(a_sess) );
+
+	gf_fs_add_filter_register(fsess, jsfilter_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) );
+#endif
+}
+
+GF_EXPORT
+void gf_fs_register_test_filters(GF_FilterSession *fsess)
+{
+	gf_fs_add_filter_register(fsess, ut_source_register(NULL) );
+	gf_fs_add_filter_register(fsess, ut_filter_register(NULL) );
+	gf_fs_add_filter_register(fsess, ut_sink_register(NULL) );
+	gf_fs_add_filter_register(fsess, ut_sink2_register(NULL) );
+}
+
+

gpac-1.0.0.tar.gz/src/filter_core/filter_session.c Added

@@ -0,0 +1,3175 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 "filter_session.h"
+#include <gpac/network.h>
+
+#ifndef GPAC_DISABLE_3D
+#include <gpac/modules/video_out.h>
+#endif
+//#define CHECK_TASK_LIST_INTEGRITY
+
+struct _gf_ft_mgr *gf_font_manager_new();
+void gf_font_manager_del(struct _gf_ft_mgr *fm);
+
+
+static GFINLINE void gf_fs_sema_io(GF_FilterSession *fsess, Bool notify, Bool main)
+{
+	GF_Semaphore *sem = main ? fsess->semaphore_main : fsess->semaphore_other;
+	if (sem) {
+		if (notify) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u notify scheduler %s semaphore\n", gf_th_id(), main ? "main" : "secondary"));
+			if ( ! gf_sema_notify(sem, 1)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("Cannot notify scheduler of new task, semaphore failure\n"));
+			}
+		} else {
+			u32 nb_tasks;
+			//if not main and no tasks in main list, this could be the last task to process.
+			//if main thread is sleeping force a wake to take further actions (only the main thread decides the exit)
+			//this also ensures that tha main thread will process tasks from secondary task lists if no
+			//dedicated main thread tasks are present (eg no GL filters)
+			if (!main && fsess->in_main_sem_wait && !gf_fq_count(fsess->main_thread_tasks)) {
+				gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+			}
+			nb_tasks = 1;
+			//no active threads, count number of tasks. If no posted tasks we are likely at the end of the session, don't block, rather use a sem_wait 
+			if (!fsess->active_threads)
+			 	nb_tasks = gf_fq_count(fsess->main_thread_tasks) + gf_fq_count(fsess->tasks);
+
+			//if main semaphore, keep track that we are going to sleep
+			if (main) {
+				fsess->in_main_sem_wait = GF_TRUE;
+				if (!nb_tasks) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("No tasks scheduled, waiting on main semaphore for at most 100 ms\n"));
+					if (gf_sema_wait_for(sem, 100)) {
+					}
+				} else {
+					if (gf_sema_wait(sem)) {
+					}
+				}
+				fsess->in_main_sem_wait = GF_FALSE;
+			} else {
+				if (!nb_tasks) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("No tasks scheduled, waiting on secondary semaphore for at most 100 ms\n"));
+					if (gf_sema_wait_for(sem, 100)) {
+					}
+				} else {
+					if (gf_sema_wait(sem)) {
+					}
+				}
+			}
+		}
+	}
+}
+
+void gf_fs_add_filter_register(GF_FilterSession *fsess, const GF_FilterRegister *freg)
+{
+	if (!freg) return;
+
+	if (!freg->name) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter missing name - ignoring\n"));
+		return;
+	}
+	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) {
+			u32 len = (u32) strlen(freg->name);
+			if (!fname[len] || (fname[len] == fsess->sep_list)) {
+				return;
+			}
+		}
+	}
+	gf_list_add(fsess->registry, (void *) freg);
+
+	if (fsess->init_done && fsess->links && gf_list_count( fsess->links)) {
+		gf_filter_sess_build_graph(fsess, freg);
+	}
+}
+
+
+
+static Bool fs_default_event_proc(void *ptr, GF_Event *evt)
+{
+	if (evt->type==GF_EVENT_QUIT) {
+		GF_FilterSession *fsess = (GF_FilterSession *)ptr;
+		gf_fs_abort(fsess, GF_FALSE);
+	}
+	return 0;
+}
+
+GF_EXPORT
+GF_FilterSession *gf_fs_new(s32 nb_threads, GF_FilterSchedulerType sched_type, u32 flags, const char *blacklist)
+{
+	const char *opt;
+	Bool gf_sys_has_filter_global_args();
+	Bool gf_sys_has_filter_global_meta_args();
+
+	u32 i, count;
+	GF_FilterSession *fsess, *a_sess;
+
+	//safety check: all built-in properties shall have unique 4CCs
+	if ( ! gf_props_4cc_check_props())
+		return NULL;
+
+	GF_SAFEALLOC(fsess, GF_FilterSession);
+	if (!fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to alloc media session\n"));
+		return NULL;
+	}
+	fsess->flags = flags;
+
+	fsess->filters = gf_list_new();
+	fsess->main_th.fsess = fsess;
+
+	if ((s32) nb_threads == -1) {
+		GF_SystemRTInfo rti;
+		memset(&rti, 0, sizeof(GF_SystemRTInfo));
+		if (gf_sys_get_rti(0, &rti, 0)) {
+			nb_threads = rti.nb_cores-1;
+		}
+		if ((s32)nb_threads<0) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Failed to query number of cores, disabling extra threads for session\n"));
+			nb_threads=0;
+		}
+	}
+
+	if (sched_type==GF_FS_SCHEDULER_DIRECT) {
+		fsess->direct_mode = GF_TRUE;
+		nb_threads=0;
+	}
+	if (nb_threads && (sched_type != GF_FS_SCHEDULER_LOCK_FREE_X)) {
+		fsess->tasks_mx = gf_mx_new("TasksList");
+	}
+
+	//regardless of scheduler type, we don't use lock on the main task list
+	fsess->tasks = gf_fq_new(fsess->tasks_mx);
+
+	if (nb_threads>0) {
+		fsess->main_thread_tasks = gf_fq_new(fsess->tasks_mx);
+		fsess->filters_mx = gf_mx_new("Filters");
+	} else {
+		//otherwise use the same as the global task list
+		fsess->main_thread_tasks = fsess->tasks;
+	}
+
+	if (!(flags & GF_FS_FLAG_NO_RESERVOIR)) {
+		fsess->tasks_reservoir = gf_fq_new(fsess->tasks_mx);
+	}
+
+	if (nb_threads || (sched_type==GF_FS_SCHEDULER_LOCK_FORCE) ) {
+		fsess->semaphore_main = fsess->semaphore_other = gf_sema_new(GF_INT_MAX, 0);
+		if (nb_threads>0)
+			fsess->semaphore_other = gf_sema_new(GF_INT_MAX, 0);
+
+		//force testing of mutex queues
+		//fsess->use_locks = GF_TRUE;
+	}
+	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 (!fsess->semaphore_main)
+		nb_threads=0;
+
+	if (nb_threads) {
+		fsess->threads = gf_list_new();
+		if (!fsess->threads) {
+			gf_sema_del(fsess->semaphore_main);
+			fsess->semaphore_main=NULL;
+			gf_sema_del(fsess->semaphore_other);
+			fsess->semaphore_other=NULL;
+			nb_threads=0;
+		}
+		fsess->use_locks = (sched_type==GF_FS_SCHEDULER_LOCK) ? GF_TRUE : GF_FALSE;
+	} else {
+#ifdef GPAC_MEMORY_TRACKING
+		extern int gf_mem_track_enabled;
+		fsess->check_allocs = gf_mem_track_enabled;
+#endif
+
+	}
+
+	if (fsess->use_locks)
+		fsess->props_mx = gf_mx_new("FilterSessionProps");
+
+	if (!(flags & GF_FS_FLAG_NO_RESERVOIR)) {
+#if GF_PROPS_HASHTABLE_SIZE
+		fsess->prop_maps_list_reservoir = gf_fq_new(fsess->props_mx);
+#endif
+		fsess->prop_maps_reservoir = gf_fq_new(fsess->props_mx);
+		fsess->prop_maps_entry_reservoir = gf_fq_new(fsess->props_mx);
+		fsess->prop_maps_entry_data_alloc_reservoir = gf_fq_new(fsess->props_mx);
+		//we also use the props mutex for the this one
+		fsess->pcks_refprops_reservoir = gf_fq_new(fsess->props_mx);
+	}
+
+
+#ifndef GPAC_DISABLE_REMOTERY
+	sprintf(fsess->main_th.rmt_name, "FSThread0");
+#endif
+
+	if (!fsess->filters || !fsess->tasks) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to alloc media session\n"));
+		fsess->run_status = GF_OUT_OF_MEM;
+		gf_fs_del(fsess);
+		return NULL;
+	}
+
+	if (nb_threads) {
+		fsess->info_mx = gf_mx_new("FilterSessionInfo");
+		fsess->ui_mx = gf_mx_new("FilterSessionUIProc");
+	}
+
+	for (i=0; i<(u32) nb_threads; i++) {
+		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");
+		if (!sess_thread->th) {
+			gf_free(sess_thread);
+			continue;
+		}
+		sess_thread->fsess = fsess;
+		gf_list_add(fsess->threads, sess_thread);
+	}
+
+	gf_fs_set_separators(fsess, NULL);
+
+	fsess->registry = gf_list_new();
+	fsess->blacklist = blacklist;
+	a_sess = (flags & GF_FS_FLAG_LOAD_META) ? fsess : NULL;
+	gf_fs_reg_all(fsess, a_sess);
+
+	//load external modules
+	count = gf_modules_count();
+	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);
+		}
+	}
+	fsess->blacklist = NULL;
+
+	//todo - find a way to handle events without mutex ...
+	fsess->evt_mx = gf_mx_new("Event mutex");
+
+	fsess->blocking_mode = GF_FS_BLOCK_ALL;
+	opt = gf_opts_get_key("core", "no-block");
+	if (opt) {
+		if (!strcmp(opt, "fanout")) {
+			fsess->blocking_mode = GF_FS_NOBLOCK_FANOUT;
+		}
+		else if (!strcmp(opt, "all")) {
+			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;
+	fsess->decoder_pid_buffer_max_us = 1000000;
+	fsess->default_pid_buffer_max_units = 1;
+	fsess->max_resolve_chain_len = 6;
+	fsess->auto_inc_nums = gf_list_new();
+
+	if (nb_threads)
+		fsess->links_mx = gf_mx_new("FilterRegistryGraph");
+	fsess->links = gf_list_new();
+
+#ifndef GPAC_DISABLE_3D
+	fsess->gl_providers = gf_list_new();
+#endif
+
+	if (! (fsess->flags & GF_FS_FLAG_NO_GRAPH_CACHE))
+		gf_filter_sess_build_graph(fsess, NULL);
+
+	fsess->init_done = GF_TRUE;
+
+
+	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++) {
+			char *arg = (char *)gf_sys_get_arg(i);
+			if (arg[0]!='-') continue;
+			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);
+			if (sep) sep[0] = '=';
+		}
+	}
+
+	return fsess;
+}
+
+void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, u32 type)
+{
+	if (session->flags & GF_FS_FLAG_NO_ARG_CHECK)
+		return;
+
+	if (!was_found) {
+		Bool afound = GF_FALSE;
+		u32 k, acount;
+		if (!session->parsed_args) session->parsed_args = gf_list_new();
+		acount = gf_list_count(session->parsed_args);
+		for (k=0; k<acount; k++) {
+			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 (!afound) {
+			GF_FSArgItem *ai;
+			GF_SAFEALLOC(ai, GF_FSArgItem);
+			if (ai) {
+				ai->argname = gf_strdup(szArg);
+				ai->type = type;
+				gf_list_add(session->parsed_args, ai );
+			}
+		}
+	} else {
+		u32 k, acount;
+		Bool found = GF_FALSE;
+		if (!session->parsed_args) session->parsed_args = gf_list_new();
+		acount = gf_list_count(session->parsed_args);
+		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;
+				found = GF_TRUE;
+				break;
+			}
+		}
+		if (!found) {
+			GF_FSArgItem *ai;
+			GF_SAFEALLOC(ai, GF_FSArgItem);
+			if (ai) {
+				ai->argname = gf_strdup(szArg);
+				ai->type = type;
+				ai->found = GF_TRUE;
+				gf_list_add(session->parsed_args, ai );
+			}
+		}
+	}
+}
+
+
+GF_EXPORT
+GF_FilterSession *gf_fs_new_defaults(u32 inflags)
+{
+	GF_FilterSession *fsess;
+	GF_FilterSchedulerType sched_type = GF_FS_SCHEDULER_LOCK_FREE;
+	u32 flags = 0;
+	s32 nb_threads = gf_opts_get_int("core", "threads");
+	const char *blacklist = gf_opts_get_key("core", "blacklist");
+	const char *opt = gf_opts_get_key("core", "sched");
+
+	if (!opt) sched_type = GF_FS_SCHEDULER_LOCK_FREE;
+	else if (!strcmp(opt, "lock")) sched_type = GF_FS_SCHEDULER_LOCK;
+	else if (!strcmp(opt, "flock")) sched_type = GF_FS_SCHEDULER_LOCK_FORCE;
+	else if (!strcmp(opt, "direct")) sched_type = GF_FS_SCHEDULER_DIRECT;
+	else if (!strcmp(opt, "free")) sched_type = GF_FS_SCHEDULER_LOCK_FREE;
+	else if (!strcmp(opt, "freex")) sched_type = GF_FS_SCHEDULER_LOCK_FREE_X;
+	else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Unrecognized scheduler type %s\n", opt));
+		return NULL;
+	}
+	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_NO_GRAPH_CACHE)
+		flags |= GF_FS_FLAG_NO_GRAPH_CACHE;
+
+	if (gf_opts_get_bool("core", "dbg-edges"))
+		flags |= GF_FS_FLAG_PRINT_CONNECTIONS;
+
+	if (gf_opts_get_bool("core", "full-link"))
+		flags |= GF_FS_FLAG_FULL_LINK;
+
+	if (gf_opts_get_bool("core", "no-reg"))
+		flags |= GF_FS_FLAG_NO_REGULATION;
+
+	if (gf_opts_get_bool("core", "no-reassign"))
+		flags |= GF_FS_FLAG_NO_REASSIGN;
+
+	if (gf_opts_get_bool("core", "no-graph-cache"))
+		flags |= GF_FS_FLAG_NO_GRAPH_CACHE;
+
+	if (gf_opts_get_bool("core", "no-probe"))
+		flags |= GF_FS_FLAG_NO_PROBE;
+
+	if (gf_opts_get_bool("core", "no-argchk"))
+		flags |= GF_FS_FLAG_NO_ARG_CHECK;
+
+	if (gf_opts_get_bool("core", "no-reservoir"))
+		flags |= GF_FS_FLAG_NO_RESERVOIR;
+
+
+	fsess = gf_fs_new(nb_threads, sched_type, flags, blacklist);
+	if (!fsess) return NULL;
+
+	gf_fs_set_max_resolution_chain_length(fsess, gf_opts_get_int("core", "max-chain") );
+
+	gf_fs_set_max_sleep_time(fsess, gf_opts_get_int("core", "max-sleep") );
+
+	opt = gf_opts_get_key("core", "seps");
+	if (opt)
+		gf_fs_set_separators(fsess, opt);
+
+	return fsess;
+}
+
+
+GF_EXPORT
+GF_Err gf_fs_set_separators(GF_FilterSession *session, const char *separator_set)
+{
+	if (!session) return GF_BAD_PARAM;
+	if (separator_set && (strlen(separator_set)<5)) return GF_BAD_PARAM;
+
+	if (separator_set) {
+		session->sep_args = separator_set[0];
+		session->sep_name = separator_set[1];
+		session->sep_frag = separator_set[2];
+		session->sep_list = separator_set[3];
+		session->sep_neg = separator_set[4];
+	} else {
+		session->sep_args = ':';
+		session->sep_name = '=';
+		session->sep_frag = '#';
+		session->sep_list = ',';
+		session->sep_neg = '!';
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_fs_set_max_resolution_chain_length(GF_FilterSession *session, u32 max_chain_length)
+{
+	if (!session) return GF_BAD_PARAM;
+	session->max_resolve_chain_len = max_chain_length;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_fs_set_max_sleep_time(GF_FilterSession *session, u32 max_sleep)
+{
+	if (!session) return GF_BAD_PARAM;
+	session->max_sleep = max_sleep;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_fs_get_max_resolution_chain_length(GF_FilterSession *session)
+{
+	if (!session) return 0;
+	return session->max_resolve_chain_len;
+}
+
+void gf_fs_remove_filter_register(GF_FilterSession *session, GF_FilterRegister *freg)
+{
+	gf_list_del_item(session->registry, freg);
+	gf_filter_sess_reset_graph(session, freg);
+}
+
+GF_EXPORT
+void gf_fs_set_ui_callback(GF_FilterSession *fs, Bool (*ui_event_proc)(void *opaque, GF_Event *event), void *cbk_udta)
+{
+	if (fs) {
+		fs->ui_event_proc = ui_event_proc;
+		fs->ui_opaque = cbk_udta;
+		if (!fs->ui_event_proc) {
+			fs->ui_event_proc = fs_default_event_proc;
+			fs->ui_opaque = fs;
+		}
+	}
+}
+
+void gf_propalloc_del(void *it)
+{
+	GF_PropertyEntry *pe = (GF_PropertyEntry *)it;
+	if (pe->prop.value.data.ptr) gf_free(pe->prop.value.data.ptr);
+	gf_free(pe);
+}
+
+
+GF_EXPORT
+Bool gf_fs_enum_unmapped_options(GF_FilterSession *fsess, u32 *idx, char **argname, u32 *argtype)
+{
+	if (!fsess || !fsess->parsed_args) return GF_FALSE;
+	u32 i, count = gf_list_count(fsess->parsed_args);
+
+	for (i=*idx; i<count; i++) {
+		GF_FSArgItem *ai = gf_list_get(fsess->parsed_args, i);
+		(*idx)++;
+		if (ai->found) continue;
+		if (argname) *argname = ai->argname;
+		if (argtype) *argtype = ai->type;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+
+GF_EXPORT
+void gf_fs_del(GF_FilterSession *fsess)
+{
+	assert(fsess);
+
+	gf_fs_stop(fsess);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session destroy begin\n"));
+
+	if (fsess->parsed_args) {
+		while (gf_list_count(fsess->parsed_args)) {
+			GF_FSArgItem *ai = gf_list_pop_back(fsess->parsed_args);
+			gf_free(ai->argname);
+			gf_free(ai);
+		}
+		gf_list_del(fsess->parsed_args);
+	}
+
+	//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);
+		//first pass: disconnect all filters, since some may have references to property maps or packets 
+		for (i=0; i<count; i++) {
+			u32 j;
+			GF_Filter *filter = gf_list_get(fsess->filters, i);
+			filter->process_th_id = 0;
+			filter->scheduled_for_next_task = GF_TRUE;
+
+			if (filter->detached_pid_inst) {
+				while (gf_list_count(filter->detached_pid_inst)) {
+					GF_FilterPidInst *pidi = gf_list_pop_front(filter->detached_pid_inst);
+					gf_filter_pid_inst_del(pidi);
+				}
+				gf_list_del(filter->detached_pid_inst);
+				filter->detached_pid_inst = NULL;
+			}
+
+			if (filter->postponed_packets) {
+				while (gf_list_count(filter->postponed_packets)) {
+					GF_FilterPacket *pck = gf_list_pop_front(filter->postponed_packets);
+					gf_filter_packet_destroy(pck);
+				}
+				gf_list_del(filter->postponed_packets);
+				filter->postponed_packets = NULL;
+			}
+			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);
+			}
+			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);
+			}
+		}
+
+		while (gf_list_count(fsess->filters)) {
+			GF_Filter *filter = gf_list_pop_back(fsess->filters);
+
+			gf_filter_del(filter);
+		}
+		gf_list_del(fsess->filters);
+		fsess->filters = NULL;
+	}
+
+	if (fsess->download_manager) gf_dm_del(fsess->download_manager);
+	if (fsess->font_manager) gf_font_manager_del(fsess->font_manager);
+
+	if (fsess->registry) {
+		while (gf_list_count(fsess->registry)) {
+			GF_FilterRegister *freg = gf_list_pop_back(fsess->registry);
+			if (freg->register_free) freg->register_free(fsess, freg);
+		}
+		gf_list_del(fsess->registry);
+	}
+
+	if (fsess->tasks)
+		gf_fq_del(fsess->tasks, gf_void_del);
+
+	if (fsess->tasks_reservoir)
+		gf_fq_del(fsess->tasks_reservoir, gf_void_del);
+
+	if (fsess->threads) {
+		if (fsess->main_thread_tasks)
+			gf_fq_del(fsess->main_thread_tasks, gf_void_del);
+
+		while (gf_list_count(fsess->threads)) {
+			GF_SessionThread *sess_th = gf_list_pop_back(fsess->threads);
+			gf_th_del(sess_th->th);
+			gf_free(sess_th);
+		}
+		gf_list_del(fsess->threads);
+	}
+
+	if (fsess->prop_maps_reservoir)
+		gf_fq_del(fsess->prop_maps_reservoir, gf_propmap_del);
+#if GF_PROPS_HASHTABLE_SIZE
+	if (fsess->prop_maps_list_reservoir)
+		gf_fq_del(fsess->prop_maps_list_reservoir, (gf_destruct_fun) gf_list_del);
+#endif
+	if (fsess->prop_maps_entry_reservoir)
+		gf_fq_del(fsess->prop_maps_entry_reservoir, gf_void_del);
+	if (fsess->prop_maps_entry_data_alloc_reservoir)
+		gf_fq_del(fsess->prop_maps_entry_data_alloc_reservoir, gf_propalloc_del);
+	if (fsess->pcks_refprops_reservoir)
+		gf_fq_del(fsess->pcks_refprops_reservoir, gf_void_del);
+
+
+	if (fsess->props_mx)
+		gf_mx_del(fsess->props_mx);
+
+	if (fsess->info_mx)
+		gf_mx_del(fsess->info_mx);
+
+	if (fsess->ui_mx)
+		gf_mx_del(fsess->ui_mx);
+
+	if (fsess->semaphore_other && (fsess->semaphore_other != fsess->semaphore_main) )
+		gf_sema_del(fsess->semaphore_other);
+
+	if (fsess->semaphore_main)
+		gf_sema_del(fsess->semaphore_main);
+
+	if (fsess->tasks_mx)
+		gf_mx_del(fsess->tasks_mx);
+
+	if (fsess->filters_mx)
+		gf_mx_del(fsess->filters_mx);
+
+	if (fsess->evt_mx) gf_mx_del(fsess->evt_mx);
+	if (fsess->event_listeners) gf_list_del(fsess->event_listeners);
+
+	if (fsess->links) {
+		gf_filter_sess_reset_graph(fsess, NULL);
+		gf_list_del(fsess->links);
+	}
+	if (fsess->links_mx) gf_mx_del(fsess->links_mx);
+
+#ifndef GPAC_DISABLE_3D
+	gf_list_del(fsess->gl_providers);
+	if (fsess->gl_driver) {
+		fsess->gl_driver->Shutdown(fsess->gl_driver);
+		gf_modules_close_interface((GF_BaseInterface *)fsess->gl_driver);
+	}
+#endif
+
+	if (fsess->auto_inc_nums) {
+		while(gf_list_count(fsess->auto_inc_nums)) {
+			GF_FSAutoIncNum *aint = gf_list_pop_back(fsess->auto_inc_nums);
+			gf_free(aint);
+		}
+		gf_list_del(fsess->auto_inc_nums);
+	}
+
+	gf_free(fsess);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session destroyed\n"));
+}
+
+GF_EXPORT
+u32 gf_fs_filters_registers_count(GF_FilterSession *fsess)
+{
+	return fsess ? gf_list_count(fsess->registry) : 0;
+}
+
+GF_EXPORT
+const GF_FilterRegister * gf_fs_get_filter_register(GF_FilterSession *fsess, u32 idx)
+{
+	return gf_list_get(fsess->registry, idx);
+}
+
+#ifdef CHECK_TASK_LIST_INTEGRITY
+static Bool check_task_list_enum(void *udta, void *item)
+{
+	assert(udta != item);
+	return GF_FALSE;
+}
+static void check_task_list(GF_FilterQueue *fq, GF_FSTask *task)
+{
+	if (fq) {
+		gf_fq_enum(fq, check_task_list_enum, task);
+	}
+}
+#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)
+{
+	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
+	if ((force_direct_call || fsess->direct_mode)
+		&& (!filter || !filter->in_process)
+		&& fsess->tasks_in_process
+		&& (gf_th_id()==fsess->main_th.th_id)
+	) {
+		GF_FSTask atask;
+		u64 task_time = gf_sys_clock_high_res();
+		memset(&atask, 0, sizeof(GF_FSTask));
+		atask.filter = filter;
+		atask.pid = pid;
+		atask.run_task = task_fun;
+		atask.log_name = log_name;
+		atask.udta = udta;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread 0 task#%d %p executing Filter %s::%s (%d tasks pending)\n", fsess->main_th.nb_tasks, &atask, filter ? filter->name : "none", log_name, fsess->tasks_pending));
+		if (filter)
+			filter->scheduled_for_next_task = GF_TRUE;
+		task_fun(&atask);
+		filter = atask.filter;
+		if (filter) {
+			filter->time_process += gf_sys_clock_high_res() - task_time;
+			filter->scheduled_for_next_task = GF_FALSE;
+			filter->nb_tasks_done++;
+		}
+		if (!atask.requeue_request)
+			return;
+		//asked to requeue the task, post it
+	}
+	task = gf_fq_pop(fsess->tasks_reservoir);
+
+	if (!task) {
+		GF_SAFEALLOC(task, GF_FSTask);
+		if (!task) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("No more memory to post new task\n"));
+			return;
+		}
+	}
+	task->filter = filter;
+	task->pid = pid;
+	task->run_task = task_fun;
+	task->log_name = log_name;
+	task->udta = udta;
+
+	if (filter && is_configure) {
+		if (filter->freg->flags & GF_FS_REG_CONFIGURE_MAIN_THREAD)
+			force_main_thread = GF_TRUE;
+	}
+
+	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;
+		} else if (force_main_thread) {
+			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"));
+			}
+		}
+		if (!force_main_thread)
+			task->blocking = (filter->freg->flags & GF_FS_REG_BLOCKING) ? GF_TRUE : GF_FALSE;
+
+		gf_fq_add(filter->tasks, task);
+		gf_mx_v(filter->tasks_mx);
+
+		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;
+		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));
+	}
+
+	//WARNING, do not use task->notified since the task may have been posted to the filter task list and may already have been swapped
+	//with a different value !
+	if (notified) {
+#ifdef CHECK_TASK_LIST_INTEGRITY
+		check_task_list(fsess->main_thread_tasks, task);
+		check_task_list(fsess->tasks, task);
+		check_task_list(fsess->tasks_reservoir, task);
+#endif
+		assert(task->run_task);
+		if (filter) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u posting filter task, scheduled_for_next_task %d\n", gf_th_id(), filter->scheduled_for_next_task));
+			assert(!filter->scheduled_for_next_task);
+		}
+
+		//notify/count tasks posted on the main task or regular task lists
+		safe_int_inc(&fsess->tasks_pending);
+		if (filter && force_main_thread) {
+			gf_fq_add(fsess->main_thread_tasks, task);
+			gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+		} else {
+			assert(task->run_task);
+			gf_fq_add(fsess->tasks, task);
+			gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
+		}
+	}
+}
+
+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_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)
+{
+	u32 j;
+	u32 has_raw_in = 0;
+	u32 has_cid_match = 0;
+	u32 exclude_cid_out = 0;
+	u32 has_exclude_cid_out = 0;
+	for (j=0; j<f_reg->nb_caps; j++) {
+		const GF_FilterCapability *cap = &f_reg->caps[j];
+		if (!(cap->flags & GF_CAPFLAG_IN_BUNDLE)) {
+			//CID not excluded, raw in present and CID explicit match or not included in excluded set
+			if (!exclude_cid_out && has_raw_in && (has_cid_match || (!exact_match_only && has_exclude_cid_out) ) ) {
+				return GF_TRUE;
+			}
+
+			if (has_raw_in != 2) has_raw_in = 0;
+			if (has_cid_match != 2) has_cid_match = 0;
+			if (exclude_cid_out != 2) exclude_cid_out = 0;
+			if (has_exclude_cid_out != 2) has_exclude_cid_out = 0;
+
+			continue;
+		}
+
+		if ( (cap->flags & GF_CAPFLAG_INPUT) && (cap->code == incode) ) {
+			if (! (cap->flags & GF_CAPFLAG_EXCLUDED) && gf_props_equal(&cap->val, cap_input) ) {
+				has_raw_in = (cap->flags & GF_CAPS_INPUT_STATIC) ? 2 : 1;
+			}
+		}
+		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;
+				}
+			} else {
+				if (gf_props_equal(&cap->val, cap_output) ) {
+					exclude_cid_out = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
+				} else {
+					has_exclude_cid_out = (cap->flags & GF_CAPS_OUTPUT_STATIC) ? 2 : 1;
+				}
+			}
+		}
+	}
+	//CID not excluded, raw in present and CID explicit match or not included in excluded set
+	if (!exclude_cid_out && has_raw_in && (has_cid_match || (!exact_match_only && has_exclude_cid_out) ) ) {
+		return GF_TRUE;
+	}
+	return 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;
+	u32 codecid=0;
+	GF_Filter *filter;
+	u32 i, count;
+	GF_PropertyValue cap_in, cap_out;
+	szCodec[0] = 'c';
+	szCodec[1] = fsess->sep_name;
+	szCodec[2] = 0;
+
+	cid = args ? strstr(args, szCodec) : NULL;
+	if (!cid) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing codec identifier in \"enc\" definition: %s\n", args ? args : "no arguments"));
+		return NULL;
+	}
+	sep = strchr(cid, fsess->sep_args);
+	if (sep) sep[0] = 0;
+
+	codecid = gf_codec_parse(cid+2);
+	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;
+	}
+	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;
+
+	count = gf_list_count(fsess->registry);
+	for (i=0; i<count; i++) {
+		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
+
+		if ( gf_fs_check_filter_register_cap(f_reg, GF_PROP_PID_CODECID, &cap_in, GF_PROP_PID_CODECID, &cap_out, GF_FALSE)) {
+			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));
+		return NULL;
+	}
+	filter = gf_filter_new(fsess, candidate, args, NULL, GF_FILTER_ARG_EXPLICIT, &e, NULL, GF_FALSE);
+	if (!filter) {
+		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);
+	}
+	return filter;
+}
+
+GF_EXPORT
+Bool gf_fs_filter_exists(GF_FilterSession *fsess, const char *name)
+{
+	u32 i, count;
+
+	if (!strcmp(name, "enc")) return GF_TRUE;
+
+	count = gf_list_count(fsess->registry);
+	for (i=0;i<count;i++) {
+		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
+		if (!strcmp(f_reg->name, name)) {
+			return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+GF_Filter *gf_fs_load_filter(GF_FilterSession *fsess, const char *name, GF_Err *err_code)
+{
+	const char *args=NULL;
+	u32 i, len, count = gf_list_count(fsess->registry);
+	Bool quiet = (err_code && (*err_code == GF_EOS)) ? GF_TRUE : GF_FALSE;
+
+	char *sep;
+
+	assert(fsess);
+	assert(name);
+	if (err_code) *err_code = GF_OK;
+
+	sep = strchr(name, fsess->sep_args);
+	if (sep) {
+		args = sep+1;
+		len = (u32) (sep - name);
+	} else len = (u32) strlen(name);
+
+	if (!len) {
+		if (!quiet) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Missing filter name in %s\n", name));
+		}
+		return NULL;
+	}
+
+	if (!strncmp(name, "enc", len)) {
+		return gf_fs_load_encoder(fsess, args);
+	}
+	/*regular filter loading*/
+	for (i=0;i<count;i++) {
+		const GF_FilterRegister *f_reg = gf_list_get(fsess->registry, i);
+		if ((strlen(f_reg->name)==len) && !strncmp(f_reg->name, name, len)) {
+			GF_Filter *filter;
+			GF_FilterArgType argtype = GF_FILTER_ARG_EXPLICIT;
+
+			if ((f_reg->flags & GF_FS_REG_REQUIRES_RESOLVER) && !fsess->max_resolve_chain_len) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Filter %s requires graph resolver but it is disabled\n", name));
+				if (err_code) *err_code = GF_BAD_PARAM;
+				return NULL;
+			}
+
+			if (f_reg->flags & GF_FS_REG_ACT_AS_SOURCE) argtype = GF_FILTER_ARG_EXPLICIT_SOURCE;
+			filter = gf_filter_new(fsess, f_reg, args, NULL, argtype, err_code, NULL, GF_FALSE);
+			if (!filter) return NULL;
+			if (!filter->num_output_pids) {
+				const char *src_url = strstr(name, "src");
+				if (src_url && (src_url[3]==fsess->sep_name))
+					gf_filter_post_process_task(filter);
+			}
+			return filter;
+		}
+	}
+	/*check JS file*/
+	if (strstr(name, ".js") || strstr(name, ".jsf") || strstr(name, ".mjs") ) {
+		char szPath[10+GF_MAX_PATH];
+		if (len>GF_MAX_PATH)
+			return NULL;
+		strncpy(szPath, name, len);
+		szPath[len]=0;
+		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);
+		}
+	}
+
+	if (!quiet) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to load filter %s: no such filter registry\n", name));
+	}
+	if (err_code) *err_code = GF_FILTER_NOT_FOUND;
+	return 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
+#define MONOTH_MIN_TASKS	2
+//this defines the sleep time for this case
+#define MONOTH_MIN_SLEEP	5
+
+static u32 gf_fs_thread_proc(GF_SessionThread *sess_thread)
+{
+	GF_FilterSession *fsess = sess_thread->fsess;
+	u32 i, th_count = fsess->threads ? gf_list_count(fsess->threads) : 0;
+	u32 thid =  1 + gf_list_find(fsess->threads, sess_thread);
+	u64 enter_time = gf_sys_clock_high_res();
+	Bool use_main_sema = thid ? GF_FALSE : GF_TRUE;
+#ifndef GPAC_DISABLE_LOG
+	u32 sys_thid = gf_th_id();
+#endif
+	u64 next_task_schedule_time = 0;
+	Bool do_regulate = (fsess->flags & GF_FS_FLAG_NO_REGULATION) ? GF_FALSE : GF_TRUE;
+	u32 consecutive_filter_tasks=0;
+	Bool force_secondary_tasks = GF_FALSE;
+	Bool skip_next_sema_wait = GF_FALSE;
+
+	GF_Filter *current_filter = NULL;
+	sess_thread->th_id = gf_th_id();
+
+#ifndef GPAC_DISABLE_REMOTERY
+	sess_thread->rmt_tasks=40;
+	gf_rmt_set_thread_name(sess_thread->rmt_name);
+#endif
+
+	gf_rmt_begin(fs_thread, 0);
+
+	safe_int_inc(&fsess->active_threads);
+
+	if (!thid && fsess->no_main_thread) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc enter\n"));
+	}
+
+	while (1) {
+		Bool notified;
+		Bool requeue = GF_FALSE;
+		u64 active_start, task_time;
+		GF_FSTask *task=NULL;
+#ifdef CHECK_TASK_LIST_INTEGRITY
+		GF_Filter *prev_current_filter = NULL;
+		Bool skip_filter_task_check = GF_FALSE;
+#endif
+
+#ifndef GPAC_DISABLE_REMOTERY
+		sess_thread->rmt_tasks--;
+		if (!sess_thread->rmt_tasks) {
+			gf_rmt_end();
+			gf_rmt_begin(fs_thread, 0);
+			sess_thread->rmt_tasks=40;
+		}
+#endif
+
+		safe_int_dec(&fsess->active_threads);
+
+		if (!skip_next_sema_wait && (current_filter==NULL)) {
+			gf_rmt_begin(sema_wait, GF_RMT_AGGREGATE);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u Waiting scheduler %s semaphore\n", sys_thid, use_main_sema ? "main" : "secondary"));
+			//wait for something to be done
+			gf_fs_sema_io(fsess, GF_FALSE, use_main_sema);
+			consecutive_filter_tasks = 0;
+			gf_rmt_end();
+		}
+		safe_int_inc(&fsess->active_threads);
+		skip_next_sema_wait = GF_FALSE;
+
+		active_start = gf_sys_clock_high_res();
+
+		if (current_filter==NULL) {
+			//main thread
+			if (thid==0) {
+				if (!force_secondary_tasks) {
+					task = gf_fq_pop(fsess->main_thread_tasks);
+				}
+				if (!task) {
+					task = gf_fq_pop(fsess->tasks);
+					if (task && task->blocking) {
+						gf_fq_add(fsess->tasks, task);
+						task = NULL;
+						gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
+					}
+				}
+				force_secondary_tasks = GF_FALSE;
+			} else {
+				task = gf_fq_pop(fsess->tasks);
+			}
+			if (task) {
+				assert( task->run_task );
+				assert( 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 );
+			}
+		}
+
+		if (!task) {
+			u32 force_nb_notif = 0;
+			next_task_schedule_time = 0;
+			//no more task and EOS signal
+			if (fsess->run_status != GF_OK)
+				break;
+
+			if (!fsess->tasks_pending && fsess->main_th.has_seen_eot) {
+				//check all threads
+				Bool all_done = GF_TRUE;
+
+				for (i=0; i<th_count; i++) {
+					GF_SessionThread *st = gf_list_get(fsess->threads, i);
+					if (!st->has_seen_eot) {
+						all_done = GF_FALSE;
+						force_nb_notif++;
+					}
+				}
+				if (all_done)
+					break;
+			}
+			if (current_filter) {
+				current_filter->scheduled_for_next_task = GF_FALSE;
+				current_filter->process_th_id = 0;
+				assert(current_filter->in_process);
+				current_filter->in_process = GF_FALSE;
+			}
+			current_filter = NULL;
+			sess_thread->active_time += gf_sys_clock_high_res() - active_start;
+
+
+			//no pending tasks and first time main task queue is empty, flush to detect if we
+			//are indeed done
+			if (!fsess->tasks_pending && !fsess->tasks_in_process && !sess_thread->has_seen_eot && !gf_fq_count(fsess->tasks)) {
+				//maybe last task, force a notify to check if we are truly done
+				sess_thread->has_seen_eot = GF_TRUE;
+				//not main thread and some tasks pending on main, notify only ourselves
+				if (thid && gf_fq_count(fsess->main_thread_tasks)) {
+					gf_fs_sema_io(fsess, GF_TRUE, use_main_sema);
+				}
+				//main thread exit probing, send a notify to main sema (for this thread), and N for the secondary one
+				else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u notify scheduler main semaphore\n", gf_th_id()));
+					gf_sema_notify(fsess->semaphore_main, 1);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u notify scheduler secondary semaphore %d\n", gf_th_id(), th_count));
+					gf_sema_notify(fsess->semaphore_other, th_count);
+				}
+			}
+			//this thread and the main thread are done but we still have unfinished threads, re-notify everyone
+			else if (!fsess->tasks_pending && fsess->main_th.has_seen_eot && force_nb_notif) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u notify scheduler main semaphore\n", gf_th_id()));
+				gf_sema_notify(fsess->semaphore_main, 1);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u notify scheduler secondary semaphore %d\n", gf_th_id(), th_count));
+				gf_sema_notify(fsess->semaphore_other, th_count);
+			}
+
+			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) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
+				return 0;
+			}
+
+			if (do_regulate) {
+				gf_sleep(0);
+			}
+			continue;
+		}
+#ifdef CHECK_TASK_LIST_INTEGRITY
+		check_task_list(fsess->main_thread_tasks, task);
+		check_task_list(fsess->tasks, task);
+#endif
+		if (current_filter) {
+			assert(current_filter==task->filter);
+		}
+		current_filter = task->filter;
+
+		//this is a crude way of scheduling the next task, we should
+		//1- have a way to make sure we will not repost after a time-consuming task
+		//2- have a way to wait for the given amount of time rather than just do a sema_wait/notify in loop
+		if (task->schedule_next_time) {
+			s64 now = gf_sys_clock_high_res();
+			s64 diff = task->schedule_next_time;
+			diff -= now;
+			diff /= 1000;
+
+
+			if (diff > 0) {
+				GF_FSTask *next;
+				s64 tdiff = diff;
+				s64 ndiff = 0;
+
+				//no filter, just reschedule the task
+				if (!current_filter) {
+#ifndef GPAC_DISABLE_LOG
+					const char *task_log_name = task->log_name;
+#endif
+					next = gf_fq_head(fsess->tasks);
+					next_task_schedule_time = task->schedule_next_time;
+					assert(task->run_task);
+#ifdef CHECK_TASK_LIST_INTEGRITY
+					check_task_list(fsess->main_thread_tasks, task);
+					check_task_list(fsess->tasks, task);
+					check_task_list(fsess->tasks_reservoir, task);
+#endif
+					//tasks without filter are currently only posted to the secondary task list
+					gf_fq_add(fsess->tasks, task);
+					if (next) {
+						if (next->schedule_next_time <= (u64) now) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, next task time ready for execution\n", sys_thid, task_log_name));
+
+							skip_next_sema_wait = GF_TRUE;
+							continue;
+						}
+						ndiff = next->schedule_next_time;
+						ndiff -= now;
+						ndiff /= 1000;
+						if (ndiff<diff) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s scheduled after next task %s:%s (in %d ms vs %d ms)\n", sys_thid, task_log_name, next->log_name, next->filter ? next->filter->name : "", (s32) diff, (s32) ndiff));
+							diff = ndiff;
+						}
+					}
+
+					if (!do_regulate) {
+						diff = 0;
+					}
+
+					if (diff && do_regulate) {
+						if (diff > fsess->max_sleep)
+							diff = fsess->max_sleep;
+						if (th_count==0) {
+							if ( gf_fq_count(fsess->tasks) > MONOTH_MIN_TASKS)
+								diff = MONOTH_MIN_SLEEP;
+						}
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, %s task scheduled after this task, sleeping for %d ms (task diff %d - next diff %d)\n", sys_thid, task_log_name, next ? "next" : "no", diff, tdiff, ndiff));
+						gf_sleep((u32) diff);
+					} else {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s reposted, next task scheduled after this task, rerun\n", sys_thid, task_log_name));
+					}
+					skip_next_sema_wait = GF_TRUE;
+					continue;
+				}
+
+				if (!task->filter->finalized) {
+#ifdef CHECK_TASK_LIST_INTEGRITY
+					next = gf_fq_head(current_filter->tasks);
+					assert(next == task);
+					check_task_list(fsess->main_thread_tasks, task);
+					check_task_list(fsess->tasks_reservoir, task);
+#endif
+
+					//next in filter should be handled before this task, move task at the end of the filter task
+					next = gf_fq_get(current_filter->tasks, 1);
+					if (next && next->schedule_next_time < task->schedule_next_time) {
+						if (task->notified) {
+							assert(fsess->tasks_pending);
+							safe_int_dec(&fsess->tasks_pending);
+							task->notified = GF_FALSE;
+						}
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s reposted to filter task until task exec time is reached (%d us)\n", sys_thid, current_filter->name, task->log_name, (s32) (task->schedule_next_time - next->schedule_next_time) ));
+						//remove task
+						gf_fq_pop(current_filter->tasks);
+						//and queue it after the next one
+						gf_fq_add(current_filter->tasks, task);
+						//and continue with the same filter
+						continue;
+					}
+					//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) {
+							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
+							// (different from secondary tasks in multithread case)
+							if (th_count) {
+								GF_FSTask *next_main = gf_fq_head(fsess->main_thread_tasks);
+								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));
+								diff = 0;
+								force_secondary_tasks = GF_TRUE;
+							}
+						}
+					}
+
+					//move task to main list
+					if (!task->notified) {
+						task->notified = GF_TRUE;
+						safe_int_inc(&fsess->tasks_pending);
+					}
+
+					sess_thread->active_time += gf_sys_clock_high_res() - active_start;
+
+					if (next_task_schedule_time && (next_task_schedule_time <= task->schedule_next_time)) {
+						tdiff = next_task_schedule_time;
+						tdiff -= now;
+						if (tdiff < 0) tdiff=0;
+						if (tdiff<diff) {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: next task has earlier exec time than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
+							diff = tdiff;
+						} else {
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: next task has earlier exec time#2 than current task %s:%s, adjusting sleep (old %d - new %d)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, (s32) tdiff));
+
+						}
+					}
+
+					if (do_regulate && diff) {
+						if (diff > fsess->max_sleep)
+							diff = fsess->max_sleep;
+						if (th_count==0) {
+							if ( gf_fq_count(fsess->tasks) > MONOTH_MIN_TASKS)
+								diff = MONOTH_MIN_SLEEP;
+						}
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s postponed for %d ms (scheduled time "LLU" us, next task schedule "LLU" us)\n", sys_thid, current_filter->name, task->log_name, (s32) diff, task->schedule_next_time, next_task_schedule_time));
+
+						gf_sleep((u32) diff);
+						active_start = gf_sys_clock_high_res();
+					}
+					diff = (s64)task->schedule_next_time;
+					diff -= (s64) gf_sys_clock_high_res();
+					if (diff > 100 ) {
+						Bool use_main = (current_filter->freg->flags & GF_FS_REG_MAIN_THREAD) ? GF_TRUE : GF_FALSE;
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: releasing current filter %s, exec time due in "LLD" us\n", sys_thid, current_filter->name, diff));
+						current_filter->process_th_id = 0;
+						current_filter->in_process = GF_FALSE;
+						//don't touch the current filter tasks, just repost the task to the main/secondary list
+						assert(gf_fq_count(current_filter->tasks));
+						current_filter = NULL;
+
+#ifdef CHECK_TASK_LIST_INTEGRITY
+						check_task_list(fsess->main_thread_tasks, task);
+						check_task_list(fsess->tasks, task);
+						check_task_list(fsess->tasks_reservoir, task);
+						assert(task->run_task);
+#endif
+
+						if (use_main) {
+							gf_fq_add(fsess->main_thread_tasks, task);
+							//we are the main thread and reposting to the main task list, don't notify/wait for the sema, just retry
+							//we are sure to get a task from main list at next iteration
+							if (use_main_sema) {
+								skip_next_sema_wait = GF_TRUE;
+							} else {
+								gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+							}
+						} else {
+							gf_fq_add(fsess->tasks, task);
+							//we are not the main thread and we are reposting to the secondary task list, don't notify/wait for the sema, just retry
+							//we are not sure to get a task from secondary list at next iteration, but the end of thread check will make
+							//sure we renotify secondary sema if some tasks are still pending
+							if (!use_main_sema) {
+								skip_next_sema_wait = GF_TRUE;
+							} else {
+								gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
+							}
+						}
+						//we temporary force the main thread to fetch a task from the secondary list
+						//because the first main task was not yet due for execution
+						//it is likely that the execution of the next task will not wake up the main thread
+						//but we must reevaluate the previous main task timing, so we force a notification of the main sema
+						if (force_secondary_tasks)
+							gf_fs_sema_io(fsess, GF_TRUE, GF_TRUE);
+
+						continue;
+					}
+					force_secondary_tasks=GF_FALSE;
+				}
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u: task %s:%s schedule time "LLU" us reached (diff %d ms)\n", sys_thid, current_filter ? current_filter->name : "", task->log_name, task->schedule_next_time, (s32) diff));
+
+		}
+		next_task_schedule_time = 0;
+
+		if (current_filter) {
+			current_filter->scheduled_for_next_task = GF_TRUE;
+			assert(!current_filter->in_process);
+			current_filter->in_process = GF_TRUE;
+			current_filter->process_th_id = gf_th_id();
+		}
+
+		sess_thread->nb_tasks++;
+		sess_thread->has_seen_eot = GF_FALSE;
+		if (task->filter) {
+			assert(gf_fq_count(task->filter->tasks));
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u task#%d %p executing Filter %s::%s (%d tasks pending, %d(%d) process task queued)\n", sys_thid, sess_thread->nb_tasks, task, task->filter ? task->filter->name : "none", task->log_name, fsess->tasks_pending, task->filter ? task->filter->process_task_queued : 0, task->filter ? gf_fq_count(task->filter->tasks) : 0));
+
+		safe_int_inc(& fsess->tasks_in_process );
+		assert( task->run_task );
+		task_time = gf_sys_clock_high_res();
+
+		task->can_swap = GF_FALSE;
+		task->requeue_request = GF_FALSE;
+		task->run_task(task);
+		requeue = task->requeue_request;
+
+		task_time = gf_sys_clock_high_res() - task_time;
+		safe_int_dec(& fsess->tasks_in_process );
+
+		//may now be NULL if task was a filter destruction task
+		current_filter = task->filter;
+
+#ifdef CHECK_TASK_LIST_INTEGRITY
+		prev_current_filter = task->filter;
+#endif
+
+		//source task was current filter, pop the filter task list
+		if (current_filter) {
+			current_filter->nb_tasks_done++;
+			current_filter->time_process += task_time;
+			consecutive_filter_tasks++;
+
+			gf_mx_p(current_filter->tasks_mx);
+			//if last task
+			if ( (gf_fq_count(current_filter->tasks)==1)
+				//if requeue request and stream reset pending (we must exit the filter task loop for the reset task to pe processed)
+				|| (requeue && current_filter->stream_reset_pending)
+				//or requeue request and pid swap pending (we must exit the filter task loop for the swap task to pe processed)
+				|| (requeue && (current_filter->swap_pidinst_src ||  current_filter->swap_pidinst_dst) )
+				//or requeue request and pid detach / cap negotiate pending
+				|| (requeue && (current_filter->out_pid_connection_pending || current_filter->detached_pid_inst || current_filter->caps_negociate) )
+
+				//or requeue request and we have been running on that filter for more than 10 times, abort
+				|| (requeue && (consecutive_filter_tasks>10))
+			) {
+
+				if (requeue) {
+					//filter task can be pushed back the queue of tasks
+					if (task->can_swap) {
+						GF_FSTask *next_task;
+
+						//drop task from filter task list
+						gf_fq_pop(current_filter->tasks);
+
+						next_task = gf_fq_head(current_filter->tasks);
+						//if first task was notified, swap the flag
+						if (next_task) {
+							//see note in post_task_ex for caution about this !!
+							next_task->notified = task->notified;
+							task->notified = GF_FALSE;
+						}
+						//requeue task
+						gf_fq_add(current_filter->tasks, task);
+
+						//ans swap task for later requeing
+						if (next_task) task = next_task;
+					}
+					//otherwise (can't swap) keep task first in the list
+
+					//don't reset scheduled_for_next_task flag if requeued to make sure no other task posted from
+					//another thread will post to main sched
+
+#ifdef CHECK_TASK_LIST_INTEGRITY
+					skip_filter_task_check = GF_TRUE;
+#endif
+				} else {
+					//no requeue, filter no longer scheduled and drop task
+					current_filter->scheduled_for_next_task = GF_FALSE;
+
+					//drop task from filter task list
+					gf_fq_pop(current_filter->tasks);
+				}
+
+				current_filter->process_th_id = 0;
+				current_filter->in_process = GF_FALSE;
+
+				//unlock once we modified in_process, otherwise this will make our assert fail
+				gf_mx_v(current_filter->tasks_mx);
+#ifdef CHECK_TASK_LIST_INTEGRITY
+				if (requeue && !skip_filter_task_check) check_task_list(current_filter->tasks, task);
+#endif
+				current_filter = NULL;
+			} else {
+				//drop task from filter task list
+				gf_fq_pop(current_filter->tasks);
+
+				//not requeued, no more tasks, deactivate filter
+				if (!requeue && !gf_fq_count(current_filter->tasks)) {
+					current_filter->process_th_id = 0;
+					current_filter->in_process = GF_FALSE;
+					current_filter->scheduled_for_next_task = GF_FALSE;
+					gf_mx_v(current_filter->tasks_mx);
+					current_filter = NULL;
+				} else {
+#ifdef CHECK_TASK_LIST_INTEGRITY
+					check_task_list(fsess->main_thread_tasks, task);
+					check_task_list(fsess->tasks, task);
+					check_task_list(fsess->tasks_reservoir, task);
+#endif
+
+					//requeue task in current filter
+					if (requeue)
+						gf_fq_add(current_filter->tasks, task);
+
+					gf_mx_v(current_filter->tasks_mx);
+				}
+			}
+		}
+		//do not touch the filter task list after this, it has to be mutex protected to ensure proper posting of tasks
+
+		notified = task->notified;
+		if (requeue) {
+			//if requeue on a filter active, use filter queue to avoid another thread grabing the task (we would have concurrent access to the filter)
+			if (current_filter) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u re-posted task Filter %s::%s in filter tasks (%d pending)\n", sys_thid, task->filter->name, task->log_name, fsess->tasks_pending));
+				task->notified = GF_FALSE;
+				//keep this thread running on the current filter no signaling of semaphore
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u re-posted task Filter %s::%s in %s tasks (%d pending)\n", sys_thid, task->filter ? task->filter->name : "none", task->log_name, (task->filter && (task->filter->freg->flags & GF_FS_REG_MAIN_THREAD)) ? "main" : "secondary", fsess->tasks_pending));
+
+				task->notified = GF_TRUE;
+				safe_int_inc(&fsess->tasks_pending);
+
+#ifdef CHECK_TASK_LIST_INTEGRITY
+				check_task_list(fsess->main_thread_tasks, task);
+				check_task_list(fsess->tasks, task);
+				check_task_list(fsess->tasks_reservoir, task);
+				if (prev_current_filter && !skip_filter_task_check) check_task_list(prev_current_filter->tasks, task);
+#endif
+
+				//main thread
+				if (task->filter && (task->filter->freg->flags & GF_FS_REG_MAIN_THREAD)) {
+					gf_fq_add(fsess->main_thread_tasks, task);
+				} else {
+					gf_fq_add(fsess->tasks, task);
+				}
+				gf_fs_sema_io(fsess, GF_TRUE, use_main_sema);
+			}
+		} else {
+#ifdef CHECK_TASK_LIST_INTEGRITY
+			check_task_list(fsess->main_thread_tasks, task);
+			check_task_list(fsess->tasks, task);
+			check_task_list(fsess->tasks_reservoir, task);
+			if (prev_current_filter)
+				check_task_list(prev_current_filter->tasks, task);
+
+			{
+				gf_mx_p(fsess->filters_mx);
+				u32 k, c2 = gf_list_count(fsess->filters);
+				for (k=0; k<c2; k++) {
+					GF_Filter *af = gf_list_get(fsess->filters, k);
+					check_task_list(af->tasks, task);
+				}
+				gf_mx_v(fsess->filters_mx);
+			}
+#endif
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Thread %u task#%d %p pushed to reservoir\n", sys_thid, sess_thread->nb_tasks, task));
+
+			if (fsess->tasks_reservoir) {
+				memset(task, 0, sizeof(GF_FSTask));
+				gf_fq_add(fsess->tasks_reservoir, task);
+			} else {
+				gf_free(task);
+			}
+		}
+
+		//decrement task counter
+		if (notified) {
+			assert(fsess->tasks_pending);
+			safe_int_dec(&fsess->tasks_pending);
+		}
+		if (current_filter) {
+			current_filter->process_th_id = 0;
+			current_filter->in_process = GF_FALSE;
+		}
+		//not requeuing and first time we have an empty task queue, flush to detect if we are indeed done
+		if (!current_filter && !fsess->tasks_pending && !sess_thread->has_seen_eot && !gf_fq_count(fsess->tasks)) {
+			//if not the main thread, or if main thread and task list is empty, enter end of session probing mode
+			if (thid || !gf_fq_count(fsess->main_thread_tasks) ) {
+				//maybe last task, force a notify to check if we are truly done. We only tag "session done" for the non-main
+				//threads, in order to enter the end-of session signaling above
+				if (thid) sess_thread->has_seen_eot = GF_TRUE;
+				gf_fs_sema_io(fsess, GF_TRUE, use_main_sema);
+			}
+		}
+
+		sess_thread->active_time += gf_sys_clock_high_res() - active_start;
+
+
+		//no main thread, return
+		if (!thid && fsess->no_main_thread && !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;
+		}
+	}
+
+	gf_rmt_end();
+
+	//no main thread, return
+	if (!thid && fsess->no_main_thread) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCHEDULER, ("Main thread proc exit\n"));
+		return 0;
+	}
+	sess_thread->run_time = gf_sys_clock_high_res() - enter_time;
+
+	safe_int_inc(&fsess->nb_threads_stopped);
+
+	if (!fsess->run_status)
+		fsess->run_status = GF_EOS;
+
+	// thread exit, notify the semaphores
+	if (fsess->semaphore_main && ! gf_sema_notify(fsess->semaphore_main, 1)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("Failed to notify main semaphore, might hang up !!\n"));
+	}
+	if (fsess->semaphore_other && ! gf_sema_notify(fsess->semaphore_other, th_count)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCHEDULER, ("Failed to notify secondary semaphore, might hang up !!\n"));
+	}
+
+	return 0;
+}
+
+
+GF_EXPORT
+GF_Err gf_fs_run(GF_FilterSession *fsess)
+{
+	u32 i, nb_threads;
+	assert(fsess);
+
+	fsess->run_status = GF_OK;
+	fsess->main_th.has_seen_eot = GF_FALSE;
+	fsess->nb_threads_stopped = 0;
+
+	nb_threads = gf_list_count(fsess->threads);
+	for (i=0;i<nb_threads; i++) {
+		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;
+
+	gf_fs_thread_proc(&fsess->main_th);
+
+	//wait for all threads to be done
+	while (nb_threads+1 != fsess->nb_threads_stopped) {
+		gf_sleep(1);
+	}
+
+	return fsess->run_status;
+}
+
+void gf_fs_run_step(GF_FilterSession *fsess)
+{
+	gf_fs_thread_proc(&fsess->main_th);
+}
+
+GF_EXPORT
+GF_Err gf_fs_abort(GF_FilterSession *fsess, Bool do_flush)
+{
+	u32 i, count;
+	GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("Session abort from user, stoping sources\n"));
+	if (!fsess) return GF_BAD_PARAM;
+
+	if (!do_flush) {
+		fsess->in_final_flush = GF_TRUE;
+		fsess->run_status = GF_EOS;
+		return GF_OK;
+	}
+
+	gf_mx_p(fsess->filters_mx);
+	count = gf_list_count(fsess->filters);
+	//disable all sources
+	for (i=0; i<count; i++) {
+		GF_Filter *filter = gf_list_get(fsess->filters, i);
+		//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)
+		if (!filter->num_input_pids) {
+			u32 j, k, l;
+			filter->disabled = GF_TRUE;
+			for (j=0; j<filter->num_output_pids; j++) {
+				GF_FilterPid *pid = gf_list_get(filter->output_pids, j);
+				gf_filter_pid_set_eos(pid);
+				for (k=0; k<pid->num_destinations; k++) {
+					GF_FilterPidInst *pidi = gf_list_get(pid->destinations, k);
+					pidi->filter->disabled = GF_TRUE;
+					for (l=0; l<pidi->filter->num_output_pids; l++) {
+						GF_FilterPid *opid = gf_list_get(pidi->filter->output_pids, l);
+						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);
+						}
+						gf_filter_pid_set_eos(opid);
+					}
+				}
+			}
+		}
+	}
+	fsess->in_final_flush = GF_TRUE;
+
+	gf_mx_v(fsess->filters_mx);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_fs_stop(GF_FilterSession *fsess)
+{
+	u32 i, count = fsess->threads ? gf_list_count(fsess->threads) : 0;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_FILTER, ("Session stop\n"));
+	if (count+1 == fsess->nb_threads_stopped) {
+		return GF_OK;
+	}
+
+	if (!fsess->run_status)
+		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) {
+		gf_fs_thread_proc(&fsess->main_th);
+		if (gf_fq_count(fsess->main_thread_tasks))
+			continue;
+
+		if (count && (count == fsess->nb_threads_stopped) && gf_fq_count(fsess->tasks) ) {
+			continue;
+		}
+		break;
+	}
+	if (fsess->no_main_thread) {
+		safe_int_inc(&fsess->nb_threads_stopped);
+		fsess->main_th.has_seen_eot = GF_TRUE;
+	}
+
+	while (count+1 != fsess->nb_threads_stopped) {
+		for (i=0; i < count; i++) {
+			gf_fs_sema_io(fsess, GF_TRUE, GF_FALSE);
+		}
+		gf_sleep(0);
+		//we may have tasks in main task list posted by other threads
+		if (fsess->no_main_thread) {
+			gf_fs_thread_proc(&fsess->main_th);
+			fsess->main_th.has_seen_eot = GF_TRUE;
+		}
+	}
+	return GF_OK;
+}
+
+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)) {
+		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;
+
+	if (!f->src_args && !f->orig_args && !f->dst_args && !f->dynamic_source_ids) return;
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ("));
+	if (f->src_args) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s", f->src_args));
+	}
+	else if (f->orig_args) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s", f->orig_args));
+	}
+	else if (f->dst_args) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s", f->dst_args));
+	}
+
+	if (f->dynamic_source_ids) GF_LOG(GF_LOG_INFO, GF_LOG_APP, (",resolved SID:%s", f->source_ids));
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")"));
+}
+
+GF_EXPORT
+void gf_fs_print_stats(GF_FilterSession *fsess)
+{
+	u64 run_time=0, active_time=0, nb_tasks=0, nb_filters=0;
+	u32 i, count;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
+	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+
+	count=gf_list_count(fsess->filters);
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		if (f->multi_sink_target) continue;
+		nb_filters++;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Filter stats - %d filters\n", nb_filters));
+	for (i=0; i<count; i++) {
+		u32 k, ipids, opids;
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		if (f->multi_sink_target) continue;
+
+		ipids = f->num_input_pids;
+		opids = f->num_output_pids;
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\tFilter "));
+		print_filter_name(f, GF_FALSE, GF_FALSE);
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" : %d input pids %d output pids "LLU" tasks "LLU" us process time\n", ipids, opids, f->nb_tasks_done, f->time_process));
+
+		if (ipids) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t"LLU" packets processed "LLU" bytes processed", f->nb_pck_processed, f->nb_bytes_processed));
+			if (f->time_process) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (%g pck/sec %g mbps)", (Double) f->nb_pck_processed*1000000/f->time_process, (Double) f->nb_bytes_processed*8/f->time_process));
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
+		}
+		if (opids) {
+			if (f->nb_hw_pck_sent) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t"LLU" hardware frames sent", f->nb_hw_pck_sent));
+				if (f->time_process) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (%g pck/sec)", (Double) f->nb_hw_pck_sent*1000000/f->time_process));
+				}
+
+			} else if (f->nb_pck_sent) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t"LLU" packets sent "LLU" bytes sent", f->nb_pck_sent, f->nb_bytes_sent));
+				if (f->time_process) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (%g pck/sec %g mbps)", (Double) f->nb_pck_sent*1000000/f->time_process, (Double) f->nb_bytes_sent*8/f->time_process));
+				}
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
+		}
+
+		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));
+		}
+#ifndef GPAC_DISABLE_LOG
+		for (k=0; k<opids; k++) {
+			GF_FilterPid *pid = gf_list_get(f->output_pids, k);
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t* output PID %s: %d packets sent\n", pid->name, pid->nb_pck_sent));
+		}
+		if (f->nb_errors) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\t\t%d errors while processing\n", f->nb_errors));
+		}
+#endif
+
+	}
+	if (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));
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\tThread %u: run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", 1, fsess->main_th.run_time, fsess->main_th.active_time, fsess->main_th.nb_tasks));
+
+	run_time+=fsess->main_th.run_time;
+	active_time+=fsess->main_th.active_time;
+	nb_tasks+=fsess->main_th.nb_tasks;
+
+	for (i=0; i<count; i++) {
+		GF_SessionThread *s = gf_list_get(fsess->threads, i);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\tThread %u: run_time "LLU" us active_time "LLU" us nb_tasks "LLU"\n", i+2, s->run_time, s->active_time, s->nb_tasks));
+
+		run_time+=s->run_time;
+		active_time+=s->active_time;
+		nb_tasks+=s->nb_tasks;
+	}
+	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)
+{
+	u32 i=0;
+
+	while (i<indent) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("-"));
+		i++;
+	}
+
+	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));
+	}
+	if (gf_list_find(filters_done, f)>=0)
+		return;
+
+	gf_list_add(filters_done, f);
+	if (alias_for) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" (<=> "));
+		print_filter_name(alias_for, GF_TRUE, GF_TRUE);
+		if (alias_for->id) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ID=%s", alias_for->id));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" ptr=%p", alias_for));
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, (")\n"));
+	}
+
+	for (i=0; i<f->num_output_pids; i++) {
+		u32 j, k;
+		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);
+			GF_Filter *alias = NULL;
+			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)
+					break;
+				alias = NULL;
+			}
+			if (alias) {
+
+				gf_fs_print_filter_outputs(alias, filters_done, indent+1, pidout, pidi->filter);
+			} else {
+				gf_fs_print_filter_outputs(pidi->filter, filters_done, indent+1, pidout, NULL);
+			}
+		}
+	}
+
+}
+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);
+
+	filters_done = gf_list_new();
+
+	count=gf_list_count(fsess->filters);
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		//only dump sources
+		if (f->num_input_pids) continue;
+		if (!f->num_output_pids) continue;
+		if (!has_connected) {
+			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);
+	}
+	for (i=0; i<count; i++) {
+		GF_Filter *f = gf_list_get(fsess->filters, i);
+		if (f->multi_sink_target) continue;
+		if (gf_list_find(filters_done, f)>=0) continue;
+		if (!has_undefined) {
+			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);
+	}
+
+	if (fsess->filters_mx) gf_mx_v(fsess->filters_mx);
+	gf_list_del(filters_done);
+}
+
+
+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;
+	Bool removed = GF_FALSE;
+	if ((!fid && !filter) || !name) return;
+
+	if (fsess->filters_mx) gf_mx_p(fsess->filters_mx);
+
+	if (!filter) {
+		GF_Filter *reg_filter = NULL;
+		count = gf_list_count(fsess->filters);
+		for (i=0; i<count; i++) {
+			filter = gf_list_get(fsess->filters, i);
+			if (filter->id && !strcmp(filter->id, fid)) {
+				break;
+			}
+			if (filter->name && !strcmp(filter->name, fid)) {
+				break;
+			}
+			if (!reg_filter && !strcmp(filter->freg->name, fid))
+				reg_filter = filter;
+			filter = NULL;
+		}
+		if (!filter)
+			filter = reg_filter;
+	}
+
+	if (filter && filter->multi_sink_target)
+		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);
+
+	if (removed) return;
+
+	GF_SAFEALLOC(upd, GF_FilterUpdate);
+	if (!val) {
+		char *sep = strchr(name, fsess->sep_name);
+		if (sep) sep[0] = 0;
+		upd->name = gf_strdup(name);
+		upd->val = sep ? gf_strdup(sep+1) : NULL;
+		if (sep) sep[0] = fsess->sep_name;
+	} else {
+		upd->name = gf_strdup(name);
+		upd->val = gf_strdup(val);
+	}
+	upd->recursive = propagate_mask;
+	gf_fs_post_task(fsess, gf_filter_update_arg_task, filter, NULL, "update_arg", upd);
+}
+
+static GF_FilterProbeScore probe_meta_check_builtin_format(GF_FilterSession *fsess, GF_FilterRegister *freg, const char *url, const char *mime, char *fargs)
+{
+	char szExt[100];
+	const char *ext = gf_file_ext_start(url);
+	u32 len=0, i, j, count = gf_list_count(fsess->registry);
+	if (ext) {
+		ext++;
+		len = (u32) strlen(ext);
+	}
+	//check in filter args if we have a format set, in which case replace URL ext by the given format
+	if (fargs) {
+		char szExtN[10];
+		char *ext_arg;
+		sprintf(szExtN, "ext%c", fsess->sep_name);
+		ext_arg = strstr(fargs, szExtN);
+		if (ext_arg) {
+			char *next_arg;
+			ext_arg+=4;
+			next_arg = strchr(ext_arg, fsess->sep_args);
+			if (next_arg) {
+				len = (u32) (next_arg - ext_arg);
+			} else {
+				len = (u32) strlen(ext_arg);
+			}
+			if (len>99) len=99;
+			strncpy(szExt, ext_arg, len);
+			szExt[len] = 0;
+			ext = szExt;
+		}
+	}
+
+	if (mime) {
+		if (strstr(mime, "/mp4")) return GF_FPROBE_MAYBE_SUPPORTED;
+	}
+
+	for (i=0; i<count; i++) {
+		const GF_FilterArgs *dst_arg=NULL;
+		GF_FilterRegister *reg = gf_list_get(fsess->registry, i);
+		if (reg==freg) continue;
+		if (reg->flags & GF_FS_REG_META) continue;
+
+		j=0;
+		while (reg->args) {
+			dst_arg = &reg->args[j];
+			if (!dst_arg || !dst_arg->arg_name) {
+				dst_arg=NULL;
+				break;
+			}
+			if (!strcmp(dst_arg->arg_name, "dst")) break;
+			dst_arg = NULL;
+			j++;
+		}
+		/*check prober*/
+		if (dst_arg) {
+			if (reg->probe_url) {
+				GF_FilterProbeScore s = reg->probe_url(url, mime);
+				if (s==GF_FPROBE_SUPPORTED)
+					return GF_FPROBE_MAYBE_SUPPORTED;
+			}
+			continue;
+		}
+
+		/* check muxers*/
+		for (j=0; j<reg->nb_caps; j++) {
+			char *value=NULL;
+			const char *pattern = NULL;
+			const GF_FilterCapability *cap = &reg->caps[j];
+			if (! (cap->flags & GF_CAPFLAG_OUTPUT) )
+				continue;
+			if (cap->flags & GF_CAPFLAG_EXCLUDED)
+				continue;
+
+			if (cap->code==GF_PROP_PID_FILE_EXT) {
+				if (ext) {
+					value = cap->val.value.string;
+					pattern = ext;
+				}
+			} else if (cap->code==GF_PROP_PID_MIME) {
+				if (mime) {
+					value = cap->val.value.string;
+					pattern = mime;
+				}
+			}
+			while (value) {
+				char *match = strstr(value, pattern);
+				if (!match) break;
+				if (!match[len] || match[len]=='|')
+					return GF_FPROBE_MAYBE_SUPPORTED;
+				value = match+1;
+			}
+		}
+	}
+	return GF_FPROBE_SUPPORTED;
+}
+
+
+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)
+{
+	GF_FilterProbeScore score = GF_FPROBE_NOT_SUPPORTED;
+	GF_FilterRegister *candidate_freg=NULL;
+	GF_Filter *alias_for_filter = NULL;
+	const GF_FilterArgs *src_dst_arg=NULL;
+	u32 i, count, user_args_len, arg_type;
+	char szForceReg[20];
+	char szMime[50];
+	GF_Err e;
+	const char *force_freg = NULL;
+	char *sURL, *mime_type, *args, *sep;
+	char szExt[50];
+	Bool free_url=GF_FALSE;
+	memset(szExt, 0, sizeof(szExt));
+
+	if (err) *err = GF_OK;
+
+	mime_type = NULL;
+	//destination, extract mime from arguments
+	if (!for_source) {
+		sprintf(szMime, "%cmime=", fsess->sep_args);
+		mime_type = strstr(url, szMime);
+		if (!mime_type && user_args)
+			mime_type = strstr(user_args, szMime);
+
+		if (mime_type) {
+			strncpy(szMime, mime_type+6, 49);
+			szMime[49]=0;
+			sep = strchr(szMime, fsess->sep_args);
+			if (sep) sep[0] = 0;
+			mime_type = szMime;
+		}
+	}
+	sURL = NULL;
+	if (!url || !strncmp(url, "\\\\", 2) ) {
+		return NULL;
+	}
+	if (filter) {
+		sURL = (char *) url;
+	} else {
+		/*used by GUIs scripts to skip URL concatenation*/
+		if (!strncmp(url, "gpac://", 7)) sURL = gf_strdup(url+7);
+		/*opera-style localhost URLs*/
+		else if (!strncmp(url, "file://localhost", 16)) sURL = gf_strdup(url+16);
+		else if (parent_url) sURL = gf_url_concatenate(parent_url, url);
+
+		/*path absolute*/
+		if (!sURL) sURL = gf_strdup(url);
+		free_url=GF_TRUE;
+
+		if (!strncmp(sURL, "gpac://", 7)) {
+			u32 ulen = (u32) strlen(sURL+7);
+			memmove(sURL, sURL+7, ulen);
+			sURL[ulen]=0;
+		}
+
+		if (for_source && gf_url_is_local(sURL)) {
+			char *frag_par, *cgi, *ext_start;
+			char f_c=0;
+			gf_url_to_fs_path(sURL);
+			sep = (char *)gf_fs_path_escape_colon(fsess, sURL);
+			if (sep) sep[0] = 0;
+
+			ext_start = gf_file_ext_start(sURL);
+			if (!ext_start) ext_start = sURL;
+			frag_par = strchr(ext_start, '#');
+			cgi = strchr(ext_start, '?');
+			if (frag_par && cgi && (cgi<frag_par))
+				frag_par = cgi;
+
+			if (frag_par) {
+				f_c = frag_par[0];
+				frag_par[0] = 0;
+			}
+
+			if (strcmp(sURL, "null") && strcmp(sURL, "-") && strcmp(sURL, "stdin") && ! gf_file_exists(sURL)) {
+				if (sep) sep[0] = fsess->sep_args;
+				if (frag_par) frag_par[0] = f_c;
+
+				if (err) *err = GF_URL_ERROR;
+				gf_free(sURL);
+				return NULL;
+			}
+			if (frag_par) frag_par[0] = f_c;
+			if (sep) sep[0] = fsess->sep_args;
+		}
+	}
+	sep = (char *)gf_fs_path_escape_colon(fsess, sURL);
+
+	sprintf(szForceReg, "gfreg%c", fsess->sep_name);
+	force_freg = NULL;
+	if (sep) {
+		sep[0] = 0;
+		force_freg = strstr(sep+1, szForceReg);
+	}
+	if (!force_freg && user_args) {
+		force_freg = strstr(user_args, szForceReg);
+	}
+	if (force_freg)
+		force_freg += 6;
+
+restart:
+	//check all our registered filters
+	count = gf_list_count(fsess->registry);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_FilterProbeScore s;
+		GF_FilterRegister *freg = gf_list_get(fsess->registry, i);
+		if (! freg->probe_url) continue;
+		if (force_freg && strncmp(force_freg, freg->name, strlen(freg->name))) continue;
+		if (! freg->args) continue;
+		if (filter && (gf_list_find(filter->blacklisted, freg) >=0)) continue;
+
+		j=0;
+		while (freg->args) {
+			src_dst_arg = &freg->args[j];
+			if (!src_dst_arg || !src_dst_arg->arg_name) {
+				src_dst_arg=NULL;
+				break;
+			}
+			if (for_source && !strcmp(src_dst_arg->arg_name, "src")) break;
+			else if (!for_source && !strcmp(src_dst_arg->arg_name, "dst")) break;
+			src_dst_arg = NULL;
+			j++;
+		}
+		if (!src_dst_arg)
+			continue;
+
+		s = freg->probe_url(sURL, mime_type);
+		/* destination meta filter: change GF_FPROBE_SUPPORTED to GF_FPROBE_MAYBE_SUPPORTED for internal mux formats
+		in order to avoid always giving the hand to the meta filter*/
+		if (!for_source && (s == GF_FPROBE_SUPPORTED) && (freg->flags & GF_FS_REG_META)) {
+			s = probe_meta_check_builtin_format(fsess, freg, sURL, mime_type, sep ? sep+1 : NULL);
+		}
+		//higher score, use this new registry
+		if (s > score) {
+			candidate_freg = freg;
+			score = s;
+		}
+		//same score and higher priority (0 being highest), use this new registry
+		else if ((s == score) && candidate_freg && (freg->priority<candidate_freg->priority) ) {
+			candidate_freg = freg;
+			score = s;
+		}
+	}
+	if (probe_only) {
+		*probe_only = candidate_freg ? GF_TRUE : GF_FALSE;
+		if (free_url)
+			gf_free(sURL);
+		if (err) *err = GF_OK;
+		return NULL;
+	}
+
+	if (!candidate_freg) {
+		if (force_freg) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_FILTER, ("No source filter named %s found, retrying without forcing registry\n", force_freg));
+			force_freg = NULL;
+			goto restart;
+		}
+		if (free_url)
+			gf_free(sURL);
+		if (err) *err = GF_NOT_SUPPORTED;
+		if (filter) filter->finalized = GF_TRUE;
+		return NULL;
+	}
+	if (sep) sep[0] = fsess->sep_args;
+
+	user_args_len = user_args ? (u32) strlen(user_args) : 0;
+	args = gf_malloc(sizeof(char)*(5+strlen(sURL) + (user_args_len ? user_args_len + 8/*for potential :gpac: */  :0) ) );
+
+	sprintf(args, "%s%c", for_source ? "src" : "dst", fsess->sep_name);
+	strcat(args, sURL);
+	if (user_args_len) {
+		if (fsess->sep_args==':') strcat(args, ":gpac:");
+		else {
+			char szSep[2];
+			szSep[0] = fsess->sep_args;
+			szSep[1] = 0;
+			strcat(args, szSep);
+		}
+		strcat(args, user_args);
+	}
+
+	e = GF_OK;
+	arg_type = GF_FILTER_ARG_EXPLICIT_SINK;
+	if (for_source) {
+		if (no_args_inherit) arg_type = GF_FILTER_ARG_EXPLICIT_SOURCE_NO_DST_INHERIT;
+		else arg_type = GF_FILTER_ARG_EXPLICIT_SOURCE;
+	}
+
+	if (!for_source && 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);
+			if (f->freg != candidate_freg) continue;
+			if (f->freg->use_alias(f, sURL, mime_type)) {
+				alias_for_filter = f;
+				break;
+			}
+		}
+	}
+
+	if (!filter) {
+		filter = gf_filter_new(fsess, candidate_freg, args, NULL, arg_type, err, alias_for_filter, GF_FALSE);
+	} else {
+		filter->freg = candidate_freg;
+		e = gf_filter_new_finalize(filter, args, arg_type);
+		if (err) *err = e;
+	}
+
+	if (free_url)
+		gf_free(sURL);
+
+	if (filter) {
+		if (filter->src_args) gf_free(filter->src_args);
+		filter->src_args = args;
+		//for link resolution
+		if (dst_filter && for_source)	{
+			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;
+		}
+	} else {
+		gf_free(args);
+	}
+
+	if (!e && filter && !filter->num_output_pids && for_source)
+		gf_filter_post_process_task(filter);
+
+	return filter;
+}
+
+GF_EXPORT
+GF_Filter *gf_fs_load_source(GF_FilterSession *fsess, const char *url, const char *args, const char *parent_url, GF_Err *err)
+{
+	return gf_fs_load_source_dest_internal(fsess, url, args, parent_url, err, NULL, NULL, GF_TRUE, GF_FALSE, NULL);
+}
+
+GF_EXPORT
+GF_Filter *gf_fs_load_destination(GF_FilterSession *fsess, const char *url, const char *args, const char *parent_url, GF_Err *err)
+{
+	return gf_fs_load_source_dest_internal(fsess, url, args, parent_url, err, NULL, NULL, GF_FALSE, GF_FALSE, NULL);
+}
+
+
+GF_EXPORT
+GF_Err gf_filter_add_event_listener(GF_Filter *filter, GF_FSEventListener *el)
+{
+	GF_Err e;
+	if (!filter || !filter->session || !el || !el->on_event) return GF_BAD_PARAM;
+	while (filter->session->in_event_listener) gf_sleep(1);
+	gf_mx_p(filter->session->evt_mx);
+	if (!filter->session->event_listeners) {
+		filter->session->event_listeners = gf_list_new();
+	}
+	e = gf_list_add(filter->session->event_listeners, el);
+	gf_mx_v(filter->session->evt_mx);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_filter_remove_event_listener(GF_Filter *filter, GF_FSEventListener *el)
+{
+	if (!filter || !filter->session || !el || !filter->session->event_listeners) return GF_BAD_PARAM;
+
+	while (filter->session->in_event_listener) gf_sleep(1);
+	gf_mx_p(filter->session->evt_mx);
+	gf_list_del_item(filter->session->event_listeners, el);
+	if (!gf_list_count(filter->session->event_listeners)) {
+		gf_list_del(filter->session->event_listeners);
+		filter->session->event_listeners=NULL;
+	}
+	gf_mx_v(filter->session->evt_mx);
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_filter_forward_gf_event(GF_Filter *filter, GF_Event *evt, Bool consumed, Bool skip_user)
+{
+	if (!filter || !filter->session || filter->session->in_final_flush) return GF_FALSE;
+
+	if (filter->session->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))) {
+			if (el->on_event(el->udta, evt, consumed)) {
+				filter->session->in_event_listener --;
+				return GF_TRUE;
+			}
+		}
+		filter->session->in_event_listener --;
+	}
+
+	if (!skip_user && !consumed && filter->session->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--;
+		return res;
+	}
+	return GF_FALSE;
+}
+
+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, ...) )
+{
+	GF_CapsBundleStore capstore;
+	GF_Filter *js_filter;
+	const char *js_name = NULL;
+	GF_Err e=GF_OK;
+	u32 i, j, count, nb_js_caps;
+	GF_List *sources, *sinks;
+	GF_FilterRegister loaded_freg;
+	Bool has_output, has_input;
+
+	js_filter = gf_fs_load_filter(session, filter_name, &e);
+	if (!js_filter) return;
+
+	js_name = strrchr(filter_name, '/');
+	if (!js_name) js_name = strrchr(filter_name, '\\');
+	if (js_name) js_name++;
+	else js_name = filter_name;
+
+	nb_js_caps = gf_filter_caps_bundle_count(js_filter->forced_caps, js_filter->nb_forced_caps);
+
+	//fake a new register with only the caps set
+	memset(&loaded_freg, 0, sizeof(GF_FilterRegister));
+	loaded_freg.caps = js_filter->forced_caps;
+	loaded_freg.nb_caps = js_filter->nb_forced_caps;
+
+	has_output = gf_filter_has_out_caps(js_filter->forced_caps, js_filter->nb_forced_caps);
+	has_input = gf_filter_has_in_caps(js_filter->forced_caps, js_filter->nb_forced_caps);
+
+	memset(&capstore, 0, sizeof(GF_CapsBundleStore));
+	sources = gf_list_new();
+	sinks = gf_list_new();
+	//edges for JS are for the unloaded JSF (eg accept anything, output anything).
+	//we need to do a manual check
+	count = gf_list_count(session->links);
+	for (i=0; i<count; i++) {
+		u32 nb_src_caps, k, l;
+		Bool src_match = GF_FALSE;
+		Bool sink_match = GF_FALSE;
+		GF_FilterRegDesc *a_reg = gf_list_get(session->links, i);
+		if (a_reg->freg == js_filter->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_js_caps; l++) {
+				s32 bundle_idx;
+				u32 loaded_filter_only_flags = 0;
+				u32 path_weight;
+				if (has_input && !src_match) {
+					path_weight = gf_filter_caps_to_caps_match(a_reg->freg, k, (const GF_FilterRegister *) &loaded_freg, NULL, &bundle_idx, l, &loaded_filter_only_flags, &capstore);
+					if (path_weight && (bundle_idx == l))
+						src_match = GF_TRUE;
+				}
+				if (has_output && !sink_match) {
+					loaded_filter_only_flags = 0;
+					path_weight = gf_filter_caps_to_caps_match(&loaded_freg, l, a_reg->freg, NULL, &bundle_idx, k, &loaded_filter_only_flags, &capstore);
+
+					if (path_weight && (bundle_idx == k))
+						sink_match = GF_TRUE;
+				}
+			}
+			if (src_match && sink_match)
+				break;
+		}
+		if (src_match) gf_list_add(sources, (void *) a_reg->freg);
+		if (sink_match) gf_list_add(sinks, (void *) a_reg->freg);
+	}
+
+	for (i=0; i<2; i++) {
+		GF_List *from = i ? sinks : sources;
+		char *type = i ? "sources" : "sinks";
+
+		count = gf_list_count(from);
+		if (!count) {
+			if (print_fn)
+				print_fn(stderr, 1, "%s: no %s\n", js_name, type);
+			else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: no %s\n", type));
+			}
+			continue;
+		}
+
+		if (print_fn)
+			print_fn(stderr, 1, "%s %s:", js_name, type);
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s %s:", js_name, type));
+		}
+		for (j=0; j<count; j++) {
+			GF_FilterRegister *a_reg = gf_list_get(from, j);
+			if (print_fn)
+				print_fn(stderr, 0, " %s", a_reg->name);
+			else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" %s", a_reg->name));
+			}
+		}
+		if (print_fn)
+			print_fn(stderr, 0, "\n");
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
+		}
+	}
+
+	if (capstore.bundles_cap_found) gf_free(capstore.bundles_cap_found);
+	if (capstore.bundles_in_ok) gf_free(capstore.bundles_in_ok);
+	if (capstore.bundles_in_scores) gf_free(capstore.bundles_in_scores);
+	gf_list_del(sources);
+	gf_list_del(sinks);
+}
+
+GF_EXPORT
+void gf_fs_print_all_connections(GF_FilterSession *session, char *filter_name, void (*print_fn)(FILE *output, GF_SysPrintArgFlags flags, const char *fmt, ...) )
+{
+	Bool found = GF_FALSE;
+	GF_List *done;
+	u32 i, j, 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_log_set_tool_level(GF_LOG_FILTER, llev);
+		return;
+	}
+	done = gf_list_new();
+	count = gf_list_count(session->links);
+
+	for (i=0; i<count; i++) {
+		const GF_FilterRegDesc *src = gf_list_get(session->links, i);
+		if (filter_name && strcmp(src->freg->name, filter_name))
+			continue;
+
+		if (!src->nb_edges) {
+			if (print_fn)
+				print_fn(stderr, 1, "%s: no sources\n", src->freg->name);
+			else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s: no sources\n", src->freg->name));
+			}
+			continue;
+		}
+		found = GF_TRUE;
+		if (print_fn)
+			print_fn(stderr, 1, "%s sources:", src->freg->name);
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s sources:", src->freg->name));
+		}
+
+		for (j=0; j<src->nb_edges; j++) {
+			if (gf_list_find(done, (void *) src->edges[j].src_reg->freg->name)<0) {
+				if (print_fn)
+					print_fn(stderr, 0, " %s", src->edges[j].src_reg->freg->name);
+				else {
+					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 (print_fn)
+			print_fn(stderr, 0, "\n");
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
+		}
+		gf_list_reset(done);
+	}
+
+	if (found && filter_name) {
+		if (print_fn)
+			print_fn(stderr, 1, "%s sinks:", filter_name);
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("%s sinks:", filter_name));
+		}
+		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;
+
+			for (j=0; j<src->nb_edges; j++) {
+				if (strcmp(src->edges[j].src_reg->freg->name, filter_name)) continue;
+
+				if (gf_list_find(done, (void *) src->freg->name)<0) {
+					if (print_fn)
+						print_fn(stderr, 0, " %s", src->freg->name);
+					else {
+						GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" %s", src->freg->name));
+					}
+					gf_list_add(done, (void *) src->freg->name);
+				}
+			}
+			gf_list_reset(done);
+		}
+		if (print_fn)
+			print_fn(stderr, 1, " \n");
+		else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_APP, (" \n"));
+		}
+	}
+
+	if (!found && filter_name) {
+		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));
+		}
+	}
+	gf_list_del(done);
+	gf_log_set_tool_level(GF_LOG_FILTER, llev);
+}
+
+
+GF_EXPORT
+void gf_filter_get_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps)
+{
+	if (caps) {
+		if (filter) {
+			(*caps) = filter->session->caps;
+		} else {
+			memset(caps, 0, sizeof(GF_FilterSessionCaps));
+		}
+	}
+}
+
+GF_EXPORT
+void gf_filter_set_session_caps(GF_Filter *filter, GF_FilterSessionCaps *caps)
+{
+	if (caps && filter) {
+		filter->session->caps = (*caps);
+		//TODO fire event
+	}
+}
+
+GF_EXPORT
+u8 gf_filter_get_sep(GF_Filter *filter, GF_FilterSessionSepType sep_type)
+{
+	switch (sep_type) {
+	case GF_FS_SEP_ARGS: return filter->session->sep_args;
+	case GF_FS_SEP_NAME: return filter->session->sep_name;
+	case GF_FS_SEP_FRAG: return filter->session->sep_frag;
+	case GF_FS_SEP_LIST: return filter->session->sep_list;
+	case GF_FS_SEP_NEG: return filter->session->sep_neg;
+	default: return 0;
+	}
+}
+
+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;
+}
+
+GF_EXPORT
+struct _gf_ft_mgr *gf_filter_get_font_manager(GF_Filter *filter)
+{
+	GF_FilterSession *fsess;
+	if (!filter) return NULL;
+	fsess = filter->session;
+
+	if (!fsess->font_manager) {
+		fsess->font_manager = gf_font_manager_new();
+	}
+	return fsess->font_manager;
+}
+
+void gf_fs_cleanup_filters(GF_FilterSession *fsess)
+{
+	assert(fsess->pid_connect_tasks_pending);
+	safe_int_dec(&fsess->pid_connect_tasks_pending);
+}
+
+GF_EXPORT
+GF_Err gf_fs_get_last_connect_error(GF_FilterSession *fs)
+{
+	GF_Err e;
+	if (!fs) return GF_BAD_PARAM;
+	e = fs->last_connect_error;
+	fs->last_connect_error = GF_OK;
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_fs_get_last_process_error(GF_FilterSession *fs)
+{
+	GF_Err e;
+	if (!fs) return GF_BAD_PARAM;
+	e = fs->last_process_error;
+	fs->last_process_error = GF_OK;
+	return e;
+}
+
+typedef struct
+{
+	GF_FilterSession *fsess;
+	void *callback;
+	Bool (*task_execute) (GF_FilterSession *fsess, void *callback, u32 *reschedule_ms);
+	Bool (*task_execute_filter) (GF_Filter *filter, void *callback, u32 *reschedule_ms);
+#ifndef GPAC_DISABLE_REMOTERY
+	rmtU32 rmt_hash;
+#endif
+} GF_UserTask;
+
+static void gf_fs_user_task(GF_FSTask *task)
+{
+	u32 reschedule_ms=0;
+	GF_UserTask *utask = (GF_UserTask *)task->udta;
+	task->schedule_next_time = 0;
+
+#ifndef GPAC_DISABLE_REMOTERY
+	gf_rmt_begin_hash(task->log_name, GF_RMT_AGGREGATE, &utask->rmt_hash);
+#endif
+	if (utask->task_execute) {
+		task->requeue_request = utask->task_execute(utask->fsess, utask->callback, &reschedule_ms);
+	} else if (task->filter) {
+		task->requeue_request = utask->task_execute_filter(task->filter, utask->callback, &reschedule_ms);
+	} else {
+		task->requeue_request = 0;
+	}
+	gf_rmt_end();
+	//if no requeue request or if we are in final flush, don't re-execute
+	if (!task->requeue_request || utask->fsess->in_final_flush) {
+		gf_free(utask);
+		task->udta = NULL;
+		task->requeue_request = GF_FALSE;
+	} else {
+		task->schedule_next_time = gf_sys_clock_high_res() + 1000*reschedule_ms;
+	}
+}
+
+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;
+	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);
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_filter_post_task(GF_Filter *filter, Bool (*task_execute) (GF_Filter *filter, void *callback, u32 *reschedule_ms), void *udta, const char *task_name)
+{
+	GF_UserTask *utask;
+	if (!filter || !task_execute) return GF_BAD_PARAM;
+	GF_SAFEALLOC(utask, GF_UserTask);
+	if (!utask) return GF_OUT_OF_MEM;
+	utask->callback = udta;
+	utask->task_execute_filter = task_execute;
+	utask->fsess = filter->session;
+	gf_fs_post_task(filter->session, gf_fs_user_task, filter, NULL, task_name ? task_name : "user_task", utask);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+Bool gf_fs_is_last_task(GF_FilterSession *fsess)
+{
+	if (!fsess) return GF_TRUE;
+	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;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_fs_mime_supported(GF_FilterSession *fsess, const char *mime)
+{
+	u32 i, count;
+	//first pass on explicit mimes
+	count = gf_list_count(fsess->registry);
+	for (i=0; i<count; i++) {
+		u32 j;
+		const GF_FilterRegister *freg = gf_list_get(fsess->registry, i);
+		for (j=0; j<freg->nb_caps; j++) {
+			const GF_FilterCapability *acap = &freg->caps[j];
+			if (!(acap->flags & GF_CAPFLAG_INPUT)) continue;
+			if (acap->code == GF_PROP_PID_MIME) {
+				if (acap->val.value.string && strstr(acap->val.value.string, mime)) return GF_TRUE;
+			}
+		}
+	}
+	return GF_FALSE;
+}
+
+
+GF_EXPORT
+void gf_fs_enable_reporting(GF_FilterSession *session, Bool reporting_on)
+{
+	if (session) session->reporting_on = reporting_on;
+}
+
+GF_EXPORT
+void gf_fs_lock_filters(GF_FilterSession *session, Bool do_lock)
+{
+	if (!session || !session->filters_mx) return;
+	if (do_lock) gf_mx_p(session->filters_mx);
+	else gf_mx_v(session->filters_mx);
+}
+
+GF_EXPORT
+u32 gf_fs_get_filters_count(GF_FilterSession *session)
+{
+	return session ? gf_list_count(session->filters) : 0;
+}
+
+GF_EXPORT
+GF_Err gf_fs_get_filter_stats(GF_FilterSession *session, u32 idx, GF_FilterStats *stats)
+{
+	GF_Filter *f;
+	u32 i;
+	Bool set_name=GF_FALSE;
+	if (!stats || !session) return GF_BAD_PARAM;
+	memset(stats, 0, sizeof(GF_FilterStats));
+	f = gf_list_get(session->filters, idx);
+	if (!f) return GF_BAD_PARAM;
+	stats->filter = f;
+	stats->filter_alias = f->multi_sink_target;
+	if (f->multi_sink_target) return GF_OK;
+	
+	stats->percent = f->status_percent>10000 ? -1 : (s32) f->status_percent;
+	stats->status = f->status_str;
+	stats->nb_pck_processed = f->nb_pck_processed;
+	stats->nb_bytes_processed = f->nb_bytes_processed;
+	stats->time_process = f->time_process;
+	stats->nb_hw_pck_sent = f->nb_hw_pck_sent;
+	stats->nb_pck_sent = f->nb_pck_sent;
+	stats->nb_bytes_sent = f->nb_bytes_sent;
+	stats->nb_tasks_done = f->nb_tasks_done;
+	stats->nb_errors = f->nb_errors;
+	stats->name = f->name;
+	stats->reg_name = f->freg->name;
+	stats->filter_id = f->id;
+	stats->done = f->removed || f->finalized;
+	if (stats->name && !strcmp(stats->name, stats->reg_name)) {
+		set_name=GF_TRUE;
+	}
+	stats->report_updated = f->report_updated;
+	f->report_updated = GF_FALSE;
+
+
+	if (!stats->nb_pid_out && stats->nb_pid_in) stats->type = GF_FS_STATS_FILTER_RAWOUT;
+	else if (!stats->nb_pid_in && stats->nb_pid_out) stats->type = GF_FS_STATS_FILTER_RAWIN;
+
+	stats->nb_pid_out = f->num_output_pids;
+	for (i=0; i<f->num_output_pids; i++) {
+		GF_FilterPid *pid = gf_list_get(f->output_pids, i);
+		stats->nb_out_pck += pid->nb_pck_sent;
+		if (pid->has_seen_eos) stats->in_eos = GF_TRUE;
+
+		if (f->num_output_pids!=1) continue;
+
+		if (!stats->codecid)
+			stats->codecid = pid->codecid;
+		if (!stats->stream_type)
+			stats->stream_type = pid->stream_type;
+
+		//set name if PID name is not a default generated one
+		if (set_name && strncmp(pid->name, "PID", 3)) {
+			stats->name = pid->name;
+			set_name = GF_FALSE;
+		}
+	}
+	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);
+		stats->nb_in_pck += pidi->nb_processed;
+		if (pidi->is_end_of_stream) stats->in_eos = GF_TRUE;
+
+		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)
+			stats->type = GF_FS_STATS_FILTER_DEMUX;
+
+		if ((f->num_input_pids!=1) && f->num_output_pids)
+			continue;
+
+		if (!stats->codecid)
+			stats->codecid = pidi->pid->codecid;
+		if (!stats->stream_type)
+			stats->stream_type = pidi->pid->stream_type;
+
+		if (set_name) {
+			stats->name = pidi->pid->name;
+			set_name = GF_FALSE;
+		}
+	}
+	return GF_OK;
+}
+
+Bool gf_fs_ui_event(GF_FilterSession *session, GF_Event *uievt)
+{
+	Bool ret;
+	gf_mx_p(session->ui_mx);
+	ret = session->ui_event_proc(session->ui_opaque, uievt);
+	gf_mx_v(session->ui_mx);
+	return ret;
+}
+
+void gf_fs_check_graph_load(GF_FilterSession *fsess, Bool for_load)
+{
+	if (for_load) {
+		if (!fsess->links || ! gf_list_count( fsess->links))
+			gf_filter_sess_build_graph(fsess, NULL);
+	} else {
+		if (fsess->flags & GF_FS_FLAG_NO_GRAPH_CACHE)
+			gf_filter_sess_reset_graph(fsess, NULL);
+	}
+}
+
+#ifndef GPAC_DISABLE_3D
+static Bool fsess_on_event(void *cbk, GF_Event *evt)
+{
+	return GF_TRUE;
+}
+
+GF_Err gf_fs_check_gl_provider(GF_FilterSession *session)
+{
+	GF_Event evt;
+	GF_Err e;
+	const char *sOpt;
+	void *os_disp_handler;
+
+	if (!session->nb_gl_filters) return GF_OK;
+	if (gf_list_count(session->gl_providers)) return GF_OK;
+
+	if (session->gl_driver) return GF_OK;
+
+
+	session->gl_driver = (GF_VideoOutput *) gf_module_load(GF_VIDEO_OUTPUT_INTERFACE, gf_opts_get_key("core", "video-output") );
+
+	if (!session->gl_driver) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_FILTER, ("Failed to load a video output for OpenGL context support !\n"));
+		return GF_IO_ERR;
+	}
+	if (!gf_opts_get_key("core", "video-output")) {
+		gf_opts_set_key("core", "video-output", session->gl_driver->module_name);
+	}
+	session->gl_driver->on_event = fsess_on_event;
+	session->gl_driver->evt_cbk_hdl = session;
+
+	os_disp_handler = NULL;
+	sOpt = gf_opts_get_key("Temp", "OSDisp");
+	if (sOpt) sscanf(sOpt, "%p", &os_disp_handler);
+
+	e = session->gl_driver->Setup(session->gl_driver, NULL, os_disp_handler, GF_TERM_INIT_HIDE);
+	if (e!=GF_OK) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_FILTER, ("Failed to setup Video Driver %s!\n", session->gl_driver->module_name));
+		gf_modules_close_interface((GF_BaseInterface *)session->gl_driver);
+		session->gl_driver = NULL;
+		return e;
+	}
+
+	//and initialize GL context
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_VIDEO_SETUP;
+	evt.setup.width = 128;
+	evt.setup.height = 128;
+	evt.setup.use_opengl = GF_TRUE;
+	evt.setup.back_buffer = 1;
+	//we anyway should'nt call swapBuffer/flush on this object
+	evt.setup.disable_vsync = GF_TRUE;
+	session->gl_driver->ProcessEvent(session->gl_driver, &evt);
+
+	if (evt.setup.use_opengl) {
+		gf_opengl_init();
+	}
+	return GF_OK;
+}
+
+GF_Err gf_fs_set_gl(GF_FilterSession *session)
+{
+	GF_Event evt;
+	if (!session->gl_driver) return GF_BAD_PARAM;
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_SET_GL;
+	return session->gl_driver->ProcessEvent(session->gl_driver, &evt);
+}
+#endif
+
+
+#ifdef FILTER_FIXME
+
+
+static Bool term_find_res(GF_TermLocales *loc, char *parent, char *path, char *relocated_path, char *localized_rel_path)
+{
+	FILE *f;
+
+	if (loc->szAbsRelocatedPath) gf_free(loc->szAbsRelocatedPath);
+	loc->szAbsRelocatedPath = gf_url_concatenate(parent, path);
+	if (!loc->szAbsRelocatedPath) loc->szAbsRelocatedPath = gf_strdup(path);
+
+	f = gf_fopen(loc->szAbsRelocatedPath, "rb");
+	if (f) {
+		gf_fclose(f);
+		strcpy(localized_rel_path, path);
+		strcpy(relocated_path, loc->szAbsRelocatedPath);
+		return 1;
+	}
+	return 0;
+}
+
+/* Checks if, for a given relative path, there exists a localized version in an given folder
+   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)
+{
+	char path[GF_MAX_PATH];
+	const char *opt;
+
+	GF_TermLocales *loc = (GF_TermLocales*)__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)) {
+		return 0;
+	}
+
+	/*Checks if the absolute path is really absolute and points to a local file (no http or else) */
+	if (!locales_parent_path ||
+	        (locales_parent_path && (locales_parent_path[0] != '/') && strstr(locales_parent_path, "://") && strnicmp(locales_parent_path, "file://", 7))) {
+		return 0;
+	}
+	opt = gf_opts_get_key("core", "lang");
+	if (opt && (!strcmp(opt, "*") || !strcmp(opt, "un") ) ) {
+		opt = NULL;
+	}
+
+	while (opt) {
+		char lan[100];
+		char *sep;
+		char *sep_lang = strchr(opt, ';');
+		if (sep_lang) sep_lang[0] = 0;
+
+		while (strchr(" \t", opt[0]))
+			opt++;
+
+		strcpy(lan, opt);
+
+		if (sep_lang) {
+			sep_lang[0] = ';';
+			opt = sep_lang+1;
+		} else {
+			opt = NULL;
+		}
+
+		while (1) {
+			sep = strstr(lan, "-*");
+			if (!sep) break;
+			strncpy(sep, sep+2, strlen(sep)-2);
+		}
+
+		sprintf(path, "locales/%s/%s", lan, rel_path);
+		if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
+			return 1;
+
+		/*recursively remove region (sub)tags*/
+		while (1) {
+			sep = strrchr(lan, '-');
+			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))
+				return 1;
+		}
+	}
+
+	if (term_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
+

gpac-1.0.0.tar.gz/src/filter_core/filter_session.h Added

@@ -0,0 +1,990 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters sub-project
+ *
+ *  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 _GF_FILTER_SESSION_H_
+#define _GF_FILTER_SESSION_H_
+
+#include <gpac/list.h>
+#include <gpac/thread.h>
+#include <gpac/filters.h>
+#include <gpac/user.h>
+
+
+
+#define GF_FILTER_SPEED_SCALER	1000
+
+#define PID_IS_INPUT(__pid) ((__pid->pid==__pid) ? GF_FALSE : GF_TRUE)
+#define PID_IS_OUTPUT(__pid) ((__pid->pid==__pid) ? GF_TRUE : GF_FALSE)
+#define PCK_IS_INPUT(__pck) ((__pck->pck==__pck) ? GF_FALSE : GF_TRUE)
+#define PCK_IS_OUTPUT(__pck) ((__pck->pck==__pck) ? GF_TRUE : GF_FALSE)
+
+#define FSESS_CHECK_THREAD(__f) assert( !(__f)->process_th_id || ( (__f)->process_th_id == gf_th_id() ) );
+
+struct __gf_prop_entry
+{
+	//parent filter session for property reservoir
+	GF_FilterSession *session;
+	volatile u32 reference_count;
+	u32 p4cc;
+	Bool name_alloc;
+	char *pname;
+
+	GF_PropertyValue prop;
+	u32 alloc_size;
+};
+
+#ifndef GF_PROPS_HASHTABLE_SIZE
+#define GF_PROPS_HASHTABLE_SIZE 0
+#endif
+
+void gf_propmap_del(void *pmap);
+
+typedef struct
+{
+#if GF_PROPS_HASHTABLE_SIZE
+	GF_List *hash_table[GF_PROPS_HASHTABLE_SIZE];
+#else
+	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
+	//the pid might be dead. This is only used for pid props maps
+	volatile u32 pckrefs_reference_count;
+	GF_FilterSession *session;
+	//current timescale, cached for duration/buffer compute
+	u32 timescale;
+} GF_PropertyMap;
+
+GF_PropertyMap * gf_props_new(GF_Filter *filter);
+void gf_props_del(GF_PropertyMap *prop);
+void gf_props_reset(GF_PropertyMap *prop);
+
+GF_Err gf_props_set_property(GF_PropertyMap *map, u32 p4cc, const char *name, char *dyn_name, const GF_PropertyValue *value);
+GF_Err gf_props_insert_property(GF_PropertyMap *map, u32 hash, u32 p4cc, const char *name, char *dyn_name, const GF_PropertyValue *value);
+
+void gf_props_remove_property(GF_PropertyMap *map, u32 hash, u32 p4cc, const char *name);
+
+const GF_PropertyValue *gf_props_get_property(GF_PropertyMap *map, u32 prop_4cc, const char *name);
+
+const GF_PropertyEntry *gf_props_get_property_entry(GF_PropertyMap *map, u32 prop_4cc, const char *name);
+
+#if GF_PROPS_HASHTABLE_SIZE
+u32 gf_props_hash_djb2(u32 p4cc, const char *str);
+#else
+#define gf_props_hash_djb2(_a, _b) 0
+#endif
+
+GF_Err gf_props_merge_property(GF_PropertyMap *dst_props, GF_PropertyMap *src_props, gf_filter_prop_filter filter_prop, void *cbk);
+
+const GF_PropertyValue *gf_props_enum_property(GF_PropertyMap *props, u32 *io_idx, u32 *prop_4cc, const char **prop_name);
+
+Bool gf_props_4cc_check_props();
+
+void gf_props_del_property(GF_PropertyEntry *it);
+
+
+typedef struct __gf_filter_queue GF_FilterQueue;
+//constructs a new fifo queue. If mx is set all pop/add/head operations are protected by the mutex
+//otherwise, a lock-free version of the fifo is used
+GF_FilterQueue *gf_fq_new(const GF_Mutex *mx);
+void gf_fq_del(GF_FilterQueue *fq, void (*item_delete)(void *) );
+void gf_fq_add(GF_FilterQueue *fq, void *item);
+void *gf_fq_pop(GF_FilterQueue *fq);
+void *gf_fq_head(GF_FilterQueue *fq);
+u32 gf_fq_count(GF_FilterQueue *fq);
+void *gf_fq_get(GF_FilterQueue *fq, u32 idx);
+void gf_fq_enum(GF_FilterQueue *fq, Bool (*enum_func)(void *udta1, void *item), void *udta);
+
+
+typedef void (*gf_destruct_fun)(void *cbck);
+
+//calls gf_free on p, used for LFQ / lists destructors
+void gf_void_del(void *p);
+
+typedef struct __gf_filter_pid_inst GF_FilterPidInst;
+
+typedef struct __gf_filter_pck_inst
+{
+	struct __gf_filter_pck *pck; //source packet
+	GF_FilterPidInst *pid;
+	u8 pid_props_change_done;
+	u8 pid_info_change_done;
+
+	//DO NOT EXTEND UNLESS UPDATING CODE IN gf_filter_pck_send()
+} GF_FilterPacketInstance;
+
+
+//packet flags
+enum
+{
+	GF_PCKF_BLOCK_START = 0x80000000, //1<<31
+	GF_PCKF_BLOCK_END = 1<<30,
+	GF_PCKF_PROPS_CHANGED = 1<<29,
+	GF_PCKF_INFO_CHANGED = 1<<28,
+	GF_PCKF_CORRUPTED = 1<<27,
+	GF_PCKF_SEEK = 1<<26,
+	GF_PCKF_DUR_SET = 1<<25,
+	GF_PCKF_PROPS_REFERENCE = 1<<24,
+	//3 bits for SAP
+	GF_PCK_SAP_POS = 21,
+	GF_PCK_SAP_MASK = 0x7 << GF_PCK_SAP_POS,
+	//2 bits for interlaced
+	GF_PCK_ILACE_POS = 19,
+	GF_PCK_ILACE_MASK = 0x3 << GF_PCK_ILACE_POS,
+	//2 bits for clock type
+	GF_PCK_CKTYPE_POS = 17,
+	GF_PCK_CKTYPE_MASK = 0x3 << GF_PCK_CKTYPE_POS,
+	//2 bits for crypt type
+	GF_PCK_CRYPT_POS = 15,
+	GF_PCK_CRYPT_MASK = 0x3 << GF_PCK_CRYPT_POS,
+	//2 bits for crypt type
+	GF_PCK_CMD_POS = 13,
+	GF_PCK_CMD_MASK = 0x3 << GF_PCK_CMD_POS,
+	//RESERVED bits [9,12]
+	//2 bits for is_leading
+	GF_PCK_ISLEADING_POS = 6,
+	GF_PCK_ISLEADING_MASK = 0x3 << GF_PCK_ISLEADING_POS,
+	//2 bits for depends_on
+	GF_PCK_DEPENDS_ON_POS = 4,
+	GF_PCK_DEPENDS_ON_MASK = 0x3 << GF_PCK_DEPENDS_ON_POS,
+	//2 bits for depended_on
+	GF_PCK_DEPENDED_ON_POS = 2,
+	GF_PCK_DEPENDED_ON_MASK = 0x3 << GF_PCK_DEPENDED_ON_POS,
+	//2 bits for redundant
+	GF_PCK_REDUNDANT_MASK = 0x3,
+
+	//quick defs
+	GF_PCK_CMD_NONE = 0<<GF_PCK_CMD_POS,
+	GF_PCK_CMD_PID_EOS = 1<<GF_PCK_CMD_POS,
+	GF_PCK_CMD_PID_REM = 2<<GF_PCK_CMD_POS,
+};
+
+typedef struct __gf_filter_pck_info
+{
+	/*! packet flags */
+	u32 flags;
+
+	//packet timing in pid_props->timescale units
+	u64 dts, cts;
+	u32 duration;
+
+	u64 byte_offset;
+	u32 seq_num;
+	s16 roll;
+	u8 carousel_version_number;
+
+} GF_FilterPckInfo;
+
+struct __gf_filter_pck
+{
+	struct __gf_filter_pck *pck; //this object
+	GF_FilterPid *pid;
+	//filter emiting the packet - this is only needed to handle destruction of packets never dispatched
+	//by the filter upon destruction. Set to NULL once the packet is dispatched
+	GF_Filter *src_filter;
+
+	//parent session, used to collect packet props references
+	GF_FilterSession *session;
+
+	//nb references of this packet
+	volatile u32 reference_count;
+
+	GF_FilterPckInfo info;
+
+	char *data;
+	u32 data_length;
+
+	//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;
+
+	GF_FilterFrameInterface *frame_ifce;
+	
+	// properties applying to this packet
+	GF_PropertyMap *props;
+	//pid properties applying to this packet
+	GF_PropertyMap *pid_props;
+};
+
+/*!
+ *	Filter Session Task process function prototype
+ */
+typedef void (*gf_fs_task_callback)(GF_FSTask *task);
+
+struct __gf_fs_task
+{
+	//flag set for tasks registered with main task list, eg having incremented the task_pending counter.
+	//some tasks may not increment that counter (eg when requeued to a filer), so this simplifies
+	//decrementing the counter
+	Bool notified;
+	Bool requeue_request;
+	Bool can_swap;
+	Bool blocking;
+
+	u64 schedule_next_time;
+
+
+	gf_fs_task_callback run_task;
+	GF_Filter *filter;
+	GF_FilterPid *pid;
+	const char *log_name;
+	void *udta;
+};
+
+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);
+
+void gf_filter_pid_send_event_downstream(GF_FSTask *task);
+
+
+typedef struct __gf_fs_thread
+{
+	//NULL for main thread
+	GF_Thread *th;
+	struct __gf_filter_session *fsess;
+	u32 th_id;
+	
+	Bool has_seen_eot; //set when no more tasks in global queue
+
+	u64 nb_tasks;
+	u64 run_time;
+	u64 active_time;
+
+#ifndef GPAC_DISABLE_REMOTERY
+	u32 rmt_tasks;
+	char rmt_name[20];
+#endif
+
+} GF_SessionThread;
+
+typedef struct
+{
+	char *argname;
+	u32 type;
+	Bool found;
+} GF_FSArgItem;
+
+void gf_fs_push_arg(GF_FilterSession *session, const char *szArg, Bool was_found, u32 type);
+
+enum
+{
+	GF_FS_BLOCK_ALL=0,
+	GF_FS_NOBLOCK_FANOUT,
+	GF_FS_NOBLOCK
+};
+
+struct __gf_filter_session
+{
+	u32 flags;
+	Bool use_locks;
+	Bool direct_mode;
+	volatile u32 tasks_in_process;
+	Bool requires_solved_graph;
+	Bool no_main_thread;
+
+	GF_List *registry;
+	GF_List *filters;
+
+	GF_FilterQueue *tasks;
+	GF_FilterQueue *main_thread_tasks;
+	GF_FilterQueue *tasks_reservoir;
+	volatile Bool in_main_sem_wait;
+	volatile u32 active_threads;
+
+	//if more than one thread, this mutex protects access to loaded filters list, to avoid concurrent calls to destruct and
+	//filter testing (graph resolution, update sending, non thread-safe graph traversal...)
+	GF_Mutex *filters_mx;
+
+	//reservoir for property maps for PID and packets properties
+	GF_FilterQueue *prop_maps_reservoir;
+	//reservoir for property entries  - properties may be inherited between packets
+	GF_FilterQueue *prop_maps_entry_reservoir;
+	//reservoir for property entries with allocated data buffers - properties may be inherited between packets
+	GF_FilterQueue *prop_maps_entry_data_alloc_reservoir;
+#if GF_PROPS_HASHTABLE_SIZE
+	//reservoir for property maps hash table entries (GF_Lists) for PID and packets properties
+	GF_FilterQueue *prop_maps_list_reservoir;
+#endif
+	//reservoir for reference property packets - we mutualize at session level to collect them
+	//it is not possible to do so at filter or pid level because a prop ref packet may be destroyed after the source
+	//pid/packet is destroyed, and we don't want to track them per pid/filter
+	GF_FilterQueue *pcks_refprops_reservoir;
+
+
+	GF_Mutex *props_mx;
+
+	GF_Mutex *info_mx;
+
+	GF_Mutex *ui_mx;
+
+	GF_List *threads;
+	GF_SessionThread main_th;
+
+	//only used in forced lock mode
+	GF_Mutex *tasks_mx;
+
+	//we duplicate the semaphores for the main and other task list. This avoids having threads grabing tasks
+	//posted for main thread, and re-notifying the sema which could then be grabbed by another thread
+	//than the main, hence producing too many wake-ups
+	//semaphore for tasks posted in main task list
+	GF_Semaphore *semaphore_main;
+	//semaphore for tasks posted in other task list
+	GF_Semaphore *semaphore_other;
+
+	volatile u32 tasks_pending;
+
+	u32 nb_threads_stopped;
+	GF_Err run_status;
+	u32 blocking_mode;
+	Bool in_final_flush;
+
+	Bool reporting_on;
+	/*user defined callback for all functions - cannot be NULL*/
+	void *ui_opaque;
+	/*the event proc. Return value depend on the event type, usually 0
+	cannot be NULL if os_window_handler is specified and dont_override_window_proc is set
+	may be NULL otherwise*/
+	Bool (*ui_event_proc)(void *opaque, GF_Event *event);
+
+	volatile u32 pid_connect_tasks_pending;
+
+	GF_List *event_listeners;
+	GF_Mutex *evt_mx;
+	u32 in_event_listener;
+
+	GF_DownloadManager *download_manager;
+	struct _gf_ft_mgr *font_manager;
+	
+	u32 default_pid_buffer_max_us, decoder_pid_buffer_max_us;
+	u32 default_pid_buffer_max_units;
+
+#ifdef GPAC_MEMORY_TRACKING
+	Bool check_allocs;
+	u32 nb_alloc_pck, nb_realloc_pck;
+#endif
+	GF_Err last_connect_error, last_process_error;
+
+	GF_FilterSessionCaps caps;
+
+	u64 hint_clock_us;
+	GF_Fraction64 hint_timestamp;
+
+	//max filter chain allowed in the link resolution process
+	u32 max_resolve_chain_len;
+	//max sleep time
+	u32 max_sleep;
+
+	//protect access to link bank
+	GF_Mutex *links_mx;
+	GF_List *links;
+
+
+	GF_List *parsed_args;
+
+	char sep_args, sep_name, sep_frag, sep_list, sep_neg;
+	const char *blacklist;
+	Bool init_done;
+
+	GF_List *auto_inc_nums;
+#ifndef GPAC_DISABLE_3D
+	GF_List *gl_providers;
+	volatile u32 nb_gl_filters;
+#endif
+	//internal video output to hidden window for GL context
+	struct _video_out *gl_driver;
+};
+
+void gf_fs_reg_all(GF_FilterSession *fsess, GF_FilterSession *a_sess);
+
+typedef struct
+{
+	u32 crc;
+	s32 inc_val;
+	GF_Filter *filter;
+} GF_FSAutoIncNum;
+
+#ifndef GPAC_DISABLE_3D
+GF_Err gf_fs_check_gl_provider(GF_FilterSession *session);
+GF_Err gf_fs_set_gl(GF_FilterSession *session);
+#endif
+
+typedef enum
+{
+	GF_FILTER_ARG_EXPLICIT = 0,
+	GF_FILTER_ARG_INHERIT,
+	GF_FILTER_ARG_INHERIT_SOURCE_ONLY,
+	GF_FILTER_ARG_EXPLICIT_SOURCE,
+	GF_FILTER_ARG_EXPLICIT_SOURCE_NO_DST_INHERIT,
+	GF_FILTER_ARG_EXPLICIT_SINK,
+} GF_FilterArgType;
+
+struct __gf_filter
+{
+	const GF_FilterRegister *freg;
+
+	//name of the filter - may be overiden by the filter instance
+	char *name;
+
+	//ID of the filter to setup connections
+	char *id;
+	//list of IDs of filters usable as sources for this filter. NULL means any source
+	char *source_ids;
+	//original source IDs in case we use dynamic clone. If present, the source_ids contains resolved identifiers (eg ServiceID=234)
+	//but dynamic_source_ids still contains the unresolved pattern (eg ServiceID=*)
+	char *dynamic_source_ids;
+
+	//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);
+	void *on_setup_error_udta;
+	GF_Filter *on_setup_error_filter;
+
+	//internal copy of argument string
+	char *orig_args;
+	//remember how the args were set, either by explicit loading of filters or during filter chain
+	GF_FilterArgType arg_type;
+	//allocated pointer to the argument string for source filters
+	char *src_args;
+	//allocated argument string of the destingation filter for filters dynamically loaded, if any
+	char *dst_args;
+
+	//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;
+	//set to true when the filter is present or to be added in the main task list
+	//this variable is unset in a zone protected by task_mx
+	volatile Bool scheduled_for_next_task;
+	//set to true when the filter is being processed by a thread
+	volatile Bool in_process;
+	u32 process_th_id;
+	//user data for the filter implementation
+	void *filter_udta;
+
+	Bool has_out_caps;
+
+	Bool disabled;
+	//set to true before calling filter process() callback, and reset to false right after
+	Bool in_process_callback;
+	Bool no_probe;
+	Bool no_inputs;
+	
+	s32 nb_pids_playing;
+
+	//list of pids connected to this filter
+	GF_List *input_pids;
+	u32 num_input_pids;
+	//list of pids created by this filter
+	GF_List *output_pids;
+	u32 num_output_pids;
+	u32 num_out_pids_not_connected;
+
+	//reservoir for packets with allocated memory
+	GF_FilterQueue *pcks_alloc_reservoir;
+	//reservoir for packets with shared memory
+	GF_FilterQueue *pcks_shared_reservoir;
+	//reservoir for packets instances - the ones stored in the pid destination(s) with shared memory
+	GF_FilterQueue *pcks_inst_reservoir;
+
+	GF_Mutex *pcks_mx;
+
+	//!this mutex protects:
+	//- the filter task queue, when reordering tasks for later processing while other threads try to post to the filter task queue
+	//- the list of input pid and output pid destinations, which can be added from different threads for a same pid (fan-out)
+	//-the blocking state of the filter
+	GF_Mutex *tasks_mx;
+
+	//list of output pids to be configured
+	Bool has_pending_pids;
+	GF_FilterQueue *pending_pids;
+
+	volatile u32 in_pid_connection_pending;
+	volatile u32 out_pid_connection_pending;
+	volatile u32 pending_packets;
+
+	volatile u32 stream_reset_pending;
+	volatile u32 num_events_queued;
+	volatile u32 detach_pid_tasks_pending;
+	volatile u32 nb_shared_packets_out;
+	GF_List *postponed_packets;
+
+	//list of blacklisted filtered registries
+	GF_List *blacklisted;
+
+	//pointer to the original filter being cloned - only used for graph setup, reset after
+	GF_Filter *cloned_from;
+
+	//pointer to the current destination filter to connect to next in the chain - only used for graph setup, reset after
+	GF_Filter *dst_filter;
+	//pointer to the target filter to connect to
+	GF_Filter *target_filter;
+
+	//list of direct destination filters for this filter during graph resolution
+	GF_List *destination_filters;
+	//list of potential destination for which we need to perform link resolution
+	GF_List *destination_links;
+
+	//statistics
+	//number of tasks executed by this filter
+	u64 nb_tasks_done;
+	//number of packets processed by this filter
+	u64 nb_pck_processed;
+	//number of bytes processed by this filter
+	u64 nb_bytes_processed;
+	//number of packets sent by this filter
+	u64 nb_pck_sent;
+	//number of hardware frames packets sent by this filter
+	u64 nb_hw_pck_sent;
+	//number of processing errors in the lifetime of the filter
+	u32 nb_errors;
+
+	//number of bytes sent by this filter
+	u64 nb_bytes_sent;
+	//number of microseconds this filter was active
+	u64 time_process;
+
+#ifdef GPAC_MEMORY_TRACKING
+	//various stats in mem tracking mode, mostly used to detect heavy alloc/free usage by the filter
+	u64 stats_mem_allocated;
+	u32 stats_nb_alloc, stats_nb_realloc, stats_nb_calloc, stats_nb_free;
+	u32 nb_process_since_reset, nb_consecutive_process;
+	u32 max_stats_nb_alloc, max_stats_nb_realloc, max_stats_nb_calloc, max_stats_nb_free;
+	u32 max_nb_consecutive_process, max_nb_process;
+#endif
+
+	volatile u32 would_block; //concurrent inc/dec
+	//sets once broken blocking mode has been detected
+	Bool blockmode_broken;
+	//requested by a filter to disable blocking
+	Bool prevent_blocking;
+
+	//filter destroy task has been posted
+	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;
+	//setup has been notified
+	Bool setup_notified;
+	//filter loaded to solve a filter chain
+	Bool 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
+	//this prevents dispatching pid_remove as packets that would no longer be consumed
+	Bool marked_for_removal;
+	//sticky filters won't unload if all inputs are deconnected. Useful for sink filters
+	//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;
+	//one of the output PID needs reconfiguration
+	volatile u32 nb_caps_renegociate;
+
+	//number of process tasks queued. There is only one "process" task allocated for the filter, but it is automatically reposted based on this value
+	volatile u32 process_task_queued;
+
+	//time in system clock at which the process should be called, used for real-time regulation of some filters
+	u64 schedule_next_time;
+
+	//clock (PCR) dispatch info
+	u64 next_clock_dispatch;
+	u32 next_clock_dispatch_timescale;
+	GF_FilterClockType next_clock_dispatch_type;
+
+	GF_Filter *cap_dst_filter;
+	//capability negotiation for the input pid
+	GF_PropertyMap *caps_negociate;
+	//set to true of this filter was instantiated to resolve a capability negotiation between two filters
+	Bool is_pid_adaptation_filter;
+	/*destination pid instance we are swapping*/
+	GF_FilterPidInst *swap_pidinst_dst;
+	/*source pid instance we are swapping*/
+	GF_FilterPidInst *swap_pidinst_src;
+	Bool swap_needs_init;
+
+	//overloaded caps of the filter
+	const GF_FilterCapability *forced_caps;
+	u32 nb_forced_caps;
+	//valid when a pid inst is waiting for a reconnection, NULL otherwise
+	GF_List *detached_pid_inst;
+
+	//index of the bundle input for dynamic filters
+	s32 bundle_idx_at_resolution;
+	//index of the cap bundle input for adaptation filters
+	s32 cap_idx_at_resolution;
+
+	//set to signal output pids should be reconfigured
+	Bool reconfigure_outputs;
+	//when set, indicates the filter uses PID property overwrite in its arguments, needed to rewrite the props at pid init time
+	Bool user_pid_props;
+
+	//for encoder filters, set to the corresponding stream type - used to discard filters during the resolution
+	u32 encoder_stream_type;
+
+#ifndef GPAC_DISABLE_REMOTERY
+	rmtU32 rmt_hash;
+#endif
+
+	//signals tha pid info has changed, to notify the filter chain
+	Bool pid_info_changed;
+
+	//set to 1 when one or more input pid to the filter is on end of state, set to 2 if the filter dispatch a packet while in this state
+	u32 eos_probe_state;
+
+	//error checking
+	//number of packet release or created during a process() call
+	u32 nb_pck_io;
+	//number of consecutive errors during process()
+	u32 nb_consecutive_errors;
+	//system clock of first error
+	u64 time_at_first_error;
+
+	GF_Err in_connect_err;
+
+	Bool main_thread_forced;
+	Bool no_dst_arg_inherit;
+	GF_List *source_filters;
+
+	char *status_str;
+	u32 status_str_alloc, status_percent;
+	Bool report_updated;
+
+	char *instance_description, *instance_version, *instance_author, *instance_help;
+	GF_FilterArgs *instance_args;
+
+	GF_Filter *multi_sink_target;
+
+};
+
+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);
+void gf_filter_del(GF_Filter *filter);
+
+Bool gf_filter_swap_source_register(GF_Filter *filter);
+
+GF_Err gf_filter_new_finalize(GF_Filter *filter, const char *args, GF_FilterArgType arg_type);
+
+GF_Filter *gf_fs_load_source_dest_internal(GF_FilterSession *fsess, const char *url, const char *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);
+
+void gf_filter_pid_inst_delete_task(GF_FSTask *task);
+
+void gf_filter_pid_inst_reset(GF_FilterPidInst *pidinst);
+void gf_filter_pid_inst_del(GF_FilterPidInst *pidinst);
+
+void gf_filter_forward_clock(GF_Filter *filter);
+
+void gf_filter_process_inline(GF_Filter *filter);
+
+void gf_filter_pid_retry_caps_negotiate(GF_FilterPid *src_pid, GF_FilterPid *pid, GF_Filter *dst_filter);
+
+void gf_filter_reset_pending_packets(GF_Filter *filter);
+
+typedef struct
+{
+	char *name;
+	char *val;
+	//0: only on filter, 1: forward downstream, 2: forward upstream
+	GF_EventPropagateType recursive;
+} GF_FilterUpdate;
+
+//structure for input pids, in order to handle fan-outs of a pid into several filters
+struct __gf_filter_pid_inst
+{
+	//first two fields are the same as in GF_FilterPid for typecast
+	struct __gf_filter_pid *pid; // source pid
+	GF_Filter *filter;
+
+	//current properties for the pid - we cannot use pid->properties since there could be
+	//multiple consumers running at different speed
+	GF_PropertyMap *props;
+
+	GF_FilterQueue *packets;
+
+	GF_Mutex *pck_mx;
+
+	GF_List *pck_reassembly;
+	Bool requires_full_data_block;
+	Bool last_block_ended;
+	Bool first_block_started;
+	//set during play/stop/reset phases
+	Bool discard_packets;
+
+	Bool force_reconfig;
+
+	//set by filter
+	Bool discard_inputs;
+
+	//amount of media data in us in the packet queue - concurrent inc/dec
+	volatile s64 buffer_duration;
+
+	volatile s32 detach_pending;
+
+	void *udta;
+
+	//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;
+	//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;
+	volatile u32 nb_eos_signaled;
+
+	Bool is_encoder_input;
+	Bool is_decoder_input;
+	GF_PropertyMap *reconfig_pid_props;
+	
+	//clock handling by the consumer: the clock values are not automatically dispatched to the output pids and are kept
+	//available as regular packets in the input pid
+	Bool handles_clock_references;
+	//if clocks are handled internally:
+	//number of clock packets present
+	volatile u32 nb_clocks_signaled;
+	//last clock value found
+	u64 last_clock_value;
+	//last clock value's timescale found
+	u32 last_clock_timescale;
+	//last clock type found
+	GF_FilterClockType last_clock_type;
+
+	GF_Filter *alias_orig;
+};
+
+struct __gf_filter_pid
+{
+	//first two fields are the same as in GF_FilterPidInst for typecast
+	struct __gf_filter_pid *pid; //self if output pid, or source pid if output
+	GF_Filter *filter;
+
+	char *name;
+	GF_List *destinations;
+	u32 num_destinations;
+	GF_List *properties;
+	Bool request_property_map;
+	Bool pid_info_changed;
+	Bool destroyed;
+	u32 not_connected;
+	Bool not_connected_ok;
+	Bool removed;
+	Bool direct_dispatch;
+	volatile u32 discard_input_packets;
+	volatile u32 init_task_pending;
+	volatile Bool props_changed_since_connect;
+	//number of shared packets (shared, frame interfaces or reference) still out there
+	volatile u32 nb_shared_packets_out;
+
+	GF_PropertyMap *infos;
+	
+	//set whenever an eos packet is dispatched, reset whenever a regular packet is dispatched
+	Bool has_seen_eos;
+	u32 nb_reaggregation_pending;
+
+	//only valid for decoder output pids
+	u32 max_buffer_unit;
+	//max number of packets in each of the destination pids - concurrent inc/dec
+	volatile u32 nb_buffer_unit;
+
+	//times in us
+	u64 max_buffer_time;
+	u32 user_max_buffer_time, user_max_playout_time, user_min_playout_time;
+	//max buffered duration of packets in each of the destination pids - concurrent inc/dec
+	u64 buffer_duration;
+	//true if the pid carries raw media
+	Bool raw_media;
+	//for stats only
+	u32 stream_type, codecid;
+
+	volatile u32 would_block; // concurrent set
+	volatile u32 nb_decoder_inputs;
+
+	Bool duration_init;
+	u64 last_pck_dts, last_pck_cts, min_pck_cts, max_pck_cts;
+	u32 min_pck_duration, nb_unreliable_dts;
+	Bool recompute_dts;
+
+	u32 nb_pck_sent;
+	//1000x speed value
+	u32 playback_speed_scaler;
+
+	Bool initial_play_done;
+	Bool is_playing;
+	void *udta;
+
+	GF_PropertyMap *caps_negociate;
+	GF_FilterPidInst *caps_negociate_pidi;
+	GF_List *adapters_blacklist;
+	GF_Filter *caps_dst_filter;
+
+	Bool ext_not_trusted;
+
+	Bool require_source_id;
+	//only used in filter_check_caps
+	GF_PropertyMap *local_props;
+	volatile u32 num_pidinst_del_pending;
+};
+
+
+void gf_filter_pid_del(GF_FilterPid *pid);
+void gf_filter_pid_del_task(GF_FSTask *task);
+
+void gf_filter_packet_destroy(GF_FilterPacket *pck);
+
+void gf_fs_cleanup_filters(GF_FilterSession *fsess);
+
+/*specific task posting*/
+void gf_filter_pid_post_init_task(GF_Filter *filter, GF_FilterPid *pid);
+void gf_filter_pid_post_connect_task(GF_Filter *filter, GF_FilterPid *pid);
+
+/*internal tasks definitions*/
+void gf_filter_pid_reconfigure_task(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);
+void gf_filter_pid_detach_task(GF_FSTask *task);
+
+Bool filter_in_parent_chain(GF_Filter *parent, GF_Filter *filter);
+
+u32 gf_filter_caps_bundle_count(const GF_FilterCapability *caps, u32 nb_caps);
+
+void gf_filter_post_remove(GF_Filter *filter);
+
+typedef struct
+{
+	u32 *bundles_in_ok;
+	u32 *bundles_cap_found;
+	u32 *bundles_in_scores;
+	u32 nb_allocs;
+} GF_CapsBundleStore;
+
+#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);
+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);
+
+void gf_filter_check_output_reconfig(GF_Filter *filter);
+Bool gf_filter_reconf_output(GF_Filter *filter, GF_FilterPid *pid);
+
+void gf_filter_renegociate_output_dst(GF_FilterPid *pid, GF_Filter *filter, GF_Filter *filter_dst, GF_FilterPidInst *dst_pidi, GF_FilterPidInst *src_pidi);
+
+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);
+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);
+
+void gf_filter_relink_dst(GF_FilterPidInst *pidinst);
+
+void gf_filter_remove_internal(GF_Filter *filter, GF_Filter *until_filter, Bool keep_end_connections);
+
+GF_FilterPacket *gf_filter_pck_new_shared_internal(GF_FilterPid *pid, const u8 *data, u32 data_size, gf_fsess_packet_destructor destruct, Bool intern_pck);
+
+void gf_filter_sess_build_graph(GF_FilterSession *fsess, const GF_FilterRegister *freg);
+void gf_filter_sess_reset_graph(GF_FilterSession *fsess, const GF_FilterRegister *freg);
+
+Bool gf_fs_ui_event(GF_FilterSession *session, GF_Event *uievt);
+
+GF_Err gf_filter_pck_send_internal(GF_FilterPacket *pck, Bool from_filter);
+
+void gf_filter_pid_send_event_internal(GF_FilterPid *pid, GF_FilterEvent *evt, Bool force_downstream);
+
+const GF_PropertyEntry *gf_filter_pid_get_property_entry(GF_FilterPid *pid, u32 prop_4cc);
+const GF_PropertyEntry *gf_filter_pid_get_property_entry_str(GF_FilterPid *pid, const char *prop_name);
+
+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);
+
+
+enum
+{
+	EDGE_STATUS_NONE=0,
+	EDGE_STATUS_ENABLED,
+	EDGE_STATUS_DISABLED,
+};
+
+#define EDGE_LOADED_SOURCE_ONLY (1)
+#define EDGE_LOADED_DEST_ONLY (1<<1)
+
+typedef struct
+{
+	struct __freg_desc *src_reg;
+	u16 src_cap_idx;
+	u16 dst_cap_idx;
+	u8 weight;
+	u8 status;
+	u8 priority;
+	u8 loaded_filter_only;
+	u32 disabled_depth;
+	//stream type of the output cap of src. Might be:
+	// -1 if multiple stream types are defined in the cap (demuxers, encoders/decoders bundles)
+	// 0 if not specified
+	// or a valid GF_STREAM_*
+	s32 src_stream_type;
+} GF_FilterRegEdge;
+
+typedef struct __freg_desc
+{
+	const GF_FilterRegister *freg;
+	u32 nb_edges, nb_alloc_edges;
+	GF_FilterRegEdge *edges;
+	u32 dist;
+	struct __freg_desc *destination;
+	u32 cap_idx;
+	u8 priority;
+	u8 in_edges_enabling;
+} GF_FilterRegDesc;
+
+#ifdef GPAC_MEMORY_TRACKING
+size_t gf_mem_get_stats(unsigned int *nb_allocs, unsigned int *nb_callocs, unsigned int *nb_reallocs, unsigned int *nb_free);
+#endif
+
+void gf_filter_post_process_task_internal(GF_Filter *filter, Bool use_direct_dispatch);
+
+//get next option after path, NULL if not found
+const char *gf_fs_path_escape_colon(GF_FilterSession *sess, const char *path);
+
+void gf_fs_check_graph_load(GF_FilterSession *fsess, Bool for_load);
+
+void gf_filter_renegociate_output_task(GF_FSTask *task);
+
+#endif //_GF_FILTER_SESSION_H_
+
+
+
+

gpac-1.0.0.tar.gz/src/filters Added

gpac-1.0.0.tar.gz/src/filters/base_filter_example.c Added

@@ -0,0 +1,168 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters 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/filters.h>
+#include <gpac/list.h>
+
+
+typedef struct
+{
+	u32 opt1;
+	Bool opt2;
+
+	GF_FilterPid *src_pid;
+	GF_FilterPid *dst_pid;
+} GF_BaseFilterExample;
+
+static void example_filter_finalize(GF_Filter *filter)
+{
+	//peform any finalyze routine needed, including potential free in the filter context
+	//if not needed, set the filter_finalize to NULL
+}
+static GF_Err example_filter_process(GF_Filter *filter)
+{
+	char *data_dst;
+	const char *data_src;
+	u32 size;
+
+	GF_FilterPacket *pck_dst;
+	GF_BaseFilterExample *stack = (GF_BaseFilterExample *) gf_filter_get_udta(filter);
+
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(stack->src_pid);
+	if (!pck) return GF_OK;
+	data_src = gf_filter_pck_get_data(pck, &size);
+
+	//produce output packet using memory allocation
+	pck_dst = gf_filter_pck_new_alloc(stack->dst_pid, size, &data_dst);
+	if (!pck_dst) return GF_OUT_OF_MEM;
+	memcpy(data_dst, data_src, size);
+
+	//no need to adjust data framing
+//	gf_filter_pck_set_framing(pck_dst, GF_TRUE, GF_TRUE);
+
+	//copy over src props to dst
+	gf_filter_pck_merge_properties(pck, pck_dst);
+	gf_filter_pck_send(pck_dst);
+
+	gf_filter_pid_drop_packet(stack->src_pid);
+	return GF_OK;
+
+}
+
+static GF_Err example_filter_config_input(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *format;
+	GF_PropertyValue p;
+	GF_BaseFilterExample  *stack = (GF_BaseFilterExample *) gf_filter_get_udta(filter);
+
+	if (stack->src_pid==pid) {
+		//disconnect of src pid (not yet supported)
+		if (is_remove) {
+		}
+		//update of caps, check everything is fine
+		else {
+		}
+		return GF_OK;
+	}
+	//check input pid properties we are interested in
+	format = gf_filter_pid_get_property(pid, GF_4CC('c','u','s','t') );
+	if (!format || !format->value.string || strcmp(format->value.string, "myformat")) {
+		return GF_NOT_SUPPORTED;
+	}
+
+
+	//setup output (if we are a filter not a sink)
+
+	stack->dst_pid = gf_filter_pid_new(filter);
+	gf_filter_pid_copy_properties(stack->dst_pid, stack->src_pid);
+	p.type = GF_PROP_UINT;
+	p.value.uint = 10;
+	gf_filter_pid_set_property(stack->dst_pid, GF_4CC('c','u','s','2'), &p);
+
+	//set framing mode if needed - by default all PIDs require complete data blocks as inputs
+//	gf_filter_pid_set_framing_mode(pidctx->src_pid, GF_TRUE);
+
+	return GF_OK;
+}
+
+static GF_Err example_filter_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	return GF_OK;
+}
+
+GF_Err example_filter_initialize(GF_Filter *filter)
+{
+	GF_BaseFilterExample *stack = gf_filter_get_udta(filter);
+	if (stack->opt2) {
+		//do something based on options
+
+	}
+	//if you filter is a source, this is the right place to start declaring output PIDs, such as above
+
+	return GF_OK;
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_BaseFilterExample, _n)
+static const GF_FilterArgs ExampleFilterArgs[] =
+{
+	//example uint option using enum, result parsed ranges from 0(=v1) to 2(=v3)
+	{ OFFS(opt1), "Example option 1", GF_PROP_UINT, "v1", "v1|v2|v3", GF_FALSE},
+	{ OFFS(opt2), "Example option 2", GF_PROP_BOOL, "false", NULL, GF_FALSE},
+	{ NULL }
+};
+
+static const GF_FilterCapability ExampleFilterInputs[] =
+{
+	{ .cap_string="cust", .val=PROP_NAME("myformat")  },
+	{ NULL }
+};
+
+static const GF_FilterCapability ExampleFilterOutputs[] =
+{
+	{GF_4CC('c','u','s','t'), PROP_UINT(10) },
+	{ NULL }
+};
+
+const GF_FilterRegister ExampleFilterRegister = {
+	.name = "ExampleFilter",
+	.description = "Example Test Filter, not used",
+	.private_size = sizeof(GF_BaseFilterExample),
+	.input_caps = ExampleFilterInputs,
+	.output_caps = ExampleFilterOutputs,
+	.args = ExampleFilterArgs,
+	.initialize = example_filter_initialize,
+	.finalize = example_filter_finalize,
+	.process = example_filter_process,
+	.configure_pid = example_filter_config_input,
+	.update_arg = example_filter_update_arg
+};
+
+const GF_FilterRegister *ex_filter_register(GF_FilterSession *session, Bool load_meta_filters)
+{
+	return &ExampleFilterRegister;
+}
+
+
+

gpac-1.0.0.tar.gz/src/filters/bsrw.c Added

@@ -0,0 +1,637 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / compressed bitstream metadata rewrite 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 _bsrw_pid_ctx BSRWPid;
+typedef struct _bsrw_ctx GF_BSRWCtx;
+
+struct _bsrw_pid_ctx
+{
+	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;
+
+	u32 nalu_size_length;
+};
+
+struct _bsrw_ctx
+{
+	GF_Fraction sar;
+	s32 m4vpl, prof, lev, pcomp, pidc, pspace, gpcflags;
+	char *clrp, *txchar, *mxcoef;
+	Bool remsei;
+
+
+	GF_List *pids;
+	Bool reconfigure;
+};
+
+static GF_Err none_rewrite_packet(GF_BSRWCtx *ctx, BSRWPid *pctx, GF_FilterPacket *pck)
+{
+	return gf_filter_pck_forward(pck, pctx->opid);
+}
+
+
+static GF_Err m4v_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+	GF_Err e;
+	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;
+
+
+	dsi_size = prop->value.data.size;
+	dsi = gf_malloc(sizeof(u8) * dsi_size);
+	memcpy(dsi, prop->value.data.ptr, sizeof(u8) * dsi_size);
+
+	if (ctx->sar.num && ctx->sar.den) {
+		e = gf_m4v_rewrite_par(&dsi, &dsi_size, ctx->sar.num, ctx->sar.den);
+		if (e) {
+			gf_free(dsi);
+			return e;
+		}
+		gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
+	}
+	if (ctx->m4vpl>=0) {
+		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) );
+	}
+
+	gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+
+	return GF_OK;
+}
+
+static GF_Err avc_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 & 0x1F;
+		if (nal_type != GF_AVC_NALU_SEI) {
+			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 & 0x1F;
+		if (nal_type == GF_AVC_NALU_SEI) {
+			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 avc_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+	GF_AVCConfig *avcc;
+	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;
+
+	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 ((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)
+			if (ctx->prof>=0) {
+				sps->data[1] = (u8) ctx->prof;
+			}
+			if (ctx->pcomp>=0) {
+				sps->data[2] = (u8) ctx->pcomp;
+			}
+			if (ctx->lev>=0) {
+				sps->data[3] = (u8) ctx->lev;
+			}
+		}
+		if (ctx->lev>=0) avcc->AVCLevelIndication = ctx->lev;
+		if (ctx->prof>=0) avcc->AVCProfileIndication = ctx->prof;
+		if (ctx->pcomp>=0) avcc->profile_compatibility = ctx->pcomp;
+	}
+
+	gf_odf_avc_cfg_write(avcc, &dsi, &dsi_size);
+	pctx->nalu_size_length = avcc->nal_unit_size;
+
+	gf_odf_avc_cfg_del(avcc);
+	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->remsei) {
+		pctx->rewrite_packet = avc_rewrite_packet;
+	} else {
+		pctx->rewrite_packet = none_rewrite_packet;
+	}
+	return GF_OK;
+}
+
+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;
+	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;
+
+	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 (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;
+
+
+	gf_odf_hevc_cfg_write(hvcc, &dsi, &dsi_size);
+	pctx->nalu_size_length = hvcc->nal_unit_size;
+	gf_odf_hevc_cfg_del(hvcc);
+	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->remsei) {
+		pctx->rewrite_packet = hevc_rewrite_packet;
+	} else {
+		pctx->rewrite_packet = none_rewrite_packet;
+	}
+	return GF_OK;
+}
+
+static GF_Err none_rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+	pctx->reconfigure = GF_FALSE;
+	return GF_OK;
+}
+
+static GF_Err rewrite_pid_config(GF_BSRWCtx *ctx, BSRWPid *pctx)
+{
+	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;
+		}
+	}
+	return GF_OK;
+}
+
+
+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);
+
+	//starting at offset 20 in frame:
+	/*
+	prores_frame->chroma_format = gf_bs_read_int(bs, 2);
+	gf_bs_read_int(bs, 2);
+	prores_frame->interlaced_mode = gf_bs_read_int(bs, 2);
+	gf_bs_read_int(bs, 2);
+	prores_frame->aspect_ratio_information = gf_bs_read_int(bs, 4);
+	prores_frame->framerate_code = gf_bs_read_int(bs, 4);
+	prores_frame->color_primaries = gf_bs_read_u8(bs);
+	prores_frame->transfer_characteristics = gf_bs_read_u8(bs);
+	prores_frame->matrix_coefficients = gf_bs_read_u8(bs);
+	gf_bs_read_int(bs, 4);
+	prores_frame->alpha_channel_type = gf_bs_read_int(bs, 4);
+	*/
+
+	if (ctx->sar.num && ctx->sar.den) {
+		u32 framerate_code = output[21] & 0xF;
+		u32 new_ar = 0;
+		if (ctx->sar.num==ctx->sar.den) new_ar = 1;
+		else if (ctx->sar.num * 3 == ctx->sar.den * 4) new_ar = 2;
+		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));
+			}
+		}
+		new_ar <<= 4;
+		framerate_code |= new_ar;
+		output[21] = (u8) framerate_code;
+		if (pctx->prev_sar != new_ar) {
+			gf_filter_pid_set_property(pctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
+			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 (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 (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;
+		}
+	}
+	return gf_filter_pck_send(dst_pck);
+}
+
+
+static GF_Err bsrw_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_BSRWCtx *ctx = (GF_BSRWCtx *) gf_filter_get_udta(filter);
+	BSRWPid *pctx = gf_filter_pid_get_udta(pid);
+
+	//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);
+			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, BSRWPid);
+		if (!pctx) return GF_OUT_OF_MEM;
+		pctx->ipid = pid;
+		gf_filter_pid_set_udta(pid, pctx);
+		pctx->rewrite_pid_config = none_rewrite_pid_config;
+		pctx->rewrite_packet = none_rewrite_packet;
+		gf_list_add(ctx->pids, pctx);
+		pctx->opid = gf_filter_pid_new(filter);
+		if (!pctx->opid) return GF_OUT_OF_MEM;
+	}
+
+	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;
+		break;
+	case GF_CODECID_HEVC:
+	case GF_CODECID_HEVC_TILES:
+	case GF_CODECID_LHVC:
+		pctx->rewrite_pid_config = hevc_rewrite_pid_config;
+		break;
+	case GF_CODECID_MPEG4_PART2:
+		pctx->rewrite_pid_config = m4v_rewrite_pid_config;
+		break;
+	case GF_CODECID_AP4H:
+	case GF_CODECID_AP4X:
+	case GF_CODECID_APCH:
+	case GF_CODECID_APCN:
+	case GF_CODECID_APCO:
+	case GF_CODECID_APCS:
+		pctx->rewrite_pid_config = none_rewrite_pid_config;
+		pctx->rewrite_packet = prores_rewrite_packet;
+		break;
+
+	default:
+		pctx->rewrite_pid_config = none_rewrite_pid_config;
+		pctx->rewrite_packet = none_rewrite_packet;
+		break;
+	}
+
+	gf_filter_pid_copy_properties(pctx->opid, pctx->ipid);
+	pctx->codec_id = prop->value.uint;
+	pctx->reconfigure = GF_TRUE;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+
+static GF_Err bsrw_process(GF_Filter *filter)
+{
+	u32 i, count;
+	GF_BSRWCtx *ctx = (GF_BSRWCtx *) gf_filter_get_udta(filter);
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		BSRWPid *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;
+		if (ctx->reconfigure)
+			pctx->reconfigure = GF_TRUE;
+
+		if (pctx->reconfigure) {
+			GF_Err e = rewrite_pid_config(ctx, pctx);
+			if (e) return e;
+		}
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pctx->ipid))
+				gf_filter_pid_set_eos(pctx->opid);
+			continue;
+		}
+		pctx->rewrite_packet(ctx, pctx, pck);
+		gf_filter_pid_drop_packet(pid);
+	}
+	ctx->reconfigure = GF_FALSE;
+	return GF_OK;
+}
+
+static GF_Err bsrw_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_BSRWCtx *ctx = (GF_BSRWCtx *) gf_filter_get_udta(filter);
+	ctx->reconfigure = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err bsrw_initialize(GF_Filter *filter)
+{
+	GF_BSRWCtx *ctx = (GF_BSRWCtx *) gf_filter_get_udta(filter);
+	ctx->pids = gf_list_new();
+
+#ifdef GPAC_ENABLE_COVERAGE
+	bsrw_update_arg(filter, NULL, NULL);
+#endif
+	return GF_OK;
+}
+static void bsrw_finalize(GF_Filter *filter)
+{
+	GF_BSRWCtx *ctx = (GF_BSRWCtx *) gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->pids)) {
+		BSRWPid *pctx = gf_list_pop_back(ctx->pids);
+		gf_free(pctx);
+	}
+	gf_list_del(ctx->pids);
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_BSRWCtx, _n)
+static const GF_FilterArgs BSRWArgs[] =
+{
+	{ OFFS(sar), "aspect ratio to rewrite", GF_PROP_FRACTION, "0/0", 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(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(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(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},
+
+	{0}
+};
+
+static const GF_FilterCapability BSRWCaps[] =
+{
+	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),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_SVC),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MVC),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_HEVC_TILES),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4H),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4X),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_APCH),
+	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),
+};
+
+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"
+	"  \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"
+	)
+	.private_size = sizeof(GF_BSRWCtx),
+	.max_extra_pids = 0xFFFFFFFF,
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.args = BSRWArgs,
+	SETCAPS(BSRWCaps),
+	.initialize = bsrw_initialize,
+	.finalize = bsrw_finalize,
+	.configure_pid = bsrw_configure_pid,
+	.process = bsrw_process,
+	.update_arg = bsrw_update_arg
+};
+
+const GF_FilterRegister *bsrw_register(GF_FilterSession *session)
+{
+	return &BSRWRegister;
+}

gpac-1.0.0.tar.gz/src/filters/compose.c Added

@@ -0,0 +1,974 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / compositor 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/config_file.h>
+#include <gpac/internal/compositor_dev.h>
+//to set caps in filter session, to cleanup!
+#include "../filter_core/filter_session.h"
+
+
+GF_Err compose_bifs_dec_config_input(GF_Scene *scene, GF_FilterPid *pid, u32 oti, Bool is_remove);
+GF_Err compose_bifs_dec_process(GF_Scene *scene, GF_FilterPid *pid);
+
+GF_Err compose_odf_dec_config_input(GF_Scene *scene, GF_FilterPid *pid, u32 oti, Bool is_remove);
+GF_Err compose_odf_dec_process(GF_Scene *scene, GF_FilterPid *pid);
+
+#define COMPOSITOR_MAGIC	GF_4CC('c','o','m','p')
+//a bit ugly, used by terminal (old APIs)
+GF_Compositor *gf_sc_from_filter(GF_Filter *filter)
+{
+	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
+	if (ctx->magic != COMPOSITOR_MAGIC) return NULL;
+	if (ctx->magic_ptr != ctx) return NULL;
+
+	return ctx;
+}
+
+static GF_Err compose_process(GF_Filter *filter)
+{
+	u32 i, nb_sys_streams_active;
+	s32 ms_until_next = 0;
+	Bool ret;
+	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
+	if (!ctx) return GF_BAD_PARAM;
+
+	if (ctx->check_eos_state == 2)
+		return GF_EOS;
+
+	ctx->last_error = GF_OK;
+	if (ctx->reload_config) {
+		ctx->reload_config = GF_FALSE;
+		gf_sc_reload_config(ctx);
+	}
+
+	nb_sys_streams_active = gf_list_count(ctx->systems_pids);
+	for (i=0; i<nb_sys_streams_active; i++) {
+		GF_FilterPacket *pck;
+		GF_Err e;
+		GF_FilterPid *pid = gf_list_get(ctx->systems_pids, i);
+		GF_ObjectManager *odm = gf_filter_pid_get_udta(pid);
+
+		assert (odm);
+
+		e = GF_OK;
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck && gf_filter_pid_is_eos(pid)) {
+			e = GF_EOS;
+		}
+		if (pck)
+			gf_filter_pid_drop_packet(pid);
+
+
+		if (e==GF_EOS) {
+			gf_list_rem(ctx->systems_pids, i);
+			i--;
+			nb_sys_streams_active--;
+			gf_odm_on_eos(odm, pid);
+		}
+		if (ctx->reload_scene_size) {
+			u32 w, h;
+			gf_sg_get_scene_size_info(ctx->root_scene->graph, &w, &h);
+			if ((ctx->scene_width!=w) || (ctx->scene_height!=h)) {
+				gf_sc_set_scene_size(ctx, w, h, GF_TRUE);
+			}
+		}
+	}
+
+	ret = gf_sc_draw_frame(ctx, GF_FALSE, &ms_until_next);
+
+	if (!ctx->player) {
+		Bool forced_eos = GF_FALSE;
+		/*remember to check for eos*/
+		if (ctx->dur<0) {
+			if (ctx->frame_number >= (u32) -ctx->dur)
+				ctx->check_eos_state = 2;
+		} else if (ctx->dur>0) {
+			Double n = ctx->scene_sampled_clock;
+			n /= 1000;
+			if (n>=ctx->dur)
+				ctx->check_eos_state = 2;
+			else if (!ret && ctx->vfr && !ctx->check_eos_state && !nb_sys_streams_active && ctx->scene_sampled_clock && !ctx->validator_mode) {
+				ctx->check_eos_state = 1;
+				if (!ctx->validator_mode)
+					ctx->force_next_frame_redraw = GF_TRUE;
+			}
+		} else if (!ret && !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) {
+				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;
+			}
+		} else {
+			ctx->last_check_pass = 0;
+		}
+
+		if ((ctx->check_eos_state==2) || (ctx->check_eos_state && gf_sc_check_end_of_scene(ctx, GF_TRUE))) {
+			u32 count;
+			ctx->force_next_frame_redraw = GF_FALSE;
+			count = gf_filter_get_ipid_count(ctx->filter);
+			if (ctx->root_scene) {
+				gf_filter_pid_set_eos(ctx->vout);
+				if (ctx->audio_renderer && ctx->audio_renderer->aout)
+					gf_filter_pid_set_eos(ctx->audio_renderer->aout);
+			}
+			//send stop
+			if (ctx->dur) {
+				for (i=0; i<count; i++) {
+					GF_FilterPid *pid = gf_filter_get_ipid(ctx->filter, i);
+					if (!gf_filter_pid_is_eos(pid)) {
+						GF_FilterEvent evt;
+						GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+						gf_filter_pid_send_event(pid, &evt);
+						GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+						gf_filter_pid_send_event(pid, &evt);
+						//and discard every incoming packet
+						gf_filter_pid_set_discard(pid, GF_TRUE);
+					}
+				}
+			}
+			return forced_eos ? GF_SERVICE_ERROR : GF_EOS;
+		}
+		ctx->check_eos_state = 0;
+		//always repost a process task since we maye have things to draw even though no new input
+		gf_filter_post_process_task(filter);
+		return ctx->last_error;
+	}
+
+
+	//to clean up,depending on whether we use a thread to poll user inputs, etc...
+	if ((u32) ms_until_next > 100)
+		ms_until_next = 100;
+
+	//ask for real-time reschedule
+	gf_filter_ask_rt_reschedule(filter, ms_until_next ? ms_until_next*1000 : 1);
+
+	return ctx->last_error;
+}
+
+static void merge_properties(GF_Compositor *ctx, GF_FilterPid *pid, u32 mtype, GF_Scene *parent_scene)
+{
+	const GF_PropertyValue *p;
+	if (!ctx->vout) return;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+	if (!p) return;
+
+	if (mtype==GF_STREAM_SCENE) {
+		if (!parent_scene || !parent_scene->is_dynamic_scene) {
+			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_URL, p);
+		}
+	} else if (parent_scene && parent_scene->is_dynamic_scene) {
+		if (mtype==GF_STREAM_VISUAL)
+			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_URL, p);
+	}
+}
+
+static GF_Err compose_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_ObjectManager *odm;
+	const GF_PropertyValue *prop;
+	u32 mtype, codecid;
+	u32 i, count;
+	GF_Scene *scene = NULL;
+	GF_Scene *top_scene = NULL;
+	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
+	GF_FilterEvent evt;
+	Bool in_iod = GF_FALSE;
+	Bool was_dyn_scene = GF_FALSE;
+	if (is_remove) {
+		u32 ID=0;
+		odm = gf_filter_pid_get_udta(pid);
+		//already disconnected
+		if (!odm) return GF_OK;
+		ID = odm->ID;
+		scene = odm->parentscene;
+		if (scene && !scene->is_dynamic_scene)
+			scene = NULL;
+		//destroy the object
+		gf_odm_disconnect(odm, 2);
+		if (scene) {
+			if (scene->visual_url.OD_ID == ID) {
+				scene->visual_url.OD_ID = 0;
+				gf_scene_regenerate(scene);
+			} else if (scene->audio_url.OD_ID == ID) {
+				scene->audio_url.OD_ID = 0;
+				gf_scene_regenerate(scene);
+			} else if (scene->text_url.OD_ID == ID) {
+				scene->text_url.OD_ID = 0;
+				gf_scene_regenerate(scene);
+			} else if (scene->dims_url.OD_ID == ID) {
+				scene->dims_url.OD_ID = 0;
+				gf_scene_regenerate(scene);
+			}
+		}
+		return GF_OK;
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop) return GF_NOT_SUPPORTED;
+	mtype = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NOT_SUPPORTED;
+	codecid = prop->value.uint;
+
+	odm = gf_filter_pid_get_udta(pid);
+	if (odm) {
+		if (mtype==GF_STREAM_SCENE) { }
+		else if (mtype==GF_STREAM_OD) { }
+		//change of stream type for a given object, no use case yet
+		else {
+			if (odm->type != mtype)
+				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_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);
+		}
+		merge_properties(ctx, pid, mtype, odm->parentscene);
+		return GF_OK;
+	}
+
+	//create a default scene
+	if (!ctx->root_scene) {
+		const char *service_url = "unknown";
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (p) service_url = p->value.string;
+		
+		ctx->root_scene = gf_scene_new(ctx, NULL);
+		ctx->root_scene->root_od = gf_odm_new();
+		ctx->root_scene->root_od->scene_ns = gf_scene_ns_new(ctx->root_scene, ctx->root_scene->root_od, service_url, NULL);
+		ctx->root_scene->root_od->subscene = ctx->root_scene;
+		ctx->root_scene->root_od->scene_ns->nb_odm_users++;
+		switch (mtype) {
+		case GF_STREAM_SCENE:
+		case GF_STREAM_PRIVATE_SCENE:
+		case GF_STREAM_OD:
+			ctx->root_scene->is_dynamic_scene = GF_FALSE;
+			break;
+		default:
+			ctx->root_scene->is_dynamic_scene = GF_TRUE;
+			break;
+		}
+
+		if (!ctx->player)
+			gf_filter_post_process_task(filter);
+	}
+
+	//default scene is root one
+	scene = ctx->root_scene;
+	top_scene = ctx->root_scene;
+
+	//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;
+			}
+			continue;
+		}
+		assert(sns->owner);
+		if (gf_filter_pid_is_filter_in_parents(pid, sns->source_filter)) {
+			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++) {
+					GF_MediaObject *mo = gf_list_get(sns->owner->parentscene->scene_objects, j);
+					if (mo->OD_ID == GF_MEDIA_EXTERNAL_ID) continue;
+					if (mo->OD_ID != sns->owner->ID) continue;
+
+					if (mo->type != GF_MEDIA_OBJECT_SCENE) continue;
+					//this is a pid from a subservice (inline) inserted through OD commands, create the subscene
+					sns->owner->subscene = gf_scene_new(NULL, sns->owner->parentscene);
+					sns->owner->subscene->root_od = sns->owner;
+					//scenes are by default dynamic
+					sns->owner->subscene->is_dynamic_scene = GF_TRUE;
+					sns->owner->mo = mo;
+					mo->odm = sns->owner;
+					break;
+				}
+			}
+			//we are attaching an inline, create the subscene if not done already
+			if (!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
+				if (sns->owner->ignore_sys) {
+					GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+					gf_filter_pid_send_event(pid, &evt);
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+					gf_filter_pid_send_event(pid, &evt);
+					return GF_OK;
+				}
+
+				assert(sns->owner->parentscene);
+				sns->owner->subscene = gf_scene_new(ctx, sns->owner->parentscene);
+				sns->owner->subscene->root_od = sns->owner;
+			}
+			scene = sns->owner->subscene ? sns->owner->subscene : sns->owner->parentscene;
+			break;
+		}
+	}
+	assert(scene);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Configuring PID %s\n", gf_stream_type_name(mtype)));
+
+	was_dyn_scene = scene->is_dynamic_scene;
+
+	//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;
+	}
+
+	//pure OCR streams are handled by dispatching OCR on the PID(s)
+	if (codecid != GF_CODECID_RAW)
+		return GF_NOT_SUPPORTED;
+
+	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;
+	}
+	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
+	//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)) {
+		GF_SceneNamespace *new_sns=NULL;
+		const char *service_url = "unknown";
+		const GF_PropertyValue *p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (p) service_url = p->value.string;
+		new_sns = gf_scene_ns_new(ctx->root_scene, ctx->root_scene->root_od, service_url, NULL);
+
+		for (i=0; i<gf_list_count(scene->resources); i++) {
+			GF_ObjectManager *anodm = gf_list_get(scene->resources, i);
+
+			if (new_sns && (anodm->scene_ns == scene->root_od->scene_ns) && (scene->root_od->scene_ns->owner==scene->root_od)) {
+				scene->root_od->scene_ns->owner = anodm;
+				break;
+			}
+		}
+		scene->root_od->scene_ns = new_sns;
+		gf_sc_set_scene(ctx, NULL);
+		gf_sg_reset(scene->graph);
+		gf_sc_set_scene(ctx, scene->graph);
+		ctx->reload_scene_size = GF_TRUE;
+	}
+
+	//setup object (clock) and playback requests
+	gf_scene_insert_pid(scene, scene->root_od->scene_ns, pid, in_iod);
+
+	if (was_dyn_scene != scene->is_dynamic_scene) {
+		for (i=0; i<gf_list_count(scene->resources); i++) {
+			GF_ObjectManager *anodm = gf_list_get(scene->resources, i);
+			if (anodm->mo)
+				anodm->flags |= GF_ODM_PASSTHROUGH;
+		}
+	}
+
+
+	//attach scene to input filters - may be true for dynamic scene (text rendering) and regular scenes
+	if ((mtype==GF_STREAM_OD) || (mtype==GF_STREAM_SCENE) || (mtype==GF_STREAM_TEXT) ) {
+		void gf_filter_pid_exec_event(GF_FilterPid *pid, GF_FilterEvent *evt);
+
+		GF_FEVT_INIT(evt, GF_FEVT_ATTACH_SCENE, pid);
+		evt.attach_scene.object_manager = gf_filter_pid_get_udta(pid);
+		gf_filter_pid_exec_event(pid, &evt);
+	}
+	//scene is dynamic
+	if (scene->is_dynamic_scene) {
+		Bool reset = GF_FALSE;
+		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;
+		}
+		if (reset)
+			gf_sg_reset(scene->graph);
+
+		gf_scene_regenerate(scene);
+	}
+
+	merge_properties(ctx, pid, mtype, scene);
+	return GF_OK;
+}
+
+#include "../compositor/visual_manager.h"
+
+static GF_Err compose_reconfig_output(GF_Filter *filter, GF_FilterPid *pid)
+{
+	const GF_PropertyValue *p;
+	u32 sr, o_fmt, nb_ch, afmt;
+	u64 cfg;
+	Bool needs_reconfigure = GF_FALSE;
+	GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
+
+	if (ctx->vout == pid) {
+		u32 w, h;
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_PIXFMT);
+		if (p) {
+			u32 stride;
+#ifndef GPAC_DISABLE_3D
+			if (ctx->scene && (ctx->hybrid_opengl || ctx->visual->type_3d)) {
+				switch (p->value.uint) {
+				case GF_PIXEL_RGBA:
+				case GF_PIXEL_RGB:
+					break;
+				default:
+					return GF_NOT_SUPPORTED;
+				}
+			}
+#endif
+			ctx->opfmt = p->value.uint;
+			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->opfmt) );
+			gf_pixel_get_size_info(ctx->opfmt, ctx->display_width, ctx->display_height, NULL, &stride, NULL, NULL, NULL);
+			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_STRIDE, &PROP_UINT(stride) );
+		}
+		
+		w = h = 0;
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_WIDTH);
+		if (p) w = p->value.uint;
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_HEIGHT);
+		if (p) h = p->value.uint;
+
+		if (w && h) {
+			ctx->osize.x = w;
+			ctx->osize.y = h;
+/*			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_WIDTH, &PROP_UINT(w) );
+			gf_filter_pid_set_property(ctx->vout, GF_PROP_PID_HEIGHT, &PROP_UINT(h) );
+*/		}
+		return GF_OK;
+	}
+
+	if (ctx->audio_renderer->aout == pid) {
+
+		gf_mixer_get_config(ctx->audio_renderer->mixer, &sr, &nb_ch, &o_fmt, &cfg);
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (p && (p->value.uint != sr)) {
+			sr = p->value.uint;
+			needs_reconfigure = GF_TRUE;
+		}
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_NUM_CHANNELS);
+		if (p && (p->value.uint != nb_ch)) {
+			nb_ch = p->value.uint;
+			needs_reconfigure = GF_TRUE;
+		}
+		p = gf_filter_pid_caps_query(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (p) afmt = p->value.uint;
+		else afmt = GF_AUDIO_FMT_S16;
+
+		if (o_fmt != afmt) {
+			needs_reconfigure = GF_TRUE;
+		}
+		if (!needs_reconfigure) return GF_OK;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Compositor] Audio output caps negotiated to %d Hz %d channels %s \n", sr, nb_ch, gf_audio_fmt_name(afmt) ));
+		gf_mixer_set_config(ctx->audio_renderer->mixer, sr, nb_ch, afmt, 0);
+		ctx->audio_renderer->need_reconfig = GF_TRUE;
+		return GF_OK;
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+static Bool compose_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	switch (evt->base.type) {
+	//event(s) we trigger on ourselves to go up the filter chain
+	case GF_FEVT_CAPS_CHANGE:
+		return GF_FALSE;
+	case GF_FEVT_CONNECT_FAIL:
+	{
+		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;
+	}
+		return GF_FALSE;
+	case GF_FEVT_BUFFER_REQ:
+		return GF_TRUE;
+		
+	case GF_FEVT_INFO_UPDATE:
+	{
+		u32 bps=0;
+		u64 tot_size=0, down_size=0;
+		GF_ObjectManager *odm = gf_filter_pid_get_udta(evt->base.on_pid);
+		GF_PropertyEntry *pe=NULL;
+		GF_PropertyValue *p = (GF_PropertyValue *) gf_filter_pid_get_info(evt->base.on_pid, GF_PROP_PID_TIMESHIFT_STATE, &pe);
+		if (p && p->value.uint) {
+			GF_Event an_evt;
+			memset(&an_evt, 0, sizeof(GF_Event));
+			GF_Compositor *ctx = (GF_Compositor *) gf_filter_get_udta(filter);
+			if (p->value.uint==1) {
+				an_evt.type = GF_EVENT_TIMESHIFT_UNDERRUN;
+				gf_sc_send_event(ctx, &an_evt);
+			} else if (p->value.uint==2) {
+				an_evt.type = GF_EVENT_TIMESHIFT_OVERFLOW;
+				gf_sc_send_event(ctx, &an_evt);
+			}
+			p->value.uint = 0;
+		}
+
+		p = (GF_PropertyValue *) gf_filter_pid_get_info(evt->base.on_pid, GF_PROP_PID_DOWN_RATE, &pe);
+		if (p) bps = p->value.uint;
+		p = (GF_PropertyValue *) gf_filter_pid_get_info(evt->base.on_pid, GF_PROP_PID_DOWN_SIZE, &pe);
+		if (p) tot_size = p->value.longuint;
+
+		p = (GF_PropertyValue *) gf_filter_pid_get_info(evt->base.on_pid, GF_PROP_PID_DOWN_BYTES, &pe);
+		if (p) down_size = p->value.longuint;
+
+		if (bps && down_size && tot_size)  {
+			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_filter_release_property(pe);
+		gf_odm_check_clock_mediatime(odm);
+	}
+		return GF_TRUE;
+
+	default:
+		break;
+	}
+	//all events cancelled (play/stop/etc...)
+	return GF_TRUE;
+}
+
+static GF_Err compose_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	GF_Compositor *compositor = gf_filter_get_udta(filter);
+	compositor->reload_config = GF_TRUE;
+	return GF_OK;
+}
+
+static void compose_finalize(GF_Filter *filter)
+{
+	GF_Compositor *ctx = gf_filter_get_udta(filter);
+
+	if (ctx) {
+		gf_sc_set_scene(ctx, NULL);
+		if (ctx->root_scene) {
+			gf_odm_disconnect(ctx->root_scene->root_od, GF_TRUE);
+		}
+		gf_sc_unload(ctx);
+	}
+}
+void compositor_setup_aout(GF_Compositor *ctx)
+{
+	if (! (ctx->init_flags & GF_TERM_NO_AUDIO) && ctx->audio_renderer && !ctx->audio_renderer->aout) {
+		GF_FilterPid *pid = ctx->audio_renderer->aout = gf_filter_pid_new(ctx->filter);
+		gf_filter_pid_set_udta(pid, ctx);
+		gf_filter_pid_set_name(pid, "aout");
+		gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(44100) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(44100) );
+		gf_filter_pid_set_property(pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(2) );
+		gf_filter_pid_set_max_buffer(ctx->audio_renderer->aout, 1000*ctx->abuf);
+		gf_filter_pid_set_loose_connect(pid);
+	}
+}
+
+static GF_Err compose_initialize(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_FilterSessionCaps sess_caps;
+	GF_FilterPid *pid;
+	GF_Compositor *ctx = gf_filter_get_udta(filter);
+
+	ctx->magic = COMPOSITOR_MAGIC;
+	ctx->magic_ptr = (void *) ctx;
+	ctx->filter = filter;
+
+	if (gf_filter_is_dynamic(filter)) {
+		ctx->dyn_filter_mode = GF_TRUE;
+		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;
+
+    if (ctx->player) {
+		if (ctx->ogl == GF_SC_GLMODE_AUTO)
+			ctx->ogl = GF_SC_GLMODE_HYBRID;
+
+		//we operate video output directly and dispatch audio output, we need to disable blocking mode
+		//otherwise we will only get called when audio output is not blocking, and we will likely missed video frames
+		gf_filter_prevent_blocking(filter, GF_TRUE);
+	}
+
+    e = gf_sc_load(ctx);
+	if (e) return e;
+
+	gf_filter_get_session_caps(filter, &sess_caps);
+
+	sess_caps.max_screen_width = ctx->video_out->max_screen_width;
+	sess_caps.max_screen_height = ctx->video_out->max_screen_height;
+	sess_caps.max_screen_bpp = ctx->video_out->max_screen_bpp;
+
+	gf_filter_set_session_caps(filter, &sess_caps);
+
+	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;
+			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) ));
+			}
+//			else {
+//				gf_filter_reconnect_output(filter);
+//			}
+		}
+		compositor_setup_aout(ctx);
+	}
+	
+	//declare video output pid
+	pid = ctx->vout = gf_filter_pid_new(filter);
+	gf_filter_pid_set_name(pid, "vout");
+	//compositor initiated for RT playback, vout pid may not be connected
+	if (! (ctx->init_flags & GF_TERM_NO_DEF_AUDIO_OUT))
+		gf_filter_pid_set_loose_connect(pid);
+
+	gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL) );
+	if (ctx->timescale)
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	else
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num) );
+
+	gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->opfmt ? ctx->opfmt : GF_PIXEL_RGB) );
+	gf_filter_pid_set_property(pid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->output_width) );
+	gf_filter_pid_set_property(pid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->output_height) );
+
+	gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC(ctx->fps) );
+
+	//for coverage
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		compose_update_arg(filter, NULL, NULL);
+	}
+#endif
+
+	//always request a process task since we don't depend on input packets arrival (animations, pure scene presentations)
+	gf_filter_post_process_task(filter);
+
+	if (ctx->player==2) {
+		const char *gui_path = gf_opts_get_key("General", "StartupFile");
+		if (gui_path)
+			gf_sc_connect_from_time_ex(ctx, gui_path, 0, 0, 0, NULL);
+	}
+	return GF_OK;
+}
+
+#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 / 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(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"\
+		"", 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(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(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(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"\
+	 "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(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, "100", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ 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(buf), "playout buffer in ms. Overriden by BufferLenth property of input pid", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(rbuf), "rebuffer trigger in ms. Overriden 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). Overriden by BufferMaxOccupancy property of input pid", GF_PROP_UINT, "3000", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(ntpsync), "ntp resync threshold (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},
+
+#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."\
+				, 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)"\
+	"", 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"\
+	"- 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"\
+		"", 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"\
+    "- 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"
+	"- face: one normal per face drawn\n"
+	"- vertex: one normal per vertex drawn"
+	"", GF_PROP_UINT, "none", "none|face|vertex", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(rext), "use non power of two (rectangular) texture GL extension", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(cull), "use aabb culling: large objects are rendered in multiple calls when not fully in viewport", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(depth_gl_scale), "set depth scaler", GF_PROP_FLOAT, "100", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(depth_gl_type), "set geometry type used to draw depth video\n"
+	"- none: no geometric conversion\n"
+	"- point: compute point cloud from pixel+depth\n"
+	"- 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"\
+		"- 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"
+		"- none: no frame packing\n"
+		"- top: top bottom frame packing\n"
+		"- side: side by side packing"
+	"", GF_PROP_UINT, "none", "none|top|side", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(camlay), "camera layout in multiview modes\n"
+		"- straight: camera is moved along a straight line, no rotation\n"
+		"- offaxis: off-axis projection is used\n"
+		"- 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(rview), "reverse view order", 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(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 },
+	{ OFFS(fragshader), "path to fragment shader file", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_EXPERT },
+#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(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
+	{ OFFS(focdist), "distance of focus point", GF_PROP_FLOAT, "0", NULL, GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+#endif
+#endif
+
+#ifdef GF_SR_USE_VIDEO_CACHE
+	{ OFFS(vcsize), "visual cache size when storing raster graphics to memory", GF_PROP_UINT, "0", "0,+I", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(vcscale), "visual cache scale factor in percent when storing raster graphics to memory", GF_PROP_UINT, "100", "0,100", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(vctol), "visual cache tolerance when storing raster graphics to memory. If the difference between the stored version scale and the target display scale is less than tolerance, the cache will be used, otherwise it will be recomputed", GF_PROP_UINT, "30", "0,100", GF_FS_ARG_UPDATE|GF_FS_ARG_HINT_EXPERT},
+#endif
+	{ 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"
+	"- 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"\
+			, GF_PROP_UINT, "auto", "no|yes|auto", GF_FS_ARG_HINT_EXPERT},
+	{0}
+};
+
+static const GF_FilterCapability CompositorCaps[] =
+{
+	/*first cap bundle for explicitly loaded compositor: accepts audio and video as well as scene/od*/
+	CAP_UINT(GF_CAPS_INPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_INPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT|GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	/*second cap bundle for dynmac loaded compositor: only accepts text/scene/od*/
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
+const GF_FilterRegister CompositorFilterRegister = {
+	.name = "compositor",
+	GF_FS_SET_DESCRIPTION("Compositor")
+	GF_FS_SET_HELP("The GPAC compositor allows mixing audio, video, text and graphics in a timed fashion.\n"
+	"The compositor operates either in media-client or filter-only mode.\n"
+	"\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 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"
+	"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"
+	"\n"
+	"The default output pixel format in filter mode is:\n"
+	"- `rgb` when the filter is explictly 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"
+	"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"\
+	"\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."
+	"\n"
+	)
+	.private_size = sizeof(GF_Compositor),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.max_extra_pids = (u32) -1,
+	SETCAPS(CompositorCaps),
+	.args = CompositorArgs,
+	.initialize = compose_initialize,
+	.finalize = compose_finalize,
+	.process = compose_process,
+	.process_event = compose_process_event,
+	.configure_pid = compose_configure_pid,
+	.reconfigure_output = compose_reconfig_output,
+	.update_arg = compose_update_arg
+};
+
+const GF_FilterRegister *compose_filter_register(GF_FilterSession *session)
+{
+	u32 i=0;
+	u32 nb_args = sizeof(CompositorArgs) / sizeof(GF_FilterArgs) - 1;
+
+	for (i=0; i<nb_args; i++) {
+		if (!strcmp(CompositorArgs[i].arg_name, "afmt")) {
+			CompositorArgs[i].min_max_enum = gf_audio_fmt_all_names();
+		}
+		else if (!strcmp(CompositorArgs[i].arg_name, "opfmt")) {
+			CompositorArgs[i].min_max_enum =  gf_pixel_fmt_all_names();
+		}
+	}
+	return &CompositorFilterRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/dasher.c Added

@@ -0,0 +1,6704 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-DASH/HLS segmenter
+ *
+ *  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/iso639.h>
+#include <gpac/mpd.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/base_coding.h>
+
+#define DEFAULT_PERIOD_ID	 "_gf_dash_def_period"
+
+typedef struct
+{
+	GF_List *streams;
+
+	//period element we will fill
+	GF_MPD_Period *period;
+} GF_DasherPeriod;
+
+enum
+{
+	DASHER_BS_SWITCH_DEF=0,
+	DASHER_BS_SWITCH_OFF,
+	DASHER_BS_SWITCH_ON,
+	DASHER_BS_SWITCH_INBAND,
+	DASHER_BS_SWITCH_FORCE,
+	DASHER_BS_SWITCH_MULTI,
+};
+
+enum
+{
+	DASHER_NTP_REM=0,
+	DASHER_NTP_YES,
+	DASHER_NTP_KEEP,
+};
+
+enum
+{
+	DASHER_SAP_OFF=0,
+	DASHER_SAP_SIG,
+	DASHER_SAP_ON,
+};
+
+enum
+{
+	DASHER_BOUNDS_OUT=0,
+	DASHER_BOUNDS_CLOSEST,
+	DASHER_BOUNDS_IN,
+};
+
+enum
+{
+	DASHER_MUX_ISOM=0,
+	DASHER_MUX_TS,
+	DASHER_MUX_MKV,
+	DASHER_MUX_WEBM,
+	DASHER_MUX_OGG,
+	DASHER_MUX_RAW,
+	DASHER_MUX_AUTO,
+};
+
+typedef struct
+{
+	u32 bs_switch, profile, cp, ntp;
+	s32 subs_sidx;
+	s32 buf, timescale;
+	Bool forcep, sfile, sseg, no_sar, mix_codecs, stl, tpl, align, sap, no_frag_def, sidx, split, hlsc, strict_cues;
+	u32 strict_sap;
+	u32 pssh;
+	Double segdur;
+	u32 dmode;
+	char *avcp;
+	char *hvcp;
+	char *aacp;
+	char *av1p;
+	char *vpxp;
+	char *template;
+	char *segext;
+	char *initext;
+	u32 muxtype;
+	char *profX;
+	Double asto;
+	char *ast;
+	char *state;
+	char *cues;
+	char *title, *source, *info, *cprt, *lang;
+	GF_List *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;
+	char *styp;
+	Bool sigfrag;
+	u32 sbound;
+
+
+	//internal
+	Bool in_error;
+
+	//Manifest output pid
+	GF_FilterPid *opid;
+
+	GF_FilterPid *opid_alt;
+	GF_Filter *alt_dst;
+	Bool opid_alt_m3u8;
+
+	GF_MPD *mpd;
+
+	Double period_start;
+	GF_DasherPeriod *current_period, *next_period;
+	GF_List *pids;
+	Bool template_use_source;
+
+	Bool use_xlink, use_cenc, check_main_role;
+
+	//options for muxers, constrained by profile
+	Bool no_fragments_defaults;
+
+	Bool is_eos;
+	u32 nb_seg_url_pending;
+	u64 last_evt_check_time;
+	Bool on_demand_done;
+	Bool subdur_done;
+	char *out_path;
+
+	GF_Err setup_failure;
+
+	Double nb_secs_to_discard;
+	Bool first_context_load, store_init_params;
+	Bool do_m3u8, do_mpd;
+
+	Bool store_seg_states;
+
+	GF_List *postponed_pids;
+	u32 last_dyn_period_id;
+	u32 next_pid_id_in_period;
+	Bool post_play_events;
+
+	Bool force_period_switch;
+	Bool streams_not_ready;
+
+	//-1 forces report update, otherwise this is a packet count
+	s32 update_report;
+
+	Bool purge_segments;
+
+	Bool is_playing;
+} GF_DasherCtx;
+
+typedef enum
+{
+	DASHER_HDR_NONE=0,
+	DASHER_HDR_PQ10,
+	DASHER_HDR_HLG,
+} DasherHDRType;
+
+typedef struct _dash_stream
+{
+	GF_FilterPid *ipid, *opid;
+
+	//stream properties
+	u32 codec_id, timescale, stream_type, dsi_crc, dsi_enh_crc, id, dep_id, src_id;
+	GF_Fraction sar, fps;
+	u32 width, height;
+	u32 sr, nb_ch;
+	const char *lang;
+	Bool interlaced;
+	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;
+	u32 nb_surround, nb_lfe;
+	u64 ch_layout;
+	GF_PropVec4i srd;
+	DasherHDRType hdr_type;
+	Bool sscale;
+
+	//TODO: get the values for all below
+	u32 view_id;
+	//end of TODO
+
+
+	u32 bitrate;
+	GF_DasherPeriod *period;
+
+	Double dash_dur;
+
+	char *period_id;
+	Double period_start;
+	Double period_dur;
+	//0: not done, 1: eos/abort, 2: subdur exceeded
+	u32 done;
+	Bool seg_done;
+
+	u32 nb_comp, nb_comp_done;
+
+	u32 nb_rep, nb_rep_done;
+	Double set_seg_duration;
+
+	//repID for this stream, generated if not found
+	char *rep_id;
+	//AS ID for this stream, may be 0
+	u32 as_id;
+	struct _dash_stream *muxed_base;
+	GF_List *complementary_streams;
+	GF_List *comp_pids;
+
+	//the one and only representation element
+	GF_MPD_Representation *rep;
+	//the parent adaptation set
+	GF_MPD_AdaptationSet *set;
+	Bool owns_set;
+	//set to true to use inband params
+	Bool inband_params;
+	GF_List *multi_pids;
+	GF_List *multi_tracks;
+	//in case we share the same init segment, we MUST use the same timescale
+	u32 force_timescale;
+
+
+	u32 startNumber, seg_number;
+	Bool rep_init;
+	u64 first_cts;
+	u64 first_dts;
+	s32 pts_minus_cts;
+	Bool is_encrypted;
+
+	//target MPD timescale
+	u32 mpd_timescale;
+	//segment start time in target MPD timescale
+	u64 seg_start_time;
+	Bool split_set_names;
+	u64 max_period_dur;
+
+	GF_Filter *dst_filter;
+
+	const char *src_url;
+
+	char *init_seg, *seg_template, *idx_template;
+	u32 nb_sap_3, nb_sap_4;
+	//ID of output pid (renumbered), used for content component and making sure output muxers use the same IDs
+	u32 pid_id;
+	//dependency ID of output pid (renumbered)
+	u32 dep_pid_id;
+	u32 nb_samples_in_source;
+	Bool has_sync_points;
+	//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
+	GF_List *pending_segment_states;
+	//next segment start time in this stream timescale (NOT MPD timescale)
+	u64 next_seg_start;
+	//adjusted next segment start time in this stream timescale (NOT MPD timescale)
+	//the value is the same as next_seg_start until the end of segment is found (SAP)
+	//in which case it is adjusted to the SAP time
+	u64 adjusted_next_seg_start;
+
+	//force representation time end in this stream timescale (NOT MPD timescale)
+	u64 force_rep_end;
+
+	Bool segment_started;
+	u64 first_cts_in_seg;
+	u64 first_cts_in_next_seg;
+	//used for last segment computation of segmentTimeline
+	u64 est_first_cts_in_next_seg;
+	u64 last_cts, last_dts;
+	u64 cumulated_dur;
+	Double cumulated_subdur;
+	Bool subdur_done;
+	u64 nb_pck;
+	u64 est_next_dts;
+	u64 seek_to_pck;
+	u64 ts_offset;
+	u32 nb_repeat;
+
+	Bool splitable;
+	u32 loop_state;
+	u32 split_dur_next;
+
+	u32 moof_sn_inc, moof_sn;
+	Double clamped_dur;
+
+	u32 nb_segments_purged;
+	Double dur_purged;
+	Bool tile_base;
+
+	u32 cues_timescale;
+	u32 nb_cues;
+	GF_DASHCueInfo *cues;
+	Bool cues_use_edits;
+
+	Bool clamp_done;
+	Bool dcd_not_ready;
+
+	Bool reschedule;
+
+	GF_Fraction64 duration;
+	GF_List *packet_queue;
+	u32 nb_sap_in_queue;
+} GF_DashStream;
+
+static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds);
+static void dasher_update_rep(GF_DasherCtx *ctx, GF_DashStream *ds);
+
+
+static GF_DasherPeriod *dasher_new_period()
+{
+	GF_DasherPeriod *period;
+	GF_SAFEALLOC(period, GF_DasherPeriod);
+	if (period)
+		period->streams = gf_list_new();
+	return period;
+}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static GF_Err dasher_get_audio_info_with_m4a_sbr_ps(GF_DashStream *ds, const GF_PropertyValue *dsi, u32 *SampleRate, u32 *Channels)
+{
+	GF_M4ADecSpecInfo a_cfg;
+	GF_Err e;
+	if (SampleRate) *SampleRate = ds->sr;
+	if (Channels) *Channels = ds->nb_ch;
+
+	if (!dsi) {
+		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);
+	if (e) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] corrupted AAC Config, %s\n", gf_error_to_string(e)));
+		return GF_NOT_SUPPORTED;
+	}
+	if (SampleRate && a_cfg.has_sbr) {
+		*SampleRate = a_cfg.sbr_sr;
+	}
+	if (Channels) *Channels = a_cfg.nb_chan;
+	return e;
+}
+#endif
+
+
+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_DashStream *ds;
+	u32 prev_stream_type;
+	const char *cue_file=NULL;
+	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		return GF_OK;
+	}
+
+	if (!ctx->opid) {
+		u32 i, nb_opids = ctx->dual ? 2 : 1;
+		for (i=0; i < nb_opids; i++) {
+			char *segext=NULL;
+			char *force_ext=NULL;
+			GF_FilterPid *opid;
+			if (i==0) {
+				ctx->opid = gf_filter_pid_new(filter);
+				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;
+					char *mpath = ctx->out_path;
+					u32 len;
+					if (!strncmp(mpath, "gfio://", 7)) {
+						gfio = gf_fileio_from_url(mpath);
+						if (!gfio) return GF_BAD_PARAM;
+						//only use basename as we will create the new resource through factory
+						mpath = (char *) gf_file_basename(gf_fileio_resource_url(gfio));
+						if (!mpath) return GF_OUT_OF_MEM;
+					}
+
+					len = (u32) strlen(mpath);
+					char *out_path = gf_malloc(len+10);
+					if (!out_path) return GF_OUT_OF_MEM;
+					memcpy(out_path, mpath, len);
+					out_path[len]=0;
+					char *sep = gf_file_ext_start(out_path);
+					if (sep) sep[0] = 0;
+					if (ctx->do_m3u8) {
+						strcat(out_path, ".mpd");
+						force_ext = "mpd";
+					} else {
+						ctx->opid_alt_m3u8 = GF_TRUE;
+						ctx->do_m3u8 = GF_TRUE;
+						strcat(out_path, ".m3u8");
+						force_ext = "m3u8";
+					}
+					if (gfio) {
+						const char *rel = gf_fileio_factory(gfio, out_path);
+						gf_free(out_path);
+						out_path = gf_strdup(rel);
+						if (!out_path) return GF_OUT_OF_MEM;
+					}
+
+					ctx->alt_dst = gf_filter_connect_destination(filter, out_path, &e);
+					if (e) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't create secondary manifest output %s: %s\n", out_path, gf_error_to_string(e) ));
+						gf_free(out_path);
+						break;
+					}
+					gf_free(out_path);
+
+					//reset any sourceID given in the dst_arg and assign sourceID to be the dasher filter
+					gf_filter_reset_source(ctx->alt_dst);
+					snprintf(szSRC, 100, "MuxSrc%cdasher_%p", gf_filter_get_sep(filter, GF_FS_SEP_NAME), ctx->alt_dst);
+					gf_filter_set_source(ctx->alt_dst, filter, szSRC);
+
+					ctx->opid_alt = gf_filter_pid_new(filter);
+					gf_filter_pid_set_name(ctx->opid_alt, "MANIFEST_ALT");
+
+					snprintf(szSRC, 100, "dasher_%p", ctx->alt_dst);
+					gf_filter_pid_set_property(ctx->opid_alt, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
+					//we also need to set the property on main output just to avoid the connection
+					snprintf(szSRC, 100, "dasher_%p", ctx);
+					gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MUX_SRC, &PROP_STRING(szSRC) );
+				}
+				opid = ctx->opid_alt;
+			}
+			if (!opid)
+				continue;
+
+			//copy properties at init or reconfig
+			gf_filter_pid_copy_properties(opid, pid);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, NULL);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+			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) );
+
+			if (!ctx->out_path)
+				ctx->out_path = gf_filter_pid_get_destination(ctx->opid);
+
+			p = gf_filter_pid_caps_query(pid, GF_PROP_PID_FILE_EXT);
+			if (p) {
+				gf_filter_pid_set_property(opid, GF_PROP_PID_FILE_EXT, p );
+				segext = p->value.string;
+			} else {
+				segext = NULL;
+				if (ctx->out_path) {
+					segext = gf_file_ext_start(ctx->out_path);
+				}
+				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")) {
+				ctx->do_m3u8 = GF_TRUE;
+				gf_filter_pid_set_name(opid, "manifest_m3u8" );
+			} else {
+				ctx->do_mpd = GF_TRUE;
+				gf_filter_pid_set_name(opid, "manifest_mpd" );
+			}
+		}
+
+		ctx->store_seg_states = GF_FALSE;
+		//in m3u8 mode, always store all seg states. In MPD only if state, not ondemand
+		if (((ctx->state || ctx->purge_segments) && !ctx->sseg) || ctx->do_m3u8) ctx->store_seg_states = GF_TRUE;
+	}
+
+	ds = gf_filter_pid_get_udta(pid);
+	if (!ds) {
+		GF_SAFEALLOC(ds, GF_DashStream);
+		if (!ds) return GF_OUT_OF_MEM;
+		ds->ipid = pid;
+		gf_list_add(ctx->pids, ds);
+		ds->complementary_streams = gf_list_new();
+		period_switch = GF_TRUE;
+		gf_filter_pid_set_udta(pid, ds);
+		if (ctx->sbound!=DASHER_BOUNDS_OUT)
+			ds->packet_queue = gf_list_new();
+
+		/*initial connection and we already have sent play event, send a PLAY on this new PID
+		TODO: we need to send STOP/PLAY depending on period
+		*/
+		if (ctx->is_playing) {
+			GF_FilterEvent evt;
+			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
+	}
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+#define CHECK_PROP(_type, _mem, _e) \
+	p = gf_filter_pid_get_property(pid, _type); \
+	if (!p && (_e<=0) ) return _e; \
+	if (p && (p->value.uint != _mem) && _mem) period_switch = GF_TRUE; \
+	if (p) _mem = p->value.uint; \
+
+#define CHECK_PROPL(_type, _mem, _e) \
+	p = gf_filter_pid_get_property(pid, _type); \
+	if (!p && (_e<=0) ) return _e; \
+	if (p && (p->value.longuint != _mem) && _mem) period_switch = GF_TRUE; \
+	if (p) _mem = p->value.longuint; \
+
+#define CHECK_PROP_BOOL(_type, _mem, _e) \
+	p = gf_filter_pid_get_property(pid, _type); \
+	if (!p && (_e<=0) ) return _e; \
+	if (p && (p->value.boolean != _mem) && _mem) period_switch = GF_TRUE; \
+	if (p) _mem = p->value.uint; \
+
+#define CHECK_PROP_FRAC(_type, _mem, _e) \
+	p = gf_filter_pid_get_property(pid, _type); \
+	if (!p && (_e<=0) ) return _e; \
+	if (p && (p->value.frac.num * _mem.den != p->value.frac.den * _mem.num) && _mem.den && _mem.num) period_switch = GF_TRUE; \
+	if (p) _mem = p->value.frac; \
+
+#define CHECK_PROP_FRAC64(_type, _mem, _e) \
+	p = gf_filter_pid_get_property(pid, _type); \
+	if (!p && (_e<=0) ) return _e; \
+	if (p && (p->value.lfrac.num * _mem.den != p->value.lfrac.den * _mem.num) && _mem.den && _mem.num) period_switch = GF_TRUE; \
+	if (p) _mem = p->value.lfrac; \
+
+
+#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; \
+
+#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; \
+	_mem = p; \
+
+
+	prev_stream_type = ds->stream_type;
+	CHECK_PROP(GF_PROP_PID_STREAM_TYPE, ds->stream_type, GF_NOT_SUPPORTED)
+
+	ds->tile_base = GF_FALSE;
+
+	if (ds->stream_type != GF_STREAM_FILE) {
+		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;
+		}
+		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->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)
+			//don't return if not defined
+			CHECK_PROP_FRAC(GF_PROP_PID_SAR, ds->sar, GF_EOS)
+			if (!ds->sar.num) ds->sar.num = ds->sar.den = 1;
+			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;
+			if (p) {
+				ds->srd.x = p->value.vec2i.x;
+				ds->srd.y = p->value.vec2i.y;
+				ds->srd.z = ds->width;
+				ds->srd.w = ds->height;
+			} else {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
+				if (p) {
+					ds->srd.x = ds->srd.y = 0;
+					ds->srd.z = ds->width;
+					ds->srd.w = ds->height;
+					ds->tile_base = GF_TRUE;
+				}
+			}
+		} else if (ds->stream_type==GF_STREAM_AUDIO) {
+			CHECK_PROP(GF_PROP_PID_SAMPLE_RATE, ds->sr, GF_EOS)
+			CHECK_PROP(GF_PROP_PID_NUM_CHANNELS, ds->nb_ch, GF_EOS)
+			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)
+		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)
+
+		if (ctx->scope_deps) {
+			const char *src_args = gf_filter_pid_orig_src_args(pid);
+			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);
+		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 (((dc_crc != ds->dsi_crc) && ds->dsi_crc)
+			|| ((dc_enh_crc != ds->dsi_enh_crc) && ds->dsi_enh_crc)
+		) {
+			//check which codecs can support inband param sets
+			switch (ds->codec_id) {
+			case GF_CODECID_AVC:
+			case GF_CODECID_SVC:
+			case GF_CODECID_MVC:
+			case GF_CODECID_HEVC:
+			case GF_CODECID_LHVC:
+				if (!ctx->bs_switch)
+					period_switch = GF_TRUE;
+				break;
+			default:
+				period_switch = GF_TRUE;
+				break;
+			}
+		}
+		//check if input is ready
+		if (!dc_crc && !dc_enh_crc) {
+			switch (ds->codec_id) {
+			case GF_CODECID_AVC:
+			case GF_CODECID_SVC:
+			case GF_CODECID_MVC:
+			case GF_CODECID_HEVC:
+			case GF_CODECID_LHVC:
+			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_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;
+				break;
+			default:
+				break;
+			}
+		}
+		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)
+		CHECK_PROP_PROP(GF_PROP_PID_AS_COND_DESC, ds->p_as_desc, GF_EOS)
+		CHECK_PROP_PROP(GF_PROP_PID_AS_ANY_DESC, ds->p_as_any_desc, GF_EOS)
+		CHECK_PROP_PROP(GF_PROP_PID_REP_DESC, ds->p_rep_desc, GF_EOS)
+		CHECK_PROP_PROP(GF_PROP_PID_BASE_URL, ds->p_base_url, GF_EOS)
+		CHECK_PROP_PROP(GF_PROP_PID_ROLE, ds->p_role, GF_EOS)
+		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)
+
+		ds->startNumber = 1;
+		CHECK_PROP(GF_PROP_PID_START_NUMBER, ds->startNumber, GF_EOS)
+		ds->dash_dur = ctx->segdur;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_DUR);
+		if (p) ds->dash_dur = p->value.number;
+		//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;
+
+		ds->splitable = GF_FALSE;
+		switch (ds->stream_type) {
+		case GF_STREAM_TEXT:
+		case GF_STREAM_METADATA:
+		case GF_STREAM_OD:
+		case GF_STREAM_SCENE:
+			ds->splitable = ctx->split;
+			break;
+		}
+
+		ds->clamped_dur = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CLAMP_DUR);
+		if (p) ds->clamped_dur = p->value.number;
+
+		//HDR
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+		if (dsi) {
+#if !defined(GPAC_DISABLE_HEVC)
+			if (ds->codec_id == GF_CODECID_LHVC || ds->codec_id == GF_CODECID_HEVC_TILES || ds->codec_id == GF_CODECID_HEVC) {
+				GF_HEVCConfig* hevccfg = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+				if (hevccfg) {
+					Bool is_interlaced;
+					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);
+					sps = &hevc.sps[hevc.sps_active_idx];
+					if (sps && sps->colour_description_present_flag) {
+						DasherHDRType old_hdr_type = ds->hdr_type;
+						if (sps->colour_primaries == 9 && sps->matrix_coeffs == 9) {
+							if (sps->transfer_characteristic == 14) ds->hdr_type = DASHER_HDR_HLG; //TODO: parse alternative_transfer_characteristics SEI
+							if (sps->transfer_characteristic == 16) ds->hdr_type = DASHER_HDR_PQ10;
+						}
+						if (old_hdr_type != ds->hdr_type) period_switch = GF_TRUE;
+					}
+					is_interlaced = hevccfg->interlaced_source_flag ? GF_TRUE : GF_FALSE;
+					if (ds->interlaced != is_interlaced) period_switch = GF_TRUE;
+					ds->interlaced = is_interlaced;
+
+					gf_odf_hevc_cfg_del(hevccfg);
+				}
+			}
+#endif
+			else 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);
+				if (sl) {
+					s32 idx;
+					memset(&avc, 0, sizeof(AVCState));
+					idx = gf_media_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;
+						ds->interlaced = is_interlaced;
+					}
+				}
+				gf_odf_avc_cfg_del(avccfg);
+			}
+		}
+#endif /*!GPAC_DISABLE_AV_PARSERS*/
+
+		if (ds->stream_type==GF_STREAM_AUDIO) {
+			u32 _sr=0, _nb_ch=0;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			switch (ds->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:
+				//DASH-IF and MPEG disagree here:
+				if (ctx->profile == GF_DASH_PROFILE_AVC264_LIVE || ctx->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
+					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
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Could not get AAC info, %s\n", gf_error_to_string(res)));
+					}
+				} else if (dsi) {
+					dasher_get_audio_info_with_m4a_sbr_ps(ds, dsi, NULL, &_nb_ch);
+				}
+				break;
+			case GF_CODECID_AC3:
+			case GF_CODECID_EAC3:
+				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);
+
+					ds->nb_lfe = ac3.streams[0].lfon ? 1 : 0;
+					_nb_ch = gf_ac3_get_channels(ac3.streams[0].acmod);
+					for (i=0; i<ac3.streams[0].nb_dep_sub; ++i) {
+						assert(ac3.streams[0].nb_dep_sub == 1);
+						_nb_ch += gf_ac3_get_channels(ac3.streams[0].chan_loc);
+					}
+				}
+				break;
+			}
+#endif
+			if (_sr > ds->sr) ds->sr = _sr;
+			if (_nb_ch > ds->nb_ch) ds->nb_ch = _nb_ch;
+		}
+
+		//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 (ds->cues) gf_free(ds->cues);
+			ds->cues = NULL;
+			ds->nb_cues = 0;
+			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;
+			}
+		}
+	} else {
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (!p) p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+		if (p) return GF_NOT_SUPPORTED;
+
+		CHECK_PROP_STR(GF_PROP_PID_XLINK, ds->xlink, GF_EOS)
+	}
+	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)
+
+	ds->period_start = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_START);
+	if (p) ds->period_start = p->value.number;
+
+	ds->period_dur = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PERIOD_DUR);
+	if (p) ds->period_dur = p->value.number;
+
+	if (ds->stream_type==GF_STREAM_FILE) {
+		if (!ds->xlink && !ds->period_start && !ds->period_dur) {
+			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;
+		}
+	}
+
+	//our stream is already scheduled for next period, don't do anything
+	if (gf_list_find(ctx->next_period->streams, ds)>=0)
+		period_switch = GF_FALSE;
+
+	//assign default ID
+	if (!ds->period_id)
+		ds->period_id = DEFAULT_PERIOD_ID;
+
+	if (!period_switch) {
+		if (ds->opid) gf_filter_pid_copy_properties(ds->opid, pid);
+		if (ds->rep)
+			dasher_update_rep(ctx, ds);
+		return GF_OK;
+	}
+
+	//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 = 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;
+	}
+	gf_list_add(ctx->next_period->streams, ds);
+	ds->period = ctx->next_period;
+
+
+	return GF_OK;
+}
+
+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);
+	for (i=0; i<count; i++) {
+		GF_XMLAttribute * att = gf_list_get(ctx->mpd->attributes, i);
+		if (!strcmp(att->name, "xmlns:cenc")) cenc_att = att;
+		if (!strcmp(att->name, "xmlns:xlink")) xlink_att = att;
+
+	}
+	if (ctx->dmode==GF_MPD_TYPE_DYNAMIC) {
+		ctx->mpd->type = GF_MPD_TYPE_DYNAMIC;
+	} else {
+		ctx->mpd->type = GF_MPD_TYPE_STATIC;
+		ctx->mpd->availabilityStartTime = 0;
+	}
+
+	if (ctx->profile==GF_DASH_PROFILE_LIVE) {
+		if (ctx->use_xlink && !ctx->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");
+		}
+	} else if (ctx->profile==GF_DASH_PROFILE_ONDEMAND) {
+		if (ctx->use_xlink) {
+			strcpy(profiles_string, "urn:mpeg:dash:profile:isoff-segext-on-demand:2014");
+		} else {
+			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");
+	} 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 {
+		strcpy(profiles_string, "urn:mpeg:dash:profile:full:2011");
+	}
+
+	if (ctx->profX) {
+		char profiles_w_ext[GF_MAX_PATH+256];
+		sprintf(profiles_w_ext, "%s,%s", profiles_string, ctx->profX);
+		if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
+		ctx->mpd->profiles = gf_strdup(profiles_w_ext);
+	} else {
+		if (ctx->mpd->profiles) gf_free(ctx->mpd->profiles);
+		ctx->mpd->profiles = gf_strdup(profiles_string);
+	}
+
+	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);
+	}
+	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);
+	}
+
+	ctx->mpd->time_shift_buffer_depth = 0;
+	ctx->mpd->minimum_update_period = 0;
+
+	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->refresh>=0) {
+			ctx->mpd->minimum_update_period = (u32) (1000*(ctx->refresh ? ctx->refresh : ctx->segdur) );
+		} else {
+			ctx->mpd->minimum_update_period = 0;
+		}
+	}
+	return GF_OK;
+}
+static GF_Err dasher_setup_mpd(GF_DasherCtx *ctx)
+{
+	u32 i, count;
+	GF_MPD_ProgramInfo *info;
+	ctx->mpd = gf_mpd_new();
+	ctx->mpd->xml_namespace = "urn:mpeg:dash:schema:mpd:2011";
+	ctx->mpd->base_URLs = gf_list_new();
+	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();
+	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;
+
+	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
+	if (info) {
+		gf_list_add(ctx->mpd->program_infos, info);
+		if (ctx->title)
+			info->title = gf_strdup(ctx->title);
+		else {
+			char tmp[256];
+			const char *name = NULL;
+			if (ctx->out_path) {
+				const char *url = ctx->out_path;
+				if (!strncmp(ctx->out_path, "gfio://", 7)) {
+					url = gf_fileio_translate_url(ctx->out_path);
+					if (!url) url = "";
+				}
+				name = strrchr(url, '/');
+				if (!name) name = strrchr(url, '\\');
+				if (!name) name = url;
+				else name++;
+			}
+			snprintf(tmp, 255, "%s generated by GPAC", name ? name : "");
+			tmp[255]=0;
+			info->title = gf_strdup(tmp);
+		}
+		if (ctx->cprt) info->copyright = gf_strdup(ctx->cprt);
+		if (ctx->info) info->more_info_url = gf_strdup(ctx->info);
+		else info->more_info_url = gf_strdup("http://gpac.io");
+		if (ctx->source) info->source = gf_strdup(ctx->source);
+		if (ctx->lang) info->lang = gf_strdup(ctx->lang);
+	}
+
+	count = ctx->location ? gf_list_count(ctx->location) : 0;
+	for (i=0; i<count; i++) {
+		char *l = gf_list_get(ctx->location, i);
+		gf_list_add(ctx->mpd->locations, gf_strdup(l));
+	}
+	count = ctx->base ? gf_list_count(ctx->base) : 0;
+	for (i=0; i<count; i++) {
+		GF_MPD_BaseURL *base;
+		char *b = gf_list_get(ctx->base, i);
+		GF_SAFEALLOC(base, GF_MPD_BaseURL);
+		if (base) {
+			base->URL = gf_strdup(b);
+			gf_list_add(ctx->mpd->base_URLs, base);
+		}
+	}
+	return dasher_update_mpd(ctx);
+}
+
+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;
+	const GF_PropertyValue *dcd, *dcd_enh, *dovi;
+
+	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 (!force_inband) {
+		force_inband = ds->inband_params;
+	}
+	if (!force_inband) {
+		const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
+		if (p) {
+			//input uses inband parameters, force it on output regardless of bitstream switching mode
+			switch (p->value.uint) {
+			case GF_ISOM_SUBTYPE_AVC3_H264:
+			case GF_ISOM_SUBTYPE_AVC4_H264:
+			case GF_ISOM_SUBTYPE_LHE1:
+			case GF_ISOM_SUBTYPE_HEV1:
+				force_inband = GF_TRUE;
+				ds->inband_params = GF_TRUE;
+				break;
+			}
+		}
+	}
+
+
+	dovi = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_DOLBY_VISION);
+	if (dovi) {
+		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)));
+			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);
+		gf_odf_dovi_cfg_del(dvcc);
+
+		return GF_OK;
+	}
+
+	switch (ds->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:
+		if (dcd && (!ctx->forcep || !ctx->aacp) ) {
+			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;
+		}
+
+		if (ctx->aacp)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%s", ctx->aacp);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", ds->codec_id);
+
+		if (!ctx->forcep) {
+			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);
+		}
+		break;
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		if (dcd_enh) dcd = dcd_enh;
+		subtype = (ds->codec_id==GF_CODECID_SVC) ? GF_ISOM_SUBTYPE_SVC_H264 : GF_ISOM_SUBTYPE_MVC_H264;
+	case GF_CODECID_AVC:
+		if (!subtype) {
+			if (force_inband) {
+				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC4_H264 : GF_ISOM_SUBTYPE_AVC3_H264;
+			} else {
+				subtype = dcd_enh ? GF_ISOM_SUBTYPE_AVC2_H264 : GF_ISOM_SUBTYPE_AVC_H264;
+			}
+		}
+
+		if (dcd && (!ctx->forcep || !ctx->avcp) ) {
+			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_odf_avc_cfg_del(avcc);
+				return GF_OK;
+			}
+		}
+		if (ctx->avcp)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%s", gf_4cc_to_str(subtype), ctx->avcp);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		if (!ctx->forcep) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[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;
+		//fallthrough
+	case GF_CODECID_HEVC_TILES:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_HVT1;
+		if (!dcd && 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->id != ds->dep_id) continue;
+				dcd = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_DECODER_CONFIG);
+				break;
+			}
+		}
+		//fallthrough
+	case GF_CODECID_HEVC:
+		if (!subtype) {
+			if (ds->tile_base) {
+				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
+			} else if (dcd_enh) {
+				if (dcd) {
+					subtype = force_inband ? GF_ISOM_SUBTYPE_HEV2 : GF_ISOM_SUBTYPE_HVC2;
+				} else {
+					subtype = force_inband ? GF_ISOM_SUBTYPE_LHE1 : GF_ISOM_SUBTYPE_LHV1;
+				}
+			} else {
+				subtype = force_inband ? GF_ISOM_SUBTYPE_HEV1 : GF_ISOM_SUBTYPE_HVC1;
+			}
+		}
+		if ((dcd || dcd_enh) && (!ctx->forcep || !ctx->hvcp)) {
+			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_odf_hevc_cfg_del(hvcc);
+			}
+			return GF_OK;
+		}
+
+		if (ctx->hvcp)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%s", gf_4cc_to_str(subtype), ctx->hvcp);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		if (!ctx->forcep) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find HEVC config, using default %s\n", szCodec));
+		}
+		return GF_OK;
+#endif
+
+#ifndef GPAC_DISABLE_AV1
+	case GF_CODECID_AV1:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_AV01;
+
+		if (dcd && (!ctx->forcep || !ctx->av1p)) {
+			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));
+					}
+				}
+				gf_odf_av1_cfg_del(av1c);
+				gf_av1_reset_state(&av1_state, GF_TRUE);
+				return GF_OK;
+#else
+				return GF_NOT_SUPPORTED;
+#endif
+			}
+		}
+
+		if (ctx->av1p)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%s", gf_4cc_to_str(subtype), ctx->av1p);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		if (!ctx->forcep) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[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:
+		if (!subtype) subtype = GF_ISOM_SUBTYPE_VP09;
+
+		if (dcd && (!ctx->forcep || !ctx->vpxp)) {
+			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);
+
+				gf_odf_vp_cfg_del(vpcc);
+				return GF_OK;
+			}
+		}
+		if (ctx->vpxp)
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%s", gf_4cc_to_str(subtype), ctx->vpxp);
+		else
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		if (!ctx->forcep) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[Dasher] Cannot find VPX config, using default %s\n", szCodec));
+		}
+		return GF_OK;
+
+	default:
+		subtype = gf_codecid_4cc_type(ds->codec_id);
+		if (!subtype) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_ISOM_SUBTYPE);
+			if (p) subtype = p->value.uint;
+		}
+		if (!subtype) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[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 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 get_canon_urn(bin128 URN, char *res)
+{
+	char sres[4];
+	u32 i;
+	/* Output canonical UIID form */
+	strcpy(res, "");
+	for (i=0; i<4; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=4; i<6; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=6; i<8; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=8; i<10; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+	strcat(res, "-");
+	for (i=10; i<16; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
+}
+
+static const char *get_drm_kms_name(const char *canURN)
+{
+	if (!stricmp(canURN, "67706163-6365-6E63-6472-6D746F6F6C31")) return "GPAC1.0";
+	else if (!stricmp(canURN, "5E629AF5-38DA-4063-8977-97FFBD9902D4")) return "Marlin1.0";
+	else if (!strcmp(canURN, "adb41c24-2dbf-4a6d-958b-4457c0d27b95")) return "MediaAccess3.0";
+	else if (!strcmp(canURN, "A68129D3-575B-4F1A-9CBA-3223846CF7C3")) return "VideoGuard";
+	else if (!strcmp(canURN, "9a04f079-9840-4286-ab92-e65be0885f95")) return "PlayReady";
+	else if (!strcmp(canURN, "9a27dd82-fde2-4725-8cbc-4234aa06ec09")) return "VCAS";
+	else if (!strcmp(canURN, "F239E769-EFA3-4850-9C16-A903C6932EFB")) return "Adobe";
+	else if (!strcmp(canURN, "1f83e1e8-6ee9-4f0d-ba2f-5ec4e3ed1a66")) return "SecureMedia";
+	else if (!strcmp(canURN, "644FE7B5-260F-4FAD-949A-0762FFB054B4")) return "CMLA (OMA DRM)";
+	else if (!strcmp(canURN, "6a99532d-869f-5922-9a91-113ab7b1e2f3")) return "MobiTVDRM";
+	else if (!strcmp(canURN, "35BF197B-530E-42D7-8B65-1B4BF415070F")) return "DivX DRM";
+	else if (!strcmp(canURN, "B4413586-C58C-FFB0-94A5-D4896C1AF6C3")) return "VODRM";
+	else if (!strcmp(canURN, "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed")) return "Widevine";
+	else if (!strcmp(canURN, "80a6be7e-1448-4c37-9e70-d5aebe04c8d2")) return "Irdeto";
+	else if (!strcmp(canURN, "dcf4e3e3-62f1-5818-7ba6-0a6fe33ff3dd")) return "CA 1.0, DRM+ 2.0";
+	else if (!strcmp(canURN, "45d481cb-8fe0-49c0-ada9-ab2d2455b2f2")) return "CoreCrypt";
+	else if (!strcmp(canURN, "616C7469-6361-7374-2D50-726F74656374")) return "altiProtect";
+	else if (!strcmp(canURN, "992c46e6-c437-4899-b6a0-50fa91ad0e39")) return "Arris SecureMedia SteelKnot version 1";
+	else if (!strcmp(canURN, "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b")) return "cenc initData";
+	else if (!strcmp(canURN, "e2719d58-a985-b3c9-781a-b030af78d30e")) return "ClearKey1.0";
+	else if (!strcmp(canURN, "94CE86FB-07FF-4F43-ADB8-93D2FA968CA2")) return "FairPlay";
+	else if (!strcmp(canURN, "279fe473-512c-48fe-ade8-d176fee6b40f")) return "Arris Titanium";
+	else if (!strcmp(canURN, "aa11967f-cc01-4a4a-8e99-c5d3dddfea2d")) return "UDRM";
+	return "unknown";
+}
+
+static GF_List *dasher_get_content_protection_desc(GF_DasherCtx *ctx, GF_DashStream *ds, GF_MPD_AdaptationSet *for_set)
+{
+	char sCan[40];
+	u32 prot_scheme=0;
+	u32 i, count;
+	const GF_PropertyValue *p;
+	GF_List *res = NULL;
+	GF_BitStream *bs_r;
+
+	count = gf_list_count(ctx->current_period->streams);
+	bs_r = gf_bs_new((const char *) &count, 1, GF_BITSTREAM_READ);
+
+	for (i=0; i<count; i++) {
+		GF_MPD_Descriptor *desc;
+		GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+		if (!a_ds->is_encrypted) continue;
+
+		if (for_set) {
+			if (a_ds->set != for_set) continue;
+			//for now only insert for the stream holding the set
+			if (!a_ds->owns_set) continue;
+		} else if ((a_ds != ds) && (a_ds->muxed_base != ds) ) {
+			continue;
+		}
+
+		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)) {
+			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) {
+				continue;
+			}
+
+			if (!res) res = gf_list_new();
+			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);
+			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 (ctx->pssh <= GF_DASH_PSSH_MOOF) {
+				continue;
+			}
+			//(data) binary blob containing (u32)N [(bin128)SystemID(u32)version(u32)KID_count[(bin128)keyID](u32)priv_size(char*priv_size)priv_data]
+			p = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_CENC_PSSH);
+			if (!p) continue;
+
+			gf_bs_reassign_buffer(bs_r, p->value.data.ptr, p->value.data.size);
+			nb_pssh = gf_bs_read_u32(bs_r);
+
+			//add pssh
+			for (j=0; j<nb_pssh; j++) {
+				u32 pssh_idx;
+				bin128 sysID;
+				GF_XMLNode *node;
+				u32 version, k_count;
+				u8 *pssh_data=NULL;
+				u32 pssh_len, size_64;
+				GF_BitStream *bs_w = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+				//rewrite PSSH box
+				gf_bs_write_u32(bs_w, 0);
+				gf_bs_write_u32(bs_w, GF_ISOM_BOX_TYPE_PSSH);
+
+				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;
+				gf_bs_write_u8(bs_w, version);
+				gf_bs_write_u24(bs_w, 0);
+				gf_bs_write_data(bs_w, sysID, 16);
+				if (version) {
+					gf_bs_write_u32(bs_w, k_count);
+					for (j=0; j<k_count; j++) {
+						bin128 keyID;
+						gf_bs_read_data(bs_r, keyID, 16);
+						gf_bs_write_data(bs_w, keyID, 16);
+					}
+				}
+				k_count = gf_bs_read_u32(bs_r);
+				gf_bs_write_u32(bs_w, k_count);
+				for (pssh_idx=0; pssh_idx<k_count; pssh_idx++) {
+					gf_bs_write_u8(bs_w, gf_bs_read_u8(bs_r) );
+				}
+				pssh_len = (u32) gf_bs_get_position(bs_w);
+				gf_bs_seek(bs_w, 0);
+				gf_bs_write_u32(bs_w, pssh_len);
+				gf_bs_seek(bs_w, pssh_len);
+				gf_bs_get_content(bs_w, &pssh_data, &pssh_len);
+				gf_bs_del(bs_w);
+
+				get_canon_urn(sysID, sCan);
+				desc = gf_mpd_descriptor_new(NULL, NULL, NULL);
+				desc->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));
+				gf_list_add(res, desc);
+
+				GF_SAFEALLOC(node, GF_XMLNode);
+				if (node) {
+					GF_XMLNode *pnode;
+					node->type = GF_XML_NODE_TYPE;
+					node->name = gf_strdup("cenc:pssh");
+					node->content = gf_list_new();
+					gf_list_add(desc->children, node);
+
+					GF_SAFEALLOC(pnode, GF_XMLNode);
+					if (pnode) {
+						pnode->type = GF_XML_TEXT_TYPE;
+						gf_list_add(node->content, pnode);
+
+						size_64 = 2*pssh_len;
+						pnode->name = gf_malloc(size_64);
+						if (pnode->name) {
+							size_64 = gf_base64_encode((const char *)pssh_data, pssh_len, (char *)pnode->name, size_64);
+							pnode->name[size_64] = 0;
+						}
+					}
+				}
+				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 (!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);
+		}
+	}
+	gf_bs_del(bs_r);
+	return res;
+}
+
+static void dasher_get_mime_and_ext(GF_DasherCtx *ctx, GF_DashStream *ds, const char **out_subtype, const char **out_ext)
+{
+	const char *subtype = NULL;
+	const char *mux_ext = NULL;
+	const char *cstr;
+
+	if (ctx->m2ts) {
+		subtype = "mp2t";
+	} else 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;
+		case DASHER_MUX_MKV: subtype = "x-matroska"; mux_ext = "mkv"; break;
+		case DASHER_MUX_WEBM: subtype = "webm"; mux_ext = "webm"; break;
+		case DASHER_MUX_OGG: subtype = "ogg"; mux_ext = "ogg"; break;
+		case DASHER_MUX_RAW:
+			cstr = gf_codecid_mime(ds->codec_id);
+			if (cstr) {
+				subtype = strchr(cstr, '/');
+				if (subtype) subtype++;
+				else subtype = "raw";
+			}
+			if (out_ext) {
+				cstr = gf_codecid_file_ext(ds->codec_id);
+				if (cstr) *out_ext = cstr;
+			}
+			break;
+		}
+	} else if (ctx->initext) {
+		mux_ext = ctx->initext;
+		if (!strcmp(ctx->initext, "ts") || !strcmp(ctx->initext, "m2ts")) {
+			subtype = "mp2t";
+			ctx->muxtype = DASHER_MUX_TS;
+		} else if (!strcmp(ctx->initext, "mkv") || !strcmp(ctx->initext, "mka") || !strcmp(ctx->initext, "mks") || !strcmp(ctx->initext, "mk3d")) {
+			subtype = "x-matroska";
+			ctx->muxtype = DASHER_MUX_MKV;
+		} else if (!strcmp(ctx->initext, "webm") || !strcmp(ctx->initext, "weba")) {
+			subtype = "webm";
+			ctx->muxtype = DASHER_MUX_WEBM;
+		} else if (!strcmp(ctx->initext, "ogg") || !strcmp(ctx->initext, "oga") || !strcmp(ctx->initext, "ogv") || !strcmp(ctx->initext, "spx") || !strcmp(ctx->initext, "oggm") || !strcmp(ctx->initext, "opus")) {
+			subtype = "ogg";
+			ctx->muxtype = DASHER_MUX_OGG;
+		}
+		else if (!strcmp(ctx->initext, "null")) {
+			mux_ext = "mp4";
+			ctx->muxtype = DASHER_MUX_ISOM;
+		}
+	}
+	if (!subtype) subtype = "mp4";
+	if (out_subtype) *out_subtype = subtype;
+	if (!mux_ext) mux_ext = "mp4";
+	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];
+
+	//Outputs are not yet connected, derive mime from init segment extension
+	if (!ds->rep->mime_type) {
+		const char *subtype = NULL;
+		dasher_get_mime_and_ext(ctx, ds, &subtype, NULL);
+
+		if (ds->stream_type==GF_STREAM_VISUAL)
+			gf_dynstrcat(&ds->rep->mime_type, "video/", NULL);
+		else if (ds->stream_type==GF_STREAM_AUDIO)
+			gf_dynstrcat(&ds->rep->mime_type, "audio/", NULL);
+		else
+			gf_dynstrcat(&ds->rep->mime_type, "application/", NULL);
+
+		gf_dynstrcat(&ds->rep->mime_type, subtype, NULL);
+	}
+
+	ds->rep->bandwidth = ds->bitrate;
+	if (ds->stream_type==GF_STREAM_VISUAL) {
+		ds->rep->width = ds->width;
+		ds->rep->height = ds->height;
+
+
+		if (!ds->rep->sar) {
+			GF_SAFEALLOC(ds->rep->sar, GF_MPD_Fractional);
+		}
+		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);
+				}
+			}
+		}
+	}
+	else if (ds->stream_type==GF_STREAM_AUDIO) {
+		GF_MPD_Descriptor *desc;
+		char value[256];
+		ds->rep->samplerate = ds->sr;
+
+		if (!ds->nb_surround && !ds->nb_lfe) {
+			sprintf(value, "%d", ds->nb_ch);
+			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:23003:3:audio_channel_configuration:2011", value);
+		} else {
+			sprintf(value, "%d", gf_audio_fmt_get_cicp_layout(ds->nb_ch, ds->nb_surround, ds->nb_lfe));
+			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:ChannelConfiguration", value);
+		}
+
+		gf_mpd_del_list(ds->rep->audio_channels, gf_mpd_descriptor_free, GF_TRUE);
+
+		gf_list_add(ds->rep->audio_channels, desc);
+	} else {
+	}
+
+	dasher_get_rfc_6381_codec_name(ctx, ds, szCodec, (ctx->bs_switch==DASHER_BS_SWITCH_INBAND) ? 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
+		switch (ctx->profile) {
+		case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
+			ds->rep->scan_type = GF_MPD_SCANTYPE_PROGRESSIVE;
+			break;
+		}
+	}
+
+	if (ctx->cp!=GF_DASH_CPMODE_ADAPTATION_SET) {
+		gf_mpd_del_list(ds->rep->content_protection, gf_mpd_descriptor_free, 0);
+		ds->rep->content_protection = dasher_get_content_protection_desc(ctx, ds, NULL);
+	}
+}
+
+static void dasher_setup_rep(GF_DasherCtx *ctx, GF_DashStream *ds, u32 *srd_rep_idx)
+{
+	const GF_PropertyValue *p;
+
+	assert(ds->rep==NULL);
+	ds->rep = gf_mpd_representation_new();
+	ds->rep->playback.udta = ds;
+
+	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;
+
+	p = gf_filter_pid_get_property(ds->ipid, GF_PROP_PID_REP_ID);
+	if (p) {
+		if (ds->rep_id) gf_free(ds->rep_id);
+
+		if (!ds->tile_base && (ds->srd.w || ds->srd.z) && !ctx->sseg && !ctx->sfile) {
+			char *rep_name = gf_malloc(sizeof(char) * (strlen(p->value.string) + 15) );
+			sprintf(rep_name, "%s_%d", p->value.string, *srd_rep_idx);
+			ds->rep_id = rep_name;
+			(*srd_rep_idx) ++;
+		} else {
+			ds->rep_id = gf_strdup(p->value.string);
+		}
+
+	} else if (!ds->rep_id) {
+		char szRepID[20];
+		sprintf(szRepID, "%d", 1 + gf_list_find(ctx->pids, ds));
+		ds->rep_id = gf_strdup(szRepID);
+	}
+	ds->rep->id = gf_strdup(ds->rep_id);
+}
+
+static Bool dasher_same_roles(GF_DashStream *ds1, GF_DashStream *ds2)
+{
+	GF_List *list;
+	if (ds1->p_role && ds2->p_role) {
+		if (gf_props_equal(ds1->p_role, ds2->p_role)) return GF_TRUE;
+	}
+	if (!ds1->p_role && !ds2->p_role)
+		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;
+	}
+	return GF_FALSE;
+}
+
+static Bool dasher_same_adaptation_set(GF_DasherCtx *ctx, GF_DashStream *ds, GF_DashStream *ds_test)
+{
+	const char *lang1, *lang2;
+	//muxed representations
+	if (ds_test->muxed_base) {
+		if (ds_test->muxed_base == ds)
+			return GF_TRUE;
+		//if muxed base rep has been registered with this AdaptationSet, also register this stream
+		if (gf_list_find(ds->set->representations, ds_test->muxed_base->rep)>=0)
+			return GF_TRUE;
+	}
+
+	//otherwise we have to be of same type
+	if (ds->stream_type != ds_test->stream_type) return GF_FALSE;
+
+	//not the same roles
+	if (!dasher_same_roles(ds, ds_test)) 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)
+		return GF_FALSE;
+	if (ds->p_as_desc && !ds_test->p_as_desc)
+		return GF_FALSE;
+	if (ds->p_as_desc && ! gf_props_equal(ds->p_as_desc, ds_test->p_as_desc))
+		return GF_FALSE;
+
+	//need same AS ID if specified
+	if (ds->as_id && ds_test->as_id &&(ds->as_id != ds_test->as_id) )
+		return GF_FALSE;
+
+	//need same dash duration if aligned
+	if (ctx->align) {
+		if (ds->dash_dur != ds_test->dash_dur) 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;
+	if (ds->srd.w != ds_test->srd.w) return GF_FALSE;
+
+	if (ds->view_id != ds_test->view_id) return GF_FALSE;
+	//according to DASH spec mixing interlaced and progressive is OK
+	//if (ds->interlaced != ds_test->interlaced) return GF_FALSE;
+	if (ds->nb_ch != ds_test->nb_ch) return GF_FALSE;
+
+	lang1 = ds->lang ? ds->lang : "und";
+	lang2 = ds_test->lang ? ds_test->lang : "und";
+	if (strcmp(lang1, lang2)) return GF_FALSE;
+
+	if (ds->stream_type==GF_STREAM_VISUAL) {
+		u32 w, h, tw, th;
+		if (ctx->no_sar) {
+			w = ds->width;
+			h = ds->height;
+			tw = ds_test->width;
+			th = ds_test->height;
+		} else {
+			w = ds->width * ds->sar.num;
+			h = ds->height * ds->sar.den;
+			tw = ds_test->width * ds_test->sar.num;
+			th = ds_test->height * ds_test->sar.den;
+		}
+
+		//not the same aspect ratio
+		if (w * th != h * tw)
+			return GF_FALSE;
+	} else if (ds->stream_type==GF_STREAM_AUDIO) {
+		if (!ctx->mix_codecs && (ds->codec_id != ds_test->codec_id) )
+			return GF_FALSE;
+		//we allow mix of channels config
+	} else {
+		if (!ctx->mix_codecs && strcmp(ds->rep->codecs, ds_test->rep->codecs)) return GF_FALSE;
+		return GF_TRUE;
+	}
+	//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;
+	}
+	//we should be good
+	return GF_TRUE;
+}
+
+static void dasher_add_descriptors(GF_List **p_dst_list, const GF_PropertyValue *desc_val)
+{
+	u32 j, count;
+	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);
+	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);
+		if (desc[0] == '<') {
+			GF_MPD_other_descriptors *d;
+			GF_SAFEALLOC(d, GF_MPD_other_descriptors);
+			if (d) {
+				d->xml_desc = gf_strdup(desc);
+				gf_list_add(dst_list, d);
+			}
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Invalid descriptor %s, expecting '<' as first character\n", desc));
+		}
+	}
+}
+
+static void dasher_setup_set_defaults(GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
+{
+	u32 i, count;
+	Bool main_role_set = GF_FALSE;
+	//by default setup alignment
+	if (ctx->sseg) set->subsegment_alignment = ctx->align;
+	else set->segment_alignment = ctx->align;
+
+	//startWithSAP is set when the first packet comes in
+
+	//the rest depends on the various profiles/iop, to check
+	count = gf_list_count(set->representations);
+	for (i=0; i<count; i++) {
+		GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+		GF_DashStream *ds = rep->playback.udta;
+
+		if (set->max_width < ds->width) set->max_width = ds->width;
+		if (set->max_height < ds->height) set->max_height = ds->height;
+/*		if (set->max_bandwidth < ds->rep->bandwidth) set->max_bandwidth = ds->rep->bandwidth;
+		if (set->max_framerate * ds->fps.den < ds->fps.num) set->max_framerate = (u32) (ds->fps.num / ds->fps.den);
+*/
+
+		/*set role*/
+		if (ds->p_role) {
+			u32 j, role_count;
+			role_count = gf_list_count(ds->p_role->value.string_list);
+			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;
+				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")
+				) {
+					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";
+				}
+				desc = gf_mpd_descriptor_new(NULL, uri, role);
+				gf_list_add(set->role, desc);
+			}
+		}
+		//set SRD
+		if (!i && ds->srd.z && ds->srd.w) {
+			char value[256];
+			GF_MPD_Descriptor *desc;
+			if (ds->dep_id) {
+				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->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 {
+					sprintf(value, "1,0,0,0,0,%d,%d", 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);
+			}
+		}
+		//set HDR
+		if (ds->hdr_type > DASHER_HDR_NONE) {
+			char value[256];
+			GF_MPD_Descriptor* desc;
+			sprintf(value, "9");
+			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:ColourPrimaries", value);
+			gf_list_add(set->essential_properties, desc);
+			sprintf(value, "9");
+			desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:MatrixCoefficients", value);
+			gf_list_add(set->essential_properties, desc);
+
+			if (ds->hdr_type==DASHER_HDR_PQ10) {
+				sprintf(value, "16");
+				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:TransferCharacteristics", value);
+				gf_list_add(set->essential_properties, desc);
+			}
+
+			if (ds->hdr_type == DASHER_HDR_HLG) {
+				sprintf(value, "14");
+				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:TransferCharacteristics", value);
+				gf_list_add(set->essential_properties, desc);
+				sprintf(value, "18");
+				desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:mpegB:cicp:TransferCharacteristics", value);
+				gf_list_add(set->supplemental_properties, desc);
+			}
+		}
+	}
+	if (ctx->check_main_role && !main_role_set) {
+		GF_MPD_Descriptor *desc;
+		desc = gf_mpd_descriptor_new(NULL, "urn:mpeg:dash:role:2011", "main");
+		gf_list_add(set->role, desc);
+	}
+}
+
+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_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) {
+		set->bitstream_switching = GF_TRUE;
+		return;
+	}
+	if (ctx->bs_switch==DASHER_BS_SWITCH_OFF) return;
+	if (!base_rep) return;
+	base_ds = base_rep->playback.udta;
+
+	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;
+		}
+		return;
+	}
+
+	for (i=1; i<count; i++) {
+		GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+		GF_DashStream *ds = rep->playback.udta;
+		//same codec ID
+		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 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
+			return;
+		}
+		//dependencies / different codec IDs, cannot use bitstream switching
+		return;
+	}
+	//ok we can use BS switching, ensure we use the same timescale for every stream
+	set->bitstream_switching = GF_TRUE;
+
+	for (i=0; i<count; i++) {
+		GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+		GF_DashStream *ds = rep->playback.udta;
+		for (j=i+1; j<count; j++) {
+			GF_DashStream *a_ds;
+			rep = gf_list_get(set->representations, j);
+			a_ds = rep->playback.udta;
+			if (a_ds->stream_type != ds->stream_type) continue;
+			if (a_ds->timescale != ds->timescale)
+				a_ds->force_timescale = ds->timescale;
+		}
+	}
+}
+
+static void dasher_open_destination(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_Representation *rep, const char *szInitURL, Bool trash_init)
+{
+	GF_Err e;
+	Bool has_frag=GF_FALSE;
+	Bool has_subs=GF_FALSE;
+	Bool has_strun=GF_FALSE;
+	Bool has_vodcache=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;
+	char *szDST = NULL;
+	char szSRC[100];
+
+	if (ctx->sigfrag)
+		return;
+
+	GF_DashStream *ds = rep->playback.udta;
+	if (ds->muxed_base) return;
+
+	gf_dynstrcat(&szDST, szInitURL, NULL);
+	if (ctx->out_path) {
+		char *rel = NULL;
+		if (ctx->do_m3u8 && ds->hls_vp_name) {
+			char *tmp = gf_url_concatenate(ctx->out_path, ds->hls_vp_name);
+			if (tmp) {
+				rel = gf_url_concatenate(tmp, szInitURL);
+				gf_free(tmp);
+			}
+		}
+		if (!rel)
+			rel = gf_url_concatenate(ctx->out_path, szInitURL);
+		if (rel) {
+			gf_free(szDST);
+			szDST = rel;
+		}
+	}
+
+	sprintf(szSRC, "%cgfopt", sep_args);
+	gf_dynstrcat(&szDST, szSRC, NULL);
+
+	dst_args = gf_filter_get_dst_args(filter);
+	if (dst_args) {
+		char szKey[20];
+		sprintf(szSRC, "%c", sep_args);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+		
+		gf_dynstrcat(&szDST, dst_args, NULL);
+		//look for frag arg
+		sprintf(szKey, "%cfrag", sep_args);
+		if (strstr(dst_args, szKey)) has_frag = GF_TRUE;
+		else {
+			sprintf(szKey, "%csfrag", sep_args);
+			if (strstr(dst_args, szKey)) has_frag = GF_TRUE;
+		}
+		//look for subs_sidx arg
+		sprintf(szKey, "%csubs_sidx", sep_args);
+		if (strstr(dst_args, szKey)) has_subs = GF_TRUE;
+
+		sprintf(szKey, "%cstrun", sep_args);
+		if (strstr(dst_args, szKey)) has_strun = GF_TRUE;
+
+		sprintf(szKey, "%cvodcache", sep_args);
+		if (strstr(dst_args, szKey)) has_vodcache = GF_TRUE;
+	}
+
+	if (trash_init) {
+		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);
+	}
+	//override xps inband declaration in args
+	sprintf(szSRC, "%cxps_inband%c%s", sep_args, sep_name, ds->inband_params ? "all" : "no");
+	gf_dynstrcat(&szDST, szSRC, NULL);
+
+	if (ctx->no_fragments_defaults) {
+		sprintf(szSRC, "%cnofragdef", sep_args );
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+	switch (ctx->pssh) {
+	case GF_DASH_PSSH_MPD:
+		sprintf(szSRC, "%cpsshs%cnone", sep_args, sep_name);
+		break;
+	case GF_DASH_PSSH_MOOF:
+	case GF_DASH_PSSH_MOOF_MPD:
+		sprintf(szSRC, "%cpsshs%cmoof", sep_args, sep_name);
+		break;
+	default:
+		sprintf(szSRC, "%cpsshs%cmoov", sep_args, sep_name);
+		break;
+	}
+	gf_dynstrcat(&szDST, szSRC, NULL);
+
+	//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 );
+		if (!strstr(szDST, szSRC))
+			gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+	sprintf(szSRC, "%cmime=%s", sep_args, 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);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+	if (ds->moof_sn_inc>1) {
+		sprintf(szSRC, "%cmsninc%c%d", sep_args, sep_name, ds->moof_sn_inc);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+	if (ds->sscale) {
+		sprintf(szSRC, "%cmoovts%c-1", sep_args, sep_name);
+		gf_dynstrcat(&szDST, szSRC, NULL);
+	}
+	ds->dst_filter = gf_filter_connect_destination(filter, szDST, &e);
+	gf_free(szDST);
+	szDST = NULL;
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't create output file %s: %s\n", szInitURL, gf_error_to_string(e) ));
+		ctx->in_error = GF_TRUE;
+		return;
+	}
+	//reset any sourceID given in the dst_arg and assign sourceID to be the dasher filter
+	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);
+}
+
+static void dasher_gather_deps(GF_DasherCtx *ctx, u32 dependency_id, GF_List *multi_tracks)
+{
+	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->id == dependency_id) {
+			if (ds->tile_base) continue;
+
+			assert(ds->opid);
+			gf_list_insert(multi_tracks, ds->opid, 0);
+			if (ds->dep_id) dasher_gather_deps(ctx, ds->dep_id, multi_tracks);
+		}
+	}
+}
+
+static void dasher_update_dep_list(GF_DasherCtx *ctx, GF_DashStream *ds, const char *ref_type)
+{
+	u32 i, j, count;
+	GF_PropertyValue *p = (GF_PropertyValue *) gf_filter_pid_get_property_str(ds->opid, ref_type);
+	if (!p) return;
+	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->id == p->value.uint_list.vals[i]) && a_ds->pid_id) {
+				p->value.uint_list.vals[j] = a_ds->pid_id;
+			}
+		}
+	}
+}
+
+static void dasher_open_pid(GF_Filter *filter, GF_DasherCtx *ctx, GF_DashStream *ds, GF_List *multi_pids, Bool init_trashed)
+{
+	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
+	char szSRC[1024];
+
+	if (ctx->sigfrag || ctx->in_error)
+		return;
+
+	assert(!ds->opid);
+	assert(base_ds->dst_filter);
+
+	if (ds->tile_base && !init_trashed) {
+		s32 res = gf_list_find(ctx->postponed_pids, ds);
+		if (res < 0) {
+			gf_list_add(ctx->postponed_pids, ds);
+			return;
+		} else {
+			gf_list_rem(ctx->postponed_pids, res);
+		}
+	} else if (!ds->tile_base) {
+		gf_list_del_item(ctx->postponed_pids, ds);
+	}
+
+	//tile base not live profile, make sure all our deps are ready
+	if (ds->tile_base && !ctx->sseg) {
+		u32 i, count = gf_list_count(ds->complementary_streams);
+		for (i=0; i<count; i++) {
+			GF_DashStream *a_ds = gf_list_get(ds->complementary_streams, i);
+			//dep not ready
+			if (!a_ds->opid) {
+				if (gf_list_find(ctx->postponed_pids, a_ds)<0) {
+					gf_list_add(ctx->postponed_pids, a_ds);
+				}
+				gf_list_del_item(ctx->postponed_pids, ds);
+				gf_list_add(ctx->postponed_pids, ds);
+				return;
+			}
+		}
+	}
+
+	if (ctx->sigfrag)
+		return;
+
+	sprintf(szSRC, "dasher_%p", base_ds->dst_filter);
+	ds->opid = gf_filter_pid_new(filter);
+	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("*"));
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_MIME, &PROP_STRING(ds->rep->mime_type));
+	}
+	if (ds->nb_cues) {
+		u32 ncues = ds->nb_cues;
+		if ((ds->cues[0].sample_num>0) || (ds->cues[0].cts>0) || (ds->cues[0].dts>0))
+			ncues++;
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_SEGMENTS, &PROP_UINT(ncues) );
+	}
+
+	gf_filter_pid_require_source_id(ds->opid);
+
+	if (ctx->pssh == GF_DASH_PSSH_MPD) {
+		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) );
+	if (ds->dep_pid_id)
+		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) );
+
+	if (ds->id != ds->pid_id) {
+		dasher_update_dep_list(ctx, ds, "isom:scal");
+		dasher_update_dep_list(ctx, ds, "isom:sabt");
+	}
+
+	/*timescale forced (bitstream switching) */
+	if (ds->force_timescale)
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ds->force_timescale) );
+
+	if (multi_pids) {
+		s32 idx = 1+gf_list_find(multi_pids, ds->ipid);
+		assert(idx>0);
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_PID, &PROP_POINTER(multi_pids) );
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_PID_IDX, &PROP_UINT(idx) );
+	}
+
+
+	if (ds->tile_base && !ctx->sseg && !ctx->sfile) {
+		u32 i, count = gf_list_count(ds->complementary_streams);
+		if (!ds->multi_tracks) ds->multi_tracks = gf_list_new();
+		gf_list_reset(ds->multi_tracks);
+
+		//gather all streams depending on our base
+		for (i=0; i<count; i++) {
+			GF_DashStream *a_ds = gf_list_get(ds->complementary_streams, i);
+			assert(a_ds->opid);
+			gf_list_add(ds->multi_tracks, a_ds->opid);
+		}
+		gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_TRACK, &PROP_POINTER(ds->multi_tracks) );
+	}
+	if (ds->dep_id) {
+		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);
+		if (gf_list_count(ds->multi_tracks)) {
+			gf_filter_pid_set_property(ds->opid, GF_PROP_PID_DASH_MULTI_TRACK, &PROP_POINTER(ds->multi_tracks) );
+		} else {
+			gf_list_del(ds->multi_tracks);
+			ds->multi_tracks = NULL;
+		}
+
+	}
+}
+
+static Bool dasher_template_use_source_url(const char *template)
+{
+	if (strstr(template, "$File$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$FSRC$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$SourcePath$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$FURL$") != NULL) return GF_TRUE;
+	else if (strstr(template, "$URL$") != NULL) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static void dasher_set_content_components(GF_DashStream *ds)
+{
+	GF_MPD_ContentComponent *component;
+	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
+
+	GF_SAFEALLOC(component, GF_MPD_ContentComponent);
+	if (!component) return;
+
+	component->id = ds->pid_id;
+	switch (ds->stream_type) {
+	case GF_STREAM_TEXT:
+		component->type = gf_strdup("text");
+		break;
+	case GF_STREAM_VISUAL:
+		component->type = gf_strdup("video");
+		break;
+	case GF_STREAM_AUDIO:
+		component->type = gf_strdup("audio");
+		break;
+	case GF_STREAM_SCENE:
+	case GF_STREAM_OD:
+	default:
+		component->type = gf_strdup("application");
+		break;
+	}
+	/*if lang not specified at adaptationSet level, put it here*/
+	if (!base_ds->set->lang && ds->lang && strcmp(ds->lang, "und")) {
+		component->lang = gf_strdup(ds->lang);
+	}
+	gf_list_add(base_ds->set->content_component, component);
+}
+
+static void dasher_setup_sources(GF_Filter *filter, GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
+{
+	char szDASHTemplate[GF_MAX_PATH];
+	char szTemplate[GF_MAX_PATH];
+	char szSegmentName[GF_MAX_PATH];
+	char szInitSegmentTemplate[GF_MAX_PATH];
+	char szInitSegmentFilename[GF_MAX_PATH];
+	char szIndexSegmentName[GF_MAX_PATH];
+	char szSetFileSuffix[200], szDASHSuffix[220];
+	const char *template;
+	u32 as_id = 0;
+	Bool single_template = GF_TRUE;
+	u32 i, j, count, nb_base, nb_streams;
+	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 template_use_source = GF_FALSE;
+	Bool split_rep_names = GF_FALSE;
+	Bool split_set_names = GF_FALSE;
+	GF_DashStream *ds;
+	GF_MPD_Representation *rep = gf_list_get(set->representations, 0);
+	if (!rep) {
+		assert(0);
+		return;
+	}
+	ds = rep->playback.udta;
+
+	count = gf_list_count(set->representations);
+
+	assert(ctx->template);
+	template = ((GF_DashStream *)set->udta)->template;
+
+	for (i=0; i<count; i++) {
+		rep = gf_list_get(set->representations, i);
+		ds = rep->playback.udta;
+		if (!ds->template && !template) {}
+		else if (ds->template && template && !strcmp(ds->template, template) ) {
+		} else {
+			single_template = GF_FALSE;
+		}
+		if (ds->template) template_use_source = dasher_template_use_source_url(ds->template);
+
+		if (template_use_source) {
+			single_template = GF_FALSE;
+		}
+
+		if (ds->as_id && !as_id)
+			as_id = ds->as_id;
+
+		if (ds->fps.den && ( (ds->fps.num*set->max_framerate.den) >= (s32) (set->max_framerate.num*ds->fps.den) )) {
+			set->max_framerate.num = ds->fps.num;
+			set->max_framerate.den = ds->fps.den;
+			gf_media_get_reduced_frame_rate(&set->max_framerate.num, &set->max_framerate.den);
+		}
+		if (ds->width && ds->height) {
+			if (!set->par) {
+				GF_SAFEALLOC(set->par, GF_MPD_Fractional);
+			}
+			if (set->par) {
+				set->par->num = ds->width;
+				set->par->den = ds->height;
+				gf_media_reduce_aspect_ratio(&set->par->num, &set->par->den);
+			}
+		}
+	}
+	if (!template) template = ctx->template;
+
+	if (as_id) {
+		set->id = ds->as_id;
+	}
+	if (ctx->sseg) {
+		set->segment_alignment = GF_TRUE;
+		set->starts_with_sap = 1;
+	}
+
+	if (count==1)
+		single_template = GF_TRUE;
+	else if (single_template) {
+		//for regular reps, if we depend on filename we cannot mutualize the template
+		if (dasher_template_use_source_url(template) ) {
+			single_template = GF_FALSE;
+		}
+		//and for scalable reps, if we don't have bandwidth /repID we cannot mutualize the template
+		else if (gf_list_count(ds->complementary_streams) ) {
+			if (strstr(template, "$Bandwidth$") != NULL) single_template = GF_FALSE;
+			else if (strstr(template, "$RepresentationId$") != NULL) single_template = GF_FALSE;
+		}
+	}
+
+	if (set->lang) gf_free(set->lang);
+	set->lang = gf_strdup(ds->lang ? ds->lang : "und");
+
+	//check all streams in active period not in this set
+	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 (ads->set == set) continue;
+		frag_uri = strrchr(ds->src_url, '#');
+		if (frag_uri) len1 = (u32) (frag_uri-1 - ds->src_url);
+		else len1 = (u32) strlen(ds->src_url);
+		frag_uri = strrchr(ads->src_url, '#');
+		if (frag_uri) len2 = (u32) (frag_uri-1 - ads->src_url);
+		else len2 = (u32) strlen(ads->src_url);
+
+		if ((len1==len2) && !strncmp(ds->src_url, ads->src_url, len1)) {
+			split_set_names = GF_TRUE;
+			break;
+		}
+	}
+
+	if (split_set_names) {
+		sprintf(szSetFileSuffix, "_track%d_", ds->id);
+	}
+
+	if (ctx->timescale>0) {
+		set_timescale = ctx->timescale;
+	} else {
+		u32 first_timescale;
+		rep = gf_list_get(set->representations, 0);
+		ds = rep->playback.udta;
+		first_timescale = ds->timescale;
+		for (i=1; i<count; i++) {
+			rep = gf_list_get(set->representations, i);
+			ds = rep->playback.udta;
+			if (ds->timescale != first_timescale) {
+				//we cannot use a single template if enforcing timescales which are not identical
+				single_template = GF_FALSE;
+				break;
+			}
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		rep = gf_list_get(set->representations, i);
+		ds = rep->playback.udta;
+
+		if (!dasher_template_use_source_url(template))
+			continue;
+
+		if (ds->muxed_base)
+			continue;
+
+		for (j=i+1; j<count; j++) {
+			const GF_PropertyValue *p1, *p2;
+			GF_DashStream *a_ds;
+			rep = gf_list_get(set->representations, j);
+			a_ds = rep->playback.udta;
+
+			if (a_ds->muxed_base == ds)
+				continue;
+
+			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;
+			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 (split_rep_names) break;
+		}
+		if (split_rep_names) break;
+	}
+
+	//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++) {
+		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) {
+			ctx->next_pid_id_in_period++;
+			ds->pid_id = ctx->next_pid_id_in_period;
+
+			for (j=i+1; j<count; j++) {
+				GF_DashStream *a_ds;
+				rep = gf_list_get(set->representations, j);
+				a_ds = rep->playback.udta;
+				if (a_ds->pid_id) continue;
+				if (a_ds->dep_id) continue;
+				if (a_ds->stream_type == ds->stream_type) a_ds->pid_id = ds->pid_id;
+			}
+		}
+		//otherwise copy over the source PID
+		else {
+			ds->pid_id = ds->id;
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		rep = gf_list_get(set->representations, i);
+		ds = rep->playback.udta;
+		if (!ds->dep_id) continue;
+
+		for (j=i+1; j<count; j++) {
+			GF_DashStream *a_ds;
+			rep = gf_list_get(set->representations, j);
+			a_ds = rep->playback.udta;
+			if (ds->dep_id == a_ds->id) {
+				ds->dep_pid_id = a_ds->pid_id;
+				break;
+			}
+		}
+	}
+
+	//this is crude because we don't copy the properties, we just pass a list of pids to the destination muxer !!
+	//we should cleanup one of these days
+	if (set->bitstream_switching && (ctx->bs_switch==DASHER_BS_SWITCH_MULTI)) {
+		multi_pids = gf_list_new();
+		for (i=0; i<count; i++) {
+			rep = gf_list_get(set->representations, i);
+			ds = rep->playback.udta;
+			if (ds->owns_set) ds->multi_pids = multi_pids;
+			gf_list_add(multi_pids, ds->ipid);
+		}
+	}
+
+	if (ctx->cp!=GF_DASH_CPMODE_REPRESENTATION) {
+		gf_mpd_del_list(set->content_protection, gf_mpd_descriptor_free, 0);
+		set->content_protection = dasher_get_content_protection_desc(ctx, NULL, set);
+	}
+
+	for (i=0; i<count; i++) {
+		GF_Err e;
+		char szRawExt[20];
+		Bool use_dash_suffix = GF_FALSE;
+		const char *seg_ext, *init_ext, *idx_ext;
+		Bool skip_init = GF_FALSE;
+		Bool is_bs_switch;
+		u32 init_template_mode = GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE;
+		rep = gf_list_get(set->representations, i);
+		ds = rep->playback.udta;
+
+		//remove representations for streams muxed with others, but still open the output
+		if (ds->muxed_base) {
+			GF_DashStream *ds_set = set->udta;
+			gf_list_rem(set->representations, i);
+			i--;
+			count--;
+			assert(ds_set->nb_rep);
+			ds_set->nb_rep--;
+			assert(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);
+			gf_list_transfer(ds->muxed_base->rep->supplemental_properties , rep->supplemental_properties);
+
+			gf_mpd_representation_free(ds->rep);
+			ds->rep = NULL;
+
+			if (!gf_list_count(ds->set->content_component)) {
+				dasher_set_content_components(ds->muxed_base);
+			}
+			dasher_set_content_components(ds);
+			assert(!multi_pids);
+			//open PID
+			dasher_open_pid(filter, ctx, ds, NULL, GF_FALSE);
+			continue;
+		}
+		if (ds->template) strcpy(szTemplate, ds->template);
+		else strcpy(szTemplate, ctx->template);
+
+		if (use_inband)
+			ds->inband_params = GF_TRUE;
+
+		//if bitstream switching and templating, only set for the first one
+		if (i && set->bitstream_switching && ctx->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 (ds->nb_repeat && !ctx->loop) {
+			if (split_set_names) {
+				sprintf(szDASHSuffix, "%sp%d_", szSetFileSuffix, ds->nb_repeat+1);
+			} else {
+				sprintf(szDASHSuffix, "p%d_", ds->nb_repeat);
+			}
+			use_dash_suffix = GF_TRUE;
+		} else if (split_set_names) {
+			strcpy(szDASHSuffix, szSetFileSuffix);
+			use_dash_suffix = GF_TRUE;
+		}
+
+		//resolve segment template
+		e = gf_filter_pid_resolve_file_template(ds->ipid, szTemplate, szDASHTemplate, 0, use_dash_suffix ? szDASHSuffix : NULL);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Cannot resolve template name %s, cannot derive output segment names, disabling rep %s\n", szTemplate, ds->src_url));
+			gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+			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)  );
+			strcat(szDASHTemplate, szStrName);
+		}
+		else if (split_rep_names) {
+			char szStrName[20];
+			sprintf(szStrName, "_rep%d", 1 + gf_list_find(set->representations, ds->rep)  );
+			strcat(szDASHTemplate, szStrName);
+		}
+
+		idx_ext = NULL;
+		if (ctx->m2ts) {
+			seg_ext = init_ext = "ts";
+			if (!ctx->do_m3u8 && (ctx->subs_sidx>=0) )
+				idx_ext = "idx";
+		} else {
+			const char *def_ext = NULL;
+
+			seg_ext = init_ext = NULL;
+
+			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);
+				szRawExt[19] = 0;
+				ext = strchr(szRawExt, '|');
+				if (ext) ext[0] = 0;
+				def_ext = szRawExt;
+			}
+
+			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";
+			}
+		}
+
+		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;
+
+		//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);
+		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);
+
+		//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);
+			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);
+		}
+
+		//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);
+
+		//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);
+
+		if (ctx->sigfrag) {
+			strcpy(szInitSegmentFilename, gf_file_basename(ds->src_url));
+			strcpy(szSegmentName, gf_file_basename(ds->src_url));
+			strcpy(szInitSegmentTemplate, gf_file_basename(ds->src_url));
+		}
+
+		if (ctx->store_seg_states) {
+			assert(!ds->pending_segment_states);
+			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;
+		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);
+			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;
+		else if (ctx->muxtype==DASHER_MUX_TS) skip_init = GF_TRUE;
+
+
+		//we use segment template
+		if (ctx->tpl) {
+			GF_MPD_SegmentTemplate *seg_template;
+			//bs switching but multiple templates
+			if ((!i && (set->bitstream_switching || single_template) )) {
+				init_template_done = GF_TRUE;
+				seg_template = NULL;
+				if (!skip_init || single_template) {
+					GF_SAFEALLOC(seg_template, GF_MPD_SegmentTemplate);
+					if (seg_template)
+						seg_template->initialization = skip_init ? NULL : gf_strdup(szInitSegmentTemplate);
+				}
+
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+
+				if (single_template) {
+					seg_template->media = gf_strdup(szSegmentName);
+					if (ds->idx_template)
+						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);
+					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;
+			}
+			if (i || !single_template) {
+				GF_SAFEALLOC(seg_template, GF_MPD_SegmentTemplate);
+				if (seg_template) {
+					if (!init_template_done) {
+						seg_template->initialization = skip_init ? NULL : gf_strdup(szInitSegmentTemplate);
+						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+					} else if (i) {
+						dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, GF_TRUE);
+					}
+					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->timescale = ds->mpd_timescale;
+					seg_template->start_number = ds->startNumber ? ds->startNumber : 1;
+					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);
+
+			GF_SAFEALLOC(baseURL, GF_MPD_BaseURL);
+			if (!baseURL) continue;
+
+			if (!rep->base_URLs) rep->base_URLs = gf_list_new();
+			gf_list_add(rep->base_URLs, baseURL);
+
+			if (ctx->sseg) {
+				GF_MPD_SegmentBase *segment_base;
+				baseURL->URL = gf_strdup(szInitSegmentFilename);
+				GF_SAFEALLOC(segment_base, GF_MPD_SegmentBase);
+				if (!segment_base) continue;
+				rep->segment_base = segment_base;
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, GF_FALSE);
+			} else {
+				GF_MPD_SegmentList *seg_list;
+				GF_SAFEALLOC(seg_list, GF_MPD_SegmentList);
+				if (!seg_list) continue;
+				GF_SAFEALLOC(seg_list->initialization_segment, GF_MPD_URL);
+				if (!seg_list->initialization_segment) continue;
+				seg_list->start_number = (u32) -1;
+				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->segment_URLs = gf_list_new();
+				rep->segment_list = seg_list;
+				ds->pending_segment_urls = gf_list_new();
+
+				dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+			}
+		}
+		//no template, no single file, we need a file list
+		else {
+			GF_MPD_SegmentList *seg_list;
+			GF_SAFEALLOC(seg_list, GF_MPD_SegmentList);
+			if (!seg_list) continue;
+
+			if (!skip_init) {
+				GF_SAFEALLOC(seg_list->initialization_segment, GF_MPD_URL);
+				if (!seg_list->initialization_segment) continue;
+
+				seg_list->initialization_segment->sourceURL = gf_strdup(szInitSegmentFilename);
+			}
+			seg_list->dasher_segment_name = gf_strdup(szSegmentName);
+			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);
+			rep->segment_list = seg_list;
+			ds->pending_segment_urls = gf_list_new();
+
+			dasher_open_destination(filter, ctx, rep, szInitSegmentFilename, skip_init);
+		}
+
+		//open PID
+		dasher_open_pid(filter, ctx, ds, multi_pids, skip_init);
+	}
+}
+
+static void dahser_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;
+
+	if (stl_e->repeat_count) {
+		stl_e->repeat_count--;
+		stl_e->start_time += stl_e->duration;
+	} else {
+		u64 start_time = stl_e->start_time + stl_e->duration;
+		gf_list_rem(stl->entries, 0);
+		gf_free(stl_e);
+		stl_e = gf_list_get(stl->entries, 0);
+		if (!stl_e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] No timeline entry after currently removed segment, cannot update start time\n" ));
+			return;
+		}
+
+		if (!stl_e->start_time) stl_e->start_time = start_time;
+		else if (stl_e->start_time != start_time) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Mismatch in segment timeline while purging, new start time "LLU" but entry indicates "LLU", keeping original one\n", start_time, stl_e->start_time ));
+		}
+	}
+}
+
+static void dasher_purge_segments(GF_DasherCtx *ctx, u64 *period_dur)
+{
+	Double min_valid_mpd_time;
+	u64 max_rem_dur = 0;
+	u32 i, count;
+
+	//non-static mode, purge segments
+	if (ctx->dmode == GF_MPD_TYPE_STATIC) return;
+	if (ctx->tsb<0) return;
+
+
+	min_valid_mpd_time = (Double) *period_dur;
+	min_valid_mpd_time /= 1000;
+	min_valid_mpd_time -= ctx->tsb;
+	//negative asto, we produce segments earlier but we don't want to delete them before the asto
+	if (ctx->asto<0) {
+		min_valid_mpd_time += ctx->asto;
+	}
+	if (min_valid_mpd_time<=0) return;
+
+	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->muxed_base) continue;
+		if (!ds->rep) continue;
+		if (!ds->rep->state_seg_list) continue;
+
+		while (1) {
+			Double time, dur;
+			GF_DASH_SegmentContext *sctx = gf_list_get(ds->rep->state_seg_list, 0);
+			if (!sctx) break;
+			/*not yet flushed*/
+			if (gf_list_find(ds->pending_segment_states, sctx)>=0) break;
+			time = (Double) sctx->time;
+			time /= ds->mpd_timescale;
+			dur = (Double) sctx->dur;
+			dur/= ds->timescale;
+			if (time + dur >= min_valid_mpd_time) break;
+			if (sctx->filepath) {
+				GF_FilterEvent evt;
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] removing segment %s\n", sctx->filename ? sctx->filename : sctx->filepath));
+
+				GF_FEVT_INIT(evt, GF_FEVT_FILE_DELETE, ds->opid);
+				evt.file_del.url = sctx->filepath;
+				gf_filter_pid_send_event(ds->opid, &evt);
+
+				if (sctx->filename) gf_free(sctx->filename);
+				gf_free(sctx->filepath);
+			}
+
+			if (ds->rep->segment_list) {
+				GF_MPD_SegmentURL *surl = gf_list_pop_front(ds->rep->segment_list->segment_URLs);
+				gf_mpd_segment_url_free(surl);
+			}
+			//not an else due to inheritance
+			if (ds->owns_set && ds->set->segment_list) {
+				GF_MPD_SegmentURL *surl = gf_list_pop_front(ds->set->segment_list->segment_URLs);
+				gf_mpd_segment_url_free(surl);
+			}
+			if (ds->rep->segment_template) {
+				if (ds->rep->segment_template->segment_timeline) {
+					dahser_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);
+				}
+			}
+
+			ds->nb_segments_purged ++;
+			ds->dur_purged += dur;
+			assert(gf_list_find(ds->pending_segment_states, sctx)<0);
+			gf_free(sctx);
+			gf_list_rem(ds->rep->state_seg_list, 0);
+		}
+		if (max_rem_dur < ds->dur_purged*1000) max_rem_dur = (u64) (ds->dur_purged * 1000);
+		//final flush to static of live session: update start number
+		if (ctx->dmode!=GF_MPD_TYPE_DYNAMIC) {
+			if (ds->owns_set && ds->set && ds->set->segment_template) {
+				ds->set->segment_template->start_number += ds->nb_segments_purged;
+			} else if (ds->rep && ds->rep->segment_template) {
+				ds->rep->segment_template->start_number += ds->nb_segments_purged;
+			}
+			ds->nb_segments_purged = 0;
+		}
+	}
+	//final flush to static of live session: update period duration
+	if (ctx->dmode!=GF_MPD_TYPE_DYNAMIC) {
+		if (max_rem_dur > *period_dur) *period_dur = 0;
+		else *period_dur = *period_dur - max_rem_dur;
+	}
+}
+
+static void dasher_update_period_duration(GF_DasherCtx *ctx, Bool is_period_switch)
+{
+	u32 i, count;
+	u64 pdur = 0;
+	u64 min_dur = 0;
+	u64 p_start=0;
+	GF_MPD_Period *prev_p = NULL;
+	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->muxed_base) continue;
+
+		if (ds->xlink) {
+			pdur = (u32) (1000*ds->period_dur);
+		} else {
+			u64 ds_dur = ds->max_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->dur_purged && (ctx->mpd->type != GF_MPD_TYPE_DYNAMIC)) {
+				u64 rem_dur = (u64) (ds->dur_purged * 1000);
+				if (ds_dur>rem_dur) ds_dur -= rem_dur;
+				else ds_dur = 0;
+			}
+
+			if (!min_dur || (min_dur > ds_dur)) min_dur = ds->max_period_dur;
+			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 (!ctx->check_dur) {
+		s32 diff = (s32) ((s64) pdur - (s64) min_dur);
+		if (ABS(diff)>2000) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Adaptation sets in period are of unequal duration min %g max %g seconds\n", ((Double)min_dur)/1000, ((Double)pdur)/1000));
+		}
+	}
+
+	dasher_purge_segments(ctx, &pdur);
+
+	if (ctx->current_period->period) {
+		ctx->current_period->period->duration = pdur;
+
+		//update MPD duration in any case
+		if (ctx->current_period->period->start) {
+			ctx->mpd->media_presentation_duration = ctx->current_period->period->start + pdur;
+		} else {
+			u32 k, pcount = gf_list_count(ctx->mpd->periods);
+			ctx->mpd->media_presentation_duration = 0;
+			for (k=0; k<pcount; k++) {
+				GF_MPD_Period *p = gf_list_get(ctx->mpd->periods, k);
+				if (p->start)
+					ctx->mpd->media_presentation_duration = p->start + p->duration;
+				else
+					ctx->mpd->media_presentation_duration += p->duration;
+				if (p==ctx->current_period->period)
+					break;
+			}
+		}
+	}
+
+	if (ctx->refresh<0)
+		ctx->mpd->media_presentation_duration = (u32) ( (-ctx->refresh) * 1000 );
+
+	//static mode, done
+	if (ctx->dmode != GF_MPD_TYPE_DYNAMIC) {
+		return;
+	}
+	assert(ctx->current_period->period);
+	//dynamic mode only, reset durations
+
+	ctx->mpd->gpac_mpd_time = ctx->mpd->media_presentation_duration;
+
+	//not done yet for this period, keep duration to 0
+	if (ctx->subdur_done) {
+		if (ctx->mpd->media_presentation_duration > ctx->current_period->period->duration)
+			ctx->mpd->media_presentation_duration -= ctx->current_period->period->duration;
+		else
+			ctx->mpd->media_presentation_duration = 0;
+		ctx->current_period->period->duration = 0;
+	}
+
+	ctx->mpd->gpac_next_ntp_ms = ctx->mpd->gpac_init_ntp_ms + ctx->mpd->gpac_mpd_time;
+	if (ctx->asto<0)
+		ctx->mpd->gpac_next_ntp_ms -= (u64) (-ctx->asto * 1000);
+	if (ctx->_p_gentime) (*ctx->_p_gentime) = ctx->mpd->gpac_next_ntp_ms;
+	if (ctx->_p_mpdtime) (*ctx->_p_mpdtime) = ctx->mpd->gpac_mpd_time;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] updated period %s duration "LLU" MPD time "LLU"\n", ctx->current_period->period->ID, pdur, ctx->mpd->gpac_mpd_time ));
+
+	count = gf_list_count(ctx->mpd->periods);
+	for (i=0; i<count; i++) {
+		GF_MPD_Period *p = gf_list_get(ctx->mpd->periods, i);
+		if (p->start) {
+			p_start = p->start;
+		} else {
+			p->start = p_start;
+		}
+		if (prev_p && (prev_p->start + prev_p->duration == p_start)) {
+			prev_p->duration = 0;
+		}
+		p_start += p->duration;
+		prev_p = p;
+	}
+}
+
+static void dasher_transfer_file(FILE *f, GF_FilterPid *opid, const char *name)
+{
+	GF_FilterPacket *pck;
+	u32 size, nb_read;
+	u8 *output;
+
+	size = (u32) gf_fsize(f);
+
+	pck = gf_filter_pck_new_alloc(opid, size, &output);
+	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) );
+	}
+	gf_filter_pck_send(pck);
+}
+
+GF_Err dasher_send_manifest(GF_Filter *filter, GF_DasherCtx *ctx, Bool for_mpd_only)
+{
+	GF_Err e;
+	u32 i, max_opid;
+	FILE *tmp;
+	u64 store_mpd_dur=0;
+	u64 max_seg_dur=0;
+	u64 last_period_dur;
+	//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
+	if (gf_sys_old_arch_compat() && (ctx->mpd->max_segment_duration==1022) && (ctx->mpd->media_presentation_duration==10160) ) {
+		ctx->mpd->max_segment_duration = 1080;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] patch for old regression tests hit, changing max seg dur from 1022 to 1080\nPlease notify GPAC devs to remove this, and do not use fot_test modes in dash filter\n"));
+	}
+
+	ctx->mpd->publishTime = gf_net_get_utc();
+	dasher_update_mpd(ctx);
+	ctx->mpd->write_context = GF_FALSE;
+	ctx->mpd->was_dynamic = GF_FALSE;
+	if (ctx->dmode==GF_DASH_DYNAMIC_LAST)
+		ctx->mpd->was_dynamic = GF_TRUE;
+
+	if ((ctx->refresh>=0) && (ctx->dmode==GF_DASH_DYNAMIC)) {
+		store_mpd_dur= ctx->mpd->media_presentation_duration;
+	}
+
+	if (ctx->sseg && ctx->mpd->max_segment_duration) {
+		max_seg_dur = ctx->mpd->max_subsegment_duration = ctx->mpd->max_segment_duration;
+		ctx->mpd->max_segment_duration = 0;
+	}
+
+	last_period_dur = 0;
+	if (ctx->current_period->period) {
+		last_period_dur = ctx->current_period->period->duration;
+		if (ctx->dmode==GF_DASH_DYNAMIC) {
+			ctx->current_period->period->duration = 0;
+			ctx->mpd->media_presentation_duration = 0;
+		}
+	}
+
+	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) {
+			if (max_opid>1) {
+				do_m3u8 = ctx->opid_alt_m3u8 ? GF_FALSE : GF_TRUE;
+			} else {
+				do_m3u8 = ctx->do_m3u8;
+			}
+			opid = ctx->opid;
+		} else {
+			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;
+		}
+
+		dasher_transfer_file(tmp, opid, NULL);
+		gf_fclose(tmp);
+	}
+
+	if (ctx->current_period->period)
+		ctx->current_period->period->duration = last_period_dur;
+
+	if (store_mpd_dur) {
+		ctx->mpd->media_presentation_duration = store_mpd_dur;
+	}
+	if (max_seg_dur) {
+		ctx->mpd->max_segment_duration = (u32) max_seg_dur;
+		ctx->mpd->max_subsegment_duration = 0;
+	}
+
+	if (ctx->do_m3u8) {
+		u32 j;
+		GF_MPD_Period *period = gf_list_get(ctx->mpd->periods, 0);
+		GF_MPD_AdaptationSet *as;
+		GF_MPD_Representation *rep;
+		assert(period);
+		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) {
+					char *outfile = rep->m3u8_var_name;
+					Bool do_free = GF_FALSE;
+
+					if (rep->m3u8_name) {
+						outfile = (char *) rep->m3u8_name;
+						if (ctx->out_path) {
+							outfile = gf_url_concatenate(ctx->out_path, rep->m3u8_name);
+							do_free = GF_TRUE;
+						}
+					}
+					dasher_transfer_file(rep->m3u8_var_file, ctx->opid, outfile);
+					gf_fclose(rep->m3u8_var_file);
+					rep->m3u8_var_file = NULL;
+					if (do_free) gf_free(outfile);
+				}
+			}
+		}
+	}
+
+
+	if (ctx->state) {
+		tmp = gf_fopen(ctx->state, "w");
+		if (!tmp) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] failed to open context MPD %s for write\n", ctx->state ));
+			return GF_IO_ERR;
+		}
+		ctx->mpd->write_context = GF_TRUE;
+		e = gf_mpd_write(ctx->mpd, tmp, ctx->cmpd);
+		gf_fclose(tmp);
+		ctx->mpd->write_context = GF_FALSE;
+		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;
+	}
+	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
+
+	ds->dst_filter = NULL;
+	if (ds->seg_template) gf_free(ds->seg_template);
+	if (ds->idx_template) gf_free(ds->idx_template);
+	if (ds->init_seg) gf_free(ds->init_seg);
+	if (ds->multi_pids) gf_list_del(ds->multi_pids);
+	ds->multi_pids = NULL;
+	if (ds->multi_tracks) gf_list_del(ds->multi_tracks);
+	ds->multi_tracks = NULL;
+
+	if (ds->pending_segment_urls) gf_list_del(ds->pending_segment_urls);
+	ds->pending_segment_urls = NULL;
+	if (ds->pending_segment_states) gf_list_del(ds->pending_segment_states);
+	ds->pending_segment_states = NULL;
+
+	if (is_destroy) {
+		if (ds->cues) gf_free(ds->cues);
+		gf_list_del(ds->complementary_streams);
+		gf_free(ds->rep_id);
+		return;
+	}
+	ds->init_seg = ds->seg_template = ds->idx_template = NULL;
+	ds->split_set_names = GF_FALSE;
+	ds->nb_sap_3 = 0;
+	ds->nb_sap_4 = 0;
+	ds->pid_id = 0;
+	ds->force_timescale = 0;
+	ds->set = NULL;
+	ds->owns_set = GF_FALSE;
+	ds->rep = NULL;
+	ds->muxed_base = NULL;
+	ds->nb_comp = ds->nb_comp_done = 0;
+	gf_list_reset(ds->complementary_streams);
+	ds->inband_params = GF_FALSE;
+	ds->seg_start_time = 0;
+	ds->seg_number = ds->startNumber;
+	ds->nb_segments_purged = 0;
+	ds->dur_purged = 0;
+	ds->moof_sn_inc = 0;
+	ds->moof_sn = 0;
+	ds->seg_done = 0;
+	ds->subdur_done = 0;
+	if (ds->packet_queue) {
+		while (gf_list_count(ds->packet_queue)) {
+			GF_FilterPacket *pck = gf_list_pop_front(ds->packet_queue);
+			gf_filter_pck_unref(pck);
+		}
+		ds->nb_sap_in_queue = 0;
+	}
+}
+
+void dasher_context_update_period_end(GF_DasherCtx *ctx)
+{
+	u32 i, count;
+
+	if (!ctx->mpd) return;
+
+	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->rep) continue;
+		if (!ds->rep->dasher_ctx) continue;
+		if (ds->done == 1) {
+			ds->rep->dasher_ctx->done = 1;
+		} else {
+			//store all dynamic parameters of the rep
+			ds->rep->dasher_ctx->last_pck_idx = ds->nb_pck;
+			ds->seek_to_pck = ds->nb_pck;
+			ds->rep->dasher_ctx->seg_number = ds->seg_number;
+			ds->rep->dasher_ctx->next_seg_start = ds->next_seg_start;
+			ds->rep->dasher_ctx->first_cts = ds->first_cts;
+			ds->rep->dasher_ctx->first_dts = ds->first_dts;
+			ds->rep->dasher_ctx->ts_offset = ds->ts_offset;
+			ds->rep->dasher_ctx->segs_purged = ds->nb_segments_purged;
+			ds->rep->dasher_ctx->dur_purged = ds->dur_purged;
+			ds->rep->dasher_ctx->moof_sn = ds->moof_sn;
+			ds->rep->dasher_ctx->moof_sn_inc = ds->moof_sn_inc;
+		}
+		if (ctx->subdur) {
+			ds->rep->dasher_ctx->cumulated_subdur = ds->cumulated_subdur + ctx->subdur;
+			ds->rep->dasher_ctx->cumulated_dur = ((Double)ds->cumulated_dur) / ds->timescale;
+
+		}
+		ds->rep->dasher_ctx->nb_repeat = ds->nb_repeat;
+		ds->rep->dasher_ctx->est_next_dts = ds->est_next_dts;
+		ds->rep->dasher_ctx->source_pid = ds->id;
+		ds->rep->dasher_ctx->mpd_timescale = ds->mpd_timescale;
+		ds->rep->dasher_ctx->last_dyn_period_id = ctx->last_dyn_period_id;
+
+		assert(ds->rep->dasher_ctx->init_seg);
+		assert(ds->rep->dasher_ctx->src_url);
+		assert(ds->rep->dasher_ctx->template_seg);
+	}
+}
+
+void dasher_context_update_period_start(GF_DasherCtx *ctx)
+{
+	u32 i, j, count;
+
+	if (!ctx->mpd) return;
+	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->rep) continue;
+		if (ds->rep->dasher_ctx) continue;
+
+		//store all static parameters of the rep
+		GF_SAFEALLOC(ds->rep->dasher_ctx, GF_DASH_SegmenterContext);
+		if (!ds->rep->dasher_ctx) return;
+
+		ds->rep->dasher_ctx->done = 0;
+
+		assert(ds->init_seg);
+		ds->rep->dasher_ctx->init_seg = gf_strdup(ds->init_seg);
+		assert(ds->src_url);
+		ds->rep->dasher_ctx->src_url = gf_strdup(ds->src_url);
+		assert(ds->seg_template);
+		ds->rep->dasher_ctx->template_seg = gf_strdup(ds->seg_template);
+		if (ds->idx_template)
+			ds->rep->dasher_ctx->template_idx = gf_strdup(ds->idx_template);
+
+		ds->rep->dasher_ctx->pid_id = ds->pid_id;
+		ds->rep->dasher_ctx->dep_pid_id = ds->dep_pid_id;
+		ds->rep->dasher_ctx->period_start = ds->period_start;
+		ds->rep->dasher_ctx->period_duration = ds->period_dur;
+		ds->rep->dasher_ctx->multi_pids = ds->multi_pids ? GF_TRUE : GF_FALSE;
+		ds->rep->dasher_ctx->dash_dur = ds->dash_dur;
+
+		if (strcmp(ds->period_id, DEFAULT_PERIOD_ID))
+			ds->rep->dasher_ctx->period_id = ds->period_id;
+
+		ds->rep->dasher_ctx->owns_set = (ds->set->udta == ds) ? GF_TRUE : GF_FALSE;
+
+		if (ds->rep->dasher_ctx->mux_pids) gf_free(ds->rep->dasher_ctx->mux_pids);
+		ds->rep->dasher_ctx->mux_pids = NULL;
+		for (j=0; j<count; j++) {
+			char szMuxPID[10];
+			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+			if (a_ds==ds) continue;
+			if (a_ds->muxed_base != ds) continue;
+
+			if (ds->rep->dasher_ctx->mux_pids)
+				sprintf(szMuxPID, " %d", a_ds->id);
+			else
+				sprintf(szMuxPID, "%d", a_ds->id);
+
+			gf_dynstrcat(&ds->rep->dasher_ctx->mux_pids, szMuxPID, NULL);
+		}
+
+	}
+}
+
+static GF_DashStream *dasher_get_stream(GF_DasherCtx *ctx, const char *src_url, u32 original_pid, u32 pid_id)
+{
+	u32 i, count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (pid_id && (ds->pid_id==pid_id)) return ds;
+		if (src_url && ds->src_url && !strcmp(ds->src_url, src_url) && (ds->id == original_pid) ) return ds;
+	}
+	return NULL;
+}
+
+static GF_Err dasher_reload_muxed_comp(GF_DasherCtx *ctx, GF_DashStream *base_ds, char *mux_pids, Bool check_only)
+{
+	GF_Err e = GF_OK;
+	while (mux_pids) {
+		u32 pid_id;
+		GF_DashStream *ds;
+		char *sep = strchr(mux_pids, ' ');
+		if (sep) sep[0] = 0;
+
+		pid_id = atoi(mux_pids);
+		ds = dasher_get_stream(ctx, base_ds->src_url, pid_id, 0);
+		if (ds) {
+			if (!check_only) {
+				if (ds->rep) gf_mpd_representation_free(ds->rep);
+				ds->rep = NULL;
+				ds->set = base_ds->set;
+				ds->muxed_base = base_ds;
+				base_ds->nb_comp ++;
+				ds->nb_comp = 1;
+				ds->done = base_ds->done;
+				ds->subdur_done = base_ds->subdur_done;
+				ds->period = ctx->current_period;
+
+				gf_list_del_item(ctx->next_period->streams, ds);
+				gf_list_add(ctx->current_period->streams, ds);
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Couldn't find muxed PID %d in source %s, did you modify the source ?\n", pid_id, base_ds->src_url));
+			e = GF_BAD_PARAM;
+		}
+
+		if (!sep) break;
+		sep[0] = ' ';
+		mux_pids = sep+1;
+
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+static GF_Err dasher_reload_context(GF_Filter *filter, GF_DasherCtx *ctx)
+{
+	GF_Err e;
+	Bool last_period_active = GF_FALSE;
+	u32 i, j, k, nb_p, nb_as, nb_rep, count;
+	GF_DOMParser *mpd_parser;
+
+	ctx->first_context_load = GF_FALSE;
+
+	if (!gf_file_exists(ctx->state)) return GF_OK;
+
+	/* parse the MPD */
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, ctx->state, NULL, NULL);
+
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Cannot parse MPD state %s: %s\n", ctx->state, gf_xml_dom_get_error(mpd_parser) ));
+		gf_xml_dom_del(mpd_parser);
+		return GF_URL_ERROR;
+	}
+	if (ctx->mpd) gf_mpd_del(ctx->mpd);
+	ctx->mpd = gf_mpd_new();
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), ctx->mpd, ctx->state);
+	gf_xml_dom_del(mpd_parser);
+	//test mode, strip URL path
+	if (gf_sys_is_test_mode()) {
+		count = gf_list_count(ctx->mpd->program_infos);
+		for (i=0; i<count; i++) {
+			GF_MPD_ProgramInfo *info = gf_list_get(ctx->mpd->program_infos, i);
+			if (info->title && strstr(info->title, "generated by GPAC")) {
+				gf_free(info->title);
+				char tmp[256];
+				char *name = strrchr(ctx->out_path, '/');
+				if (!name) name = strrchr(ctx->out_path, '\\');
+				if (!name) name = ctx->out_path;
+				else name++;
+				sprintf(tmp, "%s generated by GPAC", name);
+				info->title = gf_strdup(tmp);
+			}
+		}
+	}
+
+	if (!ctx->mpd->xml_namespace)
+		ctx->mpd->xml_namespace = "urn:mpeg:dash:schema:mpd:2011";
+
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Cannot reload MPD state %s: %s\n", ctx->state, gf_error_to_string(e) ));
+		gf_mpd_del(ctx->mpd);
+		ctx->mpd = NULL;
+		return GF_URL_ERROR;
+	}
+
+	//do a first pass to detect any potential changes in input config, if so consider the period over.
+	nb_p = gf_list_count(ctx->mpd->periods);
+	for (i=0; i<nb_p; i++) {
+		u32 nb_done_in_period = 0;
+		u32 nb_remain_in_period = 0;
+		GF_MPD_Period *p = gf_list_get(ctx->mpd->periods, i);
+		nb_as = gf_list_count(p->adaptation_sets);
+		for (j=0; j<nb_as; j++) {
+			GF_MPD_AdaptationSet *set = gf_list_get(p->adaptation_sets, j);
+			nb_rep = gf_list_count(set->representations);
+			for (k=0; k<nb_rep; k++) {
+				GF_DashStream *ds;
+				char *p_id;
+				GF_MPD_Representation *rep = gf_list_get(set->representations, k);
+				if (! rep->dasher_ctx) continue;
+
+				//ensure we have the same settings - if not consider the dash stream has been resetup for a new period
+				ds = dasher_get_stream(ctx, rep->dasher_ctx->src_url, rep->dasher_ctx->source_pid, 0);
+				if (!ds) {
+					rep->dasher_ctx->done = 1;
+					nb_done_in_period++;
+					if (rep->dasher_ctx->last_dyn_period_id >= ctx->last_dyn_period_id)
+						ctx->last_dyn_period_id = 1 + rep->dasher_ctx->last_dyn_period_id;
+					continue;
+				}
+
+				if (rep->dasher_ctx->done) {
+					nb_done_in_period++;
+					ds->nb_repeat = rep->dasher_ctx->nb_repeat + 1;
+					if (rep->dasher_ctx->last_dyn_period_id > ctx->last_dyn_period_id)
+						ctx->last_dyn_period_id = rep->dasher_ctx->last_dyn_period_id;
+					continue;
+				}
+
+				p_id = DEFAULT_PERIOD_ID;
+				if (rep->dasher_ctx->period_id) p_id = rep->dasher_ctx->period_id;
+
+				if (ds->period_id && p_id && !strcmp(ds->period_id, p_id)) {
+				} else if (!ds->period_id && !rep->dasher_ctx->period_id) {
+				} else {
+					rep->dasher_ctx->done = 1;
+					nb_done_in_period++;
+					continue;
+				}
+				if (ds->period_start != rep->dasher_ctx->period_start) {
+					rep->dasher_ctx->done = 1;
+					nb_done_in_period++;
+					continue;
+				}
+				if (ds->period_dur != rep->dasher_ctx->period_duration) {
+					rep->dasher_ctx->done = 1;
+					nb_done_in_period++;
+					continue;
+				}
+				//check we can reload muxed components - if not consider this source as removed
+				if (rep->dasher_ctx->mux_pids) {
+					e = dasher_reload_muxed_comp(ctx, ds, rep->dasher_ctx->mux_pids, GF_TRUE);
+					if (e) {
+						rep->dasher_ctx->done = 1;
+						nb_done_in_period++;
+						continue;
+					}
+				}
+				nb_remain_in_period++;
+			}
+		}
+		if (nb_remain_in_period) {
+			assert(i+1==nb_p);
+			last_period_active = GF_TRUE;
+		}
+		else if (nb_done_in_period && ctx->subdur  ) {
+			//we are done but we loop the entire streams
+			for (j=0; j<gf_list_count(ctx->pids); j++) {
+				GF_DashStream *ds = gf_list_get(ctx->pids, j);
+				ds->done = 0;
+				ds->segment_started = GF_FALSE;
+				ds->seg_done = GF_FALSE;
+				ds->cumulated_dur = 0;
+				ds->cumulated_subdur = 0;
+			}
+		}
+	}
+
+	if (!last_period_active) return GF_OK;
+	ctx->current_period->period = gf_list_last(ctx->mpd->periods);
+	gf_list_reset(ctx->current_period->streams);
+	gf_list_del(ctx->next_period->streams);
+	ctx->next_period->streams = gf_list_clone(ctx->pids);
+
+	if (ctx->current_period->period->duration) {
+		//reset last period duration and cumulated dur of MPD
+		if (ctx->mpd->media_presentation_duration>ctx->current_period->period->duration)
+			ctx->mpd->media_presentation_duration -= ctx->current_period->period->duration;
+		else
+			ctx->mpd->media_presentation_duration = 0;
+		ctx->current_period->period->duration = 0;
+	}
+
+	nb_as = gf_list_count(ctx->current_period->period->adaptation_sets);
+	for (j=0; j<nb_as; j++) {
+		GF_DashStream *set_ds = NULL;
+		GF_List *multi_pids = NULL;
+		Bool use_multi_pid_init = GF_FALSE;
+		GF_MPD_AdaptationSet *set = gf_list_get(ctx->current_period->period->adaptation_sets, j);
+		nb_rep = gf_list_count(set->representations);
+		for (k=0; k<nb_rep; k++) {
+			GF_DashStream *ds;
+			GF_MPD_Representation *rep = gf_list_get(set->representations, k);
+			if (! rep->dasher_ctx) continue;
+
+			ds = dasher_get_stream(ctx, rep->dasher_ctx->src_url, rep->dasher_ctx->source_pid, 0);
+			if (!ds) continue;
+
+			//restore everything
+			ds->done = rep->dasher_ctx->done;
+			ds->seg_number = rep->dasher_ctx->seg_number;
+
+			if (ds->init_seg) gf_free(ds->init_seg);
+			ds->init_seg = gf_strdup(rep->dasher_ctx->init_seg);
+
+			if (ds->seg_template) gf_free(ds->seg_template);
+			ds->seg_template = gf_strdup(rep->dasher_ctx->template_seg);
+
+			if (ds->idx_template) gf_free(ds->idx_template);
+			ds->idx_template = rep->dasher_ctx->template_idx ? gf_strdup(rep->dasher_ctx->template_idx) : NULL;
+
+			if (rep->dasher_ctx->period_id) {
+				if (ds->period_id) gf_free(ds->period_id);
+				ds->period_id = gf_strdup(rep->dasher_ctx->period_id);
+			}
+
+			ds->period_start = rep->dasher_ctx->period_start;
+			ds->period_dur = rep->dasher_ctx->period_duration;
+			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;
+			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;
+			ds->first_dts = rep->dasher_ctx->first_dts;
+			ds->ts_offset = rep->dasher_ctx->ts_offset;
+			ds->est_next_dts = rep->dasher_ctx->est_next_dts;
+			ds->mpd_timescale = rep->dasher_ctx->mpd_timescale;
+			ds->cumulated_dur = (u64) (rep->dasher_ctx->cumulated_dur * ds->timescale);
+			ds->cumulated_subdur = rep->dasher_ctx->cumulated_subdur;
+			ds->rep_init = GF_TRUE;
+			ds->subdur_done = GF_FALSE;
+			ds->nb_pck = 0;
+			if (!ctx->subdur) {
+				ds->nb_pck = ds->seek_to_pck;
+				ds->seek_to_pck = 0;
+			}
+			ds->nb_segments_purged = rep->dasher_ctx->segs_purged;
+			ds->dur_purged = rep->dasher_ctx->dur_purged;
+			ds->moof_sn = rep->dasher_ctx->moof_sn;
+			ds->moof_sn_inc = rep->dasher_ctx->moof_sn_inc;
+			ctx->last_dyn_period_id = rep->dasher_ctx->last_dyn_period_id;
+
+			if (ctx->store_seg_states && !ds->pending_segment_states)
+				ds->pending_segment_states = gf_list_new();
+
+			if (rep->segment_list && !ds->pending_segment_urls)
+				ds->pending_segment_urls = gf_list_new();
+
+			ds->owns_set = rep->dasher_ctx->owns_set;
+			if (ds->owns_set) set_ds = ds;
+
+			if (rep->dasher_ctx->done) {
+				ds->done = 1;
+				if (ds->rep) gf_mpd_representation_free(ds->rep);
+				ds->rep = NULL;
+				continue;
+			}
+
+			ds->nb_comp = 1;
+
+			if (ds->rep) gf_mpd_representation_free(ds->rep);
+			ds->rep = rep;
+			ds->set = set;
+			rep->playback.udta = ds;
+			if (ds->owns_set)
+				set->udta = ds;
+			if (rep->dasher_ctx->multi_pids)
+				use_multi_pid_init = GF_TRUE;
+
+			ds->period = ctx->current_period;
+
+			gf_list_del_item(ctx->next_period->streams, ds);
+
+			//non-muxed component or main comp of muxed goes first in the list
+			if (ds->nb_comp>1) {
+				gf_list_insert(ctx->current_period->streams, ds, 0);
+			} else {
+				gf_list_add(ctx->current_period->streams, ds);
+			}
+
+			if (rep->dasher_ctx->mux_pids) {
+				e = dasher_reload_muxed_comp(ctx, ds, rep->dasher_ctx->mux_pids, GF_FALSE);
+				if (e) return e;
+			}
+		}
+		assert(set_ds);
+		set_ds->nb_rep = gf_list_count(set->representations);
+
+		//if multi PID init, gather pids
+		if (use_multi_pid_init) {
+			multi_pids = gf_list_new();
+			for (i=0; i<nb_rep; i++) {
+				GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+				GF_DashStream *ds = rep->playback.udta;
+				if (ds->owns_set) ds->multi_pids = multi_pids;
+				gf_list_add(multi_pids, ds->ipid);
+			}
+		}
+		count = gf_list_count(ctx->current_period->streams);
+		for (i=0; i<nb_rep; i++) {
+			GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+			GF_DashStream *ds = rep->playback.udta;
+			if (!ds || ds->done) continue;
+			//happens when reloading context without closing the filter
+			if (ds->dst_filter || ds->opid) continue;
+
+			//open destination, trashing init
+			assert(!ds->muxed_base);
+			dasher_open_destination(filter, ctx, rep, ds->init_seg, GF_TRUE);
+
+			dasher_open_pid(filter, ctx, ds, multi_pids, GF_TRUE);
+
+			for (j=0; j<count; j++) {
+				GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+				if (a_ds->muxed_base != ds) continue;
+
+				dasher_open_pid(filter, ctx, a_ds, multi_pids, GF_TRUE);
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+static void dasher_udpate_periods_and_manifest(GF_Filter *filter, GF_DasherCtx *ctx)
+{
+	if (!ctx->subdur_done) {
+		ctx->last_dyn_period_id++;
+		ctx->next_pid_id_in_period = 0;
+	}
+	//update duration
+	dasher_update_period_duration(ctx, GF_TRUE);
+
+	if (ctx->state)
+		dasher_context_update_period_end(ctx);
+
+	//we have a MPD ready, flush it
+	if (ctx->mpd)
+		dasher_send_manifest(filter, ctx, GF_FALSE);
+}
+
+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;
+	char *period_id;
+	const char *remote_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_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->subdur_done || (ctx->current_period->period && (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST)) )
+		return GF_EOS;
+
+	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 : ""));
+	}
+	//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;
+
+	//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) {
+			gf_filter_pid_remove(ds->opid);
+			ds->opid = NULL;
+		}
+		dasher_reset_stream(filter, ds, GF_FALSE);
+		if (ds->reschedule) {
+			ds->reschedule = GF_FALSE;
+			ds->done = 0;
+		}
+	}
+
+	//figure out next period
+	count = gf_list_count(ctx->current_period->streams);
+	period_idx = 0;
+	period_start = -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;
+		} else {
+			if ((period_start<0) || (ds->period_start < period_start)) period_start = ds->period_start;
+		}
+	}
+
+	if (period_start>=0)
+		period_idx = 0;
+
+	if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		//count periods
+		GF_List *streams = gf_list_clone(ctx->current_period->streams);
+		for (i=0; i< gf_list_count(streams); i++) {
+			GF_DashStream *ds = gf_list_get(streams, i);
+			for (j=i+1; j<gf_list_count(streams); j++) {
+				GF_DashStream *a_ds = gf_list_get(streams, i);
+				Bool same_period = GF_FALSE;
+				if (a_ds->period_start == ds->period_start) same_period = GF_TRUE;
+				if (a_ds->period_id && ds->period_id && !strcmp(a_ds->period_id, ds->period_id) ) same_period = GF_TRUE;
+				if (same_period) {
+					nb_periods++;
+					gf_list_rem(streams, j);
+					j--;
+				}
+			}
+		}
+		gf_list_del(streams);
+	}
+
+	if (ctx->first_context_load) {
+		GF_Err e = dasher_reload_context(filter, ctx);
+		if (e) {
+			ctx->setup_failure = e;
+			return e;
+		}
+		if (ctx->current_period->period) is_restore = GF_TRUE;
+
+		if (ctx->dmode==GF_DASH_DYNAMIC_LAST) {
+			dasher_udpate_periods_and_manifest(filter, ctx);
+			count = gf_list_count(ctx->pids);
+			for (i=0; i<count; i++) {
+				GF_DashStream *ds = gf_list_get(ctx->pids, i);
+				gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+			}
+			return GF_EOS;
+		}
+	}
+
+	//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);
+
+		if (ds->done) {
+			in_period=GF_FALSE;
+		} else if (!period_id) {
+			period_id = ds->period_id;
+			first_in_period = ds;
+		} else if (strcmp(period_id, ds->period_id)) {
+			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 (!in_period && (first_in_period == ds))
+				period_id = NULL;
+		}
+
+		//if not in period, move to next period
+		if (!in_period) {
+			gf_list_rem(ctx->current_period->streams, i);
+			i--;
+			count--;
+			ds->period = NULL;
+			gf_list_add(ctx->next_period->streams, ds);
+			continue;
+		}
+		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);
+
+			if (ctx->post_play_events) {
+				GF_FilterEvent evt;
+
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, ds->ipid);
+				gf_filter_pid_send_event(ds->ipid, &evt);
+
+				gf_filter_pid_set_discard(ds->ipid, GF_FALSE);
+
+				GF_FEVT_INIT(evt, GF_FEVT_PLAY, ds->ipid);
+				evt.play.speed = 1.0;
+				gf_filter_pid_send_event(ds->ipid, &evt);
+			}
+		}
+	}
+	ctx->post_play_events = GF_FALSE;
+
+	count = gf_list_count(ctx->current_period->streams);
+	if (!count) {
+		count = gf_list_count(ctx->next_period->streams);
+		nb_done = 0;
+		for (i=0; i<count; i++)	 {
+			GF_DashStream *ds = gf_list_get(ctx->next_period->streams, i);
+			if (ds->done) nb_done++;
+		}
+		if (nb_done == count) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] End of MPD (no more active streams)\n"));
+			return GF_EOS;
+		}
+	}
+
+	//we need a new period unless created during reload, create it
+	if (!is_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);
+	}
+
+
+	if (remote_xlink) {
+		ctx->current_period->period->xlink_href = gf_strdup(remote_xlink);
+		ctx->current_period->period->duration = remote_dur;
+	}
+
+	assert(period_id);
+
+	next_period_start = -1;
+	if (period_start>=0) {
+		ctx->current_period->period->start = (u64)(period_start*1000);
+		//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))
+				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_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))
+				next_period_start = dur;
+		}
+		if (next_period_start>0) {
+			ctx->current_period->period->duration = (u32) ( (next_period_start - period_start) * 1000 );
+		}
+	}
+
+	//assign period ID if none specified
+	if (strcmp(period_id, DEFAULT_PERIOD_ID))
+		ctx->current_period->period->ID = gf_strdup(period_id);
+	//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
+	else if (!ctx->current_period->period->ID && ((ctx->dmode != GF_MPD_TYPE_STATIC) || ctx->state) ) {
+		char szPName[50];
+		sprintf(szPName, "DID%d", ctx->last_dyn_period_id + 1);
+		ctx->current_period->period->ID = gf_strdup(szPName);
+	}
+
+	min_dur = min_adur = max_adur = 0;
+	//setup representation dependency / components (muxed)
+	count = gf_list_count(ctx->current_period->streams);
+	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);
+		ds->period = ctx->current_period;
+
+		if (ctx->loop) {
+			Double d=0;
+			const GF_PropertyValue *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))
+					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;
+				} else {
+					if (!min_dur || (d < min_dur)) min_dur = d;
+				}
+			}
+		}
+
+		if (ds->stream_type == GF_STREAM_FILE) {
+			remove = GF_TRUE;
+		} 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));
+			remove = GF_TRUE;
+		}
+
+		if (remove) {
+			ds->done = 1;
+			ds->period = NULL;
+			gf_list_rem(ctx->current_period->streams, i);
+			gf_list_add(ctx->next_period->streams, ds);
+			i--;
+			count--;
+			continue;
+		}
+
+		if (next_period_start>0) {
+			ds->force_rep_end = (u64) ((next_period_start - period_start) * ds->timescale);
+		}
+
+		if (is_restore) continue;
+
+		//add period descriptors
+		dasher_add_descriptors(&ctx->current_period->period->other_descriptors, ds->p_period_desc);
+		//add representation descriptors
+		dasher_add_descriptors(&ds->rep->other_descriptors, ds->p_rep_desc);
+
+		if (ds->muxed_base) continue;
+
+		if (ds->stream_type==GF_STREAM_VISUAL)
+			ds_video = ds;
+		ds->nb_comp = 1;
+
+		for (j=0; j<count; j++) {
+			GF_DashStream *a_ds;
+			if (i==j) continue;
+			a_ds = gf_list_get(ctx->current_period->streams, j);
+			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;
+				}
+			}
+		}
+		//use video as main stream for segmentation of muxed sources
+		if (ds_video != ds) {
+			for (j=0; j<count; j++) {
+				GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+				if ((a_ds->muxed_base==ds) || (a_ds==ds)) {
+					if (a_ds == ds_video)
+						a_ds->muxed_base = NULL;
+					else
+						a_ds->muxed_base = ds_video;
+				}
+			}
+		}
+	}
+
+
+	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));
+		}
+		for (i=0; i<count; i++) {
+			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+			if (ds->clamped_dur > max_adur) {
+				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, ds->clamped_dur));
+			}
+			ds->clamped_dur = max_adur;
+		}
+	}
+
+
+	if (is_restore) return GF_OK;
+
+	if (has_deps) {
+		for (i=0; i<count; i++) {
+			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+			//assign rep bitrates
+			if (ds->dep_id)
+				ds->rep->bandwidth = dasher_get_dep_bitrate(ctx, ds);
+
+			if (gf_list_count(ds->complementary_streams)) {
+				u32 nb_str = gf_list_count(ds->complementary_streams);
+				ds->moof_sn_inc = 1+nb_str;
+				ds->moof_sn = 1;
+				for (j=0; j<nb_str; j++) {
+					GF_DashStream *a_ds = gf_list_get(ds->complementary_streams, j);
+					a_ds->moof_sn_inc = ds->moof_sn_inc;
+					a_ds->moof_sn = ds->moof_sn + 1 + j;
+				}
+			}
+		}
+	}
+
+	//moved all mux components after the base one, so that we do the segmentation on the main component
+	if (has_muxed_bases) {
+		//setup reps in adaptation sets
+		for (i=0; i<count; i++) {
+			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+			if (!ds->muxed_base) continue;
+			gf_list_rem(ctx->current_period->streams, i);
+			gf_list_add(ctx->current_period->streams, ds);
+		}
+	}
+
+	//setup reps in adaptation sets
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (ds->muxed_base) continue;
+		//already setup
+		if (ds->set) continue;
+
+		//not setup, create new AS
+		ds->set = gf_mpd_adaptation_set_new();
+		ds->owns_set = GF_TRUE;
+		ds->set->udta = ds;
+
+		if (!ds->set->representations)
+			ds->set->representations = gf_list_new();
+		if (!ds->period->period->adaptation_sets)
+			ds->period->period->adaptation_sets = gf_list_new();
+		gf_list_add(ds->period->period->adaptation_sets, ds->set);
+
+		gf_list_add(ds->set->representations, ds->rep);
+		ds->nb_rep = 1;
+
+		//add non-conditional adaptation set descriptors
+		dasher_add_descriptors(&ds->set->other_descriptors, ds->p_as_any_desc);
+		//new AS, add conditional adaptation set descriptors
+		dasher_add_descriptors(&ds->set->other_descriptors, ds->p_as_desc);
+
+		if (ds->as_id) has_as_id = GF_TRUE;
+		//for each following, check if same AS is possible
+		for (j=i+1; j<count; j++) {
+			GF_DashStream *a_ds;
+			a_ds = gf_list_get(ctx->current_period->streams, j);
+			//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);
+			}
+		}
+	}
+	if (has_as_id) {
+		for (i=0; i<count; i++) {
+			GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+			if (!ds->owns_set) continue;
+			for (j=i+1; j<count; j++) {
+				GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+				//avoid as id duplicates
+				if (ds->owns_set && a_ds->owns_set && (a_ds->as_id == ds->as_id)) {
+					a_ds->as_id = 0;
+				}
+			}
+		}
+	}
+
+	//we need a pass on adaptation sets to figure out if they share the same source URL
+	//in case we use file name in templates
+	nb_sets = gf_list_count(ctx->current_period->period->adaptation_sets);
+	for (i=0; i<nb_sets; i++) {
+		GF_DashStream *ds;
+		GF_MPD_Representation *rep;
+		GF_MPD_AdaptationSet *set = gf_list_get(ctx->current_period->period->adaptation_sets, i);
+		assert(set);
+		rep = gf_list_get(set->representations, 0);
+		assert(rep);
+		ds = rep->playback.udta;
+
+		if (!dasher_template_use_source_url(ds->template ? ds->template : ctx->template))
+			continue;
+
+		for (j=i+1; j<nb_sets; j++) {
+			Bool split_init = GF_FALSE;
+			const GF_PropertyValue *p1, *p2;
+			GF_DashStream *a_ds;
+
+			set = gf_list_get(ctx->current_period->period->adaptation_sets, j);
+			rep = gf_list_get(set->representations, 0);
+			assert(rep);
+			a_ds = rep->playback.udta;
+
+			if (!dasher_template_use_source_url(a_ds->template ? a_ds->template : ctx->template))
+				continue;
+
+			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 (p1 && p2) {
+				if (gf_props_equal(p1, p2)) split_init = GF_TRUE;
+			} else {
+				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 (p1 && p2 && gf_props_equal(p1, p2)) split_init = GF_TRUE;
+			}
+			
+			if (split_init) {
+				ds->split_set_names = GF_TRUE;
+				a_ds->split_set_names = GF_TRUE;
+			}
+		}
+	}
+
+	/*HbbTV 1.5 ISO live specific checks*/
+	if (ctx->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
+		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;
+		}
+		if (nb_periods > 32) {
+			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) {
+			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;
+		}
+		if (ctx->segdur > 15.0) {
+			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;
+		}
+	}
+
+	//init UTC reference time for dynamic
+	if (!ctx->mpd->availabilityStartTime && (ctx->dmode!=GF_MPD_TYPE_STATIC) ) {
+		u64 dash_start_date = ctx->ast ? gf_net_parse_date(ctx->ast) : 0;
+
+		ctx->mpd->gpac_init_ntp_ms = gf_net_get_ntp_ms();
+		ctx->mpd->availabilityStartTime = gf_net_get_utc();
+
+		if (dash_start_date && (dash_start_date < ctx->mpd->availabilityStartTime)) {
+			u64 start_date_sec_ntp, secs;
+			Double ms;
+			//recompute NTP init time matching the required ast
+			secs = dash_start_date/1000;
+			start_date_sec_ntp = (u32) secs;
+			start_date_sec_ntp += GF_NTP_SEC_1900_TO_1970;
+			ms = (Double) (dash_start_date - secs*1000);
+			ms /= 1000.0;
+			ctx->mpd->gpac_init_ntp_ms = (u64) (start_date_sec_ntp * 1000 + ms);
+			//compute number of seconds to discard
+			ctx->nb_secs_to_discard = (Double) (ctx->mpd->availabilityStartTime - dash_start_date);
+			ctx->nb_secs_to_discard /= 1000;
+			//don't discard TSB, this will be done automatically
+
+			ctx->mpd->availabilityStartTime = dash_start_date;
+
+		} else if (dash_start_date) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] specified AST %s seems in the future, ignoring it\n", ctx->ast));
+		}
+	}
+
+	//setup adaptation sets bitstream switching
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (!ds->owns_set) continue;
+		//check bitstream switching
+		dasher_check_bitstream_swicthing(ctx, ds->set);
+		//setup AS defaults, roles and co
+		dasher_setup_set_defaults(ctx, ds->set);
+		//setup sources, templates & co
+		dasher_setup_sources(filter, ctx, ds->set);
+	}
+
+	while (gf_list_count(ctx->postponed_pids)) {
+		GF_DashStream *ds = gf_list_get(ctx->postponed_pids, 0);
+		dasher_open_pid(filter, ctx, ds, ds->multi_pids, GF_FALSE);
+	}
+
+	//good to go !
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		//setup segmentation
+		ds->rep_init = GF_FALSE;
+		ds->seg_done = GF_FALSE;
+		ds->next_seg_start = (u32) ( ds->dash_dur * ds->timescale );
+		ds->adjusted_next_seg_start = ds->next_seg_start;
+		ds->segment_started = GF_FALSE;
+		ds->seg_number = ds->startNumber;
+		ds->first_cts = ds->first_dts = ds->max_period_dur = 0;
+
+		//simulate N loops of the source
+		if (ctx->nb_secs_to_discard) {
+			u64 period_dur, seg_dur;
+			u32 nb_skip=0;
+
+			period_dur = (u64) (ctx->nb_secs_to_discard * ds->timescale);
+			seg_dur = (u64) (ds->dash_dur * ds->timescale);
+
+			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;
+		}
+	}
+
+	ctx->nb_secs_to_discard = 0;
+
+	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;
+	Bool is_first = GF_FALSE;
+	Bool seg_align = GF_FALSE;
+	GF_MPD_SegmentTimeline *tl=NULL;
+
+	//we only store segment timeline for the main component in the representation
+	if (ds->muxed_base) return;
+
+	if (ds->rep && ds->rep->state_seg_list) {
+		GF_DASH_SegmentContext *sctx = gf_list_last(ds->rep->state_seg_list);
+		sctx->dur = ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+	}
+
+	//we only use segment timeline with templates
+	if (!ctx->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;
+	if (ds->timescale != ds->mpd_timescale) {
+		duration *= ds->mpd_timescale;
+		duration /= ds->timescale;
+	}
+	seg_align = (ds->set->segment_alignment || ds->set->subsegment_alignment) ? GF_TRUE : GF_FALSE;
+	//not first and segment alignment, ignore
+	if (!is_first && seg_align) {
+		return;
+	}
+
+	//no segment alignment store in each rep
+	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"));
+			return;
+		}
+
+		if (ctx->tpl) {
+			p_tl = &ds->rep->segment_template->segment_timeline;
+			ds->rep->segment_template->duration = 0;
+		} else {
+			p_tl = &ds->rep->segment_list->segment_timeline;
+			ds->rep->segment_list->duration = 0;
+		}
+		if (! (*p_tl)) {
+			(*p_tl) = gf_mpd_segmentimeline_new();
+		}
+		tl = (*p_tl);
+	} else {
+		Bool new_tl = GF_FALSE;
+		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"));
+			return;
+		}
+		assert(ds->set);
+		if (ctx->tpl) {
+			//in case we had no template at set level
+			if (!ds->set->segment_template) {
+				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;
+				}
+				new_tl = GF_TRUE;
+			}
+			p_tl = &ds->set->segment_template->segment_timeline;
+			ds->set->segment_template->duration = 0;
+		} else {
+			//in case we had no template at set level
+			if (!ds->set->segment_list) {
+				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;
+				}
+				new_tl = GF_TRUE;
+			}
+			p_tl = &ds->set->segment_list->segment_timeline;
+			ds->set->segment_list->duration = 0;
+		}
+
+		if (! (*p_tl) ) {
+			(*p_tl)  = gf_mpd_segmentimeline_new();
+		}
+		tl = (*p_tl);
+		if (new_tl) {
+			u32 i, count = gf_list_count(ds->set->representations);
+			for (i=0; i<count; i++) {
+				GF_MPD_Representation *arep = gf_list_get(ds->set->representations, i);
+				if (arep && arep->segment_template) arep->segment_template->duration = 0;
+				if (arep && arep->segment_list) arep->segment_list->duration = 0;
+			}
+		}
+	}
+
+	//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)) {
+		s->repeat_count++;
+		return;
+	}
+	//nope, allocate
+	GF_SAFEALLOC(s, GF_MPD_SegmentTimelineEntry);
+	if (!s) return;
+	s->start_time = ds->seg_start_time;
+	s->duration = (u32) duration;
+	gf_list_add(tl->entries, s);
+}
+
+static void dasher_copy_segment_timelines(GF_DasherCtx *ctx, GF_MPD_AdaptationSet *set)
+{
+	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);
+		src_tl = set->segment_template->segment_timeline;
+		set->segment_template->segment_timeline = NULL;
+	} else {
+		assert(set->segment_list->segment_timeline);
+		src_tl = set->segment_list->segment_timeline;
+		set->segment_list->segment_timeline = NULL;
+	}
+	nb_s = gf_list_count(src_tl->entries);
+
+	count = gf_list_count(set->representations);
+	for (i=0; i<count; i++) {
+		GF_MPD_SegmentTimeline *tl = NULL;
+		GF_MPD_Representation *rep = gf_list_get(set->representations, i);
+		if (ctx->tpl) {
+			if (!rep->segment_template) {
+				GF_SAFEALLOC(rep->segment_template, GF_MPD_SegmentTemplate);
+				if (!rep->segment_template) continue;
+			}
+			if (!i) {
+				rep->segment_template->segment_timeline = src_tl;
+				continue;
+			}
+			if (!rep->segment_template->segment_timeline) {
+				rep->segment_template->segment_timeline = gf_mpd_segmentimeline_new();
+			}
+			tl = rep->segment_template->segment_timeline;
+		} else {
+			if (!rep->segment_list) {
+				GF_SAFEALLOC(rep->segment_list, GF_MPD_SegmentList);
+				if (!rep->segment_list) continue;
+				rep->segment_list->start_number = (u32) -1;
+			}
+			if (!i) {
+				rep->segment_list->segment_timeline = src_tl;
+				continue;
+			}
+			if (!rep->segment_list->segment_timeline) {
+				rep->segment_list->segment_timeline = gf_mpd_segmentimeline_new();
+			}
+			tl = rep->segment_list->segment_timeline;
+		}
+		assert(tl);
+		for (j=0; j<nb_s; j++) {
+			GF_MPD_SegmentTimelineEntry *s;
+			GF_MPD_SegmentTimelineEntry *src_s = gf_list_get(src_tl->entries, j);
+			GF_SAFEALLOC(s, GF_MPD_SegmentTimelineEntry);
+			if (!s) continue;
+
+			s->duration = src_s->duration;
+			s->repeat_count = src_s->repeat_count;
+			s->start_time = src_s->start_time;
+			gf_list_add(tl->entries, s);
+		}
+	}
+}
+
+static void dasher_flush_segment(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	u32 i, count;
+	GF_DashStream *ds_done = NULL, *ds_not_done = NULL;
+	GF_DashStream *set_ds = ds->set->udta;
+	GF_DashStream *base_ds = ds->muxed_base ? ds->muxed_base : ds;
+	Bool has_ds_done = GF_FALSE;
+	u32 seg_dur_ms=0;
+	GF_DashStream *ds_log = NULL;
+	u64 first_cts_in_cur_seg=0;
+
+	ctx->update_report = -1;
+
+	if (ds->segment_started) {
+		Double seg_duration;
+		u64 seg_duration_unscale = base_ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+		//seg_duration /= base_ds->timescale;
+		if (!seg_duration_unscale) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Segment %d is empty - pid end of stream %d\n", ds->seg_number, gf_filter_pid_is_eos(ds->ipid) ));
+		}
+		seg_dur_ms = (u32) (seg_duration_unscale*1000 / base_ds->timescale);
+		if (seg_dur_ms * base_ds->timescale < seg_duration_unscale* 1000) seg_dur_ms++;
+
+		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;
+
+		seg_duration = (Double) base_ds->first_cts_in_next_seg - ds->first_cts_in_seg;
+		seg_duration /= base_ds->timescale;
+
+		if (!base_ds->done && !ctx->stl && ctx->tpl && !ctx->cues) {
+
+			if (seg_duration< ds->dash_dur/2) {
+
+				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) {
+				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));
+			}
+		}
+		dasher_insert_timeline_entry(ctx, base_ds);
+
+		if (ctx->align) {
+			if (!set_ds->nb_rep_done || !set_ds->set_seg_duration) {
+				set_ds->set_seg_duration = seg_duration;
+			} else {
+				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 (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);
+					}
+				}
+			}
+			set_ds->nb_rep_done++;
+			if (set_ds->nb_rep_done < set_ds->nb_rep) return;
+
+			set_ds->set_seg_duration = 0;
+			set_ds->nb_rep_done = 0;
+		}
+
+		ds_log = ds;
+	} else {
+		if (ctx->align) {
+			set_ds->nb_rep_done++;
+			if (set_ds->nb_rep_done < set_ds->nb_rep) return;
+
+			set_ds->set_seg_duration = 0;
+			set_ds->nb_rep_done = 0;
+		}
+	}
+
+	if (ctx->subdur && (ds->cumulated_dur >= 0.8 * (ds->cumulated_subdur + ctx->subdur) * ds->timescale))
+		ds->subdur_done = GF_TRUE;
+
+	count = gf_list_count(ctx->current_period->streams);
+
+	if (ctx->subdur) {
+		u32 nb_sub_done=0;
+		if (ctx->subdur_done) return;
+		for (i=0; i<count; i++) {
+			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+			if (a_ds->muxed_base) {
+				if (a_ds->muxed_base->subdur_done) a_ds->subdur_done = GF_TRUE;
+			}
+
+			if (a_ds->subdur_done) {
+				nb_sub_done++;
+			}
+		}
+		// if one of the AS is done and we are at 30% of target subdur, abort
+		if (nb_sub_done && !ds->subdur_done
+		 	&& (ctx->subdur && (ds->cumulated_dur >= (0.7 * (ds->cumulated_subdur + ctx->subdur)) * ds->timescale))
+		) {
+			ds->subdur_done = GF_TRUE;
+			nb_sub_done++;
+		}
+		if (nb_sub_done==count)
+ 			ctx->subdur_done = GF_TRUE;
+	}
+
+	//reset all streams from our rep or our set
+	for (i=0; i<count; i++) {
+		ds = gf_list_get(ctx->current_period->streams, i);
+		//reset all in set if segment alignment
+		if (ctx->align) {
+			if (ds->set != set_ds->set) continue;
+		} else {
+			//otherwise reset only media components for this rep
+			if ((ds->muxed_base != base_ds) && (ds != base_ds)) continue;
+		}
+
+		if (!ds->done) {
+			ds->first_cts_in_next_seg = ds->first_cts_in_seg = ds->est_first_cts_in_next_seg = 0;
+		}
+
+		if (ds->muxed_base) {
+			if (!ds->done) {
+				ds->segment_started = GF_FALSE;
+				ds->seg_done = GF_FALSE;
+			} else {
+				has_ds_done = GF_TRUE;
+			}
+			continue;
+		}
+		base_ds = ds;
+
+		if (base_ds->done)
+			ds_done = base_ds;
+		else if (base_ds->nb_comp_done==base_ds->nb_comp) ds_not_done = base_ds;
+
+		if (!base_ds->done && base_ds->seg_done) {
+			base_ds->seg_done = GF_FALSE;
+			base_ds->nb_comp_done = 0;
+
+			assert(base_ds->segment_started);
+			base_ds->segment_started = GF_FALSE;
+
+			base_ds->next_seg_start += (u64) (base_ds->dash_dur * base_ds->timescale);
+			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);
+				if (ctx->skip_seg)
+					base_ds->seg_number++;
+			}
+			base_ds->adjusted_next_seg_start = base_ds->next_seg_start;
+			base_ds->seg_number++;
+		}
+	}
+
+	if (ds_log) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[Dasher] Rep#%s flush seg %d start %g duration %g next seg end time %g\n", ds_log->rep->id, ds_log->seg_number-1, ((Double)first_cts_in_cur_seg)/ds_log->timescale, ((Double)seg_dur_ms)/1000, ((Double)ds_log->adjusted_next_seg_start)/ds_log->timescale));
+	}
+
+	//muxed representation with unaligned duration,
+	if (has_ds_done) {
+		for (i=0; i<count; i++) {
+			ds = gf_list_get(ctx->current_period->streams, i);
+			//otherwise reset only media components for this rep
+			if ((ds->muxed_base != base_ds) && (ds != base_ds)) continue;
+
+			if (ds->done && (base_ds->nb_comp_done < base_ds->nb_comp)) {
+				base_ds->nb_comp_done++;
+			}
+		}
+	}
+
+	//some reps are done, other not, force a max time on all AS in the period
+	if (ds_done && ds_not_done) {
+		for (i=0; i<count; i++) {
+			ds = gf_list_get(ctx->current_period->streams, i);
+
+			if (ds->done) {
+				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;
+			}
+		}
+	}
+}
+
+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 (pck) {
+		if (ctx->ntp==DASHER_NTP_YES) {
+			u64 ntpts = gf_net_get_ntp_ts();
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ntpts));
+		} else if (ctx->ntp==DASHER_NTP_REM) {
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, NULL);
+		}
+
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, &PROP_UINT(base_ds->seg_number ) );
+	}
+
+	//only signal file name & insert timelines on one stream for muxed representations
+	if (ds->muxed_base) return;
+
+	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;
+	}
+
+	if (ctx->store_seg_states) {
+		if (!ds->rep->state_seg_list) {
+			ds->rep->state_seg_list = gf_list_new();
+		}
+		if (!ds->rep->dash_dur) {
+			ds->rep->timescale = ds->timescale;
+			ds->rep->streamtype = ds->stream_type;
+			ds->rep->timescale_mpd = ds->mpd_timescale;
+			ds->rep->dash_dur = ds->dash_dur;
+			ds->rep->hls_single_file_name = ds->init_seg;
+			ds->rep->nb_chan = ds->nb_ch;
+			ds->rep->m3u8_name = ds->hls_vp_name;
+			if (ds->fps.den) {
+				ds->rep->fps = ds->fps.num;
+				ds->rep->fps /= ds->fps.den;
+			}
+		}
+		GF_SAFEALLOC(seg_state, GF_DASH_SegmentContext);
+		if (!seg_state) return;
+		seg_state->time = ds->seg_start_time;
+		seg_state->seg_num = ds->seg_number;
+		gf_list_add(ds->rep->state_seg_list, seg_state);
+		if (ctx->sigfrag) {
+			const GF_PropertyValue *p = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FRAG_RANGE);
+			if (p) {
+				seg_state->file_offset = p->value.lfrac.num;
+				seg_state->file_size = (u32) (p->value.lfrac.den - seg_state->file_offset);
+
+				if (ds->rep->segment_base && !ds->rep->segment_base->initialization_segment) {
+					GF_MPD_URL *url;
+					GF_SAFEALLOC(url, GF_MPD_URL);
+					if (url) {
+						GF_SAFEALLOC(url->byte_range, GF_MPD_ByteRange);
+						if (url->byte_range) {
+							url->byte_range->start_range = 0;
+							url->byte_range->end_range = seg_state->file_offset-1;
+						}
+					}
+					ds->rep->segment_base->initialization_segment = url;
+				}
+			}
+		} else {
+			gf_list_add(ds->pending_segment_states, seg_state);
+			ctx->nb_seg_url_pending++;
+		}
+	}
+
+	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);
+
+		strcpy(szSegmentFullPath, szIndexName);
+		if (ctx->out_path) {
+			char *rel = gf_url_concatenate(ctx->out_path, szIndexName);
+			if (rel) {
+				strcpy(szSegmentFullPath, rel);
+				gf_free(rel);
+			}
+		}
+		if (pck)
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_IDXFILENAME, &PROP_STRING(szSegmentFullPath) );
+	}
+
+	if (ctx->sseg) {
+		if (ctx->sigfrag) {
+			const GF_PropertyValue *p = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_SIDX_RANGE);
+			if (p) {
+				if (ds->rep->segment_base && !ds->rep->segment_base->index_range) {
+					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;
+					}
+				} else {
+					ctx->in_error = GF_TRUE;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] Several SIDX found but trying to regenerate an on-demand MPD, source file is not compatible. Try re-dashing the content or use main or full profiles\n"));
+				}
+			}
+		}
+		return;
+	}
+
+	if (ctx->sfile) {
+		GF_MPD_SegmentURL *seg_url;
+		assert(ds->rep->segment_list);
+		GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
+		if (!seg_url) return;
+
+		gf_list_add(ds->rep->segment_list->segment_URLs, seg_url);
+		if (szIndexName[0])
+			seg_url->index = gf_strdup(szIndexName);
+
+		if (ctx->sigfrag) {
+			const GF_PropertyValue *p = gf_filter_pck_get_property(in_pck, GF_PROP_PCK_FRAG_RANGE);
+			if (p) {
+				GF_SAFEALLOC(seg_url->media_range, GF_MPD_ByteRange);
+				if (seg_url->media_range) {
+					seg_url->media_range->start_range = p->value.lfrac.num;
+					seg_url->media_range->end_range = p->value.lfrac.den;
+				}
+				if (ds->rep->segment_list && ds->rep->segment_list->initialization_segment && !ds->rep->segment_list->initialization_segment->byte_range) {
+					GF_SAFEALLOC(ds->rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
+					if (ds->rep->segment_list->initialization_segment->byte_range) {
+						ds->rep->segment_list->initialization_segment->byte_range->start_range = 0;
+						ds->rep->segment_list->initialization_segment->byte_range->end_range = p->value.lfrac.num-1;
+					}
+				}
+			}
+		} else {
+			gf_list_add(ds->pending_segment_urls, seg_url);
+			ctx->nb_seg_url_pending++;
+		}
+		return;
+	}
+
+	if (!ctx->stl && !ctx->cues) {
+		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;
+
+		if ((ds->dash_dur>0) && (ABS(drift) > ds->dash_dur/2)) {
+			u64 cts = 0;
+			if (pck) {
+				cts = gf_filter_pck_get_cts(pck);
+				cts -= ds->first_cts;
+			}
+			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);
+
+	strcpy(szSegmentFullPath, szSegmentName);
+
+	if (ctx->out_path) {
+		char *rel = NULL;
+		if (ctx->do_m3u8 && ds->hls_vp_name) {
+			char *tmp = gf_url_concatenate(ctx->out_path, ds->hls_vp_name);
+			if (tmp) {
+				rel = gf_url_concatenate(tmp, szSegmentName);
+				gf_free(tmp);
+			}
+		}
+		if (!rel)
+			rel = gf_url_concatenate(ctx->out_path, szSegmentName);
+
+		if (rel) {
+			strcpy(szSegmentFullPath, rel);
+			gf_free(rel);
+		}
+	}
+
+	if (seg_state) {
+		seg_state->filepath = gf_strdup(szSegmentFullPath);
+		seg_state->filename = gf_strdup(szSegmentName);
+	}
+
+	if (ds->rep->segment_list) {
+		GF_MPD_SegmentURL *seg_url;
+		GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
+		if (seg_url) {
+			gf_list_add(ds->rep->segment_list->segment_URLs, seg_url);
+			seg_url->media = gf_strdup(szSegmentName);
+			gf_list_add(ds->pending_segment_urls, seg_url);
+			if (szIndexName[0])
+				seg_url->index = gf_strdup(szIndexName);
+		}
+		ctx->nb_seg_url_pending++;
+	}
+	if (pck)
+		gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(szSegmentFullPath) );
+}
+
+static Bool dasher_check_loop(GF_DasherCtx *ctx, GF_DashStream *ds)
+{
+	u32 i, count;
+	u32 pmode = GF_PLAYBACK_MODE_NONE;
+	u64 ts_offset, max_ts_offset, max_ts_scale;
+	const GF_PropertyValue *p;
+	if (!ds->src_url) return GF_FALSE;
+
+	//loop requested
+	if (ds->loop_state==2) return GF_TRUE;
+
+	count = gf_list_count(ctx->current_period->streams);
+	if (!ds->loop_state) {
+		for (i=0; i<count; i++) {
+			GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+
+			p = gf_filter_pid_get_property(a_ds->ipid, GF_PROP_PID_PLAYBACK_MODE);
+			if (p) pmode = p->value.uint;
+			if (pmode == GF_PLAYBACK_MODE_NONE) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Loop requested in subdur mode, but source cannot seek, defaulting to multi period for all streams\n"));
+				ctx->loop = GF_FALSE;
+				return GF_FALSE;
+			}
+		}
+		ds->loop_state = 1;
+	}
+
+	max_ts_offset = 0;
+	max_ts_scale = 1;
+	//check all input media duration
+	for (i=0; i<count; i++) {
+		GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+
+		if (a_ds->subdur_done)
+			continue;
+
+		//wait for each input to query loop
+		if (!a_ds->loop_state) {
+			a_ds->done = 0;
+			return GF_TRUE;
+		}
+
+		//get max duration
+		ts_offset = a_ds->est_next_dts;
+
+		if (max_ts_offset * a_ds->timescale < ts_offset * max_ts_scale) {
+			max_ts_offset = ts_offset;
+			max_ts_scale = a_ds->timescale;
+		}
+	}
+
+	//assign ts offset and send stop/play
+	for (i=0; i<count; i++) {
+		GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, i);
+
+		ts_offset = max_ts_offset;
+		ts_offset *= a_ds->timescale;
+		ts_offset /= max_ts_scale;
+
+		a_ds->ts_offset = ts_offset;
+		if (a_ds->done) continue;
+		if (a_ds->ts_offset > a_ds->est_next_dts) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Looping streams of unequal duration, inserting "LLU" us of timestamp delay in pid %s from %s\n", ((a_ds->ts_offset - a_ds->est_next_dts) * 1000000) / a_ds->timescale, gf_filter_pid_get_name(a_ds->ipid), a_ds->src_url));
+		}
+
+		a_ds->seek_to_pck = 0;
+		a_ds->nb_pck = 0;
+		a_ds->clamp_done = GF_FALSE;
+
+		a_ds->loop_state = 2;
+
+		if (ctx->subdur) {
+			GF_FilterEvent evt;
+
+			GF_FEVT_INIT(evt, GF_FEVT_STOP, a_ds->ipid);
+			gf_filter_pid_send_event(a_ds->ipid, &evt);
+
+			gf_filter_pid_set_discard(a_ds->ipid, GF_FALSE);
+
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, a_ds->ipid);
+			evt.play.speed = 1.0;
+			gf_filter_pid_send_event(a_ds->ipid, &evt);
+		}
+	}
+
+	return GF_TRUE;
+}
+
+//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)
+{
+	u32 i=0;
+	GF_DashStream *ds;
+	ctx->streams_not_ready = GF_FALSE;;
+	while ((ds = gf_list_enum(ctx->pids, &i))) {
+		if (ds->dcd_not_ready) {
+			GF_FilterPacket *pck;
+			ds->dcd_not_ready = GF_FALSE;
+			pck = gf_filter_pid_get_packet(ds->ipid);
+			if (!pck) {
+				ds->dcd_not_ready = GF_TRUE;
+				ctx->streams_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;
+}
+
+void dasher_format_report(GF_Filter *filter, GF_DasherCtx *ctx)
+{
+	u32 i, count;
+	Double max_ts=0;
+	u32 total_pc = 0;
+	char szDS[200];
+	char *szStatus = NULL;
+
+	if (!gf_filter_reporting_enabled(filter))
+		return;
+	if (!ctx->update_report)
+		return;
+	//don't update at each packet, this would be too much
+	if ((ctx->update_report>0) && (ctx->update_report < 20))
+		return;
+
+	ctx->update_report = 0;
+
+	sprintf(szDS, "P%s", ctx->current_period->period->ID ? ctx->current_period->period->ID : "1");
+	gf_dynstrcat(&szStatus, szDS, NULL);
+
+	count = gf_list_count(ctx->current_period->streams);
+	for (i=0; i<count; i++) {
+		s32 pc=-1;
+		Double mpdtime;
+		u32 set_idx;
+		u32 rep_idx;
+		u8 stype;
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+		if (ds->muxed_base) continue;
+
+		set_idx = 1 + gf_list_find(ctx->current_period->period->adaptation_sets, ds->set);
+		rep_idx = 1 + gf_list_find(ds->set->representations, ds->rep);
+		if (ds->stream_type==GF_STREAM_VISUAL) stype='V';
+		else if (ds->stream_type==GF_STREAM_AUDIO) stype='A';
+		else if (ds->stream_type==GF_STREAM_TEXT) stype='T';
+		else stype='M';
+
+		if (ds->done || ds->subdur_done) {
+			sprintf(szDS, "AS#%d.%d(%c) done (%d segs)", set_idx, rep_idx, stype, ds->seg_number);
+			pc = 10000;
+		} else {
+			Double done;
+			if (ctx->cues) {
+				done = (Double) (ds->last_dts);
+				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;
+				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;
+				//this may happen since we don't print info at segment start
+				if (done<0)
+					done=0;
+				pcent = done / ds->dash_dur;
+				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;
+			if (mpdtime<0) mpdtime=0;
+			mpdtime /= ds->timescale;
+
+			if (ds->duration.den && ds->duration.num) {
+				done = mpdtime;
+
+				done *= ds->duration.den;
+				done /= ds->duration.num;
+				pc = (u32) (10000*done);
+			}
+			if (max_ts<mpdtime)
+				max_ts = mpdtime;
+		}
+		if (pc > (s32) total_pc) total_pc = (u32) pc;
+		gf_dynstrcat(&szStatus, szDS, " ");
+	}
+	if (total_pc!=10000) {
+		sprintf(szDS, " / MPD %.2fs %d %%", max_ts, total_pc/100);
+		gf_dynstrcat(&szStatus, szDS, NULL);
+	}
+	gf_filter_update_status(filter, total_pc, szStatus);
+	gf_free(szStatus);
+}
+
+static void dasher_drop_input(GF_DasherCtx *ctx, GF_DashStream *ds, Bool discard_all)
+{
+	if (ctx->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)) {
+				assert(ds->nb_sap_in_queue);
+				ds->nb_sap_in_queue --;
+			}
+			gf_filter_pck_unref(pck);
+			if (!discard_all) break;
+		}
+	} else {
+		gf_filter_pid_drop_packet(ds->ipid);
+	}
+	if (discard_all) {
+		gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+	}
+}
+
+static GF_Err dasher_process(GF_Filter *filter)
+{
+	u32 i, count, nb_init, has_init;
+	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
+	GF_Err e;
+	Bool seg_done = GF_FALSE;
+
+	if (ctx->in_error)
+		return GF_SERVICE_ERROR;
+
+	if (ctx->streams_not_ready) {
+		if (! dasher_check_streams_ready(ctx)) return GF_OK;
+	}
+	if (gf_filter_connections_pending(filter))
+		return GF_OK;
+
+	if (ctx->is_eos)
+		return GF_EOS;
+	if (ctx->setup_failure) return ctx->setup_failure;
+
+	nb_init = has_init = 0;
+
+	count = gf_list_count(ctx->current_period->streams);
+	for (i=0; i<count; i++) {
+		GF_DashStream *base_ds;
+		GF_DashStream *ds = gf_list_get(ctx->current_period->streams, i);
+
+		if (ds->done) continue;
+		base_ds = ds->muxed_base ? ds->muxed_base : ds;
+		//subdur mode abort, don't process
+		if (ds->subdur_done) {
+			continue;
+		}
+		if (ds->seg_done) continue;
+
+		if (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST) {
+			ds->done = 1;
+			continue;
+		}
+
+		//flush as much as possible
+		while (1) {
+			u32 sap_type, dur, o_dur, split_dur;
+			s32 check_dur;
+			u64 cts, orig_cts, dts, ncts, split_dur_next;
+			Bool seg_over = GF_FALSE;
+			Bool is_packet_split = GF_FALSE;
+			Bool is_queue_flush = GF_FALSE;
+			GF_FilterPacket *pck;
+			GF_FilterPacket *dst;
+
+			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;
+				}
+				is_queue_flush = GF_TRUE;
+			}
+
+			//queue mode
+			if (ctx->sbound) {
+				if (!is_queue_flush && pck) {
+					gf_filter_pck_ref(&pck);
+					gf_filter_pid_drop_packet(ds->ipid);
+					gf_list_add(ds->packet_queue, pck);
+					if (gf_filter_pck_get_sap(pck))
+						ds->nb_sap_in_queue ++;
+				}
+				if (
+					//we are flushing due to period switch
+					is_queue_flush
+					//we are flushing due to end of stream
+					|| gf_filter_pid_is_eos(ds->ipid) || ds->clamp_done
+				) {
+					pck = gf_list_get(ds->packet_queue, 0);
+					is_queue_flush = GF_TRUE;
+				} else if (
+					//if current segment is not started, always get packet from queue
+					!ds->segment_started
+					//wait until we have more than 2 saps to get packet from queue, to check if next sap will be closer or not
+					|| (ds->nb_sap_in_queue>=2)
+				) {
+					pck = gf_list_get(ds->packet_queue, 0);
+				} else {
+					pck = NULL;
+				}
+			}
+
+
+			if (!pck) {
+				if (gf_filter_pid_is_eos(ds->ipid) || ds->clamp_done) {
+					u32 ds_done = 1;
+					if (ctx->loop && dasher_check_loop(ctx, ds)) {
+						if (ctx->subdur)
+							break;
+						//loop on the entire source, consider the stream not done for segment flush
+						ds_done = 0;
+					}
+
+					ds->clamp_done = GF_FALSE;
+
+					ctx->update_report = -1;
+					if (!ctx->sigfrag)
+						gf_filter_pid_set_eos(ds->opid);
+
+					if (!ds->done) ds->done = ds_done;
+					ds->seg_done = GF_TRUE;
+					seg_done = GF_TRUE;
+					ds->first_cts_in_next_seg = ds->est_first_cts_in_next_seg;
+					ds->est_first_cts_in_next_seg = 0;
+					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);
+						base_ds->nb_comp_done = 0;
+					}
+					//loop on the entire source, mark as done for subdur and check if all other streams are done
+					if (!ds->done) {
+						u32 j;
+						ds->done = 2;
+						ds->subdur_done = GF_TRUE;
+						u32 nb_sub_done=0;
+						for (j=0; j<count; j++) {
+							GF_DashStream *a_ds = gf_list_get(ctx->current_period->streams, j);
+							if (a_ds->muxed_base) a_ds = a_ds->muxed_base;
+							if (a_ds->subdur_done) {
+								nb_sub_done++;
+							}
+						}
+						if (nb_sub_done==count)
+							ctx->subdur_done = GF_TRUE;
+					} else if (ctx->reschedule && !ctx->loop && (ctx->dmode==GF_MPD_TYPE_DYNAMIC) && !strcmp(ds->period_id, DEFAULT_PERIOD_ID) ) {
+						if (gf_list_find(ctx->next_period->streams, ds)<0) {
+							gf_list_add(ctx->next_period->streams, ds);
+						}
+						ctx->post_play_events = GF_TRUE;
+						ds->nb_repeat++;
+						ds->reschedule = GF_TRUE;
+						gf_filter_pid_discard_block(ds->opid);
+					}
+				}
+				break;
+			}
+			if (ds->seek_to_pck) {
+				u32 sn = gf_filter_pck_get_seq_num(pck);
+				if (sn) {
+					if (sn <= ds->seek_to_pck) {
+						dasher_drop_input(ctx, ds, GF_FALSE);
+						continue;
+					}
+					ds->nb_pck = sn-1;
+				} else {
+					//no sn signaled, this implies we played from the begining
+					if (ds->nb_pck < ds->seek_to_pck) {
+						ds->nb_pck ++;
+						dasher_drop_input(ctx, ds, GF_FALSE);
+						continue;
+					}
+				}
+			}
+			sap_type = gf_filter_pck_get_sap(pck);
+			ds->loop_state = 0;
+
+			cts = gf_filter_pck_get_cts(pck);
+			dts = gf_filter_pck_get_dts(pck);
+			if (dts==GF_FILTER_NO_TS) dts = cts;
+
+			if (!ds->rep_init) {
+				u32 set_start_with_sap;
+				const GF_PropertyValue *p;
+				if (!sap_type) {
+					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) {
+					//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;
+					}
+					//set AS sap type
+					if (!set_start_with_sap) {
+						//don't set SAP type if not a base rep - could be further checked
+						//if (!gf_list_count(ds->complementary_streams) )
+						{
+							if (ctx->sseg) {
+								ds->set->subsegment_starts_with_sap = sap_type;
+							} else {
+								ds->set->starts_with_sap = sap_type;
+							}
+						}
+					}
+					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;
+						if (ds->rep->segment_list)
+							ds->rep->segment_list->presentation_time_offset = pto;
+						else if (ds->rep->segment_template)
+							ds->rep->segment_template->presentation_time_offset = pto;
+						else if (ds->set->segment_template)
+							ds->set->segment_template->presentation_time_offset = pto;
+					}
+				}
+
+				ds->first_cts = cts;
+				ds->first_dts = dts;
+				ds->rep_init++;
+				has_init++;
+			}
+			nb_init++;
+
+			if (ds->ts_offset) {
+				cts += ds->ts_offset;
+				dts += ds->ts_offset;
+			}
+
+			//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) {
+				e = dasher_send_manifest(filter, ctx, GF_TRUE);
+				if (e) return e;
+			}
+			cts -= ds->first_cts;
+			dts -= ds->first_dts;
+
+			dur = o_dur = gf_filter_pck_get_duration(pck);
+			split_dur = 0;
+			split_dur_next = 0;
+
+			//patch to align old arch with new
+			check_dur = 0;
+			if (ds->stream_type==GF_STREAM_AUDIO)
+				check_dur = dur;
+
+			//adjust duration and cts
+			orig_cts = cts;
+			if (ds->split_dur_next) {
+				cts += ds->split_dur_next;
+				assert(dur > ds->split_dur_next);
+				dur -= ds->split_dur_next;
+				split_dur_next = ds->split_dur_next;
+				ds->split_dur_next = 0;
+				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 ) {
+					//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;
+					}
+				}
+			}
+
+			//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 ) )
+				break;
+
+			if (ds->seek_to_pck) {
+				ds->seek_to_pck = 0;
+			}
+			//source-driven fragmentation check for segment start
+			else if (ctx->sigfrag) {
+				const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FRAG_START);
+				if (p && (p->value.uint>=1) && base_ds->segment_started) {
+					seg_over = GF_TRUE;
+					if (ds == base_ds) {
+						base_ds->adjusted_next_seg_start = cts;
+					}
+				}
+			}
+			//cue base - FIXME, check what was wrong before we merged  PR #1121
+			else if (ds->cues) {
+				u32 cidx;
+				GF_DASHCueInfo *cue=NULL;
+				Bool is_cue_split = GF_FALSE;
+				s32 has_mismatch = -1;
+
+				for (cidx=0;cidx<ds->nb_cues; cidx++) {
+					cue = &ds->cues[cidx];
+					if (cue->sample_num) {
+						if (cue->sample_num == ds->nb_pck + 1) {
+							is_cue_split = GF_TRUE;
+							break;
+						} else if (cue->sample_num < ds->nb_pck) {
+							has_mismatch = cidx;
+						} else {
+							break;
+						}
+					}
+					else if (cue->dts) {
+						u64 ts = cue->dts * ds->timescale;
+						u64 ts2 = dts * ds->cues_timescale;
+						if (ts == ts2) {
+							is_cue_split = GF_TRUE;
+							break;
+						} else if (ts < ts2) {
+							has_mismatch = cidx;
+						} else {
+							break;
+						}
+					}
+					else if (cue->cts) {
+						s64 ts = cue->cts * 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
+						if (ds->cues_use_edits) {
+							ts2 += (s64) (ds->pts_minus_cts) * ds->cues_timescale;
+						}
+						if (ts == ts2) {
+							is_cue_split = GF_TRUE;
+							break;
+						} else if (ts < ts2) {
+							has_mismatch = cidx;
+						} else {
+							break;
+						}
+					}
+				}
+				//start of first segment
+				if (is_cue_split && !ds->segment_started) {
+					memmove(ds->cues, &ds->cues[cidx+1], (ds->nb_cues-cidx-1) * sizeof(GF_DASHCueInfo));
+					ds->nb_cues -= cidx+1;
+					is_cue_split = 0;
+				}
+
+				if (is_cue_split) {
+					if (!sap_type) {
+						GF_LOG(ctx->strict_cues ?  GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] cue found (sn %d - dts "LLD" - cts "LLD") for PID %s but packet %d is not RAP !\n", cue->sample_num, cue->dts, cue->cts, gf_filter_pid_get_name(ds->ipid), ds->nb_pck));
+						if (ctx->strict_cues) {
+							gf_filter_pid_drop_packet(ds->ipid);
+							gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+							return GF_BAD_PARAM;
+						}
+					}
+					memmove(ds->cues, &ds->cues[cidx+1], (ds->nb_cues-cidx-1) * sizeof(GF_DASHCueInfo));
+					ds->nb_cues -= cidx+1;
+
+					if (sap_type==3)
+						ds->nb_sap_3 ++;
+					else if (sap_type>3)
+						ds->nb_sap_4 ++;
+
+					/*check requested profiles can be generated, or adjust them*/
+					if (
+						(ds->nb_sap_4 || (ds->nb_sap_3 > 1))
+						&& (ctx->profile != GF_DASH_PROFILE_FULL)
+						/*TODO: store at DS level whether the usage of sap4 is ok or not (eg roll info for AAC is OK, not for xHEAAC-v2)
+						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 (ctx->sseg)
+							ds->set->subsegment_starts_with_sap = sap_type;
+						else
+							ds->set->starts_with_sap = sap_type;
+					}
+
+
+					seg_over = GF_TRUE;
+					if (ds == base_ds) {
+						base_ds->adjusted_next_seg_start = cts;
+					}
+				}
+
+				if (has_mismatch>=0) {
+					cue = &ds->cues[has_mismatch];
+					GF_LOG(ctx->strict_cues ?  GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] found cue (sn %d - dts "LLD" - cts "LLD") in stream %s before current packet (sn %d - dts "LLD" - cts "LLD") , buggy source cues ?\n", cue->sample_num, cue->dts, cue->cts, gf_filter_pid_get_name(ds->ipid), ds->nb_pck+1, dts + ds->first_cts, cts + ds->first_cts));
+					if (ctx->strict_cues) {
+						gf_filter_pid_drop_packet(ds->ipid);
+						gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+						return GF_BAD_PARAM;
+					}
+				}
+			}
+			//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))
+			) {
+				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 ));
+				}
+				dasher_drop_input(ctx, ds, GF_TRUE);
+				ds->clamp_done = GF_TRUE;
+				continue;
+			}
+			//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);
+				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;
+					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;
+					//same rule as above
+					if ((cts_next + next_dur) * base_ds->timescale >= base_ds->adjusted_next_seg_start * ds->timescale ) {
+						Bool force_seg_flush = GF_FALSE;
+						s64 diff_next = cts_next * base_ds->timescale / 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;
+							diff -= base_ds->adjusted_next_seg_start;
+							//this one may be negative
+							if (diff<0)
+								diff = -diff;
+							if (diff<diff_next) {
+								force_seg_flush = GF_TRUE;
+							}
+						}
+						//bounds always in: if the next SAP is strictly greater than the target next segment start, split at this packet
+						else {
+							if (diff_next > 0) {
+								force_seg_flush = GF_TRUE;
+							}
+						}
+						if (force_seg_flush) {
+							seg_over = GF_TRUE;
+							if (ds == base_ds) {
+								base_ds->adjusted_next_seg_start = cts;
+							}
+							break;
+						}
+					}
+				}
+			}
+			//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 (ds->segment_started && ((cts + check_dur) * base_ds->timescale >= base_ds->adjusted_next_seg_start * ds->timescale ) ) {
+				//no sap, segment is over
+				if (! ctx->sap) {
+					seg_over = GF_TRUE;
+				}
+				// sap, segment is over
+				else if (sap_type) {
+
+					if (sap_type==3)
+						ds->nb_sap_3 ++;
+					else if (sap_type>3)
+						ds->nb_sap_4 ++;
+
+					/*check requested profiles can be generated, or adjust them*/
+					if ((ctx->profile != GF_DASH_PROFILE_FULL)
+						&& (ds->nb_sap_4 || (ds->nb_sap_3 > 1))
+						/*TODO: store at DS level whether the usage of sap4 is ok or not (eg roll info for AAC is OK, not for xHEAAC-v2)
+						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 (ctx->sseg)
+							ds->set->subsegment_starts_with_sap = sap_type;
+						else
+							ds->set->starts_with_sap = sap_type;
+					}
+
+					seg_over = GF_TRUE;
+					if (ds == base_ds) {
+						base_ds->adjusted_next_seg_start = cts;
+					}
+				}
+			}
+
+
+			if (ds->muxed_base && ds->muxed_base->done) {
+				seg_over = GF_FALSE;
+			}
+			//if flushing now will result in a one sample fragment afterwards
+			//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
+			else if (seg_over && ds->nb_samples_in_source && !ctx->loop
+				&& (ds->nb_pck+1 == ds->nb_samples_in_source)
+				&& !ctx->asto
+				&& !(!ds->has_sync_points && (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);
+				ds->seg_done = GF_TRUE;
+				ds->first_cts_in_next_seg = cts;
+				assert(base_ds->nb_comp_done < base_ds->nb_comp);
+				base_ds->nb_comp_done ++;
+
+				if (split_dur_next)
+					ds->split_dur_next = (u32) split_dur_next;
+
+				if (base_ds->nb_comp_done == base_ds->nb_comp) {
+					dasher_flush_segment(ctx, base_ds);
+					seg_done = GF_TRUE;
+				}
+				break;
+			}
+
+			if (cts==GF_FILTER_NO_TS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] WARNING! Source packet has no timestamp !\n"));
+
+				cts = ds->last_cts;
+				dts = ds->last_dts;
+			} else {
+
+				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;
+				if (ncts>base_ds->max_period_dur)
+					base_ds->max_period_dur = ncts;
+
+				ds->last_cts = cts + (split_dur ? split_dur : dur);
+				ds->last_dts = dts;
+				ds->est_next_dts = dts + o_dur;
+			}
+			ds->nb_pck ++;
+
+			if (ctx->sigfrag) {
+				if (!ds->segment_started) {
+					ds->first_cts_in_seg = cts;
+					dasher_mark_segment_start(ctx, ds, NULL, pck);
+					ds->segment_started = GF_TRUE;
+				}
+
+				ds->cumulated_dur += dur;
+
+				//drop packet if not spliting
+				if (!ds->split_dur_next)
+					gf_filter_pid_drop_packet(ds->ipid);
+
+				if (ctx->in_error) {
+					gf_filter_pid_set_discard(ds->ipid, GF_TRUE);
+					gf_filter_pid_set_eos(ctx->opid);
+					return GF_BAD_PARAM;
+				}
+				continue;
+			}
+			//create new ref to input
+			dst = gf_filter_pck_new_ref(ds->opid, NULL, 0, pck);
+			//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);
+			}
+
+			if (!ds->segment_started) {
+				ds->first_cts_in_seg = cts;
+				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) {
+				u64 diff=0;
+				u8 dep_flags = gf_filter_pck_get_dependency_flags(pck);
+				u64 ts = gf_filter_pck_get_cts(pck);
+				if (ts != GF_FILTER_NO_TS) {
+					cts += ds->first_cts;
+					assert(cts >= ts);
+					diff = cts - ts;
+				} else {
+					cts = ds->last_cts;
+				}
+				gf_filter_pck_set_cts(dst, cts + ds->ts_offset);
+
+				ts = gf_filter_pck_get_dts(pck);
+				if (ts != GF_FILTER_NO_TS)
+					gf_filter_pck_set_dts(dst, ts + diff + ds->ts_offset);
+
+				//add sample is redundant flag
+				dep_flags |= 0x1;
+				gf_filter_pck_set_dependency_flags(dst, dep_flags);
+				gf_filter_pck_set_duration(dst, dur);
+			}
+
+			//remove NTP
+			if (ctx->ntp != DASHER_NTP_KEEP)
+				gf_filter_pck_set_property(dst, GF_PROP_PCK_SENDER_NTP, NULL);
+
+			//change packet times
+			if (ds->force_timescale) {
+				u64 ats;
+				ats = gf_filter_pck_get_dts(dst);
+				if (ats!=GF_FILTER_NO_TS) {
+					ats *= ds->force_timescale;
+					ats /= ds->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;
+					gf_filter_pck_set_cts(dst, ats);
+				}
+				ats = (u64) gf_filter_pck_get_duration(dst);
+				if (ats) {
+					ats *= ds->force_timescale;
+					ats /= ds->timescale;
+					gf_filter_pck_set_duration(dst, (u32) ats);
+				}
+			}
+
+			ds->cumulated_dur += dur;
+
+			//TODO check drift between MPD start time and min CTS in segment (not just first CTS in segment)
+
+			//send packet
+			gf_filter_pck_send(dst);
+
+			if (ctx->update_report>=0)
+				ctx->update_report++;
+
+			//drop packet if not spliting
+			if (!ds->split_dur_next)
+				dasher_drop_input(ctx, ds, GF_FALSE);
+		}
+	}
+	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;
+		if (ds->done || ds->subdur_done) nb_init++;
+		else if (ds->seg_done && ctx->force_period_switch) nb_init++;
+		else if (ds->seg_done && ds->muxed_base && ds->muxed_base->done) {
+			nb_init++;
+			ds->done = 1;
+		}
+	}
+
+	dasher_format_report(filter, ctx);
+
+	if (seg_done) {
+		Bool update_period = GF_FALSE;
+		Bool update_manifest = GF_FALSE;
+		if (ctx->purge_segments) update_period = GF_TRUE;
+		if (ctx->mpd) {
+			//segment timeline used, always update manifest
+			if (ctx->stl)
+				update_manifest = GF_TRUE;
+			else if (ctx->dmode==GF_DASH_DYNAMIC) {
+				//publish time not set, we never send the manifest, do it
+				if (!ctx->mpd->publishTime) {
+					update_manifest = GF_TRUE;
+				}
+				//we have a minimum ipdate period
+				else if (ctx->mpd->minimum_update_period) {
+					u64 diff = gf_net_get_utc() - ctx->mpd->publishTime;
+					if (diff >= ctx->mpd->minimum_update_period)
+						update_manifest = GF_TRUE;
+				}
+			}
+			if (update_period)
+				dasher_update_period_duration(ctx, GF_FALSE);
+
+			if (update_manifest)
+				dasher_send_manifest(filter, ctx, GF_FALSE);
+		}
+
+	}
+
+	//still some running streams in period
+	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
+	//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;
+			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);
+
+			dasher_drop_input(ctx, ds, GF_TRUE);
+		}
+	}
+
+	//we need to wait for full flush of packets before switching periods in order to get the
+	//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();
+
+		diff = gf_sys_clock_high_res() - ctx->last_evt_check_time;
+		if (diff < 1000000) {
+			gf_filter_post_process_task(filter);
+			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));
+		ctx->nb_seg_url_pending = 0;
+		return GF_SERVICE_ERROR;
+	}
+	if (ctx->sseg && !ctx->on_demand_done && !ctx->sigfrag) {
+		return GF_OK;
+	}
+	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);
+	//no more periods
+	if (e==GF_EOS) {
+		if (!ctx->is_eos) {
+			ctx->is_eos = GF_TRUE;
+			gf_filter_pid_set_eos(ctx->opid);
+		}
+	}
+	return e;
+}
+
+
+
+static void dasher_resume_subdur(GF_Filter *filter, GF_DasherCtx *ctx)
+{
+	GF_FilterEvent evt;
+	u32 i, count;
+	Bool is_last = (ctx->dmode == GF_MPD_TYPE_DYNAMIC_LAST) ? GF_TRUE : GF_FALSE;
+	if (!ctx->state) return;
+
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		ds->rep = NULL;
+		if ((ds->done==1) && !ctx->subdur && ctx->loop) {}
+		else if (ds->reschedule) {
+			//we possibly dispatched end of stream on all outputs, we need to force unblockink to get called again
+			gf_filter_pid_discard_block(ds->opid);
+			continue;
+		}
+		else if (ds->done != 2) continue;
+
+		if (is_last) continue;
+
+		gf_filter_pid_set_discard(ds->ipid, GF_FALSE);
+
+		//send stop and play
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, ds->ipid);
+		gf_filter_pid_send_event(ds->ipid, &evt);
+
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, ds->ipid);
+		evt.play.speed = 1.0;
+		if (!ctx->subdur || !ctx->loop) {
+			ds->seek_to_pck = 0;
+		} else {
+			//request start after the last packet we processed
+			evt.play.from_pck = (u32) ds->seek_to_pck+1;
+		}
+		gf_filter_pid_send_event(ds->ipid, &evt);
+
+		//full stream looping
+		if (ds->subdur_done && !ctx->subdur) {
+			ds->loop_state = 0;
+			//mark as subdur done to force a context reload through period switch
+			ds->done = 2;
+			ds->seg_done = GF_FALSE;
+			ds->subdur_done = GF_FALSE;
+		}
+	}
+
+	ctx->subdur_done = GF_FALSE;
+	ctx->is_eos = GF_FALSE;
+	if (!ctx->post_play_events && !is_last) {
+		ctx->current_period->period = NULL;
+		ctx->first_context_load = GF_TRUE;
+		ctx->post_play_events = GF_TRUE;
+	}
+	gf_filter_post_process_task(filter);
+}
+
+
+static Bool dasher_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i, count;
+	Bool flush_mpd = GF_FALSE;
+	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
+
+	ctx->last_evt_check_time = 0;
+
+	if (evt->base.type == GF_FEVT_RESUME) {
+		//only process resume event when coming from main output PID, but always cancel it
+		//this is needed in case the output filter where the resume event was initiated consumes both
+		//manifest and segment PIDs, as is the case with httpout
+		if (evt->base.on_pid == ctx->opid)
+			dasher_resume_subdur(filter, ctx);
+		return GF_TRUE;
+	}
+	if (evt->base.type == GF_FEVT_CONNECT_FAIL) {
+		ctx->in_error = GF_TRUE;
+		gf_filter_pid_set_eos(ctx->opid);
+		if (ctx->opid_alt)
+			gf_filter_pid_set_eos(ctx->opid_alt);
+		return GF_TRUE;
+	}
+
+	if (evt->base.type == GF_FEVT_PLAY) {
+		ctx->is_playing = GF_TRUE;
+		return GF_FALSE;
+	}
+	if (evt->base.type == GF_FEVT_STOP) {
+		ctx->is_playing = GF_FALSE;
+		return GF_FALSE;
+	}
+
+	if (evt->base.type != GF_FEVT_SEGMENT_SIZE) return GF_FALSE;
+
+	count = gf_list_count(ctx->pids);
+	for (i=0; i<count; i++) {
+		u64 r_start, r_end;
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (ds->opid != evt->base.on_pid) continue;
+
+		if (ds->muxed_base) continue;
+
+		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"));
+				return GF_TRUE;
+			}
+			assert(sctx);
+			assert(ctx->nb_seg_url_pending);
+			ctx->nb_seg_url_pending--;
+			sctx->file_size = 1 + (u32) (evt->seg_size.media_range_end - evt->seg_size.media_range_start);
+			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;
+		}
+
+		//in state mode we store everything
+		//don't set segment sizes in template mode
+		if (ctx->tpl) continue;
+		//only set size/index size for init segment when doing onDemand/single index
+		if (ctx->sseg && !evt->seg_size.is_init) continue;
+
+		if (evt->seg_size.media_range_end) {
+			r_start = evt->seg_size.media_range_start;
+			r_end = evt->seg_size.media_range_end;
+		} else {
+			r_start = evt->seg_size.idx_range_start;
+			r_end = evt->seg_size.idx_range_end;
+		}
+		//init segment or representation index, set it in on demand and main single source
+		if ((ctx->sfile || ctx->sseg) && (evt->seg_size.is_init==1))  {
+			GF_MPD_URL *url, **s_url;
+
+			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) {
+						gf_mpd_url_free(ds->rep->segment_list->initialization_segment);
+						ds->rep->segment_list->initialization_segment = NULL;
+					}
+					continue;
+				}
+			}
+
+			if (ds->rep->segment_base && !evt->seg_size.media_range_end) {
+				if (! ds->rep->segment_base->index_range) {
+					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 = r_start;
+					ds->rep->segment_base->index_range->end_range = r_end;
+					ds->rep->segment_base->index_range_exact = GF_TRUE;
+				}
+				flush_mpd = GF_TRUE;
+				continue;
+			}
+
+			GF_SAFEALLOC(url, GF_MPD_URL);
+			if (!url) return GF_TRUE;
+
+			GF_SAFEALLOC(url->byte_range, GF_MPD_ByteRange);
+			if (!url->byte_range) return GF_TRUE;
+			url->byte_range->start_range = r_start;
+			url->byte_range->end_range = r_end;
+
+			s_url = NULL;
+			if (ds->rep->segment_base) {
+				if (evt->seg_size.media_range_end) s_url = &ds->rep->segment_base->initialization_segment;
+			} else {
+				assert(ds->rep->segment_list);
+				if (evt->seg_size.media_range_end) s_url = &ds->rep->segment_list->initialization_segment;
+				else s_url = &ds->rep->segment_list->representation_index;
+			}
+			assert(s_url);
+			if (*s_url) gf_mpd_url_free(*s_url);
+			*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);
+			ctx->nb_seg_url_pending--;
+
+			if (!url->media && ctx->sfile) {
+				GF_SAFEALLOC(url->media_range, GF_MPD_ByteRange);
+				if (url->media_range) {
+					url->media_range->start_range = evt->seg_size.media_range_start;
+					url->media_range->end_range = evt->seg_size.media_range_end;
+				}
+			}
+			//patch in test mode, old arch was not generating the index size for segment lists
+			if (evt->seg_size.idx_range_end && (!gf_sys_old_arch_compat() || ctx->sfile) ) {
+				GF_SAFEALLOC(url->index_range, GF_MPD_ByteRange);
+				if (url->index_range) {
+					url->index_range->start_range = evt->seg_size.idx_range_start;
+					url->index_range->end_range = evt->seg_size.idx_range_end;
+				}
+			}
+		}
+	}
+	if (!ctx->sseg || !flush_mpd) return GF_TRUE;
+
+	flush_mpd = GF_TRUE;
+	for (i=0; i<count; i++) {
+		GF_DashStream *ds = gf_list_get(ctx->pids, i);
+		if (!ds->rep) continue;
+		if (! ds->rep->segment_base) continue;
+		if (ds->rep->segment_base->index_range) continue;
+		flush_mpd = GF_FALSE;
+		break;
+	}
+	if (flush_mpd) {
+		ctx->on_demand_done = GF_TRUE;
+		gf_filter_post_process_task(filter);
+	}
+	return GF_TRUE;
+}
+
+static GF_Err dasher_setup_profile(GF_DasherCtx *ctx)
+{
+	switch (ctx->profile) {
+	case GF_DASH_PROFILE_AVC264_LIVE:
+	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		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;
+		}
+	default:
+		break;
+	}
+	if (ctx->m2ts) {
+		switch (ctx->profile) {
+		case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
+		case GF_DASH_PROFILE_AVC264_LIVE:
+			ctx->profile = GF_DASH_PROFILE_LIVE;
+			break;
+		case GF_DASH_PROFILE_ONDEMAND:
+		case GF_DASH_PROFILE_AVC264_ONDEMAND:
+			ctx->profile = GF_DASH_PROFILE_ONDEMAND;
+			break;
+		}
+	}
+
+	/*adjust params based on profiles*/
+	switch (ctx->profile) {
+	case GF_DASH_PROFILE_LIVE:
+		ctx->sseg = ctx->sfile = GF_FALSE;
+		ctx->tpl = ctx->align = ctx->sap = GF_TRUE;
+		break;
+	case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
+		ctx->check_main_role = GF_TRUE;
+		ctx->bs_switch = DASHER_BS_SWITCH_MULTI;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[Dasher] HBBTV1.5 profile not yet ported to filter architecture.\n"));
+		//FALLTHROUGH
+	case GF_DASH_PROFILE_AVC264_LIVE:
+		ctx->sseg = ctx->sfile = GF_FALSE;
+		ctx->no_fragments_defaults = ctx->align = ctx->tpl = ctx->sap = GF_TRUE;
+		break;
+	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		ctx->tpl = GF_FALSE;
+		ctx->no_fragments_defaults = ctx->align = ctx->sseg = ctx->sap = GF_TRUE;
+		break;
+	case GF_DASH_PROFILE_ONDEMAND:
+		ctx->sseg = ctx->align = ctx->sap = ctx->sfile = GF_TRUE;
+		ctx->tpl = GF_FALSE;
+
+		if (ctx->m2ts) {
+			ctx->sseg = GF_FALSE;
+			ctx->tpl = GF_TRUE;
+			ctx->profile = GF_DASH_PROFILE_MAIN;
+		} else {
+			if ((ctx->bs_switch != DASHER_BS_SWITCH_DEF) && (ctx->bs_switch != DASHER_BS_SWITCH_OFF)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] onDemand profile, bitstream switching mode cannot be used, defaulting to off.\n"));
+			}
+		}
+		/*BS switching is meaningless in onDemand profile*/
+		ctx->bs_switch = DASHER_BS_SWITCH_OFF;
+		break;
+	case GF_DASH_PROFILE_MAIN:
+		ctx->align = ctx->sap = GF_TRUE;
+		ctx->sseg = ctx->tpl = GF_FALSE;
+		break;
+	default:
+		break;
+	}
+
+	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->align) {
+		if (ctx->profile != GF_DASH_PROFILE_FULL) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segments are not time-aligned in each representation of each period\n\tswitching to FULL profile\n"));
+			ctx->profile = GF_DASH_PROFILE_FULL;
+		}
+		//commented out, this does not seem correct since BS switching is orthogonal to segment alignment
+		//one could have inband params working even in non time-aligned setup
+#if 0
+		if (ctx->bs_switch != DASHER_BS_SWITCH_OFF) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] Segments are not time-aligned in each representation of each period\n\tdisabling bitstream switching\n"));
+			ctx->bs_switch = DASHER_BS_SWITCH_OFF;
+		}
+#endif
+
+	}
+
+	//check we have a segment template
+	if (!ctx->template) {
+		ctx->template = gf_strdup( ctx->sfile ? "$File$$FS$_dash" : (ctx->stl ? "$File$_dash$FS$$Time$" : "$File$_dash$FS$$Number$") );
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[Dasher] No template assigned, using %s\n", ctx->template));
+		if (ctx->profile == GF_DASH_PROFILE_FULL) {
+			ctx->sfile = GF_TRUE;
+		}
+	}
+	//backward compatibility with old arch using %s
+	else {
+		char *sep = strstr(ctx->template, "%s");
+		if (sep) {
+			char *new_template = NULL;
+			sep[0] = 0;
+			gf_dynstrcat(&new_template, ctx->template, NULL);
+			gf_dynstrcat(&new_template, "$File$", NULL);
+			gf_dynstrcat(&new_template, sep+2, NULL);
+			gf_free(ctx->template);
+			ctx->template = new_template;
+		}
+
+	}
+	return GF_OK;
+}
+
+static GF_Err dasher_initialize(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
+	gf_filter_set_max_extra_input_pids(filter, -1);
+
+	ctx->pids = gf_list_new();
+	ctx->postponed_pids = gf_list_new();
+
+	if (!ctx->initext && (ctx->muxtype==DASHER_MUX_AUTO))
+		ctx->muxtype = DASHER_MUX_ISOM;
+
+	e = dasher_setup_profile(ctx);
+	if (e) return e;
+
+	if (ctx->sfile && ctx->tpl)
+		ctx->tpl = GF_FALSE;
+
+	ctx->current_period = dasher_new_period();
+	ctx->next_period = dasher_new_period();
+	ctx->on_demand_done = GF_TRUE;
+
+	if (ctx->state) {
+		ctx->first_context_load = GF_TRUE;
+	}
+	if (ctx->subdur && !ctx->state) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] subdur mode specified but no context set, will only dash %g seconds of media\n", ctx->subdur));
+	}
+	//we build manifest from input frag/seg, always use single frag
+	if (ctx->sigfrag) {
+		if (!ctx->sseg)
+			ctx->sfile = GF_TRUE;
+		ctx->tpl = 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;
+
+	if (ctx->state && ctx->sreg) {
+		u32 diff;
+		u64 next_gen_ntp;
+		GF_Err dash_state_check_timing(const char *dash_state, u64 *next_gen_ntp_ms, u32 *next_time_ms);
+
+		e = dash_state_check_timing(ctx->state, &next_gen_ntp, &diff);
+		if (e<0) return e;
+		if (e==GF_EOS) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[Dasher] generation called too early by %d ms\n", (s32) diff));
+			return e;
+		}
+	}
+	return GF_OK;
+}
+
+
+static void dasher_finalize(GF_Filter *filter)
+{
+	GF_DasherCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->pids)) {
+		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);
+		gf_free(ds);
+	}
+	gf_list_del(ctx->pids);
+	if (ctx->mpd) gf_mpd_del(ctx->mpd);
+
+	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);
+	gf_list_del(ctx->next_period->streams);
+	gf_free(ctx->next_period);
+	if (ctx->out_path) gf_free(ctx->out_path);
+	gf_list_del(ctx->postponed_pids);
+}
+
+#define MPD_EXTS "mpd|m3u8|3gm|ism"
+#define MPD_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"
+
+static const GF_FilterCapability DasherCaps[] =
+{
+	//we accept files as input, but only for NULL file (no source)
+	CAP_UINT(GF_CAPS_INPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	//only with no source
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_URL, "*"),
+	CAP_STRING(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_FILEPATH, "*"),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, MPD_EXTS),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, MPD_MIMES),
+	{0},
+	//anything AV pid framed result in manifest PID
+	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),
+	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),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, MPD_EXTS),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, MPD_MIMES),
+	{0},
+	//anything else (not file, not AV and framed) in compressed format result in manifest PID
+	//we cannot handle RAW format for such streams as these are in-memory data (scene graph, decoded text, etc ..)
+	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_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, MPD_EXTS),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, MPD_MIMES),
+	{0},
+	//anything else (not file and framed) result in media pids not file
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_DasherCtx, _n)
+static const GF_FilterArgs DasherArgs[] =
+{
+	{ OFFS(segdur), "target segment duration in seconds", GF_PROP_DOUBLE, "1.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"
+		"- static: static content\n"
+		"- dynamic: live generation\n"
+		"- dynlast: last call for live, will turn the MPD into static"
+		"", GF_PROP_UINT, "static", "static|dynamic|dynlast", GF_FS_ARG_UPDATE},
+	{ 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(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"
+	"- 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(forcep), "force profile string for avc/hevc/aac", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ 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"
+	"- 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(avcp), "profile to use for AVC|H264 if no profile could be found. If forcep is set, enforces this profile", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(hvcp), "profile to use for HEVC if no profile could be found. If forcep is set, enforces this profile", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(aacp), "profile to use for AAC if no profile could be found. If forcep is set, enforces this profile", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(av1p), "profile to use for AV1 if no profile could be found. If forcep is set, enforces this profile", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(vpxp), "profile to use for VP8/9 if no profile could be found. If forcep is set, enforces this profile", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(template), "template string to use to generate segment name - see filter help", 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"
+		"- mp4: uses ISOBMFF format\n"
+		"- 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"
+		"- 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(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"
+		"- live: DASH live profile, using segment template\n"
+		"- onDemand: MPEG-DASH live profile\n"
+		"- main: MPEG-DASH main profile, using segment list\n"
+		"- 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 },
+	{ 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"
+	"- rep: in representation element\n"
+	"- both: in both adaptation set and representation elements"
+	"", GF_PROP_UINT, "set", "set|rep|both", GF_FS_ARG_HINT_ADVANCED },
+	{ OFFS(pssh), "storage mode for PSSH box\n"
+	"- f: stores in movie fragment only\n"
+	"- v: stores in movie only\n"
+	"- m: stores in mpd only\n"
+	"- 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(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},
+	{ OFFS(title), "MPD title", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(source), "MPD Source", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(info), "MPD info url", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(cprt), "MPD copyright string", GF_PROP_STRING, NULL, NULL, 0},
+	{ 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(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(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(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(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(_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"
+				"- out: segment split as soon as `TSS` is exceeded (`TSS` <= segment_start)\n"
+				"- closest: segment split at closest SAP to theoretical bound\n"
+				"- in: `TSS` is always in segment (`TSS` >= segment_start)", GF_PROP_UINT, "out", "out|closest|in", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(reschedule), "reschedule sources with no period ID assigned once done (dynamic mode only)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(sreg), "regulate the session when using subdur to only generate segments from the past up to live edge", 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},
+	{0}
+};
+
+
+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 common codecs (aac, hevc, vp9, av1, aac)\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"
+			"Warning: the filter does not perform any real-time regulation, even in dynamic offering mode.\n"
+			"If your inputs are not real-time, 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"
+	        "- $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\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. These properties are used to setup each representation and can be overriden 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 try 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 should only be used with single-track ISOBMFF sources. If onDemand [-profile]() is requested, sources have to be formatted as a DASH self-initializing media segment with the proper sidx.\n"
+			"This mode automatically disables templates and forces [-sseg]() for all profiles except onDemand ones.\n"
+			"The manifest generation-only mode supports both MPD and HLS generation.\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 used 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"
+			)
+	.private_size = sizeof(GF_DasherCtx),
+	.args = DasherArgs,
+	.initialize = dasher_initialize,
+	.finalize = dasher_finalize,
+	SETCAPS(DasherCaps),
+	.flags = GF_FS_REG_REQUIRES_RESOLVER,
+	.configure_pid = dasher_configure_pid,
+	.process = dasher_process,
+	.process_event = dasher_process_event,
+};
+
+
+const GF_FilterRegister *dasher_register(GF_FilterSession *session)
+{
+	return &DasherRegister;
+}

gpac-1.0.0.tar.gz/src/filters/dec_ac52.c Added

@@ -0,0 +1,298 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AC3 liba52 decoder 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>
+
+#ifdef GPAC_HAS_LIBA52
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "liba52")
+# endif
+#endif
+
+
+#ifndef uint32_t
+#define uint32_t u32
+#endif
+#ifndef uint8_t
+#define uint8_t u8
+#endif
+
+#include <a52dec/mm_accel.h>
+#include <a52dec/a52.h>
+
+#define AC3_FRAME_SIZE 1536
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	
+	a52_state_t *codec;
+	sample_t* samples;
+
+	u32 sample_rate, flags, bit_rate;
+	u8 num_channels;
+	u32 channel_mask;
+	u64 last_cts;
+	u32 timescale;
+} GF_A52DecCtx;
+
+
+static GF_Err a52dec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_A52DecCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		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;
+
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+	if (!ctx->opid) {
+		u32 flags = MM_ACCEL_DJBFFT;
+#if !defined (GPAC_CONFIG_IOS) && !defined (GPAC_CONFIG_ANDROID)
+		flags |= MM_ACCEL_X86_MMX | MM_ACCEL_X86_3DNOW | MM_ACCEL_X86_MMXEXT;
+#endif
+		ctx->codec = a52_init(flags);
+		if (!ctx->codec) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
+			return GF_IO_ERR;
+		}
+
+		ctx->samples = a52_samples(ctx->codec);
+		if (!ctx->samples) {
+			a52_free(ctx->codec);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[A52] Error initializing decoder\n"));
+			return GF_IO_ERR;
+		}
+
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//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) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT(AC3_FRAME_SIZE) );
+	return GF_OK;
+}
+
+static void a52dec_finalize(GF_Filter *filter)
+{
+	GF_A52DecCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->codec) a52_free(ctx->codec);
+}
+
+
+static void a52dec_check_mc_config(GF_A52DecCtx *ctx)
+{
+	u32 channel_mask = 0;
+
+	switch (ctx->flags & A52_CHANNEL_MASK) {
+	case A52_CHANNEL1:
+	case A52_CHANNEL2:
+	case A52_MONO:
+		channel_mask = GF_AUDIO_CH_FRONT_CENTER;
+		break;
+	case A52_CHANNEL:
+	case A52_STEREO:
+		channel_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
+		break;
+	case A52_DOLBY:
+		break;
+	case A52_3F:
+		channel_mask = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
+		break;
+	case A52_2F1R:
+		channel_mask = GF_AUDIO_CH_REAR_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
+		break;
+	case A52_3F1R:
+		channel_mask = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_REAR_CENTER;
+		break;
+	case A52_2F2R:
+		channel_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT;
+		break;
+	case A52_3F2R:
+		channel_mask = GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT;
+		break;
+	}
+	if (ctx->flags & A52_LFE)
+		channel_mask |= GF_AUDIO_CH_LFE;
+
+	if (ctx->channel_mask != channel_mask) {
+		ctx->channel_mask = channel_mask;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(channel_mask) );
+	}
+}
+
+
+/**** the following two functions comes from a52dec */
+static GFINLINE s32 blah (s32 i)
+{
+	if (i > 0x43c07fff)
+		return 32767;
+	else if (i < 0x43bf8000)
+		return -32768;
+	return i - 0x43c00000;
+}
+
+static GFINLINE void float_to_int (float * _f, s16 *samps, int nchannels)
+{
+	int i, j, c;
+	s32 * f = (s32 *) _f;       // XXX assumes IEEE float format
+
+	j = 0;
+	nchannels *= 256;
+	for (i = 0; i < 256; i++) {
+		for (c = 0; c < nchannels; c += 256)
+			samps[j++] = blah (f[i + c]);
+	}
+}
+
+/**** end */
+
+static const int ac3_channels[8] = {
+	2, 1, 2, 3, 3, 4, 4, 5
+};
+
+static GF_Err a52dec_process(GF_Filter *filter)
+{
+	short *out_samples;
+	int i, len, bit_rate;
+	u32 size;
+	const char *data;
+	u8 *buffer;
+	u32 sample_rate, flags;
+	u8 num_channels;
+	sample_t level;
+	GF_A52DecCtx *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_EOS;
+		}
+		return GF_OK;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Decoding AU\n"));
+
+	data = gf_filter_pck_get_data(pck, &size);
+	len = a52_syncinfo((u8 *) data, &flags, &sample_rate, &bit_rate);
+	if (!len) return GF_NON_COMPLIANT_BITSTREAM;
+
+	num_channels = ac3_channels[flags & 7];
+	if (flags & A52_LFE) num_channels++;
+	flags |= A52_ADJUST_LEVEL;
+	if ((sample_rate != ctx->sample_rate) || (num_channels != ctx->num_channels) || (ctx->flags != flags) ) {
+		ctx->num_channels = num_channels;
+		ctx->sample_rate = sample_rate;
+		ctx->flags = flags;
+
+		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->num_channels) );
+		a52dec_check_mc_config(ctx);
+	}
+	if (ctx->bit_rate != bit_rate) {
+		ctx->bit_rate = bit_rate;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, &PROP_UINT(ctx->bit_rate) );
+	}
+	level = 1;
+	if ( a52_frame(ctx->codec, (u8 *) data, &ctx->flags, &level, 384)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[A52] Error decoding AU\n" ));
+		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->num_channels * sizeof(short) * AC3_FRAME_SIZE, &buffer);
+
+	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_pid_drop_packet(ctx->ipid);
+	}
+	gf_filter_pck_set_cts(dst_pck, ctx->last_cts);
+	if (ctx->timescale != ctx->sample_rate) {
+		u64 dur = AC3_FRAME_SIZE * ctx->timescale;
+		dur /= ctx->sample_rate;
+		gf_filter_pck_set_duration(dst_pck, (u32) dur);
+		ctx->last_cts += dur;
+	} else {
+		gf_filter_pck_set_duration(dst_pck, AC3_FRAME_SIZE);
+		ctx->last_cts += AC3_FRAME_SIZE;
+	}
+
+	out_samples = (short*)buffer;
+	for (i=0; i<6; i++) {
+		if (a52_block(ctx->codec))
+			return GF_NON_COMPLIANT_BITSTREAM;
+
+		float_to_int(ctx->samples, out_samples + i * 256 * ctx->num_channels, ctx->num_channels);
+	}
+	gf_filter_pck_send(dst_pck);
+
+	return GF_OK;
+}
+
+
+
+static const GF_FilterCapability A52DecCaps[] =
+{
+	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_AC3),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister A52DecRegister = {
+	.name = "a52dec",
+	GF_FS_SET_DESCRIPTION("A52 decoder")
+	GF_FS_SET_HELP("This filter decodes AC3 streams through a52dec library.")
+	.private_size = sizeof(GF_A52DecCtx),
+	.priority = 1,
+	SETCAPS(A52DecCaps),
+	.configure_pid = a52dec_configure_pid,
+	.process = a52dec_process,
+	.finalize = a52dec_finalize
+};
+
+#endif
+
+const GF_FilterRegister *a52dec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_LIBA52
+	return &A52DecRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dec_bifs.c Added

@@ -0,0 +1,300 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / BIFS decoder 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/bifs.h>
+#include <gpac/constants.h>
+#include <gpac/compositor.h>
+#include <gpac/internal/compositor_dev.h>
+
+
+typedef struct
+{
+	GF_BifsDecoder *bifs_dec;
+	GF_ObjectManager *odm;
+	GF_Scene *scene;
+
+	Bool is_playing;
+	GF_FilterPid *out_pid;
+} GF_BIFSDecCtx;
+
+#ifndef GPAC_DISABLE_BIFS
+
+static GF_Err bifs_dec_configure_bifs_dec(GF_BIFSDecCtx *ctx, GF_FilterPid *pid)
+{
+	GF_Err e;
+	u32 es_id=0;
+	u32 codecid=0;
+	const GF_PropertyValue *prop;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (prop) es_id = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (prop) codecid = prop->value.uint;
+
+
+	//we must have a dsi
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop || !prop->value.data.ptr || !prop->value.data.size) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (!ctx->bifs_dec) {
+		/*if a node asked for this media object, use the scene graph of the node (AnimationStream in PROTO)*/
+		if (ctx->odm->mo && ctx->odm->mo->node_ptr) {
+			GF_SceneGraph *sg = gf_node_get_graph((GF_Node*)ctx->odm->mo->node_ptr);
+			ctx->bifs_dec = gf_bifs_decoder_new(sg, GF_TRUE);
+			ctx->odm->mo->node_ptr = NULL;
+		} else {
+			ctx->bifs_dec = gf_bifs_decoder_new(ctx->scene->graph, GF_FALSE);
+		}
+	}
+
+
+	e = gf_bifs_decoder_configure_stream(ctx->bifs_dec, es_id, prop->value.data.ptr, prop->value.data.size, codecid);
+	if (e) return e;
+
+	return GF_OK;
+}
+
+GF_Err bifs_dec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_FilterPid *out_pid;
+	GF_BIFSDecCtx *ctx = gf_filter_get_udta(filter);
+	const GF_PropertyValue *prop;
+
+	//we must have streamtype SCENE
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop || (prop->value.uint != GF_STREAM_SCENE)) {
+		return GF_NOT_SUPPORTED;
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop || ( (prop->value.uint != GF_CODECID_BIFS) && (prop->value.uint != GF_CODECID_BIFS_V2)) ) {
+		return GF_NOT_SUPPORTED;
+	}
+	//we must have a dsi
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop || !prop->value.data.ptr || !prop->value.data.size) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (is_remove) {
+		out_pid = gf_filter_pid_get_udta(pid);
+		if (ctx->out_pid==out_pid)
+			ctx->out_pid = NULL;
+		gf_filter_pid_remove(out_pid);
+		return GF_OK;
+	}
+	//this is a reconfigure
+	if (gf_filter_pid_get_udta(pid)) {
+		return bifs_dec_configure_bifs_dec(ctx, pid);
+	}
+
+	//check our namespace
+	if (ctx->scene && ! gf_filter_pid_is_filter_in_parents(pid, ctx->scene->root_od->scene_ns->source_filter)) {
+		return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+
+	//declare a new output PID of type SCENE, codecid RAW
+	out_pid = gf_filter_pid_new(filter);
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(out_pid, pid);
+	gf_filter_pid_set_property(out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_udta(pid, out_pid);
+
+	if (!ctx->out_pid)
+		ctx->out_pid = out_pid;
+	return GF_OK;
+}
+
+
+
+GF_Err bifs_dec_process(GF_Filter *filter)
+{
+	GF_Err e;
+	Double ts_offset;
+	u64 now, cts;
+	u32 obj_time;
+	u32 i, count;
+	const char *data;
+	u32 size, ESID=0;
+	const GF_PropertyValue *prop;
+	GF_FilterPacket *pck;
+	GF_BIFSDecCtx *ctx = gf_filter_get_udta(filter);
+
+	GF_Scene *scene = ctx->scene;
+
+	if (!scene) {
+		if (ctx->is_playing) {
+			if (ctx->out_pid && gf_bifs_decode_has_conditionnals(ctx->bifs_dec)) {
+				gf_filter_pid_set_info(ctx->out_pid, GF_PROP_PID_KEEP_AFTER_EOS, &PROP_BOOL(GF_TRUE));
+			}
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	if (!ctx->bifs_dec) return GF_OK;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(pid);
+
+		GF_ObjectManager *odm = gf_filter_pid_get_udta(opid);
+		if (!odm) continue;
+		//object clock shall be valid
+		assert(odm->ck);
+
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			Bool is_eos = gf_filter_pid_is_eos(pid);
+			if (is_eos) {
+				if (opid && gf_bifs_decode_has_conditionnals(ctx->bifs_dec)) {
+					gf_filter_pid_set_info(opid, GF_PROP_PID_KEEP_AFTER_EOS, &PROP_BOOL(GF_TRUE));
+				}
+				gf_filter_pid_set_eos(opid);
+			}
+			continue;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (prop) ESID = prop->value.uint;
+
+		cts = gf_filter_pck_get_cts( pck );
+		ts_offset = (Double) cts;
+		ts_offset /= gf_filter_pck_get_timescale(pck);
+
+		gf_odm_check_buffering(odm, pid);
+
+
+		//we still process any frame before our clock time even when buffering
+		obj_time = gf_clock_time(odm->ck);
+		if (ts_offset * 1000 > obj_time) {
+			gf_sc_sys_frame_pending(scene->compositor, ts_offset, obj_time, filter);
+			continue;
+		}
+
+		now = gf_sys_clock_high_res();
+		e = gf_bifs_decode_au(ctx->bifs_dec, ESID, data, size, ts_offset);
+		now = gf_sys_clock_high_res() - now;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[BIFS] ODM%d #CH%d at %d decoded AU TS %u in "LLU" us\n", odm->ID, ESID, obj_time, cts, now));
+
+		gf_filter_pid_drop_packet(pid);
+
+		if (e) return e;
+		if (odm == ctx->odm)
+			gf_scene_attach_to_compositor(scene);
+	}
+	return GF_OK;
+}
+
+static void bifs_dec_finalize(GF_Filter *filter)
+{
+	GF_BIFSDecCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bifs_dec) gf_bifs_decoder_del(ctx->bifs_dec);
+}
+
+
+static Bool bifs_dec_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	u32 count, i;
+	GF_BIFSDecCtx *ctx = gf_filter_get_udta(filter);
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		return GF_FALSE;
+	case GF_FEVT_RESET_SCENE:
+		return GF_FALSE;
+
+	default:
+		return GF_FALSE;
+	}
+	if (!com->attach_scene.on_pid) return GF_TRUE;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
+		//we found our pid, set it up
+		if (opid == com->attach_scene.on_pid) {
+			if (!ctx->odm) {
+				ctx->odm = com->attach_scene.object_manager;
+				ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+			}
+			bifs_dec_configure_bifs_dec(ctx, ipid);
+			gf_filter_pid_set_udta(opid, com->attach_scene.object_manager);
+			return GF_TRUE;
+		}
+	}
+
+	return GF_TRUE;
+}
+
+static const GF_FilterCapability BIFSDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_BIFS),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_BIFS_V2),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+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.")
+	.private_size = sizeof(GF_BIFSDecCtx),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.priority = 1,
+	SETCAPS(BIFSDecCaps),
+	.finalize = bifs_dec_finalize,
+	.process = bifs_dec_process,
+	.configure_pid = bifs_dec_configure_pid,
+	.process_event = bifs_dec_process_event,
+};
+
+#endif /*GPAC_DISABLE_BIFS*/
+
+const GF_FilterRegister *bifs_dec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_DISABLE_BIFS
+	return NULL;
+#else
+	return &BIFSDecRegister;
+#endif /*GPAC_DISABLE_BIFS*/
+}
+
+
+

gpac-1.0.0.tar.gz/src/filters/dec_faad.c Added

@@ -0,0 +1,430 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AAC FAAD2 decoder 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>
+
+#ifdef GPAC_HAS_FAAD
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wunknown-pragmas"
+#endif
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libfaad")
+# endif
+#endif
+
+#include <neaacdec.h>
+#include <gpac/constants.h>
+#include <gpac/avparse.h>
+
+
+typedef struct
+{
+	NeAACDecHandle codec;
+	NeAACDecFrameInfo info;	u32 sample_rate, timescale, num_samples;
+	u8 num_channels;
+
+	GF_FilterPid *ipid, *opid;
+	u32 cfg_crc;
+
+	Bool signal_mc;
+	Bool is_sbr;
+
+	u32 channel_mask;
+	char ch_reorder[16];
+	u64 last_cts;
+} GF_FAADCtx;
+
+static void faaddec_check_mc_config(GF_FAADCtx *ctx)
+{
+	u32 i, channel_mask = 0;
+	for (i=0; i<ctx->num_channels; i++) {
+		switch (ctx->info.channel_position[i]) {
+		case FRONT_CHANNEL_CENTER:
+			channel_mask |= GF_AUDIO_CH_FRONT_CENTER;
+			break;
+		case FRONT_CHANNEL_LEFT:
+			channel_mask |= GF_AUDIO_CH_FRONT_LEFT;
+			break;
+		case FRONT_CHANNEL_RIGHT:
+			channel_mask |= GF_AUDIO_CH_FRONT_RIGHT;
+			break;
+		case SIDE_CHANNEL_LEFT:
+			channel_mask |= GF_AUDIO_CH_REAR_SURROUND_LEFT;
+			break;
+		case SIDE_CHANNEL_RIGHT:
+			channel_mask |= GF_AUDIO_CH_REAR_SURROUND_RIGHT;
+			break;
+		case BACK_CHANNEL_LEFT:
+			channel_mask |= GF_AUDIO_CH_SURROUND_LEFT;
+			break;
+		case BACK_CHANNEL_RIGHT:
+			channel_mask |= GF_AUDIO_CH_SURROUND_RIGHT;
+			break;
+		case BACK_CHANNEL_CENTER:
+			channel_mask |= GF_AUDIO_CH_REAR_CENTER;
+			break;
+		case LFE_CHANNEL:
+			channel_mask |= GF_AUDIO_CH_LFE;
+			break;
+		default:
+			break;
+		}
+	}
+	if (ctx->channel_mask != channel_mask) {
+		ctx->channel_mask = channel_mask;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(channel_mask) );
+	}
+}
+
+static GF_Err faaddec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_FAADCtx *ctx = gf_filter_get_udta(filter);
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_Err e;
+	GF_M4ADecSpecInfo a_cfg;
+#endif
+
+	if (is_remove) {
+		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->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//copy properties at init or reconfig
+	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_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, NULL );
+	ctx->ipid = pid;
+
+
+	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;
+		}
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Reconfiguring but no DSI set, skipping\n"));
+		return GF_OK;
+	}
+
+	ctx->codec = NeAACDecOpen();
+	if (!ctx->codec) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error initializing decoder\n"));
+		return GF_IO_ERR;
+	}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	e = gf_m4a_get_config(p->value.data.ptr, p->value.data.size, &a_cfg);
+	if (e) return e;
+#endif
+	if (NeAACDecInit2(ctx->codec, (unsigned char *)p->value.data.ptr, p->value.data.size, (unsigned long*)&ctx->sample_rate, (u8*)&ctx->num_channels) < 0)
+	{
+#ifndef GPAC_DISABLE_AV_PARSERS
+		s8 res;
+		u8 *dsi, *s_base_object_type;
+		u32 dsi_len;
+		switch (a_cfg.base_object_type) {
+		case GF_M4A_AAC_MAIN:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_MAIN);
+			goto base_object_type_error;
+		case GF_M4A_AAC_LC:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_LC);
+			goto base_object_type_error;
+		case GF_M4A_AAC_SSR:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_SSR);
+			goto base_object_type_error;
+		case GF_M4A_AAC_LTP:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_LTP);
+			goto base_object_type_error;
+		case GF_M4A_AAC_SBR:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_SBR);
+			goto base_object_type_error;
+		case GF_M4A_AAC_PS:
+			s_base_object_type = gf_stringizer(GF_M4A_AAC_PS);
+base_object_type_error: /*error case*/
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error: unsupported %s format for stream - defaulting to AAC LC\n", s_base_object_type));
+		default:
+			break;
+		}
+		a_cfg.base_object_type = GF_M4A_AAC_LC;
+		a_cfg.has_sbr = GF_FALSE;
+		a_cfg.nb_chan = a_cfg.nb_chan > 2 ? 1 : a_cfg.nb_chan;
+
+		gf_m4a_write_config(&a_cfg, &dsi, &dsi_len);
+		res = NeAACDecInit2(ctx->codec, (unsigned char *) dsi, dsi_len, (unsigned long *) &ctx->sample_rate, (u8 *) &ctx->num_channels);
+		gf_free(dsi);
+		if (res < 0)
+#endif
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FAAD] Error when initializing AAC decoder for stream\n"));
+			return GF_NOT_SUPPORTED;
+		}
+	}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	ctx->is_sbr = a_cfg.has_sbr;
+#endif
+	ctx->num_samples = 1024;
+	ctx->signal_mc = ctx->num_channels>2 ? GF_TRUE : GF_FALSE;
+
+	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_SAMPLES_PER_FRAME, &PROP_UINT(ctx->num_samples) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->num_channels) );
+
+#if 0
+	if (!strcmp(FAAD2_VERSION, "unknown")) {
+		if (ctx->is_sbr) gf_filter_set_name(filter, "dec_faad:FAAD2-" FAAD2_VERSION "-SBR");
+		else gf_filter_set_name(filter,  "dec_faad:FAAD2-" FAAD2_VERSION);
+	} else
+#endif
+	{
+		if (ctx->is_sbr) gf_filter_set_name(filter, "dec_faad:FAAD2-SBR");
+		else gf_filter_set_name(filter,  "dec_faad:FAAD2");
+	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static s8 faaddec_get_channel_pos(GF_FAADCtx *ffd, u32 ch_cfg)
+{
+	u32 i;
+	for (i=0; i<ffd->info.channels; i++) {
+		switch (ffd->info.channel_position[i]) {
+		case FRONT_CHANNEL_CENTER:
+			if (ch_cfg==GF_AUDIO_CH_FRONT_CENTER) return i;
+			break;
+		case FRONT_CHANNEL_LEFT:
+			if (ch_cfg==GF_AUDIO_CH_FRONT_LEFT) return i;
+			break;
+		case FRONT_CHANNEL_RIGHT:
+			if (ch_cfg==GF_AUDIO_CH_FRONT_RIGHT) return i;
+			break;
+		case SIDE_CHANNEL_LEFT:
+			if (ch_cfg==GF_AUDIO_CH_REAR_SURROUND_LEFT) return i;
+			break;
+		case SIDE_CHANNEL_RIGHT:
+			if (ch_cfg==GF_AUDIO_CH_REAR_SURROUND_RIGHT) return i;
+			break;
+		case BACK_CHANNEL_LEFT:
+			if (ch_cfg==GF_AUDIO_CH_SURROUND_LEFT) return i;
+			break;
+		case BACK_CHANNEL_RIGHT:
+			if (ch_cfg==GF_AUDIO_CH_SURROUND_RIGHT) return i;
+			break;
+		case BACK_CHANNEL_CENTER:
+			if (ch_cfg==GF_AUDIO_CH_REAR_CENTER) return i;
+			break;
+		case LFE_CHANNEL:
+			if (ch_cfg==GF_AUDIO_CH_LFE) return i;
+			break;
+		}
+	}
+	return -1;
+}
+
+static GF_Err faaddec_process(GF_Filter *filter)
+{
+	GF_FAADCtx *ctx = gf_filter_get_udta(filter);
+	void *buffer;
+	u8 *output;
+	u32 i, j;
+	Bool is_eos = GF_FALSE;
+	GF_FilterPacket *dst_pck;
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (!pck) {
+		is_eos = gf_filter_pid_is_eos(ctx->ipid);
+		if (!is_eos) return GF_OK;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] Decoding AU\n"));
+	if (!pck) {
+		buffer = NeAACDecDecode(ctx->codec, &ctx->info, NULL, 0);
+	} else {
+		Bool start, end;
+		u32 size;
+		const char *data = gf_filter_pck_get_data(pck, &size);
+		buffer = NeAACDecDecode(ctx->codec, &ctx->info, (char *) data, size);
+
+		gf_filter_pck_get_framing(pck, &start, &end);
+		assert(start && end);
+	}
+
+	if (ctx->info.error>0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FAAD] Error decoding AU %s\n", NeAACDecGetErrorMessage(ctx->info.error) ));
+		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	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);
+		return GF_OK;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FAAD] AU decoded\n"));
+
+	/*FAAD froces us to decode a frame to get channel cfg*/
+	if (ctx->signal_mc) {
+		s32 ch, idx;
+		ctx->signal_mc = GF_FALSE;
+		idx = 0;
+		/*NOW WATCH OUT!! FAAD may very well decide to output more channels than indicated!!!*/
+		ctx->num_channels = ctx->info.channels;
+
+		/*get cfg*/
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_FRONT_LEFT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_FRONT_RIGHT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_FRONT_CENTER);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_LFE);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_SURROUND_LEFT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_SURROUND_RIGHT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_REAR_CENTER);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_REAR_SURROUND_LEFT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			idx++;
+		}
+		ch = faaddec_get_channel_pos(ctx, GF_AUDIO_CH_REAR_SURROUND_RIGHT);
+		if (ch>=0) {
+			ctx->ch_reorder[idx] = ch;
+			//last one, no need to increment idx++;
+		}
+		faaddec_check_mc_config(ctx);
+	}
+
+	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);
+		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_cts(dst_pck, ctx->last_cts);
+	if (ctx->timescale != ctx->sample_rate) {
+		u64 dur =ctx->info.samples * ctx->timescale;
+		dur /= ctx->sample_rate;
+		gf_filter_pck_set_duration(dst_pck, (u32) dur);
+		ctx->last_cts += dur;
+	} else {
+		gf_filter_pck_set_duration(dst_pck, (u32) ctx->info.samples);
+		ctx->last_cts += ctx->info.samples;
+	}
+	/*we assume left/right order*/
+	if (ctx->num_channels<=2) {
+		memcpy(output, buffer, sizeof(short)* ctx->info.samples);
+	} else {
+		unsigned short *conv_in, *conv_out;
+		conv_in = (unsigned short *) buffer;
+		conv_out = (unsigned short *) output;
+		for (i=0; i<ctx->info.samples; i+=ctx->info.channels) {
+			for (j=0; j<ctx->info.channels; j++) {
+				conv_out[i + j] = conv_in[i + ctx->ch_reorder[j]];
+			}
+		}
+	}
+	gf_filter_pck_send(dst_pck);
+	if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static const GF_FilterCapability FAADCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,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_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_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister FAADRegister = {
+	.name = "faad",
+	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,
+	SETCAPS(FAADCaps),
+	.configure_pid = faaddec_configure_pid,
+	.process = faaddec_process,
+};
+
+#endif
+
+const GF_FilterRegister *faad_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_FAAD
+	return &FAADRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dec_img.c Added

@@ -0,0 +1,173 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / libjpeg and libpng decoder 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/avparse.h>
+
+typedef struct
+{
+	u32 codecid;
+	GF_FilterPid *ipid, *opid;
+	u32 width, height, pixel_format, BPP;
+} GF_IMGDecCtx;
+
+static GF_Err imgdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_IMGDecCtx *ctx = (GF_IMGDecCtx *) gf_filter_get_udta(filter);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		//one in one out, this is simple
+		gf_filter_pid_remove(ctx->opid);
+		ctx->ipid = 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;
+	ctx->codecid = prop->value.uint;
+	ctx->ipid = pid;
+
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_RAW ));
+
+	if (ctx->codecid==GF_CODECID_JPEG) {
+		gf_filter_set_name(filter, "imgdec:libjpeg");
+	} else if (ctx->codecid==GF_CODECID_PNG) {
+		gf_filter_set_name(filter, "imgdec:libpng");
+	}
+	return GF_OK;
+}
+
+static GF_Err imgdec_process(GF_Filter *filter)
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_Err e;
+	GF_FilterPacket *pck;
+	u8 *data, *output;
+	u32 size;
+	GF_IMGDecCtx *ctx = (GF_IMGDecCtx *) gf_filter_get_udta(filter);
+
+	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, &size);
+
+	if ((ctx->codecid == GF_CODECID_JPEG) || (ctx->codecid == GF_CODECID_PNG)) {
+		GF_FilterPacket *dst_pck;
+		u32 out_size = 0;
+		u32 w = ctx->width;
+		u32 h = ctx->height;
+		u32 pf = ctx->pixel_format;
+
+		if (ctx->codecid == GF_CODECID_JPEG) {
+			e = gf_img_jpeg_dec(data, size, &ctx->width, &ctx->height, &ctx->pixel_format, NULL, &out_size, ctx->BPP);
+		} else {
+			e = gf_img_png_dec(data, size, &ctx->width, &ctx->height, &ctx->pixel_format, NULL, &out_size);
+		}
+
+		if (e != GF_BUFFER_TOO_SMALL) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return e;
+		}
+		if ((w != ctx->width) || (h!=ctx->height) || (pf!=ctx->pixel_format)) {
+			switch (ctx->pixel_format) {
+			case GF_PIXEL_GREYSCALE:
+				ctx->BPP = 1;
+				break;
+			case GF_PIXEL_RGB:
+				ctx->BPP = 3;
+				break;
+			case GF_PIXEL_RGBA:
+				ctx->BPP = 4;
+				break;
+			}
+			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_PIXFMT, & PROP_UINT(ctx->pixel_format));
+			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 (ctx->codecid == GF_CODECID_JPEG) {
+			e = gf_img_jpeg_dec(data, size, &ctx->width, &ctx->height, &ctx->pixel_format, output, &out_size, ctx->BPP);
+		} else {
+			e = gf_img_png_dec(data, size, &ctx->width, &ctx->height, &ctx->pixel_format, output, &out_size);
+		}
+
+		if (e) {
+			gf_filter_pck_discard(dst_pck);
+		} else {
+			gf_filter_pck_merge_properties(pck, dst_pck);
+			gf_filter_pck_send(dst_pck);
+		}
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+#endif //GPAC_DISABLE_AV_PARSERS
+
+	return GF_NOT_SUPPORTED;
+}
+
+
+static const GF_FilterCapability ImgDecCaps[] =
+{
+	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_JPEG),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_PNG),
+	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),
+};
+
+GF_FilterRegister ImgDecRegister = {
+	.name = "imgdec",
+	GF_FS_SET_DESCRIPTION("PNG/JPG decoder")
+	GF_FS_SET_HELP("This filter decodes JPEG and PNG images.")
+	.private_size = sizeof(GF_IMGDecCtx),
+	.priority = 1,
+	SETCAPS(ImgDecCaps),
+	.configure_pid = imgdec_configure_pid,
+	.process = imgdec_process,
+};
+
+const GF_FilterRegister *imgdec_register(GF_FilterSession *session)
+{
+	return &ImgDecRegister;
+}

gpac-1.0.0.tar.gz/src/filters/dec_j2k.c Added

@@ -0,0 +1,625 @@
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+*					All rights reserved
+*
+*  This file is part of GPAC / openjpeg2k decoder 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>
+
+#ifdef GPAC_HAS_JP2
+
+//we MUST set OPJ_STATIC before including openjpeg.h
+#if !defined(__GNUC__) && (defined(_WIN32_WCE) || defined (WIN32))
+#  define OPJ_STATIC
+#endif
+
+#include <gpac/constants.h>
+#include <gpac/isomedia.h>
+
+#include <openjpeg.h>
+
+#ifdef OPJ_PROFILE_NONE
+#define OPENJP2	1
+
+# if !defined(__GNUC__) && (defined(_WIN32_WCE) || defined (WIN32))
+#  if defined(_DEBUG)
+#   pragma comment(lib, "libopenjp2d")
+#  else
+#   pragma comment(lib, "libopenjp2")
+#  endif
+# endif
+
+#else
+
+#define OPENJP2	0
+
+# if !defined(__GNUC__) && (defined(_WIN32_WCE) || defined (WIN32))
+#  if defined(_DEBUG)
+#   pragma comment(lib, "LibOpenJPEGd")
+#  else
+#   pragma comment(lib, "LibOpenJPEG")
+#  endif
+# endif
+
+#endif
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	u32 cfg_crc;
+	/*no support for scalability with JPEG (progressive JPEG to test)*/
+	u32 bpp, nb_comp, width, height, out_size, pixel_format, dsi_size;
+	char *dsi;
+} GF_J2KCtx;
+
+
+static GF_Err j2kdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_J2KCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		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;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (p && p->value.data.ptr && p->value.data.size) {
+		GF_BitStream *bs;
+		u32 d4cc;
+		Bool dsi_ok=GF_FALSE;
+		u32 ex_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (ctx->cfg_crc == ex_crc) {
+			return GF_OK;
+		}
+		ctx->cfg_crc = ex_crc;
+
+		//old gpac version used to store only the payload of ihdr in the dsi, but the new version exposes the entire jp2h (without box size and type) as dsi
+		//so handle both on read
+		d4cc = 0;
+		if (p->value.data.size>8)
+			d4cc = GF_4CC(p->value.data.ptr[4], p->value.data.ptr[5], p->value.data.ptr[6], p->value.data.ptr[7]);
+
+		bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+		if ((d4cc==GF_4CC('i','h','d','r')) || (d4cc==GF_4CC('c','o','l','r'))) {
+			while (gf_bs_available(bs)) {
+				u32 bsize = gf_bs_read_u32(bs);
+				u32 btype = gf_bs_read_u32(bs);
+				if (btype==GF_4CC('i','h','d','r')) {
+					dsi_ok=GF_TRUE;
+					break;
+				}
+				gf_bs_skip_bytes(bs, bsize-8);
+			}
+		} else {
+			dsi_ok=GF_TRUE;
+		}
+		if (dsi_ok) {
+			ctx->height = gf_bs_read_u32(bs);
+			ctx->width = gf_bs_read_u32(bs);
+			ctx->nb_comp = gf_bs_read_u16(bs);
+			ctx->bpp = 1 + gf_bs_read_u8(bs);
+		}
+		gf_bs_del(bs);
+
+		if (!dsi_ok) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[OpenJPEG] Broken decoder config in j2k stream, cannot decode\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		ctx->out_size = ctx->width * ctx->height * ctx->nb_comp /* * ctx->bpp / 8 */;
+
+		switch (ctx->nb_comp) {
+		case 1:
+			ctx->pixel_format = GF_PIXEL_GREYSCALE;
+			break;
+		case 2:
+			ctx->pixel_format = GF_PIXEL_ALPHAGREY;
+			break;
+		case 3:
+			ctx->pixel_format = GF_PIXEL_RGB;
+			break;
+		case 4:
+			ctx->pixel_format = GF_PIXEL_RGBA;
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+	} else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		if (p) ctx->width = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		if (p) ctx->height = p->value.uint;
+		ctx->nb_comp = 0;
+		ctx->pixel_format = 0;
+	}
+
+	ctx->ipid = pid;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+	}
+	//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_WIDTH, &PROP_UINT(ctx->width) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+	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) );
+	}
+	return GF_OK;
+}
+
+/**
+sample error callback expecting a FILE* client object
+*/
+void error_callback(const char *msg, void *client_data)
+{
+	if (msg) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[OpenJPEG] Error %s", msg));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenJPEG] coverage test\n"));
+	}
+}
+/**
+sample warning callback expecting a FILE* client object
+*/
+void warning_callback(const char *msg, void *client_data)
+{
+	if (msg) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[OpenJPEG] Warning %s", msg));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenJPEG] coverage test\n"));
+	}
+}
+/**
+sample debug callback expecting no client object
+*/
+void info_callback(const char *msg, void *client_data)
+{
+	if (msg) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenJPEG] Info %s", msg));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenJPEG] coverage test\n"));
+	}
+}
+
+/*
+* Divide an integer by a power of 2 and round upwards.
+*
+* a divided by 2^b
+*/
+static int int_ceildivpow2(int a, int b) {
+	return (a + (1 << b) - 1) >> b;
+}
+
+#if OPENJP2
+typedef struct
+{
+	char *data;
+	u32 len, pos;
+} OJP2Frame;
+
+static OPJ_SIZE_T j2kdec_stream_read(void *out_buffer, OPJ_SIZE_T nb_bytes, void *user_data)
+{
+    OJP2Frame *frame = user_data;
+    u32 remain;
+    if (frame->pos == frame->len) return (OPJ_SIZE_T)-1;
+    remain = frame->len - frame->pos;
+    if (nb_bytes > remain) nb_bytes = remain;
+    memcpy(out_buffer, frame->data + frame->pos, nb_bytes);
+    frame->pos += (u32) nb_bytes;
+    return nb_bytes;
+}
+
+static OPJ_OFF_T j2kdec_stream_skip(OPJ_OFF_T nb_bytes, void *user_data)
+{
+    OJP2Frame *frame = user_data;
+    if (!user_data) return 0;
+
+    if (nb_bytes < 0) {
+        if (frame->pos == 0) return (OPJ_SIZE_T)-1;
+        if (nb_bytes + (s32) frame->pos < 0) {
+            nb_bytes = -frame->pos;
+        }
+    } else {
+        u32 remain;
+        if (frame->pos == frame->len) {
+            return (OPJ_SIZE_T)-1;
+        }
+        remain = frame->len - frame->pos;
+        if (nb_bytes > remain) {
+            nb_bytes = remain;
+        }
+    }
+    frame->pos += (u32) nb_bytes;
+    return nb_bytes;
+}
+
+static OPJ_BOOL j2kdec_stream_seek(OPJ_OFF_T nb_bytes, void *user_data)
+{
+    OJP2Frame *frame = user_data;
+    if (nb_bytes < 0 || nb_bytes > frame->pos) return OPJ_FALSE;
+    frame->pos = (u32)nb_bytes;
+    return OPJ_TRUE;
+}
+#endif
+
+
+static GF_Err j2kdec_process(GF_Filter *filter)
+{
+	u32 i, w, wr, h, hr, wh, size, pf;
+	u8 *data, *buffer;
+	opj_dparameters_t parameters;	/* decompression parameters */
+#if OPENJP2
+	s32 res;
+	opj_codec_t *codec = NULL;
+	opj_stream_t * stream = NULL;
+	OJP2Frame ojp2frame;
+#else
+	opj_event_mgr_t event_mgr;		/* event manager */
+	opj_dinfo_t* dinfo = NULL;	/* handle to a decompressor */
+	opj_cio_t *cio = NULL;
+	opj_codestream_info_t cinfo;
+#endif
+	opj_image_t *image = NULL;
+	u32 start_offset=0;
+	GF_J2KCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *pck_dst;
+	Bool changed = 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_OK;
+	}
+	data = (char *) gf_filter_pck_get_data(pck, &size);
+	if (!data) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_IO_ERR;
+	}
+
+	if (size>=8) {
+		if ((data[4]=='j') && (data[5]=='p') && (data[6]=='2') && (data[7]=='c'))
+			start_offset = 8;
+	}
+
+	/* set decoding parameters to default values */
+	opj_set_default_decoder_parameters(&parameters);
+
+#if OPENJP2
+	codec = opj_create_decompress(OPJ_CODEC_J2K);
+	if (codec) res = 1;
+	else res=0;
+
+	if (res) res = opj_set_info_handler(codec, info_callback, NULL);
+	if (res) res = opj_set_warning_handler(codec, warning_callback, NULL);
+	if (res) res = opj_set_error_handler(codec, error_callback, NULL);
+
+	if (res) res = opj_setup_decoder(codec, &parameters);
+
+	stream = opj_stream_default_create(OPJ_STREAM_READ);
+    opj_stream_set_read_function(stream, j2kdec_stream_read);
+    opj_stream_set_skip_function(stream, j2kdec_stream_skip);
+    opj_stream_set_seek_function(stream, j2kdec_stream_seek);
+    ojp2frame.data = data+start_offset;
+    ojp2frame.len = size-start_offset;
+    ojp2frame.pos = 0;
+    opj_stream_set_user_data(stream, &ojp2frame, NULL);
+    opj_stream_set_user_data_length(stream, ojp2frame.len);
+
+	if (res) res = opj_read_header(stream, codec, &image);
+	if (res) res = opj_set_decode_area(codec, image, 0, 0, image->x1, image->y1);
+	if (res) {
+		res = opj_decode(codec, stream, image);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[OpenJPEG] Decoding failed\n"));
+			opj_image_destroy(image);
+			image = NULL;
+		}
+	}
+
+#else
+
+	/* get a decoder handle for raw J2K frames*/
+	dinfo = opj_create_decompress(CODEC_J2K);
+
+	/* configure the event callbacks (not required) */
+	memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+	event_mgr.error_handler = error_callback;
+	event_mgr.warning_handler = warning_callback;
+	event_mgr.info_handler = info_callback;
+
+	/* catch events using our callbacks and give a local context */
+	opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr);
+
+	/* setup the decoder decoding parameters using the current image and user parameters */
+	opj_setup_decoder(dinfo, &parameters);
+
+	cio = opj_cio_open((opj_common_ptr)dinfo, data+start_offset, size-start_offset);
+	/* decode the stream and fill the image structure */
+	image = opj_decode_with_info(dinfo, cio, &cinfo);
+#endif
+
+	if (!image) {
+#if OPENJP2
+		opj_stream_destroy(stream);
+		opj_destroy_codec(codec);
+#else
+		opj_destroy_decompress(dinfo);
+		opj_cio_close(cio);
+#endif
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_IO_ERR;
+	}
+
+#if OPENJP2
+	ctx->nb_comp = image->numcomps;
+	w = image->x1;
+	h = image->y1;
+#else
+	ctx->nb_comp = cinfo.numcomps;
+	w = cinfo.image_w;
+	h = cinfo.image_h;
+#endif
+	ctx->bpp = ctx->nb_comp * 8;
+	ctx->out_size = ctx->width * ctx->height * ctx->nb_comp /* * ctx->bpp / 8 */;
+
+	switch (ctx->nb_comp) {
+	case 1:
+		pf = GF_PIXEL_GREYSCALE;
+		break;
+	case 2:
+		pf = GF_PIXEL_ALPHAGREY;
+		break;
+	case 3:
+		pf = GF_PIXEL_RGB;
+		break;
+	case 4:
+		pf = GF_PIXEL_RGBA;
+		break;
+	default:
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+	if ((image->comps[0].w==2*image->comps[1].w)
+		&& (image->comps[1].w==image->comps[2].w)
+		&& (image->comps[0].h==2*image->comps[1].h)
+		&& (image->comps[1].h==image->comps[2].h)) {
+		pf = GF_PIXEL_YUV;
+		ctx->out_size = 3*ctx->width*ctx->height/2;
+		changed = GF_TRUE;
+	}
+	if (ctx->pixel_format!=pf) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(pf) );
+		ctx->pixel_format = pf;
+		changed = GF_TRUE;
+	}
+	if (ctx->width!=w) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(w) );
+		ctx->width = w;
+		changed = GF_TRUE;
+	}
+	if (ctx->height!=h) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(h) );
+		ctx->height = h;
+		changed = GF_TRUE;
+	}
+	if (changed) {
+		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) );
+	}
+
+#if OPENJP2
+	opj_end_decompress(codec, stream);
+	opj_stream_destroy(stream);
+	stream = NULL;
+	opj_destroy_codec(codec);
+	codec = NULL;
+#else
+	/* close the byte stream */
+	opj_cio_close(cio);
+	cio = NULL;
+
+	/* gf_free( remaining structures */
+	if(dinfo) {
+		opj_destroy_decompress(dinfo);
+		dinfo = NULL;
+	}
+#endif
+
+	pck_dst = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &buffer);
+
+	w = image->comps[0].w;
+	wr = int_ceildivpow2(image->comps[0].w, image->comps[0].factor);
+	h = image->comps[0].h;
+	hr = int_ceildivpow2(image->comps[0].h, image->comps[0].factor);
+	wh = wr*hr;
+
+	if (ctx->nb_comp==1) {
+		if ((w==wr) && (h==hr)) {
+			for (i=0; i<wh; i++) {
+				buffer[i] = image->comps[0].data[i];
+			}
+		} else {
+			for (i=0; i<wh; i++) {
+				buffer[i] = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+			}
+		}
+	}
+	else if (ctx->nb_comp==3) {
+
+		if ((image->comps[0].w==2*image->comps[1].w) && (image->comps[1].w==image->comps[2].w)
+		        && (image->comps[0].h==2*image->comps[1].h) && (image->comps[1].h==image->comps[2].h)) {
+
+			if ((w==wr) && (h==hr)) {
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[0].data[i];
+					buffer++;
+				}
+//				w = image->comps[1].w;
+				wr = int_ceildivpow2(image->comps[1].w, image->comps[1].factor);
+//				h = image->comps[1].h;
+				hr = int_ceildivpow2(image->comps[1].h, image->comps[1].factor);
+				wh = wr*hr;
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[1].data[i];
+					buffer++;
+				}
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[2].data[i];
+					buffer++;
+				}
+			} else {
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+				}
+				w = image->comps[1].w;
+				wr = int_ceildivpow2(image->comps[1].w, image->comps[1].factor);
+//				h = image->comps[1].h;
+				hr = int_ceildivpow2(image->comps[1].h, image->comps[1].factor);
+				wh = wr*hr;
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+				}
+				for (i=0; i<wh; i++) {
+					*buffer = image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+				}
+			}
+
+
+		} else if ((image->comps[0].w==image->comps[1].w) && (image->comps[1].w==image->comps[2].w)
+		           && (image->comps[0].h==image->comps[1].h) && (image->comps[1].h==image->comps[2].h)) {
+
+			if ((w==wr) && (h==hr)) {
+				for (i=0; i<wh; i++) {
+					u32 idx = 3*i;
+					buffer[idx] = image->comps[0].data[i];
+					buffer[idx+1] = image->comps[1].data[i];
+					buffer[idx+2] = image->comps[2].data[i];
+				}
+			} else {
+				for (i=0; i<wh; i++) {
+					u32 idx = 3*i;
+					buffer[idx] = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+					buffer[idx+1] = image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+					buffer[idx+2] = image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+				}
+			}
+		}
+	}
+	else if (ctx->nb_comp==4) {
+		if ((image->comps[0].w==image->comps[1].w) && (image->comps[1].w==image->comps[2].w) && (image->comps[2].w==image->comps[3].w)
+		        && (image->comps[0].h==image->comps[1].h) && (image->comps[1].h==image->comps[2].h) && (image->comps[2].h==image->comps[3].h)) {
+
+			if ((w==wr) && (h==hr)) {
+				for (i=0; i<wh; i++) {
+					u32 idx = 4*i;
+					buffer[idx] = image->comps[0].data[i];
+					buffer[idx+1] = image->comps[1].data[i];
+					buffer[idx+2] = image->comps[2].data[i];
+					buffer[idx+3] = image->comps[3].data[i];
+				}
+			} else {
+				for (i=0; i<wh; i++) {
+					u32 idx = 4*i;
+					buffer[idx] = image->comps[0].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+					buffer[idx+1] = image->comps[1].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+					buffer[idx+2] = image->comps[2].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+					buffer[idx+3] = image->comps[3].data[w * hr - ((i) / (wr) + 1) * w + (i) % (wr)];
+				}
+			}
+		}
+	}
+
+	opj_image_destroy(image);
+	image = NULL;
+
+	if (gf_filter_pck_get_seek_flag(pck)) {
+		gf_filter_pck_discard(pck_dst);
+	} else {
+		gf_filter_pck_merge_properties(pck, pck_dst);
+		gf_filter_pck_send(pck_dst);
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err j2kdec_initialize(GF_Filter *filter)
+{
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		error_callback(NULL, NULL);
+		warning_callback(NULL, NULL);
+		info_callback(NULL, NULL);
+#if OPENJP2
+		j2kdec_stream_skip(0, NULL);
+#endif
+	}
+#endif
+	return GF_OK;
+}
+
+static const GF_FilterCapability J2KCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_J2K),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, 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_RAW),
+};
+
+GF_FilterRegister J2KRegister = {
+	.name = "j2kdec",
+#ifdef OPENJPEG_VERSION
+	.version = ""OPENJPEG_VERSION,
+#elif OPENJP2
+	.version = "2.x",
+#else
+	.version = "1.x",
+#endif
+	GF_FS_SET_DESCRIPTION("OpenJPEG2000 decoder")
+	GF_FS_SET_HELP("This filter decodes JPEG2000 streams through OpenJPEG2000 library.")
+	.private_size = sizeof(GF_J2KCtx),
+	.priority = 1,
+	SETCAPS(J2KCaps),
+	.initialize = j2kdec_initialize,
+	.configure_pid = j2kdec_configure_pid,
+	.process = j2kdec_process,
+};
+
+#endif
+
+const GF_FilterRegister *j2kdec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_JP2
+	return &J2KRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_laser.c Added

@@ -0,0 +1,273 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / LASeR decoder 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>
+
+#ifndef GPAC_DISABLE_LASER
+
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/laser.h>
+#include <gpac/constants.h>
+
+typedef struct
+{
+	GF_Scene *scene;
+	GF_ObjectManager *odm;
+//	GF_Terminal *app;
+	GF_LASeRCodec *codec;
+	u32 PL, nb_streams;
+	Bool is_playing;
+	GF_FilterPid *out_pid;
+} GF_LSRDecCtx;
+
+static GF_Err lsrdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_FilterPid *out_pid;
+	u32 ESID=0;
+	GF_LSRDecCtx *ctx = gf_filter_get_udta(filter);
+	const GF_PropertyValue *prop;
+
+	//we must have streamtype SCENE
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop || (prop->value.uint != GF_STREAM_SCENE)) {
+		return GF_NOT_SUPPORTED;
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop || (prop->value.uint != GF_CODECID_LASER) ) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+	if (prop) ESID = prop->value.uint;
+	else {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (prop) ESID = prop->value.uint;
+	}
+
+	//we must have a dsi
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!prop || !prop->value.data.ptr || !prop->value.data.size) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (is_remove) {
+		out_pid = gf_filter_pid_get_udta(pid);
+		if (ctx->out_pid==out_pid)
+			ctx->out_pid = NULL;
+		gf_filter_pid_remove(out_pid);
+		ctx->nb_streams--;
+		if (ctx->codec && ESID) {
+			return gf_laser_decoder_remove_stream(ctx->codec, ESID);
+		}
+		return GF_OK;
+	}
+	//this is a reconfigure
+	if (gf_filter_pid_get_udta(pid)) {
+		gf_laser_decoder_remove_stream(ctx->codec, ESID);
+		return gf_laser_decoder_configure_stream(ctx->codec, ESID, prop->value.data.ptr, prop->value.data.size);
+	}
+
+	//check our namespace
+	if (ctx->scene && ! gf_filter_pid_is_filter_in_parents(pid, ctx->scene->root_od->scene_ns->source_filter)) {
+		return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	//declare a new output PID of type scene, codecid RAW
+	out_pid = gf_filter_pid_new(filter);
+	ctx->nb_streams++;
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(out_pid, pid);
+	gf_filter_pid_set_property(out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_udta(pid, out_pid);
+
+	if (!ctx->out_pid)
+		ctx->out_pid = out_pid;
+	return GF_OK;
+}
+
+static Bool lsrdec_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	u32 count, i;
+	GF_LSRDecCtx *ctx = gf_filter_get_udta(filter);
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (!com->attach_scene.on_pid) return GF_TRUE;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
+		//we found our pid, set it up
+		if (opid == com->attach_scene.on_pid) {
+			if (!ctx->odm) {
+				ctx->odm = com->attach_scene.object_manager;
+				ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+
+				ctx->codec = gf_laser_decoder_new(ctx->scene->graph);
+				/*attach the clock*/
+				gf_laser_decoder_set_clock(ctx->codec, gf_scene_get_time, ctx->scene);
+				gf_filter_pid_set_udta(opid, com->attach_scene.object_manager);
+				lsrdec_configure_pid(filter, ipid, GF_FALSE);
+			}
+			return GF_TRUE;
+		}
+	}
+
+	return GF_TRUE;
+}
+
+static GF_Err lsrdec_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_FilterPacket *pck;
+	const char *data;
+	u32 size, ESID=0;
+	Double ts_offset;
+	u64 now, cts;
+	u32 obj_time;
+	u32 i, count;
+	const GF_PropertyValue *prop;
+	GF_LSRDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_Scene *scene = ctx->scene;
+
+	if (!scene) {
+		if (ctx->is_playing) {
+			if (ctx->out_pid && gf_laser_decode_has_conditionnals(ctx->codec)) {
+				gf_filter_pid_set_info(ctx->out_pid, GF_PROP_PID_KEEP_AFTER_EOS, &PROP_BOOL(GF_TRUE));
+			}
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	if (!ctx->codec) return GF_OK;
+
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(pid);
+
+		GF_ObjectManager *odm = gf_filter_pid_get_udta(opid);
+		if (!odm) continue;
+		//object clock shall be valid
+		assert(odm->ck);
+
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			Bool is_eos = gf_filter_pid_is_eos(pid);
+			if (is_eos) {
+				if (ctx->out_pid && gf_laser_decode_has_conditionnals(ctx->codec)) {
+					gf_filter_pid_set_info(ctx->out_pid, GF_PROP_PID_KEEP_AFTER_EOS, &PROP_BOOL(GF_TRUE));
+				}
+				gf_filter_pid_set_eos(opid);
+			}
+			continue;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (prop) ESID = prop->value.uint;
+
+		cts = gf_filter_pck_get_cts( pck );
+		ts_offset = (Double) cts;
+		ts_offset /= gf_filter_pck_get_timescale(pck);
+
+		gf_odm_check_buffering(odm, pid);
+
+
+		//we still process any frame before our clock time even when buffering
+		obj_time = gf_clock_time(odm->ck);
+		if (ts_offset * 1000 > obj_time) {
+			gf_sc_sys_frame_pending(ctx->scene->compositor, ts_offset, obj_time, filter);
+			continue;
+		}
+
+		now = gf_sys_clock_high_res();
+		e = gf_laser_decode_au(ctx->codec, ESID, data, size);
+		now = gf_sys_clock_high_res() - now;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[BIFS] ODM%d #CH%d at %d decoded AU TS %u in "LLU" us\n", odm->ID, ESID, obj_time, cts, now));
+
+		gf_filter_pid_drop_packet(pid);
+
+		if (e) return e;
+		if (odm == ctx->odm)
+			gf_scene_attach_to_compositor(scene);
+	}
+	return GF_OK;
+}
+
+static void lsrdec_finalize(GF_Filter *filter)
+{
+	GF_LSRDecCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->codec) gf_laser_decoder_del(ctx->codec);
+}
+
+
+static const GF_FilterCapability LSRDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_LASER),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
+GF_FilterRegister LSRDecRegister = {
+	.name = "lsrdec",
+	GF_FS_SET_DESCRIPTION("MPEG-4 LASeR decoder")
+	GF_FS_SET_HELP("This filter decodes MPEG-4 LASeR frames directly into the scene graph of the compositor. It cannot be used to dump LASeR content.")
+	.private_size = sizeof(GF_LSRDecCtx),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.priority = 1,
+	SETCAPS(LSRDecCaps),
+	.finalize = lsrdec_finalize,
+	.process = lsrdec_process,
+	.configure_pid = lsrdec_configure_pid,
+	.process_event = lsrdec_process_event,
+};
+
+#endif /*GPAC_DISABLE_LASER*/
+
+const GF_FilterRegister *lsrdec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_DISABLE_LASER
+	return NULL;
+#else
+	return &LSRDecRegister;
+#endif /*GPAC_DISABLE_LASER*/
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_mad.c Added

@@ -0,0 +1,298 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MP3 libmad decoder 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>
+
+#ifdef GPAC_HAS_MAD
+
+#include <gpac/constants.h>
+
+#if defined(_WIN32_WCE) || defined(_WIN64) || defined(__SYMBIAN32__)
+#ifndef FPM_DEFAULT
+#ifdef GPAC_64_BITS
+#define FPM_64BIT
+#else
+#define FPM_DEFAULT
+#endif
+#endif
+#endif
+
+#include <mad.h>
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libmad")
+# endif
+#endif
+
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	
+	Bool configured;
+
+	u32 sample_rate, num_samples, num_channels;
+	u32 timescale;
+	u64 last_cts;
+
+	unsigned char *buffer;
+	u32 len;
+
+	struct mad_frame frame;
+	struct mad_stream stream;
+	struct mad_synth synth;
+
+} GF_MADCtx;
+
+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;
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (ctx->configured) {
+		mad_stream_finish(&ctx->stream);
+		mad_frame_finish(&ctx->frame);
+		mad_synth_finish(&ctx->synth);
+	}
+	mad_stream_init(&ctx->stream);
+	mad_frame_init(&ctx->frame);
+	mad_synth_init(&ctx->synth);
+	ctx->configured = GF_TRUE;
+
+	/*we need a frame to init, so use default values*/
+	ctx->num_samples = 1152;
+	ctx->num_channels = 0;
+	ctx->sample_rate = 0;
+	ctx->ipid = pid;
+
+	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);
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static void maddec_finalize(GF_Filter *filter)
+{
+	GF_MADCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->buffer) gf_free(ctx->buffer);
+
+	if (ctx->configured) {
+		mad_stream_finish(&ctx->stream);
+		mad_frame_finish(&ctx->frame);
+		mad_synth_finish(&ctx->synth);
+	}
+}
+
+/*from miniMad.c*/
+#define MAD_SCALE(ret, s_chan)	\
+	chan = s_chan;				\
+	chan += (1L << (MAD_F_FRACBITS - 16));		\
+	if (chan >= MAD_F_ONE)					\
+		chan = MAD_F_ONE - 1;					\
+	else if (chan < -MAD_F_ONE)				\
+		chan = -MAD_F_ONE;				\
+	ret = chan >> (MAD_F_FRACBITS + 1 - 16);		\
+ 
+static GF_Err maddec_process(GF_Filter *filter)
+{
+	mad_fixed_t *left_ch, *right_ch, chan;
+	u8 *ptr;
+	u8 *data;
+	u32 num, 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 (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;
+
+mad_resync:
+	mad_stream_buffer(&ctx->stream, ctx->buffer, ctx->len);
+
+	if (mad_frame_decode(&ctx->frame, &ctx->stream) == -1) {
+		if (ctx->stream.error==MAD_ERROR_BUFLEN) {
+			if (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 ) );
+		if (ctx->len==in_size) {
+			if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		//try resynchro
+		memcpy(ctx->buffer, data, in_size);
+		ctx->len = in_size;
+		goto mad_resync;
+	}
+
+	mad_synth_frame(&ctx->synth, &ctx->frame);
+
+	if ((ctx->sample_rate != ctx->synth.pcm.samplerate) || (ctx->num_channels != ctx->synth.pcm.channels) || (ctx->num_samples != ctx->synth.pcm.length)) {
+		ctx->sample_rate = ctx->synth.pcm.samplerate;
+		ctx->num_channels = (u8) ctx->synth.pcm.channels;
+		ctx->num_samples = ctx->synth.pcm.length;
+
+		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->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->stream.next_frame) {
+		ctx->len = (u32) (&ctx->buffer[ctx->len] - ctx->stream.next_frame);
+		memmove(ctx->buffer, ctx->stream.next_frame, ctx->len);
+	}
+
+	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);
+
+	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_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;
+		gf_filter_pck_set_duration(dst_pck, (u32) dur);
+		ctx->last_cts += dur;
+	} else {
+		gf_filter_pck_set_duration(dst_pck, num);
+		ctx->last_cts += num;
+	}
+
+
+	while (num--) {
+		s32 rs;
+		MAD_SCALE(rs, (*left_ch++) );
+
+		*ptr = (rs >> 0) & 0xff;
+		ptr++;
+		*ptr = (rs >> 8) & 0xff;
+		ptr++;
+		//outSize += 2;
+
+		if (ctx->num_channels == 2) {
+			MAD_SCALE(rs, (*right_ch++) );
+			*ptr = (rs >> 0) & 0xff;
+			ptr++;
+			*ptr = (rs >> 8) & 0xff;
+			ptr++;
+			//outSize += 2;
+		}
+	}
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+
+static const GF_FilterCapability MADCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,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_MPEG2_PART3),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG_AUDIO),
+	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),
+};
+
+GF_FilterRegister MADRegister = {
+	.name = "maddec",
+	GF_FS_SET_DESCRIPTION("MAD decoder")
+	GF_FS_SET_HELP("This filter decodes MPEG 1/2 audio streams through libmad library.")
+	.private_size = sizeof(GF_MADCtx),
+	.priority = 1,
+	SETCAPS(MADCaps),
+	.finalize = maddec_finalize,
+	.configure_pid = maddec_configure_pid,
+	.process = maddec_process,
+};
+
+#endif
+
+const GF_FilterRegister *maddec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_MAD
+	return &MADRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_mediacodec.c Added

@@ -0,0 +1,1271 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / mediacodec decoder 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/internal/media_dev.h>
+#include <gpac/constants.h>
+
+#ifdef GPAC_CONFIG_ANDROID
+
+#include "dec_mediacodec.h"
+
+typedef struct
+{
+	//opts
+	Bool disable_gl;
+
+
+	GF_List *streams;
+	GF_List *frames_res;
+	GF_Filter *filter;
+	GF_FilterPid *opid;
+	u32 codecid;
+	u32 cfg_crc;
+
+	AMediaCodec *codec;
+	AMediaFormat *format;
+	ANativeWindow *window;
+
+	Bool use_gl_textures;
+	u32 dequeue_timeout;
+	u32 width, height, stride, out_size;
+	u32 pix_fmt;
+	GF_Fraction sar;
+
+	u32 crop_left, crop_right, crop_top, crop_bottom;
+
+	const char *mime;
+	u8 chroma_format, luma_bit_depth, chroma_bit_depth;
+
+	Bool is_adaptive;
+	Bool surface_rendering;
+	Bool frame_size_changed;
+	Bool inputEOS, outputEOS;
+
+	GF_MCDecSurfaceTexture surfaceTex;
+
+	//NAL-based specific
+	GF_List *SPSs, *PPSs, *VPSs;
+	s32 active_sps, active_pps, active_vps;
+	u32 nalu_size_length;
+	Bool inject_xps;
+
+	AVCState avc;
+	HEVCState hevc;
+
+	u32 decoded_frames_pending;
+	Bool reconfig_needed;
+	Bool before_exit_registered;
+
+	//hevc
+	u32 luma_bpp, chroma_bpp;
+	u8 chroma_format_idc;
+
+	ssize_t outIndex;
+	GLuint tex_id;
+} GF_MCDecCtx;
+
+typedef struct {
+	GF_FilterFrameInterface frame_ifce;
+	u8 * frame;
+	GF_MCDecCtx * ctx;
+	ssize_t outIndex;
+	Bool flushed;
+} GF_MCDecFrame;
+
+enum {
+	MCDEC_PPS = 0,
+	MCDEC_SPS,
+	MCDEC_VPS,
+};
+
+#if 0
+u8 sdkInt()
+{
+    char sdk_str[3] = "0";
+    //__system_property_get("ro.build.version.sdk", sdk_str, "0");
+    return atoi(sdk_str);
+}
+#endif
+
+
+void mcdec_init_media_format(GF_MCDecCtx *ctx, AMediaFormat *format)
+{
+    AMediaFormat_setString(ctx->format, AMEDIAFORMAT_KEY_MIME, ctx->mime);
+    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_WIDTH, ctx->width);
+    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_HEIGHT, ctx->height);
+    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_STRIDE, ctx->stride);
+    AMediaFormat_setInt32(ctx->format, AMEDIAFORMAT_KEY_MAX_INPUT_SIZE, ctx->width * ctx->height);
+}
+
+
+static void mcdec_reset_ps_list(GF_List *list)
+{
+	while (list && gf_list_count(list)) {
+		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
+		gf_free(slc->data);
+		gf_free(slc);
+		gf_list_rem(list, 0);
+	}
+}
+
+
+GF_Err mcdec_init_avc_dec(GF_MCDecCtx *ctx)
+{
+	s32 idx;
+	u32 i;
+	GF_AVCConfigSlot *sps = NULL;
+	GF_AVCConfigSlot *pps = NULL;
+
+	for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+		sps = gf_list_get(ctx->SPSs, i);
+		if (ctx->active_sps<0) ctx->active_sps = sps->id;
+
+		if (sps->id==ctx->active_sps) break;
+		sps = NULL;
+	}
+	if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+	for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+		pps = gf_list_get(ctx->PPSs, i);
+		if (ctx->active_pps<0) ctx->active_pps = pps->id;
+		if (pps->id==ctx->active_pps) break;
+		pps = NULL;
+	}
+	if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
+	ctx->reconfig_needed = GF_FALSE;
+	ctx->inject_xps = GF_TRUE;
+
+	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;
+	ctx->crop_right = ctx->avc.sps[idx].crop.right;
+	ctx->crop_top = ctx->avc.sps[idx].crop.top;
+	ctx->crop_bottom = ctx->avc.sps[idx].crop.bottom;
+	ctx->crop_left = ctx->avc.sps[idx].crop.left;
+	ctx->width +=  ctx->crop_left + ctx->crop_right;
+	ctx->height += ctx->crop_top + ctx->crop_bottom;
+	ctx->out_size = ctx->height * ctx->width * 3/2 ;
+
+	if (ctx->avc.sps[idx].vui.par_num && ctx->avc.sps[idx].vui.par_den) {
+		ctx->sar.num = ctx->avc.sps[idx].vui.par_num;
+		ctx->sar.den = ctx->avc.sps[idx].vui.par_den;
+	}
+	ctx->chroma_format = ctx->avc.sps[idx].chroma_format;
+	ctx->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
+	ctx->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
+	switch (ctx->chroma_format) {
+	case 2:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_YUV422_10;
+		} else {
+			ctx->pix_fmt = GF_PIXEL_YUV422;
+		}
+		break;
+	case 3:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_YUV444_10;
+		} else {
+			ctx->pix_fmt = GF_PIXEL_YUV444;
+		}
+		break;
+	default:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_YUV_10;
+		}
+		break;
+	}
+	ctx->frame_size_changed = GF_TRUE;
+    return GF_OK;
+}
+
+
+GF_Err mcdec_init_m4vp2_dec(GF_MCDecCtx *ctx)
+{
+	GF_ESD *esd;
+	GF_M4VDecSpecInfo vcfg;
+	GF_BitStream *bs;
+	u8 *dsi_data;
+	u32 dsi_size;
+	GF_FilterPid *ipid = gf_list_get(ctx->streams, 0);
+	const GF_PropertyValue *dcd = gf_filter_pid_get_property(ipid, GF_PROP_PID_DECODER_CONFIG);
+
+	if (!dcd) return GF_NON_COMPLIANT_BITSTREAM;
+
+
+	gf_m4v_get_config(dcd->value.data.ptr, dcd->value.data.size, &vcfg);
+	ctx->width = vcfg.width;
+	ctx->height = vcfg.height;
+
+	esd = gf_odf_desc_esd_new(2);
+	esd->decoderConfig->decoderSpecificInfo->data = dcd->value.data.ptr;
+	esd->decoderConfig->decoderSpecificInfo->dataLength = dcd->value.data.size;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u32(bs, 1);
+	gf_odf_desc_write_bs((GF_Descriptor *) esd, bs);
+	gf_bs_get_content(bs, &dsi_data, &dsi_size);
+	gf_bs_del(bs);
+
+	ctx->mime = "video/mp4v-es";
+	AMediaFormat_setBuffer(ctx->format, "csd-0", dsi_data, dsi_size);
+
+	gf_free(dsi_data);
+	gf_odf_desc_del((GF_Descriptor*)esd);
+	return GF_OK;
+}
+
+
+GF_Err mcdec_init_hevc_dec(GF_MCDecCtx *ctx)
+{
+
+	s32 idx;
+
+	u32 i;
+	GF_AVCConfigSlot *sps = NULL;
+	GF_AVCConfigSlot *pps = NULL;
+	GF_AVCConfigSlot *vps = NULL;
+
+	for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+		sps = gf_list_get(ctx->SPSs, i);
+		if (ctx->active_sps<0) ctx->active_sps = sps->id;
+
+		if (sps->id==ctx->active_sps) break;
+		sps = NULL;
+	}
+	if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+	for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+		pps = gf_list_get(ctx->PPSs, i);
+		if (ctx->active_pps<0) ctx->active_pps = pps->id;
+
+		if (pps->id==ctx->active_pps) break;
+		pps = NULL;
+	}
+	for (i=0; i<gf_list_count(ctx->VPSs); i++) {
+		vps = gf_list_get(ctx->VPSs, i);
+		if (ctx->active_vps<0) ctx->active_vps = vps->id;
+
+		if (vps->id==ctx->active_vps) break;
+		vps = NULL;
+	}
+	if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
+	ctx->reconfig_needed = GF_FALSE;
+	ctx->inject_xps = GF_TRUE;
+
+	idx = ctx->active_sps;
+	ctx->width = ctx->hevc.sps[idx].width;
+	ctx->height = ctx->hevc.sps[idx].height;
+	ctx->luma_bpp = ctx->hevc.sps[idx].bit_depth_luma;
+	ctx->chroma_bpp = ctx->hevc.sps[idx].bit_depth_chroma;
+	ctx->chroma_format_idc  = ctx->hevc.sps[idx].chroma_format_idc;
+
+	ctx->stride = ((ctx->luma_bpp==8) && (ctx->chroma_bpp==8)) ? ctx->width : ctx->width * 2;
+	if ( ctx->chroma_format_idc  == 1) { // 4:2:0
+		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+	}
+	else if ( ctx->chroma_format_idc  == 2) { // 4:2:2
+		ctx->out_size = ctx->stride * ctx->height * 2 ;
+	}
+	else if ( ctx->chroma_format_idc  == 3) { // 4:4:4
+		ctx->out_size = ctx->stride * ctx->height * 3;
+	}
+	else {
+		return GF_NOT_SUPPORTED;
+	}
+
+	switch (ctx->chroma_format) {
+	case 2:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_YUV422_10;
+		} else {
+			ctx->pix_fmt = GF_PIXEL_YUV422;
+		}
+		break;
+	case 3:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_YUV444_10;
+		} else {
+			ctx->pix_fmt = GF_PIXEL_YUV444;
+		}
+		break;
+	default:
+		if (ctx->luma_bit_depth>8) {
+			ctx->pix_fmt = GF_PIXEL_NV12;
+		}
+		break;
+	}
+
+	ctx->frame_size_changed = GF_TRUE;
+    return GF_OK;
+}
+
+
+static GF_Err mcdec_init_decoder(GF_MCDecCtx *ctx) {
+
+    GF_Err err;
+
+    ctx->format = AMediaFormat_new();
+
+    if(!ctx->format) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaFormat_new failed"));
+        return GF_FILTER_NOT_FOUND;
+    }
+
+	ctx->sar.num = ctx->sar.den = 0;
+    ctx->pix_fmt = GF_PIXEL_NV12;
+
+    switch (ctx->codecid) {
+	case GF_CODECID_AVC :
+		err = mcdec_init_avc_dec(ctx);
+		break;
+	case GF_CODECID_MPEG4_PART2 :
+		err = mcdec_init_m4vp2_dec(ctx);
+		break;
+	case GF_CODECID_HEVC:
+		err = mcdec_init_hevc_dec(ctx);
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+    }
+
+    if (err != GF_OK) {
+        return err;
+    }
+
+    ctx->dequeue_timeout = 5000;
+    ctx->stride = ctx->width;
+    mcdec_init_media_format(ctx, ctx->format);
+
+    if (!ctx->codec) {
+		char *decoder_name = mcdec_find_decoder(ctx->mime, ctx->width, ctx->height, &ctx->is_adaptive);
+		if(!decoder_name) return GF_PROFILE_NOT_SUPPORTED;
+
+		ctx->codec = AMediaCodec_createCodecByName(decoder_name);
+		gf_free(decoder_name);
+	}
+
+    if (!ctx->codec) {
+        GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaCodec_createDecoderByType failed"));
+        return GF_FILTER_NOT_FOUND;
+    }
+
+    if (ctx->disable_gl) {
+    	ctx->surface_rendering = 0;
+	} else if (!ctx->window) {
+		if(mcdec_create_surface(ctx->tex_id, &ctx->window, &ctx->surface_rendering, &ctx->surfaceTex) != GF_OK)
+			return GF_BAD_PARAM;
+	}
+
+	//TODO add support for crypto
+	if( AMediaCodec_configure(ctx->codec, ctx->format, (ctx->surface_rendering) ? ctx->window : NULL, NULL, 0) != AMEDIA_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaCodec_configure failed"));
+        return GF_BAD_PARAM;
+    }
+
+    if( AMediaCodec_start(ctx->codec) != AMEDIA_OK){
+         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC , ("[MCDec] AMediaCodec_start failed"));
+        return GF_BAD_PARAM;
+    }
+
+	ctx->inputEOS = GF_FALSE;
+    ctx->outputEOS = GF_FALSE;
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] Video size: %d x %d", ctx->width, ctx->height));
+
+
+	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) );
+	if (ctx->sar.den)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(ctx->sar) );
+
+	if (ctx->surface_rendering) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_GL_EXTERNAL) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT_WRAPPED, &PROP_UINT(ctx->pix_fmt) );
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT_WRAPPED, NULL );
+	}
+
+	switch (ctx->codecid) {
+	case GF_CODECID_AVC:
+		gf_filter_set_name(ctx->filter, "MediaCodec hardware AVC|H264");
+		break;
+	case GF_CODECID_HEVC:
+		gf_filter_set_name(ctx->filter, "MediaCodec hardware HEVC|H265");
+		break;
+	case GF_CODECID_MPEG4_PART2:
+		gf_filter_set_name(ctx->filter, "MediaCodec hardware MPEG-4 Part2");
+		break;
+	default:
+		gf_filter_set_name(ctx->filter, "MediaCodec unsupported");
+		break;
+	}
+	return GF_OK;
+}
+
+static void mcdec_register_avc_param_set(GF_MCDecCtx *ctx, u8 *data, u32 size, u8 xps)
+{
+	Bool add = GF_TRUE;
+	u32 i, count;
+	s32 ps_id;
+	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);
+		if (ps_id<0) return;
+	}
+	else {
+		ps_id = gf_media_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);
+		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)) {
+			gf_free(a_slc->data);
+			gf_free(a_slc);
+			gf_list_rem(dest, i);
+			break;
+		}
+		else {
+			add = GF_FALSE;
+		}
+		break;
+	}
+	if (add) {
+		GF_AVCConfigSlot *slc;
+		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		if (!slc) return;
+		slc->data = gf_malloc(size);
+		if (!slc->data) {
+			gf_free(slc);
+			return;
+		}
+		memcpy(slc->data, data, size);
+		slc->size = size;
+		slc->id = ps_id;
+		gf_list_add(dest, slc);
+
+		//force re-activation of sps/pps
+		if (xps == MCDEC_SPS) ctx->active_sps = -1;
+		else ctx->active_pps = -1;
+	}
+}
+
+static void mcdec_register_hevc_param_set(GF_MCDecCtx *ctx, u8 *data, u32 size, u8 xps)
+{
+	Bool add = GF_TRUE;
+	u32 i, count;
+	s32 ps_id;
+	GF_List *dest = NULL;
+
+	switch(xps) {
+		case MCDEC_SPS:
+			dest = ctx->SPSs;
+			ps_id = gf_media_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);
+			if (ps_id<0) return;
+			break;
+		case MCDEC_VPS:
+			dest = ctx->VPSs;
+			ps_id = gf_media_hevc_read_vps(data, size, &ctx->hevc);
+			if (ps_id<0) return;
+			break;
+		default:
+			break;
+	}
+
+	count = gf_list_count(dest);
+	for (i = 0; i<count; i++) {
+		GF_AVCConfigSlot *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)) {
+			gf_free(a_slc->data);
+			gf_free(a_slc);
+			gf_list_rem(dest, i);
+			break;
+		}
+		else {
+			add = GF_FALSE;
+		}
+		break;
+	}
+	if (add && dest) {
+		GF_AVCConfigSlot *slc;
+		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		if (!slc) return;
+		slc->data = gf_malloc(size);
+		if (!slc->data) {
+			gf_free(slc);
+			return;
+		}
+		memcpy(slc->data, data, size);
+		slc->size = size;
+		slc->id = ps_id;
+		gf_list_add(dest, slc);
+
+		//force re-activation of sps/pps/vps
+		if (xps == MCDEC_SPS) ctx->active_sps = -1;
+		else if (xps == MCDEC_PPS) ctx->active_pps = -1;
+		else  ctx->active_vps = -1;
+	}
+}
+
+static GF_Err mcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p, *dsi;
+	const GF_PropertyValue *dcd;
+	u32 codecid, dsi_crc;
+	Bool do_reset=GF_FALSE;
+	u32 i;
+	GF_FilterPid *base_pid = NULL;
+    GF_MCDecCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		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;
+		}
+		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) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] Missing codecid, cannot initialize\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	codecid = p->value.uint;
+
+	base_pid = gf_list_get(ctx->streams, 0);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (!p && base_pid && (base_pid != pid)) return GF_REQUIRES_NEW_INSTANCE;
+	else if (p) {
+		u32 base_idx_plus_one = 0;
+
+		if (ctx->codecid != GF_CODECID_HEVC) return GF_REQUIRES_NEW_INSTANCE;
+
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			GF_FilterPid *ipid = gf_list_get(ctx->streams, i);
+			const GF_PropertyValue *p_dep;
+			if (ipid==pid) continue;
+
+			p_dep = gf_filter_pid_get_property(ipid, GF_PROP_PID_ID);
+			if (p_dep && p_dep->value.uint == p->value.uint) {
+				base_idx_plus_one = i+1;
+				break;
+			}
+		}
+		if (!base_idx_plus_one) return GF_REQUIRES_NEW_INSTANCE;
+
+		//no support for L-HEVC
+		if (codecid != GF_CODECID_HEVC) return GF_NOT_SUPPORTED;
+		if (gf_list_find(ctx->streams, pid) < 0) {
+			gf_list_insert(ctx->streams, pid, base_idx_plus_one);
+		}
+		//no configure for temporal enhancements
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (ctx->opid && p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, p);
+		return GF_OK;
+	}
+
+
+	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)) return GF_OK;
+
+	if (gf_list_find(ctx->streams, pid) < 0) {
+		gf_list_insert(ctx->streams, pid, 0);
+	}
+	ctx->cfg_crc = dsi_crc;
+
+	gf_filter_set_max_extra_input_pids(filter, (codecid==GF_CODECID_HEVC) ? 5 : 0);
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+
+	//copy properties at init or reconfig
+	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 );
+
+	dcd = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	//not ready yet
+	if (!dcd) return GF_OK;
+
+	if (codecid!=ctx->codecid) do_reset = GF_TRUE;
+	else if (!ctx->is_adaptive) do_reset = GF_TRUE;
+
+	ctx->codecid = codecid;
+
+
+    if (do_reset && ctx->codec) {
+    	AMediaCodec_delete(ctx->codec);
+    	ctx->codec = NULL;
+    	mcdec_reset_ps_list(ctx->SPSs);
+    	mcdec_reset_ps_list(ctx->VPSs);
+    	mcdec_reset_ps_list(ctx->PPSs);
+
+    	if (ctx->format) AMediaFormat_delete(ctx->format);
+    	ctx->format = NULL;
+	}
+
+    if (!ctx->tex_id)
+       glGenTextures(1, &ctx->tex_id);
+
+	//check AVC config
+    if (ctx->codecid == GF_CODECID_AVC) {
+		GF_AVCConfig *cfg;
+		GF_AVCConfigSlot *slc;
+
+		ctx->mime = "video/avc";
+		ctx->avc.sps_active_idx = -1;
+		ctx->active_sps = ctx->active_pps = -1;
+
+		cfg = gf_odf_avc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+		for (i = 0; i<gf_list_count(cfg->sequenceParameterSets); i++) {
+			slc = gf_list_get(cfg->sequenceParameterSets, i);
+			slc->id = -1;
+			mcdec_register_avc_param_set(ctx, slc->data, slc->size, MCDEC_SPS);
+		}
+
+		for (i = 0; i<gf_list_count(cfg->pictureParameterSets); i++) {
+			slc = gf_list_get(cfg->pictureParameterSets, i);
+			slc->id = -1;
+			mcdec_register_avc_param_set(ctx, slc->data, slc->size, MCDEC_PPS);
+		}
+		//activate first SPS/PPS by default
+		slc = gf_list_get(ctx->SPSs, 0);
+		if (slc) ctx->active_sps = slc->id;
+
+		slc = gf_list_get(ctx->PPSs, 0);
+		if (slc) ctx->active_pps = slc->id;
+
+		ctx->nalu_size_length = cfg->nal_unit_size;
+		gf_odf_avc_cfg_del(cfg);
+    }
+	else if (codecid == GF_CODECID_MPEG4_PART2) {
+		GF_M4VDecSpecInfo vcfg;
+		gf_m4v_get_config(dcd->value.data.ptr, dcd->value.data.size, &vcfg);
+		ctx->width = vcfg.width;
+		ctx->height = vcfg.height;
+		ctx->out_size = ctx->width*ctx->height*3/2;
+		ctx->pix_fmt = GF_PIXEL_NV12;
+    }
+	else if (codecid == GF_CODECID_HEVC) {
+		ctx->mime = "video/hevc";
+        GF_HEVCConfig *hvcc;
+	    GF_AVCConfigSlot *sl;
+	    HEVCState hevc;
+	    u32 j;
+
+	    memset(&hevc, 0, sizeof(HEVCState));
+
+	    hvcc = gf_odf_hevc_cfg_read(dcd->value.data.ptr, dcd->value.data.size, GF_FALSE);
+	    if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+	    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);
+			for (j=0; j< gf_list_count(ar->nalus); j++) {
+				sl = (GF_AVCConfigSlot *)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);
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					mcdec_register_hevc_param_set(ctx, sl->data, sl->size, MCDEC_VPS);
+				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					mcdec_register_hevc_param_set(ctx, sl->data, sl->size, MCDEC_PPS);
+				}
+			}
+	    }
+		//activate first VPS/SPS/PPS by default
+	    sl = gf_list_get(ctx->VPSs, 0);
+	    if (sl) ctx->active_vps = sl->id;
+
+	    sl = gf_list_get(ctx->SPSs, 0);
+	    if (sl) ctx->active_sps = sl->id;
+
+	    sl = gf_list_get(ctx->PPSs, 0);
+	    if (sl) ctx->active_pps = sl->id;
+
+	    gf_odf_hevc_cfg_del(hvcc);
+    }
+	if (ctx->codec) return GF_OK;
+	return mcdec_init_decoder(ctx);
+}
+
+static void mcdec_write_ps(GF_BitStream *bs, GF_List *ps, s32 active_ps)
+{
+	u32 i, count;
+	if (active_ps<0) return;
+	count = gf_list_count(ps);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *sl = gf_list_get(ps, i);
+		if (sl->id==active_ps) {
+			gf_bs_write_u32(bs, 1);
+			gf_bs_write_data(bs, sl->data, sl->size);
+			return;
+		}
+	}
+}
+
+
+static GF_Err mcdec_rewrite_annex_b(GF_MCDecCtx *ctx, u8 *inBuffer, u32 inBufferLength, u8 **out_buffer, u32 *out_size)
+{
+	u32 i;
+	u8 *ptr = inBuffer;
+	u32 nal_size;
+	GF_Err e = GF_OK;
+	GF_BitStream *bs = NULL;
+
+	*out_buffer = NULL;
+	*out_size = 0;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!bs) return GF_OUT_OF_MEM;
+
+	if (ctx->inject_xps) {
+		ctx->inject_xps = GF_FALSE;
+		mcdec_write_ps(bs, ctx->VPSs, ctx->active_vps);
+		mcdec_write_ps(bs, ctx->SPSs, ctx->active_sps);
+		mcdec_write_ps(bs, ctx->PPSs, ctx->active_pps);
+	}
+
+	while (inBufferLength) {
+		nal_size = 0;
+		for (i = 0; i<ctx->nalu_size_length; i++) {
+			nal_size = (nal_size << 8) + ((u8)ptr[i]);
+		}
+		ptr += ctx->nalu_size_length;
+
+		gf_bs_write_u32(bs, 1);
+		gf_bs_write_data(bs, ptr, nal_size);
+
+
+		ptr += nal_size;
+
+		if (inBufferLength < nal_size + ctx->nalu_size_length) break;
+		inBufferLength -= nal_size + ctx->nalu_size_length;
+	}
+
+	gf_bs_get_content(bs, out_buffer, out_size);
+	gf_bs_del(bs);
+	return e;
+}
+
+static GF_Err mcdec_check_ps_state(GF_MCDecCtx *ctx, u8 *inBuffer, u32 inBufferLength)
+{
+	u32 nal_size;
+	GF_Err e = GF_OK;
+	GF_BitStream *bs = gf_bs_new(inBuffer, inBufferLength, GF_BITSTREAM_READ);
+
+
+	while (gf_bs_available(bs)) {
+		u8 nal_type;
+		u32 pos;
+		//turn off epb removal when reading nal size
+		gf_bs_enable_emulation_byte_removal(bs, GF_FALSE);
+		nal_size = gf_bs_read_int(bs, ctx->nalu_size_length * 8);
+		pos = gf_bs_get_position(bs);
+
+		if (ctx->codecid==GF_CODECID_AVC) {
+			//this will turn it back on
+			gf_media_avc_parse_nalu (bs, &ctx->avc);
+			gf_bs_seek(bs, pos + nal_size);
+
+			nal_type = ctx->avc.last_nal_type_parsed;
+			switch (nal_type) {
+			case GF_AVC_NALU_SEQ_PARAM:
+			case GF_AVC_NALU_PIC_PARAM:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AVC Parameter sets still present in packet payload !\n"));
+				break;
+			default:
+				if ((nal_type <= GF_AVC_NALU_IDR_SLICE) && ctx->avc.s_info.sps) {
+					if (ctx->avc.sps_active_idx != ctx->active_sps) {
+						ctx->reconfig_needed = 1;
+						ctx->active_sps = ctx->avc.sps_active_idx;
+						ctx->active_pps = ctx->avc.s_info.pps->id;
+						gf_bs_del(bs);
+						return GF_OK;
+					}
+				}
+				break;
+			}
+		} else {
+			u8 quality_id, temporal_id;
+			gf_media_hevc_parse_nalu_bs (bs, &ctx->hevc, &nal_type, &temporal_id, &quality_id);
+			gf_bs_seek(bs, pos + nal_size);
+
+			switch(nal_type) {
+			case GF_HEVC_NALU_SEQ_PARAM:
+			case GF_HEVC_NALU_PIC_PARAM:
+			case GF_HEVC_NALU_VID_PARAM:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] HEVC Parameter sets still present in packet payload !\n"));
+				break;
+			default:
+				if ((nal_type <= GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
+					if ((ctx->hevc.sps_active_idx != ctx->active_sps) || (ctx->hevc.sps[ctx->active_sps].vps_id != ctx->active_vps)) {
+						ctx->reconfig_needed = 1;
+						ctx->active_sps = ctx->hevc.sps_active_idx;
+						ctx->active_pps = ctx->hevc.s_info.pps->id;
+						ctx->active_vps = ctx->hevc.sps[ctx->active_sps].vps_id;
+						return GF_OK;
+					}
+				}
+				break;
+			}
+		}
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
+static GF_Err mcdec_send_frame(GF_MCDecCtx *ctx, u8 *frame_buffer, u64 cts);
+
+static GF_Err mcdec_process(GF_Filter *filter)
+{
+	u64 cts=0;
+	u8 *in_buffer;
+	u32 in_buffer_size, i, count, nb_eos;
+	u64 min_dts;
+	GF_Err e;
+	GF_MCDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_FilterPid *ref_pid = NULL;
+	u8 *dec_frame=NULL;
+
+	Bool mcdec_buffer_available = GF_FALSE;
+
+#if FILTER_FIXME
+	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) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] Failed to register exit function for the decoder thread %p, try to continue anyway...\n", gf_th_current()));
+		}
+	}
+#endif
+
+
+	//figure out min DTS
+	count = gf_list_count(ctx->streams);
+	nb_eos = 0;
+	min_dts = 0;
+	for (i=0; i<count; i++) {
+		u64 dts;
+		GF_FilterPid *pid = gf_list_get(ctx->streams, i);
+
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pid)) {
+				nb_eos++;
+				continue;
+			} else {
+				return GF_OK;
+			}
+		}
+		dts = gf_filter_pck_get_dts(pck);
+		dts *= 1000;
+		dts /= gf_filter_pck_get_timescale(pck);
+		if (!min_dts || (min_dts>dts)) {
+			min_dts = dts;
+			ref_pid = pid;
+		}
+	}
+
+	if (nb_eos==count) {
+		in_buffer = NULL;
+		in_buffer_size = 0;
+	} else {
+		assert(ref_pid);
+		pck = gf_filter_pid_get_packet(ref_pid);
+		assert(pck);
+
+		in_buffer = (u8 *) gf_filter_pck_get_data(pck, &in_buffer_size);
+		cts = gf_filter_pck_get_cts(pck);
+
+		//no reconfig but no adaptive, parse NALUs to figure out active ps
+		if (!ctx->reconfig_needed && !ctx->is_adaptive) {
+			mcdec_check_ps_state(ctx, in_buffer, in_buffer_size);
+		}
+
+		if (ctx->reconfig_needed) {
+			if (ctx->codec) {
+				AMediaCodec_flush(ctx->codec);
+				AMediaCodec_stop(ctx->codec);
+			}
+			e = mcdec_init_decoder(ctx);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] Failed to reconfigure decoder: %s\n", gf_error_to_string(e) ));
+				return e;
+			}
+		}
+	}
+
+	if (!ctx->inputEOS) {
+		ssize_t inIndex = AMediaCodec_dequeueInputBuffer(ctx->codec, ctx->dequeue_timeout);
+
+		if (inIndex >= 0) {
+            size_t inSize;
+            u32 flags = 0;
+            Bool do_free = GF_TRUE;
+			u8 *in_data=NULL;
+			u32 in_data_size=0;
+            u8 *buffer = (u8 *)AMediaCodec_getInputBuffer(ctx->codec, inIndex, &inSize);
+
+            //rewrite input from isobmf to annexB - this will write the param sets if needed
+            if (in_buffer) {
+            	mcdec_rewrite_annex_b(ctx, in_buffer, in_buffer_size, &in_data, &in_data_size);
+
+				if (!in_data) {
+					in_data = in_buffer;
+					in_data_size = in_buffer_size;
+					do_free = GF_FALSE;
+				}
+			}
+
+            if (in_data_size > inSize)  {
+                 GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[MCDec] The returned buffer is too small"));
+                 if (do_free) gf_free(in_data);
+                 return GF_OK;
+            }
+
+            if (in_data_size) {
+				memcpy(buffer, in_data, in_data_size);
+				gf_filter_pid_drop_packet(ref_pid);
+                 if (do_free) gf_free(in_data);
+			} else {
+                 GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM input"));
+				 ctx->inputEOS = GF_TRUE;
+				 flags = AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM;
+            }
+
+			if (AMediaCodec_queueInputBuffer(ctx->codec, inIndex, 0, in_data_size, cts, flags) != AMEDIA_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaCodec_queueInputBuffer failed"));
+				return GF_BAD_PARAM;
+            }
+            mcdec_buffer_available = GF_TRUE;
+        }
+    }
+
+    if (!ctx->outputEOS) {
+		u32 width, height, stride;
+		AMediaCodecBufferInfo info;
+
+        ctx->outIndex = AMediaCodec_dequeueOutputBuffer(ctx->codec, &info, ctx->dequeue_timeout);
+
+        switch(ctx->outIndex) {
+		case AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED:
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED"));
+			ctx->format = AMediaCodec_getOutputFormat(ctx->codec);
+			AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_WIDTH, &width);
+			AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_HEIGHT, &height);
+			AMediaFormat_getInt32(ctx->format, AMEDIAFORMAT_KEY_STRIDE, &stride);
+			if((ctx->width != width) || (ctx->height != height) || (ctx->stride != stride)){
+				ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+				ctx->frame_size_changed = GF_TRUE;
+			}
+			break;
+
+		case AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED:
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED"));
+			break;
+
+		case AMEDIACODEC_INFO_TRY_AGAIN_LATER:
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] AMEDIACODEC_INFO_TRY_AGAIN_LATER"));
+			break;
+
+		default:
+			if (ctx->outIndex < 0)
+			 	break;
+
+			dec_frame = NULL;
+
+			if (info.flags & AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM output"));
+				ctx->outputEOS = GF_TRUE;
+			}
+
+			if (!ctx->surface_rendering) {
+				size_t outSize;
+				uint8_t * buffer = AMediaCodec_getOutputBuffer(ctx->codec, ctx->outIndex, &outSize);
+				dec_frame = buffer + info.offset;
+
+				if (!dec_frame) {
+					 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaCodec_getOutputBuffer failed"));
+					 break;
+				}
+			}
+			e = mcdec_send_frame(ctx, dec_frame, info.presentationTimeUs);
+			if (e) return e;
+			break;
+		}
+    }
+
+	if (ctx->outputEOS) gf_filter_pid_set_eos(ctx->opid);
+	return GF_OK;
+}
+
+static void mcdec_hw_del(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FilterFrameInterface *frame_ifce = (GF_FilterFrameInterface *) gf_filter_pck_get_frame_interface(pck);
+	GF_MCDecFrame *f = frame_ifce ? frame_ifce->user_data : NULL;
+	if (!f) return;
+
+	if (f->ctx->codec && !f->flushed)  {
+		if ( AMediaCodec_releaseOutputBuffer(f->ctx->codec, f->outIndex, GF_FALSE) != AMEDIA_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] NOT Release Output Buffer Index: %d", f->outIndex));
+		}
+	}
+	f->ctx->decoded_frames_pending--;
+	gf_list_add(f->ctx->frames_res, f);
+}
+
+GF_Err mcdec_hw_get_plane(GF_FilterFrameInterface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	GF_MCDecFrame *f = (GF_MCDecFrame *)frame->user_data;
+	if (! outPlane || !outStride) return GF_BAD_PARAM;
+	*outPlane = NULL;
+	*outStride = 0;
+	f->ctx->format = AMediaCodec_getOutputFormat(f->ctx->codec);
+
+	AMediaFormat_getInt32(f->ctx->format, AMEDIAFORMAT_KEY_STRIDE, outStride);
+
+	switch(plane_idx) {
+	case 0 :
+		*outPlane = f->frame ;
+		break;
+	case 1 :
+		*outPlane = f->frame + *outStride * f->ctx->height ;
+		*outStride/=2;
+		break;
+	case 2:
+		*outPlane = f->frame + 5 * *outStride * f->ctx->height/4 ;
+		*outStride/=2;
+		break;
+	default :
+		return GF_BAD_PARAM;
+	}
+
+	return GF_OK;
+}
+
+GF_Err mcdec_hw_get_gl_texture(GF_FilterFrameInterface *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_Matrix * texcoordmatrix)
+{
+	GF_MCDecFrame *f = (GF_MCDecFrame *)frame->user_data;
+   	if (!gl_tex_format || !gl_tex_id) return GF_BAD_PARAM;
+#ifndef MEDIACODEC_EMUL_API
+	*gl_tex_format = GL_TEXTURE_EXTERNAL_OES;
+#endif
+
+	*gl_tex_id = f->ctx->tex_id;
+
+	if(!f->flushed && f->ctx->codec) {
+		if (AMediaCodec_releaseOutputBuffer(f->ctx->codec, f->outIndex, GF_TRUE) != AMEDIA_OK) {
+			 GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] NOT Release Output Buffer Index: %d to surface", f->outIndex));
+			 return GF_OK;
+		}
+		if(mcdec_update_surface(f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
+		if(mcdec_get_transform_matrix(texcoordmatrix, f->ctx->surfaceTex) != GF_OK) return GF_BAD_PARAM;
+
+		f->flushed = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+static GF_Err mcdec_send_frame(GF_MCDecCtx *ctx, u8 *frame_buffer, u64 cts)
+{
+	GF_MCDecFrame *mc_frame;
+	GF_FilterPacket *dst_pck;
+
+	if(ctx->outIndex < 0 || (!frame_buffer && !ctx->surface_rendering))  return GF_BAD_PARAM;
+
+	mc_frame = gf_list_pop_front(ctx->frames_res);
+	if (!mc_frame) {
+		GF_SAFEALLOC(mc_frame, GF_MCDecFrame);
+		if (!mc_frame) return GF_OUT_OF_MEM;
+	}
+	memset(&mc_frame->frame_ifce, 0, sizeof(GF_FilterFrameInterface));
+	mc_frame->frame_ifce.user_data = mc_frame;
+	mc_frame->ctx = ctx;
+	mc_frame->frame = frame_buffer;
+	mc_frame->outIndex = ctx->outIndex;
+	mc_frame->flushed = GF_FALSE;
+
+	if (ctx->surface_rendering) {
+		mc_frame->frame_ifce.get_gl_texture = mcdec_hw_get_gl_texture;
+	} else {
+		mc_frame->frame_ifce.get_plane = mcdec_hw_get_plane;
+	}
+
+	if (ctx->frame_size_changed) {
+		mc_frame->frame_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+	}
+	ctx->decoded_frames_pending++;
+
+
+	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &mc_frame->frame_ifce, mcdec_hw_del);
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
+	if (dst_pck) {
+		gf_filter_pck_set_cts(dst_pck, cts);
+		//TODO, copy properties from source packet !
+
+		gf_filter_pck_send(dst_pck);
+	}
+
+	return GF_OK;
+}
+
+GF_Err mcdec_initialize(GF_Filter *filter)
+{
+    GF_MCDecCtx *ctx = gf_filter_get_udta(filter);
+    ctx->filter = filter;
+
+	ctx->SPSs = gf_list_new();
+	ctx->PPSs = gf_list_new();
+	ctx->VPSs = gf_list_new();
+	ctx->frames_res = gf_list_new();
+
+	ctx->active_vps = -1;
+	ctx->active_sps = -1;
+	ctx->active_pps = -1;
+
+    return GF_OK;
+}
+
+void mcdec_finalize(GF_Filter *filter)
+{
+    GF_MCDecCtx *ctx = gf_filter_get_udta(filter);
+
+    if (ctx->format && AMediaFormat_delete(ctx->format) != AMEDIA_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaFormat_delete failed"));
+    }
+
+    if (ctx->codec && AMediaCodec_delete(ctx->codec) != AMEDIA_OK) {
+         GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[MCDec] AMediaCodec_delete failed"));
+    }
+
+    if(ctx->window) {
+		ANativeWindow_release(ctx->window);
+		ctx->window = NULL;
+    }
+
+    if (ctx->surfaceTex.texture_id)
+		mcdec_delete_surface(ctx->surfaceTex);
+
+    if(ctx->tex_id)
+    	glDeleteTextures (1, &ctx->tex_id);
+
+    mcdec_reset_ps_list(ctx->SPSs);
+	gf_list_del(ctx->SPSs);
+    mcdec_reset_ps_list(ctx->PPSs);
+	gf_list_del(ctx->PPSs);
+    mcdec_reset_ps_list(ctx->VPSs);
+	gf_list_del(ctx->VPSs);
+
+	while (gf_list_count(ctx->frames_res) ) {
+		GF_MCDecFrame *f = gf_list_pop_back(ctx->frames_res);
+		gf_free(f);
+	}
+	gf_list_del(ctx->frames_res);
+}
+
+#else
+static GF_Err mcdec_process(GF_Filter *filter)
+{
+	return GF_EOS;
+}
+#endif
+
+
+static const GF_FilterCapability MCDecCaps[] =
+{
+	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_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),
+
+	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),
+};
+
+#ifdef GPAC_CONFIG_ANDROID
+#define OFFS(_n)	#_n, offsetof(GF_MCDecCtx, _n)
+#else
+#define OFFS(_n)	#_n, -1
+#endif
+
+static const GF_FilterArgs MCDecArgs[] =
+{
+	{ OFFS(disable_gl), "disable OpenGL texture transfer", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+GF_FilterRegister GF_MCDecCtxRegister = {
+	.name = "mcdec",
+	GF_FS_SET_DESCRIPTION("MediaCodec decoder")
+	GF_FS_SET_HELP("This filter decodes video streams using hardware decoder on android devices")
+	.args = MCDecArgs,
+	SETCAPS(MCDecCaps),
+#ifdef GPAC_CONFIG_ANDROID
+	.private_size = sizeof(GF_MCDecCtx),
+	.initialize = mcdec_initialize,
+	.finalize = mcdec_finalize,
+	.configure_pid = mcdec_configure_pid,
+#else
+	.process = mcdec_process,
+#endif
+};
+
+
+const GF_FilterRegister *mcdec_register(GF_FilterSession *session)
+{
+#ifndef GPAC_CONFIG_ANDROID
+	if (!gf_opts_get_bool("temp", "gendoc"))
+		return NULL;
+	GF_MCDecCtxRegister.version = "! Warning: MediaCodec SDK NOT AVAILABLE IN THIS BUILD !";
+
+#ifdef GPAC_ENABLE_COVERAGE
+	mcdec_process(NULL);
+#endif
+
+#endif
+	return &GF_MCDecCtxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/dec_mediacodec.h Added

@@ -0,0 +1,128 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / mediacodec decoder 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.
+ *
+ */
+
+#ifndef _MEDIACODEC_DEC_H_
+#define _MEDIACODEC_DEC_H_
+
+#include <gpac/filters.h>
+
+#ifndef GPAC_CONFIG_ANDROID
+#define MEDIACODEC_EMUL_API
+#endif
+
+#ifdef MEDIACODEC_EMUL_API
+
+typedef void AMediaCodec;
+typedef void AMediaFormat;
+typedef void ANativeWindow;
+typedef int window;
+typedef void *jobject;
+
+typedef struct {
+	u32 flags;
+	s32 offset;
+	s64 presentationTimeUs;
+	s32 size;
+} AMediaCodecBufferInfo;
+
+void AMediaFormat_setString(void *, const char *, const char *);
+void AMediaFormat_setInt32(void *, const char *, int);
+void AMediaFormat_setBuffer(void *, const char *, char *, int);
+AMediaFormat *AMediaFormat_new();
+AMediaCodec *AMediaCodec_createCodecByName(char *);
+int AMediaCodec_configure(AMediaCodec *, const AMediaFormat *format, ANativeWindow *surface, void *crypto, uint32_t flags);
+int AMediaCodec_start(AMediaCodec *);
+int AMediaCodec_stop(AMediaCodec *);
+
+ssize_t AMediaCodec_dequeueInputBuffer(AMediaCodec *, int64_t timeoutUs);
+int AMediaCodec_flush(AMediaCodec *);
+char *AMediaCodec_getInputBuffer(AMediaCodec *, size_t idx, size_t *out_size);
+int AMediaCodec_queueInputBuffer(AMediaCodec *, size_t idx, int offset, size_t size, uint64_t time, uint32_t flags);
+int AMediaCodec_dequeueOutputBuffer(AMediaCodec *, AMediaCodecBufferInfo *info, int64_t timeoutUs);
+char *AMediaCodec_getOutputBuffer(AMediaCodec *, size_t idx, size_t *out_size);
+int AMediaFormat_getInt32(AMediaFormat *, const char *name, int32_t *out);
+int AMediaCodec_releaseOutputBuffer(AMediaCodec*, size_t idx, int render);
+int AMediaFormat_delete(AMediaFormat *);
+AMediaFormat *AMediaCodec_getOutputFormat(AMediaCodec *);
+int AMediaCodec_delete(AMediaCodec *);
+int ANativeWindow_release(window);
+
+#define AMEDIA_OK	0
+#define AMEDIACODEC_INFO_OUTPUT_FORMAT_CHANGED	1
+#define AMEDIACODEC_INFO_OUTPUT_BUFFERS_CHANGED	2
+#define AMEDIACODEC_INFO_TRY_AGAIN_LATER	3
+#define AMEDIACODEC_BUFFER_FLAG_END_OF_STREAM	1
+
+const char* AMEDIAFORMAT_KEY_AAC_PROFILE = "aac-profile";
+const char* AMEDIAFORMAT_KEY_BIT_RATE = "bitrate";
+const char* AMEDIAFORMAT_KEY_CHANNEL_COUNT = "channel-count";
+const char* AMEDIAFORMAT_KEY_CHANNEL_MASK = "channel-mask";
+const char* AMEDIAFORMAT_KEY_COLOR_FORMAT = "color-format";
+const char* AMEDIAFORMAT_KEY_DURATION = "durationUs";
+const char* AMEDIAFORMAT_KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";
+const char* AMEDIAFORMAT_KEY_FRAME_RATE = "frame-rate";
+const char* AMEDIAFORMAT_KEY_HEIGHT = "height";
+const char* AMEDIAFORMAT_KEY_IS_ADTS = "is-adts";
+const char* AMEDIAFORMAT_KEY_IS_AUTOSELECT = "is-autoselect";
+const char* AMEDIAFORMAT_KEY_IS_DEFAULT = "is-default";
+const char* AMEDIAFORMAT_KEY_IS_FORCED_SUBTITLE = "is-forced-subtitle";
+const char* AMEDIAFORMAT_KEY_I_FRAME_INTERVAL = "i-frame-interval";
+const char* AMEDIAFORMAT_KEY_LANGUAGE = "language";
+const char* AMEDIAFORMAT_KEY_MAX_HEIGHT = "max-height";
+const char* AMEDIAFORMAT_KEY_MAX_INPUT_SIZE = "max-input-size";
+const char* AMEDIAFORMAT_KEY_MAX_WIDTH = "max-width";
+const char* AMEDIAFORMAT_KEY_MIME = "mime";
+const char* AMEDIAFORMAT_KEY_PUSH_BLANK_BUFFERS_ON_STOP = "push-blank-buffers-on-shutdown";
+const char* AMEDIAFORMAT_KEY_REPEAT_PREVIOUS_FRAME_AFTER = "repeat-previous-frame-after";
+const char* AMEDIAFORMAT_KEY_SAMPLE_RATE = "sample-rate";
+const char* AMEDIAFORMAT_KEY_WIDTH = "width";
+const char* AMEDIAFORMAT_KEY_STRIDE = "stride";
+
+#else
+
+#include <media/NdkMediaCodec.h>
+#include <media/NdkMediaExtractor.h>
+#include <media/NdkMediaFormat.h>
+#include <jni.h>
+
+#endif
+
+#include "../../src/compositor/gl_inc.h"
+
+typedef struct {
+	jobject oSurfaceTex;
+	int texture_id;
+} GF_MCDecSurfaceTexture;
+	
+GF_Err mcdec_create_surface(GLuint tex_id, ANativeWindow ** window, Bool * surface_rendering, GF_MCDecSurfaceTexture * surfaceTex);
+GF_Err mcdec_delete_surface(GF_MCDecSurfaceTexture surfaceTex);
+char * mcdec_find_decoder(const char * mime, u32 width, u32 height,  Bool * is_adaptive);
+u32 mcdec_exit_callback(void * param);
+
+GF_Err mcdec_update_surface(GF_MCDecSurfaceTexture surfaceTex);
+GF_Err mcdec_get_transform_matrix(struct __matrix * mx, GF_MCDecSurfaceTexture surfaceTex);
+
+#endif //_MEDIACODEC_DEC_H_
+

gpac-1.0.0.tar.gz/src/filters/dec_mediacodec_jni.c Added

@@ -0,0 +1,408 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / codec pack module
+ *
+ *  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/tools.h>
+#include <gpac/constants.h>
+
+// for native window JNI
+#include <android/native_window_jni.h>
+#include <android/asset_manager.h>
+#include <android/asset_manager_jni.h>
+
+#include <jni.h>
+
+#include "dec_mediacodec.h"
+#define RANDOM_JAVA_APP_CLASS "com/gpac/Osmo4/GPACInstance"
+#define ALL_CODECS 1
+
+static jclass cSurfaceTexture = NULL;
+static jclass cSurface = NULL;
+static jclass cMediaCodecList = NULL;
+static jclass cMediaFormat = NULL;
+static jmethodID mUpdateTexImage;
+static jmethodID mSurfaceTexConstructor;
+static jmethodID mSurfaceConstructor;
+static jmethodID mSurfaceRelease;
+static jmethodID mGetTransformMatrix;
+static jmethodID mFindClassMethod;
+static jmethodID mMediaCodecListConstructor;
+static jmethodID mFindDecoderForFormat;
+static jmethodID mCreateVideoFormat;
+static jmethodID mSetFeatureEnabled;
+static jobject oClassLoader = NULL;
+static JavaVM* javaVM = 0;
+
+static void HandleJNIError(JNIEnv *env)
+{
+	(*env)->ExceptionDescribe(env);
+	(*env)->ExceptionClear(env);
+}
+static jclass FindAppClass(JNIEnv* env, const char* name)
+{
+
+	return (jclass)((*env)->CallObjectMethod(env, oClassLoader, mFindClassMethod, (*env)->NewStringUTF(env, name)));
+}
+
+static GF_Err CacheAppClassLoader(JNIEnv* env, const char* name)
+{
+	GF_Err ret = GF_BAD_PARAM;
+	jclass randomClass = (*env)->FindClass(env, name);
+	if (!randomClass) goto cache_calassloader_failed;
+	jclass classClass = (*env)->GetObjectClass(env, randomClass);
+	if (!classClass) goto cache_calassloader_failed;
+    	jclass classLoaderClass = (*env)->FindClass(env, "java/lang/ClassLoader");
+	if (!classLoaderClass) goto cache_calassloader_failed;
+    	jmethodID getClassLoaderMethod = (*env)->GetMethodID(env, classClass, "getClassLoader", "()Ljava/lang/ClassLoader;");
+	if (!getClassLoaderMethod) goto cache_calassloader_failed;
+	oClassLoader = (jobject) (*env)->NewGlobalRef(env,(*env)->CallObjectMethod(env,randomClass, getClassLoaderMethod));
+	if(!oClassLoader) goto cache_calassloader_failed;
+    	mFindClassMethod = (*env)->GetMethodID(env, classLoaderClass, "findClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+	if(!mFindClassMethod) goto cache_calassloader_failed;
+	ret = GF_OK;
+
+cache_calassloader_failed:
+	if(randomClass)
+		 (*env)->DeleteLocalRef(env, randomClass);
+	 if(classClass)
+		 (*env)->DeleteLocalRef(env, classClass);
+	 if(classLoaderClass)
+		 (*env)->DeleteLocalRef(env, classLoaderClass);
+	return ret;
+}
+
+jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+	JNIEnv* env = NULL;
+	javaVM = vm;
+	
+	if ((*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2) != JNI_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("GetEnv failed"));
+		return GF_BAD_PARAM;
+	}
+	return JNI_VERSION_1_2;
+}
+
+JNIEnv* GetEnv()
+{
+	JNIEnv* env = 0;
+	if (javaVM) (*javaVM)->GetEnv(javaVM, (void**)&env, JNI_VERSION_1_2);
+	return env;
+}
+
+JavaVM* GetJavaVM()
+{
+	return javaVM;
+}
+
+u32 mcdec_exit_callback(void * param) {
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[MCDec] Detach decoder thread\n"));
+	(*GetJavaVM())->DetachCurrentThread(GetJavaVM());
+	return GF_OK;
+}
+
+GF_Err mcdec_create_surface (GLuint tex_id, ANativeWindow ** window, Bool * surface_rendering, GF_MCDecSurfaceTexture * surfaceTex)
+{
+	JNIEnv* env = NULL;
+	jobject otmp= NULL;
+	jclass ctmp = NULL;
+	jint res = 0;
+	jobject oSurface = NULL;
+	GF_Err ret = GF_BAD_PARAM;
+	
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
+	if (!env) goto create_surface_failed;
+	
+	// cache classes
+	if (!cSurfaceTexture) {
+		ctmp = (*env)->FindClass(env, "android/graphics/SurfaceTexture");
+		cSurfaceTexture = (*env)->NewGlobalRef(env, ctmp);
+		if(!cSurfaceTexture) goto create_surface_failed;
+	}
+	if (!cSurface) {
+		ctmp = (*env)->FindClass(env, "android/view/Surface");
+		cSurface = (*env)->NewGlobalRef(env, ctmp);
+		if (!cSurface) goto create_surface_failed;
+	}
+	
+	// cache methods
+	if(!mSurfaceTexConstructor) {
+		mSurfaceTexConstructor = (*env)->GetMethodID(env, cSurfaceTexture, "<init>", "(I)V");
+		if(!mSurfaceTexConstructor) goto create_surface_failed;
+	}
+	if(!mSurfaceConstructor) {
+		mSurfaceConstructor = (*env)->GetMethodID(env, cSurface, "<init>", "(Landroid/graphics/SurfaceTexture;)V");
+		if(!mSurfaceConstructor) goto create_surface_failed;
+	}
+	if(!mSurfaceRelease) {
+		mSurfaceRelease = (*env)->GetMethodID(env, cSurface, "release", "()V");
+		if(!mSurfaceRelease) goto create_surface_failed;
+	}
+	if(!mUpdateTexImage) {
+		mUpdateTexImage = (*env)->GetMethodID(env, cSurfaceTexture, "updateTexImage", "()V");
+		if(!mUpdateTexImage) goto create_surface_failed;
+	}
+	if(!mGetTransformMatrix) {
+		mGetTransformMatrix = (*env)->GetMethodID(env, cSurfaceTexture, "getTransformMatrix", "([F)V");
+		if(!mGetTransformMatrix) goto create_surface_failed;
+	}
+	
+	surfaceTex->texture_id = tex_id;
+	// create objects
+	otmp = (*env)->NewObject(env, cSurfaceTexture, mSurfaceTexConstructor, surfaceTex->texture_id);
+	surfaceTex->oSurfaceTex = (jobject) (*env)->NewGlobalRef(env,otmp);
+	if(!surfaceTex->oSurfaceTex) goto create_surface_failed;
+	
+	oSurface = (*env)->NewObject(env, cSurface, mSurfaceConstructor, surfaceTex->oSurfaceTex);
+	if(!oSurface) goto create_surface_failed;
+	
+	*window = ANativeWindow_fromSurface(env, oSurface);
+	*surface_rendering = (*window) ? GF_TRUE : GF_FALSE;
+	(*env)->CallVoidMethod(env, oSurface, mSurfaceRelease);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+	}
+	ret = GF_OK;
+	
+create_surface_failed:
+	if(otmp)
+		 (*env)->DeleteLocalRef(env, otmp);
+	 if(ctmp)
+		 (*env)->DeleteLocalRef(env, ctmp);
+	 if(oSurface)
+		 (*env)->DeleteLocalRef(env, oSurface);
+	 
+	 return ret;
+}
+
+static char * mcdec_get_decoder_name(JNIEnv * env, jobject mediaCodecList, jmethodID findId, jobject mediaFomat)
+{
+	jint res = 0;
+	jstring jdecoder_name;
+	char * decoder_name = NULL;
+
+	jdecoder_name = (*env)->CallObjectMethod(env, mediaCodecList, findId, mediaFomat);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_decoder_exit;
+	}
+	if(jdecoder_name) {
+		const char *decoder_name_tmp;
+		decoder_name_tmp = (*env)->GetStringUTFChars(env, jdecoder_name, 0);
+		decoder_name = gf_strdup(decoder_name_tmp);
+		(*env)->ReleaseStringUTFChars(env, jdecoder_name, decoder_name_tmp);
+	}
+
+get_decoder_exit:
+	if(jdecoder_name)
+		(*env)->DeleteLocalRef(env, jdecoder_name);
+
+	return decoder_name;
+}
+
+char * mcdec_find_decoder(const char * mime, u32 width, u32 height,  Bool * is_adaptive)
+{
+	JNIEnv* env = NULL;
+	jobject oMediaCodecList = NULL, oMediaFormat = NULL;
+	jclass ctmp = NULL;
+	jint res = 0;
+	jstring jmime, jfeature;
+	char *decoder_name = NULL, *decoder_name_tmp;
+
+
+	if(!mime || !is_adaptive) goto find_decoder_exit;
+
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
+	if (!env) goto find_decoder_exit;
+
+	// cache classes
+	if (!cMediaCodecList) {
+		ctmp = (*env)->FindClass(env, "android/media/MediaCodecList");
+		cMediaCodecList = (*env)->NewGlobalRef(env, ctmp);
+		if(!cMediaCodecList) goto find_decoder_exit;
+	}
+	if (!cMediaFormat) {
+		ctmp = (*env)->FindClass(env, "android/media/MediaFormat");
+		cMediaFormat = (*env)->NewGlobalRef(env, ctmp);
+		if(!cMediaFormat) goto find_decoder_exit;
+	}
+
+	//methods
+	if(!mMediaCodecListConstructor) {
+		mMediaCodecListConstructor = (*env)->GetMethodID(env, cMediaCodecList, "<init>", "(I)V");
+		if(!mMediaCodecListConstructor) goto find_decoder_exit;
+	}
+	if(!mFindDecoderForFormat) {
+		mFindDecoderForFormat = (*env)->GetMethodID(env, cMediaCodecList, "findDecoderForFormat", "(Landroid/media/MediaFormat;)Ljava/lang/String;");
+		if(!mFindDecoderForFormat) goto find_decoder_exit;
+	}
+	if(!mCreateVideoFormat) {
+		mCreateVideoFormat = (*env)->GetStaticMethodID(env, cMediaFormat, "createVideoFormat", "(Ljava/lang/String;II)Landroid/media/MediaFormat;");
+		if(!mCreateVideoFormat) goto find_decoder_exit;
+	}
+	if(!mSetFeatureEnabled ) {
+		mSetFeatureEnabled = (*env)->GetMethodID(env, cMediaFormat, "setFeatureEnabled", "(Ljava/lang/String;Z)V");
+		if(!mSetFeatureEnabled) goto find_decoder_exit;
+	}
+	oMediaCodecList = (*env)->NewObject(env, cMediaCodecList, mMediaCodecListConstructor, ALL_CODECS);
+	if(!oMediaCodecList) goto find_decoder_exit;
+
+	jmime = (*env)->NewStringUTF(env, mime);
+	oMediaFormat = (*env)->CallStaticObjectMethod(env, cMediaFormat, mCreateVideoFormat, jmime, width, height);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto find_decoder_exit;
+	}
+	decoder_name_tmp = mcdec_get_decoder_name(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
+	if(!decoder_name_tmp) goto find_decoder_exit;
+
+	jfeature = (*env)->NewStringUTF(env, "adaptive-playback");
+	(*env)->CallVoidMethod(env, oMediaFormat, mSetFeatureEnabled, jfeature, JNI_TRUE);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto find_decoder_exit;
+	}
+	decoder_name = mcdec_get_decoder_name(env, oMediaCodecList, mFindDecoderForFormat, oMediaFormat);
+	if(decoder_name){
+		*is_adaptive = GF_TRUE;
+		gf_free(decoder_name_tmp);
+		decoder_name_tmp = NULL;
+	} else {
+		*is_adaptive = GF_FALSE;
+		decoder_name = decoder_name_tmp;
+	}
+
+find_decoder_exit:
+	if(ctmp)
+		(*env)->DeleteLocalRef(env, ctmp);
+	if(oMediaCodecList)
+		(*env)->DeleteLocalRef(env, oMediaCodecList);
+	if(oMediaFormat)
+		(*env)->DeleteLocalRef(env, oMediaFormat);
+	if(jmime)
+		(*env)->DeleteLocalRef(env, jmime);
+	if(jfeature)
+		(*env)->DeleteLocalRef(env, jfeature);
+
+	return decoder_name;
+
+}
+
+GF_Err mcdec_update_surface(GF_MCDecSurfaceTexture surfaceTex)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
+	if (!env) return GF_BAD_PARAM;
+	
+	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mUpdateTexImage);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+GF_Err mcdec_get_transform_matrix(GF_Matrix * mx, GF_MCDecSurfaceTexture surfaceTex)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+	int i =0;
+	jfloatArray texMx;
+	jsize len = 0;
+	jfloat *body;
+	GF_Err ret = GF_BAD_PARAM;
+	
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	}
+	if (!env) goto get_matrix_failed;
+	
+	texMx = (*env)->NewFloatArray(env, 16);
+	if (texMx == NULL) goto get_matrix_failed;
+	
+	(*env)->CallVoidMethod(env, surfaceTex.oSurfaceTex, mGetTransformMatrix,texMx);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
+	}
+	len = (*env)->GetArrayLength(env, texMx);
+	body = (*env)->GetFloatArrayElements(env, texMx, 0);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
+	}
+	for (i=0; i<len; i++) {
+		mx->m[i] = FLT2FIX(body[i]);
+	}
+	
+	(*env)->ReleaseFloatArrayElements(env, texMx, body, 0);
+	if ((*env)->ExceptionCheck(env)) {
+		HandleJNIError(env);
+		goto get_matrix_failed;
+	}
+	ret = GF_OK;
+	
+get_matrix_failed:
+	if(texMx)
+		(*env)->DeleteLocalRef(env, texMx);
+	return ret;
+}
+
+GF_Err mcdec_delete_surface(GF_MCDecSurfaceTexture  surfaceTex)
+{
+	JNIEnv* env = NULL;
+	jint res = 0;
+	
+	res = (*GetJavaVM())->GetEnv(GetJavaVM(), (void**)&env, JNI_VERSION_1_2);
+	if ( res == JNI_EDETACHED ) {
+		(*GetJavaVM())->AttachCurrentThread(GetJavaVM(), &env, NULL);
+	} 
+	if (!env) return GF_BAD_PARAM;
+	
+	(*env)->DeleteGlobalRef(env, cSurface);
+	cSurface = NULL;
+	(*env)->DeleteGlobalRef(env, cSurfaceTexture);
+	cSurfaceTexture = NULL;
+	(*env)->DeleteGlobalRef(env, cMediaCodecList);
+	cMediaCodecList = NULL;
+	(*env)->DeleteGlobalRef(env, cMediaFormat);
+	cMediaFormat = NULL;
+	(*env)->DeleteGlobalRef(env, surfaceTex.oSurfaceTex);
+	surfaceTex.oSurfaceTex = NULL;
+	
+	return GF_OK;
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_nvdec.c Added

@@ -0,0 +1,1508 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NVidia Hardware decoder 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/thread.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/filters.h>
+
+#if (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)) 
+
+#include "dec_nvdec_sdk.h"
+
+//#define EMUL_NV_DLL
+
+#ifndef GPAC_DISABLE_3D
+
+
+#ifdef LOAD_GL_1_5
+GLDECL_EXTERN(glGenBuffers);
+GLDECL_EXTERN(glBindBuffer);
+GLDECL_EXTERN(glBufferData);
+#endif
+
+#endif
+
+typedef struct _nv_dec_inst NVDecInstance;
+
+typedef enum
+{
+	NVDEC_COPY = 0,
+	NVDEC_SINGLE,
+	NVDEC_GL
+} NVDecFrameMode ;
+
+typedef enum
+{
+	NVDEC_CUVID = 0,
+	NVDEC_CUDA,
+	NVDEC_DXVA
+} NVDecVideoMode;
+
+typedef struct _nv_dec_ctx
+{
+	u32 unload;
+	NVDecFrameMode fmode;
+	NVDecVideoMode vmode;
+	u32 num_surfaces;
+
+	GF_FilterPid *ipid, *opid;
+	u32 codec_id;
+	Bool use_gl_texture;
+	u32 width, height, bpp_luma, bpp_chroma;
+	cudaVideoCodec codec_type;
+	cudaVideoChromaFormat chroma_fmt;
+
+	u32 out_size, stride, pix_fmt, stride_uv, nb_planes, uv_height;
+	u32 reload_decoder_state;
+	Bool skip_next_frame;
+	CUresult decode_error, dec_create_error;
+	Bool frame_size_changed;
+	Bool needs_resetup;
+	unsigned long prefer_dec_mode;
+
+	NVDecInstance *dec_inst;
+
+	GF_List *frames;
+	GF_List *frames_res;
+	GF_List *src_packets;
+
+	struct __nv_frame *pending_frame;
+
+
+	u8 *xps_buf;
+	u32 xps_buf_size;
+	u32 nal_size_length;
+	Bool inject_xps;
+	u8 *nal_buffer;
+	u32 nal_buffer_alloc;
+
+	u8 *single_frame_data;
+	u32 single_frame_data_alloc;
+
+#ifndef GPAC_DISABLE_3D
+	Bool gl_provider_requested;
+	GLint y_tx_id, uv_tx_id;
+	GLint y_pbo_id, uv_pbo_id;
+#endif
+} NVDecCtx;
+
+
+struct _nv_dec_inst
+{
+	u32 width, height, bpp_luma, bpp_chroma, stride;
+	cudaVideoCodec codec_type;
+	cudaVideoChromaFormat chroma_fmt;
+	u32 id;
+	u32 th_id;
+
+	//allocated video parser and decoder
+	CUvideoparser cu_parser;
+	CUvideodecoder cu_decoder;
+
+	//current associated context, 0 is none
+	NVDecCtx *ctx;
+};
+
+
+typedef struct __nv_frame
+{
+	CUVIDPARSERDISPINFO frame_info;
+	NVDecCtx *ctx;
+	GF_FilterFrameInterface gframe;
+	Bool y_mapped, uv_mapped;
+} NVDecFrame;
+
+static GF_List *global_unactive_decoders=NULL;
+static u32 global_nb_loaded_nvdec = 0;
+static u32 global_nb_loaded_decoders = 0;
+static GF_Mutex *global_inst_mutex = NULL;
+static CUcontext cuda_ctx = NULL;
+#ifndef EMUL_NV_DLL
+static Bool cuda_ctx_gl = GF_FALSE;
+static CUdevice  cuda_dev = -1;
+#endif
+
+//#define ENABLE_10BIT_OUTPUT
+
+static GF_Err nvdec_init_decoder(NVDecCtx *ctx)
+{
+	CUresult res;
+	CUVIDDECODECREATEINFO cuvid_info;
+
+	assert(ctx->dec_inst);
+
+	memset(&cuvid_info, 0, sizeof(CUVIDDECODECREATEINFO));
+	cuvid_info.CodecType = ctx->codec_type;
+	cuvid_info.ulWidth = ctx->width;
+	cuvid_info.ulHeight = ctx->height;
+	cuvid_info.ulNumDecodeSurfaces = ctx->num_surfaces;
+	cuvid_info.ChromaFormat = ctx->chroma_fmt;
+	cuvid_info.OutputFormat = cudaVideoSurfaceFormat_NV12;
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_luma + ctx->bpp_chroma > 16)
+		cuvid_info.OutputFormat = cudaVideoSurfaceFormat_P016;
+#endif
+    cuvid_info.DeinterlaceMode = cudaVideoDeinterlaceMode_Adaptive;
+	cuvid_info.bitDepthMinus8 = ctx->bpp_luma - 8;
+	cuvid_info.ulTargetWidth = ctx->width;
+	cuvid_info.ulTargetHeight = ctx->height;
+    cuvid_info.display_area.left = 0;
+    cuvid_info.display_area.right = ctx->width;
+    cuvid_info.display_area.top = 0;
+	cuvid_info.display_area.bottom = ctx->height;
+
+    cuvid_info.ulNumOutputSurfaces = 1;
+	cuvid_info.ulCreationFlags = ctx->prefer_dec_mode;
+
+    // create the decoder
+	res = cuvidCreateDecoder(&ctx->dec_inst->cu_decoder, &cuvid_info);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create cuvid decoder %s\n", cudaGetErrorEnum(res) ) );
+		ctx->dec_create_error = res;
+		return GF_IO_ERR;
+	}
+	global_nb_loaded_decoders++;
+	assert(global_nb_loaded_decoders);
+	ctx->dec_inst->id = global_nb_loaded_decoders;
+	ctx->dec_inst->th_id = gf_th_id();
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] decoder instance %d created (%dx%d) - %d total decoders loaded\n", ctx->dec_inst->id, ctx->width, ctx->height, global_nb_loaded_decoders) );
+	return GF_OK;
+}
+
+Bool load_inactive_dec(NVDecCtx *ctx)
+{
+	u32 i, count;
+	//look for unactive decoder with same settings
+	if (global_unactive_decoders) {
+
+		gf_mx_p(global_inst_mutex);
+		count = gf_list_count(global_unactive_decoders);
+		for (i=0; i<count; i++) {
+			NVDecInstance *inst = gf_list_get(global_unactive_decoders, i);
+			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
+				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
+				) {
+
+					gf_list_rem(global_unactive_decoders, i);
+					ctx->dec_inst = inst;
+					inst->ctx = ctx;
+					gf_mx_v(global_inst_mutex);
+					return GF_TRUE;
+			}
+		}
+		if (ctx->dec_inst && !ctx->dec_inst->cu_decoder) {
+			ctx->dec_inst->ctx = ctx;
+			gf_mx_v(global_inst_mutex);
+			return GF_FALSE;
+		}
+		if (ctx->dec_inst) {
+			NVDecInstance *inst = ctx->dec_inst;
+			if ((inst->width==ctx->width) && (inst->height==ctx->height) && (inst->bpp_luma == ctx->bpp_luma )
+				&& (inst->bpp_chroma == ctx->bpp_chroma ) && (inst->codec_type == ctx->codec_type) && (inst->chroma_fmt == ctx->chroma_fmt )
+				) {
+				ctx->dec_inst = inst;
+				inst->ctx = ctx;
+				gf_mx_v(global_inst_mutex);
+				return GF_TRUE;
+			}
+		} else {
+			ctx->dec_inst = gf_list_pop_back(global_unactive_decoders);
+		}
+		gf_mx_v(global_inst_mutex);
+	}
+	if (!ctx->dec_inst) {
+		GF_SAFEALLOC(ctx->dec_inst, NVDecInstance);
+		if (!ctx->dec_inst)
+			return GF_FALSE;
+	}
+	ctx->dec_inst->ctx = ctx;
+	return GF_FALSE;
+}
+
+static void nvdec_destroy_decoder(NVDecInstance *inst)
+{
+	if (inst->cu_decoder) {
+		cuvidDestroyDecoder(inst->cu_decoder);
+		inst->cu_decoder = NULL;
+		global_nb_loaded_decoders--;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] decoder instance %d destruction - %d decoders still loaded\n", inst->id, global_nb_loaded_decoders ) );
+	}
+}
+
+static void update_pix_fmt(NVDecCtx *ctx, Bool use_10bits)
+{
+	switch (ctx->chroma_fmt) {
+	case cudaVideoChromaFormat_420:
+		ctx->pix_fmt = use_10bits ? GF_PIXEL_NV12_10 : GF_PIXEL_NV12;
+		break;
+	case cudaVideoChromaFormat_422:
+		ctx->pix_fmt = use_10bits  ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
+		break;
+	case cudaVideoChromaFormat_444:
+		ctx->pix_fmt = use_10bits  ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
+		break;
+	default:
+		ctx->pix_fmt = 0;
+		return;
+	}
+	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);
+}
+
+static int CUDAAPI HandleVideoSequence(void *pUserData, CUVIDEOFORMAT *pFormat)
+{
+	Bool use_10bits=GF_FALSE;
+	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;
+
+	if (pFormat->display_area.right && (pFormat->display_area.right<(s32)w)) w = pFormat->display_area.right;
+	if (pFormat->display_area.bottom && (pFormat->display_area.bottom<(s32)h)) h = pFormat->display_area.bottom;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] Decoder instance %d Video sequence change detected - new setup %u x %u, %u bpp\n", inst->id, pFormat->coded_width, pFormat->coded_height, pFormat->bit_depth_luma_minus8 + 8) );
+	//no change in config
+	if ((ctx->width == w)
+		&& (ctx->height == h)
+		&& (ctx->bpp_luma == 8 + pFormat->bit_depth_luma_minus8)
+		&& (ctx->bpp_chroma == 8 + pFormat->bit_depth_chroma_minus8)
+		&& (ctx->codec_type == pFormat->codec)
+		&& (ctx->chroma_fmt == pFormat->chroma_format)
+	) {
+		if (ctx->dec_inst && ctx->dec_inst->cu_decoder)
+			return 1;
+		skip_output_resize = GF_TRUE;
+	}
+
+	//commented out since this falls back to soft decoding !
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_luma + ctx->bpp_chroma > 16)  use_10bits = GF_TRUE;
+#endif
+
+	ctx->width = w;
+	ctx->height = h;
+	ctx->bpp_luma = 8 + pFormat->bit_depth_luma_minus8;
+	ctx->bpp_chroma = 8 + pFormat->bit_depth_chroma_minus8;
+	ctx->codec_type = pFormat->codec;
+	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
+	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;
+		//initial config, need to trigger output resize
+		if (!ctx->out_size) ctx->reload_decoder_state = 1;
+
+		update_pix_fmt(ctx, use_10bits);
+		return GF_OK;
+	}
+	if (!ctx->dec_inst) return GF_OUT_OF_MEM;
+	//if we have an existing decoder but with a different config, let's reload
+	nvdec_destroy_decoder(ctx->dec_inst);
+
+	ctx->dec_inst->width = ctx->width;
+	ctx->dec_inst->height = ctx->height;
+	ctx->dec_inst->bpp_luma = ctx->bpp_luma;
+	ctx->dec_inst->bpp_chroma = ctx->bpp_chroma;
+	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;
+
+	update_pix_fmt(ctx, use_10bits);
+
+	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_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));
+
+
+	assert(ctx->out_size);
+	assert(ctx->stride);
+	ctx->dec_inst->stride = ctx->stride;
+
+	if (! ctx->dec_inst->cu_decoder) {
+		nvdec_init_decoder(ctx);
+		if (!skip_output_resize) {
+			ctx->reload_decoder_state = 1;
+		}
+	} else {
+		ctx->reload_decoder_state = 2;
+	}
+	return 1;
+}
+
+static int CUDAAPI HandlePictureDecode(void *pUserData, CUVIDPICPARAMS *pPicParams)
+{
+	NVDecInstance *inst = (NVDecInstance *)pUserData;
+	inst->ctx->decode_error = cuvidDecodePicture(inst->cu_decoder, pPicParams);
+
+	if (inst->ctx->decode_error != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] decoder instance %d failed to decode picture %s\n", inst->id, cudaGetErrorEnum(inst->ctx->decode_error) ) );
+		return GF_IO_ERR;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] decoded picture %u OK\n", pPicParams->CurrPicIdx ) );
+
+	return 1;
+}
+
+static int CUDAAPI HandlePictureDisplay(void *pUserData, CUVIDPARSERDISPINFO *pPicParams)
+{
+	u32 i, count;
+	NVDecFrame *f;
+	NVDecInstance *inst = (NVDecInstance *)pUserData;
+	NVDecCtx *ctx = (NVDecCtx *)inst->ctx;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] picture %u CTS "LLU" ready for display, queuing it\n", pPicParams->picture_index, pPicParams->timestamp) );
+
+	f = gf_list_pop_back(ctx->frames_res);
+	if (!f) {
+		GF_SAFEALLOC(f, NVDecFrame);
+		if (!f) return 0;
+	}
+	f->frame_info = *pPicParams;
+	f->frame_info.timestamp = pPicParams->timestamp;
+	f->ctx = ctx;
+	count = gf_list_count(ctx->frames);
+	for (i=0; i<count; i++) {
+		NVDecFrame *af = gf_list_get(ctx->frames, i);
+		if (af->frame_info.timestamp > f->frame_info.timestamp) {
+			gf_list_insert(ctx->frames, f, i);
+			return 1;
+		}
+	}
+	gf_list_add(ctx->frames, f);
+	return 1;
+}
+
+static void nvdec_store_paramlist(GF_BitStream *bs, GF_List *psl)
+{
+	u32 i, count;
+	count = gf_list_count(psl);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *slc = gf_list_get(psl, i);
+		gf_bs_write_u32(bs, 1);
+		gf_bs_write_data(bs, slc->data, slc->size);
+	}
+}
+
+static void nvdec_store_xps(NVDecCtx *ctx, GF_AVCConfig *avc_cfg, GF_HEVCConfig *hevc_cfg)
+{
+	u32 i, count;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (avc_cfg) {
+		ctx->nal_size_length = avc_cfg->nal_unit_size;
+		nvdec_store_paramlist(bs, avc_cfg->sequenceParameterSets);
+		nvdec_store_paramlist(bs, avc_cfg->sequenceParameterSetExtensions);
+		nvdec_store_paramlist(bs, avc_cfg->pictureParameterSets);
+		gf_odf_avc_cfg_del(avc_cfg);
+	} else if (hevc_cfg) {
+		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);
+			nvdec_store_paramlist(bs, pa->nalus);
+		}
+		gf_odf_hevc_cfg_del(hevc_cfg);
+	}
+	if (ctx->xps_buf) gf_free(ctx->xps_buf);
+	ctx->xps_buf = NULL;
+	ctx->xps_buf_size = 0;
+	gf_bs_get_content(bs, &ctx->xps_buf, &ctx->xps_buf_size);
+	gf_bs_del(bs);
+	ctx->inject_xps = GF_TRUE;
+}
+
+
+static GF_Err nvdec_configure_stream(GF_Filter *filter, NVDecCtx *ctx)
+{
+#ifndef EMUL_NV_DLL
+	CUresult res;
+#endif
+	GF_HEVCConfig *hevc_cfg = NULL;
+	GF_AVCConfig *avc_cfg = NULL;
+	const GF_PropertyValue *dcd = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+    CUVIDPARSERPARAMS oVideoParserParameters;
+
+	switch (ctx->codec_id) {
+	case GF_CODECID_MPEG1:
+		ctx->codec_type = cudaVideoCodec_MPEG1;
+		break;
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_SPATIAL:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_422:
+		ctx->codec_type = cudaVideoCodec_MPEG2;
+		break;
+	case GF_CODECID_MPEG4_PART2:
+		ctx->codec_type = cudaVideoCodec_MPEG4;
+		break;
+	case GF_CODECID_AVC:
+		if (!dcd) return GF_EOS;
+		ctx->codec_type = cudaVideoCodec_H264;
+		avc_cfg = gf_odf_avc_cfg_read(dcd->value.data.ptr, dcd->value.data.size);
+		if (!avc_cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		break;
+	case GF_CODECID_HEVC:
+		if (!dcd) return GF_EOS;
+		ctx->codec_type = cudaVideoCodec_HEVC;
+		hevc_cfg = gf_odf_hevc_cfg_read(dcd->value.data.ptr, dcd->value.data.size, GF_FALSE);
+		if (!hevc_cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		break;
+	}
+
+	//create a video parser and a video decoder
+    memset(&oVideoParserParameters, 0, sizeof(CUVIDPARSERPARAMS));
+	ctx->needs_resetup = GF_FALSE;
+	ctx->nal_size_length = 0;
+
+	//this destroys avc_cfg / hevc_cfg
+	if (avc_cfg || hevc_cfg)
+		nvdec_store_xps(ctx, avc_cfg, hevc_cfg);
+
+	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;
+	}
+	if (!ctx->dec_inst) {
+		return GF_OUT_OF_MEM;
+	}
+	ctx->decode_error = CUDA_SUCCESS;
+
+	oVideoParserParameters.CodecType = ctx->codec_type;
+    oVideoParserParameters.ulMaxNumDecodeSurfaces = ctx->num_surfaces;
+    oVideoParserParameters.ulMaxDisplayDelay = 4;
+	oVideoParserParameters.ulClockRate = 1000;
+    oVideoParserParameters.pExtVideoInfo = NULL;
+    oVideoParserParameters.pfnSequenceCallback = HandleVideoSequence;    // Called before decoding frames and/or whenever there is a format change
+    oVideoParserParameters.pfnDecodePicture = HandlePictureDecode;    // Called when a picture is ready to be decoded (decode order)
+    oVideoParserParameters.pfnDisplayPicture = HandlePictureDisplay;   // Called whenever a picture is ready to be displayed (display order)
+	oVideoParserParameters.pUserData = ctx->dec_inst;
+
+#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) ) );
+	}
+	res = cuvidCreateVideoParser(&ctx->dec_inst->cu_parser, &oVideoParserParameters);
+	cuCtxPopCurrent(NULL);
+
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to create CUVID parserCTX %s\n", cudaGetErrorEnum(res) ) );
+		return GF_PROFILE_NOT_SUPPORTED;
+	}
+#endif
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] video parser init OK\n") );
+
+	switch (ctx->codec_type) {
+	case cudaVideoCodec_MPEG1:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGL MPEG-1" : "NVidia HW MPEG-1");
+		break;
+	case cudaVideoCodec_MPEG2:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGLMPEG-2" : "NVidia HW MPEG-2");
+		break;
+	case cudaVideoCodec_MPEG4:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGL MPEG-4 part2" : "NVidia HW MPEG-4 part2");
+		break;
+	case cudaVideoCodec_H264:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGL AVC|H264" : "NVidia HW AVC|H264");
+		break;
+	case cudaVideoCodec_HEVC:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGL HEVC" : "NVidia HW HEVC");
+		break;
+	case cudaVideoCodec_VC1:
+		gf_filter_set_name(filter, ctx->use_gl_texture ? "NVidia HWGL VC1" : "NVidia HW VC1");
+		break;
+	default:
+		break;
+	}
+	return GF_OK;
+}
+
+static GF_Err nvdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+#ifndef EMUL_NV_DLL
+	CUresult res;
+#endif
+	NVDecCtx *ctx = (NVDecCtx *) gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		ctx->opid = NULL;
+		ctx->ipid = NULL;
+
+		if (ctx->unload == 2) {
+			global_nb_loaded_nvdec--;
+			if (ctx->dec_inst) {
+				assert(global_unactive_decoders);
+				gf_mx_p(global_inst_mutex);
+				ctx->dec_inst->ctx = NULL;
+				gf_list_add(global_unactive_decoders, ctx->dec_inst);
+				ctx->dec_inst = NULL;
+				gf_mx_v(global_inst_mutex);
+			}
+		}
+	}
+
+
+	if (ctx->ipid && (ctx->ipid != pid)) return GF_REQUIRES_NEW_INSTANCE;
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+	ctx->ipid = pid;
+	ctx->use_gl_texture = (ctx->fmode == NVDEC_GL) ? GF_TRUE : GF_FALSE;
+
+#ifndef GPAC_DISABLE_3D
+	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) ));
+			ctx->use_gl_texture = GF_FALSE;
+		}
+		ctx->gl_provider_requested = GF_TRUE;
+	}
+#endif
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NOT_SUPPORTED;
+	ctx->codec_id = prop->value.uint;
+
+	switch (ctx->codec_id) {
+	case GF_CODECID_MPEG1:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_SPATIAL:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_422:
+	case GF_CODECID_MPEG4_PART2:
+	case GF_CODECID_AVC:
+	case GF_CODECID_HEVC:
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	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);
+
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
+	switch (ctx->codec_id) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_HEVC:
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		//not ready yet
+		if (!prop) return GF_OK;
+		break;
+	}
+
+#ifdef GPAC_DISABLE_3D
+	ctx->use_gl_texture = GF_FALSE;
+#endif
+
+	if (! cuda_ctx) {
+#ifndef EMUL_NV_DLL
+	    int major, minor;
+	    char deviceName[256];
+		res = cuDeviceGet(&cuda_dev, 0);
+		if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda device %s\n", cudaGetErrorEnum(res) ) );
+			return GF_IO_ERR;
+		}
+
+		cuDeviceComputeCapability(&major, &minor, cuda_dev);
+		cuDeviceGetName(deviceName, 256, cuda_dev);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] GPU Device %s (idx 0) has SM %d.%d compute capability\n", deviceName, major, minor));
+
+		if (ctx->use_gl_texture) {
+#ifndef GPAC_DISABLE_3D
+			res = cuGLCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+
+#ifdef LOAD_GL_1_5
+			GET_GLFUN(glGenBuffers);
+			GET_GLFUN(glBindBuffer);
+			GET_GLFUN(glBufferData);
+#endif
+			cuda_ctx_gl = GF_TRUE;
+
+#endif
+		} else {
+			res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+			cuda_ctx_gl = GF_FALSE;
+		}
+		if (res != CUDA_SUCCESS) {
+			if (ctx->use_gl_texture) {
+				cuda_ctx_gl = GF_FALSE;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[NVDec] Couldn't initialize cuda OpenGL context (error %s), retrying without OpenGL support\n", cudaGetErrorEnum(res) ) );
+				res = cuCtxCreate(&cuda_ctx, CU_CTX_BLOCKING_SYNC, cuda_dev);
+				if (res != CUDA_SUCCESS) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
+				} else {
+					ctx->use_gl_texture = GF_FALSE;
+				}
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to init cuda context %s\n", cudaGetErrorEnum(res) ) );
+			}
+
+			if (res != CUDA_SUCCESS) {
+				return GF_IO_ERR;
+			}
+		}
+#endif
+
+	}
+
+	if (ctx->vmode == NVDEC_DXVA)
+		ctx->prefer_dec_mode = cudaVideoCreate_PreferDXVA;
+	else if (ctx->vmode == NVDEC_CUDA)
+		ctx->prefer_dec_mode = cudaVideoCreate_PreferCUDA;
+	else
+		ctx->prefer_dec_mode = cudaVideoCreate_PreferCUVID;
+
+	if (ctx->unload == 2) {
+		global_nb_loaded_nvdec++;
+		if (!global_inst_mutex ) global_inst_mutex  = gf_mx_new("NVDecGlobal");
+		gf_mx_p(global_inst_mutex);
+		if (!global_unactive_decoders) global_unactive_decoders = gf_list_new();
+		gf_mx_v(global_inst_mutex);
+	}
+
+
+	ctx->needs_resetup = GF_TRUE;
+
+	return GF_OK;
+}
+
+static Bool nvdec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	NVDecCtx *ctx = (NVDecCtx *)gf_filter_get_udta(filter);
+	if (evt->base.type == GF_FEVT_PLAY) {
+		while (gf_list_count(ctx->frames)) {
+			NVDecFrame *f = gf_list_pop_back(ctx->frames);
+			gf_list_add(ctx->frames_res, f);
+		}
+	}
+	return GF_FALSE;
+}
+
+
+#if 0
+	case GF_CODEC_ABORT:
+		while (gf_list_count(ctx->frames)) {
+			NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
+			memset(f, 0, sizeof(NVDecFrame));
+			gf_list_add(ctx->frames_res, f);
+		}
+		if (ctx->unload == 2) {
+			if (ctx->dec_inst) {
+				assert(global_unactive_decoders);
+				gf_mx_p(global_inst_mutex);
+				if (ctx->decode_error) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] deactivating decoder %dx%d and destroying instance\n", ctx->width, ctx->height ) );
+					nvdec_destroy_decoder(ctx->dec_inst);
+				} else {
+					GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] deactivating decoder %dx%d\n", ctx->width, ctx->height ) );
+				}
+				ctx->dec_inst->ctx = NULL;
+				gf_list_add(global_unactive_decoders, ctx->dec_inst);
+				ctx->dec_inst = NULL;
+				gf_mx_v(global_inst_mutex);
+			}
+			ctx->needs_resetup = GF_TRUE;
+			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->dec_create_error = CUDA_SUCCESS;
+		}
+		return GF_OK;
+	}
+#endif
+
+static GF_Err nvdec_send_hw_frame(NVDecCtx *ctx);
+
+static void nvdec_reset_pcks(NVDecCtx *ctx)
+{
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+}
+
+static void nvdec_merge_pck_props(NVDecCtx *ctx, NVDecFrame *f,  GF_FilterPacket *dst_pck)
+{
+	u32 i, count;
+	GF_FilterPacket *src_pck = NULL;
+	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) == f->frame_info.timestamp) {
+			gf_filter_pck_merge_properties(src_pck, dst_pck);
+			gf_list_rem(ctx->src_packets, i);
+			gf_filter_pck_unref(src_pck);
+			return;
+		}
+	}
+	//not found !
+	gf_filter_pck_set_cts(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);
+	}
+}
+
+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;
+	CUresult res;
+	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;
+	}
+
+	memset(&cu_pkt, 0, sizeof(CUVIDSOURCEDATAPACKET));
+	cu_pkt.flags = CUVID_PKT_TIMESTAMP;
+	pck_size = 0;
+	data = NULL;
+	if (!ipck) {
+		if (!gf_filter_pid_is_eos(ctx->ipid))
+			return GF_OK;
+
+		cu_pkt.flags |= CUVID_PKT_ENDOFSTREAM;
+		ctx->skip_next_frame = GF_FALSE;
+	} else {
+		data = gf_filter_pck_get_data(ipck, &pck_size);
+	}
+
+	if (ctx->dec_create_error) {
+		if (ipck) gf_filter_pid_drop_packet(ctx->ipid);
+		else if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_IO_ERR;
+	}
+
+	if (data && ctx->nal_size_length) {
+		GF_BitStream *bs = gf_bs_new(ctx->nal_buffer, ctx->nal_buffer_alloc, GF_BITSTREAM_WRITE_DYN);
+		if (!bs) return GF_OUT_OF_MEM;
+
+		if (gf_filter_pck_get_sap(ipck)) ctx->inject_xps = GF_TRUE;
+
+		if (ctx->inject_xps) {
+			ctx->inject_xps = GF_FALSE;
+			gf_bs_write_data(bs, ctx->xps_buf, ctx->xps_buf_size);
+		}
+
+		while (pck_size) {
+			u32 i, nal_size = 0;
+			for (i = 0; i<ctx->nal_size_length; i++) {
+				nal_size = (nal_size << 8) + ((u8)data[i]);
+			}
+			data += ctx->nal_size_length;
+
+			if (pck_size < nal_size + ctx->nal_size_length) break;
+
+			gf_bs_write_u32(bs, 1);
+			gf_bs_write_data(bs, data, nal_size);
+			data += nal_size;
+			pck_size -= nal_size + ctx->nal_size_length;
+		}
+
+		gf_bs_get_content_no_truncate(bs, &ctx->nal_buffer, &pck_size, &ctx->nal_buffer_alloc);
+		gf_bs_del(bs);
+		data = ctx->nal_buffer;
+	}
+
+	cu_pkt.payload_size = pck_size;
+	cu_pkt.payload = data;
+	if (ipck) cu_pkt.timestamp = gf_filter_pck_get_cts(ipck);
+
+#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) ) );
+	}
+	if (ctx->skip_next_frame) {
+		ctx->skip_next_frame = GF_FALSE;
+	} 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) ) );
+		}
+	}
+#endif //EMUL_NV_DLL
+
+	//queue reference to source packet props
+	if (ipck) {
+		gf_filter_pck_ref_props(&ipck);
+		gf_list_add(ctx->src_packets, ipck);
+	}
+
+	if (ctx->reload_decoder_state) {
+		if (ctx->reload_decoder_state==2) {
+			nvdec_destroy_decoder(ctx->dec_inst);
+		} else {
+			ctx->skip_next_frame = GF_TRUE;
+		}
+
+		ctx->reload_decoder_state = 0;
+		if (!ctx->out_size || !ctx->pix_fmt) {
+			cuCtxPopCurrent(NULL);
+			return GF_NOT_SUPPORTED;
+		}
+
+		//need to setup decoder
+		if (! ctx->dec_inst->cu_decoder) {
+			nvdec_init_decoder(ctx);
+		}
+		cuCtxPopCurrent(NULL);
+		return GF_OK;
+	}
+	//drop packet
+	if (ipck)
+		gf_filter_pid_drop_packet(ctx->ipid);
+
+	f = gf_list_pop_front(ctx->frames);
+	if (!f) {
+#ifndef EMUL_NV_DLL
+		cuCtxPopCurrent(NULL);
+#endif
+		if (!ipck && gf_filter_pid_is_eos(ctx->ipid)) {
+			nvdec_reset_pcks(ctx);
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		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);
+	}
+
+	assert(ctx->out_size);
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
+
+	memset(&params, 0, sizeof(params));
+	params.progressive_frame = f->frame_info.progressive_frame;
+	params.top_field_first = f->frame_info.top_field_first;
+
+	nvdec_merge_pck_props(ctx, f, dst_pck);
+	e = GF_OK;
+	if (gf_filter_pck_get_seek_flag(dst_pck)) {
+		gf_filter_pck_discard(dst_pck);
+	} else {
+		res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &map_mem, &pitch, &params);
+		if (res == CUDA_SUCCESS) {
+			CUDA_MEMCPY2D mcpi;
+			memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
+			mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+			mcpi.srcDevice = map_mem;
+			mcpi.srcPitch = pitch;
+
+			mcpi.dstMemoryType = CU_MEMORYTYPE_HOST;
+			mcpi.dstHost = output;
+			mcpi.dstPitch = ctx->stride;
+			mcpi.WidthInBytes = MIN(pitch, ctx->stride);
+			mcpi.Height = ctx->height;
+
+			res = cuMemcpy2D(&mcpi);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res)));
+				e = GF_IO_ERR;
+			} else {
+
+				mcpi.srcDevice = map_mem + ctx->height * pitch;
+				mcpi.dstHost = output + ctx->stride * ctx->height;
+				mcpi.dstPitch = ctx->stride_uv;
+				mcpi.WidthInBytes = MIN(pitch, ctx->stride);
+				mcpi.Height = ctx->uv_height;
+
+				res = cuMemcpy2D(&mcpi);
+				if (res != CUDA_SUCCESS) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy UV video plane from GPU to host mem %s\n", cudaGetErrorEnum(res)));
+					e = GF_IO_ERR;
+				}
+			}
+			cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, map_mem);
+
+			gf_filter_pck_send(dst_pck);
+
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map video frame data %s\n", cudaGetErrorEnum(res)));
+			e = GF_IO_ERR;
+			gf_filter_pck_discard(dst_pck);
+		}
+	}
+	cuCtxPopCurrent(NULL);
+
+	memset(f, 0, sizeof(NVDecFrame));
+	gf_list_add(ctx->frames_res, f);
+
+	return e;
+}
+
+void nvframe_release(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FilterFrameInterface *frame = gf_filter_pck_get_frame_interface(pck);
+	NVDecFrame *f = (NVDecFrame*) frame->user_data;
+	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
+
+	memset(f, 0, sizeof(NVDecFrame));
+	gf_list_add(ctx->frames_res, f);
+}
+
+#ifndef GPAC_DISABLE_3D
+
+/*Define codec matrix*/
+typedef struct __matrix GF_NVCodecMatrix;
+
+GF_Err nvframe_get_gl_texture(GF_FilterFrameInterface *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_NVCodecMatrix * texcoordmatrix)
+{
+	CUDA_MEMCPY2D mcpi;
+	CUVIDPROCPARAMS params;
+	CUresult res;
+	GF_Err e = GF_OK;
+	CUdeviceptr tx_data, vid_data;
+	size_t tx_pitch;
+	u32 vid_pitch;
+	u32 pbo_id, tx_id, gl_fmt, gl_btype = GL_UNSIGNED_BYTE;
+	NVDecFrame *f = (NVDecFrame *)frame->user_data;
+	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
+
+	if (plane_idx>1) return GF_BAD_PARAM;
+
+	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) ) );
+	}
+
+	if (! *gl_tex_id && ! plane_idx && ctx->y_tx_id ) {
+		cuGLUnregisterBufferObject(ctx->y_pbo_id);
+		ctx->y_pbo_id = 0;
+		ctx->y_tx_id = 0;
+	}
+	if (! *gl_tex_id && plane_idx && ctx->uv_tx_id ) {
+		cuGLUnregisterBufferObject(ctx->uv_pbo_id);
+		ctx->uv_pbo_id = 0;
+		ctx->uv_tx_id = 0;
+	}
+
+#ifdef ENABLE_10BIT_OUTPUT
+	if ((ctx->bpp_luma>8) || (ctx->bpp_chroma>8)) {
+		gl_btype = GL_UNSIGNED_SHORT;
+	}
+#endif
+	if (!plane_idx) {
+		if (!ctx->y_pbo_id) {
+			glGenBuffers(1, &ctx->y_pbo_id);
+			glGenTextures(1, &ctx->y_tx_id);
+
+	        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->y_pbo_id);
+			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height, NULL, GL_STREAM_DRAW_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+			cuGLRegisterBufferObject(ctx->y_pbo_id);
+
+			glBindTexture(GL_TEXTURE_2D, ctx->y_tx_id);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, ctx->width, ctx->height, 0, GL_LUMINANCE, gl_btype, NULL);
+			glBindTexture(GL_TEXTURE_2D, 0);
+
+			f->y_mapped = GF_FALSE;
+		}
+		*gl_tex_format = GL_TEXTURE_2D;
+		*gl_tex_id = tx_id = ctx->y_tx_id;
+		if (f->y_mapped) {
+			cuCtxPopCurrent(NULL);
+			return GF_OK;
+		}
+		f->y_mapped = GF_TRUE;
+		pbo_id = ctx->y_pbo_id;
+		gl_fmt = GL_LUMINANCE;
+	} else {
+		if (!ctx->uv_pbo_id) {
+			glGenBuffers(1, &ctx->uv_pbo_id);
+			glGenTextures(1, &ctx->uv_tx_id);
+
+	        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->uv_pbo_id);
+			glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, ctx->stride * ctx->height / 2, NULL, GL_STREAM_DRAW_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+			cuGLRegisterBufferObject(ctx->uv_pbo_id);
+
+		    glBindTexture(GL_TEXTURE_2D, ctx->uv_tx_id);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, ctx->width/2, ctx->height/2, 0, GL_LUMINANCE_ALPHA, gl_btype, NULL);
+			glBindTexture(GL_TEXTURE_2D, 0);
+			f->uv_mapped = GF_FALSE;
+		}
+		*gl_tex_format = GL_TEXTURE_2D;
+		*gl_tex_id = tx_id = ctx->uv_tx_id;
+		if (f->uv_mapped) {
+			cuCtxPopCurrent(NULL);
+			return GF_OK;
+		}
+		f->uv_mapped = GF_TRUE;
+		pbo_id = ctx->uv_pbo_id;
+		gl_fmt = GL_LUMINANCE_ALPHA;
+	}
+
+	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;
+	}
+	assert(tx_pitch != 0);
+
+	memset(&params, 0, sizeof(params));
+	params.progressive_frame = f->frame_info.progressive_frame;
+	//params.second_field = 0;
+	params.top_field_first = f->frame_info.top_field_first;
+	res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &vid_data, &vid_pitch, &params);
+
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map decoded picture data %s\n", cudaGetErrorEnum(res) ) );
+		return GF_IO_ERR;
+	}
+	assert(vid_pitch != 0);
+
+	memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
+	mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+	if (plane_idx) {
+		mcpi.srcDevice = vid_data + ctx->height * vid_pitch;
+		tx_pitch *= 2; //2 bytes per pixel
+	} else {
+		mcpi.srcDevice = vid_data;
+	}
+	mcpi.srcPitch = vid_pitch;
+
+	mcpi.dstMemoryType = CU_MEMORYTYPE_DEVICE;
+	mcpi.dstDevice = tx_data;
+	mcpi.dstPitch = tx_pitch / ctx->height;
+
+	mcpi.WidthInBytes = MIN(mcpi.dstPitch, vid_pitch);
+	mcpi.Height = ctx->height;
+	if (plane_idx) mcpi.Height /= 2;
+
+	res = cuMemcpy2D(&mcpi);
+	if (res != CUDA_SUCCESS) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res) ) );
+		e = GF_IO_ERR;
+	}
+
+	cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, vid_data);
+	cuGLUnmapBufferObject(pbo_id);
+
+
+	cuCtxPopCurrent(NULL);
+
+	/*bind PBO to texture and call glTexSubImage2D only after PBO transfer is queued, otherwise we'll have a one frame delay*/
+	glBindTexture(GL_TEXTURE_2D, tx_id);
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_id);
+
+#ifdef ENABLE_10BIT_OUTPUT
+	if (ctx->bpp_chroma+ctx->bpp_luma>16) {
+		Float a, b;
+#error "FIX NVDEC GL color mapping in 10 bit"
+		a = 65535.0f / (65472.0f - 63.0f);
+		b = -63.0f * a / 65535.0f;
+
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+		//glPixelStorei(GL_UNPACK_SWAP_BYTES, 1);
+		//glPixelStorei(GL_UNPACK_LSB_FIRST, 1);
+		//we use 10 bits but GL will normalise using 16 bits, so we need to multiply the nomralized result by 2^6
+		//glPixelTransferf(GL_RED_BIAS, 0.00096317f);
+		//glPixelTransferf(GL_RED_SCALE, 0.000015288f);
+
+		glPixelTransferf(GL_RED_SCALE, a);
+		glPixelTransferf(GL_RED_BIAS, b);
+
+		if (plane_idx) {
+			glPixelTransferf(GL_ALPHA_SCALE, a);
+			glPixelTransferf(GL_ALPHA_BIAS, b);
+		}
+	}
+#endif
+	if (!plane_idx) {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width, ctx->height, gl_fmt , gl_btype, NULL);
+	} else {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ctx->width/2, ctx->height/2, gl_fmt , gl_btype, NULL);
+	}
+
+	glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	return e;
+}
+
+#endif
+
+GF_Err nvframe_get_frame(GF_FilterFrameInterface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	unsigned int pitch = 0;
+	GF_Err e = GF_OK;
+	NVDecFrame *f = (NVDecFrame *)frame->user_data;
+	NVDecCtx *ctx = (NVDecCtx *)f->ctx;
+
+	if (plane_idx>=ctx->nb_planes) return GF_BAD_PARAM;
+
+	e = GF_OK;
+	if (!f->y_mapped) {
+		CUVIDPROCPARAMS params;
+		CUdeviceptr map_mem = 0;
+		CUresult res;
+
+		if (ctx->out_size > ctx->single_frame_data_alloc) {
+			ctx->single_frame_data_alloc = ctx->out_size;
+			ctx->single_frame_data = gf_realloc(ctx->single_frame_data, ctx->out_size);
+		}
+		f->y_mapped = GF_TRUE;
+
+		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)));
+			return GF_IO_ERR;
+		}
+
+		memset(&params, 0, sizeof(params));
+		params.progressive_frame = f->frame_info.progressive_frame;
+		params.top_field_first = f->frame_info.top_field_first;
+
+		res = cuvidMapVideoFrame(ctx->dec_inst->cu_decoder, f->frame_info.picture_index, &map_mem, &pitch, &params);
+		if (res == CUDA_SUCCESS) {
+			CUDA_MEMCPY2D mcpi;
+			memset(&mcpi, 0, sizeof(CUDA_MEMCPY2D));
+			mcpi.srcMemoryType = CU_MEMORYTYPE_DEVICE;
+			mcpi.srcDevice = map_mem;
+			mcpi.srcPitch = pitch;
+
+			mcpi.dstMemoryType = CU_MEMORYTYPE_HOST;
+			mcpi.dstHost = ctx->single_frame_data;
+			mcpi.dstPitch = ctx->stride;
+			mcpi.WidthInBytes = MIN(pitch, ctx->stride);
+			mcpi.Height = ctx->height;
+
+			res = cuMemcpy2D(&mcpi);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy Y video plane from GPU to host mem %s\n", cudaGetErrorEnum(res)));
+				e = GF_IO_ERR;
+			}
+			else {
+
+				mcpi.srcDevice = map_mem + ctx->height * pitch;
+				mcpi.dstHost = ctx->single_frame_data + ctx->stride * ctx->height;
+				mcpi.dstPitch = ctx->stride_uv;
+				mcpi.Height = ctx->uv_height;
+
+				res = cuMemcpy2D(&mcpi);
+				if (res != CUDA_SUCCESS) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to copy UV video plane from GPU to host mem %s\n", cudaGetErrorEnum(res)));
+					e = GF_IO_ERR;
+				}
+			}
+			cuvidUnmapVideoFrame(ctx->dec_inst->cu_decoder, map_mem);
+		}
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to map video frame %s\n", cudaGetErrorEnum(res)));
+			e = GF_IO_ERR;
+		}
+		cuCtxPopCurrent(NULL);
+	}
+	if (e) return e;
+
+	switch (plane_idx) {
+	case 0:
+		*outPlane = ctx->single_frame_data;
+		*outStride = ctx->stride;
+		break;
+	case 1:
+		*outPlane = ctx->single_frame_data + ctx->stride * ctx->height;
+		*outStride = ctx->stride_uv;
+		break;
+	case 2:
+		*outPlane = ctx->single_frame_data + ctx->stride * ctx->height + ctx->stride_uv * ctx->uv_height;
+		*outStride = ctx->stride_uv;
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+
+GF_Err nvdec_send_hw_frame(NVDecCtx *ctx)
+{
+	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;
+#ifndef GPAC_DISABLE_3D
+	f->gframe.get_gl_texture = nvframe_get_gl_texture;
+#endif
+
+	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));
+		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_PIXFMT, &PROP_UINT(ctx->pix_fmt));
+	}
+
+
+	if (!gf_list_count(ctx->frames) && ctx->needs_resetup)
+		f->gframe.flags = GF_FRAME_IFCE_BLOCKING;
+
+	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &f->gframe, nvframe_release);
+
+	nvdec_merge_pck_props(ctx, f, dst_pck);
+	if (gf_filter_pck_get_seek_flag(dst_pck)) {
+		gf_filter_pck_discard(dst_pck);
+		memset(f, 0, sizeof(NVDecFrame));
+		gf_list_add(ctx->frames_res, f);
+	} else {
+		gf_filter_pck_send(dst_pck);
+	}
+
+	return GF_OK;
+}
+
+
+
+
+static u32 cuvid_load_state = 0;
+static u32 nb_cuvid_inst=0;
+static void init_cuda_sdk()
+{
+	if (!cuvid_load_state) {
+#ifdef EMUL_NV_DLL
+	cuvid_load_state = 2;
+	nb_cuvid_inst++;
+#else
+		CUresult res;
+		int device_count;
+	    res = cuInit(0, __CUDA_API_VERSION);
+		nb_cuvid_inst++;
+		cuvid_load_state = 1;
+		if (res == CUDA_ERROR_SHARED_OBJECT_INIT_FAILED) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[NVDec] cuda lib not found on system\n") );
+		} else if (res != CUDA_SUCCESS) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[NVDec] failed to init cuda %s\n", cudaGetErrorEnum(res) ) );
+		} else {
+			res = cuDeviceGetCount(&device_count);
+			if (res != CUDA_SUCCESS) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] failed to query cuda/nvidia cards %s\n", cudaGetErrorEnum(res) ) );
+			} else {
+				if (! device_count) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[NVDec] no device found\n" ) );
+				} else {
+					cuvid_load_state = 2;
+				}
+			}
+		}
+#endif
+
+	} else {
+		nb_cuvid_inst++;
+	}
+}
+
+static GF_Err nvdec_initialize(GF_Filter *filter)
+{
+	NVDecCtx *ctx = gf_filter_get_udta(filter);
+
+	ctx->frames = gf_list_new();
+	ctx->frames_res = gf_list_new();
+	ctx->src_packets = gf_list_new();
+	return GF_OK;
+}
+
+static void nvdec_finalize(GF_Filter *filter)
+{
+	NVDecCtx *ctx = gf_filter_get_udta(filter);
+
+	nvdec_reset_pcks(ctx);
+	gf_list_del(ctx->src_packets);
+
+	if (!global_nb_loaded_nvdec && global_unactive_decoders) {
+		while (gf_list_count(global_unactive_decoders)) {
+			NVDecInstance *inst = gf_list_pop_back(global_unactive_decoders);
+			nvdec_destroy_decoder(inst);
+			if (inst->cu_parser) cuvidDestroyVideoParser(inst->cu_parser);
+			gf_free(inst);
+		}
+		gf_list_del(global_unactive_decoders);
+
+		gf_mx_del(global_inst_mutex);
+	}
+
+	if (ctx->dec_inst) {
+		nvdec_destroy_decoder(ctx->dec_inst);
+		if (ctx->dec_inst->cu_parser) cuvidDestroyVideoParser(ctx->dec_inst->cu_parser);
+		gf_free(ctx->dec_inst);
+	}
+
+
+	assert(nb_cuvid_inst);
+	nb_cuvid_inst--;
+	if (!nb_cuvid_inst) {
+		if (cuda_ctx) cuCtxDestroy(cuda_ctx);
+		cuda_ctx = NULL;
+		cuUninit();
+		cuvid_load_state = 0;
+	}
+	while (gf_list_count(ctx->frames)) {
+		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames);
+		gf_free(f);
+	}
+	gf_list_del(ctx->frames);
+	while (gf_list_count(ctx->frames_res)) {
+		NVDecFrame *f = (NVDecFrame *) gf_list_pop_back(ctx->frames_res);
+		gf_free(f);
+	}
+	gf_list_del(ctx->frames_res);
+
+	if (ctx->single_frame_data) gf_free(ctx->single_frame_data);
+	if (ctx->xps_buf) gf_free(ctx->xps_buf);
+	if (ctx->nal_buffer) gf_free(ctx->nal_buffer);
+}
+
+
+static const GF_FilterCapability NVDecCaps[] =
+{
+	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_MPEG4_PART2),
+	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),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_HIGH),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_TILE_BASE, GF_TRUE),
+	//CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_VC1),
+	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_RAW)
+};
+
+#define OFFS(_n)	#_n, offsetof(NVDecCtx, _n)
+
+static const GF_FilterArgs NVDecArgs[] =
+{
+	{ OFFS(num_surfaces), "number of hardware surfaces to allocate", GF_PROP_UINT, "20", NULL, GF_FS_ARG_HINT_ADVANCED },
+	{ OFFS(unload), "decoder unload mode\n"
+		"- no: keep inactive decoder alive\n"
+		"- destroy: destroy inactive decoder\n"
+		"- reuse: detach decoder from inactive PIDs and reattach to active ones", GF_PROP_UINT, "no", "no|destroy|reuse", GF_FS_ARG_HINT_EXPERT },
+	{ 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 },
+	{ 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"
+		"- gl: frame data is mapped to an OpenGL texture"
+	, GF_PROP_UINT, "gl", "copy|single|gl|", 0 },
+
+	{ 0 }
+};
+
+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.")
+	.private_size = sizeof(NVDecCtx),
+	SETCAPS(NVDecCaps),
+	.flags = GF_FS_REG_CONFIGURE_MAIN_THREAD,
+	.initialize = nvdec_initialize,
+	.finalize = nvdec_finalize,
+	.args = NVDecArgs,
+	.configure_pid = nvdec_configure_pid,
+	.process = nvdec_process,
+	.process_event = nvdec_process_event
+};
+
+
+const GF_FilterRegister *nvdec_register(GF_FilterSession *session)
+{
+	init_cuda_sdk();
+	//do not register if no SDK
+	if (cuvid_load_state != 2) {
+		// this is man / md generation, load filter
+		if (!gf_opts_get_bool("temp", "gendoc"))
+			return NULL;
+		NVDecRegister.version = "! Warning: CUVID SDK NOT AVAILABLE ON THIS SYSTEM !";
+	}
+
+	return &NVDecRegister;
+}
+
+#else
+
+const GF_FilterRegister *nvdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)
+
+

gpac-1.0.0.tar.gz/src/filters/dec_nvdec_sdk.c Added

@@ -0,0 +1,712 @@
+/*
+ * Copyright 1993-2015 NVIDIA Corporation.  All rights reserved.
+ *
+ * Please refer to the NVIDIA end user license agreement (EULA) associated
+ * with this source code for terms and conditions that govern your use of
+ * this software. Any use, reproduction, disclosure, or distribution of
+ * this software and related documentation outside the terms of the EULA
+ * is strictly prohibited.
+ *
+ */
+
+
+// With these flags defined, this source file will dynamically
+// load the corresponding functions.  Disabled by default.
+#define __CUDA_API_VERSION 4000
+
+#include <stdio.h>
+#include <string.h>
+
+#include <gpac/tools.h>
+
+
+#if (defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN))
+
+#include "dec_nvdec_sdk.h"
+
+tcuInit                               *_cuInit;
+tcuDriverGetVersion                   *cuDriverGetVersion;
+tcuDeviceGet                          *cuDeviceGet;
+tcuDeviceGetCount                     *cuDeviceGetCount;
+tcuDeviceGetName                      *cuDeviceGetName;
+tcuDeviceComputeCapability            *cuDeviceComputeCapability;
+tcuDeviceTotalMem                     *cuDeviceTotalMem;
+tcuDeviceGetProperties                *cuDeviceGetProperties;
+tcuDeviceGetAttribute                 *cuDeviceGetAttribute;
+tcuCtxCreate                          *cuCtxCreate;
+tcuCtxDestroy                         *cuCtxDestroy;
+tcuCtxAttach                          *cuCtxAttach;
+tcuCtxDetach                          *cuCtxDetach;
+tcuCtxPushCurrent                     *cuCtxPushCurrent;
+tcuCtxPopCurrent                      *cuCtxPopCurrent;
+tcuCtxGetCurrent                      *cuCtxGetCurrent;
+tcuCtxSetCurrent                      *cuCtxSetCurrent;
+tcuCtxGetDevice                       *cuCtxGetDevice;
+tcuCtxSynchronize                     *cuCtxSynchronize;
+tcuModuleLoad                         *cuModuleLoad;
+tcuModuleLoadData                     *cuModuleLoadData;
+tcuModuleLoadDataEx                   *cuModuleLoadDataEx;
+tcuModuleLoadFatBinary                *cuModuleLoadFatBinary;
+tcuModuleUnload                       *cuModuleUnload;
+tcuModuleGetFunction                  *cuModuleGetFunction;
+tcuModuleGetGlobal                    *cuModuleGetGlobal;
+tcuModuleGetTexRef                    *cuModuleGetTexRef;
+tcuModuleGetSurfRef                   *cuModuleGetSurfRef;
+tcuMemGetInfo                         *cuMemGetInfo;
+tcuMemAlloc                           *cuMemAlloc;
+tcuMemAllocPitch                      *cuMemAllocPitch;
+tcuMemFree                            *cuMemFree;
+tcuMemGetAddressRange                 *cuMemGetAddressRange;
+tcuMemAllocHost                       *cuMemAllocHost;
+tcuMemFreeHost                        *cuMemFreeHost;
+tcuMemHostAlloc                       *cuMemHostAlloc;
+tcuMemHostGetDevicePointer            *cuMemHostGetDevicePointer;
+tcuMemHostRegister                    *cuMemHostRegister;
+tcuMemHostUnregister                  *cuMemHostUnregister;
+tcuMemcpyHtoD                         *cuMemcpyHtoD;
+tcuMemcpyDtoH                         *cuMemcpyDtoH;
+tcuMemcpyDtoD                         *cuMemcpyDtoD;
+tcuMemcpyDtoA                         *cuMemcpyDtoA;
+tcuMemcpyAtoD                         *cuMemcpyAtoD;
+tcuMemcpyHtoA                         *cuMemcpyHtoA;
+tcuMemcpyAtoH                         *cuMemcpyAtoH;
+tcuMemcpyAtoA                         *cuMemcpyAtoA;
+tcuMemcpy2D                           *cuMemcpy2D;
+tcuMemcpy2DUnaligned                  *cuMemcpy2DUnaligned;
+tcuMemcpy3D                           *cuMemcpy3D;
+tcuMemcpyHtoDAsync                    *cuMemcpyHtoDAsync;
+tcuMemcpyDtoHAsync                    *cuMemcpyDtoHAsync;
+tcuMemcpyDtoDAsync                    *cuMemcpyDtoDAsync;
+tcuMemcpyHtoAAsync                    *cuMemcpyHtoAAsync;
+tcuMemcpyAtoHAsync                    *cuMemcpyAtoHAsync;
+tcuMemcpy2DAsync                      *cuMemcpy2DAsync;
+tcuMemcpy3DAsync                      *cuMemcpy3DAsync;
+tcuMemcpy                             *cuMemcpy;
+tcuMemcpyPeer                         *cuMemcpyPeer;
+tcuMemsetD8                           *cuMemsetD8;
+tcuMemsetD16                          *cuMemsetD16;
+tcuMemsetD32                          *cuMemsetD32;
+tcuMemsetD2D8                         *cuMemsetD2D8;
+tcuMemsetD2D16                        *cuMemsetD2D16;
+tcuMemsetD2D32                        *cuMemsetD2D32;
+tcuFuncSetBlockShape                  *cuFuncSetBlockShape;
+tcuFuncSetSharedSize                  *cuFuncSetSharedSize;
+tcuFuncGetAttribute                   *cuFuncGetAttribute;
+tcuFuncSetCacheConfig                 *cuFuncSetCacheConfig;
+tcuLaunchKernel                       *cuLaunchKernel;
+tcuArrayCreate                        *cuArrayCreate;
+tcuArrayGetDescriptor                 *cuArrayGetDescriptor;
+tcuArrayDestroy                       *cuArrayDestroy;
+tcuArray3DCreate                      *cuArray3DCreate;
+tcuArray3DGetDescriptor               *cuArray3DGetDescriptor;
+tcuTexRefCreate                       *cuTexRefCreate;
+tcuTexRefDestroy                      *cuTexRefDestroy;
+tcuTexRefSetArray                     *cuTexRefSetArray;
+tcuTexRefSetAddress                   *cuTexRefSetAddress;
+tcuTexRefSetAddress2D                 *cuTexRefSetAddress2D;
+tcuTexRefSetFormat                    *cuTexRefSetFormat;
+tcuTexRefSetAddressMode               *cuTexRefSetAddressMode;
+tcuTexRefSetFilterMode                *cuTexRefSetFilterMode;
+tcuTexRefSetFlags                     *cuTexRefSetFlags;
+tcuTexRefGetAddress                   *cuTexRefGetAddress;
+tcuTexRefGetArray                     *cuTexRefGetArray;
+tcuTexRefGetAddressMode               *cuTexRefGetAddressMode;
+tcuTexRefGetFilterMode                *cuTexRefGetFilterMode;
+tcuTexRefGetFormat                    *cuTexRefGetFormat;
+tcuTexRefGetFlags                     *cuTexRefGetFlags;
+tcuSurfRefSetArray                    *cuSurfRefSetArray;
+tcuSurfRefGetArray                    *cuSurfRefGetArray;
+tcuParamSetSize                       *cuParamSetSize;
+tcuParamSeti                          *cuParamSeti;
+tcuParamSetf                          *cuParamSetf;
+tcuParamSetv                          *cuParamSetv;
+tcuParamSetTexRef                     *cuParamSetTexRef;
+tcuLaunch                             *cuLaunch;
+tcuLaunchGrid                         *cuLaunchGrid;
+tcuLaunchGridAsync                    *cuLaunchGridAsync;
+tcuEventCreate                        *cuEventCreate;
+tcuEventRecord                        *cuEventRecord;
+tcuEventQuery                         *cuEventQuery;
+tcuEventSynchronize                   *cuEventSynchronize;
+tcuEventDestroy                       *cuEventDestroy;
+tcuEventElapsedTime                   *cuEventElapsedTime;
+tcuStreamCreate                       *cuStreamCreate;
+tcuStreamQuery                        *cuStreamQuery;
+tcuStreamSynchronize                  *cuStreamSynchronize;
+tcuStreamDestroy                      *cuStreamDestroy;
+tcuGraphicsUnregisterResource         *cuGraphicsUnregisterResource;
+tcuGraphicsSubResourceGetMappedArray  *cuGraphicsSubResourceGetMappedArray;
+tcuGraphicsResourceGetMappedPointer   *cuGraphicsResourceGetMappedPointer;
+tcuGraphicsResourceSetMapFlags        *cuGraphicsResourceSetMapFlags;
+tcuGraphicsMapResources               *cuGraphicsMapResources;
+tcuGraphicsUnmapResources             *cuGraphicsUnmapResources;
+tcuGetExportTable                     *cuGetExportTable;
+tcuCtxSetLimit                        *cuCtxSetLimit;
+tcuCtxGetLimit                        *cuCtxGetLimit;
+tcuMemHostGetFlags                    *cuMemHostGetFlags;
+
+    // GL/CUDA interop
+    #if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+    tcuWGLGetDevice                       *cuWGLGetDevice;
+    #endif
+
+    //#if __CUDA_API_VERSION >= 3020
+    tcuGLCtxCreate                        *cuGLCtxCreate;
+    tcuGLCtxCreate                        *cuGLCtxCreate_v2;
+    tcuGLMapBufferObject                  *cuGLMapBufferObject;
+    tcuGLMapBufferObject                  *cuGLMapBufferObject_v2;
+    tcuGLMapBufferObjectAsync             *cuGLMapBufferObjectAsync;
+    //#endif
+
+#if __CUDA_API_VERSION >= 6050
+    tcuGLGetDevices                       *cuGLGetDevices;
+#endif
+
+    tcuGLInit                             *cuGLInit; // deprecated in CUDA 3.0
+    tcuGraphicsGLRegisterBuffer           *cuGraphicsGLRegisterBuffer;
+    tcuGraphicsGLRegisterImage            *cuGraphicsGLRegisterImage;
+    tcuGLSetBufferObjectMapFlags          *cuGLSetBufferObjectMapFlags;
+    tcuGLRegisterBufferObject             *cuGLRegisterBufferObject;
+
+    tcuGLUnmapBufferObject                *cuGLUnmapBufferObject;
+    tcuGLUnmapBufferObjectAsync           *cuGLUnmapBufferObjectAsync;
+
+    tcuGLUnregisterBufferObject           *cuGLUnregisterBufferObject;
+    tcuGLGetDevices                       *cuGLGetDevices; // CUDA 6.5 only
+
+
+
+#if !defined(__APPLE__)
+tcuvidCreateVideoSource               *cuvidCreateVideoSource;
+tcuvidCreateVideoSourceW              *cuvidCreateVideoSourceW;
+tcuvidDestroyVideoSource              *cuvidDestroyVideoSource;
+tcuvidSetVideoSourceState             *cuvidSetVideoSourceState;
+tcuvidGetVideoSourceState             *cuvidGetVideoSourceState;
+tcuvidGetSourceVideoFormat            *cuvidGetSourceVideoFormat;
+tcuvidGetSourceAudioFormat            *cuvidGetSourceAudioFormat;
+#endif
+
+tcuvidCreateVideoParser               *cuvidCreateVideoParser;
+tcuvidParseVideoData                  *cuvidParseVideoData;
+tcuvidDestroyVideoParser              *cuvidDestroyVideoParser;
+
+tcuvidCreateDecoder                   *cuvidCreateDecoder;
+tcuvidDestroyDecoder                  *cuvidDestroyDecoder;
+tcuvidDecodePicture                   *cuvidDecodePicture;
+
+tcuvidMapVideoFrame                   *cuvidMapVideoFrame;
+tcuvidUnmapVideoFrame                 *cuvidUnmapVideoFrame;
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+tcuvidMapVideoFrame64                 *cuvidMapVideoFrame64;
+tcuvidUnmapVideoFrame64               *cuvidUnmapVideoFrame64;
+#endif
+
+//tcuvidGetVideoFrameSurface            *cuvidGetVideoFrameSurface;
+tcuvidCtxLockCreate                   *cuvidCtxLockCreate;
+tcuvidCtxLockDestroy                  *cuvidCtxLockDestroy;
+tcuvidCtxLock                         *cuvidCtxLock;
+tcuvidCtxUnlock                       *cuvidCtxUnlock;
+
+
+
+#define STRINGIFY(X) #X
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#include <Windows.h>
+
+#ifdef UNICODE
+static LPCWSTR __CudaLibName = L"nvcuda.dll";
+static LPCWSTR __CuvidLibName = L"nvcuvid.dll";
+#else
+static LPCSTR __CudaLibName = "nvcuda.dll";
+static LPCSTR __CuvidLibName = "nvcuvid.dll";
+#endif
+
+typedef HMODULE CUDADRIVER;
+typedef HMODULE CUVIDDRIVER;
+
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+{
+    *pInstance = LoadLibrary(__CudaLibName);
+    if (*pInstance == NULL) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CudaLibName));
+        return CUDA_ERROR_UNKNOWN;
+    }
+    return CUDA_SUCCESS;
+}
+
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+{
+    *pInstance = LoadLibrary(__CuvidLibName);
+    if (*pInstance == NULL) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] LoadLibrary \"%s\" failed!\n", __CuvidLibName));
+        return CUDA_ERROR_UNKNOWN;
+    }
+    return CUDA_SUCCESS;
+}
+
+#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",       \
+               #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",       \
+               STRINGIFY(name##_v2)));                       \
+        }
+
+#elif defined(__unix__) || defined(__APPLE__) || defined(__MACOSX)
+
+#include <dlfcn.h>
+
+#if defined(__APPLE__) || defined(__MACOSX)
+static char __CudaLibName[] = "/usr/local/cuda/lib/libcuda.dylib";
+#else
+static char __CudaLibName[] = "libcuda.so";
+#endif
+
+static char __CuvidLibName[] = "libnvcuvid.so";
+
+typedef void *CUVIDDRIVER;
+
+static CUresult LOAD_LIBRARY_CUDA(CUDADRIVER *pInstance)
+{
+    *pInstance = dlopen(__CudaLibName, RTLD_NOW);
+    if (*pInstance == NULL) {
+        GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec] dlopen \"%s\" failed!\n", __CudaLibName));
+        return CUDA_ERROR_SHARED_OBJECT_INIT_FAILED;
+    }
+    return CUDA_SUCCESS;
+}
+
+static CUresult LOAD_LIBRARY_CUVID(CUVIDDRIVER *pInstance)
+{
+    *pInstance = dlopen(__CuvidLibName, RTLD_NOW);
+    if (*pInstance == NULL) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[NVDec]dlopen \"%s\" failed!\n", __CuvidLibName));
+        return CUDA_ERROR_UNKNOWN;
+    }
+    return CUDA_SUCCESS;
+}
+
+#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",       \
+               #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",       \
+               STRINGIFY(name##_v2)));                    \
+        }
+
+#else
+#error unsupported platform
+#endif
+
+#define CHECKED_CALL(call)              \
+    do {                                \
+        CUresult result = (call);       \
+        if (CUDA_SUCCESS != result) {   \
+            return result;              \
+        }                               \
+    } while(0)
+
+#define GET_PROC_REQUIRED(name) GET_PROC_EX(name,name,1)
+#define GET_PROC_OPTIONAL(name) GET_PROC_EX(name,name,0)
+#define GET_PROC(name)          GET_PROC_REQUIRED(name)
+#define GET_PROC_V2(name)       GET_PROC_EX_V2(name,name,1)
+
+CUresult CUDAAPI cuInitGL(unsigned int Flags, int cudaVersion, CUDADRIVER curr_lib)
+{
+
+    return CUDA_SUCCESS;
+}
+
+CUDADRIVER CudaDrvLib=0;
+CUVIDDRIVER CuvidDrvLib = 0;
+
+void CUDAAPI cuUninit()
+{
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+	if (CudaDrvLib) FreeLibrary((HMODULE)CudaDrvLib);
+	if (CuvidDrvLib) FreeLibrary((HMODULE)CuvidDrvLib);
+#else
+	if (CudaDrvLib) dlclose(CudaDrvLib);
+	if (CuvidDrvLib) dlclose(CuvidDrvLib);
+#endif
+	CudaDrvLib = 0;
+	CuvidDrvLib = 0;
+}
+
+CUresult CUDAAPI cuInit(unsigned int Flags, int cudaVersion)
+{
+    int driverVer = 1000;
+	CUDADRIVER curr_lib ;
+
+	if (CudaDrvLib) return CUDA_SUCCESS;
+
+	assert(CudaDrvLib == 0);
+
+	CHECKED_CALL(LOAD_LIBRARY_CUDA(&CudaDrvLib));
+	curr_lib = CudaDrvLib;
+
+	// cuInit is required; alias it to _cuInit
+    GET_PROC_EX(cuInit, _cuInit, 1);
+    CHECKED_CALL(_cuInit(Flags));
+
+    // available since 2.2. if not present, version 1.0 is assumed
+    GET_PROC_OPTIONAL(cuDriverGetVersion);
+
+    if (cuDriverGetVersion)
+    {
+        CHECKED_CALL(cuDriverGetVersion(&driverVer));
+    }
+
+    // fetch all function pointers
+    GET_PROC(cuDeviceGet);
+    GET_PROC(cuDeviceGetCount);
+    GET_PROC(cuDeviceGetName);
+    GET_PROC(cuDeviceComputeCapability);
+    GET_PROC(cuDeviceGetProperties);
+    GET_PROC(cuDeviceGetAttribute);
+    GET_PROC(cuCtxDestroy);
+    GET_PROC(cuCtxAttach);
+    GET_PROC(cuCtxDetach);
+    GET_PROC(cuCtxPushCurrent);
+    GET_PROC(cuCtxPopCurrent);
+    GET_PROC(cuCtxGetDevice);
+    GET_PROC(cuCtxSynchronize);
+    GET_PROC(cuModuleLoad);
+    GET_PROC(cuModuleLoadData);
+    GET_PROC(cuModuleUnload);
+    GET_PROC(cuModuleGetFunction);
+    GET_PROC(cuModuleGetTexRef);
+    GET_PROC(cuMemFreeHost);
+    GET_PROC(cuMemHostAlloc);
+    GET_PROC(cuFuncSetBlockShape);
+    GET_PROC(cuFuncSetSharedSize);
+    GET_PROC(cuFuncGetAttribute);
+    GET_PROC(cuArrayDestroy);
+    GET_PROC(cuTexRefCreate);
+    GET_PROC(cuTexRefDestroy);
+    GET_PROC(cuTexRefSetArray);
+    GET_PROC(cuTexRefSetFormat);
+    GET_PROC(cuTexRefSetAddressMode);
+    GET_PROC(cuTexRefSetFilterMode);
+    GET_PROC(cuTexRefSetFlags);
+    GET_PROC(cuTexRefGetArray);
+    GET_PROC(cuTexRefGetAddressMode);
+    GET_PROC(cuTexRefGetFilterMode);
+    GET_PROC(cuTexRefGetFormat);
+    GET_PROC(cuTexRefGetFlags);
+    GET_PROC(cuParamSetSize);
+    GET_PROC(cuParamSeti);
+    GET_PROC(cuParamSetf);
+    GET_PROC(cuParamSetv);
+    GET_PROC(cuParamSetTexRef);
+    GET_PROC(cuLaunch);
+    GET_PROC(cuLaunchGrid);
+    GET_PROC(cuLaunchGridAsync);
+    GET_PROC(cuEventCreate);
+    GET_PROC(cuEventRecord);
+    GET_PROC(cuEventQuery);
+    GET_PROC(cuEventSynchronize);
+    GET_PROC(cuEventDestroy);
+    GET_PROC(cuEventElapsedTime);
+    GET_PROC(cuStreamCreate);
+    GET_PROC(cuStreamQuery);
+    GET_PROC(cuStreamSynchronize);
+    GET_PROC(cuStreamDestroy);
+
+    // These could be _v2 interfaces
+    if (cudaVersion >= 4000)
+    {
+        GET_PROC_V2(cuCtxDestroy);
+        GET_PROC_V2(cuCtxPopCurrent);
+        GET_PROC_V2(cuCtxPushCurrent);
+        GET_PROC_V2(cuStreamDestroy);
+        GET_PROC_V2(cuEventDestroy);
+    }
+
+    if (cudaVersion >= 3020)
+    {
+        GET_PROC_V2(cuDeviceTotalMem);
+        GET_PROC_V2(cuCtxCreate);
+        GET_PROC_V2(cuModuleGetGlobal);
+        GET_PROC_V2(cuMemGetInfo);
+        GET_PROC_V2(cuMemAlloc);
+        GET_PROC_V2(cuMemAllocPitch);
+        GET_PROC_V2(cuMemFree);
+        GET_PROC_V2(cuMemGetAddressRange);
+        GET_PROC_V2(cuMemAllocHost);
+        GET_PROC_V2(cuMemHostGetDevicePointer);
+        GET_PROC_V2(cuMemcpyHtoD);
+        GET_PROC_V2(cuMemcpyDtoH);
+        GET_PROC_V2(cuMemcpyDtoD);
+        GET_PROC_V2(cuMemcpyDtoA);
+        GET_PROC_V2(cuMemcpyAtoD);
+        GET_PROC_V2(cuMemcpyHtoA);
+        GET_PROC_V2(cuMemcpyAtoH);
+        GET_PROC_V2(cuMemcpyAtoA);
+        GET_PROC_V2(cuMemcpy2D);
+        GET_PROC_V2(cuMemcpy2DUnaligned);
+        GET_PROC_V2(cuMemcpy3D);
+        GET_PROC_V2(cuMemcpyHtoDAsync);
+        GET_PROC_V2(cuMemcpyDtoHAsync);
+        GET_PROC_V2(cuMemcpyHtoAAsync);
+        GET_PROC_V2(cuMemcpyAtoHAsync);
+        GET_PROC_V2(cuMemcpy2DAsync);
+        GET_PROC_V2(cuMemcpy3DAsync);
+        GET_PROC_V2(cuMemsetD8);
+        GET_PROC_V2(cuMemsetD16);
+        GET_PROC_V2(cuMemsetD32);
+        GET_PROC_V2(cuMemsetD2D8);
+        GET_PROC_V2(cuMemsetD2D16);
+        GET_PROC_V2(cuMemsetD2D32);
+        GET_PROC_V2(cuArrayCreate);
+        GET_PROC_V2(cuArrayGetDescriptor);
+        GET_PROC_V2(cuArray3DCreate);
+        GET_PROC_V2(cuArray3DGetDescriptor);
+        GET_PROC_V2(cuTexRefSetAddress);
+        GET_PROC_V2(cuTexRefSetAddress2D);
+        GET_PROC_V2(cuTexRefGetAddress);
+    }
+    else
+    {
+        GET_PROC(cuDeviceTotalMem);
+        GET_PROC(cuCtxCreate);
+        GET_PROC(cuModuleGetGlobal);
+        GET_PROC(cuMemGetInfo);
+        GET_PROC(cuMemAlloc);
+        GET_PROC(cuMemAllocPitch);
+        GET_PROC(cuMemFree);
+        GET_PROC(cuMemGetAddressRange);
+        GET_PROC(cuMemAllocHost);
+        GET_PROC(cuMemHostGetDevicePointer);
+        GET_PROC(cuMemcpyHtoD);
+        GET_PROC(cuMemcpyDtoH);
+        GET_PROC(cuMemcpyDtoD);
+        GET_PROC(cuMemcpyDtoA);
+        GET_PROC(cuMemcpyAtoD);
+        GET_PROC(cuMemcpyHtoA);
+        GET_PROC(cuMemcpyAtoH);
+        GET_PROC(cuMemcpyAtoA);
+        GET_PROC(cuMemcpy2D);
+        GET_PROC(cuMemcpy2DUnaligned);
+        GET_PROC(cuMemcpy3D);
+        GET_PROC(cuMemcpyHtoDAsync);
+        GET_PROC(cuMemcpyDtoHAsync);
+        GET_PROC(cuMemcpyHtoAAsync);
+        GET_PROC(cuMemcpyAtoHAsync);
+        GET_PROC(cuMemcpy2DAsync);
+        GET_PROC(cuMemcpy3DAsync);
+        GET_PROC(cuMemsetD8);
+        GET_PROC(cuMemsetD16);
+        GET_PROC(cuMemsetD32);
+        GET_PROC(cuMemsetD2D8);
+        GET_PROC(cuMemsetD2D16);
+        GET_PROC(cuMemsetD2D32);
+        GET_PROC(cuArrayCreate);
+        GET_PROC(cuArrayGetDescriptor);
+        GET_PROC(cuArray3DCreate);
+        GET_PROC(cuArray3DGetDescriptor);
+        GET_PROC(cuTexRefSetAddress);
+        GET_PROC(cuTexRefSetAddress2D);
+        GET_PROC(cuTexRefGetAddress);
+    }
+
+    // The following functions are specific to CUDA versions
+    if (driverVer >= 2010)
+    {
+        GET_PROC(cuModuleLoadDataEx);
+        GET_PROC(cuModuleLoadFatBinary);
+    }
+
+    if (driverVer >= 2030)
+    {
+        GET_PROC(cuMemHostGetFlags);
+    }
+
+    if (driverVer >= 3000)
+    {
+        GET_PROC(cuMemcpyDtoDAsync);
+        GET_PROC(cuFuncSetCacheConfig);
+
+        GET_PROC(cuGraphicsUnregisterResource);
+        GET_PROC(cuGraphicsSubResourceGetMappedArray);
+
+#if (__CUDA_API_VERSION >= 3020)
+        if (cudaVersion >= 3020)
+        {
+            GET_PROC_V2(cuGraphicsResourceGetMappedPointer);
+        }
+        else
+        {
+            GET_PROC(cuGraphicsResourceGetMappedPointer);
+        }
+#endif
+        GET_PROC(cuGraphicsResourceSetMapFlags);
+        GET_PROC(cuGraphicsMapResources);
+        GET_PROC(cuGraphicsUnmapResources);
+        GET_PROC(cuGetExportTable);
+    }
+
+    if (driverVer >= 3010)
+    {
+        GET_PROC(cuModuleGetSurfRef);
+        GET_PROC(cuSurfRefSetArray);
+        GET_PROC(cuSurfRefGetArray);
+        GET_PROC(cuCtxSetLimit);
+        GET_PROC(cuCtxGetLimit);
+    }
+
+    if (driverVer >= 4000)
+    {
+        GET_PROC(cuCtxSetCurrent);
+        GET_PROC(cuCtxGetCurrent);
+        GET_PROC(cuMemHostRegister);
+        GET_PROC(cuMemHostUnregister);
+        GET_PROC(cuMemcpy);
+        GET_PROC(cuMemcpyPeer);
+        GET_PROC(cuLaunchKernel);
+    }
+
+	/*load openGL*/
+    if (cudaVersion >= 2010)
+    {
+        GET_PROC(cuGLCtxCreate);
+        GET_PROC(cuGraphicsGLRegisterBuffer);
+        GET_PROC(cuGraphicsGLRegisterImage);
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+        GET_PROC(cuWGLGetDevice);
+#endif
+    }
+    if (cudaVersion >= 2030)
+    {
+        GET_PROC(cuGraphicsGLRegisterBuffer);
+        GET_PROC(cuGraphicsGLRegisterImage);
+    }
+    if (cudaVersion >= 3000)
+    {
+        GET_PROC(cuGLGetDevices);
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+        GET_PROC(cuWGLGetDevice);
+#endif
+        GET_PROC_V2(cuGLCtxCreate);
+
+        GET_PROC_V2(cuGLMapBufferObject);
+        GET_PROC(cuGLUnmapBufferObject);
+        GET_PROC(cuGLMapBufferObjectAsync);
+        GET_PROC(cuGLUnmapBufferObjectAsync);
+        GET_PROC(cuGLRegisterBufferObject);
+        GET_PROC(cuGLUnregisterBufferObject);
+        GET_PROC(cuGLSetBufferObjectMapFlags);
+    }
+
+	//init cuvid
+    CHECKED_CALL(LOAD_LIBRARY_CUVID(&CuvidDrvLib));
+
+	curr_lib = CuvidDrvLib;
+#if !defined(__APPLE__)
+    // fetch all function pointers
+    GET_PROC(cuvidCreateVideoSource);
+    GET_PROC(cuvidCreateVideoSourceW);
+    GET_PROC(cuvidDestroyVideoSource);
+    GET_PROC(cuvidSetVideoSourceState);
+    GET_PROC(cuvidGetVideoSourceState);
+    GET_PROC(cuvidGetSourceVideoFormat);
+    GET_PROC(cuvidGetSourceAudioFormat);
+#endif
+
+    GET_PROC(cuvidCreateVideoParser);
+    GET_PROC(cuvidParseVideoData);
+    GET_PROC(cuvidDestroyVideoParser);
+
+    GET_PROC(cuvidCreateDecoder);
+    GET_PROC(cuvidDestroyDecoder);
+    GET_PROC(cuvidDecodePicture);
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+    GET_PROC(cuvidMapVideoFrame64);
+    GET_PROC(cuvidUnmapVideoFrame64);
+    cuvidMapVideoFrame   = cuvidMapVideoFrame64;
+    cuvidUnmapVideoFrame = cuvidUnmapVideoFrame64;
+#else
+    GET_PROC(cuvidMapVideoFrame);
+    GET_PROC(cuvidUnmapVideoFrame);
+#endif
+
+//    GET_PROC(cuvidGetVideoFrameSurface);
+    GET_PROC(cuvidCtxLockCreate);
+    GET_PROC(cuvidCtxLockDestroy);
+    GET_PROC(cuvidCtxLock);
+    GET_PROC(cuvidCtxUnlock);
+
+
+	return CUDA_SUCCESS;
+}
+
+
+// CUDA Driver API errors
+const char *cudaGetErrorEnum(CUresult error)
+{
+	switch (error) {
+	case CUDA_SUCCESS: return "CUDA_SUCCESS";
+	case CUDA_ERROR_INVALID_VALUE: return "CUDA_ERROR_INVALID_VALUE";
+	case CUDA_ERROR_OUT_OF_MEMORY:	return "CUDA_ERROR_OUT_OF_MEMORY";
+	case CUDA_ERROR_NOT_INITIALIZED: return "CUDA_ERROR_NOT_INITIALIZED";
+	case CUDA_ERROR_DEINITIALIZED:	return "CUDA_ERROR_DEINITIALIZED";
+	case CUDA_ERROR_PROFILER_DISABLED:	return "CUDA_ERROR_PROFILER_DISABLED";
+	case CUDA_ERROR_PROFILER_NOT_INITIALIZED:	return "CUDA_ERROR_PROFILER_NOT_INITIALIZED";
+	case CUDA_ERROR_PROFILER_ALREADY_STARTED:	return "CUDA_ERROR_PROFILER_ALREADY_STARTED";
+	case CUDA_ERROR_PROFILER_ALREADY_STOPPED:	return "CUDA_ERROR_PROFILER_ALREADY_STOPPED";
+	case CUDA_ERROR_NO_DEVICE:	return "CUDA_ERROR_NO_DEVICE";
+	case CUDA_ERROR_INVALID_DEVICE:	return "CUDA_ERROR_INVALID_DEVICE";
+	case CUDA_ERROR_INVALID_IMAGE:	return "CUDA_ERROR_INVALID_IMAGE";
+	case CUDA_ERROR_INVALID_CONTEXT:	return "CUDA_ERROR_INVALID_CONTEXT";
+	case CUDA_ERROR_CONTEXT_ALREADY_CURRENT:	return "CUDA_ERROR_CONTEXT_ALREADY_CURRENT";
+	case CUDA_ERROR_MAP_FAILED:	return "CUDA_ERROR_MAP_FAILED";
+	case CUDA_ERROR_UNMAP_FAILED:	return "CUDA_ERROR_UNMAP_FAILED";
+	case CUDA_ERROR_ARRAY_IS_MAPPED:	return "CUDA_ERROR_ARRAY_IS_MAPPED";
+	case CUDA_ERROR_ALREADY_MAPPED:	return "CUDA_ERROR_ALREADY_MAPPED";
+	case CUDA_ERROR_NO_BINARY_FOR_GPU:	return "CUDA_ERROR_NO_BINARY_FOR_GPU";
+	case CUDA_ERROR_ALREADY_ACQUIRED:	return "CUDA_ERROR_ALREADY_ACQUIRED";
+	case CUDA_ERROR_NOT_MAPPED:	return "CUDA_ERROR_NOT_MAPPED";
+	case CUDA_ERROR_NOT_MAPPED_AS_ARRAY:	return "CUDA_ERROR_NOT_MAPPED_AS_ARRAY";
+	case CUDA_ERROR_NOT_MAPPED_AS_POINTER:	return "CUDA_ERROR_NOT_MAPPED_AS_POINTER";
+	case CUDA_ERROR_ECC_UNCORRECTABLE:	return "CUDA_ERROR_ECC_UNCORRECTABLE";
+	case CUDA_ERROR_UNSUPPORTED_LIMIT:	return "CUDA_ERROR_UNSUPPORTED_LIMIT";
+	case CUDA_ERROR_CONTEXT_ALREADY_IN_USE:	return "CUDA_ERROR_CONTEXT_ALREADY_IN_USE";
+	case CUDA_ERROR_INVALID_SOURCE:	return "CUDA_ERROR_INVALID_SOURCE";
+	case CUDA_ERROR_FILE_NOT_FOUND:	return "CUDA_ERROR_FILE_NOT_FOUND";
+	case CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND:	return "CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND";
+	case CUDA_ERROR_SHARED_OBJECT_INIT_FAILED:	return "CUDA_ERROR_SHARED_OBJECT_INIT_FAILED";
+	case CUDA_ERROR_OPERATING_SYSTEM:	return "CUDA_ERROR_OPERATING_SYSTEM";
+	case CUDA_ERROR_INVALID_HANDLE:	return "CUDA_ERROR_INVALID_HANDLE";
+	case CUDA_ERROR_NOT_FOUND:	return "CUDA_ERROR_NOT_FOUND";
+	case CUDA_ERROR_NOT_READY:	return "CUDA_ERROR_NOT_READY";
+	case CUDA_ERROR_LAUNCH_FAILED:	return "CUDA_ERROR_LAUNCH_FAILED";
+	case CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES:	return "CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES";
+	case CUDA_ERROR_LAUNCH_TIMEOUT:	return "CUDA_ERROR_LAUNCH_TIMEOUT";
+	case CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING:	return "CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING";
+	case CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED";
+	case CUDA_ERROR_PEER_ACCESS_NOT_ENABLED:	return "CUDA_ERROR_PEER_ACCESS_NOT_ENABLED";
+	case CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE:	return "CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE";
+	case CUDA_ERROR_CONTEXT_IS_DESTROYED:	return "CUDA_ERROR_CONTEXT_IS_DESTROYED";
+	case CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED";
+	case CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED:	return "CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED";
+	case CUDA_ERROR_UNKNOWN: return "CUDA_ERROR_UNKNOWN";
+	}
+	return "<unknown>";
+}
+
+#endif //WIN32

gpac-1.0.0.tar.gz/src/filters/dec_nvdec_sdk.h Added

@@ -0,0 +1,2899 @@
+/*
+ * Copyright 1993-2015 NVIDIA Corporation.  All rights reserved.
+ *
+ * Please refer to the NVIDIA end user license agreement (EULA) associated
+ * with this source code for terms and conditions that govern your use of
+ * this software. Any use, reproduction, disclosure, or distribution of
+ * this software and related documentation outside the terms of the EULA
+ * is strictly prohibited.
+ *
+ */
+
+#ifndef __cuda_tools_h__
+#define __cuda_tools_h__
+
+#include <stdlib.h>
+
+#if defined(WIN32) || defined(GPAC_CONFIG_LINUX) || defined(GPAC_CONFIG_DARWIN)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//needed for dec_nvdec_sdk.h which uses GL prototypes
+#ifndef GPAC_DISABLE_3D
+#include "../compositor/gl_inc.h"
+#else
+typedef u32 GLuint;
+typedef u32 GLenum;
+#endif
+
+#ifndef __CUDA_API_VERSION
+#define __CUDA_API_VERSION 4000
+#endif
+
+/**
+ * \defgroup CUDA_DRIVER CUDA Driver API
+ *
+ * This section describes the low-level CUDA driver application programming
+ * interface.
+ *
+ * @{
+ */
+
+/**
+ * \defgroup CUDA_TYPES Data types used by CUDA driver
+ * @{
+ */
+
+/**
+ * CUDA API version number
+ */
+#define CUDA_VERSION 4000 /* 4.0 */
+
+/**
+ * CUDA device pointer
+ */
+#if __CUDA_API_VERSION >= 3020
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
+    typedef unsigned long long CUdeviceptr;
+#else
+    typedef unsigned int CUdeviceptr;
+#endif
+
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef int CUdevice;                                     /**< CUDA device */
+typedef struct CUctx_st *CUcontext;                       /**< CUDA context */
+typedef struct CUmod_st *CUmodule;                        /**< CUDA module */
+typedef struct CUfunc_st *CUfunction;                     /**< CUDA function */
+typedef struct CUarray_st *CUarray;                       /**< CUDA array */
+typedef struct CUtexref_st *CUtexref;                     /**< CUDA texture reference */
+typedef struct CUsurfref_st *CUsurfref;                   /**< CUDA surface reference */
+typedef struct CUevent_st *CUevent;                       /**< CUDA event */
+typedef struct CUstream_st *CUstream;                     /**< CUDA stream */
+typedef struct CUgraphicsResource_st *CUgraphicsResource; /**< CUDA graphics interop resource */
+
+typedef struct CUuuid_st                                  /**< CUDA definition of UUID */
+{
+    char bytes[16];
+} CUuuid;
+
+/**
+ * Context creation flags
+ */
+typedef enum CUctx_flags_enum
+{
+    CU_CTX_SCHED_AUTO          = 0x00, /**< Automatic scheduling */
+    CU_CTX_SCHED_SPIN          = 0x01, /**< Set spin as default scheduling */
+    CU_CTX_SCHED_YIELD         = 0x02, /**< Set yield as default scheduling */
+    CU_CTX_SCHED_BLOCKING_SYNC = 0x04, /**< Set blocking synchronization as default scheduling */
+    CU_CTX_BLOCKING_SYNC       = 0x04, /**< Set blocking synchronization as default scheduling \deprecated */
+    CU_CTX_MAP_HOST            = 0x08, /**< Support mapped pinned allocations */
+    CU_CTX_LMEM_RESIZE_TO_MAX  = 0x10, /**< Keep local memory allocation after launch */
+#if __CUDA_API_VERSION < 4000
+    CU_CTX_SCHED_MASK          = 0x03,
+    CU_CTX_FLAGS_MASK          = 0x1f
+#else
+    CU_CTX_SCHED_MASK          = 0x07,
+    CU_CTX_PRIMARY             = 0x20, /**< Initialize and return the primary context */
+    CU_CTX_FLAGS_MASK          = 0x3f
+#endif
+} CUctx_flags;
+
+/**
+ * Event creation flags
+ */
+typedef enum CUevent_flags_enum
+{
+    CU_EVENT_DEFAULT        = 0, /**< Default event flag */
+    CU_EVENT_BLOCKING_SYNC  = 1, /**< Event uses blocking synchronization */
+    CU_EVENT_DISABLE_TIMING = 2  /**< Event will not record timing data */
+} CUevent_flags;
+
+/**
+ * Array formats
+ */
+typedef enum CUarray_format_enum
+{
+    CU_AD_FORMAT_UNSIGNED_INT8  = 0x01, /**< Unsigned 8-bit integers */
+    CU_AD_FORMAT_UNSIGNED_INT16 = 0x02, /**< Unsigned 16-bit integers */
+    CU_AD_FORMAT_UNSIGNED_INT32 = 0x03, /**< Unsigned 32-bit integers */
+    CU_AD_FORMAT_SIGNED_INT8    = 0x08, /**< Signed 8-bit integers */
+    CU_AD_FORMAT_SIGNED_INT16   = 0x09, /**< Signed 16-bit integers */
+    CU_AD_FORMAT_SIGNED_INT32   = 0x0a, /**< Signed 32-bit integers */
+    CU_AD_FORMAT_HALF           = 0x10, /**< 16-bit floating point */
+    CU_AD_FORMAT_FLOAT          = 0x20  /**< 32-bit floating point */
+} CUarray_format;
+
+/**
+ * Texture reference addressing modes
+ */
+typedef enum CUaddress_mode_enum
+{
+    CU_TR_ADDRESS_MODE_WRAP   = 0, /**< Wrapping address mode */
+    CU_TR_ADDRESS_MODE_CLAMP  = 1, /**< Clamp to edge address mode */
+    CU_TR_ADDRESS_MODE_MIRROR = 2, /**< Mirror address mode */
+    CU_TR_ADDRESS_MODE_BORDER = 3  /**< Border address mode */
+} CUaddress_mode;
+
+/**
+ * Texture reference filtering modes
+ */
+typedef enum CUfilter_mode_enum
+{
+    CU_TR_FILTER_MODE_POINT  = 0, /**< Point filter mode */
+    CU_TR_FILTER_MODE_LINEAR = 1  /**< Linear filter mode */
+} CUfilter_mode;
+
+/**
+ * Device properties
+ */
+typedef enum CUdevice_attribute_enum
+{
+    CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 1,              /**< Maximum number of threads per block */
+    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_X = 2,                    /**< Maximum block dimension X */
+    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Y = 3,                    /**< Maximum block dimension Y */
+    CU_DEVICE_ATTRIBUTE_MAX_BLOCK_DIM_Z = 4,                    /**< Maximum block dimension Z */
+    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_X = 5,                     /**< Maximum grid dimension X */
+    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Y = 6,                     /**< Maximum grid dimension Y */
+    CU_DEVICE_ATTRIBUTE_MAX_GRID_DIM_Z = 7,                     /**< Maximum grid dimension Z */
+    CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK = 8,        /**< Maximum shared memory available per block in bytes */
+    CU_DEVICE_ATTRIBUTE_SHARED_MEMORY_PER_BLOCK = 8,            /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_SHARED_MEMORY_PER_BLOCK */
+    CU_DEVICE_ATTRIBUTE_TOTAL_CONSTANT_MEMORY = 9,              /**< Memory available on device for __constant__ variables in a CUDA C kernel in bytes */
+    CU_DEVICE_ATTRIBUTE_WARP_SIZE = 10,                         /**< Warp size in threads */
+    CU_DEVICE_ATTRIBUTE_MAX_PITCH = 11,                         /**< Maximum pitch in bytes allowed by memory copies */
+    CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK = 12,           /**< Maximum number of 32-bit registers available per block */
+    CU_DEVICE_ATTRIBUTE_REGISTERS_PER_BLOCK = 12,               /**< Deprecated, use CU_DEVICE_ATTRIBUTE_MAX_REGISTERS_PER_BLOCK */
+    CU_DEVICE_ATTRIBUTE_CLOCK_RATE = 13,                        /**< Peak clock frequency in kilohertz */
+    CU_DEVICE_ATTRIBUTE_TEXTURE_ALIGNMENT = 14,                 /**< Alignment requirement for textures */
+    CU_DEVICE_ATTRIBUTE_GPU_OVERLAP = 15,                       /**< Device can possibly copy memory and execute a kernel concurrently */
+    CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT = 16,              /**< Number of multiprocessors on device */
+    CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT = 17,               /**< Specifies whether there is a run time limit on kernels */
+    CU_DEVICE_ATTRIBUTE_INTEGRATED = 18,                        /**< Device is integrated with host memory */
+    CU_DEVICE_ATTRIBUTE_CAN_MAP_HOST_MEMORY = 19,               /**< Device can map host memory into CUDA address space */
+    CU_DEVICE_ATTRIBUTE_COMPUTE_MODE = 20,                      /**< Compute mode (See ::CUcomputemode for details) */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_WIDTH = 21,           /**< Maximum 1D texture width */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_WIDTH = 22,           /**< Maximum 2D texture width */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_HEIGHT = 23,          /**< Maximum 2D texture height */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_WIDTH = 24,           /**< Maximum 3D texture width */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_HEIGHT = 25,          /**< Maximum 3D texture height */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE3D_DEPTH = 26,           /**< Maximum 3D texture depth */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_WIDTH = 27,     /**< Maximum texture array width */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_HEIGHT = 28,    /**< Maximum texture array height */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE2D_ARRAY_NUMSLICES = 29, /**< Maximum slices in a texture array */
+    CU_DEVICE_ATTRIBUTE_SURFACE_ALIGNMENT = 30,                 /**< Alignment requirement for surfaces */
+    CU_DEVICE_ATTRIBUTE_CONCURRENT_KERNELS = 31,                /**< Device can possibly execute multiple kernels concurrently */
+    CU_DEVICE_ATTRIBUTE_ECC_ENABLED = 32,                       /**< Device has ECC support enabled */
+    CU_DEVICE_ATTRIBUTE_PCI_BUS_ID = 33,                        /**< PCI bus ID of the device */
+    CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID = 34,                     /**< PCI device ID of the device */
+    CU_DEVICE_ATTRIBUTE_TCC_DRIVER = 35                         /**< Device is using TCC driver model */
+#if __CUDA_API_VERSION >= 4000
+  , CU_DEVICE_ATTRIBUTE_MEMORY_CLOCK_RATE = 36,                 /**< Peak memory clock frequency in kilohertz */
+    CU_DEVICE_ATTRIBUTE_GLOBAL_MEMORY_BUS_WIDTH = 37,           /**< Global memory bus width in bits */
+    CU_DEVICE_ATTRIBUTE_L2_CACHE_SIZE = 38,                     /**< Size of L2 cache in bytes */
+    CU_DEVICE_ATTRIBUTE_MAX_THREADS_PER_MULTIPROCESSOR = 39,    /**< Maximum resident threads per multiprocessor */
+    CU_DEVICE_ATTRIBUTE_ASYNC_ENGINE_COUNT = 40,                /**< Number of asynchronous engines */
+    CU_DEVICE_ATTRIBUTE_UNIFIED_ADDRESSING = 41,                /**< Device uses shares a unified address space with the host */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_WIDTH = 42,   /**< Maximum 1D layered texture width */
+    CU_DEVICE_ATTRIBUTE_MAXIMUM_TEXTURE1D_LAYERED_LAYERS = 43   /**< Maximum layers in a 1D layered texture */
+#endif
+} CUdevice_attribute;
+
+/**
+ * Legacy device properties
+ */
+typedef struct CUdevprop_st
+{
+    int maxThreadsPerBlock;     /**< Maximum number of threads per block */
+    int maxThreadsDim[3];       /**< Maximum size of each dimension of a block */
+    int maxGridSize[3];         /**< Maximum size of each dimension of a grid */
+    int sharedMemPerBlock;      /**< Shared memory available per block in bytes */
+    int totalConstantMemory;    /**< Constant memory available on device in bytes */
+    int SIMDWidth;              /**< Warp size in threads */
+    int memPitch;               /**< Maximum pitch in bytes allowed by memory copies */
+    int regsPerBlock;           /**< 32-bit registers available per block */
+    int clockRate;              /**< Clock frequency in kilohertz */
+    int textureAlign;           /**< Alignment requirement for textures */
+} CUdevprop;
+
+/**
+ * Function properties
+ */
+typedef enum CUfunction_attribute_enum
+{
+    /**
+     * The maximum number of threads per block, beyond which a launch of the
+     * function would fail. This number depends on both the function and the
+     * device on which the function is currently loaded.
+     */
+    CU_FUNC_ATTRIBUTE_MAX_THREADS_PER_BLOCK = 0,
+
+    /**
+     * The size in bytes of statically-allocated shared memory required by
+     * this function. This does not include dynamically-allocated shared
+     * memory requested by the user at runtime.
+     */
+    CU_FUNC_ATTRIBUTE_SHARED_SIZE_BYTES = 1,
+
+    /**
+     * The size in bytes of user-allocated constant memory required by this
+     * function.
+     */
+    CU_FUNC_ATTRIBUTE_CONST_SIZE_BYTES = 2,
+
+    /**
+     * The size in bytes of local memory used by each thread of this function.
+     */
+    CU_FUNC_ATTRIBUTE_LOCAL_SIZE_BYTES = 3,
+
+    /**
+     * The number of registers used by each thread of this function.
+     */
+    CU_FUNC_ATTRIBUTE_NUM_REGS = 4,
+
+    /**
+     * The PTX virtual architecture version for which the function was
+     * compiled. This value is the major PTX version * 10 + the minor PTX
+     * version, so a PTX version 1.3 function would return the value 13.
+     * Note that this may return the undefined value of 0 for cubins
+     * compiled prior to CUDA 3.0.
+     */
+    CU_FUNC_ATTRIBUTE_PTX_VERSION = 5,
+
+    /**
+     * The binary architecture version for which the function was compiled.
+     * This value is the major binary version * 10 + the minor binary version,
+     * so a binary version 1.3 function would return the value 13. Note that
+     * this will return a value of 10 for legacy cubins that do not have a
+     * properly-encoded binary architecture version.
+     */
+    CU_FUNC_ATTRIBUTE_BINARY_VERSION = 6,
+
+    CU_FUNC_ATTRIBUTE_MAX
+} CUfunction_attribute;
+
+/**
+ * Function cache configurations
+ */
+typedef enum CUfunc_cache_enum
+{
+    CU_FUNC_CACHE_PREFER_NONE    = 0x00, /**< no preference for shared memory or L1 (default) */
+    CU_FUNC_CACHE_PREFER_SHARED  = 0x01, /**< prefer larger shared memory and smaller L1 cache */
+    CU_FUNC_CACHE_PREFER_L1      = 0x02  /**< prefer larger L1 cache and smaller shared memory */
+} CUfunc_cache;
+
+/**
+ * Memory types
+ */
+typedef enum CUmemorytype_enum
+{
+    CU_MEMORYTYPE_HOST    = 0x01,    /**< Host memory */
+    CU_MEMORYTYPE_DEVICE  = 0x02,    /**< Device memory */
+    CU_MEMORYTYPE_ARRAY   = 0x03     /**< Array memory */
+#if __CUDA_API_VERSION >= 4000
+  , CU_MEMORYTYPE_UNIFIED = 0x04     /**< Unified device or host memory */
+#endif
+} CUmemorytype;
+
+/**
+ * Compute Modes
+ */
+typedef enum CUcomputemode_enum
+{
+    CU_COMPUTEMODE_DEFAULT           = 0,  /**< Default compute mode (Multiple contexts allowed per device) */
+    CU_COMPUTEMODE_EXCLUSIVE         = 1, /**< Compute-exclusive-thread mode (Only one context used by a single thread can be present on this device at a time) */
+    CU_COMPUTEMODE_PROHIBITED        = 2  /**< Compute-prohibited mode (No contexts can be created on this device at this time) */
+#if __CUDA_API_VERSION >= 4000
+  , CU_COMPUTEMODE_EXCLUSIVE_PROCESS = 3  /**< Compute-exclusive-process mode (Only one context used by a single process can be present on this device at a time) */
+#endif
+} CUcomputemode;
+
+/**
+ * Online compiler options
+ */
+typedef enum CUjit_option_enum
+{
+    /**
+     * Max number of registers that a thread may use.\n
+     * Option type: unsigned int
+     */
+    CU_JIT_MAX_REGISTERS = 0,
+
+    /**
+     * IN: Specifies minimum number of threads per block to target compilation
+     * for\n
+     * OUT: Returns the number of threads the compiler actually targeted.
+     * This restricts the resource utilization fo the compiler (e.g. max
+     * registers) such that a block with the given number of threads should be
+     * able to launch based on register limitations. Note, this option does not
+     * currently take into account any other resource limitations, such as
+     * shared memory utilization.\n
+     * Option type: unsigned int
+     */
+    CU_JIT_THREADS_PER_BLOCK,
+
+    /**
+     * Returns a float value in the option of the wall clock time, in
+     * milliseconds, spent creating the cubin\n
+     * Option type: float
+     */
+    CU_JIT_WALL_TIME,
+
+    /**
+     * Pointer to a buffer in which to print any log messsages from PTXAS
+     * that are informational in nature (the buffer size is specified via
+     * option ::CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES) \n
+     * Option type: char*
+     */
+    CU_JIT_INFO_LOG_BUFFER,
+
+    /**
+     * IN: Log buffer size in bytes.  Log messages will be capped at this size
+     * (including null terminator)\n
+     * OUT: Amount of log buffer filled with messages\n
+     * Option type: unsigned int
+     */
+    CU_JIT_INFO_LOG_BUFFER_SIZE_BYTES,
+
+    /**
+     * Pointer to a buffer in which to print any log messages from PTXAS that
+     * reflect errors (the buffer size is specified via option
+     * ::CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES)\n
+     * Option type: char*
+     */
+    CU_JIT_ERROR_LOG_BUFFER,
+
+    /**
+     * IN: Log buffer size in bytes.  Log messages will be capped at this size
+     * (including null terminator)\n
+     * OUT: Amount of log buffer filled with messages\n
+     * Option type: unsigned int
+     */
+    CU_JIT_ERROR_LOG_BUFFER_SIZE_BYTES,
+
+    /**
+     * Level of optimizations to apply to generated code (0 - 4), with 4
+     * being the default and highest level of optimizations.\n
+     * Option type: unsigned int
+     */
+    CU_JIT_OPTIMIZATION_LEVEL,
+
+    /**
+     * No option value required. Determines the target based on the current
+     * attached context (default)\n
+     * Option type: No option value needed
+     */
+    CU_JIT_TARGET_FROM_CUCONTEXT,
+
+    /**
+     * Target is chosen based on supplied ::CUjit_target_enum.\n
+     * Option type: unsigned int for enumerated type ::CUjit_target_enum
+     */
+    CU_JIT_TARGET,
+
+    /**
+     * Specifies choice of fallback strategy if matching cubin is not found.
+     * Choice is based on supplied ::CUjit_fallback_enum.\n
+     * Option type: unsigned int for enumerated type ::CUjit_fallback_enum
+     */
+    CU_JIT_FALLBACK_STRATEGY
+
+} CUjit_option;
+
+/**
+ * Online compilation targets
+ */
+typedef enum CUjit_target_enum
+{
+    CU_TARGET_COMPUTE_10 = 0,   /**< Compute device class 1.0 */
+    CU_TARGET_COMPUTE_11,       /**< Compute device class 1.1 */
+    CU_TARGET_COMPUTE_12,       /**< Compute device class 1.2 */
+    CU_TARGET_COMPUTE_13,       /**< Compute device class 1.3 */
+    CU_TARGET_COMPUTE_20,       /**< Compute device class 2.0 */
+    CU_TARGET_COMPUTE_21        /**< Compute device class 2.1 */
+} CUjit_target;
+
+/**
+ * Cubin matching fallback strategies
+ */
+typedef enum CUjit_fallback_enum
+{
+    CU_PREFER_PTX = 0,  /**< Prefer to compile ptx */
+
+    CU_PREFER_BINARY    /**< Prefer to fall back to compatible binary code */
+
+} CUjit_fallback;
+
+/**
+ * Flags to register a graphics resource
+ */
+typedef enum CUgraphicsRegisterFlags_enum
+{
+    CU_GRAPHICS_REGISTER_FLAGS_NONE          = 0x00,
+    CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY     = 0x01,
+    CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 0x02,
+    CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST  = 0x04
+} CUgraphicsRegisterFlags;
+
+/**
+ * Flags for mapping and unmapping interop resources
+ */
+typedef enum CUgraphicsMapResourceFlags_enum
+{
+    CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE          = 0x00,
+    CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
+    CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02
+} CUgraphicsMapResourceFlags;
+
+/**
+ * Array indices for cube faces
+ */
+typedef enum CUarray_cubemap_face_enum
+{
+    CU_CUBEMAP_FACE_POSITIVE_X  = 0x00, /**< Positive X face of cubemap */
+    CU_CUBEMAP_FACE_NEGATIVE_X  = 0x01, /**< Negative X face of cubemap */
+    CU_CUBEMAP_FACE_POSITIVE_Y  = 0x02, /**< Positive Y face of cubemap */
+    CU_CUBEMAP_FACE_NEGATIVE_Y  = 0x03, /**< Negative Y face of cubemap */
+    CU_CUBEMAP_FACE_POSITIVE_Z  = 0x04, /**< Positive Z face of cubemap */
+    CU_CUBEMAP_FACE_NEGATIVE_Z  = 0x05  /**< Negative Z face of cubemap */
+} CUarray_cubemap_face;
+
+/**
+ * Limits
+ */
+typedef enum CUlimit_enum
+{
+    CU_LIMIT_STACK_SIZE        = 0x00, /**< GPU thread stack size */
+    CU_LIMIT_PRINTF_FIFO_SIZE  = 0x01, /**< GPU printf FIFO size */
+    CU_LIMIT_MALLOC_HEAP_SIZE  = 0x02  /**< GPU malloc heap size */
+} CUlimit;
+
+/**
+ * Error codes
+ */
+typedef enum cudaError_enum
+{
+    /**
+     * The API call returned with no errors. In the case of query calls, this
+     * can also mean that the operation being queried is complete (see
+     * ::cuEventQuery() and ::cuStreamQuery()).
+     */
+    CUDA_SUCCESS                              = 0,
+
+    /**
+     * This indicates that one or more of the parameters passed to the API call
+     * is not within an acceptable range of values.
+     */
+    CUDA_ERROR_INVALID_VALUE                  = 1,
+
+    /**
+     * The API call failed because it was unable to allocate enough memory to
+     * perform the requested operation.
+     */
+    CUDA_ERROR_OUT_OF_MEMORY                  = 2,
+
+    /**
+     * This indicates that the CUDA driver has not been initialized with
+     * ::cuInit() or that initialization has failed.
+     */
+    CUDA_ERROR_NOT_INITIALIZED                = 3,
+
+    /**
+     * This indicates that the CUDA driver is in the process of shutting down.
+     */
+    CUDA_ERROR_DEINITIALIZED                  = 4,
+
+    /**
+     * This indicates profiling APIs are called while application is running
+     * in visual profiler mode.
+    */
+    CUDA_ERROR_PROFILER_DISABLED           = 5,
+    /**
+     * This indicates profiling has not been initialized for this context.
+     * Call cuProfilerInitialize() to resolve this.
+    */
+    CUDA_ERROR_PROFILER_NOT_INITIALIZED       = 6,
+    /**
+     * This indicates profiler has already been started and probably
+     * cuProfilerStart() is incorrectly called.
+    */
+    CUDA_ERROR_PROFILER_ALREADY_STARTED       = 7,
+    /**
+     * This indicates profiler has already been stopped and probably
+     * cuProfilerStop() is incorrectly called.
+    */
+    CUDA_ERROR_PROFILER_ALREADY_STOPPED       = 8,
+    /**
+     * This indicates that no CUDA-capable devices were detected by the installed
+     * CUDA driver.
+     */
+    CUDA_ERROR_NO_DEVICE                      = 100,
+
+    /**
+     * This indicates that the device ordinal supplied by the user does not
+     * correspond to a valid CUDA device.
+     */
+    CUDA_ERROR_INVALID_DEVICE                 = 101,
+
+
+    /**
+     * This indicates that the device kernel image is invalid. This can also
+     * indicate an invalid CUDA module.
+     */
+    CUDA_ERROR_INVALID_IMAGE                  = 200,
+
+    /**
+     * This most frequently indicates that there is no context bound to the
+     * current thread. This can also be returned if the context passed to an
+     * API call is not a valid handle (such as a context that has had
+     * ::cuCtxDestroy() invoked on it). This can also be returned if a user
+     * mixes different API versions (i.e. 3010 context with 3020 API calls).
+     * See ::cuCtxGetApiVersion() for more details.
+     */
+    CUDA_ERROR_INVALID_CONTEXT                = 201,
+
+    /**
+     * This indicated that the context being supplied as a parameter to the
+     * API call was already the active context.
+     * \deprecated
+     * This error return is deprecated as of CUDA 3.2. It is no longer an
+     * error to attempt to push the active context via ::cuCtxPushCurrent().
+     */
+    CUDA_ERROR_CONTEXT_ALREADY_CURRENT        = 202,
+
+    /**
+     * This indicates that a map or register operation has failed.
+     */
+    CUDA_ERROR_MAP_FAILED                     = 205,
+
+    /**
+     * This indicates that an unmap or unregister operation has failed.
+     */
+    CUDA_ERROR_UNMAP_FAILED                   = 206,
+
+    /**
+     * This indicates that the specified array is currently mapped and thus
+     * cannot be destroyed.
+     */
+    CUDA_ERROR_ARRAY_IS_MAPPED                = 207,
+
+    /**
+     * This indicates that the resource is already mapped.
+     */
+    CUDA_ERROR_ALREADY_MAPPED                 = 208,
+
+    /**
+     * This indicates that there is no kernel image available that is suitable
+     * for the device. This can occur when a user specifies code generation
+     * options for a particular CUDA source file that do not include the
+     * corresponding device configuration.
+     */
+    CUDA_ERROR_NO_BINARY_FOR_GPU              = 209,
+
+    /**
+     * This indicates that a resource has already been acquired.
+     */
+    CUDA_ERROR_ALREADY_ACQUIRED               = 210,
+
+    /**
+     * This indicates that a resource is not mapped.
+     */
+    CUDA_ERROR_NOT_MAPPED                     = 211,
+
+    /**
+     * This indicates that a mapped resource is not available for access as an
+     * array.
+     */
+    CUDA_ERROR_NOT_MAPPED_AS_ARRAY            = 212,
+
+    /**
+     * This indicates that a mapped resource is not available for access as a
+     * pointer.
+     */
+    CUDA_ERROR_NOT_MAPPED_AS_POINTER          = 213,
+
+    /**
+     * This indicates that an uncorrectable ECC error was detected during
+     * execution.
+     */
+    CUDA_ERROR_ECC_UNCORRECTABLE              = 214,
+
+    /**
+     * This indicates that the ::CUlimit passed to the API call is not
+     * supported by the active device.
+     */
+    CUDA_ERROR_UNSUPPORTED_LIMIT              = 215,
+
+    /**
+     * This indicates that the ::CUcontext passed to the API call can
+     * only be bound to a single CPU thread at a time but is already
+     * bound to a CPU thread.
+     */
+    CUDA_ERROR_CONTEXT_ALREADY_IN_USE         = 216,
+
+    /**
+     * This indicates that the device kernel source is invalid.
+     */
+    CUDA_ERROR_INVALID_SOURCE                 = 300,
+
+    /**
+     * This indicates that the file specified was not found.
+     */
+    CUDA_ERROR_FILE_NOT_FOUND                 = 301,
+
+    /**
+     * This indicates that a link to a shared object failed to resolve.
+     */
+    CUDA_ERROR_SHARED_OBJECT_SYMBOL_NOT_FOUND = 302,
+
+    /**
+     * This indicates that initialization of a shared object failed.
+     */
+    CUDA_ERROR_SHARED_OBJECT_INIT_FAILED      = 303,
+
+    /**
+     * This indicates that an OS call failed.
+     */
+    CUDA_ERROR_OPERATING_SYSTEM               = 304,
+
+
+    /**
+     * This indicates that a resource handle passed to the API call was not
+     * valid. Resource handles are opaque types like ::CUstream and ::CUevent.
+     */
+    CUDA_ERROR_INVALID_HANDLE                 = 400,
+
+
+    /**
+     * This indicates that a named symbol was not found. Examples of symbols
+     * are global/constant variable names, texture names, and surface names.
+     */
+    CUDA_ERROR_NOT_FOUND                      = 500,
+
+
+    /**
+     * This indicates that asynchronous operations issued previously have not
+     * completed yet. This result is not actually an error, but must be indicated
+     * differently than ::CUDA_SUCCESS (which indicates completion). Calls that
+     * may return this value include ::cuEventQuery() and ::cuStreamQuery().
+     */
+    CUDA_ERROR_NOT_READY                      = 600,
+
+
+    /**
+     * An exception occurred on the device while executing a kernel. Common
+     * causes include dereferencing an invalid device pointer and accessing
+     * out of bounds shared memory. The context cannot be used, so it must
+     * be destroyed (and a new one should be created). All existing device
+     * memory allocations from this context are invalid and must be
+     * reconstructed if the program is to continue using CUDA.
+     */
+    CUDA_ERROR_LAUNCH_FAILED                  = 700,
+
+    /**
+     * This indicates that a launch did not occur because it did not have
+     * appropriate resources. This error usually indicates that the user has
+     * attempted to pass too many arguments to the device kernel, or the
+     * kernel launch specifies too many threads for the kernel's register
+     * count. Passing arguments of the wrong size (i.e. a 64-bit pointer
+     * when a 32-bit int is expected) is equivalent to passing too many
+     * arguments and can also result in this error.
+     */
+    CUDA_ERROR_LAUNCH_OUT_OF_RESOURCES        = 701,
+
+    /**
+     * This indicates that the device kernel took too long to execute. This can
+     * only occur if timeouts are enabled - see the device attribute
+     * ::CU_DEVICE_ATTRIBUTE_KERNEL_EXEC_TIMEOUT for more information. The
+     * context cannot be used (and must be destroyed similar to
+     * ::CUDA_ERROR_LAUNCH_FAILED). All existing device memory allocations from
+     * this context are invalid and must be reconstructed if the program is to
+     * continue using CUDA.
+     */
+    CUDA_ERROR_LAUNCH_TIMEOUT                 = 702,
+
+    /**
+     * This error indicates a kernel launch that uses an incompatible texturing
+     * mode.
+     */
+    CUDA_ERROR_LAUNCH_INCOMPATIBLE_TEXTURING  = 703,
+
+    /**
+     * This error indicates that a call to ::cuCtxEnablePeerAccess() is
+     * trying to re-enable peer access to a context which has already
+     * had peer access to it enabled.
+     */
+    CUDA_ERROR_PEER_ACCESS_ALREADY_ENABLED = 704,
+
+    /**
+     * This error indicates that a call to ::cuMemPeerRegister is trying to
+     * register memory from a context which has not had peer access
+     * enabled yet via ::cuCtxEnablePeerAccess(), or that
+     * ::cuCtxDisablePeerAccess() is trying to disable peer access
+     * which has not been enabled yet.
+     */
+    CUDA_ERROR_PEER_ACCESS_NOT_ENABLED    = 705,
+
+    /**
+     * This error indicates that a call to ::cuMemPeerRegister is trying to
+     * register already-registered memory.
+     */
+    CUDA_ERROR_PEER_MEMORY_ALREADY_REGISTERED = 706,
+
+    /**
+     * This error indicates that a call to ::cuMemPeerUnregister is trying to
+     * unregister memory that has not been registered.
+     */
+    CUDA_ERROR_PEER_MEMORY_NOT_REGISTERED     = 707,
+
+    /**
+     * This error indicates that ::cuCtxCreate was called with the flag
+     * ::CU_CTX_PRIMARY on a device which already has initialized its
+     * primary context.
+     */
+    CUDA_ERROR_PRIMARY_CONTEXT_ACTIVE         = 708,
+
+    /**
+     * This error indicates that the context current to the calling thread
+     * has been destroyed using ::cuCtxDestroy, or is a primary context which
+     * has not yet been initialized.
+     */
+    CUDA_ERROR_CONTEXT_IS_DESTROYED           = 709,
+
+    /**
+     * This indicates that an unknown internal error has occurred.
+     */
+    CUDA_ERROR_UNKNOWN                        = 999
+} CUresult;
+
+#if __CUDA_API_VERSION >= 4000
+/**
+ * If set, host memory is portable between CUDA contexts.
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_PORTABLE        0x01
+
+/**
+ * If set, host memory is mapped into CUDA address space and
+ * ::cuMemHostGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_DEVICEMAP       0x02
+
+/**
+ * If set, host memory is allocated as write-combined - fast to write,
+ * faster to DMA, slow to read except via SSE4 streaming load instruction
+ * (MOVNTDQA).
+ * Flag for ::cuMemHostAlloc()
+ */
+#define CU_MEMHOSTALLOC_WRITECOMBINED   0x04
+
+/**
+ * If set, host memory is portable between CUDA contexts.
+ * Flag for ::cuMemHostRegister()
+ */
+#define CU_MEMHOSTREGISTER_PORTABLE     0x01
+
+/**
+ * If set, host memory is mapped into CUDA address space and
+ * ::cuMemHostGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemHostRegister()
+ */
+#define CU_MEMHOSTREGISTER_DEVICEMAP    0x02
+
+/**
+ * If set, peer memory is mapped into CUDA address space and
+ * ::cuMemPeerGetDevicePointer() may be called on the host pointer.
+ * Flag for ::cuMemPeerRegister()
+ */
+#define CU_MEMPEERREGISTER_DEVICEMAP    0x02
+#endif
+
+#if __CUDA_API_VERSION >= 3020
+/**
+ * 2D memory copy parameters
+ */
+typedef struct CUDA_MEMCPY2D_st
+{
+    size_t srcXInBytes;         /**< Source X in bytes */
+    size_t srcY;                /**< Source Y */
+
+    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+    const void *srcHost;        /**< Source host pointer */
+    CUdeviceptr srcDevice;      /**< Source device pointer */
+    CUarray srcArray;           /**< Source array reference */
+    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
+
+    size_t dstXInBytes;         /**< Destination X in bytes */
+    size_t dstY;                /**< Destination Y */
+
+    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+    void *dstHost;              /**< Destination host pointer */
+    CUdeviceptr dstDevice;      /**< Destination device pointer */
+    CUarray dstArray;           /**< Destination array reference */
+    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
+
+    size_t WidthInBytes;        /**< Width of 2D memory copy in bytes */
+    size_t Height;              /**< Height of 2D memory copy */
+} CUDA_MEMCPY2D;
+
+/**
+ * 3D memory copy parameters
+ */
+typedef struct CUDA_MEMCPY3D_st
+{
+    size_t srcXInBytes;         /**< Source X in bytes */
+    size_t srcY;                /**< Source Y */
+    size_t srcZ;                /**< Source Z */
+    size_t srcLOD;              /**< Source LOD */
+    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+    const void *srcHost;        /**< Source host pointer */
+    CUdeviceptr srcDevice;      /**< Source device pointer */
+    CUarray srcArray;           /**< Source array reference */
+    void *reserved0;            /**< Must be NULL */
+    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
+    size_t srcHeight;           /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+    size_t dstXInBytes;         /**< Destination X in bytes */
+    size_t dstY;                /**< Destination Y */
+    size_t dstZ;                /**< Destination Z */
+    size_t dstLOD;              /**< Destination LOD */
+    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+    void *dstHost;              /**< Destination host pointer */
+    CUdeviceptr dstDevice;      /**< Destination device pointer */
+    CUarray dstArray;           /**< Destination array reference */
+    void *reserved1;            /**< Must be NULL */
+    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
+    size_t dstHeight;           /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+    size_t WidthInBytes;        /**< Width of 3D memory copy in bytes */
+    size_t Height;              /**< Height of 3D memory copy */
+    size_t Depth;               /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D;
+
+/**
+ * 3D memory cross-context copy parameters
+ */
+typedef struct CUDA_MEMCPY3D_PEER_st
+{
+    size_t srcXInBytes;         /**< Source X in bytes */
+    size_t srcY;                /**< Source Y */
+    size_t srcZ;                /**< Source Z */
+    size_t srcLOD;              /**< Source LOD */
+    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+    const void *srcHost;        /**< Source host pointer */
+    CUdeviceptr srcDevice;      /**< Source device pointer */
+    CUarray srcArray;           /**< Source array reference */
+    CUcontext srcContext;       /**< Source context (ignored with srcMemoryType is ::CU_MEMORYTYPE_ARRAY) */
+    size_t srcPitch;            /**< Source pitch (ignored when src is array) */
+    size_t srcHeight;           /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+    size_t dstXInBytes;         /**< Destination X in bytes */
+    size_t dstY;                /**< Destination Y */
+    size_t dstZ;                /**< Destination Z */
+    size_t dstLOD;              /**< Destination LOD */
+    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+    void *dstHost;              /**< Destination host pointer */
+    CUdeviceptr dstDevice;      /**< Destination device pointer */
+    CUarray dstArray;           /**< Destination array reference */
+    CUcontext dstContext;       /**< Destination context (ignored with dstMemoryType is ::CU_MEMORYTYPE_ARRAY) */
+    size_t dstPitch;            /**< Destination pitch (ignored when dst is array) */
+    size_t dstHeight;           /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+    size_t WidthInBytes;        /**< Width of 3D memory copy in bytes */
+    size_t Height;              /**< Height of 3D memory copy */
+    size_t Depth;               /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D_PEER;
+
+/**
+ * Array descriptor
+ */
+typedef struct CUDA_ARRAY_DESCRIPTOR_st
+{
+    size_t Width;             /**< Width of array */
+    size_t Height;            /**< Height of array */
+
+    CUarray_format Format;    /**< Array format */
+    unsigned int NumChannels; /**< Channels per array element */
+} CUDA_ARRAY_DESCRIPTOR;
+
+/**
+ * 3D array descriptor
+ */
+typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
+{
+    size_t Width;             /**< Width of 3D array */
+    size_t Height;            /**< Height of 3D array */
+    size_t Depth;             /**< Depth of 3D array */
+
+    CUarray_format Format;    /**< Array format */
+    unsigned int NumChannels; /**< Channels per array element */
+    unsigned int Flags;       /**< Flags */
+} CUDA_ARRAY3D_DESCRIPTOR;
+
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+/**
+ * If set, the CUDA array is a collection of layers, where each layer is either a 1D
+ * or a 2D array and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies the number
+ * of layers, not the depth of a 3D array.
+ */
+#define CUDA_ARRAY3D_LAYERED        0x01
+
+/**
+ * Deprecated, use CUDA_ARRAY3D_LAYERED
+ */
+#define CUDA_ARRAY3D_2DARRAY        0x01
+
+/**
+ * This flag must be set in order to bind a surface reference
+ * to the CUDA array
+ */
+#define CUDA_ARRAY3D_SURFACE_LDST   0x02
+
+/**
+ * Override the texref format with a format inferred from the array.
+ * Flag for ::cuTexRefSetArray()
+ */
+#define CU_TRSA_OVERRIDE_FORMAT 0x01
+
+/**
+ * Read the texture as integers rather than promoting the values to floats
+ * in the range [0,1].
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_READ_AS_INTEGER         0x01
+
+/**
+ * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_NORMALIZED_COORDINATES  0x02
+
+/**
+ * Perform sRGB->linear conversion during texture read.
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_SRGB  0x10
+
+/**
+ * End of array terminator for the \p extra parameter to
+ * ::cuLaunchKernel
+ */
+#define CU_LAUNCH_PARAM_END            ((void*)0x00)
+
+/**
+ * Indicator that the next value in the \p extra parameter to
+ * ::cuLaunchKernel will be a pointer to a buffer containing all kernel
+ * parameters used for launching kernel \p f.  This buffer needs to
+ * honor all alignment/padding requirements of the individual parameters.
+ * If ::CU_LAUNCH_PARAM_BUFFER_SIZE is not also specified in the
+ * \p extra array, then ::CU_LAUNCH_PARAM_BUFFER_POINTER will have no
+ * effect.
+ */
+#define CU_LAUNCH_PARAM_BUFFER_POINTER ((void*)0x01)
+
+/**
+ * Indicator that the next value in the \p extra parameter to
+ * ::cuLaunchKernel will be a pointer to a size_t which contains the
+ * size of the buffer specified with ::CU_LAUNCH_PARAM_BUFFER_POINTER.
+ * It is required that ::CU_LAUNCH_PARAM_BUFFER_POINTER also be specified
+ * in the \p extra array if the value associated with
+ * ::CU_LAUNCH_PARAM_BUFFER_SIZE is not zero.
+ */
+#define CU_LAUNCH_PARAM_BUFFER_SIZE    ((void*)0x02)
+
+/**
+ * For texture references loaded into the module, use default texunit from
+ * texture reference.
+ */
+#define CU_PARAM_TR_DEFAULT -1
+
+/**
+ * CUDA API made obselete at API version 3020
+ */
+#if defined(__CUDA_API_VERSION_INTERNAL)
+    #define CUdeviceptr                  CUdeviceptr_v1
+    #define CUDA_MEMCPY2D_st             CUDA_MEMCPY2D_v1_st
+    #define CUDA_MEMCPY2D                CUDA_MEMCPY2D_v1
+    #define CUDA_MEMCPY3D_st             CUDA_MEMCPY3D_v1_st
+    #define CUDA_MEMCPY3D                CUDA_MEMCPY3D_v1
+    #define CUDA_ARRAY_DESCRIPTOR_st     CUDA_ARRAY_DESCRIPTOR_v1_st
+    #define CUDA_ARRAY_DESCRIPTOR        CUDA_ARRAY_DESCRIPTOR_v1
+    #define CUDA_ARRAY3D_DESCRIPTOR_st   CUDA_ARRAY3D_DESCRIPTOR_v1_st
+    #define CUDA_ARRAY3D_DESCRIPTOR      CUDA_ARRAY3D_DESCRIPTOR_v1
+#endif /* CUDA_FORCE_LEGACY32_INTERNAL */
+
+#if defined(__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020
+typedef unsigned int CUdeviceptr;
+
+typedef struct CUDA_MEMCPY2D_st
+{
+    unsigned int srcXInBytes;   /**< Source X in bytes */
+    unsigned int srcY;          /**< Source Y */
+    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+    const void *srcHost;        /**< Source host pointer */
+    CUdeviceptr srcDevice;      /**< Source device pointer */
+    CUarray srcArray;           /**< Source array reference */
+    unsigned int srcPitch;      /**< Source pitch (ignored when src is array) */
+
+    unsigned int dstXInBytes;   /**< Destination X in bytes */
+    unsigned int dstY;          /**< Destination Y */
+    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+    void *dstHost;              /**< Destination host pointer */
+    CUdeviceptr dstDevice;      /**< Destination device pointer */
+    CUarray dstArray;           /**< Destination array reference */
+    unsigned int dstPitch;      /**< Destination pitch (ignored when dst is array) */
+
+    unsigned int WidthInBytes;  /**< Width of 2D memory copy in bytes */
+    unsigned int Height;        /**< Height of 2D memory copy */
+} CUDA_MEMCPY2D;
+
+typedef struct CUDA_MEMCPY3D_st
+{
+    unsigned int srcXInBytes;   /**< Source X in bytes */
+    unsigned int srcY;          /**< Source Y */
+    unsigned int srcZ;          /**< Source Z */
+    unsigned int srcLOD;        /**< Source LOD */
+    CUmemorytype srcMemoryType; /**< Source memory type (host, device, array) */
+    const void *srcHost;        /**< Source host pointer */
+    CUdeviceptr srcDevice;      /**< Source device pointer */
+    CUarray srcArray;           /**< Source array reference */
+    void *reserved0;            /**< Must be NULL */
+    unsigned int srcPitch;      /**< Source pitch (ignored when src is array) */
+    unsigned int srcHeight;     /**< Source height (ignored when src is array; may be 0 if Depth==1) */
+
+    unsigned int dstXInBytes;   /**< Destination X in bytes */
+    unsigned int dstY;          /**< Destination Y */
+    unsigned int dstZ;          /**< Destination Z */
+    unsigned int dstLOD;        /**< Destination LOD */
+    CUmemorytype dstMemoryType; /**< Destination memory type (host, device, array) */
+    void *dstHost;              /**< Destination host pointer */
+    CUdeviceptr dstDevice;      /**< Destination device pointer */
+    CUarray dstArray;           /**< Destination array reference */
+    void *reserved1;            /**< Must be NULL */
+    unsigned int dstPitch;      /**< Destination pitch (ignored when dst is array) */
+    unsigned int dstHeight;     /**< Destination height (ignored when dst is array; may be 0 if Depth==1) */
+
+    unsigned int WidthInBytes;  /**< Width of 3D memory copy in bytes */
+    unsigned int Height;        /**< Height of 3D memory copy */
+    unsigned int Depth;         /**< Depth of 3D memory copy */
+} CUDA_MEMCPY3D;
+
+typedef struct CUDA_ARRAY_DESCRIPTOR_st
+{
+    unsigned int Width;         /**< Width of array */
+    unsigned int Height;        /**< Height of array */
+
+    CUarray_format Format;      /**< Array format */
+    unsigned int NumChannels;   /**< Channels per array element */
+} CUDA_ARRAY_DESCRIPTOR;
+
+typedef struct CUDA_ARRAY3D_DESCRIPTOR_st
+{
+    unsigned int Width;         /**< Width of 3D array */
+    unsigned int Height;        /**< Height of 3D array */
+    unsigned int Depth;         /**< Depth of 3D array */
+
+    CUarray_format Format;      /**< Array format */
+    unsigned int NumChannels;   /**< Channels per array element */
+    unsigned int Flags;         /**< Flags */
+} CUDA_ARRAY3D_DESCRIPTOR;
+
+#endif /* (__CUDA_API_VERSION_INTERNAL) || __CUDA_API_VERSION < 3020 */
+
+/*
+ * If set, the CUDA array contains an array of 2D slices
+ * and the Depth member of CUDA_ARRAY3D_DESCRIPTOR specifies
+ * the number of slices, not the depth of a 3D array.
+ */
+#define CUDA_ARRAY3D_2DARRAY        0x01
+
+/**
+ * This flag must be set in order to bind a surface reference
+ * to the CUDA array
+ */
+#define CUDA_ARRAY3D_SURFACE_LDST   0x02
+
+/**
+ * Override the texref format with a format inferred from the array.
+ * Flag for ::cuTexRefSetArray()
+ */
+#define CU_TRSA_OVERRIDE_FORMAT 0x01
+
+/**
+ * Read the texture as integers rather than promoting the values to floats
+ * in the range [0,1].
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_READ_AS_INTEGER         0x01
+
+/**
+ * Use normalized texture coordinates in the range [0,1) instead of [0,dim).
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_NORMALIZED_COORDINATES  0x02
+
+/**
+ * Perform sRGB->linear conversion during texture read.
+ * Flag for ::cuTexRefSetFlags()
+ */
+#define CU_TRSF_SRGB  0x10
+
+/**
+ * For texture references loaded into the module, use default texunit from
+ * texture reference.
+ */
+#define CU_PARAM_TR_DEFAULT -1
+
+/** @} */ /* END CUDA_TYPES */
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+    #define CUDAAPI __stdcall
+#else
+    #define CUDAAPI
+#endif
+
+/**
+ * \defgroup CUDA_INITIALIZE Initialization
+ *
+ * This section describes the initialization functions of the low-level CUDA
+ * driver application programming interface.
+ *
+ * @{
+ */
+
+/*********************************
+ ** Initialization
+ *********************************/
+typedef CUresult  CUDAAPI tcuInit(unsigned int Flags);
+
+/*********************************
+ ** Driver Version Query
+ *********************************/
+typedef CUresult  CUDAAPI tcuDriverGetVersion(int *driverVersion);
+
+/************************************
+ **
+ **    Device management
+ **
+ ***********************************/
+
+typedef CUresult  CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
+typedef CUresult  CUDAAPI tcuDeviceGetCount(int *count);
+typedef CUresult  CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
+typedef CUresult  CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult  CUDAAPI tcuDeviceTotalMem(size_t *bytes, CUdevice dev);
+#else
+    typedef CUresult  CUDAAPI tcuDeviceTotalMem(unsigned int *bytes, CUdevice dev);
+#endif
+
+typedef CUresult  CUDAAPI tcuDeviceGetProperties(CUdevprop *prop, CUdevice dev);
+typedef CUresult  CUDAAPI tcuDeviceGetAttribute(int *pi, CUdevice_attribute attrib, CUdevice dev);
+
+/************************************
+ **
+ **    Context management
+ **
+ ***********************************/
+typedef CUresult  CUDAAPI tcuCtxCreate(CUcontext *pctx, unsigned int flags, CUdevice dev);
+typedef CUresult  CUDAAPI tcuCtxDestroy(CUcontext ctx);
+typedef CUresult  CUDAAPI tcuCtxAttach(CUcontext *pctx, unsigned int flags);
+typedef CUresult  CUDAAPI tcuCtxDetach(CUcontext ctx);
+typedef CUresult  CUDAAPI tcuCtxPushCurrent(CUcontext ctx);
+typedef CUresult  CUDAAPI tcuCtxPopCurrent(CUcontext *pctx);
+
+typedef CUresult  CUDAAPI tcuCtxSetCurrent(CUcontext ctx);
+typedef CUresult  CUDAAPI tcuCtxGetCurrent(CUcontext *pctx);
+
+typedef CUresult  CUDAAPI tcuCtxGetDevice(CUdevice *device);
+typedef CUresult  CUDAAPI tcuCtxSynchronize(void);
+
+
+/************************************
+ **
+ **    Module management
+ **
+ ***********************************/
+typedef CUresult  CUDAAPI tcuModuleLoad(CUmodule *module, const char *fname);
+typedef CUresult  CUDAAPI tcuModuleLoadData(CUmodule *module, const void *image);
+typedef CUresult  CUDAAPI tcuModuleLoadDataEx(CUmodule *module, const void *image, unsigned int numOptions, CUjit_option *options, void **optionValues);
+typedef CUresult  CUDAAPI tcuModuleLoadFatBinary(CUmodule *module, const void *fatCubin);
+typedef CUresult  CUDAAPI tcuModuleUnload(CUmodule hmod);
+typedef CUresult  CUDAAPI tcuModuleGetFunction(CUfunction *hfunc, CUmodule hmod, const char *name);
+
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult  CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, size_t *bytes, CUmodule hmod, const char *name);
+#else
+    typedef CUresult  CUDAAPI tcuModuleGetGlobal(CUdeviceptr *dptr, unsigned int *bytes, CUmodule hmod, const char *name);
+#endif
+
+typedef CUresult  CUDAAPI tcuModuleGetTexRef(CUtexref *pTexRef, CUmodule hmod, const char *name);
+typedef CUresult  CUDAAPI tcuModuleGetSurfRef(CUsurfref *pSurfRef, CUmodule hmod, const char *name);
+
+/************************************
+ **
+ **    Memory management
+ **
+ ***********************************/
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult CUDAAPI tcuMemGetInfo(size_t *free, size_t *total);
+    typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, size_t bytesize);
+    typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, size_t *psize, CUdeviceptr dptr);
+    typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
+                                              size_t *pPitch,
+                                              size_t WidthInBytes,
+                                              size_t Height,
+                                              // size of biggest r/w to be performed by kernels on this memory
+                                              // 4, 8 or 16 bytes
+                                              unsigned int ElementSizeBytes
+                                             );
+#else
+    typedef CUresult CUDAAPI tcuMemGetInfo(unsigned int *free, unsigned int *total);
+    typedef CUresult CUDAAPI tcuMemAlloc(CUdeviceptr *dptr, unsigned int bytesize);
+    typedef CUresult CUDAAPI tcuMemGetAddressRange(CUdeviceptr *pbase, unsigned int *psize, CUdeviceptr dptr);
+    typedef CUresult CUDAAPI tcuMemAllocPitch(CUdeviceptr *dptr,
+                                              unsigned int *pPitch,
+                                              unsigned int WidthInBytes,
+                                              unsigned int Height,
+                                              // size of biggest r/w to be performed by kernels on this memory
+                                              // 4, 8 or 16 bytes
+                                              unsigned int ElementSizeBytes
+                                             );
+#endif
+
+typedef CUresult CUDAAPI tcuMemFree(CUdeviceptr dptr);
+
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, size_t bytesize);
+#else
+    typedef CUresult CUDAAPI tcuMemAllocHost(void **pp, unsigned int bytesize);
+#endif
+
+typedef CUresult CUDAAPI tcuMemFreeHost(void *p);
+typedef CUresult CUDAAPI tcuMemHostAlloc(void **pp, size_t bytesize, unsigned int Flags);
+
+typedef CUresult CUDAAPI tcuMemHostGetDevicePointer(CUdeviceptr *pdptr, void *p, unsigned int Flags);
+typedef CUresult CUDAAPI tcuMemHostGetFlags(unsigned int *pFlags, void *p);
+
+typedef CUresult CUDAAPI tcuMemHostRegister(void *p, size_t bytesize, unsigned int Flags);
+typedef CUresult CUDAAPI tcuMemHostUnregister(void *p);;
+typedef CUresult CUDAAPI tcuMemcpy(CUdeviceptr dst, CUdeviceptr src, size_t ByteCount);
+typedef CUresult CUDAAPI tcuMemcpyPeer(CUdeviceptr dstDevice, CUcontext dstContext, CUdeviceptr srcDevice, CUcontext srcContext, size_t ByteCount);
+
+/************************************
+ **
+ **    Synchronous Memcpy
+ **
+ ** Intra-device memcpy's done with these functions may execute in parallel with the CPU,
+ ** but if host memory is involved, they wait until the copy is done before returning.
+ **
+ ***********************************/
+// 1D functions
+#if __CUDA_API_VERSION >= 3020
+    // system <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, size_t ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, size_t ByteCount);
+
+    // device <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, size_t ByteCount);
+
+    // device <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoA(CUarray dstArray, size_t dstOffset, CUdeviceptr srcDevice, size_t ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+
+    // system <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoA(CUarray dstArray, size_t dstOffset, const void *srcHost, size_t ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+
+    // array <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyAtoA(CUarray dstArray, size_t dstOffset, CUarray srcArray, size_t srcOffset, size_t ByteCount);
+#else
+    // system <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoD(CUdeviceptr dstDevice, const void *srcHost, unsigned int ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyDtoH(void *dstHost, CUdeviceptr srcDevice, unsigned int ByteCount);
+
+    // device <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoD(CUdeviceptr dstDevice, CUdeviceptr srcDevice, unsigned int ByteCount);
+
+    // device <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoA(CUarray dstArray, unsigned int dstOffset, CUdeviceptr srcDevice, unsigned int ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoD(CUdeviceptr dstDevice, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+
+    // system <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoA(CUarray dstArray, unsigned int dstOffset, const void *srcHost, unsigned int ByteCount);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoH(void *dstHost, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+
+    // array <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyAtoA(CUarray dstArray, unsigned int dstOffset, CUarray srcArray, unsigned int srcOffset, unsigned int ByteCount);
+#endif
+
+// 2D memcpy
+typedef CUresult  CUDAAPI tcuMemcpy2D(const CUDA_MEMCPY2D *pCopy);
+typedef CUresult  CUDAAPI tcuMemcpy2DUnaligned(const CUDA_MEMCPY2D *pCopy);
+
+// 3D memcpy
+typedef CUresult  CUDAAPI tcuMemcpy3D(const CUDA_MEMCPY3D *pCopy);
+
+/************************************
+ **
+ **    Asynchronous Memcpy
+ **
+ ** Any host memory involved must be DMA'able (e.g., allocated with cuMemAllocHost).
+ ** memcpy's done with these functions execute in parallel with the CPU and, if
+ ** the hardware is available, may execute in parallel with the GPU.
+ ** Asynchronous memcpy must be accompanied by appropriate stream synchronization.
+ **
+ ***********************************/
+
+// 1D functions
+#if __CUDA_API_VERSION >= 3020
+    // system <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
+                                                 const void *srcHost, size_t ByteCount, CUstream hStream);
+    typedef CUresult  CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
+                                                 CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
+
+    // device <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
+                                                 CUdeviceptr srcDevice, size_t ByteCount, CUstream hStream);
+
+    // system <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, size_t dstOffset,
+                                                 const void *srcHost, size_t ByteCount, CUstream hStream);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, size_t srcOffset,
+                                                 size_t ByteCount, CUstream hStream);
+#else
+    // system <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoDAsync(CUdeviceptr dstDevice,
+                                                 const void *srcHost, unsigned int ByteCount, CUstream hStream);
+    typedef CUresult  CUDAAPI tcuMemcpyDtoHAsync(void *dstHost,
+                                                 CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
+
+    // device <-> device memory
+    typedef CUresult  CUDAAPI tcuMemcpyDtoDAsync(CUdeviceptr dstDevice,
+                                                 CUdeviceptr srcDevice, unsigned int ByteCount, CUstream hStream);
+
+    // system <-> array memory
+    typedef CUresult  CUDAAPI tcuMemcpyHtoAAsync(CUarray dstArray, unsigned int dstOffset,
+                                                 const void *srcHost, unsigned int ByteCount, CUstream hStream);
+    typedef CUresult  CUDAAPI tcuMemcpyAtoHAsync(void *dstHost, CUarray srcArray, unsigned int srcOffset,
+                                                 unsigned int ByteCount, CUstream hStream);
+#endif
+
+// 2D memcpy
+typedef CUresult  CUDAAPI tcuMemcpy2DAsync(const CUDA_MEMCPY2D *pCopy, CUstream hStream);
+
+// 3D memcpy
+typedef CUresult  CUDAAPI tcuMemcpy3DAsync(const CUDA_MEMCPY3D *pCopy, CUstream hStream);
+
+/************************************
+ **
+ **    Memset
+ **
+ ***********************************/
+typedef CUresult  CUDAAPI tcuMemsetD8(CUdeviceptr dstDevice, unsigned char uc, unsigned int N);
+typedef CUresult  CUDAAPI tcuMemsetD16(CUdeviceptr dstDevice, unsigned short us, unsigned int N);
+typedef CUresult  CUDAAPI tcuMemsetD32(CUdeviceptr dstDevice, unsigned int ui, unsigned int N);
+
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult  CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, size_t Width, size_t Height);
+    typedef CUresult  CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, size_t Width, size_t Height);
+    typedef CUresult  CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, size_t Width, size_t Height);
+#else
+    typedef CUresult  CUDAAPI tcuMemsetD2D8(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned char uc, unsigned int Width, unsigned int Height);
+    typedef CUresult  CUDAAPI tcuMemsetD2D16(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned short us, unsigned int Width, unsigned int Height);
+    typedef CUresult  CUDAAPI tcuMemsetD2D32(CUdeviceptr dstDevice, unsigned int dstPitch, unsigned int ui, unsigned int Width, unsigned int Height);
+#endif
+
+/************************************
+ **
+ **    Function management
+ **
+ ***********************************/
+
+
+typedef CUresult CUDAAPI tcuFuncSetBlockShape(CUfunction hfunc, int x, int y, int z);
+typedef CUresult CUDAAPI tcuFuncSetSharedSize(CUfunction hfunc, unsigned int bytes);
+typedef CUresult CUDAAPI tcuFuncGetAttribute(int *pi, CUfunction_attribute attrib, CUfunction hfunc);
+typedef CUresult CUDAAPI tcuFuncSetCacheConfig(CUfunction hfunc, CUfunc_cache config);
+typedef CUresult CUDAAPI tcuLaunchKernel(CUfunction f,
+                                         unsigned int gridDimX,  unsigned int gridDimY,  unsigned int gridDimZ,
+                                         unsigned int blockDimX, unsigned int blockDimY, unsigned int blockDimZ,
+                                         unsigned int sharedMemBytes,
+                                         CUstream hStream, void **kernelParams, void **extra);
+
+/************************************
+ **
+ **    Array management
+ **
+ ***********************************/
+
+typedef CUresult  CUDAAPI tcuArrayCreate(CUarray *pHandle, const CUDA_ARRAY_DESCRIPTOR *pAllocateArray);
+typedef CUresult  CUDAAPI tcuArrayGetDescriptor(CUDA_ARRAY_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
+typedef CUresult  CUDAAPI tcuArrayDestroy(CUarray hArray);
+
+typedef CUresult  CUDAAPI tcuArray3DCreate(CUarray *pHandle, const CUDA_ARRAY3D_DESCRIPTOR *pAllocateArray);
+typedef CUresult  CUDAAPI tcuArray3DGetDescriptor(CUDA_ARRAY3D_DESCRIPTOR *pArrayDescriptor, CUarray hArray);
+
+
+/************************************
+ **
+ **    Texture reference management
+ **
+ ***********************************/
+typedef CUresult  CUDAAPI tcuTexRefCreate(CUtexref *pTexRef);
+typedef CUresult  CUDAAPI tcuTexRefDestroy(CUtexref hTexRef);
+
+typedef CUresult  CUDAAPI tcuTexRefSetArray(CUtexref hTexRef, CUarray hArray, unsigned int Flags);
+
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult  CUDAAPI tcuTexRefSetAddress(size_t *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, size_t bytes);
+    typedef CUresult  CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, size_t Pitch);
+#else
+    typedef CUresult  CUDAAPI tcuTexRefSetAddress(unsigned int *ByteOffset, CUtexref hTexRef, CUdeviceptr dptr, unsigned int bytes);
+    typedef CUresult  CUDAAPI tcuTexRefSetAddress2D(CUtexref hTexRef, const CUDA_ARRAY_DESCRIPTOR *desc, CUdeviceptr dptr, unsigned int Pitch);
+#endif
+
+typedef CUresult  CUDAAPI tcuTexRefSetFormat(CUtexref hTexRef, CUarray_format fmt, int NumPackedComponents);
+typedef CUresult  CUDAAPI tcuTexRefSetAddressMode(CUtexref hTexRef, int dim, CUaddress_mode am);
+typedef CUresult  CUDAAPI tcuTexRefSetFilterMode(CUtexref hTexRef, CUfilter_mode fm);
+typedef CUresult  CUDAAPI tcuTexRefSetFlags(CUtexref hTexRef, unsigned int Flags);
+
+typedef CUresult  CUDAAPI tcuTexRefGetAddress(CUdeviceptr *pdptr, CUtexref hTexRef);
+typedef CUresult  CUDAAPI tcuTexRefGetArray(CUarray *phArray, CUtexref hTexRef);
+typedef CUresult  CUDAAPI tcuTexRefGetAddressMode(CUaddress_mode *pam, CUtexref hTexRef, int dim);
+typedef CUresult  CUDAAPI tcuTexRefGetFilterMode(CUfilter_mode *pfm, CUtexref hTexRef);
+typedef CUresult  CUDAAPI tcuTexRefGetFormat(CUarray_format *pFormat, int *pNumChannels, CUtexref hTexRef);
+typedef CUresult  CUDAAPI tcuTexRefGetFlags(unsigned int *pFlags, CUtexref hTexRef);
+
+/************************************
+ **
+ **    Surface reference management
+ **
+ ***********************************/
+typedef CUresult  CUDAAPI tcuSurfRefSetArray(CUsurfref hSurfRef, CUarray hArray, unsigned int Flags);
+typedef CUresult  CUDAAPI tcuSurfRefGetArray(CUarray *phArray, CUsurfref hSurfRef);
+
+/************************************
+ **
+ **    Parameter management
+ **
+ ***********************************/
+
+typedef CUresult  CUDAAPI tcuParamSetSize(CUfunction hfunc, unsigned int numbytes);
+typedef CUresult  CUDAAPI tcuParamSeti(CUfunction hfunc, int offset, unsigned int value);
+typedef CUresult  CUDAAPI tcuParamSetf(CUfunction hfunc, int offset, float value);
+typedef CUresult  CUDAAPI tcuParamSetv(CUfunction hfunc, int offset, void *ptr, unsigned int numbytes);
+typedef CUresult  CUDAAPI tcuParamSetTexRef(CUfunction hfunc, int texunit, CUtexref hTexRef);
+
+
+/************************************
+ **
+ **    Launch functions
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuLaunch(CUfunction f);
+typedef CUresult CUDAAPI tcuLaunchGrid(CUfunction f, int grid_width, int grid_height);
+typedef CUresult CUDAAPI tcuLaunchGridAsync(CUfunction f, int grid_width, int grid_height, CUstream hStream);
+
+/************************************
+ **
+ **    Events
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuEventCreate(CUevent *phEvent, unsigned int Flags);
+typedef CUresult CUDAAPI tcuEventRecord(CUevent hEvent, CUstream hStream);
+typedef CUresult CUDAAPI tcuEventQuery(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventSynchronize(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventDestroy(CUevent hEvent);
+typedef CUresult CUDAAPI tcuEventElapsedTime(float *pMilliseconds, CUevent hStart, CUevent hEnd);
+
+/************************************
+ **
+ **    Streams
+ **
+ ***********************************/
+typedef CUresult CUDAAPI  tcuStreamCreate(CUstream *phStream, unsigned int Flags);
+typedef CUresult CUDAAPI  tcuStreamQuery(CUstream hStream);
+typedef CUresult CUDAAPI  tcuStreamSynchronize(CUstream hStream);
+typedef CUresult CUDAAPI  tcuStreamDestroy(CUstream hStream);
+
+/************************************
+ **
+ **    Graphics interop
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuGraphicsUnregisterResource(CUgraphicsResource resource);
+typedef CUresult CUDAAPI tcuGraphicsSubResourceGetMappedArray(CUarray *pArray, CUgraphicsResource resource, unsigned int arrayIndex, unsigned int mipLevel);
+
+#if __CUDA_API_VERSION >= 3020
+    typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, size_t *pSize, CUgraphicsResource resource);
+#else
+    typedef CUresult CUDAAPI tcuGraphicsResourceGetMappedPointer(CUdeviceptr *pDevPtr, unsigned int *pSize, CUgraphicsResource resource);
+#endif
+
+typedef CUresult CUDAAPI tcuGraphicsResourceSetMapFlags(CUgraphicsResource resource, unsigned int flags);
+typedef CUresult CUDAAPI tcuGraphicsMapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
+typedef CUresult CUDAAPI tcuGraphicsUnmapResources(unsigned int count, CUgraphicsResource *resources, CUstream hStream);
+
+/************************************
+ **
+ **    Export tables
+ **
+ ***********************************/
+typedef CUresult CUDAAPI tcuGetExportTable(const void **ppExportTable, const CUuuid *pExportTableId);
+
+/************************************
+ **
+ **    Limits
+ **
+ ***********************************/
+
+typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);
+typedef CUresult CUDAAPI tcuCtxGetLimit(size_t *pvalue, CUlimit limit);
+
+
+extern tcuDriverGetVersion             *cuDriverGetVersion;
+extern tcuDeviceGet                    *cuDeviceGet;
+extern tcuDeviceGetCount               *cuDeviceGetCount;
+extern tcuDeviceGetName                *cuDeviceGetName;
+extern tcuDeviceComputeCapability      *cuDeviceComputeCapability;
+extern tcuDeviceGetProperties          *cuDeviceGetProperties;
+extern tcuDeviceGetAttribute           *cuDeviceGetAttribute;
+extern tcuCtxDestroy                   *cuCtxDestroy;
+extern tcuCtxAttach                    *cuCtxAttach;
+extern tcuCtxDetach                    *cuCtxDetach;
+extern tcuCtxPushCurrent               *cuCtxPushCurrent;
+extern tcuCtxPopCurrent                *cuCtxPopCurrent;
+
+extern tcuCtxSetCurrent                *cuCtxSetCurrent;
+extern tcuCtxGetCurrent                *cuCtxGetCurrent;
+
+extern tcuCtxGetDevice                 *cuCtxGetDevice;
+extern tcuCtxSynchronize               *cuCtxSynchronize;
+extern tcuModuleLoad                   *cuModuleLoad;
+extern tcuModuleLoadData               *cuModuleLoadData;
+extern tcuModuleLoadDataEx             *cuModuleLoadDataEx;
+extern tcuModuleLoadFatBinary          *cuModuleLoadFatBinary;
+extern tcuModuleUnload                 *cuModuleUnload;
+extern tcuModuleGetFunction            *cuModuleGetFunction;
+extern tcuModuleGetTexRef              *cuModuleGetTexRef;
+extern tcuModuleGetSurfRef             *cuModuleGetSurfRef;
+extern tcuMemFreeHost                  *cuMemFreeHost;
+extern tcuMemHostAlloc                 *cuMemHostAlloc;
+extern tcuMemHostGetFlags              *cuMemHostGetFlags;
+
+extern tcuMemHostRegister              *cuMemHostRegister;
+extern tcuMemHostUnregister            *cuMemHostUnregister;
+extern tcuMemcpy                       *cuMemcpy;
+extern tcuMemcpyPeer                   *cuMemcpyPeer;
+
+extern tcuDeviceTotalMem               *cuDeviceTotalMem;
+extern tcuCtxCreate                    *cuCtxCreate;
+extern tcuModuleGetGlobal              *cuModuleGetGlobal;
+extern tcuMemGetInfo                   *cuMemGetInfo;
+extern tcuMemAlloc                     *cuMemAlloc;
+extern tcuMemAllocPitch                *cuMemAllocPitch;
+extern tcuMemFree                      *cuMemFree;
+extern tcuMemGetAddressRange           *cuMemGetAddressRange;
+extern tcuMemAllocHost                 *cuMemAllocHost;
+extern tcuMemHostGetDevicePointer      *cuMemHostGetDevicePointer;
+extern tcuFuncSetBlockShape            *cuFuncSetBlockShape;
+extern tcuFuncSetSharedSize            *cuFuncSetSharedSize;
+extern tcuFuncGetAttribute             *cuFuncGetAttribute;
+extern tcuFuncSetCacheConfig           *cuFuncSetCacheConfig;
+extern tcuLaunchKernel                 *cuLaunchKernel;
+extern tcuArrayDestroy                 *cuArrayDestroy;
+extern tcuTexRefCreate                 *cuTexRefCreate;
+extern tcuTexRefDestroy                *cuTexRefDestroy;
+extern tcuTexRefSetArray               *cuTexRefSetArray;
+extern tcuTexRefSetFormat              *cuTexRefSetFormat;
+extern tcuTexRefSetAddressMode         *cuTexRefSetAddressMode;
+extern tcuTexRefSetFilterMode          *cuTexRefSetFilterMode;
+extern tcuTexRefSetFlags               *cuTexRefSetFlags;
+extern tcuTexRefGetArray               *cuTexRefGetArray;
+extern tcuTexRefGetAddressMode         *cuTexRefGetAddressMode;
+extern tcuTexRefGetFilterMode          *cuTexRefGetFilterMode;
+extern tcuTexRefGetFormat              *cuTexRefGetFormat;
+extern tcuTexRefGetFlags               *cuTexRefGetFlags;
+extern tcuSurfRefSetArray              *cuSurfRefSetArray;
+extern tcuSurfRefGetArray              *cuSurfRefGetArray;
+extern tcuParamSetSize                 *cuParamSetSize;
+extern tcuParamSeti                    *cuParamSeti;
+extern tcuParamSetf                    *cuParamSetf;
+extern tcuParamSetv                    *cuParamSetv;
+extern tcuParamSetTexRef               *cuParamSetTexRef;
+extern tcuLaunch                       *cuLaunch;
+extern tcuLaunchGrid                   *cuLaunchGrid;
+extern tcuLaunchGridAsync              *cuLaunchGridAsync;
+extern tcuEventCreate                  *cuEventCreate;
+extern tcuEventRecord                  *cuEventRecord;
+extern tcuEventQuery                   *cuEventQuery;
+extern tcuEventSynchronize             *cuEventSynchronize;
+extern tcuEventDestroy                 *cuEventDestroy;
+extern tcuEventElapsedTime             *cuEventElapsedTime;
+extern tcuStreamCreate                 *cuStreamCreate;
+extern tcuStreamQuery                  *cuStreamQuery;
+extern tcuStreamSynchronize            *cuStreamSynchronize;
+extern tcuStreamDestroy                *cuStreamDestroy;
+extern tcuGraphicsUnregisterResource   *cuGraphicsUnregisterResource;
+extern tcuGraphicsSubResourceGetMappedArray  *cuGraphicsSubResourceGetMappedArray;
+extern tcuGraphicsResourceSetMapFlags  *cuGraphicsResourceSetMapFlags;
+extern tcuGraphicsMapResources         *cuGraphicsMapResources;
+extern tcuGraphicsUnmapResources       *cuGraphicsUnmapResources;
+extern tcuGetExportTable               *cuGetExportTable;
+extern tcuCtxSetLimit                  *cuCtxSetLimit;
+extern tcuCtxGetLimit                  *cuCtxGetLimit;
+
+// These functions could be using the CUDA 3.2 interface (_v2)
+extern tcuMemcpyHtoD                   *cuMemcpyHtoD;
+extern tcuMemcpyDtoH                   *cuMemcpyDtoH;
+extern tcuMemcpyDtoD                   *cuMemcpyDtoD;
+extern tcuMemcpyDtoA                   *cuMemcpyDtoA;
+extern tcuMemcpyAtoD                   *cuMemcpyAtoD;
+extern tcuMemcpyHtoA                   *cuMemcpyHtoA;
+extern tcuMemcpyAtoH                   *cuMemcpyAtoH;
+extern tcuMemcpyAtoA                   *cuMemcpyAtoA;
+extern tcuMemcpy2D                     *cuMemcpy2D;
+extern tcuMemcpy2DUnaligned            *cuMemcpy2DUnaligned;
+extern tcuMemcpy3D                     *cuMemcpy3D;
+extern tcuMemcpyHtoDAsync              *cuMemcpyHtoDAsync;
+extern tcuMemcpyDtoHAsync              *cuMemcpyDtoHAsync;
+extern tcuMemcpyDtoDAsync              *cuMemcpyDtoDAsync;
+extern tcuMemcpyHtoAAsync              *cuMemcpyHtoAAsync;
+extern tcuMemcpyAtoHAsync              *cuMemcpyAtoHAsync;
+extern tcuMemcpy2DAsync                *cuMemcpy2DAsync;
+extern tcuMemcpy3DAsync                *cuMemcpy3DAsync;
+extern tcuMemsetD8                     *cuMemsetD8;
+extern tcuMemsetD16                    *cuMemsetD16;
+extern tcuMemsetD32                    *cuMemsetD32;
+extern tcuMemsetD2D8                   *cuMemsetD2D8;
+extern tcuMemsetD2D16                  *cuMemsetD2D16;
+extern tcuMemsetD2D32                  *cuMemsetD2D32;
+extern tcuArrayCreate                  *cuArrayCreate;
+extern tcuArrayGetDescriptor           *cuArrayGetDescriptor;
+extern tcuArray3DCreate                *cuArray3DCreate;
+extern tcuArray3DGetDescriptor         *cuArray3DGetDescriptor;
+extern tcuTexRefSetAddress             *cuTexRefSetAddress;
+extern tcuTexRefSetAddress2D           *cuTexRefSetAddress2D;
+extern tcuTexRefGetAddress             *cuTexRefGetAddress;
+extern tcuGraphicsResourceGetMappedPointer   *cuGraphicsResourceGetMappedPointer;
+
+/************************************/
+CUresult CUDAAPI cuInit   (unsigned int, int cudaVersion);
+void CUDAAPI cuUninit();
+/************************************/
+
+
+#ifndef __CUDA_API_VERSION
+#define __CUDA_API_VERSION 4000
+#endif
+
+
+#include <gpac/setup.h>
+#include "../../src/compositor/gl_inc.h"
+
+/**
+ * \file dynlink_cudaGL.h
+ * \brief Header file for the OpenGL interoperability functions of the
+ * low-level CUDA driver application programming interface.
+ */
+
+/**
+ * \defgroup CUDA_GL OpenGL Interoperability
+ * \ingroup CUDA_DRIVER
+ *
+ * ___MANBRIEF___ OpenGL interoperability functions of the low-level CUDA
+ * driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
+ *
+ * This section describes the OpenGL interoperability functions of the
+ * low-level CUDA driver application programming interface. Note that mapping 
+ * of OpenGL resources is performed with the graphics API agnostic, resource 
+ * mapping interface described in \ref CUDA_GRAPHICS "Graphics Interoperability".
+ *
+ * @{
+ */
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#if !defined(WGL_NV_gpu_affinity)
+typedef void* HGPUNV;
+#endif
+#endif /* _WIN32 */
+
+typedef CUresult CUDAAPI tcuGraphicsGLRegisterBuffer(CUgraphicsResource *pCudaResource, GLuint buffer, unsigned int Flags);
+typedef CUresult CUDAAPI tcuGraphicsGLRegisterImage(CUgraphicsResource *pCudaResource, GLuint image, GLenum target, unsigned int Flags);
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+typedef CUresult CUDAAPI tcuWGLGetDevice(CUdevice *pDevice, HGPUNV hGpu);
+#endif /* _WIN32 */
+
+/**
+ * CUDA devices corresponding to an OpenGL device
+ */
+typedef enum {
+    CU_GL_DEVICE_LIST_ALL            = 0x01, /**< The CUDA devices for all GPUs used by the current OpenGL context */
+    CU_GL_DEVICE_LIST_CURRENT_FRAME  = 0x02, /**< The CUDA devices for the GPUs used by the current OpenGL context in its currently rendering frame */
+    CU_GL_DEVICE_LIST_NEXT_FRAME     = 0x03, /**< The CUDA devices for the GPUs to be used by the current OpenGL context in the next frame */
+} CUGLDeviceList;
+
+#if __CUDA_API_VERSION >= 6050
+typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
+#endif /* __CUDA_API_VERSION >= 6050 */
+
+/**
+ * \defgroup CUDA_GL_DEPRECATED OpenGL Interoperability [DEPRECATED]
+ *
+ * ___MANBRIEF___ deprecated OpenGL interoperability functions of the low-level
+ * CUDA driver API (___CURRENT_FILE___) ___ENDMANBRIEF___
+ *
+ * This section describes deprecated OpenGL interoperability functionality.
+ *
+ * @{
+ */
+
+/** Flags to map or unmap a resource */
+typedef enum CUGLmap_flags_enum {
+    CU_GL_MAP_RESOURCE_FLAGS_NONE          = 0x00,
+    CU_GL_MAP_RESOURCE_FLAGS_READ_ONLY     = 0x01,
+    CU_GL_MAP_RESOURCE_FLAGS_WRITE_DISCARD = 0x02,    
+} CUGLmap_flags;
+
+//#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLCtxCreate(CUcontext *pCtx, unsigned int Flags, CUdevice device);
+//#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLInit(void);
+typedef CUresult CUDAAPI tcuGLRegisterBufferObject(GLuint buffer);
+
+#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLMapBufferObject(CUdeviceptr *dptr, size_t *size, GLuint buffer);
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLUnmapBufferObject(GLuint buffer);
+typedef CUresult CUDAAPI tcuGLUnregisterBufferObject(GLuint buffer);
+typedef CUresult CUDAAPI tcuGLSetBufferObjectMapFlags(GLuint buffer, unsigned int Flags);
+
+#if __CUDA_API_VERSION >= 3020
+typedef CUresult CUDAAPI tcuGLMapBufferObjectAsync(CUdeviceptr *dptr, size_t *size, GLuint buffer, CUstream hStream);
+#endif /* __CUDA_API_VERSION >= 3020 */
+
+typedef CUresult CUDAAPI tcuGLUnmapBufferObjectAsync(GLuint buffer, CUstream hStream);
+typedef CUresult CUDAAPI tcuGLGetDevices(unsigned int *pCudaDeviceCount, CUdevice *pCudaDevices, unsigned int cudaDeviceCount, CUGLDeviceList deviceList);
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+extern tcuWGLGetDevice                 *cuWGLGetDevice;
+#endif
+
+extern tcuGLCtxCreate                  *cuGLCtxCreate;
+extern tcuGLCtxCreate                  *cuGLCtxCreate_v2;
+extern tcuGLMapBufferObject            *cuGLMapBufferObject;
+extern tcuGLMapBufferObject            *cuGLMapBufferObject_v2;
+extern tcuGLMapBufferObjectAsync       *cuGLMapBufferObjectAsync;
+
+#if __CUDA_API_VERSION >= 6050
+extern tcuGLGetDevices                 *cuGLGetDevices;
+#endif
+
+extern tcuGraphicsGLRegisterBuffer     *cuGraphicsGLRegisterBuffer;
+extern tcuGraphicsGLRegisterImage      *cuGraphicsGLRegisterImage;
+extern tcuGLSetBufferObjectMapFlags    *cuGLSetBufferObjectMapFlags;
+extern tcuGLRegisterBufferObject       *cuGLRegisterBufferObject;
+
+extern tcuGLUnmapBufferObject          *cuGLUnmapBufferObject;
+extern tcuGLUnmapBufferObjectAsync     *cuGLUnmapBufferObjectAsync;
+
+extern tcuGLUnregisterBufferObject     *cuGLUnregisterBufferObject;
+extern tcuGLGetDevices                 *cuGLGetDevices; // CUDA 6.5 only
+
+
+#if defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64)
+#include <Windows.h>
+typedef HMODULE CUDADRIVER;
+#else
+typedef void *CUDADRIVER;
+#endif
+
+
+
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+#if (CUDA_VERSION >= 3020) && (!defined(CUDA_FORCE_API_VERSION) || (CUDA_FORCE_API_VERSION >= 3020))
+#define __CUVID_DEVPTR64
+#endif
+#endif
+
+
+typedef void *CUvideodecoder;
+typedef struct _CUcontextlock_st *CUvideoctxlock;
+
+/**
+ * \addtogroup VIDEO_DECODER Video Decoder
+ * @{
+ */
+
+/*!
+ * \enum cudaVideoCodec
+ * Video Codec Enums
+ */
+typedef enum cudaVideoCodec_enum {
+    cudaVideoCodec_MPEG1=0,                 /**<  MPEG1   */
+    cudaVideoCodec_MPEG2,                   /**<  MPEG2  */
+    cudaVideoCodec_MPEG4,                   /**<  MPEG4   */
+    cudaVideoCodec_VC1,                     /**<  VC1   */
+    cudaVideoCodec_H264,                    /**<  H264   */
+    cudaVideoCodec_JPEG,                    /**<  JPEG   */
+    cudaVideoCodec_H264_SVC,                /**<  H264-SVC   */
+    cudaVideoCodec_H264_MVC,                /**<  H264-MVC   */
+    cudaVideoCodec_HEVC,                    /**<  HEVC   */
+    cudaVideoCodec_VP8,                     /**<  VP8   */
+    cudaVideoCodec_VP9,                     /**<  VP9   */
+    cudaVideoCodec_NumCodecs,               /**<  Max COdecs   */
+    // Uncompressed YUV
+    cudaVideoCodec_YUV420 = (('I'<<24)|('Y'<<16)|('U'<<8)|('V')),   /**< Y,U,V (4:2:0)  */
+    cudaVideoCodec_YV12   = (('Y'<<24)|('V'<<16)|('1'<<8)|('2')),   /**< Y,V,U (4:2:0)  */
+    cudaVideoCodec_NV12   = (('N'<<24)|('V'<<16)|('1'<<8)|('2')),   /**< Y,UV  (4:2:0)  */
+    cudaVideoCodec_YUYV   = (('Y'<<24)|('U'<<16)|('Y'<<8)|('V')),   /**< YUYV/YUY2 (4:2:2)  */
+    cudaVideoCodec_UYVY   = (('U'<<24)|('Y'<<16)|('V'<<8)|('Y'))    /**< UYVY (4:2:2)  */
+} cudaVideoCodec;
+
+/*!
+ * \enum cudaVideoSurfaceFormat
+ * Video Surface Formats Enums
+ */
+typedef enum cudaVideoSurfaceFormat_enum {
+    cudaVideoSurfaceFormat_NV12=0,       /**< NV12 (currently the only supported output format)  */
+	cudaVideoSurfaceFormat_P016=1
+} cudaVideoSurfaceFormat;
+
+/*!
+ * \enum cudaVideoDeinterlaceMode
+ * Deinterlacing Modes Enums
+ */
+typedef enum cudaVideoDeinterlaceMode_enum {
+    cudaVideoDeinterlaceMode_Weave=0,   /**< Weave both fields (no deinterlacing) */
+    cudaVideoDeinterlaceMode_Bob,       /**< Drop one field  */
+    cudaVideoDeinterlaceMode_Adaptive   /**< Adaptive deinterlacing  */
+} cudaVideoDeinterlaceMode;
+
+/*!
+ * \enum cudaVideoChromaFormat
+ * Chroma Formats Enums
+ */
+typedef enum cudaVideoChromaFormat_enum {
+    cudaVideoChromaFormat_Monochrome=0,  /**< MonoChrome */
+    cudaVideoChromaFormat_420,           /**< 4:2:0 */
+    cudaVideoChromaFormat_422,           /**< 4:2:2 */
+    cudaVideoChromaFormat_444            /**< 4:4:4 */
+} cudaVideoChromaFormat;
+
+/*!
+ * \enum cudaVideoCreateFlags
+ * Decoder Flags Enums
+ */
+typedef enum cudaVideoCreateFlags_enum {
+    cudaVideoCreate_Default = 0x00,     /**< Default operation mode: use dedicated video engines */
+    cudaVideoCreate_PreferCUDA = 0x01,  /**< Use a CUDA-based decoder if faster than dedicated engines (requires a valid vidLock object for multi-threading) */
+    cudaVideoCreate_PreferDXVA = 0x02,  /**< Go through DXVA internally if possible (requires D3D9 interop) */
+    cudaVideoCreate_PreferCUVID = 0x04  /**< Use dedicated video engines directly */
+} cudaVideoCreateFlags;
+
+/*!
+ * \struct CUVIDDECODECREATEINFO
+ * Struct used in create decoder
+ */
+typedef struct _CUVIDDECODECREATEINFO
+{
+    unsigned long ulWidth;              /**< Coded Sequence Width */
+    unsigned long ulHeight;             /**< Coded Sequence Height */
+    unsigned long ulNumDecodeSurfaces;  /**< Maximum number of internal decode surfaces */
+    cudaVideoCodec CodecType;           /**< cudaVideoCodec_XXX */
+    cudaVideoChromaFormat ChromaFormat; /**< cudaVideoChromaFormat_XXX (only 4:2:0 is currently supported) */
+    unsigned long ulCreationFlags;      /**< Decoder creation flags (cudaVideoCreateFlags_XXX) */
+    unsigned long bitDepthMinus8;
+    unsigned long Reserved1[4];         /**< Reserved for future use - set to zero */
+    /**
+    * area of the frame that should be displayed
+    */
+    struct {
+        short left;
+        short top;
+        short right;
+        short bottom;
+    } display_area;
+
+    cudaVideoSurfaceFormat OutputFormat;       /**< cudaVideoSurfaceFormat_XXX */
+    cudaVideoDeinterlaceMode DeinterlaceMode;  /**< cudaVideoDeinterlaceMode_XXX */
+    unsigned long ulTargetWidth;               /**< Post-processed Output Width (Should be aligned to 2) */
+    unsigned long ulTargetHeight;              /**< Post-processed Output Height (Should be aligbed to 2) */
+    unsigned long ulNumOutputSurfaces;         /**< Maximum number of output surfaces simultaneously mapped */
+    CUvideoctxlock vidLock;                    /**< If non-NULL, context lock used for synchronizing ownership of the cuda context */
+    /**
+    * target rectangle in the output frame (for aspect ratio conversion)
+    * if a null rectangle is specified, {0,0,ulTargetWidth,ulTargetHeight} will be used
+    */
+    struct {
+        short left;
+        short top;
+        short right;
+        short bottom;
+    } target_rect;
+    unsigned long Reserved2[5];                /**< Reserved for future use - set to zero */
+} CUVIDDECODECREATEINFO;
+
+/*!
+ * \struct CUVIDH264DPBENTRY
+ * H.264 DPB Entry
+ */
+typedef struct _CUVIDH264DPBENTRY
+{
+    int PicIdx;                 /**< picture index of reference frame */
+    int FrameIdx;               /**< frame_num(short-term) or LongTermFrameIdx(long-term) */
+    int is_long_term;           /**< 0=short term reference, 1=long term reference */
+    int not_existing;           /**< non-existing reference frame (corresponding PicIdx should be set to -1) */
+    int used_for_reference;     /**< 0=unused, 1=top_field, 2=bottom_field, 3=both_fields */
+    int FieldOrderCnt[2];       /**< field order count of top and bottom fields */
+} CUVIDH264DPBENTRY;
+
+/*!
+ * \struct CUVIDH264MVCEXT
+ * H.264 MVC Picture Parameters Ext
+ */
+typedef struct _CUVIDH264MVCEXT
+{
+    int num_views_minus1;
+    int view_id;
+    unsigned char inter_view_flag;
+    unsigned char num_inter_view_refs_l0;
+    unsigned char num_inter_view_refs_l1;
+    unsigned char MVCReserved8Bits;
+    int InterViewRefsL0[16];
+    int InterViewRefsL1[16];
+} CUVIDH264MVCEXT;
+
+/*!
+ * \struct CUVIDH264SVCEXT
+ * H.264 SVC Picture Parameters Ext
+ */
+typedef struct _CUVIDH264SVCEXT
+{
+    unsigned char profile_idc;
+    unsigned char level_idc;
+    unsigned char DQId;
+    unsigned char DQIdMax;
+    unsigned char disable_inter_layer_deblocking_filter_idc;
+    unsigned char ref_layer_chroma_phase_y_plus1;
+    signed char   inter_layer_slice_alpha_c0_offset_div2;
+    signed char   inter_layer_slice_beta_offset_div2;
+
+    unsigned short DPBEntryValidFlag;
+    unsigned char inter_layer_deblocking_filter_control_present_flag;
+    unsigned char extended_spatial_scalability_idc;
+    unsigned char adaptive_tcoeff_level_prediction_flag;
+    unsigned char slice_header_restriction_flag;
+    unsigned char chroma_phase_x_plus1_flag;
+    unsigned char chroma_phase_y_plus1;
+
+    unsigned char tcoeff_level_prediction_flag;
+    unsigned char constrained_intra_resampling_flag;
+    unsigned char ref_layer_chroma_phase_x_plus1_flag;
+    unsigned char store_ref_base_pic_flag;
+    unsigned char Reserved8BitsA;
+    unsigned char Reserved8BitsB;
+    // For the 4 scaled_ref_layer_XX fields below,
+    // if (extended_spatial_scalability_idc == 1), SPS field, G.7.3.2.1.4, add prefix "seq_"
+    // if (extended_spatial_scalability_idc == 2), SLH field, G.7.3.3.4,
+    short scaled_ref_layer_left_offset;
+    short scaled_ref_layer_top_offset;
+    short scaled_ref_layer_right_offset;
+    short scaled_ref_layer_bottom_offset;
+    unsigned short Reserved16Bits;
+    struct _CUVIDPICPARAMS *pNextLayer; /**< Points to the picparams for the next layer to be decoded. Linked list ends at the target layer. */
+    int bRefBaseLayer;                  /**< whether to store ref base pic */
+} CUVIDH264SVCEXT;
+
+/*!
+ * \struct CUVIDH264PICPARAMS
+ * H.264 Picture Parameters
+ */
+typedef struct _CUVIDH264PICPARAMS
+{
+    // SPS
+    int log2_max_frame_num_minus4;
+    int pic_order_cnt_type;
+    int log2_max_pic_order_cnt_lsb_minus4;
+    int delta_pic_order_always_zero_flag;
+    int frame_mbs_only_flag;
+    int direct_8x8_inference_flag;
+    int num_ref_frames;             // NOTE: shall meet level 4.1 restrictions
+    unsigned char residual_colour_transform_flag;
+    unsigned char bit_depth_luma_minus8;    // Must be 0 (only 8-bit supported)
+    unsigned char bit_depth_chroma_minus8;  // Must be 0 (only 8-bit supported)
+    unsigned char qpprime_y_zero_transform_bypass_flag;
+    // PPS
+    int entropy_coding_mode_flag;
+    int pic_order_present_flag;
+    int num_ref_idx_l0_active_minus1;
+    int num_ref_idx_l1_active_minus1;
+    int weighted_pred_flag;
+    int weighted_bipred_idc;
+    int pic_init_qp_minus26;
+    int deblocking_filter_control_present_flag;
+    int redundant_pic_cnt_present_flag;
+    int transform_8x8_mode_flag;
+    int MbaffFrameFlag;
+    int constrained_intra_pred_flag;
+    int chroma_qp_index_offset;
+    int second_chroma_qp_index_offset;
+    int ref_pic_flag;
+    int frame_num;
+    int CurrFieldOrderCnt[2];
+    // DPB
+    CUVIDH264DPBENTRY dpb[16];          // List of reference frames within the DPB
+    // Quantization Matrices (raster-order)
+    unsigned char WeightScale4x4[6][16];
+    unsigned char WeightScale8x8[2][64];
+    // FMO/ASO
+    unsigned char fmo_aso_enable;
+    unsigned char num_slice_groups_minus1;
+    unsigned char slice_group_map_type;
+    signed char pic_init_qs_minus26;
+    unsigned int slice_group_change_rate_minus1;
+    union
+    {
+        unsigned long long slice_group_map_addr;
+        const unsigned char *pMb2SliceGroupMap;
+    } fmo;
+    unsigned int  Reserved[12];
+    // SVC/MVC
+    union
+    {
+        CUVIDH264MVCEXT mvcext;
+        CUVIDH264SVCEXT svcext;
+    };
+} CUVIDH264PICPARAMS;
+
+
+/*!
+ * \struct CUVIDMPEG2PICPARAMS
+ * MPEG-2 Picture Parameters
+ */
+typedef struct _CUVIDMPEG2PICPARAMS
+{
+    int ForwardRefIdx;          // Picture index of forward reference (P/B-frames)
+    int BackwardRefIdx;         // Picture index of backward reference (B-frames)
+    int picture_coding_type;
+    int full_pel_forward_vector;
+    int full_pel_backward_vector;
+    int f_code[2][2];
+    int intra_dc_precision;
+    int frame_pred_frame_dct;
+    int concealment_motion_vectors;
+    int q_scale_type;
+    int intra_vlc_format;
+    int alternate_scan;
+    int top_field_first;
+    // Quantization matrices (raster order)
+    unsigned char QuantMatrixIntra[64];
+    unsigned char QuantMatrixInter[64];
+} CUVIDMPEG2PICPARAMS;
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// MPEG-4 Picture Parameters
+//
+
+// MPEG-4 has VOP types instead of Picture types
+#define I_VOP 0
+#define P_VOP 1
+#define B_VOP 2
+#define S_VOP 3
+
+/*!
+ * \struct CUVIDMPEG4PICPARAMS
+ * MPEG-4 Picture Parameters
+ */
+typedef struct _CUVIDMPEG4PICPARAMS
+{
+    int ForwardRefIdx;          // Picture index of forward reference (P/B-frames)
+    int BackwardRefIdx;         // Picture index of backward reference (B-frames)
+    // VOL
+    int video_object_layer_width;
+    int video_object_layer_height;
+    int vop_time_increment_bitcount;
+    int top_field_first;
+    int resync_marker_disable;
+    int quant_type;
+    int quarter_sample;
+    int short_video_header;
+    int divx_flags;
+    // VOP
+    int vop_coding_type;
+    int vop_coded;
+    int vop_rounding_type;
+    int alternate_vertical_scan_flag;
+    int interlaced;
+    int vop_fcode_forward;
+    int vop_fcode_backward;
+    int trd[2];
+    int trb[2];
+    // Quantization matrices (raster order)
+    unsigned char QuantMatrixIntra[64];
+    unsigned char QuantMatrixInter[64];
+    int gmc_enabled;
+} CUVIDMPEG4PICPARAMS;
+
+/*!
+ * \struct CUVIDVC1PICPARAMS
+ * VC1 Picture Parameters
+ */
+typedef struct _CUVIDVC1PICPARAMS
+{
+    int ForwardRefIdx;      /**< Picture index of forward reference (P/B-frames) */
+    int BackwardRefIdx;     /**< Picture index of backward reference (B-frames) */
+    int FrameWidth;         /**< Actual frame width */
+    int FrameHeight;        /**< Actual frame height */
+    // PICTURE
+    int intra_pic_flag;     /**< Set to 1 for I,BI frames */
+    int ref_pic_flag;       /**< Set to 1 for I,P frames */
+    int progressive_fcm;    /**< Progressive frame */
+    // SEQUENCE
+    int profile;
+    int postprocflag;
+    int pulldown;
+    int interlace;
+    int tfcntrflag;
+    int finterpflag;
+    int psf;
+    int multires;
+    int syncmarker;
+    int rangered;
+    int maxbframes;
+    // ENTRYPOINT
+    int panscan_flag;
+    int refdist_flag;
+    int extended_mv;
+    int dquant;
+    int vstransform;
+    int loopfilter;
+    int fastuvmc;
+    int overlap;
+    int quantizer;
+    int extended_dmv;
+    int range_mapy_flag;
+    int range_mapy;
+    int range_mapuv_flag;
+    int range_mapuv;
+    int rangeredfrm;    // range reduction state
+} CUVIDVC1PICPARAMS;
+
+/*!
+ * \struct CUVIDJPEGPICPARAMS
+ * JPEG Picture Parameters
+ */
+typedef struct _CUVIDJPEGPICPARAMS
+{
+    int Reserved;
+} CUVIDJPEGPICPARAMS;
+
+
+ /*!
+ * \struct CUVIDHEVCPICPARAMS
+ * HEVC Picture Parameters
+ */
+typedef struct _CUVIDHEVCPICPARAMS
+{
+    // sps
+    int pic_width_in_luma_samples;
+    int pic_height_in_luma_samples;
+    unsigned char log2_min_luma_coding_block_size_minus3;
+    unsigned char log2_diff_max_min_luma_coding_block_size;
+    unsigned char log2_min_transform_block_size_minus2;
+    unsigned char log2_diff_max_min_transform_block_size;
+    unsigned char pcm_enabled_flag;
+    unsigned char log2_min_pcm_luma_coding_block_size_minus3;
+    unsigned char log2_diff_max_min_pcm_luma_coding_block_size;
+    unsigned char pcm_sample_bit_depth_luma_minus1;
+
+    unsigned char pcm_sample_bit_depth_chroma_minus1;
+    unsigned char pcm_loop_filter_disabled_flag;
+    unsigned char strong_intra_smoothing_enabled_flag;
+    unsigned char max_transform_hierarchy_depth_intra;
+    unsigned char max_transform_hierarchy_depth_inter;
+    unsigned char amp_enabled_flag;
+    unsigned char separate_colour_plane_flag;
+    unsigned char log2_max_pic_order_cnt_lsb_minus4;
+
+    unsigned char num_short_term_ref_pic_sets;
+    unsigned char long_term_ref_pics_present_flag;
+    unsigned char num_long_term_ref_pics_sps;
+    unsigned char sps_temporal_mvp_enabled_flag;
+    unsigned char sample_adaptive_offset_enabled_flag;
+    unsigned char scaling_list_enable_flag;
+    unsigned char IrapPicFlag;
+    unsigned char IdrPicFlag;
+
+    unsigned char bit_depth_luma_minus8;
+    unsigned char bit_depth_chroma_minus8;
+    unsigned char reserved1[14];
+
+    // pps
+    unsigned char dependent_slice_segments_enabled_flag;
+    unsigned char slice_segment_header_extension_present_flag;
+    unsigned char sign_data_hiding_enabled_flag;
+    unsigned char cu_qp_delta_enabled_flag;
+    unsigned char diff_cu_qp_delta_depth;
+    signed char init_qp_minus26;
+    signed char pps_cb_qp_offset;
+    signed char pps_cr_qp_offset;
+
+    unsigned char constrained_intra_pred_flag;
+    unsigned char weighted_pred_flag;
+    unsigned char weighted_bipred_flag;
+    unsigned char transform_skip_enabled_flag;
+    unsigned char transquant_bypass_enabled_flag;
+    unsigned char entropy_coding_sync_enabled_flag;
+    unsigned char log2_parallel_merge_level_minus2;
+    unsigned char num_extra_slice_header_bits;
+
+    unsigned char loop_filter_across_tiles_enabled_flag;
+    unsigned char loop_filter_across_slices_enabled_flag;
+    unsigned char output_flag_present_flag;
+    unsigned char num_ref_idx_l0_default_active_minus1;
+    unsigned char num_ref_idx_l1_default_active_minus1;
+    unsigned char lists_modification_present_flag;
+    unsigned char cabac_init_present_flag;
+    unsigned char pps_slice_chroma_qp_offsets_present_flag;
+
+    unsigned char deblocking_filter_override_enabled_flag;
+    unsigned char pps_deblocking_filter_disabled_flag;
+    signed char pps_beta_offset_div2;
+    signed char pps_tc_offset_div2;
+    unsigned char tiles_enabled_flag;
+    unsigned char uniform_spacing_flag;
+    unsigned char num_tile_columns_minus1;
+    unsigned char num_tile_rows_minus1;
+
+    unsigned short column_width_minus1[21];
+    unsigned short row_height_minus1[21];
+    unsigned int reserved3[15];
+
+    // RefPicSets
+    int NumBitsForShortTermRPSInSlice;
+    int NumDeltaPocsOfRefRpsIdx;
+    int NumPocTotalCurr;
+    int NumPocStCurrBefore;
+    int NumPocStCurrAfter;
+    int NumPocLtCurr;
+    int CurrPicOrderCntVal;
+    int RefPicIdx[16];                  // [refpic] Indices of valid reference pictures (-1 if unused for reference)
+    int PicOrderCntVal[16];             // [refpic]
+    unsigned char IsLongTerm[16];       // [refpic] 0=not a long-term reference, 1=long-term reference
+    unsigned char RefPicSetStCurrBefore[8]; // [0..NumPocStCurrBefore-1] -> refpic (0..15)
+    unsigned char RefPicSetStCurrAfter[8];  // [0..NumPocStCurrAfter-1] -> refpic (0..15)
+    unsigned char RefPicSetLtCurr[8];       // [0..NumPocLtCurr-1] -> refpic (0..15)
+    unsigned char RefPicSetInterLayer0[8];
+    unsigned char RefPicSetInterLayer1[8];
+    unsigned int reserved4[12];
+
+    // scaling lists (diag order)
+    unsigned char ScalingList4x4[6][16];       // [matrixId][i]
+    unsigned char ScalingList8x8[6][64];       // [matrixId][i]
+    unsigned char ScalingList16x16[6][64];     // [matrixId][i]
+    unsigned char ScalingList32x32[2][64];     // [matrixId][i]
+    unsigned char ScalingListDCCoeff16x16[6];  // [matrixId]
+    unsigned char ScalingListDCCoeff32x32[2];  // [matrixId]
+} CUVIDHEVCPICPARAMS;
+
+
+/*!
+ * \struct CUVIDVP8PICPARAMS
+ * VP8 Picture Parameters
+ */
+typedef struct _CUVIDVP8PICPARAMS
+{
+    int width;
+    int height;
+    unsigned int first_partition_size;
+    //Frame Indexes
+    unsigned char LastRefIdx;
+    unsigned char GoldenRefIdx;
+    unsigned char AltRefIdx;
+    union {
+        struct {
+            unsigned char frame_type : 1;    /**< 0 = KEYFRAME, 1 = INTERFRAME  */
+            unsigned char version : 3;
+            unsigned char show_frame : 1;
+            unsigned char update_mb_segmentation_data : 1;    /**< Must be 0 if segmentation is not enabled */
+            unsigned char Reserved2Bits : 2;
+        };
+        unsigned char wFrameTagFlags;
+    };
+    unsigned char Reserved1[4];
+    unsigned int  Reserved2[3];
+} CUVIDVP8PICPARAMS;
+
+/*!
+ * \struct CUVIDVP9PICPARAMS
+ * VP9 Picture Parameters
+ */
+typedef struct _CUVIDVP9PICPARAMS
+{
+    unsigned int width;
+    unsigned int height;
+
+    //Frame Indices
+    unsigned char LastRefIdx;
+    unsigned char GoldenRefIdx;
+    unsigned char AltRefIdx;
+    unsigned char colorSpace;
+
+    unsigned short profile : 3;
+    unsigned short frameContextIdx : 2;
+    unsigned short frameType : 1;
+    unsigned short showFrame : 1;
+    unsigned short errorResilient : 1;
+    unsigned short frameParallelDecoding : 1;
+    unsigned short subSamplingX : 1;
+    unsigned short subSamplingY : 1;
+    unsigned short intraOnly : 1;
+    unsigned short allow_high_precision_mv : 1;
+    unsigned short refreshEntropyProbs : 1;
+    unsigned short reserved2Bits : 2;
+
+    unsigned short reserved16Bits;
+
+    unsigned char  refFrameSignBias[4];
+
+    unsigned char bitDepthMinus8Luma;
+    unsigned char bitDepthMinus8Chroma;
+    unsigned char loopFilterLevel;
+    unsigned char loopFilterSharpness;
+
+    unsigned char modeRefLfEnabled;
+    unsigned char log2_tile_columns;
+    unsigned char log2_tile_rows;
+
+    unsigned char segmentEnabled : 1;
+    unsigned char segmentMapUpdate : 1;
+    unsigned char segmentMapTemporalUpdate : 1;
+    unsigned char segmentFeatureMode : 1;
+    unsigned char reserved4Bits : 4;
+
+
+    unsigned char segmentFeatureEnable[8][4];
+    short segmentFeatureData[8][4];
+    unsigned char mb_segment_tree_probs[7];
+    unsigned char segment_pred_probs[3];
+    unsigned char reservedSegment16Bits[2];
+
+    int qpYAc;
+    int qpYDc;
+    int qpChDc;
+    int qpChAc;
+
+    unsigned int activeRefIdx[3];
+    unsigned int resetFrameContext;
+    unsigned int mcomp_filter_type;
+    unsigned int mbRefLfDelta[4];
+    unsigned int mbModeLfDelta[2];
+    unsigned int frameTagSize;
+    unsigned int offsetToDctParts;
+    unsigned int reserved128Bits[4];
+
+} CUVIDVP9PICPARAMS;
+
+
+/*!
+ * \struct CUVIDPICPARAMS
+ * Picture Parameters for Decoding
+ */
+typedef struct _CUVIDPICPARAMS
+{
+    int PicWidthInMbs;                    /**< Coded Frame Size */
+    int FrameHeightInMbs;                 /**< Coded Frame Height */
+    int CurrPicIdx;                       /**< Output index of the current picture */
+    int field_pic_flag;                   /**< 0=frame picture, 1=field picture */
+    int bottom_field_flag;                /**< 0=top field, 1=bottom field (ignored if field_pic_flag=0) */
+    int second_field;                     /**< Second field of a complementary field pair */
+    // Bitstream data
+    unsigned int nBitstreamDataLen;        /**< Number of bytes in bitstream data buffer */
+    const unsigned char *pBitstreamData;   /**< Ptr to bitstream data for this picture (slice-layer) */
+    unsigned int nNumSlices;               /**< Number of slices in this picture */
+    const unsigned int *pSliceDataOffsets; /**< nNumSlices entries, contains offset of each slice within the bitstream data buffer */
+    int ref_pic_flag;                      /**< This picture is a reference picture */
+    int intra_pic_flag;                    /**< This picture is entirely intra coded */
+    unsigned int Reserved[30];             /**< Reserved for future use */
+    // Codec-specific data
+    union {
+        CUVIDMPEG2PICPARAMS mpeg2;         /**< Also used for MPEG-1 */
+        CUVIDH264PICPARAMS h264;
+        CUVIDVC1PICPARAMS vc1;
+        CUVIDMPEG4PICPARAMS mpeg4;
+        CUVIDJPEGPICPARAMS jpeg;
+        CUVIDHEVCPICPARAMS hevc;
+        CUVIDVP8PICPARAMS vp8;
+        CUVIDVP9PICPARAMS vp9;
+        unsigned int CodecReserved[1024];
+    } CodecSpecific;
+} CUVIDPICPARAMS;
+
+
+/*!
+ * \struct CUVIDPROCPARAMS
+ * Picture Parameters for Postprocessing
+ */
+typedef struct _CUVIDPROCPARAMS
+{
+    int progressive_frame;  /**< Input is progressive (deinterlace_mode will be ignored)  */
+    int second_field;       /**< Output the second field (ignored if deinterlace mode is Weave) */
+    int top_field_first;    /**< Input frame is top field first (1st field is top, 2nd field is bottom) */
+    int unpaired_field;     /**< Input only contains one field (2nd field is invalid) */
+    // The fields below are used for raw YUV input
+    unsigned int reserved_flags;        /**< Reserved for future use (set to zero) */
+    unsigned int reserved_zero;         /**< Reserved (set to zero) */
+    unsigned long long raw_input_dptr;  /**< Input CUdeviceptr for raw YUV extensions */
+    unsigned int raw_input_pitch;       /**< pitch in bytes of raw YUV input (should be aligned appropriately) */
+    unsigned int raw_input_format;      /**< Reserved for future use (set to zero) */
+    unsigned long long raw_output_dptr; /**< Reserved for future use (set to zero) */
+    unsigned int raw_output_pitch;      /**< Reserved for future use (set to zero) */
+    unsigned int Reserved[48];
+    void *Reserved3[3];
+} CUVIDPROCPARAMS;
+
+
+/**
+ *
+ * In order to minimize decode latencies, there should be always at least 2 pictures in the decode
+ * queue at any time, in order to make sure that all decode engines are always busy.
+ *
+ * Overall data flow:
+ *  - cuvidCreateDecoder(...)
+ *  For each picture:
+ *  - cuvidDecodePicture(N)
+ *  - cuvidMapVideoFrame(N-4)
+ *  - do some processing in cuda
+ *  - cuvidUnmapVideoFrame(N-4)
+ *  - cuvidDecodePicture(N+1)
+ *  - cuvidMapVideoFrame(N-3)
+ *    ...
+ *  - cuvidDestroyDecoder(...)
+ *
+ * NOTE:
+ * - When the cuda context is created from a D3D device, the D3D device must also be created
+ *   with the D3DCREATE_MULTITHREADED flag.
+ * - There is a limit to how many pictures can be mapped simultaneously (ulNumOutputSurfaces)
+ * - cuVidDecodePicture may block the calling thread if there are too many pictures pending
+ *   in the decode queue
+ */
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci)
+ * Create the decoder object
+ */
+typedef CUresult CUDAAPI tcuvidCreateDecoder(CUvideodecoder *phDecoder, CUVIDDECODECREATEINFO *pdci);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyDecoder(CUvideodecoder hDecoder)
+ * Destroy the decoder object
+ */
+typedef CUresult CUDAAPI tcuvidDestroyDecoder(CUvideodecoder hDecoder);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams)
+ * Decode a single picture (field or frame)
+ */
+typedef CUresult CUDAAPI tcuvidDecodePicture(CUvideodecoder hDecoder, CUVIDPICPARAMS *pPicParams);
+
+
+#if !defined(__CUVID_DEVPTR64) || defined(__CUVID_INTERNAL)
+/**
+ * \fn CUresult CUDAAPI cuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx, unsigned int *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+ * Post-process and map a video frame for use in cuda
+ */
+typedef CUresult CUDAAPI tcuvidMapVideoFrame(CUvideodecoder hDecoder, int nPicIdx,
+                                           unsigned int *pDevPtr, unsigned int *pPitch,
+                                           CUVIDPROCPARAMS *pVPP);
+
+/**
+ * \fn CUresult CUDAAPI cuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr)
+ * Unmap a previously mapped video frame
+ */
+typedef CUresult CUDAAPI tcuvidUnmapVideoFrame(CUvideodecoder hDecoder, unsigned int DevPtr);
+#endif
+
+#if defined(WIN64) || defined(_WIN64) || defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+/**
+ * \fn CUresult CUDAAPI cuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr, unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+ * map a video frame
+ */
+typedef CUresult CUDAAPI tcuvidMapVideoFrame64(CUvideodecoder hDecoder, int nPicIdx, unsigned long long *pDevPtr,
+                                             unsigned int *pPitch, CUVIDPROCPARAMS *pVPP);
+
+/**
+ * \fn CUresult CUDAAPI cuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
+ * Unmap a previously mapped video frame
+ */
+typedef CUresult CUDAAPI tcuvidUnmapVideoFrame64(CUvideodecoder hDecoder, unsigned long long DevPtr);
+
+#if defined(__CUVID_DEVPTR64) && !defined(__CUVID_INTERNAL)
+#define tcuvidMapVideoFrame      tcuvidMapVideoFrame64
+#define tcuvidUnmapVideoFrame    tcuvidUnmapVideoFrame64
+#endif
+#endif
+
+
+
+/**
+ *
+ * Context-locking: to facilitate multi-threaded implementations, the following 4 functions
+ * provide a simple mutex-style host synchronization. If a non-NULL context is specified
+ * in CUVIDDECODECREATEINFO, the codec library will acquire the mutex associated with the given
+ * context before making any cuda calls.
+ * A multi-threaded application could create a lock associated with a context handle so that
+ * multiple threads can safely share the same cuda context:
+ *  - use cuCtxPopCurrent immediately after context creation in order to create a 'floating' context
+ *    that can be passed to cuvidCtxLockCreate.
+ *  - When using a floating context, all cuda calls should only be made within a cuvidCtxLock/cuvidCtxUnlock section.
+ *
+ * NOTE: This is a safer alternative to cuCtxPushCurrent and cuCtxPopCurrent, and is not related to video
+ * decoder in any way (implemented as a critical section associated with cuCtx{Push|Pop}Current calls).
+*/
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLockCreate(CUvideoctxlock *pLock, CUcontext ctx);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLockDestroy(CUvideoctxlock lck)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLockDestroy(CUvideoctxlock lck);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags)
+ */
+typedef CUresult CUDAAPI tcuvidCtxLock(CUvideoctxlock lck, unsigned int reserved_flags);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags)
+ */
+typedef CUresult CUDAAPI tcuvidCtxUnlock(CUvideoctxlock lck, unsigned int reserved_flags);
+
+/** @} */  /* End VIDEO_DECODER */
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+extern tcuvidCreateDecoder        *cuvidCreateDecoder;
+extern tcuvidDestroyDecoder       *cuvidDestroyDecoder;
+extern tcuvidDecodePicture        *cuvidDecodePicture;
+extern tcuvidMapVideoFrame        *cuvidMapVideoFrame;
+extern tcuvidUnmapVideoFrame      *cuvidUnmapVideoFrame;
+
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
+extern tcuvidMapVideoFrame64      *cuvidMapVideoFrame64;
+extern tcuvidUnmapVideoFrame64    *cuvidUnmapVideoFrame64;
+#endif
+
+//extern tcuvidGetVideoFrameSurface *cuvidGetVideoFrameSurface;
+
+extern tcuvidCtxLockCreate        *cuvidCtxLockCreate;
+extern tcuvidCtxLockDestroy       *cuvidCtxLockDestroy;
+extern tcuvidCtxLock              *cuvidCtxLock;
+extern tcuvidCtxUnlock            *cuvidCtxUnlock;
+    
+////////////////////////////////////////////////////////////////////////////////////////////////
+//
+// High-level helper APIs for video sources
+//
+
+typedef void *CUvideosource;
+typedef void *CUvideoparser;
+typedef long long CUvideotimestamp;
+
+/**
+ * \addtogroup VIDEO_PARSER Video Parser
+ * @{
+ */
+
+/*!
+ * \enum cudaVideoState
+ * Video Source State
+ */
+typedef enum {
+    cudaVideoState_Error   = -1,    /**< Error state (invalid source)  */
+    cudaVideoState_Stopped = 0,     /**< Source is stopped (or reached end-of-stream)  */
+    cudaVideoState_Started = 1      /**< Source is running and delivering data  */
+} cudaVideoState;
+
+/*!
+ * \enum cudaAudioCodec
+ * Audio compression
+ */
+typedef enum {
+    cudaAudioCodec_MPEG1=0,         /**< MPEG-1 Audio  */
+    cudaAudioCodec_MPEG2,           /**< MPEG-2 Audio  */
+    cudaAudioCodec_MP3,             /**< MPEG-1 Layer III Audio  */
+    cudaAudioCodec_AC3,             /**< Dolby Digital (AC3) Audio  */
+    cudaAudioCodec_LPCM             /**< PCM Audio  */
+} cudaAudioCodec;
+
+/*!
+ * \struct CUVIDEOFORMAT
+ * Video format
+ */
+typedef struct
+{
+    cudaVideoCodec codec;                   /**< Compression format  */
+   /**
+    * frame rate = numerator / denominator (for example: 30000/1001)
+    */
+    struct {
+        unsigned int numerator;             /**< frame rate numerator   (0 = unspecified or variable frame rate) */
+        unsigned int denominator;           /**< frame rate denominator (0 = unspecified or variable frame rate) */
+    } frame_rate;
+    unsigned char progressive_sequence;     /**< 0=interlaced, 1=progressive */
+    unsigned char bit_depth_luma_minus8;    /**< high bit depth Luma */
+    unsigned char bit_depth_chroma_minus8;  /**< high bit depth Chroma */
+    unsigned char reserved1;                /**< Reserved for future use */
+    unsigned int coded_width;               /**< coded frame width */
+    unsigned int coded_height;              /**< coded frame height  */
+   /**
+    *   area of the frame that should be displayed
+    * typical example:
+    *   coded_width = 1920, coded_height = 1088
+    *   display_area = { 0,0,1920,1080 }
+    */
+    struct {
+        int left;                           /**< left position of display rect  */
+        int top;                            /**< top position of display rect  */
+        int right;                          /**< right position of display rect  */
+        int bottom;                         /**< bottom position of display rect  */
+    } display_area;
+    cudaVideoChromaFormat chroma_format;    /**<  Chroma format */
+    unsigned int bitrate;                   /**< video bitrate (bps, 0=unknown) */
+   /**
+    * Display Aspect Ratio = x:y (4:3, 16:9, etc)
+    */
+    struct {
+        int x;
+        int y;
+    } display_aspect_ratio;
+    /**
+    * Video Signal Description
+    */
+    struct {
+        unsigned char video_format          : 3;
+        unsigned char video_full_range_flag : 1;
+        unsigned char reserved_zero_bits    : 4;
+        unsigned char color_primaries;
+        unsigned char transfer_characteristics;
+        unsigned char matrix_coefficients;
+    } video_signal_description;
+    unsigned int seqhdr_data_length;          /**< Additional bytes following (CUVIDEOFORMATEX)  */
+} CUVIDEOFORMAT;
+
+/*!
+ * \struct CUVIDEOFORMATEX
+ * Video format including raw sequence header information
+ */
+typedef struct
+{
+    CUVIDEOFORMAT format;
+    unsigned char raw_seqhdr_data[1024];
+} CUVIDEOFORMATEX;
+
+/*!
+ * \struct CUAUDIOFORMAT
+ * Audio Formats
+ */
+typedef struct
+{
+    cudaAudioCodec codec;       /**< Compression format  */
+    unsigned int channels;      /**< number of audio channels */
+    unsigned int samplespersec; /**< sampling frequency */
+    unsigned int bitrate;       /**< For uncompressed, can also be used to determine bits per sample */
+    unsigned int reserved1;     /**< Reserved for future use */
+    unsigned int reserved2;     /**< Reserved for future use */
+} CUAUDIOFORMAT;
+
+
+/*!
+ * \enum CUvideopacketflags
+ * Data packet flags
+ */
+typedef enum {
+    CUVID_PKT_ENDOFSTREAM   = 0x01,   /**< Set when this is the last packet for this stream  */
+    CUVID_PKT_TIMESTAMP     = 0x02,   /**< Timestamp is valid  */
+    CUVID_PKT_DISCONTINUITY = 0x04    /**< Set when a discontinuity has to be signalled  */
+} CUvideopacketflags;
+
+/*!
+ * \struct CUVIDSOURCEDATAPACKET
+ * Data Packet
+ */
+typedef struct _CUVIDSOURCEDATAPACKET
+{
+    unsigned long flags;            /**< Combination of CUVID_PKT_XXX flags */
+    unsigned long payload_size;     /**< number of bytes in the payload (may be zero if EOS flag is set) */
+    const unsigned char *payload;   /**< Pointer to packet payload data (may be NULL if EOS flag is set) */
+    CUvideotimestamp timestamp;     /**< Presentation timestamp (10MHz clock), only valid if CUVID_PKT_TIMESTAMP flag is set */
+} CUVIDSOURCEDATAPACKET;
+
+// Callback for packet delivery
+typedef int (CUDAAPI *PFNVIDSOURCECALLBACK)(void *, CUVIDSOURCEDATAPACKET *);
+
+/*!
+ * \struct CUVIDSOURCEPARAMS
+ * Source Params
+ */
+typedef struct _CUVIDSOURCEPARAMS
+{
+    unsigned int ulClockRate;                   /**< Timestamp units in Hz (0=default=10000000Hz)  */
+    unsigned int uReserved1[7];                 /**< Reserved for future use - set to zero  */
+    void *pUserData;                            /**< Parameter passed in to the data handlers  */
+    PFNVIDSOURCECALLBACK pfnVideoDataHandler;   /**< Called to deliver audio packets  */
+    PFNVIDSOURCECALLBACK pfnAudioDataHandler;   /**< Called to deliver video packets  */
+    void *pvReserved2[8];                       /**< Reserved for future use - set to NULL */
+} CUVIDSOURCEPARAMS;
+
+/*!
+ * \enum CUvideosourceformat_flags
+ * CUvideosourceformat_flags
+ */
+typedef enum {
+    CUVID_FMT_EXTFORMATINFO = 0x100             /**< Return extended format structure (CUVIDEOFORMATEX) */
+} CUvideosourceformat_flags;
+
+#if !defined(__APPLE__)
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams)
+ * Create Video Source
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoSource(CUvideosource *pObj, const char *pszFileName, CUVIDSOURCEPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams)
+ * Create Video Source
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoSourceW(CUvideosource *pObj, const wchar_t *pwszFileName, CUVIDSOURCEPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyVideoSource(CUvideosource obj)
+ * Destroy Video Source
+ */
+typedef CUresult CUDAAPI tcuvidDestroyVideoSource(CUvideosource obj);
+
+/**
+ * \fn CUresult CUDAAPI cuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state)
+ * Set Video Source state
+ */
+typedef CUresult CUDAAPI tcuvidSetVideoSourceState(CUvideosource obj, cudaVideoState state);
+
+/**
+ * \fn cudaVideoState CUDAAPI cuvidGetVideoSourceState(CUvideosource obj)
+ * Get Video Source state
+ */
+typedef cudaVideoState CUDAAPI tcuvidGetVideoSourceState(CUvideosource obj);
+
+/**
+ * \fn CUresult CUDAAPI cuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags)
+ * Get Video Source Format
+ */
+typedef CUresult CUDAAPI tcuvidGetSourceVideoFormat(CUvideosource obj, CUVIDEOFORMAT *pvidfmt, unsigned int flags);
+
+/**
+ * \fn CUresult CUDAAPI cuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags)
+ * Set Video Source state
+ */
+typedef CUresult CUDAAPI tcuvidGetSourceAudioFormat(CUvideosource obj, CUAUDIOFORMAT *paudfmt, unsigned int flags);
+
+#endif
+
+/**
+ * \struct CUVIDPARSERDISPINFO
+ */
+typedef struct _CUVIDPARSERDISPINFO
+{
+    int picture_index;         /**<                 */
+    int progressive_frame;     /**<                 */
+    int top_field_first;       /**<                 */
+    int repeat_first_field;    /**< Number of additional fields (1=ivtc, 2=frame doubling, 4=frame tripling, -1=unpaired field)  */
+    CUvideotimestamp timestamp; /**<     */
+} CUVIDPARSERDISPINFO;
+
+//
+// Parser callbacks
+// The parser will call these synchronously from within cuvidParseVideoData(), whenever a picture is ready to
+// be decoded and/or displayed.
+//
+typedef int (CUDAAPI *PFNVIDSEQUENCECALLBACK)(void *, CUVIDEOFORMAT *);
+typedef int (CUDAAPI *PFNVIDDECODECALLBACK)(void *, CUVIDPICPARAMS *);
+typedef int (CUDAAPI *PFNVIDDISPLAYCALLBACK)(void *, CUVIDPARSERDISPINFO *);
+
+/**
+ * \struct CUVIDPARSERPARAMS
+ */
+typedef struct _CUVIDPARSERPARAMS
+{
+    cudaVideoCodec CodecType;               /**< cudaVideoCodec_XXX  */
+    unsigned int ulMaxNumDecodeSurfaces;    /**< Max # of decode surfaces (parser will cycle through these) */
+    unsigned int ulClockRate;               /**< Timestamp units in Hz (0=default=10000000Hz) */
+    unsigned int ulErrorThreshold;          /**< % Error threshold (0-100) for calling pfnDecodePicture (100=always call pfnDecodePicture even if picture bitstream is fully corrupted) */
+    unsigned int ulMaxDisplayDelay;         /**< Max display queue delay (improves pipelining of decode with display) - 0=no delay (recommended values: 2..4) */
+    unsigned int uReserved1[5];             /**< Reserved for future use - set to 0 */
+    void *pUserData;                        /**< User data for callbacks */
+    PFNVIDSEQUENCECALLBACK pfnSequenceCallback; /**< Called before decoding frames and/or whenever there is a format change */
+    PFNVIDDECODECALLBACK pfnDecodePicture;      /**< Called when a picture is ready to be decoded (decode order) */
+    PFNVIDDISPLAYCALLBACK pfnDisplayPicture;    /**< Called whenever a picture is ready to be displayed (display order)  */
+    void *pvReserved2[7];                       /**< Reserved for future use - set to NULL */
+    CUVIDEOFORMATEX *pExtVideoInfo;             /**< [Optional] sequence header data from system layer */
+} CUVIDPARSERPARAMS;
+
+/**
+ * \fn CUresult CUDAAPI cuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams)
+ */
+typedef CUresult CUDAAPI tcuvidCreateVideoParser(CUvideoparser *pObj, CUVIDPARSERPARAMS *pParams);
+
+/**
+ * \fn CUresult CUDAAPI cuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket)
+ */
+typedef CUresult CUDAAPI tcuvidParseVideoData(CUvideoparser obj, CUVIDSOURCEDATAPACKET *pPacket);
+
+/**
+ * \fn CUresult CUDAAPI cuvidDestroyVideoParser(CUvideoparser obj)
+ */
+typedef CUresult CUDAAPI tcuvidDestroyVideoParser(CUvideoparser obj);
+
+#if !defined(__APPLE__)
+extern tcuvidCreateVideoSource               *cuvidCreateVideoSource;
+extern tcuvidCreateVideoSourceW              *cuvidCreateVideoSourceW;
+extern tcuvidDestroyVideoSource              *cuvidDestroyVideoSource;
+extern tcuvidSetVideoSourceState             *cuvidSetVideoSourceState;
+extern tcuvidGetVideoSourceState             *cuvidGetVideoSourceState;
+extern tcuvidGetSourceVideoFormat            *cuvidGetSourceVideoFormat;
+extern tcuvidGetSourceAudioFormat            *cuvidGetSourceAudioFormat;
+#endif
+
+
+extern tcuvidCreateVideoParser               *cuvidCreateVideoParser;
+extern tcuvidParseVideoData                  *cuvidParseVideoData;
+extern tcuvidDestroyVideoParser              *cuvidDestroyVideoParser;
+
+/** @} */  /* END VIDEO_PARSER */
+////////////////////////////////////////////////////////////////////////////////////////////////
+
+const char *cudaGetErrorEnum(CUresult error);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // defined(WIN32) || defined(GPAC_CONFIG_LINUX)
+
+#endif //__cuda_tools_h__
+

gpac-1.0.0.tar.gz/src/filters/dec_odf.c Added

@@ -0,0 +1,475 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OD decoder 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/internal/compositor_dev.h>
+#include <gpac/constants.h>
+#include <gpac/compositor.h>
+
+typedef struct
+{
+	GF_ObjectManager *odm;
+	GF_Scene *scene;
+	Bool is_playing;
+	GF_FilterPid *out_pid;
+} GF_ODFDecCtx;
+
+
+GF_Err odf_dec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_ODFDecCtx *ctx = gf_filter_get_udta(filter);
+	Bool in_iod = GF_FALSE;
+	GF_FilterPid *out_pid;
+	const GF_PropertyValue *prop;
+
+	//we must have streamtype SCENE
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop || (prop->value.uint != GF_STREAM_OD)) {
+		return GF_NOT_SUPPORTED;
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop || ( (prop->value.uint != GF_CODECID_OD_V1) && (prop->value.uint != GF_CODECID_OD_V2)) ) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_IN_IOD);
+	if (prop && prop->value.boolean) in_iod = GF_TRUE;
+	if (! in_iod) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (is_remove) {
+		out_pid = gf_filter_pid_get_udta(pid);
+		if (out_pid==ctx->out_pid)
+			ctx->out_pid = NULL;
+		gf_filter_pid_remove(out_pid);
+		return GF_OK;
+	}
+
+	//this is a reconfigure
+	if (gf_filter_pid_get_udta(pid)) {
+		return GF_OK;
+	}
+
+	//check our namespace
+	if (ctx->scene && ! gf_filter_pid_is_filter_in_parents(pid, ctx->scene->root_od->scene_ns->source_filter)) {
+		return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	//declare a new output PID of type scene, codecid RAW
+	out_pid = gf_filter_pid_new(filter);
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(out_pid, pid);
+	gf_filter_pid_set_property(out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_udta(pid, out_pid);
+	if (!ctx->out_pid)
+		ctx->out_pid = out_pid;
+	return GF_OK;
+}
+
+void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od)
+{
+	u32 i, j, count, nb_scene, nb_od, nb_esd;
+	GF_ESD *esd;
+	GF_ObjectManager *odm;
+
+	if (od->URLString) {
+		odm = gf_odm_new();
+		odm->ID = od->objectDescriptorID;
+		odm->parentscene = scene;
+		if (od->fake_remote)
+			odm->ignore_sys = GF_TRUE;
+		gf_list_add(scene->resources, odm);
+		gf_odm_setup_remote_object(odm, scene->root_od->scene_ns, od->URLString);
+		return;
+	}
+
+	odm = NULL;
+	nb_esd = gf_list_count(od->ESDescriptors);
+	nb_scene = nb_od = 0;
+	for (i=0; i<nb_esd; i++) {
+		esd = gf_list_get(od->ESDescriptors, i);
+		if (esd->decoderConfig && (esd->decoderConfig->streamType==GF_STREAM_SCENE)) nb_scene++;
+		else if (esd->decoderConfig && (esd->decoderConfig->streamType==GF_STREAM_OD)) nb_od++;
+	}
+
+	for (j=0; j<nb_esd; j++) {
+		GF_FilterPid *pid = NULL;
+		esd = gf_list_get(od->ESDescriptors, j);
+
+		count = gf_list_count(scene->resources);
+		for (i=0; i<count; i++) {
+			u32 k=0;
+			GF_ODMExtraPid *xpid;
+			odm = gf_list_get(scene->resources, i);
+			//can happen with interaction streams
+			if (!odm->pid) {
+				odm = NULL;
+				continue;
+			}
+			
+			if (odm->pid_id == esd->ESID) {
+				pid = odm->pid;
+				break;
+			}
+			while ( (xpid = gf_list_enum(odm->extra_pids, &k))) {
+				if (xpid->pid_id == esd->ESID) {
+					pid = odm->pid;
+					break;
+				}
+			}
+			if (pid) break;
+			odm = NULL;
+		}
+
+		//OCR streams and input sensors don't have PIDs associated for now (only local sensors supported)
+		if ((esd->decoderConfig->streamType == GF_STREAM_INTERACT)
+			|| (esd->decoderConfig->streamType == GF_STREAM_OCR)
+		) {
+#ifndef GPAC_DISABLE_VRML
+			//first time we setup this stream, create an ODM
+			if (!odm) {
+				odm = gf_odm_new();
+				odm->type = GF_STREAM_INTERACT;
+				odm->parentscene = scene;
+				odm->ID = od->objectDescriptorID;
+				odm->pid_id = esd->ESID;
+				odm->ck = scene->root_od->ck;
+				odm->scene_ns = scene->root_od->scene_ns;
+				odm->scene_ns->nb_odm_users++;
+				gf_list_add(scene->resources, odm);
+			}
+			if (esd->decoderConfig->streamType == GF_STREAM_INTERACT) {
+				gf_scene_setup_object(scene, odm);
+				gf_input_sensor_setup_object(odm, esd);
+			}
+			else if (esd->decoderConfig->streamType == GF_STREAM_OCR) {
+				odm->mo = gf_mo_new();
+				odm->mo->odm = odm;
+				odm->mo->OD_ID = od->objectDescriptorID;
+				odm->mo->type = GF_MEDIA_OBJECT_UNDEF;
+				gf_list_add(scene->scene_objects, odm->mo);
+
+				gf_clock_set_time(odm->ck, 0);
+			}
+#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));
+			return;
+		}
+
+		/*if there is BIFS and OD streams in the OD, we need an GF_Scene (except if we already
+		have one, which means this is the first IOD)*/
+		if (nb_scene && nb_od && !odm->subscene) {
+			odm->subscene = gf_scene_new(NULL, odm->parentscene);
+			odm->subscene->root_od = odm;
+		}
+
+		odm->ID = od->objectDescriptorID;
+		odm->ServiceID = od->ServiceID;
+
+		/*setup PID for this object */
+		gf_odm_setup_object(odm, scene->root_od->scene_ns, pid);
+
+	}
+}
+
+static GF_Err ODS_ODUpdate(GF_Scene *scene, GF_ODUpdate *odU)
+{
+	u32 i, count;
+
+	/*extract all our ODs and compare with what we already have...*/
+	count = gf_list_count(odU->objectDescriptors);
+	if (count > 255) return GF_ODF_INVALID_DESCRIPTOR;
+
+	for (i=0; i<count; i++) {
+		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, i);
+		ODS_SetupOD(scene, od);
+	}
+	return GF_OK;
+}
+
+
+
+static GF_Err ODS_RemoveOD(GF_Scene *scene, GF_ODRemove *odR)
+{
+	u32 i;
+	for (i=0; i< odR->NbODs; i++) {
+		GF_ObjectManager *odm = gf_scene_find_odm(scene, odR->OD_ID[i]);
+		if (odm) gf_odm_disconnect(odm, 1);
+	}
+	return GF_OK;
+}
+
+static GF_Err ODS_UpdateESD(GF_Scene *scene, GF_ESDUpdate *ESDs)
+{
+#if FILTER_FIXME
+	GF_ObjectManager *odm;
+	u32 count, i;
+
+	odm = gf_scene_find_odm(priv->scene, ESDs->ODID);
+	/*spec: "ignore"*/
+	if (!odm) return GF_OK;
+
+	count = gf_list_count(ESDs->ESDescriptors);
+
+	while (count) {
+		GF_ESD *esd, *prev;
+		esd = (GF_ESD*)gf_list_get(ESDs->ESDescriptors, 0);
+		/*spec: "ES_Descriptors with ES_IDs that have already been received within the same name scope shall be ignored."*/
+		prev = NULL;
+		i=0;
+		while ((prev = (GF_ESD*)gf_list_enum(odm->OD->ESDescriptors, &i))) {
+			if (prev->ESID == esd->ESID) break;
+		}
+		if (prev) {
+			gf_odf_desc_del((GF_Descriptor *)esd);
+		} else {
+			/*and register new stream*/
+			gf_list_add(odm->OD->ESDescriptors, esd);
+			gf_odm_setup_es(odm, esd, odm->net_service, NULL);
+		}
+
+		/*remove the desc from the AU*/
+		gf_list_rem(ESDs->ESDescriptors, 0);
+		count--;
+	}
+	/*resetup object since a new ES has been inserted
+	(typically an empty object first sent, then a stream added - cf how ogg demuxer works)*/
+	gf_scene_setup_object(priv->scene, odm);
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+
+static GF_Err ODS_RemoveESD(GF_Scene *scene, GF_ESDRemove *ESDs)
+{
+	GF_ObjectManager *odm = gf_scene_find_odm(scene, ESDs->ODID);
+	/*spec: "ignore"*/
+	if (!odm) return GF_OK;
+
+	return GF_NOT_SUPPORTED;
+	//todo one day (never used before in MPEG-4 systems): find the stream with the given ESID
+	//in the parent filter, and remove it
+}
+
+GF_Err odf_dec_process(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_ODCom *com;
+	GF_ODCodec *oddec;
+	Double ts_offset;
+	u64 cts, now;
+	u32 obj_time;
+	u32 count, i;
+	const char *data;
+	u32 size, ESID=0;
+	const GF_PropertyValue *prop;
+	GF_ODFDecCtx *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->scene) {
+		if (ctx->is_playing) {
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_Scene *scene;
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(pid);
+		GF_ObjectManager *odm = gf_filter_pid_get_udta(opid);
+		if (!odm) continue;
+
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			Bool is_eos = gf_filter_pid_is_eos(pid);
+			if (is_eos)
+				gf_filter_pid_set_eos(opid);
+			continue;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+		if (!data) {
+			gf_filter_pid_drop_packet(pid);
+			continue;
+		}
+		scene = odm->subscene;
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (prop) ESID = prop->value.uint;
+
+		cts = gf_filter_pck_get_cts( pck );
+		ts_offset = (Double) cts;
+		ts_offset /= gf_filter_pck_get_timescale(pck);
+
+		gf_odm_check_buffering(odm, pid);
+
+
+		//we still process any frame before our clock time even when buffering
+		obj_time = gf_clock_time(odm->ck);
+		if (ts_offset * 1000 > obj_time) {
+			gf_sc_sys_frame_pending(scene->compositor, ts_offset, obj_time, filter);
+			continue;
+		}
+
+		now = gf_sys_clock_high_res();
+		oddec = gf_odf_codec_new();
+
+		e = gf_odf_codec_set_au(oddec, data, size);
+		if (!e) e = gf_odf_codec_decode(oddec);
+
+		gf_filter_pid_drop_packet(pid);
+
+		//3- process all the commands in this AU, in order
+		while (e == GF_OK) {
+			com = gf_odf_codec_get_com(oddec);
+			if (!com) break;
+
+			//ok, we have a command
+			switch (com->tag) {
+			case GF_ODF_OD_UPDATE_TAG:
+				e = ODS_ODUpdate(scene, (GF_ODUpdate *) com);
+				break;
+			case GF_ODF_OD_REMOVE_TAG:
+				e = ODS_RemoveOD(scene, (GF_ODRemove *) com);
+				break;
+			case GF_ODF_ESD_UPDATE_TAG:
+				e = ODS_UpdateESD(scene, (GF_ESDUpdate *)com);
+				break;
+			case GF_ODF_ESD_REMOVE_TAG:
+				e = ODS_RemoveESD(scene, (GF_ESDRemove *)com);
+				break;
+			case GF_ODF_IPMP_UPDATE_TAG:
+#if 0
+			{
+				GF_IPMPUpdate *ipmpU = (GF_IPMPUpdate *)com;
+				while (gf_list_count(ipmpU->IPMPDescList)) {
+					GF_IPMP_Descriptor *ipmp = gf_list_get(ipmpU->IPMPDescList, 0);
+					gf_list_rem(ipmpU->IPMPDescList, 0);
+					IS_UpdateIPMP(priv->scene, ipmp);
+				}
+				e = GF_OK;
+			}
+#else
+				e = GF_OK;
+#endif
+				break;
+			case GF_ODF_IPMP_REMOVE_TAG:
+				e = GF_NOT_SUPPORTED;
+				break;
+			/*should NEVER exist outside the file format*/
+			case GF_ODF_ESD_REMOVE_REF_TAG:
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			default:
+				if (com->tag >= GF_ODF_COM_ISO_BEGIN_TAG && com->tag <= GF_ODF_COM_ISO_END_TAG) {
+					e = GF_ODF_FORBIDDEN_DESCRIPTOR;
+				} else {
+					/*we don't process user commands*/
+					e = GF_OK;
+				}
+				break;
+			}
+			gf_odf_com_del(&com);
+		}
+
+		gf_odf_codec_del(oddec);
+
+		now = gf_sys_clock_high_res() - now;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODF] ODM%d #CH%d at %d decoded AU TS %u in "LLU" us\n", odm->ID, ESID, obj_time, cts, now));
+	}
+
+	return GF_OK;
+}
+
+
+
+static Bool odf_dec_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	u32 count, i;
+	GF_ODFDecCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (com->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (!com->attach_scene.on_pid) return GF_TRUE;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
+		//we found our pid, set it up
+		if (opid == com->attach_scene.on_pid) {
+			if (!ctx->odm) {
+				ctx->odm = com->attach_scene.object_manager;
+				ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+			}
+			gf_filter_pid_set_udta(opid, com->attach_scene.object_manager);
+			return GF_TRUE;
+		}
+	}
+
+	return GF_TRUE;
+}
+
+static const GF_FilterCapability ODFDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_OD_V1),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_OD_V2),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+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.")
+	.private_size = sizeof(GF_ODFDecCtx),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.priority = 1,
+	SETCAPS(ODFDecCaps),
+	.process = odf_dec_process,
+	.configure_pid = odf_dec_configure_pid,
+	.process_event = odf_dec_process_event,
+};
+
+const GF_FilterRegister *odf_dec_register(GF_FilterSession *session)
+{
+	return &ODFDecRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_openhevc.c Added

@@ -0,0 +1,1294 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenHEVC decoder 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>
+
+#if defined(GPAC_HAS_OPENHEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+
+#include <gpac/internal/media_dev.h>
+#include <libopenhevc/openhevc.h>
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
+#  pragma comment(lib, "openhevc")
+#endif
+
+
+#define HEVC_MAX_STREAMS 2
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	u32 cfg_crc;
+	u32 id;
+	u32 dep_id;
+	u32 codec_id;
+	Bool sublayer;
+
+	u8 *inject_hdr;
+	u32 inject_hdr_size;
+} GF_HEVCStream;
+
+
+typedef struct
+{
+	//options
+	u32 threading;
+	Bool no_copy;
+	u32 nb_threads;
+	Bool pack_hfr;
+	Bool seek_reset;
+	Bool force_stereo;
+	Bool reset_switch;
+
+	//internal
+	GF_Filter *filter;
+	GF_FilterPid *opid;
+	GF_HEVCStream streams[HEVC_MAX_STREAMS];
+	u32 nb_streams;
+	Bool is_multiview;
+
+	u32 width, stride, height, out_size, luma_bpp, chroma_bpp;
+	GF_Fraction sar;
+	GF_FilterPacket *packed_pck;
+	u8 *packed_data;
+
+	u32 hevc_nalu_size_length;
+	Bool has_pic;
+
+	OHHandle codec;
+	u32 nb_layers, cur_layer;
+
+	Bool decoder_started;
+	
+	u32 frame_idx;
+	u32 dec_frames;
+	u8  chroma_format_idc;
+
+#ifdef  OPENHEVC_HAS_AVC_BASE
+	u32 avc_base_id;
+	u32 avc_nalu_size_length;
+	char *avc_base;
+	u32 avc_base_size;
+	u32 avc_base_pts;
+#endif
+
+	Bool force_stereo_reset;
+
+	GF_FilterFrameInterface frame_ifce;
+	OHFrame frame_ptr;
+	Bool frame_out;
+
+	char *reaggregation_buffer;
+	u32 reaggregation_alloc_size, reaggregation_size;
+
+	char *inject_buffer;
+	u32 inject_buffer_alloc_size, reaggregatioinject_buffer_size;
+
+	Bool reconfig_pending;
+
+	Bool signal_reconfig;
+
+	GF_List *src_packets;
+	Bool drop_non_refs;
+} GF_OHEVCDecCtx;
+
+static GF_Err ohevcdec_configure_scalable_pid(GF_OHEVCDecCtx *ctx, GF_FilterPid *pid, u32 codecid)
+{
+	GF_HEVCConfig *cfg = NULL;
+	u8 *data;
+	u32 data_len;
+	GF_BitStream *bs;
+	Bool is_lhvc = GF_TRUE;
+	u32 i, j;
+	const GF_PropertyValue *dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	if (!dsi) {
+		dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		is_lhvc = GF_FALSE;
+	}
+
+	if (!ctx->codec) return GF_NOT_SUPPORTED;
+
+	if (!dsi || !dsi->value.data.size) {
+		ctx->nb_layers++;
+		ctx->cur_layer++;
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+		return GF_OK;
+	}
+
+	cfg = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, is_lhvc);
+
+	if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+	if (!ctx->hevc_nalu_size_length) ctx->hevc_nalu_size_length = cfg->nal_unit_size;
+	else if (ctx->hevc_nalu_size_length != cfg->nal_unit_size)
+		return GF_NON_COMPLIANT_BITSTREAM;
+	
+	ctx->nb_layers++;
+	ctx->cur_layer++;
+	oh_select_active_layer(ctx->codec, ctx->nb_layers-1);
+	oh_select_view_layer(ctx->codec, ctx->nb_layers-1);
+
+#ifdef  OPENHEVC_HAS_AVC_BASE
+	//LHVC mode with base AVC layer: set extradata for LHVC
+	if (ctx->avc_base_id) {
+		oh_extradata_cpy_lhvc(ctx->codec, NULL, (u8 *) dsi->value.data.ptr, 0, dsi->value.data.size);
+	} else
+#endif
+	//LHVC mode with base HEVC layer: decode the LHVC SPS/PPS/VPS
+	{
+		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);
+			for (j=0; j< gf_list_count(ar->nalus); j++) {
+				GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)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);
+			}
+		}
+
+		gf_bs_get_content(bs, &data, &data_len);
+		gf_bs_del(bs);
+		//the decoder may not be already started
+		if (!ctx->decoder_started) {
+			oh_start(ctx->codec);
+			ctx->decoder_started=1;
+		}
+		
+		oh_decode(ctx->codec, (u8 *)data, data_len, 0);
+		gf_free(data);
+	}
+	gf_odf_hevc_cfg_del(cfg);
+	return GF_OK;
+}
+
+
+static void ohevcdec_write_ps_list(GF_BitStream *bs, GF_List *list, u32 nalu_size_length)
+{
+	u32 i, count = list ? gf_list_count(list) : 0;
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *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 void ohevcdec_create_inband(GF_HEVCStream *stream, u32 nal_unit_size, GF_List *sps, GF_List *pps, GF_List *vps)
+{
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (vps) ohevcdec_write_ps_list(bs, vps, nal_unit_size);
+	if (sps) ohevcdec_write_ps_list(bs, sps, nal_unit_size);
+	if (pps) ohevcdec_write_ps_list(bs, pps, nal_unit_size);
+	if (stream->inject_hdr) gf_free(stream->inject_hdr);
+	gf_bs_get_content(bs, &stream->inject_hdr, &stream->inject_hdr_size);
+	gf_bs_del(bs);
+}
+
+
+#if defined(OPENHEVC_HAS_AVC_BASE) && !defined(GPAC_DISABLE_LOG)
+void openhevc_log_callback(void *udta, int l, const char*fmt, va_list vl)
+{
+	u32 level = GF_LOG_DEBUG;
+	if (l <= OHEVC_LOG_ERROR) level = GF_LOG_ERROR;
+	else if (l <= OHEVC_LOG_WARNING) level = GF_LOG_WARNING;
+	else if (l <= OHEVC_LOG_INFO) level = GF_LOG_INFO;
+//	else if (l >= OHEVC_LOG_VERBOSE) return;
+
+	if (gf_log_tool_level_on(GF_LOG_CODEC, level)) {
+		gf_log_va_list(level, GF_LOG_CODEC, fmt, vl);
+	}
+}
+#endif
+
+static void ohevcdec_set_codec_name(GF_Filter *filter)
+{
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx*) gf_filter_get_udta(filter);
+#ifdef  OPENHEVC_HAS_AVC_BASE
+	if (ctx->avc_base_id) {
+		if (ctx->cur_layer==1) gf_filter_set_name(filter, "OpenHEVC-v"NV_VERSION"-AVC|H264");
+		else gf_filter_set_name(filter, "OpenHEVC-v"NV_VERSION"-AVC|H264+LHVC");
+	}
+	if (ctx->cur_layer==1) gf_filter_set_name(filter, "OpenHEVC-v"NV_VERSION);
+	else gf_filter_set_name(filter, "OpenHEVC-v"NV_VERSION"-LHVC");
+#else
+	return gf_filter_set_name(filter, libOpenHevcVersion(ctx->codec) );
+#endif
+}
+
+static u32 ohevcdec_get_pixel_format( u32 luma_bpp, u8 chroma_format_idc)
+{
+	switch (chroma_format_idc) {
+	case 1:
+		return (luma_bpp==10) ? GF_PIXEL_YUV_10 : GF_PIXEL_YUV;
+	case 2:
+		return (luma_bpp==10) ? GF_PIXEL_YUV422_10 : GF_PIXEL_YUV422;
+	case 3:
+		return (luma_bpp==10) ? GF_PIXEL_YUV444_10 : GF_PIXEL_YUV444;
+	default:
+		return 0;
+	}
+	return 0;
+}
+
+static void ohevc_set_out_props(GF_OHEVCDecCtx *ctx)
+{
+	u32 pixfmt;
+
+	gf_filter_pid_copy_properties(ctx->opid, ctx->streams[0].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_DECODER_CONFIG, NULL );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL );
+
+	if (ctx->pack_hfr) {
+		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) );
+	} 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) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(2*ctx->height) );
+		} 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_STRIDE, &PROP_UINT(ctx->stride) );
+	}
+	pixfmt = ohevcdec_get_pixel_format(ctx->luma_bpp, ctx->chroma_format_idc);
+	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) );
+}
+
+static GF_Err ohevcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i, dep_id=0, id=0, cfg_crc=0, codecid;
+	Bool has_scalable = GF_FALSE;
+	Bool is_sublayer = GF_FALSE;
+	u8 *patched_dsi=NULL;
+	u32 patched_dsi_size=0;
+	GF_HEVCStream *stream;
+	const GF_PropertyValue *p, *dsi, *dsi_enh=NULL;
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx*) gf_filter_get_udta(filter);
+
+	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;
+			ctx->nb_streams = 0;
+			if (ctx->codec) oh_close(ctx->codec);
+			ctx->codec = NULL;
+			return GF_OK;
+		} else {
+			for (i=0; i<ctx->nb_streams; i++) {
+				if (ctx->streams[i].ipid == pid) {
+					ctx->streams[i].ipid = NULL;
+					ctx->streams[i].cfg_crc = 0;
+					memmove(&ctx->streams[i], &ctx->streams[i+1], sizeof(GF_HEVCStream)*(ctx->nb_streams-1));
+					ctx->nb_streams--;
+					return GF_OK;
+				}
+			}
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) dep_id = p->value.uint;
+
+	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) id = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	codecid = p ? p->value.uint : 0;
+	if (!codecid) return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SCALABLE);
+	if (p) has_scalable = p->value.boolean;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBLAYER);
+	if (p) is_sublayer = p->value.boolean;
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	cfg_crc = 0;
+	if (dsi && dsi->value.data.ptr && dsi->value.data.size) {
+		cfg_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+	}
+	dsi_enh = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	stream = NULL;
+	//check if this is an update
+	for (i=0; i<ctx->nb_streams; i++) {
+		if (ctx->streams[i].ipid == pid) {
+			if (ctx->streams[i].cfg_crc == cfg_crc) return GF_OK;
+			if (ctx->codec && (ctx->streams[i].codec_id != codecid)) {
+				//we are already instantiated, flush all frames and reconfig
+				ctx->reconfig_pending = GF_TRUE;
+				return GF_OK;
+			}
+			ctx->streams[i].codec_id = codecid;
+			ctx->streams[i].cfg_crc = cfg_crc;
+			stream = &ctx->streams[i];
+			break;
+		}
+	}
+
+	if (!stream) {
+		if (ctx->nb_streams==HEVC_MAX_STREAMS) {
+			return GF_NOT_SUPPORTED;
+		}
+		//insert new pid in order of dependencies
+		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)));
+				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));
+
+				ctx->streams[i+1].ipid = pid;
+				ctx->streams[i+1].cfg_crc = cfg_crc;
+				ctx->streams[i+1].dep_id = dep_id;
+				ctx->streams[i+1].id = id;
+				ctx->streams[i+1].codec_id = codecid;
+				ctx->streams[i+1].sublayer = is_sublayer;
+				gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+				stream = &ctx->streams[i+1];
+				break;
+			}
+			if (ctx->streams[i].dep_id == id) {
+				if (ctx->nb_streams > i+1)
+					memmove(&ctx->streams[i+1], &ctx->streams[i], sizeof(GF_HEVCStream) * (ctx->nb_streams-i));
+
+				ctx->streams[i].ipid = pid;
+				ctx->streams[i].cfg_crc = cfg_crc;
+				ctx->streams[i].dep_id = dep_id;
+				ctx->streams[i].id = id;
+				ctx->streams[i].codec_id = codecid;
+				ctx->streams[i].sublayer = is_sublayer;
+				gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+				stream = &ctx->streams[i];
+				break;
+			}
+		}
+		if (!stream) {
+			ctx->streams[ctx->nb_streams].ipid = pid;
+			ctx->streams[ctx->nb_streams].cfg_crc = cfg_crc;
+			ctx->streams[ctx->nb_streams].id = id;
+			ctx->streams[ctx->nb_streams].dep_id = dep_id;
+			ctx->streams[ctx->nb_streams].codec_id = codecid;
+			ctx->streams[ctx->nb_streams].sublayer = is_sublayer;
+			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+			stream = &ctx->streams[ctx->nb_streams];
+		}
+		ctx->nb_streams++;
+		ctx->signal_reconfig = GF_TRUE;
+	}
+	ctx->nb_layers = ctx->cur_layer = 1;
+
+	//temporal sublayer stream setup, do nothing
+	if (stream->sublayer)
+		return GF_OK;
+
+	//scalable stream setup
+	if (stream->dep_id) {
+		GF_Err e;
+		e = ohevcdec_configure_scalable_pid(ctx, pid, codecid);
+		ohevcdec_set_codec_name(filter);
+		return e;
+	}
+
+
+	if (codecid == GF_CODECID_AVC)
+#ifdef  OPENHEVC_HAS_AVC_BASE
+		ctx->avc_base_id = id;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+	
+	if (dsi && dsi->value.data.size) {
+#ifdef  OPENHEVC_HAS_AVC_BASE
+		if (codecid==GF_CODECID_AVC) {
+			GF_AVCConfig *avcc = NULL;
+			AVCState avc;
+			memset(&avc, 0, sizeof(AVCState));
+
+			avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+			if (!avcc) return GF_NON_COMPLIANT_BITSTREAM;
+			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);
+				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;
+				ctx->chroma_bpp = avcc->chroma_bit_depth;
+				ctx->chroma_format_idc = avcc->chroma_format;
+			}
+
+			if (ctx->codec && ctx->decoder_started) {
+				//this seems to be broken in openhevc, we need to reconfigure the decoder ...
+				if (ctx->reset_switch) {
+					ctx->reconfig_pending = GF_TRUE;
+					stream->cfg_crc = 0;
+					gf_odf_avc_cfg_del(avcc);
+					return GF_OK;
+				} else {
+					ohevcdec_create_inband(stream, avcc->nal_unit_size, avcc->sequenceParameterSets, avcc->pictureParameterSets, NULL);
+				}
+			}
+			gf_odf_avc_cfg_del(avcc);
+		} else
+
+#endif
+		{
+			GF_HEVCConfig *hvcc = NULL;
+			GF_HEVCConfig *hvcc_enh = NULL;
+			HEVCState hevc;
+			u32 j;
+			GF_List *SPSs=NULL, *PPSs=NULL, *VPSs=NULL;
+			memset(&hevc, 0, sizeof(HEVCState));
+
+			hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+			if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+			ctx->hevc_nalu_size_length = hvcc->nal_unit_size;
+
+			if (dsi_enh) {
+				hvcc_enh = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+			}
+
+			for (i=0; i< gf_list_count(hvcc->param_array); i++) {
+				GF_HEVCParamArray *ar = (GF_HEVCParamArray *)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);
+						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);
+					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);
+						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);
+						ctx->chroma_bpp = MAX(hevc.sps[idx].bit_depth_chroma, ctx->chroma_bpp);
+						ctx->chroma_format_idc  = hevc.sps[idx].chroma_format_idc;
+
+						if (hdr & 0x1f8) {
+							ctx->nb_layers ++;
+						}
+						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);
+						//multiview
+						if ((vps_id>=0) && (hevc.vps[vps_id].scalability_mask[1])) {
+							ctx->is_multiview = GF_TRUE;
+						}
+						VPSs = ar->nalus;
+					}
+					else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+						gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+						PPSs = ar->nalus;
+					}
+				}
+			}
+			if (ctx->codec && ctx->decoder_started) {
+				if (ctx->reset_switch) {
+					ctx->reconfig_pending = GF_TRUE;
+					stream->cfg_crc = 0;
+					gf_odf_hevc_cfg_del(hvcc);
+					return GF_OK;
+				} else {
+					ohevcdec_create_inband(stream, hvcc->nal_unit_size, SPSs, PPSs, VPSs);
+				}
+			}
+			if (hvcc_enh) {
+				gf_odf_hevc_cfg_del(hvcc_enh);
+				gf_odf_hevc_cfg_write(hvcc, &patched_dsi, &patched_dsi_size);
+			}
+			gf_odf_hevc_cfg_del(hvcc);
+		}
+	}
+
+	if (!ctx->codec) {
+#ifdef  OPENHEVC_HAS_AVC_BASE
+		if (ctx->avc_base_id) {
+			ctx->codec = oh_init_lhvc(ctx->nb_threads, ctx->threading);
+		} else
+#endif
+		{
+			ctx->codec = oh_init(ctx->nb_threads, ctx->threading);
+		}
+	}
+
+
+#if defined(OPENHEVC_HAS_AVC_BASE) && !defined(GPAC_DISABLE_LOG)
+	if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG) ) {
+		oh_set_log_level(ctx->codec, OHEVC_LOG_DEBUG);
+	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_INFO) ) {
+		oh_set_log_level(ctx->codec, OHEVC_LOG_INFO);
+	} else if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_WARNING) ) {
+		oh_set_log_level(ctx->codec, OHEVC_LOG_WARNING);
+	} else {
+		oh_set_log_level(ctx->codec, OHEVC_LOG_ERROR);
+	}
+	oh_set_log_callback(ctx->codec, openhevc_log_callback);
+#endif
+
+	if (dsi) {
+		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);
+		} 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);
+				if (!ctx->avc_base_id)
+					oh_select_view_layer(ctx->codec, 0);
+#ifdef WIN32
+			}
+#endif
+			}
+
+		if (!ctx->decoder_started) {
+#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);
+			} else
+#endif
+			{
+				if (patched_dsi) {
+					oh_extradata_cpy(ctx->codec, (u8 *) patched_dsi, patched_dsi_size);
+				} else {
+					oh_extradata_cpy(ctx->codec, (u8 *) dsi->value.data.ptr, dsi->value.data.size);
+				}
+			}
+		}
+	} else {
+		//decode and display layer 0 by default - will be changed when attaching enhancement layers
+
+		//has_scalable_layers is set, the esd describes a set of HEVC stream but we don't know how many - for now only two decoders so easy,
+		//but should be fixed in the future
+		if (has_scalable) {
+			ctx->nb_layers = 2;
+			ctx->cur_layer = 2;
+		}
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+	}
+
+	if (patched_dsi) gf_free(patched_dsi);
+
+	//in case we don't have a config record
+	if (!ctx->chroma_format_idc) ctx->chroma_format_idc = 1;
+
+	//we start decoder on the first frame
+	ctx->dec_frames = 0;
+	ohevcdec_set_codec_name(filter);
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+
+	//copy properties at init or reconfig
+	if (ctx->signal_reconfig) {
+		ohevc_set_out_props(ctx);
+		ctx->signal_reconfig = GF_FALSE;
+	} else {
+		ctx->signal_reconfig = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+
+
+static Bool ohevcdec_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
+{
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx*) gf_filter_get_udta(filter);
+
+	if (fevt->base.type == GF_FEVT_QUALITY_SWITCH) {
+
+		if (ctx->nb_layers==1) return GF_FALSE;
+		/*switch up*/
+		if (fevt->quality_switch.up > 0) {
+			if (ctx->cur_layer>=ctx->nb_layers) return GF_FALSE;
+			ctx->cur_layer++;
+		} else {
+			if (ctx->cur_layer<=1) return GF_FALSE;
+			ctx->cur_layer--;
+		}
+		oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+		oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+		if (ctx->is_multiview)
+			ctx->force_stereo_reset = ctx->force_stereo;
+
+		//todo: we should get the set of pids active and trigger the switch up/down based on that
+		//rather than not canceling the event
+		return GF_FALSE;
+	} else if (fevt->base.type == GF_FEVT_STOP) {
+		if (ctx->seek_reset && ctx->dec_frames) {
+			u32 i;
+			u32 cl = ctx->cur_layer;
+			u32 nl = ctx->nb_layers;
+
+			//quick hack, we have an issue with openHEVC resuming after being flushed ...
+			oh_close(ctx->codec);
+			ctx->codec = NULL;
+			ctx->decoder_started = GF_FALSE;
+			for (i=0; i<ctx->nb_streams; i++) {
+				ohevcdec_configure_pid(filter, ctx->streams[i].ipid, GF_FALSE);
+			}
+			ctx->cur_layer = cl;
+			ctx->nb_layers = nl;
+			if (ctx->codec) {
+				oh_select_active_layer(ctx->codec, ctx->cur_layer-1);
+				oh_select_view_layer(ctx->codec, ctx->cur_layer-1);
+			}
+		}
+	}
+	else if ((fevt->base.type==GF_FEVT_PLAY) || (fevt->base.type==GF_FEVT_SET_SPEED) || (fevt->base.type==GF_FEVT_RESUME)) {
+		ctx->drop_non_refs = fevt->play.drop_non_ref;
+	}
+	return GF_FALSE;
+}
+
+
+void ohevcframe_release(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx *) gf_filter_get_udta(filter);
+	ctx->frame_out = GF_FALSE;
+	gf_filter_post_process_task(ctx->filter);
+}
+
+GF_Err ohevcframe_get_plane(GF_FilterFrameInterface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx *)frame->user_data;
+	if (! outPlane || !outStride) return GF_BAD_PARAM;
+	*outPlane = NULL;
+	*outStride = 0;
+
+	if (plane_idx==0) {
+		*outPlane = (const u8 *) ctx->frame_ptr.data_y_p;
+		*outStride = ctx->frame_ptr.frame_par.linesize_y;
+	} else if (plane_idx==1) {
+		*outPlane = (const u8 *)  ctx->frame_ptr.data_cb_p;
+		*outStride = ctx->frame_ptr.frame_par.linesize_cb;
+	} else if (plane_idx==2) {
+		*outPlane = (const u8 *)  ctx->frame_ptr.data_cr_p;
+		*outStride = ctx->frame_ptr.frame_par.linesize_cr;
+	} else
+		return GF_BAD_PARAM;
+
+	return GF_OK;
+}
+
+static GF_Err ohevcdec_send_output_frame(GF_OHEVCDecCtx *ctx)
+{
+	GF_FilterPacket *dst_pck, *src_pck;
+	u32 i, count;
+
+	ctx->frame_ifce.user_data = ctx;
+	ctx->frame_ifce.get_plane = ohevcframe_get_plane;
+	//we only keep one frame out, force releasing it
+	ctx->frame_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+	oh_output_update(ctx->codec, 1, &ctx->frame_ptr);
+
+	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &ctx->frame_ifce, ohevcframe_release);
+
+	src_pck = NULL;
+	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) == ctx->frame_ptr.frame_par.pts) {
+			u8 car_v = gf_filter_pck_get_carousel_version(src_pck);
+			gf_filter_pck_set_carousel_version(src_pck, 0);
+
+			gf_filter_pck_merge_properties(src_pck, dst_pck);
+			gf_list_rem(ctx->src_packets, i);
+			gf_filter_pck_unref(src_pck);
+
+			if (car_v)
+				ohevc_set_out_props(ctx);
+
+			break;
+		}
+		src_pck = NULL;
+	}
+	if (!src_pck)
+		gf_filter_pck_set_cts(dst_pck, ctx->frame_ptr.frame_par.pts);
+
+	ctx->frame_out = GF_TRUE;
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+static GF_Err ohevcdec_flush_picture(GF_OHEVCDecCtx *ctx)
+{
+	GF_FilterPacket *pck, *src_pck;
+	u8 *data;
+	u32 a_w, a_h, a_stride, bit_depth, i, count;
+	u64 cts;
+	OHFrame_cpy openHevcFrame_FL, openHevcFrame_SL;
+	int chromat_format;
+
+	if (ctx->no_copy && !ctx->pack_hfr) {
+		oh_frameinfo_update(ctx->codec, &openHevcFrame_FL.frame_par);
+	} else {
+		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);
+	}
+
+	a_w = openHevcFrame_FL.frame_par.width;
+	a_h = openHevcFrame_FL.frame_par.height;
+	a_stride = openHevcFrame_FL.frame_par.linesize_y;
+	bit_depth = openHevcFrame_FL.frame_par.bitdepth;
+	chromat_format = openHevcFrame_FL.frame_par.chromat_format;
+	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++) {
+		src_pck = gf_list_get(ctx->src_packets, i);
+		if (gf_filter_pck_get_cts(src_pck) == cts) break;
+		src_pck = NULL;
+	}
+
+	if (src_pck && gf_filter_pck_get_seek_flag(src_pck)) {
+		gf_list_del_item(ctx->src_packets, src_pck);
+		gf_filter_pck_unref(src_pck);
+		return GF_OK;
+	}
+
+	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->width = a_w;
+		ctx->stride = a_stride;
+		ctx->height = a_h;
+		if( chromat_format == OH_YUV420 ) {
+			ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+		} else if  ( chromat_format == OH_YUV422 ) {
+			ctx->out_size = ctx->stride * ctx->height * 2;
+		} 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) ){
+			ctx->out_size *= 2;
+		}
+
+		ctx->luma_bpp = ctx->chroma_bpp = bit_depth;
+		ctx->chroma_format_idc = chromat_format + 1;
+		ctx->sar.num = openHevcFrame_FL.frame_par.sample_aspect_ratio.num;
+		ctx->sar.den = openHevcFrame_FL.frame_par.sample_aspect_ratio.den;
+		if (!ctx->sar.num) ctx->sar.num = ctx->sar.den = 1;
+
+		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 ));
+
+	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;
+
+		idx_w = ((ctx->frame_idx==0) || (ctx->frame_idx==2)) ? 0 : ctx->stride;
+		idx_h = ((ctx->frame_idx==0) || (ctx->frame_idx==1)) ? 0 : ctx->height*2*ctx->stride;
+
+		if (!ctx->packed_pck) {
+			ctx->packed_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &ctx->packed_data);
+			if (src_pck) gf_filter_pck_merge_properties(src_pck, ctx->packed_pck);
+			else gf_filter_pck_set_cts(ctx->packed_pck, cts);
+		}
+		if (src_pck) {
+			gf_list_del_item(ctx->src_packets, src_pck);
+			gf_filter_pck_unref(src_pck);
+		}
+
+		pY = (u8*) (ctx->packed_data + idx_h + idx_w );
+
+		if (chromat_format == OH_YUV422) {
+			pU = (u8*)(ctx->packed_data + 4 * ctx->stride  * ctx->height + idx_w / 2 + idx_h / 2);
+			pV = (u8*)(ctx->packed_data + 4 * (3 * ctx->stride * ctx->height /2)  + idx_w / 2 + idx_h / 2);
+		} else if (chromat_format == OH_YUV444) {
+			pU = (u8*)(ctx->packed_data + 4 * ctx->stride * ctx->height + idx_w + idx_h);
+			pV = (u8*)(ctx->packed_data + 4 * ( 2 * ctx->stride * ctx->height) + idx_w + idx_h);
+		} else {
+			pU = (u8*)(ctx->packed_data + 2 * ctx->stride * 2 * ctx->height + idx_w / 2 + idx_h / 4);
+			pV = (u8*)(ctx->packed_data + 4 * ( 5 *ctx->stride  * ctx->height  / 4) + idx_w / 2 + idx_h / 4);
+		
+		}
+
+		if (oh_output_update(ctx->codec, 1, &openHFrame)) {
+			u32 i, s_stride, hs_stride, qs_stride, d_stride, dd_stride, hd_stride;
+
+			s_stride = openHFrame.frame_par.linesize_y;
+			qs_stride = s_stride / 4;
+			hs_stride = s_stride / 2;
+
+			d_stride = ctx->stride;
+			dd_stride = 2*ctx->stride;
+			hd_stride = ctx->stride/2;
+
+			if (chromat_format == OH_YUV422) {
+				for (i = 0; i < ctx->height; i++) {
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
+					pY += dd_stride;
+
+					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*hs_stride, hd_stride);
+					pU += d_stride;
+
+					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*hs_stride, hd_stride);
+					pV += d_stride;
+				}
+			} else if (chromat_format == OH_YUV444) {
+				for (i = 0; i < ctx->height; i++) {
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
+					pY += dd_stride;
+
+					memcpy(pU, (u8 *)openHFrame.data_cb_p + i*s_stride, d_stride);
+					pU += dd_stride;
+
+					memcpy(pV, (u8 *)openHFrame.data_cr_p + i*s_stride, d_stride);
+					pV += dd_stride;
+				}
+			} else {
+				for (i = 0; i<ctx->height; i++) {
+					memcpy(pY, (u8 *)openHFrame.data_y_p + i*s_stride, d_stride);
+					pY += dd_stride;
+
+					if (!(i % 2)) {
+						memcpy(pU, (u8 *)openHFrame.data_cb_p + i*qs_stride, hd_stride);
+						pU += d_stride;
+
+						memcpy(pV, (u8 *)openHFrame.data_cr_p + i*qs_stride, hd_stride);
+						pV += d_stride;
+					}
+				}
+			}
+
+			ctx->frame_idx++;
+			if (ctx->frame_idx==4) {
+				gf_filter_pck_send(ctx->packed_pck);
+				ctx->packed_pck = NULL;
+				ctx->frame_idx = 0;
+			}
+		}
+		return GF_OK;
+	}
+
+	pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &data);
+
+	openHevcFrame_FL.data_y = (void*) data;
+
+	if (ctx->nb_layers==2 && ctx->is_multiview && !ctx->no_copy){
+		int out1, out2;
+		if( chromat_format == OH_YUV420){
+			openHevcFrame_SL.data_y = (void*) (data +  ctx->stride * ctx->height);
+			openHevcFrame_FL.data_cb = (void*) (data + 2*ctx->stride * ctx->height);
+			openHevcFrame_SL.data_cb = (void*) (data +  9*ctx->stride * ctx->height/4);
+			openHevcFrame_FL.data_cr = (void*) (data + 5*ctx->stride * ctx->height/2);
+			openHevcFrame_SL.data_cr = (void*) (data + 11*ctx->stride * ctx->height/4);
+		}
+
+		out1 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_FL, 0);
+		out2 = oh_output_cropped_cpy_from_layer(ctx->codec, &openHevcFrame_SL, 1);
+
+		if (out1 && out2) {
+			gf_filter_pck_set_cts(pck, cts);
+			gf_filter_pck_send(pck);
+		} else {
+			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);
+		}
+
+		if (oh_output_cropped_cpy(ctx->codec, &openHevcFrame_FL)) {
+			if (src_pck) {
+				u8 car_v = gf_filter_pck_get_carousel_version(src_pck);
+				gf_filter_pck_set_carousel_version(src_pck, 0);
+
+				gf_filter_pck_merge_properties(src_pck, pck);
+				gf_list_del_item(ctx->src_packets, src_pck);
+				gf_filter_pck_unref(src_pck);
+
+				if (car_v)
+					ohevc_set_out_props(ctx);
+			} else {
+				gf_filter_pck_set_cts(pck, cts);
+			}
+			gf_filter_pck_send(pck);
+		} else
+			gf_filter_pck_discard(pck);
+	}
+	return GF_OK;
+}
+
+static GF_Err ohevcdec_process(GF_Filter *filter)
+{
+	s32 got_pic;
+	u64 min_dts = GF_FILTER_NO_TS;
+	u64 min_cts = GF_FILTER_NO_TS;
+	u32 idx, nb_eos=0;
+	u32 data_size, nbpck;
+	char *data;
+	Bool has_pic = GF_FALSE;
+	GF_FilterPacket *pck_ref = NULL;
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx*) gf_filter_get_udta(filter);
+
+	if (ctx->frame_out) return GF_EOS;
+
+
+	if (ctx->reconfig_pending) {
+		//wait for each input pid to be ready - this will force reconfig on pids if needed
+		for (idx=0; idx<ctx->nb_streams; idx++) {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[idx].ipid);
+			if (!pck) return GF_OK;
+		}
+		oh_flush(ctx->codec);
+		//flush
+#ifdef  OPENHEVC_HAS_AVC_BASE
+		if (ctx->avc_base_id) {
+			got_pic = oh_decode_lhvc(ctx->codec, NULL, NULL, 0, 0, 0, 0);
+		} else
+#endif
+			got_pic = oh_decode(ctx->codec, NULL, 0, 0);
+
+		if ( got_pic ) {
+			return ohevcdec_flush_picture(ctx);
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Closing decoder for reconfigure\n"));
+		//good to go: no more pics in decoder, no frame out
+		ctx->reconfig_pending = GF_FALSE;
+		oh_close(ctx->codec);
+		ctx->codec = NULL;
+		ctx->decoder_started = GF_FALSE;
+		for (idx=0; idx<ctx->nb_streams; idx++) {
+			ohevcdec_configure_pid(filter, ctx->streams[idx].ipid, GF_FALSE);
+		}
+	}
+	if (!ctx->codec) return GF_SERVICE_ERROR;
+
+	//probe all streams
+	for (idx=0; idx<ctx->nb_streams; idx++) {
+		u64 dts, cts;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[idx].ipid);
+
+		if (ctx->reconfig_pending) return GF_OK;
+
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->streams[idx].ipid))
+				nb_eos++;
+			//make sure we do have a packet on the enhancement
+			else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenHEVC] no input packets on running pid %s - postponing decode\n", gf_filter_pid_get_name(ctx->streams[idx].ipid) ) );
+				return GF_OK;
+			}
+			continue;
+		}
+		if (ctx->drop_non_refs && !gf_filter_pck_get_sap(pck)) {
+			gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+			continue;
+		}
+
+		dts = gf_filter_pck_get_dts(pck);
+		cts = gf_filter_pck_get_cts(pck);
+
+		data = (char *) gf_filter_pck_get_data(pck, &data_size);
+		//TODO: this is a clock signaling, for now just trash ..
+		if (!data) {
+			gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+			idx--;
+			continue;
+		}
+		if (dts==GF_FILTER_NO_TS) dts = cts;
+		//get packet with min dts (either a timestamp or a decode order number)
+		if (min_dts > dts) {
+			min_dts = dts;
+			if (cts == GF_FILTER_NO_TS) min_cts = min_dts;
+			else min_cts = cts;
+			pck_ref = pck;
+		}
+	}
+
+	//start decoder
+	if (!ctx->decoder_started) {
+		oh_start(ctx->codec);
+		ctx->decoder_started = GF_TRUE;
+	}
+
+	if (nb_eos == ctx->nb_streams) {
+		while (1) {
+#ifdef  OPENHEVC_HAS_AVC_BASE
+			if (ctx->avc_base_id)
+				got_pic = oh_decode_lhvc(ctx->codec, NULL, NULL, 0, 0, 0, 0);
+			else
+#endif
+				got_pic = oh_decode(ctx->codec, NULL, 0, 0);
+
+			if (got_pic) {
+				ohevcdec_flush_picture(ctx);
+				//we are in direct output mode, wait for frame to be consummed before flushing next frame
+				if (ctx->frame_out) return GF_OK;
+			}
+			else
+				break;
+		}
+		gf_filter_pid_set_eos(ctx->opid);
+		while (gf_list_count(ctx->src_packets)) {
+			GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+			gf_filter_pck_unref(pck);
+		}
+		return GF_EOS;
+	}
+
+	if (min_cts == GF_FILTER_NO_TS)
+		return GF_OK;
+
+	//queue reference to source packet props
+	gf_filter_pck_ref_props(&pck_ref);
+	gf_list_add(ctx->src_packets, pck_ref);
+	gf_filter_pck_set_carousel_version(pck_ref, ctx->signal_reconfig ? 1 : 0);
+	ctx->signal_reconfig = GF_FALSE;
+
+	ctx->dec_frames++;
+	got_pic = 0;
+	ctx->reaggregation_size = 0;
+	nbpck = 0;
+
+	for (idx=0; idx<ctx->nb_streams; idx++) {
+		u64 dts, cts;
+
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[idx].ipid);
+		if (!pck) continue;
+
+		dts = gf_filter_pck_get_dts(pck);
+		cts = gf_filter_pck_get_cts(pck);
+		if (dts==GF_FILTER_NO_TS) dts = cts;
+
+		if (min_dts != GF_FILTER_NO_TS) {
+			if (min_dts != dts) continue;
+		} else if (min_cts != cts) {
+			continue;
+		}
+
+		data = (char *) gf_filter_pck_get_data(pck, &data_size);
+
+		if (ctx->streams[idx].inject_hdr) {
+			if (ctx->inject_buffer_alloc_size < ctx->streams[idx].inject_hdr_size + data_size) {
+				ctx->inject_buffer_alloc_size = ctx->streams[idx].inject_hdr_size + data_size;
+				ctx->inject_buffer = gf_realloc(ctx->inject_buffer, ctx->inject_buffer_alloc_size);
+			}
+			memcpy(ctx->inject_buffer, ctx->streams[idx].inject_hdr, ctx->streams[idx].inject_hdr_size);
+			memcpy(ctx->inject_buffer+ctx->streams[idx].inject_hdr_size, data, data_size);
+			data = ctx->inject_buffer;
+			data_size += ctx->streams[idx].inject_hdr_size;
+
+			gf_free(ctx->streams[idx].inject_hdr);
+			ctx->streams[idx].inject_hdr=NULL;
+			ctx->streams[idx].inject_hdr_size=0;
+			
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] Config changed, injecting param sets inband at DTS "LLU" CTS "LLU"\n", dts, cts));
+		}
+
+#ifdef  OPENHEVC_HAS_AVC_BASE
+		if (ctx->avc_base_id) {
+			if (ctx->avc_base_id == ctx->streams[idx].id) {
+				got_pic = oh_decode_lhvc(ctx->codec, (u8 *) data, NULL, data_size, 0, cts, 0);
+			} else if (ctx->cur_layer>1) {
+				got_pic = oh_decode_lhvc(ctx->codec, (u8*)NULL, (u8 *) data, 0, data_size, 0, cts);
+			}
+		} else
+#endif
+		{
+			if (ctx->nb_streams>1) {
+				if (ctx->reaggregation_alloc_size < ctx->reaggregation_size + data_size) {
+					ctx->reaggregation_alloc_size = ctx->reaggregation_size + data_size;
+					ctx->reaggregation_buffer = gf_realloc(ctx->reaggregation_buffer, sizeof(char)*ctx->reaggregation_alloc_size);
+				}
+				memcpy(ctx->reaggregation_buffer + ctx->reaggregation_size, data, sizeof(char)*data_size);
+				ctx->reaggregation_size += data_size;
+			} else {
+				got_pic = oh_decode(ctx->codec, (u8 *) data, data_size, cts);
+			}
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[HEVC Decoder] PID %s Decode CTS %d - size %d - got pic %d\n", gf_filter_pid_get_name(ctx->streams[idx].ipid), min_cts, data_size, got_pic));
+
+		if (got_pic>0)
+			has_pic = GF_TRUE;
+
+		gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+		nbpck++;
+	}
+
+	if (ctx->reaggregation_size) {
+		got_pic = oh_decode(ctx->codec, (u8 *) ctx->reaggregation_buffer, ctx->reaggregation_size, min_cts);
+		ctx->reaggregation_size = 0;
+		if (got_pic)
+			has_pic = GF_TRUE;
+	}
+
+
+	if (!has_pic) return GF_OK;
+
+	return ohevcdec_flush_picture(ctx);
+}
+
+static GF_Err ohevcdec_initialize(GF_Filter *filter)
+{
+	GF_SystemRTInfo rti;
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx *) gf_filter_get_udta(filter);
+	ctx->filter = filter;
+	if (!ctx->nb_threads) {
+		if (gf_sys_get_rti(0, &rti, 0) ) {
+			ctx->nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenHEVCDec] Initializing with %d threads\n", ctx->nb_threads));
+		}
+	}
+	ctx->src_packets = gf_list_new();
+	return GF_OK;
+}
+
+static void ohevcdec_finalize(GF_Filter *filter)
+{
+	GF_OHEVCDecCtx *ctx = (GF_OHEVCDecCtx *) gf_filter_get_udta(filter);
+	if (ctx->codec) {
+		if (!ctx->decoder_started) oh_start(ctx->codec);
+		oh_close(ctx->codec);
+	}
+	if (ctx->reaggregation_buffer) gf_free(ctx->reaggregation_buffer);
+	if (ctx->inject_buffer) gf_free(ctx->inject_buffer);
+
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+}
+
+static const GF_FilterCapability OHEVCDecCaps[] =
+{
+	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_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_TILE_BASE, GF_TRUE),
+
+#ifdef  OPENHEVC_HAS_AVC_BASE
+	CAP_UINT_PRIORITY(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AVC, 255),
+#endif
+
+	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)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_OHEVCDecCtx, _n)
+
+static const GF_FilterArgs OHEVCDecArgs[] =
+{
+	{ OFFS(threading), "set threading mode\n"
+	"- 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(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(reset_switch), "reset decoder at config change", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{0}
+};
+
+GF_FilterRegister OHEVCDecRegister = {
+	.name = "ohevcdec",
+	GF_FS_SET_DESCRIPTION("OpenHEVC decoder")
+	GF_FS_SET_HELP("This filter decodes HEVC and LHVC (HEVC scalable extensions) from one or more PIDs through the OpenHEVC library")
+	.private_size = sizeof(GF_OHEVCDecCtx),
+	SETCAPS(OHEVCDecCaps),
+	.initialize = ohevcdec_initialize,
+	.finalize = ohevcdec_finalize,
+	.args = OHEVCDecArgs,
+	.configure_pid = ohevcdec_configure_pid,
+	.process = ohevcdec_process,
+	.process_event = ohevcdec_process_event,
+	.max_extra_pids = (HEVC_MAX_STREAMS-1),
+	//by default take over FFMPEG
+	.priority = 100
+};
+
+#endif // defined(GPAC_HAS_OPENHEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+
+
+#ifndef GPAC_OPENHEVC_STATIC
+
+GPAC_MODULE_EXPORT
+GF_FilterRegister *RegisterFilter(GF_FilterSession *session)
+#else
+const GF_FilterRegister *ohevcdec_register(GF_FilterSession *session)
+#endif
+
+{
+#if defined(GPAC_HAS_OPENHEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+	return &OHEVCDecRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dec_opensvc.c Added

@@ -0,0 +1,597 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2010-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenSVC Decoder 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>
+
+#ifdef GPAC_HAS_OPENSVC
+
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+#  pragma comment(lib, "OpenSVCDecoder")
+#endif
+
+#include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
+
+#define SVC_MAX_STREAMS 3
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	u32 cfg_crc;
+	u32 id;
+	u32 dep_id;
+} GF_SVCStream;
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	GF_SVCStream streams[SVC_MAX_STREAMS];
+	u32 nb_streams, active_streams;
+	u32 width, stride, height, out_size;
+	GF_Fraction pixel_ar;
+
+	u32 nalu_size_length;
+
+	/*OpenSVC things*/
+	void *codec;
+	int LimitDqId;
+	int MaxDqId;
+	int DqIdTable[8];
+	int TemporalId;
+	int TemporalCom;
+
+	int layers[4];
+	GF_List *src_packets;
+} GF_OSVCDecCtx;
+
+static GF_Err osvcdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	Bool found=GF_TRUE;
+	const GF_PropertyValue *p;
+	u32 i, count, dep_id=0, id=0, cfg_crc=0;
+	s32 res;
+	OPENSVCFRAME Picture;
+	GF_OSVCDecCtx *ctx = (GF_OSVCDecCtx*) gf_filter_get_udta(filter);
+
+	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;
+			ctx->nb_streams = ctx->active_streams = 0;
+			if (ctx->codec) SVCDecoder_close(ctx->codec);
+			ctx->codec = NULL;
+			return GF_OK;
+		} else {
+			for (i=0; i<ctx->nb_streams; i++) {
+				if (ctx->streams[i].ipid == pid) {
+					ctx->streams[i].ipid = NULL;
+					ctx->streams[i].cfg_crc = 0;
+					memmove(&ctx->streams[i], &ctx->streams[i+1], sizeof(GF_SVCStream)*(ctx->nb_streams-1));
+					ctx->nb_streams--;
+					ctx->active_streams--;
+					return GF_OK;
+				}
+			}
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) dep_id = p->value.uint;
+
+	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) id = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (p && p->value.data.ptr && p->value.data.size) {
+		cfg_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		for (i=0; i<ctx->nb_streams; i++) {
+			if ((ctx->streams[i].ipid == pid) && (ctx->streams[i].cfg_crc == cfg_crc)) return GF_OK;
+		}
+	}
+
+	found = GF_FALSE;
+	for (i=0; i<ctx->active_streams; i++) {
+		if (ctx->streams[i].ipid == pid) {
+			ctx->streams[i].cfg_crc = cfg_crc;
+			found = GF_TRUE;
+		}
+	}
+	if (!found) {
+		if (ctx->nb_streams==SVC_MAX_STREAMS) {
+			return GF_NOT_SUPPORTED;
+		}
+		//insert new pid in order of dependencies
+		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)));
+				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_SVCStream) * (ctx->nb_streams-i-1));
+
+				ctx->streams[i+1].ipid = pid;
+				ctx->streams[i+1].cfg_crc = cfg_crc;
+				ctx->streams[i+1].dep_id = dep_id;
+				ctx->streams[i+1].id = id;
+				gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+				found = GF_TRUE;
+				if (!p)
+					p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+				break;
+			}
+			if (ctx->streams[i].dep_id == id) {
+				if (ctx->nb_streams > i+1)
+					memmove(&ctx->streams[i+1], &ctx->streams[i], sizeof(GF_SVCStream) * (ctx->nb_streams-i));
+
+				ctx->streams[i].ipid = pid;
+				ctx->streams[i].cfg_crc = cfg_crc;
+				ctx->streams[i].dep_id = dep_id;
+				ctx->streams[i].id = id;
+				gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+				found = GF_TRUE;
+				break;
+			}
+		}
+		if (!found) {
+			ctx->streams[ctx->nb_streams].ipid = pid;
+			ctx->streams[ctx->nb_streams].cfg_crc = cfg_crc;
+			ctx->streams[ctx->nb_streams].id = id;
+			ctx->streams[ctx->nb_streams].dep_id = dep_id;
+			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+		}
+		ctx->nb_streams++;
+		ctx->active_streams = ctx->nb_streams;
+	}
+
+	if (p && p->value.data.ptr) {
+		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(p->value.data.ptr, p->value.data.size);
+		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		if (!dep_id) {
+			ctx->nalu_size_length = cfg->nal_unit_size;
+			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+		}
+
+		/*decode all NALUs*/
+		count = gf_list_count(cfg->sequenceParameterSets);
+		SetCommandLayer(ctx->layers, 255, 0, &res, 0);//bufindex can be reset without pb
+		for (i=0; i<count; i++) {
+			u32 w=0, h=0;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			u32 sid;
+			s32 par_n=0, par_d=0;
+#endif
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)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);
+#endif
+			/*by default use the base layer*/
+			if (!i) {
+				if ((ctx->width<w) || (ctx->height<h)) {
+					ctx->width = w;
+					ctx->height = h;
+#ifndef GPAC_DISABLE_AV_PARSERS
+					if ( ((s32)par_n>0) && ((s32)par_d>0) ) {
+						ctx->pixel_ar.num = par_n;
+						ctx->pixel_ar.den = par_d;
+					}
+#endif
+				}
+			}
+			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, ctx->layers);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding SPS %d\n", res));
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", slc->id, slc->data[0] & 0x1F, slc->size));
+		}
+
+		count = gf_list_count(cfg->pictureParameterSets);
+		for (i=0; i<count; i++) {
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)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);
+#endif
+			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, ctx->layers);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding PPS %d\n", res));
+			}
+#ifndef GPAC_DISABLE_AV_PARSERS
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] Attach: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", pps_id, slc->data[0] & 0x1F, slc->size, sps_id));
+#endif
+
+		}
+		gf_odf_avc_cfg_del(cfg);
+	} else {
+		if (ctx->nalu_size_length) {
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->nalu_size_length = 0;
+		if (!ctx->codec) {
+			if (SVCDecoder_init(&ctx->codec) == SVC_STATUS_ERROR) return GF_IO_ERR;
+			SetCommandLayer(ctx->layers, 255, 0, &res, 0);
+		}
+		ctx->pixel_ar = (GF_Fraction){1, 1};
+	}
+	ctx->stride = ctx->width + 32;
+	ctx->LimitDqId = -1;
+	ctx->MaxDqId = 0;
+	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->streams[0].ipid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	
+	if (ctx->width) {
+		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) );
+		if (ctx->pixel_ar.num)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
+	}
+	return GF_OK;
+}
+
+
+static Bool osvcdec_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
+{
+	GF_OSVCDecCtx *ctx = (GF_OSVCDecCtx*) gf_filter_get_udta(filter);
+
+	if (fevt->base.type == GF_FEVT_QUALITY_SWITCH) {
+		if (fevt->quality_switch.up) {
+			if (ctx->LimitDqId == -1)
+				ctx->LimitDqId = ctx->MaxDqId;
+			if (ctx->LimitDqId < ctx->MaxDqId)
+				// set layer up (command=1)
+				UpdateLayer( ctx->DqIdTable, &ctx->LimitDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 1 );
+		} else {
+			if (ctx->LimitDqId > 0)
+				// set layer down (command=0)
+				UpdateLayer( ctx->DqIdTable, &ctx->LimitDqId, &ctx->TemporalCom, &ctx->TemporalId, ctx->MaxDqId, 0 );
+		}
+		//todo: we should get the set of pids active and trigger the switch up/down based on that
+		//rather than not canceling the event
+		return GF_FALSE;
+	}
+	return GF_FALSE;
+}
+
+static GF_Err osvcdec_process(GF_Filter *filter)
+{
+	s32 got_pic;
+	u64 min_dts = GF_FILTER_NO_TS;
+	u64 min_cts = GF_FILTER_NO_TS;
+	OPENSVCFRAME pic;
+	u32 i, count, idx, nalu_size, sc_size, nb_eos=0;
+	u8 *ptr;
+	u32 data_size;
+	u8 *data;
+	Bool has_pic = GF_FALSE;
+	GF_OSVCDecCtx *ctx = (GF_OSVCDecCtx*) gf_filter_get_udta(filter);
+	GF_FilterPacket *dst_pck, *src_pck, *pck_ref = NULL;
+
+	for (idx=0; idx<ctx->active_streams; idx++) {
+		u64 dts, cts;
+		if (!ctx->streams[idx].ipid) {
+			if (nb_eos) nb_eos++;
+			continue;
+		}
+		
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[idx].ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->streams[idx].ipid)) nb_eos++;
+			//make sure we do have a packet on the enhancement
+			else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[OpenSVC] no input packets on running pid %s - postponing decode\n", gf_filter_pid_get_name(ctx->streams[idx].ipid) ) );
+				return GF_OK;
+			}
+			continue;
+		}
+		dts = gf_filter_pck_get_dts(pck);
+		cts = gf_filter_pck_get_cts(pck);
+
+		data = (char *) gf_filter_pck_get_data(pck, &data_size);
+		//TODO: this is a clock signaling, for now just trash ..
+		if (!data) {
+			gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+			idx--;
+			continue;
+		}
+		if (dts==GF_FILTER_NO_TS) dts = cts;
+		//get packet with min dts (either a timestamp or a decode order number)
+		if (min_dts > dts) {
+			min_dts = dts;
+			if (cts == GF_FILTER_NO_TS) min_cts = min_dts;
+			else min_cts = cts;
+			pck_ref = pck;
+		}
+	}
+	if (nb_eos == ctx->active_streams) {
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_OK;
+	}
+	if (min_cts == GF_FILTER_NO_TS) return GF_OK;
+
+	//append in cts order since we get output frames in cts order
+	gf_filter_pck_ref_props(&pck_ref);
+	count = gf_list_count(ctx->src_packets);
+	src_pck = NULL;
+	for (i=0; i<count; i++) {
+		u64 acts;
+		src_pck = gf_list_get(ctx->src_packets, i);
+		acts = gf_filter_pck_get_cts(src_pck);
+		if (acts==min_cts) {
+			gf_filter_pck_unref(pck_ref);
+			break;
+		}
+		if (acts>min_cts) {
+			gf_list_insert(ctx->src_packets, pck_ref, i);
+			break;
+		}
+		src_pck = NULL;
+	}
+	if (!src_pck)
+		gf_list_add(ctx->src_packets, pck_ref);
+
+	pic.Width = pic.Height = 0;
+	for (idx=0; idx<ctx->nb_streams; idx++) {
+		u64 dts, cts;
+#ifndef GPAC_DISABLE_AV_PARSERS
+#ifndef GPAC_DISABLE_LOG
+		u32 sps_id, pps_id;
+#endif
+#endif
+		u32 maxDqIdInAU;
+		if (!ctx->streams[idx].ipid) continue;
+
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->streams[idx].ipid);
+		if (!pck) continue;
+
+		if (idx>=ctx->active_streams) {
+			gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+			continue;
+		}
+
+		dts = gf_filter_pck_get_dts(pck);
+		cts = gf_filter_pck_get_cts(pck);
+		if (dts==GF_FILTER_NO_TS) dts = cts;
+
+		if (min_dts != GF_FILTER_NO_TS) {
+			if (min_dts != dts) continue;
+		} else if (min_cts != cts) {
+			continue;
+		}
+
+		data = (char *) gf_filter_pck_get_data(pck, &data_size);
+
+		maxDqIdInAU = GetDqIdMax((unsigned char *) data, data_size, ctx->nalu_size_length, ctx->DqIdTable, ctx->nalu_size_length ? 1 : 0);
+		if (ctx->MaxDqId <= (s32) maxDqIdInAU) {
+			ctx->MaxDqId = (s32) maxDqIdInAU;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[OpenSVC] decode from stream %s - DTS "LLU" PTS "LLU" size %d - max DQID %d\n", gf_filter_pid_get_name(ctx->streams[idx].ipid), dts, cts, data_size, maxDqIdInAU) );
+
+
+		//we are asked to use a lower quality
+		if ((ctx->LimitDqId>=0) && (ctx->LimitDqId < (s32) maxDqIdInAU))
+			maxDqIdInAU = ctx->LimitDqId;
+
+		/*decode only current layer*/
+		SetCommandLayer(ctx->layers, ctx->MaxDqId, maxDqIdInAU, &ctx->TemporalCom, ctx->TemporalId);
+
+		got_pic = 0;
+		nalu_size = 0;
+		ptr = (u8 *) data;
+		sc_size = 0;
+
+		if (!ctx->nalu_size_length) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+			u32 size = gf_media_nalu_next_start_code((u8 *) data, data_size, &sc_size);
+			if (sc_size) {
+				ptr += size+sc_size;
+				assert(data_size >= size+sc_size);
+				data_size -= size+sc_size;
+			} else
+#endif
+			{
+				/*no annex-B start-code found, discard */
+				gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+				idx--;
+				continue;
+			}
+		}
+
+		while (data_size) {
+			int res;
+			if (ctx->nalu_size_length) {
+				for (i=0; i<ctx->nalu_size_length; i++) {
+					nalu_size = (nalu_size<<8) + ptr[i];
+				}
+				ptr += ctx->nalu_size_length;
+			} else {
+#ifndef GPAC_DISABLE_AV_PARSERS
+				nalu_size = gf_media_nalu_next_start_code(ptr, data_size, &sc_size);
+#else
+				nalu_size = data_size;
+				sc_size=0;
+#endif
+
+			}
+
+#if !defined(GPAC_DISABLE_LOG) && !defined(GPAC_DISABLE_AV_PARSERS)
+			if (gf_log_tool_level_on(GF_LOG_CODEC, GF_LOG_DEBUG)) {
+				switch (ptr[0] & 0x1F) {
+				case GF_AVC_NALU_SEQ_PARAM:
+				case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+					gf_avc_get_sps_info((char *)ptr, nalu_size, &sps_id, NULL, NULL, NULL, NULL);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVCDec] PID %s: SPS id=\"%d\" code=\"%d\" size=\"%d\"\n", gf_filter_pid_get_name(ctx->streams[idx].ipid), sps_id, ptr[0] & 0x1F, nalu_size));
+					break;
+				case GF_AVC_NALU_PIC_PARAM:
+					gf_avc_get_pps_info((char *)ptr, nalu_size, &pps_id, &sps_id);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] PID %s: PPS id=\"%d\" code=\"%d\" size=\"%d\" sps_id=\"%d\"\n", gf_filter_pid_get_name(ctx->streams[idx].ipid), pps_id, ptr[0] & 0x1F, nalu_size, sps_id));
+					break;
+				case GF_AVC_NALU_VDRD:
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] PID %s: VDRD found\n", gf_filter_pid_get_name(ctx->streams[idx].ipid)));
+					break;
+				default:
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[SVC Decoder] PID %s: NALU code=\"%d\" size=\"%d\"\n", gf_filter_pid_get_name(ctx->streams[idx].ipid), ptr[0] & 0x1F, nalu_size));
+				}
+			}
+#endif
+
+			if (!got_pic) {
+				res = decodeNAL(ctx->codec, ptr, nalu_size, &pic, ctx->layers);
+				if (res>0) got_pic = res;
+			} else {
+				res = decodeNAL(ctx->codec, ptr, nalu_size, &pic, ctx->layers);
+			}
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding NAL: %d\n", res));
+			}
+
+			ptr += nalu_size;
+			if (ctx->nalu_size_length) {
+				if (data_size < nalu_size + ctx->nalu_size_length) break;
+				data_size -= nalu_size + ctx->nalu_size_length;
+			} else {
+				if (!sc_size || (data_size < nalu_size + sc_size)) break;
+				data_size -= nalu_size + sc_size;
+				ptr += sc_size;
+			}
+		}
+		gf_filter_pid_drop_packet(ctx->streams[idx].ipid);
+
+		if (got_pic) has_pic = GF_TRUE;
+	}
+	if (!has_pic) 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 ));
+		ctx->width = pic.Width;
+		ctx->stride = pic.Width + 32;
+		ctx->height = pic.Height;
+		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+
+		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) );
+		if (ctx->pixel_ar.num)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
+	}
+
+	src_pck = gf_list_pop_front(ctx->src_packets);
+
+	if (src_pck && gf_filter_pck_get_seek_flag(src_pck)) {
+		gf_filter_pck_unref(src_pck);
+		return GF_OK;
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &data);
+	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);
+
+	if (src_pck) {
+		gf_filter_pck_merge_properties(src_pck, dst_pck);
+		gf_filter_pck_unref(src_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);
+	return GF_OK;
+}
+
+static GF_Err osvcdec_initialize(GF_Filter *filter)
+{
+	GF_OSVCDecCtx *ctx = (GF_OSVCDecCtx*) gf_filter_get_udta(filter);
+	ctx->src_packets = gf_list_new();
+	return GF_OK;
+}
+
+static void osvcdec_finalize(GF_Filter *filter)
+{
+	GF_OSVCDecCtx *ctx = (GF_OSVCDecCtx*) gf_filter_get_udta(filter);
+	if (ctx->codec) SVCDecoder_close(ctx->codec);
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+}
+
+static const GF_FilterCapability OSVCDecCaps[] =
+{
+	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,GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SVC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister OSVCDecRegister = {
+	.name = "osvcdec",
+	GF_FS_SET_DESCRIPTION("OpenSVC decoder")
+	GF_FS_SET_HELP("This filter decodes scalable AVC|H264 streams through OpenSVC library.")
+	.private_size = sizeof(GF_OSVCDecCtx),
+	SETCAPS(OSVCDecCaps),
+	.initialize = osvcdec_initialize,
+	.finalize = osvcdec_finalize,
+	.configure_pid = osvcdec_configure_pid,
+	.process = osvcdec_process,
+	.process_event = osvcdec_process_event,
+	.max_extra_pids = (SVC_MAX_STREAMS-1),
+	.priority = 255
+};
+
+#endif //GPAC_HAS_OPENSVC
+
+const GF_FilterRegister *osvcdec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_OPENSVC
+	return &OSVCDecRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dec_theora.c Added

@@ -0,0 +1,313 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / XIPH Theora decoder 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>
+
+#ifdef GPAC_HAS_THEORA
+
+#include <theora/theora.h>
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libtheora_static")
+# endif
+#endif
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	theora_info ti, the_ti;
+	theora_state td;
+	theora_comment tc;
+	ogg_packet op;
+
+	u32 cfg_crc;
+
+	GF_List *src_packets;
+	u64 next_cts;
+	Bool has_reconfigured;
+} GF_TheoraDecCtx;
+
+static GF_Err theoradec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	ogg_packet oggpacket;
+	GF_BitStream *bs;
+	GF_TheoraDecCtx *ctx = gf_filter_get_udta(filter);
+
+
+	if (is_remove) {
+		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;
+
+	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;
+		if (strncmp(&p->value.data.ptr[3], "theora", 6)) return GF_NON_COMPLIANT_BITSTREAM;
+		ex_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (ctx->cfg_crc == ex_crc) return GF_OK;
+		ctx->cfg_crc = ex_crc;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[Theora] Reconfiguring without DSI not yet supported\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+
+	if (ctx->ipid) {
+		theora_clear(&ctx->td);
+		theora_info_clear(&ctx->ti);
+		theora_comment_clear(&ctx->tc);
+	}
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
+	oggpacket.granulepos = -1;
+	oggpacket.b_o_s = 1;
+	oggpacket.e_o_s = 0;
+	oggpacket.packetno = 0;
+
+	theora_info_init(&ctx->ti);
+	theora_comment_init(&ctx->tc);
+
+	bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Err e = GF_OK;
+		oggpacket.bytes = gf_bs_read_u16(bs);
+		oggpacket.packet = gf_malloc(sizeof(char) * oggpacket.bytes);
+		gf_bs_read_data(bs, oggpacket.packet, oggpacket.bytes);
+		if (theora_decode_header(&ctx->ti, &ctx->tc, &oggpacket) < 0 ) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_free(oggpacket.packet);
+		if (e)	{
+			gf_bs_del(bs);
+			return e;
+		}
+	}
+	theora_decode_init(&ctx->td, &ctx->ti);
+	gf_bs_del(bs);
+
+	return GF_OK;
+}
+
+static GF_Err theoradec_process(GF_Filter *filter)
+{
+	ogg_packet op;
+	yuv_buffer yuv;
+	u32 i, count;
+	u8 *buffer;
+	u8 *pYO, *pUO, *pVO;
+	u8 *pYD, *pUD, *pVD;
+	GF_TheoraDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck, *src_pck, *pck_ref;
+	Bool is_seek;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck && !gf_filter_pid_is_eos(ctx->ipid))
+		return GF_OK;
+
+	memset(&yuv, 0, sizeof(yuv_buffer));
+	memset(&op, 0, sizeof(ogg_packet));
+	op.granulepos = -1;
+
+	if (pck) {
+		u64 cts = gf_filter_pck_get_cts(pck);
+		u32 psize;
+		op.packet = (char *) gf_filter_pck_get_data(pck, &psize);
+		op.bytes = psize;
+
+
+		//append in cts order since we get output frames in cts order
+		pck_ref = pck;
+		gf_filter_pck_ref_props(&pck_ref);
+		count = gf_list_count(ctx->src_packets);
+		src_pck = NULL;
+		for (i=0; i<count; i++) {
+			u64 acts;
+			src_pck = gf_list_get(ctx->src_packets, i);
+			acts = gf_filter_pck_get_cts(src_pck);
+			if (acts==cts) {
+				gf_filter_pck_unref(pck_ref);
+				break;
+			}
+			if (acts>cts) {
+				gf_list_insert(ctx->src_packets, pck_ref, i);
+				break;
+			}
+			src_pck = NULL;
+		}
+		if (!src_pck)
+			gf_list_add(ctx->src_packets, pck_ref);
+
+	} else {
+		//weird bug in theora dec: even though we feed empty packets, we still keep getting frames !
+		if (!gf_list_count(ctx->src_packets)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		op.packet = NULL;
+		op.bytes = 0;
+	}
+
+	if (theora_decode_packetin(&ctx->td, &op) != 0) {
+		src_pck = gf_list_pop_front(ctx->src_packets);
+		gf_filter_pck_unref(src_pck);
+		if (pck) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+	//no frame
+	if (theora_decode_YUVout(&ctx->td, &yuv) != 0) {
+		if (pck) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+
+	if (memcmp(&ctx->ti, &ctx->the_ti, sizeof(theora_info))) {
+		memcpy(&ctx->the_ti, &ctx->ti, sizeof(theora_info));
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->ti.width));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->ti.height));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->ti.width));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, &PROP_FRAC_INT(ctx->ti.fps_numerator, ctx->ti.fps_denominator) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->ti.width*ctx->ti.height * 3 / 2, &buffer);
+
+	pYO = yuv.y;
+	pUO = yuv.u;
+	pVO = yuv.v;
+	pYD = buffer;
+	pUD = buffer + ctx->ti.width * ctx->ti.height;
+	pVD = buffer + 5 * ctx->ti.width * ctx->ti.height / 4;
+
+	for (i=0; i<(u32)yuv.y_height; i++) {
+		memcpy(pYD, pYO, sizeof(char) * yuv.y_width);
+		pYD += ctx->ti.width;
+		pYO += yuv.y_stride;
+		if (i%2) continue;
+
+		memcpy(pUD, pUO, sizeof(char) * yuv.uv_width);
+		memcpy(pVD, pVO, sizeof(char) * yuv.uv_width);
+		pUD += ctx->ti.width/2;
+		pVD += ctx->ti.width/2;
+		pUO += yuv.uv_stride;
+		pVO += yuv.uv_stride;
+	}
+
+	src_pck = gf_list_pop_front(ctx->src_packets);
+	if (src_pck) {
+		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);
+		ctx->next_cts += gf_filter_pck_get_duration(src_pck);
+		gf_filter_pck_unref(src_pck);
+	} else {
+		is_seek = 0;
+		gf_filter_pck_set_cts(dst_pck, ctx->next_cts);
+	}
+
+	if (!pck || !is_seek )
+		gf_filter_pck_send(dst_pck);
+	else
+		gf_filter_pck_discard(dst_pck);
+
+	if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err theoradec_initialize(GF_Filter *filter)
+{
+	GF_TheoraDecCtx *ctx = gf_filter_get_udta(filter);
+	ctx->src_packets = gf_list_new();
+	return GF_OK;
+}
+static void theoradec_finalize(GF_Filter *filter)
+{
+	GF_TheoraDecCtx *ctx = gf_filter_get_udta(filter);
+
+	theora_clear(&ctx->td);
+	theora_info_clear(&ctx->ti);
+	theora_comment_clear(&ctx->tc);
+
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+}
+
+static const GF_FilterCapability TheoraDecCaps[] =
+{
+	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,GF_PROP_PID_CODECID, GF_CODECID_THEORA),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister TheoraDecRegister = {
+	.name = "theoradec",
+	GF_FS_SET_DESCRIPTION("Theora decoder")
+	GF_FS_SET_HELP("This filter decodes Theora streams through libtheora library.")
+	.private_size = sizeof(GF_TheoraDecCtx),
+	.priority = 1,
+	SETCAPS(TheoraDecCaps),
+	.initialize = theoradec_initialize,
+	.finalize = theoradec_finalize,
+	.configure_pid = theoradec_configure_pid,
+	.process = theoradec_process,
+};
+
+#endif
+
+const GF_FilterRegister *theoradec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_THEORA
+	return &TheoraDecRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/dec_ttml.c Added

@@ -0,0 +1,536 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / TTML decoder 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>
+
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/xml.h>
+
+#include "../scenegraph/qjs_common.h"
+
+typedef struct
+{
+	//opts
+	char *script;
+	char *color, *font;
+	Float fontSize, lineSpacing, txtx, txty;
+	u32 txtw, txth, valign;
+
+	GF_FilterPid *ipid, *opid;
+
+	/* Boolean indicating the internal graph is registered with the compositor */
+	Bool graph_registered;
+	/* Boolean indicating the stream is playing */
+	Bool is_playing;
+
+	/* Parent scene to which this TTML stream is linked */
+	GF_Scene *scene;
+	/* root object manager of parent scene (used to get clock info)*/
+	GF_ObjectManager *odm;
+
+	/* Scene graph for the subtitle content */
+	GF_SceneGraph *scenegraph;
+
+	Bool update_args;
+
+	GF_BitStream *subs_bs;
+	s32 notify_clock;
+
+} GF_TTMLDec;
+
+void ttmldec_update_size_info(GF_TTMLDec *ctx)
+{
+	u32 w, h;
+	GF_FieldInfo info;
+	Bool has_size;
+	char szVB[100];
+	GF_Node *root = gf_sg_get_root_node(ctx->scenegraph);
+	if (!root) return;
+
+	has_size = gf_sg_get_scene_size_info(ctx->scene->graph, &w, &h);
+	/*no size info is given in main scene, override by associated video size if any, or by text track size*/
+	if (!has_size) {
+		const GF_PropertyValue *p;
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_WIDTH);
+		if (p) w = p->value.uint;
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_HEIGHT);
+		if (p) h = p->value.uint;
+
+		if (!w) w = ctx->txtw;
+		if (!h) h = ctx->txth;
+
+		gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+		gf_scene_force_size(ctx->scene, w, h);
+	}
+
+	gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+
+	sprintf(szVB, "0 0 %d %d", w, h);
+	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(root, &info, szVB, 0);
+
+	/*apply*/
+	gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+
+	sprintf(szVB, "0 0 %d %d", w, h);
+	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(root, &info, szVB, 0);
+
+}
+
+void ttmldec_setup_scene(GF_TTMLDec *ctx)
+{
+	GF_Node *n, *root;
+	GF_FieldInfo info;
+
+	ctx->scenegraph = gf_sg_new_subscene(ctx->scene->graph);
+
+	if (!ctx->scenegraph) return;
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/2000/svg", NULL);
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/1999/xlink", "xlink");
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/2001/xml-events", "ev");
+	gf_sg_set_scene_size_info(ctx->scenegraph, 800, 600, GF_TRUE);
+
+	/* modify the scene with an Inline/Animation pointing to the TTML Renderer */
+	n = root = gf_node_new(ctx->scenegraph, TAG_SVG_svg);
+	gf_node_register(root, NULL);
+	gf_sg_set_root_node(ctx->scenegraph, root);
+	gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
+	ttmldec_update_size_info(ctx);
+	gf_node_init(n);
+
+	n = gf_node_new(ctx->scenegraph, TAG_SVG_script);
+	gf_node_register(n, root);
+	gf_node_list_add_child(&((GF_ParentNode *)root)->children, n);
+
+	gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
+	if (strstr(ctx->script, ":\\")) {
+		gf_svg_parse_attribute(n, &info, (char *) ctx->script, 0);
+	} else {
+		char szPath[GF_MAX_PATH];
+		strcpy(szPath, "file://");
+		strcat(szPath, ctx->script);
+		gf_svg_parse_attribute(n, &info, (char *) szPath, 0);
+	}
+
+	gf_node_init(n);
+
+}
+
+static GF_Err ttmldec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	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;
+		return GF_OK;
+	}
+	//TODO: we need to cleanup cap checking upon reconfigure
+	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
+	assert(!ctx->ipid || (ctx->ipid == pid));
+
+	ctx->ipid = pid;
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+
+	return GF_OK;
+}
+
+
+static void ttmldec_toggle_display(GF_TTMLDec *ctx)
+{
+	if (!ctx->scenegraph) return;
+
+	if (ctx->is_playing) {
+		if (!ctx->graph_registered) {
+			ttmldec_update_size_info(ctx);
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_FALSE);
+			ctx->graph_registered = GF_TRUE;
+		}
+	 } else {
+		if (ctx->graph_registered) {
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_TRUE);
+			ctx->graph_registered = GF_FALSE;
+		}
+	}
+}
+
+static Bool ttmldec_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	GF_TTMLDec *ctx = gf_filter_get_udta(filter);
+
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_RESET_SCENE:
+		if (ctx->opid != com->attach_scene.on_pid) return GF_TRUE;
+		ctx->is_playing = GF_FALSE;
+		ttmldec_toggle_display(ctx);
+
+		gf_sg_del(ctx->scenegraph);
+		ctx->scenegraph = NULL;
+		ctx->scene = NULL;
+		return GF_TRUE;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		ttmldec_toggle_display(ctx);
+		return GF_FALSE;
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		ttmldec_toggle_display(ctx);
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (ctx->opid != com->attach_scene.on_pid) return GF_TRUE;
+
+	ctx->odm = com->attach_scene.object_manager;
+	ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+
+	/*timedtext cannot be a root scene object*/
+	if (ctx->odm->subscene) {
+		ctx->odm = NULL;
+		ctx->scene = NULL;
+	 } else {
+		 ttmldec_setup_scene(ctx);
+		 ttmldec_toggle_display(ctx);
+	 }
+	 return GF_TRUE;
+}
+
+void js_dump_error(JSContext *ctx);
+
+JSContext *ttmldec_get_js_context(GF_TTMLDec *ctx)
+{
+	GF_SceneGraph *sg = ctx->scenegraph->RootNode->sgprivate->scenegraph;
+	JSContext *svg_script_get_context(GF_SceneGraph *sg);
+	JSContext *c = svg_script_get_context(sg);
+
+	if (ctx->update_args) {
+		JSValue global = JS_GetGlobalObject(c);
+
+		JS_SetPropertyStr(c, global, "fontSize", JS_NewFloat64(c, ctx->fontSize));
+		JS_SetPropertyStr(c, global, "fontFamily", JS_NewString(c, ctx->font));
+		JS_SetPropertyStr(c, global, "textColor", JS_NewString(c, ctx->color));
+		JS_SetPropertyStr(c, global, "lineSpaceFactor", JS_NewFloat64(c, ctx->lineSpacing));
+		JS_SetPropertyStr(c, global, "xOffset", JS_NewFloat64(c, ctx->txtx));
+		JS_SetPropertyStr(c, global, "yOffset", JS_NewFloat64(c, ctx->txty));
+		JS_SetPropertyStr(c, global, "v_align", JS_NewInt32(c, ctx->valign));
+
+		JS_FreeValue(c, global);
+		ctx->update_args = GF_FALSE;
+	}
+	return c;
+}
+
+
+
+static GF_Err ttmldec_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	const GF_PropertyValue *subs;
+	GF_FilterPacket *pck;
+	const u8 *pck_data;
+	char *pck_alloc=NULL, *ttml_doc;
+	u64 cts;
+	u32 timescale, obj_time;
+	u32 pck_size;
+	JSValue fun_val;
+	JSValue global;
+	JSContext *c;
+	GF_TTMLDec *ctx = (GF_TTMLDec *) gf_filter_get_udta(filter);
+
+	if (!ctx->scene) {
+		if (ctx->is_playing) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		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;
+	}
+
+	c = ttmldec_get_js_context(ctx);
+	if (!c) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_SERVICE_ERROR;
+	}
+
+	//object clock shall be valid
+	if (!ctx->odm->ck)
+		return GF_OK;
+
+	cts = gf_filter_pck_get_cts( pck );
+	timescale = gf_filter_pck_get_timescale(pck);
+
+	gf_odm_check_buffering(ctx->odm, ctx->ipid);
+
+	//we still process any frame before our clock time even when buffering
+	obj_time = gf_clock_time(ctx->odm->ck);
+
+	if (ctx->notify_clock>0) {
+		gf_js_lock(c, GF_TRUE);
+		global = JS_GetGlobalObject(c);
+		fun_val = JS_GetPropertyStr(c, global, "on_ttml_clock");
+		if (JS_IsFunction(c, fun_val) ) {
+			JSValue ret, argv[1];
+			argv[0] = JS_NewInt64(c, obj_time);
+
+			ret = JS_Call(c, fun_val, global, 1, argv);
+			if (JS_IsException(ret)) {
+				js_dump_error(c);
+				e = GF_BAD_PARAM;
+			}
+
+			if (JS_IsNumber(ret)) {
+				JS_ToInt32(c, &ctx->notify_clock, ret);
+			} else {
+				ctx->notify_clock = 0;
+			}
+
+			JS_FreeValue(c, ret);
+			JS_FreeValue(c, argv[0]);
+		}
+		JS_FreeValue(c, global);
+		JS_FreeValue(c, fun_val);
+		gf_js_lock(c, GF_FALSE);
+		if (e) return e;
+	}
+
+	if (cts * 1000 > obj_time * timescale) {
+		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);
+	subs = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
+
+	ttml_doc = (char *) pck_data;
+	if (subs) {
+		Bool first = GF_TRUE;
+		gf_bs_reassign_buffer(ctx->subs_bs, subs->value.data.ptr, subs->value.data.size);
+		while (gf_bs_available(ctx->subs_bs)) {
+			/*u32 flags = */gf_bs_read_u32(ctx->subs_bs);
+			u32 subs_size = gf_bs_read_u32(ctx->subs_bs);
+			/*u32 reserved = */gf_bs_read_u32(ctx->subs_bs);
+			/*u8 priority = */gf_bs_read_u8(ctx->subs_bs);
+			/*u8 discardable = */gf_bs_read_u8(ctx->subs_bs);
+
+			if (first) {
+				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));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				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;
+			}
+		}
+	}
+
+	GF_DOMParser *dom = gf_xml_dom_new();
+	gf_xml_dom_parse_string(dom, ttml_doc);
+
+
+	gf_js_lock(c, GF_TRUE);
+	global = JS_GetGlobalObject(c);
+	fun_val = JS_GetPropertyStr(c, global, "on_ttml_sample");
+	if (!JS_IsFunction(c, fun_val) ) {
+		e = GF_BAD_PARAM;
+	} else {
+		JSValue ret, argv[3];
+		Double scene_ck;
+		GF_SceneGraph *doc;
+
+		doc = gf_sg_new();
+		doc->reference_count = 1;
+		e = gf_sg_init_from_xml_node(doc, gf_xml_dom_get_root(dom));
+		argv[0] = dom_document_construct_external(c, doc);
+
+		argv[1] = JS_NewInt64(c, obj_time);
+		scene_ck = gf_filter_pck_get_duration(pck);
+		scene_ck /= timescale;
+		argv[2] = JS_NewFloat64(c, scene_ck);
+
+		ret = JS_Call(c, fun_val, global, 3, argv);
+		if (JS_IsException(ret)) {
+			js_dump_error(c);
+			e = GF_BAD_PARAM;
+		}
+		if (JS_IsNumber(ret)) {
+			JS_ToInt32(c, &ctx->notify_clock, ret);
+		} else {
+			ctx->notify_clock = 0;
+		}
+
+		doc->reference_count --;
+		JS_FreeValue(c, ret);
+		JS_FreeValue(c, argv[0]);
+		JS_FreeValue(c, argv[1]);
+		JS_FreeValue(c, argv[2]);
+	}
+	JS_FreeValue(c, global);
+	JS_FreeValue(c, fun_val);
+
+	gf_js_lock(c, GF_FALSE);
+
+
+	gf_xml_dom_del(dom);
+
+	if (pck_alloc) gf_free(pck_alloc);
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	if (ctx->notify_clock>0) {
+		if (ctx->scene && ctx->scene->compositor->player)
+			gf_filter_ask_rt_reschedule(filter, ctx->notify_clock*1000);
+		else
+			gf_filter_post_process_task(filter);
+	}
+	return e;
+}
+
+static GF_Err ttmldec_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_TTMLDec *ctx = gf_filter_get_udta(filter);
+	ctx->update_args = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err ttmldec_initialize(GF_Filter *filter)
+{
+	GF_TTMLDec *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->script) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TTMLDec] TTML JS renderer script not set\n"));
+		return GF_BAD_PARAM;
+	} else if (!gf_file_exists(ctx->script)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TTMLDec] TTML JS renderer script %s not found\n", ctx->script));
+		return GF_URL_ERROR;
+	}
+	ctx->subs_bs = gf_bs_new((u8 *)ctx, 1, GF_BITSTREAM_READ);
+
+	ctx->update_args = GF_TRUE;
+#ifdef GPAC_ENABLE_COVERAGE
+	ttmldec_update_arg(filter, NULL, NULL);
+#endif
+	return GF_OK;
+}
+
+void ttmldec_finalize(GF_Filter *filter)
+{
+	GF_TTMLDec *ctx = (GF_TTMLDec *) gf_filter_get_udta(filter);
+
+	if (ctx->scenegraph) {
+		ctx->is_playing = GF_FALSE;
+		ttmldec_toggle_display(ctx);
+		gf_sg_del(ctx->scenegraph);
+	}
+	gf_bs_del(ctx->subs_bs);
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_TTMLDec, _n)
+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(valign), "vertical alignment\n"
+	"- bottom: align text at bottom of text area\n"
+	"- center: align text at center of text area\n"
+	"- top: align text at top of text area", GF_PROP_UINT, "bottom", "bottom|center|top", 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},
+	{ OFFS(txtw), "default width in standalone rendering", GF_PROP_UINT, "400", NULL, 0},
+	{ OFFS(txth), "default height in standalone rendering", GF_PROP_UINT, "200", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability TTMLDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SUBS_XML),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister TTMLDecRegister = {
+	.name = "ttmldec",
+	GF_FS_SET_DESCRIPTION("TTML decoder")
+	GF_FS_SET_HELP("This filter decodes TTML streams into a SVG scene graph of the compositor filter.\n"
+		"The scene graph creation is done through JavaScript.\n"
+		"The filter options are used to override the JS global variables of the TTML renderer.")
+	.private_size = sizeof(GF_TTMLDec),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = TTMLDecArgs,
+	.priority = 1,
+	SETCAPS(TTMLDecCaps),
+	.initialize = ttmldec_initialize,
+	.finalize = ttmldec_finalize,
+	.process = ttmldec_process,
+	.configure_pid = ttmldec_configure_pid,
+	.process_event = ttmldec_process_event,
+	.update_arg = ttmldec_update_arg
+};
+
+#endif
+
+const GF_FilterRegister *ttmldec_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+	return &TTMLDecRegister;
+#else
+	return NULL;
+#endif
+}
+
+

gpac-1.0.0.tar.gz/src/filters/dec_ttxt.c Added

@@ -0,0 +1,1354 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / 3GPP/MPEG4 text renderer 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/isomedia_dev.h>
+#include <gpac/utf.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/internal/compositor_dev.h>
+
+
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
+
+
+/*
+	this decoder is simply a scene decoder generating its own scene graph based on input data,
+	this scene graph is then used as an extra graph by the renderer, and manipulated by the decoder
+	for any time animation handling.
+	Translation from text to MPEG-4 scene graph:
+		* all modifiers (styles, hilight, etc) are unrolled into chunks forming a unique, linear
+	sequence of text data (startChar, endChar) with associated styles & modifs
+		* chunks are mapped to classic MPEG-4/VRML text
+		* these chunks are then gathered in a Form node (supported by 2D and 3D renderers), with
+	text truncation at each newline char.
+		* the Form then performs all alignment of the chunks
+
+	It could be possible to use Layout instead of form, BUT layout cannot handle new lines at the time being...
+
+	Currently supported for 3GP text streams:
+		* text box positioning & filling, dynamic text box
+		* text color
+		* proper alignment (H and V) with horizontal text. Vertical text may not be properly layed out (not fully tested)
+		* style Records (font, size, fontstyles, and colors change) - any nb per sample supported
+		* hilighting (static only) with color or reverse video - any nb per sample supported
+		* hypertext links - any nb per sample supported
+		* blinking - any nb per sample supported
+		* complete scrolling: in, out, in+out, up, down, right and left directions. All other
+		modifiers are supported when scrolling
+		* scroll delay
+
+	It does NOT support:
+		* dynamic hilighting (karaoke)
+		* wrap
+
+	The decoder only accepts complete timed text units TTU(1). In band reconfig (TTU(5) is not supported,
+	nor fragmented TTUs (2, 3, 4).
+	UTF16 support should work but MP4Box does not support it at encoding time.
+*/
+
+typedef struct
+{
+	//opts
+	Bool texture, outline;
+	u32 txtw, txth;
+
+	GF_FilterPid *ipid, *opid;
+
+	GF_ObjectManager *odm;
+	GF_Scene *scene;
+	u32 dsi_crc;
+	Bool is_tx3g;
+	Bool is_playing, graph_registered, is_eos;
+
+
+	GF_TextConfig *cfg;
+	GF_BitStream *bs_r;
+
+	GF_SceneGraph *scenegraph;
+
+	/*avoid searching the graph for things we know...*/
+	M_Transform2D *tr_track, *tr_box, *tr_scroll;
+	M_Material2D *mat_track, *mat_box;
+	M_Layer2D *dlist;
+	M_Rectangle *rec_box, *rec_track;
+
+	M_TimeSensor *ts_blink, *ts_scroll;
+	M_ScalarInterpolator *process_blink, *process_scroll;
+	GF_Route *time_route;
+	GF_List *blink_nodes;
+	u32 scroll_type, scroll_mode;
+	Fixed scroll_time, scroll_delay;
+	Bool timer_active;
+} GF_TTXTDec;
+
+
+static void ttd_set_blink_fraction(GF_Node *node, GF_Route *route);
+static void ttd_set_scroll_fraction(GF_Node *node, GF_Route *route);
+static void ttd_reset_display(GF_TTXTDec *ctx);
+
+/*the WORST thing about 3GP in MPEG4 is positioning of the text track...*/
+static void ttd_update_size_info(GF_TTXTDec *ctx)
+{
+	u32 w, h;
+	Bool has_size;
+	s32 offset, thw, thh, vw, vh;
+
+	has_size = gf_sg_get_scene_size_info(ctx->scene->graph, &w, &h);
+	/*no size info is given in main scene, override by associated video size if any, or by text track size*/
+	if (!has_size) {
+		if (ctx->cfg->has_vid_info && ctx->cfg->video_width && ctx->cfg->video_height) {
+			gf_sg_set_scene_size_info(ctx->scenegraph, ctx->cfg->video_width, ctx->cfg->video_height, GF_TRUE);
+		} else if (ctx->cfg->text_width && ctx->cfg->text_height) {
+			gf_sg_set_scene_size_info(ctx->scenegraph, ctx->cfg->text_width, ctx->cfg->text_height, GF_TRUE);
+		} else {
+			gf_sg_set_scene_size_info(ctx->scenegraph, ctx->txtw, ctx->txth, GF_TRUE);
+		}
+		gf_sg_get_scene_size_info(ctx->scenegraph, &w, &h);
+		if (!w || !h) return;
+		gf_scene_force_size(ctx->scene, w, h);
+	}
+
+	if (!w || !h) return;
+	/*apply*/
+	gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+	/*make sure the scene size is big enough to contain the text track after positioning. RESULTS ARE UNDEFINED
+	if offsets are negative: since MPEG-4 uses centered coord system, we must assume video is aligned to top-left*/
+	if (ctx->cfg->has_vid_info) {
+		Bool set_size = GF_FALSE;
+		vw = ctx->cfg->horiz_offset;
+		if (vw<0) vw = 0;
+		vh = ctx->cfg->vert_offset;
+		if (vh<0) vh = 0;
+		if (ctx->cfg->text_width + (u32) vw > w) {
+			w = ctx->cfg->text_width+vw;
+			set_size = GF_TRUE;
+		}
+		if (ctx->cfg->text_height + (u32) vh > h) {
+			h = ctx->cfg->text_height+vh;
+			set_size = GF_TRUE;
+		}
+		if (set_size) {
+			gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+			gf_scene_force_size(ctx->scene, w, h);
+		}
+	} else {
+		/*otherwise override (mainly used for SRT & TTXT file direct loading*/
+		ctx->cfg->text_width = w;
+		ctx->cfg->text_height = h;
+	}
+
+	/*ok override video size with main scene size*/
+	ctx->cfg->video_width = w;
+	ctx->cfg->video_height = h;
+
+	vw = (s32) w;
+	vh = (s32) h;
+	thw = ctx->cfg->text_width / 2;
+	thh = ctx->cfg->text_height / 2;
+	/*check translation, we must not get out of scene size - not supported in GPAC*/
+	offset = ctx->cfg->horiz_offset - vw/2 + thw;
+	/*safety checks ?
+	if (offset + thw < - vw/2) offset = - vw/2 + thw;
+	else if (offset - thw > vw/2) offset = vw/2 - thw;
+	*/
+	ctx->tr_track->translation.x = INT2FIX(offset);
+
+	offset = vh/2 - ctx->cfg->vert_offset - thh;
+	/*safety checks ?
+	if (offset + thh > vh/2) offset = vh/2 - thh;
+	else if (offset - thh < -vh/2) offset = -vh/2 + thh;
+	*/
+	ctx->tr_track->translation.y = INT2FIX(offset);
+
+	gf_node_changed((GF_Node *)ctx->tr_track, NULL);
+}
+
+static GFINLINE void ttd_add_child(GF_Node *n1, GF_Node *par)
+{
+	gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n1);
+	gf_node_register(n1, par);
+}
+
+
+static GFINLINE GF_Node *ttd_create_node(GF_TTXTDec *ttd, u32 tag, const char *def_name)
+{
+	GF_Node *n = gf_node_new(ttd->scenegraph, tag);
+	if (n) {
+		if (def_name) gf_node_set_id(n, gf_sg_get_next_available_node_id(ttd->scenegraph), def_name);
+		gf_node_init(n);
+	}
+	return n;
+}
+
+static GF_Err ttd_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_TTXTDec *ctx = gf_filter_get_udta(filter);
+	GF_Err e;
+	u32 st, codecid, dsi_crc;
+	const GF_PropertyValue *p, *dsi;
+
+	if (is_remove) {
+		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		ctx->opid = ctx->ipid = NULL;
+		return GF_OK;
+	}
+	//TODO: we need to cleanup cap checking upon reconfigure
+	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
+	assert(!ctx->ipid || (ctx->ipid == pid));
+
+	st = codecid = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) st = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) codecid = p->value.uint;
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!dsi) return GF_NOT_SUPPORTED;
+
+	if (st != GF_STREAM_TEXT) return GF_NOT_SUPPORTED;
+
+	dsi_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+	if (dsi_crc == ctx->dsi_crc) return GF_OK;
+	ctx->dsi_crc = dsi_crc;
+
+	if (ctx->cfg) gf_odf_desc_del((GF_Descriptor *) ctx->cfg);
+	ctx->cfg = (GF_TextConfig *) gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
+	if (codecid == GF_CODECID_TEXT_MPEG4) {
+		e = gf_odf_get_text_config(dsi->value.data.ptr, dsi->value.data.size, codecid, ctx->cfg);
+		if (e) {
+			gf_odf_desc_del((GF_Descriptor *) ctx->cfg);
+			ctx->cfg = NULL;
+			return e;
+		}
+		ctx->is_tx3g = GF_FALSE;
+	} else if (codecid == GF_CODECID_TX3G) {
+		GF_TextSampleDescriptor * sd = gf_odf_tx3g_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (!sd) {
+			gf_odf_desc_del((GF_Descriptor *) ctx->cfg);
+			ctx->cfg = NULL;
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_list_add(ctx->cfg->sample_descriptions, sd);
+		ctx->is_tx3g = GF_TRUE;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p && !ctx->cfg->timescale) ctx->cfg->timescale = p->value.uint;
+
+	ctx->ipid = pid;
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+
+	return GF_OK;
+}
+
+static void ttd_setup_scene(GF_TTXTDec *ctx)
+{
+	GF_Node *root, *n1, *n2;
+	if (ctx->scenegraph) return;
+
+	ctx->scenegraph = gf_sg_new_subscene(ctx->scene->graph);
+
+	root = ttd_create_node(ctx, TAG_MPEG4_OrderedGroup, NULL);
+	gf_sg_set_root_node(ctx->scenegraph, root);
+	gf_node_register(root, NULL);
+	/*root transform*/
+	ctx->tr_track = (M_Transform2D *)ttd_create_node(ctx, TAG_MPEG4_Transform2D, NULL);
+	ttd_add_child((GF_Node *) ctx->tr_track, root);
+
+	ttd_update_size_info(ctx);
+
+	/*txt track background*/
+	n1 = ttd_create_node(ctx, TAG_MPEG4_Shape, NULL);
+	ttd_add_child(n1, (GF_Node *) ctx->tr_track);
+	((M_Shape *)n1)->appearance = ttd_create_node(ctx, TAG_MPEG4_Appearance, NULL);
+	gf_node_register(((M_Shape *)n1)->appearance, n1);
+	ctx->mat_track = (M_Material2D *) ttd_create_node(ctx, TAG_MPEG4_Material2D, NULL);
+	ctx->mat_track->filled = 1;
+	ctx->mat_track->transparency = 1;
+	((M_Appearance *) ((M_Shape *)n1)->appearance)->material = (GF_Node *) ctx->mat_track;
+	gf_node_register((GF_Node *) ctx->mat_track, ((M_Shape *)n1)->appearance);
+	n2 = ttd_create_node(ctx, TAG_MPEG4_Rectangle, NULL);
+	((M_Rectangle *)n2)->size.x = 0;
+	((M_Rectangle *)n2)->size.y = 0;
+	((M_Shape *)n1)->geometry = n2;
+	gf_node_register(n2, n1);
+	ctx->rec_track = (M_Rectangle *)n2;
+
+	/*txt box background*/
+	ctx->tr_box = (M_Transform2D *) ttd_create_node(ctx, TAG_MPEG4_Transform2D, NULL);
+	ttd_add_child((GF_Node*) ctx->tr_box, (GF_Node*)ctx->tr_track);
+	n1 = ttd_create_node(ctx, TAG_MPEG4_Shape, NULL);
+	ttd_add_child(n1, (GF_Node*)ctx->tr_box);
+	((M_Shape *)n1)->appearance = ttd_create_node(ctx, TAG_MPEG4_Appearance, NULL);
+	gf_node_register(((M_Shape *)n1)->appearance, n1);
+	ctx->mat_box = (M_Material2D *) ttd_create_node(ctx, TAG_MPEG4_Material2D, NULL);
+	ctx->mat_box->filled = 1;
+	ctx->mat_box->transparency = 1;
+	((M_Appearance *) ((M_Shape *)n1)->appearance)->material = (GF_Node *)ctx->mat_box;
+	gf_node_register((GF_Node *)ctx->mat_box, ((M_Shape *)n1)->appearance);
+	ctx->rec_box = (M_Rectangle *) ttd_create_node(ctx, TAG_MPEG4_Rectangle, NULL);
+	ctx->rec_box->size.x = 0;
+	ctx->rec_box->size.y = 0;
+	((M_Shape *)n1)->geometry = (GF_Node *) ctx->rec_box;
+	gf_node_register((GF_Node *) ctx->rec_box, n1);
+
+	ctx->dlist = (M_Layer2D *) ttd_create_node(ctx, TAG_MPEG4_Layer2D, NULL);
+	ctx->dlist->size.x = ctx->cfg->text_width;
+	ctx->dlist->size.y = ctx->cfg->text_height;
+	ttd_add_child((GF_Node *)ctx->dlist, (GF_Node *)ctx->tr_box);
+
+	ctx->blink_nodes = gf_list_new();
+	ctx->ts_blink = (M_TimeSensor *) ttd_create_node(ctx, TAG_MPEG4_TimeSensor, "TimerBlink");
+	ctx->ts_blink->cycleInterval = 0.25;
+	ctx->ts_blink->startTime = 0.0;
+	ctx->ts_blink->loop = 1;
+	ctx->process_blink = (M_ScalarInterpolator *) ttd_create_node(ctx, TAG_MPEG4_ScalarInterpolator, NULL);
+	/*override set_fraction*/
+	ctx->process_blink->on_set_fraction = ttd_set_blink_fraction;
+	gf_node_set_private((GF_Node *) ctx->process_blink, ctx);
+	/*route from fraction_changed to set_fraction*/
+	gf_sg_route_new(ctx->scenegraph, (GF_Node *) ctx->ts_blink, 6, (GF_Node *) ctx->process_blink, 0);
+
+	ctx->ts_scroll = (M_TimeSensor *) ttd_create_node(ctx, TAG_MPEG4_TimeSensor, "TimerScroll");
+	ctx->ts_scroll->cycleInterval = 0;
+	ctx->ts_scroll->startTime = -1;
+	ctx->ts_scroll->loop = 0;
+	ctx->process_scroll = (M_ScalarInterpolator *) ttd_create_node(ctx, TAG_MPEG4_ScalarInterpolator, NULL);
+	/*override set_fraction*/
+	ctx->process_scroll->on_set_fraction = ttd_set_scroll_fraction;
+	gf_node_set_private((GF_Node *) ctx->process_scroll, ctx);
+	/*route from fraction_changed to set_fraction*/
+	gf_sg_route_new(ctx->scenegraph, (GF_Node *) ctx->ts_scroll, 6, (GF_Node *) ctx->process_scroll, 0);
+
+	gf_node_register((GF_Node *) ctx->ts_blink, NULL);
+	gf_node_register((GF_Node *) ctx->process_blink, NULL);
+	gf_node_register((GF_Node *) ctx->ts_scroll, NULL);
+	gf_node_register((GF_Node *) ctx->process_scroll, NULL);
+
+}
+
+static void ttd_reset_scene(GF_TTXTDec *ctx)
+{
+	if (!ctx->scenegraph) return;
+
+	gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_TRUE);
+
+	gf_node_unregister((GF_Node *) ctx->ts_blink, NULL);
+	gf_node_unregister((GF_Node *) ctx->process_blink, NULL);
+	gf_node_unregister((GF_Node *) ctx->ts_scroll, NULL);
+	gf_node_unregister((GF_Node *) ctx->process_scroll, NULL);
+
+	gf_sg_del(ctx->scenegraph);
+	ctx->scenegraph = NULL;
+	gf_list_del(ctx->blink_nodes);
+}
+
+static void ttd_set_blink_fraction(GF_Node *node, GF_Route *route)
+{
+	M_Material2D *m;
+	u32 i;
+	GF_TTXTDec *ctx = (GF_TTXTDec *)gf_node_get_private(node);
+
+	Bool blink_on = GF_TRUE;
+	if (ctx->process_blink->set_fraction>FIX_ONE/2) blink_on = GF_FALSE;
+	i=0;
+	while ((m = (M_Material2D*)gf_list_enum(ctx->blink_nodes, &i))) {
+		if (m->filled != blink_on) {
+			m->filled = blink_on;
+			gf_node_changed((GF_Node *) m, NULL);
+		}
+	}
+}
+
+static void ttd_set_scroll_fraction(GF_Node *node, GF_Route *route)
+{
+	Fixed frac;
+	GF_TTXTDec *ctx = (GF_TTXTDec *)gf_node_get_private(node);
+	frac = ctx->process_scroll->set_fraction;
+	if (frac==FIX_ONE) ctx->timer_active = GF_FALSE;
+	if (!ctx->tr_scroll) return;
+
+	switch (ctx->scroll_type - 1) {
+	case GF_TXT_SCROLL_CREDITS:
+	case GF_TXT_SCROLL_DOWN:
+		ctx->tr_scroll->translation.x = 0;
+		if (ctx->scroll_mode & GF_TXT_SCROLL_IN) {
+			if (frac>ctx->scroll_time) {
+				ctx->scroll_mode &= ~GF_TXT_SCROLL_IN;
+				ctx->tr_scroll->translation.y = 0;
+			} else {
+				ctx->tr_scroll->translation.y = gf_muldiv(ctx->dlist->size.y, frac, ctx->scroll_time) - ctx->dlist->size.y;
+			}
+		} else if (ctx->scroll_mode & GF_TXT_SCROLL_OUT) {
+			if (frac < FIX_ONE - ctx->scroll_time) return;
+			frac -= FIX_ONE - ctx->scroll_time;
+			if (ctx->scroll_type - 1 == GF_TXT_SCROLL_DOWN) {
+				ctx->tr_scroll->translation.y = gf_muldiv(ctx->dlist->size.y, frac, ctx->scroll_time);
+			} else {
+				ctx->tr_scroll->translation.y = gf_muldiv(ctx->dlist->size.y, frac, ctx->scroll_time);
+			}
+		}
+		if (ctx->scroll_type - 1 == GF_TXT_SCROLL_DOWN) ctx->tr_scroll->translation.y *= -1;
+		break;
+	case GF_TXT_SCROLL_MARQUEE:
+	case GF_TXT_SCROLL_RIGHT:
+		ctx->tr_scroll->translation.y = 0;
+		if (ctx->scroll_mode & GF_TXT_SCROLL_IN) {
+			if (! (ctx->scroll_mode & GF_TXT_SCROLL_OUT)) {
+				if (frac<ctx->scroll_delay) return;
+				frac-=ctx->scroll_delay;
+			}
+			if (frac>ctx->scroll_time) {
+				ctx->scroll_mode &= ~GF_TXT_SCROLL_IN;
+				ctx->tr_scroll->translation.x = 0;
+			} else {
+				ctx->tr_scroll->translation.x = gf_muldiv(ctx->dlist->size.x, frac, ctx->scroll_time) - ctx->dlist->size.x;
+			}
+		} else if (ctx->scroll_mode & GF_TXT_SCROLL_OUT) {
+			if (frac < FIX_ONE - ctx->scroll_time) return;
+			frac -= FIX_ONE - ctx->scroll_time;
+			ctx->tr_scroll->translation.x = gf_muldiv(ctx->dlist->size.x, frac, ctx->scroll_time);
+		}
+		if (ctx->scroll_type - 1 == GF_TXT_SCROLL_MARQUEE) ctx->tr_scroll->translation.x *= -1;
+		break;
+	default:
+		break;
+	}
+	gf_node_changed((GF_Node *)ctx->tr_scroll, NULL);
+}
+
+static void ttd_reset_display(GF_TTXTDec *ctx)
+{
+	gf_list_reset(ctx->blink_nodes);
+	gf_node_unregister_children((GF_Node*)ctx->dlist, ctx->dlist->children);
+	ctx->dlist->children = NULL;
+	gf_node_changed((GF_Node *) ctx->dlist, NULL);
+	ctx->tr_scroll = NULL;
+}
+
+static char *ttd_find_font(GF_TextSampleDescriptor *tsd, u32 ID)
+{
+	u32 i;
+	for (i=0; i<tsd->font_count; i++) {
+		if (tsd->fonts[i].fontID==ID) return tsd->fonts[i].fontName;
+	}
+	return "SERIF";
+}
+
+static void ttd_add_item(M_Form *form)
+{
+	s32 *new_gr;
+	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &new_gr);
+	(*new_gr) = gf_node_list_get_count(form->children);
+	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &new_gr);
+	(*new_gr) = -1;
+	/*store line info*/
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &new_gr);
+	(*new_gr) = gf_node_list_get_count(form->children);
+}
+
+static void ttd_add_line(M_Form *form)
+{
+	s32 *new_gr;
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &new_gr);
+	(*new_gr) = -1;
+}
+
+typedef struct
+{
+	u32 start_char, end_char;
+	GF_StyleRecord *srec;
+	Bool is_hilight;
+	u32 hilight_col;	/*0 means RV*/
+	GF_TextHyperTextBox *hlink;
+	Bool has_blink;
+	/*karaoke not done yet*/
+	/*text wrapping is not supported - we will need to move to Layout (rather than form), and modify
+	layout to handle new lines and proper scrolling*/
+} TTDTextChunk;
+
+static void ttd_new_text_chunk(GF_TTXTDec *ctx, GF_TextSampleDescriptor *tsd, M_Form *form, u16 *utf16_txt, TTDTextChunk *tc)
+{
+	GF_Node *txt_model, *n2, *txt_material;
+	M_Text *text;
+	M_FontStyle *fs;
+	char *fontName;
+	char szStyle[1024];
+	u32 fontSize, styleFlags, color, i, start_char;
+
+	if (!tc->srec) {
+		fontName = ttd_find_font(tsd, tsd->default_style.fontID);
+		fontSize = tsd->default_style.font_size;
+		styleFlags = tsd->default_style.style_flags;
+		color = tsd->default_style.text_color;
+	} else {
+		fontName = ttd_find_font(tsd, tc->srec->fontID);
+		fontSize = tc->srec->font_size;
+		styleFlags = tc->srec->style_flags;
+		color = tc->srec->text_color;
+	}
+
+	/*create base model for text node. It will then be cloned for each text item*/
+	txt_model = ttd_create_node(ctx, TAG_MPEG4_Shape, NULL);
+	gf_node_register(txt_model, NULL);
+	n2 = ttd_create_node(ctx, TAG_MPEG4_Appearance, NULL);
+	((M_Shape *)txt_model)->appearance = n2;
+	gf_node_register(n2, txt_model);
+	txt_material = ttd_create_node(ctx, TAG_MPEG4_Material2D, NULL);
+	((M_Appearance *)n2)->material = txt_material;
+	gf_node_register(txt_material, n2);
+
+	((M_Material2D *)txt_material)->filled = 1;
+	((M_Material2D *)txt_material)->transparency = FIX_ONE - INT2FIX((color>>24) & 0xFF) / 255;
+	((M_Material2D *)txt_material)->emissiveColor.red = INT2FIX((color>>16) & 0xFF) / 255;
+	((M_Material2D *)txt_material)->emissiveColor.green = INT2FIX((color>>8) & 0xFF) / 255;
+	((M_Material2D *)txt_material)->emissiveColor.blue = INT2FIX((color) & 0xFF) / 255;
+	/*force 0 lineWidth if blinking (the stupid MPEG-4 default values once again..)*/
+	if (tc->has_blink) {
+		((M_Material2D *)txt_material)->lineProps = ttd_create_node(ctx, TAG_MPEG4_LineProperties, NULL);
+		((M_LineProperties *)((M_Material2D *)txt_material)->lineProps)->width = 0;
+		gf_node_register(((M_Material2D *)txt_material)->lineProps, txt_material);
+	}
+
+	n2 = ttd_create_node(ctx, TAG_MPEG4_Text, NULL);
+	((M_Shape *)txt_model)->geometry = n2;
+	gf_node_register(n2, txt_model);
+	text = (M_Text *) n2;
+	fs = (M_FontStyle *) ttd_create_node(ctx, TAG_MPEG4_FontStyle, NULL);
+	gf_free(fs->family.vals[0]);
+
+	/*translate default fonts to MPEG-4/VRML names*/
+	if (!stricmp(fontName, "Serif")) fs->family.vals[0] = gf_strdup("SERIF");
+	else if (!stricmp(fontName, "Sans-Serif")) fs->family.vals[0] = gf_strdup("SANS");
+	else if (!stricmp(fontName, "Monospace")) fs->family.vals[0] = gf_strdup("TYPEWRITER");
+	else fs->family.vals[0] = gf_strdup(fontName);
+
+	fs->size = INT2FIX(fontSize);
+	gf_free(fs->style.buffer);
+	strcpy(szStyle, "");
+	if (styleFlags & GF_TXT_STYLE_BOLD) {
+		if (styleFlags & GF_TXT_STYLE_ITALIC) strcpy(szStyle, "BOLDITALIC");
+		else strcpy(szStyle, "BOLD");
+	} else if (styleFlags & GF_TXT_STYLE_ITALIC) strcat(szStyle, "ITALIC");
+	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 (tc->is_hilight) {
+		if (tc->hilight_col) {
+			char szTxt[50];
+			sprintf(szTxt, " HIGHLIGHT#%x", tc->hilight_col);
+			strcat(szStyle, szTxt);
+		} else {
+			strcat(szStyle, " HIGHLIGHT#RV");
+		}
+	}
+	/*a better way would be to draw the entire text box in a composite texture & bitmap but we can't really rely
+	on text box size (in MP4Box, it actually defaults to the entire video area) and drawing a too large texture
+	& bitmap could slow down rendering*/
+	if (ctx->texture) strcat(szStyle, " TEXTURED");
+	if (ctx->outline) strcat(szStyle, " OUTLINED");
+
+	fs->style.buffer = gf_strdup(szStyle);
+	fs->horizontal = (tsd->displayFlags & GF_TXT_VERTICAL) ? 0 : 1;
+	text->fontStyle = (GF_Node *) fs;
+	gf_node_register((GF_Node *)fs, (GF_Node *)text);
+	gf_sg_vrml_mf_reset(&text->string, GF_SG_VRML_MFSTRING);
+
+	if (tc->hlink && tc->hlink->URL) {
+		SFURL *s;
+		M_Anchor *anc = (M_Anchor *) ttd_create_node(ctx, TAG_MPEG4_Anchor, NULL);
+		gf_sg_vrml_mf_append(&anc->url, GF_SG_VRML_MFURL, (void **) &s);
+		s->OD_ID = 0;
+		s->url = gf_strdup(tc->hlink->URL);
+		if (tc->hlink->URL_hint) anc->description.buffer = gf_strdup(tc->hlink->URL_hint);
+		gf_node_list_add_child(& anc->children, txt_model);
+		gf_node_register(txt_model, (GF_Node *)anc);
+		gf_node_unregister(txt_model, NULL);
+		txt_model = (GF_Node *)anc;
+		gf_node_register((GF_Node *)anc, NULL);
+	}
+
+	start_char = tc->start_char;
+	for (i=tc->start_char; i<tc->end_char; i++) {
+		Bool new_line = GF_FALSE;
+		if ((utf16_txt[i] == '\n') || (utf16_txt[i] == '\r') || (utf16_txt[i] == 0x85) || (utf16_txt[i] == 0x2028) || (utf16_txt[i] == 0x2029))
+			new_line = GF_TRUE;
+
+		if (new_line || (i+1==tc->end_char) ) {
+			SFString *st;
+
+			if (i+1==tc->end_char) i++;
+
+			if (i!=start_char) {
+				char szLine[5000];
+				u32 len;
+				s16 wsChunk[5000], *sp;
+
+				/*splitting lines, duplicate node*/
+
+				n2 = gf_node_clone(ctx->scenegraph, txt_model, NULL, "", GF_TRUE);
+				if (tc->hlink && tc->hlink->URL) {
+					GF_Node *t = ((M_Anchor *)n2)->children->node;
+					text = (M_Text *) ((M_Shape *)t)->geometry;
+					txt_material = ((M_Appearance *) ((M_Shape *)t)->appearance)->material;
+				} else {
+					text = (M_Text *) ((M_Shape *)n2)->geometry;
+					txt_material = ((M_Appearance *) ((M_Shape *)n2)->appearance)->material;
+				}
+				gf_sg_vrml_mf_reset(&text->string, GF_SG_VRML_MFSTRING);
+				gf_node_list_add_child( &form->children, n2);
+				gf_node_register(n2, (GF_Node *) form);
+				ttd_add_item(form);
+				/*clone node always register by default*/
+				gf_node_unregister(n2, NULL);
+
+				if (tc->has_blink && txt_material) gf_list_add(ctx->blink_nodes, txt_material);
+
+
+				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);
+				szLine[len] = 0;
+
+				gf_sg_vrml_mf_append(&text->string, GF_SG_VRML_MFSTRING, (void **) &st);
+				st->buffer = gf_strdup(szLine);
+			}
+			start_char = i+1;
+			if (new_line) {
+				ttd_add_line(form);
+				if ((utf16_txt[i]=='\r') && (utf16_txt[i+1]=='\n')) i++;
+			}
+		}
+	}
+	gf_node_unregister(txt_model, NULL);
+	return;
+}
+
+
+/*mod can be any of TextHighlight, TextKaraoke, TextHyperText, TextBlink*/
+static void ttd_split_chunks(GF_TextSample *txt, u32 nb_chars, GF_List *chunks, GF_Box *mod)
+{
+	TTDTextChunk *tc;
+	u32 start_char, end_char;
+	u32 i;
+	switch (mod->type) {
+	/*these 3 can be safelly typecasted to the same struct for start/end char*/
+	case GF_ISOM_BOX_TYPE_HLIT:
+	case GF_ISOM_BOX_TYPE_HREF:
+	case GF_ISOM_BOX_TYPE_BLNK:
+		start_char = ((GF_TextHighlightBox *)mod)->startcharoffset;
+		end_char = ((GF_TextHighlightBox *)mod)->endcharoffset;
+		break;
+	case GF_ISOM_BOX_TYPE_KROK:
+	default:
+		return;
+	}
+
+	if (end_char>nb_chars) end_char = nb_chars;
+
+	i=0;
+	while ((tc = (TTDTextChunk *)gf_list_enum(chunks, &i))) {
+		if (tc->end_char<=start_char) continue;
+		/*need to split chunk at begin*/
+		if (tc->start_char<start_char) {
+			TTDTextChunk *tc2;
+			tc2 = (TTDTextChunk *) gf_malloc(sizeof(TTDTextChunk));
+			memcpy(tc2, tc, sizeof(TTDTextChunk));
+			tc2->start_char = start_char;
+			tc2->end_char = tc->end_char;
+			tc->end_char = start_char;
+			gf_list_insert(chunks, tc2, i+1);
+			i++;
+			tc = tc2;
+		}
+		/*need to split chunks at end*/
+		if (tc->end_char>end_char) {
+			TTDTextChunk *tc2;
+			tc2 = (TTDTextChunk *) gf_malloc(sizeof(TTDTextChunk));
+			memcpy(tc2, tc, sizeof(TTDTextChunk));
+			tc2->start_char = tc->start_char;
+			tc2->end_char = end_char;
+			tc->start_char = end_char;
+			gf_list_insert(chunks, tc2, i);
+			i++;
+			tc = tc2;
+		}
+		/*assign mod*/
+		switch (mod->type) {
+		case GF_ISOM_BOX_TYPE_HLIT:
+			tc->is_hilight = GF_TRUE;
+			if (txt->highlight_color) tc->hilight_col = txt->highlight_color->hil_color;
+			break;
+		case GF_ISOM_BOX_TYPE_HREF:
+			tc->hlink = (GF_TextHyperTextBox *) mod;
+			break;
+		case GF_ISOM_BOX_TYPE_BLNK:
+			tc->has_blink = GF_TRUE;
+			break;
+		}
+		/*done*/
+		if (tc->end_char==end_char) return;
+	}
+}
+
+
+static void ttd_apply_sample(GF_TTXTDec *ctx, GF_TextSample *txt, u32 sample_desc_index, Bool is_utf_16, u32 sample_duration)
+{
+	u32 i, nb_lines, start_idx, count;
+	s32 *id, thw, thh, tw, th, offset;
+	Bool vertical;
+	MFInt32 idx;
+	SFString *s;
+	GF_BoxRecord br;
+	M_Material2D *n;
+	M_Form *form;
+	u16 utf16_text[5000];
+	u32 char_offset, char_count;
+	GF_List *chunks;
+	TTDTextChunk *tc;
+	GF_Box *a;
+	GF_TextSampleDescriptor *td = NULL;
+
+	/*stop timer sensor*/
+	if (gf_list_count(ctx->blink_nodes)) {
+		ctx->ts_blink->stopTime = gf_node_get_scene_time((GF_Node *) ctx->ts_blink);
+		gf_node_changed((GF_Node *) ctx->ts_blink, NULL);
+	}
+	ctx->ts_scroll->stopTime = gf_node_get_scene_time((GF_Node *) ctx->ts_scroll);
+	gf_node_changed((GF_Node *) ctx->ts_scroll, NULL);
+	/*flush routes to avoid getting the set_fraction of the scroll sensor deactivation*/
+	gf_sg_activate_routes(ctx->scene->graph);
+
+	ttd_reset_display(ctx);
+	if (!sample_desc_index || !txt || !txt->len) return;
+
+	if (ctx->is_tx3g) {
+		td = (GF_TextSampleDescriptor *)gf_list_get(ctx->cfg->sample_descriptions, 0);
+	} else {
+		i=0;
+		while ((td = (GF_TextSampleDescriptor *)gf_list_enum(ctx->cfg->sample_descriptions, &i))) {
+			if (td->sample_index==sample_desc_index) break;
+			td = NULL;
+		}
+	}
+	if (!td) return;
+
+
+	vertical = (td->displayFlags & GF_TXT_VERTICAL) ? GF_TRUE : GF_FALSE;
+
+	/*set back color*/
+	/*do we fill the text box or the entire text track region*/
+	if (td->displayFlags & GF_TXT_FILL_REGION) {
+		ctx->mat_box->transparency = FIX_ONE;
+		n = ctx->mat_track;
+	} else {
+		ctx->mat_track->transparency = FIX_ONE;
+		n = ctx->mat_box;
+	}
+
+	n->transparency = FIX_ONE - INT2FIX((td->back_color>>24) & 0xFF) / 255;
+	n->emissiveColor.red = INT2FIX((td->back_color>>16) & 0xFF) / 255;
+	n->emissiveColor.green = INT2FIX((td->back_color>>8) & 0xFF) / 255;
+	n->emissiveColor.blue = INT2FIX((td->back_color) & 0xFF) / 255;
+	gf_node_changed((GF_Node *) n, NULL);
+
+	if (txt->box) {
+		br = txt->box->box;
+	} else {
+		br = td->default_pos;
+	}
+	if (!br.right || !br.bottom) {
+		br.top = br.left = 0;
+		br.right = ctx->cfg->text_width;
+		br.bottom = ctx->cfg->text_height;
+	}
+	thw = br.right - br.left;
+	thh = br.bottom - br.top;
+	if (!thw || !thh) {
+		br.top = br.left = 0;
+		thw = ctx->cfg->text_width;
+		thh = ctx->cfg->text_height;
+	}
+
+	ctx->dlist->size.x = INT2FIX(thw);
+	ctx->dlist->size.y = INT2FIX(thh);
+
+	/*disable backgrounds if not used*/
+	if (ctx->mat_track->transparency<FIX_ONE) {
+		if (ctx->rec_track->size.x != ctx->cfg->text_width) {
+			ctx->rec_track->size.x = ctx->cfg->text_width;
+			ctx->rec_track->size.y = ctx->cfg->text_height;
+			gf_node_changed((GF_Node *) ctx->rec_track, NULL);
+		}
+	} else if (ctx->rec_track->size.x) {
+		ctx->rec_track->size.x = ctx->rec_track->size.y = 0;
+		gf_node_changed((GF_Node *) ctx->rec_box, NULL);
+	}
+
+	if (ctx->mat_box->transparency<FIX_ONE) {
+		if (ctx->rec_box->size.x != ctx->dlist->size.x) {
+			ctx->rec_box->size.x = ctx->dlist->size.x;
+			ctx->rec_box->size.y = ctx->dlist->size.y;
+			gf_node_changed((GF_Node *) ctx->rec_box, NULL);
+		}
+	} else if (ctx->rec_box->size.x) {
+		ctx->rec_box->size.x = ctx->rec_box->size.y = 0;
+		gf_node_changed((GF_Node *) ctx->rec_box, NULL);
+	}
+
+	form = (M_Form *) ttd_create_node(ctx, TAG_MPEG4_Form, NULL);
+	form->size.x = INT2FIX(thw);
+	form->size.y = INT2FIX(thh);
+
+	thw /= 2;
+	thh /= 2;
+	tw = ctx->cfg->text_width;
+	th = ctx->cfg->text_height;
+
+	/*check translation, we must not get out of scene size - not supported in GPAC*/
+	offset = br.left - tw/2 + thw;
+	if (offset + thw < - tw/2) offset = - tw/2 + thw;
+	else if (offset - thw > tw/2) offset = tw/2 - thw;
+	ctx->tr_box->translation.x = INT2FIX(offset);
+
+	offset = th/2 - br.top - thh;
+	if (offset + thh > th/2) offset = th/2 - thh;
+	else if (offset - thh < -th/2) offset = -th/2 + thh;
+	ctx->tr_box->translation.y = INT2FIX(offset);
+
+	gf_node_dirty_set((GF_Node *)ctx->tr_box, 0, GF_TRUE);
+
+
+	if (ctx->scroll_type) {
+		ctx->ts_scroll->stopTime = gf_node_get_scene_time((GF_Node *) ctx->ts_scroll);
+		gf_node_changed((GF_Node *) ctx->ts_scroll, NULL);
+	}
+	ctx->scroll_mode = 0;
+	if (td->displayFlags & GF_TXT_SCROLL_IN) ctx->scroll_mode |= GF_TXT_SCROLL_IN;
+	if (td->displayFlags & GF_TXT_SCROLL_OUT) ctx->scroll_mode |= GF_TXT_SCROLL_OUT;
+
+	ctx->scroll_type = 0;
+	if (ctx->scroll_mode) {
+		ctx->scroll_type = (td->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
+		ctx->scroll_type ++;
+	}
+	/*no sample duration, cannot determine scroll rate, so just show*/
+	if (!sample_duration) ctx->scroll_type = 0;
+	/*no scroll*/
+	if (!ctx->scroll_mode) ctx->scroll_type = 0;
+
+	if (ctx->scroll_type) {
+		ctx->tr_scroll = (M_Transform2D *) ttd_create_node(ctx, TAG_MPEG4_Transform2D, NULL);
+		gf_node_list_add_child( &ctx->dlist->children, (GF_Node*)ctx->tr_scroll);
+		gf_node_register((GF_Node *) ctx->tr_scroll, (GF_Node *) ctx->dlist);
+		gf_node_list_add_child( &ctx->tr_scroll->children, (GF_Node*)form);
+		gf_node_register((GF_Node *) form, (GF_Node *) ctx->tr_scroll);
+		ctx->tr_scroll->translation.x = ctx->tr_scroll->translation.y = (ctx->scroll_mode & GF_TXT_SCROLL_IN) ? -INT2FIX(1000) : 0;
+		/*if no delay, text is in motion for the duration of the sample*/
+		ctx->scroll_time = FIX_ONE;
+		ctx->scroll_delay = 0;
+
+		if (txt->scroll_delay) {
+			ctx->scroll_delay = gf_divfix(INT2FIX(txt->scroll_delay->scroll_delay), INT2FIX(sample_duration));
+			if (ctx->scroll_delay>FIX_ONE) ctx->scroll_delay = FIX_ONE;
+			ctx->scroll_time = (FIX_ONE - ctx->scroll_delay);
+		}
+		/*if both scroll (in and out), use same scroll duration for both*/
+		if ((ctx->scroll_mode & GF_TXT_SCROLL_IN) && (ctx->scroll_mode & GF_TXT_SCROLL_OUT)) ctx->scroll_time /= 2;
+
+	} else {
+		gf_node_list_add_child( &ctx->dlist->children, (GF_Node*)form);
+		gf_node_register((GF_Node *) form, (GF_Node *) ctx->dlist);
+		ctx->tr_scroll = NULL;
+	}
+
+	if (is_utf_16) {
+		memcpy((char *) utf16_text, txt->text, sizeof(char) * txt->len);
+		((char *) utf16_text)[txt->len] = 0;
+		((char *) utf16_text)[txt->len+1] = 0;
+		char_count = txt->len / 2;
+	} else {
+		char *p = txt->text;
+		char_count = (u32) gf_utf8_mbstowcs(utf16_text, 2500, (const char **) &p);
+	}
+
+	chunks = gf_list_new();
+	/*flatten all modifiers*/
+	if (!txt->styles || !txt->styles->entry_count) {
+		GF_SAFEALLOC(tc, TTDTextChunk);
+		if (!tc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
+		} else {
+			tc->end_char = char_count;
+			gf_list_add(chunks, tc);
+		}
+	} else {
+		GF_StyleRecord *srec = NULL;
+		char_offset = 0;
+		for (i=0; i<txt->styles->entry_count; i++) {
+			srec = &txt->styles->styles[i];
+			if (srec->startCharOffset==srec->endCharOffset) continue;
+			/*handle not continuous modifiers*/
+			if (char_offset < srec->startCharOffset) {
+				GF_SAFEALLOC(tc, TTDTextChunk);
+				if (!tc) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
+				} else {
+					tc->start_char = char_offset;
+					tc->end_char = srec->startCharOffset;
+					gf_list_add(chunks, tc);
+				}
+			}
+			GF_SAFEALLOC(tc, TTDTextChunk);
+			if (!tc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
+			} else {
+				tc->start_char = srec->startCharOffset;
+				tc->end_char = srec->endCharOffset;
+				tc->srec = srec;
+				gf_list_add(chunks, tc);
+			}
+			char_offset = srec->endCharOffset;
+		}
+
+		if (srec->endCharOffset<char_count) {
+			GF_SAFEALLOC(tc, TTDTextChunk);
+			if (!tc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[TimedText] Failed to allocate text chunk\n"));
+			} else {
+				tc->start_char = char_offset;
+				tc->end_char = char_count;
+				gf_list_add(chunks, tc);
+			}
+		}
+	}
+	/*apply all other modifiers*/
+	i=0;
+	while ((a = (GF_Box*)gf_list_enum(txt->others, &i))) {
+		ttd_split_chunks(txt, char_count, chunks, a);
+	}
+
+	while (gf_list_count(chunks)) {
+		tc = (TTDTextChunk*)gf_list_get(chunks, 0);
+		gf_list_rem(chunks, 0);
+		ttd_new_text_chunk(ctx, td, form, utf16_text, tc);
+		gf_free(tc);
+	}
+	gf_list_del(chunks);
+
+	if (form->groupsIndex.vals[form->groupsIndex.count-1] != -1)
+		ttd_add_line(form);
+
+	/*rewrite form groupIndex - group is fine (eg one child per group)*/
+	idx.count = form->groupsIndex.count;
+	idx.vals = form->groupsIndex.vals;
+	form->groupsIndex.vals = NULL;
+	form->groupsIndex.count = 0;
+
+	nb_lines = 0;
+	start_idx = 0;
+	for (i=0; i<idx.count; i++) {
+		if (idx.vals[i] == -1) {
+			u32 j;
+
+			/*only one item in line, no need for alignment, but still add a group (we could use the
+			item as a group but that would complicate the alignment generation)*/
+			if (start_idx==i-1) {
+				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+				(*id) = idx.vals[start_idx];
+				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+				(*id) = -1;
+			} else {
+				/*spread horizontal 0 pixels (eg align) all items in line*/
+				gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
+				s->buffer = gf_strdup(vertical ? "SV 0" : "SH 0");
+				for (j=start_idx; j<i; j++) {
+					gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+					(*id) = idx.vals[j];
+					/*also add a group for the line, for final justif*/
+					gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+					(*id) = idx.vals[j];
+				}
+				gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+				(*id) = -1;
+				/*mark end of group*/
+				gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+				(*id) = -1;
+			}
+			start_idx = i+1;
+			nb_lines ++;
+		}
+	}
+	gf_free(idx.vals);
+
+	/*finally add constraints on lines*/
+	start_idx = gf_node_list_get_count(form->children) + 1;
+	/*horizontal alignment*/
+	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
+	if (vertical) {
+		switch (td->vert_justif) {
+		case 1:
+			s->buffer = gf_strdup("AV");
+			break;/*center*/
+		case -1:
+			s->buffer = gf_strdup("AB");
+			break;/*bottom*/
+		default:
+			s->buffer = gf_strdup("AT");
+			break;/*top*/
+		}
+	} else {
+		switch (td->horiz_justif) {
+		case 1:
+			s->buffer = gf_strdup("AH");
+			break;/*center*/
+		case -1:
+			s->buffer = gf_strdup("AR");
+			break;/*right*/
+		default:
+			s->buffer = gf_strdup("AL");
+			break;/*left*/
+		}
+	}
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = 0;
+	for (i=0; i<nb_lines; i++) {
+		gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+		(*id) = i+start_idx;
+	}
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = -1;
+
+
+	/*vertical alignment: first align all items vertically, 0 pixel */
+	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
+	s->buffer = gf_strdup(vertical ? "SH 0" : "SV 0");
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = 0;
+	for (i=0; i<nb_lines; i++) {
+		gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+		(*id) = i+start_idx;
+	}
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = -1;
+
+	/*define a group with every item drawn*/
+	count = gf_node_list_get_count(form->children);
+	for (i=0; i<count; i++) {
+		gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+		(*id) = i+1;
+	}
+	gf_sg_vrml_mf_append(&form->groups, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = -1;
+
+	gf_sg_vrml_mf_append(&form->constraints, GF_SG_VRML_MFSTRING, (void **) &s);
+	if (vertical) {
+		switch (td->horiz_justif) {
+		case 1:
+			s->buffer = gf_strdup("AH");
+			break;/*center*/
+		case -1:
+			s->buffer = gf_strdup("AR");
+			break;/*right*/
+		default:
+			s->buffer = gf_strdup("AL");
+			break;/*left*/
+		}
+	} else {
+		switch (td->vert_justif) {
+		case 1:
+			s->buffer = gf_strdup("AV");
+			break;/*center*/
+		case -1:
+			s->buffer = gf_strdup("AB");
+			break;/*bottom*/
+		default:
+			s->buffer = gf_strdup("AT");
+			break;/*top*/
+		}
+	}
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = 0;
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = start_idx + nb_lines;
+	gf_sg_vrml_mf_append(&form->groupsIndex, GF_SG_VRML_MFINT32, (void **) &id);
+	(*id) = -1;
+
+
+	gf_node_dirty_set((GF_Node *)form, 0, GF_TRUE);
+	gf_node_changed((GF_Node *)form, NULL);
+	gf_node_changed((GF_Node *) ctx->dlist, NULL);
+
+	if (gf_list_count(ctx->blink_nodes)) {
+		/*restart time sensor*/
+		ctx->ts_blink->startTime = gf_node_get_scene_time((GF_Node *) ctx->ts_blink);
+		gf_node_changed((GF_Node *) ctx->ts_blink, NULL);
+	}
+
+	ctx->timer_active = GF_TRUE;
+	/*scroll timer also acts as AU timer*/
+	ctx->ts_scroll->startTime = gf_node_get_scene_time((GF_Node *) ctx->ts_scroll);
+	ctx->ts_scroll->stopTime = ctx->ts_scroll->startTime - 1.0;
+	ctx->ts_scroll->cycleInterval = sample_duration;
+	ctx->ts_scroll->cycleInterval /= ctx->cfg->timescale;
+	ctx->ts_scroll->cycleInterval -= 0.1;
+	gf_node_changed((GF_Node *) ctx->ts_scroll, NULL);
+}
+
+static void ttd_toggle_display(GF_TTXTDec *ctx)
+{
+	if (!ctx->scenegraph) return;
+
+	if (ctx->is_playing) {
+		if (!ctx->graph_registered) {
+			ttd_reset_display(ctx);
+			ttd_update_size_info(ctx);
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_FALSE);
+			ctx->graph_registered = GF_TRUE;
+		}
+	 } else {
+		if (ctx->graph_registered) {
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_TRUE);
+			ctx->graph_registered = GF_FALSE;
+		}
+	}
+}
+
+static Bool ttd_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_TTXTDec *ctx = gf_filter_get_udta(filter);
+
+	//check for scene attach
+	switch (evt->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_RESET_SCENE:
+		if (ctx->opid != evt->attach_scene.on_pid) return GF_TRUE;
+		ctx->is_playing = GF_FALSE;
+		ttd_toggle_display(ctx);
+		ttd_reset_scene(ctx);
+		ctx->scene = NULL;
+		return GF_TRUE;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		ttd_toggle_display(ctx);
+		return GF_FALSE;
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		ttd_toggle_display(ctx);
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (ctx->opid != evt->attach_scene.on_pid) return GF_TRUE;
+
+	ctx->odm = evt->attach_scene.object_manager;
+	ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+
+	/*timedtext cannot be a root scene object*/
+	if (ctx->odm->subscene) {
+		ctx->odm = NULL;
+		ctx->scene = NULL;
+	 } else {
+		 ttd_setup_scene(ctx);
+		 ttd_toggle_display(ctx);
+	 }
+	 return GF_TRUE;
+}
+
+static GF_Err ttd_process(GF_Filter *filter)
+{
+	const char *pck_data;
+	u32 pck_size, obj_time, timescale;
+	u64 cts;
+	GF_FilterPacket *pck;
+	GF_TTXTDec *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->scene) {
+		if (ctx->is_playing) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->is_eos) {
+				gf_filter_pid_set_eos(ctx->opid);
+				ctx->ts_blink->stopTime = gf_node_get_scene_time((GF_Node *) ctx->ts_blink);
+				gf_node_changed((GF_Node *) ctx->ts_blink, NULL);
+				ctx->ts_scroll->stopTime = gf_node_get_scene_time((GF_Node *) ctx->ts_scroll);
+				gf_node_changed((GF_Node *) ctx->ts_scroll, NULL);
+				ctx->is_eos = GF_TRUE;
+			}
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	ctx->is_eos = GF_FALSE;
+
+	//object clock shall be valid
+	assert(ctx->odm->ck);
+	cts = gf_filter_pck_get_cts( pck );
+	timescale = gf_filter_pck_get_timescale(pck);
+
+	gf_odm_check_buffering(ctx->odm, ctx->ipid);
+
+	//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) {
+		Double ts_offset = (Double) cts;
+		ts_offset /= timescale;
+
+		gf_sc_sys_frame_pending(ctx->scene->compositor, ts_offset, obj_time, filter);
+		return GF_OK;
+	}
+
+	pck_data = gf_filter_pck_get_data(pck, &pck_size);
+	gf_bs_reassign_buffer(ctx->bs_r, pck_data, pck_size);
+
+	while (gf_bs_available(ctx->bs_r)) {
+		GF_TextSample *txt;
+		Bool is_utf_16=0;
+		u32 type, /*length, */sample_index, sample_duration;
+
+		if (!ctx->is_tx3g) {
+			is_utf_16 = (Bool)gf_bs_read_int(ctx->bs_r, 1);
+			gf_bs_read_int(ctx->bs_r, 4);
+			type = gf_bs_read_int(ctx->bs_r, 3);
+			/*length = */gf_bs_read_u16(ctx->bs_r);
+
+			/*currently only full text samples are supported*/
+			if (type != 1) {
+				return GF_NOT_SUPPORTED;
+			}
+			sample_index = gf_bs_read_u8(ctx->bs_r);
+			/*duration*/
+			sample_duration = gf_bs_read_u24(ctx->bs_r);
+		} else {
+			sample_index = 1;
+			/*duration*/
+			sample_duration = gf_filter_pck_get_duration(pck);
+		}
+		/*txt length is parsed with the sample*/
+		txt = gf_isom_parse_text_sample(ctx->bs_r);
+		if (!txt) return GF_NON_COMPLIANT_BITSTREAM;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[TTXTDec] Applying new sample - duration %d text \"%s\"\n", sample_duration, txt->text ? txt->text : ""));
+		ttd_apply_sample(ctx, txt, sample_index, is_utf_16, sample_duration);
+		gf_isom_delete_text_sample(txt);
+
+		/*since we support only TTU(1), no need to go on*/
+		if (!ctx->is_tx3g) {
+			break;
+		} else {
+			//tx3g mode, single sample per AU
+			assert(gf_bs_available(ctx->bs_r)==0);
+			break;
+		}
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err ttd_initialize(GF_Filter *filter)
+{
+	GF_TTXTDec *ctx = gf_filter_get_udta(filter);
+	ctx->bs_r = gf_bs_new((char *) "", 1, GF_BITSTREAM_READ);
+	return GF_OK;
+}
+
+void ttd_finalize(GF_Filter *filter)
+{
+	GF_TTXTDec *ctx = gf_filter_get_udta(filter);
+
+	ttd_reset_scene(ctx);
+
+	if (ctx->cfg) gf_odf_desc_del((GF_Descriptor *) ctx->cfg);
+	gf_bs_del(ctx->bs_r);
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_TTXTDec, _n)
+static const GF_FilterArgs TTXTDecArgs[] =
+{
+	{ OFFS(texture), "use texturing for output text", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(outline), "draw text outline", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(txtw), "default width in standalone rendering", GF_PROP_UINT, "400", NULL, 0},
+	{ OFFS(txth), "default height in standalone rendering", GF_PROP_UINT, "200", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability TTXTDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_TEXT_MPEG4),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_TX3G),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister TTXTDecRegister = {
+	.name = "ttxtdec",
+	GF_FS_SET_DESCRIPTION("TTXT/TX3G decoder")
+	GF_FS_SET_HELP("This filter decodes TTXT/TX3G streams into a BIFS scene graph of the compositor filter.\n"
+	"The TTXT documentation is available at https://wiki.gpac.io/TTXT-Format-Documentation\n")
+	.private_size = sizeof(GF_TTXTDec),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = TTXTDecArgs,
+	.priority = 1,
+	SETCAPS(TTXTDecCaps),
+	.initialize = ttd_initialize,
+	.finalize = ttd_finalize,
+	.process = ttd_process,
+	.configure_pid = ttd_configure_pid,
+	.process_event = ttd_process_event,
+};
+
+#endif
+
+const GF_FilterRegister *ttxtdec_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_ISOM)
+	return &TTXTDecRegister;
+#else
+	return NULL;
+#endif
+}
+
+
+

gpac-1.0.0.tar.gz/src/filters/dec_vorbis.c Added

@@ -0,0 +1,313 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / XIPH Vorbis decoder 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>
+
+#ifdef GPAC_HAS_VORBIS
+
+#include <vorbis/codec.h>
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libvorbis_static")
+# endif
+#endif
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	u32 cfg_crc, sample_rate, nb_chan, timescale;
+	u64 last_cts;
+
+	vorbis_info vi;
+	vorbis_dsp_state vd;
+	vorbis_block vb;
+	vorbis_comment vc;
+	ogg_packet op;
+
+	Bool has_reconfigured;
+} GF_VorbisDecCtx;
+
+static GF_Err vorbisdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	ogg_packet oggpacket;
+	GF_BitStream *bs;
+	GF_VorbisDecCtx *ctx = gf_filter_get_udta(filter);
+
+
+	if (is_remove) {
+		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;
+
+	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;
+		if (strncmp(&p->value.data.ptr[3], "vorbis", 6)) return GF_NON_COMPLIANT_BITSTREAM;
+		ex_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (ctx->cfg_crc == ex_crc) return GF_OK;
+		ctx->cfg_crc = ex_crc;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[XVID] Reconfiguring without DSI not yet supported\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+
+	if (ctx->ipid) {
+		vorbis_block_clear(&ctx->vb);
+		vorbis_dsp_clear(&ctx->vd);
+		vorbis_info_clear(&ctx->vi);
+		vorbis_comment_clear(&ctx->vc);
+	}
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
+	vorbis_info_init(&ctx->vi);
+	vorbis_comment_init(&ctx->vc);
+
+	oggpacket.granulepos = -1;
+	oggpacket.b_o_s = 1;
+	oggpacket.e_o_s = 0;
+	oggpacket.packetno = 0;
+
+	bs = gf_bs_new(p->value.data.ptr, p->value.data.size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Err e = GF_OK;
+		oggpacket.bytes = gf_bs_read_u16(bs);
+		oggpacket.packet = gf_malloc(sizeof(char) * oggpacket.bytes);
+		gf_bs_read_data(bs, oggpacket.packet, oggpacket.bytes);
+		if (vorbis_synthesis_headerin(&ctx->vi, &ctx->vc, &oggpacket) < 0 ) {
+			e = GF_NON_COMPLIANT_BITSTREAM;
+		}
+		gf_free(oggpacket.packet);
+		if (e) {
+			gf_bs_del(bs);
+			return e;
+		}
+	}
+	vorbis_synthesis_init(&ctx->vd, &ctx->vi);
+	vorbis_block_init(&ctx->vd, &ctx->vb);
+	gf_bs_del(bs);
+
+	return GF_OK;
+}
+
+static GFINLINE void vorbis_to_intern(u32 samples, Float **pcm, char *buf, u32 channels)
+{
+	u32 i, j;
+	s32 val;
+	ogg_int16_t *data = (ogg_int16_t*)buf ;
+
+	for (i=0 ; i<channels ; i++) {
+		Float *mono;
+		ogg_int16_t *ptr;
+		ptr = &data[i];
+		if (!ptr) break;
+		
+		if (channels>2) {
+			/*center is third in gpac*/
+			if (i==1) ptr = &data[2];
+			/*right is 2nd in gpac*/
+			else if (i==2) ptr = &data[1];
+			/*LFE is 4th in gpac*/
+			if ((channels==6) && (i>3)) {
+				if (i==6) ptr = &data[4];	/*LFE*/
+				else ptr = &data[i+1];	/*back l/r*/
+			}
+		}
+
+		mono = pcm[i];
+		for (j=0; j<samples; j++) {
+			val = (s32) (mono[j] * 32767.f);
+			if (val > 32767) val = 32767;
+			if (val < -32768) val = -32768;
+			(*ptr) = val;
+			ptr += channels;
+		}
+	}
+}
+
+static GF_Err vorbisdec_process(GF_Filter *filter)
+{
+	ogg_packet op;
+	u8 *buffer=NULL;
+	Float **pcm;
+	u32 samples, total_samples, total_bytes, size;
+	GF_VorbisDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck=NULL;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (!gf_filter_pid_is_eos(ctx->ipid)) {
+			return GF_OK;
+		}
+	}
+	op.granulepos = -1;
+	op.b_o_s = 0;
+	op.e_o_s = 0;
+	op.packetno = 0;
+
+	if (pck) {
+		u32 psize;
+		op.packet = (u8 *) gf_filter_pck_get_data(pck, &psize);
+		op.bytes = psize;
+	} else {
+		op.packet = NULL;
+		op.bytes = 0;
+	}
+
+	if (vorbis_synthesis(&ctx->vb, &op) == 0)
+		vorbis_synthesis_blockin(&ctx->vd, &ctx->vb) ;
+
+	if ( (ctx->vi.channels != ctx->nb_chan) || (ctx->vi.rate != ctx->sample_rate) ) {
+		u64 chan_mask = 0;
+		ctx->nb_chan = ctx->vi.channels;
+		ctx->sample_rate = ctx->vi.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_chan) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
+
+		switch (ctx->vi.channels) {
+		case 1:
+			chan_mask = GF_AUDIO_CH_FRONT_CENTER;
+			break;
+		case 2:
+			chan_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT;
+			break;
+		case 3:
+			chan_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER;
+			break;
+		case 4:
+			chan_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT;
+			break;
+		case 5:
+			chan_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT;
+			break;
+		case 6:
+			chan_mask = GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_LFE;
+			break;
+		}
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(chan_mask) );
+
+	}
+	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 (pck && dst_pck) gf_filter_pck_merge_properties(pck, dst_pck);
+
+	/*trust vorbis max block info*/
+	total_samples = 0;
+	total_bytes = 0;
+	while ((samples = vorbis_synthesis_pcmout(&ctx->vd, &pcm)) > 0) {
+		vorbis_to_intern(samples, pcm, (char*) buffer + total_bytes, ctx->vi.channels);
+		total_bytes += samples * 2 * ctx->vi.channels;
+		total_samples += samples;
+		vorbis_synthesis_read(&ctx->vd, samples);
+	}
+	if (!size) {
+		if (pck) return GF_OK;
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+
+	if (pck) {
+		ctx->last_cts = gf_filter_pck_get_cts(pck);
+		ctx->timescale = gf_filter_pck_get_timescale(pck);
+		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 = total_samples * ctx->timescale;
+		dur /= ctx->sample_rate;
+		gf_filter_pck_set_duration(dst_pck, (u32) dur);
+		ctx->last_cts += dur;
+	} else {
+		gf_filter_pck_set_duration(dst_pck, total_samples);
+		ctx->last_cts += total_samples;
+	}
+
+	assert(size == total_bytes);
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+static void vorbisdec_finalize(GF_Filter *filter)
+{
+	GF_VorbisDecCtx *ctx = gf_filter_get_udta(filter);
+
+	vorbis_block_clear(&ctx->vb);
+	vorbis_dsp_clear(&ctx->vd);
+	vorbis_info_clear(&ctx->vi);
+	vorbis_comment_clear(&ctx->vc);
+}
+
+static const GF_FilterCapability VorbisDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VORBIS),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	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),
+};
+
+GF_FilterRegister VorbisDecRegister = {
+	.name = "vorbisdec",
+	GF_FS_SET_DESCRIPTION("Vorbis decoder")
+	GF_FS_SET_HELP("This filter decodes Vorbis streams through libvorbis library.")
+	.private_size = sizeof(GF_VorbisDecCtx),
+	.priority = 1,
+	SETCAPS(VorbisDecCaps),
+	.finalize = vorbisdec_finalize,
+	.configure_pid = vorbisdec_configure_pid,
+	.process = vorbisdec_process,
+};
+
+#endif
+
+const GF_FilterRegister *vorbisdec_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_VORBIS
+	return &VorbisDecRegister;
+#else
+	return NULL;
+#endif
+}
+
+

gpac-1.0.0.tar.gz/src/filters/dec_vtb.c Added

@@ -0,0 +1,2010 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / VideoToolBox decoder 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.
+ *
+ */
+
+//do not include math.h we would have a conflict with Fixed ... we're lucky we don't need maths routines here
+#define _GF_MATH_H_
+
+#include <gpac/thread.h>
+
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+
+#include <stdint.h>
+
+#define Picture QuickdrawPicture
+#include <VideoToolbox/VideoToolbox.h>
+#undef Picture
+
+#ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
+#  define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder")
+#endif
+
+#include <gpac/maths.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/filters.h>
+
+#include "../../src/compositor/gl_inc.h"
+
+
+#ifdef GPAC_CONFIG_IOS
+#define VTB_GL_TEXTURE
+
+#define GF_CVGLTextureREF CVOpenGLESTextureRef
+#define GF_CVGLTextureCacheREF CVOpenGLESTextureCacheRef
+#define GF_kCVPixelBufferOpenGLCompatibilityKey kCVPixelBufferOpenGLESCompatibilityKey
+#define GF_CVOpenGLTextureCacheFlush CVOpenGLESTextureCacheFlush
+#define GF_CVOpenGLTextureGetTarget CVOpenGLESTextureGetTarget
+#define GF_CVOpenGLTextureGetName CVOpenGLESTextureGetName
+
+#else
+
+//not working yet, not sure why
+//#define VTB_GL_TEXTURE
+
+#include <CoreVideo/CVOpenGLTexture.h>
+
+#define GF_CVGLTextureREF CVOpenGLTextureRef
+#define GF_CVGLTextureCacheREF CVOpenGLTextureCacheRef
+#define GF_kCVPixelBufferOpenGLCompatibilityKey kCVPixelBufferOpenGLCompatibilityKey
+#define GF_CVOpenGLTextureCacheFlush CVOpenGLTextureCacheFlush
+#define GF_CVOpenGLTextureGetTarget CVOpenGLTextureGetTarget
+#define GF_CVOpenGLTextureGetName CVOpenGLTextureGetName
+
+
+#endif
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	//opts
+	u32 reorder, ofmt;
+	Bool no_copy;
+	Bool disable_hw;
+
+	//internal
+//	GF_FilterPid *ipid;
+	GF_List *streams;
+	GF_FilterPid *opid;
+	u32 width, height, stride;
+	GF_Fraction pixel_ar;
+	u32 pix_fmt;
+	u32 out_size;
+	u32 cfg_crc;
+	u32 codecid;
+	Bool is_hardware;
+
+	GF_Err last_error;
+	
+	int vtb_type;
+	VTDecompressionSessionRef vtb_session;
+    CMFormatDescriptionRef fmt_desc;
+
+    GF_List *frames, *frames_res;
+    GF_FilterPacket *cur_pck;
+
+	u8 chroma_format, luma_bit_depth, chroma_bit_depth;
+	Bool frame_size_changed;
+	Bool reorder_detected;
+	Bool drop_non_refs;
+
+	volatile u32 decoded_frames_pending;
+	u32 reorder_probe;
+	Bool reconfig_needed;
+	u64 last_cts_out;
+	u32 last_timescale_out;
+
+	//MPEG-1/2 specific
+	Bool init_mpeg12;
+	
+	//MPEG-4 specific
+	Bool skip_mpeg4_vosh;
+	char *vosh;
+	u32 vosh_size;
+
+	//NAL-based specific
+	GF_BitStream *nal_bs;
+	GF_BitStream *ps_bs;
+
+	GF_BitStream *nalu_rewrite_bs;
+	u8 *nalu_buffer;
+	u32 nalu_buffer_alloc;
+
+	Bool is_avc;
+	Bool is_annex_b;
+
+	u32 nalu_size_length;
+
+	GF_List *SPSs, *PPSs, *VPSs;
+	s32 active_sps, active_pps, active_vps;
+	u32 active_sps_crc, active_pps_crc, active_vps_crc;
+
+	AVCState avc;
+	Bool check_h264_isma;
+
+	HEVCState hevc;
+	Bool is_hevc;
+
+	Bool profile_supported, can_reconfig;
+	u32 nb_consecutive_errors;
+	//openGL output
+#ifdef VTB_GL_TEXTURE
+	Bool use_gl_textures;
+	GF_CVGLTextureCacheREF cache_texture;
+#endif
+	void *gl_context;
+
+	struct __vtb_frame_ifce *last_frame_sent;
+} GF_VTBDecCtx;
+
+
+typedef struct __vtb_frame_ifce
+{
+	GF_FilterFrameInterface frame_ifce;
+
+	Bool locked;
+	CVPixelBufferRef frame;
+	GF_VTBDecCtx *ctx;
+	GF_FilterPacket *pck_src;
+	//openGL mode
+#ifdef VTB_GL_TEXTURE
+	GF_CVGLTextureREF y, u, v;
+#endif
+} GF_VTBHWFrame;
+
+static void vtbdec_delete_decoder(GF_VTBDecCtx *ctx);
+static GF_Err vtbdec_flush_frame(GF_Filter *filter, GF_VTBDecCtx *ctx);
+
+static void vtbdec_on_frame(void *opaque, void *sourceFrameRefCon, OSStatus status, VTDecodeInfoFlags flags, CVImageBufferRef image, CMTime pts, CMTime duration)
+{
+	GF_VTBDecCtx *ctx = (GF_VTBDecCtx *)opaque;
+	GF_VTBHWFrame *frame;
+	u32 i, count, timescale;
+	u64 cts, dts;
+	assert(ctx->cur_pck);
+
+    if (!image) {
+		if (status != kCVReturnSuccess) {
+			ctx->last_error = GF_NON_COMPLIANT_BITSTREAM;
+			ctx->nb_consecutive_errors++;
+			//if we can reconfigure and this is a SAP, reconfig if too many errors or first frame after reconfig
+			if (ctx->can_reconfig && gf_filter_pck_get_sap(ctx->cur_pck)
+				&& (!ctx->profile_supported || (ctx->nb_consecutive_errors>10))
+			) {
+				ctx->last_error = GF_PROFILE_NOT_SUPPORTED;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Decode error - status %d - trying filter chain reload\n", status));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Decode error - status %d\n", status));
+			}
+			return;
+		}
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] No output buffer\n"));
+        return;
+    }
+	if (gf_filter_pck_get_seek_flag(ctx->cur_pck) ) {
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Frame marked as seek, not dispatching - status %d\n", status));
+		return;
+	}
+
+	if (ctx->reorder_probe) {
+		ctx->reorder_probe--;
+	}
+
+	ctx->profile_supported = GF_TRUE;
+	ctx->nb_consecutive_errors=0;
+	frame = gf_list_pop_back(ctx->frames_res);
+	if (!frame) {
+		GF_SAFEALLOC(frame, GF_VTBHWFrame);
+		if (!frame) return;
+	} else {
+		memset(frame, 0, sizeof(GF_VTBHWFrame));
+	}
+
+	assert( gf_filter_pck_get_seek_flag(ctx->cur_pck) == 0 );
+
+	frame->frame_ifce.user_data = frame;
+	frame->frame = CVPixelBufferRetain(image);
+	frame->pck_src = ctx->cur_pck;
+	gf_filter_pck_ref_props(&frame->pck_src);
+
+	frame->ctx = ctx;
+	cts = gf_filter_pck_get_cts(frame->pck_src);
+	dts = gf_filter_pck_get_dts(frame->pck_src);
+	timescale = gf_filter_pck_get_timescale(frame->pck_src);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Decoded frame DTS "LLU" CTS "LLU" timescale %d\n", dts, cts, timescale));
+
+	if (!ctx->last_timescale_out)
+		ctx->last_timescale_out = gf_filter_pck_get_timescale(frame->pck_src);
+
+	count = gf_list_count(ctx->frames);
+	for (i=0; i<count; i++) {
+		GF_VTBHWFrame *aframe = gf_list_get(ctx->frames, i);
+		Bool insert = GF_FALSE;
+		u64 acts, adts, atimescale;
+		s64 diff;
+
+		acts = gf_filter_pck_get_cts(aframe->pck_src);
+		adts = gf_filter_pck_get_dts(aframe->pck_src);
+		atimescale = gf_filter_pck_get_timescale(aframe->pck_src);
+
+		if (adts > dts) {
+			ctx->reorder_probe=0;
+			ctx->reorder_detected=GF_FALSE;
+			break;
+		}
+		if ((timescale == atimescale) && (ctx->last_timescale_out == timescale)) {
+			diff = (s64) acts - (s64) cts;
+			if ((diff>0) && (cts > ctx->last_cts_out) ) {
+				insert = GF_TRUE;
+			}
+		} else {
+			diff = (s64) (acts * timescale) - (s64) (cts * atimescale);
+			if ((diff>0) && (ctx->last_timescale_out * cts > timescale * ctx->last_cts_out) ) {
+				insert = GF_TRUE;
+			}
+		}
+		if (insert) {
+			gf_list_insert(ctx->frames, frame, i);
+			ctx->reorder_detected = GF_TRUE;
+			return;
+		}
+	}
+	gf_list_add(ctx->frames, frame);
+}
+
+static CFDictionaryRef vtbdec_create_buffer_attributes(GF_VTBDecCtx *ctx, OSType pix_fmt)
+{
+    CFMutableDictionaryRef buffer_attributes;
+    CFMutableDictionaryRef surf_props;
+    CFNumberRef w;
+    CFNumberRef h;
+    CFNumberRef pixel_fmt;
+
+    w = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &ctx->width);
+    h = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &ctx->height);
+    pixel_fmt = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pix_fmt);
+
+    buffer_attributes = CFDictionaryCreateMutable(kCFAllocatorDefault, 4, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    surf_props = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+	
+    CFDictionarySetValue(buffer_attributes, kCVPixelBufferWidthKey, w);
+    CFRelease(w);
+    CFDictionarySetValue(buffer_attributes, kCVPixelBufferHeightKey, h);
+    CFRelease(h);
+    CFDictionarySetValue(buffer_attributes, kCVPixelBufferPixelFormatTypeKey, pixel_fmt);
+    CFRelease(pixel_fmt);
+
+#ifdef VTB_GL_TEXTURE
+	if (ctx->use_gl_textures)
+		CFDictionarySetValue(buffer_attributes, GF_kCVPixelBufferOpenGLCompatibilityKey, kCFBooleanTrue);
+#endif
+
+    CFDictionarySetValue(buffer_attributes, kCVPixelBufferIOSurfacePropertiesKey, surf_props);
+    CFRelease(surf_props);
+
+    return buffer_attributes;
+}
+
+static GF_Err vtbdec_init_decoder(GF_Filter *filter, GF_VTBDecCtx *ctx)
+{
+	CFMutableDictionaryRef dec_dsi, dec_type;
+	CFMutableDictionaryRef dsi;
+	VTDecompressionOutputCallbackRecord cbacks;
+    CFDictionaryRef buffer_attribs;
+    OSStatus status;
+	OSType kColorSpace;
+	const GF_PropertyValue *p;
+	CFDataRef data = NULL;
+	u8 *dsi_data=NULL;
+	u32 dsi_data_size=0;
+	u32 w, h;
+	GF_FilterPid *pid;
+	w = h = 0;
+	
+    dec_dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+	if (ctx->ofmt==1) {
+		kColorSpace = kCVPixelFormatType_420YpCbCr8Planar;
+		ctx->pix_fmt = GF_PIXEL_YUV;
+	} else if (ctx->ofmt==2) {
+		kColorSpace = kCVPixelFormatType_24RGB;
+		ctx->pix_fmt = GF_PIXEL_RGB;
+	} else {
+		kColorSpace = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+		ctx->pix_fmt = GF_PIXEL_NV12;
+	}
+
+	ctx->reorder_probe = ctx->reorder;
+	ctx->reorder_detected = GF_FALSE;
+	pid = gf_list_get(ctx->streams, 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_DECODER_CONFIG);
+
+	switch (ctx->codecid) {
+    case GF_CODECID_AVC:
+		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)) {
+			s32 idx;
+			u32 i;
+			GF_AVCConfig *cfg;
+			GF_AVCConfigSlot *sps = NULL;
+			GF_AVCConfigSlot *pps = NULL;
+
+			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+				sps = gf_list_get(ctx->SPSs, i);
+				if (ctx->active_sps<0) ctx->active_sps = sps->id;
+
+				if (sps->id==ctx->active_sps) {
+					ctx->active_sps_crc = gf_crc_32(sps->data, sps->size);
+					break;
+				}
+				sps = NULL;
+			}
+			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+				pps = gf_list_get(ctx->PPSs, i);
+				if (ctx->active_pps<0) ctx->active_pps = pps->id;
+
+				if (pps->id==ctx->active_pps) {
+					ctx->active_pps_crc = gf_crc_32(pps->data, pps->size);
+					break;
+				}
+				pps = NULL;
+			}
+			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
+			ctx->reconfig_needed = GF_FALSE;
+			
+			ctx->vtb_type = kCMVideoCodecType_H264;
+
+			if (gf_media_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)
+				return GF_NON_COMPLIANT_BITSTREAM;
+
+			idx = ctx->active_sps;
+			ctx->width = ctx->avc.sps[idx].width;
+			ctx->height = ctx->avc.sps[idx].height;
+			if (ctx->avc.sps[idx].vui.par_num && ctx->avc.sps[idx].vui.par_den) {
+				ctx->pixel_ar.num = ctx->avc.sps[idx].vui.par_num;
+				ctx->pixel_ar.den = ctx->avc.sps[idx].vui.par_den;
+			} else {
+				ctx->pixel_ar.num = ctx->pixel_ar.den = 1;
+			}
+			ctx->chroma_format = ctx->avc.sps[idx].chroma_format;
+			ctx->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
+			ctx->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
+		
+			switch (ctx->chroma_format) {
+			case 2:
+#ifndef GPAC_CONFIG_IOS
+				//422 decoding doesn't seem supported ...
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_422YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV422_10;
+				} else
+#endif
+				{
+					kColorSpace = kCVPixelFormatType_422YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV422;
+				}
+				break;
+			case 3:
+#ifndef GPAC_CONFIG_IOS
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_444YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV444_10;
+				} else
+#endif
+				{
+					kColorSpace = kCVPixelFormatType_444YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV444;
+				}
+				break;
+			default:
+#if !defined(GPAC_CONFIG_IOS) && defined(AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER)
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
+					ctx->pix_fmt = GF_PIXEL_NV12_10;
+				}
+#endif
+				break;
+			}
+			//always rewrite with current sps and pps
+			cfg = gf_odf_avc_cfg_new();
+			cfg->configurationVersion = 1;
+			cfg->profile_compatibility = ctx->avc.sps[idx].prof_compat;
+			cfg->AVCProfileIndication = ctx->avc.sps[idx].profile_idc;
+			cfg->AVCLevelIndication = ctx->avc.sps[idx].level_idc;
+			cfg->chroma_format = ctx->avc.sps[idx].chroma_format;
+			cfg->luma_bit_depth = 8 + ctx->avc.sps[idx].luma_bit_depth_m8;
+			cfg->chroma_bit_depth = 8 + ctx->avc.sps[idx].chroma_bit_depth_m8;
+			cfg->nal_unit_size = 4;
+				
+			//we send only the active SPS and PPS, otherwise vtb complains !!
+			gf_list_add(cfg->sequenceParameterSets, sps);
+			gf_list_add(cfg->pictureParameterSets, pps);
+			gf_odf_avc_cfg_write(cfg, &dsi_data, &dsi_data_size);
+			gf_list_reset(cfg->sequenceParameterSets);
+			gf_list_reset(cfg->pictureParameterSets);
+			gf_odf_avc_cfg_del((cfg));
+			
+			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)dsi_data, dsi_data_size);
+			if (data) {
+				CFDictionarySetValue(dsi, CFSTR("avcC"), data);
+				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
+				CFRelease(data);
+			}
+			CFRelease(dsi);
+		
+			gf_free(dsi_data);
+		}
+        break;
+
+    case GF_CODECID_HEVC:
+		if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && gf_list_count(ctx->VPSs)) {
+			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;
+
+			for (i=0; i<gf_list_count(ctx->VPSs); i++) {
+				vps = gf_list_get(ctx->VPSs, i);
+				if (ctx->active_vps<0) ctx->active_vps = vps->id;
+
+				if (vps->id==ctx->active_vps) break;
+				vps = NULL;
+			}
+			if (!vps) return GF_NON_COMPLIANT_BITSTREAM;
+
+			for (i=0; i<gf_list_count(ctx->SPSs); i++) {
+				sps = gf_list_get(ctx->SPSs, i);
+				if (ctx->active_sps<0) ctx->active_sps = sps->id;
+
+				if (sps->id==ctx->active_sps) break;
+				sps = NULL;
+			}
+			if (!sps) return GF_NON_COMPLIANT_BITSTREAM;
+			for (i=0; i<gf_list_count(ctx->PPSs); i++) {
+				pps = gf_list_get(ctx->PPSs, i);
+				if (ctx->active_pps<0) ctx->active_pps = pps->id;
+
+				if (pps->id==ctx->active_pps) break;
+				pps = NULL;
+			}
+			if (!pps) return GF_NON_COMPLIANT_BITSTREAM;
+			ctx->reconfig_needed = GF_FALSE;
+
+			ctx->vtb_type = kCMVideoCodecType_HEVC;
+
+			idx = ctx->active_sps;
+			ctx->width = ctx->hevc.sps[idx].width;
+			ctx->height = ctx->hevc.sps[idx].height;
+			if (ctx->hevc.sps[idx].aspect_ratio_info_present_flag && ctx->hevc.sps[idx].sar_width && ctx->hevc.sps[idx].sar_height) {
+				ctx->pixel_ar.num = ctx->hevc.sps[idx].sar_width;
+				ctx->pixel_ar.den = ctx->hevc.sps[idx].sar_height;
+			} else {
+				ctx->pixel_ar.num = ctx->pixel_ar.den = 1;
+			}
+			ctx->chroma_format = ctx->hevc.sps[idx].chroma_format_idc;
+			ctx->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
+			ctx->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
+
+			switch (ctx->chroma_format) {
+			case 2:
+				//422 decoding doesn't seem supported ...
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_422YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV422_10;
+				} else {
+					kColorSpace = kCVPixelFormatType_422YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV422;
+				}
+				break;
+			case 3:
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_444YpCbCr10;
+					ctx->pix_fmt = GF_PIXEL_YUV444_10;
+				} else {
+					kColorSpace = kCVPixelFormatType_444YpCbCr8;
+					ctx->pix_fmt = GF_PIXEL_YUV444;
+				}
+				break;
+			default:
+				if (ctx->luma_bit_depth>8) {
+					kColorSpace = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+					ctx->pix_fmt = GF_PIXEL_NV12;
+				}
+				break;
+			}
+			//always rewrite with current sps and pps
+			cfg = gf_odf_hevc_cfg_new();
+			cfg->configurationVersion = 1;
+			cfg->profile_space = ctx->hevc.sps[idx].ptl.profile_space;
+			cfg->tier_flag = ctx->hevc.sps[idx].ptl.tier_flag;
+			cfg->profile_idc = ctx->hevc.sps[idx].ptl.profile_idc;
+			cfg->general_profile_compatibility_flags = ctx->hevc.sps[idx].ptl.profile_compatibility_flag;
+			cfg->progressive_source_flag = ctx->hevc.sps[idx].ptl.general_progressive_source_flag;
+			cfg->interlaced_source_flag = ctx->hevc.sps[idx].ptl.general_interlaced_source_flag;
+			cfg->non_packed_constraint_flag = ctx->hevc.sps[idx].ptl.general_non_packed_constraint_flag;
+			cfg->frame_only_constraint_flag = ctx->hevc.sps[idx].ptl.general_frame_only_constraint_flag;
+
+			cfg->constraint_indicator_flags = ctx->hevc.sps[idx].ptl.general_reserved_44bits;
+			cfg->level_idc = ctx->hevc.sps[idx].ptl.level_idc;
+
+			cfg->luma_bit_depth = ctx->hevc.sps[idx].bit_depth_luma;
+			cfg->chroma_bit_depth = ctx->hevc.sps[idx].bit_depth_chroma;
+			cfg->chromaFormat = ctx->hevc.sps[idx].chroma_format_idc;
+			cfg->complete_representation = GF_TRUE;
+
+			cfg->nal_unit_size = 4;
+
+			GF_SAFEALLOC(vpsa, GF_HEVCParamArray);
+			if (!vpsa) return GF_OUT_OF_MEM;
+			vpsa->array_completeness = 1;
+			vpsa->type = GF_HEVC_NALU_VID_PARAM;
+			vpsa->nalus = gf_list_new();
+			gf_list_add(vpsa->nalus, vps);
+			gf_list_add(cfg->param_array, vpsa);
+
+			GF_SAFEALLOC(spsa, GF_HEVCParamArray);
+			if (!spsa) return GF_OUT_OF_MEM;
+			spsa->array_completeness = 1;
+			spsa->type = GF_HEVC_NALU_SEQ_PARAM;
+			spsa->nalus = gf_list_new();
+			gf_list_add(spsa->nalus, sps);
+			gf_list_add(cfg->param_array, spsa);
+
+			GF_SAFEALLOC(ppsa, GF_HEVCParamArray);
+			if (!ppsa) return GF_OUT_OF_MEM;
+			ppsa->array_completeness = 1;
+			ppsa->type = GF_HEVC_NALU_PIC_PARAM;
+			//we send all PPS
+			ppsa->nalus = ctx->PPSs;
+
+			gf_list_add(cfg->param_array, ppsa);
+
+			gf_odf_hevc_cfg_write(cfg, &dsi_data, &dsi_data_size);
+			gf_list_reset(vpsa->nalus);
+			gf_list_reset(spsa->nalus);
+			ppsa->nalus = NULL;
+			gf_odf_hevc_cfg_del(cfg);
+
+			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*)dsi_data, dsi_data_size);
+			if (data) {
+				CFDictionarySetValue(dsi, CFSTR("hvcC"), data);
+				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
+				CFRelease(data);
+			}
+			CFRelease(dsi);
+
+			gf_free(dsi_data);
+		}
+        break;
+
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_SPATIAL:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_422:
+
+        ctx->vtb_type = kCMVideoCodecType_MPEG2Video;
+		if (!ctx->width || !ctx->height) {
+			ctx->init_mpeg12 = GF_TRUE;
+			return GF_OK;
+		}
+		ctx->init_mpeg12 = GF_FALSE;
+		ctx->reconfig_needed = GF_FALSE;
+        break;
+		
+	case GF_CODECID_MPEG1:
+		ctx->vtb_type = kCMVideoCodecType_MPEG1Video;
+		if (!ctx->width || !ctx->height) {
+			ctx->init_mpeg12 = GF_TRUE;
+			return GF_OK;
+		}
+		ctx->init_mpeg12 = GF_FALSE;
+		ctx->reconfig_needed = GF_FALSE;
+		break;
+    case GF_CODECID_MPEG4_PART2 :
+	{
+		char *vosh = NULL;
+		u32 vosh_size = 0;
+		ctx->vtb_type = kCMVideoCodecType_MPEG4Video;
+
+		if (!p || !p->value.data.ptr) {
+			vosh = ctx->vosh;
+			vosh_size = ctx->vosh_size;
+		} else {
+			vosh = p->value.data.ptr;
+			vosh_size = p->value.data.size;
+		}
+		ctx->reconfig_needed = GF_FALSE;
+
+		if (vosh) {
+			GF_M4VDecSpecInfo vcfg;
+			GF_BitStream *bs;
+			GF_ESD *esd;
+
+			gf_m4v_get_config(vosh, vosh_size, &vcfg);
+			ctx->width = vcfg.width;
+			ctx->height = vcfg.height;
+			esd = gf_odf_desc_esd_new(2);
+			esd->decoderConfig->decoderSpecificInfo->data = vosh;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = vosh_size;
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			gf_bs_write_u32(bs, 0);
+			gf_odf_desc_write_bs((GF_Descriptor *) esd, bs);
+			gf_bs_get_content(bs, &dsi_data, &dsi_data_size);
+			gf_bs_del(bs);
+			esd->decoderConfig->decoderSpecificInfo->data = NULL;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
+			gf_odf_desc_del((GF_Descriptor*)esd);
+
+			dsi = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+			data = CFDataCreate(kCFAllocatorDefault, (const UInt8*) dsi_data, dsi_data_size);
+			gf_free(dsi_data);
+			
+			if (data) {
+				CFDictionarySetValue(dsi, CFSTR("esds"), data);
+				CFDictionarySetValue(dec_dsi, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, dsi);
+				CFRelease(data);
+			}
+			CFRelease(dsi);
+			
+			ctx->skip_mpeg4_vosh = GF_FALSE;
+		} else {
+			ctx->skip_mpeg4_vosh = GF_TRUE;
+			return GF_OK;
+		}
+        break;
+    }
+	case GF_CODECID_H263:
+	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;
+		}
+		break;
+		
+	default :
+		ctx->reconfig_needed = GF_FALSE;
+		return GF_NOT_SUPPORTED;
+    }
+	//not yet ready
+	if (! ctx->width || !ctx->height) return GF_OK;
+
+    /*status = */CMVideoFormatDescriptionCreate(kCFAllocatorDefault, ctx->vtb_type, ctx->width, ctx->height, dec_dsi, &ctx->fmt_desc);
+
+    if (!ctx->fmt_desc) {
+		if (dec_dsi) CFRelease(dec_dsi);
+        return GF_NON_COMPLIANT_BITSTREAM;
+    }
+	buffer_attribs = vtbdec_create_buffer_attributes(ctx, kColorSpace);
+	
+	cbacks.decompressionOutputCallback = vtbdec_on_frame;
+    cbacks.decompressionOutputRefCon   = ctx;
+
+	status = 1;
+	if (!ctx->disable_hw) {
+		dec_type = CFDictionaryCreateMutable(kCFAllocatorDefault, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+		CFDictionarySetValue(dec_type, kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue);
+		ctx->is_hardware = GF_TRUE;
+
+		status = VTDecompressionSessionCreate(NULL, ctx->fmt_desc, dec_type, buffer_attribs, &cbacks, &ctx->vtb_session);
+
+		if (dec_type)
+			CFRelease(dec_type);
+	}
+
+	//if HW decoder not available or disabled , try soft one
+	if (status) {
+		status = VTDecompressionSessionCreate(NULL, ctx->fmt_desc, NULL, buffer_attribs, &cbacks, &ctx->vtb_session);
+		ctx->is_hardware = GF_FALSE;
+	}
+	
+	if (dec_dsi)
+		CFRelease(dec_dsi);
+    if (buffer_attribs)
+        CFRelease(buffer_attribs);
+
+    switch (status) {
+    case kVTVideoDecoderNotAvailableNowErr:
+    case kVTVideoDecoderUnsupportedDataFormatErr:
+        return GF_NOT_SUPPORTED;
+    case kVTVideoDecoderMalfunctionErr:
+        return GF_IO_ERR;
+    case kVTVideoDecoderBadDataErr :
+        return GF_NOT_SUPPORTED;
+
+	case kVTPixelTransferNotSupportedErr:
+	case kVTCouldNotFindVideoDecoderErr:
+		return GF_NOT_SUPPORTED;
+    case 0:
+        break;
+    default:
+        return GF_SERVICE_ERROR;
+    }
+	
+	//good to go !
+	ctx->stride = ctx->width;
+	if (ctx->pix_fmt == GF_PIXEL_YUV422) {
+		ctx->out_size = ctx->width*ctx->height*2;
+	} else if (ctx->pix_fmt == GF_PIXEL_YUV444) {
+		ctx->out_size = ctx->width*ctx->height*3;
+	} else if (ctx->pix_fmt == GF_PIXEL_RGB) {
+		ctx->out_size = ctx->width*ctx->height*3;
+		ctx->stride *= 3;
+	} else {
+		// (ctx->pix_fmt == GF_PIXEL_YUV)
+		ctx->out_size = ctx->width*ctx->height*3/2;
+	}
+	if (ctx->luma_bit_depth>8) {
+		ctx->out_size *= 2;
+	}
+	ctx->frame_size_changed = GF_TRUE;
+	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_PAR, &PROP_FRAC(ctx->pixel_ar) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt) );
+	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;
+	}
+	return GF_OK;
+}
+
+static void vtbdec_register_param_sets(GF_VTBDecCtx *ctx, char *data, u32 size, Bool is_sps, u8 hevc_nal_type)
+{
+	Bool add = GF_TRUE;
+	u32 i, count;
+	s32 ps_id;
+	GF_List *dest = NULL;
+
+	if (!ctx->ps_bs) ctx->ps_bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->ps_bs, data, size);
+
+	if (hevc_nal_type) {
+		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);
+			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);
+			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);
+			if (ps_id<0) return;
+		}
+
+	} else {
+		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);
+			if (ps_id<0) return;
+		} else {
+			ps_id = gf_media_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);
+		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) ) {
+			gf_free(a_slc->data);
+			gf_free(a_slc);
+			gf_list_rem(dest, i);
+			break;
+		} else {
+			add = GF_FALSE;
+		}
+		break;
+	}
+	if (add) {
+		GF_AVCConfigSlot *slc;
+		GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+		if (!slc) return;
+		slc->data = gf_malloc(size);
+		if (!slc->data) {
+			gf_free(slc);
+			return;
+		}
+		memcpy(slc->data, data, size);
+		slc->size = size;
+		slc->id = ps_id;
+		slc->crc = gf_crc_32(data, size);
+		gf_list_add(dest, slc);
+	}
+}
+
+static u32 vtbdec_purge_param_sets(GF_VTBDecCtx *ctx, Bool is_sps, s32 idx)
+{
+	u32 i, j, count, crc_res = 0;
+	GF_List *dest = is_sps ? ctx->SPSs : ctx->PPSs;
+
+	//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);
+		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);
+			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) ) {
+				crc_res = a_slc->crc;
+				gf_free(slc->data);
+				gf_free(slc);
+				gf_list_rem(dest, i);
+				i--;
+				count--;
+				break;
+			}
+		}
+	}
+	return crc_res;
+}
+
+static void vtbdec_del_param_list(GF_List *list)
+{
+	while (gf_list_count(list)) {
+		GF_AVCConfigSlot *slc = gf_list_get(list, 0);
+		gf_free(slc->data);
+		gf_free(slc);
+		gf_list_rem(list, 0);
+	}
+	gf_list_del(list);
+}
+
+static GF_Err vtbdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p, *dsi;
+	u32 codecid, dsi_crc;
+	GF_Err e;
+	GF_FilterPid *base_pid = NULL;
+	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);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid)) {
+		while (gf_list_count(ctx->frames)) {
+			vtbdec_flush_frame(filter, ctx);
+		}
+		return GF_NOT_SUPPORTED;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTBDec] Missing codecid, cannot initialize\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	codecid = p->value.uint;
+
+	base_pid = gf_list_get(ctx->streams, 0);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (!p && base_pid && (base_pid != pid)) return GF_REQUIRES_NEW_INSTANCE;
+	else if (p) {
+		u32 i;
+		u32 base_idx_plus_one = 0;
+
+		if (ctx->codecid != GF_CODECID_HEVC) return GF_REQUIRES_NEW_INSTANCE;
+
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			GF_FilterPid *ipid = gf_list_get(ctx->streams, i);
+			const GF_PropertyValue *p_dep;
+			if (ipid==pid) continue;
+
+			p_dep = gf_filter_pid_get_property(ipid, GF_PROP_PID_ID);
+			if (p_dep && p_dep->value.uint == p->value.uint) {
+				base_idx_plus_one = i+1;
+				break;
+			}
+		}
+		if (!base_idx_plus_one) return GF_REQUIRES_NEW_INSTANCE;
+
+		//no support for L-HEVC
+		if (codecid != GF_CODECID_HEVC) return GF_NOT_SUPPORTED;
+		if (gf_list_find(ctx->streams, pid) < 0) {
+			gf_list_insert(ctx->streams, pid, base_idx_plus_one);
+		}
+		//no configure for temporal enhancements
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (ctx->opid && p) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FPS, p);
+		return GF_OK;
+	}
+
+
+	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) {
+		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);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+		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_PAR, &PROP_FRAC(ctx->pixel_ar) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pix_fmt) );
+		return GF_OK;
+	}
+	//need a reset !
+	if (ctx->vtb_session) {
+		//flush all pending frames and mark reconfigure as pending
+		ctx->reconfig_needed = GF_TRUE;
+		while (gf_list_count(ctx->frames)) {
+			vtbdec_flush_frame(filter, ctx);
+		}
+	}
+	if (gf_list_find(ctx->streams, pid) < 0) {
+		gf_list_insert(ctx->streams, pid, 0);
+	}
+	ctx->cfg_crc = dsi_crc;
+	ctx->codecid = codecid;
+	gf_filter_set_max_extra_input_pids(filter, (codecid==GF_CODECID_HEVC) ? 5 : 0);
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+
+	//copy properties at init or reconfig
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, NULL);
+
+	ctx->nalu_size_length = 0;
+	ctx->is_annex_b = GF_FALSE;
+
+	//check AVC config
+	if (codecid==GF_CODECID_AVC) {
+
+		if (ctx->SPSs) vtbdec_del_param_list(ctx->SPSs);
+		ctx->SPSs = gf_list_new();
+		if (ctx->PPSs) vtbdec_del_param_list(ctx->PPSs);
+		ctx->PPSs = gf_list_new();
+
+		ctx->is_avc = GF_TRUE;
+		ctx->check_h264_isma = GF_TRUE;
+
+		ctx->avc.sps_active_idx = ctx->avc.pps_active_idx = -1;
+		ctx->active_sps = ctx->active_pps = -1;
+		ctx->active_sps_crc = ctx->active_pps_crc = 0;
+
+		if (!dsi || !dsi->value.data.ptr) {
+			ctx->is_annex_b = GF_TRUE;
+			ctx->width=ctx->height=128;
+			ctx->out_size = ctx->width*ctx->height*3/2;
+			ctx->pix_fmt = GF_PIXEL_YUV;
+			return GF_OK;
+		} else {
+			u32 i;
+			GF_AVCConfigSlot *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);
+				slc->id = -1;
+				vtbdec_register_param_sets(ctx, slc->data, slc->size, GF_TRUE, 0);
+			}
+
+			for (i=0; i<gf_list_count(cfg->pictureParameterSets); i++) {
+				slc = gf_list_get(cfg->pictureParameterSets, i);
+				slc->id = -1;
+				vtbdec_register_param_sets(ctx, slc->data, slc->size, GF_FALSE, 0);
+			}
+
+			slc = gf_list_get(ctx->SPSs, 0);
+			if (slc) {
+				ctx->active_sps = slc->id;
+				ctx->active_sps_crc = gf_crc_32(slc->data, slc->size);
+			}
+
+			slc = gf_list_get(ctx->PPSs, 0);
+			if (slc) {
+				ctx->active_pps = slc->id;
+				ctx->active_pps_crc = gf_crc_32(slc->data, slc->size);
+			}
+
+			ctx->nalu_size_length = cfg->nal_unit_size;
+			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) && !ctx->reconfig_needed ) {
+				e = vtbdec_init_decoder(filter, ctx);
+			} else {
+				e = GF_OK;
+			}
+			gf_odf_avc_cfg_del(cfg);
+			return e;
+		}
+	}
+
+	//check HEVC config
+	if (codecid==GF_CODECID_HEVC) {
+		if (ctx->SPSs) vtbdec_del_param_list(ctx->SPSs);
+		ctx->SPSs = gf_list_new();
+		if (ctx->SPSs) vtbdec_del_param_list(ctx->PPSs);
+		ctx->PPSs = gf_list_new();
+		if (ctx->SPSs) vtbdec_del_param_list(ctx->VPSs);
+		ctx->VPSs = gf_list_new();
+		ctx->is_hevc = GF_TRUE;
+
+		ctx->hevc.sps_active_idx = -1;
+		ctx->active_sps = ctx->active_pps = ctx->active_vps = -1;
+
+		if (!dsi || !dsi->value.data.ptr) {
+			ctx->is_annex_b = GF_TRUE;
+			ctx->width=ctx->height=128;
+			ctx->out_size = ctx->width*ctx->height*3/2;
+			ctx->pix_fmt = GF_PIXEL_YUV;
+			return GF_OK;
+		} else {
+			u32 i, j;
+			GF_AVCConfigSlot *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);
+
+
+				for (j=0; j<gf_list_count(pa->nalus); j++) {
+					slc = gf_list_get(pa->nalus, j);
+					slc->id = -1;
+
+					vtbdec_register_param_sets(ctx, slc->data, slc->size, GF_FALSE, pa->type);
+				}
+			}
+
+			slc = gf_list_get(ctx->SPSs, 0);
+			if (slc) ctx->active_sps = slc->id;
+
+			slc = gf_list_get(ctx->PPSs, 0);
+			if (slc) ctx->active_pps = slc->id;
+
+			slc = gf_list_get(ctx->VPSs, 0);
+			if (slc) ctx->active_vps = slc->id;
+
+			ctx->nalu_size_length = cfg->nal_unit_size;
+			if (gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs)  && gf_list_count(ctx->VPSs)  && !ctx->reconfig_needed) {
+				e = vtbdec_init_decoder(filter, ctx);
+			} else {
+				e = GF_OK;
+			}
+			gf_odf_hevc_cfg_del(cfg);
+			return e;
+		}
+	}
+
+	if (ctx->vtb_session) {
+		assert(ctx->reconfig_needed);
+		return GF_OK;
+	}
+
+	//check VOSH config
+	if (codecid==GF_CODECID_MPEG4_PART2) {
+		if (!dsi || !dsi->value.data.ptr) {
+			ctx->width=ctx->height=128;
+			ctx->out_size = ctx->width*ctx->height*3/2;
+			ctx->pix_fmt = GF_PIXEL_YUV;
+		} else {
+			return vtbdec_init_decoder(filter, ctx);
+		}
+	}
+
+	return vtbdec_init_decoder(filter, ctx);
+}
+
+
+static void vtbdec_delete_decoder(GF_VTBDecCtx *ctx)
+{
+	if (ctx->fmt_desc) {
+		CFRelease(ctx->fmt_desc);
+		ctx->fmt_desc = NULL;
+	}
+	if (ctx->vtb_session) {
+		VTDecompressionSessionInvalidate(ctx->vtb_session);
+		ctx->vtb_session=NULL;
+	}
+	vtbdec_del_param_list(ctx->SPSs);
+	ctx->SPSs = NULL;
+	vtbdec_del_param_list(ctx->PPSs);
+	ctx->PPSs = NULL;
+	vtbdec_del_param_list(ctx->VPSs);
+	ctx->VPSs = NULL;
+}
+
+static GF_Err vtbdec_parse_nal_units(GF_Filter *filter, GF_VTBDecCtx *ctx, char *inBuffer, u32 inBufferLength, char **out_buffer, u32 *out_size)
+{
+	u32 i, sc_size=0;
+	char *ptr = inBuffer;
+	u32 nal_size;
+	GF_Err e = GF_OK;
+	Bool reassign_bs = GF_TRUE;
+	Bool check_reconfig = GF_FALSE;
+
+	if (out_buffer) {
+		*out_buffer = NULL;
+		*out_size = 0;
+	}
+	
+	if (!ctx->nalu_size_length) {
+		nal_size = gf_media_nalu_next_start_code((u8 *) inBuffer, inBufferLength, &sc_size);
+		if (!sc_size) return GF_NON_COMPLIANT_BITSTREAM;
+		ptr += nal_size + sc_size;
+		assert(inBufferLength >= nal_size + sc_size);
+		inBufferLength -= nal_size + sc_size;
+	}
+	
+	while (inBufferLength) {
+		Bool add_nal = GF_TRUE;
+		u8 nal_type, nal_hdr;
+
+		if (ctx->nalu_size_length) {
+			nal_size = 0;
+			for (i=0; i<ctx->nalu_size_length; i++) {
+				nal_size = (nal_size<<8) + ((u8) ptr[i]);
+			}
+
+			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));
+				break;
+			}
+			ptr += ctx->nalu_size_length;
+		} else {
+			nal_size = gf_media_nalu_next_start_code((const u8 *) ptr, inBufferLength, &sc_size);
+		}
+
+        if (nal_size==0) {
+            GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error parsing NAL: size 0 shall never happen\n", nal_size));
+
+            if (ctx->nalu_size_length) {
+                if (inBufferLength < ctx->nalu_size_length) break;
+                inBufferLength -= ctx->nalu_size_length;
+            } else {
+                if (!sc_size || (inBufferLength < sc_size)) break;
+                inBufferLength -= sc_size;
+                ptr += sc_size;
+            }
+            continue;
+        }
+        
+		if (ctx->is_avc) {
+			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);
+
+			nal_hdr = ptr[0];
+			nal_type = nal_hdr & 0x1F;
+			switch (nal_type) {
+			case GF_AVC_NALU_SEQ_PARAM:
+				vtbdec_register_param_sets(ctx, ptr, nal_size, GF_TRUE, 0);
+				add_nal = GF_FALSE;
+				break;
+			case GF_AVC_NALU_PIC_PARAM:
+				vtbdec_register_param_sets(ctx, ptr, nal_size, GF_FALSE, 0);
+				add_nal = GF_FALSE;
+				break;
+			case GF_AVC_NALU_ACCESS_UNIT:
+			case GF_AVC_NALU_END_OF_SEQ:
+			case GF_AVC_NALU_END_OF_STREAM:
+			case GF_AVC_NALU_FILLER_DATA:
+				add_nal = GF_FALSE;
+				break;
+			default:
+				break;
+			}
+
+			gf_media_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) {
+					ctx->reconfig_needed = 1;
+					ctx->active_sps = ctx->avc.sps_active_idx;
+					ctx->active_pps = ctx->avc.s_info.pps->id;
+					return GF_OK;
+				}
+			}
+		} else if (ctx->is_hevc) {
+			u8 temporal_id, ayer_id;
+
+			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);
+			if (res>=0) {
+				switch (nal_type) {
+				case GF_HEVC_NALU_VID_PARAM:
+				case GF_HEVC_NALU_SEQ_PARAM:
+				case GF_HEVC_NALU_PIC_PARAM:
+					vtbdec_register_param_sets(ctx, ptr, nal_size, GF_FALSE, nal_type);
+					add_nal = GF_FALSE;
+					break;
+				case GF_HEVC_NALU_ACCESS_UNIT:
+				case GF_HEVC_NALU_END_OF_SEQ:
+				case GF_HEVC_NALU_END_OF_STREAM:
+				case GF_HEVC_NALU_FILLER_DATA:
+					add_nal = GF_FALSE;
+					break;
+				default:
+					break;
+				}
+
+				if ((nal_type<=GF_HEVC_NALU_SLICE_CRA) && ctx->hevc.s_info.sps) {
+					if (ctx->hevc.sps_active_idx != ctx->active_sps) {
+						ctx->reconfig_needed = 1;
+						ctx->active_sps = ctx->hevc.sps_active_idx;
+						ctx->active_pps = ctx->hevc.s_info.pps->id;
+						ctx->active_vps = ctx->hevc.s_info.sps->vps_id;
+						return GF_OK;
+					}
+				}
+			}
+		}
+		
+		//if sps and pps are ready, init decoder
+		if (!ctx->vtb_session && gf_list_count(ctx->SPSs) && gf_list_count(ctx->PPSs) ) {
+			e = vtbdec_init_decoder(filter, ctx);
+			if (e) {
+				return e;
+			}
+		}
+		
+		if (!out_buffer) add_nal = GF_FALSE;
+		else if (add_nal && !ctx->vtb_session) add_nal = GF_FALSE;
+
+		if (add_nal) {
+			if (reassign_bs) {
+				if (!ctx->nalu_rewrite_bs) ctx->nalu_rewrite_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				else {
+					gf_bs_reassign_buffer(ctx->nalu_rewrite_bs, ctx->nalu_buffer, ctx->nalu_buffer_alloc);
+					//detach from context until we get the output of the bistream
+					ctx->nalu_buffer = NULL;
+					ctx->nalu_buffer_alloc = 0;
+				}
+				reassign_bs = GF_FALSE;
+			}
+			
+			gf_bs_write_u32(ctx->nalu_rewrite_bs, nal_size);
+			gf_bs_write_data(ctx->nalu_rewrite_bs, ptr, nal_size);
+		}
+		
+		ptr += nal_size;
+		if (ctx->nalu_size_length) {
+			if (inBufferLength < nal_size + ctx->nalu_size_length) break;
+			inBufferLength -= nal_size + ctx->nalu_size_length;
+		} else {
+			if (!sc_size || (inBufferLength < nal_size + sc_size)) break;
+			inBufferLength -= nal_size + sc_size;
+			ptr += sc_size;
+		}
+	}
+
+	if (check_reconfig && ctx->avc.s_info.pps ) {
+		u32 sps_crc, pps_crc;
+		sps_crc = vtbdec_purge_param_sets(ctx, GF_TRUE, ctx->avc.s_info.pps->sps_id);
+		pps_crc = vtbdec_purge_param_sets(ctx, GF_FALSE, ctx->avc.s_info.pps->id);
+
+		if ((sps_crc != ctx->active_sps_crc) || (pps_crc != ctx->active_pps_crc) ) {
+			ctx->reconfig_needed = 1;
+			ctx->active_sps = ctx->avc.s_info.pps->sps_id;
+			ctx->active_pps = ctx->avc.s_info.pps->id;
+			ctx->active_sps_crc = sps_crc;
+			ctx->active_pps_crc = pps_crc;
+		}
+	}
+
+	if (!reassign_bs) {
+		//get output without truncating the allocated buffer, repass the buffer at the next AU
+		gf_bs_get_content_no_truncate(ctx->nalu_rewrite_bs, &ctx->nalu_buffer, out_size, &ctx->nalu_buffer_alloc);
+		*out_buffer = ctx->nalu_buffer;
+	}
+	return e;
+}
+
+
+static GF_Err vtbdec_send_output_frame(GF_Filter *filter, GF_VTBDecCtx *ctx);
+
+static GF_Err vtbdec_flush_frame(GF_Filter *filter, GF_VTBDecCtx *ctx)
+{
+	GF_VTBHWFrame *vtbframe;
+    OSStatus status;
+	OSType type;
+
+	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)));
+
+
+	status = CVPixelBufferLockBaseAddress(vtbframe->frame, kCVPixelBufferLock_ReadOnly);
+    if (status != kCVReturnSuccess) {
+        GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
+		gf_list_add(ctx->frames_res, vtbframe);
+        return GF_IO_ERR;
+    }
+
+	type = CVPixelBufferGetPixelFormatType(vtbframe->frame);
+
+	if ((type==kCVPixelFormatType_420YpCbCr8Planar)
+		|| (type==kCVPixelFormatType_420YpCbCr8PlanarFullRange)
+		|| (type==kCVPixelFormatType_422YpCbCr8_yuvs)
+		|| (type==kCVPixelFormatType_444YpCbCr8)
+		|| (type=='444v')
+		|| (type==kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange)
+		|| (type==kCVPixelFormatType_420YpCbCr8BiPlanarFullRange)
+	) {
+        u32 i, j, nb_planes = (u32) CVPixelBufferGetPlaneCount(vtbframe->frame);
+		u8 *dst;
+		u32 stride = (u32) CVPixelBufferGetBytesPerRowOfPlane(vtbframe->frame, 0);
+
+		GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &dst);
+
+		//TOCHECK - for now the 3 planes are consecutive in VideoToolbox
+		if (stride==ctx->width) {
+			char *data = CVPixelBufferGetBaseAddressOfPlane(vtbframe->frame, 0);
+			memcpy(dst, data, sizeof(char)*ctx->out_size);
+		} else {
+			for (i=0; i<nb_planes; i++) {
+				char *data = CVPixelBufferGetBaseAddressOfPlane(vtbframe->frame, i);
+				u32 stride = (u32) CVPixelBufferGetBytesPerRowOfPlane(vtbframe->frame, i);
+				u32 w, h = (u32) CVPixelBufferGetHeightOfPlane(vtbframe->frame, i);
+				w = ctx->width;
+				if (i) {
+					switch (ctx->pix_fmt) {
+					case GF_PIXEL_YUV444:
+						break;
+					case GF_PIXEL_YUV422:
+					case GF_PIXEL_YUV:
+						w /= 2;
+						break;
+					}
+				}
+				if (stride != w) {
+					for (j=0; j<h; j++) {
+						memcpy(dst, data, sizeof(char)*w);
+						dst += w;
+						data += stride;
+					}
+				} else {
+					memcpy(dst, data, sizeof(char)*h*stride);
+					dst += sizeof(char)*h*stride;
+				}
+			}
+		}
+
+		gf_filter_pck_merge_properties(vtbframe->pck_src, dst_pck);
+		ctx->last_cts_out = gf_filter_pck_get_cts(vtbframe->pck_src);
+		ctx->last_timescale_out = gf_filter_pck_get_timescale(vtbframe->pck_src);
+		gf_filter_pck_unref(vtbframe->pck_src);
+		vtbframe->pck_src = NULL;
+		gf_filter_pck_send(dst_pck);
+	}
+    CVPixelBufferUnlockBaseAddress(vtbframe->frame, kCVPixelBufferLock_ReadOnly);
+	gf_list_add(ctx->frames_res, vtbframe);
+	return GF_OK;
+}
+static GF_Err vtbdec_process(GF_Filter *filter)
+{
+    OSStatus status;
+    CMSampleBufferRef sample = NULL;
+    CMBlockBufferRef block_buffer = NULL;
+	char *in_data=NULL;
+	u32 in_data_size;
+	char *in_buffer;
+	u32 in_buffer_size, frames_count, i, count, nb_eos;
+	u64 min_dts;
+	GF_Err e;
+	GF_VTBDecCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_FilterPid *ref_pid = NULL;
+
+	//figure out min DTS
+	count = gf_list_count(ctx->streams);
+	nb_eos = 0;
+	min_dts = 0;
+	for (i=0; i<count; i++) {
+		u64 dts;
+		GF_FilterPid *pid = gf_list_get(ctx->streams, i);
+
+		pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pid)) {
+				nb_eos++;
+				continue;
+			} else {
+				return GF_OK;
+			}
+		}
+		dts = gf_filter_pck_get_dts(pck);
+		dts *= 1000;
+		dts /= gf_filter_pck_get_timescale(pck);
+		if (!min_dts || (min_dts>dts)) {
+			min_dts = dts;
+			ref_pid = pid;
+		}
+	}
+
+	if (nb_eos==count) {
+		while (gf_list_count(ctx->frames)) {
+			vtbdec_flush_frame(filter, ctx);
+		}
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+	assert(ref_pid);
+	pck = gf_filter_pid_get_packet(ref_pid);
+	assert(pck);
+
+	if (ctx->drop_non_refs && !gf_filter_pck_get_sap(pck)) {
+		gf_filter_pid_drop_packet(ref_pid);
+		return GF_OK;
+	}
+
+	in_buffer = (char *) gf_filter_pck_get_data(pck, &in_buffer_size);
+
+	//discard empty packets
+	if (!in_buffer || !in_buffer_size) {
+		gf_filter_pid_drop_packet(ref_pid);
+		//if inbuffer is null this is a hardware frame, should never happen
+		return in_buffer ? GF_OK : GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->skip_mpeg4_vosh) {
+		GF_M4VDecSpecInfo dsi;
+		dsi.width = dsi.height = 0;
+		e = gf_m4v_get_config(in_buffer, in_buffer_size, &dsi);
+		//found a vosh - remove it from payload, init decoder if needed
+		if ((e==GF_OK) && dsi.width && dsi.height) {
+			if (!ctx->vtb_session) {
+				ctx->vosh = in_buffer;
+				ctx->vosh_size = dsi.next_object_start;
+				e = vtbdec_init_decoder(filter, ctx);
+				if (e) {
+					gf_filter_pid_drop_packet(ref_pid);
+					return e;
+				}
+
+				//enfoce removal for all frames
+				ctx->skip_mpeg4_vosh = GF_TRUE;
+			}
+			ctx->vosh_size = dsi.next_object_start;
+		} else if (!ctx->vtb_session) {
+			gf_filter_pid_drop_packet(ref_pid);
+			return GF_OK;
+		}
+	}
+
+	if (ctx->init_mpeg12) {
+		GF_M4VDecSpecInfo dsi;
+		dsi.width = dsi.height = 0;
+		
+		e = gf_mpegv12_get_config(in_buffer, in_buffer_size, &dsi);
+		if ((e==GF_OK) && dsi.width && dsi.height) {
+			ctx->width = dsi.width;
+			ctx->height = dsi.height;
+			ctx->pixel_ar.num = dsi.par_num;
+			ctx->pixel_ar.den = dsi.par_den;
+			
+			e = vtbdec_init_decoder(filter, ctx);
+			if (e) {
+				gf_filter_pid_drop_packet(ref_pid);
+				return e;
+			}
+		}
+
+		if (!ctx->vtb_session) {
+			gf_filter_pid_drop_packet(ref_pid);
+			return GF_OK;
+		}
+	}
+	
+	if (ctx->check_h264_isma) {
+		if (in_buffer && !in_buffer[0] && !in_buffer[1] && !in_buffer[2] && (in_buffer[3]==0x01)) {
+			ctx->check_h264_isma=GF_FALSE;
+			ctx->nalu_size_length=0;
+			ctx->is_annex_b=GF_TRUE;
+		}
+	}
+
+	//Always parse AVC data , remove SPS/PPS/... and reconfig if needed
+	if (ctx->is_annex_b || ctx->nalu_size_length) {
+
+		e = vtbdec_parse_nal_units(filter, ctx, in_buffer, in_buffer_size, &in_data, &in_data_size);
+		if (e) {
+			gf_filter_pid_drop_packet(ref_pid);
+			return e;
+		}
+	} else if (ctx->vosh_size) {
+		in_data = in_buffer + ctx->vosh_size;
+		in_data_size = in_buffer_size - ctx->vosh_size;
+		ctx->vosh_size = 0;
+	} else {
+		in_data = in_buffer;
+		in_data_size = in_buffer_size;
+	}
+
+	if (ctx->reconfig_needed) {
+		//flush all pending frames
+		while (gf_list_count(ctx->frames)) {
+			vtbdec_flush_frame(filter, ctx);
+		}
+		//waiting for last frame to be discarded
+		if (ctx->no_copy && ctx->decoded_frames_pending) {
+			ctx->last_frame_sent->frame_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+			gf_filter_ask_rt_reschedule(filter, 0);
+			return GF_OK;
+		}
+		if (ctx->fmt_desc) {
+			CFRelease(ctx->fmt_desc);
+			ctx->fmt_desc = NULL;
+		}
+		if (ctx->vtb_session) {
+			VTDecompressionSessionInvalidate(ctx->vtb_session);
+			ctx->vtb_session=NULL;
+		}
+		vtbdec_init_decoder(filter, ctx);
+		return GF_OK;
+	}
+	if (!ctx->vtb_session) {
+		gf_filter_pid_drop_packet(ref_pid);
+		return GF_OK;
+	}
+	
+
+	status = CMBlockBufferCreateWithMemoryBlock(kCFAllocatorDefault, in_data, in_data_size, kCFAllocatorNull, NULL, 0, in_data_size, 0, &block_buffer);
+
+	if (status ||  (block_buffer == NULL) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Failed to allocate block buffer of %d bytes\n", in_data_size));
+		gf_filter_pid_drop_packet(ref_pid);
+		return GF_IO_ERR;
+	}
+
+	status = CMSampleBufferCreate(kCFAllocatorDefault, block_buffer, TRUE, NULL, NULL, ctx->fmt_desc, 1, 0, NULL, 0, NULL, &sample);
+
+    if (status || (sample==NULL)) {
+		if (block_buffer)
+			CFRelease(block_buffer);
+
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Failed to create sample buffer for %d bytes\n", in_data_size));
+		gf_filter_pid_drop_packet(ref_pid);
+		return GF_IO_ERR;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[VTB] Decoding frame DTS "LLU" ms\n", min_dts));
+	ctx->cur_pck = pck;
+	ctx->last_error = GF_OK;
+    status = VTDecompressionSessionDecodeFrame(ctx->vtb_session, sample, 0, NULL, 0);
+    if (!status)
+		status = VTDecompressionSessionWaitForAsynchronousFrames(ctx->vtb_session);
+	
+
+	CFRelease(block_buffer);
+	CFRelease(sample);
+
+	//profile not supported, request codec change - do not discard input frame
+	if (ctx->last_error==GF_PROFILE_NOT_SUPPORTED) {
+		ctx->cur_pck = NULL;
+		return ctx->last_error;
+	}
+	
+	gf_filter_pid_drop_packet(ref_pid);
+	ctx->cur_pck = NULL;
+
+	if (ctx->last_error) return ctx->last_error;
+
+	if (status)
+		return GF_NON_COMPLIANT_BITSTREAM;
+
+	frames_count = gf_list_count(ctx->frames);
+	if (!frames_count) {
+		return ctx->last_error;
+	}
+	//probing for reordering, or reordering is on but not enough frames: wait before we dispatch
+	if (ctx->reorder_probe) {
+		return GF_OK;
+	}
+
+	if (ctx->reorder_detected && (frames_count<ctx->reorder) )
+		return GF_OK;
+
+	return vtbdec_flush_frame(filter, ctx);
+}
+
+void vtbframe_release(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FilterFrameInterface *frame = gf_filter_pck_get_frame_interface(pck);
+	GF_VTBHWFrame *f = (GF_VTBHWFrame *)frame->user_data;
+	if (f->locked) {
+		CVPixelBufferUnlockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
+	}
+#ifdef VTB_GL_TEXTURE
+	if (f->y) CVBufferRelease(f->y);
+	if (f->u) CVBufferRelease(f->u);
+	if (f->v) CVBufferRelease(f->v);
+	if (f->ctx->cache_texture)
+		GF_CVOpenGLTextureCacheFlush(f->ctx->cache_texture, 0);
+#endif
+	
+	if (f->frame) {
+        CVPixelBufferRelease(f->frame);
+        f->frame = NULL;
+    }
+
+    safe_int_dec(&f->ctx->decoded_frames_pending);
+	gf_list_add(f->ctx->frames_res, f);
+}
+
+GF_Err vtbframe_get_plane(GF_FilterFrameInterface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+    OSStatus status;
+	GF_Err e;
+	GF_VTBHWFrame *f = (GF_VTBHWFrame *)frame->user_data;
+	if (! outPlane || !outStride) return GF_BAD_PARAM;
+	*outPlane = NULL;
+	assert(f->frame);
+	if (!f->locked) {
+		status = CVPixelBufferLockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
+		if (status != kCVReturnSuccess) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
+			return GF_IO_ERR;
+		}
+		f->locked = GF_TRUE;
+	}
+	e = GF_OK;
+	
+    if (CVPixelBufferIsPlanar(f->frame)) {
+		*outPlane = CVPixelBufferGetBaseAddressOfPlane(f->frame, plane_idx);
+		if (*outPlane)
+			*outStride = (u32) CVPixelBufferGetBytesPerRowOfPlane(f->frame, plane_idx);
+		else
+			e = GF_EOS;
+	} else if (plane_idx==0) {
+		*outStride = (u32) CVPixelBufferGetBytesPerRow(f->frame);
+		*outPlane = CVPixelBufferGetBaseAddress(f->frame);
+	} else {
+		e = GF_BAD_PARAM;
+	}
+	return e;
+}
+
+#ifdef VTB_GL_TEXTURE
+
+/*Define codec matrix*/
+typedef struct __matrix GF_CodecMatrix;
+
+#ifdef GPAC_CONFIG_IOS
+void *myGetGLContext();
+#else
+
+#include <OpenGL/CGLCurrent.h>
+void *myGetGLContext()
+{
+	return CGLGetCurrentContext();
+}
+#endif
+
+
+GF_Err vtbframe_get_gl_texture(GF_FilterFrameInterface *frame, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_CodecMatrix * texcoordmatrix)
+{
+    OSStatus status;
+	GLenum target_fmt;
+	u32 w, h;
+	GF_CVGLTextureREF *outTexture=NULL;
+	GF_VTBHWFrame *f = (GF_VTBHWFrame *)frame->user_data;
+	if (! gl_tex_format || !gl_tex_id) return GF_BAD_PARAM;
+	*gl_tex_format = 0;
+	*gl_tex_id = 0;
+
+	if (!f->ctx->gl_context) {
+		f->ctx->gl_context = myGetGLContext();
+		if (!f->ctx->gl_context) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locating current GL context\n"));
+			return GF_IO_ERR;
+		}
+	}
+	if (! f->ctx->decoded_frames_pending) return GF_IO_ERR;
+	
+	if (!f->ctx->cache_texture) {
+#ifdef GPAC_CONFIG_IOS
+		status = CVOpenGLESTextureCacheCreate(kCFAllocatorDefault, NULL, f->ctx->gl_context, NULL, &f->ctx->cache_texture);
+#else
+		status = CVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL, f->ctx->gl_context, CGLGetPixelFormat(f->ctx->gl_context), NULL, &f->ctx->cache_texture);
+#endif
+		if (status != kCVReturnSuccess) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error creating cache texture\n"));
+			return GF_IO_ERR;
+		}
+	}
+	
+	if (!f->locked) {
+		status = CVPixelBufferLockBaseAddress(f->frame, kCVPixelBufferLock_ReadOnly);
+		if (status != kCVReturnSuccess) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error locking frame data\n"));
+			return GF_IO_ERR;
+		}
+		f->locked = GF_TRUE;
+	}
+
+    if (CVPixelBufferIsPlanar(f->frame)) {
+		w = (u32) CVPixelBufferGetPlaneCount(f->frame);
+		if (plane_idx >= (u32) CVPixelBufferGetPlaneCount(f->frame)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Wrong plane index\n"));
+			return GF_BAD_PARAM;
+		}
+	} else if (plane_idx!=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Wrong plane index %d on interleaved format\n", plane_idx));
+		return GF_BAD_PARAM;
+	}
+
+	target_fmt = GL_LUMINANCE;
+	w = f->ctx->width;
+	h = f->ctx->height;
+	if (plane_idx) {
+		w /= 2;
+		h /= 2;
+		target_fmt = GL_LUMINANCE_ALPHA;
+	}
+	if (plane_idx==0) {
+		outTexture = &f->y;
+	}
+	else if (plane_idx==1) {
+		outTexture = &f->u;
+	}
+	//don't create texture if already done !
+	if ( *outTexture == NULL) {
+#ifdef GPAC_CONFIG_IOS
+		status = CVOpenGLESTextureCacheCreateTextureFromImage(kCFAllocatorDefault, f->ctx->cache_texture, f->frame, NULL, GL_TEXTURE_2D, target_fmt, w, h, target_fmt, GL_UNSIGNED_BYTE, plane_idx, outTexture);
+#else
+		status = CVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault, f->ctx->cache_texture, f->frame, NULL, outTexture);
+#endif
+
+		if (status != kCVReturnSuccess) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTB] Error creating cache texture for plane %d\n", plane_idx));
+			return GF_IO_ERR;
+		}
+	}
+	*gl_tex_format = GF_CVOpenGLTextureGetTarget(*outTexture);
+	*gl_tex_id = GF_CVOpenGLTextureGetName(*outTexture);
+
+	return GF_OK;
+}
+#endif
+
+static GF_Err vtbdec_send_output_frame(GF_Filter *filter, GF_VTBDecCtx *ctx)
+{
+	GF_VTBHWFrame *vtb_frame;
+	GF_FilterPacket *dst_pck;
+
+	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)));
+
+	vtb_frame->frame_ifce.user_data = vtb_frame;
+	vtb_frame->frame_ifce.get_plane = vtbframe_get_plane;
+#ifdef VTB_GL_TEXTURE
+	if (ctx->use_gl_textures)
+		vtb_frame->frame_ifce.get_gl_texture = vtbframe_get_gl_texture;
+#endif
+
+	if (ctx->reconfig_needed)
+		vtb_frame->frame_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+
+	safe_int_inc(&ctx->decoded_frames_pending);
+
+	dst_pck = gf_filter_pck_new_frame_interface(ctx->opid, &vtb_frame->frame_ifce, vtbframe_release);
+
+	gf_filter_pck_merge_properties(vtb_frame->pck_src, dst_pck);
+
+	ctx->last_cts_out = gf_filter_pck_get_cts(vtb_frame->pck_src);
+	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;
+	ctx->last_frame_sent = vtb_frame;
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+
+#endif
+
+static Bool vtbdec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_VTBDecCtx *ctx = (GF_VTBDecCtx *) gf_filter_get_udta(filter);
+	if (evt->base.type==GF_FEVT_PLAY) {
+		while (gf_list_count(ctx->frames) ) {
+			GF_VTBHWFrame *f = gf_list_pop_back(ctx->frames);
+			if (f->pck_src) gf_filter_pck_unref(f->pck_src);
+			f->pck_src = NULL;
+			gf_list_add(ctx->frames_res, f);
+		}
+		ctx->drop_non_refs = evt->play.drop_non_ref;
+	}
+	else if ((evt->base.type==GF_FEVT_SET_SPEED) || (evt->base.type==GF_FEVT_RESUME)) {
+		ctx->drop_non_refs = evt->play.drop_non_ref;
+	}
+	return GF_FALSE;
+}
+
+static GF_Err vtbdec_initialize(GF_Filter *filter)
+{
+	GF_VTBDecCtx *ctx = (GF_VTBDecCtx *) gf_filter_get_udta(filter);
+#ifdef VTB_GL_TEXTURE
+	if (ctx->no_copy)
+		ctx->use_gl_textures = GF_TRUE;
+#endif
+
+	ctx->frames_res = gf_list_new();
+	ctx->frames = gf_list_new();
+	ctx->streams = gf_list_new();
+	return GF_OK;
+}
+
+static void vtbdec_finalize(GF_Filter *filter)
+{
+	GF_VTBDecCtx *ctx = (GF_VTBDecCtx *) gf_filter_get_udta(filter);
+	vtbdec_delete_decoder(ctx);
+
+#ifdef VTB_GL_TEXTURE
+	if (ctx->cache_texture) {
+		CFRelease(ctx->cache_texture);
+    }
+#endif
+
+	if (ctx->frames) {
+		while (gf_list_count(ctx->frames) ) {
+			GF_VTBHWFrame *f = gf_list_pop_back(ctx->frames);
+			if (f->pck_src) gf_filter_pck_unref(f->pck_src);
+			gf_free(f);
+		}
+		gf_list_del(ctx->frames);
+	}
+
+	if (ctx->frames_res) {
+		while (gf_list_count(ctx->frames_res) ) {
+			GF_VTBHWFrame *f = gf_list_pop_back(ctx->frames_res);
+			if (f->pck_src) gf_filter_pck_unref(f->pck_src);
+			gf_free(f);
+		}
+		gf_list_del(ctx->frames_res);
+	}
+	gf_list_del(ctx->streams);
+
+	if (ctx->nal_bs) gf_bs_del(ctx->nal_bs);
+	if (ctx->ps_bs) gf_bs_del(ctx->ps_bs);
+	if (ctx->nalu_rewrite_bs) gf_bs_del(ctx->nalu_rewrite_bs);
+	if (ctx->nalu_buffer) gf_free(ctx->nalu_buffer);
+}
+
+
+static const GF_FilterCapability VTBDecCaps[] =
+{
+	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_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),
+
+#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),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_HIGH),
+	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_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_VTBDecCtx, _n)
+
+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(disable_hw), "disable hardware decoding", GF_PROP_BOOL, "false", NULL, 0},
+	{}
+};
+
+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.")
+	.private_size = sizeof(GF_VTBDecCtx),
+	.args = VTBDecArgs,
+	.priority = 1,
+	SETCAPS(VTBDecCaps),
+	.initialize = vtbdec_initialize,
+	.finalize = vtbdec_finalize,
+	.configure_pid = vtbdec_configure_pid,
+	.process = vtbdec_process,
+	.max_extra_pids = 5,
+	.process_event = vtbdec_process_event,
+};
+
+#else
+#undef _GF_MATH_H_
+#include <gpac/maths.h>
+#include <gpac/filters.h>
+
+#endif // !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+
+const GF_FilterRegister *vtbdec_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS) && ( defined(GPAC_CONFIG_DARWIN) || defined(GPAC_CONFIG_IOS) )
+	return &GF_VTBDecCtxRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dec_vtb_glctx.m Changed

gpac-1.0.0.tar.gz/src/filters/dec_webvtt.c Added

@@ -0,0 +1,513 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Cyril Concolato - Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2013-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / WebVTT decoder 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>
+
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+
+#include <gpac/internal/isomedia_dev.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/webvtt.h>
+
+#include "../scenegraph/qjs_common.h"
+
+typedef struct
+{
+	//opts
+	char *script;
+	char *color, *font;
+	Float fontSize, lineSpacing, txtx, txty;
+	u32 txtw, txth;
+
+	GF_FilterPid *ipid, *opid;
+
+	/* config of the VTT stream - not used by the renderer for now */
+	char *dsi;
+	//CRC of the config string
+	u32 dsi_crc;
+
+	/* Boolean indicating the internal graph is registered with the compositor */
+	Bool graph_registered;
+	/* Boolean indicating the stream is playing */
+	Bool is_playing;
+
+	/* Scene to which this WebVTT stream is linked */
+	GF_Scene *scene;
+	/* object manager corresponding to the output pid declared*/
+	GF_ObjectManager *odm;
+
+	GF_List *cues;
+
+	/* Scene graph for the subtitle content */
+	GF_SceneGraph *scenegraph;
+
+	Bool update_args;
+} GF_VTTDec;
+
+void vttd_update_size_info(GF_VTTDec *ctx)
+{
+	u32 w, h;
+	GF_FieldInfo info;
+	Bool has_size;
+	char szVB[100];
+	GF_Node *root = gf_sg_get_root_node(ctx->scenegraph);
+	if (!root) return;
+
+	has_size = gf_sg_get_scene_size_info(ctx->scene->graph, &w, &h);
+	/*no size info is given in main scene, override by associated video size if any, or by text track size*/
+	if (!has_size) {
+		const GF_PropertyValue *p;
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_WIDTH);
+		if (p) w = p->value.uint;
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_HEIGHT);
+		if (p) h = p->value.uint;
+
+		if (!w) w = ctx->txtw;
+		if (!h) h = ctx->txth;
+
+		gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+		gf_scene_force_size(ctx->scene, w, h);
+	}
+
+	gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+
+	sprintf(szVB, "0 0 %d %d", w, h);
+	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(root, &info, szVB, 0);
+
+	/*apply*/
+	gf_sg_set_scene_size_info(ctx->scenegraph, w, h, GF_TRUE);
+
+	sprintf(szVB, "0 0 %d %d", w, h);
+	gf_node_get_attribute_by_tag(root, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(root, &info, szVB, 0);
+
+}
+
+void vttd_setup_scene(GF_VTTDec *ctx)
+{
+	GF_Node *n, *root;
+	GF_FieldInfo info;
+
+	ctx->scenegraph = gf_sg_new_subscene(ctx->scene->graph);
+
+	if (!ctx->scenegraph) return;
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/2000/svg", NULL);
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/1999/xlink", "xlink");
+	gf_sg_add_namespace(ctx->scenegraph, "http://www.w3.org/2001/xml-events", "ev");
+	gf_sg_set_scene_size_info(ctx->scenegraph, 800, 600, GF_TRUE);
+
+	/* modify the scene with an Inline/Animation pointing to the VTT Renderer */
+	n = root = gf_node_new(ctx->scenegraph, TAG_SVG_svg);
+	gf_node_register(root, NULL);
+	gf_sg_set_root_node(ctx->scenegraph, root);
+	gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
+	vttd_update_size_info(ctx);
+	gf_node_init(n);
+
+	n = gf_node_new(ctx->scenegraph, TAG_SVG_script);
+	gf_node_register(n, root);
+	gf_node_list_add_child(&((GF_ParentNode *)root)->children, n);
+
+	gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
+	if (strstr(ctx->script, ":\\")) {
+		gf_svg_parse_attribute(n, &info, (char *) ctx->script, 0);
+	} else {
+		char szPath[GF_MAX_PATH];
+		strcpy(szPath, "file://");
+		strcat(szPath, ctx->script);
+		gf_svg_parse_attribute(n, &info, (char *) szPath, 0);
+	}
+
+	gf_node_init(n);
+
+}
+
+static GF_Err vttd_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 entry_type;
+	GF_BitStream *bs;
+	u32 dsi_crc;
+	const GF_PropertyValue *dsi;
+	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;
+		return GF_OK;
+	}
+	//TODO: we need to cleanup cap checking upon reconfigure
+	if (ctx->ipid && !gf_filter_pid_check_caps(pid)) return GF_NOT_SUPPORTED;
+	assert(!ctx->ipid || (ctx->ipid == pid));
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!dsi) return GF_NOT_SUPPORTED;
+
+	dsi_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+	if (dsi_crc == ctx->dsi_crc) return GF_OK;
+	ctx->dsi_crc = dsi_crc;
+
+	//parse DSI
+	bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
+	entry_type = gf_bs_read_u32(bs);
+	if (entry_type == GF_ISOM_BOX_TYPE_WVTT) {
+		GF_Box *b;
+		gf_isom_box_parse(&b, bs);
+		ctx->dsi = ((GF_StringBox *)b)->string;
+		((GF_StringBox *)b)->string = NULL;
+		gf_isom_box_del(b);
+	} else {
+		ctx->dsi = gf_malloc( dsi->value.data.size + 1);
+		memcpy(ctx->dsi, dsi->value.data.ptr, dsi->value.data.size);
+		ctx->dsi[dsi->value.data.size] = 0;
+	}
+	gf_bs_del(bs);
+
+	ctx->ipid = pid;
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+
+	return GF_OK;
+}
+
+
+static void vttd_toggle_display(GF_VTTDec *ctx)
+{
+	if (!ctx->scenegraph) return;
+
+	if (ctx->is_playing) {
+		if (!ctx->graph_registered) {
+			vttd_update_size_info(ctx);
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_FALSE);
+			ctx->graph_registered = GF_TRUE;
+		}
+	 } else {
+		if (ctx->graph_registered) {
+			gf_scene_register_extra_graph(ctx->scene, ctx->scenegraph, GF_TRUE);
+			ctx->graph_registered = GF_FALSE;
+		}
+	}
+}
+
+static Bool vttd_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	GF_VTTDec *ctx = gf_filter_get_udta(filter);
+
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_RESET_SCENE:
+		if (ctx->opid != com->attach_scene.on_pid) return GF_TRUE;
+		ctx->is_playing = GF_FALSE;
+		vttd_toggle_display(ctx);
+
+		gf_sg_del(ctx->scenegraph);
+		ctx->scenegraph = NULL;
+		ctx->scene = NULL;
+		return GF_TRUE;
+	case GF_FEVT_PLAY:
+		ctx->is_playing = GF_TRUE;
+		vttd_toggle_display(ctx);
+		return GF_FALSE;
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		vttd_toggle_display(ctx);
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (ctx->opid != com->attach_scene.on_pid) return GF_TRUE;
+
+	ctx->odm = com->attach_scene.object_manager;
+	ctx->scene = ctx->odm->subscene ? ctx->odm->subscene : ctx->odm->parentscene;
+
+	/*timedtext cannot be a root scene object*/
+	if (ctx->odm->subscene) {
+		ctx->odm = NULL;
+		ctx->scene = NULL;
+	 } else {
+		 vttd_setup_scene(ctx);
+		 vttd_toggle_display(ctx);
+	 }
+	 return GF_TRUE;
+}
+
+void js_dump_error(JSContext *ctx);
+
+JSContext *vtt_script_get_context(GF_VTTDec *ctx, GF_SceneGraph *sg)
+{
+	JSContext *svg_script_get_context(GF_SceneGraph *sg);
+	JSContext *c = svg_script_get_context(sg);
+
+	if (ctx->update_args) {
+		JSValue global = JS_GetGlobalObject(c);
+
+		JS_SetPropertyStr(c, global, "fontSize", JS_NewFloat64(c, ctx->fontSize));
+		JS_SetPropertyStr(c, global, "fontFamily", JS_NewString(c, ctx->font));
+		JS_SetPropertyStr(c, global, "textColor", JS_NewString(c, ctx->color));
+		JS_SetPropertyStr(c, global, "lineSpaceFactor", JS_NewFloat64(c, ctx->lineSpacing));
+		JS_SetPropertyStr(c, global, "xOffset", JS_NewFloat64(c, ctx->txtx));
+		JS_SetPropertyStr(c, global, "yOffset", JS_NewFloat64(c, ctx->txty));
+
+		JS_FreeValue(c, global);
+		ctx->update_args = GF_FALSE;
+	}
+	return c;
+}
+
+
+static GF_Err vttd_js_add_cue(GF_VTTDec *ctx, GF_Node *node, const char *id, const char *start, const char *end, const char *settings, const char *payload)
+{
+	GF_Err e=GF_OK;
+	JSValue fun_val;
+	JSValue global;
+	JSContext *c = vtt_script_get_context(ctx, node->sgprivate->scenegraph);
+	if (!c) return GF_SERVICE_ERROR;
+
+	gf_js_lock(c, GF_TRUE);
+	global = JS_GetGlobalObject(c);
+	fun_val = JS_GetPropertyStr(c, global, "addCue");
+	if (!JS_IsFunction(c, fun_val) ) {
+		e = GF_BAD_PARAM;
+	} else {
+		JSValue ret, argv[5];
+
+		argv[0] = JS_NewString(c, id ? id : "");
+		argv[1] = JS_NewString(c, start ? start : "");
+		argv[2] = JS_NewString(c, end ? end : "");
+		argv[3] = JS_NewString(c, settings ? settings : "");
+		argv[4] = JS_NewString(c, payload ? payload : "");
+
+		ret = JS_Call(c, fun_val, global, 5, argv);
+		if (JS_IsException(ret)) {
+			js_dump_error(c);
+			e = GF_BAD_PARAM;
+		}
+		JS_FreeValue(c, ret);
+		JS_FreeValue(c, argv[0]);
+		JS_FreeValue(c, argv[1]);
+		JS_FreeValue(c, argv[2]);
+		JS_FreeValue(c, argv[3]);
+		JS_FreeValue(c, argv[4]);
+	}
+	JS_FreeValue(c, global);
+	JS_FreeValue(c, fun_val);
+
+	gf_js_lock(c, GF_FALSE);
+	return e;
+}
+
+static GF_Err vttd_js_remove_cues(GF_VTTDec *ctx, GF_Node *node)
+{
+	GF_Err e = GF_OK;
+	JSValue fun_val;
+	JSValue global;
+	JSContext *c = vtt_script_get_context(ctx, node->sgprivate->scenegraph);
+	if (!c) return GF_SERVICE_ERROR;
+
+	gf_js_lock(c, GF_TRUE);
+	global = JS_GetGlobalObject(c);
+	fun_val = JS_GetPropertyStr(c, global, "removeCues");
+	if (!JS_IsFunction(c, fun_val) ) {
+		e = GF_BAD_PARAM;
+	} else {
+		JSValue ret = JS_Call(c, fun_val, global, 0, NULL);
+		if (JS_IsException(ret)) {
+			js_dump_error(c);
+			e = GF_BAD_PARAM;
+		}
+		JS_FreeValue(c, ret);
+	}
+	JS_FreeValue(c, global);
+	JS_FreeValue(c, fun_val);
+	gf_js_lock(c, GF_FALSE);
+	return e;
+}
+
+static GF_Err vttd_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_FilterPacket *pck;
+	GF_List *cues;
+	const char *pck_data;
+	u64 cts;
+	u32 timescale, obj_time;
+	u32 pck_size;
+	GF_VTTDec *ctx = (GF_VTTDec *) gf_filter_get_udta(filter);
+
+	if (!ctx->scene) {
+		if (ctx->is_playing) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		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;
+	}
+
+	//object clock shall be valid
+	if (!ctx->odm->ck)
+		return GF_OK;
+
+	cts = gf_filter_pck_get_cts( pck );
+	timescale = gf_filter_pck_get_timescale(pck);
+
+	gf_odm_check_buffering(ctx->odm, ctx->ipid);
+
+	//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) {
+		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);
+	vttd_js_remove_cues(ctx, ctx->scenegraph->RootNode);
+	if (gf_list_count(cues)) {
+		while (gf_list_count(cues)) {
+			char start[100], end[100];
+			GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+			gf_list_rem(cues, 0);
+			sprintf(start, "%02d:%02d:%02d.%03d", cue->start.hour, cue->start.min, cue->start.sec, cue->start.ms);
+			sprintf(end, "%02d:%02d:%02d.%03d", cue->end.hour, cue->end.min, cue->end.sec, cue->end.ms);
+			vttd_js_add_cue(ctx, ctx->scenegraph->RootNode, cue->id, start, end, cue->settings, cue->text);
+
+			gf_webvtt_cue_del(cue);
+		}
+	}
+	gf_list_del(cues);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static GF_Err vtt_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_VTTDec *ctx = gf_filter_get_udta(filter);
+	ctx->update_args = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err vttd_initialize(GF_Filter *filter)
+{
+	GF_VTTDec *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->script) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTTDec] WebVTT JS renderer script not set\n"));
+		return GF_BAD_PARAM;
+	} else if (!gf_file_exists(ctx->script)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[VTTDec] WebVTT JS renderer script %s not found\n", ctx->script));
+		return GF_URL_ERROR;
+	}
+	ctx->cues = gf_list_new();
+	ctx->update_args = GF_TRUE;
+#ifdef GPAC_ENABLE_COVERAGE
+	vtt_update_arg(filter, NULL, NULL);
+#endif
+	return GF_OK;
+}
+
+void vttd_finalize(GF_Filter *filter)
+{
+	GF_VTTDec *ctx = (GF_VTTDec *) gf_filter_get_udta(filter);
+	if (ctx->cues) gf_list_del(ctx->cues);
+	if (ctx->dsi) gf_free(ctx->dsi);
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_VTTDec, _n)
+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(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},
+	{ OFFS(txtw), "default width in standalone rendering", GF_PROP_UINT, "400", NULL, 0},
+	{ OFFS(txth), "default height in standalone rendering", GF_PROP_UINT, "200", NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability VTTDecCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_ISOM_SUBTYPE_WVTT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister VTTDecRegister = {
+	.name = "vttdec",
+	GF_FS_SET_DESCRIPTION("WebVTT decoder")
+	GF_FS_SET_HELP("This filter decodes WebVTT streams into a SVG scene graph of the compositor filter.\n"
+		"The scene graph creation is done through JavaScript.\n"
+		"The filter options are used to override the JS global variables of the WebVTT renderer.")
+	.private_size = sizeof(GF_VTTDec),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = VTTDecArgs,
+	.priority = 1,
+	SETCAPS(VTTDecCaps),
+	.initialize = vttd_initialize,
+	.finalize = vttd_finalize,
+	.process = vttd_process,
+	.configure_pid = vttd_configure_pid,
+	.process_event = vttd_process_event,
+	.update_arg = vtt_update_arg
+};
+
+#endif
+
+const GF_FilterRegister *vttdec_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_VTT) && !defined(GPAC_DISABLE_SVG) && defined(GPAC_HAS_QJS)
+	return &VTTDecRegister;
+#else
+	return NULL;
+#endif
+}
+
+

gpac-1.0.0.tar.gz/src/filters/dec_xvid.c Added

@@ -0,0 +1,461 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-4 visual p2 xvid decoder 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>
+
+
+/*if we don't have M4V (A)SP parser, we con't get width and height and xvid is then unusable ...*/
+#if !defined(GPAC_DISABLE_AV_PARSERS) && defined(GPAC_HAS_XVID)
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "libxvidcore")
+# endif
+#endif
+
+
+#include <xvid.h>
+
+#ifndef XVID_DEC_FRAME
+#define XVID_DEC_FRAME xvid_dec_frame_t
+#define XVID_DEC_PARAM xvid_dec_create_t
+#else
+#define XVID_USE_OLD_API
+#endif
+
+//#undef XVID_USE_OLD_API
+
+static Bool xvid_is_init = GF_FALSE;
+
+typedef struct
+{
+	Bool deblock_y;
+	Bool deblock_uv;
+#ifndef XVID_USE_OLD_API
+	Bool film_effect;
+	Bool dering_y;
+	Bool dering_uv;
+#endif
+
+	GF_FilterPid *ipid, *opid;
+	u32 cfg_crc;
+	void *codec;
+
+	u32 width, height, out_size;
+	GF_Fraction pixel_ar;
+	Bool first_frame;
+	s32 base_filters;
+	Float FPS;
+	u32 offset;
+
+	GF_List *src_packets;
+	u64 next_cts;
+
+} GF_XVIDCtx;
+
+static GF_Err xviddec_initialize(GF_Filter *filter)
+{
+	GF_XVIDCtx *ctx = gf_filter_get_udta(filter);
+	if (!xvid_is_init) {
+#ifdef XVID_USE_OLD_API
+		XVID_INIT_PARAM init;
+		init.api_version = 0;
+		init.core_build = 0;
+		/*get info*/
+		init.cpu_flags = XVID_CPU_CHKONLY;
+		xvid_init(NULL, 0, &init, NULL);
+		/*then init*/
+		xvid_init(NULL, 0, &init, NULL);
+#else
+		xvid_gbl_init_t init;
+		init.debug = 0;
+		init.version = XVID_VERSION;
+		init.cpu_flags = 0; /*autodetect*/
+		xvid_global(NULL, 0, &init, NULL);
+#endif
+		xvid_is_init = GF_TRUE;
+	}
+
+#ifndef XVID_USE_OLD_API
+	if (ctx->film_effect) ctx->base_filters |= XVID_FILMEFFECT;
+#endif
+
+#ifdef XVID_USE_OLD_API
+	if (ctx->deblock_y) ctx->base_filters |= XVID_DEC_DEBLOCKY;
+#else
+	if (ctx->deblock_y) ctx->base_filters |= XVID_DEBLOCKY;
+#endif
+
+#ifdef XVID_USE_OLD_API
+	if (ctx->deblock_uv) ctx->base_filters |= XVID_DEC_DEBLOCKUV;
+#else
+	if (ctx->deblock_uv) ctx->base_filters |= XVID_DEBLOCKUV;
+#endif
+
+#ifndef XVID_USE_OLD_API
+	if (ctx->dering_y) ctx->base_filters |= XVID_DERINGY | XVID_DEBLOCKY;
+	if (ctx->dering_uv) ctx->base_filters |= XVID_DERINGUV | XVID_DEBLOCKUV;
+#endif
+	ctx->src_packets = gf_list_new();
+	return GF_OK;
+}
+
+static GF_Err xviddec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_M4VDecSpecInfo dsi;
+	GF_Err e;
+	Bool is_first = GF_FALSE;
+#ifdef XVID_USE_OLD_API
+	XVID_DEC_FRAME frame;
+	XVID_DEC_PARAM par;
+#else
+	xvid_dec_frame_t frame;
+	xvid_dec_create_t par;
+#endif
+	GF_XVIDCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		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;
+
+	ctx->ipid = pid;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+		is_first = GF_TRUE;
+	}
+	//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) );
+
+	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 == ex_crc) return GF_OK;
+
+		//shoud we flush ?
+		if (ctx->codec) xvid_decore(ctx->codec, XVID_DEC_DESTROY, NULL, NULL);
+		ctx->codec = NULL;
+
+		ctx->cfg_crc = ex_crc;
+	} else if (!is_first) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[XVID] Reconfiguring without DSI not yet supported\n"));
+		return GF_NOT_SUPPORTED;
+	} else {
+		return GF_OK;
+	}
+
+	/*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;
+
+	memset(&par, 0, sizeof(par));
+	par.width = dsi.width;
+	par.height = dsi.height;
+	/*note that this may be irrelevant when used through systems (FPS is driven by systems CTS)*/
+	ctx->FPS = dsi.clock_rate;
+	ctx->FPS /= 1000;
+	if (!ctx->FPS) ctx->FPS = 30.0f;
+	ctx->pixel_ar.num = dsi.par_num;
+	ctx->pixel_ar.den = dsi.par_den;
+
+#ifndef XVID_USE_OLD_API
+	par.version = XVID_VERSION;
+#endif
+
+	if (xvid_decore(NULL, XVID_DEC_CREATE, &par, NULL) < 0) return GF_NON_COMPLIANT_BITSTREAM;
+
+	ctx->width = par.width;
+	ctx->height = par.height;
+	ctx->codec = par.handle;
+
+	/*init decoder*/
+	memset(&frame, 0, sizeof(frame));
+	frame.bitstream = (void *) p->value.data.ptr;
+	frame.length = p->value.data.size;
+#ifndef XVID_USE_OLD_API
+	frame.version = XVID_VERSION;
+	xvid_decore(ctx->codec, XVID_DEC_DECODE, &frame, NULL);
+#else
+	/*don't perform error check, XviD doesn't like DSI only frame ...*/
+	xvid_decore(ctx->codec, XVID_DEC_DECODE, &frame, NULL);
+#endif
+
+	ctx->first_frame = GF_TRUE;
+	ctx->out_size = ctx->width * ctx->height * 3 / 2;
+
+	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->width) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PAR, &PROP_FRAC(ctx->pixel_ar) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV) );
+
+	return GF_OK;
+}
+
+static void xviddec_finalize(GF_Filter *filter)
+{
+	GF_XVIDCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->codec) xvid_decore(ctx->codec, XVID_DEC_DESTROY, NULL, NULL);
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+}
+
+static GF_Err xviddec_process(GF_Filter *filter)
+{
+#ifdef XVID_USE_OLD_API
+	XVID_DEC_FRAME frame;
+#else
+	xvid_dec_frame_t frame;
+#endif
+	u8 *buffer;
+	u32 i, count;
+	Bool is_seek;
+#if 0
+	s32 postproc;
+#endif
+	s32 res;
+	GF_XVIDCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *pck_ref, *src_pck, *dst_pck;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (!ctx->codec)
+		return ctx->cfg_crc ? GF_SERVICE_ERROR : GF_OK;
+
+	memset(&frame, 0, sizeof(frame));
+	if (pck) {
+		u64 cts = gf_filter_pck_get_cts(pck);;
+		frame.bitstream = (char *) gf_filter_pck_get_data(pck, &frame.length);
+
+		//append in cts order since we get output frames in cts order
+		pck_ref = pck;
+		gf_filter_pck_ref_props(&pck_ref);
+		count = gf_list_count(ctx->src_packets);
+		src_pck = NULL;
+		for (i=0; i<count; i++) {
+			u64 acts;
+			src_pck = gf_list_get(ctx->src_packets, i);
+			acts = gf_filter_pck_get_cts(src_pck);
+			if (acts==cts) {
+				gf_filter_pck_unref(pck_ref);
+				break;
+			}
+			if (acts>cts) {
+				gf_list_insert(ctx->src_packets, pck_ref, i);
+				break;
+			}
+			src_pck = NULL;
+		}
+		if (!src_pck)
+			gf_list_add(ctx->src_packets, pck_ref);
+
+
+	} else {
+		frame.bitstream = NULL;
+		frame.length = -1;
+	}
+
+packed_frame :
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->width*ctx->height*3/2, &buffer);
+
+#ifdef XVID_USE_OLD_API
+	frame.colorspace = XVID_CSP_I420;
+	frame.stride = ctx->width;
+	frame.image = (void *) buffer;
+#else
+	frame.version = XVID_VERSION;
+	frame.output.csp = XVID_CSP_I420;
+	frame.output.stride[0] = ctx->width;
+	frame.output.plane[0] = (void *) buffer;
+#endif
+
+
+#if 0
+	postproc = ctx->base_filters;
+	/*to check, not convinced yet by results...*/
+	switch (mmlevel) {
+	case GF_CODEC_LEVEL_SEEK:
+	case GF_CODEC_LEVEL_DROP:
+		/*turn off all post-proc*/
+#ifdef XVID_USE_OLD_API
+		postproc &= ~XVID_DEC_DEBLOCKY;
+		postproc &= ~XVID_DEC_DEBLOCKUV;
+#else
+		postproc &= ~XVID_DEBLOCKY;
+		postproc &= ~XVID_DEBLOCKUV;
+		postproc &= ~XVID_FILMEFFECT;
+#endif
+		break;
+	case GF_CODEC_LEVEL_VERY_LATE:
+		/*turn off post-proc*/
+#ifdef XVID_USE_OLD_API
+		postproc &= ~XVID_DEC_DEBLOCKY;
+#else
+		postproc &= ~XVID_FILMEFFECT;
+		postproc &= ~XVID_DEBLOCKY;
+#endif
+		break;
+	case GF_CODEC_LEVEL_LATE:
+#ifdef XVID_USE_OLD_API
+		postproc &= ~XVID_DEC_DEBLOCKUV;
+#else
+		postproc &= ~XVID_DEBLOCKUV;
+		postproc &= ~XVID_FILMEFFECT;
+#endif
+		break;
+	}
+#endif
+
+	/*xvid may keep the first I frame and force a 1-frame delay, so we simply trick it*/
+	if (ctx->first_frame) {
+		buffer[0] = 'v';
+		buffer[1] = 'o';
+		buffer[2] = 'i';
+		buffer[3] = 'd';
+	}
+	src_pck = gf_list_get(ctx->src_packets, 0);
+
+	res = xvid_decore(ctx->codec, XVID_DEC_DECODE, &frame, NULL);
+	if (res < 0) {
+		gf_filter_pck_discard(dst_pck);
+		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		if (src_pck) {
+			gf_filter_pck_unref(src_pck);
+			gf_list_pop_front(ctx->src_packets);
+		}
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return pck ? GF_NON_COMPLIANT_BITSTREAM : GF_OK;
+	}
+
+	if (ctx->first_frame) {
+		ctx->first_frame = GF_FALSE;
+		if ((buffer[0] == 'v') && (buffer[1] == 'o') && (buffer[2] == 'i') && (buffer[3] =='d')) {
+			gf_filter_pck_discard(dst_pck);
+			if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+	}
+
+	if (src_pck) {
+		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);
+		ctx->next_cts += gf_filter_pck_get_duration(src_pck);
+		gf_filter_pck_unref(src_pck);
+		gf_list_pop_front(ctx->src_packets);
+	} else {
+		is_seek = 0;
+		gf_filter_pck_set_cts(dst_pck, ctx->next_cts);
+	}
+
+	if (!pck || !is_seek )
+		gf_filter_pck_send(dst_pck);
+	else
+		gf_filter_pck_discard(dst_pck);
+
+	if (res + 6 < frame.length) {
+		frame.bitstream = ((char *)frame.bitstream) + res;
+		frame.length -= res;
+		goto packed_frame;
+	}
+
+	if (pck) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	//flush all frames if eos is detected
+	else if (gf_filter_pid_is_eos(ctx->ipid)) {
+		return xviddec_process(filter);
+	}
+
+	return GF_OK;
+}
+
+static const GF_FilterCapability XVIDCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, 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_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_XVIDCtx, _n)
+
+static const GF_FilterArgs XVIDArgs[] =
+{
+	{ OFFS(deblock_y), "enable Y deblocking", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(deblock_uv), "enable UV deblocking", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+#ifndef XVID_USE_OLD_API
+	{ OFFS(film_effect), "enable film effect", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dering_y), "enable Y deblocking", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dering_uv), "enable UV deblocking", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+#endif
+	{0}
+};
+
+GF_FilterRegister XVIDRegister = {
+	.name = "xviddec",
+	GF_FS_SET_DESCRIPTION("XVid decoder")
+	GF_FS_SET_HELP("This filter decodes MPEG-4 part 2 (and DivX) through libxvidcore library.")
+	.private_size = sizeof(GF_XVIDCtx),
+	.args = XVIDArgs,
+	SETCAPS(XVIDCaps),
+	.initialize = xviddec_initialize,
+	.finalize = xviddec_finalize,
+	.configure_pid = xviddec_configure_pid,
+	.process = xviddec_process,
+	//use low priorty, below ffmpeg one, so that hardware decs/other native impl in gpac can take over if needed
+	//don't use lowest one since we use this for scalable codecs
+	.priority = 100
+};
+
+#endif
+
+const GF_FilterRegister *xviddec_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS) && defined(GPAC_HAS_XVID)
+	return &XVIDRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/decrypt_cenc_isma.c Added

@@ -0,0 +1,1335 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / CENC and ISMA decrypt 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/crypt_tools.h>
+#include <gpac/crypt.h>
+#include <gpac/base_coding.h>
+#include <gpac/download.h>
+
+#ifndef GPAC_DISABLE_CRYPTO
+
+//#define OLD_KEY_FETCHERS
+
+enum
+{
+	DECRYPT_STATE_ERROR,
+	DECRYPT_STATE_SETUP,
+	DECRYPT_STATE_PLAY,
+};
+
+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;
+
+	//ISMA & OMA
+	char salt[8];
+	u64 last_IV;
+	u32 nb_allow_play;
+	Bool is_oma, is_adobe;
+	u32 preview_range;
+	Bool is_nalu;
+	Bool selective_encryption;
+	u32 IV_length, KI_length;
+
+	/*CENC*/
+	Bool is_cenc;
+	Bool is_cbc;
+	u32 KID_count;
+	bin128 *KIDs;
+	bin128 *keys;
+
+	/*adobe and CENC*/
+	Bool crypt_init;
+} GF_CENCDecStream;
+
+typedef struct
+{
+	const char *cfile;
+
+	GF_CryptInfo *cinfo;
+	
+	GF_List *streams;
+	GF_BitStream *bs_r;
+
+	GF_DownloadManager *dm;
+} GF_CENCDecCtx;
+
+
+#ifdef OLD_KEY_FETCHERS
+static void cenc_dec_kms_netio(void *cbck, GF_NETIO_Parameter *par)
+{
+}
+
+static GF_Err gf_ismacryp_gpac_get_info(u32 stream_id, char *drm_file, char *key, char *salt)
+{
+	GF_Err e;
+	u32 i, count;
+	GF_CryptInfo *info;
+
+	e = GF_OK;
+	info = gf_crypt_info_load(drm_file, &e);
+	if (!info) return e;
+	count = gf_list_count(info->tcis);
+	for (i=0; i<count; i++) {
+		GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *) gf_list_get(info->tcis, i);
+		if ((info->has_common_key && !tci->trackID) || (tci->trackID == stream_id) ) {
+			if (tci->KID_count)
+				memcpy(key, tci->keys[0], sizeof(char)*16);
+			memcpy(salt, tci->first_IV, sizeof(char)*8);
+			e = GF_OK;
+			break;
+		}
+	}
+	gf_crypt_info_del(info);
+	return e;
+}
+
+static GF_Err cenc_dec_get_gpac_kms(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, const char *kms_url)
+{
+	const GF_PropertyValue *prop;
+	FILE *t;
+	u32 id = 0;
+	GF_FilterPid *pid = cstr->ipid;
+	GF_Err e;
+	GF_DownloadSession * sess;
+
+	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) id = prop->value.uint;
+
+	if (!strnicmp(kms_url, "(ipmp)", 6)) return GF_NOT_SUPPORTED;
+	else if (!strnicmp(kms_url, "(uri)", 5)) kms_url += 5;
+	else if (!strnicmp(kms_url, "file://", 7)) kms_url += 7;
+
+	/*try local*/
+	t = (strstr(kms_url, "://") == NULL) ? gf_fopen(kms_url, "rb") : NULL;
+	if (t) {
+		gf_fclose(t);
+		return gf_ismacryp_gpac_get_info(id, (char *)kms_url, cstr->key, cstr->salt);
+	}
+	/*note that gpac doesn't have TLS support -> not really useful. As a general remark, ISMACryp
+	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);
+	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);
+		if (e) break;
+	}
+	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);
+	return e;
+}
+
+static Bool gf_ismacryp_mpeg4ip_get_info(char *kms_uri, char *key, char *salt)
+{
+	char szPath[1024], catKey[24], line[101];
+	u32 i, x;
+	Bool got_it;
+	FILE *kms;
+	strcpy(szPath, getenv("HOME"));
+	strcat(szPath , "/.kms_data");
+	got_it = 0;
+	kms = gf_fopen(szPath, "rt");
+	while (kms && !gf_feof(kms)) {
+		if (!gf_fgets(szPath, 1024, kms)) break;
+		szPath[strlen(szPath) - 1] = 0;
+		if (stricmp(szPath, kms_uri)) continue;
+		gf_fgets(line, 1, 100, kms);
+		line[100] = 0;
+		for (i=0; i<24; i++) {
+			char szV[3];
+			szV[0] = line[2*i];
+			szV[1] = line[2*i + 1];
+			szV[2] = 0;
+			if (!sscanf(szV, "%x", &x)) break;
+			catKey[i] = x;
+		}
+		if (i==24) got_it = 1;
+		break;
+	}
+	if (kms) gf_fclose(kms);
+	if (got_it) {
+		/*watchout, MPEG4IP stores SALT|KEY, NOT KEY|SALT*/
+		memcpy(key, catKey+8, sizeof(char)*16);
+		memcpy(salt, catKey, sizeof(char)*8);
+		return 1;
+	}
+	return 0;
+}
+#endif
+
+
+static GF_Err cenc_dec_setup_isma(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
+{
+	u32 kms_crc=0;
+	const GF_PropertyValue *p;
+	cstr->state = DECRYPT_STATE_ERROR;
+
+	if (scheme_type != GF_ISOM_ISMACRYP_SCHEME) return GF_NOT_SUPPORTED;
+	if (scheme_version != 1) return GF_NOT_SUPPORTED;
+	if (!kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
+
+	kms_crc = gf_crc_32(kms_uri, (u32) strlen(kms_uri));
+	if (cstr->pssh_crc == kms_crc) return GF_OK;
+	cstr->pssh_crc = kms_crc;
+
+	/*try to fetch the keys*/
+	/*base64 inband encoding*/
+	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->salt, data+16, sizeof(char)*8);
+	}
+	/*hexadecimal inband encoding*/
+	else if (!strnicmp(kms_uri, "(key-hexa)", 10)) {
+		u32 v;
+		char szT[3], *k;
+		u32 i;
+		szT[2] = 0;
+		if (strlen(kms_uri) < 10+32+16) return GF_NON_COMPLIANT_BITSTREAM;
+
+		k = (char *)kms_uri + 10;
+		for (i=0; i<16; i++) {
+			szT[0] = k[2*i];
+			szT[1] = k[2*i + 1];
+			sscanf(szT, "%X", &v);
+			cstr->key[i] = v;
+		}
+
+		k = (char *)kms_uri + 10 + 32;
+		for (i=0; i<8; i++) {
+			szT[0] = k[2*i];
+			szT[1] = k[2*i + 1];
+			sscanf(szT, "%X", &v);
+			cstr->salt[i] = v;
+		}
+	}
+	/*MPEG4-IP KMS*/
+	else if (!stricmp(kms_uri, "AudioKey") || !stricmp(kms_uri, "VideoKey")) {
+#ifdef OLD_KEY_FETCHERS
+		if (!gf_ismacryp_mpeg4ip_get_info((char *) kms_uri, cstr->key, cstr->salt)) {
+			return GF_BAD_PARAM;
+		}
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+	}
+	/*gpac default scheme is used, fetch file from KMS and load keys*/
+	else if (scheme_uri && !stricmp(scheme_uri, "urn:gpac:isma:encryption_scheme")) {
+#ifdef OLD_KEY_FETCHERS
+		e = cenc_dec_get_gpac_kms(ctx, cstr, kms_uri);
+		if (e) return e;
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+	}
+	/*hardcoded keys*/
+	else {
+		static u8 mysalt[] = { 8,7,6,5,4,3,2,1, 0,0,0,0,0,0,0,0 };
+		static u8 mykey[][16]  = {
+			{	0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+				0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08
+			}
+		};
+		memcpy(cstr->salt, mysalt, sizeof(char)*8);
+		memcpy(cstr->key, mykey, sizeof(char)*16);
+	}
+	cstr->state = DECRYPT_STATE_SETUP;
+
+	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISMA_SELECTIVE_ENC);
+	if (p) cstr->selective_encryption = p->value.boolean;
+	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISMA_IV_LENGTH);
+	if (p) cstr->IV_length = p->value.uint;
+	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_ISMA_KI_LENGTH);
+	if (p) cstr->KI_length = p->value.uint;
+
+
+	//ctx->nb_allow_play = 1;
+	return GF_OK;
+}
+
+static GF_Err cenc_dec_access_isma(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, Bool is_play)
+{
+	GF_Err e;
+
+	if (is_play) {
+		char IV[16];
+		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--;
+
+		/*init decrypter*/
+		cstr->crypt = gf_crypt_open(GF_AES_128, GF_CTR);
+		if (!cstr->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);
+		if (e) return e;
+
+		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;
+		cstr->state = DECRYPT_STATE_SETUP;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+static GF_Err cenc_dec_process_isma(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, GF_FilterPacket *in_pck)
+{
+	u32 data_size;
+	const char *in_data;
+	u8 *out_data;
+	u64 isma_BSO = 0;
+	u32 offset=0;
+	GF_FilterPacket *out_pck;
+	Bool is_encrypted=GF_FALSE;
+	if (!cstr->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);
+		gf_filter_pck_merge_properties(in_pck, out_pck);
+		gf_filter_pck_set_crypt_flags(out_pck, 0);
+		gf_filter_pck_send(out_pck);
+		return GF_OK;
+	}
+
+	in_data = gf_filter_pck_get_data(in_pck, &data_size);
+
+	gf_bs_reassign_buffer(ctx->bs_r, in_data, data_size);
+	
+	if (cstr->selective_encryption) {
+		if (gf_bs_read_int(ctx->bs_r, 1)) is_encrypted=GF_TRUE;
+		gf_bs_read_int(ctx->bs_r, 7);
+		offset = 1;
+	} else {
+		is_encrypted=GF_TRUE;
+	}
+	if (is_encrypted) {
+		if (cstr->IV_length != 0) {
+			isma_BSO = gf_bs_read_long_int(ctx->bs_r, 8*cstr->IV_length);
+			offset += cstr->IV_length;
+		}
+		if (cstr->KI_length) {
+			offset += cstr->KI_length;
+		}
+	}
+
+	/*resync IV*/
+	if (!cstr->last_IV || (cstr->last_IV != isma_BSO)) {
+		char IV[17];
+		u64 count;
+		u32 remain;
+		GF_BitStream *bs;
+		count = isma_BSO / 16;
+		remain = (u32) (isma_BSO % 16);
+
+		/*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->salt, 8);
+		gf_bs_write_u64(bs, (s64) count);
+		gf_bs_del(bs);
+		gf_crypt_set_IV(cstr->crypt, IV, 17);
+
+		/*decrypt remain bytes*/
+		if (remain) {
+			char dummy[20];
+			gf_crypt_decrypt(cstr->crypt, dummy, remain);
+		}
+		cstr->last_IV = isma_BSO;
+	}
+	in_data += offset;
+	data_size -= offset;
+
+	out_pck = gf_filter_pck_new_alloc(cstr->opid, data_size, &out_data);
+
+	memcpy(out_data, in_data, data_size);
+	/*decrypt*/
+	gf_crypt_decrypt(cstr->crypt, out_data, data_size);
+	cstr->last_IV += data_size;
+
+	/*replace AVC start codes (0x00000001) by nalu size*/
+	if (cstr->is_nalu) {
+		u32 nalu_size;
+		u32 remain = data_size;
+		char *start, *end;
+		start = out_data;
+		end = start + 4;
+		while (remain>4) {
+			if (!end[0] && !end[1] && !end[2] && (end[3]==0x01)) {
+				nalu_size = (u32) (end - start - 4);
+				start[0] = (nalu_size>>24)&0xFF;
+				start[1] = (nalu_size>>16)&0xFF;
+				start[2] = (nalu_size>>8)&0xFF;
+				start[3] = (nalu_size)&0xFF;
+				start = end;
+				end = start+4;
+				remain -= 4;
+				continue;
+			}
+			end++;
+			remain--;
+		}
+		nalu_size = (u32) (end - start - 4);
+		start[0] = (nalu_size>>24)&0xFF;
+		start[1] = (nalu_size>>16)&0xFF;
+		start[2] = (nalu_size>>8)&0xFF;
+		start[3] = (nalu_size)&0xFF;
+	}
+
+	gf_filter_pck_merge_properties(in_pck, out_pck);
+	gf_filter_pck_set_crypt_flags(out_pck, 0);
+
+	gf_filter_pck_send(out_pck);
+	return GF_OK;
+}
+
+#ifdef OLD_KEY_FETCHERS
+
+static GF_Err cenc_dec_setup_oma(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, u32 scheme_type, u32 scheme_version, const char *scheme_uri, const char *kms_uri)
+{
+	const GF_PropertyValue *prop;
+	GF_FilterPid *pid = cstr->ipid;
+
+	cstr->state = DECRYPT_STATE_ERROR;
+	if (scheme_type != GF_ISOM_OMADRM_SCHEME) return GF_NOT_SUPPORTED;
+	if (scheme_version != 0x00000200) return GF_NOT_SUPPORTED;
+
+	cstr->is_oma = GF_TRUE;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_OMA_PREVIEW_RANGE);
+	if (prop) cstr->preview_range = (u32) prop->value.longuint;
+
+	/*TODO: call DRM agent, fetch keys*/
+	if (!kms_uri) return GF_NON_COMPLIANT_BITSTREAM;
+	cstr->state = DECRYPT_STATE_SETUP;
+
+	/*we have preview*/
+	if (cstr->preview_range) return GF_OK;
+
+	return GF_NOT_SUPPORTED;
+}
+#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)
+{
+	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;
+
+	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)
+	)
+		return GF_NOT_SUPPORTED;
+
+	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) ));
+	}
+
+	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);
+	}
+	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;
+
+	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
+	//ctx->nb_allow_play = 1;
+
+	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_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;
+		char *enc_data;
+		bin128 cypherKey, cypherIV;
+		GF_Crypt *mc;
+		u32 pos, priv_len;
+		char szSystemID[33];
+		bin128 sysID;
+		u32 j, kid_count;
+
+		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);
+
+		memset(szSystemID, 0, 33);
+		for (j=0; j<16; j++) {
+			sprintf(szSystemID+j*2, "%02X", (unsigned char) sysID[j]);
+		}
+
+		/*SystemID for GPAC Player: 67706163-6365-6E63-6472-6D746F6F6C31*/
+		if (strcmp(szSystemID, "6770616363656E6364726D746F6F6C31")) {
+			if (!cinfo_prop && !ctx->cfile) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] System ID %s not supported\n", szSystemID));
+			}
+			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;
+		}
+
+		/*store key IDs*/
+		cstr->KID_count = kid_count;
+		pos = (u32) gf_bs_get_position(ctx->bs_r);
+		cstr->KIDs = (bin128 *)gf_realloc(cstr->KIDs, cstr->KID_count*sizeof(bin128));
+		cstr->keys = (bin128 *)gf_realloc(cstr->keys, cstr->KID_count*sizeof(bin128));
+
+		memmove(cstr->KIDs, pssh_data + pos, cstr->KID_count*sizeof(bin128));
+		gf_bs_skip_bytes(ctx->bs_r, cstr->KID_count*sizeof(bin128));
+		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;
+		}
+		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);
+		return GF_OK;
+	}
+
+	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));
+			return e;
+		}
+	}
+	if (!cinfo) cinfo = ctx->cinfo;
+
+	if (cinfo) {
+		GF_TrackCryptInfo *any_tci = NULL;
+		GF_TrackCryptInfo *tci = NULL;
+		u32 count = gf_list_count(cinfo->tcis);
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		for (i=0; i<count; i++) {
+			tci = gf_list_get(cinfo->tcis, i);
+			if (tci->trackID && prop && (tci->trackID==prop->value.uint)) {
+				break;
+			}
+			if (!any_tci && !tci->trackID) any_tci = tci;
+			if ((cinfo != ctx->cinfo) && !any_tci) any_tci = tci;
+			tci = NULL;
+		}
+		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));
+			}
+			if (cinfo != ctx->cinfo)
+				gf_crypt_info_del(cinfo);
+			return GF_OK;
+		}
+		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;
+}
+
+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;
+	const GF_PropertyValue *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_ADOBE_SCHEME) return GF_NOT_SUPPORTED;
+	if (scheme_version != 1) return GF_NOT_SUPPORTED;
+
+
+	if (cstr->KID_count) return GF_OK;
+
+	cstr->is_adobe = GF_TRUE;
+
+	cstr->state = is_playing ? DECRYPT_STATE_PLAY : DECRYPT_STATE_SETUP;
+
+	prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECRYPT_INFO);
+	if (!prop) prop = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_CRYPT_INFO);
+
+	if (prop) {
+		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));
+			return e;
+		}
+	}
+	if (!cinfo) cinfo = ctx->cinfo;
+
+	if (cinfo) {
+		GF_TrackCryptInfo *any_tci = NULL;
+		GF_TrackCryptInfo *tci = NULL;
+		u32 i, count = gf_list_count(cinfo->tcis);
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		for (i=0; i<count; i++) {
+			tci = gf_list_get(cinfo->tcis, i);
+			if (tci->trackID && prop && (tci->trackID==prop->value.uint)) {
+				break;
+			}
+			if (!any_tci && !tci->trackID) any_tci = tci;
+			if ((cinfo != ctx->cinfo) && !any_tci) any_tci = tci;
+			tci = NULL;
+		}
+		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));
+			}
+			if (cinfo != ctx->cinfo)
+				gf_crypt_info_del(cinfo);
+			return GF_OK;
+		}
+		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;
+}
+
+static GF_Err cenc_dec_access_cenc(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, Bool is_play)
+{
+	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;
+
+		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;
+		cstr->state = DECRYPT_STATE_SETUP;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+static GF_Err cenc_dec_access_adobe(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr, Bool is_play)
+{
+	if (is_play) {
+		if (cstr->state != DECRYPT_STATE_SETUP)
+			return GF_SERVICE_ERROR;
+		assert(!cstr->crypt);
+
+		cstr->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+		if (!cstr->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;
+		cstr->state = DECRYPT_STATE_SETUP;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+
+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;
+	u32 data_size;
+	u8 *out_data;
+	const char *sai_payload=NULL;
+	u32 saiz=0;
+	u32 IV_size;
+	Bool crypt_reinit = GF_FALSE;
+	GF_FilterPacket *out_pck;
+	const GF_PropertyValue *prop, *const_IV=NULL, *cbc_pattern=NULL;
+
+	if (!cstr->crypt)
+		return GF_SERVICE_ERROR;
+
+	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);
+		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) {
+		sai_payload = prop->value.data.ptr;
+		saiz = prop->value.data.size;
+		gf_bs_reassign_buffer(ctx->bs_r, sai_payload, saiz);
+	}
+
+	//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);
+
+	/*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 (const_IV) IV_size = const_IV->value.data.size;
+
+	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;
+			}
+		}
+		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;
+		}
+		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;
+	}
+	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;
+		}
+	} 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;
+		}
+	}
+
+	//sub-sample encryption
+	if (subsample_count) {
+		u32 cur_pos = 0;
+
+		while (cur_pos < data_size) {
+			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" ));
+				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" ));
+				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);
+			subsample_count--;
+
+			if (const_IV) {
+				memmove(IV, const_IV->value.data.ptr, const_IV->value.data.size);
+				if (const_IV->value.data.size == 8)
+					memset(IV+8, 0, sizeof(char)*8);
+				gf_crypt_set_IV(cstr->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 ));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+			/*skip clear data*/
+			cur_pos += bytes_clear_data;
+
+			//pattern decryption
+			if (cbc_pattern && cbc_pattern->value.frac.den && cbc_pattern->value.frac.num) {
+				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;
+
+				if (cstr->is_cbc) {
+					u32 clear_trailing = res % 16;
+					res -= clear_trailing;
+				}
+
+				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);
+					} else {
+						res = 0;
+					}
+				}
+			}
+			//full subsample decryption
+			else {
+				gf_crypt_decrypt(cstr->crypt, out_data+cur_pos, bytes_encrypted_data);
+			}
+			cur_pos += bytes_encrypted_data;
+		}
+	}
+	//full sample encryption
+	else {
+		if (cstr->is_cenc) {
+			gf_crypt_decrypt(cstr->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_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)
+{
+	u32 data_size;
+	const u8 *in_data;
+	u8 *out_data;
+	GF_FilterPacket *out_pck;
+	GF_Err e;
+	u32 offset, size;
+	Bool encrypted_au;
+
+	if (!cstr->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);
+
+	memcpy(out_data, in_data, data_size);
+
+	offset=0;
+	size = data_size;
+	encrypted_au = out_data[0] ? GF_TRUE : GF_FALSE;
+	if (encrypted_au) {
+		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 ) );
+			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);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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);
+		trim_bytes = out_data[offset + size - 1];
+		size -= trim_bytes;
+	} else {
+		offset += 1;
+		size -= 1;
+	}
+	memmove(out_data, out_data+offset, size);
+	gf_filter_pck_truncate(out_pck, size);
+	gf_filter_pck_merge_properties(in_pck, out_pck);
+
+	gf_filter_pck_send(out_pck);
+	return GF_OK;
+}
+
+static void cenc_dec_stream_del(GF_CENCDecStream *cstr)
+{
+	if (cstr->crypt) gf_crypt_close(cstr->crypt);
+	if (cstr->KIDs) gf_free(cstr->KIDs);
+	if (cstr->keys) gf_free(cstr->keys);
+
+
+	gf_free(cstr);
+}
+
+static GF_Err cenc_dec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_Err e = GF_OK;
+	u32 scheme_type = 0;
+	u32 scheme_version = 0;
+	const char *scheme_uri = NULL;
+	const char *kms_uri = NULL;
+	GF_CENCDecStream *cstr;
+	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+	if (prop) scheme_type = prop->value.uint;
+
+	if (is_remove) {
+		cstr = gf_filter_pid_get_udta(pid);
+		if (cstr->opid) {
+			gf_filter_pid_remove(cstr->opid);
+		}
+		gf_list_del_item(ctx->streams, cstr);
+		cenc_dec_stream_del(cstr);
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	cstr = gf_filter_pid_get_udta(pid);
+	if (!cstr) {
+		GF_SAFEALLOC(cstr, GF_CENCDecStream);
+		if (!cstr) return GF_OUT_OF_MEM;
+		cstr->opid = gf_filter_pid_new(filter);
+		cstr->ipid = pid;
+		gf_list_add(ctx->streams, cstr);
+		gf_filter_pid_set_udta(pid, cstr);
+		gf_filter_pid_set_udta(cstr->opid, cstr);
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
+	if (prop) scheme_version = prop->value.uint;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_URI);
+	if (prop) scheme_uri = prop->value.string;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_KMS_URI);
+	if (prop) kms_uri = prop->value.string;
+
+	if (ctx->cinfo) {
+		u32 stream_id=0;
+		u32 i, 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;
+
+		for (i=0; i<count; i++) {
+			GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *) gf_list_get(ctx->cinfo->tcis, i);
+			if ((ctx->cinfo->has_common_key && !tci->trackID) || (tci->trackID == stream_id) ) {
+				if (tci->force_type) scheme_type = tci->scheme_type;
+				break;
+			}
+		}
+
+	}
+
+	switch (scheme_type) {
+	case GF_ISOM_ISMACRYP_SCHEME:
+		e = cenc_dec_setup_isma(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
+		break;
+	case GF_ISOM_OMADRM_SCHEME:
+#ifdef OLD_KEY_FETCHERS
+		e = cenc_dec_setup_oma(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
+#else
+		e = GF_NOT_SUPPORTED;
+#endif
+		break;
+	case GF_ISOM_CENC_SCHEME:
+	case GF_ISOM_PIFF_SCHEME:
+	case GF_ISOM_CBC_SCHEME:
+	case GF_ISOM_CENS_SCHEME:
+	case GF_ISOM_CBCS_SCHEME:
+		e = cenc_dec_setup_cenc(ctx, cstr, scheme_type, scheme_version, scheme_uri, kms_uri);
+		break;
+	case GF_ISOM_ADOBE_SCHEME:
+		e = cenc_dec_setup_adobe(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;
+	}
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENC/ISMA] Error setting up protection scheme type %s\n", gf_4cc_to_str(scheme_type) ) );
+		return e;
+	}
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(cstr->opid, pid);
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+	if (prop) {
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT(prop->value.uint) );
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ORIG_STREAM_TYPE, NULL);
+	}
+	//remove all cenc properties on output
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_TYPE, NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_URI, NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_KMS_URI, NULL);
+	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_PATTERN, NULL);
+
+	cstr->is_nalu = GF_FALSE;;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (prop) {
+		switch (prop->value.uint) {
+		case GF_CODECID_AVC:
+		case GF_CODECID_SVC:
+		case GF_CODECID_MVC:
+		case GF_CODECID_HEVC:
+		case GF_CODECID_HEVC_TILES:
+		case GF_CODECID_LHVC:
+			cstr->is_nalu = GF_TRUE;;
+			break;
+		}
+	}
+	return e;
+}
+
+
+static Bool cenc_dec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterPid *ipid;
+	GF_CENCDecStream *cstr;
+	Bool is_play = GF_FALSE;
+	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+
+	ipid = evt->base.on_pid;
+	if (!ipid) return GF_FALSE;
+	cstr = gf_filter_pid_get_udta(ipid);
+	if (!cstr) return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		is_play = GF_TRUE;
+	case GF_FEVT_STOP:
+		if (cstr->is_cenc || cstr->is_cbc) {
+			cenc_dec_access_cenc(ctx, cstr, is_play);
+		} else if (cstr->is_adobe) {
+			cenc_dec_access_adobe(ctx, cstr, is_play);
+		} else if (cstr->is_oma) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENC/ISMA] OMA not supported, canceling filter event\n") );
+			return GF_TRUE;
+		} else {
+			cenc_dec_access_isma(ctx, cstr, is_play);
+		}
+		break;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+static GF_Err cenc_dec_process(GF_Filter *filter)
+{
+	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+	u32 i, nb_eos, count = gf_list_count(ctx->streams);
+
+	nb_eos = 0;
+	for (i=0; i<count; i++) {
+		GF_Err e;
+		GF_CENCDecStream *cstr = gf_list_get(ctx->streams, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(cstr->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(cstr->ipid)) {
+				nb_eos++;
+				gf_filter_pid_set_eos(cstr->opid);
+			}
+			continue;
+		}
+
+		if (cstr->is_cenc || cstr->is_cbc) {
+			e = cenc_dec_process_cenc(ctx, cstr, pck);
+		} else if (cstr->is_oma) {
+			e = GF_NOT_SUPPORTED;
+		} else if (cstr->is_adobe) {
+			e = cenc_dec_process_adobe(ctx, cstr, pck);
+		} else {
+			e = cenc_dec_process_isma(ctx, cstr, pck);
+		}
+		gf_filter_pid_drop_packet(cstr->ipid);
+		if (e) return e;
+	}
+	if (nb_eos && (nb_eos==count)) return GF_EOS;
+	return GF_OK;
+}
+
+static GF_Err cenc_dec_initialize(GF_Filter *filter)
+{
+	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	if (!ctx->streams) return GF_OUT_OF_MEM;
+
+	if (ctx->cfile) {
+		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 ));
+			return e;
+		}
+	}
+	ctx->bs_r = gf_bs_new((char *) ctx, 1, GF_BITSTREAM_READ);
+	return GF_OK;
+}
+
+static void cenc_dec_finalize(GF_Filter *filter)
+{
+	GF_CENCDecCtx *ctx = (GF_CENCDecCtx *)gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		GF_CENCDecStream *cstr = gf_list_pop_back(ctx->streams);
+		cenc_dec_stream_del(cstr);
+	}
+	gf_list_del(ctx->streams);
+
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->cinfo) gf_crypt_info_del(ctx->cinfo);
+}
+
+
+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_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),
+};
+
+
+#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},
+	{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"
+	"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) "
+	"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.")
+	.private_size = sizeof(GF_CENCDecCtx),
+	.max_extra_pids=-1,
+	.args = GF_CENCDecArgs,
+	SETCAPS(CENCDecCaps),
+	.configure_pid = cenc_dec_configure_pid,
+	.initialize = cenc_dec_initialize,
+	.finalize = cenc_dec_finalize,
+	.process = cenc_dec_process,
+	.process_event = cenc_dec_process_event
+	//for now only one PID per CENC decryptor instance, could be further optimized
+};
+
+#endif /*GPAC_DISABLE_CRYPTO*/
+
+const GF_FilterRegister *cenc_decrypt_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_CRYPTO
+	return &CENCDecRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dmx_avi.c Added

@@ -0,0 +1,647 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AVI demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#ifndef GPAC_DISABLE_AVILIB
+#include <gpac/internal/avilib.h>
+#include <gpac/media_tools.h>
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 stream_num;
+	Bool in_use;
+	u32 aud_frame, audio_bps, nb_channels, freq;
+	u64 audio_ts, seek_to_ts;
+	Bool audio_done, is_aac, playing, init_play_done;
+} AVIAstream;
+
+
+typedef struct
+{
+	//opts
+	GF_Fraction fps;
+	Bool importer;
+
+	GF_FilterPid *ipid;
+
+	GF_FilterPid *v_opid;
+	Bool v_in_use;
+	u32 nb_frames, cur_frame, nb_frame_sent;
+	u32 dummy, nvops;
+	const char *src_url;
+	avi_t *avi;
+
+	Bool use_file_fps;
+	GF_Fraction64 duration;
+	Bool v_playing;
+	Bool v_init_play_done;
+
+	GF_List *audios;
+} GF_AVIDmxCtx;
+
+
+static void avidmx_setup(GF_Filter *filter, GF_AVIDmxCtx *ctx)
+{
+	u32 sync_id = 0;
+	u32 codecid = 0;
+	Bool unframed;
+	u32 i, count, pfmt=0;
+	GF_Fraction64 dur;
+	char *comp;
+
+	if (ctx->use_file_fps) {
+		Double fps = AVI_frame_rate(ctx->avi);
+		gf_media_get_video_timing(fps, &ctx->fps.num, &ctx->fps.den);
+	}
+
+	dur.den = ctx->fps.num;
+	dur.num = (u64) (ctx->fps.den * AVI_video_frames(ctx->avi));
+
+	unframed = GF_TRUE;
+	comp = AVI_video_compressor(ctx->avi);
+	if (!comp) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Cannot retrieve video compressor name, ignoring video stream\n"));
+	}
+	/*these are/should be OK*/
+	else if (!stricmp(comp, "DIVX") || !stricmp(comp, "DX50")	/*DivX*/
+		|| !stricmp(comp, "XVID") /*XviD*/
+		|| !stricmp(comp, "3iv2") /*3ivX*/
+		|| !stricmp(comp, "fvfw") /*ffmpeg*/
+		|| !stricmp(comp, "NDIG") /*nero*/
+		|| !stricmp(comp, "MP4V") /*!! not tested*/
+		|| !stricmp(comp, "M4CC") /*Divio - not tested*/
+		|| !stricmp(comp, "PVMM") /*PacketVideo - not tested*/
+		|| !stricmp(comp, "SEDG") /*Samsung - not tested*/
+		|| !stricmp(comp, "RMP4") /*Sigma - not tested*/
+		|| !stricmp(comp, "MP43") /*not tested*/
+		|| !stricmp(comp, "FMP4") /*not tested*/
+	) {
+		codecid = GF_CODECID_MPEG4_PART2;
+	} else if ( !stricmp(comp, "H264") /*not tested*/
+		|| !stricmp(comp, "X264") /*not tested*/
+	) {
+		codecid = GF_CODECID_AVC;
+	} else if ( !stricmp(comp, "avc1") ) {
+		codecid = GF_CODECID_AVC;
+		unframed = GF_FALSE;
+	} else if (!stricmp(comp, "DIV3") || !stricmp(comp, "DIV4")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Video format %s not compliant with MPEG-4 Visual - please recompress the file first\n", comp));
+	} else if (!comp[0]) {
+		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));
+	}
+
+	ctx->v_in_use = GF_FALSE;
+	if (codecid) {
+		u32 w, h;
+		if (!ctx->v_opid) {
+			ctx->v_opid = gf_filter_pid_new(filter);
+		}
+		ctx->nb_frames = (u32) AVI_video_frames(ctx->avi);
+		ctx->cur_frame = 0;
+		sync_id = 1;
+		ctx->v_in_use = GF_TRUE;
+
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL) );
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_CODECID, &PROP_UINT(codecid) );
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num) );
+
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_ID, &PROP_UINT( sync_id) );
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT( sync_id ) );
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_FPS, &PROP_FRAC( ctx->fps ) );
+		w = AVI_video_width(ctx->avi);
+		h = AVI_video_height(ctx->avi);
+		gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_WIDTH, &PROP_UINT( w ) );
+		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 ) );
+
+		if (pfmt) {
+			u32 stride=0;
+			gf_pixel_get_size_info(pfmt, w, h, NULL, &stride, NULL, NULL, NULL);
+			gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_STRIDE, &PROP_UINT( stride ) );
+			gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_PIXFMT, &PROP_UINT( pfmt ) );
+		} else if (unframed) {
+			gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+			gf_filter_pid_set_property_str(ctx->v_opid, "nocts", &PROP_BOOL( GF_TRUE ) );
+		} else if (ctx->avi->extradata_size && ctx->avi->extradata) {
+			gf_filter_pid_set_property(ctx->v_opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(ctx->avi->extradata, ctx->avi->extradata_size) );
+
+		}
+	}
+
+	unframed = GF_FALSE;
+	count = AVI_audio_tracks(ctx->avi);
+	for (i=0; i<count; i++) {
+		u32 a_fmt, afmt=0, nb_bits;
+		AVI_set_audio_track(ctx->avi, i);
+
+		codecid = 0;
+		a_fmt = AVI_audio_format(ctx->avi);
+		nb_bits = AVI_audio_bits(ctx->avi);
+		switch (a_fmt) {
+		case WAVE_FORMAT_PCM:
+		case GF_4CC('P','C','M',' '):
+			codecid = GF_CODECID_RAW;
+			switch (nb_bits) {
+			case 8:
+				afmt = GF_AUDIO_FMT_U8;
+				break;
+			case 16:
+				afmt = GF_AUDIO_FMT_S16;
+				break;
+			case 24:
+				afmt = GF_AUDIO_FMT_S24;
+				break;
+			case 32:
+				afmt = GF_AUDIO_FMT_S32;
+				break;
+			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Audio bit depth %d not mapped, patch welcome\n", nb_bits));
+				afmt = GF_AUDIO_FMT_S16;
+				break;
+			}
+			break;
+		case WAVE_FORMAT_ADPCM:
+			codecid = GF_CODECID_ADPCM;
+			break;
+		case WAVE_FORMAT_IBM_CVSD:
+			codecid = GF_CODECID_IBM_CVSD;
+			break;
+		case WAVE_FORMAT_ALAW:
+			codecid = GF_CODECID_ALAW;
+			break;
+		case WAVE_FORMAT_MULAW:
+			codecid = GF_CODECID_MULAW;
+			break;
+		case WAVE_FORMAT_OKI_ADPCM:
+			codecid = GF_CODECID_OKI_ADPCM;
+			break;
+		case WAVE_FORMAT_DVI_ADPCM:
+			codecid = GF_CODECID_DVI_ADPCM;
+			break;
+		case WAVE_FORMAT_DIGISTD:
+			codecid = GF_CODECID_DIGISTD;
+			break;
+		case WAVE_FORMAT_YAMAHA_ADPCM:
+			codecid = GF_CODECID_YAMAHA_ADPCM;
+			break;
+		case WAVE_FORMAT_DSP_TRUESPEECH:
+			codecid = GF_CODECID_DSP_TRUESPEECH;
+			break;
+		case WAVE_FORMAT_GSM610:
+			codecid = GF_CODECID_GSM610;
+			break;
+		case IBM_FORMAT_MULAW:
+			codecid = GF_CODECID_IBM_MULAW;
+			break;
+		case IBM_FORMAT_ALAW:
+			codecid = GF_CODECID_IBM_ALAW;
+			break;
+		case IBM_FORMAT_ADPCM:
+			codecid = GF_CODECID_IBM_ADPCM;
+			break;
+		case 0x55:
+			codecid = GF_CODECID_MPEG_AUDIO;
+			unframed = GF_TRUE;
+			break;
+		case 0x0000706d:
+			codecid = GF_CODECID_AAC_MPEG4;
+			unframed = GF_TRUE;
+			break;
+		case 255:
+			codecid = GF_CODECID_AAC_MPEG4;
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIDmx] Audio format %d not supported, patch welcome\n", a_fmt));
+			break;
+		}
+
+		if (codecid) {
+			AVIAstream *st = NULL;
+			u32 brate, j, c  = gf_list_count(ctx->audios);
+			for (j=0; j<c; j++) {
+				st = gf_list_get(ctx->audios, j);
+				if (!st->in_use) break;
+				st = NULL;
+			}
+			if (!st) {
+				GF_SAFEALLOC(st, AVIAstream);
+				if (!st) continue;
+				st->opid = gf_filter_pid_new(filter);
+				gf_list_add(ctx->audios, st);
+			}
+			st->in_use = GF_TRUE;
+			st->stream_num = i;
+			if (!sync_id) sync_id = 2 + st->stream_num;
+			st->audio_done = GF_FALSE;
+
+			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);
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT( st->freq ) );
+			st->nb_channels = AVI_audio_channels(ctx->avi);
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT( st->nb_channels ) );
+			brate = AVI_audio_mp3rate(ctx->avi);
+			//for mp3 and aac
+			if (brate && (unframed || (codecid == GF_CODECID_AAC_MPEG4)))
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_BITRATE, &PROP_UINT( brate ) );
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT( 2 + st->stream_num) );
+			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 ) );
+			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
+			} else {
+				if (afmt) {
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt) );
+				}
+				st->audio_bps = AVI_audio_bits(ctx->avi);
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(st->freq) );
+
+				if (codecid == GF_CODECID_AAC_MPEG4) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+					GF_M4ADecSpecInfo acfg;
+					u8 *dsi=NULL;
+					u32 dsi_len=0;
+					memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+					acfg.base_object_type = GF_M4A_AAC_LC;
+					acfg.base_sr = st->freq;
+					acfg.nb_chan = st->nb_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(st->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_len) );
+#endif
+					st->audio_bps = 0;
+					st->is_aac = GF_TRUE;
+				}
+			}
+
+		}
+	}
+}
+
+GF_Err avidmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_AVIDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = 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);
+			gf_free(st);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->ipid) {
+		GF_FilterEvent fevt;
+		ctx->ipid = pid;
+
+		//we work with full file only, send a play event on source to indicate that
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
+		fevt.play.start_range = 0;
+		fevt.base.on_pid = ctx->ipid;
+		fevt.play.full_file_only = GF_TRUE;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (!p) return GF_NOT_SUPPORTED;
+
+	if (ctx->src_url && !strcmp(ctx->src_url, p->value.string)) return GF_OK;
+
+	if (ctx->avi) {
+		u32 i;
+		AVI_close(ctx->avi);
+		ctx->v_in_use = GF_FALSE;
+		for (i=0; i<gf_list_count(ctx->audios); i++) {
+			AVIAstream *st = gf_list_get(ctx->audios, i);
+			st->in_use = GF_FALSE;
+		}
+	}
+	ctx->avi = NULL;
+
+	ctx->src_url = p->value.string;
+
+	return GF_OK;
+}
+
+static Bool avidmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_AVIDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		gf_filter_post_process_task(filter);
+		if (evt->base.on_pid==ctx->v_opid) {
+			u32 frame_idx = 0;
+			ctx->v_playing = GF_TRUE;
+			if ((evt->play.start_range==0) && !ctx->v_init_play_done) {
+				ctx->v_init_play_done = GF_TRUE;
+				return GF_TRUE;
+			}
+			ctx->v_init_play_done = GF_TRUE;
+			frame_idx = (u32) (ctx->avi->fps * evt->play.start_range);
+			if (frame_idx) {
+				AVI_set_video_position(ctx->avi, frame_idx);
+			} else {
+				AVI_seek_start(ctx->avi);
+				gf_filter_post_process_task(filter);
+			}
+			ctx->cur_frame = frame_idx;
+		} else {
+			u32 i;
+			for (i=0; i<gf_list_count(ctx->audios); i++) {
+				AVIAstream *st = gf_list_get(ctx->audios, i);
+				if (st->opid != evt->base.on_pid) continue;
+				st->playing = GF_TRUE;
+				if ((evt->play.start_range==0) && !st->init_play_done) {
+					st->init_play_done = GF_TRUE;
+					return GF_TRUE;
+				}
+				st->init_play_done = GF_TRUE;
+				AVI_set_audio_position(ctx->avi, 0);
+				st->seek_to_ts = (u32) (evt->play.start_range * st->freq);
+			}
+		}
+
+		//cancel play event, we work with full file
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		if (evt->base.on_pid==ctx->v_opid) {
+			ctx->v_playing = GF_FALSE;
+		} else {
+			u32 i;
+			for (i=0; i<gf_list_count(ctx->audios); i++) {
+				AVIAstream *st = gf_list_get(ctx->audios, i);
+				if (st->opid != evt->base.on_pid) continue;
+				st->playing = GF_TRUE;
+			}
+		}
+		//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;
+}
+
+GF_Err avidmx_process(GF_Filter *filter)
+{
+	GF_AVIDmxCtx *ctx = gf_filter_get_udta(filter);
+	u32 i, count, nb_done, nb_active=0;
+	Bool start, end, video_done;
+
+	if (!ctx->avi) {
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!pck) {
+			return GF_OK;
+		}
+		gf_filter_pck_get_framing(pck, &start, &end);
+		gf_filter_pid_drop_packet(ctx->ipid);
+
+		if (!end) {
+			return GF_OK;
+		}
+
+		ctx->avi = AVI_open_input_file((char *)ctx->src_url, 1);
+		if (!ctx->avi) {
+			GF_Err e = GF_NON_COMPLIANT_BITSTREAM;
+			if (! gf_file_exists(ctx->src_url)) e = GF_URL_ERROR;
+			gf_filter_setup_failure(filter, e);
+			return GF_NOT_SUPPORTED;
+		}
+		avidmx_setup(filter, ctx);
+		return GF_OK;
+	}
+	video_done = GF_FALSE;
+	if (ctx->v_in_use && ctx->v_playing && (ctx->cur_frame < ctx->nb_frames) && !gf_filter_pid_would_block(ctx->v_opid) ) {
+		u32 key;
+		u64 file_offset, cts;
+		u8 *pck_data;
+		s32 size = AVI_frame_size(ctx->avi, ctx->cur_frame);
+		if (!size) {
+			AVI_read_frame(ctx->avi, NULL, &key);
+			ctx->dummy++;
+		}
+		//remove dummy frames
+		else {
+			file_offset = (u64) AVI_get_video_position(ctx->avi, ctx->cur_frame);
+			cts = ctx->nb_frame_sent * ctx->fps.den;
+
+			if (size > 4) {
+				GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->v_opid, size, &pck_data);
+				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);
+				gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+				if (key) gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+				gf_filter_pck_send(dst_pck);
+				ctx->nb_frame_sent++;
+			} else {
+				AVI_read_frame(ctx->avi, NULL, &key);
+				ctx->nvops++;
+			}
+		}
+		nb_active++;
+
+		ctx->cur_frame++;
+		if (ctx->cur_frame < ctx->nb_frames)
+			gf_filter_post_process_task(filter);
+		else
+			video_done = GF_TRUE;
+	} else if (!ctx->v_in_use) {
+		video_done = GF_TRUE;
+	} else if (ctx->cur_frame >= ctx->nb_frames) {
+		video_done = GF_TRUE;
+	}
+	
+	nb_done = 0;
+	count = gf_list_count(ctx->audios);
+	for (i=0; i<count; i++) {
+		s32 size;
+		AVIAstream *st = gf_list_get(ctx->audios, i);
+		if (st->audio_done || !st->in_use) {
+			nb_done++;
+			continue;
+		}
+		if (!st->playing || gf_filter_pid_would_block(st->opid) )
+			continue;
+		AVI_set_audio_track(ctx->avi, st->stream_num);
+		nb_active++;
+
+		size = AVI_audio_size(ctx->avi, st->aud_frame);
+
+		if (st->seek_to_ts && size) {
+			if (st->seek_to_ts > st->audio_ts) {
+				st->aud_frame ++;
+				continue;
+			}
+			else
+				st->seek_to_ts = 0;
+		}
+
+		if (size>0) {
+			int continuous;
+			u8 *pck_data;
+			u64 file_offset;
+			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(st->opid, size, &pck_data);
+
+			file_offset = gf_ftell(ctx->avi->fdes);
+			AVI_read_audio(ctx->avi, pck_data, size, (int*)&continuous);
+
+			if (st->audio_bps) {
+				u32 nb_samples = (8*size) / (st->audio_bps * st->nb_channels);
+				gf_filter_pck_set_cts(dst_pck, st->audio_ts);
+				gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+				st->audio_ts += nb_samples;
+			} else if (st->is_aac) {
+				gf_filter_pck_set_cts(dst_pck, st->audio_ts);
+				gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+				st->audio_ts += 1024;
+			}
+
+			if (continuous)
+				gf_filter_pck_set_byte_offset(dst_pck, file_offset);
+
+			gf_filter_pck_send(dst_pck);
+
+			st->aud_frame ++;
+		} else {
+			st->audio_done = GF_TRUE;
+			nb_done++;
+		}
+	}
+	if (!nb_active)
+		return GF_OK;
+	if (video_done && (nb_done==count) ) {
+		if (ctx->v_opid && ctx->v_in_use) gf_filter_pid_set_eos(ctx->v_opid);
+
+		for (i=0; i<count;i++) {
+			AVIAstream *st = gf_list_get(ctx->audios, i);
+			gf_filter_pid_set_eos(st->opid);
+		}
+		return GF_EOS;
+	}
+	gf_filter_post_process_task(filter);
+	return GF_OK;
+}
+
+GF_Err avidmx_initialize(GF_Filter *filter)
+{
+	GF_AVIDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->use_file_fps = ctx->fps.den ? GF_FALSE : GF_TRUE;
+	ctx->audios = gf_list_new();
+	return GF_OK;
+}
+
+void avidmx_finalize(GF_Filter *filter)
+{
+	GF_AVIDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->avi) AVI_close(ctx->avi);
+	while (gf_list_count(ctx->audios)) {
+		AVIAstream *st = gf_list_pop_back(ctx->audios);
+		gf_free(st);
+	}
+	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));
+	}
+
+}
+
+
+static const GF_FilterCapability AVIDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "avi"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/avi|video/x-avi"),
+	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),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_AVIDmxCtx, _n)
+static const GF_FilterArgs AVIDmxArgs[] =
+{
+	{ OFFS(fps), "import frame rate, default is AVI one", GF_PROP_FRACTION, "1/0", NULL, 0},
+	{ OFFS(importer), "compatibility with old importer, displays import results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+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.")
+	.private_size = sizeof(GF_AVIDmxCtx),
+	.initialize = avidmx_initialize,
+	.finalize = avidmx_finalize,
+	.args = AVIDmxArgs,
+	SETCAPS(AVIDmxCaps),
+	.configure_pid = avidmx_configure_pid,
+	.process = avidmx_process,
+	.process_event = avidmx_process_event,
+};
+
+#endif // GPAC_DISABLE_AVILIB
+
+const GF_FilterRegister *avidmx_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_AVILIB
+	return &AVIDmxRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_dash.c Added

@@ -0,0 +1,1823 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / DASH/HLS demux 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>
+
+#ifndef GPAC_DISABLE_DASH_CLIENT
+
+#include <gpac/dash.h>
+
+typedef struct
+{
+	//opts
+	s32 shift_utc, debug_as, atsc_shift;
+	u32 max_buffer, auto_switch, timeshift, tiles_rate, store, delay40X, exp_threshold, switch_count;
+	Bool server_utc, screen_res, aggressive, speedadapt;
+	GF_DASHInitialSelectionMode start_with;
+	GF_DASHTileAdaptationMode tile_mode;
+	GF_DASHAdaptationAlgorithm algo;
+	Bool max_res, immediate, abort, use_bmin;
+	char *query;
+	Bool noxlink, split_as;
+	u32 lowlat;
+
+	GF_FilterPid *mpd_pid;
+	GF_Filter *filter;
+
+	GF_DashClient *dash;
+	//http io for manifest
+	GF_DASHFileIO dash_io;
+	GF_DownloadManager *dm;
+	
+	Bool closed;
+	Bool reuse_download_session;
+
+	Bool initial_setup_done;
+	u32 nb_playing;
+
+	/*max width & height in all active representations*/
+	u32 width, height;
+
+	Double seek_request;
+	Double media_start_range;
+
+	Bool mpd_open;
+	Bool initial_play;
+	Bool check_eos;
+} GF_DASHDmxCtx;
+
+typedef struct
+{
+	GF_DASHDmxCtx *ctx;
+	GF_Filter *seg_filter_src;
+
+	u32 idx;
+	Bool init_switch_seg_sent;
+	Bool segment_sent;
+
+	u32 nb_eos, nb_pids;
+	Bool stats_uploaded;
+	Bool wait_for_pck;
+	Bool eos_detected;
+
+	GF_DownloadSession *sess;
+	Bool is_timestamp_based, pto_setup;
+	Bool prev_is_init_segment;
+	u32 timescale;
+	s64 pto;
+	s64 max_cts_in_period;
+	bin128 key_IV;
+
+	Bool seg_was_not_ready;
+	Bool in_error;
+	Bool is_playing;
+	Bool force_seg_switch;
+	u32 nb_group_deps, current_group_dep;
+} GF_DASHGroup;
+
+
+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)) {
+		gf_filter_pck_forward(in_pck, out_pid);
+
+		if (!group->pto_setup) {
+			cts = gf_filter_pck_get_cts(in_pck);
+			gf_filter_pid_set_property_str(out_pid, "time:timestamp", &PROP_LONGUINT(cts) );
+			gf_filter_pid_set_property_str(out_pid, "time:media", &PROP_DOUBLE(ctx->media_start_range) );
+			group->pto_setup = GF_TRUE;
+		}
+
+		gf_filter_pid_drop_packet(in_pid);
+		return;
+	}
+
+	//filter any packet outside the current period
+	dts = gf_filter_pck_get_dts(in_pck);
+	cts = gf_filter_pck_get_cts(in_pck);
+	seek_flag = gf_filter_pck_get_seek_flag(in_pck);
+
+	//if sync is based on timestamps do not adjust the timestamps back
+	if (! group->is_timestamp_based) {
+		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;
+			group->pto_setup = 1;
+
+			if (group->timescale && (group->timescale != ts)) {
+				group->pto *= ts;
+				group->pto /= group->timescale;
+			}
+			scale = ts;
+			scale /= 1000;
+
+			dur = (u64) (scale * gf_dash_get_period_duration(ctx->dash));
+			if (dur) {
+				group->max_cts_in_period = group->pto + dur;
+			} else {
+				group->max_cts_in_period = 0;
+			}
+
+			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));
+
+			seek_flag = 1;
+		}
+
+		//remap timestamps to our timeline
+		if (dts != GF_FILTER_NO_TS) {
+			if ((s64) dts >= group->pto)
+				dts -= group->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));
+				dts = 0;
+				seek_flag = 1;
+			}
+		}
+		if (cts!=GF_FILTER_NO_TS) {
+			if ((s64) cts >= group->pto)
+				cts -= group->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));
+				cts = 0;
+				seek_flag = 1;
+			}
+		}
+	} 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);
+	//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);
+	gf_filter_pck_set_cts(dst_pck, cts);
+	gf_filter_pck_set_seek_flag(dst_pck, seek_flag);
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(in_pid);
+
+	if (do_map_time) {
+		gf_filter_pid_set_property_str(out_pid, "time:timestamp", &PROP_LONGUINT(cts) );
+		gf_filter_pid_set_property_str(out_pid, "time:media", &PROP_DOUBLE(ctx->media_start_range) );
+	}
+}
+
+
+static void dashdmx_on_filter_setup_error(GF_Filter *failed_filter, void *udta, GF_Err err)
+{
+	GF_DASHGroup *group = (GF_DASHGroup *)udta;
+	if (!udta) return;
+
+	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);
+	if (err) {
+		Bool group_done=GF_FALSE;
+
+		gf_dash_group_get_num_segments_ready(group->ctx->dash, group->idx, &group_done);
+
+		group->stats_uploaded = GF_TRUE;
+		group->segment_sent = GF_FALSE;
+		gf_filter_post_process_task(group->ctx->filter);
+		if (group_done) {
+			group->eos_detected = GF_TRUE;
+		} else {
+			group->in_error = GF_TRUE;
+		}
+	}
+}
+
+/*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)
+{
+	GF_DASHGroup *group;
+	GF_Err e;
+	u32 url_type=0;
+	Bool has_sep = GF_FALSE;
+	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));
+		return GF_FILTER_NOT_FOUND;
+	}
+
+	GF_SAFEALLOC(group, GF_DASHGroup);
+	if (!group) return GF_OUT_OF_MEM;
+	group->ctx = ctx;
+	group->idx = group_index;
+	gf_dash_set_group_udta(ctx->dash, group_index, group);
+
+	base_url = gf_dash_get_url(ctx->dash);
+	if (!strnicmp(base_url, "http://", 7)) url_type=1;
+	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)) {
+		if (url_type==1)
+			sprintf(sURL, "http://%s", init_segment_name);
+		else if (url_type==2)
+			sprintf(sURL, "http://%s", init_segment_name);
+		else
+			sprintf(sURL, "file://%s", init_segment_name);
+	}
+	//not from file system, set cache option
+	if (url_type) {
+		if (!ctx->store) {
+			if (!has_sep) { strcat(sURL, ":gpac"); has_sep = GF_TRUE; }
+			strcat(sURL, ":cache=mem");
+		}
+		else if (ctx->store==2) {
+			if (!has_sep) { strcat(sURL, ":gpac"); has_sep = GF_TRUE; }
+			strcat(sURL, ":cache=keep");
+		}
+	}
+
+	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);
+	}
+
+	group->seg_filter_src = gf_filter_connect_source(ctx->filter, sURL, NULL, &e);
+	if (!group->seg_filter_src) {
+		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_filter_set_setup_failure_callback(ctx->filter, group->seg_filter_src, dashdmx_on_filter_setup_error, group);
+	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;
+}
+
+void dashdmx_io_delete_cache_file(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url)
+{
+	if (!session) {
+		return;
+	}
+	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url);
+}
+
+GF_DASHFileIOSession dashdmx_io_create(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx)
+{
+	GF_DownloadSession *sess;
+	const GF_PropertyValue *p;
+	GF_Err e;
+	u32 flags = GF_NETIO_SESSION_NOT_THREADED;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+
+	//we work in non-threaded mode, only MPD fetcher is allowed
+	if (group_idx>=0)
+		return NULL;
+
+	//crude hack when using gpac downloader to initialize the MPD pid: get the pointer to the download session
+	//this should be safe unless the mpd_pid is destroyed, which should only happen upon destruction of the DASH session
+	p = gf_filter_pid_get_property(ctx->mpd_pid, GF_PROP_PID_DOWNLOAD_SESSION);
+	if (p) {
+		sess = (GF_DownloadSession *) p->value.ptr;
+		if (!ctx->store) {
+			gf_dm_sess_force_memory_mode(sess);
+		}
+		ctx->reuse_download_session = GF_TRUE;
+		return (GF_DASHFileIOSession) sess;
+	}
+
+	if (!ctx->store) flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+	if (persistent) flags |= GF_NETIO_SESSION_PERSISTENT;
+	sess = gf_dm_sess_new(ctx->dm, url, flags, NULL, NULL, &e);
+	return (GF_DASHFileIOSession) sess;
+}
+void dashdmx_io_del(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+	if (!ctx->reuse_download_session)
+		gf_dm_sess_del((GF_DownloadSession *)session);
+}
+GF_Err dashdmx_io_init(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_process_headers((GF_DownloadSession *)session);
+}
+GF_Err dashdmx_io_run(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_process((GF_DownloadSession *)session);
+}
+const char *dashdmx_io_get_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_get_resource_name((GF_DownloadSession *)session);
+}
+const char *dashdmx_io_get_cache_name(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_get_cache_name((GF_DownloadSession *)session);
+}
+const char *dashdmx_io_get_mime(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_mime_type((GF_DownloadSession *)session);
+}
+const char *dashdmx_io_get_header_value(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name)
+{
+	return gf_dm_sess_get_header((GF_DownloadSession *)session, header_name);
+}
+u64 dashdmx_io_get_utc_start_time(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_get_utc_start((GF_DownloadSession *)session);
+}
+GF_Err dashdmx_io_setup_from_url(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx)
+{
+	return gf_dm_sess_setup_from_url((GF_DownloadSession *)session, url, GF_FALSE);
+}
+GF_Err dashdmx_io_set_range(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache)
+{
+	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;
+	if (session) {
+		gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, NULL, &bps, NULL);
+	} else {
+		GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+		bps = gf_dm_get_data_rate(ctx->dm);
+		bps/=8;
+	}
+	return bps;
+}
+u32 dashdmx_io_get_total_size(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	u64 size=0;
+	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, &size, NULL, NULL, NULL);
+	return (u32) size;
+}
+u32 dashdmx_io_get_bytes_done(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	u64 size=0;
+	gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, &size, NULL, NULL);
+	return (u32) size;
+}
+#endif
+
+GF_Err dashdmx_io_on_dash_event(GF_DASHFileIO *dashio, GF_DASHEventType dash_evt, s32 group_idx, GF_Err error_code)
+{
+	GF_Err e;
+	u32 i;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx *)dashio->udta;
+
+	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;
+		}
+		return GF_OK;
+	}
+
+	if (dash_evt==GF_DASH_EVENT_SELECT_GROUPS) {
+#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);
+		}
+#endif
+
+		//let the player decide which group to play: we declare everything
+		return GF_OK;
+	}
+
+	/*for all selected groups, create input service and connect to init/first segment*/
+	if (dash_evt==GF_DASH_EVENT_CREATE_PLAYBACK) {
+		//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);
+
+
+			//these are not used in the test suite (require decoding)
+			gf_dash_group_set_codec_stat(ctx->dash, 0, 0, 0, 0, 0, GF_FALSE, GF_FALSE);
+			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)
+				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)
+			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
+		/*select input services if possible*/
+		for (i=0; i<gf_dash_get_group_count(ctx->dash); i++) {
+			const char *mime, *init_segment;
+			u64 start_range, end_range;
+			u32 j;
+			Bool playable = GF_TRUE;
+			//let the player decide which group to play
+			if (!gf_dash_is_group_selectable(ctx->dash, i))
+				continue;
+
+			j=0;
+			while (1) {
+				const char *desc_id, *desc_scheme, *desc_value;
+				if (! gf_dash_group_enum_descriptor(ctx->dash, i, GF_MPD_DESC_ESSENTIAL_PROPERTIES, j, &desc_id, &desc_scheme, &desc_value))
+					break;
+				j++;
+				if (!strcmp(desc_scheme, "urn:mpeg:dash:srd:2014")) {
+				} else {
+					playable = GF_FALSE;
+					break;
+				}
+			}
+			if (!playable) {
+				gf_dash_group_select(ctx->dash, i, GF_FALSE);
+				continue;
+			}
+
+			if (gf_dash_group_has_dependent_group(ctx->dash, i) >=0 ) {
+				gf_dash_group_select(ctx->dash, i, GF_TRUE);
+				continue;
+			}
+
+			mime = gf_dash_group_get_segment_mime(ctx->dash, i);
+			init_segment = gf_dash_group_get_segment_init_url(ctx->dash, i, &start_range, &end_range);
+
+			e = dashdmx_load_source(ctx, i, mime, init_segment, start_range, end_range);
+			if (e != GF_OK) {
+				gf_dash_group_select(ctx->dash, i, GF_FALSE);
+			} else {
+				u32 w, h;
+				/*connect our media service*/
+				gf_dash_group_get_video_info(ctx->dash, i, &w, &h);
+				if (w && h && w>ctx->width && h>ctx->height) {
+					ctx->width = w;
+					ctx->height = h;
+				}
+				if (gf_dash_group_get_srd_max_size_info(ctx->dash, i, &w, &h)) {
+					ctx->width = w;
+					ctx->height = h;
+				}
+				if (ctx->closed) return GF_OK;
+			}
+		}
+
+		if (!ctx->initial_setup_done) {
+			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
+
+		}
+		return GF_OK;
+	}
+
+	/*for all running services, stop service*/
+	if (dash_evt==GF_DASH_EVENT_DESTROY_PLAYBACK) {
+		for (i=0; i<gf_dash_get_group_count(ctx->dash); i++) {
+			GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, i);
+			if (!group) continue;
+			if (group->seg_filter_src) {
+				gf_filter_remove_src(ctx->filter, group->seg_filter_src);
+				group->seg_filter_src = NULL;
+			}
+			gf_free(group);
+			gf_dash_set_group_udta(ctx->dash, i, NULL);
+		}
+		for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+			gf_filter_pid_set_udta(opid, NULL);
+		}
+		return GF_OK;
+	}
+	if (dash_evt==GF_DASH_EVENT_ABORT_DOWNLOAD) {
+		GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, group_idx);
+		if (group) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_SOURCE_SWITCH,  NULL);
+			evt.seek.start_offset = -1;
+			evt.seek.source_switch = NULL;
+			gf_filter_send_event(group->seg_filter_src, &evt, GF_FALSE);
+		}
+		return GF_OK;
+	}
+
+	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) ) );
+				}
+			}
+		}
+		return GF_OK;
+	}
+	if (dash_evt==GF_DASH_EVENT_TIMESHIFT_UPDATE) {
+		Double timeshift = gf_dash_get_timeshift_buffer_pos(ctx->dash);
+		for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+			gf_filter_pid_set_info(opid, GF_PROP_PID_TIMESHIFT_TIME, &PROP_DOUBLE(timeshift) );
+		}
+		return GF_OK;
+	}
+	if (dash_evt==GF_DASH_EVENT_TIMESHIFT_OVERFLOW) {
+		u32 evttype = (group_idx>=0) ? 2 : 1;
+		for (i=0; i<gf_filter_get_opid_count(ctx->filter); i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+			gf_filter_pid_set_info(opid, GF_PROP_PID_TIMESHIFT_STATE, &PROP_UINT(evttype) );
+		}
+	}
+
+	if (dash_evt==GF_DASH_EVENT_CODEC_STAT_QUERY) {
+		GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, group_idx);
+		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) {
+				GF_FilterPidStatistics stats;
+				if (gf_filter_pid_get_statistics(opid, &stats, GF_STATS_DECODER_SINK) != 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);
+
+
+				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) );
+
+				break;
+			}
+		}
+	}
+	return GF_OK;
+}
+
+static void dashdmx_setup_buffer(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
+{
+	u32 buffer_ms, play_buf_ms;
+	gf_filter_get_output_buffer_max(ctx->filter, &buffer_ms, &play_buf_ms);
+	buffer_ms /= 1000;
+	play_buf_ms /= 1000;
+
+	//use min buffer from MPD
+	if (ctx->use_bmin) {
+		u64 mpd_buffer_ms = gf_dash_get_min_buffer_time(ctx->dash);
+		if (mpd_buffer_ms > buffer_ms)
+			buffer_ms = (u32) mpd_buffer_ms;
+	}
+	if (buffer_ms) {
+		gf_dash_set_user_buffer(ctx->dash, buffer_ms);
+	}
+	gf_dash_group_set_max_buffer_playout(ctx->dash, group->idx, play_buf_ms);
+}
+
+/*check in all groups if the service can support reverse playback (speed<0); return GF_OK only if service is supported in all groups*/
+static u32 dashdmx_dash_playback_mode(GF_DASHDmxCtx *ctx)
+{
+	u32 pmode, mode, i, count = gf_filter_get_ipid_count(ctx->filter);
+	mode = GF_PLAYBACK_MODE_REWIND;
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *p;
+		GF_FilterPid *pid = gf_filter_get_ipid(ctx->filter, i);
+		if (ctx->mpd_pid == pid) continue;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
+		pmode = p ? p->value.uint : GF_PLAYBACK_MODE_REWIND;
+		if (pmode < mode) mode = pmode;
+	}
+	return mode;
+}
+
+
+static s32 dashdmx_group_idx_from_pid(GF_DASHDmxCtx *ctx, GF_FilterPid *src_pid)
+{
+	s32 i;
+
+	for (i=0; (u32) i < gf_dash_get_group_count(ctx->dash); i++) {
+		GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, i);
+		if (!group) continue;
+		if (gf_filter_pid_is_filter_in_parents(src_pid, group->seg_filter_src))
+			return i;
+	}
+	return -1;
+}
+
+static GF_FilterPid *dashdmx_create_output_pid(GF_Filter *filter, GF_FilterPid *input, u32 *run_status)
+{
+	u32 global_score=0;
+	GF_FilterPid *output_pid = NULL;
+	u32 i, count = gf_filter_get_opid_count(filter);
+	const GF_PropertyValue *codec, *streamtype, *role, *lang;
+
+	*run_status = 0;
+
+	streamtype = gf_filter_pid_get_property(input, GF_PROP_PID_STREAM_TYPE);
+	if (streamtype && streamtype->value.uint==GF_STREAM_ENCRYPTED)
+		streamtype = gf_filter_pid_get_property(input, GF_PROP_PID_ORIG_STREAM_TYPE);
+
+	codec = gf_filter_pid_get_property(input, GF_PROP_PID_CODECID);
+	role = gf_filter_pid_get_property(input, GF_PROP_PID_ROLE);
+	lang = gf_filter_pid_get_property(input, GF_PROP_PID_LANGUAGE);
+
+	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);
+		//in use by us
+		if (gf_filter_pid_get_udta(opid)) continue;
+
+		o_streamtype = gf_filter_pid_get_property(opid, GF_PROP_PID_STREAM_TYPE);
+		if (o_streamtype && o_streamtype->value.uint==GF_STREAM_ENCRYPTED)
+			o_streamtype = gf_filter_pid_get_property(opid, GF_PROP_PID_ORIG_STREAM_TYPE);
+
+		o_codec = gf_filter_pid_get_property(opid, GF_PROP_PID_CODECID);
+		o_role = gf_filter_pid_get_property(opid, GF_PROP_PID_ROLE);
+		o_lang = gf_filter_pid_get_property(opid, GF_PROP_PID_LANGUAGE);
+
+		if (!o_streamtype || !streamtype || !gf_props_equal(streamtype, o_streamtype))
+			continue;
+
+		score = 1;
+		//get highest priority for streams with same role
+		if (o_role && role && gf_props_equal(role, o_role)) score += 10;
+		//then high priority for streams with same lang
+		if (o_lang && lang && gf_props_equal(lang, o_lang)) score += 5;
+
+		//otherwise favour streams with same codec
+		if (!o_codec && codec && gf_props_equal(codec, o_codec)) score++;
+
+		if (global_score<score) {
+			global_score = score;
+			output_pid = opid;
+		}
+	}
+	if (output_pid) {
+		*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);
+}
+
+static void dashdmx_declare_properties(GF_DASHDmxCtx *ctx, GF_DASHGroup *group, u32 group_idx, GF_FilterPid *opid, GF_FilterPid *ipid)
+{
+	GF_DASHQualityInfo qinfo;
+	GF_PropertyValue qualities, srd, srdref;
+	GF_Err e;
+	u32 count, i;
+	u32 dur, mode;
+
+	gf_filter_pid_copy_properties(opid, ipid);
+
+	if (!group->nb_group_deps) {
+		u32 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);
+		gf_filter_pid_set_name(opid, as_name);
+	}
+
+	mode = dashdmx_dash_playback_mode(ctx);
+	gf_filter_pid_set_property(opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(mode));
+
+	if (ctx->max_res && gf_filter_pid_get_property(ipid, GF_PROP_PID_WIDTH)) {
+		gf_filter_pid_set_property(opid, GF_PROP_SERVICE_WIDTH, &PROP_UINT(ctx->width));
+		gf_filter_pid_set_property(opid, GF_PROP_SERVICE_HEIGHT, &PROP_UINT(ctx->height));
+	}
+
+	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) );
+
+	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) );
+
+
+	if (ctx->use_bmin) {
+		u32 max = gf_dash_get_min_buffer_time(ctx->dash);
+		gf_filter_pid_set_property_str(opid, "BufferLength", &PROP_UINT(max));
+	}
+
+	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;
+
+		snprintf(szInfo, 500, "codec=%s", qinfo.codec);
+		e = gf_dynstrcat(&qdesc, szInfo, "::");
+		if (e) break;
+
+		snprintf(szInfo, 500, "mime=%s", qinfo.mime);
+		e = gf_dynstrcat(&qdesc, szInfo, "::");
+		if (e) break;
+
+		snprintf(szInfo, 500, "bw=%d", qinfo.bandwidth);
+		e = gf_dynstrcat(&qdesc, szInfo, "::");
+		if (e) break;
+
+		if (qinfo.disabled) {
+			e = gf_dynstrcat(&qdesc, "disabled", "::");
+			if (e) break;
+		}
+
+		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 (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;
+
+			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 (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;
+		}
+		gf_list_add(qualities.value.string_list, qdesc);
+		qdesc = NULL;
+	}
+	gf_filter_pid_set_info_str(opid, "has:qualities", &qualities);
+
+	const char *title, *source;
+	gf_dash_get_info(ctx->dash, &title, &source);
+	gf_filter_pid_set_info(opid, GF_PROP_PID_SERVICE_NAME, &PROP_STRING(title) );
+	gf_filter_pid_set_info(opid, GF_PROP_PID_SERVICE_PROVIDER, &PROP_STRING(source) );
+
+	title = NULL;
+	gf_dash_group_enum_descriptor(ctx->dash, group_idx, GF_MPD_DESC_ROLE, 0, NULL, NULL, &title);
+	if (title)
+		gf_filter_pid_set_property(opid, GF_PROP_PID_ROLE, &PROP_STRING(title) );
+
+	title = NULL;
+	gf_dash_group_enum_descriptor(ctx->dash, group_idx, GF_MPD_DESC_ACCESSIBILITY, 0, NULL, NULL, &title);
+	if (title)
+		gf_filter_pid_set_property_str(opid, "accessibility", &PROP_STRING(title) );
+
+	title = NULL;
+	gf_dash_group_enum_descriptor(ctx->dash, group_idx, GF_MPD_DESC_RATING, 0, NULL, NULL, &title);
+	if (title)
+		gf_filter_pid_set_property_str(opid, "rating", &PROP_STRING(title) );
+
+	if (!gf_sys_is_test_mode()) {
+		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;
+	srdref.type = GF_PROP_VEC2I;
+	if (gf_dash_group_get_srd_info(ctx->dash, group_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)) {
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_SRD, &srd);
+		gf_filter_pid_set_property(opid, GF_PROP_PID_SRD_REF, &srdref);
+	}
+
+	//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);
+}
+
+static GF_Err dashdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	s32 group_idx;
+	GF_FilterPid *opid;
+	GF_Err e;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+	GF_DASHGroup *group;
+
+	if (is_remove) {
+		//TODO
+		if (pid==ctx->mpd_pid) {
+			u32 i;
+			for (i=0; i<gf_filter_get_opid_count(filter); i++) {
+				opid = gf_filter_get_opid(filter, i);
+				group = gf_filter_pid_get_udta(opid);
+				if (group && group->seg_filter_src) {
+					gf_filter_remove_src(filter, group->seg_filter_src);
+				}
+			}
+			gf_dash_close(ctx->dash);
+			ctx->mpd_pid = NULL;
+		} else {
+			opid = gf_filter_pid_get_udta(pid);
+			if (opid) {
+				if (!ctx->mpd_pid) {
+					gf_filter_pid_remove(opid);
+				} else if (gf_dash_all_groups_done(ctx->dash) && gf_dash_in_last_period(ctx->dash, GF_TRUE)) {
+					gf_filter_pid_remove(opid);
+				} else {
+					gf_filter_pid_set_udta(opid, NULL);
+					gf_filter_pid_set_udta(pid, NULL);
+				}
+			}
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Mismatch in input pid caps\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	//configure MPD pid
+	if (!ctx->mpd_pid) {
+		const GF_PropertyValue *p;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+		if (!p || !p->value.string) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] no URL on MPD pid\n"));
+			return GF_NOT_SUPPORTED;
+		}
+
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+		ctx->mpd_pid = pid;
+		ctx->seek_request = -1;
+		ctx->nb_playing = 0;
+
+		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;
+		}
+		//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)
+			gf_filter_post_process_task(filter);
+		return GF_OK;
+	} else if (ctx->mpd_pid == pid) {
+		return GF_OK;
+	}
+
+	//figure out group for this pid
+	group_idx = dashdmx_group_idx_from_pid(ctx, pid);
+	if (group_idx<0) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASHDmx] Failed to locate adaptation set for input pid\n"));
+		return GF_SERVICE_ERROR;
+	}
+	group = gf_dash_get_group_udta(ctx->dash, group_idx);
+
+	//initial configure
+	opid = gf_filter_pid_get_udta(pid);
+	if (opid == NULL) {
+		u32 run_status;
+		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);
+		gf_filter_pid_set_udta(opid, group);
+		gf_filter_pid_set_udta(pid, opid);
+		group->nb_pids ++;
+
+		if (run_status) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			gf_filter_pid_send_event(pid, &evt);
+			group->is_playing = GF_TRUE;
+			gf_dash_group_select(ctx->dash, group->idx, GF_TRUE);
+
+			if (run_status==2) {
+				gf_dash_set_group_done(ctx->dash, group->idx, GF_TRUE);
+				gf_dash_group_select(ctx->dash, group->idx, GF_FALSE);
+
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, pid);
+				gf_filter_pid_send_event(pid, &evt);
+				group->is_playing = GF_FALSE;
+			}
+		}
+	}
+	dashdmx_declare_properties(ctx, group, group_idx, opid, pid);
+
+
+	//reset the file cache property (init segment could be cached but not the rest)
+	gf_filter_pid_set_property(opid, GF_PROP_PID_FILE_CACHED, NULL);
+
+	return GF_OK;
+}
+
+static GF_Err dashdmx_initialize(GF_Filter *filter)
+{
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+	ctx->filter = filter;
+	ctx->dm = gf_filter_get_download_manager(filter);
+	if (!ctx->dm) return GF_SERVICE_ERROR;
+
+	ctx->dash_io.udta = ctx;
+	ctx->dash_io.delete_cache_file = dashdmx_io_delete_cache_file;
+	ctx->dash_io.create = dashdmx_io_create;
+	ctx->dash_io.del = dashdmx_io_del;
+	ctx->dash_io.init = dashdmx_io_init;
+	ctx->dash_io.run = dashdmx_io_run;
+	ctx->dash_io.get_url = dashdmx_io_get_url;
+	ctx->dash_io.get_cache_name = dashdmx_io_get_cache_name;
+	ctx->dash_io.get_mime = dashdmx_io_get_mime;
+	ctx->dash_io.get_header_value = dashdmx_io_get_header_value;
+	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 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->store==2) ? GF_TRUE : GF_FALSE, (ctx->algo==GF_DASH_ALGO_NONE) ? GF_TRUE : GF_FALSE, ctx->start_with, ctx->timeshift);
+
+	if (!ctx->dash) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] Error - cannot create DASH Client\n"));
+		return GF_IO_ERR;
+	}
+
+	if (ctx->screen_res) {
+		GF_FilterSessionCaps caps;
+		gf_filter_get_session_caps(ctx->filter, &caps);
+		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_utc_shift(ctx->dash, ctx->shift_utc);
+	gf_dash_set_atsc_ast_shift(ctx->dash, ctx->atsc_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);
+
+	gf_dash_set_min_timeout_between_404(ctx->dash, ctx->delay40X);
+	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_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);
+
+	ctx->initial_play = GF_TRUE;
+	gf_filter_block_eos(filter, GF_TRUE);
+
+	//for coverage
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		dashdmx_on_filter_setup_error(NULL, NULL, GF_OK);
+	}
+#endif
+	return GF_OK;
+}
+
+
+static void dashdmx_finalize(GF_Filter *filter)
+{
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+	assert(ctx);
+
+	if (ctx->dash)
+		gf_dash_del(ctx->dash);
+}
+
+static Bool dashdmx_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
+{
+	u32 i, count;
+	GF_FilterEvent src_evt;
+	GF_FilterPid *ipid;
+	u64 pto;
+	u32 timescale;
+	Bool initial_play;
+	Double offset;
+	GF_DASHDmxCtx *ctx = (GF_DASHDmxCtx*) gf_filter_get_udta(filter);
+	GF_DASHGroup *group;
+
+
+	switch (fevt->base.type) {
+	case GF_FEVT_QUALITY_SWITCH:
+		if (fevt->quality_switch.set_tile_mode_plus_one) {
+			GF_DASHTileAdaptationMode tile_mode = fevt->quality_switch.set_tile_mode_plus_one - 1;
+			gf_dash_set_tile_adaptation_mode(ctx->dash, tile_mode, 100);
+		} else if (fevt->quality_switch.q_idx < 0) {
+			gf_dash_set_automatic_switching(ctx->dash, 1);
+		} else if (fevt->base.on_pid) {
+			s32 idx;
+			group = gf_filter_pid_get_udta(fevt->base.on_pid);
+			if (!group) return GF_TRUE;
+			idx = group->idx;
+
+			gf_dash_group_set_quality_degradation_hint(ctx->dash, group->idx, fevt->quality_switch.quality_degradation);
+
+			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;
+
+				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;
+			}
+
+			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);
+		}
+		return GF_TRUE;
+
+#ifdef FILTER_FIXME
+
+	case GF_NET_ASSOCIATED_CONTENT_TIMING:
+		gf_dash_override_ntp(ctx->dash, com->addon_time.ntp);
+		return GF_OK;
+#endif
+	default:
+		break;
+	}
+
+	/*not supported*/
+	if (!fevt->base.on_pid) return GF_NOT_SUPPORTED;
+	group = gf_filter_pid_get_udta(fevt->base.on_pid);
+	if (!group) return GF_NOT_SUPPORTED;
+	count = gf_filter_get_ipid_count(filter);
+	ipid = NULL;
+	for (i=0; i<count; i++) {
+		ipid = gf_filter_get_ipid(filter, i);
+		if (gf_filter_pid_get_udta(ipid) == fevt->base.on_pid) break;
+		ipid = NULL;
+	}
+
+	switch (fevt->base.type) {
+	case GF_FEVT_VISIBILITY_HINT:
+		group = gf_filter_pid_get_udta(fevt->base.on_pid);
+		if (!group) return GF_TRUE;
+
+		gf_dash_group_set_visible_rect(ctx->dash, group->idx, fevt->visibility_hint.min_x, fevt->visibility_hint.max_x, fevt->visibility_hint.min_y, fevt->visibility_hint.max_y, fevt->visibility_hint.is_gaze);
+		return GF_TRUE;
+
+	case GF_FEVT_PLAY:
+		src_evt = *fevt;
+		group->is_playing = GF_TRUE;
+		ctx->check_eos = GF_FALSE;
+
+		//adjust play range from media timestamps to MPD time
+		if (fevt->play.timestamp_based) {
+
+			if (fevt->play.timestamp_based==1) {
+				gf_dash_group_get_presentation_time_offset(ctx->dash, group->idx, &pto, &timescale);
+				offset = (Double) pto;
+				offset /= timescale;
+				src_evt.play.start_range -= offset;
+				if (src_evt.play.start_range < 0) src_evt.play.start_range = 0;
+			}
+
+			group->is_timestamp_based = 1;
+			group->pto_setup = 0;
+			ctx->media_start_range = fevt->play.start_range;
+		} else {
+			group->is_timestamp_based = 0;
+			group->pto_setup = 0;
+			if (fevt->play.start_range<0) src_evt.play.start_range = 0;
+			//in m3u8, we need also media start time for mapping time
+			if (gf_dash_is_m3u8(ctx->dash))
+				ctx->media_start_range = fevt->play.start_range;
+		}
+
+		//we cannot handle seek request outside of a period being setup, this messes up our internal service setup
+		//we postpone the seek and will request it later on ...
+		if (gf_dash_in_period_setup(ctx->dash)) {
+			u64 p_end = gf_dash_get_period_duration(ctx->dash);
+			if (p_end) {
+				p_end += gf_dash_get_period_start(ctx->dash);
+				if (p_end<1000*fevt->play.start_range) {
+					ctx->seek_request = fevt->play.start_range;
+					return GF_TRUE;
+				}
+			}
+		}
+
+		if (fevt->play.speed)
+			gf_dash_set_speed(ctx->dash, fevt->play.speed);
+
+		initial_play = ctx->initial_play;
+		if (fevt->play.initial_broadcast_play) initial_play = GF_TRUE;
+
+		/*don't seek if this command is the first PLAY request of objects declared by the subservice, unless start range is not default one (0) */
+		if (!ctx->nb_playing) {
+			if (!initial_play || (fevt->play.start_range>1.0)) {
+
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] Received Play command on group %d\n", group->idx));
+
+				if (fevt->play.end_range<=0) {
+					u32 ms = (u32) ( 1000 * (-fevt->play.end_range) );
+					if (ms<1000) ms = 0;
+					gf_dash_set_timeshift(ctx->dash, ms);
+				}
+				gf_dash_seek(ctx->dash, fevt->play.start_range);
+
+				//to remove once we manage to keep the service alive
+				/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
+				if (gf_dash_get_period_switch_status(ctx->dash)) return GF_TRUE;
+			}
+		}
+		//otherwise in static mode, perform a group seek
+		else if (!initial_play && !gf_dash_is_dynamic_mpd(ctx->dash) ) {
+			/*don't forward commands if a switch of period is to be scheduled, we are killing the service anyway ...*/
+			if (gf_dash_get_period_switch_status(ctx->dash)) return GF_TRUE;
+
+			//seek on a single group
+
+			gf_dash_group_seek(ctx->dash, group->idx, fevt->play.start_range);
+		}
+
+		//check if current segment playback should be aborted
+		src_evt.play.forced_dash_segment_switch = gf_dash_group_segment_switch_forced(ctx->dash, group->idx);
+
+		gf_dash_group_select(ctx->dash, group->idx, GF_TRUE);
+		gf_dash_set_group_done(ctx->dash, (u32) group->idx, 0);
+
+		//adjust start range from MPD time to media time
+		src_evt.play.start_range = gf_dash_group_get_start_range(ctx->dash, group->idx);
+		gf_dash_group_get_presentation_time_offset(ctx->dash, group->idx, &pto, &timescale);
+		src_evt.play.start_range += ((Double)pto) / timescale;
+		src_evt.play.no_byterange_forward = 1;
+
+		dashdmx_setup_buffer(ctx, group);
+
+		gf_filter_prevent_blocking(filter, GF_TRUE);
+
+		ctx->nb_playing++;
+		//forward new event to source pid
+		src_evt.base.on_pid = ipid;
+
+		gf_filter_pid_send_event(ipid, &src_evt);
+		gf_filter_post_process_task(filter);
+		//cancel the event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		gf_dash_set_group_done(ctx->dash, (u32) group->idx, 1);
+		gf_dash_group_select(ctx->dash, (u32) group->idx, GF_FALSE);
+		group->is_playing = GF_FALSE;
+		if (ctx->nb_playing) {
+			ctx->initial_play = GF_FALSE;
+			group->force_seg_switch = GF_TRUE;
+			ctx->nb_playing--;
+			if (!ctx->nb_playing) ctx->check_eos = GF_TRUE;
+		}
+		//forward new event to source pid
+		src_evt = *fevt;
+		src_evt.base.on_pid = ipid;
+		gf_filter_pid_send_event(ipid, &src_evt);
+
+		//cancel the event
+		return GF_TRUE;
+
+	case GF_FEVT_CAPS_CHANGE:
+		if (ctx->screen_res) {
+			GF_FilterSessionCaps caps;
+			gf_filter_get_session_caps(ctx->filter, &caps);
+			gf_dash_set_max_resolution(ctx->dash, caps.max_screen_width, caps.max_screen_height, caps.max_screen_bpp);
+		}
+		return GF_TRUE;
+	case GF_FEVT_INFO_UPDATE:
+		//propagate
+		return GF_FALSE;
+	default:
+		break;
+	}
+
+	//by default cancel all events
+	return GF_TRUE;
+}
+
+static void dashdmx_switch_segment(GF_DASHDmxCtx *ctx, GF_DASHGroup *group)
+{
+	u32 dependent_representation_index = 0;
+	GF_Err e;
+	Bool has_next;
+	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;
+
+	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)
+			gf_dash_group_discard_segment(ctx->dash, group->idx);
+
+		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)) {
+			return;
+		}
+	}
+#endif
+
+	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-
+		}
+	}
+	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);
+
+	if (e == GF_EOS) {
+		group->eos_detected = GF_TRUE;
+		return;
+	}
+	group->eos_detected = GF_FALSE;
+
+	if (e != GF_OK) {
+		if (e == GF_BUFFER_TOO_SMALL) {
+			group->seg_was_not_ready = GF_TRUE;
+			group->stats_uploaded = GF_TRUE;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASHDmx] group %d next segment name not known yet!\n", group->idx));
+			gf_filter_ask_rt_reschedule(ctx->filter, 10000);
+//			gf_filter_post_process_task(ctx->filter);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASHDmx] group %d error fetching next segment name: %s\n", group->idx, gf_error_to_string(e) ));
+		}
+		return;
+	}
+
+	if (group->nb_group_deps) {
+		group->current_group_dep++;
+		if (group->current_group_dep>group->nb_group_deps)
+			group->current_group_dep = 0;
+	}
+
+	assert(next_url);
+	group->seg_was_not_ready = GF_FALSE;
+
+	if (next_url_init_or_switch_segment && !group->init_switch_seg_sent) {
+		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.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->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);
+}
+
+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;
+
+	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;
+	}
+	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;
+	}
+
+	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_filter_release_property(pe);
+}
+
+GF_Err dashdmx_process(GF_Filter *filter)
+{
+	u32 i, count;
+	GF_FilterPacket *pck;
+	GF_Err e;
+	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;
+
+	//reset group states and update stats
+	count = gf_dash_get_group_count(ctx->dash);
+	for (i=0; i<count; i++) {
+		GF_DASHGroup *group = gf_dash_get_group_udta(ctx->dash, i);
+		if (!group) continue;
+		group->nb_eos = 0;
+		if (group->eos_detected) check_eos = GF_TRUE;
+	}
+
+	if (!ctx->mpd_pid)
+		return GF_EOS;
+
+	//check MPD pid
+	pck = gf_filter_pid_get_packet(ctx->mpd_pid);
+	if (pck) {
+		gf_filter_pid_drop_packet(ctx->mpd_pid);
+	}
+	e = gf_dash_process(ctx->dash);
+	if (e == GF_IP_NETWORK_EMPTY) {
+		gf_filter_ask_rt_reschedule(filter, 100000);
+		return GF_OK;
+	}
+	if (e)
+		return e;
+
+	next_time_ms = gf_dash_get_min_wait_ms(ctx->dash);
+	if (next_time_ms>1000)
+		next_time_ms=1000;
+
+	//flush all media input
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid;
+		GF_DASHGroup *group;
+		if (ipid == ctx->mpd_pid) continue;
+		opid = gf_filter_pid_get_udta(ipid);
+		group = gf_filter_pid_get_udta(opid);
+
+		if (!group)
+			continue;
+
+		while (1) {
+			pck = gf_filter_pid_get_packet(ipid);
+			if (!group->is_playing) {
+				if (pck) {
+					gf_filter_pid_drop_packet(ipid);
+					continue;
+				}
+				break;
+			}
+
+			if (!pck) {
+				if (gf_filter_pid_is_eos(ipid) || !gf_filter_pid_is_playing(opid) || group->force_seg_switch) {
+					group->nb_eos++;
+
+					//wait until all our inputs are done
+					if (group->nb_eos == group->nb_pids) {
+						u32 j, nb_block = 0;
+						//check all pids in this group, postpone segment switch if blocking
+						for (j=0; j<count; 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;
+
+							if (gf_filter_pid_would_block(an_opid)) {
+								nb_block++;
+							}
+						}
+						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));
+							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));
+						for (j=0; j<count; 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;
+
+							if (gf_filter_pid_is_eos(an_ipid)) {
+								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_update_group_stats(ctx, group);
+						group->stats_uploaded = GF_TRUE;
+						group->force_seg_switch = GF_FALSE;
+						dashdmx_switch_segment(ctx, group);
+
+						gf_filter_prevent_blocking(filter, GF_FALSE);
+						if (group->eos_detected && !has_pck) check_eos = GF_TRUE;
+					}
+				}
+				else {
+					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) {
+					dashdmx_switch_segment(ctx, group);
+					gf_filter_prevent_blocking(filter, GF_FALSE);
+					if (group->eos_detected && !has_pck) check_eos = GF_TRUE;
+				}
+				break;
+			}
+			has_pck = GF_TRUE;
+			check_eos = GF_FALSE;
+			dashdmx_forward_packet(ctx, pck, ipid, opid, group);
+			group->wait_for_pck = GF_FALSE;
+			dashdmx_update_group_stats(ctx, group);
+		}
+	}
+
+	if (check_eos) {
+		Bool all_groups_done = GF_TRUE;
+		Bool groups_not_playing = GF_TRUE;
+		Bool is_in_last_period = gf_dash_in_last_period(ctx->dash, GF_TRUE);
+
+		//not last period, check if we are done playing all groups due to stop requests
+		if (!is_in_last_period && !ctx->nb_playing) {
+			Bool groups_done=GF_TRUE;
+			for (i=0; i<count; i++) {
+				GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+				GF_FilterPid *opid;
+				GF_DASHGroup *group;
+				if (ipid == ctx->mpd_pid) continue;
+				opid = gf_filter_pid_get_udta(ipid);
+				group = gf_filter_pid_get_udta(opid);
+				if (!group) continue;
+				if (!group->is_playing && group->eos_detected) continue;
+				groups_done=GF_FALSE;
+			}
+			if (groups_done)
+				is_in_last_period = GF_TRUE;
+		}
+
+		for (i=0; i<count; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			GF_FilterPid *opid;
+			GF_DASHGroup *group;
+			if (ipid == ctx->mpd_pid) continue;
+			opid = gf_filter_pid_get_udta(ipid);
+			group = gf_filter_pid_get_udta(opid);
+			//reset in progress
+			if (!group) {
+				all_groups_done = GF_FALSE;
+				continue;
+			}
+			if (group->is_playing)
+				groups_not_playing = GF_FALSE;
+
+			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)
+					gf_filter_pid_set_eos(opid);
+				else
+					all_groups_done = GF_FALSE;
+			}
+		}
+		if (all_groups_done) {
+			if (is_in_last_period || groups_not_playing)
+				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);
+					if (!group) continue;
+					group->nb_eos = 0;
+					group->eos_detected = GF_FALSE;
+				}
+
+				gf_dash_request_period_switch(ctx->dash);
+			}
+		}
+	}
+	if (gf_dash_is_in_setup(ctx->dash))
+		gf_filter_post_process_task(filter);
+	else if (next_time_ms) {
+		gf_filter_ask_rt_reschedule(filter, 1000 * next_time_ms);
+	}
+	return GF_OK;
+}
+
+static const char *dashdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	char *d = (char *)data;
+	char *res_dash, *res_m3u, *res_smooth;
+	char last_c = d[size-1];
+	d[size-1] = 0;
+	res_dash = strstr(data, "<MPD ");
+	res_m3u = strstr(data, "#EXTM3U");
+	res_smooth = strstr(data, "<SmoothStreamingMedia");
+	d[size-1] = last_c;
+
+	if (res_dash) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "application/dash+xml";
+	}
+	if (res_m3u) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "video/mpegurl";
+	}
+	if (res_smooth) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "application/vnd.ms-sstr+xml";
+	}
+	return NULL;
+}
+
+#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(store), "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"
+		"- 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},
+
+	{ 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(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(screen_res), "use screen resolution in selection phase", GF_PROP_BOOL, "yes", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(timeshift), "set initial timshift in ms (if >0) or in %% 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(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(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(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(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},
+	{0}
+};
+
+
+
+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_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 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, 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),
+};
+
+
+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.")
+	.private_size = sizeof(GF_DASHDmxCtx),
+	.initialize = dashdmx_initialize,
+	.finalize = dashdmx_finalize,
+	.args = DASHDmxArgs,
+	SETCAPS(DASHDmxCaps),
+	.flags = GF_FS_REG_REQUIRES_RESOLVER,
+	.configure_pid = dashdmx_configure_pid,
+	.process = dashdmx_process,
+	.process_event = dashdmx_process_event,
+	.probe_data = dashdmx_probe_data,
+	//we accept as many input pids as loaded by the session
+	.max_extra_pids = (u32) -1,
+};
+
+
+#endif //GPAC_DISABLE_DASH_CLIENT
+
+const GF_FilterRegister *dashdmx_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_DASH_CLIENT
+	return &DASHDmxRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dmx_gsf.c Added

@@ -0,0 +1,1273 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GPAC stream serializer 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/network.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/crypt.h>
+
+
+typedef struct
+{
+	u32 offset;
+	u32 size;
+} GSF_PacketFragment;
+
+typedef struct
+{
+	GF_FilterPacket *pck;
+	u8 *output;
+	u32 full_block_size, nb_bytes, recv_bytes;
+	Bool corrupted;
+	u16 frame_sn;
+	u8 pck_type;
+	u8 crypted;
+
+	u32 nb_frags, nb_alloc_frags, nb_recv_frags;
+	Bool complete;
+	GSF_PacketFragment *frags;
+
+} GSF_Packet;
+
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	GF_List *packets;
+
+	u32 idx;
+	u16 nb_pck;
+	u8 config_version;
+
+	u16 last_frame_sn;
+} GSF_Stream;
+
+typedef struct
+{
+	//opts
+	const char *magic;
+	GF_PropData key;
+	u32 pad, mq;
+
+
+	//only one output pid declared
+	GF_FilterPid *ipid;
+
+	GF_List *streams;
+
+	bin128 crypt_IV;
+	GF_Crypt *crypt;
+	u16 crypt_blocks, skip_blocks;
+
+	u32 nb_playing;
+	Double start_range;
+	Bool is_file;
+	u64 file_pos, file_size;
+	GF_Fraction64 duration;
+	Bool initial_play_done;
+
+	GF_BitStream *bs_r;
+	GF_BitStream *bs_pck;
+
+	//signaling stream
+	GSF_Stream *signal_st;
+
+	//where we store incoming packets
+	char *buffer;
+	u32 alloc_size, buf_size;
+
+	u32 missing_bytes;
+	Bool tuned;
+	Bool tune_error;
+	Bool use_seq_num;
+	Bool wait_for_play;
+
+	GF_List *pck_res;
+	Bool buffer_too_small;
+} GSF_DemuxCtx;
+
+
+typedef enum
+{
+	GFS_PCKTYPE_HDR=0,
+	GFS_PCKTYPE_PID_CONFIG,
+	GFS_PCKTYPE_PID_INFO_UPDATE,
+	GFS_PCKTYPE_PID_REMOVE,
+	GFS_PCKTYPE_PID_EOS,
+	GFS_PCKTYPE_PCK,
+
+	GFS_PCKTYPE_UNDEF1,
+	GFS_PCKTYPE_UNDEF2,
+	GFS_PCKTYPE_UNDEF3,
+	GFS_PCKTYPE_UNDEF4,
+	GFS_PCKTYPE_UNDEF5,
+	GFS_PCKTYPE_UNDEF6,
+	GFS_PCKTYPE_UNDEF7,
+	GFS_PCKTYPE_UNDEF8,
+	GFS_PCKTYPE_UNDEF9,
+	GFS_PCKTYPE_UNDEF10,
+
+	/*NO MORE PACKET TYPE AVAILABLE*/
+
+} GSF_PacketType;
+
+
+
+GF_Err gsfdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GSF_DemuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+
+		while (gf_list_count(ctx->streams)) {
+			GSF_Stream *st = gf_list_pop_back(ctx->streams);
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
+			gf_free(st);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+static Bool gsfdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterEvent fevt;
+	GSF_DemuxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->nb_playing && (ctx->start_range == evt->play.start_range)) {
+			return GF_TRUE;
+		}
+		ctx->nb_playing++;
+		ctx->wait_for_play = GF_FALSE;
+
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+//		safdmx_check_dur(ctx);
+
+		ctx->start_range = evt->play.start_range;
+		ctx->file_pos = 0;
+		if (ctx->duration.num) {
+			ctx->file_pos = (u64) (ctx->file_size * ctx->start_range);
+			ctx->file_pos *= ctx->duration.den;
+			ctx->file_pos /= ctx->duration.num;
+			if (ctx->file_pos>ctx->file_size) return GF_TRUE;
+		}
+
+		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;
+		}
+		//post a seek to 0 - we would need to build an index of AUs to find the next place to seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 0;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->nb_playing--;
+		//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 void gsfdmx_decrypt(GSF_DemuxCtx *ctx, char *data, u32 size)
+{
+	u32 pos=0;
+	u32 clear_tail = size%16;
+	u32 bytes_crypted = size - clear_tail;
+
+	if (!bytes_crypted) return;
+
+	gf_crypt_set_IV(ctx->crypt, ctx->crypt_IV, 16);
+	if (ctx->crypt_blocks && ctx->skip_blocks) {
+		u32 pattern_length = 16 * (ctx->crypt_blocks + ctx->skip_blocks);
+		u32 cryp_len = 16 * ctx->crypt_blocks;
+		while (bytes_crypted) {
+			gf_crypt_decrypt(ctx->crypt, data+pos, bytes_crypted >= cryp_len ? cryp_len : bytes_crypted);
+			if (bytes_crypted >= pattern_length) {
+				pos += pattern_length;
+				bytes_crypted -= pattern_length;
+			} else {
+				bytes_crypted = 0;
+			}
+		}
+	} else {
+		gf_crypt_decrypt(ctx->crypt, data, bytes_crypted);
+	}
+}
+
+static GFINLINE u32 gsfdmx_read_vlen(GF_BitStream *bs)
+{
+	if (!gf_bs_read_int(bs, 1))
+		return gf_bs_read_int(bs, 7);
+	if (!gf_bs_read_int(bs, 1))
+		return gf_bs_read_int(bs, 14);
+	if (!gf_bs_read_int(bs, 1))
+		return gf_bs_read_int(bs, 21);
+	if (!gf_bs_read_int(bs, 1))
+		return gf_bs_read_int(bs, 28);
+
+	return (u32) gf_bs_read_long_int(bs, 36);
+}
+
+static GF_Err gsfdmx_read_prop(GF_BitStream *bs, GF_PropertyValue *p)
+{
+	u32 len, len2, i;
+
+	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_BOOL:
+		p->value.boolean = gf_bs_read_u8(bs) ? 1 : 0;
+		break;
+	case GF_PROP_FRACTION:
+		p->value.frac.num = gsfdmx_read_vlen(bs);
+		p->value.frac.den = gsfdmx_read_vlen(bs);
+		break;
+	case GF_PROP_FRACTION64:
+		p->value.lfrac.num = gf_bs_read_u64(bs);
+		p->value.lfrac.den = gf_bs_read_u64(bs);
+		break;
+	case GF_PROP_FLOAT:
+		p->value.fnumber = FLT2FIX( gf_bs_read_float(bs) );
+		break;
+	case GF_PROP_DOUBLE:
+		p->value.number = gf_bs_read_double(bs);
+		break;
+	case GF_PROP_VEC2I:
+		p->value.vec2i.x = gsfdmx_read_vlen(bs);
+		p->value.vec2i.y = gsfdmx_read_vlen(bs);
+		break;
+	case GF_PROP_VEC2:
+		p->value.vec2.x = gf_bs_read_double(bs);
+		p->value.vec2.y = gf_bs_read_double(bs);
+		break;
+	case GF_PROP_VEC3I:
+		p->value.vec3i.x = gsfdmx_read_vlen(bs);
+		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:
+		p->type = GF_PROP_STRING_NO_COPY;
+		len = gsfdmx_read_vlen(bs);
+		p->value.string = gf_malloc(sizeof(char)*(len+1));
+		gf_bs_read_data(bs, p->value.string, len);
+		p->value.string[len]=0;
+		break;
+
+	case GF_PROP_DATA:
+	case GF_PROP_DATA_NO_COPY:
+	case GF_PROP_CONST_DATA:
+		p->type = GF_PROP_DATA_NO_COPY;
+		p->value.data.size = gsfdmx_read_vlen(bs);
+		p->value.data.ptr = gf_malloc(sizeof(char) * p->value.data.size);
+		gf_bs_read_data(bs, p->value.data.ptr, p->value.data.size);
+		break;
+
+	case GF_PROP_STRING_LIST:
+		p->value.string_list = gf_list_new();
+		len2 = gsfdmx_read_vlen(bs);
+		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);
+		}
+		break;
+
+	case GF_PROP_UINT_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_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"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	return GF_OK;
+}
+
+static GSF_Stream *gsfdmx_get_stream(GF_Filter *filter, GSF_DemuxCtx *ctx, u32 idx, u32 pkt_type)
+{
+	GSF_Stream *gst;
+	u32 i, count;
+
+	count = gf_list_count(ctx->streams);
+	for (i=0; i<count; i++) {
+		gst = gf_list_get(ctx->streams, i);
+		if (gst->idx == idx) return gst;
+	}
+
+	if ((pkt_type==GFS_PCKTYPE_PID_CONFIG) || (pkt_type==GFS_PCKTYPE_PID_INFO_UPDATE) ) {
+		GF_SAFEALLOC(gst, GSF_Stream);
+		if (!gst) return NULL;
+		gst->packets = gf_list_new();
+		gst->idx = idx;
+		gf_list_add(ctx->streams, gst);
+		gst->opid = gf_filter_pid_new(filter);
+		return gst;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFDemux] no stream found for idx %d\n", idx));
+	return NULL;
+}
+static GF_Err gsfdmx_parse_pid_info(GF_Filter *filter, GSF_DemuxCtx *ctx, GSF_Stream *gst, GSF_Packet *pck, Bool is_info_update)
+{
+	GF_Err e;
+	u32 nb_4cc_props=0;
+	u32 nb_str_props=0;
+	u32 i;
+	u8 cfg_version;
+	GF_BitStream *bs=NULL;
+
+	if (pck->crypted) {
+		gsfdmx_decrypt(ctx, pck->output, pck->full_block_size);
+	}
+	e = gf_bs_reassign_buffer(ctx->bs_pck, pck->output, pck->full_block_size);
+	if (e) return e;
+	bs = ctx->bs_pck;
+
+	cfg_version = gf_bs_read_u8(bs);
+	if ((gst->config_version == 1 + cfg_version) && !is_info_update)
+		return GF_OK;
+	gst->config_version = 1 + cfg_version;
+
+	nb_4cc_props = gsfdmx_read_vlen(bs);
+	nb_str_props = gsfdmx_read_vlen(bs);
+
+	for (i=0; i<nb_4cc_props; i++) {
+		GF_PropertyValue p;
+		u32 p4cc = gf_bs_read_u32(bs);
+
+		memset(&p, 0, sizeof(GF_PropertyValue));
+		p.type = gf_props_4cc_get_type(p4cc);
+		if (p.type==GF_PROP_FORBIDEN) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong GPAC property type for property 4CC %s\n", gf_4cc_to_str(p4cc) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		e = gsfdmx_read_prop(bs, &p);
+		if (e) return e;
+
+		if (is_info_update) gf_filter_pid_set_info(gst->opid, p4cc, &p);
+		else gf_filter_pid_set_property(gst->opid, p4cc, &p);
+	}
+	for (i=0; i<nb_str_props; i++) {
+		GF_PropertyValue p;
+
+		u32 len = gsfdmx_read_vlen(bs);
+		char *pname = gf_malloc(sizeof(char)*(len+1));
+		gf_bs_read_data(bs, pname, len);
+		pname[len]=0;
+
+		memset(&p, 0, sizeof(GF_PropertyValue));
+		p.type = gf_bs_read_u8(bs);
+
+		e = gsfdmx_read_prop(bs, &p);
+		if (e) {
+			gf_free(pname);
+			return e;
+		}
+		if (is_info_update) gf_filter_pid_set_info_dyn(gst->opid, pname, &p);
+		else gf_filter_pid_set_property_dyn(gst->opid, pname, &p);
+		gf_free(pname);
+	}
+	return GF_OK;
+}
+
+static GF_Err gsfdmx_tune(GF_Filter *filter, GSF_DemuxCtx *ctx, char *pck_data, u32 pck_size, Bool is_crypted)
+{
+	u32 len;
+	GF_BitStream *bs;
+	GF_Err e = gf_bs_reassign_buffer(ctx->bs_pck, pck_data, pck_size);
+	if (e) return e;
+	bs = ctx->bs_pck;
+
+	u32 sig = gf_bs_read_u32(bs);
+	if (sig != GF_4CC('G','S','5','F') ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong GPAC serialized signature %s, expecting \"GS5F\"\n", gf_4cc_to_str(sig) ));
+		ctx->tune_error = GF_TRUE;
+		return GF_NOT_SUPPORTED;
+	}
+	sig = gf_bs_read_u8(bs);
+	if (sig != 1) {
+		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;
+	}
+	if (is_crypted) {
+		if (pck_size<25) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong serialized header size %d, should be at least 25 bytes for encrypted streams\n", pck_size ));
+			ctx->tune_error = GF_TRUE;
+			return GF_NOT_SUPPORTED;
+		}
+		gf_bs_read_data(bs, ctx->crypt_IV, 16);
+		ctx->crypt_blocks = gf_bs_read_u16(bs);
+		ctx->skip_blocks = gf_bs_read_u16(bs);
+
+		if (!ctx->key.size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] stream is encrypted but no key provided\n" ));
+			ctx->tune_error = GF_TRUE;
+			return GF_BAD_PARAM;
+		}
+		ctx->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+		if (!ctx->crypt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] failed to create decryptor\n" ));
+			ctx->tune_error = GF_TRUE;
+			return GF_IO_ERR;
+		}
+		gf_crypt_init(ctx->crypt, ctx->key.ptr, ctx->crypt_IV);
+
+		gsfdmx_decrypt(ctx, pck_data+25, pck_size - 25);
+	}
+	ctx->use_seq_num = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 7);
+
+	//header:magic
+	len = gsfdmx_read_vlen(bs);
+	if (len) {
+		Bool wrongm=GF_FALSE;
+		char *magic = gf_malloc(sizeof(char)*len);
+		gf_bs_read_data(bs, magic, len);
+
+		if (ctx->magic && !memcmp(ctx->magic, magic, len)) wrongm = GF_TRUE;
+		if (!wrongm) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] wrong magic word in stream config\n" ));
+			ctx->tune_error = GF_TRUE;
+			gf_free(magic);
+			return GF_NOT_SUPPORTED;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[GSFDemux] tuning in stream, magic %s\n", magic));
+		gf_free(magic);
+ 	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[GSFDemux] tuning in stream\n"));
+	}
+
+	ctx->tuned = GF_TRUE;
+	return GF_OK;
+}
+
+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;
+	GSF_Packet *gpck = NULL;
+
+	if ((frame_sn>=0) || pck_frag) {
+		while (( gpck = gf_list_enum(gst->packets, &i))) {
+			if (gpck->frame_sn == frame_sn) {
+				assert(gpck->pck_type == pkt_type);
+				assert(gpck->full_block_size == frame_size);
+
+				break;
+			}
+			gpck = NULL;
+		}
+	}
+	if (!gpck) {
+		Bool inserted = GF_FALSE;
+		gpck = gf_list_pop_back(ctx->pck_res);
+		if (!gpck) {
+ 			GF_SAFEALLOC(gpck, GSF_Packet);
+ 			if (!gpck) return NULL;
+ 			gpck->nb_alloc_frags = 10;
+ 			gpck->frags = gf_malloc(sizeof(GSF_PacketFragment) * gpck->nb_alloc_frags);
+		}
+		gpck->frame_sn = frame_sn;
+		gpck->pck_type = pkt_type;
+		gpck->full_block_size = frame_size;
+		gpck->pck = gf_filter_pck_new_alloc(gst->opid, frame_size, &gpck->output);
+		memset(gpck->output, (u8) ctx->pad, sizeof(char) * gpck->full_block_size);
+
+		count = gf_list_count(gst->packets);
+		for (i=0; i<count; i++) {
+			GSF_Packet *apck = gf_list_get(gst->packets, i);
+
+			if ( ( (apck->frame_sn > frame_sn) && (apck->frame_sn - frame_sn <= 32768) )
+				|| ( (apck->frame_sn < frame_sn ) && (frame_sn - apck->frame_sn > 32768) )
+			) {
+				inserted = GF_TRUE;
+				gf_list_insert(gst->packets, gpck, i);
+			}
+		}
+		if (!inserted) gf_list_add(gst->packets, gpck);
+	}
+	return gpck;
+}
+
+static void gsfdmx_packet_append_frag(GSF_Packet *pck, u32 size, u32 offset)
+{
+	u32 i;
+	Bool inserted = GF_FALSE;
+	pck->recv_bytes += size;
+	pck->nb_recv_frags++;
+
+	assert(offset + size <= pck->full_block_size);
+
+	for (i=0; i<pck->nb_frags; i++) {
+		if ((pck->frags[i].offset <= offset) && (pck->frags[i].offset + pck->frags[i].size >= offset + size) ) {
+			return;
+		}
+
+		//insert fragment
+		if (pck->frags[i].offset > offset) {
+			if (pck->nb_frags==pck->nb_alloc_frags) {
+				pck->nb_alloc_frags *= 2;
+				pck->frags = gf_realloc(pck->frags, sizeof(GSF_PacketFragment)*pck->nb_alloc_frags);
+			}
+			memmove(&pck->frags[i+1], &pck->frags[i], sizeof(GSF_PacketFragment) * (pck->nb_frags - i)  );
+			pck->frags[i].offset = offset;
+			pck->frags[i].size = size;
+			pck->nb_bytes += size;
+			pck->nb_frags++;
+			inserted = GF_TRUE;
+			break;
+		}
+		//expand fragment
+		if (pck->frags[i].offset + pck->frags[i].size == offset) {
+			pck->frags[i].size += size;
+			pck->nb_bytes += size;
+			inserted = GF_TRUE;
+			break;
+		}
+	}
+
+	if (!inserted) {
+		if (pck->nb_frags==pck->nb_alloc_frags) {
+			pck->nb_alloc_frags *= 2;
+			pck->frags = gf_realloc(pck->frags, sizeof(GSF_PacketFragment)*pck->nb_alloc_frags);
+		}
+		pck->frags[pck->nb_frags].offset = offset;
+		pck->frags[pck->nb_frags].size = size;
+		pck->nb_frags++;
+		pck->nb_bytes += size;
+	}
+	if (pck->nb_bytes >= pck->full_block_size) {
+		if (pck->nb_bytes>pck->full_block_size) pck->corrupted=GF_TRUE;
+		pck->complete = GF_TRUE;
+	}
+}
+
+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;
+	s16 roll=0;
+	u8 carv=0;
+
+	//not yet setup
+	if (!gst || !gpck) return GF_NOT_FOUND;
+
+
+//	gsfdmx_flush_dst_pck(gst, GF_TRUE);
+
+	spos = (u32) gf_bs_get_position(bs);
+
+	//flags first byte: 1(has_dts) 1(has_cts) 1(has_dur) 1(cts_diff_neg) 2(ts_mode) 2(ts_diff_mode)
+	//flags second byte: 3(sap) 2(encrypted) 1(has_sample_deps) 1(has builtin props) 1(has_ext)
+	//if (ext) {
+	// 	flags third byte: 1(has_byteoffset) 1(corrupted) 1(seek) 1(has_carousel) 2(ilaced) 2(cktype)
+	// 	flags fourth byte: 1(au start) 1(au end) 1(has props) reserved(5)
+	//}
+	//if has_dts, dts on tsmodebits
+	//if has_cts, has_dts ? cts_diff on ts_diff_mode : cts on tsmodebits
+	//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_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]
+
+	//first flags byte
+	u8 has_dts = gf_bs_read_int(bs, 1);
+	u8 has_cts = gf_bs_read_int(bs, 1);
+	u8 has_dur = gf_bs_read_int(bs, 1);
+	u8 cts_diff_neg = gf_bs_read_int(bs, 1);
+	u8 tsmode = gf_bs_read_int(bs, 2);
+	u8 tsdiffmode = gf_bs_read_int(bs, 2);
+
+	u8 sap = gf_bs_read_int(bs, 3);
+	u8 crypt = gf_bs_read_int(bs, 2);
+	u8 has_dep = gf_bs_read_int(bs, 1);
+	u8 has_4cc_props = gf_bs_read_int(bs, 1);
+	u8 has_ext = gf_bs_read_int(bs, 1);
+
+	//default field values without ext
+	u8 has_bo = 0, corr = 0, seek = 0, has_carv = 0, interl = 0, cktype = 0, has_str_props = 0;
+	u8 is_start = 1, is_end = 1;
+	if (has_ext) {
+		has_bo = gf_bs_read_int(bs, 1);
+		corr = gf_bs_read_int(bs, 1);
+		seek = gf_bs_read_int(bs, 1);
+		has_carv = gf_bs_read_int(bs, 1);
+		interl = gf_bs_read_int(bs, 2);
+		cktype = gf_bs_read_int(bs, 2);
+
+		is_start = gf_bs_read_int(bs, 1);
+		is_end = gf_bs_read_int(bs, 1);
+		has_str_props = gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 5); //reserved
+	}
+
+	if (tsmode==3) tsmodebits = 64;
+	else if (tsmode==2) tsmodebits = 32;
+	else if (tsmode==1) tsmodebits = 24;
+	else tsmodebits = 16;
+
+	if (tsdiffmode==3) durmodebits = 32;
+	else if (tsdiffmode==2) durmodebits = 24;
+	else if (tsdiffmode==1) durmodebits = 16;
+	else durmodebits = 8;
+
+	if (has_dts) {
+		if (tsmode==3) dts = gf_bs_read_long_int(bs, tsmodebits);
+		else dts = gf_bs_read_int(bs, tsmodebits);
+	}
+	if (has_cts) {
+		if (has_dts) {
+			s32 cts_diff = gf_bs_read_int(bs, durmodebits);
+			if (cts_diff_neg) {
+				cts = dts - cts_diff;
+			} else {
+				cts = dts + cts_diff;
+			}
+		} else {
+			if (tsmode==3) cts = gf_bs_read_long_int(bs, tsmodebits);
+			else cts = gf_bs_read_int(bs, tsmodebits);
+		}
+	}
+
+	if (has_dur) {
+		dur = gf_bs_read_int(bs, durmodebits);
+	}
+
+	if (sap==GF_FILTER_SAP_4) {
+		roll = gf_bs_read_u16(bs);
+	}
+	if (has_dep)
+		dep_flags = gf_bs_read_u8(bs);
+
+	if (has_carv) {
+		carv = gf_bs_read_u8(bs);
+	}
+	if (has_bo) {
+		bo = gf_bs_read_u64(bs);
+	}
+
+	if (has_4cc_props) {
+		u32 nb_4cc = gsfdmx_read_vlen(bs);
+		while (nb_4cc) {
+			GF_Err e;
+			GF_PropertyValue p;
+			memset(&p, 0, sizeof(GF_PropertyValue));
+			u32 p4cc = gf_bs_read_u32(bs);
+			p.type = gf_props_4cc_get_type(p4cc);
+			if (p.type==GF_PROP_FORBIDEN) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong GPAC property type for property 4CC %s\n", gf_4cc_to_str(p4cc) ));
+				gf_filter_pck_discard(gpck->pck);
+				gpck->pck = NULL;
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			nb_4cc--;
+
+			e = gsfdmx_read_prop(bs, &p);
+			if (e) {
+				gf_filter_pck_discard(gpck->pck);
+				gpck->pck = NULL;
+				return e;
+			}
+			gf_filter_pck_set_property(gpck->pck, p4cc, &p);
+		}
+	}
+	if (has_str_props) {
+		u32 nb_props = gsfdmx_read_vlen(bs);
+		while (nb_props) {
+			GF_Err e;
+			GF_PropertyValue p;
+			char *pname;
+			memset(&p, 0, sizeof(GF_PropertyValue));
+			u32 len = gsfdmx_read_vlen(bs);
+			pname = gf_malloc(sizeof(char)*(len+1) );
+			gf_bs_read_data(bs, pname, len);
+			pname[len] = 0;
+			p.type = gf_bs_read_u8(bs);
+			if (p.type==GF_PROP_FORBIDEN) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] Wrong GPAC property type for property %s\n", pname ));
+				gf_free(pname);
+				gf_filter_pck_discard(gpck->pck);
+				gpck->pck = NULL;
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			nb_props--;
+
+			e = gsfdmx_read_prop(bs, &p);
+			if (e) {
+				gf_filter_pck_discard(gpck->pck);
+				gf_free(pname);
+				gpck->pck = NULL;
+				return e;
+			}
+			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);
+		}
+	}
+
+	consummed = (u32) gf_bs_get_position(bs) - spos;
+	pck_len -= consummed;
+	if (full_pck) {
+		assert(gpck->full_block_size > consummed);
+		gpck->full_block_size -= consummed;
+		assert(gpck->full_block_size == pck_len);
+		gf_filter_pck_truncate(gpck->pck, gpck->full_block_size);
+	}
+	copy_size = gpck->full_block_size;
+	if (copy_size > pck_len)
+		copy_size = pck_len;
+	gf_bs_read_data(bs, gpck->output, copy_size);
+	gsfdmx_packet_append_frag(gpck, copy_size, 0);
+
+	gf_filter_pck_set_framing(gpck->pck, is_start, is_end);
+	if (has_dts) gf_filter_pck_set_dts(gpck->pck, dts);
+	if (has_cts) gf_filter_pck_set_cts(gpck->pck, cts);
+	if (has_dur) gf_filter_pck_set_duration(gpck->pck, dur);
+	if (has_bo) gf_filter_pck_set_byte_offset(gpck->pck, bo);
+	if (corr) gf_filter_pck_set_corrupted(gpck->pck, corr);
+	if (interl) gf_filter_pck_set_interlaced(gpck->pck, interl);
+	if (has_carv) gf_filter_pck_set_carousel_version(gpck->pck, carv);
+	if (has_dep) gf_filter_pck_set_dependency_flags(gpck->pck, dep_flags);
+	if (cktype) gf_filter_pck_set_clock_type(gpck->pck, cktype);
+	if (seek) gf_filter_pck_set_seek_flag(gpck->pck, seek);
+	if (crypt) gf_filter_pck_set_crypt_flags(gpck->pck, crypt);
+	if (sap) gf_filter_pck_set_sap(gpck->pck, sap);
+	if (sap==GF_FILTER_SAP_4) gf_filter_pck_set_roll_info(gpck->pck, roll);
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_LOG
+static const char *gsfdmx_pck_name(u32 pck_type)
+{
+	switch (pck_type) {
+	case GFS_PCKTYPE_HDR: return "TUNE";
+	case GFS_PCKTYPE_PID_CONFIG: return "CONFIG";
+	case GFS_PCKTYPE_PID_INFO_UPDATE: return "INFO";
+	case GFS_PCKTYPE_PID_REMOVE: return "PIDREM";
+	case GFS_PCKTYPE_PID_EOS: return "PIDEOS";
+	case GFS_PCKTYPE_PCK: return "PCK";
+	default: return "FORBIDDEN";
+	}
+}
+#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)
+{
+	while (gf_list_count(gst->packets)) {
+		GSF_Packet *gpck = gf_list_pop_front(gst->packets);
+
+		if (gpck->pck) {
+			if (is_flush && (gpck->pck_type == GFS_PCKTYPE_PCK)) {
+				gf_filter_pck_set_corrupted(gpck->pck, GF_TRUE);
+				gf_filter_pck_send(gpck->pck);
+			} else {
+				gf_filter_pck_discard(gpck->pck);
+			}
+		}
+		gsfdmx_pck_reset(gpck);
+		gf_list_add(ctx->pck_res, gpck);
+	}
+	if (is_flush)
+		gf_filter_pid_remove(gst->opid);
+
+	gf_list_del(gst->packets);
+	gf_list_del_item(ctx->streams, gst);
+	gf_free(gst);
+}
+
+static GF_Err gsfdmx_process_packets(GF_Filter *filter, GSF_DemuxCtx *ctx, GSF_Stream *gst)
+{
+	GSF_Packet *gpck;
+	GF_Err e;
+
+	if (ctx->tune_error) {
+		return GF_SERVICE_ERROR;
+	}
+	while (1) {
+		gpck = gf_list_get(gst->packets, 0);
+
+		if (!gpck)
+			return GF_OK;
+
+		if (!gpck->complete) {
+			u32 pck_count = gf_list_count(gst->packets);
+			if (ctx->mq && (pck_count > ctx->mq + 1)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFDemux] packets queue too large (%d vs %d max), processing incomplete packet size %d receive %d\n", pck_count, ctx->mq, gpck->full_block_size, gpck->nb_bytes));
+				gpck->corrupted = 1;
+			} else {
+				return GF_OK;
+			}
+		}
+		assert(gpck->pck);
+		if (ctx->use_seq_num) {
+			u32 frame_sn;
+			if (!gst->last_frame_sn) frame_sn = gpck->frame_sn;
+			else {
+				frame_sn = gst->last_frame_sn;
+				if (frame_sn>0xFFFF) frame_sn=0;
+			}
+			if (gpck->frame_sn != frame_sn) {
+				u32 pck_count = gf_list_count(gst->packets);
+				if (ctx->mq && (pck_count > 2*ctx->mq + 1)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFDemux] packets queue too large (%d vs %d max), missed one full packet\n", pck_count, 2*ctx->mq));
+				} else {
+					return GF_OK;
+				}
+			}
+			gst->last_frame_sn = gpck->frame_sn+1;
+		}
+
+		switch (gpck->pck_type) {
+		case GFS_PCKTYPE_PID_CONFIG:
+		case GFS_PCKTYPE_PID_INFO_UPDATE:
+			if (!gpck->corrupted)
+				e = gsfdmx_parse_pid_info(filter, ctx, gst, gpck, (gpck->pck_type==GFS_PCKTYPE_PID_INFO_UPDATE) ? GF_TRUE : GF_FALSE);
+			else
+				e = GF_CORRUPTED_DATA;
+			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
+			break;
+		case GFS_PCKTYPE_PID_REMOVE:
+			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
+			gsfdmx_stream_del(ctx, gst, GF_TRUE);
+			return GF_OK;
+
+		case GFS_PCKTYPE_PID_EOS:
+			if (gpck->pck) gf_filter_pck_discard(gpck->pck);
+			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);
+			break;
+		default:
+			e = GF_OK;
+			break;
+		}
+		gf_list_rem(gst->packets, 0);
+		gsfdmx_pck_reset(gpck);
+		gf_list_add(ctx->pck_res, gpck);
+		if (e>GF_OK) e = GF_OK;
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+static GF_Err gsfdmx_demux(GF_Filter *filter, GSF_DemuxCtx *ctx, char *data, u32 data_size)
+{
+	u32 last_pck_end=0;
+
+	//always reset input buffer if not tuned - since in reliable (pipe/file/...) this is the first packet and it is less than 40 bytes at max whe should be fine
+	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;
+	}
+
+	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
+		GF_Err e = GF_OK;
+		u32 pck_len, block_size, block_offset;
+#ifndef GPAC_DISABLE_LOG
+		u32 hdr_pos = (u32) gf_bs_get_position(ctx->bs_r);
+#endif
+		/*Bool reserved =*/ gf_bs_read_int(ctx->bs_r, 1);
+		u32 frag_flags = gf_bs_read_int(ctx->bs_r, 2);
+		Bool is_crypted = gf_bs_read_int(ctx->bs_r, 1);
+		u32 pck_type = gf_bs_read_int(ctx->bs_r, 4);
+#ifndef GPAC_DISABLE_LOG
+		u16 sn = 0;
+#endif
+		u32 st_idx;
+		Bool needs_agg = GF_FALSE;
+		u16 frame_sn = 0;
+		Bool has_sn = (pck_type==GFS_PCKTYPE_HDR) ? GF_FALSE : ctx->use_seq_num;
+
+		Bool full_pck = (frag_flags==0) ? GF_TRUE : GF_FALSE;
+		Bool pck_frag = (frag_flags>=2) ? GF_TRUE : GF_FALSE;
+
+		//reset buffer too small flag, and blindly parse the following vlen fields
+		ctx->buffer_too_small = GF_FALSE;
+
+		st_idx = gsfdmx_read_vlen(ctx->bs_r);
+		if (has_sn) {
+			frame_sn = gf_bs_read_u16(ctx->bs_r);
+		}
+
+		block_size = block_offset = 0;
+		if (!full_pck) {
+			block_size = gsfdmx_read_vlen(ctx->bs_r);
+			if (pck_frag) block_offset = gsfdmx_read_vlen(ctx->bs_r);
+		}
+
+		pck_len = gsfdmx_read_vlen(ctx->bs_r);
+		if (pck_len > gf_bs_available(ctx->bs_r)) {
+			break;
+		}
+		//buffer was not big enough to contain all the vlen fields, we need more data
+		if (ctx->buffer_too_small)
+			break;
+			
+		if (full_pck) {
+			block_size = pck_len;
+			block_offset = 0;
+		}
+
+		if ( (pck_type==GFS_PCKTYPE_PCK) && !ctx->nb_playing && ctx->tuned && gf_list_count(ctx->streams) ) {
+			ctx->wait_for_play = GF_TRUE;
+			break;
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFDemux] found %s on stream %d type %s cryped %d sn %d size %d block_offset %d, hdr size %d at position %d\n",
+					(pck_len==block_size) ? "full packet" : (pck_frag ? "packet fragment" : "packet start"),
+					st_idx,
+					gsfdmx_pck_name(pck_type),
+					is_crypted, sn, pck_len, block_offset, gf_bs_get_position(ctx->bs_r)-hdr_pos, hdr_pos));
+
+		e = GF_OK;
+
+		if ((pck_type != GFS_PCKTYPE_PCK) && (pck_frag || (pck_len < block_size)))
+			needs_agg = GF_TRUE;
+
+		//tunein, we don't care about the seq num (for now, might chenge if we want key roll or other order-dependent features)
+		if (!st_idx) {
+			if (ctx->tuned) {
+			} else if (needs_agg) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] tune-in packet shall not be fragmented\n"));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+			} else {
+				u32 pos = (u32) gf_bs_get_position(ctx->bs_r);
+				e = gsfdmx_tune(filter, ctx, ctx->buffer + pos, pck_len, is_crypted);
+			}
+		}
+		//stream signaling or packet
+		else {
+			u32 cur_pos = (u32) gf_bs_get_position(ctx->bs_r);
+
+			GSF_Stream *gst = gsfdmx_get_stream(filter, ctx, st_idx, pck_type);
+			if (!gst) {
+				e = GF_OK;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFDemux] cannot find stream idx %d\n", st_idx));
+			} else {
+				GSF_Packet *gpck = gsfdmx_get_packet(ctx, gst, pck_frag, frame_sn, pck_type, block_size);
+
+				//aggregate data
+				if (!gpck) {
+					e = GF_OUT_OF_MEM;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] cannot allocate packet\n"));
+				} else if (!gpck->pck) {
+					e = GF_CORRUPTED_DATA;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] lost first packet in frame, cannot reaggregate fragment\n"));
+				} else {
+					Bool append = GF_TRUE;
+
+					//packet: decrypt on per-packet base, and decode if not first fragment
+					if (pck_type==GFS_PCKTYPE_PCK) {
+						if (is_crypted) {
+							gsfdmx_decrypt(ctx, ctx->buffer + cur_pos, pck_len);
+						}
+						if (!pck_frag) {
+							gf_bs_reassign_buffer(ctx->bs_pck, ctx->buffer + cur_pos, pck_len);
+							e = gsfdmx_read_data_pck(ctx, gst, gpck, pck_len, full_pck, ctx->bs_pck);
+	 						append = GF_FALSE;
+						}
+					} else {
+						//otherwise decryption will happen upon decoding the complete packet
+						if (is_crypted) gpck->crypted = 1;
+					}
+
+					if (append) {
+						if (block_offset + pck_len > gpck->full_block_size) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFDemux] packet fragment out of bounds of current frame (offset %d size %d max size %d)\n", block_offset,  pck_len, gpck->full_block_size));
+							e = GF_NON_COMPLIANT_BITSTREAM;
+						} else {
+							//append fragment
+							memcpy(gpck->output + block_offset, ctx->buffer + cur_pos, pck_len);
+
+							gsfdmx_packet_append_frag(gpck, pck_len, block_offset);
+						}
+					}
+					if (!e)
+						e = gsfdmx_process_packets(filter, ctx, gst);
+				}
+			}
+		}
+
+		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;
+		}
+		gf_bs_skip_bytes(ctx->bs_r, pck_len);
+		last_pck_end = (u32) gf_bs_get_position(ctx->bs_r);
+	}
+
+	if (last_pck_end) {
+		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;
+	}
+	return GF_OK;
+}
+
+GF_Err gsfdmx_process(GF_Filter *filter)
+{
+	GF_Err e;
+	GSF_DemuxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GSF_Stream *st;
+	u32 i=0, pkt_size;
+	const char *data;
+	u32 would_block = 0;
+	Bool is_eos = GF_FALSE;
+
+	if (ctx->wait_for_play) return GF_OK;
+	if (ctx->tune_error) return GF_SERVICE_ERROR;
+
+	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;
+	}
+
+	//check if all the streams are in block state, if so return.
+	//we need to check for all output since one pid could still be buffering
+	while ((st = gf_list_enum(ctx->streams, &i))) {
+		if (st->opid) {
+			if (is_eos) {
+				gf_filter_pid_set_eos(st->opid);
+			} else if (gf_filter_pid_would_block(st->opid)) {
+				would_block++;
+			}
+		}
+	}
+	if (is_eos) return GF_EOS;
+
+	if (would_block && (would_block+1==i))
+		return GF_OK;
+
+	data = gf_filter_pck_get_data(pck, &pkt_size);
+	e = gsfdmx_demux(filter, ctx, (char *) data, pkt_size);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	if (ctx->tune_error)
+		gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
+
+	return e;
+}
+
+static const char *gsfdmx_probe_data(const u8 *data, u32 data_size, GF_FilterProbeScore *score)
+{
+	u32 avail = data_size;
+	if (data_size < 10) return NULL;
+	char *buf = (char *) data;
+	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)) {
+			*score = GF_FPROBE_SUPPORTED;
+			return "application/x-gpac-sf";
+		}
+		buf = start_sig+1;
+		avail = data_size - (u32) ( buf - (char *) data);
+	}
+	return NULL;
+}
+
+static void gsfdmx_not_enough_bytes(void *par)
+{
+	GSF_DemuxCtx *ctx = (GSF_DemuxCtx *)par;
+	if (ctx)
+		ctx->buffer_too_small = GF_TRUE;
+}
+
+static GF_Err gsfdmx_initialize(GF_Filter *filter)
+{
+	GSF_DemuxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	if (!ctx->streams) return GF_OUT_OF_MEM;
+	ctx->bs_r = gf_bs_new((char *) ctx, 1, GF_BITSTREAM_READ);
+	gf_bs_set_eos_callback(ctx->bs_r, gsfdmx_not_enough_bytes, ctx);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode())
+		gsfdmx_not_enough_bytes(NULL);
+#endif
+
+	ctx->bs_pck = gf_bs_new((char *) ctx, 1, GF_BITSTREAM_READ);
+	ctx->pck_res = gf_list_new();
+	return GF_OK;
+}
+
+static void gsfdmx_finalize(GF_Filter *filter)
+{
+	GSF_DemuxCtx *ctx = gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->streams)) {
+		GSF_Stream *gst = gf_list_pop_back(ctx->streams);
+		gsfdmx_stream_del(ctx, gst, GF_FALSE);
+	}
+	gf_list_del(ctx->streams);
+
+	while (gf_list_count(ctx->pck_res)) {
+		GSF_Packet *gsp = gf_list_pop_back(ctx->pck_res);
+		if (gsp->frags) gf_free(gsp->frags);
+		gf_free(gsp);
+	}
+	gf_list_del(ctx->pck_res);
+
+	if (ctx->crypt) gf_crypt_close(ctx->crypt);
+	if (ctx->buffer) gf_free(ctx->buffer);
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->bs_pck) gf_bs_del(ctx->bs_pck);
+}
+
+static const GF_FilterCapability GSFDemuxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "gsf"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-gpac-sf"),
+	//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_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GSF_DemuxCtx, _n)
+static const GF_FilterArgs GSFDemuxArgs[] =
+{
+	{ OFFS(key), "key for decrypting packets", GF_PROP_DATA, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(magic), "magic string to check in setup packet", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(mq), "set max packet queue length for loss detection. 0 will flush incomplete packet when a new one starts", GF_PROP_UINT, "4", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pad), "byte value used to pad lost packets", GF_PROP_UINT, "0", "0-255", GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+GF_FilterRegister GSFDemuxRegister = {
+	.name = "gsfdmx",
+	GF_FS_SET_DESCRIPTION("GSF Demuxer")
+	GF_FS_SET_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"
+			"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"
+			"The stream format can be encrypted in AES 128 CBC mode, in which case the demux filters must be given a 128 bit key.")
+	.private_size = sizeof(GSF_DemuxCtx),
+	.max_extra_pids = (u32) -1,
+	.args = GSFDemuxArgs,
+	.flags = GF_FS_REG_DYNAMIC_PIDS,
+	SETCAPS(GSFDemuxCaps),
+	.initialize = gsfdmx_initialize,
+	.finalize = gsfdmx_finalize,
+	.configure_pid = gsfdmx_configure_pid,
+	.process = gsfdmx_process,
+	.process_event = gsfdmx_process_event,
+	.probe_data = gsfdmx_probe_data,
+};
+
+
+const GF_FilterRegister *gsfdmx_register(GF_FilterSession *session)
+{
+	return &GSFDemuxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/dmx_m2ts.c Added

@@ -0,0 +1,1081 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / M2TS demux 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>
+
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+#include <gpac/mpegts.h>
+#include <gpac/thread.h>
+
+typedef struct {
+	char *fragment;
+	u32 id;
+	/*if only pid is requested*/
+	u32 pid;
+} GF_M2TSDmxCtx_Prog;
+
+enum
+{
+	DMX_TUNE_DONE=0,
+	DMX_TUNE_INIT,
+	DMX_TUNE_WAIT_PROGS,
+	DMX_TUNE_WAIT_SEEK,
+
+};
+
+typedef struct
+{
+	//opts
+	const char *temi_url;
+	Bool dsmcc, seeksrc;
+
+	GF_Filter *filter;
+	GF_FilterPid *ipid;
+
+	GF_M2TS_Demuxer *ts;
+
+	GF_FilterPid *eit_pid;
+
+	Bool is_file;
+	u64 file_size;
+	Bool in_seek;
+	Bool initial_play_done;
+	u32 nb_playing;
+
+	//duration estimation
+	GF_Fraction64 duration;
+	u64 first_pcr_found;
+	u16 pcr_pid;
+	u64 nb_pck_at_pcr;
+
+	u32 map_time_on_prog_id;
+	Double media_start_range;
+
+	u32 mux_tune_state;
+	u32 wait_for_progs;
+} GF_M2TSDmxCtx;
+
+
+static void m2tsdmx_estimate_duration(GF_M2TSDmxCtx *ctx, GF_M2TS_ES *stream)
+{
+	Bool changed;
+	Double pck_dur;
+	const GF_PropertyValue *p;
+
+	if (ctx->duration.num) return;
+	if (!ctx->file_size) {
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+		if (p) {
+			ctx->file_size = p->value.longuint;
+		} else {
+			ctx->duration.num = 1;
+			return;
+		}
+	}
+
+	if (!ctx->first_pcr_found) {
+		ctx->first_pcr_found = stream->program->last_pcr_value;
+		ctx->pcr_pid = stream->pid;
+		ctx->nb_pck_at_pcr = ctx->ts->pck_number;
+		return;
+	}
+	if (ctx->pcr_pid != stream->pid) return;
+	if (stream->program->last_pcr_value < ctx->first_pcr_found) {
+		ctx->first_pcr_found = stream->program->last_pcr_value;
+		ctx->pcr_pid = stream->pid;
+		ctx->nb_pck_at_pcr = ctx->ts->pck_number;
+		return;
+	}
+	if (stream->program->last_pcr_value - ctx->first_pcr_found <= 2*27000000)
+		return;
+
+	changed = GF_FALSE;
+
+	pck_dur = (Double) (stream->program->last_pcr_value - ctx->first_pcr_found);
+	pck_dur /= (ctx->ts->pck_number - ctx->nb_pck_at_pcr);
+	pck_dur /= 27000;
+
+	pck_dur *= ctx->file_size;
+	pck_dur /= ctx->ts->prefix_present ? 192 : 188;
+	if ((u32) ctx->duration.num != (u32) pck_dur) {
+		ctx->duration.num = (s32) pck_dur;
+		ctx->duration.den = 1000;
+		changed = GF_TRUE;
+	}
+	ctx->first_pcr_found = stream->program->last_pcr_value;
+	ctx->pcr_pid = stream->pid;
+	ctx->nb_pck_at_pcr = ctx->ts->pck_number;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TSDmx] Estimated duration based on instant bitrate: %g sec\n", pck_dur/1000));
+
+	if (changed) {
+		u32 i, nb_streams = gf_filter_get_opid_count(ctx->filter);
+		for (i=0; i<nb_streams; i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(ctx->filter, i);
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DURATION, &PROP_FRAC64(ctx->duration) );
+		}
+	}
+}
+
+static void m2tsdmx_on_event_duration_probe(GF_M2TS_Demuxer *ts, u32 evt_type, void *param)
+{
+	GF_Filter *filter = (GF_Filter *) ts->user;
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (evt_type == GF_M2TS_EVT_PES_PCR) {
+		GF_M2TS_PES_PCK *pck = ((GF_M2TS_PES_PCK *) param);
+
+		if (pck->stream) m2tsdmx_estimate_duration(ctx, (GF_M2TS_ES *) pck->stream);
+	}
+}
+
+static void m2tsdmx_declare_pid(GF_M2TSDmxCtx *ctx, GF_M2TS_PES *stream, GF_ESD *esd)
+{
+	u32 i, count, codecid=0, 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;
+	char szName[20];
+	const char *stname;
+	if (stream->user) return;
+
+	if (stream->flags & GF_M2TS_GPAC_CODEC_ID) {
+		codecid = stream->stream_type;
+		stype = gf_codecid_type(codecid);
+		unframed = GF_TRUE;
+		if (!stype) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TSDmx] Unrecognized gpac codec %s - ignoring pid\n", gf_4cc_to_str(codecid) ));
+			return;
+		}
+	} else {
+
+		switch (stream->stream_type) {
+		case GF_M2TS_VIDEO_MPEG1:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_MPEG1;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_MPEG2:
+		case GF_M2TS_VIDEO_DCII:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_MPEG2_MAIN;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_MPEG4:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_MPEG4_PART2;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_H264:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_AVC;
+			unframed = GF_TRUE;
+			if (stream->program->is_scalable)
+				has_scal_layer = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_SVC:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_SVC;
+			has_scal_layer = GF_TRUE;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_HEVC:
+		case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+		case GF_M2TS_VIDEO_HEVC_MCTS:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_HEVC;
+			unframed = GF_TRUE;
+			if (stream->program->is_scalable)
+				has_scal_layer = GF_TRUE;
+			break;
+		case GF_M2TS_VIDEO_SHVC:
+		case GF_M2TS_VIDEO_SHVC_TEMPORAL:
+		case GF_M2TS_VIDEO_MHVC:
+		case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+			stype = GF_STREAM_VISUAL;
+			codecid = GF_CODECID_LHVC;
+			has_scal_layer = GF_TRUE;
+			break;
+		case GF_M2TS_AUDIO_MPEG1:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_MPEG_AUDIO;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_AUDIO_MPEG2:
+			stype = GF_STREAM_AUDIO;
+			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:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_AAC_MPEG4;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_AUDIO_AC3:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_AC3;
+			unframed = GF_TRUE;
+			break;
+		case GF_M2TS_AUDIO_EC3:
+			stype = GF_STREAM_AUDIO;
+			codecid = GF_CODECID_EAC3;
+			break;
+		case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
+			((GF_M2TS_ES*)stream)->flags |= GF_M2TS_ES_SEND_REPEATED_SECTIONS;
+			//fallthrough
+		case GF_M2TS_SYSTEMS_MPEG4_PES:
+			if (!esd) {
+				m4sys_iod_stream = GF_TRUE;
+				count = gf_list_count(stream->program->pmt_iod->ESDescriptors);
+				for (i=0; i<count; i++) {
+					esd = gf_list_get(stream->program->pmt_iod->ESDescriptors, i);
+					if (esd->ESID == stream->mpeg4_es_id) break;
+					esd = NULL;
+				}
+			}
+			m4sys_stream = GF_TRUE;
+			//cannot setup stream yet
+			if (!esd) return;
+			break;
+		case GF_M2TS_METADATA_PES:
+		case GF_M2TS_METADATA_ID3_HLS:
+			stype = GF_STREAM_METADATA;
+			codecid = GF_CODECID_SIMPLE_TEXT;
+			break;
+		case 0xA1:
+			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));
+			return;
+		}
+	}
+
+	opid = gf_filter_pid_new(ctx->filter);
+	stream->user = opid;
+	stream->flags |= GF_M2TS_ES_ALREADY_DECLARED;
+
+	stname = gf_stream_type_name(stype);
+	sprintf(szName, "P%d%c%d", stream->program->number, stname[0], 1+gf_list_find(stream->program->streams, stream));
+	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) );
+
+	if (m4sys_stream) {
+		if (stream->slcfg) gf_free(stream->slcfg);
+
+		stream->slcfg = esd->slConfig;
+		esd->slConfig = NULL;
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(esd->decoderConfig ? esd->decoderConfig->streamType : GF_STREAM_SCENE) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, &PROP_UINT(esd->decoderConfig ? esd->decoderConfig->objectTypeIndication : GF_CODECID_BIFS) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(esd->OCRESID ? esd->OCRESID : esd->ESID) );
+		gf_filter_pid_set_property(opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(esd->dependsOnESID) );
+		if (esd->decoderConfig && esd->decoderConfig->decoderSpecificInfo  && esd->decoderConfig->decoderSpecificInfo->dataLength)
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength) );
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_IN_IOD, &PROP_BOOL(m4sys_iod_stream) );
+
+		gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(((GF_M2TS_ES*)stream)->slcfg->timestampResolution) );
+		if (esd->decoderConfig && (esd->decoderConfig->streamType==GF_STREAM_OD))
+			stream->flags |= GF_M2TS_ES_IS_MPEG4_OD;
+	} 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_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_SERVICE_ID, &PROP_UINT(stream->program->number) );
+
+	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 ) );
+	}
+	/*indicate our coding dependencies if any*/
+	if (!m4sys_stream) {
+		if (stream->depends_on_pid) {
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(stream->depends_on_pid) );
+			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) );
+			}
+		}
+	}
+	gf_m2ts_set_pes_framing((GF_M2TS_PES *)stream, GF_M2TS_PES_FRAMING_DEFAULT);
+}
+
+static void m2tsdmx_setup_program(GF_M2TSDmxCtx *ctx, GF_M2TS_Program *prog)
+{
+	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;
+		if (! (es->flags & GF_M2TS_ES_IS_PES)) continue;
+
+		if (es->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL ) continue;
+		if (es->depends_on_pid ) {
+			prog->is_scalable = GF_TRUE;
+			break;
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		u32 ncount;
+		GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+		if (es->pid==prog->pmt_pid) continue;
+
+		if (! (es->flags & GF_M2TS_ES_ALREADY_DECLARED)) {
+			m2tsdmx_declare_pid(ctx, (GF_M2TS_PES *)es, NULL);
+		}
+		ncount = gf_list_count(prog->streams);
+		while (ncount<count) {
+			i--;
+			count--;
+		}
+	}
+}
+
+static void m2tsdmx_send_packet(GF_M2TSDmxCtx *ctx, GF_M2TS_PES_PCK *pck)
+{
+	GF_FilterPid *opid;
+	GF_FilterPacket *dst_pck;
+	u8 * data;
+
+	/*pcr not initialized, don't send any data*/
+//	if (! pck->stream->program->first_dts) return;
+	if (!pck->stream->user) return;
+	opid = pck->stream->user;
+
+	dst_pck = gf_filter_pck_new_alloc(opid, pck->data_len, &data);
+	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);
+
+	if (pck->flags & GF_M2TS_PES_PCK_AU_START) {
+		gf_filter_pck_set_cts(dst_pck, pck->PTS);
+		if (pck->DTS != pck->PTS) {
+			gf_filter_pck_set_dts(dst_pck, pck->DTS);
+		}
+		gf_filter_pck_set_sap(dst_pck, (pck->flags & GF_M2TS_PES_PCK_RAP) ? GF_FILTER_SAP_1 : GF_FILTER_SAP_NONE);
+	}
+	gf_filter_pck_send(dst_pck);
+}
+
+static GF_M2TS_ES *m2tsdmx_get_m4sys_stream(GF_M2TSDmxCtx *ctx, u32 m4sys_es_id)
+{
+	u32 i, j, count, count2;
+	count = gf_list_count(ctx->ts->programs);
+	for (i=0; i<count; i++) {
+		GF_M2TS_Program *prog = gf_list_get(ctx->ts->programs, i);
+		count2 = gf_list_count(prog->streams);
+		for (j=0; j<count2; j++) {
+			GF_M2TS_ES *pes = (GF_M2TS_ES *)gf_list_get(prog->streams, j);
+			if (pes->mpeg4_es_id == m4sys_es_id) return pes;
+		}
+	}
+	return NULL;
+}
+static GFINLINE void m2tsdmx_send_sl_packet(GF_M2TSDmxCtx *ctx, GF_M2TS_SL_PCK *pck)
+{
+	GF_SLConfig *slc = ((GF_M2TS_ES*)pck->stream)->slcfg;
+	GF_FilterPid *opid;
+	GF_FilterPacket *dst_pck;
+	u8 * data;
+	Bool start, end;
+	GF_SLHeader slh;
+	u32 slh_len = 0;
+
+	if (!pck->stream->user) return;
+	opid = pck->stream->user;
+
+	/*depacketize SL Header*/
+	if (((GF_M2TS_ES*)pck->stream)->slcfg) {
+		gf_sl_depacketize(slc, &slh, pck->data, pck->data_len, &slh_len);
+		slh.m2ts_version_number_plus_one = pck->version_number + 1;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDmx] MPEG-4 SL-packetized stream without SLConfig assigned - ignoring packet\n") );
+		return;
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(opid, pck->data_len - slh_len, &data);
+	memcpy(data, pck->data + slh_len, pck->data_len - slh_len);
+	start = end = GF_FALSE;
+	if (slc->useAccessUnitStartFlag && slh.accessUnitStartFlag) start = GF_TRUE;
+	if (slc->useAccessUnitEndFlag && slh.accessUnitEndFlag) end = GF_TRUE;
+	gf_filter_pck_set_framing(dst_pck, start, end);
+
+	if (slc->useTimestampsFlag && slh.decodingTimeStampFlag)
+		gf_filter_pck_set_dts(dst_pck, slh.decodingTimeStamp);
+
+	if (slc->useTimestampsFlag && slh.compositionTimeStampFlag)
+		gf_filter_pck_set_cts(dst_pck, slh.compositionTimeStamp);
+
+	if (slc->hasRandomAccessUnitsOnlyFlag || slh.randomAccessPointFlag)
+		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+
+	gf_filter_pck_set_carousel_version(dst_pck, pck->version_number);
+
+	gf_filter_pck_send(dst_pck);
+
+	if (pck->version_number + 1 == pck->stream->slcfg->carousel_version)
+		return;
+	pck->stream->slcfg->carousel_version = 1 + pck->version_number;
+
+
+	if (pck->stream->flags & GF_M2TS_ES_IS_MPEG4_OD) {
+		/* We need to decode OD streams to get the SL config for other streams :( */
+		GF_ESD *esd;
+		GF_ODUpdate* odU;
+		GF_ESDUpdate* esdU;
+		u32 com_count, com_index, od_count, od_index, esd_index;
+		GF_ODCodec *od_codec = gf_odf_codec_new();
+
+		gf_odf_codec_set_au(od_codec, pck->data + slh_len, pck->data_len - slh_len);
+		gf_odf_codec_decode(od_codec);
+		com_count = gf_list_count(od_codec->CommandList);
+		for (com_index = 0; com_index < com_count; com_index++) {
+			GF_ODCom *com;
+			com = (GF_ODCom *)gf_list_get(od_codec->CommandList, com_index);
+			switch (com->tag) {
+			case GF_ODF_OD_UPDATE_TAG:
+				odU = (GF_ODUpdate*)com;
+				od_count = gf_list_count(odU->objectDescriptors);
+				for (od_index=0; od_index<od_count; od_index++) {
+					GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, od_index);
+					esd_index = 0;
+					while ( (esd = gf_list_enum(od->ESDescriptors, &esd_index)) ) {
+						GF_M2TS_ES *es = m2tsdmx_get_m4sys_stream(ctx, esd->ESID);
+
+						if (es && ! (es->flags & GF_M2TS_ES_ALREADY_DECLARED)) {
+							m2tsdmx_declare_pid(ctx, (GF_M2TS_PES *)es, esd);
+						}
+					}
+				}
+				break;
+			case GF_ODF_ESD_UPDATE_TAG:
+				esdU = (GF_ESDUpdate*)com;
+				esd_index = 0;
+				while ( (esd = gf_list_enum(esdU->ESDescriptors, &esd_index)) ) {
+					GF_M2TS_ES *es = m2tsdmx_get_m4sys_stream(ctx, esd->ESID);
+						if (es && ! (es->flags & GF_M2TS_ES_ALREADY_DECLARED)) {
+							m2tsdmx_declare_pid(ctx, (GF_M2TS_PES *)es, esd);
+						}
+				}
+				break;
+			}
+		}
+		gf_odf_codec_del(od_codec);
+	}
+}
+
+#ifdef FILTER_FIXME
+static void m2tsdmx_declare_epg_pid(GF_M2TSDmxCtx *ctx)
+{
+	assert(ctx->eit_pid == NULL);
+	ctx->eit_pid = gf_filter_pid_new(ctx->filter);
+	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_ID, &PROP_UINT(GF_M2TS_PID_EIT_ST_CIT) );
+	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_PRIVATE_SCENE) );
+	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_DVB_EIT) );
+	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
+	gf_filter_pid_set_property(ctx->eit_pid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(GF_M2TS_PID_EIT_ST_CIT) );
+}
+#endif
+
+static void m2tsdmx_on_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *param)
+{
+	u32 i, count;
+	GF_Filter *filter = (GF_Filter *) ts->user;
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt_type) {
+	case GF_M2TS_EVT_PAT_UPDATE:
+		break;
+	case GF_M2TS_EVT_AIT_FOUND:
+		break;
+	case GF_M2TS_EVT_PAT_FOUND:
+		if (ctx->mux_tune_state==DMX_TUNE_INIT) {
+			ctx->mux_tune_state = DMX_TUNE_WAIT_PROGS;
+			ctx->wait_for_progs = gf_list_count(ts->programs);
+		}
+		break;
+	case GF_M2TS_EVT_DSMCC_FOUND:
+		break;
+	case GF_M2TS_EVT_PMT_FOUND:
+		m2tsdmx_setup_program(ctx, param);
+		if (ctx->mux_tune_state == DMX_TUNE_WAIT_PROGS) {
+			assert(ctx->wait_for_progs);
+			ctx->wait_for_progs--;
+			if (!ctx->wait_for_progs) {
+				ctx->mux_tune_state = DMX_TUNE_WAIT_SEEK;
+			}
+		}
+		break;
+	case GF_M2TS_EVT_PMT_REPEAT:
+		break;
+	case GF_M2TS_EVT_PMT_UPDATE:
+		m2tsdmx_setup_program(ctx, param);
+		break;
+
+	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 ) );
+					}
+				}
+			}
+		}
+		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);
+		}
+		break;
+	case GF_M2TS_EVT_PES_PCK:
+		if (ctx->mux_tune_state) break;
+		m2tsdmx_send_packet(ctx, param);
+		break;
+	case GF_M2TS_EVT_SL_PCK: /* DMB specific */
+		if (ctx->mux_tune_state) break;
+		m2tsdmx_send_sl_packet(ctx, param);
+		break;
+	case GF_M2TS_EVT_PES_PCR:
+		if (ctx->mux_tune_state) break;
+	{
+		u64 pcr;
+		Bool map_time = GF_FALSE;
+		GF_M2TS_PES_PCK *pck = ((GF_M2TS_PES_PCK *) param);
+		Bool discontinuity = ( ((GF_M2TS_PES_PCK *) param)->flags & GF_M2TS_PES_PCK_DISCONTINUITY) ? 1 : 0;
+
+		assert(pck->stream);
+		m2tsdmx_estimate_duration(ctx, (GF_M2TS_ES *) pck->stream);
+
+		if (ctx->map_time_on_prog_id && (ctx->map_time_on_prog_id==pck->stream->program->number)) {
+			map_time = GF_TRUE;
+		}
+
+		//we forward the PCR on each pid
+		pcr = ((GF_M2TS_PES_PCK *) param)->PTS;
+		pcr /= 300;
+		count = gf_list_count(pck->stream->program->streams);
+		for (i=0; i<count; i++) {
+			GF_FilterPacket *dst_pck;
+			GF_M2TS_PES *stream = gf_list_get(pck->stream->program->streams, i);
+			if (!stream->user) continue;
+
+			dst_pck = gf_filter_pck_new_shared(stream->user, NULL, 0, NULL);
+			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);
+			gf_filter_pck_send(dst_pck);
+
+			if (map_time) {
+				gf_filter_pid_set_info_str(stream->user, "time:timestamp", &PROP_LONGUINT(pcr) );
+				gf_filter_pid_set_info_str(stream->user, "time:media", &PROP_DOUBLE(ctx->media_start_range) );
+			}
+		}
+
+		if (map_time) {
+			ctx->map_time_on_prog_id = 0;
+		}
+	}
+		break;
+
+	case GF_M2TS_EVT_TDT:
+		if (ctx->mux_tune_state) break;
+	{
+		GF_M2TS_TDT_TOT *tdt = (GF_M2TS_TDT_TOT *)param;
+		u64 utc_ts = gf_net_get_utc_ts(tdt->year, tdt->month, tdt->day, tdt->hour, tdt->minute, tdt->second);
+		count = gf_list_count(ts->programs );
+		for (i=0; i<count; i++) {
+			GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
+			u32 j, count2 = gf_list_count(prog->streams);
+			for (j=0; j<count2; j++) {
+				GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
+				if (stream->user) {
+					gf_filter_pid_set_info(stream->user, GF_PROP_PID_UTC_TIME, & PROP_LONGUINT(utc_ts) );
+					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",
+				                                       tdt->year, tdt->month, tdt->day, tdt->hour, tdt->minute, tdt->second, prog->last_pcr_value/300, prog->number));
+		}
+	}
+		break;
+	case GF_M2TS_EVT_TOT:
+		break;
+
+	case GF_M2TS_EVT_DURATION_ESTIMATED:
+	{
+		u64 duration = ((GF_M2TS_PES_PCK *) param)->PTS;
+		count = gf_list_count(ts->programs);
+		for (i=0; i<count; i++) {
+			GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
+			u32 j, count2;
+			count2 = gf_list_count(prog->streams);
+			for (j=0; j<count2; j++) {
+				GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
+				if (stream->user) {
+					gf_filter_pid_set_property(stream->user, GF_PROP_PID_DURATION, & PROP_FRAC64_INT(duration, 1000) );
+				}
+			}
+		}
+	}
+	break;
+
+#ifdef FILTER_FIXME
+	case GF_M2TS_EVT_TEMI_LOCATION:
+	{
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(com));
+		com.addon_info.command_type = GF_NET_ASSOCIATED_CONTENT_LOCATION;
+		com.addon_info.external_URL = ((GF_M2TS_TemiLocationDescriptor*)param)->external_URL;
+		if (ctx->force_temi_url)
+			com.addon_info.external_URL = ctx->force_temi_url;
+		com.addon_info.is_announce = ((GF_M2TS_TemiLocationDescriptor*)param)->is_announce;
+		com.addon_info.is_splicing = ((GF_M2TS_TemiLocationDescriptor*)param)->is_splicing;
+		com.addon_info.activation_countdown = ((GF_M2TS_TemiLocationDescriptor*)param)->activation_countdown;
+//		com.addon_info.reload_external = ((GF_M2TS_TemiLocationDescriptor*)param)->reload_external;
+		com.addon_info.timeline_id = ((GF_M2TS_TemiLocationDescriptor*)param)->timeline_id;
+		gf_service_command(ctx->service, &com, GF_OK);
+	}
+	break;
+	case GF_M2TS_EVT_TEMI_TIMECODE:
+	{
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(com));
+		com.addon_time.command_type = GF_NET_ASSOCIATED_CONTENT_TIMING;
+		com.addon_time.timeline_id = ((GF_M2TS_TemiTimecodeDescriptor*)param)->timeline_id;
+		com.addon_time.media_pts = ((GF_M2TS_TemiTimecodeDescriptor*)param)->pes_pts;
+		com.addon_time.media_timescale = ((GF_M2TS_TemiTimecodeDescriptor*)param)->media_timescale;
+		com.addon_time.media_timestamp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->media_timestamp;
+		com.addon_time.force_reload = ((GF_M2TS_TemiTimecodeDescriptor*)param)->force_reload;
+		com.addon_time.is_paused = ((GF_M2TS_TemiTimecodeDescriptor*)param)->is_paused;
+		com.addon_time.ntp = ((GF_M2TS_TemiTimecodeDescriptor*)param)->ntp;
+		gf_service_command(ctx->service, &com, GF_OK);
+	}
+	break;
+#endif
+	}
+}
+
+static GF_Err m2tsdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;;
+	FILE *stream = NULL;
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+//		gf_filter_pid_remove(ctx->opid);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	//by default for all URLs, send packets as soon as the program is configured
+	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) {
+		stream = gf_fopen(p->value.string, "rb");
+	}
+
+	if (stream) {
+		if (ctx->seeksrc) {
+			//for local file we will send a seek and stop once all programs are configured, and reparse from start
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+			if (p && p->value.string && gf_file_exists(p->value.string)) {
+				ctx->mux_tune_state = DMX_TUNE_INIT;
+			}
+		}
+		
+		ctx->ipid = pid;
+		ctx->is_file = GF_TRUE;
+		ctx->ts->seek_mode = GF_TRUE;
+		ctx->ts->on_event = m2tsdmx_on_event_duration_probe;
+		while (!gf_feof(stream)) {
+			char buf[1880];
+			u32 nb_read = (u32) gf_fread(buf, 1880, stream);
+			gf_m2ts_process_data(ctx->ts, buf, nb_read);
+			if (ctx->duration.num || (nb_read!=1880)) break;
+		}
+		gf_m2ts_demux_del(ctx->ts);
+		gf_fclose(stream);
+		ctx->ts = gf_m2ts_demux_new();
+		ctx->ts->on_event = m2tsdmx_on_event;
+		ctx->ts->user = filter;
+	} else if (!p) {
+		GF_FilterEvent evt;
+		ctx->duration.num = 1;
+
+		//not-file base TS, we need to start demuxing the first time we see the PID
+		if (!ctx->ipid) {
+			GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+			gf_filter_pid_send_event(pid, &evt);
+		}
+	}
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+
+static GF_M2TS_PES *m2tsdmx_get_stream(GF_M2TSDmxCtx *ctx, GF_FilterPid *pid)
+{
+	u32 i, j, count, count2;
+	count = gf_list_count(ctx->ts->programs);
+	for (i=0; i<count; i++) {
+		GF_M2TS_Program *prog = gf_list_get(ctx->ts->programs, i);
+		count2 = gf_list_count(prog->streams);
+		for (j=0; j<count2; j++) {
+			GF_M2TS_PES *pes = (GF_M2TS_PES *)gf_list_get(prog->streams, j);
+			if (pes->user == pid) return pes;
+		}
+	}
+	return NULL;
+}
+
+static void m2tsdmx_switch_quality(GF_M2TS_Program *prog, GF_M2TS_Demuxer *ts, Bool switch_up)
+{
+	GF_M2TS_ES *es;
+	u32 i, count;
+
+	if (!prog->is_scalable)
+		return;
+
+	if (switch_up) {
+		for (i = 0; i < GF_M2TS_MAX_STREAMS; i++) {
+			es = ts->ess[i];
+			if (es && (es->flags & GF_M2TS_ES_IS_PES) && (((GF_M2TS_PES *)es)->depends_on_pid == prog->pid_playing)) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn on ES%d\n", es->pid));
+				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_DEFAULT);
+				prog->pid_playing = es->pid;
+				return;
+			}
+		}
+	}
+	else {
+		count = gf_list_count(prog->streams);
+		for (i = 0; i < count; i++) {
+			es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
+			if (es && (es->pid == prog->pid_playing) && ((GF_M2TS_PES *)es)->depends_on_pid) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Turn off ES%d - playing ES%d\n", es->pid, ((GF_M2TS_PES *)es)->depends_on_pid));
+				gf_m2ts_set_pes_framing((GF_M2TS_PES *)ts->ess[es->pid], GF_M2TS_PES_FRAMING_SKIP);
+
+				//do we want to send a reset ?
+				prog->pid_playing = ((GF_M2TS_PES *)es)->depends_on_pid;
+				return;
+			}
+		}
+	}
+}
+
+static Bool m2tsdmx_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	GF_M2TS_PES *pes;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_M2TS_Demuxer *ts = ctx->ts;
+
+	if (com->base.type == GF_FEVT_QUALITY_SWITCH) {
+		u32 i, count;
+		count = gf_list_count(ts->programs);
+		for (i = 0; i < count; i++) {
+			GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs, i);
+			m2tsdmx_switch_quality(prog, ts, com->quality_switch.up);
+		}
+		//don't cancel event for RTP source
+		return GF_FALSE;
+	}
+
+		//don't cancel event for RTP source
+	if (!com->base.on_pid) return GF_FALSE;
+	switch (com->base.type) {
+	case GF_FEVT_PLAY:
+		pes = m2tsdmx_get_stream(ctx, com->base.on_pid);
+		if (!pes) {
+			if (com->base.on_pid == ctx->eit_pid) {
+				return GF_FALSE;
+			}
+			return GF_FALSE;
+		}
+		/*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, ("[GF_M2TSDmxCtx] Setting default reframing for PID %d\n", pes->pid));
+
+		/*this is a multplex, only trigger the play command for the first stream activated*/
+		ctx->nb_playing++;
+		if (ctx->nb_playing>1) return GF_TRUE;
+
+		//not file, don't cancel the event
+		if (!ctx->is_file) {
+			ctx->initial_play_done = GF_TRUE;
+			return GF_FALSE;
+		}
+
+		ctx->map_time_on_prog_id = pes->program->number;
+		ctx->media_start_range = com->play.start_range;
+
+
+		if (ctx->is_file && ctx->duration.num) {
+			file_pos = (u64) (ctx->file_size * com->play.start_range);
+			file_pos *= ctx->duration.den;
+			file_pos /= ctx->duration.num;
+			if (file_pos > ctx->file_size) return GF_TRUE;
+		}
+
+		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)
+				return GF_TRUE;
+		}
+
+		//file and seek, cancel the event and post a seek event to source
+		ctx->in_seek = GF_TRUE;
+		//we seek so consider the mux tuned in
+		ctx->mux_tune_state = DMX_TUNE_DONE;
+
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = file_pos;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		pes = m2tsdmx_get_stream(ctx, com->base.on_pid);
+		if (!pes) {
+			if (com->base.on_pid == ctx->eit_pid) {
+				return GF_FALSE;
+			}
+			return GF_FALSE;
+		}
+		/* In case of EOS, we may receive a stop command after no one is playing */
+		if (ctx->nb_playing)
+			ctx->nb_playing--;
+
+		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
+		//don't cancel event if still playing
+		return ctx->nb_playing ? GF_TRUE : GF_FALSE;
+
+	case GF_FEVT_PAUSE:
+	case GF_FEVT_RESUME:
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+}
+
+
+
+static GF_Err m2tsdmx_initialize(GF_Filter *filter)
+{
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	ctx->ts = gf_m2ts_demux_new();
+	if (!ctx->ts) return GF_OUT_OF_MEM;
+
+	ctx->ts->on_event = m2tsdmx_on_event;
+	ctx->ts->user = filter;
+
+	ctx->filter = filter;
+	if (ctx->dsmcc) {
+		gf_m2ts_demux_dmscc_init(ctx->ts);
+	}
+
+	return GF_OK;
+}
+
+
+static void m2tsdmx_finalize(GF_Filter *filter)
+{
+	GF_M2TSDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->ts) gf_m2ts_demux_del(ctx->ts);
+
+}
+
+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);
+	const char *data;
+	u32 size;
+
+	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);
+			for (i=0; i<nb_streams; i++) {
+				GF_FilterPid *opid = gf_filter_get_opid(filter, i);
+				gf_filter_pid_set_eos(opid);
+			}
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	//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 {
+		u32 i, nb_streams, would_block = 0;
+		nb_streams = gf_filter_get_opid_count(filter);
+		for (i=0; i<nb_streams; i++) {
+			GF_FilterPid *opid = gf_filter_get_opid(filter, i);
+			if ( gf_filter_pid_would_block(opid) ) {
+				would_block++;
+			}
+		}
+		if (would_block && (would_block==nb_streams))
+			return GF_OK;
+	}
+
+	data = gf_filter_pck_get_data(pck, &size);
+	if (data && size)
+		gf_m2ts_process_data(ctx->ts, (char*) data, size);
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	if (ctx->mux_tune_state==DMX_TUNE_WAIT_SEEK) {
+		GF_FilterEvent fevt;
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+		ctx->mux_tune_state = DMX_TUNE_DONE;
+		gf_m2ts_reset_parsers(ctx->ts);
+	}
+	return GF_OK;
+}
+
+static const char *m2tsdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (gf_m2ts_probe_data(data, size)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "video/mp2t";
+	}
+	return NULL;
+}
+
+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_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_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_M2TSDmxCtx, _n)
+static const GF_FilterArgs M2TSDmxArgs[] =
+{
+	{ 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},
+	{0}
+};
+
+
+GF_FilterRegister M2TSDmxRegister = {
+	.name = "m2tsdmx",
+	GF_FS_SET_DESCRIPTION("MPEG-2 TS demuxer")
+	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,
+	.finalize = m2tsdmx_finalize,
+	.args = M2TSDmxArgs,
+	.flags = GF_FS_REG_DYNAMIC_PIDS,
+	SETCAPS(M2TSDmxCaps),
+	.configure_pid = m2tsdmx_configure_pid,
+	.process = m2tsdmx_process,
+	.process_event = m2tsdmx_process_event,
+	.probe_data = m2tsdmx_probe_data,
+};
+
+
+#endif
+
+const GF_FilterRegister *m2tsdmx_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_MPEG2TS
+	return &M2TSDmxRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/dmx_mpegps.c Added

@@ -0,0 +1,493 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG Program Stream demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#ifndef GPAC_DISABLE_MPEG2PS
+#include "../media_tools/mpeg2_ps.h"
+#include <gpac/media_tools.h>
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 stream_type;
+	u32 stream_num;
+	Bool in_use;
+	u64 last_dts;
+} M2PSStream;
+
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+
+	const char *src_url;
+	mpeg2ps_t *ps;
+
+	Double start_range;
+	u64 first_dts;
+
+	u32 nb_playing;
+	GF_Fraction64 duration;
+	Bool in_seek;
+
+	GF_List *streams;
+	Bool initial_play_done;
+} GF_M2PSDmxCtx;
+
+static void m2psdmx_setup(GF_Filter *filter, GF_M2PSDmxCtx *ctx)
+{
+	u32 i, nb_streams;
+	u32 sync_id = 0;
+	Double fps;
+	GF_Fraction64 dur;
+
+	dur.den = 1000;
+	dur.num = (s32) mpeg2ps_get_max_time_msec(ctx->ps);
+
+	ctx->first_dts = mpeg2ps_get_first_cts(ctx->ps);
+
+	nb_streams = mpeg2ps_get_video_stream_count(ctx->ps);
+	for (i=0; i<nb_streams; i++) {
+		u32 par;
+		u32 id;
+		GF_Fraction frac;
+		M2PSStream *st = NULL;
+		u32 j, count = gf_list_count(ctx->streams);
+		for (j=0; j<count; j++) {
+			st = gf_list_get(ctx->streams, j);
+			if ((st->stream_type==GF_STREAM_VISUAL) && !st->in_use) break;
+			st = NULL;
+		}
+		if (!st) {
+			GF_SAFEALLOC(st, M2PSStream);
+			if (!st) continue;
+			st->opid = gf_filter_pid_new(filter);
+			st->stream_type = GF_STREAM_VISUAL;
+			gf_list_add(ctx->streams, st);
+		}
+		st->in_use = GF_TRUE;
+		st->stream_num = i;
+		id = 0x100 | mpeg2ps_get_video_stream_id(ctx->ps, st->stream_num);
+		if (!sync_id) sync_id = id;
+
+		gf_filter_pid_copy_properties(st->opid, ctx->ipid);
+		gf_filter_pid_set_name(st->opid, "Video");
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(st->stream_type) );
+		switch (mpeg2ps_get_video_stream_type(ctx->ps, st->stream_num)) {
+		case MPEG_VIDEO_MPEG1:
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_MPEG1) );
+			break;
+		case MPEG_VIDEO_MPEG2:
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_MPEG2_MAIN) );
+			break;
+		default:
+			break;
+		}
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT( id) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT( sync_id ) );
+
+		fps = mpeg2ps_get_video_stream_framerate(ctx->ps, i);
+		if (fps) {
+			gf_media_get_video_timing(fps, &frac.num, &frac.den);
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_FPS, &PROP_FRAC( frac ) );
+		}
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_WIDTH, &PROP_UINT( mpeg2ps_get_video_stream_width(ctx->ps, i) ) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_HEIGHT, &PROP_UINT( mpeg2ps_get_video_stream_height(ctx->ps, i) ) );
+		par = mpeg2ps_get_video_stream_aspect_ratio(ctx->ps, i);
+		if (par) {
+			frac.num = par>>16;
+			frac.den = (par&0xffff);
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_SAR, &PROP_FRAC( frac ) );
+		}
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, &PROP_FRAC64( dur ) );
+		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_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 ) );
+	}
+
+	nb_streams = mpeg2ps_get_audio_stream_count(ctx->ps);
+	for (i=0; i<nb_streams; i++) {
+		u32 id;
+		char szName[20];
+		M2PSStream *st = NULL;
+		u32 j, count = gf_list_count(ctx->streams);
+
+		if (mpeg2ps_get_audio_stream_type(ctx->ps, i) == MPEG_AUDIO_UNKNOWN) {
+			continue;
+		}
+
+		for (j=0; j<count; j++) {
+			st = gf_list_get(ctx->streams, j);
+			if ((st->stream_type==GF_STREAM_AUDIO) && !st->in_use) break;
+			st = NULL;
+		}
+		if (!st) {
+			GF_SAFEALLOC(st, M2PSStream);
+			if (!st) continue;
+			st->opid = gf_filter_pid_new(filter);
+			st->stream_type = GF_STREAM_AUDIO;
+			gf_list_add(ctx->streams, st);
+		}
+		st->in_use = GF_TRUE;
+		st->stream_num = i;
+		id = 0x100 | mpeg2ps_get_audio_stream_id(ctx->ps, st->stream_num);
+		if (!sync_id) sync_id = id;
+
+		gf_filter_pid_copy_properties(st->opid, ctx->ipid);
+		sprintf(szName, "Audio%d", i+1);
+		gf_filter_pid_set_name(st->opid, szName);
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(st->stream_type) );
+		switch (mpeg2ps_get_audio_stream_type(ctx->ps, st->stream_num)) {
+		case MPEG_AUDIO_MPEG:
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT( GF_CODECID_MPEG_AUDIO) );
+			break;
+		case MPEG_AUDIO_AC3:
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT( GF_CODECID_AC3) );
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL( GF_TRUE) );
+			break;
+		case MPEG_AUDIO_LPCM:
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_4CC('L','P','C','M') ) );
+			break;
+		default:
+			break;
+		}
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT( mpeg2ps_get_audio_stream_sample_freq(ctx->ps, i) ) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT( mpeg2ps_get_audio_stream_channels(ctx->ps, i) ) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_BITRATE, &PROP_UINT( mpeg2ps_get_audio_stream_bitrate(ctx->ps, i) ) );
+
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT( id) );
+		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_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_Err m2psdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i;
+	const GF_PropertyValue *p;
+	GF_M2PSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		while (gf_list_count(ctx->streams) ) {
+			M2PSStream *st = gf_list_pop_back(ctx->streams);
+			gf_filter_pid_remove(st->opid);
+			gf_free(st);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->ipid) {
+		GF_FilterEvent fevt;
+		ctx->ipid = pid;
+
+		//we work with full file only, send a play event on source to indicate that
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
+		fevt.play.start_range = 0;
+		fevt.base.on_pid = ctx->ipid;
+		fevt.play.full_file_only = GF_TRUE;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILEPATH);
+	if (!p) return GF_NOT_SUPPORTED;
+
+	if (ctx->src_url && !strcmp(ctx->src_url, p->value.string)) return GF_OK;
+
+	if (ctx->ps) {
+		mpeg2ps_close(ctx->ps);
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			M2PSStream *st = gf_list_get(ctx->streams, i);
+			st->in_use = GF_FALSE;
+		}
+	}
+	ctx->ps = NULL;
+
+	ctx->src_url = p->value.string;
+
+	return GF_OK;
+}
+
+static Bool m2psdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_M2PSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	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->start_range = evt->play.start_range;
+		gf_filter_post_process_task(filter);
+
+		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->start_range<0.5)
+				return GF_TRUE;
+		}
+
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			M2PSStream *pss = gf_list_get(ctx->streams, i);
+			if (pss->opid == evt->base.on_pid)
+				pss->in_use = GF_TRUE;
+			if (!pss->in_use) continue;
+
+			if (pss->stream_type==GF_STREAM_VISUAL) {
+				mpeg2ps_seek_video_frame(ctx->ps, pss->stream_num, (u64) (ctx->start_range*1000));
+			} else {
+				mpeg2ps_seek_audio_frame(ctx->ps, pss->stream_num, (u64) (ctx->start_range*1000) );
+			}
+		}
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->nb_playing--;
+		for (i=0; i<gf_list_count(ctx->streams); i++) {
+			M2PSStream *pss = gf_list_get(ctx->streams, i);
+			if (pss->opid == evt->base.on_pid)
+				pss->in_use = GF_FALSE;
+		}
+		//cancel event if not last stream playing
+		if (ctx->nb_playing) return GF_TRUE;
+
+		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;
+}
+
+GF_Err m2psdmx_process(GF_Filter *filter)
+{
+	GF_M2PSDmxCtx *ctx = gf_filter_get_udta(filter);
+	Bool start, end;
+	u32 i, count, nb_done;
+	if (!ctx->ps) {
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+		if (!pck) {
+			return GF_OK;
+		}
+		gf_filter_pck_get_framing(pck, &start, &end);
+		if (!end) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		gf_filter_pid_drop_packet(ctx->ipid);
+
+		ctx->ps = mpeg2ps_init(ctx->src_url);
+		if (!ctx->ps) {
+			GF_Err e = GF_NON_COMPLIANT_BITSTREAM;
+			if (! gf_file_exists(ctx->src_url)) e = GF_URL_ERROR;
+			gf_filter_setup_failure(filter, e);
+			return GF_NOT_SUPPORTED;
+		}
+		m2psdmx_setup(filter, ctx);
+	}
+	if (!ctx->nb_playing) return GF_OK;
+
+
+	nb_done = 0;
+	count = gf_list_count(ctx->streams);
+
+	if (ctx->in_seek) {
+		u64 seek_to = (u64) (1000*ctx->start_range);
+		for (i=0; i<count;i++) {
+			M2PSStream *st = gf_list_get(ctx->streams, i);
+			if (!st->in_use) continue;
+			if (st->stream_type==GF_STREAM_VISUAL) {
+				mpeg2ps_seek_video_frame(ctx->ps, st->stream_num, seek_to);
+			} else {
+				mpeg2ps_seek_audio_frame(ctx->ps, st->stream_num, seek_to);
+			}
+		}
+		ctx->in_seek = GF_FALSE;
+	}
+
+
+	for (i=0; i<count;i++) {
+		u8 *buf;
+		u32 buf_len;
+		u8 *pck_data;
+		GF_FilterPacket *dst_pck;
+		M2PSStream *st = gf_list_get(ctx->streams, i);
+		if (!st->in_use) {
+			nb_done++;
+			continue;
+		}
+
+		if (gf_filter_pid_would_block(st->opid)) continue;
+
+		if (st->stream_type==GF_STREAM_VISUAL) {
+			u8 ftype;
+			u64 dts, cts;
+			u32 res = mpeg2ps_get_video_frame(ctx->ps, st->stream_num, (u8 **) &buf, &buf_len, &ftype, TS_90000, &dts, &cts);
+			if (!res) {
+				nb_done++;
+				continue;
+			}
+
+			//bug in some streams, make sure we don't dispatch twice the same ts
+			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;
+			dst_pck = gf_filter_pck_new_alloc(st->opid, buf_len, &pck_data);
+			memcpy(pck_data, buf, buf_len);
+			if (ftype==1) gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+
+			if (cts != GF_FILTER_NO_TS) {
+				if (dts == GF_FILTER_NO_TS) dts = cts;
+				dts -= ctx->first_dts;
+				cts -= ctx->first_dts;
+				gf_filter_pck_set_dts(dst_pck, dts);
+				gf_filter_pck_set_cts(dst_pck, cts);
+				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
+			} else {
+				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+			}
+			gf_filter_pck_send(dst_pck);
+		} else {
+			u64 cts;
+			u32 res = mpeg2ps_get_audio_frame(ctx->ps, st->stream_num, (u8**)&buf, &buf_len, TS_90000, NULL, &cts);
+			if (!res) {
+				nb_done++;
+				continue;
+			}
+			dst_pck = gf_filter_pck_new_alloc(st->opid, buf_len, &pck_data);
+			memcpy(pck_data, buf, buf_len);
+			if (cts != GF_FILTER_NO_TS) {
+				cts -= ctx->first_dts;
+				gf_filter_pck_set_cts(dst_pck, cts);
+				gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
+			} else {
+				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+			}
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+
+			gf_filter_pck_send(dst_pck);
+		}
+	}
+
+	if (nb_done==count) {
+		for (i=0; i<count;i++) {
+			M2PSStream *st = gf_list_get(ctx->streams, i);
+			gf_filter_pid_set_eos(st->opid);
+		}
+		return GF_EOS;
+	}
+	return GF_OK;
+}
+
+GF_Err m2psdmx_initialize(GF_Filter *filter)
+{
+	GF_M2PSDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	return GF_OK;
+}
+
+void m2psdmx_finalize(GF_Filter *filter)
+{
+	GF_M2PSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		M2PSStream *st = gf_list_pop_back(ctx->streams);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	if (ctx->ps) mpeg2ps_close(ctx->ps);
+}
+
+static const char *m2psdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	*score = GF_FPROBE_EXT_MATCH;
+	return "mpg|mpeg|vob";
+}
+
+static const GF_FilterCapability M2PSDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mpg|mpeg|vob"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mpeg|audio/mpeg"),
+	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),
+};
+
+
+
+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.")
+	.private_size = sizeof(GF_M2PSDmxCtx),
+	.initialize = m2psdmx_initialize,
+	.finalize = m2psdmx_finalize,
+	SETCAPS(M2PSDmxCaps),
+	.configure_pid = m2psdmx_configure_pid,
+	.process = m2psdmx_process,
+	.process_event = m2psdmx_process_event,
+	.probe_data = m2psdmx_probe_data,
+	//this filter is not very reliable, prefer ffmpeg when available
+	.priority = 255
+};
+
+#endif // GPAC_DISABLE_MPEG2PS
+
+const GF_FilterRegister *m2psdmx_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_MPEG2PS
+	return &M2PSDmxRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_nhml.c Added

@@ -0,0 +1,1411 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NHML demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+#include <gpac/xml.h>
+#include <gpac/network.h>
+#include <gpac/isomedia.h>
+#include <gpac/base_coding.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#include <gpac/avparse.h>
+#endif
+
+typedef struct
+{
+	//opts
+	Bool reframe;
+	Double index;
+
+	GF_FilterPid *ipid;
+	GF_FilterPid *opid;
+
+	Bool is_dims;
+
+	Double start_range;
+	u64 first_dts;
+
+	Bool is_playing;
+	GF_Fraction64 duration;
+	Bool in_seek;
+
+	u32 timescale;
+	u32 sample_num;
+
+	FILE *mdia;
+	char szMedia[GF_MAX_PATH];
+
+	GF_DOMParser *parser;
+	GF_XMLNode *root;
+	//0: not initialized, 1: OK, samples can be sent, 2: EOS, 3: error
+	u32 parsing_state;
+	u32 current_child_idx;
+	Bool has_sap;
+	u32 compress_type;
+	const char *src_url;
+	u64 last_dts;
+	u32 dts_inc;
+
+	u8 *samp_buffer;
+	u32 samp_buffer_alloc, samp_buffer_size;
+	char *zlib_buffer;
+	u32 zlib_buffer_alloc, zlib_buffer_size;
+#ifndef GPAC_DISABLE_ZLIB
+	Bool use_dict;
+	char *dictionary;
+#endif
+
+	u64 media_done;
+	Bool is_img;
+	u32 header_end;
+
+	GF_BitStream *bs_w;
+	GF_BitStream *bs_r;
+} GF_NHMLDmxCtx;
+
+
+GF_Err nhmldmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_NHMLDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		//gf_filter_pid_remove(st->opid);
+
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+	if (p && p->value.string && strstr(p->value.string, "dims")) ctx->is_dims = GF_TRUE;
+	else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+		if (p && p->value.string && strstr(p->value.string, "dims")) ctx->is_dims = GF_TRUE;
+	}
+
+	return GF_OK;
+}
+
+static Bool nhmldmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i=0;
+	u64 cur_dts = 0;
+	u64 byte_offset = 0;
+	u32 sample_num = 0;
+	GF_XMLNode *node;
+	GF_NHMLDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->is_playing && (ctx->start_range ==  evt->play.start_range)) {
+			return GF_TRUE;
+		}
+
+		ctx->start_range = evt->play.start_range;
+		ctx->current_child_idx = 0;
+		ctx->media_done = ctx->header_end;
+		ctx->is_playing = GF_TRUE;
+		//post a seek
+		ctx->in_seek = GF_TRUE;
+
+		//lcoate previous RAP sample
+		while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
+			u32 j=0;
+			u64 dts=0;
+			u32 datalen=0;
+			Bool is_rap = ctx->has_sap ? GF_FALSE : GF_TRUE;
+			s32 cts_offset=0;
+			u64 sample_duration = 0;
+			GF_XMLAttribute *att;
+			if (node->type) continue;
+			if (stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) continue;
+
+			while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+				if (!stricmp(att->name, "DTS") || !stricmp(att->name, "time")) {
+					u32 h, m, s, ms;
+					u64 dst_val;
+					if (strchr(att->value, ':') && sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+						dts = (u64) ( (Double) ( ((h*3600.0 + m*60.0 + s)*1000 + ms) / 1000.0) * ctx->timescale );
+					} else if (sscanf(att->value, ""LLU, &dst_val)==1) {
+						dts = dst_val;
+					}
+				}
+				else if (!stricmp(att->name, "CTSOffset")) cts_offset = atoi(att->value);
+				else if (!stricmp(att->name, "duration") ) sscanf(att->value, ""LLU, &sample_duration);
+				else if (!stricmp(att->name, "isRAP") ) {
+					is_rap = (!stricmp(att->value, "yes")) ? GF_TRUE : GF_FALSE;
+				}
+				else if (!stricmp(att->name, "mediaOffset"))
+					byte_offset = (s64) atof(att->value) ;
+				else if (!stricmp(att->name, "dataLength"))
+					datalen = atoi(att->value);
+			}
+
+			dts += cts_offset;
+			if ((s64) dts < 0) dts = 0;
+
+			if (dts) cur_dts = dts;
+			if (sample_duration) cur_dts += sample_duration;
+			else if (ctx->dts_inc) cur_dts += ctx->dts_inc;
+
+			if (cur_dts >= ctx->timescale * evt->play.start_range) {
+				break;
+			}
+			if (is_rap) {
+				ctx->current_child_idx = i-1;
+				ctx->media_done = byte_offset;
+				ctx->sample_num = sample_num;
+			}
+			byte_offset += datalen;
+			sample_num++;
+		}
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		//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;
+}
+
+
+typedef struct
+{
+	Bool from_is_start, from_is_end, to_is_start, to_is_end;
+	u64 from_pos, to_pos;
+	char *from_id, *to_id;
+	GF_List *id_stack;
+	GF_SAXParser *sax;
+} XMLBreaker;
+
+
+static void nhml_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
+{
+	XMLBreaker *breaker = (XMLBreaker *)sax_cbck;
+	char *node_id;
+	u32 i;
+	node_id = NULL;
+	for (i=0; i<nb_attributes; i++) {
+		GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
+		if (stricmp(att->name, "DEF") && stricmp(att->name, "id")) continue;
+		node_id = gf_strdup(att->value);
+		break;
+	}
+	if (!node_id) {
+		node_id = gf_strdup("__nhml__none");
+		gf_list_add(breaker->id_stack, node_id);
+		return;
+	}
+	gf_list_add(breaker->id_stack, node_id);
+
+	if (breaker->from_is_start && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
+		breaker->from_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
+		breaker->from_is_start = GF_FALSE;
+	}
+	if (breaker->to_is_start && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
+		breaker->to_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
+		breaker->to_is_start = GF_FALSE;
+	}
+	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
+		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
+	}
+
+}
+
+static void nhml_node_end(void *sax_cbck, const char *node_name, const char *name_space)
+{
+	XMLBreaker *breaker = (XMLBreaker *)sax_cbck;
+	char *node_id = (char *)gf_list_last(breaker->id_stack);
+	gf_list_rem_last(breaker->id_stack);
+	if (breaker->from_is_end && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
+		breaker->from_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
+		breaker->from_is_end = GF_FALSE;
+	}
+	if (breaker->to_is_end && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
+		breaker->to_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
+		breaker->to_is_end = GF_FALSE;
+	}
+	gf_free(node_id);
+	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
+		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
+	}
+}
+
+
+static GF_Err nhml_sample_from_xml(GF_NHMLDmxCtx *ctx, char *xml_file, char *xmlFrom, char *xmlTo)
+{
+	GF_Err e = GF_OK;
+	u32 read;
+	XMLBreaker breaker;
+	char *tmp;
+	FILE *xml;
+	u8 szBOM[3];
+	if (!xml_file || !xmlFrom || !xmlTo) return GF_BAD_PARAM;
+
+	memset(&breaker, 0, sizeof(XMLBreaker));
+
+	xml = gf_fopen(xml_file, "rb");
+	if (!xml) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure: file %s not found", xml_file ));
+		goto exit;
+	}
+	//we cannot use files with BOM since the XML position we get from the parser are offsets in the UTF-8 version of the XML.
+	//TODO: to support files with BOM we would need to serialize on the fly the callback from the sax parser
+	read = (u32) gf_fread(szBOM, 3, xml);
+	if (read==3) {
+		gf_fseek(xml, 0, SEEK_SET);
+		if ((szBOM[0]==0xFF) || (szBOM[0]==0xFE) || (szBOM[0]==0xEF)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure: XML file %s uses unsupported BOM, please convert to plain UTF-8 or ANSI first", xml_file));
+			goto exit;
+		}
+	}
+
+
+	memset(&breaker, 0, sizeof(XMLBreaker));
+	breaker.id_stack = gf_list_new();
+
+	if (strstr(xmlFrom, ".start")) breaker.from_is_start = GF_TRUE;
+	else breaker.from_is_end = GF_TRUE;
+	tmp = strchr(xmlFrom, '.');
+	*tmp = 0;
+	if (stricmp(xmlFrom, "doc")) breaker.from_id = gf_strdup(xmlFrom);
+	/*doc start pos is 0, no need to look for it*/
+	else if (breaker.from_is_start) breaker.from_is_start = GF_FALSE;
+	*tmp = '.';
+
+	if (strstr(xmlTo, ".start")) breaker.to_is_start = GF_TRUE;
+	else breaker.to_is_end = GF_TRUE;
+	tmp = strchr(xmlTo, '.');
+	*tmp = 0;
+	if (stricmp(xmlTo, "doc")) breaker.to_id = gf_strdup(xmlTo);
+	/*doc end pos is file size, no need to look for it*/
+	else if (breaker.to_is_end) breaker.to_is_end = GF_FALSE;
+	*tmp = '.';
+
+	breaker.sax = gf_xml_sax_new(nhml_node_start, nhml_node_end, NULL, &breaker);
+	e = gf_xml_sax_parse_file(breaker.sax, xml_file, NULL);
+	gf_xml_sax_del(breaker.sax);
+	if (e<0) goto exit;
+
+	if (!breaker.to_id) {
+		breaker.to_pos = gf_fsize(xml);
+	}
+	if (breaker.to_pos < breaker.from_pos) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] import failure: xmlFrom %s is located after xmlTo %s", xmlFrom, xmlTo));
+		goto exit;
+	}
+
+	assert(breaker.to_pos > breaker.from_pos);
+
+
+	ctx->samp_buffer_size = (u32) (breaker.to_pos - breaker.from_pos);
+	if (ctx->samp_buffer_alloc < ctx->samp_buffer_size) {
+		ctx->samp_buffer_alloc = ctx->samp_buffer_size;
+		ctx->samp_buffer = (char*)gf_realloc(ctx->samp_buffer, sizeof(char)*ctx->samp_buffer_alloc);
+	}
+	gf_fseek(xml, breaker.from_pos, SEEK_SET);
+	if (0 == gf_fread(ctx->samp_buffer, ctx->samp_buffer_size, xml)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] Failed to read samp->dataLength\n"));
+	}
+	e = GF_OK;
+	
+exit:
+	if (xml) gf_fclose(xml);
+	while (gf_list_count(breaker.id_stack)) {
+		char *id = (char *)gf_list_last(breaker.id_stack);
+		gf_list_rem_last(breaker.id_stack);
+		gf_free(id);
+	}
+	gf_list_del(breaker.id_stack);
+	if (breaker.from_id) gf_free(breaker.from_id);
+	if (breaker.to_id) gf_free(breaker.to_id);
+	return e;
+}
+
+
+#ifndef GPAC_DISABLE_ZLIB
+
+/*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
+#include <zlib.h>
+
+#define ZLIB_COMPRESS_SAFE	4
+
+static GF_Err compress_sample_data(GF_NHMLDmxCtx *ctx, u32 compress_type, char **dict, u32 offset)
+{
+	z_stream stream;
+	int err;
+	u32 size;
+
+	if (!ctx) return GF_OK;
+
+	size = ctx->samp_buffer_size*ZLIB_COMPRESS_SAFE;
+	if (ctx->zlib_buffer_alloc < size) {
+		ctx->zlib_buffer_alloc = size;
+		ctx->zlib_buffer = gf_realloc(ctx->zlib_buffer, sizeof(char)*size);
+	}
+
+	stream.next_in = (Bytef*) ctx->samp_buffer + offset;
+	stream.avail_in = (uInt)ctx->samp_buffer_size - offset;
+	stream.next_out = ( Bytef*)ctx->zlib_buffer;
+	stream.avail_out = (uInt)size;
+	stream.zalloc = (alloc_func)NULL;
+	stream.zfree = (free_func)NULL;
+	stream.opaque = (voidpf)NULL;
+
+	if (compress_type==1) {
+		err = deflateInit(&stream, 9);
+	} else {
+		err = deflateInit2(&stream, 9, Z_DEFLATED, 16+MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
+	}
+	if (err != Z_OK) {
+		return GF_IO_ERR;
+	}
+	if (dict && *dict) {
+		err = deflateSetDictionary(&stream, (Bytef *)*dict, (u32) strlen(*dict));
+		if (err != Z_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error assigning dictionary\n"));
+			deflateEnd(&stream);
+			return GF_IO_ERR;
+		}
+	}
+	err = deflate(&stream, Z_FINISH);
+	if (err != Z_STREAM_END) {
+		deflateEnd(&stream);
+		return GF_IO_ERR;
+	}
+	if (ctx->samp_buffer_size - offset < stream.total_out) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] compressed data (%d) bigger than input data (%d)\n", (u32) stream.total_out, (u32) ctx->samp_buffer_size - offset));
+	}
+	if (dict) {
+		if (*dict) gf_free(*dict);
+		*dict = (char*)gf_malloc(sizeof(char) * ctx->samp_buffer_size);
+		memcpy(*dict, ctx->samp_buffer, ctx->samp_buffer_size);
+	}
+	if (ctx->samp_buffer_alloc < stream.total_out) {
+		ctx->samp_buffer_alloc = (u32) (stream.total_out*2);
+		ctx->samp_buffer = (char*)gf_realloc(ctx->samp_buffer, ctx->samp_buffer_alloc * sizeof(char));
+	}
+
+	memcpy(ctx->samp_buffer + offset, ctx->zlib_buffer, sizeof(char)*stream.total_out);
+	ctx->samp_buffer_size = (u32) (offset + stream.total_out);
+
+	deflateEnd(&stream);
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ZLIB*/
+
+#define NHML_SCAN_INT(_fmt, _value)	\
+	{\
+	if (strstr(att->value, "0x")) { u32 __i; sscanf(att->value+2, "%x", &__i); _value = __i; }\
+	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
+	else sscanf(att->value, _fmt, &_value); \
+	}\
+
+
+static GF_Err nhmldmx_init_parsing(GF_Filter *filter, GF_NHMLDmxCtx *ctx)
+{
+	GF_Err e;
+	Bool inRootOD;
+	u32 i, tkID, mtype, streamType, codecid, specInfoSize, par_den, par_num;
+	GF_XMLAttribute *att;
+	u32 width, height, codec_tag, sample_rate, nb_channels, version, revision, vendor_code, temporal_quality, spatial_quality, h_res, v_res, bit_depth, bits_per_sample;
+
+	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];
+	u8 *specInfo;
+	char compressor_name[100];
+	GF_XMLNode *node;
+	FILE *finfo;
+	u64 media_size, 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;
+	}
+
+	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;
+
+#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;
+	strcpy(szXmlHeaderEnd, "");
+	ctx->header_end = 0;
+
+	width = height = codec_tag = sample_rate = nb_channels = version = revision = vendor_code = temporal_quality = spatial_quality = h_res = v_res = bit_depth = bits_per_sample = 0;
+
+	dims_pathComponents = dims_fullRequestHost = 0;
+	textEncoding = contentEncoding = dims_content_script_types = mime_type = xml_schema_loc = xmlns = NULL;
+	dims_profile = dims_level = 255;
+	dims_streamType = GF_TRUE;
+	dims_containsRedundant = 1;
+
+	while ((att = (GF_XMLAttribute *)gf_list_enum(ctx->root->attributes, &i))) {
+		if (!stricmp(att->name, "streamType")) {
+			NHML_SCAN_INT("%u", streamType)
+		} 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, "timeScale")) {
+			NHML_SCAN_INT("%u", ctx->timescale)
+		} else if (!stricmp(att->name, "width")) {
+			NHML_SCAN_INT("%u", width)
+		} else if (!stricmp(att->name, "height")) {
+			NHML_SCAN_INT("%u", height)
+		} else if (!stricmp(att->name, "parNum")) {
+			NHML_SCAN_INT("%u", par_num)
+		} else if (!stricmp(att->name, "parDen")) {
+			NHML_SCAN_INT("%u", par_den)
+		} else if (!stricmp(att->name, "sampleRate")) {
+			NHML_SCAN_INT("%u", sample_rate)
+		} else if (!stricmp(att->name, "numChannels")) {
+			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);
+		} 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);
+		} else if (!stricmp(att->name, "headerEnd")) {
+			NHML_SCAN_INT("%u", ctx->header_end)
+		} else if (!stricmp(att->name, "trackID")) {
+			NHML_SCAN_INT("%u", tkID)
+		} else if (!stricmp(att->name, "inRootOD")) {
+			inRootOD = (!stricmp(att->value, "yes") );
+		} else if (!stricmp(att->name, "DTS_increment")) {
+			NHML_SCAN_INT("%u", ctx->dts_inc)
+		} else if (!stricmp(att->name, "gzipSamples")) {
+			if (!stricmp(att->value, "yes") || !stricmp(att->value, "gzip"))
+				ctx->compress_type = 2;
+			else if (!stricmp(att->value, "deflate"))
+				ctx->compress_type = 1;
+		} else if (!stricmp(att->name, "auxiliaryMimeTypes")) {
+			auxiliary_mime_types = gf_strdup(att->name);
+		}
+#ifndef GPAC_DISABLE_ZLIB
+		else if (!stricmp(att->name, "gzipDictionary")) {
+			u32 d_size;
+			if (stricmp(att->value, "self")) {
+				char *url = gf_url_concatenate(ctx->src_url, att->value);
+
+				e = gf_file_load_data(url ? url : att->value, (u8 **) &ctx->dictionary, &d_size);
+
+				if (url) gf_free(url);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Cannot open dictionary file %s: %s", att->value, gf_error_to_string(e) ));
+					continue;
+				}
+			}
+			ctx->use_dict = GF_TRUE;
+		}
+#endif
+		/*unknown desc related*/
+		else if (!stricmp(att->name, "compressorName")) {
+			strncpy(compressor_name, att->value, 99);
+			compressor_name[99]=0;
+		} else if (!stricmp(att->name, "codecVersion")) {
+			NHML_SCAN_INT("%u", version)
+		} else if (!stricmp(att->name, "codecRevision")) {
+			NHML_SCAN_INT("%u", revision)
+		} else if (!stricmp(att->name, "codecVendor") && (strlen(att->value)==4)) {
+			vendor_code = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+		} else if (!stricmp(att->name, "temporalQuality")) {
+			NHML_SCAN_INT("%u", temporal_quality)
+		} else if (!stricmp(att->name, "spatialQuality")) {
+			NHML_SCAN_INT("%u", spatial_quality)
+		} else if (!stricmp(att->name, "horizontalResolution")) {
+			NHML_SCAN_INT("%u", h_res)
+		} else if (!stricmp(att->name, "verticalResolution")) {
+			NHML_SCAN_INT("%u", v_res)
+		} else if (!stricmp(att->name, "bitDepth")) {
+			NHML_SCAN_INT("%u", bit_depth)
+		} else if (!stricmp(att->name, "bitsPerSample")) {
+			NHML_SCAN_INT("%u", bits_per_sample)
+		}
+		/*DIMS stuff*/
+		else if (!stricmp(att->name, "profile")) {
+			NHML_SCAN_INT("%u", dims_profile)
+		} else if (!stricmp(att->name, "level")) {
+			NHML_SCAN_INT("%u", dims_level)
+		} else if (!stricmp(att->name, "pathComponents")) {
+			NHML_SCAN_INT("%u", dims_pathComponents)
+		} else if (!stricmp(att->name, "useFullRequestHost") && !stricmp(att->value, "yes")) {
+			dims_fullRequestHost = GF_TRUE;
+		} else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) {
+			dims_streamType = GF_FALSE;
+		} else if (!stricmp(att->name, "contains_redundant")) {
+			if (!stricmp(att->value, "main")) {
+				dims_containsRedundant = 1;
+			} else if (!stricmp(att->value, "redundant")) {
+				dims_containsRedundant = 2;
+			} else if (!stricmp(att->value, "main+redundant")) {
+				dims_containsRedundant = 3;
+			}
+		} else if (!stricmp(att->name, "text_encoding") || !stricmp(att->name, "encoding")) {
+			textEncoding = att->value;
+		} else if (!stricmp(att->name, "content_encoding")) {
+			if (!strcmp(att->value, "deflate")) {
+				contentEncoding = att->value;
+				ctx->compress_type = 1;
+			}
+			else if (!strcmp(att->value, "gzip")) {
+				contentEncoding = att->value;
+				ctx->compress_type = 2;
+			}
+		} else if (!stricmp(att->name, "content_script_types")) {
+			dims_content_script_types = att->value;
+		} else if (!stricmp(att->name, "mime_type")) {
+			mime_type = att->value;
+		} else if (!stricmp(att->name, "media_namespace")) {
+			xmlns = att->value;
+		} else if (!stricmp(att->name, "media_schema_location")) {
+			xml_schema_loc = att->value;
+		} else if (!stricmp(att->name, "xml_namespace")) {
+			xmlns = att->value;
+		} else if (!stricmp(att->name, "xml_schema_location")) {
+			xml_schema_loc = att->value;
+		} else if (!stricmp(att->name, "xmlHeaderEnd")) {
+			strcpy(szXmlHeaderEnd, att->value);
+		}
+	}
+	if (sample_rate && !ctx->timescale) {
+		ctx->timescale = sample_rate;
+	}
+	if (!bits_per_sample) {
+		bits_per_sample = 16;
+	}
+
+	if (ctx->is_dims || (codec_tag==GF_ISOM_SUBTYPE_3GP_DIMS)) {
+		mtype = GF_ISOM_MEDIA_DIMS;
+		codec_tag=GF_ISOM_SUBTYPE_3GP_DIMS;
+		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");
+
+	specInfoSize = 0;
+	if (!streamType && !mtype && !codec_tag) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] parsing %s file - StreamType or MediaType not specified", szImpName));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	finfo = NULL;
+	if (gf_file_exists_ex(szInfo, ctx->src_url))
+		finfo = gf_fopen_ex(szInfo, ctx->src_url, "rb");
+
+	if (finfo) {
+		e = gf_file_load_data_filep(finfo, (u8 **)&specInfo, &specInfoSize);
+		gf_fclose(finfo);
+		if (e) 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;
+		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
+		specInfoSize = (u32) gf_fread(specInfo, specInfoSize, ctx->mdia);
+		specInfo[specInfoSize] = 0;
+		ctx->header_end = specInfoSize;
+	} else if (strlen(szXmlHeaderEnd)) {
+		/* 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);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] failed to load XML header: %s", gf_error_to_string(e) ));
+			return e;
+		}
+
+		specInfo = (char*)gf_malloc(sizeof(char) * (ctx->samp_buffer_size +1));
+		memcpy(specInfo, ctx->samp_buffer, ctx->samp_buffer_size);
+		specInfoSize = ctx->samp_buffer_size;
+		specInfo[specInfoSize] = 0;
+	}
+
+	i=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
+		if (node->type) continue;
+		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);
+			return e;
+		}
+		break;
+	}
+
+	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) );
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (!width && !height && specInfo && (codecid==GF_CODECID_MPEG4_PART2)) {
+		GF_M4VDecSpecInfo dsi;
+		e = gf_m4v_get_config(specInfo, specInfoSize, &dsi);
+		if (!e) {
+			width = dsi.width;
+			height = dsi.height;
+			par_num = dsi.par_num;
+			par_den = dsi.par_den;
+		}
+	}
+#endif
+
+	if (tkID) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ESID, &PROP_UINT(tkID) );
+	if (width) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(width) );
+	if (height) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(height) );
+
+	if (par_den) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC_INT(par_num, par_den) );
+	switch (bits_per_sample) {
+	case 8:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_U8) );
+		break;
+	case 16:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16) );
+		break;
+	case 24:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S24) );
+		break;
+	case 32:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S32) );
+		break;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] Unsupported audio bit depth %d\n", bits_per_sample));
+		break;
+	}
+
+	if (sample_rate) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sample_rate) );
+	if (nb_channels) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_channels) );
+	if (bit_depth) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BIT_DEPTH_Y, &PROP_UINT(bit_depth) );
+
+	if (ctx->is_dims) {
+		if (dims_profile) gf_filter_pid_set_property_str(ctx->opid, "dims:profile", &PROP_UINT(dims_profile) );
+		if (dims_level) gf_filter_pid_set_property_str(ctx->opid, "dims:level", &PROP_UINT(dims_level) );
+		if (dims_pathComponents) gf_filter_pid_set_property_str(ctx->opid, "dims:pathComponents", &PROP_UINT(dims_pathComponents) );
+		if (dims_fullRequestHost) gf_filter_pid_set_property_str(ctx->opid, "dims:fullRequestHost", &PROP_UINT(dims_fullRequestHost) );
+		if (dims_streamType) gf_filter_pid_set_property_str(ctx->opid, "dims:streamType", &PROP_BOOL(dims_streamType) );
+		if (dims_containsRedundant) gf_filter_pid_set_property_str(ctx->opid, "dims:redundant", &PROP_UINT(dims_containsRedundant) );
+		if (textEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:encoding", &PROP_STRING(textEncoding) );
+		if (contentEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:content_encoding", &PROP_STRING(contentEncoding) );
+		if (dims_content_script_types) gf_filter_pid_set_property_str(ctx->opid, "dims:scriptTypes", &PROP_STRING(dims_content_script_types) );
+		if (mime_type) gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING(mime_type) );
+		if (xml_schema_loc) gf_filter_pid_set_property_str(ctx->opid, "meta:schemaloc", &PROP_STRING(xml_schema_loc) );
+
+	} else if (mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT || mtype == GF_ISOM_MEDIA_TEXT) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(mtype) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(codec_tag) );
+
+		if (codec_tag == GF_ISOM_SUBTYPE_STPP) {
+			if (xmlns) gf_filter_pid_set_property_str(ctx->opid, "meta:xmlns", &PROP_STRING(xmlns) );
+			if (xml_schema_loc) gf_filter_pid_set_property_str(ctx->opid, "meta:schemaloc", &PROP_STRING(xml_schema_loc) );
+			if (auxiliary_mime_types) gf_filter_pid_set_property_str(ctx->opid, "meta:aux_mimes", &PROP_STRING(auxiliary_mime_types) );
+
+		} else if (codec_tag == GF_ISOM_SUBTYPE_SBTT) {
+			if (mime_type) gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING(mime_type) );
+			if (textEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:encoding", &PROP_STRING(textEncoding) );
+		} else if (codec_tag == GF_ISOM_SUBTYPE_STXT) {
+			if (mime_type) gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING(mime_type) );
+			if (textEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:encoding", &PROP_STRING(textEncoding) );
+			if (contentEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:content_encoding", &PROP_STRING(contentEncoding) );
+		} else {
+			e = GF_NOT_SUPPORTED;
+		}
+	} else if (mtype == GF_ISOM_MEDIA_META) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(mtype) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(codec_tag) );
+
+		if (codec_tag == GF_ISOM_SUBTYPE_METX) {
+			if (xmlns) gf_filter_pid_set_property_str(ctx->opid, "meta:xmlns", &PROP_STRING(xmlns) );
+			if (xml_schema_loc) gf_filter_pid_set_property_str(ctx->opid, "meta:schemaloc", &PROP_STRING(xml_schema_loc) );
+			if (textEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:encoding", &PROP_STRING(textEncoding) );
+		} else if (codec_tag == GF_ISOM_SUBTYPE_METT) {
+			if (mime_type) gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING(mime_type) );
+			if (textEncoding) gf_filter_pid_set_property_str(ctx->opid, "meta:encoding", &PROP_STRING(textEncoding) );
+		} else {
+			e = GF_NOT_SUPPORTED;
+		}
+	} else if (!streamType) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(mtype) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(codec_tag) );
+
+		if (version) gf_filter_pid_set_property_str(ctx->opid, "gene:version", &PROP_UINT(version) );
+		if (revision) gf_filter_pid_set_property_str(ctx->opid, "gene:revision", &PROP_UINT(revision) );
+		if (vendor_code) gf_filter_pid_set_property_str(ctx->opid, "gene:vendor", &PROP_UINT(vendor_code) );
+		if (temporal_quality) gf_filter_pid_set_property_str(ctx->opid, "gene:temporal_quality", &PROP_UINT(temporal_quality) );
+		if (spatial_quality) gf_filter_pid_set_property_str(ctx->opid, "gene:spatial_quality", &PROP_UINT(spatial_quality) );
+		if (h_res) gf_filter_pid_set_property_str(ctx->opid, "gene:horizontal_res", &PROP_UINT(h_res) );
+		if (v_res) gf_filter_pid_set_property_str(ctx->opid, "gene:vertical_res", &PROP_UINT(v_res) );
+	}
+
+
+	if (specInfo) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(specInfo, specInfoSize) );
+		specInfo = NULL;
+		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));
+
+	if (ctx->mdia) {
+		media_size = gf_fsize(ctx->mdia);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, & PROP_LONGUINT(media_size) );
+	}
+
+	if (specInfo) gf_free(specInfo);
+	if (auxiliary_mime_types) gf_free(auxiliary_mime_types);
+
+	//compute duration
+	ctx->duration.den = ctx->timescale;
+	ctx->duration.num = 0;
+	last_dts = 0;
+	i=0;
+	ctx->has_sap = GF_FALSE;
+	while ((node = (GF_XMLNode *) gf_list_enum(ctx->root->content, &i))) {
+		u32 j=0;
+		u64 dts=0;
+		s32 cts_offset=0;
+		u64 sample_duration = 0;
+		if (node->type) continue;
+		if (stricmp(node->name, szSampleName) ) continue;
+
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!stricmp(att->name, "DTS") || !stricmp(att->name, "time")) {
+				u32 h, m, s, ms;
+				u64 dst_val;
+				if (strchr(att->value, ':') && sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					dts = (u64) ( (Double) ( ((h*3600.0 + m*60.0 + s)*1000 + ms) / 1000.0) * ctx->timescale );
+				} else if (sscanf(att->value, ""LLU, &dst_val)==1) {
+					dts = dst_val;
+				}
+			}
+			else if (!stricmp(att->name, "CTSOffset")) cts_offset = atoi(att->value);
+			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) {
+			last_dts = 0;
+			ctx->duration.num += (u32) sample_duration;
+		} else if (ctx->dts_inc) {
+			last_dts = 0;
+			ctx->duration.num += ctx->dts_inc;
+		}
+	}
+	if (last_dts) {
+		ctx->duration.num += (u32) (ctx->duration.num - last_dts);
+	}
+	//assume image, one sec (default for old arch)
+	if ((streamType==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) );
+
+	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 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;
+		GF_FilterPacket *pck;
+		u32 j, dims_flags;
+		GF_FilterSAPType sap_type;
+		GF_XMLAttribute *att;
+		u64 dts=0;
+		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;
+		u32 compress_type;
+		char *base_data = NULL;
+		if (node->type) continue;
+		if (stricmp(node->name, ctx->is_dims ? "DIMSUnit" : "NHNTSample") ) continue;
+
+		strcpy(szMediaTemp, "");
+		strcpy(szXmlFrom, "");
+		strcpy(szXmlTo, "");
+
+		/*by default handle all samples as contiguous*/
+		ctx->samp_buffer_size = 0;
+		dims_flags = 0;
+		append = GF_FALSE;
+		compress_type = ctx->compress_type;
+		sample_duration = 0;
+		redundant_rap = 0;
+		sap_type = ctx->has_sap ? GF_FILTER_SAP_NONE : GF_FILTER_SAP_1;
+
+		cts_offset = 0;
+		if (ctx->last_dts != GF_FILTER_NO_TS)
+			dts = ctx->last_dts;
+		else
+			dts = 0;
+
+		ctx->sample_num++;
+
+
+		j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!stricmp(att->name, "DTS") || !stricmp(att->name, "time")) {
+				u32 h, m, s, ms;
+				u64 dst_val;
+				if (strchr(att->value, ':') && sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					dts = (u64) ( (Double) ( ((h*3600.0 + m*60.0 + s)*1000 + ms) / 1000.0) * ctx->timescale );
+				} else if (sscanf(att->value, ""LLU, &dst_val)==1) {
+					dts = dst_val;
+				}
+			}
+			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;
+			}
+			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);
+			else if (!stricmp(att->name, "mediaOffset")) offset = (s64) atof(att->value) ;
+			else if (!stricmp(att->name, "dataLength")) ctx->samp_buffer_size = atoi(att->value);
+			else if (!stricmp(att->name, "mediaFile")) {
+				if (!strncmp(att->value, "data:", 5)) {
+					char *base = strstr(att->value, "base64,");
+					if (!base) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHMLDmx] Data encoding scheme not recognized in sample %d - skipping\n", ctx->sample_num));
+					} else {
+						base_data = att->value;
+					}
+				} else {
+					char *url = gf_url_concatenate(ctx->src_url, att->value);
+					strcpy(szMediaTemp, url ? url : att->value);
+					if (url) gf_free(url);
+				}
+			}
+			else if (!stricmp(att->name, "xmlFrom")) strcpy(szXmlFrom, att->value);
+			else if (!stricmp(att->name, "xmlTo")) strcpy(szXmlTo, att->value);
+			/*DIMS flags*/
+			else if (!stricmp(att->name, "is-Scene") && !stricmp(att->value, "yes"))
+				dims_flags |= GF_DIMS_UNIT_S;
+			else if (!stricmp(att->name, "is-RAP") && !stricmp(att->value, "yes")) {
+				dims_flags |= GF_DIMS_UNIT_M;
+				sap_type = GF_FILTER_SAP_1;
+			}
+			else if (!stricmp(att->name, "is-redundant") && !stricmp(att->value, "yes"))
+				dims_flags |= GF_DIMS_UNIT_I;
+			else if (!stricmp(att->name, "redundant-exit") && !stricmp(att->value, "yes"))
+				dims_flags |= GF_DIMS_UNIT_D;
+			else if (!stricmp(att->name, "priority") && !stricmp(att->value, "high"))
+				dims_flags |= GF_DIMS_UNIT_P;
+			else if (!stricmp(att->name, "compress") && !stricmp(att->value, "yes"))
+				dims_flags |= GF_DIMS_UNIT_C;
+			else if (!stricmp(att->name, "duration") )
+				sscanf(att->value, ""LLU, &sample_duration);
+		}
+		if (sap_type==GF_FILTER_SAP_1)
+			dims_flags |= GF_DIMS_UNIT_M;
+
+		if (ctx->is_dims)
+			compress_type = (dims_flags & GF_DIMS_UNIT_C) ? 2 : 0 ;
+
+		if (ctx->is_img) sample_duration = ctx->duration.den;
+
+		has_subbs = GF_FALSE;
+		j=0;
+		while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
+			if (childnode->type) continue;
+			if (!stricmp(childnode->name, "BS")) {
+				has_subbs = GF_TRUE;
+				break;
+			}
+		}
+
+		if (strlen(szXmlFrom) && strlen(szXmlTo)) {
+			char *xml_file;
+			if (strlen(szMediaTemp)) xml_file = szMediaTemp;
+			else xml_file = ctx->szMedia;
+			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);
+
+			ctx->samp_buffer_size = 3 + (u32) strlen(content);
+			if (ctx->samp_buffer_alloc < ctx->samp_buffer_size) {
+				ctx->samp_buffer_alloc = ctx->samp_buffer_size;
+				ctx->samp_buffer = gf_realloc(ctx->samp_buffer, ctx->samp_buffer_size);
+			}
+			nhml_get_bs(&ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_size, GF_BITSTREAM_WRITE);
+			gf_bs_write_u16(ctx->bs_w, ctx->samp_buffer_size - 2);
+			gf_bs_write_u8(ctx->bs_w, (u8) dims_flags);
+			gf_bs_write_data(ctx->bs_w, content, (ctx->samp_buffer_size - 3));
+			gf_free(content);
+
+			/*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) {
+				u32 len = (u32)strlen(start+1);
+				if (len > ctx->samp_buffer_alloc) {
+					ctx->samp_buffer_alloc = len;
+					ctx->samp_buffer = gf_realloc(ctx->samp_buffer, sizeof(char)*ctx->samp_buffer_alloc);
+				}
+				ctx->samp_buffer_size = gf_base64_decode(start, len, ctx->samp_buffer, ctx->samp_buffer_alloc);
+			}
+		} else {
+			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));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				close = GF_TRUE;
+				if (offset) gf_fseek(f, offset, SEEK_SET);
+				//when using dedicated source files per samples, we don't allow for data reference yet
+			} else {
+				if (!offset) offset = ctx->media_done;
+				byte_offset = offset;
+			}
+
+			if (f) {
+				if (!ctx->samp_buffer_size) {
+					u64 ssize = gf_fsize(f);
+					assert(ssize < 0x80000000);
+					ctx->samp_buffer_size = (u32) ssize;
+				}
+				gf_fseek(f, offset, SEEK_SET);
+
+				if (ctx->is_dims) {
+					u32 read;
+					if (ctx->samp_buffer_size + 3 > ctx->samp_buffer_alloc) {
+						ctx->samp_buffer_alloc = ctx->samp_buffer_size + 3;
+						ctx->samp_buffer = (char*)gf_realloc(ctx->samp_buffer, sizeof(char) * ctx->samp_buffer_alloc);
+					}
+					nhml_get_bs(&ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_alloc, GF_BITSTREAM_WRITE);
+					gf_bs_write_u16(ctx->bs_w, ctx->samp_buffer_size+1);
+					gf_bs_write_u8(ctx->bs_w, (u8) dims_flags);
+					read = (u32) gf_fread( ctx->samp_buffer + 3, ctx->samp_buffer_size, f);
+					if (ctx->samp_buffer_size != read) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Failed to fully read sample %d: dataLength %d read %d\n", ctx->sample_num, ctx->samp_buffer_size, read));
+					}
+					ctx->samp_buffer_size += 3;
+
+					/*same DIMS unit*/
+					if (ctx->last_dts == dts)
+						append = GF_TRUE;
+				} else {
+					u32 read;
+					if (ctx->samp_buffer_alloc < ctx->samp_buffer_size) {
+						ctx->samp_buffer_alloc = ctx->samp_buffer_size;
+						ctx->samp_buffer = (char*)gf_realloc(ctx->samp_buffer, sizeof(char) * ctx->samp_buffer_alloc);
+					}
+					read = (u32) gf_fread(ctx->samp_buffer, ctx->samp_buffer_size, f);
+					if (ctx->samp_buffer_size != read) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Failed to fully read sample %d: dataLength %d read %d\n", ctx->sample_num, ctx->samp_buffer_size, read));
+					}
+				}
+				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;
+			}
+		}
+
+		if (e) return e;
+
+		//override DIMS flags
+		if (ctx->is_dims) {
+			if (strstr(ctx->samp_buffer + 3, "svg ")) dims_flags |= GF_DIMS_UNIT_S;
+			if (dims_flags & GF_DIMS_UNIT_S) dims_flags |= GF_DIMS_UNIT_P;
+			ctx->samp_buffer[2] = dims_flags;
+		}
+
+		if (compress_type) {
+#ifndef GPAC_DISABLE_ZLIB
+			e = compress_sample_data(ctx, compress_type, ctx->use_dict ? &ctx->dictionary : NULL, ctx->is_dims ? 3 : 0);
+			if (e) return e;
+
+			if (ctx->is_dims) {
+				nhml_get_bs(&ctx->bs_w, ctx->samp_buffer, ctx->samp_buffer_size, GF_BITSTREAM_WRITE);
+				gf_bs_write_u16(ctx->bs_w, ctx->samp_buffer_size-2);
+			}
+#else
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] Error: your version of GPAC was compiled with no libz support. Abort."));
+			return GF_NOT_SUPPORTED;
+#endif
+		}
+
+		if (ctx->is_dims && (ctx->samp_buffer_size > 0xFFFF)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHMLDmx] DIMS import failure: sample %d data is too long - maximum size allowed: 65532 bytes", ctx->sample_num));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (ctx->samp_buffer_size) {
+			pck = gf_filter_pck_new_alloc(ctx->opid, ctx->samp_buffer_size, &data);
+			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);
+			if (!append) {
+				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 (byte_offset != GF_FILTER_NO_BO)
+					gf_filter_pck_set_byte_offset(pck, byte_offset);
+
+				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);
+				}
+			}
+			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);
+			}
+			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);
+					}
+				}
+			}
+		}
+
+		ctx->last_dts = dts;
+
+		if (sample_duration)
+			ctx->last_dts += sample_duration;
+		else
+			ctx->last_dts += ctx->dts_inc;
+		ctx->media_done += ctx->samp_buffer_size;
+
+		if (gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+	ctx->parsing_state = 2;
+	return GF_OK;
+}
+
+GF_Err nhmldmx_process(GF_Filter *filter)
+{
+	GF_NHMLDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_Err e;
+	Bool start, end;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (pck) {
+		gf_filter_pck_get_framing(pck, &start, &end);
+		//for now we only work with complete files
+		assert(end);
+	}
+
+
+	//need init ?
+	switch (ctx->parsing_state) {
+	case 0:
+		e = nhmldmx_init_parsing(filter, ctx);
+		if (e) {
+			ctx->parsing_state = 3;
+			return e;
+		}
+		ctx->parsing_state = 1;
+		//fall-through
+	case 1:
+		if (!ctx->is_playing) return GF_OK;
+
+		e = nhmldmx_send_sample(filter, ctx);
+		if (e) return e;
+		break;
+	case 2:
+	default:
+		if (pck) gf_filter_pid_drop_packet(ctx->ipid);
+		if (ctx->opid) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		break;
+	}
+	return GF_OK;
+}
+
+GF_Err nhmldmx_initialize(GF_Filter *filter)
+{
+//	GF_NHMLDmxCtx *ctx = gf_filter_get_udta(filter);
+	return GF_OK;
+}
+
+void nhmldmx_finalize(GF_Filter *filter)
+{
+	GF_NHMLDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->mdia) gf_fclose(ctx->mdia);
+	if (ctx->parser)
+		gf_xml_dom_del(ctx->parser);
+
+#ifndef GPAC_DISABLE_ZLIB
+	if (ctx->dictionary) gf_free(ctx->dictionary);
+#endif
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	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);
+}
+
+
+#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(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+static const GF_FilterCapability NHMLDmxCaps[] =
+{
+	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),
+};
+
+GF_FilterRegister NHMLDmxRegister = {
+	.name = "nhmlr",
+	GF_FS_SET_DESCRIPTION("NHML parser")
+	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),
+	.args = GF_NHMLDmxArgs,
+	.initialize = nhmldmx_initialize,
+	.finalize = nhmldmx_finalize,
+	SETCAPS(NHMLDmxCaps),
+	.configure_pid = nhmldmx_configure_pid,
+	.process = nhmldmx_process,
+	.process_event = nhmldmx_process_event
+};
+
+const GF_FilterRegister *nhmldmx_register(GF_FilterSession *session)
+{
+	return &NHMLDmxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_nhnt.c Added

@@ -0,0 +1,513 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NHNT demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#include <gpac/avparse.h>
+#endif
+
+
+enum
+{
+	GF_MEDIA_TYPE_NHNL 	= GF_4CC('N','H','n','l'),
+	GF_MEDIA_TYPE_NHNT 	= GF_4CC('N','H','n','t')
+};
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} NHNTIdx;
+
+typedef struct
+{
+	//opts
+	Bool reframe;
+	Double index;
+
+	GF_FilterPid *ipid;
+	GF_FilterPid *opid;
+
+	Double start_range;
+	u64 first_dts;
+
+	Bool is_playing;
+	GF_Fraction64 duration;
+	Bool need_reassign, in_seek;
+
+	Bool initial_play_done;
+	Bool header_parsed;
+	u32 sig;
+	u32 timescale;
+
+	FILE *mdia;
+	GF_BitStream *bs;
+
+	NHNTIdx *indexes;
+	u32 index_alloc_size, index_size;
+	GF_Err in_error;
+} GF_NHNTDmxCtx;
+
+
+
+static void nhntdmx_check_dur(GF_NHNTDmxCtx *ctx)
+{
+	GF_Fraction64 dur;
+	FILE *stream;
+	GF_BitStream *bs;
+	u32 sig, timescale;
+	u64 dts_prev;
+	u32 prev_dur;
+	u64 cur_dur=0;
+	const GF_PropertyValue *p;
+
+	if (ctx->duration.num) 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->duration.num = 1;
+		return;
+	}
+	if (ctx->duration.num) return;
+
+	stream = gf_fopen(p->value.string, "rb");
+	if (!stream) return;
+
+//	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+
+
+	sig = GF_4CC(gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs));
+	if (sig == GF_MEDIA_TYPE_NHNT) sig = 0;
+	else if (sig == GF_MEDIA_TYPE_NHNL) sig = 1;
+	else {
+		gf_bs_del(bs);
+		gf_fclose(stream);
+		return;
+	}
+	gf_bs_read_u8(bs); /*version*/
+	gf_bs_read_u8(bs); //streamType
+	gf_bs_read_u8(bs); //oti
+	gf_bs_read_u16(bs);
+	gf_bs_read_u24(bs); //bufferSizeDB
+	gf_bs_read_u32(bs); //avgBitrate
+	gf_bs_read_u32(bs); //maxBitrate
+	timescale = gf_bs_read_u32(bs);
+
+	dur.num = 0;
+	dts_prev = 0;
+	prev_dur = 0;
+	while (gf_bs_available(bs)) {
+		u64 dts;
+		u64 pos  =gf_bs_get_position(bs);
+		/*u32 len = */gf_bs_read_u24(bs);
+		Bool is_rap = gf_bs_read_int(bs, 1);
+		/*Bool is_start = (Bool)*/gf_bs_read_int(bs, 1);
+		/*Bool is_end = (Bool)*/gf_bs_read_int(bs, 1);
+		/*3 reserved + AU type (2)*/
+		gf_bs_read_int(bs, 5);
+
+		if (sig) {
+			/*offset = */gf_bs_read_u64(bs);
+			/*cts = */gf_bs_read_u64(bs);
+			dts = gf_bs_read_u64(bs);
+		} else {
+			/*offset = */gf_bs_read_u32(bs);
+			/*cts = */gf_bs_read_u32(bs);
+			dts = gf_bs_read_u32(bs);
+		}
+		if (!ctx->first_dts)
+			ctx->first_dts = 1 + dts;
+		prev_dur = (u32) (dts - dts_prev);
+		dur.num += prev_dur;
+		dts_prev = dts;
+
+		cur_dur += prev_dur;
+		//only index at I-frame start
+		if (is_rap && (cur_dur >= ctx->index * ctx->timescale) ) {
+			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(NHNTIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos;
+			ctx->indexes[ctx->index_size].duration = (Double) dur.num;
+			ctx->indexes[ctx->index_size].duration /= ctx->timescale;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	dur.num += prev_dur;
+	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));
+	}
+}
+
+
+GF_Err nhntdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_NHNTDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		//gf_filter_pid_remove(st->opid);
+
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	return GF_OK;
+}
+
+static Bool nhntdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterEvent fevt;
+	u64 file_pos = 0;
+	u32 i;
+	GF_NHNTDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->is_playing && (ctx->start_range ==  evt->play.start_range)) {
+			return GF_TRUE;
+		}
+		nhntdmx_check_dur(ctx);
+		ctx->start_range = evt->play.start_range;
+		ctx->is_playing = GF_TRUE;
+
+		if (ctx->start_range) {
+			for (i=1; i<ctx->index_size; i++) {
+				if (ctx->indexes[i].duration>ctx->start_range) {
+					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 (!file_pos)
+				return GF_TRUE;
+		}
+		//post a seek
+		ctx->need_reassign = GF_TRUE;
+		ctx->in_seek = GF_TRUE;
+		ctx->header_parsed = file_pos ? GF_TRUE : GF_FALSE;
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = file_pos;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		//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;
+}
+
+GF_Err nhntdmx_process(GF_Filter *filter)
+{
+	GF_NHNTDmxCtx *ctx = gf_filter_get_udta(filter);
+	const GF_PropertyValue *p;
+	GF_FilterPacket *pck;
+	u32 pkt_size;
+	Bool start, end;
+	u8 *data;
+	if (ctx->in_error)
+		return ctx->in_error;
+
+	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 = (u8 *)gf_filter_pck_get_data(pck, &pkt_size);
+	gf_filter_pck_get_framing(pck, &start, &end);
+	//for now we only work with complete files
+	assert(end);
+
+	if (!ctx->bs) {
+		ctx->bs = gf_bs_new(data, pkt_size, GF_BITSTREAM_READ);
+	} else if (ctx->need_reassign) {
+		ctx->need_reassign = GF_FALSE;
+		gf_bs_reassign_buffer(ctx->bs, data, pkt_size);
+	}
+
+	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;
+	}
+
+	if (!ctx->header_parsed) {
+		if (!ctx->opid) {
+			char *ext;
+			char szMedia[1000];
+			char *dsi;
+			u32 dsi_size;
+			u32 val, oti;
+			u64 media_size;
+			Bool use_gfio = GF_FALSE;
+			FILE *finfo;
+
+
+			if (!strncmp(p->value.string, "gfio://", 7)) {
+				use_gfio = GF_TRUE;
+				strcpy(szMedia, gf_fileio_translate_url(p->value.string) );
+			} else {
+				strcpy(szMedia, p->value.string);
+			}
+
+			ext = strrchr(szMedia, '.');
+			if (ext) ext[0] = 0;
+			strcat(szMedia, ".media");
+			ctx->mdia = gf_fopen_ex(szMedia, p->value.string, "rb");
+
+			if (!ctx->mdia) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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;
+				return GF_URL_ERROR;
+			}
+
+			ctx->sig = GF_4CC(gf_bs_read_u8(ctx->bs), gf_bs_read_u8(ctx->bs), gf_bs_read_u8(ctx->bs), gf_bs_read_u8(ctx->bs));
+			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_filter_pid_drop_packet(ctx->ipid);
+				gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
+				ctx->in_error = GF_NON_COMPLIANT_BITSTREAM;
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			ctx->opid = gf_filter_pid_new(filter);
+
+			//we change the file path of the pid to point to the media stream, not the nhnt stream
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILEPATH, & PROP_STRING(szMedia));
+
+			media_size = gf_fsize(ctx->mdia);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, & PROP_LONGUINT(media_size) );
+
+			/*version*/
+			gf_bs_read_u8(ctx->bs);
+
+			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_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(val));
+
+			oti = gf_bs_read_u8(ctx->bs);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(oti));
+
+			gf_bs_read_u16(ctx->bs);
+			/*val = */gf_bs_read_u24(ctx->bs); //bufferSizeDB
+			val = gf_bs_read_u32(ctx->bs); //avgBitrate
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, &PROP_UINT(val));
+			/*val = */gf_bs_read_u32(ctx->bs); //maxBitrate
+			ctx->timescale = gf_bs_read_u32(ctx->bs);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale));
+
+			if (use_gfio) {
+				strcpy(szMedia, gf_fileio_translate_url(p->value.string) );
+			} else {
+				strcpy(szMedia, p->value.string);
+			}
+			ext = gf_file_ext_start(szMedia);
+			if (ext) ext[0] = 0;
+			strcat(szMedia, ".info");
+
+			finfo = gf_fopen_ex(szMedia, p->value.string, "rb");
+			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"));
+				} else {
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+					if (oti==GF_CODECID_MPEG4_PART2) {
+						GF_M4VDecSpecInfo cfg;
+						GF_Err e = gf_m4v_get_config(dsi, dsi_size, &cfg);
+						if (e>=0) {
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(cfg.width) );
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(cfg.height) );
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT(cfg.VideoPL) );
+							gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC_INT(cfg.par_num, cfg.par_den) );
+						}
+					}
+#endif
+
+					gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+				}
+				gf_fclose(finfo);
+			}
+
+			if (ctx->reframe)
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(ctx->reframe) );
+
+			nhntdmx_check_dur(ctx);
+			ctx->header_parsed = GF_TRUE;
+		} else {
+			/*version*/
+			gf_bs_skip_bytes(ctx->bs, 4+1+1+1+2+3+4+4+4);
+			ctx->header_parsed = GF_TRUE;
+		}
+	}
+
+	if (!ctx->is_playing) return GF_OK;
+
+	while (gf_bs_available(ctx->bs) >= 16 ) {
+		GF_FilterPacket *dst_pck;
+		u8 *output;
+		u64 dts, cts, offset;
+		u32 res, len = gf_bs_read_u24(ctx->bs);
+		Bool is_rap = gf_bs_read_int(ctx->bs, 1);
+		Bool is_start = (Bool)gf_bs_read_int(ctx->bs, 1);
+		Bool is_end = (Bool)gf_bs_read_int(ctx->bs, 1);
+		/*3 reserved + AU type (2)*/
+		gf_bs_read_int(ctx->bs, 5);
+
+		if (ctx->sig) {
+			offset = gf_bs_read_u64(ctx->bs);
+			cts = gf_bs_read_u64(ctx->bs);
+			dts = gf_bs_read_u64(ctx->bs);
+		} else {
+			offset = gf_bs_read_u32(ctx->bs);
+			cts = gf_bs_read_u32(ctx->bs);
+			dts = gf_bs_read_u32(ctx->bs);
+		}
+
+		if (!ctx->first_dts)
+			ctx->first_dts = 1 + dts;
+
+		if (ctx->in_seek) {
+			Double now = (Double) (dts - (ctx->first_dts-1) );
+			now /= ctx->timescale;
+			if (now >= ctx->start_range) ctx->in_seek = GF_FALSE;
+		}
+		gf_fseek(ctx->mdia, offset, SEEK_SET);
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, len, &output);
+		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_filter_pck_set_framing(dst_pck, is_start, is_end);
+		if (is_rap)
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+		gf_filter_pck_set_dts(dst_pck, dts);
+		gf_filter_pck_set_cts(dst_pck, cts);
+		gf_filter_pck_set_byte_offset(dst_pck, offset);
+		if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+		gf_filter_pck_send(dst_pck);
+
+		if (gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+GF_Err nhntdmx_initialize(GF_Filter *filter)
+{
+//	GF_NHNTDmxCtx *ctx = gf_filter_get_udta(filter);
+	return GF_OK;
+}
+
+void nhntdmx_finalize(GF_Filter *filter)
+{
+	GF_NHNTDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->mdia) gf_fclose(ctx->mdia);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+}
+
+
+#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(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+static const GF_FilterCapability NHNTDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "nhnt"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-nhnt"),
+	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),
+};
+
+
+GF_FilterRegister NHNTDmxRegister = {
+	.name = "nhntr",
+	GF_FS_SET_DESCRIPTION("NHNT reader")
+	GF_FS_SET_HELP("This filter reads NHNT files/data to produce a media PID and frames.\n"
+	"NHNT documentation is available at https://wiki.gpac.io/NHNT-Format\n")
+	.private_size = sizeof(GF_NHNTDmxCtx),
+	.args = GF_NHNTDmxArgs,
+	.initialize = nhntdmx_initialize,
+	.finalize = nhntdmx_finalize,
+	SETCAPS(NHNTDmxCaps),
+	.configure_pid = nhntdmx_configure_pid,
+	.process = nhntdmx_process,
+	.process_event = nhntdmx_process_event
+};
+
+const GF_FilterRegister *nhntdmx_register(GF_FilterSession *session)
+{
+	return &NHNTDmxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_ogg.c Added

@@ -0,0 +1,845 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / XIPH OGG demux 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/list.h>
+#include <gpac/bitstream.h>
+
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
+#include <gpac/internal/ogg.h>
+#include <gpac/internal/isomedia_dev.h>
+//#include <ogg/ogg.h>
+#include <gpac/avparse.h>
+
+
+
+typedef struct
+{
+	u32 streamType;	/*MPEG-4 streamType*/
+	u32 num_init_headers;
+	u32 sample_rate, bitrate, nb_chan;
+	u32 width, height;
+	GF_Fraction sar;
+
+	u32 theora_kgs;
+	GF_Fraction frame_rate;
+
+	u32 type;
+} OGGInfo;
+
+typedef struct
+{
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	ogg_stream_state os;
+	u32 serial_no;
+	/*DSI for ogg - cf constants.h*/
+	GF_BitStream *dsi_bs;
+
+	OGGInfo info;
+	Bool got_headers;
+
+	u32 parse_headers;
+
+	Bool eos_detected;
+
+	u32 recomputed_ts;
+
+	GF_VorbisParser *vorbis_parser;
+
+	GF_OpusParser *opus_parser;
+} GF_OGGStream;
+
+typedef struct
+{
+	Double index;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+
+	u64 file_pos, file_size;
+	u32 global_rate;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool seek_file;
+	u32 nb_playing;
+	Bool is_file;
+	Bool initial_play_done, file_loaded;
+
+	GF_List *streams;
+
+	/*ogg ogfile state*/
+	ogg_sync_state oy;
+} GF_OGGDmxCtx;
+
+void oggdmx_signal_eos(GF_OGGDmxCtx *ctx)
+{
+	GF_OGGStream *st;
+	u32 i=0;
+	while ((st = (GF_OGGStream*)gf_list_enum(ctx->streams, &i))) {
+		if (st->opid)
+			gf_filter_pid_set_eos(st->opid);
+	}
+}
+
+static GF_OGGStream *oggdmx_find_stream_for_page(GF_OGGDmxCtx *ctx, ogg_page *oggpage)
+{
+	u32 i, count;
+	count = gf_list_count(ctx->streams);
+	for (i=0; i<count; i++) {
+		GF_OGGStream *st = (GF_OGGStream*)gf_list_get(ctx->streams, i);
+		if (ogg_stream_pagein(&st->os, oggpage) == 0) return st;
+	}
+	return NULL;
+}
+
+static void oggdmx_get_stream_info(ogg_packet *oggpacket, OGGInfo *info)
+{
+	oggpack_buffer opb;
+
+	memset(info, 0, sizeof(OGGInfo));
+
+	/*vorbis*/
+	if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "vorbis", 6)) {
+		info->streamType = GF_STREAM_AUDIO;
+		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
+		oggpack_adv( &opb, 88);
+		info->nb_chan = oggpack_read( &opb, 8);	/*nb chan*/
+		info->sample_rate = oggpack_read(&opb, 32);
+		oggpack_adv( &opb, 32);	/*max rate*/
+		info->bitrate = oggpack_read(&opb, 32);
+		info->num_init_headers = 3;
+		info->type = GF_CODECID_VORBIS;
+	}
+	/*speex*/
+	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[0], "Speex", 5)) {
+		info->streamType = GF_STREAM_AUDIO;
+		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
+		oggpack_adv(&opb, 224);
+		oggpack_adv(&opb, 32);
+		oggpack_adv( &opb, 32);
+		info->sample_rate = oggpack_read(&opb, 32);
+		info->type = GF_CODECID_SPEEX;
+		info->num_init_headers = 1;
+	}
+	/*flac*/
+	else if ((oggpacket->bytes >= 4) && !strncmp((char *) &oggpacket->packet[0], "fLaC", 4)) {
+		info->streamType = GF_STREAM_AUDIO;
+		info->type = GF_CODECID_FLAC;
+		info->num_init_headers = 3;
+	}
+	/*opus*/
+	else if ((oggpacket->bytes >= 8) && !strncmp((char *) &oggpacket->packet[0], "OpusHead", 8)) {
+		info->streamType = GF_STREAM_AUDIO;
+		info->type = GF_CODECID_OPUS;
+		info->num_init_headers = 1;
+		info->sample_rate = 48000;
+	}
+	/*theora*/
+	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "theora", 6)) {
+		GF_BitStream *bs;
+		u32 keyframe_freq_force;
+
+		info->streamType = GF_STREAM_VISUAL;
+		info->type = GF_CODECID_THEORA;
+		bs = gf_bs_new((char *) oggpacket->packet, oggpacket->bytes, GF_BITSTREAM_READ);
+		gf_bs_read_int(bs, 56);
+		gf_bs_read_int(bs, 8); /* major version num */
+		gf_bs_read_int(bs, 8); /* minor version num */
+		gf_bs_read_int(bs, 8); /* subminor version num */
+		info->width = gf_bs_read_int(bs, 16) << 4; /* width */
+		info->height = gf_bs_read_int(bs, 16) << 4; /* height */
+		gf_bs_read_int(bs, 24); /* frame width */
+		gf_bs_read_int(bs, 24); /* frame height */
+		gf_bs_read_int(bs, 8); /* x offset */
+		gf_bs_read_int(bs, 8); /* y offset */
+		info->frame_rate.den = gf_bs_read_u32(bs);
+		info->frame_rate.num = gf_bs_read_u32(bs);
+		info->sar.num = gf_bs_read_int(bs, 24); /* aspect_numerator */
+		info->sar.den =gf_bs_read_int(bs, 24); /* aspect_denominator */
+		gf_bs_read_int(bs, 8); /* colorspace */
+		info->bitrate = gf_bs_read_int(bs, 24);/* bitrate */
+		gf_bs_read_int(bs, 6); /* quality */
+
+		/*patch for compatibility with old arch*/
+		if ((info->frame_rate.den==25025) && (info->frame_rate.num==1001) ) {
+			info->frame_rate.den = 25000;
+			info->frame_rate.num = 1000;
+		}
+
+		keyframe_freq_force = 1 << gf_bs_read_int(bs, 5);
+		info->theora_kgs = 0;
+		keyframe_freq_force--;
+		while (keyframe_freq_force) {
+			info->theora_kgs ++;
+			keyframe_freq_force >>= 1;
+		}
+		info->num_init_headers = 3;
+		gf_bs_del(bs);
+	}
+}
+
+static void oggdmx_declare_pid(GF_Filter *filter, GF_OGGDmxCtx *ctx, GF_OGGStream *st)
+{
+	if (!st->opid) {
+		st->opid = gf_filter_pid_new(filter);
+	}
+//	gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT(st->serial_no) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT(1 + gf_list_find(ctx->streams, st) ) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(st->info.streamType) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT(st->info.type) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_BITRATE, &PROP_UINT(st->info.bitrate) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(st->info.sample_rate ? st->info.sample_rate : st->info.frame_rate.den) );
+	gf_filter_pid_set_property(st->opid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT(0xFE) );
+
+	//opus DSI is formatted as box (ffmpeg compat) we might want to change that to avoid the box header
+	if (st->info.type==GF_CODECID_OPUS) {
+		GF_OpusSpecificBox *opus = (GF_OpusSpecificBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
+		st->dsi_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		opus->version = 0;
+
+		opus->OutputChannelCount = st->opus_parser->OutputChannelCount;
+		opus->PreSkip = st->opus_parser->PreSkip;
+		opus->InputSampleRate = st->opus_parser->InputSampleRate;
+		opus->OutputGain = st->opus_parser->OutputGain;
+		opus->ChannelMappingFamily = st->opus_parser->ChannelMappingFamily;
+		opus->StreamCount = st->opus_parser->StreamCount;
+		opus->CoupledCount = st->opus_parser->CoupledCount;
+		memcpy(opus->ChannelMapping, st->opus_parser->ChannelMapping, sizeof(char)*255);
+		gf_isom_box_size((GF_Box *) opus);
+		gf_isom_box_write((GF_Box *) opus, st->dsi_bs);
+		gf_isom_box_del((GF_Box *) opus);
+
+		st->info.nb_chan = st->opus_parser->OutputChannelCount;
+	}
+
+	if (st->dsi_bs) {
+		u8 *data;
+		u32 size;
+		gf_bs_get_content(st->dsi_bs, &data, &size);
+		gf_bs_del(st->dsi_bs);
+		st->dsi_bs = NULL;
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(data, size) );
+	}
+
+	if (st->info.sample_rate)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(st->info.sample_rate) );
+
+	if (st->info.nb_chan)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(st->info.nb_chan) );
+
+	if (st->info.width)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_WIDTH, &PROP_UINT(st->info.width) );
+	if (st->info.height)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(st->info.height) );
+	if (st->info.sar.den)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_SAR, &PROP_FRAC(st->info.sar) );
+	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)
+		gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+}
+
+static void oggdmx_new_stream(GF_Filter *filter, GF_OGGDmxCtx *ctx, ogg_page *oggpage)
+{
+	ogg_packet oggpacket;
+	u32 serial_no, i;
+	GF_OGGStream *st;
+
+	/*reannounce of stream (caroussel in live streams) */
+	serial_no = ogg_page_serialno(oggpage);
+	i=0;
+	while ((st = (GF_OGGStream*)gf_list_enum(ctx->streams, &i))) {
+		if (st->serial_no==serial_no) {
+			//resetup stream
+			ogg_stream_clear(&st->os);
+			ogg_stream_init(&st->os, st->serial_no);
+			ogg_stream_pagein(&st->os, oggpage);
+			st->parse_headers = st->info.num_init_headers;
+			return;
+		}
+	}
+
+	/*look if we have the same stream defined (eg, reuse first stream dead with same header page)*/
+	i=0;
+	while ((st = (GF_OGGStream*)gf_list_enum(ctx->streams, &i))) {
+		if (st->eos_detected) {
+			gf_filter_pid_set_eos(st->opid);
+			//and reuse the pid connection
+			break;
+		}
+	}
+	if (!st) {
+		GF_SAFEALLOC(st, GF_OGGStream);
+		if (!st) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] Failed to allocate stream for demux\n"));
+			return;
+		}
+	}
+	st->eos_detected = GF_FALSE;
+	st->serial_no = serial_no;
+	ogg_stream_init(&st->os, st->serial_no);
+	ogg_stream_pagein(&st->os, oggpage);
+
+	ogg_stream_packetpeek(&st->os, &oggpacket);
+	oggdmx_get_stream_info(&oggpacket, &st->info);
+
+	gf_list_add(ctx->streams, st);
+	st->parse_headers = st->info.num_init_headers;
+	switch (st->info.type) {
+	case GF_CODECID_VORBIS:
+		GF_SAFEALLOC(st->vorbis_parser, GF_VorbisParser);
+		break;
+	case GF_CODECID_OPUS:
+		GF_SAFEALLOC(st->opus_parser, GF_OpusParser);
+		break;
+	default:
+		break;
+	}
+
+	if (st->got_headers) {
+		oggdmx_declare_pid(filter, ctx, st);
+	}
+	i=0;
+	ctx->global_rate = 0;
+	while ((st = (GF_OGGStream*)gf_list_enum(ctx->streams, &i))) {
+		if (!st->eos_detected) ctx->global_rate += st->info.bitrate;
+	}
+	if (ctx->global_rate && ctx->is_file && !ctx->file_loaded) {
+		if (!ctx->file_size) {
+			GF_PropertyEntry *pe=NULL;
+			const GF_PropertyValue *p = gf_filter_pid_get_info(ctx->ipid, GF_PROP_PID_DOWN_SIZE, &pe);
+			if (p) ctx->file_size = p->value.longuint;
+			gf_filter_release_property(pe);
+		}
+		if (ctx->file_size) {
+			ctx->duration.num = (u32) (8 * ctx->file_size);
+			ctx->duration.den = ctx->global_rate;
+		}
+	}
+}
+
+GF_Err oggdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i;
+	GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		GF_OGGStream *st;
+		ctx->ipid = NULL;
+
+		while ((st = (GF_OGGStream*)gf_list_enum(ctx->streams, &i))) {
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+static void oggdmx_check_dur(GF_Filter *filter, GF_OGGDmxCtx *ctx)
+{
+	ogg_sync_state oy;
+	FILE *stream;
+	const GF_PropertyValue *p;
+	OGGInfo info, the_info;
+	ogg_page oggpage;
+	ogg_packet oggpacket;
+	ogg_stream_state os, the_os;
+	u64 max_gran;
+	Bool has_stream = GF_FALSE;
+	GF_VorbisParser vp;
+	GF_OpusParser op;
+	u64 recompute_ts;
+	GF_Fraction64 dur;
+
+	if (!ctx->index || ctx->duration.num) return;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	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->duration.num=1;
+		return;
+	}
+	ctx->is_file = GF_TRUE;
+	if (!ctx->file_loaded) return;
+
+	stream = gf_fopen(p->value.string, "rb");
+	if (!stream) return;
+
+	ogg_sync_init(&oy);
+	memset(&the_info, 0, sizeof(OGGInfo));
+	memset(&vp, 0, sizeof(GF_VorbisParser));
+	recompute_ts = 0;
+	max_gran = 0;
+	while (1) {
+		char buf[10000];
+		while (ogg_sync_pageout(&oy, &oggpage) != 1 ) {
+			char *buffer;
+			u32 bytes;
+
+			if (gf_feof(stream))
+				break;
+
+			bytes = (u32) gf_fread(buf, 10000, stream);
+			if (!bytes) break;
+			buffer = ogg_sync_buffer(&oy, bytes);
+			memcpy(buffer, buf, bytes);
+			ogg_sync_wrote(&oy, bytes);
+		}
+		if (gf_feof(stream))
+			break;
+
+		if (ogg_page_bos(&oggpage)) {
+			ogg_stream_init(&os, ogg_page_serialno(&oggpage));
+			if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
+				ogg_stream_packetpeek(&os, &oggpacket);
+				if (ogg_stream_pagein(&os, &oggpage) >= 0 ) {
+					ogg_stream_packetpeek(&os, &oggpacket);
+					oggdmx_get_stream_info(&oggpacket, &info);
+				}
+				if (!has_stream) {
+					has_stream = GF_TRUE;
+					ogg_stream_init(&the_os, ogg_page_serialno(&oggpage));
+					the_info = info;
+				}
+			}
+			ogg_stream_clear(&os);
+		}
+		if (has_stream && (ogg_stream_pagein(&the_os, &oggpage) >= 0) ) {
+			while (ogg_stream_packetout(&the_os, &oggpacket ) > 0 ) {
+				if (the_info.type==GF_CODECID_VORBIS) {
+					if (the_info.num_init_headers) {
+						the_info.num_init_headers--;
+						gf_vorbis_parse_header(&vp, oggpacket.packet, oggpacket.bytes);
+					} else {
+						recompute_ts += gf_vorbis_check_frame(&vp, (char *) oggpacket.packet, oggpacket.bytes);
+					}
+				} else if (the_info.type==GF_CODECID_OPUS) {
+					if (the_info.num_init_headers) {
+						the_info.num_init_headers--;
+						gf_opus_parse_header(&op, oggpacket.packet, oggpacket.bytes);
+					} else {
+						recompute_ts += gf_opus_check_frame(&op, (char *) oggpacket.packet, oggpacket.bytes);
+					}
+
+				} else if ((oggpacket.granulepos>=0) && ((u64) oggpacket.granulepos>max_gran) ) {
+					max_gran = oggpacket.granulepos;
+				}
+			}
+		}
+	}
+	ogg_sync_clear(&oy);
+	ctx->file_size = gf_ftell(stream);
+	if (has_stream) {
+		ogg_stream_clear(&the_os);
+		if (recompute_ts) {
+			dur.num = (u32) recompute_ts;
+			dur.den = the_info.sample_rate;
+		} else {
+			//convert granule to time
+			if (the_info.sample_rate) {
+				dur.num = (s32) max_gran;
+			} else if (the_info.frame_rate.num) {
+				s64 iframe = max_gran >> the_info.theora_kgs;
+				s64 pframe = max_gran - (iframe << the_info.theora_kgs);
+				pframe += iframe;
+				dur.num = (s32) (pframe / the_info.frame_rate.num);
+			} else {
+				dur.num = 0;
+			}
+			if (the_info.sample_rate) dur.den = the_info.sample_rate;
+			else dur.den = the_info.frame_rate.den;
+		}
+
+		if (!ctx->duration.num || (ctx->duration.num  * dur.den != dur.num * ctx->duration.den)) {
+			u32 i=0;
+			GF_OGGStream *st;
+			ctx->duration = dur;
+			while ( (st = gf_list_enum(ctx->streams, &i)) ) {
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+			}
+		}
+	}
+	gf_fclose(stream);
+}
+
+static Bool oggdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_OGGStream *st;
+	GF_FilterEvent fevt;
+	GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	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++;
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		oggdmx_check_dur(filter, ctx);
+
+
+		ctx->start_range = evt->play.start_range;
+		ctx->file_pos = 0;
+		if (ctx->duration.num) {
+			ctx->file_pos = (u32) (ctx->file_size * ctx->start_range);
+			ctx->file_pos *= ctx->duration.den;
+			ctx->file_pos /= ctx->duration.num;
+			if (ctx->file_pos>ctx->file_size) return GF_TRUE;
+		}
+
+		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->seek_file = GF_TRUE;
+		i=0;
+		while ((st = gf_list_enum(ctx->streams, &i)) ) {
+			if (st->info.sample_rate) {
+				st->recomputed_ts = (u32) (ctx->start_range * st->info.sample_rate);
+			} else {
+				st->recomputed_ts = (u32) (ctx->start_range * st->info.frame_rate.den);
+			}
+		}
+
+		//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->nb_playing --;
+		//cancel event if not last stream
+		if (ctx->nb_playing) return GF_TRUE;
+
+		//cancel event if we didn't get all stream headers yet not last stream
+		i=0;
+		while ((st = gf_list_enum(ctx->streams, &i))) {
+			if (!st->got_headers) return GF_TRUE;
+		}
+		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;
+}
+
+GF_Err oggdmx_process(GF_Filter *filter)
+{
+	ogg_page oggpage;
+	GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_OGGStream *st;
+	s64 granulepos_init = -1;
+
+	//update duration
+	oggdmx_check_dur(filter, ctx);
+
+
+	if (ctx->seek_file) {
+		ogg_sync_clear(&ctx->oy);
+		ogg_sync_init(&ctx->oy);
+		ctx->seek_file = GF_FALSE;
+	} else {
+		u32 i=0;
+		u32 would_block = 0;
+		//check if all the streams are in block state, if so return.
+		//we need to check for all output since one pid could still be buffering
+		while ((st = gf_list_enum(ctx->streams, &i))) {
+			if (st->got_headers && gf_filter_pid_would_block(st->opid))
+				would_block++;
+		}
+		if (would_block && (would_block+1==i))
+			return GF_OK;
+	}
+
+	while (1) {
+		ogg_packet oggpacket;
+
+		if (ogg_sync_pageout(&ctx->oy, &oggpage ) != 1 ) {
+			u32 pck_size;
+			char *data, *buffer;
+
+			pck = gf_filter_pid_get_packet(ctx->ipid);
+			if (!pck) {
+				if (gf_filter_pid_is_eos(ctx->ipid)) oggdmx_signal_eos(ctx);
+				return GF_OK;
+			}
+			data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+			buffer = ogg_sync_buffer(&ctx->oy, pck_size);
+			memcpy(buffer, data, pck_size);
+			if (ogg_sync_wrote(&ctx->oy, pck_size) >= 0) {
+				gf_filter_pid_drop_packet(ctx->ipid);
+			}
+			continue;
+		}
+
+		if (ogg_page_bos(&oggpage)) {
+			oggdmx_new_stream(filter, ctx, &oggpage);
+			continue;
+		}
+
+		st = oggdmx_find_stream_for_page(ctx, &oggpage);
+		if (!st) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] cannot find stream for ogg page\n"));
+			continue;
+		}
+
+		if (ogg_page_eos(&oggpage))
+			st->eos_detected = GF_TRUE;
+
+		while (ogg_stream_packetout(&st->os, &oggpacket ) > 0 ) {
+			if (st->parse_headers && !st->got_headers) {
+				Bool res = GF_FALSE;
+				Bool add_page = GF_FALSE;
+				u32 bytes = oggpacket.bytes;
+				//bug in some files where first header is repeated
+				if ( (st->parse_headers + 1 == st->info.num_init_headers) && st->dsi_bs && (gf_bs_get_position(st->dsi_bs) == 2 + bytes) )
+					continue;
+
+				switch (st->info.type) {
+				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"));
+					} else {
+						add_page = GF_TRUE;
+					}
+					break;
+				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"));
+					}
+					break;
+				case GF_CODECID_THEORA:
+					add_page = GF_TRUE;
+					break;
+				}
+
+				if (add_page) {
+					if (!st->dsi_bs) st->dsi_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+					gf_bs_write_u16(st->dsi_bs, oggpacket.bytes);
+					gf_bs_write_data(st->dsi_bs, (char *) oggpacket.packet, oggpacket.bytes);
+				}
+				
+				st->parse_headers--;
+				if (!st->parse_headers) {
+					st->got_headers = GF_TRUE;
+					oggdmx_declare_pid(filter, ctx, st);
+				}
+
+				granulepos_init = oggpacket.granulepos;
+			} else if (st->parse_headers && st->got_headers) {
+				st->parse_headers--;
+			} else if (!st->opid) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[OGG] Channel %d packet before configure done - discarding\n", st->serial_no));
+			} else {
+				u8 *output;
+				GF_FilterPacket *dst_pck;
+
+				if (st->info.type==GF_CODECID_THEORA) {
+					oggpack_buffer opb;
+					oggpackB_readinit(&opb, oggpacket.packet, oggpacket.bytes);
+					/*not a new frame*/
+					if (oggpackB_read(&opb, 1) != 0) continue;
+
+					dst_pck = gf_filter_pck_new_alloc(st->opid, oggpacket.bytes, &output);
+					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);
+					st->recomputed_ts += st->info.frame_rate.num;
+				}
+				//this is audio
+				else {
+					u32 block_size = 0;
+
+					if (st->info.type==GF_CODECID_VORBIS) {
+						block_size = gf_vorbis_check_frame(st->vorbis_parser, (char *) oggpacket.packet, oggpacket.bytes);
+						if (!block_size) continue;
+					}
+					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 (!st->recomputed_ts) {
+							//compat with old arch (keep same hashes), to remove once droping 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));
+							}
+						}
+					}
+
+					if (ogg_page_eos(&oggpage)) {
+						//compat with old arch (keep same hashes), to remove once droping it
+						if (!gf_sys_old_arch_compat()) {
+							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*/
+						}
+					}
+					dst_pck = gf_filter_pck_new_alloc(st->opid, oggpacket.bytes, &output);
+					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
+					if (!gf_sys_old_arch_compat()) {
+						gf_filter_pck_set_duration(dst_pck, block_size);
+					}
+					
+					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
+						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);
+						} else {
+							gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+						}
+					} else {
+						gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+					}
+
+					st->recomputed_ts += block_size;
+				}
+
+				gf_filter_pck_send(dst_pck);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err oggdmx_initialize(GF_Filter *filter)
+{
+	GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	ogg_sync_init(&ctx->oy);
+	return GF_OK;
+}
+
+static void oggdmx_finalize(GF_Filter *filter)
+{
+	GF_OGGDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	/*just in case something went wrong*/
+	while (gf_list_count(ctx->streams)) {
+		GF_OGGStream *st = (GF_OGGStream*)gf_list_get(ctx->streams, 0);
+		gf_list_rem(ctx->streams, 0);
+		ogg_stream_clear(&st->os);
+		if (st->dsi_bs) gf_bs_del(st->dsi_bs);
+		if (st->vorbis_parser) gf_free(st->vorbis_parser);
+		if (st->opus_parser) gf_free(st->opus_parser);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	ogg_sync_clear(&ctx->oy);
+}
+
+static const char *oggdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (!strncmp(data, "OggS", 4)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "video/ogg";
+	}
+	return NULL;
+}
+
+
+static const GF_FilterCapability OGGDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "oga|spx|ogg|ogv|oggm|opus"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/ogg|audio/x-ogg|audio/x-vorbis+ogg|application/ogg|application/x-ogg|video/ogg|video/x-ogg|video/x-ogm+ogg"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_VORBIS),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_FLAC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_OPUS),
+	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),
+};
+
+#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},
+	{0}
+};
+
+
+GF_FilterRegister OGGDmxRegister = {
+	.name = "oggdmx",
+	GF_FS_SET_DESCRIPTION("OGG demuxer")
+	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,
+	.finalize = oggdmx_finalize,
+	.args = OGGDmxArgs,
+	.flags = GF_FS_REG_DYNAMIC_PIDS,
+	SETCAPS(OGGDmxCaps),
+	.configure_pid = oggdmx_configure_pid,
+	.process = oggdmx_process,
+	.process_event = oggdmx_process_event,
+	.probe_data = oggdmx_probe_data,
+};
+
+#endif // !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
+
+const GF_FilterRegister *oggdmx_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_OGG)
+	return &OGGDmxRegister;
+#else
+	return NULL;
+#endif
+
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_saf.c Added

@@ -0,0 +1,464 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / SAF demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 au_sn, stream_id, ts_res, buffer_min;
+} GF_SAFStream;
+
+enum
+{
+	SAF_FILE_LOCAL,
+	SAF_FILE_REMOTE,
+	SAF_LIVE_STREAM
+};
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+
+
+	GF_List *streams;
+
+	u32 saf_type;
+
+	Double start_range, end_range;
+	u32 nb_playing;
+	Bool is_file, file_loaded;
+	GF_Fraction64 duration;
+	u64 file_pos, file_size;
+
+	Bool initial_play_done;
+
+	char *saf_data;
+	u32 alloc_size, saf_size;
+} GF_SAFDmxCtx;
+
+
+static GFINLINE GF_SAFStream *saf_get_channel(GF_SAFDmxCtx *saf, u32 stream_id)
+{
+	GF_SAFStream *st;
+	u32 i=0;
+	while ((st = (GF_SAFStream *)gf_list_enum(saf->streams, &i))) {
+		if (st->stream_id==stream_id) return st;
+	}
+	return NULL;
+}
+
+static void safdmx_demux(GF_Filter *filter, GF_SAFDmxCtx *ctx, char *data, u32 data_size)
+{
+	Bool is_rap, go;
+	u32 cts, au_size, type, i, stream_id;
+	u64 bs_pos;
+	GF_BitStream *bs;
+
+	if (ctx->alloc_size < ctx->saf_size + data_size) {
+		ctx->saf_data = (char*)gf_realloc(ctx->saf_data, sizeof(char)*(ctx->saf_size + data_size) );
+		ctx->alloc_size = ctx->saf_size + data_size;
+	}
+	//we could avoid a full copy of the buffer, but given how much SAF is used that's not very urgent ...
+	memcpy(ctx->saf_data + ctx->saf_size, data, sizeof(char)*data_size);
+	ctx->saf_size += data_size;
+
+	/*first AU not complete yet*/
+	if (ctx->saf_size<10) return;
+
+	bs = gf_bs_new(ctx->saf_data, ctx->saf_size, GF_BITSTREAM_READ);
+	bs_pos = 0;
+
+	go = GF_TRUE;
+	while (go) {
+		GF_SAFStream *st;
+		u64 avail = gf_bs_available(bs);
+		bs_pos = gf_bs_get_position(bs);
+
+		if (avail<10) break;
+
+		is_rap = (Bool)gf_bs_read_int(bs, 1);
+		/*au_sn = */gf_bs_read_int(bs, 15);
+		gf_bs_read_int(bs, 2);
+		cts = gf_bs_read_int(bs, 30);
+		au_size = gf_bs_read_int(bs, 16);
+		avail-=8;
+
+		if (au_size > avail) break;
+		assert(au_size>=2);
+
+		type = gf_bs_read_int(bs, 4);
+		stream_id = gf_bs_read_int(bs, 12);
+		au_size -= 2;
+
+		st = saf_get_channel(ctx, stream_id);
+		switch (type) {
+		case 1:
+		case 2:
+		case 7:
+			if (st) {
+				gf_bs_skip_bytes(bs, au_size);
+			} else {
+				u32 oti, stype;
+				GF_SAFStream *first = (GF_SAFStream *)gf_list_get(ctx->streams, 0);
+				GF_SAFEALLOC(st, GF_SAFStream);
+				if (!st) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SAF] Failed to allocate SAF channel"));
+					gf_bs_del(bs);
+					return;
+				}
+				st->stream_id = stream_id;
+				st->opid = gf_filter_pid_new(filter);
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_ID, &PROP_UINT(stream_id));
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_ESID, &PROP_UINT(stream_id));
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(first ? first->stream_id : stream_id));
+				if (!first) {
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE));
+				}
+				oti = gf_bs_read_u8(bs);
+				gf_filter_pid_set_property(st->opid, GF_PROP_PID_CODECID, &PROP_UINT(oti));
+				stype = gf_bs_read_u8(bs);
+				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)
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+				/*bufferSizeDB = */gf_bs_read_u16(bs);
+				au_size -= 7;
+				if ((oti == 0xFF) && (stype == 0xFF) ) {
+					u16 mimeLen = gf_bs_read_u16(bs);
+					gf_bs_skip_bytes(bs, mimeLen);
+					au_size -= mimeLen+2;
+				}
+				if (type==7) {
+					u16 urlLen = gf_bs_read_u16(bs);
+					char *url_string = (char*)gf_malloc(sizeof(char)*(urlLen+1));
+					gf_bs_read_data(bs, url_string, urlLen);
+					url_string[urlLen] = 0;
+					au_size -= urlLen+2;
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_REMOTE_URL, &PROP_NAME(url_string));
+				}
+				if (au_size) {
+					char *dsi = (char*)gf_malloc(sizeof(char)*au_size);
+					gf_bs_read_data(bs, dsi, au_size);
+					gf_filter_pid_set_property(st->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, au_size) );
+				}
+				gf_list_add(ctx->streams, st);
+			}
+			break;
+		case 4:
+			if (st) {
+				GF_FilterPacket *pck;
+				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);
+				}
+				gf_filter_pck_send(pck);
+			}
+			gf_bs_skip_bytes(bs, au_size);
+			break;
+		case 3:
+			if (st && st->opid) gf_filter_pid_set_eos(st->opid);
+			break;
+		case 5:
+			i=0;
+			while ((st = (GF_SAFStream *)gf_list_enum(ctx->streams, &i))) {
+				if (st->opid) gf_filter_pid_set_eos(st->opid);
+			}
+			break;
+		}
+	}
+
+	gf_bs_del(bs);
+	if (bs_pos) {
+		u32 remain = (u32) (ctx->saf_size - bs_pos);
+		if (remain) memmove(ctx->saf_data, ctx->saf_data+bs_pos, sizeof(char)*remain);
+		ctx->saf_size = remain;
+	}
+}
+
+
+typedef struct
+{
+	u32 stream_id;
+	u32 ts_res;
+} StreamInfo;
+
+static void safdmx_check_dur(GF_SAFDmxCtx *ctx)
+{
+	u32 nb_streams, i, cts, au_size, au_type, stream_id, ts_res;
+	GF_BitStream *bs;
+	GF_Fraction64 dur;
+	const GF_PropertyValue *p;
+	StreamInfo si[1024];
+	FILE *stream;
+
+
+	if (ctx->duration.num) return;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	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->duration.num=1;
+		return;
+	}
+	ctx->is_file = GF_TRUE;
+	if (!ctx->file_loaded) return;
+
+	stream = gf_fopen(p->value.string, "rb");
+	if (!stream) return;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	ctx->file_size = gf_bs_get_size(bs);
+
+	dur.num = 0;
+	dur.den = 1000;
+	nb_streams=0;
+	while (gf_bs_available(bs)) {
+		gf_bs_read_u16(bs);
+		gf_bs_read_int(bs, 2);
+		cts = gf_bs_read_int(bs, 30);
+		au_size = gf_bs_read_int(bs, 16);
+		au_type = gf_bs_read_int(bs, 4);
+		stream_id = gf_bs_read_int(bs, 12);
+		au_size-=2;
+		ts_res = 0;
+		for (i=0; i<nb_streams; i++) {
+			if (si[i].stream_id==stream_id) ts_res = si[i].ts_res;
+		}
+		if (!ts_res) {
+			if ((au_type==1) || (au_type==2) || (au_type==7)) {
+				gf_bs_read_u16(bs);
+				ts_res = gf_bs_read_u24(bs);
+				au_size -= 5;
+				si[nb_streams].stream_id = stream_id;
+				si[nb_streams].ts_res = ts_res;
+				nb_streams++;
+			}
+		}
+		if (ts_res && (au_type==4)) {
+			Double ts = cts;
+			ts /= ts_res;
+			if (ts * 1000 > dur.num) dur.num = (u32) (ts * 1000);
+		}
+		gf_bs_skip_bytes(bs, au_size);
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num * dur.den != dur.num * ctx->duration.den)) {
+		GF_SAFStream *st;
+		ctx->duration = dur;
+		i=0;
+		while ( (st = gf_list_enum(ctx->streams, &i)) ) {
+			gf_filter_pid_set_property(st->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+		}
+	}
+}
+
+
+GF_Err safdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i;
+	GF_SAFDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		GF_SAFStream *st;
+		ctx->ipid = NULL;
+
+		while ((st = (GF_SAFStream*)gf_list_enum(ctx->streams, &i))) {
+			if (st->opid)
+				gf_filter_pid_remove(st->opid);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+static Bool safdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterEvent fevt;
+	GF_SAFDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->nb_playing && (ctx->start_range == evt->play.start_range)) {
+			return GF_TRUE;
+		}
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		safdmx_check_dur(ctx);
+
+		ctx->nb_playing++;
+
+		ctx->start_range = evt->play.start_range;
+		ctx->file_pos = 0;
+		if (ctx->duration.num) {
+			ctx->file_pos = (u64) (ctx->file_size * ctx->start_range);
+			ctx->file_pos *= ctx->duration.den;
+			ctx->file_pos /= ctx->duration.num;
+			if (ctx->file_pos>ctx->file_size) return GF_TRUE;
+		}
+
+		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;
+		}
+		//post a seek to 0 - we would need to build an index of AUs to find the next place to seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 0;
+		ctx->saf_size = 0;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->nb_playing--;
+		//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;
+}
+
+GF_Err safdmx_process(GF_Filter *filter)
+{
+	GF_SAFDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_SAFStream *st;
+	u32 i=0, pkt_size;
+	const char *data;
+	u32 would_block = 0;
+
+	//update duration
+	safdmx_check_dur(ctx);
+
+	//check if all the streams are in block state, if so return.
+	//we need to check for all output since one pid could still be buffering
+	while ((st = gf_list_enum(ctx->streams, &i))) {
+		if (st->opid && gf_filter_pid_would_block(st->opid))
+			would_block++;
+	}
+	if (would_block && (would_block+1==i))
+		return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+//		if (gf_filter_pid_is_eos(ctx->ipid)) oggdmx_signal_eos(ctx);
+		return GF_OK;
+	}
+	data = gf_filter_pck_get_data(pck, &pkt_size);
+	safdmx_demux(filter, ctx, (char *) data, pkt_size);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+GF_Err safdmx_initialize(GF_Filter *filter)
+{
+	GF_SAFDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	return GF_OK;
+}
+
+void safdmx_finalize(GF_Filter *filter)
+{
+	GF_SAFDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		GF_SAFStream *st = (GF_SAFStream *)gf_list_last(ctx->streams);
+		gf_list_rem_last(ctx->streams);
+		gf_free(st);
+	}
+	if (ctx->saf_data) gf_free(ctx->saf_data);
+	gf_list_del(ctx->streams);
+}
+
+static const char *safdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	*score = GF_FPROBE_EXT_MATCH;
+	return "saf|lsr";
+}
+
+static const GF_FilterCapability SAFDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "saf|lsr"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-saf|application/saf"),
+	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),
+};
+
+GF_FilterRegister SAFDmxRegister = {
+	.name = "safdmx",
+	GF_FS_SET_DESCRIPTION("SAF demuxer")
+	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,
+	.finalize = safdmx_finalize,
+	SETCAPS(SAFDmxCaps),
+	.configure_pid = safdmx_configure_pid,
+	.process = safdmx_process,
+	.process_event = safdmx_process_event,
+	.probe_data = safdmx_probe_data
+};
+
+const GF_FilterRegister *safdmx_register(GF_FilterSession *session)
+{
+	return &SAFDmxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/dmx_vobsub.c Added

@@ -0,0 +1,486 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NHNT demuxer 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#ifndef GPAC_DISABLE_VOBSUB
+
+#include <gpac/internal/vobsub.h>
+
+
+typedef struct
+{
+	//opts
+	Bool blankframe;
+
+	GF_FilterPid *idx_pid, *sub_pid;
+	GF_Filter *sub_filter;
+	GF_List *opids;
+	Bool first;
+
+	u32 idx_file_crc;
+	FILE *mdia;
+
+	Double start_range;
+	u64 first_dts;
+
+	u32 nb_playing;
+	GF_Fraction64 duration;
+	Bool in_seek;
+
+	Bool initial_play_done;
+	Bool idx_parsed;
+
+	u32 timescale;
+
+	vobsub_file *vobsub;
+} GF_VOBSubDmxCtx;
+
+
+GF_Err vobsubdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 crc;
+	const GF_PropertyValue *p;
+	GF_VOBSubDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+	if (!p) {
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		return GF_EOS;
+	}
+
+	if (is_remove) {
+		u32 i, count;
+		ctx->idx_pid = NULL;
+		ctx->sub_pid = NULL;
+		count = gf_filter_get_opid_count(filter);
+		for (i=0; i<count; i++) {
+			gf_filter_pid_remove( gf_filter_get_opid(filter, i) );
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->idx_pid) {
+		ctx->idx_pid = pid;
+	} else if (ctx->idx_pid != pid) {
+		ctx->sub_pid = pid;
+	}
+	
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	if (ctx->idx_pid==pid) {
+		GF_Err e;
+		Bool use_gfio = GF_FALSE;
+		char sURL[GF_MAX_PATH], *ext;
+		crc = gf_crc_32(p->value.string, (u32) strlen(p->value.string));
+		if (ctx->idx_file_crc == crc) return GF_OK;
+		ctx->idx_file_crc = crc;
+
+		if (ctx->sub_filter) {
+			gf_filter_remove_src(filter, ctx->sub_filter);
+			ctx->sub_filter = NULL;
+		}
+		if (!strncmp(p->value.string, "gfio://", 7)) {
+			use_gfio = GF_TRUE;
+			strcpy(sURL, gf_fileio_translate_url(p->value.string) );
+		} else {
+			strcpy(sURL, p->value.string);
+		}
+		ext = gf_file_ext_start(sURL);
+		if (ext) ext[0] = 0;
+		strcat(sURL, ".sub");
+		if (use_gfio) {
+			GF_FileIO *gfio = gf_fileio_from_url(p->value.string);
+			char *base = gf_file_basename(sURL);
+			const char *new_url = gf_fileio_factory(gfio, base ? base : sURL);
+			if (new_url) {
+				strcpy(sURL, new_url);
+			}
+		}
+
+		ctx->sub_filter = gf_filter_connect_source(filter, sURL, NULL, &e);
+		if (e) return e;
+		if (ctx->mdia) gf_fclose(ctx->mdia);
+		ctx->mdia = NULL;
+		gf_filter_disable_probe(ctx->sub_filter);
+
+		ctx->first = GF_TRUE;
+	}
+
+	return GF_OK;
+}
+
+static Bool vobsubdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_VOBSubDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->nb_playing) return GF_TRUE;
+		if (ctx->vobsub && (ctx->start_range != evt->play.start_range)) {
+			u32 i;
+			for (i=0; i<ctx->vobsub->num_langs; i++) {
+				ctx->vobsub->langs[i].last_dts = 0;
+				ctx->vobsub->langs[i].current = 0;
+				ctx->vobsub->langs[i].is_seek = GF_TRUE;
+			}
+		}
+		ctx->start_range = evt->play.start_range;
+		ctx->nb_playing++;
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->nb_playing--;
+		//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;
+}
+
+GF_Err vobsubdmx_parse_idx(GF_Filter *filter, GF_VOBSubDmxCtx *ctx)
+{
+	FILE *file = NULL;
+	int		  version;
+	GF_Err err = GF_OK;
+	const GF_PropertyValue *p;
+
+	if (!ctx->idx_pid) return GF_SERVICE_ERROR;
+
+	p = gf_filter_pid_get_property(ctx->idx_pid, GF_PROP_PID_FILEPATH);
+	if (!p) {
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		return GF_EOS;
+	}
+
+	file = gf_fopen(p->value.string, "rb");
+	if (!file) {
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		return GF_EOS;
+	}
+
+	GF_SAFEALLOC(ctx->vobsub, vobsub_file);
+	if (!ctx->vobsub) {
+		gf_fclose(file);
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		return GF_EOS;
+	}
+
+	err = vobsub_read_idx(file, ctx->vobsub, &version);
+	gf_fclose(file);
+	if (err) {
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		return GF_EOS;
+	}
+	if (!gf_filter_get_opid_count(filter) ) {
+		u32 i;
+		ctx->duration.num = 0;
+
+		for (i=0; i<ctx->vobsub->num_langs; i++) {
+			vobsub_pos *pos = (vobsub_pos*)gf_list_last(ctx->vobsub->langs[i].subpos);
+			if ((u64) ctx->duration.num < pos->start*90)
+				ctx->duration.num = (s64) (pos->start*90);
+		}
+		ctx->duration.den = 90000;
+
+		for (i=0; i<ctx->vobsub->num_langs; i++) {
+			GF_FilterPid *opid = gf_filter_pid_new(filter);
+
+			//copy properties from idx pid
+			gf_filter_pid_copy_properties(opid, ctx->idx_pid);
+
+			gf_filter_pid_set_property(opid, GF_PROP_PID_ID, &PROP_UINT(i+1) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SUBPIC) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000) );
+			gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char*)&ctx->vobsub->palette[0][0], sizeof(ctx->vobsub->palette)) );
+
+
+			gf_filter_pid_set_property(opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->vobsub->width) );
+			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_udta(opid, &ctx->vobsub->langs[i]);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err vobsubdmx_send_stream(GF_VOBSubDmxCtx *ctx, GF_FilterPid *pid)
+{
+	static const u8 null_subpic[] = { 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0xFF };
+	GF_List *subpic;
+	vobsub_lang *vslang;
+	u32 c, count;
+	GF_FilterPacket *dst_pck;
+
+	unsigned char buf[0x800];
+
+	vslang = gf_filter_pid_get_udta(pid);
+	subpic = vslang->subpos;
+
+	count = gf_list_count(subpic);
+
+	c = vslang->current;
+
+	for (; c<count; c++) {
+		u32		i, left, size, psize, dsize, hsize, duration;
+		u8 *packet;
+		vobsub_pos *pos = (vobsub_pos*)gf_list_get(subpic, c);
+
+		if (vslang->is_seek) {
+			if (pos->start*90 < ctx->start_range * 90000) {
+				continue;
+			}
+			vslang->is_seek = GF_FALSE;
+		}
+
+		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"));
+			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"));
+			return GF_IO_ERR;
+		}
+
+		if (*(u32*)&buf[0x00] != 0xba010000		   ||
+		        *(u32*)&buf[0x0e] != 0xbd010000		   ||
+		        !(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"));
+			return GF_CORRUPTED_DATA;
+		}
+
+		psize = (buf[buf[0x16] + 0x18] << 8) + buf[buf[0x16] + 0x19];
+		dsize = (buf[buf[0x16] + 0x1a] << 8) + buf[buf[0x16] + 0x1b];
+
+		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;
+			}
+			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);
+			gf_filter_pck_set_duration(dst_pck, (u32) (pos->start * 90) );
+			gf_filter_pck_send(dst_pck);
+		}
+
+		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;
+		}
+
+		for (i = 0, left = psize; i < psize; i += size, left -= size) {
+			hsize = 0x18 + buf[0x16];
+			size  = MIN(left, 0x800 - hsize);
+			memcpy(packet + i, buf + hsize, size);
+
+			if (size != left) {
+				while (gf_fread(buf, sizeof(buf), ctx->mdia)) {
+					if (buf[buf[0x16] + 0x17] == (vslang->idx | 0x20)) {
+						break;
+					}
+				}
+			}
+		}
+
+		if (i != psize || left > 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[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"));
+			return GF_CORRUPTED_DATA;
+		}
+
+		gf_filter_pck_set_cts(dst_pck, pos->start * 90);
+		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+		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_filter_pck_send(dst_pck);
+		vslang->last_dts = pos->start * 90;
+
+		vslang->current++;
+		if (gf_filter_pid_would_block(pid)) return GF_OK;
+	}
+	return GF_EOS;
+}
+
+GF_Err vobsubdmx_process(GF_Filter *filter)
+{
+	GF_VOBSubDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	u32 pkt_size, i, count, nb_eos;
+	Bool start, end;
+
+	if (!ctx->idx_parsed) {
+		GF_Err e;
+		pck = gf_filter_pid_get_packet(ctx->idx_pid);
+		if (!pck) return GF_OK;
+		gf_filter_pck_get_framing(pck, &start, &end);
+		//for now we only work with complete files
+		assert(end);
+
+		e = vobsubdmx_parse_idx(filter, ctx);
+		ctx->idx_parsed = GF_TRUE;
+		gf_filter_pid_drop_packet(ctx->idx_pid);
+		if (e) {
+			gf_filter_setup_failure(filter, e);
+			return e;
+		}
+	}
+
+	if (!ctx->nb_playing) return GF_OK;
+
+	if (!ctx->mdia) {
+		const GF_PropertyValue *p;
+		if (!ctx->sub_pid) return GF_OK;
+		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"));
+			return GF_EOS;
+		}
+		ctx->mdia = gf_fopen(p->value.string, "rb");
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->sub_pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->sub_pid)) return GF_EOS;
+		return GF_OK;
+	}
+
+	/*data =*/ gf_filter_pck_get_data(pck, &pkt_size);
+	gf_filter_pck_get_framing(pck, &start, &end);
+	//for now we only work with complete files
+	assert(end);
+
+	nb_eos = 0;
+	count = gf_filter_get_opid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *opid = gf_filter_get_opid(filter, i);
+		GF_Err e = vobsubdmx_send_stream(ctx, opid);
+		if (e==GF_EOS) {
+			nb_eos++;
+			gf_filter_pid_set_eos(opid);
+		}
+	}
+
+	if (nb_eos==count) {
+		//only drop packet once we are done
+		gf_filter_pid_drop_packet(ctx->sub_pid);
+		return GF_EOS;
+	}
+	return GF_OK;
+}
+
+static void vobsubdmx_finalize(GF_Filter *filter)
+{
+	GF_VOBSubDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->vobsub) vobsub_free(ctx->vobsub);
+	if (ctx->mdia) gf_fclose(ctx->mdia);
+}
+
+static const char * vobsubdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (!strncmp(data, "# VobSub", 8)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "text/vobsub";
+	}
+	return NULL;
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_VOBSubDmxCtx, _n)
+static const GF_FilterArgs GF_VOBSubDmxArgs[] =
+{
+	{ OFFS(blankframe), "force inserting a blank frame if first subpic is not at 0", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+static const GF_FilterCapability VOBSubDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "idx|sub"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "text/vobsub"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SUBPIC),
+};
+
+
+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.")
+	.private_size = sizeof(GF_VOBSubDmxCtx),
+	.max_extra_pids = 1,
+	.args = GF_VOBSubDmxArgs,
+	.finalize = vobsubdmx_finalize,
+	SETCAPS(VOBSubDmxCaps),
+	.configure_pid = vobsubdmx_configure_pid,
+	.process = vobsubdmx_process,
+	.probe_data = vobsubdmx_probe_data,
+	.process_event = vobsubdmx_process_event
+};
+
+#endif
+
+const GF_FilterRegister *vobsubdmx_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_VOBSUB
+	return &VOBSubDmxRegister;
+#else
+	return NULL;
+#endif
+
+}
+

gpac-1.0.0.tar.gz/src/filters/enc_jpg.c Added

@@ -0,0 +1,409 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / libjpeg encoder 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>
+
+#ifdef GPAC_HAS_JPEG
+
+#ifdef WIN32
+#define HAVE_UNSIGNED_CHAR
+#endif
+
+#include <jpeglib.h>
+#include <setjmp.h>
+
+typedef struct
+{
+	//opts
+	u32 dctmode;
+	u32 quality;
+
+	GF_FilterPid *ipid, *opid;
+	u32 width, height, pixel_format, stride, stride_uv, nb_planes, uv_height;
+
+	GF_FilterPacket *dst_pck;
+	u8 *output;
+
+	/*io manager*/
+	struct jpeg_destination_mgr dst;
+	u32 dst_pck_size, max_size;
+
+	struct jpeg_error_mgr pub;
+	jmp_buf jmpbuf;
+
+	Bool in_fmt_negotiate;
+} GF_JPGEncCtx;
+
+static GF_Err jpgenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	char n[100];
+	const GF_PropertyValue *prop;
+	GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) gf_filter_get_udta(filter);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		//one in one out, this is simple
+		gf_filter_pid_remove(ctx->opid);
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+
+	ctx->ipid = pid;
+
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_JPEG ));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, NULL);
+	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);
+
+#ifdef JPEG_LIB_VERSION_MAJOR
+	sprintf(n, "encjpg:%d.%d", JPEG_LIB_VERSION_MAJOR, JPEG_LIB_VERSION_MINOR);
+#else
+	sprintf(n, "encjpg:%d", JPEG_LIB_VERSION);
+#endif
+	
+	gf_filter_set_name(filter, n);
+
+	//some props may not be set yet
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (!prop) return GF_OK;
+	ctx->width = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (!prop) return GF_OK;
+	ctx->height = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (!prop) return GF_OK;
+	ctx->pixel_format = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+	if (prop) ctx->stride = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+	if (prop) ctx->stride_uv = prop->value.uint;
+
+	gf_pixel_get_size_info(ctx->pixel_format, ctx->width, ctx->height, NULL, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+
+
+	//TODO: for now we only allow YUV420p input, we should refine this to allow any YUV
+	if (ctx->pixel_format != GF_PIXEL_YUV) {
+		gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_YUV));
+		ctx->in_fmt_negotiate = GF_TRUE;
+		return GF_OK;
+	}
+	ctx->in_fmt_negotiate = GF_FALSE;
+	return GF_OK;
+}
+
+static void jpgenc_output_message (j_common_ptr cinfo)
+{
+	if (cinfo) {
+		char buffer[JMSG_LENGTH_MAX];
+		/* Create the message */
+		(*cinfo->err->format_message) (cinfo, buffer);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc]: %s\n", buffer));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[JPGEnc] coverage test\n"));
+	}
+}
+static void jpgenc_nonfatal_error2(j_common_ptr cinfo, int lev)
+{
+	if (cinfo) {
+		char buffer[JMSG_LENGTH_MAX];
+		/* Create the message */
+		(*cinfo->err->format_message) (cinfo, buffer);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc]: %s\n", buffer));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[JPGEnc] coverage test\n"));
+	}
+}
+
+static void jpgenc_fatal_error(j_common_ptr cinfo)
+{
+	if (!cinfo) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[JPGEnc] coverage test\n"));
+	} else {
+		GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) cinfo->client_data;
+		jpgenc_output_message(cinfo);
+		longjmp(ctx->jmpbuf, 1);
+	}
+}
+
+//start with 4k when we have no clue about the size
+#define ALLOC_STEP_SIZE 4096
+static void jpgenc_init_dest(j_compress_ptr cinfo)
+{
+	GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) cinfo->client_data;
+	if (ctx->dst_pck)
+		return;
+
+	ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ALLOC_STEP_SIZE, &ctx->output);
+    cinfo->dest->next_output_byte = ctx->output;
+    cinfo->dest->free_in_buffer = ALLOC_STEP_SIZE;
+    ctx->dst_pck_size += ALLOC_STEP_SIZE;
+}
+
+static boolean jpgenc_empty_output(j_compress_ptr cinfo)
+{
+	u8 *data;
+	u32 new_size;
+	GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) cinfo->client_data;
+
+	if (!ctx->dst_pck)
+		return FALSE;
+
+	if (gf_filter_pck_expand(ctx->dst_pck, ALLOC_STEP_SIZE, &ctx->output, &data, &new_size) != GF_OK) {
+		return FALSE;
+	}
+    cinfo->dest->next_output_byte = data;
+    cinfo->dest->free_in_buffer = ALLOC_STEP_SIZE;
+    ctx->dst_pck_size += ALLOC_STEP_SIZE;
+	return TRUE;
+}
+
+static void jpgenc_term_dest(j_compress_ptr cinfo)
+{
+	GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) cinfo->client_data;
+
+    ctx->dst_pck_size -= (u32) cinfo->dest->free_in_buffer;
+	gf_filter_pck_truncate(ctx->dst_pck, ctx->dst_pck_size);
+}
+
+static GF_Err jpgenc_process(GF_Filter *filter)
+{
+    GF_JPGEncCtx *ctx = (GF_JPGEncCtx *) gf_filter_get_udta(filter);
+	GF_Err e = GF_OK;
+	struct jpeg_compress_struct cinfo;
+	GF_FilterPacket *pck = NULL;
+	char *in_data;
+	GF_FilterFrameInterface *frame_ifce = NULL;
+	u32 size, stride, stride_uv;
+    u32 i, j;
+    u8 *pY, *pU, *pV;
+    JSAMPROW y[16],cb[16],cr[16];
+    JSAMPARRAY block[3];
+
+	if (ctx->ipid)
+		pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!ctx->ipid)
+		return GF_EOS;
+
+	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->in_fmt_negotiate) return GF_OK;
+
+	in_data = (char *) gf_filter_pck_get_data(pck, &size);
+	if (!in_data) {
+		frame_ifce = gf_filter_pck_get_frame_interface(pck);
+		if (!frame_ifce || !frame_ifce->get_plane) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NOT_SUPPORTED;
+		}
+	}
+
+    block[0] = y;
+    block[1] = cb;
+    block[2] = cr;
+
+	cinfo.err = jpeg_std_error(&(ctx->pub));
+	cinfo.client_data = ctx;
+	ctx->pub.error_exit = jpgenc_fatal_error;
+	ctx->pub.output_message = jpgenc_output_message;
+	ctx->pub.emit_message = jpgenc_nonfatal_error2;
+	if (setjmp(ctx->jmpbuf)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc] : Failed to encode\n"));
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		goto exit;
+	}
+
+	ctx->dst.init_destination = jpgenc_init_dest;
+	ctx->dst.empty_output_buffer = jpgenc_empty_output;
+	ctx->dst.term_destination = jpgenc_term_dest;
+
+	if (ctx->max_size) {
+		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->max_size, &ctx->output);
+		ctx->dst.next_output_byte = ctx->output;
+		ctx->dst.free_in_buffer = ctx->max_size;
+		ctx->dst_pck_size = ctx->max_size;
+	}
+
+	jpeg_create_compress(&cinfo);
+	cinfo.image_width = ctx->width;
+	cinfo.image_height = ctx->height;
+	cinfo.input_components = 3;
+	cinfo.in_color_space = JCS_YCbCr;
+	if (ctx->dctmode==0) cinfo.dct_method = JDCT_ISLOW;
+	else if (ctx->dctmode==2) cinfo.dct_method = JDCT_FLOAT;
+	else cinfo.dct_method = JDCT_IFAST;
+	cinfo.optimize_coding = TRUE;
+	jpeg_set_defaults (&cinfo);
+
+	cinfo.raw_data_in = TRUE;
+	cinfo.comp_info[0].h_samp_factor = 2;
+	cinfo.comp_info[0].v_samp_factor = 2;
+	cinfo.comp_info[1].h_samp_factor = 1;
+	cinfo.comp_info[1].v_samp_factor = 1;
+	cinfo.comp_info[2].h_samp_factor = 1;
+	cinfo.comp_info[2].v_samp_factor = 1;
+#ifdef JPEG_LIB_VERSION_MAJOR
+	cinfo.do_fancy_downsampling = FALSE;
+#endif
+	jpeg_set_colorspace(&cinfo, JCS_YCbCr);
+	jpeg_set_quality(&cinfo, MIN(100, ctx->quality), TRUE);
+
+	cinfo.dest = &ctx->dst;
+
+	jpeg_start_compress (&cinfo, TRUE);
+
+	stride = ctx->stride;
+	stride_uv = ctx->stride_uv;
+	pY = pU = pV = 0;
+	if (in_data) {
+		pY = in_data;
+		pU = pY + ctx->stride * ctx->height;
+		pV = pU + ctx->stride_uv * ctx->height/2;
+	} else {
+		e = frame_ifce->get_plane(frame_ifce, 0, (const u8 **)&pY, &stride);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc] Failed to fetch first plane in hardware frame\n"));
+			goto exit;
+		}
+		if (ctx->nb_planes>1) {
+			e = frame_ifce->get_plane(frame_ifce, 1, (const u8 **)&pU, &stride_uv);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc] Failed to fetch first plane in hardware frame\n"));
+				goto exit;
+			}
+			if (ctx->nb_planes>2) {
+				e = frame_ifce->get_plane(frame_ifce, 2, (const u8 **)&pV, &stride_uv);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPGEnc] Failed to fetch first plane in hardware frame\n"));
+					goto exit;
+				}
+			}
+		}
+	}
+
+	for (j=0; j<ctx->height; j+=16) {
+		for (i=0;i<16;i++) {
+			y[i] = pY + stride*(i+j);
+			if (i%2 == 0) {
+				cb[i/2] = pU + stride_uv*((i+j)/2);
+				cr[i/2] = pV + stride_uv*((i+j)/2);
+			}
+		}
+		jpeg_write_raw_data (&cinfo, block, 16);
+  	}
+    jpeg_finish_compress(&cinfo);
+
+exit:
+
+    jpeg_destroy_compress(&cinfo);
+	if (ctx->dst_pck) {
+		if (!e) {
+			gf_filter_pck_merge_properties(pck, ctx->dst_pck);
+			gf_filter_pck_send(ctx->dst_pck);
+		} else {
+			gf_filter_pck_discard(ctx->dst_pck);
+		}
+	}
+	if (ctx->max_size<ctx->dst_pck_size)
+		ctx->max_size = ctx->dst_pck_size;
+
+	ctx->dst_pck = NULL;
+	ctx->output = NULL;
+	ctx->dst_pck_size = 0;
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err jpgenc_initialize(GF_Filter *filter)
+{
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		jpgenc_output_message(NULL);
+		jpgenc_nonfatal_error2(NULL, 0);
+		jpgenc_fatal_error(NULL);
+	}
+#endif
+	return GF_OK;
+}
+
+static const GF_FilterCapability JPGEncCaps[] =
+{
+	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_UINT(GF_CAPS_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_JPEG)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_JPGEncCtx, _n)
+static GF_FilterArgs JPGEncArgs[] =
+{
+	{ OFFS(dctmode), "type of DCT used\n"
+	"- slow: precise but slow integer DCT\n"
+	"- fast: less precise but faster integer DCT\n"
+	"- float: float DCT"
+	"", GF_PROP_UINT, "fast", "slow|fast|float", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(quality), "compression quality", GF_PROP_UINT, "100", "0-100", GF_FS_ARG_UPDATE},
+	{0}
+};
+
+GF_FilterRegister JPGEncRegister = {
+	.name = "jpgenc",
+	GF_FS_SET_DESCRIPTION("JPG encoder")
+	GF_FS_SET_HELP("This filter encodes a single uncompressed video PID to JPEG using libjpeg.")
+	.private_size = sizeof(GF_JPGEncCtx),
+	.args = JPGEncArgs,
+	SETCAPS(JPGEncCaps),
+	.initialize = jpgenc_initialize,
+	.configure_pid = jpgenc_configure_pid,
+	.process = jpgenc_process,
+};
+
+#endif
+
+const GF_FilterRegister *jpgenc_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_JPEG
+	return &JPGEncRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/enc_png.c Added

@@ -0,0 +1,387 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / libpng encoder 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/avparse.h>
+
+#ifdef GPAC_HAS_PNG
+
+#include <png.h>
+
+typedef struct
+{
+	//opts
+	u32 dctmode;
+	u32 quality;
+
+	GF_FilterPid *ipid, *opid;
+	u32 width, height, pixel_format, stride, stride_uv, nb_planes, uv_height;
+	u32 nb_alloc_rows;
+
+	u32 max_size, pos, alloc_size;
+	u32 png_type;
+	png_bytep *row_pointers;
+
+	GF_FilterPacket *dst_pck;
+	u8 *output;
+
+} GF_PNGEncCtx;
+
+static GF_Err pngenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_PNGEncCtx *ctx = (GF_PNGEncCtx *) gf_filter_get_udta(filter);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		//one in one out, this is simple
+		gf_filter_pid_remove(ctx->opid);
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	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);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_PNG ));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, NULL);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, NULL);
+	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_set_name(filter, "encpng:"PNG_LIBPNG_VER_STRING );
+	//not yeat ready
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (!prop) return GF_OK;
+	ctx->width = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (!prop) return GF_OK;
+	ctx->height = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (!prop) return GF_OK;
+	ctx->pixel_format = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+	if (prop) ctx->stride = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+	if (prop) ctx->stride_uv = prop->value.uint;
+
+	gf_pixel_get_size_info(ctx->pixel_format, ctx->width, ctx->height, NULL, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+
+	switch (ctx->pixel_format) {
+	case GF_PIXEL_GREYSCALE:
+		ctx->png_type = PNG_COLOR_TYPE_GRAY;
+		break;
+	case GF_PIXEL_GREYALPHA:
+		ctx->png_type = PNG_COLOR_TYPE_GRAY_ALPHA;
+		break;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XBGR:
+		ctx->png_type = PNG_COLOR_TYPE_RGB;
+		break;
+	case GF_PIXEL_RGBA:
+		ctx->png_type = PNG_COLOR_TYPE_RGB_ALPHA;
+		break;
+	default:
+		gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_RGB));
+		break;
+	}
+	if (ctx->height > ctx->nb_alloc_rows) {
+		ctx->nb_alloc_rows = ctx->height;
+		ctx->row_pointers = gf_realloc(ctx->row_pointers, sizeof(png_bytep) * ctx->height);
+	}
+	return GF_OK;
+}
+
+static void pngenc_finalize(GF_Filter *filter)
+{
+	GF_PNGEncCtx *ctx = (GF_PNGEncCtx *) gf_filter_get_udta(filter);
+	if (ctx->row_pointers) gf_free(ctx->row_pointers);
+}
+
+#define PNG_BLOCK_SIZE	4096
+
+static void pngenc_write(png_structp png, png_bytep data, png_size_t size)
+{
+	GF_PNGEncCtx *ctx = (GF_PNGEncCtx *)png_get_io_ptr(png);
+	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);
+	} else if (ctx->pos + size > ctx->alloc_size) {
+		u8 *new_data;
+		u32 new_size;
+		u32 old_size = ctx->alloc_size;
+		while (ctx->pos + size > ctx->alloc_size)
+			ctx->alloc_size += PNG_BLOCK_SIZE;
+		
+		if (gf_filter_pck_expand(ctx->dst_pck, ctx->alloc_size - old_size, &ctx->output, &new_data, &new_size) != GF_OK) {
+			return;
+		}
+	}
+
+	memcpy(ctx->output + ctx->pos, data, sizeof(char)*size);
+	ctx->pos += (u32) size;
+}
+
+void pngenc_flush(png_structp png)
+{
+	if (!png) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[PNGEnc] coverage test\n"));
+	}
+}
+
+static void pngenc_error(png_structp cbk, png_const_charp msg)
+{
+	if (msg) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[PNGEnc] Error %s", msg));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[PNGEnc] coverage test\n"));
+	}
+}
+static void pngenc_warn(png_structp cbk, png_const_charp msg)
+{
+	if (msg) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[PNGEnc] Warning %s", msg));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[PNGEnc] coverage test\n"));
+	}
+}
+
+static GF_Err pngenc_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	GF_PNGEncCtx *ctx = (GF_PNGEncCtx *) gf_filter_get_udta(filter);
+	png_color_8 sig_bit;
+	u32 k;
+	GF_Err e = GF_OK;
+	png_structp png_ptr;
+	png_infop info_ptr;
+	char *in_data;
+	u32 size, stride;
+
+	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;
+	}
+	stride = ctx->stride;
+	in_data = (char *) gf_filter_pck_get_data(pck, &size);
+	if (!in_data) {
+		GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+		if (!frame_ifce || !frame_ifce->get_plane) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NOT_SUPPORTED;
+		}
+		e = frame_ifce->get_plane(frame_ifce, 0, (const u8 **) &in_data, &stride);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[PNGEnc] Failed to fetch first plane in hardware frame\n"));
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NOT_SUPPORTED;
+		}
+	}
+
+	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, ctx, pngenc_error, pngenc_warn);
+
+	if (png_ptr == NULL) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_IO_ERR;
+	}
+
+	/* Allocate/initialize the image information data.  REQUIRED */
+	info_ptr = png_create_info_struct(png_ptr);
+	if (info_ptr == NULL) {
+		png_destroy_write_struct(&png_ptr, NULL);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_IO_ERR;
+	}
+
+	/* Set error handling.  REQUIRED if you aren't supplying your own
+	* error handling functions in the png_create_write_struct() call.
+	*/
+	if (setjmp(png_jmpbuf(png_ptr))) {
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		goto exit;
+	}
+
+	ctx->output = NULL;
+	ctx->pos = 0;
+	if (ctx->max_size) {
+		ctx->dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->max_size, &ctx->output);
+		ctx->alloc_size = ctx->max_size;
+	}
+	png_set_write_fn(png_ptr, ctx, pngenc_write, pngenc_flush);
+
+	png_set_IHDR(png_ptr, info_ptr, ctx->width, ctx->height, 8, ctx->png_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+
+	memset(&sig_bit, 0, sizeof(sig_bit));
+	switch (ctx->png_type) {
+	case PNG_COLOR_TYPE_GRAY:
+		sig_bit.gray = 8;
+		break;
+	case PNG_COLOR_TYPE_GRAY_ALPHA:
+		sig_bit.gray = 8;
+		sig_bit.alpha = 8;
+		break;
+	case PNG_COLOR_TYPE_RGB_ALPHA:
+		sig_bit.alpha = 8;
+	case PNG_COLOR_TYPE_RGB:
+		sig_bit.red = 8;
+		sig_bit.green = 8;
+		sig_bit.blue = 8;
+		break;
+	default:
+		break;
+	}
+	png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+
+	//todo add support for tags
+#if 0
+	{
+	png_text text_ptr[3];
+	/* Optionally write comments into the image */
+	text_ptr[0].key = "Title";
+	text_ptr[0].text = "Mona Lisa";
+	text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE;
+	text_ptr[1].key = "Author";
+	text_ptr[1].text = "Leonardo DaVinci";
+	text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE;
+	text_ptr[2].key = "Description";
+	text_ptr[2].text = "<long text>";
+	text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt;
+	png_set_text(png_ptr, info_ptr, text_ptr, 3);
+	}
+#endif
+
+	png_write_info(png_ptr, info_ptr);
+
+	/* Shift the pixels up to a legal bit depth and fill in
+	* as appropriate to correctly scale the image.
+	*/
+	png_set_shift(png_ptr, &sig_bit);
+
+	/* pack pixels into bytes */
+	png_set_packing(png_ptr);
+
+	switch (ctx->pixel_format) {
+	case GF_PIXEL_ARGB:
+		png_set_bgr(png_ptr);
+		break;
+	case GF_PIXEL_RGBX:
+		png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+		png_set_bgr(png_ptr);
+		break;
+	case GF_PIXEL_BGRX:
+		png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
+		break;
+	case GF_PIXEL_BGR:
+		png_set_bgr(png_ptr);
+		break;
+	}
+	for (k=0; k<ctx->height; k++) {
+		ctx->row_pointers[k] = (png_bytep) in_data + k*stride;
+	}
+
+	png_write_image(png_ptr, ctx->row_pointers);
+	png_write_end(png_ptr, info_ptr);
+
+exit:
+	/* clean up after the write, and free any memory allocated */
+	png_destroy_write_struct(&png_ptr, &info_ptr);
+	if (ctx->dst_pck) {
+		if (!e) {
+			gf_filter_pck_truncate(ctx->dst_pck, ctx->pos);
+			gf_filter_pck_merge_properties(pck, ctx->dst_pck);
+			gf_filter_pck_send(ctx->dst_pck);
+		} else {
+			gf_filter_pck_discard(ctx->dst_pck);
+		}
+	}
+	if (ctx->max_size<ctx->pos)
+		ctx->max_size = ctx->pos;
+
+	ctx->dst_pck = NULL;
+	ctx->output = NULL;
+	ctx->pos = ctx->alloc_size = 0;
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err pngenc_initialize(GF_Filter *filter)
+{
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		pngenc_flush(NULL);
+		pngenc_error(NULL, NULL);
+		pngenc_warn(NULL, NULL);
+	}
+#endif
+	return GF_OK;
+}
+
+static const GF_FilterCapability PNGEncCaps[] =
+{
+	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_UINT(GF_CAPS_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_PNG)
+};
+
+GF_FilterRegister PNGEncRegister = {
+	.name = "pngenc",
+	GF_FS_SET_DESCRIPTION("PNG encoder")
+	GF_FS_SET_HELP("This filter encodes a single uncompressed video PID to PNG using libpng.")
+	.private_size = sizeof(GF_PNGEncCtx),
+	.initialize = pngenc_initialize,
+	.finalize = pngenc_finalize,
+	SETCAPS(PNGEncCaps),
+	.configure_pid = pngenc_configure_pid,
+	.process = pngenc_process,
+};
+
+#endif
+
+const GF_FilterRegister *pngenc_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_PNG
+	return &PNGEncRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/encrypt_cenc_isma.c Added

@@ -0,0 +1,1890 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / CENC and ISMA encrypt module
+ *
+ *  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/crypt_tools.h>
+#include <gpac/crypt.h>
+#include <gpac/base_coding.h>
+#include <gpac/download.h>
+#include <gpac/xml.h>
+#include <gpac/internal/isomedia_dev.h>
+
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_CRYPTO
+
+
+enum
+{
+	ISMAEA_STATE_ERROR,
+	ISMAEA_STATE_SETUP,
+	ISMAEA_STATE_PLAY,
+};
+
+
+typedef enum {
+	CENC_FULL_SAMPLE,
+
+	/*below types may have several ranges (clear/encrypted) per sample*/
+	CENC_AVC, /*AVC, nalu-based*/
+	CENC_HEVC, /*HEVC, nalu-based*/
+	CENC_AV1,  /*AV1, OBU-based*/
+	CENC_VPX,  /*VPX, custom, see https://www.webmproject.org/vp9/mp4/ */
+} CENCCodecMode;
+
+
+typedef struct
+{
+	Bool passthrough;
+
+	GF_CryptInfo *cinfo;
+
+	GF_FilterPid *ipid;
+	GF_FilterPid *opid;
+	GF_TrackCryptInfo *tci;
+	GF_Crypt *crypt;
+	u32 codec_id;
+
+	u32 nb_pck;
+
+	//ISMA/OMA var
+	u32 nalu_size_length;
+	u32 dsi_crc;
+	Bool isma_oma;
+	u64 BSO;
+	u64 range_end;
+	Bool prev_pck_encryped;
+	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;
+
+	//true if using AES-CTR mode, false if using AES-CBC mode
+	Bool ctr_mode;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	AVCState avc;
+#ifndef GPAC_DISABLE_HEVC
+	HEVCState hevc;
+#endif
+	AV1State av1;
+#endif
+	Bool slice_header_clear;
+} GF_CENCStream;
+
+typedef struct
+{
+	//options
+	const char *cfile;
+	Bool allc;
+	
+	//internal
+	GF_CryptInfo *cinfo;
+
+	GF_List *streams;
+	GF_BitStream *bs_w, *bs_r;
+} GF_CENCEncCtx;
+
+
+static GF_Err isma_enc_configure(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, Bool is_isma, const char *scheme_uri, const char *kms_uri)
+{
+	GF_Err e;
+	bin128 IV;
+	const GF_PropertyValue *p;
+	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	switch (cstr->codec_id) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		if (p) {
+			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(p->value.data.ptr, p->value.data.size);
+			cstr->nalu_size_length = avcc ? avcc->nal_unit_size : 0;
+			if (avcc) gf_odf_avc_cfg_del(avcc);
+		}
+		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;
+	case GF_CODECID_HEVC:
+	case GF_CODECID_LHVC:
+		if (p) {
+			GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, (cstr->codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+			cstr->nalu_size_length = hvcc ? hvcc->nal_unit_size : 0;
+			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+		}
+		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";
+
+	if (cstr->tci && ((cstr->tci->sel_enc_type==GF_CRYPT_SELENC_RAND) || (cstr->tci->sel_enc_type==GF_CRYPT_SELENC_RAND_RANGE)) ) {
+		gf_rand_init(1);
+	}
+
+	cstr->isma_IV_size = 0;
+	if (!is_isma) {
+		/*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);
+		if (p) {
+			cstr->isma_IV_size = p->value.uint;
+		} else {
+			p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_MEDIA_DATA_SIZE);
+			if (p) {
+				u64 BSO = p->value.longuint;
+
+				if (BSO<0xFFFF) cstr->isma_IV_size = 2;
+				else if (BSO<0xFFFFFFFF) cstr->isma_IV_size = 4;
+				else cstr->isma_IV_size = 8;
+			}
+		}
+		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"));
+		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"));
+		return GF_IO_ERR;
+	}
+
+	e = gf_crypt_init(cstr->crypt, cstr->tci->keys[0], IV);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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" : ""));
+
+	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);
+		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);
+		strcpy(cstr->tci->KMS_URI, "(key)");
+		strcat(cstr->tci->KMS_URI, d64);
+		kms_uri = cstr->tci->KMS_URI;
+	}
+
+	/*create ISMA protection*/
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_VERSION, &PROP_UINT(1) );
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_KMS_URI, kms_uri ? &PROP_STRING(kms_uri) : NULL);
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ISMA_SELECTIVE_ENC, &PROP_BOOL( (cstr->tci->sel_enc_type!=0) ? GF_TRUE : GF_FALSE) );
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ISMA_IV_LENGTH, &PROP_UINT(cstr->isma_IV_size) );
+
+	if (is_isma) {
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_PROTECTION_SCHEME_URI, scheme_uri ? &PROP_STRING(scheme_uri) : NULL );
+	} else {
+		if ((cstr->tci->sel_enc_type==GF_CRYPT_SELENC_PREVIEW) && cstr->tci->sel_enc_range) {
+			char szSTR[100];
+			u32 len;
+			char *szPreview;
+
+			sprintf(szSTR, "PreviewRange:%d", cstr->tci->sel_enc_range);
+			len = (u32) strlen(szSTR) + ( cstr->tci->TextualHeaders ? (u32) strlen(cstr->tci->TextualHeaders) : 0 ) + 1;
+			szPreview = gf_malloc(sizeof(char) * len);
+			strcpy(szPreview, cstr->tci->TextualHeaders ? cstr->tci->TextualHeaders : "");
+			strcat(szPreview, szSTR);
+
+			gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_TXT_HDR, &PROP_STRING_NO_COPY(szPreview));
+		} else {
+			gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_TXT_HDR, cstr->tci->TextualHeaders ? &PROP_STRING(cstr->tci->TextualHeaders) : NULL);
+		}
+
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_CID, scheme_uri ? &PROP_STRING(scheme_uri) : NULL );
+
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_CRYPT_TYPE, &PROP_UINT(cstr->tci->encryption));
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_OMA_CLEAR_LEN, &PROP_LONGUINT(cstr->tci->sel_enc_range) );
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_ISMA_KI_LENGTH, &PROP_UINT(0) );
+	}
+
+	cstr->range_end = 0;
+	if (cstr->tci->sel_enc_type==GF_CRYPT_SELENC_PREVIEW) {
+		p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_TIMESCALE);
+		if (p)
+			cstr->range_end = p->value.uint *cstr->tci->sel_enc_range;
+	}
+
+	cstr->isma_oma = GF_TRUE;
+	cstr->prev_pck_encryped = GF_TRUE;
+	cstr->has_crypted_pck = GF_FALSE;
+
+	//we drop IPMPX support for now
+#if GPAC_DEPRECTAED
+	/*format as IPMP(X) - note that the ISMACryp spec is broken since it always uses IPMPPointers to a
+	single desc which would assume the same protection (eg key & salt) for all streams using it...*/
+	if (!tci->ipmp_type) return GF_OK;
+
+	ipmpdp = (GF_IPMPPtr*)gf_odf_desc_new(GF_ODF_IPMP_PTR_TAG);
+	if (!tci->ipmp_desc_id) tci->ipmp_desc_id = track;
+	if (tci->ipmp_type==2) {
+		ipmpdp->IPMP_DescriptorID = 0xFF;
+		ipmpdp->IPMP_DescriptorIDEx = tci->ipmp_desc_id;
+	} else {
+		ipmpdp->IPMP_DescriptorID = tci->ipmp_desc_id;
+	}
+	gf_isom_add_desc_to_description(mp4, track, 1, (GF_Descriptor *)ipmpdp);
+	gf_odf_desc_del((GF_Descriptor*)ipmpdp);
+
+	ipmpdU = (GF_IPMPUpdate*)gf_odf_com_new(GF_ODF_IPMP_UPDATE_TAG);
+	/*format IPMPD*/
+	ipmpd = (GF_IPMP_Descriptor*)gf_odf_desc_new(GF_ODF_IPMP_TAG);
+	if (tci->ipmp_type==2) {
+#ifndef GPAC_MINIMAL_ODF
+		ipmpd->IPMP_DescriptorID = 0xFF;
+		ipmpd->IPMP_DescriptorIDEx = tci->ipmp_desc_id;
+		ipmpd->IPMPS_Type = 0xFFFF;
+		ipmpd->IPMP_ToolID[14] = 0x49;
+		ipmpd->IPMP_ToolID[15] = 0x53;
+		ipmpd->control_point = 1;
+		ipmpd->cp_sequence_code = 0x80;
+		/*format IPMPXData*/
+		ismac = (GF_IPMPX_ISMACryp *) gf_ipmpx_data_new(GF_IPMPX_ISMACRYP_TAG);
+		ismac->cryptoSuite = 1;	/*default ISMA AESCTR128*/
+		ismac->IV_length = IV_size;
+		ismac->key_indicator_length = 0;
+		ismac->use_selective_encryption = (tci->sel_enc_type!=0)? 1 : 0;
+		gf_list_add(ipmpd->ipmpx_data, ismac);
+#endif
+	} else {
+		ipmpd->IPMP_DescriptorID = tci->ipmp_desc_id;
+	}
+	gf_list_add(ipmpdU->IPMPDescList, ipmpd);
+
+	for (i=0; i<gf_isom_get_track_count(mp4); i++) {
+		GF_ODCodec *cod;
+		if (gf_isom_get_media_type(mp4, i+1) != GF_ISOM_MEDIA_OD) continue;
+
+		/*add com*/
+		samp = gf_isom_get_sample(mp4, i+1, 1, &di);
+		cod = gf_odf_codec_new();
+		gf_odf_codec_set_au(cod, samp->data, samp->dataLength);
+		gf_odf_codec_decode(cod);
+		gf_odf_codec_add_com(cod, (GF_ODCom *) ipmpdU);
+		gf_free(samp->data);
+		samp->data = NULL;
+		samp->dataLength = 0;
+		gf_odf_codec_encode(cod, 1);
+		gf_odf_codec_get_au(cod, &samp->data, &samp->dataLength);
+		ipmpdU = NULL;
+		gf_odf_codec_del(cod);
+		gf_isom_update_sample(mp4, i+1, 1, samp, 1);
+		gf_isom_sample_del(&samp);
+
+		if (tci->ipmp_type==2) {
+			GF_IPMP_ToolList*ipmptl = (GF_IPMP_ToolList*)gf_odf_desc_new(GF_ODF_IPMP_TL_TAG);
+			GF_IPMP_Tool *ipmpt = (GF_IPMP_Tool*)gf_odf_desc_new(GF_ODF_IPMP_TOOL_TAG);
+			gf_list_add(ipmptl->ipmp_tools, ipmpt);
+			ipmpt->IPMP_ToolID[14] = 0x49;
+			ipmpt->IPMP_ToolID[15] = 0x53;
+			gf_isom_add_desc_to_root_od(mp4, (GF_Descriptor *)ipmptl);
+			gf_odf_desc_del((GF_Descriptor *)ipmptl);
+		}
+		break;
+	}
+#endif
+	return GF_OK;
+}
+
+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"));
+		return GF_IO_ERR;
+	}
+
+	/*Adobe's protection scheme does not support selective key*/
+	memcpy(cstr->key, cstr->tci->keys[0], 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) ) );
+
+	cstr->is_adobe = GF_TRUE;
+
+	return GF_OK;
+}
+
+static GF_Err cenc_parse_pssh(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, const char *cfile_name)
+{
+	GF_DOMParser *parser;
+	GF_XMLNode *root, *node;
+	u32 i;
+	GF_Err e;
+	u32 nb_pssh=0;
+	GF_BitStream *pssh_bs=NULL;
+
+	parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(parser, cfile_name, NULL, NULL);
+	if (e) {
+		gf_xml_dom_del(parser);
+		return e;
+	}
+	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));
+		return GF_NOT_SUPPORTED;
+	}
+	pssh_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u32(pssh_bs, 0);
+
+	i=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
+		Bool is_pssh;
+		u32 version, cypherMode, specInfoSize, len, KID_count, j;
+		bin128 cypherKey, cypherIV, systemID;
+		GF_XMLAttribute *att;
+		u8 *data, *specInfo;
+		GF_BitStream *bs;
+		bin128 *KIDs;
+		s32 cypherOffset = -1;
+		Bool has_key = GF_FALSE, has_IV = GF_FALSE;
+
+		if (strcmp(node->name, "DRMInfo")) continue;
+
+		j = 0;
+		is_pssh = GF_FALSE;
+		version = cypherMode = 0;
+		data = specInfo = NULL;
+		bs = NULL;
+
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!strcmp(att->name, "type")) {
+				if (!strcmp(att->value, "pssh"))
+					is_pssh = GF_TRUE;
+			} else if (!strcmp(att->name, "version")) {
+				version = atoi(att->value);
+			} else if (!strcmp(att->name, "cypherMode")) {
+				/*cypher-mode: 0: ctr (default mode) -  1: cbc - 2: clear*/
+				if (!strcmp(att->value, "yes"))
+					cypherMode = 0;
+				else if (!strcmp(att->value, "no"))
+					cypherMode = 1;
+			} 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;
+                }
+				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;
+                }
+				has_IV = GF_TRUE;
+			} else if (!strcmp(att->name, "cypherOffset")) {
+				cypherOffset = atoi(att->value);
+			}
+		}
+
+		if (!is_pssh) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[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;
+		}
+
+		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);
+			KIDs = (bin128 *)gf_malloc(KID_count*sizeof(bin128));
+			for (j = 0; j < KID_count; j++) {
+				gf_bs_read_data(bs, (char *)KIDs[j], 16);
+			}
+		}
+		else {
+			KID_count = 0;
+			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));
+			continue;
+		}
+		len = specInfoSize - 16 - (version ? 4 + 16*KID_count : 0);
+		data = (char *)gf_malloc(len*sizeof(char));
+		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;
+			}
+			e = gf_crypt_init(gc, cypherKey, cypherIV);
+			gf_crypt_encrypt(gc, data+cypherOffset, len-cypherOffset);
+			gf_crypt_close(gc);
+		}
+		if (!e) {
+			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);
+			}
+			gf_bs_write_u32(pssh_bs, len);
+			gf_bs_write_data(pssh_bs, data, len);
+		}
+
+		if (specInfo) gf_free(specInfo);
+		if (data) gf_free(data);
+		if (KIDs) gf_free(KIDs);
+		if (bs) gf_bs_del(bs);
+		if (e) break;
+	}
+
+	gf_xml_dom_del(parser);
+
+	if (nb_pssh) {
+		u8 *pssh=NULL;
+		u32 pssh_size=0;
+		u32 pos = (u32) gf_bs_get_position(pssh_bs);
+		gf_bs_seek(pssh_bs, 0);
+		gf_bs_write_u32(pssh_bs, nb_pssh);
+		gf_bs_seek(pssh_bs, pos);
+		gf_bs_get_content(pssh_bs, &pssh, &pssh_size);
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_PSSH, &PROP_DATA_NO_COPY(pssh, pssh_size));
+	}
+	gf_bs_del(pssh_bs);
+
+	return e;
+}
+
+
+static GF_Err cenc_enc_configure(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, const char *cfile_name)
+{
+#if !defined(GPAC_DISABLE_AV_PARSERS)
+	u32 i;
+#endif
+	u32 dsi_crc=0;
+	Bool is_reinit=GF_FALSE;
+	GF_AVCConfig *avccfg;
+	GF_HEVCConfig *hevccfg;
+	const GF_PropertyValue *p;
+
+	p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) p = gf_filter_pid_get_property(cstr->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	if (p) {
+		dsi_crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+	}
+	if (dsi_crc != cstr->dsi_crc)
+		is_reinit = GF_TRUE;
+	else if (!dsi_crc && !cstr->crypt)
+		is_reinit = GF_TRUE;
+
+	cstr->dsi_crc = dsi_crc;
+
+	if (is_reinit) {
+		const GF_PropertyValue *p2;
+		cstr->nalu_size_length = 0;
+		switch (cstr->codec_id) {
+		case GF_CODECID_AVC:
+		case GF_CODECID_SVC:
+		case GF_CODECID_MVC:
+			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) {
+					cstr->slice_header_clear = GF_TRUE;
+				} else if (cstr->tci->scheme_type==GF_CRYPT_TYPE_CBCS) {
+					cstr->slice_header_clear = GF_TRUE;
+				}
+			} else {
+				cstr->slice_header_clear = GF_TRUE;
+			}
+#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);
+				}
+				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_odf_avc_cfg_del(avccfg);
+			}
+#else
+			if (avccfg) gf_odf_avc_cfg_del(avccfg);
+#endif
+			cstr->bytes_in_nal_hdr = 1;
+
+			if (!cstr->slice_header_clear && cstr->tci->clear_bytes)
+				cstr->bytes_in_nal_hdr = cstr->tci->clear_bytes;
+
+			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;
+		case GF_CODECID_HEVC:
+		case GF_CODECID_LHVC:
+			if (!p)
+				return GF_OK;
+
+			hevccfg = gf_odf_hevc_cfg_read(p->value.data.ptr, p->value.data.size, (cstr->codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+			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);
+#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;
+
+			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;
+		case GF_CODECID_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->bytes_in_nal_hdr = 2;
+#endif
+			//mandatory for AV1
+			cstr->slice_header_clear = GF_TRUE;
+			break;
+		case GF_CODECID_VP8:
+		case GF_CODECID_VP9:
+			if (p) {
+			cstr->cenc_codec = CENC_VPX;
+				cstr->bytes_in_nal_hdr = 2;
+			}
+			break;
+		}
+	}
+
+	if (((cstr->tci->scheme_type == GF_CRYPT_TYPE_CENS) || (cstr->tci->scheme_type == GF_CRYPT_TYPE_CBCS) ) && (cstr->cenc_codec>CENC_FULL_SAMPLE) && (cstr->cenc_codec<=CENC_AV1)
+	)  {
+		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"));
+			}
+			cstr->tci->crypt_byte_block = 1;
+			cstr->tci->skip_byte_block = 9;
+		}
+	}
+
+	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) ));
+		return GF_NOT_SUPPORTED;
+	}
+
+
+	cstr->use_subsamples = GF_FALSE;
+	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) {
+		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"));
+			//cbcs allows bytes of clear data
+			cstr->bytes_in_nal_hdr = cstr->tci->clear_bytes;
+		}
+		//This is not clear in the spec, setting skip and crypt to 0 means no pattern, in which case tenc version shall be 0
+		//but cbcs asks for 1 - needs further clarification
+#if 0
+		//setup defaults
+		else if (!cstr->tci->crypt_byte_block) {
+			cstr->tci->crypt_byte_block = 1;
+		}
+#else
+		else {
+			cstr->tci->crypt_byte_block = 0;
+		}
+#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;
+		}
+	}
+
+	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);
+		}
+
+		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;
+		}
+
+		/*select key*/
+		if (!cstr->tci->keys) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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;
+		}
+		cstr->prev_pck_encryped = cstr->tci->IsEncrypted;
+	}
+
+	/*set CENC protection properties*/
+
+	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) );
+	} else {
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_IV_SIZE, 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) );
+	}
+
+	//parse pssh even if reinit since we need to reassign pssh property
+	return cenc_parse_pssh(ctx, cstr, cfile_name);
+}
+
+static GF_Err cenc_enc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	GF_Err e = GF_OK;
+	u32 scheme_type = 0;
+	GF_TrackCryptInfo *tci = NULL;
+	const char *scheme_uri = NULL;
+	const char *kms_uri = NULL;
+	GF_CryptInfo *cinfo = NULL;
+	GF_CENCStream *cstr;
+	GF_CENCEncCtx *ctx = (GF_CENCEncCtx *)gf_filter_get_udta(filter);
+	const char *cfile_name = ctx->cfile;
+	GF_TrackCryptInfo *tci_any = NULL;
+	u32 i, count;
+
+
+	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);
+		}
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	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;
+		}
+		cfile_name = prop->value.string;
+	}
+	if (!cinfo) cinfo = ctx->cinfo;
+
+
+	if (cinfo) {
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		count = gf_list_count(cinfo->tcis);
+		for (i=0; i<count; i++) {
+			tci = gf_list_get(cinfo->tcis, i);
+			if (prop && tci->trackID && (tci->trackID==prop->value.uint)) break;
+			if (!tci_any && !tci->trackID) tci_any = tci;
+			if ((cinfo != ctx->cinfo) && !tci_any) tci_any = tci;
+			tci = NULL;
+		}
+		if (!tci) tci = tci_any;
+	} else if (ctx->allc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] Missing DRM config file\n") );
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!tci) {
+		if (cinfo) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[CENCrypt] Missing track crypt info in DRM config file, PID will not be crypted\n") );
+		}
+	} else {
+		scheme_type = tci->scheme_type;
+
+		switch (scheme_type) {
+		case GF_CRYPT_TYPE_ISMA:
+		case GF_CRYPT_TYPE_OMA:
+		case GF_CRYPT_TYPE_ADOBE:
+		case GF_CRYPT_TYPE_CENC:
+		case GF_CRYPT_TYPE_CBC1:
+		case GF_CRYPT_TYPE_CENS:
+		case GF_CRYPT_TYPE_CBCS:
+		case GF_CRYPT_TYPE_PIFF:
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[CENCrypt] Unsupported scheme type %s\n", gf_4cc_to_str(scheme_type) ));
+			if (cinfo != ctx->cinfo) gf_crypt_info_del(cinfo);
+			return GF_NOT_SUPPORTED;
+		}
+	}
+
+	cstr = gf_filter_pid_get_udta(pid);
+	if (!cstr) {
+		GF_SAFEALLOC(cstr, GF_CENCStream);
+		if (!cstr) return GF_OUT_OF_MEM;
+		cstr->ipid = pid;
+		cstr->opid = gf_filter_pid_new(filter);
+		cstr->tci = tci;
+		gf_list_add(ctx->streams, cstr);
+		gf_filter_pid_set_udta(pid, cstr);
+	}
+	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;
+
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(cstr->opid, pid);
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	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) );
+
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		if (prop) {
+			switch (prop->value.uint) {
+			case GF_STREAM_VISUAL:
+			case GF_STREAM_AUDIO:
+			case GF_STREAM_SCENE:
+			case GF_STREAM_FONT:
+			case GF_STREAM_TEXT:
+				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) ));
+				cstr->passthrough = GF_TRUE;
+				break;
+			}
+		}
+		gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_CENC_STSD_MODE, &PROP_UINT(tci->force_clear_stsd_idx) );
+	}
+	
+	if (cstr->passthrough) return GF_OK;
+
+	gf_filter_pid_set_property(cstr->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_ENCRYPTED) );
+
+	scheme_uri = cstr->tci->Scheme_URI;
+	kms_uri = cstr->tci->KMS_URI;
+
+	/*default to FILE uri*/
+	if (!kms_uri || !strlen(kms_uri) ) {
+		kms_uri = cfile_name;
+	}
+
+	cstr->ctr_mode = GF_FALSE;
+
+	switch (scheme_type) {
+	case GF_CRYPT_TYPE_ISMA:
+		cstr->ctr_mode = GF_TRUE;
+		return isma_enc_configure(ctx, cstr, GF_TRUE, scheme_uri, kms_uri);
+	case GF_CRYPT_TYPE_OMA:
+		return isma_enc_configure(ctx, cstr, GF_FALSE, scheme_uri, kms_uri);
+	case GF_CRYPT_TYPE_ADOBE:
+		return adobe_enc_configure(ctx, cstr);
+	case GF_CRYPT_TYPE_CENC:
+	case GF_CRYPT_TYPE_CENS:
+	case GF_CRYPT_TYPE_PIFF:
+		cstr->ctr_mode = GF_TRUE;
+	case GF_CRYPT_TYPE_CBC1:
+	case GF_CRYPT_TYPE_CBCS:
+		return cenc_enc_configure(ctx, cstr, cfile_name);
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	return e;
+}
+
+
+static GF_Err isma_process(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, GF_FilterPacket *pck)
+{
+	u32 isma_hdr_size=0;
+	GF_FilterPacket *dst_pck;
+	const u8 *data;
+	u8 *output;
+	u32 size, rand, flags;
+	u64 cts = gf_filter_pck_get_cts(pck);
+	u8 sap = gf_filter_pck_get_sap(pck);
+
+
+	flags = 0;
+
+	switch (cstr->tci->sel_enc_type) {
+	case GF_CRYPT_SELENC_RAP:
+		if (sap) flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	case GF_CRYPT_SELENC_NON_RAP:
+		if (!sap) flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	/*random*/
+	case GF_CRYPT_SELENC_RAND:
+		rand = gf_rand();
+		if (rand%2) flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	/*random every sel_freq samples*/
+	case GF_CRYPT_SELENC_RAND_RANGE:
+		if (! (cstr->nb_pck % cstr->tci->sel_enc_range) ) cstr->has_crypted_pck = 0;
+		if (! cstr->has_crypted_pck) {
+			rand = gf_rand();
+			if (!(rand % cstr->tci->sel_enc_range)) flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+
+			if (!(flags & GF_ISOM_ISMA_IS_ENCRYPTED) && !( (1+cstr->nb_pck) % cstr->tci->sel_enc_range)) {
+				flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+			}
+			cstr->has_crypted_pck = (flags & GF_ISOM_ISMA_IS_ENCRYPTED);
+		}
+		break;
+	/*every sel_freq samples*/
+	case GF_CRYPT_SELENC_RANGE:
+		if (!(cstr->nb_pck % cstr->tci->sel_enc_type)) flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	case GF_CRYPT_SELENC_PREVIEW:
+		if (cts >= cstr->range_end)
+			flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	case 0:
+		flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
+		break;
+	default:
+		break;
+	}
+
+	if (cstr->tci->sel_enc_type) flags |= GF_ISOM_ISMA_USE_SEL_ENC;
+
+	if (flags & GF_ISOM_ISMA_USE_SEL_ENC) isma_hdr_size = 1;
+	if (flags & GF_ISOM_ISMA_IS_ENCRYPTED) isma_hdr_size += cstr->isma_IV_size + cstr->KI_length;
+
+	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" ));
+		return GF_OK;
+	}
+	dst_pck = gf_filter_pck_new_alloc(cstr->opid, size+isma_hdr_size, &output);
+	memcpy(output+isma_hdr_size, data, sizeof(char)*size);
+	gf_filter_pck_merge_properties(pck, dst_pck);
+
+	
+	/*isma e&a stores AVC1 in AVC/H264 annex B bitstream fashion, with 0x00000001 start codes*/
+	if (cstr->nalu_size_length) {
+		u32 done = 0;
+		u8 *d = (u8*) output+isma_hdr_size;
+		while (done < size) {
+			u32 nal_size = GF_4CC(d[0], d[1], d[2], d[3]);
+			d[0] = d[1] = d[2] = 0;
+			d[3] = 1;
+			d += 4 + nal_size;
+			done += 4 + nal_size;
+		}
+	}
+
+	//encrypt
+	if (flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
+		/*resync IV*/
+		if (!cstr->prev_pck_encryped) {
+			char IV[17];
+			u64 count;
+			u32 remain;
+			GF_BitStream *bs;
+			count = cstr->BSO / 16;
+			remain = (u32) (cstr->BSO % 16);
+
+			/*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_u64(bs, (s64) count);
+			gf_bs_del(bs);
+			gf_crypt_set_IV(cstr->crypt, IV, GF_AES_128_KEYSIZE+1);
+
+			/*decrypt remain bytes*/
+			if (remain) {
+				char dummy[20];
+				gf_crypt_decrypt(cstr->crypt, dummy, remain);
+			}
+		}
+		gf_crypt_encrypt(cstr->crypt, output+isma_hdr_size, size);
+		cstr->prev_pck_encryped = GF_TRUE;
+	} else {
+		cstr->prev_pck_encryped = GF_FALSE;
+	}
+
+	//rewrite ISMA header
+	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(output, isma_hdr_size, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_w, output, isma_hdr_size);
+
+	if (flags & GF_ISOM_ISMA_USE_SEL_ENC) {
+		gf_bs_write_int(ctx->bs_w, (flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, 0, 7);
+	}
+	if (flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
+		if (cstr->isma_IV_size) gf_bs_write_long_int(ctx->bs_w, (s64) cstr->BSO, 8*cstr->isma_IV_size);
+		//not yet implemented
+//		if (cstr->KI_length) gf_bs_write_data(ctx->bs_w, (char*) key_indicator, cstr->KI_length);
+	}
+
+	cstr->BSO += size;
+
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+static GF_Err adobe_process(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, GF_FilterPacket *pck)
+{
+	Bool is_encrypted = GF_TRUE;
+	GF_FilterPacket *dst_pck;
+	const u8 *data;
+	u8 *output;
+	GF_Err e;
+	bin128 IV;
+	u32 size, adobe_hdr_size;
+	u32 len, padding_bytes;
+	u8 sap = gf_filter_pck_get_sap(pck);
+
+	switch (cstr->tci->sel_enc_type) {
+	case GF_CRYPT_SELENC_RAP:
+		if (!sap) is_encrypted = GF_FALSE;
+		break;
+	case GF_CRYPT_SELENC_NON_RAP:
+		if (sap) is_encrypted = GF_FALSE;
+		break;
+	default:
+		break;
+	}
+
+	adobe_hdr_size = 1;
+	if (is_encrypted) adobe_hdr_size += 16;
+
+	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" ));
+		return GF_OK;
+	}
+	padding_bytes = 0;
+	len = size;
+	if (is_encrypted) {
+		padding_bytes = 16 - len % 16;
+		len += padding_bytes;
+	}
+	dst_pck = gf_filter_pck_new_alloc(cstr->opid, len + adobe_hdr_size, &output);
+	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;
+		} else {
+			cstr->isma_IV_size = 16;
+			e = gf_crypt_get_IV(cstr->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_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);
+
+		/*write encrypted AU header*/
+		output[0] = 0x10;
+		memcpy(output+1, (char *) IV, sizeof(char) * 16);
+	} else {
+		/*write encrypted AU header*/
+		output[0] = 0x0;
+	}
+
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+
+/*Common Encryption*/
+static void increase_counter(char *x, int x_size) {
+	register int i;
+
+	for (i=x_size-1; i>=0; i--) {
+		register int y=0;
+		if ((u8) x[i] == 0xFF) {
+			x[i] = 0;
+			y = 1;
+		} else x[i]++;
+
+		if (y==0) break;
+	}
+
+	return;
+}
+
+static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u8 IV_size)
+{
+	char next_IV[17];
+	u32 size = 17;
+
+	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 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
+		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.
+
+		NOTE 4: Since CENC forces declaration of a unique, potentially random, IV per sample, we could increase the IV counter at each sample start
+		but this is currently not done
+	*/
+	if (IV_size == 8) {
+		/*cf note 2*/
+		increase_counter(&next_IV[1], IV_size);
+		next_IV[0] = 0;
+		/*cf note 3*/
+		memset(&next_IV[9], 0, 8*sizeof(char));
+	} else if (next_IV[0]) {
+		/*cf note 1*/
+		increase_counter(&next_IV[1], IV_size);
+		next_IV[0] = 0;
+	}
+
+	gf_crypt_set_IV(mc, next_IV, size);
+
+	memset(IV, 0, 16*sizeof(char));
+	memcpy(IV, next_IV+1, 16*sizeof(char));
+}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+//parses slice header and returns its size
+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;
+			switch (ntype) {
+			case GF_AVC_NALU_NON_IDR_SLICE:
+			case GF_AVC_NALU_DP_A_SLICE:
+			case GF_AVC_NALU_DP_B_SLICE:
+			case GF_AVC_NALU_DP_C_SLICE:
+			case GF_AVC_NALU_IDR_SLICE:
+			case GF_AVC_NALU_SLICE_AUX:
+			case GF_AVC_NALU_SVC_SLICE:
+				gf_bs_align(plaintext_bs);
+				clear_bytes = (u32) gf_bs_get_position(plaintext_bs) - nal_start;
+				break;
+			default:
+				clear_bytes = nal_size;
+				break;
+			}
+		} else {
+#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);
+			if (ntype<=GF_HEVC_NALU_SLICE_CRA) {
+				clear_bytes = cstr->hevc.s_info.payload_start_offset;
+			} else {
+				clear_bytes = nal_size;
+			}
+#endif
+		}
+		gf_bs_seek(plaintext_bs, nal_start);
+	} else {
+		clear_bytes = bytes_in_nalhr;
+	}
+	gf_bs_enable_emulation_byte_removal(plaintext_bs, GF_FALSE);
+	return clear_bytes;
+}
+#endif
+
+static GF_Err cenc_encrypt_packet(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, GF_FilterPacket *pck)
+{
+	GF_BitStream *sai_bs;
+	u32 prev_entry_bytes_clear=0;
+	u32 prev_entry_bytes_crypt=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);
+	}
+
+
+	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;
+	}
+
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	gf_filter_pck_set_crypt_flags(dst_pck, GF_FILTER_PCK_CRYPT);
+
+	if (!ctx->bs_r) ctx->bs_r = gf_bs_new(data, pck_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+
+	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_data(sai_bs, cstr->IV, cstr->tci->IV_size);
+
+	while (gf_bs_available(ctx->bs_r)) {
+		GF_Err e=GF_OK;
+
+		if (cstr->use_subsamples) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+			ObuType obut;
+			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;
+#else
+			struct {
+				int clear, encrypted;
+			} ranges[1];
+#endif
+			u64 pos;
+			u32 clear_bytes_at_end = 0;
+			u32 clear_bytes = 0;
+			u32 nb_ranges = 1;
+			u32 range_idx = 0;
+			u32 nalu_size = 0;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+			switch (cstr->cenc_codec) {
+			case CENC_AVC:
+			case CENC_HEVC:
+				nalu_size = gf_bs_read_int(ctx->bs_r, 8*cstr->nalu_size_length);
+				if (nalu_size == 0) {
+					continue;
+				}
+				clear_bytes = cenc_get_clear_bytes(cstr, ctx->bs_r, (char *) data, nalu_size, cstr->bytes_in_nal_hdr);
+				break;
+
+			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);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Failed to parse OBU\n" ));
+					return e;
+				}
+				gf_bs_seek(ctx->bs_r, pos);
+
+				nalu_size = (u32)obu_size;
+				switch (obut) {
+				//we only encrypt frame and tile group
+				case OBU_FRAME:
+				case OBU_TILE_GROUP:
+					if (!cstr->av1.frame_state.nb_tiles_in_obu) {
+						clear_bytes = (u32) obu_size;
+					} else {
+						nb_ranges = cstr->av1.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;
+						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;
+						}
+						clear_bytes = ranges[0].clear;
+						nalu_size = clear_bytes + ranges[0].encrypted;
+
+						/* A subsample SHALL be created for each tile even if less than 16 bytes
+							see https://github.com/AOMediaCodec/av1-isobmff/pull/116#discussion_r340176740
+
+						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);
+							nb_subsamples++;
+							gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
+							gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
+							sai_size+=6;
+
+							prev_entry_bytes_crypt = 0;
+							prev_entry_bytes_clear = 0;
+						}
+					}
+					break;
+				default:
+					clear_bytes = (u32) obu_size;
+					break;
+				}
+				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"));
+					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;
+				gf_bs_seek(ctx->bs_r, pos);
+
+				nb_ranges = num_frames_in_superframe;
+
+				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);
+					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) ));
+						return e;
+					}
+
+					ranges[i].clear = (int)(gf_bs_get_position(ctx->bs_r) - pos2);
+					ranges[i].encrypted = frame_sizes[i] - ranges[i].clear;
+
+					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",
+						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);
+
+				clear_bytes = ranges[0].clear;
+				assert(frame_sizes[0] == ranges[0].clear + ranges[0].encrypted);
+				nalu_size = frame_sizes[0];
+
+				//final superframe index must be in clear
+				if (superframe_index_size > 0) {
+					ranges[nb_ranges].clear = superframe_index_size;
+					ranges[nb_ranges].encrypted = 0;
+					nb_ranges++;
+				}
+
+				//not clearly defined in the spec (so we do the same as in AV1 which is more clearly defined):
+				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);
+						nb_subsamples++;
+						gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
+						gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
+						sai_size+=6;
+
+						prev_entry_bytes_crypt = 0;
+						prev_entry_bytes_clear = 0;
+					}
+				} else {
+					clear_bytes = nalu_size;
+				}
+				break;
+			default:
+				assert(0);
+			}
+#else
+			clear_bytes = nalu_size;
+#endif
+
+			while (nb_ranges) {
+				if (cstr->ctr_mode) {
+
+					// adjust so that encrypted bytes are a multiple of 16 bytes: cenc SHOULD, cens SHALL, we always do it
+					if (nalu_size > clear_bytes) {
+						u32 ret = (nalu_size - clear_bytes) % 16;
+						//in AV1 always enforced
+						if (cstr->cenc_codec==CENC_AV1) {
+							clear_bytes += ret;
+						}
+						//for CENC (should),
+						else if ((cstr->tci->scheme_type == GF_CRYPT_TYPE_CENC) || (cstr->tci->scheme_type == GF_CRYPT_TYPE_PIFF))  {
+							//do it if not disabled by user
+							if (cstr->tci->block_align != 1) {
+								//always align even if sample is not encrypted in the end
+								if (cstr->tci->block_align==2) {
+									clear_bytes += ret;
+								}
+								//or if we don't end up with sample in the clear
+								else if (nalu_size > clear_bytes + ret) {
+									clear_bytes += ret;
+								}
+							}
+						} else {
+							clear_bytes += ret;
+						}
+					}
+				} 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)) {
+						u32 ret = (nalu_size - clear_bytes) % 16;
+						clear_bytes_at_end = ret;
+					}
+					//in cbc1 or cbcs+VPX, we adjust bytes_encrypted_data to be a multiple of 16 bytes
+					else {
+						u32 ret = (nalu_size - clear_bytes) % 16;
+						clear_bytes += ret;
+						clear_bytes_at_end = 0;
+					}
+
+				}
+
+				/*skip bytes of clear data*/
+				gf_bs_skip_bytes(ctx->bs_r, clear_bytes);
+
+				//read data to encrypt
+				if (nalu_size > clear_bytes) {
+					/*get encrypted data start*/
+					u32 cur_pos = (u32) gf_bs_get_position(ctx->bs_r);
+
+					/*skip bytes of encrypted data*/
+					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);
+
+					//pattern encryption
+					if (cstr->tci->crypt_byte_block && cstr->tci->skip_byte_block) {
+						u32 res = nalu_size - clear_bytes - clear_bytes_at_end;
+						pos = cur_pos;
+						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);
+							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);
+							} else {
+								res = 0;
+							}
+						}
+					}
+					//full subsample encryption
+					else {
+						e = gf_crypt_encrypt(cstr->crypt, output+cur_pos, nalu_size - clear_bytes);
+					}
+				}
+
+
+				//prev entry is not a VCL, append this NAL
+				if (!prev_entry_bytes_crypt) {
+					prev_entry_bytes_clear += cstr->nalu_size_length + clear_bytes;
+					prev_entry_bytes_crypt += nalu_size - clear_bytes;
+				} else {
+					//store current
+					if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+					nb_subsamples++;
+					gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
+					gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
+					sai_size+=6;
+
+					prev_entry_bytes_clear = cstr->nalu_size_length + clear_bytes;
+					prev_entry_bytes_crypt = nalu_size - clear_bytes;
+				}
+
+				//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);
+					nb_subsamples++;
+					gf_bs_write_u16(sai_bs, 0xFFFF);
+					gf_bs_write_u32(sai_bs, 0);
+					sai_size+=6;
+
+					prev_entry_bytes_clear -= 0xFFFF;
+				}
+
+
+				nb_ranges--;
+				if (!nb_ranges) break;
+
+				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"));
+					return GF_BAD_PARAM;
+				}
+				switch (cstr->cenc_codec) {
+				case CENC_AV1:
+					clear_bytes = ranges[range_idx].clear;
+					nalu_size = clear_bytes + ranges[range_idx].encrypted;
+					break;
+				case CENC_VPX:
+					if (nb_ranges > 1) {
+						clear_bytes = ranges[range_idx].clear;
+						nalu_size = clear_bytes + ranges[range_idx].encrypted;
+					} else { /*last*/
+						nalu_size = clear_bytes = ranges[range_idx].clear;
+						assert(ranges[range_idx].encrypted == 0);
+					}
+					break;
+				default:
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unexpected subrange for sample format, only allowed for VPX and AV1\n"));
+					return GF_BAD_PARAM;
+				}
+			}
+		} 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;
+
+			clear_trailing = pck_size % 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 (pck_size >= 16) {
+				gf_crypt_encrypt(cstr->crypt, output, pck_size - clear_trailing);
+			}
+			gf_bs_skip_bytes(ctx->bs_r, pck_size);
+		}
+
+		if (e) {
+			gf_filter_pck_discard(dst_pck);
+			return e;
+		}
+	}
+	
+	if (prev_entry_bytes_clear || prev_entry_bytes_crypt) {
+		if (!nb_subsamples) gf_bs_write_u16(sai_bs, 0);
+		nb_subsamples++;
+		gf_bs_write_u16(sai_bs, prev_entry_bytes_clear);
+		gf_bs_write_u32(sai_bs, prev_entry_bytes_crypt);
+		sai_size+=6;
+	}
+	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);
+		sai_size = 0;
+		gf_bs_get_content(sai_bs, &sai, &sai_size);
+
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CENC_SAI, &PROP_DATA_NO_COPY(sai, sai_size) );
+	}
+	gf_bs_del(sai_bs);
+
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+static GF_Err cenc_process(GF_CENCEncCtx *ctx, GF_CENCStream *cstr, GF_FilterPacket *pck)
+{
+	Bool is_encrypted = GF_TRUE;
+	const u8 *data;
+	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" ));
+		return GF_OK;
+	}
+
+	if (!ctx->bs_w) ctx->bs_w = gf_bs_new((char *) &sap, 1, GF_BITSTREAM_WRITE);
+
+	switch (cstr->tci->sel_enc_type) {
+	case GF_CRYPT_SELENC_RAP:
+		if (!sap && !all_rap) {
+			is_encrypted = GF_FALSE;
+		}
+		break;
+	case GF_CRYPT_SELENC_NON_RAP:
+		if (sap || all_rap) {
+			is_encrypted = GF_FALSE;
+		}
+		break;
+	case GF_CRYPT_SELENC_CLEAR:
+		is_encrypted = GF_FALSE;
+		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;
+		}
+		break;
+	default:
+		break;
+	}
+
+	if (!is_encrypted) {
+		u8 *sai=NULL;
+		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);
+		gf_filter_pck_merge_properties(pck, dst_pck);
+
+		if (force_clear && !cstr->tci->force_clear_stsd_idx)
+			signal_sai = GF_TRUE;
+		//format NULL bitstream only for forced clear mode
+		if (cstr->use_subsamples && signal_sai) {
+			GF_BitStream *bs;
+			u32 subsample_count = 1;
+			u32 olen = pck_size;
+			while (olen>0xFFFF) {
+				olen -= 0xFFFF;
+				subsample_count ++;
+			}
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			if (force_clear) {
+				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_u16(bs, subsample_count);
+			olen = pck_size;
+			for (i = 0; i < subsample_count; i++) {
+				if (olen<0xFFFF) {
+					gf_bs_write_u16(bs, olen);
+				} else {
+					gf_bs_write_u16(bs, 0xFFFF);
+					olen -= 0xFFFF;
+				}
+				gf_bs_write_u32(bs, 0);
+			}
+			gf_bs_get_content(bs, &sai, &sai_size);
+			gf_bs_del(bs);
+		}
+		if (sai)
+			gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_CENC_SAI, &PROP_DATA_NO_COPY(sai, sai_size) );
+
+		gf_filter_pck_set_crypt_flags(dst_pck, signal_sai ? GF_FILTER_PCK_CRYPT : 0);
+		gf_filter_pck_send(dst_pck);
+		return GF_OK;
+	}
+
+	/*generate 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);
+			}
+			else if (cstr->tci->constant_IV_size == 16) {
+				memcpy(cstr->IV, cstr->tci->constant_IV, sizeof(char)*16);
+			} 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;
+		}
+		cstr->cenc_init = GF_TRUE;
+	} else {
+		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 (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 ?
+	}
+
+	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)) );
+		return e;
+	}
+
+	cstr->nb_pck_encrypted++;
+	return GF_OK;
+}
+
+static GF_Err cenc_enc_process(GF_Filter *filter)
+{
+	GF_CENCEncCtx *ctx = (GF_CENCEncCtx *)gf_filter_get_udta(filter);
+	u32 i, nb_eos, count = gf_list_count(ctx->streams);
+
+	nb_eos = 0;
+	for (i=0; i<count; i++) {
+		GF_Err e = GF_OK;;
+		GF_CENCStream *cstr = gf_list_get(ctx->streams, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(cstr->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(cstr->ipid)) {
+				gf_filter_pid_set_eos(cstr->opid);
+				nb_eos++;
+			}
+			continue;
+		}
+
+		if (cstr->passthrough) {
+			gf_filter_pck_forward(pck, cstr->opid);
+		}
+		else if (cstr->isma_oma) {
+			e = isma_process(ctx, cstr, pck);
+		} else if (cstr->is_adobe) {
+	 		e = adobe_process(ctx, cstr, pck);
+		} else {
+			e = cenc_process(ctx, cstr, pck);
+		}
+		gf_filter_pid_drop_packet(cstr->ipid);
+		cstr->nb_pck++;
+
+		if (e) return e;
+	}
+	if (nb_eos==count) return GF_EOS;
+
+	return GF_OK;
+}
+
+static GF_Err cenc_enc_initialize(GF_Filter *filter)
+{
+	GF_CENCEncCtx *ctx = (GF_CENCEncCtx *)gf_filter_get_udta(filter);
+
+	if (ctx->cfile) {
+		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 ));
+			return GF_BAD_PARAM;
+		}
+	}
+
+	ctx->streams = gf_list_new();
+	return GF_OK;
+}
+
+static void cenc_enc_finalize(GF_Filter *filter)
+{
+	GF_CENCEncCtx *ctx = (GF_CENCEncCtx *)gf_filter_get_udta(filter);
+	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);
+	}
+	gf_list_del(ctx->streams);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+}
+
+
+static const GF_FilterCapability CENCEncCaps[] =
+{
+	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_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},
+	{0}
+};
+
+GF_FilterRegister CENCEncRegister = {
+	.name = "cecrypt",
+	GF_FS_SET_DESCRIPTION("CENC  encryptor")
+	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"
+	"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),
+	.max_extra_pids=-1,
+	//encryptor shall be explicitly loaded
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.args = GF_CENCEncArgs,
+	SETCAPS(CENCEncCaps),
+	.configure_pid = cenc_enc_configure_pid,
+	.initialize = cenc_enc_initialize,
+	.finalize = cenc_enc_finalize,
+	.process = cenc_enc_process
+
+};
+
+#endif /*GPAC_DISABLE_CRYPTO*/
+
+const GF_FilterRegister *cenc_encrypt_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_CRYPTO
+	return &CENCEncRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/ff_avf.c Added

@@ -0,0 +1,1032 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom Paris 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg avfilter 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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+#include <gpac/network.h>
+#include <libavfilter/avfilter.h>
+#include <libavfilter/buffersrc.h>
+#include <libavfilter/buffersink.h>
+
+#if (LIBAVFILTER_VERSION_MAJOR < 7)
+#undef GPAC_HAS_FFMPEG
+#endif
+
+#endif
+
+#ifdef GPAC_HAS_FFMPEG
+
+typedef struct
+{
+	AVFilterContext *io_filter_ctx;
+	GF_FilterPid *io_pid;
+	u32 timescale, pfmt, width, height, sr, nb_ch, bps;
+	u64 ch_layout;
+	GF_Fraction sar;
+	u32 stride, stride_uv, nb_planes;
+	//output only
+	Bool is_video;
+	u32 gf_pfmt, out_size, uv_height, uv_width, tb_num;
+} GF_FFAVPid;
+
+
+typedef struct
+{
+	//options
+	u32 pfmt, afmt, sr, ch;
+	Bool dump;
+
+	//internal
+
+	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;
+
+	AVFilterInOut *outputs;
+	AVFrame *frame;
+
+	//0: no flush, 1: graph flush (push EOS in input), 2: wait for EOS in output
+	u32 flush_state;
+	GF_Err in_error;
+} GF_FFAVFilterCtx;
+
+
+static void ffavf_reset_graph(GF_FFAVFilterCtx *ctx)
+{
+	if (ctx->outputs) {
+		avfilter_inout_free(&ctx->outputs);
+		ctx->outputs = NULL;
+	}
+	if (ctx->filter_graph) {
+		avfilter_graph_free(&ctx->filter_graph);
+		ctx->filter_graph = NULL;
+	}
+}
+
+
+static GF_Err ffavf_setup_input(GF_FFAVFilterCtx *ctx, GF_FFAVPid *avpid)
+{
+	int ret;
+	char args[1024];
+	const AVFilter *avf = NULL;
+	const char *pid_name = gf_filter_pid_get_name(avpid->io_pid);
+
+	if (avpid->width) {
+		avf = avfilter_get_by_name("buffer");
+		snprintf(args, sizeof(args),
+				"video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
+				avpid->width, avpid->height, avpid->pfmt, 1, avpid->timescale, avpid->sar.num, avpid->sar.den);
+	} else {
+		avf = avfilter_get_by_name("abuffer");
+		snprintf(args, sizeof(args),
+			   "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x"LLU,
+			   1, avpid->timescale, avpid->sr, av_get_sample_fmt_name(avpid->pfmt), avpid->ch_layout);
+	}
+	avpid->io_filter_ctx = NULL;
+	ret = avfilter_graph_create_filter(&avpid->io_filter_ctx, avf, pid_name, args, NULL, ctx->filter_graph);
+	if (ret<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to create filter graph: %s\n", av_err2str(ret) ));
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+static GF_Err ffavf_setup_outputs(GF_Filter *filter, GF_FFAVFilterCtx *ctx)
+{
+	AVFilterInOut *io;
+	u32 i, nb_outputs;
+	int ret;
+
+	//outputs are configured
+	if (ctx->outputs) return GF_OK;
+
+	//allocate output pids
+	ctx->outputs = avfilter_inout_alloc();
+	io = ctx->outputs;
+	nb_outputs = ctx->nb_v_out + ctx->nb_a_out;
+	for (i=0; i<nb_outputs; i++) {
+		u32 k;
+		char szName[20];
+		const AVFilter *avf = NULL;
+		GF_FFAVPid *opid = NULL;
+		Bool is_video = i<ctx->nb_v_out ? GF_TRUE : GF_FALSE;
+
+		for (k=0; k<gf_list_count(ctx->opids); k++) {
+			opid = gf_list_get(ctx->opids, k);
+			if (opid->is_video && is_video) break;
+			if (!opid->is_video && !is_video) break;
+			opid = NULL;
+		}
+		if (!opid) {
+			GF_SAFEALLOC(opid, GF_FFAVPid);
+			if (!opid) continue;
+
+			gf_list_add(ctx->opids, opid);
+			opid->io_pid = gf_filter_pid_new(filter);
+			opid->is_video = i<ctx->nb_v_out ? GF_TRUE : GF_FALSE;
+			//remove properties since we may have change format
+			if (is_video) {
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL));
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_SAMPLE_RATE, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_CHANNEL_LAYOUT, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_BPS, NULL);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_FORMAT, NULL);
+			} else {
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO));
+				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_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);
+			}
+			gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW));
+			gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_FILE_EXT, NULL);
+			gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_MIME, NULL);
+		}
+		opid->io_filter_ctx = NULL;
+
+		if (opid->is_video) {
+			sprintf(szName, "vout%d", i+1);
+			avf = avfilter_get_by_name("buffersink");
+		} else {
+			sprintf(szName, "aout%d", (i-ctx->nb_v_out) + 1);
+			avf = avfilter_get_by_name("abuffersink");
+		}
+
+		if (nb_outputs==1)
+			sprintf(szName, "out");
+
+		ret = avfilter_graph_create_filter(&opid->io_filter_ctx, avf, szName, NULL, NULL, ctx->filter_graph);
+		if (ret<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to create %s filter: %s\n", avf->name, av_err2str(ret) ));
+			return GF_BAD_PARAM;
+		}
+		if (opid->is_video) {
+			if (ctx->pfmt) {
+				enum AVPixelFormat pfmt = ffmpeg_pixfmt_from_gpac(ctx->pfmt);
+				ret = av_opt_set_bin(opid->io_filter_ctx, "pix_fmts", (uint8_t*)&pfmt, sizeof(pfmt), AV_OPT_SEARCH_CHILDREN);
+				if (ret < 0) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFAVF] Fail to set %s pixel format: %s\n", avf->name, av_err2str(ret) ));
+				}
+			}
+		} else {
+			if (ctx->afmt) {
+				enum AVSampleFormat afmt = ffmpeg_audio_fmt_from_gpac(ctx->afmt);
+				ret = av_opt_set_bin(opid->io_filter_ctx, "sample_fmts", (uint8_t*)&afmt, sizeof(afmt), AV_OPT_SEARCH_CHILDREN);
+				if (ret < 0) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFAVF] Fail to set %s audio format: %s\n", avf->name, av_err2str(ret) ));
+				}
+			}
+			if (ctx->sr) {
+				ret = av_opt_set_bin(opid->io_filter_ctx, "sample_rates", (uint8_t*)&ctx->sr, sizeof(ctx->sr), AV_OPT_SEARCH_CHILDREN);
+				if (ret < 0) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFAVF] Fail to set %s audio sample rate: %s\n", avf->name, av_err2str(ret) ));
+				}
+			}
+			if (ctx->ch) {
+				ret = av_opt_set_bin(opid->io_filter_ctx, "channels", (uint8_t*)&ctx->ch, sizeof(ctx->ch), AV_OPT_SEARCH_CHILDREN);
+				if (ret < 0) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFAVF] Fail to set %s audio sample rate: %s\n", avf->name, av_err2str(ret) ));
+				}
+			}
+
+		}
+		io->name = av_strdup(szName);
+		io->filter_ctx = opid->io_filter_ctx;
+		io->pad_idx = 0;
+		io->next = NULL;
+		if (i+1==nb_outputs) break;
+		io->next = avfilter_inout_alloc();
+		io = io->next;
+	}
+	return GF_OK;
+}
+
+
+static GF_Err ffavf_reconfigure_graph(GF_Filter *filter, GF_FFAVFilterCtx *ctx)
+{
+	u32 i, count;
+	GF_Err e = GF_OK;
+	ctx->flush_state = 0;
+	ffavf_reset_graph(ctx);
+	ctx->filter_graph = avfilter_graph_alloc();
+
+	count = gf_list_count(ctx->ipids);
+	for (i=0; i<count; i++) {
+		GF_FFAVPid *ipid = gf_list_get(ctx->ipids, i);
+		e = ffavf_setup_input(ctx, ipid);
+		if (e) break;
+	}
+	ctx->configure_state = 2;
+	if (!e)
+		e = ffavf_setup_outputs(filter, ctx);
+
+	if (e) ctx->in_error = e;
+	return e;
+}
+
+static GF_Err ffavf_initialize(GF_Filter *filter)
+{
+	u32 nb_v_in=0, nb_a_in=0;
+	u32 i;
+	AVFilterInOut *inputs;
+	AVFilterInOut *outputs;
+	AVFilterInOut *io;
+	int ret;
+	Bool dyn_inputs = GF_FALSE;
+	GF_FFAVFilterCtx *ctx = (GF_FFAVFilterCtx *) gf_filter_get_udta(filter);
+	if (!ctx->filter_desc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Missing filter graph description, cannot load\n"));
+		return GF_BAD_PARAM;
+	}
+
+	ctx->ipids = gf_list_new();
+	ctx->opids = gf_list_new();
+	ctx->frame = av_frame_alloc();
+
+
+	ctx->filter_graph = avfilter_graph_alloc();
+	ret = avfilter_graph_parse2(ctx->filter_graph, ctx->filter_desc, &inputs, &outputs);
+	if (ret<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to parse filter description: %s\nFilter description was %s\n", av_err2str(ret), ctx->filter_desc));
+		return GF_BAD_PARAM;
+	}
+
+	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;
+			}
+		}
+		io = io->next;
+	}
+
+	ctx->nb_v_out = ctx->nb_a_out = 0;
+	io = outputs;
+	while (io) {
+		for (i=0; i<io->filter_ctx->nb_outputs; i++) {
+			enum AVMediaType mt = avfilter_pad_get_type(io->filter_ctx->output_pads, i);
+			u32 streamtype = ffmpeg_stream_type_to_gpac(mt);
+			switch (streamtype) {
+			case GF_STREAM_VISUAL: ctx->nb_v_out++; break;
+			case GF_STREAM_AUDIO: ctx->nb_a_out++; break;
+			}
+		}
+		io = io->next;
+	}
+	avfilter_inout_free(&inputs);
+	avfilter_inout_free(&outputs);
+	avfilter_graph_free(&ctx->filter_graph);
+	ctx->filter_graph = avfilter_graph_alloc();
+
+	if (dyn_inputs) {
+		gf_filter_set_max_extra_input_pids(filter, -1);
+	} else if (nb_v_in + nb_a_in > 1)
+		gf_filter_set_max_extra_input_pids(filter, nb_v_in + nb_a_in - 1);
+
+	/*update filter caps*/
+	memset(ctx->filter_caps, 0, sizeof(GF_FilterCapability) * 7);
+	ctx->filter_caps[0].flags = GF_CAPS_INPUT_OUTPUT;
+	ctx->filter_caps[0].code = GF_PROP_PID_CODECID;
+	ctx->filter_caps[0].val = PROP_UINT(GF_CODECID_RAW);
+	i=1;
+	if (nb_v_in) {
+		ctx->filter_caps[i].flags = ctx->nb_v_out ? GF_CAPS_INPUT_OUTPUT : GF_CAPS_INPUT;
+		ctx->filter_caps[i].code = GF_PROP_PID_STREAM_TYPE;
+		ctx->filter_caps[i].val = PROP_UINT(GF_STREAM_VISUAL);
+		i++;
+	}
+	if (nb_a_in) {
+		ctx->filter_caps[i].flags = ctx->nb_a_out ? GF_CAPS_INPUT_OUTPUT : GF_CAPS_INPUT;
+		ctx->filter_caps[i].code = GF_PROP_PID_STREAM_TYPE;
+		ctx->filter_caps[i].val = PROP_UINT(GF_STREAM_AUDIO);
+		i++;
+	}
+	if (ctx->nb_v_out && !nb_v_in) {
+		ctx->filter_caps[i].flags = GF_CAPS_OUTPUT;
+		ctx->filter_caps[i].code = GF_PROP_PID_STREAM_TYPE;
+		ctx->filter_caps[i].val = PROP_UINT(GF_STREAM_VISUAL);
+		i++;
+	}
+	if (ctx->nb_a_out && !nb_a_in) {
+		ctx->filter_caps[i].flags = GF_CAPS_OUTPUT;
+		ctx->filter_caps[i].code = GF_PROP_PID_STREAM_TYPE;
+		ctx->filter_caps[i].val = PROP_UINT(GF_STREAM_AUDIO);
+		i++;
+	}
+	gf_filter_override_caps(filter, ctx->filter_caps, i);
+
+	return GF_OK;
+}
+
+static void ffavf_dump_graph(GF_FFAVFilterCtx *ctx, const char *opt)
+{
+	char *graphdump = avfilter_graph_dump(ctx->filter_graph, opt);
+
+	if (graphdump) {
+#ifndef GPAC_DISABLE_LOG
+		if (gf_log_tool_level_on(GF_LOG_MEDIA, GF_LOG_INFO)) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FFAVF] Graph dump:\n%s\n\n", graphdump ));
+		} else
+#endif
+			fprintf(stderr, "[FFAVF] Graph dump:\n%s\n\n", graphdump);
+
+		av_free(graphdump);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Failed to dump graph %s\n", ctx->filter_desc));
+	}
+
+}
+static GF_Err ffavf_setup_filter(GF_Filter *filter, GF_FFAVFilterCtx *ctx)
+{
+	int ret;
+	AVFilterInOut *io, *inputs;
+	u32 i, count = gf_list_count(ctx->ipids);
+
+	//wait until we have one packet on each input
+	for (i=0; i<count; i++) {
+		GF_FFAVPid *pid_ctx = gf_list_get(ctx->ipids, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid_ctx->io_pid);
+		if (!pck) return GF_OK;
+	}
+	ctx->configure_state = 2;
+
+	/*create inputs*/
+	inputs = avfilter_inout_alloc();
+	io = inputs;
+	for (i=0; i<count; i++) {
+		char szName[20];
+		GF_FFAVPid *pid_ctx = gf_list_get(ctx->ipids, i);
+
+		if (count==1)
+			io->name = av_strdup("in");
+		else {
+			const GF_PropertyValue *p = gf_filter_pid_get_property_str(pid_ctx->io_pid, "ffid");
+			if (p && p->value.string) {
+				io->name = av_strdup(p->value.string);
+			} else {
+				if (i)
+					sprintf(szName, "in%d", i+1);
+				else
+					sprintf(szName, "in");
+				io->name = av_strdup(szName);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFAVF] Multiple input for graph but no names assigned to input PIDs (missing ffid property), using %s as default name. Filter linking might fail\n", szName));
+			}
+		}
+		io->filter_ctx = pid_ctx->io_filter_ctx;
+
+		if (i+1==count) break;
+		io->next = avfilter_inout_alloc();
+		io = io->next;
+	}
+	//our outputs describe the filter graph outputs and our inputs desscribe the filter graph input
+	//however avfilter_graph_parse_ptr expects:
+	// inputs: the inputs of the next filter graph to connect to, hence our outputs
+	// outputs: the outputs of the previous filter graph to connect to, hence our inputs
+	ret = avfilter_graph_parse_ptr(ctx->filter_graph, ctx->filter_desc,  &ctx->outputs, &inputs, NULL);
+	avfilter_inout_free(&inputs);
+	if (ret < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to parse filter description: %s\nFilter description was %s\n", av_err2str(ret), ctx->filter_desc));
+        return ctx->in_error = GF_BAD_PARAM;
+	}
+	ret = avfilter_graph_config(ctx->filter_graph, NULL);
+	if (ret < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to validate filter graph: %s\n", av_err2str(ret) ));
+        return ctx->in_error = GF_BAD_PARAM;
+	}
+
+	if (ctx->dump)
+		ffavf_dump_graph(ctx, NULL);
+	return GF_OK;
+}
+
+static GF_Err ffavf_process(GF_Filter *filter)
+{
+	int ret;
+	GF_Err e = GF_OK;
+	u32 i, count, nb_eos;
+	GF_FFAVFilterCtx *ctx = (GF_FFAVFilterCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->in_error)
+		return ctx->in_error;
+
+	//graph needs to be loaded
+	if (ctx->configure_state==1) {
+		return ffavf_setup_filter(filter, ctx);
+	}
+
+	//push input
+	nb_eos = 0;
+	count = gf_list_count(ctx->ipids);
+	if (ctx->flush_state==2)
+		count = 0;
+
+	for (i=0; i<count; i++) {
+		const u8 *data;
+		u32 data_size;
+		Bool frame_ok = GF_FALSE;
+		GF_FFAVPid *ipid = gf_list_get(ctx->ipids, i);
+		GF_FilterPacket *pck;
+		pck = gf_filter_pid_get_packet(ipid->io_pid);
+
+		//config changed at this packet, start flushing the graph
+		if (ctx->flush_state==1) {
+			ret = av_buffersrc_add_frame_flags(ipid->io_filter_ctx, NULL, 0);
+			if (ret<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to flush filter graph: %s\n", av_err2str(ret) ));
+			}
+			continue;
+		}
+
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ipid->io_pid)) {
+				ret = av_buffersrc_add_frame_flags(ipid->io_filter_ctx, NULL, 0);
+				if (ret<0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to signal EOS: %s\n", av_err2str(ret) ));
+					e = GF_SERVICE_ERROR;
+				}
+				nb_eos++;
+			}
+			continue;
+		}
+		data = gf_filter_pck_get_data(pck, &data_size);
+		if (data) {
+			ctx->frame->data[0] = (uint8_t *) data;
+			if (ipid->width) {
+				ctx->frame->linesize[0] = ipid->stride;
+				if (ipid->stride_uv) {
+					ctx->frame->data[1] = ctx->frame->data[0] + ipid->height * ipid->stride;
+					ctx->frame->linesize[1] = ipid->stride_uv;
+					if (ipid->nb_planes==3) {
+						ctx->frame->data[2] = ctx->frame->data[1] + ipid->uv_height * ipid->stride_uv;
+						ctx->frame->linesize[2] = ipid->stride_uv;
+					}
+				}
+			} else {
+				ctx->frame->linesize[0] = data_size;
+			}
+			frame_ok = GF_TRUE;
+		} else {
+			u32 j;
+			GF_FilterFrameInterface *fifce = gf_filter_pck_get_frame_interface(pck);
+			if (fifce->get_plane) {
+				frame_ok = GF_TRUE;
+				for (j=0; j<ipid->nb_planes; j++) {
+					e = fifce->get_plane(fifce, j, (const u8 **) &ctx->frame->data[j], &ctx->frame->linesize[j]);
+					if (e) {
+						frame_ok = GF_FALSE;
+						break;
+					}
+				}
+			}
+		}
+
+		if (frame_ok) {
+			u64 cts = gf_filter_pck_get_cts(pck);
+			ctx->frame->pts = cts;
+			if (ipid->width) {
+				ctx->frame->width = ipid->width;
+				ctx->frame->height = ipid->height;
+				ctx->frame->format = ipid->pfmt;
+				ctx->frame->sample_aspect_ratio.num = ipid->sar.num;
+				ctx->frame->sample_aspect_ratio.den = ipid->sar.den;
+			} else {
+				ctx->frame->channel_layout = ipid->ch_layout;
+				ctx->frame->channels = ipid->nb_ch;
+				ctx->frame->sample_rate = ipid->sr;
+				ctx->frame->format = ipid->pfmt;
+				ctx->frame->nb_samples = data_size / ipid->nb_ch / ipid->bps;
+			}
+			/* push the decoded frame into the filtergraph */
+			ret = av_buffersrc_add_frame_flags(ipid->io_filter_ctx, ctx->frame, 0);
+			if (ret < 0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to push frame to filtergaph: %s\n", av_err2str(ret) ));
+				e = GF_SERVICE_ERROR;
+				break;
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to fetch data from frame\n"));
+			e = GF_SERVICE_ERROR;
+			break;
+		}
+		gf_filter_pid_drop_packet(ipid->io_pid);
+	}
+	if (count>nb_eos) nb_eos=0;
+
+	if (ctx->flush_state==1) {
+		ctx->flush_state = 2;
+		nb_eos = 0;
+	}
+
+	//pull output
+	count = gf_list_count(ctx->opids);
+	for (i=0; i<count; i++) {
+		GF_FFAVPid *opid = gf_list_get(ctx->opids, i);
+		if (!nb_eos && gf_filter_pid_would_block(opid->io_pid)) {
+			continue;
+		}
+
+		AVFrame *frame = av_frame_alloc();
+
+		ret = av_buffersink_get_frame(opid->io_filter_ctx, frame);
+        if (ret < 0) {
+			if (ret == AVERROR_EOF) {
+				if (ctx->flush_state==2) {
+					nb_eos++;
+				} else if (nb_eos) {
+					gf_filter_pid_set_eos(opid->io_pid);
+				}
+			} else if (ret != AVERROR(EAGAIN)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Fail to pull frame from filtergaph: %s\n", av_err2str(ret) ));
+				e = GF_SERVICE_ERROR;
+			}
+			av_frame_free(&frame);
+			break;
+        }
+        if (opid->is_video) {
+			u8 *buffer;
+			u32 j;
+			GF_FilterPacket *pck;
+			Bool update_props=GF_TRUE;
+			if (frame->width!=opid->width) {}
+			else if (frame->height!=opid->height) {}
+			else if (frame->format != opid->pfmt) {}
+			else {
+				update_props = GF_FALSE;
+			}
+			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);
+				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])
+					gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(frame->linesize[1]));
+				else
+					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) );
+
+				opid->width = frame->width;
+				opid->height = frame->height;
+				opid->pfmt = frame->format;
+				opid->tb_num = opid->io_filter_ctx->inputs[0]->time_base.num;
+				opid->stride = 0;
+				opid->stride_uv = 0;
+				gf_pixel_get_size_info(opid->gf_pfmt, opid->width, opid->height, &opid->out_size, &opid->stride, &opid->stride_uv, NULL, &opid->uv_height);
+				if ((opid->gf_pfmt==GF_PIXEL_YUV444) || (opid->gf_pfmt==GF_PIXEL_YUV444_10)) {
+					opid->uv_width = opid->width;
+				} else if (opid->uv_height) {
+					opid->uv_width = opid->width/2;
+				} else {
+					opid->uv_width = 0;
+				}
+				if (ctx->nb_a_out+ctx->nb_v_out>1) {
+					gf_filter_pid_set_property_str(opid->io_pid, "ffid", &PROP_STRING(opid->io_filter_ctx->name));
+				}
+			}
+			pck = gf_filter_pck_new_alloc(opid->io_pid, opid->out_size, &buffer);
+			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);
+			}
+			if (frame->linesize[1]) {
+				buffer += opid->height*opid->stride;
+				for (j=0; j<opid->uv_height; j++) {
+					memcpy(buffer + j*opid->stride_uv, frame->data[1] + j*frame->linesize[1], opid->uv_width);
+				}
+			}
+			if (frame->linesize[2]) {
+				buffer += opid->uv_height*opid->stride_uv;
+				for (j=0; j<opid->uv_height; j++) {
+					memcpy(buffer + j*opid->stride_uv, frame->data[2] + j*frame->linesize[2], opid->uv_width);
+				}
+			}
+			if (frame->interlaced_frame)
+				gf_filter_pck_set_interlaced(pck, frame->top_field_first ? 1 : 2);
+
+			gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_cts(pck, frame->pts * opid->tb_num);
+			gf_filter_pck_send(pck);
+		} else {
+			u8 *buffer;
+			u32 j, out_size;
+			GF_FilterPacket *pck;
+			Bool update_props=GF_TRUE;
+			if (frame->sample_rate!=opid->sr) {}
+			else if (frame->channel_layout!=opid->ch_layout) {}
+			else if (frame->channels != opid->nb_ch) {}
+			else if (frame->format != opid->pfmt) {}
+			else {
+				update_props = GF_FALSE;
+			}
+			if (update_props) {
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(frame->sample_rate));
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(frame->channel_layout));
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(frame->channels));
+				opid->gf_pfmt = ffmpeg_audio_fmt_to_gpac(frame->format);
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(opid->gf_pfmt));
+				gf_filter_pid_set_property(opid->io_pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(opid->io_filter_ctx->inputs[0]->time_base.den) );
+
+				opid->sr = frame->sample_rate;
+				opid->ch_layout = frame->channel_layout;
+				opid->nb_ch = frame->channels;
+				opid->pfmt = frame->format;
+				opid->tb_num = opid->io_filter_ctx->inputs[0]->time_base.num;
+				opid->bps = gf_audio_fmt_bit_depth(opid->gf_pfmt) / 8;
+				if (ctx->nb_a_out+ctx->nb_v_out>1) {
+					gf_filter_pid_set_property_str(opid->io_pid, "ffid", &PROP_STRING(opid->io_filter_ctx->name));
+				}
+			}
+			out_size = 0;
+			for (j=0; j<8; j++) {
+				if (!frame->linesize[j]) break;
+				out_size += frame->linesize[j];
+			}
+
+			pck = gf_filter_pck_new_alloc(opid->io_pid, out_size, &buffer);
+			if (!pck) return GF_OUT_OF_MEM;
+
+			for (j=0; j<8; j++) {
+				if (!frame->linesize[j]) break;
+				memcpy(buffer, frame->data[0], frame->linesize[j]);
+				buffer += frame->linesize[j];
+			}
+			gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_cts(pck, frame->pts * opid->tb_num);
+			gf_filter_pck_send(pck);
+		}
+		av_frame_free(&frame);
+	}
+	if (e) return e;
+	if (ctx->flush_state==2) {
+		if (nb_eos<count) return GF_OK;
+		return ffavf_reconfigure_graph(filter, ctx);
+	}
+	if (nb_eos) return GF_EOS;
+	return GF_OK;
+}
+
+static GF_Err ffavf_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 streamtype;
+	GF_FFAVPid *pid_ctx;
+	Bool check_recfg = GF_FALSE;
+	const GF_PropertyValue *p;
+	GF_Fraction timebase;
+	GF_FFAVFilterCtx *ctx = (GF_FFAVFilterCtx *) gf_filter_get_udta(filter);
+
+	gf_filter_pid_check_caps(pid);
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_BAD_PARAM;
+	streamtype = p->value.uint;
+
+	pid_ctx = gf_filter_pid_get_udta(pid);
+	if (!pid_ctx) {
+		GF_SAFEALLOC(pid_ctx, GF_FFAVPid);
+		if (!pid_ctx) return GF_OUT_OF_MEM;
+		
+		pid_ctx->io_pid = pid;
+		gf_filter_pid_set_udta(pid, pid_ctx);
+		gf_list_add(ctx->ipids, pid_ctx);
+	} else {
+		check_recfg = GF_TRUE;
+	}
+
+	timebase.num = 1;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (!p) return GF_BAD_PARAM;
+	timebase.den = p->value.uint;
+
+	ctx->in_error = GF_OK;
+
+	if (streamtype==GF_STREAM_VISUAL) {
+		u32 width, height, pix_fmt, gf_pfmt;
+		GF_Fraction sar={1,1};
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		if (!p) return GF_OK; //not ready yet
+		width = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		if (!p) return GF_OK; //not ready yet
+		height = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+		if (!p) return GF_OK; //not ready yet
+		gf_pfmt = p->value.uint;
+		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;
+
+		pid_ctx->stride = pid_ctx->stride_uv = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+		if (p) pid_ctx->stride = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+		if (p) pid_ctx->stride_uv = p->value.uint;
+		gf_pixel_get_size_info(gf_pfmt, width, height, NULL, &pid_ctx->stride, &pid_ctx->stride_uv, &pid_ctx->nb_planes, &pid_ctx->uv_height);
+
+		if (check_recfg) {
+			check_recfg = GF_FALSE;
+			if (width!=pid_ctx->width) {}
+			else if (height!=pid_ctx->height) {}
+			else if (pix_fmt!=pid_ctx->pfmt) {}
+			else if (timebase.den!=pid_ctx->timescale) {}
+			else if (sar.den * pid_ctx->sar.num != sar.num * pid_ctx->sar.den) {}
+			else {
+				return GF_OK;
+			}
+		}
+		pid_ctx->width = width;
+		pid_ctx->height = height;
+		pid_ctx->pfmt = pix_fmt;
+		pid_ctx->timescale = timebase.den;
+		pid_ctx->sar = sar;
+	} else if (streamtype==GF_STREAM_AUDIO) {
+		u64 ch_layout=0;
+		u32 sr, afmt, nb_ch;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (p) ch_layout = p->value.longuint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		if (!p) return GF_OK; //not ready yet
+		nb_ch = p->value.uint;
+		if (!ch_layout) ch_layout = av_get_default_channel_layout(p->value.uint);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (!p) return GF_OK; //not ready yet
+		sr = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		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;
+
+		if (check_recfg) {
+			if (sr!=pid_ctx->sr) {}
+			else if (afmt!=pid_ctx->pfmt) {}
+			else if (nb_ch!=pid_ctx->nb_ch) {}
+			else if (ch_layout!=pid_ctx->ch_layout) {}
+			else if (timebase.den!=pid_ctx->timescale) {}
+			else {
+				return GF_OK;
+			}
+		}
+		pid_ctx->sr = sr;
+		pid_ctx->ch_layout = ch_layout;
+		pid_ctx->pfmt = afmt;
+		pid_ctx->nb_ch = nb_ch;
+		pid_ctx->timescale = timebase.den;
+	} else {
+		return GF_NOT_SUPPORTED;
+	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	//we have not yet configured graph, no need to flush
+	if (ctx->configure_state==1) {
+		check_recfg = GF_FALSE;
+	}
+
+	//pid config change, flush current graph and resetup
+	if (check_recfg) ctx->flush_state = 1;
+	//graph has already been loaded, we need to flush/resetup to add the pid
+	if (ctx->configure_state==2) ctx->flush_state = 1;
+	//in flush state, either because of this reconfig or a previous one
+	if (ctx->flush_state)
+		return GF_OK;
+
+	//setup input connections
+	ctx->in_error = ffavf_setup_input(ctx, pid_ctx);
+	if (ctx->in_error) return ctx->in_error;
+
+	//mark graph to be rebuild
+	ctx->configure_state = 1;
+	//setup output connections
+	ctx->in_error = ffavf_setup_outputs(filter, ctx);
+	return ctx->in_error;
+}
+
+
+static void ffavf_finalize(GF_Filter *filter)
+{
+	GF_FFAVFilterCtx *ctx = (GF_FFAVFilterCtx *) gf_filter_get_udta(filter);
+
+	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
+		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
+		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)
+{
+	int ret;
+	char *arg_value;
+
+	GF_FFAVFilterCtx *ctx = gf_filter_get_udta(filter);
+
+	if (!strcmp(arg_name, "f")) {
+		if (ctx->filter_graph) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Cannot update filter description while running, not supported\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (ctx->filter_desc) gf_free(ctx->filter_desc);
+		ctx->filter_desc = gf_strdup(arg_val->value.string);
+		return GF_OK;
+	}
+
+	arg_value = NULL;
+	if  (arg_val->type == GF_PROP_STRING) {
+		arg_value = arg_val->value.string;
+	}
+
+	if (!strcmp(arg_name, "dump")) {
+		ffavf_dump_graph(ctx, (arg_value && strlen(arg_value) ) ? arg_value : NULL);
+		//do not change the dump value
+		return GF_NOT_FOUND;
+	}
+
+	if (!arg_value) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFAVF] Failed to set option %s:%s, unrecognized type %d\n", arg_name, arg_val, arg_val->type ));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->filter_graph) {
+		char *arg = (char *) arg_name;
+		char szTargetName[101];
+		char szCommandRes[1025];
+		char *target = strchr(arg_name, gf_filter_get_sep(filter, GF_FS_SEP_FRAG));
+		if (target) {
+			u32 len = (u32) (target - arg_name);
+			if (len>=100) len=100;
+			strncpy(szTargetName, arg_name, len);
+			szTargetName[100] = 0;
+			arg = target+1;
+		} else {
+			strcpy(szTargetName, "all");
+		}
+		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) ));
+		}
+	}
+	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;
+}
+
+
+static const GF_FilterCapability FFAVFilterCaps[] =
+{
+	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_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+GF_FilterRegister FFAVFilterRegister = {
+	.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"
+		"\n"
+		"# Declaring a filter\n"
+		"The filter loads a filter or a filter chain description from the [-f]() option.\n"
+		"EX ffavf:f=showspectrum\n"
+		"\n"
+		"Unlike other FFMPEG bindings in GPAC, this filter does not parse other libavfilter options, you must specify them directly in the filter chain, and the [-f]() option will have to be escaped.\n"
+		"EX ffavf::f=showspectrum=size=320x320 or ffavf::f=showspectrum=size=320x320::pfmt=rgb\n"
+		"\n"
+		"The filter will automatically create `buffer` and `buffersink` AV filters for data exchange between GPAC and libavfilter.\n"
+		"The builtin options ( [-pfmt](), [-afmt]() ...) can be used to configure the `buffersink` filter to set the output format of the filter.\n"
+		"\n"
+		"# Naming of PIDs\n"
+		"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"
+		"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"
+		"In this example:\n"
+		"- the spliter produces 2 video streams `out0` and `out1`\n"
+		"- the inspecter 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"
+		"\n"
+		"# Filter graph commands\n"
+		"The filter handles option updates as commands passed to the AV filter graph. The syntax expected in the option name is:\n"
+		"- com_name=value: sends command `com_name` with value `value` to all filters\n"
+		"- 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,
+	.private_size = sizeof(GF_FFAVFilterCtx),
+	SETCAPS(FFAVFilterCaps),
+	.initialize = ffavf_initialize,
+	.finalize = ffavf_finalize,
+	.configure_pid = ffavf_configure_pid,
+	.process = ffavf_process,
+	.update_arg = ffavf_update_arg,
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_FFAVFilterCtx, _n)
+
+static const GF_FilterArgs FFAVFilterArgs[] =
+{
+	{ "f", -1, "filter or filter chain description - see filter help", 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},
+	{0}
+};
+
+const int FFAVF_STATIC_ARGS = (sizeof (FFAVFilterArgs) / sizeof (GF_FilterArgs)) - 1;
+
+const GF_FilterRegister *ffavf_register(GF_FilterSession *session)
+{
+	ffmpeg_build_register(session, &FFAVFilterRegister, FFAVFilterArgs, FFAVF_STATIC_ARGS, FF_REG_TYPE_AVF);
+	return &FFAVFilterRegister;
+}
+
+#else
+#include <gpac/filters.h>
+const GF_FilterRegister *ffavf_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif

gpac-1.0.0.tar.gz/src/filters/ff_common.c Added

@@ -0,0 +1,1256 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common ffmpeg filters
+ *
+ *  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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+
+#include <libavfilter/avfilter.h>
+
+#if !defined(__GNUC__)
+# if defined(_WIN32_WCE) || defined (WIN32)
+#  pragma comment(lib, "avutil")
+#  pragma comment(lib, "avformat")
+#  pragma comment(lib, "avcodec")
+#  pragma comment(lib, "avdevice")
+#  pragma comment(lib, "swscale")
+#  pragma comment(lib, "avfilter")
+# endif
+#endif
+
+
+static Bool ffmpeg_init = GF_FALSE;
+
+typedef struct
+{
+	GF_List *all_filters;
+	u32 nb_arg_skip;
+} GF_FFRegistryExt;
+
+typedef struct
+{
+	u32 ff_pf;
+	u32 gpac_pf;
+} GF_FF_PFREG;
+
+static const GF_FF_PFREG FF2GPAC_PixelFormats[] =
+{
+	{AV_PIX_FMT_YUV420P, GF_PIXEL_YUV},
+	{AV_PIX_FMT_YUV420P10LE, GF_PIXEL_YUV_10},
+	{AV_PIX_FMT_YUV422P, GF_PIXEL_YUV422},
+	{AV_PIX_FMT_YUV422P10LE, GF_PIXEL_YUV422_10},
+	{AV_PIX_FMT_YUV444P, GF_PIXEL_YUV444},
+	{AV_PIX_FMT_YUV444P10LE, GF_PIXEL_YUV444_10},
+	{AV_PIX_FMT_RGBA, GF_PIXEL_RGBA},
+	{AV_PIX_FMT_RGB24, GF_PIXEL_RGB},
+	{AV_PIX_FMT_BGR24, GF_PIXEL_BGR},
+	{AV_PIX_FMT_UYVY422, GF_PIXEL_UYVY},
+	{AV_PIX_FMT_YUYV422, GF_PIXEL_YUYV},
+	//remap unsupported pix formats
+	{AV_PIX_FMT_UYVY422, GF_PIXEL_VYUY},
+	{AV_PIX_FMT_YUYV422, GF_PIXEL_YVYU},
+
+	{AV_PIX_FMT_NV12, GF_PIXEL_NV12},
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	{AV_PIX_FMT_P010LE, GF_PIXEL_NV12_10},
+#endif
+	{AV_PIX_FMT_NV21, GF_PIXEL_NV21},
+	{AV_PIX_FMT_0RGB, GF_PIXEL_XRGB},
+	{AV_PIX_FMT_RGB0, GF_PIXEL_RGBX},
+	{AV_PIX_FMT_0BGR, GF_PIXEL_XBGR},
+	{AV_PIX_FMT_BGR0, GF_PIXEL_BGRX},
+	{AV_PIX_FMT_GRAY8, GF_PIXEL_GREYSCALE},
+	{AV_PIX_FMT_YA8, GF_PIXEL_GREYALPHA},
+	{AV_PIX_FMT_RGB444, GF_PIXEL_RGB_444},
+	{AV_PIX_FMT_RGB555, GF_PIXEL_RGB_555},
+	{AV_PIX_FMT_RGB565, GF_PIXEL_RGB_565},
+	{AV_PIX_FMT_RGBA, GF_PIXEL_RGBA},
+	{AV_PIX_FMT_ARGB, GF_PIXEL_ARGB},
+	{AV_PIX_FMT_ABGR, GF_PIXEL_ABGR},
+	{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},
+
+	{0},
+};
+
+u32 ffmpeg_pixfmt_from_gpac(u32 pfmt)
+{
+	u32 i=0;
+	while (FF2GPAC_PixelFormats[i].gpac_pf) {
+		if (FF2GPAC_PixelFormats[i].gpac_pf == pfmt)
+			return FF2GPAC_PixelFormats[i].ff_pf;
+		i++;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unmapped GPAC pixel format %s, patch welcome\n", gf_4cc_to_str(pfmt) ));
+	return 0;
+}
+
+u32 ffmpeg_pixfmt_to_gpac(u32 pfmt)
+{
+	const AVPixFmtDescriptor *ffdesc = av_pix_fmt_desc_get(pfmt);
+	if (!ffdesc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFMPEG] Unrecognized FFMPEG pixel format %d\n", pfmt ));
+		return 0;
+	}
+	u32 i=0;
+	while (FF2GPAC_PixelFormats[i].gpac_pf) {
+		if (FF2GPAC_PixelFormats[i].ff_pf == pfmt)
+			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));
+	return 0;
+}
+
+
+typedef struct
+{
+	u32 ff_sf;
+	u32 gpac_sf;
+} GF_FF_AFREG;
+
+static const GF_FF_AFREG FF2GPAC_AudioFormats[] =
+{
+	{AV_SAMPLE_FMT_U8, GF_AUDIO_FMT_U8},
+	{AV_SAMPLE_FMT_S16, GF_AUDIO_FMT_S16},
+	{AV_SAMPLE_FMT_S32, GF_AUDIO_FMT_S32},
+	{AV_SAMPLE_FMT_FLT, GF_AUDIO_FMT_FLT},
+	{AV_SAMPLE_FMT_DBL, GF_AUDIO_FMT_DBL},
+	{AV_SAMPLE_FMT_U8P, GF_AUDIO_FMT_U8P},
+	{AV_SAMPLE_FMT_S16P, GF_AUDIO_FMT_S16P},
+	{AV_SAMPLE_FMT_S32P, GF_AUDIO_FMT_S32P},
+	{AV_SAMPLE_FMT_FLTP, GF_AUDIO_FMT_FLTP},
+	{AV_SAMPLE_FMT_DBLP, GF_AUDIO_FMT_DBLP},
+	{0},
+};
+
+u32 ffmpeg_audio_fmt_from_gpac(u32 sfmt)
+{
+	u32 i=0;
+	while (FF2GPAC_AudioFormats[i].gpac_sf) {
+		if (FF2GPAC_AudioFormats[i].gpac_sf == sfmt)
+			return FF2GPAC_AudioFormats[i].ff_sf;
+		i++;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unmapped GPAC audio format %s, patch welcome\n", gf_4cc_to_str(sfmt) ));
+	return 0;
+}
+
+u32 ffmpeg_audio_fmt_to_gpac(u32 sfmt)
+{
+	u32 i=0;
+	while (FF2GPAC_AudioFormats[i].gpac_sf) {
+		if (FF2GPAC_AudioFormats[i].ff_sf == sfmt)
+			return FF2GPAC_AudioFormats[i].gpac_sf;
+		i++;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unmapped FFMPEG audio format %d, patch welcome\n", sfmt ));
+	return 0;
+}
+
+
+typedef struct
+{
+	u64 ff_ch_mask;
+	u64 gpac_ch_mask;
+} GF_FF_LAYOUTREG;
+
+static const GF_FF_LAYOUTREG FF2GPAC_ChannelLayout[] =
+{
+	{AV_CH_FRONT_LEFT, GF_AUDIO_CH_FRONT_LEFT},
+	{AV_CH_FRONT_RIGHT, GF_AUDIO_CH_FRONT_RIGHT},
+	{AV_CH_FRONT_CENTER, GF_AUDIO_CH_FRONT_CENTER},
+	{AV_CH_LOW_FREQUENCY, GF_AUDIO_CH_LFE},
+	{AV_CH_BACK_LEFT, GF_AUDIO_CH_SURROUND_LEFT},
+	{AV_CH_BACK_RIGHT, GF_AUDIO_CH_SURROUND_RIGHT},
+	{AV_CH_FRONT_LEFT_OF_CENTER, GF_AUDIO_CH_FRONT_CENTER_LEFT},
+	{AV_CH_FRONT_RIGHT_OF_CENTER, GF_AUDIO_CH_FRONT_CENTER_RIGHT},
+	{AV_CH_BACK_CENTER, GF_AUDIO_CH_REAR_CENTER},
+	{AV_CH_SIDE_LEFT, GF_AUDIO_CH_REAR_SURROUND_LEFT},
+	{AV_CH_SIDE_RIGHT, GF_AUDIO_CH_REAR_SURROUND_RIGHT},
+	{AV_CH_TOP_CENTER, GF_AUDIO_CH_CENTER_SURROUND_TOP},
+	{AV_CH_TOP_FRONT_LEFT, GF_AUDIO_CH_FRONT_TOP_LEFT},
+	{AV_CH_TOP_FRONT_CENTER, GF_AUDIO_CH_FRONT_TOP_CENTER},
+	{AV_CH_TOP_FRONT_RIGHT, GF_AUDIO_CH_FRONT_TOP_RIGHT},
+	{AV_CH_TOP_BACK_LEFT, GF_AUDIO_CH_SURROUND_TOP_LEFT},
+	{AV_CH_TOP_BACK_CENTER, GF_AUDIO_CH_REAR_CENTER_TOP},
+	{AV_CH_TOP_BACK_RIGHT, GF_AUDIO_CH_SURROUND_TOP_RIGHT},
+	{AV_CH_WIDE_LEFT, GF_AUDIO_CH_WIDE_FRONT_LEFT},
+	{AV_CH_WIDE_RIGHT, GF_AUDIO_CH_WIDE_FRONT_RIGHT},
+	{AV_CH_SURROUND_DIRECT_LEFT, GF_AUDIO_CH_SURROUND_DIRECT_LEFT},
+	{AV_CH_SURROUND_DIRECT_RIGHT, GF_AUDIO_CH_SURROUND_DIRECT_RIGHT},
+	{AV_CH_LOW_FREQUENCY_2, GF_AUDIO_CH_LFE2},
+/*	{AV_CH_STEREO_LEFT, },
+	{AV_CH_STEREO_RIGHT, },
+*/
+};
+
+u64 ffmpeg_channel_layout_from_gpac(u64 gpac_ch_layout)
+{
+	u32 i, nb_layout = sizeof(FF2GPAC_ChannelLayout) / sizeof(GF_FF_LAYOUTREG);
+	u64 res = 0;
+	for (i=0; i<nb_layout; i++) {
+		if (FF2GPAC_ChannelLayout[i].gpac_ch_mask & gpac_ch_layout)
+			res |= FF2GPAC_ChannelLayout[i].ff_ch_mask;
+	}
+	return res;
+}
+u64 ffmpeg_channel_layout_to_gpac(u64 ff_ch_layout)
+{
+	u32 i, nb_layout = sizeof(FF2GPAC_ChannelLayout) / sizeof(GF_FF_LAYOUTREG);
+	u64 res = 0;
+	for (i=0; i<nb_layout; i++) {
+		if (FF2GPAC_ChannelLayout[i].ff_ch_mask & ff_ch_layout)
+			res |= FF2GPAC_ChannelLayout[i].gpac_ch_mask;
+	}
+	return res;
+}
+
+
+typedef struct
+{
+	u32 ff_codec_id;
+	u32 gpac_codec_id;
+	u32 ff_codectag;
+} GF_FF_CIDREG;
+
+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_AAC, GF_CODECID_AAC_MPEG4, 0},
+	{AV_CODEC_ID_AC3, GF_CODECID_AC3, 0},
+	{AV_CODEC_ID_EAC3, GF_CODECID_EAC3, 0},
+	{AV_CODEC_ID_AMR_NB, GF_CODECID_AMR, 0},
+	{AV_CODEC_ID_AMR_WB, GF_CODECID_AMR_WB, 0},
+	{AV_CODEC_ID_QCELP, GF_CODECID_QCELP, 0},
+	{AV_CODEC_ID_EVRC, GF_CODECID_EVRC, 0},
+	{AV_CODEC_ID_SMV, GF_CODECID_SMV, 0},
+	{AV_CODEC_ID_VORBIS, GF_CODECID_VORBIS, 0},
+	{AV_CODEC_ID_FLAC, GF_CODECID_FLAC, 0},
+	{AV_CODEC_ID_SPEEX, GF_CODECID_SPEEX, 0},
+	{AV_CODEC_ID_THEORA, GF_CODECID_THEORA, 0},
+	{AV_CODEC_ID_MPEG4, GF_CODECID_MPEG4_PART2, 0},
+	{AV_CODEC_ID_H264, GF_CODECID_AVC, 0},
+	{AV_CODEC_ID_HEVC, GF_CODECID_HEVC, 0},
+	{AV_CODEC_ID_MPEG1VIDEO, GF_CODECID_MPEG1, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_SIMPLE, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_MAIN, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_HIGH, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_SPATIAL, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_SNR, 0},
+	{AV_CODEC_ID_MPEG2VIDEO, GF_CODECID_MPEG2_422, 0},
+	{AV_CODEC_ID_H263, GF_CODECID_S263, 0},
+	{AV_CODEC_ID_H263, GF_CODECID_H263, 0},
+	{AV_CODEC_ID_MJPEG, GF_CODECID_JPEG, 0},
+	{AV_CODEC_ID_PNG, GF_CODECID_PNG, 0},
+	{AV_CODEC_ID_JPEG2000, GF_CODECID_J2K, 0},
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	{AV_CODEC_ID_AV1, GF_CODECID_AV1, 0},
+#endif
+	{AV_CODEC_ID_VP8, GF_CODECID_VP8, 0},
+	{AV_CODEC_ID_VP9, GF_CODECID_VP9, 0},
+	{AV_CODEC_ID_VC1, GF_CODECID_SMPTE_VC1, 0},
+
+	{AV_CODEC_ID_OPUS, GF_CODECID_OPUS, 0},
+
+
+	//ProRes
+	{AV_CODEC_ID_PRORES, GF_CODECID_APCH, GF_4CC('h','c','p','a') },
+	{AV_CODEC_ID_PRORES, GF_CODECID_APCO, GF_4CC('o','c','p','a') },
+	{AV_CODEC_ID_PRORES, GF_CODECID_APCN, GF_4CC('n','c','p','a')},
+	{AV_CODEC_ID_PRORES, GF_CODECID_APCS, GF_4CC('s','c','p','a')},
+	{AV_CODEC_ID_PRORES, GF_CODECID_AP4X, GF_4CC('x','4','p','a')},
+	{AV_CODEC_ID_PRORES, GF_CODECID_AP4H, GF_4CC('h','4','p','a')},
+
+	//RAW codecs
+	{AV_CODEC_ID_RAWVIDEO, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S16LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S16BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U16LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U16BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S8, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U8, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_MULAW, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_ALAW, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S32LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S32BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U32LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U32BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S24LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S24BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U24LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_U24BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S24DAUD, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_ZORK, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S16LE_PLANAR, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_DVD, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F32BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F32LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F64BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F64LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_BLURAY, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_LXF, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_S302M, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S8_PLANAR, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S24LE_PLANAR, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S32LE_PLANAR, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S16BE_PLANAR, GF_CODECID_RAW, 0},
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	{AV_CODEC_ID_PCM_S64LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_S64BE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F16LE, GF_CODECID_RAW, 0},
+	{AV_CODEC_ID_PCM_F24LE, GF_CODECID_RAW, 0},
+#endif
+	{0}
+};
+
+u32 ffmpeg_codecid_from_gpac(u32 codec_id, u32 *ff_codectag)
+{
+	u32 i=0;
+	if (ff_codectag) *ff_codectag = 0;
+
+	while (FF2GPAC_CodecIDs[i].gpac_codec_id) {
+		if (FF2GPAC_CodecIDs[i].gpac_codec_id == codec_id) {
+			if (ff_codectag) *ff_codectag = FF2GPAC_CodecIDs[i].ff_codectag;
+			return FF2GPAC_CodecIDs[i].ff_codec_id;
+		}
+		i++;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FFMPEG] Unmapped GPAC codec %s\n", gf_codecid_name(codec_id) ));
+	return 0;
+}
+
+u32 ffmpeg_codecid_to_gpac(u32 codec_id)
+{
+	u32 i=0;
+	while (FF2GPAC_CodecIDs[i].ff_codec_id) {
+		if (FF2GPAC_CodecIDs[i].ff_codec_id == codec_id)
+			return FF2GPAC_CodecIDs[i].gpac_codec_id;
+		i++;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[FFMPEG] Unmapped FFMPEG codec ID %s\n", avcodec_get_name(codec_id) ));
+	return 0;
+}
+
+
+typedef struct
+{
+	u32 ff_st;
+	u32 gpac_st;
+} GF_FF_ST;
+
+static const GF_FF_ST FF2GPAC_StreamTypes[] =
+{
+	{AVMEDIA_TYPE_VIDEO, GF_STREAM_VISUAL},
+	{AVMEDIA_TYPE_AUDIO, GF_STREAM_AUDIO},
+	{AVMEDIA_TYPE_DATA, GF_STREAM_METADATA},
+	{AVMEDIA_TYPE_SUBTITLE, GF_STREAM_TEXT},
+	{AVMEDIA_TYPE_ATTACHMENT, GF_STREAM_METADATA},
+	{AVMEDIA_TYPE_UNKNOWN, GF_STREAM_UNKNOWN},
+	{0},
+};
+
+u32 ffmpeg_stream_type_from_gpac(u32 streamtype)
+{
+	u32 i=0;
+	while (FF2GPAC_StreamTypes[i].gpac_st) {
+		if (FF2GPAC_StreamTypes[i].gpac_st == streamtype)
+			return FF2GPAC_StreamTypes[i].ff_st;
+		i++;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFMPEG] Unmapped GPAC stream type %s, assuming data\n", gf_stream_type_name(streamtype) ));
+	return AVMEDIA_TYPE_DATA;
+}
+
+
+u32 ffmpeg_stream_type_to_gpac(u32 streamtype)
+{
+	u32 i=0;
+	while (FF2GPAC_StreamTypes[i].gpac_st) {
+		if (FF2GPAC_StreamTypes[i].ff_st == streamtype)
+			return FF2GPAC_StreamTypes[i].gpac_st;
+		i++;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFMPEG] Unmapped FFMPEG stream type %d, assuming data\n", streamtype ));
+	return GF_STREAM_METADATA;
+}
+
+//static void ff_log_callback(void *avcl, int level, const char *fmt, va_list vl) { }
+
+void ffmpeg_setup_logs(u32 log_class)
+{
+	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;
+	default:
+		av_log_set_level(AV_LOG_ERROR);
+		break;
+	}
+//	av_log_set_callback(ff_log_callback);
+}
+
+void ffmpeg_initialize()
+{
+	if (ffmpeg_init) return;
+	av_register_all();
+	avformat_network_init();
+	ffmpeg_init = GF_TRUE;
+}
+
+static void ffmpeg_register_free(GF_FilterSession *session, GF_FilterRegister *reg)
+{
+	u32 i;
+	GF_FFRegistryExt *ffregext = reg->udta;
+	GF_List *all_filters = ffregext->all_filters;
+	u32 nb_skip_begin = ffregext->nb_arg_skip;
+	gf_free(ffregext);
+	reg->udta = NULL;
+
+	if (all_filters) {
+		while (gf_list_count(all_filters)) {
+			i=0;
+			GF_FilterRegister *f = gf_list_pop_back(all_filters);
+			if (f->caps)
+				gf_free((void *)f->caps);
+
+			while (f->args) {
+				GF_FilterArgs *arg = (GF_FilterArgs *) &f->args[i];
+				if (!arg || !arg->arg_name) break;
+				i++;
+				if (arg->arg_default_val) gf_free((void *) arg->arg_default_val);
+				if (arg->min_max_enum) gf_free((void *) arg->min_max_enum);
+				if (arg->flags & GF_FS_ARG_META_ALLOC) gf_free((void *) arg->arg_desc);
+			}
+			gf_free((void *) f->args);
+			gf_free((char*) f->name);
+			gf_fs_remove_filter_register(session, f);
+			gf_free(f);
+		}
+		gf_list_del(all_filters);
+	}
+	i=nb_skip_begin;
+	while (reg->args) {
+		GF_FilterArgs *arg = (GF_FilterArgs *) &reg->args[i];
+		if (!arg || !arg->arg_name) break;
+		i++;
+		if (arg->arg_default_val) gf_free((void *) arg->arg_default_val);
+		if (arg->min_max_enum) gf_free((void *) arg->min_max_enum);
+		if (arg->flags & GF_FS_ARG_META_ALLOC) gf_free((void *) arg->arg_desc);
+	}
+	if (reg->args) gf_free((void *) reg->args);
+
+}
+
+GF_FilterArgs ffmpeg_arg_translate(const struct AVOption *opt)
+{
+	char szDef[200];
+	GF_FilterArgs arg;
+	memset(&arg, 0, sizeof(GF_FilterArgs));
+	arg.arg_name = opt->name;
+	arg.arg_desc = opt->help;
+	arg.offset_in_private=-1;
+	arg.flags = GF_FS_ARG_META;
+	if (opt->name[0] == 0)
+		arg.flags = GF_FS_ARG_META;
+
+	switch (opt->type) {
+	case AV_OPT_TYPE_INT64:
+	case AV_OPT_TYPE_INT:
+	case AV_OPT_TYPE_CHANNEL_LAYOUT:
+		if (opt->type==AV_OPT_TYPE_INT64) arg.arg_type = GF_PROP_LSINT;
+		else if (opt->type==AV_OPT_TYPE_INT) arg.arg_type = GF_PROP_SINT;
+		else arg.arg_type = GF_PROP_UINT; //channel layout, map to int
+
+		sprintf(szDef, LLD, opt->default_val.i64);
+		arg.arg_default_val = gf_strdup(szDef);
+		if (opt->max>=(Double) GF_INT_MAX)
+			sprintf(szDef, LLD"-I", (s64) opt->min);
+		else
+			sprintf(szDef, LLD"-"LLD, (s64) opt->min, (s64) opt->max);
+		arg.min_max_enum = gf_strdup(szDef);
+		break;
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+	case AV_OPT_TYPE_UINT64:
+//	case AV_OPT_TYPE_UINT:
+		arg.arg_type = GF_PROP_LUINT;
+		sprintf(szDef, LLU, opt->default_val.i64);
+		arg.arg_default_val = gf_strdup(szDef);
+		if (opt->max>=(Double) GF_INT_MAX)
+			sprintf(szDef, LLU"-I", (s64) opt->min);
+		else
+			sprintf(szDef, LLU"-"LLU, (u64) opt->min, (u64) opt->max);
+		arg.min_max_enum = gf_strdup(szDef);
+		break;
+	case AV_OPT_TYPE_BOOL:
+		arg.arg_type = GF_PROP_BOOL;
+		arg.arg_default_val = gf_strdup(opt->default_val.i64 ? "true" : "false");
+		break;
+#endif
+	case AV_OPT_TYPE_FLOAT:
+		arg.arg_type = GF_PROP_FLOAT;
+		sprintf(szDef, "%g", opt->default_val.dbl);
+		arg.arg_default_val = gf_strdup(szDef);
+		break;
+	case AV_OPT_TYPE_DOUBLE:
+		arg.arg_type = GF_PROP_DOUBLE;
+		sprintf(szDef, "%g", opt->default_val.dbl);
+		arg.arg_default_val = gf_strdup(szDef);
+		break;
+	case AV_OPT_TYPE_VIDEO_RATE:
+	case AV_OPT_TYPE_RATIONAL:
+		arg.arg_type = GF_PROP_FRACTION;
+		sprintf(szDef, "%d/%d", opt->default_val.q.num, opt->default_val.q.den);
+		arg.arg_default_val = gf_strdup(szDef);
+		break;
+	case AV_OPT_TYPE_COLOR://color is a string in libavfilter
+	case AV_OPT_TYPE_STRING:
+	case AV_OPT_TYPE_DICT:
+		arg.arg_type = GF_PROP_STRING;
+		if (opt->default_val.str)
+			arg.arg_default_val = gf_strdup(opt->default_val.str);
+		break;
+	case AV_OPT_TYPE_IMAGE_SIZE:
+		arg.arg_type = GF_PROP_STRING;
+		break;
+	case AV_OPT_TYPE_CONST:
+		arg.arg_type = GF_PROP_BOOL;
+		arg.arg_default_val = gf_strdup("false");
+		break;
+	case AV_OPT_TYPE_FLAGS:
+		arg.arg_type = GF_PROP_UINT;
+		sprintf(szDef, ""LLD, opt->default_val.i64);
+		arg.arg_default_val = gf_strdup(szDef);
+		break;
+	case AV_OPT_TYPE_BINARY:
+	case AV_OPT_TYPE_DURATION:
+		arg.arg_type = GF_PROP_UINT;
+		break;
+	case AV_OPT_TYPE_SAMPLE_FMT:
+		arg.arg_type = GF_PROP_UINT;
+		arg.arg_default_val = gf_strdup("s16");
+		arg.min_max_enum = gf_strdup("u8|s16|s32|flt|dbl|u8p|s16p|s32p|fltp|dblp");
+		break;
+	case AV_OPT_TYPE_PIXEL_FMT:
+		arg.arg_type = GF_PROP_UINT;
+		arg.arg_default_val = gf_strdup(av_get_pix_fmt_name(AV_PIX_FMT_YUV420P) );
+		{
+		u32 i, all_len=1, def_size=1000;
+		char *enum_val = gf_malloc(sizeof(char)*def_size);
+		enum_val[0] = 0;
+		for (i=0; i<AV_PIX_FMT_NB; i++) {
+			u32 len;
+			const char *n = av_get_pix_fmt_name(i);
+			if (!n) continue;
+
+			len = (u32) strlen(n)+ (i ? 2 : 1);
+			if (len+all_len>def_size) {
+				def_size+=1000;
+				enum_val = gf_realloc(enum_val, sizeof(char)*def_size);
+			}
+			if (i) strcat(enum_val, "|");
+			strcat(enum_val, n);
+			all_len+=len-1;
+		}
+		arg.min_max_enum = enum_val;
+		}
+		break;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[FFMPEG] Unknown ffmpeg option type %d\n", opt->type));
+		break;
+	}
+	return arg;
+}
+
+static u32 ff_streamtype(u32 st)
+{
+	switch (st) {
+	case AVMEDIA_TYPE_AUDIO: return GF_STREAM_AUDIO;
+	case AVMEDIA_TYPE_VIDEO: return GF_STREAM_VISUAL;
+	case AVMEDIA_TYPE_DATA: return GF_STREAM_METADATA;
+	case AVMEDIA_TYPE_SUBTITLE: return GF_STREAM_TEXT;
+	}
+	return GF_STREAM_UNKNOWN;
+}
+
+#if (LIBAVFORMAT_VERSION_MAJOR >= 58) && (LIBAVFORMAT_VERSION_MINOR>=30)
+#else
+#define NO_AVIO_PROTO
+#endif
+
+static void ffmpeg_expand_register(GF_FilterSession *session, GF_FilterRegister *orig_reg, u32 type)
+{
+	u32 i=0, idx=0, flags=0;
+#ifndef NO_AVIO_PROTO
+	Bool protocol_pass = GF_FALSE;
+#endif
+	const struct AVOption *opt;
+	GF_List *all_filters = gf_list_new();
+	AVInputFormat *fmt = NULL;
+	const AVOutputFormat *ofmt = NULL;
+	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;
+#endif
+
+	const char *fname = "";
+	if (type==FF_REG_TYPE_DEMUX) fname = "ffdmx";
+	else if (type==FF_REG_TYPE_DECODE) {
+		fname = "ffdec";
+		flags=AV_OPT_FLAG_DECODING_PARAM;
+	}
+	else if (type==FF_REG_TYPE_DEV_IN) {
+		fname = "ffavin";
+		avdevice_register_all();
+		flags=AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_DECODING_PARAM;
+	}
+	else if (type==FF_REG_TYPE_ENCODE) {
+		fname = "ffenc";
+		flags=AV_OPT_FLAG_ENCODING_PARAM;
+	}
+	else if (type==FF_REG_TYPE_MUX) {
+		fname = "ffmx";
+	}
+	else if (type==FF_REG_TYPE_AVF) {
+		fname = "ffavf";
+	}
+	else return;
+
+
+	((GF_FFRegistryExt *)orig_reg->udta)->all_filters = all_filters;
+
+
+#ifndef NO_AVIO_PROTO
+second_pass:
+#endif
+
+#if !defined(NO_AVIO_PROTO) || (LIBAVFILTER_VERSION_MAJOR > 6)
+	av_it = NULL;
+#endif
+
+	while (1) {
+		const AVClass *av_class=NULL;
+		const char *subname = NULL;
+#ifndef GPAC_DISABLE_DOC
+		const char *description = "description unavailable in ffmpeg";
+#endif
+		char szDef[100];
+		GF_FilterRegister *freg;
+		if (type==FF_REG_TYPE_DEMUX) {
+#ifndef NO_AVIO_PROTO
+			if (protocol_pass) {
+				subname = avio_enum_protocols(&av_it, 0);
+				if (!subname) break;
+				av_class = avio_protocol_get_class(subname);
+#ifndef GPAC_DISABLE_DOC
+				description = "Input protocol";
+#endif
+			} else
+#endif
+			{
+				fmt = av_iformat_next(fmt);
+				if (!fmt) break;
+				av_class = fmt->priv_class;
+				subname = fmt->name;
+#ifndef GPAC_DISABLE_DOC
+				description = fmt->long_name;
+#endif
+			}
+		} else if (type==FF_REG_TYPE_DECODE) {
+			codec = av_codec_next(codec);
+			if (!codec) break;
+			av_class = codec->priv_class;
+			subname = codec->name;
+#ifndef GPAC_DISABLE_DOC
+			description = codec->long_name;
+#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);
+			if (!fmt) break;
+			av_class = fmt->priv_class;
+			subname = fmt->name;
+#ifndef GPAC_DISABLE_DOC
+			description = fmt->long_name;
+#endif
+    		if (!av_class || (av_class->category!=AV_CLASS_CATEGORY_DEVICE_VIDEO_INPUT) ) continue;
+#else
+			fmt = av_iformat_next(fmt);
+			if (!fmt) break;
+			av_class = fmt->priv_class;
+			subname = fmt->name;
+#ifndef GPAC_DISABLE_DOC
+			description = fmt->long_name;
+#endif
+			//brute force ...
+			if (!strcmp(subname, "dshow")) {}
+			else if (!strcmp(subname, "avfoundation")) {}
+			else if (!strcmp(subname, "video4linux2")) {}
+			else if (!strcmp(subname, "x11grab")) {}
+			else if (!strcmp(subname, "alsa")) {}
+			else if (!strcmp(subname, "decklink")) {}
+			else if (!strcmp(subname, "kmsgrab")) {}
+			else if (!strcmp(subname, "libndi_newtek")) {}
+			else if (!strcmp(subname, "fbdev")) {}
+			else if (!strcmp(subname, "gdigrab")) {}
+			else if (!strcmp(subname, "iec61883")) {}
+			else if (!strcmp(subname, "lavfi")) {}
+			else if (!strcmp(subname, "libcdio")) {}
+			else if (!strcmp(subname, "openal")) {}
+			else if (!strcmp(subname, "oss")) {}
+			else if (!strcmp(subname, "pulse")) {}
+			else if (!strcmp(subname, "sndio")) {}
+			else if (!stricmp(subname, "vfw")) {}
+			else continue;
+#endif
+		} else if (type==FF_REG_TYPE_ENCODE) {
+			codec = av_codec_next(codec);
+			if (!codec) break;
+			av_class = codec->priv_class;
+			subname = codec->name;
+#ifndef GPAC_DISABLE_DOC
+			description = codec->long_name;
+#endif
+		} else if (type==FF_REG_TYPE_MUX) {
+#ifndef NO_AVIO_PROTO
+			if (protocol_pass) {
+				subname = avio_enum_protocols(&av_it, 1);
+				if (!subname) break;
+				av_class = avio_protocol_get_class(subname);
+#ifndef GPAC_DISABLE_DOC
+				description = "Output protocol";
+#endif
+			} else
+#endif
+
+			{
+#if (LIBAVFILTER_VERSION_MAJOR > 6)
+				ofmt = av_muxer_iterate(&av_it);
+#else
+				ofmt = av_oformat_next(ofmt);
+#endif
+				if (!ofmt) break;
+				av_class = ofmt->priv_class;
+				subname = ofmt->name;
+#ifndef GPAC_DISABLE_DOC
+				description = ofmt->long_name;
+#endif
+			}
+		} else if (type==FF_REG_TYPE_AVF) {
+#if (LIBAVFILTER_VERSION_MAJOR > 5)
+#if (LIBAVFILTER_VERSION_MAJOR > 6)
+			avf = av_filter_iterate(&av_it);
+#else
+			avf = avfilter_next(avf);
+#endif
+			if (!avf) break;
+			av_class = avf->priv_class;
+			subname = avf->name;
+#ifndef GPAC_DISABLE_DOC
+			description = avf->description;
+#endif
+
+#else
+			break;
+
+#endif
+		} else {
+			break;
+		}
+		GF_SAFEALLOC(freg, GF_FilterRegister);
+		if (!freg) continue;
+		memcpy(freg, orig_reg, sizeof(GF_FilterRegister));
+		freg->args = NULL;
+		freg->caps = NULL;
+		freg->nb_caps = 0;
+
+		gf_list_add(all_filters, freg);
+
+		sprintf(szDef, "%s:%s", fname, subname);
+		freg->name = gf_strdup(szDef);
+#ifndef GPAC_DISABLE_DOC
+		freg->description = description;
+#endif
+		 if ((type==FF_REG_TYPE_ENCODE) || (type==FF_REG_TYPE_DECODE)) {
+		 	GF_FilterCapability *caps;
+		 	u32 cid = ffmpeg_codecid_to_gpac(codec->id);
+		 	freg->nb_caps = 3;
+
+		 	caps = gf_malloc(sizeof(GF_FilterCapability)*3);
+		 	memset(caps, 0, sizeof(GF_FilterCapability)*3);
+		 	caps[0].code = GF_PROP_PID_STREAM_TYPE;
+		 	caps[0].val.type = GF_PROP_UINT;
+		 	caps[0].val.value.uint = ff_streamtype(codec->type);
+		 	caps[0].flags = GF_CAPS_INPUT_OUTPUT;
+
+		 	caps[1].code = GF_PROP_PID_CODECID;
+		 	caps[1].val.type = GF_PROP_UINT;
+		 	caps[1].val.value.uint = (type==FF_REG_TYPE_DECODE) ? cid : GF_CODECID_RAW;
+		 	caps[1].flags = GF_CAPS_INPUT;
+
+		 	caps[2].code = GF_PROP_PID_CODECID;
+		 	caps[2].val.type = GF_PROP_UINT;
+		 	caps[2].val.value.uint = (type==FF_REG_TYPE_DECODE) ? GF_CODECID_RAW : cid;
+		 	caps[2].flags = GF_CAPS_OUTPUT;
+
+		 	freg->caps =  caps;
+		}
+		else if ((type==FF_REG_TYPE_DEMUX)
+			&& fmt
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			&& (fmt->mime_type || fmt->extensions)
+#else
+			&& fmt->extensions
+#endif
+			){
+		 	GF_FilterCapability *caps;
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			freg->nb_caps = (fmt->mime_type && fmt->extensions) ? 4 : 2;
+#else
+			freg->nb_caps = 2;
+#endif
+		 	caps = gf_malloc(sizeof(GF_FilterCapability)*freg->nb_caps);
+		 	memset(caps, 0, sizeof(GF_FilterCapability)*freg->nb_caps);
+		 	caps[0].code = GF_PROP_PID_STREAM_TYPE;
+		 	caps[0].val.type = GF_PROP_UINT;
+		 	caps[0].val.value.uint = GF_STREAM_FILE;
+		 	caps[0].flags = GF_CAPS_INPUT_STATIC;
+
+		 	caps[1].code = fmt->extensions ? GF_PROP_PID_FILE_EXT : GF_PROP_PID_MIME;
+		 	caps[1].val.type = GF_PROP_NAME;
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			caps[1].val.value.string = (char *) ( fmt->extensions ? fmt->extensions : fmt->mime_type );
+#else
+			caps[1].val.value.string = (char *) fmt->extensions;
+#endif
+			caps[1].flags = GF_CAPS_INPUT;
+
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			if (fmt->mime_type && fmt->extensions) {
+				caps[2].flags = 0;
+				caps[3].code = GF_PROP_PID_MIME;
+				caps[3].val.type = GF_PROP_NAME;
+				caps[3].val.value.string = (char *) fmt->mime_type;
+				caps[3].flags = GF_CAPS_INPUT;
+			}
+#endif
+			//TODO map codec IDs if known ?
+		 	freg->caps =  caps;
+		}
+		else if ((type==FF_REG_TYPE_MUX)
+			&& ofmt
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			&& (ofmt->mime_type || ofmt->extensions)
+#else
+			&& ofmt->extensions
+#endif
+			){
+			GF_FilterCapability *caps;
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			freg->nb_caps = (ofmt->mime_type && ofmt->extensions) ? 4 : 2;
+#else
+			freg->nb_caps = 2;
+#endif
+			caps = gf_malloc(sizeof(GF_FilterCapability)*freg->nb_caps);
+			memset(caps, 0, sizeof(GF_FilterCapability)*freg->nb_caps);
+			caps[0].code = GF_PROP_PID_STREAM_TYPE;
+			caps[0].val.type = GF_PROP_UINT;
+			caps[0].val.value.uint = GF_STREAM_FILE;
+			caps[0].flags = GF_CAPS_OUTPUT_STATIC;
+
+			caps[1].code = ofmt->extensions ? GF_PROP_PID_FILE_EXT : GF_PROP_PID_MIME;
+			caps[1].val.type = GF_PROP_NAME;
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			caps[1].val.value.string = (char *) ( ofmt->extensions ? ofmt->extensions : ofmt->mime_type );
+#else
+			caps[1].val.value.string = (char *) ofmt->extensions;
+#endif
+			caps[1].flags = GF_CAPS_OUTPUT;
+
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			if (ofmt->mime_type && ofmt->extensions) {
+				caps[2].flags = 0;
+				caps[3].code = GF_PROP_PID_MIME;
+				caps[3].val.type = GF_PROP_NAME;
+				caps[3].val.value.string = (char *) ofmt->mime_type;
+				caps[3].flags = GF_CAPS_OUTPUT;
+			}
+#endif
+			//TODO map codec IDs if known ?
+			freg->caps =  caps;
+		}
+
+		idx=0;
+		i=0;
+		while (av_class) {
+			opt = &av_class->option[idx];
+			if (!opt || !opt->name) break;
+			if (!flags || (opt->flags & flags) ) {
+				if (!opt->unit)
+					i++;
+				else {
+					u32 k;
+					Bool is_first = GF_TRUE;
+					for (k=0; k<idx; k++) {
+						const struct AVOption *an_opt = &av_class->option[k];
+						if (an_opt && an_opt->unit && !strcmp(opt->unit, an_opt->unit)) {
+							//patch some broken AVClass where the option name declaring the option unit is not declared first
+							u32 l;
+							for (l=0; l<k; l++) {
+								const struct AVOption *par_opt = &av_class->option[l];
+								if (!strcmp(par_opt->name, an_opt->name)) {
+									is_first=GF_FALSE;
+									break;
+								}
+							}
+							break;
+						}
+					}
+					if (is_first)
+						i++;
+				}
+			}
+			idx++;
+		}
+		if (i) {
+			GF_FilterArgs *args = gf_malloc(sizeof(GF_FilterArgs)*(i+1));
+			memset(args, 0, sizeof(GF_FilterArgs)*(i+1));
+			freg->args = args;
+
+			i=0;
+			idx=0;
+			while (av_class) {
+				opt = &av_class->option[idx];
+				if (!opt || !opt->name) break;
+				if (flags && !(opt->flags & flags) ) {
+					idx++;
+					continue;
+				}
+
+				if (opt->unit) {
+					u32 k;
+					const char *opt_name = NULL;
+					GF_FilterArgs *par_arg=NULL;
+					for (k=0; k<idx; k++) {
+						const struct AVOption *an_opt = &av_class->option[k];
+						if (an_opt && an_opt->unit && !strcmp(opt->unit, an_opt->unit)) {
+							opt_name = an_opt->name;
+							break;
+						}
+					}
+					if (opt_name) {
+						for (k=0; k<i; k++) {
+							par_arg = &args[k];
+							if (!strcmp(par_arg->arg_name, opt_name))
+								break;
+							par_arg = NULL;
+						}
+					}
+
+					if (par_arg) {
+						GF_FilterArgs an_arg = ffmpeg_arg_translate(opt);
+						if (!(par_arg->flags & GF_FS_ARG_META_ALLOC)) {
+							par_arg->arg_desc = par_arg->arg_desc ? gf_strdup(par_arg->arg_desc) : NULL;
+							par_arg->flags |= GF_FS_ARG_META_ALLOC;
+						}
+						gf_dynstrcat((char **) &par_arg->arg_desc, an_arg.arg_name, "\n - ");
+						gf_dynstrcat((char **) &par_arg->arg_desc, an_arg.arg_desc, ": ");
+
+						if (an_arg.arg_default_val)
+							gf_free((void *) an_arg.arg_default_val);
+						if (an_arg.min_max_enum)
+							gf_free((void *) an_arg.min_max_enum);
+
+						idx++;
+						continue;
+					}
+				}
+
+				args[i] = ffmpeg_arg_translate(opt);
+				i++;
+
+				idx++;
+			}
+		}
+		gf_fs_add_filter_register(session, freg);
+	}
+
+#ifndef NO_AVIO_PROTO
+	if ((type==FF_REG_TYPE_MUX) || (type==FF_REG_TYPE_DEMUX)) {
+		if (!protocol_pass) {
+			protocol_pass = GF_TRUE;
+			goto second_pass;
+		}
+	}
+#endif
+
+}
+
+void ffmpeg_build_register(GF_FilterSession *session, GF_FilterRegister *orig_reg, const GF_FilterArgs *default_args, u32 nb_def_args, u32 reg_type)
+{
+	GF_FilterArgs *args;
+	u32 i=0, idx=0, nb_args;
+	const struct AVOption *opt;
+	u32 opt_type = AV_OPT_FLAG_DECODING_PARAM;
+	Bool load_meta_filters = session ? GF_TRUE : GF_FALSE;
+	AVFormatContext *format_ctx = NULL;
+	AVCodecContext *codec_ctx = NULL;
+	const AVClass *av_class = NULL;
+	GF_FFRegistryExt *ffregext;
+
+	ffmpeg_initialize();
+
+	//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;
+		orig_reg->register_free = NULL;
+		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)) {
+		codec_ctx = avcodec_alloc_context3(NULL);
+		av_class = codec_ctx->av_class;
+	} else if (reg_type==FF_REG_TYPE_AVF) {
+#if (LIBAVFILTER_VERSION_MAJOR > 5)
+		av_class = avfilter_get_class();
+#endif
+	} else {
+		format_ctx = avformat_alloc_context();
+		av_class = format_ctx->av_class;
+	}
+
+	i=0;
+	idx=0;
+	while (av_class && av_class->option) {
+		opt = &av_class->option[idx];
+		if (!opt || !opt->name) break;
+
+		if (opt->flags & opt_type) {
+			if (!opt->unit) {
+				i++;
+			} else {
+				u32 k;
+				Bool is_first = GF_TRUE;
+				for (k=0; k<idx; k++) {
+					const struct AVOption *an_opt = &av_class->option[k];
+					if (an_opt && an_opt->unit && !strcmp(opt->unit, an_opt->unit)) {
+						//patch some broken AVClass where the option name declaring the option unit is not declared first
+						u32 l;
+						for (l=0; l<k; l++) {
+							const struct AVOption *par_opt = &av_class->option[l];
+							if (!strcmp(par_opt->name, an_opt->name)) {
+								is_first=GF_FALSE;
+								break;
+							}
+						}
+						break;
+					}
+				}
+				if (is_first)
+					i++;
+			}
+		}
+		idx++;
+	}
+	i += nb_def_args;
+
+	nb_args = i+1;
+	args = gf_malloc(sizeof(GF_FilterArgs)*nb_args);
+	memset(args, 0, sizeof(GF_FilterArgs)*nb_args);
+	orig_reg->args = args;
+
+	for (i=0; i<nb_def_args-1; i++) {
+		memcpy(&args[i], &default_args[i], sizeof(GF_FilterArgs));
+	}
+	//do not reset i
+
+	idx=0;
+	while (av_class && av_class->option) {
+		opt = &av_class->option[idx];
+		if (!opt || !opt->name) break;
+
+		if (opt->flags & opt_type) {
+
+			if (opt->unit) {
+				u32 k;
+				const char *opt_name = NULL;
+				GF_FilterArgs *par_arg=NULL;
+				for (k=0; k<idx; k++) {
+					const struct AVOption *an_opt = &av_class->option[k];
+					if (an_opt && an_opt->unit && !strcmp(opt->unit, an_opt->unit)) {
+						opt_name = an_opt->name;
+						break;
+					}
+				}
+				if (opt_name) {
+					for (k=0; k<i; k++) {
+						par_arg = &args[k];
+						if (!strcmp(par_arg->arg_name, opt_name))
+							break;
+						par_arg = NULL;
+					}
+				}
+
+				if (par_arg) {
+					GF_FilterArgs an_arg = ffmpeg_arg_translate(opt);
+					if (!(par_arg->flags & GF_FS_ARG_META_ALLOC)) {
+						//move from const to allocated memory
+						par_arg->arg_desc = gf_strdup(par_arg->arg_desc ? par_arg->arg_desc : " ");
+						par_arg->flags |= GF_FS_ARG_META_ALLOC;
+						/*trash default values and min_max_enum for flags*/
+						if (par_arg->arg_default_val) {
+							gf_free((char *) par_arg->arg_default_val);
+							par_arg->arg_default_val = NULL;
+						}
+						if (par_arg->min_max_enum) {
+							gf_free((char *) par_arg->min_max_enum);
+							par_arg->min_max_enum = NULL;
+						}
+					}
+					gf_dynstrcat((char **) &par_arg->arg_desc, an_arg.arg_name, "\n- ");
+					gf_dynstrcat((char **) &par_arg->arg_desc, an_arg.arg_desc ? an_arg.arg_desc : "", ": ");
+
+					if (an_arg.arg_default_val)
+						gf_free((void *) an_arg.arg_default_val);
+					if (an_arg.min_max_enum)
+						gf_free((void *) an_arg.min_max_enum);
+
+					idx++;
+					continue;
+				}
+			}
+			assert(nb_args>i);
+			args[i] = ffmpeg_arg_translate(opt);
+			i++;
+		}
+		idx++;
+	}
+	memcpy(&args[i], &default_args[nb_def_args-1], sizeof(GF_FilterArgs));
+
+	if (codec_ctx) {
+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
+		avcodec_free_context(&codec_ctx);
+#else
+		av_free(codec_ctx);
+#endif
+	} else {
+		avformat_free_context(format_ctx);
+	}
+
+	GF_SAFEALLOC(ffregext, GF_FFRegistryExt);
+	if (!ffregext) return;
+	
+	orig_reg->udta = ffregext;
+	ffregext->nb_arg_skip = nb_def_args-1;
+	orig_reg->register_free = ffmpeg_register_free;
+
+	ffmpeg_expand_register(session, orig_reg, reg_type);
+
+}
+
+void ffmpeg_set_enc_dec_flags(const AVDictionary *options, AVCodecContext *ctx)
+{
+	AVDictionaryEntry *de=NULL;
+
+	ctx->flags = 0;
+	ctx->flags2 = 0;
+	while (1) {
+		u32 idx=0;
+		de = av_dict_get((AVDictionary *)options, "", (const AVDictionaryEntry *) de, AV_DICT_IGNORE_SUFFIX);
+		if (!de) break;
+
+		while (ctx->av_class->option) {
+			const struct AVOption *opt = &ctx->av_class->option[idx];
+			if (!opt || !opt->name) break;
+			if (opt->name && !strcmp(opt->name, de->key) && (!stricmp(de->value, "true") || !stricmp(de->value, "yes") || !stricmp(de->value, "1") )) {
+				if (opt->unit && !strcmp(opt->unit, "flags"))
+					ctx->flags |= (int) opt->default_val.i64;
+				else if (opt->unit && !strcmp(opt->unit, "flags2"))
+					ctx->flags2 |= (int) opt->default_val.i64;
+				break;
+			}
+			idx++;
+		}
+	}
+}
+
+void ffmpeg_set_mx_dmx_flags(const AVDictionary *options, AVFormatContext *ctx)
+{
+	AVDictionaryEntry *de=NULL;
+
+	while (1) {
+		u32 idx=0;
+		de = av_dict_get((AVDictionary *)options, "", de, AV_DICT_IGNORE_SUFFIX);
+		if (!de) break;
+
+		while (ctx->av_class->option) {
+			const struct AVOption *opt = &ctx->av_class->option[idx];
+			if (!opt || !opt->name) break;
+			if (opt->name && !strcmp(opt->name, de->key)) {
+				if (opt->unit && !strcmp(opt->unit, "fflags"))
+					ctx->flags |= (int) opt->default_val.i64;
+				else if (opt->unit && !strcmp(opt->unit, "avioflags"))
+					ctx->avio_flags |= (int) opt->default_val.i64;
+				break;
+			}
+			idx++;
+		}
+	}
+}
+
+void ffmpeg_report_unused_options(GF_Filter *filter, AVDictionary *options)
+{
+	AVDictionaryEntry *prev_e = NULL;
+	while (1) {
+		prev_e = av_dict_get(options, "", prev_e, AV_DICT_IGNORE_SUFFIX);
+		if (!prev_e) break;
+		gf_filter_report_unused_meta_option(filter, prev_e->key);
+	}
+
+}
+#endif

gpac-1.0.0.tar.gz/src/filters/ff_common.h Added

@@ -0,0 +1,75 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / common ffmpeg filters
+ *
+ *  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.
+ *
+ */
+
+#define JPEGLIB_H
+#include <gpac/filters.h>
+#include <gpac/list.h>
+#include <gpac/constants.h>
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/opt.h>
+#include <libavutil/pixdesc.h>
+#include <libavutil/dict.h>
+#include <libavdevice/avdevice.h>
+#include <libswscale/swscale.h>
+
+#define GF_FFMPEG_DECODER_CONFIG GF_4CC('f','f','D','C')
+
+
+//rendering/translating to internal supported formats for text streams is not yet implemented
+//#define FF_SUB_SUPPORT
+
+
+GF_FilterArgs ffmpeg_arg_translate(const struct AVOption *opt);
+void ffmpeg_setup_logs(u32 log_class);
+
+enum{
+	FF_REG_TYPE_DEMUX=0,
+	FF_REG_TYPE_DECODE,
+	FF_REG_TYPE_DEV_IN,
+	FF_REG_TYPE_ENCODE,
+	FF_REG_TYPE_MUX,
+	FF_REG_TYPE_AVF,
+};
+
+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_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);
+u32 ffmpeg_codecid_to_gpac(u32 codec_id);
+
+u32 ffmpeg_stream_type_from_gpac(u32 streamtype);
+u32 ffmpeg_stream_type_to_gpac(u32 streamtype);
+
+void ffmpeg_set_enc_dec_flags(const AVDictionary *options, AVCodecContext *ctx);
+void ffmpeg_set_mx_dmx_flags(const AVDictionary *options, AVFormatContext *ctx);
+
+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);

gpac-1.0.0.tar.gz/src/filters/ff_dec.c Added

@@ -0,0 +1,926 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg decode 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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+
+#include <libswscale/swscale.h>
+
+#define FF_CHECK_PROP(_name, _ffname, _type)	if (ctx->_name != ctx->decoder->_ffname) { \
+		gf_filter_pid_set_property(ctx->out_pid, _type, &PROP_UINT( (u32) ctx->decoder->_ffname ) );	\
+		ctx->_name = (u32) ctx->decoder->_ffname;	\
+	} \
+
+#define FF_CHECK_PROPL(_name, _ffname, _type)	if (ctx->_name != ctx->decoder->_ffname) { \
+	gf_filter_pid_set_property(ctx->out_pid, _type, &PROP_LONGUINT( (u32) ctx->decoder->_ffname ) );	\
+	ctx->_name = (u32) ctx->decoder->_ffname;	\
+} \
+
+#define FF_CHECK_PROP_VAL(_name, _val, _type)	if (ctx->_name != _val) { \
+		gf_filter_pid_set_property(ctx->out_pid, _type, &PROP_UINT( _val ) );	\
+		ctx->_name = _val;	\
+	} \
+
+static GF_Err ffdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+
+
+typedef struct _gf_ffdec_ctx
+{
+	//internal data
+	Bool initialized;
+
+	Bool owns_context;
+	AVCodecContext *decoder;
+	//decode options
+	AVDictionary *options;
+
+	Bool reconfig_pending;
+
+	GF_FilterPid *in_pid, *out_pid;
+	//media type
+	u32 type;
+	//CRC32 of extra_data
+	u32 extra_data_crc;
+
+	GF_Err (*process)(GF_Filter *filter, struct _gf_ffdec_ctx *ctx);
+
+	u32 flush_done;
+
+	//for now we don't share the data
+	AVFrame *frame;
+	//audio state
+	u32 channels, sample_rate, sample_fmt, bytes_per_sample;
+	u64 channel_layout;
+	u32 frame_start;
+	u32 nb_samples_already_in_frame;
+
+	//video state
+	u32 width, height, pixel_fmt, stride, stride_uv;
+	GF_Fraction sar;
+	struct SwsContext *sws_ctx;
+
+	GF_List *src_packets;
+
+	Bool drop_non_refs;
+} GF_FFDecodeCtx;
+
+static GF_Err ffdec_initialize(GF_Filter *filter)
+{
+	GF_FFDecodeCtx *ctx = (GF_FFDecodeCtx *) gf_filter_get_udta(filter);
+	ctx->initialized = GF_TRUE;
+	ctx->src_packets = gf_list_new();
+
+	ffmpeg_setup_logs(GF_LOG_CODEC);
+	return GF_OK;
+}
+
+static void ffdec_finalize(GF_Filter *filter)
+{
+	GF_FFDecodeCtx *ctx = (GF_FFDecodeCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->options) av_dict_free(&ctx->options);
+	if (ctx->frame) av_frame_free(&ctx->frame);
+	if (ctx->sws_ctx) sws_freeContext(ctx->sws_ctx);
+
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+
+	if (ctx->owns_context && ctx->decoder) {
+		if (ctx->decoder->extradata) gf_free(ctx->decoder->extradata);
+		avcodec_close(ctx->decoder);
+	}
+	return;
+}
+
+static GF_Err ffdec_process_video(GF_Filter *filter, struct _gf_ffdec_ctx *ctx)
+{
+	AVPacket pkt;
+	AVFrame *frame;
+	AVPicture pict;
+	Bool is_eos=GF_FALSE;
+	s32 res;
+	s32 gotpic;
+	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;
+	u8 *out_buffer;
+	GF_FilterPacket *pck_src;
+	GF_FilterPacket *dst_pck;
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->in_pid);
+
+	if (ctx->reconfig_pending) {
+		pck = NULL;
+	} else if (!pck) {
+		is_eos = gf_filter_pid_is_eos(ctx->in_pid);
+		if (!is_eos) return GF_OK;
+	}
+
+	if (pck && ctx->drop_non_refs && !gf_filter_pck_get_sap(pck)) {
+		gf_filter_pid_drop_packet(ctx->in_pid);
+		return GF_OK;
+	}
+
+	frame = ctx->frame;
+
+	av_init_packet(&pkt);
+
+	if (pck) {
+		data = gf_filter_pck_get_data(pck, &size);
+
+		if (!size) {
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_OK;
+		}
+
+		pck_src = pck;
+		gf_filter_pck_ref_props(&pck_src);
+		if (pck_src) gf_list_add(ctx->src_packets, pck_src);
+
+		//seems ffmpeg is not properly handling the decoding after a flush, we close and reopen the codec
+		if (ctx->flush_done) {
+			const AVCodec *codec = ctx->decoder->codec;
+			avcodec_close(ctx->decoder);
+			avcodec_open2(ctx->decoder, codec, NULL );
+			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);
+		if (gf_filter_pck_get_sap(pck)>0)
+			pkt.flags = AV_PKT_FLAG_KEY;
+	}
+	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 (pck) gf_filter_pid_drop_packet(ctx->in_pid);
+
+	if (!gotpic) {
+		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);
+			ctx->decoder = NULL;
+			ctx->reconfig_pending = GF_FALSE;
+			//these properties are checked after decode, when we reconfigure we copy props from input to output
+			//so we need to make sure we retrigger pid config even if these did not change
+			ctx->pixel_fmt = 0;
+			ctx->width = 0;
+			ctx->height = 0;
+			ctx->stride = 0;
+			ctx->stride_uv = 0;
+			ctx->sar.num = ctx->sar.den = 0;
+			while (gf_list_count(ctx->src_packets)) {
+				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);
+		}
+	}
+
+	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) ));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (!gotpic) return GF_OK;
+
+	pix_fmt = ffmpeg_pixfmt_to_gpac(ctx->decoder->pix_fmt);
+	if (!pix_fmt) pix_fmt = GF_PIXEL_RGB;
+
+	//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) ) {
+		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;
+	}
+
+	FF_CHECK_PROP_VAL(stride, stride, GF_PROP_PID_STRIDE)
+	FF_CHECK_PROP_VAL(stride_uv, stride_uv, GF_PROP_PID_STRIDE_UV)
+	if (ctx->sar.num * ctx->decoder->sample_aspect_ratio.den != ctx->sar.den * ctx->decoder->sample_aspect_ratio.num) {
+		ctx->sar.num = ctx->decoder->sample_aspect_ratio.num;
+		ctx->sar.den = ctx->decoder->sample_aspect_ratio.den;
+
+		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++) {
+		pck_src = gf_list_get(ctx->src_packets, i);
+		if (gf_filter_pck_get_cts(pck_src) == frame->pkt_pts) break;
+		pck_src = NULL;
+	}
+
+	seek_flag = GF_FALSE;
+	if (pck_src) {
+		seek_flag = gf_filter_pck_get_seek_flag(pck_src);
+	}
+	//this was a seek frame, do not dispatch
+	if (seek_flag) {
+		if (pck_src) {
+			gf_list_del_item(ctx->src_packets, pck_src);
+			gf_filter_pck_unref(pck_src);
+		}
+		return GF_OK;
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, outsize, &out_buffer);
+
+	if (pck_src) {
+		if (dst_pck) gf_filter_pck_merge_properties(pck_src, dst_pck);
+		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);
+	}
+	if (!dst_pck) return GF_OUT_OF_MEM;
+
+
+	//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;
+		pix_out = AV_PIX_FMT_RGB24;
+		break;
+	case GF_PIXEL_RGBA:
+		pict.data[0] =  (uint8_t *)out_buffer;
+		pict.linesize[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;
+		if (ctx->pixel_fmt == GF_PIXEL_YUV_10)
+			pix_out = AV_PIX_FMT_YUV420P10LE;
+		else
+			pix_out = AV_PIX_FMT_YUV420P;
+		break;
+
+	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;
+		if (ctx->pixel_fmt == GF_PIXEL_YUV422_10)
+			pix_out = AV_PIX_FMT_YUV422P10LE;
+		else
+			pix_out = AV_PIX_FMT_YUV422P;
+		break;
+
+	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;
+		if (ctx->pixel_fmt == GF_PIXEL_YUV444_10)
+			pix_out = AV_PIX_FMT_YUV444P10LE;
+		else
+			pix_out = AV_PIX_FMT_YUV444P;
+		break;
+
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] Unsupported pixel format %s, patch welcome\n", av_get_pix_fmt_name(ctx->decoder->pix_fmt) ));
+
+		gf_filter_pck_discard(dst_pck);
+
+		return GF_NOT_SUPPORTED;
+	}
+
+	ctx->sws_ctx = sws_getCachedContext(ctx->sws_ctx,
+	                                   ctx->decoder->width, ctx->decoder->height, ctx->decoder->pix_fmt,
+	                                   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);
+	}
+
+	gf_filter_pck_set_seek_flag(dst_pck, GF_FALSE);
+
+	if (frame->interlaced_frame)
+		gf_filter_pck_set_interlaced(dst_pck, frame->top_field_first ? 2 : 1);
+
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+
+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;
+	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);
+
+	if (ctx->reconfig_pending) {
+		pck = NULL;
+	} else if (!pck) {
+		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);
+
+	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) {
+			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.size = in_size;
+		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.duration = gf_filter_pck_get_duration(pck);
+		if (gf_filter_pck_get_sap(pck)>0)
+			pkt.flags = AV_PKT_FLAG_KEY;
+
+	} else {
+		pkt.size = 0;
+	}
+
+	frame = ctx->frame;
+	len = avcodec_decode_audio4(ctx->decoder, frame, &gotpic, &pkt);
+
+	//this will handle eos as well
+	if ((len<0) || !gotpic) {
+		ctx->frame_start = 0;
+		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) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		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);
+			ctx->decoder = NULL;
+			ctx->reconfig_pending = GF_FALSE;
+			//these properties are checked after decode, when we reconfigure we copy props from input to output
+			//so we need to make sure we retrigger pid config even if these did not change
+			ctx->sample_fmt = 0;
+			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);
+		}
+		return GF_OK;
+	}
+
+	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;
+	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, output_size, &data);
+
+	switch (frame->format) {
+	case AV_SAMPLE_FMT_U8P:
+	case AV_SAMPLE_FMT_S16P:
+	case AV_SAMPLE_FMT_S32P:
+	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;
+		}
+		break;
+	default:
+		memcpy(data, ctx->frame->data[0], ctx->bytes_per_sample * frame->nb_samples * ctx->channels);
+		break;
+	}
+
+	//we don't follow the same approach as in video, we assume the codec works with one in one out
+	//and use the first entry in src packets to match in order to copy the properties
+	//a nicer approach would be to count delay frames (number of frames used to initialize)
+	//and backmerge properties from the last packet in to the last-nb_init_frames
+	src_pck = gf_list_get(ctx->src_packets, 0);
+
+	if (src_pck) {
+		gf_filter_pck_merge_properties(src_pck, dst_pck);
+		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;
+			}
+		}
+		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);
+
+	ctx->frame_start += len;
+	//done with this input packet
+	if (in_size <= (s32) ctx->frame_start) {
+		frame->nb_samples = 0;
+		ctx->frame_start = 0;
+		ctx->nb_samples_already_in_frame = 0;
+		gf_filter_pid_drop_packet(ctx->in_pid);
+		return GF_OK;
+	}
+	//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;
+
+	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;
+	AVSubtitle subs;
+	s32 gotpic;
+	s32 len, in_size;
+	Bool is_eos=GF_FALSE;
+
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->in_pid);
+
+	if (!pck) {
+		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);
+
+	if (!is_eos) {
+		u64 dts;
+		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.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;
+		}
+	} else {
+		pkt.size = 0;
+	}
+
+	memset(&subs, 0, sizeof(AVSubtitle));
+	len = avcodec_decode_subtitle2(ctx->decoder, &subs, &gotpic, &pkt);
+
+	//this will handle eos as well
+	if ((len<0) || !gotpic) {
+		ctx->frame_start = 0;
+		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) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (is_eos) {
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	//TODO - do we want to remap to TX3G/other and handle the rendering some place else, or do we do the rendering here ?
+
+
+	avsubtitle_free(&subs);
+	if (pck) gf_filter_pid_drop_packet(ctx->in_pid);
+	return GF_OK;
+}
+#endif
+
+static GF_Err ffdec_process(GF_Filter *filter)
+{
+	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 GF_Err ffdec_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	s32 res;
+	u32 type=0, gpac_codecid=0;
+	const GF_PropertyValue *prop;
+	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);
+		return GF_OK;
+	}
+
+	//check our PID: streamtype and codecid
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop) return GF_NOT_SUPPORTED;
+
+	type = prop->value.uint;
+	switch (type) {
+	case GF_STREAM_AUDIO:
+	case GF_STREAM_VISUAL:
+#ifdef FF_SUB_SUPPORT
+	case GF_STREAM_TEXT:
+#endif
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!prop) return GF_NOT_SUPPORTED;
+	gpac_codecid = prop->value.uint;
+	if (gpac_codecid==GF_CODECID_RAW)
+		return GF_NOT_SUPPORTED;
+
+
+	//initial config or update
+	if (!ctx->in_pid || (ctx->in_pid==pid)) {
+		ctx->in_pid = pid;
+		if (!ctx->type) ctx->type = type;
+		else if (ctx->type != type) {
+			return GF_NOT_SUPPORTED;
+		}
+	} else {
+		//only one input pid in ctx
+		if (ctx->in_pid) return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	ctx->width = prop ? prop->value.uint : 320;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	ctx->height = prop ? prop->value.uint : 240;
+
+
+	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) {
+			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;
+		}
+	}
+	//we reconfigure the stream
+	else {
+		AVCodec *codec=NULL;
+		u32 codec_id, ff_codectag=0;
+		if (ctx->decoder) {
+			codec_id = ffmpeg_codecid_from_gpac(gpac_codecid, NULL);
+			//same codec, same config, don't reinit
+			if (ctx->decoder->codec->id == codec_id) {
+				u32 cfg_crc=0;
+				prop = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+				if (prop && prop->value.data.ptr && prop->value.data.size) {
+					cfg_crc = gf_crc_32(prop->value.data.ptr, prop->value.data.size);
+				}
+				if (cfg_crc == ctx->extra_data_crc) {
+					goto reuse_codec_context;
+				}
+			}
+
+			//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
+			ctx->reconfig_pending = GF_TRUE;
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFDec] PID %s reconfigure detected, flushing frame\n", gf_filter_pid_get_name(pid) ));
+			return GF_OK;
+		}
+
+		codec_id = ffmpeg_codecid_from_gpac(gpac_codecid, &ff_codectag);
+		if (codec_id) codec = avcodec_find_decoder(codec_id);
+		if (!codec) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFDec] No decoder found for codec %s\n", gf_codecid_name(gpac_codecid) ));
+			return GF_NOT_SUPPORTED;
+		}
+
+		ctx->decoder = avcodec_alloc_context3(NULL);
+		if (! ctx->decoder) return GF_OUT_OF_MEM;
+		ctx->owns_context = GF_TRUE;
+		if (ff_codectag)
+			ctx->decoder->codec_tag = ff_codectag;
+
+		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);
+		}
+
+		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;
+		}
+	}
+
+	ffmpeg_report_unused_options(filter, ctx->options);
+
+	//we're good to go, declare our output pid
+	ctx->in_pid = pid;
+	if (!ctx->out_pid) {
+		char szCodecName[1000];
+		ctx->out_pid = gf_filter_pid_new(filter);
+
+		//to change once we implement on-the-fly codec change
+		sprintf(szCodecName, "ffdec:%s", ctx->decoder->codec->name ? ctx->decoder->codec->name : "unknown");
+		gf_filter_set_name(filter, szCodecName);
+		gf_filter_pid_set_framing_mode(ctx->in_pid, GF_TRUE);
+	}
+
+reuse_codec_context:
+	//copy props it at init config or at reconfig
+	if (ctx->out_pid) {
+		gf_filter_pid_copy_properties(ctx->out_pid, ctx->in_pid);
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+		gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, NULL );
+	}
+
+	if (type==GF_STREAM_VISUAL) {
+		u32 pix_fmt;
+		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);
+			if (!pix_fmt) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFDec] Unsupported pixel format %d, defaulting to RGB\n", 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) );
+		}
+
+		if (ctx->decoder->width) {
+			FF_CHECK_PROP(width, width, GF_PROP_PID_WIDTH)
+		} else {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_WIDTH, &PROP_UINT( ctx->width) );
+		}
+		if (ctx->decoder->height) {
+			FF_CHECK_PROP(height, height, GF_PROP_PID_HEIGHT)
+		} else {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_HEIGHT, &PROP_UINT( ctx->height) );
+		}
+		if (ctx->decoder->sample_aspect_ratio.num && ctx->decoder->sample_aspect_ratio.den) {
+			ctx->sar.num = ctx->decoder->sample_aspect_ratio.num;
+			ctx->sar.den = ctx->decoder->sample_aspect_ratio.den;
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_SAR, &PROP_FRAC( ctx->sar) );
+		}
+		if (!ctx->frame)
+			ctx->frame = av_frame_alloc();
+
+		if (ctx->pixel_fmt) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_PIXFMT, &PROP_UINT( ctx->pixel_fmt) );
+		}
+
+	} 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;
+
+		//override PID props with what decoder gives us
+		if (ctx->decoder->channels) {
+			FF_CHECK_PROP(channels, channels, GF_PROP_PID_NUM_CHANNELS)
+		}
+		if (ctx->decoder->channel_layout) {
+			u64 ch_lay = ffmpeg_channel_layout_to_gpac(ctx->decoder->channel_layout);
+			if (ctx->channel_layout != ch_lay) {
+				gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(ch_lay ) );
+				ctx->channel_layout = ch_lay;
+			}
+		}
+		if (ctx->decoder->sample_rate) {
+			FF_CHECK_PROP(sample_rate, sample_rate, GF_PROP_PID_SAMPLE_RATE)
+		}
+		if (!ctx->frame)
+			ctx->frame = av_frame_alloc();
+
+		if (ctx->sample_fmt) {
+			gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT( ctx->sample_fmt) );
+		}
+
+	} else {
+#ifdef FF_SUB_SUPPORT
+		ctx->process = ffdec_process_subtitle;
+#endif
+	}
+	return GF_OK;
+}
+
+
+static GF_Err ffdec_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	s32 res;
+	GF_FFDecodeCtx *ctx = gf_filter_get_udta(filter);
+
+	//initial parsing of arguments
+	if (!ctx->initialized) {
+		switch (arg_val->type) {
+		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 ));
+			}
+			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 ));
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+	//updates of arguments, not supported for ffmpeg decoders
+	return GF_NOT_SUPPORTED;
+}
+
+static Bool ffdec_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FFDecodeCtx *ctx = (GF_FFDecodeCtx *) gf_filter_get_udta(filter);
+
+	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;
+	}
+	return GF_FALSE;
+}
+
+static const GF_FilterCapability FFDecodeCaps[] =
+{
+	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_RAW),
+	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_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_TILE_BASE, GF_TRUE),
+	{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_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+
+#ifdef FF_SUB_SUPPORT
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_TEXT_MPEG4),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_TX3G),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_WEBVTT),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_SUBS_XML),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+#endif
+
+};
+
+GF_FilterRegister FFDecodeRegister = {
+	.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")
+	.private_size = sizeof(GF_FFDecodeCtx),
+	SETCAPS(FFDecodeCaps),
+	.initialize = ffdec_initialize,
+	.finalize = ffdec_finalize,
+	.configure_pid = ffdec_configure_pid,
+	.process = ffdec_process,
+	.update_arg = ffdec_update_arg,
+	.process_event = ffdec_process_event,
+	.flags = GF_FS_REG_META,
+	//use middle priorty, so that hardware decs/other native impl in gpac can take over if needed
+	//don't use lowest one since we use this for scalable codecs
+	.priority = 128
+
+};
+
+
+static const GF_FilterArgs FFDecodeArgs[] =
+{
+	{ "*", -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}
+};
+
+const GF_FilterRegister *ffdec_register(GF_FilterSession *session)
+{
+	ffmpeg_build_register(session, &FFDecodeRegister, FFDecodeArgs, 1, FF_REG_TYPE_DECODE);
+	return &FFDecodeRegister;
+}
+
+#else
+#include <gpac/filters.h>
+const GF_FilterRegister *ffdec_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif
+

gpac-1.0.0.tar.gz/src/filters/ff_dmx.c Added

@@ -0,0 +1,1029 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg demux 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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+
+//for NTP clock
+#include <gpac/network.h>
+
+enum
+{
+	COPY_NO,
+	COPY_A,
+	COPY_V,
+	COPY_AV
+};
+
+typedef struct
+{
+	//options
+	const char *src;
+	u32 block_size;
+	u32 copy, probes;
+	Bool sclock;
+	const char *fmt, *dev;
+
+	//internal data
+	const char *fname;
+	u32 log_class;
+
+	Bool initialized;
+	Bool raw_data;
+	//input file
+	AVFormatContext *demuxer;
+	//demux options
+	AVDictionary *options;
+
+	GF_FilterPid **pids;
+
+	Bool raw_pck_out;
+	u32 nb_playing;
+	Bool stop_seen;
+	u64 first_sample_clock, last_frame_ts;
+	u32 probe_frames;
+
+	AVPacket pkt;
+	s32 audio_idx, video_idx;
+
+	u64 *probe_times;
+
+	Bool copy_audio, copy_video;
+
+	u8 *avio_ctx_buffer;
+	AVIOContext *avio_ctx;
+	FILE *gfio;
+} GF_FFDemuxCtx;
+
+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->options)
+		av_dict_free(&ctx->options);
+	if (ctx->probe_times)
+		gf_free(ctx->probe_times);
+	if (ctx->demuxer) {
+		avformat_close_input(&ctx->demuxer);
+		avformat_free_context(ctx->demuxer);
+	}
+	if (ctx->avio_ctx) {
+		if (ctx->avio_ctx->buffer) av_freep(&ctx->avio_ctx->buffer);
+		av_freep(&ctx->avio_ctx);
+	}
+	if (ctx->gfio) gf_fclose(ctx->gfio);
+	return;
+}
+
+void ffdmx_shared_pck_release(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
+	if (ctx->raw_pck_out) {
+		av_free_packet(&ctx->pkt);
+		ctx->raw_pck_out = GF_FALSE;
+		gf_filter_post_process_task(filter);
+	}
+}
+
+static GF_Err ffdmx_process(GF_Filter *filter)
+{
+	GF_Err e;
+	u32 i;
+	u64 sample_time;
+	u8 *data_dst;
+	Bool copy = GF_TRUE;
+	GF_FilterPacket *pck_dst;
+	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->nb_playing)
+		return GF_EOS;
+
+	if (ctx->raw_pck_out)
+		return GF_EOS;
+
+	sample_time = gf_sys_clock_high_res();
+	av_init_packet(&ctx->pkt);
+	ctx->pkt.stream_index = -1;
+	/*EOF*/
+	if (av_read_frame(ctx->demuxer, &ctx->pkt) <0) {
+		av_free_packet(&ctx->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]);
+			}
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	assert(ctx->pkt.stream_index>=0);
+	assert(ctx->pkt.stream_index < (s32) ctx->demuxer->nb_streams);
+
+	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 ));
+		} else {
+			ctx->pkt.pts = ctx->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);
+		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);
+			return GF_OK;
+		}
+
+		ctx->probe_times[ctx->probe_frames] = ctx->sclock ? sample_time : ctx->pkt.pts;
+		ctx->probe_frames++;
+		if (ctx->probe_frames==ctx->probes) {
+			u32 best_diff=0, max_stat=0;
+			for (i=0; i<ctx->probes; i++) {
+				if (i) {
+					u32 j, nb_stats=0;
+					u32 diff = (u32) (ctx->probe_times[i]-ctx->probe_times[i-1]);
+					for (j=1; j<ctx->probes; j++) {
+						s32 sdiff = (s32) (ctx->probe_times[j]-ctx->probe_times[j-1]);
+						sdiff -= (s32) diff;
+						if (sdiff<0) sdiff = -sdiff;
+						if (sdiff<2000) nb_stats++;
+					}
+					if (max_stat<nb_stats) {
+						max_stat = nb_stats;
+						best_diff = diff;
+					}
+				}
+			}
+			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);
+			return GF_OK;
+		}
+	}
+
+	if (ctx->raw_data) {
+		if (ctx->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);
+		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);
+		assert(pck_dst);
+		memcpy(data_dst, ctx->pkt.data, ctx->pkt.size);
+	}
+
+
+	if (ctx->raw_data && ctx->sclock) {
+		u64 ts;
+		if (!ctx->first_sample_clock) {
+			ctx->last_frame_ts = ctx->first_sample_clock = sample_time;
+		}
+		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;
+
+		gf_filter_pck_set_cts(pck_dst, ts );
+
+		if (ctx->pkt.dts != AV_NOPTS_VALUE) {
+			ts = ctx->pkt.dts * 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);
+	}
+
+	//fixme: try to identify SAP type 2 and more
+	if (ctx->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)
+		gf_filter_pck_set_corrupted(pck_dst, GF_TRUE);
+
+	gf_net_get_utc();
+
+	if (ctx->raw_data) {
+		u64 ntp = gf_net_get_ntp_ts();
+		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);
+	return e;
+}
+
+
+static GF_Err ffdmx_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	s32 res;
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+
+	//initial parsing of arguments
+	if (!ctx->initialized) {
+		switch (arg_val->type) {
+		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, ctx->log_class, ("[%s] Failed to set option %s:%s\n", ctx->fname, arg_name, arg_val ));
+			}
+			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Failed to set option %s:%s, unrecognized type %d\n", ctx->fname, arg_name, arg_val, arg_val->type ));
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+	//updates of arguments, not supported for ffmpeg demuxers
+	return GF_NOT_SUPPORTED;
+}
+
+GF_Err ffdmx_init_common(GF_Filter *filter, GF_FFDemuxCtx *ctx, Bool is_grab)
+{
+	u32 i;
+	u32 nb_a, nb_v;
+#ifdef FF_SUB_SUPPORT
+	u32 nb_t = 0;
+#endif
+	char szName[50];
+
+
+	ctx->pids = gf_malloc(sizeof(GF_FilterPid *)*ctx->demuxer->nb_streams);
+	memset(ctx->pids, 0, sizeof(GF_FilterPid *)*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;
+		AVStream *stream = ctx->demuxer->streams[i];
+		AVCodecContext *codec = stream->codec;
+		u32 gpac_codec_id;
+
+		switch(codec->codec_type) {
+		case AVMEDIA_TYPE_AUDIO:
+			pid = gf_filter_pid_new(filter);
+			if (!pid) return GF_OUT_OF_MEM;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_AUDIO) );
+			nb_a++;
+			sprintf(szName, "audio%d", nb_a);
+			if (ctx->audio_idx<0)
+				ctx->audio_idx = i;
+			break;
+
+		case AVMEDIA_TYPE_VIDEO:
+			pid = gf_filter_pid_new(filter);
+			if (!pid) return GF_OUT_OF_MEM;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL) );
+			nb_v++;
+			sprintf(szName, "video%d", nb_v);
+			if (ctx->video_idx<0)
+				ctx->video_idx = i;
+			break;
+#ifdef FF_SUB_SUPPORT
+		case AVMEDIA_TYPE_SUBTITLE:
+			pid = gf_filter_pid_new(filter);
+			if (!pid) return GF_OUT_OF_MEM;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+			nb_t++;
+			sprintf(szName, "text%d", nb_t);
+			break;
+#endif
+		default:
+			sprintf(szName, "ffdmx%d", i+1);
+			break;
+		}
+		if (!pid) continue;
+		ctx->pids[i] = pid;
+		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) );
+		gf_filter_pid_set_name(pid, szName);
+
+		if (ctx->raw_data && ctx->sclock) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(1000000) );
+		} else {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(stream->time_base.den) );
+		}
+
+		if (!ctx->raw_data) {
+			if (stream->duration>=0)
+				gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(stream->duration, stream->time_base.den) );
+			else if (ctx->demuxer->duration>=0)
+				gf_filter_pid_set_property(pid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(ctx->demuxer->duration, AV_TIME_BASE) );
+		}
+
+		if (stream->sample_aspect_ratio.num && stream->sample_aspect_ratio.den)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_SAR, &PROP_FRAC_INT( stream->sample_aspect_ratio.num, stream->sample_aspect_ratio.den ) );
+
+		if (stream->metadata) {
+			AVDictionaryEntry *ent=NULL;
+			while (1) {
+				ent = av_dict_get(stream->metadata, "", ent, AV_DICT_IGNORE_SUFFIX);
+				if (!ent) break;
+
+				//we use the same syntax as ffmpeg here
+				gf_filter_pid_set_property_str(pid, ent->key, &PROP_STRING(ent->value) );
+			}
+		}
+
+		gpac_codec_id = ffmpeg_codecid_to_gpac(codec->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;
+		} else {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_CODECID, &PROP_UINT(gpac_codec_id) );
+		}
+
+		if (is_grab)
+			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 ) );
+		}
+
+		//force reframer for the following formats if no DSI is found
+		if (!codec->extradata_size) {
+			switch (gpac_codec_id) {
+			case GF_CODECID_AC3:
+			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_AVC:
+			case GF_CODECID_HEVC:
+			case GF_CODECID_AV1:
+				force_reframer = GF_TRUE;
+				break;
+			}
+		}
+		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 ) );
+
+			if (cname)
+				gf_filter_pid_set_property_str(pid, "ffmpeg:codec", &PROP_STRING(cname ) );
+		} else if (codec->extradata_size) {
+
+			//avc/hevc read by ffmpeg is still in annex B format
+			if (ctx->demuxer->iformat) {
+				if (!strcmp(ctx->demuxer->iformat->name, "h264") || !strcmp(ctx->demuxer->iformat->name, "hevc")) {
+					force_reframer = GF_TRUE;
+				}
+			}
+
+			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) );
+			}
+		}
+
+		if (force_reframer) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_UNFRAMED, &PROP_BOOL(GF_TRUE) );
+		}
+
+
+		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->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))
+		) {
+			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));
+			}
+			gf_filter_pid_set_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT( pfmt) );
+
+#undef CHECK_FF_PFMT
+		}
+
+
+		if (codec->sample_fmt>0) {
+			u32 sfmt = 0;
+			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;
+			case AV_SAMPLE_FMT_FLT: sfmt = GF_AUDIO_FMT_FLT; break;
+			case AV_SAMPLE_FMT_DBL: sfmt = GF_AUDIO_FMT_DBL; break;
+			case AV_SAMPLE_FMT_U8P: sfmt = GF_AUDIO_FMT_U8P; break;
+			case AV_SAMPLE_FMT_S16P: sfmt = GF_AUDIO_FMT_S16P; break;
+			case AV_SAMPLE_FMT_S32P: sfmt = GF_AUDIO_FMT_S32P; break;
+			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_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 ) );
+
+		gf_filter_pid_set_property(pid, GF_PROP_PID_URL, &PROP_STRING(ctx->demuxer->filename));
+	}
+
+	if (!nb_a && !nb_v
+#ifdef FF_SUB_SUPPORT
+		&& !nb_t
+#endif
+	)
+		return GF_NOT_SUPPORTED;
+
+	return GF_OK;
+}
+
+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);
+}
+
+static int64_t ffavio_seek(void *opaque, int64_t offset, int whence)
+{
+	GF_FFDemuxCtx *ctx = (GF_FFDemuxCtx *)opaque;
+	return (int64_t) gf_fseek(ctx->gfio, offset, whence);
+}
+
+static GF_Err ffdmx_initialize(GF_Filter *filter)
+{
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+	GF_Err e;
+	s32 res;
+	char *ext;
+	const char *url;
+	AVInputFormat *av_in = NULL;
+	ctx->fname = "FFDmx";
+	ctx->log_class = GF_LOG_CONTAINER;
+
+	ffmpeg_setup_logs(ctx->log_class);
+
+	ctx->initialized = GF_TRUE;
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		ffdmx_update_arg(filter, NULL, NULL);
+	}
+#endif
+	if (!ctx->src) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Missing file name, cannot open\n", ctx->fname));
+		return GF_SERVICE_ERROR;
+	}
+	/*some extensions not supported by ffmpeg, overload input format*/
+	ext = strrchr(ctx->src, '.');
+	if (ext) {
+		if (!stricmp(ext+1, "cmp")) av_in = av_find_input_format("m4v");
+	}
+
+	GF_LOG(GF_LOG_DEBUG, ctx->log_class, ("[%s] opening file %s - av_in %08x\n", ctx->fname, ctx->src, av_in));
+
+	ctx->demuxer = avformat_alloc_context();
+	ffmpeg_set_mx_dmx_flags(ctx->options, ctx->demuxer);
+
+	url = ctx->src;
+	if (!strncmp(ctx->src, "gfio://", 7)) {
+		ctx->gfio = gf_fopen(ctx->src, "rb");
+		if (!ctx->gfio) {
+			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Failed to open %s\n", ctx->fname, ctx->src));
+			return GF_URL_ERROR;
+		}
+		ctx->avio_ctx_buffer = av_malloc(ctx->block_size);
+		if (!ctx->avio_ctx_buffer) {
+			return GF_OUT_OF_MEM;
+		}
+		ctx->avio_ctx = avio_alloc_context(ctx->avio_ctx_buffer, ctx->block_size,
+									  0, ctx, &ffavio_read_packet, NULL, &ffavio_seek);
+
+		if (!ctx->avio_ctx) {
+			GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] Failed to create AVIO context for %s\n", ctx->fname, ctx->src));
+			return GF_OUT_OF_MEM;
+		}
+		ctx->demuxer->pb = ctx->avio_ctx;
+		url = gf_fileio_translate_url(ctx->src);
+	}
+
+	res = avformat_open_input(&ctx->demuxer, url, av_in, ctx->options ? &ctx->options : NULL);
+
+	switch (res) {
+	case 0:
+		e = GF_OK;
+		break;
+	case AVERROR_INVALIDDATA:
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		break;
+	case AVERROR_DEMUXER_NOT_FOUND:
+	case -ENOENT:
+		e = GF_URL_ERROR;
+		break;
+	case AVERROR_EOF:
+		e = GF_EOS;
+		break;
+	default:
+		e = GF_NOT_SUPPORTED;
+		break;
+	}
+	if (e) {
+		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);
+		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);
+		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));
+
+	return ffdmx_init_common(filter, ctx, GF_FALSE);
+}
+
+
+static Bool ffdmx_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (com->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);
+			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) ));
+			}
+		}
+		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;
+		}
+		//cancel event
+		return GF_TRUE;
+
+	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 GF_FilterProbeScore ffdmx_probe_url(const char *url, const char *mime)
+{
+	if (!strncmp(url, "video://", 8)) return GF_FPROBE_NOT_SUPPORTED;
+	if (!strncmp(url, "audio://", 8)) return GF_FPROBE_NOT_SUPPORTED;
+	if (!strncmp(url, "av://", 5)) return GF_FPROBE_NOT_SUPPORTED;
+	if (!strncmp(url, "pipe://", 7)) return GF_FPROBE_NOT_SUPPORTED;
+	return GF_FPROBE_MAYBE_SUPPORTED;
+}
+
+
+static const char *ffdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	int ffscore;
+	AVInputFormat *probe_fmt;
+	AVProbeData pb;
+
+	av_register_all();
+
+
+	memset(&pb, 0, sizeof(AVProbeData));
+	//not setting this crashes some probers in ffmpeg
+	pb.filename = "";
+	if (size <= AVPROBE_PADDING_SIZE) {
+		pb.buf = gf_malloc(sizeof(char)*(size+AVPROBE_PADDING_SIZE) );
+		memcpy(pb.buf, data, sizeof(char)*size);
+		pb.buf_size = size;
+		probe_fmt = av_probe_input_format3(&pb, GF_FALSE, &ffscore);
+		gf_free(pb.buf);
+	} else {
+		pb.buf =  (char *) data;
+		pb.buf_size = size - AVPROBE_PADDING_SIZE;
+		probe_fmt = av_probe_input_format3(&pb, GF_FALSE, &ffscore);
+	}
+
+	if (!probe_fmt) return NULL;
+	if (probe_fmt->mime_type) {
+		//TODO try to refine based on ffprobe score
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return probe_fmt->mime_type;
+	}
+	return NULL;
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_FFDemuxCtx, _n)
+
+static const GF_FilterCapability FFDmxCaps[] =
+{
+	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),
+};
+
+
+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")
+	.private_size = sizeof(GF_FFDemuxCtx),
+	SETCAPS(FFDmxCaps),
+	.initialize = ffdmx_initialize,
+	.finalize = ffdmx_finalize,
+	.process = ffdmx_process,
+	.update_arg = ffdmx_update_arg,
+	.probe_url = ffdmx_probe_url,
+	.probe_data = ffdmx_probe_data,
+	.process_event = ffdmx_process_event,
+	.flags = GF_FS_REG_META,
+};
+
+
+static const GF_FilterArgs FFDemuxArgs[] =
+{
+	{ OFFS(src), "location 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);
+	return &FFDemuxRegister;
+}
+
+
+
+static GF_Err ffavin_initialize(GF_Filter *filter)
+{
+	s32 res, i;
+	Bool has_a, has_v;
+	char szPatchedName[1024];
+	const char *dev_name=NULL;
+	const char *default_fmt=NULL;
+	AVInputFormat *dev_fmt=NULL;
+	GF_FFDemuxCtx *ctx = gf_filter_get_udta(filter);
+	Bool wants_audio = GF_FALSE;
+	Bool wants_video = GF_FALSE;
+	ctx->fname = "FFAVIn";
+	ctx->log_class = GF_LOG_MMIO;
+
+	ffmpeg_setup_logs(ctx->log_class);
+
+	avdevice_register_all();
+	ctx->initialized = GF_TRUE;
+	if (!ctx->src) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] No source URL specified, expecting video://, audio:/ or av://\n", ctx->fname));
+		return GF_SERVICE_ERROR;
+	}
+	default_fmt = ctx->fmt;
+	if (!default_fmt) {
+#ifdef WIN32
+		default_fmt = "dshow";
+#elif defined(__DARWIN) || defined(__APPLE__)
+		default_fmt = "avfoundation";
+#else
+		default_fmt = "video4linux2";
+#endif
+	}
+
+	if (default_fmt) {
+		dev_fmt = av_find_input_format(default_fmt);
+		if (dev_fmt == NULL) {
+			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));
+			dev_fmt = NULL;
+		}
+#else
+		//not supported for old FFMPE 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);
+			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))
+				continue;
+
+			//listing devices is on its way of implementation in ffmpeg ... for now break at first provider
+			break;
+		}
+	}
+#endif
+	if (!dev_fmt) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] No input format specified\n", ctx->fname, ctx->fmt));
+		return GF_BAD_PARAM;
+	}
+
+	dev_name = ctx->dev;
+
+	if (!strncmp(ctx->src, "video://", 8)) wants_video = GF_TRUE;
+	else if (!strncmp(ctx->src, "audio://", 8)) wants_audio = GF_TRUE;
+	else if (!strncmp(ctx->src, "av://", 5)) wants_video = wants_audio = GF_TRUE;
+
+	szPatchedName[0]=0;
+
+#if defined(__DARWIN) || defined(__APPLE__)
+	if (!strncmp(dev_name, "screen", 6)) {
+		strcpy(szPatchedName, "Capture screen ");
+		strcat(szPatchedName, dev_name+6);
+		dev_name = (char *) szPatchedName;
+	}
+#endif
+
+	if (wants_video && wants_audio && !strcmp(dev_name, "0")) {
+		strcpy(szPatchedName, "0:0");
+		dev_name = (char *) szPatchedName;
+	}
+#if defined(__APPLE__) && !defined(GPAC_CONFIG_IOS)
+	else if (!strncmp(dev_fmt->priv_class->class_name, "AVFoundation", 12) && wants_audio) {
+		if (ctx->dev[0] != ':') {
+			strcpy(szPatchedName, ":");
+			strcat(szPatchedName, ctx->dev);
+			dev_name = (char *) szPatchedName;
+		}
+	}
+#endif
+
+	/* Open video */
+	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);
+	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);
+	}
+
+	if (res < 0) {
+		if (ctx->options) {
+			av_dict_free(&ctx->options);
+			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);
+		}
+		if (res<0) {
+			av_dict_set(&ctx->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);
+			if (res < 0) {
+				av_dict_set(&ctx->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);
+			}
+		}
+	}
+
+	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));
+		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);
+
+	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;
+	}
+
+	//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) {
+		case AVMEDIA_TYPE_AUDIO:
+			has_a = GF_TRUE;
+			break;
+		case AVMEDIA_TYPE_VIDEO:
+			has_v = GF_TRUE;
+			break;
+		default:
+			break;
+		}
+	}
+	if (wants_audio && !has_a) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] No audio stream in input device\n", ctx->fname));
+		return GF_NOT_SUPPORTED;
+	}
+	if (wants_video && !has_v) {
+		GF_LOG(GF_LOG_ERROR, ctx->log_class, ("[%s] No video stream in input device\n", ctx->fname));
+		return GF_NOT_SUPPORTED;
+	}
+	ctx->probe_frames = ctx->probes;
+	if (has_v && ctx->probes) {
+		ctx->probe_times = gf_malloc(sizeof(u64) * ctx->probes);
+		memset(ctx->probe_times, 0, sizeof(u64) * ctx->probes);
+		//we probe timestamps in either modes because timestamps of first frames are sometimes off
+		ctx->probe_frames = 0;
+	}
+
+	GF_LOG(GF_LOG_INFO, ctx->log_class, ("[%s] device %s:%s opened - %d streams\n", ctx->fname, dev_fmt->priv_class->class_name, ctx->dev, ctx->demuxer->nb_streams));
+
+	ctx->copy_audio = ctx->copy_video = GF_FALSE;
+	switch (ctx->copy) {
+	case COPY_NO:
+		break;
+	case COPY_A:
+		ctx->copy_audio = GF_TRUE;
+		break;
+	case COPY_V:
+		ctx->copy_video = GF_TRUE;
+		break;
+	default:
+		ctx->copy_audio = ctx->copy_video = GF_TRUE;
+		break;
+	}
+	if (wants_audio && wants_video) {
+		if (!ctx->copy_audio || !ctx->copy_video) {
+			GF_LOG(GF_LOG_WARNING, ctx->log_class, ("[%s] using muxed capture av:// without copy on %s, this might introduce packet losses due to blocking modes or delayed consumption of the frames. If experiencing problems, either set [-copy]() to `AV` or consider using two filters video:// and audio://\n", ctx->fname, (!ctx->copy_audio && !ctx->copy_video) ? "audio and video streams" : ctx->copy_video ? "audio stream" : "video stream"));
+		}
+	}
+	return ffdmx_init_common(filter, ctx, GF_TRUE);
+}
+
+static GF_FilterProbeScore ffavin_probe_url(const char *url, const char *mime)
+{
+	if (!strncmp(url, "video://", 8)) return GF_FPROBE_MAYBE_SUPPORTED;
+	if (!strncmp(url, "audio://", 8)) return GF_FPROBE_MAYBE_SUPPORTED;
+	if (!strncmp(url, "av://", 5)) return GF_FPROBE_MAYBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+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),
+};
+
+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")
+	.private_size = sizeof(GF_FFDemuxCtx),
+	SETCAPS(FFAVInCaps),
+	.initialize = ffavin_initialize,
+	.finalize = ffdmx_finalize,
+	.process = ffdmx_process,
+	.update_arg = ffdmx_update_arg,
+	.probe_url = ffavin_probe_url,
+	.process_event = ffdmx_process_event,
+	.flags = GF_FS_REG_META,
+};
+
+
+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(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"
+		"- V: video frames are copied, audio frames are forwarded\n"
+		"- 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(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},
+	{0}
+};
+
+
+//number of arguments defined above
+const int FFAVIN_STATIC_ARGS = (sizeof (FFAVInArgs) / sizeof (GF_FilterArgs)) - 1;
+
+const GF_FilterRegister *ffavin_register(GF_FilterSession *session)
+{
+	ffmpeg_build_register(session, &FFAVInRegister, FFAVInArgs, FFAVIN_STATIC_ARGS, FF_REG_TYPE_DEV_IN);
+	return &FFAVInRegister;
+}
+
+#else
+
+#include <gpac/filters.h>
+
+const GF_FilterRegister *ffdmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+const GF_FilterRegister *ffavin_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif

gpac-1.0.0.tar.gz/src/filters/ff_enc.c Added

@@ -0,0 +1,1460 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg encode 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/setup.h>
+#include <gpac/bitstream.h>
+#include <gpac/avparse.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+
+#define ENC_BUF_ALLOC_SAFE	10000
+
+typedef struct _gf_ffenc_ctx
+{
+	//opts
+	Bool all_intra;
+	char *c, *ffc;
+	Bool ls;
+	u32 pfmt;
+	GF_Fraction fintra;
+
+	//internal data
+	Bool initialized;
+
+	u32 gop_size;
+	u32 target_rate;
+
+	AVCodecContext *encoder;
+	//decode options
+	AVDictionary *options;
+
+	GF_FilterPid *in_pid, *out_pid;
+	//media type
+	u32 type;
+	u32 timescale;
+
+	u32 nb_frames_out, nb_frames_in;
+	u64 time_spent;
+
+	Bool low_delay;
+
+	GF_Err (*process)(GF_Filter *filter, struct _gf_ffenc_ctx *ctx);
+	//gpac one
+	u32 codecid;
+	//done flushing encoder (eg sent NULL frames)
+	u32 flush_done;
+	//frame used by both video and audio encoder
+	AVFrame *frame;
+
+	//encoding buffer - we allocate ENC_BUF_ALLOC_SAFE+WxH for the video (some image codecs in ffmpeg require more than WxH for headers), ENC_BUF_ALLOC_SAFE+nb_ch*samplerate for the audio
+	//this should be enough to hold any lossless compression formats
+	char *enc_buffer;
+	u32 enc_buffer_size;
+
+	Bool init_cts_setup;
+
+	//video state
+	u32 width, height, stride, stride_uv, nb_planes, uv_height;
+	//ffmpeg one
+	enum AVPixelFormat pixel_fmt;
+	u64 cts_first_frame_plus_one;
+
+	//audio state
+	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 also store the remaining of a consumed frame here, so that input packet is realeased ASAP
+	char *audio_buffer;
+	u32 audio_buffer_size;
+	u32 samples_in_audio_buffer;
+	//cts of first byte in frame
+	u64 first_byte_cts;
+	Bool planar_audio;
+
+	//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;
+
+	GF_List *src_packets;
+
+	GF_BitStream *sdbs;
+
+	Bool reconfig_pending;
+	Bool infmt_negociate;
+	Bool remap_ts;
+	Bool force_reconfig;
+
+	u32 dsi_crc;
+
+	u32 gpac_pixel_fmt;
+	u32 gpac_audio_fmt;
+
+	Bool fintra_setup;
+	u64 orig_ts;
+	u32 nb_forced;
+
+} GF_FFEncodeCtx;
+
+static GF_Err ffenc_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+
+static GF_Err ffenc_initialize(GF_Filter *filter)
+{
+	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);
+	return GF_OK;
+}
+
+static void ffenc_finalize(GF_Filter *filter)
+{
+	GF_FFEncodeCtx *ctx = (GF_FFEncodeCtx *) gf_filter_get_udta(filter);
+	if (ctx->options) av_dict_free(&ctx->options);
+	if (ctx->frame) av_frame_free(&ctx->frame);
+	if (ctx->enc_buffer) gf_free(ctx->enc_buffer);
+	if (ctx->audio_buffer) gf_free(ctx->audio_buffer);
+
+	while (gf_list_count(ctx->src_packets)) {
+		GF_FilterPacket *pck = gf_list_pop_back(ctx->src_packets);
+		gf_filter_pck_unref(pck);
+	}
+	gf_list_del(ctx->src_packets);
+
+	if (ctx->encoder) {
+		avcodec_close(ctx->encoder);
+	}
+	if (ctx->sdbs) gf_bs_del(ctx->sdbs);
+	return;
+}
+
+//TODO add more feedback
+static void ffenc_log_video(GF_Filter *filter, struct _gf_ffenc_ctx *ctx, AVPacket *pkt, Bool do_reporting)
+{
+	Double fps=0;
+	s32 q=-1;
+	u8 pictype=0;
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	u64 errors[10];
+	u32 i;
+	u8 nb_errors = 0;
+#endif
+	const char *ptype = "U";
+
+	if (!ctx->ls && !do_reporting) return;
+
+
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	u32 sq_size;
+	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);
+		q = gf_bs_read_u32_le(ctx->sdbs);
+		pictype = gf_bs_read_u8(ctx->sdbs);
+		nb_errors = gf_bs_read_u8(ctx->sdbs);
+		/*res*/gf_bs_read_u16(ctx->sdbs);
+		if (nb_errors>10) nb_errors = 10;
+		for (i=0; i<nb_errors; i++) {
+			errors[i] = gf_bs_read_u64_le(ctx->sdbs);
+		}
+	}
+#endif
+	if (ctx->time_spent) {
+		fps = ctx->nb_frames_out;
+		fps *= 1000000;
+		fps /= ctx->time_spent;
+	}
+	switch (pictype) {
+	case AV_PICTURE_TYPE_I: ptype = "I"; break;
+	case AV_PICTURE_TYPE_P: ptype = "P"; break;
+	case AV_PICTURE_TYPE_S: ptype = "S"; break;
+	case AV_PICTURE_TYPE_SP: ptype = "SP"; break;
+	case AV_PICTURE_TYPE_B: ptype = "B"; break;
+	case AV_PICTURE_TYPE_BI: ptype = "B"; break;
+	}
+
+	if (ctx->ls) {
+		fprintf(stderr, "[FFEnc] FPS %.02f F %d DTS "LLD" CTS "LLD" Q %02.02f PT %s (F_in %d)", fps, ctx->nb_frames_out, pkt->dts+ctx->ts_shift, pkt->pts+ctx->ts_shift, ((Double)q) /  FF_QP2LAMBDA, ptype, ctx->nb_frames_in);
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+		if (nb_errors) {
+			fprintf(stderr, "PSNR");
+			for (i=0; i<nb_errors; i++) {
+				Double psnr = (Double) errors[i];
+				psnr /= ctx->width * ctx->height * 255.0 * 255.0;
+				fprintf(stderr, " %02.02f", psnr);
+			}
+		}
+#endif
+		fprintf(stderr, "\r");
+	}
+
+	if (do_reporting) {
+		char szStatus[1024];
+		sprintf(szStatus, "[FFEnc] FPS %.02f F %d DTS "LLD" CTS "LLD" Q %02.02f PT %s (F_in %d)", fps, ctx->nb_frames_out, pkt->dts+ctx->ts_shift, pkt->pts+ctx->ts_shift, ((Double)q) /  FF_QP2LAMBDA, ptype, ctx->nb_frames_in);
+		gf_filter_update_status(filter, -1, szStatus);
+	}
+}
+
+static GF_Err ffenc_process_video(GF_Filter *filter, struct _gf_ffenc_ctx *ctx)
+{
+	AVPacket pkt;
+	s32 gotpck;
+	const char *data = NULL;
+	u32 size=0, i, count, offset, to_copy;
+	s32 res;
+	u64 now;
+	u8 *output;
+	u32 force_intra = 0;
+	Bool insert_jp2c = GF_FALSE;
+	GF_FilterPacket *dst_pck, *src_pck;
+	GF_FilterPacket *pck;
+
+	if (!ctx->in_pid) return GF_EOS;
+
+	pck = gf_filter_pid_get_packet(ctx->in_pid);
+
+	if (!ctx->encoder) {
+		if (ctx->infmt_negociate) return GF_OK;
+
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] encoder reconfiguration failed, aborting stream\n"));
+		gf_filter_pid_set_eos(ctx->out_pid);
+		return GF_EOS;
+	}
+
+	if (!pck) {
+		if (! gf_filter_pid_is_eos(ctx->in_pid)) return GF_OK;
+		if (ctx->flush_done) return GF_OK;
+	}
+
+	if (ctx->reconfig_pending) pck = NULL;
+
+	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;
+
+	ctx->frame->pict_type = 0;
+	ctx->frame->width = ctx->width;
+	ctx->frame->height = ctx->height;
+	ctx->frame->format = ctx->pixel_fmt;
+
+	ctx->frame->pict_type = AV_PICTURE_TYPE_NONE;
+
+	//force picture type
+	if (ctx->all_intra)
+		ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+
+	//if PCK_FILENUM is set on input, this is a file boundary, force IDR sync
+	if (pck && gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM)) {
+		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 (!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"));
+			ctx->orig_ts = cts;
+			force_intra = 1;
+			ctx->nb_forced=1;
+		} else {
+			u64 ts_diff = cts - ctx->orig_ts;
+			if (ts_diff * ctx->fintra.den >= ctx->nb_forced * ctx->fintra.num * ctx->timescale) {
+				force_intra = 1;
+				ctx->nb_forced++;
+				GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFEnc] Forcing IDR at frame %d (CTS %d / %d)\n", ctx->nb_frames_in, cts, ctx->timescale));
+			}
+		}
+	}
+	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->force_reconfig) {
+				ctx->reconfig_pending = GF_TRUE;
+				ctx->force_reconfig = GF_TRUE;
+				pck = NULL;
+			} else {
+				ctx->force_reconfig = GF_FALSE;
+			}
+		}
+		ctx->frame->pict_type = AV_PICTURE_TYPE_I;
+	}
+
+
+	now = gf_sys_clock_high_res();
+	gotpck = 0;
+	if (pck) {
+		u32 ilaced;
+		if (data) {
+			ctx->frame->data[0] = (u8 *) data;
+			ctx->frame->linesize[0] = ctx->stride;
+			if (ctx->nb_planes>1) {
+				ctx->frame->data[1] = (u8 *) data + ctx->stride * ctx->height;
+				ctx->frame->linesize[1] = ctx->stride_uv ? ctx->stride_uv : ctx->stride/2;
+				if (ctx->nb_planes>2) {
+					ctx->frame->data[2] = (u8 *) ctx->frame->data[1] + ctx->stride_uv * ctx->height/2;
+					ctx->frame->linesize[2] = ctx->frame->linesize[1];
+				} else {
+					ctx->frame->linesize[2] = 0;
+				}
+			} else {
+				ctx->frame->linesize[1] = 0;
+			}
+		} else {
+			GF_Err e=GF_NOT_SUPPORTED;
+			GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+			if (frame_ifce && frame_ifce->get_plane) {
+				e = frame_ifce->get_plane(frame_ifce, 0, (const u8 **) &ctx->frame->data[0], &ctx->frame->linesize[0]);
+				if (!e && (ctx->nb_planes>1)) {
+					e = frame_ifce->get_plane(frame_ifce, 1, (const u8 **) &ctx->frame->data[1], &ctx->frame->linesize[1]);
+					if (!e && (ctx->nb_planes>2)) {
+						e = frame_ifce->get_plane(frame_ifce, 1, (const u8 **) &ctx->frame->data[2], &ctx->frame->linesize[2]);
+					}
+				}
+			}
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Failed to fetch %sframe data: %s\n", frame_ifce ? "hardware " : "", gf_error_to_string(e) ));
+				gf_filter_pid_drop_packet(ctx->in_pid);
+				return e;
+			}
+		}
+
+		ilaced = gf_filter_pck_get_interlaced(pck);
+		if (!ilaced) {
+			ctx->frame->interlaced_frame = 0;
+		} else {
+			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->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;
+		}
+
+		if (ctx->remap_ts) {
+			SCALE_TS(ctx->frame->pts);
+
+			SCALE_TS(ctx->frame->pkt_duration);
+		}
+
+		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++;
+
+		//keep ref to ource properties
+		gf_filter_pck_ref_props(&pck);
+		gf_list_add(ctx->src_packets, 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);
+		}
+	} else {
+		res = avcodec_encode_video2(ctx->encoder, &pkt, NULL, &gotpck);
+		if (!gotpck) {
+			//done flushing encoder while reconfiguring
+			if (ctx->reconfig_pending) {
+				ctx->reconfig_pending = GF_FALSE;
+				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);
+			}
+			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);
+		}
+	}
+	now = gf_sys_clock_high_res() - now;
+	ctx->time_spent += now;
+
+	if (res<0) {
+		ctx->nb_frames_out++;
+		return GF_SERVICE_ERROR;
+	}
+
+	if (!gotpck) {
+		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 );
+
+			//check shift in DTS
+			ctx->ts_shift += (s32) ( (s64) ctx->cts_first_frame_plus_one - 1 - (s64) pkt.dts );
+		}
+		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) );
+		}
+	}
+
+	src_pck = NULL;
+	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;
+		src_pck = NULL;
+	}
+
+	offset = 0;
+	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]);
+		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]);
+				if (b4cc == GF_4CC('j','p','2','c')) {
+					break;
+				}
+				if (b4cc == GF_4CC('j','p','2','h')) {
+					jp2h_offset = offset;
+				}
+				offset++;
+			}
+			if (jp2h_offset) {
+				u32 len = pkt.data[jp2h_offset];
+				len <<= 8;
+				len |= pkt.data[jp2h_offset+1];
+				len <<= 8;
+				len |= pkt.data[jp2h_offset+2];
+				len <<= 8;
+				len |= pkt.data[jp2h_offset+3];
+
+				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) );
+				}
+			}
+			size -= offset;
+			to_copy -= offset;
+		} else {
+			size += 8;
+
+			if (!ctx->dsi_crc) {
+				u8 *dsi;
+				u32 dsi_len;
+				GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				gf_bs_write_u32(bs, 14+8);
+				gf_bs_write_u32(bs, GF_4CC('i','h','d','r'));
+				gf_bs_write_u32(bs, ctx->height);
+				gf_bs_write_u32(bs, ctx->width);
+				gf_bs_write_u16(bs, ctx->nb_planes);
+				gf_bs_write_u8(bs, gf_pixel_get_bytes_per_pixel(ctx->gpac_pixel_fmt));
+				gf_bs_write_u8(bs, 7); //COMP
+				gf_bs_write_u8(bs, 0);
+				gf_bs_write_u8(bs, 0);
+				gf_bs_get_content(bs, &dsi, &dsi_len);
+				gf_bs_del(bs);
+				gf_filter_pid_set_property(ctx->out_pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_len) );
+				ctx->dsi_crc = 1;
+			}
+		}
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, size, &output);
+	if (insert_jp2c) {
+		u32 bsize = pkt.size + 8;
+		output[0] = (bsize >> 24) & 0xFF;
+		output[1] = (bsize >> 16) & 0xFF;
+		output[2] = (bsize >> 8) & 0xFF;
+		output[3] = (bsize) & 0xFF;
+		output[4] = 'j';
+		output[5] = 'p';
+		output[6] = '2';
+		output[7] = 'c';
+		output += 8;
+	}
+	memcpy(output, pkt.data + offset, to_copy);
+
+	if (src_pck) {
+		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);
+		} else {
+			gf_filter_pck_set_duration(dst_pck, (u32) ctx->frame->pkt_duration);
+		}
+	}
+
+	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);
+
+	//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) {
+		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));
+	}
+	else
+		gf_filter_pck_set_sap(dst_pck, 0);
+
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+	if (pkt.flags & AV_PKT_FLAG_DISPOSABLE) {
+		gf_filter_pck_set_dependency_flags(dst_pck, 0x8);
+	}
+#endif
+	gf_filter_pck_send(dst_pck);
+
+	//we're in final flush, request a process task until all frames flushe
+	//we could recursiveley call ourselves, same result
+	if (!pck) {
+		gf_filter_post_process_task(filter);
+	}
+	return GF_OK;
+}
+
+
+
+static void ffenc_audio_append_samples(struct _gf_ffenc_ctx *ctx, const u8 *data, u32 size, u32 sample_offset, u32 nb_samples)
+{
+	u8 *dst;
+	u32 f_idx, s_idx;
+	u32 i, bytes_per_chan, src_frame_size;
+
+	if (!ctx->audio_buffer || !data)
+		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);
+		ctx->samples_in_audio_buffer += nb_samples;
+		return;
+	}
+
+	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(ctx->encoder->frame_size);
+
+	f_idx = ctx->samples_in_audio_buffer / ctx->encoder->frame_size;
+	s_idx = ctx->samples_in_audio_buffer % ctx->encoder->frame_size;
+	if (s_idx) {
+		assert(s_idx + nb_samples <= (u32) ctx->encoder->frame_size);
+	}
+	dst = ctx->audio_buffer + (f_idx * ctx->channels * ctx->encoder->frame_size + s_idx) * bytes_per_chan;
+	while (nb_samples) {
+		const u8 *src;
+		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;
+
+		for (i=0; i<ctx->channels; i++) {
+			memcpy(dst, src, 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;
+		sample_offset += nb_samples_to_copy;
+	}
+}
+
+static GF_Err ffenc_process_audio(GF_Filter *filter, struct _gf_ffenc_ctx *ctx)
+{
+	AVPacket pkt;
+	s32 gotpck;
+	const char *data = NULL;
+	u32 size=0, nb_copy=0, i, count;
+	Bool from_internal_buffer_only = GF_FALSE;
+	s32 res;
+	u32 nb_samples=0;
+	u64 ts_diff;
+	u8 *output;
+	GF_FilterPacket *dst_pck, *src_pck;
+	GF_FilterPacket *pck;
+
+	if (!ctx->in_pid) return GF_EOS;
+
+	pck = gf_filter_pid_get_packet(ctx->in_pid);
+
+	if (!ctx->encoder) {
+		if (ctx->infmt_negociate) return GF_OK;
+		
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] encoder reconfiguration failed, aborting stream\n"));
+		gf_filter_pid_set_eos(ctx->out_pid);
+		return GF_EOS;
+	}
+
+	if (!pck) {
+		if (! gf_filter_pid_is_eos(ctx->in_pid)) return GF_OK;
+		if (ctx->flush_done) return GF_EOS;
+	}
+
+	if (ctx->reconfig_pending) pck = NULL;
+
+	if (ctx->encoder->frame_size && (ctx->encoder->frame_size <= (s32) ctx->samples_in_audio_buffer)) {
+		avcodec_fill_audio_frame(ctx->frame, ctx->channels, ctx->sample_fmt, ctx->audio_buffer, ctx->bytes_per_sample * ctx->encoder->frame_size, 0);
+
+		from_internal_buffer_only = GF_TRUE;
+
+	} else if (pck) {
+		data = gf_filter_pck_get_data(pck, &size);
+		if (!data) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] Packet without associated data\n"));
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_OK;
+		}
+
+		if (!ctx->samples_in_audio_buffer) {
+			ctx->first_byte_cts = gf_filter_pck_get_cts(pck);
+		}
+
+		src_pck = pck;
+		gf_filter_pck_ref_props(&src_pck);
+		gf_list_add(ctx->src_packets, src_pck);
+
+		nb_samples = size / ctx->bytes_per_sample;
+		if (ctx->encoder->frame_size && (nb_samples + ctx->samples_in_audio_buffer < (u32) ctx->encoder->frame_size)) {
+			ffenc_audio_append_samples(ctx, data, size, 0, nb_samples);
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_OK;
+		}
+
+		if (ctx->encoder->frame_size) {
+			nb_copy = ctx->encoder->frame_size - ctx->samples_in_audio_buffer;
+			ffenc_audio_append_samples(ctx, data, size, 0, nb_copy);
+
+			ctx->frame->nb_samples = ctx->encoder->frame_size;
+			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 {
+			ctx->frame->nb_samples = size / ctx->bytes_per_sample;
+			res = avcodec_fill_audio_frame(ctx->frame, ctx->channels, ctx->sample_fmt, data, size, 0);
+			data = NULL;
+			size = 0;
+		}
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Error filling raw audio frame: %s\n", av_err2str(res) ));
+			//discard
+			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;
+			}
+			gf_filter_pid_drop_packet(ctx->in_pid);
+			return GF_SERVICE_ERROR;
+		}
+	}
+
+	av_init_packet(&pkt);
+	pkt.data = (uint8_t*)ctx->enc_buffer;
+	pkt.size = ctx->enc_buffer_size;
+
+	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) {
+		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);
+	} else {
+		res = avcodec_encode_audio2(ctx->encoder, &pkt, NULL, &gotpck);
+		if (!gotpck) {
+			//done flushing encoder while reconfiguring
+			if (ctx->reconfig_pending) {
+				ctx->reconfig_pending = GF_FALSE;
+				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);
+			}
+			ctx->flush_done = 1;
+			gf_filter_pid_set_eos(ctx->out_pid);
+			return GF_EOS;
+		}
+	}
+
+	if (from_internal_buffer_only) {
+		//avcodec_fill_audio_frame does not perform copy, so make sure we discard internal buffer AFTER we encode
+		u32 offset, len, nb_samples_to_drop;
+
+		//we always drop a complete encoder frame size, so same code for planar and packed
+		nb_samples_to_drop = ctx->encoder->frame_size;
+
+		if (ctx->samples_in_audio_buffer > nb_samples_to_drop) {
+			offset = nb_samples_to_drop * ctx->bytes_per_sample;
+			len = (ctx->samples_in_audio_buffer - nb_samples_to_drop) * ctx->bytes_per_sample;
+			memmove(ctx->audio_buffer, ctx->audio_buffer + offset, sizeof(u8)*len);
+			ctx->samples_in_audio_buffer -= nb_samples_to_drop;
+		} else {
+			ctx->samples_in_audio_buffer = 0;
+		}
+
+	}
+
+	//increase timestamp
+	ts_diff = ctx->frame->nb_samples;
+	if (ctx->timescale!=ctx->sample_rate) {
+		ts_diff *= ctx->timescale;
+		ts_diff /= ctx->sample_rate;
+	}
+	ctx->first_byte_cts += ts_diff;
+
+	if (pck && !from_internal_buffer_only) {
+		ctx->samples_in_audio_buffer = 0;
+		if (nb_samples > nb_copy) {
+			ffenc_audio_append_samples(ctx, data, size, nb_copy, nb_samples - nb_copy);
+		}
+		gf_filter_pid_drop_packet(ctx->in_pid);
+	}
+
+	if (res<0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Error encoding frame: %s\n", av_err2str(res) ));
+		return GF_SERVICE_ERROR;
+	}
+	if (!gotpck) {
+		return GF_OK;
+	}
+	dst_pck = gf_filter_pck_new_alloc(ctx->out_pid, pkt.size, &output);
+	memcpy(output, pkt.data, pkt.size);
+
+	if (ctx->init_cts_setup) {
+		ctx->init_cts_setup = GF_FALSE;
+		if (ctx->frame->pts != pkt.pts) {
+			ctx->ts_shift = (s32) ( (s64) ctx->frame->pts - (s64) pkt.pts );
+		}
+//		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
+	//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);
+	for (i=0; i<count; i++) {
+		u64 acts;
+		u32 adur;
+		src_pck = gf_list_get(ctx->src_packets, i);
+		acts = gf_filter_pck_get_cts(src_pck);
+		adur = gf_filter_pck_get_duration(src_pck);
+
+		if ((s64) acts >= pkt.pts) {
+			break;
+		}
+
+		if (acts + adur <= (u64) ( pkt.pts + ctx->ts_shift) ) {
+			gf_list_rem(ctx->src_packets, i);
+			gf_filter_pck_unref(src_pck);
+			i--;
+			count--;
+		}
+		src_pck = NULL;
+	}
+	if (src_pck) {
+		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);
+	//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)
+		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_send(dst_pck);
+
+	//we're in final flush, request a process task until all frames flushe
+	//we could recursiveley call ourselves, same result
+	if (!pck) {
+		gf_filter_post_process_task(filter);
+	}
+	return GF_OK;
+}
+
+static GF_Err ffenc_process(GF_Filter *filter)
+{
+	GF_FFEncodeCtx *ctx = (GF_FFEncodeCtx *) gf_filter_get_udta(filter);
+	if (!ctx->out_pid || gf_filter_pid_would_block(ctx->out_pid))
+		return GF_OK;
+	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)
+{
+	s32 res;
+	u32 type=0, fftype, ff_codectag=0;
+	u32 i=0;
+	u32 change_input_fmt = 0;
+	const GF_PropertyValue *prop;
+	const AVCodec *codec=NULL;
+	const AVCodec *desired_codec=NULL;
+	u32 codec_id, pfmt, afmt;
+	GF_FFEncodeCtx *ctx = (GF_FFEncodeCtx *) gf_filter_get_udta(filter);
+
+	//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);
+		return GF_OK;
+	}
+	//check our PID: streamtype and codecid
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!prop) return GF_NOT_SUPPORTED;
+
+	type = prop->value.uint;
+	switch (type) {
+	case GF_STREAM_AUDIO:
+	case GF_STREAM_VISUAL:
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+	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 the codec was set using ffc, get it
+	if (ctx->ffc) {
+		desired_codec = avcodec_find_encoder_by_name(ctx->ffc);
+	}
+
+	if (!ctx->codecid && !desired_codec) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] No codecid specified\n" ));
+		return GF_BAD_PARAM;
+	}
+
+	//initial config or update
+	if (!ctx->in_pid || (ctx->in_pid==pid)) {
+		ctx->in_pid = pid;
+		if (!ctx->type) ctx->type = type;
+		//no support for dynamic changes of stream types
+		else if (ctx->type != type) {
+			return GF_NOT_SUPPORTED;
+		}
+	} else {
+		//only one input pid in ctx
+		if (ctx->in_pid) return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	if (ctx->codecid) {
+		codec_id = ffmpeg_codecid_from_gpac(ctx->codecid, &ff_codectag);
+		if (codec_id) {
+			if (desired_codec && desired_codec->id==codec_id)
+				codec = desired_codec;
+			else
+				codec = avcodec_find_encoder(codec_id);
+		}
+	} else {
+		codec = desired_codec;
+	}
+	if (!codec) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Cannot find encoder for codec %s\n", gf_codecid_name(ctx->codecid) ));
+		return GF_NOT_SUPPORTED;
+	}
+	codec_id = codec->id;
+	if (!ctx->codecid)
+		ctx->codecid = ffmpeg_codecid_to_gpac(codec->id);
+
+	fftype = ffmpeg_stream_type_to_gpac(codec->type);
+	if (fftype != type) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Mismatch between stream type, codec indicates %s but source type is %s\n", gf_stream_type_name(fftype), gf_stream_type_name(type) ));
+		return GF_NOT_SUPPORTED;
+	}
+
+	//declare our output pid to make sure we connect the chain
+	ctx->in_pid = pid;
+	if (!ctx->out_pid) {
+		char szCodecName[1000];
+		ctx->out_pid = gf_filter_pid_new(filter);
+
+		//to change once we implement on-the-fly codec change
+		sprintf(szCodecName, "ffenc:%s", codec->name ? codec->name : "unknown");
+		gf_filter_set_name(filter, szCodecName);
+		gf_filter_pid_set_framing_mode(ctx->in_pid, GF_TRUE);
+	}
+	if (type==GF_STREAM_AUDIO) {
+		ctx->process = ffenc_process_audio;
+	} else {
+		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));
+
+
+#define GET_PROP(_a, _code, _name) \
+	prop = gf_filter_pid_get_property(pid, _code); \
+	if (!prop) {\
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[FFEnc] Input %s unknown, waiting for reconfigure\n", _name)); \
+		return GF_OK; \
+	}\
+	_a  =prop->value.uint;
+
+	pfmt = afmt = 0;
+	if (type==GF_STREAM_VISUAL) {
+		GET_PROP(ctx->width, GF_PROP_PID_WIDTH, "width")
+		GET_PROP(ctx->height, GF_PROP_PID_HEIGHT, "height")
+		GET_PROP(pfmt, GF_PROP_PID_PIXFMT, "pixel format")
+
+		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;
+		prop = gf_filter_pid_caps_query(pid, GF_PROP_PID_STRIDE_UV);
+		if (prop) ctx->stride_uv = prop->value.uint;
+	} 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) {
+		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;
+			}
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[FFEnc] codec reconfiguration, begining flush\n"));
+		ctx->reconfig_pending = GF_TRUE;
+		return GF_OK;
+	}
+
+	if (type==GF_STREAM_VISUAL) {
+		u32 force_pfmt = AV_PIX_FMT_NONE;
+		if (ctx->pfmt) {
+			u32 ff_pfmt = ffmpeg_pixfmt_from_gpac(ctx->pfmt);
+			i=0;
+			while (codec->pix_fmts) {
+				if (codec->pix_fmts[i] == AV_PIX_FMT_NONE) break;
+				if (codec->pix_fmts[i] == ff_pfmt) {
+					force_pfmt = ff_pfmt;
+					break;
+				}
+				//handle pixel formats aliases
+				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i]) == ctx->pfmt) {
+					force_pfmt = ctx->pixel_fmt;
+					break;
+				}
+				i++;
+			}
+			if (force_pfmt == AV_PIX_FMT_NONE) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] Requested source format %s not supported by codec, using default one\n", gf_pixel_fmt_name(ctx->pfmt) ));
+			} else {
+				change_input_fmt = force_pfmt;
+			}
+		}
+		ctx->pixel_fmt = ffmpeg_pixfmt_from_gpac(pfmt);
+		//check pixel format
+		if (force_pfmt == AV_PIX_FMT_NONE) {
+			change_input_fmt = AV_PIX_FMT_NONE;
+			i=0;
+			while (codec->pix_fmts) {
+				if (codec->pix_fmts[i] == AV_PIX_FMT_NONE) break;
+				if (codec->pix_fmts[i] == ctx->pixel_fmt) {
+					change_input_fmt = ctx->pixel_fmt;
+					break;
+				}
+				//handle pixel formats aliases
+				if (ffmpeg_pixfmt_to_gpac(codec->pix_fmts[i]) == 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)
+				void *ff_opaque=NULL;
+#else
+				AVCodec *codec_alt = NULL;
+#endif
+				while (1) {
+#if (LIBAVCODEC_VERSION_MAJOR >= 58) && (LIBAVCODEC_VERSION_MINOR>=20)
+					const AVCodec *codec_alt = av_codec_iterate(&ff_opaque);
+#else
+					codec_alt = av_codec_next(codec_alt);
+#endif
+					if (!codec_alt) break;
+					if (codec_alt==codec) continue;
+					if (codec_alt->id == codec_id) {
+						i=0;
+						while (codec_alt->pix_fmts) {
+							if (codec_alt->pix_fmts[i] == AV_PIX_FMT_NONE) break;
+							if (codec_alt->pix_fmts[i] == ctx->pixel_fmt) {
+								change_input_fmt = ctx->pixel_fmt;
+								GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[FFEnc] Reassigning codec from %s to %s to match pixel format\n", codec->name, codec_alt->name ));
+								codec = codec_alt;
+								break;
+							}
+							i++;
+						}
+					}
+				}
+			}
+		}
+
+		if (ctx->pixel_fmt != change_input_fmt) {
+			u32 ff_pmft = ctx->pixel_fmt;
+
+			if (force_pfmt == AV_PIX_FMT_NONE) {
+				ff_pmft = AV_PIX_FMT_NONE;
+				i=0;
+				//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])) {
+						ff_pmft = codec->pix_fmts[i];
+						break;
+					}
+					i++;
+				}
+				if (ff_pmft == AV_PIX_FMT_NONE) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[FFEnc] Could not find a matching GPAC pixel format for encoder %s\n", codec->name ));
+					return GF_NOT_SUPPORTED;
+				}
+			} else if (ctx->pfmt) {
+				ff_pmft = ffmpeg_pixfmt_from_gpac(ctx->pfmt);
+			}
+			pfmt = ffmpeg_pixfmt_to_gpac(ff_pmft);
+			gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pfmt) );
+			ctx->infmt_negociate = GF_TRUE;
+		} else {
+			ctx->infmt_negociate = GF_FALSE;
+		}
+	} else {
+		u32 change_input_sr = 0;
+		//check audio format
+		ctx->sample_fmt = ffmpeg_audio_fmt_from_gpac(afmt);
+		change_input_fmt = 0;
+		while (codec->sample_fmts) {
+			if (codec->sample_fmts[i] == AV_SAMPLE_FMT_NONE) break;
+			if (codec->sample_fmts[i] == ctx->sample_fmt) {
+				change_input_fmt = ctx->sample_fmt;
+				break;
+			}
+			i++;
+		}
+		i=0;
+		if (!codec->supported_samplerates)
+			change_input_sr = ctx->sample_rate;
+
+		while (codec->supported_samplerates) {
+			if (!codec->supported_samplerates[i]) break;
+			if (codec->supported_samplerates[i]==ctx->sample_rate) {
+				change_input_sr = ctx->sample_rate;
+				break;
+			}
+			i++;
+		}
+		if ((ctx->sample_fmt != change_input_fmt) || (ctx->sample_rate != change_input_sr)) {
+			if (ctx->sample_fmt != change_input_fmt) {
+				ctx->sample_fmt = codec->sample_fmts ? codec->sample_fmts[0] : AV_SAMPLE_FMT_S16;
+				afmt = ffmpeg_audio_fmt_to_gpac(ctx->sample_fmt);
+				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(afmt) );
+			}
+			if (ctx->sample_rate != change_input_sr) {
+				gf_filter_pid_negociate_property(ctx->in_pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(codec->supported_samplerates[0]) );
+			}
+			ctx->infmt_negociate = GF_TRUE;
+		} else {
+			ctx->infmt_negociate = GF_FALSE;
+		}
+	}
+
+	//renegociate input, wait for reconfig call
+	if (ctx->infmt_negociate) return GF_OK;
+
+	ctx->gpac_pixel_fmt = pfmt;
+	ctx->gpac_audio_fmt = afmt;
+	ctx->dsi_crc = 0;
+
+	ctx->encoder = avcodec_alloc_context3(codec);
+	if (! ctx->encoder) return GF_OUT_OF_MEM;
+
+	ctx->encoder->codec_tag = ff_codectag;
+	if (type==GF_STREAM_VISUAL) {
+		ctx->encoder->width = ctx->width;
+		ctx->encoder->height = ctx->height;
+		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;
+		} 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;
+		}
+		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;
+		}
+
+		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, "preset", "ultrafast", 0);
+			av_dict_set(&ctx->options, "tune", "zerolatency", 0);
+			if (ctx->codecid==GF_CODECID_AVC) {
+				av_dict_set(&ctx->options, "x264opts", "no-mbtree:sliced-threads:sync-lookahead=0", 0);
+			}
+#if LIBAVCODEC_VERSION_MAJOR >= 58
+			ctx->encoder->flags |= AV_CODEC_FLAG_LOW_DELAY;
+#endif
+		}
+
+		if (ctx->fintra.den && ctx->fintra.num) {
+			av_dict_set(&ctx->options, "forced-idr", "1", 0);
+		}
+
+		//we don't use out of band headers, since x264 in ffmpeg (and likely other) do not output in MP4 format but
+		//in annexB (extradata only contains SPS/PPS/etc in annexB)
+		//so we indicate unframed for these codecs and use our own filter for annexB->MP4
+
+		if (!ctx->frame)
+			ctx->frame = av_frame_alloc();
+
+		ctx->enc_buffer_size = ctx->width*ctx->height + ENC_BUF_ALLOC_SAFE;
+		ctx->enc_buffer = gf_realloc(ctx->enc_buffer, sizeof(char)*ctx->enc_buffer_size);
+
+		gf_pixel_get_size_info(pfmt, ctx->width, ctx->height, NULL, &ctx->stride, &ctx->stride_uv, &ctx->nb_planes, &ctx->uv_height);
+
+		ctx->encoder->pix_fmt = ctx->pixel_fmt;
+		ctx->init_cts_setup = GF_TRUE;
+		ctx->frame->format = ctx->encoder->pix_fmt;
+	} else if (type==GF_STREAM_AUDIO) {
+		ctx->process = ffenc_process_audio;
+
+		ctx->encoder->sample_rate = ctx->sample_rate;
+		ctx->encoder->channels = ctx->channels;
+
+		//TODO
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (prop) {
+			ctx->encoder->channel_layout = ffmpeg_channel_layout_from_gpac(prop->value.longuint);
+		} else if (ctx->channels==1) {
+			ctx->encoder->channel_layout = AV_CH_LAYOUT_MONO;
+		} else if (ctx->channels==2) {
+			ctx->encoder->channel_layout = AV_CH_LAYOUT_STEREO;
+		}
+
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (prop) {
+			ctx->encoder->time_base.num = 1;
+			ctx->encoder->time_base.den = prop->value.uint;
+			ctx->timescale = prop->value.uint;
+		} else {
+			ctx->encoder->time_base.num = 1;
+			ctx->encoder->time_base.den = ctx->sample_rate;
+			ctx->timescale = ctx->sample_rate;
+		}
+
+		//for aac
+		switch (ctx->codecid) {
+		case GF_CODECID_AAC_MPEG4:
+		case GF_CODECID_AAC_MPEG2_MP:
+		case GF_CODECID_AAC_MPEG2_LCP:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+			av_dict_set(&ctx->options, "strict", "experimental", 0);
+			break;
+		}
+
+		if (!ctx->frame)
+			ctx->frame = av_frame_alloc();
+
+		ctx->enc_buffer_size = ctx->channels*ctx->sample_rate + ENC_BUF_ALLOC_SAFE;
+		ctx->enc_buffer = gf_realloc(ctx->enc_buffer, sizeof(char) * ctx->enc_buffer_size);
+
+		ctx->encoder->sample_fmt = ctx->sample_fmt;
+		ctx->planar_audio = gf_audio_fmt_is_planar(afmt);
+		ctx->frame->format = ctx->encoder->sample_fmt;
+
+		ctx->audio_buffer_size = ctx->sample_rate;
+		ctx->audio_buffer = gf_realloc(ctx->audio_buffer, sizeof(char) * ctx->enc_buffer_size);
+		ctx->bytes_per_sample = ctx->channels * gf_audio_fmt_bit_depth(afmt) / 8;
+		ctx->init_cts_setup = GF_TRUE;
+
+		switch (ctx->codecid) {
+		case GF_CODECID_AAC_MPEG4:
+		case GF_CODECID_AAC_MPEG2_MP:
+		case GF_CODECID_AAC_MPEG2_LCP:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+		{
+#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) );
+#endif
+
+		}
+			break;
+		}
+	}
+
+	ffmpeg_set_enc_dec_flags(ctx->options, ctx->encoder);
+
+	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 );
+	if (res < 0) {
+		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) ));
+		return GF_BAD_PARAM;
+	}
+	ctx->remap_ts = (ctx->encoder->time_base.den != ctx->timescale) ? GF_TRUE : GF_FALSE;
+
+
+	ffmpeg_report_unused_options(filter, ctx->options);
+
+	ffenc_copy_pid_props(ctx);
+	return GF_OK;
+}
+
+
+static GF_Err ffenc_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	s32 res;
+	GF_FFEncodeCtx *ctx = gf_filter_get_udta(filter);
+
+	if (!strcmp(arg_name, "global_header"))	return GF_OK;
+	else if (!strcmp(arg_name, "local_header"))	return GF_OK;
+	else if (!strcmp(arg_name, "low_delay"))	ctx->low_delay = GF_TRUE;
+	//remap some options
+	else if (!strcmp(arg_name, "bitrate") || !strcmp(arg_name, "rate"))	arg_name = "b";
+//	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, "preset")) ctx->low_delay = GF_FALSE;
+	else if (!strcmp(arg_name, "tune")) ctx->low_delay = GF_FALSE;
+
+	if (!strcmp(arg_name, "g") || !strcmp(arg_name, "gop"))
+		ctx->gop_size = arg_val->value.string ? atoi(arg_val->value.string) : 25;
+
+	if (!strcmp(arg_name, "b") && arg_val->value.string) {
+		ctx->target_rate = atoi(arg_val->value.string);
+		if (strchr(arg_val->value.string, 'm') || strchr(arg_val->value.string, 'M'))
+			ctx->target_rate *= 1000000;
+		else if (strchr(arg_val->value.string, 'k') || strchr(arg_val->value.string, 'K'))
+			ctx->target_rate *= 1000;
+	}
+
+	//initial parsing of arguments
+	if (!ctx->initialized) {
+		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";
+			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 ));
+			}
+			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 ));
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+	//updates of arguments, not supported for ffmpeg decoders
+	return GF_NOT_SUPPORTED;
+}
+
+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),
+	//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"
+		"\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"
+		"\n"
+		"The encoder will force a closed gop boundary at each packet with a `FileNumber` property set.\n"
+	)
+	.private_size = sizeof(GF_FFEncodeCtx),
+	SETCAPS(FFEncodeCaps),
+	.initialize = ffenc_initialize,
+	.finalize = ffenc_finalize,
+	.configure_pid = ffenc_configure_pid,
+	.process = ffenc_process,
+	.update_arg = ffenc_update_arg,
+	.flags = GF_FS_REG_META,
+};
+
+#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(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(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},
+
+	{ "*", -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}
+};
+
+const int FFENC_STATIC_ARGS = (sizeof (FFEncodeArgs) / sizeof (GF_FilterArgs)) - 1;
+
+const GF_FilterRegister *ffenc_register(GF_FilterSession *session)
+{
+	ffmpeg_build_register(session, &FFEncodeRegister, FFEncodeArgs, FFENC_STATIC_ARGS, FF_REG_TYPE_ENCODE);
+	return &FFEncodeRegister;
+}
+
+
+#else
+#include <gpac/filters.h>
+const GF_FilterRegister *ffenc_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+#endif //GPAC_HAS_FFMPEG
+

gpac-1.0.0.tar.gz/src/filters/ff_mx.c Added

@@ -0,0 +1,1037 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom Paris 2019-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg muxer 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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+#include <gpac/network.h>
+
+#if (LIBAVFORMAT_VERSION_MAJOR <= 56)
+#undef GPAC_HAS_FFMPEG
+#endif
+
+#endif
+
+#ifdef GPAC_HAS_FFMPEG
+
+typedef struct
+{
+	AVStream *stream;
+	Bool ts_rescale;
+	AVRational in_scale;
+	Bool in_seg_flush;
+	u32 cts_shift;
+
+	Bool suspended;
+} GF_FFMuxStream;
+
+enum{
+	FFMX_STATE_ALLOC=0,
+	FFMX_STATE_AVIO_OPEN,
+	FFMX_STATE_HDR_DONE,
+	FFMX_STATE_TRAILER_DONE,
+	FFMX_STATE_EOS,
+	FFMX_STATE_ERROR
+};
+
+typedef struct
+{
+	//options
+	char *dst, *mime, *ffmt;
+	Double start, speed;
+	u32 block_size;
+	Bool interleave, nodisc, ffiles, noinit;
+
+	AVFormatContext *muxer;
+	//decode options
+	AVDictionary *options;
+
+	GF_List *streams;
+
+	//0 not created, 1 created, header written, 2 finalized, trailer written, 3: end of stream
+	u32 status;
+
+	Bool dash_mode, init_done;
+	u32 nb_pck_in_seg;
+	u32 dash_seg_num;
+	u64 offset_at_seg_start;
+
+	u8 *avio_ctx_buffer;
+	AVIOContext *avio_ctx;
+	FILE *gfio;
+
+
+	u32 cur_file_idx_plus_one;
+} GF_FFMuxCtx;
+
+static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove);
+
+static GF_Err ffmx_init_mux(GF_Filter *filter, GF_FFMuxCtx *ctx)
+{
+	u32 i, nb_pids;
+	int res;
+
+	assert(ctx->status==FFMX_STATE_AVIO_OPEN);
+
+	ctx->status = FFMX_STATE_HDR_DONE;
+	res = avformat_init_output(ctx->muxer, &ctx->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;
+		return GF_NOT_SUPPORTED;
+	}
+
+	nb_pids = gf_filter_get_ipid_count(filter);
+	for (i=0; i<nb_pids; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
+		if (!st) continue;
+
+		if ((st->in_scale.den == st->stream->time_base.den) && (st->in_scale.num == st->stream->time_base.num)) {
+			st->ts_rescale = GF_FALSE;
+		} else {
+			st->ts_rescale = GF_TRUE;
+		}
+	}
+
+	res = avformat_write_header(ctx->muxer, &ctx->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;
+		return GF_SERVICE_ERROR;
+	}
+
+	ffmpeg_report_unused_options(filter, ctx->options);
+
+	return GF_OK;
+}
+
+
+static int ffavio_write_packet(void *opaque, uint8_t *buf, int buf_size)
+{
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *)opaque;
+	return (int) gf_fwrite(buf, buf_size, ctx->gfio);
+}
+
+static int64_t ffavio_seek(void *opaque, int64_t offset, int whence)
+{
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *)opaque;
+	return (int64_t) gf_fseek(ctx->gfio, offset, whence);
+}
+
+static GF_Err ffmx_open_url(GF_FFMuxCtx *ctx, char *final_name)
+{
+	const char *dst;
+	Bool use_gfio=GF_FALSE;
+	AVOutputFormat *ofmt = ctx->muxer->oformat;
+
+	dst = final_name ? final_name : ctx->dst;
+	if (!strncmp(dst, "gfio://", 7)) {
+		use_gfio = GF_TRUE;
+	}
+
+	if (ofmt) {
+		//handle local urls some_dir/some_other_dir/file.ext, ffmpeg doesn't create the dirs for us
+		if (! (ofmt->flags & AVFMT_NOFILE) && gf_url_is_local(dst)) {
+			FILE *f = gf_fopen(dst, "wb");
+			gf_fclose(f);
+		}
+	}
+
+	if (use_gfio) {
+		ctx->gfio = gf_fopen(dst, "wb");
+		if (!ctx->gfio) return GF_URL_ERROR;
+		ctx->avio_ctx_buffer = av_malloc(ctx->block_size);
+		if (!ctx->avio_ctx_buffer) return GF_OUT_OF_MEM;
+
+		ctx->avio_ctx = avio_alloc_context(ctx->avio_ctx_buffer, ctx->block_size,
+									  1, ctx, NULL, &ffavio_write_packet, &ffavio_seek);
+
+		if (!ctx->avio_ctx) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Failed to create AVIO context for %s\n", dst));
+			return GF_OUT_OF_MEM;
+		}
+		ctx->muxer->pb = ctx->avio_ctx;
+	} else if (!ofmt || !(ofmt->flags & AVFMT_NOFILE) ) {
+		int res = avio_open2(&ctx->muxer->pb, dst, AVIO_FLAG_WRITE, NULL, &ctx->options);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to open AVIO context for %s - error %s\n", dst, av_err2str(res) ));
+			return GF_FILTER_NOT_SUPPORTED;
+		}
+	}
+	ctx->status = FFMX_STATE_AVIO_OPEN;
+	return GF_OK;
+}
+static GF_Err ffmx_initialize_ex(GF_Filter *filter, Bool use_templates)
+{
+	const char *url, *sep;
+	AVOutputFormat *ofmt;
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
+
+	ffmpeg_setup_logs(GF_LOG_CONTAINER);
+
+	ctx->muxer = avformat_alloc_context();
+	if (!ctx->muxer) return GF_OUT_OF_MEM;
+
+	if (!ctx->streams)
+		ctx->streams = gf_list_new();
+
+	url = ctx->dst;
+
+	if (!strncmp(ctx->dst, "gfio://", 7)) {
+		url = gf_fileio_translate_url(ctx->dst);
+	}
+	sep = strchr(url, '$');
+	if (sep && strchr(sep+1, '$'))
+		use_templates = GF_TRUE;
+
+	ofmt = av_guess_format(ctx->ffmt, url, ctx->mime);
+	//if protocol is present, we may fail at guessing the format
+	if (!ofmt && !ctx->ffmt) {
+		u32 len;
+		char szProto[20];
+		char *proto = strstr(url, "://");
+		if (!proto)
+			return GF_FILTER_NOT_SUPPORTED;
+		szProto[19] = 0;
+		len = (u32) (proto - url);
+		if (len>19) len=19;
+		strncpy(szProto, url, len);
+		szProto[len] = 0;
+		ofmt = av_guess_format(szProto, url, ctx->mime);
+	}
+	if (!ofmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Failed to guess output format for %s, cannot run\n", ctx->dst));
+		if (!ctx->ffmt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Try specifying the format through :ffmt option\n"));
+		}
+		return GF_SERVICE_ERROR;
+	}
+	ctx->muxer->oformat = 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
+	if (use_templates)
+		return GF_OK;
+
+	return ffmx_open_url(ctx, NULL);
+}
+
+static GF_Err ffmx_initialize(GF_Filter *filter)
+{
+	return ffmx_initialize_ex(filter, GF_FALSE);
+}
+static GF_Err ffmx_start_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, const char *seg_name)
+{
+	int i;
+	int res;
+
+	/*create a new output context, clone all streams from current one and swap output context*/
+	if (ctx->ffiles) {
+		AVFormatContext *segmux;
+
+		res = avformat_alloc_output_context2(&segmux, ctx->muxer->oformat, NULL, NULL);
+		if (res<0) {
+			return GF_IO_ERR;
+		}
+		segmux->interrupt_callback = ctx->muxer->interrupt_callback;
+		segmux->max_delay = ctx->muxer->max_delay;
+		av_dict_copy(&segmux->metadata, ctx->muxer->metadata, 0);
+		segmux->opaque = ctx->muxer->opaque;
+		segmux->io_close = ctx->muxer->io_close;
+		segmux->io_open = ctx->muxer->io_open;
+		segmux->flags = ctx->muxer->flags;
+
+		for (i=0; i< (s32) ctx->muxer->nb_streams; i++) {
+			u32 j;
+			AVStream *st;
+			AVCodecParameters *ipar, *opar;
+
+			if (!(st = avformat_new_stream(segmux, NULL)))
+				return GF_OUT_OF_MEM;
+			ipar = ctx->muxer->streams[i]->codecpar;
+			opar = st->codecpar;
+			avcodec_parameters_copy(opar, ipar);
+			if (!segmux->oformat->codec_tag ||
+				av_codec_get_id (segmux->oformat->codec_tag, ipar->codec_tag) == opar->codec_id ||
+				av_codec_get_tag(segmux->oformat->codec_tag, ipar->codec_id) <= 0) {
+				opar->codec_tag = ipar->codec_tag;
+			} else {
+				opar->codec_tag = 0;
+			}
+			st->sample_aspect_ratio = ctx->muxer->streams[i]->sample_aspect_ratio;
+			st->time_base = ctx->muxer->streams[i]->time_base;
+			st->avg_frame_rate = ctx->muxer->streams[i]->avg_frame_rate;
+
+			if (ctx->muxer->streams[i]->codecpar->codec_tag == MKTAG('t','m','c','d'))
+				st->codec->time_base = ctx->muxer->streams[i]->codec->time_base;
+
+			av_dict_copy(&st->metadata, ctx->muxer->streams[i]->metadata, 0);
+
+			/*reassign stream*/
+			for (j=0; j<gf_list_count(ctx->streams); j++) {
+				GF_FFMuxStream *ast = gf_list_get(ctx->streams, j);
+				if (ast->stream == ctx->muxer->streams[i]) {
+					ast->stream = st;
+					break;
+				}
+			}
+		}
+		//swap context
+		avformat_free_context(ctx->muxer);
+		ctx->muxer = segmux;
+	} else {
+		ctx->muxer->io_close(ctx->muxer, ctx->muxer->pb);
+		ctx->muxer->pb = NULL;
+	}
+
+//	av_freep(&ctx->muxer->url);
+//	ctx->muxer->url = av_strdup(seg_name);
+	strncpy(ctx->muxer->filename, seg_name, 1023);
+	ctx->muxer->filename[1023]=0;
+	ctx->offset_at_seg_start = 0;
+
+	if (!(ctx->muxer->oformat->flags & AVFMT_NOFILE)) {
+		//handle local urls some_dir/some_other_dir/file.ext, ffmpeg doesn't create the dirs for us
+		if (gf_url_is_local(seg_name)) {
+			FILE *f = gf_fopen(seg_name, "wb");
+			gf_fclose(f);
+		}
+
+		res = ctx->muxer->io_open(ctx->muxer, &ctx->muxer->pb, /*ctx->muxer->url*/seg_name, AVIO_FLAG_WRITE, NULL);
+		if (res < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Fail to open new segment %s - error %s\n", seg_name, av_err2str(res) ));
+			return GF_IO_ERR;
+		}
+	}
+	ctx->muxer->pb->seekable = 0;
+
+    if (ctx->muxer->oformat->priv_class && ctx->muxer->priv_data)
+        av_opt_set(ctx->muxer->priv_data, "mpegts_flags", "+resend_headers", 0);
+
+    if (ctx->ffiles) {
+        AVDictionary *options = NULL;
+        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 (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;
+		}
+    }
+	ctx->status = FFMX_STATE_HDR_DONE;
+	return GF_OK;
+}
+
+
+static GF_Err ffmx_close_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, Bool send_evt_only)
+{
+	GF_FilterEvent evt;
+	GF_FilterPid *pid;
+
+	av_write_frame(ctx->muxer, NULL);
+
+	if (!send_evt_only) {
+		int res=0;
+
+		if (ctx->ffiles) {
+			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));
+				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) ));
+			return GF_SERVICE_ERROR;
+		}
+		ctx->status = FFMX_STATE_TRAILER_DONE;
+	}
+	ctx->nb_pck_in_seg = 0;
+
+	pid = gf_filter_get_ipid(filter, 0);
+	GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, pid);
+	evt.seg_size.seg_url = NULL;
+
+	//init seg
+	if (!ctx->init_done) {
+		evt.seg_size.is_init = GF_TRUE;
+		ctx->init_done = GF_TRUE;
+	} else {
+		evt.seg_size.is_init = GF_FALSE;
+	}
+	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;
+	ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+
+	gf_filter_pid_send_event(pid, &evt);
+	return GF_OK;
+}
+
+static GF_Err ffmx_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
+	u32 nb_done, nb_segs_done, nb_suspended, i, nb_pids = gf_filter_get_ipid_count(filter);
+
+	if (ctx->status<FFMX_STATE_HDR_DONE) {
+		Bool all_ready = GF_TRUE;
+		Bool needs_reinit = (ctx->status==FFMX_STATE_ALLOC) ? GF_TRUE : GF_FALSE;
+
+		for (i=0; i<nb_pids; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
+			GF_FilterPacket *ipck = gf_filter_pid_get_packet(ipid);
+
+			if (needs_reinit) {
+				e = ffmx_configure_pid(filter, ipid, GF_FALSE);
+				if (e) return e;
+			}
+			if (!ipck) {
+				all_ready = GF_FALSE;
+				continue;
+			}
+
+			if (st->stream->codecpar->codec_type==AVMEDIA_TYPE_VIDEO) {
+				u8 ilced = gf_filter_pck_get_interlaced(ipck);
+				if (ilced==2) st->stream->codecpar->field_order = AV_FIELD_BB;
+				else if (ilced==1) st->stream->codecpar->field_order = AV_FIELD_TT;
+				else st->stream->codecpar->field_order = AV_FIELD_PROGRESSIVE;
+			}
+			else if (st->stream->codecpar->codec_type==AVMEDIA_TYPE_AUDIO) {
+				st->stream->codecpar->seek_preroll = gf_filter_pck_get_roll_info(ipck);
+			}
+		}
+		if (!all_ready || (ctx->status==FFMX_STATE_ALLOC)) return GF_OK;
+
+		//good to go, finalize mux
+		ffmx_init_mux(filter, ctx);
+	}
+	if (ctx->status==FFMX_STATE_EOS) return GF_EOS;
+	else if (ctx->status==FFMX_STATE_ERROR) return GF_SERVICE_ERROR;
+
+	nb_segs_done = 0;
+	nb_done = 0;
+	nb_suspended = 0;
+	for (i=0; i<nb_pids; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
+		if (!st) continue;
+		if (st->in_seg_flush) {
+			nb_segs_done ++;
+			continue;
+		}
+		if (st->suspended) {
+			nb_suspended++;
+			continue;
+		}
+
+		while (1) {
+			u64 cts;
+			int res;
+			const GF_PropertyValue *p;
+			u32 sap;
+			AVPacket ffpck;
+			GF_FilterPacket *ipck = gf_filter_pid_get_packet(ipid);
+			if (!ipck) {
+				if (gf_filter_pid_is_eos(ipid)) {
+					nb_done++;
+				}
+				break;
+			}
+			cts = gf_filter_pck_get_cts(ipck);
+
+			if (cts == GF_FILTER_NO_TS) {
+				p = gf_filter_pck_get_property(ipck, GF_PROP_PCK_EODS);
+				if (p && p->value.boolean) {
+					st->in_seg_flush = GF_TRUE;
+					nb_segs_done ++;
+					nb_done++;
+					gf_filter_pid_drop_packet(ipid);
+					break;
+				}
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Packet with no CTS assigned, cannot store to track, ignoring\n"));
+				gf_filter_pid_drop_packet(ipid);
+				continue;
+			}
+
+			p = gf_filter_pck_get_property(ipck, GF_PROP_PCK_FILENUM);
+			if (ctx->dash_mode) {
+				if (p) {
+					//flush segment
+					if (ctx->dash_seg_num && (p->value.uint != ctx->dash_seg_num)) {
+						st->in_seg_flush = GF_TRUE;
+						nb_segs_done++;
+						break;
+					}
+					ctx->dash_seg_num = p->value.uint;
+					//segment done, check if we switch file
+					p = gf_filter_pck_get_property(ipck, GF_PROP_PCK_FILENAME);
+					if (p && p->value.string) {
+						ffmx_close_seg(filter, ctx, GF_FALSE);
+						ffmx_start_seg(filter, ctx, p->value.string);
+					}
+					//otherwise close segment for event processing only
+					else
+						ffmx_close_seg(filter, ctx, GF_TRUE);
+				}
+			} else if (p) {
+				if (ctx->cur_file_idx_plus_one == p->value.uint+1) {
+				} else if (!st->suspended) {
+					st->suspended = GF_TRUE;
+					nb_suspended++;
+					break;
+				}
+			}
+
+			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;
+
+			if (ffpck.dts > ffpck.pts) {
+				st->cts_shift = (u32) (ffpck.dts - ffpck.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;
+			}
+			ffpck.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 (st->ts_rescale) {
+				av_packet_rescale_ts(&ffpck, st->in_scale, st->stream->time_base);
+			}
+
+			if (ctx->interleave) {
+				res = av_interleaved_write_frame(ctx->muxer, &ffpck);
+			} else {
+				res = av_write_frame(ctx->muxer, &ffpck);
+			}
+			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) ));
+				e = GF_IO_ERR;
+			}
+
+			gf_filter_pid_drop_packet(ipid);
+			ctx->nb_pck_in_seg++;
+		}
+	}
+
+	//done writing file
+	if (nb_suspended && (nb_suspended==nb_pids)) {
+		av_write_trailer(ctx->muxer);
+		if (ctx->muxer)	avformat_free_context(ctx->muxer);
+		ctx->muxer = NULL;
+		ctx->status = FFMX_STATE_ALLOC;
+		ffmx_initialize_ex(filter, GF_TRUE);
+		for (i=0; i<nb_pids; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
+			if (!st) continue;
+			st->suspended = GF_FALSE;
+			st->stream = 0;
+			ffmx_configure_pid(filter, ipid, GF_FALSE);
+		}
+		nb_done = 0;
+	}
+
+	//done writing segment
+	if (nb_segs_done==nb_pids) {
+		ctx->dash_seg_num = 0;
+		for (i=0; i<nb_pids; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			GF_FFMuxStream *st = gf_filter_pid_get_udta(ipid);
+			if (!st) continue;
+			st->in_seg_flush = GF_FALSE;
+		}
+	}
+
+	if (e) return e;
+
+	if (nb_done==nb_pids) {
+		if (ctx->status==FFMX_STATE_HDR_DONE) {
+			if (ctx->dash_mode) {
+				ffmx_close_seg(filter, ctx, GF_FALSE);
+			} else {
+				av_write_trailer(ctx->muxer);
+			}
+			ctx->status = FFMX_STATE_EOS;
+		}
+		return GF_EOS;
+	}
+	return GF_OK;
+}
+
+static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	int res;
+	AVStream *avst;
+	Bool check_disc = GF_FALSE;
+	u32 streamtype, codec_id;
+	u32 ff_codec_id, ff_st, ff_codec_tag;
+	const GF_PropertyValue *p, *dsi;
+	GF_FFMuxStream *st;
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
+
+	//disconnect of src pid (not yet supported)
+	if (is_remove) {
+		//one in one out, this is simple
+		return GF_OK;
+	}
+	st = gf_filter_pid_get_udta(pid);
+	if (st) {
+		if (ctx->status>FFMX_STATE_HDR_DONE)
+			check_disc = GF_TRUE;
+	} else {
+		if (ctx->status>FFMX_STATE_HDR_DONE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Cannot dynamically add new stream to %s, not supported\n", ctx->dst ));
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	streamtype = p->value.uint;
+
+	//not supported yet
+	if (streamtype==GF_STREAM_ENCRYPTED) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Cannot import protected stream, not supported\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) return GF_NOT_SUPPORTED;
+	codec_id = p->value.uint;
+
+	ff_st = ffmpeg_stream_type_from_gpac(streamtype);
+	if (codec_id==GF_CODECID_RAW) {
+		ff_codec_tag = 0;
+		if (streamtype==GF_STREAM_VISUAL) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (!p) return GF_NOT_SUPPORTED;
+			switch (p->value.uint) {
+			default:
+				ff_codec_id = AV_CODEC_ID_RAWVIDEO;
+				break;
+			}
+		} else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+			if (!p) return GF_NOT_SUPPORTED;
+
+			switch (p->value.uint) {
+			case GF_AUDIO_FMT_U8:
+			case GF_AUDIO_FMT_U8P:
+				ff_codec_id = AV_CODEC_ID_PCM_U8;
+				break;
+			case GF_AUDIO_FMT_S16:
+			case GF_AUDIO_FMT_S16P:
+				ff_codec_id = AV_CODEC_ID_PCM_S16LE;
+				break;
+			case GF_AUDIO_FMT_S24:
+			case GF_AUDIO_FMT_S24P:
+				ff_codec_id = AV_CODEC_ID_PCM_S24LE;
+				break;
+			case GF_AUDIO_FMT_S32:
+			case GF_AUDIO_FMT_S32P:
+				ff_codec_id = AV_CODEC_ID_PCM_S32LE;
+				break;
+			case GF_AUDIO_FMT_FLT:
+			case GF_AUDIO_FMT_FLTP:
+				ff_codec_id = AV_CODEC_ID_PCM_F32LE;
+				break;
+			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Unmapped raw audio format %s to FFMPEG, patch welcome\n", gf_audio_fmt_name(p->value.uint) ));
+				return GF_NOT_SUPPORTED;
+			}
+		}
+	} else {
+		ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
+	}
+
+	if (ctx->muxer->oformat && ctx->muxer->oformat->query_codec) {
+		res = ctx->muxer->oformat->query_codec(ff_codec_id, 1);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	const AVCodec *c = avcodec_find_decoder(ff_codec_id);
+	if (!c) return GF_NOT_SUPPORTED;
+
+	if (!st) {
+		GF_FilterEvent evt;
+
+		GF_SAFEALLOC(st, GF_FFMuxStream);
+		if (!st) return GF_OUT_OF_MEM;
+		gf_filter_pid_set_udta(pid, st);
+		gf_list_add(ctx->streams, st);
+
+		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "FFMux");
+		gf_filter_pid_send_event(pid, &evt);
+	}
+
+	if (ctx->status==FFMX_STATE_ALLOC) {
+		char szPath[GF_MAX_PATH];
+		const GF_PropertyValue *p;
+		const char *file_suffix = NULL;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pid))
+				return GF_SERVICE_ERROR;
+			return GF_OK;
+		}
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		ctx->cur_file_idx_plus_one = p ? (p->value.uint + 1) : 1;
+
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+		if (p && p->value.string) file_suffix = p->value.string;
+
+		gf_filter_pid_resolve_file_template(pid, ctx->dst, szPath, ctx->cur_file_idx_plus_one-1, file_suffix);
+		ffmx_open_url(ctx, szPath);
+	}
+
+
+	if (!st->stream) {
+		st->stream = avformat_new_stream(ctx->muxer, c);
+		if (!st->stream) return GF_NOT_SUPPORTED;
+	}
+	avst = st->stream;
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+
+	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;
+
+		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;
+		}
+	}
+
+	avst->codecpar->codec_id = ff_codec_id;
+	avst->codecpar->codec_type = ff_st;
+	avst->codecpar->codec_tag = ff_codec_tag;
+
+	if (dsi && dsi->value.data.ptr) {
+		if (avst->codecpar->extradata) av_free(avst->codecpar->extradata);
+		avst->codecpar->extradata_size = dsi->value.data.size;
+		avst->codecpar->extradata = av_malloc(avst->codecpar->extradata_size+ AV_INPUT_BUFFER_PADDING_SIZE);
+		if (avst->codecpar->extradata) {
+			memcpy(avst->codecpar->extradata, dsi->value.data.ptr, avst->codecpar->extradata_size);
+			memset(avst->codecpar->extradata + dsi->value.data.size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
+		}
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (p) avst->id = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) {
+		avst->time_base.den = p->value.uint;
+		avst->time_base.num = 1;
+	}
+	st->in_scale = avst->time_base;
+
+	avst->start_time = 0;
+	avst->duration = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p && p->value.lfrac.den) {
+		avst->duration = p->value.lfrac.num;
+		avst->duration *= avst->time_base.den;
+		avst->duration /= p->value.lfrac.den;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+	if (p) avst->codecpar->bit_rate = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CTS_SHIFT);
+	if (p) st->cts_shift = p->value.uint;
+
+	if (streamtype==GF_STREAM_VISUAL) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+		if (p) avst->codecpar->width = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+		if (p) avst->codecpar->height = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (p) {
+			avst->r_frame_rate.num = p->value.frac.num;
+			avst->r_frame_rate.den = p->value.frac.den;
+			avst->avg_frame_rate = avst->r_frame_rate;
+		}
+		if (codec_id==GF_CODECID_RAW) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (p) {
+				avst->codecpar->format = ffmpeg_pixfmt_from_gpac(p->value.uint);
+				avst->codecpar->codec_tag = avcodec_pix_fmt_to_codec_tag(avst->codecpar->format);
+			}
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+		if (p) {
+			avst->codecpar->sample_aspect_ratio.num = p->value.frac.num;
+			avst->codecpar->sample_aspect_ratio.den = p->value.frac.den;
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_PRIMARIES);
+		if (p) avst->codecpar->color_primaries = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_RANGE);
+		if (p) avst->codecpar->color_range = (p->value.uint==1) ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_TRANSFER);
+		if (p) avst->codecpar->color_trc = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_MX);
+		if (p) avst->codecpar->color_space = p->value.uint;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_COLR_CHROMALOC);
+		if (p) avst->codecpar->chroma_location = p->value.uint;
+
+		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;
+		}
+
+	}
+	else if (streamtype==GF_STREAM_AUDIO) {
+		u64 ch_layout;
+		u32 samplerate=0;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (p) avst->codecpar->sample_rate = samplerate = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		if (p) avst->codecpar->channels = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME);
+		if (p) avst->codecpar->frame_size = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_BPS);
+		if (p) avst->codecpar->bits_per_raw_sample = p->value.uint;
+		if (codec_id==GF_CODECID_RAW) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+			if (p) avst->codecpar->format =  ffmpeg_audio_fmt_from_gpac(p->value.uint);
+		}
+
+		ch_layout = AV_CH_LAYOUT_MONO;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+		if (p)
+			ch_layout = p->value.longuint;
+		else if (avst->codecpar->channels==2)
+			ch_layout = AV_CH_LAYOUT_STEREO;
+		avst->codecpar->channel_layout = ffmpeg_channel_layout_from_gpac(ch_layout);
+
+		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;
+			if (st->in_scale.den != samplerate) {
+				avst->codecpar->initial_padding *= samplerate;
+				avst->codecpar->initial_padding /= st->in_scale.den;
+			}
+		}
+		/*
+		//not mapped in gpac
+		int trailing_padding;
+		*/
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	if (p && (p->value.uint==1)) {
+		ctx->dash_mode = GF_TRUE;
+	}
+
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static void ffmx_finalize(GF_Filter *filter)
+{
+	GF_FFMuxCtx *ctx = (GF_FFMuxCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->status==FFMX_STATE_HDR_DONE) {
+		if (ctx->dash_mode) {
+			ffmx_close_seg(filter, ctx, GF_FALSE);
+		} else {
+			av_write_trailer(ctx->muxer);
+		}
+		ctx->status = FFMX_STATE_TRAILER_DONE;
+	}
+
+	if (ctx->options) av_dict_free(&ctx->options);
+	if (ctx->muxer)	avformat_free_context(ctx->muxer);
+	while (gf_list_count(ctx->streams)) {
+		GF_FFMuxStream *st = gf_list_pop_back(ctx->streams);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	if (ctx->avio_ctx) {
+		if (ctx->avio_ctx->buffer) av_freep(&ctx->avio_ctx->buffer);
+		av_freep(&ctx->avio_ctx);
+	}
+	if (ctx->gfio) gf_fclose(ctx->gfio);
+	return;
+}
+
+static GF_Err ffmx_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	s32 res;
+	GF_FFMuxCtx *ctx = gf_filter_get_udta(filter);
+
+	//initial parsing of arguments
+	if (!ctx->muxer) {
+		switch (arg_val->type) {
+		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 ));
+			}
+			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 ));
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+	//updates of arguments, not supported for ffmpeg decoders
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_FilterProbeScore ffmx_probe_url(const char *url, const char *mime)
+{
+	const char *proto;
+	if (url && !strncmp(url, "gfio://", 7)) {
+		url = gf_fileio_translate_url(url);
+	}
+	if (!url)
+		return GF_FPROBE_NOT_SUPPORTED;
+
+
+	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);
+
+	if (ofmt) return GF_FPROBE_SUPPORTED;
+
+	proto = strstr(url, "://");
+	if (!proto)
+		return GF_FPROBE_NOT_SUPPORTED;
+
+	proto = avio_find_protocol_name(url);
+	if (proto)
+		return GF_FPROBE_MAYBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static const GF_FilterCapability FFMuxCaps[] =
+{
+	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),
+	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),
+
+#ifdef FF_SUB_SUPPORT
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+#endif
+};
+
+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"
+		"\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"
+		"\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"
+	)
+	.private_size = sizeof(GF_FFMuxCtx),
+	SETCAPS(FFMuxCaps),
+	.initialize = ffmx_initialize,
+	.finalize = ffmx_finalize,
+	.configure_pid = ffmx_configure_pid,
+	.process = ffmx_process,
+	.update_arg = ffmx_update_arg,
+	.probe_url = ffmx_probe_url,
+	.flags = GF_FS_REG_META,
+	.max_extra_pids = (u32) -1,
+
+
+	//use lowest priorty, so that we still use our default built-in muxers
+	.priority = 255
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_FFMuxCtx, _n)
+
+
+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(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(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},
+	{0}
+};
+
+const int FFMX_STATIC_ARGS = (sizeof (FFMuxArgs) / sizeof (GF_FilterArgs)) - 1;
+
+const GF_FilterRegister *ffmx_register(GF_FilterSession *session)
+{
+	ffmpeg_build_register(session, &FFMuxRegister, FFMuxArgs, FFMX_STATIC_ARGS, FF_REG_TYPE_MUX);
+	return &FFMuxRegister;
+}
+
+#else
+#include <gpac/filters.h>
+const GF_FilterRegister *ffmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif
+

gpac-1.0.0.tar.gz/src/filters/ff_rescale.c Added

@@ -0,0 +1,422 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ffmpeg video rescaler 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/setup.h>
+
+#ifdef GPAC_HAS_FFMPEG
+
+#include "ff_common.h"
+
+typedef struct
+{
+	//options
+	GF_PropVec2i osize;
+	u32 ofmt, scale;
+	Double p1, p2;
+
+	//internal data
+	Bool initialized;
+
+	GF_FilterPid *ipid, *opid;
+	u32 w, h, stride, s_pfmt;
+	GF_Fraction ar;
+	Bool passthrough;
+
+	struct SwsContext *swscaler;
+
+	u32 dst_stride[5];
+	u32 src_stride[5];
+	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;
+
+} GF_FFSWScaleCtx;
+
+static GF_Err ffsws_process(GF_Filter *filter)
+{
+	const char *data;
+	u8 *output;
+	u32 osize;
+	s32 res;
+	u8 *src_planes[5];
+	u8 *dst_planes[5];
+	GF_FilterPacket *dst_pck;
+	GF_FilterFrameInterface *frame_ifce;
+	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+
+	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->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	//not yet configured
+	if (!ctx->ofmt && !ctx->ow && !ctx->oh)
+		return GF_OK;
+
+	if (!ctx->swscaler) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	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
+	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);
+		return GF_NOT_SUPPORTED;
+	}
+
+	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;
+	}
+	gf_filter_pck_merge_properties(pck, dst_pck);
+
+	if (data) {
+		src_planes[0] = (u8 *) data;
+
+		if (ctx->nb_src_planes==1) {
+		} else if (ctx->nb_src_planes==2) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0]*ctx->h;
+		} else if (ctx->nb_src_planes==3) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+		} else if (ctx->nb_src_planes==4) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+			src_planes[3] = src_planes[2] + ctx->src_stride[2] * ctx->src_uv_height;
+		}
+	} else if (frame_ifce && frame_ifce->get_plane) {
+		u32 i=0;
+		for (i=0; i<ctx->nb_src_planes; i++) {
+			if (frame_ifce->get_plane(frame_ifce, i, (const u8 **) &src_planes[i], &ctx->src_stride[i])!=GF_OK)
+				break;
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] No data associated with packet, not supported\n"));
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+	dst_planes[0] = output;
+	if (ctx->nb_planes==1) {
+	} else if (ctx->nb_planes==2) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->oh;
+	} 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;
+	} 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;
+	}
+
+	//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) {
+		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);
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->swap_idx_1 || ctx->swap_idx_2) {
+		u32 i, j;
+		for (i=0; i<ctx->h; i++) {
+			u8 *dst = output + ctx->dst_stride[0]*i;
+			for (j=0; j<ctx->dst_stride[0]; j+=4) {
+				u8 tmp = dst[ctx->swap_idx_1];
+				dst[ctx->swap_idx_1] = dst[ctx->swap_idx_2];
+				dst[ctx->swap_idx_2] = tmp;
+				dst += 4;
+			}
+		}
+	}
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static u32 get_sws_mode(u32 mode, u32 *has_param)
+{
+	switch (mode) {
+	case 0: return SWS_FAST_BILINEAR;
+	case 1: return SWS_BILINEAR;
+	case 2: *has_param = 2; return SWS_BICUBIC;
+	case 3: return SWS_X;
+	case 4: return SWS_POINT;
+	case 5: return SWS_AREA;
+	case 6: return SWS_BICUBLIN;
+	case 7: *has_param = 1; return SWS_GAUSS;
+	case 8: return SWS_SINC;
+	case 9: *has_param = 1; return SWS_LANCZOS;
+	case 10: return SWS_SPLINE;
+	default: break;
+	}
+	*has_param = 2;
+	return SWS_BICUBIC;
+}
+
+static GF_Err ffsws_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 w, h, stride, ofmt;
+	GF_Fraction sar;
+	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);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+
+	if (!ctx->ipid) {
+		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)
+		return GF_OK;
+
+
+
+	w = h = ofmt = stride = 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_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) ofmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+	if (p) sar = p->value.frac;
+	else sar.den = sar.num = 1;
+
+	//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;
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+
+	if (!ctx->ofmt)
+		ctx->ofmt = ofmt;
+
+	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)) {
+		//nothing to reconfigure
+	}
+	//passthrough mode
+	else if ((ctx->ow == w) && (ctx->oh == h) && (ctx->s_pfmt == ofmt) && (ofmt==ctx->ofmt) ) {
+		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;
+	} else {
+		u32 nb_par = 0;
+		nb_par = 0;
+		Bool res;
+		u32 mode = get_sws_mode(ctx->scale, &nb_par);
+		u32 ff_src_pfmt = ffmpeg_pixfmt_from_gpac(ofmt);
+		u32 ff_dst_pfmt = ffmpeg_pixfmt_from_gpac(ctx->ofmt);
+
+		//get layout info for source
+		memset(ctx->src_stride, 0, sizeof(ctx->src_stride));
+		if (ctx->stride) ctx->src_stride[0] = ctx->stride;
+
+
+		res = gf_pixel_get_size_info(ofmt, w, h, &ctx->out_src_size, &ctx->src_stride[0], &ctx->src_stride[1], &ctx->nb_src_planes, &ctx->src_uv_height);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] Failed to query source pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		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];
+
+		//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);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] Failed to query output pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (ctx->nb_planes==3) ctx->dst_stride[2] = ctx->dst_stride[1];
+		if (ctx->nb_planes==4) ctx->dst_stride[3] = ctx->dst_stride[0];
+
+
+		if (nb_par) {
+			if ((nb_par==1) && (ctx->p1!=GF_MAX_DOUBLE) ) {
+				par[0] = ctx->p1;
+				par_p = (Double *)par;
+			} else if ((nb_par==2) && (ctx->p1!=GF_MAX_DOUBLE) && (ctx->p2!=GF_MAX_DOUBLE)) {
+				par[0] = ctx->p1;
+				par[1] = ctx->p2;
+				par_p = (Double *)par;
+			}
+		}
+		//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);
+
+		if (!ctx->swscaler) {
+#ifndef GPAC_DISABLE_LOG
+			Bool in_ok = sws_isSupportedInput(ff_src_pfmt);
+			Bool out_ok = sws_isSupportedInput(ff_dst_pfmt);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[FFSWS] Cannot allocate context for required format - input %s output %s\n", in_ok ? "OK" : "not supported" , out_ok ? "OK" : "not supported"));
+#endif
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->w = w;
+		ctx->h = h;
+		ctx->s_pfmt = ofmt;
+		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 (ctx->s_pfmt != ctx->ofmt) {
+			if (ctx->ofmt==GF_PIXEL_VYUY) {
+				ctx->swap_idx_1 = 0;
+				ctx->swap_idx_2 = 2;
+			}
+			else if (ctx->ofmt==GF_PIXEL_YVYU) {
+				ctx->swap_idx_1 = 1;
+				ctx->swap_idx_2 = 3;
+			}
+		}
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->ow));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->oh));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->dst_stride[0]));
+	if (ctx->nb_planes>1)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(ctx->dst_stride[1]));
+
+	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) );
+	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);
+	return;
+}
+
+
+static GF_Err ffsws_reconfigure_output(GF_Filter *filter, GF_FilterPid *pid)
+{
+	const GF_PropertyValue *p;
+	GF_FFSWScaleCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->opid != pid) return GF_BAD_PARAM;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_WIDTH);
+	if (p) ctx->osize.x = p->value.uint;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_HEIGHT);
+	if (p) ctx->osize.y = p->value.uint;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_PIXFMT);
+	if (p) ctx->ofmt = p->value.uint;
+	return ffsws_configure_pid(filter, ctx->ipid, GF_FALSE);
+}
+
+
+#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(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},
+	{0}
+};
+
+static const GF_FilterCapability FFSWSCaps[] =
+{
+	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)
+};
+
+
+GF_FilterRegister FFSWSRegister = {
+	.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")
+
+	.private_size = sizeof(GF_FFSWScaleCtx),
+	.args = FFSWSArgs,
+	.configure_pid = ffsws_configure_pid,
+	SETCAPS(FFSWSCaps),
+	.finalize = ffsws_finalize,
+	.process = ffsws_process,
+	.reconfigure_output = ffsws_reconfigure_output,
+};
+
+#else
+#include <gpac/filters.h>
+#endif //GPAC_HAS_FFMPEG
+
+const GF_FilterRegister *ffsws_register(GF_FilterSession *session)
+{
+#ifdef GPAC_HAS_FFMPEG
+	FFSWSArgs[1].min_max_enum = gf_pixel_fmt_all_names();
+	return &FFSWSRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/filelist.c Added

@@ -0,0 +1,895 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / file concatenator 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+#include <gpac/avparse.h>
+#endif
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	GF_FilterPid *opid;
+	u32 stream_type;
+	//in current timescale
+	u64 max_cts, max_dts;
+	u32 o_timescale, timescale;
+	//in original timescale
+	u64 cts_o, dts_o;
+	Bool single_frame;
+	Bool is_eos;
+	u64 dts_sub;
+	u64 first_dts_plus_one;
+
+	Bool is_playing;
+} FileListPid;
+
+typedef struct
+{
+	char *file_name;
+	u64 last_mod_time;
+	u64 file_size;
+} FileListEntry;
+
+enum
+{
+	FL_SORT_NONE=0,
+	FL_SORT_NAME,
+	FL_SORT_SIZE,
+	FL_SORT_DATE,
+	FL_SORT_DATEX,
+};
+
+typedef struct
+{
+	//opts
+	Bool revert;
+	s32 floop;
+	u32 fsort;
+	GF_List *srcs;
+	GF_Fraction fdur;
+	u32 timescale;
+
+	GF_FilterPid *file_pid;
+	char *file_path;
+	u32 last_url_crc;
+	u32 last_url_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;
+
+	u32 nb_repeat;
+	Double start, stop;
+
+	GF_List *file_list;
+	s32 file_list_idx;
+
+	u64 current_file_dur;
+
+	char szCom[GF_MAX_PATH];
+} GF_FileListCtx;
+
+static const GF_FilterCapability FileListCapsSrc[] =
+{
+	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),
+};
+
+static void filelist_start_ipid(GF_FileListCtx *ctx, FileListPid *iopid)
+{
+	GF_FilterEvent evt;
+	iopid->is_eos = GF_FALSE;
+
+	//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);
+
+	//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;
+
+	iopid->cts_o = ctx->cts_offset;
+	iopid->cts_o *= iopid->o_timescale;
+	iopid->cts_o /= 1000000;
+	iopid->max_cts = iopid->max_dts = 0;
+
+	iopid->first_dts_plus_one = 0;
+}
+
+GF_Err filelist_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	FileListPid *iopid;
+	const GF_PropertyValue *p;
+	u32 i, count;
+	Bool reassign = GF_FALSE;
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (pid==ctx->file_pid)
+			ctx->file_pid = NULL;
+		else {
+			iopid = gf_filter_pid_get_udta(pid);
+			if (iopid) iopid->ipid = NULL;
+		}
+		return GF_OK;
+	}
+
+	if (!ctx->file_pid && !ctx->file_list) {
+		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);
+
+		//we will declare pids later
+
+		//from now on we only accept the above caps
+		gf_filter_override_caps(filter, FileListCapsSrc, 2);
+	}
+	if (ctx->file_pid == pid) return GF_OK;
+
+	iopid = NULL;
+	count = gf_list_count(ctx->io_pids);
+	for (i=0; i<count; i++) {
+		iopid = gf_list_get(ctx->io_pids, i);
+		if (iopid->ipid==pid) break;
+		//check matching stream types if out pit not connected, and reuse if matching
+		if (!iopid->ipid) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+			assert(p);
+			if (p->value.uint == iopid->stream_type) {
+				iopid->ipid = pid;
+				iopid->timescale = gf_filter_pid_get_timescale(pid);
+				reassign = GF_TRUE;
+				break;
+			}
+		}
+		iopid = NULL;
+	}
+
+	if (!iopid) {
+		GF_SAFEALLOC(iopid, FileListPid);
+		if (!iopid) return GF_OUT_OF_MEM;
+		iopid->ipid = pid;
+		if (ctx->timescale) iopid->o_timescale = ctx->timescale;
+		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);
+	}
+	gf_filter_pid_set_udta(pid, iopid);
+
+	if (!iopid->opid) {
+		iopid->opid = gf_filter_pid_new(filter);
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		assert(p);
+		iopid->stream_type = p->value.uint;
+	}
+
+	gf_filter_pid_reset_properties(iopid->opid);
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(iopid->opid, iopid->ipid);
+	//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 );
+
+	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;
+	}
+#endif
+
+	//if we reattached the input, we must send a play request
+	if (reassign) {
+		filelist_start_ipid(ctx, iopid);
+	}
+	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;
+}
+
+static Bool filelist_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i, count;
+	FileListPid *iopid;
+	GF_FilterEvent fevt;
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+
+	//manually forward event to all input, except our file in pid
+	memcpy(&fevt, evt, sizeof(GF_FilterEvent));
+	count = gf_list_count(ctx->io_pids);
+	for (i=0; i<count; i++) {
+		iopid = gf_list_get(ctx->io_pids, i);
+		if (!iopid->ipid) 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->is_eos = GF_FALSE;
+		} else if (evt->base.type==GF_FEVT_STOP) {
+			iopid->is_playing = GF_FALSE;
+			iopid->is_eos = GF_TRUE;
+		}
+		gf_filter_pid_send_event(iopid->ipid, &fevt);
+	}
+	//and cancel
+	return GF_TRUE;
+}
+
+void filelist_parse_arg(char *com, char *name, Bool is_float, u32 *int_val, Double *float_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 (is_float) (*float_val) = atof(val);
+		else (*int_val) = atoi(val);
+		if (sep) sep[0] = c;
+	}
+}
+
+Bool filelist_next_url(GF_FileListCtx *ctx, char szURL[GF_MAX_PATH])
+{
+	u32 len;
+	Bool last_found = GF_FALSE;
+	FILE *f;
+	u32 nb_repeat=0, lineno=0;
+	Double start=0, stop=0;
+
+	if (ctx->file_list) {
+		FileListEntry *fentry, *next;
+
+		if (ctx->revert) {
+			if (!ctx->file_list_idx) {
+				if (!ctx->floop) return GF_FALSE;
+				if (ctx->floop>0) ctx->floop--;
+				ctx->file_list_idx = gf_list_count(ctx->file_list);
+			}
+			ctx->file_list_idx --;
+		} else {
+			ctx->file_list_idx ++;
+			if (ctx->file_list_idx >= (s32) gf_list_count(ctx->file_list)) {
+				if (!ctx->floop) return GF_FALSE;
+				if (ctx->floop>0) ctx->floop--;
+				ctx->file_list_idx = 0;
+			}
+		}
+		fentry = gf_list_get(ctx->file_list, ctx->file_list_idx);
+		strncpy(szURL, fentry->file_name, sizeof(char)*(GF_MAX_PATH-1) );
+		szURL[GF_MAX_PATH-1] = 0;
+		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;
+		return GF_TRUE;
+	}
+
+
+	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)) {
+			if (ctx->floop != 0) {
+				gf_fseek(f, 0, SEEK_SET);
+				//load first line
+				last_found = GF_TRUE;
+				continue;
+			}
+			gf_fclose(f);
+			return GF_FALSE;
+		}
+		lineno++;
+
+		len = (u32) strlen(szURL);
+		while (len && strchr("\n\r\t ", szURL[len-1])) {
+			szURL[len-1] = 0;
+			len--;
+		}
+		if (!len) continue;
+
+		//comment
+		if (szURL[0] == '#') {
+			nb_repeat=0;
+			start=stop=0;
+			filelist_parse_arg(szURL, "repeat=", GF_FALSE, &nb_repeat, NULL);
+			filelist_parse_arg(szURL, "start=", GF_TRUE, NULL, &start);
+			filelist_parse_arg(szURL, "stop=", GF_TRUE, NULL, &stop);
+			strcpy(ctx->szCom, szURL);
+			continue;
+		}
+		crc = gf_crc_32(szURL, (u32) strlen(szURL) );
+		if (!ctx->last_url_crc) {
+			ctx->last_url_crc = crc;
+			ctx->last_url_lineno = lineno;
+			break;
+		}
+		if ((ctx->last_url_crc == crc) && (ctx->last_url_lineno == lineno)) {
+			last_found = GF_TRUE;
+			nb_repeat=0;
+			start=stop=0;
+			ctx->szCom[0] = 0;
+			continue;
+		}
+		if (last_found) {
+			ctx->last_url_crc = crc;
+			ctx->last_url_lineno = lineno;
+			break;
+		}
+		nb_repeat=0;
+		start=stop=0;
+		ctx->szCom[0] = 0;
+	}
+	gf_fclose(f);
+
+	len = (u32) strlen(szURL);
+	while (len && strchr("\r\n", szURL[len-1])) {
+		szURL[len-1] = 0;
+		len--;
+	}
+	ctx->nb_repeat = nb_repeat;
+	ctx->start = start;
+	ctx->stop = stop;
+	return GF_TRUE;
+}
+
+GF_Err filelist_process(GF_Filter *filter)
+{
+	Bool start, end;
+	GF_Err e;
+	u32 i, count, nb_done, nb_inactive;
+	FileListPid *iopid;
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->is_eos)
+		return GF_EOS;
+
+	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) {
+					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;
+				}
+			}
+		}
+	}
+
+	count = gf_list_count(ctx->io_pids);
+
+	if (ctx->load_next) {
+		GF_Filter *fsrc;
+		char *url;
+		char szURL[GF_MAX_PATH];
+
+		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;
+
+		if (! filelist_next_url(ctx, szURL)) {
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				gf_filter_pid_set_eos(iopid->opid);
+				iopid->ipid = NULL;
+			}
+			ctx->is_eos = GF_TRUE;
+			return GF_EOS;
+		}
+		url = szURL;
+		while (url) {
+			char *sep = strstr(url, " && ");
+			if (sep) sep[0] = 0;
+
+			fsrc = gf_filter_connect_source(filter, url, ctx->file_path, &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;
+		}
+		//wait for PIDs to connect
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[FileList] Switching to file %s\n", szURL));
+	}
+
+	//init first timestamp
+	if (!ctx->dts_sub_plus_one) {
+		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 (!pck) 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;
+	 	}
+		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;
+		}
+	}
+
+	nb_done = nb_inactive = 0;
+	for (i=0; i<count; i++) {
+		iopid = gf_list_get(ctx->io_pids, i);
+		if (!iopid->ipid) {
+			nb_inactive++;
+			continue;
+		}
+		if (iopid->is_eos) {
+			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;
+			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 (iopid->is_eos)
+					nb_done++;
+				break;
+			}
+
+			if (gf_filter_pid_would_block(iopid->opid))
+				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 (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->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)) {
+					iopid->is_eos = GF_TRUE;
+					nb_done++;
+					break;
+				}
+			}
+		}
+	}
+	if ((nb_inactive!=count) && (nb_done+nb_inactive==count)) {
+		//compute max cts and dts in 1Mhz timescale
+		u64 max_cts = 0, max_dts = 0;
+
+		if (gf_filter_end_of_session(filter)) {
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				gf_filter_pid_set_eos(iopid->opid);
+			}
+			ctx->is_eos = GF_TRUE;
+			return GF_EOS;
+		}
+		ctx->dts_sub_plus_one = 0;
+		for (i=0; i<count; i++) {
+			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;
+
+				ts = iopid->max_dts - iopid->dts_sub;
+				ts *= 1000000;
+				ts /= iopid->timescale;
+				if (max_dts < ts) max_dts = ts;
+			}
+		}
+		ctx->cts_offset += max_dts;
+		ctx->dts_offset += max_dts;
+
+		if (ctx->nb_repeat) {
+			ctx->nb_repeat--;
+			for (i=0; i<count; i++) {
+				GF_FilterEvent evt;
+				iopid = gf_list_get(ctx->io_pids, i);
+				if (!iopid->ipid) continue;
+
+				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);
+			}
+		} else {
+			//detach all input pids and
+			for (i=0; i<count; i++) {
+				iopid = gf_list_get(ctx->io_pids, i);
+				iopid->ipid = NULL;
+			}
+			//force load
+			ctx->load_next = GF_TRUE;
+			return filelist_process(filter);
+		}
+	}
+	return GF_OK;
+}
+
+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));
+	if (ctx->fsort==FL_SORT_NONE) {
+		gf_list_add(ctx->file_list, fentry);
+		return;
+	}
+	count = gf_list_count(ctx->file_list);
+	for (i=0; i<count; i++) {
+		Bool insert=GF_FALSE;
+		FileListEntry *cur = gf_list_get(ctx->file_list, i);
+		switch (ctx->fsort) {
+		case FL_SORT_SIZE:
+			if (cur->file_size>fentry->file_size) insert = GF_TRUE;
+			break;
+		case FL_SORT_DATE:
+		case FL_SORT_DATEX:
+			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;
+			break;
+		}
+		if (insert) {
+			gf_list_insert(ctx->file_list, fentry, i);
+			return;
+		}
+	}
+	gf_list_add(ctx->file_list, fentry);
+}
+
+Bool filelist_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	FileListEntry *fentry;
+	GF_FileListCtx *ctx = cbck;
+	if (file_info->hidden) return GF_FALSE;
+	if (file_info->directory) return GF_FALSE;
+	if (file_info->drive) return GF_FALSE;
+	if (file_info->system) return GF_FALSE;
+
+	GF_SAFEALLOC(fentry, FileListEntry);
+	if (!fentry) return GF_TRUE;
+
+	fentry->file_name = gf_strdup(item_path);
+	fentry->file_size = file_info->size;
+	fentry->last_mod_time = file_info->last_modified;
+	filelist_add_entry(ctx, fentry);
+
+	return GF_FALSE;
+}
+
+GF_Err filelist_initialize(GF_Filter *filter)
+{
+	u32 i, count;
+	char *sep_dir, c=0, *dir, *pattern;
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+	ctx->io_pids = gf_list_new();
+
+	if (!ctx->srcs || !gf_list_count(ctx->srcs)) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[FileList] No inputs\n"));
+		//not completely correct, needs further testing
+#if 0
+		if (!gf_filter_connections_pending(filter)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[FileList] No source specified and no input PIDs pending, cannot instantiate\n"));
+			return GF_BAD_PARAM;
+		}
+#endif
+		return GF_OK;
+	}
+	ctx->filter_srcs = gf_list_new();
+	ctx->file_list = gf_list_new();
+	count = gf_list_count(ctx->srcs);
+	for (i=0; i<count; i++) {
+		char *list = gf_list_get(ctx->srcs, i);
+
+		if (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;
+			} else {
+				dir = ".";
+				pattern = list;
+			}
+			gf_enum_directory(dir, GF_FALSE, filelist_enum, ctx, pattern);
+			if (c && sep_dir) sep_dir[0] = c;
+		} else {
+			if (gf_file_exists(list)) {
+				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);
+					}
+					filelist_add_entry(ctx, fentry);
+				}
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[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));
+		return GF_BAD_PARAM;
+	}
+	if (ctx->fsort==FL_SORT_DATEX) {
+		ctx->revert = GF_FALSE;
+		ctx->floop = 0;
+	}
+	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);
+	//and we act as a source, request processing
+	gf_filter_post_process_task(filter);
+	//prevent deconnection of filter when no input
+	gf_filter_make_sticky(filter);
+	return GF_OK;
+}
+
+void filelist_finalize(GF_Filter *filter)
+{
+	GF_FileListCtx *ctx = gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->io_pids)) {
+		FileListPid *iopid = gf_list_pop_back(ctx->io_pids);
+		gf_free(iopid);
+	}
+	if (ctx->file_list) {
+		while (gf_list_count(ctx->file_list)) {
+			FileListEntry *fentry = gf_list_pop_back(ctx->file_list);
+			gf_free(fentry->file_name);
+			gf_free(fentry);
+		}
+		gf_list_del(ctx->file_list);
+	}
+	gf_list_del(ctx->io_pids);
+	gf_list_del(ctx->filter_srcs);
+	if (ctx->file_path) gf_free(ctx->file_path);
+}
+
+
+#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(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"
+		, GF_PROP_UINT, "no", "no|name|size|date|datex", 0},
+	{0}
+};
+
+
+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_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+
+GF_FilterRegister FileListRegister = {
+	.name = "flist",
+	GF_FS_SET_DESCRIPTION("Sources concatenator")
+	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"
+		"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"
+		"\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"
+		"- options [-floop](), [-revert]() and [-dur]() are ignored\n"
+		"- the files are sorted by modification time\n"
+		"- the first frame is assigned a timestamp of 0\n"
+		"- 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"
+		"# 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)\n"
+		"Warning: This may not work with some files/formats not supporting seeking\n"
+		"- stop=T: stops source playback after T seconds (double format only)\n"
+		"This works on any source (implemented independently from seek support).\n"
+		"\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"
+		"\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"
+		"EX audio.mp4 && video.mp4\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")
+	.private_size = sizeof(GF_FileListCtx),
+	.max_extra_pids = -1,
+	.flags = GF_FS_REG_ACT_AS_SOURCE | GF_FS_REG_REQUIRES_RESOLVER,
+	.args = GF_FileListArgs,
+	.initialize = filelist_initialize,
+	.finalize = filelist_finalize,
+	SETCAPS(FileListCaps),
+	.configure_pid = filelist_configure_pid,
+	.process = filelist_process,
+	.process_event = filelist_process_event
+};
+
+const GF_FilterRegister *filelist_register(GF_FilterSession *session)
+{
+	return &FileListRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/hevcmerge.c Added

@@ -0,0 +1,1652 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *					 Yacine Mathurin Boubacar Aziakou
+ *					 Samir Mustapha
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / HEVC tile merger 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/bitstream.h>
+#include <gpac/filters.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+#include <math.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	GF_FilterPid *pid;
+	u32 slice_segment_address, width, height;
+	Bool in_error;
+
+	u32 nalu_size_length;
+	u32 dsi_crc;
+	HEVCState hevc_state;
+
+	//final position in grid - the row index is only used to push non multiple of CU height at the bottom of the grid
+	u32 pos_row, pos_col;
+
+	//timescale of source pid
+	//number of packets processed
+	u32 timescale;
+	u32 nb_pck;
+
+	//true if positioning in pixel is given
+	Bool has_pos;
+	// >=0: positioning in pixel in the Y plane as given by CropOrigin
+	// <=0: positioning relative to top-left tile
+	s32 pos_x, pos_y;
+} HEVCTilePidCtx;
+
+
+typedef struct {
+	//width of column
+	u32 width;
+	//cumulated height of all slices in column
+	u32 height;
+	//only used while computing the grid, current position in rows in the column
+	u32 row_pos, max_row_pos;
+	u32 last_row_idx;
+	u32 pos_x;
+} HEVCGridInfo;
+
+typedef struct
+{
+	//options
+	Bool strict, mrows;
+
+	GF_FilterPid *opid;
+	s32 base_pps_init_qp_delta_minus26;
+	u32 nb_bits_per_address_dst;
+	u32 out_width, out_height;
+	u8 *buffer_nal, *buffer_nal_no_epb, *buffer_nal_in_no_epb;
+	u32 buffer_nal_alloc, buffer_nal_no_epb_alloc, buffer_nal_in_no_epb_alloc;
+	GF_BitStream *bs_au_in;
+
+	GF_BitStream *bs_nal_in;
+	GF_BitStream *bs_nal_out;
+
+	HEVCGridInfo *grid;
+	u32 nb_cols;
+
+	u8 *sei_suffix_buf;
+	u32 sei_suffix_len, sei_suffix_alloc;
+	u32 hevc_nalu_size_length;
+	u32 max_CU_width, max_CU_height;
+
+	GF_List *pids, *ordered_pids;
+	Bool in_error;
+	Bool enable_multi_rows;
+	u32 nb_rows;
+} GF_HEVCMergeCtx;
+
+//in src/filters/hevcsplit.c
+void hevc_rewrite_sps(char *in_SPS, u32 in_SPS_length, u32 width, u32 height, char **out_SPS, u32 *out_SPS_length);
+
+#if 0 //todo
+//rewrite the profile and level
+static void write_profile_tier_level(GF_BitStream *ctx->bs_nal_in, GF_BitStream *ctx->bs_nal_out, Bool ProfilePresentFlag, u8 MaxNumSubLayersMinus1)
+{
+	u8 j;
+	Bool sub_layer_profile_present_flag[8], sub_layer_level_present_flag[8];
+	if (ProfilePresentFlag) {
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 8), 8);
+		gf_bs_write_long_int(ctx->bs_nal_out, gf_bs_read_long_int(ctx->bs_nal_in, 32), 32);
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 4), 4);
+		gf_bs_write_long_int(ctx->bs_nal_out, gf_bs_read_long_int(ctx->bs_nal_in, 44), 44);
+	}
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 8), 8);
+
+	for (j = 0; j < MaxNumSubLayersMinus1; j++) {
+		sub_layer_profile_present_flag[j] = gf_bs_read_int(ctx->bs_nal_in, 1);
+		gf_bs_write_int(ctx->bs_nal_out, sub_layer_profile_present_flag[j], 1);
+		sub_layer_level_present_flag[j] = gf_bs_read_int(ctx->bs_nal_in, 1);
+		gf_bs_write_int(ctx->bs_nal_out, sub_layer_level_present_flag[j], 1);
+	}
+	if (MaxNumSubLayersMinus1 > 0)
+		for (j = MaxNumSubLayersMinus1; j < 8; j++)
+			gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 2), 2);
+
+
+	for (j = 0; j < MaxNumSubLayersMinus1; j++) {
+		if (sub_layer_profile_present_flag[j]) {
+			gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 8), 8);
+			gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 32), 32);
+			gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 4), 4);
+			gf_bs_write_long_int(ctx->bs_nal_out, gf_bs_read_long_int(ctx->bs_nal_in, 44), 44);
+		}
+		if (sub_layer_level_present_flag[j])
+			gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 8), 8);
+	}
+}
+#endif
+
+static void hevcmerge_rewrite_pps(GF_HEVCMergeCtx *ctx, char *in_PPS, u32 in_PPS_length, char **out_PPS, u32 *out_PPS_length)
+{
+	u8 cu_qp_delta_enabled_flag;
+	u32 loop_filter_flag;
+	u32 pps_size_no_epb;
+
+	gf_bs_reassign_buffer(ctx->bs_nal_in, in_PPS, in_PPS_length);
+	gf_bs_enable_emulation_byte_removal(ctx->bs_nal_in, GF_TRUE);
+	if (!ctx->bs_nal_out) ctx->bs_nal_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_nal_out, ctx->buffer_nal_no_epb, ctx->buffer_nal_no_epb_alloc);
+
+	//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_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_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_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
+	//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);
+	} else {
+		gf_bs_set_ue(ctx->bs_nal_out, 0);//num_tile_rows_minus1
+	}
+	gf_bs_write_int(ctx->bs_nal_out, 0, 1);  //uniform_spacing_flag
+
+//	if (!uniform_spacing_flag) //always 0
+	{
+		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));
+
+		//if multi row is possible, declare the row height
+		if (ctx->enable_multi_rows && (ctx->nb_rows>1))  {
+			u32 nb_rows = ctx->nb_rows - 1;
+			u32 nb_pids = gf_list_count(ctx->pids);
+
+			for (i=0; i<nb_pids; i++) {
+				//get pid in their final order
+				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]
+				nb_rows--;
+				if (!nb_rows) break;
+			}
+		}
+		//otherwise nothing to declare since we use a single row
+	}
+	loop_filter_flag = 1;
+	gf_bs_write_int(ctx->bs_nal_out, loop_filter_flag, 1);
+
+	loop_filter_flag = gf_bs_read_int(ctx->bs_nal_in, 1);
+	gf_bs_write_int(ctx->bs_nal_out, loop_filter_flag, 1);
+
+	// copy and write the rest of the bits in the byte
+	while (gf_bs_get_bit_position(ctx->bs_nal_in) != 8) {
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
+	}
+
+	//copy and write the rest of the bytes
+	while (gf_bs_get_size(ctx->bs_nal_in) != gf_bs_get_position(ctx->bs_nal_in)) {
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_u8(ctx->bs_nal_in), 8); //watchout, not aligned in destination bitstream
+	}
+
+	gf_bs_align(ctx->bs_nal_out);
+
+	gf_bs_get_content_no_truncate(ctx->bs_nal_out, &ctx->buffer_nal_no_epb, &pps_size_no_epb, &ctx->buffer_nal_no_epb_alloc);
+
+	*out_PPS_length = pps_size_no_epb + gf_media_nalu_emulation_bytes_add_count(ctx->buffer_nal_no_epb, pps_size_no_epb);
+	*out_PPS = gf_malloc(*out_PPS_length);
+	gf_media_nalu_add_emulation_bytes(ctx->buffer_nal_no_epb, *out_PPS, pps_size_no_epb);
+}
+
+u32 hevcmerge_rewrite_slice(GF_HEVCMergeCtx *ctx, HEVCTilePidCtx *tile_pid, char *in_slice, u32 in_slice_length)
+{
+	u64 header_end;
+	u32 out_slice_size_no_epb = 0, out_slice_length;
+	u32 num_entry_point_start;
+	u32 pps_id;
+	Bool RapPicFlag = GF_FALSE;
+	u32 slice_qp_delta_start;
+	HEVC_PPS *pps;
+	HEVC_SPS *sps;
+	u32 al, slice_size, in_slice_size_no_epb, slice_offset_orig, slice_offset_dst;
+	u32 first_slice_segment_in_pic_flag;
+	u32 dependent_slice_segment_flag;
+	u8 nal_unit_type;
+	s32 new_slice_qp_delta;
+
+	HEVCState *hevc = &tile_pid->hevc_state;
+
+	//we remove EPB directly rather than from bs reader, since we will have to copy the entire payload without EPB
+	//and gf_bs_read_data does not check for EPB
+	if (ctx->buffer_nal_in_no_epb_alloc<in_slice_length) {
+		ctx->buffer_nal_in_no_epb_alloc = in_slice_length;
+		ctx->buffer_nal_in_no_epb = gf_realloc(ctx->buffer_nal_in_no_epb, in_slice_length);
+	}
+	in_slice_size_no_epb = gf_media_nalu_remove_emulation_bytes(in_slice, ctx->buffer_nal_in_no_epb, in_slice_length);
+	gf_bs_reassign_buffer(ctx->bs_nal_in, ctx->buffer_nal_in_no_epb, in_slice_size_no_epb);
+	//disable EPB removal
+	gf_bs_enable_emulation_byte_removal(ctx->bs_nal_in, GF_FALSE);
+	if (!ctx->bs_nal_out) ctx->bs_nal_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_nal_out, ctx->buffer_nal_no_epb, ctx->buffer_nal_no_epb_alloc);
+
+	assert(hevc->s_info.header_size_bits >= 0);
+	assert(hevc->s_info.entry_point_start_bits >= 0);
+	header_end = (u64)hevc->s_info.header_size_bits;
+
+	num_entry_point_start = (u32)hevc->s_info.entry_point_start_bits;
+	slice_qp_delta_start = (u32)hevc->s_info.slice_qp_delta_start_bits;
+
+	// nal_unit_header			 
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
+	nal_unit_type = gf_bs_read_int(ctx->bs_nal_in, 6);
+	gf_bs_write_int(ctx->bs_nal_out, nal_unit_type, 6);
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 9), 9);
+
+	first_slice_segment_in_pic_flag = gf_bs_read_int(ctx->bs_nal_in, 1);    //first_slice_segment_in_pic_flag
+	if (tile_pid->slice_segment_address == 0)
+		gf_bs_write_int(ctx->bs_nal_out, 1, 1);
+	else
+		gf_bs_write_int(ctx->bs_nal_out, 0, 1);
+
+	switch (nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		RapPicFlag = GF_TRUE;
+		break;
+	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_CRA:
+		RapPicFlag = GF_TRUE;
+		break;
+	}
+
+	if (RapPicFlag) {
+		//no_output_of_prior_pics_flag
+		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 = &hevc->pps[pps_id];
+	sps = &hevc->sps[pps->sps_id];
+
+	if (!first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
+		dependent_slice_segment_flag = gf_bs_read_int(ctx->bs_nal_in, 1);
+	} else {
+		dependent_slice_segment_flag = GF_FALSE;
+	}
+	if (!first_slice_segment_in_pic_flag) {
+		/*address_ori = */gf_bs_read_int(ctx->bs_nal_in, sps->bitsSliceSegmentAddress);
+	}
+	//else original slice segment address = 0
+
+	if (tile_pid->slice_segment_address > 0) {
+		if (pps->dependent_slice_segments_enabled_flag) {
+			gf_bs_write_int(ctx->bs_nal_out, dependent_slice_segment_flag, 1);
+		}
+		gf_bs_write_int(ctx->bs_nal_out, tile_pid->slice_segment_address, ctx->nb_bits_per_address_dst);
+	}
+	//else first slice in pic, no address
+
+	//copy over bits until start of slice_qp_delta
+	while (slice_qp_delta_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);
+	}
+	//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);
+
+	//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);
+
+	//write slice extension to 0
+	if (pps->slice_segment_header_extension_present_flag)
+		gf_bs_write_int(ctx->bs_nal_out, 0, 1);
+
+
+	//we may have unparsed data in the source bitstream (slice header) due to entry points or slice segment extensions
+	//TODO: we might want to copy over the slice extension header bits
+	while (header_end != (gf_bs_get_position(ctx->bs_nal_in) - 1) * 8 + gf_bs_get_bit_position(ctx->bs_nal_in))
+		gf_bs_read_int(ctx->bs_nal_in, 1);
+
+	//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_bs_align(ctx->bs_nal_in);
+
+	//write byte_alignment() is bit=1 + x bit=0
+	gf_bs_write_int(ctx->bs_nal_out, 1, 1);
+	gf_bs_align(ctx->bs_nal_out);	// align
+
+	//get the final slice header
+	gf_bs_get_content_no_truncate(ctx->bs_nal_out, &ctx->buffer_nal_no_epb, &out_slice_size_no_epb, &ctx->buffer_nal_no_epb_alloc);
+
+	//get the slice payload size (no EPB in it) and offset in payload
+	slice_size = (u32) gf_bs_available(ctx->bs_nal_in);
+	slice_offset_orig = (u32) gf_bs_get_position(ctx->bs_nal_in);
+	//slice data offset in output slice
+	slice_offset_dst = out_slice_size_no_epb;
+	//update output slice size
+	out_slice_size_no_epb += slice_size;
+
+	//copy slice data
+	if (ctx->buffer_nal_no_epb_alloc < out_slice_size_no_epb) {
+		ctx->buffer_nal_no_epb_alloc = out_slice_size_no_epb;
+		ctx->buffer_nal_no_epb = gf_realloc(ctx->buffer_nal_no_epb, out_slice_size_no_epb);
+	}
+	memcpy(ctx->buffer_nal_no_epb + slice_offset_dst, ctx->buffer_nal_in_no_epb + slice_offset_orig, sizeof(char) * slice_size);
+
+	//insert epb
+	out_slice_length = out_slice_size_no_epb + gf_media_nalu_emulation_bytes_add_count(ctx->buffer_nal_no_epb, out_slice_size_no_epb);
+	if (ctx->buffer_nal_alloc < out_slice_length) {
+		ctx->buffer_nal_alloc = out_slice_length;
+		ctx->buffer_nal = gf_realloc(ctx->buffer_nal, out_slice_length);
+	}
+	gf_media_nalu_add_emulation_bytes(ctx->buffer_nal_no_epb, ctx->buffer_nal, out_slice_size_no_epb);
+	return out_slice_length;
+}
+
+static GF_Err hevcmerge_rewrite_config(GF_HEVCMergeCtx *ctx, GF_FilterPid *opid, char *data, u32 size)
+{
+	u32 i, j;
+	u8 *new_dsi;
+	u32 new_size;
+	GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(data, size, GF_FALSE);
+	if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+	// 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
+		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
+
+			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
+				char *outSPS=NULL;
+				u32 outSize=0;
+				hevc_rewrite_sps(sl->data, sl->size, ctx->out_width, ctx->out_height, &outSPS, &outSize);
+				gf_free(sl->data);
+				sl->data = outSPS;
+				sl->size = outSize;
+			}
+			else if (ar->type == GF_HEVC_NALU_VID_PARAM) {
+			}
+			else if (ar->type == GF_HEVC_NALU_PIC_PARAM) {
+				char *outPPS=NULL;
+				u32 outSize=0;
+				hevcmerge_rewrite_pps(ctx, sl->data, sl->size, &outPPS, &outSize);
+				gf_free(sl->data);
+				sl->data = outPPS;
+				sl->size = outSize;
+			}
+		}
+	}
+	gf_odf_hevc_cfg_write(hvcc, &new_dsi, &new_size);
+	gf_odf_hevc_cfg_del(hvcc);
+
+	gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(new_dsi, new_size));
+	return GF_OK;
+}
+
+static void hevcmerge_write_nal(GF_HEVCMergeCtx *ctx, char *output_nal, char *rewritten_nal, u32 out_nal_size)
+{
+	u32 n = 8*(ctx->hevc_nalu_size_length);
+	while (n) {
+		u32 v = (out_nal_size >> (n-8)) & 0xFF;
+		*output_nal = v;
+		output_nal++;
+		n-=8;
+	}
+	memcpy(output_nal, rewritten_nal, out_nal_size);
+}
+
+static u32 hevcmerge_compute_address(GF_HEVCMergeCtx *ctx, HEVCTilePidCtx *tile_pid, Bool use_y_coord)
+{
+	u32 i, nb_pids, sum_height = 0, sum_width = 0;
+	for (i=0; i<tile_pid->pos_col; i++) {
+		sum_width += ctx->grid[i].width / ctx->max_CU_width;
+	}
+
+	if (use_y_coord) {
+		sum_height = tile_pid->pos_y / ctx->max_CU_height;
+	} else {
+		nb_pids = gf_list_count(ctx->pids);
+		for (i=0; i<nb_pids; i++) {
+			HEVCTilePidCtx *actx = gf_list_get(ctx->pids, i);
+			if (actx->pos_col == tile_pid->pos_col) {
+				if (actx->pos_row<tile_pid->pos_row) {
+					sum_height += actx->height / ctx->max_CU_height;
+				}
+			}
+		}
+	}
+	return sum_height * (ctx->out_width / ctx->max_CU_width) + sum_width;
+}
+
+void hevcmerge_build_srdmap(GF_HEVCMergeCtx *ctx, Bool use_abs_pos)
+{
+	GF_PropertyValue srdmap;
+	u32 i, nb_pids;
+	Bool srd_map_valid = GF_TRUE;
+
+	if (!ctx->out_width || !ctx->out_height) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_MAP, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_REF, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD, NULL);
+		return;
+	}
+
+	nb_pids = gf_list_count(ctx->ordered_pids);
+
+
+	memset(&srdmap, 0, sizeof(GF_PropertyValue));
+	srdmap.type = GF_PROP_UINT_LIST;
+	//8 integers per PID
+	srdmap.value.uint_list.nb_items = nb_pids*8;
+	srdmap.value.uint_list.vals = gf_malloc(sizeof(s32)*nb_pids*8);
+
+	s32 *vals = srdmap.value.uint_list.vals;
+
+	for (i=0; i<nb_pids; i++) {
+		s32 tile_x, tile_y;
+		u32 width_in_CU, nb_cols, nb_rows;
+		s32 x=0, y=0, w=0, h=0, srd_x, srd_y, srd_w, srd_h;
+		HEVCTilePidCtx *tile = gf_list_get(ctx->ordered_pids, i);
+
+		const GF_PropertyValue *srd = gf_filter_pid_get_property(tile->pid, GF_PROP_PID_SRD);
+		const GF_PropertyValue *srd_ref = gf_filter_pid_get_property(tile->pid, GF_PROP_PID_SRD_REF);
+		const GF_PropertyValue *crop_pos = gf_filter_pid_get_property(tile->pid, GF_PROP_PID_CROP_POS);
+
+		//get original SRD of the PID, translate into output referential {out_width,out_height}
+		if (srd && srd_ref) {
+			srd_x = srd->value.vec4i.x;
+			srd_y = srd->value.vec4i.y;
+			srd_w = srd->value.vec4i.z;
+			srd_h = srd->value.vec4i.w;
+
+			if (srd_ref->value.vec2i.x != 0) {
+				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" ));
+				srd_map_valid = GF_FALSE;
+				break;
+			}
+			if (srd_ref->value.vec2i.y != 0) {
+				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" ));
+				srd_map_valid = GF_FALSE;
+				break;
+			}
+		} else if (crop_pos) {
+			x = crop_pos->value.vec2i.x;
+			y = crop_pos->value.vec2i.y;
+			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" ));
+			srd_map_valid = GF_FALSE;
+			break;
+		}
+		vals[8*i] = x;
+		vals[8*i+1] = y;
+		vals[8*i+2] = w;
+		vals[8*i+3] = h;
+
+		//get final position in the recomputed video, expressed in output referential {out_width,out_height}
+		//we recompute the position directly from the slice segment address
+		width_in_CU = ctx->out_width / ctx->max_CU_width;
+		nb_cols = tile->slice_segment_address % width_in_CU;
+		nb_rows = (tile->slice_segment_address - nb_cols) / width_in_CU;
+
+		assert(tile->slice_segment_address == (nb_rows * width_in_CU + nb_cols));
+
+		//tile_x and tile_y should start at zero
+		tile_x = use_abs_pos ? nb_cols * ctx->max_CU_width  : nb_cols;
+		tile_y = use_abs_pos ? nb_rows * ctx->max_CU_height : nb_rows;
+
+		vals[8*i+4] = (tile_x * ctx->out_width) / ctx->out_width;
+		vals[8*i+5] = (tile_y * ctx->out_height) / ctx->out_height;
+		vals[8*i+6] = (tile->width * ctx->out_width) / ctx->out_width;
+		vals[8*i+7] = (tile->height * ctx->out_height) / ctx->out_height;
+	}
+	if (srd_map_valid)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_MAP, &srdmap);
+
+	gf_free(srdmap.value.uint_list.vals);
+
+	//assign reference space
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_REF, &PROP_VEC2I_INT(ctx->out_width, ctx->out_height));
+	//remove any SRD copied from inputs - we could also create an SRD {0,0,out_width,out_height}
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD, NULL);
+}
+
+static GF_Err hevcmerge_rebuild_grid(GF_HEVCMergeCtx *ctx,  GF_FilterPid *pid)
+{
+	u32 nb_cols=0;
+	u32 nb_rows=0;
+	Bool reorder_rows=GF_FALSE;
+	u32 force_last_col_plus_one=0;
+	u32 nb_has_pos=0, nb_no_pos=0, nb_rel_pos=0, nb_abs_pos=0;
+	u32 min_rel_pos_x = (u32) -1;
+	u32 min_rel_pos_y = (u32) -1;
+	u32 i, j, max_cols, nb_pids = gf_list_count(ctx->pids);
+
+	for (i=0; i<nb_pids; i++) {
+		HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, i);
+		if (apidctx->width % ctx->max_CU_width) nb_cols++;
+		if (apidctx->height % ctx->max_CU_height) nb_rows++;
+		if (apidctx->has_pos) {
+			nb_has_pos++;
+			if ((apidctx->pos_x<0) || (apidctx->pos_y<0)) {
+				nb_rel_pos++;
+			}
+			else if ((apidctx->pos_x>0) || (apidctx->pos_y>0)) nb_abs_pos++;
+
+			if ((apidctx->pos_x<=0) && ((u32) (-apidctx->pos_x) < min_rel_pos_x))
+				min_rel_pos_x = -apidctx->pos_x;
+			if ((apidctx->pos_y<=0) && ((u32) (-apidctx->pos_y) < min_rel_pos_y))
+				min_rel_pos_y = -apidctx->pos_y;
+		} else {
+			nb_no_pos++;
+		}
+	}
+	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"));
+		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"));
+		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"));
+		return GF_BAD_PARAM;
+	}
+	if (ctx->grid) gf_free(ctx->grid);
+	ctx->grid = NULL;
+
+	if (min_rel_pos_x == (u32)-1) min_rel_pos_x=0;
+
+	if (nb_has_pos) {
+		max_cols = 0;
+		for (i=0; i<nb_pids; i++) {
+			HEVCTilePidCtx *tile1 = gf_list_get(ctx->pids, i);
+			if (!tile1->has_pos) continue;
+
+			for (j=0; j<nb_pids; j++) {
+				Bool overlap = GF_FALSE;
+				HEVCTilePidCtx *tile2 = gf_list_get(ctx->pids, j);
+				if (tile2 == tile1) continue;
+				if (!tile2->has_pos) continue;
+
+				//for relative positioning, only check we don't have the same indexes
+				if (nb_rel_pos) {
+					continue;
+				}
+
+				//make sure we are aligned
+				if ((tile1->pos_x<tile2->pos_x) && (tile1->pos_x + (s32) tile1->width > tile2->pos_x)) {
+					overlap = GF_TRUE;
+				}
+				else if ((tile1->pos_x==tile2->pos_x) && (tile1->width != tile2->width)) {
+					overlap = GF_TRUE;
+				}
+				if (tile1->pos_x==tile2->pos_x) {
+					if ((tile1->pos_y<tile2->pos_y) && (tile1->pos_y + (s32) tile1->height > tile2->pos_y)) {
+						overlap = GF_TRUE;
+					}
+					else if ((tile1->pos_y==tile2->pos_y) && (tile1->height != tile2->height)) {
+						overlap = GF_TRUE;
+					}
+				}
+
+				if (overlap) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Overlapping tiles detected, cannot merge\n"));
+					return GF_BAD_PARAM;
+				}
+			}
+
+			if (!max_cols) {
+				ctx->grid = gf_malloc(sizeof(HEVCGridInfo));
+				memset(&ctx->grid[0], 0, sizeof(HEVCGridInfo));
+
+				ctx->grid[0].width = tile1->width;
+				if (nb_rel_pos) {
+					ctx->grid[0].pos_x = -tile1->pos_x - min_rel_pos_x;
+				} else {
+					ctx->grid[0].pos_x = tile1->pos_x;
+				}
+				max_cols=1;
+			} else if (ctx->grid[max_cols-1].pos_x != tile1->pos_x) {
+				if (nb_rel_pos) {
+					//append
+					if (ctx->grid[max_cols-1].pos_x <(u32) -tile1->pos_x) {
+						ctx->grid = gf_realloc(ctx->grid, sizeof(HEVCGridInfo) * (max_cols+1) );
+						memset(&ctx->grid[max_cols], 0, sizeof(HEVCGridInfo));
+						ctx->grid[max_cols].width = tile1->width;
+						ctx->grid[max_cols].pos_x = -tile1->pos_x;
+						max_cols+=1;
+					}
+					//insert
+					else {
+						Bool found=GF_FALSE;
+						for (j=0; j<max_cols; j++) {
+							if (ctx->grid[j].pos_x == -tile1->pos_x) {
+								found=GF_TRUE;
+								break;
+							}
+						}
+						if (!found) {
+							for (j=0; j<max_cols; j++) {
+								if (ctx->grid[j].pos_x > (u32) -tile1->pos_x) {
+									ctx->grid = gf_realloc(ctx->grid, sizeof(HEVCGridInfo) * (max_cols+1) );
+									memmove(&ctx->grid[j+1], &ctx->grid[j], sizeof(HEVCGridInfo) * (max_cols-j));
+									memset(&ctx->grid[j], 0, sizeof(HEVCGridInfo));
+									ctx->grid[j].width = tile1->width;
+									ctx->grid[j].pos_x = -tile1->pos_x;
+									max_cols+=1;
+									break;
+								}
+							}
+						}
+					}
+				} else {
+					//append
+					if (ctx->grid[max_cols-1].pos_x + ctx->grid[max_cols-1].width <= (u32) tile1->pos_x) {
+						ctx->grid = gf_realloc(ctx->grid, sizeof(HEVCGridInfo) * (max_cols+1) );
+						memset(&ctx->grid[max_cols], 0, sizeof(HEVCGridInfo));
+						ctx->grid[max_cols].width = tile1->width;
+						ctx->grid[max_cols].pos_x = tile1->pos_x;
+						max_cols+=1;
+					}
+					//insert
+					else {
+						for (j=0; j<max_cols; j++) {
+							if (ctx->grid[j].pos_x == (u32) tile1->pos_x) {
+								break;
+							}
+							if (ctx->grid[j].pos_x > (u32) tile1->pos_x) {
+								ctx->grid = gf_realloc(ctx->grid, sizeof(HEVCGridInfo) * (max_cols+1) );
+								memmove(&ctx->grid[j+1], &ctx->grid[j], sizeof(HEVCGridInfo) * (max_cols-j));
+								memset(&ctx->grid[j], 0, sizeof(HEVCGridInfo));
+								ctx->grid[j].width = tile1->width;
+								ctx->grid[j].pos_x = tile1->pos_x;
+								max_cols+=1;
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		if (!ctx->grid) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[HEVCMerge] Failed to create grid\n"));
+			return GF_OUT_OF_MEM;
+		}
+		// pass on the grid to insert empty columns
+		if (!nb_rel_pos && ctx->grid) {
+			for (j=0; j<max_cols-1; j++) {
+				assert(ctx->grid[j].pos_x + ctx->grid[j].width <= ctx->grid[j+1].pos_x);
+				if (ctx->grid[j].pos_x + ctx->grid[j].width != ctx->grid[j+1].pos_x) {
+					u32 new_width = ctx->grid[j+1].pos_x - ctx->grid[j].pos_x - ctx->grid[j].width;
+					u32 new_x = ctx->grid[j].pos_x + ctx->grid[j].width;
+
+					ctx->grid = gf_realloc(ctx->grid, sizeof(HEVCGridInfo) * (max_cols+1) );
+					memmove(&ctx->grid[j+2], &ctx->grid[j+1], sizeof(HEVCGridInfo) * (max_cols-j-1));
+
+					memset(&ctx->grid[j+1], 0, sizeof(HEVCGridInfo));
+					ctx->grid[j+1].width = new_width;
+					ctx->grid[j+1].pos_x = new_x;
+					max_cols+=1;
+					j++;
+				}
+			}
+		}
+
+		//assign cols and rows
+		for (i=0; i<nb_pids; i++) {
+			HEVCTilePidCtx *tile = gf_list_get(ctx->pids, i);
+			tile->pos_col=0;
+			tile->pos_row=0;
+		}
+
+		for (j=0; j<max_cols; j++) {
+			if (nb_rel_pos) {
+				ctx->grid[j].height = 0;
+			}
+			//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));
+				return GF_BAD_PARAM;
+			}
+			for (i=0; i<nb_pids; i++) {
+				HEVCTilePidCtx *tile = gf_list_get(ctx->pids, i);
+				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));
+						return GF_BAD_PARAM;
+					}
+					tile->pos_col = j;
+					tile->pos_row = -tile->pos_y;
+					ctx->grid[j].height += tile->height;
+				} else {
+					if (tile->pos_x != ctx->grid[j].pos_x) continue;
+					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));
+						tile->pos_row++;
+					}
+					if (tile->pos_y + tile->height > ctx->grid[j].height)
+						ctx->grid[j].height = tile->pos_y + tile->height;
+				}
+
+				if (tile->pos_row > ctx->grid[j].max_row_pos)
+					ctx->grid[j].max_row_pos = tile->pos_row;
+			}
+		}
+		//check non-last rows are multiple of max CU height
+		for (j=0; j<max_cols; j++) {
+			for (i=0; i<nb_pids; i++) {
+				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));
+					return GF_BAD_PARAM;
+				}
+			}
+		}
+		nb_cols = max_cols;
+
+	} else {
+		//gather tiles per columns
+		ctx->grid = gf_malloc(sizeof(HEVCGridInfo)*nb_pids);
+		memset(ctx->grid, 0, sizeof(HEVCGridInfo)*nb_pids);
+
+		nb_cols=0;
+		for (i=0; i<nb_pids; i++) {
+			Bool found = GF_FALSE;
+			HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, i);
+			//do we fit on a col
+			for (j=0; j<nb_cols; j++) {
+				if (ctx->grid[j].width == apidctx->width) {
+					found = GF_TRUE;
+					break;
+				}
+			}
+			//force new column
+			if ((apidctx->height % ctx->max_CU_height) && found && ctx->grid[j].last_row_idx)
+				found = GF_FALSE;
+
+			if (!found) {
+				ctx->grid[nb_cols].width = apidctx->width;
+				ctx->grid[nb_cols].height = apidctx->height;
+				if (apidctx->width % ctx->max_CU_width) {
+					assert(!force_last_col_plus_one);
+					force_last_col_plus_one = nb_cols+1;
+				}
+				if (apidctx->height % ctx->max_CU_height) {
+					ctx->grid[nb_cols].last_row_idx = ctx->grid[nb_cols].row_pos +1 ;
+					reorder_rows=GF_TRUE;
+				}
+
+				ctx->grid[nb_cols].row_pos = 1;
+				nb_cols++;
+				j=nb_cols-1;
+			} else {
+				ctx->grid[j].height += apidctx->height;
+				if (apidctx->height % ctx->max_CU_height) {
+					ctx->grid[j].last_row_idx = ctx->grid[j].row_pos+1;
+					reorder_rows=GF_TRUE;
+				}
+				ctx->grid[j].row_pos ++;
+			}
+			assert(ctx->grid[j].row_pos);
+			apidctx->pos_row = ctx->grid[j].row_pos - 1;
+			apidctx->pos_col = j;
+		}
+		//move last column at end if not a multiple of CTU
+		if (force_last_col_plus_one) {
+			for (i=0; i<nb_pids; i++) {
+				HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, i);
+				//do we fit on a col
+				if (apidctx->pos_col == force_last_col_plus_one - 1) {
+					apidctx->pos_col = nb_cols-1;
+				} else if (apidctx->pos_col > force_last_col_plus_one - 1) {
+					apidctx->pos_col -= 1;
+				}
+			}
+		}
+		//in each column, push the last_row_idx if any to the bottom and move up other tiles accordingly
+		//this ensures that slices with non multiple of maxCTU height are always at the bottom of the grid
+		if (reorder_rows) {
+			for (i=0; i<nb_cols; i++) {
+				if (!ctx->grid[i].last_row_idx) continue;
+
+				for (j=0; j<nb_pids; j++) {
+					HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, j);
+
+					if (apidctx->pos_col != i) continue;
+
+					if (apidctx->pos_row==ctx->grid[i].last_row_idx-1) {
+						apidctx->pos_row = ctx->grid[i].row_pos;
+					} else if (apidctx->pos_row > ctx->grid[i].last_row_idx-1) {
+						apidctx->pos_row -= 1;
+					}
+				}
+			}
+		}
+	}
+
+	//update final pos
+	ctx->out_width = 0;
+	ctx->out_height = 0;
+	for (i=0; i<nb_cols; i++) {
+		ctx->out_width += ctx->grid[i].width;
+		if (ctx->grid[i].height > ctx->out_height)
+			ctx->out_height = ctx->grid[i].height;
+	}
+	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));
+	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_filter_pid_get_name(pidctx->pid),
+				nb_has_pos ? pidctx->pos_x : pidctx->pos_col,
+				nb_has_pos ? pidctx->pos_y : pidctx->pos_row,
+				pidctx->width, pidctx->height, pidctx->slice_segment_address));
+	}
+
+	//check if we can use a multi-row grid
+	ctx->enable_multi_rows = GF_FALSE;
+	if (ctx->mrows) {
+		ctx->enable_multi_rows = GF_TRUE;
+		ctx->nb_rows=0;
+		for (i=0; i<nb_pids; i++) {
+			HEVCTilePidCtx *tile = gf_list_get(ctx->pids, i);
+			s32 pos_y = nb_has_pos ? tile->pos_y : tile->pos_row;
+
+			if (!tile->pos_col)
+				ctx->nb_rows++;
+
+			for (j=0; j<nb_pids; j++) {
+				if (i==j) continue;
+				HEVCTilePidCtx *atile = gf_list_get(ctx->pids, j);
+				s32 apos_y = nb_has_pos ? atile->pos_y : atile->pos_row;
+				if (apos_y != pos_y) continue;
+				if (atile->height != tile->height) {
+					ctx->enable_multi_rows = GF_FALSE;
+					break;
+				}
+			}
+			if (!ctx->enable_multi_rows) {
+				ctx->nb_rows = 0;
+				break;
+			}
+		}
+	}
+
+	//sort pids according to columns (tiles) and slice addresses to be conformant with spec
+	gf_list_reset(ctx->ordered_pids);
+	for (i=0; i<nb_cols; i++) {
+		for (j=0; j<nb_pids; j++) {
+			u32 k;
+			Bool inserted = GF_FALSE;
+			HEVCTilePidCtx *tile = gf_list_get(ctx->pids, j);
+			//
+			if (!ctx->enable_multi_rows && (tile->pos_col != i))
+				continue;
+			for (k=0; k<gf_list_count(ctx->ordered_pids); k++) {
+				HEVCTilePidCtx *tile2 = gf_list_get(ctx->ordered_pids, k);
+				if (!ctx->enable_multi_rows && (tile2->pos_col != i))
+					continue;
+				if (tile2->slice_segment_address > tile->slice_segment_address) {
+					inserted = GF_TRUE;
+					gf_list_insert(ctx->ordered_pids, tile, k);
+					break;
+				}
+			}
+			if (!inserted) {
+				for (k=0; k<gf_list_count(ctx->ordered_pids); k++) {
+					HEVCTilePidCtx *tile2 = gf_list_get(ctx->ordered_pids, k);
+					if (!ctx->enable_multi_rows) {
+						if (tile2->pos_col > tile->pos_col) {
+							inserted = GF_TRUE;
+							gf_list_insert(ctx->ordered_pids, tile, k);
+							break;
+						}
+					} else {
+						if (tile2->slice_segment_address > tile->slice_segment_address) {
+							inserted = GF_TRUE;
+							gf_list_insert(ctx->ordered_pids, tile, k);
+							break;
+						}
+					}
+				}
+				if (!inserted)
+					gf_list_add(ctx->ordered_pids, tile);
+			}
+		}
+		if (ctx->enable_multi_rows)
+			break;
+	}
+
+	assert(gf_list_count(ctx->ordered_pids) == gf_list_count(ctx->pids));
+
+	//build SRD map
+	hevcmerge_build_srdmap(ctx, nb_abs_pos ? GF_TRUE : GF_FALSE);
+
+	return GF_OK;
+}
+
+static GF_Err hevcmerge_check_sps_pps(GF_HEVCMergeCtx *ctx, HEVCTilePidCtx *pid_base, HEVCTilePidCtx *pid_o)
+{
+	Bool all_ok = GF_TRUE;
+	u32 i;
+	HEVCState *state_base = &pid_base->hevc_state;
+	HEVCState *state_o = &pid_o->hevc_state;
+	char *src_base = gf_filter_pid_get_source(pid_base->pid);
+	char *src_o = gf_filter_pid_get_source(pid_o->pid);
+
+	for (i=0; i<16; i++) {
+		HEVC_SPS *sps_base = &state_base->sps[i];
+		HEVC_SPS *sps_o = &state_o->sps[i];
+
+#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));\
+				all_ok = GF_FALSE;\
+			}\
+
+		if (!sps_base->state && !sps_o->state) continue;
+		if (!sps_base->state && sps_o->state) {
+			all_ok = GF_FALSE;
+			break;
+		}
+		if (sps_base->state && !sps_o->state) {
+			all_ok = GF_FALSE;
+			break;
+		}
+		CHECK_SPS_VAL(aspect_ratio_info_present_flag)
+		CHECK_SPS_VAL(chroma_format_idc)
+		CHECK_SPS_VAL(cw_flag)
+		CHECK_SPS_VAL(cw_flag)
+		CHECK_SPS_VAL(cw_left)
+		CHECK_SPS_VAL(cw_right)
+		CHECK_SPS_VAL(cw_top)
+		CHECK_SPS_VAL(cw_bottom)
+		CHECK_SPS_VAL(bit_depth_luma)
+		CHECK_SPS_VAL(bit_depth_chroma)
+		CHECK_SPS_VAL(log2_max_pic_order_cnt_lsb)
+		CHECK_SPS_VAL(separate_colour_plane_flag)
+		CHECK_SPS_VAL(max_CU_depth)
+		CHECK_SPS_VAL(num_short_term_ref_pic_sets)
+		CHECK_SPS_VAL(num_long_term_ref_pic_sps)
+		//HEVC_ReferencePictureSets rps[64];
+		CHECK_SPS_VAL(aspect_ratio_info_present_flag)
+		CHECK_SPS_VAL(long_term_ref_pics_present_flag)
+		CHECK_SPS_VAL(temporal_mvp_enable_flag)
+		CHECK_SPS_VAL(sample_adaptive_offset_enabled_flag)
+		CHECK_SPS_VAL(sar_idc)
+		CHECK_SPS_VAL(sar_width)
+		CHECK_SPS_VAL(sar_height)
+//		CHECK_SPS_VAL(has_timing_info)
+//		CHECK_SPS_VAL(num_units_in_tick)
+//		CHECK_SPS_VAL(time_scale)
+//		CHECK_SPS_VAL(poc_proportional_to_timing_flag)
+		CHECK_SPS_VAL(num_ticks_poc_diff_one_minus1)
+		CHECK_SPS_VAL(video_full_range_flag)
+		CHECK_SPS_VAL(colour_description_present_flag)
+		CHECK_SPS_VAL(colour_primaries)
+		CHECK_SPS_VAL(transfer_characteristic)
+		CHECK_SPS_VAL(matrix_coeffs)
+		CHECK_SPS_VAL(rep_format_idx);
+		CHECK_SPS_VAL(sps_ext_or_max_sub_layers_minus1)
+		CHECK_SPS_VAL(max_sub_layers_minus1)
+		CHECK_SPS_VAL(update_rep_format_flag)
+		CHECK_SPS_VAL(sub_layer_ordering_info_present_flag)
+		CHECK_SPS_VAL(scaling_list_enable_flag)
+		CHECK_SPS_VAL(infer_scaling_list_flag)
+		CHECK_SPS_VAL(scaling_list_ref_layer_id)
+		CHECK_SPS_VAL(scaling_list_data_present_flag)
+		CHECK_SPS_VAL(asymmetric_motion_partitions_enabled_flag)
+		CHECK_SPS_VAL(pcm_enabled_flag)
+		CHECK_SPS_VAL(strong_intra_smoothing_enable_flag)
+		CHECK_SPS_VAL(vui_parameters_present_flag)
+		CHECK_SPS_VAL(log2_diff_max_min_luma_coding_block_size)
+		CHECK_SPS_VAL(log2_min_transform_block_size)
+		CHECK_SPS_VAL(log2_min_luma_coding_block_size)
+		CHECK_SPS_VAL(log2_max_transform_block_size)
+		CHECK_SPS_VAL(max_transform_hierarchy_depth_inter)
+		CHECK_SPS_VAL(max_transform_hierarchy_depth_intra)
+		CHECK_SPS_VAL(pcm_sample_bit_depth_luma_minus1)
+		CHECK_SPS_VAL(pcm_sample_bit_depth_chroma_minus1)
+		CHECK_SPS_VAL(pcm_loop_filter_disable_flag)
+		CHECK_SPS_VAL(log2_min_pcm_luma_coding_block_size_minus3)
+		CHECK_SPS_VAL(log2_diff_max_min_pcm_luma_coding_block_size)
+		CHECK_SPS_VAL(overscan_info_present)
+		CHECK_SPS_VAL(overscan_appropriate)
+		CHECK_SPS_VAL(video_signal_type_present_flag)
+		CHECK_SPS_VAL(video_format)
+		CHECK_SPS_VAL(chroma_loc_info_present_flag)
+		CHECK_SPS_VAL(chroma_sample_loc_type_top_field)
+		CHECK_SPS_VAL(chroma_sample_loc_type_bottom_field)
+		CHECK_SPS_VAL(neutra_chroma_indication_flag)
+		CHECK_SPS_VAL(field_seq_flag)
+		CHECK_SPS_VAL(frame_field_info_present_flag)
+		CHECK_SPS_VAL(default_display_window_flag)
+		CHECK_SPS_VAL(left_offset)
+		CHECK_SPS_VAL(right_offset)
+		CHECK_SPS_VAL(top_offset)
+		CHECK_SPS_VAL(bottom_offset)
+	}
+
+	for (i=0; i<64; i++) {
+		HEVC_PPS *pps_base = &state_base->pps[i];
+		HEVC_PPS *pps_o = &state_o->pps[i];
+
+#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"));\
+				all_ok = GF_FALSE;\
+			}\
+
+		if (!pps_base->state && !pps_o->state) continue;
+		if (!pps_base->state && pps_o->state) {
+			all_ok = GF_FALSE;
+			break;
+		}
+		if (pps_base->state && !pps_o->state) {
+			all_ok = GF_FALSE;
+			break;
+		}
+		//we don't check tile config nor init qp since we rewrite these
+//		CHECK_PPS_VAL(loop_filter_across_tiles_enabled_flag)
+//		CHECK_PPS_VAL(pic_init_qp_minus26)
+
+		CHECK_PPS_VAL(dependent_slice_segments_enabled_flag)
+		CHECK_PPS_VAL(num_extra_slice_header_bits)
+		CHECK_PPS_VAL(num_ref_idx_l0_default_active)
+		CHECK_PPS_VAL(num_ref_idx_l1_default_active)
+		CHECK_PPS_VAL(slice_segment_header_extension_present_flag)
+		CHECK_PPS_VAL(output_flag_present_flag)
+		CHECK_PPS_VAL(lists_modification_present_flag)
+		CHECK_PPS_VAL(cabac_init_present_flag)
+		CHECK_PPS_VAL(weighted_pred_flag)
+		CHECK_PPS_VAL(weighted_bipred_flag)
+		CHECK_PPS_VAL(slice_chroma_qp_offsets_present_flag)
+		CHECK_PPS_VAL(deblocking_filter_override_enabled_flag)
+		CHECK_PPS_VAL(loop_filter_across_slices_enabled_flag)
+		CHECK_PPS_VAL(entropy_coding_sync_enabled_flag)
+		CHECK_PPS_VAL(sign_data_hiding_flag)
+		CHECK_PPS_VAL(constrained_intra_pred_flag)
+		CHECK_PPS_VAL(transform_skip_enabled_flag)
+		CHECK_PPS_VAL(cu_qp_delta_enabled_flag)
+		CHECK_PPS_VAL(transquant_bypass_enable_flag)
+		CHECK_PPS_VAL(diff_cu_qp_delta_depth)
+		CHECK_PPS_VAL(pic_cb_qp_offset)
+		CHECK_PPS_VAL(pic_cr_qp_offset)
+		CHECK_PPS_VAL(deblocking_filter_control_present_flag)
+		CHECK_PPS_VAL(pic_disable_deblocking_filter_flag)
+		CHECK_PPS_VAL(pic_scaling_list_data_present_flag)
+		CHECK_PPS_VAL(beta_offset_div2)
+		CHECK_PPS_VAL(tc_offset_div2)
+		CHECK_PPS_VAL(log2_parallel_merge_level_minus2)
+	}
+
+	if (src_base) gf_free(src_base);
+	if (src_o) gf_free(src_o);
+	if (all_ok || !ctx->strict) return GF_OK;
+	return GF_BAD_PARAM;
+}
+
+
+static GF_Err hevcmerge_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	Bool grid_config_changed = GF_FALSE;
+	u32 cfg_crc = 0, pid_width, pid_height;
+	const GF_PropertyValue *p, *dsi;
+	GF_Err e;
+	u8 j, i;
+	GF_HEVCMergeCtx *ctx = (GF_HEVCMergeCtx*)gf_filter_get_udta(filter);
+	HEVCTilePidCtx *tile_pid;
+
+	if (ctx->in_error)
+		return GF_BAD_PARAM;
+
+	if (is_remove) {
+		tile_pid = gf_filter_pid_get_udta(pid);
+		gf_list_del_item(ctx->pids, tile_pid);
+		gf_free(tile_pid);
+		if (!gf_list_count(ctx->pids)) {
+			if (ctx->opid)
+				gf_filter_pid_remove(ctx->opid);
+
+			return GF_OK;
+		}
+		grid_config_changed = GF_TRUE;
+		goto reconfig_grid;
+	}
+
+	if (!gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (!p) return GF_OK;
+	pid_width = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (!p) return GF_OK;
+	pid_height = p->value.uint;
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!dsi) return GF_OK;
+
+	tile_pid = gf_filter_pid_get_udta(pid);
+	//not set, first time we see this pid
+	if (!tile_pid) {
+		GF_SAFEALLOC(tile_pid, HEVCTilePidCtx);
+		if (!tile_pid) return GF_OUT_OF_MEM;
+		
+		gf_filter_pid_set_udta(pid, tile_pid);
+		tile_pid->pid = pid;
+		tile_pid->hevc_state.full_slice_header_parse = GF_TRUE;
+		gf_list_add(ctx->pids, tile_pid);
+
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	}
+	assert(tile_pid);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) tile_pid->timescale = p->value.uint;
+
+	//check if config (vps/sps/pps) has changed - if not, we ignore the reconfig
+	//note that we don't copy all properties of input pids to the output in this case
+	cfg_crc = 0;
+	if (dsi->value.data.ptr && dsi->value.data.size) {
+		cfg_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+	}
+	if (cfg_crc == tile_pid->dsi_crc)
+		return GF_OK;
+	tile_pid->dsi_crc = cfg_crc;
+
+	//update this pid's config by parsing sps/vps/pps and check if we need to change anything
+	GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+	if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+	tile_pid->nalu_size_length = hvcc->nal_unit_size;
+	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);
+		for (j = 0; j < gf_list_count(ar->nalus); j++) {
+			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)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);
+				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));
+						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));
+						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);
+			}
+			else if (ar->type == GF_HEVC_NALU_PIC_PARAM) {
+				idx = gf_media_hevc_read_pps(sl->data, sl->size, &tile_pid->hevc_state);
+			}
+			if (idx < 0) {
+				// WARNING
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+		}
+		if (e) break;
+	}
+	gf_odf_hevc_cfg_del(hvcc);
+	if (e) return e;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_copy_properties(ctx->opid, pid);
+		//remove all SRD related properties
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_REF, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SRD_MAP, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CROP_POS, NULL);
+		//TODO, we might want to compute a cumulate of these properties on the output ?
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ORIG_SIZE, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_RATE, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_BYTES, NULL);
+	}
+
+	if ((pid_width != tile_pid->width) || (pid_height != tile_pid->height)) {
+		tile_pid->width = pid_width;
+		tile_pid->height = pid_height;
+		grid_config_changed = GF_TRUE;
+	}
+	//todo further testing we might want to force a grid reconfig even if same width / height
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CROP_POS);
+	if (p) {
+		s32 pos_x, pos_y;
+		if (!tile_pid->has_pos)
+			grid_config_changed = GF_TRUE;
+
+		tile_pid->has_pos = GF_TRUE;
+		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));
+				pos_x++;
+			}
+			pos_x *= ctx->max_CU_width;
+		} else {
+			pos_x = p->value.vec2i.x;
+		}
+
+		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));
+				pos_y++;
+			}
+			pos_y *= ctx->max_CU_height;
+		} else {
+			pos_y = p->value.vec2i.y;
+		}
+		if ((pos_x != tile_pid->pos_x) || (pos_y != tile_pid->pos_y))
+			grid_config_changed = GF_TRUE;
+		tile_pid->pos_x = pos_x;
+		tile_pid->pos_y = pos_y;
+	} else {
+		if (tile_pid->has_pos)
+			grid_config_changed = GF_TRUE;
+		tile_pid->has_pos = GF_FALSE;
+		tile_pid->pos_x = tile_pid->pos_y = 0;
+	}
+
+reconfig_grid:
+	// Update grid
+	if (grid_config_changed) {
+		e = hevcmerge_rebuild_grid(ctx, pid);
+		if (e) {
+			ctx->in_error = GF_TRUE;
+			return e;
+		}
+	}
+
+	//check SPS/PPS are compatible - for now we only warn but still process
+	tile_pid = gf_list_get(ctx->pids, 0);
+	for (i=1; i<gf_list_count(ctx->pids); i++) {
+		HEVCTilePidCtx *apidctx = gf_list_get(ctx->pids, i);
+		e = hevcmerge_check_sps_pps(ctx, tile_pid, apidctx);
+		if (e) {
+			apidctx->in_error = GF_TRUE;
+			return e;
+		}
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->out_width));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->out_height));
+
+	//recreate DSI based on first in the ordered set of pid we have
+	//this avoids cases where the input pid order changes due to scheduling, and they don't have exactly the same xPS
+	tile_pid = gf_list_get(ctx->ordered_pids, 0);
+	ctx->base_pps_init_qp_delta_minus26 = tile_pid->hevc_state.pps->pic_init_qp_minus26;
+
+	u32 nb_CTUs = ((ctx->out_width + ctx->max_CU_width - 1) / ctx->max_CU_width) * ((ctx->out_height + ctx->max_CU_height - 1) / ctx->max_CU_height);
+	ctx->nb_bits_per_address_dst = 0;
+	while (nb_CTUs > (u32)(1 << ctx->nb_bits_per_address_dst)) {
+		ctx->nb_bits_per_address_dst++;
+	}
+
+	dsi = gf_filter_pid_get_property(tile_pid->pid, GF_PROP_PID_DECODER_CONFIG);
+	assert(dsi);
+	return hevcmerge_rewrite_config(ctx, ctx->opid, dsi->value.data.ptr, dsi->value.data.size);
+}
+
+static GF_Err hevcmerge_process(GF_Filter *filter)
+{
+	char *data;
+	u32 pos, nal_length, data_size, i;
+	s32 current_poc=0;
+	u8 temporal_id, layer_id, nal_unit_type;
+	u32 nb_eos, nb_ipid;
+	Bool found_sei_prefix=GF_FALSE, found_sei_suffix=GF_FALSE;
+	u64 min_dts = GF_FILTER_NO_TS;
+	u32 min_dts_timescale=0;
+	GF_FilterPacket *output_pck = NULL;
+	GF_HEVCMergeCtx *ctx = (GF_HEVCMergeCtx*) gf_filter_get_udta (filter);
+
+	if (ctx->in_error)
+		return GF_BAD_PARAM;
+	nb_eos = 0;
+	nb_ipid = gf_list_count(ctx->pids);
+
+	//probe input for at least one packet on each pid
+	for (i = 0; i < nb_ipid; i++) {
+		u64 dts;
+		GF_FilterPacket *pck_src;
+		HEVCTilePidCtx *tile_pid = gf_list_get(ctx->pids, i);
+		if (tile_pid->in_error) {
+			nb_eos++;
+			continue;
+		}
+
+		pck_src = gf_filter_pid_get_packet(tile_pid->pid);
+		if (!pck_src) {
+			if (gf_filter_pid_is_eos(tile_pid->pid)) {
+				nb_eos++;
+				continue;
+			}
+			return GF_OK;
+		}
+		dts = gf_filter_pck_get_dts(pck_src);
+
+		if (dts * min_dts_timescale < min_dts * tile_pid->timescale) {
+			min_dts = dts;
+			min_dts_timescale = tile_pid->timescale;
+		}
+	}
+	if (nb_eos == nb_ipid) {
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+
+	//reassemble based on the ordered list of pids
+	for (i = 0; i < nb_ipid; i++) {
+		u64 dts;
+		GF_FilterPacket *pck_src;
+		HEVCTilePidCtx *tile_pid = gf_list_get(ctx->ordered_pids, i);
+		assert(tile_pid);
+		if (tile_pid->in_error)
+			continue;
+		pck_src = gf_filter_pid_get_packet(tile_pid->pid);
+		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_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) ));
+			continue;
+		}
+
+		dts = gf_filter_pck_get_dts(pck_src);
+		if (dts * min_dts_timescale != min_dts * tile_pid->timescale) continue;
+		data = (char *)gf_filter_pck_get_data(pck_src, &data_size); // data contains only a packet
+		// TODO: this is a clock signaling, for now just trash ..
+		if (!data) {
+			gf_filter_pid_drop_packet(tile_pid->pid);
+			continue;
+		}
+		tile_pid->nb_pck++;
+
+		//parse the access unit for this pid
+		gf_bs_reassign_buffer(ctx->bs_au_in, data, data_size);
+
+		while (gf_bs_available(ctx->bs_au_in)) {
+			u8 *output_nal;
+			u8 *nal_pck;
+			u32 nal_pck_size;
+
+			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_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));
+				}
+
+				nal_pck_size = hevcmerge_rewrite_slice(ctx, tile_pid, data + pos, nal_length);
+				nal_pck = ctx->buffer_nal;
+			}
+			//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);
+				// 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;
+					nal_pck = data + pos;
+					nal_pck_size = nal_length;
+				}
+				// Copy SEI_SUFFIX only as last nalu of the sample.
+				else if (nal_unit_type == GF_HEVC_NALU_SEI_SUFFIX && ((i+1 == nb_ipid) || !found_sei_suffix) ) {
+					found_sei_suffix = GF_TRUE;
+					if (ctx->sei_suffix_alloc<nal_length) {
+						ctx->sei_suffix_alloc = nal_length;
+						ctx->sei_suffix_buf = gf_realloc(ctx->sei_suffix_buf, nal_length);
+					}
+					ctx->sei_suffix_len = nal_length;
+					memcpy(ctx->sei_suffix_buf, data+pos, nal_length);
+					continue;
+				}
+				else continue;
+			}
+			if (!output_pck) {
+				output_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->hevc_nalu_size_length + nal_pck_size, &output_nal);
+				// todo: might need to rewrite crypto info
+				gf_filter_pck_merge_properties(pck_src, output_pck);
+			}
+			else {
+				u8 *data_start;
+				u32 new_size;
+				gf_filter_pck_expand(output_pck, ctx->hevc_nalu_size_length + nal_pck_size, &data_start, &output_nal, &new_size);
+			}
+			hevcmerge_write_nal(ctx, output_nal, nal_pck, nal_pck_size);
+		}
+		gf_filter_pid_drop_packet(tile_pid->pid);
+	}
+	// end of loop on inputs
+
+	//if we had a SEI suffix, append it
+	if (ctx->sei_suffix_len) {
+		if (output_pck) {
+			u8 *output_nal;
+			u8 *data_start;
+			u32 new_size;
+			gf_filter_pck_expand(output_pck, ctx->hevc_nalu_size_length + ctx->sei_suffix_len, &data_start, &output_nal, &new_size);
+			hevcmerge_write_nal(ctx, output_nal, ctx->sei_suffix_buf, ctx->sei_suffix_len);
+		}
+		ctx->sei_suffix_len = 0;
+	}
+
+	if (output_pck)
+		gf_filter_pck_send(output_pck);
+
+	return GF_OK;
+}
+
+static GF_Err hevcmerge_initialize(GF_Filter *filter)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[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);
+	ctx->pids = gf_list_new();
+	ctx->ordered_pids = gf_list_new();
+	return GF_OK;
+}
+
+static void hevcmerge_finalize(GF_Filter *filter)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[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);
+	if (ctx->buffer_nal_in_no_epb) gf_free(ctx->buffer_nal_in_no_epb);
+	gf_bs_del(ctx->bs_au_in);
+	gf_bs_del(ctx->bs_nal_in);
+	if (ctx->bs_nal_out)
+		gf_bs_del(ctx->bs_nal_out);
+
+	if (ctx->grid) gf_free(ctx->grid);
+	while (gf_list_count(ctx->pids)) {
+		HEVCTilePidCtx *pctx = gf_list_pop_back(ctx->pids);
+		gf_free(pctx);
+	}
+	gf_list_del(ctx->pids);
+	gf_list_del(ctx->ordered_pids);
+
+	if (ctx->sei_suffix_buf) gf_free(ctx->sei_suffix_buf);
+
+}
+
+static const GF_FilterCapability HEVCMergeCaps[] =
+{
+	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_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_HEVCMergeCtx, _n)
+
+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(mrows), "signal multiple rows in tile grid when possible", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+GF_FilterRegister HEVCMergeRegister = {
+	.name = "hevcmerge",
+	GF_FS_SET_DESCRIPTION("HEVC Tile merger")
+	GF_FS_SET_HELP("This filter merges a set of HEVC PIDs into a single motion-constrained tiled HEVC PID.\n"
+		"The filter creates a tiling grid with a single row and as many columns as needed.\n"
+		"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"
+		"## Implicit Positioning\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"
+		"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 `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 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`."
+		"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"
+		"- 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"
+		"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"
+		"Alternatively to using `SRD` and `SRDRef`, it is possible to specify `CropOrigin` property on the inputs, in which case:\n"
+		"- 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"
+	)
+	.private_size = sizeof(GF_HEVCMergeCtx),
+	SETCAPS(HEVCMergeCaps),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.initialize = hevcmerge_initialize,
+	.finalize = hevcmerge_finalize,
+	.args = HEVCMergeArgs,
+	.configure_pid = hevcmerge_configure_pid,
+	.process = hevcmerge_process,
+	.max_extra_pids = -1,
+};
+
+const GF_FilterRegister *hevcmerge_register(GF_FilterSession *session)
+{
+	return &HEVCMergeRegister;
+}
+
+#else
+const GF_FilterRegister *hevcmerge_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS

gpac-1.0.0.tar.gz/src/filters/hevcsplit.c Added

@@ -0,0 +1,962 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *					 Yacine Mathurin Boubacar Aziakou
+ *					 Samir Mustapha
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / HEVC tile split and rewrite 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/bitstream.h>
+#include <gpac/filters.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 width, height, orig_x, orig_y;
+	GF_FilterPacket *cur_pck;
+} HEVCTilePid;
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	GF_List *outputs;
+	u32 num_tiles, got_p;
+	HEVCState hevc_state;
+	u32 hevc_nalu_size_length, cfg_crc, nb_pck;
+
+	//static read/write objects to avoid allocs
+	GF_BitStream *bs_au_in;
+	GF_BitStream *bs_nal_in;
+	GF_BitStream *bs_nal_out;
+
+	//buffer where we will store the rewritten slice with EPB
+	u8 *buffer_nal;
+	u32 buffer_nal_alloc;
+
+	//buffer where we will store the rewritten slice or nal (sps, pps) without EPB
+	u8 *output_no_epb;
+	u32 output_no_epb_alloc;
+
+	//buffer where we will store the input slice without EPB - we cannot use EPB removal functions from bitstream object since
+	//we don't have gf_bs_read_data support in this mode
+	u8 *input_no_epb;
+	u32 input_no_epb_alloc;
+} GF_HEVCSplitCtx;
+
+//get tiles coordinates in as index in grid
+static u32 hevcsplit_get_slice_tile_index(HEVCState *hevc)
+{
+	u32 tile_x, tile_y;
+
+	HEVCSliceInfo si = hevc->s_info;
+	u32 i, tbX = 0, tbY = 0, slX, slY, PicWidthInCtbsY, PicHeightInCtbsX;
+
+	PicWidthInCtbsY = (si.sps->width + si.sps->max_CU_width - 1) / si.sps->max_CU_width;
+	PicHeightInCtbsX = (si.sps->height + si.sps->max_CU_height - 1) / si.sps->max_CU_height;
+
+	slY = si.slice_segment_address % PicWidthInCtbsY;
+	slX = si.slice_segment_address / PicWidthInCtbsY;
+	tile_x = 0;
+	tile_y = 0;
+	if (si.pps->tiles_enabled_flag) {
+		u32 valX, valY;
+		if (si.pps->uniform_spacing_flag) {
+			for (i = 0; i < si.pps->num_tile_rows; i++) {
+				if (i < si.pps->num_tile_rows - 1)
+					valX = (i + 1) * PicHeightInCtbsX / si.pps->num_tile_rows - i * PicHeightInCtbsX / si.pps->num_tile_rows;
+				else
+					valX = PicHeightInCtbsX - tbX;
+
+				if (slX < tbX + valX) {
+					tile_x = i;
+					break;
+				}
+
+				tbX += valX;
+			}
+			for (i = 0; i < si.pps->num_tile_columns; i++) {
+				if (i < si.pps->num_tile_columns - 1)
+					valY = (i + 1) * PicWidthInCtbsY / si.pps->num_tile_columns - i * PicWidthInCtbsY / si.pps->num_tile_columns;
+				else
+					valY = PicWidthInCtbsY - tbY;
+				if (slY < tbY + valY) {
+					tile_y = i;
+					break;
+				}
+
+				tbY += valY;
+			}
+		} else {
+			for (i = 0; i < si.pps->num_tile_rows; i++) {
+				if (i < si.pps->num_tile_rows - 1)
+					valX = si.pps->row_height[i];
+				else
+					valX = PicHeightInCtbsX - tbX;
+				if (slX < tbX + valX) {
+					tile_x = i;
+					break;
+				}
+
+				tbX += valX;
+			}
+
+			for (i = 0; i < si.pps->num_tile_columns; i++) {
+				if (i < si.pps->num_tile_columns - 1)
+					valY = si.pps->column_width[i];
+				else
+					valY = PicWidthInCtbsY - tbY;
+
+				if (slY < tbY + valY) {
+					tile_y = i;
+					break;
+				}
+				tbY += valY;
+			}
+		}
+	}
+	return tile_x * hevc->s_info.pps->num_tile_columns + tile_y;
+}
+
+//get the width and the height of the tile in pixel
+static void hevcsplit_get_tile_pixel_coords(HEVCState *hevc, u32 index_row, u32 index_col, u32 pps_id, u32 *width, u32 *height, u32 *tx, u32 *ty)
+{
+	u32 i, sps_id, tbX = 0, tbY = 0, PicWidthInCtbsY, PicHeightInCtbsX, max_CU_width, max_CU_height;
+
+	sps_id = hevc->pps[pps_id].sps_id;
+	max_CU_width = hevc->sps[sps_id].max_CU_width;
+	max_CU_height = hevc->sps[sps_id].max_CU_height;
+	PicWidthInCtbsY = (hevc->sps[sps_id].width + max_CU_width - 1) / max_CU_width;
+	PicHeightInCtbsX = (hevc->sps[sps_id].height + max_CU_height - 1) / max_CU_height;
+
+	*tx = 0;
+	*ty = 0;
+
+	if (!hevc->pps[pps_id].tiles_enabled_flag) {
+ 		*width = hevc->sps[sps_id].width;
+ 		*height = hevc->sps[sps_id].height;
+ 		return;
+	}
+
+	if (hevc->pps[pps_id].uniform_spacing_flag) {
+		if (index_row < hevc->pps[pps_id].num_tile_rows - 1) {
+			for (i = 0; i < index_row; i++)
+				tbX += ((i + 1) * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows - i * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows);
+
+			*height = (index_row + 1) * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows - index_row * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows;
+		} else {
+			for (i = 0; i < hevc->pps[pps_id].num_tile_rows - 1; i++)
+				tbX += ((i + 1) * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows - i * PicHeightInCtbsX / hevc->pps[pps_id].num_tile_rows);
+			*height = PicHeightInCtbsX - tbX;
+		}
+
+		if (index_col < hevc->pps[pps_id].num_tile_columns - 1) {
+			for (i = 0; i < index_col; i++)
+				tbY += ((i + 1) * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns - i * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns);
+			*width = (index_col + 1) * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns - index_col * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns;
+		} else {
+			for (i = 0; i < hevc->pps[pps_id].num_tile_columns - 1; i++)
+				tbY += ((i + 1) * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns - i * PicWidthInCtbsY / hevc->pps[pps_id].num_tile_columns);
+			*width = PicWidthInCtbsY - tbY;
+		}
+	} else {
+		if (index_row < hevc->pps[pps_id].num_tile_rows - 1) {
+
+			for (i = 0; i < index_row; i++)
+				tbX += hevc->pps[pps_id].row_height[i];
+
+			*height = hevc->pps[pps_id].row_height[index_row];
+		} else {
+			for (i = 0; i < hevc->pps[pps_id].num_tile_rows - 1; i++)
+				tbX += hevc->pps[pps_id].row_height[i];
+			*height = PicHeightInCtbsX - tbX;
+		}
+
+		if (index_col < hevc->pps[pps_id].num_tile_columns - 1) {
+			*width = hevc->pps[pps_id].column_width[index_col];
+
+			for (i = 0; i < index_col; i++)
+				tbY += hevc->pps[pps_id].column_width[i];
+		} else {
+			for (i = 0; i < hevc->pps[pps_id].num_tile_columns - 1; i++)
+				tbY += hevc->pps[pps_id].column_width[i];
+			*width = PicWidthInCtbsY - tbY;
+		}
+	}
+
+	*width = *width * max_CU_width;
+	*height = *height * max_CU_height;
+	*ty = tbX * max_CU_height;
+	*tx = tbY * max_CU_width;
+
+	if (*tx + *width > hevc->sps[sps_id].width)
+		*width = hevc->sps[sps_id].width - *tx;
+	if (*ty + *height > hevc->sps[sps_id].height)
+		*height = hevc->sps[sps_id].height - *ty;
+}
+
+//rewrite the profile and level
+static void hevc_write_profile_tier_level(GF_BitStream *bs_in, GF_BitStream *bs_out, Bool ProfilePresentFlag, u8 MaxNumSubLayersMinus1)
+{
+	u8 j;
+	Bool sub_layer_profile_present_flag[8], sub_layer_level_present_flag[8];
+	if (ProfilePresentFlag) {
+		gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 8), 8);
+		gf_bs_write_long_int(bs_out, gf_bs_read_long_int(bs_in, 32), 32);
+		gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 4), 4);
+		gf_bs_write_long_int(bs_out, gf_bs_read_long_int(bs_in, 44), 44);
+	}
+	gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 8), 8);
+
+	for (j = 0; j < MaxNumSubLayersMinus1; j++) {
+		sub_layer_profile_present_flag[j] = gf_bs_read_int(bs_in, 1);
+		gf_bs_write_int(bs_out, sub_layer_profile_present_flag[j], 1);
+		sub_layer_level_present_flag[j] = gf_bs_read_int(bs_in, 1);
+		gf_bs_write_int(bs_out, sub_layer_level_present_flag[j], 1);
+	}
+	if (MaxNumSubLayersMinus1 > 0)
+		for (j = MaxNumSubLayersMinus1; j < 8; j++)
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 2), 2);
+
+
+	for (j = 0; j < MaxNumSubLayersMinus1; j++) {
+		if (sub_layer_profile_present_flag[j]) {
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 8), 8);
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 32), 32);
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 4), 4);
+			gf_bs_write_long_int(bs_out, gf_bs_read_long_int(bs_in, 44), 44);
+		}
+		if (sub_layer_level_present_flag[j])
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 8), 8);
+	}
+}
+
+//also used by HEVCmerge, don't use context bitstream objects
+void hevc_rewrite_sps(char *in_SPS, u32 in_SPS_length, u32 width, u32 height, char **out_SPS, u32 *out_SPS_length)
+{
+	GF_BitStream *bs_in, *bs_out;
+	u64 length_no_use = 4096;
+	u8 *data_without_emulation_bytes = NULL;
+	u32 data_without_emulation_bytes_size = 0, sps_ext_or_max_sub_layers_minus1;
+	u8 max_sub_layers_minus1 = 0, layer_id;
+	Bool conformance_window_flag, multiLayerExtSpsFlag;
+	u32 chroma_format_idc;
+
+	bs_in = gf_bs_new(in_SPS, in_SPS_length, GF_BITSTREAM_READ);
+	gf_bs_enable_emulation_byte_removal(bs_in, GF_TRUE);
+	bs_out = gf_bs_new(NULL, length_no_use, GF_BITSTREAM_WRITE);
+	/*dst_buffer_size =*/ gf_bs_get_size(bs_out);
+	if (!bs_in) goto exit;
+
+	//copy NAL Header
+	gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 7), 7);
+	layer_id = gf_bs_read_int(bs_in, 6);
+	gf_bs_write_int(bs_out, layer_id, 6);
+	gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 3), 3);
+
+	gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 4), 4); //copy vps_id
+
+	if (layer_id == 0)
+	{
+		max_sub_layers_minus1 = gf_bs_read_int(bs_in, 3);
+		gf_bs_write_int(bs_out, max_sub_layers_minus1, 3);
+	}
+	else
+	{
+		sps_ext_or_max_sub_layers_minus1 = gf_bs_read_int(bs_in, 3);
+		gf_bs_write_int(bs_out, sps_ext_or_max_sub_layers_minus1, 3);
+	}
+	multiLayerExtSpsFlag = (layer_id != 0) && (sps_ext_or_max_sub_layers_minus1 == 7);
+	if (!multiLayerExtSpsFlag) {
+		gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 1), 1);
+		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
+
+	if (multiLayerExtSpsFlag) {
+		u8 update_rep_format_flag = gf_bs_read_int(bs_in, 1);
+		gf_bs_write_int(bs_out, update_rep_format_flag, 1);
+		if (update_rep_format_flag) {
+			gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 8), 8);
+		}
+	}
+	else {
+		chroma_format_idc = gf_bs_get_ue(bs_in);
+		gf_bs_set_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
+
+		//Copy the new width and height in output bitstream
+		gf_bs_set_ue(bs_out, width);
+		gf_bs_set_ue(bs_out, height);
+
+		//Get rid of the bit conformance_window_flag
+		conformance_window_flag = gf_bs_read_int(bs_in, 1);
+		//put the new conformance flag to zero
+		gf_bs_write_int(bs_out, 0, 1);
+
+		//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);
+		}
+	}
+
+	//copy and write the rest of the bits in the byte
+	while (gf_bs_get_bit_position(bs_in) != 8) {
+		gf_bs_write_int(bs_out, gf_bs_read_int(bs_in, 1), 1);
+	}
+
+	//copy and write the rest of the bytes
+	while (gf_bs_get_size(bs_in) != gf_bs_get_position(bs_in)) {
+		gf_bs_write_int(bs_out, gf_bs_read_u8(bs_in), 8); //watchout, not aligned in destination bitstream
+	}
+
+
+	gf_bs_align(bs_out);						//align
+
+	gf_free(data_without_emulation_bytes);
+	data_without_emulation_bytes = NULL;
+	data_without_emulation_bytes_size = 0;
+
+	gf_bs_get_content(bs_out, &data_without_emulation_bytes, &data_without_emulation_bytes_size);
+
+	*out_SPS_length = data_without_emulation_bytes_size + gf_media_nalu_emulation_bytes_add_count(data_without_emulation_bytes, data_without_emulation_bytes_size);
+	*out_SPS = gf_malloc(*out_SPS_length);
+	*out_SPS_length = gf_media_nalu_add_emulation_bytes(data_without_emulation_bytes, *out_SPS, data_without_emulation_bytes_size);
+
+	exit:
+	gf_bs_del(bs_in);
+	gf_bs_del(bs_out);
+	gf_free(data_without_emulation_bytes);
+}
+
+
+static void hevcsplit_rewrite_pps_no_grid(GF_HEVCSplitCtx *ctx, char *in_PPS, u32 in_PPS_length, char **out_PPS, u32 *out_PPS_length)
+{
+	u32 i, out_size_no_epb;
+	u8 cu_qp_delta_enabled_flag, tiles_enabled_flag, loop_filter_across_slices_enabled_flag;
+
+	gf_bs_reassign_buffer(ctx->bs_nal_in, in_PPS, in_PPS_length);
+	gf_bs_enable_emulation_byte_removal(ctx->bs_nal_in, GF_TRUE);
+
+
+	if (!ctx->bs_nal_out) ctx->bs_nal_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_nal_out, ctx->output_no_epb, ctx->output_no_epb_alloc);
+
+	//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_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_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_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
+	gf_bs_write_int(ctx->bs_nal_out, 0, 1); //discard tile enable in dest
+
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1); // entropy_coding_sync_enabled_flag
+
+	//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);
+		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);
+			for (i = 0; i < num_tile_rows_minus1; i++)
+				gf_bs_get_ue(ctx->bs_nal_in);
+		}
+		gf_bs_read_int(ctx->bs_nal_in, 1);
+	}
+
+	loop_filter_across_slices_enabled_flag = gf_bs_read_int(ctx->bs_nal_in, 1);
+	gf_bs_write_int(ctx->bs_nal_out, loop_filter_across_slices_enabled_flag, 1);
+
+	//copy and write the rest of the bits in the byte
+	while (gf_bs_get_bit_position(ctx->bs_nal_in) != 8) {
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
+	}
+
+	//copy and write the rest of the bytes
+	while (gf_bs_get_size(ctx->bs_nal_in) != gf_bs_get_position(ctx->bs_nal_in)) {
+		gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_u8(ctx->bs_nal_in), 8); //watchout, not aligned in destination bitstream
+	}
+
+	//align
+	gf_bs_align(ctx->bs_nal_out);
+
+	gf_bs_get_content_no_truncate(ctx->bs_nal_out, &ctx->output_no_epb, &out_size_no_epb, &ctx->output_no_epb_alloc);
+
+	*out_PPS_length = out_size_no_epb + gf_media_nalu_emulation_bytes_add_count(ctx->output_no_epb, out_size_no_epb);
+	*out_PPS = gf_malloc(*out_PPS_length);
+	gf_media_nalu_add_emulation_bytes(ctx->output_no_epb, *out_PPS, out_size_no_epb);
+}
+
+//return the new size slice - slice data is stored in ctx->buffer_nal
+static u32 hevcsplit_remove_slice_address(GF_HEVCSplitCtx *ctx, u8 *in_slice, u32 in_slice_length)
+{
+	u32 inslice_size_no_epb, outslice_size_epb;
+	u64 header_end;
+	u32 num_entry_point_start;
+	u32 pps_id;
+	Bool RapPicFlag = GF_FALSE;
+	HEVC_PPS *pps;
+	HEVC_SPS *sps;
+	u32 al, slice_size, slice_offset_orig, slice_offset_dst;
+	u32 first_slice_segment_in_pic_flag;
+	//u32 dependent_slice_segment_flag;
+	u8 nal_unit_type;
+	HEVCState *hevc = &ctx->hevc_state;
+
+	if (ctx->input_no_epb_alloc < in_slice_length) {
+		ctx->input_no_epb = gf_realloc(ctx->input_no_epb, in_slice_length);
+		ctx->input_no_epb_alloc = in_slice_length;
+	}
+	inslice_size_no_epb = gf_media_nalu_remove_emulation_bytes(in_slice, ctx->input_no_epb, in_slice_length);
+
+	gf_bs_reassign_buffer(ctx->bs_nal_in, ctx->input_no_epb, inslice_size_no_epb);
+	gf_bs_enable_emulation_byte_removal(ctx->bs_nal_in, GF_FALSE);
+
+	if (!ctx->bs_nal_out) ctx->bs_nal_out = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_nal_out, ctx->output_no_epb, ctx->output_no_epb_alloc);
+
+
+	assert(hevc->s_info.header_size_bits >= 0);
+	assert(hevc->s_info.entry_point_start_bits >= 0);
+	header_end = (u64) hevc->s_info.header_size_bits;
+
+	num_entry_point_start = (u32) hevc->s_info.entry_point_start_bits;
+
+	// nal_unit_header			 
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 1), 1);
+	nal_unit_type = gf_bs_read_int(ctx->bs_nal_in, 6);
+	gf_bs_write_int(ctx->bs_nal_out, nal_unit_type, 6);
+	gf_bs_write_int(ctx->bs_nal_out, gf_bs_read_int(ctx->bs_nal_in, 9), 9);
+
+	first_slice_segment_in_pic_flag = gf_bs_read_int(ctx->bs_nal_in, 1);    //first_slice_segment_in_pic_flag
+	gf_bs_write_int(ctx->bs_nal_out, 1, 1);
+
+	switch (nal_unit_type) {
+	case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+	case GF_HEVC_NALU_SLICE_IDR_N_LP:
+		RapPicFlag = GF_TRUE;
+		break;
+	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_CRA:
+		RapPicFlag = GF_TRUE;
+		break;
+	}
+
+	if (RapPicFlag) {
+		//no_output_of_prior_pics_flag
+		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 = &hevc->pps[pps_id];
+	sps = &hevc->sps[pps->sps_id];
+
+	//dependent_slice_segment_flag = 0;
+	if (!first_slice_segment_in_pic_flag && pps->dependent_slice_segments_enabled_flag) {
+		/*dependent_slice_segment_flag =*/ gf_bs_read_int(ctx->bs_nal_in, 1);
+//	} else {
+//		dependent_slice_segment_flag = GF_FALSE;
+	}
+
+	if (!first_slice_segment_in_pic_flag) {
+		gf_bs_read_int(ctx->bs_nal_in, sps->bitsSliceSegmentAddress);
+	}
+	//else original slice segment address = 0
+
+	//nothing to write for slice address, we remove the address
+
+	//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);
+	}
+
+	//no tilin, don't write num_entry_points
+
+	//write slice extension to 0
+	if (pps->slice_segment_header_extension_present_flag)
+		gf_bs_write_int(ctx->bs_nal_out, 0, 1);
+
+	//we may have unparsed data in the source bitstream (slice header) due to entry points or slice segment extensions
+	//TODO: we might want to copy over the slice extension header bits
+	while (header_end != (gf_bs_get_position(ctx->bs_nal_in) - 1) * 8 + gf_bs_get_bit_position(ctx->bs_nal_in))
+		gf_bs_read_int(ctx->bs_nal_in, 1);
+
+	//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"));
+	}
+
+	//write byte_alignment() is bit=1 + x bit=0
+	gf_bs_write_int(ctx->bs_nal_out, 1, 1);
+	gf_bs_align(ctx->bs_nal_out);					//align
+
+	 /* get output slice header*/
+	u32 outslice_size_no_epb;
+	gf_bs_get_content_no_truncate(ctx->bs_nal_out, &ctx->output_no_epb, &outslice_size_no_epb, &ctx->output_no_epb_alloc);
+	/* slice_size: the rest of the slice after the header (no_emulation_bytes in it) in source.*/
+	slice_size = (u32) gf_bs_available(ctx->bs_nal_in);
+	 /* slice_offset_orig: Immediate next byte after header_end (start of the slice_payload) */
+	slice_offset_orig = (u32) gf_bs_get_position(ctx->bs_nal_in);
+	/* slice_offset_dst: end of header in dest (=dst_buf_size since we have not copied slice data yet)*/
+	slice_offset_dst = outslice_size_no_epb;
+	/*final slice size: add source slice size */
+	outslice_size_no_epb += slice_size;
+	if (ctx->output_no_epb_alloc < outslice_size_no_epb) {
+		ctx->output_no_epb = gf_realloc(ctx->output_no_epb, outslice_size_no_epb);
+		ctx->output_no_epb_alloc = outslice_size_no_epb;
+	}
+	memcpy(ctx->output_no_epb + slice_offset_dst, ctx->input_no_epb + slice_offset_orig, sizeof(char) * slice_size);
+
+	outslice_size_epb = outslice_size_no_epb + gf_media_nalu_emulation_bytes_add_count(ctx->output_no_epb, outslice_size_no_epb);
+
+	if (ctx->buffer_nal_alloc < outslice_size_epb) {
+		ctx->buffer_nal = gf_realloc(ctx->buffer_nal, outslice_size_epb);
+		ctx->buffer_nal_alloc = outslice_size_epb;
+	}
+	gf_media_nalu_add_emulation_bytes(ctx->output_no_epb, ctx->buffer_nal, outslice_size_no_epb);
+	return outslice_size_epb;
+}
+
+static char *hevcsplit_rewrite_nal(GF_Filter *filter, GF_HEVCSplitCtx *ctx, char *in_nal, u32 in_nal_size, u32 *out_tile_index, u32 *out_nal_size)
+{
+	u8 nal_unit_type, temporal_id, layer_id;
+	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);
+	switch (nal_unit_type) {
+	//all VCL nal, remove slice address
+	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_RADL_N:
+	case GF_HEVC_NALU_SLICE_RADL_R:
+	case GF_HEVC_NALU_SLICE_RASL_N:
+	case GF_HEVC_NALU_SLICE_RASL_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:
+		*out_tile_index = hevcsplit_get_slice_tile_index(hevc);
+		buf_size = hevcsplit_remove_slice_address(ctx, in_nal, in_nal_size);
+		*out_nal_size = buf_size;
+		return ctx->buffer_nal;
+	//non-vcl, write to bitstream
+	default:
+		*out_nal_size = in_nal_size;
+		return in_nal;
+	}
+	return NULL;
+}
+
+static GF_Err hevcsplit_rewrite_dsi(GF_HEVCSplitCtx *ctx, GF_FilterPid *opid, char *data, u32 size, u32 new_width, u32 new_height)
+{
+	u32 i, j;
+	u8 *new_dsi;
+	u32 new_size;
+	GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(data, size, GF_FALSE);
+	if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+
+	// 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
+		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
+
+			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
+				char *outSPS=NULL;
+				u32 outSize=0;
+				hevc_rewrite_sps(sl->data, sl->size, new_width, new_height, &outSPS, &outSize);
+				gf_free(sl->data);
+				sl->data = outSPS;
+				sl->size= outSize;
+			}
+			else if (ar->type == GF_HEVC_NALU_VID_PARAM) {
+			}
+			else if (ar->type == GF_HEVC_NALU_PIC_PARAM) {
+				char *outPPS=NULL;
+				u32 outSize=0;
+				hevcsplit_rewrite_pps_no_grid(ctx, sl->data, sl->size, &outPPS, &outSize);
+				gf_free(sl->data);
+				sl->data = outPPS;
+				sl->size = outSize;
+			}
+		}
+	}
+	gf_odf_hevc_cfg_write(hvcc, &new_dsi, &new_size);
+	gf_odf_hevc_cfg_del(hvcc);
+
+	gf_filter_pid_set_property(opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(new_dsi, new_size));
+	return GF_OK;
+}
+
+static void hevcsplit_write_nal(char *output_nal, char *rewritten_nal, u32 out_nal_size, u32 hevc_nalu_size_length)
+{
+	u32 n = 8*(hevc_nalu_size_length);
+	while (n) {
+		u32 v = (out_nal_size >> (n-8)) & 0xFF;
+		*output_nal = v;
+		output_nal++;
+		n-=8;
+	}
+	memcpy(output_nal, rewritten_nal, out_nal_size);
+}
+
+static GF_Err hevcsplit_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 cfg_crc = 0, codecid, o_width, o_height;
+	s32 pps_id = -1, sps_id = -1;
+	const GF_PropertyValue *p, *dsi;
+	GF_Err e;
+	GF_HEVCSplitCtx *ctx = (GF_HEVCSplitCtx*)gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		u32 i, count;
+		count = gf_filter_get_opid_count(filter);
+		for (i=0; i<count; i++) {
+			GF_FilterPid *opid;
+			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){
+				gf_filter_pid_set_udta(opid, NULL);
+				gf_filter_pid_remove(opid);
+			}
+		}
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+	// checks if input pid matchs its destination filter.
+	if (!gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	codecid = p ? p->value.uint : 0;
+	if (!codecid || (codecid != GF_CODECID_HEVC)) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	cfg_crc = 0;
+	if (dsi && dsi->value.data.ptr && dsi->value.data.size) {
+		cfg_crc = gf_crc_32(dsi->value.data.ptr, dsi->value.data.size);
+	}
+	//same config, skip reconf
+	if (!dsi || (cfg_crc == ctx->cfg_crc)) return GF_OK;
+	ctx->cfg_crc = cfg_crc;
+	ctx->ipid = pid;
+
+	// parse otherwise they should refer to something else
+	u32 i, j;
+	GF_HEVCConfig *hvcc;
+
+	memset(&ctx->hevc_state, 0, sizeof(HEVCState));
+	ctx->hevc_state.full_slice_header_parse = GF_TRUE;
+
+	hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+	if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+	ctx->hevc_nalu_size_length = hvcc->nal_unit_size;
+
+	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);
+		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
+			s32 idx;
+
+			if (ar->type == GF_HEVC_NALU_SEQ_PARAM) {
+				idx = gf_media_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);
+				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);
+			}
+		}
+	}
+	gf_odf_hevc_cfg_del(hvcc);
+
+	if (pps_id < 0) return GF_NON_COMPLIANT_BITSTREAM;
+	if (sps_id < 0) return GF_NON_COMPLIANT_BITSTREAM;
+
+	o_width = ctx->hevc_state.sps[sps_id].width;
+	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));
+
+	// Done with parsing SPS/pps/vps
+	u32 rows = ctx->hevc_state.pps[pps_id].num_tile_rows;
+	u32 cols = ctx->hevc_state.pps[pps_id].num_tile_columns;
+
+	for (i = 0; i < rows; i++) {
+		for (j = 0; j < cols; j++) {
+			u32 tile_idx = i * cols + j;
+			HEVCTilePid *tpid = gf_list_get(ctx->outputs, tile_idx);
+			if (!tpid) {
+				assert(gf_list_count(ctx->outputs) == tile_idx);
+
+				GF_SAFEALLOC(tpid, HEVCTilePid);
+				if (!tpid) return GF_OUT_OF_MEM;
+				gf_list_add(ctx->outputs, tpid);
+				tpid->opid = gf_filter_pid_new(filter);
+				gf_filter_pid_set_udta(tpid->opid, tpid);
+			}
+
+			hevcsplit_get_tile_pixel_coords(&ctx->hevc_state, i, j, pps_id, &tpid->width, &tpid->height, &tpid->orig_x, &tpid->orig_y);
+			gf_filter_pid_copy_properties(tpid->opid, ctx->ipid);
+			// for each output pid, set decoder_config, width and height.
+			gf_filter_pid_set_property(tpid->opid, GF_PROP_PID_WIDTH, &PROP_UINT(tpid->width));
+			gf_filter_pid_set_property(tpid->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(tpid->height));
+			gf_filter_pid_set_property(tpid->opid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(tpid->orig_x, tpid->orig_y));
+			gf_filter_pid_set_property(tpid->opid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(o_width, o_height));
+			// rewrite the decoder config
+			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));
+		}
+	}
+	// reaggregate to form complete frame.
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static GF_Err hevcsplit_process(GF_Filter *filter)
+{
+	u32 hevc_nalu_size_length;
+	u32 data_size, nal_length, opid_idx = 0;
+	u8 temporal_id, layer_id, nal_unit_type, i;
+	u8 *data;
+	u8 *output_nal;
+	u32 out_nal_size;
+	GF_FilterPid * opid;
+	HEVCTilePid * tpid;
+	GF_HEVCSplitCtx *ctx = (GF_HEVCSplitCtx*)gf_filter_get_udta(filter);
+	GF_FilterPacket *pck_src = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck_src) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	data = (u8*)gf_filter_pck_get_data(pck_src, &data_size);
+	//this is a clock signaling, for now just trash ..
+	if (!data) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	/*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)));
+
+	while (gf_bs_available(ctx->bs_au_in)) {
+		u8 *rewritten_nal;
+		// ctx->hevc_nalu_size_length filled using hvcc
+		nal_length = gf_bs_read_int(ctx->bs_au_in, ctx->hevc_nalu_size_length * 8);
+		u32 pos = (u32) gf_bs_get_position(ctx->bs_au_in);
+		// 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);
+
+		// todo: might need to rewrite crypto info
+
+		rewritten_nal = hevcsplit_rewrite_nal(filter, ctx, data+pos, nal_length, &opid_idx, &out_nal_size);
+		if (!rewritten_nal) continue;
+
+		hevc_nalu_size_length = ctx->hevc_nalu_size_length;
+		//non-vcl NAL, forward to all outputs
+		if (nal_unit_type > 34) {
+			for (i=0; i<ctx->num_tiles; i++) {
+				opid = gf_filter_get_opid(filter, i);
+				tpid = gf_filter_pid_get_udta(opid);
+				if (!tpid->opid) {
+					continue;
+				}
+				if (!tpid->cur_pck) {
+					tpid->cur_pck = gf_filter_pck_new_alloc(tpid->opid, ctx->hevc_nalu_size_length + out_nal_size, &output_nal);
+					gf_filter_pck_merge_properties(pck_src, tpid->cur_pck);
+				} else {
+					u8 *data_start;
+					u32 new_size;
+					gf_filter_pck_expand(tpid->cur_pck, ctx->hevc_nalu_size_length + out_nal_size, &data_start, &output_nal, &new_size);
+				}
+				hevcsplit_write_nal(output_nal, rewritten_nal, out_nal_size, hevc_nalu_size_length);
+			}
+		} else {
+			opid = gf_filter_get_opid(filter, opid_idx);
+			tpid = gf_filter_pid_get_udta(opid);
+			if (!tpid->opid) {
+				continue;
+			}
+			if (!tpid->cur_pck) {
+				tpid->cur_pck = gf_filter_pck_new_alloc(tpid->opid, ctx->hevc_nalu_size_length + out_nal_size, &output_nal);
+				gf_filter_pck_merge_properties(pck_src, tpid->cur_pck);
+			} else {
+				u8 *data_start;
+				u32 new_size;
+				gf_filter_pck_expand(tpid->cur_pck, ctx->hevc_nalu_size_length + out_nal_size, &data_start, &output_nal, &new_size);
+			}
+			hevcsplit_write_nal(output_nal, rewritten_nal, out_nal_size, hevc_nalu_size_length);
+		}
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	// done rewriting all nals from input, send all output
+	for (i=0; i < ctx->num_tiles; i++) {
+		opid = gf_filter_get_opid(filter, i);
+		tpid = gf_filter_pid_get_udta(opid);
+
+		if (!tpid->opid) continue;
+		if (tpid->cur_pck) {
+			gf_filter_pck_send(tpid->cur_pck);
+			tpid->cur_pck = NULL;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err hevcsplit_initialize(GF_Filter *filter)
+{
+	GF_HEVCSplitCtx *ctx = (GF_HEVCSplitCtx *) 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);
+	ctx->outputs = gf_list_new();
+	return GF_OK;
+}
+
+static void hevcsplit_finalize(GF_Filter *filter)
+{
+	u32 i, count;
+	GF_HEVCSplitCtx *ctx = (GF_HEVCSplitCtx *) gf_filter_get_udta(filter);
+	if (ctx->buffer_nal) gf_free(ctx->buffer_nal);
+	if (ctx->output_no_epb) gf_free(ctx->output_no_epb);
+	if (ctx->input_no_epb) gf_free(ctx->input_no_epb);
+
+	gf_bs_del(ctx->bs_au_in);
+	gf_bs_del(ctx->bs_nal_in);
+	if (ctx->bs_nal_out) gf_bs_del(ctx->bs_nal_out);
+
+	count = gf_list_count(ctx->outputs);
+	for (i=0; i<count; i++) {
+		HEVCTilePid *tpid;
+		tpid = gf_list_get(ctx->outputs, i);
+		gf_free(tpid);
+	}
+	gf_list_del(ctx->outputs);
+}
+
+static const GF_FilterCapability HEVCSplitCaps[] =
+{
+	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_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_HEVC)
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_HEVCSplitCtx, _n)
+
+static const GF_FilterArgs HEVCSplitArgs[] =
+{
+	{0}
+};
+
+GF_FilterRegister HEVCSplitRegister = {
+	.name = "hevcsplit",
+	GF_FS_SET_DESCRIPTION("HEVC tile spliter")
+	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),
+	SETCAPS(HEVCSplitCaps),
+	//hevc split shall be explicitly loaded
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.initialize = hevcsplit_initialize,
+	.finalize = hevcsplit_finalize,
+	.args = HEVCSplitArgs,
+	.configure_pid = hevcsplit_configure_pid,
+	.process = hevcsplit_process,
+};
+
+const GF_FilterRegister* hevcsplit_register(GF_FilterSession *session)
+{
+	return &HEVCSplitRegister;
+}
+
+#else
+const GF_FilterRegister* hevcsplit_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+

gpac-1.0.0.tar.gz/src/filters/in_atsc.c Added

@@ -0,0 +1,507 @@
+	/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					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 cache, 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->cache) {
+			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->cache) {
+			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->cache) {
+			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->cache = GF_FALSE;
+
+	if (ctx->cache) {
+		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(cache), "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.0.tar.gz/src/filters/in_dvb4linux.c Added

@@ -0,0 +1,438 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / DVB4Linux 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/constants.h>
+#include <gpac/network.h>
+
+#ifndef WIN32
+//#define GPAC_HAS_LINUX_DVB
+//#define GPAC_SIM_LINUX_DVB
+#endif
+
+
+#ifdef GPAC_HAS_LINUX_DVB
+
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifndef GPAC_SIM_LINUX_DVB
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#endif
+
+typedef struct
+{
+	//options
+	const char *src;
+	const char *chcfg;
+	u32 block_size;
+
+	//only one output pid declared
+	GF_FilterPid *pid;
+
+	u32 freq;
+	u16 vpid;
+	u16 apid;
+
+#ifndef GPAC_SIM_LINUX_DVB
+	fe_spectral_inversion_t specInv;
+	fe_modulation_t modulation;
+	fe_bandwidth_t bandwidth;
+	fe_transmit_mode_t TransmissionMode;
+	fe_guard_interval_t guardInterval;
+	fe_code_rate_t HP_CodeRate;
+	fe_code_rate_t LP_CodeRate;
+	fe_hierarchy_t hierarchy;
+#endif
+
+	int demux_fd;
+
+	char *block;
+
+} GF_DVBLinuxCtx;
+
+
+static GF_Err dvblin_tune(GF_DVBLinuxCtx *ctx)
+{
+	FILE *chanfile;
+	char line[255];
+#ifndef GPAC_SIM_LINUX_DVB
+	int demux1, front1;
+	struct dmx_pes_filter_params pesFilterParams;
+	struct dvb_frontend_parameters frp;
+	char chan_name_t[255];
+	char freq_str[255], inv[255], bw[255], lcr[255], hier[255], cr[255],
+	     mod[255], transm[255], gi[255], apid_str[255], vpid_str[255];
+	const char *chan_conf = ":%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:";
+#endif
+	char *chan_name;
+	char *tmp;
+	char frontend_name[100], demux_name[100], dvr_name[100];
+	u32 adapter_num;
+
+	if (!ctx->src) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[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"));
+		return GF_BAD_PARAM;
+	}
+	chanfile = gf_fopen(ctx->chcfg, "rb");
+	if (!chanfile) return GF_BAD_PARAM;
+
+	chan_name = (char *) ctx->src+6; // 6 = strlen("dvb://")
+
+	// support for multiple frontends
+	tmp = strchr(chan_name, '@');
+	if (tmp) {
+		adapter_num = atoi(tmp+1);
+		tmp[0] = 0;
+	} else {
+		adapter_num = 0;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Channel name %s\n", chan_name));
+
+	while(!gf_feof(chanfile)) {
+		if ( gf_fgets(line, 255, chanfile) != NULL) {
+			if (line[0]=='#') continue;
+			if (line[0]=='\r') continue;
+			if (line[0]=='\n') continue;
+
+#ifndef GPAC_SIM_LINUX_DVB
+			strncpy(chan_name_t, line, index(line, ':')-line);
+			chan_name_t[254] = 0;
+
+			if (strncmp(chan_name,chan_name_t,strlen(chan_name))==0) {
+				sscanf(strstr(line,":"), chan_conf, freq_str, inv, bw, lcr, cr, mod, transm, gi, hier, apid_str, vpid_str);
+				ctx->freq = (uint32_t) atoi(freq_str);
+				ctx->apid = (uint16_t) atoi(apid_str);
+				ctx->vpid = (uint16_t) atoi(vpid_str);
+				//Inversion
+				if(! strcmp(inv, "INVERSION_ON")) ctx->specInv = INVERSION_ON;
+				else if(! strcmp(inv, "INVERSION_OFF")) ctx->specInv = INVERSION_OFF;
+				else ctx->specInv = INVERSION_AUTO;
+				//LP Code Rate
+				if(! strcmp(lcr, "FEC_1_2")) ctx->LP_CodeRate =FEC_1_2;
+				else if(! strcmp(lcr, "FEC_2_3")) ctx->LP_CodeRate =FEC_2_3;
+				else if(! strcmp(lcr, "FEC_3_4")) ctx->LP_CodeRate =FEC_3_4;
+				else if(! strcmp(lcr, "FEC_4_5")) ctx->LP_CodeRate =FEC_4_5;
+				else if(! strcmp(lcr, "FEC_6_7")) ctx->LP_CodeRate =FEC_6_7;
+				else if(! strcmp(lcr, "FEC_8_9")) ctx->LP_CodeRate =FEC_8_9;
+				else if(! strcmp(lcr, "FEC_5_6")) ctx->LP_CodeRate =FEC_5_6;
+				else if(! strcmp(lcr, "FEC_7_8")) ctx->LP_CodeRate =FEC_7_8;
+				else if(! strcmp(lcr, "FEC_NONE")) ctx->LP_CodeRate =FEC_NONE;
+				else ctx->LP_CodeRate =FEC_AUTO;
+				//HP Code Rate
+				if(! strcmp(cr, "FEC_1_2")) ctx->HP_CodeRate =FEC_1_2;
+				else if(! strcmp(cr, "FEC_2_3")) ctx->HP_CodeRate =FEC_2_3;
+				else if(! strcmp(cr, "FEC_3_4")) ctx->HP_CodeRate =FEC_3_4;
+				else if(! strcmp(cr, "FEC_4_5")) ctx->HP_CodeRate =FEC_4_5;
+				else if(! strcmp(cr, "FEC_6_7")) ctx->HP_CodeRate =FEC_6_7;
+				else if(! strcmp(cr, "FEC_8_9")) ctx->HP_CodeRate =FEC_8_9;
+				else if(! strcmp(cr, "FEC_5_6")) ctx->HP_CodeRate =FEC_5_6;
+				else if(! strcmp(cr, "FEC_7_8")) ctx->HP_CodeRate =FEC_7_8;
+				else if(! strcmp(cr, "FEC_NONE")) ctx->HP_CodeRate =FEC_NONE;
+				else ctx->HP_CodeRate =FEC_AUTO;
+				//Modulation
+				if(! strcmp(mod, "QAM_128")) ctx->modulation = QAM_128;
+				else if(! strcmp(mod, "QAM_256")) ctx->modulation = QAM_256;
+				else if(! strcmp(mod, "QAM_64")) ctx->modulation = QAM_64;
+				else if(! strcmp(mod, "QAM_32")) ctx->modulation = QAM_32;
+				else if(! strcmp(mod, "QAM_16")) ctx->modulation = QAM_16;
+				//Bandwidth
+				if(! strcmp(bw, "BANDWIDTH_6_MHZ")) ctx->bandwidth = BANDWIDTH_6_MHZ;
+				else if(! strcmp(bw, "BANDWIDTH_7_MHZ")) ctx->bandwidth = BANDWIDTH_7_MHZ;
+				else if(! strcmp(bw, "BANDWIDTH_8_MHZ")) ctx->bandwidth = BANDWIDTH_8_MHZ;
+				//Transmission Mode
+				if(! strcmp(transm, "TRANSMISSION_MODE_2K")) ctx->TransmissionMode = TRANSMISSION_MODE_2K;
+				else if(! strcmp(transm, "TRANSMISSION_MODE_8K")) ctx->TransmissionMode = TRANSMISSION_MODE_8K;
+				//Guard Interval
+				if(! strcmp(gi, "GUARD_INTERVAL_1_32")) ctx->guardInterval = GUARD_INTERVAL_1_32;
+				else if(! strcmp(gi, "GUARD_INTERVAL_1_16")) ctx->guardInterval = GUARD_INTERVAL_1_16;
+				else if(! strcmp(gi, "GUARD_INTERVAL_1_8")) ctx->guardInterval = GUARD_INTERVAL_1_8;
+				else ctx->guardInterval = GUARD_INTERVAL_1_4;
+				//Hierarchy
+				if(! strcmp(hier, "HIERARCHY_1")) ctx->hierarchy = HIERARCHY_1;
+				else if(! strcmp(hier, "HIERARCHY_2")) ctx->hierarchy = HIERARCHY_2;
+				else if(! strcmp(hier, "HIERARCHY_4")) ctx->hierarchy = HIERARCHY_4;
+				else if(! strcmp(hier, "HIERARCHY_AUTO")) ctx->hierarchy = HIERARCHY_AUTO;
+				else ctx->hierarchy = HIERARCHY_NONE;
+
+				break;
+			}
+#endif
+
+		}
+	}
+	gf_fclose(chanfile);
+
+	sprintf(frontend_name, "/dev/dvb/adapter%d/frontend0", adapter_num);
+	sprintf(demux_name, "/dev/dvb/adapter%d/demux0", adapter_num);
+	sprintf(dvr_name, "/dev/dvb/adapter%d/dvr0", adapter_num);
+
+#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));
+		return GF_IO_ERR;
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("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));
+		return GF_IO_ERR;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Demux %s opened.\n", demux_name));
+	}
+	// Set FrontendParameters - DVB-T
+	frp.frequency = ctx->freq;
+	frp.inversion = ctx->specInv;
+	frp.u.ofdm.bandwidth = ctx->bandwidth;
+	frp.u.ofdm.code_rate_HP = ctx->HP_CodeRate;
+	frp.u.ofdm.code_rate_LP = ctx->LP_CodeRate;
+	frp.u.ofdm.constellation = ctx->modulation;
+	frp.u.ofdm.transmission_mode = ctx->TransmissionMode;
+	frp.u.ofdm.guard_interval = ctx->guardInterval;
+	frp.u.ofdm.hierarchy_information = ctx->hierarchy;
+	// Set frontend
+	if (ioctl(front1, FE_SET_FRONTEND, &frp) < 0) {
+		return GF_IO_ERR;
+	}
+
+	// Set dumex
+	pesFilterParams.pid      = 0x2000;				// Linux-DVB API take PID=2000 for FULL/RAW TS flag
+	pesFilterParams.input    = DMX_IN_FRONTEND;
+	pesFilterParams.output   = DMX_OUT_TS_TAP;
+	pesFilterParams.pes_type = DMX_PES_OTHER;
+	pesFilterParams.flags    = DMX_IMMEDIATE_START;
+	if (ioctl(demux1, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
+		return GF_IO_ERR;
+	}
+	/* The following code differs from mplayer and alike because the device is opened in blocking mode */
+	if ((ctx->demux_fd = open(dvr_name, O_RDONLY/*|O_NONBLOCK*/)) < 0) {
+		return GF_IO_ERR;
+	}
+#endif
+
+	return GF_OK;
+}
+
+static u32 gf_dvblin_get_freq_from_url(GF_DVBLinuxCtx *ctx, const char *url)
+{
+	FILE *chcfgig_file;
+	char line[255], *tmp, *channel_name;
+
+	u32 freq;
+
+	/* get rid of trailing @ */
+	tmp = strchr(url, '@');
+	if (tmp) tmp[0] = 0;
+
+	channel_name = (char *)url+6;
+
+	chcfgig_file = gf_fopen(ctx->chcfg, "rb");
+	if (!chcfgig_file) return GF_BAD_PARAM;
+
+	freq = 0;
+	while(!gf_feof(chcfgig_file)) {
+		if ( gf_fgets(line, 255, chcfgig_file) != NULL) {
+			if (line[0]=='#') continue;
+			if (line[0]=='\r') continue;
+			if (line[0]=='\n') continue;
+
+			tmp = strchr(line, ':');
+			tmp[0] = 0;
+			if (!strcmp(line, channel_name)) {
+				char *tmp2;
+				tmp++;
+				tmp2 = strchr(tmp, ':');
+				if (tmp2) tmp2[0] = 0;
+				freq = (u32)atoi(tmp);
+				break;
+			}
+		}
+	}
+	return freq;
+}
+
+GF_Err dvblin_setup_demux(GF_DVBLinuxCtx *ctx)
+{
+	GF_Err e = GF_OK;
+
+	if (!ctx->chcfg) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[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"));
+		return GF_OK;
+	}
+
+	e = dvblin_tune(ctx);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Unable to tune to frequency\n"));
+		return GF_SERVICE_ERROR;
+	}
+	return GF_OK;
+}
+
+
+
+
+GF_Err dvblin_initialize(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_DVBLinuxCtx *ctx = (GF_DVBLinuxCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->src) return GF_BAD_PARAM;
+	e = dvblin_setup_demux(ctx);
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[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));
+
+	ctx->block = gf_malloc(ctx->block_size +1);
+	return GF_OK;
+}
+
+void dvblin_finalize(GF_Filter *filter)
+{
+	GF_DVBLinuxCtx *ctx = (GF_DVBLinuxCtx *) gf_filter_get_udta(filter);
+#ifndef GPAC_SIM_LINUX_DVB
+	if (ctx->demux_fd) close(ctx->demux_fd);
+#endif
+	if (ctx->block) gf_free(ctx->block);
+}
+
+GF_FilterProbeScore dvblin_probe_url(const char *url, const char *mime_type)
+{
+	if (!strnicmp(url, "dvb://", 6)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+
+static Bool dvblin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_DVBLinuxCtx *ctx = (GF_DVBLinuxCtx *) gf_filter_get_udta(filter);
+
+	if (!evt->base.on_pid) return GF_FALSE;
+	if (evt->base.on_pid != ctx->pid) return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		dvblin_setup_demux(ctx);
+		return GF_TRUE;
+	case GF_FEVT_STOP:
+#ifndef GPAC_SIM_LINUX_DVB
+		if (ctx->demux_fd) close(ctx->demux_fd);
+		ctx->demux_fd = 0;
+#endif
+		return GF_TRUE;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+static GF_Err dvblin_process(GF_Filter *filter)
+{
+	GF_FilterPacket *dst_pck;
+	u8 *out_data;
+	GF_DVBLinuxCtx *ctx = (GF_DVBLinuxCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->freq) return GF_EOS;
+
+#ifndef GPAC_SIM_LINUX_DVB
+	u32 nb_read = read(ctx->demux_fd, ctx->block, ctx->block_size);
+	if (!nb_read) return GF_OK;
+#endif
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->pid, nb_read, &out_data);
+	memcpy(out_data, ctx->block, nb_read);
+	gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+#else
+static GF_Err dvblin_process(GF_Filter *filter)
+{
+	return GF_EOS;
+}
+#endif //GPAC_HAS_LINUX_DVB
+
+
+#ifdef GPAC_HAS_LINUX_DVB
+#define OFFS(_n)	#_n, offsetof(GF_DVBLinuxCtx, _n)
+#else
+#define OFFS(_n)	#_n, -1
+#endif
+
+static const GF_FilterArgs DVBLinuxArgs[] =
+{
+	{ OFFS(src), "location 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}
+};
+
+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]()")
+	.args = DVBLinuxArgs,
+#ifdef GPAC_HAS_LINUX_DVB
+	.private_size = sizeof(GF_DVBLinuxCtx),
+	.initialize = dvblin_initialize,
+	.finalize = dvblin_finalize,
+	.process = dvblin_process,
+	.process_event = dvblin_process_event,
+	.probe_url = dvblin_probe_url
+#else
+	.process = dvblin_process,
+#endif
+};
+
+const GF_FilterRegister *dvblin_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_HAS_LINUX_DVB) || defined(GPAC_SIM_LINUX_DVB)
+	if (!gf_opts_get_bool("temp", "gendoc"))
+		return NULL;
+	DVBLinuxRegister.version = "! Warning: DVB4Linux NOT AVAILABLE IN THIS BUILD !";
+#endif
+	return &DVBLinuxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/in_file.c Added

@@ -0,0 +1,576 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic FILE 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/constants.h>
+
+enum{
+	FILE_RAND_NONE=0,
+	FILE_RAND_ANY,
+	FILE_RAND_SC_ANY,
+	FILE_RAND_SC_AVC,
+	FILE_RAND_SC_HEVC,
+	FILE_RAND_SC_AV1
+};
+
+typedef struct
+{
+	//options
+	char *src;
+	char *ext, *mime;
+	u32 block_size;
+	GF_Fraction64 range;
+
+	//only one output pid declared
+	GF_FilterPid *pid;
+
+	FILE *file;
+	u64 file_size;
+	u64 file_pos, end_pos;
+	Bool is_end, pck_out;
+	Bool is_null;
+	Bool full_file_only;
+	Bool do_reconfigure;
+	char *block;
+	u32 is_random;
+	Bool cached_set;
+	Bool no_failure;
+} GF_FileInCtx;
+
+
+static GF_Err filein_initialize(GF_Filter *filter)
+{
+	GF_FileInCtx *ctx = (GF_FileInCtx *) gf_filter_get_udta(filter);
+	FILE *old_file = NULL;
+	char *ext_start = NULL;
+	char *frag_par = NULL;
+	char *cgi_par = NULL;
+	char *src, *path;
+	const char *prev_url=NULL;
+
+	if (!ctx || !ctx->src) return GF_BAD_PARAM;
+
+	if (!strcmp(ctx->src, "null")) {
+		ctx->pid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+		gf_filter_pid_set_eos(ctx->pid);
+		ctx->is_end = GF_TRUE;
+		return GF_OK;
+	}
+	if (!strcmp(ctx->src, "rand") || !strcmp(ctx->src, "randsc")) {
+		gf_rand_init(GF_FALSE);
+		ctx->is_random = FILE_RAND_ANY;
+		if (!strcmp(ctx->src, "randsc")) {
+			ctx->is_random = FILE_RAND_SC_ANY;
+			if (ctx->mime) {
+				if (!strcmp(ctx->mime, "video/avc")) ctx->is_random = FILE_RAND_SC_AVC;
+				if (!strcmp(ctx->mime, "video/hevc")) ctx->is_random = FILE_RAND_SC_HEVC;
+				if (!strcmp(ctx->mime, "video/av1")) ctx->is_random = FILE_RAND_SC_AV1;
+			}
+		}
+
+		if (!ctx->block_size) ctx->block_size = 5000;
+		while (ctx->block_size % 4) ctx->block_size++;
+		ctx->block = gf_malloc(ctx->block_size +1);
+		return GF_OK;
+	}
+
+
+
+	if (strnicmp(ctx->src, "file:/", 6) && strnicmp(ctx->src, "gfio:/", 6) && strstr(ctx->src, "://"))  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		return GF_NOT_SUPPORTED;
+	}
+	path = strstr(ctx->src, "://");
+	if (path) path += 3;
+	if (path && strstr(path, "://")) {
+		ctx->is_end = GF_TRUE;
+		return gf_filter_pid_raw_new(filter, path, path, NULL, NULL, NULL, 0, GF_TRUE, &ctx->pid);
+	}
+
+	//local file
+
+	//strip any fragment identifer
+	ext_start = gf_file_ext_start(ctx->src);
+	frag_par = strchr(ext_start ? ext_start : ctx->src, '#');
+	if (frag_par) frag_par[0] = 0;
+	cgi_par = strchr(ctx->src, '?');
+	if (cgi_par) cgi_par[0] = 0;
+
+	src = (char *) ctx->src;
+	if (!strnicmp(ctx->src, "file://", 7)) src += 7;
+	else if (!strnicmp(ctx->src, "file:", 5)) src += 5;
+
+	//for gfio, do not close file until we open the new one
+	if (ctx->do_reconfigure) {
+		old_file = ctx->file;
+		ctx->file = NULL;
+		if (gf_fileio_check(old_file))
+			prev_url = gf_fileio_url((GF_FileIO *)old_file);
+	}
+
+	if (!ctx->file) {
+		ctx->file = gf_fopen_ex(src, prev_url, "rb");
+	}
+
+	if (old_file) {
+		gf_fclose(old_file);
+	}
+
+	if (!ctx->file) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileIn] Failed to open %s\n", src));
+
+		if (frag_par) frag_par[0] = '#';
+		if (cgi_par) cgi_par[0] = '?';
+
+		if (ctx->no_failure) {
+			gf_filter_notification_failure(filter, GF_URL_ERROR, GF_FALSE);
+			ctx->is_end = GF_TRUE;
+			return GF_OK;
+		}
+
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode() && !strcmp(src, "blob"))
+			return GF_OK;
+#endif
+		return GF_URL_ERROR;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileIn] opening %s\n", src));
+	ctx->file_size = gf_fsize(ctx->file);
+
+	ctx->cached_set = GF_FALSE;
+	ctx->full_file_only = GF_FALSE;
+
+	if (ctx->do_reconfigure && gf_fileio_check(ctx->file)) {
+		GF_FileIO *gfio = (GF_FileIO *)ctx->file;
+		gf_free(ctx->src);
+		ctx->src = gf_strdup(gf_fileio_url(gfio));
+	}
+
+
+	ctx->file_pos = ctx->range.num;
+	if (ctx->range.den) {
+		ctx->end_pos = ctx->range.den;
+		if (ctx->end_pos>ctx->file_size) {
+			ctx->range.den = ctx->end_pos = ctx->file_size;
+		}
+	}
+	gf_fseek(ctx->file, ctx->file_pos, SEEK_SET);
+	ctx->is_end = GF_FALSE;
+
+	if (frag_par) frag_par[0] = '#';
+	if (cgi_par) cgi_par[0] = '?';
+
+	if (!ctx->block) {
+		if (!ctx->block_size) {
+			if (ctx->file_size>500000000) ctx->block_size = 1000000;
+			else ctx->block_size = 5000;
+		}
+		ctx->block = gf_malloc(ctx->block_size +1);
+	}
+	return GF_OK;
+}
+
+static void filein_finalize(GF_Filter *filter)
+{
+	GF_FileInCtx *ctx = (GF_FileInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->file) gf_fclose(ctx->file);
+	if (ctx->block) gf_free(ctx->block);
+}
+
+static GF_FilterProbeScore filein_probe_url(const char *url, const char *mime_type)
+{
+	char *ext_start = NULL;
+	char *frag_par = NULL;
+	char *cgi_par = NULL;
+	char *src = (char *) url;
+	Bool res;
+
+	if (!strcmp(url, "-") || !strcmp(url, "stdin")) return GF_FPROBE_NOT_SUPPORTED;
+
+	if (!strnicmp(url, "file://", 7)) src += 7;
+	else if (!strnicmp(url, "file:", 5)) src += 5;
+
+	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(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;
+	}
+
+	//strip any fragment identifer
+	ext_start = gf_file_ext_start(url);
+	frag_par = strchr(ext_start ? ext_start : url, '#');
+	if (frag_par) frag_par[0] = 0;
+	cgi_par = strchr(url, '?');
+	if (cgi_par) cgi_par[0] = 0;
+
+	res = gf_file_exists(src);
+
+	if (frag_par) frag_par[0] = '#';
+	if (cgi_par) cgi_par[0] = '?';
+
+	return res ? GF_FPROBE_SUPPORTED : GF_FPROBE_NOT_SUPPORTED;
+}
+
+static Bool filein_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FileInCtx *ctx = (GF_FileInCtx *) gf_filter_get_udta(filter);
+
+	if (evt->base.on_pid && (evt->base.on_pid != ctx->pid))
+		return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+	case GF_FEVT_PLAY_HINT:
+		ctx->full_file_only = evt->play.full_file_only;
+		return GF_TRUE;
+	case GF_FEVT_STOP:
+		//stop sending data
+		ctx->is_end = GF_TRUE;
+		gf_filter_pid_set_eos(ctx->pid);
+		return GF_TRUE;
+	case GF_FEVT_SOURCE_SEEK:
+		if (ctx->is_random)
+			return GF_TRUE;
+		if (ctx->file_size && (evt->seek.start_offset >= ctx->file_size)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileIn] Seek request outside of file %s range ("LLU" vs size "LLU")\n", ctx->src, evt->seek.start_offset, ctx->file_size));
+			return GF_TRUE;
+		}
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileIn] Asked to seek source to range "LLU"-"LLU"\n", evt->seek.start_offset, evt->seek.end_offset));
+		ctx->is_end = GF_FALSE;
+
+		if (gf_fileio_check(ctx->file)) {
+			ctx->cached_set = GF_FALSE;
+		}
+
+		if (ctx->file) {
+			int res = gf_fseek(ctx->file, evt->seek.start_offset, SEEK_SET);
+			if (res) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileIn] Seek on file failed: %d\n", res));
+				return GF_TRUE;
+			}
+		}
+
+		ctx->file_pos = evt->seek.start_offset;
+		ctx->end_pos = evt->seek.end_offset;
+		if (ctx->end_pos>ctx->file_size) ctx->end_pos = ctx->file_size;
+		ctx->range.num = evt->seek.start_offset;
+		ctx->range.den = ctx->end_pos;
+		if (evt->seek.hint_block_size > ctx->block_size) {
+			ctx->block_size = evt->seek.hint_block_size;
+			ctx->block = gf_realloc(ctx->block, ctx->block_size+1);
+		}
+		return GF_TRUE;
+	case GF_FEVT_SOURCE_SWITCH:
+		if (ctx->is_random)
+			return GF_TRUE;
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileIn] Asked to switch source to %s (range "LLU"-"LLU")\n", evt->seek.source_switch ? evt->seek.source_switch : "self", evt->seek.start_offset, evt->seek.end_offset));
+		assert(ctx->is_end);
+		ctx->range.num = evt->seek.start_offset;
+		ctx->range.den = evt->seek.end_offset;
+		if (evt->seek.source_switch) {
+			if (strcmp(evt->seek.source_switch, ctx->src)) {
+				gf_free(ctx->src);
+				ctx->src = gf_strdup(evt->seek.source_switch);
+			}
+			ctx->do_reconfigure = GF_TRUE;
+		}
+		//don't send a setup failure on source switch (this would destroy ourselves which we don't want in DASH)
+		ctx->no_failure = GF_TRUE;
+		filein_initialize(filter);
+		gf_filter_post_process_task(filter);
+		break;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+
+static void filein_pck_destructor(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_FileInCtx *ctx = (GF_FileInCtx *) gf_filter_get_udta(filter);
+	ctx->pck_out = GF_FALSE;
+	//ready to process again
+	gf_filter_post_process_task(filter);
+}
+
+static GF_Err filein_process(GF_Filter *filter)
+{
+	GF_Err e;
+	u32 nb_read, to_read;
+	u64 lto_read;
+	GF_FilterPacket *pck;
+	GF_FileInCtx *ctx = (GF_FileInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->is_end)
+		return GF_EOS;
+
+	//until packet is released we return EOS (no processing), and ask for processing again upon release
+	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);
+		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;
+		gf_filter_pck_send(pck);
+		gf_filter_pid_set_eos(ctx->pid);
+
+		if (ctx->file_size && gf_filter_reporting_enabled(filter)) {
+			char szStatus[1024], *szSrc;
+			szSrc = gf_file_basename(ctx->src);
+
+			sprintf(szStatus, "%s: EOS (dispatch canceled after "LLD" b, file size "LLD" b)", szSrc, (s64) ctx->file_pos, (s64) ctx->file_size);
+			gf_filter_update_status(filter, 10000, szStatus);
+		}
+		return GF_OK;
+	}
+	if (ctx->is_random) {
+		u32 i;
+		if (ctx->is_random>=FILE_RAND_SC_ANY) {
+			for (i=0; i<ctx->block_size; i+= 4) {
+				u32 val = gf_rand();
+
+				if (i+4>=ctx->block_size) {
+					* ((u32 *) (ctx->block + i)) = val;
+					continue;
+				}
+				if (val % 100) {
+					* ((u32 *) (ctx->block + i)) = val;
+					continue;
+				}
+				if (ctx->is_random==FILE_RAND_SC_AVC) {
+					u32 rand_high = val>>24;
+					* ((u32 *) (ctx->block + i)) = 0x00000001;
+					i += 4;
+					val &= 0x00FFFFFF;
+					rand_high = rand_high%31;
+					rand_high <<= 24;
+					val |= rand_high;
+					* ((u32 *) (ctx->block + i)) = val;
+				} else if (ctx->is_random==FILE_RAND_SC_HEVC) {
+					u32 rand_high = val>>16;
+					* ((u32 *) (ctx->block + i)) = 0x00000001;
+					i += 4;
+					val &= 0x0000FFFF;
+					rand_high = rand_high % 63;
+					rand_high <<= 8;
+					rand_high |= 1; //end of layerid (=0) and temporal sublayer (=1)
+					rand_high <<= 16;
+					val |= rand_high;
+					* ((u32 *) (ctx->block + i)) = val;
+				}
+				else {
+					val &= 0x000001FF;
+					* ((u32 *) (ctx->block + i)) = val;
+				}
+			}
+		} else {
+			for (i=0; i<ctx->block_size; i+= 4) {
+				* ((u32 *) (ctx->block + i)) = gf_rand();
+			}
+		}
+		ctx->block[ctx->block_size]=0;
+
+		if (!ctx->pid) {
+			e = gf_filter_pid_raw_new(filter, ctx->src, ctx->src, ctx->mime, ctx->ext, ctx->block, ctx->block_size, GF_TRUE,  &ctx->pid);
+			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;
+
+		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);
+		ctx->file_pos += ctx->block_size;
+
+		ctx->pck_out = GF_TRUE;
+		gf_filter_pck_send(pck);
+		return GF_OK;
+	}
+
+	//compute size to read as u64 (large file)
+	if (ctx->end_pos > ctx->file_pos)
+		lto_read = ctx->end_pos - ctx->file_pos;
+	else if (ctx->file_size)
+		lto_read = ctx->file_size - ctx->file_pos;
+	else
+		lto_read = ctx->block_size;
+
+	//and clamp based on blocksize as u32
+	if (lto_read > (u64) ctx->block_size)
+		to_read = (u64) ctx->block_size;
+	else
+		to_read = (u32) lto_read;
+
+	nb_read = (u32) gf_fread(ctx->block, to_read, ctx->file);
+	if (!nb_read)
+		ctx->file_size = ctx->file_pos;
+
+	ctx->block[nb_read] = 0;
+	if (!ctx->pid || ctx->do_reconfigure) {
+		ctx->do_reconfigure = GF_FALSE;
+		e = gf_filter_pid_raw_new(filter, ctx->src, ctx->src, ctx->mime, ctx->ext, ctx->block, nb_read, GF_TRUE, &ctx->pid);
+		if (e) return e;
+
+		if (!gf_fileio_check(ctx->file)) {
+			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_TRUE) );
+
+			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_DOWN_SIZE, ctx->file_size ? &PROP_LONGUINT(ctx->file_size) : NULL);
+
+			ctx->cached_set = GF_TRUE;
+		}
+
+		if (ctx->range.num || ctx->range.den)
+			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_RANGE, &PROP_FRAC64(ctx->range) );
+	}
+
+	//GFIO wrapper, gets stats and update
+	if (!ctx->cached_set) {
+		u64 bdone, btotal;
+		Bool fcached;
+		u32 bytes_per_sec;
+		if (gf_fileio_get_stats((GF_FileIO *)ctx->file, &bdone, &btotal, &fcached, &bytes_per_sec)) {
+			if (fcached) {
+				gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(fcached) );
+				ctx->cached_set = GF_TRUE;
+			}
+
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(btotal) );
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(bdone) );
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT(bytes_per_sec*8) );
+		}
+	}
+
+	pck = gf_filter_pck_new_shared(ctx->pid, ctx->block, nb_read, filein_pck_destructor);
+	if (!pck)
+		return GF_OK;
+
+	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 (nb_read < to_read) {
+			Bool is_eof;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[FileIn] Asked to read %d but got only %d\n", to_read, nb_read));
+
+			is_eof = gf_feof(ctx->file);
+
+			if (is_eof) {
+				gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(ctx->file_size) );
+				ctx->is_end = GF_TRUE;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileIn] IO error EOF found after reading %d bytes but file %s size is %d\n", ctx->file_pos+nb_read, ctx->src, ctx->file_size));
+			}
+		} else {
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(ctx->file_pos) );
+		}
+	}
+	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->file_pos += nb_read;
+
+	ctx->pck_out = GF_TRUE;
+	gf_filter_pck_send(pck);
+
+	if (ctx->file_size && gf_filter_reporting_enabled(filter)) {
+		char szStatus[1024], *szSrc;
+		szSrc = gf_file_basename(ctx->src);
+
+		sprintf(szStatus, "%s: % 16"LLD_SUF" /% 16"LLD_SUF" (%02.02f)", szSrc, (s64) ctx->file_pos, (s64) ctx->file_size, ((Double)ctx->file_pos*100.0)/ctx->file_size);
+		gf_filter_update_status(filter, (u32) (ctx->file_pos*10000/ctx->file_size), szStatus);
+	}
+
+	if (ctx->is_end) {
+		gf_filter_pid_set_eos(ctx->pid);
+		return GF_EOS;
+	}
+	return ctx->pck_out ? GF_EOS : GF_OK;
+}
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_FileInCtx, _n)
+
+static const GF_FilterArgs FileInArgs[] =
+{
+	{ OFFS(src), "location of source content", 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},
+	{ OFFS(mime), "set file mime type", GF_PROP_NAME, NULL, NULL, 0},
+	{0}
+};
+
+static const GF_FilterCapability FileInCaps[] =
+{
+	CAP_UINT(GF_CAPS_OUTPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister FileInRegister = {
+	.name = "fin",
+	GF_FS_SET_DESCRIPTION("File input")
+	GF_FS_SET_HELP("This filter dispatch raw blocks from input file into a filter chain.\n"
+	"Block size can be adjusted using [-block_size]().\n"
+	"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.\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"
+	"\n"
+	"The filter handles both files and GF_FileIO objects as input URL.\n"
+	)
+	.private_size = sizeof(GF_FileInCtx),
+	.args = FileInArgs,
+	.initialize = filein_initialize,
+	SETCAPS(FileInCaps),
+	.finalize = filein_finalize,
+	.process = filein_process,
+	.process_event = filein_process_event,
+	.probe_url = filein_probe_url
+};
+
+
+const GF_FilterRegister *filein_register(GF_FilterSession *session)
+{
+	return &FileInRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/in_http.c Added

@@ -0,0 +1,477 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / HTTP input filter using GPAC http stack
+ *
+ *  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>
+
+
+typedef enum
+{
+	GF_HTTPIN_STORE_DISK=0,
+	GF_HTTPIN_STORE_DISK_KEEP,
+	GF_HTTPIN_STORE_MEM,
+	GF_HTTPIN_STORE_NONE,
+} GF_HTTPInStoreMode;
+
+typedef struct
+{
+	//options
+	char *src;
+	u32 block_size;
+	GF_HTTPInStoreMode cache;
+	GF_Fraction64 range;
+	char *ext;
+	char *mime;
+
+	//internal
+	Bool initial_ack_done;
+	GF_DownloadManager *dm;
+
+	//only one output pid declared
+	GF_FilterPid *pid;
+
+	GF_DownloadSession *sess;
+
+	char *block;
+	Bool pck_out, is_end;
+	u64 nb_read, file_size;
+	FILE *cached;
+
+	Bool do_reconfigure;
+	Bool full_file_only;
+	GF_Err last_state;
+} GF_HTTPInCtx;
+
+static void httpin_notify_error(GF_Filter *filter, GF_HTTPInCtx *ctx, GF_Err e)
+{
+	if (filter && (ctx->last_state == GF_OK)) {
+		if (!ctx->initial_ack_done) {
+			gf_filter_setup_failure(filter, e);
+			ctx->initial_ack_done = GF_TRUE;
+		} else {
+			gf_filter_notification_failure(filter, e, GF_FALSE);
+		}
+		ctx->last_state = e;
+	}
+}
+
+static GF_Err httpin_initialize(GF_Filter *filter)
+{
+	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
+	GF_Err e;
+	char *server;
+	u32 flags = 0;
+
+	if (!ctx || !ctx->src) return GF_BAD_PARAM;
+	ctx->dm = gf_filter_get_download_manager(filter);
+	if (!ctx->dm) return GF_SERVICE_ERROR;
+
+	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;
+
+	server = strstr(ctx->src, "://");
+	if (server) server += 3;
+	if (server && strstr(server, "://")) {
+		ctx->is_end = GF_TRUE;
+		return gf_filter_pid_raw_new(filter, server, server, NULL, NULL, NULL, 0, GF_FALSE, &ctx->pid);
+	}
+
+	ctx->sess = gf_dm_sess_new(ctx->dm, ctx->src, flags, NULL, NULL, &e);
+	if (e) {
+		gf_filter_setup_failure(filter, e);
+		ctx->initial_ack_done = GF_TRUE;
+		return e;
+	}
+	if (ctx->range.den) {
+		gf_dm_sess_set_range(ctx->sess, ctx->range.num, ctx->range.den, GF_TRUE);
+	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode())
+		httpin_notify_error(NULL, NULL, GF_OK);
+#endif
+
+	return GF_OK;
+}
+
+void httpin_finalize(GF_Filter *filter)
+{
+	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->sess) gf_dm_sess_del(ctx->sess);
+
+	if (ctx->block) gf_free(ctx->block);
+	if (ctx->cached) gf_fclose(ctx->cached);
+}
+
+static GF_FilterProbeScore httpin_probe_url(const char *url, const char *mime_type)
+{
+	if (!strnicmp(url, "http://", 7) ) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "https://", 8) ) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "gmem://", 7) ) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static Bool httpin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_Err e;
+	GF_HTTPInCtx *ctx = (GF_HTTPInCtx *) gf_filter_get_udta(filter);
+
+	if (evt->base.on_pid && (evt->base.on_pid != ctx->pid)) return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		ctx->is_end = GF_FALSE;
+		ctx->full_file_only = evt->play.full_file_only;
+		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;
+			if (ctx->sess) {
+				gf_dm_sess_abort(ctx->sess);
+				gf_dm_sess_del(ctx->sess);
+				ctx->sess = NULL;
+			}
+		}
+		return GF_TRUE;
+	case GF_FEVT_SOURCE_SEEK:
+		if (evt->seek.start_offset < ctx->file_size) {
+			ctx->is_end = GF_FALSE;
+			//open cache if needed
+			if (!ctx->cached && ctx->file_size && (ctx->nb_read==ctx->file_size) && ctx->sess) {
+				const char *cached = gf_dm_sess_get_cache_name(ctx->sess);
+				if (cached) ctx->cached = gf_fopen(cached, "rb");
+			}
+			ctx->nb_read = evt->seek.start_offset;
+
+			if (ctx->cached) {
+				gf_fseek(ctx->cached, ctx->nb_read, SEEK_SET);
+			} else if (ctx->sess) {
+				gf_dm_sess_abort(ctx->sess);
+				gf_dm_sess_set_range(ctx->sess, ctx->nb_read, 0, GF_TRUE);
+			}
+			ctx->range.den = 0;
+			ctx->range.num = ctx->nb_read;
+			ctx->last_state = GF_OK;
+		} 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);
+		}
+		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) {
+				gf_dm_delete_cached_file_entry_session(ctx->sess, ctx->src);
+			}
+			if (ctx->src) gf_free(ctx->src);
+			ctx->src = gf_strdup(evt->seek.source_switch);
+		}
+		if (ctx->cached) gf_fclose(ctx->cached);
+		ctx->cached = NULL;
+
+		//abort type
+		if (evt->seek.start_offset == (u64) -1) {
+			if (!ctx->is_end) {
+				if (ctx->sess)
+					gf_dm_sess_abort(ctx->sess);
+				ctx->is_end = GF_TRUE;
+				gf_filter_pid_set_eos(ctx->pid);
+			}
+			ctx->nb_read = 0;
+			ctx->last_state = GF_OK;
+			return GF_TRUE;
+		}
+		ctx->last_state = GF_OK;
+		if (ctx->sess) {
+			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;
+			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) ) );
+			httpin_notify_error(filter, ctx, e);
+			ctx->is_end = GF_TRUE;
+			if (ctx->src) gf_free(ctx->src);
+			ctx->src = NULL;
+			return GF_TRUE;
+		}
+		ctx->nb_read = ctx->file_size = 0;
+		ctx->do_reconfigure = GF_TRUE;
+		ctx->is_end = GF_FALSE;
+		ctx->last_state = GF_OK;
+		gf_filter_post_process_task(filter);
+		return GF_TRUE;
+	default:
+		break;
+	}
+	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)
+{
+	Bool is_start;
+	u32 nb_read=0;
+	GF_FilterPacket *pck;
+	GF_Err e=GF_OK;
+	u32 bytes_per_sec=0;
+	u64 bytes_done=0, total_size, byte_offset;
+	GF_NetIOStatus net_status;
+	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
+	if (ctx->pck_out)
+		return GF_EOS;
+
+	if (ctx->is_end)
+		return GF_EOS;
+
+	if (!ctx->sess)
+		return GF_EOS;
+
+	if (!ctx->pid) {
+		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))
+			return GF_OK;
+	}
+
+	is_start = ctx->nb_read ? GF_FALSE : GF_TRUE;
+	ctx->is_end = GF_FALSE;
+
+	//we read from cache file
+	if (ctx->cached) {
+		u32 to_read;
+		u64 lto_read = ctx->file_size - ctx->nb_read;
+
+		if (lto_read > (u64) ctx->block_size)
+			to_read = (u64) ctx->block_size;
+		else
+			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);
+			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;
+			gf_filter_pck_send(pck);
+
+			gf_filter_pid_set_eos(ctx->pid);
+			return GF_EOS;
+		}
+		nb_read = (u32) gf_fread(ctx->block, to_read, ctx->cached);
+		bytes_per_sec = 0;
+
+	}
+	//we read from network
+	else {
+
+		e = gf_dm_sess_fetch_data(ctx->sess, ctx->block, ctx->block_size, &nb_read);
+		if (e<0) {
+			if (e==GF_IP_NETWORK_EMPTY) {
+				if (ctx->pid) {
+					gf_dm_sess_get_stats(ctx->sess, NULL, NULL, NULL, NULL, &bytes_per_sec, NULL);
+					gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_RATE, &PROP_UINT(8*bytes_per_sec) );
+				}
+				gf_filter_ask_rt_reschedule(filter, 1000);
+				return GF_OK;
+			}
+			if (! ctx->nb_read)
+				httpin_notify_error(filter, ctx, e);
+
+			ctx->is_end = GF_TRUE;
+			if (ctx->pid)
+				gf_filter_pid_set_eos(ctx->pid);
+			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 (!ctx->pid || ctx->do_reconfigure) {
+			u32 idx;
+			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);
+				} 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;
+
+			gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
+
+			if (!ctx->initial_ack_done) {
+				ctx->initial_ack_done = GF_TRUE;
+				gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_DOWNLOAD_SESSION, &PROP_POINTER( (void*)ctx->sess ) );
+			}
+
+			/*in test mode don't expose http headers (they contain date/version/etc)*/
+			if (! gf_sys_is_test_mode()) {
+				idx = 0;
+				while (gf_dm_sess_enum_headers(ctx->sess, &idx, &hname, &hval) == GF_OK) {
+					gf_filter_pid_set_property_dyn(ctx->pid, (char *) hname, & PROP_STRING(hval));
+				}
+			}
+		}
+
+		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) {
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(bytes_done + ctx->range.num) );
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(ctx->file_size) );
+		} else {
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT(bytes_done) );
+			gf_filter_pid_set_info(ctx->pid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(ctx->file_size ? ctx->file_size : bytes_done) );
+		}
+	}
+
+	byte_offset = ctx->nb_read;
+
+	ctx->nb_read += nb_read;
+	if (ctx->file_size && (ctx->nb_read==ctx->file_size)) {
+		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;
+
+	gf_filter_pck_set_cts(pck, 0);
+
+	gf_filter_pck_set_framing(pck, is_start, ctx->is_end);
+	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+	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;
+	gf_filter_pck_send(pck);
+
+	if (ctx->file_size && gf_filter_reporting_enabled(filter)) {
+		char szStatus[1024], *szSrc;
+		szSrc = gf_file_basename(ctx->src);
+
+		sprintf(szStatus, "%s: % 16"LLD_SUF" /% 16"LLD_SUF" (%02.02f) % 8d kbps", szSrc, (s64) bytes_done, (s64) ctx->file_size, ((Double)bytes_done*100.0)/ctx->file_size, bytes_per_sec*8/1000);
+		gf_filter_update_status(filter, (u32) (bytes_done*10000/ctx->file_size), szStatus);
+	}
+
+	if (ctx->is_end) {
+		const char *cached = gf_dm_sess_get_cache_name(ctx->sess);
+		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);
+		return GF_EOS;
+	}
+
+	return ctx->pck_out ? GF_EOS : GF_OK;
+}
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_HTTPInCtx, _n)
+
+static const GF_FilterArgs HTTPInArgs[] =
+{
+	{ OFFS(src), "location 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"
+	"- disk: 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},
+	{ 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},
+	{0}
+};
+
+static const GF_FilterCapability HTTPInCaps[] =
+{
+	CAP_UINT(GF_CAPS_OUTPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister HTTPInRegister = {
+	.name = "httpin",
+	GF_FS_SET_DESCRIPTION("HTTP input")
+	GF_FS_SET_HELP("This filter dispatch raw blocks from a remote HTTP resource into a filter chain.\n"
+	"Block size can be adjusted using [-block_size](), and disk caching policies can be adjusted.\n"
+	"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,
+	.finalize = httpin_finalize,
+	.process = httpin_process,
+	.process_event = httpin_process_event,
+	.probe_url = httpin_probe_url
+};
+
+
+const GF_FilterRegister *httpin_register(GF_FilterSession *session)
+{
+	return &HTTPInRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/in_pipe.c Added

@@ -0,0 +1,534 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / pipe 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/constants.h>
+#include <gpac/network.h>
+
+#ifdef WIN32
+
+#include <windows.h>
+
+#else
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifdef GPAC_CONFIG_LINUX
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+#ifndef __BEOS__
+#include <errno.h>
+#endif
+
+#endif
+
+
+typedef struct
+{
+	//options
+	char *src;
+	char *ext;
+	char *mime;
+	u32 block_size;
+	Bool blk, ka, mkp;
+
+	//only one output pid declared
+	GF_FilterPid *pid;
+
+#ifdef WIN32
+	HANDLE pipe;
+	HANDLE event;
+	OVERLAPPED overlap;
+#else
+	int fd;
+#endif
+	u64 bytes_read;
+
+	Bool is_end, pck_out, is_first, owns_pipe;
+	Bool do_reconfigure;
+	char *buffer;
+	Bool is_stdin;
+} GF_PipeInCtx;
+
+static Bool pipein_process_event(GF_Filter *filter, const GF_FilterEvent *evt);
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif //WIN32
+
+static GF_Err pipein_initialize(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_PipeInCtx *ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
+	char *frag_par = NULL;
+	char *cgi_par = NULL;
+	char *src;
+
+	if (!ctx->src) return GF_BAD_PARAM;
+
+#ifdef WIN32
+	ctx->pipe = INVALID_HANDLE_VALUE;
+#else
+	ctx->fd = -1;
+#endif
+
+	if (!strcmp(ctx->src, "-") || !strcmp(ctx->src, "stdin")) {
+		ctx->is_stdin = GF_TRUE;
+		ctx->mkp = GF_FALSE;
+#ifdef WIN32
+		_setmode(_fileno(stdin), _O_BINARY);
+#endif
+	}
+	else if (strnicmp(ctx->src, "pipe:/", 6) && strstr(ctx->src, "://"))  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		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;
+	cgi_par = strchr(ctx->src, '?');
+	if (cgi_par) cgi_par[0] = 0;
+
+	src = (char *) ctx->src;
+	if (!strnicmp(ctx->src, "pipe://", 7)) src += 7;
+	else if (!strnicmp(ctx->src, "pipe:", 5)) src += 5;
+
+	if (ctx->is_stdin) {
+		e = GF_OK;
+		goto setup_done;
+	}
+
+#ifdef WIN32
+	char szNamedPipe[GF_MAX_PATH];
+	if (!strncmp(src, "\\\\", 2)) {
+		strcpy(szNamedPipe, src);
+	}
+	else {
+		strcpy(szNamedPipe, "\\\\.\\pipe\\gpac\\");
+		strcat(szNamedPipe, src);
+	}
+	if (strchr(szNamedPipe, '/')) {
+		u32 i, len = (u32)strlen(szNamedPipe);
+		for (i = 0; i < len; i++) {
+			if (szNamedPipe[i] == '/')
+				szNamedPipe[i] = '\\';
+		}
+	}
+
+	if (WaitNamedPipeA(szNamedPipe, 1) == FALSE) {
+		if (!ctx->mkp) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to open %s: %d\n", szNamedPipe, GetLastError()));
+			e = GF_URL_ERROR;
+			goto err_exit;
+		}
+		DWORD pflags = PIPE_ACCESS_INBOUND;
+		DWORD flags = PIPE_TYPE_BYTE | PIPE_READMODE_BYTE;
+		if (ctx->blk) flags |= PIPE_WAIT;
+		else {
+			flags |= PIPE_NOWAIT;
+			pflags |= FILE_FLAG_OVERLAPPED;
+			if (!ctx->event) ctx->event = CreateEvent(NULL, TRUE, FALSE, NULL);
+			if (!ctx->event) {
+				e = GF_IO_ERR;
+				goto err_exit;
+			}
+			ctx->overlap.hEvent = ctx->event;
+		}
+		ctx->pipe = CreateNamedPipe(szNamedPipe, pflags, flags, 10, ctx->block_size, ctx->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()));
+			e = GF_URL_ERROR;
+			goto err_exit;
+		}
+		if (ctx->blk) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] Waiting for client connection for %s, blocking\n", szNamedPipe));
+		}
+		if (!ConnectNamedPipe(ctx->pipe, ctx->blk ? NULL : &ctx->overlap) && (GetLastError() != ERROR_PIPE_CONNECTED) && (GetLastError() != ERROR_PIPE_LISTENING)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to connect named pipe %s: %d\n", szNamedPipe, GetLastError()));
+			e = GF_IO_ERR;
+			CloseHandle(ctx->pipe);
+			ctx->pipe = INVALID_HANDLE_VALUE;
+		}
+		else {
+			ctx->owns_pipe = GF_TRUE;
+		}
+	}
+	else {
+		ctx->pipe = CreateFile(szNamedPipe, GENERIC_READ, ctx->blk ? PIPE_WAIT : PIPE_NOWAIT, NULL, OPEN_EXISTING, 0, NULL);
+		if (ctx->pipe == INVALID_HANDLE_VALUE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to open %s: %d\n", szNamedPipe, GetLastError()));
+			e = GF_URL_ERROR;
+		}
+	}
+
+err_exit:
+
+#else
+	if (!gf_file_exists(src) && ctx->mkp) {
+
+#ifdef GPAC_CONFIG_DARWIN
+		mknod(src,S_IFIFO | 0666, 0);
+#else
+		mkfifo(src, 0666);
+#endif
+		ctx->owns_pipe = GF_TRUE;
+	}
+
+	ctx->fd = open(src, ctx->blk ? O_RDONLY : O_RDONLY|O_NONBLOCK );
+
+	if (ctx->fd < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] Failed to open %s: %s\n", src, gf_errno_str(errno)));
+		e = GF_URL_ERROR;
+	}
+#endif
+
+setup_done:
+
+	if (e) {
+		if (frag_par) frag_par[0] = '#';
+		if (cgi_par) cgi_par[0] = '?';
+
+		gf_filter_setup_failure(filter, GF_URL_ERROR);
+		ctx->owns_pipe = GF_FALSE;
+		return GF_URL_ERROR;
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] opening %s\n", src));
+
+	ctx->is_end = GF_FALSE;
+
+	if (frag_par) frag_par[0] = '#';
+	if (cgi_par) cgi_par[0] = '?';
+
+	ctx->is_first = GF_TRUE;
+	if (!ctx->buffer)
+		ctx->buffer = gf_malloc(ctx->block_size +1);
+
+	gf_filter_post_process_task(filter);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		pipein_process_event(NULL, NULL);
+	}
+#endif
+	return GF_OK;
+}
+
+
+static void pipein_finalize(GF_Filter *filter)
+{
+	GF_PipeInCtx *ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->is_stdin) {
+#ifdef WIN32
+		if (ctx->pipe != INVALID_HANDLE_VALUE) CloseHandle(ctx->pipe);
+#else
+		if (ctx->fd>=0) close(ctx->fd);
+#endif
+		if (ctx->owns_pipe)
+			gf_file_delete(ctx->src);
+	}
+	if (ctx->buffer) gf_free(ctx->buffer);
+
+}
+
+static GF_FilterProbeScore pipein_probe_url(const char *url, const char *mime_type)
+{
+	if (!strnicmp(url, "pipe://", 7)) return GF_FPROBE_SUPPORTED;
+	else if (!strnicmp(url, "pipe:", 5)) return GF_FPROBE_SUPPORTED;
+	else if (!strcmp(url, "-") || !strcmp(url, "stdin")) return GF_FPROBE_SUPPORTED;
+
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static Bool pipein_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_PipeInCtx *ctx;
+	if (!filter || !evt) return GF_TRUE;
+
+	ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
+	if (evt->base.on_pid && (evt->base.on_pid != ctx->pid))
+		return GF_TRUE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		return GF_TRUE;
+	case GF_FEVT_STOP:
+		//stop sending data
+		ctx->is_end = GF_TRUE;
+		gf_filter_pid_set_eos(ctx->pid);
+		return GF_TRUE;
+	case GF_FEVT_SOURCE_SEEK:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] Seek request not possible on pipes, ignoring\n"));
+		return GF_TRUE;
+	case GF_FEVT_SOURCE_SWITCH:
+		assert(ctx->is_end);
+		if (evt->seek.source_switch) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] source switch request not possible on pipes, ignoring\n"));
+		}
+		pipein_initialize(filter);
+		gf_filter_post_process_task(filter);
+		break;
+	default:
+		break;
+	}
+	return GF_TRUE;
+}
+
+
+static void pipein_pck_destructor(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_PipeInCtx *ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
+	ctx->pck_out = GF_FALSE;
+	//ready to process again
+	gf_filter_post_process_task(filter);
+}
+
+static GF_Err pipein_process(GF_Filter *filter)
+{
+	GF_Err e;
+	u32 to_read;
+	s32 nb_read;
+	GF_FilterPacket *pck;
+	GF_PipeInCtx *ctx = (GF_PipeInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->is_end)
+		return GF_EOS;
+
+	//until packet is released we return EOS (no processing), and ask for processing again upon release
+	if (ctx->pck_out)
+		return GF_EOS;
+
+	if (ctx->pid && gf_filter_pid_would_block(ctx->pid)) {
+		assert(0);
+		return GF_OK;
+	}
+
+	to_read = ctx->block_size;
+
+	if (ctx->is_stdin) {
+		nb_read = 0;
+		if (feof(stdin)) {
+			if (!ctx->ka) {
+				gf_filter_pid_set_eos(ctx->pid);
+				return GF_EOS;
+			}
+		} else {
+			nb_read = (s32) fread(ctx->buffer, 1, to_read, stdin);
+			if (nb_read<0) {
+				if (!ctx->ka) {
+					gf_filter_pid_set_eos(ctx->pid);
+					return GF_EOS;
+				}
+			}
+		}
+	} else {
+
+		errno = 0;
+#ifdef WIN32
+		nb_read = -1;
+		if (!ctx->blk && ctx->mkp) {
+			DWORD res = WaitForMultipleObjects(1, &ctx->event, FALSE, 1);
+			ResetEvent(ctx->event);
+			if (res == WAIT_FAILED) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeIn] WaitForMultipleObjects failed!\n"));
+				return GF_IO_ERR;
+			}
+			if (GetOverlappedResult(ctx->pipe, &ctx->overlap, &res, FALSE) == 0) {
+				if (GetLastError() == ERROR_IO_INCOMPLETE) {
+				}
+				else {
+					CloseHandle(ctx->pipe);
+					ctx->pipe = INVALID_HANDLE_VALUE;
+					if (!ctx->ka) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[PipeIn] end of stream detected\n"));
+						gf_filter_pid_set_eos(ctx->pid);
+						return GF_EOS;
+					}
+					GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[PipeIn] Pipe closed by remote side, reopening!\n"));
+					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);
+			}
+			return GF_OK;
+		}
+#else
+		nb_read = (s32) read(ctx->fd, ctx->buffer, to_read);
+		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;
+			}
+			return GF_OK;
+		}
+#endif
+	}
+
+	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));
+		ctx->do_reconfigure = GF_FALSE;
+		e = gf_filter_pid_raw_new(filter, ctx->src, NULL, ctx->mime, ctx->ext, ctx->buffer, nb_read, GF_TRUE, &ctx->pid);
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeIn] failed to configure stream: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+		gf_filter_pid_set_property(ctx->pid, GF_PROP_PID_FILE_CACHED, &PROP_BOOL(GF_FALSE) );
+		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;
+
+	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);
+	gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+
+	ctx->is_first = GF_FALSE;
+	ctx->pck_out = GF_TRUE;
+	gf_filter_pck_send(pck);
+	ctx->bytes_read += nb_read;
+
+	if (ctx->is_end) {
+		gf_filter_pid_set_eos(ctx->pid);
+		return GF_EOS;
+	}
+	return ctx->pck_out ? GF_EOS : GF_OK;
+}
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_PipeInCtx, _n)
+
+static const GF_FilterArgs PipeInArgs[] =
+{
+	{ OFFS(src), "location of source content", 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},
+	{0}
+};
+
+static const GF_FilterCapability PipeInCaps[] =
+{
+	CAP_UINT(GF_CAPS_OUTPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister PipeInRegister = {
+	.name = "pin",
+	GF_FS_SET_DESCRIPTION("pipe input")
+	GF_FS_SET_HELP( "This filter handles generic input pipes (mono-directional) in blocking or non blocking mode.\n"
+		"Warning: Input pipes cannot seek.\n"
+		"Data format of the pipe may be specified using extension (either in file name or through [-ext]()) or MIME type through [-mime]().\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.\n"
+		"\n"
+		"# stdin pipe\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"
+		"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"
+		"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"
+		"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"
+	"")
+	.private_size = sizeof(GF_PipeInCtx),
+	.args = PipeInArgs,
+	.flags = GF_FS_REG_BLOCKING,
+	SETCAPS(PipeInCaps),
+	.initialize = pipein_initialize,
+	.finalize = pipein_finalize,
+	.process = pipein_process,
+	.process_event = pipein_process_event,
+	.probe_url = pipein_probe_url
+};
+
+
+const GF_FilterRegister *pipein_register(GF_FilterSession *session)
+{
+	return &PipeInRegister;
+}

gpac-1.0.0.tar.gz/src/filters/in_rtp.c Added

@@ -0,0 +1,809 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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 "in_rtp.h"
+
+#ifndef GPAC_DISABLE_STREAMING
+
+
+static void rtpin_reset(GF_RTPIn *ctx, Bool is_finalized)
+{
+	while (gf_list_count(ctx->streams)) {
+		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);
+	}
+
+	rtpin_rtsp_del(ctx->session);
+	ctx->session = NULL;
+
+	if (ctx->iod_desc) gf_odf_desc_del(ctx->iod_desc);
+	ctx->iod_desc = NULL;
+}
+
+static GF_FilterProbeScore rtpin_probe_url(const char *url, const char *mime)
+{
+	/*embedded data - TO TEST*/
+	if (strstr(url, "data:application/mpeg4-od-au;base64")
+		|| strstr(url, "data:application/mpeg4-bifs-au;base64")
+		|| strstr(url, "data:application/mpeg4-es-au;base64"))
+	{
+		return GF_FPROBE_SUPPORTED;
+	}
+
+	/*we need rtsp/tcp , rtsp/udp or direct RTP sender (no control)*/
+	if (!strnicmp(url, "rtsp://", 7)
+		|| !strnicmp(url, "rtspu://", 8)
+		|| !strnicmp(url, "rtp://", 6)
+		|| !strnicmp(url, "satip://", 6))
+	{
+		return GF_FPROBE_SUPPORTED;
+	}
+
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+//simplified version of RTSP_UnpackURL for SAT>IP
+static void rtpin_satip_get_server_ip(const char *sURL, char *Server)
+{
+	char schema[10], *test, text[1024], *retest;
+	u32 i, len;
+	Bool is_ipv6;
+
+	strcpy(Server, "");
+
+	//extract the schema
+	i = 0;
+	while (i <= strlen(sURL)) {
+		if (sURL[i] == ':')
+			goto found;
+		schema[i] = sURL[i];
+		i += 1;
+	}
+	return;
+
+found:
+	schema[i] = 0;
+	if (stricmp(schema, "satip")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Wrong SATIP schema %s - not setting up\n", schema));
+		return;
+	}
+	test = strstr(sURL, "://");
+	test += 3;
+
+	//check for port
+	retest = strrchr(test, ':');
+	/*IPV6 address*/
+	if (retest && strchr(retest, ']')) retest = NULL;
+
+	if (retest && strstr(retest, "/")) {
+		retest += 1;
+		i = 0;
+		while (i<strlen(retest)) {
+			if (retest[i] == '/') break;
+			text[i] = retest[i];
+			i += 1;
+		}
+		text[i] = 0;
+	}
+	//get the server name
+	is_ipv6 = GF_FALSE;
+	len = (u32)strlen(test);
+	i = 0;
+	while (i<len) {
+		if (test[i] == '[') is_ipv6 = GF_TRUE;
+		else if (test[i] == ']') is_ipv6 = GF_FALSE;
+		if ((test[i] == '/') || (!is_ipv6 && (test[i] == ':'))) break;
+		text[i] = test[i];
+		i += 1;
+	}
+	text[i] = 0;
+	strcpy(Server, text);
+}
+
+
+static GF_Err rtpin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	const char *src = NULL;
+	u32 crc;
+	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));
+		return GF_BAD_PARAM;
+	}
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		//reset session, remove pids
+		rtpin_reset(ctx, GF_FALSE);
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	//we must have a file path
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+	if (prop && prop->value.string) src = prop->value.string;
+	if (!src)
+		return GF_NOT_SUPPORTED;
+
+	crc = gf_crc_32(src, (u32) strlen(src) );
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+	} else {
+		if (pid != ctx->ipid) {
+			return GF_REQUIRES_NEW_INSTANCE;
+		}
+		if (ctx->sdp_url_crc == crc) return GF_OK;
+
+		//reset session, remove pids for now
+		rtpin_reset(ctx, GF_FALSE);
+	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	ctx->sdp_url_crc = crc;
+	ctx->sdp_loaded = GF_FALSE;
+	return GF_OK;
+}
+
+
+static void gf_rtp_switch_quality(GF_RTPIn *rtp, Bool switch_up)
+{
+	u32 i,count;
+	GF_RTPInStream *stream, *cur_stream;
+
+	count = gf_list_count(rtp->streams);
+	/*find the current stream*/
+	stream = cur_stream = NULL;
+	for (i = 0; i < count; i++) {
+		cur_stream = (GF_RTPInStream *) gf_list_get(rtp->streams, i);
+		if (cur_stream->mid != rtp->cur_mid) {
+			cur_stream = NULL;
+			continue;
+		}
+		break;
+	}
+	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;
+				}
+
+			}
+		}
+	} else {
+		/*this is the lowest stream i.e base layer*/
+		if (!cur_stream->prev_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->prev_stream) {
+					/*stop streaming current channel*/
+					gf_rtp_stop(cur_stream->rtp_ch);
+					cur_stream->status = RTP_Connected;
+					rtp->cur_mid = stream->mid;
+					break;
+				}
+			}
+		}
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("Switch from ES%d to ES %d\n", cur_stream->mid, stream->mid));
+	return;
+}
+
+
+#ifdef FILTER_FIXME
+static void rtpin_send_data_base64(GF_RTPInStream *stream)
+{
+	u32 size;
+	char *pck_data;
+	GF_FilterPacket *pck;
+	char *data;
+
+	if (stream->current_start<0) return;
+
+	data = strstr(stream->control, ";base64");
+	if (!data) return;
+
+	/*decode data*/
+	data = strstr(data, ",");
+	data += 1;
+	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);
+	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);
+	gf_filter_pck_send(pck);
+
+	stream->flags &= ~GF_RTP_NEW_AU;
+	stream->current_start = -1;
+}
+#endif
+
+static void rtpin_check_setup(GF_RTPInStream *stream)
+{
+	RTPIn_StreamDescribe ch_desc;
+	switch (stream->status) {
+	case RTP_Connected:
+	case RTP_Running:
+		rtpin_stream_ack_connect(stream, GF_OK);
+		return;
+	default:
+		break;
+	}
+	memset(&ch_desc, 0, sizeof(RTPIn_StreamDescribe));
+	ch_desc.opid = stream->opid;
+	rtpin_stream_setup(stream, &ch_desc);
+}
+
+static Bool rtpin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_RTPInStream *stream;
+	GF_RTPIn *ctx = (GF_RTPIn *) gf_filter_get_udta(filter);
+	Bool reset_stream = GF_FALSE;
+	Bool skip_rtsp_teardown = GF_FALSE;
+
+	if (evt->base.type == GF_FEVT_QUALITY_SWITCH) {
+		gf_rtp_switch_quality(ctx, evt->quality_switch.up);
+		return GF_TRUE;
+	}
+
+	/*ignore commands other than channels one*/
+	if (!evt->base.on_pid) {
+		return GF_TRUE;
+	}
+
+	stream = rtpin_find_stream(ctx, evt->base.on_pid, 0, NULL, GF_FALSE);
+	if (!stream) return GF_TRUE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+
+		ctx->is_eos = GF_FALSE;
+
+		if ((stream->status==RTP_Running) && ((ctx->last_start_range >= 0) && (ctx->last_start_range==evt->play.start_range)))
+		 	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?*/
+		stream->flags &= ~RTP_EOS;
+		stream->flags &= ~RTP_EOS_FLUSHED;
+
+		if (!(stream->flags & RTP_INTERLEAVED)) {
+			if (stream->rtp_ch->rtp)
+				gf_sk_group_register(ctx->sockgroup, stream->rtp_ch->rtp);
+			if (stream->rtp_ch->rtcp)
+				gf_sk_group_register(ctx->sockgroup, stream->rtp_ch->rtcp);
+		}
+
+		if (stream->rtsp) {
+			//send a setup if needed
+			rtpin_check_setup(stream);
+
+			//if not aggregated control or no more queued events send a play
+			if (! (stream->rtsp->flags & RTSP_AGG_CONTROL) )  {
+				rtpin_rtsp_usercom_send(stream->rtsp, stream, evt);
+				ctx->last_start_range = evt->play.start_range;
+			} else {
+			//tricky point here: the play events may get at different times depending on the length
+			//of each filter chain connected to our output pids.
+			//we store the event and wait for no more pending events
+				if (!ctx->postponed_play_stream) {
+					ctx->postponed_play = evt->play;
+					ctx->postponed_play_stream = stream;
+					ctx->last_start_range = evt->play.start_range;
+				}
+				return GF_TRUE;
+			}
+		} else {
+			ctx->last_start_range = evt->play.start_range;
+			stream->status = RTP_Running;
+			if (!stream->next_stream)
+				ctx->cur_mid = stream->mid;
+
+			if (stream->rtp_ch) {
+				//wait for RTCP to perform stream sync
+				stream->rtcp_init = GF_FALSE;
+				rtpin_stream_init(stream, (stream->flags & RTP_CONNECTED) ? GF_TRUE : GF_FALSE);
+				gf_rtp_set_info_rtp(stream->rtp_ch, 0, 0, 0);
+			} else {
+				/*direct channel, store current start*/
+				stream->current_start = evt->play.start_range;
+				stream->flags |= GF_RTP_NEW_AU;
+				gf_rtp_depacketizer_reset(stream->depacketizer, GF_FALSE);
+			}
+		}
+		break;
+	case GF_FEVT_STOP:
+
+		while (1) {
+			u32 size = gf_rtp_read_flush(stream->rtp_ch, stream->buffer, stream->rtpin->block_size);
+			if (!size) break;
+			rtpin_stream_on_rtp_pck(stream, stream->buffer, size);
+		}
+
+		/*is this RTSP or direct RTP?*/
+		if (stream->rtsp) {
+			if (!ctx->is_eos)
+				rtpin_rtsp_usercom_send(stream->rtsp, stream, evt);
+			else
+				skip_rtsp_teardown=GF_TRUE;
+		} else {
+			stream->status = RTP_Connected;
+			stream->rtpin->last_ntp = 0;
+			stream->flags |= RTP_EOS;
+		}
+		ctx->last_start_range = -1.0;
+		stream->rtcp_init = GF_FALSE;
+		reset_stream = stream->pck_queue ? GF_TRUE : GF_FALSE;
+
+		if (!(stream->flags & RTP_INTERLEAVED)) {
+			if (stream->rtp_ch->rtp)
+				gf_sk_group_unregister(ctx->sockgroup, stream->rtp_ch->rtp);
+			if (stream->rtp_ch->rtcp)
+				gf_sk_group_unregister(ctx->sockgroup, stream->rtp_ch->rtcp);
+		}
+		if (reset_stream) {
+			while (gf_list_count(stream->pck_queue)) {
+				GF_FilterPacket *pck = gf_list_pop_front(stream->pck_queue);
+				gf_filter_pck_send(pck);
+			}
+		}
+		break;
+	case GF_FEVT_SET_SPEED:
+	case GF_FEVT_PAUSE:
+	case GF_FEVT_RESUME:
+		assert(stream->rtsp);
+		rtpin_rtsp_usercom_send(stream->rtsp, stream, evt);
+		break;
+	default:
+		break;
+	}
+
+	//flush rtsp commands
+	if (ctx->session && !skip_rtsp_teardown) {
+		rtpin_rtsp_process_commands(ctx->session);
+	}
+
+	if (reset_stream) rtpin_stream_reset_queue(stream);
+	//cancel event
+	return GF_TRUE;
+}
+
+static void rtpin_rtsp_flush(GF_RTPInRTSP *session)
+{
+	/*process teardown on all sessions*/
+	while (!session->connect_error) {
+		if (!gf_list_count(session->rtsp_commands))
+			break;
+		rtpin_rtsp_process_commands(session);
+	}
+}
+
+static GF_Err rtpin_process(GF_Filter *filter)
+{
+	u32 i;
+	GF_RTPInStream *stream;
+	GF_RTPIn *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->is_eos) return GF_EOS;
+
+	if (ctx->ipid) {
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->ipid);
+
+		if (!ctx->sdp_loaded && pck) {
+			Bool start, end;
+			u32 sdp_len;
+			const char *sdp_data;
+			gf_filter_pck_get_framing(pck, &start, &end);
+			assert(end);
+		
+			sdp_data = gf_filter_pck_get_data(pck, &sdp_len);
+			rtpin_load_sdp(ctx, (char *)sdp_data, sdp_len, NULL);
+			gf_filter_pid_drop_packet(ctx->ipid);
+			ctx->sdp_loaded = GF_TRUE;
+		}
+		//we act as a source filter, request process task
+		gf_filter_post_process_task(filter);
+	}
+
+	if (ctx->postponed_play_stream) {
+		GF_FilterEvent evt;
+		if (gf_filter_get_num_events_queued(filter))
+			return GF_OK;
+		stream = ctx->postponed_play_stream;
+		ctx->postponed_play_stream = NULL;
+		evt.play = ctx->postponed_play;
+		rtpin_rtsp_usercom_send(stream->rtsp, stream, &evt);
+	}
+
+
+	if (ctx->retry_tcp && ctx->session) {
+		GF_FilterEvent evt;
+		Bool send_agg_play = GF_TRUE;
+		GF_List *streams = gf_list_new();
+		ctx->retry_tcp = GF_FALSE;
+		ctx->interleave = 1;
+		i=0;
+		while ((stream = (GF_RTPInStream *)gf_list_enum(ctx->streams, &i))) {
+			if (stream->status >= RTP_Setup) {
+				gf_list_add(streams, stream);
+			}
+		}
+		rtpin_rtsp_flush(ctx->session);
+		/*send teardown*/
+		rtpin_rtsp_teardown(ctx->session, NULL);
+		rtpin_rtsp_flush(ctx->session);
+		//for safety reset the session, some servers don't handle teardown that well
+		gf_rtsp_session_reset(ctx->session->session, GF_TRUE);
+
+		ctx->session->flags |= RTSP_FORCE_INTER;
+		evt.play = ctx->postponed_play;
+		if (!evt.base.type) evt.base.type = GF_FEVT_PLAY;
+		gf_rtsp_set_buffer_size(ctx->session->session, ctx->block_size);
+
+		stream = NULL;
+		for (i=0; i<gf_list_count(streams); i++) {
+			stream = (GF_RTPInStream *)gf_list_get(streams, i);
+			//reset status
+			stream->status = RTP_Disconnected;
+			//reset all dynamic flags
+			stream->flags &= ~(RTP_EOS | RTP_EOS_FLUSHED | RTP_SKIP_NEXT_COM | RTP_CONNECTED);
+			//mark as interleaved
+			stream->flags |= RTP_INTERLEAVED;
+			//reset SSRC since some servers don't include it in interleave response
+			gf_rtp_reset_ssrc(stream->rtp_ch);
+
+			//send setup
+			rtpin_check_setup(stream);
+			rtpin_rtsp_flush(ctx->session);
+
+			//if not aggregated control or no more queued events send a play
+			if (! (stream->rtsp->flags & RTSP_AGG_CONTROL) )  {
+				evt.base.on_pid = stream->opid;
+				rtpin_rtsp_usercom_send(stream->rtsp, stream, &evt);
+				send_agg_play = GF_FALSE;
+			}
+			rtpin_rtsp_flush(ctx->session);
+		}
+		if (stream && send_agg_play) {
+			evt.base.on_pid = stream->opid;
+			rtpin_rtsp_usercom_send(ctx->session, stream, &evt);
+		}
+
+		gf_list_del(streams);
+	}
+
+
+	/*fetch data on udp*/
+	u32 tot_read=0;
+	while (1) {
+		u32 read=0;
+		//select both read and write
+		GF_Err e = gf_sk_group_select(ctx->sockgroup, 10, GF_SK_SELECT_BOTH);
+		if (e) {
+			if ((e==GF_IP_NETWORK_EMPTY) && !ctx->eos_probe_start)
+				ctx->eos_probe_start = gf_sys_clock();
+			break;
+		}
+
+		ctx->eos_probe_start = 0;
+
+		i=0;
+		while ((stream = (GF_RTPInStream *)gf_list_enum(ctx->streams, &i))) {
+			if (stream->status==RTP_Running) {
+				/*for interleaved channels don't read too fast, query the buffer occupancy*/
+				read += rtpin_stream_read(stream);
+			}
+
+			if (stream->flags & RTP_EOS) {
+				ctx->eos_probe_start = gf_sys_clock();
+			}
+		}
+
+		if (!read) {
+			break;
+		}
+		tot_read+=read;
+	}
+
+	//we wait max 300ms to detect eos
+	if (ctx->eos_probe_start && (gf_sys_clock() - ctx->eos_probe_start > 300) ) {
+		u32 nb_eos=0;
+		i=0;
+		while ((stream = (GF_RTPInStream *)gf_list_enum(ctx->streams, &i))) {
+			if (! (stream->flags & RTP_EOS)) break;
+			if (stream->flags & RTP_EOS_FLUSHED) {
+				nb_eos++;
+				continue;
+			}
+			while (1) {
+				u32 size = gf_rtp_flush_rtp(stream->rtp_ch, stream->buffer, stream->rtpin->block_size);
+				if (!size) break;
+				rtpin_stream_on_rtp_pck(stream, stream->buffer, size);
+			}
+
+			stream->stat_stop_time = gf_sys_clock();
+			if (stream->pck_queue) {
+				while (gf_list_count(stream->pck_queue)) {
+					GF_FilterPacket *pck = gf_list_pop_front(stream->pck_queue);
+					gf_filter_pck_send(pck);
+				}
+			}
+			gf_filter_pid_set_eos(stream->opid);
+			stream->flags |= RTP_EOS_FLUSHED;
+			nb_eos++;
+		}
+		if (nb_eos==gf_list_count(ctx->streams)) {
+			if (!ctx->is_eos) {
+				ctx->is_eos = GF_TRUE;
+				if (ctx->session) {
+					/*send teardown*/
+					rtpin_rtsp_teardown(ctx->session, NULL);
+					rtpin_rtsp_flush(ctx->session);
+				}
+			}
+			return GF_EOS;
+		}
+		ctx->eos_probe_start = 0;
+	}
+
+	/*and process commands / flush TCP*/
+	if (ctx->session) {
+		rtpin_rtsp_process_commands(ctx->session);
+
+		if (ctx->session->connect_error) {
+			gf_filter_setup_failure(filter, ctx->session->connect_error);
+			ctx->session->connect_error = GF_OK;
+		}
+	}
+	if (ctx->max_sleep<0)
+		gf_filter_ask_rt_reschedule(filter, (u32) ((-ctx->max_sleep) *1000) );
+	else {
+		assert(ctx->min_frame_dur_ms <= (u32) ctx->max_sleep);
+		gf_filter_ask_rt_reschedule(filter, ctx->min_frame_dur_ms*1000);
+	}
+	return GF_OK;
+}
+
+
+static GF_Err rtpin_initialize(GF_Filter *filter)
+{
+	GF_RTPIn *ctx = gf_filter_get_udta(filter);
+	char *the_ext;
+
+	ctx->streams = gf_list_new();
+	ctx->filter = filter;
+	//turn on interleave on http port
+	if ((ctx->default_port == 80) || (ctx->default_port == 8080))
+		ctx->interleave = 1;
+
+	ctx->last_start_range = -1.0;
+
+	ctx->sockgroup = gf_sk_group_new();
+
+	//sdp mode, we will have a configure_pid
+	if (!ctx->src) return GF_OK;
+
+	/*rtsp and rtsp over udp*/
+
+	the_ext = strrchr(ctx->src, '#');
+	if (the_ext) {
+		if (!stricmp(the_ext, "#audio")) ctx->stream_type = GF_STREAM_AUDIO;
+		else if (!stricmp(the_ext, "#video")) ctx->stream_type = GF_STREAM_VISUAL;
+		the_ext[0] = 0;
+	}
+	gf_filter_disable_inputs(filter);
+
+	if (!strnicmp(ctx->src, "rtp://", 6)) {
+		GF_RTPInStream *stream;
+		GF_Err e = GF_OK;
+		u32 port = 1234;
+		char *ip = ctx->src + 6;
+		char *sep = strchr(ip, ':');
+		if (sep) {
+			port = atoi(sep+1);
+			sep[0] = 0;
+			ip = gf_strdup(ip);
+			sep[0] = ':';
+		} else {
+			ip = gf_strdup(ip);
+		}
+		stream = rtpin_stream_new_standalone(ctx, ip, port);
+		gf_free(ip);
+		if (!stream)
+			e = GF_OUT_OF_MEM;
+
+		if (!e)
+			e = rtpin_add_stream(ctx, stream, NULL);
+
+		if (!e)
+			e = rtpin_stream_init(stream, GF_FALSE);
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPIn]] Couldn't setup RTP stream: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+		stream->status = RTP_Running;
+		return GF_OK;
+	}
+	ctx->session = rtpin_rtsp_new(ctx, (char *) ctx->src);
+	if (!strnicmp(ctx->src, "satip://", 8)) {
+		ctx->session->satip = GF_TRUE;
+		ctx->session->satip_server = gf_malloc(GF_MAX_PATH);
+		rtpin_satip_get_server_ip(ctx->src, ctx->session->satip_server);
+	}
+
+	if (!ctx->session) {
+		return GF_NOT_SUPPORTED;
+	} else {
+		rtpin_rtsp_describe_send(ctx->session, 0, NULL);
+	}
+	return GF_OK;
+}
+
+
+static void rtpin_finalize(GF_Filter *filter)
+{
+	GF_RTPIn *ctx = gf_filter_get_udta(filter);
+	ctx->done = GF_TRUE;
+	if (ctx->session) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Closing RTSP service\n"));
+		rtpin_rtsp_flush(ctx->session);
+		if (!ctx->is_eos) {
+			/*send teardown*/
+			rtpin_rtsp_teardown(ctx->session, NULL);
+			rtpin_rtsp_flush(ctx->session);
+		}
+	}
+
+	rtpin_reset(ctx, GF_TRUE);
+	gf_list_del(ctx->streams);
+
+	gf_sk_group_del(ctx->sockgroup);
+}
+
+static const char *rtpin_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	Bool is_sdp = GF_TRUE;
+	char *pdata = (char *)data;
+	char cend = pdata[size-1];
+	pdata[size-1] = 0;
+	if (!strstr(pdata, "\n")) is_sdp = GF_FALSE;
+	else if (!strstr(pdata, "v=0")) is_sdp = GF_FALSE;
+	else if (!strstr(pdata, "o=")) is_sdp = GF_FALSE;
+	else if (!strstr(pdata, "c=")) is_sdp = GF_FALSE;
+	pdata[size-1] = cend;
+	if (is_sdp) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "application/sdp";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability RTPInCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "sdp"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/sdp"),
+	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_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_METADATA),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_ENCRYPTED),
+	{0},
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "ts|m2t|mts|dmb|trp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg"),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_RTPIn, _n)
+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(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(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(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(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(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(rtcpsync), "use RTCP to adjust synchronization", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_EXPERT},
+	{0}
+};
+
+
+GF_FilterRegister RTPInRegister = {
+	.name = "rtpin",
+	GF_FS_SET_DESCRIPTION("RTP/RTSP/SDP input")
+	GF_FS_SET_HELP("This filter handles SDP/RTSP/RTP input reading. It supports:\n"
+	"- SDP file reading\n"
+	"- 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).")
+	.private_size = sizeof(GF_RTPIn),
+	.args = RTPInArgs,
+	.initialize = rtpin_initialize,
+	.finalize = rtpin_finalize,
+	SETCAPS(RTPInCaps),
+	.configure_pid = rtpin_configure_pid,
+	.process = rtpin_process,
+	.process_event = rtpin_process_event,
+	.probe_url = rtpin_probe_url,
+	.probe_data = rtpin_probe_data
+};
+
+#endif
+
+
+const GF_FilterRegister *rtpin_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_STREAMING
+	return &RTPInRegister;
+#else
+	return NULL;
+#endif
+}
+

gpac-1.0.0.tar.gz/src/filters/in_rtp.h Added

@@ -0,0 +1,359 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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.
+ *
+ */
+
+#ifndef _IN_RTP_H_
+#define _IN_RTP_H_
+
+/*module interface*/
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#ifndef GPAC_DISABLE_STREAMING
+
+#include <gpac/base_coding.h>
+#include <gpac/mpeg4_odf.h>
+/*IETF lib*/
+#include <gpac/internal/ietf_dev.h>
+
+
+#define RTSP_BUFFER_SIZE		5000
+
+typedef struct _rtsp_session GF_RTPInRTSP;
+typedef struct __rtpin_stream GF_RTPInStream;
+
+/*the rtsp/rtp client*/
+typedef struct
+{
+	//opts
+	char *src;
+	u32 firstport, ttl, satip_port;
+	const char *ifce, *force_mcast, *user_agent, *languages;
+	Bool use_client_ports;
+	u32 bandwidth, reorder_len, reorder_delay, nat_keepalive, block_size;
+	Bool disable_rtcp;
+	u32 default_port;
+	u32 rtsp_timeout, udp_timeout, rtcp_timeout, stats;
+	/*transport mode. 0 is udp, 1 is tcp, 3 is tcp if unreliable media */
+	u32 interleave;
+	s32 max_sleep;
+	Bool autortsp, rtcpsync;
+
+	//internal
+
+	GF_Filter *filter;
+	
+	/*the service we're responsible for*/
+	GF_FilterPid *ipid;
+	u32 sdp_url_crc;
+	Bool sdp_loaded;
+
+	/*one and only RTSP session*/
+	GF_RTPInRTSP *session;
+
+	/*RTP/RTCP media streams*/
+	GF_List *streams;
+
+	/*RTSP config*/
+
+	/*packet drop emulation*/
+	u32 first_packet_drop;
+	u32 frequency_drop;
+
+	/*for single-object control*/
+	u32 stream_type;
+
+	GF_Descriptor *iod_desc;
+
+	GF_RTPInStream *postponed_play_stream;
+	GF_FEVT_Play postponed_play;
+
+	/*if set ANNOUNCE (sent by server) will be handled*/
+//	Bool handle_announce;
+
+	Double last_ntp;
+
+	Bool is_scalable, done, retry_tcp;
+
+	Double last_start_range;
+
+	u32 cur_mid;
+
+	u32 min_frame_dur_ms;
+
+	GF_SockGroup *sockgroup;
+	Bool is_eos;
+	u32 eos_probe_start;
+} GF_RTPIn;
+
+enum
+{
+	RTSP_AGG_CONTROL = 1,
+	RTSP_TCP_FLUSH = 1<<1,
+	RTSP_FORCE_INTER = 1<<2,
+	RTSP_WAIT_REPLY = 1<<3,
+	RTSP_DSS_SERVER = 1<<4,
+	RTSP_AGG_ONLY = 1<<5,
+};
+
+/*rtsp session*/
+struct _rtsp_session
+{
+	u32 flags;
+
+	/*owner*/
+	GF_RTPIn *rtpin;
+
+	/*RTSP session object*/
+	GF_RTSPSession *session;
+	/*session ID for aggregated stream control*/
+	char *session_id;
+
+	/*session control string*/
+	char *control;
+
+	/*response object*/
+	GF_RTSPResponse *rtsp_rsp;
+
+	Double last_range;
+	u32 command_time;
+	GF_List *rtsp_commands;
+	GF_Err connect_error;
+
+	/*SAT>IP uses a non-conformant version of RTSP*/
+	Bool satip;
+	char *satip_server;
+};
+
+/*creates new RTSP session handler*/
+GF_RTPInRTSP *rtpin_rtsp_new(GF_RTPIn *rtp, char *session_control);
+/*disconnects and destroy RTSP session handler - if immediate_shutdown do not wait for response*/
+void rtpin_rtsp_del(GF_RTPInRTSP *sess);
+/*check session by control string*/
+GF_RTPInRTSP *rtpin_rtsp_check(GF_RTPIn *rtp, char *control);
+
+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
+{
+	/*channel is setup and waits for connection request*/
+	RTP_Setup,
+	/*waiting for server reply*/
+	RTP_WaitingForAck,
+	/*connection OK*/
+	RTP_Connected,
+	/*data exchange on this service/channel*/
+	RTP_Running,
+	/*deconnection OK - a download channel can automatically disconnect when download is done*/
+	RTP_Disconnected,
+	/*service/channel is not (no longer) available/found and should be removed*/
+	RTP_Unavailable,
+	/*service/channel is not (no longer) available/found and should be removed*/
+	RTP_WaitForTCPRetry,
+};
+
+
+/*rtp channel flags*/
+enum
+{
+	/*static RTP channel flags*/
+
+	/*set if sending RTCP reports is enabled (default)*/
+	RTP_ENABLE_RTCP = 1,
+	/*set if stream control possible*/
+	RTP_HAS_RANGE = (1<<1),
+	/*set if RTP over RTSP*/
+	RTP_INTERLEAVED = (1<<2),
+	/*broadcast emultaion is on (no time control for stream)*/
+	RTP_FORCE_BROADCAST = (1<<3),
+
+	/*RTP channel runtime flags*/
+
+	/*set if next command (PLAY/PAUSE) is to be skipped (aggregation control)*/
+	RTP_SKIP_NEXT_COM = (1<<4),
+	/*indicates whether channel creation has been acknowledged or not
+	this is needed to filter real channel_connect calls from RTSP re-setup (after STOP) ones*/
+	RTP_CONNECTED = (1<<5),
+	/*EOS signaled (RTCP or range-based)*/
+	RTP_EOS = (1<<6),
+	RTP_EOS_FLUSHED = (1<<7),
+};
+
+enum
+{
+	RTP_SET_TIME_NONE = 0,
+	RTP_SET_TIME_RTP,
+	RTP_SET_TIME_RTP_SEEK,
+};
+
+/*rtp channel*/
+struct __rtpin_stream
+{
+	/*module*/
+	GF_RTPIn *rtpin;
+
+	/*channel flags*/
+	u32 flags;
+
+	/*control session (may be null)*/
+	GF_RTPInRTSP *rtsp;
+	/*session ID for independent stream control*/
+	char *session_id;
+
+	/*RTP channel*/
+	GF_RTPChannel *rtp_ch;
+
+	/*depacketizer*/
+	GF_RTPDepacketizer *depacketizer;
+
+	GF_FilterPid *opid;
+
+	u32 status;
+
+	u32 last_stats_time;
+	
+	u32 ES_ID, OD_ID;
+	char *control;
+
+	/*rtp receive buffer*/
+	char *buffer;
+	/*set at play/seek stages to sync app NPT to RTP time (RTSP) or NTP to RTP (RTCP)
+	*/
+	u32 check_rtp_time;
+
+	/*can we control the stream ?*/
+	Double range_start, range_end;
+	/*current start time in npt (for pause/resume)*/
+	Double current_start;
+
+	Bool paused;
+	Bool rtcp_init;
+	/*UDP time-out detection*/
+	u32 last_udp_time;
+	/*RTP stats*/
+	u32 rtp_bytes, rtcp_bytes, stat_start_time, stat_stop_time;
+	u32 ts_res;
+
+	//MPEG-4 deinterleaver
+	Bool first_in_rtp_pck;
+	GF_List *pck_queue;
+
+	/*stream id*/
+	u32 mid;
+
+	u32 prev_stream;
+	u32 next_stream;
+	u32 base_stream;
+
+	u32 rtcp_check_start;
+	u32 first_rtp_ts;
+	s64 ts_adjust;
+	//source NTP of first packet received, ercomputed at first RTCP sender report
+	u64 init_ntp_us;
+
+	u32 min_dur_us, min_dur_rtp;
+	u32 prev_cts;
+
+	u32 sr, nb_ch;
+};
+
+/*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);
+
+/*destroys RTP stream */
+void rtpin_stream_del(GF_RTPInStream *stream);
+/*resets stream state and inits RTP sockets if ResetOnly is false*/
+GF_Err rtpin_stream_init(GF_RTPInStream *stream, Bool ResetOnly);
+
+void rtpin_stream_reset_queue(GF_RTPInStream *stream);
+
+/*RTSP -> RTP de-interleaving callback*/
+GF_Err rtpin_rtsp_data_cbk(GF_RTSPSession *sess, void *cbck, u8 *buffer, u32 bufferSize, Bool IsRTCP);
+/*send confirmation of connection - if no error, also setup SL based on payload*/
+void rtpin_stream_ack_connect(GF_RTPInStream *stream, GF_Err e);
+
+/*locate RTP stream by channel or ES_ID or control*/
+GF_RTPInStream *rtpin_find_stream(GF_RTPIn *rtp, GF_FilterPid *opid, u32 ES_ID, char *es_control, Bool remove_stream);
+/*adds channel to session identified by session_control. If no session exists, the session is created if needed*/
+GF_Err rtpin_add_stream(GF_RTPIn *rtp, GF_RTPInStream *stream, char *session_control);
+/*removes stream from session*/
+void rtpin_remove_stream(GF_RTPIn *rtp, GF_RTPInStream *stream);
+/*reads input socket and process*/
+u32 rtpin_stream_read(GF_RTPInStream *stream);
+
+/*load SDP and setup described media in SDP. If stream is null this is the root
+SDP and IOD will be extracted, otherwise this a channel SDP*/
+void rtpin_load_sdp(GF_RTPIn *rtp, char *sdp, u32 sdp_len, GF_RTPInStream *stream);
+
+/*for standalone rtp streams*/
+void rtpin_declare_pid(GF_RTPInStream *stream, Bool force_iod, u32 ch_idx, u32 *ocr_es_id);
+
+/*RTSP signaling is handled by stacking commands and processing them
+in the main session thread. Each RTSP command has an associated private stack as follows*/
+
+/*describe stack for single channel (not for session)*/
+typedef struct
+{
+	u32 ES_ID;
+	GF_FilterPid *opid;
+	char *esd_url;
+} RTPIn_StreamDescribe;
+
+typedef struct
+{
+	GF_RTPInStream *stream;
+	GF_FilterEvent evt;
+} RTPIn_StreamControl;
+
+/*RTSP signaling */
+Bool rtpin_rtsp_describe_preprocess(GF_RTPInRTSP *sess, GF_RTSPCommand *com);
+GF_Err rtpin_rtsp_describe_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e);
+void rtpin_rtsp_setup_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e);
+void rtpin_rtsp_teardown_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e);
+Bool rtpin_rtsp_usercom_preprocess(GF_RTPInRTSP *sess, GF_RTSPCommand *com);
+void rtpin_rtsp_usercom_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e);
+
+/*send describe - if esd_url is given, this is a describe on es*/
+void rtpin_rtsp_describe_send(GF_RTPInRTSP *sess, char *esd_url, GF_FilterPid *opid);
+/*send setup for stream*/
+void rtpin_rtsp_setup_send(GF_RTPInStream *stream);
+/*filter setup if no session (rtp only), otherwise setup channel - ch_desc may be NULL
+if channel association is already done*/
+GF_Err rtpin_stream_setup(GF_RTPInStream *stream, RTPIn_StreamDescribe *ch_desc);
+/*send command for stream - handles aggregation*/
+void rtpin_rtsp_usercom_send(GF_RTPInRTSP *sess, GF_RTPInStream *stream, const GF_FilterEvent *fevt);
+/*disconnect the session - if @ch, only the channel is teardown*/
+void rtpin_rtsp_teardown(GF_RTPInRTSP *sess, GF_RTPInStream *stream);
+
+
+void rtpin_stream_on_rtp_pck(GF_RTPInStream *stream, char *pck, u32 size);
+
+#endif /*GPAC_DISABLE_STREAMING*/
+
+#endif //_IN_RTP_H_

gpac-1.0.0.tar.gz/src/filters/in_rtp_rtsp.c Added

@@ -0,0 +1,383 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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 "in_rtp.h"
+
+#ifndef GPAC_DISABLE_STREAMING
+
+static GF_Err rtpin_rtsp_process_response(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e)
+{
+	if (!strcmp(com->method, GF_RTSP_DESCRIBE))
+		return rtpin_rtsp_describe_process(sess, com, e);
+	else if (!strcmp(com->method, GF_RTSP_SETUP))
+		rtpin_rtsp_setup_process(sess, com, e);
+	else if (!strcmp(com->method, GF_RTSP_TEARDOWN))
+		rtpin_rtsp_teardown_process(sess, com, e);
+	else if (!strcmp(com->method, GF_RTSP_PLAY) || !strcmp(com->method, GF_RTSP_PAUSE))
+		rtpin_rtsp_usercom_process(sess, com, e);
+	return GF_OK;
+}
+
+void rtpin_rtsp_process_commands(GF_RTPInRTSP *sess)
+{
+	GF_RTSPCommand *com;
+	GF_Err e;
+	u32 time;
+	char sMsg[1000];
+
+	com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
+
+	/*if asked or command to send, flushout TCP - TODO: check what's going on with ANNOUNCE*/
+	if ((com && !(sess->flags & RTSP_WAIT_REPLY) ) || (sess->flags & RTSP_TCP_FLUSH) ) {
+		while (1) {
+			e = gf_rtsp_session_read(sess->session);
+			if (e) break;
+		}
+	}
+
+	/*handle response or announce*/
+	if ( (com && (sess->flags & RTSP_WAIT_REPLY) ) /*|| (!com && sess->rtpin->handle_announce)*/) {
+		e = gf_rtsp_get_response(sess->session, sess->rtsp_rsp);
+		if (e!= GF_IP_NETWORK_EMPTY) {
+			e = rtpin_rtsp_process_response(sess, com, e);
+			/*this is a service connect error -> plugin may be discarded */
+			if (e!=GF_OK) {
+				gf_list_rem(sess->rtsp_commands, 0);
+				gf_rtsp_command_del(com);
+				gf_filter_setup_failure(sess->rtpin->filter, e);
+				return;
+			}
+
+			gf_list_rem(sess->rtsp_commands, 0);
+			gf_rtsp_command_del(com);
+			sess->flags &= ~RTSP_WAIT_REPLY;
+			sess->command_time = 0;
+		} else {
+			u32 time_out = sess->rtpin->rtsp_timeout;
+			/*evaluate timeout*/
+			time = gf_sys_clock() - sess->command_time;
+
+			if (!strcmp(com->method, GF_RTSP_DESCRIBE) && (time_out < 10000) ) time_out = 10000;
+			/*don't waste time waiting for teardown ACK, half a sec is enough. If server is not replying
+			in time it is likely to never reply (happens with RTP over RTSP) -> kill session
+			and create new one*/
+			else if (!strcmp(com->method, GF_RTSP_TEARDOWN) && (time>=500) ) time = time_out;
+
+			//signal what's going on
+			if (time >= time_out) {
+				if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
+					gf_rtsp_session_reset(sess->session, GF_TRUE);
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Request Timeout for command %s after %d ms\n", com->method, time));
+				}
+
+				rtpin_rtsp_process_response(sess, com, GF_IP_NETWORK_FAILURE);
+				gf_list_rem(sess->rtsp_commands, 0);
+				gf_rtsp_command_del(com);
+				sess->flags &= ~RTSP_WAIT_REPLY;
+				sess->command_time = 0;
+				gf_rtsp_reset_aggregation(sess->session);
+			}
+		}
+		return;
+	}
+
+	if (!com) return;
+
+	/*send command - check RTSP session state first*/
+	switch (gf_rtsp_get_session_state(sess->session)) {
+	case GF_RTSP_STATE_WAITING:
+	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_list_rem(sess->rtsp_commands, 0);
+		gf_rtsp_command_del(com);
+		sess->flags &= ~RTSP_WAIT_REPLY;
+		sess->command_time = 0;
+		return;
+	}
+	/*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)
+		com->Session = sess->session_id;
+
+	/*preprocess describe before sending (always the ESD url thing)*/
+	if (!strcmp(com->method, GF_RTSP_DESCRIBE)) {
+		com->Session = NULL;
+		if (!rtpin_rtsp_describe_preprocess(sess, com)) {
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+	}
+	/*preprocess play/stop/pause before sending (aggregation)*/
+	if (!strcmp(com->method, GF_RTSP_PLAY)
+	        || !strcmp(com->method, GF_RTSP_PAUSE)
+	        || !strcmp(com->method, GF_RTSP_TEARDOWN)) {
+		//command is skipped
+		if (!rtpin_rtsp_usercom_preprocess(sess, com)) {
+			e = GF_BAD_PARAM;
+			goto exit;
+		}
+	}
+	e = gf_rtsp_send_command(sess->session, com);
+	if (e) {
+		sprintf(sMsg, "Cannot send %s", com->method);
+		rtpin_send_message(sess->rtpin, e, sMsg);
+		rtpin_rtsp_process_response(sess, com, e);
+	} else {
+		sess->command_time = gf_sys_clock();
+		sess->flags |= RTSP_WAIT_REPLY;
+	}
+
+exit:
+	/*reset static strings*/
+	com->User_Agent = NULL;
+	com->Accept_Language = NULL;
+	com->Session = NULL;
+	/*remove command*/
+	if (e) {
+		gf_list_rem(sess->rtsp_commands, 0);
+		gf_rtsp_command_del(com);
+		sess->flags &= ~RTSP_WAIT_REPLY;
+		sess->command_time = 0;
+	}
+}
+
+
+/*locate channel - if requested remove from session*/
+GF_RTPInStream *rtpin_find_stream(GF_RTPIn *rtp, GF_FilterPid *opid, u32 ES_ID, char *es_control, Bool remove_stream)
+{
+	u32 i=0;
+	GF_RTPInStream *st;
+
+	while ((st = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
+		if (opid && (st->opid==opid)) goto found;
+		if (ES_ID && (st->ES_ID==ES_ID)) goto found;
+		if (es_control && st->control) {
+			char *ctrl_start = strstr(es_control, st->control);
+			if (ctrl_start && !strcmp(ctrl_start, st->control)) goto found;
+		}
+	}
+	return NULL;
+
+found:
+	if (remove_stream) gf_list_rem(rtp->streams, i-1);
+	return st;
+}
+
+/*locate session by control*/
+GF_RTPInRTSP *rtpin_rtsp_check(GF_RTPIn *rtp, char *control)
+{
+	if (!control) return NULL;
+
+	if (!strcmp(control, "*")) control = (char *) rtp->src;
+	if (gf_rtsp_is_my_session(rtp->session->session, control)) return rtp->session;
+	return NULL;
+}
+
+GF_RTPInRTSP *rtpin_rtsp_new(GF_RTPIn *rtp, char *session_control)
+{
+	char *szCtrl, *szExt;
+	GF_RTPInRTSP *tmp;
+	GF_RTSPSession *rtsp;
+
+	if (!session_control) return NULL;
+
+	if (rtp->session) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Request more than one RTSP session for more URL, old code to patch !!\n"));
+		return rtp->session;
+	}
+
+	/*little fix: some servers don't understand DESCRIBE URL/trackID=, so remove the trackID...*/
+	szCtrl = gf_strdup(session_control);
+	szExt = szCtrl ? gf_file_ext_start(szCtrl) : NULL;
+	if (szExt) {
+		szExt = strchr(szExt, '/');
+		if (szExt) {
+			if (!strnicmp(szExt+1, "trackID=", 8) || !strnicmp(szExt+1, "ESID=", 5) || !strnicmp(szExt+1, "ES_ID=", 6)) szExt[0] = 0;
+		}
+	}
+
+	rtsp = gf_rtsp_session_new(szCtrl, rtp->default_port);
+	gf_free(szCtrl);
+
+	if (!rtsp) return NULL;
+
+	GF_SAFEALLOC(tmp, GF_RTPInRTSP);
+	if (!tmp) return NULL;
+	tmp->rtpin = rtp;
+	tmp->session = rtsp;
+
+	if (rtp->interleave) {
+		gf_rtsp_set_buffer_size(rtsp, rtp->block_size);
+	} else {
+		gf_rtsp_set_buffer_size(rtsp, RTSP_BUFFER_SIZE);
+	}
+	tmp->rtsp_commands = gf_list_new();
+	tmp->rtsp_rsp = gf_rtsp_response_new();
+
+	rtp->session = tmp;
+	return tmp;
+}
+
+GF_Err rtpin_add_stream(GF_RTPIn *rtp, GF_RTPInStream *stream, char *session_control)
+{
+	Bool has_aggregated_control;
+	char *service_name;
+	GF_RTPInRTSP *in_session = rtpin_rtsp_check(rtp, session_control);
+
+	has_aggregated_control = GF_FALSE;
+	if (session_control) {
+		//if (!strcmp(session_control, "*")) session_control = NULL;
+		has_aggregated_control = GF_TRUE;
+	}
+
+	/*regular setup in an established session (RTSP DESCRIBE)*/
+	if (in_session) {
+		in_session->flags |= RTSP_AGG_CONTROL;
+		stream->rtsp = in_session;
+		gf_list_add(rtp->streams, stream);
+		return GF_OK;
+	}
+
+	/*setup through SDP with control - assume this is RTSP and try to create a session*/
+	if (stream->control) {
+		/*stream control is relative to main session*/
+		if (strnicmp(stream->control, "rtsp://", 7) && strnicmp(stream->control, "rtspu://", 8) && strnicmp(stream->control, "satip://", 8)) {
+			/*locate session by control - if no control was provided for the session, use default
+			session*/
+			if (!in_session) in_session = rtpin_rtsp_check(rtp, session_control ? session_control : "*");
+			/*none found, try to create one*/
+			if (!in_session) in_session = rtpin_rtsp_new(rtp, session_control);
+			/*cannot add an RTSP session for this channel, check if multicast*/
+//			if (!in_session && gf_rtp_is_unicast(stream->rtp_ch) ) return GF_SERVICE_ERROR;
+		}
+		/*stream control is absolute*/
+		else {
+			char *ctrl;
+			in_session = rtpin_rtsp_check(rtp, stream->control);
+			if (!in_session) in_session = rtpin_rtsp_check(rtp, session_control);
+			if (!in_session) {
+				if (session_control && strstr(stream->control, session_control))
+					in_session = rtpin_rtsp_new(rtp, session_control);
+				else
+					in_session = rtpin_rtsp_new(rtp, stream->control);
+				if (!in_session) return GF_SERVICE_ERROR;
+			}
+			/*remove session control part from channel control*/
+			service_name = in_session->session->Service;
+			ctrl = strstr(stream->control, service_name);
+			if (ctrl && (strlen(ctrl) != strlen(service_name)) ) {
+				ctrl += strlen(service_name) + 1;
+				service_name = gf_strdup(ctrl);
+				gf_free(stream->control);
+				stream->control = service_name;
+			}
+		}
+	}
+	/*no control specified, assume this is multicast*/
+	else {
+		in_session = NULL;
+	}
+
+	if (in_session) {
+		if (has_aggregated_control)
+			in_session->flags |= RTSP_AGG_CONTROL;
+	} else if (stream->control) {
+		gf_free(stream->control);
+		stream->control = NULL;
+	}
+	stream->rtsp = in_session;
+	gf_list_add(rtp->streams, stream);
+	return GF_OK;
+}
+
+
+void rtpin_remove_stream(GF_RTPIn *rtp, GF_RTPInStream *stream)
+{
+	u32 i=0;
+	GF_RTPInStream *st;
+	while ((st = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
+		if (st == stream) {
+			gf_list_rem(rtp->streams, i-1);
+			break;
+		}
+	}
+}
+
+static void rtpin_rtsp_reset(GF_RTPInRTSP *sess, GF_Err e)
+{
+	if (!sess) return;
+
+	//destroy command list
+	while (gf_list_count(sess->rtsp_commands)) {
+		GF_RTSPCommand *com = (GF_RTSPCommand *)gf_list_get(sess->rtsp_commands, 0);
+		gf_list_rem(sess->rtsp_commands, 0);
+
+		/*reset static strings*/
+		com->User_Agent = NULL;
+		com->Accept_Language = NULL;
+		com->Session = NULL;
+
+		gf_rtsp_command_del(com);
+		//first = 0;
+	}
+	/*reset session state*/
+	gf_rtsp_session_reset(sess->session, GF_TRUE);
+	sess->flags &= ~RTSP_WAIT_REPLY;
+}
+
+
+void rtpin_rtsp_del(GF_RTPInRTSP *sess)
+{
+	if (!sess) return;
+	rtpin_rtsp_reset(sess, GF_OK);
+	gf_list_del(sess->rtsp_commands);
+	gf_rtsp_response_del(sess->rtsp_rsp);
+	gf_rtsp_session_del(sess->session);
+	if (sess->control) gf_free(sess->control);
+	if (sess->session_id) gf_free(sess->session_id);
+	if (sess->satip_server) gf_free(sess->satip_server);
+	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.0.tar.gz/src/filters/in_rtp_sdp.c Added

@@ -0,0 +1,378 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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 "in_rtp.h"
+#include <gpac/internal/ietf_dev.h>
+//for ismacrypt scheme
+#include <gpac/isomedia.h>
+#include <gpac/avparse.h>
+
+#ifndef GPAC_DISABLE_STREAMING
+
+static GF_Err rtpin_setup_sdp(GF_RTPIn *rtp, GF_SDPInfo *sdp, GF_RTPInStream *for_stream)
+{
+	GF_Err e;
+	GF_SDPMedia *media;
+	Double Start, End;
+	u32 i;
+	char *sess_ctrl;
+	GF_X_Attribute *att;
+	GF_RTSPRange *range;
+
+	Start = 0.0;
+	End = -1.0;
+
+	sess_ctrl = NULL;
+	range = NULL;
+
+	i=0;
+	while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
+		if (!att->Name || !att->Value) continue;
+		//session-level control string. Keep it in the current session if any
+		if (!strcmp(att->Name, "control")) sess_ctrl = att->Value;
+		//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;
+	}
+	if (range) {
+		Start = range->start;
+		End = range->end;
+		gf_rtsp_range_del(range);
+	}
+
+	//setup all streams
+	i=0;
+	while ((media = (GF_SDPMedia*)gf_list_enum(sdp->media_desc, &i))) {
+		GF_RTPInStream *stream = rtpin_stream_new(rtp, media, sdp, for_stream);
+		//do not generate error if the channel is not created, just assume
+		//1 - this is not an MPEG-4 configured channel -> not needed
+		//2 - this is a 2nd describe and the channel was already created
+		if (!stream) continue;
+
+		e = rtpin_add_stream(rtp, stream, sess_ctrl);
+		if (e) {
+			rtpin_stream_del(stream);
+			return e;
+		}
+
+		if (!(stream->flags & RTP_HAS_RANGE)) {
+			stream->range_start = Start;
+			stream->range_end = End;
+			if (End > 0) stream->flags |= RTP_HAS_RANGE;
+		}
+
+		/*force interleaving whenever needed*/
+		if (stream->rtsp) {
+			switch (stream->depacketizer->sl_map.StreamType) {
+			case GF_STREAM_VISUAL:
+			case GF_STREAM_AUDIO:
+				if ((rtp->interleave==1) && ! (stream->rtsp->flags & RTSP_FORCE_INTER) ) {
+					gf_rtsp_set_buffer_size(stream->rtsp->session, stream->rtpin->block_size);
+					stream->rtsp->flags |= RTSP_FORCE_INTER;
+				}
+				break;
+			default:
+				if (rtp->interleave && ! (stream->rtsp->flags & RTSP_FORCE_INTER) ) {
+					gf_rtsp_set_buffer_size(stream->rtsp->session, stream->rtpin->block_size);
+					stream->rtsp->flags |= RTSP_FORCE_INTER;
+				}
+				break;
+			}
+		}
+
+	}
+	return GF_OK;
+}
+
+/*load iod from data:application/mpeg4-iod;base64*/
+static GF_Err rtpin_sdp_load_iod(GF_RTPIn *rtp, char *iod_str)
+{
+	char buf[2000];
+	u32 size;
+
+	if (rtp->iod_desc) return GF_SERVICE_ERROR;
+	/*the only IOD format we support*/
+	iod_str += 1;
+	if (!strnicmp(iod_str, "data:application/mpeg4-iod;base64", strlen("data:application/mpeg4-iod;base64"))) {
+		char *buf64;
+		u32 size64;
+
+		buf64 = strstr(iod_str, ",");
+		if (!buf64) return GF_URL_ERROR;
+		buf64 += 1;
+		size64 = (u32) strlen(buf64) - 1;
+
+		size = gf_base64_decode(buf64, size64, buf, 2000);
+		if (!size) return GF_SERVICE_ERROR;
+	} else if (!strnicmp(iod_str, "data:application/mpeg4-iod;base16", strlen("data:application/mpeg4-iod;base16"))) {
+		char *buf16;
+		u32 size16;
+
+		buf16 = strstr(iod_str, ",");
+		if (!buf16) return GF_URL_ERROR;
+		buf16 += 1;
+		size16 = (u32) strlen(buf16) - 1;
+
+		size = gf_base16_decode(buf16, size16, buf, 2000);
+		if (!size) return GF_SERVICE_ERROR;
+	} else {
+		return GF_NOT_SUPPORTED;
+	}
+
+	gf_odf_desc_read(buf, size, &rtp->iod_desc);
+	return GF_OK;
+}
+
+void rtpin_declare_pid(GF_RTPInStream *stream, Bool force_iod, u32 ch_idx, u32 *ocr_es_id)
+{
+	GP_RTPSLMap *sl_map;
+	const GF_RTPStaticMap *static_map;
+
+	if (!stream->depacketizer) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP Stream channel %u has no depacketizer - not supported\n", ch_idx));
+		return;
+	}
+
+	assert(!stream->opid);
+	stream->opid = gf_filter_pid_new(stream->rtpin->filter);
+
+	gf_filter_pid_set_property(stream->opid, GF_PROP_PID_ID, &PROP_UINT(ch_idx) );
+	if (stream->ES_ID && (force_iod || stream->rtpin->iod_desc))
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_ESID, &PROP_UINT(stream->ES_ID) );
+
+	gf_filter_pid_set_property(stream->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT( gf_rtp_get_clockrate(stream->rtp_ch) ) );
+
+
+	if (stream->rtpin->session && (stream->flags & RTP_HAS_RANGE)) {
+		GF_Fraction64 dur;
+		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) );
+	} else {
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE ) );
+	}
+	if (stream->mid)
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SCALABLE, &PROP_BOOL( GF_TRUE) );
+
+	//TOCHECK: do we need to map ODID ?
+	//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) {
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT( stream->prev_stream) );
+	}
+
+	if (stream->rtpin->iod_desc) {
+		u32 i, count;
+		GF_ObjectDescriptor *iod = (GF_ObjectDescriptor *)stream->rtpin->iod_desc;
+		count = gf_list_count(iod->ESDescriptors);
+		for (i=0; i<count; i++) {
+			GF_ESD *esd = gf_list_get(iod->ESDescriptors, i);
+			if (esd->ESID == stream->ES_ID) {
+				gf_filter_pid_set_property(stream->opid, GF_PROP_PID_IN_IOD, &PROP_BOOL( GF_TRUE ) );
+			}
+		}
+	} else if (force_iod) {
+		switch (stream->depacketizer->sl_map.StreamType) {
+		case GF_STREAM_OD:
+		case GF_STREAM_SCENE:
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_IN_IOD, &PROP_BOOL( GF_TRUE ) );
+			break;
+		}
+	}
+	if (!stream->ES_ID)
+		stream->ES_ID = ch_idx;
+
+	if (ocr_es_id) {
+		if (! *ocr_es_id) *ocr_es_id = stream->ES_ID;
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT( *ocr_es_id) );
+	}
+
+	sl_map = &stream->depacketizer->sl_map;
+	static_map = stream->depacketizer->static_map;
+
+	if (sl_map->StreamType) {
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(sl_map->StreamType) );
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_CODECID, &PROP_UINT(sl_map->CodecID) );
+
+		if (sl_map->config)
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA(sl_map->config, sl_map->configSize) );
+
+		if (sl_map->rvc_predef) {
+			gf_filter_pid_set_property_str(stream->opid, "rvc:predef", &PROP_UINT( sl_map->rvc_predef) );
+		} else if (sl_map->rvc_config) {
+			gf_filter_pid_set_property_str(stream->opid, "rvc:config", &PROP_DATA_NO_COPY( sl_map->rvc_config, sl_map->rvc_config_size) );
+			sl_map->rvc_config = NULL;
+			sl_map->rvc_config_size = 0;
+		}
+	} else if (static_map) {
+		if (static_map->stream_type)
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(static_map->stream_type) );
+		if (static_map->codec_id)
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_CODECID, &PROP_UINT(static_map->codec_id) );
+		if (static_map->mime)
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_MIME, &PROP_STRING((char*)static_map->mime) );
+	}
+	if (stream->depacketizer->w)
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_WIDTH, &PROP_UINT(stream->depacketizer->w) );
+	if (stream->depacketizer->h)
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(stream->depacketizer->h) );
+
+
+	/*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_VERSION, &PROP_UINT(1) );
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_PROTECTION_KMS_URI, &PROP_STRING(stream->depacketizer->key) );
+	}
+
+	if (sl_map->StreamType==GF_STREAM_VISUAL) {
+		if (stream->depacketizer->payt != GF_RTP_PAYT_MPEG4) {
+			gf_filter_pid_recompute_dts(stream->opid, GF_TRUE);
+		} else if (!stream->depacketizer->sl_map.DTSDeltaLength && !stream->depacketizer->sl_map.CTSDeltaLength) {
+			gf_filter_pid_recompute_dts(stream->opid, GF_TRUE);
+		}
+	}
+
+
+	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) {
+#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) );
+#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;
+		}
+	}
+}
+
+
+static void rtpin_declare_media(GF_RTPIn *rtp, Bool force_iod)
+{
+	GF_RTPInStream *stream;
+	u32 i, ocr_es_id;
+	ocr_es_id = 0;
+	/*add everything*/
+	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);
+	}
+	rtp->stream_type = 0;
+}
+
+void rtpin_load_sdp(GF_RTPIn *rtp, char *sdp_text, u32 sdp_len, GF_RTPInStream *stream)
+{
+	GF_Err e;
+	u32 i;
+	GF_SDPInfo *sdp;
+	Bool is_isma_1;
+	char *iod_str;
+	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);
+
+	if (e == GF_OK) e = rtpin_setup_sdp(rtp, sdp, stream);
+
+	if (e != GF_OK) {
+		if (!stream) {
+			gf_filter_setup_failure(rtp->filter, e);
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPIn] code not tested file %s line %d !!\n", __FILE__, __LINE__));
+			gf_filter_setup_failure(rtp->filter, e);
+			stream->status = RTP_Unavailable;
+		}
+		gf_sdp_info_del(sdp);
+		return;
+	}
+
+	/*root SDP, attach service*/
+	if (!stream) {
+		/*look for IOD*/
+		i=0;
+		while ((att = (GF_X_Attribute*)gf_list_enum(sdp->Attributes, &i))) {
+			if (!iod_str && !strcmp(att->Name, "mpeg4-iod") ) iod_str = att->Value;
+			if (!is_isma_1 && !strcmp(att->Name, "isma-compliance") ) {
+				if (!stricmp(att->Value, "1,1.0,1")) is_isma_1 = GF_TRUE;
+			}
+		}
+
+		/*force iod reconstruction with ISMA to use proper clock dependencies*/
+		if (is_isma_1) iod_str = NULL;
+
+		if (!iod_str) {
+			GF_RTPInStream *a_stream;
+			i=0;
+			while (!force_in_iod && (a_stream = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
+				if (!a_stream->depacketizer) continue;
+				if (a_stream->depacketizer->payt!=GF_RTP_PAYT_MPEG4) continue;
+				switch (a_stream->depacketizer->sl_map.StreamType) {
+				case GF_STREAM_SCENE:
+				case GF_STREAM_OD:
+					force_in_iod = GF_TRUE;
+					break;
+				default:
+					break;
+				}
+			}
+		}
+
+		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);
+	}
+	/*channel SDP */
+	else {
+		/*connect*/
+		rtpin_stream_setup(stream, NULL);
+	}
+	gf_sdp_info_del(sdp);
+}
+
+#endif /*GPAC_DISABLE_STREAMING*/

gpac-1.0.0.tar.gz/src/filters/in_rtp_signaling.c Added

@@ -0,0 +1,867 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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 "in_rtp.h"
+#include <gpac/internal/ietf_dev.h>
+
+#ifndef GPAC_DISABLE_STREAMING
+
+static Bool rtpin_stream_is_valid(GF_RTPIn *rtp, GF_RTPInStream *stream)
+{
+	u32 i=0;
+	GF_RTPInStream *st;
+	while ((st = (GF_RTPInStream *)gf_list_enum(rtp->streams, &i))) {
+		if (st == stream) return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+/*this prevent sending teardown on session with running channels*/
+static Bool rtpin_rtsp_is_active(GF_RTPInStream *stream)
+{
+	GF_RTPInStream *a_st;
+	u32 i, count;
+	i = count = 0;
+	while ((a_st = (GF_RTPInStream *)gf_list_enum(stream->rtpin->streams, &i))) {
+		if (a_st->rtsp != stream->rtsp) continue;
+		/*count only active channels*/
+		if (a_st->status == RTP_Running) count++;
+	}
+	return count ? GF_TRUE : GF_FALSE;
+}
+
+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;
+	}
+	gf_list_add(sess->rtsp_commands, com);
+}
+
+
+
+/*
+ 						channel setup functions
+																*/
+
+void rtpin_rtsp_setup_send(GF_RTPInStream *stream)
+{
+	GF_RTSPCommand *com;
+	GF_RTSPTransport *trans;
+
+	com = gf_rtsp_command_new();
+	com->method = gf_strdup(GF_RTSP_SETUP);
+
+	//setup ports if unicast non interleaved or multicast
+	if (gf_rtp_is_unicast(stream->rtp_ch) && (stream->rtpin->interleave != 1) && !gf_rtp_is_interleaved(stream->rtp_ch) ) {
+		gf_rtp_set_ports(stream->rtp_ch, stream->rtpin->firstport);
+	} else if (stream->rtpin->force_mcast) {
+		gf_rtp_set_ports(stream->rtp_ch, stream->rtpin->firstport);
+	}
+
+	trans = gf_rtsp_transport_clone((GF_RTSPTransport *)gf_rtp_get_transport(stream->rtp_ch));
+
+	/*some servers get confused when trying to resetup on the same remote ports, so reset info*/
+	trans->port_first = trans->port_last = 0;
+	trans->SSRC = 0;
+
+	/*override transport: */
+	/*1: multicast forced*/
+	if (stream->rtpin->force_mcast) {
+		trans->IsUnicast = GF_FALSE;
+		trans->destination = gf_strdup(stream->rtpin->force_mcast);
+		trans->TTL = stream->rtpin->ttl;
+		if (trans->Profile) gf_free(trans->Profile);
+		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP);
+		if (!(stream->rtsp->flags & RTSP_DSS_SERVER) ) {
+			trans->port_first = trans->client_port_first;
+			trans->port_last = trans->client_port_last;
+			/*this is correct but doesn't work with DSS: the server expects "client_port" to indicate
+			the multicast port, not "port" - this will send both*/
+			//trans->client_port_first = trans->client_port_last = 0;
+		}
+		gf_rtp_setup_transport(stream->rtp_ch, trans, NULL);
+	}
+	/*2: RTP over RTSP forced*/
+	else if (stream->rtsp->flags & RTSP_FORCE_INTER) {
+		if (trans->Profile) gf_free(trans->Profile);
+		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP_TCP);
+		//some servers expect the interleaved to be set during the setup request
+		trans->IsInterleaved = GF_TRUE;
+		trans->rtpID = 2*gf_list_find(stream->rtpin->streams, stream);
+		trans->rtcpID = trans->rtpID+1;
+		gf_rtp_setup_transport(stream->rtp_ch, trans, NULL);
+	}
+
+	if (trans->source) {
+		gf_free(trans->source);
+		trans->source = NULL;
+	}
+
+	/*turn off interleaving in case of re-setup, some servers don't like it (we still signal it
+	through RTP/AVP/TCP profile so it's OK)*/
+//	trans->IsInterleaved = 0;
+	gf_list_add(com->Transports, trans);
+	if (strlen(stream->control)) com->ControlString = gf_strdup(stream->control);
+
+	com->user_data = stream;
+	stream->status = RTP_WaitingForAck;
+
+	rtpin_rtsp_queue_command(stream->rtsp, stream, com, GF_TRUE);
+}
+
+/*filter setup if no session (rtp only)*/
+GF_Err rtpin_stream_setup(GF_RTPInStream *stream, RTPIn_StreamDescribe *ch_desc)
+{
+	GF_Err resp;
+
+	/*assign ES_ID of the channel*/
+	if (ch_desc && !stream->ES_ID && ch_desc->ES_ID) stream->ES_ID = ch_desc->ES_ID;
+
+	stream->status = RTP_Setup;
+
+	/*assign channel handle if not done*/
+	if (ch_desc && stream->opid) {
+		assert(stream->opid == ch_desc->opid);
+	} else if (!stream->opid && stream->rtsp && !stream->rtsp->satip) {
+		assert(ch_desc);
+		assert(ch_desc->opid);
+		stream->opid = ch_desc->opid;
+	}
+
+	/*no session , setup for pure rtp*/
+	if (!stream->rtsp) {
+		stream->flags |= RTP_CONNECTED;
+		/*init rtp*/
+		resp = rtpin_stream_init(stream, GF_FALSE);
+		/*send confirmation to user*/
+		rtpin_stream_ack_connect(stream, resp);
+	} else {
+		rtpin_rtsp_setup_send(stream);
+	}
+	return GF_OK;
+}
+
+static GF_Err rtpin_rtsp_tcp_send_report(void *par, void *par2, Bool is_rtcp, u8 *pck, u32 pck_size)
+{
+	return GF_OK;
+}
+
+void rtpin_rtsp_setup_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e)
+{
+	GF_RTPInStream *stream;
+	u32 i;
+	GF_RTSPTransport *trans;
+
+	stream = (GF_RTPInStream *)com->user_data;
+	if (e) goto exit;
+
+	switch (sess->rtsp_rsp->ResponseCode) {
+	case NC_RTSP_OK:
+		break;
+	case NC_RTSP_Not_Found:
+		e = GF_STREAM_NOT_FOUND;
+		goto exit;
+	default:
+		e = GF_SERVICE_ERROR;
+		goto exit;
+	}
+	e = GF_SERVICE_ERROR;
+	if (!stream) goto exit;
+
+	/*assign session ID*/
+	if (!sess->rtsp_rsp->Session) {
+		e = GF_SERVICE_ERROR;
+		goto exit;
+	}
+	if (!sess->session_id) sess->session_id = gf_strdup(sess->rtsp_rsp->Session);
+	assert(!stream->session_id);
+
+	/*transport setup: break at the first correct transport */
+	i=0;
+	while ((trans = (GF_RTSPTransport *)gf_list_enum(sess->rtsp_rsp->Transports, &i))) {
+		/*copy over previous ports (hack for some servers overriding client ports)*/
+		if (stream->rtpin->use_client_ports)
+			gf_rtp_get_ports(stream->rtp_ch, &trans->client_port_first, &trans->client_port_last);
+
+		if (gf_rtp_is_interleaved(stream->rtp_ch) && !trans->IsInterleaved) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Requested interleaved RTP over RTSP but server did not setup interleave - cannot process command\n"));
+			e = GF_REMOTE_SERVICE_ERROR;
+			continue;
+		}
+
+		e = gf_rtp_setup_transport(stream->rtp_ch, trans, gf_rtsp_get_server_name(sess->session));
+		if (!e) break;
+	}
+	if (e) goto exit;
+
+	e = rtpin_stream_init(stream, GF_FALSE);
+	if (e) goto exit;
+	stream->status = RTP_Connected;
+
+	//in case this is TCP channel, setup callbacks
+	stream->flags &= ~RTP_INTERLEAVED;
+	if (gf_rtp_is_interleaved(stream->rtp_ch)) {
+		stream->flags |= RTP_INTERLEAVED;
+		gf_rtsp_set_interleave_callback(sess->session, rtpin_rtsp_data_cbk);
+
+		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())
+			rtpin_rtsp_tcp_send_report(NULL, NULL, GF_FALSE, NULL, 0);
+#endif
+	}
+
+	if (sess->satip) {
+		RTPIn_StreamControl *ch_ctrl = NULL;
+		GF_RTSPCommand *a_com = gf_rtsp_command_new();
+		a_com->method = gf_strdup(GF_RTSP_PLAY);
+		GF_SAFEALLOC(ch_ctrl, RTPIn_StreamControl);
+		if (ch_ctrl) {
+			ch_ctrl->stream = stream;
+			a_com->user_data = ch_ctrl;
+		}
+		rtpin_rtsp_queue_command(sess, stream, a_com, GF_TRUE);
+	}
+
+exit:
+	/*confirm only on first connect, otherwise this is a re-SETUP of the rtsp session, not the channel*/
+	if (stream && ! (stream->flags & RTP_CONNECTED) ) {
+		if (!e)
+			stream->flags |= RTP_CONNECTED;
+		rtpin_stream_ack_connect(stream, e);
+	}
+	com->user_data = NULL;
+}
+
+
+/*
+ 						session/channel describe functions
+																*/
+/*filter describe commands in case of ESD URLs*/
+Bool rtpin_rtsp_describe_preprocess(GF_RTPInRTSP *sess, GF_RTSPCommand *com)
+{
+	GF_RTPInStream *stream;
+	RTPIn_StreamDescribe *ch_desc;
+	/*not a channel describe*/
+	if (!com->user_data) {
+		rtpin_send_message(sess->rtpin, GF_OK, "Connecting...");
+		return GF_TRUE;
+	}
+
+	ch_desc = (RTPIn_StreamDescribe *)com->user_data;
+	stream = rtpin_find_stream(sess->rtpin, NULL, ch_desc->ES_ID, ch_desc->esd_url, GF_FALSE);
+	if (!stream) return GF_TRUE;
+
+	/*channel has been described already, skip describe and send setup directly*/
+	rtpin_stream_setup(stream, ch_desc);
+
+	if (ch_desc->esd_url) gf_free(ch_desc->esd_url);
+	gf_free(ch_desc);
+	return GF_FALSE;
+}
+
+/*process describe reply*/
+GF_Err rtpin_rtsp_describe_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e)
+{
+	GF_RTPInStream *stream;
+	RTPIn_StreamDescribe *ch_desc;
+
+	stream = NULL;
+	ch_desc = (RTPIn_StreamDescribe *)com->user_data;
+	if (e) goto exit;
+
+	switch (sess->rtsp_rsp->ResponseCode) {
+	//TODO handle all 3xx codes  (redirections)
+	case NC_RTSP_Multiple_Choice:
+		e = ch_desc ? GF_STREAM_NOT_FOUND : GF_URL_ERROR;
+		goto exit;
+	case NC_RTSP_Not_Found:
+		e = GF_URL_ERROR;
+		goto exit;
+	case NC_RTSP_OK:
+		break;
+	default:
+		//we should have a basic error code mapping here
+		e = GF_SERVICE_ERROR;
+		goto exit;
+	}
+
+	stream = NULL;
+	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");
+	}
+
+	/*error on loading SDP is done internally*/
+	rtpin_load_sdp(sess->rtpin, sess->rtsp_rsp->body, sess->rtsp_rsp->Content_Length, stream);
+
+	if (!ch_desc) goto exit;
+	if (!stream) {
+		e = GF_STREAM_NOT_FOUND;
+		goto exit;
+	}
+	e = rtpin_stream_setup(stream, ch_desc);
+
+exit:
+	com->user_data = NULL;
+	if (e) {
+		if (!ch_desc) {
+			sess->connect_error = e;
+			return e;
+		} else if (stream) {
+			rtpin_stream_ack_connect(stream, e);
+		} else {
+			//TODO - check if this is correct
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPIn] code not tested file %s line %d !!\n", __FILE__, __LINE__));
+			gf_filter_setup_failure(sess->rtpin->filter, e);
+		}
+	}
+	if (ch_desc) gf_free(ch_desc);
+	return GF_OK;
+}
+
+/*send describe*/
+void rtpin_rtsp_describe_send(GF_RTPInRTSP *sess, char *esd_url, GF_FilterPid *opid)
+{
+	RTPIn_StreamDescribe *ch_desc;
+	GF_RTSPCommand *com;
+
+	/*locate the channel by URL - if we have one, this means the channel is already described
+	this happens when 2 ESD with URL use the same RTSP service - skip describe and send setup*/
+	if (esd_url || opid) {
+		GF_RTPInStream *stream = rtpin_find_stream(sess->rtpin, opid, 0, esd_url, GF_FALSE);
+		if (stream) {
+			if (!stream->opid) stream->opid = opid;
+			switch (stream->status) {
+			case RTP_Connected:
+			case RTP_Running:
+				rtpin_stream_ack_connect(stream, GF_OK);
+				return;
+			default:
+				break;
+			}
+			ch_desc = (RTPIn_StreamDescribe *)gf_malloc(sizeof(RTPIn_StreamDescribe));
+			ch_desc->esd_url = esd_url ? gf_strdup(esd_url) : NULL;
+			ch_desc->opid = opid;
+			rtpin_stream_setup(stream, ch_desc);
+
+			if (esd_url) gf_free(ch_desc->esd_url);
+			gf_free(ch_desc);
+			return;
+		}
+		/*channel not found, send describe on service*/
+	}
+
+	/*send describe*/
+	com = gf_rtsp_command_new();
+	if (!sess->satip) {
+		com->method = gf_strdup(GF_RTSP_DESCRIBE);
+	} else {
+		GF_Err e;
+		GF_RTSPTransport *trans;
+		GF_RTPInStream *stream = NULL;
+
+		com->method = gf_strdup(GF_RTSP_SETUP);
+
+		/*setup transport ports*/
+		GF_SAFEALLOC(trans, GF_RTSPTransport);
+		if (trans) {
+			trans->IsUnicast = GF_TRUE;
+			trans->client_port_first = sess->rtpin->satip_port;
+			trans->client_port_last = sess->rtpin->satip_port+1;
+			trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP);
+			gf_list_add(com->Transports, trans);
+		}
+		
+		/*hardcoded channel*/
+		stream = rtpin_stream_new_satip(sess->rtpin, sess->satip_server);
+		if (!stream) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("SAT>IP: couldn't create the RTP stream.\n"));
+			return;
+		}
+		e = rtpin_add_stream(sess->rtpin, stream, "*");
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("SAT>IP: couldn't add the RTP stream.\n"));
+			return;
+		}
+		com->user_data = stream;
+	}
+
+	if (opid || esd_url) {
+		com->Accept = gf_strdup("application/sdp");
+		com->ControlString = esd_url ? gf_strdup(esd_url) : NULL;
+
+		ch_desc = (RTPIn_StreamDescribe *)gf_malloc(sizeof(RTPIn_StreamDescribe));
+		ch_desc->esd_url = esd_url ? gf_strdup(esd_url) : NULL;
+		ch_desc->opid = opid;
+
+		com->user_data = ch_desc;
+	} else {
+		//always accept both SDP and IOD
+		com->Accept = gf_strdup("application/sdp, application/mpeg4-iod");
+//		com->Accept = gf_strdup("application/sdp");
+	}
+
+	/*need better tuning ...*/
+	if (sess->rtpin->bandwidth)
+		com->Bandwidth = sess->rtpin->bandwidth;
+
+	rtpin_rtsp_queue_command(sess, NULL, com, GF_FALSE);
+}
+
+
+static void rtpin_rtsp_skip_command(GF_RTPInStream *stream)
+{
+	u32 i;
+	GF_RTPInStream *a_st;
+	if (!stream || (stream->flags & RTP_SKIP_NEXT_COM) || !(stream->rtsp->flags & RTSP_AGG_CONTROL) ) return;
+	i=0;
+	while ((a_st = (GF_RTPInStream *)gf_list_enum(stream->rtpin->streams, &i))) {
+		if ((stream == a_st) || (a_st->rtsp != stream->rtsp) ) continue;
+		if (a_st->status>=RTP_Connected)
+			a_st->flags |= RTP_SKIP_NEXT_COM;
+	}
+}
+
+
+/*
+ 						channel control functions
+																*/
+/*remove command if session is using aggregated control*/
+Bool rtpin_rtsp_usercom_preprocess(GF_RTPInRTSP *sess, GF_RTSPCommand *com)
+{
+	RTPIn_StreamControl *ch_ctrl;
+	GF_RTPInStream *stream;
+	GF_Err e;
+	Bool skip_it;
+
+	ch_ctrl = NULL;
+	if (strcmp(com->method, GF_RTSP_TEARDOWN)) ch_ctrl = (RTPIn_StreamControl *)com->user_data;
+	if (!ch_ctrl || !ch_ctrl->stream) return GF_TRUE;
+	stream = ch_ctrl->stream;
+
+	if (!sess->satip) {
+		if (!stream->opid || !rtpin_stream_is_valid(sess->rtpin, stream)) {
+			gf_free(ch_ctrl);
+			com->user_data = NULL;
+			return GF_FALSE;
+		}
+
+		assert(stream->rtsp == sess);
+		assert(stream->opid == ch_ctrl->evt.base.on_pid);
+	}
+
+	skip_it = GF_FALSE;
+	if (!com->Session) {
+		/*re-SETUP failed*/
+		if (!strcmp(com->method, GF_RTSP_PLAY) || !strcmp(com->method, GF_RTSP_PAUSE)) {
+			e = GF_SERVICE_ERROR;
+			goto err_exit;
+		}
+		/*this is a stop, no need for SessionID just skip*/
+		skip_it = GF_TRUE;
+	} else {
+		rtpin_rtsp_skip_command(stream);
+	}
+
+	/*check if aggregation discards this command*/
+	if (skip_it || ( (sess->flags & RTSP_AGG_CONTROL) && (stream->flags & RTP_SKIP_NEXT_COM) )) {
+		stream->flags &= ~RTP_SKIP_NEXT_COM;
+		gf_free(ch_ctrl);
+		com->user_data = NULL;
+		return GF_FALSE;
+	}
+	return GF_TRUE;
+
+err_exit:
+	gf_rtsp_reset_aggregation(stream->rtsp->session);
+	stream->status = RTP_Disconnected;
+	stream->check_rtp_time = RTP_SET_TIME_NONE;
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Error processing event %s: %s\n", gf_filter_event_name(ch_ctrl->evt.base.type), gf_error_to_string(e) ));
+
+	gf_free(ch_ctrl);
+	com->user_data = NULL;
+	return GF_FALSE;
+}
+
+void rtpin_rtsp_usercom_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e)
+{
+	RTPIn_StreamControl *ch_ctrl;
+	GF_RTPInStream *stream, *agg_st;
+	u32 i, count;
+	GF_RTPInfo *info;
+
+	ch_ctrl = (RTPIn_StreamControl *)com->user_data;
+	stream = ch_ctrl->stream;
+
+	if (stream) {
+		if (!stream->opid || !rtpin_stream_is_valid(sess->rtpin, stream)) {
+			gf_free(ch_ctrl);
+			com->user_data = NULL;
+			return;
+		}
+
+		assert(stream->opid==ch_ctrl->evt.base.on_pid);
+	}
+
+	/*some consistency checking: on interleaved sessions, some servers do NOT reply to the
+	teardown. If our command is STOP just skip the error notif*/
+	if (e) {
+		if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
+			goto process_reply;
+		} else {
+			/*spec is not really clear about what happens if the server doesn't support
+			non aggregated operations. Since this happen only on pause/play, we consider
+			that no error occured and wait for next play*/
+			if (sess->rtsp_rsp->ResponseCode == NC_RTSP_Only_Aggregate_Operation_Allowed) {
+				sess->flags |= RTSP_AGG_ONLY;
+				sess->rtsp_rsp->ResponseCode = NC_RTSP_OK;
+			} else {
+				goto err_exit;
+			}
+		}
+	}
+
+	switch (sess->rtsp_rsp->ResponseCode) {
+	//handle all 3xx codes  (redirections)
+	case NC_RTSP_Method_Not_Allowed:
+		e = GF_NOT_SUPPORTED;
+		goto err_exit;
+	case NC_RTSP_OK:
+		break;
+	default:
+		//we should have a basic error code mapping here
+		e = GF_SERVICE_ERROR;
+		goto err_exit;
+	}
+
+process_reply:
+
+	if ( (ch_ctrl->evt.base.type==GF_FEVT_PLAY)
+	        || (ch_ctrl->evt.base.type==GF_FEVT_SET_SPEED)
+	        || (ch_ctrl->evt.base.type==GF_FEVT_RESUME) ) {
+
+		//auto-detect any aggregated control if not done yet
+		if (gf_list_count(sess->rtsp_rsp->RTP_Infos) > 1) {
+			sess->flags |= RTSP_AGG_CONTROL;
+		}
+
+		//process all RTP infos
+		count = gf_list_count(sess->rtsp_rsp->RTP_Infos);
+		for (i=0; i<count; i++) {
+			info = (GF_RTPInfo*)gf_list_get(sess->rtsp_rsp->RTP_Infos, i);
+			agg_st = rtpin_find_stream(sess->rtpin, NULL, 0, info->url, GF_FALSE);
+
+			if (!agg_st || (agg_st->rtsp != sess) ) continue;
+			/*channel is already playing*/
+			if (agg_st->status == RTP_Running) {
+				gf_rtp_set_info_rtp(agg_st->rtp_ch, info->seq, info->rtp_time, info->ssrc);
+				agg_st->check_rtp_time = RTP_SET_TIME_RTP;
+				continue;
+			}
+
+			/*if play/seeking we must send update RTP/NPT link*/
+			if (ch_ctrl->evt.base.type != GF_FEVT_RESUME) {
+				agg_st->check_rtp_time = RTP_SET_TIME_RTP;
+			}
+			/*this is used to discard RTP packets re-sent on resume*/
+			else {
+				agg_st->check_rtp_time = RTP_SET_TIME_RTP_SEEK;
+			}
+			/* reset the buffers */
+			rtpin_stream_init(agg_st, GF_TRUE);
+
+			gf_rtp_set_info_rtp(agg_st->rtp_ch, info->seq, info->rtp_time, info->ssrc);
+			agg_st->status = RTP_Running;
+
+			/*skip next play command on this channel if aggregated control*/
+			if ((stream != agg_st) && stream && (stream->rtsp->flags & RTSP_AGG_CONTROL) ) agg_st->flags |= RTP_SKIP_NEXT_COM;
+
+
+			if (gf_rtp_is_interleaved(agg_st->rtp_ch)) {
+				gf_rtsp_register_interleave(sess->session,
+				                            agg_st,
+				                            gf_rtp_get_low_interleave_id(agg_st->rtp_ch),
+				                            gf_rtp_get_hight_interleave_id(agg_st->rtp_ch));
+			}
+		}
+		/*no rtp info (just in case), no time mapped - set to 0 and specify we're not interactive*/
+		if (stream && !i) {
+			stream->current_start = 0.0;
+			stream->check_rtp_time = RTP_SET_TIME_RTP;
+			rtpin_stream_init(stream, GF_TRUE);
+			stream->status = RTP_Running;
+			if (gf_rtp_is_interleaved(stream->rtp_ch)) {
+				gf_rtsp_register_interleave(sess->session,
+				                            stream, gf_rtp_get_low_interleave_id(stream->rtp_ch), gf_rtp_get_hight_interleave_id(stream->rtp_ch));
+			}
+		}
+		if (stream) stream->flags &= ~RTP_SKIP_NEXT_COM;
+	} else if (ch_ctrl->evt.base.type == GF_FEVT_PAUSE) {
+		if (stream) {
+			rtpin_rtsp_skip_command(stream);
+			stream->flags &= ~RTP_SKIP_NEXT_COM;
+
+		}
+	} else if (ch_ctrl->evt.base.type == GF_FEVT_STOP) {
+		sess->rtpin->eos_probe_start = gf_sys_clock();
+		if (stream)
+			stream->flags |= RTP_EOS;
+	}
+	gf_free(ch_ctrl);
+	com->user_data = NULL;
+	return;
+
+
+err_exit:
+	if (stream) {
+		stream->status = RTP_Disconnected;
+		stream->flags |= RTP_EOS;
+		gf_rtsp_reset_aggregation(stream->rtsp->session);
+		stream->check_rtp_time = RTP_SET_TIME_NONE;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Error processing user command %s\n", gf_error_to_string(e) ));
+	gf_free(ch_ctrl);
+	com->user_data = NULL;
+	if (sess->flags & RTSP_TCP_FLUSH) {
+		sess->rtpin->eos_probe_start = gf_sys_clock();
+	}
+}
+
+
+void rtpin_rtsp_usercom_send(GF_RTPInRTSP *sess, GF_RTPInStream *stream, const GF_FilterEvent *evt)
+{
+	RTPIn_StreamControl *ch_ctrl;
+	u32 i;
+	Bool needs_setup = GF_FALSE;
+	GF_RTSPCommand *com;
+	GF_RTSPRange *range;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+	case GF_FEVT_RESUME:
+		needs_setup = GF_TRUE;
+		break;
+	case GF_FEVT_PAUSE:
+	case GF_FEVT_STOP:
+		break;
+	//TODO
+	case GF_FEVT_SET_SPEED:
+	default:
+		return;
+	}
+
+
+	/*we may need to re-setup stream/session*/
+	if (needs_setup) {
+		if (stream->status == RTP_Disconnected) {
+			if (sess->flags & RTSP_AGG_CONTROL) {
+				GF_RTPInStream *a_st;
+				i=0;
+				while ((a_st = (GF_RTPInStream *)gf_list_enum(sess->rtpin->streams, &i))) {
+					if (a_st->rtsp != sess) continue;
+					if (a_st->status == RTP_Disconnected)
+						rtpin_rtsp_setup_send(a_st);
+				}
+			} else {
+				rtpin_rtsp_setup_send(stream);
+			}
+		}
+	}
+
+	com	= gf_rtsp_command_new();
+	range = NULL;
+
+	if ( (evt->base.type == GF_FEVT_PLAY) || (evt->base.type == GF_FEVT_RESUME) ) {
+
+		range = gf_rtsp_range_new();
+		range->start = stream->range_start;
+		range->end = stream->range_end;
+
+		com->method = gf_strdup(GF_RTSP_PLAY);
+
+		stream->paused = GF_FALSE;
+
+		/*specify pause range on resume - this is not mandatory but most servers need it*/
+		if (evt->base.type == GF_FEVT_RESUME) {
+			range->start = stream->current_start;
+
+			stream->stat_start_time -= stream->stat_stop_time;
+			stream->stat_start_time += gf_sys_clock();
+			stream->stat_stop_time = 0;
+		} else {
+			range->start = stream->range_start;
+			if (evt->play.start_range>=0) range->start += evt->play.start_range;
+			range->end = stream->range_start;
+			if (evt->play.end_range >=0) {
+				range->end += evt->play.end_range;
+				if (range->end > stream->range_end) range->end = stream->range_end;
+			}
+
+			stream->stat_start_time = gf_sys_clock();
+			stream->stat_stop_time = 0;
+		}
+		/*if aggregated the command is sent once, so store info at session level*/
+		if (stream->flags & RTP_SKIP_NEXT_COM) {
+			stream->current_start = stream->rtsp->last_range;
+		} else {
+			stream->rtsp->last_range = range->start;
+			stream->current_start = range->start;
+		}
+		/*some RTSP servers don't accept Range=npt:0.0- (for ex, broadcast only...), so skip it if:
+		- a range was given in initial describe
+		- the command is not a RESUME
+		*/
+		if (!(stream->flags & RTP_HAS_RANGE) && (evt->base.type != GF_FEVT_RESUME) ) {
+			gf_rtsp_range_del(range);
+			com->Range = NULL;
+		} else {
+			com->Range = range;
+		}
+
+		if (sess->flags & RTSP_AGG_CONTROL)
+			rtpin_rtsp_skip_command(stream);
+		else if (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) {
+		com->method = gf_strdup(GF_RTSP_PAUSE);
+		if (stream) {
+			range = gf_rtsp_range_new();
+			/*update current time*/
+			stream->current_start += gf_rtp_get_current_time(stream->rtp_ch);
+			stream->stat_stop_time = gf_sys_clock();
+			range->start = stream->current_start;
+			range->end = -1.0;
+			com->Range = range;
+
+			if (sess->flags & RTSP_AGG_CONTROL)
+				rtpin_rtsp_skip_command(stream);
+			else if (strlen(stream->control))
+				com->ControlString = gf_strdup(stream->control);
+
+			stream->paused = GF_TRUE;
+		}
+	}
+	else if (evt->base.type == GF_FEVT_STOP) {
+		stream->current_start = 0;
+		stream->stat_stop_time = gf_sys_clock();
+
+		stream->status = RTP_Connected;
+		rtpin_stream_init(stream, GF_TRUE);
+
+		/*if server only support aggregation on pause, skip the command or issue
+		a teardown if last active stream*/
+		if (stream->rtsp->flags & RTSP_AGG_ONLY) {
+			stream->flags &= ~RTP_SKIP_NEXT_COM;
+			//remove interleaved
+			if (gf_rtp_is_interleaved(stream->rtp_ch)) {
+				gf_rtsp_unregister_interleave(stream->rtsp->session, gf_rtp_get_low_interleave_id(stream->rtp_ch));
+			}
+
+			if (com) gf_rtsp_command_del(com);
+			if (!rtpin_rtsp_is_active(stream))
+				rtpin_rtsp_teardown(sess, stream);
+			return;
+		}
+		/* otherwise send a PAUSE on the stream */
+		else {
+			if (stream->paused) {
+				if (com) gf_rtsp_command_del(com);
+				return;
+			}
+			range = gf_rtsp_range_new();
+			range->start = 0;
+			range->end = -1;
+			com->method = gf_strdup(GF_RTSP_PAUSE);
+			com->Range = range;
+			/*only pause the specified stream*/
+			if (stream->control) com->ControlString = gf_strdup(stream->control);
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Unsupported command %s\n", gf_filter_event_name(evt->base.type) ));
+		gf_rtsp_command_del(com);
+		return;
+	}
+
+	ch_ctrl = (RTPIn_StreamControl *)gf_malloc(sizeof(RTPIn_StreamControl));
+	ch_ctrl->stream = stream;
+	memcpy(&ch_ctrl->evt, evt, sizeof(GF_FilterEvent));
+	com->user_data = ch_ctrl;
+
+	rtpin_rtsp_queue_command(sess, stream, com, GF_TRUE);
+	return;
+}
+
+
+/*
+ 						session/channel teardown functions
+																*/
+void rtpin_rtsp_teardown_process(GF_RTPInRTSP *sess, GF_RTSPCommand *com, GF_Err e)
+{
+	GF_RTPInStream *stream = (GF_RTPInStream *)com->user_data;
+	if (stream) {
+		if (stream->session_id) gf_free(stream->session_id);
+		stream->session_id = NULL;
+	} else {
+		if (sess->session_id) gf_free(sess->session_id);
+		sess->session_id = NULL;
+	}
+}
+
+void rtpin_rtsp_teardown(GF_RTPInRTSP *sess, GF_RTPInStream *stream)
+{
+	GF_RTSPCommand *com;
+
+	/*we need a session id*/
+	if (!sess->session_id) return;
+	/*ignore teardown on channels*/
+	if ((sess->flags & RTSP_AGG_CONTROL) && stream) return;
+
+	com = gf_rtsp_command_new();
+	com->method = gf_strdup(GF_RTSP_TEARDOWN);
+	/*this only works in RTSP2*/
+	if (stream && stream->control) {
+		com->ControlString = gf_strdup(stream->control);
+		com->user_data = stream;
+	}
+
+	rtpin_rtsp_queue_command(sess, stream, com, GF_TRUE);
+}
+
+#endif /*GPAC_DISABLE_STREAMING*/

gpac-1.0.0.tar.gz/src/filters/in_rtp_stream.c Added

@@ -0,0 +1,766 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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 "in_rtp.h"
+
+
+#ifndef GPAC_DISABLE_STREAMING
+
+void rtpin_stream_ack_connect(GF_RTPInStream *stream, GF_Err e)
+{
+	/*in case the channel has been disconnected while SETUP was issued&processed. We also could
+	clean up the command stack*/
+	if (!stream->opid) return;
+
+	if (e != GF_OK || !stream->rtp_ch) return;
+}
+
+GF_Err rtpin_stream_init(GF_RTPInStream *stream, Bool ResetOnly)
+{
+	gf_rtp_depacketizer_reset(stream->depacketizer, !ResetOnly);
+
+	if (!ResetOnly) {
+		GF_Err e;
+		const char *ip_ifce = NULL;
+		if (!stream->rtpin->interleave) {
+			ip_ifce = stream->rtpin->ifce;
+		}
+		if (stream->rtp_ch->rtp)
+			gf_sk_group_unregister(stream->rtpin->sockgroup, stream->rtp_ch->rtp);
+		if (stream->rtp_ch->rtcp)
+			gf_sk_group_unregister(stream->rtpin->sockgroup, stream->rtp_ch->rtcp);
+
+		e = gf_rtp_initialize(stream->rtp_ch, stream->rtpin->block_size, GF_FALSE, 0, stream->rtpin->reorder_len, stream->rtpin->reorder_delay, (char *)ip_ifce);
+		if (e) return e;
+
+		if (stream->rtp_ch->rtp)
+			gf_sk_group_register(stream->rtpin->sockgroup, stream->rtp_ch->rtp);
+		if (stream->rtp_ch->rtcp)
+			gf_sk_group_register(stream->rtpin->sockgroup, stream->rtp_ch->rtcp);
+
+	}
+	//just reset the sockets
+	gf_rtp_reset_buffers(stream->rtp_ch);
+	return GF_OK;
+}
+
+void rtpin_stream_reset_queue(GF_RTPInStream *stream)
+{
+	if (!stream->pck_queue) return;
+	while (gf_list_count(stream->pck_queue)) {
+		GF_FilterPacket *pck = gf_list_pop_back(stream->pck_queue);
+		gf_filter_pck_discard(pck);
+	}
+}
+
+void rtpin_stream_del(GF_RTPInStream *stream)
+{
+	if (stream->rtsp) {
+		if (stream->status == RTP_Running) {
+			rtpin_rtsp_teardown(stream->rtsp, stream);
+			stream->status = RTP_Disconnected;
+		}
+		rtpin_remove_stream(stream->rtpin, stream);
+	} else {
+		rtpin_find_stream(stream->rtpin, stream->opid, 0, NULL, GF_TRUE);
+	}
+
+	if (stream->depacketizer) gf_rtp_depacketizer_del(stream->depacketizer);
+	if (stream->rtp_ch) gf_rtp_del(stream->rtp_ch);
+	if (stream->control) gf_free(stream->control);
+	if (stream->session_id) gf_free(stream->session_id);
+	if (stream->buffer) gf_free(stream->buffer);
+	if (stream->pck_queue) {
+		rtpin_stream_reset_queue(stream);
+		gf_list_del(stream->pck_queue);
+	}
+	gf_free(stream);
+}
+
+static void rtpin_stream_queue_pck(GF_RTPInStream *stream, GF_FilterPacket *pck, u64 cts)
+{
+	//get all packets in queue, dispatch all packets with a cts less than the cts of the packet being queued
+	//if this is teh first packet in the RTP packet
+	//This is only used for MPEG4, and we are sure we only have [AU(n),AU(n+i)..], [AU(n+j), AU(n+k) ...]
+	//with i,j,k >0
+	while (stream->first_in_rtp_pck) {
+		u64 prev_cts;
+		GF_FilterPacket *prev = gf_list_get(stream->pck_queue, 0);
+		if (!prev) break;
+		prev_cts = gf_filter_pck_get_cts(prev);
+		if (prev_cts>cts) break;
+		gf_list_rem(stream->pck_queue, 0);
+		gf_filter_pck_send(prev);
+	}
+	stream->first_in_rtp_pck = GF_FALSE;
+	gf_list_add(stream->pck_queue, pck);
+}
+
+static void rtp_sl_packet_cbk(void *udta, u8 *payload, u32 size, GF_SLHeader *hdr, GF_Err e)
+{
+	u64 cts, dts;
+	s64 diff;
+	GF_FilterPacket *pck;
+	u8 *pck_data;
+	GF_RTPInStream *stream = (GF_RTPInStream *)udta;
+
+
+	if (!stream->rtcp_init) {
+		if (!stream->rtcp_check_start) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] No RTCP packet received yet, synchronization might be wrong for a while\n"));
+			stream->rtcp_check_start = gf_sys_clock();
+		}
+		else if (gf_sys_clock() - stream->rtcp_check_start <= stream->rtpin->rtcp_timeout) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] No RTCP packet received yet, synchronization might be wrong for a while\n"));
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Timeout for RTCP: no SR recevied after %d ms - sync may be broken\n", stream->rtpin->rtcp_timeout));
+			stream->rtcp_init = GF_TRUE;
+		}
+	}
+
+	if (stream->rtpin->first_packet_drop && (hdr->packetSequenceNumber >= stream->rtpin->first_packet_drop) ) {
+		if (! ( (hdr->packetSequenceNumber - stream->rtpin->first_packet_drop) % stream->rtpin->frequency_drop) )
+			return;
+	}
+
+	cts = hdr->compositionTimeStamp;
+	dts = hdr->decodingTimeStamp;
+
+	hdr->seekFlag = 0;
+	hdr->compositionTimeStamp += stream->ts_adjust;
+	if (stream->first_rtp_ts) {
+		assert(hdr->compositionTimeStamp >= stream->first_rtp_ts - 1);
+		hdr->compositionTimeStamp -= stream->first_rtp_ts - 1;
+	}
+
+	if (hdr->decodingTimeStamp) {
+		hdr->decodingTimeStamp += stream->ts_adjust;
+		if (stream->first_rtp_ts) {
+			assert(hdr->decodingTimeStamp >= stream->first_rtp_ts - 1);
+			hdr->decodingTimeStamp -= stream->first_rtp_ts - 1;
+		}
+	}
+
+	pck = gf_filter_pck_new_alloc(stream->opid, size, &pck_data);
+	memcpy(pck_data, payload, size);
+	if (hdr->decodingTimeStampFlag)
+		gf_filter_pck_set_dts(pck, hdr->decodingTimeStamp);
+
+	gf_filter_pck_set_cts(pck, hdr->compositionTimeStamp);
+
+	diff = (s64) hdr->compositionTimeStamp - (s64) stream->prev_cts;
+	if ((stream->rtpin->max_sleep>0) && stream->prev_cts && diff) {
+		if (diff<0) diff = -diff;
+		if (!stream->min_dur_rtp || (diff < stream->min_dur_rtp)) {
+			u64 dur = diff;
+			dur *= 1000;
+			dur /= stream->rtp_ch->TimeScale;
+			stream->min_dur_rtp = (u32) dur;
+			if (dur > stream->rtpin->max_sleep) dur = stream->rtpin->max_sleep;
+			if (!stream->rtpin->min_frame_dur_ms || ( (u32) dur < stream->rtpin->min_frame_dur_ms)) {
+				stream->rtpin->min_frame_dur_ms = (u32) dur;
+			}
+		}
+	}
+	stream->prev_cts = (u32) hdr->compositionTimeStamp;
+
+	gf_filter_pck_set_sap(pck, hdr->randomAccessPointFlag ? GF_FILTER_SAP_1  :GF_FILTER_SAP_NONE);
+	if (hdr->au_duration)
+		gf_filter_pck_set_duration(pck, hdr->au_duration);
+
+	if (hdr->samplerate && (hdr->samplerate != stream->sr)) {
+		stream->sr = hdr->samplerate;
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(stream->sr));
+	}
+	if (hdr->channels && (hdr->channels != stream->nb_ch)) {
+		stream->nb_ch = hdr->channels;
+		gf_filter_pid_set_property(stream->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(stream->nb_ch));
+	}
+	gf_filter_pck_set_framing(pck, hdr->accessUnitStartFlag, hdr->accessUnitEndFlag);
+
+	if (stream->rtp_ch->packet_loss)
+		gf_filter_pck_set_corrupted(pck, 1);
+
+#if 0 //not yet implemented
+	if (hdr->seekFlag)
+		gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+#endif
+
+	if (stream->depacketizer->sl_map.IndexDeltaLength) {
+		rtpin_stream_queue_pck(stream, pck, hdr->compositionTimeStamp);
+	} else {
+		gf_filter_pck_send(pck);
+	}
+
+	hdr->compositionTimeStamp = cts;
+	hdr->decodingTimeStamp = dts;
+}
+
+GF_RTPInStream *rtpin_stream_new_satip(GF_RTPIn *rtp, const char *server_ip)
+{
+	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();
+	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;
+
+	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 (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 (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(GF_RTPIn *rtp, GF_SDPMedia *media, GF_SDPInfo *sdp, GF_RTPInStream *input_stream)
+{
+	GF_RTSPRange *range;
+	GF_RTPInStream *tmp;
+	GF_RTPMap *map;
+	u32 i, ESID, ODID;
+	Bool force_bcast = GF_FALSE;
+	Double Start, End;
+	u16 rvc_predef = 0;
+	char *rvc_config_att = NULL;
+	GF_X_Attribute *att;
+	char *ctrl;
+	GF_SDPConnection *conn;
+	GF_RTSPTransport trans;
+	u32 mid, prev_stream, base_stream;
+
+	//extract all relevant info from the GF_SDPMedia
+	Start = 0.0;
+	End = -1.0;
+	ODID = 0;
+	ESID = 0;
+	ctrl = NULL;
+	range = NULL;
+	mid = prev_stream = base_stream = 0;
+	i=0;
+	while ((att = (GF_X_Attribute*)gf_list_enum(media->Attributes, &i))) {
+		if (!stricmp(att->Name, "control")) ctrl = att->Value;
+		else if (!stricmp(att->Name, "gpac-broadcast")) force_bcast = GF_TRUE;
+		else if (!stricmp(att->Name, "mpeg4-esid") && att->Value) ESID = atoi(att->Value);
+		else if (!stricmp(att->Name, "mpeg4-odid") && att->Value) ODID = atoi(att->Value);
+		else if (!stricmp(att->Name, "range") && !range) range = gf_rtsp_range_parse(att->Value);
+		else if (!stricmp(att->Name, "rvc-config-predef") && att->Value) {
+			rvc_predef = atoi(att->Value);
+		} else if (!stricmp(att->Name, "rvc-config")) {
+			rvc_config_att = att->Value;
+		} else if (!stricmp(att->Name, "mid")) {
+			sscanf(att->Value, "L%d", &mid);
+		} else if (!stricmp(att->Name, "depend")) {
+			char buf[3000];
+			memset(buf, 0, 3000);
+			sscanf(att->Value, "%*d lay L%d %*s %2999s", &base_stream, buf);
+			if (!strlen(buf))
+				sscanf(att->Value, "%*d lay %2999s", buf);
+			sscanf(buf, "L%d", &prev_stream);
+		}
+	}
+
+	if (range) {
+		Start = range->start;
+		End = range->end;
+		gf_rtsp_range_del(range);
+	}
+
+	/*check connection*/
+	conn = sdp->c_connection;
+	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
+
+	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
+	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
+
+	if (!conn) {
+		/*RTSP RFC recommends an empty "c= " line but some server don't send it. Use session info (o=)*/
+		if (!sdp->o_net_type || !sdp->o_add_type || strcmp(sdp->o_net_type, "IN")) return NULL;
+		if (strcmp(sdp->o_add_type, "IP4") && strcmp(sdp->o_add_type, "IP6")) return NULL;
+	} else {
+		if (strcmp(conn->net_type, "IN")) return NULL;
+		if (strcmp(conn->add_type, "IP4") && strcmp(conn->add_type, "IP6")) return NULL;
+	}
+	/*do we support transport*/
+	if (strcmp(media->Profile, "RTP/AVP") && strcmp(media->Profile, "RTP/AVP/TCP")
+	        && strcmp(media->Profile, "RTP/SAVP") && strcmp(media->Profile, "RTP/SAVP/TCP")
+	   ) return NULL;
+
+	/*check RTP map. For now we only support 1 RTPMap*/
+	if (gf_list_count(media->RTPMaps) > 1) return NULL;
+
+	/*check payload type*/
+	map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
+	if (!map) {
+		if (!media->fmt_list) return NULL;
+		if (strchr(media->fmt_list, ' ')) return NULL;
+	}
+
+	/*this is an ESD-URL setup, we likely have namespace conflicts so overwrite given ES_ID
+	by the app one (client side), but keep control (server side) if provided*/
+	if (input_stream) {
+		ESID = input_stream->ES_ID;
+		if (!ctrl) ctrl = input_stream->control;
+		tmp = input_stream;
+	} else {
+		tmp = rtpin_find_stream(rtp, NULL, ESID, NULL, GF_FALSE);
+		if (tmp) return NULL;
+
+		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();
+	if (ctrl) tmp->control = gf_strdup(ctrl);
+	tmp->ES_ID = ESID;
+	tmp->OD_ID = ODID;
+	tmp->mid = mid;
+	tmp->prev_stream = prev_stream;
+	tmp->base_stream = base_stream;
+
+	memset(&trans, 0, sizeof(GF_RTSPTransport));
+	trans.Profile = media->Profile;
+	trans.source = conn ? conn->host : sdp->o_address;
+	trans.IsUnicast = gf_sk_is_multicast_address(trans.source) ? GF_FALSE : GF_TRUE;
+	if (!trans.IsUnicast) {
+		trans.port_first = media->PortNumber;
+		trans.port_last = media->PortNumber + 1;
+		trans.TTL = conn ? conn->TTL : 0;
+	} else {
+		trans.client_port_first = media->PortNumber;
+		trans.client_port_last = media->PortNumber + 1;
+		trans.port_first = trans.client_port_first;
+		trans.port_last = trans.client_port_last;
+	}
+
+	if (gf_rtp_setup_transport(tmp->rtp_ch, &trans, NULL) != GF_OK) {
+		rtpin_stream_del(tmp);
+		return NULL;
+	}
+	/*setup depacketizer*/
+	tmp->depacketizer = gf_rtp_depacketizer_new(media, 0, rtp_sl_packet_cbk, tmp);
+	if (!tmp->depacketizer) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Failed to create RTP depacketizer for payload type %d/%s - ignoring stream)\n", map ? map->PayloadType : 0, media->fmt_list ? media->fmt_list : ""));
+		rtpin_stream_del(tmp);
+		return NULL;
+	}
+	/*setup channel*/
+	gf_rtp_setup_payload(tmp->rtp_ch, map ? map->PayloadType : tmp->depacketizer->payt, tmp->depacketizer->clock_rate);
+
+	if (tmp->depacketizer->sl_map.IndexDeltaLength) {
+		tmp->pck_queue = gf_list_new();
+	}
+
+//	tmp->status = NM_Disconnected;
+
+	if (!rtp->disable_rtcp) tmp->flags |= RTP_ENABLE_RTCP;
+
+	/*setup NAT keep-alive*/
+	if (rtp->nat_keepalive) gf_rtp_enable_nat_keepalive(tmp->rtp_ch, rtp->nat_keepalive);
+
+	tmp->range_start = Start;
+	tmp->range_end = End;
+	if (End != -1.0) tmp->flags |= RTP_HAS_RANGE;
+
+	if (force_bcast) tmp->flags |= RTP_FORCE_BROADCAST;
+
+	if (rvc_predef) {
+		tmp->depacketizer->sl_map.rvc_predef = rvc_predef ;
+	} else if (rvc_config_att) {
+		char *rvc_data=NULL;
+		u32 rvc_size=0;
+		Bool is_gz = GF_FALSE;
+		if (!strncmp(rvc_config_att, "data:application/rvc-config+xml", 32) && strstr(rvc_config_att, "base64") ) {
+			char *data = strchr(rvc_config_att, ',');
+			if (data) {
+				rvc_size = (u32) strlen(data) * 3 / 4 + 1;
+				rvc_data = (char*)gf_malloc(sizeof(char) * rvc_size);
+				rvc_size = gf_base64_decode(data, (u32) strlen(data), rvc_data, rvc_size);
+				rvc_data[rvc_size] = 0;
+			}
+			if (!strncmp(rvc_config_att, "data:application/rvc-config+xml+gz", 35)) is_gz = GF_TRUE;
+		} else if (!strnicmp(rvc_config_att, "http://", 7) || !strnicmp(rvc_config_att, "https://", 8) ) {
+			return NULL;
+		}
+		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_free(rvc_data);
+				return NULL;
+#else
+				gf_gz_decompress_payload(rvc_data, rvc_size, &tmp->depacketizer->sl_map.rvc_config, &tmp->depacketizer->sl_map.rvc_config_size);
+				gf_free(rvc_data);
+#endif
+			} else {
+				tmp->depacketizer->sl_map.rvc_config = rvc_data;
+				tmp->depacketizer->sl_map.rvc_config_size = rvc_size;
+			}
+		}
+	}
+
+	return tmp;
+}
+
+static void rtpin_stream_update_stats(GF_RTPInStream *stream)
+{
+	u32 time;
+	Float bps;
+	if (!stream->rtp_ch) return;
+
+	gf_filter_pid_set_info_str(stream->opid, "nets:loss", &PROP_FLOAT( gf_rtp_get_loss(stream->rtp_ch) ) );
+	if (stream->rtsp && (stream->flags & RTP_INTERLEAVED)) {
+		gf_filter_pid_set_info_str(stream->opid, "nets:interleaved", &PROP_UINT( gf_rtsp_get_session_port(stream->rtsp->session) ) );
+		gf_filter_pid_set_info_str(stream->opid, "nets:rtpid", &PROP_UINT( gf_rtp_get_low_interleave_id(stream->rtp_ch) ) );
+		gf_filter_pid_set_info_str(stream->opid, "nets:rctpid", &PROP_UINT( gf_rtp_get_hight_interleave_id(stream->rtp_ch) ) );
+
+	} else {
+		gf_filter_pid_set_info_str(stream->opid, "nets:rtpp", &PROP_UINT( stream->rtp_ch->net_info.client_port_first ) );
+		gf_filter_pid_set_info_str(stream->opid, "nets:rtcpp", &PROP_UINT( stream->rtp_ch->net_info.client_port_last ) );
+	}
+	if (stream->stat_stop_time) {
+		time = stream->stat_stop_time - stream->stat_start_time;
+	} else {
+		time = gf_sys_clock() - stream->stat_start_time;
+	}
+	if (!time) return;
+
+	bps = 8.0f * stream->rtp_bytes;
+	bps *= 1000;
+	bps /= time;
+	gf_filter_pid_set_info_str(stream->opid, "nets:bw_down", &PROP_UINT( (u32) bps ) );
+
+	bps = 8.0f * stream->rtcp_bytes;
+	bps *= 1000;
+	bps /= time;
+	gf_filter_pid_set_info_str(stream->opid, "nets:ctrl_bw_down", &PROP_UINT( (u32) bps ) );
+
+	bps = 8.0f * gf_rtp_get_tcp_bytes_sent(stream->rtp_ch);
+	bps *= 1000;
+	bps /= time;
+	gf_filter_pid_set_info_str(stream->opid, "nets:ctrl_bw_up", &PROP_UINT( (u32) bps ) );
+}
+
+
+void rtpin_stream_on_rtp_pck(GF_RTPInStream *stream, char *pck, u32 size)
+{
+	GF_Err e;
+	GF_RTPHeader hdr;
+	u32 PayloadStart;
+	stream->rtp_bytes += size;
+	stream->first_in_rtp_pck = GF_TRUE;
+
+	/*first decode RTP*/
+	e = gf_rtp_decode_rtp(stream->rtp_ch, pck, size, &hdr, &PayloadStart);
+
+	/*corrupted or NULL data*/
+	if (e || (PayloadStart >= size)) {
+		//gf_service_send_packet(stream->rtpin->service, stream->opid, NULL, 0, NULL, GF_CORRUPTED_DATA);
+		return;
+	}
+	if (!stream->opid && !stream->depacketizer) {
+		stream->depacketizer = gf_rtp_depacketizer_new(NULL, hdr.PayloadType, rtp_sl_packet_cbk, stream);
+		if (!stream->depacketizer) {
+			return;
+		}
+		stream->rtp_ch->PayloadType = hdr.PayloadType;
+		stream->rtp_ch->TimeScale = stream->depacketizer->clock_rate;
+		rtpin_declare_pid(stream, GF_FALSE, 0, NULL);
+	}
+	if (!stream->depacketizer) {
+		return;
+	}
+
+	/*first we only work with one payload type...*/
+	if (hdr.PayloadType != stream->rtp_ch->PayloadType) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Mismatched in packet payload type %d vs channel payload type %d, only one payload type per channel is currently supported\n", hdr.PayloadType, stream->rtp_ch->PayloadType));
+	}
+
+	//pure RTP, remap all streams to 0, adjust sync later
+	if (!stream->rtsp) {
+		if (!stream->first_rtp_ts || (hdr.TimeStamp < stream->first_rtp_ts-1) )
+			stream->first_rtp_ts = 1 + hdr.TimeStamp;
+	}
+
+	/*if we must notify some timing, do it now. */
+	if (stream->check_rtp_time) {
+		Double ch_time;
+
+		/*it may happen that we still receive packets from a previous "play" request. If this is the case,
+		filter until we reach the indicated rtptime*/
+		if (stream->rtp_ch->rtp_time
+		        && (stream->rtp_ch->rtp_first_SN > hdr.SequenceNumber)
+		        && (stream->rtp_ch->rtp_time > hdr.TimeStamp)
+		   ) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Rejecting too early packet (TS %d vs signaled rtp time %d - diff %d ms)\n",
+			                                    hdr.TimeStamp, stream->rtp_ch->rtp_time, ((hdr.TimeStamp - stream->rtp_ch->rtp_time)*1000) / stream->rtp_ch->TimeScale));
+			return;
+		}
+
+		ch_time = gf_rtp_get_current_time(stream->rtp_ch);
+
+		/*this is the first packet on the channel (no PAUSE)*/
+		if (stream->check_rtp_time == RTP_SET_TIME_RTP) {
+			Double media_time = 0;
+			if (stream->rtsp) {
+				media_time = stream->current_start + ch_time;
+			}
+			gf_filter_pid_set_property_str(stream->opid, "time:timestamp", &PROP_LONGUINT(hdr.TimeStamp) );
+			gf_filter_pid_set_property_str(stream->opid, "time:media", &PROP_DOUBLE(media_time) );
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Mapping RTP Time seq %d TS %d Media Time %g - rtp info seq %d TS %d\n",
+			                                 hdr.SequenceNumber, hdr.TimeStamp, stream->current_start + ch_time, stream->rtp_ch->rtp_first_SN, stream->rtp_ch->rtp_time
+			                                ));
+
+			/*skip RTCP clock init when RTSP is used*/
+			if (stream->rtsp) stream->rtcp_init = GF_TRUE;
+
+			if (stream->depacketizer->payt==GF_RTP_PAYT_H264_AVC) stream->depacketizer->flags |= GF_RTP_AVC_WAIT_RAP;
+		}
+		/*this is RESUME on channel, filter packet based on time (darwin seems to send
+		couple of packet before)
+		do not fetch if we're below 10 ms or <0, because this means we already have
+		this packet - as the PAUSE is issued with the RTP currentTime*/
+		else if (ch_time <= 0.021) {
+			return;
+		}
+		stream->check_rtp_time = RTP_SET_TIME_NONE;
+	}
+
+	gf_rtp_depacketizer_process(stream->depacketizer, &hdr, pck + PayloadStart, size - PayloadStart);
+
+	/*last check: signal EOS if we're close to end range in case the server do not send RTCP BYE*/
+	if ((stream->flags & RTP_HAS_RANGE) && !(stream->flags & RTP_EOS) ) {
+		/*also check last CTS*/
+		Double ts = (Double) ((u32) stream->depacketizer->sl_hdr.compositionTimeStamp - hdr.TimeStamp);
+		ts /= gf_rtp_get_clockrate(stream->rtp_ch);
+		if (ABSDIFF(stream->range_end, (ts + stream->current_start + gf_rtp_get_current_time(stream->rtp_ch)) ) < 0.2) {
+			stream->flags |= RTP_EOS;
+			stream->stat_stop_time = gf_sys_clock();
+			gf_filter_pid_set_eos(stream->opid);
+		}
+	}
+
+	if (stream->rtpin->stats) {
+		u32 now = gf_sys_clock();
+		if (stream->last_stats_time + stream->rtpin->stats < now) {
+			stream->last_stats_time = now;
+			rtpin_stream_update_stats(stream);
+		}
+	}
+}
+
+static void rtpin_adjust_sync(GF_RTPIn *ctx)
+{
+	u32 i, count = gf_list_count(ctx->streams);
+	u64 max_ntp_us = 0;
+
+	for (i=0; i<count; i++) {
+		GF_RTPInStream *stream = gf_list_get(ctx->streams, i);
+		if (!stream->rtcp_init) return;
+
+		if (max_ntp_us < stream->init_ntp_us) {
+			max_ntp_us = stream->init_ntp_us;
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		s64 ntp_diff_us;
+		GF_RTPInStream *stream = gf_list_get(ctx->streams, i);
+
+		ntp_diff_us = max_ntp_us;
+		ntp_diff_us -= stream->init_ntp_us;
+		ntp_diff_us *= stream->rtp_ch->TimeScale;
+		ntp_diff_us /= 1000000;
+		stream->ts_adjust = ntp_diff_us;
+	}
+}
+
+static void rtpin_stream_on_rtcp_pck(GF_RTPInStream *stream, char *pck, u32 size)
+{
+	Bool has_sr;
+	GF_Err e;
+
+	if (stream->status == RTP_Connected) return;
+	//not configured yes
+	if (!stream->rtp_ch->TimeScale) return;
+	stream->rtcp_bytes += size;
+
+	e = gf_rtp_decode_rtcp(stream->rtp_ch, pck, size, &has_sr);
+	if (e<0) return;
+
+	/*update sync if on pure RTP*/
+	if (!stream->rtcp_init && has_sr) {
+		u64 ntp_clock_us, rtp_diff_us;
+
+		ntp_clock_us = stream->rtp_ch->last_SR_NTP_frac;
+		ntp_clock_us *= 1000000;
+		ntp_clock_us /= 0xFFFFFFFF;
+		ntp_clock_us += 1000000 * (u64) stream->rtp_ch->last_SR_NTP_sec;
+
+		//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;
+
+		stream->init_ntp_us = ntp_clock_us - rtp_diff_us;
+
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTCP] At %d Using Sender Report to map RTP TS %d to NTP clock "LLU" us - NTP origin "LLU"\n", gf_sys_clock(), stream->rtp_ch->last_SR_rtp_time, ntp_clock_us, stream->init_ntp_us));
+
+		stream->rtcp_init = GF_TRUE;
+
+		if (stream->rtpin->rtcpsync)
+			rtpin_adjust_sync(stream->rtpin);
+	}
+
+	if (e == GF_EOS) {
+		stream->flags |= RTP_EOS;
+	}
+}
+
+GF_Err rtpin_rtsp_data_cbk(GF_RTSPSession *sess, void *cbk, u8 *buffer, u32 bufferSize, Bool IsRTCP)
+{
+	GF_RTPInStream *stream = (GF_RTPInStream *) cbk;
+	if (!stream || stream->rtpin->done) return GF_OK;
+	if (IsRTCP) {
+		rtpin_stream_on_rtcp_pck(stream, buffer, bufferSize);
+	} else {
+		rtpin_stream_on_rtp_pck(stream, buffer, bufferSize);
+	}
+	return GF_OK;
+}
+
+
+
+u32 rtpin_stream_read(GF_RTPInStream *stream)
+{
+	u32 size, tot_size = 0;
+
+	if (!stream->rtp_ch) return 0;
+	if (gf_sk_group_sock_is_set(stream->rtpin->sockgroup, stream->rtp_ch->rtcp, GF_SK_SELECT_READ)) {
+		size = gf_rtp_read_rtcp(stream->rtp_ch, stream->buffer, stream->rtpin->block_size);
+		if (size) {
+			tot_size += size;
+			rtpin_stream_on_rtcp_pck(stream, stream->buffer, size);
+		}
+	}
+
+	if (gf_sk_group_sock_is_set(stream->rtpin->sockgroup, stream->rtp_ch->rtp, GF_SK_SELECT_READ)) {
+		size = gf_rtp_read_rtp(stream->rtp_ch, stream->buffer, stream->rtpin->block_size);
+		if (size) {
+			tot_size += size;
+			stream->rtpin->udp_timeout = 0;
+			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);
+
+	/*detect timeout*/
+	if (stream->rtpin->udp_timeout) {
+		if (!stream->last_udp_time) {
+			stream->last_udp_time = gf_sys_clock();
+		} 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)
+					stream->rtpin->retry_tcp = GF_TRUE;
+			}
+		}
+	}
+	return tot_size;
+}
+
+#endif /*GPAC_DISABLE_STREAMING*/

gpac-1.0.0.tar.gz/src/filters/in_sock.c Added

@@ -0,0 +1,541 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic TCP/UDP 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/constants.h>
+#include <gpac/network.h>
+
+#ifndef GPAC_DISABLE_STREAMING
+#include <gpac/internal/ietf_dev.h>
+#endif
+
+typedef struct
+{
+	GF_FilterPid *pid;
+	GF_Socket *socket;
+	Bool pck_out;
+#ifndef GPAC_DISABLE_STREAMING
+	GF_RTPReorder *rtp_reorder;
+#else
+	Bool is_rtp;
+#endif
+	char address[GF_MAX_IP_NAME_LEN];
+
+	u64 start_time;
+	u64 nb_bytes;
+	Bool done;
+
+} GF_SockInClient;
+
+typedef struct
+{
+	//options
+	const char *src;
+	u32 block_size, sockbuf;
+	u32 port, maxc;
+	char *ifce;
+	const char *ext;
+	const char *mime;
+	Bool tsprobe, listen, ka, block;
+	u32 timeout;
+#ifndef GPAC_DISABLE_STREAMING
+	u32 reorder_pck;
+	u32 reorder_delay;
+#endif
+
+	GF_SockInClient sock_c;
+	GF_List *clients;
+	Bool had_clients;
+	Bool is_udp;
+
+	char *buffer;
+
+	GF_SockGroup *active_sockets;
+	u64 last_rcv_time;
+} GF_SockInCtx;
+
+
+
+static GF_Err sockin_initialize(GF_Filter *filter)
+{
+	char *str, *url;
+	u16 port;
+	u32 sock_type = 0;
+	GF_Err e = GF_OK;
+	GF_SockInCtx *ctx = (GF_SockInCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->src) return GF_BAD_PARAM;
+
+	ctx->active_sockets = gf_sk_group_new();
+	if (!ctx->active_sockets) return GF_OUT_OF_MEM;
+
+	if (!strnicmp(ctx->src, "udp://", 6)) {
+		sock_type = GF_SOCK_TYPE_UDP;
+		ctx->listen = GF_FALSE;
+		ctx->is_udp = GF_TRUE;
+	} else if (!strnicmp(ctx->src, "tcp://", 6)) {
+		sock_type = GF_SOCK_TYPE_TCP;
+#ifdef GPAC_HAS_SOCK_UN
+	} else if (!strnicmp(ctx->src, "tcpu://", 7) ) {
+		sock_type = GF_SOCK_TYPE_TCP_UN;
+	} else if (!strnicmp(ctx->src, "udpu://", 7) ) {
+		sock_type = GF_SOCK_TYPE_UDP_UN;
+		ctx->listen = GF_FALSE;
+#endif
+	} else {
+		return GF_NOT_SUPPORTED;
+	}
+
+	url = strchr(ctx->src, ':');
+	url += 3;
+
+	ctx->sock_c.socket = gf_sk_new(sock_type);
+	if (! ctx->sock_c.socket ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockIn] Failed to open socket for %s\n", ctx->src));
+		return GF_IO_ERR;
+	}
+	gf_sk_group_register(ctx->active_sockets, ctx->sock_c.socket);
+
+	/*setup port and src*/
+	port = ctx->port;
+	str = strrchr(url, ':');
+	/*take care of IPv6 address*/
+	if (str && strchr(str, ']')) str = strchr(url, ':');
+	if (str) {
+		port = atoi(str+1);
+		str[0] = 0;
+	}
+
+	/*do we have a source ?*/
+	if (gf_sk_is_multicast_address(url)) {
+		e = gf_sk_setup_multicast(ctx->sock_c.socket, url, port, 0, 0, ctx->ifce);
+		ctx->listen = GF_FALSE;
+	} else if ((sock_type==GF_SOCK_TYPE_UDP) 
+#ifdef GPAC_HAS_SOCK_UN 
+		|| (sock_type==GF_SOCK_TYPE_UDP_UN)
+#endif
+		) {
+		e = gf_sk_bind(ctx->sock_c.socket, ctx->ifce, port, url, port, GF_SOCK_REUSE_PORT);
+		ctx->listen = GF_FALSE;
+		if (!e)
+			e = gf_sk_connect(ctx->sock_c.socket, url, port, NULL);
+	} else if (ctx->listen) {
+		e = gf_sk_bind(ctx->sock_c.socket, NULL, port, url, 0, GF_SOCK_REUSE_PORT);
+		if (!e)
+			e = gf_sk_listen(ctx->sock_c.socket, ctx->maxc);
+		if (!e) {
+			gf_filter_post_process_task(filter);
+			gf_sk_server_mode(ctx->sock_c.socket, GF_TRUE);
+		}
+
+	} else {
+		e = gf_sk_connect(ctx->sock_c.socket, url, port, ctx->ifce);
+	}
+
+	if (str) str[0] = ':';
+
+	if (e) {
+		gf_sk_del(ctx->sock_c.socket);
+		ctx->sock_c.socket = NULL;
+		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;
+	ctx->buffer = gf_malloc(ctx->block_size + 1);
+	if (!ctx->buffer) return GF_OUT_OF_MEM;
+	//ext/mime given and not mpeg2, disable probe
+	if (ctx->ext && !strstr("ts|m2t|mts|dmb|trp", ctx->ext)) ctx->tsprobe = GF_FALSE;
+	if (ctx->mime && !strstr(ctx->mime, "mpeg-2") && !strstr(ctx->mime, "mp2t")) ctx->tsprobe = GF_FALSE;
+
+	if (ctx->listen) {
+		ctx->clients = gf_list_new();
+		if (!ctx->clients) return GF_OUT_OF_MEM;
+	}
+	return GF_OK;
+}
+
+static void sockin_client_reset(GF_SockInClient *sc)
+{
+	if (sc->socket) gf_sk_del(sc->socket);
+#ifndef GPAC_DISABLE_STREAMING
+	if (sc->rtp_reorder) gf_rtp_reorderer_del(sc->rtp_reorder);
+#endif
+}
+
+static void sockin_finalize(GF_Filter *filter)
+{
+	GF_SockInCtx *ctx = (GF_SockInCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->clients) {
+		while (gf_list_count(ctx->clients)) {
+			GF_SockInClient *sc = gf_list_pop_back(ctx->clients);
+			sockin_client_reset(sc);
+			gf_free(sc);
+		}
+		gf_list_del(ctx->clients);
+	}
+	sockin_client_reset(&ctx->sock_c);
+	if (ctx->buffer) gf_free(ctx->buffer);
+	if (ctx->active_sockets) gf_sk_group_del(ctx->active_sockets);
+}
+
+static GF_FilterProbeScore sockin_probe_url(const char *url, const char *mime_type)
+{
+	if (!strnicmp(url, "udp://", 6)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "tcp://", 6)) return GF_FPROBE_SUPPORTED;
+#ifdef GPAC_HAS_SOCK_UN
+	if (!strnicmp(url, "udpu://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "tcpu://", 7)) return GF_FPROBE_SUPPORTED;
+#endif
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static void sockin_rtp_destructor(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	u32 size;
+	char *data;
+	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);
+}
+
+static Bool sockin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if (!evt->base.on_pid) return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		return GF_TRUE;
+	case GF_FEVT_STOP:
+		return GF_TRUE;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+static GF_Err sockin_read_client(GF_Filter *filter, GF_SockInCtx *ctx, GF_SockInClient *sock_c)
+{
+	u32 nb_read;
+	u64 bitrate;
+	GF_Err e;
+	GF_FilterPacket *dst_pck;
+	u8 *out_data, *in_data;
+
+	if (!sock_c->socket)
+		return GF_EOS;
+	if (sock_c->pck_out)
+		return GF_OK;
+
+	if (sock_c->pid && 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);
+		}
+		return GF_EOS;
+	default:
+		return e;
+	}
+	if (!nb_read) return GF_OK;
+	sock_c->nb_bytes += nb_read;
+	sock_c->done = GF_FALSE;
+
+	//we allocated one more byte for that
+	ctx->buffer[nb_read] = 0;
+
+	//first run, probe data
+	if (!sock_c->pid) {
+		const char *mime = ctx->mime;
+		//probe MPEG-2
+		if (ctx->tsprobe) {
+			/*TS over RTP signaled as udp */
+			if ((ctx->buffer[0] != 0x47) && ((ctx->buffer[1] & 0x7F) == 33) ) {
+#ifndef GPAC_DISABLE_STREAMING
+				sock_c->rtp_reorder = gf_rtp_reorderer_new(ctx->reorder_pck, ctx->reorder_delay);
+#else
+			ctx-	>is_rtp = GF_TRUE;
+#endif
+				mime = "video/mp2t";
+			} else if (ctx->buffer[0] == 0x47) {
+				mime = "video/mp2t";
+			}
+		}
+
+		e = gf_filter_pid_raw_new(filter, ctx->src, NULL, mime, ctx->ext, ctx->buffer, nb_read, GF_TRUE, &sock_c->pid);
+		if (e) return e;
+
+//		if (ctx->is_udp) gf_filter_pid_set_property(sock_c->pid, GF_PROP_PID_UDP, &PROP_BOOL(GF_TRUE) );
+
+		gf_filter_pid_set_udta(sock_c->pid, sock_c);
+
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			GF_FilterEvent evt;
+			memset(&evt, 0, sizeof(GF_FilterEvent));
+			evt.base.type = GF_FEVT_PLAY;
+			evt.base.on_pid = sock_c->pid;
+			sockin_process_event(filter, &evt);
+		}
+#endif
+
+	}
+
+	in_data = ctx->buffer;
+
+#ifndef GPAC_DISABLE_STREAMING
+	if (sock_c->rtp_reorder) {
+		char *pck;
+		u16 seq_num = ((ctx->buffer[2] << 8) & 0xFF00) | (ctx->buffer[3] & 0xFF);
+		gf_rtp_reorderer_add(sock_c->rtp_reorder, (void *) ctx->buffer, nb_read, seq_num);
+
+		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);
+		}
+		return GF_OK;
+	}
+#else
+	if (sock_c->is_rtp) {
+		in_data = ctx->buffer + 12;
+		nb_read -= 12;
+	}
+#endif
+
+	dst_pck = gf_filter_pck_new_alloc(sock_c->pid, nb_read, &out_data);
+	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)));
+	}
+
+	return GF_OK;
+}
+
+static Bool sockin_check_eos(GF_SockInCtx *ctx)
+{
+	u64 now = gf_sys_clock_high_res();
+	if (!ctx->last_rcv_time) {
+		ctx->last_rcv_time = now;
+		return GF_FALSE;
+	}
+	if (now - ctx->last_rcv_time < ctx->timeout*1000) {
+		return GF_FALSE;
+	}
+	if (ctx->sock_c.pid && !ctx->sock_c.done) {
+		gf_filter_pid_set_eos(ctx->sock_c.pid);
+		ctx->sock_c.done = GF_TRUE;
+	}
+	return GF_TRUE;
+}
+
+static GF_Err sockin_process(GF_Filter *filter)
+{
+	GF_Socket *new_conn=NULL;
+	GF_Err e;
+	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);
+	if (e==GF_IP_NETWORK_EMPTY) {
+		if (ctx->is_udp) {
+			if (sockin_check_eos(ctx) )
+				return GF_EOS;
+		} else if (!gf_list_count(ctx->clients)) {
+			gf_filter_ask_rt_reschedule(filter, 1000);
+			return GF_OK;
+		}
+
+		gf_filter_ask_rt_reschedule(filter, 1000);
+		return GF_OK;
+	}
+	else if (e) return e;
+
+	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);
+		}
+
+		if (gf_sk_group_sock_is_set(ctx->active_sockets, ctx->sock_c.socket, GF_SK_SELECT_READ)) {
+			e = gf_sk_accept(ctx->sock_c.socket, &new_conn);
+			if ((e==GF_OK) && new_conn) {
+				GF_SockInClient *sc;
+				GF_SAFEALLOC(sc, GF_SockInClient);
+				if (!sc) return GF_OUT_OF_MEM;
+				
+				sc->socket = new_conn;
+				strcpy(sc->address, "unknown");
+				gf_sk_get_remote_address(new_conn, sc->address);
+				gf_sk_set_block_mode(new_conn, !ctx->block);
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SockIn] Accepting new connection from %s\n", sc->address));
+				gf_list_add(ctx->clients, sc);
+				ctx->had_clients = GF_TRUE;
+				gf_sk_group_register(ctx->active_sockets, sc->socket);
+			}
+		}
+	}
+	if (!ctx->listen) return GF_OK;
+
+	count = gf_list_count(ctx->clients);
+	for (i=0; i<count; i++) {
+		GF_SockInClient *sc = gf_list_get(ctx->clients, i);
+
+		if (!gf_sk_group_sock_is_set(ctx->active_sockets, sc->socket, GF_SK_SELECT_READ)) continue;
+
+	 	e = sockin_read_client(filter, ctx, sc);
+	 	if (e == GF_IP_CONNECTION_CLOSED) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SockIn] Connection to %s lost, removing input\n", sc->address));
+			if (sc->socket)
+				gf_sk_group_unregister(ctx->active_sockets, sc->socket);
+
+	 		sockin_client_reset(sc);
+	 		if (sc->pid) {
+	 			gf_filter_pid_set_eos(sc->pid);
+	 			gf_filter_pid_remove(sc->pid);
+	 		}
+	 		gf_free(sc);
+	 		gf_list_del_item(ctx->clients, sc);
+	 		i--;
+	 		count--;
+		} else {
+			if (e) return e;
+		}
+	}
+	if (!ctx->had_clients) {
+		//we should use socket groups and selects !
+		gf_filter_ask_rt_reschedule(filter, 100000);
+		return GF_OK;
+	}
+
+	if (!count) {
+		if (ctx->ka) {
+			//keep alive, ask for real-time reschedule of 100 ms - we should use socket groups and selects !
+			gf_filter_ask_rt_reschedule(filter, 100000);
+		} else {
+			return GF_EOS;
+		}
+	}
+	return GF_OK;
+}
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_SockInCtx, _n)
+
+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(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},
+	{ OFFS(ka), "keep socket alive if no more connections", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(maxc), "max number of concurrent connections", GF_PROP_UINT, "+I", NULL, 0},
+	{ OFFS(tsprobe), "probe for MPEG-2 TS data, either RTP or raw UDP. Disabled if mime or ext are given and do not match MPEG-2 TS mimes/extensions", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ 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},
+
+#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},
+	{ OFFS(reorder_delay), "number of ms delay for RTP reordering (M2TS over RTP)", GF_PROP_UINT, "10", NULL, GF_FS_ARG_HINT_ADVANCED},
+#endif
+	{0}
+};
+
+static const GF_FilterCapability SockInCaps[] =
+{
+	CAP_UINT(GF_CAPS_OUTPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+GF_FilterRegister SockInRegister = {
+	.name = "sockin",
+	GF_FS_SET_DESCRIPTION("UDP/TCP input")
+#ifndef GPAC_DISABLE_DOC
+	.help = "This filter handles generic TCP and UDP input sockets. It can also probe for MPEG-2 TS over RTP input. Probing of MPEG-2 TS over UDP/RTP is enabled by default but can be turned off.\n"
+		"\nData format can be specified by setting either [-ext]() or [-mime]() options. If not set, the format will be guessed by probing the first data packet\n"
+		"\n"
+		"- UDP sockets are used for source URLs formatted as `udp://NAME`\n"
+		"- TCP sockets are used for source URLs formatted as `tcp://NAME`\n"
+#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"
+#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"
+#endif
+	""
+#else
+	"Your platform does not supports unix domain sockets, udpu:// and tcpu:// schemes not supported."
+#endif
+	,
+#endif //GPAC_DISABLE_DOC
+	.private_size = sizeof(GF_SockInCtx),
+	.args = SockInArgs,
+	SETCAPS(SockInCaps),
+	.initialize = sockin_initialize,
+	.finalize = sockin_finalize,
+	.process = sockin_process,
+	.process_event = sockin_process_event,
+	.probe_url = sockin_probe_url
+};
+
+
+const GF_FilterRegister *sockin_register(GF_FilterSession *session)
+{
+	return &SockInRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/inspect.c Added

@@ -0,0 +1,2451 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / inspection 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/list.h>
+#include <gpac/xml.h>
+#include <gpac/internal/media_dev.h>
+
+typedef struct
+{
+	GF_FilterPid *src_pid;
+	FILE *tmp;
+	u64 pck_num;
+	u32 idx;
+	u8 dump_pid; //0: no, 1: configure/reconfig, 2: info update
+	u8 init_pid_config_done;
+	u64 pck_for_config;
+	u64 prev_dts, prev_cts, init_ts;
+	u32 codec_id;
+	u32 stream_type;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	HEVCState *hevc_state;
+	AVCState *avc_state;
+	AV1State *av1_state;
+	GF_M4VParser *mv124_state;
+	GF_M4VDecSpecInfo dsi;
+#endif
+
+	Bool has_svcc;
+	u32 nalu_size_length;
+	Bool is_adobe_protected;
+	Bool is_cenc_protected;
+
+	GF_Fraction tmcd_rate;
+	u32 tmcd_flags;
+	u32 tmcd_fpt;
+} PidCtx;
+
+enum
+{
+	INSPECT_MODE_PCK=0,
+	INSPECT_MODE_BLOCK,
+	INSPECT_MODE_REFRAME,
+	INSPECT_MODE_RAW
+};
+
+enum
+{
+	INSPECT_TEST_NO=0,
+	INSPECT_TEST_NOPROP,
+	INSPECT_TEST_NETWORK,
+	INSPECT_TEST_ENCODE,
+	INSPECT_TEST_ENCX,
+};
+
+typedef struct
+{
+	u32 mode;
+	Bool interleave;
+	Bool dump_data;
+	Bool deep;
+	char *log;
+	char *fmt;
+	Bool props, hdr, allp, info, pcr, analyze, xml;
+	Double speed, start;
+	u32 test;
+	GF_Fraction dur;
+	Bool dump_crc, dtype;
+	Bool fftmcd;
+
+	FILE *dump;
+
+	GF_List *src_pids;
+
+	Bool is_prober, probe_done, hdr_done, dump_pck;
+	Bool args_updated;
+} GF_InspectCtx;
+
+#define DUMP_ATT_STR(_name, _val) if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\"%s\"", _name, _val); \
+	} else { \
+		gf_fprintf(dump, " %s %s", _name, _val); \
+	}
+
+#define DUMP_ATT_LLU(_name, _val) if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\""LLU"\"", _name, _val);\
+	} else {\
+		gf_fprintf(dump, " %s "LLU, _name, _val);\
+	}
+
+#define DUMP_ATT_U(_name, _val) if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\"%u\"", _name, _val);\
+	} else {\
+		gf_fprintf(dump, " %s %u", _name, _val);\
+	}
+
+#define DUMP_ATT_D(_name, _val) if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\"%d\"", _name, _val);\
+	} else {\
+		gf_fprintf(dump, " %s %d", _name, _val);\
+	}
+
+#define DUMP_ATT_X(_name, _val)  if (ctx->xml) { \
+		gf_fprintf(dump, " %s=\"0x%08X\"", _name, _val);\
+	} else {\
+		gf_fprintf(dump, " %s 0x%08X", _name, _val);\
+	}
+
+
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static u32 inspect_get_nal_size(char *ptr, u32 nalh_size)
+{
+	u32 nal_size=0;
+	u32 v = nalh_size;
+	while (v) {
+		nal_size |= (u8) *ptr;
+		ptr++;
+		v-=1;
+		if (v) nal_size <<= 8;
+	}
+	return nal_size;
+}
+
+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;
+		while (gf_bs_peek_bits(bs, 8, 0) == 0xFF) {
+			sei_type += 255;
+			gf_bs_read_int(bs, 8);
+		}
+		sei_type += gf_bs_read_int(bs, 8);
+		while (gf_bs_peek_bits(bs, 8, 0) == 0xFF) {
+			sei_size += 255;
+			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++;
+		if (gf_bs_peek_bits(bs, 8, 0) == 0x80) {
+			break;
+		}
+	}
+	gf_fprintf(dump, "\"");
+}
+
+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)
+{
+	s32 res = 0;
+	u8 type, nal_ref_idc;
+	u8 dependency_id, quality_id, temporal_id;
+	u8 track_ref_index;
+	s8 sample_offset;
+	u32 data_offset, data_size;
+	s32 idx;
+	GF_BitStream *bs;
+
+	if (!ptr_size) {
+		gf_fprintf(dump, "error=\"invalid nal size 0\"");
+		return;
+	}
+
+	if (dump_crc) gf_fprintf(dump, "crc=\"%u\" ", gf_crc_32(ptr, ptr_size) );
+
+	if (hevc) {
+#ifndef GPAC_DISABLE_HEVC
+		if (ptr_size==1) {
+			gf_fprintf(dump, "error=\"invalid nal size 1\"");
+			return;
+		}
+		res = gf_media_hevc_parse_nalu(ptr, ptr_size, hevc, &type, &temporal_id, &quality_id);
+
+		gf_fprintf(dump, "code=\"%d\" type=\"", 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;
+
+		case GF_HEVC_NALU_VID_PARAM:
+			gf_fputs("Video Parameter Set", dump);
+			idx = gf_media_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);
+			}
+			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);
+				}
+				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);
+			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:
+		{
+			u32 remain = ptr_size-2;
+			char *s = ptr+2;
+
+			gf_fputs("HEVCExtractor ", dump);
+
+			while (remain) {
+				u32 mode = s[0];
+				remain -= 1;
+				s += 1;
+				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);
+						return;
+					}
+					remain -= len+1;
+					s += len+1;
+					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);
+						return;
+					}
+					track_ref_index = (u8) s[0];
+					sample_offset = (s8) s[1];
+					data_offset = inspect_get_nal_size(&s[2], nalh_size);
+					data_size = inspect_get_nal_size(&s[2+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);
+
+					remain -= 2 + 2*nalh_size;
+					s += 2 + 2*nalh_size;
+				}
+			}
+		}
+			break;
+		default:
+			gf_fprintf(dump, "UNKNOWN (parsing return %d)", res);
+			break;
+		}
+		gf_fputs("\"", dump);
+
+		if ((type == GF_HEVC_NALU_SEI_PREFIX) || (type == GF_HEVC_NALU_SEI_SUFFIX)) {
+			bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+			dump_sei(dump, bs, GF_TRUE);
+			gf_bs_del(bs);
+		}
+
+		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);
+
+			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);
+			}
+		}
+
+		gf_fprintf(dump, " layer_id=\"%d\" temporal_id=\"%d\"", quality_id, temporal_id);
+
+#endif //GPAC_DISABLE_HEVC
+		return;
+	}
+
+	type = ptr[0] & 0x1F;
+	nal_ref_idc = ptr[0] & 0x60;
+	nal_ref_idc>>=5;
+	gf_fprintf(dump, "code=\"%d\" type=\"", type);
+	res = -2;
+	bs = gf_bs_new(ptr, ptr_size, GF_BITSTREAM_READ);
+	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);
+		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);
+		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);
+		gf_fprintf(dump, "\" max_num_ref_frames=\"%d", avc->sps->max_num_ref_frames);
+		gf_fprintf(dump, "\" gaps_in_frame_num_value_allowed_flag=\"%d", avc->sps->gaps_in_frame_num_value_allowed_flag);
+		gf_fprintf(dump, "\" chroma_format_idc=\"%d", avc->sps->chroma_format);
+		gf_fprintf(dump, "\" bit_depth_luma_minus8=\"%d", avc->sps->luma_bit_depth_m8);
+		gf_fprintf(dump, "\" bit_depth_chroma_minus8=\"%d", avc->sps->chroma_bit_depth_m8);
+		gf_fprintf(dump, "\" width=\"%d", avc->sps->width);
+		gf_fprintf(dump, "\" height=\"%d", avc->sps->height);
+		gf_fprintf(dump, "\" crop_top=\"%d", avc->sps->crop.top);
+		gf_fprintf(dump, "\" crop_left=\"%d", avc->sps->crop.left);
+		gf_fprintf(dump, "\" crop_bottom=\"%d", avc->sps->crop.bottom);
+		gf_fprintf(dump, "\" crop_right=\"%d", avc->sps->crop.right);
+		if (avc->sps->vui_parameters_present_flag) {
+			gf_fprintf(dump, "\" vui_video_full_range_flag=\"%d", avc->sps->vui.video_full_range_flag);
+			gf_fprintf(dump, "\" vui_video_signal_type_present_flag=\"%d", avc->sps->vui.video_signal_type_present_flag);
+			gf_fprintf(dump, "\" vui_aspect_ratio_info_present_flag=\"%d", avc->sps->vui.aspect_ratio_info_present_flag);
+			gf_fprintf(dump, "\" vui_aspect_ratio_num=\"%d", avc->sps->vui.par_num);
+			gf_fprintf(dump, "\" vui_aspect_ratio_den=\"%d", avc->sps->vui.par_den);
+			gf_fprintf(dump, "\" vui_overscan_info_present_flag=\"%d", avc->sps->vui.overscan_info_present_flag);
+			gf_fprintf(dump, "\" vui_colour_description_present_flag=\"%d", avc->sps->vui.colour_description_present_flag);
+			gf_fprintf(dump, "\" vui_colour_primaries=\"%d", avc->sps->vui.colour_primaries);
+			gf_fprintf(dump, "\" vui_transfer_characteristics=\"%d", avc->sps->vui.transfer_characteristics);
+			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);
+		gf_fprintf(dump, "\" offset_for_non_ref_pic=\"%d", avc->sps->offset_for_non_ref_pic);
+
+		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);
+		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);
+		gf_fprintf(dump, "\" num_ref_idx_l1_default_active_minus1=\"%d", avc->pps[idx].num_ref_idx_l1_default_active_minus1);
+		gf_fprintf(dump, "\" pic_order_present=\"%d", avc->pps[idx].pic_order_present);
+		gf_fprintf(dump, "\" pic_size_in_map_units_minus1=\"%d", avc->pps[idx].pic_size_in_map_units_minus1);
+		gf_fprintf(dump, "\" redundant_pic_cnt_present=\"%d", avc->pps[idx].redundant_pic_cnt_present);
+		gf_fprintf(dump, "\" slice_group_change_rate_minus1=\"%d", avc->pps[idx].slice_group_change_rate_minus1);
+		gf_fprintf(dump, "\" slice_group_count=\"%d", avc->pps[idx].slice_group_count);
+		gf_fprintf(dump, "\" weighted_pred_flag=\"%d", avc->pps[idx].weighted_pred_flag);
+		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;
+		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);
+		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);
+		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);
+		break;
+	case 31:
+		gf_fputs("SVCExtractor", dump);
+		if (is_encrypted) 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 (res == -1)
+		gf_fprintf(dump, " status=\"error decoding slice\"");
+
+	if (bs) gf_bs_del(bs);
+}
+
+static void av1_dump_tile(FILE *dump, u32 idx, AV1Tile *tile)
+{
+	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)
+{
+#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) );
+	switch (obu_type) {
+	case OBU_SEQUENCE_HEADER:
+		DUMP_OBU_INT(width)
+		DUMP_OBU_INT(height)
+		DUMP_OBU_INT(bit_depth)
+		DUMP_OBU_INT(still_picture)
+		DUMP_OBU_INT(OperatingPointIdc)
+		DUMP_OBU_INT(color_range)
+		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)
+		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 (obu_type==OBU_FRAME_HEADER)
+			break;
+
+	case OBU_TILE_GROUP:
+		if (av1->frame_state.nb_tiles_in_obu) {
+			u32 i;
+			DUMP_OBU_INT2("nb_tiles", av1->frame_state.nb_tiles_in_obu)
+			fprintf(dump, ">\n");
+			for (i = 0; i < av1->frame_state.nb_tiles_in_obu; i++) {
+				av1_dump_tile(dump, i, &av1->frame_state.tiles[i]);
+			}
+		} else {
+			gf_fprintf(dump, "nb_tiles=\"unknown\">\n");
+		}
+		gf_fprintf(dump, "</OBU>\n");
+		break;
+	default:
+		break;
+
+	}
+	if (obu_type != OBU_TILE_GROUP)
+		gf_fprintf(dump, "/>\n");
+}
+
+GF_EXPORT
+void gf_inspect_dump_prores(FILE *dump, u8 *ptr, u64 frame_size, Bool dump_crc)
+{
+	GF_BitStream *bs;
+	GF_ProResFrameInfo prores_frame;
+	GF_Err e;
+
+	bs = gf_bs_new(ptr, frame_size, GF_BITSTREAM_READ);
+	e = gf_media_prores_parse_bs(bs, &prores_frame);
+	gf_bs_del(bs);
+	if (e) {
+		gf_fprintf(dump, "   \n", gf_error_to_string(e) );
+		return;
+	}
+	gf_fprintf(dump, "   <ProResFrame framesize=\"%d\" frameID=\"%s\" version=\"%d\""
+		, prores_frame.frame_size
+		, gf_4cc_to_str(prores_frame.frame_identifier)
+		, prores_frame.version
+	);
+	gf_fprintf(dump, " encoderID=\"%s\" width=\"%d\" height=\"%d\""
+		, gf_4cc_to_str(prores_frame.encoder_id)
+		, prores_frame.width
+		, prores_frame.height
+	);
+	switch (prores_frame.chroma_format) {
+	case 0: gf_fprintf(dump, " chromaFormat=\"reserved(0)\""); break;
+	case 1: gf_fprintf(dump, " chromaFormat=\"reserved(1)\""); break;
+	case 2: gf_fprintf(dump, " chromaFormat=\"4:2:2\""); break;
+	case 3: gf_fprintf(dump, " chromaFormat=\"4:4:4\""); break;
+	}
+	switch (prores_frame.interlaced_mode) {
+	case 0: gf_fprintf(dump, " interlacedMode=\"progressive\""); break;
+	case 1: gf_fprintf(dump, " interlacedMode=\"interlaced_top_first\""); break;
+	case 2: gf_fprintf(dump, " interlacedMode=\"interlaced_bottom_first\""); break;
+	case 3: gf_fprintf(dump, " interlacedMode=\"reserved\""); break;
+	}
+	switch (prores_frame.aspect_ratio_information) {
+	case 0: gf_fprintf(dump, " aspectRatio=\"unknown\""); break;
+	case 1: gf_fprintf(dump, " aspectRatio=\"1:1\""); break;
+	case 2: gf_fprintf(dump, " aspectRatio=\"4:3\""); break;
+	case 3: gf_fprintf(dump, " aspectRatio=\"16:9\""); break;
+	default: gf_fprintf(dump, " aspectRatio=\"reserved(%d)\"", prores_frame.aspect_ratio_information); break;
+	}
+	switch (prores_frame.framerate_code) {
+	case 0: gf_fprintf(dump, " framerate=\"unknown\""); break;
+	case 1: gf_fprintf(dump, " framerate=\"23.976\""); break;
+	case 2: gf_fprintf(dump, " framerate=\"24\""); break;
+	case 3: gf_fprintf(dump, " framerate=\"25\""); break;
+	case 4: gf_fprintf(dump, " framerate=\"29.97\""); break;
+	case 5: gf_fprintf(dump, " framerate=\"30\""); break;
+	case 6: gf_fprintf(dump, " framerate=\"50\""); break;
+	case 7: gf_fprintf(dump, " framerate=\"59.94\""); break;
+	case 8: gf_fprintf(dump, " framerate=\"60\""); break;
+	case 9: gf_fprintf(dump, " framerate=\"100\""); break;
+	case 10: gf_fprintf(dump, " framerate=\"119.88\""); break;
+	case 11: gf_fprintf(dump, " framerate=\"120\""); break;
+	default: gf_fprintf(dump, " framerate=\"reserved(%d)\"", prores_frame.framerate_code); break;
+	}
+	switch (prores_frame.color_primaries) {
+	case 0: case 2: gf_fprintf(dump, " colorPrimaries=\"unknown\""); break;
+	case 1: gf_fprintf(dump, " colorPrimaries=\"BT.709\""); break;
+	case 5: gf_fprintf(dump, " colorPrimaries=\"BT.601-625\""); break;
+	case 6: gf_fprintf(dump, " colorPrimaries=\"BT.601-525\""); break;
+	case 9: gf_fprintf(dump, " colorPrimaries=\"BT.2020\""); break;
+	case 11: gf_fprintf(dump, " colorPrimaries=\"P3\""); break;
+	case 12: gf_fprintf(dump, " colorPrimaries=\"P3-D65\""); break;
+	default: gf_fprintf(dump, " colorPrimaries=\"reserved(%d)\"", prores_frame.color_primaries); break;
+	}
+	switch (prores_frame.matrix_coefficients) {
+	case 0: case 2: gf_fprintf(dump, " matrixCoefficients=\"unknown\""); break;
+	case 1: gf_fprintf(dump, " matrixCoefficients=\"BT.709\""); break;
+	case 6: gf_fprintf(dump, " matrixCoefficients=\"BT.601\""); break;
+	case 9: gf_fprintf(dump, " matrixCoefficients=\"BT.2020\""); break;
+	default: gf_fprintf(dump, " matrixCoefficients=\"reserved(%d)\"", prores_frame.matrix_coefficients); break;
+	}
+	switch (prores_frame.transfer_characteristics) {
+	case 0: gf_fprintf(dump, " transferCharacteristics=\"unknown\""); break;
+	case 1: gf_fprintf(dump, " transferCharacteristics=\"BT-709\""); break;
+	case 16: gf_fprintf(dump, " transferCharacteristics=\"ST-2084\""); break;
+	case 18: gf_fprintf(dump, " transferCharacteristics=\"STD-B67\""); break;
+	case 2:
+	default:
+		gf_fprintf(dump, " transferCharacteristics=\"unspecified\""); break;
+	}
+	switch (prores_frame.alpha_channel_type) {
+	case 0: gf_fprintf(dump, " alphaChannel=\"none\""); break;
+	case 1: gf_fprintf(dump, " alphaChannel=\"8bits\""); break;
+	case 2: gf_fprintf(dump, " alphaChannel=\"16bits\""); break;
+	default: gf_fprintf(dump, " alphaChannel=\"reserved(%d)\"", prores_frame.alpha_channel_type); break;
+	}
+	gf_fprintf(dump, " numPictures=\"%d\"" , prores_frame.transfer_characteristics, prores_frame.nb_pic);
+
+	if (!prores_frame.load_luma_quant_matrix && !prores_frame.load_chroma_quant_matrix) {
+		gf_fprintf(dump, "/>\n");
+	} else {
+		u32 j, k;
+		gf_fprintf(dump, ">\n");
+		if (prores_frame.load_luma_quant_matrix) {
+			gf_fprintf(dump, "    <LumaQuantMatrix coefs=\"");
+			for (j=0; j<8; j++) {
+				for (k=0; k<8; k++) {
+					gf_fprintf(dump, " %02X", prores_frame.luma_quant_matrix[j][k]);
+				}
+			}
+			gf_fprintf(dump, "\">\n");
+		}
+		if (prores_frame.load_chroma_quant_matrix) {
+			gf_fprintf(dump, "    <ChromaQuantMatrix coefs=\"");
+			for (j=0; j<8; j++) {
+				for (k=0; k<8; k++) {
+					gf_fprintf(dump, " %02X", prores_frame.chroma_quant_matrix[j][k]);
+				}
+			}
+			gf_fprintf(dump, "\">\n");
+		}
+		gf_fprintf(dump, "   </ProResFrame>\n");
+	}
+}
+#endif
+
+
+static void finalize_dump(GF_InspectCtx *ctx, u32 streamtype, Bool concat)
+{
+	char szLine[1025];
+	u32 i, count = gf_list_count(ctx->src_pids);
+	for (i=0; i<count; i++) {
+		PidCtx *pctx = gf_list_get(ctx->src_pids, i);
+		//already done
+		if (!pctx->tmp) continue;
+		//not our streamtype
+		if (streamtype && (pctx->stream_type!=streamtype)) continue;
+
+		if (concat) {
+			gf_fseek(pctx->tmp, 0, SEEK_SET);
+			while (!gf_feof(pctx->tmp)) {
+				u32 read = (u32) gf_fread(szLine, 1024, pctx->tmp);
+				gf_fwrite(szLine, read, ctx->dump);
+			}
+		}
+		gf_fclose(pctx->tmp);
+		if (ctx->xml)
+			gf_fprintf(ctx->dump, "</PIDInspect>");
+		pctx->tmp = NULL;
+	}
+}
+
+static void inspect_finalize(GF_Filter *filter)
+{
+	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);
+	}
+
+	while (gf_list_count(ctx->src_pids)) {
+		PidCtx *pctx = gf_list_pop_front(ctx->src_pids);
+
+#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->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
+		gf_free(pctx);
+	}
+	gf_list_del(ctx->src_pids);
+
+	if (ctx->dump) {
+		if (ctx->xml) gf_fprintf(ctx->dump, "</GPACInspect>\n");
+		if ((ctx->dump!=stderr) && (ctx->dump!=stdout)) {
+
+#ifdef GPAC_ENABLE_COVERAGE
+			if (gf_sys_is_cov_mode()) {
+				gf_fflush(ctx->dump);
+				gf_ferror(ctx->dump);
+			}
+#endif
+			gf_fclose(ctx->dump);
+		}
+	}
+
+}
+
+static void inspect_dump_property(GF_InspectCtx *ctx, FILE *dump, u32 p4cc, const char *pname, const GF_PropertyValue *att)
+{
+	char szDump[GF_PROP_DUMP_ARG_SIZE];
+
+	if (!pname) pname = gf_props_4cc_get_name(p4cc);
+
+	if (p4cc==GF_PROP_PID_DOWNLOAD_SESSION)
+		return;
+
+	if (gf_sys_is_test_mode() || ctx->test) {
+		switch (p4cc) {
+		case GF_PROP_PID_FILEPATH:
+		case GF_PROP_PID_URL:
+			return;
+		case GF_PROP_PID_FILE_CACHED:
+		case GF_PROP_PID_DURATION:
+			if (ctx->test==INSPECT_TEST_NETWORK)
+				return;
+			break;
+		case GF_PROP_PID_DECODER_CONFIG:
+		case GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT:
+		case GF_PROP_PID_DOWN_SIZE:
+			if (ctx->test>=INSPECT_TEST_ENCODE)
+				return;
+			break;
+		case GF_PROP_PID_MEDIA_DATA_SIZE:
+		case GF_PROP_PID_BITRATE:
+		case GF_PROP_PID_MAXRATE:
+		case GF_PROP_PID_AVG_FRAME_SIZE:
+		case GF_PROP_PID_MAX_FRAME_SIZE:
+		case GF_PROP_PID_DBSIZE:
+			if (ctx->test==INSPECT_TEST_ENCX)
+				return;
+			break;
+
+		case GF_PROP_PID_ISOM_TREX_TEMPLATE:
+		case GF_PROP_PID_ISOM_STSD_TEMPLATE:
+			//TODO once all OK: remove this test and regenerate all hashes
+			if (gf_sys_is_test_mode())
+				return;
+		default:
+			if (gf_sys_is_test_mode() && (att->type==GF_PROP_POINTER) )
+				return;
+			break;
+		}
+	}
+
+	if (ctx->xml) {
+		if (ctx->dtype)
+			gf_fprintf(dump, " type=\"%s\"", gf_props_get_type_name(att->type) );
+			
+		if (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]='_';
+				i++;
+			}
+
+			if (att->type==GF_PROP_UINT_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:
+						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++) {
+					if (k) gf_fprintf(dump, ", ");
+					gf_xml_dump_string(dump, NULL, (char *) gf_list_get(att->value.string_list, 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_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));
+		}
+	} else {
+		if (ctx->dtype) {
+			gf_fprintf(dump, "\t%s (%s): ", pname ? pname : gf_4cc_to_str(p4cc), gf_props_get_type_name(att->type));
+		} else {
+			gf_fprintf(dump, "\t%s: ", pname ? pname : gf_4cc_to_str(p4cc));
+		}
+
+		if (att->type==GF_PROP_UINT_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:
+					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++) {
+				if (k) gf_fprintf(dump, ", ");
+				gf_fprintf(dump, "%s", (const char *) gf_list_get(att->value.string_list, k));
+			}
+		}else{
+			gf_fprintf(dump, "%s", gf_props_dump(p4cc, att, szDump, ctx->dump_data) );
+		}
+		gf_fprintf(dump, "\n");
+	}
+}
+
+static void inspect_dump_packet_fmt(GF_InspectCtx *ctx, FILE *dump, GF_FilterPacket *pck, PidCtx *pctx, u64 pck_num)
+{
+	char szDump[GF_PROP_DUMP_ARG_SIZE];
+	u32 size=0;
+	const char *data=NULL;
+	char *str = ctx->fmt;
+	assert(str);
+
+	if (pck)
+		data = gf_filter_pck_get_data(pck, &size);
+
+	while (str) {
+		char csep;
+		char *sep, *key;
+		if (!str[0]) break;
+
+		if ((str[0] != '$') && (str[0] != '%') && (str[0] != '@')) {
+			gf_fprintf(dump, "%c", str[0]);
+			str = str+1;
+			continue;
+		}
+		csep = str[0];
+		if (str[1] == csep) {
+			gf_fprintf(dump, "%c", str[0]);
+			str = str+2;
+			continue;
+		}
+		sep = strchr(str+1, csep);
+		if (!sep) {
+			gf_fprintf(dump, "%c", str[0]);
+			str = str+1;
+			continue;
+		}
+		sep[0] = 0;
+		key = str+1;
+
+		if (!pck) {
+			if (!strcmp(key, "lf")) gf_fprintf(dump, "\n" );
+			else if (!strcmp(key, "cr")) gf_fprintf(dump, "\r" );
+			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);
+			sep[0] = csep;
+			str = sep+1;
+			continue;
+		}
+
+		if (!strcmp(key, "pn")) gf_fprintf(dump, LLU, pck_num);
+		else if (!strcmp(key, "dts")) {
+			u64 ts = gf_filter_pck_get_dts(pck);
+			if (ts==GF_FILTER_NO_TS) gf_fprintf(dump, "N/A");
+			else gf_fprintf(dump, LLU, ts );
+		}
+		else if (!strcmp(key, "cts")) {
+			u64 ts = gf_filter_pck_get_cts(pck);
+			if (ts==GF_FILTER_NO_TS) gf_fprintf(dump, "N/A");
+			else gf_fprintf(dump, LLU, ts );
+		}
+		else if (!strcmp(key, "ddts")) {
+			u64 ts = gf_filter_pck_get_dts(pck);
+			if ((ts==GF_FILTER_NO_TS) || (pctx->prev_dts==GF_FILTER_NO_TS)) gf_fprintf(dump, "N/A");
+			else if (pctx->pck_num<=1) gf_fprintf(dump, "N/A");
+			else {
+				s64 diff = ts;
+				diff -= pctx->prev_dts;
+				gf_fprintf(dump, LLD, diff);
+			}
+			pctx->prev_dts = ts;
+		}
+		else if (!strcmp(key, "dcts")) {
+			u64 ts = gf_filter_pck_get_cts(pck);
+			if ((ts==GF_FILTER_NO_TS) || (pctx->prev_cts==GF_FILTER_NO_TS)) gf_fprintf(dump, "N/A");
+			else if (pctx->pck_num<=1) gf_fprintf(dump, "N/A");
+			else {
+				s64 diff = ts;
+				diff -= pctx->prev_cts;
+				gf_fprintf(dump, LLD, diff);
+			}
+			pctx->prev_cts = ts;
+		}
+		else if (!strcmp(key, "ctso")) {
+			u64 dts = gf_filter_pck_get_dts(pck);
+			u64 cts = gf_filter_pck_get_cts(pck);
+			if (dts==GF_FILTER_NO_TS) dts = cts;
+			if (cts==GF_FILTER_NO_TS) gf_fprintf(dump, "N/A");
+			else gf_fprintf(dump, LLD, ((s64)cts) - ((s64)dts) );
+		}
+
+		else if (!strcmp(key, "dur")) gf_fprintf(dump, "%u", gf_filter_pck_get_duration(pck) );
+		else if (!strcmp(key, "frame")) {
+			Bool start, end;
+			gf_filter_pck_get_framing(pck, &start, &end);
+			if (start && end) gf_fprintf(dump, "frame_full");
+			else if (start) gf_fprintf(dump, "frame_start");
+			else if (end) gf_fprintf(dump, "frame_end");
+			else gf_fprintf(dump, "frame_cont");
+		}
+		else if (!strcmp(key, "sap") || !strcmp(key, "rap")) gf_fprintf(dump, "%u", gf_filter_pck_get_sap(pck) );
+		else if (!strcmp(key, "ilace")) gf_fprintf(dump, "%d", gf_filter_pck_get_interlaced(pck) );
+		else if (!strcmp(key, "corr")) gf_fprintf(dump, "%d", gf_filter_pck_get_corrupted(pck) );
+		else if (!strcmp(key, "seek")) gf_fprintf(dump, "%d", gf_filter_pck_get_seek_flag(pck) );
+		else if (!strcmp(key, "bo")) {
+			u64 bo = gf_filter_pck_get_byte_offset(pck);
+			if (bo==GF_FILTER_NO_BO) gf_fprintf(dump, "N/A");
+			else gf_fprintf(dump, LLU, bo);
+		}
+		else if (!strcmp(key, "roll")) gf_fprintf(dump, "%d", gf_filter_pck_get_roll_info(pck) );
+		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, "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, "t")) gf_fprintf(dump, "\t" );
+		else if (!strcmp(key, "data")) {
+			u32 i;
+			for (i=0; i<size; i++) {
+				gf_fprintf(dump, "%02X", (unsigned char) data[i]);
+			}
+		}
+		else if (!strcmp(key, "lp")) {
+			u8 flags = gf_filter_pck_get_dependency_flags(pck);
+			flags >>= 6;
+			gf_fprintf(dump, "%u", flags);
+		}
+		else if (!strcmp(key, "depo")) {
+			u8 flags = gf_filter_pck_get_dependency_flags(pck);
+			flags >>= 4;
+			flags &= 0x3;
+			gf_fprintf(dump, "%u", flags);
+		}
+		else if (!strcmp(key, "depf")) {
+			u8 flags = gf_filter_pck_get_dependency_flags(pck);
+			flags >>= 2;
+			flags &= 0x3;
+			gf_fprintf(dump, "%u", flags);
+		}
+		else if (!strcmp(key, "red")) {
+			u8 flags = gf_filter_pck_get_dependency_flags(pck);
+			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 (!strncmp(key, "pid.", 4)) {
+			const GF_PropertyValue *prop = NULL;
+			u32 prop_4cc=0;
+			const char *pkey = key+4;
+			prop_4cc = gf_props_get_id(pkey);
+			if (!prop_4cc && strlen(pkey)==4) prop_4cc = GF_4CC(pkey[0],pkey[1],pkey[2],pkey[3]);
+
+			if (prop_4cc) {
+				prop = gf_filter_pid_get_property(pctx->src_pid, prop_4cc);
+			}
+			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) );
+			}
+		}
+		else {
+			const GF_PropertyValue *prop = NULL;
+			u32 prop_4cc = gf_props_get_id(key);
+			if (!prop_4cc && strlen(key)==4) prop_4cc = GF_4CC(key[0],key[1],key[2],key[3]);
+
+			if (prop_4cc) {
+				prop = gf_filter_pck_get_property(pck, prop_4cc);
+			}
+			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) );
+			}
+		}
+
+		sep[0] = csep;
+		str = sep+1;
+	}
+}
+
+void gf_m4v_parser_set_inspect(GF_M4VParser *m4v);
+u32 gf_m4v_parser_get_obj_type(GF_M4VParser *m4v);
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void inspect_dump_mpeg124(PidCtx *pctx, char *data, u32 size, FILE *dump)
+{
+	u8 ftype;
+	u32 tinc, o_type;
+	u64 fsize, start;
+	Bool is_coded, is_m4v=(pctx->codec_id==GF_CODECID_MPEG4_PART2) ? GF_TRUE : GF_FALSE;
+	GF_Err e;
+	GF_M4VParser *m4v = gf_m4v_parser_new(data, size, !is_m4v);
+
+	gf_m4v_parser_set_inspect(m4v);
+	while (1) {
+		ftype = 0;
+		is_coded = GF_FALSE;
+		e = gf_m4v_parse_frame(m4v, &pctx->dsi, &ftype, &tinc, &fsize, &start, &is_coded);
+		if (e)
+			break;
+
+		o_type = gf_m4v_parser_get_obj_type(m4v);
+		if (is_m4v) {
+			gf_fprintf(dump, "<MPEG4P2VideoObj type=\"0x%02X\"", o_type);
+			switch (o_type) {
+			/*vosh*/
+			case M4V_VOS_START_CODE:
+				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);
+				if (pctx->dsi.clock_rate)
+					gf_fprintf(dump, " clockRate=\"%d\"", pctx->dsi.clock_rate);
+				if (pctx->dsi.time_increment)
+					gf_fprintf(dump, " timeIncrement=\"%d\"", pctx->dsi.time_increment);
+				if (!pctx->dsi.has_shape)
+					gf_fprintf(dump, " width=\"%d\" height=\"%d\"", pctx->dsi.width, pctx->dsi.height);
+
+				break;
+
+			case M4V_VOP_START_CODE:
+				gf_fprintf(dump, " name=\"VOP\" frameType=\"%d\" timeInc=\"%d\" isCoded=\"%d\"", ftype, tinc, is_coded);
+				break;
+			case M4V_GOV_START_CODE:
+				gf_fprintf(dump, " name=\"GOV\"");
+				break;
+			/*don't interest us*/
+			case M4V_UDTA_START_CODE:
+				gf_fprintf(dump, " name=\"UDTA\"");
+				break;
+
+	 		case M4V_VO_START_CODE:
+				gf_fprintf(dump, " name=\"VO\"");
+				break;
+	 		case M4V_VISOBJ_START_CODE:
+				gf_fprintf(dump, " name=\"VisObj\"");
+				break;
+			default:
+				break;
+			}
+			gf_fprintf(dump, "/>\n");
+		} else {
+			gf_fprintf(dump, "<MPEG12VideoObj type=\"0x%02X\"", o_type);
+			switch (o_type) {
+			case M2V_SEQ_START_CODE:
+				gf_fprintf(dump, " name=\"SeqStart\" width=\"%d\" height=\"%d\" sar=\"%d/%d\" fps=\"%f\"", pctx->dsi.width, pctx->dsi.height, pctx->dsi.par_num, pctx->dsi.par_den, pctx->dsi.fps);
+				break;
+
+			case M2V_EXT_START_CODE:
+				gf_fprintf(dump, " name=\"SeqStartEXT\" width=\"%d\" height=\"%d\" PL=\"%d\"", pctx->dsi.width, pctx->dsi.height, pctx->dsi.VideoPL);
+				break;
+			case M2V_PIC_START_CODE:
+				gf_fprintf(dump, " name=\"PicStart\" frameType=\"%d\" isCoded=\"%d\"", ftype, is_coded);
+				break;
+			case M2V_GOP_START_CODE:
+				gf_fprintf(dump, " name=\"GOPStart\"");
+				break;
+			default:
+				break;
+			}
+			gf_fprintf(dump, "/>\n");
+		}
+	}
+	gf_m4v_parser_del(m4v);
+}
+#endif
+
+static void inspect_dump_tmcd(GF_InspectCtx *ctx, PidCtx *pctx, char *data, u32 size, FILE *dump)
+{
+	u32 h, m, s, f;
+	Bool neg=GF_FALSE;
+	GF_BitStream *bs;
+	if (!pctx->tmcd_rate.den || !pctx->tmcd_rate.num)
+		return;
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+
+	u32 value = gf_bs_read_u32(bs);
+	gf_bs_seek(bs, 0);
+	gf_fprintf(dump, "<TimeCode");
+
+	if (ctx->fftmcd || (pctx->tmcd_flags & 0x00000008)) {
+		u64 nb_secs, nb_frames = value;
+		Bool is_drop = GF_FALSE;
+		if (!ctx->fftmcd && pctx->tmcd_fpt)
+			nb_frames *= pctx->tmcd_fpt;
+
+		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 (is_drop) {
+			u32 drop_frames, frame_base;
+
+			frame_base = 100 * pctx->tmcd_rate.num;
+			frame_base /= pctx->tmcd_rate.den;
+
+			drop_frames = (u32) (nb_frames / frame_base);
+			nb_frames -= 3*drop_frames;
+		}
+
+		nb_secs = nb_frames * pctx->tmcd_rate.den / pctx->tmcd_rate.num;
+
+		gf_fprintf(dump, " counter=\"%d\"", value);
+		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;
+		f = (u32) (nb_frames - nb_secs);
+		if (pctx->tmcd_fpt && (f==pctx->tmcd_fpt)) {
+			f = 0;
+			s++;
+			if (s==60) {
+				s = 0;
+				m++;
+				if (m==60) {
+					m = 0;
+					h++;
+				}
+			}
+		}
+	} else {
+		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);
+	}
+	gf_fprintf(dump, " time=\"%s%02d:%02d:%02d:%02d\"/>\n", neg ? "-" : "", h, m, s, f);
+	gf_bs_del(bs);
+
+
+}
+
+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;
+	u64 ts;
+	u8 dflags = 0;
+	GF_FilterClockType ck_type;
+	GF_FilterFrameInterface *fifce=NULL;
+	Bool start, end;
+	u8 *data;
+
+	if (!ctx->deep && !ctx->fmt) return;
+
+	data = (u8 *) gf_filter_pck_get_data(pck, &size);
+	gf_filter_pck_get_framing(pck, &start, &end);
+
+	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) {
+		gf_fprintf(dump, "<Packet number=\""LLU"\"", pck_num);
+		if (ctx->interleave)
+			gf_fprintf(dump, " PID=\"%d\"", pid_idx);
+	} else {
+		gf_fprintf(dump, "PID %d PCK "LLU" - ", pid_idx, pck_num);
+	}
+	if (ck_type) {
+		ts = gf_filter_pck_get_cts(pck);
+		if (ctx->xml) {
+			if (ts==GF_FILTER_NO_TS) gf_fprintf(dump, " PCR=\"N/A\"");
+			else gf_fprintf(dump, " PCR=\""LLU"\" ", ts );
+			if (ck_type!=GF_FILTER_CLOCK_PCR) gf_fprintf(dump, " discontinuity=\"true\"");
+			gf_fprintf(dump, "/>");
+		} else {
+			if (ts==GF_FILTER_NO_TS) gf_fprintf(dump, " PCR N/A");
+			else gf_fprintf(dump, " PCR%s "LLU"\n", (ck_type==GF_FILTER_CLOCK_PCR) ? "" : " discontinuity", ts );
+		}
+		return;
+	}
+	if (ctx->xml) {
+		if (fifce) gf_fprintf(dump, " framing=\"interface\"");
+		else if (start && end) gf_fprintf(dump, " framing=\"complete\"");
+		else if (start) gf_fprintf(dump, " framing=\"start\"");
+		else if (end) gf_fprintf(dump, " framing=\"end\"");
+		else gf_fprintf(dump, " framing=\"continuation\"");
+	} else {
+		if (fifce) gf_fprintf(dump, "interface");
+		else if (start && end) gf_fprintf(dump, "full frame");
+		else if (start) gf_fprintf(dump, "frame start");
+		else if (end) gf_fprintf(dump, "frame end");
+		else gf_fprintf(dump, "frame continuation");
+	}
+	ts = gf_filter_pck_get_dts(pck);
+	if (ts==GF_FILTER_NO_TS) DUMP_ATT_STR("dts", "N/A")
+	else DUMP_ATT_LLU("dts", ts )
+
+	ts = gf_filter_pck_get_cts(pck);
+	if (ts==GF_FILTER_NO_TS) DUMP_ATT_STR("cts", "N/A")
+	else DUMP_ATT_LLU("cts", ts )
+
+	DUMP_ATT_U("dur", gf_filter_pck_get_duration(pck) )
+	DUMP_ATT_U("sap", gf_filter_pck_get_sap(pck) )
+	DUMP_ATT_D("ilace", gf_filter_pck_get_interlaced(pck) )
+	DUMP_ATT_D("corr", gf_filter_pck_get_corrupted(pck) )
+	DUMP_ATT_D("seek", gf_filter_pck_get_seek_flag(pck) )
+
+	ts = gf_filter_pck_get_byte_offset(pck);
+	if (ts==GF_FILTER_NO_BO) DUMP_ATT_STR("bo", "N/A")
+	else DUMP_ATT_LLU("bo", ts )
+
+	DUMP_ATT_U("roll", gf_filter_pck_get_roll_info(pck) )
+	DUMP_ATT_U("crypt", gf_filter_pck_get_crypt_flags(pck) )
+	DUMP_ATT_U("vers", gf_filter_pck_get_carousel_version(pck) )
+
+	if (!fifce) {
+		DUMP_ATT_U("size", size )
+	}
+	dflags = gf_filter_pck_get_dependency_flags(pck);
+	DUMP_ATT_U("lp", (dflags>>6) & 0x3 )
+	DUMP_ATT_U("depo", (dflags>>4) & 0x3 )
+	DUMP_ATT_U("depf", (dflags>>2) & 0x3 )
+	DUMP_ATT_U("red", (dflags) & 0x3 )
+
+	if (!data) size = 0;
+	if (ctx->dump_data) {
+		u32 i;
+		DUMP_ATT_STR("data", "")
+		for (i=0; i<size; i++) {
+			gf_fprintf(dump, "%02X", (unsigned char) data[i]);
+		}
+		if (ctx->xml) gf_fprintf(dump, "\"");
+	} else if (fifce) {
+		u32 i;
+		char *name = fifce->get_gl_texture ? "Interface_GLTexID" : "Interface_NumPlanes";
+		if (ctx->xml) {
+			gf_fprintf(dump, " %s=\"", name);
+		} else {
+			gf_fprintf(dump, " %s ", name);
+		}
+		for (i=0; i<4; i++) {
+			if (fifce->get_gl_texture) {
+				GF_Matrix mx;
+				gf_mx_init(mx);
+				u32 gl_tex_format, gl_tex_id;
+				if (fifce->get_gl_texture(fifce, i, &gl_tex_format, &gl_tex_id, &mx) != GF_OK)
+					break;
+				if (i) gf_fprintf(dump, ",");
+				gf_fprintf(dump, "%d", gl_tex_id);
+			} else {
+				u32 stride;
+				const u8 *plane;
+				if (fifce->get_plane(fifce, i, &plane, &stride) != GF_OK)
+					break;
+			}
+		}
+		if (!fifce->get_gl_texture) {
+			gf_fprintf(dump, "%d", i);
+		}
+
+		if (ctx->xml) {
+			gf_fprintf(dump, "\"");
+		}
+	} else if (data) {
+		DUMP_ATT_X("CRC32", gf_crc_32(data, size) )
+	}
+	if (ctx->xml) {
+		if (!ctx->props) goto props_done;
+
+	} else {
+		gf_fprintf(dump, "\n");
+	}
+
+	if (!ctx->props) return;
+	while (1) {
+		u32 prop_4cc;
+		const char *prop_name;
+		const GF_PropertyValue * p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
+		if (!p) break;
+		if (idx==0) gf_fprintf(dump, "properties:\n");
+
+		inspect_dump_property(ctx, dump, prop_4cc, prop_name, p);
+	}
+
+
+props_done:
+	if (!ctx->analyze) {
+		if (ctx->xml) {
+			gf_fprintf(dump, "/>\n");
+		}
+		return;
+	}
+	gf_fprintf(dump, ">\n");
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (pctx->hevc_state || pctx->avc_state) {
+		idx=1;
+
+		if (pctx->is_adobe_protected && size) {
+			u8 encrypted_au = data[0];
+			if (encrypted_au) {
+				gf_fprintf(dump, "   \n");
+				gf_fprintf(dump, "</Packet>\n");
+				return;
+			}
+			else {
+				data++;
+				size--;
+			}
+		}
+		while (size) {
+			u32 nal_size = inspect_get_nal_size((char*)data, pctx->nalu_size_length);
+			data += pctx->nalu_size_length;
+
+			if (pctx->nalu_size_length + nal_size > size) {
+				gf_fprintf(dump, "   \n", nal_size, size);
+				break;
+			} else {
+				gf_fprintf(dump, "   <NALU size=\"%d\" ", nal_size);
+				gf_inspect_dump_nalu(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);
+				gf_fprintf(dump, "/>\n");
+			}
+			idx++;
+			data += nal_size;
+			size -= nal_size + pctx->nalu_size_length;
+		}
+	} else if (pctx->av1_state) {
+		GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+		while (size) {
+			ObuType obu_type;
+			u64 obu_size;
+			u32 hdr_size;
+			gf_media_aom_av1_parse_obu(bs, &obu_type, &obu_size, &hdr_size, pctx->av1_state);
+
+			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++;
+		}
+		gf_bs_del(bs);
+	} else {
+		u32 hdr, pos, fsize, i;
+		switch (pctx->codec_id) {
+		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_MPEG4_PART2:
+			inspect_dump_mpeg124(pctx, (char *) data, size, dump);
+			break;
+		case GF_CODECID_MPEG_AUDIO:
+		case GF_CODECID_MPEG2_PART3:
+			pos = 0;
+			while (size) {
+				hdr = gf_mp3_get_next_header_mem(data, size, &pos);
+				fsize = gf_mp3_frame_size(hdr);
+				gf_fprintf(dump, "<MPEGAudioFrame size=\"%d\" layer=\"%d\" version=\"%d\" bitrate=\"%d\" channels=\"%d\" samplesPerFrame=\"%d\" samplerate=\"%d\"/>\n", fsize, gf_mp3_layer(hdr), gf_mp3_version(hdr), gf_mp3_bit_rate(hdr), gf_mp3_num_channels(hdr), gf_mp3_window_size(hdr), gf_mp3_sampling_rate(hdr));
+				if (size<pos+fsize) break;
+				data += pos + fsize;
+				size -= pos + fsize;
+			}
+			break;
+		case GF_CODECID_TMCD:
+			inspect_dump_tmcd(ctx, pctx, (char *) data, size, dump);
+			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;
+		case GF_CODECID_SUBS_XML:
+		case GF_CODECID_META_XML:
+			for (i=0; i<size; i++) {
+				gf_fputc(data[i], dump);
+			}
+			break;
+		case GF_CODECID_APCH:
+		case GF_CODECID_APCO:
+		case GF_CODECID_APCN:
+		case GF_CODECID_APCS:
+		case GF_CODECID_AP4X:
+		case GF_CODECID_AP4H:
+			gf_inspect_dump_prores(dump, (char *) data, size, ctx->dump_crc);
+			break;
+
+		}
+	}
+#endif
+	gf_fprintf(dump, "</Packet>\n");
+}
+
+#define DUMP_ARRAY(arr, name, loc, _is_svc)\
+	if (arr && gf_list_count(arr)) {\
+		gf_fprintf(dump, "  <%sArray location=\"%s\">\n", name, loc);\
+		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(dump, slc->data, slc->size, _is_svc, pctx->hevc_state, pctx->avc_state, nalh_size, ctx->dump_crc, GF_FALSE);\
+			gf_fprintf(dump, "/>\n");\
+		}\
+		gf_fprintf(dump, "  </%sArray>\n", name);\
+	}\
+
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void inspect_reset_parsers(PidCtx *pctx, void *keep_parser_address)
+{
+	if ((&pctx->hevc_state != keep_parser_address) && pctx->hevc_state) {
+		gf_free(pctx->hevc_state);
+		pctx->hevc_state = NULL;
+	}
+	if ((&pctx->avc_state != keep_parser_address) && pctx->avc_state) {
+		gf_free(pctx->avc_state);
+		pctx->avc_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);
+		pctx->av1_state = NULL;
+	}
+	if ((&pctx->mv124_state != keep_parser_address) && pctx->mv124_state) {
+		gf_m4v_parser_del(pctx->mv124_state);
+		pctx->mv124_state = NULL;
+	}
+}
+#endif
+
+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;
+#ifndef GPAC_DISABLE_AV_PARSERS
+	u32 i;
+	GF_AVCConfigSlot *slc;
+#endif
+	GF_AVCConfig *avcc, *svcc;
+	GF_HEVCConfig *hvcc, *lhcc;
+	Bool is_enh = GF_FALSE;
+	Bool is_svc=GF_FALSE;
+	char *elt_name = NULL;
+	const GF_PropertyValue *p, *dsi, *dsi_enh;
+
+	if (ctx->test==INSPECT_TEST_NOPROP) return;
+
+	//disconnect of src pid (not yet supported)
+	if (ctx->xml) {
+		if (is_info) {
+			elt_name = "PIDInfoUpdate";
+		} else if (is_remove) {
+			elt_name = "PIDRemove";
+		} else {
+			elt_name = is_connect ? "PIDConfigure" : "PIDReconfigure";
+		}
+		gf_fprintf(dump, "<%s PID=\"%d\" name=\"%s\"",elt_name, pid_idx, gf_filter_pid_get_name(pid) );
+
+		if (pck_for_config)
+			gf_fprintf(dump, " packetsSinceLastConfig=\""LLU"\"", pck_for_config);
+	} else {
+		if (is_info) {
+			gf_fprintf(dump, "PID %d name %s info update\n", pid_idx, gf_filter_pid_get_name(pid) );
+		} else if (is_remove) {
+			gf_fprintf(dump, "PID %d name %s delete\n", pid_idx, gf_filter_pid_get_name(pid) );
+		} else {
+			gf_fprintf(dump, "PID %d name %s %sonfigure", pid_idx, gf_filter_pid_get_name(pid), is_connect ? "C" : "Rec" );
+			if (pck_for_config)
+				gf_fprintf(dump, " after "LLU" packets", pck_for_config);
+			gf_fprintf(dump, " - properties:\n");
+		}
+	}
+
+	if (!is_info) {
+		while (1) {
+			u32 prop_4cc;
+			const char *prop_name;
+			p = gf_filter_pid_enum_properties(pid, &idx, &prop_4cc, &prop_name);
+			if (!p) break;
+			inspect_dump_property(ctx, dump, prop_4cc, prop_name, p);
+
+			if (prop_name) {
+				if (!strcmp(prop_name, "tmcd:flags"))
+					pctx->tmcd_flags = p->value.uint;
+				else if (!strcmp(prop_name, "tmcd:framerate"))
+					pctx->tmcd_rate = p->value.frac;
+				else if (!strcmp(prop_name, "tmcd:frames_per_tick"))
+					pctx->tmcd_fpt = p->value.uint;
+
+			}
+		}
+	} else {
+		while (ctx->info) {
+			u32 prop_4cc;
+			const char *prop_name;
+			p = gf_filter_pid_enum_info(pid, &idx, &prop_4cc, &prop_name);
+			if (!p) break;
+			inspect_dump_property(ctx, dump, prop_4cc, prop_name, p);
+		}
+	}
+
+	if (!ctx->analyze) {
+		if (ctx->xml) {
+			gf_fprintf(dump, "/>\n");
+		}
+		return;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (!p) {
+		gf_fprintf(dump, "/>\n");
+		return;
+	}
+	pctx->codec_id = p->value.uint;
+
+	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);
+
+	avcc = NULL;
+	svcc = NULL;
+	hvcc = NULL;
+	lhcc = NULL;
+	pctx->has_svcc = 0;
+
+	switch (pctx->codec_id) {
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		if (!dsi) is_enh = GF_TRUE;
+	case GF_CODECID_AVC:
+	case GF_CODECID_AVC_PS:
+		if (!dsi && !dsi_enh) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, &pctx->avc_state);
+
+		if (!pctx->avc_state) {
+			GF_SAFEALLOC(pctx->avc_state, AVCState);
+			if (!pctx->avc_state) return;
+		}
+#endif
+		gf_fprintf(dump, ">\n");
+		gf_fprintf(dump, "<AVCParameterSets>\n");
+		if (dsi) {
+			if (is_enh) {
+				svcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+				if (svcc)
+					pctx->nalu_size_length = svcc->nal_unit_size;
+			} else {
+				avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+				if (avcc)
+					pctx->nalu_size_length = avcc->nal_unit_size;
+			}
+		}
+		if (dsi_enh && !svcc) {
+			svcc = gf_odf_avc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size);
+			if (svcc)
+				pctx->nalu_size_length = svcc->nal_unit_size;
+		}
+		nalh_size = pctx->nalu_size_length;
+		is_svc = (svcc != NULL) ? 1 : 0;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (avcc) {
+			DUMP_ARRAY(avcc->sequenceParameterSets, "AVCSPS", "decoderConfig", is_svc)
+			DUMP_ARRAY(avcc->pictureParameterSets, "AVCPPS", "decoderConfig", is_svc)
+			DUMP_ARRAY(avcc->sequenceParameterSetExtensions, "AVCSPSEx", "decoderConfig", is_svc)
+		}
+		if (is_svc) {
+			DUMP_ARRAY(svcc->sequenceParameterSets, "SVCSPS", dsi_enh ? "decoderConfigEnhancement" : "decoderConfig", is_svc)
+			DUMP_ARRAY(svcc->pictureParameterSets, "SVCPPS", dsi_enh ? "decoderConfigEnhancement" : "decoderConfig", is_svc)
+			pctx->has_svcc = 1;
+		}
+#endif
+		gf_fprintf(dump, "</AVCParameterSets>\n");
+		break;
+	case GF_CODECID_LHVC:
+		is_enh = GF_TRUE;
+	case GF_CODECID_HEVC:
+	case GF_CODECID_HEVC_TILES:
+		if (!dsi && !dsi_enh) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, &pctx->hevc_state);
+
+		if (!pctx->hevc_state) {
+			GF_SAFEALLOC(pctx->hevc_state, HEVCState);
+			if (!pctx->hevc_state) return;
+		}
+#endif
+
+		if (dsi) {
+			if (is_enh && !dsi_enh) {
+				lhcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_TRUE);
+				if (lhcc)
+					pctx->nalu_size_length = lhcc->nal_unit_size;
+			} else {
+				hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+				if (hvcc)
+					pctx->nalu_size_length = hvcc->nal_unit_size;
+			}
+		}
+		if (dsi_enh && !lhcc) {
+			lhcc = gf_odf_hevc_cfg_read(dsi_enh->value.data.ptr, dsi_enh->value.data.size, GF_TRUE);
+			if (lhcc)
+				pctx->nalu_size_length = lhcc->nal_unit_size;
+		}
+		nalh_size = pctx->nalu_size_length;
+
+		gf_fprintf(dump, ">\n");
+		gf_fprintf(dump, "<HEVCParameterSets>\n");
+#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);
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCSPS", "hvcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCPPS", "hvcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCVPS", "hvcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "hvcC", 0)
+				}
+			}
+		}
+		if (lhcc) {
+			for (idx=0; idx<gf_list_count(lhcc->param_array); idx++) {
+				GF_HEVCParamArray *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) {
+					DUMP_ARRAY(ar->nalus, "HEVCPPS", "lhcC", 0)
+				} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					DUMP_ARRAY(ar->nalus, "HEVCVPS", "lhcC", 0)
+				} else {
+					DUMP_ARRAY(ar->nalus, "HEVCUnknownPS", "lhcC", 0)
+				}
+			}
+		}
+#endif
+		gf_fprintf(dump, "</HEVCParameterSets>\n");
+		break;
+
+	case GF_CODECID_AV1:
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, &pctx->av1_state);
+		if (!pctx->av1_state) {
+			GF_SAFEALLOC(pctx->av1_state, AV1State);
+			if (!pctx->av1_state) return;
+			gf_av1_init_state(pctx->av1_state);
+		}
+#endif
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (pctx->av1_state->config) gf_odf_av1_cfg_del(pctx->av1_state->config);
+		pctx->av1_state->config = gf_odf_av1_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		gf_fprintf(dump, ">\n");
+		gf_fprintf(dump, " <OBUConfig>\n");
+
+		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;
+			GF_AV1_OBUArrayEntry *obu = gf_list_get(pctx->av1_state->config->obu_array, i);
+			GF_BitStream *bs = gf_bs_new((const char *)obu->obu, (u32) obu->obu_length, GF_BITSTREAM_READ);
+			gf_media_aom_av1_parse_obu(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_bs_del(bs);
+			idx++;
+		}
+#endif
+		gf_fprintf(dump, " </OBUConfig>\n");
+		break;
+
+	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_MPEG4_PART2:
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_reset_parsers(pctx, &pctx->mv124_state);
+#endif
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+		gf_fprintf(dump, ">\n");
+		gf_fprintf(dump, " <MPEGVideoConfig>\n");
+#ifndef GPAC_DISABLE_AV_PARSERS
+		inspect_dump_mpeg124(pctx, dsi->value.data.ptr, dsi->value.data.size, dump);
+#endif
+		gf_fprintf(dump, " </MPEGVideoConfig>\n");
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (pctx->mv124_state) gf_m4v_parser_del(pctx->mv124_state);
+#endif
+		break;
+	case GF_CODECID_MPEG_AUDIO:
+	case GF_CODECID_MPEG2_PART3:
+	case GF_CODECID_TMCD:
+		gf_fprintf(dump, "/>\n");
+		return;
+	case GF_CODECID_SUBS_XML:
+	case GF_CODECID_META_XML:
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+		gf_fprintf(dump, " <XMLTextConfig>\n");
+		for (i=0; i<dsi->value.data.size; i++) {
+			gf_fputc(dsi->value.data.ptr[i], dump);
+		}
+		gf_fprintf(dump, "\n </XMLTextConfig>\n");
+		gf_fprintf(dump, "/>\n");
+		return;
+	case GF_CODECID_SUBS_TEXT:
+	case GF_CODECID_META_TEXT:
+		if (!dsi) {
+			gf_fprintf(dump, "/>\n");
+			return;
+		}
+		gf_fprintf(dump, " <TextConfig>\n");
+		gf_fprintf(dump, "<![CDATA[");
+		for (i=0; i<dsi->value.data.size; i++) {
+			gf_fputc(dsi->value.data.ptr[i], dump);
+		}
+		gf_fprintf(dump, "]]>\n");
+		gf_fprintf(dump, " </TextConfig>\n");
+		gf_fprintf(dump, "/>\n");
+		return;
+	case GF_CODECID_APCH:
+	case GF_CODECID_APCN:
+	case GF_CODECID_APCS:
+	case GF_CODECID_APCO:
+	case GF_CODECID_AP4H:
+	case GF_CODECID_AP4X:
+		gf_fprintf(dump, "/>\n");
+		return;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[Inspect] bitstream analysis for codec %s not supported\n", gf_codecid_name(pctx->codec_id)));
+		gf_fprintf(dump, "/>\n");
+		return;
+	}
+
+	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 (lhcc) gf_odf_hevc_cfg_del(lhcc);
+
+	gf_fprintf(dump, "</%s>\n", elt_name);
+}
+
+static GF_Err inspect_process(GF_Filter *filter)
+{
+	u32 i, count, nb_done=0;
+	GF_InspectCtx *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(ctx->src_pids);
+
+	if (ctx->args_updated) {
+		ctx->args_updated = GF_FALSE;
+		for (i=0; i<count; i++) {
+			PidCtx *pctx = gf_list_get(ctx->src_pids, i);
+			switch (ctx->mode) {
+			case INSPECT_MODE_PCK:
+			case INSPECT_MODE_REFRAME:
+				gf_filter_pid_set_framing_mode(pctx->src_pid, GF_TRUE);
+				break;
+			default:
+				gf_filter_pid_set_framing_mode(pctx->src_pid, GF_FALSE);
+				break;
+			}
+			gf_filter_pid_set_clock_mode(pctx->src_pid, ctx->pcr);
+		}
+		if (ctx->is_prober || ctx->deep || ctx->fmt) {
+			ctx->dump_pck = GF_TRUE;
+		} else {
+			ctx->dump_pck = GF_FALSE;
+		}
+	}
+	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);
+
+		if (!pck && !gf_filter_pid_is_eos(pctx->src_pid))
+			continue;
+
+		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;
+			pctx->init_pid_config_done = 1;
+			pctx->pck_for_config=0;
+
+			if (!ctx->hdr_done) {
+				ctx->hdr_done=GF_TRUE;
+				//dump header on main output file, not on pid one!
+				if (ctx->hdr && ctx->fmt && !ctx->xml)
+					inspect_dump_packet_fmt(ctx, ctx->dump, NULL, 0, 0);
+			}
+		}
+		if (!pck) continue;
+		
+		pctx->pck_for_config++;
+		pctx->pck_num++;
+
+		if (ctx->dump_pck) {
+
+			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);
+			}
+		}
+		
+		if (ctx->dur.num && ctx->dur.den) {
+			u64 timescale = gf_filter_pck_get_timescale(pck);
+			u64 ts = gf_filter_pck_get_dts(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) {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, pctx->src_pid);
+				gf_filter_pid_send_event(pctx->src_pid, &evt);
+				gf_filter_pid_set_discard(pctx->src_pid, GF_TRUE);
+				break;
+			}
+		}
+		gf_filter_pid_drop_packet(pctx->src_pid);
+	}
+	if (ctx->is_prober && !ctx->probe_done && (nb_done==count) && !ctx->allp) {
+		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;
+		return GF_EOS;
+	}
+	return GF_OK;
+}
+
+static GF_Err inspect_config_input(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_FilterEvent evt;
+	PidCtx *pctx;
+	const GF_PropertyValue *p;
+	GF_InspectCtx *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->src_pids) ctx->src_pids = gf_list_new();
+
+	pctx = gf_filter_pid_get_udta(pid);
+	if (pctx) {
+		assert(pctx->src_pid == pid);
+		if (!ctx->is_prober) pctx->dump_pid = 1;
+		return GF_OK;
+	}
+	GF_SAFEALLOC(pctx, PidCtx);
+	if (!pctx) return GF_OUT_OF_MEM;
+	
+	pctx->src_pid = pid;
+	gf_filter_pid_set_udta(pid, pctx);
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	pctx->stream_type = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	pctx->codec_id = p ? p->value.uint : 0;
+
+	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++) {
+			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)) {
+				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;
+		}
+	} else {
+		pctx->tmp = ctx->dump;
+		gf_list_add(ctx->src_pids, pctx);
+	}
+
+	pctx->idx = gf_list_find(ctx->src_pids, pctx) + 1;
+
+	if (! ctx->interleave && !pctx->tmp) {
+		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) );
+	}
+
+	switch (ctx->mode) {
+	case INSPECT_MODE_PCK:
+	case INSPECT_MODE_REFRAME:
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+		break;
+	default:
+		gf_filter_pid_set_framing_mode(pid, GF_FALSE);
+		break;
+	}
+
+	if (!ctx->is_prober) {
+		pctx->dump_pid = 1;
+	}
+
+	gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "Inspect");
+	gf_filter_pid_send_event(pid, &evt);
+
+	if (ctx->is_prober || ctx->deep || ctx->fmt) {
+		ctx->dump_pck = GF_TRUE;
+	} else {
+		ctx->dump_pck = GF_FALSE;
+	}
+	if (ctx->pcr)
+		gf_filter_pid_set_clock_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static const GF_FilterCapability InspecterDemuxedCaps[] =
+{
+	//accept any stream but files, framed
+	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),
+	{0},
+};
+
+static const GF_FilterCapability InspecterReframeCaps[] =
+{
+	//accept any stream but files, framed
+	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),
+	{0},
+};
+
+static GF_Err inspect_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *new_val)
+{
+	GF_InspectCtx  *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
+	ctx->args_updated = GF_TRUE;
+	return GF_OK;
+}
+
+GF_Err inspect_initialize(GF_Filter *filter)
+{
+	const char *name = gf_filter_get_name(filter);
+	GF_InspectCtx  *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
+
+	if (name && !strcmp(name, "probe") ) {
+		ctx->is_prober = GF_TRUE;
+		return GF_OK;
+	}
+
+	if (!ctx->log) return GF_BAD_PARAM;
+	if (!strcmp(ctx->log, "stderr")) ctx->dump = stderr;
+	else if (!strcmp(ctx->log, "stdout")) ctx->dump = stdout;
+	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));
+			return GF_IO_ERR;
+		}
+	}
+	if (ctx->analyze) {
+		ctx->xml = GF_TRUE;
+	}
+
+	if (ctx->xml) {
+		ctx->fmt = NULL;
+		gf_fprintf(ctx->dump, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+		gf_fprintf(ctx->dump, "<GPACInspect>\n");
+	}
+
+	switch (ctx->mode) {
+	case INSPECT_MODE_RAW:
+		break;
+	case INSPECT_MODE_REFRAME:
+		gf_filter_override_caps(filter, InspecterReframeCaps,  sizeof(InspecterReframeCaps)/sizeof(GF_FilterCapability) );
+		break;
+	default:
+		gf_filter_override_caps(filter, InspecterDemuxedCaps,  sizeof(InspecterDemuxedCaps)/sizeof(GF_FilterCapability) );
+		break;
+	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		inspect_update_arg(filter, NULL, NULL);
+		ctx->args_updated = GF_FALSE;
+	}
+#endif
+	return GF_OK;
+}
+
+static Bool inspect_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_InspectCtx  *ctx = (GF_InspectCtx *) gf_filter_get_udta(filter);
+	if (!ctx->info) return GF_TRUE;
+	if (evt->base.type!=GF_FEVT_INFO_UPDATE) return GF_TRUE;
+	PidCtx *pctx = gf_filter_pid_get_udta(evt->base.on_pid);
+	pctx->dump_pid = 2;
+	return GF_TRUE;
+}
+
+#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 or stdout", GF_FS_ARG_UPDATE},
+	{ 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},
+	{ 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(info), "monitor PID info changes", 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(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(xml), "use xml formatting (implied if (-analyze]() is set) and disable [-fmt]()", 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(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"
+		"- network: URL/path dump, cache state, file size properties skipped (used for hashing network results)\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|encode|encx", GF_FS_ARG_HINT_EXPERT|GF_FS_ARG_UPDATE},
+	{0}
+};
+
+static const GF_FilterCapability InspectCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_UNKNOWN),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_NONE),
+};
+
+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")
+	.private_size = sizeof(GF_InspectCtx),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.max_extra_pids = (u32) -1,
+	.args = InspectArgs,
+	SETCAPS(InspectCaps),
+	.initialize = inspect_initialize,
+	.finalize = inspect_finalize,
+	.process = inspect_process,
+	.process_event = inspect_process_event,
+	.configure_pid = inspect_config_input,
+	.update_arg = inspect_update_arg,
+};
+
+static const GF_FilterCapability ProberCaps[] =
+{
+	//accept any stream but files, framed
+	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_SCENE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	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),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_INPUT,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	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_RAW),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	{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.")
+	.private_size = sizeof(GF_InspectCtx),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.max_extra_pids = (u32) -1,
+	.args = InspectArgs,
+	.initialize = inspect_initialize,
+	SETCAPS(ProberCaps),
+	.finalize = inspect_finalize,
+	.process = inspect_process,
+	.configure_pid = inspect_config_input,
+};
+
+const GF_FilterRegister *inspect_register(GF_FilterSession *session)
+{
+	return &InspectRegister;
+}
+
+const GF_FilterRegister *probe_register(GF_FilterSession *session)
+{
+	return &ProbeRegister;
+}
+
+
+

gpac-1.0.0.tar.gz/src/filters/isoffin.h Added

@@ -0,0 +1,220 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ISOBMFF 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
+ *  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 _ISMO_IN_H_
+#define _ISMO_IN_H_
+
+#include <gpac/constants.h>
+#include <gpac/isomedia.h>
+#include <gpac/filters.h>
+#include <gpac/thread.h>
+
+#ifndef GPAC_DISABLE_ISOM
+
+/*
+			reader module
+
+*/
+
+//#define DASH_USE_PULL
+
+enum
+{
+	MP4DMX_SPLIT=0,
+	MP4DMX_SPLIT_EXTRACTORS,
+	MP4DMX_SINGLE,
+};
+
+typedef struct
+{
+	//options
+	char *src;
+	Bool allt, noedit, itt, itemid;
+	u32 smode;
+	u32 stsd;
+	Bool expart;
+	Bool alltk;
+	u32 frame_size;
+	char* tkid;
+	Bool analyze;
+	char *catseg;
+	Bool sigfrag;
+	Bool nocrypt, strtxt;
+	u32 mstore_purge, mstore_samples, mstore_size;
+
+	//internal
+
+	GF_Filter *filter;
+
+	/*current channels*/
+	GF_List *channels;
+
+	/*input file*/
+	GF_ISOFile *mov;
+	Bool extern_mov;
+	u32 time_scale;
+	u32 nb_playing;
+	//source data is completely available
+	Bool input_loaded;
+	//fragmented file to be refreshed before processing it
+	Bool refresh_fragmented;
+	Bool input_is_stop;
+	u64 missing_bytes, last_size;
+
+	u32 play_only_track_id;
+	u32 play_only_first_media;
+	Bool full_segment_flush;
+	/*0: not fragmented - 1 fragmented - 2 fragmented and last fragment received*/
+	u32 frag_type;
+	Bool waiting_for_data, reset_frag_state;
+
+
+	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;
+
+	u64 last_sender_ntp, ntp_at_last_sender_ntp, cts_for_last_sender_ntp;
+	Bool is_partial_download, wait_for_source;
+
+	u32 src_crc;
+	u64 start_range, end_range;
+	GF_FilterPid *pid;
+
+	Bool eos_signaled;
+	u32 mem_load_mode;
+	u8 *mem_url;
+	GF_Blob mem_blob;
+	u64 bytes_removed;
+	u64 last_min_offset;
+	GF_Err in_error;
+	Bool force_fetch;
+} ISOMReader;
+
+typedef struct
+{
+	u32 track, track_id;
+	u32 item_id, item_idx;
+	/*base track if scalable media, 0 otherwise*/
+	u32 base_track;
+	u32 next_track;
+	GF_FilterPid *pid;
+	ISOMReader *owner;
+	u64 duration;
+
+	/*current sample*/
+	GF_ISOSample *static_sample;
+	GF_ISOSample *sample;
+	u64 sample_data_offset, last_valid_sample_data_offset;
+	GF_Err last_state;
+	Bool sap_3, sap_4;
+	s32 roll;
+
+	Bool has_edit_list;
+	u32 sample_num;
+	s64 ts_offset;
+/*
+	s64 dts_offset;
+	Bool do_dts_shift_test;
+*/
+
+	/*for edit lists*/
+	u32 edit_sync_frame;
+	u64 sample_time, last_rap_sample_time, start, end;
+	Double speed;
+
+	u32 time_scale;
+	Bool to_init, has_rap;
+	Bool playing, eos_sent;
+	u8 streamType;
+	Bool initial_play_seen;
+
+	Bool is_encrypted, is_cenc;
+
+	Bool disable_seek;
+	u32 nalu_extract_mode;
+
+	//channel sample state
+	u32 last_sample_desc_index;
+	u32 isLeading, dependsOn, dependedOn, redundant;
+	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;
+
+	u8 *sai_buffer;
+	u32 sai_alloc_size, sai_buffer_size;
+
+	Bool check_avc_ps, check_hevc_ps;
+	GF_HEVCConfig *hvcc;
+	GF_AVCConfig *avcc;
+	GF_BitStream *nal_bs;
+	u32 dsi_crc;
+
+	Bool needs_pid_reconfig;
+	u32 sap_only;
+} ISOMChannel;
+
+void isor_reset_reader(ISOMChannel *ch);
+void isor_reader_get_sample(ISOMChannel *ch);
+void isor_reader_release_sample(ISOMChannel *ch);
+void isor_update_channel_config(ISOMChannel *ch);
+
+void isor_check_producer_ref_time(ISOMReader *read);
+
+//ISOMChannel *isor_get_channel(ISOMReader *reader, GF_FilterPid *pid);
+ISOMChannel *isor_create_channel(ISOMReader *read, GF_FilterPid *pid, u32 track, u32 item_id, Bool force_no_extractors);
+
+GF_Err isor_declare_objects(ISOMReader *read);
+
+void isor_reader_get_sample_from_item(ISOMChannel *ch);
+void isor_set_crypt_config(ISOMChannel *ch);
+
+void isor_reader_check_config(ISOMChannel *ch);
+
+Bool isor_declare_item_properties(ISOMReader *read, ISOMChannel *ch, u32 item_idx);
+
+#endif /*GPAC_DISABLE_ISOM*/
+
+#endif /*_ISMO_IN_H_*/
+

gpac-1.0.0.tar.gz/src/filters/isoffin_load.c Added

@@ -0,0 +1,1206 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ISOBMFF 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
+ *  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 "isoffin.h"
+#include <gpac/iso639.h>
+#include <gpac/base_coding.h>
+#include <gpac/media_tools.h>
+
+#ifndef GPAC_DISABLE_ISOM
+
+#if 0	//deprecated - we need to rework chapter information to deal with static chapters and chapter tracks
+void isor_emulate_chapters(GF_ISOFile *file, GF_InitialObjectDescriptor *iod)
+{
+	GF_Segment *prev_seg;
+	u64 prev_start;
+	u64 start;
+	u32 i, count;
+	if (!iod || gf_list_count(iod->OCIDescriptors)) return;
+	count = gf_isom_get_chapter_count(file, 0);
+	if (!count) return;
+
+	prev_seg = NULL;
+	start = prev_start = 0;
+	for (i=0; i<count; i++) {
+		const char *name;
+		GF_Segment *seg;
+		gf_isom_get_chapter(file, 0, i+1, &start, &name);
+		seg = (GF_Segment *) gf_odf_desc_new(GF_ODF_SEGMENT_TAG);
+		seg->startTime = (Double) (s64) start;
+		seg->startTime /= 1000;
+		seg->SegmentName = gf_strdup(name);
+		gf_list_add(iod->OCIDescriptors, seg);
+		if (prev_seg) {
+			prev_seg->Duration = (Double) (s64) (start - prev_start);
+			prev_seg->Duration /= 1000;
+		} else if (start) {
+			prev_seg = (GF_Segment *) gf_odf_desc_new(GF_ODF_SEGMENT_TAG);
+			prev_seg->startTime = 0;
+			prev_seg->Duration = (Double) (s64) (start);
+			prev_seg->Duration /= 1000;
+			gf_list_insert(iod->OCIDescriptors, prev_seg, 0);
+		}
+		prev_seg = seg;
+		prev_start = start;
+	}
+	if (prev_seg) {
+		start = 1000*gf_isom_get_duration(file);
+		start /= gf_isom_get_timescale(file);
+		if (start>prev_start) {
+			prev_seg->Duration = (Double) (s64) (start - prev_start);
+			prev_seg->Duration /= 1000;
+		}
+	}
+}
+#endif
+
+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;
+	GF_ESD *an_esd;
+	const char *mime, *encoding, *stxtcfg, *namespace, *schemaloc;
+#if !defined(GPAC_DISABLE_ISOM_WRITE)
+	u8 *tk_template;
+	u32 tk_template_size;
+#endif
+	GF_Language *lang_desc = NULL;
+	Bool external_base=GF_FALSE;
+	Bool has_scalable_layers = GF_FALSE;
+	u8 *dsi = NULL, *enh_dsi = NULL;
+	u32 dsi_size = 0, enh_dsi_size = 0;
+	Double track_dur=0;
+	u32 srd_id=0, srd_indep=0, srd_x=0, srd_y=0, srd_w=0, srd_h=0;
+	u32 base_tile_track=0;
+	Bool srd_full_frame=GF_FALSE;
+	u32 mtype, m_subtype;
+	GF_GenericSampleDescription *udesc = NULL;
+	GF_Err e;
+	u32 ocr_es_id;
+	Bool first_config = GF_FALSE;
+
+
+	depends_on_id = avg_rate = max_rate = buffer_size = 0;
+	mime = encoding = stxtcfg = namespace = schemaloc = 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);
+	} else {
+		m_subtype = gf_isom_get_media_subtype(read->mov, track, stsd_idx);
+	}
+	
+	audio_fmt = 0;
+	pix_fmt = 0;
+	ocr_es_id = 0;
+	an_esd = gf_media_map_esd(read->mov, track, stsd_idx);
+	if (an_esd && an_esd->decoderConfig) {
+		if (an_esd->decoderConfig->streamType==GF_STREAM_INTERACT) {
+			gf_odf_desc_del((GF_Descriptor *)an_esd);
+			return;
+		}
+		streamtype = an_esd->decoderConfig->streamType;
+		if (an_esd->decoderConfig->objectTypeIndication < GF_CODECID_LAST_MPEG4_MAPPING) {
+			codec_id = gf_codecid_from_oti(streamtype, an_esd->decoderConfig->objectTypeIndication);
+		} else {
+			codec_id = an_esd->decoderConfig->objectTypeIndication;
+		}
+		ocr_es_id = an_esd->OCRESID;
+		depends_on_id = an_esd->dependsOnESID;
+		lang_desc = an_esd->langDesc;
+		an_esd->langDesc = NULL;
+		esid = an_esd->ESID;
+
+		if (an_esd->decoderConfig->decoderSpecificInfo && an_esd->decoderConfig->decoderSpecificInfo->data) {
+			dsi = an_esd->decoderConfig->decoderSpecificInfo->data;
+			dsi_size = an_esd->decoderConfig->decoderSpecificInfo->dataLength;
+			an_esd->decoderConfig->decoderSpecificInfo->data = NULL;
+			an_esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
+		}
+
+		gf_odf_desc_del((GF_Descriptor *)an_esd);
+	} else {
+		u32 pcm_flags, pcm_size;
+		Bool load_default = GF_FALSE;
+		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);
+
+		if (!streamtype) streamtype = gf_codecid_type(m_subtype);
+		codec_id = 0;
+
+		switch (m_subtype) {
+		case GF_ISOM_SUBTYPE_STXT:
+		case GF_ISOM_SUBTYPE_METT:
+		case GF_ISOM_SUBTYPE_SBTT:
+		case GF_ISOM_MEDIA_SUBT:
+
+			codec_id = GF_CODECID_SIMPLE_TEXT;
+			gf_isom_stxt_get_description(read->mov, track, stsd_idx, &mime, &encoding, &stxtcfg);
+			break;
+		case GF_ISOM_SUBTYPE_STPP:
+			codec_id = GF_CODECID_SUBS_XML;
+			gf_isom_xml_subtitle_get_description(read->mov, track, stsd_idx, &namespace, &schemaloc, &mime);
+			break;
+		case GF_ISOM_SUBTYPE_METX:
+			codec_id = GF_CODECID_META_XML;
+			gf_isom_xml_subtitle_get_description(read->mov, track, stsd_idx, &namespace, &schemaloc, &mime);
+			break;
+		case GF_ISOM_SUBTYPE_WVTT:
+			codec_id = GF_CODECID_WEBVTT;
+			stxtcfg = gf_isom_get_webvtt_config(read->mov, track, stsd_idx);
+			break;
+		case GF_ISOM_SUBTYPE_MJP2:
+			codec_id = GF_CODECID_J2K;
+			gf_isom_get_jp2_config(read->mov, track, stsd_idx, &dsi, &dsi_size);
+			break;
+		case GF_ISOM_SUBTYPE_HVT1:
+			codec_id = GF_CODECID_HEVC_TILES;
+			gf_isom_get_reference(read->mov, track, GF_ISOM_REF_TBAS, 1, &base_tile_track);
+			if (base_tile_track) {
+				depends_on_id = gf_isom_get_track_id(read->mov, base_tile_track);
+			}
+			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_TEXT:
+		case GF_ISOM_SUBTYPE_TX3G:
+		{
+			GF_TextSampleDescriptor *txtcfg = NULL;
+			codec_id = GF_CODECID_TX3G;
+			e = gf_isom_get_text_description(read->mov, track, stsd_idx, &txtcfg);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d unable to fetch TX3G config\n", track));
+			}
+			if (txtcfg) {
+				gf_odf_tx3g_write(txtcfg, &dsi, &dsi_size);
+				gf_odf_desc_del((GF_Descriptor *) txtcfg);
+			}
+		}
+			break;
+
+		case GF_ISOM_SUBTYPE_FLAC:
+			codec_id = GF_CODECID_FLAC;
+			gf_isom_flac_config_get(read->mov, track, stsd_idx, &dsi, &dsi_size);
+			break;
+		case GF_ISOM_SUBTYPE_OPUS:
+			codec_id = GF_CODECID_OPUS;
+			gf_isom_opus_config_get(read->mov, track, stsd_idx, &dsi, &dsi_size);
+			break;
+
+		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:
+			codec_id = GF_CODECID_RAW;
+			audio_fmt = gf_audio_fmt_from_isobmf(m_subtype);
+			break;
+		case GF_ISOM_MEDIA_TMCD:
+			codec_id = GF_CODECID_TMCD;
+			streamtype = GF_STREAM_METADATA;
+			break;
+
+		case GF_QT_SUBTYPE_RAW:
+			codec_id = GF_CODECID_RAW;
+			if (streamtype==GF_STREAM_AUDIO)
+ 				audio_fmt = GF_AUDIO_FMT_U8;
+			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;
+			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;
+				if (pcm_size==16) audio_fmt = GF_AUDIO_FMT_S16;
+				else if (pcm_size==24) audio_fmt = GF_AUDIO_FMT_S24;
+				else if (pcm_size==32) audio_fmt = GF_AUDIO_FMT_S32;
+			}
+			break;
+		case GF_ISOM_SUBTYPE_FPCM:
+			if (gf_isom_get_pcm_config(read->mov, track, stsd_idx, &pcm_flags, &pcm_size) == GF_OK) {
+				codec_id = GF_CODECID_RAW;
+				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;
+			break;
+			
+		default:
+			codec_id = gf_codec_id_from_isobmf(m_subtype);
+			if (!codec_id)
+				load_default = GF_TRUE;
+			break;
+		}
+
+		if (load_default) {
+			if (!codec_id) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d type %s not natively handled\n", track, gf_4cc_to_str(m_subtype) ));
+
+				codec_id = m_subtype;
+			}
+			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 (!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));
+		if (lang_desc) gf_odf_desc_del((GF_Descriptor *)lang_desc);
+		if (dsi) gf_free(dsi);
+		return;
+	}
+
+	//first setup, creation of PID and channel
+	if (!ch) {
+		Bool use_sidx_dur = GF_FALSE;
+		GF_FilterPid *pid;
+		first_config = GF_TRUE;
+
+		gf_isom_get_reference(read->mov, track, GF_ISOM_REF_BASE, 1, &base_track);
+
+		if (base_track) {
+			u32 base_subtype=0;
+			if (read->smode==MP4DMX_SINGLE)
+				depends_on_id = 0;
+
+			switch (m_subtype) {
+			case GF_ISOM_SUBTYPE_LHV1:
+			case GF_ISOM_SUBTYPE_LHE1:
+				base_subtype = gf_isom_get_media_subtype(read->mov, base_track, stsd_idx);
+				switch (base_subtype) {
+				case GF_ISOM_SUBTYPE_HVC1:
+				case GF_ISOM_SUBTYPE_HEV1:
+				case GF_ISOM_SUBTYPE_HVC2:
+				case GF_ISOM_SUBTYPE_HEV2:
+					break;
+				default:
+					external_base=GF_TRUE;
+					break;
+				}
+			}
+			if (external_base) {
+				depends_on_id = gf_isom_get_track_id(read->mov, base_track);
+				has_scalable_layers = GF_TRUE;
+			} else {
+				switch (gf_isom_get_hevc_lhvc_type(read->mov, track, stsd_idx)) {
+				case GF_ISOM_HEVCTYPE_HEVC_LHVC:
+				case GF_ISOM_HEVCTYPE_LHVC_ONLY:
+					has_scalable_layers = GF_TRUE;
+					break;
+				//this is likely temporal sublayer of base
+				case GF_ISOM_HEVCTYPE_HEVC_ONLY:
+					has_scalable_layers = GF_FALSE;
+					if (gf_isom_get_reference_count(read->mov, track, GF_ISOM_REF_SCAL)<=0) {
+						depends_on_id = gf_isom_get_track_id(read->mov, base_track);
+					}
+					break;
+				default:
+					break;
+				}
+			}
+		} else {
+			switch (gf_isom_get_hevc_lhvc_type(read->mov, track, stsd_idx)) {
+			case GF_ISOM_HEVCTYPE_HEVC_LHVC:
+			case GF_ISOM_HEVCTYPE_LHVC_ONLY:
+				has_scalable_layers = GF_TRUE;
+				break;
+			default:
+				break;
+			}
+		}
+
+		if (base_track && !ocr_es_id) {
+			ocr_es_id = gf_isom_get_track_id(read->mov, base_track);
+		}
+		if (!ocr_es_id) ocr_es_id = esid;
+
+		//OK declare PID
+		pid = gf_filter_pid_new(read->filter);
+		if (read->pid)
+			gf_filter_pid_copy_properties(pid, read->pid);
+
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ID, &PROP_UINT(esid));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(ocr_es_id));
+		if (depends_on_id && (depends_on_id != esid))
+			gf_filter_pid_set_property(pid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(depends_on_id));
+
+		if (gf_isom_get_track_count(read->mov)>1) {
+			char szPName[1024];
+			const char *szST = gf_stream_type_name(streamtype);
+			sprintf(szPName, "%c%d", szST[0], esid);
+			gf_filter_pid_set_name(pid, szPName);
+		}
+
+		//MPEG-4 systems present
+		if (use_iod)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_ESID, &PROP_UINT(esid));
+
+		if (gf_isom_is_track_in_root_od(read->mov, track)) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE));
+		}
+
+		gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(streamtype));
+		gf_filter_pid_set_property(pid, GF_PROP_PID_TIMESCALE, &PROP_UINT( gf_isom_get_media_timescale(read->mov, track) ) );
+
+		//Dolby Vision
+		if (m_subtype == GF_ISOM_SUBTYPE_DVHE) {
+			GF_DOVIDecoderConfigurationRecord *dovi = gf_isom_dovi_config_get(read->mov, track, 1);
+			if (dovi) {
+				u8 *data = NULL;
+				u32 size = 0;
+				GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				gf_odf_dovi_cfg_write_bs(dovi, bs);
+				gf_bs_get_content(bs, &data, &size);
+				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);
+			}
+		}
+
+		//create our channel
+		ch = isor_create_channel(read, pid, track, 0, (codec_id==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+
+		if (lang_desc) {
+			char *lang=NULL;
+			gf_isom_get_media_language(read->mov, track, &lang);
+			//s32 idx = gf_lang_find(lang);
+			gf_filter_pid_set_property(pid, GF_PROP_PID_LANGUAGE, &PROP_STRING( lang ));
+			if (lang) gf_free(lang);
+			gf_odf_desc_del((GF_Descriptor *)lang_desc);
+			lang_desc = NULL;
+		}
+
+
+		if (has_scalable_layers)
+			gf_filter_pid_set_property(pid, GF_PROP_PID_SCALABLE, &PROP_BOOL(GF_TRUE));
+
+		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));
+		}
+
+		if (srd_w && srd_h) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_CROP_POS, &PROP_VEC2I_INT(srd_x, srd_y) );
+			if (base_tile_track) {
+				gf_isom_get_visual_info(read->mov, base_tile_track, stsd_idx, &w, &h);
+				if (w && h) {
+					gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I_INT(w, h) );
+				}
+			}
+		}
+
+		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);
+			}
+		}
+
+		ch->duration = gf_isom_get_track_duration(read->mov, ch->track);
+		if (!ch->duration) {
+			ch->duration = gf_isom_get_duration(read->mov);
+		}
+		sample_count = gf_isom_get_sample_count(read->mov, ch->track);
+
+		if (read->frag_type && !read->input_loaded) {
+			u32 ts;
+			u64 dur;
+			if (gf_isom_get_sidx_duration(read->mov, &dur, &ts)==GF_OK) {
+				dur *= read->time_scale;
+				dur /= ts;
+				ch->duration = dur;
+				use_sidx_dur = GF_TRUE;
+				sample_count = 0;
+			}
+		}
+
+		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));
+			}
+			//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_NB_FRAMES, &PROP_UINT(sample_count));
+		}
+
+		if (sample_count && (streamtype==GF_STREAM_VISUAL)) {
+			u64 mdur = gf_isom_get_media_duration(read->mov, track);
+			mdur /= sample_count;
+			gf_filter_pid_set_property(pid, GF_PROP_PID_FPS, &PROP_FRAC_INT(ch->time_scale, (u32) mdur));
+		}
+
+		track_dur = (Double) (s64) ch->duration;
+		track_dur /= read->time_scale;
+		//move channel duration in media timescale
+		ch->duration = (u32) (track_dur * ch->time_scale);
+
+
+		//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) );
+
+		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) ) );
+		}
+
+
+		w = gf_isom_get_constant_sample_size(read->mov, track);
+		if (w)
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_FRAME_SIZE, &PROP_UINT(w));
+
+		if (read->mem_load_mode) {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_NONE) );
+		} else {
+			gf_filter_pid_set_property(pid, GF_PROP_PID_PLAYBACK_MODE, &PROP_UINT(GF_PLAYBACK_MODE_REWIND) );
+		}
+
+		GF_PropertyValue brands;
+		brands.type = GF_PROP_UINT_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) );
+
+		max_size = gf_isom_get_max_sample_size(read->mov, ch->track);
+		if (max_size) gf_filter_pid_set_property(pid, GF_PROP_PID_MAX_FRAME_SIZE, &PROP_UINT(max_size) );
+
+		max_size = gf_isom_get_avg_sample_size(read->mov, ch->track);
+		if (max_size) gf_filter_pid_set_property(pid, GF_PROP_PID_AVG_FRAME_SIZE, &PROP_UINT(max_size) );
+
+		max_size = gf_isom_get_max_sample_delta(read->mov, ch->track);
+		if (max_size) gf_filter_pid_set_property(pid, GF_PROP_PID_MAX_TS_DELTA, &PROP_UINT(max_size) );
+
+		max_size = gf_isom_get_max_sample_cts_offset(read->mov, ch->track);
+		if (max_size) gf_filter_pid_set_property(pid, GF_PROP_PID_MAX_CTS_OFFSET, &PROP_UINT(max_size) );
+
+		max_size = gf_isom_get_constant_sample_duration(read->mov, ch->track);
+		if (max_size) gf_filter_pid_set_property(pid, GF_PROP_PID_CONSTANT_DURATION, &PROP_UINT(max_size) );
+
+		u32 media_pl=0;
+		if (streamtype==GF_STREAM_VISUAL) {
+			media_pl = gf_isom_get_pl_indication(read->mov, GF_ISOM_PL_VISUAL);
+		} else if (streamtype==GF_STREAM_AUDIO) {
+			media_pl = gf_isom_get_pl_indication(read->mov, GF_ISOM_PL_AUDIO);
+		}
+		if (media_pl && (media_pl!=0xFF) ) gf_filter_pid_set_property(pid, GF_PROP_PID_PROFILE_LEVEL, &PROP_UINT(media_pl) );
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE)
+		e = gf_isom_get_track_template(read->mov, ch->track, &tk_template, &tk_template_size);
+		if (e == GF_OK) {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TRACK_TEMPLATE, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Failed to serialize track box: %s\n", gf_error_to_string(e) ));
+		}
+
+		e = gf_isom_get_trex_template(read->mov, ch->track, &tk_template, &tk_template_size);
+		if (e == GF_OK) {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TREX_TEMPLATE, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+		}
+
+		e = gf_isom_get_raw_user_data(read->mov, &tk_template, &tk_template_size);
+		if (e==GF_OK) {
+			if (tk_template_size)
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_UDTA, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Failed to serialize moov UDTA box: %s\n", gf_error_to_string(e) ));
+		}
+#endif
+
+		GF_Fraction64 moov_time;
+		moov_time.num = gf_isom_get_duration(read->mov);
+		moov_time.den = gf_isom_get_timescale(read->mov);
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_MOVIE_TIME, &PROP_FRAC64(moov_time) );
+
+
+		u32 i;
+		s32 tx, ty;
+		s16 l;
+		gf_isom_get_track_layout_info(read->mov, ch->track, &w, &h, &tx, &ty, &l);
+		if (w && h) {
+			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) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_TRANS_X, &PROP_SINT(tx) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_TRANS_Y, &PROP_SINT(ty) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ZORDER, &PROP_SINT(l) );
+		}
+		if (codec_id==GF_CODECID_TX3G) {
+			u32 m_w = w;
+			u32 m_h = h;
+			for (i=0; i<gf_isom_get_track_count(read->mov); i++) {
+				switch (gf_isom_get_media_type(read->mov, i+1)) {
+				case GF_ISOM_MEDIA_SCENE:
+				case GF_ISOM_MEDIA_VISUAL:
+				case GF_ISOM_MEDIA_AUXV:
+				case GF_ISOM_MEDIA_PICT:
+					gf_isom_get_track_layout_info(read->mov, i+1, &w, &h, &tx, &ty, &l);
+					if (w>m_w) m_w = w;
+					if (h>m_h) m_h = h;
+					break;
+				default:
+					break;
+				}
+			}
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_WIDTH_MAX, &PROP_UINT(m_w) );
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_HEIGHT_MAX, &PROP_UINT(m_h) );
+			char *tx3g_config_sdp = NULL;
+			for (i=0; i<gf_isom_get_sample_description_count(read->mov, ch->track); i++) {
+				u8 *tx3g;
+				char buffer[2000];
+				u32 l1;
+				u32 tx3g_len, len;
+				gf_isom_text_get_encoded_tx3g(read->mov, ch->track, i+1, GF_RTP_TX3G_SIDX_OFFSET, &tx3g, &tx3g_len);
+				len = gf_base64_encode(tx3g, tx3g_len, buffer, 2000);
+				gf_free(tx3g);
+				buffer[len] = 0;
+
+				l1 = tx3g_config_sdp ? (u32) strlen(tx3g_config_sdp) : 0;
+				tx3g_config_sdp = gf_realloc(tx3g_config_sdp, len+3+l1);
+				tx3g_config_sdp[l1] = 0;
+				if (i) strcat(tx3g_config_sdp, ", ");
+				strcat(tx3g_config_sdp, buffer);
+			}
+			if (tx3g_config_sdp) {
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_STRING_NO_COPY(tx3g_config_sdp) );
+			}
+		}
+
+
+		u32 tag_len;
+		const u8 *tag;
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_NAME, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:name", &PROP_STRING(tag) );
+
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_ARTIST, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:artist", &PROP_STRING(tag) );
+
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_ALBUM, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:album", &PROP_STRING(tag) );
+
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COMMENT, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:comment", &PROP_STRING(tag) );
+
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_TRACK, &tag, &tag_len)==GF_OK) {
+			u16 tk_n = (tag[2]<<8)|tag[3];
+			u16 tk_all = (tag[4]<<8)|tag[5];
+			gf_filter_pid_set_info_str(ch->pid, "info:track", &PROP_FRAC_INT(tk_n, tk_all) );
+		}
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COMPOSER, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:composer", &PROP_STRING(tag) );
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_WRITER, &tag, &tag_len)==GF_OK)
+			gf_filter_pid_set_info_str(ch->pid, "info:writer", &PROP_STRING(tag) );
+
+		if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_GENRE, &tag, &tag_len)==GF_OK) {
+			if (tag[0]) {
+			} else {
+				/*com->info.genre = (tag[0]<<8) | tag[1];*/
+			}
+		}
+
+		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);
+			gf_filter_pid_set_property_str(ch->pid, "tmcd:flags", &PROP_UINT(tmcd_flags) );
+			gf_filter_pid_set_property_str(ch->pid, "tmcd:framerate", &PROP_FRAC_INT(tmcd_fps_num, tmcd_fps_den) );
+			gf_filter_pid_set_property_str(ch->pid, "tmcd:frames_per_tick", &PROP_UINT(tmcd_fpt) );
+
+		}
+
+		if (!gf_sys_is_test_mode()) {
+			const char *hdlr = NULL;
+			gf_isom_get_handler_name(read->mov, ch->track, &hdlr);
+			if (hdlr)
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_HANDLER, &PROP_STRING(hdlr));
+
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_TRACK_FLAGS, &PROP_UINT( gf_isom_get_track_flags(read->mov, ch->track) ));
+
+			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.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);
+			}
+		}
+	}
+
+	//update decoder configs
+	ch->check_avc_ps = ch->check_hevc_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 (lang_desc) {
+		gf_odf_desc_del((GF_Descriptor *)lang_desc);
+		lang_desc = NULL;
+	}
+	
+	if (read->smode != MP4DMX_SINGLE) {
+		if ((codec_id==GF_CODECID_LHVC) || (codec_id==GF_CODECID_HEVC)) {
+			Bool signal_lhv = (read->smode==MP4DMX_SPLIT) ? GF_TRUE : GF_FALSE;
+			GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(read->mov, track, stsd_idx);
+			GF_HEVCConfig *lhcc = gf_isom_lhvc_config_get(read->mov, track, stsd_idx);
+
+			if (hvcc || lhcc) {
+				if (dsi) gf_free(dsi);
+				dsi = NULL;
+				//no base layer config
+				if (!hvcc) signal_lhv = GF_TRUE;
+
+				if (signal_lhv && lhcc) {
+					if (hvcc) {
+						hvcc->is_lhvc = GF_FALSE;
+						gf_odf_hevc_cfg_write(hvcc, &dsi, &dsi_size);
+					}
+					lhcc->is_lhvc = GF_TRUE;
+					gf_odf_hevc_cfg_write(lhcc, &enh_dsi, &enh_dsi_size);
+					codec_id = GF_CODECID_LHVC;
+				} else {
+					if (hvcc) {
+						hvcc->is_lhvc = GF_FALSE;
+						gf_odf_hevc_cfg_write(hvcc, &dsi, &dsi_size);
+					}
+					if (lhcc) {
+						lhcc->is_lhvc = GF_TRUE;
+						gf_odf_hevc_cfg_write(lhcc, &enh_dsi, &enh_dsi_size);
+					}
+					codec_id = GF_CODECID_HEVC;
+				}
+			}
+			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;
+			Bool signal_svc = (read->smode==MP4DMX_SPLIT) ? GF_TRUE : GF_FALSE;
+			GF_AVCConfig *avcc = gf_isom_avc_config_get(read->mov, track, stsd_idx);
+			GF_AVCConfig *svcc = gf_isom_svc_config_get(read->mov, track, stsd_idx);
+			if (!svcc) {
+				svcc = gf_isom_mvc_config_get(read->mov, track, stsd_idx);
+				is_mvc = GF_TRUE;
+			}
+
+			if (avcc || svcc) {
+				if (dsi) gf_free(dsi);
+				dsi = NULL;
+				//no base layer config
+				if (!avcc) signal_svc = GF_TRUE;
+
+				if (signal_svc && svcc) {
+					if (avcc) {
+						gf_odf_avc_cfg_write(avcc, &dsi, &dsi_size);
+					}
+					gf_odf_avc_cfg_write(svcc, &enh_dsi, &enh_dsi_size);
+					codec_id = is_mvc ? GF_CODECID_MVC : GF_CODECID_SVC;
+				} else {
+					if (avcc) {
+						gf_odf_avc_cfg_write(avcc, &dsi, &dsi_size);
+					}
+					if (svcc) {
+						gf_odf_avc_cfg_write(svcc, &enh_dsi, &enh_dsi_size);
+					}
+					codec_id = GF_CODECID_AVC;
+				}
+			}
+			if (avcc) gf_odf_avc_cfg_del(avcc);
+			if (svcc) gf_odf_avc_cfg_del(svcc);
+		}
+	}
+
+	//all stsd specific init/reconfig
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CODECID, &PROP_UINT(codec_id));
+	if (dsi) {
+		ch->dsi_crc = gf_crc_32(dsi, dsi_size);
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size));
+	}
+	if (enh_dsi) {
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT, &PROP_DATA_NO_COPY(enh_dsi, enh_dsi_size));
+	}
+	if (audio_fmt) {
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(audio_fmt));
+		if (codec_id == GF_CODECID_RAW) {
+			gf_isom_enable_raw_pack(read->mov, track, read->frame_size);
+		}
+	}
+	if (pix_fmt) {
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_PIXFMT, &PROP_UINT(pix_fmt));
+	}
+
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CONFIG_IDX, &PROP_UINT(stsd_idx) );
+
+	w = h = 0;
+	gf_isom_get_visual_info(read->mov, track, stsd_idx, &w, &h);
+	if (w && h) {
+		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));
+
+		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) );
+	}
+	sr = nb_ch = nb_bps = 0;
+	gf_isom_get_audio_info(read->mov,track, stsd_idx, &sr, &nb_ch, &nb_bps);
+	if (sr && nb_ch) {
+		u32 d1, d2;
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sr));
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(nb_ch));
+
+		//to remove once we deprecate master
+		if (!gf_sys_old_arch_compat()) {
+			GF_AudioChannelLayout layout;
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_BPS, &PROP_UINT(nb_bps));
+
+			if (gf_isom_get_audio_layout(read->mov, track, stsd_idx, &layout)==GF_OK) {
+				if (layout.definedLayout) {
+					u64 lay = gf_audio_fmt_get_layout_from_cicp(layout.definedLayout);
+					gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CHANNEL_LAYOUT, &PROP_LONGUINT(lay));
+				}
+
+			}
+
+		}
+
+		if (first_config ) {
+			d1 = gf_isom_get_sample_duration(read->mov, ch->track, 1);
+			d2 = gf_isom_get_sample_duration(read->mov, ch->track, 2);
+			if (d1 && d2 && (d1==d2)) {
+				d1 *= sr;
+				d1 /= ch->time_scale;
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT(d1));
+			}
+		}
+	}
+
+	gf_isom_get_bitrate(read->mov, ch->track, stsd_idx, &avg_rate, &max_rate, &buffer_size);
+
+	if (!avg_rate) {
+		if (first_config && ch->duration) {
+			u64 avgrate = 8 * gf_isom_get_media_data_size(read->mov, ch->track);
+			avgrate = (u64) (avgrate / track_dur);
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_BITRATE, &PROP_UINT((u32) avgrate));
+		}
+	} else {
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_BITRATE, &PROP_UINT((u32) avg_rate));
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_MAXRATE, &PROP_UINT((u32) max_rate));
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DBSIZE, &PROP_UINT((u32) buffer_size));
+	}
+
+	if (mime) gf_filter_pid_set_property_str(ch->pid, "meta:mime", &PROP_STRING(mime) );
+	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) );
+
+	gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_SUBTYPE, &PROP_UINT(m_subtype) );
+	if (stxtcfg) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *)stxtcfg, (u32) strlen(stxtcfg) ));
+
+
+#if !defined(GPAC_DISABLE_ISOM_WRITE)
+	tk_template=NULL;
+	tk_template_size=0;
+	e = gf_isom_get_stsd_template(read->mov, ch->track, stsd_idx, &tk_template, &tk_template_size);
+	if (e == GF_OK) {
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISOM_STSD_TEMPLATE, &PROP_DATA_NO_COPY(tk_template, tk_template_size) );
+	} else {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Failed to serialize stsd box: %s\n", gf_error_to_string(e) ));
+	}
+#endif
+
+	if (codec_id == GF_CODECID_DIMS) {
+		GF_DIMSDescription dims;
+		memset(&dims, 0, sizeof(GF_DIMSDescription));
+
+		gf_isom_get_dims_description(read->mov, ch->track, stsd_idx, &dims);
+		gf_filter_pid_set_property_str(ch->pid, "dims:profile", &PROP_UINT(dims.profile));
+		gf_filter_pid_set_property_str(ch->pid, "dims:level", &PROP_UINT(dims.level));
+		gf_filter_pid_set_property_str(ch->pid, "dims:pathComponents", &PROP_UINT(dims.pathComponents));
+		gf_filter_pid_set_property_str(ch->pid, "dims:fullRequestHost", &PROP_BOOL(dims.fullRequestHost));
+		gf_filter_pid_set_property_str(ch->pid, "dims:streamType", &PROP_BOOL(dims.streamType));
+		gf_filter_pid_set_property_str(ch->pid, "dims:redundant", &PROP_BOOL(dims.containsRedundant));
+		if (dims.content_script_types)
+			gf_filter_pid_set_property_str(ch->pid, "dims:scriptTypes", &PROP_STRING(dims.content_script_types));
+		if (dims.textEncoding)
+			gf_filter_pid_set_property_str(ch->pid, "meta:encoding", &PROP_STRING(dims.textEncoding));
+		if (dims.contentEncoding)
+			gf_filter_pid_set_property_str(ch->pid, "meta:content_encoding", &PROP_STRING(dims.contentEncoding));
+		if (dims.xml_schema_loc)
+			gf_filter_pid_set_property_str(ch->pid, "meta:schemaloc", &PROP_STRING(dims.xml_schema_loc));
+		if (dims.mime_type)
+			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;
+	else if (codec_id==GF_CODECID_HEVC)
+		ch->check_hevc_ps = GF_TRUE;
+
+	if (udesc) {
+		gf_filter_pid_set_property_str(ch->pid, "codec_vendor", &PROP_UINT(udesc->vendor_code));
+		gf_filter_pid_set_property_str(ch->pid, "codec_version", &PROP_UINT(udesc->version));
+		gf_filter_pid_set_property_str(ch->pid, "codec_revision", &PROP_UINT(udesc->revision));
+		gf_filter_pid_set_property_str(ch->pid, "compressor_name", &PROP_STRING(udesc->compressor_name));
+		gf_filter_pid_set_property_str(ch->pid, "temporal_quality", &PROP_UINT(udesc->temporal_quality));
+		gf_filter_pid_set_property_str(ch->pid, "spatial_quality", &PROP_UINT(udesc->spatial_quality));
+		if (udesc->h_res) {
+			gf_filter_pid_set_property_str(ch->pid, "hres", &PROP_UINT(udesc->h_res));
+			gf_filter_pid_set_property_str(ch->pid, "vres", &PROP_UINT(udesc->v_res));
+		} else if (udesc->nb_channels) {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(udesc->nb_channels));
+			switch (udesc->bits_per_sample) {
+			case 8:
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_U8));
+				break;
+			case 16:
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
+				break;
+			case 24:
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S24));
+				break;
+			case 32:
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S32));
+				break;
+			default:
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d unsupported audio bit depth %d\n", track, udesc->bits_per_sample ));
+				break;
+			}
+		}
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_BIT_DEPTH_Y, &PROP_UINT(udesc->depth));
+
+		gf_free(udesc);
+	}
+
+
+	if (ch->check_avc_ps) {
+		ch->avcc = gf_isom_avc_config_get(ch->owner->mov, ch->track, ch->last_sample_desc_index ? ch->last_sample_desc_index : 1);
+	}
+	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);
+	}
+}
+
+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);
+
+}
+
+GF_Err isor_declare_objects(ISOMReader *read)
+{
+	const u8 *tag;
+	u32 tlen;
+	u32 i, count, j, track_id;
+	Bool highest_stream;
+	Bool single_media_found = GF_FALSE;
+	Bool use_iod = GF_FALSE;
+	GF_Err e;
+	Bool isom_contains_video = GF_FALSE;
+	GF_Descriptor *od = gf_isom_get_root_od(read->mov);
+	if (od && gf_list_count(((GF_ObjectDescriptor*)od)->ESDescriptors)) {
+		use_iod = GF_TRUE;
+	}
+	if (od) gf_odf_desc_del(od);
+
+	/*TODO
+	 check for alternate tracks
+    */
+	count = gf_isom_get_track_count(read->mov);
+	for (i=0; i<count; i++) {
+		u32 mtype, m_subtype, streamtype, stsd_idx;
+
+		mtype = gf_isom_get_media_type(read->mov, i+1);
+
+		if (read->tkid) {
+			u32 for_id=0;
+			if (sscanf(read->tkid, "%d", &for_id)) {
+				u32 id = gf_isom_get_track_id(read->mov, i+1);
+				if (id != for_id) continue;
+			} else if (!strcmp(read->tkid, "audio")) {
+				if (mtype!=GF_ISOM_MEDIA_AUDIO) continue;
+			} else if (!strcmp(read->tkid, "video")) {
+				if (mtype!=GF_ISOM_MEDIA_VISUAL) continue;
+			} else if (strlen(read->tkid)==4) {
+				u32 t = GF_4CC(read->tkid[0], read->tkid[1], read->tkid[2], read->tkid[3]);
+				if (mtype!=t) continue;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] Bad format for tkid option %s, no match\n", read->tkid));
+				return GF_BAD_PARAM;
+			}
+		}
+
+		switch (mtype) {
+		case GF_ISOM_MEDIA_AUDIO:
+			streamtype = GF_STREAM_AUDIO;
+			break;
+		case GF_ISOM_MEDIA_VISUAL:
+		case GF_ISOM_MEDIA_AUXV:
+		case GF_ISOM_MEDIA_PICT:
+		case GF_ISOM_MEDIA_QTVR:
+			streamtype = GF_STREAM_VISUAL;
+			isom_contains_video = GF_TRUE;
+			break;
+		case GF_ISOM_MEDIA_TEXT:
+		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_SUBPIC:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
+		case GF_ISOM_MEDIA_CLOSED_CAPTION:
+			streamtype = GF_STREAM_TEXT;
+			break;
+		case GF_ISOM_MEDIA_FLASH:
+		case GF_ISOM_MEDIA_DIMS:
+		case GF_ISOM_MEDIA_SCENE:
+			streamtype = GF_STREAM_SCENE;
+			break;
+		case GF_ISOM_MEDIA_OD:
+			streamtype = GF_STREAM_OD;
+			break;
+		case GF_ISOM_MEDIA_META:
+		case GF_ISOM_MEDIA_TIMECODE:
+			streamtype = GF_STREAM_METADATA;
+			break;
+		/*hint tracks are never exported*/
+		case GF_ISOM_MEDIA_HINT:
+			continue;
+		default:
+			if (!read->allt) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d type %s not supported, ignoring track - you may retry by specifying allt option\n", i+1, gf_4cc_to_str(mtype) ));
+				continue;
+			}
+			streamtype = GF_STREAM_UNKNOWN;
+			break;
+		}
+
+		if (!read->alltk && !read->tkid && !gf_isom_is_track_enabled(read->mov, i+1)) {
+			if (count>1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d is disabled, ignoring track - you may retry by specifying alltk option\n", i+1));
+				continue;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Track %d is disabled but single track in file, considering it enabled\n", i+1 ));
+			}
+		}
+
+		stsd_idx = read->stsd ? read->stsd : 1;
+		//some subtypes are not declared as readable objects
+		m_subtype = gf_isom_get_media_subtype(read->mov, i+1, stsd_idx);
+		switch (m_subtype) {
+		case GF_ISOM_SUBTYPE_HVT1:
+			if (read->smode == MP4DMX_SINGLE)
+				continue;
+
+			break;
+		default:
+			break;
+		}
+
+		/*we declare only the highest video track (i.e the track we play)*/
+		highest_stream = GF_TRUE;
+		track_id = gf_isom_get_track_id(read->mov, i+1);
+		if (read->play_only_track_id && (read->play_only_track_id != track_id)) continue;
+
+		if (read->play_only_first_media) {
+			if (read->play_only_first_media != mtype) continue;
+			if (single_media_found) continue;
+			single_media_found = GF_TRUE;
+		}
+
+		for (j = 0; j < count; j++) {
+			if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_SCAL, track_id) > 0) {
+				highest_stream = GF_FALSE;
+				break;
+			}
+			if (gf_isom_has_track_reference(read->mov, j+1, GF_ISOM_REF_BASE, track_id) > 0) {
+				highest_stream = GF_FALSE;
+				break;
+			}
+		}
+
+		if ((read->smode==MP4DMX_SINGLE) && (gf_isom_get_media_type(read->mov, i+1) == GF_ISOM_MEDIA_VISUAL) && !highest_stream)
+			continue;
+
+
+		isor_declare_track(read, NULL, i+1, stsd_idx, streamtype, use_iod);
+
+		if (read->tkid)
+			break;
+	}
+
+	if (!read->tkid) {
+		/*declare image items*/
+		count = gf_isom_get_meta_item_count(read->mov, GF_TRUE, 0);
+		for (i=0; i<count; i++) {
+			if (! isor_declare_item_properties(read, NULL, i+1))
+				continue;
+
+			if (read->itt) break;
+		}
+	}
+	
+	/*if cover art, declare a video pid*/
+	if (gf_isom_apple_get_tag(read->mov, GF_ISOM_ITUNE_COVER_ART, &tag, &tlen)==GF_OK) {
+
+		/*write cover data*/
+		assert(!(tlen & 0x80000000));
+		tlen &= 0x7FFFFFFF;
+
+		if (read->expart && !isom_contains_video) {
+			GF_FilterPid *cover_pid=NULL;
+			gf_filter_pid_set_property(cover_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+
+			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) ));
+			}
+			if (cover_pid) {
+				u8 *out_buffer;
+				GF_FilterPacket *dst_pck;
+				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);
+				gf_filter_pid_set_eos(cover_pid);
+			}
+		}
+	}
+	return GF_OK;
+}
+
+Bool isor_declare_item_properties(ISOMReader *read, ISOMChannel *ch, u32 item_idx)
+{
+	GF_ImageItemProperties props;
+	GF_FilterPid *pid;
+	GF_ESD *esd;
+	u32 item_id=0;
+	const char *item_name, *item_mime_type, *item_encoding;
+
+	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);
+
+	if (!item_id) return GF_FALSE;
+
+	gf_isom_get_meta_image_props(read->mov, GF_TRUE, 0, item_id, &props);
+
+	esd = gf_media_map_item_esd(read->mov, item_id);
+	if (!esd) return GF_FALSE;
+
+	//OK declare PID
+	if (!ch)
+		pid = gf_filter_pid_new(read->filter);
+	else
+		pid = ch->pid;
+
+	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));
+	if (read->itemid)
+		gf_filter_pid_set_property(pid, GF_PROP_PID_ITEM_ID, &PROP_UINT(item_id));
+		
+	//TODO: no support for LHEVC images
+	//gf_filter_pid_set_property(pid, GF_PROP_PID_DEPENDENCY_ID, &PROP_UINT(esd->dependsOnESID));
+
+	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) {
+		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;
+		esd->decoderConfig->decoderSpecificInfo->dataLength=0;
+	}
+
+	if (props.width && props.height) {
+		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_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));
+	} else {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_PRIMARY_ITEM, &PROP_BOOL(GF_FALSE));
+	}
+
+	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 );
+
+	if (!ch) {
+		/*ch = */isor_create_channel(read, pid, 0, item_id, GF_FALSE);
+	}
+	return GF_TRUE;
+}
+
+#endif /*GPAC_DISABLE_ISOM*/
+
+
+

gpac-1.0.0.tar.gz/src/filters/isoffin_read.c Added

@@ -0,0 +1,1403 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ISOBMFF 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
+ *  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 "isoffin.h"
+
+#ifndef GPAC_DISABLE_ISOM
+
+#include <gpac/crypt_tools.h>
+#include <gpac/media_tools.h>
+
+ISOMChannel *isor_get_channel(ISOMReader *reader, GF_FilterPid *pid)
+{
+	u32 i=0;
+	ISOMChannel *ch;
+	while ((ch = (ISOMChannel *)gf_list_enum(reader->channels, &i))) {
+		if (ch->pid == pid) return ch;
+	}
+	return NULL;
+}
+
+
+static GFINLINE Bool isor_is_local(const char *url)
+{
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (!strnicmp(url, "gmem://", 7)) return GF_TRUE;
+	if (!strnicmp(url, "gfio://", 7)) return GF_TRUE;
+	if (!strnicmp(url, "isobmff://", 10)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	/*the rest is local (mounted on FS)*/
+	return GF_TRUE;
+}
+
+
+static GF_Err isoffin_setup(GF_Filter *filter, ISOMReader *read)
+{
+	char szURL[2048];
+	char *tmp, *src;
+	GF_Err e;
+	const GF_PropertyValue *prop;
+	if (!read) return GF_SERVICE_ERROR;
+
+	if (read->pid) {
+		prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILEPATH);
+		assert(prop);
+		src = prop->value.string;
+	} else {
+		src = read->src;
+	}
+	if (!src)  return GF_SERVICE_ERROR;
+
+	read->src_crc = gf_crc_32(src, (u32) strlen(src));
+
+	strcpy(szURL, src);
+	tmp = gf_file_ext_start(szURL);
+	if (tmp) {
+		Bool truncate = GF_TRUE;
+		tmp = strchr(tmp, '#');
+		if (!tmp && read->pid) {
+			prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_URL);
+			if (prop && prop->value.string) {
+				tmp = gf_file_ext_start(prop->value.string);
+				if (tmp) tmp = strchr(tmp, '#');
+				truncate = GF_FALSE;
+			}
+		}
+		if (tmp) {
+			if (!strnicmp(tmp, "#audio", 6)) {
+				read->play_only_first_media = GF_ISOM_MEDIA_AUDIO;
+			} else if (!strnicmp(tmp, "#video", 6)) {
+				read->play_only_first_media = GF_ISOM_MEDIA_VISUAL;
+			} else if (!strnicmp(tmp, "#auxv", 5)) {
+				read->play_only_first_media = GF_ISOM_MEDIA_AUXV;
+			} else if (!strnicmp(tmp, "#pict", 5)) {
+				read->play_only_first_media = GF_ISOM_MEDIA_PICT;
+			} else if (!strnicmp(tmp, "#text", 5)) {
+				read->play_only_first_media = GF_ISOM_MEDIA_TEXT;
+			} else if (!strnicmp(tmp, "#trackID=", 9)) {
+				read->play_only_track_id = atoi(tmp+9);
+			} else if (!strnicmp(tmp, "#ID=", 4)) {
+				read->play_only_track_id = atoi(tmp+4);
+			} else {
+				read->play_only_track_id = atoi(tmp+1);
+			}
+			if (truncate) tmp[0] = 0;
+		}
+	}
+
+	if (! isor_is_local(szURL)) {
+		return GF_NOT_SUPPORTED;
+	}
+	read->start_range = read->end_range = 0;
+	prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILE_RANGE);
+	if (prop) {
+		read->start_range = prop->value.lfrac.num;
+		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);
+
+	if (e == GF_ISOM_INCOMPLETE_FILE) {
+		read->moov_not_loaded = GF_TRUE;
+		return GF_OK;
+	}
+
+	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_filter_setup_failure(filter, e);
+		return e;
+	}
+	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
+
+	read->time_scale = 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);
+
+	return isor_declare_objects(read);
+}
+
+static void isoffin_delete_channel(ISOMChannel *ch)
+{
+	isor_reset_reader(ch);
+	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);
+	gf_free(ch);
+}
+
+static void isoffin_disconnect(ISOMReader *read)
+{
+	read->disconnected = GF_TRUE;
+	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);
+		isoffin_delete_channel(ch);
+	}
+
+	if (read->mov) gf_isom_close(read->mov);
+	read->mov = NULL;
+
+	read->pid = NULL;
+}
+
+static GF_Err isoffin_reconfigure(GF_Filter *filter, ISOMReader *read, const char *next_url)
+{
+	const GF_PropertyValue *prop;
+	u32 i, count;
+	Bool is_new_mov = GF_FALSE;
+	u64 tfdt;
+	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));
+
+	switch (gf_isom_probe_file_range(next_url, read->start_range, read->end_range)) {
+	//this is a fragment
+	case 3:
+		gf_isom_release_segment(read->mov, 1);
+		gf_isom_reset_fragment_info(read->mov, GF_TRUE);
+
+		if (read->no_order_check) flags |= GF_ISOM_SEGMENT_NO_ORDER_FLAG;
+#ifdef FILTER_FIXME
+		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;
+		}
+
+		for (i=0; i<gf_list_count(read->channels); i++) {
+			ISOMChannel *ch = gf_list_get(read->channels, i);
+			if (ch->last_state==GF_EOS)
+				ch->last_state=GF_OK;
+		}
+
+#ifndef GPAC_DISABLE_LOG
+		if (e<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Error opening new segment %s at UTC "LLU": %s\n", next_url, gf_net_get_utc(), gf_error_to_string(e) ));
+		} 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));
+		}
+#endif
+		break;
+	//this is a movie, reload
+	case 2:
+	case 1:
+		tfdt = gf_isom_get_current_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
+			if (tfdt_val) {
+				sprintf(tfdt_val+5, LLU, 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() ));
+			}
+		}
+
+		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);
+		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) ));
+		}
+		if (read->sigfrag)
+			gf_isom_enable_traf_map_templates(read->mov);
+
+		is_new_mov = GF_TRUE;
+		break;
+	//empty file
+	case 4:
+		return GF_OK;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	gf_filter_post_process_task(filter);
+
+	count = gf_list_count(read->channels);
+	
+	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;
+		//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;
+		}
+		return e;
+	}
+	//segment is the first in our cache, we may need a refresh
+	if (!read->input_loaded) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in progressive mode (download in progress)\n"));
+	} else {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in non-progressive mode (completely downloaded)\n"));
+	}
+
+	isor_check_producer_ref_time(read);
+
+	for (i=0; i<count; i++) {
+		ISOMChannel *ch = gf_list_get(read->channels, i);
+		ch->last_state = GF_OK;
+		ch->eos_sent = GF_FALSE;
+
+		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;
+					ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
+				}
+			} else {
+				ch->track = ch->base_track;
+				ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
+			}
+		}
+
+		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) ));
+
+		//TODO: signal all discontinuities here
+		if (is_new_mov) {
+			ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
+			if (!ch->track) {
+				if (gf_isom_get_track_count(read->mov)==1) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+					ch->track = 1;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Mismatch between track IDs of different representations\n"));
+				}
+			}
+
+			/*we changed our moov structure, sample_num now starts from 0*/
+			ch->sample_num = 0;
+			//this may happen if we reload moov before initializing the channel
+			if (!ch->last_sample_desc_index)
+				ch->last_sample_desc_index = 1;
+			//and update channel config
+			isor_update_channel_config(ch);
+
+			/*restore NAL extraction mode*/
+			gf_isom_set_nalu_extract_mode(read->mov, ch->track, ch->nalu_extract_mode);
+
+			if (ch->is_cenc) {
+				isor_set_crypt_config(ch);
+			}
+		}
+
+		ch->last_state = GF_OK;
+	}
+	return e;
+}
+
+GF_Err isoffin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *prop;
+	ISOMReader *read = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		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)
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+	if (!prop || !prop->value.string) {
+		read->mem_load_mode = 1;
+		if (!read->pid) read->pid = pid;
+		return GF_OK;
+	}
+
+	if (read->pid && prop->value.string) {
+		const char *next_url = prop->value.string;
+		u64 sr, er;
+		u32 crc = gf_crc_32(next_url, (u32) strlen(next_url) );
+
+		sr = er = 0;
+		prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILE_RANGE);
+		if (prop) {
+			sr = prop->value.lfrac.num;
+			er = prop->value.lfrac.den;
+		}
+
+		//if eos is signaled, don't check for crc since we might have the same blob address (same alloc)
+		if (!read->eos_signaled && (read->src_crc == crc) && (read->start_range==sr) && (read->end_range==er)) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] same URL crc and range for %s, skipping reconfigure\n", next_url));
+			return GF_OK;
+		}
+		read->src_crc = crc;
+		read->start_range = sr;
+		read->end_range = er;
+		read->input_loaded = GF_FALSE;
+		read->eos_signaled = GF_FALSE;
+		
+		//we need to reconfigure
+		return isoffin_reconfigure(filter, read, next_url);
+	}
+
+	read->pid = pid;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_CACHED);
+	if (prop && prop->value.boolean) {
+		GF_FilterEvent evt;
+		read->input_loaded = GF_TRUE;
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY_HINT, pid);
+		evt.play.full_file_only=1;
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	return isoffin_setup(filter, read);
+}
+
+GF_Err isoffin_initialize(GF_Filter *filter)
+{
+	ISOMReader *read = gf_filter_get_udta(filter);
+	GF_Err e = GF_OK;
+	read->filter = filter;
+	read->channels = gf_list_new();
+
+	if (read->src) {
+		read->input_loaded = GF_TRUE;
+		return isoffin_setup(filter, read);
+	}
+	else if (read->mov) {
+		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);
+
+		if (read->sigfrag) {
+			gf_isom_enable_traf_map_templates(read->mov);
+		}
+
+		if (read->catseg) {
+			e = gf_isom_open_segment(read->mov, read->catseg, 0, 0, 0);
+		}
+		if (!e)
+			e = isor_declare_objects(read);
+
+		gf_filter_post_process_task(filter);
+	}
+	return e;
+}
+
+
+static void isoffin_finalize(GF_Filter *filter)
+{
+	ISOMReader *read = (ISOMReader *) gf_filter_get_udta(filter);
+
+	read->disconnected = GF_TRUE;
+
+	while (gf_list_count(read->channels)) {
+		ISOMChannel *ch = (ISOMChannel *)gf_list_get(read->channels, 0);
+		gf_list_rem(read->channels, 0);
+		isoffin_delete_channel(ch);
+	}
+	gf_list_del(read->channels);
+
+	if (!read->extern_mov && read->mov) gf_isom_close(read->mov);
+	read->mov = NULL;
+
+	if (read->mem_blob.data) gf_free(read->mem_blob.data);
+	if (read->mem_url) gf_free(read->mem_url);
+}
+
+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;
+	const char *kms_uri, *scheme_uri;
+	Bool selectiveEncryption=0;
+	u32 IVLength=0;
+	u32 KeyIndicationLength=0;
+	const char *txtHdr=NULL;
+	const char *contentID=NULL;
+	u32 txtHdrLen=0;
+	u64 plainTextLen=0;
+	u32 crypt_type=0;
+	u32 stsd_idx = ch->owner->stsd ? ch->owner->stsd : 1;
+
+	if (!ch->is_encrypted) return;
+
+	scheme_type = scheme_version = 0;
+	kms_uri = scheme_uri = NULL;
+
+	/*ugly fix to detect when an stsd uses both clear and encrypted sample descriptions*/
+	count = gf_isom_get_sample_description_count(ch->owner->mov, ch->track);
+	if (count>1) {
+		u32 first_crypted_stsd = 0;
+		u32 nb_same_mtype = 1;
+		u32 nb_clear=0, nb_encrypted=0;
+		u32 base_subtype = 0;
+		Bool first_is_clear = GF_FALSE;
+		for (i=0; i<count; i++) {
+			u32 mtype = gf_isom_get_media_subtype(ch->owner->mov, ch->track, i+1);
+			if ( gf_isom_is_media_encrypted(ch->owner->mov, track, i+1)) {
+				gf_isom_get_original_format_type(ch->owner->mov, ch->track, i+1, &mtype);
+				nb_encrypted++;
+				if (!first_crypted_stsd) first_crypted_stsd = i+1;
+			} else {
+				nb_clear++;
+				if (!i) first_is_clear = GF_TRUE;
+			}
+			if (!i) base_subtype = mtype;
+			else if (base_subtype==mtype) {
+				nb_same_mtype++;
+			}
+		}
+		if ((nb_same_mtype==count) && (nb_clear==nb_encrypted)) {
+			gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_STSD_MODE, &PROP_UINT(first_is_clear ? 1 : 2) );
+			stsd_idx = first_crypted_stsd;
+		}
+
+	}
+
+	if (gf_isom_is_ismacryp_media(mov, track, stsd_idx)) {
+		gf_isom_get_ismacryp_info(mov, track, stsd_idx, NULL, &scheme_type, &scheme_version, &scheme_uri, &kms_uri, &selectiveEncryption, &IVLength, &KeyIndicationLength);
+	} else if (gf_isom_is_omadrm_media(mov, track, stsd_idx)) {
+		//u8 hash[20];
+		gf_isom_get_omadrm_info(mov, track, stsd_idx, NULL, &scheme_type, &scheme_version, &contentID, &kms_uri, &txtHdr, &txtHdrLen, &plainTextLen, &crypt_type, &selectiveEncryption, &IVLength, &KeyIndicationLength);
+
+		//gf_media_get_file_hash(gf_isom_get_filename(mov), hash);
+	} 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);
+
+		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;
+		scheme_version = 1;
+		scheme_type = GF_ISOM_ADOBE_SCHEME;
+		const char *metadata = NULL;
+
+		gf_isom_get_adobe_protection_info(mov, track, stsd_idx, &ofmt, &scheme_type, &scheme_version, &metadata);
+		if (metadata)
+			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_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) );
+
+	if (selectiveEncryption) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISMA_SELECTIVE_ENC, &PROP_BOOL(GF_TRUE) );
+	if (IVLength) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISMA_IV_LENGTH, &PROP_UINT(IVLength) );
+	if (KeyIndicationLength) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_ISMA_KI_LENGTH, &PROP_UINT(KeyIndicationLength) );
+	if (crypt_type) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_OMA_CRYPT_TYPE, &PROP_UINT(crypt_type) );
+	if (contentID) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_OMA_CID, &PROP_STRING(contentID) );
+	if (txtHdr) gf_filter_pid_set_property(ch->pid, GF_PROP_PID_OMA_TXT_HDR, &PROP_STRING(txtHdr) );
+	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) );
+
+		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);
+
+		gf_filter_pid_set_property(ch->pid, GF_PROP_PID_CENC_STORE, &PROP_UINT(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) ) );
+	}
+}
+
+
+ISOMChannel *isor_create_channel(ISOMReader *read, GF_FilterPid *pid, u32 track, u32 item_id, Bool force_no_extractors)
+{
+	ISOMChannel *ch;
+	const GF_PropertyValue *p;
+	s64 ts_shift;
+	if (!read->mov) return NULL;
+
+	GF_SAFEALLOC(ch, ISOMChannel);
+	if (!ch) {
+		return NULL;
+	}
+	ch->owner = read;
+	ch->pid = pid;
+	ch->to_init = GF_TRUE;
+	gf_list_add(read->channels, ch);
+	ch->track = track;
+	ch->item_id = item_id;
+
+	ch->nalu_extract_mode = 0;
+	ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
+	switch (gf_isom_get_media_type(ch->owner->mov, ch->track)) {
+	case GF_ISOM_MEDIA_OCR:
+		ch->streamType = GF_STREAM_OCR;
+		break;
+	case GF_ISOM_MEDIA_SCENE:
+		ch->streamType = GF_STREAM_SCENE;
+		break;
+	case GF_ISOM_MEDIA_VISUAL:
+	case GF_ISOM_MEDIA_AUXV:
+	case GF_ISOM_MEDIA_PICT:
+		gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
+		//use base track only if avc/svc or hevc/lhvc. If avc+lhvc we need different rules
+		if ( gf_isom_get_avc_svc_type(ch->owner->mov, ch->base_track, 1) == GF_ISOM_AVCTYPE_AVC_ONLY) {
+			if ( gf_isom_get_hevc_lhvc_type(ch->owner->mov, ch->track, 1) >= GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+				ch->base_track=0;
+			}
+		}
+		ch->next_track = 0;
+		/*in scalable mode add SPS/PPS in-band*/
+		if (ch->base_track)
+			ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG /*| GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG*/;
+		break;
+	}
+	if (!read->noedit) {
+		ch->ts_offset = 0;
+		ch->has_edit_list = gf_isom_get_edit_list_type(ch->owner->mov, ch->track, &ch->ts_offset) ? GF_TRUE : GF_FALSE;
+		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) );
+		}
+	} 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);
+
+	ts_shift = gf_isom_get_cts_to_dts_shift(ch->owner->mov, ch->track);
+	if (ts_shift) {
+		gf_filter_pid_set_property(pid, GF_PROP_PID_CTS_SHIFT, &PROP_UINT((u32) ts_shift) );
+	}
+
+	if (!track || !gf_isom_is_track_encrypted(read->mov, track)) {
+		if (force_no_extractors) {
+			ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_LAYER_ONLY;
+		} else {
+			switch (read->smode) {
+			case MP4DMX_SPLIT_EXTRACTORS:
+				ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_TILE_ONLY;
+				break;
+			case MP4DMX_SPLIT:
+				ch->nalu_extract_mode = GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_TILE_ONLY;
+				break;
+			default:
+				break;
+			}
+		}
+
+		if (ch->nalu_extract_mode) {
+			gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
+		}
+		return ch;
+	}
+	if (ch->owner->nocrypt) {
+		ch->is_encrypted = GF_FALSE;
+		return ch;
+	}
+	ch->is_encrypted = GF_TRUE;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) gf_filter_pid_set_property(pid, GF_PROP_PID_ORIG_STREAM_TYPE, &PROP_UINT(p->value.uint) );
+
+	gf_filter_pid_set_property(pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_ENCRYPTED) );
+
+	isor_set_crypt_config(ch);
+
+	if (ch->nalu_extract_mode) {
+		if (ch->is_encrypted) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] using sample NAL rewrite with encryption is not yet supported, patch welcome\n"));
+		} else {
+			gf_isom_set_nalu_extract_mode(ch->owner->mov, ch->track, ch->nalu_extract_mode);
+		}
+	}
+	return ch;
+}
+
+/*switch channel quality. Return next channel or current channel if error*/
+static
+u32 isoffin_channel_switch_quality(ISOMChannel *ch, GF_ISOFile *the_file, Bool switch_up)
+{
+	u32 i, count, next_track, trackID, cur_track;
+	s32 ref_count;
+
+	cur_track = ch->next_track ? ch->next_track : ch->track;
+	count = gf_isom_get_track_count(the_file);
+	trackID = gf_isom_get_track_id(the_file, cur_track);
+	next_track = 0;
+
+	if (switch_up) {
+		for (i = 0; i < count; i++) {
+			ref_count = gf_isom_get_reference_count(the_file, i+1, GF_ISOM_REF_SCAL);
+			if (ref_count < 0)
+				return cur_track; //error
+			if (ref_count == 0)
+				continue;
+			/*next track is the one that has the last reference of type GF_ISOM_REF_SCAL refers to this current track*/
+			if ((u32)ref_count == gf_isom_has_track_reference(the_file, i+1, GF_ISOM_REF_SCAL, trackID)) {
+				next_track = i+1;
+				break;
+			}
+		}
+		/*this is the highest quality*/
+		if (!next_track)
+			return cur_track;
+	} else {
+		if (cur_track == ch->base_track)
+			return cur_track;
+		ref_count = gf_isom_get_reference_count(the_file, cur_track, GF_ISOM_REF_SCAL);
+		if (ref_count <= 0)
+			return cur_track;
+		gf_isom_get_reference(the_file, cur_track, GF_ISOM_REF_SCAL, ref_count, &next_track);
+		if (!next_track)
+			return cur_track;
+	}
+
+	/*in scalable mode add SPS/PPS in-band*/
+	gf_isom_set_nalu_extract_mode(the_file, next_track, ch->nalu_extract_mode);
+
+	return next_track;
+}
+
+static Bool isoffin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 count, i;
+	Bool cancel_event = GF_TRUE;
+	ISOMChannel *ch;
+	ISOMReader *read = gf_filter_get_udta(filter);
+
+	if (!read || read->disconnected) return GF_FALSE;
+
+	if (evt->base.type == GF_FEVT_QUALITY_SWITCH) {
+		count = gf_list_count(read->channels);
+		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()) {
+				isoffin_channel_switch_quality(ch, read->mov, evt->quality_switch.up);
+			}
+#endif
+
+		}
+		return GF_TRUE;
+	}
+
+	if (!evt->base.on_pid) return GF_FALSE;
+
+	ch = isor_get_channel(read, evt->base.on_pid);
+	if (!ch)
+		return GF_FALSE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		isor_reset_reader(ch);
+		ch->eos_sent = GF_FALSE;
+		ch->speed = evt->play.speed;
+		ch->initial_play_seen = GF_TRUE;
+		read->reset_frag_state = 1;
+		if (read->frag_type)
+			read->frag_type = 1;
+
+		ch->start = ch->end = 0;
+		if (evt->play.speed>=0) {
+			Double t;
+			if (evt->play.start_range>=0) {
+				t = evt->play.start_range;
+				t *= ch->time_scale;
+				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;
+					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);
+			if (end <= evt->play.start_range)
+				ch->end = (u64) (s64) (end  * ch->time_scale);
+		}
+		ch->playing = GF_TRUE;
+		ch->sample_num = evt->play.from_pck;
+
+		ch->sap_only = evt->play.drop_non_ref ? GF_TRUE : GF_FALSE;
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[IsoMedia] Starting channel playback "LLD" to "LLD" (%g to %g)\n", ch->start, ch->end, evt->play.start_range, evt->play.end_range));
+
+		if (!read->nb_playing)
+			gf_isom_reset_seq_num(read->mov);
+
+		if (read->is_partial_download) read->input_loaded = GF_FALSE;
+
+		if (evt->play.no_byterange_forward) {
+			//new segment will be loaded, reset
+			gf_isom_reset_tables(read->mov, GF_TRUE);
+			gf_isom_reset_data_offset(read->mov, NULL);
+			read->refresh_fragmented = GF_TRUE;
+			//send play event
+			cancel_event = GF_FALSE;
+		} else if (!read->nb_playing && read->pid && !read->input_loaded) {
+			GF_FilterEvent fevt;
+			Bool is_sidx_seek = GF_FALSE;
+			u64 max_offset = GF_FILTER_NO_BO;
+			count = gf_list_count(read->channels);
+
+			//try sidx
+			if (read->frag_type) {
+				u32 ts;
+				u64 dur=0;
+				GF_Err e = gf_isom_get_file_offset_for_time(read->mov, evt->play.start_range, &max_offset);
+				if (e==GF_OK) {
+					gf_isom_reset_tables(read->mov, GF_TRUE);
+					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;
+						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));
+						}
+					}
+				}
+			}
+
+			if (!is_sidx_seek) {
+				for (i=0; i< count; i++) {
+					u32 mode, sample_desc_index, sample_num;
+					u64 data_offset;
+					GF_Err e;
+					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);
+
+					/*take care of seeking out of the track range*/
+					if (!read->frag_type && (ch->duration < time)) {
+						e = gf_isom_get_sample_for_movie_time(read->mov, ch->track, ch->duration, 	&sample_desc_index, mode, NULL, &sample_num, &data_offset);
+					} else {
+						e = gf_isom_get_sample_for_movie_time(read->mov, ch->track, time, &sample_desc_index, mode, NULL, &sample_num, &data_offset);
+					}
+					if ((e == GF_OK) && (data_offset<max_offset))
+						max_offset = data_offset;
+				}
+			}
+
+			if ((evt->play.start_range || read->is_partial_download)  && (max_offset != GF_FILTER_NO_BO) ) {
+
+				//send a seek request
+				read->is_partial_download = GF_TRUE;
+				read->wait_for_source = GF_TRUE;
+				read->refresh_fragmented = GF_TRUE;
+
+				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, read->pid);
+				fevt.seek.start_offset = max_offset;
+				gf_filter_pid_send_event(read->pid, &fevt);
+				gf_isom_set_byte_offset(read->mov, is_sidx_seek ? 0 : max_offset);
+
+			}
+		}
+		//always request a process task upon a play
+		gf_filter_post_process_task(read->filter);
+		read->nb_playing++;
+		//cancel event unless dash mode
+		return cancel_event;
+
+	case GF_FEVT_STOP:
+ 		if (read->nb_playing) read->nb_playing--;
+		isor_reset_reader(ch);
+		//don't send a stop if some of our channels are still waiting for initial play
+		for (i=0; i<gf_list_count(read->channels); i++) {
+			ISOMChannel *a_ch = gf_list_get(read->channels, i);
+			if (ch==a_ch) continue;
+			if (!a_ch->initial_play_seen) return GF_TRUE;
+		}
+		//cancel event if nothing playing
+		if (read->nb_playing) return GF_TRUE;
+		read->input_is_stop = GF_TRUE;
+		return GF_FALSE;
+
+	case GF_FEVT_SET_SPEED:
+	case GF_FEVT_RESUME:
+		ch->speed = evt->play.speed;
+		if (ch->sap_only && !evt->play.drop_non_ref) {
+			ch->sap_only = 2;
+		} else {
+			ch->sap_only = evt->play.drop_non_ref ? GF_TRUE : GF_FALSE;
+		}
+		//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 void isoffin_push_buffer(GF_Filter *filter, ISOMReader *read, const u8 *pck_data, u32 data_size)
+{
+	u64 bytes_missing;
+	GF_Err e;
+
+	if (!read->mem_url) {
+		char szPath[200];
+		sprintf(szPath, "gmem://%p", &read->mem_blob);
+		read->mem_url = gf_strdup(szPath);
+	}
+	read->mem_blob.data = gf_realloc(read->mem_blob.data, read->mem_blob.size + data_size);
+	memcpy(read->mem_blob.data + read->mem_blob.size, pck_data, data_size);
+	read->mem_blob.size += data_size;
+
+	if (read->mem_load_mode==1) {
+		u32 box_type;
+		e = gf_isom_open_progressive_ex(read->mem_url, 0, 0, GF_FALSE, &read->mov, &bytes_missing, &box_type);
+
+		if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
+			gf_filter_setup_failure(filter, e);
+			read->mem_load_mode = 0;
+			read->in_error = e;
+			return;
+		}
+		if (!read->mov) {
+			switch (box_type) {
+			case GF_4CC('m','d','a','t'):
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IsoMedia] non fragmented ISOBMFF with moof after mdat and no underlying file cache (pipe or other stream input), not supported !\n"));
+				gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+				read->mem_load_mode = 0;
+				read->in_error = GF_NOT_SUPPORTED;
+				break;
+			default:
+				read->moov_not_loaded = GF_TRUE;
+				break;
+			}
+			return;
+		}
+
+		read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
+		read->time_scale = gf_isom_get_timescale(read->mov);
+		isor_declare_objects(read);
+		read->mem_load_mode = 2;
+		read->moov_not_loaded = GF_FALSE;
+		return;
+	}
+	//refresh file
+	gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
+}
+
+static void isoffin_purge_mem(ISOMReader *read, u64 min_offset)
+{
+	u32 i, count;
+	u64 top_offset;
+	u32 nb_bytes_to_purge;
+	u64 bytes_missing;
+
+	//purge every
+	if (read->mstore_purge && (min_offset - read->last_min_offset < read->mstore_purge))
+		return;
+
+	if (read->frag_type) {
+		//get position of current box being parsed - if new offset is greater than this box we cannot remove
+		//bytes (we would trash the top-level box header)
+		gf_isom_get_current_top_box_offset(read->mov, &top_offset);
+		if (top_offset<min_offset) {
+			return;
+		}
+	}
+	read->last_min_offset = min_offset;
+
+	assert(min_offset>=read->bytes_removed);
+	//min_offset is given in absolute file position
+	nb_bytes_to_purge = (u32) (min_offset - read->bytes_removed);
+	assert(nb_bytes_to_purge<=read->mem_blob.size);
+
+	memmove(read->mem_blob.data, read->mem_blob.data+nb_bytes_to_purge, read->mem_blob.size - nb_bytes_to_purge);
+	read->mem_blob.size -= nb_bytes_to_purge;
+	read->bytes_removed += nb_bytes_to_purge;
+	gf_isom_set_removed_bytes(read->mov, read->bytes_removed);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[IsoMedia] mem mode %d bytes in mem, "LLU" bytes trashed since start\n", read->mem_blob.size, read->bytes_removed));
+
+	//force a refresh
+	gf_isom_refresh_fragmented(read->mov, &bytes_missing, read->mem_url);
+
+	if (!read->frag_type)
+		return;
+
+	//fragmented file, cleanup sample tables
+	count = gf_list_count(read->channels);
+	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)
+			ch->sample_num = 1;
+
+		num_samples = gf_isom_get_sample_count(read->mov, ch->track);
+		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));
+	}
+}
+
+static GF_Err isoffin_process(GF_Filter *filter)
+{
+	ISOMReader *read = gf_filter_get_udta(filter);
+	u32 i, count = gf_list_count(read->channels);
+	Bool is_active = GF_FALSE;
+	Bool in_is_eos = GF_FALSE;
+	Bool has_new_data = GF_FALSE;
+	u64 min_offset_plus_one = 0;
+	if (read->in_error)
+		return read->in_error;
+
+	if (read->pid) {
+		Bool fetch_input = GF_TRUE;
+		if (read->mem_load_mode==2) {
+			if (!read->force_fetch && read->mem_blob.size > read->mstore_size) {
+				fetch_input = GF_FALSE;
+			}
+			read->force_fetch = GF_FALSE;
+		}
+		while (fetch_input) {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(read->pid);
+			if (!pck) {
+				//we issued a seek, wait for the first packet to be received before fetching channels
+				//otherwise we could end up reading from the wrong cache
+				if (read->wait_for_source) {
+					//something went wrong during the seek request
+					if (gf_filter_pid_is_eos(read->pid))
+						return GF_EOS;
+					return GF_OK;
+				}
+				break;
+			}
+			read->wait_for_source = GF_FALSE;
+
+			if (read->mem_load_mode) {
+				u32 data_size;
+				const u8 *pck_data = gf_filter_pck_get_data(pck, &data_size);
+				isoffin_push_buffer(filter, read, pck_data, data_size);
+			}
+			gf_filter_pid_drop_packet(read->pid);
+			has_new_data = GF_TRUE;
+			if (read->in_error)
+				return read->in_error;
+		}
+		if (gf_filter_pid_is_eos(read->pid)) {
+			read->input_loaded = GF_TRUE;
+			in_is_eos = GF_TRUE;
+		}
+		if (read->input_is_stop) {
+			read->input_loaded = GF_TRUE;
+			in_is_eos = GF_TRUE;
+			read->input_is_stop = GF_FALSE;
+		}
+		if (!read->frag_type && read->input_loaded) {
+			in_is_eos = GF_TRUE;
+		}
+	} else if (read->extern_mov) {
+		in_is_eos = GF_TRUE;
+		read->input_loaded = GF_TRUE;
+	}
+	if (read->moov_not_loaded) {
+		if (read->mem_load_mode)
+			return GF_OK;
+		read->moov_not_loaded = GF_FALSE;
+		return isoffin_setup(filter, read);
+	}
+
+	if (read->refresh_fragmented) {
+		const GF_PropertyValue *prop;
+
+		if (in_is_eos) {
+			read->refresh_fragmented = GF_FALSE;
+		} else {
+			prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILE_CACHED);
+			if (prop && prop->value.boolean)
+				read->refresh_fragmented = GF_FALSE;
+		}
+
+		if (has_new_data) {
+			u64 bytesMissing=0;
+			GF_Err e;
+			const char *new_url = NULL;
+			prop = gf_filter_pid_get_property(read->pid, GF_PROP_PID_FILEPATH);
+			if (prop) new_url = prop->value.string;
+
+			e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, new_url);
+
+			if (e && (e!= GF_ISOM_INCOMPLETE_FILE)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[IsoMedia] Failed to refresh current segment: %s\n", gf_error_to_string(e) ));
+				read->refresh_fragmented = GF_FALSE;
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refreshing current segment at UTC "LLU" - "LLU" bytes still missing - input is EOS %d\n", gf_net_get_utc(), bytesMissing, in_is_eos));
+			}
+
+			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 ));
+			}
+
+#ifndef GPAC_DISABLE_LOG
+			if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
+				for (i=0; i<count; i++) {
+					ISOMChannel *ch = gf_list_get(read->channels, i);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
+				}
+			}
+#endif
+			isor_check_producer_ref_time(read);
+			if (!read->frag_type)
+				read->refresh_fragmented = GF_FALSE;
+		}
+	}
+
+	for (i=0; i<count; i++) {
+		u8 *data;
+		u32 nb_pck=50;
+		ISOMChannel *ch;
+		ch = gf_list_get(read->channels, i);
+		if (!ch->playing) {
+			continue;
+		}
+		//eos not sent on this channel, we are active
+		if (!ch->eos_sent)
+			is_active = GF_TRUE;
+
+		while (nb_pck) {
+			ch->sample_data_offset = 0;
+			if (!read->full_segment_flush && gf_filter_pid_would_block(ch->pid) )
+				break;
+
+			if (ch->item_id) {
+				isor_reader_get_sample_from_item(ch);
+			} else {
+				isor_reader_get_sample(ch);
+			}
+
+			if (read->stsd && (ch->last_sample_desc_index != read->stsd) && ch->sample) {
+				isor_reader_release_sample(ch);
+				continue;
+			}
+			if (ch->sample) {
+				u32 sample_dur;
+				u8 dep_flags;
+				GF_FilterPacket *pck;
+				if (ch->needs_pid_reconfig) {
+					isor_update_channel_config(ch);
+					ch->needs_pid_reconfig = GF_FALSE;
+				}
+
+				//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);
+
+				gf_filter_pck_set_dts(pck, ch->dts);
+				gf_filter_pck_set_cts(pck, ch->cts);
+				if (ch->sample->IsRAP==-1) {
+					gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+					ch->redundant = 1;
+				} else {
+					gf_filter_pck_set_sap(pck, (GF_FilterSAPType) ch->sample->IsRAP);
+				}
+
+				if (ch->sap_3)
+					gf_filter_pck_set_sap(pck, GF_FILTER_SAP_3);
+				else if (ch->sap_4) {
+					gf_filter_pck_set_sap(pck, GF_FILTER_SAP_4);
+					gf_filter_pck_set_roll_info(pck, ch->roll);
+				}
+
+				sample_dur = ch->au_duration;
+				if (ch->sample->nb_pack)
+					sample_dur *= ch->sample->nb_pack;
+				gf_filter_pck_set_duration(pck, sample_dur);
+				gf_filter_pck_set_seek_flag(pck, ch->seek_flag);
+
+				dep_flags = ch->isLeading;
+				dep_flags <<= 2;
+				dep_flags |= ch->dependsOn;
+				dep_flags <<= 2;
+				dep_flags |= ch->dependedOn;
+				dep_flags <<= 2;
+				dep_flags |= ch->redundant;
+
+				if (dep_flags)
+					gf_filter_pck_set_dependency_flags(pck, dep_flags);
+
+				gf_filter_pck_set_crypt_flags(pck, ch->pck_encrypted ? GF_FILTER_PCK_CRYPT : 0);
+				gf_filter_pck_set_seq_num(pck, ch->sample_num);
+
+				/**/
+				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);
+					gf_filter_pck_set_property(pck, GF_PROP_PCK_CENC_SAI, &PROP_DATA(ch->sai_buffer, ch->sai_buffer_size) );
+				}
+
+				if (read->sigfrag) {
+					GF_ISOFragmentBoundaryInfo finfo;
+					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;
+						gf_filter_pck_set_property(pck, GF_PROP_PCK_FRAG_START, &PROP_UINT(traf_start));
+
+						start = finfo.frag_start;
+						if (finfo.seg_start_plus_one) start = finfo.seg_start_plus_one-1;
+						gf_filter_pck_set_property(pck, GF_PROP_PCK_FRAG_RANGE, &PROP_FRAC64_INT(start, finfo.mdat_end));
+						if (finfo.moof_template) {
+							gf_filter_pck_set_property(pck, GF_PROP_PCK_MOOF_TEMPLATE, &PROP_DATA((u8 *)finfo.moof_template, finfo.moof_template_size));
+						}
+						if (finfo.sidx_end) {
+							gf_filter_pck_set_property(pck, GF_PROP_PCK_SIDX_RANGE, &PROP_FRAC64_INT(finfo.sidx_start , finfo.sidx_end));
+						}
+					}
+				}
+				if (ch->sender_ntp) {
+					gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(ch->sender_ntp));
+					if (ch->ntp_at_server_ntp) {
+						gf_filter_pck_set_property(pck, GF_PROP_PCK_RECEIVER_NTP, &PROP_LONGUINT(ch->ntp_at_server_ntp));
+					}
+				}
+				ch->eos_sent = GF_FALSE;
+				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 (in_is_eos && !ch->eos_sent) {
+					ch->eos_sent = GF_TRUE;
+					read->eos_signaled = GF_TRUE;
+					gf_filter_pid_set_eos(ch->pid);
+				}
+				break;
+			} else {
+				read->force_fetch = GF_TRUE;
+				break;
+			}
+		}
+		if (!min_offset_plus_one || (min_offset_plus_one - 1 > ch->last_valid_sample_data_offset))
+			min_offset_plus_one = 1 + ch->last_valid_sample_data_offset;
+	}
+	if (read->mem_load_mode && min_offset_plus_one) {
+		isoffin_purge_mem(read, min_offset_plus_one-1);
+	}
+
+	if (!is_active) {
+		return GF_EOS;
+	}
+	//if (in_is_eos)
+	gf_filter_ask_rt_reschedule(filter, 1);
+	return GF_OK;
+
+}
+
+static const char *isoffin_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (gf_isom_probe_data(data, size)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "video/mp4";
+	}
+	return NULL;
+}
+
+#define OFFS(_n)	#_n, offsetof(ISOMReader, _n)
+
+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(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},
+	{ OFFS(smode), "load mode for scalable/tile tracks\n"
+	"- 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(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, "true", 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"
+	"- 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(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(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_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},
+
+	{0}
+};
+
+static const GF_FilterCapability ISOFFInCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mp4|mpg4|m4a|m4i|3gp|3gpp|3g2|3gp2|iso|m4s|heif|heic|avci|mj2|mov|qt"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_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"),
+	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_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_METADATA),
+	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.
+};
+
+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"
+		"# 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"
+		" - #video: only use the first video track\n"
+		" - #auxv: only use the first auxiliary video track\n"
+		" - #pict: only use the first picture track\n"
+		" - #text: only use the first text track\n"
+		" - #trackID=VAL: only use the track with given ID\n"
+		" - #ID=VAL: only use the track with given ID\n"
+		" - #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")
+	.private_size = sizeof(ISOMReader),
+	.args = ISOFFInArgs,
+	.initialize = isoffin_initialize,
+	.finalize = isoffin_finalize,
+	.process = isoffin_process,
+	.configure_pid = isoffin_configure_pid,
+	SETCAPS(ISOFFInCaps),
+	.process_event = isoffin_process_event,
+	.probe_data = isoffin_probe_data
+};
+
+
+#endif /*GPAC_DISABLE_ISOM*/
+
+const GF_FilterRegister *isoffin_register(GF_FilterSession *session)
+{
+#ifdef GPAC_DISABLE_ISOM
+	return NULL;
+#else
+	return &ISOFFInRegister;
+#endif /*GPAC_DISABLE_ISOM*/
+}
+

gpac-1.0.0.tar.gz/src/filters/isoffin_read_ch.c Added

@@ -0,0 +1,676 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ISOBMFF 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
+ *  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 "isoffin.h"
+
+#ifndef GPAC_DISABLE_ISOM
+#include <gpac/network.h>
+
+
+void isor_reset_reader(ISOMChannel *ch)
+{
+	ch->last_state = GF_OK;
+	isor_reader_release_sample(ch);
+
+	if (ch->static_sample) {
+		ch->static_sample->dataLength = ch->static_sample->alloc_size;
+		gf_isom_sample_del(&ch->static_sample);
+	}
+	ch->sample = NULL;
+	ch->sample_num = 0;
+	ch->speed = 1.0;
+	ch->start = ch->end = 0;
+	ch->to_init = 1;
+	ch->playing = GF_FALSE;
+	if (ch->sai_buffer) gf_free(ch->sai_buffer);
+	ch->sai_buffer = NULL;
+	ch->sai_alloc_size = 0;
+	ch->dts = ch->cts = 0;
+	ch->seek_flag = 0;
+}
+
+void isor_check_producer_ref_time(ISOMReader *read)
+{
+	GF_ISOTrackID trackID;
+	u64 ntp;
+	u64 timestamp;
+
+	if (gf_sys_is_test_mode()) {
+		return;
+	}
+
+	if (gf_isom_get_last_producer_time_box(read->mov, &trackID, &ntp, &timestamp, GF_TRUE)) {
+#if !defined(_WIN32_WCE) && !defined(GPAC_DISABLE_LOG)
+
+		if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_DEBUG)) {
+			time_t secs;
+			struct tm t;
+
+			s32 diff = gf_net_get_ntp_diff_ms(ntp);
+
+			secs = (ntp>>32) - GF_NTP_SEC_1900_TO_1970;
+			t = *gf_gmtime(&secs);
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] TrackID %d: Timestamp "LLU" matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ - NTP clock diff (local - remote): %d ms\n", trackID, timestamp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, diff));
+		}
+#endif
+		read->last_sender_ntp = ntp;
+		read->cts_for_last_sender_ntp = timestamp;
+		read->ntp_at_last_sender_ntp = gf_net_get_ntp_ts();
+	}
+}
+
+
+static void init_reader(ISOMChannel *ch)
+{
+	u32 sample_desc_index=0;
+
+	ch->au_seq_num = 1;
+
+	assert(ch->sample==NULL);
+	if (!ch->static_sample) {
+		ch->static_sample = gf_isom_sample_new();
+	}
+
+	if (ch->streamType==GF_STREAM_OCR) {
+		assert(!ch->sample);
+		ch->sample = gf_isom_sample_new();
+		ch->sample->IsRAP = RAP;
+		ch->sample->DTS = ch->start;
+		ch->last_state=GF_OK;
+	} else if (ch->sample_num) {
+		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);
+		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
+		u32 mode = ch->disable_seek ? GF_ISOM_SEARCH_BACKWARD : GF_ISOM_SEARCH_SYNC_BACKWARD;
+
+		/*take care of seeking out of the track range*/
+		if (!ch->owner->frag_type && (ch->duration<=ch->start)) {
+			ch->last_state = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->duration-1, &sample_desc_index, mode, &ch->static_sample, &ch->sample_num, &ch->sample_data_offset);
+		} else if (ch->start || ch->has_edit_list) {
+			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->sample) ch->last_state = GF_EOS;
+		}
+		if (ch->last_state) {
+			ch->sample = NULL;
+			ch->last_state = GF_OK;
+		} else {
+			ch->sample = ch->static_sample;
+		}
+
+		if (ch->has_rap && ch->has_edit_list) {
+			ch->edit_sync_frame = ch->sample_num;
+		}
+
+		if (ch->sample && !ch->sample->data && ch->owner->frag_type && !ch->has_edit_list) {
+			ch->sample = NULL;
+			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);
+		}
+	}
+
+
+	/*no sample means we're not in the track range - stop*/
+	if (!ch->sample) {
+		/*incomplete file - check if we're still downloading or not*/
+		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
+			if (!ch->owner->input_loaded) {
+				ch->last_state = GF_OK;
+				return;
+			}
+			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
+		} else if (ch->sample_num) {
+			ch->last_state = (ch->owner->frag_type==1) ? GF_OK : GF_EOS;
+			ch->to_init = 0;
+		}
+		return;
+	}
+
+	ch->sample_time = ch->sample->DTS;
+
+	ch->to_init = GF_FALSE;
+
+	ch->seek_flag = 0;
+	if (ch->disable_seek) {
+		ch->dts = ch->sample->DTS;
+		ch->cts = ch->sample->DTS + ch->sample->CTS_Offset;
+		ch->start = 0;
+	} else {
+		ch->dts = ch->start;
+		ch->cts = ch->start;
+
+		//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) {
+			ch->seek_flag = 1;
+		}
+	}
+	if (!sample_desc_index) sample_desc_index = 1;
+	ch->last_sample_desc_index = sample_desc_index;
+	ch->owner->no_order_check = ch->speed < 0 ? GF_TRUE : GF_FALSE;
+}
+
+void isor_reader_get_sample_from_item(ISOMChannel *ch)
+{
+	if (ch->au_seq_num) {
+		if (!ch->owner->itt || !isor_declare_item_properties(ch->owner, ch, 1+ch->au_seq_num)) {
+			ch->last_state = GF_EOS;
+			return;
+		}
+	}
+	ch->sample_time = 0;
+	ch->last_state = GF_OK;
+	if (!ch->static_sample) {
+		ch->static_sample = gf_isom_sample_new();
+	}
+
+	ch->sample = ch->static_sample;
+	ch->sample->IsRAP = RAP;
+	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);
+}
+
+void isor_reader_get_sample(ISOMChannel *ch)
+{
+	GF_Err e;
+	u32 sample_desc_index;
+	if (ch->sample) return;
+
+	if (ch->next_track) {
+		ch->track = ch->next_track;
+		ch->next_track = 0;
+	}
+
+	if (ch->to_init) {
+		init_reader(ch);
+		sample_desc_index = ch->last_sample_desc_index;
+	} else if (ch->speed < 0) {
+		if (ch->last_state == GF_EOS) {
+			ch->sample = NULL;
+			return;
+		}
+
+		if (ch->static_sample->IsRAP) {
+			ch->last_rap_sample_time = ch->sample_time;
+		}
+
+		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &sample_desc_index, GF_ISOM_SEARCH_FORWARD, &ch->static_sample, &ch->sample_num, NULL);
+
+		if ((e==GF_EOS) || (ch->static_sample->IsRAP)) {
+			if (!ch->last_rap_sample_time) {
+				e = GF_EOS;
+			} else {
+				e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->last_rap_sample_time - 1, &sample_desc_index, GF_ISOM_SEARCH_SYNC_BACKWARD, &ch->static_sample, &ch->sample_num, NULL);
+			}
+		}
+
+		if (e) {
+			if ((e==GF_EOS) && !ch->owner->frag_type) {
+				ch->last_state = GF_EOS;
+			}
+			ch->sample = NULL;
+			return;
+		}
+		ch->sample = ch->static_sample;
+
+		if (ch->sample->DTS == ch->sample_time) {
+			if (!ch->owner->frag_type) {
+				ch->last_state = GF_EOS;
+			}
+		}
+		if (ch->sample) {
+			ch->sample_time = ch->sample->DTS;
+		}
+
+	} else if (ch->has_edit_list) {
+		u32 prev_sample = ch->sample_num;
+		e = gf_isom_get_sample_for_movie_time(ch->owner->mov, ch->track, ch->sample_time + 1, &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;
+
+			/*we are in forced seek mode: fetch all samples before the one matching the sample time*/
+			if (ch->edit_sync_frame) {
+				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;
+				} else {
+					ch->edit_sync_frame = 0;
+					if (ch->sample) ch->sample_time = ch->sample->DTS;
+				}
+			} else {
+				/*if we get the same sample, figure out next interesting time (current sample + DTS gap to next sample should be a good bet)*/
+				if (prev_sample == ch->sample_num) {
+					if (ch->owner->frag_type && (ch->sample_num==gf_isom_get_sample_count(ch->owner->mov, ch->track))) {
+						ch->sample = NULL;
+					} else {
+						u32 sample_num = ch->sample_num ? ch->sample_num : 1;
+
+						if (sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track) ) {
+							//e = GF_EOS;
+						} else {
+							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;
+							}
+						}
+					}
+				}
+
+				/*we jumped to another segment - if RAP is needed look for closest rap in decoding order and
+				force seek mode*/
+				if (ch->sample && !ch->sample->IsRAP && ch->has_rap && (ch->sample_num != prev_sample+1)) {
+					GF_ISOSample *found = ch->static_sample;
+					u32 samp_num = ch->sample_num;
+					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;
+
+					/*if no sync point in the past, use the first non-sync for the given time*/
+					if (!ch->sample || !ch->sample->data) {
+						ch->sample = ch->static_sample = found;
+						ch->sample_time = ch->sample->DTS;
+						ch->sample_num = samp_num;
+					} else {
+						ch->sample = ch->static_sample;
+						ch->edit_sync_frame = ch->sample_num;
+						ch->sample->DTS = ch->sample_time;
+						ch->sample->CTS_Offset = 0;
+					}
+				} else {
+					if (ch->sample) ch->sample_time = ch->sample->DTS;
+				}
+			}
+		}
+	} else {
+		Bool do_fetch = GF_TRUE;
+		ch->sample_num++;
+
+		if (ch->sap_only) {
+			Bool is_rap = gf_isom_get_sample_sync(ch->owner->mov, ch->track, ch->sample_num);
+			if (!is_rap) {
+				Bool has_roll;
+				gf_isom_get_sample_rap_roll_info(ch->owner->mov, ch->track, ch->sample_num, &is_rap, &has_roll, NULL);
+				if (has_roll) is_rap = GF_TRUE;
+			}
+
+			if (!is_rap) {
+				do_fetch = GF_FALSE;
+			} else if (ch->sap_only==2) {
+				ch->sap_only = 0;
+			}
+		}
+		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 sync shadow / carousel RAP skip*/
+			if (ch->sample && (ch->sample->IsRAP==RAP_REDUNDANT)) {
+				ch->sample = NULL;
+				ch->sample_num++;
+				isor_reader_get_sample(ch);
+				return;
+			}
+		}
+	}
+
+	//check scalable track change
+	if (ch->sample && ch->sample->IsRAP && ch->next_track) {
+		ch->track = ch->next_track;
+		ch->next_track = 0;
+		ch->sample = NULL;
+		isor_reader_get_sample(ch);
+		return;
+	}
+
+	if (!ch->sample) {
+		u32 sample_count = gf_isom_get_sample_count(ch->owner->mov, ch->track);
+		ch->sample_data_offset = 0;
+		/*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->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)) {
+					ch->last_state = GF_EOS;
+				}
+			}
+		}
+		else if (!ch->sample_num
+		         || ((ch->speed >= 0) && (ch->sample_num >= sample_count))
+		         || ((ch->speed < 0) && (ch->sample_time == gf_isom_get_current_tfdt(ch->owner->mov, ch->track) ))
+		        ) {
+
+			if (ch->owner->frag_type==1) {
+				/*if sample cannot be found and file is fragmented, rewind sample*/
+				if (ch->sample_num) ch->sample_num--;
+				ch->last_state = GF_EOS;
+			} else if (ch->last_state != GF_EOS) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[IsoMedia] Track #%d end of stream reached\n", ch->track));
+				ch->last_state = GF_EOS;
+				if (ch->sample_num>sample_count) ch->sample_num = sample_count;
+			} else {
+				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)) ));
+		}
+		return;
+	}
+
+	if (sample_desc_index != ch->last_sample_desc_index) {
+		if (!ch->owner->stsd) {
+			ch->needs_pid_reconfig = GF_TRUE;
+		}
+		ch->last_sample_desc_index = sample_desc_index;
+	}
+
+	ch->last_state = GF_OK;
+	ch->au_duration = gf_isom_get_sample_duration(ch->owner->mov, ch->track, ch->sample_num);
+
+	ch->sap_3 = GF_FALSE;
+	ch->sap_4 = GF_FALSE;
+	ch->roll = 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, &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;
+
+	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->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;
+	} else if (ch->owner->last_sender_ntp && ch->dts==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;
+	} else {
+		ch->sender_ntp = ch->ntp_at_server_ntp = 0;
+	}
+
+	if (!ch->sample_num) return;
+
+	gf_isom_get_sample_flags(ch->owner->mov, ch->track, ch->sample_num, &ch->isLeading, &ch->dependsOn, &ch->dependedOn, &ch->redundant);
+
+	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;
+
+		} else if (gf_isom_is_media_encrypted(ch->owner->mov, ch->track, ch->last_sample_desc_index)) {
+			ch->pck_encrypted = GF_TRUE;
+		} else {
+			ch->pck_encrypted = GF_FALSE;
+		}
+	}
+	if (ch->sample && ch->sample->nb_pack)
+		ch->sample_num += ch->sample->nb_pack-1;
+}
+
+void isor_reader_release_sample(ISOMChannel *ch)
+{
+	if (ch->sample)
+		ch->au_seq_num++;
+	ch->sample = NULL;
+	ch->sai_buffer_size = 0;
+}
+
+static void isor_reset_seq_list(GF_List *list)
+{
+	while (gf_list_count(list)) {
+		GF_AVCConfigSlot *sl = gf_list_pop_back(list);
+		gf_free(sl->data);
+		gf_free(sl);
+	}
+}
+
+enum
+{
+	RESET_STATE_VPS=1,
+	RESET_STATE_SPS=1<<1,
+	RESET_STATE_PPS=1<<2,
+	RESET_STATE_SPS_EXT=1<<3,
+};
+
+static void isor_replace_nal(GF_AVCConfig *avcc, GF_HEVCConfig *hvcc, u8 *data, u32 size, u8 nal_type, u32 *reset_state)
+{
+	u32 i, count, state=0;
+	GF_AVCConfigSlot *sl;
+	GF_List *list=NULL;
+	if (avcc) {
+		if (nal_type==GF_AVC_NALU_PIC_PARAM) {
+			list = avcc->pictureParameterSets;
+			state=RESET_STATE_PPS;
+		} else if (nal_type==GF_AVC_NALU_SEQ_PARAM) {
+			list = avcc->sequenceParameterSets;
+			state=RESET_STATE_SPS;
+		} else if (nal_type==GF_AVC_NALU_SEQ_PARAM_EXT) {
+			list = avcc->sequenceParameterSetExtensions;
+			state=RESET_STATE_SPS_EXT;
+		} else return;
+	} else if (hvcc) {
+		GF_HEVCParamArray *hvca=NULL;
+		count = gf_list_count(hvcc->param_array);
+		for (i=0; i<count; i++) {
+			hvca = gf_list_get(hvcc->param_array, i);
+			if (hvca->type==nal_type) {
+				list = hvca->nalus;
+				break;
+			}
+			hvca = NULL;
+		}
+		if (!hvca) {
+			GF_SAFEALLOC(hvca, GF_HEVCParamArray);
+			if (hvca) {
+				list = hvca->nalus = gf_list_new();
+				hvca->type = nal_type;
+				gf_list_add(hvcc->param_array, hvca);
+			}
+		}
+		switch (nal_type) {
+		case GF_HEVC_NALU_VID_PARAM:
+			state = RESET_STATE_VPS;
+			break;
+		case GF_HEVC_NALU_SEQ_PARAM:
+			state = RESET_STATE_SPS;
+			break;
+		case GF_HEVC_NALU_PIC_PARAM:
+			state = RESET_STATE_PPS;
+			break;
+		}
+	}
+
+	count = gf_list_count(list);
+	for (i=0; i<count; i++) {
+		sl = gf_list_get(list, i);
+		if ((sl->size==size) && !memcmp(sl->data, data, size)) return;
+	}
+	if (! (*reset_state & state))  {
+		isor_reset_seq_list(list);
+		*reset_state |= state;
+	}
+	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
+	if (!sl) return;
+	sl->data = gf_malloc(sizeof(char)*size);
+	memcpy(sl->data, data, size);
+	sl->size = size;
+	gf_list_add(list, sl);
+}
+
+void isor_reader_check_config(ISOMChannel *ch)
+{
+	u32 nalu_len = 0;
+	u32 reset_state = 0;
+	if (ch->owner->analyze) return;
+	if (!ch->check_hevc_ps && !ch->check_avc_ps) 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;
+
+	nalu_len = ch->hvcc ? ch->hvcc->nal_unit_size : (ch->avcc ? ch->avcc->nal_unit_size : 4);
+
+	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)) {
+		Bool replace_nal = GF_FALSE;
+		u8 nal_type=0;
+		u32 pos = (u32) gf_bs_get_position(ch->nal_bs);
+		u32 size = gf_bs_read_int(ch->nal_bs, nalu_len*8);
+		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) {
+			nal_type = hdr & 0x1F;
+			switch (nal_type) {
+			case GF_AVC_NALU_SEQ_PARAM:
+			case GF_AVC_NALU_SEQ_PARAM_EXT:
+			case GF_AVC_NALU_PIC_PARAM:
+				replace_nal = GF_TRUE;
+				break;
+			}
+		}
+		if (ch->check_hevc_ps) {
+			nal_type = (hdr & 0x7E) >> 1;
+			switch (nal_type) {
+			case GF_HEVC_NALU_VID_PARAM:
+			case GF_HEVC_NALU_SEQ_PARAM:
+			case GF_HEVC_NALU_PIC_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);
+			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);
+		}
+	}
+
+	if (reset_state) {
+		u8 *dsi=NULL;
+		u32 dsi_size=0;
+		if (ch->check_avc_ps) {
+			gf_odf_avc_cfg_write(ch->avcc, &dsi, &dsi_size);
+		}
+		else if (ch->check_hevc_ps) {
+			gf_odf_hevc_cfg_write(ch->hvcc, &dsi, &dsi_size);
+		}
+		if (dsi && dsi_size) {
+			u32 dsi_crc = gf_crc_32(dsi, dsi_size);
+			if (ch->dsi_crc == dsi_crc) {
+				gf_free(dsi);
+			} else {
+				ch->dsi_crc = dsi_crc;
+				gf_filter_pid_set_property(ch->pid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_size) );
+			}
+		}
+	}
+}
+
+#endif /*GPAC_DISABLE_ISOM*/

gpac-1.0.0.tar.gz/src/filters/jsfilter.c Added

@@ -0,0 +1,4079 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / QuickJS bindings for GF_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.
+ *
+ */
+
+
+/*
+	ANY CHANGE TO THE API MUST BE REFLECTED IN THE DOCUMENTATION IN gpac/share/doc/idl/jsf.idl
+	(no way to define inline JS doc with doxygen)
+*/
+
+#include <gpac/filters.h>
+#include <gpac/list.h>
+#include <gpac/constants.h>
+#include <gpac/network.h>
+
+#ifdef GPAC_HAS_QJS
+
+#include <gpac/internal/scenegraph_dev.h>
+#include "../scenegraph/qjs_common.h"
+
+
+
+/*
+	Currently unmapped functions
+
+//likely not needed
+u32 	gf_filter_count_source_by_protocol (GF_Filter *filter, const char *protocol_scheme, Bool expand_proto, GF_FilterPid *(*enum_pids)(void *udta, u32 *idx), void *udta)
+GF_FilterPacket * 	gf_filter_pck_new_frame_interface (GF_FilterPid *PID, GF_FilterFrameInterface *frame_ifce, gf_fsess_packet_destructor destruct)
+GF_FilterFrameInterface * 	gf_filter_pck_get_frame_interface (GF_FilterPacket *pck)
+
+//todo
+GF_Err 	gf_filter_add_event_listener (GF_Filter *filter, GF_FSEventListener *el)
+GF_Err 	gf_filter_remove_event_listener (GF_Filter *filter, GF_FSEventListener *el)
+Bool 	gf_filter_forward_gf_event (GF_Filter *filter, GF_Event *evt, Bool consumed, Bool skip_user)
+Bool 	gf_filter_send_gf_event (GF_Filter *filter, GF_Event *evt)
+Bool 	gf_filter_ui_event (GF_Filter *filter, GF_Event *uievt)
+void 	gf_filter_register_opengl_provider (GF_Filter *filter, Bool do_register)
+GF_Err 	gf_filter_request_opengl (GF_Filter *filter)
+
+//either not needed or require a dedicated module
+GF_DownloadManager *gf_filter_get_download_manager (GF_Filter *filter)
+
+
+*/
+
+enum
+{
+	JSF_EVT_INITIALIZE=0,
+	JSF_EVT_FINALIZE,
+	JSF_EVT_CONFIGURE_PID,
+	JSF_EVT_PROCESS,
+	JSF_EVT_PROCESS_EVENT,
+	JSF_EVT_UPDATE_ARG,
+	JSF_EVT_PROBE_URL,
+	JSF_EVT_PROBE_DATA,
+	JSF_EVT_RECONFIGURE_OUTPUT,
+	JSF_EVT_REMOVE_PID,
+
+	JSF_EVT_LAST_DEFINED,
+
+	JSF_FILTER_MAX_PIDS,
+	JSF_FILTER_BLOCK_ENABLED,
+	JSF_FILTER_OUTPUT_BUFFER,
+	JSF_FILTER_OUTPUT_PLAYOUT,
+	JSF_FILTER_SEP_ARGS,
+	JSF_FILTER_SEP_NAME,
+	JSF_FILTER_SEP_LIST,
+	JSF_FILTER_DST_ARGS,
+	JSF_FILTER_DST_NAME,
+	JSF_FILTER_SINKS_DONE,
+	JSF_FILTER_REPORTING_ENABLED,
+
+	JSF_FILTER_CAPS_MAX_WIDTH,
+	JSF_FILTER_CAPS_MAX_HEIGHT,
+	JSF_FILTER_CAPS_MAX_DISPLAY_DEPTH,
+	JSF_FILTER_CAPS_MAX_FPS,
+	JSF_FILTER_CAPS_MAX_VIEWS,
+	JSF_FILTER_CAPS_MAX_CHANNELS,
+	JSF_FILTER_CAPS_MAX_SAMPLERATE,
+	JSF_FILTER_CAPS_MAX_AUDIO_DEPTH,
+	JSF_FILTER_NB_EVTS_QUEUED,
+	JSF_FILTER_CLOCK_HINT_TIME,
+	JSF_FILTER_CLOCK_HINT_MEDIATIME,
+	JSF_FILTER_CONNECTIONS_PENDING,
+};
+
+enum
+{
+	JSF_SETUP_ERROR=0,
+	JSF_NOTIF_ERROR,
+	JSF_NOTIF_ERROR_AND_DISCONNECT
+};
+
+
+typedef struct
+{
+	//options
+	const char *js;
+
+	GF_Filter *filter;
+
+	JSContext *ctx;
+
+	Bool initialized;
+	JSValue funcs[JSF_EVT_LAST_DEFINED];
+	JSValue filter_obj;
+
+	GF_FilterArgs *args;
+	u32 nb_args;
+
+
+	GF_FilterCapability *caps;
+	u32 nb_caps;
+
+	GF_List *pids;
+	char *log_name;
+
+	GF_List *pck_res;
+} GF_JSFilterCtx;
+
+enum
+{
+	JSF_PID_NAME=0,
+	JSF_PID_EOS,
+	JSF_PID_EOS_SEEN,
+	JSF_PID_WOULD_BLOCK,
+	JSF_PID_FILTER_NAME,
+	JSF_PID_FILTER_SRC,
+	JSF_PID_FILTER_ARGS,
+	JSF_PID_FILTER_SRC_ARGS,
+	JSF_PID_MAX_BUFFER,
+	JSF_PID_LOOSE_CONNECT,
+	JSF_PID_FRAMING_MODE,
+	JSF_PID_BUFFER,
+	JSF_PID_IS_FULL,
+	JSF_PID_FIRST_EMPTY,
+	JSF_PID_FIRST_CTS,
+	JSF_PID_NB_PACKETS,
+	JSF_PID_TIMESCALE,
+	JSF_PID_CLOCK_MODE,
+	JSF_PID_DISCARD,
+	JSF_PID_SRC_URL,
+	JSF_PID_DST_URL,
+	JSF_PID_REQUIRE_SOURCEID,
+	JSF_PID_RECOMPUTE_DTS,
+	JSF_PID_MIN_PCK_DUR,
+	JSF_PID_IS_PLAYING,
+};
+typedef struct
+{
+	GF_JSFilterCtx *jsf;
+	GF_FilterPid *pid;
+	JSValue jsobj;
+	struct _js_pck_ctx *pck_head;
+	GF_List *shared_pck;
+} GF_JSPidCtx;
+
+enum
+{
+	GF_JS_PCK_IS_REF = 1,
+	GF_JS_PCK_IS_SHARED = 1<<1,
+	GF_JS_PCK_IS_OUTPUT = 1<<2
+};
+
+typedef struct _js_pck_ctx
+{
+	GF_JSPidCtx *jspid;
+	GF_FilterPacket *pck;
+	JSValue jsobj;
+	//shared packet, this is a string or an array buffer
+	JSValue ref_val;
+	//shared packet callback
+	JSValue cbck_val;
+	//array buffer
+	JSValue data_ab;
+	u32 flags;
+} GF_JSPckCtx;
+
+typedef enum
+{
+	JSF_FINST_SOURCE=0,
+	JSF_FINST_DEST,
+	JSF_FINST_FILTER,
+} GF_JSFilterMode;
+typedef struct
+{
+	GF_JSFilterCtx *jsf;
+	GF_Filter *filter;
+	JSValue filter_obj;
+	GF_JSFilterMode fmode;
+	JSValue setup_failure_fun;
+
+} GF_JSFilterInstanceCtx;
+
+
+static JSClassID jsf_filter_class_id;
+
+static void jsf_filter_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    GF_JSFilterCtx *jsf = JS_GetOpaque(val, jsf_filter_class_id);
+    if (jsf) {
+        u32 i;
+        for (i=0; i<JSF_EVT_LAST_DEFINED; i++) {
+            JS_MarkValue(rt, jsf->funcs[i], mark_func);
+		}
+    }
+}
+static JSClassDef jsf_filter_class = {
+    "JSFilter",
+	.gc_mark = jsf_filter_mark
+};
+
+static JSClassID jsf_filter_inst_class_id;
+
+static void jsf_filter_inst_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(val, jsf_filter_inst_class_id);
+    if (f_inst) {
+		JS_MarkValue(rt, f_inst->setup_failure_fun, mark_func);
+    }
+}
+static void jsf_filter_inst_finalizer(JSRuntime *rt, JSValue val) {
+    GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(val, jsf_filter_inst_class_id);
+    if (!f_inst) return;
+    JS_FreeValueRT(rt, f_inst->setup_failure_fun);
+    gf_free(f_inst);
+}
+static JSClassDef jsf_filter_inst_class = {
+    "FilterInstance",
+    .finalizer = jsf_filter_inst_finalizer,
+	.gc_mark = jsf_filter_inst_mark
+};
+
+static JSClassID jsf_pid_class_id;
+static JSClassDef jsf_pid_class = {
+    "FilterPid",
+};
+
+static JSClassID jsf_event_class_id;
+static void jsf_evt_finalizer(JSRuntime *rt, JSValue val)
+{
+	GF_FilterEvent *evt = JS_GetOpaque(val, jsf_event_class_id);
+    if (!evt) return;
+	gf_free(evt);
+}
+static JSClassDef jsf_event_class = {
+    "FilterEvent",
+    .finalizer = jsf_evt_finalizer
+};
+
+static JSClassID jsf_pck_class_id;
+
+static void jsf_pck_detach_ab(JSContext *ctx, GF_JSPckCtx *pckctx)
+{
+	if (!JS_IsUndefined(pckctx->data_ab)) {
+		JS_DetachArrayBuffer(ctx, pckctx->data_ab);
+		JS_FreeValue(ctx, pckctx->data_ab);
+		pckctx->data_ab = JS_UNDEFINED;
+	}
+}
+
+static void jsf_pck_finalizer(JSRuntime *rt, JSValue val)
+{
+    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;
+	}
+
+    if (JS_IsUndefined(pckctx->ref_val) && pckctx->jspid && pckctx->jspid->jsf) {
+		gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
+		memset(pckctx, 0, sizeof(GF_JSPckCtx));
+	}
+}
+
+static void jsf_filter_pck_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    GF_JSPckCtx *pckctx = JS_GetOpaque(val, jsf_pck_class_id);
+    if (!pckctx) return;
+
+	if (!(pckctx->flags & GF_JS_PCK_IS_OUTPUT))
+		JS_MarkValue(rt, pckctx->jsobj, mark_func);
+
+    if (!JS_IsUndefined(pckctx->ref_val)) {
+		JS_MarkValue(rt, pckctx->ref_val, mark_func);
+	}
+
+    if (!JS_IsUndefined(pckctx->data_ab)) {
+		JS_MarkValue(rt, pckctx->data_ab, mark_func);
+	}
+}
+
+static JSClassDef jsf_pck_class = {
+    "FilterPacket",
+    .finalizer = jsf_pck_finalizer,
+	.gc_mark = jsf_filter_pck_mark
+};
+
+GF_DownloadManager *jsf_get_download_manager(JSContext *c)
+{
+	GF_JSFilterCtx *jsf;
+	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;
+	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
+	JS_FreeValue(c, filter_obj);
+	if (!jsf) return NULL;
+	return gf_filter_get_download_manager(jsf->filter);
+}
+
+struct _gf_ft_mgr *jsf_get_font_manager(JSContext *c)
+{
+	GF_JSFilterCtx *jsf;
+	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;
+	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);
+}
+
+GF_Err jsf_request_opengl(JSContext *c)
+{
+	GF_JSFilterCtx *jsf;
+	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 GF_BAD_PARAM;
+	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
+	JS_FreeValue(c, filter_obj);
+
+	return gf_filter_request_opengl(jsf->filter);
+}
+GF_Err jsf_set_gl_active(JSContext *c)
+{
+	GF_JSFilterCtx *jsf;
+	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 GF_BAD_PARAM;
+	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
+	JS_FreeValue(c, filter_obj);
+
+	return gf_filter_set_active_opengl_context(jsf->filter);
+}
+
+Bool jsf_is_packet(JSContext *c, JSValue obj)
+{
+	GF_JSPckCtx *pckc = JS_GetOpaque(obj, jsf_pck_class_id);
+	if (pckc) return GF_TRUE;
+	return GF_FALSE;
+}
+const GF_FilterPacket *jsf_get_packet(JSContext *c, JSValue obj)
+{
+	GF_JSPckCtx *pckc = JS_GetOpaque(obj, jsf_pck_class_id);
+	if (pckc) return pckc->pck;
+	return NULL;
+}
+
+GF_Err jsf_get_filter_packet_planes(JSContext *c, JSValue obj, u32 *width, u32 *height, u32 *pf, u32 *stride, u32 *stride_uv, const u8 **data, const u8 **p_u, const u8 **p_v, const u8 **p_a)
+{
+	u32 cid;
+	GF_FilterFrameInterface *frame_ifce;
+	const GF_PropertyValue *p;
+	GF_JSPckCtx *pckc = JS_GetOpaque(obj, jsf_pck_class_id);
+	if (!pckc) return GF_BAD_PARAM;
+
+#define GETPROP(_code, _v, opt)\
+	p = gf_filter_pid_get_property(pckc->jspid->pid, _code);\
+	if (!opt && !p) return GF_BAD_PARAM;\
+	_v = p ? p->value.uint : 0;\
+
+	GETPROP(GF_PROP_PID_CODECID, cid, 0)
+	if (cid != GF_CODECID_RAW) return GF_BAD_PARAM;
+	GETPROP(GF_PROP_PID_WIDTH, *width, 0)
+	GETPROP(GF_PROP_PID_HEIGHT, *height, 0)
+	GETPROP(GF_PROP_PID_PIXFMT, *pf, 0)
+	GETPROP(GF_PROP_PID_STRIDE, *stride, 1)
+	GETPROP(GF_PROP_PID_STRIDE_UV, *stride_uv, 1)
+#undef GETPROP
+
+	if (!data || !p_u || !p_v || !p_a) return GF_OK;
+
+	frame_ifce = gf_filter_pck_get_frame_interface(pckc->pck);
+	if (!frame_ifce) {
+		u32 size=0;
+		*data = (u8 *) gf_filter_pck_get_data(pckc->pck, &size);
+	} else {
+		u32 st_o;
+		frame_ifce->get_plane(frame_ifce, 0, data, stride);
+		frame_ifce->get_plane(frame_ifce, 1, p_u, stride_uv);
+		//todo we need to cleanup alpha frame fetch, how do we differentiate between NV12+alpha (3 planes) and YUV420 ?
+		frame_ifce->get_plane(frame_ifce, 2, p_v, &st_o);
+		frame_ifce->get_plane(frame_ifce, 3, p_a, &st_o);
+	}
+	return GF_OK;
+}
+
+const char *jsf_get_script_filename(JSContext *c)
+{
+	GF_JSFilterCtx *jsf;
+	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;
+	jsf = JS_GetOpaque(filter_obj, jsf_filter_class_id);
+	JS_FreeValue(c, filter_obj);
+	if (!jsf) return NULL;
+	return jsf->js;
+}
+
+JSValue jsf_NewProp(JSContext *ctx, const GF_PropertyValue *new_val)
+{
+	JSValue res;
+	u32 i;
+	if (!new_val) return JS_NULL;
+
+	switch (new_val->type) {
+	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_LUINT:
+		return JS_NewInt64(ctx, new_val->value.longuint);
+	case GF_PROP_LSINT:
+		return JS_NewInt64(ctx, new_val->value.longsint);
+	case GF_PROP_FLOAT:
+		return JS_NewFloat64(ctx, FIX2FLT(new_val->value.fnumber));
+	case GF_PROP_DOUBLE:
+		return JS_NewFloat64(ctx, new_val->value.number);
+	case GF_PROP_STRING:
+	case GF_PROP_STRING_NO_COPY:
+	case GF_PROP_NAME:
+		return JS_NewString(ctx, new_val->value.string);
+	case GF_PROP_VEC2:
+		res = JS_NewObject(ctx);
+		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));
+		JS_SetPropertyStr(ctx, res, "y", JS_NewInt32(ctx, new_val->value.vec2i.y));
+		return res;
+	case GF_PROP_VEC3I:
+		res = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, res, "x", JS_NewInt32(ctx, new_val->value.vec3i.x));
+		JS_SetPropertyStr(ctx, res, "y", JS_NewInt32(ctx, new_val->value.vec3i.y));
+		JS_SetPropertyStr(ctx, res, "z", JS_NewInt32(ctx, new_val->value.vec3i.z));
+		return res;
+	case GF_PROP_VEC4I:
+		res = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, res, "x", JS_NewInt32(ctx, new_val->value.vec4i.x));
+		JS_SetPropertyStr(ctx, res, "y", JS_NewInt32(ctx, new_val->value.vec4i.y));
+		JS_SetPropertyStr(ctx, res, "z", JS_NewInt32(ctx, new_val->value.vec4i.z));
+		JS_SetPropertyStr(ctx, res, "w", JS_NewInt32(ctx, new_val->value.vec4i.w));
+		return res;
+	case GF_PROP_FRACTION:
+		res = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, res, "n", JS_NewInt32(ctx, new_val->value.frac.num));
+		JS_SetPropertyStr(ctx, res, "d", JS_NewInt32(ctx, new_val->value.frac.den));
+		return res;
+	case GF_PROP_FRACTION64:
+		res = JS_NewObject(ctx);
+		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]) );
+		}
+		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)  ) );
+		}
+		return res;
+	case GF_PROP_DATA:
+		return JS_NewArrayBufferCopy(ctx, new_val->value.data.ptr, new_val->value.data.size);
+
+	default:
+		return JS_NULL;
+	}
+}
+
+JSValue jsf_NewPropTranslate(JSContext *ctx, const GF_PropertyValue *prop, u32 p4cc)
+{
+	const char *cid;
+	JSValue res;
+	switch (p4cc) {
+	case GF_PROP_PID_CODECID:
+		cid = gf_codecid_file_ext(prop->value.uint);
+		if (!cid) res = JS_EXCEPTION;
+		else {
+			char *sep = strchr(cid, '|');
+			if (sep)
+				res = JS_NewStringLen(ctx, cid, sep-cid);
+			else
+				res = JS_NewString(ctx, cid);
+		}
+		break;
+	case GF_PROP_PID_STREAM_TYPE:
+		res = JS_NewString(ctx, gf_stream_type_name(prop->value.uint));
+		break;
+	case GF_PROP_PID_AUDIO_FORMAT:
+		res = JS_NewString(ctx, gf_audio_fmt_name(prop->value.uint));
+		break;
+	case GF_PROP_PID_PIXFMT:
+		res = JS_NewString(ctx, gf_pixel_fmt_name(prop->value.uint));
+		break;
+	default:
+		res = jsf_NewProp(ctx, prop);
+		break;
+	}
+	return res;
+}
+
+GF_Err jsf_ToProp(GF_Filter *filter, JSContext *ctx, JSValue value, u32 p4cc, GF_PropertyValue *prop)
+{
+	u32 type;
+	memset(prop, 0, sizeof(GF_PropertyValue));
+
+	type = GF_PROP_STRING;
+	if (p4cc)
+		type = gf_props_4cc_get_type(p4cc);
+
+	if (JS_IsString(value)) {
+		const char *val_str = JS_ToCString(ctx, value);
+		if (p4cc==GF_PROP_PID_STREAM_TYPE) {
+			prop->type = GF_PROP_UINT;
+			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);
+		} else {
+			*prop = gf_props_parse_value(type, NULL, val_str, NULL, gf_filter_get_sep(filter, GF_FS_SEP_LIST));
+		}
+		JS_FreeCString(ctx, val_str);
+		if (prop->type==GF_PROP_FORBIDEN) return GF_BAD_PARAM;
+		return GF_OK;
+	}
+	if (JS_IsBool(value)) {
+		prop->type = GF_PROP_BOOL;
+		prop->value.boolean = JS_ToBool(ctx, value);
+	}
+	else if (JS_IsInteger(value)) {
+		if (!JS_ToInt32(ctx, &prop->value.sint, value)) {
+			prop->type = GF_PROP_SINT;
+		} else if (!JS_ToInt64(ctx, &prop->value.longsint, value)) {
+			prop->type = GF_PROP_LSINT;
+		}
+	}
+	else if (JS_IsNumber(value)) {
+		JS_ToFloat64(ctx, &prop->value.number, value);
+		prop->type = GF_PROP_DOUBLE;
+	}
+	else if (JS_IsArray(ctx, value)) {
+		u64 len = 0;
+		u32 i;
+		u32 atype = 0;
+		JSValue js_length = JS_GetPropertyStr(ctx, value, "length");
+		if (JS_ToIndex(ctx, &len, js_length)) {
+			JS_FreeValue(ctx, js_length);
+			return GF_BAD_PARAM;
+		}
+		JS_FreeValue(ctx, js_length);
+		for (i=0; i<len; i++) {
+			JSValue v = JS_GetPropertyUint32(ctx, value, i);
+			if (JS_IsString(v)) {
+				if (!i) atype = 1;
+				else if (atype!=1) {
+					JS_FreeValue(ctx, v);
+					return GF_BAD_PARAM;
+				}
+			} else if (JS_IsInteger(v)) {
+				if (!i) atype = 2;
+				else if (atype!=2) {
+					JS_FreeValue(ctx, v);
+					return GF_BAD_PARAM;
+				}
+			}
+			else {
+				JS_FreeValue(ctx, v);
+				return GF_BAD_PARAM;
+			}
+			if (!i) {
+				if (atype==1) {
+					prop->value.string_list = gf_list_new();
+				}
+			} 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));
+				JS_FreeCString(ctx, str);
+			} else {
+				JS_ToInt32(ctx, &prop->value.uint_list.vals[i], v);
+			}
+			JS_FreeValue(ctx, v);
+		}
+	}
+	else if (JS_IsObject(value)) {
+		u32 is_vec4 = 0;
+		u32 is_vec3 = 0;
+		u32 is_vec2 = 0;
+		u32 is_frac = 0;
+		Bool is_vec = GF_FALSE;
+		GF_PropVec4 val_d;
+		GF_PropVec4i val_i;
+		GF_Fraction frac;
+		GF_Fraction64 frac_l;
+
+		JSValue res = JS_GetPropertyStr(ctx, value, "w");
+		if (!JS_IsUndefined(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)) {
+			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);
+
+		res = JS_GetPropertyStr(ctx, value, "y");
+		if (!JS_IsUndefined(res)) {
+			is_vec2 = 1;
+			if (JS_ToFloat64(ctx, &val_d.y, res)) {
+				JS_ToInt32(ctx, &val_i.y, res);
+				is_vec2 = 2;
+			}
+		}
+		JS_FreeValue(ctx, res);
+
+		res = JS_GetPropertyStr(ctx, value, "x");
+		if (!JS_IsUndefined(res)) {
+			is_vec = GF_TRUE;
+			if (JS_ToFloat64(ctx, &val_d.x, res)) {
+				JS_ToInt32(ctx, &val_i.x, res);
+			}
+		}
+		JS_FreeValue(ctx, res);
+
+		res = JS_GetPropertyStr(ctx, value, "d");
+		if (!JS_IsUndefined(res)) {
+			is_frac = 2;
+			if (JS_ToInt32(ctx, &frac.den, res)) {
+				JS_ToInt64(ctx, &frac_l.den, res);
+				is_frac = 1;
+			}
+		}
+		JS_FreeValue(ctx, res);
+		if (is_frac) {
+			res = JS_GetPropertyStr(ctx, value, "n");
+			if (!JS_IsUndefined(res)) {
+				is_frac = 2;
+				if (JS_ToInt32(ctx, &frac.num, res)) {
+					JS_ToInt64(ctx, &frac_l.num, res);
+					is_frac = 1;
+				}
+			} else {
+				is_frac = 0;
+			}
+			JS_FreeValue(ctx, res);
+		}
+
+		if (is_vec) {
+			if (is_vec4==2) {
+				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) {
+				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;
+			} else if (is_vec2==1) {
+				prop->type = GF_PROP_VEC2;
+				prop->value.vec3.x = val_d.x;
+				prop->value.vec3.y = val_d.y;
+			}
+		} else if (is_frac) {
+			if (is_frac==2) {
+				prop->type = GF_PROP_FRACTION;
+				prop->value.frac = frac;
+			} else {
+				prop->type = GF_PROP_FRACTION64;
+				prop->value.lfrac = frac_l;
+			}
+		}
+		//try array buffer
+		else {
+			size_t ab_size;
+			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;
+			prop->type = GF_PROP_DATA;
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Unmapped JS object type, cannot convert back to property\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (prop->type==GF_PROP_STRING) {
+		if ((type==GF_PROP_DATA) || (type==GF_PROP_CONST_DATA)) {
+			char *str = prop->value.string;
+			prop->value.data.ptr = str;
+			prop->value.data.size = (u32) strlen(str);
+			prop->type = GF_PROP_DATA;
+		}
+	}
+	return GF_OK;
+}
+
+
+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;
+
+	if (magic < JSF_EVT_LAST_DEFINED) {
+		if (JS_IsFunction(ctx, value) || JS_IsUndefined(value) || JS_IsNull(value)) {
+			JS_FreeValue(ctx, jsf->funcs[magic]);
+			jsf->funcs[magic] = JS_DupValue(ctx, value);
+		}
+    	return JS_UNDEFINED;
+	}
+	switch (magic) {
+	case JSF_FILTER_MAX_PIDS:
+		if (JS_ToInt32(ctx, &ival, value))
+			return JS_EXCEPTION;
+		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;
+		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;
+		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;
+		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;
+		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;
+		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;
+		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;
+		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;
+		gf_filter_set_session_caps(jsf->filter, &caps);
+		break;
+	}
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_prop_get(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	u32 ival;
+	s64 lival;
+	Double dval;
+	char *str;
+	char szSep[2];
+	GF_FilterSessionCaps caps;
+	JSValue res;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+	if (!jsf)
+		return JS_EXCEPTION;
+
+	if (magic<JSF_EVT_LAST_DEFINED)
+		return JS_DupValue(jsf->ctx, jsf->funcs[magic]);
+
+	switch (magic) {
+	case JSF_FILTER_MAX_PIDS:
+		return JS_NewInt32(ctx, gf_filter_get_max_extra_input_pids(jsf->filter));
+	case JSF_FILTER_BLOCK_ENABLED:
+    	return JS_NewBool(jsf->ctx, gf_filter_block_enabled(jsf->filter));
+	case JSF_FILTER_OUTPUT_BUFFER:
+		gf_filter_get_output_buffer_max(jsf->filter, &ival, NULL);
+    	return JS_NewInt32(jsf->ctx, ival);
+	case JSF_FILTER_OUTPUT_PLAYOUT:
+		gf_filter_get_output_buffer_max(jsf->filter, NULL, &ival);
+    	return JS_NewInt32(jsf->ctx, ival);
+
+	case JSF_FILTER_SEP_ARGS:
+		szSep[1]=0;
+		szSep[0] = gf_filter_get_sep(jsf->filter, GF_FS_SEP_ARGS);
+    	return JS_NewString(jsf->ctx, szSep);
+	case JSF_FILTER_SEP_NAME:
+		szSep[1]=0;
+		szSep[0] = gf_filter_get_sep(jsf->filter, GF_FS_SEP_NAME);
+    	return JS_NewString(jsf->ctx, szSep);
+	case JSF_FILTER_SEP_LIST:
+		szSep[1]=0;
+		szSep[0] = gf_filter_get_sep(jsf->filter, GF_FS_SEP_LIST);
+    	return JS_NewString(jsf->ctx, szSep);
+
+	case JSF_FILTER_DST_ARGS:
+		str = (char *) gf_filter_get_dst_args(jsf->filter);
+    	return str ? JS_NewString(jsf->ctx, str) : JS_NULL;
+	case JSF_FILTER_DST_NAME:
+		str = gf_filter_get_dst_name(jsf->filter);
+		res = str ? JS_NewString(jsf->ctx, str) : JS_NULL;
+		if (str) gf_free(str);
+		return res;
+	case JSF_FILTER_SINKS_DONE:
+    	return JS_NewBool(jsf->ctx, gf_filter_all_sinks_done(jsf->filter) );
+	case JSF_FILTER_REPORTING_ENABLED:
+    	return JS_NewBool(jsf->ctx, gf_filter_reporting_enabled(jsf->filter) );
+
+	case JSF_FILTER_CAPS_MAX_WIDTH:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_screen_width);
+	case JSF_FILTER_CAPS_MAX_HEIGHT:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_screen_height);
+	case JSF_FILTER_CAPS_MAX_DISPLAY_DEPTH:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_screen_bpp);
+	case JSF_FILTER_CAPS_MAX_FPS:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_screen_fps);
+	case JSF_FILTER_CAPS_MAX_VIEWS:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_screen_nb_views);
+	case JSF_FILTER_CAPS_MAX_CHANNELS:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_audio_channels);
+	case JSF_FILTER_CAPS_MAX_SAMPLERATE:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_audio_sample_rate);
+	case JSF_FILTER_CAPS_MAX_AUDIO_DEPTH:
+		gf_filter_get_session_caps(jsf->filter, &caps);
+		return JS_NewInt32(ctx, caps.max_audio_bit_depth);
+
+	case JSF_FILTER_NB_EVTS_QUEUED:
+		return JS_NewInt32(ctx, gf_filter_get_num_events_queued(jsf->filter) );
+	case JSF_FILTER_CLOCK_HINT_TIME:
+		gf_filter_get_clock_hint(jsf->filter, &lival, NULL);
+		return JS_NewInt64(ctx, lival);
+	case JSF_FILTER_CLOCK_HINT_MEDIATIME:
+	{
+		GF_Fraction64 frac;
+		gf_filter_get_clock_hint(jsf->filter, NULL, &frac);
+		dval = ((Double)frac.num) / frac.den;
+	}
+		return JS_NewFloat64(ctx, dval);
+	case JSF_FILTER_CONNECTIONS_PENDING:
+		return JS_NewBool(ctx, gf_filter_connections_pending(jsf->filter) );
+	}
+
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_set_arg(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue v;
+	const char *desc=NULL;
+	const char *name=NULL;
+	const char *def = NULL;
+	const char *min_enum = NULL;
+	u32 type = 0;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || !argc) return JS_EXCEPTION;
+
+	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;
+
+	v = JS_GetPropertyStr(ctx, argv[0], "desc");
+	if (!JS_IsUndefined(v)) desc = JS_ToCString(ctx, v);
+	JS_FreeValue(ctx, v);
+	if (!desc) {
+	 	JS_FreeCString(ctx, name);
+	 	return JS_EXCEPTION;
+	}
+
+	v = JS_GetPropertyStr(ctx, argv[0], "type");
+	if (!JS_IsUndefined(v))
+		JS_ToInt32(ctx, &type, v);
+	JS_FreeValue(ctx, v);
+	if (!type) {
+	 	JS_FreeCString(ctx, name);
+	 	JS_FreeCString(ctx, desc);
+	 	return JS_EXCEPTION;
+	}
+
+	v = JS_GetPropertyStr(ctx, argv[0], "def");
+	if (!JS_IsUndefined(v)) def = JS_ToCString(ctx, v);
+	JS_FreeValue(ctx, v);
+
+	v = JS_GetPropertyStr(ctx, argv[0], "minmax_enum");
+	if (!JS_IsUndefined(v)) min_enum = JS_ToCString(ctx, v);
+	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);
+	jsf->args[jsf->nb_args].arg_desc = desc ? gf_strdup(desc) : NULL;
+	jsf->args[jsf->nb_args].arg_default_val = def ? gf_strdup(def) : NULL;
+	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->nb_args ++;
+
+	gf_filter_define_args(jsf->filter, jsf->args);
+
+	JS_FreeCString(ctx, name);
+	JS_FreeCString(ctx, desc);
+	JS_FreeCString(ctx, def);
+	JS_FreeCString(ctx, min_enum);
+    return JS_UNDEFINED;
+}
+
+
+static JSValue jsf_filter_set_cap(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 prop_id = 0;
+	Bool is_output=GF_FALSE;
+	Bool is_inputoutput=GF_FALSE;
+	Bool is_excluded=GF_FALSE;
+	Bool is_static=GF_FALSE;
+	Bool is_loaded_filter_only=GF_FALSE;
+	Bool is_optional=GF_FALSE;
+	GF_PropertyValue p;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf) return JS_EXCEPTION;
+
+	memset(&p, 0, sizeof(GF_PropertyValue));
+    if (argc) {
+		u32 prop_type;
+    	JSValue v;
+		const char *name = NULL;
+
+		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;
+		prop_id = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!prop_id)
+			return js_throw_err(ctx, GF_BAD_PARAM);
+		prop_type = gf_props_4cc_get_type(prop_id);
+
+		name = NULL;
+		v = JS_GetPropertyStr(ctx, argv[0], "value");
+		if (!JS_IsUndefined(v)) name = JS_ToCString(ctx, v);
+		JS_FreeValue(ctx, v);
+
+		if (prop_id==GF_PROP_PID_STREAM_TYPE) {
+			p.type = GF_PROP_UINT;
+			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);
+		} else {
+			p = gf_props_parse_value(prop_type, NULL, name, NULL, gf_filter_get_sep(jsf->filter, GF_FS_SEP_LIST) );
+		}
+		JS_FreeCString(ctx, name);
+
+#define GETB(_v, _n)\
+		v = JS_GetPropertyStr(ctx, argv[0], _n);\
+		if (!JS_IsUndefined(v)) _v = JS_ToBool(ctx, v);\
+		JS_FreeValue(ctx, v);\
+
+		GETB(is_output, "output");
+		GETB(is_inputoutput, "inout");
+		GETB(is_excluded, "excluded");
+		GETB(is_loaded_filter_only, "loaded_filter_only");
+		GETB(is_static, "static");
+		GETB(is_optional, "optional");
+#undef GETB
+
+	}
+
+	jsf->caps = gf_realloc(jsf->caps, sizeof(GF_FilterCapability)*(jsf->nb_caps+1));
+	memset(&jsf->caps[jsf->nb_caps], 0, sizeof(GF_FilterCapability));
+	if (prop_id) {
+		GF_FilterCapability *cap = &jsf->caps[jsf->nb_caps];
+		cap->code = prop_id;
+		cap->val = p;
+		cap->flags = GF_CAPFLAG_IN_BUNDLE;
+		if (is_inputoutput) {
+			cap->flags |= GF_CAPFLAG_INPUT|GF_CAPFLAG_OUTPUT;
+		} else if (is_output) {
+			cap->flags |= GF_CAPFLAG_OUTPUT;
+		} else {
+			cap->flags |= GF_CAPFLAG_INPUT;
+		}
+		if (is_excluded)
+			cap->flags |= GF_CAPFLAG_EXCLUDED;
+		if (is_static)
+			cap->flags |= GF_CAPFLAG_STATIC;
+		if (is_loaded_filter_only)
+			cap->flags |= GF_CAPFLAG_LOADED_FILTER;
+		if (is_optional)
+			cap->flags |= GF_CAPFLAG_OPTIONAL;
+	}
+	jsf->nb_caps ++;
+	gf_filter_override_caps(jsf->filter, jsf->caps, jsf->nb_caps);
+	return JS_UNDEFINED;
+}
+
+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;
+	const char *str = JS_ToCString(ctx, argv[0]);
+    if (!str) return JS_EXCEPTION;
+	gf_filter_set_description(jsf->filter, str);
+	JS_FreeCString(ctx, str);
+    return JS_UNDEFINED;
+}
+
+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;
+	const char *str = JS_ToCString(ctx, argv[0]);
+    if (!str) return JS_EXCEPTION;
+	gf_filter_set_version(jsf->filter, str);
+	JS_FreeCString(ctx, str);
+    return JS_UNDEFINED;
+}
+
+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;
+	const char *str = JS_ToCString(ctx, argv[0]);
+    if (!str) return JS_EXCEPTION;
+	gf_filter_set_author(jsf->filter, str);
+	JS_FreeCString(ctx, str);
+    return JS_UNDEFINED;
+}
+
+
+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;
+	const char *str = JS_ToCString(ctx, argv[0]);
+    if (!str) return JS_EXCEPTION;
+	gf_filter_set_help(jsf->filter, str);
+	JS_FreeCString(ctx, str);
+    return JS_UNDEFINED;
+}
+
+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->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;
+    	jsf->log_name = gf_strdup(str);
+		JS_FreeCString(ctx, str);
+		gf_filter_set_name(jsf->filter, jsf->log_name);
+
+		global = JS_GetGlobalObject(ctx);
+    	JS_SetPropertyStr(ctx, global, "_gpac_log_name", JS_NewString(ctx, jsf->log_name));
+    	JS_FreeValue(ctx, global);
+    }
+    return JS_UNDEFINED;
+}
+
+
+static JSValue jsf_filter_new_pid(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSPidCtx *pctx;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf) return JS_EXCEPTION;
+    GF_FilterPid *opid = gf_filter_pid_new(jsf->filter);
+	if (!opid) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(pctx, GF_JSPidCtx);
+	if (!pctx)
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	gf_list_add(jsf->pids, pctx);
+	pctx->jsf = jsf;
+	pctx->pid = opid;
+	pctx->jsobj = JS_NewObjectClass(ctx, jsf_pid_class_id);
+	//keep ref to value we destroy it upon pid removal or filter desctruction
+	pctx->jsobj = JS_DupValue(ctx, pctx->jsobj);
+	JS_SetOpaque(pctx->jsobj, pctx);
+	gf_filter_pid_set_udta(pctx->pid, pctx);
+	return pctx->jsobj;
+}
+
+static JSValue jsf_filter_send_event(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+	GF_FilterEvent *evt = JS_GetOpaque(argv[0], jsf_event_class_id);
+    if (!evt) return JS_EXCEPTION;
+    if (argc>1) {
+		upstream = JS_ToBool(ctx, argv[1]);
+	}
+
+	if (jsf)
+		gf_filter_send_event(jsf->filter, evt, upstream);
+	else
+		gf_filter_send_event(jsfi->filter, evt, upstream);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_get_info(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	const char *name=NULL;
+	const GF_PropertyValue *prop;
+	GF_Filter *filter;
+	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;
+    name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+	filter = jsf ? jsf->filter : jsfi->filter;
+
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		prop = gf_filter_get_info_str(filter, name, &pe);
+		JS_FreeCString(ctx, name);
+		if (!prop) return JS_NULL;
+		res = jsf_NewProp(ctx, prop);
+		JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc)
+			return js_throw_err(ctx, GF_BAD_PARAM);
+		prop = gf_filter_get_info(filter, p4cc, &pe);
+		if (!prop) return JS_NULL;
+		res = jsf_NewPropTranslate(ctx, prop, p4cc);
+	}
+	gf_filter_release_property(pe);
+    return res;
+}
+
+
+
+static JSValue jsf_filter_is_supported_mime(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *mime=NULL;
+	JSValue res;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || !argc) return JS_EXCEPTION;
+    mime = JS_ToCString(ctx, argv[0]);
+	if (!mime) return JS_EXCEPTION;
+	res = JS_NewBool(ctx, gf_filter_is_supported_mime(jsf->filter, mime));
+	JS_FreeCString(ctx, mime);
+	return res;
+}
+
+static JSValue jsf_filter_is_supported_source(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *src=NULL;
+	const char *parent=NULL;
+	JSValue res;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || !argc) return JS_EXCEPTION;
+    src = JS_ToCString(ctx, argv[0]);
+	if (!src) return JS_EXCEPTION;
+	if (argc>1) {
+		parent = JS_ToCString(ctx, argv[1]);
+		if (!parent) {
+			JS_FreeCString(ctx, src);
+			return JS_EXCEPTION;
+		}
+	}
+	res = JS_NewBool(ctx, gf_filter_is_supported_source(jsf->filter, src, parent) );
+	JS_FreeCString(ctx, src);
+	JS_FreeCString(ctx, parent);
+	return res;
+}
+
+static JSValue jsf_filter_update_status(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+    const char *status;
+    u32 pc=0;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || (argc<1))  return JS_EXCEPTION;
+
+    status = JS_ToCString(ctx, argv[0]);
+	if (argc>1)
+		JS_ToInt32(ctx, &pc, argv[1]);
+    gf_filter_update_status(jsf->filter, pc, (char*) status);
+	JS_FreeCString(ctx, status);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_reschedule_in(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+    u32 rt_delay=0;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf) return JS_EXCEPTION;
+
+    if (argc) {
+		if (JS_ToInt32(ctx, &rt_delay, argv[0]))
+			return JS_EXCEPTION;
+
+		gf_filter_ask_rt_reschedule(jsf->filter, rt_delay);
+	} else {
+		gf_filter_post_process_task(jsf->filter);
+	}
+	return JS_UNDEFINED;
+}
+
+typedef struct
+{
+	JSValue func;
+	JSValue obj;
+	GF_JSFilterCtx *jsf;
+} JS_ScriptTask;
+
+Bool jsf_task_exec(GF_Filter *filter, void *callback, u32 *reschedule_ms)
+{
+	s32 fun_result = -1;
+	JS_ScriptTask *task = (JS_ScriptTask *) callback;
+	JSValue ret;
+	gf_js_lock(task->jsf->ctx, GF_TRUE);
+
+	if (JS_IsUndefined(task->obj)) {
+		ret = JS_Call(task->jsf->ctx, task->func, task->jsf->filter_obj, 0, NULL);
+	} else {
+		ret = JS_Call(task->jsf->ctx, task->func, task->obj, 0, NULL);
+	}
+
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error processing JS-defined task\n", task->jsf->log_name));
+		js_dump_error(task->jsf->ctx);
+	}
+	else if (JS_IsInteger(ret)) {
+		JS_ToInt32(task->jsf->ctx, &fun_result, ret);
+	}
+	JS_FreeValue(task->jsf->ctx, ret);
+
+	gf_js_lock(task->jsf->ctx, GF_FALSE);
+	js_do_loop(task->jsf->ctx);
+
+	if (fun_result>=0) {
+		*reschedule_ms = (u32) fun_result;
+		return GF_TRUE;
+	}
+	if (!JS_IsUndefined(task->obj)) {
+		JS_FreeValue(task->jsf->ctx, task->obj);
+	}
+	JS_FreeValue(task->jsf->ctx, task->func);
+	gf_free(task);
+	return GF_FALSE;
+}
+static JSValue jsf_filter_post_task(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JS_ScriptTask *task;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || !argc) return JS_EXCEPTION;
+	if (!JS_IsFunction(ctx, argv[0]))
+		return JS_EXCEPTION;
+	if ((argc>1) && !JS_IsObject(argv[1]))
+		return JS_EXCEPTION;
+
+	GF_SAFEALLOC(task, JS_ScriptTask);
+	if (!task)
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	task->jsf = jsf;
+	task->func = JS_DupValue(ctx, argv[0]);
+	task->obj = JS_UNDEFINED;
+	if (argc>1)
+		task->obj = JS_DupValue(ctx, argv[1]);
+
+	gf_filter_post_task(jsf->filter, jsf_task_exec, task, "jsf_task");
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_notify_failure(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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 (JS_ToInt32(ctx, (int *) &e, argv[0]))
+		return JS_EXCEPTION;
+
+	if (e==GF_OK) return JS_UNDEFINED;
+
+	if ((argc>1) && JS_ToInt32(ctx, &error_type, argv[1]))
+		return JS_EXCEPTION;
+	if (error_type==JSF_NOTIF_ERROR_AND_DISCONNECT)
+		gf_filter_notification_failure(jsf->filter, e, GF_TRUE);
+	else if (error_type==JSF_NOTIF_ERROR)
+		gf_filter_notification_failure(jsf->filter, e, GF_FALSE);
+	else
+		gf_filter_setup_failure(jsf->filter, e);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_hint_clock(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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 (JS_ToInt64(ctx, &time_in_us, argv[0]))
+		return JS_EXCEPTION;
+	if (argc==2) {
+		Double t=0;
+		if (JS_ToFloat64(ctx, &t, argv[0]))
+			return JS_EXCEPTION;
+		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;
+		if (JS_ToInt64(ctx, &media_timestamp.den, argv[0]))
+			return JS_EXCEPTION;
+	}
+	gf_filter_hint_single_clock(jsf->filter, time_in_us, media_timestamp);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_send_update(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *filter_id=NULL;
+	const char *arg_name=NULL;
+	const char *arg_val=NULL;
+	GF_EventPropagateType prop_mask = 0;
+	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;
+
+	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;
+		goto exit;
+	}
+	if (jsf)
+		gf_filter_send_update(jsf->filter, filter_id, arg_name, arg_val, prop_mask);
+	else
+		gf_filter_send_update(jsfi->filter, filter_id, arg_name, arg_val, prop_mask);
+
+exit:
+	JS_FreeCString(ctx, filter_id);
+	JS_FreeCString(ctx, arg_name);
+	JS_FreeCString(ctx, arg_val);
+	return ret;
+}
+
+static JSValue jsf_filter_load_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, GF_JSFilterMode mode)
+{
+	const char *url=NULL;
+	const char *parent=NULL;
+	GF_Err e=GF_OK;
+	GF_JSFilterInstanceCtx *f_ctx;
+	GF_JSFilterCtx *jsf = JS_GetOpaque(this_val, jsf_filter_class_id);
+    if (!jsf || !argc) return JS_EXCEPTION;
+    url = JS_ToCString(ctx, argv[0]);
+	if (!url) return JS_EXCEPTION;
+
+	if ((mode==JSF_FINST_SOURCE) && (argc>1)) {
+		parent = JS_ToCString(ctx, argv[1]);
+		if (!parent) {
+			JS_FreeCString(ctx, url);
+			return JS_EXCEPTION;
+		}
+	}
+	GF_SAFEALLOC(f_ctx, GF_JSFilterInstanceCtx);
+	if (!f_ctx) {
+		JS_FreeCString(ctx, url);
+		JS_FreeCString(ctx, parent);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+
+	f_ctx->fmode = mode;
+	if (mode==JSF_FINST_SOURCE) {
+		f_ctx->filter = gf_filter_connect_source(jsf->filter, url, parent, &e);
+	} else if (mode==JSF_FINST_DEST) {
+		f_ctx->filter = gf_filter_connect_destination(jsf->filter, url, &e);
+	} else {
+		f_ctx->filter = gf_filter_load_filter(jsf->filter, url, &e);
+	}
+	JS_FreeCString(ctx, url);
+	JS_FreeCString(ctx, parent);
+	if (!f_ctx->filter) {
+		gf_free(f_ctx);
+		return js_throw_err(ctx, e);
+	}
+	f_ctx->jsf = jsf;
+	f_ctx->setup_failure_fun = JS_UNDEFINED;
+	f_ctx->filter_obj = JS_NewObjectClass(ctx, jsf_filter_inst_class_id);
+	JS_SetOpaque(f_ctx->filter_obj, f_ctx);
+	return f_ctx->filter_obj;
+}
+
+static JSValue jsf_filter_add_source(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_filter_load_filter(ctx, this_val, argc, argv, JSF_FINST_SOURCE);
+
+}
+static JSValue jsf_filter_add_dest(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_filter_load_filter(ctx, this_val, argc, argv, JSF_FINST_DEST);
+}
+static JSValue jsf_filter_add_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_filter_load_filter(ctx, this_val, argc, argv, JSF_FINST_FILTER);
+}
+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;
+	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;
+	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;
+	gf_filter_block_eos(jsf->filter, JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE);
+	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),
+    JS_CGETSET_MAGIC_DEF("configure_pid", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_CONFIGURE_PID),
+    JS_CGETSET_MAGIC_DEF("process", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_PROCESS),
+    JS_CGETSET_MAGIC_DEF("process_event", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_PROCESS_EVENT),
+    JS_CGETSET_MAGIC_DEF("update_arg", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_UPDATE_ARG),
+    JS_CGETSET_MAGIC_DEF("probe_data", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_PROBE_DATA),
+    JS_CGETSET_MAGIC_DEF("probe_url", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_PROBE_URL),
+    JS_CGETSET_MAGIC_DEF("reconfigure_output", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_RECONFIGURE_OUTPUT),
+    JS_CGETSET_MAGIC_DEF("remove_pid", jsf_filter_prop_get, jsf_filter_prop_set, JSF_EVT_REMOVE_PID),
+    JS_CGETSET_MAGIC_DEF("max_pids", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_MAX_PIDS),
+    JS_CGETSET_MAGIC_DEF("block_enabled", jsf_filter_prop_get, NULL, JSF_FILTER_BLOCK_ENABLED),
+    JS_CGETSET_MAGIC_DEF("output_buffer", jsf_filter_prop_get, NULL, JSF_FILTER_OUTPUT_BUFFER),
+    JS_CGETSET_MAGIC_DEF("output_playout", jsf_filter_prop_get, NULL, JSF_FILTER_OUTPUT_PLAYOUT),
+    JS_CGETSET_MAGIC_DEF("sep_args", jsf_filter_prop_get, NULL, JSF_FILTER_SEP_ARGS),
+    JS_CGETSET_MAGIC_DEF("sep_name", jsf_filter_prop_get, NULL, JSF_FILTER_SEP_NAME),
+    JS_CGETSET_MAGIC_DEF("sep_list", jsf_filter_prop_get, NULL, JSF_FILTER_SEP_LIST),
+    JS_CGETSET_MAGIC_DEF("dst_args", jsf_filter_prop_get, NULL, JSF_FILTER_DST_ARGS),
+    JS_CGETSET_MAGIC_DEF("dst_name", jsf_filter_prop_get, NULL, JSF_FILTER_DST_NAME),
+    JS_CGETSET_MAGIC_DEF("sinks_done", jsf_filter_prop_get, NULL, JSF_FILTER_SINKS_DONE),
+    JS_CGETSET_MAGIC_DEF("reports_on", jsf_filter_prop_get, NULL, JSF_FILTER_REPORTING_ENABLED),
+    JS_CGETSET_MAGIC_DEF("max_screen_width", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_WIDTH),
+    JS_CGETSET_MAGIC_DEF("max_screen_height", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_HEIGHT),
+    JS_CGETSET_MAGIC_DEF("max_screen_depth", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_DISPLAY_DEPTH),
+    JS_CGETSET_MAGIC_DEF("max_screen_fps", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_FPS),
+    JS_CGETSET_MAGIC_DEF("max_screen_views", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_VIEWS),
+    JS_CGETSET_MAGIC_DEF("max_audio_channels", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_CHANNELS),
+    JS_CGETSET_MAGIC_DEF("max_audio_samplerate", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_SAMPLERATE),
+    JS_CGETSET_MAGIC_DEF("max_audio_depth", jsf_filter_prop_get, jsf_filter_prop_set, JSF_FILTER_CAPS_MAX_AUDIO_DEPTH),
+    JS_CGETSET_MAGIC_DEF("events_queued", jsf_filter_prop_get, NULL, JSF_FILTER_NB_EVTS_QUEUED),
+    JS_CGETSET_MAGIC_DEF("clock_hint_us", jsf_filter_prop_get, NULL, JSF_FILTER_CLOCK_HINT_TIME),
+    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_CFUNC_DEF("set_desc", 0, jsf_filter_set_desc),
+    JS_CFUNC_DEF("set_version", 0, jsf_filter_set_version),
+    JS_CFUNC_DEF("set_author", 0, jsf_filter_set_author),
+    JS_CFUNC_DEF("set_help", 0, jsf_filter_set_help),
+    JS_CFUNC_DEF("set_arg", 0, jsf_filter_set_arg),
+    JS_CFUNC_DEF("set_cap", 0, jsf_filter_set_cap),
+    JS_CFUNC_DEF("set_name", 0, jsf_filter_set_name),
+    JS_CFUNC_DEF("new_pid", 0, jsf_filter_new_pid),
+    JS_CFUNC_DEF("send_event", 0, jsf_filter_send_event),
+    JS_CFUNC_DEF("get_info", 0, jsf_filter_get_info),
+    JS_CFUNC_DEF("is_supported_mime", 0, jsf_filter_is_supported_mime),
+    JS_CFUNC_DEF("update_status", 0, jsf_filter_update_status),
+    JS_CFUNC_DEF("reschedule", 0, jsf_filter_reschedule_in),
+    JS_CFUNC_DEF("post_task", 0, jsf_filter_post_task),
+    JS_CFUNC_DEF("notify_failure", 0, jsf_filter_notify_failure),
+    JS_CFUNC_DEF("is_supported_source", 0, jsf_filter_is_supported_source),
+    JS_CFUNC_DEF("hint_clock", 0, jsf_filter_hint_clock),
+    JS_CFUNC_DEF("send_update", 0, jsf_filter_send_update),
+    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("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),
+};
+
+
+
+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->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 (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);
+		if (fi_stop) stop_at = fi_stop->filter;
+		else if (f_stop) stop_at = f_stop->filter;
+	} else if (jsfi->fmode==JSF_FINST_SOURCE) {
+		stop_at = jsfi->jsf->filter;
+	}
+	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)
+{
+	GF_JSFilterInstanceCtx *f_inst = on_setup_error_udta;
+	JSValue ret, argv[1];
+	gf_js_lock(f_inst->jsf->ctx, GF_TRUE);
+
+	argv[0] = JS_NewInt32(f_inst->jsf->ctx, e);
+
+	ret = JS_Call(f_inst->jsf->ctx, f_inst->setup_failure_fun, f_inst->filter_obj, 0, NULL);
+
+	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);
+}
+
+static JSValue jsf_filter_inst_prop_set(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+	GF_JSFilterInstanceCtx *f_inst = JS_GetOpaque(this_val, jsf_filter_inst_class_id);
+    if (!f_inst) return JS_EXCEPTION;
+
+	if (magic==0) {
+		if (JS_IsFunction(ctx, value) || JS_IsUndefined(value) || JS_IsNull(value)) {
+			if (JS_IsUndefined(f_inst->setup_failure_fun) && !JS_IsUndefined(value)) {
+
+				gf_filter_set_setup_failure_callback(f_inst->jsf->filter, f_inst->filter, jsf_on_setup_error, f_inst);
+			}
+			JS_FreeValue(ctx, f_inst->setup_failure_fun);
+			f_inst->setup_failure_fun = JS_DupValue(ctx, value);
+		}
+    	return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_filter_inst_get_arg(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+    arg_name = JS_ToCString(ctx, argv[0]);
+	if (!arg_name) return JS_EXCEPTION;
+	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);
+		res = arg_val ? JS_NewString(ctx, dump) : JS_NULL;
+	} else {
+		GF_PropertyValue p;
+		if (gf_filter_get_arg(f_inst->filter, arg_name, &p))
+			res = jsf_NewProp(ctx, &p);
+		else
+			res = JS_NULL;
+	}
+	JS_FreeCString(ctx, arg_name);
+	return res;
+}
+
+
+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;
+	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;
+    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_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("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),
+
+};
+
+
+static JSValue jsf_pid_set_prop(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+	u32 ival;
+	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;
+	switch (magic) {
+	case JSF_PID_NAME:
+		str = JS_ToCString(ctx, value);
+		gf_filter_pid_set_name(pctx->pid, str);
+    	break;
+	case JSF_PID_EOS:
+		if (JS_ToBool(ctx, value))
+			gf_filter_pid_set_eos(pctx->pid);
+    	break;
+	case JSF_PID_MAX_BUFFER:
+		if (JS_ToInt32(ctx, &ival, value))
+			return JS_EXCEPTION;
+		gf_filter_pid_set_max_buffer(pctx->pid, ival);
+    	break;
+	case JSF_PID_LOOSE_CONNECT:
+		if (JS_ToBool(ctx, value))
+			gf_filter_pid_set_loose_connect(pctx->pid);
+    	break;
+	case JSF_PID_FRAMING_MODE:
+		gf_filter_pid_set_framing_mode(pctx->pid, JS_ToBool(ctx, value) );
+    	break;
+	case JSF_PID_CLOCK_MODE:
+		gf_filter_pid_set_clock_mode(pctx->pid, JS_ToBool(ctx, value) );
+		break;
+	case JSF_PID_DISCARD:
+		gf_filter_pid_set_discard(pctx->pid, JS_ToBool(ctx, value) );
+		break;
+	case JSF_PID_REQUIRE_SOURCEID:
+		if (JS_ToBool(ctx, value))
+			gf_filter_pid_require_source_id(pctx->pid);
+		break;
+	case JSF_PID_RECOMPUTE_DTS:
+		gf_filter_pid_recompute_dts(pctx->pid, JS_ToBool(ctx, value));
+		break;
+	}
+
+	if (str)
+		JS_FreeCString(ctx, str);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_get_prop(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	u64 dur;
+	char *str;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+	switch (magic) {
+	case JSF_PID_NAME:
+		return JS_NewString(ctx, gf_filter_pid_get_name(pctx->pid) );
+	case JSF_PID_EOS:
+		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_WOULD_BLOCK:
+		return JS_NewBool(ctx, gf_filter_pid_would_block(pctx->pid) );
+	case JSF_PID_FILTER_NAME:
+		return JS_NewString(ctx, gf_filter_pid_get_filter_name(pctx->pid) );
+	case JSF_PID_FILTER_SRC:
+		return JS_NewString(ctx, gf_filter_pid_get_source_filter_name(pctx->pid) );
+	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) );
+	case JSF_PID_MAX_BUFFER:
+		return JS_NewInt32(ctx, gf_filter_pid_get_max_buffer(pctx->pid) );
+	case JSF_PID_BUFFER:
+		return JS_NewInt64(ctx, gf_filter_pid_query_buffer_duration(pctx->pid, GF_FALSE) );
+	case JSF_PID_IS_FULL:
+		dur = gf_filter_pid_query_buffer_duration(pctx->pid, GF_TRUE);
+		return JS_NewBool(ctx, !dur ? 0 : 1);
+	case JSF_PID_FIRST_EMPTY:
+		return JS_NewBool (ctx, gf_filter_pid_first_packet_is_empty(pctx->pid) );
+	case JSF_PID_FIRST_CTS:
+		if (gf_filter_pid_get_first_packet_cts(pctx->pid, &dur))
+			return JS_NewInt64(ctx, dur);
+		else
+			return JS_NULL;
+	case JSF_PID_NB_PACKETS:
+		return JS_NewInt32(ctx, gf_filter_pid_get_packet_count(pctx->pid) );
+	case JSF_PID_TIMESCALE:
+		return JS_NewInt32(ctx, gf_filter_pid_get_timescale(pctx->pid) );
+	case JSF_PID_SRC_URL:
+		str = gf_filter_pid_get_source(pctx->pid);
+		if (str) {
+			JSValue res = JS_NewString(ctx, str);
+			gf_free(str);
+			return res;
+		}
+		return JS_NULL;
+	case JSF_PID_DST_URL:
+		str = gf_filter_pid_get_destination(pctx->pid);
+		if (str) {
+			JSValue res = JS_NewString(ctx, str);
+			gf_free(str);
+			return res;
+		}
+		return JS_NULL;
+	case JSF_PID_MIN_PCK_DUR:
+		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) );
+	}
+    return JS_UNDEFINED;
+}
+
+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;
+	GF_FilterEvent *evt = JS_GetOpaque(argv[0], jsf_event_class_id);
+    if (!evt) return JS_EXCEPTION;
+    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);
+	}
+	gf_filter_pid_send_event(pctx->pid, evt);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_enum_properties(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s32 idx;
+	u32 p4cc;
+	const char *pname;
+	JSValue res;
+	const GF_PropertyValue *prop;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &idx, argv[0]))
+		return JS_EXCEPTION;
+
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		prop = gf_filter_pid_enum_info(pctx->pid, &idx, &p4cc, &pname);
+	} else {
+		prop = gf_filter_pid_enum_properties(pctx->pid, &idx, &p4cc, &pname);
+	}
+	if (!prop) return JS_NULL;
+	if (!pname) pname = gf_props_4cc_get_name(p4cc);
+	if (!pname) return JS_EXCEPTION;
+
+	res = JS_NewObject(ctx);
+    JS_SetPropertyStr(ctx, res, "name", JS_NewString(ctx, pname));
+    JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+    JS_SetPropertyStr(ctx, res, "value", jsf_NewProp(ctx, prop));
+    return res;
+}
+
+static JSValue jsf_pid_get_property_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, Bool is_info)
+{
+	JSValue res;
+	const char *name=NULL;
+	const GF_PropertyValue *prop;
+	GF_PropertyEntry *pe = NULL;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+    name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		if (is_info) {
+			prop = gf_filter_pid_get_info_str(pctx->pid, name, &pe);
+		} else {
+			prop = gf_filter_pid_get_property_str(pctx->pid, name);
+		}
+		JS_FreeCString(ctx, name);
+		if (!prop) return JS_NULL;
+		res = jsf_NewProp(ctx, prop);
+		JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc) return JS_EXCEPTION;
+		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;
+		res = jsf_NewPropTranslate(ctx, prop, p4cc);
+	}
+	gf_filter_release_property(pe);
+    return res;
+}
+static JSValue jsf_pid_get_property(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_pid_get_property_ex(ctx, this_val, argc, argv, GF_FALSE);
+}
+static JSValue jsf_pid_get_info(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_pid_get_property_ex(ctx, this_val, argc, argv, GF_TRUE);
+}
+
+
+static JSValue jsf_pid_get_packet(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+
+    pck = gf_filter_pid_get_packet(pctx->pid);
+	if (!pck) return JS_NULL;
+
+	if (pctx->pck_head) {
+		pckctx = pctx->pck_head;
+		assert(pckctx->pck == pck);
+		return JS_DupValue(ctx, pckctx->jsobj);
+	}
+
+	res = JS_NewObjectClass(ctx, jsf_pck_class_id);
+	pckctx = gf_list_pop_back(pctx->jsf->pck_res);
+	if (!pckctx) {
+		GF_SAFEALLOC(pckctx, GF_JSPckCtx);
+		if (!pckctx) return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	memset(pckctx, 0, sizeof(GF_JSPckCtx));
+	pckctx->jspid = pctx;
+	pckctx->pck = pck;
+	pckctx->jsobj = JS_DupValue(ctx, res);
+	pckctx->ref_val = JS_UNDEFINED;
+	pckctx->data_ab = JS_UNDEFINED;
+	pctx->pck_head = pckctx;
+
+	JS_SetOpaque(res, pckctx);
+    return res;
+}
+static JSValue jsf_pid_drop_packet(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSPckCtx *pckctx;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+
+	if (!pctx->pck_head) {
+		if (gf_filter_pid_get_packet_count(pctx->pid)) {
+    		gf_filter_pid_drop_packet(pctx->pid);
+		}
+		return JS_UNDEFINED;
+	}
+
+	pckctx = pctx->pck_head;
+	pckctx->pck = NULL;
+	pctx->pck_head = NULL;
+	JS_FreeValue(ctx, pckctx->jsobj);
+	pckctx->jsobj = JS_UNDEFINED;
+    gf_filter_pid_drop_packet(pctx->pid);
+    return JS_UNDEFINED;
+}
+
+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;
+	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;
+	return JS_NewBool(ctx, gf_filter_pid_is_filter_in_parents(pctx->pid, f_ctx ? f_ctx->filter : fi_ctx->filter));
+}
+
+static JSValue jsf_pid_get_buffer_occupancy(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	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;
+
+	in_final_flush = !gf_filter_pid_get_buffer_occupancy(pctx->pid, &max_units, &nb_pck, &max_dur, &dur);
+	res = JS_NewObject(ctx);
+    JS_SetPropertyStr(ctx, res, "max_units", JS_NewInt32(ctx, max_units));
+    JS_SetPropertyStr(ctx, res, "nb_pck", JS_NewInt32(ctx, nb_pck));
+    JS_SetPropertyStr(ctx, res, "max_dur", JS_NewInt32(ctx, max_dur));
+    JS_SetPropertyStr(ctx, res, "dur", JS_NewInt32(ctx, dur));
+    JS_SetPropertyStr(ctx, res, "final_flush", JS_NewBool(ctx, in_final_flush));
+    return res;
+}
+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;
+	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;
+	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;
+    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;
+    gf_filter_pid_allow_direct_dispatch(pctx->pid);
+	return JS_UNDEFINED;
+}
+static JSValue jsf_pid_resolve_file_template(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 fileidx=0;
+	GF_Err e;
+	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;
+
+ 	templ = JS_ToCString(ctx, argv[0]);
+ 	if (!templ)
+    	return JS_EXCEPTION;
+
+	if ((argc>=2) && JS_ToInt32(ctx, &fileidx, argv[1])) {
+		JS_FreeCString(ctx, templ);
+    	return JS_EXCEPTION;
+	}
+
+	if (argc==3)
+ 		suffix = JS_ToCString(ctx, argv[2]);
+
+	e = gf_filter_pid_resolve_file_template(pctx->pid, (char *)templ, szFinal, fileidx, suffix);
+	JS_FreeCString(ctx, templ);
+
+	if (e)
+    	return js_throw_err(ctx, e);
+	return JS_NewString(ctx, szFinal);
+}
+
+static JSValue jsf_pid_query_caps(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+
+	name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		JSValue res;
+		prop = gf_filter_pid_caps_query_str(pctx->pid, name);
+		JS_FreeCString(ctx, name);
+		if (!prop) return JS_NULL;
+		res = jsf_NewProp(ctx, prop);
+		JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc)
+			return js_throw_err(ctx, GF_BAD_PARAM);
+
+		prop = gf_filter_pid_caps_query(pctx->pid, p4cc);
+		if (!prop) return JS_NULL;
+		return jsf_NewPropTranslate(ctx, prop, p4cc);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_get_statistics(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	u32 mode;
+	GF_Err e;
+	GF_FilterPidStatistics stats;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx || !argc) return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, &mode, argv[0]))
+		return JS_EXCEPTION;
+
+	e = gf_filter_pid_get_statistics(pctx->pid, &stats, mode);
+	if (e)
+    	return js_throw_err(ctx, e);
+
+	res = JS_NewObject(ctx);
+#define SET_PROP32(_val)\
+    JS_SetPropertyStr(ctx, res, #_val, JS_NewInt32(ctx, stats._val));
+#define SET_PROP64(_val)\
+    JS_SetPropertyStr(ctx, res, #_val, JS_NewInt64(ctx, stats._val));
+#define SET_PROPB(_val)\
+    JS_SetPropertyStr(ctx, res, #_val, JS_NewBool(ctx, stats._val));
+
+	SET_PROPB(disconnected)
+	SET_PROP32(average_process_rate)
+	SET_PROP32(max_process_rate)
+	SET_PROP32(avgerage_bitrate)
+	SET_PROP32(max_bitrate)
+	SET_PROP32(nb_processed)
+	SET_PROP32(max_process_time)
+	SET_PROP64(total_process_time)
+	SET_PROP64(first_process_time)
+	SET_PROP64(last_process_time)
+	SET_PROP32(min_frame_dur)
+	SET_PROP32(nb_saps)
+	SET_PROP32(max_sap_process_time)
+	SET_PROP64(total_sap_process_time)
+	SET_PROP64(max_buffer_time)
+	SET_PROP64(max_playout_time)
+	SET_PROP64(min_playout_time)
+	SET_PROP64(buffer_time)
+	SET_PROP32(nb_buffer_units)
+    return res;
+}
+
+void jsf_pck_shared_del(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck)
+{
+	u32 i, count;
+	GF_JSPidCtx *pctx = gf_filter_pid_get_udta(PID);
+	count = gf_list_count(pctx->shared_pck);
+	for (i=0; i<count; i++) {
+		GF_JSPckCtx *pckc = gf_list_get(pctx->shared_pck, i);
+		if (pckc->pck == pck) {
+			if (!JS_IsUndefined(pckc->cbck_val)) {
+				JSValue res = JS_Call(pctx->jsf->ctx, pckc->cbck_val, pctx->jsobj, 0, NULL);
+				JS_FreeValue(pctx->jsf->ctx, res);
+				JS_FreeValue(pctx->jsf->ctx, pckc->cbck_val);
+				pckc->cbck_val = JS_UNDEFINED;
+			}
+			JS_FreeValue(pctx->jsf->ctx, pckc->ref_val);
+			pckc->ref_val = JS_UNDEFINED;
+			jsf_pck_detach_ab(pctx->jsf->ctx, pckc);
+			memset(pckc, 0, sizeof(GF_JSPckCtx));
+			gf_list_add(pctx->jsf->pck_res, pckc);
+			gf_list_rem(pctx->shared_pck, i);
+			return;
+		}
+	}
+}
+
+
+#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);
+#endif
+
+static JSValue jsf_pid_new_packet(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	size_t ab_size;
+	u8 *data, *ab_data;
+	JSValue obj;
+	Bool use_shared=GF_FALSE;
+	GF_JSPckCtx *pckc;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+
+    if (!pctx) return JS_EXCEPTION;
+
+	pckc = gf_list_pop_back(pctx->jsf->pck_res);
+	if (!pckc) {
+		GF_SAFEALLOC(pckc, GF_JSPckCtx);
+		if (!pckc)
+			return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	obj = JS_NewObjectClass(ctx, jsf_pck_class_id);
+    if (JS_IsException(obj)) {
+    	gf_list_add(pctx->jsf->pck_res, pckc);
+		return JS_EXCEPTION;
+	}
+	JS_SetOpaque(obj, pckc);
+	pckc->jspid = pctx;
+	pckc->jsobj = obj;
+	pckc->cbck_val = JS_UNDEFINED;
+	pckc->ref_val = JS_UNDEFINED;
+	pckc->data_ab = JS_UNDEFINED;
+
+	if (argc>1)
+		use_shared = JS_ToBool(ctx, argv[1]);
+
+	if (!argc) {
+		pckc->pck = gf_filter_pck_new_alloc(pctx->pid, 0, NULL);
+		goto pck_done;
+	}
+	/*string or true alloc*/
+	if (JS_IsString(argv[0]) || JS_IsInteger(argv[0]) ) {
+		u32 len;
+		const char *str = NULL;
+		if (JS_IsInteger(argv[0]) ) {
+			if (use_shared)
+				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;
+			}
+		} else {
+ 			str = JS_ToCString(ctx, argv[0]);
+			len = (u32) strlen(str);
+		}
+		if (use_shared) {
+			pckc->pck = gf_filter_pck_new_shared(pctx->pid, str, len, jsf_pck_shared_del);
+			pckc->ref_val = JS_DupValue(ctx, argv[0]);
+			JS_FreeCString(ctx, str);
+			if (!pctx->shared_pck) pctx->shared_pck = gf_list_new();
+			gf_list_add(pctx->shared_pck, pckc);
+			pckc->flags = GF_JS_PCK_IS_SHARED;
+			if ((argc>2) && JS_IsFunction(ctx, argv[2]))
+				pckc->cbck_val = JS_DupValue(ctx, argv[2]);
+		} else {
+			u8 *pdata=NULL;
+			pckc->pck = gf_filter_pck_new_alloc(pctx->pid, len, &pdata);
+			if (str) {
+				memcpy(pdata, str, len);
+				JS_FreeCString(ctx, str);
+			}
+		}
+		goto pck_done;
+	}
+	//check packet reference
+	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);
+			if ((argc>2) && JS_IsFunction(ctx, argv[2]))
+				pckc->cbck_val = JS_DupValue(ctx, argv[2]);
+		} else {
+			u8 *new_data;
+			if ((argc>2) && JS_ToBool(ctx, argv[2])) {
+				pckc->pck = gf_filter_pck_new_copy(pctx->pid, pckc_ref->pck, &new_data);
+			} else {
+				pckc->pck = gf_filter_pck_new_clone(pctx->pid, pckc_ref->pck, &new_data);
+			}
+		}
+		goto pck_done;
+	}
+	//check array buffer
+
+	if (!JS_IsObject(argv[0])) {
+		JS_FreeValue(ctx, obj);
+		return JS_EXCEPTION;
+	}
+	ab_data = JS_GetArrayBuffer(ctx, &ab_size, argv[0]);
+	//this is an array buffer
+	if (ab_data) {
+		if (use_shared) {
+			pckc->pck = gf_filter_pck_new_shared(pctx->pid, ab_data, (u32) ab_size, jsf_pck_shared_del);
+			pckc->ref_val = JS_DupValue(ctx, argv[0]);
+			if (!pctx->shared_pck) pctx->shared_pck = gf_list_new();
+			gf_list_add(pctx->shared_pck, pckc);
+			pckc->flags = GF_JS_PCK_IS_SHARED;
+			if ((argc>2) && JS_IsFunction(ctx, argv[2]))
+				pckc->cbck_val = JS_DupValue(ctx, argv[2]);
+		} else {
+			pckc->pck = gf_filter_pck_new_alloc(pctx->pid, (u32) ab_size, &data);
+			if (!data) {
+				JS_FreeValue(ctx, obj);
+				return js_throw_err(ctx, GF_OUT_OF_MEM);
+			}
+			memcpy(data, ab_data, ab_size);
+		}
+		goto pck_done;
+	}
+	/*try WebGL canvas*/
+#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);
+	if (!JS_IsNull(res)) {
+		if (JS_IsException(res)) {
+			JS_FreeValue(ctx, obj);
+			return res;
+		}
+		assert(f_ifce);
+		pckc->pck = gf_filter_pck_new_frame_interface(pctx->pid, f_ifce, pck_del);
+		goto pck_done;
+	}
+#endif
+
+	JS_FreeValue(ctx, obj);
+	return JS_EXCEPTION;
+
+
+pck_done:
+	if (!pckc->pck) {
+		JS_FreeValue(ctx, obj);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	pckc->flags |= GF_JS_PCK_IS_OUTPUT;
+	return obj;
+}
+
+static JSValue jsf_pid_get_clock_info(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 timescale;
+	u64 val;
+	GF_FilterClockType cktype;
+	JSValue res;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+    cktype = gf_filter_pid_get_clock_info(pctx->pid, &val, &timescale);
+	res = JS_NewObject(ctx);
+    JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, cktype));
+    JS_SetPropertyStr(ctx, res, "timescale", JS_NewInt32(ctx, timescale));
+    JS_SetPropertyStr(ctx, res, "value", JS_NewInt64(ctx, val));
+	return res;
+}
+
+
+static JSValue jsf_pid_set_property_ex(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, u32 mode)
+{
+	GF_Err e;
+	GF_PropertyValue prop;
+	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;
+    name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+
+	if ((argc>2) && JS_ToBool(ctx, argv[2])) {
+		if (!JS_IsNull(argv[1])) {
+			e = jsf_ToProp(pctx->jsf->filter, ctx, argv[1], 0, &prop);
+			JS_FreeCString(ctx, name);
+			if (e)
+				return js_throw_err(ctx, e);
+			the_prop = &prop;
+		}
+		if (mode==1) {
+			e = gf_filter_pid_set_info_dyn(pctx->pid, (char *) name, &prop);
+		} else if (mode==2) {
+			e = gf_filter_pid_negociate_property_dyn(pctx->pid, (char *) name, &prop);
+		} else {
+			e = gf_filter_pid_set_property_dyn(pctx->pid, (char *) name, &prop);
+		}
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc) return JS_EXCEPTION;
+		if (!JS_IsNull(argv[1])) {
+			e = jsf_ToProp(pctx->jsf->filter, ctx, argv[1], p4cc, &prop);
+			if (e)
+				return js_throw_err(ctx, e);
+
+			the_prop = &prop;
+		}
+		if (mode==1) {
+			e = gf_filter_pid_set_info(pctx->pid, p4cc, the_prop);
+		} else if (mode==2) {
+			e = gf_filter_pid_negociate_property(pctx->pid, p4cc, the_prop);
+		} else {
+			e = gf_filter_pid_set_property(pctx->pid, p4cc, the_prop);
+		}
+	}
+
+	if (the_prop)
+		gf_props_reset_single(&prop);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+static JSValue jsf_pid_set_property(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 0);
+}
+static JSValue jsf_pid_set_info(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 1);
+}
+static JSValue jsf_pid_negociate_prop(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return jsf_pid_set_property_ex(ctx, this_val, argc, argv, 2);
+}
+
+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;
+    JS_SetOpaque(this_val, NULL);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_reset_props(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_JSPidCtx *pctx = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx) return JS_EXCEPTION;
+    e = gf_filter_pid_reset_properties(pctx->pid);
+	if (e) return js_throw_err(ctx, e);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_copy_props(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_JSPidCtx *pctx_this = JS_GetOpaque(this_val, jsf_pid_class_id);
+    if (!pctx_this || !argc) return JS_EXCEPTION;
+	GF_JSPidCtx *pctx_from = JS_GetOpaque(argv[0], jsf_pid_class_id);
+    if (!pctx_from) return JS_EXCEPTION;
+    e = gf_filter_pid_copy_properties(pctx_this->pid, pctx_from->pid);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pid_forward(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+	pckc = JS_GetOpaque(argv[0], jsf_pck_class_id);
+    if (!pckc || !pckc->pck) return JS_EXCEPTION;
+    e = gf_filter_pck_forward(pckc->pck, pctx->pid);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+
+static const JSCFunctionListEntry jsf_pid_funcs[] = {
+    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("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("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),
+    JS_CGETSET_MAGIC_DEF("buffer", jsf_pid_get_prop, NULL, JSF_PID_BUFFER),
+    JS_CGETSET_MAGIC_DEF("full", jsf_pid_get_prop, NULL, JSF_PID_IS_FULL),
+    JS_CGETSET_MAGIC_DEF("first_empty", jsf_pid_get_prop, NULL, JSF_PID_FIRST_EMPTY),
+    JS_CGETSET_MAGIC_DEF("first_cts", jsf_pid_get_prop, NULL, JSF_PID_FIRST_CTS),
+    JS_CGETSET_MAGIC_DEF("nb_pck_queued", jsf_pid_get_prop, NULL, JSF_PID_NB_PACKETS),
+    JS_CGETSET_MAGIC_DEF("timescale", jsf_pid_get_prop, NULL, JSF_PID_TIMESCALE),
+    JS_CGETSET_MAGIC_DEF("clock_mode", NULL, jsf_pid_set_prop, JSF_PID_CLOCK_MODE),
+    JS_CGETSET_MAGIC_DEF("discard", NULL, jsf_pid_set_prop, JSF_PID_DISCARD),
+    JS_CGETSET_MAGIC_DEF("src_url", jsf_pid_get_prop, NULL, JSF_PID_SRC_URL),
+    JS_CGETSET_MAGIC_DEF("dst_url", jsf_pid_get_prop, NULL, JSF_PID_DST_URL),
+    JS_CGETSET_MAGIC_DEF("require_source_id", NULL, jsf_pid_set_prop, JSF_PID_REQUIRE_SOURCEID),
+    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_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),
+    JS_CFUNC_DEF("get_info", 0, jsf_pid_get_info),
+    JS_CFUNC_DEF("get_packet", 0, jsf_pid_get_packet),
+    JS_CFUNC_DEF("drop_packet", 0, jsf_pid_drop_packet),
+    JS_CFUNC_DEF("is_filter_in_parents", 0, jsf_pid_is_filter_in_parents),
+    JS_CFUNC_DEF("get_buffer_occupancy", 0, jsf_pid_get_buffer_occupancy),
+    JS_CFUNC_DEF("clear_eos", 0, jsf_pid_clear_eos),
+    JS_CFUNC_DEF("check_caps", 0, jsf_pid_check_caps),
+    JS_CFUNC_DEF("discard_block", 0, jsf_pid_discard_block),
+    JS_CFUNC_DEF("allow_direct_dispatch", 0, jsf_pid_allow_direct_dispatch),
+    JS_CFUNC_DEF("resolve_file_template", 0, jsf_pid_resolve_file_template),
+    JS_CFUNC_DEF("query_caps", 0, jsf_pid_query_caps),
+    JS_CFUNC_DEF("get_stats", 0, jsf_pid_get_statistics),
+    JS_CFUNC_DEF("get_clock_info", 0, jsf_pid_get_clock_info),
+    JS_CFUNC_DEF("set_prop", 0, jsf_pid_set_property),
+    JS_CFUNC_DEF("set_info", 0, jsf_pid_set_info),
+    JS_CFUNC_DEF("new_packet", 0, jsf_pid_new_packet),
+    JS_CFUNC_DEF("remove", 0, jsf_pid_remove),
+    JS_CFUNC_DEF("reset_props", 0, jsf_pid_reset_props),
+    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),
+};
+
+enum
+{
+	JSF_EVENT_TYPE,
+	/*PLAY event*/
+	JSF_EVENT_START_RANGE,
+	JSF_EVENT_SPEED,
+	JSF_EVENT_HW_BUFFER_RESET,
+	JSF_EVENT_INITIAL_BROADCAST_PLAY,
+	JSF_EVENT_TIMESTAMP_BASED,
+	JSF_EVENT_FULL_FILE_ONLY,
+	JSF_EVENT_FORCE_DASH_SEG_SWITCH,
+	JSF_EVENT_FROM_PCK,
+	/*source switch*/
+	JSF_EVENT_START_OFFSET,
+	JSF_EVENT_END_OFFSET,
+	JSF_EVENT_SOURCE_SWITCH,
+	JSF_EVENT_SKIP_CACHE_EXPIRATION,
+	JSF_EVENT_HINT_BLOCK_SIZE,
+	/*segment size*/
+	JSF_EVENT_SEG_URL,
+	JSF_EVENT_SEG_IS_INIT,
+	JSF_EVENT_MEDIA_START_RANGE,
+	JSF_EVENT_MEDIA_END_RANGE,
+	JSF_EVENT_IDX_START_RANGE,
+	JSF_EVENT_IDX_END_RANGE,
+	/*quality switch*/
+	JSF_EVENT_SWITCH_UP,
+	JSF_EVENT_SWITCH_GROUP_IDX,
+	JSF_EVENT_SWITCH_QUALITY_IDX,
+	JSF_EVENT_SWITCH_TILE_MODE,
+	JSF_EVENT_SWITCH_QUALITY_DEGRADATION,
+	/*visibility hint*/
+	JSF_EVENT_VIS_MIN_X,
+	JSF_EVENT_VIS_MIN_Y,
+	JSF_EVENT_VIS_MAX_X,
+	JSF_EVENT_VIS_MAX_Y,
+	JSF_EVENT_VIS_IS_GAZE,
+	/*buffer requirements*/
+	JSF_EVENT_BUFREQ_MAX_BUFFER_US,
+	JSF_EVENT_BUFREQ_MAX_PLAYOUT_US,
+	JSF_EVENT_BUFREQ_MIN_PLAYOUT_US,
+	JSF_EVENT_BUFREQ_PID_ONLY,
+
+	JSF_EVENT_USER_TYPE,
+	JSF_EVENT_USER_KEYCODE,
+	JSF_EVENT_USER_MOUSE_X,
+	JSF_EVENT_USER_MOUSE_Y,
+	JSF_EVENT_USER_WHEEL,
+	JSF_EVENT_USER_BUTTON,
+	JSF_EVENT_USER_HWKEY,
+	JSF_EVENT_USER_DROPFILES,
+};
+
+static Bool jsf_check_evt(u32 evt_type, u8 ui_type, int magic)
+{
+	if (magic==JSF_EVENT_TYPE) return GF_TRUE;
+	switch (evt_type) {
+	case GF_FEVT_PLAY:
+		switch (magic) {
+		case JSF_EVENT_START_RANGE:
+		case JSF_EVENT_SPEED:
+		case JSF_EVENT_HW_BUFFER_RESET:
+		case JSF_EVENT_INITIAL_BROADCAST_PLAY:
+		case JSF_EVENT_TIMESTAMP_BASED:
+		case JSF_EVENT_FULL_FILE_ONLY:
+		case JSF_EVENT_FORCE_DASH_SEG_SWITCH:
+		case JSF_EVENT_FROM_PCK:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_SET_SPEED:
+		return (magic == JSF_EVENT_SPEED) ? GF_TRUE : GF_FALSE;
+	case GF_FEVT_SOURCE_SWITCH:
+		switch (magic) {
+		case JSF_EVENT_START_OFFSET:
+		case JSF_EVENT_END_OFFSET:
+		case JSF_EVENT_SOURCE_SWITCH:
+		case JSF_EVENT_SKIP_CACHE_EXPIRATION:
+		case JSF_EVENT_HINT_BLOCK_SIZE:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_SEGMENT_SIZE:
+		switch (magic) {
+		case JSF_EVENT_SEG_URL:
+		case JSF_EVENT_SEG_IS_INIT:
+		case JSF_EVENT_MEDIA_START_RANGE:
+		case JSF_EVENT_MEDIA_END_RANGE:
+		case JSF_EVENT_IDX_START_RANGE:
+		case JSF_EVENT_IDX_END_RANGE:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_QUALITY_SWITCH:
+		switch (magic) {
+		case JSF_EVENT_SWITCH_UP:
+		case JSF_EVENT_SWITCH_GROUP_IDX:
+		case JSF_EVENT_SWITCH_QUALITY_IDX:
+		case JSF_EVENT_SWITCH_TILE_MODE:
+		case JSF_EVENT_SWITCH_QUALITY_DEGRADATION:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_VISIBILITY_HINT:
+		switch (magic) {
+		case JSF_EVENT_VIS_MIN_X:
+		case JSF_EVENT_VIS_MIN_Y:
+		case JSF_EVENT_VIS_MAX_X:
+		case JSF_EVENT_VIS_MAX_Y:
+		case JSF_EVENT_VIS_IS_GAZE:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_BUFFER_REQ:
+		switch (magic) {
+		case JSF_EVENT_BUFREQ_MAX_BUFFER_US:
+		case JSF_EVENT_BUFREQ_MAX_PLAYOUT_US:
+		case JSF_EVENT_BUFREQ_MIN_PLAYOUT_US:
+		case JSF_EVENT_BUFREQ_PID_ONLY:
+			return GF_TRUE;
+		default:
+			return GF_FALSE;
+		}
+		break;
+	case GF_FEVT_USER:
+		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:
+			switch (magic) {
+			case JSF_EVENT_USER_TYPE:
+			case JSF_EVENT_USER_MOUSE_X:
+			case JSF_EVENT_USER_MOUSE_Y:
+			case JSF_EVENT_USER_WHEEL:
+			case JSF_EVENT_USER_BUTTON:
+				return GF_TRUE;
+			default:
+				break;
+			}
+			return GF_FALSE;
+		case GF_EVENT_KEYUP:
+		case GF_EVENT_KEYDOWN:
+		case GF_EVENT_LONGKEYPRESS:
+		case GF_EVENT_TEXTINPUT:
+			switch (magic) {
+			case JSF_EVENT_USER_TYPE:
+			case JSF_EVENT_USER_KEYCODE:
+			case JSF_EVENT_USER_HWKEY:
+			case JSF_EVENT_USER_DROPFILES:
+				return GF_TRUE;
+			default:
+				break;
+			}
+			return GF_FALSE;
+		}
+	}
+	return GF_FALSE;
+}
+
+
+static JSValue jsf_event_set_prop(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+	GF_Err e = GF_OK;
+	u32 ival;
+	const char *str=NULL;
+	GF_FilterEvent *evt = JS_GetOpaque(this_val, jsf_event_class_id);
+    if (!evt) return JS_EXCEPTION;
+	if (!jsf_check_evt(evt->base.type, 0, magic))
+		return JS_EXCEPTION;
+
+	switch (magic) {
+	case JSF_EVENT_TYPE:
+		return JS_EXCEPTION;
+	/*PLAY*/
+	case JSF_EVENT_START_RANGE:
+		return JS_ToFloat64(ctx, &evt->play.start_range, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_SPEED:
+		return JS_ToFloat64(ctx, &evt->play.speed, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_HW_BUFFER_RESET:
+		evt->play.hw_buffer_reset = JS_ToBool(ctx, value);
+		return JS_UNDEFINED;
+	case JSF_EVENT_INITIAL_BROADCAST_PLAY:
+		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;
+		evt->play.timestamp_based = (u8) ival;
+		return JS_UNDEFINED;
+	case JSF_EVENT_FULL_FILE_ONLY:
+		evt->play.full_file_only = JS_ToBool(ctx, value);
+		return JS_UNDEFINED;
+	case JSF_EVENT_FORCE_DASH_SEG_SWITCH:
+		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;
+	/*source switch*/
+	case JSF_EVENT_START_OFFSET:
+		return JS_ToInt64(ctx, &evt->seek.start_offset, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_END_OFFSET:
+		return JS_ToInt64(ctx, &evt->seek.end_offset, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_SOURCE_SWITCH:
+		/*TODO check leak!*/
+		evt->seek.source_switch = JS_ToCString(ctx, value);
+		return JS_UNDEFINED;
+	case JSF_EVENT_SKIP_CACHE_EXPIRATION:
+		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;
+	/*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);
+		return JS_UNDEFINED;
+	case JSF_EVENT_MEDIA_START_RANGE:
+		return JS_ToInt64(ctx, &evt->seg_size.media_range_start, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_MEDIA_END_RANGE:
+		return JS_ToInt64(ctx, &evt->seg_size.media_range_end, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_IDX_START_RANGE:
+		return JS_ToInt64(ctx, &evt->seg_size.idx_range_start, value) ? JS_EXCEPTION : JS_UNDEFINED;
+	case JSF_EVENT_IDX_END_RANGE:
+		return JS_ToInt64(ctx, &evt->seg_size.idx_range_end, value) ? JS_EXCEPTION : 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;
+	case JSF_EVENT_SWITCH_QUALITY_IDX:
+		return JS_ToInt32(ctx, &evt->quality_switch.q_idx, value) ? JS_EXCEPTION : 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;
+	case JSF_EVENT_SWITCH_QUALITY_DEGRADATION:
+		return JS_ToInt32(ctx, &evt->quality_switch.quality_degradation, value) ? JS_EXCEPTION : 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_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_PID_ONLY:
+		evt->buffer_req.pid_only = JS_ToBool(ctx, value);
+		return JS_UNDEFINED;
+	}
+
+	if (str)
+		JS_FreeCString(ctx, str);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+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 (!jsf_check_evt(evt->base.type, evt->user_event.event.type, magic))
+		return JS_EXCEPTION;
+	switch (magic) {
+	/*PLAY*/
+	case JSF_EVENT_TYPE: return JS_NewInt32(ctx, evt->base.type);
+	case JSF_EVENT_START_RANGE: return JS_NewFloat64(ctx, evt->play.start_range);
+	case JSF_EVENT_SPEED: return JS_NewFloat64(ctx, evt->play.speed);
+	case JSF_EVENT_HW_BUFFER_RESET: return JS_NewBool(ctx, evt->play.hw_buffer_reset);
+	case JSF_EVENT_INITIAL_BROADCAST_PLAY: return JS_NewBool(ctx, evt->play.initial_broadcast_play);
+	case JSF_EVENT_TIMESTAMP_BASED: return JS_NewInt32(ctx, evt->play.timestamp_based);
+	case JSF_EVENT_FULL_FILE_ONLY: return JS_NewBool(ctx, evt->play.full_file_only);
+	case JSF_EVENT_FORCE_DASH_SEG_SWITCH: return JS_NewBool(ctx, evt->play.forced_dash_segment_switch);
+	case JSF_EVENT_FROM_PCK: return JS_NewInt32(ctx, evt->play.from_pck);
+	/*source switch*/
+	case JSF_EVENT_START_OFFSET: return JS_NewInt64(ctx, evt->seek.start_offset);
+	case JSF_EVENT_END_OFFSET: return JS_NewInt64(ctx, evt->seek.end_offset);
+	case JSF_EVENT_SOURCE_SWITCH: return JS_NewString(ctx, evt->seek.source_switch);
+	case JSF_EVENT_SKIP_CACHE_EXPIRATION: return JS_NewBool(ctx, evt->seek.skip_cache_expiration);
+	case JSF_EVENT_HINT_BLOCK_SIZE: return JS_NewInt32(ctx, evt->seek.hint_block_size);
+	/*segment size*/
+	case JSF_EVENT_SEG_URL: return JS_NewString(ctx, evt->seg_size.seg_url);
+	case JSF_EVENT_SEG_IS_INIT: return JS_NewBool(ctx, evt->seg_size.is_init);
+	case JSF_EVENT_MEDIA_START_RANGE: return JS_NewInt64(ctx, evt->seg_size.media_range_start);
+	case JSF_EVENT_MEDIA_END_RANGE: return JS_NewInt64(ctx, evt->seg_size.media_range_end);
+	case JSF_EVENT_IDX_START_RANGE: return JS_NewInt64(ctx, evt->seg_size.media_range_start);
+	case JSF_EVENT_IDX_END_RANGE: return JS_NewInt64(ctx, evt->seg_size.idx_range_end);
+	/*quality switch*/
+	case JSF_EVENT_SWITCH_UP: return JS_NewBool(ctx, evt->quality_switch.up);
+	case JSF_EVENT_SWITCH_GROUP_IDX: return JS_NewInt32(ctx, evt->quality_switch.dependent_group_index);
+	case JSF_EVENT_SWITCH_QUALITY_IDX: return JS_NewInt32(ctx, evt->quality_switch.q_idx);
+	case JSF_EVENT_SWITCH_TILE_MODE: return JS_NewInt32(ctx, evt->quality_switch.set_tile_mode_plus_one);
+	case JSF_EVENT_SWITCH_QUALITY_DEGRADATION: return JS_NewInt32(ctx, evt->quality_switch.quality_degradation);
+	/*visibility hint*/
+	case JSF_EVENT_VIS_MIN_X: return JS_NewInt32(ctx, evt->visibility_hint.min_x);
+	case JSF_EVENT_VIS_MIN_Y: return JS_NewInt32(ctx, evt->visibility_hint.min_y);
+	case JSF_EVENT_VIS_MAX_X: return JS_NewInt32(ctx, evt->visibility_hint.max_x);
+	case JSF_EVENT_VIS_MAX_Y: return JS_NewInt32(ctx, evt->visibility_hint.max_y);
+	case JSF_EVENT_VIS_IS_GAZE: return JS_NewBool(ctx, evt->visibility_hint.is_gaze);
+	/*buffer reqs*/
+	case JSF_EVENT_BUFREQ_MAX_BUFFER_US: return JS_NewInt32(ctx, evt->buffer_req.max_buffer_us);
+	case JSF_EVENT_BUFREQ_MAX_PLAYOUT_US: return JS_NewInt32(ctx, evt->buffer_req.max_playout_us);
+	case JSF_EVENT_BUFREQ_MIN_PLAYOUT_US: return JS_NewInt32(ctx, evt->buffer_req.min_playout_us);
+	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:
+#ifndef GPAC_DISABLE_SVG
+		return JS_NewString(ctx, gf_dom_get_key_name(evt->user_event.event.key.key_code) );
+#else
+		return JS_NULL;
+#endif
+
+	case JSF_EVENT_USER_MOUSE_X: return JS_NewInt32(ctx, evt->user_event.event.mouse.x);
+	case JSF_EVENT_USER_MOUSE_Y: return JS_NewInt32(ctx, evt->user_event.event.mouse.y);
+	case JSF_EVENT_USER_WHEEL: return JS_NewFloat64(ctx, FIX2FLT(evt->user_event.event.mouse.wheel_pos));
+	case JSF_EVENT_USER_BUTTON: return JS_NewInt32(ctx,  evt->user_event.event.mouse.button);
+	case JSF_EVENT_USER_HWKEY: return JS_NewInt32(ctx, evt->user_event.event.key.hw_code);
+	case JSF_EVENT_USER_DROPFILES:
+	{
+		u32 i, idx;
+		JSValue files_array = JS_NewArray(ctx);
+		idx=0;
+		for (i=0; i<evt->user_event.event.open_file.nb_files; i++) {
+			if (evt->user_event.event.open_file.files[i]) {
+				JS_SetPropertyUint32(ctx, files_array, idx, JS_NewString(ctx, evt->user_event.event.open_file.files[i]) );
+				idx++;
+			}
+		}
+		return files_array;
+	}
+
+	}
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry jsf_event_funcs[] =
+{
+    JS_CGETSET_MAGIC_DEF("type", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_TYPE),
+    /*PLAY event*/
+    JS_CGETSET_MAGIC_DEF("start_range", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_START_RANGE),
+    JS_CGETSET_MAGIC_DEF("speed", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SPEED),
+    JS_CGETSET_MAGIC_DEF("hw_buffer_reset", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_HW_BUFFER_RESET),
+    JS_CGETSET_MAGIC_DEF("initial_broadcast_play", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_INITIAL_BROADCAST_PLAY),
+    JS_CGETSET_MAGIC_DEF("timestamp_based", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_TIMESTAMP_BASED),
+    JS_CGETSET_MAGIC_DEF("full_file_only", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_FULL_FILE_ONLY),
+    JS_CGETSET_MAGIC_DEF("forced_dash_segment_switch", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_FORCE_DASH_SEG_SWITCH),
+    JS_CGETSET_MAGIC_DEF("from_pck", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_FROM_PCK),
+	/*source switch*/
+    JS_CGETSET_MAGIC_DEF("start_offset", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_START_OFFSET),
+    JS_CGETSET_MAGIC_DEF("end_offset", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_END_OFFSET),
+    JS_CGETSET_MAGIC_DEF("switch_url", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SOURCE_SWITCH),
+    JS_CGETSET_MAGIC_DEF("skip_cache_exp", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SKIP_CACHE_EXPIRATION),
+    JS_CGETSET_MAGIC_DEF("hint_block_size", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_HINT_BLOCK_SIZE),
+	/*segment size*/
+    JS_CGETSET_MAGIC_DEF("seg_url", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SEG_URL),
+    JS_CGETSET_MAGIC_DEF("is_init", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SEG_IS_INIT),
+    JS_CGETSET_MAGIC_DEF("media_start_range", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_MEDIA_START_RANGE),
+    JS_CGETSET_MAGIC_DEF("media_end_range", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_MEDIA_END_RANGE),
+    JS_CGETSET_MAGIC_DEF("index_start_range", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_IDX_START_RANGE),
+    JS_CGETSET_MAGIC_DEF("index_end_range", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_IDX_END_RANGE),
+	/*quality switch*/
+    JS_CGETSET_MAGIC_DEF("up", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SWITCH_UP),
+    JS_CGETSET_MAGIC_DEF("dependent_group_index", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SWITCH_GROUP_IDX),
+    JS_CGETSET_MAGIC_DEF("q_idx", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SWITCH_QUALITY_IDX),
+    JS_CGETSET_MAGIC_DEF("set_tile_mode_plus_one", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SWITCH_TILE_MODE),
+    JS_CGETSET_MAGIC_DEF("quality_degradation", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_SWITCH_QUALITY_DEGRADATION),
+    /*visibility hint*/
+    JS_CGETSET_MAGIC_DEF("min_x", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_VIS_MIN_X),
+    JS_CGETSET_MAGIC_DEF("min_y", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_VIS_MIN_Y),
+    JS_CGETSET_MAGIC_DEF("max_x", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_VIS_MAX_X),
+    JS_CGETSET_MAGIC_DEF("max_y", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_VIS_MAX_Y),
+    JS_CGETSET_MAGIC_DEF("is_gaze", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_VIS_IS_GAZE),
+    /*buffer reqs*/
+    JS_CGETSET_MAGIC_DEF("max_buffer_us", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_BUFREQ_MAX_BUFFER_US),
+    JS_CGETSET_MAGIC_DEF("max_playout_us", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_BUFREQ_MAX_PLAYOUT_US),
+    JS_CGETSET_MAGIC_DEF("min_playout_us", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_BUFREQ_MIN_PLAYOUT_US),
+    JS_CGETSET_MAGIC_DEF("pid_only", jsf_event_get_prop, jsf_event_set_prop, JSF_EVENT_BUFREQ_PID_ONLY),
+    /*ui events*/
+    JS_CGETSET_MAGIC_DEF("ui_type", jsf_event_get_prop, NULL, JSF_EVENT_USER_TYPE),
+    JS_CGETSET_MAGIC_DEF("keycode", jsf_event_get_prop, NULL, JSF_EVENT_USER_KEYCODE),
+    JS_CGETSET_MAGIC_DEF("mouse_x", jsf_event_get_prop, NULL, JSF_EVENT_USER_MOUSE_X),
+    JS_CGETSET_MAGIC_DEF("mouse_y", jsf_event_get_prop, NULL, JSF_EVENT_USER_MOUSE_Y),
+    JS_CGETSET_MAGIC_DEF("wheel", jsf_event_get_prop, NULL, JSF_EVENT_USER_WHEEL),
+    JS_CGETSET_MAGIC_DEF("button", jsf_event_get_prop, NULL, JSF_EVENT_USER_BUTTON),
+    JS_CGETSET_MAGIC_DEF("hwkey", jsf_event_get_prop, NULL, JSF_EVENT_USER_HWKEY),
+    JS_CGETSET_MAGIC_DEF("dropfiles", jsf_event_get_prop, NULL, JSF_EVENT_USER_DROPFILES),
+};
+
+static JSValue jsf_event_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	GF_FilterEvent *evt;
+    JSValue obj;
+    s32 type;
+	if (argc!=1)
+		return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, &type, argv[0]))
+		return JS_EXCEPTION;
+	if (!type)
+    	return JS_EXCEPTION;
+    obj = JS_NewObjectClass(ctx, jsf_event_class_id);
+    if (JS_IsException(obj)) return obj;
+
+	GF_SAFEALLOC(evt, GF_FilterEvent);
+    if (!evt) {
+        JS_FreeValue(ctx, obj);
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+    }
+    evt->base.type = type;
+    if (type==GF_FEVT_PLAY)
+    	evt->play.speed = 1.0;
+    JS_SetOpaque(obj, evt);
+    return obj;
+}
+
+enum
+{
+	JSF_PCK_START = 0,
+	JSF_PCK_END,
+	JSF_PCK_DTS,
+	JSF_PCK_CTS,
+	JSF_PCK_DUR,
+	JSF_PCK_SAP,
+	JSF_PCK_TIMESCALE,
+	JSF_PCK_INTERLACED,
+	JSF_PCK_SEEK,
+	JSF_PCK_CORRUPTED,
+	JSF_PCK_BYTE_OFFSET,
+	JSF_PCK_ROLL,
+	JSF_PCK_CRYPT,
+	JSF_PCK_CLOCK_TYPE,
+	JSF_PCK_CAROUSEL,
+	JSF_PCK_SEQNUM,
+	JSF_PCK_BLOCKING_REF,
+	JSF_PCK_DEPENDS_ON,
+	JSF_PCK_DEPENDED_ON,
+	JSF_PCK_IS_LEADING,
+	JSF_PCK_HAS_REDUNDANT,
+	JSF_PCK_SIZE,
+	JSF_PCK_DATA,
+	JSF_PCK_FRAME_IFCE,
+};
+
+static JSValue jsf_pck_set_prop(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+	GF_Err e = GF_OK;
+	u32 ival, flags;
+	u64 lival;
+	Bool a1, a2;
+	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;
+    pck = pckctx->pck;
+
+    switch (magic) {
+	case JSF_PCK_START:
+		gf_filter_pck_get_framing(pck, &a1, &a2);
+		gf_filter_pck_set_framing(pck, JS_ToBool(ctx, value), a2);
+		break;
+	case JSF_PCK_END:
+		gf_filter_pck_get_framing(pck, &a1, &a2);
+		gf_filter_pck_set_framing(pck, a1, JS_ToBool(ctx, value));
+		break;
+	case JSF_PCK_DTS:
+		if (JS_IsNull(value))
+			gf_filter_pck_set_dts(pck, GF_FILTER_NO_TS);
+		else {
+			if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+			gf_filter_pck_set_dts(pck, lival);
+		}
+		break;
+	case JSF_PCK_CTS:
+		if (JS_IsNull(value))
+			gf_filter_pck_set_cts(pck, GF_FILTER_NO_TS);
+		else {
+			if (JS_ToInt64(ctx, &lival, value)) return JS_EXCEPTION;
+			gf_filter_pck_set_cts(pck, lival);
+		}
+		break;
+	case JSF_PCK_DUR:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_duration(pck, ival);
+		break;
+	case JSF_PCK_SAP:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_sap(pck, ival);
+		break;
+	case JSF_PCK_INTERLACED:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_interlaced(pck, ival);
+		break;
+	case JSF_PCK_SEEK:
+		gf_filter_pck_set_seek_flag(pck, JS_ToBool(ctx, value));
+		break;
+	case JSF_PCK_CORRUPTED:
+		gf_filter_pck_set_corrupted(pck, JS_ToBool(ctx, value));
+		break;
+	case JSF_PCK_BYTE_OFFSET:
+		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;
+			gf_filter_pck_set_byte_offset(pck, lival);
+		}
+		break;
+	case JSF_PCK_ROLL:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_roll_info(pck, (s16) ival);
+		break;
+	case JSF_PCK_CRYPT:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_crypt_flags(pck, ival);
+		break;
+	case JSF_PCK_CLOCK_TYPE:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_clock_type(pck, ival);
+		break;
+	case JSF_PCK_CAROUSEL:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_carousel_version(pck, ival);
+		break;
+	case JSF_PCK_SEQNUM:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_filter_pck_set_seq_num(pck, ival);
+		break;
+	case JSF_PCK_IS_LEADING:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		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;
+		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;
+		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;
+		flags = gf_filter_pck_get_dependency_flags(pck);
+		flags &= 0xFC;
+		flags |= (ival & 0x3);
+		gf_filter_pck_set_seq_num(pck, flags);
+		break;
+	}
+	if (str)
+		JS_FreeCString(ctx, str);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pck_get_prop(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	Bool a1, a2;
+	u64 lival;
+	u32 ival;
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+    pck = pckctx->pck;
+
+	switch (magic) {
+	case JSF_PCK_START:
+		gf_filter_pck_get_framing(pck, &a1, &a2);
+		return JS_NewBool(ctx, a1);
+	case JSF_PCK_END:
+		gf_filter_pck_get_framing(pck, &a1, &a2);
+		return JS_NewBool(ctx, a2);
+	case JSF_PCK_DTS:
+		lival = gf_filter_pck_get_dts(pck);
+		if (lival==GF_FILTER_NO_TS) return JS_NULL;
+		return JS_NewInt64(ctx, lival);
+	case JSF_PCK_CTS:
+		lival = gf_filter_pck_get_cts(pck);
+		if (lival==GF_FILTER_NO_TS) return JS_NULL;
+		return JS_NewInt64(ctx, lival);
+	case JSF_PCK_DUR:
+		return JS_NewInt32(ctx, gf_filter_pck_get_duration(pck));
+	case JSF_PCK_SAP:
+		return JS_NewInt32(ctx, gf_filter_pck_get_sap(pck));
+	case JSF_PCK_TIMESCALE:
+		return JS_NewInt32(ctx, gf_filter_pck_get_timescale(pck));
+	case JSF_PCK_INTERLACED:
+		return JS_NewInt32(ctx, gf_filter_pck_get_interlaced(pck));
+	case JSF_PCK_SEEK:
+		return JS_NewBool(ctx, gf_filter_pck_get_seek_flag(pck));
+	case JSF_PCK_CORRUPTED:
+		return JS_NewBool(ctx, gf_filter_pck_get_corrupted(pck));
+	case JSF_PCK_BYTE_OFFSET:
+		lival = gf_filter_pck_get_byte_offset(pck);
+		if (lival==GF_FILTER_NO_TS) return JS_NULL;
+		return JS_NewInt64(ctx, lival);
+	case JSF_PCK_ROLL:
+		return JS_NewInt32(ctx, gf_filter_pck_get_roll_info(pck));
+	case JSF_PCK_CRYPT:
+		return JS_NewInt32(ctx, gf_filter_pck_get_crypt_flags(pck));
+	case JSF_PCK_CLOCK_TYPE:
+		return JS_NewInt32(ctx, gf_filter_pck_get_clock_type(pck));
+	case JSF_PCK_CAROUSEL:
+		return JS_NewInt32(ctx, gf_filter_pck_get_carousel_version(pck));
+	case JSF_PCK_SEQNUM:
+		return JS_NewInt32(ctx, gf_filter_pck_get_seq_num(pck));
+	case JSF_PCK_BLOCKING_REF:
+		return JS_NewBool(ctx, gf_filter_pck_is_blocking_ref(pck));
+	case JSF_PCK_IS_LEADING:
+		ival = gf_filter_pck_get_dependency_flags(pck);
+		return JS_NewBool(ctx, (ival>>6) & 0x3);
+	case JSF_PCK_DEPENDS_ON:
+		ival = gf_filter_pck_get_dependency_flags(pck);
+		return JS_NewBool(ctx, (ival>>4) & 0x3);
+	case JSF_PCK_DEPENDED_ON:
+		ival = gf_filter_pck_get_dependency_flags(pck);
+		return JS_NewBool(ctx, (ival>>2) & 0x3);
+	case JSF_PCK_HAS_REDUNDANT:
+		ival = gf_filter_pck_get_dependency_flags(pck);
+		return JS_NewBool(ctx, (ival) & 0x3);
+	case JSF_PCK_SIZE:
+		gf_filter_pck_get_data(pck, &ival);
+		return JS_NewInt32(ctx, ival);
+	case JSF_PCK_DATA:
+		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);
+		}
+		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);
+		else return JS_NewBool(ctx, 0);
+	}
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pck_set_readonly(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+    pck = pckctx->pck;
+
+	gf_filter_pck_set_readonly(pck);
+    return JS_UNDEFINED;
+}
+static JSValue jsf_pck_enum_properties(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s32 idx;
+	u32 p4cc;
+	const char *pname;
+	JSValue res;
+	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;
+    pck = pckctx->pck;
+
+    if (JS_ToInt32(ctx, &idx, argv[0]))
+		return JS_EXCEPTION;
+
+	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;
+
+	res = JS_NewObject(ctx);
+    JS_SetPropertyStr(ctx, res, "name", JS_NewString(ctx, pname));
+    JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+    JS_SetPropertyStr(ctx, res, "value", jsf_NewProp(ctx, prop));
+    return res;
+}
+
+static JSValue jsf_pck_get_property(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	const char *name=NULL;
+	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;
+    pck = pckctx->pck;
+
+    name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		prop = gf_filter_pck_get_property_str(pck, name);
+		JS_FreeCString(ctx, name);
+		if (!prop) return JS_NULL;
+		res = jsf_NewProp(ctx, prop);
+		JS_SetPropertyStr(ctx, res, "type", JS_NewInt32(ctx, prop->type));
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc)
+			return js_throw_err(ctx, GF_BAD_PARAM);
+
+		prop = gf_filter_pck_get_property(pck, p4cc);
+		if (!prop) return JS_NULL;
+		res = jsf_NewPropTranslate(ctx, prop, p4cc);
+	}
+    return res;
+}
+
+static JSValue jsf_pck_ref(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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 (argc && JS_ToBool(ctx, argv[0])) is_ref_props = GF_TRUE;
+
+	ref_pckctx = gf_list_pop_back(pckctx->jspid->jsf->pck_res);
+	if (!ref_pckctx) {
+		GF_SAFEALLOC(ref_pckctx, GF_JSPckCtx);
+		if (!ref_pckctx)
+			return js_throw_err(ctx, GF_OUT_OF_MEM);
+	}
+	memcpy(ref_pckctx, pckctx, sizeof(GF_JSPckCtx));
+	if (is_ref_props)
+		gf_filter_pck_ref_props(&ref_pckctx->pck);
+	else {
+		gf_filter_pck_ref(&ref_pckctx->pck);
+	}
+	ref_pckctx->flags = GF_JS_PCK_IS_REF;
+	ref_pckctx->jsobj = JS_NewObjectClass(ctx, jsf_pck_class_id);
+	ref_pckctx->data_ab = JS_UNDEFINED;
+	ref_pckctx->ref_val = JS_UNDEFINED;
+	JS_SetOpaque(ref_pckctx->jsobj, ref_pckctx);
+	return JS_DupValue(ctx, ref_pckctx->jsobj);
+}
+
+static JSValue jsf_pck_unref(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+ 	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_SetOpaque(this_val, NULL);
+	gf_list_add(pckctx->jspid->jsf->pck_res, pckctx);
+	memset(pckctx, 0, sizeof(GF_JSPckCtx));
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_pck_send(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+    pck = pckctx->pck;
+    if (!JS_IsUndefined(pckctx->data_ab)) {
+    	JS_FreeValue(ctx, pckctx->data_ab);
+    	pckctx->data_ab = JS_UNDEFINED;
+	}
+	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));
+	}
+	return JS_UNDEFINED;
+}
+static JSValue jsf_pck_discard(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+    pck = pckctx->pck;
+    pckctx->pck = NULL;
+	gf_filter_pck_discard(pck);
+	return JS_UNDEFINED;
+}
+
+static JSValue jsf_pck_set_property(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_PropertyValue prop;
+	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;
+    pck = pckctx->pck;
+
+    name = JS_ToCString(ctx, argv[0]);
+	if (!name) return JS_EXCEPTION;
+
+	if ((argc>2) && JS_ToBool(ctx, argv[2])) {
+		if (!JS_IsNull(argv[2])) {
+			e = jsf_ToProp(pckctx->jspid->jsf->filter, ctx, argv[1], 0, &prop);
+			JS_FreeCString(ctx, name);
+			if (e) return js_throw_err(ctx, e);
+			e = gf_filter_pck_set_property_dyn(pck, (char *) name, &prop);
+			gf_props_reset_single(&prop);
+		} else {
+			e = gf_filter_pck_set_property_dyn(pck, (char *) name, NULL);
+		}
+	} else {
+		u32 p4cc = gf_props_get_id(name);
+		JS_FreeCString(ctx, name);
+		if (!p4cc) return js_throw_err(ctx, GF_OUT_OF_MEM);
+		if (!!JS_IsNull(argv[1])) {
+			e = jsf_ToProp(pckctx->jspid->jsf->filter, ctx, argv[1], p4cc, &prop);
+			if (e) return js_throw_err(ctx, e);
+			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);
+    return JS_UNDEFINED;
+}
+
+static JSValue jsf_pck_append_data(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u8 *data_start=NULL;
+	u32 data_size=0;
+	u8 *new_start;
+	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;
+    pck = pckctx->pck;
+
+	if (JS_IsString(argv[0])  || JS_IsInteger(argv[0])) {
+    	u32 len;
+    	const char *str = NULL;
+
+		if (JS_IsInteger(argv[0])) {
+			JS_ToInt32(ctx, &len, argv[0]);
+		} else {
+			str = JS_ToCString(ctx, argv[0]);
+			if (!str) return JS_EXCEPTION;
+			len = (u32) strlen(str);
+		}
+
+		e = gf_filter_pck_expand(pck, len, &data_start, &new_start, &data_size);
+		if (!new_start || e) {
+			if (str) JS_FreeCString(ctx, str);
+			return js_throw_err(ctx, e);
+		}
+		if (str) {
+			memcpy(new_start, str, len);
+			JS_FreeCString(ctx, str);
+		}
+
+		jsf_pck_detach_ab(ctx, pckctx);
+		return JS_NewArrayBuffer(ctx, (u8 *) new_start, len, NULL, NULL, GF_TRUE);
+	}
+
+	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+
+	size_t ab_size;
+	u8 *data = JS_GetArrayBuffer(ctx, &ab_size, argv[0]);
+	if (!data)
+		return JS_EXCEPTION;
+
+	e = gf_filter_pck_expand(pck, (u32) ab_size, &data_start, &new_start, &data_size);
+	if (!new_start || e) {
+		return js_throw_err(ctx, e);
+	}
+	memcpy(new_start, data, ab_size);
+
+	jsf_pck_detach_ab(ctx, pckctx);
+
+	return JS_NewArrayBuffer(ctx, (u8 *) new_start, ab_size, NULL, NULL, GF_TRUE);
+}
+
+static JSValue jsf_pck_truncate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 len=0;
+	GF_Err e;
+	GF_FilterPacket *pck;
+	GF_JSPckCtx *pckctx = JS_GetOpaque(this_val, jsf_pck_class_id);
+    if (!pckctx || !pckctx->pck) return JS_EXCEPTION;
+    pck = pckctx->pck;
+	if (argc) {
+		JS_ToInt32(ctx, &len, argv[0]);
+	}
+	e = gf_filter_pck_truncate(pck, len);
+	if (e) return js_throw_err(ctx, e);
+
+	jsf_pck_detach_ab(ctx, pckctx);
+    return JS_UNDEFINED;
+}
+static JSValue jsf_pck_copy_props(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+	GF_JSPckCtx *pck_from = JS_GetOpaque(argv[0], jsf_pck_class_id);
+    if (!pck_from || !pck_from->pck)
+    	return JS_EXCEPTION;
+    e = gf_filter_pck_merge_properties(pck_from->pck, pck_dst->pck);
+	if (e) return js_throw_err(ctx, e);
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry jsf_pck_funcs[] =
+{
+    JS_CGETSET_MAGIC_DEF("start", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_START),
+    JS_CGETSET_MAGIC_DEF("end", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_END),
+    JS_CGETSET_MAGIC_DEF("dts", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_DTS),
+    JS_CGETSET_MAGIC_DEF("cts", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_CTS),
+    JS_CGETSET_MAGIC_DEF("dur", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_DUR),
+    JS_CGETSET_MAGIC_DEF("sap", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_SAP),
+    JS_CGETSET_MAGIC_DEF("timescale", jsf_pck_get_prop, NULL, JSF_PCK_TIMESCALE),
+    JS_CGETSET_MAGIC_DEF("interlaced", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_INTERLACED),
+    JS_CGETSET_MAGIC_DEF("corrupted", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_CORRUPTED),
+    JS_CGETSET_MAGIC_DEF("seek", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_SEEK),
+    JS_CGETSET_MAGIC_DEF("byte_offset", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_BYTE_OFFSET),
+    JS_CGETSET_MAGIC_DEF("roll", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_ROLL),
+    JS_CGETSET_MAGIC_DEF("crypt", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_CRYPT),
+    JS_CGETSET_MAGIC_DEF("clock_type", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_CLOCK_TYPE),
+    JS_CGETSET_MAGIC_DEF("carousel", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_CAROUSEL),
+    JS_CGETSET_MAGIC_DEF("seqnum", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_SEQNUM),
+    JS_CGETSET_MAGIC_DEF("blocking_ref", jsf_pck_get_prop, NULL, JSF_PCK_BLOCKING_REF),
+    JS_CGETSET_MAGIC_DEF("is_leading", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_IS_LEADING),
+    JS_CGETSET_MAGIC_DEF("depends_on", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_DEPENDS_ON),
+    JS_CGETSET_MAGIC_DEF("depended_on", jsf_pck_get_prop, jsf_pck_set_prop, JSF_PCK_DEPENDED_ON),
+    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_CFUNC_DEF("set_readonly", 0, jsf_pck_set_readonly),
+    JS_CFUNC_DEF("enum_properties", 0, jsf_pck_enum_properties),
+    JS_CFUNC_DEF("get_prop", 0, jsf_pck_get_property),
+    JS_CFUNC_DEF("ref", 0, jsf_pck_ref),
+    JS_CFUNC_DEF("unref", 0, jsf_pck_unref),
+    JS_CFUNC_DEF("send", 0, jsf_pck_send),
+    JS_CFUNC_DEF("discard", 0, jsf_pck_discard),
+    JS_CFUNC_DEF("set_prop", 0, jsf_pck_set_property),
+    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),
+};
+
+
+static GF_Err jsfilter_process(GF_Filter *filter)
+{
+	JSValue ret;
+	GF_Err e = GF_OK;
+	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
+	if (!jsf) return GF_BAD_PARAM;
+
+	gf_js_lock(jsf->ctx, GF_TRUE);
+	ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_PROCESS], jsf->filter_obj, 0, NULL);
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error processing\n", jsf->log_name));
+		js_dump_error(jsf->ctx);
+		e = GF_BAD_PARAM;
+	}
+	else if (JS_IsInteger(ret))
+		JS_ToInt32(jsf->ctx, (int*)&e, ret);
+
+	JS_FreeValue(jsf->ctx, ret);
+	gf_js_lock(jsf->ctx, GF_FALSE);
+
+	js_do_loop(jsf->ctx);
+	return e;
+}
+
+
+
+static GF_Err jsfilter_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	JSValue ret;
+	GF_Err e = GF_OK;
+	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
+	GF_JSPidCtx *pctx;
+
+	if (!jsf) return GF_BAD_PARAM;
+
+	pctx = gf_filter_pid_get_udta(pid);
+
+	if (is_remove) {
+		assert(pctx);
+		gf_js_lock(jsf->ctx, GF_TRUE);
+		ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_REMOVE_PID], jsf->filter_obj, 1, &pctx->jsobj);
+		if (JS_IsException(ret)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error removing pid\n", jsf->log_name));
+			js_dump_error(jsf->ctx);
+			e = GF_BAD_PARAM;
+		}
+		else if (JS_IsInteger(ret))
+			JS_ToInt32(jsf->ctx, (int*)&e, ret);
+		JS_FreeValue(jsf->ctx, ret);
+		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);
+		return e;
+	}
+
+	gf_js_lock(jsf->ctx, GF_TRUE);
+
+	if (!pctx) {
+		GF_SAFEALLOC(pctx, GF_JSPidCtx);
+		if (!pctx) return GF_OUT_OF_MEM;
+		
+		pctx->jsf = jsf;
+		pctx->pid = pid;
+		pctx->jsobj = JS_NewObjectClass(jsf->ctx, jsf_pid_class_id);
+		gf_filter_pid_set_udta(pid, pctx);
+		gf_list_add(jsf->pids, pctx);
+		JS_SetOpaque(pctx->jsobj, pctx);
+	}
+
+	ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_CONFIGURE_PID], jsf->filter_obj, 1, &pctx->jsobj);
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error configure pid\n", jsf->log_name));
+		js_dump_error(jsf->ctx);
+		e = GF_BAD_PARAM;
+	}
+	else if (JS_IsInteger(ret))
+			JS_ToInt32(jsf->ctx, (int*)&e, ret);
+	JS_FreeValue(jsf->ctx, ret);
+
+	gf_js_lock(jsf->ctx, GF_FALSE);
+	js_do_loop(jsf->ctx);
+	return e;
+}
+
+
+static GF_Err jsfilter_initialize(GF_Filter *filter)
+{
+	u8 *buf;
+	u32 buf_len;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+    JSValue ret;
+    JSValue global_obj, val, args;
+    u32 i, nb_args;
+    JSRuntime *rt;
+	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
+
+	jsf->filter = filter;
+	jsf->pids = gf_list_new();
+	jsf->pck_res = gf_list_new();
+	jsf->log_name = gf_strdup("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;
+
+	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);
+	rt = JS_GetRuntime(jsf->ctx);
+
+    global_obj = JS_GetGlobalObject(jsf->ctx);
+
+    val = JS_NewObject(jsf->ctx);
+    JS_SetPropertyStr(jsf->ctx, val, "log", JS_NewCFunction(jsf->ctx, js_print, "log", 1));
+    JS_SetPropertyStr(jsf->ctx, global_obj, "console", val);
+
+#define DEF_CONST( _val ) \
+    JS_SetPropertyStr(jsf->ctx, global_obj, #_val, JS_NewInt32(jsf->ctx, _val));
+
+	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_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)
+	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_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_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_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(JSF_SETUP_ERROR)
+	DEF_CONST(JSF_NOTIF_ERROR)
+	DEF_CONST(JSF_NOTIF_ERROR_AND_DISCONNECT)
+
+	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_KEYUP)
+	DEF_CONST(GF_EVENT_KEYDOWN)
+	DEF_CONST(GF_EVENT_TEXTINPUT)
+	DEF_CONST(GF_EVENT_DROPFILE)
+	DEF_CONST(GF_EVENT_QUALITY_SWITCHED)
+	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_QUIT)
+
+	args = JS_NewArray(jsf->ctx);
+    nb_args = gf_sys_get_argc();
+    for (i=0; i<nb_args; i++) {
+        JS_SetPropertyUint32(jsf->ctx, args, i, JS_NewString(jsf->ctx, gf_sys_get_arg(i)));
+    }
+    JS_SetPropertyStr(jsf->ctx, global_obj, "args", args);
+    JS_SetPropertyStr(jsf->ctx, global_obj, "print", JS_NewCFunction(jsf->ctx, js_print, "print", 1));
+    JS_SetPropertyStr(jsf->ctx, global_obj, "alert", JS_NewCFunction(jsf->ctx, js_print, "alert", 1));
+
+	//initialize filter class and create a single filter object in global scope
+	JS_NewClassID(&jsf_filter_class_id);
+	JS_NewClass(rt, jsf_filter_class_id, &jsf_filter_class);
+
+	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);
+
+	//initialize filter instance class
+	JS_NewClassID(&jsf_filter_inst_class_id);
+	JS_NewClass(rt, jsf_filter_inst_class_id, &jsf_filter_inst_class);
+	JSValue finst_proto = JS_NewObjectClass(jsf->ctx, jsf_filter_inst_class_id);
+    JS_SetPropertyFunctionList(jsf->ctx, finst_proto, jsf_filter_inst_funcs, countof(jsf_filter_inst_funcs));
+    JS_SetClassProto(jsf->ctx, jsf_filter_inst_class_id, finst_proto);
+
+	//initialize filter pid class
+	JS_NewClassID(&jsf_pid_class_id);
+	JS_NewClass(rt, jsf_pid_class_id, &jsf_pid_class);
+	JSValue pid_proto = JS_NewObjectClass(jsf->ctx, jsf_pid_class_id);
+    JS_SetPropertyFunctionList(jsf->ctx, pid_proto, jsf_pid_funcs, countof(jsf_pid_funcs));
+    JS_SetClassProto(jsf->ctx, jsf_pid_class_id, pid_proto);
+
+	//initialize filter event class
+	JS_NewClassID(&jsf_event_class_id);
+	JS_NewClass(rt, jsf_event_class_id, &jsf_event_class);
+	JSValue evt_proto = JS_NewObjectClass(jsf->ctx, jsf_event_class_id);
+    JS_SetPropertyFunctionList(jsf->ctx, evt_proto, jsf_event_funcs, countof(jsf_event_funcs));
+    JS_SetClassProto(jsf->ctx, jsf_event_class_id, evt_proto);
+
+	JSValue evt_ctor = JS_NewCFunction2(jsf->ctx, jsf_event_constructor, "FilterEvent", 1, JS_CFUNC_constructor, 0);
+    JS_SetPropertyStr(jsf->ctx, global_obj, "FilterEvent", evt_ctor);
+
+
+	//initialize filter event 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) ) );
+    JS_FreeValue(jsf->ctx, global_obj);
+
+
+	//load script
+	GF_Err e = gf_file_load_data(jsf->js, &buf, &buf_len);
+	if (e) {
+		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;
+	}
+
+ 	for (i=0; i<JSF_EVT_LAST_DEFINED; i++) {
+        jsf->funcs[i] = JS_UNDEFINED;
+    }
+
+ 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((char *)buf, buf_len)) {
+ 		//init modules
+		qjs_module_init_xhr(jsf->ctx);
+		qjs_module_init_evg(jsf->ctx);
+		qjs_module_init_storage(jsf->ctx);
+		qjs_module_init_webgl(jsf->ctx);
+		flags = JS_EVAL_TYPE_MODULE;
+	}
+	
+	ret = JS_Eval(jsf->ctx, (char *)buf, buf_len, jsf->js, flags);
+	gf_free(buf);
+
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JSF] Error loading script %s\n", jsf->js));
+        js_dump_error(jsf->ctx);
+		JS_FreeValue(jsf->ctx, ret);
+		return GF_BAD_PARAM;
+	}
+	JS_FreeValue(jsf->ctx, ret);
+
+	return GF_OK;
+}
+
+static void jsfilter_finalize(GF_Filter *filter)
+{
+	u32 i, count;
+	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
+	if (!jsf->ctx) return;
+
+	//reset references but do not destroy PIDs yet
+	count = gf_list_count(jsf->pids);
+	for (i=0; i<count; i++) {
+		GF_JSPidCtx *pctx = gf_list_get(jsf->pids, i);
+		JS_FreeValue(jsf->ctx, pctx->jsobj);
+		if (pctx->shared_pck) {
+			while (gf_list_count(pctx->shared_pck)) {
+				GF_JSPckCtx *pckc = gf_list_pop_back(pctx->shared_pck);
+				JS_FreeValue(jsf->ctx, pckc->ref_val);
+				pckc->ref_val = JS_UNDEFINED;
+				jsf_pck_detach_ab(jsf->ctx, pckc);
+
+				//do not free here since pck->jsobj may already have been GCed/destroyed
+			}
+		}
+	}
+
+	for (i=0; i<JSF_EVT_LAST_DEFINED; i++) {
+		JS_FreeValue(jsf->ctx, jsf->funcs[i]);
+	}
+
+	JS_SetOpaque(jsf->filter_obj, NULL);
+	gf_js_delete_context(jsf->ctx);
+
+	while (gf_list_count(jsf->pids)) {
+		GF_JSPidCtx *pctx = gf_list_pop_back(jsf->pids);
+		if (pctx->shared_pck)
+			gf_list_del(pctx->shared_pck);
+		gf_free(pctx);
+	}
+	gf_list_del(jsf->pids);
+
+	if (jsf->log_name) gf_free(jsf->log_name);
+
+	while (gf_list_count(jsf->pck_res)) {
+		GF_JSPckCtx *pck = gf_list_pop_back(jsf->pck_res);
+		gf_free(pck);
+	}
+	gf_list_del(jsf->pck_res);
+
+	if (jsf->args) {
+		for (i=0; i<jsf->nb_args; i++) {
+			if (jsf->args[i].arg_default_val)
+				gf_free((char *) jsf->args[i].arg_default_val);
+			if (jsf->args[i].arg_desc)
+				gf_free((char *) jsf->args[i].arg_desc);
+			if (jsf->args[i].arg_name)
+				gf_free((char *) jsf->args[i].arg_name);
+			if (jsf->args[i].min_max_enum)
+				gf_free((char *) jsf->args[i].min_max_enum);
+		}
+		gf_free(jsf->args);
+	}
+	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);
+	JSValue ret, val;
+	const GF_FilterArgs *the_arg = NULL;
+	u32 i;
+	GF_Err e = GF_OK;
+	if (!jsf->ctx)
+		return GF_OK;
+
+	if (!arg_name && !new_val) {
+		gf_js_lock(jsf->ctx, GF_TRUE);
+		if (JS_IsFunction(jsf->ctx, jsf->funcs[JSF_EVT_INITIALIZE]) ) {
+			ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_INITIALIZE], jsf->filter_obj, 0, NULL);
+			if (JS_IsException(ret)) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error initializing filter\n", jsf->log_name));
+				js_dump_error(jsf->ctx);
+				JS_FreeValue(jsf->ctx, ret);
+				gf_js_lock(jsf->ctx, GF_FALSE);
+				return GF_BAD_PARAM;
+			}
+			if (JS_IsInteger(ret))
+				JS_ToInt32(jsf->ctx, (int*)&e, ret);
+
+			JS_FreeValue(jsf->ctx, ret);
+		}
+		jsf->initialized = GF_TRUE;
+		gf_js_lock(jsf->ctx, GF_FALSE);
+		return e;
+	}
+	if (!arg_name)
+		return GF_OK;
+
+	for (i=0; i<jsf->nb_args; i++) {
+		if (jsf->args[i].arg_name && !strcmp(jsf->args[i].arg_name, arg_name)) {
+			the_arg = &jsf->args[i];
+			break;
+		}
+	}
+	if (!the_arg) return GF_OK;
+
+	gf_js_lock(jsf->ctx, GF_TRUE);
+
+	val = jsf_NewProp(jsf->ctx, new_val);
+	if (!jsf->initialized) {
+    	JS_SetPropertyStr(jsf->ctx, jsf->filter_obj, arg_name, val);
+		gf_js_lock(jsf->ctx, GF_FALSE);
+		return GF_OK;
+	}
+
+	JSValue args[2];
+	args[0] = JS_NewString(jsf->ctx, arg_name);
+	args[1] = val;
+	ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_UPDATE_ARG], jsf->filter_obj, 2, args);
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error updating arg\n", jsf->log_name));
+        js_dump_error(jsf->ctx);
+		e = GF_BAD_PARAM;
+	}
+	if (JS_IsInteger(ret))
+		JS_ToInt32(jsf->ctx, (int*)&e, ret);
+	JS_FreeValue(jsf->ctx, ret);
+	JS_FreeValue(jsf->ctx, args[0]);
+	JS_FreeValue(jsf->ctx, args[1]);
+	gf_js_lock(jsf->ctx, GF_FALSE);
+	return e;
+}
+
+static Bool jsfilter_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	JSValue argv[2];
+	JSValue ret;
+	Bool canceled=GF_TRUE;
+	GF_JSFilterCtx *jsf = gf_filter_get_udta(filter);
+	if (!jsf) return GF_TRUE;
+
+	if (!JS_IsFunction(jsf->ctx, jsf->funcs[JSF_EVT_PROCESS_EVENT]))
+		return GF_FALSE;
+
+	gf_js_lock(jsf->ctx, GF_TRUE);
+	if (evt->base.on_pid) {
+		GF_JSPidCtx *pctx = gf_filter_pid_get_udta(evt->base.on_pid);
+		argv[0] = pctx ? JS_DupValue(jsf->ctx, pctx->jsobj) : JS_NULL;
+	} else {
+		argv[0] = JS_NULL;
+	}
+	argv[1] = JS_NewObjectClass(jsf->ctx, jsf_event_class_id);
+	JS_SetOpaque(argv[1], (void *) evt);
+	ret = JS_Call(jsf->ctx, jsf->funcs[JSF_EVT_PROCESS_EVENT], jsf->filter_obj, 2, argv);
+	if (JS_IsException(ret)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[%s] Error processing event\n", jsf->log_name));
+		js_dump_error(jsf->ctx);
+	}
+	else {
+		canceled = JS_ToBool(jsf->ctx, ret);
+	}
+	JS_FreeValue(jsf->ctx, ret);
+	JS_FreeValue(jsf->ctx, argv[0]);
+	JS_SetOpaque(argv[1], NULL);
+	JS_FreeValue(jsf->ctx, argv[1]);
+	gf_js_lock(jsf->ctx, GF_FALSE);
+
+	js_do_loop(jsf->ctx);
+	return canceled;
+}
+
+/*static GF_Err jsfilter_reconfigure_output(GF_Filter *filter, GF_FilterPid *PID)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_FilterProbeScore jsfilter_probe_url(const char *url, const char *mime)
+{
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static const char * jsfilter_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	return NULL;
+}
+*/
+
+#define OFFS(_n)	#_n, offsetof(GF_JSFilterCtx, _n)
+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},
+	{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),
+};
+
+GF_FilterRegister JSFilterRegister = {
+	.name = "jsf",
+	GF_FS_SET_DESCRIPTION("JavaScript filter")
+	GF_FS_SET_HELP("This filter runs a javascript file specified in [-js]() defining a new JavaScript filter.\n"
+	"  \n"
+	"For more information on how to use JS filters, please check https://wiki.gpac.io/jsfilter\n")
+	.private_size = sizeof(GF_JSFilterCtx),
+	.flags = GF_FS_REG_SCRIPT,
+	.args = JSFilterArgs,
+	SETCAPS(JSFilterCaps),
+	.initialize = jsfilter_initialize,
+	.finalize = jsfilter_finalize,
+	.configure_pid = jsfilter_configure_pid,
+	.process = jsfilter_process,
+	.update_arg = jsfilter_update_arg,
+	.process_event = jsfilter_process_event,
+//	.probe_url = jsfilter_probe_url,
+//	.probe_data = jsfilter_probe_data
+//	.reconfigure_output = jsfilter_reconfigure_output
+};
+
+
+const GF_FilterRegister *jsfilter_register(GF_FilterSession *session)
+{
+	return &JSFilterRegister;
+}
+
+#else
+
+const GF_FilterRegister *jsfilter_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+#endif
+

gpac-1.0.0.tar.gz/src/filters/load_bt_xmt.c Added

@@ -0,0 +1,911 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Context loader 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/internal/compositor_dev.h>
+#include <gpac/scene_manager.h>
+#include <gpac/constants.h>
+#include <gpac/network.h>
+#include <gpac/nodes_mpeg4.h>
+
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
+
+typedef struct
+{
+	//opts
+	Bool progressive;
+	u32 sax_dur;
+
+	//internal
+	GF_FilterPid *in_pid, *out_pid;
+
+	GF_Scene *scene;
+	const char *file_name;
+
+
+	GF_SceneManager *ctx;
+	GF_SceneLoader load;
+	u64 file_size;
+	u32 load_flags;
+	u32 nb_streams;
+	u32 base_stream_id;
+	u32 last_check_time;
+	u64 last_check_size;
+	/*mp3 import from flash*/
+	GF_List *files_to_delete;
+	/*progressive loading support for XMT X3D*/
+	FILE *src;
+	u32 file_pos;
+
+	u64 pck_time;
+	const char *service_url;
+	Bool is_playing;
+} CTXLoadPriv;
+
+
+void ODS_SetupOD(GF_Scene *scene, GF_ObjectDescriptor *od);
+
+
+static void CTXLoad_ExecuteConditional(M_Conditional *c, GF_Scene *scene)
+{
+	GF_List *clist = c->buffer.commandList;
+	c->buffer.commandList = NULL;
+
+	gf_sg_command_apply_list(gf_node_get_graph((GF_Node*)c), clist, gf_scene_get_time(scene));
+
+	if (c->buffer.commandList != NULL) {
+		while (gf_list_count(clist)) {
+			GF_Command *sub_com = (GF_Command *)gf_list_get(clist, 0);
+			gf_sg_command_del(sub_com);
+			gf_list_rem(clist, 0);
+		}
+		gf_list_del(clist);
+	} else {
+		c->buffer.commandList = clist;
+	}
+}
+
+static void CTXLoad_OnActivate(GF_Node *node, GF_Route *route)
+{
+	GF_Scene *scene = (GF_Scene *) gf_node_get_private(node);
+	M_Conditional*c = (M_Conditional*)node;
+	/*always apply in parent graph to handle protos correctly*/
+	if (c->activate) CTXLoad_ExecuteConditional(c, scene);
+}
+
+static void CTXLoad_OnReverseActivate(GF_Node *node, GF_Route *route)
+{
+	GF_Scene *scene = (GF_Scene *) gf_node_get_private(node);
+	M_Conditional*c = (M_Conditional*)node;
+	/*always apply in parent graph to handle protos correctly*/
+	if (!c->reverseActivate)
+		CTXLoad_ExecuteConditional(c, scene);
+}
+
+void CTXLoad_NodeCallback(void *cbk, GF_SGNodeCbkType type, GF_Node *node, void *param)
+{
+	if ((type==GF_SG_CALLBACK_INIT) && (gf_node_get_tag(node) == TAG_MPEG4_Conditional) ) {
+		M_Conditional*c = (M_Conditional*)node;
+		c->on_activate = CTXLoad_OnActivate;
+		c->on_reverseActivate = CTXLoad_OnReverseActivate;
+		gf_node_set_private(node, cbk);
+	} else {
+		gf_scene_node_callback(cbk, type, node, param);
+	}
+}
+
+static GF_Err CTXLoad_Setup(GF_Filter *filter, CTXLoadPriv *priv)
+{
+	const GF_PropertyValue *prop;
+	if (!priv->file_name) return GF_BAD_PARAM;
+
+	priv->ctx = gf_sm_new(priv->scene->graph);
+	memset(&priv->load, 0, sizeof(GF_SceneLoader));
+	priv->load.ctx = priv->ctx;
+	priv->load.is = priv->scene;
+	priv->load.scene_graph = priv->scene->graph;
+	priv->load.fileName = priv->file_name;
+	priv->load.src_url = priv->service_url;
+	priv->load.flags = GF_SM_LOAD_FOR_PLAYBACK;
+	priv->load.localPath = gf_get_default_cache_directory();
+
+	priv->load.swf_import_flags = GF_SM_SWF_STATIC_DICT | GF_SM_SWF_QUAD_CURVE | GF_SM_SWF_SCALABLE_LINE | GF_SM_SWF_SPLIT_TIMELINE;
+
+	if (!priv->files_to_delete)
+		priv->files_to_delete = gf_list_new();
+
+	prop = gf_filter_pid_get_property(priv->in_pid, GF_PROP_PID_MIME);
+	if (prop && prop->value.string) {
+		if (!strcmp(prop->value.string, "application/x-bt")) priv->load.type = GF_SM_LOAD_BT;
+		else if (!strcmp(prop->value.string, "application/x-xmt")) priv->load.type = GF_SM_LOAD_XMTA;
+		else if (!strcmp(prop->value.string, "model/vrml")) priv->load.type = GF_SM_LOAD_VRML;
+		else if (!strcmp(prop->value.string, "x-model/x-vrml")) priv->load.type = GF_SM_LOAD_VRML;
+		else if (!strcmp(prop->value.string, "model/x3d+vrml")) priv->load.type = GF_SM_LOAD_X3DV;
+		else if (!strcmp(prop->value.string, "model/x3d+xml")) priv->load.type = GF_SM_LOAD_X3D;
+		else if (!strcmp(prop->value.string, "application/x-shockwave-flash")) priv->load.type = GF_SM_LOAD_SWF;
+		else if (!strcmp(prop->value.string, "application/x-LASeR+xml")) priv->load.type = GF_SM_LOAD_XSR;
+	}
+
+	return GF_OK;
+}
+
+GF_Err ctxload_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	CTXLoadPriv *priv = gf_filter_get_udta(filter);
+	const GF_PropertyValue *prop;
+
+	if (is_remove) {
+		priv->in_pid = NULL;
+		gf_filter_pid_remove(priv->out_pid);
+		priv->out_pid = NULL;
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	//we must have a file path
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+	if (!prop || ! prop->value.string) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!priv->in_pid) {
+		GF_FilterEvent fevt;
+		priv->in_pid = pid;
+
+		//we work with full file only, send a play event on source to indicate that
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
+		fevt.play.start_range = 0;
+		fevt.base.on_pid = priv->in_pid;
+		fevt.play.full_file_only = GF_TRUE;
+		gf_filter_pid_send_event(priv->in_pid, &fevt);
+
+	} else {
+		if (pid != priv->in_pid) {
+			return GF_REQUIRES_NEW_INSTANCE;
+		}
+		//update of PID filename
+		if (!prop->value.string || !priv->file_name || strcmp(prop->value.string, priv->file_name))
+			return GF_NOT_SUPPORTED;
+		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;
+
+	//declare a new output PID of type scene, codecid RAW
+	priv->out_pid = gf_filter_pid_new(filter);
+
+	gf_filter_pid_copy_properties(priv->out_pid, pid);
+	gf_filter_pid_set_property(priv->out_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_SCENE) );
+	gf_filter_pid_set_property(priv->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(priv->out_pid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE) );
+
+	gf_filter_pid_set_udta(pid, priv->out_pid);
+
+
+	priv->file_size = 0;
+	priv->load_flags = 0;
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+	priv->base_stream_id = prop ? prop->value.uint : -1;
+
+	priv->pck_time = -1;
+
+
+	switch (priv->load.type) {
+	case GF_SM_LOAD_BT:
+		gf_filter_set_name(filter, "Load:BT");
+		break;
+	case GF_SM_LOAD_VRML:
+		gf_filter_set_name(filter, "Load:VRML97");
+		break;
+	case GF_SM_LOAD_X3DV:
+		gf_filter_set_name(filter, "Load:X3D+vrml");
+		break;
+	case GF_SM_LOAD_XMTA:
+		gf_filter_set_name(filter, "Load:XMTA");
+		break;
+	case GF_SM_LOAD_X3D:
+		gf_filter_set_name(filter, "Load:X3D+XML Syntax");
+		break;
+	case GF_SM_LOAD_SWF:
+		gf_filter_set_name(filter, "Load:SWF");
+		break;
+	case GF_SM_LOAD_XSR:
+		gf_filter_set_name(filter, "Load:LASeRML");
+		break;
+	case GF_SM_LOAD_MP4:
+		gf_filter_set_name(filter, "Load:MP4BIFSMemory");
+		break;
+	default:
+		break;
+	}
+
+	return GF_OK;
+}
+
+static Bool ctxload_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	u32 count, i;
+	CTXLoadPriv *priv = gf_filter_get_udta(filter);
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_PLAY:
+		//cancel play event, we work with full file
+		//TODO: animation stream in BT
+		priv->is_playing = GF_TRUE;
+		return GF_TRUE;
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_RESET_SCENE:
+		gf_sm_load_done(&priv->load);
+		if (priv->ctx) gf_sm_del(priv->ctx);
+		priv->ctx = NULL;
+		priv->load_flags = 3;
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (!com->attach_scene.on_pid) return GF_TRUE;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
+		//we found our pid, set it up
+		if (opid == com->attach_scene.on_pid) {
+			if (!priv->scene) {
+				GF_ObjectManager *odm = com->attach_scene.object_manager;
+				priv->scene = odm->subscene ? odm->subscene : odm->parentscene;
+				gf_sg_set_node_callback(priv->scene->graph, CTXLoad_NodeCallback);
+
+				priv->service_url = odm->scene_ns->url;
+
+				if (!priv->ctx)	CTXLoad_Setup(filter, priv);
+
+			}
+			return GF_TRUE;
+		}
+	}
+
+	return GF_FALSE;
+}
+
+static Bool CTXLoad_StreamInRootOD(GF_ObjectDescriptor *od, u32 ESID)
+{
+	u32 i, count;
+	/*no root, only one stream possible*/
+	if (!od) return GF_TRUE;
+	count = gf_list_count(od->ESDescriptors);
+	/*idem*/
+	if (!count) return GF_TRUE;
+	for (i=0; i<count; i++) {
+		GF_ESD *esd = (GF_ESD *)gf_list_get(od->ESDescriptors, i);
+		if (esd->ESID==ESID) return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+
+Double CTXLoad_GetVRMLTime(void *cbk)
+{
+	u32 secs, msecs;
+	Double res;
+	gf_utc_time_since_1970(&secs, &msecs);
+	res = msecs;
+	res /= 1000;
+	res += secs;
+	return res;
+}
+
+static void CTXLoad_CheckStreams(CTXLoadPriv *priv )
+{
+	u32 i, j, max_dur;
+	GF_StreamContext *sc;
+	u32 nb_aus=0;
+	max_dur = 0;
+	i=0;
+	while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
+		GF_AUContext *au;
+		/*all streams in root OD are handled with ESID 0 to differentiate with any animation streams*/
+		if (CTXLoad_StreamInRootOD(priv->ctx->root_od, sc->ESID)) sc->in_root_od = GF_TRUE;
+		if (!sc->timeScale) sc->timeScale = 1000;
+
+		j=0;
+		while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
+			if (!au->timing) au->timing = (u64) (sc->timeScale*au->timing_sec);
+			if (gf_list_count(au->commands))
+				nb_aus++;
+		}
+		if (au && sc->in_root_od && (au->timing>max_dur)) max_dur = (u32) (au->timing * 1000 / sc->timeScale);
+	}
+	if (max_dur) {
+		priv->scene->root_od->duration = max_dur;
+		gf_scene_set_duration(priv->scene);
+	}
+	if ((priv->load_flags==1) && priv->ctx->root_od && priv->ctx->root_od->URLString) {
+		gf_filter_pid_set_property(priv->out_pid, GF_PROP_PID_REMOTE_URL, &PROP_STRING(priv->ctx->root_od->URLString) );
+	}
+	if ((priv->load_flags==2) && !nb_aus) {
+		gf_filter_pid_set_eos(priv->out_pid);
+	}
+}
+
+static GF_Err ctxload_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	GF_FilterPacket *pck;
+	u32 i, j, k, updates_pending, last_rap=0;
+	GF_AUContext *au;
+	Bool can_delete_com;
+	GF_StreamContext *sc;
+	Bool is_seek = GF_FALSE;
+	Bool is_start, is_end;
+	u32 min_next_time_ms = 0;
+	CTXLoadPriv *priv = gf_filter_get_udta(filter);
+
+	//not yet ready
+	if (!priv->scene) {
+		if (priv->is_playing) {
+			gf_filter_pid_set_eos(priv->out_pid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	/*something failed*/
+	if (priv->load_flags==3) return GF_EOS;
+
+	/*this signals main scene deconnection, destroy the context if needed*/
+	if (!priv->ctx) {
+		e = CTXLoad_Setup(filter, priv);
+		if (e) return e;
+	}
+
+	is_start = is_end = GF_FALSE;
+	pck = gf_filter_pid_get_packet(priv->in_pid);
+	if (pck) {
+		//source is FILE, untimed - consider we init from 0
+		u64 cts = 0;
+		if ((s64)priv->pck_time<0) priv->pck_time = cts;
+		else if (priv->pck_time!=cts) {
+			priv->pck_time = cts;
+			is_seek = GF_TRUE;
+		}
+		//init clocks
+		gf_odm_check_buffering(priv->scene->root_od, priv->in_pid);
+		gf_filter_pck_get_framing(pck, &is_start, &is_end);
+		gf_filter_pid_drop_packet(priv->in_pid);
+	}
+
+	if (is_seek) {
+		/*seek on root stream: destroy the context manager and reload it. We cannot seek on the main stream
+		because commands may have changed node attributes/children and we don't track the initial value*/
+		if (priv->load_flags) {
+			if (priv->src) gf_fclose(priv->src);
+			priv->src = NULL;
+			gf_sm_load_done(&priv->load);
+			priv->file_pos = 0;
+
+			return CTXLoad_Setup(filter, priv);
+		}
+		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;
+		}
+		return GF_OK;
+	}
+
+	if (priv->load_flags != 2) {
+
+		if (priv->progressive) {
+			u32 entry_time;
+			char file_buf[4096+1];
+			if (!priv->src) {
+				priv->src = gf_fopen(priv->file_name, "rb");
+				if (!priv->src) return GF_URL_ERROR;
+				priv->file_pos = 0;
+			}
+			priv->load.type = GF_SM_LOAD_XMTA;
+			e = GF_OK;
+			entry_time = gf_sys_clock();
+			gf_fseek(priv->src, priv->file_pos, SEEK_SET);
+			while (1) {
+				u32 diff;
+				s32 nb_read = (s32) gf_fread(file_buf, 4096, priv->src);
+				if (nb_read<0) {
+					return GF_IO_ERR;
+				}
+				file_buf[nb_read] = 0;
+				if (!nb_read) {
+					if (priv->file_pos==priv->file_size) {
+						gf_fclose(priv->src);
+						priv->src = NULL;
+						priv->load_flags = 2;
+						gf_sm_load_done(&priv->load);
+						break;
+					}
+					break;
+				}
+
+				e = gf_sm_load_string(&priv->load, file_buf, GF_FALSE);
+				priv->file_pos += nb_read;
+				if (e) break;
+				diff = gf_sys_clock() - entry_time;
+				if (diff > priv->sax_dur) break;
+			}
+			if (!priv->scene->graph_attached) {
+				gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
+				gf_scene_attach_to_compositor(priv->scene);
+
+				CTXLoad_CheckStreams(priv);
+			}
+		}
+		/*load first frame only*/
+		else if (!priv->load_flags) {
+			/*we need the whole file - this could be further optimized by loading from memory the entire buffer*/
+			if (!is_end) return GF_OK;
+
+			priv->load_flags = 1;
+			e = gf_sm_load_init(&priv->load);
+			if (!e) {
+				CTXLoad_CheckStreams(priv);
+				gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
+				/*VRML, override base clock*/
+				if ((priv->load.type==GF_SM_LOAD_VRML) || (priv->load.type==GF_SM_LOAD_X3DV) || (priv->load.type==GF_SM_LOAD_X3D)) {
+					/*override clock callback*/
+					gf_sg_set_scene_time_callback(priv->scene->graph, CTXLoad_GetVRMLTime);
+				}
+			}
+		}
+		/*load the rest*/
+		else {
+			priv->load_flags = 2;
+			e = gf_sm_load_run(&priv->load);
+			gf_sm_load_done(&priv->load);
+			/*in case this was not set in the first pass (XMT)*/
+			gf_sg_set_scene_size_info(priv->scene->graph, priv->ctx->scene_width, priv->ctx->scene_height, priv->ctx->is_pixel_metrics);
+		}
+
+		if (e<0) {
+			gf_sm_load_done(&priv->load);
+			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) ));
+			if (priv->out_pid)
+				gf_filter_pid_set_eos(priv->out_pid);
+			return e;
+		}
+
+		/*and figure out duration of root scene, and take care of XMT timing*/
+		if (priv->load_flags==2) {
+			CTXLoad_CheckStreams(priv);
+			if (!gf_list_count(priv->ctx->streams)) {
+				gf_scene_attach_to_compositor(priv->scene);
+			}
+		}
+	}
+
+	updates_pending = 0;
+
+	i=0;
+	while ((sc = (GF_StreamContext *)gf_list_enum(priv->ctx->streams, &i))) {
+		u32 stream_time = gf_clock_time(priv->scene->root_od->ck);
+
+		//compositor is in end of stream mode, flush all commands
+		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;
+
+		/*check for seek*/
+		if (sc->last_au_time > 1 + stream_time) {
+			sc->last_au_time = 0;
+		}
+
+		can_delete_com = GF_FALSE;
+		if (sc->in_root_od && (priv->load_flags==2)) can_delete_com = GF_TRUE;
+
+		/*we're in the right stream, apply update*/
+		j=0;
+
+		/*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);
+
+				if (au_time > stream_time)
+					break;
+				if (au->flags & GF_SM_AU_RAP) last_rap = j-1;
+			}
+			j = last_rap;
+		}
+
+		while ((au = (GF_AUContext *)gf_list_enum(sc->AUs, &j))) {
+			u32 au_time = (u32) (au->timing*1000/sc->timeScale);
+
+			if (au_time + 1 <= sc->last_au_time) {
+				/*remove first replace command*/
+				if (can_delete_com && (sc->streamType==GF_STREAM_SCENE)) {
+					while (gf_list_count(au->commands)) {
+						GF_Command *com = (GF_Command *)gf_list_get(au->commands, 0);
+						gf_list_rem(au->commands, 0);
+						gf_sg_command_del(com);
+					}
+					j--;
+					gf_list_rem(sc->AUs, j);
+					gf_list_del(au->commands);
+					gf_free(au);
+				}
+				continue;
+			}
+
+			if (au_time > stream_time) {
+				Double ts_offset;
+				u32 t = au_time - stream_time;
+				if (!min_next_time_ms || (min_next_time_ms>t))
+					min_next_time_ms = t;
+
+				updates_pending++;
+
+				ts_offset = (Double) au->timing;
+				ts_offset /= sc->timeScale;
+				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 ));
+
+			if (sc->streamType == GF_STREAM_SCENE) {
+				GF_Command *com;
+				/*apply the commands*/
+				k=0;
+				while ((com = (GF_Command *)gf_list_enum(au->commands, &k))) {
+					e = gf_sg_command_apply(priv->scene->graph, com, 0);
+					if (e) break;
+					/*remove commands on base layer*/
+					if (can_delete_com) {
+						k--;
+						gf_list_rem(au->commands, k);
+						gf_sg_command_del(com);
+					}
+				}
+			}
+			else if (sc->streamType == GF_STREAM_OD) {
+				/*apply the commands*/
+				while (gf_list_count(au->commands)) {
+					Bool keep_com = GF_FALSE;
+					GF_ODCom *com = (GF_ODCom *)gf_list_get(au->commands, 0);
+					gf_list_rem(au->commands, 0);
+					switch (com->tag) {
+					case GF_ODF_OD_UPDATE_TAG:
+					{
+						GF_ODUpdate *odU = (GF_ODUpdate *)com;
+						while (gf_list_count(odU->objectDescriptors)) {
+							GF_ESD *esd;
+							char *remote;
+							GF_MuxInfo *mux = NULL;
+							GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, 0);
+							gf_list_rem(odU->objectDescriptors, 0);
+							/*we can only work with single-stream ods*/
+							esd = (GF_ESD*)gf_list_get(od->ESDescriptors, 0);
+							if (!esd) {
+								if (od->URLString) {
+									ODS_SetupOD(priv->scene, od);
+								}
+								gf_odf_desc_del((GF_Descriptor *) od);
+								continue;
+							}
+							/*fix OCR dependencies*/
+							if (CTXLoad_StreamInRootOD(priv->ctx->root_od, esd->OCRESID)) esd->OCRESID = priv->base_stream_id;
+
+							/*forbidden if ESD*/
+							if (od->URLString) {
+								gf_odf_desc_del((GF_Descriptor *) od);
+								continue;
+							}
+							/*look for MUX info*/
+							k=0;
+							while ((mux = (GF_MuxInfo*)gf_list_enum(esd->extensionDescriptors, &k))) {
+								if (mux->tag == GF_ODF_MUXINFO_TAG) break;
+								mux = NULL;
+							}
+							/*we need a mux if not animation stream*/
+							if (!mux || !mux->file_name) {
+								/*only animation streams are handled*/
+								if (!esd->decoderConfig) {
+								} else if (esd->decoderConfig->streamType==GF_STREAM_SCENE) {
+									/*set ST to private scene to get sure the stream will be redirected to us*/
+									esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
+									esd->dependsOnESID = priv->base_stream_id;
+									ODS_SetupOD(priv->scene, od);
+								} else if (esd->decoderConfig->streamType==GF_STREAM_INTERACT) {
+									GF_UIConfig *cfg = (GF_UIConfig *) esd->decoderConfig->decoderSpecificInfo;
+									gf_odf_encode_ui_config(cfg, &esd->decoderConfig->decoderSpecificInfo);
+									gf_odf_desc_del((GF_Descriptor *) cfg);
+									ODS_SetupOD(priv->scene, od);
+								} else if (esd->decoderConfig->streamType==GF_STREAM_OCR) {
+									ODS_SetupOD(priv->scene, od);
+								}
+								gf_odf_desc_del((GF_Descriptor *) od);
+								continue;
+							}
+							//solve url before import
+							if (mux->src_url) {
+								char *res_url = gf_url_concatenate(mux->src_url, mux->file_name);
+								if (res_url) {
+									gf_free(mux->file_name);
+									mux->file_name = res_url;
+								}
+								gf_free(mux->src_url);
+								mux->src_url = NULL;
+							}
+							/*text import*/
+							if (mux->textNode) {
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+								gf_odf_desc_del((GF_Descriptor *) od);
+								continue;
+#else
+								e = gf_sm_import_bifs_subtitle(priv->ctx, esd, mux);
+								if (e) {
+									e = GF_OK;
+									gf_odf_desc_del((GF_Descriptor *) od);
+									continue;
+								}
+								/*set ST to private scene and dependency to base to get sure the stream will be redirected to us*/
+								esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
+								esd->dependsOnESID = priv->base_stream_id;
+								ODS_SetupOD(priv->scene, od);
+								gf_odf_desc_del((GF_Descriptor *) od);
+								continue;
+#endif
+							}
+
+							/*soundstreams are a bit of a pain, they may be declared before any data gets written*/
+							if (mux->delete_file) {
+								FILE *t = gf_fopen(mux->file_name, "rb");
+								if (!t) {
+									keep_com = GF_TRUE;
+									gf_list_insert(odU->objectDescriptors, od, 0);
+									break;
+								}
+								gf_fclose(t);
+							}
+							/*remap to remote URL - warning, the URL has already been resolved according to the parent path*/
+							remote = (char*)gf_malloc(sizeof(char) * (strlen("gpac://")+strlen(mux->file_name)+1) );
+							strcpy(remote, "gpac://");
+							strcat(remote, mux->file_name);
+							k = od->objectDescriptorID;
+							/*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_odf_desc_del((GF_Descriptor *) od);
+							od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+							od->URLString = remote;
+							od->fake_remote = GF_TRUE;
+							od->objectDescriptorID = k;
+							ODS_SetupOD(priv->scene, od);
+							gf_odf_desc_del((GF_Descriptor*)od);
+						}
+						if (keep_com) break;
+					}
+					break;
+					case GF_ODF_OD_REMOVE_TAG:
+					{
+						GF_ODRemove *odR = (GF_ODRemove*)com;
+						for (k=0; k<odR->NbODs; k++) {
+							GF_ObjectManager *odm = gf_scene_find_odm(priv->scene, odR->OD_ID[k]);
+							if (odm) gf_odm_disconnect(odm, 1);
+						}
+					}
+					break;
+					default:
+						break;
+					}
+					if (keep_com) {
+						gf_list_insert(au->commands, com, 0);
+						break;
+					} else {
+						gf_odf_com_del(&com);
+					}
+					if (e) break;
+				}
+
+			}
+			sc->last_au_time = au_time + 1;
+			/*attach graph to renderer*/
+			if (!priv->scene->graph_attached)
+				gf_scene_attach_to_compositor(priv->scene);
+			if (e) return e;
+
+			/*for root streams remove completed AUs (no longer needed)*/
+			if (sc->in_root_od && !gf_list_count(au->commands) ) {
+				j--;
+				gf_list_rem(sc->AUs, j);
+				gf_list_del(au->commands);
+				gf_free(au);
+			}
+		}
+	}
+	if (e) return e;
+
+	if ((priv->load_flags==2) && !updates_pending) {
+		gf_filter_pid_set_eos(priv->out_pid);
+		return GF_EOS;
+	}
+	if (!min_next_time_ms) min_next_time_ms = 1;
+	min_next_time_ms *= 1000;
+	if (min_next_time_ms>2000)
+		min_next_time_ms = 2000;
+
+	gf_filter_ask_rt_reschedule(filter, min_next_time_ms);
+	return GF_OK;
+}
+
+
+static void ctxload_finalize(GF_Filter *filter)
+{
+	CTXLoadPriv *priv = gf_filter_get_udta(filter);
+
+	if (priv->ctx) gf_sm_del(priv->ctx);
+	if (priv->files_to_delete) gf_list_del(priv->files_to_delete);
+}
+
+#include <gpac/utf.h>
+static const char *ctxload_probe_data(const u8 *probe_data, u32 size, GF_FilterProbeScore *score)
+{
+	const char *mime_type = NULL;
+	char *dst = NULL;
+	u8 *res;
+
+	/* check gzip magic header */
+	if ((size>2) && (probe_data[0] == 0x1f) && (probe_data[1] == 0x8b)) {
+		*score = GF_FPROBE_EXT_MATCH;
+		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;
+
+	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:"))
+	) {
+		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"))
+	) {
+		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")
+	) {
+		mime_type = "application/x-LASeR+xml";
+	} else if (strstr(probe_data, "DIMSStream") ) {
+		mime_type = "application/dims";
+	} else if (strstr(probe_data, "<svg") || strstr(probe_data, "w3.org/2000/svg") ) {
+		mime_type = "image/svg+xml";
+	} else if (strstr(probe_data, "<widget")  ) {
+		mime_type = "application/widget";
+	} else if (strstr(probe_data, "<NHNTStream")) {
+		mime_type = "application/x-nhml";
+	} else if (strstr(probe_data, "TextStream") ) {
+		mime_type = "text/ttxt";
+	} else if (strstr(probe_data, "text3GTrack") ) {
+		mime_type = "quicktime/text";
+	}
+	if (dst) gf_free(dst);
+	if (mime_type) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return mime_type;
+	}
+
+	*score = GF_FPROBE_NOT_SUPPORTED;
+	return NULL;
+}
+
+#endif //defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
+
+static const GF_FilterCapability CTXLoadCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "bt|btz|bt.gz|xmt|xmt.gz|xmtz|wrl|wrl.gz|x3dv|x3dv.gz|x3dvz|x3d|x3d.gz|x3dz|swf|xsr"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "application/x-bt|application/x-xmt|model/vrml|x-model/x-vrml|model/x3d+vrml|model/x3d+xml|application/x-shockwave-flash|application/x-LASeR+xml"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(CTXLoadPriv, _n)
+
+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},
+	{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.")
+	.private_size = sizeof(CTXLoadPriv),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = CTXLoadArgs,
+	SETCAPS(CTXLoadCaps),
+	.finalize = ctxload_finalize,
+	.process = ctxload_process,
+	.configure_pid = ctxload_configure_pid,
+	.process_event = ctxload_process_event,
+	.probe_data = ctxload_probe_data,
+};
+
+
+const GF_FilterRegister *ctxload_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_VRML) && !defined(GPAC_DISABLE_SCENEGRAPH)
+	return &CTXLoadRegister;
+#else
+	return NULL;
+#endif
+}
+
+

gpac-1.0.0.tar.gz/src/filters/load_svg.c Added

@@ -0,0 +1,481 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / SVG loader 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/internal/compositor_dev.h>
+#include <gpac/scene_manager.h>
+#include <gpac/constants.h>
+
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB)
+
+#include <zlib.h>
+
+typedef struct
+{
+	//opts
+	u32 sax_dur;
+
+	//internal
+	GF_FilterPid *in_pid, *out_pid;
+	GF_SceneLoader loader;
+	GF_Scene *scene;
+	u32 codecid;
+	const char *file_name;
+	u32 file_size;
+	u16 base_es_id;
+	u32 file_pos;
+	void *src;
+	Bool is_playing;
+} SVGIn;
+
+
+#define SVG_PROGRESSIVE_BUFFER_SIZE		4096
+
+//static
+GF_Err svgin_deflate(SVGIn *svgin, const char *buffer, u32 buffer_len, Bool is_dims)
+{
+	GF_Err e;
+	char svg_data[2049];
+	int err;
+	u32 done = 0;
+	z_stream d_stream;
+	memset(&d_stream, 0, sizeof(z_stream));
+	d_stream.next_in  = (Bytef*)buffer;
+	d_stream.avail_in = buffer_len;
+	d_stream.next_out = (Bytef*)svg_data;
+	d_stream.avail_out = 2048;
+
+	if (is_dims==1) {
+		err = inflateInit2(&d_stream, 16+MAX_WBITS);
+	} else {
+		err = inflateInit(&d_stream);
+	}
+
+	if (err == Z_OK) {
+		e = GF_OK;
+		while (d_stream.total_in < buffer_len) {
+			err = inflate(&d_stream, Z_NO_FLUSH);
+			if (err < Z_OK) {
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				break;
+			}
+			svg_data[d_stream.total_out - done] = 0;
+			e = gf_sm_load_string(&svgin->loader, svg_data, GF_FALSE);
+			if (e || (err== Z_STREAM_END)) break;
+			done = (u32) d_stream.total_out;
+			d_stream.avail_out = 2048;
+			d_stream.next_out = (Bytef*)svg_data;
+		}
+		inflateEnd(&d_stream);
+		return e;
+	}
+	return GF_NON_COMPLIANT_BITSTREAM;
+}
+
+static GF_Err svgin_process(GF_Filter *filter)
+{
+	Bool start, end;
+	const u8 *data;
+	u32 size;
+	GF_Err e = GF_OK;
+	GF_FilterPacket *pck;
+	SVGIn *svgin = (SVGIn *) gf_filter_get_udta(filter);
+
+	//no scene yet attached
+	if (!svgin->scene) {
+		if (svgin->is_playing) {
+			gf_filter_pid_set_eos(svgin->out_pid);
+			return GF_EOS;
+		}
+		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:
+		pck = gf_filter_pid_get_packet(svgin->in_pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(svgin->in_pid)) {
+				gf_filter_pid_set_eos(svgin->out_pid);
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+		e = gf_sm_load_string(&svgin->loader, data, GF_FALSE);
+		gf_filter_pid_drop_packet(svgin->in_pid);
+		break;
+
+	/*! streaming SVG + gz*/
+	case GF_CODECID_SVG_GZ:
+		pck = gf_filter_pid_get_packet(svgin->in_pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(svgin->in_pid)) {
+				gf_filter_pid_set_eos(svgin->out_pid);
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+		e = svgin_deflate(svgin, data, size, GF_FALSE);
+		gf_filter_pid_drop_packet(svgin->in_pid);
+		break;
+
+	/*! DIMS (dsi = 3GPP DIMS configuration)*/
+	case GF_CODECID_DIMS:
+	{
+		u8 prev, dims_hdr;
+		u32 nb_bytes;
+		u64 pos;
+		char * buf2 ;
+		GF_BitStream *bs;
+
+		pck = gf_filter_pid_get_packet(svgin->in_pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(svgin->in_pid)) {
+				gf_filter_pid_set_eos(svgin->out_pid);
+				return GF_EOS;
+			}
+			return GF_OK;
+		}
+		data = gf_filter_pck_get_data(pck, &size);
+
+		buf2 = gf_malloc(size);
+		bs = gf_bs_new((u8 *)data, size, GF_BITSTREAM_READ);
+		memcpy(buf2, data, size);
+
+		gf_filter_pid_drop_packet(svgin->in_pid);
+		e = GF_OK;
+		while (gf_bs_available(bs)) {
+			pos = gf_bs_get_position(bs);
+			size = gf_bs_read_u16(bs);
+			nb_bytes = 2;
+			/*GPAC internal hack*/
+			if (!size) {
+				size = gf_bs_read_u32(bs);
+				nb_bytes = 6;
+			}
+
+			dims_hdr = gf_bs_read_u8(bs);
+			prev = buf2[pos + nb_bytes + size];
+
+			buf2[pos + nb_bytes + size] = 0;
+			if (dims_hdr & GF_DIMS_UNIT_C) {
+				e = svgin_deflate(svgin, buf2 + pos + nb_bytes + 1, size - 1, GF_TRUE);
+			} else {
+				e = gf_sm_load_string(&svgin->loader, buf2 + pos + nb_bytes + 1, GF_FALSE);
+			}
+			buf2[pos + nb_bytes + size] = prev;
+			gf_bs_skip_bytes(bs, size-1);
+			if (e) break;
+
+		}
+		gf_bs_del(bs);
+		gf_free(buf2);
+		
+		if (e) goto exit;
+	}
+	break;
+
+	default:
+		if (!svgin->file_name) return GF_SERVICE_ERROR;
+
+		pck = gf_filter_pid_get_packet(svgin->in_pid);
+		if (!pck) return GF_OK;
+		gf_filter_pck_get_framing(pck, &start, &end);
+		gf_filter_pid_drop_packet( svgin->in_pid);
+
+		/*full doc parsing*/
+		if ((svgin->sax_dur == 0) && svgin->file_name) {
+			if (end) {
+				svgin->loader.fileName = svgin->file_name;
+				e = gf_sm_load_init(&svgin->loader);
+				if (!e) e = gf_sm_load_run(&svgin->loader);
+			}
+		}
+		/*chunk parsing*/
+		else {
+			u32 entry_time;
+			char file_buf[SVG_PROGRESSIVE_BUFFER_SIZE+2];
+			/*initial load*/
+			if (!svgin->src && !svgin->file_pos) {
+				svgin->src = gf_gzopen(svgin->file_name, "rb");
+				if (!svgin->src) return GF_URL_ERROR;
+				svgin->loader.fileName = svgin->file_name;
+				gf_sm_load_init(&svgin->loader);
+			}
+			e = GF_OK;
+			entry_time = gf_sys_clock();
+
+			while (1) {
+				u32 diff;
+				s32 nb_read;
+				nb_read = gf_gzread(svgin->src, file_buf, SVG_PROGRESSIVE_BUFFER_SIZE);
+				/*we may have read nothing but we still need to call parse in case the parser got suspended*/
+				if (nb_read<=0) {
+					if ((e==GF_EOS) && gf_gzeof(svgin->src)) {
+						gf_set_progress("SVG Parsing", svgin->file_pos, svgin->file_size);
+						gf_gzclose(svgin->src);
+						svgin->src = NULL;
+						gf_sm_load_done(&svgin->loader);
+					}
+					goto exit;
+				}
+
+				file_buf[nb_read] = file_buf[nb_read+1] = 0;
+
+				e = gf_sm_load_string(&svgin->loader, file_buf, GF_FALSE);
+				svgin->file_pos += nb_read;
+
+
+
+				/*handle decompression*/
+				if (svgin->file_pos > svgin->file_size) svgin->file_size = svgin->file_pos + 1;
+				if (e) break;
+
+				gf_set_progress("SVG Parsing", svgin->file_pos, svgin->file_size);
+				diff = gf_sys_clock() - entry_time;
+				if (diff > svgin->sax_dur) {
+					break;
+				}
+			}
+		}
+		break;
+	}
+
+exit:
+	if ((e>=GF_OK) && (svgin->scene->graph_attached!=1) && (gf_sg_get_root_node(svgin->loader.scene_graph)!=NULL) ) {
+		gf_scene_attach_to_compositor(svgin->scene);
+	}
+	/*prepare for next playback*/
+	if (e) {
+		gf_sm_load_done(&svgin->loader);
+		svgin->loader.fileName = NULL;
+		gf_filter_pid_set_eos(svgin->out_pid);
+	}
+	return e;
+}
+
+static GF_Err svgin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	SVGIn *svgin = (SVGIn *) gf_filter_get_udta(filter);
+	const GF_PropertyValue *prop;
+
+	if (is_remove) {
+		svgin->in_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 && prop->value.uint) svgin->codecid = prop->value.uint;
+
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (prop && (prop->value.uint==GF_STREAM_FILE)) {
+		//we must have a file path or codecid
+		prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+		if (prop && prop->value.string) svgin->file_name = prop->value.string;
+	}
+
+	if (!svgin->codecid && !svgin->file_name)
+		return GF_NOT_SUPPORTED;
+
+	svgin->loader.type = GF_SM_LOAD_SVG;
+	/* decSpecInfo is not null only when reading from an SVG file (local or distant, cached or not) */
+	switch (svgin->codecid) {
+	case GF_CODECID_SVG:
+	case GF_CODECID_SVG_GZ:
+		svgin->loader.flags |= GF_SM_LOAD_CONTEXT_STREAMING;
+		/*no decSpecInfo defined for streaming svg yet*/
+		break;
+	case GF_CODECID_DIMS:
+		svgin->loader.type = GF_SM_LOAD_DIMS;
+		svgin->loader.flags |= GF_SM_LOAD_CONTEXT_STREAMING;
+		/*decSpecInfo not yet supported for DIMS svg - we need properties at the scene level to store the
+		various indications*/
+		break;
+	default:
+		break;
+	}
+
+	if (!svgin->in_pid) {
+		GF_FilterEvent fevt;
+		svgin->in_pid = pid;
+
+		//we work with full file only, send a play event on source to indicate that
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
+		fevt.play.start_range = 0;
+		fevt.base.on_pid = svgin->in_pid;
+		fevt.play.full_file_only = GF_TRUE;
+		gf_filter_pid_send_event(svgin->in_pid, &fevt);
+
+	} else {
+		if (pid != svgin->in_pid) {
+			return GF_REQUIRES_NEW_INSTANCE;
+		}
+		//check for filename change
+		return GF_OK;
+	}
+
+	//declare a new output PID of type scene, codecid RAW
+	svgin->out_pid = gf_filter_pid_new(filter);
+
+	gf_filter_pid_copy_properties(svgin->out_pid, pid);
+	gf_filter_pid_set_property(svgin->out_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_SCENE) );
+	gf_filter_pid_set_property(svgin->out_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+	gf_filter_pid_set_property(svgin->out_pid, GF_PROP_PID_IN_IOD, &PROP_BOOL(GF_TRUE) );
+	gf_filter_pid_set_udta(pid, svgin->out_pid);
+
+
+	if (svgin->file_name) {
+		gf_filter_set_name(filter,  ((svgin->sax_dur==0) && svgin->file_size) ? "SVGLoad" : "SVGLoad:Progressive");
+	} else if (svgin->codecid==GF_CODECID_SVG) {
+		gf_filter_set_name(filter,  "SVG:Streaming");
+	} else if (svgin->codecid==GF_CODECID_SVG_GZ) {
+		gf_filter_set_name(filter,  "SVG:Streaming:GZ");
+	} else if (svgin->codecid==GF_CODECID_DIMS) {
+		gf_filter_set_name(filter,  "SVG:DIMS");
+	}
+
+	return GF_OK;
+}
+
+static Bool svgin_process_event(GF_Filter *filter, const GF_FilterEvent *com)
+{
+	u32 count, i;
+	SVGIn *svgin = gf_filter_get_udta(filter);
+	//check for scene attach
+	switch (com->base.type) {
+	case GF_FEVT_PLAY:
+		//cancel play event, we work with full file
+		svgin->is_playing = GF_TRUE;
+		return GF_TRUE;
+	case GF_FEVT_ATTACH_SCENE:
+		break;
+	case GF_FEVT_RESET_SCENE:
+		gf_sm_load_done(&svgin->loader);
+		svgin->scene = NULL;
+		return GF_FALSE;
+	default:
+		return GF_FALSE;
+	}
+	if (!com->attach_scene.on_pid) return GF_TRUE;
+
+	count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		GF_FilterPid *opid = gf_filter_pid_get_udta(ipid);
+		//we found our pid, set it up
+		if (opid == com->attach_scene.on_pid) {
+			if (!svgin->scene) {
+				GF_ObjectManager *odm = com->attach_scene.object_manager;
+				svgin->scene = odm->subscene ? odm->subscene : odm->parentscene;
+
+				memset(&svgin->loader, 0, sizeof(GF_SceneLoader));
+				svgin->loader.is = svgin->scene;
+				svgin->loader.scene_graph = svgin->scene->graph;
+				svgin->loader.localPath = gf_get_default_cache_directory();
+				
+				/*Warning: svgin->loader.type may be overriden in attach stream */
+				svgin->loader.type = GF_SM_LOAD_SVG;
+				svgin->loader.flags = GF_SM_LOAD_FOR_PLAYBACK;
+
+				if (! svgin->file_name)
+					gf_sm_load_init(&svgin->loader);
+
+				if (svgin->scene->root_od->ck && !svgin->scene->root_od->ck->clock_init)
+					gf_clock_set_time(svgin->scene->root_od->ck, 0);
+
+				//init clocks
+				gf_odm_check_buffering(svgin->scene->root_od, svgin->in_pid);
+			}
+			return GF_TRUE;
+		}
+	}
+
+	return GF_FALSE;
+}
+
+static const GF_FilterCapability SVGInCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "svg|svgz|svg.gz"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "image/svg+xml"),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SVG),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SVG_GZ),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_DIMS),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(SVGIn, _n)
+
+static const GF_FilterArgs SVGInArgs[] =
+{
+	{ OFFS(sax_dur), "loading duration for SAX parsing, 0 disables SAX parsing", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+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.")
+	.private_size = sizeof(SVGIn),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = SVGInArgs,
+	SETCAPS(SVGInCaps),
+	.process = svgin_process,
+	.configure_pid = svgin_configure_pid,
+	.process_event = svgin_process_event,
+};
+
+#endif
+
+
+const GF_FilterRegister *svgin_register(GF_FilterSession *session)
+{
+#if !defined(GPAC_DISABLE_SVG) && !defined(GPAC_DISABLE_ZLIB)
+	return &SVGInRegister;
+#else
+	return NULL;
+#endif
+}

gpac-1.0.0.tar.gz/src/filters/load_text.c Added

@@ -0,0 +1,2929 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / text import 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/utf.h>
+#include <gpac/xml.h>
+#include <gpac/token.h>
+#include <gpac/color.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/internal/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+/* SWF Importer */
+#include <gpac/internal/swf_dev.h>
+#endif
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+typedef struct __txtin_ctx GF_TXTIn;
+
+struct __txtin_ctx
+{
+	//opts
+	u32 width, height, txtx, txty, fontsize;
+	s32 zorder;
+	const char *fontname, *lang;
+	Bool nodefbox, noflush, webvtt;
+	u32 timescale;
+	GF_Fraction fps;
+
+
+	GF_FilterPid *ipid, *opid;
+	const char *file_name;
+	u32 fmt;
+	u32 playstate;
+	//0: not seeking, 1: seek request pending, 2: seek configured, discarding packets up until start_range
+	u32 seek_state;
+	Double start_range;
+
+	Bool is_setup;
+
+	GF_Err (*text_process)(GF_Filter *filter, GF_TXTIn *ctx);
+
+	s32 unicode_type;
+
+	FILE *src;
+
+	GF_BitStream *bs_w;
+	Bool first_samp;
+	Bool hdr_parsed;
+
+	//state vars for srt
+	u32 state, default_color;
+	GF_TextSample *samp;
+	u64 start, end, prev_end;
+	u32 curLine;
+	GF_StyleRecord style;
+
+	//WebVTT state
+	GF_WebVTTParser *vttparser;
+
+	//TTXT state
+	GF_DOMParser *parser;
+	u32 cur_child_idx, nb_children, last_desc_idx;
+	GF_List *text_descs;
+	Bool last_sample_empty;
+	u64 last_sample_duration;
+	//TTML state is the same as ttxt plus the timescale and start (webvtt) for cts compute
+	u32 txml_timescale;
+
+	//TTML state
+	GF_XMLNode *root_working_copy, *div_node, *sample_list_node;
+	GF_DOMParser *parser_working_copy;
+	Bool non_compliant_ttml;
+	u32 nb_p_found;
+
+
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+	//SWF text
+	SWFReader *swf_parse;
+	Bool do_suspend;
+#endif
+
+
+};
+
+
+enum
+{
+	GF_TXTIN_MODE_NONE = 0,
+	GF_TXTIN_MODE_SRT,
+	GF_TXTIN_MODE_SUB,
+	GF_TXTIN_MODE_TTXT,
+	GF_TXTIN_MODE_TEXML,
+	GF_TXTIN_MODE_WEBVTT,
+	GF_TXTIN_MODE_TTML,
+	GF_TXTIN_MODE_SWF_SVG,
+};
+
+#define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
+		u32 _len = (u32) strlen(__str);		\
+		if (!_len) break;	\
+		_len--;				\
+		if (strchr(__sep, __str[_len])) __str[_len] = 0;	\
+		else break;	\
+	}	\
+ 
+
+s32 gf_text_get_utf_type(FILE *in_src)
+{
+	u32 read;
+	unsigned char BOM[5];
+	read = (u32) gf_fread(BOM, 5, in_src);
+	if ((s32) read < 1)
+		return -1;
+
+	if ((BOM[0]==0xFF) && (BOM[1]==0xFE)) {
+		/*UTF32 not supported*/
+		if (!BOM[2] && !BOM[3]) return -1;
+		gf_fseek(in_src, 2, SEEK_SET);
+		return 3;
+	}
+	if ((BOM[0]==0xFE) && (BOM[1]==0xFF)) {
+		/*UTF32 not supported*/
+		if (!BOM[2] && !BOM[3]) return -1;
+		gf_fseek(in_src, 2, SEEK_SET);
+		return 2;
+	} else if ((BOM[0]==0xEF) && (BOM[1]==0xBB) && (BOM[2]==0xBF)) {
+		gf_fseek(in_src, 3, SEEK_SET);
+		return 1;
+	}
+	if (BOM[0]<0x80) {
+		gf_fseek(in_src, 0, SEEK_SET);
+		return 0;
+	}
+	return -1;
+}
+static void ttxt_dom_progress(void *cbk, u64 cur_samp, u64 count)
+{
+	GF_TXTIn *ctx = (GF_TXTIn *)cbk;
+	ctx->end = count;
+}
+
+static GF_Err gf_text_guess_format(const char *filename, u32 *fmt)
+{
+	char szLine[2048];
+	u32 val;
+	s32 uni_type;
+	FILE *test = gf_fopen(filename, "rb");
+	if (!test) return GF_URL_ERROR;
+	uni_type = gf_text_get_utf_type(test);
+
+	if (uni_type>1) {
+		const u16 *sptr;
+		char szUTF[1024];
+		u32 read = (u32) gf_fread(szUTF, 1023, test);
+		if ((s32) read < 0) {
+			gf_fclose(test);
+			return GF_IO_ERR;
+		}
+		szUTF[read]=0;
+		sptr = (u16*)szUTF;
+		/*read = (u32) */gf_utf8_wcstombs(szLine, read, &sptr);
+	} else {
+		val = (u32) gf_fread(szLine, 1024, test);
+		if ((s32) val<0) return GF_IO_ERR;
+		
+		szLine[val]=0;
+	}
+	REM_TRAIL_MARKS(szLine, "\r\n\t ")
+
+	*fmt = GF_TXTIN_MODE_NONE;
+	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;
+		ext = strstr(szLine, "?>");
+		if (ext) ext += 2;
+		if (ext && !ext[0]) {
+			if (!gf_fgets(szLine, 2048, test))
+				szLine[0] = '\0';
+		}
+		if (strstr(szLine, "x-quicktime-tx3g") || strstr(szLine, "text3GTrack")) *fmt = GF_TXTIN_MODE_TEXML;
+		else if (strstr(szLine, "TextStream")) *fmt = GF_TXTIN_MODE_TTXT;
+		else if (strstr(szLine, "tt")) *fmt = GF_TXTIN_MODE_TTML;
+	}
+	else if (strstr(szLine, "WEBVTT") )
+		*fmt = GF_TXTIN_MODE_WEBVTT;
+	else if (strstr(szLine, " --> ") )
+		*fmt = GF_TXTIN_MODE_SRT; /* might want to change the default to WebVTT */
+
+	else if (!strncmp(szLine, "FWS", 3) || !strncmp(szLine, "CWS", 3))
+		*fmt = GF_TXTIN_MODE_SWF_SVG;
+
+	gf_fclose(test);
+	return GF_OK;
+}
+
+
+
+char *gf_text_get_utf8_line(char *szLine, u32 lineSize, FILE *txt_in, s32 unicode_type)
+{
+	u32 i, j, len;
+	char *sOK;
+	char szLineConv[1024];
+	unsigned short *sptr;
+
+	memset(szLine, 0, sizeof(char)*lineSize);
+	sOK = gf_fgets(szLine, lineSize, txt_in);
+	if (!sOK) return NULL;
+	if (unicode_type<=1) {
+		j=0;
+		len = (u32) strlen(szLine);
+		for (i=0; i<len; i++) {
+			if (!unicode_type && (szLine[i] & 0x80)) {
+				/*non UTF8 (likely some win-CP)*/
+				if ((szLine[i+1] & 0xc0) != 0x80) {
+					szLineConv[j] = 0xc0 | ( (szLine[i] >> 6) & 0x3 );
+					j++;
+					szLine[i] &= 0xbf;
+				}
+				/*UTF8 2 bytes char*/
+				else if ( (szLine[i] & 0xe0) == 0xc0) {
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+				}
+				/*UTF8 3 bytes char*/
+				else if ( (szLine[i] & 0xf0) == 0xe0) {
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+				}
+				/*UTF8 4 bytes char*/
+				else if ( (szLine[i] & 0xf8) == 0xf0) {
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+					szLineConv[j] = szLine[i];
+					i++;
+					j++;
+				} else {
+					i+=1;
+					continue;
+				}
+			}
+			szLineConv[j] = szLine[i];
+			j++;
+		}
+		szLineConv[j] = 0;
+		strcpy(szLine, szLineConv);
+		return sOK;
+	}
+
+#ifdef GPAC_BIG_ENDIAN
+	if (unicode_type==3) {
+#else
+	if (unicode_type==2) {
+#endif
+		i=0;
+		while (1) {
+			char c;
+			if (!szLine[i] && !szLine[i+1]) break;
+			c = szLine[i+1];
+			szLine[i+1] = szLine[i];
+			szLine[i] = c;
+			i+=2;
+		}
+	}
+	sptr = (u16 *)szLine;
+	i = (u32) gf_utf8_wcstombs(szLineConv, 1024, (const unsigned short **) &sptr);
+	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*/
+	if (unicode_type==3) gf_fgetc(txt_in);
+	return sOK;
+}
+
+
+static void txtin_probe_duration(GF_TXTIn *ctx)
+{
+	GF_Fraction64 dur;
+	dur.num = 0;
+
+	if (ctx->fmt == GF_TXTIN_MODE_SWF_SVG) {
+#ifndef GPAC_DISABLE_SWF_IMPORT
+		u32 frame_count, frame_rate;
+		gf_swf_get_duration(ctx->swf_parse, &frame_rate, &frame_count);
+		if (frame_count) {
+			GF_Fraction64 tdur;
+			tdur.num = frame_count;
+			tdur.den = frame_rate;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(tdur));
+		}
+#endif
+		return;
+	}
+	if ((ctx->fmt == GF_TXTIN_MODE_SRT) || (ctx->fmt == GF_TXTIN_MODE_WEBVTT)  || (ctx->fmt == GF_TXTIN_MODE_SUB)) {
+		u64 pos = gf_ftell(ctx->src);
+		gf_fseek(ctx->src, 0, SEEK_SET);
+		while (!gf_feof(ctx->src)) {
+			u64 end;
+			char szLine[2048];
+			char *sOK = gf_text_get_utf8_line(szLine, 2048, ctx->src, ctx->unicode_type);
+			if (!sOK) break;
+			REM_TRAIL_MARKS(szLine, "\r\n\t ")
+
+			if (ctx->fmt == GF_TXTIN_MODE_SUB) {
+				char szText[2048];
+				u32 sframe, eframe;
+				if (sscanf(szLine, "{%d}{%d}%2047s", &sframe, &eframe, szText) == 3) {
+					if (ctx->fps.den)
+						end = 1000 * eframe * ctx->fps.num / ctx->fps.den;
+					else
+						end = 1000 * eframe / 25;
+					if (end > (u64) dur.num) dur.num = (s64) end;
+				}
+			} else {
+				u32 eh, em, es, ems;
+				char *start = strstr(szLine, "-->");
+				if (!start) continue;
+				while (start[0] && ((start[0] == ' ') || (start[0] == '\t'))) start++;
+
+				if (sscanf(start, "%u:%u:%u,%u", &eh, &em, &es, &ems) != 4) {
+					eh = 0;
+					if (sscanf(szLine, "%u:%u,%u", &em, &es, &ems) != 3) {
+						continue;
+					}
+				}
+				end = (3600*eh + 60*em + es)*1000 + ems;
+				if (end > (u64) dur.num) dur.num = (s64) end;
+			}
+		}
+		gf_fseek(ctx->src, pos, SEEK_SET);
+		if (dur.num) {
+			dur.den = 1000;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+		}
+		return;
+	}
+	if ((ctx->fmt == GF_TXTIN_MODE_TTXT) || (ctx->fmt == GF_TXTIN_MODE_TEXML)) {
+		u32 i=0;
+		GF_XMLNode *node, *root = gf_xml_dom_get_root(ctx->parser);
+		while ((node = gf_list_enum(root->content, &i))) {
+			u32 j;
+			u64 duration;
+			GF_XMLAttribute *att;
+			if (node->type) {
+				continue;
+			}
+			/*sample text*/
+			if ((ctx->fmt == GF_TXTIN_MODE_TTXT) && strcmp(node->name, "TextSample")) continue;
+			else if ((ctx->fmt == GF_TXTIN_MODE_TEXML) && strcmp(node->name, "sample")) continue;
+
+
+			j=0;
+			while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
+				u32 h, m, s, ms;
+				u64 ts=0;
+				if (ctx->fmt == GF_TXTIN_MODE_TTXT) {
+					if (strcmp(att->name, "sampleTime")) continue;
+
+					if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+						ts = (h*3600 + m*60 + s)*1000 + ms;
+					} else {
+						ts = (u32) (atof(att->value) * 1000);
+					}
+					if (ts > (u64) dur.num) dur.num = (s64) ts;
+				} else {
+					if (strcmp(att->name, "duration")) continue;
+					duration = atoi(att->value);
+					dur.num += (s32) ( (1000 * duration) / ctx->txml_timescale);
+				}
+			}
+		}
+		if (dur.num) {
+			dur.den = 1000;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+		}
+		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;
+
+				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 <span>
+			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 (dur.num) {
+			dur.den = 1000;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64(dur));
+		}
+		return;
+	}
+	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Duration probing not supported for format %d\n", ctx->fmt));
+}
+
+static GF_Err txtin_setup_srt(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	u32 ID, OCR_ES_ID, dsi_len, file_size;
+	u8 *dsi;
+	GF_TextSampleDescriptor *sd;
+
+	ctx->src = gf_fopen(ctx->file_name, "rt");
+	if (!ctx->src) return GF_URL_ERROR;
+
+	file_size = (u32) gf_fsize(ctx->src);
+
+	ctx->unicode_type = gf_text_get_utf_type(ctx->src);
+	if (ctx->unicode_type<0) {
+		gf_fclose(ctx->src);
+		ctx->src = NULL;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Unsupported SRT UTF encoding\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (!ctx->timescale) ctx->timescale = 1000;
+	OCR_ES_ID = ID = 0;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_TX3G) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(file_size) );
+
+	if (!ID) ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (OCR_ES_ID) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(OCR_ES_ID) );
+	if (ctx->width) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
+	if (ctx->height) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+	if (ctx->zorder) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+	if (ctx->lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( ctx->lang) );
+
+	sd = (GF_TextSampleDescriptor*)gf_odf_desc_new(GF_ODF_TX3G_TAG);
+	sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
+	sd->font_count = 1;
+	sd->fonts[0].fontID = 1;
+	sd->fonts[0].fontName = gf_strdup(ctx->fontname ? ctx->fontname : "Serif");
+	sd->back_color = 0x00000000;	/*transparent*/
+	sd->default_style.fontID = 1;
+	sd->default_style.font_size = ctx->fontsize;
+	sd->default_style.text_color = 0xFFFFFFFF;	/*white*/
+	sd->default_style.style_flags = 0;
+	sd->horiz_justif = 1; /*center of scene*/
+	sd->vert_justif = (s8) -1;	/*bottom of scene*/
+
+	if (ctx->nodefbox) {
+		sd->default_pos.top = sd->default_pos.left = sd->default_pos.right = sd->default_pos.bottom = 0;
+	} else if ((sd->default_pos.bottom==sd->default_pos.top) || (sd->default_pos.right==sd->default_pos.left)) {
+		sd->default_pos.left = ctx->txtx;
+		sd->default_pos.top = ctx->txty;
+		sd->default_pos.right = ctx->width + sd->default_pos.left;
+		sd->default_pos.bottom = ctx->height + sd->default_pos.top;
+	}
+
+	/*store attribs*/
+	ctx->style = sd->default_style;
+	gf_odf_tx3g_write(sd, &dsi, &dsi_len);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA_NO_COPY(dsi, dsi_len) );
+
+	gf_odf_desc_del((GF_Descriptor *)sd);
+
+	ctx->default_color = ctx->style.text_color;
+	ctx->samp = gf_isom_new_text_sample();
+	ctx->state = 0;
+	ctx->end = ctx->prev_end = ctx->start = 0;
+	ctx->first_samp = GF_TRUE;
+	ctx->curLine = 0;
+
+	txtin_probe_duration(ctx);
+	return GF_OK;
+}
+
+static void txtin_process_send_text_sample(GF_TXTIn *ctx, GF_TextSample *txt_samp, u64 ts, u32 duration, Bool is_rap)
+{
+	GF_FilterPacket *dst_pck;
+	u8 *pck_data;
+	u32 size;
+
+	if (ctx->seek_state==2) {
+		Double end = (Double) (ts+duration);
+		end /= 1000;
+		if (end < ctx->start_range) return;
+		ctx->seek_state = 0;
+	}
+
+	size = gf_isom_text_sample_size(txt_samp);
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
+	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;
+
+	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);
+	gf_filter_pck_set_duration(dst_pck, duration);
+
+	gf_filter_pck_send(dst_pck);
+}
+
+static GF_Err txtin_process_srt(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	u32 i;
+	u32 sh, sm, ss, sms, eh, em, es, ems, txt_line, char_len, char_line, j, rem_styles;
+	Bool set_start_char, set_end_char, rem_color;
+	u32 line, len;
+	char szLine[2048], szText[2048], *ptr;
+	unsigned short uniLine[5000], uniText[5000], *sptr;
+
+	if (!ctx->is_setup) {
+		ctx->is_setup = GF_TRUE;
+		return txtin_setup_srt(filter, ctx);
+	}
+	if (!ctx->opid) return GF_NOT_SUPPORTED;
+	if (!ctx->playstate) return GF_OK;
+	else if (ctx->playstate==2) return GF_EOS;
+
+	txt_line = 0;
+	set_start_char = set_end_char = GF_FALSE;
+	char_len = 0;
+
+	if (ctx->seek_state == 1) {
+		ctx->seek_state = 2;
+		gf_fseek(ctx->src, 0, SEEK_SET);
+	}
+
+	while (1) {
+		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 || !strlen(szLine)) {
+			u32 nb_empty = 1;
+			u32 pos = (u32) gf_ftell(ctx->src);
+			if (ctx->state) {
+				while (!gf_feof(ctx->src)) {
+					sOK = gf_text_get_utf8_line(szLine+nb_empty, 2048-nb_empty, ctx->src, ctx->unicode_type);
+					if (sOK) REM_TRAIL_MARKS((szLine+nb_empty), "\r\n\t ")
+
+					if (!sOK) {
+						gf_fseek(ctx->src, pos, SEEK_SET);
+						break;
+					} else if (!strlen(szLine+nb_empty)) {
+						nb_empty++;
+						continue;
+					} else if (	sscanf(szLine+nb_empty, "%u", &line) == 1) {
+						gf_fseek(ctx->src, pos, SEEK_SET);
+						break;
+					} else {
+						u32 k;
+						for (k=0; k<nb_empty; k++) szLine[k] = '\n';
+						goto force_line;
+					}
+				}
+			}
+			ctx->style.style_flags = 0;
+			ctx->style.startCharOffset = ctx->style.endCharOffset = 0;
+			if (txt_line) {
+				if (ctx->prev_end && (ctx->start != ctx->prev_end) && (ctx->state<=2)) {
+					GF_TextSample * empty_samp = gf_isom_new_text_sample();
+					txtin_process_send_text_sample(ctx, empty_samp, ctx->prev_end, (u32) (ctx->start - ctx->prev_end), GF_TRUE );
+					gf_isom_delete_text_sample(empty_samp);
+				}
+
+				if (ctx->state<=2) {
+					txtin_process_send_text_sample(ctx, ctx->samp,  ctx->start, (u32) (ctx->end -  ctx->start), GF_TRUE);
+					ctx->prev_end = ctx->end;
+				}
+				txt_line = 0;
+				char_len = 0;
+				set_start_char = set_end_char = GF_FALSE;
+				ctx->style.startCharOffset = ctx->style.endCharOffset = 0;
+				gf_isom_text_reset(ctx->samp);
+
+				gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT( gf_ftell(ctx->src )) );
+			}
+			ctx->state = 0;
+			if (!sOK) break;
+			continue;
+		}
+
+force_line:
+		switch (ctx->state) {
+		case 0:
+			if (sscanf(szLine, "%u", &line) != 1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Bad SRT formatting - expecting number got \"%s\"\n", szLine));
+				break;
+			}
+			if (line != ctx->curLine + 1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Corrupted SRT frame %d after frame %d\n", line, ctx->curLine));
+			}
+			ctx->curLine = line;
+			ctx->state = 1;
+			break;
+		case 1:
+			if (sscanf(szLine, "%u:%u:%u,%u --> %u:%u:%u,%u", &sh, &sm, &ss, &sms, &eh, &em, &es, &ems) != 8) {
+				if (sscanf(szLine, "%u:%u:%u.%u --> %u:%u:%u.%u", &sh, &sm, &ss, &sms, &eh, &em, &es, &ems) != 8) {
+					sh = eh = 0;
+					if (sscanf(szLine, "%u:%u,%u --> %u:%u,%u", &sm, &ss, &sms, &em, &es, &ems) != 6) {
+						if (sscanf(szLine, "%u:%u.%u --> %u:%u.%u", &sm, &ss, &sms, &em, &es, &ems) != 6) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Error scanning SRT frame %d timing\n", ctx->curLine));
+				    		ctx->state = 0;
+							break;
+						}
+					}
+				}
+			}
+			ctx->start = (3600*sh + 60*sm + ss)*1000 + sms;
+			if (ctx->start < ctx->end) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Overlapping SRT frame %d - starts "LLD" ms is before end of previous one "LLD" ms - adjusting time stamps\n", ctx->curLine, ctx->start, ctx->end));
+				ctx->start = ctx->end;
+			}
+
+			ctx->end = (3600*eh + 60*em + es)*1000 + ems;
+			/*make stream start at 0 by inserting a fake AU*/
+			if (ctx->first_samp && (ctx->start > 0)) {
+				txtin_process_send_text_sample(ctx, ctx->samp, 0, (u32) ctx->start, GF_TRUE);
+			}
+			ctx->style.style_flags = 0;
+			ctx->state = 2;
+			if (ctx->end <= ctx->prev_end) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Overlapping SRT frame %d end "LLD" is at or before previous end "LLD" - removing\n", ctx->curLine, ctx->end, ctx->prev_end));
+				ctx->start = ctx->end;
+				ctx->state = 3;
+			}
+			break;
+
+		default:
+			/*reset only when text is present*/
+			ctx->first_samp = GF_FALSE;
+
+			/*go to line*/
+			if (txt_line) {
+				gf_isom_text_add_text(ctx->samp, "\n", 1);
+				char_len += 1;
+			}
+
+			ptr = (char *) szLine;
+			{
+				size_t _len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &ptr);
+				if (_len == (size_t) -1) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Invalid UTF data (line %d)\n", ctx->curLine));
+					ctx->state = 0;
+				}
+				len = (u32) _len;
+			}
+			i=j=0;
+			rem_styles = 0;
+			rem_color = 0;
+			while (i<len) {
+				u32 font_style = 0;
+				u32 style_nb_chars = 0;
+				u32 style_def_type = 0;
+
+				if ( (uniLine[i]=='<') && (uniLine[i+2]=='>')) {
+					style_nb_chars = 3;
+					style_def_type = 1;
+				}
+				else if ( (uniLine[i]=='<') && (uniLine[i+1]=='/') && (uniLine[i+3]=='>')) {
+					style_def_type = 2;
+					style_nb_chars = 4;
+				}
+				else if (uniLine[i]=='<')  {
+					const unsigned short* src = uniLine + i;
+					size_t alen = gf_utf8_wcstombs(szLine, 2048, (const unsigned short**) & src);
+					szLine[alen] = 0;
+					strlwr(szLine);
+					if (!strncmp(szLine, "<font ", 6) ) {
+						char *a_sep = strstr(szLine, "color");
+						if (a_sep) a_sep = strchr(a_sep, '"');
+						if (a_sep) {
+							char *e_sep = strchr(a_sep+1, '"');
+							if (e_sep) {
+								e_sep[0] = 0;
+								font_style = gf_color_parse(a_sep+1);
+								e_sep[0] = '"';
+								e_sep = strchr(e_sep+1, '>');
+								if (e_sep) {
+									style_nb_chars = (u32) (1 + e_sep - szLine);
+									style_def_type = 1;
+								}
+							}
+
+						}
+					}
+					else if (!strncmp(szLine, "</font>", 7) ) {
+						style_nb_chars = 7;
+						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);
+							i += style_nb_chars;
+							continue;
+						}
+					}
+
+				}
+
+				/*start of new style*/
+				if (style_def_type==1)  {
+					/*store prev style*/
+					if (set_end_char) {
+						assert(set_start_char);
+						gf_isom_text_add_style(ctx->samp, &ctx->style);
+						set_end_char = set_start_char = GF_FALSE;
+						ctx->style.style_flags &= ~rem_styles;
+						rem_styles = 0;
+						if (rem_color) {
+							ctx->style.text_color = ctx->default_color;
+							rem_color = 0;
+						}
+					}
+					if (set_start_char && (ctx->style.startCharOffset != j)) {
+						ctx->style.endCharOffset = char_len + j;
+						if (ctx->style.style_flags) gf_isom_text_add_style(ctx->samp, &ctx->style);
+					}
+					switch (uniLine[i+1]) {
+					case 'b':
+					case 'B':
+						ctx->style.style_flags |= GF_TXT_STYLE_BOLD;
+						set_start_char = GF_TRUE;
+						ctx->style.startCharOffset = char_len + j;
+						break;
+					case 'i':
+					case 'I':
+						ctx->style.style_flags |= GF_TXT_STYLE_ITALIC;
+						set_start_char = GF_TRUE;
+						ctx->style.startCharOffset = char_len + j;
+						break;
+					case 'u':
+					case 'U':
+						ctx->style.style_flags |= GF_TXT_STYLE_UNDERLINED;
+						set_start_char = GF_TRUE;
+						ctx->style.startCharOffset = char_len + j;
+						break;
+					case 'f':
+					case 'F':
+						if (font_style) {
+							ctx->style.text_color = font_style;
+							set_start_char = GF_TRUE;
+							ctx->style.startCharOffset = char_len + j;
+						}
+						break;
+					}
+					i += style_nb_chars;
+					continue;
+				}
+
+				/*end of prev style*/
+				if (style_def_type==2)  {
+					switch (uniLine[i+2]) {
+					case 'b':
+					case 'B':
+						rem_styles |= GF_TXT_STYLE_BOLD;
+						set_end_char = GF_TRUE;
+						ctx->style.endCharOffset = char_len + j;
+						break;
+					case 'i':
+					case 'I':
+						rem_styles |= GF_TXT_STYLE_ITALIC;
+						set_end_char = GF_TRUE;
+						ctx->style.endCharOffset = char_len + j;
+						break;
+					case 'u':
+					case 'U':
+						rem_styles |= GF_TXT_STYLE_UNDERLINED;
+						set_end_char = GF_TRUE;
+						ctx->style.endCharOffset = char_len + j;
+						break;
+					case 'f':
+					case 'F':
+						if (font_style) {
+							rem_color = 1;
+							set_end_char = GF_TRUE;
+							ctx->style.endCharOffset = char_len + j;
+						}
+					}
+					i+=style_nb_chars;
+					continue;
+				}
+				/*store style*/
+				if (set_end_char) {
+					gf_isom_text_add_style(ctx->samp, &ctx->style);
+					set_end_char = GF_FALSE;
+					set_start_char = GF_TRUE;
+					ctx->style.startCharOffset = char_len + j;
+					ctx->style.style_flags &= ~rem_styles;
+					rem_styles = 0;
+					ctx->style.text_color = ctx->default_color;
+					rem_color = 0;
+				}
+
+				uniText[j] = uniLine[i];
+				j++;
+				i++;
+			}
+			/*store last style*/
+			if (set_end_char) {
+				gf_isom_text_add_style(ctx->samp, &ctx->style);
+				set_end_char = GF_FALSE;
+				set_start_char = GF_TRUE;
+				ctx->style.startCharOffset = char_len + j;
+				ctx->style.style_flags &= ~rem_styles;
+			}
+
+			char_line = j;
+			uniText[j] = 0;
+
+			sptr = (u16 *) uniText;
+			len = (u32) gf_utf8_wcstombs(szText, 5000, (const u16 **) &sptr);
+
+			gf_isom_text_add_text(ctx->samp, szText, len);
+			char_len += char_line;
+			txt_line ++;
+			break;
+		}
+
+		if (gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+
+	/*final flush*/	
+	if (ctx->end && ! ctx->noflush) {
+		gf_isom_text_reset(ctx->samp);
+		txtin_process_send_text_sample(ctx, ctx->samp, ctx->end, 0, GF_TRUE);
+		ctx->end = 0;
+	}
+	gf_isom_text_reset(ctx->samp);
+
+	return GF_EOS;
+}
+
+/* Structure used to pass importer and track data to the parsers without exposing the GF_MediaImporter structure
+   used by WebVTT and Flash->SVG */
+typedef struct {
+	GF_TXTIn *ctx;
+	u32 timescale;
+	u32 track;
+	u32 descriptionIndex;
+} GF_ISOFlusher;
+
+#ifndef GPAC_DISABLE_VTT
+
+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) );
+	return e;
+}
+
+static void gf_webvtt_import_header(void *user, const char *config)
+{
+	GF_TXTIn *ctx = (GF_TXTIn *)user;
+	if (!ctx->hdr_parsed) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *) config, (u32) (1+strlen(config)) ) );
+		ctx->hdr_parsed = GF_TRUE;
+		gf_webvtt_parser_suspend(ctx->vttparser);
+	}
+}
+
+static void gf_webvtt_flush_sample(void *user, GF_WebVTTSample *samp)
+{
+	u64 start, end;
+	GF_TXTIn *ctx = (GF_TXTIn *)user;
+	GF_ISOSample *s;
+
+	start = gf_webvtt_sample_get_start(samp);
+	end = gf_webvtt_sample_get_end(samp);
+
+	if (ctx->seek_state==2) {
+		Double tsend = (Double) end;
+		tsend /= 1000;
+		if (tsend<ctx->start_range) return;
+		ctx->seek_state = 0;
+	}
+
+	s = gf_isom_webvtt_to_sample(samp);
+	if (s) {
+		GF_FilterPacket *pck;
+		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 (end && (end>=start) ) {
+			gf_filter_pck_set_duration(pck, (u32) (ctx->timescale * (end-start) / 1000) );
+		}
+		gf_filter_pck_send(pck);
+
+		gf_isom_sample_del(&s);
+	}
+	gf_webvtt_sample_del(samp);
+
+	gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT( gf_ftell(ctx->src )) );
+
+	if (gf_filter_pid_would_block(ctx->opid))
+		gf_webvtt_parser_suspend(ctx->vttparser);
+
+}
+
+static GF_Err txtin_webvtt_setup(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	u32 ID, OCR_ES_ID, file_size, w, h;
+	Bool is_srt;
+	char *ext;
+
+	ctx->src = gf_fopen(ctx->file_name, "rt");
+	if (!ctx->src) return GF_URL_ERROR;
+
+	file_size = (u32) gf_fsize(ctx->src);
+
+	ctx->unicode_type = gf_text_get_utf_type(ctx->src);
+	if (ctx->unicode_type<0) {
+		gf_fclose(ctx->src);
+		ctx->src = NULL;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Unsupported SRT UTF encoding\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	ext = gf_file_ext_start(ctx->file_name);
+	is_srt = (ext && !strnicmp(ext, ".srt", 4)) ? GF_TRUE : GF_FALSE;
+
+
+	if (!ctx->timescale) ctx->timescale = 1000;
+	OCR_ES_ID = ID = 0;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_WEBVTT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(file_size) );
+
+	w = ctx->width;
+	h = ctx->height;
+	if (!ID) ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (OCR_ES_ID) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(OCR_ES_ID) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(w) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(h) );
+	if (ctx->zorder) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+	if (ctx->lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( ctx->lang) );
+
+	ctx->vttparser = gf_webvtt_parser_new();
+
+	e = gf_webvtt_parser_init(ctx->vttparser, ctx->src, ctx->unicode_type, is_srt, ctx, gf_webvtt_import_report, gf_webvtt_flush_sample, gf_webvtt_import_header);
+	if (e != GF_OK) {
+		gf_webvtt_parser_del(ctx->vttparser);
+		ctx->vttparser = NULL;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] WebVTT parser init error %s\n", gf_error_to_string(e) ));
+	}
+	//get the header
+	e = gf_webvtt_parser_parse(ctx->vttparser);
+
+	txtin_probe_duration(ctx);
+	return e;
+}
+
+static GF_Err txtin_process_webvtt(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+
+	if (!ctx->is_setup) {
+		ctx->is_setup = GF_TRUE;
+		return txtin_webvtt_setup(filter, ctx);
+	}
+	if (!ctx->vttparser) return GF_NOT_SUPPORTED;
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		gf_webvtt_parser_restart(ctx->vttparser);
+	}
+
+	e = gf_webvtt_parser_parse(ctx->vttparser);
+	if (e < GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] WebVTT process error %s\n", gf_error_to_string(e) ));
+	}
+	return e;
+}
+
+#endif /*GPAC_DISABLE_VTT*/
+
+static char *ttxt_parse_string(char *str, Bool strip_lines)
+{
+	u32 i=0;
+	u32 k=0;
+	u32 len = (u32) strlen(str);
+	u32 state = 0;
+
+	if (!strip_lines) {
+		for (i=0; i<len; i++) {
+			if ((str[i] == '\r') && (str[i+1] == '\n')) {
+				i++;
+			}
+			str[k] = str[i];
+			k++;
+		}
+		str[k]=0;
+		return str;
+	}
+
+	if (str[0]!='\'') return str;
+	for (i=0; i<len; i++) {
+		if (str[i] == '\'') {
+
+			if (!state) {
+				if (k) {
+					str[k]='\n';
+					k++;
+				}
+				state = 1; //!state;
+			} else {
+				if ( (i+1==len) ||
+				        ((str[i+1]==' ') || (str[i+1]=='\n') || (str[i+1]=='\r') || (str[i+1]=='\t') || (str[i+1]=='\''))
+				   ) {
+					state = !state;
+				} else {
+					str[k] = str[i];
+					k++;
+				}
+			}
+		} else if (state) {
+			str[k] = str[i];
+			k++;
+		}
+	}
+	str[k]=0;
+	return str;
+}
+
+static void GF_TXTIN_MODE_ebu_ttd_remove_samples(GF_XMLNode *root, GF_XMLNode **sample_list_node)
+{
+	u32 idx = 0;
+	GF_XMLNode *node = NULL;
+	*sample_list_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;
+			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);
+						assert(gf_list_find(body_node->content, content_node) == 0);
+						gf_list_rem(body_node->content, 0);
+						gf_xml_dom_node_del(content_node);
+					}
+					return;
+				}
+			}
+		}
+	}
+}
+
+#define TTML_NAMESPACE "http://www.w3.org/ns/ttml"
+
+static GF_Err gf_text_ttml_setup(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	u32 i, nb_children, ID;
+	u64 file_size;
+	GF_XMLAttribute *att;
+	GF_XMLNode *root, *node, *body_node;
+	const char *lang = ctx->lang;
+
+
+	ctx->is_setup = GF_TRUE;
+	ctx->parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(ctx->parser, ctx->file_name, ttxt_dom_progress, ctx);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Error parsing TTML file: Line %d - %s. Abort.\n", gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
+		ctx->is_setup = GF_TRUE;
+		ctx->non_compliant_ttml = GF_TRUE;
+		return e;
+	}
+	root = gf_xml_dom_get_root(ctx->parser);
+	if (!root) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Error parsing TTML file: no root XML element found. Abort.\n"));
+		ctx->non_compliant_ttml = GF_TRUE;
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	/*look for TTML*/
+	if (gf_xml_get_element_check_namespace(root, "tt", NULL) != GF_OK) {
+		if (root->ns) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s:%s\" (check your namespaces)\n", root->ns, root->name));
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("TTML file not recognized: root element is \"%s\"\n", root->name));
+		}
+		ctx->non_compliant_ttml = GF_TRUE;
+		return GF_NOT_SUPPORTED;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TXTIn] TTML EBU-TTD detected\n"));
+
+	root = gf_xml_dom_get_root(ctx->parser);
+
+
+	/*** root (including language) ***/
+	i=0;
+	while ( (att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TTML] Found root attribute name %s, value %s\n", att->name, att->value));
+
+		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")) {
+			lang = att->value;
+		}
+	}
+
+	//locate body
+	nb_children = gf_list_count(root->content);
+	body_node = NULL;
+
+	i=0;
+	while ( (node = (GF_XMLNode*)gf_list_enum(root->content, &i))) {
+		if (node->type) {
+			nb_children--;
+			continue;
+		}
+		e = gf_xml_get_element_check_namespace(node, "body", 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 (body_node) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"body\" element. Abort.\n"));
+				ctx->non_compliant_ttml = GF_TRUE;
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			body_node = node;
+		}
+	}
+	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;
+	}
+
+	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"));
+			}
+			ctx->div_node = node;
+		}
+	}
+	file_size = ctx->end;
+	if (!ctx->timescale) ctx->timescale = 1000;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SUBS_XML) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(file_size) );
+
+	ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (ctx->width) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
+	if (ctx->height) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+	if (ctx->zorder) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+	if (lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( lang) );
+	gf_filter_pid_set_property_str(ctx->opid, "meta:xmlns", &PROP_STRING(TTML_NAMESPACE) );
+
+	/*** body ***/
+	ctx->parser_working_copy = gf_xml_dom_new();
+	e = gf_xml_dom_parse(ctx->parser_working_copy, ctx->file_name, NULL, NULL);
+	assert (e == GF_OK);
+	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*/
+	GF_TXTIN_MODE_ebu_ttd_remove_samples(ctx->root_working_copy, &ctx->sample_list_node);
+
+	ctx->nb_children = gf_list_count(ctx->div_node->content);
+	ctx->cur_child_idx = 0;
+
+	ctx->last_sample_duration = 0;
+	ctx->end = 0;
+	ctx->first_samp = GF_TRUE;
+
+	txtin_probe_duration(ctx);
+
+	return GF_OK;
+}
+
+static GF_Err gf_text_process_ttml(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	GF_XMLNode *root;
+	char *samp_text=NULL;
+
+	if (!ctx->is_setup) return gf_text_ttml_setup(filter, ctx);
+	if (ctx->non_compliant_ttml || !ctx->opid) return GF_NOT_SUPPORTED;
+	if (!ctx->playstate) return GF_OK;
+	else if (ctx->playstate==2) return GF_EOS;
+
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		ctx->cur_child_idx = 0;
+	}
+
+	root = gf_xml_dom_get_root(ctx->parser);
+
+	for (; ctx->cur_child_idx < ctx->nb_children; ctx->cur_child_idx++) {
+		GF_XMLNode *p_node;
+		GF_XMLAttribute *p_att;
+		u32 p_idx = 0, h, m, s, ms;
+		s64 ts_begin = -1, ts_end = -1;
+
+		GF_XMLNode *div_child = (GF_XMLNode*)gf_list_get(ctx->div_node->content, ctx->cur_child_idx);
+		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;
+		}
+
+		//sample is either in the <p> ...
+		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;
+				}
+				if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					ts_begin = (h*3600 + m*60+s)*1000+ms;
+				} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+					ts_begin = (h*3600 + m*60+s)*1000;
+				}
+			} 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;
+				}
+				if (sscanf(p_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					ts_end = (h*3600 + m*60+s)*1000+ms;
+				} else if (sscanf(p_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+					ts_end = (h*3600 + m*60+s)*1000;
+				}
+			}
+			if ((ts_begin != -1) && (ts_end != -1) && !samp_text && ctx->sample_list_node) {
+				e = gf_xml_dom_append_child(ctx->sample_list_node, div_child);
+				assert(e == GF_OK);
+				samp_text = gf_xml_dom_serialize((GF_XMLNode*)ctx->root_working_copy, GF_FALSE);
+				e = gf_xml_dom_rem_child(ctx->sample_list_node, div_child);
+				assert(e == GF_OK);
+			}
+		}
+
+		//or under a <span>
+		p_idx = 0;
+		while ( (p_node = (GF_XMLNode*)gf_list_enum(div_child->content, &p_idx))) {
+			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 == GF_OK) {
+				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")) {
+						if (ts_begin != -1) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] duplicated \"begin\" attribute under <span>. Abort.\n"));
+							e = GF_NON_COMPLIANT_BITSTREAM;
+							goto exit;
+						}
+						if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+							ts_begin = (h*3600 + m*60+s)*1000+ms;
+						} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+							ts_begin = (h*3600 + m*60+s)*1000;
+						}
+					} 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 <span>. Abort.\n"));
+							e = GF_NON_COMPLIANT_BITSTREAM;
+							goto exit;
+						}
+						if (sscanf(span_att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+							ts_end = (h*3600 + m*60+s)*1000+ms;
+						} else if (sscanf(span_att->value, "%u:%u:%u", &h, &m, &s) == 3) {
+							ts_end = (h*3600 + m*60+s)*1000;
+						}
+					}
+					if ((ts_begin != -1) && (ts_end != -1) && !samp_text && ctx->sample_list_node) {
+						/*append the sample*/
+						e = gf_xml_dom_append_child(ctx->sample_list_node, div_child);
+						assert(e == GF_OK);
+						samp_text = gf_xml_dom_serialize((GF_XMLNode*)ctx->root_working_copy, GF_FALSE);
+						e = gf_xml_dom_rem_child(ctx->sample_list_node, div_child);
+						assert(e == GF_OK);
+					}
+				}
+			}
+		}
+
+		if ((ts_begin != -1) && (ts_end != -1) && samp_text) {
+			GF_FilterPacket *pck;
+			u8 *pck_data;
+			Bool skip_pck = GF_FALSE;
+			u32 txt_len;
+			char *txt_str;
+
+			if (ts_end < ts_begin) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] invalid timings: \"begin\"="LLD" , \"end\"="LLD". Abort.\n", ts_begin, ts_end));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto exit;
+			}
+
+			if (ts_begin < (s64) ctx->end) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TTML EBU-TTD] timing overlapping not supported: \"begin\" is "LLD" , last \"end\" was "LLD". Abort.\n", ts_begin, ctx->end));
+				e = GF_NOT_SUPPORTED;
+				goto exit;
+			}
+
+			txt_str = ttxt_parse_string(samp_text, GF_TRUE);
+			if (!txt_str) txt_str = "";
+			txt_len = (u32) strlen(txt_str);
+
+			if (ctx->first_samp) {
+				ts_begin = 0; /*in MP4 we must start at T=0*/
+				ctx->last_sample_duration = ts_end;
+				ctx->first_samp = GF_FALSE;
+			} else {
+				ctx->last_sample_duration = ts_end - ts_begin;
+			}
+
+			ctx->end = ts_end;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("ts_begin="LLD", ts_end="LLD", last_sample_duration="LLU" (real duration: "LLU"), last_sample_end="LLU"\n", ts_begin, ts_end, ts_end - ctx->end, ctx->last_sample_duration, ctx->end));
+
+			if (ctx->seek_state==2) {
+				Double end = (Double) ts_end;
+				end /= ctx->timescale;
+				if (end<ctx->start_range) skip_pck = GF_TRUE;
+				else ctx->seek_state = 0;
+			}
+
+			if (!skip_pck) {
+				pck = gf_filter_pck_new_alloc(ctx->opid, txt_len, &pck_data);
+				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*ts_begin)/1000);
+				gf_filter_pck_send(pck);
+			}
+
+			gf_free(samp_text);
+			samp_text = NULL;
+			ctx->nb_p_found++;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] incomplete sample (begin="LLD", end="LLD", text=\"%s\"). Skip.\n", ts_begin, ts_end, samp_text ? samp_text : "NULL"));
+		}
+
+		if (gf_filter_pid_would_block(ctx->opid)) {
+			ctx->cur_child_idx++;
+			return GF_OK;
+		}
+	}
+
+	if (!ctx->nb_p_found) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTML EBU-TTD] \"%s\" div node has no <p> elements.\n", ctx->div_node->name));
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[TTML EBU-TTD] last_sample_duration="LLU", last_sample_end="LLU"\n", ctx->last_sample_duration, ctx->end));
+
+	gf_filter_pid_set_info_str( ctx->opid, "ttxt:last_dur", &PROP_UINT((u32) ctx->last_sample_duration) );
+
+	return GF_EOS;
+
+
+exit:
+	ctx->non_compliant_ttml = GF_TRUE;
+	return e;
+}
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+
+static GF_Err swf_svg_add_iso_sample(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap)
+{
+	GF_FilterPacket *pck;
+	u8 *pck_data;
+	GF_TXTIn *ctx = (GF_TXTIn *)user;
+
+	if (ctx->seek_state==2) {
+		Double ts = (Double) timestamp;
+		ts/=1000;
+		if (ts<ctx->start_range) return GF_OK;
+		ctx->seek_state = 0;
+	}
+
+	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);
+
+	gf_filter_pck_send(pck);
+
+	if (gf_filter_pid_would_block(ctx->opid))
+		ctx->do_suspend = GF_TRUE;
+	return GF_OK;
+}
+
+static GF_Err swf_svg_add_iso_header(void *user, const u8 *data, u32 length, Bool isHeader)
+{
+	GF_TXTIn *ctx = (GF_TXTIn *)user;
+
+	if (isHeader) {
+		if (!ctx->hdr_parsed) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, &PROP_DATA((char *)data, (u32) ( strlen(data)+1 ) )  );
+			ctx->hdr_parsed = GF_TRUE;
+		}
+	} else if (!ctx->seek_state) {
+		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);
+
+		gf_filter_pck_send(pck);
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_text_swf_setup(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	u32 ID;
+
+	ctx->swf_parse = gf_swf_reader_new(NULL, ctx->file_name);
+	e = gf_swf_read_header(ctx->swf_parse);
+	if (e) return e;
+	gf_swf_reader_set_user_mode(ctx->swf_parse, ctx, swf_svg_add_iso_sample, swf_svg_add_iso_header);
+
+	if (!ctx->timescale) ctx->timescale = 1000;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_SIMPLE_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+//	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_UINT(file_size) );
+
+	//patch for old arch
+	ctx->width = FIX2INT(ctx->swf_parse->width);
+	ctx->height = FIX2INT(ctx->swf_parse->height);
+	if (!ctx->width && !ctx->height) {
+		ctx->width = 400;
+		ctx->height = 60;
+	}
+	ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (ctx->width) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
+	if (ctx->height) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+	if (ctx->zorder) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+	if (ctx->lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( ctx->lang) );
+
+	gf_filter_pid_set_property_str(ctx->opid, "meta:mime", &PROP_STRING("image/svg+xml") );
+
+#ifndef GPAC_DISABLE_SVG
+	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] swf -> svg not fully migrated, using SWF flags 0 and no flatten angle. Patch welcome\n"));
+	e = swf_to_svg_init(ctx->swf_parse, 0, 0);
+#endif
+
+	//SWF->BIFS is handled in ctx loader, no need to define it here
+	txtin_probe_duration(ctx);
+
+	return e;
+}
+
+static GF_Err gf_text_process_swf(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e=GF_OK;
+
+	if (!ctx->is_setup) {
+		ctx->is_setup = GF_TRUE;
+		return gf_text_swf_setup(filter, ctx);
+	}
+	if (!ctx->opid) return GF_NOT_SUPPORTED;
+
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		gf_swf_reader_del(ctx->swf_parse);
+		ctx->swf_parse = gf_swf_reader_new(NULL, ctx->file_name);
+		gf_swf_read_header(ctx->swf_parse);
+		gf_swf_reader_set_user_mode(ctx->swf_parse, ctx, swf_svg_add_iso_sample, swf_svg_add_iso_header);
+	}
+
+	ctx->do_suspend = GF_FALSE;
+	/*parse all tags*/
+	while (e == GF_OK) {
+		e = swf_parse_tag(ctx->swf_parse);
+		if (ctx->do_suspend) return GF_OK;
+	}
+	if (e==GF_EOS) {
+		if (ctx->swf_parse->finalize) {
+			ctx->swf_parse->finalize(ctx->swf_parse);
+			ctx->swf_parse->finalize = NULL;
+		}
+	}
+	return e;
+}
+/* end of SWF Importer */
+
+#else
+
+#ifndef GPAC_DISABLE_ZLIB
+static GF_Err gf_text_process_swf(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Warning: GPAC was compiled without SWF import support, can't import file.\n"));
+	return GF_NOT_SUPPORTED;
+}
+#endif
+
+
+#endif /*GPAC_DISABLE_SWF_IMPORT*/
+
+static GF_Err gf_text_process_sub(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	u32 i, j, len, line;
+	GF_TextSample *samp;
+	Double ts_scale;
+	char szLine[2048], szTime[20], szText[2048];
+
+	//same setup as for srt
+	if (!ctx->is_setup) {
+		ctx->is_setup = GF_TRUE;
+		return txtin_setup_srt(filter, ctx);
+	}
+	if (!ctx->opid) return GF_NOT_SUPPORTED;
+	if (!ctx->playstate) return GF_OK;
+	else if (ctx->playstate==2) return GF_EOS;
+
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		gf_fseek(ctx->src, 0, SEEK_SET);
+	}
+
+	if (ctx->fps.den && ctx->fps.num) {
+		ts_scale = ((Double) ctx->fps.num) / ctx->fps.den;
+	} else {
+		ts_scale = 25;
+	}
+
+	line = 0;
+
+	while (1) {
+		char *sOK = gf_text_get_utf8_line(szLine, 2048, ctx->src, ctx->unicode_type);
+		if (!sOK) break;
+
+		REM_TRAIL_MARKS(szLine, "\r\n\t ")
+
+		line++;
+		len = (u32) strlen(szLine);
+		if (!len) continue;
+
+		i=0;
+		if (szLine[i] != '{') {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Bad SUB file (line %d): expecting \"{\" got \"%c\"\n", line, szLine[i]));
+			continue;
+		}
+		while (szLine[i+1] && szLine[i+1]!='}') {
+			szTime[i] = szLine[i+1];
+			i++;
+		}
+		szTime[i] = 0;
+		ctx->start = atoi(szTime);
+		if (ctx->start < ctx->end) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] corrupted SUB frame (line %d) - starts (at %d ms) before end of previous one (%d ms) - adjusting time stamps\n", line, ctx->start, ctx->end));
+			ctx->start = ctx->end;
+		}
+		j=i+2;
+		i=0;
+		if (szLine[i+j] != '{') {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Bad SUB file - expecting \"{\" got \"%c\"\n", szLine[i]));
+			continue;
+		}
+		while (szLine[i+1+j] && szLine[i+1+j]!='}') {
+			szTime[i] = szLine[i+1+j];
+			i++;
+		}
+		szTime[i] = 0;
+		ctx->end = atoi(szTime);
+		j+=i+2;
+
+		if (ctx->start > ctx->end) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] corrupted SUB frame (line %d) - ends (at %d ms) before start of current frame (%d ms) - skipping\n", line, ctx->end, ctx->start));
+			continue;
+		}
+
+		if (ctx->start && ctx->first_samp) {
+			samp = gf_isom_new_text_sample();
+			txtin_process_send_text_sample(ctx, samp, 0, (u32) (ts_scale*ctx->start), GF_TRUE);
+			ctx->first_samp = GF_FALSE;
+			gf_isom_delete_text_sample(samp);
+		}
+
+		for (i=j; i<len; i++) {
+			if (szLine[i]=='|') {
+				szText[i-j] = '\n';
+			} else {
+				szText[i-j] = szLine[i];
+			}
+		}
+		szText[i-j] = 0;
+
+		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);
+			gf_isom_delete_text_sample(samp);
+		}
+
+		samp = gf_isom_new_text_sample();
+		gf_isom_text_add_text(samp, szText, (u32) strlen(szText) );
+		txtin_process_send_text_sample(ctx, samp, (u64) (ts_scale*(s64)ctx->start), (u32) (ts_scale*(ctx->end - ctx->start)), GF_TRUE);
+		gf_isom_delete_text_sample(samp);
+
+		ctx->prev_end = ctx->end;
+
+		gf_filter_pid_set_info(ctx->opid, GF_PROP_PID_DOWN_BYTES, &PROP_LONGUINT( gf_ftell(ctx->src )) );
+
+		if (gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+	/*final flush*/
+	if (ctx->end && !ctx->noflush) {
+		samp = gf_isom_new_text_sample();
+		txtin_process_send_text_sample(ctx, samp, (u64) (ts_scale*(s64)ctx->end), 0, GF_TRUE);
+		gf_isom_delete_text_sample(samp);
+	}
+
+	gf_filter_pid_set_info_str( ctx->opid, "ttxt:last_dur", &PROP_UINT(0) );
+
+	return GF_EOS;
+}
+
+
+#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)
+{
+	u32 r, g, b, a, res;
+	r = g = b = a = 0;
+	if (sscanf(val, "%x %x %x %x", &r, &g, &b, &a) != 4) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TXTIn] Warning: color badly formatted %s\n", val));
+	}
+	res = (a&0xFF);
+	res<<=8;
+	res |= (r&0xFF);
+	res<<=8;
+	res |= (g&0xFF);
+	res<<=8;
+	res |= (b&0xFF);
+	return res;
+}
+
+static void ttxt_parse_text_box(GF_XMLNode *n, GF_BoxRecord *box)
+{
+	u32 i=0;
+	GF_XMLAttribute *att;
+	memset(box, 0, sizeof(GF_BoxRecord));
+	while ( (att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
+		if (!stricmp(att->name, "top")) box->top = atoi(att->value);
+		else if (!stricmp(att->name, "bottom")) box->bottom = atoi(att->value);
+		else if (!stricmp(att->name, "left")) box->left = atoi(att->value);
+		else if (!stricmp(att->name, "right")) box->right = atoi(att->value);
+	}
+}
+
+static void ttxt_parse_text_style(GF_TXTIn *ctx, GF_XMLNode *n, GF_StyleRecord *style)
+{
+	u32 i=0;
+	GF_XMLAttribute *att;
+	memset(style, 0, sizeof(GF_StyleRecord));
+	style->fontID = 1;
+	style->font_size = ctx->fontsize ;
+	style->text_color = 0xFFFFFFFF;
+
+	while ( (att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
+		if (!stricmp(att->name, "fromChar")) style->startCharOffset = atoi(att->value);
+		else if (!stricmp(att->name, "toChar")) style->endCharOffset = atoi(att->value);
+		else if (!stricmp(att->name, "fontID")) style->fontID = atoi(att->value);
+		else if (!stricmp(att->name, "fontSize")) style->font_size = atoi(att->value);
+		else if (!stricmp(att->name, "color")) style->text_color = ttxt_get_color(att->value);
+		else if (!stricmp(att->name, "styles")) {
+			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;
+		}
+	}
+}
+
+static GF_Err txtin_setup_ttxt(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	u32 j, k, ID, OCR_ES_ID;
+	u64 file_size;
+	GF_XMLNode *root, *ext;
+	GF_PropertyValue *dcd;
+
+	ctx->parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(ctx->parser, ctx->file_name, ttxt_dom_progress, ctx);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Error parsing TTXT file: Line %d - %s\n", gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser)));
+		return e;
+	}
+	root = gf_xml_dom_get_root(ctx->parser);
+
+	if (strcmp(root->name, "TextStream")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Invalid Timed Text file - expecting \"TextStream\" got %s", root->name));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	file_size = ctx->end;
+	ctx->end = 0;
+
+	/*setup track in 3GP format directly (no ES desc)*/
+	if (!ctx->timescale) ctx->timescale = 1000;
+	OCR_ES_ID = ID = 0;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_TX3G) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(file_size) );
+
+	if (!ID) ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (OCR_ES_ID) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(OCR_ES_ID) );
+
+	ctx->nb_children = gf_list_count(root->content);
+
+	ctx->cur_child_idx = 0;
+	for (ctx->cur_child_idx=0; ctx->cur_child_idx < ctx->nb_children; ctx->cur_child_idx++) {
+		GF_XMLNode *node = (GF_XMLNode*) gf_list_get(root->content, ctx->cur_child_idx);
+
+		if (node->type) {
+			continue;
+		}
+
+		if (!strcmp(node->name, "TextStreamHeader")) {
+			GF_XMLNode *sdesc;
+			s32 w, h, tx, ty, layer;
+			u32 tref_id;
+			GF_XMLAttribute *att;
+			w = ctx->width;
+			h = ctx->height;
+			tx = ctx->txtx;
+			ty = ctx->txty;
+			layer = ctx->zorder;
+			tref_id = 0;
+
+			j=0;
+			while ( (att=(GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+				if (!strcmp(att->name, "width")) w = atoi(att->value);
+				else if (!strcmp(att->name, "height")) h = atoi(att->value);
+				else if (!strcmp(att->name, "layer")) layer = atoi(att->value);
+				else if (!strcmp(att->name, "translation_x")) tx = atoi(att->value);
+				else if (!strcmp(att->name, "translation_y")) ty = atoi(att->value);
+				else if (!strcmp(att->name, "trefID")) tref_id = atoi(att->value);
+			}
+
+			if (tref_id) {
+				gf_filter_pid_set_property_str(ctx->opid, "tref:chap", &PROP_UINT(tref_id) );
+			}
+
+			if (w) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(w) );
+			if (h) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(h) );
+			if (tx) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TRANS_X, &PROP_UINT(tx) );
+			if (ty) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TRANS_X, &PROP_UINT(ty) );
+			if (layer) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+			if (ctx->lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( ctx->lang) );
+
+			j=0;
+			while ( (sdesc=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
+				if (sdesc->type) continue;
+
+				if (!strcmp(sdesc->name, "TextSampleDescription")) {
+					GF_TextSampleDescriptor td;
+					memset(&td, 0, sizeof(GF_TextSampleDescriptor));
+					td.tag = GF_ODF_TEXT_CFG_TAG;
+					td.vert_justif = (s8) -1;
+					td.default_style.fontID = 1;
+					td.default_style.font_size = ctx->fontsize;
+
+					k=0;
+					while ( (att=(GF_XMLAttribute *)gf_list_enum(sdesc->attributes, &k))) {
+						if (!strcmp(att->name, "horizontalJustification")) {
+							if (!stricmp(att->value, "center")) td.horiz_justif = 1;
+							else if (!stricmp(att->value, "right")) td.horiz_justif = (s8) -1;
+							else if (!stricmp(att->value, "left")) td.horiz_justif = 0;
+						}
+						else if (!strcmp(att->name, "verticalJustification")) {
+							if (!stricmp(att->value, "center")) td.vert_justif = 1;
+							else if (!stricmp(att->value, "bottom")) td.vert_justif = (s8) -1;
+							else if (!stricmp(att->value, "top")) td.vert_justif = 0;
+						}
+						else if (!strcmp(att->name, "backColor")) td.back_color = ttxt_get_color(att->value);
+						else if (!strcmp(att->name, "verticalText") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_VERTICAL;
+						else if (!strcmp(att->name, "fillTextRegion") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_FILL_REGION;
+						else if (!strcmp(att->name, "continuousKaraoke") && !stricmp(att->value, "yes") ) td.displayFlags |= GF_TXT_KARAOKE;
+						else if (!strcmp(att->name, "scroll")) {
+							if (!stricmp(att->value, "inout")) td.displayFlags |= GF_TXT_SCROLL_IN | GF_TXT_SCROLL_OUT;
+							else if (!stricmp(att->value, "in")) td.displayFlags |= GF_TXT_SCROLL_IN;
+							else if (!stricmp(att->value, "out")) td.displayFlags |= GF_TXT_SCROLL_OUT;
+						}
+						else if (!strcmp(att->name, "scrollMode")) {
+							u32 scroll_mode = GF_TXT_SCROLL_CREDITS;
+							if (!stricmp(att->value, "Credits")) scroll_mode = GF_TXT_SCROLL_CREDITS;
+							else if (!stricmp(att->value, "Marquee")) scroll_mode = GF_TXT_SCROLL_MARQUEE;
+							else if (!stricmp(att->value, "Right")) scroll_mode = GF_TXT_SCROLL_RIGHT;
+							else if (!stricmp(att->value, "Down")) scroll_mode = GF_TXT_SCROLL_DOWN;
+							td.displayFlags |= ((scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION);
+						}
+					}
+
+					k=0;
+					while ( (ext=(GF_XMLNode*)gf_list_enum(sdesc->content, &k))) {
+						if (ext->type) continue;
+						if (!strcmp(ext->name, "TextBox")) ttxt_parse_text_box(ext, &td.default_pos);
+						else if (!strcmp(ext->name, "Style")) ttxt_parse_text_style(ctx, ext, &td.default_style);
+						else if (!strcmp(ext->name, "FontTable")) {
+							GF_XMLNode *ftable;
+							u32 z=0;
+							while ( (ftable=(GF_XMLNode*)gf_list_enum(ext->content, &z))) {
+								u32 m;
+								if (ftable->type || strcmp(ftable->name, "FontTableEntry")) continue;
+								td.font_count += 1;
+								td.fonts = (GF_FontRecord*)gf_realloc(td.fonts, sizeof(GF_FontRecord)*td.font_count);
+								m=0;
+								while ( (att=(GF_XMLAttribute *)gf_list_enum(ftable->attributes, &m))) {
+									if (!stricmp(att->name, "fontID")) td.fonts[td.font_count-1].fontID = atoi(att->value);
+									else if (!stricmp(att->name, "fontName")) td.fonts[td.font_count-1].fontName = gf_strdup(att->value);
+								}
+							}
+						}
+					}
+					if (ctx->nodefbox) {
+						td.default_pos.top = td.default_pos.left = td.default_pos.right = td.default_pos.bottom = 0;
+					} else {
+						if ((td.default_pos.bottom==td.default_pos.top) || (td.default_pos.right==td.default_pos.left)) {
+							td.default_pos.top = td.default_pos.left = 0;
+							td.default_pos.right = w;
+							td.default_pos.bottom = h;
+						}
+					}
+					if (!td.fonts) {
+						td.font_count = 1;
+						td.fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
+						td.fonts[0].fontID = 1;
+						td.fonts[0].fontName = gf_strdup("Serif");
+					}
+					GF_SAFEALLOC(dcd, GF_PropertyValue);
+					if (dcd) {
+						dcd->type = GF_PROP_DATA;
+
+						gf_odf_tx3g_write(&td, &dcd->value.data.ptr, &dcd->value.data.size);
+						if (!ctx->text_descs) ctx->text_descs = gf_list_new();
+						gf_list_add(ctx->text_descs, dcd);
+					}
+
+					for (k=0; k<td.font_count; k++) gf_free(td.fonts[k].fontName);
+					gf_free(td.fonts);
+				}
+			}
+		}
+		else {
+			break;
+		}
+	}
+
+	if (!ctx->text_descs) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Invalid Timed Text file - text stream header not found or empty\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	dcd = gf_list_get(ctx->text_descs, 0);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, dcd);
+	ctx->last_desc_idx = 1;
+
+	ctx->first_samp = GF_TRUE;
+	ctx->last_sample_empty = GF_FALSE;
+	ctx->last_sample_duration = 0;
+
+	txtin_probe_duration(ctx);
+
+	return GF_OK;
+}
+
+static GF_Err txtin_process_ttxt(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	u32 j, k;
+	GF_XMLNode *root, *ext;
+
+	if (!ctx->is_setup) {
+		ctx->is_setup = GF_TRUE;
+		return txtin_setup_ttxt(filter, ctx);
+	}
+	if (!ctx->opid) return GF_NON_COMPLIANT_BITSTREAM;
+	if (!ctx->playstate) return GF_OK;
+	else if (ctx->playstate==2) return GF_EOS;
+
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		ctx->cur_child_idx = 0;
+	}
+	root = gf_xml_dom_get_root(ctx->parser);
+
+	for (; ctx->cur_child_idx < ctx->nb_children; ctx->cur_child_idx++) {
+		GF_TextSample * samp;
+		u32 ts, descIndex;
+		Bool has_text = GF_FALSE;
+		GF_XMLAttribute *att;
+		GF_XMLNode *node = (GF_XMLNode*) gf_list_get(root->content, ctx->cur_child_idx);
+
+		if (node->type) {
+			continue;
+		}
+		/*sample text*/
+		else if (strcmp(node->name, "TextSample")) continue;
+
+		samp = gf_isom_new_text_sample();
+		ts = 0;
+		descIndex = 1;
+		ctx->last_sample_empty = GF_TRUE;
+
+		j=0;
+		while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
+			if (!strcmp(att->name, "sampleTime")) {
+				u32 h, m, s, ms;
+				if (sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					ts = (h*3600 + m*60 + s)*1000 + ms;
+				} else {
+					ts = (u32) (atof(att->value) * 1000);
+				}
+			}
+			else if (!strcmp(att->name, "sampleDescriptionIndex")) descIndex = atoi(att->value);
+			else if (!strcmp(att->name, "text")) {
+				u32 len;
+				char *str = ttxt_parse_string(att->value, GF_TRUE);
+				len = (u32) strlen(str);
+				gf_isom_text_add_text(samp, str, len);
+				ctx->last_sample_empty = len ? GF_FALSE : GF_TRUE;
+				has_text = GF_TRUE;
+			}
+			else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, (u32) (1000*atoi(att->value)));
+			else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color(samp, ttxt_get_color(att->value));
+			else if (!strcmp(att->name, "wrap") && !strcmp(att->value, "Automatic")) gf_isom_text_set_wrap(samp, 0x01);
+		}
+
+		/*get all modifiers*/
+		j=0;
+		while ( (ext=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
+			if (!has_text && (ext->type==GF_XML_TEXT_TYPE)) {
+				u32 len;
+				char *str = ttxt_parse_string(ext->name, GF_FALSE);
+				len = (u32) strlen(str);
+				gf_isom_text_add_text(samp, str, len);
+				ctx->last_sample_empty = len ? GF_FALSE : GF_TRUE;
+				has_text = GF_TRUE;
+			}
+			if (ext->type) continue;
+
+			if (!stricmp(ext->name, "Style")) {
+				GF_StyleRecord r;
+				ttxt_parse_text_style(ctx, ext, &r);
+				gf_isom_text_add_style(samp, &r);
+			}
+			else if (!stricmp(ext->name, "TextBox")) {
+				GF_BoxRecord r;
+				ttxt_parse_text_box(ext, &r);
+				gf_isom_text_set_box(samp, r.top, r.left, r.bottom, r.right);
+			}
+			else if (!stricmp(ext->name, "Highlight")) {
+				u16 start, end;
+				start = end = 0;
+				k=0;
+				while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
+					if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
+					else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
+				}
+				gf_isom_text_add_highlight(samp, start, end);
+			}
+			else if (!stricmp(ext->name, "Blinking")) {
+				u16 start, end;
+				start = end = 0;
+				k=0;
+				while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
+					if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
+					else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
+				}
+				gf_isom_text_add_blink(samp, start, end);
+			}
+			else if (!stricmp(ext->name, "HyperLink")) {
+				u16 start, end;
+				char *url, *url_tt;
+				start = end = 0;
+				url = url_tt = NULL;
+				k=0;
+				while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
+					if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
+					else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
+					else if (!strcmp(att->name, "URL")) url = gf_strdup(att->value);
+					else if (!strcmp(att->name, "URLToolTip")) url_tt = gf_strdup(att->value);
+				}
+				gf_isom_text_add_hyperlink(samp, url, url_tt, start, end);
+				if (url) gf_free(url);
+				if (url_tt) gf_free(url_tt);
+			}
+			else if (!stricmp(ext->name, "Karaoke")) {
+				u32 startTime;
+				GF_XMLNode *krok;
+				startTime = 0;
+				k=0;
+				while ( (att=(GF_XMLAttribute *)gf_list_enum(ext->attributes, &k))) {
+					if (!strcmp(att->name, "startTime")) startTime = (u32) (1000*atof(att->value));
+				}
+				gf_isom_text_add_karaoke(samp, startTime);
+				k=0;
+				while ( (krok=(GF_XMLNode*)gf_list_enum(ext->content, &k))) {
+					u16 start, end;
+					u32 endTime, m;
+					if (krok->type) continue;
+					if (strcmp(krok->name, "KaraokeRange")) continue;
+					start = end = 0;
+					endTime = 0;
+					m=0;
+					while ( (att=(GF_XMLAttribute *)gf_list_enum(krok->attributes, &m))) {
+						if (!strcmp(att->name, "fromChar")) start = atoi(att->value);
+						else if (!strcmp(att->name, "toChar")) end = atoi(att->value);
+						else if (!strcmp(att->name, "endTime")) endTime = (u32) (1000*atof(att->value));
+					}
+					gf_isom_text_set_karaoke_segment(samp, endTime, start, end);
+				}
+			}
+		}
+
+		if (!descIndex) descIndex = 1;
+		if (descIndex != ctx->last_desc_idx) {
+			GF_PropertyValue *dcd;
+			ctx->last_desc_idx = descIndex;
+			dcd = gf_list_get(ctx->text_descs, descIndex-1);
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, dcd);
+		}
+
+		/*in MP4 we must start at T=0, so add an empty sample*/
+		if (ts && ctx->first_samp) {
+			GF_TextSample * firstsamp = gf_isom_new_text_sample();
+			txtin_process_send_text_sample(ctx, firstsamp, 0, 0, GF_TRUE);
+			gf_isom_delete_text_sample(firstsamp);
+		}
+		ctx->first_samp = GF_FALSE;
+
+		txtin_process_send_text_sample(ctx, samp, ts, 0, GF_TRUE);
+
+		gf_isom_delete_text_sample(samp);
+
+		if (ctx->last_sample_empty) {
+			ctx->last_sample_duration = ts - ctx->last_sample_duration;
+		} else {
+			ctx->last_sample_duration = ts;
+		}
+
+		if (gf_filter_pid_would_block(ctx->opid)) {
+			ctx->cur_child_idx++;
+			return GF_OK;
+		}
+	}
+
+	if (ctx->last_sample_empty) {
+		//this is a bit ugly, in regular streaming mode we don't want to remove empty samples
+		//howvere the last one can be removed, adjusting the duration of the previous one.
+		//doing this here is problematic if the loader is sent a new ttxt file, we would have a cue termination sample
+		//we therefore share that info through pid, and let the final user (muxer& co) decide what to do
+		gf_filter_pid_set_info_str( ctx->opid, "ttxt:rem_last", &PROP_BOOL(GF_TRUE) );
+		gf_filter_pid_set_info_str( ctx->opid, "ttxt:last_dur", &PROP_UINT((u32) ctx->last_sample_duration) );
+	}
+
+	return GF_EOS;
+}
+
+
+static u32 tx3g_get_color(char *value)
+{
+	u32 r, g, b, a;
+	u32 res, v;
+	r = g = b = a = 0;
+	if (sscanf(value, "%u%%, %u%%, %u%%, %u%%", &r, &g, &b, &a) != 4) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("Warning: color badly formatted\n"));
+	}
+	v = (u32) (a*255/100);
+	res = (v&0xFF);
+	res<<=8;
+	v = (u32) (r*255/100);
+	res |= (v&0xFF);
+	res<<=8;
+	v = (u32) (g*255/100);
+	res |= (v&0xFF);
+	res<<=8;
+	v = (u32) (b*255/100);
+	res |= (v&0xFF);
+	return res;
+}
+
+static void tx3g_parse_text_box(GF_XMLNode *n, GF_BoxRecord *box)
+{
+	u32 i=0;
+	GF_XMLAttribute *att;
+	memset(box, 0, sizeof(GF_BoxRecord));
+	while ((att=(GF_XMLAttribute *)gf_list_enum(n->attributes, &i))) {
+		if (!stricmp(att->name, "x")) box->left = atoi(att->value);
+		else if (!stricmp(att->name, "y")) box->top = atoi(att->value);
+		else if (!stricmp(att->name, "height")) box->bottom = atoi(att->value);
+		else if (!stricmp(att->name, "width")) box->right = atoi(att->value);
+	}
+}
+
+typedef struct
+{
+	u32 id;
+	u32 pos;
+} Marker;
+
+#define GET_MARKER_POS(_val, __isend) \
+	{	\
+		u32 i, __m = atoi(att->value);	\
+		_val = 0;	\
+		for (i=0; i<nb_marks; i++) { if (__m==marks[i].id) { _val = marks[i].pos; /*if (__isend) _val--; */break; } }	 \
+	}
+
+
+static GF_Err txtin_texml_setup(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	GF_Err e;
+	u32 ID, OCR_ES_ID, i;
+	u64 file_size;
+	GF_XMLAttribute *att;
+	GF_XMLNode *root;
+
+	ctx->parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(ctx->parser, ctx->file_name, ttxt_dom_progress, ctx);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Error parsing TeXML file: Line %d - %s", gf_xml_dom_get_line(ctx->parser), gf_xml_dom_get_error(ctx->parser) ));
+		gf_xml_dom_del(ctx->parser);
+		ctx->parser = NULL;
+		return e;
+	}
+
+	root = gf_xml_dom_get_root(ctx->parser);
+
+	if (strcmp(root->name, "text3GTrack")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTIn] Invalid QT TeXML file - expecting root \"text3GTrack\" got \"%s\"", root->name));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	file_size = ctx->end;
+	ctx->txml_timescale = 600;
+
+	i=0;
+	while ( (att=(GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
+		if (!strcmp(att->name, "trackWidth")) ctx->width = atoi(att->value);
+		else if (!strcmp(att->name, "trackHeight")) ctx->height = atoi(att->value);
+		else if (!strcmp(att->name, "layer")) ctx->zorder = atoi(att->value);
+		else if (!strcmp(att->name, "timeScale")) ctx->txml_timescale = atoi(att->value);
+		else if (!strcmp(att->name, "transform")) {
+			Float fx, fy;
+			sscanf(att->value, "translate(%f,%f)", &fx, &fy);
+			ctx->txtx = (u32) fx;
+			ctx->txty = (u32) fy;
+		}
+	}
+
+	/*setup track in 3GP format directly (no ES desc)*/
+	OCR_ES_ID = ID = 0;
+	if (!ctx->timescale) ctx->timescale = 1000;
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_TEXT) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_ISOM_SUBTYPE_TX3G) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->timescale) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DOWN_SIZE, &PROP_LONGUINT(file_size) );
+
+
+	if (!ID) ID = 1;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(ID) );
+	if (OCR_ES_ID) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CLOCK_ID, &PROP_UINT(OCR_ES_ID) );
+	if (ctx->width) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->width) );
+	if (ctx->height) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->height) );
+	if (ctx->zorder) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ZORDER, &PROP_SINT(ctx->zorder) );
+	if (ctx->lang) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_LANGUAGE, &PROP_STRING( ctx->lang) );
+
+
+	ctx->nb_children = gf_list_count(root->content);
+	ctx->cur_child_idx = 0;
+	txtin_probe_duration(ctx);
+
+	return GF_OK;
+}
+
+static GF_Err txtin_process_texml(GF_Filter *filter, GF_TXTIn *ctx)
+{
+	u32 j, k;
+	GF_StyleRecord styles[50];
+	Marker marks[50];
+	GF_XMLAttribute *att;
+	GF_XMLNode *root;
+	Bool probe_first_desc_only = GF_FALSE;
+
+	if (!ctx->is_setup) {
+		GF_Err e;
+
+		ctx->is_setup = GF_TRUE;
+		e = txtin_texml_setup(filter, ctx);
+		if (e) return e;
+		probe_first_desc_only = GF_TRUE;
+	}
+	if (!ctx->opid) return GF_NON_COMPLIANT_BITSTREAM;
+	if (!ctx->playstate && !probe_first_desc_only) return GF_OK;
+	else if (ctx->playstate==2) return GF_EOS;
+
+	if (ctx->seek_state==1) {
+		ctx->seek_state = 2;
+		ctx->cur_child_idx = 0;
+		ctx->start = 0;
+	}
+
+	root = gf_xml_dom_get_root(ctx->parser);
+
+	for (; ctx->cur_child_idx < ctx->nb_children; ctx->cur_child_idx++) {
+		GF_XMLNode *node, *desc;
+		GF_TextSampleDescriptor td;
+		GF_TextSample * samp = NULL;
+		u64 duration;
+		u32 nb_styles, nb_marks;
+		Bool isRAP, same_style, same_box;
+
+		if (probe_first_desc_only && ctx->text_descs && gf_list_count(ctx->text_descs))
+			return GF_OK;
+
+		memset(&td, 0, sizeof(GF_TextSampleDescriptor));
+		node = (GF_XMLNode*)gf_list_get(root->content, ctx->cur_child_idx);
+		if (node->type) continue;
+		if (strcmp(node->name, "sample")) continue;
+
+		isRAP = GF_TRUE;
+		duration = 1000;
+		j=0;
+		while ((att=(GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!strcmp(att->name, "duration")) duration = atoi(att->value);
+			else if (!strcmp(att->name, "keyframe")) isRAP = (!stricmp(att->value, "true") ? GF_TRUE : GF_FALSE);
+		}
+		nb_styles = 0;
+		nb_marks = 0;
+		same_style = same_box = GF_FALSE;
+		j=0;
+		while ((desc=(GF_XMLNode*)gf_list_enum(node->content, &j))) {
+			if (desc->type) continue;
+
+			if (!strcmp(desc->name, "description")) {
+				u8 *dsi;
+				u32 dsi_len, stsd_idx;
+				GF_XMLNode *sub;
+				memset(&td, 0, sizeof(GF_TextSampleDescriptor));
+				td.tag = GF_ODF_TEXT_CFG_TAG;
+				td.vert_justif = (s8) -1;
+				td.default_style.fontID = 1;
+				td.default_style.font_size = ctx->fontsize;
+
+				k=0;
+				while ((att=(GF_XMLAttribute *)gf_list_enum(desc->attributes, &k))) {
+					if (!strcmp(att->name, "horizontalJustification")) {
+						if (!stricmp(att->value, "center")) td.horiz_justif = 1;
+						else if (!stricmp(att->value, "right")) td.horiz_justif = (s8) -1;
+						else if (!stricmp(att->value, "left")) td.horiz_justif = 0;
+					}
+					else if (!strcmp(att->name, "verticalJustification")) {
+						if (!stricmp(att->value, "center")) td.vert_justif = 1;
+						else if (!stricmp(att->value, "bottom")) td.vert_justif = (s8) -1;
+						else if (!stricmp(att->value, "top")) td.vert_justif = 0;
+					}
+					else if (!strcmp(att->name, "backgroundColor")) td.back_color = tx3g_get_color(att->value);
+					else if (!strcmp(att->name, "displayFlags")) {
+						Bool rev_scroll = GF_FALSE;
+						if (strstr(att->value, "scroll")) {
+							u32 scroll_mode = 0;
+							if (strstr(att->value, "scrollIn")) td.displayFlags |= GF_TXT_SCROLL_IN;
+							if (strstr(att->value, "scrollOut")) td.displayFlags |= GF_TXT_SCROLL_OUT;
+							if (strstr(att->value, "reverse")) rev_scroll = GF_TRUE;
+							if (strstr(att->value, "horizontal")) scroll_mode = rev_scroll ? GF_TXT_SCROLL_RIGHT : GF_TXT_SCROLL_MARQUEE;
+							else scroll_mode = (rev_scroll ? GF_TXT_SCROLL_DOWN : GF_TXT_SCROLL_CREDITS);
+							td.displayFlags |= (scroll_mode<<7) & GF_TXT_SCROLL_DIRECTION;
+						}
+						/*TODO FIXME: check in QT doc !!*/
+						if (strstr(att->value, "writeTextVertically")) td.displayFlags |= GF_TXT_VERTICAL;
+						if (!strcmp(att->name, "continuousKaraoke")) td.displayFlags |= GF_TXT_KARAOKE;
+					}
+				}
+
+				k=0;
+				while ((sub=(GF_XMLNode*)gf_list_enum(desc->content, &k))) {
+					if (sub->type) continue;
+					if (!strcmp(sub->name, "defaultTextBox")) tx3g_parse_text_box(sub, &td.default_pos);
+					else if (!strcmp(sub->name, "fontTable")) {
+						GF_XMLNode *ftable;
+						u32 m=0;
+						while ((ftable=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
+							if (ftable->type) continue;
+							if (!strcmp(ftable->name, "font")) {
+								u32 n=0;
+								td.font_count += 1;
+								td.fonts = (GF_FontRecord*)gf_realloc(td.fonts, sizeof(GF_FontRecord)*td.font_count);
+								while ((att=(GF_XMLAttribute *)gf_list_enum(ftable->attributes, &n))) {
+									if (!stricmp(att->name, "id")) td.fonts[td.font_count-1].fontID = atoi(att->value);
+									else if (!stricmp(att->name, "name")) td.fonts[td.font_count-1].fontName = gf_strdup(att->value);
+								}
+							}
+						}
+					}
+					else if (!strcmp(sub->name, "sharedStyles")) {
+						GF_XMLNode *style, *ftable;
+						u32 m=0;
+						while ((style=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
+							if (style->type) continue;
+							if (!strcmp(style->name, "style")) break;
+						}
+						if (style) {
+							char *cur;
+							s32 start=0;
+							char css_style[1024], css_val[1024];
+							memset(&styles[nb_styles], 0, sizeof(GF_StyleRecord));
+							m=0;
+							while ( (att=(GF_XMLAttribute *)gf_list_enum(style->attributes, &m))) {
+								if (!strcmp(att->name, "id")) styles[nb_styles].startCharOffset = atoi(att->value);
+							}
+							m=0;
+							while ( (ftable=(GF_XMLNode*)gf_list_enum(style->content, &m))) {
+								if (ftable->type) break;
+							}
+							cur = ftable ? ftable->name : NULL;
+							while (cur) {
+								start = gf_token_get_strip(cur, 0, "{:", " ", css_style, 1024);
+								if (start <0) break;
+								start = gf_token_get_strip(cur, start, ":}", " ", css_val, 1024);
+								if (start <0) break;
+								cur = strchr(cur+start, '{');
+
+								if (!strcmp(css_style, "font-table")) {
+									u32 z;
+									styles[nb_styles].fontID = atoi(css_val);
+									for (z=0; z<td.font_count; z++) {
+										if (td.fonts[z].fontID == styles[nb_styles].fontID)
+											break;
+									}
+								}
+								else if (!strcmp(css_style, "font-size")) styles[nb_styles].font_size = atoi(css_val);
+								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, "color")) styles[nb_styles].text_color = tx3g_get_color(css_val);
+							}
+							if (!nb_styles) td.default_style = styles[0];
+							nb_styles++;
+						}
+					}
+
+				}
+				if ((td.default_pos.bottom==td.default_pos.top) || (td.default_pos.right==td.default_pos.left)) {
+					td.default_pos.top = ctx->txty;
+					td.default_pos.left = ctx->txtx;
+					td.default_pos.right = ctx->width;
+					td.default_pos.bottom = ctx->height;
+				}
+				if (!td.fonts) {
+					td.font_count = 1;
+					td.fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
+					td.fonts[0].fontID = 1;
+					td.fonts[0].fontName = gf_strdup( ctx->fontname ? ctx->fontname : "Serif");
+				}
+
+				gf_odf_tx3g_write(&td, &dsi, &dsi_len);
+				stsd_idx = 0;
+				for (k=0; ctx->text_descs && k<gf_list_count(ctx->text_descs); k++) {
+					GF_PropertyValue *d = gf_list_get(ctx->text_descs, k);
+					if (d->value.data.size != dsi_len) continue;
+					if (! memcmp(d->value.data.ptr, dsi, dsi_len)) {
+						stsd_idx = k+1;
+						break;
+					}
+				}
+				if (stsd_idx) {
+					gf_free(dsi);
+				} else {
+					GF_PropertyValue *d;
+					GF_SAFEALLOC(d, GF_PropertyValue);
+					if (!d) return GF_OUT_OF_MEM;
+					d->type = GF_PROP_DATA;
+					d->value.data.ptr = dsi;
+					d->value.data.size = dsi_len;
+					if (!ctx->text_descs) ctx->text_descs = gf_list_new();
+					gf_list_add(ctx->text_descs, d);
+					stsd_idx = gf_list_count(ctx->text_descs);
+				}
+				if (stsd_idx != ctx->last_desc_idx) {
+					ctx->last_desc_idx = stsd_idx;
+					GF_PropertyValue *d = gf_list_get(ctx->text_descs, stsd_idx-1);
+					gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, d);
+				}
+
+				for (k=0; k<td.font_count; k++) gf_free(td.fonts[k].fontName);
+				gf_free(td.fonts);
+
+				if (probe_first_desc_only)
+					return GF_OK;
+			}
+			else if (!strcmp(desc->name, "sampleData")) {
+				GF_XMLNode *sub;
+				u16 start, end;
+				u32 styleID;
+				u32 nb_chars, txt_len, m;
+				nb_chars = 0;
+
+				samp = gf_isom_new_text_sample();
+
+				k=0;
+				while ((att=(GF_XMLAttribute *)gf_list_enum(desc->attributes, &k))) {
+					if (!strcmp(att->name, "targetEncoding") && !strcmp(att->value, "utf16")) ;//is_utf16 = 1;
+					else if (!strcmp(att->name, "scrollDelay")) gf_isom_text_set_scroll_delay(samp, atoi(att->value) );
+					else if (!strcmp(att->name, "highlightColor")) gf_isom_text_set_highlight_color(samp, tx3g_get_color(att->value));
+				}
+				start = end = 0;
+				k=0;
+				while ((sub=(GF_XMLNode*)gf_list_enum(desc->content, &k))) {
+					if (sub->type) continue;
+					if (!strcmp(sub->name, "text")) {
+						GF_XMLNode *text;
+						styleID = 0;
+						m=0;
+						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
+							if (!strcmp(att->name, "styleID")) styleID = atoi(att->value);
+						}
+						txt_len = 0;
+
+						m=0;
+						while ((text=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
+							if (!text->type) {
+								if (!strcmp(text->name, "marker")) {
+									u32 z;
+									memset(&marks[nb_marks], 0, sizeof(Marker));
+									marks[nb_marks].pos = nb_chars+txt_len;
+
+									z = 0;
+									while ( (att=(GF_XMLAttribute *)gf_list_enum(text->attributes, &z))) {
+										if (!strcmp(att->name, "id")) marks[nb_marks].id = atoi(att->value);
+									}
+									nb_marks++;
+								}
+							} else if (text->type==GF_XML_TEXT_TYPE) {
+								txt_len += (u32) strlen(text->name);
+								gf_isom_text_add_text(samp, text->name, (u32) strlen(text->name));
+							}
+						}
+						if (styleID && (!same_style || (td.default_style.startCharOffset != styleID))) {
+							GF_StyleRecord st = td.default_style;
+							for (m=0; m<nb_styles; m++) {
+								if (styles[m].startCharOffset==styleID) {
+									st = styles[m];
+									break;
+								}
+							}
+							st.startCharOffset = nb_chars;
+							st.endCharOffset = nb_chars + txt_len;
+							gf_isom_text_add_style(samp, &st);
+						}
+						nb_chars += txt_len;
+					}
+					else if (!stricmp(sub->name, "highlight")) {
+						m=0;
+						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
+							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
+								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
+								}
+						gf_isom_text_add_highlight(samp, start, end);
+					}
+					else if (!stricmp(sub->name, "blink")) {
+						m=0;
+						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
+							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
+								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
+								}
+						gf_isom_text_add_blink(samp, start, end);
+					}
+					else if (!stricmp(sub->name, "link")) {
+						char *url, *url_tt;
+						url = url_tt = NULL;
+						m=0;
+						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
+							if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
+								else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
+									else if (!strcmp(att->name, "URL") || !strcmp(att->name, "href")) url = gf_strdup(att->value);
+									else if (!strcmp(att->name, "URLToolTip") || !strcmp(att->name, "altString")) url_tt = gf_strdup(att->value);
+						}
+						gf_isom_text_add_hyperlink(samp, url, url_tt, start, end);
+						if (url) gf_free(url);
+						if (url_tt) gf_free(url_tt);
+					}
+					else if (!stricmp(sub->name, "karaoke")) {
+						u32 time = 0;
+						GF_XMLNode *krok;
+						m=0;
+						while ((att=(GF_XMLAttribute *)gf_list_enum(sub->attributes, &m))) {
+							if (!strcmp(att->name, "startTime")) time = atoi(att->value);
+						}
+						gf_isom_text_add_karaoke(samp, time);
+						m=0;
+						while ((krok=(GF_XMLNode*)gf_list_enum(sub->content, &m))) {
+							u32 u=0;
+							if (krok->type) continue;
+							if (strcmp(krok->name, "run")) continue;
+							start = end = 0;
+							while ((att=(GF_XMLAttribute *)gf_list_enum(krok->attributes, &u))) {
+								if (!strcmp(att->name, "startMarker")) GET_MARKER_POS(start, 0)
+									else if (!strcmp(att->name, "endMarker")) GET_MARKER_POS(end, 1)
+										else if (!strcmp(att->name, "duration")) time += atoi(att->value);
+							}
+							gf_isom_text_set_karaoke_segment(samp, time, start, end);
+						}
+					}
+				}
+			}
+		}
+		/*OK, let's add the sample*/
+		if (samp) {
+			if (!same_box) gf_isom_text_set_box(samp, td.default_pos.top, td.default_pos.left, td.default_pos.bottom, td.default_pos.right);
+//			if (!same_style) gf_isom_text_add_style(samp, &td.default_style);
+
+			txtin_process_send_text_sample(ctx, samp, (ctx->start*ctx->timescale)/ctx->txml_timescale, (u32) (duration*ctx->timescale)/ctx->txml_timescale, isRAP);
+			ctx->start += duration;
+			gf_isom_delete_text_sample(samp);
+
+		}
+		if (gf_filter_pid_would_block(ctx->opid)) {
+			ctx->cur_child_idx++;
+			return GF_OK;
+		}
+	}
+
+	return GF_EOS;
+}
+
+
+static GF_Err txtin_process(GF_Filter *filter)
+{
+	GF_TXTIn *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	GF_Err e;
+	Bool start, end;
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		return GF_OK;
+	}
+	gf_filter_pck_get_framing(pck, &start, &end);
+	if (!end) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	//file is loaded
+
+	e = ctx->text_process(filter, ctx);
+
+
+	if (e==GF_EOS) {
+		//keep input alive until end of stream, so that we keep getting called
+		gf_filter_pid_drop_packet(ctx->ipid);
+		if (gf_filter_pid_is_eos(ctx->ipid))
+			gf_filter_pid_set_eos(ctx->opid);
+	}
+	return e;
+}
+
+static void ttxtin_reset(GF_TXTIn *ctx)
+{
+	if (ctx->samp) gf_isom_delete_text_sample(ctx->samp);
+	ctx->samp = NULL;
+	if (ctx->src) gf_fclose(ctx->src);
+	ctx->src = NULL;
+	if (ctx->vttparser) gf_webvtt_parser_del(ctx->vttparser);
+	ctx->vttparser = NULL;
+	if (ctx->parser) gf_xml_dom_del(ctx->parser);
+	ctx->parser = NULL;
+	if (ctx->parser_working_copy) gf_xml_dom_del(ctx->parser_working_copy);
+	ctx->parser_working_copy = NULL;
+}
+
+static GF_Err txtin_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_Err e;
+	const char *src = NULL;
+	GF_TXTIn *ctx = gf_filter_get_udta(filter);
+	const GF_PropertyValue *prop;
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	//we must have a file path
+	prop = gf_filter_pid_get_property(pid, GF_PROP_PID_FILEPATH);
+	if (prop && prop->value.string) src = prop->value.string;
+	if (!src)
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->ipid) {
+		GF_FilterEvent fevt;
+		ctx->ipid = pid;
+
+		//we work with full file only, send a play event on source to indicate that
+		GF_FEVT_INIT(fevt, GF_FEVT_PLAY, pid);
+		fevt.play.start_range = 0;
+		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;
+	} else {
+		if (pid != ctx->ipid) {
+			return GF_REQUIRES_NEW_INSTANCE;
+		}
+		if (!strcmp(ctx->file_name, src)) return GF_OK;
+
+		ttxtin_reset(ctx);
+		ctx->is_setup = GF_FALSE;
+		ctx->file_name = src;
+	}
+	//guess type
+	e = gf_text_guess_format(ctx->file_name, &ctx->fmt);
+	if (e) return e;
+	if (!ctx->fmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[TXTLoad] Unknown text format for %s\n", ctx->file_name));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->webvtt && (ctx->fmt == GF_TXTIN_MODE_SRT))
+		ctx->fmt = GF_TXTIN_MODE_WEBVTT;
+
+	switch (ctx->fmt) {
+	case GF_TXTIN_MODE_SRT:
+		ctx->text_process = txtin_process_srt;
+		break;
+#ifndef GPAC_DISABLE_VTT
+	case GF_TXTIN_MODE_WEBVTT:
+		ctx->text_process = txtin_process_webvtt;
+		break;
+#endif
+	case GF_TXTIN_MODE_TTXT:
+		ctx->text_process = txtin_process_ttxt;
+		break;
+	case GF_TXTIN_MODE_TEXML:
+		ctx->text_process = txtin_process_texml;
+		break;
+	case GF_TXTIN_MODE_SUB:
+		ctx->text_process = gf_text_process_sub;
+		break;
+	case GF_TXTIN_MODE_TTML:
+		ctx->text_process = gf_text_process_ttml;
+		break;
+#ifndef GPAC_DISABLE_SWF_IMPORT
+	case GF_TXTIN_MODE_SWF_SVG:
+		ctx->text_process = gf_text_process_swf;
+		break;
+#endif
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	return GF_OK;
+}
+
+static Bool txtin_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_TXTIn *ctx = gf_filter_get_udta(filter);
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->playstate==1) return GF_TRUE;
+		ctx->playstate = 1;
+		if ((ctx->start_range < 0.1) && (evt->play.start_range<0.1)) return GF_TRUE;
+		ctx->start_range = evt->play.start_range;
+		ctx->seek_state = 1;
+		//cancel play event, we work with full file
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->playstate = 2;
+		//cancel play event, we work with full file
+		return GF_TRUE;
+	default:
+		return GF_FALSE;
+	}
+	return GF_FALSE;
+}
+
+GF_Err txtin_initialize(GF_Filter *filter)
+{
+	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;
+}
+
+void txtin_finalize(GF_Filter *filter)
+{
+	GF_TXTIn *ctx = gf_filter_get_udta(filter);
+
+	ttxtin_reset(ctx);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+
+	if (ctx->text_descs) {
+		while (gf_list_count(ctx->text_descs)) {
+			GF_PropertyValue *p = gf_list_pop_back(ctx->text_descs);
+			gf_free(p->value.data.ptr);
+			gf_free(p);
+		}
+		gf_list_del(ctx->text_descs);
+	}
+#ifndef GPAC_DISABLE_SWF_IMPORT
+	gf_swf_reader_del(ctx->swf_parse);
+#endif
+}
+
+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;
+
+#define PROBE_OK(_score, _mime) \
+		*score = _score;\
+		if (dst) gf_free(dst);\
+		return _mime; \
+
+
+	if (!strncmp(data, "WEBVTT", 6)) {
+		PROBE_OK(GF_FPROBE_SUPPORTED, "subtitle/vtt")
+	}
+	if (strstr(data, " --> ")) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/srt")
+	}
+	if (!strncmp(data, "FWS", 3) || !strncmp(data, "CWS", 3)) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "application/x-shockwave-flash")
+	}
+
+	if ((data[0]=='{') && strstr(data, "}{")) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/sub")
+
+	}
+	/*XML formats*/
+	if (!strstr(data, "?>") ) {
+		if (dst) gf_free(dst);
+		return NULL;
+	}
+
+	if (strstr(data, "<x-quicktime-tx3g") || strstr(data, "<text3GTrack")) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "quicktime/text")
+	}
+	if (strstr(data, "TextStream")) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/ttxt")
+	}
+	if (strstr(data, "<tt ") || strstr(data, ":tt ")) {
+		PROBE_OK(GF_FPROBE_MAYBE_SUPPORTED, "subtitle/ttml")
+	}
+
+	if (dst) gf_free(dst);
+	return NULL;
+}
+
+static const GF_FilterCapability TXTInCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "srt|ttxt|sub|vtt|txml|ttml|swf"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "x-subtitle/srt|subtitle/srt|text/srt|x-subtitle/sub|subtitle/sub|text/sub|x-subtitle/ttxt|subtitle/ttxt|text/ttxt|x-subtitle/vtt|subtitle/vtt|text/vtt|x-quicktime/text|quicktime/text|subtitle/ttml|text/ttml|application/xml+ttml|application/x-shockwave-flash"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_TX3G),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_WEBVTT),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SUBS_XML),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_TXTIn, _n)
+
+static const GF_FilterArgs TXTInArgs[] =
+{
+	{ 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(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(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},
+	{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"
+	)
+
+	.private_size = sizeof(GF_TXTIn),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = TXTInArgs,
+	SETCAPS(TXTInCaps),
+	.process = txtin_process,
+	.configure_pid = txtin_configure_pid,
+	.process_event = txtin_process_event,
+	.probe_data = txtin_probe_data,
+	.initialize = txtin_initialize,
+	.finalize = txtin_finalize
+};
+
+
+const GF_FilterRegister *txtin_register(GF_FilterSession *session)
+{
+	return &TXTInRegister;
+}
+
+
+#else
+const GF_FilterRegister *txtin_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_ISOM_WRITE
+

gpac-1.0.0.tar.gz/src/filters/mux_avi.c Added

@@ -0,0 +1,625 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AVI 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>
+
+#ifndef GPAC_DISABLE_AVILIB
+
+#include <gpac/internal/avilib.h>
+
+typedef struct
+{
+	u32 width, height, pf, stride;
+	GF_Fraction fps;
+	u32 sr, bps, nb_ch, wfmt, br;
+	u32 codec_id;
+	u32 format;
+	u32 timescale;
+	Bool is_video, is_raw_vid;
+	u32 is_open;
+	u32 tk_idx;
+	GF_FilterPid *pid;
+	Bool suspended;
+} AVIStream;
+
+typedef struct
+{
+	//options
+	char *dst;
+	GF_Fraction fps;
+	Bool noraw;
+
+
+	avi_t *avi_out;
+	u32 nb_write;
+	GF_List *streams;
+	Bool has_video;
+	char comp_name[5];
+
+	u64 last_video_time_ms;
+	Bool video_is_eos;
+	char *buf_tmp;
+	u32 buf_alloc;
+	Bool in_error;
+
+	u32 cur_file_idx_plus_one;
+} GF_AVIMuxCtx;
+
+static GF_Err avimux_open_close(GF_AVIMuxCtx *ctx, const char *filename, const char *ext, u32 file_idx)
+{
+	Bool had_file = GF_FALSE;
+	if (ctx->avi_out) {
+		had_file = GF_TRUE;
+		AVI_close(ctx->avi_out);
+	}
+	ctx->avi_out = NULL;
+	if (!filename) return GF_OK;
+
+	if (!strcmp(filename, "std") || !strcmp(filename, "stdout")) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] Writing to stdout not yet implemented\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	ctx->avi_out = AVI_open_output_file((char *) filename);
+
+	if (had_file && ctx->nb_write) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[AVIOut] re-opening in write mode output file %s, content overwrite\n", filename));
+	}
+	ctx->nb_write = 0;
+	if (!ctx->avi_out) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] cannot open output file %s\n", filename));
+		ctx->in_error = GF_TRUE;
+		return GF_IO_ERR;
+	}
+	return GF_OK;
+}
+
+static GF_Err avimux_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	AVIStream *stream;
+	GF_FilterEvent evt;
+	const GF_PropertyValue *p;
+	u32 w, h, sr, stride, bps, nb_ch, pf, codec_id, type, br, timescale, wfmt;
+	GF_Fraction fps;
+	GF_AVIMuxCtx *ctx = (GF_AVIMuxCtx *) gf_filter_get_udta(filter);
+
+	stream = gf_filter_pid_get_udta(pid);
+
+	if (is_remove) {
+		if (!stream) return GF_SERVICE_ERROR;
+		gf_list_del_item(ctx->streams, stream);
+		gf_free(stream);
+
+		if (!gf_list_count(ctx->streams))
+			avimux_open_close(ctx, NULL, NULL, 0);
+		return GF_OK;
+	}
+	gf_filter_pid_check_caps(pid);
+
+	w = h = sr = nb_ch = pf = codec_id = type = timescale = wfmt = stride = 0;
+	bps = 16;
+	br=128000;
+	fps.den = fps.num = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) type = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) codec_id = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) timescale = p->value.uint;
+
+	if (!codec_id) return GF_NOT_SUPPORTED;
+	if ((type!=GF_STREAM_VISUAL) && (type!=GF_STREAM_AUDIO)) return GF_NOT_SUPPORTED;
+
+	if (!stream && (type==GF_STREAM_VISUAL) && ctx->has_video) {
+		return GF_REQUIRES_NEW_INSTANCE;
+	}
+
+	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_STRIDE);
+	if (p) stride = 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_FPS);
+	if (p) fps = p->value.frac;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) pf = 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_AUDIO_FORMAT);
+	if (p) bps = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p) nb_ch = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+	if (p) br = p->value.uint;
+
+	switch (codec_id) {
+	case GF_CODECID_MPEG4_PART2:
+		strcpy(ctx->comp_name, "XVID");
+		break;
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		strcpy(ctx->comp_name, "h264");
+		break;
+//	case GF_CODECID_HEVC:
+//	case GF_CODECID_LHVC:
+//		strcpy(szComp, "hevc");
+//		break;
+	case GF_CODECID_MPEG_AUDIO:
+	case GF_CODECID_MPEG2_PART3:
+		wfmt = 0x55;
+		break;
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+		wfmt = 0x0000706d;
+		break;
+	case GF_CODECID_RAW:
+
+		if (type==GF_STREAM_VISUAL) {
+			if (pf != GF_PIXEL_BGR) {
+				gf_filter_pid_negociate_property(pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_BGR));
+				return GF_OK;
+			}
+		} else if (type==GF_STREAM_AUDIO) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+			if (!p || (p->value.uint != GF_AUDIO_FMT_S16) ) {
+				gf_filter_pid_negociate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
+				return GF_OK;
+			}
+			wfmt = WAVE_FORMAT_PCM;
+		}
+		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;
+	}
+
+	if (!stream) {
+		GF_SAFEALLOC(stream, AVIStream);
+		if (!stream) return GF_OUT_OF_MEM;
+		stream->pid = pid;
+		gf_filter_pid_set_udta(pid, stream);
+		gf_list_add(ctx->streams, stream);
+		stream->codec_id = codec_id;
+		stream->timescale = timescale;
+		if (type==GF_STREAM_VISUAL) {
+			ctx->has_video = GF_TRUE;
+			stream->width = w;
+			stream->height = h;
+			stream->pf = pf;
+			stream->fps = fps;
+			stream->is_video = GF_TRUE;
+		} else {
+			stream->sr = sr;
+			stream->bps = bps;
+			stream->nb_ch = nb_ch;
+			stream->wfmt = wfmt;
+			stream->br = br;
+		}
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+		gf_filter_pid_send_event(pid, &evt);
+
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	} else {
+		if (!stream->is_open) {
+			stream->codec_id = codec_id;
+			stream->timescale = timescale;
+			stream->width = w;
+			stream->height = h;
+			stream->pf = pf;
+			stream->fps = fps;
+			stream->sr = sr;
+			stream->bps = bps;
+			stream->nb_ch = nb_ch;
+			stream->wfmt = wfmt;
+			stream->br = br;
+			stream->stride = stride;
+			stream->is_raw_vid = (codec_id==GF_CODECID_RAW) ? GF_TRUE : GF_FALSE;
+			goto check_mx;
+		}
+		if ((type==GF_STREAM_VISUAL) && (stream->width==w) && (stream->height==h) && (stream->format==pf) && (stream->codec_id==codec_id) && (stream->timescale==timescale) && (stream->fps.num*fps.den == stream->fps.den*fps.num))
+		{
+			goto check_mx;
+		}
+		else if ((type==GF_STREAM_AUDIO) && (stream->sr==sr) && (stream->nb_ch==nb_ch) && (stream->bps==bps) && (stream->codec_id==codec_id) && (stream->timescale==timescale) )
+		{
+			goto check_mx;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] Stream configuration changed for codec %s, not supported in AVI\n", gf_codecid_name(codec_id) ));
+
+		return GF_NOT_SUPPORTED;
+	}
+
+check_mx:
+	if (!ctx->avi_out) {
+		char szPath[GF_MAX_PATH];
+		const char *cur_file_suffix=NULL;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(pid)) return GF_EOS;
+			return GF_OK;
+		}
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		ctx->cur_file_idx_plus_one = p ? (p->value.uint + 1) : 1;
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+		if (p && p->value.string) cur_file_suffix = p->value.string;
+
+		gf_filter_pid_resolve_file_template(pid, ctx->dst, szPath, ctx->cur_file_idx_plus_one-1, cur_file_suffix);
+		avimux_open_close(ctx, szPath, NULL, 0);
+	}
+
+	return GF_OK;
+}
+
+static void avimux_finalize(GF_Filter *filter)
+{
+	GF_AVIMuxCtx *ctx = (GF_AVIMuxCtx *) gf_filter_get_udta(filter);
+	avimux_open_close(ctx, NULL, NULL, 0);
+	while (gf_list_count(ctx->streams)) {
+		AVIStream *st = gf_list_pop_back(ctx->streams);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	if (ctx->buf_tmp) gf_free(ctx->buf_tmp);
+}
+
+static GF_Err avimux_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	s32 res=0;
+	const GF_PropertyValue *p;
+	u32 i, count, nb_eos, nb_suspended;
+	AVIStream *video_st=NULL;
+	const char *pck_data;
+	u32 pck_size;
+	GF_AVIMuxCtx *ctx = (GF_AVIMuxCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->in_error)
+		return GF_IO_ERR;
+
+	count = gf_list_count(ctx->streams);
+	if (!ctx->avi_out) {
+		for (i=0; i<count; i++) {
+			AVIStream *st = gf_list_get(ctx->streams, i);
+			GF_Err e = avimux_configure_pid(filter, st->pid, GF_FALSE);
+			if (e) return e;
+		}
+		if (!ctx->avi_out)
+			return GF_OK;
+	}
+
+	//no video in mux, force writing 100ms of audio
+	//hack in raw mode, avoids flushing frames after video TS for video dump
+	//this should be fixed
+	if (!ctx->has_video || (ctx->noraw && ctx->video_is_eos)) ctx->last_video_time_ms += 100;
+
+
+	//flush all audio
+	nb_eos = 0;
+	nb_suspended = 0;
+	for (i=0; i<count; i++) {
+		u64 cts;
+		AVIStream *st = gf_list_get(ctx->streams, i);
+
+		if (st->is_video) {
+			video_st=st;
+			continue;
+		}
+		if (!ctx->last_video_time_ms) continue;
+		if (st->suspended) {
+			nb_suspended++;
+			continue;
+		}
+
+		while (1) {
+			pck = gf_filter_pid_get_packet(st->pid);
+			if (!pck) {
+				if (gf_filter_pid_is_eos(st->pid)) {
+					nb_eos++;
+					if (st->suspended) {
+						nb_suspended++;
+					}
+				}
+				break;
+			}
+
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (p) {
+				if (ctx->cur_file_idx_plus_one == p->value.uint+1) {
+				} else if (!st->suspended) {
+					st->suspended = GF_TRUE;
+					nb_suspended++;
+					break;
+				}
+			}
+
+			cts = gf_filter_pck_get_cts(pck);
+			if (cts==GF_FILTER_NO_TS) {
+
+			} else {
+				cts *= 1000;
+				cts /= st->timescale;
+				if (!ctx->video_is_eos && (cts > ctx->last_video_time_ms))
+				 	break;
+			}
+
+
+			pck_data = gf_filter_pck_get_data(pck, &pck_size);
+			if (!st->is_open) {
+				st->is_open = 1;
+				AVI_set_audio(ctx->avi_out, st->nb_ch, st->sr, 8*st->bps, st->wfmt, st->br);
+				st->tk_idx = AVI_get_audio_track(ctx->avi_out);
+			} else {
+				AVI_set_audio_track(ctx->avi_out, st->tk_idx);
+			}
+			res = AVI_write_audio(ctx->avi_out, (char *) pck_data, pck_size);
+			gf_filter_pid_drop_packet(st->pid);
+			if (res<0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] Audio write error %d\n", res));
+			}
+			ctx->nb_write++;
+		}
+	}
+	//write video
+	if (!video_st) return GF_OK;
+
+	pck = gf_filter_pid_get_packet(video_st->pid);
+
+	if (!video_st->is_open) {
+		Double fps;
+		if (!pck) return GF_OK;
+
+		fps = ctx->fps.num;
+		fps /= ctx->fps.den;
+
+		if (video_st->fps.num && video_st->fps.den) {
+			fps = video_st->fps.num;
+			fps /= video_st->fps.den;
+		} else {
+			u32 duration = gf_filter_pck_get_duration(pck);
+			if (duration) {
+				fps = video_st->timescale;
+				fps /= duration;
+			}
+		}
+		AVI_set_video(ctx->avi_out, video_st->width, video_st->height, fps, ctx->comp_name);
+		video_st->is_open = GF_TRUE;
+	}
+
+	if (!pck) {
+		if (gf_filter_pid_is_eos(video_st->pid)) {
+			nb_eos++;
+			ctx->video_is_eos=GF_TRUE;
+		}
+	} else {
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		if (p) {
+			if (ctx->cur_file_idx_plus_one == p->value.uint+1) {
+			} else if (!video_st->suspended) {
+				video_st->suspended = GF_TRUE;
+				nb_suspended++;
+				pck = NULL;
+			}
+		}
+	}
+
+	if (pck) {
+		u32 out_stride = video_st->stride;
+		u64 cts = gf_filter_pck_get_cts(pck);
+		int is_rap = gf_filter_pck_get_sap(pck) ? 1 : 0;
+		pck_data = gf_filter_pck_get_data(pck, &pck_size);
+		if (!pck_data) {
+			GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+			if (frame_ifce && frame_ifce->get_plane) {
+				GF_Err e = frame_ifce->get_plane(frame_ifce, 0, (const u8 **) &pck_data, &out_stride);
+				if (e!=GF_OK) {
+					pck_data = NULL;
+				} else {
+					gf_pixel_get_size_info(video_st->pf, video_st->width, video_st->height, &pck_size, &out_stride, NULL, NULL, NULL);
+				}
+			}
+		}
+		if (pck_data) {
+			//raw RGB, flip
+			if (video_st->is_raw_vid) {
+				if (ctx->buf_alloc<pck_size) {
+					ctx->buf_alloc = pck_size;
+					ctx->buf_tmp = gf_realloc(ctx->buf_tmp, pck_size);
+				}
+				for (i=0; i<video_st->height; i++) {
+					memcpy(ctx->buf_tmp + i*out_stride, pck_data + (video_st->height-i-1)*out_stride, out_stride);
+				}
+				res = AVI_write_frame(ctx->avi_out, (char *) ctx->buf_tmp, pck_size, is_rap);
+			} else {
+				res = AVI_write_frame(ctx->avi_out, (char *) pck_data, pck_size, is_rap);
+			}
+		}
+
+		if (cts!=GF_FILTER_NO_TS) {
+			u32 dur = gf_filter_pck_get_duration(pck);
+			cts += dur;
+			cts *= 1000;
+			cts /= video_st->timescale;
+			ctx->last_video_time_ms = cts + 1;
+		} else {
+			ctx->last_video_time_ms ++;
+		}
+		gf_filter_pid_drop_packet(video_st->pid);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[AVIOut] Video write error %d\n", res));
+		}
+		ctx->nb_write++;
+	}
+
+	if (nb_suspended && (nb_suspended==count)) {
+		avimux_open_close(ctx, NULL, NULL, 0);
+		for (i=0; i<count; i++) {
+			AVIStream *st = gf_list_get(ctx->streams, i);
+			st->is_open = GF_FALSE;
+			st->suspended = GF_FALSE;
+		}
+		ctx->avi_out = NULL;
+		return GF_OK;
+	}
+
+	if (nb_eos==count) {
+		if (ctx->avi_out)
+			avimux_open_close(ctx, NULL, NULL, 0);
+		return GF_EOS;
+	}
+
+	return GF_OK;
+}
+
+static GF_FilterProbeScore avimux_probe_url(const char *url, const char *mime)
+{
+	char *fext = gf_file_ext_start(url);
+	if (fext && !stricmp(fext, ".avi")) return GF_FPROBE_FORCE;
+	if (mime) {
+		if (!stricmp(mime, "video/avi")) return GF_FPROBE_FORCE;
+		if (!stricmp(mime, "video/x-avi")) return GF_FPROBE_FORCE;
+	}
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static GF_Err avimux_initialize(GF_Filter *filter);
+
+
+#define OFFS(_n)	#_n, offsetof(GF_AVIMuxCtx, _n)
+
+static const GF_FilterArgs AVIMuxArgs[] =
+{
+	{ OFFS(dst), "location of destination file", GF_PROP_NAME, NULL, NULL, 0},
+	{ OFFS(fps), "default framerate if none indicated in stream", GF_PROP_FRACTION, "25/1", NULL, 0},
+	{ OFFS(noraw), "disable raw output in AVI, only compressed ones allowed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{0}
+};
+
+static const GF_FilterCapability AVIMuxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	{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_RAW),
+	{0},
+	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_MPEG4_PART2),
+	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_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),
+	{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),
+};
+
+static const GF_FilterCapability AVIMuxCapsNoRAW[] =
+{
+	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_MPEG4_PART2),
+	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_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),
+	{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),
+};
+
+
+GF_FilterRegister AVIMuxRegister = {
+	.name = "avimx",
+	GF_FS_SET_DESCRIPTION("AVI muxer")
+	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"
+	)
+	.private_size = sizeof(GF_AVIMuxCtx),
+	.max_extra_pids = -1,
+	.args = AVIMuxArgs,
+	SETCAPS(AVIMuxCaps),
+	.probe_url = avimux_probe_url,
+	.initialize = avimux_initialize,
+	.finalize = avimux_finalize,
+	.configure_pid = avimux_configure_pid,
+	.process = avimux_process
+};
+
+static GF_Err avimux_initialize(GF_Filter *filter)
+{
+	const char *sep;
+	GF_AVIMuxCtx *ctx = (GF_AVIMuxCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->dst) return GF_OK;
+	ctx->streams = gf_list_new();
+	if (strnicmp(ctx->dst, "file:/", 6) && strstr(ctx->dst, "://"))  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		return GF_NOT_SUPPORTED;
+	}
+	if (ctx->noraw) {
+		gf_filter_override_caps(filter, AVIMuxCapsNoRAW,  sizeof(AVIMuxCapsNoRAW)/sizeof(GF_FilterCapability) );
+	}
+	sep = strchr(ctx->dst, '$');
+	if (sep && strchr(sep+1, '$')) {
+		//using templates, cannot solve final name
+	} else {
+		avimux_open_close(ctx, ctx->dst, NULL, 0);
+	}
+	return GF_OK;
+}
+
+#endif
+
+const GF_FilterRegister *avimux_register(GF_FilterSession *session)
+{
+#ifndef GPAC_DISABLE_AVILIB
+	return &AVIMuxRegister;
+#else
+	return NULL;
+#endif
+
+}
+

gpac-1.0.0.tar.gz/src/filters/mux_gsf.c Added

@@ -0,0 +1,1139 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / GPAC stream serializer 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/network.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/crypt.h>
+
+typedef struct
+{
+	GF_FilterPid *pid;
+
+	u32 idx;
+	u16 nb_frames;
+	Bool eos;
+	u8 config_version;
+	u64 last_cts_config;
+	u32 timescale;
+} GSFStream;
+
+typedef struct
+{
+	//opts
+	Bool sigsn, sigdur, sigbo, sigdts, minp;
+	u32 dbg;
+	const char *magic;
+	const char *skp;
+	GF_PropData key;
+	GF_PropData IV;
+	GF_Fraction pattern;
+	u32 mpck;
+	Double crate;
+
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_List *streams;
+
+	u8 *buffer;
+	u32 alloc_size;
+	GF_BitStream *bs_w;
+
+	Bool is_start;
+	u32 max_pid_idx;
+
+	bin128 crypt_IV;
+	GF_Crypt *crypt;
+	Bool regenerate_tunein_info;
+
+	u32 nb_frames;
+	u32 nb_pck;
+} GSFMxCtx;
+
+
+typedef enum
+{
+	GFS_PCKTYPE_HDR=0,
+	GFS_PCKTYPE_PID_CONFIG,
+	GFS_PCKTYPE_PID_INFO_UPDATE,
+	GFS_PCKTYPE_PID_REMOVE,
+	GFS_PCKTYPE_PID_EOS,
+	GFS_PCKTYPE_PCK,
+
+	GFS_PCKTYPE_UNDEF1,
+	GFS_PCKTYPE_UNDEF2,
+	GFS_PCKTYPE_UNDEF3,
+	GFS_PCKTYPE_UNDEF4,
+	GFS_PCKTYPE_UNDEF5,
+	GFS_PCKTYPE_UNDEF6,
+	GFS_PCKTYPE_UNDEF7,
+	GFS_PCKTYPE_UNDEF8,
+	GFS_PCKTYPE_UNDEF9,
+	GFS_PCKTYPE_UNDEF10,
+
+	/*NO MORE PACKET TYPE AVAILABLE*/
+} GF_GSFPacketType;
+
+
+static GFINLINE u32 get_vlen_size(u32 len)
+{
+	if (len<=0x7F) return 1;
+	if (len<=0x3FFF) return 2;
+	if (len<=0x1FFFFF) return 3;
+	if (len<=0xFFFFFFF) return 4;
+	return 5;
+}
+
+static GFINLINE void gsfmx_write_vlen(GSFMxCtx *ctx, u32 len)
+{
+	if (len<=0x7F) {
+		gf_bs_write_int(ctx->bs_w, 0, 1);
+		gf_bs_write_int(ctx->bs_w, len, 7);
+	} else if (len <= 0x3FFF){
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 0, 1);
+		gf_bs_write_int(ctx->bs_w, len, 14);
+	} else if (len <= 0x1FFFFF){
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 0, 1);
+		gf_bs_write_int(ctx->bs_w, len, 21);
+	} else if (len <= 0xFFFFFFF){
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 0, 1);
+		gf_bs_write_int(ctx->bs_w, len, 28);
+	} else {
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_int(ctx->bs_w, 1, 1);
+		gf_bs_write_long_int(ctx->bs_w, len, 36);
+	}
+}
+
+static GFINLINE u32 gsfmx_get_header_size(GSFMxCtx *ctx, GSFStream *gst, Bool use_seq_num, Bool first_frag, Bool no_frag, u32 pck_size, u32 block_size, u32 block_offset)
+{
+	u32 hdr_size = 1 + get_vlen_size(pck_size);
+	hdr_size += get_vlen_size(gst ? gst->idx : 0);
+	if (use_seq_num) hdr_size += 2;
+
+	if (!no_frag) {
+		hdr_size += get_vlen_size(block_size);
+		if (!first_frag)
+			hdr_size += get_vlen_size(block_offset);
+	}
+	return hdr_size;
+}
+
+static void gsfmx_encrypt(GSFMxCtx *ctx, char *data, u32 nb_crypt_bytes)
+{
+	u32 clear_trail;
+
+	clear_trail = nb_crypt_bytes % 16;
+	nb_crypt_bytes -= clear_trail;
+	if (! nb_crypt_bytes) return;
+
+	//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;
+		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;
+			} else {
+				nb_crypt_bytes = 0;
+			}
+		}
+	} else {
+		gf_crypt_encrypt(ctx->crypt, data, nb_crypt_bytes);
+	}
+}
+
+static void gsfmx_send_packets(GSFMxCtx *ctx, GSFStream *gst, GF_GSFPacketType pck_type, Bool is_end, Bool is_redundant, u32 frame_size, u32 frame_hdr_size)
+{
+	u32 pck_size, bytes_remain, pck_offset, block_offset;
+	Bool first_frag = GF_TRUE;
+	Bool no_frag = GF_TRUE;
+	//for now only data packets are encrypted on a per-fragment base, others are fully encrypted
+	Bool frag_encryption = (pck_type==GFS_PCKTYPE_PCK) ? GF_TRUE : GF_FALSE;
+	Bool use_seq_num = (pck_type==GFS_PCKTYPE_HDR) ? GF_FALSE : ctx->sigsn;
+
+	gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->buffer, &pck_size, &ctx->alloc_size);
+
+	first_frag = GF_TRUE;
+	bytes_remain = pck_size;
+	block_offset = pck_offset = 0;
+	if (!frame_size) frame_size = pck_size;
+
+	if (ctx->crypt && !frag_encryption) {
+		u32 crypt_offset=0;
+		if (pck_type == GFS_PCKTYPE_HDR) {
+			crypt_offset=25; //sig + version + IV + pattern
+		}
+		gsfmx_encrypt(ctx, ctx->buffer + crypt_offset, pck_size - crypt_offset);
+	}
+
+	while (bytes_remain) {
+		u8 *output;
+		GF_FilterPacket *dst_pck;
+		Bool do_encrypt = GF_FALSE;
+		u32 crypt_offset=0;
+		u32 osize;
+		u32 to_write = bytes_remain;
+		u32 hdr_size = gsfmx_get_header_size(ctx, gst, use_seq_num, first_frag, no_frag, to_write, frame_size, block_offset);
+		if (ctx->mpck && (ctx->mpck < to_write + hdr_size)) {
+			no_frag = GF_FALSE;
+			hdr_size = gsfmx_get_header_size(ctx, gst, use_seq_num, first_frag, no_frag, ctx->mpck - hdr_size, frame_size, block_offset);
+			to_write = ctx->mpck - hdr_size;
+		}
+		osize = hdr_size + to_write;
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+
+		//format header
+		gf_bs_reassign_buffer(ctx->bs_w, output, osize);
+
+		if (ctx->crypt) do_encrypt = GF_TRUE;
+
+		gf_bs_write_int(ctx->bs_w, 0, 1); //reserved
+		//fragment flag
+		if (no_frag) gf_bs_write_int(ctx->bs_w, 0, 2);
+		else if (first_frag) gf_bs_write_int(ctx->bs_w, 1, 2);
+		else gf_bs_write_int(ctx->bs_w, 2, 2);
+		//encrypt flag
+		gf_bs_write_int(ctx->bs_w, do_encrypt ? 1 : 0, 1);
+		//packet type
+		gf_bs_write_int(ctx->bs_w, pck_type, 4);
+
+		//packet size and seq num
+		gsfmx_write_vlen(ctx, gst ? gst->idx : 0);
+		if (use_seq_num) {
+			gf_bs_write_u16(ctx->bs_w, gst ? gst->nb_frames : ctx->nb_frames);
+		}
+
+		//block size and block offset
+		if (!no_frag) {
+			gsfmx_write_vlen(ctx, frame_size);
+			if (!first_frag) gsfmx_write_vlen(ctx, block_offset);
+		}
+
+		gsfmx_write_vlen(ctx, to_write);
+
+		hdr_size = (u32) gf_bs_get_position(ctx->bs_w);
+		assert(hdr_size + to_write == osize);
+		memcpy(output+hdr_size, ctx->buffer + pck_offset, to_write);
+		bytes_remain -= to_write;
+		pck_offset += to_write;
+		block_offset += to_write;
+		if (frame_hdr_size) {
+			if (frame_hdr_size > block_offset) {
+				frame_hdr_size -= block_offset;
+				block_offset = 0;
+			} else {
+				block_offset -= frame_hdr_size;
+				frame_hdr_size = 0;
+			}
+		}
+
+		if (ctx->mpck && (ctx->mpck < to_write)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFMux] packet type %d size %d exceeds max packet size %d!\n", pck_type, osize, ctx->mpck));
+		}
+		//this is just to detach the buffer from the bit writer
+		gf_bs_get_content_no_truncate(ctx->bs_w, &output, &to_write, NULL);
+
+		if (do_encrypt && frag_encryption) {
+			//encrypt start after fragmentation block info, plus any additional offset based on packet type
+			hdr_size += crypt_offset;
+			gsfmx_encrypt(ctx, output+hdr_size, osize - hdr_size);
+		}
+
+		if (is_redundant) {
+			gf_filter_pck_set_dependency_flags(dst_pck, 1);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+		} else if (first_frag && bytes_remain) {
+			gf_filter_pck_set_framing(dst_pck, ctx->is_start, GF_FALSE);
+		} else if (!first_frag && bytes_remain) {
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+		} else if (first_frag) {
+			gf_filter_pck_set_framing(dst_pck, ctx->is_start, is_end);
+		} else {
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, is_end);
+		}
+		gf_filter_pck_send(dst_pck);
+
+		first_frag = GF_FALSE;
+	}
+}
+
+static void gsfmx_send_pid_rem(GSFMxCtx *ctx, GSFStream *gst)
+{
+	gf_bs_reassign_buffer(ctx->bs_w, ctx->buffer, ctx->alloc_size);
+	gst->nb_frames++;
+	gsfmx_send_packets(ctx, gst, GFS_PCKTYPE_PID_REMOVE, GF_FALSE, GF_FALSE, 0, 0);
+}
+
+static void gsfmx_send_pid_eos(GSFMxCtx *ctx, GSFStream *gst, Bool is_eos)
+{
+	gf_bs_reassign_buffer(ctx->bs_w, ctx->buffer, ctx->alloc_size);
+	gst->nb_frames++;
+	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)
+{
+	switch (p->type) {
+	case GF_PROP_POINTER:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize pointer property, ignoring !!\n"));
+	case GF_PROP_FORBIDEN:
+		return GF_FALSE;
+	default:
+		if (p->type>=GF_PROP_LAST_DEFINED)
+			return GF_FALSE;
+		return GF_TRUE;
+	}
+}
+
+static void gsfmx_write_prop(GSFMxCtx *ctx, const GF_PropertyValue *p)
+{
+	u32 len, len2, i;
+	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_LSINT:
+	case GF_PROP_LUINT:
+		gf_bs_write_u64(ctx->bs_w, p->value.longuint);
+		break;
+	case GF_PROP_BOOL:
+		gf_bs_write_u8(ctx->bs_w, p->value.boolean ? 1 : 0);
+		break;
+	case GF_PROP_FRACTION:
+		gsfmx_write_vlen(ctx, p->value.frac.num);
+		gsfmx_write_vlen(ctx, p->value.frac.den);
+		break;
+	case GF_PROP_FRACTION64:
+		gf_bs_write_u64(ctx->bs_w, p->value.lfrac.num);
+		gf_bs_write_u64(ctx->bs_w, p->value.lfrac.den);
+		break;
+	case GF_PROP_FLOAT:
+		gf_bs_write_float(ctx->bs_w, FIX2FLT(p->value.fnumber) );
+		break;
+	case GF_PROP_DOUBLE:
+		gf_bs_write_double(ctx->bs_w, p->value.number);
+		break;
+	case GF_PROP_VEC2I:
+		gsfmx_write_vlen(ctx, p->value.vec2i.x);
+		gsfmx_write_vlen(ctx, p->value.vec2i.y);
+		break;
+	case GF_PROP_VEC2:
+		gf_bs_write_double(ctx->bs_w, p->value.vec2.x);
+		gf_bs_write_double(ctx->bs_w, p->value.vec2.y);
+		break;
+	case GF_PROP_VEC3I:
+		gsfmx_write_vlen(ctx, p->value.vec3i.x);
+		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:
+		len = (u32) strlen(p->value.string);
+		gsfmx_write_vlen(ctx, len);
+		gf_bs_write_data(ctx->bs_w, p->value.string, len);
+		break;
+
+	case GF_PROP_DATA:
+	case GF_PROP_DATA_NO_COPY:
+	case GF_PROP_CONST_DATA:
+		len = p->value.data.size;
+		gsfmx_write_vlen(ctx, len);
+		gf_bs_write_data(ctx->bs_w, p->value.data.ptr, len);
+		break;
+
+	//string list: memory is ALWAYS duplicated
+	case GF_PROP_STRING_LIST:
+		len2 = gf_list_count(p->value.string_list);
+		gsfmx_write_vlen(ctx, len2);
+		for (i=0; i<len2; i++) {
+			const char *str = gf_list_get(p->value.string_list, i);
+			len = (u32) strlen(str);
+			gsfmx_write_vlen(ctx, len);
+			gf_bs_write_data(ctx->bs_w, str, len);
+		}
+		break;
+
+	case GF_PROP_UINT_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_POINTER:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize pointer property, ignoring !!\n"));
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Cannot serialize property of unknown type, ignoring !!\n"));
+		break;
+	}
+}
+
+static GFINLINE Bool gsfmx_is_prop_skip(GSFMxCtx *ctx, u32 prop_4cc, const char *prop_name, u8 sep_l)
+{
+	if (ctx->minp) {
+		u8 flags;
+		if (prop_name) return GF_TRUE;
+
+		flags = gf_props_4cc_get_flags(prop_4cc);
+		if (flags & GF_PROP_FLAG_GSF_REM) return GF_TRUE;
+		return GF_FALSE;
+	}
+	if (ctx->skp) {
+		const char *pname = prop_name ? prop_name : gf_4cc_to_str(prop_4cc);
+		u32 plen = (u32) strlen(pname);
+		const char *sep = strstr(ctx->skp, pname);
+		if (sep && ((sep[plen]==sep_l) || !sep[plen]))
+			return GF_TRUE;
+		if (prop_4cc) {
+			pname = gf_props_4cc_get_name(prop_4cc);
+			if (!pname) pname = gf_4cc_to_str(prop_4cc);
+			plen = (u32) strlen(pname);
+			sep = strstr(ctx->skp, pname);
+			if (sep && ((sep[plen]==sep_l) || !sep[plen]))
+				return GF_TRUE;
+		}
+	}
+	return GF_FALSE;
+}
+
+static void gsfmx_write_pid_config(GF_Filter *filter, GSFMxCtx *ctx, GSFStream *gst)
+{
+	u32 nb_4cc_props=0;
+	u32 nb_str_props=0;
+	u32 idx=0;
+	u8 sep_l = gf_filter_get_sep(filter, GF_FS_SEP_LIST);
+
+	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_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++;
+			}
+		}
+		else if (prop_name)
+			nb_str_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);
+
+	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 (prop_name) continue;
+		if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN)
+			continue;
+
+		if ( gsfmx_is_prop_skip(ctx, prop_4cc, prop_name, sep_l) )
+			continue;
+
+		gf_bs_write_u32(ctx->bs_w, prop_4cc);
+
+		gsfmx_write_prop(ctx, p);
+	}
+
+	idx=0;
+	while (1) {
+		u32 prop_4cc, len;
+		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 (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) )
+			continue;
+		if (!prop_name)
+			prop_name = gf_4cc_to_str(prop_4cc);
+
+		len = (u32) strlen(prop_name);
+		gsfmx_write_vlen(ctx, len);
+		gf_bs_write_data(ctx->bs_w, prop_name, len);
+
+		gf_bs_write_u8(ctx->bs_w, p->type);
+		gsfmx_write_prop(ctx, p);
+	}
+}
+
+
+
+static void gsfmx_send_header(GF_Filter *filter, GSFMxCtx *ctx, Bool is_carousel_update)
+{
+	u32 mlen=0;
+
+	if (!ctx->bs_w) {
+ 		ctx->bs_w = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		if (!ctx->bs_w) return;
+	} else {
+		gf_bs_reassign_buffer(ctx->bs_w, ctx->buffer, ctx->alloc_size);
+	}
+
+	ctx->nb_frames++;
+	if (ctx->magic) {
+		mlen = (u32) strlen(ctx->magic);
+	}
+
+	//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);
+
+	if (ctx->crypt) {
+		gf_bs_write_data(ctx->bs_w, ctx->crypt_IV, 16);
+		gf_bs_write_u16(ctx->bs_w, ctx->pattern.num);
+		gf_bs_write_u16(ctx->bs_w, ctx->pattern.den);
+	}
+	gf_bs_write_int(ctx->bs_w, ctx->sigsn ? 1 : 0, 1);
+	gf_bs_write_int(ctx->bs_w, 0, 7);
+
+	//header:magic
+	gsfmx_write_vlen(ctx, mlen);
+	if (ctx->magic) {
+		gf_bs_write_data(ctx->bs_w, ctx->magic, mlen);
+	}
+
+	gsfmx_send_packets(ctx, NULL, GFS_PCKTYPE_HDR, GF_FALSE, is_carousel_update ? GF_TRUE : GF_FALSE, 0, 0);
+	ctx->is_start = GF_FALSE;
+}
+
+static void gsfmx_send_pid_config(GF_Filter *filter, GSFMxCtx *ctx, GSFStream *gst, Bool is_info, Bool is_carousel_update)
+{
+	if (ctx->is_start) {
+		gsfmx_send_header(filter, ctx, GF_FALSE);
+	}
+
+	gf_bs_reassign_buffer(ctx->bs_w, ctx->buffer, ctx->alloc_size);
+	if (!is_info && !is_carousel_update) {
+		gst->config_version++;
+	}
+	gsfmx_write_pid_config(filter, ctx, gst);
+	gst->nb_frames++;
+	gsfmx_send_packets(ctx, gst, is_info ? GFS_PCKTYPE_PID_INFO_UPDATE : GFS_PCKTYPE_PID_CONFIG, GF_FALSE, is_carousel_update ? GF_TRUE : GF_FALSE, 0, 0);
+}
+
+static void gsfmx_write_data_packet(GSFMxCtx *ctx, GSFStream *gst, GF_FilterPacket *pck)
+{
+	u32 w=0, h=0, stride=0, stride_uv=0, pf=0;
+	u32 nb_planes=0, uv_height=0;
+	const char *data;
+	u32 frame_size, frame_hdr_size;
+	GF_FilterFrameInterface *frame_ifce=NULL;
+	u32 nb_4cc_props=0;
+	u32 nb_str_props=0;
+	u32 idx=0;
+	u32 tsmode=0;
+	u32 tsmodebits=0;
+	u32 tsdiffmode=0;
+	u32 tsdiffmodebits=0;
+	Bool start, end;
+	const GF_PropertyValue *p;
+
+	if (ctx->dbg==2) return;
+
+	gst->nb_frames++;
+
+	while (1) {
+		u32 prop_4cc;
+		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 (prop_4cc) {
+			if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN)
+				nb_str_props++;
+			else
+				nb_4cc_props++;
+		}
+		else if (prop_name)
+			nb_str_props++;
+	}
+
+	gf_bs_reassign_buffer(ctx->bs_w, ctx->buffer, ctx->alloc_size);
+
+	data = gf_filter_pck_get_data(pck, &frame_size);
+	if (!data) {
+		frame_ifce = gf_filter_pck_get_frame_interface(pck);
+		if (frame_ifce) {
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_WIDTH);
+			w = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_HEIGHT);
+			h = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_PIXFMT);
+			pf = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_STRIDE);
+			stride = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(gst->pid, GF_PROP_PID_STRIDE_UV);
+			stride_uv = p ? p->value.uint : 0;
+
+			if (! gf_pixel_get_size_info(pf, w, h, &frame_size, &stride, &stride_uv, &nb_planes, &uv_height)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[GSFMux] Raw packet with unsupported pixel format, cannot send\n"));
+				return;
+			}
+		}
+	}
+
+	if (ctx->dbg) frame_size=0;
+
+	u64 dts = gf_filter_pck_get_dts(pck);
+	u64 cts = gf_filter_pck_get_cts(pck);
+	u32 cts_diff=0;
+	u8 has_dts=0;
+	u8 has_cts=0;
+	u8 neg_cts=0;
+
+	//packet structure:
+	//flags first byte: 1(has_dts) 1(has_cts) 1(has_dur) 1(cts_diff_neg) 2(ts_mode) 2(ts_diff_mode)
+	//flags second byte: 3(sap) 2(encrypted) 1(has_sample_deps) 1(has builtin props) 1(has_ext)
+	//if (ext) {
+	// 	flags third byte: 1(has_byteoffset) 1(corrupted) 1(seek) 1(has_carousel) 2(ilaced) 2(cktype)
+	// 	flags fourth byte: 1(au start) 1(au end) 1(has props) reserved(5)
+	//}
+	//if has_dts, dts on tsmodebits
+	//if has_cts, has_dts ? cts_diff on ts_diff_mode : cts on tsmodebits
+	//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_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]
+	//data
+
+
+	u32 duration = ctx->sigdur ? gf_filter_pck_get_duration(pck) : 0;
+
+	if (ctx->sigdts && (dts!=GF_FILTER_NO_TS) && (dts!=cts)) {
+		has_dts=1;
+
+		if (dts>0xFFFFFFFFUL) tsmode=3;
+		else if (dts>0xFFFFFF) tsmode=2;
+		else if (dts>0xFFFF) tsmode=1;
+	}
+	if (cts!=GF_FILTER_NO_TS) {
+		has_cts=1;
+		if (has_dts) {
+			s64 diff = ( (s64) cts - (s64) dts);
+			if (diff>0) cts_diff = (u32) diff;
+			else {
+				neg_cts=1;
+				cts_diff = (u32) (-diff);
+			}
+		} else {
+			if (cts>0xFFFFFFFFUL) tsmode=3;
+			else if (cts>0xFFFFFF) tsmode=2;
+			else if (cts>0xFFFF) tsmode=1;
+		}
+	}
+
+	if (tsmode==3) tsmodebits=64;
+	else if (tsmode==2) tsmodebits=32;
+	else if (tsmode==1) tsmodebits=24;
+	else tsmodebits=16;
+
+	u32 max_dur = MAX(duration, cts_diff);
+	if (max_dur < 0xFF) { tsdiffmode=0; tsdiffmodebits=8; }
+	else if (max_dur < 0xFFFF) { tsdiffmode=1; tsdiffmodebits=16; }
+	else if (max_dur < 0xFFFFFF) { tsdiffmode=2; tsdiffmodebits=24; }
+	else { tsdiffmode=3; tsdiffmodebits=32; }
+
+
+	assert(tsmodebits<=32);
+
+	//first flags byte
+	//flags first byte: 1(has_dts) 1(has_cts) 1(has_dur) 1(cts_diff_neg) 2(ts_mode) 2(ts_diff_mode)
+	gf_bs_write_int(ctx->bs_w, has_dts, 1);
+	gf_bs_write_int(ctx->bs_w, has_cts, 1);
+	gf_bs_write_int(ctx->bs_w, duration ? 1 : 0, 1);
+	gf_bs_write_int(ctx->bs_w, neg_cts, 1);
+	gf_bs_write_int(ctx->bs_w, tsmode, 2);
+	gf_bs_write_int(ctx->bs_w, tsdiffmode, 2);
+
+	//flags second byte: 3(sap) 2(encrypted) 1(has_sample_deps) 1(has builtin props) 1(has_ext)
+	u8 sap = gf_filter_pck_get_sap(pck);
+	gf_bs_write_int(ctx->bs_w, sap, 3);
+	u8 crypt = gf_filter_pck_get_crypt_flags(pck);
+	gf_bs_write_int(ctx->bs_w, crypt, 2);
+	u8 depflags = gf_filter_pck_get_dependency_flags(pck);
+	gf_bs_write_int(ctx->bs_w, depflags ? 1 : 0, 1);
+	gf_bs_write_int(ctx->bs_w, nb_4cc_props ? 1 : 0, 1);
+
+	u8 needs_ext = nb_str_props ? 1 : 0;
+	u64 bo = ctx->sigbo ? gf_filter_pck_get_byte_offset(pck) : GF_FILTER_NO_BO;
+	if (bo != GF_FILTER_NO_BO) needs_ext=1;
+	u8 corr = gf_filter_pck_get_corrupted(pck);
+	if (corr) needs_ext=1;
+	u8 seek = gf_filter_pck_get_seek_flag(pck);
+	if (seek) needs_ext=1;
+	u8 carv = gf_filter_pck_get_carousel_version(pck);
+	if (carv) needs_ext=1;
+	u8 interl = gf_filter_pck_get_interlaced(pck);
+	if (interl) needs_ext=1;
+	u8 cktype = gf_filter_pck_get_clock_type(pck);
+	if (cktype) needs_ext=1;
+	gf_filter_pck_get_framing(pck, &start, &end);
+	if (!start || !end) needs_ext=1;
+
+	gf_bs_write_int(ctx->bs_w, needs_ext, 1);
+
+	//extension header
+	if (needs_ext) {
+		// 	flags third byte: 1(has_byteoffset) 1(corrupted) 1(seek) 1(has_carousel) 2(ilaced) 2(cktype)
+		gf_bs_write_int(ctx->bs_w, (bo==GF_FILTER_NO_BO) ? 0 : 1, 1);
+		gf_bs_write_int(ctx->bs_w, corr ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, seek ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, carv ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, interl, 2);
+		gf_bs_write_int(ctx->bs_w, cktype, 2);
+
+		// 	flags fourth byte: 1(au start) 1(au end) 1(has props) reserved(5)
+		gf_bs_write_int(ctx->bs_w, start ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, end ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, nb_str_props ? 1 : 0, 1);
+		gf_bs_write_int(ctx->bs_w, 0, 5);
+	}
+	//done with flags
+
+	if (has_dts) {
+		if (tsmode==3) gf_bs_write_long_int(ctx->bs_w, dts, tsmodebits);
+		else gf_bs_write_int(ctx->bs_w, (u32) dts, tsmodebits);
+	}
+	if (has_cts) {
+		if (has_dts) {
+			gf_bs_write_int(ctx->bs_w, cts_diff, tsdiffmodebits);
+		} else {
+			if (tsmode==3) gf_bs_write_long_int(ctx->bs_w, cts, tsmodebits);
+			else gf_bs_write_int(ctx->bs_w, (u32) cts, tsmodebits);
+		}
+	}
+
+	if (duration) {
+		gf_bs_write_int(ctx->bs_w, duration, tsdiffmodebits);
+	}
+
+	if (sap==GF_FILTER_SAP_4) {
+		s16 roll = gf_filter_pck_get_roll_info(pck);
+		gf_bs_write_u16(ctx->bs_w, roll);
+	}
+	if (depflags)
+		gf_bs_write_u8(ctx->bs_w, depflags);
+
+	if (carv) {
+		gf_bs_write_u8(ctx->bs_w, carv);
+	}
+	if (bo!=GF_FILTER_NO_BO) {
+		gf_bs_write_u64(ctx->bs_w, bo);
+	}
+	if (nb_4cc_props) {
+		gsfmx_write_vlen(ctx, nb_4cc_props);
+
+		//write packet properties
+		idx=0;
+		while (1) {
+			u32 prop_4cc;
+			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 (prop_name) continue;
+			if (gf_props_4cc_get_type(prop_4cc) == GF_PROP_FORBIDEN) continue;
+
+			gf_bs_write_u32(ctx->bs_w, prop_4cc);
+
+			gsfmx_write_prop(ctx, p);
+		}
+	}
+	if (nb_str_props) {
+		gsfmx_write_vlen(ctx, nb_str_props);
+		idx=0;
+		while (1) {
+			u32 prop_4cc, len;
+			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 (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);
+			gsfmx_write_vlen(ctx, len);
+			gf_bs_write_data(ctx->bs_w, prop_name, len);
+
+			gf_bs_write_u8(ctx->bs_w, p->type);
+			gsfmx_write_prop(ctx, p);
+		}
+		gsfmx_write_vlen(ctx, nb_str_props);
+	}
+
+	frame_hdr_size = (u32) gf_bs_get_position(ctx->bs_w);
+
+	if (has_cts && ctx->crate>0) {
+		if (!gst->last_cts_config) {
+			gst->last_cts_config = has_cts+1;
+		} else if ( cts - (gst->last_cts_config-1) > ctx->crate * gst->timescale) {
+			ctx->regenerate_tunein_info = GF_TRUE;
+		}
+	}
+
+
+	//write packet data
+	if (ctx->dbg) {
+
+	} 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));
+		}
+		gsfmx_send_packets(ctx, gst, GFS_PCKTYPE_PCK, GF_FALSE, GF_FALSE, frame_size, frame_hdr_size);
+	} else if (frame_ifce) {
+		u32 i, bpp = gf_pixel_get_bytes_per_pixel(pf);
+		for (i=0; i<nb_planes; i++) {
+			u32 j, write_h, lsize;
+			const u8 *out_ptr;
+			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"));
+				break;
+			}
+			write_h = h;
+			if (i) write_h = uv_height;
+			lsize = bpp * (i ? stride_uv : stride);
+			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));
+				}
+				out_ptr += out_stride;
+			}
+		}
+		gsfmx_send_packets(ctx, gst, GFS_PCKTYPE_PCK, GF_FALSE, GF_FALSE, frame_size, frame_hdr_size);
+	}
+}
+
+GF_Err gsfmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GSFStream *gst=NULL;
+	const GF_PropertyValue *p;
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		gst = gf_filter_pid_get_udta(pid);
+		assert(gst);
+		gsfmx_send_pid_rem(ctx, gst);
+		gf_list_del_item(ctx->streams, gst);
+		gf_free(gst);
+		if (!gf_list_count(ctx->streams)) {
+			gf_filter_pid_remove(ctx->opid);
+			ctx->opid = NULL;
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_name(ctx->opid, "gsf_mux");
+		//copy properties at init or reconfig
+		gf_filter_pid_copy_properties(ctx->opid, pid);
+		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_CODECID, NULL );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ENCRYPTED, NULL );
+		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_FILE_EXT, &PROP_STRING( "*" ) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("application/x-gpac-sf") );
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+
+	gst = gf_filter_pid_get_udta(pid);
+	if (!gst) {
+		GF_SAFEALLOC(gst, GSFStream);
+		if (!gst) return GF_OUT_OF_MEM;
+		gf_list_add(ctx->streams, gst);
+		gst->pid = pid;
+		gf_filter_pid_set_udta(pid, gst);
+		gst->idx = 1+ctx->max_pid_idx;
+		ctx->max_pid_idx++;
+		gst->timescale = 1000;
+		if (p && p->value.uint) gst->timescale = p->value.uint;
+
+		gsfmx_send_pid_config(filter, ctx, gst, GF_FALSE, GF_FALSE);
+
+	} 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);
+
+	}
+	return GF_OK;
+}
+
+
+GF_Err gsfmx_process(GF_Filter *filter)
+{
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+	u32 i, nb_eos, count = gf_list_count(ctx->streams);
+
+	nb_eos = 0;
+	for (i=0; i<count; i++) {
+		GSFStream *gst = gf_list_get(ctx->streams, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(gst->pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(gst->pid)) {
+				nb_eos++;
+				if (!gst->eos) {
+					gsfmx_send_pid_eos(ctx, gst, (nb_eos==count) ? GF_TRUE : GF_FALSE);
+					gst->eos = GF_TRUE;
+				}
+			}
+			continue;
+		}
+		gst->eos = GF_FALSE;
+		gsfmx_write_data_packet(ctx, gst, pck);
+		gf_filter_pid_drop_packet(gst->pid);
+	}
+	if (ctx->regenerate_tunein_info) {
+		ctx->regenerate_tunein_info = GF_FALSE;
+		gsfmx_send_header(filter, ctx, GF_TRUE);
+		for (i=0; i<count; i++) {
+			GSFStream *gst = gf_list_get(ctx->streams, i);
+			gsfmx_send_pid_config(filter, ctx, gst, GF_FALSE, GF_TRUE);
+		}
+	}
+
+	if (count && (nb_eos==count) ) {
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+	return GF_OK;
+}
+
+static Bool gsfmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+	if (evt->base.type==GF_FEVT_INFO_UPDATE) {
+		GSFStream *gst = gf_filter_pid_get_udta(evt->base.on_pid);
+		if (gst)
+			gsfmx_send_pid_config(filter, ctx, gst, GF_TRUE, GF_FALSE);
+	}
+	//don't cancel events
+	return GF_FALSE;
+}
+
+static GF_Err gsfmx_initialize(GF_Filter *filter)
+{
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+
+	gf_rand_init(GF_FALSE);
+
+	if (ctx->key.size==16) {
+		GF_Err e;
+		if (ctx->IV.size==16) {
+			memcpy(ctx->crypt_IV, ctx->IV.ptr, 16);
+		} else if (ctx->IV.size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Wrong IV value, size %d expecting 16\n", ctx->key.size));
+			return GF_BAD_PARAM;
+		} else {
+			char szIV[64];
+			u32 i;
+			* (u32 *) &ctx->crypt_IV[0] = gf_rand();
+			* (u32 *) &ctx->crypt_IV[4] = gf_rand();
+			* (u32 *) &ctx->crypt_IV[8] = gf_rand();
+			* (u32 *) &ctx->crypt_IV[12] = gf_rand();
+			szIV[0] = 0;
+			for (i=0; i<16; i++) {
+				char szC[3];
+				sprintf(szC, "%02X", ctx->crypt_IV[i]);
+				strcat(szIV, szC);
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[GSFMux] Generated IV value Ox%s\n", szIV));
+		}
+		ctx->crypt = gf_crypt_open(GF_AES_128, GF_CBC);
+		if (!ctx->crypt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Failed to allocate crypt context\n"));
+			return GF_IO_ERR;
+		}
+		e = gf_crypt_init(ctx->crypt, ctx->key.ptr, ctx->crypt_IV);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Failed to setup encryption: %s\n", gf_error_to_string(e) ));
+			return GF_IO_ERR;
+		}
+	} else if (ctx->key.size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[GSFMux] Wrong key value, size %d expecting 16\n", ctx->key.size));
+		return GF_BAD_PARAM;
+	}
+
+	ctx->streams = gf_list_new();
+	if (!ctx->streams) return GF_OUT_OF_MEM;
+
+	ctx->is_start = GF_TRUE;
+
+	return GF_OK;
+}
+
+static void gsfmx_finalize(GF_Filter *filter)
+{
+	GSFMxCtx *ctx = gf_filter_get_udta(filter);
+	while (gf_list_count(ctx->streams)) {
+		GSFStream *gst = gf_list_pop_back(ctx->streams);
+		gf_free(gst);
+	}
+	gf_list_del(ctx->streams);
+
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+	if (ctx->buffer) gf_free(ctx->buffer);
+	if (ctx->crypt) gf_crypt_close(ctx->crypt);
+}
+
+static const GF_FilterCapability GSFMxCaps[] =
+{
+	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, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "gsf"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "application/x-gpac-sf"),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GSFMxCtx, _n)
+static const GF_FilterArgs GSFMxArgs[] =
+{
+	{ OFFS(sigsn), "signal packet sequence number after header field and before size field. Sequence number is per PID, encoded on 16 bits. Header packet does not have a SN", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(sigdur), "signal duration", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(sigbo), "signal byte offset", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(sigdts), "signal decoding timestamp", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(dbg), "set debug mode\n"
+	"- no: disable debug\n"
+	"- nodata: force packet size to 0\n"
+	"- nopck: skip packet", GF_PROP_UINT, "no", "no|nodata|nopck", GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(key), "encrypt packets using given key - see filter helps", 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(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},
+	{0}
+};
+
+
+GF_FilterRegister GSFMxRegister = {
+	.name = "gsfmx",
+	GF_FS_SET_DESCRIPTION("GSF Muxer")
+	GF_FS_SET_HELP("This filter provides GSF (__GPAC Super/Simple/Serialized/Stream/State 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"
+			"\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"
+			"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"
+			"The [-IV]() is constant to avoid packet overhead, randomly generated if not set and sent in the initial stream header. "
+			"Pattern mode can be used (cf CENC cbcs) to encrypt K block and leave N blocks in the clear.\n"
+			"\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 dropable (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"
+			"\n")
+	.private_size = sizeof(GSFMxCtx),
+	.max_extra_pids = (u32) -1,
+	.args = GSFMxArgs,
+	.flags = GF_FS_REG_DYNAMIC_REDIRECT,
+	SETCAPS(GSFMxCaps),
+	.initialize = gsfmx_initialize,
+	.finalize = gsfmx_finalize,
+	.configure_pid = gsfmx_configure_pid,
+	.process = gsfmx_process,
+	.process_event = gsfmx_process_event,
+};
+
+
+const GF_FilterRegister *gsfmx_register(GF_FilterSession *session)
+{
+	return &GSFMxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/mux_isom.c Added

@@ -0,0 +1,5440 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ISOBMF mux 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/isomedia_dev.h>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+#define TEXT_DEFAULT_WIDTH	400
+#define TEXT_DEFAULT_HEIGHT	60
+#define TEXT_DEFAULT_FONT_SIZE	18
+
+#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_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
+};
+
+
+enum
+{
+	CENC_NONE=0,
+	CENC_NEED_SETUP,
+	CENC_SETUP_DONE,
+	CENC_SETUP_ERROR
+};
+
+typedef struct
+{
+	GF_FilterPid *ipid;
+	u32 track_num, track_id;
+	GF_ISOSample sample;
+
+	u32 src_timescale;
+	u32 tk_timescale;
+	u32 stream_type;
+	u32 codecid;
+	Bool is_encrypted;
+
+	u32 cfg_crc, enh_cfg_crc;
+	u32 dep_id;
+	u32 stsd_idx;
+	u32 clear_stsd_idx;
+
+	Bool use_dref;
+	Bool aborted;
+	Bool suspended;
+	Bool has_append;
+	Bool has_ctts;
+	s64 min_neg_ctts;
+	u32 nb_samples, samples_in_stsd;
+	u32 nb_frames_per_sample;
+	u64 ts_shift;
+
+	Bool skip_bitrate_update;
+	Bool has_open_gop;
+	Bool has_gdr;
+
+	Bool next_is_first_sample;
+
+	u32 media_profile_level;
+
+	Bool import_msg_header_done;
+
+	u32 nal_unit_size;
+
+	GF_AVCConfig *avcc, *svcc;
+	GF_HEVCConfig *hvcc, *lvcc;
+
+	u8 *inband_hdr;
+	u32 inband_hdr_size;
+	u32 is_nalu;
+	Bool is_av1, is_vpx;
+	Bool fragment_done;
+	s32 ts_delay, negctts_shift;
+	Bool insert_tfdt, probe_min_ctts;
+	u64 first_dts_in_seg, next_seg_cts, cts_next;
+	u64 offset_dts;
+	u32 samples_in_frag;
+
+	//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;
+
+	Bool fake_track;
+
+	Bool has_brands;
+	Bool force_inband_inject;
+
+	u32 dur_in_frag;
+
+	u32 amr_mode_set;
+	Bool has_seig;
+	u64 empty_init_dur;
+	u32 raw_audio_bytes_per_sample;
+	u64 dts_patch;
+
+	Bool is_item;
+	u32 item_id;
+	char status_type;
+	u32 last_import_pc;
+
+	u32 nb_frames;
+	u64 down_bytes, down_size;
+	GF_Fraction64 pid_dur;
+	//for import message
+	u64 prog_done, prog_total;
+
+	u32 prev_tid_group;
+
+	Bool box_patched;
+} TrackWriter;
+
+enum
+{
+	MP4MX_MODE_INTER=0,
+	MP4MX_MODE_FLAT,
+	MP4MX_MODE_FASTSTART,
+	MP4MX_MODE_TIGHT,
+	MP4MX_MODE_FRAG,
+	MP4MX_MODE_SFRAG,
+};
+
+
+enum
+{
+	MP4MX_DASH_OFF=0,
+	MP4MX_DASH_ON,
+	MP4MX_DASH_VOD,
+};
+
+enum
+{
+	MP4MX_PSSH_MOOV=0,
+	MP4MX_PSSH_MOOF,
+	MP4MX_PSSH_SKIP,
+};
+
+enum
+{
+	MP4MX_CT_EDIT=0,
+	MP4MX_CT_NOEDIT,
+	MP4MX_CT_NEGCTTS,
+};
+
+enum
+{
+	MP4MX_VODCACHE_ON=0,
+	MP4MX_VODCACHE_INSERT,
+	MP4MX_VODCACHE_REPLACE,
+};
+
+typedef struct
+{
+	//filter args
+	GF_ISOFile *file;
+	char *tmpd;
+	Bool m4sys, dref;
+	GF_Fraction idur;
+	u32 pack3gp, ctmode;
+	Bool importer, pack_nal, moof_first, abs_offset, fsap, tfdt_traf;
+	u32 xps_inband;
+	u32 block_size;
+	u32 store, tktpl, mudta;
+	s32 subs_sidx;
+	Double cdur;
+	s32 moovts;
+	char *m4cc;
+	Bool chain_sidx;
+	u32 msn, msninc;
+	GF_Fraction64 tfdt;
+	Bool nofragdef, straf, strun, sgpd_traf, noinit;
+	u32 vodcache;
+	u32 psshs;
+	u32 trackid;
+	Bool fragdur;
+	Bool btrt;
+	Bool ssix;
+	Bool ccst;
+	s32 mediats;
+	GF_AudioSampleEntryImportMode ase;
+	char *styp;
+	Bool sseg;
+	Bool noroll;
+	Bool saio32;
+	u32 compress;
+	Bool trun_inter;
+	char *boxpatch;
+	Bool fcomp;
+	Bool deps;
+	Bool mvex;
+	u32 sdtp_traf;
+#ifdef GF_ENABLE_CTRN
+	Bool ctrn;
+	Bool ctrni;
+#endif
+
+	//internal
+	Bool owns_mov;
+	GF_FilterPid *opid;
+	Bool first_pck_sent;
+
+	GF_List *tracks;
+
+	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 current_offset;
+	u64 current_size;
+
+	u32 nb_segs, nb_frags, nb_frags_in_seg;
+
+	GF_FilterPacket *dst_pck;
+	char *seg_name;
+	u32 dash_seg_num;
+	Bool flush_seg;
+	u32 eos_marker;
+	TrackWriter *ref_tkw;
+	Bool single_file;
+	Bool store_output;
+	FILE *tmp_store;
+	u64 flush_size, flush_done;
+
+	u32 dash_mode;
+	Double dash_dur;
+	Double media_dur;
+	u32 sidx_max_size, sidx_chunk_offset;
+	Bool final_sidx_flush;
+	Bool sidx_size_exact;
+
+	u32 *seg_sizes;
+	u32 nb_seg_sizes, alloc_seg_sizes;
+	Bool config_timing;
+
+	u32 major_brand_set;
+	Bool def_brand_patched;
+
+	Bool force_play;
+
+	Bool moov_inserted;
+	Bool update_report;
+	u64 total_bytes_in, total_bytes_out;
+	u32 total_samples, last_mux_pc;
+
+	u32 maxchunk;
+	u32 make_qt;
+	TrackWriter *prores_track;
+
+	GF_SegmentIndexBox *cloned_sidx;
+	u32 cloned_sidx_index;
+	Double faststart_ts_regulate;
+
+	Bool is_rewind;
+	Bool box_patched;
+	u32 cur_file_idx_plus_one;
+	char *cur_file_suffix;
+	Bool notify_filename;
+
+	u32 next_file_idx;
+	const char *next_file_suffix;
+} GF_MP4MuxCtx;
+
+static void mp4_mux_set_hevc_groups(GF_MP4MuxCtx *ctx, TrackWriter *tkw);
+
+static GF_Err mp4mx_setup_dash_vod(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	if (tkw) {
+		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;
+		}
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DURATION);
+		if (p && p->value.lfrac.den) {
+			Double mdur = (Double) p->value.lfrac.num;
+			mdur /= p->value.lfrac.den;
+			if (ctx->media_dur < mdur) ctx->media_dur = mdur;
+		}
+	}
+	ctx->dash_mode = MP4MX_DASH_VOD;
+	if ((ctx->vodcache==MP4MX_VODCACHE_ON) && !ctx->tmp_store) {
+		ctx->tmp_store = gf_file_temp(NULL);
+		if (!ctx->tmp_store) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot allocate temp file for VOD sidx generation\n"));
+			return GF_IO_ERR;
+		}
+		if (!ctx->block_size) ctx->block_size = 10000;
+	}
+
+	return GF_OK;
+}
+
+
+static u32 gf_isom_stream_type_to_media_type(u32 stream_type, u32 codecid)
+{
+	switch (stream_type) {
+	case GF_STREAM_SCENE: return GF_ISOM_MEDIA_SCENE;
+	case GF_STREAM_OD: return GF_ISOM_MEDIA_OD;
+	case GF_STREAM_OCR: return GF_ISOM_MEDIA_OCR;
+	case GF_STREAM_OCI: return GF_ISOM_MEDIA_OCI;
+	case GF_STREAM_MPEG7: return GF_ISOM_MEDIA_MPEG7;
+	case GF_STREAM_METADATA: return GF_ISOM_MEDIA_META;
+	case GF_STREAM_VISUAL: return GF_ISOM_MEDIA_VISUAL;
+	case GF_STREAM_AUDIO: return GF_ISOM_MEDIA_AUDIO;
+	case GF_STREAM_TEXT:
+		if (codecid==GF_ISOM_SUBTYPE_STPP)
+			return GF_ISOM_MEDIA_MPEG_SUBT;
+		if (codecid == GF_CODECID_SUBPIC)
+			return GF_ISOM_MEDIA_SUBPIC;
+		return GF_ISOM_MEDIA_TEXT;
+	case GF_STREAM_INTERACT: return GF_ISOM_MEDIA_SCENE;
+	case GF_STREAM_IPMP: return GF_ISOM_MEDIA_IPMP;
+	case GF_STREAM_MPEGJ: return GF_ISOM_MEDIA_MPEGJ;
+	case GF_STREAM_IPMP_TOOL: return GF_ISOM_MEDIA_IPMP;
+	case GF_STREAM_FONT: return GF_ISOM_MEDIA_MPEGJ;//TOCHECK !!
+
+	case GF_STREAM_PRIVATE_SCENE:
+	case GF_STREAM_ENCRYPTED:
+	case GF_STREAM_FILE:
+		return 0;
+	default:
+		return stream_type;
+	}
+	return 0;
+}
+
+static void mp4_mux_write_ps_list(GF_BitStream *bs, GF_List *list, u32 nalu_size_length)
+{
+	u32 i, count = list ? gf_list_count(list) : 0;
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *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)
+{
+	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);
+		if (pa->type == type) return pa->nalus;
+	}
+	return NULL;
+}
+
+static void mp4_mux_make_inband_header(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	GF_BitStream *bs;
+	if (tkw->inband_hdr) gf_free(tkw->inband_hdr);
+
+	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 (!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 (!tkw->nal_unit_size) tkw->nal_unit_size = tkw->svcc->nal_unit_size;
+		}
+
+		if (tkw->avcc && tkw->avcc->sequenceParameterSetExtensions)
+			mp4_mux_write_ps_list(bs, tkw->avcc->sequenceParameterSetExtensions, tkw->avcc->nal_unit_size);
+
+		if (tkw->svcc && tkw->svcc->sequenceParameterSetExtensions)
+			mp4_mux_write_ps_list(bs, tkw->svcc->sequenceParameterSetExtensions, tkw->svcc->nal_unit_size);
+
+		if (tkw->avcc)
+			mp4_mux_write_ps_list(bs, tkw->avcc->pictureParameterSets, tkw->avcc->nal_unit_size);
+
+		if (tkw->svcc)
+			mp4_mux_write_ps_list(bs, tkw->svcc->pictureParameterSets, tkw->svcc->nal_unit_size);
+	}
+	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 (!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 (!tkw->nal_unit_size) tkw->nal_unit_size = 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);
+		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);
+	}
+
+	tkw->inband_hdr=NULL;
+	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;
+}
+
+void mp4_mux_get_video_size(GF_MP4MuxCtx *ctx, u32 *width, u32 *height)
+{
+	u32 w, h, f_w, f_h, i;
+
+	f_w = f_h = 0;
+	for (i=0; i<gf_isom_get_track_count(ctx->file); i++) {
+		switch (gf_isom_get_media_type(ctx->file, i+1)) {
+		case GF_ISOM_MEDIA_SCENE:
+		case GF_ISOM_MEDIA_VISUAL:
+			gf_isom_get_visual_info(ctx->file, i+1, 1, &w, &h);
+			if (w > f_w) f_w = w;
+			if (h > f_h) f_h = h;
+			//fallthrough
+		case GF_ISOM_MEDIA_TEXT:
+			gf_isom_get_track_layout_info(ctx->file, i+1, &w, &h, NULL, NULL, NULL);
+			if (w > f_w) f_w = w;
+			if (h > f_h) f_h = h;
+			break;
+		}
+	}
+	(*width) = f_w ? f_w : TEXT_DEFAULT_WIDTH;
+	(*height) = f_h ? f_h : TEXT_DEFAULT_HEIGHT;
+}
+
+static void mp4_mux_track_writer_del(TrackWriter *tkw)
+{
+	if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
+	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->inband_hdr) gf_free(tkw->inband_hdr);
+	gf_free(tkw);
+}
+
+static void mp4_mux_write_track_refs(GF_MP4MuxCtx *ctx, TrackWriter *tkw, const char *rname, u32 rtype)
+{
+	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]);
+	}
+}
+
+static void mp4mux_track_reorder(void *udta, u32 old_track_num, u32 new_track_num)
+{
+	GF_MP4MuxCtx *ctx = (GF_MP4MuxCtx *) udta;
+	u32 i, count;
+	count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (tkw->track_num==old_track_num) {
+			tkw->track_num = new_track_num;
+			return;
+		}
+	}
+}
+
+static void mp4mux_reorder_tracks(GF_MP4MuxCtx *ctx)
+{
+	u32 i, count, prev_num, prev_pos;
+	GF_List *new_tracks = gf_list_new();
+	prev_num = prev_pos = 0;
+	count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (tkw->track_num<prev_num) {
+			gf_list_insert(new_tracks, tkw, prev_pos);
+		} else {
+			gf_list_add(new_tracks, tkw);
+		}
+		prev_pos = gf_list_count(new_tracks) - 1;
+		prev_num = tkw->track_num;
+	}
+	if (gf_list_count(new_tracks)!=count) {
+		gf_list_del(new_tracks);
+		return;
+	}
+	gf_list_del(ctx->tracks);
+	ctx->tracks = new_tracks;
+}
+
+
+static GF_Err mp4_mux_setup_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_true_pid)
+{
+	Bool use_m4sys = GF_FALSE;
+	Bool use_tx3g = GF_FALSE;
+	Bool use_webvtt = GF_FALSE;
+	Bool needs_track = GF_FALSE;
+	u32 needs_sample_entry = 0; //1: change of codecID, 2 change of decoder config
+	Bool use_gen_sample_entry = GF_FALSE;
+	Bool use_3gpp_config = GF_FALSE;
+	Bool use_ac3_entry = GF_FALSE;
+	Bool use_flac_entry = GF_FALSE;
+	Bool use_avc = GF_FALSE;
+	Bool use_hevc = GF_FALSE;
+	Bool use_hvt1 = GF_FALSE;
+	Bool use_av1 = GF_FALSE;
+	Bool use_vpX = GF_FALSE;
+	Bool use_mj2 = GF_FALSE;
+	Bool use_opus = GF_FALSE;
+	Bool use_dref = GF_FALSE;
+	Bool skip_dsi = GF_FALSE;
+	Bool is_text_subs = GF_FALSE;
+	Bool force_colr = GF_FALSE;
+	u32 m_subtype=0;
+	u32 m_subtype_alt_raw=0;
+	u32 raw_bitdepth=0;
+	u32 override_stype=0;
+	u32 width, height, sr, nb_chan, nb_bps, z_order, txt_fsize;
+	u64 ch_layout;
+	GF_Fraction fps, sar;
+	GF_List *multi_pid_stsd = NULL;
+	u32 multi_pid_idx = 0;
+	GF_FilterPid *orig_pid = NULL;
+	u32 codec_id;
+	u32 frames_per_sample_backup=0;
+	u32 is_nalu_backup = NALU_NONE;
+	Bool is_tile_base = GF_FALSE;
+	Bool unknown_generic = GF_FALSE;
+	u32 multi_pid_final_stsd_idx = 0;
+	u32 audio_pli=0;
+	Bool force_tk_layout = GF_FALSE;
+	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;
+	const char *src_url = NULL;
+	const char *meta_mime = NULL;
+	const char *meta_encoding = NULL;
+	const char *meta_config = NULL;
+	const char *meta_xmlns = NULL;
+	const char *meta_schemaloc = NULL;
+	const char *meta_auxmimes = NULL;
+	const char *meta_content_encoding = NULL;
+	char *txt_font = NULL;
+
+	u32 i, count, reuse_stsd = 0;
+	GF_Err e;
+	const GF_PropertyValue *dsi=NULL;
+	const GF_PropertyValue *enh_dsi=NULL;
+	const GF_PropertyValue *p;
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	GF_AudioSampleEntryImportMode ase_mode = ctx->ase;
+	TrackWriter *tkw;
+
+	if (ctx->owns_mov && !ctx->opid) {
+		char *dst;
+		ctx->opid = gf_filter_pid_new(filter);
+
+		dst = gf_filter_get_dst_name(filter);
+		if (dst) {
+			char *ext = gf_file_ext_start(dst);
+			if (ext && (!stricmp(ext, ".mov") || !stricmp(ext, ".qt")) ) {
+				ctx->make_qt = 1;
+			}
+			gf_free(dst);
+		}
+	}
+	//copy properties at init or reconfig
+	if (ctx->opid && is_true_pid) {
+		Bool found=GF_FALSE;
+		gf_filter_pid_copy_properties(ctx->opid, pid);
+		if (gf_list_count(ctx->tracks)>1)
+			gf_filter_pid_set_name(ctx->opid, "isobmf_mux");
+
+		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, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_UNFRAMED, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+		if (p) {
+			char *match = strstr(ISOM_FILE_EXT, p->value.string);
+			if (match) {
+				u32 slen = (u32) strlen(match);
+				if (!match[slen-1] || (match[slen-1]=='|'))
+					found = GF_TRUE;
+			}
+		}
+		if (!found)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("*") );
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		found = GF_FALSE;
+		if (p) {
+			char *match = strstr(ISOM_FILE_MIME, p->value.string);
+			if (match) {
+				u32 slen = (u32) strlen(match);
+				if (!match[slen-1] || (match[slen-1]=='|'))
+					found = GF_TRUE;
+			}
+		}
+		if (!found)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("*") );
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DASH_MODE, NULL);
+
+		switch (ctx->store) {
+		case MP4MX_MODE_FLAT:
+		case MP4MX_MODE_FASTSTART:
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_INSERT) );
+			break;
+		case MP4MX_MODE_INTER:
+		case MP4MX_MODE_TIGHT:
+			gf_filter_pid_allow_direct_dispatch(ctx->opid);
+			break;
+		}
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TILE_BASE);
+	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);
+		if (p) {
+			u32 j, count2;
+			GF_List *multi_tracks = p->value.ptr;
+			count = gf_list_count(multi_tracks);
+			for (i=0; i<count; i++) {
+				GF_FilterPid *a_ipid = gf_list_get(multi_tracks, i);
+				const GF_PropertyValue *a_pidid = gf_filter_pid_get_property(a_ipid, GF_PROP_PID_ID);
+				count2 = gf_list_count(ctx->tracks);
+				for (j=0; j<count2; j++) {
+					TrackWriter *atkw = gf_list_get(ctx->tracks, j);
+					const GF_PropertyValue *c_pidid = gf_filter_pid_get_property(atkw->ipid, GF_PROP_PID_ID);
+					if (gf_props_equal(a_pidid, c_pidid)) {
+						a_ipid = NULL;
+						break;
+					}
+				}
+				if (a_ipid)
+					mp4_mux_setup_pid(filter, a_ipid, GF_FALSE);
+			}
+		}
+	}
+
+	audio_pli = gf_isom_get_pl_indication(ctx->file, GF_ISOM_PL_AUDIO);
+
+	//new pid ?
+	tkw = gf_filter_pid_get_udta(pid);
+	if (!tkw) {
+		GF_FilterEvent evt;
+		GF_SAFEALLOC(tkw, TrackWriter);
+		if (!tkw) return GF_OUT_OF_MEM;
+		
+		gf_list_add(ctx->tracks, tkw);
+		tkw->ipid = pid;
+		tkw->fake_track = !is_true_pid;
+		if (is_true_pid) {
+			gf_filter_pid_set_udta(pid, tkw);
+
+#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);
+				gf_filter_pid_send_event(pid, &evt);
+			}
+			gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ITEM_ID);
+			if (p) {
+				tkw->is_item = GF_TRUE;
+			} else {
+				ctx->config_timing = GF_TRUE;
+				ctx->update_report = GF_TRUE;
+			}
+
+		}
+	}
+
+	//check change of pid config
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) {
+		if (p->value.uint!=tkw->dep_id) needs_track = GF_TRUE;
+		tkw->dep_id = p->value.uint;
+	}
+
+	//check change of pid config
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) {
+		if (p->value.uint!=tkw->codecid) needs_sample_entry = 1;
+		tkw->codecid = p->value.uint;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (p) {
+		u32 stype = p->value.uint;
+		if (tkw->is_encrypted && (p->value.uint==GF_STREAM_ENCRYPTED) ) {
+			stype = gf_codecid_type(tkw->codecid);
+		}
+		if (stype != tkw->stream_type) {
+			needs_track = GF_TRUE;
+			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;
+		tkw->cfg_crc = cfg_crc;
+	} else if (tkw->cfg_crc) {
+		tkw->cfg_crc = 0;
+		needs_sample_entry = 2;
+	}
+
+	enh_dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+	if (enh_dsi) {
+		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;
+		tkw->enh_cfg_crc = cfg_crc;
+	} else if (tkw->enh_cfg_crc) {
+		tkw->enh_cfg_crc = 0;
+		needs_sample_entry = 2;
+	}
+
+	//TODO: try to merge PPS/SPS for AVC and HEVC rather than creating a new sample description
+
+	switch (tkw->codecid) {
+	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_MPEG4_PART2:
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_HEVC:
+	case GF_CODECID_LHVC:
+		if (!dsi && !enh_dsi) return GF_OK;
+		break;
+	case GF_CODECID_APCH:
+	case GF_CODECID_APCO:
+	case GF_CODECID_APCN:
+	case GF_CODECID_APCS:
+	case GF_CODECID_AP4X:
+	case GF_CODECID_AP4H:
+		if (!ctx->make_qt) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MP4Mux] ProRes track detected, muxing to QTFF even though ISOBMFF was asked\n"));
+			ctx->make_qt = 2;
+		}
+		if (ctx->prores_track == tkw) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] More than one ProRes track detected, result might be non compliant\n"));
+		}
+		is_prores = GF_TRUE;
+		break;
+	default:
+		break;
+	}
+	if (!tkw->track_num) {
+		needs_sample_entry = 1;
+		needs_track = GF_TRUE;
+	}
+
+	if (ctx->make_qt) {
+		gf_isom_remove_root_od(ctx->file);
+		gf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_QT, 512);
+		gf_isom_reset_alt_brands(ctx->file);
+		tkw->has_brands = GF_TRUE;
+		ctx->major_brand_set = GF_ISOM_BRAND_QT;
+		ctx->btrt = GF_FALSE;
+
+		if (is_prores && !ctx->prores_track) {
+			ctx->prores_track = tkw;
+		}
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_URL);
+	if (p) src_url = p->value.string;
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	if (p) {
+		ctx->dash_mode = MP4MX_DASH_ON;
+		if (p->value.uint==2) {
+			e = mp4mx_setup_dash_vod(ctx, tkw);
+			if (e) return e;
+		}
+	}
+	//we consider that when muxing single segments, we are always in DASH, not VoD mode
+	else if (ctx->noinit) {
+		ctx->dash_mode = MP4MX_DASH_ON;
+	}
+
+	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->dash_mode)
+					ctx->fragdur = GF_FALSE;
+			}
+		} else if (ctx->dash_mode)
+			ctx->fragdur = GF_TRUE;
+	}
+
+	if (needs_track) {
+		if (ctx->init_movie_done) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Cannot add track to already finalized movie in fragmented file, will request a new muxer for that track\n"));
+			return GF_REQUIRES_NEW_INSTANCE;
+		}
+		if (tkw->is_item) {
+			needs_track = GF_FALSE;
+		}
+	}
+
+	if (needs_track) {
+		u32 tkid=0;
+		u32 tk_idx=0;
+		u32 mtype=0;
+		u32 target_timescale = 0;
+
+		if (ctx->make_qt && (tkw->stream_type==GF_STREAM_VISUAL)) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+			if (p) {
+				u32 ts=p->value.frac.num, inc=p->value.frac.den;
+				if (inc * 24000 == ts * 1001) target_timescale = 24000;
+				else if (inc * 2400 == ts * 100) target_timescale = 2400;
+				else if (inc * 2500 == ts * 100) target_timescale = 2500;
+				else if (inc * 30000 == ts * 1001) target_timescale = 30000;
+				else if (inc * 2997 == ts * 100) target_timescale = 30000;
+				else if (inc * 3000 == ts * 100) target_timescale = 3000;
+				else if (inc * 5000 == ts * 100) target_timescale = 5000;
+				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 ));
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+			}
+			if (!ctx->prores_track)
+				ctx->prores_track = tkw;
+		}
+
+		if (!ctx->moov_inserted) {
+			if (target_timescale) {
+				ctx->moovts = target_timescale;
+				gf_isom_set_timescale(ctx->file, target_timescale);
+			} else if (ctx->moovts>=0) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_MOVIE_TIME);
+				if (p && p->value.lfrac.den) {
+					gf_isom_set_timescale(ctx->file, (u32) p->value.lfrac.den);
+					ctx->moovts = (u32) p->value.lfrac.den;
+				} else {
+					gf_isom_set_timescale(ctx->file, ctx->moovts);
+				}
+			}
+			if (ctx->store==MP4MX_MODE_FASTSTART) {
+				gf_isom_make_interleave(ctx->file, ctx->cdur);
+			}
+		}
+
+		//assign some defaults
+		tkw->src_timescale = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (p) tkw->src_timescale = p->value.uint;
+
+		u32 mtimescale = 1000;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+		if (p) mtimescale = p->value.uint;
+		else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+			if (p && p->value.frac.den) mtimescale = p->value.frac.den;
+		}
+		if (!tkw->src_timescale) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] No timescale specified, guessing from media: %d\n", mtimescale));
+			tkw->src_timescale = mtimescale;
+		}
+		if (target_timescale) tkw->tk_timescale = target_timescale;
+		else if (ctx->mediats>0) tkw->tk_timescale = ctx->mediats;
+		else if (ctx->mediats<0) tkw->tk_timescale = mtimescale;
+		else tkw->tk_timescale = tkw->src_timescale;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+		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);
+		}
+		mtype = gf_isom_stream_type_to_media_type(tkw->stream_type, tkw->codecid);
+
+		if (ctx->moovts<0) {
+			ctx->moovts = tkw->tk_timescale;
+			gf_isom_set_timescale(ctx->file, (u32) ctx->moovts);
+		}
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_TRACK_INDEX);
+		if (p) {
+			tk_idx = p->value.uint;
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_TRACK_TEMPLATE);
+		if (ctx->tktpl && p && p->value.data.ptr) {
+			Bool udta_only = (ctx->tktpl==2) ? GF_TRUE : GF_FALSE;
+
+
+			tkw->track_num = gf_isom_new_track_from_template(ctx->file, tkid, mtype, tkw->tk_timescale, p->value.data.ptr, p->value.data.size, udta_only);
+			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);
+			}
+
+			if (!ctx->btrt) {
+				gf_isom_update_bitrate(ctx->file, tkw->track_num, 0, 0, 0, 0);
+			}
+		} else {
+			if (!mtype) {
+				mtype = GF_4CC('u','n','k','n');
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unable to find ISOM media type for stream type %s codec %s\n", gf_stream_type_name(tkw->stream_type), gf_codecid_name(tkw->codecid) ));
+			}
+			if (!tkid) tkid = tk_idx;
+
+			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);
+			}
+			//FIXME once we finally merge to filters, there is an old bug in isobmff initializing the width and height to 320x240 which breaks text import
+			//this should be removed and hashes regenerated
+			gf_isom_set_track_layout_info(ctx->file, tkw->track_num, 0, 0, 0, 0, 0);
+
+			if (!gf_sys_is_test_mode()) {
+				p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_URL);
+				if (tkw->track_num && p && p->value.string) {
+					char szHName[1025];
+					char *f = gf_file_basename(p->value.string);
+					szHName[1024]=0;
+					snprintf(szHName, 1024, "*%s@GPAC%s", f ? f : "", gf_gpac_version() );
+					gf_isom_set_handler_name(ctx->file, tkw->track_num, szHName);
+				}
+			}
+		}
+
+		if (!tkw->track_num) {
+			e = gf_isom_last_error(ctx->file);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to create new track: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->track_id = gf_isom_get_track_id(ctx->file, tkw->track_num);
+		tkw->next_is_first_sample = GF_TRUE;
+
+		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);
+		}
+
+		//if we have a subtype set for the pid, use it
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBTYPE);
+		if (p) gf_isom_set_media_type(ctx->file, tkw->track_num, p->value.uint);
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_HANDLER);
+		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_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);
+		}
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_SRC_MAGIC);
+		if (p) {
+			gf_isom_set_track_magic(ctx->file, tkw->track_num, p->value.longuint);
+		}
+		if (tk_idx) {
+			gf_isom_set_track_index(ctx->file, tkw->track_num, tk_idx, mp4mux_track_reorder, ctx);
+			mp4mux_reorder_tracks(ctx);
+		}
+
+		//by default use cttsv1 (negative ctts)
+		gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_TRUE);
+
+		p = ctx->make_qt ? NULL : gf_filter_pid_get_property(pid, GF_PROP_PID_PROFILE_LEVEL);
+		if (p) {
+			tkw->media_profile_level = p->value.uint;
+			if (tkw->stream_type == GF_STREAM_AUDIO) {
+				//patch to align old arch (IOD not written in dash) with new
+				if (!ctx->dash_mode) {
+					gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_AUDIO, p->value.uint);
+				}
+			} else if (tkw->stream_type == GF_STREAM_VISUAL) {
+				//patch to align old arch (IOD not written in dash) with new
+				if (!ctx->dash_mode) {
+					gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_VISUAL, p->value.uint);
+				}
+			}
+		}
+
+		if (ctx->mudta && gf_isom_get_track_count(ctx->file)==1) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_UDTA);
+			if (ctx->tktpl && p && p->value.data.ptr) {
+				gf_isom_load_extra_boxes(ctx->file, p->value.data.ptr, p->value.data.size, (ctx->mudta==2) ? GF_TRUE : GF_FALSE);
+			}
+		}
+
+		if (ctx->sgpd_traf)
+			gf_isom_set_sample_group_in_traf(ctx->file);
+
+		if (ctx->noroll) {
+			gf_isom_remove_sample_group(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_ROLL);
+		}
+
+
+		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) ) {
+				use_cache = GF_TRUE;
+			}
+
+			if (ctx->vodcache==MP4MX_VODCACHE_INSERT) {
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_INSERT) );
+			}
+			else if (!use_cache) {
+				gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_REPLACE) );
+			}
+		}
+	}
+
+	if (!tkw->has_brands) {
+		Bool is_isom = GF_FALSE;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_MBRAND);
+		if (p) {
+			if (!ctx->major_brand_set) {
+				gf_isom_set_brand_info(ctx->file, p->value.uint, 1);
+				ctx->major_brand_set = p->value.uint;
+			} else {
+				gf_isom_modify_alternate_brand(ctx->file, p->value.uint, GF_TRUE);
+			}
+			if (p->value.uint == GF_ISOM_BRAND_ISOM) is_isom = GF_TRUE;
+		}
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_BRANDS);
+		if (p && p->value.uint_list.nb_items) {
+			tkw->has_brands = GF_TRUE;
+			if (!ctx->major_brand_set) {
+				ctx->major_brand_set = p->value.uint_list.vals[0];
+				gf_isom_set_brand_info(ctx->file, p->value.uint_list.vals[0], 1);
+			}
+
+			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;
+			}
+		}
+		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;
+		}
+	}
+
+	width = height = sr = nb_chan = z_order = txt_fsize = 0;
+	nb_bps = 16;
+	ch_layout = 0;
+	fps.num = 25;
+	fps.den = 1;
+	sar.num = sar.den = 0;
+	codec_id = tkw->codecid;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MULTI_PID);
+	if (p) {
+		multi_pid_stsd = p->value.ptr;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DASH_MULTI_PID_IDX);
+		assert(p);
+		multi_pid_final_stsd_idx = p->value.uint;
+
+		//should never be the case
+		ctx->xps_inband = 0;
+		ctx->dref = GF_FALSE;
+		orig_pid = pid;
+		goto multipid_stsd_setup;
+	}
+
+
+	//WARNING !! from this point on until the goto multipid_stsd_setup, use pid and not tkw->ipid
+	//so that we setup the sample entry properly for each PIDs
+sample_entry_setup:
+
+	use_m4sys = ctx->m4sys;
+	use_gen_sample_entry = GF_TRUE;
+	use_dref = ctx->dref;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) width = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (p) height = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+	if (p) fps = p->value.frac;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+	if (p) sar = p->value.frac;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ZORDER);
+	if (p) z_order = 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) nb_chan = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_BPS);
+	if (p) nb_bps = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+	if (p) ch_layout = p->value.longuint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_LANGUAGE);
+	if (p) lang_name = p->value.string;
+
+	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;
+	}
+
+	//get our subtype
+	switch (codec_id) {
+	case GF_CODECID_MPEG_AUDIO:
+	case GF_CODECID_MPEG2_PART3:
+		m_subtype = GF_ISOM_SUBTYPE_MP3;
+		comp_name = "MP3";
+		break;
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+		m_subtype = GF_ISOM_SUBTYPE_MPEG4;
+		use_m4sys = GF_TRUE;
+		comp_name = "AAC";
+		use_gen_sample_entry = GF_FALSE;
+
+		if (ctx->importer) {
+			const char *pid_args = gf_filter_pid_get_args(pid);
+			if (pid_args) {
+				Bool sbr_i = strstr(pid_args, "sbr=imp") ? GF_TRUE : GF_FALSE;
+				Bool sbr_x = strstr(pid_args, "sbr=exp") ? GF_TRUE : GF_FALSE;
+				Bool ps_i = strstr(pid_args, "ps=imp") ? GF_TRUE : GF_FALSE;
+				Bool ps_x = strstr(pid_args, "ps=exp") ? GF_TRUE : GF_FALSE;
+
+				if (sbr_x) {
+					if (ps_i) imp_name = "AAC explicit SBR implict PS";
+					else if (ps_x) imp_name = "AAC explicit SBR+PS";
+					else imp_name = "AAC explicit SBR";
+				} else if (sbr_i) {
+					if (ps_i) imp_name = "AAC implicit SBR+PS";
+					else if (ps_x) imp_name = "AAC implicit SBR explicit PS";
+					else imp_name = "AAC implicit SBR";
+				} else {
+					if (ps_i) imp_name = "AAC implicit PS";
+					else if (ps_x) imp_name = "AAC explicit PS";
+					else imp_name = "AAC ";
+				}
+			}
+		}
+		break;
+	case GF_CODECID_JPEG:
+		m_subtype = GF_ISOM_BOX_TYPE_JPEG;
+		comp_name = "JPEG";
+		break;
+	case GF_CODECID_PNG:
+		m_subtype = GF_ISOM_BOX_TYPE_PNG;
+		comp_name = "PNG";
+		break;
+	case GF_CODECID_J2K:
+		m_subtype = GF_ISOM_BOX_TYPE_MJP2;
+		comp_name = "JPEG2000";
+		use_mj2 = GF_TRUE;
+		break;
+
+	case GF_CODECID_AMR:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_AMR;
+		comp_name = "AMR";
+		use_3gpp_config = GF_TRUE;
+		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;
+		}
+		break;
+	case GF_CODECID_AMR_WB:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_AMR_WB;
+		comp_name = "AMR-WB";
+		use_3gpp_config = GF_TRUE;
+		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;
+		}
+		break;
+	case GF_CODECID_EVRC:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_EVRC;
+		comp_name = "EVRC";
+		use_3gpp_config = GF_TRUE;
+		break;
+	case GF_CODECID_SMV:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_SMV;
+		comp_name = "SMV";
+		use_3gpp_config = GF_TRUE;
+		break;
+	case GF_CODECID_QCELP:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_QCELP;
+		comp_name = "QCELP";
+		use_3gpp_config = GF_TRUE;
+		break;
+	case GF_CODECID_S263:
+	case GF_CODECID_H263:
+		m_subtype = GF_ISOM_SUBTYPE_3GP_H263;
+		comp_name = "H263";
+		use_3gpp_config = GF_TRUE;
+		break;
+	case GF_CODECID_AC3:
+		m_subtype = GF_ISOM_SUBTYPE_AC3;
+		comp_name = "AC-3";
+		use_ac3_entry = GF_TRUE;
+		break;
+	case GF_CODECID_EAC3:
+		m_subtype = GF_ISOM_SUBTYPE_AC3;
+		comp_name = "EAC-3";
+		use_ac3_entry = GF_TRUE;
+		break;
+	case GF_CODECID_FLAC:
+		m_subtype = GF_ISOM_SUBTYPE_FLAC;
+		comp_name = "FLAC";
+		use_flac_entry = GF_TRUE;
+		break;
+	case GF_CODECID_OPUS:
+		m_subtype = GF_ISOM_SUBTYPE_OPUS;
+		comp_name = "Opus";
+		use_opus = GF_TRUE;
+		break;
+	case GF_CODECID_MPEG4_PART2:
+		m_subtype = GF_ISOM_SUBTYPE_MPEG4;
+		use_m4sys = GF_TRUE;
+		comp_name = "MPEG-4 Visual Part 2";
+		use_gen_sample_entry = GF_FALSE;
+		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;
+		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==1) 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;
+		use_hevc = GF_TRUE;
+		comp_name = (codec_id == GF_CODECID_LHVC) ? "L-HEVC" : "HEVC";
+		use_gen_sample_entry = 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;
+		}
+		break;
+	case GF_CODECID_HEVC_TILES:
+		m_subtype = GF_ISOM_SUBTYPE_HVT1;
+		skip_dsi = GF_TRUE;
+		use_hvt1 = GF_TRUE;
+		comp_name = "HEVC Tiles";
+		use_gen_sample_entry = GF_FALSE;
+		break;
+	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:
+		m_subtype = GF_ISOM_SUBTYPE_MPEG4;
+		use_m4sys = GF_TRUE;
+		comp_name = "MPEG-2 Video";
+		use_gen_sample_entry = GF_FALSE;
+		break;
+	case 0:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] muxing codecID %d not yet implemented - patch welcome\n", codec_id));
+		return GF_NOT_SUPPORTED;
+
+	case GF_ISOM_SUBTYPE_TX3G:
+		m_subtype = GF_ISOM_SUBTYPE_TX3G;
+		use_tx3g = GF_TRUE;
+		comp_name = "Timed Text";
+		is_text_subs = GF_TRUE;
+		break;
+	case GF_ISOM_SUBTYPE_WVTT:
+		m_subtype = GF_ISOM_SUBTYPE_WVTT;
+		use_webvtt = GF_TRUE;
+		comp_name = "WebVTT";
+		is_text_subs = GF_TRUE;
+		break;
+	case GF_CODECID_SUBPIC:
+		use_m4sys = GF_TRUE;
+		override_stype = GF_STREAM_ND_SUBPIC;
+		comp_name = "VobSub";
+		break;
+	case GF_CODECID_TEXT_MPEG4:
+		use_m4sys = GF_TRUE;
+		gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_MEDIA_SCENE);
+		comp_name = "MPEG4 Streaming Text";
+		break;
+	case GF_CODECID_AV1:
+		use_gen_sample_entry = GF_FALSE;
+		m_subtype = GF_ISOM_SUBTYPE_AV01;
+		use_av1 = GF_TRUE;
+		comp_name = "AOM AV1 Video";
+		break;
+
+	case GF_CODECID_VP8:
+		use_gen_sample_entry = GF_FALSE;
+		m_subtype = GF_ISOM_SUBTYPE_VP08;
+		use_vpX = GF_TRUE;
+		comp_name = "VP8 Video";
+		break;
+	case GF_CODECID_VP9:
+		use_gen_sample_entry = GF_FALSE;
+		m_subtype = GF_ISOM_SUBTYPE_VP09;
+		use_vpX = GF_TRUE;
+		comp_name = "VP9 Video";
+		break;
+	case GF_CODECID_VP10:
+		use_gen_sample_entry = GF_FALSE;
+		m_subtype = GF_ISOM_SUBTYPE_VP10;
+		use_vpX = GF_TRUE;
+		comp_name = "VP10 Video";
+		break;
+
+	case GF_CODECID_VORBIS:
+	case GF_CODECID_THEORA:
+		use_m4sys = GF_TRUE;
+		break;
+
+	case GF_CODECID_BIFS:
+/* ==  GF_CODECID_OD_V1:*/
+	case GF_CODECID_BIFS_V2:
+/*	== GF_CODECID_OD_V2:*/
+	case GF_CODECID_BIFS_EXTENDED:
+	case GF_CODECID_LASER:
+		use_m4sys = GF_TRUE;
+		break;
+
+	case GF_CODECID_RAW:
+		m_subtype = codec_id;
+		unknown_generic = GF_TRUE;
+		use_gen_sample_entry = GF_TRUE;
+		use_m4sys = GF_FALSE;
+		tkw->skip_bitrate_update = GF_TRUE;
+		if (tkw->stream_type == GF_STREAM_AUDIO) {
+			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) {
+			case GF_AUDIO_FMT_U8P:
+			 	req_non_planar_type = GF_AUDIO_FMT_U8;
+			case GF_AUDIO_FMT_U8:
+				m_subtype = GF_QT_SUBTYPE_RAW;
+				break;
+			case GF_AUDIO_FMT_S16P:
+			 	req_non_planar_type = GF_AUDIO_FMT_S16;
+			case GF_AUDIO_FMT_S16:
+				m_subtype = GF_QT_SUBTYPE_SOWT;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
+				break;
+			case GF_AUDIO_FMT_S24P:
+			 	req_non_planar_type = GF_AUDIO_FMT_S24;
+			case GF_AUDIO_FMT_S24:
+				m_subtype = GF_QT_SUBTYPE_IN24;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
+				break;
+			case GF_AUDIO_FMT_S32P:
+			 	req_non_planar_type = GF_AUDIO_FMT_S32P;
+			case GF_AUDIO_FMT_S32:
+				m_subtype = GF_QT_SUBTYPE_IN32;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_IPCM;
+				break;
+			case GF_AUDIO_FMT_FLTP:
+			 	req_non_planar_type = GF_AUDIO_FMT_FLTP;
+			case GF_AUDIO_FMT_FLT:
+				m_subtype = GF_QT_SUBTYPE_FL32;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				break;
+			case GF_AUDIO_FMT_DBLP:
+			 	req_non_planar_type = GF_AUDIO_FMT_DBL;
+			case GF_AUDIO_FMT_DBL:
+				m_subtype = GF_QT_SUBTYPE_FL64;
+				m_subtype_alt_raw = GF_ISOM_SUBTYPE_FPCM;
+				break;
+			default:
+				unknown_generic = GF_TRUE;
+				m_subtype = p->value.uint;
+				break;
+			}
+			if (req_non_planar_type) {
+				if (is_true_pid)
+					gf_filter_pid_negociate_property(pid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(GF_AUDIO_FMT_S16));
+				else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] raw audio format planar in DASH multi-stsd mode is not supported, try assigning a resampler before the dasher\n"));
+					return GF_NOT_SUPPORTED;
+				}
+			}
+			raw_bitdepth = gf_audio_fmt_bit_depth(p->value.uint);
+			tkw->raw_audio_bytes_per_sample = raw_bitdepth;
+			tkw->raw_audio_bytes_per_sample *= nb_chan;
+			tkw->raw_audio_bytes_per_sample /= 8;
+		}
+		else if (tkw->stream_type == GF_STREAM_VISUAL) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+			if (!p) break;
+			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:
+				unknown_generic = GF_TRUE;
+				m_subtype = p->value.uint;
+				break;
+			}
+		}
+		break;
+
+	default:
+		m_subtype = codec_id;
+		unknown_generic = GF_TRUE;
+		use_gen_sample_entry = GF_TRUE;
+		use_m4sys = GF_FALSE;
+		if (is_prores)
+			unknown_generic = GF_FALSE;
+
+		p = gf_filter_pid_get_property_str(pid, "meta:mime");
+		if (p) meta_mime = p->value.string;
+		p = gf_filter_pid_get_property_str(pid, "meta:encoding");
+		if (p) meta_encoding = p->value.string;
+		p = gf_filter_pid_get_property_str(pid, "meta:content_encoding");
+		if (p) meta_content_encoding = p->value.string;
+		p = gf_filter_pid_get_property_str(pid, "meta:xmlns");
+		if (p) meta_xmlns = p->value.string;
+		p = gf_filter_pid_get_property_str(pid, "meta:schemaloc");
+		if (p) meta_schemaloc = p->value.string;
+		p = gf_filter_pid_get_property_str(pid, "meta:aux_mimes");
+		if (p) meta_auxmimes = p->value.string;
+		break;
+	}
+	if (!comp_name) comp_name = gf_codecid_name(codec_id);
+	if (!comp_name) comp_name = gf_4cc_to_str(m_subtype);
+
+	if (dsi)
+		meta_config = dsi->value.data.ptr;
+
+	if (is_text_subs && !width && !height) {
+		mp4_mux_get_video_size(ctx, &width, &height);
+	}
+
+	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);
+		}
+		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);
+		}
+	}
+	if (!needs_sample_entry || tkw->is_item) {
+		goto sample_entry_done;
+	}
+
+	//we are fragmented, init movie done, we cannot update the sample description
+	if (ctx->init_movie_done) {
+		if (needs_sample_entry==1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot create a new sample description entry (codec change) for finalized movie in fragmented mode\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		force_mix_xps = GF_TRUE;
+	} else if (ctx->store < MP4MX_MODE_FRAG) {
+		if ((needs_sample_entry==2) && (ctx->xps_inband==2)) {
+			force_mix_xps = GF_TRUE;
+		}
+		else if ((needs_sample_entry==2) && ((ctx->xps_inband==1)||(ctx->xps_inband==3)) ) {
+			needs_sample_entry = 0;
+			make_inband_headers = GF_TRUE;
+		}
+	}
+	
+	if (force_mix_xps) {
+
+		//for AVC and HEVC, move to inband params if config changed
+		if (use_avc && dsi) {
+			if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
+
+			tkw->avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+
+			if (enh_dsi) {
+				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 (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;
+			}
+			mp4_mux_make_inband_header(ctx, tkw);
+			return GF_OK;
+		}
+		else if (use_hevc && dsi) {
+			if (tkw->hvcc) gf_odf_hevc_cfg_del(tkw->hvcc);
+			tkw->hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size,  (codec_id == GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+
+			if (enh_dsi) {
+				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 (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;
+			}
+			mp4_mux_make_inband_header(ctx, tkw);
+			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;
+	}
+
+
+	//little optim here: if no samples were added on the stream descritpion remove it
+	if (!tkw->samples_in_stsd && tkw->stsd_idx) {
+		gf_isom_remove_stream_description(ctx->file, tkw->track_num, tkw->stsd_idx);
+	}
+
+	if (!use_dref) src_url = NULL;
+
+	if (use_m4sys && !gf_codecid_oti(codec_id)) {
+		use_m4sys = GF_FALSE;
+	}
+	//nope, create sample entry
+	if (use_m4sys) {
+		GF_ESD *esd = gf_odf_desc_esd_new(2);
+		esd->decoderConfig->streamType = override_stype ? override_stype : tkw->stream_type;
+		esd->decoderConfig->objectTypeIndication = gf_codecid_oti(codec_id);
+		if (!esd->decoderConfig->objectTypeIndication) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Codec %s does not have an official MPEG-4 systems mapping, cannot mux\n", gf_codecid_name(codec_id) ));
+			return GF_NOT_SUPPORTED;
+
+		}
+		esd->slConfig->timestampResolution = tkw->tk_timescale;
+		if (dsi && !skip_dsi) {
+			esd->decoderConfig->decoderSpecificInfo->data = dsi->value.data.ptr;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = dsi->value.data.size;
+		}
+
+		e = gf_isom_new_mpeg4_description(ctx->file, tkw->track_num, esd, (char *)src_url, NULL, &tkw->stsd_idx);
+		if (dsi && !skip_dsi) {
+			esd->decoderConfig->decoderSpecificInfo->data = NULL;
+			esd->decoderConfig->decoderSpecificInfo->dataLength = 0;
+		}
+		gf_odf_desc_del((GF_Descriptor *) esd);
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new MPEG-4 Systems sample description for stream type %d OTI %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_IN_IOD);
+		if (p && p->value.boolean)
+			gf_isom_add_track_to_root_od(ctx->file, tkw->track_num);
+
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (dsi && (tkw->stream_type==GF_STREAM_AUDIO)) {
+			GF_M4ADecSpecInfo acfg;
+			gf_m4a_get_config(dsi->value.data.ptr, dsi->value.data.size, &acfg);
+			audio_pli = acfg.audioPL;
+		}
+		//patch to align old arch (IOD not written in dash) with new
+		if (audio_pli && !ctx->dash_mode)
+			gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_AUDIO, audio_pli);
+#endif
+
+	} else if (use_avc) {
+		if (tkw->avcc) gf_odf_avc_cfg_del(tkw->avcc);
+
+		//not yet known
+		if (!dsi) return GF_OK;
+
+		tkw->avcc = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+
+		if (needs_sample_entry) {
+
+			if (tkw->codecid == GF_CODECID_SVC) {
+				e = gf_isom_svc_config_new(ctx->file, tkw->track_num, tkw->avcc, NULL, NULL, &tkw->stsd_idx);
+			} else {
+				e = gf_isom_avc_config_new(ctx->file, tkw->track_num, tkw->avcc, NULL, NULL, &tkw->stsd_idx);
+			}
+
+			if (!e && enh_dsi) {
+				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 (tkw->svcc) {
+					e = gf_isom_svc_config_update(ctx->file, tkw->track_num, tkw->stsd_idx, tkw->svcc, GF_TRUE);
+					if (e) {
+						gf_odf_avc_cfg_del(tkw->svcc);
+						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 (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new AVC sample description: %s\n", gf_error_to_string(e) ));
+				return e;
+			}
+		}
+		
+		if (ctx->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;
+		} else {
+			gf_odf_avc_cfg_del(tkw->avcc);
+			tkw->avcc = NULL;
+		}
+		//patch to align old arch with filters
+		if (!ctx->dash_mode && !ctx->make_qt && !gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ISOM_TREX_TEMPLATE) )
+			gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_VISUAL, 0x7F);
+
+		if (!tkw->has_brands)
+			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_AVC1, GF_TRUE);
+
+		tkw->is_nalu = NALU_AVC;
+
+		tkw->use_dref = GF_FALSE;
+
+	} else if (use_hvt1) {
+		if (tkw->hvcc) gf_odf_hevc_cfg_del(tkw->hvcc);
+		tkw->hvcc = gf_odf_hevc_cfg_new();
+		e = gf_isom_hevc_config_new(ctx->file, tkw->track_num, tkw->hvcc, NULL, NULL, &tkw->stsd_idx);
+		if (!e) {
+			gf_isom_hevc_set_tile_config(ctx->file, tkw->track_num, tkw->stsd_idx, NULL, GF_FALSE);
+		}
+		gf_odf_hevc_cfg_del(tkw->hvcc);
+		tkw->hvcc = NULL;
+		tkw->is_nalu = NALU_HEVC;
+		tkw->use_dref = GF_FALSE;
+		if (!tkw->has_brands)
+			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_HVTI, GF_TRUE);
+	} else if (use_hevc) {
+		if (tkw->hvcc) gf_odf_hevc_cfg_del(tkw->hvcc);
+
+		if (!dsi && !enh_dsi) {
+			//not yet known
+			return GF_OK;
+		}
+		if (dsi) {
+			tkw->hvcc = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size,  (codec_id == GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE);
+		} else {
+			tkw->hvcc = gf_odf_hevc_cfg_new();
+		}
+		tkw->is_nalu = NALU_HEVC;
+
+		if (needs_sample_entry) {
+			e = gf_isom_hevc_config_new(ctx->file, tkw->track_num, tkw->hvcc, 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 && enh_dsi) {
+				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 (tkw->lvcc) {
+					e = gf_isom_lhvc_config_update(ctx->file, tkw->track_num, tkw->stsd_idx, tkw->lvcc, dsi ? GF_ISOM_LEHVC_WITH_BASE_BACKWARD : GF_ISOM_LEHVC_ONLY);
+					if (e) {
+						gf_odf_hevc_cfg_del(tkw->lvcc);
+						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);
+					}
+				}
+			} else if (codec_id == GF_CODECID_LHVC) {
+				gf_isom_lhvc_config_update(ctx->file, tkw->track_num, tkw->stsd_idx, tkw->hvcc, GF_ISOM_LEHVC_ONLY);
+			} else if (is_tile_base) {
+				gf_isom_lhvc_config_update(ctx->file, tkw->track_num, tkw->stsd_idx, tkw->hvcc, GF_ISOM_HEVC_TILE_BASE);
+			}
+			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 (dsi && ctx->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);
+		} else {
+			gf_odf_hevc_cfg_del(tkw->hvcc);
+			tkw->hvcc = NULL;
+		}
+
+		tkw->use_dref = GF_FALSE;
+
+	} else if (use_av1) {
+		GF_AV1Config *av1c;
+
+		if (!dsi) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] No decoder specific info found for AV1\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		av1c = gf_odf_av1_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (!av1c) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to parser AV1 decoder specific info\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		e = gf_isom_av1_config_new(ctx->file, tkw->track_num, av1c, (char *) src_url, NULL, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new AV1 sample description: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->is_av1 = GF_TRUE;
+
+		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);
+			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_AV01, GF_TRUE);
+		}
+
+		gf_odf_av1_cfg_del(av1c);
+	} else if (use_vpX) {
+		GF_VPConfig *vpc;
+
+		if (!dsi) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] No decoder specific info found for %s\n", gf_4cc_to_str(codec_id) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		vpc = gf_odf_vp_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (!vpc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to parser %s decoder specific info\n", gf_4cc_to_str(codec_id)));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		e = gf_isom_vp_config_new(ctx->file, tkw->track_num, vpc, (char *) src_url, NULL, &tkw->stsd_idx, m_subtype);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new %s sample description: %s\n", gf_4cc_to_str(codec_id), gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->is_vpx = GF_TRUE;
+		gf_odf_vp_cfg_del(vpc);
+	} else if (use_3gpp_config) {
+		GF_3GPConfig gpp_cfg;
+		memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
+		gpp_cfg.type = m_subtype;
+		gpp_cfg.vendor = GF_VENDOR_GPAC;
+
+		if (use_dref) {
+			gpp_cfg.frames_per_sample  = 1;
+		} else {
+			gpp_cfg.frames_per_sample = ctx->pack3gp;
+			if (!gpp_cfg.frames_per_sample) gpp_cfg.frames_per_sample  = 1;
+			else if (gpp_cfg.frames_per_sample >15) gpp_cfg.frames_per_sample = 15;
+		}
+		gpp_cfg.AMR_mode_set = tkw->amr_mode_set;
+		if (tkw->stream_type==GF_STREAM_VISUAL) {
+			/*FIXME - we need more in-depth parsing of the bitstream to detect P3@L10 (streaming wireless)*/
+			gpp_cfg.H263_profile = 0;
+			gpp_cfg.H263_level = 10;
+			gpp_cfg.frames_per_sample = 0;
+		}
+		tkw->nb_frames_per_sample = gpp_cfg.frames_per_sample;
+
+		e = gf_isom_3gp_config_new(ctx->file, tkw->track_num, &gpp_cfg, (char *) src_url, NULL, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new 3GPP audio sample description for stream type %d codecid %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+
+		if (!tkw->has_brands) {
+			switch (gpp_cfg.type) {
+			case GF_ISOM_SUBTYPE_3GP_QCELP:
+			case GF_ISOM_SUBTYPE_3GP_EVRC:
+			case GF_ISOM_SUBTYPE_3GP_SMV:
+				gf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_3G2A, 65536);
+				break;
+			case GF_ISOM_SUBTYPE_3GP_H263:
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_3GG6, GF_TRUE);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_3GG5, GF_TRUE);
+				break;
+			}
+		}
+		tkw->skip_bitrate_update = GF_TRUE;
+	} else if (use_ac3_entry) {
+		GF_AC3Config ac3cfg;
+		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);
+		}
+		e = gf_isom_ac3_config_new(ctx->file, tkw->track_num, &ac3cfg, (char *)src_url, NULL, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new AC3 audio sample description for stream type %d codecid %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+	} else if (use_flac_entry) {
+		e = gf_isom_flac_config_new(ctx->file, tkw->track_num, dsi ? dsi->value.data.ptr : NULL, dsi ? dsi->value.data.size : 0, (char *)src_url, NULL, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new FLAC audio sample description for stream type %d codecid %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+	} else if (use_opus) {
+		GF_OpusSpecificBox *opus_cfg = NULL;
+		GF_BitStream *bs;
+
+		if (!dsi) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] No decoder specific info found for opus\n" ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		bs = gf_bs_new(dsi->value.data.ptr, dsi->value.data.size, GF_BITSTREAM_READ);
+		e = gf_isom_box_parse((GF_Box**)&opus_cfg, bs);
+		gf_bs_del(bs);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error parsing opus configuration data: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+
+		e = gf_isom_opus_config_new(ctx->file, tkw->track_num, opus_cfg, (char *)src_url, NULL, &tkw->stsd_idx);
+		if (opus_cfg) gf_isom_box_del((GF_Box*)opus_cfg);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new AC3 audio sample description for stream type %d codecid %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+	} else if (m_subtype == GF_ISOM_SUBTYPE_METX) {
+		comp_name = "XML Metadata";
+		e = gf_isom_new_xml_metadata_description(ctx->file, tkw->track_num, meta_xmlns, meta_schemaloc, meta_encoding, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new METX sample description: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+	} else if (m_subtype == GF_ISOM_SUBTYPE_METT) {
+		comp_name = "Text Metadata";
+		e = gf_isom_new_stxt_description(ctx->file, tkw->track_num, GF_ISOM_SUBTYPE_METT, meta_mime, meta_encoding, meta_config, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new METT sample description: %s\n", gf_error_to_string(e) ));
+			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";
+		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;
+		}
+	} 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);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new %s sample description: %s\n", gf_4cc_to_str(m_subtype), gf_error_to_string(e) ));
+			return e;
+		}
+		if (m_subtype == GF_ISOM_SUBTYPE_STXT) force_tk_layout = GF_TRUE;
+	} else if (use_tx3g) {
+		GF_TextSampleDescriptor *txtc;
+		if (!dsi) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] No decoder specific info found for TX3G\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		txtc = gf_odf_tx3g_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (!txtc) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to parse TX3G config\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		if (!txtc->default_pos.right) txtc->default_pos.right = width + txtc->default_pos.left;
+		if (!txtc->default_pos.bottom) txtc->default_pos.bottom = height + txtc->default_pos.top;
+
+
+		e = gf_isom_new_text_description(ctx->file, tkw->track_num, txtc, NULL, NULL, &tkw->stsd_idx);
+		if (e) {
+			gf_odf_desc_del((GF_Descriptor *)txtc);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new %s sample description: %s\n", gf_4cc_to_str(m_subtype), gf_error_to_string(e) ));
+			return e;
+		}
+		if (ctx->importer) {
+			txt_fsize = txtc->default_style.font_size;
+			if (txtc->font_count && txtc->fonts[0].fontName) txt_font = gf_strdup(txtc->fonts[0].fontName);
+		}
+		gf_odf_desc_del((GF_Descriptor *)txtc);
+
+		tkw->skip_bitrate_update = GF_TRUE;
+	} else if (use_webvtt) {
+		e = gf_isom_new_webvtt_description(ctx->file, tkw->track_num, NULL, NULL, &tkw->stsd_idx, dsi ? dsi->value.data.ptr : NULL);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new %s sample description: %s\n", gf_4cc_to_str(m_subtype), gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->skip_bitrate_update = GF_TRUE;
+	} else if (use_mj2) {
+		e = gf_isom_new_mj2k_description(ctx->file, tkw->track_num, NULL, NULL, &tkw->stsd_idx, dsi ? dsi->value.data.ptr : NULL, dsi ? dsi->value.data.size : 0);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new %s sample description: %s\n", gf_4cc_to_str(m_subtype), gf_error_to_string(e) ));
+			return e;
+		}
+	} else if (codec_id==GF_CODECID_TMCD) {
+		u32 tmcd_flags=0, tmcd_fps_num=0, tmcd_fps_den=0;
+		s32 tmcd_fpt=0;
+
+		p = gf_filter_pid_get_property_str(pid, "tmcd:flags");
+		if (p) tmcd_flags = p->value.uint;
+		p = gf_filter_pid_get_property_str(pid, "tmcd:framerate");
+		if (p) {
+			tmcd_fps_num = p->value.frac.num;
+			tmcd_fps_den = p->value.frac.den;
+		}
+		p = gf_filter_pid_get_property_str(pid, "tmcd:frames_per_tick");
+		if (p) tmcd_fpt = p->value.uint;
+		if (tkw->tk_timescale != tmcd_fps_num) {
+			tmcd_fps_den *= tmcd_fps_num;
+			tmcd_fps_den /= tkw->tk_timescale;
+		}
+
+		e = gf_isom_tmcd_config_new(ctx->file, tkw->track_num, tmcd_fps_num, tmcd_fps_den, tmcd_fpt, (tmcd_flags & 0x1), (tmcd_flags & 0x8), &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new tmcd sample description: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+	} else if (codec_id==GF_CODECID_DIMS) {
+		GF_DIMSDescription dims_c;
+		memset(&dims_c, 0, sizeof(GF_DIMSDescription));
+		dims_c.contentEncoding = meta_content_encoding;
+		dims_c.mime_type = meta_mime;
+		dims_c.textEncoding = meta_encoding;
+		dims_c.xml_schema_loc = meta_xmlns;
+
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:profile");
+		if (p) dims_c.profile = p->value.uint;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:level");
+		if (p) dims_c.level = p->value.uint;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:pathComponents");
+		if (p) dims_c.pathComponents = p->value.uint;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:fullRequestHost");
+		if (p) dims_c.fullRequestHost = p->value.uint;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:streamType");
+		if (p) dims_c.streamType = p->value.boolean;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:redundant");
+		if (p) dims_c.containsRedundant = p->value.uint;
+		p = gf_filter_pid_get_property_str(tkw->ipid, "dims:scriptTypes");
+		if (p) dims_c.content_script_types = p->value.string;
+
+		e = gf_isom_new_dims_description(ctx->file, tkw->track_num, &dims_c, NULL, NULL, &tkw->stsd_idx);
+		if (e) {
+			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 (use_gen_sample_entry) {
+		u8 isor_ext_buf[14];
+		u32 len = 0;
+		GF_GenericSampleDescription udesc;
+		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
+
+		if (!comp_name) comp_name = "Unknown";
+		len = (u32) strlen(comp_name);
+		if (len>32) len = 32;
+		udesc.compressor_name[0] = len;
+		memcpy(udesc.compressor_name+1, comp_name, len);
+		if ((codec_id==GF_CODECID_RAW) || unknown_generic)
+			udesc.vendor_code = GF_4CC('G','P','A','C');
+
+		udesc.samplerate = sr;
+		udesc.nb_channels = nb_chan;
+		if (codec_id==GF_CODECID_RAW) {
+			if (ase_mode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG) {
+				m_subtype = m_subtype_alt_raw;
+				udesc.extension_buf_size = 14;
+				udesc.extension_buf = isor_ext_buf;
+				memset(isor_ext_buf, 0, sizeof(u8)*14);
+				isor_ext_buf[3] = 14;
+				isor_ext_buf[4] = 'p';
+				isor_ext_buf[5] = 'c';
+				isor_ext_buf[6] = 'm';
+				isor_ext_buf[7] = 'C';
+				isor_ext_buf[12] = 1; //little endian only for now
+				isor_ext_buf[13] = raw_bitdepth; //little endian only for now
+			} else {
+				udesc.is_qtff = GF_TRUE;
+				udesc.version = 1;
+				ase_mode = GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF;
+			}
+		}
+		udesc.codec_tag = m_subtype;
+		udesc.width = width;
+		udesc.height = height;
+		if (width) {
+			udesc.v_res = 72;
+			udesc.h_res = 72;
+			udesc.depth = 24;
+		}
+		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) ));
+		}
+		
+		e = gf_isom_new_generic_sample_description(ctx->file, tkw->track_num, (char *)src_url, NULL, &udesc, &tkw->stsd_idx);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error creating new sample description for stream type %d codecid %d: %s\n", tkw->stream_type, codec_id, gf_error_to_string(e) ));
+			return e;
+		}
+		tkw->use_dref = src_url ? GF_TRUE : GF_FALSE;
+	} else {
+		assert(0);
+	}
+
+	if (ctx->btrt && !tkw->skip_bitrate_update) {
+		u32 avg_rate, max_rate, dbsize;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_BITRATE);
+		avg_rate = p ? p->value.uint : 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MAXRATE);
+		max_rate = p ? p->value.uint : 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DBSIZE);
+		dbsize = p ? p->value.uint : 0;
+
+		if (avg_rate && max_rate) {
+			gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, avg_rate, max_rate, dbsize);
+		}
+	} else {
+		gf_isom_update_bitrate(ctx->file, tkw->track_num, tkw->stsd_idx, 0, 0, 0);
+	}
+
+multipid_stsd_setup:
+	if (multi_pid_stsd) {
+		if (multi_pid_idx<gf_list_count(multi_pid_stsd)) {
+
+			if (multi_pid_final_stsd_idx == multi_pid_idx) {
+				frames_per_sample_backup = tkw->nb_frames_per_sample;
+				is_nalu_backup = tkw->is_nalu;
+			}
+			pid = gf_list_get(multi_pid_stsd, multi_pid_idx);
+			multi_pid_idx ++;
+			//reload codecID, decoder config and enhancement decoder config
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+			if (p) codec_id = p->value.uint;
+			dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+			enh_dsi = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+			//force stsd idx to be 0 to avoid removing the stsd
+			tkw->stsd_idx = 0;
+			goto sample_entry_setup;
+		}
+		tkw->stsd_idx = multi_pid_final_stsd_idx;
+		//restore input pid
+		pid = orig_pid;
+		codec_id = tkw->codecid;
+
+		tkw->is_nalu = is_nalu_backup;
+		tkw->nb_frames_per_sample = frames_per_sample_backup;
+	}
+
+
+	//final opt: we couldn't detect before if the same stsd was possible, now that we have create a new one, check again
+	if (needs_sample_entry) {
+		reuse_stsd = 0;
+		//don't try to reuse STSDs in multi STSD setup for DASH
+		if (multi_pid_stsd) count = 0;
+		else count = gf_isom_get_sample_description_count(ctx->file, tkw->track_num);
+		for (i=0; i<count; i++) {
+			if (i+1 == tkw->stsd_idx) continue;
+
+			if (gf_isom_is_same_sample_description(ctx->file, tkw->track_num, tkw->stsd_idx, ctx->file, tkw->track_num, i+1) ) {
+				gf_isom_remove_stream_description(ctx->file, tkw->track_num, tkw->stsd_idx);
+				tkw->stsd_idx = i+1;
+				reuse_stsd = 1;
+				break;
+			}
+		}
+		if (!reuse_stsd) {
+			tkw->samples_in_stsd = 0;
+		} else if (use_3gpp_config && tkw->amr_mode_set) {
+			GF_3GPConfig *gpp_cfg = gf_isom_3gp_config_get(ctx->file, tkw->track_num, tkw->stsd_idx);
+			if (gpp_cfg->AMR_mode_set != tkw->amr_mode_set) {
+				gpp_cfg->AMR_mode_set = tkw->amr_mode_set;
+				gf_isom_3gp_config_update(ctx->file, tkw->track_num, gpp_cfg, tkw->stsd_idx);
+			}
+			gf_free(gpp_cfg);
+		}
+	}
+
+	if (tkw->is_encrypted) {
+		const char *scheme_uri=NULL;
+		const char *kms_uri=NULL;
+		u32 scheme_version=0;
+		u32 scheme_type = 0;
+		Bool is_sel_enc = GF_FALSE;
+		u32 KI_length=0;
+		u32 IV_length=0;
+		/*todo !*/
+		const char *oma_contentID=0;
+		u32 oma_encryption_type=0;
+		u64 oma_plainTextLength=0;
+		const char *oma_textual_headers=NULL;
+		u32 textual_headers_len=0;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+		if (p) scheme_type = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
+		if (p) scheme_version = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_SCHEME_URI);
+		if (p) scheme_uri = p->value.string;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PROTECTION_KMS_URI);
+		if (p) kms_uri = p->value.string;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISMA_SELECTIVE_ENC);
+		if (p) is_sel_enc = p->value.boolean;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISMA_IV_LENGTH);
+		if (p) IV_length = p->value.uint;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISMA_KI_LENGTH);
+		if (p) KI_length = p->value.uint;
+
+		tkw->scheme_type = scheme_type;
+		switch (scheme_type) {
+		case GF_ISOM_ISMACRYP_SCHEME:
+			gf_isom_set_ismacryp_protection(ctx->file, tkw->track_num, tkw->stsd_idx, scheme_type, scheme_version, (char *) scheme_uri, (char *) kms_uri, is_sel_enc, KI_length, IV_length);
+			break;
+		case GF_ISOM_OMADRM_SCHEME:
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_OMA_CRYPT_TYPE);
+			if (p) oma_encryption_type = p->value.uint;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_OMA_CID);
+			if (p) oma_contentID = p->value.string;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_OMA_TXT_HDR);
+			if (p) oma_textual_headers = p->value.string;
+			if (oma_textual_headers) textual_headers_len = (u32) strlen(oma_textual_headers);
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_OMA_CLEAR_LEN);
+			if (p) oma_plainTextLength = p->value.longuint;
+			gf_isom_set_oma_protection(ctx->file, tkw->track_num, tkw->stsd_idx, (char *) oma_contentID, (char*) kms_uri, oma_encryption_type, oma_plainTextLength, (char*)oma_textual_headers, textual_headers_len,
+                                  is_sel_enc, KI_length, IV_length);
+
+			break;
+		case GF_ISOM_ADOBE_SCHEME:
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ADOBE_CRYPT_META);
+			gf_isom_set_adobe_protection(ctx->file, tkw->track_num, tkw->stsd_idx, scheme_type, 1/*scheme_version*/, 1/*is_sel_enc*/,p ? p->value.data.ptr : NULL, p ? p->value.data.size : 0);
+			break;
+		case GF_ISOM_PIFF_SCHEME:
+		case GF_ISOM_CENC_SCHEME:
+		case GF_ISOM_CENS_SCHEME:
+		case GF_ISOM_CBC_SCHEME:
+		case GF_ISOM_CBCS_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) ));
+			switch (tkw->stream_type) {
+			case GF_STREAM_VISUAL:
+				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCV);
+				break;
+			case GF_STREAM_AUDIO:
+				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCA);
+				break;
+			case GF_STREAM_TEXT:
+				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCT);
+				break;
+			case GF_STREAM_FONT:
+				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCF);
+				break;
+			default:
+				gf_isom_set_media_type(ctx->file, tkw->track_num, GF_ISOM_BOX_TYPE_ENCS);
+				break;
+			}
+			gf_isom_set_generic_protection(ctx->file, tkw->track_num, tkw->stsd_idx, scheme_type, scheme_version, (char*)scheme_uri, (char*)kms_uri);
+		}
+	} else {
+		//in case we used track template
+		gf_isom_remove_samp_enc_box(ctx->file, tkw->track_num);
+		gf_isom_remove_samp_group_box(ctx->file, tkw->track_num);
+	}
+
+	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);
+	} else if (codec_id==GF_CODECID_HEVC_TILES) {
+		mp4_mux_write_track_refs(ctx, tkw, "isom:tbas", GF_ISOM_REF_TBAS);
+	}
+
+	if (is_true_pid && ctx->dash_mode && is_tile_base) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MULTI_TRACK);
+		if (p) {
+			GF_List *multi_tracks = p->value.ptr;
+			count = gf_list_count(multi_tracks);
+			for (i=0; i<count; i++) {
+				GF_FilterPid *a_ipid = gf_list_get(multi_tracks, i);
+				mp4_mux_setup_pid(filter, a_ipid, GF_FALSE);
+			}
+		}
+	}
+
+	if (width) {
+		if (ctx->ccst) {
+			e = gf_isom_set_image_sequence_coding_constraints(ctx->file, tkw->track_num, tkw->stsd_idx, GF_FALSE, GF_FALSE, GF_TRUE, 15);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set coding constraints parameter: %s\n", gf_error_to_string(e) ));
+			}
+		}
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ALPHA);
+		if (p && p->value.boolean) {
+			e = gf_isom_set_image_sequence_alpha(ctx->file, tkw->track_num, tkw->stsd_idx, GF_FALSE);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set alpha config: %s\n", gf_error_to_string(e) ));
+			}
+		}
+	}
+
+sample_entry_done:
+	if (!tkw->is_item) {
+		if (ctx->maxchunk)
+			gf_isom_hint_max_chunk_size(ctx->file, tkw->track_num, ctx->maxchunk);
+
+		if (sr) {
+			if (use_flac_entry) {
+				while (sr>65535) {
+					u32 val = sr/2;
+					if (val*2 != sr) {
+						sr=65535;
+						break;
+					}
+					sr = val;
+				}
+			}
+			gf_isom_set_audio_info(ctx->file, tkw->track_num, tkw->stsd_idx, sr, nb_chan, nb_bps, ctx->make_qt ? GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF : ase_mode);
+			if ((m_subtype==GF_ISOM_SUBTYPE_IPCM) || (m_subtype==GF_ISOM_SUBTYPE_FPCM)) {
+				GF_AudioChannelLayout layout;
+				memset(&layout, 0, sizeof(GF_AudioChannelLayout));
+				layout.stream_structure = 1;
+				layout.channels_count = nb_chan;
+				if (ch_layout)
+					layout.definedLayout = gf_audio_fmt_get_cicp_from_layout(ch_layout);
+				else
+					layout.definedLayout = gf_audio_fmt_get_cicp_layout(nb_chan, 0, 0);
+				gf_isom_set_audio_layout(ctx->file, tkw->track_num, tkw->stsd_idx, &layout);
+			}
+		}
+		else if (width) {
+			u32 colour_type=0;
+			u16 colour_primaries=0, transfer_characteristics=0, matrix_coefficients=0;
+			Bool full_range_flag=GF_FALSE;
+
+			gf_isom_set_visual_info(ctx->file, tkw->track_num, tkw->stsd_idx, width, height);
+			if (sar.den) {
+				if (sar.num != sar.den) {
+					gf_isom_set_pixel_aspect_ratio(ctx->file, tkw->track_num, tkw->stsd_idx, sar.num, sar.den, GF_FALSE);
+					width = width * sar.num / sar.den;
+				}
+				//old importer did not set PASP for
+				else if (!gf_sys_old_arch_compat() || (codec_id!=GF_CODECID_MPEG4_PART2) ) {
+					gf_isom_set_pixel_aspect_ratio(ctx->file, tkw->track_num, tkw->stsd_idx, 1, 1, GF_TRUE);
+				}
+			}
+
+			gf_isom_set_track_layout_info(ctx->file, tkw->track_num, width<<16, height<<16, 0, 0, z_order);
+			if (codec_id==GF_CODECID_HEVC_TILES) {
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_ORIG_SIZE);
+				if (p) {
+					gf_isom_set_track_layout_info(ctx->file, tkw->track_num, p->value.vec2i.x<<16, p->value.vec2i.y<<16, 0, 0, z_order);
+				}
+			}
+
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_COLR_PRIMARIES);
+			if (p) colour_primaries = p->value.uint;
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_COLR_TRANSFER);
+			if (p) transfer_characteristics = p->value.uint;
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_COLR_MX);
+			if (p) matrix_coefficients = p->value.uint;
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_COLR_RANGE);
+			if (p) full_range_flag = p->value.boolean;
+
+			if ((ctx->prores_track == tkw) || force_colr) {
+				//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);
+				} 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) {
+						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_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);
+				}
+
+				if (ctx->prores_track == tkw) {
+					u32 chunk_size;
+					if ((width<=720) && (height<=576)) chunk_size = 2000000;
+					else chunk_size = 4000000;
+					gf_isom_hint_max_chunk_size(ctx->file, tkw->track_num, chunk_size);
+				}
+			} else {
+				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','x'), colour_primaries, transfer_characteristics, matrix_coefficients, full_range_flag, NULL, 0);
+				}
+
+			}
+		}
+		//default for old arch
+		else if (force_tk_layout
+			|| (use_m4sys && (tkw->stream_type==GF_STREAM_VISUAL) && !width && !height)
+		)  {
+			gf_isom_set_track_layout_info(ctx->file, tkw->track_num, 320<<16, 240<<16, 0, 0, 0);
+		}
+
+		if (lang_name) gf_isom_set_media_language(ctx->file, tkw->track_num, (char*)lang_name);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ISOM_STSD_TEMPLATE);
+		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 (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";
+#endif
+		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));
+		} 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));
+			} 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));
+
+			}
+		} 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));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("%s %s\n", dst_type, imp_name));
+		}
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (tkw->svcc) {
+			AVCState avc;
+			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);
+				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);
+				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 ));
+
+				}
+			}
+		}
+#endif
+
+	}
+	if (txt_font) gf_free(txt_font);
+	if (!ctx->xps_inband || tkw->is_item) {
+		if (tkw->svcc) {
+			gf_odf_avc_cfg_del(tkw->svcc);
+			tkw->svcc = NULL;
+		}
+		if (tkw->lvcc) {
+			gf_odf_hevc_cfg_del(tkw->lvcc);
+			tkw->lvcc = NULL;
+		}
+	} else if (needs_sample_entry || make_inband_headers) {
+		mp4_mux_make_inband_header(ctx, tkw);
+	}
+
+	tkw->negctts_shift = 0;
+	tkw->probe_min_ctts = GF_FALSE;
+	if (is_true_pid && !tkw->nb_samples && !tkw->is_item) {
+		Bool use_negccts = GF_FALSE;
+		s64 moffset=0;
+		ctx->config_timing = GF_TRUE;
+		ctx->update_report = GF_TRUE;
+
+		//if we have an edit list (due to track template) only providing media offset, trash it
+		if (!gf_isom_get_edit_list_type(ctx->file, tkw->track_num, &moffset)) {
+			gf_isom_remove_edits(ctx->file, tkw->track_num);
+		}
+		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 {
+					gf_isom_set_edit(ctx->file, tkw->track_num, 0, 0, -p->value.sint, GF_ISOM_EDIT_NORMAL);
+				}
+			} else if (p->value.sint > 0) {
+				s64 dur = p->value.sint;
+				dur *= (u32) ctx->moovts;
+				dur /= tkw->src_timescale;
+				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;
+		}
+		if (use_negccts) {
+			gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_TRUE);
+
+			if (!tkw->has_brands) {
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO4, GF_TRUE);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISOM, GF_FALSE);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO1, GF_FALSE);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO2, GF_FALSE);
+				gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO3, GF_FALSE);
+			}
+
+			tkw->negctts_shift = (tkw->ts_delay<0) ? -tkw->ts_delay : 0;
+		} else {
+			//this will remove any cslg in the track due to template
+			gf_isom_set_composition_offset_mode(ctx->file, tkw->track_num, GF_FALSE);
+		}
+	}
+	return GF_OK;
+}
+
+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)
+{
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		TrackWriter *tkw = gf_filter_pid_get_udta(pid);
+		if (tkw) {
+			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);
+		}
+		return GF_OK;
+	}
+	return mp4_mux_setup_pid(filter, pid, GF_TRUE);
+}
+
+static Bool mp4_mux_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (evt->base.on_pid && (evt->base.type==GF_FEVT_INFO_UPDATE) ) {
+		TrackWriter *tkw = gf_filter_pid_get_udta(evt->base.on_pid);
+		if (tkw) {
+			GF_PropertyEntry *pe=NULL;
+			const GF_PropertyValue *p;
+			p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_DOWN_BYTES, &pe);
+			if (p) tkw->down_bytes = p->value.longuint;
+
+			p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_DOWN_SIZE, &pe);
+			if (p) tkw->down_size = p->value.longuint;
+
+			gf_filter_release_property(pe);
+		}
+
+		return GF_FALSE;
+	}
+	if (!evt->base.on_pid && (evt->base.type==GF_FEVT_STOP) ) {
+		if (ctx->file && ctx->owns_mov) {
+			mp4_mux_done(filter, ctx, GF_TRUE);
+		}
+	}
+	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
+		ctx->force_play = GF_TRUE;
+		if (evt->play.speed<0)
+			ctx->is_rewind = GF_TRUE;
+		return GF_FALSE;
+	}
+	//by default don't cancel event - to rework once we have downloading in place
+	return GF_FALSE;
+}
+
+enum
+{
+	CENC_CONFIG=0,
+	CENC_ADD_NORMAL,
+	CENC_ADD_FRAG,
+};
+
+static void mp4_mux_cenc_insert_pssh(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	bin128 *keyIDs=NULL;
+	u32 max_keys = 0;
+	u32 i, nb_pssh;
+
+	//set pssh
+	const GF_PropertyValue *p = 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++) {
+		bin128 sysID;
+		u32 j, kid_count, version=0;
+		char *data;
+		u32 len;
+
+		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);
+
+		if (kid_count>=max_keys) {
+			max_keys = kid_count;
+			keyIDs = gf_realloc(keyIDs, sizeof(bin128)*max_keys);
+		}
+		for (j=0; j<kid_count; j++) {
+			gf_bs_read_data(ctx->bs_r, keyIDs[j], 16);
+		}
+		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);
+		gf_bs_skip_bytes(ctx->bs_r, len);
+	}
+	if (keyIDs) gf_free(keyIDs);
+}
+
+static GF_Err mp4_mux_cenc_update(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck, u32 act_type, u32 pck_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 scheme_type=0;
+	u32 scheme_version=0;
+	char *sai = NULL;
+	u32 sai_size = 0;
+	Bool needs_seig = GF_FALSE;
+	u32 sample_num;
+
+	if (tkw->cenc_state == CENC_SETUP_ERROR)
+		return GF_SERVICE_ERROR;
+
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_PATTERN);
+	if (p) {
+		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);
+		if (p) {
+			sai = p->value.data.ptr;
+			sai_size = p->value.data.size;
+		}
+	}
+
+
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+	if (p) scheme_type = p->value.uint;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PROTECTION_SCHEME_VERSION);
+	if (p) scheme_version = p->value.uint;
+
+	//initial setup
+	if (tkw->cenc_state==CENC_NEED_SETUP) {
+		u32 cenc_stsd_mode=0;
+		u32 container_type = GF_ISOM_BOX_TYPE_SENC;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_STSD_MODE);
+		if (p) cenc_stsd_mode = p->value.uint;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ENCRYPTED);
+		if (p) pck_is_encrypted = p->value.boolean;
+		else pck_is_encrypted = GF_FALSE;
+
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_CENC_STORE);
+		if (p && p->value.uint) container_type = p->value.uint;
+
+		tkw->clear_stsd_idx = 0;
+		if (cenc_stsd_mode) {
+			u32 clone_stsd_idx;
+			e = gf_isom_clone_sample_description(ctx->file, tkw->track_num, ctx->file, tkw->track_num, tkw->stsd_idx, NULL, NULL, &clone_stsd_idx);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to clone sample description: %s\n", gf_error_to_string(e) ));
+				return e;
+			}
+			//before
+			if (cenc_stsd_mode==1) {
+				tkw->clear_stsd_idx = tkw->stsd_idx;
+				tkw->stsd_idx = clone_stsd_idx;
+			}
+			//after
+			else {
+				tkw->clear_stsd_idx = clone_stsd_idx;
+			}
+		}
+
+		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);
+		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;
+			return e;
+		}
+
+		if (ctx->psshs == MP4MX_PSSH_MOOV)
+			mp4_mux_cenc_insert_pssh(ctx, tkw);
+
+		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));
+
+		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 (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;
+				return e;
+			}
+		}
+	}
+	if (act_type==CENC_CONFIG) return GF_OK;
+
+	pck_is_encrypted = GF_FALSE;
+	if (pck)
+		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)
+		sample_num = tkw->samples_in_frag + 1;
+	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);
+			} 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);
+			}
+		} 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);
+			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;
+
+		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);
+			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);
+		}
+	}
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample encryption group entry: %s)\n", gf_error_to_string(e) ));
+		return e;
+	}
+
+	if (!sai) {
+		if (tkw->constant_IV_size && !tkw->cenc_subsamples)
+			return GF_OK;
+		sai_size = pck_size;
+	}
+
+	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);
+		} else {
+			e = gf_isom_fragment_set_cenc_sai(ctx->file, tkw->track_id, 0, NULL, 0, GF_FALSE, ctx->saio32);
+		}
+		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);
+		} 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);
+		}
+		if (e) return e;
+	}
+
+	return GF_OK;
+}
+
+
+static GF_Err mp4_mux_process_sample(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck, Bool for_fragment)
+{
+	GF_Err e=GF_OK;
+	u64 cts, prev_dts;
+	u32 prev_size=0;
+	u32 duration = 0;
+	u32 timescale = 0;
+	const GF_PropertyValue *subs;
+	GF_FilterSAPType sap_type;
+	u8 dep_flags;
+	Bool insert_subsample_dsi = GF_FALSE;
+	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);
+
+	ctx->update_report = GF_TRUE;
+	ctx->total_bytes_in += tkw->sample.dataLength;
+	ctx->total_samples++;
+
+	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 ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		} else {
+			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 += min_pck_dur;
+			} else {
+				tkw->sample.DTS = cts;
+			}
+		}
+	} else {
+		tkw->sample.CTS_Offset = (s32) ((s64) cts - (s64) tkw->sample.DTS);
+	}
+
+	//tkw->ts_shift is in source timescale, apply it before rescaling TSs/duration
+	if (tkw->ts_shift) {
+		if (ctx->is_rewind) {
+			if (tkw->sample.DTS <= tkw->ts_shift) {
+				tkw->sample.DTS = tkw->ts_shift - tkw->sample.DTS;
+				cts = tkw->ts_shift - cts;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] broken timing in track, initial ts "LLU" less than TS "LLU"\n", tkw->ts_shift, tkw->sample.DTS));
+			}
+		} else {
+			if (tkw->sample.DTS >= tkw->ts_shift) {
+				tkw->sample.DTS -= tkw->ts_shift;
+				cts -= tkw->ts_shift;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] broken timing in track, initial ts "LLU" gretaer than TS "LLU"\n", tkw->ts_shift, tkw->sample.DTS));
+			}
+		}
+	}
+
+	duration = gf_filter_pck_get_duration(pck);
+	if (timescale != tkw->tk_timescale) {
+		s64 ctso;
+		tkw->sample.DTS *= tkw->tk_timescale;
+		tkw->sample.DTS /= timescale;
+		ctso = (s64) tkw->sample.CTS_Offset;
+		ctso *= tkw->tk_timescale;
+		ctso /= timescale;
+		tkw->sample.CTS_Offset = (s32) ctso;
+		duration *= tkw->tk_timescale;
+		duration /= timescale;
+	}
+
+
+	tkw->sample.IsRAP = 0;
+	sap_type = gf_filter_pck_get_sap(pck);
+	if (sap_type==GF_FILTER_SAP_1)
+		tkw->sample.IsRAP = SAP_TYPE_1;
+	else if ( (sap_type == GF_FILTER_SAP_4) && (tkw->stream_type != GF_STREAM_VISUAL) )
+		tkw->sample.IsRAP = SAP_TYPE_1;
+
+	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_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 ));
+
+		tkw->dts_patch = prev_dts - tkw->sample.DTS;
+		tkw->sample.DTS += tkw->dts_patch;
+	}
+
+
+	if (tkw->negctts_shift)
+		tkw->sample.CTS_Offset -= tkw->negctts_shift;
+
+	if (tkw->probe_min_ctts) {
+		s32 diff = (s32) ((s64) cts - (s64) tkw->sample.DTS);
+		if (diff < tkw->min_neg_ctts)
+			tkw->min_neg_ctts = diff;
+	}
+	if (tkw->sample.CTS_Offset) tkw->has_ctts = GF_TRUE;
+
+	if (tkw->sample.CTS_Offset < tkw->min_neg_ctts)
+		tkw->min_neg_ctts = tkw->sample.CTS_Offset;
+
+	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->cenc_state && tkw->clear_stsd_idx && !gf_filter_pck_get_crypt_flags(pck)) {
+		sample_desc_index = tkw->clear_stsd_idx;
+	}
+
+	if (tkw->use_dref) {
+		u64 data_offset = gf_filter_pck_get_byte_offset(pck);
+		if (data_offset != GF_FILTER_NO_BO) {
+			e = gf_isom_add_sample_reference(ctx->file, tkw->track_num, sample_desc_index, &tkw->sample, data_offset);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to add sample DTS "LLU" as reference: %s\n", tkw->sample.DTS, gf_error_to_string(e) ));
+			}
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot add sample reference at DTS "LLU" , input sample data is not continous in source\n", tkw->sample.DTS ));
+		}
+	} else if (tkw->nb_frames_per_sample && (tkw->nb_samples % tkw->nb_frames_per_sample)) {
+		if (for_fragment) {
+		 	e = gf_isom_fragment_append_data(ctx->file, tkw->track_id, tkw->sample.data, tkw->sample.dataLength, 0);
+		} else {
+			e = gf_isom_append_sample_data(ctx->file, tkw->track_num, tkw->sample.data, tkw->sample.dataLength);
+		}
+		tkw->has_append = GF_TRUE;
+		if (e) {
+			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) {
+			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->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;
+				}
+			} 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 (au_delim) {
+				tkw->sample.data = au_delim;
+				tkw->sample.dataLength = au_delim_size;
+				pck_data += au_delim_size;
+				pck_data_len -= au_delim_size;
+			}
+
+			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);
+				}
+				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);
+				}
+				if (!e) e = gf_isom_append_sample_data(ctx->file, tkw->track_num, pck_data, pck_data_len);
+			}
+			insert_subsample_dsi = GF_TRUE;
+		} 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 {
+			e = gf_isom_add_sample(ctx->file, tkw->track_num, sample_desc_index, &tkw->sample);
+			if (!e && !duration) {
+				gf_isom_set_last_sample_duration(ctx->file, tkw->track_num, 0);
+			}
+		}
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to add sample DTS "LLU" - prev DTS "LLU": %s\n", tkw->sample.DTS, prev_dts, gf_error_to_string(e) ));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] added sample DTS "LLU" - prev DTS "LLU" - prev size %d\n", tkw->sample.DTS, prev_dts, prev_size));
+		}
+
+		if (!e && tkw->cenc_state) {
+			e = mp4_mux_cenc_update(ctx, tkw, pck, for_fragment ? CENC_ADD_FRAG : CENC_ADD_NORMAL, tkw->sample.dataLength);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample CENC information: %s\n", gf_error_to_string(e) ));
+			}
+		}
+	}
+
+	tkw->nb_samples++;
+	tkw->samples_in_stsd++;
+	tkw->samples_in_frag++;
+
+	if (e) return e;
+
+	//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) ));
+		}
+		tkw->has_open_gop = GF_TRUE;
+	}
+	if (!ctx->noroll) {
+		if ((sap_type==4) || tkw->has_gdr) {
+			s16 roll = gf_filter_pck_get_roll_info(pck);
+			if (for_fragment) {
+				e = gf_isom_fragment_set_sample_roll_group(ctx->file, tkw->track_id, tkw->samples_in_frag, (sap_type==4) ? GF_TRUE : GF_FALSE, roll);
+			} else {
+				e = gf_isom_set_sample_roll_group(ctx->file, tkw->track_num, tkw->nb_samples, (sap_type==4) ? GF_TRUE : GF_FALSE, roll);
+			}
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Failed to set sample DTS "LLU" SAP 4 roll %s in roll group: %s\n", tkw->sample.DTS, roll, gf_error_to_string(e) ));
+			}
+			tkw->has_gdr = GF_TRUE;
+		}
+	}
+	
+	if (subs) {
+		//if no AUDelim nal and inband header injection, push new subsample
+		if (!first_nal_is_audelim && insert_subsample_dsi) {
+			if (for_fragment) {
+				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, 0, tkw->inband_hdr_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);
+			}
+			insert_subsample_dsi = GF_FALSE;
+		}
+
+		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);
+
+		while (gf_bs_available(ctx->bs_r)) {
+			u32 flags = gf_bs_read_u32(ctx->bs_r);
+			u32 subs_size = gf_bs_read_u32(ctx->bs_r);
+			u32 reserved = gf_bs_read_u32(ctx->bs_r);
+			u8 priority = gf_bs_read_u8(ctx->bs_r);
+			u8 discardable = gf_bs_read_u8(ctx->bs_r);
+
+			if (for_fragment) {
+				gf_isom_fragment_add_subsample(ctx->file, tkw->track_id, flags, subs_size, priority, reserved, discardable);
+			} else {
+				gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, flags, subs_size, priority, reserved, discardable);
+			}
+
+			//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 (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);
+				} else {
+					gf_isom_add_subsample(ctx->file, tkw->track_num, tkw->nb_samples, 0, tkw->inband_hdr_size, 0, 0, 0);
+				}
+				insert_subsample_dsi = GF_FALSE;
+			}
+		}
+	}
+
+	dep_flags = gf_filter_pck_get_dependency_flags(pck);
+	if (dep_flags) {
+		u32 is_leading = (dep_flags>>6) & 0x3;
+		u32 depends_on = (dep_flags>>4) & 0x3;
+		u32 depended_on = (dep_flags>>2) & 0x3;
+		u32 redundant = (dep_flags) & 0x3;
+		if (for_fragment) {
+			gf_isom_fragment_set_sample_flags(ctx->file, tkw->track_id, is_leading, depends_on, depended_on, redundant);
+		} else {
+			gf_isom_set_sample_flags(ctx->file, tkw->track_num, tkw->nb_samples, is_leading, depends_on, depended_on, redundant);
+		}
+	}
+
+
+	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) {
+		Bool abort = GF_FALSE;
+		if (ctx->idur.num>0) {
+			u64 mdur = gf_isom_get_media_duration(ctx->file, tkw->track_num);
+
+			/*patch to align to old arch */
+			if (gf_sys_old_arch_compat() && (tkw->stream_type==GF_STREAM_VISUAL)) {
+				mdur = tkw->sample.DTS;
+			}
+
+			if (ctx->importer) {
+				tkw->prog_done = mdur * ctx->idur.den;
+				tkw->prog_total =  ((u64)tkw->tk_timescale) * ctx->idur.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)
+					abort = GF_TRUE;
+			} else {
+				if (mdur * (u64) ctx->idur.den >= tkw->tk_timescale * (u64) ctx->idur.num)
+					abort = GF_TRUE;
+			}
+		} else {
+			if ((s32) tkw->nb_samples >= -ctx->idur.num)
+				abort = GF_TRUE;
+		}
+
+		if (abort) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_STOP, tkw->ipid);
+			gf_filter_pid_send_event(tkw->ipid, &evt);
+
+			tkw->aborted = GF_TRUE;
+		}
+	} else if (ctx->importer) {
+		if (tkw->nb_frames) {
+			tkw->prog_done = tkw->nb_samples;
+			tkw->prog_total = tkw->nb_frames;
+		} else {
+			u64 data_offset = gf_filter_pck_get_byte_offset(pck);
+			if (data_offset == GF_FILTER_NO_BO) {
+				data_offset = tkw->down_bytes;
+			}
+			if ((data_offset != GF_FILTER_NO_BO) && tkw->down_size) {
+				tkw->prog_done = data_offset;
+				tkw->prog_total = tkw->down_size;
+			} else {
+				if (tkw->pid_dur.den && tkw->pid_dur.num) {
+					tkw->prog_done = tkw->sample.DTS * tkw->pid_dur.den;
+					tkw->prog_total = tkw->pid_dur.num * tkw->tk_timescale;
+				} else {
+					tkw->prog_done = 0;
+					tkw->prog_total = 1;
+				}
+
+			}
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err mp4_mux_process_item(GF_MP4MuxCtx *ctx, TrackWriter *tkw, GF_FilterPacket *pck)
+{
+	GF_Err e;
+	u32 meta_type, item_id, size, item_type, nb_items, media_brand;
+	GF_ImageItemProperties image_props;
+	const char *data, *item_name=NULL;
+	const GF_PropertyValue *p, *dsi, *dsi_enh;
+	GF_Box *config_box = NULL;
+
+
+	if (ctx->init_movie_done) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot add item to a finalized movie, not supported\n"));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (tkw->stream_type != GF_STREAM_VISUAL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot add item other than visual, not supported - use MP4Box for this\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	ctx->update_report = GF_TRUE;
+
+	meta_type = gf_isom_get_meta_type(ctx->file, GF_TRUE, 0);
+	if (!meta_type) {
+		e = gf_isom_set_meta_type(ctx->file, GF_TRUE, 0, GF_META_ITEM_TYPE_PICT);
+	} else if (meta_type != GF_META_ITEM_TYPE_PICT) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] File already has a root 'meta' box of type %s\n", gf_4cc_to_str(meta_type)));
+		e= GF_BAD_PARAM;
+	} else {
+		e = GF_OK;
+	}
+	if (e) return e;
+
+	data = (char *)gf_filter_pck_get_data(pck, &size);
+	if (!data) {
+		if (gf_filter_pck_get_frame_interface(pck)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot add items from raw decoder outputs, not supported\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		return GF_OK;
+	}
+	ctx->total_bytes_in += size;
+	ctx->total_samples++;
+
+
+	item_id = 0;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ITEM_ID);
+	if (p) item_id = p->value.uint;
+
+	item_name = "Image";
+	p = gf_filter_pid_get_property_str(tkw->ipid, "meta:name");
+	if (p && p->value.string) item_name = p->value.string;
+
+	memset(&image_props, 0, sizeof(GF_ImageItemProperties));
+
+	dsi = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DECODER_CONFIG);
+	dsi_enh = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+
+	switch (tkw->codecid) {
+	case GF_CODECID_AVC:
+	case GF_ISOM_SUBTYPE_SVC_H264:
+	case GF_ISOM_SUBTYPE_MVC_H264:
+		if (!dsi) return GF_OK;
+
+		if (tkw->codecid==GF_CODECID_AVC) {
+			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
+			item_type = GF_ISOM_SUBTYPE_AVC_H264;
+		} else if (tkw->codecid==GF_CODECID_MVC) {
+			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_MVCC);
+			item_type = GF_ISOM_SUBTYPE_MVC_H264;
+			if (dsi_enh) dsi = dsi_enh;
+		} else {
+			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
+			item_type = GF_ISOM_SUBTYPE_SVC_H264;
+			if (dsi_enh) dsi = dsi_enh;
+		}
+
+		((GF_AVCConfigurationBox *)config_box)->config = gf_odf_avc_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+		if (! ((GF_AVCConfigurationBox *)config_box)->config) return GF_NON_COMPLIANT_BITSTREAM;
+
+		image_props.num_channels = 3;
+		image_props.bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+		image_props.bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		image_props.bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		media_brand = GF_ISOM_BRAND_AVCI;
+		break;
+
+	case GF_CODECID_HEVC:
+	case GF_CODECID_HEVC_TILES:
+	case GF_CODECID_LHVC:
+		if (tkw->codecid == GF_CODECID_LHVC) {
+			if (dsi_enh) dsi = dsi_enh;
+			if (!dsi) return GF_OK;
+		}
+		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+
+		if (dsi_enh) {
+			((GF_HEVCConfigurationBox *)config_box)->config = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_TRUE);
+			item_type = GF_ISOM_SUBTYPE_LHV1;
+		} else {
+			if ((tkw->codecid == GF_CODECID_HEVC) && !dsi) return GF_OK;
+
+			((GF_HEVCConfigurationBox *)config_box)->config = gf_odf_hevc_cfg_read(dsi->value.data.ptr, dsi->value.data.size, GF_FALSE);
+			item_type = (tkw->codecid == GF_CODECID_HEVC_TILES) ? GF_ISOM_SUBTYPE_HVT1 : GF_ISOM_SUBTYPE_HVC1;
+		}
+		if (! ((GF_HEVCConfigurationBox *)config_box)->config) {
+			if ((tkw->codecid != GF_CODECID_HEVC_TILES) && !dsi) return GF_NON_COMPLIANT_BITSTREAM;
+		} else {
+			image_props.num_channels = 3;
+			image_props.bits_per_channel[0] = ((GF_HEVCConfigurationBox *)config_box)->config->luma_bit_depth;
+			image_props.bits_per_channel[1] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+			image_props.bits_per_channel[2] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		}
+		media_brand = GF_ISOM_BRAND_HEIC;
+		if (tkw->codecid==GF_CODECID_LHVC) {
+			media_brand = GF_ISOM_BRAND_HEIM;
+		}
+		break;
+	case GF_CODECID_AV1:
+		if (!dsi) return GF_OK;
+
+		config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AV1C);
+		((GF_AV1ConfigurationBox *)config_box)->config = gf_odf_av1_cfg_read(dsi->value.data.ptr, dsi->value.data.size);
+
+		if (! ((GF_AV1ConfigurationBox *)config_box)->config) return GF_NON_COMPLIANT_BITSTREAM;
+
+		item_type = GF_ISOM_SUBTYPE_AV01;
+		u8 depth = ((GF_AV1ConfigurationBox *)config_box)->config->high_bitdepth ? (((GF_AV1ConfigurationBox *)config_box)->config->twelve_bit ? 12 : 10 ) : 8;
+		if (((GF_AV1ConfigurationBox *)config_box)->config->monochrome) {
+			image_props.num_channels = 1;
+			image_props.bits_per_channel[0] = depth;
+			image_props.bits_per_channel[1] = 0;
+			image_props.bits_per_channel[2] = 0;
+		} else {
+			image_props.num_channels = 3;
+			image_props.bits_per_channel[0] = depth;
+			image_props.bits_per_channel[1] = depth;
+			image_props.bits_per_channel[2] = depth;
+		}
+		media_brand = GF_ISOM_BRAND_AVIF;
+		break;
+	case GF_CODECID_JPEG:
+		item_type = GF_ISOM_SUBTYPE_JPEG;
+		media_brand = GF_ISOM_SUBTYPE_JPEG /* == GF_4CC('j', 'p', 'e', 'g') */;
+		break;
+	case GF_CODECID_J2K:
+		item_type = GF_ISOM_SUBTYPE_JP2K;
+		media_brand = GF_4CC('j', '2', 'k', 'i');
+		break;
+	case GF_CODECID_PNG:
+		item_type = GF_ISOM_SUBTYPE_PNG;
+		//not defined !
+		media_brand = GF_ISOM_SUBTYPE_PNG /* == GF_4CC('j', 'p', 'e', 'g') */;
+		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;
+	}
+
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_WIDTH);
+	if (p) image_props.width = p->value.uint;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_HEIGHT);
+	if (p) image_props.height = p->value.uint;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_ALPHA);
+	if (p) image_props.alpha = p->value.boolean;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_SAR);
+	if (p) {
+		image_props.hSpacing = p->value.frac.num;
+		image_props.vSpacing = p->value.frac.den;
+	} else {
+		image_props.hSpacing = image_props.vSpacing = 1;
+	}
+	image_props.config = config_box;
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_HIDDEN);
+	if (p) image_props.hidden = p->value.boolean;
+
+	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);
+
+	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);
+	tkw->item_id = item_id;
+
+	p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_PRIMARY_ITEM);
+	if (p && p->value.boolean) {
+		e = gf_isom_set_meta_primary_item(ctx->file, GF_TRUE, 0, item_id);
+		if (e) return e;
+	}
+	//if primary item is not set, assign one
+	else if (! gf_isom_get_meta_primary_item_id(ctx->file, GF_TRUE, 0)) {
+		e = gf_isom_set_meta_primary_item(ctx->file, GF_TRUE, 0, item_id);
+		if (e) return e;
+	}
+
+	if (!ctx->major_brand_set) {
+		gf_isom_set_brand_info(ctx->file, GF_ISOM_BRAND_MIF1, 0);
+		gf_isom_reset_alt_brands(ctx->file);
+		ctx->major_brand_set = 2;
+	}
+	if (media_brand && (ctx->major_brand_set==2)) {
+		gf_isom_modify_alternate_brand(ctx->file, media_brand, 1);
+	}
+#if 0
+	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);
+	}
+#endif
+	return GF_OK;
+}
+
+static void mp4mux_send_output(GF_MP4MuxCtx *ctx)
+{
+	if (ctx->dst_pck) {
+		if (ctx->notify_filename) {
+			gf_filter_pck_set_framing(ctx->dst_pck, GF_TRUE, GF_FALSE);
+			gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->cur_file_idx_plus_one-1) );
+			if (ctx->cur_file_suffix) {
+				gf_filter_pck_set_property(ctx->dst_pck, GF_PROP_PCK_FILESUF, &PROP_STRING_NO_COPY(ctx->cur_file_suffix) );
+				ctx->cur_file_suffix = NULL;
+			}
+			ctx->notify_filename = 0;
+		}
+		gf_filter_pck_send(ctx->dst_pck);
+		ctx->dst_pck = NULL;
+	}
+}
+
+
+static void mp4_mux_flush_frag(GF_MP4MuxCtx *ctx, Bool is_init, u64 idx_start_range, u64 idx_end_range)
+{
+	GF_FilterEvent evt;
+	TrackWriter *tkw = NULL;
+
+	if (ctx->dst_pck) {
+		if (!ctx->single_file) {
+			Bool s, e;
+			gf_filter_pck_get_framing(ctx->dst_pck, &s, &e);
+			gf_filter_pck_set_framing(ctx->dst_pck, s, GF_TRUE);
+			ctx->first_pck_sent = GF_FALSE;
+			ctx->current_offset = 0;
+		}
+		if (is_init) {
+			gf_filter_pck_set_dependency_flags(ctx->dst_pck, 0xFF);
+			gf_filter_pck_set_carousel_version(ctx->dst_pck, 1);
+		}
+		mp4mux_send_output(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;
+		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;
+		}
+		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;
+		//changing file
+		if (ctx->seg_name) {
+			ctx->first_pck_sent = GF_FALSE;
+		}
+	}
+}
+
+
+static GF_Err mp4_mux_initialize_movie(GF_MP4MuxCtx *ctx)
+{
+	GF_Err e;
+	u32 i, count = gf_list_count(ctx->tracks);
+	TrackWriter *ref_tkw = NULL;
+	u64 min_dts = 0;
+	u32 min_dts_scale=0;
+	u32 def_fake_dur=0;
+	u32 def_fake_scale=0;
+#ifdef GF_ENABLE_CTRN
+	u32 traf_inherit_base_id=0;
+#endif
+	u32 nb_segments=0;
+	GF_Fraction64 max_dur;
+	ctx->single_file = GF_TRUE;
+	ctx->current_offset = ctx->current_size = 0;
+	max_dur.den = 1;
+	max_dur.num = 0;
+
+	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;
+	}
+
+	//make sure we have one sample from each PID. This will trigger potential pending reconfigure
+	//for filters updating the PID caps before the first packet dispatch
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *p;
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		GF_FilterPacket *pck;
+		if (tkw->fake_track) continue;
+
+		pck = gf_filter_pid_get_packet(tkw->ipid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(tkw->ipid)) continue;
+			return GF_OK;
+		}
+
+		if (!ctx->dash_mode && !ctx->cur_file_idx_plus_one) {
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (p) {
+				ctx->cur_file_idx_plus_one = p->value.uint + 1;
+				if (!ctx->cur_file_suffix) {
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+					if (p && p->value.string) ctx->cur_file_suffix = gf_strdup(p->value.string);
+				}
+				ctx->notify_filename = GF_TRUE;
+			}
+		}
+
+		if (tkw->cenc_state==CENC_NEED_SETUP) {
+			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0);
+		}
+
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+		if (p && strlen(p->value.string)) ctx->single_file = GF_FALSE;
+
+		def_fake_dur = gf_filter_pck_get_duration(pck);
+		def_fake_scale = tkw->src_timescale;
+
+		p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_DURATION);
+		if (p && p->value.lfrac.num>0 && p->value.lfrac.den) {
+			tkw->pid_dur = p->value.lfrac;
+			if (max_dur.num * (s64) p->value.lfrac.den < (s64) max_dur.den * p->value.lfrac.num) {
+				max_dur.num = p->value.lfrac.num;
+				max_dur.den = p->value.lfrac.den;
+			}
+		}
+#ifdef GF_ENABLE_CTRN
+		if (tkw->codecid==GF_CODECID_HEVC)
+			traf_inherit_base_id = tkw->track_id;
+#endif
+	}
+	//good to go, finalize for fragments
+	for (i=0; i<count; i++) {
+		u32 def_pck_dur;
+		u32 def_is_rap;
+		u32 inherit_traf_from_track = 0;
+		u64 dts;
+		const GF_PropertyValue *p;
+
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+
+		if (tkw->fake_track) {
+			if (def_fake_scale) {
+				def_pck_dur = def_fake_dur;
+				def_pck_dur *= tkw->src_timescale;
+				def_pck_dur /= def_fake_scale;
+			} else {
+				def_pck_dur = 0;
+			}
+		} else {
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(tkw->ipid);
+			//can be null if eos
+			if (pck) {
+				u32 tscale;
+				//otherwise setup fragmentation, using first sample desc as default idx
+				//first pck dur as default
+				def_pck_dur = gf_filter_pck_get_duration(pck);
+
+				dts = gf_filter_pck_get_dts(pck);
+				if (dts == GF_FILTER_NO_TS)
+					dts = gf_filter_pck_get_cts(pck);
+				tscale = gf_filter_pck_get_timescale(pck);
+
+				if (!min_dts || min_dts * tscale > dts * min_dts_scale) {
+					min_dts = dts;
+					min_dts_scale = tscale;
+				}
+			} else {
+				def_pck_dur = 0;
+			}
+		}
+		if (tkw->src_timescale != tkw->tk_timescale) {
+			def_pck_dur *= tkw->tk_timescale;
+			def_pck_dur /= tkw->src_timescale;
+		}
+
+		//and consider audio & text all RAPs, the rest not rap - this will need refinement later on
+		//but won't break the generated files
+		switch (tkw->stream_type) {
+		case GF_STREAM_AUDIO:
+		case GF_STREAM_TEXT:
+			def_is_rap = GF_TRUE;
+			p = gf_filter_pid_get_property(tkw->ipid, GF_PROP_PID_HAS_SYNC);
+			if (p && p->value.boolean)
+				def_is_rap = GF_FALSE;
+			break;
+		case GF_STREAM_VISUAL:
+			switch (tkw->codecid) {
+			case GF_CODECID_PNG:
+			case GF_CODECID_JPEG:
+			case GF_CODECID_J2K:
+				break;
+			case GF_CODECID_HEVC_TILES:
+#ifdef GF_ENABLE_CTRN
+				if (ctx->ctrn && ctx->ctrni)
+					inherit_traf_from_track = traf_inherit_base_id;
+#endif
+				break;
+			default:
+				if (!ref_tkw) ref_tkw = tkw;
+				break;
+			}
+			def_is_rap = GF_FALSE;
+			break;
+
+		default:
+			def_is_rap = GF_FALSE;
+			break;
+		}
+
+		mp4_mux_set_hevc_groups(ctx, tkw);
+
+		//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);
+		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->tfdt.den && ctx->tfdt.num) {
+			tkw->offset_dts = ctx->tfdt.num * tkw->tk_timescale;
+			tkw->offset_dts /= ctx->tfdt.den;
+		}
+
+		if (tkw->fake_track) {
+			gf_list_del_item(ctx->tracks, tkw);
+			if (ref_tkw==tkw) ref_tkw=NULL;
+			mp4_mux_track_writer_del(tkw);
+			i--;
+			count--;
+			continue;
+		}
+
+		if (inherit_traf_from_track)
+			gf_isom_enable_traf_inherit(ctx->file, tkw->track_id, inherit_traf_from_track);
+
+		if (!tkw->box_patched) {
+			p = gf_filter_pid_get_property_str(tkw->ipid, "boxpatch");
+			if (p && p->value.string) {
+				e = gf_isom_apply_box_patch(ctx->file, tkw->track_id, p->value.string, GF_FALSE);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s to track %d: %s\n",
+						p->value.string, tkw->track_id, gf_error_to_string(e) ));
+				}
+			}
+			tkw->box_patched = GF_TRUE;
+		}
+
+		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 (max_dur.num) {
+		u64 mdur = max_dur.num;
+		mdur *= (u32) ctx->moovts;
+		mdur /= max_dur.den;
+		gf_isom_set_movie_duration(ctx->file, mdur);
+	}
+
+	//if we have an explicit track reference for fragmenting, move it first in our list
+	if (ref_tkw) {
+		gf_list_del_item(ctx->tracks, ref_tkw);
+		gf_list_insert(ctx->tracks, ref_tkw, 0);
+	}
+	ctx->ref_tkw = gf_list_get(ctx->tracks, 0);
+
+	if (!ctx->abs_offset) {
+		u32 mval = ctx->dash_mode ? '6' : '5';
+		u32 mbrand, mcount, found=0;
+		u8 szB[GF_4CC_MSIZE];
+		gf_isom_set_fragment_option(ctx->file, 0, GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET, 1);
+
+		gf_isom_get_brand_info(ctx->file, &mbrand, NULL, &mcount);
+		strcpy(szB, gf_4cc_to_str(mbrand));
+		if (!strncmp(szB, "iso", 3) && (szB[3] >= mval) && (szB[3] <= 'F') ) found = 1;
+		i=0;
+		while (!found && (i<mcount)) {
+			i++;
+			gf_isom_get_alternate_brand(ctx->file, i, &mbrand);
+			strcpy(szB, gf_4cc_to_str(mbrand));
+			if (!strncmp(szB, "iso", 3) && (szB[3] >= mval) && (szB[3] <= 'F') ) found = 1;
+		}
+
+		/*because of movie fragments MOOF based offset, ISOM <4 is forbidden*/
+		if (!found) {
+			gf_isom_set_brand_info(ctx->file, ctx->dash_mode ? GF_ISOM_BRAND_ISO6 : GF_ISOM_BRAND_ISO5, 1);
+		}
+
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISOM, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO1, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO2, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO3, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO4, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_AVC1, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_MP41, GF_FALSE);
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_MP42, GF_FALSE);
+	}
+
+	if (ctx->dash_mode) {
+		/*DASH self-init media segment*/
+		if (ctx->dash_mode==MP4MX_DASH_VOD) {
+			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_DSMS, GF_TRUE);
+		} else {
+			gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_DASH, GF_TRUE);
+		}
+		gf_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_MSIX, ((ctx->dash_mode==MP4MX_DASH_VOD) && (ctx->subs_sidx>=0)) ? GF_TRUE : GF_FALSE);
+	}
+
+	if (ctx->boxpatch && !ctx->box_patched) {
+		e = gf_isom_apply_box_patch(ctx->file, 0, ctx->boxpatch, GF_FALSE);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s: %s\n", ctx->boxpatch, gf_error_to_string(e) ));
+		}
+		ctx->box_patched = GF_TRUE;
+	}
+
+	e = gf_isom_finalize_for_fragment(ctx->file, ctx->dash_mode ? 1 : 0, ctx->mvex);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to finalize moov for fragmentation: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+	ctx->init_movie_done = GF_TRUE;
+
+	if (min_dts_scale) {
+		ctx->next_frag_start = (Double) min_dts;
+		ctx->next_frag_start /= min_dts_scale;
+	}
+	ctx->next_frag_start += ctx->cdur;
+	ctx->adjusted_next_frag_start = ctx->next_frag_start;
+	ctx->fragment_started = GF_FALSE;
+
+	if (ctx->noinit) {
+		if (ctx->dst_pck) gf_filter_pck_discard(ctx->dst_pck);
+		ctx->dst_pck = NULL;
+		ctx->current_size = ctx->current_offset = 0;
+		ctx->first_pck_sent = GF_FALSE;
+	} else {
+		mp4_mux_flush_frag(ctx, GF_TRUE, 0, 0);
+	}
+	assert(!ctx->dst_pck);
+
+	//change major brand for segments
+	if (ctx->styp && (strlen(ctx->styp)>=4)) {
+		u32 styp_brand = GF_4CC(ctx->styp[0], ctx->styp[1], ctx->styp[2], ctx->styp[3]);
+		u32 version = 0;
+		char *sep = strchr(ctx->styp, '.');
+		if (sep) version = atoi(sep+1);
+		gf_isom_set_brand_info(ctx->file, styp_brand, version);
+	}
+
+	if (ctx->dash_mode==MP4MX_DASH_VOD) {
+		if ((ctx->vodcache==MP4MX_VODCACHE_REPLACE) && !nb_segments && (!ctx->media_dur || !ctx->dash_dur) ) {
+			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);
+			if (e) return e;
+		}
+
+		if (ctx->vodcache==MP4MX_VODCACHE_REPLACE) {
+			GF_BitStream *bs;
+			u8 *output;
+			char *msg;
+			GF_FilterPacket *pck;
+			u32 len;
+			Bool exact_sidx = GF_TRUE;
+
+			if (!nb_segments) {
+				exact_sidx = GF_FALSE;
+				nb_segments = (u32) ( ctx->media_dur / ctx->dash_dur);
+				//always add an extra segment
+				nb_segments ++;
+				//and safety alloc of 10%
+				if (nb_segments>10)
+					nb_segments += 10*nb_segments/100;
+				else
+					nb_segments ++;
+			}
+
+			//max sidx size: full box + sidx fields + timing 64 bit + nb segs (each 12 bytes)
+			ctx->sidx_max_size = 12 + (12 + 16) + 12 * nb_segments;
+
+			//we produce an ssix, add full box + nb subsegs + nb_segments * (range_count=2 + 2*(range+size))
+			if (ctx->ssix) {
+				ctx->sidx_max_size += 12 + 4 + nb_segments * 12;
+			}
+
+			if (!exact_sidx) {
+				//and a free box
+				ctx->sidx_max_size += 8;
+				ctx->sidx_size_exact = GF_FALSE;
+			} else {
+				ctx->sidx_size_exact = GF_TRUE;
+			}
+			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);
+			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);
+			gf_bs_write_u32(bs, ctx->sidx_max_size);
+			gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FREE);
+			msg = "GPAC " GPAC_VERSION" SIDX placeholder";
+			len = (u32) strlen(msg);
+			if (len+8>ctx->sidx_max_size) len = ctx->sidx_max_size - 8;
+			gf_bs_write_data(bs, msg, len );
+			gf_bs_del(bs);
+			gf_filter_pck_send(pck);
+		} else if (ctx->vodcache==MP4MX_VODCACHE_ON) {
+			ctx->store_output = GF_TRUE;
+		} else {
+			ctx->store_output = GF_FALSE;
+			ctx->sidx_chunk_offset = (u32) (ctx->current_offset + ctx->current_size);
+		}
+		gf_isom_allocate_sidx(ctx->file, ctx->subs_sidx, ctx->chain_sidx, 0, NULL, NULL, NULL, ctx->ssix);
+	}
+	return GF_OK;
+}
+
+static GF_Err mp4_mux_start_fragment(GF_MP4MuxCtx *ctx, GF_FilterPacket *pck)
+{
+	GF_Err e;
+	u32 i, count = gf_list_count(ctx->tracks);
+	Bool has_tfdt=GF_FALSE;
+	GF_ISOStartFragmentFlags flags=0;
+
+	//setup some default
+	gf_isom_set_next_moof_number(ctx->file, ctx->msn);
+	ctx->msn += ctx->msninc;
+
+	if (ctx->moof_first) flags |= GF_ISOM_FRAG_MOOF_FIRST;
+#ifdef GF_ENABLE_CTRN
+	if (ctx->ctrn) flags |= GF_ISOM_FRAG_USE_COMPACT;
+#endif
+
+	e = gf_isom_start_fragment(ctx->file, flags);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to start new fragment: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+	if (pck) {
+		const GF_PropertyValue *p = gf_filter_pck_get_property(pck, GF_PROP_PCK_MOOF_TEMPLATE);
+		if (p && p->value.data.ptr) {
+			GF_SegmentIndexBox *out_sidx = NULL;
+			gf_isom_set_fragment_template(ctx->file, p->value.data.ptr, p->value.data.size, &has_tfdt, &out_sidx);
+			if (out_sidx) {
+				if (ctx->cloned_sidx) gf_isom_box_del((GF_Box *)ctx->cloned_sidx);
+				ctx->cloned_sidx = out_sidx;
+				ctx->cloned_sidx_index = 0;
+			}
+		}
+	}
+
+	//setup some default
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		e = GF_OK;
+		if (ctx->strun) {
+			e = gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_RANDOM_ACCESS, 0);
+		}
+		//fragment at sap boundaries for video, but not in dash mode (compatibility with old arch)
+		else if (ctx->fsap && (tkw->stream_type == GF_STREAM_VISUAL) && !ctx->dash_mode) {
+			e = gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_RANDOM_ACCESS, 1);
+		}
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unable set fragment options: %s\n", gf_error_to_string(e) ));
+		}
+		tkw->fragment_done = GF_FALSE;
+		tkw->insert_tfdt = (has_tfdt || ctx->tfdt_traf) ? GF_TRUE : ctx->insert_tfdt;
+		tkw->dur_in_frag = 0;
+
+		if (ctx->trun_inter) {
+			gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRUN_SET_INTERLEAVE_ID, 0);
+		}
+
+		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->insert_pssh)
+			mp4_mux_cenc_insert_pssh(ctx, tkw);
+	}
+	ctx->fragment_started = GF_TRUE;
+	ctx->insert_tfdt = GF_FALSE;
+	ctx->insert_pssh = GF_FALSE;
+	return GF_OK;
+}
+
+static GF_Err mp4_mux_flush_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+{
+	GF_FilterPacket *pck;
+	u8 *output;
+	u32 nb_read, blocksize = ctx->block_size;
+	if (ctx->flush_done + blocksize>ctx->flush_size) {
+		blocksize = (u32) (ctx->flush_size - ctx->flush_done);
+	}
+	if (!blocksize) return GF_EOS;
+	pck = gf_filter_pck_new_alloc(ctx->opid, blocksize, &output);
+	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));
+	}
+	if (ctx->flush_done==ctx->flush_size) {
+		gf_filter_pck_set_framing(pck, GF_FALSE, GF_TRUE);
+		gf_filter_pck_send(pck);
+		gf_filter_pid_set_eos(ctx->opid);
+		return GF_EOS;
+	}
+	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);
+	return GF_OK;
+}
+
+static void mp4mx_frag_box_patch(GF_MP4MuxCtx *ctx)
+{
+	GF_Err e;
+	u32 i, count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *p;
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (!tkw->track_id) continue;
+		//no box patched set (todo, do we want to allow changing boxpatch props ?)
+		if (!tkw->box_patched) continue;
+
+		p = gf_filter_pid_get_property_str(tkw->ipid, "boxpatch");
+		if (p && p->value.string) {
+			e = gf_isom_apply_box_patch(ctx->file, tkw->track_id ? tkw->track_id : tkw->item_id, p->value.string, GF_TRUE);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s to track fragment %d: %s\n",
+					p->value.string, tkw->track_id, gf_error_to_string(e) ));
+			}
+		}
+	}
+
+	if (ctx->boxpatch) {
+		e = gf_isom_apply_box_patch(ctx->file, 0, ctx->boxpatch, GF_TRUE);
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s to fragment: %s\n", ctx->boxpatch, gf_error_to_string(e) ));
+		}
+		ctx->box_patched = GF_TRUE;
+	}
+}
+
+
+static GF_Err mp4_mux_initialize(GF_Filter *filter);
+
+GF_Err mp4mx_reload_output(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+{
+	GF_Err e;
+	u32 i, count = gf_list_count(ctx->tracks);
+
+	//done with the file
+	if (ctx->file) {
+		e = mp4_mux_done(filter, ctx, GF_FALSE);
+		if (e) return e;
+		ctx->file = NULL;
+	}
+	ctx->init_movie_done = GF_FALSE;
+	e = mp4_mux_initialize(filter);
+	if (e) return e;
+	ctx->config_timing = GF_TRUE;
+
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		tkw->suspended = GF_FALSE;
+		tkw->track_num = 0;
+		tkw->nb_samples = 0;
+		e = mp4_mux_configure_pid(filter, tkw->ipid, GF_FALSE);
+		if (e) return e;
+		tkw->nb_samples = 0;
+		tkw->sample.DTS = 0;
+		tkw->sample.CTS_Offset = 0;
+		tkw->samples_in_stsd = 0;
+		tkw->samples_in_frag = 0;
+	}
+	assert(ctx->next_file_idx);
+	ctx->cur_file_idx_plus_one = ctx->next_file_idx;
+	ctx->next_file_idx = 0;
+	ctx->notify_filename = GF_TRUE;
+	assert(!ctx->cur_file_suffix);
+	if (ctx->next_file_suffix) {
+		ctx->cur_file_suffix = gf_strdup(ctx->next_file_suffix);
+		ctx->next_file_suffix = NULL;
+	}
+	return GF_OK;
+}
+
+
+static GF_Err mp4_mux_process_fragmented(GF_Filter *filter, GF_MP4MuxCtx *ctx)
+{
+	GF_Err e = GF_OK;
+	u32 nb_eos, nb_done, nb_suspended, i, count;
+
+	if (ctx->flush_size) {
+		return mp4_mux_flush_fragmented(filter, ctx);
+	}
+
+	if (!ctx->file)
+		return GF_EOS;
+
+	//init movie not yet produced
+	if (!ctx->init_movie_done) {
+		e = mp4_mux_initialize_movie(ctx);
+		if (e) return e;
+		if (!ctx->init_movie_done)
+			return GF_OK;
+	}
+	/*get count after init, some tracks may have been remove*/
+	count = gf_list_count(ctx->tracks);
+	if (ctx->dash_mode && !ctx->segment_started) {
+		//don't start a new segment if all pids are in eos
+		nb_eos=0;
+		for (i=0; i<count; i++) {
+			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+			if (gf_filter_pid_is_eos(tkw->ipid)) {
+				nb_eos ++;
+			}
+		}
+		if (nb_eos==count)
+			goto check_eos;
+
+		ctx->segment_started = GF_TRUE;
+		ctx->insert_tfdt = GF_TRUE;
+		ctx->insert_pssh = (ctx->psshs == MP4MX_PSSH_MOOF) ? GF_TRUE : GF_FALSE;
+
+		gf_isom_start_segment(ctx->file, ctx->single_file ? NULL : "_gpac_isobmff_redirect", GF_FALSE);
+	}
+
+	//process pid by pid
+	nb_eos=0;
+	nb_done = 0;
+	nb_suspended = 0;
+	for (i=0; i<count; i++) {
+		u64 cts, dts, ncts;
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+
+		if (ctx->fragment_started && tkw->fragment_done) {
+			nb_done ++;
+			continue;
+		}
+		if (tkw->suspended) {
+			if (ctx->fragment_started) nb_done++;
+			nb_suspended++;
+			continue;
+		}
+
+		while (1) {
+			const GF_PropertyValue *p;
+			u32 orig_frag_bounds=0;
+			GF_FilterPacket *pck = gf_filter_pid_get_packet(tkw->ipid);
+
+			if (!pck) {
+				if (gf_filter_pid_is_eos(tkw->ipid)) {
+					tkw->fragment_done = GF_TRUE;
+					if (ctx->dash_mode) ctx->flush_seg = GF_TRUE;
+					if (ctx->next_file_idx)
+						nb_suspended++;
+					nb_done ++;
+					nb_eos++;
+					break;
+				}
+				return GF_OK;
+			}
+			if (tkw->aborted) {
+				gf_filter_pid_drop_packet(tkw->ipid);
+				nb_eos++;
+				nb_done ++;
+				tkw->fragment_done = GF_TRUE;
+				if (ctx->dash_mode) ctx->flush_seg = GF_TRUE;
+				break;
+			}
+
+			cts = gf_filter_pck_get_cts(pck);
+
+			if (cts == GF_FILTER_NO_TS) {
+				p = gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS);
+				if (p && p->value.boolean) {
+					nb_done ++;
+					tkw->fragment_done = GF_TRUE;
+					gf_filter_pid_drop_packet(tkw->ipid);
+					ctx->flush_seg = GF_TRUE;
+					tkw->next_seg_cts = tkw->cts_next;
+					break;
+				}
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MuxIsom] Packet with no CTS assigned, cannot store to track, ignoring\n"));
+				gf_filter_pid_drop_packet(tkw->ipid);
+				continue;
+			}
+
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FRAG_START);
+			if (p) {
+				orig_frag_bounds = p->value.uint;
+
+				if (orig_frag_bounds==2) {
+					if (!ctx->segment_started) {
+						ctx->dash_mode = 1;
+						ctx->insert_tfdt = GF_TRUE;
+						gf_isom_start_segment(ctx->file, ctx->single_file ? NULL : "_gpac_isobmff_redirect", GF_FALSE);
+					} else if (tkw->samples_in_frag) {
+						tkw->fragment_done = GF_TRUE;
+						tkw->samples_in_frag = 0;
+						nb_done ++;
+						//make sure we flush until the end of the segment
+						ctx->flush_seg = GF_TRUE;
+						//store CTS of next packet (first in next segment) for sidx compute
+						tkw->next_seg_cts = cts;
+					}
+				}
+			}
+
+			//get dash/file segment number
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+
+			//not dash and file end, we need to wait for all streams and resetup
+			if (!ctx->dash_mode && p) {
+				if (!ctx->cur_file_idx_plus_one) {
+					ctx->cur_file_idx_plus_one = p->value.uint + 1;
+					if (!ctx->cur_file_suffix) {
+						p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+						if (p && p->value.string) ctx->cur_file_suffix = gf_strdup(p->value.string);
+					}
+					ctx->notify_filename = GF_TRUE;
+				} else if (ctx->cur_file_idx_plus_one == p->value.uint+1) {
+				} else if (!tkw->suspended) {
+					tkw->suspended = GF_TRUE;
+					nb_suspended++;
+					ctx->next_file_idx =  p->value.uint + 1;
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+					if (p && p->value.string)
+						ctx->next_file_suffix = p->value.string;
+					break;
+				}
+			}
+
+
+			if (!ctx->fragment_started) {
+				e = mp4_mux_start_fragment(ctx, orig_frag_bounds ? pck : NULL);
+				if (e) return e;
+
+				ctx->nb_frags++;
+				if (ctx->dash_mode)
+					ctx->nb_frags_in_seg++;
+
+			}
+
+
+			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) ) {
+						tkw->fragment_done = GF_TRUE;
+						tkw->samples_in_frag = 0;
+						nb_done ++;
+						//make sure we flush until the end of the segment
+						ctx->flush_seg = GF_TRUE;
+						//store CTS of next packet (first in next segment) for sidx compute
+						tkw->next_seg_cts = cts;
+
+						break;
+					}
+					//start of current segment, remember segment number and name
+					ctx->dash_seg_num = 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) {
+						if (ctx->seg_name) gf_free(ctx->seg_name);
+						ctx->seg_name = gf_strdup(p->value.string);
+					}
+					//store PRFT only for reference track at segment start
+					if (tkw==ctx->ref_tkw) {
+						p = gf_filter_pck_get_property(pck, GF_PROP_PCK_SENDER_NTP);
+						if (p) {
+							gf_isom_set_fragment_reference_time(ctx->file, tkw->track_id, p->value.longuint, cts);
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MuxIsom] Segment %s, storing NTP TS "LLU" for CTS "LLU" at "LLU" us, at UTC "LLU"\n", ctx->seg_name ? ctx->seg_name : "singlefile", p->value.longuint, cts, gf_sys_clock_high_res(), gf_net_get_utc()));
+						}
+					}
+				}
+
+				dts = gf_filter_pck_get_dts(pck);
+				if (dts==GF_FILTER_NO_TS) dts = cts;
+				if (tkw->first_dts_in_seg > dts)
+					tkw->first_dts_in_seg = dts;
+			}
+			ncts = cts + gf_filter_pck_get_duration(pck);
+			if (tkw->cts_next < ncts)
+				tkw->cts_next = ncts;
+
+
+			if (tkw->samples_in_frag && orig_frag_bounds) {
+				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) ) {
+				u32 dur = gf_filter_pck_get_duration(pck);
+				if (tkw->dur_in_frag && (tkw->dur_in_frag >= ctx->cdur * tkw->src_timescale)) {
+					tkw->fragment_done = GF_TRUE;
+					nb_done ++;
+					tkw->dur_in_frag = 0;
+					tkw->samples_in_frag = 0;
+					break;
+				}
+				tkw->dur_in_frag += dur;
+			} else if (!ctx->flush_seg && !ctx->dash_mode
+				&& (cts >= (u64) (ctx->adjusted_next_frag_start * tkw->src_timescale) + tkw->ts_delay)
+			 ) {
+				u32 sap = gf_filter_pck_get_sap(pck);
+				if ((ctx->store==MP4MX_MODE_FRAG) || (sap && sap<GF_FILTER_SAP_3)) {
+					tkw->fragment_done = GF_TRUE;
+					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;
+					}
+					break;
+				}
+			}
+			if (tkw->insert_tfdt) {
+				u64 odts = gf_filter_pck_get_dts(pck);
+				if (odts==GF_FILTER_NO_TS)
+					odts = gf_filter_pck_get_cts(pck);
+
+				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);
+				tkw->first_dts_in_seg = (u64) odts;
+			}
+
+			if (ctx->trun_inter) {
+				s32 sap = gf_filter_pck_get_sap(pck);
+				s32 tid_group = 0;
+				if (sap) {
+					tkw->prev_tid_group = 0;
+				} else {
+					s64 dts_diff;
+					s64 p_dts = gf_filter_pck_get_dts(pck);
+					s64 p_cts = gf_filter_pck_get_cts(pck);
+					s64 cts_o = p_cts - p_dts;
+					dts_diff = p_dts - tkw->sample.DTS;
+					tid_group = (s32) (cts_o / dts_diff);
+					tid_group = 20 - tid_group;
+					if (tid_group != tkw->prev_tid_group) {
+						tkw->prev_tid_group = tid_group;
+						gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRUN_SET_INTERLEAVE_ID, tid_group);
+					}
+				}
+			}
+
+			//process packet
+			e = mp4_mux_process_sample(ctx, tkw, pck, GF_TRUE);
+
+			//discard
+			gf_filter_pid_drop_packet(tkw->ipid);
+
+			if (e) return e;
+		}
+		//done with this track - if single track per moof, request new fragment but don't touch the
+		//fragmentation state of the track writers
+		if (ctx->straf && (i+1 < count)) {
+			GF_ISOStartFragmentFlags flags = 0;
+			if (ctx->moof_first) flags |= GF_ISOM_FRAG_MOOF_FIRST;
+#ifdef GF_ENABLE_CTRN
+			if (ctx->ctrn) flags |= GF_ISOM_FRAG_USE_COMPACT;
+#endif
+			e = gf_isom_start_fragment(ctx->file, flags);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to start new fragment: %s\n", gf_error_to_string(e) ));
+				return e;
+			}
+			if (ctx->sdtp_traf)
+				gf_isom_set_fragment_option(ctx->file, tkw->track_id, GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX, ctx->sdtp_traf);
+		}
+	}
+
+	//all suspended tracks done, flush fragment
+	if (nb_suspended && (nb_suspended==count)) {
+		nb_done = count;
+	}
+
+
+	if (nb_done==count) {
+		Bool is_eos = (count == nb_eos) ? GF_TRUE : GF_FALSE;
+		Double ref_start;
+		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;
+		while (ctx->next_frag_start <= ctx->adjusted_next_frag_start) {
+			ctx->next_frag_start += ctx->cdur;
+		}
+		ctx->adjusted_next_frag_start = ctx->next_frag_start;
+		ctx->fragment_started = GF_FALSE;
+
+		mp4mx_frag_box_patch(ctx);
+
+		//end of DASH segment
+		if (ctx->dash_mode && (ctx->flush_seg || is_eos) ) {
+			u64 offset = ctx->single_file ? ctx->current_offset : 0;
+			u64 idx_start_range, idx_end_range, segment_size_in_bytes;
+			s32 subs_sidx = -1;
+			u32 track_ref_id = 0;
+
+			idx_start_range = idx_end_range = 0;
+			if (ctx->subs_sidx>=0) {
+				subs_sidx = ctx->subs_sidx;
+				track_ref_id = ctx->ref_tkw->track_id;
+			}
+			if (ctx->cloned_sidx && (ctx->subs_sidx!=-2) ) {
+				subs_sidx = (s32) ctx->cloned_sidx->nb_refs;
+				track_ref_id = ctx->cloned_sidx->reference_ID;
+				gf_isom_box_del((GF_Box *)ctx->cloned_sidx);
+				ctx->cloned_sidx = NULL;
+			}
+
+			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 ));
+
+			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);
+			} else if (ctx->vodcache==MP4MX_VODCACHE_REPLACE) {
+				mp4_mux_flush_frag(ctx, GF_FALSE, 0, 0);
+			} else {
+				if (ctx->nb_seg_sizes == ctx->alloc_seg_sizes) {
+					 ctx->alloc_seg_sizes *= 2;
+					 if (!ctx->alloc_seg_sizes) ctx->alloc_seg_sizes = 10;
+					 ctx->seg_sizes = gf_realloc(ctx->seg_sizes, sizeof(u32) * ctx->alloc_seg_sizes);
+				}
+				assert(segment_size_in_bytes);
+				ctx->seg_sizes[ctx->nb_seg_sizes] = (u32) segment_size_in_bytes;
+				ctx->nb_seg_sizes++;
+			}
+		}
+		//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);
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MP4Mux] Done writing fragment - next fragment start time %g\n", ctx->next_frag_start ));
+		}
+
+		if (ctx->flush_seg) {
+			ctx->segment_started = GF_FALSE;
+			ctx->flush_seg = GF_FALSE;
+			ctx->dash_seg_num = 0;
+			ctx->nb_segs++;
+			ctx->nb_frags_in_seg=0;
+		}
+	}
+
+	if (nb_suspended && (nb_suspended==count)) {
+		ctx->nb_segs=0;
+		return mp4mx_reload_output(filter, ctx);
+	}
+
+check_eos:
+	if (count == nb_eos) {
+		if (ctx->dash_mode==MP4MX_DASH_VOD) {
+			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);
+			} else {
+				u64 start_offset;
+				//reenable packet dispatch
+				ctx->store_output = GF_FALSE;
+				gf_isom_flush_sidx(ctx->file, 0, GF_FALSE);
+				//flush sidx packet
+				mp4mux_send_output(ctx);
+
+				mp4_mux_flush_frag(ctx, GF_TRUE, ctx->current_offset, ctx->current_offset + ctx->current_size - 1);
+
+				ctx->flush_size = gf_ftell(ctx->tmp_store);
+				ctx->flush_done = 0;
+				gf_fseek(ctx->tmp_store, 0, SEEK_SET);
+
+				if (ctx->seg_sizes) {
+					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);
+					}
+					ctx->current_offset = start_offset;
+					ctx->current_size = 0;
+
+					gf_free(ctx->seg_sizes);
+					ctx->seg_sizes = NULL;
+					ctx->alloc_seg_sizes = ctx->nb_seg_sizes = 0;
+				}
+			}
+		}
+		//only destroy file if not dash or not onDemand, otherwise (regular dash) the file will be needed to append further segments
+		if (ctx->dash_mode!=MP4MX_DASH_ON) {
+			//only delete file in vod mode
+			if (ctx->file) {
+				gf_isom_close(ctx->file);
+				ctx->file = NULL;
+			}
+		}
+
+		mp4mux_send_output(ctx);
+
+		if (!ctx->flush_size) gf_filter_pid_set_eos(ctx->opid);
+
+		return ctx->flush_size ? GF_OK : GF_EOS;
+	}
+
+	return GF_OK;
+}
+
+static void mp4_mux_config_timing(GF_MP4MuxCtx *ctx)
+{
+	u32 i, count = gf_list_count(ctx->tracks);
+	//compute min dts of first packet on each track - this assume all tracks are synchronized, might need adjustment for MPEG4 Systems
+	u64 first_ts_min = (u64) -1;
+	for (i=0; i<count; i++) {
+		u64 ts, dts_min;
+		GF_FilterPacket *pck;
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		if (tkw->fake_track) continue;
+		pck = gf_filter_pid_get_packet(tkw->ipid);
+		//check this after fetching a packet since it may reconfigure the track
+		if (!tkw->track_num) {
+			if (gf_filter_pid_is_eos(tkw->ipid)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] PID has no input packet and configuration not known after 10 retries, aborting initial timing sync\n"));
+				continue;
+			}
+			return;
+		}
+		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);
+
+				if (!tkw->nb_samples) {
+					const GF_PropertyValue *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);
+					}
+				}
+				continue;
+			}
+			return;
+		}
+		//we may have reorder tracks after the get_packet, redo
+		if (gf_list_find(ctx->tracks, tkw) != i) {
+			mp4_mux_config_timing(ctx);
+			return;
+		}
+		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;
+
+		dts_min = ts * 1000000;
+		dts_min /= tkw->src_timescale;
+
+		if (first_ts_min > dts_min) {
+			first_ts_min = (u64) dts_min;
+		}
+		tkw->ts_shift = ts;
+	}
+	if (first_ts_min==(u64)-1)
+		first_ts_min = 0;
+
+	//for all packets with dts greater than min dts, we need to add a pause
+	for (i=0; i<count; i++) {
+		s64 dts_diff, dur;
+		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 = (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;
+		if (dur) {
+			gf_isom_remove_edits(ctx->file, tkw->track_num);
+
+			gf_isom_set_edit(ctx->file, tkw->track_num, 0, dur, dts_diff, GF_ISOM_EDIT_EMPTY);
+			gf_isom_set_edit(ctx->file, tkw->track_num, dur, 0, 0, GF_ISOM_EDIT_NORMAL);
+			tkw->empty_init_dur = (u64) dur;
+		}
+	}
+
+	ctx->config_timing = GF_FALSE;
+}
+
+void mp4_mux_format_report(GF_Filter *filter, GF_MP4MuxCtx *ctx, u64 done, u64 total)
+{
+	Bool status_changed=GF_FALSE;
+	u32 total_pc = 0;
+	char szStatus[2048], szTK[20];
+	if (!gf_filter_reporting_enabled(filter))
+		return;
+	if (!ctx->update_report)
+		return;
+
+	ctx->update_report = GF_FALSE;
+
+	if (ctx->config_timing) {
+		sprintf(szStatus, "waiting for clock init");
+		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);
+			status_changed = GF_TRUE;
+			total_pc = 10000;
+
+		} else {
+			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);
+			status_changed = GF_TRUE;
+		}
+	} else {
+		u32 i, count = gf_list_count(ctx->tracks);
+		Bool is_frag = GF_FALSE;
+
+		if (ctx->store>=MP4MX_MODE_FRAG) {
+			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);
+			} else {
+				sprintf(szStatus, "mux frags %d next %02.02g", ctx->nb_frags, ctx->next_frag_start);
+			}
+		} else {
+			sprintf(szStatus, "%s", ((ctx->store==MP4MX_MODE_FLAT) || (ctx->store==MP4MX_MODE_FASTSTART)) ? "mux" : "import");
+		}
+		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) {
+					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;
+					pc = (u32) ((tk_done*10000)/tk_total);
+				} else {
+					pc = (u32) ( (10000 * (u64) tkw->nb_samples) / (-ctx->idur.num) );
+				}
+			} else {
+				if (tkw->nb_frames) {
+					pc = (u32) ( (10000 * (u64) tkw->nb_samples) / 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));
+					} else if (tkw->down_bytes && tkw->down_size) {
+						pc = (u32) (((tkw->down_bytes*10000) / tkw->down_size));
+					}
+				}
+			}
+			if (pc>10000)
+				pc=0;
+			if (tkw->last_import_pc != pc + 1) {
+				status_changed = GF_TRUE;
+				tkw->last_import_pc = pc + 1;
+			}
+			if (!total_pc || (total_pc > pc))
+				total_pc = pc;
+
+			if (is_frag) {
+				sprintf(szTK, " TK%d(%c): %d", tkw->track_id, tkw->status_type, tkw->samples_in_frag);
+				strcat(szStatus, szTK);
+				status_changed = GF_TRUE;
+				if (pc) {
+					sprintf(szTK, " %d %%", pc/100);
+					strcat(szStatus, szTK);
+				}
+			} else {
+				sprintf(szTK, " %s%d(%c): %d %%", tkw->is_item ? "IT" : "TK", tkw->track_id, tkw->status_type, pc/100);
+				strcat(szStatus, szTK);
+			}
+		}
+	}
+	if (status_changed) {
+		gf_filter_update_status(filter, total_pc, szStatus);
+	}
+}
+
+
+GF_Err mp4_mux_process(GF_Filter *filter)
+{
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	u32 nb_skip, nb_eos, nb_suspended, i, count = gf_list_count(ctx->tracks);
+	nb_skip = 0;
+	nb_eos = 0;
+
+	if (ctx->config_timing) {
+		mp4_mux_config_timing(ctx);
+		if (ctx->config_timing) {
+			mp4_mux_format_report(filter, ctx, 0, 0);
+			return GF_OK;
+		}
+	}
+
+	//in frag mode, force fetching a sample from each track before processing
+	if (ctx->store>=MP4MX_MODE_FRAG) {
+		u32 done=0;
+		GF_Err e = mp4_mux_process_fragmented(filter, ctx);
+		if (e==GF_EOS) done=100;
+		mp4_mux_format_report(filter, ctx, done, done);
+		return e;
+	}
+
+	nb_suspended = 0;
+	for (i=0; i<count; i++) {
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(tkw->ipid);
+
+		if (tkw->suspended) {
+			nb_suspended++;
+			continue;
+		}
+
+		if (!pck) {
+			if (gf_filter_pid_is_eos(tkw->ipid)) {
+				tkw->suspended = GF_FALSE;
+				nb_eos++;
+			}
+			continue;
+		}
+
+		if (tkw->aborted) {
+			gf_filter_pid_drop_packet(tkw->ipid);
+			nb_eos++;
+			continue;
+		}
+
+		if (ctx->owns_mov) {
+			const GF_PropertyValue *p;
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (p) {
+				if (!ctx->cur_file_idx_plus_one) {
+					ctx->cur_file_idx_plus_one = p->value.uint + 1;
+					if (!ctx->cur_file_suffix) {
+						p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+						if (p && p->value.string) ctx->cur_file_suffix = gf_strdup(p->value.string);
+					}
+					ctx->notify_filename = GF_TRUE;
+				} else if (ctx->cur_file_idx_plus_one == p->value.uint+1) {
+				} else if (!tkw->suspended) {
+					tkw->suspended = GF_TRUE;
+					nb_suspended++;
+					ctx->next_file_idx =  p->value.uint + 1;
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+					if (p && p->value.string)
+						ctx->next_file_suffix = p->value.string;
+					continue;
+				}
+			}
+		}
+
+		//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->is_rewind)
+				cts = tkw->ts_shift - cts;
+			else
+				cts -= tkw->ts_shift;
+			cts /= tkw->src_timescale;
+			if (!ctx->faststart_ts_regulate) {
+				ctx->faststart_ts_regulate = ctx->cdur;
+			}
+			//ahead of our interleaving window, don't write yet
+			else if (cts > ctx->faststart_ts_regulate) {
+				nb_skip++;
+				continue;
+			}
+		}
+
+		if (tkw->cenc_state==CENC_NEED_SETUP)
+			mp4_mux_cenc_update(ctx, tkw, pck, CENC_CONFIG, 0);
+
+		if (tkw->is_item) {
+			mp4_mux_process_item(ctx, tkw, pck);
+		} else {
+			mp4_mux_process_sample(ctx, tkw, pck, GF_FALSE);
+		}
+
+		gf_filter_pid_drop_packet(tkw->ipid);
+		if (tkw->aborted) {
+			nb_eos++;
+		}
+	}
+	mp4_mux_format_report(filter, ctx, 0, 0);
+
+	if (nb_suspended && (nb_suspended+nb_eos==count)) {
+		return mp4mx_reload_output(filter, ctx);
+	}
+
+	if (count == nb_eos) {
+		if (ctx->file) {
+			GF_Err e = mp4_mux_done(filter, ctx, GF_TRUE);
+			if (e) return e;
+		}
+		return GF_EOS;
+	}
+	//done with this interleaving window, start next one
+	else if (nb_skip + nb_eos == count) {
+		ctx->faststart_ts_regulate += ctx->cdur;
+	} else if (ctx->importer) {
+		u64 prog_done=0, prog_total=0;
+		for (i=0; i<count; i++) {
+			TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+			if (prog_done * tkw->prog_total <= tkw->prog_done * prog_total) {
+				prog_done = tkw->prog_done;
+				prog_total = tkw->prog_total;
+			}
+		}
+		gf_set_progress("Import", prog_done, prog_total);
+	}
+
+	return GF_OK;
+}
+
+static GF_Err mp4_mux_on_data_patch(void *cbk, u8 *data, u32 block_size, u64 file_offset, Bool is_insert)
+{
+	GF_Filter *filter = (GF_Filter *) cbk;
+	u8 *output;
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
+	memcpy(output, data, block_size);
+	gf_filter_pck_set_framing(pck, GF_FALSE, GF_FALSE);
+	gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+	if (is_insert)
+		gf_filter_pck_set_interlaced(pck, 1);
+	gf_filter_pck_set_byte_offset(pck, file_offset);
+	gf_filter_pck_send(pck);
+	return GF_OK;
+}
+
+static GF_Err mp4_mux_on_data(void *cbk, u8 *data, u32 block_size)
+{
+	GF_Filter *filter = (GF_Filter *) cbk;
+	u8 *output;
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+
+	ctx->total_bytes_out += block_size;
+
+	//flush pending packet in frag mode
+	mp4mux_send_output(ctx);
+
+	if (ctx->final_sidx_flush) {
+		GF_FilterPacket *pck;
+		u32 free_size=0;
+
+		if (ctx->vodcache==MP4MX_VODCACHE_INSERT) {
+			pck = gf_filter_pck_new_alloc(ctx->opid, block_size, &output);
+			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);
+			gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+			gf_filter_pck_set_interlaced(pck, 1);
+			gf_filter_pck_send(pck);
+		} else {
+			GF_BitStream *bs;
+			assert(!ctx->dst_pck);
+
+			if (block_size > ctx->sidx_max_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Final SIDX chunk larger than preallocated block, will not flush SIDX (output file still readable). Try disabling nocache mode\n"));
+				return GF_OK;
+			}
+			free_size = ctx->sidx_max_size - block_size;
+			pck = gf_filter_pck_new_alloc(ctx->opid, ctx->sidx_max_size, &output);
+			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);
+			bs = gf_bs_new(output, ctx->sidx_max_size, GF_BITSTREAM_WRITE);
+			if (free_size) {
+				gf_bs_write_u32(bs, free_size);
+				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_FREE);
+				gf_bs_skip_bytes(bs, free_size-8);
+			}
+			gf_bs_write_data(bs, data, block_size);
+			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);
+		return GF_OK;
+	}
+
+	if (ctx->store_output) {
+		u32 nb_write = (u32) gf_fwrite(data, block_size, ctx->tmp_store);
+		if (nb_write != block_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Error writing to temp cache: %d bytes write instead of %d\n", nb_write, block_size));
+			return GF_IO_ERR;
+		}
+		return GF_OK;
+	}
+
+	//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);
+	}
+	//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) );
+	}
+	ctx->first_pck_sent = GF_TRUE;
+	ctx->current_size += block_size;
+	//non-frag mode, send right away
+	if (ctx->store<MP4MX_MODE_FRAG) {
+		mp4mux_send_output(ctx);
+	}
+	return GF_OK;
+}
+
+void mp4_mux_progress_cbk(void *udta, u64 done, u64 total)
+{
+	GF_Filter *filter = (GF_Filter *)udta;
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->update_report = GF_TRUE;
+	mp4_mux_format_report(filter, ctx, done, total);
+}
+
+static GF_Err mp4_mux_initialize(GF_Filter *filter)
+{
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+	gf_filter_set_max_extra_input_pids(filter, -1);
+
+	if (ctx->file) {
+		if (gf_isom_get_mode(ctx->file) < GF_ISOM_OPEN_WRITE) return GF_BAD_PARAM;
+		if (ctx->store>=MP4MX_MODE_FRAG) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Cannot use fragmented output on already opened ISOBMF file\n"));
+			return GF_BAD_PARAM;
+		}
+		ctx->owns_mov = GF_FALSE;
+	} else {
+		u32 open_mode = GF_ISOM_OPEN_WRITE;
+		ctx->owns_mov = GF_TRUE;
+
+		switch (ctx->store) {
+		case MP4MX_MODE_INTER:
+		case MP4MX_MODE_TIGHT:
+			open_mode = GF_ISOM_WRITE_EDIT;
+			break;
+		}
+		ctx->file = gf_isom_open("_gpac_isobmff_redirect", open_mode, ctx->tmpd);
+		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);
+
+		gf_isom_set_progress_callback(ctx->file, mp4_mux_progress_cbk, filter);
+
+		if (ctx->dref && (ctx->store>=MP4MX_MODE_FRAG)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Cannot use data reference in movie fragments, not supported. Ignoring it\n"));
+			ctx->dref = GF_FALSE;
+		}
+
+		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->tracks)
+		ctx->tracks = gf_list_new();
+
+#ifdef GF_ENABLE_CTRN
+	if (ctx->ctrni)
+		ctx->ctrn = GF_TRUE;
+#endif
+
+	if (ctx->m4cc) {
+		if (strlen(ctx->m4cc)==4)
+			ctx->eos_marker = GF_4CC(ctx->m4cc[0], ctx->m4cc[1], ctx->m4cc[2], ctx->m4cc[3]);
+		else {
+			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);
+	return GF_OK;
+}
+
+
+static void mp4_mux_update_edit_list_for_bframes(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	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->DTS + s->CTS_Offset > max_cts)
+			max_cts = s->DTS + s->CTS_Offset;
+
+		if (min_cts > s->DTS + s->CTS_Offset)
+			min_cts = s->DTS + s->CTS_Offset;
+
+		gf_isom_sample_del(&s);
+	}
+
+	if (min_cts || tkw->empty_init_dur) {
+		max_cts -= min_cts;
+		max_cts += gf_isom_get_sample_duration(ctx->file, tkw->track_num, count);
+
+		max_cts *= ctx->moovts;
+		max_cts /= tkw->tk_timescale;
+		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;
+		}
+
+		gf_isom_set_edit(ctx->file, tkw->track_num, tkw->empty_init_dur, max_cts, min_cts, GF_ISOM_EDIT_NORMAL);
+	}
+}
+
+//todo: move from media_import.c to here once done
+void gf_media_update_bitrate(GF_ISOFile *file, u32 track);
+
+
+static void mp4_mux_set_hevc_groups(GF_MP4MuxCtx *ctx, TrackWriter *tkw)
+{
+	u32 avc_base_track, hevc_base_track, ref_track_id;
+	avc_base_track = hevc_base_track = 0;
+	u32 i;
+	GF_PropertyEntry *pe=NULL;
+	const GF_PropertyValue *p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:oinf", &pe);
+	if (p) {
+		u32 gi=0;
+		gf_isom_add_sample_group_info(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_OINF, p->value.data.ptr, p->value.data.size, GF_TRUE, &gi);
+
+		p = gf_filter_pid_get_info_str(tkw->ipid, "hevc:linf", &pe);
+		if (p) {
+			gf_isom_add_sample_group_info(ctx->file, tkw->track_num, GF_ISOM_SAMPLE_GROUP_LINF, p->value.data.ptr, p->value.data.size, GF_TRUE, &gi);
+			gf_isom_set_track_group(ctx->file, tkw->track_num, 1000+gf_isom_get_track_id(ctx->file, tkw->track_num), GF_ISOM_BOX_TYPE_CSTG, GF_TRUE);
+		}
+	}
+
+	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)) {
+		return;
+	}
+	//set linf
+	for (i=0; i < gf_isom_get_track_count(ctx->file); i++) {
+		u32 subtype = gf_isom_get_media_subtype(ctx->file, i+1, 1);
+		switch (subtype) {
+		case GF_ISOM_SUBTYPE_AVC_H264:
+		case GF_ISOM_SUBTYPE_AVC2_H264:
+		case GF_ISOM_SUBTYPE_AVC3_H264:
+		case GF_ISOM_SUBTYPE_AVC4_H264:
+			if (!avc_base_track) {
+				avc_base_track = i+1;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Warning: More than one AVC bitstream found, use track %d as base layer", avc_base_track));
+			}
+			break;
+		case GF_ISOM_SUBTYPE_HVC1:
+		case GF_ISOM_SUBTYPE_HEV1:
+		case GF_ISOM_SUBTYPE_HVC2:
+		case GF_ISOM_SUBTYPE_HEV2:
+			if (!hevc_base_track) {
+				hevc_base_track = i+1;
+				if (avc_base_track) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Warning: Found both AVC and HEVC tracks, using HEVC track %d as base layer\n", hevc_base_track));
+				}
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Warning: More than one HEVC bitstream found, use track %d as base layer\n", avc_base_track));
+			}
+			break;
+		}
+	}
+	if (!hevc_base_track && !avc_base_track) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MP4Mux] Using LHVC external base layer, but no base layer not found - NOT SETTING SBAS TRACK REFERENCE!\n"));
+	} else {
+		ref_track_id = gf_isom_get_track_id(ctx->file, hevc_base_track ? hevc_base_track : avc_base_track);
+		gf_isom_set_track_reference(ctx->file, tkw->track_num, GF_ISOM_REF_BASE, ref_track_id);
+
+		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);
+		}
+	}
+}
+
+static GF_Err mp4_mux_done(GF_Filter *filter, GF_MP4MuxCtx *ctx, Bool is_final)
+{
+	GF_Err e = GF_OK;
+	u32 i, count;
+	GF_PropertyEntry *pe=NULL;
+
+	count = gf_list_count(ctx->tracks);
+	for (i=0; i<count; i++) {
+		const GF_PropertyValue *p;
+		Bool has_bframes = GF_FALSE;
+		TrackWriter *tkw = gf_list_get(ctx->tracks, i);
+
+		if (tkw->min_neg_ctts<0) {
+			//use ctts v1 negative offsets
+			if (ctx->ctmode==MP4MX_CT_NEGCTTS) {
+				gf_isom_set_ctts_v1(ctx->file, tkw->track_num, (u32) -tkw->min_neg_ctts);
+			}
+			//ctts v0
+			else {
+				gf_isom_set_cts_packing(ctx->file, tkw->track_num, GF_TRUE);
+				gf_isom_shift_cts_offset(ctx->file, tkw->track_num, (s32) tkw->min_neg_ctts);
+				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);
+			}
+			has_bframes = GF_TRUE;
+		} else if (tkw->has_ctts && (tkw->stream_type==GF_STREAM_VISUAL)) {
+			mp4_mux_update_edit_list_for_bframes(ctx, tkw);
+
+			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) {
+			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 ));
+			} 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 ));
+			}
+		}
+
+		/*this is plain ugly but since some encoders (divx) don't use the video PL correctly
+		 we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
+		if (tkw->codecid == GF_CODECID_MPEG4_PART2) {
+			Bool force_rewrite = GF_FALSE;
+			u32 PL = tkw->media_profile_level;
+			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) ));
+			}
+
+			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) ));
+				force_rewrite = GF_TRUE;
+			}
+			if (PL != tkw->media_profile_level) {
+				if (force_rewrite) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+					GF_ESD *esd = gf_isom_get_esd(ctx->file, tkw->track_num, tkw->stsd_idx);
+					assert(esd);
+					gf_m4v_rewrite_pl(&esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
+					gf_isom_change_mpeg4_description(ctx->file, tkw->track_num, tkw->stsd_idx, esd);
+					gf_odf_desc_del((GF_Descriptor*)esd);
+#endif
+
+				}
+				if (!ctx->make_qt)
+					gf_isom_set_pl_indication(ctx->file, GF_ISOM_PL_VISUAL, PL);
+			}
+		}
+
+
+		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;
+			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_isom_modify_alternate_brand(ctx->file, GF_ISOM_BRAND_ISO6, GF_TRUE);
+		}
+
+		mp4_mux_set_hevc_groups(ctx, tkw);
+
+		p = gf_filter_pid_get_info_str(tkw->ipid, "ttxt:rem_last", &pe);
+		if (p && p->value.boolean)
+			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 (tkw->is_nalu && ctx->pack_nal && (gf_isom_get_mode(ctx->file)!=GF_ISOM_OPEN_WRITE)) {
+			u32 msize = 0;
+			Bool do_rewrite = GF_FALSE;
+			u32 j, stsd_count = gf_isom_get_sample_description_count(ctx->file, tkw->track_num);
+			p = gf_filter_pid_get_info(tkw->ipid, GF_PROP_PID_MAX_NALU_SIZE, &pe);
+			msize = gf_get_bit_size(p->value.uint);
+			if (msize<8) msize = 8;
+			else if (msize<16) msize = 16;
+			else msize = 32;
+
+			if (msize<=0xFFFF) {
+				for (j=0; j<stsd_count; j++) {
+					u32 k = 8 * gf_isom_get_nalu_length_field(ctx->file, tkw->track_num, j+1);
+					if (k > msize) {
+						do_rewrite = GF_TRUE;
+					}
+				}
+				if (do_rewrite) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[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++) {
+						gf_isom_set_nalu_length_field(ctx->file, tkw->track_num, j+1, msize);
+					}
+				}
+			}
+		}
+
+		//don't update bitrate info for single sample tracks, unless MPEG-4 Systems - compatibility with old arch
+		if (ctx->btrt && !tkw->skip_bitrate_update && ((tkw->nb_samples>1) || ctx->m4sys) )
+			gf_media_update_bitrate(ctx->file, tkw->track_num);
+
+		if (!tkw->box_patched) {
+			p = gf_filter_pid_get_property_str(tkw->ipid, "boxpatch");
+			if (p && p->value.string) {
+				e = gf_isom_apply_box_patch(ctx->file, tkw->track_id ? tkw->track_id : tkw->item_id, p->value.string, GF_FALSE);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s to track %d: %s\n",
+						p->value.string, tkw->track_id, gf_error_to_string(e) ));
+				}
+			}
+			tkw->box_patched = GF_TRUE;
+		}
+	}
+
+	gf_filter_release_property(pe);
+
+	if (ctx->boxpatch && !ctx->box_patched) {
+		e = gf_isom_apply_box_patch(ctx->file, 0, ctx->boxpatch, GF_FALSE);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MP4Mux] Unable to apply box patch %s: %s\n", ctx->boxpatch, gf_error_to_string(e) ));
+		}
+		ctx->box_patched = GF_TRUE;
+	}
+
+
+	if (ctx->owns_mov) {
+		switch (ctx->store) {
+		case MP4MX_MODE_INTER:
+			if (ctx->cdur==0) {
+				e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_STREAMABLE);
+			} else {
+				e = gf_isom_make_interleave(ctx->file, ctx->cdur);
+			}
+			break;
+		case MP4MX_MODE_FLAT:
+			e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_FLAT);
+			break;
+		case MP4MX_MODE_FASTSTART:
+			e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_FASTSTART);
+			break;
+		case MP4MX_MODE_TIGHT:
+			e = gf_isom_set_storage_mode(ctx->file, GF_ISOM_STORE_TIGHT);
+			break;
+		}
+		if (e) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[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) ));
+			}
+		}
+		ctx->file = NULL;
+		if (is_final)
+			gf_filter_pid_set_eos(ctx->opid);
+	} else {
+		ctx->file = NULL;
+	}
+	return e;
+}
+
+static void mp4_mux_finalize(GF_Filter *filter)
+{
+	GF_MP4MuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->owns_mov && (ctx->file || (ctx->store>=MP4MX_MODE_FRAG))) {
+		gf_isom_delete(ctx->file);
+	}
+
+	while (gf_list_count(ctx->tracks)) {
+		TrackWriter *tkw = gf_list_pop_back(ctx->tracks);
+		mp4_mux_track_writer_del(tkw);
+	}
+	gf_list_del(ctx->tracks);
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->seg_name) gf_free(ctx->seg_name);
+	if (ctx->tmp_store) gf_fclose(ctx->tmp_store);
+	if (ctx->seg_sizes) gf_free(ctx->seg_sizes);
+
+	if (ctx->cur_file_suffix) gf_free(ctx->cur_file_suffix);
+
+}
+
+static const GF_FilterCapability MP4MuxCaps[] =
+{
+	//for now don't accept files as input, although we could store them as items, to refine
+	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_SCENE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	//we want framed media only
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	//and any codecid
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_NONE),
+	CAP_STRING(GF_CAPS_OUTPUT_STATIC,  GF_PROP_PID_FILE_EXT, ISOM_FILE_EXT),
+	CAP_STRING(GF_CAPS_OUTPUT_STATIC,  GF_PROP_PID_MIME, ISOM_FILE_MIME),
+	{0},
+	//for scene / OD / text, we don't want raw codecid (filters modifying a scene graph we don't expose)
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_SCENE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_OD),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_MP4MuxCtx, _n)
+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(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(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 AVC/HEVC/...", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(xps_inband), "use inband (in sample data) param set for 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(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"
+	"- 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"
+	"- 0: no specific interleaving but moov first\n"
+	"- negative: defaults to 1.0 unless overriden by storage profile", GF_PROP_DOUBLE, "-1.0", 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(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(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(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"
+	"- 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"
+		"- 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(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"
+	"- 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(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"\
+		, 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(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},
+#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},
+#endif
+	{ OFFS(sseg), "set single segment mode for dash", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_HIDE},
+
+	{ OFFS(compress), "set top-level box compression mode\n"
+						"- no: disable box compression\n"
+						"- moov: compress only moov box\n"
+						"- moof: compress only moof boxes\n"
+						"- sidx: compress moof and sidx boxes\n"
+						"- 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(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(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},
+	{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"
+	"  \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"
+	"  \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"
+	"  \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"
+	"  \n"
+	"The [-vodcache]() option allows controling 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"
+	"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"
+	"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"
+	"  \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"
+	"# Notes\n"
+	"The filter  watches the property `FileNumber` on incoming packets to create new files or new segments in DASH mode.\n"
+	)
+	.private_size = sizeof(GF_MP4MuxCtx),
+	.args = MP4MuxArgs,
+	.initialize = mp4_mux_initialize,
+	.finalize = mp4_mux_finalize,
+	.flags = GF_FS_REG_DYNAMIC_REDIRECT,
+	SETCAPS(MP4MuxCaps),
+	.configure_pid = mp4_mux_configure_pid,
+	.process = mp4_mux_process,
+	.process_event = mp4_mux_process_event
+};
+
+
+const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session)
+{
+	return &MP4MuxRegister;
+}
+
+#else
+const GF_FilterRegister *mp4_mux_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_ISOM_WRITE
+

gpac-1.0.0.tar.gz/src/filters/mux_ts.c Added

@@ -0,0 +1,1474 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-2 TS mux 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/mpegts.h>
+#include <gpac/iso639.h>
+#include <gpac/webvtt.h>
+
+typedef struct
+{
+	u64 sap_time;
+	u64 offset;
+	u32 nb_pck;
+	u32 sap_type;
+	u64 min_pts_plus_one;
+	u64 max_pts;
+} TS_SIDX;
+
+typedef struct
+{
+	//filter args
+	u32 pmt_id, pmt_rate, pcr_offset, pmt_version, sdt_rate, breq, mpeg4;
+	u32 rate, pat_rate, repeat_rate, repeat_img, max_pcr, nb_pack, sid, bifs_pes, temi_delay, temi_offset;
+	GF_M2TS_PackMode pes_pack;
+	Bool flush_rap, realtime, pcr_only, disc, temi_ntp, latm;
+	s64 pcr_init;
+	char *name, *provider, *temi;
+	u32 log_freq;
+	s32 subs_sidx;
+
+	//internal
+	GF_FilterPid *opid;
+	GF_FilterPid *idx_opid;
+	GF_Filter *idx_filter;
+	GF_M2TS_Mux *mux;
+
+	GF_List *pids;
+
+	Bool check_pcr;
+	Bool update_mux;
+	char *pack_buffer;
+	u64 nb_pck;
+	Bool init_buffering;
+	u32 last_log_time;
+	Bool pmt_update_pending;
+
+	u32 dash_mode;
+	Bool init_dash;
+	u32 dash_seg_num;
+	Bool wait_dash_flush;
+	Bool dash_file_switch;
+	Bool next_is_start;
+	u32 nb_pck_in_seg;
+	u64 pck_start_idx;
+
+	char dash_file_name[GF_MAX_PATH];
+	char idx_file_name[GF_MAX_PATH];
+
+	//dash indexing
+	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;
+	u64 total_bytes_in;
+
+	u32 nb_suspended, cur_file_idx_plus_one;
+	char *cur_file_suffix;
+	Bool notify_filename;
+} GF_TSMuxCtx;
+
+typedef struct
+{
+	GF_ESInterface esi;
+	GF_FilterPid *ipid;
+	GF_M2TS_Mux_Stream *mstream;
+	GF_M2TS_Mux_Program *prog;
+
+	u32 sid;
+	u32 codec_id;
+	u32 pmt_pid;
+	u32 nb_pck;
+	Bool is_repeat;
+	u32 nb_repeat_last;
+
+	GF_TSMuxCtx *ctx;
+	u32 last_cv;
+	//ts media skip
+	s32 media_delay;
+	Bool done;
+
+	u32 temi_id;
+	char *temi_url;
+
+	u32 last_temi_url;
+	char af_data[188];
+
+	Bool rewrite_odf;
+	Bool has_seen_eods;
+	u32 pck_duration;
+
+	u64 loop_ts_offset;
+	u64 last_dts;
+	u32 last_dur;
+
+	char *pck_data_buf;
+
+	u32 suspended;
+} M2Pid;
+
+static u32 tsmux_format_af_descriptor(char *af_data, u32 timeline_id, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 temi_delay, u32 *last_url_time)
+{
+	u32 res;
+	u32 len;
+	u32 last_time;
+	GF_BitStream *bs = gf_bs_new(af_data, 188, GF_BITSTREAM_WRITE);
+
+	if (ntp) {
+		last_time = 1000*(ntp>>32);
+		last_time += 1000*(ntp&0xFFFFFFFF)/0xFFFFFFFF;
+	} else {
+		last_time = (u32) (1000*timecode/timescale);
+	}
+	if (temi_url && (!*last_url_time || (last_time - *last_url_time + 1 >= temi_delay)) ) {
+		*last_url_time = last_time + 1;
+		len = 0;
+		gf_bs_write_int(bs,	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR, 8);
+		gf_bs_write_int(bs,	len, 8);
+
+		gf_bs_write_int(bs,	0, 1); //force_reload
+		gf_bs_write_int(bs,	0, 1); //is_announcement
+		gf_bs_write_int(bs,	0, 1); //splicing_flag
+		gf_bs_write_int(bs,	0, 1); //use_base_temi_url
+		gf_bs_write_int(bs,	0xFF, 5); //reserved
+		gf_bs_write_int(bs,	timeline_id, 7); //timeline_id
+
+		if (strlen(temi_url)) {
+			char *url = (char *)temi_url;
+			if (!strnicmp(temi_url, "http://", 7)) {
+				gf_bs_write_int(bs,	1, 8); //url_scheme
+				url = (char *) temi_url + 7;
+			} else if (!strnicmp(temi_url, "https://", 8)) {
+				gf_bs_write_int(bs,	2, 8); //url_scheme
+				url = (char *) temi_url + 8;
+			} else {
+				gf_bs_write_int(bs,	0, 8); //url_scheme
+			}
+			gf_bs_write_u8(bs, (u32) strlen(url)); //url_path_len
+			gf_bs_write_data(bs, url, (u32) strlen(url) ); //url
+			gf_bs_write_u8(bs, 0); //nb_addons
+		}
+		//rewrite len
+		len = (u32) gf_bs_get_position(bs) - 2;
+		af_data[1] = len;
+	}
+
+	if (timescale || ntp) {
+		Bool use64 = (timecode > 0xFFFFFFFFUL) ? GF_TRUE : GF_FALSE;
+		len = 3; //3 bytes flags
+
+		if (timescale) len += 4 + (use64 ? 8 : 4);
+		if (ntp) len += 8;
+
+		//write timeline descriptor
+		gf_bs_write_int(bs,	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR, 8);
+		gf_bs_write_int(bs,	len, 8);
+
+		gf_bs_write_int(bs,	timescale ? (use64 ? 2 : 1) : 0, 2); //has_timestamp
+		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
+		gf_bs_write_int(bs,	0, 1); //has_ptp
+		gf_bs_write_int(bs,	0, 2); //has_timecode
+		gf_bs_write_int(bs,	0, 1); //force_reload
+		gf_bs_write_int(bs,	0, 1); //paused
+		gf_bs_write_int(bs,	0, 1); //discontinuity
+		gf_bs_write_int(bs,	0xFF, 7); //reserved
+		gf_bs_write_int(bs,	timeline_id, 8); //timeline_id
+		if (timescale) {
+			gf_bs_write_u32(bs,	timescale); //timescale
+			if (use64)
+				gf_bs_write_u64(bs,	timecode); //timestamp
+			else
+				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
+		}
+		if (ntp) {
+			gf_bs_write_u64(bs,	ntp); //ntp
+		}
+	}
+	res = (u32) gf_bs_get_position(bs);
+	gf_bs_del(bs);
+	return res;
+}
+
+
+GF_SLConfig *tsmux_get_sl_config(GF_TSMuxCtx *ctx, u32 timescale, GF_SLConfig *slc)
+{
+	if (!slc) slc = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
+	slc->predefined = 0;
+	slc->useAccessUnitStartFlag = 1;
+	slc->useAccessUnitEndFlag = 1;
+	slc->useRandomAccessPointFlag = 1;
+	slc->useTimestampsFlag = 1;
+	slc->timestampLength = 33;
+	slc->timestampResolution = timescale;
+
+	/*test mode in which time stamps are 90khz and not coded but copied over from PES header*/
+	if (ctx->bifs_pes==2) {
+		slc->timestampLength = 0;
+		slc->timestampResolution = 90000;
+	}
+	return slc;
+}
+
+static void tsmux_rewrite_odf(GF_TSMuxCtx *ctx, GF_ESIPacket *es_pck)
+{
+	u32 com_count, com_index, od_count, esd_index, od_index;
+	GF_ODUpdate *odU;
+	GF_ESDUpdate *esdU;
+	GF_ESD *esd;
+	GF_ODCodec *od_codec = gf_odf_codec_new();
+
+	gf_odf_codec_set_au(od_codec, es_pck->data, es_pck->data_len);
+	gf_odf_codec_decode(od_codec);
+	com_count = gf_list_count(od_codec->CommandList);
+	for (com_index = 0; com_index < com_count; com_index++) {
+		GF_ODCom *com = (GF_ODCom *)gf_list_get(od_codec->CommandList, com_index);
+		switch (com->tag) {
+		case GF_ODF_OD_UPDATE_TAG:
+			odU = (GF_ODUpdate*)com;
+			od_count = gf_list_count(odU->objectDescriptors);
+			for (od_index=0; od_index<od_count; od_index++) {
+				GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, od_index);
+				esd_index = 0;
+				while ( (esd = gf_list_enum(od->ESDescriptors, &esd_index)) ) {
+					assert(esd->slConfig);
+					esd->slConfig = tsmux_get_sl_config(ctx, esd->slConfig->timestampResolution, esd->slConfig);
+				}
+			}
+			break;
+		case GF_ODF_ESD_UPDATE_TAG:
+			esdU = (GF_ESDUpdate*)com;
+			esd_index = 0;
+			while ( (esd = gf_list_enum(esdU->ESDescriptors, &esd_index)) ) {
+					assert(esd->slConfig);
+					esd->slConfig = tsmux_get_sl_config(ctx, esd->slConfig->timestampResolution, esd->slConfig);
+			}
+			break;
+		}
+	}
+	gf_odf_codec_encode(od_codec, 1);
+	es_pck->data = NULL;
+	es_pck->data_len = 0;
+	gf_odf_codec_get_au(od_codec, &es_pck->data, &es_pck->data_len);
+	gf_odf_codec_del(od_codec);
+
+}
+
+static GF_Err tsmux_esi_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
+{
+	u32 cversion;
+	u64 cts, cts_diff;
+	M2Pid *tspid = (M2Pid *)ifce->input_udta;
+	if (!tspid) return GF_BAD_PARAM;
+
+	switch (act_type) {
+	case GF_ESI_INPUT_DATA_FLUSH:
+	{
+		u64 dts;
+		GF_ESIPacket es_pck;
+		const GF_PropertyValue *p;
+		GF_FilterPacket *pck;
+		pck = gf_filter_pid_get_packet(tspid->ipid);
+		//if PMT update is pending after this packet fetch (reconfigure), don't send the packet
+		if (tspid->ctx->pmt_update_pending) return GF_OK;
+
+		if (!pck) {
+			if (gf_filter_pid_is_eos(tspid->ipid)) {
+				if (tspid->ctx->realtime
+					&& tspid->ctx->repeat_img
+					&& (tspid->nb_pck==1)
+					&& (tspid->esi.stream_type==GF_STREAM_VISUAL)
+				) {
+					tspid->nb_repeat_last++;
+					tspid->is_repeat = GF_TRUE;
+				} else {
+					tspid->done = GF_TRUE;
+					ifce->caps |= GF_ESI_STREAM_IS_OVER;
+				}
+				if (tspid->ctx->dash_mode)
+					tspid->has_seen_eods = GF_TRUE;
+			}
+			return GF_OK;
+		}
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		if (tspid->ctx->dash_mode) {
+			if (p && tspid->ctx->dash_seg_num && (tspid->ctx->dash_seg_num != p->value.uint)) {
+				tspid->has_seen_eods = GF_TRUE;
+				tspid->ctx->wait_dash_flush = GF_TRUE;
+				tspid->ctx->dash_seg_num = p->value.uint;
+				tspid->ctx->dash_file_name[0] = 0;
+
+				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;
+			}
+
+			if (tspid->has_seen_eods)
+				return GF_OK;
+
+			if (p)
+				tspid->ctx->dash_seg_num = p->value.uint;
+
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_IDXFILENAME);
+			if (p) {
+				strcpy(tspid->ctx->idx_file_name, p->value.string);
+			}
+
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_EODS);
+			if (p && p->value.boolean) {
+				tspid->has_seen_eods = GF_TRUE;
+				tspid->ctx->wait_dash_flush = GF_TRUE;
+				gf_filter_pid_drop_packet(tspid->ipid);
+				return GF_OK;
+			}
+		} else if (p) {
+			if (!tspid->ctx->cur_file_idx_plus_one) {
+				tspid->ctx->cur_file_idx_plus_one = p->value.uint + 1;
+				if (!tspid->ctx->cur_file_suffix) {
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+					if (p && p->value.string) tspid->ctx->cur_file_suffix = gf_strdup(p->value.string);
+				}
+				tspid->ctx->notify_filename = GF_TRUE;
+			} else if (tspid->ctx->cur_file_idx_plus_one == p->value.uint+1) {
+			} else if (tspid->suspended) {
+				return GF_OK;
+			} else if (!tspid->ctx->notify_filename) {
+				tspid->suspended = GF_TRUE;
+				tspid->ctx->nb_suspended++;
+				if (tspid->ctx->nb_suspended==1) {
+					tspid->ctx->cur_file_idx_plus_one = p->value.uint + 1;
+					p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+					if (p && p->value.string && !tspid->ctx->cur_file_suffix)
+						tspid->ctx->cur_file_suffix = gf_strdup(p->value.string);
+				}
+				ifce->caps |= GF_ESI_STREAM_IS_OVER;
+				return GF_OK;
+			} else {
+				//notify filename pending
+				return GF_OK;
+			}
+		}
+
+		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);
+		tspid->pck_duration = gf_filter_pck_get_duration(pck);
+		cversion = gf_filter_pck_get_carousel_version(pck);
+		if (cversion+1 == tspid->last_cv) {
+			es_pck.flags |= GF_ESI_DATA_REPEAT;
+		}
+		tspid->last_cv = cversion+1;
+
+		if (tspid->is_repeat)
+			es_pck.flags |= GF_ESI_DATA_REPEAT;
+
+		cts = gf_filter_pck_get_cts(pck);
+		dts = gf_filter_pck_get_dts(pck);
+		if (dts != GF_FILTER_NO_TS) {
+			dts += tspid->loop_ts_offset;
+			//loop detected
+			if (tspid->last_dts && (dts<tspid->last_dts)) {
+				dts -= tspid->loop_ts_offset;
+				tspid->loop_ts_offset = tspid->last_dts - dts + tspid->last_dur;
+				dts += tspid->loop_ts_offset;
+			}
+		}
+		if (cts != GF_FILTER_NO_TS) {
+			cts += tspid->loop_ts_offset;
+		}
+
+		es_pck.cts = cts;
+		if (tspid->temi_id) {
+			u64 ntp=0;
+			//TOCHECK: do we want media timeline or composition timeline ?
+			u64 tc = cts;
+			if (tspid->ctx->temi_offset) {
+				tc += ((u64) tspid->ctx->temi_offset) * ifce->timescale / 1000;
+			}
+
+			if (tspid->ctx->temi_ntp) {
+				u32 sec, frac;
+				gf_net_get_ntp(&sec, &frac);
+				ntp = sec;
+				ntp <<= 32;
+				ntp |= frac;
+			}
+			es_pck.mpeg2_af_descriptors_size = tsmux_format_af_descriptor(tspid->af_data, tspid->temi_id, tc, tspid->esi.timescale, ntp, tspid->temi_url, tspid->ctx->temi_delay, &tspid->last_temi_url);
+			es_pck.mpeg2_af_descriptors = tspid->af_data;
+		}
+		es_pck.cts += tspid->prog->max_media_skip + tspid->media_delay;
+
+		if (tspid->nb_repeat_last) {
+			es_pck.cts += tspid->nb_repeat_last * ifce->timescale * tspid->ctx->repeat_img / 1000;
+		}
+
+		cts_diff = 0;
+		if (tspid->prog->cts_offset) {
+			cts_diff = tspid->prog->cts_offset;
+			cts_diff *= tspid->esi.timescale;
+			cts_diff /= 1000000;
+
+			es_pck.cts += cts_diff;
+		}
+
+		es_pck.dts = es_pck.cts;
+		if (dts != GF_FILTER_NO_TS) {
+			tspid->last_dts = dts;
+			es_pck.dts = dts;
+			es_pck.dts += tspid->prog->max_media_skip + tspid->media_delay;
+
+			if (es_pck.dts > es_pck.cts) {
+				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;
+				assert(tspid->prog->cts_offset <= diff);
+				tspid->prog->cts_offset += (u32) diff;
+
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TSMux] Packet CTS "LLU" is less than packet DTS "LLU", adjusting all CTS by %d / %d!\n", es_pck.cts, es_pck.dts, cts_diff, tspid->esi.timescale));
+
+				es_pck.cts += cts_diff;
+			}
+			if (tspid->esi.stream_type!=GF_STREAM_VISUAL) {
+				es_pck.dts += cts_diff;
+			}
+
+			if (es_pck.dts != es_pck.cts) {
+				es_pck.flags |= GF_ESI_DATA_HAS_DTS;
+			}
+		}
+		es_pck.data = (char *) gf_filter_pck_get_data(pck, &es_pck.data_len);
+		es_pck.duration = gf_filter_pck_get_duration(pck);
+		tspid->last_dur = es_pck.duration;
+
+		if (tspid->rewrite_odf) {
+			tsmux_rewrite_odf(tspid->ctx, &es_pck);
+		}
+
+		tspid->ctx->total_bytes_in += es_pck.data_len;
+
+		if (tspid->pck_data_buf) gf_free(tspid->pck_data_buf);
+		tspid->pck_data_buf = NULL;
+
+		//drop formatting for TX3G
+		if (tspid->codec_id == GF_CODECID_TX3G) {
+			u16 len = es_pck.data[0];
+			len<<=8;
+			len |= es_pck.data[1];
+			es_pck.data += 2;
+			es_pck.data_len = len;
+		}
+		//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);
+			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);
+			for (i = 0; i < gf_list_count(cues); i++) {
+				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
+				webvtt_write_cue(bs, cue);
+				gf_webvtt_cue_del(cue);
+			}
+			gf_list_del(cues);
+			gf_bs_get_content(bs, &es_pck.data, &es_pck.data_len);
+			gf_bs_del(bs);
+			tspid->pck_data_buf = es_pck.data;
+		}
+		//for TTML we keep the entire payload as a PES packet
+
+		tspid->nb_pck++;
+		ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &es_pck);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[M2TSMux] PID %d: packet %d CTS "LLU"\n", tspid->esi.stream_id, tspid->nb_pck, es_pck.cts));
+
+		//data is copied by muxer for now, should need rewrite to avoid un-needed allocations
+		gf_filter_pid_drop_packet(tspid->ipid);
+
+		if (tspid->rewrite_odf) {
+			gf_free(es_pck.data);
+		}
+
+	}
+	return GF_OK;
+
+	case GF_ESI_INPUT_DESTROY:
+		return GF_OK;
+	default:
+		return GF_BAD_PARAM;
+	}
+}
+
+
+void update_m4sys_info(GF_TSMuxCtx *ctx, GF_M2TS_Mux_Program *prog)
+{
+	GF_M2TS_Mux_Stream *stream = prog->streams;
+
+	if (prog->iod) gf_odf_desc_del(prog->iod);
+	prog->iod = gf_odf_desc_new(GF_ODF_IOD_TAG);
+	while (stream) {
+		M2Pid *tspid = (M2Pid *)stream->ifce->input_udta;
+		const GF_PropertyValue *p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_IN_IOD);
+		if (p && p->value.boolean) {
+			GF_ESD *esd = gf_odf_desc_esd_new(0);
+			esd->decoderConfig->objectTypeIndication = stream->ifce->codecid;
+			esd->decoderConfig->streamType = stream->ifce->stream_type;
+			esd->ESID = stream->ifce->stream_id;
+			esd->dependsOnESID = stream->ifce->depends_on_stream;
+			if (stream->ifce->decoder_config_size) {
+				esd->decoderConfig->decoderSpecificInfo->data = gf_malloc(sizeof(char)*stream->ifce->decoder_config_size);
+				memcpy(esd->decoderConfig->decoderSpecificInfo->data, stream->ifce->decoder_config, stream->ifce->decoder_config_size);
+				esd->decoderConfig->decoderSpecificInfo->dataLength = stream->ifce->decoder_config_size;
+			}
+			tsmux_get_sl_config(ctx, stream->ifce->timescale, esd->slConfig);
+			gf_list_add( ((GF_ObjectDescriptor *)prog->iod)->ESDescriptors, esd);
+		}
+		stream->ifce->sl_config = tsmux_get_sl_config(ctx, stream->ifce->timescale, stream->ifce->sl_config);
+		stream = stream->next;
+	}
+}
+
+static void tsmux_setup_esi(GF_TSMuxCtx *ctx, GF_M2TS_Mux_Program *prog, M2Pid *tspid, u32 stream_type)
+{
+	const GF_PropertyValue *p;
+
+	memset(&tspid->esi, 0, sizeof(GF_ESInterface));
+	tspid->esi.stream_type = stream_type;
+	
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_TIMESCALE);
+	tspid->esi.timescale = p->value.uint;
+
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (p) {
+		tspid->esi.decoder_config = p->value.data.ptr;
+		tspid->esi.decoder_config_size = p->value.data.size;
+	}
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_ID);
+	if (p) tspid->esi.stream_id = p->value.uint;
+
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) tspid->esi.depends_on_stream = p->value.uint;
+
+	tspid->esi.codecid = tspid->codec_id;
+
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_LANGUAGE);
+	if (p) {
+		s32 idx = gf_lang_find(p->value.string);
+		if (idx>=0) {
+			const char *code = gf_lang_get_3cc(idx);
+			if (code) tspid->esi.lang = GF_4CC(code[0], code[1], code[2], ' ');
+		}
+	}
+
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_DURATION);
+	if (p) {
+		tspid->esi.duration = (Double) p->value.lfrac.num;
+		tspid->esi.duration /= p->value.lfrac.den;
+	}
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_BITRATE);
+	if (p) tspid->esi.bit_rate = p->value.uint;
+	/*repeat rate in ms for carrouseling - 0 if no repeat*/
+
+	tspid->esi.repeat_rate = ctx->repeat_rate;
+	p = gf_filter_pid_get_property(tspid->ipid, GF_PROP_PID_CAROUSEL_RATE);
+	if (p) tspid->esi.repeat_rate = p->value.uint;
+
+	tspid->rewrite_odf = GF_FALSE;
+	if (tspid->esi.stream_type==GF_STREAM_OD) {
+		tspid->rewrite_odf = GF_TRUE;
+		update_m4sys_info(ctx, prog);
+	} else if (prog->iod) {
+		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;
+	case GF_STREAM_VISUAL:
+		if (ctx->mpeg4==2) {
+			tspid->esi.caps |= GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS;
+		}
+		break;
+	}
+
+	tspid->esi.input_ctrl = tsmux_esi_ctrl;
+	tspid->esi.input_udta = tspid;
+	tspid->prog = prog;
+}
+
+static void tsmux_setup_temi(GF_TSMuxCtx *ctx, M2Pid *tspid)
+{
+	GF_M2TS_Mux_Stream *a_stream;
+	u32 service_id=0;
+	u32 st_idx=0;
+	char *turl = ctx->temi;
+	if (!turl) return;
+	u32 idx = 0;
+	u32 temi_id=0;
+
+	//find our stream index
+	a_stream = tspid->mstream->program->streams;
+	while (a_stream) {
+		if (tspid->mstream == a_stream) break;
+		st_idx++;
+		a_stream = a_stream->next;
+	}
+
+	while (turl) {
+		char *sep;
+		if (turl[0]=='#') {
+			sscanf(turl, "#%d#", &service_id);
+			turl = strchr(turl+1, '#');
+			if (!turl) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSMux] Invalid temi syntax, expecting #SID# but got nothing\n"));
+				return;
+			}
+			turl += 1;
+			idx = 0;
+		}
+
+		sep = strchr(turl, ',');
+		if (sep) sep[0] = 0;
+
+		if (strlen(turl) && (idx==st_idx) && (!service_id || (service_id == tspid->mstream->program->number) ))  {
+			tspid->temi_id = atoi(turl);
+			if (!tspid->temi_id) {
+				tspid->temi_url = gf_strdup(turl);
+				tspid->temi_id = temi_id+1;
+			}
+		}
+		idx++;
+		if (!sep) break;
+		sep[0] = ',';
+		turl = sep+1;
+	}
+}
+
+static void tsmux_del_stream(M2Pid *tspid)
+{
+	if (tspid->temi_url) gf_free(tspid->temi_url);
+	if (tspid->esi.sl_config) gf_free(tspid->esi.sl_config);
+	if (tspid->pck_data_buf) gf_free(tspid->pck_data_buf);
+	gf_free(tspid);
+}
+
+static GF_Err tsmux_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 service_id, codec_id, streamtype;
+	GF_M2TS_Mux_Stream *ts_stream;
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	M2Pid *tspid=NULL;
+	char *sname, *pname;
+	GF_M2TS_Mux_Program *prog;
+	GF_TSMuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		tspid = gf_filter_pid_get_udta(pid);
+		if (!tspid) return GF_OK;
+		//remove stream - this will update PMT as well
+		gf_m2ts_program_stream_remove(tspid->mstream);
+		//destroy or object
+		gf_list_del_item(ctx->pids, tspid);
+		tsmux_del_stream(tspid);
+		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;
+	codec_id = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	streamtype = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_ID);
+	service_id = p ? p->value.uint : ctx->sid;
+
+	sname = ctx->name;
+	pname = ctx->provider;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_NAME);
+	if (p) sname = p->value.string;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_PROVIDER);
+	if (p) pname = p->value.string;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_name(ctx->opid, "ts_mux");
+	}
+	//set output properties at init or reconfig
+	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_UNFRAMED, NULL);
+	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_FILE_EXT, &PROP_STRING("ts") );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_FAKE_MP2T));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(90000));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_NO_TS_LOOP, &PROP_BOOL(GF_TRUE));
+
+	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;
+		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);
+		}
+	}
+	gf_filter_release_property(pe);
+
+	tspid = gf_filter_pid_get_udta(pid);
+	if (!tspid) {
+		GF_SAFEALLOC(tspid, M2Pid);
+		if (!tspid) return GF_OUT_OF_MEM;
+		gf_filter_pid_set_udta(pid, tspid);
+		tspid->ipid = pid;
+		tspid->sid = service_id;
+		tspid->ctx = ctx;
+		gf_list_add(ctx->pids, tspid);
+		gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+		if (ctx->breq) {
+			GF_FilterEvent evt;
+			GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, pid);
+			evt.buffer_req.max_buffer_us = 1000*ctx->breq;
+			evt.buffer_req.pid_only = GF_TRUE;
+			gf_filter_pid_send_event(pid, &evt);
+		}
+	}
+
+	//do we need a new program
+	prog = gf_m2ts_mux_program_find(ctx->mux, service_id);
+	if (!prog) {
+		u32 nb_progs;
+		u32 pcr_offset=0;
+		u32 pmt_id = ctx->pmt_id;
+
+		if (!pmt_id) pmt_id = 100;
+		nb_progs = gf_m2ts_mux_program_count(ctx->mux);
+		if (nb_progs>1) {
+			if (ctx->dash_mode) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSMux] Muxing several programs (%d) in DASH mode is not allowed\n", nb_progs+1));
+				return GF_BAD_PARAM;
+			}
+			pmt_id += (nb_progs - 1) * 100;
+		}
+
+		if (ctx->pcr_offset==(u32)-1) {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_MAX_FRAME_SIZE);
+			if (p && p->value.uint && ctx->rate) {
+				Double r = p->value.uint * 8;
+				r *= 90000;
+				r/= ctx->rate;
+				//add 10% of safety to cover TS signaling and other potential table update while sending the largest PES
+				r *= 1.1;
+				pcr_offset = (u32) r;
+			}
+		} else {
+			pcr_offset = ctx->pcr_offset;
+		}
+
+		prog = gf_m2ts_mux_program_add(ctx->mux, service_id, pmt_id, ctx->pmt_rate, pcr_offset, ctx->mpeg4, ctx->pmt_version, ctx->disc);
+
+		if (sname) gf_m2ts_mux_program_set_name(prog, sname, pname);
+
+		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;
+
+	if (!tspid->codec_id) {
+		Bool is_pcr=GF_FALSE;
+		Bool force_pes=GF_FALSE;
+		u32 pes_pid;
+		assert(!tspid->esi.stream_type);
+		tspid->codec_id = codec_id;
+		tspid->esi.stream_type = streamtype;
+
+		if (ctx->bifs_pes && (tspid->esi.stream_type==GF_STREAM_SCENE))
+			force_pes = GF_TRUE;
+
+		pes_pid = gf_m2ts_mux_program_get_pmt_pid(prog);
+		pes_pid += 1 + gf_m2ts_mux_program_get_stream_count(prog);
+		if (gf_m2ts_mux_program_get_pcr_pid(prog)==0) {
+			if (streamtype==GF_STREAM_VISUAL)
+				is_pcr = GF_TRUE;
+			else
+				ctx->check_pcr = GF_TRUE;
+			//if no video track we will update the PCR at the first packets
+		}
+
+		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);
+	} else {
+		tspid->codec_id = codec_id;
+		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;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DELAY);
+	if (p) {
+		tspid->media_delay = p->value.sint;
+
+		//compute max ts skip for this program
+		prog->max_media_skip = 0;
+		ts_stream = prog->streams;
+		while (ts_stream) {
+			M2Pid *atspid = ts_stream->ifce->input_udta;
+			s32 media_skip = -atspid->media_delay;
+			if (media_skip  > prog->max_media_skip)
+				prog->max_media_skip = media_skip ;
+			ts_stream = ts_stream->next;
+		}
+	}
+	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;
+		if (diff > tspid->prog->cts_offset)
+			tspid->prog->cts_offset = (u32) diff;
+	}
+	return GF_OK;
+}
+
+static void tsmux_assign_pcr(GF_TSMuxCtx *ctx)
+{
+	GF_M2TS_Mux_Program *prog = ctx->mux->programs;
+	while (prog) {
+		GF_M2TS_Mux_Stream *stream;
+		if (prog->pcr) {
+			prog = prog->next;
+			continue;
+		}
+		stream = prog->streams;
+		while (stream) {
+			if (stream->ifce->stream_type==GF_STREAM_VISUAL) {
+				prog->pcr = stream;
+				break;
+			}
+			stream = stream->next;
+		}
+		if (!prog->pcr) prog->pcr = prog->streams;
+		ctx->update_mux = GF_TRUE;
+		prog = prog->next;
+	}
+}
+
+static Bool tsmux_init_buffering(GF_Filter *filter, GF_TSMuxCtx *ctx)
+{
+	u32 mbuf = ctx->breq*1000;
+	u32 i, count = gf_filter_get_ipid_count(filter);
+	for (i=0; i<count; i++) {
+		u32 buf;
+		Bool buf_ok;
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		buf_ok = gf_filter_pid_get_buffer_occupancy(pid, NULL, NULL, NULL, &buf);
+		if (buf_ok && (buf < mbuf) && !gf_filter_pid_has_seen_eos(pid))
+			return GF_FALSE;
+	}
+	ctx->init_buffering = GF_FALSE;
+	gf_m2ts_mux_update_config(ctx->mux, GF_TRUE);
+	return GF_TRUE;
+}
+
+static void tsmux_send_seg_event(GF_Filter *filter, GF_TSMuxCtx *ctx)
+{
+	GF_FilterEvent evt;
+	u32 i;
+	M2Pid *tspid = NULL;
+
+	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;
+		tspid = NULL;
+	}
+	if (!tspid) tspid = gf_list_get(ctx->pids, 0);
+
+	if (ctx->nb_sidx_entries) {
+		GF_FilterPacket *idx_pck;
+		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;
+
+		if (ctx->sidx_entries[ctx->nb_sidx_entries-1].sap_time > 0xFFFFFFFFUL)
+			large_sidx = GF_TRUE;
+		if (ctx->sidx_entries[0].offset*188 > 0xFFFFFFFFUL)
+			large_sidx = GF_TRUE;
+
+		//styp box: 8(box) + 4(major) + 4(version) + 4(compat brand)
+		segidx_size = 20;
+		//sidx size: 12 (fullbox) + 8 + large ? 16 : 8 + 4 + nb_entries+12
+		segidx_size += 24 +( large_sidx ? 16 : 8) + ctx->nb_sidx_entries*12;
+
+		if (!ctx->idx_opid) {
+			ctx->idx_filter = gf_filter_connect_destination(filter, ctx->idx_file_name, NULL);
+			ctx->idx_opid = gf_filter_pid_new(filter);
+			gf_filter_pid_set_property(ctx->idx_opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+			gf_filter_pid_set_property(ctx->idx_opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("*") );
+			gf_filter_pid_set_property(ctx->idx_opid, GF_PROP_PID_MIME, &PROP_STRING("*") );
+			gf_filter_pid_set_name(ctx->idx_opid, "ts_idx");
+		}
+		idx_pck = gf_filter_pck_new_alloc(ctx->idx_opid, segidx_size, &output);
+
+		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);
+
+		//write styp box
+		gf_bs_write_u32(ctx->idx_bs, 20);
+		gf_bs_write_u32(ctx->idx_bs, GF_4CC('s','t','y','p') );
+		gf_bs_write_u32(ctx->idx_bs, GF_4CC('s','i','s','x') );
+		gf_bs_write_u32(ctx->idx_bs, 0);
+		gf_bs_write_u32(ctx->idx_bs, GF_4CC('s','i','s','x') );
+
+		//write sidx box
+		gf_bs_write_u32(ctx->idx_bs, segidx_size - 20);
+		gf_bs_write_u32(ctx->idx_bs, GF_4CC('s','i','d','x') );
+		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);
+		//timescale
+		gf_bs_write_u32(ctx->idx_bs, 90000);
+		if (large_sidx) {
+			gf_bs_write_u64(ctx->idx_bs, ctx->sidx_entries[0].min_pts_plus_one-1);
+			gf_bs_write_u64(ctx->idx_bs, ctx->sidx_entries[0].offset*188);
+		} else {
+			gf_bs_write_u32(ctx->idx_bs, (u32) ctx->sidx_entries[0].min_pts_plus_one-1);
+			gf_bs_write_u32(ctx->idx_bs, (u32) ctx->sidx_entries[0].offset*188);
+		}
+		gf_bs_write_u16(ctx->idx_bs, 0);
+		gf_bs_write_u16(ctx->idx_bs, ctx->nb_sidx_entries);
+		for (i=0; i<ctx->nb_sidx_entries; i++) {
+			u64 duration = ctx->sidx_entries[i].max_pts - (ctx->sidx_entries[i].min_pts_plus_one-1);
+			if (i+1 == ctx->nb_sidx_entries) duration += last_pck_dur;
+
+			gf_bs_write_int(ctx->idx_bs, 0, 1);
+			gf_bs_write_int(ctx->idx_bs, ctx->sidx_entries[i].nb_pck * 188, 31);
+			gf_bs_write_int(ctx->idx_bs, (u32) duration, 32);
+			gf_bs_write_int(ctx->idx_bs, ctx->sidx_entries[i].sap_type ? 1 : 0, 1);
+			gf_bs_write_int(ctx->idx_bs, ctx->sidx_entries[i].sap_type, 3);
+			gf_bs_write_int(ctx->idx_bs, (u32) (ctx->sidx_entries[i].sap_time - (ctx->sidx_entries[i].min_pts_plus_one-1) ), 28);
+		}
+		gf_filter_pck_set_property(idx_pck, GF_PROP_PCK_FILENAME, &PROP_STRING(ctx->idx_file_name) );
+
+		gf_filter_pck_send(idx_pck);
+		ctx->nb_sidx_entries = 0;
+	}
+
+
+	GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, tspid->ipid);
+	evt.seg_size.media_range_start = 188*ctx->pck_start_idx;
+	evt.seg_size.media_range_end = evt.seg_size.media_range_start + 188*ctx->nb_pck_in_seg - 1;
+
+	gf_filter_pid_send_event(tspid->ipid, &evt);
+	ctx->nb_pck_in_seg = 0;
+	ctx->nb_sidx_entries = 0;
+}
+
+static void tsmux_insert_sidx(GF_TSMuxCtx *ctx, Bool final_flush)
+{
+	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->nb_sidx_entries) {
+		TS_SIDX *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->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 (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);
+	}
+	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 ++;
+}
+
+static GF_Err tsmux_process(GF_Filter *filter)
+{
+	u32 nb_pck_in_pack, nb_pck_in_call;
+	GF_M2TSMuxState status;
+	u32 usec_till_next;
+	GF_FilterPacket *pck;
+	GF_TSMuxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->check_pcr) {
+		ctx->check_pcr = GF_FALSE;
+		tsmux_assign_pcr(ctx);
+	}
+
+	if (ctx->init_buffering && !tsmux_init_buffering(filter, ctx)) return GF_OK;
+
+	if (ctx->init_dash) {
+		u32 i, count = gf_list_count(ctx->pids);
+		for (i=0; i<count; i++) {
+			const GF_PropertyValue *p;
+			M2Pid *tspid = gf_list_get(ctx->pids, i);
+			pck = gf_filter_pid_get_packet(tspid->ipid);
+			if (!pck) return GF_OK;
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (p)
+				tspid->ctx->dash_seg_num = p->value.uint;
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+			if (p)
+				strcpy(tspid->ctx->dash_file_name, p->value.string);
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_IDXFILENAME);
+			if (p)
+				strcpy(tspid->ctx->idx_file_name, p->value.string);
+		}
+		ctx->init_dash = GF_FALSE;
+		ctx->next_is_start = GF_TRUE;
+		ctx->wait_dash_flush = GF_FALSE;
+	}
+
+	if (ctx->update_mux) {
+		gf_m2ts_mux_update_config(ctx->mux, GF_FALSE);
+	}
+
+
+	if (ctx->wait_dash_flush) {
+		u32 i, done=0, count = gf_list_count(ctx->pids);
+		for (i=0; i<count; i++) {
+			M2Pid *tspid = gf_list_get(ctx->pids, i);
+			if (tspid->has_seen_eods) done++;
+		}
+
+		if (done==count) {
+			for (i=0; i<count; i++) {
+				M2Pid *tspid = gf_list_get(ctx->pids, i);
+				tspid->has_seen_eods = 0;
+			}
+			ctx->dash_seg_num = 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->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;
+		}
+	}
+
+	nb_pck_in_call = 0;
+	nb_pck_in_pack=0;
+	while (1) {
+		u64 pck_ts;
+		u8 *output;
+		u32 osize;
+		Bool is_pack_flush = GF_FALSE;
+		const char *ts_pck;
+
+		ts_pck = gf_m2ts_mux_process(ctx->mux, &status, &usec_till_next);
+		if (ts_pck == NULL) {
+			if (!nb_pck_in_pack)
+				break;
+			ts_pck = (const char *) ctx->pack_buffer;
+			is_pack_flush = GF_TRUE;
+		} else {
+
+			tsmux_insert_sidx(ctx, GF_FALSE);
+
+			if (ctx->nb_pack>1) {
+				memcpy(ctx->pack_buffer + 188 * nb_pck_in_pack, ts_pck, 188);
+				nb_pck_in_pack++;
+
+				if (nb_pck_in_pack < ctx->nb_pack)
+					continue;
+
+				ts_pck = (const char *) ctx->pack_buffer;
+			} else {
+				nb_pck_in_pack = 1;
+			}
+		}
+		osize = nb_pck_in_pack * 188;
+		pck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+		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);
+
+		if (ctx->next_is_start && ctx->dash_mode) {
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->dash_seg_num) );
+			if (ctx->dash_file_name[0])
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENAME, &PROP_STRING(ctx->dash_file_name) ) ;
+
+			ctx->dash_file_name[0] = 0;
+			ctx->next_is_start = GF_FALSE;
+		}
+
+		pck_ts = gf_m2ts_get_ts_clock_90k(ctx->mux);
+		gf_filter_pck_set_dts(pck, pck_ts);
+		gf_filter_pck_set_cts(pck, pck_ts);
+
+		if (ctx->notify_filename) {
+			gf_filter_pck_set_framing(pck, GF_TRUE, (status==GF_M2TS_STATE_EOS) ? GF_TRUE : GF_FALSE);
+			gf_filter_pck_set_property(pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->cur_file_idx_plus_one-1));
+			if (ctx->cur_file_suffix) {
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_FILESUF, &PROP_STRING_NO_COPY(ctx->cur_file_suffix));
+				ctx->cur_file_suffix = NULL;
+			}
+			ctx->notify_filename = GF_FALSE;
+		}
+		gf_filter_pck_send(pck);
+		ctx->nb_pck += nb_pck_in_pack;
+		ctx->nb_pck_in_seg++;
+		ctx->nb_pck_in_file++;
+		nb_pck_in_call += nb_pck_in_pack;
+		nb_pck_in_pack = 0;
+
+		if (is_pack_flush)
+			break;
+
+		if (status>=GF_M2TS_STATE_PADDING) {
+			break;
+		}
+		if (nb_pck_in_call>100)
+			break;
+	}
+
+	if (gf_filter_reporting_enabled(filter)) {
+		char szStatus[1024];
+		if (status==GF_M2TS_STATE_EOS) {
+			Double ohead = 0;
+			u64 total_bytes_out = ctx->nb_pck;
+			total_bytes_out *= 188;
+
+			if (ctx->total_bytes_in) ohead =  ((Double) (total_bytes_out - ctx->total_bytes_in)*100 / ctx->total_bytes_in);
+
+			sprintf(szStatus, "done - TS clock % 6d ms bitrate %d kbps - bytes "LLD" in "LLD" out overhead %02.02f%%", gf_m2ts_get_ts_clock(ctx->mux), ctx->mux->bit_rate/1000, ctx->total_bytes_in, total_bytes_out, ohead);
+			gf_filter_update_status(filter, 10000, szStatus);
+		} else {
+
+			sprintf(szStatus, "sysclock % 6d ms TS clock % 6d ms bitrate % 8d kbps", gf_m2ts_get_sys_clock(ctx->mux), gf_m2ts_get_ts_clock(ctx->mux), ctx->mux->bit_rate/1000);
+			gf_filter_update_status(filter, -1, szStatus);
+		}
+	}
+
+	if (ctx->nb_suspended && (ctx->nb_suspended==gf_list_count(ctx->pids)) ) {
+		u32 i, count = gf_list_count(ctx->pids);
+		for (i=0; i<count; i++) {
+			M2Pid *tspid = gf_list_get(ctx->pids, i);
+			tspid->esi.caps &= ~GF_ESI_STREAM_IS_OVER;
+			tspid->suspended = GF_FALSE;
+		}
+		ctx->nb_suspended = 0;
+		ctx->mux->force_pat = GF_TRUE;
+		ctx->notify_filename = GF_TRUE;
+		status = GF_M2TS_STATE_IDLE;
+	}
+
+	if (status==GF_M2TS_STATE_EOS) {
+		gf_filter_pid_set_eos(ctx->opid);
+		if (ctx->nb_pck_in_seg) {
+			tsmux_insert_sidx(ctx, GF_TRUE);
+			tsmux_send_seg_event(filter, ctx);
+			ctx->nb_pck_in_seg = 0;
+		}
+		return GF_EOS;
+	}
+
+	if (ctx->realtime) {
+		u32 now = gf_sys_clock();
+		if (!ctx->last_log_time)
+			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));
+		}
+		if (status == GF_M2TS_STATE_IDLE) {
+#if 0
+			u64 sleep_for=0;
+			/*wait till next packet is ready to be sent*/
+			if (usec_till_next>1000) {
+				sleep_for = usec_till_next;
+			}
+			if (sleep_for)
+				gf_filter_ask_rt_reschedule(filter, (u32) sleep_for);
+#else
+			//we don't have enough precision on usec counting and we end up eating one core on most machines,
+			// so let's just sleep one ms whenever we are idle - it's maybe too much but the muxer will catchup afterwards
+			gf_filter_ask_rt_reschedule(filter, 1000);
+#endif
+		}
+	}
+	//PMT update management is still under progress...
+	ctx->pmt_update_pending = 0;
+
+	return GF_OK;
+}
+
+static GF_Err tsmux_initialize(GF_Filter *filter)
+{
+	GF_TSMuxCtx *ctx = gf_filter_get_udta(filter);
+	gf_filter_set_max_extra_input_pids(filter, -1);
+
+	ctx->mux = gf_m2ts_mux_new(ctx->rate, ctx->pat_rate, ctx->realtime);
+	ctx->mux->flush_pes_at_rap = ctx->flush_rap;
+
+	if (gf_sys_is_test_mode() && ctx->pcr_init<0)
+		ctx->pcr_init = 1000000;
+
+	gf_m2ts_mux_use_single_au_pes_mode(ctx->mux, ctx->pes_pack);
+	if (ctx->pcr_init>=0) gf_m2ts_mux_set_initial_pcr(ctx->mux, (u64) ctx->pcr_init);
+	gf_m2ts_mux_set_pcr_max_interval(ctx->mux, ctx->max_pcr);
+	gf_m2ts_mux_enable_pcr_only_packets(ctx->mux, ctx->pcr_only);
+
+	if (!ctx->sid) ctx->sid = 1;
+	if (ctx->sdt_rate) {
+		gf_m2ts_mux_enable_sdt(ctx->mux, ctx->sdt_rate);
+	}
+
+	if (!gf_filter_block_enabled(filter)) {
+		ctx->breq = 0;
+	} else {
+		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);
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_m2ts_get_sys_clock(ctx->mux);
+	}
+#endif
+	return GF_OK;
+}
+
+
+static void tsmux_finalize(GF_Filter *filter)
+{
+	GF_TSMuxCtx *ctx = gf_filter_get_udta(filter);
+#ifndef GPAC_DISABLE_LOG
+	u64 bits = ctx->mux->tot_pck_sent*8*188;
+#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",
+		((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)
+	));
+
+	while (gf_list_count(ctx->pids)) {
+		M2Pid *tspid = gf_list_pop_back(ctx->pids);
+		tsmux_del_stream(tspid);
+	}
+	gf_list_del(ctx->pids);
+	gf_m2ts_mux_del(ctx->mux);
+	if (ctx->pack_buffer) gf_free(ctx->pack_buffer);
+	if (ctx->sidx_entries) gf_free(ctx->sidx_entries);
+	if (ctx->idx_bs) gf_bs_del(ctx->idx_bs);
+	if (ctx->cur_file_suffix) gf_free(ctx->cur_file_suffix);
+}
+
+static Bool tsmux_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if ((evt->base.type==GF_FEVT_STOP) || (evt->base.type==GF_FEVT_PLAY) ) {
+		u32 i;
+		GF_TSMuxCtx *ctx = gf_filter_get_udta(filter);
+		for (i=0; i<gf_list_count(ctx->pids); i++) {
+			M2Pid *tspid = gf_list_get(ctx->pids, i);
+			if (evt->base.type==GF_FEVT_STOP)
+				tspid->esi.caps |= GF_ESI_STREAM_IS_OVER;
+			else
+				tspid->esi.caps &= ~GF_ESI_STREAM_IS_OVER;
+		}
+	}
+	return GF_FALSE;
+}
+
+static const GF_FilterCapability TSMuxCaps[] =
+{
+	//first set of caps describe streams that need reframing (NAL)
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	//unframed streams only
+	CAP_BOOL(GF_CAPS_INPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	//for NAL-based, we want annexB format
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_AVC),
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_CODECID, GF_CODECID_MVC),
+	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),
+	//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
+
+	//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, "ts|m2t|mts|dmb|trp"),
+	CAP_STRING(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg"),
+	{0},
+	
+	//for now don't accept files as input, although we could store them as items, to refine
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	//these caps are framed
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	//exclude caps from above
+	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_MVC),
+	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_MPEG4_PART2),
+	//no RAW support for now
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+};
+
+
+#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(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(pcr_offset), "offset all timestamps from PCR by V, in 90kHz. Default value is computed based on input media", GF_PROP_UINT, "-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 overriden by carousel duration PID property if defined", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(repeat_img), "interval in ms between resending (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"\
+		"- 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"
+	"- on: uses BIFS PES\n"
+	"- off: uses BIFS sections\n"
+	"- 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(temi_delay), "set delay in ms between two TEMI url descriptors", GF_PROP_UINT, "1000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(temi_offset), "set offset in ms  to add to TEMI timecodes", GF_PROP_UINT, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(temi_ntp), "insert NTP timestamp in TEMI timeline descriptor", GF_PROP_BOOL, "false", 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},
+	{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"
+		"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 overriden by input PID property `ServiceName`.\n"
+		"[-provider]() option is overriden by input PID property `ServiceProvider`.\n"
+		"\n"
+		"# Time and External Media Information (TEMI)\n"
+		"The [-temi]() option allows specifying a list of URLs or timeline IDs to insert in the program.\n"
+		"Only a single TEMI timeline can be specified per PID.\n"
+		"The syntax is a comma-separated list of one or more TEMI description, each of them separated by '#'\n"
+		"Each TEMI description is formated as #ServiceID#ID_OR_URL, with:\n"
+		"- ServiceID: optional, number indicating the target serviceID\n"
+		"- ID_OR_URL: If numbern indicates the TEMI ID to use for external timeline. Otherwise, gives the URL to insert\n"
+		"Each comma-separated description designs a stream index in the target service.\n"
+		"EX temi=\"url\"\nIinserts a TEMI URL+timecode in the first stream of all programs.\n"
+		"EX temi=\"url,4\"\n"
+		"Inserts a TEMI URL+timecode in the first stream of all programs and an external TEMI with ID 4 in the second stream of all programs.\n"
+		"EX temi=\"#20#4,#10#URL\"\n"
+		"Inserts an external TEMI with ID 4 in the first stream of program with ServiceID 20 and a TEMI URL to the second stream of program with ServiceID 10.\n"
+		"EX temi=\"#20#4,,#10#URL\"\n"
+		"Inserts an external TEMI with ID 4 in the first stream of program with ServiceID 20 and a TEMI URL to the third stream of program with ServiceID 10 (and nothing on second stream).\n"
+		"\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"
+	)
+	.private_size = sizeof(GF_TSMuxCtx),
+	.args = TSMuxArgs,
+	.initialize = tsmux_initialize,
+	.finalize = tsmux_finalize,
+	.flags = GF_FS_REG_DYNAMIC_REDIRECT,
+	SETCAPS(TSMuxCaps),
+	.configure_pid = tsmux_configure_pid,
+	.process = tsmux_process,
+	.process_event = tsmux_process_event,
+};
+
+
+const GF_FilterRegister *tsmux_register(GF_FilterSession *session)
+{
+	return &TSMuxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/out_audio.c Added

@@ -0,0 +1,579 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / audio 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/modules/audio_out.h>
+#include <gpac/thread.h>
+
+typedef struct
+{
+	//options
+	char *drv;
+	u32 bnum, bdur, threaded, priority;
+	Bool clock;
+	GF_Fraction64 dur;
+	Double speed, start;
+	u32 vol, pan, buffer;
+	GF_Fraction adelay;
+	
+	GF_FilterPid *pid;
+	u32 sr, afmt, nb_ch, timescale;
+	u64 ch_cfg;
+	GF_AudioOutput *audio_out;
+	GF_Thread *th;
+	u32 audio_th_state;
+	Bool needs_recfg, wait_recfg;
+	u32 bytes_per_sample;
+
+	u32 pck_offset;
+	u64 first_cts;
+	Bool aborted;
+	Bool speed_set;
+	GF_Filter *filter;
+	Bool is_eos;
+	Bool first_write_done;
+
+	s32 pid_delay;
+
+	Bool buffer_done, no_buffering;
+	u64 hwdelay_us, totaldelay_us;
+} GF_AudioOutCtx;
+
+
+void aout_reconfig(GF_AudioOutCtx *ctx)
+{
+	u32 sr, afmt, old_afmt, nb_ch;
+	u64 ch_cfg;
+	GF_Err e = GF_OK;
+	sr = ctx->sr;
+
+	nb_ch = ctx->nb_ch;
+	afmt = old_afmt = ctx->afmt;
+	ch_cfg = ctx->ch_cfg;
+
+	//config not ready, wait
+	if (!nb_ch || !sr || !afmt) {
+		//force a get_packet to trigger reconfigure
+		gf_filter_pid_get_packet(ctx->pid);
+		return;
+	}
+
+	e = ctx->audio_out->Configure(ctx->audio_out, &sr, &nb_ch, &afmt, ch_cfg);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[AudioOut] Failed to configure audio output: %s\n", gf_error_to_string(e) ));
+		afmt = GF_AUDIO_FMT_S16;
+		sr = 44100;
+		nb_ch = 2;
+	}
+	if (ctx->speed == FIX_ONE) ctx->speed_set = GF_TRUE;
+
+	if (ctx->vol<=100) {
+		if (ctx->audio_out->SetVolume)
+			ctx->audio_out->SetVolume(ctx->audio_out, ctx->vol);
+		ctx->vol = 101;
+	}
+	if (ctx->pan<=100) {
+		if (ctx->audio_out->SetPan)
+			ctx->audio_out->SetPan(ctx->audio_out, ctx->pan);
+		ctx->pan = 101;
+	}
+
+
+	if (ctx->sr * ctx->nb_ch * old_afmt == 0) {
+		ctx->needs_recfg = GF_FALSE;
+		ctx->wait_recfg = GF_FALSE;
+		return;
+	}
+
+	if ((sr != ctx->sr) || (nb_ch!=ctx->nb_ch) || (afmt!=old_afmt) || !ctx->speed_set) {
+		gf_filter_pid_negociate_property(ctx->pid, GF_PROP_PID_SAMPLE_RATE, &PROP_UINT(sr));
+		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->needs_recfg = GF_FALSE;
+		//drop all packets until next reconfig
+		ctx->wait_recfg = GF_TRUE;
+		ctx->sr = sr;
+		ctx->nb_ch = nb_ch;
+		ctx->afmt = afmt;
+		ctx->ch_cfg = ch_cfg;
+	} else if (e==GF_OK) {
+		ctx->needs_recfg = GF_FALSE;
+		ctx->wait_recfg = GF_FALSE;
+	}
+	ctx->bytes_per_sample = gf_audio_fmt_bit_depth(afmt) * nb_ch / 8;
+	ctx->hwdelay_us = 0;
+	if (ctx->audio_out->GetAudioDelay) {
+		ctx->hwdelay_us = ctx->audio_out->GetAudioDelay(ctx->audio_out);
+		ctx->hwdelay_us *= 1000;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[AudioOut] Hardware delay is "LLU" us\n", ctx->hwdelay_us ));
+	}
+	ctx->totaldelay_us = 0;
+	if (ctx->audio_out->GetTotalBufferTime) {
+		ctx->totaldelay_us = ctx->audio_out->GetTotalBufferTime(ctx->audio_out);
+		ctx->totaldelay_us *= 1000;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[AudioOut] Total audio delay is "LLU" ms\n", ctx->totaldelay_us ));
+	}
+}
+
+u32 aout_th_proc(void *p)
+{
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) p;
+
+	ctx->audio_th_state = 1;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[AudioOut] Entering audio thread ID %d\n", gf_th_id() ));
+
+	while (ctx->audio_th_state == 1) {
+		if (ctx->needs_recfg) {
+			aout_reconfig(ctx);
+		} else if (ctx->pid) {
+			ctx->audio_out->WriteAudio(ctx->audio_out);
+		} else {
+			gf_sleep(10);
+		}
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[AudioOut] Exiting audio thread\n"));
+	ctx->audio_out->Shutdown(ctx->audio_out);
+	ctx->audio_th_state = 3;
+	return 0;
+}
+
+
+static u32 aout_fill_output(void *ptr, u8 *buffer, u32 buffer_size)
+{
+	u32 done = 0;
+	GF_AudioOutCtx *ctx = ptr;
+	Bool is_first_pck = GF_TRUE;
+
+	memset(buffer, 0, buffer_size);
+	if (!ctx->pid || ctx->aborted) return 0;
+
+	if (!ctx->buffer_done) {
+		u32 size;
+		GF_FilterPacket *pck;
+
+		//query full buffer duration in us
+		u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[AudioOut] buffer %d / %d ms\r", dur/1000, ctx->buffer));
+
+		/*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 (! gf_filter_pck_is_blocking_ref(pck)) {
+			if ((dur < ctx->buffer * 1000) && !gf_filter_pid_is_eos(ctx->pid))
+				return 0;
+			gf_filter_pck_get_data(pck, &size);
+			if (!size) {
+				gf_filter_pid_drop_packet(ctx->pid);
+				return 0;
+			}
+			//check the decoder output is full (avoids initial underrun)
+			if (gf_filter_pid_query_buffer_duration(ctx->pid, GF_TRUE)==0)
+				return 0;
+		}
+		ctx->buffer_done = GF_TRUE;
+	}
+	//do not throw underflow log util first packet is fetched
+	if (ctx->first_write_done)
+		is_first_pck = GF_FALSE;
+
+	while (done < buffer_size) {
+		const char *data;
+		u32 size;
+		u64 cts;
+		s64 delay;
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(ctx->pid);
+		if (!pck) {
+			if (gf_filter_pid_is_eos(ctx->pid)) {
+				ctx->is_eos = GF_TRUE;
+			} else if (!is_first_pck) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[AudioOut] buffer underflow\n"));
+			}
+			return done;
+		}
+		ctx->is_eos = GF_FALSE;
+		if (ctx->needs_recfg) {
+			return done;
+		}
+
+		delay = ctx->pid_delay;
+		if (ctx->adelay.den)
+			delay += ctx->adelay.num * (s32)ctx->timescale / (s32)ctx->adelay.den;
+
+		cts = gf_filter_pck_get_cts(pck);
+		if (delay >= 0) {
+			cts += delay;
+		} else if (cts < (u64) -delay) {
+			gf_filter_pid_drop_packet(ctx->pid);
+			continue;
+		} else {
+			cts -= (u64) -delay;
+		}
+
+		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) {
+				gf_filter_pid_drop_packet(ctx->pid);
+				if (!ctx->aborted) {
+					GF_FilterEvent evt;
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->pid);
+					gf_filter_pid_send_event(ctx->pid, &evt);
+
+					ctx->aborted = GF_TRUE;
+				}
+				return done;
+			}
+		}
+
+		data = gf_filter_pck_get_data(pck, &size);
+
+		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;
+
+			timestamp.num -= (ctx->hwdelay_us*ctx->timescale)/1000000;
+			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 ));
+		}
+		
+		if (data && !ctx->wait_recfg) {
+			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;
+			memcpy(buffer+done, data+ctx->pck_offset, nb_copy);
+
+			if (!done && gf_filter_reporting_enabled(ctx->filter)) {
+				char szStatus[1024];
+				u64 bdur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+				sprintf(szStatus, "%d Hz %d ch %s buffer %d / %d ms", ctx->sr, ctx->nb_ch, gf_audio_fmt_name(ctx->afmt), (u32) (bdur/1000), ctx->buffer);
+				gf_filter_update_status(ctx->filter, -1, szStatus);
+			}
+
+
+			done += nb_copy;
+			ctx->first_write_done = GF_TRUE;
+			is_first_pck = GF_FALSE;
+			if (nb_copy + ctx->pck_offset < size) {
+				ctx->pck_offset += nb_copy;
+				return done;
+			}
+			ctx->pck_offset = 0;
+		}
+		gf_filter_pid_drop_packet(ctx->pid);
+	}
+	return done;
+}
+
+void aout_set_priority(GF_AudioOutCtx *ctx, u32 prio)
+{
+	if (prio==ctx->priority) return;
+	ctx->priority = prio;
+	if (ctx->th) gf_th_set_priority(ctx->th, (s32) ctx->priority);
+	else if (ctx->audio_out->SelfThreaded && ctx->audio_out->SetPriority)
+		ctx->audio_out->SetPriority(ctx->audio_out, ctx->priority);
+}
+
+static GF_Err aout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	u32 sr, nb_ch, afmt, timescale;
+	u64 ch_cfg;
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		assert(ctx->pid==pid);
+		ctx->pid=NULL;
+		return GF_OK;
+	}
+	assert(!ctx->pid || (ctx->pid==pid));
+	gf_filter_pid_check_caps(pid);
+
+	sr = afmt = nb_ch = timescale = 0;
+	ch_cfg = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) timescale = 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_AUDIO_FORMAT);
+	if (p) afmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p) nb_ch = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+	if (p) ch_cfg = p->value.longuint;
+
+	if (ctx->audio_out->SetVolume) {
+		p = gf_filter_pid_get_info(pid, GF_PROP_PID_AUDIO_VOLUME, &pe);
+		if (p) ctx->audio_out->SetVolume(ctx->audio_out, p->value.uint);
+	}
+	if (ctx->audio_out->SetPan) {
+		p = gf_filter_pid_get_info(pid, GF_PROP_PID_AUDIO_PAN, &pe);
+		if (p) ctx->audio_out->SetPan(ctx->audio_out, p->value.uint);
+	}
+	gf_filter_release_property(pe);
+	
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_PRIORITY);
+	if (p) aout_set_priority(ctx, p->value.uint);
+
+	if (ctx->first_cts && (ctx->timescale != timescale)) {
+		ctx->first_cts-=1;
+		ctx->first_cts *= timescale;
+		ctx->first_cts /= ctx->timescale;
+		ctx->first_cts+=1;
+	}
+	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;
+	}
+
+	//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)) {
+		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 
+		GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, pid);
+		evt.buffer_req.max_buffer_us = ctx->buffer * 1000;
+		if (ctx->bdur) {
+			u64 b = ctx->bdur;
+			b *= 1000;
+			if (evt.buffer_req.max_buffer_us < b)
+				evt.buffer_req.max_buffer_us = (u32) b;
+		}
+		evt.buffer_req.pid_only = GF_TRUE;
+
+		gf_filter_pid_send_event(pid, &evt);
+
+		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "AudioOut");
+		gf_filter_pid_send_event(pid, &evt);
+		ctx->speed = evt.play.speed;
+		ctx->start = evt.play.start_range;
+	}
+
+	ctx->pid = pid;
+	ctx->sr = sr;
+	ctx->afmt = afmt;
+	ctx->nb_ch = nb_ch;
+	ctx->ch_cfg = ch_cfg;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_PRIORITY);
+	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->needs_recfg = GF_TRUE;
+	
+	//not threaded, request a task to restart audio (cannot do it during the audio callback)
+	if (!ctx->th) gf_filter_post_process_task(filter);
+	return GF_OK;
+}
+
+static GF_Err aout_initialize(GF_Filter *filter)
+{
+	const char *sOpt;
+	void *os_wnd_handler;
+	GF_Err e;
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+
+	ctx->filter = filter;
+
+
+	ctx->audio_out = (GF_AudioOutput *) gf_module_load(GF_AUDIO_OUTPUT_INTERFACE, ctx->drv);
+	/*if not init we run with a NULL audio compositor*/
+	if (!ctx->audio_out) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[AudioOut] No audio output modules found, cannot load audio output\n"));
+		return GF_IO_ERR;
+	}
+	if (!gf_opts_get_key("core", "audio-output")) {
+		gf_opts_set_key("core", "audio-output", ctx->audio_out->module_name);
+	}
+
+	ctx->audio_out->FillBuffer = aout_fill_output;
+	ctx->audio_out->audio_renderer = ctx;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] Setting up audio module %s\n", ctx->audio_out->module_name));
+
+	if (!ctx->bnum || !ctx->bdur) ctx->bnum = ctx->bdur = 0;
+
+	os_wnd_handler = NULL;
+	sOpt = gf_opts_get_key("Temp", "OSWnd");
+	if (sOpt) sscanf(sOpt, "%p", &os_wnd_handler);
+	e = ctx->audio_out->Setup(ctx->audio_out, os_wnd_handler, ctx->bnum, ctx->bdur);
+
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[AudioOut] Could not setup module %s\n", ctx->audio_out->module_name));
+		gf_modules_close_interface((GF_BaseInterface *)ctx->audio_out);
+		ctx->audio_out = NULL;
+		return e;
+	}
+	/*only used for coverage for now*/
+	if (ctx->audio_out->QueryOutputSampleRate) {
+		u32 sr = 48000;
+		u32 ch = 2;
+		u32 bps = 16;
+		ctx->audio_out->QueryOutputSampleRate(ctx->audio_out, &sr, &ch, &bps);
+	}
+	if (ctx->audio_out->SelfThreaded) {
+	} else if (ctx->threaded) {
+		ctx->th = gf_th_new("AudioOutput");
+		gf_th_run(ctx->th, aout_th_proc, ctx);
+	}
+
+	aout_set_priority(ctx, GF_THREAD_PRIORITY_REALTIME);
+
+	return GF_OK;
+}
+
+static void aout_finalize(GF_Filter *filter)
+{
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+
+	/*stop and shutdown*/
+	if (ctx->audio_out) {
+		/*kill audio thread*/
+		if (ctx->th) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] stopping audio thread\n"));
+			ctx->audio_th_state = 2;
+			while (ctx->audio_th_state != 3) {
+				gf_sleep(33);
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[AudioOut] audio thread stopped\n"));
+			gf_th_del(ctx->th);
+		} else {
+			ctx->audio_out->Shutdown(ctx->audio_out);
+		}
+		gf_modules_close_interface((GF_BaseInterface *)ctx->audio_out);
+		ctx->audio_out = NULL;
+	}
+}
+
+static GF_Err aout_process(GF_Filter *filter)
+{
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->th && ctx->needs_recfg) {
+		aout_reconfig(ctx);
+	}
+
+	if (ctx->th || ctx->audio_out->SelfThreaded) {
+		if (ctx->is_eos) return GF_EOS;
+		gf_filter_ask_rt_reschedule(filter, 100000);
+		return GF_OK;
+	}
+
+	ctx->audio_out->WriteAudio(ctx->audio_out);
+	return GF_OK;
+}
+
+static Bool aout_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_AudioOutCtx *ctx = (GF_AudioOutCtx *) gf_filter_get_udta(filter);
+	if (!ctx->audio_out) return GF_TRUE;
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		if (ctx->audio_out->Play) ctx->audio_out->Play(ctx->audio_out, evt->play.hw_buffer_reset ? 2 : 1);
+		break;
+	case GF_FEVT_STOP:
+		if (ctx->audio_out->Play) ctx->audio_out->Play(ctx->audio_out, 0);
+		break;
+	default:
+		break;
+	}
+	//cancel
+	return GF_TRUE;
+}
+
+#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(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(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(adelay), "set audio delay in sec", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_ADVANCED|GF_FS_ARG_UPDATE},
+	{0}
+};
+
+static const GF_FilterCapability AudioOutCaps[] =
+{
+	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),
+	//we accept all audio formats, but will ask for input reconfiguration if sound card does not support
+};
+
+
+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.")
+	.private_size = sizeof(GF_AudioOutCtx),
+	.args = AudioOutArgs,
+	SETCAPS(AudioOutCaps),
+	.initialize = aout_initialize,
+	.finalize = aout_finalize,
+	.configure_pid = aout_configure_pid,
+	.process = aout_process,
+	.process_event = aout_process_event
+};
+
+const GF_FilterRegister *aout_register(GF_FilterSession *session)
+{
+	return &AudioOutRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/out_file.c Added

@@ -0,0 +1,623 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic FILE 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>
+
+typedef struct
+{
+	//options
+	Double start, speed;
+	char *dst, *mime, *ext;
+	Bool append, dynext, cat, ow, redund;
+	u32 mvbk;
+
+	//only one input pid
+	GF_FilterPid *pid;
+
+	FILE *file;
+	Bool is_std;
+	u64 nb_write;
+
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+	char szFileName[GF_MAX_PATH];
+
+	Bool patch_blocks;
+	Bool is_null;
+	GF_Err is_error;
+	u32 dash_mode;
+	u64 offset_at_seg_start;
+	const char *original_url;
+	GF_FileIO *gfio_ref;
+} GF_FileOutCtx;
+
+#ifdef WIN32
+#include <io.h>
+#include <fcntl.h>
+#endif //WIN32
+
+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);
+	}
+	ctx->file = NULL;
+
+	if (!filename)
+		return GF_OK;
+
+	if (!strcmp(filename, "std")) ctx->is_std = GF_TRUE;
+	else if (!strcmp(filename, "stdout")) ctx->is_std = GF_TRUE;
+	else ctx->is_std = GF_FALSE;
+
+	if (ctx->is_std) {
+		ctx->file = stdout;
+#ifdef WIN32
+		_setmode(_fileno(stdout), _O_BINARY);
+#endif
+
+	} else {
+		char szName[GF_MAX_PATH], szFinalName[GF_MAX_PATH];
+		Bool append = ctx->append;
+		const char *url = filename;
+
+		if (!strncmp(filename, "gfio://", 7))
+			url = gf_fileio_translate_url(filename);
+
+		if (ctx->dynext) {
+			const char *has_ext = gf_file_ext_start(url);
+
+			strcpy(szName, url);
+			if (!has_ext && ext) {
+				strcat(szName, ".");
+				strcat(szName, ext);
+			}
+		} else {
+			strcpy(szName, url);
+		}
+		gf_filter_pid_resolve_file_template(ctx->pid, szName, szFinalName, file_idx, file_suffix);
+
+		if (!gf_file_exists(szFinalName)) append = GF_FALSE;
+
+		if (!ctx->ow && gf_file_exists(szFinalName) && !append) {
+			char szRes[21];
+			s32 res;
+
+			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;
+			}
+			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");
+
+		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));
+		}
+		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 GF_OK;
+}
+
+static void fileout_setup_file(GF_FileOutCtx *ctx, Bool explicit_overwrite)
+{
+	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) {
+		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);
+			}
+		}
+	} else {
+		fileout_open_close(ctx, ctx->dst, NULL, 0, explicit_overwrite, NULL);
+	}
+}
+static GF_Err fileout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
+	if (is_remove) {
+		ctx->pid = NULL;
+		fileout_open_close(ctx, NULL, NULL, 0, GF_FALSE, NULL);
+		return GF_OK;
+	}
+	gf_filter_pid_check_caps(pid);
+
+	if (!ctx->pid) {
+		GF_FilterEvent evt;
+		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "FileOut");
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	ctx->pid = pid;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
+	if (p && p->value.uint) ctx->patch_blocks = GF_TRUE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	if (p && p->value.uint) ctx->dash_mode = 1;
+	return GF_OK;
+}
+
+static GF_Err fileout_initialize(GF_Filter *filter)
+{
+	char *ext=NULL;
+	const char *dst;
+	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->dst) return GF_OK;
+
+	if (!ctx->mvbk)
+		ctx->mvbk = 1;
+
+	if (strnicmp(ctx->dst, "file:/", 6) && strnicmp(ctx->dst, "gfio:/", 6) && strstr(ctx->dst, "://"))  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		return GF_NOT_SUPPORTED;
+	}
+	if (!stricmp(ctx->dst, "null") ) {
+		ctx->is_null = GF_TRUE;
+		//null and no format specified, we accept any kind
+		if (!ctx->ext) {
+			ctx->in_caps[0].code = GF_PROP_PID_STREAM_TYPE;
+			ctx->in_caps[0].val = PROP_UINT(GF_STREAM_UNKNOWN);
+			ctx->in_caps[0].flags = GF_CAPS_INPUT_EXCLUDED;
+			gf_filter_override_caps(filter, ctx->in_caps, 1);
+			return GF_OK;
+		}
+	}
+	if (!strncmp(ctx->dst, "gfio://", 7)) {
+		GF_Err e;
+		ctx->gfio_ref = gf_fileio_open_url(gf_fileio_from_url(ctx->dst), NULL, "ref", &e);
+		if (!ctx->gfio_ref) {
+			gf_filter_setup_failure(filter, e);
+			return e;
+		}
+		dst = gf_fileio_translate_url(ctx->dst);
+		ctx->original_url = ctx->dst;
+	} else {
+		dst = ctx->dst;
+	}
+
+	if (ctx->dynext) return GF_OK;
+
+	if (ctx->ext) ext = ctx->ext;
+	else if (dst) {
+		ext = gf_file_ext_start(dst);
+		if (!ext) ext = ".*";
+		ext += 1;
+	}
+
+	if (!ext && !ctx->mime) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] No extension provided nor mime type for output file %s, cannot infer format\n", ctx->dst));
+		return GF_NOT_SUPPORTED;
+	}
+	//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);
+
+	return GF_OK;
+}
+
+static void fileout_finalize(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
+	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);
+}
+
+static GF_Err fileout_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	const GF_PropertyValue *fname, *p;
+	Bool start, end;
+	const u8 *pck_data;
+	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;
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->pid)) {
+			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);
+			}
+
+			if (ctx->dash_mode && ctx->file) {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, ctx->pid);
+				evt.seg_size.seg_url = NULL;
+
+				if (ctx->dash_mode==1) {
+					evt.seg_size.is_init = GF_TRUE;
+					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.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);
+				}
+			}
+			fileout_open_close(ctx, NULL, NULL, 0, GF_FALSE, NULL);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	gf_filter_pck_get_framing(pck, &start, &end);
+	if (!ctx->redund) {
+		u32 dep_flags = gf_filter_pck_get_dependency_flags(pck);
+		//redundant packet, do not store
+		if ((dep_flags & 0x3) == 1) {
+			gf_filter_pid_drop_packet(ctx->pid);
+			return GF_OK;
+		}
+	}
+
+	if (ctx->is_null) {
+		if (start) {
+			u32 fnum=0;
+			const char *filename=NULL;
+			p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (p) fnum = p->value.uint;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_URL);
+			if (!p) p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_OUTPATH);
+			if (!p) p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME);
+			if (p) filename = p->value.string;
+			if (filename) {
+				strcpy(ctx->szFileName, filename);
+			} else {
+				sprintf(ctx->szFileName, "%d", fnum);
+			}
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] null open (file name is %s)\n", ctx->szFileName));
+		}
+		if (end) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[FileOut] null close (file name was %s)\n", ctx->szFileName));
+		}
+		gf_filter_pid_drop_packet(ctx->pid);
+		return fileout_process(filter);
+	}
+
+	if (ctx->file && start && ctx->cat)
+		start = GF_FALSE;
+
+	if (ctx->dash_mode) {
+		p = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		if (p) {
+			GF_FilterEvent evt;
+
+			GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, ctx->pid);
+			evt.seg_size.seg_url = NULL;
+
+			if (ctx->dash_mode==1) {
+				evt.seg_size.is_init = GF_TRUE;
+				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.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;
+				gf_filter_pid_send_event(ctx->pid, &evt);
+			}
+			if ( gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME))
+				start = GF_TRUE;
+		}
+	}
+
+	if (start) {
+		const GF_PropertyValue *ext, *fnum, *fsuf;
+		Bool explicit_overwrite = GF_FALSE;
+		const char *name = NULL;
+		fname = ext = NULL;
+		//file num increased per packet, open new file
+		fnum = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		if (fnum) {
+			fname = 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 (!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_PID_OUTPATH);
+		if (!ext) ext = gf_filter_pck_get_property(pck, GF_PROP_PID_FILE_EXT);
+		if (fname) name = fname->value.string;
+
+		fsuf = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILESUF);
+
+		if (end && gf_filter_pck_get_seek_flag(pck))
+			explicit_overwrite = GF_TRUE;
+
+		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) {
+			fileout_setup_file(ctx, explicit_overwrite);
+		}
+	}
+
+	pck_data = gf_filter_pck_get_data(pck, &pck_size);
+	if (ctx->file) {
+		GF_FilterFrameInterface *hwf = gf_filter_pck_get_frame_interface(pck);
+		if (pck_data) {
+			if (ctx->patch_blocks && gf_filter_pck_get_seek_flag(pck)) {
+				u64 bo = gf_filter_pck_get_byte_offset(pck);
+				if (ctx->is_std) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Cannot patch file, output is stdout\n"));
+				} else if (bo==GF_FILTER_NO_BO) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Cannot patch file, wrong byte offset\n"));
+				} else {
+					u32 ilaced = gf_filter_pck_get_interlaced(pck);
+					u64 pos = ctx->nb_write;
+					if (ctx->file) {
+						assert( ctx->nb_write == gf_ftell(ctx->file) );
+					}
+
+					//we are inserting a block: write dummy bytes at end and move bytes
+					if (ilaced) {
+						u8 *block;
+						u64 cur_r, cur_w;
+						nb_write = (u32) gf_fwrite(pck_data, pck_size, ctx->file);
+
+						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));
+						}
+						cur_w = gf_ftell(ctx->file);
+
+						gf_fseek(ctx->file, pos, SEEK_SET);
+
+						cur_r = pos;
+						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));
+						} else {
+							while (cur_r > bo) {
+								u32 move_bytes = ctx->mvbk;
+								if (cur_r - bo < move_bytes)
+									move_bytes = (u32) (cur_r - bo);
+
+								gf_fseek(ctx->file, cur_r - move_bytes, SEEK_SET);
+								nb_write = (u32) gf_fread(block, (size_t) move_bytes, ctx->file);
+
+								if (nb_write!=move_bytes) {
+									GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Read error, got %d bytes but had %d to read\n", nb_write, move_bytes));
+								}
+
+								gf_fseek(ctx->file, cur_w - move_bytes, SEEK_SET);
+								nb_write = (u32) gf_fwrite(block, (size_t) move_bytes, ctx->file);
+
+								if (nb_write!=move_bytes) {
+									GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Write error, wrote %d bytes but had %d to write\n", nb_write, move_bytes));
+								}
+								cur_r -= move_bytes;
+								cur_w -= move_bytes;
+							}
+							gf_free(block);
+						}
+					}
+
+					gf_fseek(ctx->file, bo, SEEK_SET);
+					nb_write = (u32) gf_fwrite(pck_data, pck_size, ctx->file);
+					gf_fseek(ctx->file, pos, SEEK_SET);
+
+					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 {
+				nb_write = (u32) gf_fwrite(pck_data, pck_size, ctx->file);
+				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));
+				}
+				ctx->nb_write += nb_write;
+			}
+		} else if (hwf) {
+			u32 w, h, stride, stride_uv, pf;
+			u32 nb_planes, uv_height;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_WIDTH);
+			w = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_HEIGHT);
+			h = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_PIXFMT);
+			pf = p ? p->value.uint : 0;
+
+			stride = stride_uv = 0;
+
+			if (gf_pixel_get_size_info(pf, w, h, NULL, &stride, &stride_uv, &nb_planes, &uv_height) == GF_TRUE) {
+				u32 i;
+				for (i=0; i<nb_planes; i++) {
+					u32 j, write_h, lsize;
+					const u8 *out_ptr;
+					u32 out_stride = i ? stride_uv : stride;
+					GF_Err e = hwf->get_plane(hwf, i, &out_ptr, &out_stride);
+					if (e) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Failed to fetch plane data from hardware frame, cannot write\n"));
+						break;
+					}
+					if (i) {
+						write_h = uv_height;
+						lsize = stride_uv;
+					} else {
+						write_h = h;
+						lsize = stride;
+					}
+					for (j=0; j<write_h; j++) {
+						nb_write = (u32) gf_fwrite(out_ptr, lsize, ctx->file);
+						if (nb_write!=lsize) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] Write error, wrote %d bytes but had %d to write\n", nb_write, lsize));
+						}
+						ctx->nb_write += nb_write;
+						out_ptr += out_stride;
+					}
+				}
+			}
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[FileOut] No data associated with packet, cannot write\n"));
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[FileOut] output file handle is not opened, discarding %d bytes\n", pck_size));
+	}
+	gf_filter_pid_drop_packet(ctx->pid);
+	if (end && !ctx->cat) {
+		fileout_open_close(ctx, NULL, NULL, 0, GF_FALSE, NULL);
+	}
+	if (gf_filter_reporting_enabled(filter)) {
+		char szStatus[1024];
+		snprintf(szStatus, 1024, "%s: wrote % 16"LLD_SUF" bytes", gf_file_basename(ctx->szFileName), (s64) ctx->nb_write);
+		gf_filter_update_status(filter, -1, szStatus);
+	}
+	return GF_OK;
+}
+
+static Bool fileout_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	if (evt->base.type==GF_FEVT_FILE_DELETE) {
+		GF_FileOutCtx *ctx = (GF_FileOutCtx *) gf_filter_get_udta(filter);
+		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_file_delete(evt->file_del.url);
+		}
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+static GF_FilterProbeScore fileout_probe_url(const char *url, const char *mime)
+{
+	if (strstr(url, "://")) {
+
+		if (!strnicmp(url, "file://", 7)) return GF_FPROBE_MAYBE_SUPPORTED;
+		if (!strnicmp(url, "gfio://", 7)) {
+			if (!gf_fileio_write_mode(gf_fileio_from_url(url)))
+				return GF_FPROBE_NOT_SUPPORTED;
+			return GF_FPROBE_MAYBE_SUPPORTED;
+		}
+		return GF_FPROBE_NOT_SUPPORTED;
+	}
+	return GF_FPROBE_MAYBE_SUPPORTED;
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_FileOutCtx, _n)
+
+static const GF_FilterArgs FileOutArgs[] =
+{
+	{ OFFS(dst), "location of destination file - see filter help ", 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(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(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},
+
+	{0}
+};
+
+static const GF_FilterCapability FileOutCaps[] =
+{
+	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 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`."
+		"The filter watches the property `FileNumber` on incoming packets to create new files.\n"
+	)
+	.private_size = sizeof(GF_FileOutCtx),
+	.args = FileOutArgs,
+	SETCAPS(FileOutCaps),
+	.probe_url = fileout_probe_url,
+	.initialize = fileout_initialize,
+	.finalize = fileout_finalize,
+	.configure_pid = fileout_configure_pid,
+	.process = fileout_process,
+	.process_event = fileout_process_event
+};
+
+
+const GF_FilterRegister *fileout_register(GF_FilterSession *session)
+{
+	return &FileOutRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/out_http.c Added

@@ -0,0 +1,2782 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / http server and 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/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/maths.h>
+
+#include <gpac/filters.h>
+#include <gpac/ietf.h>
+#include <gpac/config_file.h>
+#include <gpac/base_coding.h>
+#include <gpac/network.h>
+
+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_Err gf_dm_sess_send(GF_DownloadSession *sess, u8 *data, u32 size);
+
+#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
+
+enum
+{
+	MODE_DEFAULT=0,
+	MODE_PUSH,
+	MODE_SOURCE,
+};
+
+typedef struct
+{
+	//options
+	char *dst, *user_agent, *ifce, *cache_control, *ext, *mime, *wdir, *cert, *pkey, *reqlog;
+	GF_List *rdirs;
+	Bool close, hold, quit, post, dlist, ice;
+	u32 port, block_size, maxc, maxp, timeout, hmode, sutc, cors;
+
+	//internal
+	GF_Filter *filter;
+	GF_Socket *server_sock;
+	GF_List *sessions, *active_sessions;
+	GF_List *inputs;
+
+	u32 next_wake_us;
+	char *ip;
+	Bool done;
+
+	GF_SockGroup *sg;
+	Bool no_etag;
+
+	u32 nb_connections;
+
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+
+	//set to true when no mounted dirs and not push mode
+	Bool single_mode;
+
+	void *ssl_ctx;
+
+	u64 req_id;
+} GF_HTTPOutCtx;
+
+typedef struct
+{
+	GF_HTTPOutCtx *ctx;
+	GF_FilterPid *ipid;
+	char *path;
+	Bool dash_mode;
+	char *mime;
+	u32 nb_dest;
+	Bool hold;
+
+	Bool is_open, done, is_delete;
+	Bool patch_blocks;
+	GF_List *file_deletes;
+
+	//for PUT mode, NULL in server mode
+	GF_DownloadSession *upload;
+	u32 cur_header;
+
+	u64 offset_at_seg_start;
+	u64 nb_write, write_start_range, write_end_range;
+	char range_hdr[100];
+
+	//for server mode, recording
+	char *local_path;
+	FILE *resource;
+
+	u8 *tunein_data;
+	u32 tunein_data_size;
+} GF_HTTPOutInput;
+
+typedef struct
+{
+	s64 start;
+	s64 end;
+} HTTByteRange;
+
+typedef struct __httpout_session
+{
+	GF_HTTPOutCtx *ctx;
+
+	GF_Socket *socket;
+	GF_DownloadSession *http_sess;
+	char peer_address[GF_MAX_IP_NAME_LEN];
+	void *ssl;
+
+	u32 play_state;
+	Double start_range;
+
+	FILE *resource;
+	char *path, *mime;
+	u64 file_size, file_pos, nb_bytes, bytes_in_req;
+	u8 *buffer;
+	Bool done;
+	u64 last_file_modif;
+
+	u64 req_start_time;
+	u64 last_active_time;
+	Bool is_head;
+	Bool file_in_progress;
+	Bool use_chunk_transfer;
+	u32 put_in_progress;
+	//for upload only: 0 not an upload, 1 creation, 2: update
+	u32 upload_type;
+	u64 content_length;
+	GF_FilterPid *opid;
+	Bool reconfigure_output;
+
+	GF_HTTPOutInput *in_source;
+	Bool send_init_data;
+
+	u32 nb_ranges, alloc_ranges, range_idx;
+	HTTByteRange *ranges;
+
+	Bool do_log;
+	u64 req_id;
+	u32 method_type, reply_code;
+} GF_HTTPOutSession;
+
+static void httpout_reset_socket(GF_HTTPOutSession *sess)
+{
+	if (!sess->socket) return;
+
+	assert(sess->ctx->nb_connections);
+	sess->ctx->nb_connections--;
+
+	gf_sk_group_unregister(sess->ctx->sg, sess->socket);
+#ifdef GPAC_HAS_SSL
+	if (sess->ssl) {
+		gf_ssl_del(sess->ssl);
+		sess->ssl = NULL;
+	}
+#endif
+	gf_sk_del(sess->socket);
+	sess->socket = NULL;
+	if (sess->in_source) sess->in_source->nb_dest--;
+}
+
+static void httpout_insert_date(u64 time, char **headers, Bool for_listing)
+{
+	char szDate[200];
+	time_t gtime;
+	struct tm *t;
+	const char *wday, *month;
+	u32 sec;
+	gtime = time / 1000;
+	t = gf_gmtime(&gtime);
+	sec = t->tm_sec;
+	//see issue #859, no clue how this happened...
+	if (sec > 60)
+		sec = 60;
+	switch (t->tm_wday) {
+	case 1: wday = "Mon"; break;
+	case 2: wday = "Tue"; break;
+	case 3: wday = "Wed"; break;
+	case 4: wday = "Thu"; break;
+	case 5: wday = "Fri"; break;
+	case 6: wday = "Sat"; break;
+	default: wday = "Sun"; break;
+	}
+	switch (t->tm_mon) {
+	case 1: month = "Feb"; break;
+	case 2: month = "Mar"; break;
+	case 3: month = "Apr"; break;
+	case 4: month = "May"; break;
+	case 5: month = "Jun"; break;
+	case 6: month = "Jul"; break;
+	case 7: month = "Aug"; break;
+	case 8: month = "Sep"; break;
+	case 9: month = "Oct"; break;
+	case 10: month = "Nov"; break;
+	case 11: month = "Dec"; break;
+	default: month = "Jan"; break;
+
+	}
+
+	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);
+	}
+}
+
+static Bool httpout_dir_file_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info, Bool is_dir)
+{
+	char szFmt[200];
+	u64 size;
+	u32 name_len;
+	char *unit=NULL;
+	char **listing = (char **) cbck;
+
+	if (file_info && (file_info->hidden || file_info->system))
+		return GF_FALSE;
+
+	if (is_dir)
+		gf_dynstrcat(listing, "+  <a href=\"", NULL);
+	else
+		gf_dynstrcat(listing, "   <a href=\"", NULL);
+
+	name_len = (u32) strlen(item_name);
+	if (is_dir) name_len++;
+	gf_dynstrcat(listing, item_name, NULL);
+	if (is_dir) gf_dynstrcat(listing, "/", NULL);
+	gf_dynstrcat(listing, "\">", NULL);
+	gf_dynstrcat(listing, item_name, NULL);
+	if (is_dir) gf_dynstrcat(listing, "/", NULL);
+	gf_dynstrcat(listing, "</a>", NULL);
+	while (name_len<60) {
+		name_len++;
+		gf_dynstrcat(listing, " ", NULL);
+	}
+	if (file_info)
+		httpout_insert_date(file_info->last_modified*1000, listing, GF_TRUE);
+
+	if (is_dir || !file_info) {
+		gf_dynstrcat(listing, "    -\n", NULL);
+		return GF_FALSE;
+	}
+	size = file_info->size;
+	if (size<1000) unit="";
+	else if (size<1000000) { unit="K"; size/=1000; }
+	else if (size<1000000000) { unit="M"; size/=1000000; }
+	else if (size<1000000000000) { unit="G"; size/=1000000000; }
+	gf_dynstrcat(listing, "    ", NULL);
+	sprintf(szFmt, LLU"%s\n", size, unit);
+	gf_dynstrcat(listing, szFmt, NULL);
+
+	return GF_FALSE;
+}
+static Bool httpout_dir_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	return httpout_dir_file_enum(cbck, item_name, item_path, file_info, GF_TRUE);
+}
+static Bool httpout_file_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	return httpout_dir_file_enum(cbck, item_name, item_path, file_info, GF_FALSE);
+}
+
+static char *httpout_create_listing(GF_HTTPOutCtx *ctx, char *full_path)
+{
+	char szHost[GF_MAX_IP_NAME_LEN];
+	char *has_par, *dir;
+	u32 i, count = gf_list_count(ctx->rdirs);
+	char *listing = NULL;
+	char *name = full_path;
+
+	if (full_path && (full_path[0]=='.'))
+		name++;
+
+	gf_dynstrcat(&listing, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">\n<html>\n<head>\n<title>Index of ", NULL);
+	gf_dynstrcat(&listing, name, NULL);
+	gf_dynstrcat(&listing, "</title>\n</head>\n<body><h1>Index of ", NULL);
+	gf_dynstrcat(&listing, name, NULL);
+	gf_dynstrcat(&listing, "</h1>\n<pre>Name                                                                Last modified      Size\n<hr>\n", NULL);
+
+	if (!full_path) {
+		has_par=NULL;
+	} else {
+		u32 len = (u32) strlen(full_path);
+		if (len && strchr("/\\", full_path[len-1]))
+			full_path[len-1] = 0;
+		has_par = strrchr(full_path, '/');
+	}
+	if (has_par) {
+		u8 c = has_par[1];
+		has_par[1] = 0;
+
+		//retranslate server root
+		gf_dynstrcat(&listing, ".. <a href=\"", NULL);
+		for (i=0; i<count; i++) {
+			dir = gf_list_get(ctx->rdirs, i);
+			u32 dlen = (u32) strlen(dir);
+			if (!strncmp(dir, name, dlen) && ((name[dlen]=='/') || (name[dlen]==0))) {
+				gf_dynstrcat(&listing, "/", NULL);
+				if (count==1) name = NULL;
+				break;
+			}
+		}
+
+		if (name)
+			gf_dynstrcat(&listing, name, NULL);
+
+		gf_dynstrcat(&listing, "\">Parent Directory</a>\n", NULL);
+		has_par[1] = c;
+	}
+
+	if (!full_path || !strlen(full_path)) {
+		count = gf_list_count(ctx->rdirs);
+		if (count==1) {
+			dir = gf_list_get(ctx->rdirs, 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);
+				httpout_dir_file_enum(&listing, dir, NULL, NULL, GF_TRUE);
+			}
+		}
+	} else {
+		Bool insert_root = GF_FALSE;
+		if (count>1) {
+			for (i=0; i<count; i++) {
+				dir = gf_list_get(ctx->rdirs, i);
+				if (!strcmp(full_path, dir)) {
+					insert_root=GF_TRUE;
+					break;
+				}
+			}
+			if (insert_root) {
+				gf_dynstrcat(&listing, ".. <a href=\"/\">Parent Directory</a>                                 -\n", NULL);
+			}
+		}
+		gf_enum_directory(full_path, GF_TRUE, httpout_dir_enum, &listing, NULL);
+		gf_enum_directory(full_path, GF_FALSE, httpout_file_enum, &listing, NULL);
+	}
+
+	gf_dynstrcat(&listing, "\n<hr></pre>\n<address>", NULL);
+	gf_dynstrcat(&listing, ctx->user_agent, NULL);
+	gf_sk_get_host_name(szHost);
+	gf_dynstrcat(&listing, " at ", NULL);
+	gf_dynstrcat(&listing, szHost, NULL);
+	gf_dynstrcat(&listing, " Port ", NULL);
+	sprintf(szHost, "%d", ctx->port);
+	gf_dynstrcat(&listing, szHost, NULL);
+	gf_dynstrcat(&listing, "</address>\n</body></html>", NULL);
+	return listing;
+}
+
+
+static void httpout_set_local_path(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	char *dir;
+	u32 len;
+	assert(in->path);
+	//not recording
+	if (!ctx->rdirs) return;
+
+	dir = gf_list_get(ctx->rdirs, 0);
+	if (!dir) return;
+	len = (u32) strlen(dir);
+	if (in->local_path) gf_free(in->local_path);
+	in->local_path = NULL;
+	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);
+}
+
+static Bool httpout_sess_parse_range(GF_HTTPOutSession *sess, char *range)
+{
+	Bool request_ok = GF_TRUE;;
+	u32 i;
+	Bool has_open_start=GF_FALSE;
+	Bool has_file_end=GF_FALSE;
+	u64 known_file_size;
+	sess->nb_ranges = 0;
+	sess->nb_bytes = 0;
+	sess->range_idx = 0;
+	if (!range) return GF_TRUE;
+
+	if (sess->in_source && !sess->ctx->rdirs)
+		return GF_FALSE;
+
+	while (range) {
+		char *sep;
+		u32 len;
+		s64 start, end;
+		char *next = strchr(range, ',');
+		if (next) next[0] = 0;
+
+		while (range[0] == ' ') range++;
+
+		//unsupported unit
+		if (strncmp(range, "bytes=", 6)) {
+			return GF_FALSE;
+		}
+		range += 6;
+		sep = strchr(range, '/');
+		if (sep) sep[0] = 0;
+		len = (u32) strlen(range);
+		start = end = -1;
+		if (!len) {
+			request_ok = GF_FALSE;
+		}
+		//end range only
+		else if (range[0] == '-') {
+			if (has_file_end)
+				request_ok = GF_FALSE;
+			has_file_end = GF_TRUE;
+			start = -1;
+			if (sscanf(range+1, LLD, &end) != 1)
+				request_ok = GF_FALSE;
+		}
+		//start -> EOF
+		else if (range[len-1] == '-') {
+			if (has_open_start)
+				request_ok = GF_FALSE;
+			has_open_start = GF_TRUE;
+			end = -1;
+			if (sscanf(range, LLD"-", &start) != 1)
+				request_ok = GF_FALSE;
+		} else {
+			if (sscanf(range, LLD"-"LLD, &start, &end) != 2)
+				request_ok = GF_FALSE;
+		}
+		if ((start==-1) && (end==-1)) {
+			request_ok = GF_FALSE;
+		}
+
+		if (request_ok) {
+			if (sess->nb_ranges >= sess->alloc_ranges) {
+				sess->alloc_ranges = sess->nb_ranges + 1;
+				sess->ranges = gf_realloc(sess->ranges, sizeof(HTTByteRange)*sess->alloc_ranges);
+			}
+			sess->ranges[sess->nb_ranges].start = start;
+			sess->ranges[sess->nb_ranges].end = end;
+			sess->nb_ranges++;
+		}
+
+		if (sep) sep[0] = '/';
+		if (!next) break;
+		next[0] = ',';
+		range = next+1;
+		if (!request_ok) break;
+	}
+	if (!request_ok) return GF_FALSE;
+
+	if (sess->in_source) {
+		//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;
+	} else {
+		known_file_size = sess->file_size;
+	}
+	sess->bytes_in_req = 0;
+	for (i=0; i<sess->nb_ranges; i++) {
+		if (sess->ranges[i].start>=0) {
+			//if start, end is a pos in bytes in size (0-based)
+			if (sess->ranges[i].end==-1) {
+				sess->ranges[i].end = known_file_size-1;
+			}
+
+			if (sess->ranges[i].end >= (s64) known_file_size) {
+				request_ok = GF_FALSE;
+				break;
+			}
+			if (sess->ranges[i].start >= (s64) known_file_size) {
+				request_ok = GF_FALSE;
+				break;
+			}
+		} else {
+			//no start, end is a file size
+			if (sess->ranges[i].end >= (s64) known_file_size) {
+				request_ok = GF_FALSE;
+				break;
+			}
+			sess->ranges[i].start = known_file_size - sess->ranges[i].end;
+			sess->ranges[i].end = known_file_size - 1;
+		}
+		sess->bytes_in_req += (sess->ranges[i].end + 1 - sess->ranges[i].start);
+	}
+	//if we have a single byte range request covering the entire file, reply 200 OK and not 206 partial
+	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;
+	sess->file_pos = sess->ranges[0].start;
+	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;
+
+	if (!strcmp(sess->ctx->reqlog, "*")) return GF_TRUE;
+
+	switch (method) {
+	case GF_HTTP_GET:
+		if (strstr(sess->ctx->reqlog, "GET") || strstr(sess->ctx->reqlog, "get")) return GF_TRUE;
+		break;
+	case GF_HTTP_PUT:
+		if (strstr(sess->ctx->reqlog, "PUT") || strstr(sess->ctx->reqlog, "put")) return GF_TRUE;
+		break;
+	case GF_HTTP_POST:
+		if (strstr(sess->ctx->reqlog, "POST") || strstr(sess->ctx->reqlog, "post")) return GF_TRUE;
+		break;
+	case GF_HTTP_DELETE:
+		if (strstr(sess->ctx->reqlog, "DEL") || strstr(sess->ctx->reqlog, "del")) return GF_TRUE;
+		break;
+	case GF_HTTP_HEAD:
+		if (strstr(sess->ctx->reqlog, "HEAD") || strstr(sess->ctx->reqlog, "head")) return GF_TRUE;
+		break;
+	case GF_HTTP_OPTIONS:
+		if (strstr(sess->ctx->reqlog, "OPT") || strstr(sess->ctx->reqlog, "opt")) return GF_TRUE;
+		break;
+	default:
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+#ifndef GPAC_DISABLE_LOG
+static const char *get_method_name(u32 method)
+{
+	switch (method) {
+	case GF_HTTP_GET: return "GET";
+	case GF_HTTP_HEAD: return "HEAD";
+	case GF_HTTP_PUT: return "PUT";
+	case GF_HTTP_POST: return "POST";
+	case GF_HTTP_DELETE: return "DELETE";
+	case GF_HTTP_TRACE: return "TRACE";
+	case GF_HTTP_CONNECT: return "CONNECT";
+	case GF_HTTP_OPTIONS: return "OPTIONS";
+	default: return "UNKNOWN";
+	}
+}
+#endif //GPAC_DISABLE_LOG
+
+static void httpout_sess_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	char *rsp_buf = NULL;
+	const char *url="";
+	char *full_path=NULL;
+	char *response = NULL;
+	char szFmt[100];
+	char szETag[100];
+	u64 modif_time=0;
+	u32 body_size=0;
+	const char *etag=NULL, *range=NULL;
+	const char *mime = NULL;
+	char *response_body = NULL;
+	GF_Err e=GF_OK;
+	Bool not_modified = GF_FALSE;
+	Bool is_upload = GF_FALSE;
+	u32 i, count;
+	GF_HTTPOutInput *source_pid = NULL;
+	GF_HTTPOutSession *source_sess = NULL;
+	GF_HTTPOutSession *sess = usr_cbk;
+
+	if (parameter->msg_type != GF_NETIO_PARSE_REPLY) {
+		parameter->error = GF_BAD_PARAM;
+		return;
+	}
+	switch (parameter->reply) {
+	case GF_HTTP_GET:
+	case GF_HTTP_HEAD:
+		break;
+	case GF_HTTP_PUT:
+	case GF_HTTP_POST:
+	case GF_HTTP_DELETE:
+		is_upload = GF_TRUE;
+		break;
+	default:
+		response = "HTTP/1.1 501 Not Implemented\r\n";
+		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";
+		goto exit;
+	}
+
+	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";
+			gf_dynstrcat(&response_body, "No write directory enabled on server", NULL);
+			goto exit;
+		}
+		if (sess->ctx->wdir) {
+			u32 len = (u32) strlen(sess->ctx->wdir);
+			gf_dynstrcat(&full_path, sess->ctx->wdir, NULL);
+			if (!strchr("/\\", sess->ctx->wdir[len-1]))
+				gf_dynstrcat(&full_path, "/", NULL);
+			gf_dynstrcat(&full_path, url+1, NULL);
+		} else if (sess->ctx->hmode==MODE_SOURCE) {
+			full_path = gf_strdup(url+1);
+		}
+		if (parameter->reply==GF_HTTP_DELETE)
+			is_upload = GF_FALSE;
+	}
+
+	if (is_upload) {
+		const char *hdr;
+		range = gf_dm_sess_get_header(sess->http_sess, "Range");
+
+		if (sess->in_source) {
+			sess->in_source->nb_dest--;
+			sess->in_source = NULL;
+		}
+		sess->content_length = 0;
+		hdr = gf_dm_sess_get_header(sess->http_sess, "Content-Length");
+		if (hdr) {
+			sscanf(hdr, LLU, &sess->content_length);
+		}
+		sess->use_chunk_transfer = GF_FALSE;
+		hdr = gf_dm_sess_get_header(sess->http_sess, "Transfer-Encoding");
+		if (hdr && !strcmp(hdr, "chunked")) {
+			sess->use_chunk_transfer = GF_TRUE;
+		}
+		sess->file_in_progress = GF_FALSE;
+		sess->nb_bytes = 0;
+		sess->done = GF_FALSE;
+		assert(full_path);
+		if (sess->path) gf_free(sess->path);
+		sess->path = full_path;
+		if (sess->resource) gf_fclose(sess->resource);
+		sess->resource = NULL;
+
+		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";
+				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;
+			}
+			sess->upload_type = 1;
+			sess->reconfigure_output = GF_TRUE;
+		} else {
+			if (gf_file_exists(sess->path))
+				sess->upload_type = 2;
+			else
+				sess->upload_type = 1;
+
+			sess->resource = gf_fopen(sess->path, range ? "rb+" : "wb");
+			if (!sess->resource) {
+				response = "HTTP/1.1 403 Forbidden\r\n";
+				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";
+				gf_dynstrcat(&response_body, "No content length specified and chunked transfer not enabled", NULL);
+				goto exit;
+			}
+			sess->file_size = gf_fsize(sess->resource);
+		}
+		sess->file_pos = 0;
+
+		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";
+			gf_dynstrcat(&response_body, "Range format is not supported, only \"bytes\" units allowed: ", NULL);
+			gf_dynstrcat(&response_body, range, NULL);
+			goto exit;
+		}
+		if (!sess->buffer) {
+			sess->buffer = gf_malloc(sizeof(u8)*sess->ctx->block_size);
+		}
+		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->last_active_time = gf_sys_clock_high_res();
+
+		if (sess->do_log) {
+			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));
+			} 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));
+			}
+		}
+		sess->req_start_time = gf_sys_clock_high_res();
+		//send reply once we are done recieving
+		return;
+	}
+
+	/*first check active inputs*/
+	count = gf_list_count(sess->ctx->inputs);
+	//delete only accepts local files
+	if (parameter->reply == GF_HTTP_DELETE)
+		count = 0;
+
+	for (i=0; i<count; i++) {
+		GF_HTTPOutInput *in = gf_list_get(sess->ctx->inputs, i);
+		//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;
+		}
+	}
+
+	/*not resolved and no source matching, check file on disk*/
+	if (!source_pid && !full_path) {
+		count = gf_list_count(sess->ctx->rdirs);
+		for (i=0; i<count; i++) {
+			char *mdir = gf_list_get(sess->ctx->rdirs, i);
+			u32 len = (u32) strlen(mdir);
+			if (!len) continue;
+			if (count==1) {
+				gf_dynstrcat(&full_path, mdir, NULL);
+				if (!strchr("/\\", mdir[len-1]))
+					gf_dynstrcat(&full_path, "/", NULL);
+			}
+			gf_dynstrcat(&full_path, url+1, NULL);
+
+			if (gf_file_exists(full_path))
+				break;
+			gf_free(full_path);
+			full_path = NULL;
+		}
+	}
+
+	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);
+			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);
+		for (i=0; i<count; i++) {
+			source_sess = gf_list_get(sess->ctx->sessions, i);
+			if ((source_sess != sess) && !source_sess->done && source_sess->upload_type && !strcmp(source_sess->path, full_path)) {
+				break;
+			}
+			source_sess = NULL;
+		}
+	}
+
+	//session is on an active input being uploaded, always consider as modified
+	if (source_pid && !sess->ctx->single_mode) {
+		etag = NULL;
+	}
+	//resource is being uploaded, always consider as modified
+	else if (source_sess) {
+		etag = NULL;
+	}
+	//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");
+	}
+
+	range = gf_dm_sess_get_header(sess->http_sess, "Range");
+
+	if (sess->in_source) {
+		sess->in_source->nb_dest--;
+		sess->in_source = NULL;
+	}
+	sess->file_in_progress = GF_FALSE;
+	sess->use_chunk_transfer = GF_FALSE;
+	sess->put_in_progress = 0;
+	sess->nb_bytes = 0;
+	sess->upload_type = 0;
+
+	if (parameter->reply==GF_HTTP_DELETE) {
+		sess->upload_type = 0;
+		if (sess->path) gf_free(sess->path);
+		sess->path = full_path;
+		if (sess->resource) gf_fclose(sess->resource);
+		sess->resource = NULL;
+		sess->file_pos = sess->file_size = 0;
+
+		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";
+				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));
+			}
+
+			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));
+			}
+		} else {
+			e = GF_URL_ERROR;
+		}
+		range = NULL;
+	}
+	/*we have a source and we are not in record mode */
+	else if (source_pid && sess->ctx->single_mode) {
+		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++;
+		source_pid->hold = GF_FALSE;
+
+		sess->file_pos = sess->file_size = 0;
+		sess->use_chunk_transfer = GF_TRUE;
+	}
+	/*we have matching etag*/
+	else if (etag && !strcmp(etag, szETag) && !sess->ctx->no_etag) {
+		if (sess->path) gf_free(sess->path);
+		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) ) {
+		gf_free(full_path);
+		sess->file_pos = 0;
+	} else {
+		if (sess->path) gf_free(sess->path);
+		if (source_pid) {
+			sess->in_source = source_pid;
+			source_pid->nb_dest++;
+			source_pid->hold = GF_FALSE;
+			sess->send_init_data = GF_TRUE;
+
+			sess->file_in_progress = GF_TRUE;
+			assert(!full_path);
+			assert(source_pid->local_path);
+			full_path = gf_strdup(source_pid->local_path);
+			sess->use_chunk_transfer = GF_TRUE;
+		}
+		sess->path = full_path;
+		if (!full_path || gf_dir_exists(full_path)) {
+			if (sess->ctx->dlist) {
+				range = NULL;
+				if (!strcmp(url, "/")) {
+					response_body = httpout_create_listing(sess->ctx, (char *) url);
+				} else {
+					response_body = httpout_create_listing(sess->ctx, full_path);
+				}
+				sess->file_size = sess->file_pos = 0;
+			} else {
+				response = "HTTP/1.1 403 Forbidden\r\n";
+				gf_dynstrcat(&response_body, "Directory browsing is not allowed", NULL);
+				goto exit;
+			}
+		} else {
+			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";
+				gf_dynstrcat(&response_body, "File exists but no read access", NULL);
+				goto exit;
+			}
+
+			if (!sess->in_source) {
+				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";
+						gf_dynstrcat(&response_body, "File opened but read operation failed", NULL);
+						goto exit;
+					}
+				}
+				if (read) {
+					probe_buf[read] = 0;
+					mime = gf_filter_probe_data(sess->ctx->filter, probe_buf, read);
+				}
+
+				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;
+			}
+		}
+		sess->file_pos = 0;
+		sess->bytes_in_req = sess->file_size;
+
+		if (sess->mime) gf_free(sess->mime);
+		sess->mime = ( mime && strcmp(mime, "*")) ? gf_strdup(mime) : NULL;
+		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";
+		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);
+	}
+	if (sess->ctx->sutc) {
+		sprintf(szFmt, "Server-UTC: "LLU"\r\n", gf_net_get_utc());
+		gf_dynstrcat(&rsp_buf, szFmt, NULL);
+	}
+
+	sess->is_head = (parameter->reply == GF_HTTP_HEAD) ? GF_TRUE : GF_FALSE;
+
+	if (sess->ctx->close) {
+		gf_dynstrcat(&rsp_buf, "Connection: close\r\n", NULL);
+	} else {
+		gf_dynstrcat(&rsp_buf, "Connection: keep-alive\r\n", NULL);
+		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);
+		}
+	}
+
+	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);
+		sprintf(szFmt, "%d", body_size);
+		gf_dynstrcat(&rsp_buf, szFmt, NULL);
+		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	}
+	//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->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);
+			}
+		} else if (sess->in_source && !sess->ctx->rdirs) {
+			sess->nb_ranges = 0;
+			gf_dynstrcat(&rsp_buf, "Cache-Control: no-cache, no-store\r\n", NULL);
+		}
+		if (sess->bytes_in_req) {
+			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);
+		}
+		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);
+		}
+		//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 (!sess->is_head && sess->nb_ranges) {
+			gf_dynstrcat(&rsp_buf, "Content-Range: 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(&rsp_buf, "\r\n", NULL);
+		}
+
+		if (sess->in_source && sess->ctx->ice) {
+			const GF_PropertyValue *p;
+			u32 sr=0, br=0, nb_ch=0, p_idx;
+			u32 w=0, h=0;
+			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_SAMPLE_RATE);
+			if (p) sr = p->value.uint;
+			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_NUM_CHANNELS);
+			if (p) nb_ch = p->value.uint;
+			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_BITRATE);
+			if (p) br = p->value.uint;
+
+			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_WIDTH);
+			if (p) w = p->value.uint;
+			p = gf_filter_pid_get_property(sess->in_source->ipid, GF_PROP_PID_HEIGHT);
+			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 (w&&h) {
+				gf_dynstrcat(&rsp_buf, "ice-video-info: ", NULL);
+				sprintf(szFmt, "width=%d;height=%d", w, h);
+				gf_dynstrcat(&rsp_buf, szFmt, NULL);
+				gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+			}
+
+			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_dynstrcat(&rsp_buf, "icy-pub: 1\r\n", NULL);
+			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);
+			}
+			p_idx = 0;
+			while (1) {
+				const char *pname;
+				p = gf_filter_pid_enum_properties(sess->in_source->ipid, &p_idx, NULL, &pname);
+				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_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));
+
+	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" : ""));
+		} 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" : ""));
+		}
+	}
+
+	httpout_sess_send(sess, rsp_buf, (u32) strlen(rsp_buf));
+	gf_free(rsp_buf);
+	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)
+			sess->done = GF_TRUE;
+	}
+	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 (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);
+		sprintf(szFmt, "%d", body_size);
+		gf_dynstrcat(&rsp_buf, szFmt, NULL);
+		gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	}
+	gf_dynstrcat(&rsp_buf, "\r\n", NULL);
+	if (response_body) {
+		gf_dynstrcat(&rsp_buf, response_body, NULL);
+		gf_free(response_body);
+	}
+	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);
+
+	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));
+	}
+
+	sess->upload_type = 0;
+	httpout_reset_socket(sess);
+	return;
+}
+
+enum
+{
+	HTTP_PUT_HEADER_ENCODING=0,
+	HTTP_PUT_HEADER_MIME,
+	HTTP_PUT_HEADER_RANGE,
+	HTTP_PUT_HEADER_DONE
+};
+
+static void httpout_in_io(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	GF_HTTPOutInput *in =usr_cbk;
+
+	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;
+		return;
+	}
+	if (parameter->msg_type==GF_NETIO_GET_HEADER) {
+		parameter->name = parameter->value = NULL;
+
+		if (in->is_delete) return;
+
+		switch (in->cur_header) {
+		case HTTP_PUT_HEADER_ENCODING:
+			parameter->name = "Transfer-Encoding";
+			parameter->value = "chunked";
+			if (in->mime)
+				in->cur_header = HTTP_PUT_HEADER_MIME;
+			else
+				in->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)
+				in->cur_header = HTTP_PUT_HEADER_RANGE;
+			break;
+		case HTTP_PUT_HEADER_RANGE:
+			parameter->name = "Range";
+			if (in->write_end_range) {
+				sprintf(in->range_hdr, "bytes="LLU"-"LLU, in->write_start_range, in->write_end_range);
+			} else {
+				sprintf(in->range_hdr, "bytes="LLU"-", in->write_start_range);
+			}
+			parameter->value = in->range_hdr;
+			in->cur_header = HTTP_PUT_HEADER_DONE;
+			break;
+		default:
+			parameter->name = NULL;
+			parameter->value = NULL;
+			break;
+		}
+	}
+}
+
+static GF_Err httpout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_HTTPOutInput *pctx;
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
+
+	if (!is_remove) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+		if (!p || (p->value.uint!=GF_STREAM_FILE))
+			return GF_NOT_SUPPORTED;
+	}
+
+	pctx = gf_filter_pid_get_udta(pid);
+	if (!pctx) {
+		GF_HTTPOutCtx *ctx_orig;
+		Bool patch_blocks = GF_FALSE;
+		GF_FilterEvent evt;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
+		if (p && p->value.uint) {
+			if (ctx->hmode==MODE_PUSH) {
+				if (p->value.uint==GF_PID_FILE_PATCH_INSERT) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Push cannot be used to insert blocks in remote files (not supported by HTTP)\n"));
+					return GF_FILTER_NOT_SUPPORTED;
+				}
+				patch_blocks = GF_TRUE;
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Server cannot deliver PIDs with progressive download disabled\n"));
+				return GF_FILTER_NOT_SUPPORTED;
+			}
+		}
+
+		/*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->dst && (ctx->hmode==MODE_PUSH))  {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Push output but no destination set !\n"));
+			return GF_BAD_PARAM;
+		}
+
+		GF_SAFEALLOC(pctx, GF_HTTPOutInput);
+		if (!pctx) return GF_OUT_OF_MEM;
+		pctx->ipid = pid;
+		pctx->ctx = ctx;
+		pctx->patch_blocks = patch_blocks;
+		pctx->hold = ctx->hold;
+
+		if (ctx_orig->dst) {
+			char *path = strstr(ctx_orig->dst, "://");
+			if (path) path = strchr(path+3, '/');
+			if (path) pctx->path = gf_strdup(path);
+
+			if (ctx->hmode==MODE_PUSH) {
+				GF_Err e;
+				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);
+					return e;
+				}
+//				gf_sk_group_register(ctx->sg, pctx->socket);
+			} else {
+				httpout_set_local_path(ctx, pctx);
+			}
+
+			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;
+	}
+
+	//we act as a server
+
+	return GF_OK;
+}
+
+
+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;
+
+	e = gf_sk_accept(ctx->server_sock, &new_conn);
+	if (e==GF_IP_SOCK_WOULD_BLOCK) return;
+	else if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Accept failure %s\n", gf_error_to_string(e) ));
+		return;
+	}
+	//check max connections
+	if (ctx->maxc && (ctx->nb_connections>=ctx->maxc)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] Connection rejected due to too many connections\n"));
+		gf_sk_del(new_conn);
+		return;
+	}
+	gf_sk_get_remote_address(new_conn, peer_address);
+	if (ctx->maxp) {
+		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 (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_sk_del(new_conn);
+			return;
+		}
+	}
+	GF_SAFEALLOC(sess, GF_HTTPOutSession);
+	if (!sess) {
+		gf_sk_del(new_conn);
+		return;
+	}
+	
+	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);
+		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);
+			gf_sk_del(new_conn);
+			return;
+		}
+	}
+#endif
+
+	sess->http_sess = gf_dm_sess_new_server(new_conn, sess->ssl, 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) ));
+		gf_free(sess);
+		return;
+	}
+	ctx->nb_connections++;
+
+	gf_list_add(ctx->sessions, sess);
+	gf_list_add(ctx->active_sessions, sess);
+	gf_sk_group_register(ctx->sg, sess->socket);
+	
+	gf_sk_set_buffer_size(new_conn, GF_FALSE, ctx->block_size);
+	gf_sk_set_buffer_size(new_conn, GF_TRUE, ctx->block_size);
+	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;
+}
+
+static GF_Err httpout_initialize(GF_Filter *filter)
+{
+	char szIP[1024];
+	GF_Err e;
+	u16 port;
+	char *ip;
+	const char *ext = NULL;
+	char *sep, *url;
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
+
+
+	port = ctx->port;
+	ip = ctx->ifce;
+
+	url = ctx->dst;
+	sep = NULL;
+	if (ctx->dst) {
+		if (!strncmp(ctx->dst, "http://", 7)) {
+			sep = strchr(ctx->dst+7, '/');
+		} else if (!strncmp(ctx->dst, "https://", 8)) {
+			sep = strchr(ctx->dst+8, '/');
+		}
+	}
+	if (sep) {
+		u32 cplen;
+		url = sep+1;
+		cplen = (u32) (sep-ctx->dst-7);
+		if (cplen>1023) cplen=1023;
+		strncpy(szIP, ctx->dst+7, cplen);
+		szIP[1023] = 0;
+		sep = strchr(szIP, ':');
+		if (sep) {
+			port = atoi(sep+1);
+			if (!port) port = ctx->port;
+			sep[0] = 0;
+		}
+		if (strlen(szIP)) ip = szIP;
+	}
+	if (url && !strlen(url))
+		url = NULL;
+
+	if (url) {
+		if (ctx->ext) ext = ctx->ext;
+		else {
+			ext = gf_file_ext_start(url);
+			if (!ext) ext = ".*";
+			ext += 1;
+		}
+
+		if (!ext && !ctx->mime) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTPOut] No extension provided nor mime type for output file %s, cannot infer format\nThis may result in invalid filter chain resolution", ctx->dst));
+		} else {
+			//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;
+	}
+
+	if (ctx->wdir)
+		ctx->hmode = MODE_DEFAULT;
+
+	if (!url && !ctx->rdirs && !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) {
+		gf_filter_make_sticky(filter);
+	} else if (ctx->hmode!=MODE_PUSH) {
+		ctx->single_mode = GF_TRUE;
+	}
+
+	ctx->sessions = gf_list_new();
+	ctx->active_sessions = gf_list_new();
+	ctx->inputs = gf_list_new();
+	ctx->filter = filter;
+	//used in both server and push modes
+	ctx->sg = gf_sk_group_new();
+
+	if (ip)
+		ctx->ip = gf_strdup(ip);
+
+	if (ctx->cache_control) {
+		if (!strcmp(ctx->cache_control, "none")) ctx->no_etag = GF_TRUE;
+	}
+
+	if (ctx->hmode==MODE_PUSH) {
+		ctx->hold = GF_FALSE;
+		return GF_OK;
+	}
+	ctx->port = port;
+	if (ctx->cert && !ctx->pkey) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] missing server private key file\n"));
+		return GF_BAD_PARAM;
+	}
+	if (!ctx->cert && ctx->pkey) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] missing server certificate file\n"));
+		return GF_BAD_PARAM;
+	}
+	if (ctx->cert && ctx->pkey) {
+#ifdef GPAC_HAS_SSL
+		if (!gf_file_exists(ctx->cert)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Certificate file %s not found\n", ctx->cert));
+			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));
+			return GF_IO_ERR;
+		}
+		if (gf_ssl_init_lib()) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Failed to initialize OpenSSL library\n"));
+			return GF_IO_ERR;
+		}
+		ctx->ssl_ctx = gf_ssl_server_context_new(ctx->cert, ctx->pkey);
+		if (!ctx->ssl_ctx) return GF_IO_ERR;
+#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;
+
+#endif
+	}
+
+	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);
+	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) ));
+		return e;
+	}
+	gf_sk_group_register(ctx->sg, ctx->server_sock);
+
+	gf_sk_server_mode(ctx->server_sock, GF_TRUE);
+	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));
+	}
+	gf_filter_post_process_task(filter);
+	return GF_OK;
+}
+
+static void httpout_del_session(GF_HTTPOutSession *s)
+{
+	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->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_finalize(GF_Filter *filter)
+{
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
+
+	/*this is an alias for our main filter, nothing to finalize*/
+	if (gf_filter_is_alias(filter))
+		return;
+
+	while (gf_list_count(ctx->sessions)) {
+		GF_HTTPOutSession *tmp = gf_list_get(ctx->sessions, 0);
+		tmp->opid = NULL;
+		httpout_del_session(tmp);
+	}
+	gf_list_del(ctx->sessions);
+	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_free(url);
+			}
+			gf_list_del(tmp->file_deletes);
+		}
+		gf_free(tmp);
+	}
+	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);
+
+#ifdef GPAC_HAS_SSL
+	if (ctx->ssl_ctx) {
+		gf_ssl_server_context_del(ctx->ssl_ctx);
+	}
+#endif
+}
+
+static GF_Err httpout_sess_data_upload(GF_HTTPOutSession *sess, const u8 *data, u32 size)
+{
+	u32 remain, write, to_write;
+
+	if (sess->opid || sess->reconfigure_output) {
+		GF_FilterPacket *pck;
+		u8 *buffer;
+		Bool is_first = GF_FALSE;
+		if (sess->reconfigure_output) {
+			sess->reconfigure_output = GF_FALSE;
+			gf_filter_pid_raw_new(sess->ctx->filter, sess->path, NULL, sess->mime, NULL, (u8 *) data, size, GF_FALSE, &sess->opid);
+			is_first = GF_TRUE;
+		}
+		if (!sess->opid) return GF_SERVICE_ERROR;
+		pck = gf_filter_pck_new_alloc(sess->opid, size, &buffer);
+		if (!pck) return GF_IO_ERR;
+		memcpy(buffer, data, size);
+		gf_filter_pck_set_framing(pck, is_first, GF_FALSE);
+		gf_filter_pck_send(pck);
+		return GF_OK;
+	}
+	if (!sess->resource) {
+		assert(0);
+	}
+	if (!sess->nb_ranges) {
+		write = (u32) gf_fwrite(data, size, sess->resource);
+		if (write != size) {
+			return GF_IO_ERR;
+		}
+		sess->nb_bytes += write;
+		sess->file_pos += write;
+		return GF_OK;
+	}
+	remain = size;
+	while (remain) {
+		to_write = (u32) (sess->ranges[sess->range_idx].end + 1 - sess->file_pos);
+		if (to_write>=remain) {
+			write = (u32) gf_fwrite(data, remain, sess->resource);
+			if (write != remain) {
+				return GF_IO_ERR;
+			}
+			sess->nb_bytes += write;
+			sess->file_pos += remain;
+			remain = 0;
+			break;
+		}
+		write = (u32) gf_fwrite(data, to_write, sess->resource);
+		sess->nb_bytes += write;
+		remain -= to_write;
+		sess->range_idx++;
+		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);
+	}
+	if (remain) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Error in file upload, more bytes uploaded than described in byte range\n"));
+		return GF_BAD_PARAM;
+	}
+	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;
+
+	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)));
+	} else {
+		char *unit = "bps";
+		u64 diff_us = (gf_sys_clock_high_res() - sess->req_start_time);
+		Double bps = (Double)sess->nb_bytes * 8000000;
+		bps /= diff_us;
+		if (bps>1000000) {
+			unit = "mbps";
+			bps/=1000000;
+		} else if (bps>1000) {
+			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));
+	}
+}
+
+static void httpout_process_session(GF_Filter *filter, GF_HTTPOutCtx *ctx, GF_HTTPOutSession *sess)
+{
+	u32 read;
+	u64 to_read=0;
+	GF_Err e = GF_OK;
+	Bool close_session = ctx->close;
+
+
+	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 (e>=GF_OK) {
+			if (read)
+				write_e = httpout_sess_data_upload(sess, sess->buffer, read);
+			else
+				write_e = GF_OK;
+
+			if (!write_e) {
+				sess->last_active_time = gf_sys_clock_high_res();
+				ctx->next_wake_us = 0;
+				//we way be in end of stream
+				if (e==GF_OK)
+					return;
+			} else {
+				e = write_e;
+			}
+		} else if (e==GF_IP_NETWORK_EMPTY) {
+			ctx->next_wake_us = 0;
+			sess->last_active_time = gf_sys_clock_high_res();
+			httpout_check_connection(sess);
+			return;
+		} else if (e==GF_IP_CONNECTION_CLOSED) {
+			sess->last_active_time = gf_sys_clock_high_res();
+			sess->done = GF_TRUE;
+			sess->upload_type = 0;
+			httpout_reset_socket(sess);
+			log_request_done(sess);
+			return;
+		}
+		//done (error or end of upload)
+		if (sess->opid) {
+			GF_FilterPacket *pck = gf_filter_pck_new_alloc(sess->opid, 0, NULL);
+			if (pck) {
+				gf_filter_pck_set_framing(pck, GF_FALSE, 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;
+		}
+
+
+		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);
+			} else {
+				gf_dynstrcat(&rsp_buf, "HTTP/1.1 201 Created\r\n", NULL);
+				sess->reply_code = 201;
+			}
+		} 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);
+
+		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 (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);
+			}
+			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));
+
+		log_request_done(sess);
+
+		httpout_sess_send(sess, rsp_buf, (u32) strlen(rsp_buf));
+		gf_free(rsp_buf);
+
+		sess->last_active_time = gf_sys_clock_high_res();
+		sess->done = GF_TRUE;
+		sess->upload_type = 0;
+
+		//notify all download (GET, HEAD) sessions using the same resource that we are done
+		count = gf_list_count(sess->ctx->sessions);
+		for (i=0; i<count; i++) {
+			GF_HTTPOutSession *a_sess = gf_list_get(sess->ctx->sessions, i);
+			if (a_sess == sess) continue;
+			if (a_sess->done || !a_sess->put_in_progress) continue;
+			if (a_sess->path && sess->path && !strcmp(a_sess->path, sess->path)) {
+				a_sess->put_in_progress = (sess->reply_code>201) ? 2 : 0;
+				a_sess->file_size = gf_fsize(a_sess->resource);
+				gf_fseek(a_sess->resource, a_sess->file_pos, SEEK_SET);
+			}
+		}
+
+		if (close_session) {
+			httpout_reset_socket(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);
+			}
+		}
+		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)) {
+			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 (!sess->done)
+				log_request_done(sess);
+			return;
+		}
+
+		sess->last_active_time = gf_sys_clock_high_res();
+		ctx->next_wake_us = 0;
+
+		//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) )
+				goto session_done;
+		} else {
+			//flush any data received
+			httpout_process_session(filter, ctx, sess);
+			return;
+		}
+	}
+	if (!sess->socket) return;
+	if (sess->done) return;
+	if (sess->in_source) return;
+
+	if (!gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_WRITE)) {
+		return;
+	}
+	//resource is not set
+	if (!sess->resource && sess->path) {
+		if (sess->in_source && !sess->in_source->nb_write) {
+			sess->last_active_time = gf_sys_clock_high_res();
+			return;
+		}
+		sess->resource = gf_fopen(sess->path, "rb");
+		if (!sess->resource) return;
+		sess->last_active_time = gf_sys_clock_high_res();
+		gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+	}
+
+	//refresh file size
+	if (sess->put_in_progress==1) {
+		sess->file_size = gf_fsize(sess->resource);
+		gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+	}
+
+	//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) {
+				sess->file_pos = (u64) sess->ranges[sess->range_idx].start;
+				gf_fseek(sess->resource, sess->file_pos, SEEK_SET);
+			}
+		}
+		if (sess->range_idx<sess->nb_ranges) {
+			to_read = sess->ranges[sess->range_idx].end + 1 - sess->file_pos;
+		}
+	} else if (sess->file_pos < sess->file_size) {
+		to_read = sess->file_size - sess->file_pos;
+	}
+
+	if (to_read) {
+		ctx->next_wake_us = 0;
+
+		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);
+
+		//transfer of file being uploaded, use chunk transfer
+		if (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);
+		} else {
+			e = httpout_sess_send(sess, sess->buffer, read);
+		}
+		sess->last_active_time = gf_sys_clock_high_res();
+
+		sess->file_pos += read;
+		sess->nb_bytes += read;
+
+		if (e) {
+			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);
+				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));
+		}
+		return;
+	}
+	//file not done yet ...
+	if (sess->file_in_progress || (sess->put_in_progress==1)) {
+		sess->last_active_time = gf_sys_clock_high_res();
+		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;
+	sess->last_active_time = gf_sys_clock_high_res();
+
+	//an error ocured uploading the resource, we cannot notify that error so we force a close...
+	if (sess->put_in_progress==2)
+		close_session = GF_TRUE;
+
+	if (!sess->done) {
+		if (sess->use_chunk_transfer) {
+			httpout_sess_send(sess, "0\r\n\r\n", 5);
+		}
+		if (sess->resource) gf_fclose(sess->resource);
+		sess->resource = NULL;
+		//keep resource active
+		sess->done = GF_TRUE;
+	}
+	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);
+		}
+	}
+}
+
+static Bool httpout_open_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in, const char *name, Bool is_delete)
+{
+//	Bool reassign_clients = GF_TRUE;
+	u32 len;
+	const char *dir;
+	const char *sep = name ? strstr(name, "://") : NULL;
+
+	if (sep) sep = strchr(sep+3, '/');
+	if (!sep) {
+		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));
+
+	if (in->upload) {
+		GF_Err e;
+		char *old = in->path;
+		in->is_delete = is_delete;
+		in->path = gf_strdup(name);
+		if (old) gf_free(old);
+		e = gf_dm_sess_setup_from_url(in->upload, in->path, GF_TRUE);
+		if (!e) {
+			in->cur_header = 0;
+			e = gf_dm_sess_process(in->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->is_open = GF_FALSE;
+			return GF_FALSE;
+		}
+		if (is_delete) {
+			//get response
+			gf_dm_sess_process(in->upload);
+			in->done = GF_TRUE;
+			in->is_open = GF_FALSE;
+			in->is_delete = GF_FALSE;
+		}
+		return GF_TRUE;
+	}
+	//server mode not recording, nothing to do
+	if (!ctx->rdirs) return GF_FALSE;
+
+	if (in->resource) return GF_FALSE;
+
+	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;
+	} else {
+		if (in->path) gf_free(in->path);
+		in->path = gf_strdup(sep);
+	}
+	httpout_set_local_path(ctx, in);
+
+	if (is_delete) {
+		gf_file_delete(in->local_path);
+		in->done = GF_TRUE;
+		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;
+	}
+	return GF_TRUE;
+}
+
+static void httpout_close_input(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	if (!in->is_open) return;
+	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));
+	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) ));
+		}
+		//signal we're done sending the body
+		gf_dm_sess_send(in->upload, NULL, 0);
+
+		//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) ));
+		}
+
+	} else {
+		u32 i, count;
+		if (in->resource) {
+			u64 file_size = gf_ftell(in->resource);
+
+			assert(in->local_path);
+			//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;
+				sess->file_in_progress = GF_FALSE;
+			}
+			gf_fclose(in->resource);
+			in->resource = NULL;
+		} else {
+			count = gf_list_count(ctx->active_sessions);
+			for (i=0; i<count; i++) {
+				GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
+				if (sess->in_source != in) continue;
+
+				httpout_sess_send(sess, "0\r\n\r\n", 5);
+				log_request_done(sess);
+			}
+		}
+	}
+	in->nb_write = 0;
+}
+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;
+
+	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) {
+		GF_Err e;
+		u32 nb_retry = 0;
+		out = pck_size;
+
+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 (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 {
+		u32 i, count = gf_list_count(ctx->active_sessions);
+
+		if (in->resource) {
+			out = (u32) gf_fwrite(pck_data, pck_size, in->resource);
+		}
+
+		for (i=0; i<count; i++) {
+			GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
+			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);
+				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)*/
+			if (sess->file_in_progress) {
+				sess->file_size += pck_size;
+			}
+			/*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);
+				sess->nb_bytes += pck_size;
+			}
+		}
+	}
+	ctx->next_wake_us = 0;
+	return out;
+}
+
+static Bool httpout_input_write_ready(GF_HTTPOutCtx *ctx, GF_HTTPOutInput *in)
+{
+	u32 i, count;
+	if (ctx->rdirs)
+		return GF_TRUE;
+
+	if (in->upload) {
+/*		if (!gf_sk_group_sock_is_set(ctx->sg, in->socket, GF_SK_SELECT_WRITE))
+			return GF_FALSE;
+*/
+		return GF_TRUE;
+	}
+
+	count = gf_list_count(ctx->active_sessions);
+	for (i=0; i<count; i++) {
+		GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
+		if (sess->in_source != in) continue;
+
+		if (!sess->file_in_progress && !gf_sk_group_sock_is_set(ctx->sg, sess->socket, GF_SK_SELECT_WRITE))
+			return GF_FALSE;
+	}
+	return count ? GF_TRUE : GF_FALSE;
+}
+
+static void httpin_send_seg_info(GF_HTTPOutInput *in)
+{
+	GF_FilterEvent evt;
+	GF_FEVT_INIT(evt, GF_FEVT_SEGMENT_SIZE, in->ipid);
+	evt.seg_size.seg_url = NULL;
+
+	if (in->dash_mode==1) {
+		evt.seg_size.is_init = GF_TRUE;
+		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.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;
+		gf_filter_pid_send_event(in->ipid, &evt);
+	}
+}
+
+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 u8 *pck_data;
+		u32 pck_size, nb_write;
+		GF_FilterPacket *pck;
+		GF_HTTPOutInput *in = gf_list_get(ctx->inputs, i);
+
+		//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;
+		}
+
+		//no destination and holding for first connect, don't drop
+		if (!ctx->hmode && !ctx->rdirs && !in->nb_dest && in->hold) {
+			continue;
+		}
+
+		pck = gf_filter_pid_get_packet(in->ipid);
+		if (!pck) {
+			nb_nopck++;
+			//check end of PID state
+			if (gf_filter_pid_is_eos(in->ipid)) {
+				nb_eos++;
+				if (in->dash_mode && in->is_open) {
+					httpin_send_seg_info(in);
+				}
+				httpout_close_input(ctx, in);
+			}
+			continue;
+		}
+
+
+		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);
+			if (p) {
+				httpin_send_seg_info(in);
+
+				if ( gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENAME))
+					start = GF_TRUE;
+			}
+		}
+
+		if (start) {
+			const GF_PropertyValue *fnum, *fname;
+			const char *name = NULL;
+			fname = NULL;
+
+			if (in->is_open)
+				httpout_close_input(ctx, in);
+
+			//file num increased per packet, open new file
+			fnum = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+			if (fnum) {
+				fname = gf_filter_pid_get_property(in->ipid, GF_PROP_PID_OUTPATH);
+				//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_PID_OUTPATH);
+			if (fname) name = fname->value.string;
+
+			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;
+			}
+
+			httpout_open_input(ctx, in, name, GF_FALSE);
+
+			if (!ctx->hmode && !ctx->rdirs && !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) {
+						in->tunein_data_size = pck_size;
+						in->tunein_data = gf_realloc(in->tunein_data, pck_size);
+						memcpy(in->tunein_data, pck_data, pck_size);
+					}
+				}
+			}
+		}
+
+		//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) {
+			gf_filter_pid_drop_packet(in->ipid);
+			continue;
+		}
+
+		if (!httpout_input_write_ready(ctx, in)) {
+			continue;
+		}
+
+		pck_data = gf_filter_pck_get_data(pck, &pck_size);
+		if (in->upload || ctx->single_mode || in->resource) {
+			GF_FilterFrameInterface *hwf = gf_filter_pck_get_frame_interface(pck);
+			if (pck_data && pck_size) {
+
+				if (in->patch_blocks && gf_filter_pck_get_seek_flag(pck)) {
+					u64 bo = gf_filter_pck_get_byte_offset(pck);
+					if (bo==GF_FILTER_NO_BO) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Cannot patch file, wrong byte offset\n"));
+					} else {
+						if (gf_filter_pck_get_interlaced(pck)) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Cannot patch file by byte insertion, not supported by HTTP\n"));
+						} else {
+							u64 pos = in->nb_write;
+							//close file
+							httpout_close_input(ctx, in);
+							//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);
+
+							nb_write = httpout_write_input(ctx, in, pck_data, pck_size, start);
+							if (nb_write!=pck_size) {
+								GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Write error, wrote %d bytes but had %d to write\n", nb_write, pck_size));
+							}
+							httpout_close_input(ctx, in);
+
+							in->write_start_range = pos;
+							in->write_end_range = 0;
+						}
+					}
+				} else {
+					if (in->write_start_range) {
+						httpout_open_input(ctx, in, in->path, GF_FALSE);
+					}
+
+					nb_write = httpout_write_input(ctx, in, pck_data, pck_size, start);
+					if (nb_write!=pck_size) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Write error, wrote %d bytes but had %d to write\n", nb_write, pck_size));
+					}
+					in->nb_write += nb_write;
+				}
+			} 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);
+				h = p ? p->value.uint : 0;
+				p = gf_filter_pid_get_property(in->ipid, GF_PROP_PID_PIXFMT);
+				pf = p ? p->value.uint : 0;
+
+				stride = stride_uv = 0;
+
+				if (gf_pixel_get_size_info(pf, w, h, NULL, &stride, &stride_uv, &nb_planes, &uv_height) == GF_TRUE) {
+					u32 k;
+					for (k=0; k<nb_planes; k++) {
+						u32 j, write_h, lsize;
+						const u8 *out_ptr;
+						u32 out_stride = k ? stride_uv : stride;
+						GF_Err e = hwf->get_plane(hwf, k, &out_ptr, &out_stride);
+						if (e) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Failed to fetch plane #%d data from hardware frame, cannot write\n", k));
+							break;
+						}
+						if (k) {
+							write_h = uv_height;
+							lsize = stride_uv;
+						} else {
+							write_h = h;
+							lsize = stride;
+						}
+						for (j=0; j<write_h; j++) {
+							nb_write = (u32) httpout_write_input(ctx, in, out_ptr, lsize, start);
+							if (nb_write!=lsize) {
+								GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPOut] Write error, wrote %d bytes but had %d to write\n", nb_write, lsize));
+							}
+							in->nb_write += nb_write;
+							out_ptr += out_stride;
+							start = GF_FALSE;
+						}
+					}
+				}
+			} else {
+				GF_LOG(GF_LOG_WARNING, 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));
+		}
+		gf_filter_pid_drop_packet(in->ipid);
+		if (end) {
+			httpout_close_input(ctx, in);
+		}
+	}
+
+	if (count && (nb_eos==count)) {
+		if (ctx->rdirs) {
+			if (gf_list_count(ctx->active_sessions))
+				gf_filter_post_process_task(ctx->filter);
+			else
+				ctx->done = GF_TRUE;
+		}
+		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)
+	if ((nb_nopck==count) && (ctx->hmode==MODE_PUSH))
+		ctx->next_wake_us = 0;
+}
+
+static GF_Err httpout_process(GF_Filter *filter)
+{
+	GF_Err e=GF_OK;
+	u32 i, count;
+	GF_HTTPOutCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->done)
+		return GF_EOS;
+
+	//wakeup every 50ms when inactive
+	ctx->next_wake_us = 50000;
+
+	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)) {
+			httpout_check_new_session(ctx);
+		}
+
+		count = gf_list_count(ctx->active_sessions);
+		for (i=0; i<count; i++) {
+			GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
+			//push
+			if (sess->in_source) continue;
+
+			//regular download
+			httpout_process_session(filter, ctx, sess);
+			//closed, remove
+			if (! sess->socket) {
+				httpout_del_session(sess);
+				i--;
+				count--;
+				if (!count && ctx->quit)
+					ctx->done = GF_TRUE;
+			}
+		}
+	}
+
+	httpout_process_inputs(ctx);
+
+	if (ctx->timeout && ctx->server_sock) {
+		count = gf_list_count(ctx->active_sessions);
+		for (i=0; i<count; i++) {
+			u32 diff_sec;
+			GF_HTTPOutSession *sess = gf_list_get(ctx->active_sessions, i);
+			if (!sess->done) continue;
+
+			diff_sec = (u32) (gf_sys_clock_high_res() - sess->last_active_time)/1000000;
+			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_del_session(sess);
+				i--;
+				count--;
+			}
+		}
+	}
+
+	if (e==GF_EOS) {
+		if (ctx->dst) return GF_EOS;
+		e=GF_OK;
+	}
+
+	if (ctx->next_wake_us)
+		gf_filter_ask_rt_reschedule(filter, ctx->next_wake_us);
+
+	return e;
+}
+
+static Bool httpout_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_HTTPOutInput *in;
+	GF_HTTPOutCtx *ctx;
+	if (evt->base.type!=GF_FEVT_FILE_DELETE)
+		return GF_FALSE;
+
+	if (!evt->base.on_pid) return GF_TRUE;
+	in = gf_filter_pid_get_udta(evt->base.on_pid);
+	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;
+
+	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;
+}
+
+static GF_FilterProbeScore httpout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "http://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "https://", 8)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static Bool httpout_use_alias(GF_Filter *filter, const char *url, const char *mime)
+{
+	u32 len;
+	char *sep;
+	GF_HTTPOutCtx *ctx = (GF_HTTPOutCtx *) gf_filter_get_udta(filter);
+
+	//check we have same hostname. If so, accept this destination as a source for our filter
+	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;
+}
+
+static const GF_FilterCapability HTTPOutCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_FILE_EXT, "*"),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_MIME, "*"),
+	{0},
+	CAP_UINT(GF_CAPS_OUTPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+};
+
+
+#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(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(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"
+	"- 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(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},
+	{0}
+};
+
+
+GF_FilterRegister HTTPOutRegister = {
+	.name = "httpout",
+	GF_FS_SET_DESCRIPTION("HTTP Server")
+
+	GF_FS_SET_HELP("The HTTP output filter can act as:\n"
+		"- a simple HTTP server\n"
+		"- an HTTP server sink\n"
+		"- an HTTP server file sink\n"
+		"- an HTTP __client__ sink\n"
+		"- an HTTP server __source__\n"
+		"  \n"
+		"The server currently handles GET, HEAD, PUT, POST, DELETE methods.\n"
+		"Single or multiple byte ranges are supported for both GET and PUT/POST methods.\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"
+		"  \n"
+		"Warning: the partial PUT request is RFC2616 compliant but not compliant with RFC7230. PATCH method is not yet implemented in GPAC.\n"
+		"  \n"
+		"When a single read directory is specified, the server root `/` is the content of this directory.\n"
+		"When multiple read directories are specified, the server root `/` contains the list of the mount points with their directory names.\n"
+		"When a write directory is specified, the upload resource name identifies a file in this directory (the write directory name is not present in the URL).\n"
+		"  \n"
+		"Listing can be enabled on server using [-dlist]().\n"
+		"When disabled, a GET on a directory will fail.\n"
+		"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"
+		"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"
+		"  \n"
+		"EX gpac httpout:wdir=incoming\n"
+		"This sets up a write-only server.\n"
+		"  \n"
+		"EX gpac httpout:rdirs=outcoming:wdir=incoming:port=8080\n"
+		"This sets up a read-write server running on [-port]() 8080.\n"
+		"  \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"
+		"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"
+		"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"
+		"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"
+		"# HTTP server file sink\n"
+		"In this mode, the filter will write input PIDs to files in the first read directory specified, acting as a file output sink.\n"
+		"The filter uses a read directory in this mode, which must be writable.\n"
+		"Upon client GET request, the server will check if the requested file matches the name of a file currently being written by the server.\n"
+		"If so, the server will keep refreshing the source size until the associated input file is closed.\n"
+		"This 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 -o http://localhost/live.mpd --rdirs=temp\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"
+		"This mode must be explicitly activated using [-hmode]().\n"
+		"The filter uses no read or write directories in this mode.\n"
+		"EX gpac -i SOURCE -o http://targethost:8080/live.mpd:gpac:hmode=push\n"
+		"In this example, the filter will send PUT methods to the server running on [-port]() 8080 at `targethost` location (IP address or name).\n"
+		"  \n"
+		"# HTTP server source\n"
+		"In this mode, the server acts as a source rather than a sink. It declares incoming PUT or POST methods as output PIDs\n"
+		"This mode must be explicitly activated using [-hmode]().\n"
+		"The filter uses no read or write directories in this mode, and uploaded data is NOT stored by the server.\n"
+		"EX gpac httpout:hmode=source vout aout\n"
+		"In this example, the filter will try to play uploaded files through video and audio output.\n"
+		"  \n"
+		"# HTTPS server\n"
+		"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"
+		"Note: 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"
+		)
+	.private_size = sizeof(GF_HTTPOutCtx),
+	.max_extra_pids = -1,
+	.args = HTTPOutArgs,
+	.probe_url = httpout_probe_url,
+	.initialize = httpout_initialize,
+	.finalize = httpout_finalize,
+	SETCAPS(HTTPOutCaps),
+	.configure_pid = httpout_configure_pid,
+	.process = httpout_process,
+	.process_event = httpout_process_event,
+	.use_alias = httpout_use_alias
+};
+
+
+const GF_FilterRegister *httpout_register(GF_FilterSession *session)
+{
+	return &HTTPOutRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/out_pipe.c Added

@@ -0,0 +1,513 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic pipe 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>
+
+#ifdef WIN32
+
+#include <windows.h>
+
+#else
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifdef GPAC_CONFIG_LINUX
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+#ifndef __BEOS__
+#include <errno.h>
+#endif
+
+#endif
+
+
+
+typedef struct
+{
+	//options
+	Double start, speed;
+	char *dst, *mime, *ext;
+	Bool dynext, mkp;
+	u32 block_size;
+
+
+	//only one input pid
+	GF_FilterPid *pid;
+
+#ifdef WIN32
+	HANDLE pipe;
+#else
+	int fd;
+#endif
+
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+	char szFileName[GF_MAX_PATH];
+	Bool owns_pipe;
+
+} GF_PipeOutCtx;
+
+const char *gf_errno_str(int errnoval);
+
+
+static GF_Err pipeout_open_close(GF_PipeOutCtx *ctx, const char *filename, const char *ext, u32 file_idx, Bool explicit_overwrite)
+{
+	GF_Err e = GF_OK;
+	char szName[GF_MAX_PATH], szFinalName[GF_MAX_PATH];
+
+	if (!filename) {
+#ifdef WIN32
+		if (ctx->pipe != INVALID_HANDLE_VALUE) CloseHandle(ctx->pipe);
+		ctx->pipe = INVALID_HANDLE_VALUE;
+#else
+		if (ctx->fd>=0) close(ctx->fd);
+		ctx->fd = -1;
+#endif
+		return GF_OK;
+	}
+
+	if (!strncmp(filename, "pipe://", 7)) filename+=7;
+
+	if (ctx->dynext) {
+		Bool has_ext = (strchr(filename, '.')==NULL) ? GF_FALSE : GF_TRUE;
+
+		strcpy(szName, filename);
+		if (!has_ext && ext) {
+			strcat(szName, ".");
+			strcat(szName, ext);
+		}
+	} else {
+		strcpy(szName, filename);
+	}
+	gf_filter_pid_resolve_file_template(ctx->pid, szName, szFinalName, file_idx, NULL);
+
+	if (!strcmp(szFinalName, ctx->szFileName) 
+#ifdef WIN32
+		&& (ctx->pipe != INVALID_HANDLE_VALUE)
+#else
+		&& ctx->fd>=0
+#endif
+		) return GF_OK;
+
+#ifdef WIN32
+	if (ctx->pipe != INVALID_HANDLE_VALUE) CloseHandle(ctx->pipe);
+	ctx->pipe = INVALID_HANDLE_VALUE;
+	char szNamedPipe[GF_MAX_PATH];
+	if (!strncmp(szFinalName, "\\\\", 2)) {
+		strcpy(szNamedPipe, szFinalName);
+	}
+	else {
+		strcpy(szNamedPipe, "\\\\.\\pipe\\gpac\\");
+		strcat(szNamedPipe, szFinalName);
+	}
+	if (strchr(szFinalName, '/')) {
+		u32 i, len = (u32)strlen(szNamedPipe);
+		for (i = 0; i < len; i++) {
+			if (szNamedPipe[i] == '/')
+				szNamedPipe[i] = '\\';
+		}
+	}
+
+	if (WaitNamedPipeA(szNamedPipe, 1) == FALSE) {
+		if (!ctx->mkp) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to open %s: %d\n", szNamedPipe, GetLastError()));
+			e = GF_URL_ERROR;
+		}
+		else {
+			ctx->pipe = CreateNamedPipe(szNamedPipe, PIPE_ACCESS_OUTBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE,
+				PIPE_TYPE_BYTE | PIPE_WAIT,
+				10,
+				ctx->block_size,
+				ctx->block_size,
+				0,
+				NULL);
+
+			if (ctx->pipe == INVALID_HANDLE_VALUE) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to create named pipe %s: %d\n", szNamedPipe, GetLastError()));
+				e = GF_IO_ERR;
+			}
+			else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[PipeOut] Waiting for client connection for %s, blocking\n", szNamedPipe));
+				if (!ConnectNamedPipe(ctx->pipe, NULL) && (GetLastError() != ERROR_PIPE_CONNECTED)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to connect named pipe %s: %d\n", szNamedPipe, GetLastError()));
+					e = GF_IO_ERR;
+					CloseHandle(ctx->pipe);
+					ctx->pipe = INVALID_HANDLE_VALUE;
+				}
+				else {
+					ctx->owns_pipe = GF_TRUE;
+				}
+			}
+		}
+	}
+	else {
+		ctx->pipe = CreateFile(szNamedPipe, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL);
+		if (ctx->pipe == INVALID_HANDLE_VALUE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to open %s: %d\n", szNamedPipe, GetLastError()));
+			e = GF_URL_ERROR;
+		}
+	}
+
+#else
+	if (ctx->fd>=0) close(ctx->fd);
+	ctx->fd = -1;
+
+	if (!gf_file_exists(szFinalName) && ctx->mkp) {
+#ifdef GPAC_CONFIG_DARWIN
+		mknod(szFinalName, S_IFIFO | 0666, 0);
+#else
+		mkfifo(szFinalName, 0666);
+#endif
+		ctx->owns_pipe = GF_TRUE;
+	}
+
+	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)));
+		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;
+	return GF_OK;
+}
+
+static GF_Err pipeout_setup_file(GF_PipeOutCtx *ctx, Bool explicit_overwrite)
+{
+	const GF_PropertyValue *p;
+	p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_OUTPATH);
+	if (p && p->value.string) {
+		return pipeout_open_close(ctx, p->value.string, NULL, 0, explicit_overwrite);
+	} else if (ctx->dynext) {
+		p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PCK_FILENUM);
+		if (!p) {
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_FILE_EXT);
+			if (p && p->value.string) {
+				return pipeout_open_close(ctx, ctx->dst, p->value.string, 0, explicit_overwrite);
+			}
+		}
+	} else {
+		return pipeout_open_close(ctx, ctx->dst, NULL, 0, explicit_overwrite);
+	}
+	return GF_BAD_PARAM;
+}
+static GF_Err pipeout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_PipeOutCtx *ctx = (GF_PipeOutCtx *) gf_filter_get_udta(filter);
+	if (is_remove) {
+		ctx->pid = NULL;
+		pipeout_open_close(ctx, NULL, NULL, 0, GF_FALSE);
+		return GF_OK;
+	}
+	gf_filter_pid_check_caps(pid);
+
+	if (!ctx->pid) {
+		GF_FilterEvent evt;
+		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "PipeOut");
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	ctx->pid = pid;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
+	if (p && p->value.uint) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Block patching is not supported by pipe output\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err pipeout_initialize(GF_Filter *filter)
+{
+	char *ext;
+	GF_PipeOutCtx *ctx = (GF_PipeOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->dst) return GF_OK;
+
+	if (strnicmp(ctx->dst, "pipe://", 7) && strstr(ctx->dst, "://"))  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		return GF_NOT_SUPPORTED;
+	}
+	if (ctx->dynext) return GF_OK;
+
+	if (ctx->ext) ext = ctx->ext;
+	else {
+		ext = gf_file_ext_start(ctx->dst);
+		if (ext) ext++;
+	}
+
+#ifdef WIN32
+	ctx->pipe = INVALID_HANDLE_VALUE;
+#else
+	ctx->fd = -1;
+#endif
+	if (!ext && !ctx->mime) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] No extension provided nor mime type for output file %s, cannot infer format\n", ctx->dst));
+		return GF_NOT_SUPPORTED;
+	}
+	//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);
+	return GF_OK;
+}
+
+static void pipeout_finalize(GF_Filter *filter)
+{
+	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);
+}
+
+static GF_Err pipeout_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	const GF_PropertyValue *fname, *p;
+	Bool start, end;
+	const char *pck_data;
+	u32 pck_size;
+	s32 nb_write;
+	GF_PipeOutCtx *ctx = (GF_PipeOutCtx *) gf_filter_get_udta(filter);
+
+	pck = gf_filter_pid_get_packet(ctx->pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->pid)) {
+			pipeout_open_close(ctx, NULL, NULL, 0, GF_FALSE);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	gf_filter_pck_get_framing(pck, &start, &end);
+
+	if (start) {
+		const GF_PropertyValue *fext, *fnum;
+
+		Bool explicit_overwrite = GF_FALSE;
+		const char *name = NULL;
+		fname = fext = NULL;
+		//file num increased per packet, open new file
+		fnum = gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM);
+		if (fnum) {
+			fname = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_OUTPATH);
+			fext = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_FILE_EXT);
+			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_PID_OUTPATH);
+		if (!fext) fext = gf_filter_pck_get_property(pck, GF_PROP_PID_FILE_EXT);
+		if (fname) name = fname->value.string;
+
+		if (end && gf_filter_pck_get_seek_flag(pck))
+			explicit_overwrite = GF_TRUE;
+
+		if (name) {
+			pipeout_open_close(ctx, name, fext ? fext->value.string : NULL, fnum ? fnum->value.uint : 0, explicit_overwrite);
+		} else if (
+#ifdef WIN32
+			ctx->pipe==INVALID_HANDLE_VALUE
+#else
+			ctx->fd<0
+#endif
+			) {
+			GF_Err e = pipeout_setup_file(ctx, explicit_overwrite);
+			if (e) {
+				gf_filter_setup_failure(filter, e);
+				return e;
+			}
+		}
+	}
+
+	pck_data = gf_filter_pck_get_data(pck, &pck_size);
+	if (
+#ifdef WIN32
+		ctx->pipe != INVALID_HANDLE_VALUE
+#else
+		ctx->fd>=0
+#endif
+		) {
+		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)) {
+				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() ));
+			}
+#else
+			nb_write = (s32) write(ctx->fd, pck_data, pck_size);
+			if (nb_write != pck_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Write error, wrote %d bytes but had %u to write: %s\n", nb_write, pck_size, gf_errno_str(errno)));
+			}
+#endif
+		} else if (hwf) {
+			u32 w, h, stride, stride_uv, pf;
+			u32 nb_planes, uv_height;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_WIDTH);
+			w = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_HEIGHT);
+			h = p ? p->value.uint : 0;
+			p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_PIXFMT);
+			pf = p ? p->value.uint : 0;
+
+			//get stride/stride_uv with no padding
+			stride = stride_uv = 0;
+			if (gf_pixel_get_size_info(pf, w, h, NULL, &stride, &stride_uv, &nb_planes, &uv_height) == GF_TRUE) {
+				u32 i;
+				for (i=0; i<nb_planes; i++) {
+					u32 j, write_h, lsize;
+					const u8 *out_ptr;
+					u32 out_stride = i ? stride_uv : stride;
+					GF_Err e = hwf->get_plane(hwf, i, &out_ptr, &out_stride);
+					if (e) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Failed to fetch plane data from hardware frame, cannot write\n"));
+						break;
+					}
+					if (i) {
+						write_h = uv_height;
+						lsize = stride_uv;
+					} else {
+						write_h = h;
+						lsize = stride;
+					}
+
+					for (j=0; j<write_h; j++) {
+#ifdef WIN32
+						if (!WriteFile(ctx->pipe, out_ptr, lsize, &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()));
+						}
+#else
+						nb_write = (s32) write(ctx->fd, out_ptr, lsize);
+						if (nb_write != lsize) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[PipeOut] Write error, wrote %d bytes but had %u to write: %s\n", nb_write, lsize, gf_errno_str(errno)));
+						}
+#endif
+						out_ptr += out_stride;
+					}
+				}
+			}
+		} else {
+			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_filter_pid_drop_packet(ctx->pid);
+	if (end) {
+		pipeout_open_close(ctx, NULL, NULL, 0, GF_FALSE);
+	}
+	return GF_OK;
+}
+
+static GF_FilterProbeScore pipeout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "pipe://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "pipe:", 5)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_PipeOutCtx, _n)
+
+static const GF_FilterArgs PipeOutArgs[] =
+{
+	{ OFFS(dst), "location of destination file", 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(block_size), "buffer size used to write to pipe, windows only", GF_PROP_UINT, "5000", NULL, GF_FS_ARG_HINT_ADVANCED },
+	{0}
+};
+
+static const GF_FilterCapability PipeOutCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_FILE_EXT, "*"),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_MIME, "*"),
+};
+
+
+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."\
+	"")
+	.private_size = sizeof(GF_PipeOutCtx),
+	.args = PipeOutArgs,
+	SETCAPS(PipeOutCaps),
+	.probe_url = pipeout_probe_url,
+	.initialize = pipeout_initialize,
+	.finalize = pipeout_finalize,
+	.configure_pid = pipeout_configure_pid,
+	.process = pipeout_process
+};
+
+
+const GF_FilterRegister *pipeout_register(GF_FilterSession *session)
+{
+	return &PipeOutRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/out_rtp.c Added

@@ -0,0 +1,1194 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / rtp 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/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/maths.h>
+
+#if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
+
+#include <gpac/filters.h>
+#include <gpac/ietf.h>
+#include <gpac/config_file.h>
+#include <gpac/base_coding.h>
+#include <gpac/rtp_streamer.h>
+
+#include "out_rtp.h"
+
+
+typedef struct
+{
+	//options
+	char *ip;
+	char *dst, *ext, *mime;
+	u32 port;
+	Bool loop, xps;
+	Bool mpeg4;
+	u32 mtu;
+	u32 ttl;
+	char *ifce;
+	u32 payt, tt;
+	s32 delay;
+	char *info, *url, *email;
+	s32 runfor, tso;
+	Bool latm;
+
+	/*timeline origin of our session (all tracks) in microseconds*/
+	u64 sys_clock_at_init;
+
+	/*list of streams in session*/
+	GF_List *streams;
+
+	/*base stream if this stream contains a media decoding dependency, 0 otherwise*/
+	u32 base_pid_id;
+
+	Bool first_RTCP_sent;
+
+	GF_RTPOutStream *active_stream;
+	u32 active_stream_idx;
+	u64 active_min_ts_microsec;
+
+	GF_FilterPid *opid;
+
+	Bool wait_for_loop;
+	u64 microsec_ts_init;
+	//0: not single stream, 1: input is raw media, 2: input is TS
+	u32 single_stream;
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+} GF_RTPOutCtx;
+
+
+GF_Err rtpout_create_sdp(GF_List *streams, Bool is_rtsp, const char *ip, const char *info, const char *sess_name, const char *url, const char *email, u32 base_pid_id, FILE **sdp_tmp, u64 *session_id)
+{
+	FILE *sdp_out;
+	u32 i, count;
+	u64 session_version;
+	sdp_out = gf_file_temp(NULL);
+	if (!sdp_out) return GF_IO_ERR;
+	*sdp_tmp = sdp_out;
+
+
+	count = gf_list_count(streams);
+
+	gf_fprintf(sdp_out, "v=0\n");
+	if (gf_sys_is_test_mode()) {
+		*session_id = 0;
+		session_version = 0;
+	} else {
+		if (! *session_id) *session_id = gf_net_get_ntp_ts();
+		session_version = gf_net_get_ntp_ts();
+	}
+	gf_fprintf(sdp_out, "o=gpac "LLU" "LLU" IN IP%d %s\n", *session_id, session_version, gf_net_is_ipv6(ip) ? 6 : 4, ip);
+	gf_fprintf(sdp_out, "s=%s\n", sess_name);
+
+	if (info) {
+		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);
+		if (!src) src = gf_filter_pid_get_source_filter_name(stream->pid);
+		else {
+			src = gf_file_basename(src);
+		}
+		if (src)
+			gf_fprintf(sdp_out, "i=%s\n", src);
+	}
+	gf_fprintf(sdp_out, "u=%s\n", url ? url : "http://gpac.io");
+	if (email) {
+		gf_fprintf(sdp_out, "e=%s\n", email);
+	}
+	if (is_rtsp) {
+		gf_fprintf(sdp_out, "c=IN IP4 0.0.0.0\n");
+	} else {
+		gf_fprintf(sdp_out, "c=IN IP%d %s\n", gf_net_is_ipv6(ip) ? 6 : 4, ip);
+	}
+	gf_fprintf(sdp_out, "t=0 0\n");
+
+	if (is_rtsp) {
+		gf_fprintf(sdp_out, "a=control=*\n");
+	}
+
+	if (gf_sys_is_test_mode()) {
+		gf_fprintf(sdp_out, "a=x-copyright: Streamed with GPAC - http://gpac.io\n");
+	} else {
+		gf_fprintf(sdp_out, "a=x-copyright: Streamed with GPAC %s - %s\n", gf_gpac_version(), gf_gpac_copyright() );
+	}
+
+	if (is_rtsp) {
+		Double max_dur=0;
+		Bool disable_seek = GF_FALSE;
+		for (i=0; i<count; i++) {
+			const GF_PropertyValue *p;
+			GF_RTPOutStream *stream = gf_list_get(streams, i);
+			if (!stream->rtp) continue;
+
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DURATION);
+			if (p) {
+				Double dur = (Double) p->value.lfrac.num;
+				dur /= p->value.lfrac.den;
+				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))
+				disable_seek = GF_TRUE;
+		}
+
+		if (!disable_seek && max_dur) {
+			gf_fprintf(sdp_out, "a=range:npt=0-%g\n", max_dur);
+		}
+	}
+	
+	if (base_pid_id) {
+		gf_fprintf(sdp_out, "a=group:DDP L%d", base_pid_id);
+		for (i = 0; i < count; i++) {
+			GF_RTPOutStream *st = gf_list_get(streams, i);
+			if (st->depends_on == base_pid_id) {
+				gf_fprintf(sdp_out, " L%d", i+1);
+			}
+		}
+		gf_fprintf(sdp_out, "\n");
+	}
+
+	for (i=0; i<count; i++) {
+		char *sdp_media=NULL;
+		const char *KMS = NULL;
+		char *dsi = NULL;
+		char *dsi_enh = NULL;
+		u32 w, h, tw, th;
+		s32 tx, ty;
+		s16 tl;
+		u32 dsi_len = 0;
+		u32 dsi_enh_len = 0;
+        const GF_PropertyValue *p;
+		GF_RTPOutStream *stream = gf_list_get(streams, i);
+		if (!stream->rtp) continue;
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DECODER_CONFIG);
+		if (p && p->value.data.ptr) {
+			dsi = p->value.data.ptr;
+			dsi_len = p->value.data.size;
+		}
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DECODER_CONFIG_ENHANCEMENT);
+		if (p && p->value.data.ptr) {
+			dsi_enh = p->value.data.ptr;
+			dsi_enh_len = p->value.data.size;
+		}
+
+		w = h = tw = th = 0;
+		tx = ty = 0;
+		tl = 0;
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_WIDTH);
+		if (p) w = p->value.uint;
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_HEIGHT);
+		if (p) h = p->value.uint;
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_PROTECTION_KMS_URI);
+		if (p) KMS = p->value.string;
+
+		if (stream->codecid == GF_CODECID_TX3G) {
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_TRANS_X);
+			if (p) tx = p->value.sint;
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_TRANS_Y);
+			if (p) ty = p->value.sint;
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ZORDER);
+			if (p) tl = p->value.sint;
+			tw = w;
+			th = h;
+
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_WIDTH_MAX);
+			if (p) w = p->value.uint;
+
+			p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_HEIGHT_MAX);
+			if (p) h = p->value.uint;
+		}
+
+		gf_rtp_streamer_append_sdp_extended(stream->rtp, stream->id, dsi, dsi_len, dsi_enh, dsi_enh_len, (char *)KMS, w, h, tw, th, tx, ty, tl, is_rtsp, &sdp_media);
+
+		if (sdp_media) {
+			gf_fprintf(sdp_out, "%s", sdp_media);
+			gf_free(sdp_media);
+		}
+		if (base_pid_id) {
+			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) );
+
+			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) );
+				}
+			}
+			gf_fprintf(sdp_out, "\n");
+		}
+
+		if (is_rtsp) {
+			gf_fprintf(sdp_out, "a=control:trackID=%d\n", stream->ctrl_id);
+		}
+	}
+	gf_fprintf(sdp_out, "\n");
+	return GF_OK;
+}
+
+GF_Err rtpout_init_streamer(GF_RTPOutStream *stream, const char *ipdest, Bool inject_xps, Bool use_mpeg4_signaling, Bool use_latm, u32 payt, u32 mtu, u32 ttl, const char *ifce, Bool is_rtsp, u32 *base_pid_id, u32 file_mode)
+{
+	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;
+	const GF_PropertyValue *p;
+
+	*base_pid_id = 0;
+
+	dsi_len = samplerate = nb_ch = IV_length = KI_length = 0;
+	is_crypted = 0;
+	dsi = NULL;
+	flags = 0;
+	max_ptime = au_sn_len = 0;
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_CODECID);
+	codecid = p ? p->value.uint : 0;
+	if (stream->codecid && (stream->codecid != codecid)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Dynamic change of codec in RTP session not supported !\n"));
+		return GF_FILTER_NOT_SUPPORTED;
+	}
+	stream->codecid = codecid;
+
+	stream->is_encrypted = GF_FALSE;
+	if (stream->streamtype == GF_STREAM_ENCRYPTED) {
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ORIG_STREAM_TYPE);
+		if (p) stream->streamtype = p->value.uint;
+		stream->is_encrypted = GF_TRUE;
+
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_PROTECTION_SCHEME_TYPE);
+		if (!p || (p->value.uint != GF_ISOM_ISMACRYP_SCHEME)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Protected track with scheme type %s, cannot stream (only ISMA over RTP is supported !\n", p ? gf_4cc_to_str(p->value.uint) : "unknwon" ));
+			return GF_FILTER_NOT_SUPPORTED;
+		}
+	}
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_TIMESCALE);
+	stream->timescale = p ? p->value.uint : 1000;
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_CONFIG_IDX);
+	stream->sample_desc_index = p ? p->value.uint : 0;
+
+
+	u32 cfg_crc=0;
+	dsi = NULL;
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DECODER_CONFIG);
+	if (p) {
+		dsi = p->value.data.ptr;
+		dsi_len = p->value.data.size;
+		cfg_crc = gf_crc_32(dsi, dsi_len);
+	}
+	if (stream->rtp && (cfg_crc==stream->cfg_crc))
+		return GF_OK;
+
+	if (inject_xps)
+		stream->inject_ps = GF_TRUE;
+	else if (stream->cfg_crc)
+		stream->inject_ps = GF_TRUE;
+	stream->cfg_crc = cfg_crc;
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_NB_FRAMES);
+	stream->nb_aus = p ? p->value.uint : 0;
+
+	switch (stream->streamtype) {
+	case GF_STREAM_OD:
+	case GF_STREAM_SCENE:
+		//todo, check if sync shadow is used
+//		if (gf_isom_has_sync_shadows(ctx->isom, stream->track_num) || gf_isom_has_sample_dependency(ctx->isom, stream->track_num))
+//			flags |= GP_RTP_PCK_SYSTEMS_CAROUSEL;
+		break;
+	case GF_STREAM_AUDIO:
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_SAMPLE_RATE);
+		if (p) samplerate = p->value.uint;
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_NUM_CHANNELS);
+		if (p) nb_ch = p->value.uint;
+		break;
+	case GF_STREAM_VISUAL:
+		break;
+	case GF_STREAM_FILE:
+		if (file_mode==2) {
+			stream->codecid = codecid = GF_CODECID_FAKE_MP2T;
+			stream->timescale = 90000;
+		}
+		break;
+	default:
+		break;
+	}
+
+	gf_filter_pid_set_framing_mode(stream->pid, (stream->streamtype==GF_STREAM_FILE) ? GF_FALSE : GF_TRUE);
+
+	/*get sample info*/
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_MAX_FRAME_SIZE);
+	max_size = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_AVG_FRAME_SIZE);
+	average_size = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_MAX_TS_DELTA);
+	max_tsdelta = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_MAX_CTS_OFFSET);
+	max_cts_offset = p ? p->value.uint : (u32) -1;
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_CONSTANT_DURATION);
+	const_dur = p ? p->value.uint : 0;
+
+
+	if (stream->avcc) gf_odf_avc_cfg_del(stream->avcc);
+	stream->avcc = NULL;
+	if (stream->hvcc) gf_odf_hevc_cfg_del(stream->hvcc);
+	stream->hvcc = NULL;
+
+	stream->avc_nalu_size = 0;
+	switch (codecid) {
+	case GF_CODECID_AVC:
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		if (dsi) {
+			GF_AVCConfig *avcc = gf_odf_avc_cfg_read(dsi, dsi_len);
+			if (avcc) {
+				stream->avc_nalu_size = avcc->nal_unit_size;
+				if (stream->inject_ps)
+					stream->avcc = avcc;
+				else
+					gf_odf_avc_cfg_del(avcc);
+			}
+		}
+		break;
+	case GF_CODECID_HEVC:
+	case GF_CODECID_LHVC:
+		if (dsi) {
+			GF_HEVCConfig *hvcc = gf_odf_hevc_cfg_read(dsi, dsi_len, (codecid==GF_CODECID_LHVC) ? GF_TRUE : GF_FALSE );
+			if (hvcc) {
+				stream->avc_nalu_size = hvcc->nal_unit_size;
+				if (stream->inject_ps) {
+					u32 i, count = gf_list_count(hvcc->param_array);
+					GF_HEVCParamArray *vpsa=NULL, *spsa=NULL;
+					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)) {
+							vpsa = pa;
+							gf_list_rem(hvcc->param_array, i);
+							count--;
+						}
+						else if (!spsa && (pa->type == GF_HEVC_NALU_SEQ_PARAM)) {
+							spsa = pa;
+							gf_list_rem(hvcc->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);
+			}
+		}
+		break;
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	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;
+			max_tsdelta = const_dur;
+			average_size = 500;
+			max_size = 1000;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPOut] AAC stream detected but not information available on average size/tsdelta/duration, assuming const dur %d max_tsdelta %d average size %d max size %d\n", const_dur, max_tsdelta, average_size, max_size));
+		}
+		if (use_latm)
+			flags |= GP_RTP_PCK_USE_LATM_AAC;
+		break;
+	}
+
+	if (max_cts_offset==(u32)-1) {
+		if (stream->streamtype==GF_STREAM_VISUAL) {
+			disable_mpeg4 = GF_TRUE;
+		}
+		max_cts_offset = 0;
+	}
+
+	if (!disable_mpeg4 && use_mpeg4_signaling)
+		flags = GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_FORCE_MPEG4;
+
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ID);
+	stream->id = p ? p->value.uint : 0;
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_BITRATE);
+	bandwidth = p ? p->value.uint : 0;
+
+	if (codecid==GF_CODECID_AAC_MPEG4)
+
+	if (is_crypted) {
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ISMA_SELECTIVE_ENC);
+		if (p->value.boolean) {
+			flags |= GP_RTP_PCK_SELECTIVE_ENCRYPTION;
+		}
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ISMA_IV_LENGTH);
+		IV_length = p ? p->value.uint : 0;
+		p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_ISMA_KI_LENGTH);
+		KI_length = p ? p->value.uint : 0;
+	}
+
+
+	/*init packetizer*/
+	stream->rtp = gf_rtp_streamer_new(stream->streamtype, codecid, stream->timescale,
+				 (char *) ipdest, stream->port, mtu, ttl, ifce,
+				 flags, dsi, dsi_len,
+				 payt, samplerate, nb_ch,
+				 is_crypted, IV_length, KI_length,
+				 average_size, max_size, max_tsdelta, max_cts_offset, const_dur, bandwidth, max_ptime, au_sn_len, is_rtsp);
+
+	if (!stream->rtp) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Could not initialize RTP for stream %s:  not supported\n", gf_filter_pid_get_name(stream->pid) ));
+		return GF_NOT_SUPPORTED;
+	}
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DELAY);
+	stream->ts_delay = p ? p->value.sint : 0;
+
+	payt++;
+	stream->microsec_ts_scale_frac.num = 1000000;
+	stream->microsec_ts_scale_frac.den = stream->timescale;
+
+	while (! (stream->microsec_ts_scale_frac.num % 10) && ! (stream->microsec_ts_scale_frac.den % 10)) {
+		stream->microsec_ts_scale_frac.num /= 10;
+		stream->microsec_ts_scale_frac.den /= 10;
+	}
+
+	p = gf_filter_pid_get_property(stream->pid, GF_PROP_PID_DEPENDENCY_ID);
+	if (p) {
+		*base_pid_id = p->value.uint;
+		gf_rtp_streamer_disable_auto_rtcp(stream->rtp);
+	}
+	return GF_OK;
+}
+
+static GF_Err rtpout_setup_sdp(GF_RTPOutCtx *ctx)
+{
+	FILE *sdp_out;
+	u32 fsize;
+	GF_Err e;
+	u64 sess_id=0;
+	u8 *output;
+	const char *ip = ctx->ip;
+	if (!ip) ip = "127.0.0.1";
+
+	if (ctx->single_stream) return GF_OK;
+
+	e = rtpout_create_sdp(ctx->streams, GF_FALSE, ip, ctx->info, "livesession", ctx->url, ctx->email, ctx->base_pid_id, &sdp_out, &sess_id);
+	if (e) return e;
+
+	fsize = (u32) gf_ftell(sdp_out);
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, fsize, &output);
+	if (pck) {
+		gf_fseek(sdp_out, 0, SEEK_SET);
+		u32 read = (u32) gf_fread(output, fsize, sdp_out);
+		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);
+		} else {
+			char c = output[fsize-1];
+			output[fsize-1] = 0;
+			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTPOut] SDP file generated: %s\n", output));
+			output[fsize-1] = c;
+			gf_filter_pck_set_framing(pck, GF_TRUE, GF_TRUE);
+			gf_filter_pck_send(pck);
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Failed to send SDP file packet\n"));
+	}
+
+	gf_fclose(sdp_out);
+	return GF_OK;
+}
+
+static u16 rtpout_check_next_port(GF_RTPOutCtx *ctx, u16 first_port)
+{
+	u32 i, count = gf_list_count(ctx->streams);
+	for (i=0;i<count; i++) {
+		GF_RTPOutStream *stream = gf_list_get(ctx->streams, i);
+		if (stream->port==first_port) {
+			return rtpout_check_next_port(ctx, (u16) (first_port+2) );
+		}
+	}
+	return first_port;
+}
+
+static 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);
+	if (st->avcc)
+		gf_odf_avc_cfg_del(st->avcc);
+	if (st->hvcc)
+		gf_odf_hevc_cfg_del(st->hvcc);
+	gf_free(st);
+}
+
+static GF_Err rtpout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_RTPOutCtx *ctx = (GF_RTPOutCtx *) gf_filter_get_udta(filter);
+	GF_Err e = GF_OK;
+	GF_RTPOutStream *stream;
+	u16 first_port;
+	u32 streamType, payt;
+	const GF_PropertyValue *p;
+
+	first_port = ctx->port;
+
+	if (is_remove) {
+		GF_RTPOutStream *t =gf_filter_pid_get_udta(pid);
+		if (t) {
+			if (ctx->active_stream==t) ctx->active_stream = NULL;
+			gf_list_del_item(ctx->streams, t);
+			rtpout_del_stream(t);
+		}
+		if (!gf_list_count(ctx->streams)) {
+			if (ctx->opid) gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	stream = gf_filter_pid_get_udta(pid);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	streamType = p ? p->value.uint : 0;
+
+	switch (streamType) {
+	case GF_STREAM_VISUAL:
+	case GF_STREAM_AUDIO:
+		break;
+	case GF_STREAM_FILE:
+	case GF_STREAM_UNKNOWN:
+		if (stream) {
+			if (ctx->active_stream==stream) ctx->active_stream = NULL;
+			gf_list_del_item(ctx->streams, stream);
+			rtpout_del_stream(stream);
+		}
+		if (!ctx->dst)
+			return GF_FILTER_NOT_SUPPORTED;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && p->value.string && !strcmp(p->value.string, "video/mpeg-2")) {
+			ctx->single_stream = 2;
+		} else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+			if (p && p->value.string && !strcmp(p->value.string, "ts")) {
+				ctx->single_stream = 2;
+			} else {
+				return GF_FILTER_NOT_SUPPORTED;
+			}
+		}
+
+		break;
+	default:
+		break;
+	}
+	if (!stream) {
+		GF_SAFEALLOC(stream, GF_RTPOutStream);
+		if (!stream) return GF_OUT_OF_MEM;
+		gf_list_add(ctx->streams, stream);
+		stream->pid = pid;
+		stream->streamtype = streamType;
+		stream->min_dts = GF_FILTER_NO_TS;
+	 	gf_filter_pid_set_udta(pid, stream);
+		if (ctx->single_stream) {
+			GF_FilterEvent evt;
+			gf_filter_pid_init_play_event(pid, &evt, 0, 1.0, "RTPOut");
+			gf_filter_pid_send_event(pid, &evt);
+		}
+	}
+	if (!ctx->single_stream) {
+		if (!ctx->opid) {
+			ctx->opid = gf_filter_pid_new(filter);
+		}
+		gf_filter_pid_copy_properties(ctx->opid, pid);
+		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_DECODER_CONFIG, NULL );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, NULL );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("sdp") );
+		gf_filter_pid_set_name(ctx->opid, "SDP");
+	} else {
+		char *dst = ctx->dst+6;
+		char *sep = strchr(dst, ':');
+		if (sep) {
+			first_port = ctx->port = atoi(sep+1);
+			sep[0] = 0;
+			if (ctx->ip) gf_free(ctx->ip);
+			ctx->ip = gf_strdup(dst);
+			sep[0] = ':';
+		}
+	}
+
+	stream->port = rtpout_check_next_port(ctx, first_port);
+
+	payt = ctx->payt + gf_list_find(ctx->streams, stream);
+	//init rtp
+	e = rtpout_init_streamer(stream,  ctx->ip ? ctx->ip : "127.0.0.1", ctx->xps, ctx->mpeg4, ctx->latm, payt, ctx->mtu, ctx->ttl, ctx->ifce, GF_FALSE, &ctx->base_pid_id, ctx->single_stream);
+	if (e) return e;
+
+	stream->selected = GF_TRUE;
+
+	if (ctx->loop) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
+		if (!p || (p->value.uint<GF_PLAYBACK_MODE_SEEK)) {
+			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) ));
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err rtpout_initialize(GF_Filter *filter)
+{
+	GF_RTPOutCtx *ctx = (GF_RTPOutCtx *) gf_filter_get_udta(filter);
+	if (!ctx->payt) ctx->payt = 96;
+	if (!ctx->port) ctx->port = 7000;
+	if (!ctx->mtu) ctx->mtu = 1450;
+	if (ctx->payt<96) ctx->payt = 96;
+	if (ctx->payt>127) ctx->payt = 127;
+	ctx->streams = gf_list_new();
+
+	if (ctx->dst && (ctx->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, ctx->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);
+		gf_filter_set_max_extra_input_pids(filter, 0);
+		ctx->single_stream = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+static void rtpout_finalize(GF_Filter *filter)
+{
+	GF_RTPOutCtx *ctx = (GF_RTPOutCtx *) gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		GF_RTPOutStream *tmp = gf_list_pop_back(ctx->streams);
+		rtpout_del_stream(tmp);
+	}
+	gf_list_del(ctx->streams);
+
+}
+
+static GF_Err rtpout_send_xps(GF_RTPOutStream *stream, GF_List *pslist, Bool *au_start, u32 pck_size, u32 cts, u32 dts, u32 duration)
+{
+	GF_Err e;
+	u32 i, count = gf_list_count(pslist);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *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;
+	}
+	return GF_OK;
+}
+
+static Bool rtpout_init_clock(GF_RTPOutCtx *ctx)
+{
+	GF_Err e;
+	u64 min_dts = GF_FILTER_NO_TS;
+	u32 i, count = gf_list_count(ctx->streams);
+
+	for (i=0; i<count; i++) {
+		u64 dts;
+		GF_RTPOutStream *stream = gf_list_get(ctx->streams, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(stream->pid);
+		if (!pck) return GF_FALSE;
+
+		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;
+
+		dts *= 1000000;
+		dts /= stream->timescale;
+		if (min_dts > dts)
+			min_dts = dts;
+
+		if (ctx->tso>0) {
+			u64 offset = ctx->tso;
+			offset *= stream->timescale;
+			offset /= 1000000;
+			stream->rtp_ts_offset = (u32) offset;
+		}
+	}
+	ctx->sys_clock_at_init = gf_sys_clock_high_res();
+	ctx->microsec_ts_init = min_dts;
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTPOut] RTP clock initialized - time origin set to "LLU" us (sys clock) / "LLU" us (media clock)\n", ctx->sys_clock_at_init, ctx->microsec_ts_init));
+	if (ctx->tso<0) {
+		gf_rand_init(0);
+		for (i=0; i<count; i++) {
+			GF_RTPOutStream *stream = gf_list_get(ctx->streams, i);
+			stream->rtp_ts_offset = gf_rand();
+			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTPOut] RTP stream %d initial RTP TS set to %d\n", i+1, stream->rtp_ts_offset));
+		}
+	}
+
+	e = rtpout_setup_sdp(ctx);
+	if (e) return e;
+
+	if (ctx->runfor==0) {
+		for (i=0; i<count; i++) {
+			GF_RTPOutStream *stream = gf_list_get(ctx->streams, i);
+			gf_filter_pid_set_discard(stream->pid, GF_TRUE);
+		}
+	}
+
+	return GF_TRUE;
+}
+
+GF_Err rtpout_process_rtp(GF_List *streams, GF_RTPOutStream **active_stream, Bool loop, s32 delay, u32 *active_stream_idx, u64 sys_clock_at_init, u64 *active_min_ts_microsec, u64 microsec_ts_init, Bool *wait_for_loop, u32 *repost_delay_us, Bool *first_RTCP_sent, u32 base_pid_id)
+{
+	GF_Err e = GF_OK;
+	GF_RTPOutStream *stream;
+	u32 duration, i, count;
+	s64 diff;
+	u64 clock;
+	const char *pck_data;
+	u32 pck_size;
+	u32 dts, cts;
+
+	/*browse all inputs and locate most mature stream*/
+	if (! *active_stream) {
+		u32 nb_eos = 0;
+		count = gf_list_count(streams);
+
+		*active_min_ts_microsec = (u64) -1;
+		for (i=0; i<count; i++) {
+			stream = gf_list_get(streams, i);
+			if (!stream->rtp) continue;
+
+			/*load next AU*/
+			if (!stream->pck) {
+				u64 ts;
+				stream->pck = gf_filter_pid_get_packet(stream->pid);
+
+				if (!stream->pck) {
+					if (gf_filter_pid_is_eos(stream->pid)) {
+						//flush stream
+						if (!stream->bye_sent) {
+							stream->bye_sent = GF_TRUE;
+							gf_rtp_streamer_send_au(stream->rtp, NULL, 0, 0, 0, GF_FALSE);
+							gf_rtp_streamer_send_bye(stream->rtp);
+						}
+						nb_eos++;
+					}
+					continue;
+				}
+				stream->current_dts = gf_filter_pck_get_dts(stream->pck);
+				//if CTS is not set, use prev packet CTS
+				ts = gf_filter_pck_get_cts(stream->pck);
+				if (ts==GF_FILTER_NO_TS) ts = stream->current_cts;
+				stream->current_cts = ts;
+
+				stream->current_sap = gf_filter_pck_get_sap(stream->pck);
+				duration = gf_filter_pck_get_duration(stream->pck);
+				if (duration) stream->current_duration = duration;
+				if (stream->current_dts==GF_FILTER_NO_TS)
+					stream->current_dts = stream->current_cts;
+
+				if (stream->min_dts==GF_FILTER_NO_TS) {
+					stream->min_dts = stream->current_dts;
+				}
+
+				stream->microsec_dts = (u64) (stream->microsec_ts_scale_frac.num * (s64) stream->current_dts);
+				stream->microsec_dts /= stream->microsec_ts_scale_frac.den;
+				stream->microsec_dts += stream->microsec_ts_offset + sys_clock_at_init;
+
+				if (stream->microsec_dts < microsec_ts_init) {
+					stream->microsec_dts = 0;
+					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPOut] next RTP packet (stream %d) has a timestamp "LLU" less than initial timestamp "LLU" - forcing to 0\n", i+1, stream->microsec_dts, microsec_ts_init));
+				} else {
+					stream->microsec_dts -= microsec_ts_init;
+				}
+
+				if (stream->current_sap>GF_FILTER_SAP_3) stream->current_sap = 0;
+				stream->pck_num++;
+				*wait_for_loop = GF_FALSE;
+			}
+
+			/*check timing*/
+			if (stream->pck) {
+				if (*active_min_ts_microsec > stream->microsec_dts) {
+					*active_min_ts_microsec = stream->microsec_dts;
+					*active_stream = stream;
+					*active_stream_idx = i+1;
+				}
+			}
+		}
+
+		/*no input data ...*/
+		if (! *active_stream) {
+			if (nb_eos==count) {
+				u64 max_dur = 0;
+				if (!loop)
+					return GF_EOS;
+
+				for (i=0; i<count; i++) {
+					stream = gf_list_get(streams, i);
+					u64 dur = stream->current_dts + stream->current_duration - stream->min_dts;
+
+					dur *= 1000000;
+					dur /= stream->timescale;
+
+					if (max_dur < dur) {
+						max_dur = dur;
+					}
+				}
+				if (*wait_for_loop)
+					return GF_OK;
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTPOut] RTP session done, looping source\n"));
+				*wait_for_loop = GF_TRUE;
+				for (i=0; i<count; i++) {
+					GF_FilterEvent evt;
+					const GF_PropertyValue *p;
+					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;
+						stream->ts_offset += new_ts;
+						stream->microsec_ts_offset = (u64) (stream->ts_offset*(1000000.0/stream->timescale) + sys_clock_at_init);
+					}
+
+					//loop pid: stop and play
+					GF_FEVT_INIT(evt, GF_FEVT_STOP, stream->pid);
+					gf_filter_pid_send_event(stream->pid, &evt);
+
+					GF_FEVT_INIT(evt, GF_FEVT_PLAY, stream->pid);
+					gf_filter_pid_send_event(stream->pid, &evt);
+				}
+			}
+			return GF_OK;
+		}
+	}
+
+	stream = *active_stream;
+	clock = gf_sys_clock_high_res();
+	diff = (s64) *active_min_ts_microsec;
+	diff += ((s64) delay) * 1000;
+	diff -= (s64) clock;
+
+	if (diff > 1000) {
+		u64 repost_in;
+		//if more than 11 secs ahead of time, ask for delay minus one second, otherwise ask for half the delay
+		if (diff<=11000) repost_in = diff/3;
+		else repost_in = diff - 10000;
+		*repost_delay_us = (u32) repost_in;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTPOut] next RTP packet (stream %d DTS "LLU") scheduled in "LLU" us, requesting filter reschedule in "LLU" us - clock "LLU" us\n", *active_stream_idx, stream->current_dts, diff, repost_in, clock));
+		return GF_OK;
+	} else if (diff<=-1000) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTPOut] RTP session stream %d - sending packet %d (DTS "LLU") too late by %d us - clock "LLU" us\n", *active_stream_idx, stream->pck_num, stream->current_dts, -diff, clock));
+	} else if (diff>0){
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTPOut] RTP session stream %d - sending packet %d (DTS "LLU") ahead of %d us - clock "LLU" us\n", *active_stream_idx, stream->pck_num, stream->current_dts, diff, clock));
+	}
+
+	/*send packets*/
+	pck_data = gf_filter_pck_get_data(stream->pck, &pck_size);
+	if (!pck_size) {
+		gf_filter_pid_drop_packet(stream->pid);
+		stream->pck = NULL;
+		*active_stream = NULL;
+		return GF_OK;
+	}
+
+	dts = (u32) (stream->current_dts + stream->ts_offset);
+	cts = (u32) (stream->current_cts + stream->ts_offset);
+	duration = stream->current_duration;
+
+	dts += stream->rtp_ts_offset;
+	cts += stream->rtp_ts_offset;
+	if (stream->ts_delay>=0) {
+		dts += stream->ts_delay;
+		cts += stream->ts_delay;
+	} else {
+		if ((s32) dts >= -stream->ts_delay)
+			dts += stream->ts_delay;
+		else
+			dts = 0;
+
+		if ((s32) cts >= -stream->ts_delay )
+			cts += stream->ts_delay;
+		else
+			cts = 0;
+	}
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_DEBUG)) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTPOut] Sending RTP packets for stream %d pck %d/%d DTS "LLU" - CTS "LLU" - RTP TS "LLU" - size %d - SAP %d - clock "LLU" us\n", *active_stream_idx, stream->pck_num, stream->nb_aus, stream->current_dts, stream->current_dts, cts, pck_size, stream->current_sap, clock) );
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTPOut] Runtime %08u ms send stream %d pck %08u/%08u DTS %08u CTS %08u RTP-TS %08u size %08u SAP %d\r", (u32) (clock - sys_clock_at_init)/1000, *active_stream_idx, stream->pck_num, stream->nb_aus, (u32) stream->current_dts, (u32) stream->current_dts, (u32) cts, pck_size, stream->current_sap) );
+	}
+#endif
+
+	/*we are about to send scalable base: trigger RTCP reports with the same NTP. This avoids
+	NTP drift due to system clock precision which could break sync decoding*/
+	if (! *first_RTCP_sent || (base_pid_id && (base_pid_id== stream->id) )) {
+		u32 ntp_sec, ntp_frac;
+		/*force sending RTCP SR every RAP ? - not really compliant but we cannot perform scalable tuning otherwise*/
+		u32 ntp_type = stream->current_sap ? 2 : 1;
+		gf_net_get_ntp(&ntp_sec, &ntp_frac);
+		count = gf_list_count(streams);
+
+		for (i=0; i<count; i++) {
+			GF_RTPOutStream *astream = gf_list_get(streams, i);
+			if (!astream->pck) break;
+
+			u32 ts = (u32) (astream->current_cts + astream->ts_offset + astream->rtp_ts_offset);
+			gf_rtp_streamer_send_rtcp(stream->rtp, GF_TRUE, ts, ntp_type, ntp_sec, ntp_frac);
+		}
+		*first_RTCP_sent = GF_TRUE;
+	}
+
+	/*unpack nal units*/
+	if (stream->avc_nalu_size) {
+		Bool au_start, au_end;
+		u32 v, size;
+		u32 remain = pck_size;
+		const char *ptr = pck_data;
+
+		au_start = 1;
+		e = GF_OK;
+
+		if (stream->avcc && stream->current_sap) {
+			e = rtpout_send_xps(stream, stream->avcc->sequenceParameterSets, &au_start, pck_size, cts, dts, duration);
+			if (!e)
+				e = rtpout_send_xps(stream, stream->avcc->sequenceParameterSetExtensions, &au_start, pck_size, cts, dts, duration);
+
+			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);
+			for (i=0; i<nbps; i++) {
+				GF_HEVCParamArray *pa = gf_list_get(stream->hvcc->param_array, i);
+
+				if (!e)
+					e = rtpout_send_xps(stream, pa->nalus, &au_start, pck_size, cts, dts, duration);
+			}
+		}
+
+		while (!e && remain) {
+			size = 0;
+			v = (*active_stream)->avc_nalu_size;
+			while (v) {
+				size |= (u8) *ptr;
+				ptr++;
+				remain--;
+				v-=1;
+				if (v) size<<=8;
+			}
+			if (remain < size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Broken AVC nalu encapsulation: NALU size is %d but only %d bytes left in sample %d\n", size, remain, (*active_stream)->pck_num));
+				break;
+			}
+			remain -= size;
+			au_end = remain ? 0 : 1;
+
+			e = gf_rtp_streamer_send_data(stream->rtp, (char *) ptr, size, pck_size, cts, dts, stream->current_sap ? 1 : 0, au_start, au_end, stream->pck_num, duration, stream->sample_desc_index);
+			ptr += size;
+			au_start = 0;
+		}
+	} else {
+		e = gf_rtp_streamer_send_data(stream->rtp, (char *) pck_data, pck_size, pck_size, cts, dts, stream->current_sap ? 1 : 0, 1, 1, stream->pck_num, duration, stream->sample_desc_index);
+	}
+	gf_filter_pid_drop_packet(stream->pid);
+	stream->pck = NULL;
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTPOut] Error sending RTP packet %d: %s\n", stream->pck_num, gf_error_to_string(e) ));
+	}
+
+	*active_stream = NULL;
+	return e;
+
+}
+
+static GF_Err rtpout_process(GF_Filter *filter)
+{
+	GF_Err e = GF_OK;
+	u32 repost_delay_us=0;
+	GF_RTPOutCtx *ctx = gf_filter_get_udta(filter);
+
+	/*init session timeline - all sessions are sync'ed for packet scheduling purposes*/
+	if (!ctx->sys_clock_at_init) {
+		if (!rtpout_init_clock(ctx)) return GF_OK;
+	}
+
+	if (ctx->runfor>0) {
+		s64 diff = gf_sys_clock_high_res();
+		diff -= ctx->sys_clock_at_init;
+		diff /= 1000;
+		if ((s32) diff > ctx->runfor) {
+			u32 i, count = gf_list_count(ctx->streams);
+			for (i=0; i<count; i++) {
+				GF_RTPOutStream *stream = gf_list_get(ctx->streams, i);
+				gf_filter_pid_set_discard(stream->pid, GF_TRUE);
+				stream->pck = NULL;
+			}
+			if (ctx->opid) gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+	}
+
+	e = rtpout_process_rtp(ctx->streams, &ctx->active_stream, ctx->loop, ctx->delay, &ctx->active_stream_idx, ctx->sys_clock_at_init, &ctx->active_min_ts_microsec, ctx->microsec_ts_init, &ctx->wait_for_loop, &repost_delay_us, &ctx->first_RTCP_sent, ctx->base_pid_id);
+	if (e) return e;
+
+	if (repost_delay_us)
+		gf_filter_ask_rt_reschedule(filter, repost_delay_us);
+
+	return GF_OK;
+}
+
+static GF_FilterProbeScore rtpout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "rtp://", 6)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static const GF_FilterCapability RTPOutCaps[] =
+{
+	//anything else (not file and framed) result in manifest PID
+	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),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "sdp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "application/sdp"),
+	{0},
+	//anything else (not file and framed) result in media pids not file
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER, 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, "ts|m2t|mts|dmb|trp"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg"),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_RTPOutCtx, _n)
+static const GF_FilterArgs RTPOutArgs[] =
+{
+	{ 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(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(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(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},
+	{0}
+};
+
+
+GF_FilterRegister RTPOutRegister = {
+	.name = "rtpout",
+	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"
+	"# 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"
+	"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"
+	"# RTP Packets\n"
+	"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"
+	"- 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),
+	.max_extra_pids = -1,
+	.args = RTPOutArgs,
+	//dynamic redirect since RTP may be dynamically loaded when solving .sdp destinations
+	.flags = GF_FS_REG_DYNAMIC_REDIRECT,
+	.initialize = rtpout_initialize,
+	.finalize = rtpout_finalize,
+	SETCAPS(RTPOutCaps),
+	.configure_pid = rtpout_configure_pid,
+	.probe_url = rtpout_probe_url,
+	.process = rtpout_process
+};
+
+
+const GF_FilterRegister *rtpout_register(GF_FilterSession *session)
+{
+	return &RTPOutRegister;
+}
+
+#else
+
+const GF_FilterRegister *rtpout_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+#endif /* !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING) */

gpac-1.0.0.tar.gz/src/filters/out_rtp.h Added

@@ -0,0 +1,107 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RTP/RTSP 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.
+ *
+ */
+
+#ifndef _OUT_RTP_H_
+#define _OUT_RTP_H_
+
+/*module interface*/
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+#ifndef GPAC_DISABLE_STREAMING
+
+#include <gpac/base_coding.h>
+#include <gpac/mpeg4_odf.h>
+/*IETF lib*/
+#include <gpac/internal/ietf_dev.h>
+
+
+
+typedef struct
+{
+	GF_RTPStreamer *rtp;
+	u16 port;
+
+	/*scale from TimeStamps in media timescales to TimeStamps in microseconds*/
+	GF_Fraction64 microsec_ts_scale_frac;
+
+	u32 id, codecid;
+	Bool is_encrypted;
+
+	/*NALU size for H264/AVC parsing*/
+	u32 avc_nalu_size;
+
+	GF_FilterPid *pid;
+	u32 streamtype;
+	u32 timescale;
+	u32 nb_aus;
+	Bool is_playing;
+
+	u32 depends_on;
+	u32 cfg_crc;
+
+
+	/*loaded AU info*/
+	GF_FilterPacket *pck;
+	u64 current_dts, current_cts, min_dts;
+	u32 current_sap, current_duration;
+
+	u32 pck_num;
+	u32 sample_duration;
+	u32 sample_desc_index;
+
+	Bool inject_ps;
+
+	/*normalized DTS in micro-sec*/
+	u64 microsec_dts;
+
+	/*offset of CTS/DTS in media timescale, used when looping the pid*/
+	u64 ts_offset;
+	/*offset of CTS/DTS in microseconds, used when looping the pid*/
+	u64 microsec_ts_offset;
+
+	GF_AVCConfig *avcc;
+	GF_HEVCConfig *hvcc;
+	u32 rtp_ts_offset;
+
+	s32 ts_delay;
+	Bool bye_sent;
+
+	/*RTSP state*/
+	Bool selected, send_rtpinfo;
+	u32 ctrl_id;
+	u32 rtp_id, rtcp_id;
+	u32 mcast_port;
+} GF_RTPOutStream;
+
+GF_Err rtpout_create_sdp(GF_List *streams, Bool is_rtsp, const char *ip, const char *info, const char *sess_name, const char *url, const char *email, u32 base_pid_id, FILE **sdp_tmp, u64 *session_id);
+
+GF_Err rtpout_init_streamer(GF_RTPOutStream *stream, const char *ipdest, Bool inject_xps, Bool use_mpeg4_signaling, Bool use_latm, u32 payt, u32 mtu, u32 ttl, const char *ifce, Bool is_rtsp, u32 *base_pid_id, u32 file_mode);
+
+GF_Err rtpout_process_rtp(GF_List *streams, GF_RTPOutStream **active_stream, Bool loop, s32 delay, u32 *active_stream_idx, u64 sys_clock_at_init, u64 *active_min_ts_microsec, u64 microsec_ts_init, Bool *wait_for_loop, u32 *repost_delay_us, Bool *first_RTCP_sent, u32 base_pid_id);
+
+
+#endif /*GPAC_DISABLE_STREAMING*/
+
+#endif //_IN_RTP_H_

gpac-1.0.0.tar.gz/src/filters/out_rtsp.c Added

@@ -0,0 +1,1348 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / rtsp 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/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/maths.h>
+
+#if !defined(GPAC_DISABLE_STREAMING)
+
+#include <gpac/filters.h>
+#include <gpac/ietf.h>
+#include <gpac/config_file.h>
+#include <gpac/base_coding.h>
+#include <gpac/rtp_streamer.h>
+
+//common functions for rtpout and rtspout
+#include "out_rtp.h"
+
+enum
+{
+	SDP_NONE = 0,
+	SDP_WAIT,
+	SDP_LOADED
+};
+
+enum
+{
+	MCAST_OFF = 0,
+	MCAST_ON,
+	MCAST_MIRROR
+};
+
+
+typedef struct
+{
+	//options
+	char *dst, *user_agent;
+	GF_List *mounts;
+	u32 port, firstport;
+	Bool xps;
+	u32 mtu;
+	u32 ttl;
+	char *ifce;
+	u32 payt, tt;
+	s32 delay;
+	char *info, *url, *email;
+	s32 runfor, tso;
+	u32 maxc;
+	u32 block_size;
+	Bool close, loop, dynurl, mpeg4;
+	u32 mcast;
+	Bool latm;
+
+	GF_Socket *server_sock;
+	GF_List *sessions;
+
+	u32 next_wake_us;
+	char *ip;
+	Bool done;
+} GF_RTSPOutCtx;
+
+
+typedef struct __rtspout_session
+{
+	GF_RTSPOutCtx *ctx;
+
+	struct __rtspout_session *mcast_mirror;
+
+	GF_RTSPSession *rtsp;
+	GF_RTSPCommand *command;
+	GF_RTSPResponse *response;
+	/*list of streams in session*/
+	GF_List *streams;
+	Bool loop_disabled, loop;
+
+	char *service_name;
+	char *sessionID;
+	char peer_address[GF_MAX_IP_NAME_LEN];
+
+	u32 play_state;
+	Double start_range;
+	u32 last_cseq;
+	Bool interleave;
+
+	/*base stream if this stream contains a media decoding dependency, 0 otherwise*/
+	u32 base_pid_id;
+
+	Bool first_RTCP_sent;
+
+	GF_RTPOutStream *active_stream;
+	u32 active_stream_idx;
+	u64 active_min_ts_microsec;
+
+	/*timeline origin of our session (all tracks) in microseconds*/
+	u64 sys_clock_at_init;
+
+	Bool wait_for_loop;
+	u64 microsec_ts_init;
+
+	Bool single_session;
+	char *server_path;
+	GF_List *filter_srcs;
+
+	u32 sdp_state;
+
+	u32 next_stream_id;
+
+	u64 pause_sys_clock;
+	Bool request_pending;
+	char *multicast_ip;
+	u64 sdp_id;
+} GF_RTSPOutSession;
+
+
+static void rtspout_send_response(GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess)
+{
+	sess->response->User_Agent = ctx->user_agent;
+	sess->response->Session = sess->sessionID;
+	if (ctx->close && !sess->interleave)
+		sess->response->Connection = "close";
+	gf_rtsp_send_response(sess->rtsp, sess->response);
+	sess->response->User_Agent = NULL;
+	sess->response->Session = NULL;
+	if (ctx->close && !sess->interleave) {
+		sess->response->Connection = NULL;
+		gf_rtsp_session_del(sess->rtsp);
+		sess->rtsp = NULL;
+	}
+}
+
+static void rtspout_check_last_sess(GF_RTSPOutCtx *ctx)
+{
+	if (gf_list_count(ctx->sessions) ) return;
+
+	if (ctx->dst)
+		ctx->done = GF_TRUE;
+	else if (ctx->runfor>0)
+		ctx->done = GF_TRUE;
+}
+
+static GF_Err rtspout_send_sdp(GF_RTSPOutSession *sess)
+{
+	FILE *sdp_out;
+	u32 fsize;
+	GF_Err e;
+	const char *ip = sess->ctx->ip;
+	if (!ip) ip = sess->ctx->ifce;
+	if (!ip) ip = "127.0.0.1";
+
+	if (sess->mcast_mirror) {
+		ip = sess->mcast_mirror->multicast_ip;
+ 		e = rtpout_create_sdp(sess->mcast_mirror->streams, GF_FALSE, ip, sess->ctx->info, "livesession", sess->ctx->url, sess->ctx->email, sess->mcast_mirror->base_pid_id, &sdp_out, &sess->sdp_id);
+	} else {
+ 		e = rtpout_create_sdp(sess->streams, GF_TRUE, ip, sess->ctx->info, "livesession", sess->ctx->url, sess->ctx->email, sess->base_pid_id, &sdp_out, &sess->sdp_id);
+	}
+	if (e) return e;
+
+	fsize = (u32) gf_ftell(sdp_out);
+	char *sdp_output = gf_malloc(sizeof(char)*(fsize+1));
+	gf_fseek(sdp_out, 0, SEEK_SET);
+	u32 read = (u32) gf_fread(sdp_output, fsize, sdp_out);
+	sdp_output[read]=0;
+	gf_fclose(sdp_out);
+
+
+	gf_rtsp_response_reset(sess->response);
+	sess->response->ResponseCode = NC_RTSP_OK;
+	sess->response->CSeq = sess->command->CSeq;
+	sess->response->body = sdp_output;
+
+	rtspout_send_response(sess->ctx, sess);
+	sess->response->body = NULL;
+	gf_free(sdp_output);
+
+	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);
+}
+
+static void rtspout_del_session(GF_RTSPOutSession *sess)
+{
+	//server mode, cleanup
+	while (gf_list_count(sess->streams)) {
+		GF_RTPOutStream *stream = gf_list_pop_back(sess->streams);
+		rtspout_del_stream(stream);
+	}
+	gf_list_del(sess->streams);
+
+	if (sess->service_name)
+		gf_free(sess->service_name);
+	if (sess->sessionID)
+		gf_free(sess->sessionID);
+	gf_list_del(sess->filter_srcs);
+	gf_rtsp_session_del(sess->rtsp);
+	gf_rtsp_command_del(sess->command);
+	gf_rtsp_response_del(sess->response);
+	gf_list_del_item(sess->ctx->sessions, sess);
+	if (sess->multicast_ip) gf_free(sess->multicast_ip);
+	gf_free(sess);
+}
+
+
+GF_RTSPOutSession *rtspout_locate_session_for_pid(GF_Filter *filter, GF_RTSPOutCtx *ctx, GF_FilterPid *pid)
+{
+	u32 i, count = gf_list_count(ctx->sessions);
+	if (ctx->dst) {
+		for (i=0; i<count; i++) {
+			GF_RTSPOutSession *sess = gf_list_get(ctx->sessions, i);
+			if (sess->single_session) return sess;
+		}
+		return NULL;
+	}
+	for (i=0; i<count; i++) {
+		u32 j, nb_filters;
+		GF_RTSPOutSession *sess = gf_list_get(ctx->sessions, i);
+		if (sess->single_session) continue;
+		nb_filters = gf_list_count(sess->filter_srcs);
+		for (j=0; j<nb_filters; j++) {
+			GF_Filter *srcf = gf_list_get(sess->filter_srcs, j);
+			if (gf_filter_pid_is_filter_in_parents(pid, srcf))
+				return sess;
+		}
+	}
+
+	return NULL;
+}
+
+static GF_Err rtspout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_RTSPOutCtx *ctx = (GF_RTSPOutCtx *) gf_filter_get_udta(filter);
+	GF_Err e = GF_OK;
+	GF_RTPOutStream *stream;
+	GF_RTSPOutSession *sess;
+	u32 streamType, payt;
+	const GF_PropertyValue *p;
+
+	sess = rtspout_locate_session_for_pid(filter, ctx, pid);
+	if (!sess) return GF_SERVICE_ERROR;
+
+	if (is_remove) {
+		GF_RTPOutStream *t = gf_filter_pid_get_udta(pid);
+		if (t) {
+			if (sess->active_stream==t) sess->active_stream = NULL;
+			gf_list_del_item(sess->streams, t);
+			rtspout_del_stream(t);
+		}
+		if (!gf_list_count(sess->streams)) {
+			rtspout_del_session(sess);
+		}
+		return GF_OK;
+	}
+	stream = gf_filter_pid_get_udta(pid);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	streamType = p ? p->value.uint : 0;
+
+	switch (streamType) {
+	case GF_STREAM_VISUAL:
+	case GF_STREAM_AUDIO:
+		break;
+	case GF_STREAM_FILE:
+	case GF_STREAM_UNKNOWN:
+		if (stream) {
+			if (sess->active_stream==stream) sess->active_stream = NULL;
+			gf_list_del_item(sess->streams, stream);
+			rtspout_del_stream(stream);
+		}
+		return GF_FILTER_NOT_SUPPORTED;
+	default:
+		break;
+	}
+	if (!stream) {
+		GF_SAFEALLOC(stream, GF_RTPOutStream);
+		if (!stream) return GF_OUT_OF_MEM;
+		gf_list_add(sess->streams, stream);
+		stream->pid = pid;
+		stream->streamtype = streamType;
+		stream->min_dts = GF_FILTER_NO_TS;
+	 	gf_filter_pid_set_udta(pid, stream);
+	}
+
+	stream->ctrl_id = sess->next_stream_id+1;
+	sess->next_stream_id++;
+
+	payt = ctx->payt + gf_list_find(sess->streams, stream);
+
+	e = rtpout_init_streamer(stream, ctx->ifce ? ctx->ifce : "127.0.0.1", ctx->xps, ctx->mpeg4, ctx->latm, payt, ctx->mtu, ctx->ttl, ctx->ifce, GF_TRUE, &sess->base_pid_id, 0);
+	if (e) return e;
+
+	if (ctx->loop) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
+		if (!p || (p->value.uint<GF_PLAYBACK_MODE_SEEK)) {
+			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;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err rtspout_check_new_session(GF_RTSPOutCtx *ctx, Bool single_session)
+{
+	GF_RTSPOutSession *sess;
+	GF_RTSPSession *new_sess = NULL;
+
+	if (!single_session) {
+		new_sess = gf_rtsp_session_new_server(ctx->server_sock);
+		if (!new_sess) return GF_OK;
+	}
+
+	GF_SAFEALLOC(sess, GF_RTSPOutSession);
+	if (!sess) {
+		gf_rtsp_session_del(new_sess);
+		return GF_OUT_OF_MEM;
+	}
+	sess->rtsp = new_sess;
+	sess->command = gf_rtsp_command_new();
+	sess->response = gf_rtsp_response_new();
+	sess->streams = gf_list_new();
+	sess->filter_srcs = gf_list_new();
+
+	if (new_sess) {
+		gf_rtsp_set_buffer_size(new_sess, ctx->block_size);
+		gf_rtsp_get_remote_address(new_sess, sess->peer_address);
+		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Accepting new connection from %s\n", sess->peer_address));
+	} else {
+		sess->single_session = GF_TRUE;
+	}
+	sess->ctx = ctx;
+	gf_list_add(ctx->sessions, sess);
+	return GF_OK;
+}
+
+static GF_Err rtspout_initialize(GF_Filter *filter)
+{
+	char szIP[1024];
+	GF_Err e;
+	u16 port;
+	char *ip;
+	GF_RTSPOutCtx *ctx = (GF_RTSPOutCtx *) gf_filter_get_udta(filter);
+	if (!ctx->payt) ctx->payt = 96;
+	if (!ctx->port) ctx->port = 554;
+	if (!ctx->firstport) ctx->firstport = 7000;
+	if (!ctx->mtu) ctx->mtu = 1450;
+	if (ctx->payt<96) ctx->payt = 96;
+	if (ctx->payt>127) ctx->payt = 127;
+	ctx->sessions = gf_list_new();
+
+	port = ctx->port;
+	ip = ctx->ifce;
+
+	if (!ctx->dst) {
+		if (!ctx->mounts) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPOut] No root dir for server, cannot run\n" ));
+			return GF_BAD_PARAM;
+		}
+		gf_filter_make_sticky(filter);
+	} else {
+		GF_RTSPOutSession *sess;
+		char *sep = strchr(ctx->dst+7, '/');
+		if (sep) {
+			u32 cplen = (u32) (sep-ctx->dst-7);
+			if (cplen>1023) cplen = 1023;
+			strncpy(szIP, ctx->dst+7, cplen);
+			szIP[1023] = 0;
+			sep = strchr(szIP, ':');
+			if (sep) {
+				port = atoi(sep+1);
+				if (!port) port = ctx->port;
+				sep[0] = 0;
+			}
+			if (strlen(szIP)) ip = szIP;
+		}
+		rtspout_check_new_session(ctx, GF_TRUE);
+		sess = gf_list_get(ctx->sessions, 0);
+		if (!sess) return GF_SERVICE_ERROR;
+		sess->server_path = ctx->dst;
+		sess->sdp_state = SDP_LOADED;
+	}
+
+	if (ip)
+		ctx->ip = gf_strdup(ip);
+
+	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);
+	if (!e) e = gf_sk_listen(ctx->server_sock, ctx->maxc);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSPOut] failed to start server on port %d: %s\n", ctx->port, gf_error_to_string(e) ));
+		return e;
+	}
+
+	gf_sk_server_mode(ctx->server_sock, GF_TRUE);
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSPOut] Server running on port %d\n", ctx->port));
+	gf_filter_post_process_task(filter);
+	return GF_OK;
+}
+
+static void rtspout_finalize(GF_Filter *filter)
+{
+	GF_RTSPOutCtx *ctx = (GF_RTSPOutCtx *) gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->sessions)) {
+		GF_RTSPOutSession *tmp = gf_list_get(ctx->sessions, 0);
+		rtspout_del_session(tmp);
+	}
+	gf_list_del(ctx->sessions);
+
+	gf_sk_del(ctx->server_sock);
+	if (ctx->ip) gf_free(ctx->ip);	
+}
+
+
+static Bool rtspout_init_clock(GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess)
+{
+	u64 min_dts = GF_FILTER_NO_TS;
+	u32 i, count = gf_list_count(sess->streams);
+
+	for (i=0; i<count; i++) {
+		u64 dts;
+		GF_FilterPacket *pck;
+		GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+		if (!stream->selected) continue;
+
+		while (1) {
+			pck = gf_filter_pid_get_packet(stream->pid);
+			if (!pck) return GF_FALSE;
+			if (gf_filter_pck_get_seek_flag(pck)) {
+				gf_filter_pid_drop_packet(stream->pid);
+				continue;
+			}
+			break;
+		}
+
+		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;
+
+		dts *= 1000000;
+		dts /= stream->timescale;
+		if (min_dts > dts)
+			min_dts = dts;
+
+		if (ctx->tso>0) {
+			u64 offset = ctx->tso;
+			offset *= stream->timescale;
+			offset /= 1000000;
+			stream->rtp_ts_offset = (u32) offset;
+		}
+		stream->current_cts = gf_filter_pck_get_cts(pck);
+	}
+	sess->sys_clock_at_init = gf_sys_clock_high_res();
+	sess->microsec_ts_init = min_dts;
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSPOut] Session %s: RTP clock initialized - time origin set to "LLU" us (sys clock) / "LLU" us (media clock)\n", sess->service_name, sess->sys_clock_at_init, sess->microsec_ts_init));
+	if (ctx->tso<0) {
+		gf_rand_init(0);
+		for (i=0; i<count; i++) {
+			GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+			stream->rtp_ts_offset = gf_rand();
+			GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSPOut] Session %s: RTP stream %d initial RTP TS set to %d\n", sess->service_name, i+1, stream->rtp_ts_offset));
+		}
+	}
+
+
+	gf_rtsp_response_reset(sess->response);
+	sess->response->ResponseCode = NC_RTSP_OK;
+	for (i=0; i<count; i++) {
+		GF_RTPInfo *rtpi;
+		GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+		if (!stream->selected) continue;
+		if (!stream->send_rtpinfo) continue;
+		stream->send_rtpinfo = GF_FALSE;
+
+		GF_SAFEALLOC(rtpi, GF_RTPInfo);
+		if (rtpi) {
+			rtpi->url = gf_malloc(sizeof(char) * (strlen(sess->service_name)+50));
+			sprintf(rtpi->url, "%s/trackID=%d", sess->service_name, stream->ctrl_id);
+			rtpi->seq = gf_rtp_streamer_get_next_rtp_sn(stream->rtp);
+			rtpi->rtp_time = (u32) (stream->current_cts + stream->ts_offset + stream->rtp_ts_offset);
+
+			gf_list_add(sess->response->RTP_Infos, rtpi);
+		}
+	}
+	GF_SAFEALLOC(sess->response->Range, GF_RTSPRange);
+	if (sess->response->Range)
+		sess->response->Range->start = sess->start_range;
+
+	sess->response->CSeq = sess->last_cseq;
+	rtspout_send_response(ctx, sess);
+	sess->request_pending = GF_FALSE;
+	return GF_TRUE;
+}
+
+static void rtspout_send_event(GF_RTSPOutSession *sess, Bool send_stop, Bool send_play, Double start_range)
+{
+	GF_FilterEvent fevt;
+	u32 i, count = gf_list_count(sess->streams);
+
+	memset(&fevt, 0, sizeof(GF_FilterEvent));
+
+	for (i=0; i<count; i++) {
+		GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+		if (!stream->selected) continue;
+
+		fevt.base.on_pid = stream->pid;
+		if (send_stop && stream->is_playing) {
+			stream->is_playing = GF_FALSE;
+			fevt.base.type = GF_FEVT_STOP;
+			gf_filter_pid_send_event(stream->pid, &fevt);
+		}
+		if (send_play && !stream->is_playing) {
+			stream->is_playing = GF_TRUE;
+			fevt.base.type = GF_FEVT_PLAY;
+			fevt.play.start_range = start_range;
+			gf_filter_pid_send_event(stream->pid, &fevt);
+
+			stream->send_rtpinfo = GF_TRUE;
+		}
+	}
+}
+
+static GF_Err rtspout_process_rtp(GF_Filter *filter, GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess)
+{
+	GF_Err e = GF_OK;
+	u32 repost_delay_us=0;
+
+	/*init session timeline - all sessions are sync'ed for packet scheduling purposes*/
+	if (!sess->sys_clock_at_init) {
+		if (!rtspout_init_clock(ctx, sess)) return GF_OK;
+	}
+
+	if (ctx->runfor>0) {
+		s64 diff = gf_sys_clock_high_res();
+		diff -= sess->sys_clock_at_init;
+		diff /= 1000;
+		if ((s32) diff > ctx->runfor) {
+			u32 i, count = gf_list_count(sess->streams);
+			for (i=0; i<count; i++) {
+				GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+				gf_filter_pid_set_discard(stream->pid, GF_TRUE);
+				stream->pck = NULL;
+			}
+			return GF_EOS;
+		}
+	}
+
+	e = rtpout_process_rtp(sess->streams, &sess->active_stream, sess->loop, ctx->delay, &sess->active_stream_idx, sess->sys_clock_at_init, &sess->active_min_ts_microsec, sess->microsec_ts_init, &sess->wait_for_loop, &repost_delay_us, &sess->first_RTCP_sent, sess->base_pid_id);
+
+	if (e) return e;
+	if (ctx->next_wake_us > repost_delay_us)
+		ctx->next_wake_us = (u32) repost_delay_us;
+	return GF_OK;
+}
+
+static GF_Err rtspout_interleave_packet(void *cbk1, void *cbk2, Bool is_rtcp, u8 *pck, u32 pck_size)
+{
+	GF_RTSPOutSession *sess = (GF_RTSPOutSession *)cbk1;
+	GF_RTPOutStream *stream = (GF_RTPOutStream *)cbk2;
+
+	u32 idx = is_rtcp ? stream->rtcp_id : stream->rtp_id;
+	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)
+{
+	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;
+
+	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;
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(sess->ctx, sess);
+	}
+	rtspout_del_session(sess);
+}
+
+static GF_Err rtspout_load_media_service(GF_Filter *filter, GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess, char *src_url)
+{
+	GF_Err e;
+	Bool found = GF_FALSE;
+	u32 i, count = gf_list_count(sess->filter_srcs);
+	for (i=0; i<count; i++) {
+		GF_Filter *src = gf_list_get(sess->filter_srcs, i);
+		const char *url = gf_filter_get_arg_str(src, "src", NULL);
+		if (url && !strcmp(src_url, url)) {
+			found = GF_TRUE;
+			break;
+		}
+	}
+	if (!found) {
+		GF_Filter *filter_src = gf_filter_connect_source(filter, src_url, NULL, &e);
+		if (!filter_src) {
+			gf_rtsp_response_reset(sess->response);
+			sess->response->ResponseCode = NC_RTSP_Session_Not_Found;
+			sess->response->CSeq = sess->command->CSeq;
+			rtspout_send_response(ctx, sess);
+			return e;
+		}
+		gf_list_add(sess->filter_srcs, filter_src);
+		gf_filter_set_setup_failure_callback(filter, filter_src, rtspout_on_filter_setup_error, sess);
+		sess->sdp_state = SDP_WAIT;
+	}
+	if (sess->sdp_state==SDP_LOADED) {
+		//single session, create SDP
+		rtspout_send_sdp(sess);
+	} else {
+		sess->sdp_state = SDP_WAIT;
+		sess->request_pending = GF_TRUE;
+	}
+	return GF_OK;
+}
+
+static GF_Err rtspout_check_sdp(GF_Filter *filter, GF_RTSPOutSession *sess)
+{
+	u32 i, count = gf_list_count(sess->streams);
+	u32 j, nb_filters = gf_list_count(sess->filter_srcs);
+
+	for (j=0; j<nb_filters; j++) {
+		Bool found = GF_FALSE;
+		GF_Filter *srcf = gf_list_get(sess->filter_srcs, j);
+		//check we have at least one pid
+		for (i=0; i<count; i++) {
+			GF_RTPOutStream *stream = gf_list_get(sess->streams, i);
+			if (gf_filter_pid_is_filter_in_parents(stream->pid, srcf)) {
+				found = GF_TRUE;
+				break;
+			}
+		}
+		//not yet connected
+		if (!found) return GF_OK;
+
+		//check we don't have other pid connection pendings
+		if (gf_filter_has_pid_connection_pending(srcf, filter))
+			return GF_OK;
+	}
+	//all streams should be ready - note that we don't know handle dynamic pid insertion in source service yet
+	sess->sdp_state = SDP_LOADED;
+	sess->request_pending = GF_FALSE;
+	rtspout_send_sdp(sess);
+	return GF_OK;
+}
+
+static void rtspout_get_next_mcast_port(GF_RTSPOutCtx *ctx, GF_RTSPOutSession *sess, u32 *port)
+{
+	u32 i, count = gf_list_count(ctx->sessions);
+	u32 min_port=ctx->firstport;
+	for (i=0; i<count; i++) {
+		u32 j, count2;
+		GF_RTSPOutSession *asess = gf_list_get(ctx->sessions, i);
+		if (asess == sess) continue;
+		if (!asess->multicast_ip || !sess->multicast_ip) continue;
+		//reuse port number if different multicast groups
+		if (strcmp(asess->multicast_ip, sess->multicast_ip)) continue;
+
+		count2 = gf_list_count(asess->streams);
+		for (j=0; j<count2; j++) {
+			GF_RTPOutStream *stream = gf_list_get(asess->streams, j);
+			if (stream->mcast_port>min_port) min_port = stream->mcast_port;
+			if (stream->mcast_port == *port) *port = 0;
+		}
+	}
+	if (! *port) *port = min_port;
+}
+
+static GF_RTSPOutSession *rtspout_locate_mcast(GF_RTSPOutCtx *ctx, char *res_path)
+{
+	u32 i, count = gf_list_count(ctx->sessions);
+	for (i=0; i<count; i++) {
+		char *a_sess_path=NULL;
+		GF_RTSPOutSession *a_sess = gf_list_get(ctx->sessions, i);
+		if (!a_sess->multicast_ip) continue;
+		if (!a_sess->service_name) continue;
+
+		a_sess_path = strstr(a_sess->service_name, "://");
+		if (a_sess_path) a_sess_path = strchr(a_sess_path+3, '/');
+		if (a_sess_path) a_sess_path++;
+		if (a_sess_path && !strcmp(a_sess_path, res_path))
+			return a_sess;
+	}
+	return NULL;
+}
+
+static char *rtspout_get_local_res_path(GF_RTSPOutCtx *ctx, char *res_path)
+{
+	u32 i;
+	char *src_url=NULL;
+	for (i=0; i<gf_list_count(ctx->mounts); i++) {
+		char *mpoint = gf_list_get(ctx->mounts, i);
+
+		gf_dynstrcat(&src_url, mpoint, NULL);
+		gf_dynstrcat(&src_url, res_path, "/");
+		if (gf_file_exists(src_url))
+			break;
+		gf_free(src_url);
+		src_url = NULL;
+	}
+	return src_url;
+}
+
+static GF_Err rtspout_process_session_signaling(GF_Filter *filter, GF_RTSPOutCtx *ctx, GF_RTSPOutSession **sess_ptr)
+{
+	GF_Err e;
+	GF_RTSPOutSession *sess = *sess_ptr;
+	char *ctrl=NULL;
+	u32 stream_ctrl_id=0;
+
+	//no rtsp connection on this session
+	if (!sess->rtsp) return GF_OK;
+
+	if (sess->sdp_state==SDP_WAIT) {
+		return rtspout_check_sdp(filter, sess);
+	}
+
+	if (sess->request_pending) return GF_OK;
+
+	e = gf_rtsp_get_command(sess->rtsp, sess->command);
+	if (e==GF_IP_NETWORK_EMPTY) {
+		return GF_OK;
+	}
+	//
+	if (e==GF_IP_CONNECTION_CLOSED) {
+		gf_rtsp_session_del(sess->rtsp);
+		sess->rtsp = NULL;
+		rtspout_check_last_sess(ctx);
+		return GF_OK;
+	}
+	if (e)
+		return e;
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Got request %s from %s\n", sess->command->method, sess->peer_address));
+
+	//restore session if needed
+	if (!sess->service_name) {
+		u32 i, count = gf_list_count(ctx->sessions);
+		for (i=0; i<count; i++) {
+			Bool swap_sess = GF_FALSE;
+			GF_RTSPOutSession *a_sess = gf_list_get(ctx->sessions, i);
+			if (a_sess->rtsp) continue;
+
+			if (a_sess->sessionID && sess->command->Session && !strcmp(a_sess->sessionID, sess->command->Session) ) {
+				swap_sess = GF_TRUE;
+			}
+			else if (!a_sess->sessionID && !sess->response->Session) {
+				char *sname;
+				char *cmd_path = strstr(sess->command->service_name, "://");
+				if (cmd_path) cmd_path = strchr(cmd_path+3, '/');
+				if (cmd_path) cmd_path++;
+
+				sname = a_sess->service_name;
+				if (!sname) sname = a_sess->server_path;
+
+				if (sname) sname = strstr(sname, "://");
+				if (sname) sname = strchr(sname+3, '/');
+				if (sname) sname++;
+
+				if (cmd_path && sname && !strncmp(cmd_path, sname, strlen(sname))) {
+					if (a_sess->service_name) {
+						//no session ID, match based on peer address
+						if (!strcmp(sess->peer_address, a_sess->peer_address))
+							swap_sess = GF_TRUE;
+					} else {
+						swap_sess = GF_TRUE;
+					}
+				}
+			}
+
+			if (!swap_sess) continue;
+			gf_rtsp_command_del(a_sess->command);
+			a_sess->command = sess->command;
+			a_sess->rtsp = sess->rtsp;
+			sess->rtsp = NULL;
+			sess->command = NULL;
+			memcpy(a_sess->peer_address, sess->peer_address, sizeof(char)*GF_MAX_IP_NAME_LEN);
+			rtspout_del_session(sess);
+			*sess_ptr = sess = a_sess;
+			break;
+		}
+	}
+	if (!sess->sessionID && sess->command->Session) {
+		gf_rtsp_response_reset(sess->response);
+		sess->response->ResponseCode = NC_RTSP_Session_Not_Found;
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(ctx, sess);
+		return GF_OK;
+	}
+
+	//process options
+	if (!strcmp(sess->command->method, GF_RTSP_OPTIONS)) {
+		gf_rtsp_response_reset(sess->response);
+		sess->response->ResponseCode = NC_RTSP_OK;
+		sess->response->Public = "DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE";
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(ctx, sess);
+		sess->response->Public = NULL;
+		return GF_OK;
+	}
+
+	//process describe
+	if (!strcmp(sess->command->method, GF_RTSP_DESCRIBE)) {
+		u32 rsp_code = NC_RTSP_OK;
+		char *res_path = NULL;
+		if (sess->command->service_name) {
+			res_path = strstr(sess->command->service_name, "://");
+			if (res_path) res_path = strchr(res_path+3, '/');
+			if (res_path) res_path++;
+		}
+
+		if (res_path && (ctx->mcast==MCAST_MIRROR) ) {
+			GF_RTSPOutSession *a_sess = rtspout_locate_mcast(ctx, res_path);
+			if (a_sess) {
+				sess->mcast_mirror = a_sess;
+				rtspout_send_sdp(sess);
+				return GF_OK;
+			}
+		}
+
+		if (!res_path) {
+			rsp_code = NC_RTSP_Not_Found;
+		} else if (ctx->dst) {
+			if (sess->server_path) {
+				char *sepp = strstr(sess->server_path, "://");
+				if (sepp) sepp = strchr(sepp+3, '/');
+				if (sepp) sepp++;
+				if (!sepp || strcmp(sepp, res_path))
+					rsp_code = NC_RTSP_Not_Found;
+			}
+		}
+		else if ((res_path[0] == '?') || (res_path[0] == '@') ) {
+			if (!ctx->dynurl) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTSP] client %s wants dynamic services, not enabled\n", sess->peer_address));
+				rsp_code = NC_RTSP_Forbidden;
+			} else {
+				GF_List *paths = gf_list_new();
+				rsp_code = NC_RTSP_OK;
+				res_path++;
+				while (res_path) {
+					char sep_c=0;
+					char *src_url = NULL;
+					char *sep = strchr(res_path, '&');
+					if (!sep) sep = strchr(res_path, '@');
+					if (sep) {
+						sep_c = sep[0];
+						sep[0] = 0;
+					}
+
+					if (!strstr(res_path, "://")) {
+						src_url = rtspout_get_local_res_path(ctx, res_path);
+						if (src_url) gf_list_add(paths, src_url);
+						else
+							rsp_code = NC_RTSP_Not_Found;
+					} else {
+						if (gf_filter_is_supported_source(filter, src_url, NULL)) {
+							src_url = gf_strdup(res_path);
+							gf_list_add(paths, src_url);
+						} else {
+							rsp_code = NC_RTSP_Service_Unavailable;
+						}
+					}
+
+					if (!sep) break;
+					sep[0] = sep_c;
+					res_path = sep+1;
+					if (rsp_code != NC_RTSP_OK)
+						break;
+				}
+				while (gf_list_count(paths)) {
+					char *src_url = gf_list_pop_front(paths);
+					if (rsp_code == NC_RTSP_OK) {
+						//load media service
+						e = rtspout_load_media_service(filter, ctx, sess, src_url);
+						if (e) {
+							rsp_code = NC_RTSP_Service_Unavailable;
+						}
+					}
+					gf_free(src_url);
+				}
+				gf_list_del(paths);
+			}
+		} else {
+			rsp_code = NC_RTSP_Not_Found;
+			char *src_url = rtspout_get_local_res_path(ctx, res_path);
+			if (src_url) {
+				rsp_code = NC_RTSP_OK;
+				//load media service
+				e = rtspout_load_media_service(filter, ctx, sess, src_url);
+				gf_free(src_url);
+				if (e) {
+					rsp_code = NC_RTSP_Service_Unavailable;
+				}
+			}
+		}
+
+		if (sess->service_name) gf_free(sess->service_name);
+		sess->service_name = gf_strdup(sess->command->service_name);
+
+		if (rsp_code != NC_RTSP_OK) {
+			gf_rtsp_response_reset(sess->response);
+			sess->response->ResponseCode = rsp_code;
+			sess->response->CSeq = sess->command->CSeq;
+			rtspout_send_response(ctx, sess);
+			return GF_OK;
+		}
+
+		if (sess->sdp_state==SDP_LOADED) {
+			//single session, create SDP
+			rtspout_send_sdp(sess);
+			return GF_OK;
+		}
+		//store cseq and wait for SDP to be loadable
+		sess->last_cseq = sess->command->CSeq;
+		sess->request_pending = GF_TRUE;
+		return GF_OK;
+	}
+
+	//forbid any access to the streams, ony describe is allowed
+	if (sess->mcast_mirror) {
+		gf_rtsp_response_reset(sess->response);
+		sess->response->ResponseCode = NC_RTSP_Unauthorized;
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(ctx, sess);
+		return GF_OK;
+	}
+
+	//extract control string if any
+	if (sess->service_name) {
+		char *sep = strstr(sess->service_name, "://");
+		if (sep) sep = strchr(sep+3, '/');
+		if (sep) sep = strstr(sess->command->service_name, sep);
+
+		if (sep) {
+			ctrl = strrchr(sess->command->service_name, '/');
+		}
+	} else {
+		ctrl = strrchr(sess->command->service_name, '/');
+	}
+	if (ctrl) {
+		sscanf(ctrl, "/trackID=%d", &stream_ctrl_id);
+	}
+
+	//process setup
+	if (!strcmp(sess->command->method, GF_RTSP_SETUP)) {
+	 	char remoteIP[GF_MAX_IP_NAME_LEN];
+		GF_RTPOutStream *stream = NULL;
+		GF_RTSPTransport *transport = gf_list_get(sess->command->Transports, 0);
+		u32 rsp_code=NC_RTSP_OK;
+		Bool enable_multicast = GF_FALSE;
+		Bool reset_transport_dest = GF_FALSE;
+
+		if (!ctrl || !transport) {
+			rsp_code = NC_RTSP_Bad_Request;
+		} else if (sess->sessionID && sess->command->Session && strcmp(sess->sessionID, sess->command->Session)) {
+			rsp_code = NC_RTSP_Bad_Request;
+		} else if (sess->sessionID && !sess->command->Session) {
+			rsp_code = NC_RTSP_Not_Implemented;
+		} else {
+			u32 i, count = gf_list_count(sess->streams);
+			for (i=0; i<count; i++) {
+				stream = gf_list_get(sess->streams, i);
+				if (stream_ctrl_id==stream->ctrl_id)
+					break;
+				stream=NULL;
+			}
+			if (!stream_ctrl_id)
+				rsp_code = NC_RTSP_Not_Found;
+		}
+
+		if (!stream) {
+			gf_rtsp_response_reset(sess->response);
+			sess->response->ResponseCode = rsp_code;
+			sess->response->CSeq = sess->command->CSeq;
+			rtspout_send_response(ctx, sess);
+			return GF_OK;
+		}
+
+		gf_rtsp_response_reset(sess->response);
+		sess->response->CSeq = sess->command->CSeq;
+
+		stream->selected = GF_TRUE;
+		if (transport && (rsp_code==NC_RTSP_OK) ) {
+			if (!transport->IsInterleaved) {
+				u32 st_idx = gf_list_find(sess->streams, stream);
+				transport->port_first = ctx->firstport + 2 * st_idx;
+				transport->port_last = transport->port_first + 1;
+				if (sess->interleave)
+					rsp_code = NC_RTSP_Not_Implemented;
+			} else {
+				if (!sess->sessionID) {
+					sess->interleave = GF_TRUE;
+				} else if (!sess->interleave) {
+					rsp_code = NC_RTSP_Not_Implemented;
+				}
+			}
+			transport->SSRC = rand();
+			transport->is_sender = GF_TRUE;
+
+			if (transport->IsUnicast) {
+				if (transport->destination && gf_sk_is_multicast_address(transport->destination)) {
+					rsp_code = NC_RTSP_Bad_Request;
+				} else if (!transport->destination) {
+					transport->destination = sess->peer_address;
+					reset_transport_dest = GF_TRUE;
+				}
+				if (sess->multicast_ip)
+					rsp_code = NC_RTSP_Forbidden;
+
+				if (ctx->dst && (strstr(ctx->dst, "://127.0.0.1") || strstr(ctx->dst, "://localhost") || strstr(ctx->dst, "://::1/128") ) ) {
+					if (!reset_transport_dest && transport->destination) gf_free(transport->destination);
+					transport->destination = "127.0.0.1";
+					reset_transport_dest = GF_TRUE;
+				}
+			}
+			else {
+				if (transport->destination && !gf_sk_is_multicast_address(transport->destination)) {
+					rsp_code = NC_RTSP_Bad_Request;
+				} else {
+					if (ctx->mcast != MCAST_OFF) {
+						enable_multicast = GF_TRUE;
+						//we don't allow seting up streams on different mcast addresses
+						if (!sess->multicast_ip) {
+							sess->multicast_ip = transport->destination; //detach memory
+						}
+						transport->source = transport->destination = sess->multicast_ip;
+						reset_transport_dest = GF_TRUE;
+
+						transport->client_port_first = 0;
+						transport->client_port_last = 0;
+						if (ctx->ttl) transport->TTL = ctx->ttl;
+						if (!transport->TTL) transport->TTL = 1;
+						stream->mcast_port = transport->port_first;
+						rtspout_get_next_mcast_port(ctx, sess, &stream->mcast_port);
+						transport->port_first = stream->mcast_port;
+						transport->port_last = stream->mcast_port+1;
+					} else {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] SETUP requests a multicast to %s, not allowed\n", transport->destination));
+						rsp_code = NC_RTSP_Forbidden;
+					}
+				}
+			}
+		}
+
+		if (rsp_code != NC_RTSP_OK) {
+			sess->response->ResponseCode = rsp_code;
+		} else {
+			e = gf_rtp_streamer_init_rtsp(stream->rtp, ctx->mtu, transport, ctx->ifce);
+			if (e) {
+				sess->response->ResponseCode = NC_RTSP_Internal_Server_Error;
+			} else {
+				if (!sess->sessionID)
+					sess->sessionID = gf_rtsp_generate_session_id(sess->rtsp);
+
+				sess->response->ResponseCode = NC_RTSP_OK;
+				sess->response->Session = sess->sessionID;
+				if (!enable_multicast) {
+					gf_rtsp_get_session_ip(sess->rtsp, remoteIP);
+					if (!reset_transport_dest && transport->destination) gf_free(transport->destination);
+					transport->destination = NULL;
+					transport->source = remoteIP;
+				}
+				gf_list_add(sess->response->Transports, transport);
+			}
+		}
+
+
+		if (sess->interleave) {
+			stream->rtp_id = transport->rtpID;
+			stream->rtcp_id = transport->rtcpID;
+			gf_rtp_streamer_set_interleave_callbacks(stream->rtp, rtspout_interleave_packet, sess, stream);
+		}
+
+		rtspout_send_response(ctx, sess);
+		gf_list_reset(sess->response->Transports);
+		sess->response->Session = NULL;
+		if (reset_transport_dest)
+			transport->destination = NULL;
+
+		transport->source = NULL;
+		return GF_OK;
+	}
+
+	//process play
+	if (!strcmp(sess->command->method, GF_RTSP_PLAY)) {
+		Double start_range=-1;
+		u32 rsp_code=NC_RTSP_OK;
+		if (sess->sessionID && sess->command->Session && strcmp(sess->sessionID, sess->command->Session)) {
+			rsp_code = NC_RTSP_Bad_Request;
+		} else if (!sess->command->Session || !sess->sessionID) {
+			rsp_code = NC_RTSP_Bad_Request;
+		}
+		if (sess->command->Range)
+			start_range = sess->command->Range->start;
+
+		if (stream_ctrl_id) {
+			rsp_code=NC_RTSP_Only_Aggregate_Operation_Allowed;
+		}
+
+		if (rsp_code!=NC_RTSP_OK) {
+			gf_rtsp_response_reset(sess->response);
+			sess->response->ResponseCode = rsp_code;
+			sess->response->CSeq = sess->command->CSeq;
+			rtspout_send_response(ctx, sess);
+			return GF_OK;
+		} else {
+			//loop enabled, only if multicast session or single session mode
+			if (ctx->loop && !sess->loop_disabled && (sess->single_session || sess->multicast_ip))
+				sess->loop = GF_TRUE;
+
+			if ((sess->play_state==2) && !sess->command->Range) {
+				u64 ellapsed_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;
+
+				gf_rtsp_response_reset(sess->response);
+				sess->response->ResponseCode = NC_RTSP_OK;
+				sess->response->CSeq = sess->command->CSeq;
+				rtspout_send_response(ctx, sess);
+			} else {
+				sess->play_state = 1;
+				sess->sys_clock_at_init = 0;
+				sess->start_range = start_range;
+				sess->last_cseq = sess->command->CSeq;
+				sess->request_pending = GF_TRUE;
+				rtspout_send_event(sess, GF_FALSE, GF_TRUE, start_range);
+			}
+		}
+		return GF_OK;
+	}
+
+	//process pause (we don't implement range on pause yet)
+	if (!strcmp(sess->command->method, GF_RTSP_PAUSE)) {
+		if (sess->play_state!=2) {
+			sess->play_state = 2;
+			sess->pause_sys_clock = gf_sys_clock_high_res();
+		}
+		gf_rtsp_response_reset(sess->response);
+		sess->response->ResponseCode = NC_RTSP_OK;
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(ctx, sess);
+		return GF_OK;
+	}
+	//process teardown
+	if (!strcmp(sess->command->method, GF_RTSP_TEARDOWN)) {
+		sess->play_state = 0;
+		rtspout_send_event(sess, GF_TRUE, GF_FALSE, 0);
+
+		gf_rtsp_response_reset(sess->response);
+		sess->response->ResponseCode = NC_RTSP_OK;
+		sess->response->CSeq = sess->command->CSeq;
+		rtspout_send_response(ctx, sess);
+
+		rtspout_send_event(sess, GF_TRUE, GF_FALSE, 0);
+
+		rtspout_del_session(sess);
+		rtspout_check_last_sess(ctx);
+		*sess_ptr = NULL;
+		return GF_OK;
+	}
+	return GF_OK;
+}
+
+
+static GF_Err rtspout_process(GF_Filter *filter)
+{
+	GF_Err e=GF_OK;
+	u32 i, count;
+	GF_RTSPOutCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->done)
+		return GF_EOS;
+
+	ctx->next_wake_us = 50000;
+	e = rtspout_check_new_session(ctx, GF_FALSE);
+	if (e==GF_IP_NETWORK_EMPTY) {
+		e = GF_OK;
+	}
+
+ 	count = gf_list_count(ctx->sessions);
+	for (i=0; i<count; i++) {
+		GF_Err sess_err;
+		GF_RTSPOutSession *sess = gf_list_get(ctx->sessions, i);
+		sess_err = rtspout_process_session_signaling(filter, ctx, &sess);
+		if (sess_err) e |= sess_err;
+
+		if (sess && sess->play_state) {
+			sess_err = rtspout_process_rtp(filter, ctx, sess);
+			if (sess_err) e |= sess_err;
+		}
+	}
+
+	if (e==GF_EOS) {
+		if (ctx->dst) return GF_EOS;
+		e=GF_OK;
+	}
+
+	if (ctx->next_wake_us)
+		gf_filter_ask_rt_reschedule(filter, ctx->next_wake_us);
+
+	return e;
+}
+
+static GF_FilterProbeScore rtspout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "rtsp://", 7)) return GF_FPROBE_SUPPORTED;
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+static const GF_FilterCapability RTSPOutCaps[] =
+{
+	//anything else (not file and framed) result in manifest PID
+	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),
+
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "sdp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "application/sdp"),
+	{0},
+	//anything else (not file and framed) result in media pids not file
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED | GF_CAPFLAG_LOADED_FILTER, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#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(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(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(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},
+	{ OFFS(block_size), "block size used to read TCP socket", GF_PROP_UINT, "10000", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ 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(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"
+				"- mirror: clients can create a multicast session. Any later request to the same URL will use that multicast session"
+		, GF_PROP_UINT, "off", "off|on|mirror", GF_FS_ARG_HINT_EXPERT},
+
+	{0}
+};
+
+
+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"\
+		"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"\
+	)
+	.private_size = sizeof(GF_RTSPOutCtx),
+	.max_extra_pids = -1,
+	.args = RTSPOutArgs,
+	.probe_url = rtspout_probe_url,
+	.initialize = rtspout_initialize,
+	.finalize = rtspout_finalize,
+	SETCAPS(RTSPOutCaps),
+	.configure_pid = rtspout_configure_pid,
+	.process = rtspout_process
+};
+
+
+const GF_FilterRegister *rtspout_register(GF_FilterSession *session)
+{
+	return &RTSPOutRegister;
+}
+
+#else
+
+const GF_FilterRegister *rtspout_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+
+#endif /* !defined(GPAC_DISABLE_STREAMING) */

gpac-1.0.0.tar.gz/src/filters/out_sock.c Added

@@ -0,0 +1,576 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic socket 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/network.h>
+
+typedef struct
+{
+	GF_Socket *socket;
+	Bool is_tuned;
+	char address[GF_MAX_IP_NAME_LEN];
+	Bool pck_pending;
+} GF_SockOutClient;
+
+typedef struct
+{
+	//options
+	Double start, speed;
+	char *dst, *mime, *ext, *ifce;
+	Bool listen;
+	u32 maxc, port, sockbuf, ka, kp, rate;
+	GF_Fraction pckr, pckd;
+
+	GF_Socket *socket;
+	//only one output pid
+	GF_FilterPid *pid;
+
+	GF_List *clients;
+
+	Bool pid_started;
+	Bool had_clients;
+	Bool pck_pending;
+
+	GF_FilterCapability in_caps[2];
+	char szExt[10];
+	char szFileName[GF_MAX_PATH];
+
+	u32 nb_pck_processed;
+	u64 start_time;
+	u64 nb_bytes_sent;
+
+	GF_FilterPacket *rev_pck;
+	u32 next_pckd_idx, next_pckr_idx;
+	u32 nb_pckd_wnd, nb_pckr_wnd;
+} GF_SockOutCtx;
+
+
+static GF_Err sockout_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_SockOutCtx *ctx = (GF_SockOutCtx *) gf_filter_get_udta(filter);
+	if (is_remove) {
+		ctx->pid = NULL;
+		gf_sk_del(ctx->socket);
+		ctx->socket = NULL;
+		return GF_OK;
+	}
+	gf_filter_pid_check_caps(pid);
+
+	if (!ctx->pid && (!ctx->listen || gf_list_count(ctx->clients) ) ) {
+		GF_FilterEvent evt;
+		gf_filter_pid_init_play_event(pid, &evt, ctx->start, ctx->speed, "SockOut");
+		gf_filter_pid_send_event(pid, &evt);
+		ctx->pid_started = GF_TRUE;
+	}
+	ctx->pid = pid;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DISABLE_PROGRESSIVE);
+	if (p && p->value.uint) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Block patching is not supported by socket output\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err sockout_initialize(GF_Filter *filter)
+{
+	GF_Err e;
+	char *str, *url;
+	u16 port;
+	char *ext;
+	u32 sock_type = 0;
+	GF_SockOutCtx *ctx = (GF_SockOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx || !ctx->dst) return GF_OK;
+	e = GF_NOT_SUPPORTED;
+	if (!strncmp(ctx->dst, "tcp://", 6)) e = GF_OK;
+	else if (!strncmp(ctx->dst, "udp://", 6)) e = GF_OK;
+	else if (!strncmp(ctx->dst, "tcpu://", 7)) e = GF_OK;
+	else if (!strncmp(ctx->dst, "udpu://", 7)) e = GF_OK;
+
+
+	if (e)  {
+		gf_filter_setup_failure(filter, GF_NOT_SUPPORTED);
+		return GF_NOT_SUPPORTED;
+	}
+	if (ctx->ext) ext = ctx->ext;
+	else {
+		ext = gf_file_ext_start(ctx->dst);
+		if (ext) ext++;
+	}
+
+	if (!ext && !ctx->mime) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] No extension provided nor mime type for output file %s, cannot infer format\n", ctx->dst));
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (ctx->listen) {
+		ctx->clients = gf_list_new();
+		if (!ctx->clients) return GF_OUT_OF_MEM;
+	}
+
+	//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);
+
+	/*create our ourput socket*/
+
+	if (!strnicmp(ctx->dst, "udp://", 6)) {
+		sock_type = GF_SOCK_TYPE_UDP;
+		ctx->listen = GF_FALSE;
+	} else if (!strnicmp(ctx->dst, "tcp://", 6)) {
+		sock_type = GF_SOCK_TYPE_TCP;
+#ifdef GPAC_HAS_SOCK_UN
+	} else if (!strnicmp(ctx->dst, "udpu://", 7)) {
+		sock_type = GF_SOCK_TYPE_UDP_UN;
+		ctx->listen = GF_FALSE;
+	} else if (!strnicmp(ctx->dst, "tcpu://", 7)) {
+		sock_type = GF_SOCK_TYPE_TCP_UN;
+#endif
+	} else {
+		return GF_NOT_SUPPORTED;
+	}
+
+	//skip ://
+	url = strchr(ctx->dst, ':');
+	url += 3;
+
+	ctx->socket = gf_sk_new(sock_type);
+	if (! ctx->socket ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Failed to open socket for %s\n", ctx->dst));
+		return GF_IO_ERR;
+	}
+
+	/*setup port and src*/
+	port = ctx->port;
+	str = strrchr(url, ':');
+	/*take care of IPv6 address*/
+	if (str && strchr(str, ']')) str = strchr(url, ':');
+	if (str) {
+		port = atoi(str+1);
+		str[0] = 0;
+	}
+
+	if (gf_sk_is_multicast_address(url)) {
+		e = gf_sk_setup_multicast(ctx->socket, url, port, 0, 0, ctx->ifce);
+		ctx->listen = GF_FALSE;
+	} else if ((sock_type == GF_SOCK_TYPE_UDP)
+#ifdef GPAC_HAS_SOCK_UN
+		|| (sock_type == GF_SOCK_TYPE_UDP_UN)
+#endif
+	) {
+		e = gf_sk_bind(ctx->socket, ctx->ifce, port, url, port, GF_SOCK_REUSE_PORT | GF_SOCK_FAKE_BIND);
+		ctx->listen = GF_FALSE;
+	} else if (ctx->listen) {
+		e = gf_sk_bind(ctx->socket, NULL, port, url, 0, GF_SOCK_REUSE_PORT);
+		if (!e) e = gf_sk_listen(ctx->socket, ctx->maxc);
+		if (!e) {
+			gf_filter_post_process_task(filter);
+			gf_sk_server_mode(ctx->socket, GF_TRUE);
+		}
+	} else {
+		e = gf_sk_connect(ctx->socket, url, port, ctx->ifce);
+	}
+
+	if (str) str[0] = ':';
+
+	if (e) {
+		gf_sk_del(ctx->socket);
+		ctx->socket = NULL;
+		return e;
+	}
+
+	gf_sk_set_buffer_size(ctx->socket, 0, ctx->sockbuf);
+
+	return GF_OK;
+}
+
+static void sockout_finalize(GF_Filter *filter)
+{
+	GF_SockOutCtx *ctx = (GF_SockOutCtx *) gf_filter_get_udta(filter);
+	if (ctx->clients) {
+		while (gf_list_count(ctx->clients)) {
+			GF_SockOutClient *sc = gf_list_pop_back(ctx->clients);
+			if (sc->socket) gf_sk_del(sc->socket);
+			gf_free(sc);
+		}
+		gf_list_del(ctx->clients);
+	}
+
+	if (ctx->socket) gf_sk_del(ctx->socket);
+}
+
+static GF_Err sockout_send_packet(GF_SockOutCtx *ctx, GF_FilterPacket *pck, GF_Socket *dst_sock)
+{
+	GF_Err e;
+	const GF_PropertyValue *p;
+	u32 w, h, stride, stride_uv, pf;
+	u32 nb_planes, uv_height;
+	const char *pck_data;
+	u32 pck_size;
+	GF_FilterFrameInterface *hwf=NULL;
+	if (!dst_sock) return GF_OK;
+
+	pck_data = gf_filter_pck_get_data(pck, &pck_size);
+	if (pck_data) {
+		e = gf_sk_send(dst_sock, pck_data, pck_size);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Write error: %s\n", gf_error_to_string(e) ));
+		}
+		ctx->nb_bytes_sent += pck_size;
+		return e;
+	}
+	hwf = gf_filter_pck_get_frame_interface(pck);
+	if (!hwf) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] output file handle is not opened, discarding %d bytes\n", pck_size));
+		return GF_OK;
+	}
+
+	p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_WIDTH);
+	w = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_HEIGHT);
+	h = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(ctx->pid, GF_PROP_PID_PIXFMT);
+	pf = p ? p->value.uint : 0;
+
+	//get stride/stride_uv with no padding
+	stride = stride_uv = 0;
+	if (gf_pixel_get_size_info(pf, w, h, NULL, &stride, &stride_uv, &nb_planes, &uv_height) == GF_TRUE) {
+		u32 i;
+		for (i=0; i<nb_planes; i++) {
+			u32 j, write_h, lsize;
+			const u8 *out_ptr;
+			u32 out_stride = i ? stride_uv : stride;
+			e = hwf->get_plane(hwf, i, &out_ptr, &out_stride);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Failed to fetch plane data from hardware frame, cannot write\n"));
+				break;
+			}
+			if (i) {
+				write_h = uv_height;
+				lsize = stride_uv;
+			} else {
+				write_h = h;
+				lsize = stride;
+			}
+			for (j=0; j<write_h; j++) {
+				e = gf_sk_send(dst_sock, out_ptr, lsize);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SockOut] Write error: %s\n", gf_error_to_string(e) ));
+				}
+				out_ptr += out_stride;
+				ctx->nb_bytes_sent += lsize;
+			}
+		}
+	}
+	return GF_OK;
+}
+
+
+static GF_Err sockout_process(GF_Filter *filter)
+{
+	GF_Err e;
+	Bool is_pck_ref = GF_FALSE;
+
+	GF_FilterPacket *pck;
+	GF_SockOutCtx *ctx = (GF_SockOutCtx *) gf_filter_get_udta(filter);
+
+	if (!ctx->socket)
+		return GF_EOS;
+
+	if (ctx->rate) {
+		if (!ctx->start_time) ctx->start_time = gf_sys_clock_high_res();
+		else {
+			u64 now = gf_sys_clock_high_res() - ctx->start_time;
+			if (ctx->nb_bytes_sent*8*1000000 > ctx->rate * now) {
+				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);
+			}
+		}
+	}
+
+	if (ctx->listen) {
+		GF_Socket *new_conn=NULL;
+		e = gf_sk_accept(ctx->socket, &new_conn);
+		if ((e==GF_OK) && new_conn) {
+			GF_SockOutClient *sc;
+			GF_SAFEALLOC(sc, GF_SockOutClient);
+			if (!sc) return GF_OUT_OF_MEM;
+			
+			sc->socket = new_conn;
+			strcpy(sc->address, "unknown");
+			gf_sk_get_remote_address(new_conn, sc->address);
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SockOut] Accepting new connection from %s\n", sc->address));
+			gf_list_add(ctx->clients, sc);
+			ctx->had_clients = GF_TRUE;
+			if (!ctx->pid_started && ctx->pid) {
+				GF_FilterEvent evt;
+				gf_filter_pid_init_play_event(ctx->pid, &evt, ctx->start, ctx->speed, "SockOut");
+				gf_filter_pid_send_event(ctx->pid, &evt);
+				ctx->pid_started = GF_TRUE;
+			}
+			sc->pck_pending = ctx->pck_pending;
+			if (!ctx->nb_pck_processed)
+				sc->is_tuned = GF_TRUE;
+		}
+	}
+	if (!ctx->pid) {
+		if (ctx->listen) gf_filter_post_process_task(filter);
+		return GF_OK;
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->pid)) {
+			if (ctx->rev_pck) {
+				is_pck_ref = GF_TRUE;
+				pck = ctx->rev_pck;
+			} else {
+				if (!ctx->listen) {
+					gf_sk_del(ctx->socket);
+					ctx->socket = NULL;
+					return GF_EOS;
+				}
+				if (!ctx->ka)
+					return GF_EOS;
+				//keep alive, ask for real-time reschedule of 100 ms - we should use socket groups and selects !
+				gf_filter_ask_rt_reschedule(filter, 100000);
+			}
+		}
+		if (!pck)
+			return GF_OK;
+	}
+
+	if (ctx->pckd.den && !ctx->rev_pck) {
+		u32 pck_idx = ctx->pckd.num;
+		u32 nb_pck = ctx->nb_pckd_wnd * ctx->pckd.den;
+
+		if (!pck_idx) {
+			if (!ctx->next_pckd_idx) ctx->next_pckd_idx = gf_rand() % ctx->pckd.den;
+			pck_idx = ctx->next_pckd_idx;
+		}
+		nb_pck += pck_idx;
+
+		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_filter_pid_drop_packet(ctx->pid);
+			ctx->next_pckd_idx = 0;
+			ctx->nb_pckd_wnd ++;
+			return GF_OK;
+		}
+	}
+	if (ctx->pckr.den && !ctx->rev_pck) {
+		u32 pck_idx = ctx->pckr.num;
+		u32 nb_pck = ctx->nb_pckr_wnd * ctx->pckr.den;
+
+		if (!pck_idx) {
+			if (!ctx->next_pckr_idx) ctx->next_pckr_idx = gf_rand() % ctx->pckr.den;
+			pck_idx = ctx->next_pckr_idx;
+		}
+		nb_pck += pck_idx;
+
+		if (nb_pck == 1+ctx->nb_pck_processed) {
+			ctx->rev_pck = pck;
+			gf_filter_pck_ref(&ctx->rev_pck);
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SockOut] Reverting packet %d per user request\r", ctx->nb_pck_processed));
+			ctx->nb_pck_processed++;
+			gf_filter_pid_drop_packet(ctx->pid);
+			pck = gf_filter_pid_get_packet(ctx->pid);
+			if (!pck) return GF_OK;
+		}
+	}
+
+	if (ctx->listen) {
+		Bool had_pck_pending = ctx->pck_pending;
+		u32 i, nb_clients = gf_list_count(ctx->clients);
+		u8 dep_flags = gf_filter_pck_get_dependency_flags(pck);
+		if ((dep_flags & 0x3) == 1) {
+		}
+		ctx->pck_pending = GF_FALSE;
+
+		if (!nb_clients) {
+			//client disconnected, drop packet if needed
+			if (ctx->had_clients && !ctx->kp) {
+				if (is_pck_ref) {
+					gf_filter_pck_unref(pck);
+					ctx->rev_pck = NULL;
+				} else {
+					gf_filter_pid_drop_packet(ctx->pid);
+				}
+			}
+			return GF_OK;
+		}
+		for (i=0; i<nb_clients; i++) {
+			GF_SockOutClient *sc = gf_list_get(ctx->clients, i);
+			if (!sc->is_tuned) {
+
+			}
+			if (had_pck_pending && !sc->pck_pending) {
+				continue;
+			}
+			sc->pck_pending = GF_FALSE;
+
+			e = sockout_send_packet(ctx, pck, sc->socket);
+			if (e == GF_BUFFER_TOO_SMALL) {
+				sc->pck_pending = GF_TRUE;
+				ctx->pck_pending = GF_TRUE;
+			}
+		}
+		if (ctx->pck_pending) return GF_OK;
+
+	} else {
+		e = sockout_send_packet(ctx, pck, ctx->socket);
+		if (e == GF_BUFFER_TOO_SMALL) return GF_OK;
+	}
+
+	ctx->nb_pck_processed++;
+
+	if (is_pck_ref) {
+		gf_filter_pck_unref(pck);
+		ctx->rev_pck = NULL;
+	} else {
+		gf_filter_pid_drop_packet(ctx->pid);
+		if (ctx->rev_pck) {
+			e = sockout_send_packet(ctx, ctx->rev_pck, ctx->socket);
+			if (e == GF_BUFFER_TOO_SMALL) return GF_OK;
+			gf_filter_pck_unref(ctx->rev_pck);
+			ctx->rev_pck = NULL;
+			ctx->next_pckr_idx=0;
+			ctx->nb_pckr_wnd++;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_FilterProbeScore sockout_probe_url(const char *url, const char *mime)
+{
+	if (!strnicmp(url, "tcp://", 6)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "udp://", 6)) return GF_FPROBE_SUPPORTED;
+#ifdef GPAC_HAS_SOCK_UN
+	if (!strnicmp(url, "tcpu://", 7)) return GF_FPROBE_SUPPORTED;
+	if (!strnicmp(url, "udpu://", 7)) return GF_FPROBE_SUPPORTED;
+#endif
+	return GF_FPROBE_NOT_SUPPORTED;
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_SockOutCtx, _n)
+
+static const GF_FilterArgs SockOutArgs[] =
+{
+	{ OFFS(dst), "location of destination file", 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(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(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},
+	{0}
+};
+
+static const GF_FilterCapability SockOutCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_FILE_EXT, "*"),
+	CAP_STRING(GF_CAPS_INPUT,GF_PROP_PID_MIME, "*"),
+};
+
+
+GF_FilterRegister SockOutRegister = {
+	.name = "sockout",
+	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"
+		"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"
+		"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"
+		"- TCP sockets are used for destinations URLs formatted as `tcp://NAME`\n"
+#ifdef GPAC_HAS_SOCK_UN
+		"- UDP unix domain sockets are used for destinations URLs formatted as `udpu://NAME`\n"
+		"- TCP unix domain sockets are used for destinations URLs formatted as `tcpu://NAME`\n"
+#else
+		"Your platform does not supports unix domain sockets"
+#endif
+		"\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"
+		"If the numerator is 0, a packet is randomly chosen in that window.\n"
+		"EX :pckd=4/10\n"\
+		"This drops every 4th packet of each 10 packet window.\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
+	.private_size = sizeof(GF_SockOutCtx),
+	.args = SockOutArgs,
+	SETCAPS(SockOutCaps),
+	.probe_url = sockout_probe_url,
+	.initialize = sockout_initialize,
+	.finalize = sockout_finalize,
+	.configure_pid = sockout_configure_pid,
+	.process = sockout_process
+};
+
+
+const GF_FilterRegister *sockout_register(GF_FilterSession *session)
+{
+	return &SockOutRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/out_video.c Added

@@ -0,0 +1,1527 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / video 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/modules/video_out.h>
+#include <gpac/color.h>
+
+
+//#define GPAC_DISABLE_3D
+
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+#define VOUT_USE_OPENGL
+
+//include openGL
+#include "../compositor/gl_inc.h"
+
+#define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
+#define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
+
+
+#define TEXTURE_TYPE GL_TEXTURE_2D
+
+
+#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
+#define GF_SHADERID u64
+#else
+#define GF_SHADERID u32
+#endif
+
+
+static char *default_glsl_vertex = "\
+	attribute vec4 gfVertex;\
+	attribute vec2 gfTexCoord;\
+	varying vec2 TexCoord;\
+	void main(void)\
+	{\
+		gl_Position = gl_ModelViewProjectionMatrix * gfVertex;\
+		TexCoord = gfTexCoord;\
+	}";
+
+#endif
+
+typedef enum
+{
+	MODE_GL,
+	MODE_GL_PBO,
+	MODE_2D,
+	MODE_2D_SOFT,
+} GF_VideoOutMode;
+
+typedef struct
+{
+	//options
+	char *drv;
+	GF_VideoOutMode disp;
+	Bool vsync, linear, fullscreen, drop, hide;
+	GF_Fraction64 dur;
+	Double speed, hold;
+	u32 back;
+	GF_PropVec2i wsize;
+	GF_PropVec2i wpos;
+	Double start;
+	u32 buffer;
+	GF_Fraction vdelay;
+	const char *out;
+	GF_PropUIntList dumpframes;
+
+	GF_Filter *filter;
+	GF_FilterPid *pid;
+	u32 width, height, stride, pfmt, timescale;
+	GF_Fraction fps;
+
+	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;
+	Bool aborted;
+	u32 display_width, display_height;
+	Bool display_changed;
+	Float dh, dw, oh, ow;
+	Bool has_alpha;
+	u32 nb_frames;
+
+	//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
+	Bool raw_grab;
+
+#ifdef VOUT_USE_OPENGL
+	GLint glsl_program;
+	GF_SHADERID vertex_shader;
+	GF_SHADERID fragment_shader;
+
+	GF_GLTextureWrapper tx;
+#endif // VOUT_USE_OPENGL
+
+	u32 num_textures;
+
+	u32 uv_w, uv_h, uv_stride, bit_depth;
+	Bool is_yuv, in_fullscreen;
+	u32 nb_drawn;
+
+	GF_Fraction sar;
+
+	Bool force_release;
+	GF_FilterPacket *last_pck;
+
+	s32 pid_delay;
+	Bool buffer_done;
+	Bool no_buffering;
+	Bool dump_done;
+
+	u32 dump_f_idx;
+	char *dump_buffer;
+} GF_VideoOutCtx;
+
+static GF_Err vout_draw_frame(GF_VideoOutCtx *ctx);
+
+#ifdef VOUT_USE_OPENGL
+static Bool vout_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
+{
+	GLint blen = 0;
+	GLsizei slen = 0;
+	u32 len;
+	if (!source || !shader_id) return 0;
+	len = (u32) strlen(source);
+	glShaderSource(shader_id, 1, &source, &len);
+	glCompileShader(shader_id);
+
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);
+	if (blen > 1) {
+		char* compiler_log = (char*) gf_malloc(blen);
+#if defined(GPAC_USE_GLES2)
+		glGetShaderInfoLog(shader_id, blen, &slen, compiler_log);
+#elif defined(CONFIG_DARWIN_GL)
+		glGetInfoLogARB((GLhandleARB) shader_id, blen, &slen, compiler_log);
+#else
+		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
+#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
+		gf_free (compiler_log);
+		return 0;
+	}
+	return 1;
+}
+#endif // VOUT_USE_OPENGL
+
+
+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);
+	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;
+		if (!strncmp(evt.caption.caption, "./", 2)) evt.caption.caption += 2;
+		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	}
+}
+
+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;
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+
+	//if we have a pending packet, draw it now
+	if (ctx->last_pck) {
+		vout_draw_frame(ctx);
+		gf_filter_pck_unref(ctx->last_pck);
+		ctx->last_pck = NULL;
+	}
+
+
+	if (is_remove) {
+		assert(ctx->pid==pid);
+		ctx->pid=NULL;
+		return GF_OK;
+	}
+	assert(!ctx->pid || (ctx->pid==pid));
+	if (!gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	w = h = pfmt = timescale = stride = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) timescale = p->value.uint;
+
+	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_PIXFMT);
+	if (p) pfmt = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+	if (p) ctx->fps = p->value.frac;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE_UV);
+	stride_uv = p ? p->value.uint : 0;
+
+	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;
+
+	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;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_RAWGRAB);
+	ctx->raw_grab = (p && p->value.boolean) ? GF_TRUE : GF_FALSE;
+
+	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;
+		gf_filter_pid_send_event(pid, &fevt);
+
+		gf_filter_pid_init_play_event(pid, &fevt, ctx->start, ctx->speed, "VideoOut");
+		if (ctx->dur.num && ctx->dur.den) {
+			fevt.play.end_range = ((Double)ctx->dur.num) / ctx->dur.den;
+			fevt.play.end_range += fevt.play.start_range;
+		}
+		gf_filter_pid_send_event(pid, &fevt);
+
+		ctx->start = fevt.play.start_range;
+		if ((ctx->speed<0) && (fevt.play.speed>=0))
+			ctx->speed = fevt.play.speed;
+
+		ctx->pid = pid;
+	}
+	vout_set_caption(ctx);
+
+	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+=1;
+	}
+	if (!timescale) timescale = 1;
+	ctx->timescale = timescale;
+
+	//pid not yet ready
+	if (!pfmt || !w || !h) return GF_OK;
+
+	if ((ctx->width==w) && (ctx->height == h) && (ctx->pfmt == pfmt) ) return GF_OK;
+
+	dw = w;
+	dh = h;
+	if (ctx->sar.den != ctx->sar.num) {
+		dw = dw * ctx->sar.num / ctx->sar.den;
+	}
+	if (ctx->wsize.x==0) ctx->wsize.x = w;
+	if (ctx->wsize.y==0) ctx->wsize.y = h;
+	if ((ctx->wsize.x>0) && (ctx->wsize.y>0)) {
+		dw = ctx->wsize.x;
+		dh = ctx->wsize.y;
+	}
+	//in 2D mode we need to send a setup event to resize backbuffer to the video source wsize
+	if (ctx->disp>=MODE_2D) {
+		dw = w;
+		dh = h;
+		if (ctx->sar.den != ctx->sar.num) {
+			dw = dw * ctx->sar.num / ctx->sar.den;
+		}
+	}
+
+	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);
+		}
+	} 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;
+	}
+	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;
+	} else if ((ctx->wpos.x!=-1) && (ctx->wpos.y!=-1)) {
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_MOVE;
+		evt.move.relative = 0;
+		evt.move.x = ctx->wpos.x;
+		evt.move.y = ctx->wpos.y;
+		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	}
+
+	ctx->timescale = timescale;
+	ctx->width = w;
+	ctx->height = h;
+	ctx->pfmt = pfmt;
+	ctx->uv_w = ctx->uv_h = 0;
+	ctx->uv_stride = stride_uv;
+	ctx->bit_depth = 0;
+	ctx->has_alpha = GF_FALSE;
+
+	if (!stride) {
+		gf_pixel_get_size_info(ctx->pfmt, w, h, NULL, &stride, &ctx->uv_stride, NULL, &ctx->uv_h);
+	}
+	ctx->stride = stride ? stride : w;
+	if (ctx->dump_buffer) {
+		gf_free(ctx->dump_buffer);
+		ctx->dump_buffer = NULL;
+	}
+
+	hw = ctx->width/2;
+	if (ctx->width %2) hw++;
+	hh = ctx->height/2;
+	if (ctx->height %2) hh++;
+
+	ctx->is_yuv = GF_FALSE;
+	switch (ctx->pfmt) {
+	case GF_PIXEL_YUV444_10:
+		ctx->bit_depth = 10;
+	case GF_PIXEL_YUV444:
+		ctx->uv_w = ctx->width;
+		ctx->uv_h = ctx->height;
+		ctx->uv_stride = ctx->stride;
+		ctx->is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_YUV422_10:
+		ctx->bit_depth = 10;
+	case GF_PIXEL_YUV422:
+		ctx->uv_w = ctx->width/2;
+		ctx->uv_h = ctx->height;
+		ctx->uv_stride = ctx->stride/2;
+		ctx->is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_YUV_10:
+		ctx->bit_depth = 10;
+	case GF_PIXEL_YUV:
+		ctx->uv_w = ctx->width/2;
+		if (ctx->width % 2) ctx->uv_w++;
+		ctx->uv_h = ctx->height/2;
+		if (ctx->height % 2) ctx->uv_h++;
+		if (!ctx->uv_stride) {
+			ctx->uv_stride = ctx->stride/2;
+			if (ctx->stride%2) ctx->uv_stride ++;
+		}
+		ctx->is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		ctx->bit_depth = 10;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		ctx->uv_w = ctx->width/2;
+		ctx->uv_h = ctx->height/2;
+		ctx->uv_stride = ctx->stride;
+		ctx->is_yuv = GF_TRUE;
+		break;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_VYUY:
+		ctx->uv_w = ctx->width/2;
+		ctx->uv_h = ctx->height;
+		if (!ctx->uv_stride) {
+			ctx->uv_stride = ctx->stride/2;
+			if (ctx->stride%2) ctx->uv_stride ++;
+		}
+		ctx->is_yuv = GF_TRUE;
+		break;
+
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_RGBA:
+		ctx->has_alpha = GF_TRUE;
+		break;
+	case GF_PIXEL_GREYSCALE:
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+		break;
+
+	case 0:
+		//not yet set, happens with some decoders/stream settings - wait until first frame is available and PF is known
+		return GF_OK;
+	default:
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[VideoOut] Pixel format %s unknown\n", gf_4cc_to_str(ctx->pfmt)));
+		return GF_OK;
+	}
+
+#ifdef VOUT_USE_OPENGL
+	if (ctx->disp<MODE_2D) {
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SET_GL;
+		ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+	}
+	
+	DEL_SHADER(ctx->vertex_shader);
+	DEL_SHADER(ctx->fragment_shader);
+	DEL_PROGRAM(ctx->glsl_program );
+	gf_gl_txw_reset(&ctx->tx);
+
+	if (ctx->disp<MODE_2D) {
+		char *frag_shader_src = NULL;
+		GF_Matrix mx;
+		Float ft_hw, ft_hh;
+
+		ctx->glsl_program = glCreateProgram();
+		ctx->vertex_shader = glCreateShader(GL_VERTEX_SHADER);
+		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_dynstrcat(&frag_shader_src, "#version 120\n", NULL);
+
+		gf_gl_txw_insert_fragment_shader(ctx->tx.pix_fmt, "maintx", &frag_shader_src);
+		gf_dynstrcat(&frag_shader_src, "varying vec2 TexCoord;\n"
+										"void main(void) {\n"
+										"gl_FragColor = maintx_sample(TexCoord.st);\n"
+										"}"
+								, NULL);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] Fragment shader is %s\n", frag_shader_src));
+
+		vout_compile_shader(ctx->fragment_shader, "fragment", frag_shader_src);
+		gf_free(frag_shader_src);
+
+		glAttachShader(ctx->glsl_program, ctx->vertex_shader);
+		glAttachShader(ctx->glsl_program, ctx->fragment_shader);
+		glLinkProgram(ctx->glsl_program);
+
+#ifdef WIN32
+		if (glMapBuffer == NULL) {
+			if (ctx->disp == MODE_GL_PBO) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[VideoOut] GL PixelBufferObject extensions not found, fallback to regular GL\n"));
+				ctx->disp = MODE_GL;
+			}
+		}
+#endif
+
+		glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+		glViewport(0, 0, ctx->width, ctx->height);
+
+		gf_mx_init(mx);
+		ft_hw = ((Float)ctx->width)/2;
+		ft_hh = ((Float)ctx->height)/2;
+		gf_mx_ortho(&mx, -ft_hw, ft_hw, -ft_hh, ft_hh, 50, -50);
+		glMatrixMode(GL_PROJECTION);
+		glLoadMatrixf(mx.m);
+
+		glMatrixMode(GL_MODELVIEW);
+		glLoadIdentity();
+
+		glClear(GL_DEPTH_BUFFER_BIT);
+		glDisable(GL_NORMALIZE);
+		glDisable(GL_DEPTH_TEST);
+		glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+		glDisable(GL_LINE_SMOOTH);
+		glDisable(GL_LINE_SMOOTH);
+		glDisable(GL_LIGHTING);
+		glDisable(GL_CULL_FACE);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		if (ctx->has_alpha) {
+			glEnable(GL_BLEND);
+		} else {
+			glDisable(GL_BLEND);
+		}
+	} else
+#endif //VOUT_USE_OPENGL
+	{
+		switch (ctx->pfmt) {
+		case GF_PIXEL_NV12:
+		case GF_PIXEL_NV21:
+		case GF_PIXEL_NV12_10:
+		case GF_PIXEL_NV21_10:
+			ctx->num_textures = 2;
+			break;
+		case GF_PIXEL_UYVY:
+		case GF_PIXEL_VYUY:
+		case GF_PIXEL_YVYU:
+		case GF_PIXEL_YUYV:
+			ctx->num_textures = 1;
+			break;
+		default:
+			if (ctx->is_yuv) {
+				ctx->num_textures = 3;
+			} else {
+				ctx->num_textures = 1;
+			}
+			break;
+		}
+	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[VideoOut] Reconfig input wsize %d x %d, %d textures\n", ctx->width, ctx->height, ctx->num_textures));
+	return GF_OK;
+}
+
+static Bool vout_on_event(void *cbk, GF_Event *evt)
+{
+	GF_FilterEvent fevt;
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) cbk;
+
+	fevt.base.type = 0;
+	switch (evt->type) {
+	case GF_EVENT_SIZE:
+		if ((ctx->display_width != evt->size.width) || (ctx->display_height != evt->size.height)) {
+			ctx->display_width = evt->size.width;
+			ctx->display_height = evt->size.height;
+			ctx->display_changed = GF_TRUE;
+		}
+		break;
+	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:
+	case GF_EVENT_KEYUP:
+	case GF_EVENT_KEYDOWN:
+	case GF_EVENT_LONGKEYPRESS:
+	case GF_EVENT_TEXTINPUT:
+
+		GF_FEVT_INIT(fevt, GF_FEVT_USER, ctx->pid);
+		fevt.user_event.event = *evt;
+		break;
+	}
+	if (gf_filter_ui_event(ctx->filter, evt))
+		return GF_TRUE;
+
+	if (fevt.base.type)
+	 	gf_filter_pid_send_event(ctx->pid, &fevt);
+
+	 return GF_TRUE;
+}
+
+static GF_Err vout_initialize(GF_Filter *filter)
+{
+	const char *sOpt;
+	void *os_wnd_handler, *os_disp_handler;
+	u32 init_flags;
+	GF_Err e;
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+
+	ctx->filter = filter;
+
+	ctx->video_out = (GF_VideoOutput *) gf_module_load(GF_VIDEO_OUTPUT_INTERFACE, ctx->drv);
+
+
+	if (ctx->dumpframes.nb_items) {
+		ctx->hide = GF_TRUE;
+		ctx->vsync = GF_FALSE;
+	}
+
+	/*if not init we run with a NULL audio compositor*/
+	if (!ctx->video_out) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] No output modules found, cannot load video output\n"));
+		return GF_IO_ERR;
+	}
+	if (!gf_opts_get_key("core", "video-output")) {
+		gf_opts_set_key("core", "video-output", ctx->video_out->module_name);
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] Setting up video module %s\n", ctx->video_out->module_name));
+	ctx->video_out->on_event = vout_on_event;
+	ctx->video_out->evt_cbk_hdl = ctx;
+
+	os_wnd_handler = os_disp_handler = NULL;
+	init_flags = 0;
+	sOpt = gf_opts_get_key("Temp", "OSWnd");
+	if (sOpt) sscanf(sOpt, "%p", &os_wnd_handler);
+	sOpt = gf_opts_get_key("Temp", "OSDisp");
+	if (sOpt) sscanf(sOpt, "%p", &os_disp_handler);
+	sOpt = gf_opts_get_key("Temp", "InitFlags");
+	if (sOpt) sscanf(sOpt, "%d", &init_flags);
+
+	if (ctx->hide)
+		init_flags |= GF_TERM_INIT_HIDE;
+
+	e = ctx->video_out->Setup(ctx->video_out, os_wnd_handler, os_disp_handler, init_flags);
+	if (e!=GF_OK) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("Failed to Setup Video Driver %s!\n", ctx->video_out->module_name));
+		gf_modules_close_interface((GF_BaseInterface *)ctx->video_out);
+		ctx->video_out = NULL;
+		return e;
+	}
+
+	if ( !(ctx->video_out->hw_caps & GF_VIDEO_HW_OPENGL)
+#ifndef VOUT_USE_OPENGL
+	|| (1)
+#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));
+			ctx->disp = MODE_2D;
+		}
+	}
+#ifdef VOUT_USE_OPENGL
+	if (ctx->disp <= MODE_GL_PBO) {
+		GF_Event evt;
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_VIDEO_SETUP;
+		evt.setup.width = 320;
+		evt.setup.height = 240;
+		evt.setup.use_opengl = GF_TRUE;
+		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();
+		}
+		gf_filter_register_opengl_provider(filter, GF_TRUE);
+	}
+#endif
+
+	return GF_OK;
+}
+
+static void vout_finalize(GF_Filter *filter)
+{
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+
+	if (ctx->last_pck) {
+		gf_filter_pck_unref(ctx->last_pck);
+		ctx->last_pck = NULL;
+	}
+
+	if ((ctx->nb_frames==1) || (ctx->hold<0)) {
+		u32 holdms = (u32) (((ctx->hold>0) ? ctx->hold : -ctx->hold) * 1000);
+		gf_sleep(holdms);
+	}
+
+#ifdef VOUT_USE_OPENGL
+	DEL_SHADER(ctx->vertex_shader);
+	DEL_SHADER(ctx->fragment_shader);
+	DEL_PROGRAM(ctx->glsl_program );
+	gf_gl_txw_reset(&ctx->tx);
+#endif //VOUT_USE_OPENGL
+
+	/*stop and shutdown*/
+	if (ctx->video_out) {
+		ctx->video_out->Shutdown(ctx->video_out);
+		gf_modules_close_interface((GF_BaseInterface *)ctx->video_out);
+		ctx->video_out = NULL;
+	}
+	if (ctx->dump_buffer) gf_free(ctx->dump_buffer);
+
+}
+
+#ifdef VOUT_USE_OPENGL
+
+static void vout_draw_gl_quad(GF_VideoOutCtx *ctx, Bool flip_texture)
+{
+	Float dw, dh;
+
+	gf_gl_txw_bind(&ctx->tx, "maintx", ctx->glsl_program, 0);
+
+	dw = ((Float)ctx->dw) / 2;
+	dh = ((Float)ctx->dh) / 2;
+
+
+	GLfloat squareVertices[] = {
+		dw, dh,
+		dw, -dh,
+		-dw,  -dh,
+		-dw,  dh,
+	};
+
+	GLfloat textureVertices[] = {
+		1.0f, 0.0f,
+		1.0f, 1.0f,
+		0.0f,  1.0f,
+		0.0f,  0.0f,
+	};
+
+	if (flip_texture) {
+		textureVertices[1] = textureVertices[7] = 1.0f;
+		textureVertices[3] = textureVertices[5] = 0.0f;
+	}
+
+	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);
+
+			glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Failed to gfTexCoord uniform in shader\n"));
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Failed to gfVertex uniform in shader\n"));
+	}
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(TEXTURE_TYPE, 0);
+	glDisable(TEXTURE_TYPE);
+
+	glUseProgram(0);
+
+	if (ctx->dump_f_idx) {
+		FILE *fout;
+		char szFileName[1024];
+		if (strchr(gf_file_basename(ctx->out), '.')) {
+			snprintf(szFileName, 1024, "%s", ctx->out);
+		} else {
+			snprintf(szFileName, 1024, "%s_%d.rgb", ctx->out, ctx->dump_f_idx);
+		}
+		if (!ctx->dump_buffer)
+			ctx->dump_buffer = gf_malloc(sizeof(char)*ctx->display_width*ctx->display_height*3);
+
+		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");
+		if (fout) {
+			gf_fwrite(ctx->dump_buffer, ctx->display_width*ctx->display_height*3, fout);
+			gf_fclose(fout);
+		} else {
+			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)
+{
+	if (ctx->tx.internal_textures) {
+		glDeleteTextures(ctx->tx.nb_textures, ctx->tx.textures);
+		ctx->tx.internal_textures = GF_FALSE;
+	}
+	ctx->tx.frame_ifce = hwf;
+	gf_gl_txw_bind(&ctx->tx, "maintx", ctx->glsl_program, 0);
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	//and draw
+	vout_draw_gl_quad(ctx, ctx->tx.flip ? GF_TRUE : GF_FALSE);
+	GL_CHECK_ERR()
+}
+
+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);
+
+	if (ctx->display_changed) {
+		//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);
+			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 *= ctx->sar.den;
+			ctx->dh /= ctx->sar.num;
+			ctx->dw = (Float) ctx->display_width;
+			ctx->ow = (Float) 0;
+			ctx->oh = (Float) (ctx->display_height - ctx->dh ) / 2;
+		}
+		if (ctx->dump_buffer) {
+			gf_free(ctx->dump_buffer);
+			ctx->dump_buffer = NULL;
+		}
+
+		ctx->display_changed = GF_FALSE;
+	}
+
+
+	frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	if (frame_ifce && (frame_ifce->flags & GF_FRAME_IFCE_MAIN_GLFB)) {
+		ctx->video_out->Flush(ctx->video_out, NULL);
+		return;
+	}
+
+	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;
+	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 10, -5);
+	glMatrixMode(GL_PROJECTION);
+	glLoadMatrixf(mx.m);
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	if (ctx->has_alpha) {
+		Float r, g, b;
+		r = GF_COL_R(ctx->back); r /= 255;
+		g = GF_COL_G(ctx->back); g /= 255;
+		b = GF_COL_B(ctx->back); b /= 255;
+		glClearColor(r, g, b, 1.0);
+	} else {
+		glClearColor(0, 0, 0, 1.0);
+	}
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	//we are not sure if we are the only ones using the gl context, reset our defaults
+	glDisable(GL_LIGHTING);
+	glDisable(GL_CULL_FACE);
+	glDisable(GL_DEPTH_TEST);
+	if (ctx->has_alpha) {
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		glEnable(GL_BLEND);
+	} else {
+		glDisable(GL_BLEND);
+	}
+	if (ctx->has_alpha) {
+		Float r, g, b;
+		r = GF_COL_R(ctx->back); r /= 255;
+		g = GF_COL_G(ctx->back); g /= 255;
+		b = GF_COL_B(ctx->back); b /= 255;
+		glClearColor(r, g, b, 1.0);
+		glClear(GL_COLOR_BUFFER_BIT);
+	}
+
+	glUseProgram(ctx->glsl_program);
+
+	if (frame_ifce && frame_ifce->get_gl_texture) {
+		vout_draw_gl_hw_textures(ctx, frame_ifce);
+		return;
+	}
+
+	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);
+}
+#endif
+
+void vout_draw_2d(GF_VideoOutCtx *ctx, GF_FilterPacket *pck)
+{
+	char *data;
+	u32 wsize;
+	GF_Err e;
+	GF_VideoSurface src_surf;
+	GF_Window dst_wnd, src_wnd;
+
+	memset(&src_surf, 0, sizeof(GF_VideoSurface));
+	src_surf.width = ctx->width;
+	src_surf.height = ctx->height;
+	src_surf.pitch_x = 0;
+	src_surf.pitch_y = ctx->stride;
+	src_surf.pixel_format = ctx->pfmt;
+	src_surf.global_alpha = 0xFF;
+
+	data = (char *) gf_filter_pck_get_data(pck, &wsize);
+	if (!data) {
+		u32 stride_luma;
+		u32 stride_chroma;
+		GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+		if (frame_ifce->flags & GF_FRAME_IFCE_BLOCKING)
+			ctx->force_release = GF_TRUE;
+		if (! frame_ifce->get_plane) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Hardware GL texture blit not supported with non-GL blitter\n"));
+			return;
+		}
+		e = frame_ifce->get_plane(frame_ifce, 0, (const u8 **) &src_surf.video_buffer, &stride_luma);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error fetching chroma plane from hardware frame\n"));
+			return;
+		}
+		if (ctx->is_yuv && (ctx->num_textures>1)) {
+			e = frame_ifce->get_plane(frame_ifce, 1, (const u8 **) &src_surf.u_ptr, &stride_chroma);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error fetching luma U plane from hardware frame\n"));
+				return;
+			}
+			if ((ctx->pfmt!= GF_PIXEL_NV12) && (ctx->pfmt!= GF_PIXEL_NV21)) {
+				e = frame_ifce->get_plane(frame_ifce, 2, (const u8 **) &src_surf.v_ptr, &stride_chroma);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error fetching luma V plane from hardware frame\n"));
+					return;
+				}
+			}
+		}
+	} else {
+		src_surf.video_buffer = data;
+	}
+
+
+	if (ctx->display_changed) {
+		GF_Event evt;
+
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_VIDEO_SETUP;
+		evt.setup.back_buffer = 1;
+		evt.setup.width = ctx->display_width;
+		evt.setup.height = ctx->display_height;
+		e = ctx->video_out->ProcessEvent(ctx->video_out, &evt);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error resizing 2D backbuffer %s\n", gf_error_to_string(e) ));
+		}
+		//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->sar.num / ctx->height / 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->sar.den / ctx->width / ctx->sar.num);
+			ctx->dw = (Float) ctx->display_width;
+			ctx->ow = (Float) 0;
+			ctx->oh = (Float) (ctx->display_height - ctx->dh ) / 2;
+		}
+		ctx->display_changed = GF_FALSE;
+	}
+
+	dst_wnd.x = (u32) ctx->ow;
+	dst_wnd.y = (u32) ctx->oh;
+	dst_wnd.w = (u32) ctx->dw;
+	dst_wnd.h = (u32) ctx->dh;
+	e = GF_EOS;
+
+	src_wnd.x = src_wnd.y = 0;
+	src_wnd.w = ctx->width;
+	src_wnd.h = ctx->height;
+
+	if ((ctx->disp!=MODE_2D_SOFT) && ctx->video_out->Blit) {
+		e = ctx->video_out->Blit(ctx->video_out, &src_surf, &src_wnd, &dst_wnd, 0);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error bliting surface %s - retrying in software mode\n", gf_error_to_string(e) ));
+		}
+	}
+	if (e) {
+		GF_VideoSurface backbuffer;
+
+		e = ctx->video_out->LockBackBuffer(ctx->video_out, &backbuffer, GF_TRUE);
+		if (!e) {
+			gf_stretch_bits(&backbuffer, &src_surf, &dst_wnd, &src_wnd, 0xFF, GF_FALSE, NULL, NULL);
+			ctx->video_out->LockBackBuffer(ctx->video_out, &backbuffer, GF_FALSE);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Cannot lock back buffer - Error %s\n", gf_error_to_string(e) ));
+		}
+	}
+
+	if (e != GF_OK)
+		return;
+
+
+	if (ctx->dump_f_idx) {
+		char szFileName[1024];
+		GF_VideoSurface backbuffer;
+
+		e = ctx->video_out->LockBackBuffer(ctx->video_out, &backbuffer, GF_TRUE);
+		if (!e) {
+			FILE *fout;
+			const char *src_ext = strchr(gf_file_basename(ctx->out), '.');
+			const char *ext = gf_pixel_fmt_sname(backbuffer.pixel_format);
+			if (!ext) ext = "rgb";
+
+			if (src_ext && !strcmp(ext, src_ext+1)) {
+				snprintf(szFileName, 1024, "%s", ctx->out);
+			} else {
+				snprintf(szFileName, 1024, "%s_%d.%s", ctx->out, ctx->dump_f_idx, ext);
+			}
+			fout = gf_fopen(szFileName, "wb");
+			if (fout) {
+				u32 i;
+				for (i=0; i<backbuffer.height; i++) {
+					gf_fwrite(backbuffer.video_buffer + i*backbuffer.pitch_y, backbuffer.pitch_y, fout);
+				}
+				gf_fclose(fout);
+			} else {
+				e = GF_IO_ERR;
+			}
+			ctx->video_out->LockBackBuffer(ctx->video_out, &backbuffer, GF_FALSE);
+		}
+
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error writing frame %d buffer to %s: %s\n", ctx->nb_frames, szFileName, gf_error_to_string(e) ));
+		}
+	}
+
+	dst_wnd.x = 0;
+	dst_wnd.y = 0;
+	dst_wnd.w = ctx->display_width;
+	dst_wnd.h = ctx->display_height;
+	e = ctx->video_out->Flush(ctx->video_out, &dst_wnd);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] Error flushing vido output %s%s\n", gf_error_to_string(e)));
+		return;
+	}
+}
+
+static GF_Err vout_process(GF_Filter *filter)
+{
+	GF_FilterPacket *pck;
+	GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+
+	ctx->video_out->ProcessEvent(ctx->video_out, NULL);
+
+	pck = gf_filter_pid_get_packet(ctx->pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->pid)) {
+			if (!ctx->aborted) {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->pid);
+				gf_filter_pid_send_event(ctx->pid, &evt);
+
+				ctx->aborted = GF_TRUE;
+			}
+		}
+		if (ctx->aborted) {
+			if (ctx->last_pck) {
+				gf_filter_pck_unref(ctx->last_pck);
+				ctx->last_pck = NULL;
+			}
+			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;
+				return GF_OK;
+			}
+			//fallthrough
+		}
+		//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;
+			return GF_OK;
+		}
+		return ctx->aborted ? GF_EOS : GF_OK;
+	}
+	
+	if (!ctx->width || !ctx->height) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[VideoOut] pid display wsize unknown, discarding packet\n"));
+		gf_filter_pid_drop_packet(ctx->pid);
+		return GF_OK;
+	}
+
+	if (ctx->dumpframes.nb_items) {
+		u32 i;
+
+		ctx->nb_frames++;
+		ctx->dump_f_idx = 0;
+
+		for (i=0; i<ctx->dumpframes.nb_items; i++) {
+			if (ctx->dumpframes.vals[i] == 0) {
+				ctx->dump_f_idx = ctx->nb_frames;
+				break;
+			}
+			if (ctx->dumpframes.vals[i] == ctx->nb_frames) {
+				ctx->dump_f_idx = ctx->dumpframes.vals[i];
+				break;
+			}
+			if (ctx->dumpframes.vals[i] > ctx->nb_frames) {
+				break;
+			}
+		}
+
+		if (ctx->dump_f_idx) {
+			ctx->last_pck = pck;
+			vout_draw_frame(ctx);
+			ctx->last_pck = NULL;
+		}
+		gf_filter_pid_drop_packet(ctx->pid);
+
+		if (ctx->dumpframes.vals[ctx->dumpframes.nb_items-1] <= ctx->nb_frames) {
+			gf_filter_pid_set_discard(ctx->pid, GF_TRUE);
+		}
+		return GF_OK;
+	}
+
+	if (ctx->buffer) {
+		if (gf_filter_pck_is_blocking_ref(pck)) {
+			ctx->buffer_done = GF_TRUE;
+			ctx->buffer = 0;
+		} else {
+			//query full buffer duration in us
+			u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[VideoOut] buffer %d / %d ms\r", (u32) (dur/1000), ctx->buffer));
+			if (!ctx->buffer_done) {
+				if ((dur < ctx->buffer * 1000) && !gf_filter_pid_has_seen_eos(ctx->pid)) {
+					gf_filter_ask_rt_reschedule(filter, 100000);
+
+					if (gf_filter_reporting_enabled(filter)) {
+						char szStatus[1024];
+						sprintf(szStatus, "buffering %d / %d ms", (u32) (dur/1000), ctx->buffer);
+						gf_filter_update_status(filter, -1, szStatus);
+					}
+					return GF_OK;
+				}
+				ctx->buffer_done = GF_TRUE;
+			}
+		}
+	}
+
+	if (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();
+		Bool check_clock = GF_FALSE;
+		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)) {
+				GF_FilterEvent evt;
+				if (ctx->last_pck) {
+					gf_filter_pck_unref(ctx->last_pck);
+					ctx->last_pck = NULL;
+				}
+				ctx->aborted = GF_TRUE;
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->pid);
+				gf_filter_pid_send_event(ctx->pid, &evt);
+				gf_filter_pid_set_discard(ctx->pid, GF_TRUE);
+				return GF_EOS;
+			}
+		}
+
+		delay = ctx->pid_delay;
+		if (ctx->vdelay.den)
+			delay += ctx->vdelay.num * (s32)ctx->timescale / (s32)ctx->vdelay.den;
+
+		if (delay>=0) {
+			cts += delay;
+		} else if (cts < (u64) (-delay) ) {
+			if (ctx->vsync) {
+				if (ctx->last_pck) {
+					gf_filter_pck_unref(ctx->last_pck);
+					ctx->last_pck = NULL;
+				}
+				gf_filter_pid_drop_packet(ctx->pid);
+				return GF_OK;
+			}
+			cts = 0;
+		} else {
+			cts -= (u64) -delay;
+		}
+
+		//check if we have a clock hint from an audio output
+		gf_filter_get_clock_hint(filter, &clock_us, &media_ts);
+		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
+			s64 diff = now;
+			diff -= (s64) clock_us;
+			if (ctx->timescale!=1000000) {
+				diff *= ctx->timescale;
+				diff /= 1000000;
+			}
+			assert(diff>=0);
+			//ref stream hypothetical timestamp at now
+			ref_ts += diff;
+			ctx->first_cts_plus_one = cts + 1;
+
+			//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)) {
+				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) );
+				//not ready yet
+				return GF_OK;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms frame CTS "LLU" latest reference clock CTS "LLU" (%g sec)\n", gf_sys_clock(), cts, ref_ts, ((Double)media_ts.num)/media_ts.den));
+			ref_clock = ref_ts;
+			check_clock = GF_TRUE;
+		} else if (!ctx->first_cts_plus_one) {
+			//init clock on second frame, first frame likely will have large rendering time
+			//due to GPU config. While this is not important for recorded media, it may impact
+			//monitoring of live source (webcams) by consuming frame really late which may
+			//block source sampling when blocking mode is enabled
+
+			//store first frame TS
+			if (!ctx->clock_at_first_cts) {
+				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;
+				//diff less than 100ms (eg 10fps or more), init on the second frame
+				if (diff<100) {
+					ctx->first_cts_plus_one = 1 + cts;
+					ctx->clock_at_first_cts = now;
+				}
+				//otherwise (low frame rate), init on the first frame
+				else {
+					ctx->first_cts_plus_one = ctx->clock_at_first_cts /* - 1 + 1*/;
+					ctx->clock_at_first_cts = ctx->last_frame_clock;
+					check_clock = GF_TRUE;
+				}
+			}
+			ref_clock = cts;
+		} else {
+			check_clock = GF_TRUE;
+		}
+
+		if (check_clock) {
+			s64 diff;
+			if (ctx->speed>=0) {
+				if (cts < ctx->first_cts_plus_one) cts = ctx->first_cts_plus_one;
+				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);
+				else
+					diff -= (s64) (cts - ctx->first_cts_plus_one + 1);
+
+			} else {
+				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);
+				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;
+				gf_filter_ask_rt_reschedule(filter, (u32) (-diff));
+
+				if (ctx->display_changed) goto draw_frame;
+				//not ready yet
+				return GF_OK;
+			}
+			if (ABS(diff)>2000) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms frame cts "LLU"/%d is "LLD" us too %s\n", gf_sys_clock(), cts, ctx->timescale, diff<0 ? -diff : diff, diff<0 ? "early" : "late"));
+			} else {
+				diff = 0;
+			}
+
+			if (ctx->timescale != 1000000)
+				ref_clock = diff * ctx->timescale / 1000000 + 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;
+		}
+		//detach packet from pid, so that we can query next cts
+		gf_filter_pck_ref(&pck);
+		gf_filter_pid_drop_packet(ctx->pid);
+
+		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){
+				u32 speed = (u32) ABS(ctx->speed);
+
+				ctx->nb_drawn++;
+				if (ctx->nb_drawn % speed) {
+					do_drop = GF_TRUE;
+				} else {
+					ctx->nb_drawn = 0;
+				}
+			}
+			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);
+				return GF_OK;
+			}
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms display frame cts "LLU"/%d  "LLU" ms\n", gf_sys_clock(), cts, ctx->timescale, (1000*cts)/ctx->timescale));
+	} else {
+		gf_filter_pck_ref(&pck);
+		gf_filter_pid_drop_packet(ctx->pid);
+
+#ifndef GPAC_DISABLE_LOG
+#ifdef VOUT_USE_OPENGL
+		u64 cts = gf_filter_pck_get_cts(pck);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[VideoOut] At %d ms display frame cts "LLU"/%d  "LLU" ms\n", gf_sys_clock(), cts, ctx->timescale, (1000*cts)/ctx->timescale));
+#endif
+#endif
+
+	}
+
+	if (ctx->last_pck)
+		gf_filter_pck_unref(ctx->last_pck);
+	ctx->last_pck = pck;
+	ctx->nb_frames++;
+
+
+draw_frame:
+
+	if (ctx->last_pck && gf_filter_reporting_enabled(filter)) {
+		char szStatus[1024];
+		u64 dur = gf_filter_pid_query_buffer_duration(ctx->pid, GF_FALSE);
+		Double fps = 0;
+		if (ctx->clock_at_first_frame) {
+			fps = ctx->nb_frames;
+			fps *= 1000000;
+			fps /= (1 + gf_sys_clock_high_res() - ctx->clock_at_first_cts);
+		} else {
+			ctx->clock_at_first_frame = gf_sys_clock_high_res();
+		}
+		sprintf(szStatus, "%dx%d->%dx%d %s frame TS "LLU"/%d buffer %d / %d ms %02.02f FPS", ctx->width, ctx->height, ctx->display_width, ctx->display_height,
+		 	gf_pixel_fmt_name(ctx->pfmt), gf_filter_pck_get_cts(ctx->last_pck), ctx->timescale, (u32) (dur/1000), ctx->buffer, fps);
+		gf_filter_update_status(filter, -1, szStatus);
+	}
+
+	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) {
+#ifdef VOUT_USE_OPENGL
+		if (ctx->disp < MODE_2D) {
+			gf_rmt_begin_gl(vout_draw_gl);
+			glGetError();
+			vout_draw_gl(ctx, ctx->last_pck);
+			gf_rmt_end_gl();
+			glGetError();
+		} else
+#endif
+		{
+			vout_draw_2d(ctx, ctx->last_pck);
+		}
+	}
+	if (ctx->no_buffering)
+		ctx->force_release = GF_TRUE;
+	else if (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) {
+		gf_filter_pck_unref(ctx->last_pck);
+		ctx->last_pck = NULL;
+	}
+	//remember the clock right after the flush (in case of vsync)
+	ctx->last_frame_clock = gf_sys_clock_high_res();
+
+	//note we don't ask RT reschedule in frame duration, we take the decision on postponing the next frame in the next process call
+	return GF_OK;
+}
+
+static Bool vout_process_event(GF_Filter *filter, const GF_FilterEvent *fevt)
+{
+	if (fevt->base.type==GF_FEVT_INFO_UPDATE) {
+		GF_VideoOutCtx *ctx = (GF_VideoOutCtx *) gf_filter_get_udta(filter);
+		vout_set_caption(ctx);
+		return GF_TRUE;
+	}
+	//cancel
+	return GF_TRUE;
+}
+
+#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(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(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(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(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},
+	{0}
+};
+
+static const GF_FilterCapability VideoOutCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+
+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"\
+	)
+	.private_size = sizeof(GF_VideoOutCtx),
+	.flags = GF_FS_REG_MAIN_THREAD,
+	.args = VideoOutArgs,
+	SETCAPS(VideoOutCaps),
+	.initialize = vout_initialize,
+	.finalize = vout_finalize,
+	.configure_pid = vout_configure_pid,
+	.process = vout_process,
+	.process_event = vout_process_event
+};
+
+const GF_FilterRegister *vout_register(GF_FilterSession *session)
+{
+	return &VideoOutRegister;
+}

gpac-1.0.0.tar.gz/src/filters/reframe_ac3.c Added

@@ -0,0 +1,608 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AC3 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>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} AC3Idx;
+
+#define AC3_FRAME_SIZE 1536
+
+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;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+
+	GF_AC3Header hdr;
+	u8 *ac3_buffer;
+	u32 ac3_buffer_size, ac3_buffer_alloc, resume_from;
+	u64 byte_offset;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	Bool is_eac3;
+	Bool (*ac3_parser_bs)(GF_BitStream*, GF_AC3Header*, Bool);
+
+	GF_FilterPacket *src_pck;
+
+	AC3Idx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_AC3DmxCtx;
+
+
+
+
+GF_Err ac3dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_AC3DmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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;
+
+	ctx->ac3_parser_bs = gf_ac3_parser_bs;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p && p->value.uint==GF_CODECID_EAC3) ctx->is_eac3 = GF_TRUE;
+	else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && p->value.string && strstr(p->value.string, "eac3")) ctx->is_eac3 = GF_TRUE;
+		else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+			if (p && p->value.string && strstr(p->value.string, "eac3")) ctx->is_eac3 = GF_TRUE;
+		}
+	}
+	if (ctx->is_eac3) {
+		ctx->ac3_parser_bs = gf_eac3_parser_bs;
+	}
+
+	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);
+	}
+	return GF_OK;
+}
+
+static void ac3dmx_check_dur(GF_Filter *filter, GF_AC3DmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	GF_AC3Header hdr;
+	u64 duration, cur_dur;
+	s32 sr = -1;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration = 0;
+	cur_dur = 0;
+	while (	ctx->ac3_parser_bs(bs, &hdr, GF_FALSE) ) {
+		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;
+		duration += AC3_FRAME_SIZE;
+		cur_dur += AC3_FRAME_SIZE;
+		if (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(AC3Idx)*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;
+		}
+
+		gf_bs_skip_bytes(bs, hdr.framesize);
+	}
+	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;
+	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;
+
+	//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(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));
+
+
+	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->sample_rate = ctx->hdr.sample_rate;
+
+	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) );
+
+	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_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 ac3dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_AC3DmxCtx *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->ac3_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->ac3_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 ac3dmx_update_cts(GF_AC3DmxCtx *ctx)
+{
+	if (ctx->timescale) {
+		u64 inc = AC3_FRAME_SIZE;
+		inc *= ctx->timescale;
+		inc /= ctx->sample_rate;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += AC3_FRAME_SIZE;
+	}
+}
+
+GF_Err ac3dmx_process(GF_Filter *filter)
+{
+	GF_AC3DmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *output;
+	u8 *start;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		ac3dmx_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->ac3_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->ac3_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->ac3_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->ac3_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->ac3_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->ac3_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->ac3_buffer_size + pck_size > ctx->ac3_buffer_alloc) {
+			ctx->ac3_buffer_alloc = ctx->ac3_buffer_size + pck_size;
+			ctx->ac3_buffer = gf_realloc(ctx->ac3_buffer, ctx->ac3_buffer_alloc);
+		}
+		memcpy(ctx->ac3_buffer + ctx->ac3_buffer_size, data, pck_size);
+		ctx->ac3_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->ac3_buffer_size;
+	start = ctx->ac3_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) {
+		u8 *sync;
+		Bool res;
+		u32 sync_pos, bytes_to_drop=0;
+
+
+		res = ctx->ac3_parser_bs(ctx->bs, &ctx->hdr, GF_TRUE);
+
+		sync_pos = (u32) gf_bs_get_position(ctx->bs);
+
+		//startcode not found or not enough bytes, gather more
+		if (!res || (remain < sync_pos + ctx->hdr.framesize))
+			break;
+
+		ac3dmx_check_pid(filter, ctx);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = 1 + ctx->ac3_buffer_size - remain;
+			return GF_OK;
+		}
+
+		if (sync_pos) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[AC3Dmx] %d bytes unrecovered before sync word\n", sync_pos));
+		}
+		sync = start + sync_pos;
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * ctx->hdr.sample_rate);
+			if (ctx->cts + AC3_FRAME_SIZE >= 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 = sync_pos + ctx->hdr.framesize;
+		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, ctx->hdr.framesize, &output);
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+
+			memcpy(output, sync, ctx->hdr.framesize);
+			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, AC3_FRAME_SIZE);
+			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 + ctx->hdr.framesize);
+			}
+
+			gf_filter_pck_send(dst_pck);
+		}
+		ac3dmx_update_cts(ctx);
+
+		//truncated last frame
+		if (bytes_to_drop>remain) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ADTSDmx] truncated AC3 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->ac3_buffer_size = 0;
+		return ac3dmx_process(filter);
+	} else {
+		if (remain) {
+			memmove(ctx->ac3_buffer, start, remain);
+		}
+		ctx->ac3_buffer_size = remain;
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	return GF_OK;
+}
+
+static void ac3dmx_finalize(GF_Filter *filter)
+{
+	GF_AC3DmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->ac3_buffer) gf_free(ctx->ac3_buffer);
+	if (ctx->indexes) gf_free(ctx->indexes);
+}
+
+static const char *ac3dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=0;
+	u32 pos=0;
+	while (1) {
+		GF_AC3Header ahdr;
+		if (! gf_ac3_parser((u8 *) data, size, &pos, &ahdr, GF_FALSE) )
+		 	break;
+		u32 fsize = ahdr.framesize;
+		if (pos) nb_frames=0;
+		nb_frames++;
+		if (fsize > size+pos) break;
+		if (nb_frames>4) break;
+		if (size < fsize+pos) break;
+		size -= fsize+pos;
+		data += fsize+pos;
+	}
+	if (nb_frames>2) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/ac3";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability AC3DmxCaps[] =
+{
+	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_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,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),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_AC3DmxCtx, _n)
+static const GF_FilterArgs AC3DmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister AC3DmxRegister = {
+	.name = "rfac3",
+	GF_FS_SET_DESCRIPTION("AC3 reframer")
+	GF_FS_SET_HELP("This filter parses AC3 and E-AC3 files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_AC3DmxCtx),
+	.args = AC3DmxArgs,
+	.finalize = ac3dmx_finalize,
+	SETCAPS(AC3DmxCaps),
+	.configure_pid = ac3dmx_configure_pid,
+	.process = ac3dmx_process,
+	.probe_data = ac3dmx_probe_data,
+	.process_event = ac3dmx_process_event
+};
+
+
+const GF_FilterRegister *ac3dmx_register(GF_FilterSession *session)
+{
+	return &AC3DmxRegister;
+}
+
+#else
+
+const GF_FilterRegister *ac3dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS

gpac-1.0.0.tar.gz/src/filters/reframe_adts.c Added

@@ -0,0 +1,909 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AAC ADTS 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>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+enum
+{
+	AAC_SIGNAL_NONE=0,
+	AAC_SIGNAL_IMPLICIT,
+	AAC_SIGNAL_EXPLICIT
+};
+
+typedef struct
+{
+	Bool is_mp2, no_crc;
+	u32 profile, sr_idx, nb_ch, frame_size, hdr_size;
+} ADTSHeader;
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} ADTSIdx;
+
+typedef struct
+{
+	//filter args
+	u32 frame_size;
+	Double index;
+	u32 sbr;
+	u32 ps;
+//	Bool mpeg4;
+	Bool ovsbr;
+	Bool expart;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//output pid for audio
+	GF_FilterPid *opid;
+
+	//video pid for cover art
+	GF_FilterPid *vpid;
+
+	GF_BitStream *bs;
+	u64 file_pos, cts;
+	u32 sr_idx, nb_ch, is_mp2, profile;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+
+	ADTSHeader hdr;
+	u32 dts_inc;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	GF_FilterPacket *src_pck;
+
+	ADTSIdx *indexes;
+	u32 index_alloc_size, index_size;
+
+	u8 *adts_buffer;
+	u32 adts_buffer_size, adts_buffer_alloc, resume_from;
+	u64 byte_offset;
+
+	u32 tag_size;
+	u8 *id3_buffer;
+	u32 id3_buffer_size, id3_buffer_alloc;
+	u32 nb_frames;
+} GF_ADTSDmxCtx;
+
+
+static Bool adts_dmx_sync_frame_bs(GF_BitStream *bs, ADTSHeader *hdr)
+{
+	u32 val;
+	u64 pos;
+
+	while (gf_bs_available(bs)>7) {
+		val = gf_bs_read_u8(bs);
+		if (val!=0xFF) continue;
+		val = gf_bs_read_int(bs, 4);
+		if (val != 0x0F) {
+			gf_bs_read_int(bs, 4);
+			continue;
+		}
+		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
+		gf_bs_read_int(bs, 2);
+		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
+		pos = gf_bs_get_position(bs) - 2;
+
+		hdr->profile = 1 + gf_bs_read_int(bs, 2);
+		hdr->sr_idx = gf_bs_read_int(bs, 4);
+		gf_bs_read_int(bs, 1);
+		hdr->nb_ch = gf_bs_read_int(bs, 3);
+		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);
+		hdr->hdr_size = 7;
+		if (!hdr->no_crc) {
+			gf_bs_read_u16(bs);
+			hdr->hdr_size = 9;
+		}
+		if (!GF_M4ASampleRates[hdr->sr_idx] || (hdr->frame_size < hdr->hdr_size)) {
+			gf_bs_seek(bs, pos+1);
+			continue;
+		}
+		hdr->frame_size -= hdr->hdr_size;
+
+		if (gf_bs_available(bs) == hdr->frame_size) {
+			return GF_TRUE;
+		}
+		if (gf_bs_available(bs) < hdr->frame_size) {
+			break;
+		}
+
+		gf_bs_skip_bytes(bs, hdr->frame_size);
+		val = gf_bs_read_u8(bs);
+		if (val!=0xFF) {
+			gf_bs_seek(bs, pos+1);
+			continue;
+		}
+		val = gf_bs_read_int(bs, 4);
+		if (val!=0x0F) {
+			gf_bs_read_int(bs, 4);
+			gf_bs_seek(bs, pos+1);
+			continue;
+		}
+		gf_bs_seek(bs, pos+hdr->hdr_size);
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+void id3dmx_flush(GF_Filter *filter, u8 *id3_buf, u32 id3_buf_size, GF_FilterPid *audio_pid, GF_FilterPid **video_pid_p);
+
+
+GF_Err adts_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_ADTSDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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);
+		//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
+	}
+
+	return GF_OK;
+}
+
+static void adts_dmx_check_dur(GF_Filter *filter, GF_ADTSDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	ADTSHeader hdr;
+	u64 duration, cur_dur;
+	s32 sr_idx = -1;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration = 0;
+	cur_dur = 0;
+	while (adts_dmx_sync_frame_bs(bs, &hdr)) {
+		if ((sr_idx>=0) && (sr_idx != hdr.sr_idx)) {
+			duration *= GF_M4ASampleRates[hdr.sr_idx];
+			duration /= GF_M4ASampleRates[sr_idx];
+
+			cur_dur *= GF_M4ASampleRates[hdr.sr_idx];
+			cur_dur /= GF_M4ASampleRates[sr_idx];
+		}
+		sr_idx = hdr.sr_idx;
+		duration += ctx->frame_size;
+		cur_dur += ctx->frame_size;
+		if (cur_dur > ctx->index * GF_M4ASampleRates[sr_idx]) {
+			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(ADTSIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = gf_bs_get_position(bs) - hdr.hdr_size;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= GF_M4ASampleRates[sr_idx];
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		gf_bs_skip_bytes(bs, hdr.frame_size);
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (sr_idx>=0) {
+		if (!ctx->duration.num || (ctx->duration.num  * GF_M4ASampleRates[sr_idx] != duration * ctx->duration.den)) {
+			ctx->duration.num = (s32) duration;
+			ctx->duration.den = GF_M4ASampleRates[sr_idx];
+
+			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;
+	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;
+	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;
+
+	//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_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) {
+		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;
+	ctx->profile = ctx->hdr.profile;
+
+	sr = GF_M4ASampleRates[ctx->hdr.sr_idx];
+	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->sr_idx = ctx->hdr.sr_idx;
+
+	/*keep MPEG-2 AAC codecid even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
+	codecid = ctx->hdr.is_mp2 ? ctx->hdr.profile+GF_CODECID_AAC_MPEG2_MP-1 : GF_CODECID_AAC_MPEG4;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(codecid) );
+
+	//force explicit SBR if explicit PS
+	if (ctx->ps==AAC_SIGNAL_EXPLICIT) {
+		ctx->sbr = AAC_SIGNAL_EXPLICIT;
+	}
+	/*no provision for explicit indication of MPEG-2 AAC through MPEG-4 PLs, so force implicit*/
+	if (ctx->hdr.is_mp2) {
+		if (ctx->sbr == AAC_SIGNAL_EXPLICIT) ctx->sbr = AAC_SIGNAL_IMPLICIT;
+		if (ctx->ps == AAC_SIGNAL_EXPLICIT) ctx->ps = AAC_SIGNAL_IMPLICIT;
+	}
+
+	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) {
+		for (i=0; i<16; i++) {
+			if (GF_M4ASampleRates[i] == (u32) 2*sr) {
+				sbr_sr_idx = i;
+				sbr_sr = 2*sr;
+				break;
+			}
+		}
+	}
+
+	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;
+
+		/*for better interop, always store using full SR when using explict signaling*/
+		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);
+		/*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);
+		}
+		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_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_SAMPLE_RATE, & PROP_UINT(sr));
+
+	timescale = sr;
+	if (ctx->ovsbr) timescale = 2*sr;
+
+	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->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;
+	}
+
+}
+
+static Bool adts_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_ADTSDmxCtx *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->nb_frames = 0;
+		ctx->id3_buffer_size = 0;
+
+		if (! ctx->is_file) {
+			if (evt->play.start_range || ctx->initial_play_done) {
+				ctx->adts_buffer_size = 0;
+				ctx->resume_from = 0;
+			}
+
+			ctx->initial_play_done = GF_TRUE;
+			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 * GF_M4ASampleRates[ctx->sr_idx]);
+					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->resume_from = 0;
+		ctx->adts_buffer_size = 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 adts_dmx_update_cts(GF_ADTSDmxCtx *ctx)
+{
+	assert(ctx->dts_inc);
+
+	if (ctx->timescale) {
+		u64 inc = ctx->dts_inc;
+		inc *= ctx->timescale;
+		inc /= GF_M4ASampleRates[ctx->sr_idx];
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->dts_inc;
+	}
+}
+
+GF_Err adts_dmx_process(GF_Filter *filter)
+{
+	GF_ADTSDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u8 *start;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		adts_dmx_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->adts_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->adts_buffer_size;
+	if (pck && !ctx->resume_from) {
+		data = (char *) 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->adts_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->adts_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->adts_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->adts_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->adts_buffer_size + pck_size > ctx->adts_buffer_alloc) {
+			ctx->adts_buffer_alloc = ctx->adts_buffer_size + pck_size;
+			ctx->adts_buffer = gf_realloc(ctx->adts_buffer, ctx->adts_buffer_alloc);
+		}
+		memcpy(ctx->adts_buffer + ctx->adts_buffer_size, data, pck_size);
+		ctx->adts_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->adts_buffer_size;
+	start = ctx->adts_buffer;
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from - 1;
+		remain -= ctx->resume_from - 1;
+		ctx->resume_from = 0;
+	}
+
+	while (remain) {
+		u8 *sync;
+		u32 sync_pos, size, offset, bytes_to_drop=0;
+
+		if (!ctx->tag_size && (remain>3)) {
+
+			/* Did we read an ID3v2 ? */
+			if (start[0] == 'I' && start[1] == 'D' && start[2] == '3') {
+				if (remain<10)
+					return GF_OK;
+
+				ctx->tag_size = ((start[9] & 0x7f) + ((start[8] & 0x7f) << 7) + ((start[7] & 0x7f) << 14) + ((start[6] & 0x7f) << 21));
+
+				bytes_to_drop = 10;
+				if (ctx->id3_buffer_alloc < ctx->tag_size+10) {
+					ctx->id3_buffer = gf_realloc(ctx->id3_buffer, ctx->tag_size+10);
+					ctx->id3_buffer_alloc = ctx->tag_size+10;
+				}
+				memcpy(ctx->id3_buffer, start, 10);
+				ctx->id3_buffer_size = 10;
+				goto drop_byte;
+			}
+		}
+		if (ctx->tag_size) {
+			if (ctx->tag_size>remain) {
+				bytes_to_drop = remain;
+				ctx->tag_size-=remain;
+			} else {
+				bytes_to_drop = ctx->tag_size;
+				ctx->tag_size = 0;
+			}
+			memcpy(ctx->id3_buffer + ctx->id3_buffer_size, start, bytes_to_drop);
+			ctx->id3_buffer_size += bytes_to_drop;
+
+			if (!ctx->tag_size && ctx->opid) {
+				id3dmx_flush(filter, ctx->id3_buffer, ctx->id3_buffer_size, ctx->opid, ctx->expart ? &ctx->vpid : NULL);
+				ctx->id3_buffer_size = 0;
+			}
+			goto drop_byte;
+
+		}
+
+		sync = memchr(start, 0xFF, remain);
+		sync_pos = (u32) (sync ? sync - start : remain);
+
+		//couldn't find sync byte in this packet
+		if (remain - sync_pos < 7) {
+			break;
+		}
+
+		//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"));
+			ctx->nb_frames = 0;
+			goto drop_byte;
+		}
+		if (!ctx->bs) {
+			ctx->bs = gf_bs_new(sync + 1, remain - sync_pos - 1, GF_BITSTREAM_READ);
+		} else {
+			gf_bs_reassign_buffer(ctx->bs, sync + 1, remain - sync_pos - 1);
+		}
+
+		//ok parse header
+		gf_bs_read_int(ctx->bs, 4);
+
+		ctx->hdr.is_mp2 = (Bool)gf_bs_read_int(ctx->bs, 1);
+		//if (ctx->mpeg4)
+		//we deprecate old MPEG-2 signaling for AAC in ISOBMFF, as it is not well supported anyway and we don't write adif_header as
+		//supposed to be for these types
+		ctx->hdr.is_mp2 = 0;
+
+		gf_bs_read_int(ctx->bs, 2);
+		ctx->hdr.no_crc = (Bool)gf_bs_read_int(ctx->bs, 1);
+
+		ctx->hdr.profile = 1 + gf_bs_read_int(ctx->bs, 2);
+		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);
+		ctx->hdr.hdr_size = 7;
+
+		if (!ctx->hdr.no_crc) {
+			ctx->hdr.hdr_size = 9;
+		}
+
+		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"));
+			ctx->nb_frames = 0;
+			goto drop_byte;
+		}
+
+		//ready to send packet
+		if (ctx->hdr.frame_size + 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"));
+				ctx->nb_frames = 0;
+				goto drop_byte;
+			}
+		}
+		//otherwise wait for next frame, unless if end of stream
+		else if (pck) {
+			if (ctx->timescale && !prev_pck_size &&  (cts != GF_FILTER_NO_TS) ) {
+				ctx->cts = cts;
+			}
+			break;
+		}
+
+		adts_dmx_check_pid(filter, ctx);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = 1 + ctx->adts_buffer_size - remain;
+			return GF_OK;
+		}
+
+		ctx->nb_frames++;
+		size = ctx->hdr.frame_size - ctx->hdr.hdr_size;
+		offset = ctx->hdr.hdr_size;
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * GF_M4ASampleRates[ctx->sr_idx]);
+			if (ctx->cts + ctx->dts_inc >= 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 = ctx->hdr.frame_size;
+		if (ctx->timescale && !prev_pck_size &&  (cts != GF_FILTER_NO_TS) ) {
+			ctx->cts = cts;
+			cts = GF_FILTER_NO_TS;
+		}
+
+		if (!ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			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);
+			gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+
+			if (ctx->byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, ctx->byte_offset + ctx->hdr.hdr_size);
+			}
+
+			gf_filter_pck_send(dst_pck);
+		}
+		adts_dmx_update_cts(ctx);
+
+
+		//truncated last frame
+		if (bytes_to_drop>remain) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ADTSDmx] truncated ADTS frame!\n"));
+			bytes_to_drop=remain;
+		}
+
+drop_byte:
+		if (!bytes_to_drop) {
+			bytes_to_drop = 1;
+		}
+		start += bytes_to_drop;
+		remain -= bytes_to_drop;
+
+		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->adts_buffer_size = 0;
+		return adts_dmx_process(filter);
+	} else {
+		if (remain) {
+			memmove(ctx->adts_buffer, start, remain);
+		}
+		ctx->adts_buffer_size = remain;
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	return GF_OK;
+}
+
+static void adts_dmx_finalize(GF_Filter *filter)
+{
+	GF_ADTSDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	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);
+}
+
+static const char *adts_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=0, next_pos=0, max_consecutive_frames=0;
+	ADTSHeader prev_hdr;
+	GF_BitStream *bs;
+	Bool has_id3=GF_FALSE;
+
+	/*check for id3*/
+	if (size>= 10) {
+		if (data[0] == 'I' && data[1] == 'D' && data[2] == '3') {
+			u32 tag_size = ((data[9] & 0x7f) + ((data[8] & 0x7f) << 7) + ((data[7] & 0x7f) << 14) + ((data[6] & 0x7f) << 21));
+
+			if (tag_size+10 > size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("ID3 tag detected size %d but probe data only %d bytes, will rely on file extension (try increasing probe size using --block_size)\n", tag_size+10, size));
+				*score = GF_FPROBE_EXT_MATCH;
+				return "aac|adts";
+			}
+			data += tag_size+10;
+			size -= tag_size+10;
+			has_id3 = GF_TRUE;
+		}
+	}
+
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	memset(&prev_hdr, 0, sizeof(ADTSHeader));
+	while (gf_bs_available(bs)) {
+		ADTSHeader hdr;
+		u32 pos;
+		hdr.frame_size = 0;
+		if (!adts_dmx_sync_frame_bs(bs, &hdr)) {
+			if (hdr.frame_size) {
+				//nb_frames++;
+				max_consecutive_frames++;
+			}
+			break;
+		}
+		if ((hdr.hdr_size!=7) && (hdr.hdr_size!=9)) 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) ) {
+			nb_frames++;
+			if (max_consecutive_frames<nb_frames) max_consecutive_frames = nb_frames;
+			if (max_consecutive_frames>5)
+				break;
+		} else {
+			nb_frames=1;
+		}
+		prev_hdr = hdr;
+		gf_bs_skip_bytes(bs, hdr.frame_size);
+		next_pos = (u32) gf_bs_get_position(bs);
+	}
+	gf_bs_del(bs);
+	if (max_consecutive_frames>=4) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/aac";
+	}
+	if (has_id3 && max_consecutive_frames) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "audio/aac";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability ADTSDmxCaps[] =
+{
+	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_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),
+	//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,GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG4),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_ADTSDmxCtx, _n)
+static const GF_FilterArgs ADTSDmxArgs[] =
+{
+	{ OFFS(frame_size), "size of AAC frame in audio samples", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ 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)"\
+				, 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)"\
+				, 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},
+	{0}
+};
+
+
+GF_FilterRegister ADTSDmxRegister = {
+	.name = "rfadts",
+	GF_FS_SET_DESCRIPTION("ADTS reframer")
+	GF_FS_SET_HELP("This filter parses AAC files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_ADTSDmxCtx),
+	.args = ADTSDmxArgs,
+	.finalize = adts_dmx_finalize,
+	SETCAPS(ADTSDmxCaps),
+	.configure_pid = adts_dmx_configure_pid,
+	.process = adts_dmx_process,
+	.probe_data = adts_dmx_probe_data,
+	.process_event = adts_dmx_process_event
+};
+
+
+const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session)
+{
+	return &ADTSDmxRegister;
+}
+
+#else
+const GF_FilterRegister *adts_dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS

gpac-1.0.0.tar.gz/src/filters/reframe_amr.c Added

@@ -0,0 +1,603 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AMR&EVRC&SMV 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/filters.h>
+#include <gpac/constants.h>
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} AMRIdx;
+
+typedef struct
+{
+	//filter args
+	Double index;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 start_offset;
+	u32 codecid, sample_rate, block_size;
+
+
+	u64 file_pos, cts;
+
+	u16 amr_mode_set;
+
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+	Bool is_playing;
+	Bool is_file;
+	Bool initial_play_done, file_loaded;
+	Bool skip_magic;
+
+	u32 hdr;
+	u32 resume_from;
+	u32 remaining;
+
+	AMRIdx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_AMRDmxCtx;
+
+
+
+
+GF_Err amrdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_AMRDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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;
+
+	ctx->start_offset = 6;
+	ctx->sample_rate = 8000;
+	ctx->block_size = 160;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) {
+		if (ctx->codecid && (ctx->codecid != p->value.uint)) {
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->codecid = p->value.uint;
+		if (ctx->codecid == GF_CODECID_AMR_WB) {
+			ctx->sample_rate = 16000;
+			ctx->block_size = 320;
+		}
+		ctx->skip_magic = GF_FALSE;
+		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_UNFRAMED, NULL);
+		}
+	}
+	return GF_OK;
+}
+
+static void amrdmx_check_dur(GF_Filter *filter, GF_AMRDmxCtx *ctx)
+{
+	FILE *stream;
+	u32 i;
+	u64 duration, cur_dur;
+	char magic[20];
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->codecid = GF_CODECID_NONE;
+	ctx->start_offset = 6;
+	ctx->sample_rate = 8000;
+	ctx->block_size = 160;
+	i = (u32) gf_fread(magic, 20, stream);
+	if (i != 20) return;
+
+	if (!strnicmp(magic, "#!AMR\n", 6)) {
+		gf_fseek(stream, 6, SEEK_SET);
+		ctx->codecid = GF_CODECID_AMR;
+	}
+	else if (!strnicmp(magic, "#!EVRC\n", 7)) {
+		gf_fseek(stream, 7, SEEK_SET);
+		ctx->start_offset = 7;
+		ctx->codecid = GF_CODECID_EVRC;
+	}
+	else if (!strnicmp(magic, "#!SMV\n", 6)) {
+		gf_fseek(stream, 6, SEEK_SET);
+		ctx->codecid = GF_CODECID_SMV;
+	}
+	else if (!strnicmp(magic, "#!AMR-WB\n", 9)) {
+		ctx->codecid = GF_CODECID_AMR_WB;
+		ctx->start_offset = 9;
+		ctx->sample_rate = 16000;
+		ctx->block_size = 320;
+		gf_fseek(stream, 9, SEEK_SET);
+	}
+	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) return;
+	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) return;
+	else return;
+
+	ctx->index_size = 0;
+
+	cur_dur = 0;
+	duration = 0;
+	while (!gf_feof(stream)) {
+		u32 size=0;
+		u64 pos;
+		u8 toc, ft;
+		toc = gf_fgetc(stream);
+
+		switch (ctx->codecid) {
+		case GF_CODECID_AMR:
+			ft = (toc >> 3) & 0x0F;
+			size = (u32)GF_AMR_FRAME_SIZE[ft];
+			break;
+		case GF_CODECID_AMR_WB:
+			ft = (toc >> 3) & 0x0F;
+			size = (u32)GF_AMR_WB_FRAME_SIZE[ft];
+			break;
+		default:
+			for (i=0; i<GF_SMV_EVRC_RATE_TO_SIZE_NB; i++) {
+				if (GF_SMV_EVRC_RATE_TO_SIZE[2*i]==toc) {
+					/*remove rate_type byte*/
+					size = (u32)GF_SMV_EVRC_RATE_TO_SIZE[2*i+1] - 1;
+					break;
+				}
+			}
+			break;
+		}
+		duration += ctx->block_size;
+		cur_dur += ctx->block_size;
+		pos = gf_ftell(stream);
+		if (cur_dur > ctx->index * ctx->sample_rate) {
+			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(AMRIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos - 1;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= ctx->sample_rate;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+		if (size) gf_fseek(stream, size, SEEK_CUR);
+	}
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->sample_rate != duration * ctx->duration.den)) {
+		ctx->duration.num = (u32) duration;
+		ctx->duration.den = ctx->sample_rate;
+
+		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;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+}
+
+static void amrdmx_check_pid(GF_Filter *filter, GF_AMRDmxCtx *ctx, u16 amr_mode_set)
+{
+	if (ctx->opid) {
+		if (ctx->amr_mode_set != amr_mode_set) {
+			ctx->amr_mode_set = amr_mode_set;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AMR_MODE_SET, & PROP_UINT( amr_mode_set));
+		}
+		return;
+	}
+
+	ctx->opid = gf_filter_pid_new(filter);
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+
+	amrdmx_check_dur(filter, ctx);
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(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(1) );
+	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(ctx->block_size ) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AMR_MODE_SET, & PROP_UINT(ctx->amr_mode_set));
+
+	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 amrdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_AMRDmxCtx *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->remaining = 0;
+		}
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		amrdmx_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) {
+				ctx->skip_magic = GF_TRUE;
+				return GF_TRUE;
+			}
+		}
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		if (!ctx->file_pos)
+			ctx->skip_magic = GF_TRUE;
+		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;
+		//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 amrdmx_update_cts(GF_AMRDmxCtx *ctx)
+{
+	if (ctx->timescale) {
+		u64 inc = ctx->block_size;
+		inc *= ctx->timescale;
+		inc /= ctx->sample_rate;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->block_size;
+	}
+}
+
+GF_Err amrdmx_process(GF_Filter *filter)
+{
+	GF_AMRDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u64 byte_offset;
+	u8 *data, *output;
+	u8 *start;
+	u32 pck_size, remain;
+
+	//update duration
+	amrdmx_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->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			assert(ctx->remaining == 0);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	start = data;
+	remain = pck_size;
+
+	//flush not previously dispatched data
+	if (ctx->remaining) {
+		u32 to_send = ctx->remaining;
+		if (ctx->remaining > pck_size) {
+			to_send = pck_size;
+			ctx->remaining -= pck_size;
+		} else {
+			ctx->remaining = 0;
+		}
+		if (! ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, to_send, &output);
+			memcpy(output, data, to_send);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, ctx->remaining ? GF_FALSE : GF_TRUE);
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
+			}
+			gf_filter_pck_send(dst_pck);
+		}
+
+		if (ctx->remaining) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		amrdmx_update_cts(ctx);
+		start += to_send;
+		remain -= to_send;
+	}
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale) {
+		u64 cts = gf_filter_pck_get_cts(pck);
+		if (cts != GF_FILTER_NO_TS)
+			ctx->cts = cts;
+	}
+	if (ctx->skip_magic) {
+
+		if (!strnicmp(start, "#!AMR\n", 6)) {
+			ctx->start_offset = 6;
+			ctx->codecid = GF_CODECID_AMR;
+		}
+		else if (!strnicmp(start, "#!EVRC\n", 7)) {
+			ctx->start_offset = 7;
+			ctx->codecid = GF_CODECID_EVRC;
+		}
+		else if (!strnicmp(start, "#!SMV\n", 6)) {
+			ctx->start_offset = 6;
+			ctx->codecid = GF_CODECID_SMV;
+		}
+		else if (!strnicmp(start, "#!AMR-WB\n", 9)) {
+			ctx->codecid = GF_CODECID_AMR_WB;
+			ctx->start_offset = 9;
+			ctx->sample_rate = 16000;
+			ctx->block_size = 320;
+		}
+		start += ctx->start_offset;
+		remain -= ctx->start_offset;
+	}
+	if (ctx->resume_from) {
+		start += ctx->resume_from;
+		remain -= ctx->resume_from;
+		ctx->resume_from = 0;
+	}
+
+
+	while (remain) {
+		u8 toc, ft;
+		u16 amr_mode_set = ctx->amr_mode_set;
+		u32 size=0, i;
+
+		toc = start[0];
+		if (!toc) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AMRDmx] Could not find TOC word in packet, droping\n"));
+			break;
+		}
+		switch (ctx->codecid) {
+		case GF_CODECID_AMR:
+			ft = (toc >> 3) & 0x0F;
+
+			/*update mode set (same mechanism for both AMR and AMR-WB*/
+			amr_mode_set |= (1<<ft);
+			size = (u32)GF_AMR_FRAME_SIZE[ft];
+			break;
+		case GF_CODECID_AMR_WB:
+			ft = (toc >> 3) & 0x0F;
+			size = (u32)GF_AMR_WB_FRAME_SIZE[ft];
+
+			/*update mode set (same mechanism for both AMR and AMR-WB*/
+			amr_mode_set |= (1<<ft);
+			break;
+		case GF_CODECID_NONE:
+			size=0;
+			break;
+		default:
+			for (i=0; i<GF_SMV_EVRC_RATE_TO_SIZE_NB; i++) {
+				if (GF_SMV_EVRC_RATE_TO_SIZE[2*i]==toc) {
+					/*remove rate_type byte*/
+					size = (u32)GF_SMV_EVRC_RATE_TO_SIZE[2*i+1] - 1;
+					break;
+				}
+			}
+			break;
+		}
+
+		if (!size) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[AMRDmx] Broken TOC, trying resync\n"));
+			start++;
+			remain--;
+			continue;
+		}
+		//ready to send packet
+		amrdmx_check_pid(filter, ctx, amr_mode_set);
+
+		if (!ctx->is_playing) return GF_OK;
+		size++;
+		if (size > remain) {
+			ctx->remaining = size - remain;
+			size = remain;
+		}
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * ctx->sample_rate);
+			if (ctx->cts + ctx->block_size >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->block_size ) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+		if (!ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+			memcpy(output, start, size);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_duration(dst_pck, ctx->block_size);
+			gf_filter_pck_set_framing(dst_pck, GF_TRUE, ctx->remaining ? GF_FALSE : GF_TRUE);
+
+			if (byte_offset != GF_FILTER_NO_BO) {
+				u64 boffset = byte_offset;
+				boffset += start - data;
+				gf_filter_pck_set_byte_offset(dst_pck, boffset);
+			}
+
+			gf_filter_pck_send(dst_pck);
+		}
+		start += size;
+		remain -= size;
+
+		ctx->skip_magic = 0;
+		if (ctx->remaining) break;
+		amrdmx_update_cts(ctx);
+
+		//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 (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);
+
+	return GF_OK;
+}
+
+static GF_Err amrdmx_initialize(GF_Filter *filter)
+{
+	GF_AMRDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->skip_magic = GF_TRUE;
+	return GF_OK;
+}
+
+static void amrdmx_finalize(GF_Filter *filter)
+{
+	GF_AMRDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->indexes) gf_free(ctx->indexes);
+}
+
+static const char * amrdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (!strnicmp(data, "#!AMR\n", 6)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/amr";
+	}
+	else if (!strnicmp(data, "#!AMR-WB\n", 9)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/amr";
+	}
+	else if (!strnicmp(data, "#!EVRC\n", 7)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/evrc";
+	}
+	else if (!strnicmp(data, "#!SMV\n", 6)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/smv";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability AMRDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "amr|awb|evc|smv"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/amr|audio/evrc|audio/smv"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AMR),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_AMR_WB),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SMV),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_EVRC),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_AMRDmxCtx, _n)
+static const GF_FilterArgs AMRDmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister AMRDmxRegister = {
+	.name = "rfamr",
+	GF_FS_SET_DESCRIPTION("AMR/EVRC reframer")
+	GF_FS_SET_HELP("This filter parses AMR, AMR Wideband, EVRC and SMV files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_AMRDmxCtx),
+	.args = AMRDmxArgs,
+	.initialize = amrdmx_initialize,
+	.finalize = amrdmx_finalize,
+	SETCAPS(AMRDmxCaps),
+	.configure_pid = amrdmx_configure_pid,
+	.process = amrdmx_process,
+	.probe_data = amrdmx_probe_data,
+	.process_event = amrdmx_process_event
+};
+
+
+const GF_FilterRegister *amrdmx_register(GF_FilterSession *session)
+{
+	return &AMRDmxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/reframe_av1.c Added

@@ -0,0 +1,1114 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau, Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AV1 IVF/OBU/annexB 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>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} AV1Idx;
+
+typedef enum {
+	NOT_SET,   /*Section 5*/
+	OBUs,   /*Section 5*/
+	AnnexB,
+	IVF,
+	UNSUPPORTED
+} AV1BitstreamSyntax;
+
+typedef struct
+{
+	//filter args
+	GF_Fraction fps;
+	Double index;
+	Bool importer;
+	Bool deps;
+	
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	AV1BitstreamSyntax bsmode;
+
+	GF_BitStream *bs;
+	u64 cts;
+	u32 width, height;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+	GF_Fraction cur_fps;
+
+	u32 resume_from;
+
+	char *buffer;
+	u32 buf_size, alloc_size;
+
+	//ivf header for now
+	u32 file_hdr_size;
+
+	Bool is_av1;
+	Bool is_vp9;
+	Bool is_vpX;
+	u32 codecid;
+	GF_VPConfig *vp_cfg;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	GF_FilterPacket *src_pck;
+
+	AV1Idx *indexes;
+	u32 index_alloc_size, index_size;
+
+	AV1State state;
+	u32 dsi_crc;
+
+	Bool pts_from_file;
+	u64 cumulated_dur, last_pts;
+} GF_AV1DmxCtx;
+
+
+GF_Err av1dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_AV1DmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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;
+	ctx->state.mem_mode = GF_TRUE;
+	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) {
+		//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;
+	}
+	return GF_OK;
+}
+
+GF_Err av1dmx_check_format(GF_Filter *filter, GF_AV1DmxCtx *ctx, GF_BitStream *bs, u32 *last_obu_end)
+{
+	GF_Err e;
+	if (last_obu_end) (*last_obu_end) = 0;
+	//probing av1 bs mode
+	if (ctx->bsmode != NOT_SET) return GF_OK;
+
+
+	if (!ctx->state.config)
+		ctx->state.config = gf_odf_av1_cfg_new();
+
+	ctx->is_av1 = ctx->is_vp9 = ctx->is_vpX = GF_FALSE;
+	ctx->codecid = 0;
+	if (ctx->vp_cfg) gf_odf_vp_cfg_del(ctx->vp_cfg);
+	ctx->vp_cfg = NULL;
+	ctx->cur_fps = ctx->fps;
+	if (!ctx->fps.num || !ctx->fps.den) {
+		ctx->cur_fps.num = 25000;
+		ctx->cur_fps.den = 1000;
+	}
+
+	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;
+		ctx->bsmode = IVF;
+
+		e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &frame_rate, &time_scale, &num_frames);
+		if (e) return e;
+
+		switch (codec_fourcc) {
+		case GF_4CC('A', 'V', '0', '1'):
+			ctx->is_av1 = GF_TRUE;
+			ctx->codecid = GF_CODECID_AV1;
+			break;
+		case GF_4CC('V', 'P', '9', '0'):
+			ctx->is_vp9 = GF_TRUE;
+			ctx->codecid = GF_CODECID_VP9;
+			ctx->vp_cfg = gf_odf_vp_cfg_new();
+			break;
+		case GF_4CC('V', 'P', '8', '0'):
+			ctx->codecid = GF_CODECID_VP8;
+			ctx->vp_cfg = gf_odf_vp_cfg_new();
+			break;
+		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) ));
+			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) ));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (ctx->vp_cfg && !ctx->is_vp9) {
+			ctx->is_vpX = GF_TRUE;
+			ctx->vp_cfg->profile = 1;
+			ctx->vp_cfg->level = 10;
+			ctx->vp_cfg->bit_depth = 8;
+			//leave the rest as 0
+		}
+
+		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
+
+		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));
+			ctx->pts_from_file = GF_TRUE;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[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"));
+		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) ) {
+			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_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"));
+		ctx->bsmode = OBUs;
+
+		gf_av1_reset_state(&ctx->state, GF_FALSE);
+		gf_bs_seek(bs, 0);
+	}
+	ctx->is_av1 = GF_TRUE;
+	ctx->state.unframed = GF_TRUE;
+	ctx->codecid = GF_CODECID_AV1;
+	return GF_OK;
+}
+
+
+static void av1dmx_check_dur(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	FILE *stream;
+	GF_Err e;
+	GF_BitStream *bs;
+	u64 duration, cur_dur, last_cdur;
+	AV1State av1state;
+	const char *filepath=NULL;
+	const GF_PropertyValue *p;
+	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	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;
+	}
+	filepath = p->value.string;
+	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"));
+		} else {
+			ctx->index = -ctx->index;
+		}
+	}
+	if (ctx->index<=0)
+		return;
+
+	stream = gf_fopen(filepath, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+
+	if (ctx->file_hdr_size) {
+		gf_bs_seek(bs, ctx->file_hdr_size);
+	}
+	gf_av1_init_state(&av1state);
+	av1state.skip_frames = GF_TRUE;
+	av1state.config = gf_odf_av1_cfg_new();
+
+	duration = 0;
+	cur_dur = last_cdur = 0;
+	while (gf_bs_available(bs)) {
+		Bool is_sap=GF_FALSE;
+		u64 pts = GF_FILTER_NO_TS;
+		u64 frame_start = gf_bs_get_position(bs);
+		gf_av1_reset_state(&av1state, GF_FALSE);
+
+		/*we process each TU and extract only the necessary OBUs*/
+		switch (ctx->bsmode) {
+		case OBUs:
+			e = aom_av1_parse_temporal_unit_from_section5(bs, &av1state);
+			break;
+		case AnnexB:
+			e = aom_av1_parse_temporal_unit_from_annexb(bs, &av1state);
+			break;
+		case IVF:
+			if (ctx->is_av1) {
+				e = aom_av1_parse_temporal_unit_from_ivf(bs, &av1state);
+			} else {
+				u64 frame_size;
+				e = gf_media_parse_ivf_frame_header(bs, &frame_size, &pts);
+				if (!e) gf_bs_skip_bytes(bs, frame_size);
+		 		is_sap = GF_TRUE;
+			}
+			break;
+		default:
+			e = GF_NOT_SUPPORTED;
+		}
+		if (e)
+		 	break;
+
+		if (pts != GF_FILTER_NO_TS) {
+			duration = pts;
+			cur_dur = pts - last_cdur;
+		} else {
+			duration += ctx->cur_fps.den;
+			cur_dur += ctx->cur_fps.den;
+		}
+		if (av1state.frame_state.key_frame)
+		 	is_sap = GF_TRUE;
+
+		//only index at I-frame start
+		if (frame_start && is_sap && (cur_dur > ctx->index * ctx->cur_fps.num) ) {
+			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(AV1Idx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = frame_start;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= ctx->cur_fps.num;
+			ctx->index_size ++;
+			last_cdur = cur_dur;
+			cur_dur = 0;
+		}
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+	gf_odf_av1_cfg_del(av1state.config);
+	gf_av1_reset_state(&av1state, GF_TRUE);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->cur_fps.num != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		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) );
+}
+
+
+static Bool av1dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_AV1DmxCtx *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;
+		}
+		if (! ctx->is_file) {
+			ctx->buf_size = 0;
+			return GF_FALSE;
+		}
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+
+		if (ctx->start_range) {
+
+			if (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, ("[AV1/VP9Demx] Play request from %d, building index\n", ctx->start_range));
+				av1dmx_check_dur(filter, ctx);
+			}
+
+			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->cur_fps.num);
+					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 (!file_pos)
+				return GF_TRUE;
+		}
+		ctx->buf_size = 0;
+		if (!file_pos)
+			file_pos = ctx->file_hdr_size;
+
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 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 av1dmx_update_cts(GF_AV1DmxCtx *ctx)
+{
+	assert(ctx->cur_fps.num);
+	assert(ctx->cur_fps.den);
+
+	if (ctx->timescale) {
+		u64 inc = ctx->cur_fps.den;
+		inc *= ctx->timescale;
+		inc /= ctx->cur_fps.num;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->cur_fps.den;
+	}
+}
+
+static void av1dmx_check_pid(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	u8 *dsi;
+	u32 dsi_size, crc;
+
+	//no config or no config change
+	if (ctx->is_av1 && !gf_list_count(ctx->state.frame_state.header_obus)) return;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		av1dmx_check_dur(filter, ctx);
+	}
+	dsi = NULL;
+	dsi_size = 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);
+	} else if (ctx->is_av1) {
+		//first or config changed, compute dsi
+		while (gf_list_count(ctx->state.config->obu_array)) {
+			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*) gf_list_pop_back(ctx->state.config->obu_array);
+			if (a->obu) gf_free(a->obu);
+			gf_free(a);
+		}
+		dsi = NULL;
+		dsi_size = 0;
+		while (gf_list_count(ctx->state.frame_state.header_obus)) {
+			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);
+		}
+		gf_odf_av1_cfg_write(ctx->state.config, &dsi, &dsi_size);
+
+		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;
+		}
+
+	}
+	crc = gf_crc_32(dsi, dsi_size);
+
+	if (crc == ctx->dsi_crc) {
+		gf_free(dsi);
+		return;
+	}
+	ctx->dsi_crc = crc;
+
+	//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));
+
+	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->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+	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->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) );
+	}
+}
+
+GF_Err av1dmx_parse_ivf(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	GF_Err e;
+	u32 pck_size;
+	u64 frame_size = 0, pts = GF_FILTER_NO_TS;
+	GF_FilterPacket *pck;
+	u64 pos, pos_ivf_hdr;
+	u8 *output;
+
+	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;
+
+	pos = gf_bs_get_position(ctx->bs);
+	if (gf_bs_available(ctx->bs) < frame_size) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_EOS;
+	}
+
+	if (ctx->pts_from_file) {
+		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));
+			ctx->cumulated_dur = ctx->last_pts + ctx->cur_fps.den;
+			ctx->cumulated_dur -= pts;
+			pts = ctx->cumulated_dur;
+		}
+		ctx->last_pts = pts;
+	}
+
+
+	//check pid state
+	av1dmx_check_pid(filter, ctx);
+
+	if (!ctx->opid) {
+		return GF_OK;
+	}
+
+	if (!ctx->is_playing) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_EOS;
+	}
+
+	pck_size = (u32)frame_size;
+	pck = gf_filter_pck_new_alloc(ctx->opid, pck_size, &output);
+	if (!pck) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_OUT_OF_MEM;
+	}
+	if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, pck);
+
+	if (ctx->pts_from_file) {
+		gf_filter_pck_set_cts(pck, pts);
+	} else {
+		gf_filter_pck_set_cts(pck, ctx->cts);
+	}
+
+	gf_bs_seek(ctx->bs, pos);
+	gf_bs_read_data(ctx->bs, output, pck_size);
+
+	if (output[0] & 0x80)
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+	else
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_NONE);
+
+	gf_filter_pck_send(pck);
+
+	av1dmx_update_cts(ctx);
+	return GF_OK;
+}
+
+GF_Err av1dmx_parse_vp9(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	Bool key_frame = GF_FALSE;
+	u64 frame_size = 0, pts = 0;
+	u64 pos, pos_ivf_hdr;
+	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];
+	u8 *output;
+	GF_Err e;
+
+	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;
+
+	pos = gf_bs_get_position(ctx->bs);
+	if (gf_bs_available(ctx->bs) < frame_size) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_EOS;
+	}
+
+	if (ctx->pts_from_file) {
+		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));
+			ctx->cumulated_dur = ctx->last_pts + ctx->cur_fps.den;
+			ctx->cumulated_dur -= pts;
+			pts = ctx->cumulated_dur;
+		}
+		ctx->last_pts = pts;
+	}
+
+	/*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);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[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"));
+			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]));
+			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));
+		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_PARSER, ("\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));
+		return e;
+	}
+
+	u32 pck_size = (u32)(gf_bs_get_position(ctx->bs) - pos);
+	assert(pck_size == frame_size);
+
+	//check pid state
+	av1dmx_check_pid(filter, ctx);
+
+	if (!ctx->opid) {
+		return GF_OK;
+	}
+
+	if (!ctx->is_playing) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_EOS;
+	}
+
+	GF_FilterPacket *pck = gf_filter_pck_new_alloc(ctx->opid, pck_size, &output);
+	if (!pck) {
+		gf_bs_seek(ctx->bs, pos_ivf_hdr);
+		return GF_OUT_OF_MEM;
+	}
+	if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, pck);
+
+	if (ctx->pts_from_file) {
+		gf_filter_pck_set_cts(pck, pts);
+	} else {
+		gf_filter_pck_set_cts(pck, ctx->cts);
+	}
+
+
+	if (key_frame) {
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+	}
+
+	if (ctx->deps) {
+		u8 flags = 0;
+		//dependsOn
+		flags = (key_frame) ? 2 : 1;
+		flags <<= 2;
+		//dependedOn
+		//flags |= 2;
+		flags <<= 2;
+		//hasRedundant
+		//flags |= ctx->has_redundant ? 1 : 2;
+		gf_filter_pck_set_dependency_flags(pck, flags);
+	}
+
+	gf_bs_seek(ctx->bs, pos);
+	gf_bs_read_data(ctx->bs, output, pck_size);
+	gf_filter_pck_send(pck);
+
+	av1dmx_update_cts(ctx);
+	return GF_OK;
+}
+
+static GF_Err av1dmx_parse_flush_sample(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	u32 pck_size;
+	GF_FilterPacket *pck;
+	u8 *output;
+
+	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"));
+		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);
+
+	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);
+
+	memcpy(output, ctx->state.frame_obus, pck_size);
+
+	if (ctx->deps) {
+		u8 flags = 0;
+		//dependsOn
+		flags = ( ctx->state.frame_state.key_frame) ? 2 : 1;
+		flags <<= 2;
+		//dependedOn
+	 	flags |= ctx->state.frame_state.refresh_frame_flags ? 1 : 2;
+		flags <<= 2;
+		//hasRedundant
+	 	//flags |= ctx->has_redundant ? 1 : 2;
+	 	gf_filter_pck_set_dependency_flags(pck, flags);
+	}
+
+	gf_filter_pck_send(pck);
+
+	av1dmx_update_cts(ctx);
+	gf_av1_reset_state(&ctx->state, GF_FALSE);
+
+	return GF_OK;
+
+}
+GF_Err av1dmx_parse_av1(GF_Filter *filter, GF_AV1DmxCtx *ctx)
+{
+	GF_Err e = GF_OK;
+	u64 start;
+
+	if (!ctx->is_playing) {
+		ctx->state.frame_state.is_first_frame = GF_TRUE;
+	}
+
+	/*we process each TU and extract only the necessary OBUs*/
+	start = gf_bs_get_position(ctx->bs);
+	switch (ctx->bsmode) {
+	case OBUs:
+		//first frame loaded !
+		if (ctx->state.bs && gf_bs_get_position(ctx->state.bs) && (ctx->state.obu_type == OBU_TEMPORAL_DELIMITER)) {
+			e = GF_OK;
+		} else {
+			e = aom_av1_parse_temporal_unit_from_section5(ctx->bs, &ctx->state);
+		}
+		break;
+	case AnnexB:
+		//first TU loaded !
+		if (ctx->state.bs && gf_bs_get_position(ctx->state.bs)) {
+			e = GF_OK;
+		} else {
+			e = aom_av1_parse_temporal_unit_from_annexb(ctx->bs, &ctx->state);
+			if (e==GF_BUFFER_TOO_SMALL) {
+				gf_av1_reset_state(&ctx->state, GF_FALSE);
+				gf_bs_seek(ctx->bs, start);
+			}
+		}
+		break;
+	case IVF:
+		//first frame loaded !
+		if (ctx->state.bs && gf_bs_get_position(ctx->state.bs)) {
+			e = GF_OK;
+		} else {
+			e = aom_av1_parse_temporal_unit_from_ivf(ctx->bs, &ctx->state);
+		}
+		break;
+	default:
+		e = GF_NOT_SUPPORTED;
+	}
+
+	//check pid state
+	av1dmx_check_pid(filter, ctx);
+
+	if (e) return e;
+
+
+	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_av1_reset_state(&ctx->state, GF_FALSE);
+		return GF_OK;
+	}
+
+	if (!ctx->is_playing) {
+		//don't reset state we would skip seq header obu in first frame
+		//gf_av1_reset_state(&ctx->state, GF_FALSE);
+		return GF_OK;
+	}
+
+	return av1dmx_parse_flush_sample(filter, ctx);
+
+}
+
+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;
+	GF_Err e = GF_OK;
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs, data, data_size);
+
+	//check ivf vs obu vs annexB
+	e = av1dmx_check_format(filter, ctx, ctx->bs, &last_obu_end);
+	if (e) return e;
+
+	while (gf_bs_available(ctx->bs)) {
+
+		if (ctx->is_vp9) {
+			e = av1dmx_parse_vp9(filter, ctx);
+		} else if (ctx->is_av1) {
+			e = av1dmx_parse_av1(filter, ctx);
+		} else {
+			e = av1dmx_parse_ivf(filter, ctx);
+		}
+
+		if (e!=GF_EOS)
+			last_obu_end = (u32) gf_bs_get_position(ctx->bs);
+
+		if (e) {
+			break;
+		}
+		if (!ctx->is_playing && ctx->opid)
+			break;
+	}
+
+	if (is_copy && last_obu_end) {
+		assert(ctx->buf_size>=last_obu_end);
+		memmove(ctx->buffer, ctx->buffer+last_obu_end, sizeof(char) * (ctx->buf_size-last_obu_end));
+		ctx->buf_size -= last_obu_end;
+	}
+	if (e==GF_EOS) return GF_OK;
+	if (e==GF_BUFFER_TOO_SMALL) return GF_OK;
+	return e;
+}
+
+GF_Err av1dmx_process(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_AV1DmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	char *data;
+	u32 pck_size;
+
+	if (ctx->bsmode == UNSUPPORTED) return GF_EOS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		av1dmx_check_dur(filter, ctx);
+
+	if (!ctx->is_playing && ctx->opid)
+		return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			//flush
+			while (ctx->buf_size) {
+				u32 buf_size = ctx->buf_size;
+				e = av1dmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+				if (e) break;
+				if (buf_size == ctx->buf_size) {
+					break;
+				}
+			}
+			if (ctx->state.bs && gf_bs_get_position(ctx->state.bs))
+				av1dmx_parse_flush_sample(filter, ctx);
+
+			ctx->buf_size = 0;
+			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;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->opid) {
+		if (!ctx->is_playing || gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale) {
+		Bool start, end;
+		u64 cts;
+
+		e = GF_OK;
+
+		gf_filter_pck_get_framing(pck, &start, &end);
+		//middle or end of frame, reaggregation
+		if (!start) {
+			if (ctx->alloc_size < ctx->buf_size + pck_size) {
+				ctx->alloc_size = ctx->buf_size + pck_size;
+				ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+			}
+			memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+			ctx->buf_size += pck_size;
+
+			//end of frame, process av1
+			if (end) {
+				e = av1dmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+			}
+			ctx->buf_size=0;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return e;
+		}
+		//flush of pending frame (might have lost something)
+		if (ctx->buf_size) {
+			e = av1dmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+			ctx->buf_size = 0;
+			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;
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = pck;
+		gf_filter_pck_ref_props(&ctx->src_pck);
+		ctx->buf_size = 0;
+
+		if (!end) {
+			if (ctx->alloc_size < ctx->buf_size + pck_size) {
+				ctx->alloc_size = ctx->buf_size + pck_size;
+				ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+			}
+			memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+			ctx->buf_size += pck_size;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		assert(start && end);
+		//process
+		e = av1dmx_process_buffer(filter, ctx, data, pck_size, GF_FALSE);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return e;
+	}
+
+	//not from framed stream, copy buffer
+	if (ctx->alloc_size < ctx->buf_size + pck_size) {
+		ctx->alloc_size = ctx->buf_size + pck_size;
+		ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+	}
+	memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+	ctx->buf_size += pck_size;
+	e = av1dmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static void av1dmx_finalize(GF_Filter *filter)
+{
+	GF_AV1DmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+
+	gf_av1_reset_state(&ctx->state, GF_TRUE);
+	if (ctx->state.config) gf_odf_av1_cfg_del(ctx->state.config);
+	if (ctx->state.bs) gf_bs_del(ctx->state.bs);
+	if (ctx->state.frame_obus) gf_free(ctx->state.frame_obus);
+	if (ctx->buffer) gf_free(ctx->buffer);
+
+	if (ctx->vp_cfg) gf_odf_vp_cfg_del(ctx->vp_cfg);
+}
+
+static const char * av1dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	Bool res;
+	u32 lt;
+	const char *mime = "video/av1";
+	lt = gf_log_get_tool_level(GF_LOG_CODING);
+	gf_log_set_tool_level(GF_LOG_CODING, GF_LOG_QUIET);
+
+	res = gf_media_probe_ivf(bs);
+	if (res) {
+		*score = GF_FPROBE_SUPPORTED;
+		mime = "video/x-ivf";
+	} else {
+		res = gf_media_aom_probe_annexb(bs);
+		if (res) *score = GF_FPROBE_SUPPORTED;
+		else {
+			AV1State state;
+			GF_Err e;
+			u32 nb_units = 0;
+
+			gf_av1_init_state(&state);
+			state.config = gf_odf_av1_cfg_new();
+			while (gf_bs_available(bs)) {
+				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)) {
+						nb_units++;
+						if (e==GF_BUFFER_TOO_SMALL)
+							nb_units++;
+					} else
+						break;
+				} else {
+					break;
+				}
+				gf_av1_reset_state(&state, GF_FALSE);
+				if (nb_units>2) 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;
+			}
+		}
+	}
+
+	gf_log_set_tool_level(GF_LOG_CODING, lt);
+
+	gf_bs_del(bs);
+	if (res) return mime;
+	return NULL;
+}
+
+static const GF_FilterCapability AV1DmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "ivf|obu|av1b|av1"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/x-ivf|video/av1"),
+	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_AV1),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_VP8),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_VP9),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_VP10),
+	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_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AV1),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP8),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP9),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP10),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_AV1DmxCtx, _n)
+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(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},
+	{0}
+};
+
+
+GF_FilterRegister AV1DmxRegister = {
+	.name = "rfav1",
+	GF_FS_SET_DESCRIPTION("AV1/IVF/VP9 reframer")
+	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,
+	.finalize = av1dmx_finalize,
+	SETCAPS(AV1DmxCaps),
+	.configure_pid = av1dmx_configure_pid,
+	.process = av1dmx_process,
+	.probe_data = av1dmx_probe_data,
+	.process_event = av1dmx_process_event
+};
+
+
+const GF_FilterRegister *av1dmx_register(GF_FilterSession *session)
+{
+	return &AV1DmxRegister;
+}
+
+#else
+const GF_FilterRegister *av1dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+

gpac-1.0.0.tar.gz/src/filters/reframe_flac.c Added

@@ -0,0 +1,665 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / FLAC 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;
+} FLACIdx;
+
+typedef struct
+{
+	u32 block_size;
+	u32 sample_rate;
+} FLACHeader;
+
+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, 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;
+	u32 sample_rate, nb_channels, bits_per_sample, block_size;
+
+	u8 *flac_buffer;
+	u32 flac_buffer_size, flac_buffer_alloc, resume_from;
+	u64 byte_offset;
+
+	GF_FilterPacket *src_pck;
+
+	Bool recompute_cts;
+	FLACIdx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_FLACDmxCtx;
+
+
+
+
+GF_Err flac_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_FLACDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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;
+
+	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);
+	}
+	return GF_OK;
+}
+
+static void flac_dmx_check_dur(GF_Filter *filter, GF_FLACDmxCtx *ctx)
+{
+	u64 duration;
+	s32 prev_sr = -1;
+	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;
+
+	/*todo ...*/
+	duration = 0;
+
+	if (!ctx->duration.num || (ctx->duration.num  * prev_sr != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = prev_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;
+	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)
+{
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		flac_dmx_check_dur(filter, 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_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_name(ctx->opid, "audio");
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA( dsi, dsi_size ) );
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT( GF_CODECID_FLAC ) );
+	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_channels) );
+	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_AUDIO_BPS, & PROP_UINT(ctx->bits_per_sample) );
+
+}
+
+static Bool flac_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_FLACDmxCtx *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->flac_buffer_size = 0;
+				ctx->resume_from = 0;
+			}
+			ctx->initial_play_done = GF_TRUE;
+			return GF_FALSE;
+		}
+		flac_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->flac_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 flac_dmx_update_cts(GF_FLACDmxCtx *ctx, u32 nb_samp)
+{
+	if (ctx->timescale) {
+		u64 inc = nb_samp;
+		inc *= ctx->timescale;
+		inc /= ctx->sample_rate;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += nb_samp;
+	}
+}
+
+
+u8 const flac_dmx_crc8_table[256] = {
+	0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
+	0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D,
+	0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
+	0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D,
+	0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5,
+	0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD,
+	0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85,
+	0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD,
+	0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2,
+	0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA,
+	0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2,
+	0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A,
+	0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32,
+	0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0D, 0x0A,
+	0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42,
+	0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A,
+	0x89, 0x8E, 0x87, 0x80, 0x95, 0x92, 0x9B, 0x9C,
+	0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4,
+	0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC,
+	0xC1, 0xC6, 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4,
+	0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C,
+	0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44,
+	0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C,
+	0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34,
+	0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B,
+	0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63,
+	0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B,
+	0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13,
+	0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB,
+	0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83,
+	0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB,
+	0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3
+};
+
+u8 flac_dmx_crc8(u8 *data, u32 len)
+{
+	u8 crc = 0;
+	while (len--)
+		crc = flac_dmx_crc8_table[crc ^ *data++];
+	return crc;
+}
+
+static u32 flac_dmx_block_sizes[] =
+{
+	0, 192, 576, 1152, 2304, 4608, 0, 0, 256, 512, 1024, 2048, 4096, 8192, 16384,  32768
+};
+static u32 flac_dmx_samplerates[] =
+{
+	0, 88200, 176400, 192000, 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
+};
+
+static Bool flac_parse_header(GF_FLACDmxCtx *ctx, char *data, u32 size, FLACHeader *hdr)
+{
+	u32 block_size, sample_rate, res, top, pos, crc, crc_hdr;
+
+	gf_bs_reassign_buffer(ctx->bs, data, size);
+	gf_bs_read_int(ctx->bs, 15);
+	/*block_strategy = */gf_bs_read_int(ctx->bs, 1);
+	block_size = gf_bs_read_int(ctx->bs, 4);
+	sample_rate = gf_bs_read_int(ctx->bs, 4);
+	/*u32 channel_layout = */gf_bs_read_int(ctx->bs, 4);
+	/*u32 bps = */gf_bs_read_int(ctx->bs, 3);
+	gf_bs_read_int(ctx->bs, 1);
+
+	res = gf_bs_read_u8(ctx->bs);
+	top = (res & 128) >> 1;
+	if ((res & 0xC0) == 0x80 || (res >= 0xFE)) return GF_FALSE;
+	while (res & top) {
+		s32 tmp = gf_bs_read_u8(ctx->bs);
+		tmp -= 128;
+		if(tmp>>6)
+			return GF_FALSE;
+		res = (res<<6) + tmp;
+		top <<= 5;
+	}
+	//res &= (top << 1) - 1;
+
+	if (block_size==6) block_size = 1 + gf_bs_read_int(ctx->bs, 8);
+	else if (block_size==7) block_size = 1 + gf_bs_read_int(ctx->bs, 16);
+	else {
+		block_size = flac_dmx_block_sizes[block_size];
+	}
+
+#if 0
+	if (bps==0) bps = ctx->bits_per_sample;
+	else if (bps==1) bps = 8;
+	else if (bps==2) bps = 12;
+	else if (bps==4) bps = 16;
+	else if (bps==5) bps = 20;
+	else if (bps==6) bps = 24;
+#endif
+
+	if (sample_rate==0) sample_rate = ctx->sample_rate;
+	else if ((sample_rate&0xC)==0xC) {
+		if (sample_rate==0xC) sample_rate = gf_bs_read_u8(ctx->bs);
+		else if (sample_rate==0xD) sample_rate = gf_bs_read_u16(ctx->bs);
+		else if (sample_rate==0xE) sample_rate = 10*gf_bs_read_u16(ctx->bs);
+	} else {
+		sample_rate = flac_dmx_samplerates[sample_rate];
+	}
+
+	pos = (u32) gf_bs_get_position(ctx->bs);
+
+	crc = gf_bs_read_u8(ctx->bs);
+	crc_hdr = flac_dmx_crc8(data, pos);
+
+	if (crc != crc_hdr) {
+		return GF_FALSE;
+	}
+	hdr->sample_rate = sample_rate;
+	hdr->block_size = block_size;
+	return GF_TRUE;
+}
+
+GF_Err flac_dmx_process(GF_Filter *filter)
+{
+	GF_FLACDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *output;
+	u8 *start;
+	Bool final_flush=GF_FALSE;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+	FLACHeader hdr;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		flac_dmx_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->flac_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 {
+			return GF_OK;
+		}
+	}
+
+	prev_pck_size = ctx->flac_buffer_size;
+	if (pck && !ctx->resume_from) {
+		u8 *data = (u8 *) gf_filter_pck_get_data(pck, &pck_size);
+
+		if (ctx->byte_offset != GF_FILTER_NO_BO) {
+			u64 byte_offset = gf_filter_pck_get_byte_offset(pck);
+			if (!ctx->flac_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->flac_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->flac_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->flac_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->flac_buffer_size + pck_size > ctx->flac_buffer_alloc) {
+			ctx->flac_buffer_alloc = ctx->flac_buffer_size + pck_size;
+			ctx->flac_buffer = gf_realloc(ctx->flac_buffer, ctx->flac_buffer_alloc);
+		}
+		memcpy(ctx->flac_buffer + ctx->flac_buffer_size, data, pck_size);
+		ctx->flac_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->flac_buffer_size;
+	start = ctx->flac_buffer;
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from - 1;
+		remain -= ctx->resume_from - 1;
+		ctx->resume_from = 0;
+	}
+
+	while (remain>2) {
+		u32 next_frame=0, nb_samp;
+		u32 cur_size = remain-2;
+		u8 *cur_buf = start+2;
+		u8 *hdr_start = NULL;
+
+		if (final_flush) {
+			next_frame = remain;
+		} else {
+			while (cur_size) {
+				//wait till we have a frame header
+				hdr_start = memchr(cur_buf, 0xFF, cur_size);
+				if (!hdr_start) break;
+				next_frame = (u32) (hdr_start-start);
+				if (next_frame == remain)
+					break;
+
+				if ((hdr_start[1]&0xFC) == 0xF8) {
+					if (flac_parse_header(ctx, hdr_start, (u32) remain - next_frame, &hdr))
+						break;
+				}
+				cur_buf = hdr_start+1;
+				cur_size = (u32) (cur_buf - start);
+				assert(cur_size<=remain);
+				cur_size = remain - cur_size;
+				hdr_start = NULL;
+			}
+			if (!hdr_start) break;
+			if (next_frame == remain)
+				break;
+		}
+
+
+		if (!ctx->initialized) {
+			u32 size = next_frame;
+			u32 dsi_end = 0;
+			//we have a header
+			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')) {
+
+			}
+			while (gf_bs_available(ctx->bs)) {
+				Bool last = gf_bs_read_int(ctx->bs, 1);
+				u32 type = gf_bs_read_int(ctx->bs, 7);
+				u32 len = gf_bs_read_int(ctx->bs, 24);
+
+				if (type==0) {
+					u16 min_block_size = gf_bs_read_u16(ctx->bs);
+					u16 max_block_size = gf_bs_read_u16(ctx->bs);
+					/*u32 min_frame_size = */gf_bs_read_u24(ctx->bs);
+					/*u32 max_frame_size = */gf_bs_read_u24(ctx->bs);
+					ctx->sample_rate = gf_bs_read_int(ctx->bs, 20);
+					ctx->nb_channels = 1 + gf_bs_read_int(ctx->bs, 3);
+					ctx->bits_per_sample = 1 + gf_bs_read_int(ctx->bs, 5);
+					if (min_block_size==max_block_size) ctx->block_size = min_block_size;
+					else ctx->block_size = 0;
+
+					//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);
+
+				} else {
+					//ignore the rest for now
+					//TODO: expose metadata, pictures and co
+					gf_bs_skip_bytes(ctx->bs, len);
+				}
+				if (last) break;
+			}
+			flac_dmx_check_pid(filter, ctx, ctx->flac_buffer+4, dsi_end-4);
+			remain -= size;
+			start += size;
+			ctx->initialized = GF_TRUE;
+			if (!ctx->is_playing) break;
+			continue;
+		}
+
+		//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));
+			start += next_frame;
+			remain -= next_frame;
+			continue;
+		}
+
+		flac_parse_header(ctx,start, next_frame, &hdr);
+		if (hdr.sample_rate != ctx->sample_rate) {
+			ctx->sample_rate = hdr.sample_rate;
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLE_RATE, & PROP_UINT(ctx->sample_rate));
+		}
+
+		nb_samp = hdr.block_size;
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * ctx->sample_rate);
+			if (ctx->cts + nb_samp >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + nb_samp ) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		if (ctx->timescale && !prev_pck_size && (cts != GF_FILTER_NO_TS) ) {
+			ctx->cts = cts;
+			cts = GF_FILTER_NO_TS;
+		}
+
+		if (!ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, next_frame, &output);
+			memcpy(output, start, next_frame);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			if (!ctx->timescale || (ctx->timescale==ctx->sample_rate) )
+				gf_filter_pck_set_duration(dst_pck, nb_samp);
+			else {
+				gf_filter_pck_set_duration(dst_pck, (nb_samp * ctx->timescale) / ctx->sample_rate);
+			}
+			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);
+			}
+			gf_filter_pck_send(dst_pck);
+		}
+		flac_dmx_update_cts(ctx, nb_samp);
+
+		assert (start[0] == 0xFF);
+		assert((start[1]&0xFC) == 0xF8);
+
+		start += next_frame;
+		assert(remain >= next_frame);
+		remain -= next_frame;
+
+	}
+
+	if (!pck) {
+		ctx->flac_buffer_size = 0;
+		return flac_dmx_process(filter);
+	} else {
+		if (remain < ctx->flac_buffer_size) {
+			memmove(ctx->flac_buffer, start, remain);
+		}
+		ctx->flac_buffer_size = remain;
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	return GF_OK;
+}
+
+static GF_Err flac_dmx_initialize(GF_Filter *filter)
+{
+	GF_FLACDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->bs = gf_bs_new((u8 *)ctx, 1, GF_BITSTREAM_READ);
+	return GF_OK;
+}
+static void flac_dmx_finalize(GF_Filter *filter)
+{
+	GF_FLACDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->flac_buffer) gf_free(ctx->flac_buffer);
+	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+}
+
+
+static const char *flac_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if ((size>4) && !strncmp(data, "fLaC", 4)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/flac";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability FLACDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "flac"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/flac"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_FLAC),
+	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_FLAC),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_FLACDmxCtx, _n)
+static const GF_FilterArgs FLACDmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister FLACDmxRegister = {
+	.name = "rfflac",
+	GF_FS_SET_DESCRIPTION("FLAC reframer")
+	GF_FS_SET_HELP("This filter parses FLAC files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_FLACDmxCtx),
+	.args = FLACDmxArgs,
+	.finalize = flac_dmx_finalize,
+	.initialize = flac_dmx_initialize,
+	SETCAPS(FLACDmxCaps),
+	.configure_pid = flac_dmx_configure_pid,
+	.process = flac_dmx_process,
+	.probe_data = flac_dmx_probe_data,
+	.process_event = flac_dmx_process_event
+};
+
+
+const GF_FilterRegister *flac_dmx_register(GF_FilterSession *session)
+{
+	return &FLACDmxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/reframe_h263.c Added

@@ -0,0 +1,722 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / H263 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;
+} H263Idx;
+
+typedef struct
+{
+	//filter args
+	GF_Fraction fps;
+	Double index;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_BitStream *bs;
+	u64 cts;
+	u32 width, height;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+
+	u32 resume_from;
+
+
+	u32 bytes_in_header;
+	char hdr_store[8];
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	GF_FilterPacket *src_pck;
+
+	H263Idx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_H263DmxCtx;
+
+
+GF_Err h263dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_H263DmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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);
+	}
+	return GF_OK;
+}
+
+#define H263_CACHE_SIZE	4096
+static u32 h263dmx_next_start_code_bs(GF_BitStream *bs)
+{
+	u32 v, bpos;
+	unsigned char h263_cache[H263_CACHE_SIZE];
+	u64 end, cache_start, load_size;
+	u64 start = gf_bs_get_position(bs);
+
+	/*skip 16b header*/
+	gf_bs_read_u16(bs);
+	bpos = 0;
+	load_size = 0;
+	cache_start = 0;
+	end = 0;
+	v = 0xffffffff;
+	while (!end) {
+		/*refill cache*/
+		if (bpos == (u32) load_size) {
+			if (!gf_bs_available(bs)) break;
+			load_size = gf_bs_available(bs);
+			if (load_size>H263_CACHE_SIZE) load_size=H263_CACHE_SIZE;
+			bpos = 0;
+			cache_start = gf_bs_get_position(bs);
+			gf_bs_read_data(bs, (char *) h263_cache, (u32) load_size);
+		}
+		v = (v<<8) | h263_cache[bpos];
+		bpos++;
+		if ((v >> (32-22)) == 0x20) end = cache_start+bpos-4;
+	}
+	gf_bs_seek(bs, start);
+	if (!end) end = gf_bs_get_size(bs);
+	return (u32) (end-start);
+}
+static void h263dmx_check_dur(GF_Filter *filter, GF_H263DmxCtx *ctx)
+{
+
+	FILE *stream;
+	GF_BitStream *bs;
+	u64 duration, cur_dur;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration = 0;
+	cur_dur = 0;
+	while (gf_bs_available(bs)) {
+		u8 type;
+		u64 pos = gf_bs_get_position(bs);
+		u64 next_pos = pos + h263dmx_next_start_code_bs(bs);
+		gf_bs_read_u32(bs);
+		type = gf_bs_read_u8(bs);
+
+		if (type & 0x02) type = 0;
+		else
+			type = 1;
+
+
+		duration += ctx->fps.den;
+		cur_dur += ctx->fps.den;
+		//only index at I-frame start
+		if (pos && type && (cur_dur > ctx->index * ctx->fps.num) ) {
+			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(H263Idx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= ctx->fps.num;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		gf_bs_seek(bs, next_pos);
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->fps.num != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = ctx->fps.num;
+
+		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;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+}
+
+static void h263dmx_check_pid(GF_Filter *filter, GF_H263DmxCtx *ctx, u32 width, u32 height)
+{
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		h263dmx_check_dur(filter, ctx);
+	}
+	if ((ctx->width == width) && (ctx->height == height)) return;
+
+	//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_UNFRAMED, NULL);
+	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_H263));
+	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_FPS, & PROP_FRAC(ctx->fps));
+
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+	ctx->width = width;
+	ctx->height = height;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT( width));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT( height));
+
+	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 h263dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_H263DmxCtx *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->bytes_in_header = 0;
+		}
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+
+		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->fps.num);
+					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 (!file_pos)
+				return GF_TRUE;
+		}
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 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 h263dmx_update_cts(GF_H263DmxCtx *ctx)
+{
+	assert(ctx->fps.num);
+	assert(ctx->fps.den);
+
+	if (ctx->timescale) {
+		u64 inc = ctx->fps.den;
+		inc *= ctx->timescale;
+		inc /= ctx->fps.num;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->fps.den;
+	}
+}
+
+
+static s32 h263dmx_next_start_code(u8 *data, u32 size)
+{
+	u32 v, bpos;
+	s64 end;
+	s64 start = 0;
+
+	/*skip 16b header*/
+	start+=2;
+	bpos = 0;
+	end = 0;
+	v = 0xffffffff;
+	while (!end) {
+		if (bpos == size) return -1;
+		v = (v<<8) | data[bpos];
+		bpos++;
+		if ((v >> (32-22)) == 0x20) end = start + bpos - 4;
+	}
+
+	return (s32) (end-start);
+}
+
+static void h263_get_pic_size(GF_BitStream *bs, u32 fmt, u32 *w, u32 *h)
+{
+	switch (fmt) {
+	case 1:
+		*w = 128;
+		*h = 96;
+		break;
+	case 2:
+		*w = 176;
+		*h = 144;
+		break;
+	case 3:
+		*w = 352;
+		*h = 288;
+		break;
+	case 4:
+		*w = 704;
+		*h = 576;
+		break;
+	case 5:
+		*w = 1409;
+		*h = 1152 ;
+		break;
+	default:
+		*w = *h = 0;
+		break;
+	}
+}
+
+GF_Err h263dmx_process(GF_Filter *filter)
+{
+	GF_H263DmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u64 byte_offset;
+	char *data;
+	u8 *start;
+	Bool first_frame_found = GF_FALSE;
+	u32 pck_size;
+	s32 remain;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		h263dmx_check_dur(filter, ctx);
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			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;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	start = data;
+	remain = pck_size;
+
+
+	if (ctx->bytes_in_header) {
+#if 0
+		if (ctx->bytes_in_header + remain < 7) {
+			memcpy(ctx->header + ctx->bytes_in_header, start, remain);
+			ctx->bytes_in_header += remain;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		alread_sync = 7 - ctx->bytes_in_header;
+		memcpy(ctx->header + ctx->bytes_in_header, start, alread_sync);
+		start += alread_sync;
+		remain -= alread_sync;
+		ctx->bytes_in_header = 0;
+		alread_sync = GF_TRUE;
+#endif
+
+	}
+	//input pid sets some timescale - we flushed pending data , update cts
+	else if (ctx->timescale) {
+		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);
+	}
+
+	if (ctx->resume_from) {
+		if (gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+		start += ctx->resume_from;
+		remain -= ctx->resume_from;
+		ctx->resume_from = 0;
+	}
+
+	while (remain) {
+		u32 size=0;
+		Bool full_frame;
+		u8 *pck_data;
+		s32 current, next;
+		u32 fmt, w, h;
+
+		//not enough bytes
+		if (remain<5) {
+			memcpy(ctx->hdr_store, start, remain);
+			ctx->bytes_in_header = remain;
+			break;
+		}
+
+		if (ctx->bytes_in_header) {
+			if (first_frame_found) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[H263Dmx] corrupted frame!\n"));
+			}
+
+			memcpy(ctx->hdr_store + ctx->bytes_in_header, start, 8 - ctx->bytes_in_header);
+			current = h263dmx_next_start_code(ctx->hdr_store, 8);
+
+			//no start code in stored buffer
+			if (current<0) {
+				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);
+
+				memcpy(pck_data, ctx->hdr_store, ctx->bytes_in_header);
+				gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+				gf_filter_pck_set_cts(dst_pck, ctx->cts);
+				gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+				if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+
+				if (byte_offset != GF_FILTER_NO_BO) {
+					gf_filter_pck_set_byte_offset(dst_pck, byte_offset - ctx->bytes_in_header);
+				}
+				gf_filter_pck_send(dst_pck);
+				ctx->bytes_in_header = 0;
+
+				current = h263dmx_next_start_code(start, remain);
+			}
+		} else {
+			//locate next start code
+			current = h263dmx_next_start_code(start, remain);
+		}
+
+
+		if (current<0) {
+			//not enough bytes to process start code !!
+			break;
+		}
+
+		if (current>0) {
+			if (!ctx->opid) {
+				if (ctx->bytes_in_header) {
+					ctx->bytes_in_header -= current;
+				} else {
+					start += current;
+					remain -= current;
+				}
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[H263Dmx] garbage before first frame!\n"));
+				continue;
+			}
+			if (first_frame_found) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[H263Dmx] corrupted frame!\n"));
+			}
+			//flush remaining
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, current, &pck_data);
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+
+			if (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);
+				}
+				ctx->bytes_in_header -= current;
+				memcpy(pck_data, ctx->hdr_store, current);
+			} else {
+				if (byte_offset != GF_FILTER_NO_BO) {
+					gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
+				}
+				memcpy(pck_data, start, current);
+				start += current;
+				remain -= current;
+			}
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+			if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+			gf_filter_pck_send(dst_pck);
+
+			h263dmx_update_cts(ctx);
+		}
+
+		if (ctx->bytes_in_header) {
+			gf_bs_reassign_buffer(ctx->bs, ctx->hdr_store+current, 8-current);
+		} else if (!ctx->bs) {
+			ctx->bs = gf_bs_new(start, remain, GF_BITSTREAM_READ);
+		} else {
+			gf_bs_reassign_buffer(ctx->bs, start, remain);
+		}
+		/*parse header*/
+		gf_bs_read_int(ctx->bs, 22);
+		gf_bs_read_int(ctx->bs, 8);
+		/*spare+0+split_screen_indicator+document_camera_indicator+freeze_picture_release*/
+		gf_bs_read_int(ctx->bs, 5);
+
+		fmt = gf_bs_read_int(ctx->bs, 3);
+		h263_get_pic_size(ctx->bs, fmt, &w, &h);
+
+		h263dmx_check_pid(filter, ctx, w, h);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = (u32) ( (char *)start -  (char *)data );
+			return GF_OK;
+		}
+
+		if (ctx->in_seek) {
+			u64 nb_frames_at_seek = (u64) (ctx->start_range * ctx->fps.num);
+			if (ctx->cts + ctx->fps.den >= nb_frames_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->dts_inc) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		//good to go
+		next = h263dmx_next_start_code(start+1, remain-1);
+
+		if (next>0) {
+			size = next+1 + ctx->bytes_in_header;
+			full_frame = GF_TRUE;
+		} else {
+			u8 b3 = start[remain-3];
+			u8 b2 = start[remain-2];
+			u8 b1 = start[remain-1];
+			//we may have a startcode here !
+			if (!b1 || !b2 || !b3) {
+				memcpy(ctx->hdr_store, start+remain-3, 3);
+				remain -= 3;
+				ctx->bytes_in_header = 3;
+			}
+			size = remain;
+			full_frame = GF_FALSE;
+		}
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
+		if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+		if (ctx->bytes_in_header && current) {
+			memcpy(pck_data, ctx->hdr_store+current, ctx->bytes_in_header);
+			size -= ctx->bytes_in_header;
+			ctx->bytes_in_header = 0;
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset + ctx->bytes_in_header);
+			}
+			memcpy(pck_data, start, size);
+		} else {
+			memcpy(pck_data, start, size);
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset + start - (u8 *) data);
+			}
+		}
+
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, full_frame);
+		gf_filter_pck_set_cts(dst_pck, ctx->cts);
+		gf_filter_pck_set_sap(dst_pck, (start[4]&0x02) ? GF_FILTER_SAP_NONE : GF_FILTER_SAP_1);
+		gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+		if (ctx->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+		gf_filter_pck_send(dst_pck);
+
+		first_frame_found = GF_TRUE;
+		start += size;
+		remain -= size;
+		if (!full_frame) break;
+		h263dmx_update_cts(ctx);
+
+
+		//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 (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);
+
+	return GF_OK;
+}
+
+static void h263dmx_finalize(GF_Filter *filter)
+{
+	GF_H263DmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+}
+
+static const char * h263dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=0;
+	u32 max_nb_frames=0;
+	u32 prev_fmt=0;
+	u32 nb_fail=0;
+	s32 current = h263dmx_next_start_code((u8*)data, size);
+	while (size && (current>=0) && (current< (s32) size)) {
+		u32 fmt=0;
+		data += current;
+		size -= current;
+
+		GF_BitStream *bs = gf_bs_new((u8 *)data, size, GF_BITSTREAM_READ);
+
+		/*parse header*/
+		gf_bs_read_int(bs, 22);
+		gf_bs_read_int(bs, 8);
+		gf_bs_read_int(bs, 5);
+
+		fmt = gf_bs_read_int(bs, 3);
+		gf_bs_del(bs);
+
+		if (fmt>=1 && (fmt<=5)) {
+			if (!prev_fmt || (prev_fmt==fmt)) {
+				nb_frames++;
+			} else {
+				if (nb_frames>max_nb_frames) {
+					max_nb_frames = nb_frames;
+				}
+			}
+			prev_fmt=fmt;
+		} else {
+			nb_frames=0;
+			nb_fail++;
+			break;
+		}
+		current = h263dmx_next_start_code((u8*)data+1, size-1);
+		if (current<=0) break;
+		current++;
+		if ((s32) size < current) break;
+	}
+	if (nb_fail) return NULL;
+	if (nb_frames>max_nb_frames) {
+		max_nb_frames = nb_frames;
+	}
+
+	if (max_nb_frames>1) {
+		// *score = max_nb_frames>4 ? GF_FPROBE_SUPPORTED : GF_FPROBE_MAYBE_SUPPORTED;
+		//above fails the following test:
+		//gpac -mem-track -mem-track-stack -blacklist=nvdec  -i results/temp/hevc-split-merge/high_832x0.hvc  @ vout
+		//returning a score GF_FPROBE_SUPPORTED conflicting with naludmx_probe_data which also returns GF_FPROBE_SUPPORTED
+		//TODO Change the following code line in order that only naludmx_probe_data is GF_FPROBE_SUPPORTED:
+		//Tips: "nb_frames of naludmx is larger than the one of h263" may be considered.
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "video/h263";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability H263DmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "263|h263|s263"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/h263"),
+	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_S263),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_H263),
+	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_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_S263),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_H263),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_H263DmxCtx, _n)
+static const GF_FilterArgs H263DmxArgs[] =
+{
+	{ OFFS(fps), "import frame rate", GF_PROP_FRACTION, "15000/1000", NULL, 0},
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister H263DmxRegister = {
+	.name = "rfh263",
+	GF_FS_SET_DESCRIPTION("H263 reframer")
+	GF_FS_SET_HELP("This filter parses H263 files/data and outputs corresponding visual PID and frames.")
+	.private_size = sizeof(GF_H263DmxCtx),
+	.args = H263DmxArgs,
+	.finalize = h263dmx_finalize,
+	SETCAPS(H263DmxCaps),
+	.configure_pid = h263dmx_configure_pid,
+	.process = h263dmx_process,
+	.probe_data = h263dmx_probe_data,
+	.process_event = h263dmx_process_event
+};
+
+
+const GF_FilterRegister *h263dmx_register(GF_FilterSession *session)
+{
+	return &H263DmxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/reframe_img.c Added

@@ -0,0 +1,434 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / image (jpg/png/bmp/j2k) 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/filters.h>
+#include <gpac/constants.h>
+#include <gpac/avparse.h>
+
+
+#if defined(WIN32) || defined(_WIN32_WCE)
+#include <windows.h>
+#else
+
+#ifdef GPAC_CONFIG_LINUX
+#include <arpa/inet.h>
+#endif
+
+typedef struct tagBITMAPFILEHEADER
+{
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
+} BITMAPFILEHEADER;
+
+typedef struct tagBITMAPINFOHEADER {
+	u32	biSize;
+	s32	biWidth;
+	s32	biHeight;
+	u16	biPlanes;
+	u16	biBitCount;
+	u32	biCompression;
+	u32	biSizeImage;
+	s32	biXPelsPerMeter;
+	s32	biYPelsPerMeter;
+	u32	biClrUsed;
+	u32	biClrImportant;
+} BITMAPINFOHEADER;
+
+#define BI_RGB        0L
+
+#endif
+
+typedef struct
+{
+	//options
+	GF_Fraction fps;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+	u32 src_timescale;
+	Bool is_bmp;
+	Bool owns_timescale;
+	u32 codec_id;
+
+	Bool initial_play_done;
+	Bool is_playing;
+} GF_ReframeImgCtx;
+
+
+GF_Err img_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_ReframeImgCtx *ctx = gf_filter_get_udta(filter);
+	const GF_PropertyValue *p;
+	
+	if (is_remove) {
+		ctx->ipid = NULL;
+		return GF_OK;
+	}
+
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	ctx->ipid = pid;
+	//force retest of codecid
+	ctx->codec_id = 0;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) ctx->src_timescale = p->value.uint;
+
+	if (ctx->src_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);
+	}
+	ctx->is_playing = GF_TRUE;
+	return GF_OK;
+}
+
+Bool img_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_FilterEvent fevt;
+	GF_ReframeImgCtx *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) {
+			return GF_TRUE;
+		}
+
+		ctx->is_playing = GF_TRUE;
+		if (!ctx->initial_play_done) {
+			ctx->initial_play_done = GF_TRUE;
+			return GF_TRUE;
+		}
+
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 0;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+		return GF_TRUE;
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		return GF_FALSE;
+	default:
+		break;
+	}
+	//cancel all events
+	return GF_TRUE;
+}
+
+GF_Err img_process(GF_Filter *filter)
+{
+	GF_ReframeImgCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	GF_Err e;
+	u8 *data, *output;
+	u32 size, w=0, h=0, pf=0;
+	u8 *pix;
+	u32 i, j, irow, in_stride, out_stride;
+	GF_BitStream *bs;
+	BITMAPFILEHEADER fh;
+	BITMAPINFOHEADER fi;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			ctx->is_playing = GF_FALSE;
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	data = (char *) gf_filter_pck_get_data(pck, &size);
+	
+	if (!ctx->opid || !ctx->codec_id) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		u32 dsi_size;
+		u8 *dsi=NULL;
+#endif
+		const char *ext, *mime;
+		const GF_PropertyValue *prop;
+		u32 codecid = 0;
+
+		if ((size >= 54) && (data[0] == 'B') && (data[1] == 'M')) {
+			codecid = GF_CODECID_RAW;
+			ctx->is_bmp = GF_TRUE;
+		}
+#ifndef GPAC_DISABLE_AV_PARSERS
+		else {
+			bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+			gf_img_parse(bs, &codecid, &w, &h, &dsi, &dsi_size);
+			gf_bs_del(bs);
+		}
+#endif
+
+		prop = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_EXT);
+		ext = (prop && prop->value.string) ? prop->value.string : "";
+		prop = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_MIME);
+		mime = (prop && prop->value.string) ? prop->value.string : "";
+
+		if (!codecid) {
+			if (!stricmp(ext, "jpeg") || !stricmp(ext, "jpg") || !strcmp(mime, "image/jpg")) {
+				codecid = GF_CODECID_JPEG;
+			} else if (!stricmp(ext, "png") || !strcmp(mime, "image/png")) {
+				codecid = GF_CODECID_PNG;
+			} else if (!stricmp(ext, "jp2") || !stricmp(ext, "j2k") || !strcmp(mime, "image/jp2")) {
+				codecid = GF_CODECID_J2K;
+			} else if (!stricmp(ext, "pngd")) {
+				codecid = GF_CODECID_PNG;
+				pf = GF_PIXEL_RGBD;
+			} else if (!stricmp(ext, "pngds")) {
+				codecid = GF_CODECID_PNG;
+				pf = GF_PIXEL_RGBDS;
+			} else if (!stricmp(ext, "pngs")) {
+				codecid = GF_CODECID_PNG;
+				pf = GF_PIXEL_RGBS;
+			} else if (!stricmp(ext, "bmp") || !strcmp(mime, "image/png")) {
+				codecid = GF_CODECID_RAW;
+			}
+		}
+		if (!codecid) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->codec_id = codecid;
+		ctx->opid = gf_filter_pid_new(filter);
+		if (!ctx->opid) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_SERVICE_ERROR;
+		}
+		if (!ctx->fps.num || !ctx->fps.den) {
+			ctx->fps.num = 1000;
+			ctx->fps.den = 1000;
+		}
+		//we don't have input reconfig for now
+		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(codecid));
+		if (pf) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, & PROP_UINT(pf));
+		if (w) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(w));
+		if (h) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(h));
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (dsi) gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dsi, dsi_size));
+#endif
+		if (! gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_TIMESCALE)) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->fps.num) );
+			ctx->owns_timescale = GF_TRUE;
+		}
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NB_FRAMES, &PROP_UINT(1) );
+
+		if (ext || mime)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+	}
+	if (! ctx->is_bmp) {
+		e = GF_OK;
+		u32 start_offset = 0;
+		if (ctx->codec_id==GF_CODECID_J2K) {
+
+			if (size<8) {
+				gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+
+			if ((data[4]=='j') && (data[5]=='P') && (data[6]==' ') && (data[7]==' ')) {
+				bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+				while (gf_bs_available(bs)) {
+					u32 bsize = gf_bs_read_u32(bs);
+					u32 btype = gf_bs_read_u32(bs);
+					if (btype == GF_4CC('j','p','2','c') ) {
+						start_offset = (u32) gf_bs_get_position(bs) - 8;
+						break;
+					}
+					gf_bs_skip_bytes(bs, bsize-8);
+				}
+				gf_bs_del(bs);
+				if (start_offset>=size) {
+					gf_filter_pid_drop_packet(ctx->ipid);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+			}
+		}
+		dst_pck = gf_filter_pck_new_ref(ctx->opid, data+start_offset, size-start_offset, pck);
+		if (!dst_pck) e = GF_OUT_OF_MEM;
+		gf_filter_pck_merge_properties(pck, dst_pck);
+		if (ctx->owns_timescale) {
+			gf_filter_pck_set_cts(dst_pck, 0);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1 );
+			gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+		}
+		gf_filter_pck_send(dst_pck);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return e;
+	}
+
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+
+	/*fh.bfType = */ gf_bs_read_u16(bs);
+	/*fh.bfSize = */ gf_bs_read_u32(bs);
+	/*fh.bfReserved1 = */ gf_bs_read_u16(bs);
+	/*fh.bfReserved2 = */ gf_bs_read_u16(bs);
+	fh.bfOffBits = gf_bs_read_u32(bs);
+	fh.bfOffBits = ntohl(fh.bfOffBits);
+
+	gf_bs_read_data(bs, (char *) &fi, 40);
+	gf_bs_del(bs);
+
+	if ((fi.biCompression != BI_RGB) || (fi.biPlanes!=1)) return GF_NOT_SUPPORTED;
+	if ((fi.biBitCount!=24) && (fi.biBitCount!=32)) return GF_NOT_SUPPORTED;
+
+	w = fi.biWidth;
+	h = fi.biHeight;
+	pf = (fi.biBitCount==24) ? GF_PIXEL_RGB : GF_PIXEL_RGBA;
+	size = (fi.biBitCount==24) ? 3 : 4;
+	size *= w;
+	out_stride = size;
+	size *= h;
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PIXFMT, & PROP_UINT(pf));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, & PROP_UINT(w));
+	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);
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	if (ctx->owns_timescale) {
+		gf_filter_pck_set_cts(dst_pck, 0);
+		gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1 );
+		gf_filter_pck_set_duration(dst_pck, ctx->fps.den);
+	}
+
+	in_stride = out_stride;
+	while (in_stride % 4) in_stride++;
+
+	if (fi.biBitCount==24) {
+		for (i=0; i<h; i++) {
+			irow = (h-1-i)*out_stride;
+			pix = data + fh.bfOffBits + i*in_stride;
+			for (j=0; j<out_stride; j+=3) {
+				output[j + irow] = pix[2];
+				output[j+1 + irow] = pix[1];
+				output[j+2 + irow] = pix[0];
+				pix += 3;
+			}
+		}
+	} else {
+		for (i=0; i<h; i++) {
+			irow = (h-1-i)*out_stride;
+			pix = data + fh.bfOffBits + i*in_stride;
+			for (j=0; j<out_stride; j+=4) {
+				output[j + irow] = pix[2];
+				output[j+1 + irow] = pix[1];
+				output[j+2 + irow] = pix[0];
+				output[j+3 + irow] = pix[3];
+				pix += 4;
+			}
+		}
+	}
+	e = gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+#include <gpac/internal/isomedia_dev.h>
+
+static const char * img_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	/*JPEG*/
+	if ((data[0]==0xFF) && (data[1]==0xD8) && (data[2]==0xFF)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "image/jpg";
+	}
+	/*PNG*/
+	if ((data[0]==0x89) && (data[1]==0x50) && (data[2]==0x4E)) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "image/png";
+	}
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	u32 bsize = gf_bs_read_u32(bs);
+	u32 btype = gf_bs_read_u32(bs);
+	if ( (bsize==12) && ( (btype==GF_ISOM_BOX_TYPE_JP ) || (btype==GF_ISOM_BOX_TYPE_JP2H) ) ) {
+		if (btype==GF_ISOM_BOX_TYPE_JP2H) {
+			*score = GF_FPROBE_FORCE;
+			gf_bs_del(bs);
+			return "image/jp2";
+		}
+		btype = gf_bs_read_u32(bs);
+		if (btype==0x0D0A870A) {
+			*score = GF_FPROBE_FORCE;
+			gf_bs_del(bs);
+			return "image/jp2";
+		}
+	}
+	gf_bs_del(bs);
+	if ((size >= 54) && (data[0] == 'B') && (data[1] == 'M')) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "image/bmp";
+	}
+	return NULL;
+}
+static const GF_FilterCapability ReframeImgCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "jpg|jpeg|jp2|bmp|png|pngd|pngds|pngs"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "image/jpg|image/jp2|image/bmp|image/png|image/x-png+depth|image/x-png+depth+mask|image/x-png+stereo"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_PNG),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_JPEG),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_J2K),
+	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_ReframeImgCtx, _n)
+static const GF_FilterArgs ReframeImgArgs[] =
+{
+	{ OFFS(fps), "import frame rate (0 default to 1 Hz)", GF_PROP_FRACTION, "0/1000", NULL, GF_FS_ARG_HINT_HIDE},
+	{0}
+};
+
+GF_FilterRegister ReframeImgRegister = {
+	.name = "rfimg",
+	GF_FS_SET_DESCRIPTION("JPG/J2K/PNG/BMP reframer")
+	GF_FS_SET_HELP("This filter parses JPG/J2K/PNG/BMP files/data and outputs corresponding visual PID and frames.")
+	.private_size = sizeof(GF_ReframeImgCtx),
+	.args = ReframeImgArgs,
+	SETCAPS(ReframeImgCaps),
+	.configure_pid = img_configure_pid,
+	.probe_data = img_probe_data,
+	.process = img_process,
+	.process_event = img_process_event
+};
+
+const GF_FilterRegister *img_reframe_register(GF_FilterSession *session)
+{
+	return &ReframeImgRegister;
+}
+
+

gpac-1.0.0.tar.gz/src/filters/reframe_latm.c Added

@@ -0,0 +1,637 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AAC ADTS 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>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} LATMIdx;
+
+typedef struct
+{
+	//filter args
+	u32 frame_size;
+	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 sr_idx, nb_ch, base_object_type;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+
+	GF_M4ADecSpecInfo acfg;
+	
+	char *latm_buffer;
+	u32 latm_buffer_size, latm_buffer_alloc;
+	u32 dts_inc;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	GF_FilterPacket *src_pck;
+
+	LATMIdx *indexes;
+	u32 index_alloc_size, index_size;
+	u32 resume_from;
+} GF_LATMDmxCtx;
+
+
+static Bool latm_dmx_sync_frame_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *acfg, u32 *nb_bytes, u8 *buffer, u32 *nb_skipped)
+{
+	u32 val, size;
+	u64 pos, mux_size;
+	if (nb_skipped) *nb_skipped = 0;
+	if (!acfg) return 0;
+
+	while (gf_bs_available(bs)>3) {
+		val = gf_bs_read_u8(bs);
+		if (val!=0x56) {
+			if (nb_skipped) (*nb_skipped) ++;
+			continue;
+		}
+		val = gf_bs_read_int(bs, 3);
+		if (val != 0x07) {
+			gf_bs_read_int(bs, 5);
+			if (nb_skipped) (*nb_skipped) ++;
+			continue;
+		}
+		mux_size = gf_bs_read_int(bs, 13);
+		pos = gf_bs_get_position(bs);
+		if (mux_size>gf_bs_available(bs) ) {
+			gf_bs_seek(bs, pos-3);
+			return GF_FALSE;
+		}
+
+		/*use same stream mux*/
+		if (!gf_bs_read_int(bs, 1)) {
+			Bool amux_version, amux_versionA;
+
+			amux_version = (Bool)gf_bs_read_int(bs, 1);
+			amux_versionA = GF_FALSE;
+			if (amux_version) amux_versionA = (Bool)gf_bs_read_int(bs, 1);
+			if (!amux_versionA) {
+				u32 i, allStreamsSameTimeFraming, numProgram;
+				if (amux_version) gf_latm_get_value(bs);
+
+				allStreamsSameTimeFraming = gf_bs_read_int(bs, 1);
+				/*numSubFrames = */gf_bs_read_int(bs, 6);
+				numProgram = gf_bs_read_int(bs, 4);
+				for (i=0; i<=numProgram; i++) {
+					u32 j, num_lay;
+					num_lay = gf_bs_read_int(bs, 3);
+					for (j=0; j<=num_lay; j++) {
+						u32 frameLengthType;
+						Bool same_cfg = GF_FALSE;
+						if (i || j) same_cfg = (Bool)gf_bs_read_int(bs, 1);
+
+						if (!same_cfg) {
+							if (amux_version==1) gf_latm_get_value(bs);
+							gf_m4a_parse_config(bs, acfg, GF_FALSE);
+						}
+						frameLengthType = gf_bs_read_int(bs, 3);
+						if (!frameLengthType) {
+							/*latmBufferFullness = */gf_bs_read_int(bs, 8);
+							if (!allStreamsSameTimeFraming) {
+							}
+						} else {
+							/*not supported*/
+						}
+					}
+
+				}
+				/*other data present*/
+				if (gf_bs_read_int(bs, 1)) {
+//					u32 k = 0;
+				}
+				/*CRCcheck present*/
+				if (gf_bs_read_int(bs, 1)) {
+				}
+			}
+		}
+
+		size = 0;
+		while (1) {
+			u32 tmp = gf_bs_read_int(bs, 8);
+			size += tmp;
+			if (tmp!=255) break;
+		}
+		if (gf_bs_available(bs) < size) {
+			gf_bs_seek(bs, pos-3);
+			return GF_FALSE;
+		}
+
+		if (nb_bytes) {
+			*nb_bytes = (u32) size;
+		}
+
+		if (buffer) {
+			gf_bs_read_data(bs, (char *) buffer, size);
+		} else {
+			while (size) {
+				gf_bs_read_int(bs, 8);
+				size--;
+			}
+		}
+
+		/*parse amux*/
+		gf_bs_seek(bs, pos + mux_size);
+
+		if ((gf_bs_available(bs)>2) && gf_bs_peek_bits(bs, 11, 0) != 0x2B7) {
+			gf_bs_seek(bs, pos + 1);
+			if (nb_skipped) (*nb_skipped) ++;
+			continue;
+		}
+
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+
+
+GF_Err latm_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_LATMDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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);
+	}
+
+	return GF_OK;
+}
+
+static void latm_dmx_check_dur(GF_Filter *filter, GF_LATMDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	GF_M4ADecSpecInfo acfg;
+	u64 duration, cur_dur, cur_pos;
+	s32 sr_idx = -1;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	duration = 0;
+	cur_dur = 0;
+	cur_pos = gf_bs_get_position(bs);
+	while (latm_dmx_sync_frame_bs(bs, &acfg, 0, NULL, NULL)) {
+		if ((sr_idx>=0) && (sr_idx != acfg.base_sr_index)) {
+			duration *= GF_M4ASampleRates[acfg.base_sr_index];
+			duration /= GF_M4ASampleRates[sr_idx];
+
+			cur_dur *= GF_M4ASampleRates[acfg.base_sr_index];
+			cur_dur /= GF_M4ASampleRates[sr_idx];
+		}
+		sr_idx = acfg.base_sr_index;
+		duration += ctx->frame_size;
+		cur_dur += ctx->frame_size;
+		if (cur_dur > ctx->index * GF_M4ASampleRates[sr_idx]) {
+			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(LATMIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = cur_pos;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= GF_M4ASampleRates[sr_idx];
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		cur_pos = gf_bs_get_position(bs);
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (sr_idx>=0) {
+		if (!ctx->duration.num || (ctx->duration.num  * GF_M4ASampleRates[sr_idx] != duration * ctx->duration.den)) {
+			ctx->duration.num = (s32) duration;
+			ctx->duration.den = GF_M4ASampleRates[sr_idx];
+
+			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;
+	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;
+
+	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 ((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;
+
+	//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_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) {
+		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->nb_ch = ctx->acfg.nb_chan;
+	ctx->base_object_type = ctx->acfg.base_object_type;
+
+	sr = GF_M4ASampleRates[ctx->acfg.base_sr_index];
+	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->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) );
+	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;
+
+	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) );
+
+}
+
+static Bool latm_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_LATMDmxCtx *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;
+		}
+		if (! ctx->is_file) {
+			if (evt->play.start_range || ctx->initial_play_done) {
+				ctx->latm_buffer_size = 0;
+				ctx->resume_from = 0;
+			}
+
+			ctx->initial_play_done = GF_TRUE;
+			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 * GF_M4ASampleRates[ctx->sr_idx]);
+					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->latm_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 latm_dmx_update_cts(GF_LATMDmxCtx *ctx)
+{
+	assert(ctx->dts_inc);
+
+	if (ctx->timescale) {
+		u64 inc = ctx->dts_inc;
+		inc *= ctx->timescale;
+		inc /= GF_M4ASampleRates[ctx->sr_idx];
+		ctx->cts += inc;
+	} else {
+		ctx->cts += ctx->dts_inc;
+	}
+}
+
+GF_Err latm_dmx_process(GF_Filter *filter)
+{
+	GF_LATMDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u32 pos;
+	u8 *data, *output;
+	u32 pck_size, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		latm_dmx_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->latm_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;
+		}
+	}
+
+	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);
+	}
+
+	prev_pck_size = ctx->latm_buffer_size;
+
+	if (pck && !ctx->resume_from) {
+		if (ctx->latm_buffer_size + pck_size > ctx->latm_buffer_alloc) {
+			ctx->latm_buffer_alloc = ctx->latm_buffer_size + pck_size;
+			ctx->latm_buffer = gf_realloc(ctx->latm_buffer, ctx->latm_buffer_alloc);
+		}
+		memcpy(ctx->latm_buffer + ctx->latm_buffer_size, data, pck_size);
+		ctx->latm_buffer_size += pck_size;
+	}
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(ctx->latm_buffer, ctx->latm_buffer_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs, ctx->latm_buffer, ctx->latm_buffer_size);
+
+	if (ctx->resume_from) {
+		gf_bs_seek(ctx->bs, ctx->resume_from-1);
+		ctx->resume_from = 0;
+	}
+
+	if (cts == GF_FILTER_NO_TS)
+		prev_pck_size = 0;
+
+
+	while (1) {
+		pos = (u32) gf_bs_get_position(ctx->bs);
+		u8 latm_buffer[4096];
+		u32 latm_frame_size = 4096;
+		if (!latm_dmx_sync_frame_bs(ctx->bs,&ctx->acfg, &latm_frame_size, latm_buffer, NULL)) break;
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * GF_M4ASampleRates[ctx->sr_idx]);
+			if (ctx->cts + ctx->dts_inc >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->dts_inc) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		latm_dmx_check_pid(filter, ctx);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = pos+1;
+			return GF_OK;
+		}
+
+		if (!ctx->in_seek) {
+			GF_FilterSAPType sap = GF_FILTER_SAP_1;
+
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, latm_frame_size, &output);
+			if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+
+			memcpy(output, latm_buffer, latm_frame_size);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_duration(dst_pck, ctx->dts_inc);
+			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)) {
+					sap = GF_FILTER_SAP_1;
+				} else {
+					sap = GF_FILTER_SAP_NONE;
+				}
+			}
+			gf_filter_pck_set_sap(dst_pck, sap);
+
+			gf_filter_pck_send(dst_pck);
+		}
+		latm_dmx_update_cts(ctx);
+
+		if (prev_pck_size) {
+			pos = (u32) gf_bs_get_position(ctx->bs);
+			if (prev_pck_size<=pos) {
+				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 (pck) {
+		pos = (u32) gf_bs_get_position(ctx->bs);
+		assert(ctx->latm_buffer_size >= pos);
+		memmove(ctx->latm_buffer, ctx->latm_buffer+pos, ctx->latm_buffer_size - pos);
+		ctx->latm_buffer_size -= pos;
+		gf_filter_pid_drop_packet(ctx->ipid);
+		assert(!ctx->resume_from);
+	} else {
+		ctx->latm_buffer_size = 0;
+		return latm_dmx_process(filter);
+	}
+	return GF_OK;
+}
+
+static void latm_dmx_finalize(GF_Filter *filter)
+{
+	GF_LATMDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->latm_buffer) gf_free(ctx->latm_buffer);
+}
+
+static const char *latm_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=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;
+		nb_frames++;
+	}
+	gf_bs_del(bs);
+	if (nb_frames>=2) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/aac+latm";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability LATMDmxCaps[] =
+{
+	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_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),
+	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,GF_PROP_PID_UNFRAMED_LATM, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_LATMDmxCtx, _n)
+static const GF_FilterArgs LATMDmxArgs[] =
+{
+	{ OFFS(frame_size), "size of AAC frame in audio samples", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister LATMDmxRegister = {
+	.name = "rflatm",
+	GF_FS_SET_DESCRIPTION("LATM reframer")
+	GF_FS_SET_HELP("This filter parses AAC in LATM files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_LATMDmxCtx),
+	.args = LATMDmxArgs,
+	.finalize = latm_dmx_finalize,
+	SETCAPS(LATMDmxCaps),
+	.configure_pid = latm_dmx_configure_pid,
+	.process = latm_dmx_process,
+	.probe_data = latm_dmx_probe_data,
+	.process_event = latm_dmx_process_event
+};
+
+
+const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session)
+{
+	return &LATMDmxRegister;
+}
+
+#else
+const GF_FilterRegister *latm_dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS

gpac-1.0.0.tar.gz/src/filters/reframe_mp3.c Added

@@ -0,0 +1,830 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MP3 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>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} MP3Idx;
+
+typedef struct
+{
+	//filter args
+	Double index;
+	Bool expart;
+
+	//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;
+	u32 sr, nb_ch, codecid;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+	Bool is_playing;
+	Bool is_file;
+	Bool initial_play_done, file_loaded;
+
+	u32 hdr;
+
+	u8 *mp3_buffer;
+	u32 mp3_buffer_size, mp3_buffer_alloc, resume_from;
+	u64 byte_offset;
+
+	GF_FilterPacket *src_pck;
+
+	Bool recompute_cts;
+	MP3Idx *indexes;
+	u32 index_alloc_size, index_size;
+
+	u32 tag_size;
+	u8 *id3_buffer;
+	u32 id3_buffer_size, id3_buffer_alloc;
+
+	GF_FilterPid *vpid;
+} GF_MP3DmxCtx;
+
+
+
+
+GF_Err mp3_dmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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;
+
+	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);
+	}
+	return GF_OK;
+}
+
+static void mp3_dmx_check_dur(GF_Filter *filter, GF_MP3DmxCtx *ctx)
+{
+	FILE *stream;
+	u64 duration, cur_dur;
+	s32 prev_sr = -1;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	duration = 0;
+	cur_dur = 0;
+	while (1) {
+		u32 sr, dur;
+		u64 pos;
+		u32 hdr = gf_mp3_get_next_header(stream);
+		if (!hdr) break;
+		sr = gf_mp3_sampling_rate(hdr);
+
+		if ((prev_sr>=0) && (prev_sr != sr)) {
+			duration *= sr;
+			duration /= prev_sr;
+
+			cur_dur *= sr;
+			cur_dur /= prev_sr;
+		}
+		prev_sr = sr;
+		dur = gf_mp3_window_size(hdr);
+		duration += dur;
+		cur_dur += dur;
+		pos = gf_ftell(stream);
+		if (cur_dur > ctx->index * prev_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(MP3Idx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos - 4;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= prev_sr;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		pos = gf_ftell(stream);
+		gf_fseek(stream, pos + gf_mp3_frame_size(hdr) - 4, SEEK_SET);
+	}
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * prev_sr != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = prev_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;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+}
+
+
+#include <gpac/utf.h>
+static void id3dmx_set_string(GF_FilterPid *apid, char *name, u8 *buf)
+{
+	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) );
+		char *tmp = gf_malloc(len+1);
+		len = (s32) gf_utf8_wcstombs(tmp, len, &sptr);
+		if (len>=0) {
+			tmp[len] = 0;
+			gf_filter_pid_set_property_dyn(apid, name, &PROP_STRING(tmp) );
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[MP3Dmx] Corrupted ID3 text frame %s\n", name));
+		}
+		gf_free(tmp);
+	} else {
+		gf_filter_pid_set_property_dyn(apid, name, &PROP_STRING(buf) );
+	}
+}
+
+void id3dmx_flush(GF_Filter *filter, u8 *id3_buf, u32 id3_buf_size, GF_FilterPid *audio_pid, GF_FilterPid **video_pid_p)
+{
+	GF_BitStream *bs = gf_bs_new(id3_buf, id3_buf_size, GF_BITSTREAM_READ);
+	char *sep_desc;
+	char *buf=NULL;
+	u32 buf_alloc=0;
+	gf_bs_skip_bytes(bs, 3);
+	/*u8 major = */gf_bs_read_u8(bs);
+	/*u8 minor = */gf_bs_read_u8(bs);
+	/*u8 unsync = */gf_bs_read_int(bs, 1);
+	u8 ext_hdr = gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 6);
+	u32 size = gf_id3_read_size(bs);
+
+
+	if (ext_hdr) {
+
+	}
+
+	while (size && (gf_bs_available(bs)>=10) ) {
+		char szTag[1024];
+		char *sep;
+		u32 pic_size;
+		//u32 pic_type;
+		u32 ftag = gf_bs_read_u32(bs);
+		u32 fsize = gf_id3_read_size(bs);
+		/*u16 fflags = */gf_bs_read_u16(bs);
+
+		size -= 10;
+		if (!fsize)
+			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));
+			break;
+		}
+
+		if (buf_alloc<=fsize) {
+			buf = gf_realloc(buf, fsize+2);
+			buf_alloc = fsize+2;
+		}
+
+		gf_bs_read_data(bs, buf, fsize);
+		buf[fsize]=0;
+		buf[fsize+1]=0;
+
+		switch (ftag) {
+		case ID3V2_FRAME_TIT2:
+			id3dmx_set_string(audio_pid, "tag:title", buf+1);
+			break;
+		case ID3V2_FRAME_TPE1:
+			id3dmx_set_string(audio_pid, "tag:artist", buf+1);
+			break;
+		case ID3V2_FRAME_TALB:
+			id3dmx_set_string(audio_pid, "tag:album", buf+1);
+			break;
+		case ID3V2_FRAME_TCON:
+			id3dmx_set_string(audio_pid, "tag:genre", buf+1);
+			break;
+		case ID3V2_FRAME_TDRC:
+			id3dmx_set_string(audio_pid, "tag:recdate", buf+1);
+			break;
+		case ID3V2_FRAME_TRCK:
+			id3dmx_set_string(audio_pid, "tag:tracknum", buf+1);
+			break;
+		case ID3V2_FRAME_TSSE:
+			id3dmx_set_string(audio_pid, "tag:encoder", buf+1);
+			break;
+		case ID3V2_FRAME_TXXX:
+			sep = memchr(buf, 0, fsize);
+			if (sep) {
+				strcpy(szTag, "tag:");
+				strncat(szTag, buf+1, 1019);
+				id3dmx_set_string(audio_pid, szTag, sep+1);
+			}
+			break;
+
+		case ID3V2_FRAME_APIC:
+			//first char is text encoding
+			//then mime
+			sep = memchr(buf+1, 0, fsize-1);
+			/*pic_type = sep[1];*/
+			sep_desc = memchr(sep+2, 0, fsize-1);
+
+			if (sep_desc) {
+				GF_Err e;
+				pic_size = (u32) ( (sep_desc + 1) - buf);
+				pic_size = fsize - pic_size;
+
+				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) ));
+					}
+					if (*video_pid_p) {
+						u8 *out_buffer;
+						GF_FilterPacket *dst_pck;
+						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);
+
+						gf_filter_pid_set_eos(*video_pid_p);
+					}
+				} else {
+					gf_filter_pid_set_property(audio_pid, GF_PROP_PID_COVER_ART, &PROP_DATA(sep_desc+1, pic_size) );
+				}
+			}
+			break;
+
+		default:
+			sprintf(szTag, "tag:%s", gf_4cc_to_str(ftag));
+
+			if ((ftag>>24) == 'T') {
+				id3dmx_set_string(audio_pid, szTag, buf+1);
+			} else {
+				gf_filter_pid_set_property_str(audio_pid, szTag, &PROP_DATA(buf, fsize) );
+			}
+			break;
+		}
+		size -= fsize;
+	}
+	gf_bs_del(bs);
+	if (buf) gf_free(buf);
+}
+static void mp3_dmx_flush_id3(GF_Filter *filter, GF_MP3DmxCtx *ctx)
+{
+	id3dmx_flush(filter, ctx->id3_buffer, ctx->id3_buffer_size, ctx->opid, ctx->expart ? &ctx->vpid : NULL);
+	ctx->id3_buffer_size = 0;
+}
+
+static void mp3_dmx_check_pid(GF_Filter *filter, GF_MP3DmxCtx *ctx)
+{
+	u32 sr;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		mp3_dmx_check_dur(filter, ctx);
+	}
+
+	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) )
+	)
+		return;
+
+	//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_name(ctx->opid, "audio");
+
+	ctx->nb_ch = gf_mp3_num_channels(ctx->hdr);
+	ctx->codecid = gf_mp3_object_type_indication(ctx->hdr);
+	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->sr = sr;
+
+	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_SAMPLES_PER_FRAME, & PROP_UINT(gf_mp3_window_size(ctx->hdr) ) );
+
+	if (ctx->id3_buffer_size)
+		mp3_dmx_flush_id3(filter, ctx);
+
+}
+
+static Bool mp3_dmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	GF_FilterEvent fevt;
+	GF_MP3DmxCtx *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->mp3_buffer_size = 0;
+				ctx->resume_from = 0;
+			}
+			ctx->initial_play_done = GF_TRUE;
+			return GF_FALSE;
+		}
+		mp3_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->sr);
+					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->mp3_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 mp3_dmx_update_cts(GF_MP3DmxCtx *ctx)
+{
+	u32 nb_samp = gf_mp3_window_size(ctx->hdr);
+	if (ctx->timescale) {
+		u64 inc = nb_samp;
+		inc *= ctx->timescale;
+		inc /= ctx->sr;
+		ctx->cts += inc;
+	} else {
+		ctx->cts += nb_samp;
+	}
+}
+
+GF_Err mp3_dmx_process(GF_Filter *filter)
+{
+	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u8 *start;
+	u32 pck_size, remain, prev_pck_size;
+	u64 cts = GF_FILTER_NO_TS;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		mp3_dmx_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->mp3_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->mp3_buffer_size;
+	if (pck && !ctx->resume_from) {
+		data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+		if (ctx->byte_offset != GF_FILTER_NO_BO) {
+			u64 byte_offset = gf_filter_pck_get_byte_offset(pck);
+			if (!ctx->mp3_buffer_size) {
+				ctx->byte_offset = byte_offset;
+			} else if (ctx->byte_offset + ctx->mp3_buffer_size != byte_offset) {
+				ctx->byte_offset = GF_FILTER_NO_BO;
+				if ((byte_offset != GF_FILTER_NO_BO) && (byte_offset>ctx->mp3_buffer_size) ) {
+					ctx->byte_offset = byte_offset - ctx->mp3_buffer_size;
+				}
+			}
+		}
+
+		if (ctx->mp3_buffer_size + pck_size > ctx->mp3_buffer_alloc) {
+			ctx->mp3_buffer_alloc = ctx->mp3_buffer_size + pck_size;
+			ctx->mp3_buffer = gf_realloc(ctx->mp3_buffer, ctx->mp3_buffer_alloc);
+		}
+		memcpy(ctx->mp3_buffer + ctx->mp3_buffer_size, data, pck_size);
+		ctx->mp3_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->mp3_buffer_size;
+	start = ctx->mp3_buffer;
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from - 1;
+		remain -= ctx->resume_from - 1;
+		ctx->resume_from = 0;
+	}
+
+	while (remain) {
+		u8 *sync;
+		Bool skip_id3v1=GF_FALSE;
+		u32 bytes_skipped=0, size, nb_samp, bytes_to_drop=0;;
+
+		if (!ctx->tag_size && (remain>3)) {
+
+			/* Did we read an ID3v2 ? */
+			if (start[0] == 'I' && start[1] == 'D' && start[2] == '3') {
+				if (remain<10)
+					return GF_OK;
+
+				ctx->tag_size = ((start[9] & 0x7f) + ((start[8] & 0x7f) << 7) + ((start[7] & 0x7f) << 14) + ((start[6] & 0x7f) << 21));
+
+				bytes_to_drop = 10;
+				if (ctx->id3_buffer_alloc < ctx->tag_size+10) {
+					ctx->id3_buffer = gf_realloc(ctx->id3_buffer, ctx->tag_size+10);
+					ctx->id3_buffer_alloc = ctx->tag_size+10;
+				}
+				memcpy(ctx->id3_buffer, start, 10);
+				ctx->id3_buffer_size = 10;
+				goto drop_byte;
+			}
+		}
+		if (ctx->tag_size) {
+			if (ctx->tag_size>remain) {
+				bytes_to_drop = remain;
+				ctx->tag_size-=remain;
+			} else {
+				bytes_to_drop = ctx->tag_size;
+				ctx->tag_size = 0;
+			}
+			memcpy(ctx->id3_buffer + ctx->id3_buffer_size, start, bytes_to_drop);
+			ctx->id3_buffer_size += bytes_to_drop;
+
+			if (!ctx->tag_size && ctx->opid) {
+				mp3_dmx_flush_id3(filter, ctx);
+			}
+			goto drop_byte;
+
+		}
+
+		ctx->hdr = gf_mp3_get_next_header_mem(start, remain, &bytes_skipped);
+
+		//couldn't find sync byte in this packet
+		if (!ctx->hdr) {
+			break;
+		}
+		sync = start + bytes_skipped;
+
+		size = gf_mp3_frame_size(ctx->hdr);
+
+
+		//ready to send packet
+		if (size + 1 < remain-bytes_skipped) {
+			//make sure we are sync!
+			if (sync[size] !=0xFF) {
+				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"));
+					goto drop_byte;
+				}
+			}
+		}
+		//otherwise wait for next frame, unless if end of stream
+		else if (pck) {
+			break;
+		}
+		//ready to send packet
+		mp3_dmx_check_pid(filter, ctx);
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = (u32) (sync - ctx->mp3_buffer + 1);
+			return GF_OK;
+		}
+
+		nb_samp = gf_mp3_window_size(ctx->hdr);
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * ctx->sr);
+			if (ctx->cts + nb_samp >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + nb_samp ) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		bytes_to_drop = bytes_skipped + size;
+		if (ctx->timescale && !prev_pck_size && (cts != GF_FILTER_NO_TS) ) {
+			ctx->cts = cts;
+			cts = GF_FILTER_NO_TS;
+		}
+
+		if (!ctx->in_seek) {
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+			memcpy(output, sync, size);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_duration(dst_pck, nb_samp);
+			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 + bytes_skipped);
+			}
+
+			gf_filter_pck_send(dst_pck);
+		}
+		mp3_dmx_update_cts(ctx);
+
+		//TODO, parse id3v1 ??
+		if (skip_id3v1)
+			bytes_to_drop+=128;
+
+		//truncated last frame
+		if (bytes_to_drop>remain) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[MP3Dmx] truncated frame!\n"));
+			bytes_to_drop=remain;
+		}
+
+drop_byte:
+		if (!bytes_to_drop) {
+			bytes_to_drop = 1;
+		}
+		start += bytes_to_drop;
+		remain -= bytes_to_drop;
+
+		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->mp3_buffer_size = 0;
+		return mp3_dmx_process(filter);
+	} else {
+		if (remain) {
+			memmove(ctx->mp3_buffer, start, remain);
+		}
+		ctx->mp3_buffer_size = remain;
+		gf_filter_pid_drop_packet(ctx->ipid);
+	}
+	return GF_OK;
+}
+
+static void mp3_dmx_finalize(GF_Filter *filter)
+{
+	GF_MP3DmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->mp3_buffer) gf_free(ctx->mp3_buffer);
+	if (ctx->id3_buffer) gf_free(ctx->id3_buffer);
+	if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+}
+
+
+static const char *mp3_dmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 nb_frames=0;
+	u32 pos=0;
+	u32 prev_pos=0;
+	Bool has_id3 = GF_FALSE;
+
+	/* Check for ID3 */
+	if (size>= 10) {
+		if (data[0] == 'I' && data[1] == 'D' && data[2] == '3') {
+			u32 tag_size = ((data[9] & 0x7f) + ((data[8] & 0x7f) << 7) + ((data[7] & 0x7f) << 14) + ((data[6] & 0x7f) << 21));
+
+			if (tag_size+10>size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("ID3 tag detected size %d but probe data only %d bytes, will rely on file extension (try increasing probe size using --block_size)\n", tag_size+10, size));
+				*score = GF_FPROBE_EXT_MATCH;
+				return "mp3|mp2|mp1";
+			}
+			data += tag_size+10;
+			size -= tag_size+10;
+			has_id3 = GF_TRUE;
+		}
+	}
+
+	while (1) {
+		u32 hdr = gf_mp3_get_next_header_mem(data, size, &pos);
+		if (!hdr) break;
+
+		if (gf_mp3_version(hdr) > 3)
+			break;
+		u8 sampleRateIndex = (hdr >> 10) & 0x3;
+		if (sampleRateIndex>2)
+			break;
+		u32 fsize = gf_mp3_frame_size(hdr);
+		if (prev_pos && pos) {
+			nb_frames=0;
+			break;
+		}
+
+		if (fsize + pos > size) {
+			nb_frames++;
+			break;
+		}
+
+		prev_pos = pos;
+		nb_frames++;
+		if (nb_frames>4) break;
+		if (size < fsize + pos) break;
+		size -= fsize + pos;
+		data += fsize + pos;
+	}
+
+	if (nb_frames>=2) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "audio/mp3";
+	}
+	if (nb_frames && has_id3) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "audio/mp3";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability MP3DmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "mp3|mp2|mp1"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/mp3|audio/x-mp3"),
+	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_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_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
+	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_MP3DmxCtx, _n)
+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},
+	{0}
+};
+
+
+GF_FilterRegister MP3DmxRegister = {
+	.name = "rfmp3",
+	GF_FS_SET_DESCRIPTION("MP3 reframer")
+	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,
+	.finalize = mp3_dmx_finalize,
+	SETCAPS(MP3DmxCaps),
+	.configure_pid = mp3_dmx_configure_pid,
+	.process = mp3_dmx_process,
+	.probe_data = mp3_dmx_probe_data,
+	.process_event = mp3_dmx_process_event
+};
+
+
+const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session)
+{
+	return &MP3DmxRegister;
+}
+
+#else
+const GF_FilterRegister *mp3_dmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+

gpac-1.0.0.tar.gz/src/filters/reframe_mpgvid.c Added

@@ -0,0 +1,1188 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-1/2/4(Part2) video 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>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	u64 pos;
+	Double start_time;
+} MPGVidIdx;
+
+typedef struct
+{
+	//filter args
+	GF_Fraction fps;
+	Double index;
+	Bool vfr, importer;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_BitStream *bs;
+	u64 cts, dts, prev_dts;
+	u32 width, height;
+	GF_Fraction64 duration;
+	Double start_range;
+	Bool in_seek;
+	u32 timescale;
+
+	u32 resume_from;
+	GF_Fraction cur_fps;
+
+	Bool is_mpg12, forced_packed;
+	GF_M4VParser *vparser;
+	GF_M4VDecSpecInfo dsi;
+	u32 b_frames;
+	Bool is_packed, is_vfr;
+	GF_List *pck_queue;
+	u64 last_ref_cts;
+	Bool frame_started;
+
+	u32 nb_i, nb_p, nb_b, nb_frames, max_b;
+
+	u32 bytes_in_header;
+	char *hdr_store;
+	u32 hdr_store_size, hdr_store_alloc;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	Bool input_is_au_start, input_is_au_end;
+	Bool recompute_cts;
+
+	GF_FilterPacket *src_pck;
+
+	MPGVidIdx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_MPGVidDmxCtx;
+
+
+GF_Err mpgviddmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	Bool was_mpeg12;
+	const GF_PropertyValue *p;
+	GF_MPGVidDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	ctx->cur_fps = ctx->fps;
+	if (!ctx->fps.num || !ctx->fps.den) {
+		ctx->cur_fps.num = 25000;
+		ctx->cur_fps.den = 1000;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) {
+		ctx->timescale = ctx->cur_fps.num = p->value.uint;
+		ctx->cur_fps.den = 0;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+		if (p) {
+			ctx->cur_fps = p->value.frac;
+		}
+		p = gf_filter_pid_get_property_str(pid, "nocts");
+		if (p && p->value.boolean) ctx->recompute_cts = GF_TRUE;
+	}
+
+	was_mpeg12 = ctx->is_mpg12;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+	if (p) {
+		switch (p->value.uint) {
+		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:
+			ctx->is_mpg12 = GF_TRUE;
+			break;
+		}
+	}
+	else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && p->value.string && (strstr(p->value.string, "m1v") || strstr(p->value.string, "m2v")) ) ctx->is_mpg12 = GF_TRUE;
+		else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+			if (p && p->value.string && (strstr(p->value.string, "m1v") || strstr(p->value.string, "m2v")) ) ctx->is_mpg12 = GF_TRUE;
+		}
+	}
+
+	if (ctx->vparser && (was_mpeg12 != ctx->is_mpg12)) {
+		gf_m4v_parser_del_no_bs(ctx->vparser);
+		ctx->vparser = NULL;
+	}
+
+	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);
+	}
+	return GF_OK;
+}
+
+
+static void mpgviddmx_check_dur(GF_Filter *filter, GF_MPGVidDmxCtx *ctx)
+{
+
+	FILE *stream;
+	GF_BitStream *bs;
+	GF_M4VParser *vparser;
+	GF_M4VDecSpecInfo dsi;
+	GF_Err e;
+	u64 duration, cur_dur;
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->index_size = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+
+	vparser = gf_m4v_parser_bs_new(bs, ctx->is_mpg12);
+	e = gf_m4v_parse_config(vparser, &dsi);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MPGVid] Could not parse video header - duration  not estimated\n"));
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	duration = 0;
+	cur_dur = 0;
+	while (gf_bs_available(bs)) {
+		u8 ftype;
+		u32 tinc;
+		u64 fsize, start;
+		Bool is_coded;
+		u64 pos;
+		pos = gf_m4v_get_object_start(vparser);
+		e = gf_m4v_parse_frame(vparser, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
+		if (e<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[MPGVid] Could not parse video frame\n"));
+			continue;
+		}
+
+		duration += ctx->cur_fps.den;
+		cur_dur += ctx->cur_fps.den;
+		//only index at I-frame start
+		if (pos && (ftype==0) && (cur_dur >= ctx->index * ctx->cur_fps.num) ) {
+			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(MPGVidIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos;
+			ctx->indexes[ctx->index_size].start_time = (Double) (duration-ctx->cur_fps.den);
+			ctx->indexes[ctx->index_size].start_time /= ctx->cur_fps.num;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+	}
+	gf_m4v_parser_del(vparser);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->cur_fps.num != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = ctx->cur_fps.num;
+
+		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;
+	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
+	//need to signal this for consumers using DTS (eg MPEG-2 TS)
+	if (flush_ref && ctx->pck_queue) {
+		//send all reference packet queued
+		u32 i, count = gf_list_count(ctx->pck_queue);
+
+		for (i=0; i<count; i++) {
+			u64 cts;
+			GF_FilterPacket *q_pck = gf_list_get(ctx->pck_queue, i);
+			u8 carousel = gf_filter_pck_get_carousel_version(q_pck);
+			if (!carousel) {
+				gf_filter_pck_send(q_pck);
+				continue;
+			}
+			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
+				if (ctx->last_ref_cts == cts) {
+					cts += ctx->b_frames * ctx->cur_fps.den;
+					gf_filter_pck_set_cts(q_pck, cts);
+				} else {
+					//shift all other frames (i.e. pending Bs) by 1 frame in the past since we move the ref frame after them
+					assert(cts >= ctx->cur_fps.den);
+					cts -= ctx->cur_fps.den;
+					gf_filter_pck_set_cts(q_pck, cts);
+				}
+			}
+			if (is_eos && (i+1==count)) {
+				Bool start, end;
+				gf_filter_pck_get_framing(q_pck, &start, &end);
+				gf_filter_pck_set_framing(q_pck, start, GF_TRUE);
+			}
+			gf_filter_pck_send(q_pck);
+		}
+		gf_list_reset(ctx->pck_queue);
+	}
+	if (!pck) return;
+
+	if (!ctx->pck_queue) ctx->pck_queue = gf_list_new();
+	gf_list_add(ctx->pck_queue, pck);
+}
+
+static void mpgviddmx_check_pid(GF_Filter *filter, GF_MPGVidDmxCtx *ctx, u32 vosh_size, u8 *data)
+{
+	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;
+
+	//copy properties at init or reconfig
+	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);
+
+	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;
+		if (cid) {
+			switch (cid->value.uint) {
+			case GF_CODECID_MPEG2_MAIN:
+			case GF_CODECID_MPEG2_422:
+			case GF_CODECID_MPEG2_SNR:
+			case GF_CODECID_MPEG2_HIGH:
+				//keep same signaling
+				PL = cid->value.uint;
+				break;
+			default:
+				break;
+			}
+		}
+		if (!PL) PL = 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) );
+
+	ctx->b_frames = 0;
+
+	if (vosh_size) {
+		u32 i;
+		char * dcfg = gf_malloc(sizeof(char)*vosh_size);
+		memcpy(dcfg, data, sizeof(char)*vosh_size);
+
+		/*remove packed flag if any (VOSH user data)*/
+		ctx->is_packed = ctx->is_vfr = ctx->forced_packed = GF_FALSE;
+		i=0;
+		while (1) {
+			char *frame = dcfg;
+			while ((i+3<vosh_size)  && ((frame[i]!=0) || (frame[i+1]!=0) || (frame[i+2]!=1))) i++;
+			if (i+4>=vosh_size) break;
+			if (strncmp(frame+i+4, "DivX", 4)) {
+				i += 4;
+				continue;
+			}
+			frame = strchr(dcfg + i + 4, 'p');
+			if (frame) {
+				ctx->forced_packed = GF_TRUE;
+				frame[0] = 'n';
+			}
+			break;
+		}
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DECODER_CONFIG, & PROP_DATA_NO_COPY(dcfg, vosh_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 mpgviddmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_MPGVidDmxCtx *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->bytes_in_header = 0;
+		}
+		if (! ctx->is_file) {
+			if (!ctx->initial_play_done) {
+				ctx->initial_play_done = GF_TRUE;
+				if (evt->play.start_range>0.1) ctx->resume_from = 0;
+ 			}
+			return GF_FALSE;
+		}
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+
+		if (ctx->start_range) {
+			for (i=1; i<ctx->index_size; i++) {
+				if ((ctx->indexes[i].start_time > ctx->start_range) || (i+1==ctx->index_size)) {
+					ctx->cts = (u64) (ctx->indexes[i-1].start_time * ctx->cur_fps.num);
+					file_pos = ctx->indexes[i-1].pos;
+					break;
+				}
+			}
+		}
+		ctx->dts = ctx->cts;
+		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)
+				return GF_TRUE;
+		}
+		ctx->resume_from = 0;
+		ctx->bytes_in_header = 0;
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 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;
+		if (ctx->pck_queue) {
+			while (gf_list_count(ctx->pck_queue)) {
+				GF_FilterPacket *pck=gf_list_pop_front(ctx->pck_queue);
+				gf_filter_pck_discard(pck);
+			}
+		}
+		//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 mpgviddmx_update_time(GF_MPGVidDmxCtx *ctx)
+{
+	assert(ctx->cur_fps.num);
+
+	if (ctx->timescale) {
+		u64 inc = 3000;
+		if (ctx->cur_fps.den && ctx->cur_fps.num) {
+			inc = ctx->cur_fps.den;
+			if (ctx->cur_fps.num != ctx->timescale) {
+				inc *= ctx->timescale;
+				inc /= ctx->cur_fps.num;
+			}
+		}
+		ctx->cts += inc;
+		ctx->dts += inc;
+	} else {
+		assert(ctx->cur_fps.den);
+		ctx->cts += ctx->cur_fps.den;
+		ctx->dts += ctx->cur_fps.den;
+	}
+}
+
+
+static s32 mpgviddmx_next_start_code(u8 *data, u32 size)
+{
+	u32 v, bpos, found;
+	s64 start, end;
+
+	bpos = 0;
+	found = 0;
+	start = 0;
+	end = 0;
+
+	v = 0xffffffff;
+	while (!end) {
+		if (bpos == size)
+			return -1;
+		v = ( (v<<8) & 0xFFFFFF00) | data[bpos];
+
+		bpos++;
+		if ((v & 0xFFFFFF00) == 0x00000100) {
+			end = start + bpos - 4;
+			found = 1;
+			break;
+		}
+	}
+	if (!found)
+		return -1;
+	assert(end >= start);
+	return (s32) (end - start);
+}
+
+GF_Err mpgviddmx_process(GF_Filter *filter)
+{
+	GF_MPGVidDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u64 byte_offset;
+	s64 vosh_start = -1;
+	s64 vosh_end = -1;
+	GF_Err e;
+	char *data;
+	u8 *start;
+	u32 pck_size;
+	s32 remain;
+
+	//always reparse duration
+	if (!ctx->duration.num)
+		mpgviddmx_check_dur(filter, ctx);
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_TRUE);
+			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;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	start = data;
+	remain = pck_size;
+
+	//input pid sets some timescale - 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;
+			}
+		}
+		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;
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = pck;
+		gf_filter_pck_ref_props(&ctx->src_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);
+		}
+		memcpy(ctx->hdr_store + ctx->hdr_store_size, data, sizeof(char)*pck_size);
+		if (byte_offset != GF_FILTER_NO_BO) {
+			if (byte_offset >= ctx->hdr_store_size)
+				byte_offset -= ctx->hdr_store_size;
+			else
+				byte_offset = GF_FILTER_NO_BO;
+		}
+		ctx->hdr_store_size += pck_size;
+		start = data = ctx->hdr_store;
+		remain = pck_size = ctx->hdr_store_size;
+	}
+
+	if (ctx->resume_from) {
+		if (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(remain >= (s32) ctx->resume_from);
+			start += ctx->resume_from;
+			remain -= ctx->resume_from;
+		}
+		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);
+	}
+	if (!ctx->vparser) {
+		ctx->vparser = gf_m4v_parser_bs_new(ctx->bs, ctx->is_mpg12);
+	}
+
+
+	while (remain) {
+		Bool full_frame;
+		u8 *pck_data;
+		s32 current;
+		u8 sc_type, forced_sc_type=0;
+		Bool sc_type_forced = GF_FALSE;
+		Bool skip_pck = GF_FALSE;
+		u8 ftype;
+		u32 tinc;
+		u64 size=0;
+		u64 fstart;
+		Bool is_coded;
+		u32 bytes_from_store = 0;
+		u32 hdr_offset = 0;
+		Bool copy_last_bytes = GF_FALSE;
+
+		//not enough bytes to parse start code
+		if (remain<5) {
+			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) {
+
+			memcpy(ctx->hdr_store + ctx->bytes_in_header, start, 8 - ctx->bytes_in_header);
+			current = mpgviddmx_next_start_code(ctx->hdr_store, 8);
+
+			//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 (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);
+				if (current<0) current = -1;
+				else current -= ctx->bytes_in_header;
+				ctx->bytes_in_header = 0;
+			} else {
+				//we have a valid start code, check which byte in our store or in the packet payload is the start code type
+				//and remember its location to reinit the parser from there
+				hdr_offset = 4 - ctx->bytes_in_header + current;
+				//bytes still to dispatch
+				bytes_from_store = ctx->bytes_in_header;
+				ctx->bytes_in_header = 0;
+				if (!hdr_offset) {
+					forced_sc_type = ctx->hdr_store[current+3];
+				} else {
+					forced_sc_type = start[hdr_offset-1];
+				}
+				sc_type_forced = GF_TRUE;
+			}
+		}
+		//no starcode in store, look for startcode in packet
+		if (current == -1) {
+			//locate next start code
+			current = mpgviddmx_next_start_code(start, remain);
+			//no start code, dispatch the block
+			if (current<0) {
+				u8 b3, b2, b1;
+				if (! ctx->frame_started) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[MPGVid] no start code in block and no frame started, discarding data\n" ));
+					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 (!b1 || !b2 || !b3) {
+					copy_last_bytes = GF_TRUE;
+					assert(size >= 3);
+					size -= 3;
+					ctx->bytes_in_header = 3;
+				}
+
+				dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) size, &pck_data);
+				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);
+				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);
+				}
+
+				mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
+				if (copy_last_bytes) {
+					memcpy(ctx->hdr_store, start+remain-3, 3);
+				}
+				break;
+			}
+		}
+
+		assert(current>=0);
+
+		//if we are in the middle of parsing the vosh, skip over bytes remaining from previous obj not parsed
+		if ((vosh_start>=0) && current) {
+			assert(remain>=current);
+			start += current;
+			remain -= current;
+			current = 0;
+		}
+		//also skip if no output pid
+		if (!ctx->opid && current) {
+			assert(remain>=current);
+			start += current;
+			remain -= current;
+			current = 0;
+		}
+		//dispatch remaining bytes
+		if (current>0) {
+			//flush remaining
+			dst_pck = gf_filter_pck_new_alloc(ctx->opid, current, &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);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_TRUE);
+			//bytes were partly in store, partly in packet
+			if (bytes_from_store) {
+				if (byte_offset != GF_FILTER_NO_BO) {
+					gf_filter_pck_set_byte_offset(dst_pck, byte_offset - bytes_from_store);
+				}
+				assert(bytes_from_store>=(u32) current);
+				bytes_from_store -= current;
+				memcpy(pck_data, ctx->hdr_store, current);
+			} else {
+				//bytes were only in packet
+				if (byte_offset != GF_FILTER_NO_BO) {
+					gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
+				}
+				memcpy(pck_data, start, current);
+				assert(remain>=current);
+				start += current;
+				remain -= current;
+				current = 0;
+			}
+			gf_filter_pck_set_carousel_version(dst_pck, 1);
+
+			mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
+		}
+
+		//parse headers
+
+		//we have a start code loaded, eg the data packet does not have a full start code at the begining
+		if (sc_type_forced) {
+			gf_bs_reassign_buffer(ctx->bs, start + hdr_offset, remain - hdr_offset);
+			sc_type = forced_sc_type;
+		} else {
+			gf_bs_reassign_buffer(ctx->bs, start, remain);
+			gf_bs_read_int(ctx->bs, 24);
+			sc_type = gf_bs_read_int(ctx->bs, 8);
+		}
+
+		if (ctx->is_mpg12) {
+			switch (sc_type) {
+			case M2V_SEQ_START_CODE:
+			case M2V_EXT_START_CODE:
+				gf_bs_reassign_buffer(ctx->bs, start, remain);
+				e = gf_m4v_parse_config(ctx->vparser, &ctx->dsi);
+				//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);
+					}
+					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);
+				}
+				break;
+			case M2V_PIC_START_CODE:
+				break;
+			default:
+				break;
+			}
+
+		} else {
+			u8 PL;
+			switch (sc_type) {
+			case M4V_VOS_START_CODE:
+				ctx->dsi.VideoPL = (u8) gf_bs_read_u8(ctx->bs);
+				vosh_start = start - (u8 *)data;
+				skip_pck = GF_TRUE;
+				assert(remain>=5);
+				start += 5;
+				remain -= 5;
+				break;
+			case M4V_VOL_START_CODE:
+				gf_bs_reassign_buffer(ctx->bs, start, remain);
+				PL = ctx->dsi.VideoPL;
+				e = gf_m4v_parse_config(ctx->vparser, &ctx->dsi);
+				ctx->dsi.VideoPL = PL;
+				//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);
+					}
+					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);
+					vosh_end = start - (u8 *)data + obj_size;
+					vosh_end -= vosh_start;
+					mpgviddmx_check_pid(filter, ctx,(u32)  vosh_end, data+vosh_start);
+					skip_pck = GF_TRUE;
+					assert(remain>=(s32) obj_size);
+					start += obj_size;
+					remain -= obj_size;
+				}
+				break;
+			case M4V_VOP_START_CODE:
+			case M4V_GOV_START_CODE:
+				break;
+
+			case M4V_VO_START_CODE:
+			case M4V_VISOBJ_START_CODE:
+			default:
+				if (vosh_start>=0) {
+					skip_pck = GF_TRUE;
+					assert(remain>=4);
+					start += 4;
+					remain -= 4;
+				}
+				break;
+			}
+		}
+
+		if (skip_pck) {
+			continue;
+		}
+
+		if (!ctx->opid) {
+			assert(remain>=4);
+			start += 4;
+			remain -= 4;
+			continue;
+		}
+
+		if (!ctx->is_playing) {
+			ctx->resume_from = (u32) ((char *)start -  (char *)data);
+			return GF_OK;
+		}
+		//at this point, we no longer reaggregate packets
+		ctx->hdr_store_size = 0;
+
+		if (ctx->in_seek) {
+			u64 nb_frames_at_seek = (u64) (ctx->start_range * ctx->cur_fps.num);
+			if (ctx->cts + ctx->cur_fps.den >= nb_frames_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->dts_inc) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+		//may happen that after all our checks, only 4 bytes are left, continue to store these 4 bytes
+		if (remain<5)
+			continue;
+
+		//good to go
+		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);
+
+		//we skipped bytes already in store + end of start code present in packet, so the size of the first object
+		//needs adjustement
+		if (bytes_from_store) {
+			size += bytes_from_store + hdr_offset;
+		}
+
+		if ((e == GF_EOS) && !ctx->input_is_au_end) {
+			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;
+			}
+			full_frame = GF_FALSE;
+		} else {
+			full_frame = GF_TRUE;
+		}
+
+		if (!is_coded) {
+			/*if prev is B and we're parsing a packed bitstream discard n-vop*/
+			if (ctx->forced_packed && ctx->b_frames) {
+				ctx->is_packed = GF_TRUE;
+				assert(remain>=size);
+				start += size;
+				remain -= (s32) size;
+				continue;
+			}
+			/*policy is to import at variable frame rate, skip*/
+			if (ctx->vfr) {
+				ctx->is_vfr = GF_TRUE;
+				mpgviddmx_update_time(ctx);
+				assert(remain>=size);
+				start += size;
+				remain -= (s32) size;
+				continue;
+			}
+			/*policy is to keep non coded frame (constant frame rate), add*/
+		}
+
+		if (ftype==2) {
+			//count number of B-frames since last ref
+			ctx->b_frames++;
+			ctx->nb_b++;
+		} else {
+			//flush all pending packets
+			mpgviddmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE, GF_FALSE);
+			//remeber 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;
+			
+			ctx->b_frames = 0;
+			if (ftype)
+				ctx->nb_p++;
+			else
+				ctx->nb_i++;
+		}
+		ctx->nb_frames++;
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, (u32) size, &pck_data);
+		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) {
+			memcpy(pck_data, ctx->hdr_store+current, bytes_from_store);
+			assert(size >= bytes_from_store);
+			size -= bytes_from_store;
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset - bytes_from_store);
+			}
+			memcpy(pck_data + bytes_from_store, start, (size_t) size);
+		} else {
+			//bytes only come the data packet
+			memcpy(pck_data, start, (size_t) size);
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset + start - (u8 *) data);
+			}
+		}
+		assert(pck_data[0] == 0);
+		assert(pck_data[1] == 0);
+		assert(pck_data[2] == 0x01);
+
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, (full_frame || ctx->input_is_au_end) ? GF_TRUE : GF_FALSE);
+		gf_filter_pck_set_cts(dst_pck, ctx->cts);
+		gf_filter_pck_set_dts(dst_pck, ctx->dts);
+		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
+			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->in_seek) gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+		ctx->frame_started = GF_TRUE;
+
+		mpgviddmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE, GF_FALSE);
+
+		mpgviddmx_update_time(ctx);
+
+		if (!full_frame) {
+			if (copy_last_bytes) {
+				memcpy(ctx->hdr_store, start+remain-3, 3);
+			}
+			break;
+		}
+		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);
+
+	return GF_OK;
+}
+
+static GF_Err mpgviddmx_initialize(GF_Filter *filter)
+{
+	GF_MPGVidDmxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->hdr_store_size = 0;
+	ctx->hdr_store_alloc = 8;
+	ctx->hdr_store = gf_malloc(sizeof(char)*8);
+	return GF_OK;
+}
+
+static void mpgviddmx_finalize(GF_Filter *filter)
+{
+	GF_MPGVidDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->vparser) gf_m4v_parser_del_no_bs(ctx->vparser);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->hdr_store) gf_free(ctx->hdr_store);
+	if (ctx->pck_queue) {
+		while (gf_list_count(ctx->pck_queue)) {
+			GF_FilterPacket *pck = gf_list_pop_back(ctx->pck_queue);
+			gf_filter_pck_discard(pck);
+		}
+		gf_list_del(ctx->pck_queue);
+	}
+	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));
+		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" : "" ));
+		}
+		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"));
+		}
+	}
+}
+
+static const char * mpgvdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	GF_M4VParser *parser;
+	u8 ftype;
+	u32 tinc, nb_frames;
+	u64 fsize, start;
+	Bool is_coded;
+	GF_Err e;
+	GF_M4VDecSpecInfo dsi;
+
+	memset(&dsi, 0, sizeof(GF_M4VDecSpecInfo));
+	parser = gf_m4v_parser_new((char*)data, size, GF_FALSE);
+	nb_frames = 0;
+	while (1) {
+		ftype = 0;
+		is_coded = GF_FALSE;
+		e = gf_m4v_parse_frame(parser, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
+		if (!nb_frames && start)
+			break;
+		if (is_coded) nb_frames++;
+		if (e==GF_EOS) {
+			if (is_coded) nb_frames++;
+			e = GF_OK;
+			break;
+		}
+		if (ftype>2) break;
+		if (e) break;
+		nb_frames++;
+	}
+	gf_m4v_parser_del(parser);
+	if ((e==GF_OK) && (nb_frames>1)) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "video/mp4v-es";
+	}
+
+	memset(&dsi, 0, sizeof(GF_M4VDecSpecInfo));
+	parser = gf_m4v_parser_new((char*)data, size, GF_TRUE);
+	nb_frames = 0;
+	while (1) {
+		ftype = 0;
+		is_coded = GF_FALSE;
+		e = gf_m4v_parse_frame(parser, &dsi, &ftype, &tinc, &fsize, &start, &is_coded);
+		if (!nb_frames && start)
+			break;
+		if (is_coded) nb_frames++;
+		if (e==GF_EOS) {
+			if (is_coded) nb_frames++;
+			e = GF_OK;
+			break;
+		}
+		if (ftype>2) break;
+		if (e) break;
+		nb_frames++;
+	}
+	gf_m4v_parser_del(parser);
+	if ((e==GF_OK) && (nb_frames>1)) {
+		*score = GF_FPROBE_MAYBE_SUPPORTED;
+		return "video/mpgv-es";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability MPGVidDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "cmp|m1v|m2v"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/mp4v-es|video/mpgv-es"),
+	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_MPEG4_PART2),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG1),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SIMPLE),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SNR),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_MAIN),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_HIGH),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
+	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_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG1),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SNR),
+	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_HIGH),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_MPGVidDmxCtx, _n)
+static const GF_FilterArgs MPGVidDmxArgs[] =
+{
+	{ 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", 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},
+	{0}
+};
+
+
+GF_FilterRegister MPGVidDmxRegister = {
+	.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.")
+	.private_size = sizeof(GF_MPGVidDmxCtx),
+	.args = MPGVidDmxArgs,
+	.initialize = mpgviddmx_initialize,
+	.finalize = mpgviddmx_finalize,
+	SETCAPS(MPGVidDmxCaps),
+	.configure_pid = mpgviddmx_configure_pid,
+	.process = mpgviddmx_process,
+	.probe_data = mpgvdmx_probe_data,
+	.process_event = mpgviddmx_process_event
+};
+
+
+const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session)
+{
+	return &MPGVidDmxRegister;
+}
+
+#else
+const GF_FilterRegister *mpgviddmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+
+

gpac-1.0.0.tar.gz/src/filters/reframe_nalu.c Added

@@ -0,0 +1,3209 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NALU (AVC & HEVC)  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>
+#include <gpac/internal/media_dev.h>
+//for oinf stuff
+#include <gpac/internal/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+#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
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} NALUIdx;
+
+
+typedef struct
+{
+	u32 layer_id_plus_one;
+	u32 min_temporal_id, max_temporal_id;
+} LHVCLayerInfo;
+
+typedef struct
+{
+	//filter args
+	GF_Fraction fps;
+	Double index;
+	Bool explicit, force_sync, strict_poc, nosei, importer, subsamples, nosvc, novpsext, deps, seirw, audelim, analyze;
+	u32 nal_length;
+	GF_Fraction idur;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	//read bitstream for AVC/HEVC parsing
+	GF_BitStream *bs_r;
+	//write bitstream for nalus size length rewrite
+	GF_BitStream *bs_w;
+	//current CTS/DTS of the stream, may be overriden by input packet if not file (eg TS PES)
+	u64 cts, dts, prev_dts;
+	u32 pck_duration;
+	//basic config stored here: with, height CRC of base and enh layer decoder config, sample aspect ratio
+	//when changing, a new pid config will be emitted
+	u32 width, height;
+	u32 crc_cfg, crc_cfg_enh;
+	GF_Fraction sar;
+	GF_Fraction cur_fps;
+
+	//duration of the file if known
+	GF_Fraction64 duration;
+	//playback start range
+	Double start_range;
+	//indicates we are in seek, packets before start range should be marked
+	Bool in_seek;
+	//set once we play something
+	Bool is_playing;
+	//is a file, is a file fully loaded on disk (local or download done)
+	Bool is_file, file_loaded;
+	//initial PLAY command found
+	Bool initial_play_done;
+
+	//list of RAP entry points
+	NALUIdx *indexes;
+	u32 index_alloc_size, index_size;
+
+
+	//timescale of the input pid if any, 0 otherwise
+	u32 timescale;
+	//framing flag of input packet when input pid has timing (eg is not a file)
+	Bool input_is_au_start;
+
+	GF_FilterPacket *src_pck;
+
+	Bool full_au_source;
+
+	//total delay in frames between decode and presentation
+	s32 max_total_delay;
+	//max size codable with our nal_length setting
+	u32 max_nalu_size_allowed;
+
+	//position in input packet from which we resume parsing
+	u32 resume_from;
+	//prevents message about possible NAL size optimizaion at finalization
+	Bool nal_adjusted;
+
+	//avc/hevc switch
+	Bool is_hevc;
+	//name of the logger
+	const char *log_name;
+
+	//list of packet (in decode order !!) not yet dispatched.
+	//Dispatch depends on the mode:
+	//strict_poc=0: we wait after each IDR until we find a stable poc diff between pictures, controled by poc_probe_done
+	//strict_poc=1: we dispatch only after IDR or at the end (huge delay)
+	GF_List *pck_queue;
+	//dts of the last IDR found
+	u64 dts_last_IDR;
+	//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;
+
+	//list of param sets found
+	GF_List *sps, *pps, *vps, *sps_ext, *pps_svc;
+	//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;
+
+	//frame has intra slice
+	Bool has_islice;
+	//AU is rap
+	GF_FilterSAPType au_sap;
+	//frame first slice
+	Bool first_slice_in_au;
+	//paff used - NEED FURTHER CHECKING
+	Bool is_paff;
+	Bool bottom_field_flag;
+	//SEI recovery count - if 0 and I slice only frame, openGOP detection (avc)
+	s32 sei_recovery_frame_count;
+	u32 use_opengop_gdr;
+	//poc compute variables
+	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
+	//set to TRUE once 3 frames with same min poc diff are found, enabling dispatch of the frames
+	Bool poc_probe_done;
+	//pointer to the first packet of the current frame (the one holding timing info)
+	//this packet is in the packet queue
+	GF_FilterPacket *first_pck_in_au;
+	//frame has slices used as reference
+	Bool has_ref_slices;
+	//frame has redundant coding
+	Bool has_redundant;
+
+	Bool next_nal_end_skip;
+
+	Bool last_frame_is_idr;
+
+	//buffer to store SEI messages
+	//for AVC: we have to rewrite the SEI to remove some of the messages according to the spec
+	//for HEVC: we store prefix SEI here and dispatch them once the first VCL is found
+	char *sei_buffer;
+	u32 sei_buffer_size, sei_buffer_alloc;
+
+	//subsample buffer, only used for SVC for now
+	u32 subsamp_buffer_alloc, subsamp_buffer_size, subs_mapped_bytes;
+	char *subsamp_buffer;
+
+	//AVC specific
+	//avc bitstream state
+	AVCState *avc_state;
+
+	//SVC specific
+	char *svc_prefix_buffer;
+	u32 svc_prefix_buffer_size, svc_prefix_buffer_alloc;
+	u32 svc_nalu_prefix_reserved;
+	u8 svc_nalu_prefix_priority;
+
+	//HEVC specific
+	HEVCState *hevc_state;
+	//shvc stats
+	u32 nb_e_idr, nb_e_i, nb_e_p, nb_e_b;
+
+	LHVCLayerInfo linf[64];
+	u8 max_temporal_id[64];
+	u8 min_layer_id;
+
+	Bool has_initial_aud;
+	char init_aud[3];
+
+	Bool interlaced, eos_in_bs;
+} GF_NALUDmxCtx;
+
+
+GF_Err naludmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		if (ctx->opid) gf_filter_pid_remove(ctx->opid);
+		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 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;
+		} else {
+			ctx->cur_fps.den = 0;
+			ctx->cur_fps.num = ctx->timescale;
+		}
+	}
+
+	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;
+			break;
+		}
+	}
+	else {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_MIME);
+		if (p && p->value.string && (
+			strstr(p->value.string, "hvc")
+			|| strstr(p->value.string, "hevc")
+			|| strstr(p->value.string, "265")
+			|| strstr(p->value.string, "shvc")
+			|| strstr(p->value.string, "mhvc")
+			|| strstr(p->value.string, "lhvc")
+		) ) ctx->is_hevc = GF_TRUE;
+		else {
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_FILE_EXT);
+			if (p && p->value.string && (
+				 strstr(p->value.string, "hvc")
+				 || strstr(p->value.string, "hevc")
+				 || strstr(p->value.string, "265")
+				 || strstr(p->value.string, "shvc")
+				 || strstr(p->value.string, "mhvc")
+				 || strstr(p->value.string, "lhvc")
+			 ) ) ctx->is_hevc = GF_TRUE;
+		}
+	}
+	if (ctx->is_hevc) {
+		ctx->log_name = "HEVC";
+		if (ctx->avc_state) gf_free(ctx->avc_state);
+		if (!ctx->hevc_state) GF_SAFEALLOC(ctx->hevc_state, HEVCState);
+		ctx->min_layer_id = 0xFF;
+	} else {
+		ctx->log_name = "AVC|H264";
+		if (ctx->hevc_state) gf_free(ctx->hevc_state);
+		if (!ctx->avc_state) GF_SAFEALLOC(ctx->avc_state, AVCState);
+	}
+	if (ctx->timescale && !ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		ctx->first_slice_in_au = GF_TRUE;
+	}
+	ctx->full_au_source = GF_FALSE;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED_FULL_AU);
+	if (p && p->value.boolean)
+		ctx->full_au_source = GF_TRUE;
+
+	//copy properties at init or reconfig
+	if (ctx->opid) {
+		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));
+		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))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ID, &PROP_UINT(1));
+
+		ctx->ps_modified = GF_TRUE;
+		ctx->crc_cfg = ctx->crc_cfg_enh = 0;
+	}
+	
+	return GF_OK;
+}
+
+
+static void naludmx_check_dur(GF_Filter *filter, GF_NALUDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	u64 duration, cur_dur, nal_start, start_code_pos;
+	AVCState *avc_state = NULL;
+	HEVCState *hevc_state = NULL;
+	Bool first_slice_in_pic = GF_TRUE;
+	const GF_PropertyValue *p;
+	const char *filepath = NULL;
+	if (!ctx->opid || ctx->timescale || ctx->file_loaded) 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;
+	}
+	filepath = p->value.string;
+	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));
+		} else {
+			ctx->index = -ctx->index;
+		}
+	}
+	if (ctx->index<=0) {
+		ctx->duration.num = 1;
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	if (ctx->is_hevc) {
+		GF_SAFEALLOC(hevc_state, HEVCState);
+		if (!hevc_state) return;
+	} else {
+		GF_SAFEALLOC(avc_state, AVCState);
+		if (!avc_state) return;
+	}
+
+	stream = gf_fopen(filepath, "rb");
+	if (!stream) {
+		if (hevc_state) gf_free(hevc_state);
+		if (avc_state) gf_free(avc_state);
+		return;
+	}
+	ctx->index_size = 0;
+	duration = 0;
+	cur_dur = 0;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	gf_bs_enable_emulation_byte_removal(bs, GF_TRUE);
+
+	start_code_pos = gf_bs_get_position(bs);
+	if (!gf_media_nalu_is_start_code(bs)) {
+		if (hevc_state) gf_free(hevc_state);
+		if (avc_state) gf_free(avc_state);
+		gf_bs_del(bs);
+		gf_fclose(stream);
+		ctx->duration.num = 1;
+		ctx->file_loaded = GF_TRUE;
+		return;
+	}
+
+	nal_start = gf_bs_get_position(bs);
+
+	while (gf_bs_available(bs)) {
+		u32 nal_size;
+		s32 res;
+		Bool is_rap = GF_FALSE;
+		Bool is_slice = GF_FALSE;
+		nal_size = gf_media_nalu_next_start_code_bs(bs);
+
+		gf_bs_seek(bs, nal_start);
+		if (hevc_state) {
+			u8 temporal_id, layer_id, nal_type;
+
+			res = gf_media_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:
+			case GF_HEVC_NALU_SLICE_IDR_W_DLP:
+			case GF_HEVC_NALU_SLICE_CRA:
+			case GF_HEVC_NALU_SLICE_BLA_N_LP:
+			case GF_HEVC_NALU_SLICE_BLA_W_LP:
+			case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+				is_rap = GF_TRUE;
+				is_slice = GF_TRUE;
+				break;
+			case GF_HEVC_NALU_SLICE_STSA_N:
+			case GF_HEVC_NALU_SLICE_STSA_R:
+			case GF_HEVC_NALU_SLICE_RADL_R:
+			case GF_HEVC_NALU_SLICE_RASL_R:
+			case GF_HEVC_NALU_SLICE_RADL_N:
+			case GF_HEVC_NALU_SLICE_RASL_N:
+			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:
+				is_slice = GF_TRUE;
+				break;
+			}
+		} else {
+			u32 nal_type;
+			u64 pos = gf_bs_get_position(bs);
+			res = gf_media_avc_parse_nalu(bs, avc_state);
+			if (res>0) first_slice_in_pic = GF_TRUE;
+
+			nal_type = avc_state->last_nal_type_parsed;
+
+			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);
+				break;
+			case GF_AVC_NALU_PIC_PARAM:
+				gf_bs_seek(bs, pos);
+				gf_media_avc_read_pps_bs(bs, avc_state);
+				break;
+			case GF_AVC_NALU_IDR_SLICE:
+				is_rap = GF_TRUE;
+				is_slice = GF_TRUE;
+				break;
+			case GF_AVC_NALU_NON_IDR_SLICE:
+			case GF_AVC_NALU_DP_A_SLICE:
+			case GF_AVC_NALU_DP_B_SLICE:
+			case GF_AVC_NALU_DP_C_SLICE:
+				is_slice = GF_TRUE;
+				break;
+			}
+		}
+
+		if (is_rap && first_slice_in_pic && (cur_dur >= ctx->index * ctx->cur_fps.num) ) {
+			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(NALUIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = start_code_pos;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= ctx->cur_fps.num;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+
+		if (is_slice && first_slice_in_pic) {
+			duration += ctx->cur_fps.den;
+			cur_dur += ctx->cur_fps.den;
+			first_slice_in_pic = GF_FALSE;
+		}
+
+		gf_bs_seek(bs, nal_start + nal_size);
+/*		nal_start = gf_media_nalu_next_start_code_bs(bs);
+		if (nal_start) gf_bs_skip_bytes(bs, nal_start);
+*/
+		if (gf_bs_available(bs)<4)
+			break;
+
+		start_code_pos = gf_bs_get_position(bs);
+		nal_start = gf_media_nalu_is_start_code(bs);
+		if (!nal_start) {
+			break;
+		}
+		nal_start = gf_bs_get_position(bs);
+	}
+
+	gf_bs_del(bs);
+	gf_fclose(stream);
+	if (hevc_state) gf_free(hevc_state);
+	if (avc_state) gf_free(avc_state);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->cur_fps.num != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = ctx->cur_fps.num;
+
+		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;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+}
+
+
+static void naludmx_enqueue_or_dispatch(GF_NALUDmxCtx *ctx, GF_FilterPacket *n_pck, Bool flush_ref)
+{
+	//TODO: we are dispatching frames in "negctts mode", ie we may have DTS>CTS
+	//need to signal this for consumers using DTS (eg MPEG-2 TS)
+	if (flush_ref && ctx->pck_queue && ctx->poc_diff) {
+		//send all reference packet queued
+
+		while (gf_list_count(ctx->pck_queue) ) {
+			u64 dts;
+			GF_FilterPacket *q_pck = gf_list_get(ctx->pck_queue, 0);
+
+			if (q_pck == ctx->first_pck_in_au) break;
+
+			dts = gf_filter_pck_get_dts(q_pck);
+			if (dts != GF_FILTER_NO_TS) {
+				s32 poc;
+				u64 poc_ts, cts;
+				u8 carousel_info = gf_filter_pck_get_carousel_version(q_pck);
+
+				//we reused timing from source packets
+				if (!carousel_info) {
+					assert(ctx->timescale);
+					gf_list_rem(ctx->pck_queue, 0);
+					gf_filter_pck_send(q_pck);
+					continue;
+				}
+				gf_filter_pck_set_carousel_version(q_pck, 0);
+
+				poc_ts = gf_filter_pck_get_cts(q_pck);
+				assert(poc_ts != GF_FILTER_NO_TS);
+				poc = (s32) ((s64) poc_ts - CTS_POC_OFFSET_SAFETY);
+				//poc is stored as diff since last IDR which has min_poc
+				cts = ( (ctx->min_poc + (s32) poc) * ctx->cur_fps.den ) / ctx->poc_diff + ctx->dts_last_IDR;
+
+				/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
+				if (ctx->is_paff) {
+					cts /= 2;
+					/*in some cases the poc is not on the top field - if that is the case, round up*/
+					if (cts % ctx->cur_fps.den) {
+						cts = ((cts/ctx->cur_fps.den)+1) * ctx->cur_fps.den;
+					}
+				}
+
+				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));
+
+				if (ctx->importer) {
+					poc = (s32) ( (s64) cts - (s64) dts);
+					if (poc<0) poc = -poc;
+					poc /= ctx->cur_fps.den;
+					if (poc > ctx->max_total_delay)
+						ctx->max_total_delay = poc;
+				}
+			}
+			gf_list_rem(ctx->pck_queue, 0);
+			gf_filter_pck_send(q_pck);
+		}
+	}
+	if (!n_pck) return;
+
+	if (!ctx->pck_queue) ctx->pck_queue = gf_list_new();
+	gf_list_add(ctx->pck_queue, n_pck);
+}
+
+static void naludmx_hevc_add_param(GF_HEVCConfig *cfg, GF_AVCConfigSlot *sl, u8 nal_type)
+{
+	GF_HEVCParamArray *pa = NULL;
+	u32 i, count;
+	count = gf_list_count(cfg->param_array);
+	for (i=0; i<count; i++) {
+		pa = gf_list_get(cfg->param_array, i);
+		if (pa->type == nal_type) break;
+		pa = NULL;
+	}
+	if (!pa) {
+		GF_SAFEALLOC(pa, GF_HEVCParamArray);
+		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(pa->nalus, sl);
+}
+
+static void naludmx_hevc_set_parall_type(GF_NALUDmxCtx *ctx, GF_HEVCConfig *hevc_cfg)
+{
+	u32 use_tiles, use_wpp, nb_pps, i, count;
+	HEVCState hevc;
+
+	count = gf_list_count(ctx->pps);
+
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
+
+	use_tiles = 0;
+	use_wpp = 0;
+	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);
+
+		if (idx>=0) {
+			HEVC_PPS *pps;
+			nb_pps++;
+			pps = &hevc.pps[idx];
+			if (!pps->entropy_coding_sync_enabled_flag && pps->tiles_enabled_flag)
+				use_tiles++;
+			else if (pps->entropy_coding_sync_enabled_flag && !pps->tiles_enabled_flag)
+				use_wpp++;
+		}
+	}
+	if (!use_tiles && !use_wpp) hevc_cfg->parallelismType = 1;
+	else if (!use_wpp && (use_tiles==nb_pps) ) hevc_cfg->parallelismType = 2;
+	else if (!use_tiles && (use_wpp==nb_pps) ) hevc_cfg->parallelismType = 3;
+	else hevc_cfg->parallelismType = 0;
+}
+
+GF_Err naludmx_set_hevc_oinf(GF_NALUDmxCtx *ctx, u8 *max_temporal_id)
+{
+	GF_OperatingPointsInformation *oinf;
+	GF_BitStream *bs;
+	u8 *data;
+	u32 data_size;
+	u32 i;
+	HEVC_VPS *vps;
+	GF_AVCConfigSlot *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;
+
+	oinf = gf_isom_oinf_new_entry();
+	if (!oinf) return GF_OUT_OF_MEM;
+
+	oinf->scalability_mask = 0;
+	for (i = 0; i < 16; i++) {
+		if (vps->scalability_mask[i])
+			oinf->scalability_mask |= 1 << i;
+	}
+
+	for (i = 0; i < vps->num_profile_tier_level; i++) {
+		HEVC_ProfileTierLevel ptl = (i == 0) ? vps->ptl : vps->ext_ptl[i-1];
+		LHEVC_ProfileTierLevel *lhevc_ptl;
+		GF_SAFEALLOC(lhevc_ptl, LHEVC_ProfileTierLevel);
+		if (!lhevc_ptl) return GF_OUT_OF_MEM;
+
+		lhevc_ptl->general_profile_space = ptl.profile_space;
+		lhevc_ptl->general_tier_flag = ptl.tier_flag;
+		lhevc_ptl->general_profile_idc = ptl.profile_idc;
+		lhevc_ptl->general_profile_compatibility_flags = ptl.profile_compatibility_flag;
+		lhevc_ptl->general_constraint_indicator_flags = 0;
+		if (ptl.general_progressive_source_flag)
+			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 47;
+		if (ptl.general_interlaced_source_flag)
+			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 46;
+		if (ptl.general_non_packed_constraint_flag)
+			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 45;
+		if (ptl.general_frame_only_constraint_flag)
+			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 44;
+		lhevc_ptl->general_constraint_indicator_flags |= ptl.general_reserved_44bits;
+		lhevc_ptl->general_level_idc = ptl.level_idc;
+		gf_list_add(oinf->profile_tier_levels, lhevc_ptl);
+	}
+
+	for (i = 0; i < vps->num_output_layer_sets; i++) {
+		LHEVC_OperatingPoint *op;
+		u32 j;
+		u16 minPicWidth, minPicHeight, maxPicWidth, maxPicHeight;
+		u8 maxChromaFormat, maxBitDepth;
+		u8 maxTemporalId;
+		GF_SAFEALLOC(op, LHEVC_OperatingPoint);
+		if (!op) return GF_OUT_OF_MEM;
+
+		op->output_layer_set_idx = i;
+		op->layer_count = vps->num_necessary_layers[i];
+		minPicWidth = minPicHeight = maxPicWidth = maxPicHeight = maxTemporalId = 0;
+		maxChromaFormat = maxBitDepth = 0;
+		for (j = 0; j < op->layer_count; j++) {
+			u32 format_idx;
+			u32 bitDepth;
+			op->layers_info[j].ptl_idx = vps->profile_tier_level_idx[i][j];
+			op->layers_info[j].layer_id = j;
+			op->layers_info[j].is_outputlayer = vps->output_layer_flag[i][j];
+			//FIXME: we consider that this flag is never set
+			op->layers_info[j].is_alternate_outputlayer = GF_FALSE;
+
+			if (max_temporal_id) {
+				if (!maxTemporalId || (maxTemporalId < max_temporal_id[op->layers_info[j].layer_id]))
+					maxTemporalId = max_temporal_id[op->layers_info[j].layer_id];
+			} else {
+				maxTemporalId = vps->max_sub_layers;
+			}
+
+			format_idx = vps->rep_format_idx[op->layers_info[j].layer_id];
+			if (!minPicWidth || (minPicWidth > vps->rep_formats[format_idx].pic_width_luma_samples))
+				minPicWidth = vps->rep_formats[format_idx].pic_width_luma_samples;
+			if (!minPicHeight || (minPicHeight > vps->rep_formats[format_idx].pic_height_luma_samples))
+				minPicHeight = vps->rep_formats[format_idx].pic_height_luma_samples;
+			if (!maxPicWidth || (maxPicWidth < vps->rep_formats[format_idx].pic_width_luma_samples))
+				maxPicWidth = vps->rep_formats[format_idx].pic_width_luma_samples;
+			if (!maxPicHeight || (maxPicHeight < vps->rep_formats[format_idx].pic_height_luma_samples))
+				maxPicHeight = vps->rep_formats[format_idx].pic_height_luma_samples;
+			if (!maxChromaFormat || (maxChromaFormat < vps->rep_formats[format_idx].chroma_format_idc))
+				maxChromaFormat = vps->rep_formats[format_idx].chroma_format_idc;
+			bitDepth = vps->rep_formats[format_idx].bit_depth_chroma > vps->rep_formats[format_idx].bit_depth_luma ? vps->rep_formats[format_idx].bit_depth_chroma : vps->rep_formats[format_idx].bit_depth_luma;
+			if (!maxChromaFormat || (maxChromaFormat < bitDepth))
+				maxChromaFormat = bitDepth;
+		}
+		op->max_temporal_id = maxTemporalId;
+		op->minPicWidth = minPicWidth;
+		op->minPicHeight = minPicHeight;
+		op->maxPicWidth = maxPicWidth;
+		op->maxPicHeight = maxPicHeight;
+		op->maxChromaFormat = maxChromaFormat;
+		op->maxBitDepth = maxBitDepth;
+		op->frame_rate_info_flag = GF_FALSE; //FIXME: should fetch this info from VUI
+		op->bit_rate_info_flag = GF_FALSE; //we don't use it
+		gf_list_add(oinf->operating_points, op);
+	}
+
+	for (i = 0; i < vps->max_layers; i++) {
+		LHEVC_DependentLayer *dep;
+		u32 j, k;
+		GF_SAFEALLOC(dep, LHEVC_DependentLayer);
+		if (!dep) return GF_OUT_OF_MEM;
+
+		dep->dependent_layerID = vps->layer_id_in_nuh[i];
+		for (j = 0; j < vps->max_layers; j++) {
+			if (vps->direct_dependency_flag[dep->dependent_layerID][j]) {
+				dep->dependent_on_layerID[dep->num_layers_dependent_on] = j;
+				dep->num_layers_dependent_on ++;
+			}
+		}
+		k = 0;
+		for (j = 0; j < 16; j++) {
+			if (oinf->scalability_mask & (1 << j)) {
+				dep->dimension_identifier[j] = vps->dimension_id[i][k];
+				k++;
+			}
+		}
+		gf_list_add(oinf->dependency_layers, dep);
+	}
+
+	//write Operating Points Information Sample Group
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_isom_oinf_write_entry(oinf, bs);
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	gf_isom_oinf_del_entry(oinf);
+
+	gf_filter_pid_set_info_str(ctx->opid, "hevc:oinf", &PROP_DATA_NO_COPY(data, data_size) );
+	return GF_OK;
+}
+
+static void naludmx_set_hevc_linf(GF_NALUDmxCtx *ctx)
+{
+	u32 i, nb_layers=0, nb_sublayers=0;
+	u8 *data;
+	u32 data_size;
+	GF_BitStream *bs;
+
+	for (i=0; i<64; i++) {
+		if (ctx->linf[i].layer_id_plus_one) nb_layers++;
+		if (ctx->linf[i].min_temporal_id != ctx->linf[i].max_temporal_id) nb_sublayers++;
+	}
+	if (!nb_layers && !nb_sublayers)
+		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++) {
+		if (! ctx->linf[i].layer_id_plus_one) continue;
+		gf_bs_write_int(bs, 0, 4);
+		gf_bs_write_int(bs, ctx->linf[i].layer_id_plus_one - 1, 6);
+		gf_bs_write_int(bs, ctx->linf[i].min_temporal_id, 3);
+		gf_bs_write_int(bs, ctx->linf[i].max_temporal_id, 3);
+		gf_bs_write_int(bs, 0, 1);
+		gf_bs_write_int(bs, 0xFF, 7);
+
+	}
+	gf_bs_get_content(bs, &data, &data_size);
+	gf_bs_del(bs);
+	gf_filter_pid_set_info_str(ctx->opid, "hevc:linf", &PROP_DATA_NO_COPY(data, data_size) );
+}
+
+static void naludmx_create_hevc_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_hevc_base)
+{
+	u32 i, count;
+	u8 layer_id;
+	Bool first = GF_TRUE;
+	Bool first_lhvc = GF_TRUE;
+	GF_HEVCConfig *cfg;
+	GF_HEVCConfig *hvcc;
+	GF_HEVCConfig *lvcc;
+	u32 max_w, max_h, max_ew, max_eh;
+
+	*has_hevc_base = GF_FALSE;
+
+
+	max_w = max_h = 0;
+	max_ew = max_eh = 0;
+	sar->num = sar->den = 0;
+
+	hvcc = gf_odf_hevc_cfg_new();
+	lvcc = gf_odf_hevc_cfg_new();
+	hvcc->nal_unit_size = ctx->nal_length;
+	lvcc->nal_unit_size = ctx->nal_length;
+	lvcc->is_lhvc = GF_TRUE;
+	//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);
+		layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
+		if (!layer_id) {
+			*has_hevc_base = GF_TRUE;
+			break;
+		}
+	}
+	count = gf_list_count(ctx->pps);
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *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;
+			break;
+		}
+	}
+	//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);
+		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->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);
+	}
+
+	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);
+		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;
+
+		if (ctx->explicit || layer_id) {
+			cfg = lvcc;
+			is_lhvc = GF_TRUE;
+		} else {
+			cfg = hvcc;
+		}
+
+		if (first || (is_lhvc && first_lhvc) ) {
+			cfg->configurationVersion = 1;
+			cfg->profile_space = sps->ptl.profile_space;
+			cfg->tier_flag = sps->ptl.tier_flag;
+			cfg->profile_idc = sps->ptl.profile_idc;
+			cfg->general_profile_compatibility_flags = sps->ptl.profile_compatibility_flag;
+			cfg->progressive_source_flag = sps->ptl.general_progressive_source_flag;
+			cfg->interlaced_source_flag = sps->ptl.general_interlaced_source_flag;
+			cfg->non_packed_constraint_flag = sps->ptl.general_non_packed_constraint_flag;
+			cfg->frame_only_constraint_flag = sps->ptl.general_frame_only_constraint_flag;
+			cfg->constraint_indicator_flags = sps->ptl.general_reserved_44bits;
+			cfg->level_idc = sps->ptl.level_idc;
+			cfg->chromaFormat = sps->chroma_format_idc;
+			cfg->luma_bit_depth = sps->bit_depth_luma;
+			cfg->chroma_bit_depth = sps->bit_depth_chroma;
+			ctx->interlaced = cfg->interlaced_source_flag ? GF_TRUE : GF_FALSE;
+
+			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->timescale && 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;
+
+				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_lhvc) {
+			first_lhvc = 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_hevc_add_param(cfg, 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);
+		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);
+	}
+
+	*dsi = *dsi_enh = NULL;
+	*dsi_size = *dsi_enh_size = 0;
+
+	if (ctx->explicit || ! (*has_hevc_base) ) {
+		naludmx_hevc_set_parall_type(ctx, lvcc);
+		gf_odf_hevc_cfg_write(lvcc, dsi, dsi_size);
+		*max_width = *max_enh_width = max_ew;
+		*max_height = *max_enh_height = max_eh;
+	} else {
+		naludmx_hevc_set_parall_type(ctx, hvcc);
+		gf_odf_hevc_cfg_write(hvcc, dsi, dsi_size);
+		if (gf_list_count(lvcc->param_array) ) {
+			naludmx_hevc_set_parall_type(ctx, lvcc);
+			gf_odf_hevc_cfg_write(lvcc, dsi_enh, dsi_enh_size);
+		}
+		*max_width = max_w;
+		*max_height = max_h;
+		*max_enh_width = max_ew;
+		*max_enh_height = max_eh;
+	}
+	count = gf_list_count(hvcc->param_array);
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *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_list_reset(pa->nalus);
+	}
+	gf_odf_hevc_cfg_del(hvcc);
+	gf_odf_hevc_cfg_del(lvcc);
+}
+
+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;
+	Bool first = GF_TRUE;
+	Bool first_svc = GF_TRUE;
+	GF_AVCConfig *cfg;
+	GF_AVCConfig *avcc;
+	GF_AVCConfig *svcc;
+	u32 max_w, max_h, max_ew, max_eh;
+
+
+	max_w = max_h = max_ew = max_eh = 0;
+	sar->num = sar->den = 0;
+
+	avcc = gf_odf_avc_cfg_new();
+	svcc = gf_odf_avc_cfg_new();
+	avcc->nal_unit_size = ctx->nal_length;
+	svcc->nal_unit_size = ctx->nal_length;
+
+	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);
+		AVC_SPS *sps = &ctx->avc_state->sps[sl->id];
+		u32 nal_type = sl->data[0] & 0x1F;
+
+		if (ctx->explicit) {
+			cfg = svcc;
+		} else if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM) {
+			cfg = svcc;
+			is_svc = GF_TRUE;
+		} else {
+			cfg = avcc;
+		}
+
+		if (first || (is_svc && first_svc) ) {
+			cfg->configurationVersion = 1;
+			cfg->profile_compatibility = sps->prof_compat;
+			cfg->AVCProfileIndication = sps->profile_idc;
+			cfg->AVCLevelIndication = sps->level_idc;
+			cfg->chroma_format = sps->chroma_format;
+			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)
+				&& ((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)) {
+					cfg->AVCProfileIndication = 110;
+				} else {
+					cfg->AVCProfileIndication = (cfg->chroma_format==3) ? 244 : 122;
+				}
+			}
+			if (sps->vui_parameters_present_flag && sps->vui.par_num && sps->vui.par_den) {
+				sar->num = sps->vui.par_num;
+				sar->den = sps->vui.par_den;
+			}
+			ctx->interlaced = sps->frame_mbs_only_flag ? GF_FALSE : GF_TRUE;
+
+
+			/*disable frame rate scan, most bitstreams have wrong values there*/
+			if (first && (!ctx->fps.num || !ctx->fps.den) && sps->vui.timing_info_present_flag
+				/*if detected FPS is greater than 1000, assume wrong timing info*/
+				&& (sps->vui.time_scale <= 1000*sps->vui.num_units_in_tick)
+			) {
+				/*ISO/IEC 14496-10 n11084 Table E-6*/
+				/* not used :				u8 DeltaTfiDivisorTable[] = {1,1,1,2,2,2,2,3,3,4,6}; */
+				u8 DeltaTfiDivisorIdx;
+				if (!sps->vui.pic_struct_present_flag) {
+					DeltaTfiDivisorIdx = 1 + (1 - ctx->avc_state->s_info.field_pic_flag);
+				} else {
+					if (!ctx->avc_state->sei.pic_timing.pic_struct)
+						DeltaTfiDivisorIdx = 2;
+					else if (ctx->avc_state->sei.pic_timing.pic_struct == 8)
+						DeltaTfiDivisorIdx = 6;
+					else
+						DeltaTfiDivisorIdx = (ctx->avc_state->sei.pic_timing.pic_struct+1) / 2;
+				}
+				if (!ctx->timescale) {
+					ctx->cur_fps.num = 2 * sps->vui.time_scale;
+					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));
+			}
+			ctx->fps = ctx->cur_fps;
+		}
+		first = GF_FALSE;
+		if (is_svc) {
+			first_svc = 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)
+			gf_list_add(cfg->sequenceParameterSets, sl);
+	}
+
+	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);
+		if (!cfg->sequenceParameterSetExtensions) cfg->sequenceParameterSetExtensions = gf_list_new();
+		if (!ctx->analyze)
+			gf_list_add(cfg->sequenceParameterSetExtensions, sl);
+	}
+
+	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);
+		if (!ctx->analyze)
+			gf_list_add(cfg->pictureParameterSets, sl);
+	}
+
+	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);
+		if (!ctx->analyze)
+			gf_list_add(cfg->pictureParameterSets, sl);
+	}
+
+	*dsi = *dsi_enh = NULL;
+	*dsi_size = *dsi_enh_size = 0;
+
+	if (ctx->explicit) {
+		gf_odf_avc_cfg_write(svcc, dsi, dsi_size);
+	} else {
+		gf_odf_avc_cfg_write(avcc, dsi, dsi_size);
+		if (gf_list_count(svcc->sequenceParameterSets) || svcc->sequenceParameterSetExtensions) {
+			gf_odf_avc_cfg_write(svcc, dsi_enh, dsi_enh_size);
+		}
+	}
+	gf_list_reset(avcc->sequenceParameterSets);
+	gf_list_reset(avcc->sequenceParameterSetExtensions);
+	gf_list_reset(avcc->pictureParameterSets);
+	gf_list_reset(svcc->sequenceParameterSets);
+	gf_list_reset(svcc->sequenceParameterSetExtensions);
+	gf_list_reset(svcc->pictureParameterSets);
+	gf_odf_avc_cfg_del(avcc);
+	gf_odf_avc_cfg_del(svcc);
+	*max_width = max_w;
+	*max_height = max_h;
+	*max_enh_width = max_ew;
+	*max_enh_height = max_eh;
+}
+
+static void naludmx_check_pid(GF_Filter *filter, GF_NALUDmxCtx *ctx)
+{
+	u32 w, h, ew, eh;
+	u8 *dsi, *dsi_enh;
+	u32 dsi_size, dsi_enh_size;
+	u32 crc_cfg, crc_cfg_enh;
+	GF_Fraction sar;
+	Bool has_hevc_base = GF_TRUE;
+	Bool has_colr_info = GF_FALSE;
+
+	if (ctx->analyze) {
+		if (ctx->opid && !ctx->ps_modified) return;
+	} else {
+		if (!ctx->ps_modified) return;
+	}
+	ctx->ps_modified = GF_FALSE;
+
+	dsi = dsi_enh = NULL;
+
+	if (!ctx->timescale) {
+		ctx->cur_fps = ctx->fps;
+		if (!ctx->cur_fps.num || !ctx->cur_fps.den) {
+			ctx->cur_fps.num = 25000;
+			ctx->cur_fps.den = 1000;
+		}
+	}
+
+	if (ctx->is_hevc) {
+		naludmx_create_hevc_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);
+	}
+	crc_cfg = crc_cfg_enh = 0;
+	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->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+
+		naludmx_check_dur(filter, ctx);
+		ctx->first_slice_in_au = GF_TRUE;
+	}
+
+	if ((ctx->crc_cfg == crc_cfg) && (ctx->crc_cfg_enh == crc_cfg_enh)
+		&& (ctx->width==w) && (ctx->height==h)
+		&& (ctx->sar.num * sar.den == ctx->sar.den * sar.num)
+	) {
+		if (dsi) gf_free(dsi);
+		if (dsi_enh) gf_free(dsi_enh);
+		return;
+	}
+
+	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" : "!"));
+	}
+
+	//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));
+	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));
+
+	ctx->width = w;
+	ctx->height = h;
+	ctx->sar = sar;
+	ctx->crc_cfg = crc_cfg;
+	ctx->crc_cfg_enh = crc_cfg_enh;
+
+	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));
+	if (ew && eh) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH_MAX, & PROP_UINT( ew ));
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT_MAX, & PROP_UINT( eh ));
+	}
+	if (ctx->sar.den)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, & PROP_FRAC(ctx->sar));
+	else
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL);
+
+	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_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));
+		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));
+		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) ) {
+		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));
+		}
+		naludmx_set_hevc_linf(ctx);
+	}
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+	if (ctx->is_file /* && ctx->index*/) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_FASTFORWARD) );
+	}
+	//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) {
+		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) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, & PROP_UINT(sps->transfer_characteristic) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, & PROP_UINT(sps->matrix_coeffs) );
+			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 {
+		/*use the last active SPS*/
+		if (ctx->avc_state->sps[ctx->avc_state->sps_active_idx].vui_parameters_present_flag
+		&& ctx->avc_state->sps[ctx->avc_state->sps_active_idx].vui.colour_description_present_flag) {
+			AVC_VUI *vui = &ctx->avc_state->sps[ctx->avc_state->sps_active_idx].vui;
+
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, & PROP_UINT(vui->colour_primaries) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, & PROP_UINT(vui->transfer_characteristics) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, & PROP_UINT(vui->matrix_coefficients) );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_RANGE, & PROP_BOOL(vui->video_full_range_flag) );
+			has_colr_info = GF_TRUE;
+		}
+	}
+
+	if (!has_colr_info) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, NULL);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, NULL);
+		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);
+	}
+}
+
+static Bool naludmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_NALUDmxCtx *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 = ctx->dts = 0;
+			ctx->bytes_in_header = 0;
+		}
+		if (! ctx->is_file) {
+			if (!ctx->initial_play_done) {
+				ctx->initial_play_done = GF_TRUE;
+				if (evt->play.start_range<0.1)
+					return GF_FALSE;
+			}
+			ctx->resume_from = 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));
+			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;
+			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);
+					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 (!file_pos)
+				return GF_TRUE;
+		}
+		ctx->resume_from = 0;
+		
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 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 naludmx_update_time(GF_NALUDmxCtx *ctx)
+{
+	assert(ctx->cur_fps.num);
+
+	if (ctx->timescale) {
+		//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;
+		ctx->dts += dts_inc;
+	} else {
+		assert(ctx->cur_fps.den);
+		ctx->cts += ctx->cur_fps.den;
+		ctx->dts += ctx->cur_fps.den;
+	}
+}
+
+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);
+
+	if (ctx->is_hevc) {
+		switch (ps_type) {
+		case GF_HEVC_NALU_VID_PARAM:
+			if (!ctx->vps) ctx->vps = gf_list_new();
+			list = ctx->vps;
+			break;
+		case GF_HEVC_NALU_SEQ_PARAM:
+			list = ctx->sps;
+			break;
+		case GF_HEVC_NALU_PIC_PARAM:
+			list = ctx->pps;
+			break;
+		default:
+			assert(0);
+			return;
+		}
+	} else {
+		switch (ps_type) {
+		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+		case GF_AVC_NALU_SEQ_PARAM:
+			list = ctx->sps;
+			break;
+		case GF_AVC_NALU_PIC_PARAM:
+			list = ctx->pps;
+			alt_list = ctx->pps_svc;
+			break;
+		case GF_AVC_NALU_SEQ_PARAM_EXT:
+			if (!ctx->sps_ext) ctx->sps_ext = gf_list_new();
+			list = ctx->sps_ext;
+			break;
+		default:
+			assert(0);
+			return;
+		}
+	}
+	sl = NULL;
+	count = gf_list_count(list);
+	for (i=0; i<count; i++) {
+		sl = gf_list_get(list, i);
+		if (sl->id != ps_id) {
+			sl = NULL;
+			continue;
+		}
+		//same ID, same CRC, we don't change our state
+		if (sl->crc == crc) return;
+		break;
+	}
+	//handle alt PPS list for SVC
+	if (!sl && alt_list) {
+		count = gf_list_count(alt_list);
+		for (i=0; i<count; i++) {
+			sl = gf_list_get(alt_list, i);
+			if (sl->id != ps_id) {
+				sl = NULL;
+				continue;
+			}
+			//same ID, same CRC, we don't change our state
+			if (sl->crc == crc) return;
+			break;
+		}
+	}
+
+	if (sl) {
+		//otherwise we keep this new param set
+		sl->data = gf_realloc(sl->data, size);
+		memcpy(sl->data, data, size);
+		sl->size = size;
+		sl->crc = crc;
+		ctx->ps_modified = GF_TRUE;
+		return;
+	}
+	//TODO we might want to purge the list after a while !!
+
+	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
+	if (!sl) return;
+	sl->data = gf_malloc(sizeof(char) * size);
+	if (!sl->data) {
+		gf_free(sl);
+		return;
+	}
+	memcpy(sl->data, data, size);
+	sl->size = size;
+	sl->id = ps_id;
+	sl->crc = crc;
+
+	ctx->ps_modified = GF_TRUE;
+	gf_list_add(list, sl);
+}
+
+void naludmx_finalize_au_flags(GF_NALUDmxCtx *ctx)
+{
+	u64 ts;
+	Bool is_rap = GF_FALSE;
+
+	if (!ctx->first_pck_in_au)
+		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) {
+			ctx->dts_last_IDR = gf_filter_pck_get_dts(ctx->first_pck_in_au);
+			if (ctx->is_paff)
+				ctx->dts_last_IDR *= 2;
+		}
+		if (ctx->au_sap <= GF_FILTER_SAP_3) {
+			is_rap = GF_TRUE;
+		}
+	}
+	else if (ctx->has_islice && ctx->force_sync && (ctx->sei_recovery_frame_count==0)) {
+		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));
+		}
+		is_rap = GF_TRUE;
+	}
+	/*set roll info sampleGroups info*/
+	else if (!ctx->au_sap && ( (ctx->sei_recovery_frame_count >= 0) || ctx->has_islice) ) {
+		/*generic GDR*/
+		if (ctx->sei_recovery_frame_count > 0) {
+			if (!ctx->use_opengop_gdr) ctx->use_opengop_gdr = 1;
+			gf_filter_pck_set_sap(ctx->first_pck_in_au, GF_FILTER_SAP_4);
+			gf_filter_pck_set_roll_info(ctx->first_pck_in_au, ctx->sei_recovery_frame_count);
+		}
+		/*open-GOP*/
+		else if ((ctx->sei_recovery_frame_count == 0) && ctx->has_islice) {
+			if (!ctx->use_opengop_gdr) ctx->use_opengop_gdr = 2;
+			gf_filter_pck_set_sap(ctx->first_pck_in_au, GF_FILTER_SAP_3);
+			is_rap = GF_TRUE;
+		}
+	}
+	if (ctx->is_paff) {
+		gf_filter_pck_set_interlaced(ctx->first_pck_in_au, ctx->bottom_field_flag ? 2 : 1);
+	}
+
+	//if TS is set, the packet was the first in AU in the input timed packet (eg PES), we reuse the input timing
+	ts = gf_filter_pck_get_cts(ctx->first_pck_in_au);
+	if (ts == GF_FILTER_NO_TS) {
+		/*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
+		gf_filter_pck_set_carousel_version(ctx->first_pck_in_au, 1);
+	}
+
+	if (ctx->subsamp_buffer_size) {
+		gf_filter_pck_set_property(ctx->first_pck_in_au, GF_PROP_PCK_SUBS, &PROP_DATA(ctx->subsamp_buffer, ctx->subsamp_buffer_size) );
+		ctx->subsamp_buffer_size = 0;
+		ctx->subs_mapped_bytes = 0;
+	}
+	if (ctx->deps) {
+		u8 flags = 0;
+		//dependsOn
+		flags = (is_rap) ? 2 : 1;
+		flags <<= 2;
+		//dependedOn
+	 	flags |= ctx->has_ref_slices ? 1 : 2;
+		flags <<= 2;
+		//hasRedundant
+	 	flags |= ctx->has_redundant ? 1 : 2;
+	 	gf_filter_pck_set_dependency_flags(ctx->first_pck_in_au, flags);
+	}
+	ctx->has_ref_slices = GF_FALSE;
+	ctx->has_redundant = GF_FALSE;
+
+	//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) )
+		naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
+
+	ctx->first_pck_in_au = NULL;
+}
+
+static void naludmx_update_nalu_maxsize(GF_NALUDmxCtx *ctx, u32 size)
+{
+	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_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 (!skip_nal_field) {
+		if (!ctx->bs_w) ctx->bs_w = gf_bs_new(*pck_data, ctx->nal_length, GF_BITSTREAM_WRITE);
+		else gf_bs_reassign_buffer(ctx->bs_w, *pck_data, ctx->nal_length);
+		gf_bs_write_int(ctx->bs_w, nal_size, 8*ctx->nal_length);
+	}
+
+	if (*au_start) {
+		ctx->first_pck_in_au = dst_pck;
+		if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, dst_pck);
+
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
+		//we reuse the timing of the input packet for the first nal of the first frame starting in this packet
+		if (ctx->input_is_au_start) {
+			ctx->input_is_au_start = GF_FALSE;
+			gf_filter_pck_set_dts(dst_pck, ctx->dts);
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+		} else {
+			//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);
+
+		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;
+	} else {
+		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+	}
+	naludmx_update_nalu_maxsize(ctx, nal_size);
+
+	naludmx_enqueue_or_dispatch(ctx, dst_pck, GF_FALSE);
+
+	return dst_pck;
+}
+
+void naludmx_add_subsample(GF_NALUDmxCtx *ctx, u32 subs_size, u8 subs_priority, u32 subs_reserved)
+{
+	if (ctx->subsamp_buffer_alloc < ctx->subsamp_buffer_size+14 ) {
+		ctx->subsamp_buffer_alloc = ctx->subsamp_buffer_size+14;
+		ctx->subsamp_buffer = gf_realloc(ctx->subsamp_buffer, ctx->subsamp_buffer_alloc);
+	}
+	assert(ctx->subsamp_buffer);
+	gf_bs_reassign_buffer(ctx->bs_w, ctx->subsamp_buffer + ctx->subsamp_buffer_size, 14);
+	gf_bs_write_u32(ctx->bs_w, 0); //flags
+	gf_bs_write_u32(ctx->bs_w, subs_size + ctx->nal_length);
+	gf_bs_write_u32(ctx->bs_w, subs_reserved); //reserved
+	gf_bs_write_u8(ctx->bs_w, subs_priority); //priority
+	gf_bs_write_u8(ctx->bs_w, 0); //discardable - todo
+	ctx->subsamp_buffer_size += 14;
+	ctx->subs_mapped_bytes += subs_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)
+{
+	s32 ps_idx = 0;
+	s32 res;
+	u8 nal_unit_type, temporal_id, layer_id;
+	*skip_nal = GF_FALSE;
+
+	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);
+	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));
+		}
+		*skip_nal = GF_TRUE;
+	}
+
+	if (layer_id && ctx->nosvc) {
+		*skip_nal = GF_TRUE;
+		return 0;
+	}
+
+	switch (nal_unit_type) {
+	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);
+		} 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));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_VID_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	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));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_HEVC_NALU_SEQ_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	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));
+		} 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);
+		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;
+		} else {
+			ctx->nb_nalus--;
+		}
+		*skip_nal = GF_TRUE;
+		break;
+	case GF_HEVC_NALU_SEI_SUFFIX:
+		if (! ctx->is_playing) return 0;
+		if (ctx->nosei) {
+			*skip_nal = GF_TRUE;
+			ctx->nb_nalus--;
+		} else {
+			ctx->nb_sei++;
+		}
+		break;
+
+	/*slice_segment_layer_rbsp*/
+	case GF_HEVC_NALU_SLICE_STSA_N:
+	case GF_HEVC_NALU_SLICE_STSA_R:
+	case GF_HEVC_NALU_SLICE_RADL_R:
+	case GF_HEVC_NALU_SLICE_RASL_R:
+	case GF_HEVC_NALU_SLICE_RADL_N:
+	case GF_HEVC_NALU_SLICE_RASL_N:
+	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_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:
+		if (! ctx->is_playing) return 0;
+		*is_slice = GF_TRUE;
+		if (! *skip_nal) {
+			switch (ctx->hevc_state->s_info.slice_type) {
+			case GF_HEVC_SLICE_TYPE_P:
+				if (layer_id) ctx->nb_e_p++;
+				else ctx->nb_p++;
+				break;
+			case GF_HEVC_SLICE_TYPE_I:
+				if (layer_id) ctx->nb_e_i++;
+				else ctx->nb_i++;
+				*is_islice = GF_TRUE;
+				break;
+			case GF_HEVC_SLICE_TYPE_B:
+				if (layer_id) ctx->nb_e_b++;
+				else ctx->nb_b++;
+				break;
+			}
+		}
+		break;
+
+	case GF_HEVC_NALU_ACCESS_UNIT:
+		ctx->nb_aud++;
+		if (!ctx->audelim) {
+			*skip_nal = GF_TRUE;
+		} else if (!ctx->opid) {
+			ctx->has_initial_aud = GF_TRUE;
+			memcpy(ctx->init_aud, data, 3);
+		}
+		break;
+	/*remove*/
+	case GF_HEVC_NALU_FILLER_DATA:
+	case GF_HEVC_NALU_END_OF_SEQ:
+	case GF_HEVC_NALU_END_OF_STREAM:
+		*skip_nal = GF_TRUE;
+		break;
+
+	//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;
+		break;
+	case GF_HEVC_NALU_DV_EL:
+		ctx->hevc_state->dv_el = GF_TRUE;
+		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));
+		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;
+
+	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;
+	if (res < 0) {
+		if (res == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[%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));
+			}
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_SEQ_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		return 0;
+
+	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));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_PIC_PARAM, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		return 0;
+
+	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));
+		} else {
+			naludmx_queue_param_set(ctx, data, size, GF_AVC_NALU_SEQ_PARAM_EXT, ps_idx);
+		}
+		*skip_nal = GF_TRUE;
+		return 0;
+
+	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);
+			}
+
+			*skip_nal = GF_TRUE;
+			ctx->sei_buffer_size += rw_sei_size + ctx->nal_length;
+
+			if (ctx->nosei) {
+				ctx->sei_buffer_size = 0;
+			} else {
+				ctx->nb_sei++;
+			}
+		}
+		return 0;
+
+	case GF_AVC_NALU_ACCESS_UNIT:
+		ctx->nb_aud++;
+		if (!ctx->audelim) {
+			*skip_nal = GF_TRUE;
+		} else if (!ctx->opid) {
+			ctx->has_initial_aud = GF_TRUE;
+			memcpy(ctx->init_aud, data, 2);
+		}
+		return 1;
+	/*remove*/
+	case GF_AVC_NALU_FILLER_DATA:
+	case GF_AVC_NALU_END_OF_SEQ:
+	case GF_AVC_NALU_END_OF_STREAM:
+		*skip_nal = GF_TRUE;
+		return 0;
+
+	//update stats
+	case GF_AVC_NALU_NON_IDR_SLICE:
+	case GF_AVC_NALU_DP_A_SLICE:
+	case GF_AVC_NALU_DP_B_SLICE:
+	case GF_AVC_NALU_DP_C_SLICE:
+	case GF_AVC_NALU_IDR_SLICE:
+		*is_slice = GF_TRUE;
+		switch (ctx->avc_state->s_info.slice_type) {
+		case GF_AVC_TYPE_P:
+		case GF_AVC_TYPE2_P:
+			ctx->nb_p++;
+			break;
+		case GF_AVC_TYPE_I:
+		case GF_AVC_TYPE2_I:
+			ctx->nb_i++;
+			*is_islice = GF_TRUE;
+			break;
+		case GF_AVC_TYPE_B:
+		case GF_AVC_TYPE2_B:
+			ctx->nb_b++;
+			break;
+		case GF_AVC_TYPE_SP:
+		case GF_AVC_TYPE2_SP:
+			ctx->nb_sp++;
+			break;
+		case GF_AVC_TYPE_SI:
+		case GF_AVC_TYPE2_SI:
+			ctx->nb_si++;
+			break;
+		}
+		break;
+
+	case GF_AVC_NALU_SVC_SLICE:
+		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) {
+					/* 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--;
+					if (!ctx->pps_svc) ctx->pps_svc = gf_list_new(ctx->pps_svc);
+					gf_list_add(ctx->pps_svc, slc);
+					ctx->ps_modified = GF_TRUE;
+				}
+			}
+		}
+		*is_slice = GF_TRUE;
+        if (ctx->avc_state->s_info.sps) {
+            switch (ctx->avc_state->s_info.slice_type) {
+            case GF_AVC_TYPE_P:
+            case GF_AVC_TYPE2_P:
+                ctx->avc_state->s_info.sps->nb_ep++;
+                break;
+            case GF_AVC_TYPE_I:
+            case GF_AVC_TYPE2_I:
+                ctx->avc_state->s_info.sps->nb_ei++;
+                break;
+            case GF_AVC_TYPE_B:
+            case GF_AVC_TYPE2_B:
+                ctx->avc_state->s_info.sps->nb_eb++;
+                break;
+            }
+        }
+        break;
+	case GF_AVC_NALU_SLICE_AUX:
+		*is_slice = GF_TRUE;
+		break;
+	}
+	return res;
+}
+
+static void naludmx_on_eos(void *par)
+{
+	GF_NALUDmxCtx *ctx = (GF_NALUDmxCtx *)par;
+	ctx->eos_in_bs = GF_TRUE;
+}
+
+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;
+	s32 remain;
+	Bool is_eos = GF_FALSE;
+
+	//always reparse duration
+	if (!ctx->file_loaded)
+		naludmx_check_dur(filter, ctx);
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!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;
+				is_eos = GF_TRUE;
+				goto naldmx_flush;
+			}
+			if (ctx->first_pck_in_au) {
+				naludmx_finalize_au_flags(ctx);
+			}
+			naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
+			if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+			ctx->src_pck = NULL;
+			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) {
+				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) );
+			}
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	start = data;
+	remain = pck_size;
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale) {
+		u64 ts = gf_filter_pck_get_cts(pck);
+		if (ts != GF_FILTER_NO_TS)
+			ctx->cts = ts;
+		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)
+				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->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
+		//use the DTS/CTS of the inout packet, otherwise we will use our internal POC recompute
+		gf_filter_pck_get_framing(pck, &ctx->input_is_au_start, NULL);
+	}
+
+	//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;
+	}
+
+	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;
+            }
+		}
+		ctx->resume_from = 0;
+	}
+
+naldmx_flush:
+	if (!ctx->bs_r) {
+		ctx->bs_r = gf_bs_new(start, remain, GF_BITSTREAM_READ);
+	} 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;
+		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 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 is_slice = GF_FALSE;
+		Bool is_islice = GF_FALSE;
+		Bool bottom_field_flag = GF_FALSE;
+		Bool au_start;
+		u32 avc_svc_subs_reserved = 0;
+		u8 avc_svc_subs_priority = 0;
+		Bool recovery_point_valid = GF_FALSE;
+		u32 recovery_point_frame_cnt = 0;
+		Bool bIntraSlice = GF_FALSE;
+		GF_FilterSAPType au_sap_type = GF_FILTER_SAP_NONE;
+		Bool slice_is_b = GF_FALSE;
+		Bool full_nal = GF_FALSE;
+		s32 slice_poc = 0;
+		u32 next_size = 0;
+
+		Bool copy_last_bytes = GF_FALSE;
+
+		//not enough bytes to parse start code
+		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;
+				} 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;
+
+					//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;
+			}
+		}
+
+		assert(current>=0);
+
+
+		//skip if no output pid
+		if (!ctx->opid && current) {
+			assert(remain>=current);
+            assert((s32) current >= 0);
+            
+			start += current;
+			remain -= current;
+			current = 0;
+			ctx->next_nal_end_skip = GF_FALSE;
+		}
+
+		//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;
+		}
+
+		//figure out which nal we need to completely load
+		if (ctx->is_hevc) {
+			nal_type = hdr_start[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:
+			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:
+			case GF_HEVC_NALU_SLICE_STSA_N:
+			case GF_HEVC_NALU_SLICE_RADL_N:
+			case GF_HEVC_NALU_SLICE_RASL_N:
+			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;
+					}
+				}
+				break;
+			default:
+				if (nal_type<GF_HEVC_NALU_VID_PARAM)
+					nal_ref_idc = GF_TRUE;
+				break;
+			}
+		} else {
+			nal_type = hdr_start[0] & 0x1F;
+			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;
+				break;
+			default:
+				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;
+					}
+				} 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;
+		}
+
+		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);
+		}
+
+		if (ctx->eos_in_bs && is_eos) {
+			break;
+		}
+
+
+		if (ctx->analyze) {
+			skip_nal = GF_FALSE;
+			ctx->sei_buffer_size = 0;
+		}
+
+		//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;
+		}
+
+		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);
+		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;
+            }
+			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));
+			return GF_OK;
+		}
+		if (ctx->in_seek) {
+			u64 nb_frames_at_seek = (u64) (ctx->start_range * ctx->cur_fps.num);
+			if (ctx->cts + ctx->cur_fps.den >= nb_frames_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->dts_inc) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		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;
+			continue;
+		}
+
+		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) {
+
+			slice_is_ref = gf_media_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);
+
+			au_sap_type = GF_FILTER_SAP_NONE;
+			if (gf_media_hevc_slice_is_IDR(ctx->hevc_state)) {
+				au_sap_type = GF_FILTER_SAP_1;
+			}
+			else {
+				switch (ctx->hevc_state->s_info.nal_unit_type) {
+				case GF_HEVC_NALU_SLICE_BLA_W_LP:
+				case GF_HEVC_NALU_SLICE_BLA_W_DLP:
+					au_sap_type = GF_FILTER_SAP_3;
+					break;
+				case GF_HEVC_NALU_SLICE_BLA_N_LP:
+					au_sap_type = GF_FILTER_SAP_1;
+					break;
+				case GF_HEVC_NALU_SLICE_CRA:
+					au_sap_type = GF_FILTER_SAP_3;
+					break;
+				}
+			}
+
+			slice_poc = ctx->hevc_state->s_info.poc;
+
+			/*need to store TS offsets*/
+			switch (ctx->hevc_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*/
+			if ((nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE)) {
+				unsigned char *p = (unsigned char *) start;
+				// RefPicFlag
+				avc_svc_subs_reserved |= (p[0] & 0x60) ? 0x80000000 : 0;
+				// RedPicFlag TODO: not supported, would require to parse NAL unit payload
+				avc_svc_subs_reserved |= (0) ? 0x40000000 : 0;
+				// VclNALUnitFlag
+				avc_svc_subs_reserved |= (1<=nal_type && nal_type<=5) || (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE) ? 0x20000000 : 0;
+				// use values of IdrFlag and PriorityId directly from SVC extension header
+				avc_svc_subs_reserved |= p[1] << 16;
+				// use values of DependencyId and QualityId directly from SVC extension header
+				avc_svc_subs_reserved |= p[2] << 8;
+				// use values of TemporalId and UseRefBasePicFlag directly from SVC extension header
+				avc_svc_subs_reserved |= p[3] & 0xFC;
+				// StoreBaseRepFlag TODO: SVC FF mentions a store_base_rep_flag which cannot be found in SVC spec
+				avc_svc_subs_reserved |= (0) ? 0x00000002 : 0;
+
+				// priority_id (6 bits) in SVC has inverse meaning -> lower value means higher priority - invert it and scale it to 8 bits
+				avc_svc_subs_priority = (63 - (p[1] & 0x3F)) << 2;
+
+				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));
+                        ctx->svc_prefix_buffer_size = 0;
+                    }
+
+					/* remember reserved and priority value */
+					ctx->svc_nalu_prefix_reserved = avc_svc_subs_reserved;
+					ctx->svc_nalu_prefix_priority = avc_svc_subs_priority;
+
+					ctx->svc_prefix_buffer_size = next;
+					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;
+					continue;
+				}
+			} else if (is_slice) {
+				// RefPicFlag
+				avc_svc_subs_reserved |= (start[0] & 0x60) ? 0x80000000 : 0;
+				// VclNALUnitFlag
+				avc_svc_subs_reserved |= (1<=nal_type && nal_type<=5) || (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE) ? 0x20000000 : 0;
+				avc_svc_subs_priority = 0;
+			}
+
+			if (is_slice && ctx->avc_state->s_info.field_pic_flag) {
+				ctx->is_paff = GF_TRUE;
+				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;
+
+			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);
+
+			au_sap_type = GF_FILTER_SAP_NONE;
+			if (ctx->avc_state->s_info.nal_unit_type == GF_AVC_NALU_IDR_SLICE)
+				au_sap_type = GF_FILTER_SAP_1;
+
+			slice_poc = ctx->avc_state->s_info.poc;
+			/*need to store TS offsets*/
+			switch (ctx->avc_state->s_info.slice_type) {
+			case GF_AVC_TYPE_B:
+			case GF_AVC_TYPE2_B:
+				slice_is_b = GF_TRUE;
+				break;
+			}
+		}
+
+		if (is_slice) {
+			Bool first_in_au = ctx->first_slice_in_au;
+
+			if (slice_is_ref)
+				ctx->nb_idr++;
+			slice_force_ref = GF_FALSE;
+
+			/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
+			SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
+			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*/
+					if (!recovery_point_frame_cnt && bIntraSlice) {
+						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));
+						}
+					}
+					if (ctx->is_hevc) {
+						ctx->hevc_state->sei.recovery_point.valid = 0;
+					} else {
+						ctx->avc_state->sei.recovery_point.valid = 0;
+					}
+					if (bIntraSlice && ctx->force_sync && (ctx->sei_recovery_frame_count==0))
+						slice_force_ref = GF_TRUE;
+				}
+				ctx->au_sap = au_sap_type;
+				ctx->bottom_field_flag = bottom_field_flag;
+			}
+
+			if (slice_poc < ctx->poc_shift) {
+
+				u32 i, count = gf_list_count(ctx->pck_queue);
+				for (i=0; i<count; i++) {
+					u64 dts, cts;
+					GF_FilterPacket *q_pck = gf_list_get(ctx->pck_queue, i);
+					assert(q_pck);
+					dts = gf_filter_pck_get_dts(q_pck);
+					if (dts == GF_FILTER_NO_TS) continue;
+					cts = gf_filter_pck_get_cts(q_pck);
+					cts += ctx->poc_shift;
+					cts -= slice_poc;
+					gf_filter_pck_set_cts(q_pck, cts);
+				}
+
+				ctx->poc_shift = slice_poc;
+			}
+
+			/*if #pics, compute smallest POC increase*/
+			if (slice_poc != ctx->last_poc) {
+				s32 pdiff = ABS(ctx->last_poc - slice_poc);
+
+				if ((slice_poc < 0) && !ctx->last_poc)
+					ctx->poc_diff = 0;
+
+				if (!ctx->poc_diff || (ctx->poc_diff > (s32) pdiff ) ) {
+					ctx->poc_diff = pdiff;
+					ctx->poc_probe_done = GF_FALSE;
+				} else if (first_in_au) {
+					//second frame with the same poc diff, we should be able to properly recompute CTSs
+					ctx->poc_probe_done = GF_TRUE;
+				}
+			}
+			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));
+
+			/*ref slice, reset poc*/
+			if (slice_is_ref) {
+				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;
+					//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;
+					ctx->last_frame_is_idr = GF_TRUE;
+				}
+			}
+			/*forced ref slice*/
+			else if (slice_force_ref) {
+				ctx->last_frame_is_idr = GF_FALSE;
+				if (first_in_au) {
+					//new ref frame, dispatch all pending packets
+					naludmx_enqueue_or_dispatch(ctx, NULL, GF_TRUE);
+
+					/*adjust POC shift as sample will now be marked as sync, so we must store poc as if IDR (eg POC=0) for our CTS offset computing to be correct*/
+					ctx->poc_shift = slice_poc;
+
+					//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;
+				}
+			}
+			/*strictly less - this is a new P slice*/
+			else if (ctx->max_last_poc < ctx->last_poc) {
+				ctx->max_last_b_poc = 0;
+				ctx->max_last_poc = ctx->last_poc;
+				ctx->last_frame_is_idr = GF_FALSE;
+			}
+			/*stricly greater*/
+			else if (slice_is_b && (ctx->max_last_poc > ctx->last_poc)) {
+				ctx->last_frame_is_idr = GF_FALSE;
+				if (!ctx->max_last_b_poc) {
+					ctx->max_last_b_poc = ctx->last_poc;
+				}
+				/*if same poc than last max, this is a B-slice*/
+				else if (ctx->last_poc > ctx->max_last_b_poc) {
+					ctx->max_last_b_poc = ctx->last_poc;
+				}
+				/*otherwise we had a B-slice reference: do nothing*/
+			} else {
+				ctx->last_frame_is_idr = GF_FALSE;
+			}
+
+
+			if (ctx->deps) {
+				if (nal_ref_idc) {
+					ctx->has_ref_slices = GF_TRUE;
+				}
+				if (!ctx->is_hevc && (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;
+			/*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;
+			if (ctx->subsamples) {
+				naludmx_add_subsample(ctx, audelim_size, avc_svc_subs_priority, avc_svc_subs_reserved);
+			}
+		}
+		if (ctx->sei_buffer_size) {
+			//sei buffer is already nal size prefixed
+			/*dst_pck = */naludmx_start_nalu(ctx, ctx->sei_buffer_size, GF_TRUE, &au_start, &pck_data);
+			memcpy(pck_data, ctx->sei_buffer, ctx->sei_buffer_size);
+			if (ctx->subsamples) {
+				naludmx_add_subsample(ctx, ctx->sei_buffer_size - ctx->nal_length, avc_svc_subs_priority, avc_svc_subs_reserved);
+			}
+			ctx->sei_buffer_size = 0;
+		}
+
+		if (ctx->svc_prefix_buffer_size) {
+			/*dst_pck = */naludmx_start_nalu(ctx, ctx->svc_prefix_buffer_size, GF_FALSE, &au_start, &pck_data);
+			memcpy(pck_data + ctx->nal_length, ctx->svc_prefix_buffer, ctx->svc_prefix_buffer_size);
+			if (ctx->subsamples) {
+				naludmx_add_subsample(ctx, ctx->svc_prefix_buffer_size, ctx->svc_nalu_prefix_priority, ctx->svc_nalu_prefix_reserved);
+			}
+			ctx->svc_prefix_buffer_size = 0;
+		}
+
+		//nalu size field
+		/*dst_pck = */naludmx_start_nalu(ctx, (u32) 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);
+		}
+
+		//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;
+			}
+		} 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);
+
+
+		//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);
+            }
+			return GF_OK;
+		}
+	}
+	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);
+		gf_filter_update_status(filter, -1, szStatus);
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+	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) {
+	case 1:
+		ctx->max_nalu_size_allowed = 0xFF;
+		break;
+	case 2:
+		ctx->max_nalu_size_allowed = 0xFFFF;
+		break;
+	case 4:
+		ctx->max_nalu_size_allowed = 0xFFFFFFFF;
+		break;
+	case 0:
+		ctx->max_nalu_size_allowed = 0xFFFFFFFF;
+		ctx->nal_length = 4;
+		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));
+		ctx->max_nalu_size_allowed = 0xFFFFFFFF;
+		ctx->nal_length = 4;
+		break;
+	}
+	return GF_OK;
+}
+
+static void naludmx_del_param_list(GF_List *ps)
+{
+	if (!ps) return;
+	while (gf_list_count(ps)) {
+		GF_AVCConfigSlot *sl = gf_list_pop_back(ps);
+		if (sl->data) gf_free(sl->data);
+		gf_free(sl);
+	}
+	gf_list_del(ps);
+}
+
+static void naludmx_log_stats(GF_NALUDmxCtx *ctx)
+{
+	u32 i, count;
+	const char *msg_import;
+	u32 nb_frames = 0;
+	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));
+		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 ));
+	} 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));
+	}
+
+	if (!ctx->is_hevc) {
+		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);
+			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 ));
+			}
+		}
+	} 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 ));
+	}
+
+	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));
+	}
+
+	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));
+		} 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));
+		}
+	}
+}
+
+static void naludmx_finalize(GF_Filter *filter)
+{
+	GF_NALUDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (ctx->importer) naludmx_log_stats(ctx);
+
+	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->pck_queue) {
+		while (gf_list_count(ctx->pck_queue)) {
+			GF_FilterPacket *pck = gf_list_pop_back(ctx->pck_queue);
+			gf_filter_pck_discard(pck);
+		}
+		gf_list_del(ctx->pck_queue);
+	}
+	if (ctx->sei_buffer) gf_free(ctx->sei_buffer);
+	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->avc_state) gf_free(ctx->avc_state);
+	if (ctx->hevc_state) gf_free(ctx->hevc_state);
+}
+
+
+static const char *naludmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	u32 sc, sc_size;
+	u32 not_hevc=0;
+	u32 not_avc=0;
+	u32 nb_hevc=0;
+	u32 nb_avc=0;
+	u32 nb_nalus=0;
+	u32 nb_hevc_zero=0;
+	u32 nb_avc_zero=0;
+	u32 nb_sps_hevc=0,nb_pps_hevc=0,nb_vps_hevc=0;
+	u32 nb_sps_avc=0,nb_pps_avc=0;
+
+	while (size) {
+		u32 avc_type=0;
+		u32 hevc_type=0;
+		sc = gf_media_nalu_next_start_code(data, size, &sc_size);
+		if (!sc_size) break;
+
+		data += sc + sc_size;
+		if (size <= sc + sc_size) break;
+		size -= sc + sc_size;
+
+		nb_nalus++;
+
+		hevc_type = (data[0] & 0x7E) >> 1;
+		if (hevc_type<=40) {
+			nb_hevc++;
+			switch (hevc_type) {
+			case GF_HEVC_NALU_PIC_PARAM:
+				nb_pps_hevc++;
+				break;
+			case GF_HEVC_NALU_SEQ_PARAM:
+				nb_sps_hevc++;
+				break;
+			case GF_HEVC_NALU_VID_PARAM:
+				nb_vps_hevc++;
+				break;
+			case 0:
+				nb_hevc_zero++;
+				break;
+			}
+		} else {
+			not_hevc++;
+		}
+
+		avc_type = data[0] & 0x1F;
+		if (avc_type && avc_type<=24) {
+			nb_avc++;
+			switch (avc_type) {
+			case GF_AVC_NALU_PIC_PARAM:
+				nb_pps_avc++;
+				break;
+			case GF_AVC_NALU_SEQ_PARAM:
+				nb_sps_avc++;
+				break;
+			case 0:
+				nb_avc_zero++;
+				break;
+			}
+		} else {
+			not_avc++;
+		}
+	}
+	if (!nb_sps_avc || !nb_pps_avc) nb_avc=0;
+	if (!nb_sps_hevc || !nb_pps_hevc || !nb_vps_hevc) nb_hevc=0;
+	if (not_avc) nb_avc=0;
+	if (not_hevc) nb_hevc=0;
+
+	if (not_avc && not_hevc) return NULL;
+	if (nb_avc==nb_avc_zero) nb_avc=0;
+	if (nb_hevc==nb_hevc_zero) nb_hevc=0;
+
+	if (!nb_hevc && !nb_avc) 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";
+	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_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_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_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_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, 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(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", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(nosei), "remove all sei messages", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ 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(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(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},
+	{0}
+};
+
+
+GF_FilterRegister NALUDmxRegister = {
+	.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.")
+	.private_size = sizeof(GF_NALUDmxCtx),
+	.args = NALUDmxArgs,
+	.initialize = naludmx_initialize,
+	.finalize = naludmx_finalize,
+	SETCAPS(NALUDmxCaps),
+	.configure_pid = naludmx_configure_pid,
+	.process = naludmx_process,
+	.process_event = naludmx_process_event,
+	.probe_data = naludmx_probe_data,
+};
+
+
+const GF_FilterRegister *naludmx_register(GF_FilterSession *session)
+{
+	return &NALUDmxRegister;
+}
+
+#else
+const GF_FilterRegister *naludmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif //GPAC_DISABLE_AV_PARSERS

gpac-1.0.0.tar.gz/src/filters/reframe_prores.c Added

@@ -0,0 +1,671 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / ProRes 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>
+#include <gpac/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	//filter args
+	GF_Fraction fps;
+	Bool findex;
+	char *cid;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	GF_BitStream *bs;
+	u64 cts;
+	GF_Fraction64 duration;
+	u64 file_size, file_pos;
+	Double start_range;
+	Bool rewind;
+	u32 cur_frame;
+	u32 timescale;
+	GF_Fraction cur_fps;
+
+	u8 *buffer;
+	u32 buf_size, alloc_size;
+
+	GF_ProResFrameInfo cur_cfg;
+
+	Bool is_playing;
+	Bool is_file, file_loaded;
+	Bool initial_play_done;
+
+	//when source is not a file/pipe/net stream
+	GF_FilterPacket *src_pck;
+
+	/*frame index 0/NULL if findex is not set*/
+	u32 nb_frames;
+	u32 *frame_sizes;
+} GF_ProResDmxCtx;
+
+
+GF_Err proresdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_ProResDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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) {
+		//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;
+	}
+	return GF_OK;
+}
+
+
+static void proresdmx_check_dur(GF_Filter *filter, GF_ProResDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	u64 duration;
+	u32 idx_size;
+	const char *filepath=NULL;
+	const GF_PropertyValue *p;
+	if (!ctx->opid || ctx->timescale || ctx->file_loaded) return;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	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;
+	}
+	filepath = p->value.string;
+	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 {
+			ctx->findex = 2;
+		}
+	}
+	if (!ctx->findex)
+		return;
+
+	stream = gf_fopen(filepath, "rb");
+	if (!stream) return;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+
+	idx_size = ctx->nb_frames;
+	ctx->nb_frames = 0;
+	ctx->file_size = gf_bs_available(bs);
+
+	duration = 0;
+	while (gf_bs_available(bs)) {
+		u64 frame_start = gf_bs_get_position(bs);
+		u32 fsize = gf_bs_read_u32(bs);
+		u32 fmark = gf_bs_read_u32(bs);
+		gf_bs_seek(bs, frame_start + fsize);
+		if (fmark != GF_4CC('i','c','p','f'))
+			break;
+
+		duration += ctx->cur_fps.den;
+
+		if (!idx_size) idx_size = 10;
+		else if (idx_size == ctx->nb_frames) idx_size += 10;
+		ctx->frame_sizes = gf_realloc(ctx->frame_sizes, sizeof(u32)*idx_size);
+		ctx->frame_sizes[ctx->nb_frames] = fsize;
+		ctx->nb_frames++;
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->cur_fps.num != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = ctx->cur_fps.num;
+
+		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_CAN_DATAREF, & PROP_BOOL(GF_TRUE) );
+}
+
+
+static Bool proresdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_ProResDmxCtx *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;
+		}
+		if (! ctx->is_file) {
+			ctx->buf_size = 0;
+			return GF_FALSE;
+		}
+		ctx->start_range = evt->play.start_range;
+
+		if (ctx->start_range) {
+			ctx->cur_frame = 0;
+
+			if (ctx->findex==1) {
+				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));
+				proresdmx_check_dur(filter, ctx);
+			}
+			if ((evt->play.speed<0) && (ctx->start_range<0)) {
+				ctx->start_range = (Double) ctx->duration.num;
+				ctx->start_range /= ctx->duration.den;
+			}
+
+			for (i=0; i<ctx->nb_frames; i++) {
+				Double t = ctx->cur_frame * ctx->cur_fps.den / ctx->cur_fps.num;
+				ctx->cts = ctx->cur_frame * ctx->cur_fps.den;
+				if (t>=ctx->start_range) {
+					break;
+				}
+				if (i+1==ctx->nb_frames)
+					break;
+				ctx->cur_frame++;
+				file_pos += ctx->frame_sizes[i];
+			}
+		}
+
+		ctx->rewind = (ctx->nb_frames && (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 (!file_pos)
+				return GF_TRUE;
+		}
+		ctx->buf_size = 0;
+		ctx->file_pos = file_pos;
+
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = 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 proresdmx_update_cts(GF_ProResDmxCtx *ctx)
+{
+	u64 inc;
+	assert(ctx->cur_fps.num);
+	assert(ctx->cur_fps.den);
+
+	if (ctx->timescale) {
+		inc = ctx->cur_fps.den;
+		inc *= ctx->timescale;
+		inc /= ctx->cur_fps.num;
+	} else {
+		inc = ctx->cur_fps.den;
+	}
+	if (ctx->rewind)
+		ctx->cts -= inc;
+	else
+		ctx->cts += inc;
+}
+
+static void proresdmx_check_pid(GF_Filter *filter, GF_ProResDmxCtx *ctx, GF_ProResFrameInfo *finfo)
+{
+	Bool same_cfg = GF_TRUE;
+	u32 codec_id;
+	u64 bitrate;
+	GF_Fraction fps;
+
+#define CHECK_CFG(_name) if (ctx->cur_cfg._name!=finfo->_name) same_cfg = GF_FALSE;
+
+	CHECK_CFG(width)
+	CHECK_CFG(height)
+	CHECK_CFG(chroma_format)
+	CHECK_CFG(interlaced_mode)
+	CHECK_CFG(aspect_ratio_information)
+	CHECK_CFG(framerate_code)
+	CHECK_CFG(color_primaries)
+	CHECK_CFG(transfer_characteristics)
+	CHECK_CFG(matrix_coefficients)
+	CHECK_CFG(alpha_channel_type)
+
+#undef CHECK_CFG
+
+	if (same_cfg) return;
+	fps.num = fps.den = 0;
+	switch (finfo->framerate_code) {
+	case 1: fps.num = 24000; fps.den = 1001; break;
+	case 2: fps.num = 24; fps.den = 1; break;
+	case 3: fps.num = 24; fps.den = 1; break;
+	case 4: fps.num = 30000; fps.den = 1001; break;
+	case 5: fps.num = 30; fps.den = 1; break;
+	case 6: fps.num = 50; fps.den = 1; break;
+	case 7: fps.num = 60000; fps.den = 1001; break;
+	case 8: fps.num = 60; fps.den = 1; break;
+	case 9: fps.num = 100; fps.den = 1; break;
+	case 10: fps.num = 120000; fps.den = 1001; break;
+	case 11: fps.num = 120; fps.den = 1; break;
+	}
+
+	ctx->cur_fps = ctx->fps;
+	if (!ctx->fps.num || !ctx->fps.den) {
+		if (fps.num && fps.den) {
+			ctx->cur_fps = fps;
+		} else {
+			ctx->cur_fps.num = 25000;
+			ctx->cur_fps.den = 1000;
+		}
+	}
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		proresdmx_check_dur(filter, ctx);
+	}
+
+	bitrate = 0;
+	if (ctx->nb_frames && ctx->file_size) {
+		u64 dur = ctx->nb_frames * ctx->cur_fps.den / ctx->cur_fps.num;
+		bitrate = ctx->file_size * 8;
+		bitrate /= dur;
+		bitrate /= 1000000;
+	}
+	memcpy(&ctx->cur_cfg, finfo, sizeof(GF_ProResFrameInfo));
+	if (ctx->cid && (strlen(ctx->cid)>4)) {
+		codec_id = GF_4CC(ctx->cid[0],ctx->cid[1],ctx->cid[2],ctx->cid[3]);
+	} else if (finfo->chroma_format==3) {
+		codec_id = GF_CODECID_AP4H;
+	} else {
+		codec_id = GF_CODECID_APCH;
+	}
+
+	//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));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CODECID, & PROP_UINT(codec_id));
+
+	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(finfo->width));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, & PROP_UINT(finfo->height));
+	switch (finfo->alpha_channel_type) {
+	case 1:
+	case 2:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ALPHA, & PROP_BOOL(GF_TRUE));
+		break;
+	default:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ALPHA, NULL);
+		break;
+	}
+
+	switch (finfo->aspect_ratio_information) {
+	case 0:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL);
+		break;
+	case 1:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, & PROP_FRAC_INT(1, 1) );
+		break;
+	case 2:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, & PROP_FRAC_INT(4, 3) );
+		break;
+	case 3:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, & PROP_FRAC_INT(16, 9) );
+		break;
+	default:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, NULL);
+		break;
+	}
+
+	if (ctx->duration.num)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, & PROP_FRAC64(ctx->duration));
+
+	/*prores is all intra, we support rewind*/
+	if (ctx->is_file && ctx->findex) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_PLAYBACK_MODE, & PROP_UINT(GF_PLAYBACK_MODE_REWIND) );
+	}
+	if (bitrate && !gf_sys_is_test_mode())
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT((u32)bitrate) );
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_PRIMARIES, & PROP_UINT(finfo->color_primaries) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_TRANSFER, & PROP_UINT(finfo->transfer_characteristics) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_COLR_MX, & PROP_UINT(finfo->matrix_coefficients) );
+
+	//set interlaced or remove interlaced property
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_INTERLACED, ctx->cur_cfg.interlaced_mode ? & PROP_UINT(GF_TRUE) : NULL);
+}
+
+
+
+GF_Err proresdmx_process_buffer(GF_Filter *filter, GF_ProResDmxCtx *ctx, const u8 *data, u32 data_size, Bool is_copy)
+{
+	u32 last_frame_end = 0;
+	GF_Err e = GF_OK;
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs, data, data_size);
+
+	while (gf_bs_available(ctx->bs)) {
+		u8 *output;
+		GF_FilterPacket *pck;
+		GF_ProResFrameInfo finfo;
+		e = gf_media_prores_parse_bs(ctx->bs, &finfo);
+
+		if (e) {
+			break;
+		}
+		proresdmx_check_pid(filter, ctx, &finfo);
+
+		if (!ctx->is_playing && ctx->opid)
+			break;
+
+		if (gf_bs_available(ctx->bs)<finfo.frame_size)
+			break;
+
+		pck = gf_filter_pck_new_alloc(ctx->opid, finfo.frame_size, &output);
+		if (!pck) break;
+		gf_bs_read_data(ctx->bs, output, finfo.frame_size);
+
+		if (ctx->src_pck) gf_filter_pck_merge_properties(ctx->src_pck, pck);
+
+		gf_filter_pck_set_dts(pck, ctx->cts);
+		gf_filter_pck_set_cts(pck, ctx->cts);
+		gf_filter_pck_set_sap(pck, GF_FILTER_SAP_1);
+		gf_filter_pck_set_byte_offset(pck, ctx->file_pos);
+
+		gf_filter_pck_send(pck);
+		proresdmx_update_cts(ctx);
+		last_frame_end = (u32) gf_bs_get_position(ctx->bs);
+
+		if (ctx->rewind) {
+			ctx->buf_size = 0;
+			last_frame_end = 0;
+			assert(ctx->cur_frame);
+			ctx->cur_frame--;
+			if (!ctx->cur_frame) {
+				if (ctx->opid)
+					gf_filter_pid_set_eos(ctx->opid);
+			} else {
+				GF_FilterEvent fevt;
+				ctx->file_pos -= ctx->frame_sizes[ctx->cur_frame];
+				//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);
+			}
+			break;
+		} else {
+			ctx->file_pos += finfo.frame_size;
+		}
+	}
+
+	if (is_copy && last_frame_end) {
+		assert(ctx->buf_size >= last_frame_end);
+		memmove(ctx->buffer, ctx->buffer+last_frame_end, sizeof(char) * (ctx->buf_size-last_frame_end));
+		ctx->buf_size -= last_frame_end;
+	}
+	if (e==GF_EOS) return GF_OK;
+	if (e==GF_BUFFER_TOO_SMALL) return GF_OK;
+	return e;
+}
+
+GF_Err proresdmx_process(GF_Filter *filter)
+{
+	GF_Err e;
+	GF_ProResDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	char *data;
+	u32 pck_size;
+
+	if (!ctx->is_playing && ctx->opid)
+		return GF_OK;
+
+	if (ctx->rewind && !ctx->cur_frame) {
+		gf_filter_pid_set_discard(ctx->ipid, GF_TRUE);
+		return GF_OK;
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			//flush
+			while (ctx->buf_size) {
+				u32 buf_size = ctx->buf_size;
+				e = proresdmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+				if (e) break;
+				if (buf_size == ctx->buf_size) {
+					break;
+				}
+			}
+
+			ctx->buf_size = 0;
+			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;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->opid) {
+		if (!ctx->is_playing || gf_filter_pid_would_block(ctx->opid))
+			return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+	//input pid sets some timescale - we flushed pending data , update cts
+	if (ctx->timescale) {
+		Bool start, end;
+		u64 cts;
+
+		e = GF_OK;
+
+		gf_filter_pck_get_framing(pck, &start, &end);
+		//middle or end of frame, reaggregation
+		if (!start) {
+			if (ctx->alloc_size < ctx->buf_size + pck_size) {
+				ctx->alloc_size = ctx->buf_size + pck_size;
+				ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+			}
+			memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+			ctx->buf_size += pck_size;
+
+			//end of frame, process av1
+			if (end) {
+				e = proresdmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+			}
+			ctx->buf_size=0;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return e;
+		}
+		//flush of pending frame (might have lost something)
+		if (ctx->buf_size) {
+			e = proresdmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+			ctx->buf_size = 0;
+			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;
+		if (ctx->src_pck) gf_filter_pck_unref(ctx->src_pck);
+		ctx->src_pck = pck;
+		gf_filter_pck_ref_props(&ctx->src_pck);
+		ctx->buf_size = 0;
+
+		if (!end) {
+			if (ctx->alloc_size < ctx->buf_size + pck_size) {
+				ctx->alloc_size = ctx->buf_size + pck_size;
+				ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+			}
+			memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+			ctx->buf_size += pck_size;
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		assert(start && end);
+		//process
+		e = proresdmx_process_buffer(filter, ctx, data, pck_size, GF_FALSE);
+
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return e;
+	}
+
+	//not from framed stream, copy buffer
+	if (ctx->alloc_size < ctx->buf_size + pck_size) {
+		ctx->alloc_size = ctx->buf_size + pck_size;
+		ctx->buffer = gf_realloc(ctx->buffer, ctx->alloc_size);
+	}
+	memcpy(ctx->buffer+ctx->buf_size, data, pck_size);
+	ctx->buf_size += pck_size;
+	e = proresdmx_process_buffer(filter, ctx, ctx->buffer, ctx->buf_size, GF_TRUE);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return e;
+}
+
+static void proresdmx_finalize(GF_Filter *filter)
+{
+	GF_ProResDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->frame_sizes) gf_free(ctx->frame_sizes);
+	if (ctx->buffer) gf_free(ctx->buffer);
+}
+
+static const char * proresdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	if (size<8) return NULL;
+
+	if ((data[4] == 'i') && (data[5] == 'c') && (data[6] == 'p') && (data[7] == 'f')) {
+		*score = GF_FPROBE_SUPPORTED;
+		return "video/prores";
+	}
+	return NULL;
+}
+
+static const GF_FilterCapability ProResDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "prores"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "video/prores"),
+	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_APCN),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_APCO),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_APCH),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_APCS),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AP4X),
+	CAP_UINT(GF_CAPS_OUTPUT_STATIC, GF_PROP_PID_CODECID, GF_CODECID_AP4H),
+	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_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCN),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCH),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCS),
+	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_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_ProResDmxCtx, _n)
+static const GF_FilterArgs ProResDmxArgs[] =
+{
+	{ 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},
+	{0}
+};
+
+
+GF_FilterRegister ProResDmxRegister = {
+	.name = "rfprores",
+	GF_FS_SET_DESCRIPTION("ProRes reframer")
+	GF_FS_SET_HELP("This filter parses ProRes raw files/data and outputs corresponding visual PID and frames.")
+	.private_size = sizeof(GF_ProResDmxCtx),
+	.args = ProResDmxArgs,
+	.finalize = proresdmx_finalize,
+	SETCAPS(ProResDmxCaps),
+	.configure_pid = proresdmx_configure_pid,
+	.process = proresdmx_process,
+	.probe_data = proresdmx_probe_data,
+	.process_event = proresdmx_process_event
+};
+
+
+const GF_FilterRegister *proresdmx_register(GF_FilterSession *session)
+{
+	return &ProResDmxRegister;
+}
+
+#else
+const GF_FilterRegister *proresdmx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+

gpac-1.0.0.tar.gz/src/filters/reframe_qcp.c Added

@@ -0,0 +1,729 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AMR&EVRC&SMV 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/filters.h>
+#include <gpac/constants.h>
+#include <gpac/bitstream.h>
+#include <gpac/internal/media_dev.h>
+
+typedef struct
+{
+	u64 pos;
+	Double duration;
+} QCPIdx;
+
+typedef struct
+{
+	//filter args
+	Double index;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 codecid, sample_rate, block_size;
+	Bool done;
+
+	u64 cts;
+	GF_Fraction64 duration;
+	Double start_range;
+
+	Bool in_seek;
+	u32 timescale;
+	Bool is_playing;
+	Bool is_file;
+	Bool initial_play_done, file_loaded;
+
+	u32 data_chunk_offset, data_chunk_size, data_chunk_remain;
+	u32 resume_from;
+	u32 remaining;
+	u32 skip_bytes;
+	u32 vrat_rate_flag, pck_size, rate_table_count;
+	QCPRateTable rate_table[8];
+
+	Bool hdr_processed;
+
+	char *buffer;
+	u32 buffer_alloc, buffer_size;
+
+	GF_BitStream *bs;
+
+
+	QCPIdx *indexes;
+	u32 index_alloc_size, index_size;
+} GF_QCPDmxCtx;
+
+
+
+
+GF_Err qcpdmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_QCPDmxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+static GF_Err qcpdmx_process_header(GF_Filter *filter, GF_QCPDmxCtx *ctx, char *data, u32 size, GF_BitStream *file_bs);
+
+static void qcpdmx_check_dur(GF_Filter *filter, GF_QCPDmxCtx *ctx)
+{
+	FILE *stream;
+	GF_BitStream *bs;
+	u32 i, chunk_size;
+	GF_Err e;
+	u32 data_chunk_size = 0;
+	u64 duration, cur_dur;
+	char magic[4];
+	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(p->value.string, "rb");
+	if (!stream) return;
+
+	ctx->codecid = 0;
+	ctx->sample_rate = 8000;
+	ctx->block_size = 160;
+
+	bs = gf_bs_from_file(stream, GF_BITSTREAM_READ);
+	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) ));
+		}
+	} else {
+		gf_bs_skip_bytes(bs, 170);
+	}
+	while (gf_bs_available(bs) ) {
+		gf_bs_read_data(bs, magic, 4);
+		chunk_size = gf_bs_read_u32_le(bs);
+
+		if (strncmp(magic, "data", 4)) {
+			gf_bs_skip_bytes(bs, chunk_size);
+			if (chunk_size%2) gf_bs_skip_bytes(bs, 1);
+			continue;
+		}
+		data_chunk_size = chunk_size;
+		break;
+	}
+	if (!data_chunk_size) {
+		gf_bs_del(bs);
+		gf_fclose(stream);
+		return;
+	}
+
+	ctx->index_size = 0;
+	ctx->data_chunk_offset = (u32) gf_ftell(stream);
+	ctx->data_chunk_size = data_chunk_size;
+
+	duration = 0;
+	cur_dur = 0;
+	while (data_chunk_size) {
+		u32 idx, size=0;
+		u64 pos;
+		pos = gf_ftell(stream);
+		/*get frame rate idx*/
+		if (ctx->vrat_rate_flag) {
+			idx = gf_fgetc(stream);
+			chunk_size-=1;
+			for (i=0; i<ctx->rate_table_count; i++) {
+				if (ctx->rate_table[i].rate_idx==idx) {
+					size = ctx->rate_table[i].pck_size;
+					break;
+				}
+			}
+			gf_fseek(stream, size, SEEK_CUR);
+			size++;
+		} else {
+			size = ctx->pck_size;
+			gf_fseek(stream, size, SEEK_CUR);
+		}
+		data_chunk_size-= size;
+		
+		duration += ctx->block_size;
+		cur_dur += ctx->block_size;
+		if (cur_dur > ctx->index * ctx->sample_rate) {
+			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(QCPIdx)*ctx->index_alloc_size);
+			ctx->indexes[ctx->index_size].pos = pos;
+			ctx->indexes[ctx->index_size].duration = (Double) duration;
+			ctx->indexes[ctx->index_size].duration /= ctx->sample_rate;
+			ctx->index_size ++;
+			cur_dur = 0;
+		}
+	}
+	gf_bs_del(bs);
+	gf_fclose(stream);
+
+	if (!ctx->duration.num || (ctx->duration.num  * ctx->sample_rate != duration * ctx->duration.den)) {
+		ctx->duration.num = (s32) duration;
+		ctx->duration.den = ctx->sample_rate;
+
+		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;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CAN_DATAREF, & PROP_BOOL(GF_TRUE ) );
+}
+
+static Bool qcpdmx_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 i;
+	u64 file_pos = 0;
+	GF_FilterEvent fevt;
+	GF_QCPDmxCtx *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->remaining = 0;
+		}
+		if (! ctx->is_file) {
+			return GF_FALSE;
+		}
+		qcpdmx_check_dur(filter, ctx);
+
+		ctx->start_range = evt->play.start_range;
+		ctx->in_seek = GF_TRUE;
+		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);
+					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 (!file_pos) {
+				return GF_TRUE;
+			}
+		}
+		if (!file_pos) {
+			file_pos = ctx->data_chunk_offset;
+			ctx->data_chunk_remain = ctx->data_chunk_size;
+		}
+
+		//post a seek
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = file_pos;
+		gf_filter_pid_send_event(ctx->ipid, &fevt);
+
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		ctx->is_playing = GF_FALSE;
+		//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;
+}
+
+/*QCP codec GUIDs*/
+static const char *QCP_QCELP_GUID_1 = "\x41\x6D\x7F\x5E\x15\xB1\xD0\x11\xBA\x91\x00\x80\x5F\xB4\xB9\x7E";
+static const char *QCP_QCELP_GUID_2 = "\x42\x6D\x7F\x5E\x15\xB1\xD0\x11\xBA\x91\x00\x80\x5F\xB4\xB9\x7E";
+static const char *QCP_EVRC_GUID = "\x8D\xD4\x89\xE6\x76\x90\xB5\x46\x91\xEF\x73\x6A\x51\x00\xCE\xB4";
+static const char *QCP_SMV_GUID = "\x75\x2B\x7C\x8D\x97\xA7\x46\xED\x98\x5E\xD5\x3C\x8C\xC7\x5F\x84";
+
+static GF_Err qcpdmx_process_header(GF_Filter *filter, GF_QCPDmxCtx *ctx, char *data, u32 size, GF_BitStream *file_bs)
+{
+	char magic[12], GUID[17], name[81], fmt[162];
+	u32 riff_size, chunk_size, i, avg_bps;
+	Bool has_pad;
+	const GF_PropertyValue *p;
+	GF_BitStream *bs;
+
+	bs = file_bs ? file_bs : gf_bs_new(data, size, GF_BITSTREAM_READ);
+
+	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"));
+		if (!file_bs) gf_bs_del(bs);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	riff_size = gf_bs_read_u32_le(bs);
+	gf_bs_read_data(bs, fmt, 162);
+	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"));
+		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));
+	}
+	/*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"));
+		if (!file_bs) gf_bs_del(bs);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	chunk_size = gf_bs_read_u32_le(bs);
+	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
+	/*major = */gf_bs_read_u8(bs);
+	/*minor = */gf_bs_read_u8(bs);
+	chunk_size -= 2;
+	/*codec info*/
+	gf_bs_read_data(bs, GUID, 16);
+	GUID[16]=0;
+	/*version = */gf_bs_read_u16_le(bs);
+	chunk_size -= 18;
+	gf_bs_read_data(bs, name, 80);
+	name[80]=0;
+	chunk_size -= 80;
+	avg_bps = gf_bs_read_u16_le(bs);
+	ctx->pck_size = gf_bs_read_u16_le(bs);
+	ctx->block_size = gf_bs_read_u16_le(bs);
+	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);
+	chunk_size -= 14;
+	/*skip var rate*/
+	for (i=0; i<8; i++) {
+		ctx->rate_table[i].pck_size = gf_bs_read_u8(bs);
+		ctx->rate_table[i].rate_idx = gf_bs_read_u8(bs);
+	}
+	chunk_size -= 16;
+	gf_bs_skip_bytes(bs, 5*4);/*reserved*/
+	chunk_size -= 20;
+	gf_bs_skip_bytes(bs, chunk_size);
+	if (has_pad) gf_bs_read_u8(bs);
+
+	if (!strncmp(GUID, QCP_QCELP_GUID_1, 16) || !strncmp(GUID, QCP_QCELP_GUID_2, 16)) {
+		ctx->codecid = GF_CODECID_QCELP;
+	} else if (!strncmp(GUID, QCP_EVRC_GUID, 16)) {
+		ctx->codecid = GF_CODECID_EVRC;
+	} 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));
+		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"));
+		if (!file_bs) gf_bs_del(bs);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	chunk_size = gf_bs_read_u32_le(bs);
+	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
+	ctx->vrat_rate_flag = gf_bs_read_u32_le(bs);
+	/*size_in_packet =*/gf_bs_read_u32_le(bs);
+	chunk_size -= 8;
+	gf_bs_skip_bytes(bs, chunk_size);
+	if (has_pad) gf_bs_read_u8(bs);
+
+	if (file_bs) return GF_OK;
+
+	gf_bs_del(bs);
+
+
+	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_STREAM_TYPE, & PROP_UINT( GF_STREAM_AUDIO));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, & PROP_UINT(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(1) );
+	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(ctx->block_size ) );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_BITRATE, & PROP_UINT(avg_bps));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FRAME_SIZE, & PROP_UINT(ctx->pck_size));
+
+	qcpdmx_check_dur(filter, ctx);
+
+	return GF_OK;
+
+}
+
+GF_Err qcpdmx_process(GF_Filter *filter)
+{
+	GF_QCPDmxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	u64 byte_offset;
+	u8 *data, *output;
+	u8 *start;
+	u32 pck_size, remain;
+	GF_Err e;
+	//update duration
+	qcpdmx_check_dur(filter, ctx);
+
+	if (ctx->done) return GF_EOS;
+
+	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->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			assert(ctx->remaining == 0);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	start = data;
+	remain = pck_size;
+
+	//flush not previously dispatched data
+	if (ctx->remaining) {
+		u32 to_send = ctx->remaining;
+		if (ctx->remaining > pck_size) {
+			to_send = pck_size;
+			ctx->remaining -= pck_size;
+		} else {
+			ctx->remaining = 0;
+		}
+		if (! ctx->in_seek) {
+			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, to_send, &output);
+			memcpy(output, data, to_send);
+
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_framing(dst_pck, GF_FALSE, ctx->remaining ? GF_FALSE : GF_TRUE);
+			if (byte_offset != GF_FILTER_NO_BO) {
+				gf_filter_pck_set_byte_offset(dst_pck, byte_offset);
+			}
+			gf_filter_pck_send(dst_pck);
+		}
+		assert (ctx->data_chunk_remain >= to_send);
+		ctx->data_chunk_remain -= to_send;
+
+		if (ctx->remaining) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		ctx->cts += ctx->block_size;
+		start += to_send;
+		remain -= to_send;
+
+		if (!ctx->data_chunk_remain) {
+			ctx->done = GF_TRUE;
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+	}
+
+	if (ctx->resume_from) {
+		start += ctx->resume_from;
+		remain -= ctx->resume_from;
+		ctx->resume_from = 0;
+	}
+
+
+	while (remain) {
+		u32 i, chunk_size=0;
+		u32 idx = 0;
+		u32 size = 0;
+		u64 b_offset;
+		u8 *pck_data;
+		Bool has_pad;
+
+		if (!ctx->hdr_processed) {
+			if (ctx->buffer_size + remain < 170) {
+				if (ctx->buffer_alloc < ctx->buffer_size + remain) {
+					ctx->buffer_alloc = ctx->buffer_size + remain;
+					ctx->buffer = gf_realloc(ctx->buffer, ctx->buffer_alloc);
+				}
+				memcpy(ctx->buffer + ctx->buffer_size, start, remain);
+				ctx->buffer_size += remain;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_OK;
+			}
+			ctx->hdr_processed = GF_TRUE;
+			if (ctx->buffer_size) {
+				e = qcpdmx_process_header(filter, ctx, ctx->buffer, ctx->buffer_size, NULL);
+			} else {
+				e = qcpdmx_process_header(filter, ctx, start, remain, NULL);
+			}
+			start += 170 - ctx->buffer_size;
+			remain -= 170 - ctx->buffer_size;
+			ctx->buffer_size = 0;
+
+			if (e) {
+				gf_filter_setup_failure(filter, e);
+				ctx->done = GF_TRUE;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_EOS;
+			}
+			continue;
+		}
+		//skip current chunk
+		if (ctx->skip_bytes) {
+			if (remain<ctx->skip_bytes) {
+				ctx->skip_bytes -= remain;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_OK;
+			}
+			start += ctx->skip_bytes;
+			remain -= ctx->skip_bytes;
+			ctx->skip_bytes = 0;
+		}
+
+		//load chunk tag
+		if (!ctx->data_chunk_remain) {
+			char magic[4];
+			//load chunk
+			if (remain<8) {
+				if (ctx->buffer_alloc < ctx->buffer_size + 8) {
+					ctx->buffer_alloc = ctx->buffer_size + 8;
+					ctx->buffer = gf_realloc(ctx->buffer, ctx->buffer_alloc);
+				}
+				memcpy(ctx->buffer + ctx->buffer_size, start, remain);
+				ctx->buffer_size += remain;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				return GF_OK;
+			}
+			if (!ctx->buffer_size) {
+				if (!ctx->bs) {
+					ctx->bs = gf_bs_new((u8 *) start, remain, GF_BITSTREAM_READ);
+				} else {
+					gf_bs_reassign_buffer(ctx->bs, start, remain);
+				}
+			} else {
+				if (!ctx->bs) {
+					ctx->bs = gf_bs_new((u8 *) ctx->buffer, ctx->buffer_size, GF_BITSTREAM_READ);
+				} else {
+					gf_bs_reassign_buffer(ctx->bs, ctx->buffer, ctx->buffer_size);
+				}
+			}
+
+			gf_bs_read_data(ctx->bs, magic, 4);
+			chunk_size = gf_bs_read_u32_le(ctx->bs);
+			has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
+			start += 8-ctx->buffer_size;
+			remain -= 8-ctx->buffer_size;
+			ctx->buffer_size = 0;
+
+			//wait until we reach data chunk
+			if (strnicmp(magic, "data", 4)) {
+				ctx->skip_bytes = chunk_size;
+				if (has_pad) ctx->skip_bytes++;
+				continue;
+			} else {
+				ctx->data_chunk_size = ctx->data_chunk_remain = chunk_size;
+			}
+		}
+
+		//we are in the data chunk
+		if (!ctx->is_playing) {
+			ctx->resume_from = (u32) ( (char *)start -  (char *)data);
+			return GF_OK;
+		}
+
+		b_offset = gf_filter_pck_get_byte_offset(pck);
+		if (b_offset != GF_FILTER_NO_BO) {
+			b_offset += (start - (u8 *) data);
+		}
+		/*get frame rate idx*/
+		if (ctx->vrat_rate_flag) {
+			idx = start[0];
+			//chunk_size-=1;
+			for (i=0; i<ctx->rate_table_count; i++) {
+				if (ctx->rate_table[i].rate_idx==idx) {
+					size = ctx->rate_table[i].pck_size;
+					break;
+				}
+			}
+			size++;
+		} else {
+			size = ctx->pck_size;
+		}
+
+		if (size > remain) {
+			ctx->remaining = size - remain;
+			size = remain;
+		} else {
+			ctx->remaining = 0;
+		}
+
+		if (ctx->in_seek) {
+			u64 nb_samples_at_seek = (u64) (ctx->start_range * ctx->sample_rate);
+			if (ctx->cts + ctx->block_size >= nb_samples_at_seek) {
+				//u32 samples_to_discard = (ctx->cts + ctx->block_size ) - nb_samples_at_seek;
+				ctx->in_seek = GF_FALSE;
+			}
+		}
+
+		if (!ctx->in_seek) {
+			GF_FilterPacket *dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &pck_data);
+			memcpy(pck_data, start, size);
+
+			gf_filter_pck_set_framing(dst_pck, GF_TRUE, ctx->remaining ? GF_FALSE : GF_TRUE);
+			gf_filter_pck_set_cts(dst_pck, ctx->cts);
+			gf_filter_pck_set_sap(dst_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_duration(dst_pck, ctx->block_size);
+			if (b_offset != GF_FILTER_NO_BO)
+				gf_filter_pck_set_byte_offset(dst_pck, b_offset);
+
+			gf_filter_pck_send(dst_pck);
+		}
+
+		assert (ctx->data_chunk_remain >= size);
+		ctx->data_chunk_remain -= size;
+		if (!ctx->data_chunk_remain) {
+			ctx->done = GF_TRUE;
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			break;
+		}
+
+		if (ctx->remaining) break;
+		ctx->cts += ctx->block_size;
+		start += size;
+		remain -= 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 (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);
+
+	return GF_OK;
+}
+
+static void qcpdmx_finalize(GF_Filter *filter)
+{
+	GF_QCPDmxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->indexes) gf_free(ctx->indexes);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+	if (ctx->buffer) gf_free(ctx->buffer);
+}
+
+static const char *qcpdmx_probe_data(const u8 *data, u32 size, GF_FilterProbeScore *score)
+{
+	char magic[5];
+	Bool is_qcp = GF_TRUE;
+	GF_BitStream *bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+
+	magic[4] = 0;
+	gf_bs_read_data(bs, magic, 4);
+	if (strnicmp(magic, "RIFF", 4)) {
+		is_qcp = GF_FALSE;
+	} else {
+		/*riff_size = */gf_bs_read_u32_le(bs);
+		gf_bs_read_data(bs, magic, 4);
+		if (strnicmp(magic, "QLCM", 4)) {
+			is_qcp = GF_FALSE;
+		}
+	}
+	gf_bs_del(bs);
+	if (!is_qcp) return NULL;
+	*score = GF_FPROBE_SUPPORTED;
+	return "audio/qcp";
+}
+
+static const GF_FilterCapability QCPDmxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "qcp"),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_MIME, "audio/qcp"),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_QCELP),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_SMV),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_EVRC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_CODECID, GF_CODECID_EVRC_PV),
+	CAP_BOOL(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_QCPDmxCtx, _n)
+static const GF_FilterArgs QCPDmxArgs[] =
+{
+	{ OFFS(index), "indexing window length", GF_PROP_DOUBLE, "1.0", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister QCPDmxRegister = {
+	.name = "rfqcp",
+	GF_FS_SET_DESCRIPTION("QCP reframer")
+	GF_FS_SET_HELP("This filter parses QCP files/data and outputs corresponding audio PID and frames.")
+	.private_size = sizeof(GF_QCPDmxCtx),
+	.args = QCPDmxArgs,
+	.finalize = qcpdmx_finalize,
+	SETCAPS(QCPDmxCaps),
+	.configure_pid = qcpdmx_configure_pid,
+	.process = qcpdmx_process,
+	.probe_data = qcpdmx_probe_data,
+	.process_event = qcpdmx_process_event
+};
+
+
+const GF_FilterRegister *qcpdmx_register(GF_FilterSession *session)
+{
+	return &QCPDmxRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/reframe_rawpcm.c Added

@@ -0,0 +1,324 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RAW PCM 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
+{
+	//opts
+	u32 framelen, safmt, sr, ch;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	Bool file_loaded, is_playing, initial_play_done;
+	u64 cts;
+	u32 frame_size, nb_bytes_in_frame, Bps;
+	u64 filepos, total_frames;
+	GF_FilterPacket *out_pck;
+	u8 *out_data;
+	Bool reverse_play, done;
+} GF_PCMReframeCtx;
+
+
+
+
+GF_Err pcmreframe_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_PCMReframeCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	if (!ctx->safmt) {
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_EXT);
+		if (p && p->value.string) ctx->safmt = gf_audio_fmt_parse(p->value.string);
+	}
+	if (!ctx->safmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[PCMReframe] Missing audio format, cannot parse\n"));
+		return GF_BAD_PARAM;
+	}
+	if (!ctx->sr) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[PCMReframe] Missing audio sample rate, cannot parse\n"));
+		return GF_BAD_PARAM;
+	}
+	if (!ctx->ch) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[PCMReframe] Missing audio ch, cannot parse\n"));
+		return GF_BAD_PARAM;
+	}
+	if (!ctx->framelen) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[PCMReframe] Missing audio framelen, using 1024\n"));
+		ctx->framelen = 1024;
+	}
+
+	ctx->Bps = gf_audio_fmt_bit_depth(ctx->safmt) / 8;
+	ctx->frame_size = ctx->framelen * ctx->Bps * ctx->ch;
+
+	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_AUDIO));
+	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_SAMPLE_RATE, &PROP_UINT(ctx->sr));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_NUM_CHANNELS, &PROP_UINT(ctx->ch));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAMPLES_PER_FRAME, &PROP_UINT(ctx->framelen));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->safmt));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_TIMESCALE, &PROP_UINT(ctx->sr));
+	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));
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+	if (p && p->value.longuint) {
+		u64 nb_frames = p->value.longuint;
+		nb_frames /= ctx->Bps * ctx->ch;
+		ctx->total_frames = p->value.longuint;
+		ctx->total_frames /= ctx->frame_size;
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(nb_frames, ctx->sr));
+	}
+
+	return GF_OK;
+}
+
+static Bool pcmreframe_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 nb_frames;
+	GF_FilterEvent fevt;
+	GF_PCMReframeCtx *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->done = GF_FALSE;
+
+		if (!ctx->total_frames)
+			return GF_TRUE;
+
+		if (evt->play.start_range>=0) {
+			ctx->cts = (u64) (evt->play.start_range * ctx->sr);
+		} else {
+			ctx->cts = (ctx->total_frames-1) * ctx->framelen;
+		}
+		nb_frames = (u32) (ctx->cts / ctx->framelen);
+		if (nb_frames==ctx->total_frames) {
+			if (evt->play.speed>=0) {
+				ctx->done = GF_TRUE;
+				return GF_TRUE;
+			}
+			nb_frames--;
+			ctx->cts = nb_frames * ctx->framelen;
+		}
+
+		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
+		GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+		fevt.seek.start_offset = ctx->filepos;
+		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;
+}
+
+void pcmreframe_flush_packet(GF_PCMReframeCtx *ctx)
+{
+	if (ctx->reverse_play) {
+		u32 i, nb_bytes_in_sample, nb_samples = ctx->nb_bytes_in_frame / ctx->Bps / ctx->ch;
+		nb_bytes_in_sample = ctx->Bps * ctx->ch;
+		for (i=0; i<nb_samples/2; i++) {
+			char store[100];
+			memcpy(store, ctx->out_data + i*nb_bytes_in_sample, nb_bytes_in_sample);
+			memcpy(ctx->out_data + i*nb_bytes_in_sample, ctx->out_data + (nb_samples - i - 1)*nb_bytes_in_sample, nb_bytes_in_sample);
+			memcpy(ctx->out_data + (nb_samples-i-1)*nb_bytes_in_sample, store, nb_bytes_in_sample);
+		}
+	}
+	gf_filter_pck_send(ctx->out_pck);
+	ctx->out_pck = NULL;
+}
+GF_Err pcmreframe_process(GF_Filter *filter)
+{
+	GF_PCMReframeCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	u64 byte_offset;
+	u8 *data;
+	u32 pck_size;
+
+	if (ctx->done) return GF_EOS;
+
+	if (!ctx->is_playing && ctx->opid) return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid) && !ctx->reverse_play) {
+			if (ctx->out_pck) {
+				pcmreframe_flush_packet(ctx);
+			}
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	while (pck_size) {
+		if (!ctx->out_pck) {
+			ctx->out_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->frame_size, &ctx->out_data);
+			if (!ctx->out_pck) return GF_OUT_OF_MEM;
+
+			gf_filter_pck_set_cts(ctx->out_pck, ctx->cts);
+			gf_filter_pck_set_sap(ctx->out_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_duration(ctx->out_pck, ctx->framelen);
+			gf_filter_pck_set_byte_offset(ctx->out_pck, byte_offset);
+		}
+
+		if (pck_size + ctx->nb_bytes_in_frame < ctx->frame_size) {
+			memcpy(ctx->out_data + ctx->nb_bytes_in_frame, data, pck_size);
+			ctx->nb_bytes_in_frame += pck_size;
+			pck_size = 0;
+		} else {
+			u32 remain = ctx->frame_size - ctx->nb_bytes_in_frame;
+			memcpy(ctx->out_data + ctx->nb_bytes_in_frame, data, remain);
+			ctx->nb_bytes_in_frame = ctx->frame_size;
+			pcmreframe_flush_packet(ctx);
+
+			pck_size -= remain;
+			data += remain;
+			byte_offset += remain;
+			ctx->out_pck = NULL;
+			ctx->nb_bytes_in_frame = 0;
+
+			//reverse playback, the remaining data is for the next frame, we want the previous one.
+			//Trash packet and seek to previous frame
+			if (ctx->reverse_play) {
+				GF_FilterEvent fevt;
+				if (!ctx->cts) {
+					if (ctx->opid)
+						gf_filter_pid_set_eos(ctx->opid);
+					GF_FEVT_INIT(fevt, GF_FEVT_STOP, ctx->ipid);
+					gf_filter_pid_send_event(ctx->ipid, &fevt);
+					ctx->done = GF_TRUE;
+					return GF_EOS;
+				}
+				ctx->cts -= ctx->framelen;
+				ctx->filepos -= ctx->frame_size;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				//post a seek, this will trash remaining packets in buffers
+				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+				fevt.seek.start_offset = ctx->filepos;
+				gf_filter_pid_send_event(ctx->ipid, &fevt);
+				return GF_OK;
+			}
+			ctx->cts += ctx->framelen;
+		}
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+
+static GF_FilterCapability PCMReframeCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "pcm"),
+	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),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_PCMReframeCtx, _n)
+static GF_FilterArgs PCMReframeArgs[] =
+{
+	{ OFFS(sr), "sample rate", GF_PROP_UINT, "44100", NULL, 0},
+	{ OFFS(safmt), "audio format", GF_PROP_PCMFMT, "none", NULL, 0},
+	{ OFFS(ch), "number of channels", GF_PROP_UINT, "2", NULL, 0},
+	{ OFFS(framelen), "number of samples to put in one audio frame. For planar formats, indicate plane size in samples", GF_PROP_UINT, "1024", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+GF_FilterRegister PCMReframeRegister = {
+	.name = "rfpcm",
+	GF_FS_SET_DESCRIPTION("PCM reframer")
+	GF_FS_SET_HELP("This filter parses raw PCM file/data and outputs corresponding raw audio PID and frames.")
+	.private_size = sizeof(GF_PCMReframeCtx),
+	.args = PCMReframeArgs,
+	SETCAPS(PCMReframeCaps),
+	.configure_pid = pcmreframe_configure_pid,
+	.process = pcmreframe_process,
+	.process_event = pcmreframe_process_event
+};
+
+
+const GF_FilterRegister *pcmreframe_register(GF_FilterSession *session)
+{
+	PCMReframeArgs[1].min_max_enum = gf_audio_fmt_all_names();
+	PCMReframeCaps[1].val.value.string = (char *) gf_audio_fmt_all_shortnames();
+	return &PCMReframeRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/reframe_rawvid.c Added

@@ -0,0 +1,306 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / RAW video (YUV,RGB) 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
+{
+	//opts
+	GF_PropVec2i size;
+	GF_PixelFormat spfmt;
+	GF_Fraction fps;
+	Bool copy;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	Bool file_loaded, is_playing, initial_play_done;
+	u64 cts;
+	u32 frame_size, nb_bytes_in_frame;
+	u64 filepos, total_frames;
+	GF_FilterPacket *out_pck;
+	u8 *out_data;
+	Bool reverse_play, done;
+} GF_RawVidReframeCtx;
+
+
+
+
+GF_Err rawvidreframe_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 stride, stride_uv;
+	GF_RawVidReframeCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	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 (!ctx->spfmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Missing pixel format, cannot parse\n"));
+		return GF_BAD_PARAM;
+	}
+	if (!ctx->size.x || !ctx->size.y) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[RawVidReframe] Missing video frame size, cannot parse\n"));
+		return GF_BAD_PARAM;
+	}
+
+	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->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));
+	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_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));
+
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FILE_CACHED);
+	if (p && p->value.boolean) ctx->file_loaded = GF_TRUE;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DOWN_SIZE);
+	if (p && p->value.longuint) {
+		u64 nb_frames = p->value.longuint;
+		nb_frames /= ctx->frame_size;
+		ctx->total_frames = nb_frames;
+		nb_frames *= ctx->fps.den;
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DURATION, &PROP_FRAC64_INT(nb_frames, ctx->fps.num));
+	}
+
+	if (!ctx->copy) {
+		gf_filter_pid_set_property_str(ctx->opid, "BufferLength", &PROP_UINT(0));
+	}
+	return GF_OK;
+}
+
+static Bool rawvidreframe_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	u32 nb_frames;
+	GF_FilterEvent fevt;
+	GF_RawVidReframeCtx *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->done = GF_FALSE;
+		if (evt->play.start_range>=0) {
+			nb_frames = (u32) (evt->play.start_range * ctx->fps.num);
+		} else {
+			nb_frames = (u32) (ctx->cts / ctx->fps.den);
+		}
+		if (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;
+
+		//post a seek even for the begining, 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;
+		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;
+}
+
+GF_Err rawvidreframe_process(GF_Filter *filter)
+{
+	GF_RawVidReframeCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	u64 byte_offset;
+	char *data;
+	u32 pck_size;
+
+	if (ctx->done) return GF_EOS;
+
+	if (!ctx->is_playing && ctx->opid) return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid) && !ctx->reverse_play) {
+			if (ctx->out_pck) {
+				gf_filter_pck_send(ctx->out_pck);
+				ctx->out_pck = NULL;
+			}
+			if (ctx->opid)
+				gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+	byte_offset = gf_filter_pck_get_byte_offset(pck);
+
+	while (pck_size) {
+		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);
+				use_ref = GF_TRUE;
+			} else {
+				ctx->out_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->frame_size, &ctx->out_data);
+			}
+			if (!ctx->out_pck) return GF_OUT_OF_MEM;
+
+			gf_filter_pck_set_cts(ctx->out_pck, ctx->cts);
+			gf_filter_pck_set_sap(ctx->out_pck, GF_FILTER_SAP_1);
+			gf_filter_pck_set_duration(ctx->out_pck, ctx->fps.den);
+			gf_filter_pck_set_byte_offset(ctx->out_pck, byte_offset);
+		}
+
+		if (pck_size + ctx->nb_bytes_in_frame < ctx->frame_size) {
+			memcpy(ctx->out_data + ctx->nb_bytes_in_frame, data, pck_size);
+			ctx->nb_bytes_in_frame += pck_size;
+			pck_size = 0;
+		} else {
+			u32 remain = ctx->frame_size - ctx->nb_bytes_in_frame;
+			if (!use_ref) {
+				memcpy(ctx->out_data + ctx->nb_bytes_in_frame, data, remain);
+			}
+			gf_filter_pck_send(ctx->out_pck);
+
+			pck_size -= remain;
+			data += remain;
+			byte_offset += remain;
+			ctx->out_pck = NULL;
+			ctx->nb_bytes_in_frame = 0;
+
+			//reverse playback, the remaining data is for the next frame, we want the previous one.
+			//Trash packet and seek to previous frame
+			if (ctx->reverse_play) {
+				GF_FilterEvent fevt;
+				if (!ctx->cts) {
+					if (ctx->opid)
+						gf_filter_pid_set_eos(ctx->opid);
+					ctx->done = GF_TRUE;
+					return GF_EOS;
+				}
+				ctx->cts -= ctx->fps.den;
+				ctx->filepos -= ctx->frame_size;
+				gf_filter_pid_drop_packet(ctx->ipid);
+				//post a seek, this will trash remaining packets in buffers
+				GF_FEVT_INIT(fevt, GF_FEVT_SOURCE_SEEK, ctx->ipid);
+				fevt.seek.start_offset = ctx->filepos;
+				gf_filter_pid_send_event(ctx->ipid, &fevt);
+				return GF_OK;
+			}
+			ctx->cts += ctx->fps.den;
+		}
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+
+static GF_FilterCapability RawVidReframeCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT, GF_PROP_PID_FILE_EXT, "yuv"),
+	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),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_RawVidReframeCtx, _n)
+static GF_FilterArgs RawVidReframeArgs[] =
+{
+	{ OFFS(size), "source video resolution", GF_PROP_VEC2I, "0x0", NULL, 0},
+	{ OFFS(spfmt), "source pixel format. When not set, derived from file extension", GF_PROP_PIXFMT, "none", NULL, 0},
+	{ OFFS(fps), "number of frames per second", GF_PROP_FRACTION, "25/1", NULL, 0},
+	{ OFFS(copy), "copy source bytes into output frame. If not set, source bytes are referenced only", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+
+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.")
+	.private_size = sizeof(GF_RawVidReframeCtx),
+	.args = RawVidReframeArgs,
+	SETCAPS(RawVidReframeCaps),
+	.configure_pid = rawvidreframe_configure_pid,
+	.process = rawvidreframe_process,
+	.process_event = rawvidreframe_process_event
+};
+
+
+const GF_FilterRegister *rawvidreframe_register(GF_FilterSession *session)
+{
+	RawVidReframeArgs[1].min_max_enum = gf_pixel_fmt_all_names();
+	RawVidReframeCaps[1].val.value.string = (char *) gf_pixel_fmt_all_shortnames();
+	return &RawVidReframeRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/reframer.c Added

@@ -0,0 +1,1856 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / force 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>
+
+enum
+{
+	REFRAME_RT_OFF = 0,
+	REFRAME_RT_ON,
+	REFRAME_RT_SYNC,
+};
+
+enum
+{
+	REFRAME_ROUND_BEFORE=0,
+	REFRAME_ROUND_AFTER,
+	REFRAME_ROUND_CLOSEST,
+};
+
+enum
+{
+	RANGE_NONE=0,
+	RANGE_CLOSED,
+	RANGE_OPEN,
+	RANGE_DONE
+};
+
+enum
+{
+	EXTRACT_NONE=0,
+	EXTRACT_RANGE,
+	EXTRACT_SAP,
+	EXTRACT_SIZE,
+	EXTRACT_DUR,
+};
+
+typedef struct
+{
+	GF_FilterPid *ipid, *opid;
+	u32 timescale;
+	u64 cts_us_at_init;
+	u64 sys_clock_at_init;
+	u32 nb_frames;
+	Bool can_split;
+	Bool all_saps;
+	Bool needs_adjust;
+
+	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
+	u32 range_start_computed;
+	u64 range_end_reached_ts;
+	u64 prev_sap_ts;
+	u32 prev_sap_frame_idx;
+	u32 nb_frames_range;
+	u64 sap_ts_plus_one;
+	Bool first_pck_sent;
+
+	u32 tk_delay;
+	Bool in_eos;
+	u32 split_start;
+	u32 split_end;
+
+	GF_FilterPacket *split_pck;
+	GF_FilterPacket *resinsert_single_pck;
+	Bool is_playing;
+} RTStream;
+
+typedef struct
+{
+	//args
+	Bool exporter;
+	GF_PropUIntList saps;
+	GF_PropUIntList frames;
+	Bool refs;
+	u32 rt;
+	Double speed;
+	Bool raw;
+	GF_List *xs, *xe;
+	Bool nosap, splitrange, xadjust;
+	u32 xround;
+	Double seeksafe;
+
+	//internal
+	Bool filter_sap1;
+	Bool filter_sap2;
+	Bool filter_sap3;
+	Bool filter_sap4;
+	Bool filter_sap_none;
+
+	GF_List *streams;
+	RTStream *clock;
+
+	u64 reschedule_in;
+	u64 clock_val;
+
+	u32 range_type;
+	u32 cur_range_idx;
+	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;
+
+	GF_Fraction64 extract_dur;
+	u32 extract_mode;
+	Bool is_range_extraction;
+	u32 file_idx;
+
+	u64 min_ts_computed;
+	u32 min_ts_scale;
+	u64 split_size;
+	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;
+	u32 nb_non_saps;
+} GF_ReframerCtx;
+
+static void reframer_reset_stream(GF_ReframerCtx *ctx, RTStream *st)
+{
+	if (st->pck_queue) {
+		while (gf_list_count(st->pck_queue)) {
+			GF_FilterPacket *pck = gf_list_pop_front(st->pck_queue);
+			gf_filter_pck_unref(pck);
+		}
+		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);
+	gf_free(st);
+}
+GF_Err reframer_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i;
+	const GF_PropertyValue *p;
+	GF_ReframerCtx *ctx = gf_filter_get_udta(filter);
+	RTStream *st = gf_filter_pid_get_udta(pid);
+
+	if (is_remove) {
+		if (st) {
+			gf_filter_pid_remove(st->opid);
+			gf_list_del_item(ctx->streams, st);
+			reframer_reset_stream(ctx, st);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (st) {
+		gf_filter_pid_reset_properties(st->opid);
+	} else {
+		GF_SAFEALLOC(st, RTStream);
+		if (!st) return GF_OUT_OF_MEM;
+		
+		gf_list_add(ctx->streams, st);
+		st->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_udta(pid, st);
+		gf_filter_pid_set_udta(st->opid, st);
+		st->ipid = pid;
+		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;
+	else st->timescale = 1000;
+
+	if (!st->all_saps) {
+		ctx->nb_non_saps--;
+		st->all_saps = GF_TRUE;
+	}
+	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->needs_adjust = ctx->xadjust ? GF_TRUE : GF_FALSE;
+
+	st->tk_delay = 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) {
+			st->tk_delay = 0;
+		}
+		//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);
+			}
+		}
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PLAYBACK_MODE);
+	if (!p || (p->value.uint < GF_PLAYBACK_MODE_SEEK))
+		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 3: ctx->filter_sap3 = GF_TRUE; break;
+		case 4: ctx->filter_sap4 = GF_TRUE; break;
+		default: ctx->filter_sap_none = GF_TRUE; break;
+		}
+	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	return GF_OK;
+}
+
+static Bool reframer_parse_date(char *date, GF_Fraction64 *value, u64 *frame_idx_plus_one, u32 *extract_mode)
+{
+	u64 v;
+	value->num  =0;
+	value->den = 0;
+
+	if (extract_mode)
+		*extract_mode = EXTRACT_RANGE;
+
+	if (date[0] == 'T') {
+		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) {
+				if (sscanf(date, "T%u:%u.%u", &m, &s, &ms) != 3) {
+					goto exit;
+				}
+			}
+			if (ms>=1000) ms=0;
+		} else {
+			if (sscanf(date, "T%u:%u:%u", &h, &m, &s) != 3) {
+				goto exit;
+			}
+		}
+		v = h*3600 + m*60 + s;
+		v *= 1000;
+		v += ms;
+		value->num = v;
+		value->den = 1000;
+		return GF_TRUE;
+	}
+	if ((date[0]=='F') || (date[0]=='f')) {
+		*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;
+		value->num = 0;
+		value->den = 1000;
+		return GF_TRUE;
+	}
+	if ((date[0]=='D') || (date[0]=='d')) {
+		if (extract_mode)
+			*extract_mode = EXTRACT_DUR;
+		if (sscanf(date+1, LLD"/"LLU, &value->num, &value->den)==2) {
+			return GF_TRUE;
+		}
+		if (sscanf(date+1, LLU, &v)==1) {
+			value->num = v;
+			value->den = 1000;
+			return GF_TRUE;
+		}
+	}
+	if ((date[0]=='S') || (date[0]=='s')) {
+		GF_PropertyValue p;
+		if (extract_mode)
+			*extract_mode = EXTRACT_SIZE;
+		p = gf_props_parse_value(GF_PROP_LUINT, "size", date+1, NULL, ',');
+		if (p.type==GF_PROP_LUINT) {
+			value->den = p.value.longuint;
+			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));
+	if (extract_mode)
+		*extract_mode = EXTRACT_NONE;
+	return GF_FALSE;
+}
+
+static void reframer_load_range(GF_ReframerCtx *ctx)
+{
+	u32 i, count;
+	Bool do_seek = ctx->seekable;
+	u64 prev_frame = ctx->start_frame_idx_plus_one;
+	GF_Fraction64 prev_end;
+	char *start_date=NULL, *end_date=NULL;
+
+	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;
+		ctx->file_idx++;
+		return;
+	}
+	if ((ctx->extract_mode==EXTRACT_SAP) || (ctx->extract_mode==EXTRACT_SIZE)) {
+		ctx->cur_start = ctx->cur_end;
+		ctx->min_ts_computed = 0;
+		ctx->min_ts_scale = 0;
+		ctx->file_idx++;
+		return;
+	}
+	prev_end = ctx->cur_end;
+	ctx->start_frame_idx_plus_one = 0;
+	ctx->end_frame_idx_plus_one = 0;
+	ctx->cur_start.num = 0;
+	ctx->cur_start.den = 0;
+	ctx->cur_end.num = 0;
+	ctx->cur_end.den = 0;
+
+	count = gf_list_count(ctx->xs);
+	if (!count) {
+		if (ctx->range_type) goto range_done;
+		return;
+	}
+	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);
+	}
+	if (!start_date)
+		goto range_done;
+
+	ctx->cur_range_idx++;
+	if (!end_date) ctx->range_type = RANGE_OPEN;
+	else ctx->range_type = RANGE_CLOSED;
+
+	if (!reframer_parse_date(start_date, &ctx->cur_start, &ctx->start_frame_idx_plus_one, &ctx->extract_mode)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] cannot parse start date, assuming end of ranges\n"));
+		//done
+		ctx->range_type = RANGE_DONE;
+		return;
+	}
+
+	//range in frame
+	if (ctx->start_frame_idx_plus_one) {
+		//either range is before or prev range was not frame-based
+		if (ctx->start_frame_idx_plus_one > prev_frame)
+			do_seek = GF_TRUE;
+	}
+	//range is time based, prev was frame-based, seek
+	else if (!prev_end.den) {
+		do_seek = GF_TRUE;
+	} else {
+		//cur start is before previous end, need to seek
+		if (ctx->cur_start.num * prev_end.den < prev_end.num * ctx->cur_start.den) {
+			do_seek = GF_TRUE;
+		}
+		//cur start is less than our seek safety from previous end, do not seek
+		if (ctx->cur_start.num * prev_end.den < (prev_end.num + ctx->seeksafe*prev_end.den) * ctx->cur_start.den)
+			do_seek = GF_FALSE;
+	}
+	//do not issue seek on first range, done when catching play requests
+	if (ctx->cur_range_idx==1) {
+		do_seek = GF_FALSE;
+	}
+
+	if (!ctx->seekable && do_seek) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Reframer] ranges not in order and input not seekable, aborting extraction\n"));
+		goto range_done;
+	}
+
+	ctx->is_range_extraction = ((ctx->extract_mode==EXTRACT_RANGE) || (ctx->extract_mode==EXTRACT_DUR)) ? GF_TRUE : GF_FALSE;
+
+	if (ctx->extract_mode != EXTRACT_RANGE) {
+		end_date = NULL;
+		if (ctx->extract_mode==EXTRACT_DUR) {
+			ctx->extract_dur = ctx->cur_start;
+			ctx->cur_start.num = 0;
+			ctx->cur_start.den = ctx->extract_dur.den;
+			ctx->cur_end = ctx->extract_dur;
+			ctx->range_type = RANGE_CLOSED;
+			ctx->file_idx = 1;
+			ctx->splitrange = GF_TRUE;
+			ctx->xadjust = GF_TRUE;
+		}
+		else if (ctx->extract_mode==EXTRACT_SIZE) {
+			ctx->splitrange = GF_TRUE;
+			ctx->split_size = ctx->cur_start.den;
+			if (!ctx->split_size) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] invalid split size %d\n", ctx->split_size));
+				goto range_done;
+			}
+			ctx->file_idx = 1;
+		}
+		else if (ctx->extract_mode==EXTRACT_SAP) {
+			ctx->splitrange = GF_TRUE;
+		}
+	}
+	if (end_date) {
+		if (!reframer_parse_date(end_date, &ctx->cur_end, &ctx->end_frame_idx_plus_one, NULL)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] cannot parse end date, assuming open range\n"));
+			ctx->range_type = RANGE_OPEN;
+		}
+	}
+
+	//reset realtime range and issue seek requests
+	if (ctx->rt || do_seek) {
+		Double start_range = 0;
+		if (do_seek) {
+			start_range = (Double) ctx->cur_start.num;
+			start_range /= ctx->cur_start.den;
+			if (start_range > ctx->seeksafe)
+				start_range -= ctx->seeksafe;
+			else
+				start_range = 0;
+			ctx->has_seen_eos = GF_FALSE;
+		}
+		count = gf_list_count(ctx->streams);
+		for (i=0; i<count; i++) {
+			RTStream *st = gf_list_get(ctx->streams, i);
+			if (ctx->rt) {
+				st->cts_us_at_init = 0;
+				st->sys_clock_at_init = 0;
+			}
+			if (do_seek) {
+				GF_FilterEvent evt;
+				GF_FEVT_INIT(evt, GF_FEVT_STOP, st->ipid);
+				gf_filter_pid_send_event(st->ipid, &evt);
+				GF_FEVT_INIT(evt, GF_FEVT_PLAY, st->ipid);
+				evt.play.start_range = start_range;
+				evt.play.speed = 1;
+				gf_filter_pid_send_event(st->ipid, &evt);
+			}
+		}
+	}
+	return;
+
+range_done:
+	//done
+	ctx->range_type = RANGE_DONE;
+	count = gf_list_count(ctx->streams);
+	for (i=0; i<count; i++) {
+		GF_FilterEvent evt;
+		RTStream *st = gf_list_get(ctx->streams, i);
+		gf_filter_pid_set_discard(st->ipid, GF_TRUE);
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, st->ipid);
+		gf_filter_pid_send_event(st->ipid, &evt);
+		gf_filter_pid_set_eos(st->opid);
+	}
+
+}
+
+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) {
+		gf_list_rem(st->pck_queue, 0);
+		gf_filter_pck_unref(pck);
+	} else {
+		gf_filter_pid_drop_packet(st->ipid);
+	}
+}
+
+Bool reframer_send_packet(GF_Filter *filter, GF_ReframerCtx *ctx, RTStream *st, GF_FilterPacket *pck, Bool pck_is_ref)
+{
+	Bool do_send = GF_FALSE;
+
+
+	if (!ctx->rt) {
+		do_send = GF_TRUE;
+	} else {
+		u64 cts_us = gf_filter_pck_get_dts(pck);
+		if (cts_us==GF_FILTER_NO_TS)
+			cts_us = gf_filter_pck_get_cts(pck);
+
+		if (cts_us==GF_FILTER_NO_TS) {
+			do_send = GF_TRUE;
+		} else {
+			u64 clock = ctx->clock_val;
+			cts_us += st->tk_delay;
+
+			cts_us *= 1000000;
+			cts_us /= st->timescale;
+			if (ctx->rt==REFRAME_RT_SYNC) {
+				if (!ctx->clock) ctx->clock = st;
+
+				st = ctx->clock;
+			}
+			if (!st->sys_clock_at_init) {
+				st->cts_us_at_init = cts_us;
+				st->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"));
+				do_send = GF_TRUE;
+			} else {
+				u64 diff = cts_us - st->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) {
+					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));
+				} else {
+					diff -= clock;
+					if (!ctx->reschedule_in)
+						ctx->reschedule_in = diff;
+					else if (ctx->reschedule_in > diff)
+						ctx->reschedule_in = diff;
+				}
+			}
+		}
+	}
+
+	if (!ctx->range_type && ctx->frames.nb_items) {
+		u32 i;
+		Bool found=GF_FALSE;
+		for (i=0; i<ctx->frames.nb_items; i++) {
+			if (ctx->frames.vals[i] == st->nb_frames + 1) {
+				found=GF_TRUE;
+				break;
+			}
+		}
+		if (!found) {
+			//drop
+			gf_filter_pid_drop_packet(st->ipid);
+			st->nb_frames++;
+			return GF_TRUE;
+		}
+	}
+
+	if (!do_send)
+		return GF_FALSE;
+
+	//range processing
+	if (st->ts_at_range_start_plus_one) {
+		s64 ts;
+		GF_FilterPacket *new_pck = gf_filter_pck_new_ref(st->opid, NULL, 0, pck);
+		gf_filter_pck_merge_properties(pck, new_pck);
+
+		//signal chunk start boundary
+		if (!st->first_pck_sent) {
+			u32 i, len;
+			char *file_suf_name = NULL;
+			char *start = gf_list_get(ctx->xs, ctx->cur_range_idx-1);
+			char *end = NULL;
+			if (ctx->range_type==1) end = gf_list_get(ctx->xe, 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;
+					}
+				}
+				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];
+				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);
+				gf_filter_pck_set_property(new_pck, GF_PROP_PCK_FILESUF, &PROP_STRING(szFileSuf) );
+			}
+		}
+
+		//rewrite timestamps
+		ts = gf_filter_pck_get_cts(pck);
+
+		if (ts != GF_FILTER_NO_TS) {
+			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);
+				ts = 0;
+			}
+
+			gf_filter_pck_set_cts(new_pck, (u64) ts);
+			if (ctx->raw) {
+				gf_filter_pck_set_dts(new_pck, ts);
+			}
+		}
+		if (!ctx->raw) {
+			ts = gf_filter_pck_get_dts(pck);
+			if (ts != GF_FILTER_NO_TS) {
+				ts += st->tk_delay;
+				ts -= st->ts_at_range_start_plus_one - 1;
+				ts += st->ts_at_range_end;
+				gf_filter_pck_set_dts(new_pck, (u64) ts);
+			}
+		}
+		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);
+			st->ts_at_range_start_plus_one += st->split_start;
+			st->split_start = 0;
+		}
+		//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);
+			st->split_end = 0;
+		}
+
+		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;
+		}
+	}
+	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)
+{
+	if (ctx->start_frame_idx_plus_one) {
+		//frame not after our range start
+		if (frame_idx<ctx->start_frame_idx_plus_one) {
+			return 0;
+		} else {
+			//closed range, check
+			if ((ctx->range_type!=RANGE_OPEN) && (frame_idx>=ctx->end_frame_idx_plus_one)) {
+				return 2;
+			}
+			return 1;
+		}
+	} else {
+		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) {
+			before = GF_TRUE;
+		}
+		//closed range, check
+		if ((ctx->range_type!=RANGE_OPEN) && ((s64) ((ts+dur) * ctx->cur_end.den) >= ctx->cur_end.num * st->timescale)) {
+			after = GF_TRUE;
+		}
+		if (before) {
+			if (!after)
+				return 0;
+			//long duration samples (typically text) can both start before and end after the target range
+			else
+				return 2;
+		}
+		if (after) return 2;
+		return 1;
+	}
+	return 0;
+}
+
+void reframer_purge_queues(GF_ReframerCtx *ctx, u64 ts, u32 timescale)
+{
+	u32 i, count = gf_list_count(ctx->streams);
+	for (i=0; i<count; i++) {
+		RTStream *st = gf_list_get(ctx->streams, i);
+		u64 ts_rescale = ts;
+		if (st->resinsert_single_pck)
+			continue;
+
+		if (st->timescale != timescale) {
+			ts_rescale *= st->timescale;
+			ts_rescale /= timescale;
+		}
+		while (1) {
+			GF_FilterPacket *pck = gf_list_get(st->pck_queue, 0);
+			if (!pck) break;
+			u64 dts = gf_filter_pck_get_dts(pck);
+			if (dts==GF_FILTER_NO_TS)
+				dts = gf_filter_pck_get_cts(pck);
+
+			dts += gf_filter_pck_get_duration(pck);
+			if (dts >= ts_rescale) break;
+			gf_list_rem(st->pck_queue, 0);
+			gf_filter_pck_unref(pck);
+			st->nb_frames++;
+		}
+	}
+}
+
+static void check_gop_split(GF_ReframerCtx *ctx)
+{
+	u32 i, count = gf_list_count(ctx->streams);
+	Bool flush_all = GF_FALSE;
+
+	if (!ctx->min_ts_scale) {
+		u64 min_ts = 0;
+		u32 min_timescale=0;
+		u64 min_ts_a = 0;
+		u32 min_timescale_a=0;
+		u32 nb_eos = 0;
+		Bool has_empty_streams = GF_FALSE;
+		Bool wait_for_sap = GF_FALSE;
+		for (i=0; i<count; i++) {
+			u32 j, nb_pck, nb_sap;
+			u64 last_sap_ts=0;
+			RTStream *st = gf_list_get(ctx->streams, i);
+			nb_pck = gf_list_count(st->pck_queue);
+			nb_sap = 0;
+			if (st->in_eos) {
+				nb_eos++;
+				if (!nb_pck) {
+					has_empty_streams = GF_TRUE;
+					continue;
+				}
+			}
+
+			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) ) {
+					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;
+
+				nb_sap++;
+				if (nb_sap <= 1 + ctx->gop_depth) {
+					continue;
+				}
+
+				last_sap_ts = ts;
+				break;
+			}
+			//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) {
+					flush_all = GF_TRUE;
+				} else if (!st->all_saps) {
+					wait_for_sap = GF_TRUE;
+				}
+			}
+
+			if (st->all_saps) {
+				if (!min_ts_a || (last_sap_ts * min_timescale_a < min_ts_a * st->timescale) ) {
+					min_ts_a = last_sap_ts;
+					min_timescale_a = st->timescale;
+				}
+			} else {
+				if (!min_ts || (last_sap_ts * min_timescale < min_ts * st->timescale) ) {
+					min_ts = last_sap_ts;
+					min_timescale = st->timescale;
+				}
+			}
+		}
+
+		//in size split, flush as soon as one stream is in eos
+		if (nb_eos && has_empty_streams) {
+			flush_all = GF_TRUE;
+		}
+
+		//if flush, get timestamp + dur of last packet in each stream and use this as final end time
+		if (flush_all) {
+			for (i=0; i<count; i++) {
+				u64 ts;
+				GF_FilterPacket *pck;
+				RTStream *st = gf_list_get(ctx->streams, i);
+				if (!st->in_eos)
+					return;
+
+				pck = gf_list_last(st->pck_queue);
+				if (!pck) continue;
+				u32 dur = gf_filter_pck_get_duration(pck);
+				if (!dur) dur=1;
+				ts = gf_filter_pck_get_dts(pck);
+				if (ts==GF_FILTER_NO_TS)
+					ts = gf_filter_pck_get_cts(pck);
+				ts += st->tk_delay;
+				ts += dur;
+				if (!min_ts || (ts * min_timescale > min_ts * st->timescale) ) {
+					min_ts = ts;
+					min_timescale = st->timescale;
+				}
+			}
+		}
+
+		if (!min_ts) {
+			//video not ready, need more input
+			if (wait_for_sap)
+				return;
+			min_ts = min_ts_a;
+			min_timescale = min_timescale_a;
+		}
+		if (!min_ts) {
+			//other streams not ready, need more input
+			if (nb_eos<count)
+				return;
+		} else {
+			ctx->min_ts_scale = min_timescale;
+			ctx->min_ts_computed = min_ts;
+		}
+	}
+	//check all streams have reached min ts unless we are in final flush
+	if (!flush_all) {
+		for (i=0; i<count; i++) {
+			u64 ts;
+			GF_FilterPacket *pck;
+			RTStream *st = gf_list_get(ctx->streams, i);
+			if (st->range_start_computed==2) continue;
+			if (st->resinsert_single_pck) continue;
+			pck = gf_list_last(st->pck_queue);
+			assert(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;
+
+			if (ts * ctx->min_ts_scale < ctx->min_ts_computed * st->timescale) {
+				return;
+			}
+		}
+	}
+
+	//check condition
+	if (ctx->extract_mode==EXTRACT_SIZE) {
+		u32 nb_stop_at_min_ts = 0;
+		u64 cumulated_size = 0;
+		Bool use_prev = GF_FALSE;
+		u32 nb_eos = 0;
+
+		//check all streams have reached min ts
+		for (i=0; i<count; i++) {
+			u32 j, nb_pck;
+			Bool found=GF_FALSE;
+			RTStream *st = gf_list_get(ctx->streams, i);
+			nb_pck = gf_list_count(st->pck_queue);
+
+			for (j=0; j<nb_pck; j++) {
+				u64 ts;
+				u32 size;
+				GF_FilterPacket *pck = gf_list_get(st->pck_queue, j);
+
+				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) {
+					nb_stop_at_min_ts ++;
+					found = GF_TRUE;
+					break;
+				}
+				gf_filter_pck_get_data(pck, &size);
+				cumulated_size += size;
+			}
+			if ((j==nb_pck) && st->in_eos && !found) {
+				nb_eos++;
+			}
+		}
+		//some streams are not done and we have an estimated size less than target split
+		if ((nb_eos < count ) && (cumulated_size < ctx->split_size)
+			&& ctx->min_ts_scale
+			//do this only if first time we estimate this chunk size, or if previous estimated min_ts is not the same as current min_ts
+			&& (!ctx->prev_min_ts_computed || (ctx->prev_min_ts_computed < ctx->min_ts_computed))
+		) {
+			if ((nb_stop_at_min_ts + nb_eos) == count) {
+				ctx->est_file_size = cumulated_size;
+				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;
+		}
+		//decide which one we use
+		if (ctx->xround==REFRAME_ROUND_BEFORE) {
+			use_prev = GF_TRUE;
+		} else if (ctx->xround==REFRAME_ROUND_AFTER) {
+			use_prev = GF_FALSE;
+		} else {
+			s64 diff_prev = (s64) ctx->split_size;
+			s64 diff_cur = (s64) ctx->split_size;
+			diff_prev -= (s64) ctx->est_file_size;
+			diff_cur -= (s64) cumulated_size;
+			if (ABS(diff_cur)<ABS(diff_prev))
+				use_prev = GF_FALSE;
+			else
+				use_prev = GF_TRUE;
+		}
+		if (!ctx->prev_min_ts_scale)
+			use_prev = GF_FALSE;
+
+		if (use_prev) {
+			//ctx->est_file_size = ctx->est_file_size;
+			ctx->min_ts_computed = ctx->prev_min_ts_computed;
+			ctx->min_ts_scale = ctx->prev_min_ts_scale;
+		} else {
+			ctx->est_file_size = cumulated_size;
+		}
+		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;
+	}
+
+	//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);
+		GF_FilterPacket *pck = gf_list_get(st->pck_queue, 0);
+		st->range_end_reached_ts = (ctx->min_ts_computed * st->timescale);
+		if (ctx->min_ts_scale)
+			st->range_end_reached_ts /= ctx->min_ts_scale;
+
+		st->range_end_reached_ts += 1;
+		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;
+		} else {
+			//this will be a eos signal
+			st->range_end_reached_ts = 0;
+			assert(st->range_start_computed==2);
+		}
+	}
+	ctx->cur_end.num = ctx->min_ts_computed;
+	ctx->cur_end.den = ctx->min_ts_scale;
+
+}
+
+
+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->rt) {
+		ctx->reschedule_in = 0;
+		ctx->clock_val = gf_sys_clock_high_res();
+	}
+
+	/*active range, process as follows:
+		- if stream is marked as "start reached" or "end reached" do nothing
+		- queue up packets until we reach start range:
+		- 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
+				- 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
+			- do NOT enqueue packet
+			- if stream was not marked as "start ready" (no SAP in active range), use previous SAP before start and mark as active
+			- mark as end of range reached
+			- if stream is video and xadjust is set, re-enable all other stream processing
+
+		Once all streams are marked as "start ready"
+			- compute min time at which we will adjust the start range for all streams
+			- purge all packets before this time
+			- mark global context as "in range"
+
+		The regular (non-range) process is then adjusted as follows:
+			- if context is "in range" get packet from internal queue
+			- if no more packets in internal queue, mark stream as "range done"
+
+		Once all streams are marked as "range done"
+			- adjust next_ts of each stream
+			- mark each stream as not "start ready" and not "range done"
+			- mark context as not "in range"
+			- load next range and let the algo loop
+	*/
+	if (ctx->range_type && (ctx->range_type!=RANGE_DONE)) {
+		u32 nb_start_range_reached = 0;
+		Bool check_split = GF_FALSE;
+		//init timing
+		if (!ctx->timing_initialized) {
+			if (!reframer_init_timing(filter, ctx)) return GF_OK;
+		}
+
+		//fetch input packets
+		for (i=0; i<count; i++) {
+			u64 ts;
+			u32 pck_in_range, dur;
+			Bool is_sap;
+			Bool drop_input = GF_TRUE;
+			GF_FilterPacket *pck;
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			RTStream *st = gf_filter_pid_get_udta(ipid);
+
+			if (!st->is_playing) {
+				nb_start_range_reached++;
+				continue;
+			}
+
+			if (st->range_start_computed && !ctx->wait_video_range_adjust) {
+				nb_start_range_reached++;
+				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 (st->split_pck) {
+				pck = st->split_pck;
+				drop_input = GF_FALSE;
+			} else {
+				pck = gf_filter_pid_get_packet(ipid);
+			}
+			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
+					//this allows dealing with BIFS/OD/JPEG/PNG tracks
+					if (st->resinsert_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;
+								gf_filter_pck_ref(&pck);
+								gf_list_add(st->pck_queue, pck);
+								if (!ctx->is_range_extraction) {
+									check_split = GF_TRUE;
+								}
+							}
+						}
+						if (st->range_start_computed) {
+							nb_start_range_reached++;
+						}
+						if (!ctx->is_range_extraction) {
+							st->in_eos = GF_TRUE;
+						}
+						continue;
+					}
+
+					if (!ctx->is_range_extraction) {
+						check_split = GF_TRUE;
+						st->in_eos = GF_TRUE;
+					} else {
+						st->range_start_computed = 2;
+						if (ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust) {
+							ctx->wait_video_range_adjust = GF_FALSE;
+						}
+					}
+					//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;
+					}
+				}
+				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 nosap is set, consider all packet SAPs
+			is_sap = (ctx->nosap || ctx->raw || gf_filter_pck_get_sap(pck)) ? GF_TRUE : GF_FALSE;
+
+			if (!is_sap) {
+				if (st->all_saps) {
+					st->all_saps = GF_FALSE;
+					ctx->nb_non_saps++;
+					if (ctx->nb_non_saps>1) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Reframer] %d streams using predictive coding, results may be undefined or broken when aligning SAP, consider remuxing the source\n", ctx->nb_non_saps));
+					}
+
+					if (ctx->xadjust) {
+						st->needs_adjust = GF_TRUE;
+						if (st->range_start_computed==1) {
+							if (ctx->is_range_extraction) {
+								ctx->wait_video_range_adjust = GF_TRUE;
+							}
+						}
+					}
+				}
+			}
+
+			//SAP or size split, push packet in queue and ask for gop split check
+			if (!ctx->is_range_extraction) {
+				//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) {
+					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;
+				}
+				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;
+
+			//check if packet is in our range
+			pck_in_range = reframer_check_pck_range(ctx, st, ts, dur, st->nb_frames_range);
+
+
+			//SAP packet, decide if we cut here or at previous SAP
+			if (is_sap) {
+				//if streamtype is video or we have only one pid, purge all packets in all streams before this time
+				//
+				//for more complex cases we keep packets because we don't know if we will need SAP packets before the final
+				//decided start range
+				if (!pck_in_range && ((count==1) || !st->all_saps) ) {
+					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
+				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 (cur_closer) {
+							st->sap_ts_plus_one = ts+1;
+						} else {
+							st->sap_ts_plus_one = st->prev_sap_ts + 1;
+						}
+					} 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;
+					nb_start_range_reached++;
+				}
+				//remember prev sap time
+				if (pck_in_range!=2) {
+					st->prev_sap_ts = ts;
+					st->prev_sap_frame_idx = st->nb_frames_range;
+				}
+				//video stream start and xadjust set, prevent all other streams from being processed until wee determine the end of the video range
+				//and re-enable other streams processing
+				if (!ctx->wait_video_range_adjust && ctx->xadjust && st->needs_adjust) {
+					ctx->wait_video_range_adjust = GF_TRUE;
+				}
+			}
+
+			if ((ctx->extract_mode==EXTRACT_DUR) && ctx->has_seen_eos && (pck_in_range==2))
+				pck_in_range = 1;
+
+			//after range: whether SAP or not, mark end of range reached
+			if (pck_in_range==2) {
+				if (!ctx->xadjust || is_sap) {
+					Bool enqueue = GF_FALSE;
+					st->split_end = 0;
+					if (!st->range_start_computed) {
+						st->sap_ts_plus_one = st->prev_sap_ts + 1;
+						st->range_start_computed = 1;
+						nb_start_range_reached++;
+						if (st->prev_sap_ts == ts)
+							enqueue = GF_TRUE;
+					}
+					//remember the timestamp of first packet after range
+					st->range_end_reached_ts = ts + 1;
+
+					//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) {
+							//force enqueing this packet
+							enqueue = GF_TRUE;
+							st->split_end = (u32) ( (ctx->cur_end.num * st->timescale) / ctx->cur_end.den - ts);
+							st->range_end_reached_ts += st->split_end;
+							//and remember it for next chunk - note that we dequeue the input to get proper eos notification
+							gf_filter_pck_ref(&pck);
+							st->split_pck = pck;
+						}
+					}
+					//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;
+					}
+
+					//do NOT enqueue packet
+					if (!enqueue)
+						break;
+				}
+			}
+
+			//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) {
+					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;
+				}
+			} else {
+				assert(pck == st->split_pck);
+				gf_filter_pck_unref(st->split_pck);
+				st->split_pck = NULL;
+			}
+		}
+
+		if (check_split) {
+			check_gop_split(ctx);
+		}
+
+		//all streams reached the start range, compute min ts
+		if (!ctx->in_range
+			&& (nb_start_range_reached==count)
+			&& ctx->is_range_extraction
+		) {
+			u64 min_ts = 0;
+			u32 min_timescale=0;
+			u64 min_ts_a = 0;
+			u32 min_timescale_a=0;
+			u64 min_ts_split = 0;
+			u32 min_timescale_split=0;
+			Bool purge_all = GF_FALSE;
+			for (i=0; i<count; i++) {
+				GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+				RTStream *st = gf_filter_pid_get_udta(ipid);
+				if (!st->is_playing) continue;
+				assert(st->range_start_computed);
+				//eos
+				if (st->range_start_computed==2) {
+					continue;
+				}
+				//packet will be reinserted at cut time, do not check its timestamp
+				if (st->range_start_computed==3)
+					continue;
+
+				if (st->can_split) {
+					if (!min_ts_split || ((st->sap_ts_plus_one-1) * min_timescale_split < min_ts_split * st->timescale) ) {
+						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) ) {
+						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) ) {
+						min_ts = st->sap_ts_plus_one;
+						min_timescale = st->timescale;
+					}
+				}
+			}
+			if (!min_ts) {
+				min_ts = min_ts_a;
+				min_timescale = min_timescale_a;
+				if (!min_ts && min_ts_split) {
+					if (ctx->start_frame_idx_plus_one) {
+						min_ts = min_ts_split;
+						min_timescale = min_timescale_split;
+					} else {
+						min_ts = ctx->cur_start.num+1;
+						min_timescale = (u32) ctx->cur_start.den;
+					}
+				}
+			}
+			if (!min_ts) {
+				purge_all = GF_TRUE;
+				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;
+			} else {
+				min_ts -= 1;
+			}
+			//purge everything before min ts
+			for (i=0; i<count; i++) {
+				GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+				RTStream *st = gf_filter_pid_get_udta(ipid);
+
+				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;
+						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);
+						if (!dur) dur=1;
+						ots = ts;
+						if (min_timescale != st->timescale) {
+							ts *= min_timescale;
+							ts /= st->timescale;
+							dur *= min_timescale;
+							dur /= st->timescale;
+						}
+
+						if (ts >= min_ts) {
+							is_start = 1;
+						}
+						else if (st->can_split && (ts+dur >= min_ts)) {
+							is_start = 2;
+						}
+						else if (st->range_start_computed==3) {
+							is_start = 1;
+						}
+
+						if (is_start) {
+							//remember TS at range start
+							s64 orig = min_ts;
+							if (st->timescale != min_timescale) {
+								orig *= st->timescale;
+								orig /= min_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->ts_at_range_start_plus_one = ots + 1;
+
+							if ((st->range_start_computed==1)
+								&& (orig < (s64) ots)
+								&& 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) );
+							}
+							break;
+						}
+					}
+					gf_list_rem(st->pck_queue, 0);
+					gf_filter_pck_unref(pck);
+					st->nb_frames++;
+				}
+				//reset start range computed
+				st->range_start_computed = 0;
+				if (ctx->extract_mode==EXTRACT_DUR) {
+					st->first_pck_sent = GF_FALSE;
+				} else {
+					st->first_pck_sent = ctx->splitrange ? GF_FALSE : GF_TRUE;
+				}
+
+				if (purge_all && (ctx->extract_mode!=EXTRACT_RANGE)) {
+					gf_filter_pid_get_packet(st->ipid);
+					gf_filter_pid_set_eos(st->opid);
+				}
+			}
+			if (purge_all) {
+				if (ctx->extract_mode!=EXTRACT_RANGE)
+					return GF_EOS;
+
+				goto load_next_range;
+			}
+
+			//we are in the range
+			ctx->in_range = GF_TRUE;
+		}
+		if (!ctx->in_range)
+			return GF_OK;
+	}
+
+	nb_eos = 0;
+	nb_end_of_range = 0;
+	for (i=0; i<count; i++) {
+		GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+		RTStream *st = gf_filter_pid_get_udta(ipid);
+
+		while (1) {
+			Bool forward = GF_TRUE;
+			Bool pck_is_ref = GF_FALSE;
+			GF_FilterPacket *pck;
+
+			//dequeue packet
+			if (ctx->range_type && (ctx->range_type!=RANGE_DONE) ) {
+				pck = gf_list_get(st->pck_queue, 0);
+				pck_is_ref = GF_TRUE;
+
+				if (pck && !ctx->is_range_extraction && st->range_end_reached_ts) {
+					u64 ts;
+					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>= st->range_end_reached_ts-1) {
+						nb_end_of_range++;
+						break;
+					}
+				}
+
+			} else {
+				pck = gf_filter_pid_get_packet(ipid);
+			}
+
+			if (!pck) {
+				if (st->range_end_reached_ts) {
+					nb_end_of_range++;
+					break;
+				}
+
+				if (!st->is_playing) {
+					nb_eos++;
+				} else {
+					//force a eos check if this was a split pid
+					if (st->can_split)
+						gf_filter_pid_get_packet(st->ipid);
+
+					if (gf_filter_pid_is_eos(ipid)) {
+						gf_filter_pid_set_eos(st->opid);
+						nb_eos++;
+					}
+				}
+				break;
+			}
+
+			if (ctx->refs) {
+				u8 deps = gf_filter_pck_get_dependency_flags(pck);
+				deps >>= 2;
+				deps &= 0x3;
+				//not used as reference, don't forward
+				if (deps==2)
+					forward = GF_FALSE;
+			}
+			if (ctx->saps.nb_items) {
+				u32 sap = gf_filter_pck_get_sap(pck);
+				switch (sap) {
+				case GF_FILTER_SAP_1:
+					if (!ctx->filter_sap1) forward = GF_FALSE;
+					break;
+				case GF_FILTER_SAP_2:
+					if (!ctx->filter_sap2) forward = GF_FALSE;
+					break;
+				case GF_FILTER_SAP_3:
+					if (!ctx->filter_sap3) forward = GF_FALSE;
+					break;
+				case GF_FILTER_SAP_4:
+					if (!ctx->filter_sap4) forward = GF_FALSE;
+					break;
+				default:
+					if (!ctx->filter_sap_none) forward = GF_FALSE;
+					break;
+				}
+			}
+			if (ctx->range_type==RANGE_DONE)
+				forward = GF_FALSE;
+
+			if (!forward) {
+				reframer_drop_packet(ctx, st, pck, pck_is_ref);
+				st->nb_frames++;
+				continue;
+			}
+
+			if (! reframer_send_packet(filter, ctx, st, pck, pck_is_ref))
+				break;
+
+		}
+	}
+
+	//end of range
+	if (nb_end_of_range + nb_eos == count) {
+load_next_range:
+		nb_end_of_range = 0;
+		nb_eos=0;
+		for (i=0; i<count; i++) {
+			GF_FilterPid *ipid = gf_filter_get_ipid(filter, i);
+			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;
+			} else {
+				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;
+			st->range_start_computed = 0;
+			if (st->in_eos) {
+				if (gf_list_count(st->pck_queue)) {
+					nb_end_of_range++;
+				} else {
+					gf_filter_pid_set_eos(st->opid);
+					nb_eos++;
+				}
+			} else if (st->split_pck) {
+				nb_end_of_range++;
+			}
+		}
+		//and load next range
+		ctx->in_range = GF_FALSE;
+		reframer_load_range(ctx);
+		if (nb_end_of_range)
+			gf_filter_post_process_task(filter);
+	}
+
+	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));
+		} else if (ctx->reschedule_in>1000) {
+			gf_filter_ask_rt_reschedule(filter, (u32) (ctx->reschedule_in / 2));
+		}
+	}
+
+	return GF_OK;
+}
+
+static const GF_FilterCapability ReframerRAWCaps[] =
+{
+	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)
+};
+
+static GF_Err reframer_initialize(GF_Filter *filter)
+{
+	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) );
+	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		reframer_update_ts_shift(ctx, -1, 1000);
+	}
+#endif
+	return GF_OK;
+}
+
+static Bool reframer_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_ReframerCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterEvent fevt;
+	RTStream *st;
+	if (!evt->base.on_pid) return GF_FALSE;
+	st = gf_filter_pid_get_udta(evt->base.on_pid);
+	if (!st) return GF_TRUE;
+	//if we have a PID, we always cancel the event and forward the same event to the associated input pid
+	fevt = *evt;
+	fevt.base.on_pid = st->ipid;
+
+	//if range extraction based on time, adjust start range
+	if (evt->base.type==GF_FEVT_PLAY) {
+		if (ctx->range_type && !ctx->start_frame_idx_plus_one) {
+			Double start_range = (Double) ctx->cur_start.num;
+			start_range /= ctx->cur_start.den;
+			//rewind safety offset
+			if (start_range > ctx->seeksafe)
+				start_range -= ctx->seeksafe;
+			else
+				start_range = 0.0;
+
+			fevt.play.start_range = start_range;
+		}
+		st->in_eos = GF_FALSE;
+		st->is_playing = GF_TRUE;
+		ctx->is_eos = GF_FALSE;
+	} else if (evt->base.type==GF_FEVT_STOP) {
+		st->is_playing = GF_FALSE;
+	}
+
+	gf_filter_pid_send_event(st->ipid, &fevt);
+	return GF_TRUE;
+}
+
+static void reframer_finalize(GF_Filter *filter)
+{
+	GF_ReframerCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		RTStream *st = gf_list_pop_back(ctx->streams);
+		reframer_reset_stream(ctx, st);
+	}
+	gf_list_del(ctx->streams);
+}
+
+static const GF_FilterCapability ReframerCaps[] =
+{
+	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),
+	//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
+	CAP_UINT(GF_CAPS_OUTPUT_EXCLUDED, GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	//but we may produce raw streams when filter is explicitly loaded (media exporter)
+	CAP_UINT(GF_CAPS_OUTPUT_LOADED_FILTER, GF_PROP_PID_CODECID, GF_CODECID_RAW)
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_ReframerCtx, _n)
+static const GF_FilterArgs ReframerArgs[] =
+{
+	{ 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},
+	{ 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(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(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},
+	{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"
+		"- 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"
+		"  \n"
+		"# SAP filtering\n"
+		"The filter can remove packets based on their SAP types using [-saps]() option.\n"
+		"For example, this can be used to extract only the key frame (SAP 1,2,3) of a video to create a trick mode version.\n"
+		"  \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"
+		"  \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"
+		"# 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"
+		"  \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"
+		"- NUM/DEN: specify time in seconds as fraction\n"
+		"- FNUM: specify time as frame number\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."
+		"\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"
+		"This will extract the time ranges [10s,20s], [1m10s,1m20s] and all media starting from 2m\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"
+		"\n"
+		"EX gpac src=m.mp4 reframer:xs=T00:00:10,T00:01:10:xe=T00:00:20:splitrange -o dump_$FS$.264\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"
+		"# 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"
+		"\n"
+		"Note: In these modes, [-splitrange]() and [-xadjust]() are implicitly set.\n"
+	)
+	.private_size = sizeof(GF_ReframerCtx),
+	.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,
+	SETCAPS(ReframerCaps),
+	.initialize = reframer_initialize,
+	.finalize = reframer_finalize,
+	.configure_pid = reframer_configure_pid,
+	.process = reframer_process,
+	.process_event = reframer_process_event,
+};
+
+
+const GF_FilterRegister *reframer_register(GF_FilterSession *session)
+{
+	return &ReframerRegister;
+}

gpac-1.0.0.tar.gz/src/filters/resample_audio.c Added

@@ -0,0 +1,394 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / audio resample 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>
+#include <gpac/internal/compositor_dev.h>
+
+typedef struct
+{
+	//opts
+	u32 ch, sr, fmt;
+
+	//internal
+	GF_FilterPid *ipid, *opid;
+	GF_AudioMixer *mixer;
+	Bool cfg_forced;
+	//output config
+	u32 freq, nb_ch, afmt;
+	u64 ch_cfg;
+	u64 out_cts;
+	//source is planar
+	Bool src_is_planar;
+	GF_AudioInterface input_ai;
+	Bool passthrough;
+	u32 timescale;
+	const char *data;
+	u32 size, bytes_consumed;
+	Fixed speed;
+	GF_FilterPacket *in_pck;
+} GF_ResampleCtx;
+
+
+static u8 *resample_fetch_frame(void *callback, u32 *size, u32 *planar_stride, u32 audio_delay_ms)
+{
+	u32 sample_offset;
+	GF_ResampleCtx *ctx = (GF_ResampleCtx *) callback;
+	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
+	//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;
+	}
+	return (char*)ctx->data + sample_offset;
+}
+
+static void resample_release_frame(void *callback, u32 nb_bytes)
+{
+	GF_ResampleCtx *ctx = (GF_ResampleCtx *) callback;
+	ctx->bytes_consumed += nb_bytes;
+	assert(ctx->bytes_consumed<=ctx->size);
+	if (ctx->bytes_consumed==ctx->size) {
+		//trash packet and get a new one
+		gf_filter_pid_drop_packet(ctx->ipid);
+		ctx->data = 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;
+	}
+}
+
+static Bool resample_get_config(struct _audiointerface *ai, Bool for_reconf)
+{
+	return GF_TRUE;
+}
+static Bool resample_is_muted(void *callback)
+{
+	return GF_FALSE;
+}
+static Fixed resample_get_speed(void *callback)
+{
+	GF_ResampleCtx *ctx = (GF_ResampleCtx *) callback;
+	return ctx->speed;
+}
+static Bool resample_get_channel_volume(void *callback, Fixed *vol)
+{
+	u32 i;
+	for (i=0; i<GF_AUDIO_MIXER_MAX_CHANNELS; i++) vol[i] = FIX_ONE;
+	return GF_FALSE;
+}
+
+static GF_Err resample_initialize(GF_Filter *filter)
+{
+	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+	ctx->mixer = gf_mixer_new(NULL);
+	if (!ctx->mixer) return GF_OUT_OF_MEM;
+
+	ctx->input_ai.callback = ctx;
+	ctx->input_ai.FetchFrame = resample_fetch_frame;
+	ctx->input_ai.ReleaseFrame = resample_release_frame;
+	ctx->input_ai.GetConfig = resample_get_config;
+	ctx->input_ai.IsMuted = resample_is_muted;
+	ctx->input_ai.GetSpeed = resample_get_speed;
+	ctx->input_ai.GetChannelVolume = resample_get_channel_volume;
+	ctx->speed = FIX_ONE;
+	return GF_OK;
+}
+
+static void resample_finalize(GF_Filter *filter)
+{
+	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->mixer) gf_mixer_del(ctx->mixer);
+	if (ctx->in_pck && ctx->ipid) gf_filter_pid_drop_packet(ctx->ipid);
+}
+
+
+static GF_Err resample_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 sr, nb_ch, afmt;
+	u64 ch_cfg;
+	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_mixer_remove_input(ctx->mixer, &ctx->input_ai);
+			gf_filter_pid_remove(ctx->opid);
+		}
+		if (ctx->in_pck) gf_filter_pid_drop_packet(ctx->ipid);
+		ctx->in_pck = NULL;
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_max_buffer(ctx->opid, gf_filter_pid_get_max_buffer(pid) );
+	}
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+		gf_mixer_add_input(ctx->mixer, &ctx->input_ai);
+	}
+
+	sr = ctx->freq;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (p) sr = p->value.uint;
+	if (!sr) sr = 44100;
+
+	nb_ch = ctx->nb_ch;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p) nb_ch = p->value.uint;
+	if (!nb_ch) nb_ch = 1;
+
+	afmt = ctx->afmt;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+	if (p) afmt = p->value.uint;
+
+	ch_cfg = ctx->ch_cfg;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+	if (p) ch_cfg = p->value.longuint;
+	if (!ch_cfg) ch_cfg = (nb_ch==1) ? GF_AUDIO_CH_FRONT_CENTER : (GF_AUDIO_CH_FRONT_LEFT|GF_AUDIO_CH_FRONT_RIGHT);
+
+	ctx->timescale = sr;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+	if (p) ctx->timescale = p->value.uint;
+
+	//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;
+		ctx->ch_cfg = ch_cfg;
+
+		gf_mixer_set_config(ctx->mixer, ctx->freq, ctx->nb_ch, afmt, ctx->ch_cfg);
+	}
+	//input reconfig
+	if ((sr != ctx->input_ai.samplerate) || (nb_ch != ctx->input_ai.chan)
+		|| (afmt != ctx->input_ai.afmt) || (ch_cfg != ctx->input_ai.ch_layout)
+		|| (ctx->src_is_planar != gf_audio_fmt_is_planar(afmt))
+	) {
+		ctx->input_ai.samplerate = sr;
+		ctx->input_ai.afmt = afmt;
+		ctx->input_ai.chan = nb_ch;
+		ctx->input_ai.ch_layout = ch_cfg;
+		ctx->src_is_planar = gf_audio_fmt_is_planar(afmt);
+	}
+
+	ctx->passthrough = GF_FALSE;
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+
+	if ((ctx->input_ai.samplerate==ctx->freq) && (ctx->input_ai.chan==ctx->nb_ch) && (ctx->input_ai.afmt==ctx->afmt) && (ctx->speed==FIX_ONE))
+		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_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));
+	return GF_OK;
+}
+
+
+static GF_Err resample_process(GF_Filter *filter)
+{
+	u8 *output;
+	u32 osize, written;
+	GF_FilterPacket *dstpck;
+	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+	u32 bps, bytes_per_samp;
+	if (!ctx->ipid) return GF_OK;
+
+	bps = gf_audio_fmt_bit_depth(ctx->afmt);
+	bytes_per_samp = ctx->nb_ch * bps / 8;
+
+	while (1) {
+		if (!ctx->in_pck) {
+			ctx->in_pck = gf_filter_pid_get_packet(ctx->ipid);
+
+			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;
+				}
+				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) {
+			gf_filter_pck_forward(ctx->in_pck, ctx->opid);
+			gf_filter_pid_drop_packet(ctx->ipid);
+			ctx->in_pck = NULL;
+			continue;
+		}
+
+		osize = ctx->size * ctx->nb_ch * bps;
+		osize /= ctx->input_ai.chan * gf_audio_fmt_bit_depth(ctx->input_ai.afmt);
+
+		dstpck = gf_filter_pck_new_alloc(ctx->opid, osize, &output);
+		if (!dstpck) return GF_OK;
+		gf_filter_pck_merge_properties(ctx->in_pck, dstpck);
+
+		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->timescale==ctx->freq) {
+			ctx->out_cts += written / bytes_per_samp;
+		} else {
+			u64 ts_inc = written / bytes_per_samp;
+			ts_inc *= ctx->timescale;
+			ts_inc /= ctx->freq;
+
+			ctx->out_cts += ts_inc;
+
+		}
+		//still some bytes to use from packet, do not discard
+		if (ctx->bytes_consumed<ctx->size) {
+			continue;
+		}
+		//done with this packet
+		if (ctx->in_pck) {
+			ctx->in_pck = NULL;
+			gf_filter_pid_drop_packet(ctx->ipid);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err resample_reconfigure_output(GF_Filter *filter, GF_FilterPid *pid)
+{
+	u32 sr, nb_ch, afmt;
+	u64 ch_cfg;
+	const GF_PropertyValue *p;
+	GF_ResampleCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->opid != pid) return GF_BAD_PARAM;
+		
+	sr = ctx->freq;
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (p) sr = p->value.uint;
+
+	nb_ch = ctx->nb_ch;
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p) nb_ch = p->value.uint;
+
+	afmt = ctx->afmt;
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_AUDIO_FORMAT);
+	if (p) afmt = p->value.uint;
+
+	ch_cfg = ctx->ch_cfg;
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_CHANNEL_LAYOUT);
+	if (p) ch_cfg = p->value.longuint;
+
+	p = gf_filter_pid_caps_query(pid, GF_PROP_PID_AUDIO_SPEED);
+	if (p) {
+		ctx->speed = FLT2FIX((Float) p->value.number);
+		if (ctx->speed<0) ctx->speed = -ctx->speed;
+	} else {
+		ctx->speed = FIX_ONE;
+	}
+
+	if ((sr==ctx->freq) && (nb_ch==ctx->nb_ch) && (afmt==ctx->afmt) && (ch_cfg==ctx->ch_cfg) && (ctx->speed == FIX_ONE) ) return GF_OK;
+
+	ctx->afmt = afmt;
+	ctx->freq = sr;
+	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);
+	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_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));
+
+	if (ctx->speed > FIX_ONE) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_BUFFER_REQ, ctx->ipid);
+		evt.buffer_req.max_buffer_us = FIX2INT( ctx->speed * 100000 );
+		gf_filter_pid_send_event(ctx->ipid, &evt);
+	}
+
+	return GF_OK;
+}
+
+static const GF_FilterCapability ResamplerCaps[] =
+{
+	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),
+	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),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_ResampleCtx, _n)
+static const 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},
+	{0}
+};
+
+GF_FilterRegister ResamplerRegister = {
+	.name = "resample",
+	GF_FS_SET_DESCRIPTION("Audio resampler")
+	GF_FS_SET_HELP("This filter resamples raw audio to a target sample rate, number of channels or audio format.")
+	.private_size = sizeof(GF_ResampleCtx),
+	.initialize = resample_initialize,
+	.finalize = resample_finalize,
+	.args = ResamplerArgs,
+	SETCAPS(ResamplerCaps),
+	.configure_pid = resample_configure_pid,
+	.process = resample_process,
+	.reconfigure_output = resample_reconfigure_output,
+};
+
+
+const GF_FilterRegister *resample_register(GF_FilterSession *session)
+{
+	return &ResamplerRegister;
+}

gpac-1.0.0.tar.gz/src/filters/rewind.c Added

@@ -0,0 +1,262 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / media rewinder 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>
+#include <gpac/internal/compositor_dev.h>
+
+typedef struct
+{
+	//opts
+	u32 rbuffer;
+
+	//internal
+	GF_FilterPid *ipid, *opid;
+	u32 type;
+
+	Bool passthrough;
+
+	GF_List *frames;
+
+	u32 nb_ch;
+	u32 bytes_per_sample;
+	Bool is_planar;
+
+	Bool wait_for_next_sap;
+
+} GF_RewindCtx;
+
+
+static GF_Err rewind_initialize(GF_Filter *filter)
+{
+	GF_RewindCtx *ctx = gf_filter_get_udta(filter);
+	ctx->frames = gf_list_new();
+	return GF_OK;
+}
+
+static void rewind_finalize(GF_Filter *filter)
+{
+	GF_RewindCtx *ctx = gf_filter_get_udta(filter);
+	gf_list_del(ctx->frames);
+}
+
+
+static GF_Err rewind_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 afmt;
+	GF_RewindCtx *ctx = gf_filter_get_udta(filter);
+	if (is_remove) {
+		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_STREAM_TYPE);
+	if (!p) return GF_NOT_SUPPORTED;
+	ctx->type = p->value.uint;
+
+	if (ctx->type==GF_STREAM_AUDIO) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+		if (p) ctx->nb_ch = p->value.uint;
+		if (!ctx->nb_ch) ctx->nb_ch = 1;
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+		if (!p) return GF_NOT_SUPPORTED;
+
+		afmt = p->value.uint;
+		ctx->bytes_per_sample = gf_audio_fmt_bit_depth(afmt) * ctx->nb_ch / 8;
+		ctx->is_planar = gf_audio_fmt_is_planar(afmt);
+	}
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_max_buffer(ctx->opid, gf_filter_pid_get_max_buffer(pid) );
+	}
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+	}
+	gf_filter_pid_copy_properties(ctx->opid, ctx->ipid);
+	return GF_OK;
+}
+
+static GF_Err rewind_process_video(GF_RewindCtx *ctx, GF_FilterPacket *pck)
+{
+	Bool do_flush = GF_FALSE;
+	if (pck) {
+		//keep a ref on this packet
+		gf_filter_pck_ref(&pck);
+		//and drop input
+		gf_filter_pid_drop_packet(ctx->ipid);
+		if (gf_filter_pck_get_sap(pck)) {
+			do_flush = GF_TRUE;
+			ctx->wait_for_next_sap = GF_FALSE;
+		}
+		else if (gf_list_count(ctx->frames)>ctx->rbuffer) {
+			do_flush = GF_TRUE;
+			ctx->wait_for_next_sap = GF_TRUE;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[Rewind] Too many frames in GOP, %d vs %d max allowed, flushing until next SAP\n", gf_list_count(ctx->frames), ctx->rbuffer));
+		}
+	} else {
+		do_flush = GF_TRUE;
+	}
+	//frame was a SAP, flush all previous frames in reverse order
+	if (do_flush) {
+		while (1) {
+			GF_FilterPacket *frame = gf_list_pop_back(ctx->frames);
+			if (!frame) break;
+			gf_filter_pck_forward(frame, ctx->opid);
+			gf_filter_pck_unref(frame);
+		}
+	}
+	if (pck) {
+		//rewind buffer exceeded
+		if (ctx->wait_for_next_sap) {
+			gf_filter_pck_forward(pck, ctx->opid);
+			gf_filter_pck_unref(pck);
+		} else {
+			gf_list_add(ctx->frames, pck);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err rewind_process(GF_Filter *filter)
+{
+	u8 *output;
+	const u8 *data;
+	u32 size;
+	GF_FilterPacket *pck, *dstpck;
+	GF_RewindCtx *ctx = gf_filter_get_udta(filter);
+
+	if (!ctx->ipid) return GF_OK;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (!ctx->passthrough && (ctx->type == GF_STREAM_VISUAL)) {
+				return rewind_process_video(ctx, NULL);
+			}
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+	if (ctx->type == GF_STREAM_VISUAL) {
+		return rewind_process_video(ctx, pck);
+	}
+	data = gf_filter_pck_get_data(pck, &size);
+
+	dstpck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	if (!dstpck) return GF_OK;
+	gf_filter_pck_merge_properties(pck, dstpck);
+
+	if (ctx->is_planar) {
+		u32 i, j, nb_samples, planesize, bytes_per_samp;
+		nb_samples = size / ctx->bytes_per_sample;
+		planesize = nb_samples * ctx->bytes_per_sample / ctx->nb_ch;
+
+		bytes_per_samp = ctx->bytes_per_sample / ctx->nb_ch;
+		for (j=0; j<ctx->nb_ch; j++) {
+			char *dst = output + j * planesize;
+			char *src = (char *) data + j * planesize;
+
+			for (i=0; i<nb_samples; i++) {
+				memcpy(dst + i*bytes_per_samp, src + (nb_samples - i - 1)*bytes_per_samp, bytes_per_samp);
+			}
+		}
+	} else {
+		u32 i, nb_samples;
+		nb_samples = size / ctx->bytes_per_sample;
+
+		for (i=0; i<nb_samples; i++) {
+			memcpy(output + i*ctx->bytes_per_sample, data + (nb_samples - i - 1)*ctx->bytes_per_sample, ctx->bytes_per_sample);
+		}
+	}
+	gf_filter_pck_send(dstpck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static Bool rewind_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+	GF_RewindCtx *ctx = gf_filter_get_udta(filter);
+	if (evt->base.type==GF_FEVT_PLAY) {
+		if (evt->play.speed>0) ctx->passthrough = GF_TRUE;
+		else ctx->passthrough = GF_FALSE;
+	}
+	return GF_FALSE;
+}
+
+static const GF_FilterCapability RewinderCaps[] =
+{
+	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},
+	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),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_RewindCtx, _n)
+static const GF_FilterArgs RewinderArgs[] =
+{
+	{ OFFS(rbuffer), "size of video rewind buffer in frames. If more frames than this, flush is performed", GF_PROP_UINT, "100", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+GF_FilterRegister RewinderRegister = {
+	.name = "rewind",
+	GF_FS_SET_DESCRIPTION("Audio/Video rewinder")
+	GF_FS_SET_HELP("This filter reverses audio and video frames in negative playback speed.\nThe filter is in passthrough if speed is positive. Otherwise, it reverts decoded GOPs for video, or revert samples in decoded frame for audio (not really nice for most codecs).")
+	.private_size = sizeof(GF_RewindCtx),
+	//rewind shall be explicitly loaded
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.initialize = rewind_initialize,
+	.finalize = rewind_finalize,
+	.args = RewinderArgs,
+	SETCAPS(RewinderCaps),
+	.configure_pid = rewind_configure_pid,
+	.process = rewind_process,
+	.process_event = rewind_process_event
+};
+
+
+const GF_FilterRegister *rewind_register(GF_FilterSession *session)
+{
+	return &RewinderRegister;
+}

gpac-1.0.0.tar.gz/src/filters/rewrite_adts.c Added

@@ -0,0 +1,389 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AAC ADTS 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, mpeg2;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 codecid, channels, sr_idx, aac_type;
+
+	Bool is_latm;
+
+	GF_BitStream *bs_w;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	GF_M4ADecSpecInfo acfg;
+#else
+	u8 *dsi;
+	u32 dsi_size;
+#endif
+	u32 dsi_crc;
+	Bool update_dsi;
+	GF_Fraction fdsi;
+	u64 last_cts;
+	u32 timescale;
+} GF_ADTSMxCtx;
+
+
+
+
+GF_Err adtsmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 i, sr;
+	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);
+		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->codecid = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (!p) return GF_NOT_SUPPORTED;
+	sr = p->value.uint;
+	for (i=0; i<16; i++) {
+		if (GF_M4ASampleRates[i] == (u32) sr) {
+			ctx->sr_idx = i;
+			break;
+		}
+	}
+	ctx->channels = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (p)
+		ctx->channels = p->value.uint;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
+#endif
+
+	ctx->aac_type = 0;
+	if (ctx->is_latm) {
+		u32 crc;
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+		if (!p) return GF_NOT_SUPPORTED;
+
+		crc = gf_crc_32(p->value.data.ptr, p->value.data.size);
+		if (crc != ctx->dsi_crc) {
+			ctx->dsi_crc = crc;
+#ifndef GPAC_DISABLE_AV_PARSERS
+			gf_m4a_get_config(p->value.data.ptr, p->value.data.size, &ctx->acfg);
+#endif
+			ctx->update_dsi = GF_TRUE;
+		}
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+		if (!p) return GF_NOT_SUPPORTED;
+		ctx->timescale = p->value.uint;
+
+	} else if (ctx->codecid==GF_CODECID_AAC_MPEG4) {
+		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"));
+				ctx->aac_type = GF_M4A_AAC_LC;
+			}
+#endif
+		}
+	} 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;
+		patch_channels = GF_TRUE;
+	}
+#else
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) return GF_NOT_SUPPORTED;
+	ctx->dsi = p->value.data.ptr;
+	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"));
+	}
+
+	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;
+}
+
+
+
+GF_Err adtsmx_process(GF_Filter *filter)
+{
+	GF_ADTSMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u32 pck_size, size;
+
+	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 (ctx->is_latm) {
+		u32 asize;
+
+		size = pck_size+20;
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+		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->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;
+				}
+			}
+		}
+
+		/*same mux config = 0 (refresh aac config)*/
+		if (ctx->update_dsi) {
+			gf_bs_write_int(ctx->bs_w, 0, 1);
+			/*mux config */
+			gf_bs_write_int(ctx->bs_w, 0, 1);/*audio mux version = 0*/
+			gf_bs_write_int(ctx->bs_w, 1, 1);/*allStreamsSameTimeFraming*/
+			gf_bs_write_int(ctx->bs_w, 0, 6);/*numSubFrames*/
+			gf_bs_write_int(ctx->bs_w, 0, 4);/*numProgram*/
+			gf_bs_write_int(ctx->bs_w, 0, 3);/*numLayer prog 1*/
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+			gf_m4a_write_config_bs(ctx->bs_w, &ctx->acfg);
+#else
+			gf_bs_write_data(ctx->bs_w, ctx->dsi, ctx->dsi_size);
+#endif
+			gf_bs_write_int(ctx->bs_w, 0, 3);/*frameLengthType*/
+			gf_bs_write_int(ctx->bs_w, 0, 8);/*latmBufferFullness*/
+			gf_bs_write_int(ctx->bs_w, 0, 1);/*other data present*/
+			gf_bs_write_int(ctx->bs_w, 0, 1);/*crcCheckPresent*/
+
+			ctx->update_dsi = 0;
+		} else {
+			gf_bs_write_int(ctx->bs_w, 1, 1);
+		}
+		/*write payloadLengthInfo*/
+		asize = pck_size;
+		while (1) {
+			if (asize>=255) {
+				gf_bs_write_int(ctx->bs_w, 255, 8);
+				asize -= 255;
+			} else {
+				gf_bs_write_int(ctx->bs_w, asize, 8);
+				break;
+			}
+		}
+		gf_bs_write_data(ctx->bs_w, data, pck_size);
+		gf_bs_align(ctx->bs_w);
+
+		size = (u32) gf_bs_get_position(ctx->bs_w);
+		gf_filter_pck_truncate(dst_pck, size);
+
+		/*rewrite LATM frame header*/
+		output[1] |= ((size-3) >> 8 ) & 0x1F;
+		output[2] = (size-3) & 0xFF;
+
+	} else {
+		size = pck_size+7;
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+		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, 0xFFF, 12);/*sync*/
+		gf_bs_write_int(ctx->bs_w, (ctx->mpeg2==1) ? 1 : 0, 1);/*mpeg2 aac*/
+		gf_bs_write_int(ctx->bs_w, 0, 2); /*layer*/
+		gf_bs_write_int(ctx->bs_w, 1, 1); /* protection_absent*/
+		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, 0, 4);
+		gf_bs_write_int(ctx->bs_w, 7+pck_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_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 void adtsmx_finalize(GF_Filter *filter)
+{
+	GF_ADTSMxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+}
+
+static const GF_FilterCapability ADTSMxCaps[] =
+{
+	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_AAC_MPEG4),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_MP),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_LCP),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT, GF_PROP_PID_CODECID, GF_CODECID_AAC_MPEG2_SSRP),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_ADTSMxCtx, _n)
+static const GF_FilterArgs ADTSMxArgs[] =
+{
+	{ OFFS(mpeg2), "signal as MPEG2 AAC\n"
+	"- auto: selects based on AAC profile\n"
+	"- no: always signals as MPEG-4 AAC\n"
+	"- yes: always signals as MPEG-2 AAC"
+	"", GF_PROP_UINT, "auto", "auto|no|yes", GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+GF_FilterRegister ADTSMxRegister = {
+	.name = "ufadts",
+	GF_FS_SET_DESCRIPTION("ADTS writer")
+	GF_FS_SET_HELP("This filter converts AAC streams into ADTS encapsulated data.")
+	.private_size = sizeof(GF_ADTSMxCtx),
+	.args = ADTSMxArgs,
+	.finalize = adtsmx_finalize,
+	SETCAPS(ADTSMxCaps),
+	.configure_pid = adtsmx_configure_pid,
+	.process = adtsmx_process
+};
+
+
+const GF_FilterRegister *adtsmx_register(GF_FilterSession *session)
+{
+	return &ADTSMxRegister;
+}
+
+static GF_Err latmmx_initialize(GF_Filter*filter)
+{
+	GF_ADTSMxCtx *ctx = gf_filter_get_udta(filter);
+	ctx->is_latm = GF_TRUE;
+	return GF_OK;
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_ADTSMxCtx, _n)
+static const GF_FilterArgs LATMMxArgs[] =
+{
+	{ OFFS(fdsi), "set delay between two LATM Audio Config", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+static const GF_FilterCapability LATMMxCaps[] =
+{
+	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_AAC_MPEG4),
+	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_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED_LATM, GF_TRUE),
+};
+
+GF_FilterRegister LATMMxRegister = {
+	.name = "uflatm",
+	GF_FS_SET_DESCRIPTION("Raw AAC to LATM writer")
+	GF_FS_SET_HELP("This filter converts AAC streams into LATM encapsulated data.")
+	.private_size = sizeof(GF_ADTSMxCtx),
+	.args = LATMMxArgs,
+	.initialize = latmmx_initialize,
+	.finalize = adtsmx_finalize,
+	SETCAPS(LATMMxCaps),
+	.configure_pid = adtsmx_configure_pid,
+	.process = adtsmx_process
+};
+
+
+const GF_FilterRegister *latm_mx_register(GF_FilterSession *session)
+{
+	return &LATMMxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/rewrite_mp4v.c Added

@@ -0,0 +1,169 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG-4 part2 video rewrite 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/internal/media_dev.h>
+
+typedef struct
+{
+	//opts
+	Bool rcfg;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 crc;
+	char *dsi;
+	u32 dsi_size;
+} GF_M4VMxCtx;
+
+GF_Err m4vmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 crc;
+	const GF_PropertyValue *dcd;
+	GF_M4VMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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);
+	}
+	//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;
+
+	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;
+}
+
+
+GF_Err m4vmx_process(GF_Filter *filter)
+{
+	GF_M4VMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	u8 *data, *output;
+	u32 pck_size, size, sap_type;
+	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);
+
+	sap_type = gf_filter_pck_get_sap(pck);
+	if (!sap_type) {
+		u8 flags = gf_filter_pck_get_dependency_flags(pck);
+		//get dependsOn
+		if (flags) {
+			flags>>=4;
+			flags &= 0x3;
+			if (flags==2) sap_type = 3; //could be 1, 2 or 3
+		}
+	}
+
+	if (sap_type && ctx->dsi) {
+		GF_FilterPacket *dst_pck;
+		size = pck_size + ctx->dsi_size;
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+		memcpy(output, ctx->dsi, ctx->dsi_size);
+		memcpy(output+ctx->dsi_size, data, pck_size);
+		gf_filter_pck_merge_properties(pck, dst_pck);
+		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+		gf_filter_pck_send(dst_pck);
+
+		if (!ctx->rcfg) {
+			ctx->dsi = NULL;
+			ctx->dsi_size = 0;
+		}
+
+	} else {
+		gf_filter_pck_forward(pck, ctx->opid);
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static const GF_FilterCapability M4VMxCaps[] =
+{
+	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_MPEG4_PART2),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_M4VMxCtx, _n)
+static const GF_FilterArgs M4VMxArgs[] =
+{
+	{ OFFS(rcfg), "force repeating decoder config at each I-frame", GF_PROP_BOOL, "true", NULL, 0},
+	{0}
+};
+
+
+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).")
+	.private_size = sizeof(GF_M4VMxCtx),
+	.args = M4VMxArgs,
+	SETCAPS(M4VMxCaps),
+	.configure_pid = m4vmx_configure_pid,
+	.process = m4vmx_process
+};
+
+
+const GF_FilterRegister *m4vmx_register(GF_FilterSession *session)
+{
+	return &M4VMxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/rewrite_nalu.c Added

@@ -0,0 +1,495 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NALU video AnnexB 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/internal/media_dev.h>
+
+typedef struct
+{
+	//opts
+	Bool rcfg, delim;
+	u32 extract;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	Bool is_hevc;
+
+	u32 nal_hdr_size, crc, crc_enh;
+	u8 *dsi;
+	u32 dsi_size;
+
+	GF_BitStream *bs_w, *bs_r;
+	u32 nb_nalu, nb_nalu_in_hdr;
+	u32 width, height;
+} GF_NALUMxCtx;
+
+
+
+
+static void nalumx_write_ps_list(GF_NALUMxCtx *ctx, GF_BitStream *bs, GF_List *list)
+{
+	u32 i, count = list ? gf_list_count(list) : 0;
+	for (i=0; i<count; i++) {
+		GF_AVCConfigSlot *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++;
+	}
+}
+
+static GF_List *nalumx_get_hevc_ps(GF_HEVCConfig *cfg, u8 type)
+{
+	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);
+		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)
+{
+	GF_BitStream *bs;
+	GF_AVCConfig *avcc = NULL;
+	GF_AVCConfig *svcc = NULL;
+	GF_HEVCConfig *hvcc = NULL;
+	GF_HEVCConfig *lvcc = NULL;
+
+	if (ctx->is_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 (dsi) avcc = gf_odf_avc_cfg_read(dsi, dsi_len);
+		if (dsi_enh) svcc = gf_odf_avc_cfg_read(dsi_enh, dsi_enh_len);
+		if (!avcc && !svcc) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nal_hdr_size = avcc ? avcc->nal_unit_size : svcc->nal_unit_size;
+	}
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (avcc || svcc) {
+		if (avcc) {
+			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSets);
+		}
+
+		if (svcc)
+			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSets);
+
+		if (avcc && avcc->sequenceParameterSetExtensions)
+			nalumx_write_ps_list(ctx, bs, avcc->sequenceParameterSetExtensions);
+
+		if (svcc && svcc->sequenceParameterSetExtensions)
+			nalumx_write_ps_list(ctx, bs, svcc->sequenceParameterSetExtensions);
+
+		if (avcc)
+			nalumx_write_ps_list(ctx, bs, avcc->pictureParameterSets);
+
+		if (svcc)
+			nalumx_write_ps_list(ctx, bs, svcc->pictureParameterSets);
+	}
+	if (hvcc || lvcc) {
+		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));
+		if (lvcc)
+			nalumx_write_ps_list(ctx, bs, nalumx_get_hevc_ps(lvcc, GF_HEVC_NALU_PIC_PARAM));
+	}
+	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);
+
+	return GF_OK;
+}
+
+GF_Err nalumx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	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);
+		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;
+	codecid = p->value.uint;
+
+	//it may happen we don't have anything yet ...
+	dcd = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!dcd) {
+		crc = -1;
+	} else {
+		crc = gf_crc_32(dcd->value.data.ptr, dcd->value.data.size);
+	}
+	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;
+	ctx->crc = crc;
+	ctx->crc_enh = crc_enh;
+
+	if ((codecid==GF_CODECID_HEVC) || (codecid==GF_CODECID_LHVC)) {
+		ctx->is_hevc = GF_TRUE;
+	} else {
+		ctx->is_hevc = GF_FALSE;
+	}
+
+	ctx->width = ctx->height = 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	if (p) ctx->width = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	if (p) ctx->height = p->value.uint;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//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);
+}
+
+
+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)
+{
+	Bool is_layer = GF_FALSE;
+	if (ctx->is_hevc) {
+		u8 nal_type = (data[pos] & 0x7E) >> 1;
+		u8 temporal_id = data[pos+1] & 0x7;
+		u8 layer_id = data[pos] & 1;
+		layer_id <<= 5;
+		layer_id |= (data[pos+1]>>3) & 0x1F;
+		if (temporal_id > *out_temporal_id) *out_temporal_id = temporal_id;
+		if (! (*out_layer_id) ) *out_layer_id = 1+layer_id;
+
+		switch (nal_type) {
+		case GF_HEVC_NALU_VID_PARAM:
+			break;
+		case GF_HEVC_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) {
+		case GF_AVC_NALU_SVC_PREFIX_NALU:
+		case GF_AVC_NALU_SVC_SLICE:
+		case GF_AVC_NALU_VDRD:
+		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+		case GF_AVC_NALU_SEQ_PARAM:
+		case GF_AVC_NALU_SEQ_PARAM_EXT:
+		case GF_AVC_NALU_PIC_PARAM:
+			is_layer = GF_TRUE;
+			break;
+		case GF_AVC_NALU_ACCESS_UNIT:
+			*has_nal_delim = GF_TRUE;
+			break;
+		default:
+			if (! (*avc_hdr))
+				(*avc_hdr) = data[pos];
+			break;
+		}
+	}
+	if (ctx->extract==1) return is_layer ? GF_TRUE : GF_FALSE;
+	else if (ctx->extract==2) return is_layer ? GF_FALSE : GF_TRUE;
+	return GF_FALSE;
+}
+
+GF_Err nalumx_process(GF_Filter *filter)
+{
+	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;
+	u8 avc_hdr;
+	Bool insert_dsi = GF_FALSE;
+	Bool has_nalu_delim = 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;
+	}
+
+	if (!ctx->nal_hdr_size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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) {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	if (!ctx->bs_r) ctx->bs_r = gf_bs_new(data, pck_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+
+	size = 0;
+	temporal_id = layer_id = 0;
+	avc_hdr = 0;
+
+	while (gf_bs_available((ctx->bs_r))) {
+		Bool skip_nal = GF_FALSE;
+		Bool is_nalu_delim = GF_FALSE;
+		u32 pos;
+		u32 nal_size = gf_bs_read_int(ctx->bs_r, 8*ctx->nal_hdr_size);
+		if (nal_size > gf_bs_available(ctx->bs_r) ) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		pos = (u32) gf_bs_get_position(ctx->bs_r);
+		//even if not filtering, parse to check for AU delim
+		skip_nal = nalumx_is_nal_skip(ctx, data, pos, &is_nalu_delim, &layer_id, &temporal_id, &avc_hdr);
+		if (!ctx->extract) {
+			skip_nal = GF_FALSE;
+		}
+		if (is_nalu_delim) {
+			has_nalu_delim = GF_TRUE;
+			if (!ctx->delim)
+				skip_nal = GF_TRUE;
+		}
+		if (!skip_nal) {
+			size += nal_size + 4;
+		}
+		gf_bs_skip_bytes(ctx->bs_r, nal_size);
+	}
+	gf_bs_seek(ctx->bs_r, 0);
+
+	if (!ctx->delim)
+		has_nalu_delim = GF_TRUE;
+
+	//we need to insert NALU delim
+	if (!has_nalu_delim) {
+		size += ctx->is_hevc ? 3 : 2;
+		size += 4;
+	}
+
+	if (ctx->dsi) {
+		sap = gf_filter_pck_get_sap(pck);
+		if (sap && (sap <= GF_FILTER_SAP_3) ) {
+			insert_dsi = GF_TRUE;
+		}
+		if (!insert_dsi) {
+			u8 flags = gf_filter_pck_get_dependency_flags(pck);
+			//get dependsOn
+			if (flags) {
+				flags>>=4;
+				flags &= 0x3;
+				if (flags==2) insert_dsi = GF_TRUE; //could be SAP 1, 2 or 3
+			}
+		}
+
+		if (insert_dsi) {
+			size += ctx->dsi_size;
+		}
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+	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);
+
+	// 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 (!layer_id)
+				layer_id=1;
+			if (!temporal_id)
+				temporal_id=1;
+#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, 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);
+#endif
+		} 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)*/;
+		}
+		ctx->nb_nalu++;
+	}
+
+	while (gf_bs_available((ctx->bs_r))) {
+		u32 pos;
+		Bool skip_nal = GF_FALSE;
+		Bool is_nalu_delim = GF_FALSE;
+		u32 nal_size = gf_bs_read_int(ctx->bs_r, 8*ctx->nal_hdr_size);
+		if (nal_size > gf_bs_available(ctx->bs_r) ) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		pos = (u32) gf_bs_get_position(ctx->bs_r);
+
+		skip_nal = nalumx_is_nal_skip(ctx, data, pos, &is_nalu_delim, &layer_id, &temporal_id, &avc_hdr);
+		if (!ctx->extract) {
+			skip_nal = GF_FALSE;
+		}
+		//we don't serialize nalu delimiter, skip nal
+		else if (!ctx->delim && is_nalu_delim) {
+			skip_nal = GF_TRUE;
+		}
+
+
+		if (skip_nal) {
+			gf_bs_skip_bytes(ctx->bs_r, nal_size);
+			continue;
+		}
+
+		//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 (!ctx->rcfg) {
+				gf_free(ctx->dsi);
+				ctx->dsi = NULL;
+				ctx->dsi_size = 0;
+			}
+		}
+
+		gf_bs_write_u32(ctx->bs_w, 1);
+		gf_bs_write_data(ctx->bs_w, data+pos, nal_size);
+
+		gf_bs_skip_bytes(ctx->bs_r, nal_size);
+		ctx->nb_nalu++;
+	}
+	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);
+
+	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);
+		gf_filter_update_status(filter, -1, szStatus);
+
+	}
+	return GF_OK;
+}
+
+static void nalumx_finalize(GF_Filter *filter)
+{
+	GF_NALUMxCtx *ctx = gf_filter_get_udta(filter);
+	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);
+}
+
+static const GF_FilterCapability NALUMxCaps[] =
+{
+	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_AVC),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT,GF_PROP_PID_CODECID, GF_CODECID_AVC_PS),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT,GF_PROP_PID_CODECID, GF_CODECID_SVC),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT_OPT,GF_PROP_PID_CODECID, GF_CODECID_MVC),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, 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_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_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_NALUMxCtx, _n)
+static const GF_FilterArgs NALUMxArgs[] =
+{
+	{ 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"
+	"- 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},
+	{0}
+};
+
+
+GF_FilterRegister NALUMxRegister = {
+	.name = "ufnalu",
+	GF_FS_SET_DESCRIPTION("AVC/HEVC to AnnexB writer")
+	GF_FS_SET_HELP("This filter converts AVC|H264 and HEVC streams into AnnexB format, with inband parameter sets and start codes.")
+	.private_size = sizeof(GF_NALUMxCtx),
+	.args = NALUMxArgs,
+	.finalize = nalumx_finalize,
+	SETCAPS(NALUMxCaps),
+	.configure_pid = nalumx_configure_pid,
+	.process = nalumx_process
+};
+
+
+const GF_FilterRegister *nalumx_register(GF_FilterSession *session)
+{
+	return &NALUMxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/rewrite_obu.c Added

@@ -0,0 +1,433 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / AV1 OBU rewrite 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/internal/media_dev.h>
+
+#ifndef GPAC_DISABLE_AV_PARSERS
+
+typedef struct
+{
+	//opts
+	Bool rcfg, tsep;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 crc;
+
+	Bool ivf_hdr;
+	u32 mode;
+	GF_BitStream *bs_w;
+	GF_BitStream *bs_r;
+	u32 w, h;
+	GF_Fraction fps;
+	GF_AV1Config *av1c;
+	u32 av1b_cfg_size;
+	u32 codec_id;
+} GF_OBUMxCtx;
+
+#ifdef GPAC_ENABLE_COVERAGE
+static Bool obumx_test_filter_prop(void *cbk, u32 prop_4cc, const char *prop_name, const GF_PropertyValue *src_prop)
+{
+	return GF_TRUE;
+}
+#endif
+
+GF_Err obumx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 crc;
+	const GF_PropertyValue *p, *dcd;
+	GF_OBUMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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);
+	}
+	//copy properties at init or reconfig
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_filter_pid_merge_properties(ctx->opid, pid, obumx_test_filter_prop, NULL);
+	} else
+#endif
+	{
+		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);
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_CODECID);
+	ctx->codec_id = p ? p->value.uint : 0;
+	switch (ctx->codec_id) {
+	case GF_CODECID_AV1:
+		//check output type OBU vs av1b
+		p = gf_filter_pid_caps_query(ctx->opid, GF_PROP_PID_FILE_EXT);
+		if (p) {
+			if (!strcmp(p->value.string, "obu")) ctx->mode = 0;
+			else if (!strcmp(p->value.string, "av1b") || !strcmp(p->value.string, "av1")) ctx->mode = 1;
+			//we might want to add a generic IVF read/write at some point
+			else if (!strcmp(p->value.string, "ivf")) {
+				ctx->mode = 2;
+				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"));
+		}
+		break;
+	case GF_CODECID_VP8:
+	case GF_CODECID_VP9:
+	case GF_CODECID_VP10:
+		ctx->mode = 2; //IVF only
+		ctx->ivf_hdr = 1;
+		break;
+	}
+
+	if (ctx->av1c) gf_odf_av1_cfg_del(ctx->av1c);
+	ctx->av1c = NULL;
+	if (ctx->mode==1) {
+		u32 i=0;
+		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"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		ctx->av1b_cfg_size = 0;
+
+		while ((obu = gf_list_enum(ctx->av1c->obu_array, &i))) {
+			//we don't output sequence header since it shall be present in sync sample
+			//this avoids creating duplicate of the seqeunce header in the output stream
+			if (obu->obu_type==OBU_SEQUENCE_HEADER) {
+				i--;
+				gf_list_rem(ctx->av1c->obu_array, i);
+				gf_free(obu->obu);
+				gf_free(obu);
+				continue;
+			}
+			ctx->av1b_cfg_size += (u32) obu->obu_length;
+			ctx->av1b_cfg_size += gf_av1_leb128_size(obu->obu_length);
+		}
+	}
+
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_WIDTH);
+	if (p) ctx->w = p->value.uint;
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_HEIGHT);
+	if (p) ctx->h = p->value.uint;
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FPS);
+	if (p) ctx->fps = p->value.frac;
+	if (!ctx->fps.num || !ctx->fps.den) {
+		ctx->fps.num = 25;
+		ctx->fps.den = 1;
+	}
+	gf_filter_pid_set_property_str(ctx->opid, "obu:mode", &PROP_UINT(ctx->mode) );
+	gf_filter_pid_set_framing_mode(ctx->ipid, GF_TRUE);
+
+	return GF_OK;
+}
+
+
+GF_Err obumx_process(GF_Filter *filter)
+{
+	u32 i;
+	u32 frame_sizes[128], max_frames;
+	GF_OBUMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u32 pck_size, size, sap_type, hdr_size, av1b_frame_size=0;
+
+
+	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);
+	hdr_size = 0;
+	size = pck_size;
+	//always add temporal delim
+	if (ctx->codec_id==GF_CODECID_AV1)
+		size += 2;
+
+	sap_type = gf_filter_pck_get_sap(pck);
+	if (!sap_type) {
+		u8 flags = gf_filter_pck_get_dependency_flags(pck);
+		if (flags) {
+			//get dependsOn
+			flags>>=4;
+			flags &= 0x3;
+			if (flags==2) sap_type = 3; //could be 1, 2 or 3
+		}
+	}
+
+	memset(frame_sizes, 0, sizeof(u32)*128);
+	if (ctx->mode==2) {
+		if (ctx->ivf_hdr) hdr_size += 32;
+		hdr_size += 12;
+	}
+	if (ctx->mode==1) {
+		u32 obu_sizes=0;
+		u32 frame_idx=0;
+
+		obu_sizes = frame_sizes[0] = 3;
+		if (sap_type && ctx->av1b_cfg_size) {
+			frame_sizes[0] += ctx->av1b_cfg_size;
+			obu_sizes += ctx->av1b_cfg_size;
+		}
+
+		if (!ctx->bs_r) ctx->bs_r = gf_bs_new(data, pck_size, GF_BITSTREAM_READ);
+		else gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+
+		while (gf_bs_available(ctx->bs_r)) {
+			ObuType obu_type;
+			u32 obu_size;
+			Bool obu_extension_flag, obu_has_size_field;
+			u8 temporal_id, spatial_id;
+			u32 obu_hdr_size = (u32) gf_bs_get_position(ctx->bs_r);
+
+			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"));
+				return GF_NON_COMPLIANT_BITSTREAM;
+			}
+			obu_size = (u32)gf_av1_leb128_read(ctx->bs_r, NULL);
+			obu_hdr_size = (u32) gf_bs_get_position(ctx->bs_r) - obu_hdr_size;
+			gf_bs_skip_bytes(ctx->bs_r, obu_size);
+
+			obu_size += obu_hdr_size;
+			obu_sizes += obu_size + gf_av1_leb128_size(obu_size);
+
+			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"));
+					return GF_NOT_SUPPORTED;
+				}
+				if (frame_idx>1)
+					frame_sizes[frame_idx-1] = 0;
+			}
+			frame_sizes[frame_idx ? (frame_idx-1) : 0] += obu_size + gf_av1_leb128_size(obu_size);
+		}
+		max_frames = frame_idx;
+		size = obu_sizes;
+		//packet without frame
+		if (!max_frames) {
+			size += gf_av1_leb128_size(frame_sizes[0]);
+		} else {
+			for (i=0;i<max_frames; i++) {
+				size += gf_av1_leb128_size(frame_sizes[i]);
+			}
+		}
+		av1b_frame_size = size;
+		size += gf_av1_leb128_size(size);
+	} else {
+		if (sap_type && ctx->av1b_cfg_size) size += ctx->av1b_cfg_size;
+	}
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, hdr_size+size, &output);
+	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);
+	else gf_bs_reassign_buffer(ctx->bs_w, output, hdr_size+size);
+
+	if (ctx->mode==1) {
+		u32 frame_idx = 0;
+		//temporal unit
+		gf_av1_leb128_write(ctx->bs_w, av1b_frame_size);
+		assert(frame_sizes[0]);
+		gf_av1_leb128_write(ctx->bs_w, frame_sizes[0]);
+
+		//write temporal delim with obu size set
+		gf_av1_leb128_write(ctx->bs_w, 2);
+		gf_bs_write_u8(ctx->bs_w, 0x12);
+		gf_bs_write_u8(ctx->bs_w, 0);
+
+		if (sap_type && ctx->av1b_cfg_size) {
+			GF_AV1_OBUArrayEntry *obu;
+			i=0;
+			while ((obu = gf_list_enum(ctx->av1c->obu_array, &i))) {
+				gf_av1_leb128_write(ctx->bs_w, obu->obu_length);
+				gf_bs_write_data(ctx->bs_w, obu->obu, (u32) obu->obu_length);
+			}
+		}
+
+		gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+
+		while (gf_bs_available(ctx->bs_r)) {
+			ObuType obu_type;
+			u32 obu_size;
+			Bool obu_extension_flag, obu_has_size_field;
+			u8 temporal_id, spatial_id;
+			u32 obu_hdr_size, start = (u32) gf_bs_get_position(ctx->bs_r);
+
+			gf_av1_parse_obu_header(ctx->bs_r, &obu_type, &obu_extension_flag, &obu_has_size_field, &temporal_id, &spatial_id);
+			obu_size = (u32)gf_av1_leb128_read(ctx->bs_r, NULL);
+
+			obu_hdr_size = (u32) gf_bs_get_position(ctx->bs_r) - start;
+			gf_bs_skip_bytes(ctx->bs_r, obu_size);
+
+			if (obu_type==OBU_FRAME) {
+				frame_idx++;
+				if (frame_idx>1) {
+					gf_av1_leb128_write(ctx->bs_w, frame_sizes[frame_idx-1] );
+				}
+			}
+
+			obu_size += obu_hdr_size;
+			gf_av1_leb128_write(ctx->bs_w, obu_size);
+			gf_bs_write_data(ctx->bs_w, data+start, obu_size);
+
+		}
+		assert(gf_bs_get_position(ctx->bs_w) == size);
+	} else {
+
+		//write IVF headers
+		if (ctx->ivf_hdr) {
+			gf_bs_write_u32(ctx->bs_w, GF_4CC('D', 'K', 'I', 'F'));
+			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
+			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
+			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);
+			gf_bs_write_u32_le(ctx->bs_w, size);
+			gf_bs_write_u64(ctx->bs_w, cts);
+		}
+		if (ctx->codec_id==GF_CODECID_AV1) {
+			//write temporal delim with obu size set
+			gf_bs_write_u8(ctx->bs_w, 0x12);
+			gf_bs_write_u8(ctx->bs_w, 0);
+
+			if (sap_type && ctx->av1b_cfg_size) {
+				GF_AV1_OBUArrayEntry *obu;
+				i=0;
+				while ((obu = gf_list_enum(ctx->av1c->obu_array, &i))) {
+					gf_av1_leb128_write(ctx->bs_w, obu->obu_length);
+					gf_bs_write_data(ctx->bs_w, obu->obu, (u32) obu->obu_length);
+				}
+			}
+		}
+		gf_bs_write_data(ctx->bs_w, data, pck_size);
+	}
+
+	if (!ctx->rcfg) {
+		ctx->av1b_cfg_size = 0;
+	}
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+static void obumx_finalize(GF_Filter *filter)
+{
+	GF_OBUMxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+	if (ctx->av1c) gf_odf_av1_cfg_del(ctx->av1c);
+}
+
+static const GF_FilterCapability OBUMxCaps[] =
+{
+	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_AV1),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_VP8),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_VP9),
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT,GF_PROP_PID_CODECID, GF_CODECID_VP10),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_BOOL(GF_CAPS_OUTPUT, GF_PROP_PID_UNFRAMED, GF_TRUE),
+};
+
+
+
+#define OFFS(_n)	#_n, offsetof(GF_OBUMxCtx, _n)
+static const GF_FilterArgs OBUMxArgs[] =
+{
+	{ OFFS(rcfg), "force repeating decoder config at each I-frame", GF_PROP_BOOL, "true", NULL, 0},
+	{0}
+};
+
+
+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.")
+	.private_size = sizeof(GF_OBUMxCtx),
+	.args = OBUMxArgs,
+	SETCAPS(OBUMxCaps),
+	.finalize = obumx_finalize,
+	.configure_pid = obumx_configure_pid,
+	.process = obumx_process
+};
+
+
+const GF_FilterRegister *obumx_register(GF_FilterSession *session)
+{
+	return &OBUMxRegister;
+}
+
+#else
+const GF_FilterRegister *obumx_register(GF_FilterSession *session)
+{
+	return NULL;
+}
+#endif // GPAC_DISABLE_AV_PARSERS
+

gpac-1.0.0.tar.gz/src/filters/tileagg.c Added

@@ -0,0 +1,290 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / tile aggregrator 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/media_tools.h>
+
+
+typedef struct
+{
+	//options
+	GF_PropUIntList tiledrop;
+
+	//internal
+	GF_FilterPid *opid;
+	GF_FilterPid *base_ipid;
+	u32 nalu_size_length;
+	u32 base_id;
+
+	GF_BitStream *bs_r;
+} GF_TileAggCtx;
+
+
+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_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->base_ipid == pid) {
+			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;
+	codec_id = p->value.uint;
+
+
+	if ((codec_id==GF_CODECID_HEVC) && 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;
+	}
+
+	if (!ctx->opid) ctx->opid = gf_filter_pid_new(filter);
+
+	if (!ctx->base_ipid) {
+		ctx->base_ipid = pid;
+	}
+	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);
+
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+		if (!p) return GF_NOT_SUPPORTED;
+		ctx->base_id = p->value.uint;
+	} else {
+		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;
+	}
+
+	return GF_OK;
+}
+
+
+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;
+	u64 min_cts = GF_FILTER_NO_TS;
+	u32 pck_size, size = 0;
+	u32 pos;
+	Bool has_sei_suffix = GF_FALSE;
+	const char *data;
+	u8 *output;
+	if (!ctx->base_ipid) return GF_EOS;
+
+	pck = gf_filter_pid_get_packet(ctx->base_ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->base_ipid)) {
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	min_cts = gf_filter_pck_get_cts(pck);
+	gf_filter_pck_get_data(pck, &pck_size);
+	size = pck_size;
+
+	for (i=0; i<count; i++) {
+		u64 cts;
+		Bool do_drop=GF_FALSE;
+		GF_FilterPid *pid = gf_filter_get_ipid(filter, i);
+		if (pid==ctx->base_ipid) continue;
+		while (1) {
+			pck = gf_filter_pid_get_packet(pid);
+			if (!pck) return GF_OK;
+
+			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);
+			} else {
+				break;
+			}
+		}
+		assert(pck);
+		if (cts > min_cts) continue;
+
+		for (j=0; j<ctx->tiledrop.nb_items; j++) {
+			if (ctx->tiledrop.vals[j] == i)
+				do_drop=GF_TRUE;
+		}
+		if (do_drop) {
+			gf_filter_pid_drop_packet(pid);
+			continue;
+		}
+
+		gf_filter_pck_get_data(pck, &pck_size);
+		size += pck_size;
+	}
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+	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);
+
+	//copy all NAL from base except SEI suffixes
+	gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+	pos = 0;
+	size = 0;
+	while (pos<pck_size) {
+		u32 nal_size = gf_bs_read_int(ctx->bs_r, 8*ctx->nalu_size_length);
+		u8 nal_type;
+		gf_bs_read_int(ctx->bs_r, 1);
+		nal_type = gf_bs_read_int(ctx->bs_r, 6);
+		gf_bs_read_int(ctx->bs_r, 1);
+		gf_bs_skip_bytes(ctx->bs_r, nal_size-1);
+		if (nal_type == GF_HEVC_NALU_SEI_SUFFIX) {
+			has_sei_suffix = GF_TRUE;
+		} else {
+			memcpy(output+size, data+pos, nal_size + ctx->nalu_size_length);
+			size += nal_size + ctx->nalu_size_length;
+		}
+		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;
+
+		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;
+
+		gf_filter_pid_drop_packet(pid);
+	}
+
+	//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);
+		gf_bs_reassign_buffer(ctx->bs_r, data, pck_size);
+
+		pos = 0;
+		while (pos<pck_size) {
+			u32 nal_size = gf_bs_read_int(ctx->bs_r, 8*ctx->nalu_size_length);
+			u8 nal_type;
+			gf_bs_read_int(ctx->bs_r, 1);
+			nal_type = gf_bs_read_int(ctx->bs_r, 6);
+			gf_bs_read_int(ctx->bs_r, 1);
+			gf_bs_skip_bytes(ctx->bs_r, nal_size-1);
+			if (nal_type == GF_HEVC_NALU_SEI_SUFFIX) {
+				memcpy(output+size, data+pos, nal_size + ctx->nalu_size_length);
+				size += nal_size + ctx->nalu_size_length;
+			}
+			pos += nal_size + ctx->nalu_size_length;
+		}
+	}
+
+	gf_filter_pid_drop_packet(ctx->base_ipid);
+
+	gf_filter_pck_send(dst_pck);
+	return GF_OK;
+}
+
+static GF_Err tileagg_initialize(GF_Filter *filter)
+{
+	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
+	ctx->bs_r = gf_bs_new((char *)ctx, 1, GF_BITSTREAM_READ);
+
+	return GF_OK;
+}
+
+static void tileagg_finalize(GF_Filter *filter)
+{
+	GF_TileAggCtx *ctx = (GF_TileAggCtx *) gf_filter_get_udta(filter);
+	gf_bs_del(ctx->bs_r);
+}
+
+static const GF_FilterCapability TileAggCaps[] =
+{
+	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),
+	{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),
+};
+
+#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},
+	{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.")
+	.private_size = sizeof(GF_TileAggCtx),
+	SETCAPS(TileAggCaps),
+	.initialize = tileagg_initialize,
+	.finalize = tileagg_finalize,
+	.args = TileAggArgs,
+	.configure_pid = tileagg_configure_pid,
+	.process = tileagg_process,
+	.max_extra_pids = (u32) (-1),
+};
+
+const GF_FilterRegister *tileagg_register(GF_FilterSession *session)
+{
+	return &TileAggRegister;
+}
+
+

gpac-1.0.0.tar.gz/src/filters/tssplit.c Added

@@ -0,0 +1,480 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom Paris 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / MPEG Transport Stream 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/thread.h>
+#include <gpac/list.h>
+#include <gpac/bitstream.h>
+
+#include <gpac/mpegts.h>
+
+typedef struct
+{
+	GF_FilterPid *opid;
+	u32 pmt_pid;
+	u8 pat_pck[192];
+	u32 pat_pck_size;
+
+	u8 *pck_buffer;
+	u32 nb_pck;
+} GF_M2TSSplit_SPTS;
+
+
+typedef struct
+{
+	//options
+	Bool dvb;
+	s32 mux_id;
+	Bool avonly;
+	u32 nb_pack;
+
+	//internal
+	GF_Filter *filter;
+	GF_FilterPid *ipid;
+
+	GF_List *streams;
+
+	GF_M2TS_Demuxer *dmx;
+
+	u8 tsbuf[192];
+	GF_BitStream *bsw;
+
+} GF_M2TSSplitCtx;
+
+
+
+void m2tssplit_send_packet(GF_M2TSSplitCtx *ctx, GF_M2TSSplit_SPTS *stream, u8 *data, u32 size)
+{
+	u8 *buffer;
+	GF_FilterPacket *pck;
+	if (ctx->nb_pack) {
+		assert (stream->nb_pck<ctx->nb_pack);
+		if (data) {
+			memcpy(stream->pck_buffer + size*stream->nb_pck, data, size);
+			stream->nb_pck++;
+			if (stream->nb_pck<ctx->nb_pack) {
+				return;
+			}
+		}
+		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);
+		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);
+	}
+}
+
+void m2tssplit_flush(GF_M2TSSplitCtx *ctx)
+{
+	u32 i;
+	if (!ctx->nb_pack) return;
+
+	for (i=0; i<gf_list_count(ctx->streams); i++ ) {
+		GF_M2TSSplit_SPTS *stream = gf_list_get(ctx->streams, i);
+		if (stream->opid && stream->nb_pck)
+			m2tssplit_send_packet(ctx, stream, NULL, 0);
+	}
+
+}
+
+GF_Err m2tssplit_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_M2TSSplitCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		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->pck_buffer) gf_free(st->pck_buffer);
+			gf_free(st);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	ctx->ipid = pid;
+	return GF_OK;
+}
+
+static Bool m2tssplit_process_event(GF_Filter *filter, const GF_FilterEvent *evt)
+{
+//	GF_M2TSSplitCtx *ctx = gf_filter_get_udta(filter);
+
+	switch (evt->base.type) {
+	case GF_FEVT_PLAY:
+		//cancel event
+		return GF_TRUE;
+
+	case GF_FEVT_STOP:
+		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;
+}
+
+GF_Err m2tssplit_process(GF_Filter *filter)
+{
+	GF_M2TSSplitCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	const u8 *data;
+	u32 data_size;
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid))
+			m2tssplit_flush(ctx);
+		return GF_OK;
+	}
+	data = gf_filter_pck_get_data(pck, &data_size);
+	if (data) {
+		gf_m2ts_process_data(ctx->dmx, (u8 *)data, data_size);
+	}
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+
+void m2tssplit_on_event(struct tag_m2ts_demux *ts, u32 evt_type, void *par)
+{
+	u32 i;
+	GF_M2TSSplitCtx *ctx = ts->user;
+
+	if ((evt_type==GF_M2TS_EVT_PAT_FOUND) || (evt_type==GF_M2TS_EVT_PAT_UPDATE)) {
+		//todo, purge previous programs if PMT PID changes
+		for (i=0; i<gf_list_count(ctx->dmx->programs); i++) {
+			GF_M2TS_SectionInfo *sinfo = par;
+			GF_M2TSSplit_SPTS *stream=NULL;
+			u32 j, pck_size, tot_len=188, crc, offset=5, mux_id;
+			u8 *buffer;
+			Bool first_pck=GF_FALSE;
+			GF_M2TS_Program *prog = gf_list_get(ctx->dmx->programs, i);
+			assert(prog->pmt_pid);
+
+			for (j=0; j<gf_list_count(ctx->streams); j++) {
+				stream = gf_list_get(ctx->streams, j);
+				if (stream->pmt_pid==prog->pmt_pid)
+					break;
+				stream = NULL;
+			}
+			if (!stream) {
+				GF_SAFEALLOC(stream, GF_M2TSSplit_SPTS);
+				if (!stream) return;
+				stream->pmt_pid = prog->pmt_pid;
+				first_pck = GF_TRUE;
+				prog->user = stream;
+				if (ctx->nb_pack)
+					stream->pck_buffer = gf_malloc(sizeof(char) * ctx->nb_pack * (ctx->dmx->prefix_present ? 192 : 188) );
+
+				gf_list_add(ctx->streams, stream);
+
+				//do not create output stream until we are sure we have AV component in program
+			}
+
+			//generate a pat
+			gf_bs_seek(ctx->bsw, 0);
+			if (ctx->dmx->prefix_present) {
+				tot_len += 4;
+				offset += 4;
+				gf_bs_write_u32(ctx->bsw, 1);
+			}
+			gf_bs_write_u8(ctx->bsw, 0x47);
+			gf_bs_write_int(ctx->bsw,	0, 1);    // error indicator
+			gf_bs_write_int(ctx->bsw,	1, 1); // start ind
+			gf_bs_write_int(ctx->bsw,	0, 1);	  // transport priority
+			gf_bs_write_int(ctx->bsw,	0, 13); // pid
+			gf_bs_write_int(ctx->bsw,	0, 2);    // scrambling
+			gf_bs_write_int(ctx->bsw,	1, 2);    // we do not use adaptation field for sections
+			gf_bs_write_int(ctx->bsw,	0, 4);   // continuity counter
+			gf_bs_write_u8(ctx->bsw,	0);   // ptr_field
+			gf_bs_write_int(ctx->bsw,	GF_M2TS_TABLE_ID_PAT, 8);
+			gf_bs_write_int(ctx->bsw,	1/*use_syntax_indicator*/, 1);
+			gf_bs_write_int(ctx->bsw,	0, 1);
+			gf_bs_write_int(ctx->bsw,	3, 2);  /* reserved bits are all set */
+			gf_bs_write_int(ctx->bsw,	5 + 4 + 4, 12); //syntax indicator section + PAT payload + CRC32
+			/*syntax indicator section*/
+
+			if (ctx->mux_id>=0) {
+				mux_id = ctx->mux_id;
+			} else {
+				//we use muxID*255 + streamIndex as the target mux ID if not configured
+				mux_id = sinfo->ex_table_id;
+				mux_id *= 255;
+			}
+			mux_id += i;
+
+			gf_bs_write_int(ctx->bsw,	mux_id, 16);
+			gf_bs_write_int(ctx->bsw,	3, 2); /* reserved bits are all set */
+			gf_bs_write_int(ctx->bsw,	sinfo->version_number, 5);
+			gf_bs_write_int(ctx->bsw,	1, 1); /* current_next_indicator = 1: we don't send version in advance */
+			gf_bs_write_int(ctx->bsw,	0, 8); //current section number
+			gf_bs_write_int(ctx->bsw,	0, 8); //last section number
+
+			/*PAT payload*/
+			gf_bs_write_u16(ctx->bsw, prog->number);
+			gf_bs_write_int(ctx->bsw, 0x7, 3);	/*reserved*/
+			gf_bs_write_int(ctx->bsw, prog->pmt_pid, 13);	/*reserved*/
+
+			pck_size = (u32) gf_bs_get_position(ctx->bsw);
+			/*write CRC32 starting from first field in section until last before CRC*/
+			crc = gf_crc_32(ctx->tsbuf + offset, pck_size - offset);
+			ctx->tsbuf[pck_size] = (crc >> 24) & 0xFF;
+			ctx->tsbuf[pck_size+1] = (crc >> 16) & 0xFF;
+			ctx->tsbuf[pck_size+2] = (crc  >> 8) & 0xFF;
+			ctx->tsbuf[pck_size+3] = crc & 0xFF;
+			pck_size += 4;
+
+			//pad the rest to 0xFF
+			memset(ctx->tsbuf + pck_size, 0xFF, tot_len - pck_size);
+			//copy over for PAT repeat
+			memcpy(stream->pat_pck, ctx->tsbuf, tot_len);
+			stream->pat_pck_size = tot_len;
+
+			//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);
+			}
+		}
+		return;
+	}
+	//resend PAT
+	if (evt_type==GF_M2TS_EVT_PAT_REPEAT) {
+		for (i=0; i<gf_list_count(ctx->dmx->programs); i++) {
+			u8 *buffer;
+			GF_M2TS_Program *prog = gf_list_get(ctx->dmx->programs, i);
+			GF_M2TSSplit_SPTS *stream = prog->user;
+			if (!stream) continue;
+			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);
+		}
+		return;
+	}
+	if ((evt_type==GF_M2TS_EVT_PMT_FOUND) || (evt_type==GF_M2TS_EVT_PMT_UPDATE)) {
+		GF_M2TS_Program *prog = par;
+		GF_M2TSSplit_SPTS *stream = prog->user;
+		u32 known_streams = 0;
+		for (i=0; i<gf_list_count(prog->streams); i++) {
+			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+			switch (es->stream_type) {
+			case GF_M2TS_VIDEO_MPEG1:
+			case GF_M2TS_VIDEO_MPEG2:
+			case GF_M2TS_VIDEO_DCII:
+			case GF_M2TS_VIDEO_MPEG4:
+			case GF_M2TS_VIDEO_H264:
+			case GF_M2TS_VIDEO_SVC:
+			case GF_M2TS_VIDEO_HEVC:
+			case GF_M2TS_VIDEO_HEVC_TEMPORAL:
+			case GF_M2TS_VIDEO_HEVC_MCTS:
+			case GF_M2TS_VIDEO_SHVC:
+			case GF_M2TS_VIDEO_SHVC_TEMPORAL:
+			case GF_M2TS_VIDEO_MHVC:
+			case GF_M2TS_VIDEO_MHVC_TEMPORAL:
+			case GF_M2TS_AUDIO_MPEG1:
+			case GF_M2TS_AUDIO_MPEG2:
+			case GF_M2TS_AUDIO_LATM_AAC:
+			case GF_M2TS_AUDIO_AAC:
+			case GF_CODECID_AAC_MPEG2_MP:
+			case GF_CODECID_AAC_MPEG2_LCP:
+			case GF_CODECID_AAC_MPEG2_SSRP:
+			case GF_M2TS_AUDIO_AC3:
+			case GF_M2TS_AUDIO_EC3:
+			case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
+			case GF_M2TS_SYSTEMS_MPEG4_PES:
+			case GF_M2TS_METADATA_PES:
+			case GF_M2TS_METADATA_ID3_HLS:
+				known_streams++;
+				break;
+			default:
+				break;
+			}
+		}
+		//if avonly mode and no known streams, do not forward program
+		if (ctx->avonly && !known_streams)
+			return;
+		//good to go, create output and send PAT
+		if (!stream->opid) {
+			u8 *buffer;
+
+			stream->opid = gf_filter_pid_new(ctx->filter);
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE));
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_MIME, &PROP_STRING("video/mpeg-2"));
+			gf_filter_pid_set_property(stream->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("ts"));
+			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);
+		}
+		return;
+	}
+
+	if (evt_type==GF_M2TS_EVT_PCK) {
+		GF_M2TS_TSPCK *tspck = par;
+		Bool do_fwd;
+		GF_M2TSSplit_SPTS *stream = tspck->stream ? tspck->stream->program->user : NULL;
+
+		if (stream) {
+			if (!stream->opid) return;
+
+			if (ctx->dmx->prefix_present) {
+				u8 *data = tspck->data;
+				data -= 4;
+				m2tssplit_send_packet(ctx, stream, data, 192);
+			} else {
+				m2tssplit_send_packet(ctx, stream, tspck->data, 188);
+			}
+			return;
+		}
+
+		if (!ctx->dvb) return;
+
+		do_fwd = GF_FALSE;
+		switch (tspck->pid) {
+		case GF_M2TS_PID_CAT:
+		case GF_M2TS_PID_TSDT:
+		case GF_M2TS_PID_NIT_ST:
+		case GF_M2TS_PID_SDT_BAT_ST:
+		case GF_M2TS_PID_EIT_ST_CIT:
+		case GF_M2TS_PID_RST_ST:
+		case GF_M2TS_PID_TDT_TOT_ST:
+		case GF_M2TS_PID_NET_SYNC:
+		case GF_M2TS_PID_RNT:
+		case GF_M2TS_PID_IN_SIG:
+		case GF_M2TS_PID_MEAS:
+		case GF_M2TS_PID_DIT:
+		case GF_M2TS_PID_SIT:
+			do_fwd = GF_TRUE;
+		}
+		if (do_fwd) {
+			u32 count = gf_list_count(ctx->streams);
+			for (i=0; i<count; i++) {
+				stream = gf_list_get(ctx->streams, i);
+				if (!stream->opid) continue;
+
+				if (ctx->dmx->prefix_present) {
+					u8 *data = tspck->data;
+					data -= 4;
+					m2tssplit_send_packet(ctx, stream, data, 192);
+				} else {
+					m2tssplit_send_packet(ctx, stream, tspck->data, 188);
+				}
+			}
+		}
+	}
+}
+
+GF_Err m2tssplit_initialize(GF_Filter *filter)
+{
+	GF_M2TSSplitCtx *ctx = gf_filter_get_udta(filter);
+	ctx->streams = gf_list_new();
+	ctx->dmx = gf_m2ts_demux_new();
+	ctx->dmx->on_event = m2tssplit_on_event;
+	ctx->dmx->split_mode = GF_TRUE;
+	ctx->dmx->user = ctx;
+	ctx->filter = filter;
+	ctx->bsw = gf_bs_new(ctx->tsbuf, 192, GF_BITSTREAM_WRITE);
+	if (ctx->nb_pack<=1)
+		ctx->nb_pack = 0;
+	return GF_OK;
+}
+
+void m2tssplit_finalize(GF_Filter *filter)
+{
+	GF_M2TSSplitCtx *ctx = gf_filter_get_udta(filter);
+
+	while (gf_list_count(ctx->streams)) {
+		GF_M2TSSplit_SPTS *st = gf_list_pop_back(ctx->streams);
+		if (st->pck_buffer) gf_free(st->pck_buffer);
+		gf_free(st);
+	}
+	gf_list_del(ctx->streams);
+	gf_bs_del(ctx->bsw);
+	gf_m2ts_demux_del(ctx->dmx);
+}
+
+static const GF_FilterCapability M2TSSplitCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_FILE_EXT, "ts|m2t|mts|dmb|trp"),
+	CAP_STRING(GF_CAPS_INPUT_OUTPUT, GF_PROP_PID_MIME, "video/mpeg-2|video/mp2t|video/mpeg"),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_M2TSSplitCtx, _n)
+static const GF_FilterArgs M2TSSplitArgs[] =
+{
+	{ OFFS(dvb), "forward all packets from global DVB PIDs", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(mux_id), "set initial ID of output mux; the first program will use mux_id, the second mux_id+1, etc. If not set, this value will be set to sourceMuxId*255", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_HINT_EXPERT},
+	{ OFFS(avonly), "do not forward programs with no AV component", GF_PROP_BOOL, "true", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(nb_pack), "pack N packets before sending", GF_PROP_UINT, "10", NULL, GF_FS_ARG_HINT_ADVANCED},
+
+	{0}
+};
+
+
+
+GF_FilterRegister M2TSSplitRegister = {
+	.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.")
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	.private_size = sizeof(GF_M2TSSplitCtx),
+	.initialize = m2tssplit_initialize,
+	.finalize = m2tssplit_finalize,
+	.args = M2TSSplitArgs,
+	SETCAPS(M2TSSplitCaps),
+	.configure_pid = m2tssplit_configure_pid,
+	.process = m2tssplit_process,
+	.process_event = m2tssplit_process_event,
+};
+
+const GF_FilterRegister *m2tssplit_register(GF_FilterSession *session)
+{
+	return &M2TSSplitRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/unit_test_filter.c Added

@@ -0,0 +1,1001 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / unit test filters
+ *
+ *  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/list.h>
+
+typedef struct
+{
+	GF_FilterPid *src_pid;
+	GF_FilterPid *dst_pid;
+	GF_SHA1Context *sha_ctx;
+	u32 nb_packets, pck_del;
+
+	GF_FilterFrameInterface frame_ifce;
+	u8 ifce_data[10];
+} PIDCtx;
+
+enum
+{
+	UTF_MODE_SOURCE=0,
+	UTF_MODE_SINK,
+	UTF_MODE_FILTER,
+};
+typedef struct
+{
+	GF_List *pids;
+
+	//0: source, 1: sink, 2: filter
+	u32 mode;
+	u32 max_pck;
+	s32 max_out;
+	const char *pid_att;
+	Bool alloc;
+	u32 nb_pids;
+	u32 fwd;
+	u32 framing;
+	Bool cov;
+	Bool norecfg;
+	const char *update;
+
+	Bool gsftest;
+	GF_Fraction64 dummy1;
+} GF_UnitTestFilter;
+
+static void test_pck_del(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	PIDCtx *stack = (PIDCtx *) gf_filter_pid_get_udta(pid);
+	stack->pck_del++;
+	assert(stack->nb_packets >= stack->pck_del);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("%s: Packet deleted - %d out there (%d sent %d destroyed)\n", gf_filter_get_name(filter), stack->nb_packets - stack->pck_del, stack->nb_packets, stack->pck_del));
+}
+
+
+void dump_properties(GF_FilterPacket *pck, u32 nb_pck)
+{
+	u32 idx = 0;
+	while (1) {
+		u32 p4cc;
+		const char *pname;
+		const GF_PropertyValue *p = gf_filter_pck_enum_properties(pck, &idx, &p4cc, &pname);
+		if (!p) break;
+		//dump_property(pck, nb_pck, p4cc, pname, p);
+	}
+	if (nb_pck==1) {
+		gf_filter_pck_get_property(pck, GF_4CC('c','u','s','t'));
+		gf_filter_pck_get_property_str(pck, "custom");
+	}
+}
+
+static void ut_filter_finalize(GF_Filter *filter)
+{
+	u32 i, count;
+	u8 digest[GF_SHA1_DIGEST_SIZE];
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(stack->pids);
+	for (i=0; i<count; i++) {
+		PIDCtx *pidctx = gf_list_get(stack->pids, i);
+		if (pidctx->sha_ctx && (stack->mode!=UTF_MODE_SOURCE) ) {
+			gf_sha1_finish(pidctx->sha_ctx, digest);
+
+			if (!pidctx->src_pid) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[%s] Pid %d Source PID not available while dumping SHA1\n", gf_filter_get_name(filter), i+1 ));
+			} else {
+				const GF_PropertyValue *p = gf_filter_pid_get_property(pidctx->src_pid, GF_4CC('s','h','a','1') );
+				if (!p) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[%s] Pid %d sha1 property not found on input pid\n", gf_filter_get_name(filter), i+1 ));
+				} else if (p->value.data.size != GF_SHA1_DIGEST_SIZE) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[%s] Pid %d wrong size for sha1 property\n", gf_filter_get_name(filter), i+1 ));
+				} else if (memcmp(p->value.data.ptr, digest, p->value.data.size )) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[%s] Pid %d wrong hash after execution\n", gf_filter_get_name(filter), i+1 ));
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_APP, ("[%s] Pid %d hash OK after execution\n", gf_filter_get_name(filter), i+1 ));
+				}
+			}
+		}
+		gf_free(pidctx);
+	}
+	gf_list_del(stack->pids);
+}
+
+static void ut_filter_send_update(GF_Filter *filter, u32 nb_pck)
+{
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	if (stack->update && (nb_pck==stack->max_pck/2) ) {
+		char *sep, *fid;
+		char *cmd = gf_strdup(stack->update);
+		fid = cmd;
+		sep = strchr(cmd, ',');
+		if (sep) {
+			char *name, *val;
+			sep[0]=0;
+			sep+=1;
+			name=sep;
+			sep = strchr(name, ',');
+			if (sep) {
+				sep[0]=0;
+				val = sep+1;
+			} else {
+				val=NULL;
+			}
+			gf_filter_send_update(filter, fid, name, val, 0);
+		}
+		gf_free(cmd);
+	}
+}
+
+
+static GF_Err ut_filter_process_filter(GF_Filter *filter)
+{
+	u32 size, i, j, count, nb_loops;
+	u32 fwd;
+	GF_FilterPacket *pck_dst;
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(stack->pids);
+	for (i=0; i<count; i++) {
+		PIDCtx *pidctx = gf_list_get(stack->pids, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pidctx->src_pid);
+		if (!pck)
+			return GF_OK;
+
+		if ((stack-> max_out>=0) && (pidctx->nb_packets - pidctx->pck_del >= (u32) stack->max_out) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("TestSource: No packets to emit, waiting for destruction\n"));
+			return GF_OK;
+		}
+	}
+
+	//loop on each PID
+	for (i=0; i<count; i++) {
+		const u8 *data;
+		u32 pck_size;
+		u8 *data_ptr;
+		PIDCtx *pidctx = gf_list_get(stack->pids, i);
+		GF_FilterPacket *pck = gf_filter_pid_get_packet(pidctx->src_pid);
+		assert (pck);
+		assert(pidctx == gf_filter_pid_get_udta(pidctx->src_pid));
+
+		data = gf_filter_pck_get_data(pck, &size);
+		gf_sha1_update(pidctx->sha_ctx, (u8*)data, size);
+
+		nb_loops = stack->framing ? 3 : 1;
+		pck_size = stack->framing ? size/nb_loops : size;
+		data_ptr = (u8 *)data;
+
+		for (j=0; j<nb_loops; j++) {
+
+		//adjust last packet size
+		if ((j+1) == nb_loops) {
+			pck_size = size - j*pck_size;
+		}
+
+		fwd = stack->fwd;
+		if (fwd==3) fwd = pidctx->nb_packets % 3;
+
+		//shared memory
+		if (fwd==0) {
+			pck_dst = gf_filter_pck_new_shared(pidctx->dst_pid, data_ptr, pck_size, test_pck_del);
+		}
+		//copy memory
+		else if (fwd==1) {
+			u8 *data_dst;
+			pck_dst = gf_filter_pck_new_alloc(pidctx->dst_pid, pck_size, &data_dst);
+			if (pck_dst) {
+				memcpy(data_dst, data_ptr, pck_size);
+			}
+		}
+		//packet reference
+		else {
+			if (stack->framing) {
+				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, data_ptr, pck_size, pck);
+			} else {
+				pck_dst = gf_filter_pck_new_ref(pidctx->dst_pid, NULL, 0, pck);
+			}
+		}
+
+
+		if (pck_dst) {
+			Bool is_start, is_end;
+			//get source packet framing
+			gf_filter_pck_get_framing(pck, &is_start, &is_end);
+			//adjust flags given our framing
+			if (is_start && j) is_start = GF_FALSE;
+			if (is_end && (j+1 < nb_loops) ) is_end = GF_FALSE;
+			if (stack->framing==2) is_start = GF_FALSE;
+			if (stack->framing==3) is_end = GF_FALSE;
+
+			gf_filter_pck_set_framing(pck_dst, is_start, is_end);
+			
+			pidctx->nb_packets++;
+			//copy over src props to dst
+			gf_filter_pck_merge_properties(pck, pck_dst);
+			gf_filter_pck_send(pck_dst);
+		}
+		//move our data pointer
+		data_ptr += pck_size;
+
+		} //end framing loop
+
+		gf_filter_pid_drop_packet(pidctx->src_pid);
+
+	} //end PID loop
+
+	return GF_OK;
+
+}
+
+static void ut_source_pck_del(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+
+}
+
+static GF_Err ut_source_ifce_get_plane(struct _gf_filter_frame_interface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	PIDCtx *pctx = frame->user_data;
+	memset(pctx->ifce_data, 0, 10);
+	if (plane_idx) return GF_BAD_PARAM;
+	*outPlane = pctx->ifce_data;
+	*outStride = 5;
+	return GF_OK;
+}
+
+static GF_Err ut_filter_process_source(GF_Filter *filter)
+{
+	GF_PropertyValue p;
+	GF_FilterPacket *pck;
+	u32 i, count, nb_eos;
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	nb_eos = 0;
+	count = gf_list_count(stack->pids);
+	for (i=0; i<count; i++) {
+		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;
+			}
+			nb_eos++;
+			continue;
+		}
+
+		if ((stack->max_out>=0) && (pidctx->nb_packets - pidctx->pck_del >= (u32) stack->max_out) ) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("TestSource: No packets to emit, waiting for destruction\n"));
+			continue;
+		}
+		pidctx->nb_packets++;
+
+		if (stack->gsftest && pidctx->nb_packets==4) {
+			pidctx->frame_ifce.get_plane = ut_source_ifce_get_plane;
+			pidctx->frame_ifce.user_data = pidctx;
+			pck = gf_filter_pck_new_frame_interface(pidctx->dst_pid, &pidctx->frame_ifce, ut_source_pck_del);
+		} else if (stack->alloc) {
+			u8 *data;
+			pck = gf_filter_pck_new_alloc(pidctx->dst_pid, 10, &data);
+			memcpy(data, "PacketCopy", 10);
+			gf_sha1_update(pidctx->sha_ctx, "PacketCopy", 10);
+		} else {
+			pck = gf_filter_pck_new_shared(pidctx->dst_pid, "PacketShared", 12, test_pck_del);
+			gf_sha1_update(pidctx->sha_ctx, "PacketShared", 12);
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("TestSource: pck %d PacketShared\n", pidctx->nb_packets));
+
+		gf_filter_pck_set_cts(pck, pidctx->nb_packets);
+
+		p.type = GF_PROP_NAME;
+		p.value.string = "custom_value";
+		gf_filter_pck_set_property(pck, GF_4CC('c','u','s','t'), &p);
+
+		//try all our properties
+		if (pidctx->nb_packets==1) {
+			u32 val=1;
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','1'), &PROP_BOOL(GF_TRUE) );
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','2'), &PROP_SINT(-1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','3'), &PROP_UINT(1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','4'), &PROP_LONGSINT(-1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','5'), &PROP_LONGUINT(1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','6'), &PROP_FLOAT(1.0f));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','7'), &PROP_DOUBLE(1.0));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','8'), &PROP_FRAC_INT(1,1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','8'), &PROP_FRAC64_INT(1,1));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','9'), &PROP_POINTER(pck));
+
+			if (stack->gsftest) {
+				gf_filter_pck_set_property(pck, GF_4CC('c','u','s','a'), &PROP_DATA(pidctx->ifce_data, 8));
+				gf_filter_pck_set_property(pck, GF_4CC('c','u','s','b'), &PROP_CONST_DATA(pidctx->ifce_data, 8));
+			} else {
+				gf_filter_pck_set_property(pck, GF_4CC('c','u','s','a'), &PROP_DATA((char *) pidctx, sizeof(pidctx)));
+				gf_filter_pck_set_property(pck, GF_4CC('c','u','s','b'), &PROP_CONST_DATA((char *) pidctx, sizeof(pidctx)));
+			}
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','c'), &PROP_STRING("custom"));
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','d'), &PROP_STRING("custom"));
+			memset(&p, 0, sizeof(GF_PropertyValue));
+			p.type = GF_PROP_VEC2;
+			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"));
+			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;
+			gf_filter_pck_set_property(pck, GF_4CC('c','u','s','l'), &p);
+
+			gf_filter_pck_set_property_str(pck, "cusd", &PROP_BOOL(GF_TRUE) );
+			gf_filter_pck_set_property_dyn(pck, "cuse", &PROP_BOOL(GF_TRUE) );
+		}
+		if (stack->gsftest) {
+			gf_filter_pck_set_dts(pck, pidctx->nb_packets-1);
+			gf_filter_pck_set_cts(pck, pidctx->nb_packets-1);
+			gf_filter_pck_set_duration(pck, 1);
+			if (pidctx->nb_packets==2) {
+				gf_filter_pck_set_seek_flag(pck, GF_TRUE);
+				gf_filter_pck_set_carousel_version(pck, 1);
+				gf_filter_pck_set_interlaced(pck, GF_TRUE);
+				gf_filter_pck_set_sap(pck, GF_FILTER_SAP_3);
+				gf_filter_pck_set_dependency_flags(pck, 0xFF);
+				gf_filter_pck_set_property(pck, GF_PROP_PCK_SENDER_NTP, &PROP_LONGUINT(0) );
+			}
+			else if (pidctx->nb_packets==3) {
+				gf_filter_pck_set_sap(pck, GF_FILTER_SAP_4);
+				gf_filter_pck_set_roll_info(pck, 1);
+				gf_filter_pck_set_byte_offset(pck, 20);
+			}
+		}
+
+		ut_filter_send_update(filter, pidctx->nb_packets);
+
+		if (pidctx->nb_packets==stack->max_pck) {
+			if (pidctx->sha_ctx) {
+				u8 digest[GF_SHA1_DIGEST_SIZE];
+				gf_sha1_finish(pidctx->sha_ctx, digest);
+				pidctx->sha_ctx = NULL;
+				p.type = GF_PROP_DATA;
+				p.value.data.size = GF_SHA1_DIGEST_SIZE;
+				p.value.data.ptr = (char *) digest;
+				//with this we test both:
+				//- SHA of send data is correct at the receiver side
+				//- property update on a PID
+				gf_filter_pid_set_property(pidctx->dst_pid, GF_4CC('s','h','a','1'), &p);
+			}
+		}
+		//just for coverage: check keeping a reference to the packet
+		gf_filter_pck_ref(& pck);
+
+		gf_filter_pck_send(pck);
+
+		//and destroy the reference
+		gf_filter_pck_unref(pck);
+
+	}
+	if (nb_eos==count) return GF_EOS;
+	return GF_OK;
+}
+
+
+static GF_Err ut_filter_process_sink(GF_Filter *filter)
+{
+	u32 size, i, count, nb_eos;
+	const char *data;
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	count = gf_list_count(stack->pids);
+	nb_eos=0;
+
+	for (i=0; i<count; i++) {
+	PIDCtx *pidctx=gf_list_get(stack->pids, i);
+
+	GF_FilterPacket *pck = gf_filter_pid_get_packet(pidctx->src_pid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(pidctx->src_pid)) nb_eos++;
+		continue;
+	}
+
+	data = gf_filter_pck_get_data(pck, &size);
+
+	if (stack->cov && !pidctx->nb_packets) {
+		GF_PropertyValue p;
+		Bool old_strict = gf_log_set_strict_error(GF_FALSE);
+		gf_filter_pck_send(pck);
+		gf_filter_pck_set_property(pck, GF_4CC('c','u','s','t'), &p);
+		gf_filter_pck_merge_properties(pck, pck);
+		gf_filter_pck_set_framing(pck, GF_TRUE, GF_FALSE);
+		gf_log_set_strict_error(old_strict);
+	}
+
+	gf_sha1_update(pidctx->sha_ctx, (u8*)data, size);
+
+	pidctx->nb_packets++;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_APP, ("TestSink: Consuming packet %d bytes\n", size));
+
+	dump_properties(pck, pidctx->nb_packets);
+
+	gf_filter_pid_drop_packet(pidctx->src_pid);
+
+	} //end PID loop
+
+	if (nb_eos==count) return GF_EOS;
+	
+	return GF_OK;
+}
+
+
+static GF_Err ut_filter_config_input(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *format;
+	GF_PropertyValue p;
+	PIDCtx *pidctx;
+	u32 i, count;
+	GF_UnitTestFilter  *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	if (stack->mode==UTF_MODE_SOURCE) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error: Attempt to connect PID on source filter\n"));
+		return GF_BAD_PARAM;
+	}
+	//for both filter and sink modes, check input format
+
+	count = gf_list_count(stack->pids);
+	for (i=0; i<count; i++) {
+		pidctx = gf_list_get(stack->pids, i);
+
+		//something is being reconfigured. We check we have the same custum arg, otherwise we do not support
+		if (pidctx->src_pid == pid) {
+			format = gf_filter_pid_get_property(pidctx->src_pid, GF_4CC('c','u','s','t') );
+			if (!format || !format->value.string || strcmp(format->value.string, stack->pid_att)) {
+				return GF_NOT_SUPPORTED;
+			}
+			//filter mode, set properties on output
+			if (stack->mode==UTF_MODE_FILTER) {
+				//this is not needed since copy_properties does that, used for coverage/tests
+				gf_filter_pid_reset_properties(pidctx->dst_pid);
+				gf_filter_pid_copy_properties(pidctx->dst_pid, pidctx->src_pid);
+			}
+			return GF_OK;
+		}
+	}
+
+	//check our functions
+	format = gf_filter_pid_get_property_str(pid, "custom1");
+	if (!format) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("%s: expecting property string custom1 on PID\n", gf_filter_get_name(filter) ));
+	}
+	format = gf_filter_pid_get_property_str(pid, "custom2");
+	if (!format) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("%s: expecting property string custom2 on PID\n", gf_filter_get_name(filter) ));
+	}
+
+	format = gf_filter_pid_get_property(pid, GF_4CC('c','u','s','t') );
+	if (!format || !format->value.string || strcmp(format->value.string, stack->pid_att)) {
+		return GF_NOT_SUPPORTED;
+	}
+
+	//new PID
+	GF_SAFEALLOC(pidctx, PIDCtx);
+	if (!pidctx) return GF_OUT_OF_MEM;
+	pidctx->src_pid = pid;
+	gf_list_add(stack->pids, pidctx);
+	assert(pidctx->src_pid);
+	
+	//coverage mode
+	if (stack->cov) {
+		u8 *data;
+		Bool old_strict = gf_log_set_strict_error(GF_FALSE);
+		gf_filter_pid_set_property(pidctx->src_pid, GF_4CC('s','h','a','1'), format);
+		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_log_set_strict_error(old_strict);
+	}
+
+	//filter mode, setup output
+	if (stack->mode==UTF_MODE_FILTER) {
+		pidctx->dst_pid = gf_filter_pid_new(filter);
+		p.type=GF_PROP_NAME;
+		p.value.string = (char *) stack->pid_att;
+		gf_filter_pid_copy_properties(pidctx->dst_pid, pidctx->src_pid);
+
+		if (stack->cov) {
+			Bool old_strict = gf_log_set_strict_error(GF_FALSE);
+			gf_filter_pid_copy_properties(pidctx->src_pid, pidctx->dst_pid);
+			gf_filter_pid_get_packet(pidctx->dst_pid);
+			gf_filter_pid_drop_packet(pidctx->dst_pid);
+			gf_filter_pid_drop_packet(pidctx->src_pid);
+			gf_log_set_strict_error(old_strict);
+		}
+
+		gf_filter_pid_set_property(pidctx->dst_pid, GF_4CC('c','u','s','t'), &p);
+
+		gf_filter_pid_set_udta(pidctx->dst_pid, pidctx);
+		gf_filter_pid_set_udta(pidctx->src_pid, pidctx);
+
+		gf_filter_pid_set_framing_mode(pidctx->src_pid, GF_TRUE);
+		pidctx->sha_ctx = gf_sha1_starts();
+	}
+	//sink mode, request full reconstruction of input blocks or not depending on framing mode 
+	else {
+		GF_FilterEvent evt;
+		gf_filter_pid_set_framing_mode(pidctx->src_pid, stack->framing ? GF_FALSE : GF_TRUE);
+		pidctx->sha_ctx = gf_sha1_starts();
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+		gf_filter_pid_send_event(pid, &evt);
+	}
+
+	return GF_OK;
+}
+
+
+static GF_Err ut_filter_config_source(GF_Filter *filter)
+{
+	GF_PropertyValue p;
+	PIDCtx *pidctx;
+	u32 i;
+	GF_UnitTestFilter *stack = (GF_UnitTestFilter *) gf_filter_get_udta(filter);
+
+	for (i=0; i<stack->nb_pids; i++) {
+		//create a pid
+		GF_SAFEALLOC(pidctx, PIDCtx);
+		if (!pidctx) return GF_OUT_OF_MEM;
+		gf_list_add(stack->pids, pidctx);
+		pidctx->dst_pid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_udta(pidctx->dst_pid, pidctx);
+
+		//set a custum property
+		p.type = GF_PROP_NAME;
+		p.value.string = (char *) stack->pid_att;
+		gf_filter_pid_set_property(pidctx->dst_pid, GF_4CC('c','u','s','t'), &p);
+
+		//for coverage
+		gf_filter_pid_set_property_str(pidctx->dst_pid, "custom1", &p);
+		gf_filter_pid_set_property_dyn(pidctx->dst_pid, "custom2", &p);
+
+		if (stack->cov) {
+			Bool old_strict = gf_log_set_strict_error(GF_FALSE);
+			gf_filter_pid_set_framing_mode(pidctx->dst_pid, GF_TRUE);
+			gf_log_set_strict_error(old_strict);
+		}
+
+		pidctx->sha_ctx = gf_sha1_starts();
+
+		if (stack->gsftest) {
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_VISUAL) );
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_WIDTH, &PROP_UINT(5) );
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_HEIGHT, &PROP_UINT(2) );
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_FPS, &PROP_FRAC_INT(25,1) );
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_CODECID, &PROP_UINT(GF_CODECID_RAW) );
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_PIXFMT, &PROP_UINT(GF_PIXEL_GREYSCALE) );
+			gf_filter_pid_set_property_str(pidctx->dst_pid, "gsfdummy", &p);
+			gf_filter_pid_set_property(pidctx->dst_pid, GF_PROP_PID_TIMESCALE, &PROP_UINT(25) );
+		}
+
+	}
+	return GF_OK;
+}
+
+
+static GF_Err ut_filter_update_arg(GF_Filter *filter, const char *arg_name, const GF_PropertyValue *arg_val)
+{
+	return GF_OK;
+}
+
+GF_Err utfilter_initialize(GF_Filter *filter)
+{
+	GF_PropertyValue p;
+	GF_UnitTestFilter *stack = gf_filter_get_udta(filter);
+
+	stack->pids = gf_list_new();
+
+	if (stack->cov) {
+		Bool old_strict;
+		char szFmt[40];
+		s64 val;
+		u32 i;
+		GF_PropertyValue p2;
+		p = gf_props_parse_value(GF_PROP_BOOL, "prop", "true", NULL, 0);
+		if (p.value.boolean != GF_TRUE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing boolean value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_BOOL, "prop", "yes", NULL, 0);
+		if (p.value.boolean != GF_TRUE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing boolean value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_BOOL, "prop", "no", NULL, 0);
+		if (p.value.boolean != GF_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing boolean value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_BOOL, "prop", "false", NULL, 0);
+		if (p.value.boolean != GF_FALSE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing boolean value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_SINT, "prop", "-1", NULL, 0);
+		if (p.value.sint != -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing sint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_SINT, "prop", "-1k", NULL, 0);
+		if (p.value.sint != -1000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing sint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_UINT, "prop", "1", NULL, 0);
+		if (p.value.uint != 1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing uint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_UINT, "prop", "1m", NULL, 0);
+		if (p.value.uint != 1000000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing uint 1m value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_UINT, "prop", "0x10000000", NULL, 0);
+		if (p.value.uint != 0x10000000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing uint hex value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_UINT, "prop", "moof", NULL, 0);
+		if (p.value.uint != GF_4CC('m','o','o','f')) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing uint 4CC value\n"));
+		}
+		val = 0xFFFFFFFF;
+		val *= 2;
+		sprintf(szFmt, ""LLD, -val);
+		p = gf_props_parse_value(GF_PROP_LSINT, "prop", szFmt, NULL, 0);
+		if (p.value.longsint != -val) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing longsint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_LSINT, "prop", "-1m", NULL, 0);
+		if (p.value.longsint != -1000000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing longsint value\n"));
+		}
+		sprintf(szFmt, ""LLU, val);
+		p = gf_props_parse_value(GF_PROP_LUINT, "prop", szFmt, NULL, 0);
+		if (p.value.longuint != val) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing longuint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_LUINT, "prop", "1k", NULL, 0);
+		if (p.value.longuint != 1000) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing longuint value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_FLOAT, "prop", "1.0", NULL, 0);
+		if (p.value.fnumber != FIX_ONE) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing float value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_DOUBLE, "prop", "1.0", NULL, 0);
+		if (p.value.number != 1.0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing double value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_DOUBLE, "prop", "1.0m", NULL, 0);
+		if (p.value.number != 1000000.0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing double value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_FRACTION, "prop", "1000/1", NULL, 0);
+		if ((p.value.frac.den != 1) || (p.value.frac.num != 1000)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing fraction value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_FRACTION, "prop", "1000", NULL, 0);
+		if ((p.value.frac.den != 1) || (p.value.frac.num != 1000)) {
+			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) ) {
+			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);
+		if (!p.value.string || strcmp(p.value.string, "test")) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing fraction value\n"));
+		}
+		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) ) {
+			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);
+		if ((p.value.vec2i.x != 1) || (p.value.vec2i.y != 1) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec2i value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_VEC2, "prop", "1x1", NULL, 0);
+		if ((p.value.vec2.x != 1.0) || (p.value.vec2.y != 1.0) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing vec2 value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_VEC3I, "prop", "1x1x1", NULL, 0);
+		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"));
+		}
+		p = gf_props_parse_value(GF_PROP_PCMFMT, "prop", "pcm", NULL, 0);
+		if (p.value.uint != GF_AUDIO_FMT_S16) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing pcmfmt value\n"));
+		}
+
+		sprintf(szFmt, "%d@%p", (u32) sizeof(stack), stack);
+		p = gf_props_parse_value(GF_PROP_DATA, "prop", szFmt, NULL, 0);
+		if ((p.value.data.size != (u32) sizeof(stack)) || memcmp(p.value.data.ptr, (char *) stack, sizeof(stack))) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing data value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_CONST_DATA, "prop", szFmt, NULL, 0);
+		if ((p.value.data.ptr != (u8 *) stack) || (p.value.data.size != (u32) sizeof(stack))) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing data value\n"));
+		}
+		p = gf_props_parse_value(GF_PROP_CONST_DATA, "prop", "0xABCDEF", NULL, 0);
+		if (!p.value.data.ptr || (p.value.data.size != 3) || (p.value.data.ptr[0] != 0xAB) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing data value\n"));
+		}
+		if (p.value.data.ptr) gf_free(p.value.data.ptr);
+
+		sprintf(szFmt, "%p", stack);
+		p = gf_props_parse_value(GF_PROP_POINTER, "prop", szFmt, NULL, 0);
+		if (p.value.ptr != stack) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_APP, ("[UTFilter] Error parsing data value\n"));
+		}
+
+		old_strict = gf_log_set_strict_error(GF_FALSE);
+		//negative tests
+		gf_props_parse_value(GF_PROP_STRING, "prop", "file@_no_exist", NULL, 0);
+		gf_props_parse_value(GF_PROP_STRING, "prop", "bxml@_no_exist", NULL, 0);
+		gf_props_parse_value(GF_PROP_DATA, "prop", "file@_no_exist", NULL, 0);
+		gf_props_parse_value(GF_PROP_DATA, "prop", "bxml@_no_exist", NULL, 0);
+		gf_props_parse_value(GF_PROP_BOOL, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_SINT, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_UINT, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_LSINT, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_LUINT, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_FLOAT, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_DOUBLE, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_FRACTION, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_FRACTION, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_STRING, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_DATA, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_CONST_DATA, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_POINTER, "prop", "", NULL, 0);
+		gf_props_parse_value(GF_PROP_BOOL, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_SINT, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_UINT, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_LSINT, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_LUINT, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_FLOAT, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_DOUBLE, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_FRACTION, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_FRACTION64, "prop", NULL, NULL, 0);
+		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);
+		gf_props_parse_value(GF_PROP_POINTER, "prop", NULL, NULL, 0);
+		gf_props_parse_value(GF_PROP_UINT, "prop", "test", "foo|bar", 0);
+		gf_props_parse_value(100, "prop", "test", NULL, 0);
+
+		memset(&p, 0, sizeof(GF_PropertyValue));
+		p2=p;
+		for (i=GF_PROP_FORBIDEN; i<GF_PROP_LAST_DEFINED; i++) {
+			char dump[GF_PROP_DUMP_ARG_SIZE];
+			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);
+		}
+		p.type = GF_PROP_DATA;
+		p.value.data.size = 4;
+		p.value.data.ptr = "test";
+		p2 = p;
+		p2.value.data.ptr = NULL;
+		gf_props_equal(&p, &p2);
+		p2.value.data.size = 3;
+		p2.value.data.ptr = "test";
+		gf_props_equal(&p, &p2);
+		p2.value.data.size = 4;
+		gf_props_equal(&p, &p2);
+
+		p.type = GF_PROP_UINT_LIST;
+		i=0;
+		p.value.uint_list.nb_items=1;
+		p.value.uint_list.vals = &i;
+		p2 = p;
+		gf_props_equal(&p, &p2);
+
+
+		gf_log_set_strict_error(old_strict);
+	}
+
+	if (! strcmp( "UTSink", gf_filter_get_name(filter))) {
+		stack->mode=UTF_MODE_SINK;
+		gf_filter_set_max_extra_input_pids(filter, 10);
+	}
+	else if (! strcmp( "UTFilter", gf_filter_get_name(filter))) stack->mode=UTF_MODE_FILTER;
+	else {
+		stack->mode=UTF_MODE_SOURCE;
+		return ut_filter_config_source(filter);
+	}
+	return GF_OK;
+}
+
+#define OFFS(_n)	#_n, offsetof(GF_UnitTestFilter, _n)
+static const GF_FilterArgs UTFilterArgs[] =
+{
+	{ OFFS(pid_att), "set default value for PID `cust` attribute", GF_PROP_NAME, "UTSourceData", NULL, 0},
+	{ OFFS(max_pck), "maximum number of packets to send in source mode", GF_PROP_UINT, "1000", NULL, 0},
+	{ OFFS(nb_pids), "number of PIDs in source mode", GF_PROP_UINT, "1", "1-+I", 0},
+	{ OFFS(max_out), "maximum number of shared packets not yet released in source/filter mode, no limit if -1", GF_PROP_SINT, "-1", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(alloc), "use allocated memory packets in source mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(fwd), "indicate packet forward mode for filter.\n"
+	"- shared: use shared memory (dangerous)\n"
+	"- copy: use copy\n"
+	"- ref: use references to source packet\n"
+	"- mix: change mode at each packet sent", GF_PROP_UINT, "shared", "shared|copy|ref|mix", GF_FS_ARG_UPDATE},
+	{ OFFS(framing), "packet framing.\n"
+	"- none: disable packet split\n"
+	"- default: divide packets in 3 for filter mode and allows partial blocks for sink mode\n"
+	"- nostart: same as default but does not signal packet start flag\n"
+	"- noend: same as default but does not signal packet end flag"
+	"", GF_PROP_UINT, "none", "none|default|nostart|noend", GF_FS_ARG_UPDATE},
+	{ OFFS(update), "send update message after half packet send. Update format is FID,argname,argval", GF_PROP_STRING, NULL, NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(cov), "dump options and exercise error cases for code coverage", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(norecfg), "disable reconfig on input pid in filter/sink mode", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(gsftest), "dispatch a fake single video pid with props and packet props for GSF testing", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_UPDATE},
+
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_LSINT, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_LUINT, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_FLOAT, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_DOUBLE, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_FRACTION, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_POINTER, "0", NULL, GF_FS_ARG_UPDATE},
+	{ OFFS(dummy1), "dummy for coverage", GF_PROP_FRACTION64, "0", NULL, GF_FS_ARG_UPDATE},
+	{ NULL }
+};
+
+#define UT_CAP_CODE		GF_4CC('c','u','s','t')
+static const GF_FilterCapability UTFilterCaps[] =
+{
+	CAP_STRING(GF_CAPS_INPUT, UT_CAP_CODE, "UTSourceData"),
+	CAP_STRING(GF_CAPS_INPUT, UT_CAP_CODE, "UTFilterData"),
+	CAP_STRING(GF_CAPS_OUTPUT, UT_CAP_CODE, "UTSourceData"),
+	CAP_STRING(GF_CAPS_OUTPUT, UT_CAP_CODE, "UTFilterData"),
+};
+
+static const GF_FilterCapability UTSinkInputs[] =
+{
+	CAP_STRING(GF_CAPS_INPUT, UT_CAP_CODE, "UTSourceData"),
+};
+
+static const GF_FilterCapability UTSink2Inputs[] =
+{
+	CAP_STRING(GF_CAPS_INPUT, UT_CAP_CODE, "UTFilterData"),
+};
+
+static const GF_FilterCapability UTSourceOutputs[] =
+{
+	CAP_STRING(GF_CAPS_OUTPUT, UT_CAP_CODE, "UTSourceData"),
+};
+
+
+const GF_FilterRegister UTFilterRegister = {
+	.name = "UTFilter",
+	GF_FS_SET_DESCRIPTION("Unit Test Filter")
+	GF_FS_SET_HELP("This filter is only used for unit testing of filter framework")
+	.private_size = sizeof(GF_UnitTestFilter),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS( UTFilterCaps),
+	.args = UTFilterArgs,
+	.initialize = utfilter_initialize,
+	.finalize = ut_filter_finalize,
+	.process = ut_filter_process_filter,
+	.configure_pid = ut_filter_config_input,
+	.update_arg = ut_filter_update_arg
+};
+
+
+const GF_FilterRegister UTSinkRegister = {
+	.name = "UTSink",
+	GF_FS_SET_DESCRIPTION("Unit Test Sink")
+	GF_FS_SET_HELP("This filter is only used for unit testing of filter framework")
+	.private_size = sizeof(GF_UnitTestFilter),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS(UTSinkInputs),
+	.args = UTFilterArgs,
+	.initialize = utfilter_initialize,
+	.finalize = ut_filter_finalize,
+	.process = ut_filter_process_sink,
+	.configure_pid = ut_filter_config_input,
+	.update_arg = ut_filter_update_arg
+};
+
+const GF_FilterRegister UTSink2Register = {
+	.name = "UTSink2",
+	GF_FS_SET_DESCRIPTION("Unit Test Sink2")
+	GF_FS_SET_HELP("This filter is only used for unit testing of filter framework")
+	.private_size = sizeof(GF_UnitTestFilter),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS(UTSink2Inputs),
+	.args = UTFilterArgs,
+	.initialize = utfilter_initialize,
+	.finalize = ut_filter_finalize,
+	.process = ut_filter_process_sink,
+	.configure_pid = ut_filter_config_input,
+	.update_arg = ut_filter_update_arg
+};
+
+const GF_FilterRegister UTSourceRegister = {
+	.name = "UTSource",
+	GF_FS_SET_DESCRIPTION("Unit Test Source")
+	GF_FS_SET_HELP("This filter is only used for unit testing of filter framework")
+	.private_size = sizeof(GF_UnitTestFilter),
+	.flags = GF_FS_REG_EXPLICIT_ONLY,
+	SETCAPS(UTSourceOutputs),
+	.args = UTFilterArgs,
+	.initialize = utfilter_initialize,
+	.finalize = ut_filter_finalize,
+	.process = ut_filter_process_source,
+	.update_arg = ut_filter_update_arg
+};
+
+
+const GF_FilterRegister *ut_filter_register(GF_FilterSession *session, Bool load_meta_filters)
+{
+	return &UTFilterRegister;
+}
+const GF_FilterRegister *ut_source_register(GF_FilterSession *session, Bool load_meta_filters)
+{
+	return &UTSourceRegister;
+}
+const GF_FilterRegister *ut_sink_register(GF_FilterSession *session, Bool load_meta_filters)
+{
+	return &UTSinkRegister;
+}
+const GF_FilterRegister *ut_sink2_register(GF_FilterSession *session, Bool load_meta_filters)
+{
+	return &UTSink2Register;
+}
+
+
+

gpac-1.0.0.tar.gz/src/filters/vcrop.c Added

@@ -0,0 +1,626 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / video cropping 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/list.h>
+#include <gpac/constants.h>
+#include <gpac/network.h>
+
+typedef struct
+{
+	//options
+	const char *wnd;
+	Bool copy;
+	u32 round;
+
+	//internal data
+	Bool initialized;
+
+	GF_FilterPid *ipid, *opid;
+	u32 w, h, stride, s_pfmt;
+	GF_Fraction ar;
+	Bool passthrough;
+
+	u32 dst_stride[5];
+	u32 src_stride[5];
+	u32 nb_planes, nb_src_planes, out_size, out_src_size, src_uv_height, dst_uv_height;
+
+	Bool use_reference;
+	u32 dst_width, dst_height;
+	s32 src_x, src_y;
+	Bool packed_422;
+
+	GF_List *frames, *frames_res;
+} GF_VCropCtx;
+
+typedef struct
+{
+	GF_FilterFrameInterface frame_ifce;
+
+	//reference to the source packet
+	GF_FilterPacket *pck;
+	u8 *planes[5];
+	u32 stride[5];
+
+	GF_VCropCtx *ctx;
+} GF_VCropFrame;
+
+
+GF_Err vcrop_frame_get_plane(GF_FilterFrameInterface *frame, u32 plane_idx, const u8 **outPlane, u32 *outStride)
+{
+	GF_VCropFrame *vframe = frame->user_data;
+
+	if (plane_idx>=vframe->ctx->nb_planes) return GF_BAD_PARAM;
+	if (outPlane) *outPlane = vframe->planes[plane_idx];
+	if (outStride) *outStride = vframe->stride[plane_idx];
+	return GF_OK;
+}
+
+void vcrop_packet_destruct(GF_Filter *filter, GF_FilterPid *pid, GF_FilterPacket *pck)
+{
+	GF_VCropFrame *vframe;
+	GF_FilterFrameInterface *frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	if (!frame_ifce) return;
+	vframe = frame_ifce->user_data;
+	assert(vframe->pck);
+	gf_filter_pck_unref(vframe->pck);
+	vframe->pck = NULL;
+	gf_list_add(vframe->ctx->frames_res, vframe);
+}
+
+
+static GF_Err vcrop_process(GF_Filter *filter)
+{
+	const u8 *data;
+	u8 *output;
+	u32 size;
+	u32 bps;
+	u32 s_off_x, s_off_y, d_off_x, d_off_y, i, copy_w, copy_h;
+	u8 *src, *dst;
+	u8 *src_planes[5];
+	u8 *dst_planes[5];
+	Bool do_memset = GF_FALSE;
+	GF_FilterPacket *dst_pck;
+	GF_FilterFrameInterface *frame_ifce;
+	GF_VCropCtx *ctx = gf_filter_get_udta(filter);
+	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_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	data = gf_filter_pck_get_data(pck, &size);
+	frame_ifce = gf_filter_pck_get_frame_interface(pck);
+
+	memset(src_planes, 0, sizeof(src_planes));
+	memset(dst_planes, 0, sizeof(dst_planes));
+
+	if (data) {
+		src_planes[0] = (u8 *) data;
+
+		if (ctx->nb_src_planes==1) {
+		} else if (ctx->nb_src_planes==2) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0]*ctx->h;
+		} else if (ctx->nb_src_planes==3) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+		} else if (ctx->nb_src_planes==4) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+			src_planes[3] = src_planes[2] + ctx->src_stride[2] * ctx->src_uv_height;
+		}
+	} else if (frame_ifce && frame_ifce->get_plane) {
+		for (i=0; i<4; i++) {
+			if (frame_ifce->get_plane(frame_ifce, i, (const u8 **) &src_planes[i], &ctx->src_stride[i])!=GF_OK)
+				break;
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] No data associated with packet, not supported\n"));
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	bps = gf_pixel_get_bytes_per_pixel(ctx->s_pfmt);
+
+	copy_w = ctx->dst_width;
+	copy_h = ctx->dst_height;
+	s_off_x = s_off_y = d_off_x = d_off_y = 0;
+	if (ctx->src_x>=0) {
+		s_off_x = ctx->src_x;
+	} else {
+		d_off_x = (u32) (-ctx->src_x);
+		copy_w = (s32) ctx->dst_width + ctx->src_x;
+		do_memset = GF_TRUE;
+	}
+	if (s_off_x + copy_w > ctx->w) {
+		copy_w = ctx->w - s_off_x;
+		do_memset = GF_TRUE;
+	}
+	if (ctx->src_y>=0) {
+		s_off_y = ctx->src_y;
+	} else {
+		d_off_y = (u32) (-ctx->src_y);
+		copy_h = (s32) ctx->dst_height + ctx->src_y;
+		do_memset = GF_TRUE;
+	}
+	if (s_off_y + copy_h > ctx->h) {
+		copy_h = ctx->h - s_off_y;
+		do_memset = GF_TRUE;
+	}
+
+	if (ctx->use_reference) {
+		GF_VCropFrame *vframe = gf_list_pop_back(ctx->frames_res);
+		if (!vframe) {
+			GF_SAFEALLOC(vframe, GF_VCropFrame);
+			if (!vframe) return GF_OUT_OF_MEM;
+		}
+		vframe->ctx = ctx;
+		memcpy(vframe->stride, ctx->src_stride, sizeof(vframe->stride));
+		if (ctx->packed_422) {
+			vframe->planes[0] = src_planes[0] + s_off_x * bps * 2 + ctx->src_stride[0] * s_off_y;
+		} else {
+			vframe->planes[0] = src_planes[0] + s_off_x * bps + ctx->src_stride[0] * s_off_y;
+		}
+		//nv12/21
+		if (ctx->nb_planes==2) {
+			vframe->planes[1] = src_planes[1] + s_off_x * bps + ctx->src_stride[1] * s_off_y/2;
+		} else if (ctx->nb_planes>=3) {
+			u32 div_x, div_y;
+			//alpha/depth/other plane, treat as luma plane
+			if (ctx->nb_planes==4) {
+				vframe->planes[3] = src_planes[3] + s_off_x * bps + ctx->src_stride[3] * s_off_y;
+			}
+			div_x = (ctx->src_stride[1]==ctx->src_stride[0]) ? 1 : 2;
+			div_y = (ctx->src_uv_height==ctx->h) ? 1 : 2;
+
+			vframe->planes[1] = src_planes[1] + s_off_x * bps / div_x + ctx->src_stride[1] * s_off_y / div_y;
+			vframe->planes[2] =src_planes[2] + s_off_x * bps / div_x + ctx->src_stride[2] * s_off_y / div_y;
+		}
+		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);
+		//keep a ref to input packet
+		vframe->pck = pck;
+		gf_filter_pck_ref(&vframe->pck);
+		gf_filter_pck_merge_properties(pck, dst_pck);
+		gf_filter_pck_send(dst_pck);
+		//remove input packet
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+
+
+	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;
+	}
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	dst_planes[0] = output;
+	if (ctx->nb_planes==1) {
+	} else if (ctx->nb_planes==2) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+	} else if (ctx->nb_planes==3) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+		dst_planes[2] = dst_planes[1] + ctx->dst_stride[1]*ctx->dst_uv_height;
+	} else if (ctx->nb_planes==4) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+		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;
+	} else {
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (do_memset) {
+		memset(output, 0x00, sizeof(char)*ctx->out_size);
+	}
+
+	//YUYV variations need *2 on horizontal dimension
+	if (ctx->packed_422) {
+		src = src_planes[0] + s_off_x * bps * 2 + ctx->src_stride[0] * s_off_y;
+		dst = dst_planes[0] + d_off_x * bps * 2 + ctx->dst_stride[0] * d_off_y;
+		for (i=0; i<copy_h; i++) {
+			memcpy(dst, src, bps * copy_w * 2);
+			src += ctx->src_stride[0];
+			dst += ctx->dst_stride[0];
+		}
+	} else {
+		//copy first plane
+		src = src_planes[0] + s_off_x * bps + ctx->src_stride[0] * s_off_y;
+		dst = dst_planes[0] + d_off_x * bps + ctx->dst_stride[0] * d_off_y;
+		for (i=0; i<copy_h; i++) {
+			memcpy(dst, src, bps * copy_w);
+			src += ctx->src_stride[0];
+			dst += ctx->dst_stride[0];
+		}
+	}
+
+	//nv12/21
+	if (ctx->nb_planes==2) {
+		src = src_planes[1] + s_off_x * bps + ctx->src_stride[1] * s_off_y/2;
+		dst = dst_planes[1] + d_off_x * bps + ctx->dst_stride[1] * d_off_y/2;
+		//half vertical res (/2)
+		for (i=0; i<copy_h/2; i++) {
+			//half horizontal res (/2) but two chroma packed per pixel (*2)
+			memcpy(dst, src, bps * copy_w);
+			src += ctx->src_stride[1];
+			dst += ctx->dst_stride[1];
+		}
+	} else if ((ctx->nb_planes==3) || (ctx->nb_planes==4)) {
+		u32 div_x, div_y;
+		//alpha/depth/other plane, treat as luma plane
+		if (ctx->nb_planes==4) {
+			src = src_planes[3] + s_off_x * bps + ctx->src_stride[3] * s_off_y;
+			dst = dst_planes[3] + d_off_x * bps + ctx->dst_stride[3] * d_off_y;
+			for (i=0; i<copy_h; i++) {
+				memcpy(dst, src, bps * copy_w);
+				src += ctx->src_stride[3];
+				dst += ctx->dst_stride[3];
+			}
+		}
+
+		div_x = (ctx->src_stride[1]==ctx->src_stride[0]) ? 1 : 2;
+		div_y = (ctx->src_uv_height==ctx->h) ? 1 : 2;
+
+		src = src_planes[1] + s_off_x * bps / div_x + ctx->src_stride[1] * s_off_y / div_y;
+		dst = dst_planes[1] + d_off_x * bps / div_x + ctx->dst_stride[1] * d_off_y / div_y;
+		copy_h /= div_y;
+		copy_w /= div_x;
+
+		for (i=0; i<copy_h; i++) {
+			memcpy(dst, src, bps * copy_w);
+			src += ctx->src_stride[1];
+			dst += ctx->dst_stride[1];
+		}
+
+		src = src_planes[2] + s_off_x * bps / div_x + ctx->src_stride[2] * s_off_y / div_y;
+		dst = dst_planes[2] + d_off_x * bps / div_x + ctx->dst_stride[2] * d_off_y / div_y;
+		for (i=0; i<copy_h; i++) {
+			memcpy(dst, src, bps * copy_w);
+			src += ctx->src_stride[1];
+			dst += ctx->dst_stride[1];
+		}
+	}
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+static Bool parse_crop_props(GF_VCropCtx *ctx, u32 src_w, u32 src_h, GF_PixelFormat pfmt)
+{
+	s32 dim[4];
+	s32 dim_off[4];
+	Bool dim_pc[4];
+	u32 nb_dim=0;
+	char *args = (char *)ctx->wnd;
+
+	memset(dim, 0, sizeof(dim));
+	memset(dim_pc, 0, sizeof(dim_pc));
+	memset(dim_off, 0, sizeof(dim_off));
+
+	while (args) {
+		char *sep_offset=NULL, *sep_pc, sign=0;
+		char *sep = strchr(args, 'x');
+		if (sep) sep[0] = 0;
+
+		sep_pc = strchr(args, '%');
+		if (sep_pc) {
+			sep_pc[0] = 0;
+			dim[nb_dim] = atoi(args);
+			sep_pc[0] = '%';
+			dim_pc[nb_dim] = GF_TRUE;
+
+			sep_offset = strchr(sep_pc, '+');
+			if (sep_offset) {
+				sign = sep_offset[0];
+				dim_off[nb_dim] = atoi(sep_offset+1);
+				sep_offset[0] = 0;
+			} else {
+				sep_offset = strchr(args, '-');
+				if (sep_offset) {
+					sign = sep_offset[0];
+					dim_off[nb_dim] = - atoi(sep_offset+1);
+					sep_offset[0] = 0;
+				}
+			}
+
+		} else {
+			dim[nb_dim] = atoi(args);
+		}
+
+		if (sep_offset) sep_offset[0] = sign;
+		nb_dim++;
+		if (!sep) break;
+		sep[0] = 'x';
+		args = sep+1;
+		if (nb_dim==4) break;
+	}
+
+#define GET_DIM(_dst, _i, _s) if (dim_pc[_i]) \
+								_dst = (dim[_i] * (s32) _s / 100) + dim_off[_i]; \
+							else \
+								_dst = dim[_i] + dim_off[_i]; \
+
+
+	if (nb_dim==2) {
+		ctx->src_x = 0;
+		ctx->src_y = 0;
+		GET_DIM(ctx->dst_width, 0, src_w)
+		GET_DIM(ctx->dst_height, 1, src_h)
+	} else if (nb_dim==4) {
+		GET_DIM(ctx->src_x, 0, src_w)
+		GET_DIM(ctx->src_y, 1, src_h)
+		GET_DIM(ctx->dst_width, 2, src_w)
+		GET_DIM(ctx->dst_height, 3, src_h)
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] Cannot parse crop parameters, expected 2 or 4 numbers, got %d\n", nb_dim));
+		return GF_FALSE;
+	}
+	if ((s32) ctx->dst_width < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] Negative destination width %d !\n", (s32) ctx->dst_width));
+		return GF_FALSE;
+	}
+	if ((s32) ctx->dst_height < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] Negative destination height %d !\n", (s32) ctx->dst_height));
+		return GF_FALSE;
+	}
+
+#define ROUND_IT(_a) { if ((ctx->round==0) || (ctx->round==2)) { (_a)++; } else { (_a)--; } }
+
+	//for YUV 420, adjust to multiple of 2 on both dim
+	ctx->packed_422 = GF_FALSE;
+	switch (pfmt) {
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_NV21_10:
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVD:
+	case GF_PIXEL_YUV_10:
+		if (ctx->src_x % 2) ROUND_IT(ctx->src_x);
+		if (ctx->src_y % 2) ROUND_IT(ctx->src_y);
+		if ((ctx->src_x + ctx->dst_width) % 2) ROUND_IT(ctx->dst_width);
+		if ((ctx->src_y + ctx->dst_height) % 2) ROUND_IT(ctx->dst_height);
+		break;
+	//for YUV 422, adjust to multiple of 2 on horizontal dim
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		ctx->packed_422 = GF_TRUE;
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+		if (ctx->src_x % 2) ROUND_IT(ctx->src_x);
+		if ((ctx->src_x + ctx->dst_width) % 2) ROUND_IT(ctx->dst_width);
+		if (ctx->round>1) {
+			if (ctx->src_y % 2) ROUND_IT(ctx->src_y);
+			if ((ctx->src_y + ctx->dst_height) % 2) ROUND_IT(ctx->dst_height);
+		}
+		break;
+	default:
+		if (ctx->round>1) {
+			if (ctx->src_x % 2) ROUND_IT(ctx->src_x);
+			if (ctx->src_y % 2) ROUND_IT(ctx->src_y);
+			if ((ctx->src_x + ctx->dst_width) % 2) ROUND_IT(ctx->dst_width);
+			if ((ctx->src_y + ctx->dst_height) % 2) ROUND_IT(ctx->dst_height);
+		}
+		break;
+	}
+	return GF_TRUE;
+}
+
+static GF_Err vcrop_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	GF_PropVec2i vec;
+	const GF_PropertyValue *p;
+	u32 w, h, stride, pfmt;
+	GF_Fraction sar;
+	GF_VCropCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+	}
+	w = h = pfmt = stride = 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_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) pfmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+	if (p) sar = p->value.frac;
+	else sar.den = sar.num = 1;
+
+	if (!w || !h || !pfmt) {
+		ctx->passthrough = GF_TRUE;
+		return GF_OK;
+	}
+	ctx->passthrough = GF_FALSE;
+
+	if ((ctx->w == w) && (ctx->h == h) && (ctx->s_pfmt == pfmt) && (ctx->stride == stride)) {
+		//nothing to reconfigure
+	} else {
+		Bool res;
+		if (! parse_crop_props(ctx, w, h, pfmt)) {
+			return GF_BAD_PARAM;
+		}
+
+		if (ctx->src_x<0) ctx->use_reference = GF_FALSE;
+		else if (ctx->src_y<0) ctx->use_reference = GF_FALSE;
+		else if (ctx->src_x + ctx->dst_width > w) ctx->use_reference = GF_FALSE;
+		else if (ctx->src_y + ctx->dst_height > h) ctx->use_reference = GF_FALSE;
+		else ctx->use_reference = ctx->copy ? GF_FALSE : GF_TRUE;
+
+		if (ctx->use_reference) {
+			if (!ctx->frames) ctx->frames = gf_list_new();
+			if (!ctx->frames_res) ctx->frames_res = gf_list_new();
+		}
+
+		//get layout info for source
+		memset(ctx->src_stride, 0, sizeof(ctx->src_stride));
+		if (ctx->stride) ctx->src_stride[0] = ctx->stride;
+
+		res = gf_pixel_get_size_info(pfmt, w, h, &ctx->out_src_size, &ctx->src_stride[0], &ctx->src_stride[1], &ctx->nb_src_planes, &ctx->src_uv_height);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] Failed to query source pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		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];
+
+
+		//get layout info for dest
+		memset(ctx->dst_stride, 0, sizeof(ctx->dst_stride));
+		res = gf_pixel_get_size_info(pfmt, ctx->dst_width, ctx->dst_height, &ctx->out_size, &ctx->dst_stride[0], &ctx->dst_stride[1], &ctx->nb_planes, &ctx->dst_uv_height);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VCrop] Failed to query output pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (ctx->nb_planes==3) ctx->dst_stride[2] = ctx->dst_stride[1];
+		if (ctx->nb_planes==4) ctx->dst_stride[3] = ctx->dst_stride[0];
+
+
+		ctx->w = w;
+		ctx->h = h;
+		ctx->s_pfmt = pfmt;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[VCrop] Configured output window to crop %dx%dx%dx%d from full frame size %dx%d\n", ctx->src_x, ctx->src_y, ctx->dst_width, ctx->dst_height, ctx->w, ctx->h));
+
+		if (!ctx->src_x && !ctx->src_y && (ctx->dst_width==ctx->w) &&  (ctx->dst_height==ctx->h) ) {
+			ctx->passthrough = GF_TRUE;
+		}
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->dst_width));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->dst_height));
+	if (ctx->use_reference) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->src_stride[0] ));
+		if (ctx->nb_planes>1)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(ctx->src_stride[1]));
+	} else {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->dst_stride[0] ));
+		if (ctx->nb_planes>1)
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(ctx->dst_stride[1]));
+	}
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar) );
+	vec.x = ctx->src_x;
+	vec.y = ctx->src_y;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_CROP_POS, &PROP_VEC2I(vec) );
+	vec.x = ctx->w;
+	vec.y = ctx->h;
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_ORIG_SIZE, &PROP_VEC2I(vec) );
+
+	return GF_OK;
+}
+
+void vcrop_finalize(GF_Filter *filter)
+{
+	GF_VCropCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->frames) {
+		while (gf_list_count(ctx->frames)) {
+			GF_VCropFrame *vframe = gf_list_pop_back(ctx->frames);
+			gf_free(vframe);
+		}
+		gf_list_del(ctx->frames);
+	}
+	if (ctx->frames_res) {
+		while (gf_list_count(ctx->frames_res)) {
+			GF_VCropFrame *vframe = gf_list_pop_back(ctx->frames_res);
+			gf_free(vframe);
+		}
+		gf_list_del(ctx->frames_res);
+	}
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_VCropCtx, _n)
+static GF_FilterArgs VCropArgs[] =
+{
+	{ OFFS(wnd), "size of output to crop, indicated as TxLxWxH. If % is indicated after a number, the value is in percent of the source width (for L and W) or height (for T and H). An absolute offset (+x, -x) can be added after percent", GF_PROP_STRING, NULL, NULL, 0},
+	{ OFFS(copy), "copy the source pixels. By default the filter will try to forward crop frames by adjusting offsets and strides of the source if possible (window contained in frame)", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(round), "adjust dimension to be a multiple of 2.\n"
+	"- up: up rounding\n"
+	"- down: down rounding\n"
+	"- allup: up rounding on formats that do not require it (RGB, YUV444)\n"
+	"- alldown: down rounding on formats that do not require it (RGB, YUV444)", GF_PROP_UINT, "up", "up|down|allup|alldown", GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+static const GF_FilterCapability VCropCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	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),
+};
+
+GF_FilterRegister VCropRegister = {
+	.name = "vcrop",
+	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,
+	.args = VCropArgs,
+	.configure_pid = vcrop_configure_pid,
+	SETCAPS(VCropCaps),
+	.process = vcrop_process,
+	.finalize = vcrop_finalize,
+};
+
+
+
+const GF_FilterRegister *vcrop_register(GF_FilterSession *session)
+{
+	return &VCropRegister;
+}

gpac-1.0.0.tar.gz/src/filters/vflip.c Added

@@ -0,0 +1,511 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Samir Mustapha - Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / video flip 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/list.h>
+#include <gpac/constants.h>
+#include <gpac/network.h>
+
+typedef struct
+{
+	//options
+	u32 mode;
+
+	//internal data
+	Bool initialized;
+
+	GF_FilterPid *ipid, *opid;
+	u32 w, h, stride, s_pfmt;
+	u32 bps;
+	GF_Fraction ar;
+	Bool passthrough;
+	u32 dst_width, dst_height;
+
+	u32 dst_stride[5];
+	u32 src_stride[5];
+	u32 nb_planes, nb_src_planes, out_size, out_src_size, src_uv_height, dst_uv_height;
+
+	Bool use_reference;
+	Bool packed_422;
+
+
+	char *line_buffer_vf; //vertical flip
+	char *line_buffer_hf; //horizontal flip
+
+} GF_VFlipCtx;
+
+enum
+{
+	VFLIP_OFF = 0,
+	VFLIP_VERT,
+	VFLIP_HORIZ,
+	VFLIP_BOTH,
+};
+
+
+
+static void swap_2Ys_YUVpixel(GF_VFlipCtx *ctx, u8 *line_src, u8 *line_dst, u32 FourBytes_start_index)
+{
+	u32 isFirstY_indexOne;
+	switch (ctx->s_pfmt) {
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+		isFirstY_indexOne= (u32) 0;
+		break;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+		isFirstY_indexOne= (u32) 1;
+		break;
+	default:
+		return;
+	}
+
+	//Y2_dst = Y1_src
+	line_dst[FourBytes_start_index + 2 + isFirstY_indexOne]=line_src[FourBytes_start_index + 0 + isFirstY_indexOne];
+
+	//Y1_dst = Y2_src
+	line_dst[FourBytes_start_index + 0 + isFirstY_indexOne]=line_src[FourBytes_start_index + 2 + isFirstY_indexOne];
+}
+
+static void horizontal_flip_per_line(GF_VFlipCtx *ctx, u8 *line_src, u8 *line_dst, u32 plane_idx, u32 wiB)
+{
+	u32 j, line_size = wiB;
+
+	if (ctx->s_pfmt == GF_PIXEL_RGB || ctx->s_pfmt == GF_PIXEL_BGR || ctx->s_pfmt == GF_PIXEL_XRGB || ctx->s_pfmt == GF_PIXEL_RGBX || ctx->s_pfmt == GF_PIXEL_XBGR || ctx->s_pfmt == GF_PIXEL_BGRX){
+		//to avoid "3*j > line_size - 3*j - 3" or "4*j > line_size - 4*j - 4"
+		//jmax=line_size/(2*3) or jmax=line_size/(2*4)
+		for (j=0; j < line_size/(2*ctx->bps); j++) {
+			u8 pix[4];
+			memcpy(pix, line_src + line_size - ctx->bps*(j+1), ctx->bps);
+			memcpy(line_dst + line_size - ctx->bps*(j+1), line_src + ctx->bps*j, ctx->bps);
+			memcpy(line_dst + ctx->bps*j, pix, ctx->bps);
+		}
+	} else if (ctx->packed_422) {
+		//If the source data is assigned to the output packet during the destination pack allocation
+		//i.e dst_planes[0]= src_planes[0], line_src is going to change while reading it as far as writing on line_dst=line_src
+		//To avoid this situation, ctx->line_buffer_hf keeps the values of line_src
+		memcpy(ctx->line_buffer_hf, line_src, wiB);
+
+		//reversing of 4-bytes sequences
+		u32 fourBytesSize = wiB/4;
+		for (j=0; j < fourBytesSize; j++) {
+			//buffer = last 4 columns
+			u32 last_4bytes_index = wiB-4-(4*j);
+			u32 p, first_4bytes_index = 4*j;
+			for (p = 0; p < 4; p++) {
+				line_dst[first_4bytes_index+p] = ctx->line_buffer_hf[last_4bytes_index+p];
+			}
+			//exchanging of Ys within a yuv pixel
+			swap_2Ys_YUVpixel(ctx, line_dst, line_dst, first_4bytes_index);
+		}
+	} else {
+		//nv12/21
+		//second plane is U-plane={u1,v1, u2,v2...}
+		if (ctx->nb_planes==2 && plane_idx==1){
+			if (ctx->bps==1) {
+				//to avoid "line_size - 2*j - 2 > 2*j", jmax=line_size/4
+				for (j=0; j < line_size/4; j++) {
+					u8 u_comp, v_comp;
+					u_comp = line_src[line_size - 2*j - 2];
+					v_comp = line_src[line_size - 2*j - 1];
+
+					line_dst[line_size - 2*j - 2] = line_src[2*j];
+					line_dst[line_size - 2*j - 1] = line_src[2*j + 1];
+
+					line_dst[2*j] = u_comp;
+					line_dst[2*j + 1] = v_comp;
+				}
+			} else {
+				for (j=0; j < line_size/4; j++) {
+					u16 u_comp, v_comp;
+					u_comp = line_src[line_size - 2*j - 2];
+					v_comp = line_src[line_size - 2*j - 1];
+
+					((u16 *)line_dst)[line_size - 2*j - 2] = ((u16 *)line_src)[2*j];
+					((u16 *)line_dst)[line_size - 2*j - 1] = ((u16 *)line_src)[2*j + 1];
+
+					((u16 *)line_dst)[2*j] = u_comp;
+					((u16 *)line_dst)[2*j + 1] = v_comp;
+				}
+			}
+		} else if (ctx->bps==1) {
+			u32 wx = line_size/2;
+			u8 tmp;
+			for (j=0; j < wx; j++) {
+				//tmp = last column
+				tmp = line_src[line_size-1-j];
+
+				//last column = first column
+				line_dst[line_size-1-j] = line_src[j];
+
+				//first column = tmp
+				line_dst[j]=tmp;
+			}
+		} else {
+			line_size /= 2;
+			u32 wx = line_size/2;
+			u16 tmp;
+			for (j=0; j < wx; j++) {
+				//tmp = last column
+				tmp = (u16) ( ((u16 *)line_src) [line_size-1-j] );
+
+				//last column = first column
+				((u16 *)line_dst) [line_size-1-j] = ((u16*)line_src)[j];
+
+				//first column = tmp
+				((u16 *)line_dst) [j]=tmp;
+			}
+		}
+	}
+}
+
+static void horizontal_flip(GF_VFlipCtx *ctx, u8 *src_plane, u8 *dst_plane, u32 height, u32 plane_idx, u32 wiB, u32 *src_stride)
+{
+	u32 i;
+	for (i=0; i<height; i++) {
+		u8 *src_first_line = src_plane + i * src_stride[plane_idx];
+		u8 *dst_first_line = dst_plane + i * ctx->dst_stride[plane_idx];
+
+		horizontal_flip_per_line(ctx, src_first_line, dst_first_line, plane_idx, wiB);
+	}
+}
+
+static void vertical_flip(GF_VFlipCtx *ctx, u8 *src_plane, u8 *dst_plane, u32 height, u32 plane_idx, u32 wiB){
+	u32 hy, i;
+	hy = height/2;
+	for (i=0; i<hy; i++) {
+		u8 *src_first_line = src_plane+ i*ctx->src_stride[plane_idx];
+		u8 *src_last_line  = src_plane+ (height  - 1 - i) * ctx->src_stride[plane_idx];
+
+		u8 *dst_first_line = dst_plane+ i*ctx->dst_stride[plane_idx];
+		u8 *dst_last_line  = dst_plane+ (height  - 1 - i) * ctx->dst_stride[plane_idx];
+
+		memcpy(ctx->line_buffer_vf, src_last_line, wiB);
+		memcpy(dst_last_line, src_first_line, wiB);
+		memcpy(dst_first_line, ctx->line_buffer_vf, wiB);
+	}
+}
+
+static GF_Err vflip_process(GF_Filter *filter)
+{
+	const char *data;
+	u8 *output;
+	u32 size;
+	u32 i;
+	u32 wiB, height; //wiB: width in Bytes of a plane
+	u8 *src_planes[5];
+	u8 *dst_planes[5];
+	GF_FilterPacket *dst_pck;
+	GF_FilterFrameInterface *frame_ifce;
+	GF_VFlipCtx *ctx = gf_filter_get_udta(filter);
+	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_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->passthrough) {
+		gf_filter_pck_forward(pck, ctx->opid);
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_OK;
+	}
+	data = gf_filter_pck_get_data(pck, &size);
+	frame_ifce = gf_filter_pck_get_frame_interface(pck);
+
+	memset(src_planes, 0, sizeof(src_planes));
+	memset(dst_planes, 0, sizeof(dst_planes));
+
+	if (data) {
+		src_planes[0] = (u8 *) data;
+
+		if (ctx->nb_src_planes==1) {
+		} else if (ctx->nb_src_planes==2) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0]*ctx->h;
+		} else if (ctx->nb_src_planes==3) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+		} else if (ctx->nb_src_planes==4) {
+			src_planes[1] = src_planes[0] + ctx->src_stride[0] * ctx->h;
+			src_planes[2] = src_planes[1] + ctx->src_stride[1] * ctx->src_uv_height;
+			src_planes[3] = src_planes[2] + ctx->src_stride[2] * ctx->src_uv_height;
+		}
+	} else if (frame_ifce && frame_ifce->get_plane) {
+		for (i=0; i<4; i++) {
+			if (frame_ifce->get_plane(frame_ifce, i, (const u8 **) &src_planes[i], &ctx->src_stride[i])!=GF_OK)
+				break;
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VFlip] No data associated with packet, not supported\n"));
+		gf_filter_pid_drop_packet(ctx->ipid);
+		return GF_NOT_SUPPORTED;
+	}
+
+	ctx->bps = gf_pixel_get_bytes_per_pixel(ctx->s_pfmt);
+
+
+	if (frame_ifce){
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, ctx->out_size, &output);
+		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;
+	}
+
+
+	dst_planes[0] = output;
+	if (ctx->nb_planes==1) {
+	} else if (ctx->nb_planes==2) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+	} else if (ctx->nb_planes==3) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+		dst_planes[2] = dst_planes[1] + ctx->dst_stride[1]*ctx->dst_uv_height;
+	} else if (ctx->nb_planes==4) {
+		dst_planes[1] = output + ctx->dst_stride[0] * ctx->dst_height;
+		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;
+	}
+
+	//computing of height and wiB
+	//YUYV variations need *2 on horizontal dimension
+	for (i=0; i<ctx->nb_planes; i++) {
+		if (i==0) {
+			if (ctx->packed_422) {
+				wiB = ctx->bps * ctx->dst_width *2;
+			} else {
+				wiB = ctx->bps * ctx->dst_width;
+			}
+			height = ctx->h;
+		}else {
+			//nv12/21
+			if (i==1 && ctx->nb_planes==2) {
+				//half vertical res (/2)
+				//half horizontal res (/2) but two chroma packed per pixel (*2)
+				wiB = ctx->bps * ctx->dst_width;
+				height = ctx->h / 2;
+			} else if (ctx->nb_planes>=3) {
+				u32 div_x, div_y;
+				//alpha/depth/other plane, treat as luma plane
+				if (i==3 && ctx->nb_planes==4) {
+					wiB = ctx->bps * ctx->dst_width;
+					height = ctx->h;
+				}else if (i==1 || i==2) {
+					div_x = (ctx->src_stride[1]==ctx->src_stride[0]) ? 1 : 2;
+					div_y = (ctx->src_uv_height==ctx->h) ? 1 : 2;
+					height = ctx->dst_height;
+					height /= div_y;
+					wiB = ctx->bps * ctx->dst_width;
+					wiB /= div_x;
+				}
+			}
+		}
+
+		//processing according selected mode
+		if (ctx->mode==VFLIP_VERT){
+			vertical_flip(ctx, src_planes[i], dst_planes[i], height, i, wiB);
+		}else if (ctx->mode==VFLIP_HORIZ){
+			horizontal_flip(ctx, src_planes[i], dst_planes[i], height, i, wiB, ctx->src_stride);
+		}else if (ctx->mode==VFLIP_BOTH){
+			vertical_flip(ctx, src_planes[i], dst_planes[i], height, i, wiB);
+			horizontal_flip(ctx, dst_planes[i], dst_planes[i], height, i, wiB, ctx->dst_stride);
+		}
+	}
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pid_drop_packet(ctx->ipid);
+	return GF_OK;
+}
+
+
+static GF_Err vflip_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	u32 w, h, stride, pfmt;
+	GF_Fraction sar;
+	GF_VFlipCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		if (ctx->opid) {
+			gf_filter_pid_remove(ctx->opid);
+		}
+		return GF_OK;
+	}
+	if (! gf_filter_pid_check_caps(pid))
+		return GF_NOT_SUPPORTED;
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+	}
+	//copy properties at init or reconfig
+	gf_filter_pid_copy_properties(ctx->opid, pid);
+
+	if (!ctx->ipid) {
+		ctx->ipid = pid;
+	}
+	w = h = pfmt = stride = 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_STRIDE);
+	if (p) stride = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	if (p) pfmt = p->value.uint;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+	if (p) sar = p->value.frac;
+	else sar.den = sar.num = 1;
+
+	if (!w || !h || !pfmt) {
+		ctx->passthrough = GF_TRUE;
+		return GF_OK;
+	}
+
+	if ((ctx->w == w) && (ctx->h == h) && (ctx->s_pfmt == pfmt) && (ctx->stride == stride)) {
+		//nothing to reconfigure
+		ctx->passthrough = GF_TRUE;
+	} else if (ctx->mode==VFLIP_OFF) {
+		ctx->passthrough = GF_TRUE;
+	} else {
+		Bool res;
+
+		ctx->w = w;
+		ctx->h = h;
+		ctx->s_pfmt = pfmt;
+		ctx->stride = stride;
+		ctx->dst_width  = w;
+		ctx->dst_height = h;
+		ctx->passthrough = GF_FALSE;
+
+		//get layout info for source
+		memset(ctx->src_stride, 0, sizeof(ctx->src_stride));
+		if (ctx->stride) ctx->src_stride[0] = ctx->stride;
+
+		res = gf_pixel_get_size_info(pfmt, w, h, &ctx->out_src_size, &ctx->src_stride[0], &ctx->src_stride[1], &ctx->nb_src_planes, &ctx->src_uv_height);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VFlip] Failed to query source pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		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];
+
+
+		//get layout info for dest
+		memset(ctx->dst_stride, 0, sizeof(ctx->dst_stride));
+		res = gf_pixel_get_size_info(pfmt, ctx->dst_width, ctx->dst_height, &ctx->out_size, &ctx->dst_stride[0], &ctx->dst_stride[1], &ctx->nb_planes, &ctx->dst_uv_height);
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[VFlip] Failed to query output pixel format characteristics\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		if (ctx->nb_planes==3) ctx->dst_stride[2] = ctx->dst_stride[1];
+		if (ctx->nb_planes==4) ctx->dst_stride[3] = ctx->dst_stride[0];
+
+
+		ctx->w = w;
+		ctx->h = h;
+		ctx->s_pfmt = pfmt;
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[VFlip] Configured output full frame size %dx%d\n", ctx->w, ctx->h));
+
+		ctx->line_buffer_vf = gf_realloc(ctx->line_buffer_vf, sizeof(char)*ctx->dst_stride[0] );
+		ctx->line_buffer_hf = gf_realloc(ctx->line_buffer_hf, sizeof(char)*ctx->src_stride[0] );
+
+		ctx->packed_422 = GF_FALSE;
+		switch (pfmt) {
+		//for YUV 422, adjust to multiple of 2 on horizontal dim
+		case GF_PIXEL_YUYV:
+		case GF_PIXEL_YVYU:
+		case GF_PIXEL_UYVY:
+		case GF_PIXEL_VYUY:
+			ctx->packed_422 = GF_TRUE;
+			break;
+		}
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_WIDTH, &PROP_UINT(ctx->dst_width));
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_HEIGHT, &PROP_UINT(ctx->dst_height));
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE, &PROP_UINT(ctx->dst_stride[0] ));
+	if (ctx->nb_planes>1)
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STRIDE_UV, &PROP_UINT(ctx->dst_stride[1]));
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_SAR, &PROP_FRAC(sar) );
+
+	//an access unit corresponds to a single packet
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+void vflip_finalize(GF_Filter *filter)
+{
+	GF_VFlipCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->line_buffer_vf) gf_free(ctx->line_buffer_vf);
+	if (ctx->line_buffer_hf) gf_free(ctx->line_buffer_hf);
+}
+
+
+#define OFFS(_n)	#_n, offsetof(GF_VFlipCtx, _n)
+static GF_FilterArgs VFlipArgs[] =
+{
+		{ OFFS(mode), "flip mode\n"
+		"- off: no flipping (passthrough)\n"
+		"- vert: vertical flip\n"
+		"- horiz: horizontal flip\n"
+		"- both: horizontal and vertical flip"
+		"", GF_PROP_UINT, "vert", "off|vert|horiz|both", GF_FS_ARG_UPDATE | GF_FS_ARG_HINT_ADVANCED},
+		{0}
+};
+
+static const GF_FilterCapability VFlipCaps[] =
+{
+		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)
+};
+
+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")
+		.private_size = sizeof(GF_VFlipCtx),
+		.flags = GF_FS_REG_EXPLICIT_ONLY,
+		.args = VFlipArgs,
+		.configure_pid = vflip_configure_pid,
+		SETCAPS(VFlipCaps),
+		.process = vflip_process,
+		.finalize = vflip_finalize,
+};
+
+
+
+const GF_FilterRegister *vflip_register(GF_FilterSession *session)
+{
+	return &VFlipRegister;
+}

gpac-1.0.0.tar.gz/src/filters/write_generic.c Added

@@ -0,0 +1,1063 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / generic stream to file 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/internal/isomedia_dev.h>
+
+enum
+{
+	DECINFO_NO=0,
+	DECINFO_FIRST,
+	DECINFO_SAP,
+	DECINFO_AUTO
+};
+
+typedef struct
+{
+	//opts
+	Bool exporter, frame, split;
+	u32 sstart, send;
+	u32 pfmt, afmt, decinfo;
+	GF_Fraction dur;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 codecid;
+	Bool is_mj2k;
+	u32 sample_num;
+
+	const char *dcfg;
+	u32 dcfg_size;
+	Bool cfg_sent;
+
+	GF_Fraction64 duration;
+	Bool first;
+
+	GF_BitStream *bs;
+
+	u32 target_pfmt, target_afmt;
+	Bool is_bmp;
+	u32 is_wav;
+	u32 w, h, stride;
+	u64 nb_bytes;
+	Bool dash_mode;
+
+	u64 first_dts_plus_one;
+} GF_GenDumpCtx;
+
+
+GF_Err writegen_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 cid, chan, sr, w, h, stype, pf, sfmt, av1mode, nb_bps;
+	const char *name, *mimetype;
+	char szExt[GF_4CC_MSIZE], szCodecExt[30], *sep;
+	const GF_PropertyValue *p;
+	GF_GenDumpCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		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;
+	cid = p->value.uint;
+
+	ctx->codecid = cid;
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		ctx->first = GF_TRUE;
+	}
+
+	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_DECODER_CONFIG, NULL);
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	stype = p ? p->value.uint : 0;
+
+	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);
+	chan = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+	sfmt = p ? p->value.uint : GF_AUDIO_FMT_S16;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_BPS);
+	nb_bps = p ? p->value.uint : 0;
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	ctx->w = w = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	ctx->h = h = p ? p->value.uint : 0;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_PIXFMT);
+	pf = p ? p->value.uint : 0;
+	if (!pf) pf = GF_PIXEL_YUV;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (p) {
+		ctx->dcfg = p->value.data.ptr;
+		ctx->dcfg_size = p->value.data.size;
+	}
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DASH_MODE);
+	ctx->dash_mode = (p && p->value.uint) ? GF_TRUE : GF_FALSE;
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+
+	//special case for xml text, override to xml
+	switch (cid) {
+	case GF_CODECID_META_XML:
+	case GF_CODECID_SUBS_XML:
+		strcpy(szCodecExt, "xml");
+		break;
+	default:
+		strncpy(szCodecExt, gf_codecid_file_ext(cid), 29);
+		szCodecExt[29]=0;
+		sep = strchr(szCodecExt, '|');
+		if (sep) sep[0] = 0;
+		break;
+	}
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING(szCodecExt) );
+
+	mimetype = gf_codecid_mime(cid);
+
+	switch (cid) {
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_UNFRAMED_LATM);
+		if (p && p->value.boolean) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("latm") );
+		}
+		break;
+	case GF_CODECID_PNG:
+	case GF_CODECID_JPEG:
+		ctx->split = GF_TRUE;
+		break;
+	case GF_CODECID_J2K:
+		ctx->split = GF_TRUE;
+		ctx->is_mj2k = GF_TRUE;
+		break;
+	case GF_CODECID_AMR:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		ctx->dcfg = "#!AMR\n";
+		ctx->dcfg_size = 6;
+		ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_AMR_WB:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		ctx->dcfg = "#!AMR-WB\n";
+		ctx->dcfg_size = 9;
+		ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_SMV:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		ctx->dcfg = "#!SMV\n";
+		ctx->dcfg_size = 6;
+		ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_EVRC_PV:
+	case GF_CODECID_EVRC:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		ctx->dcfg = "#!EVRC\n";
+		ctx->dcfg_size = 7;
+		ctx->decinfo = DECINFO_FIRST;
+		break;
+
+	case GF_CODECID_FLAC:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		ctx->decinfo = DECINFO_FIRST;
+		break;
+
+
+	case GF_CODECID_SIMPLE_TEXT:
+		if (!gf_filter_pid_get_property(pid, GF_PROP_PID_MIME))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		if (ctx->decinfo == DECINFO_AUTO)
+			ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_META_TEXT:
+		if (!gf_filter_pid_get_property(pid, GF_PROP_PID_MIME))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		if (ctx->decinfo == DECINFO_AUTO)
+			ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_META_XML:
+		if (!gf_filter_pid_get_property(pid, GF_PROP_PID_MIME))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		if (ctx->decinfo == DECINFO_AUTO)
+			ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_SUBS_TEXT:
+		if (!gf_filter_pid_get_property(pid, GF_PROP_PID_MIME))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		if (ctx->decinfo == DECINFO_AUTO)
+			ctx->decinfo = DECINFO_FIRST;
+		break;
+	case GF_CODECID_SUBS_XML:
+		if (!gf_filter_pid_get_property(pid, GF_PROP_PID_MIME))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+
+		if (!ctx->frame) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Subtitles re-assembling is not supported yet\n"));
+			return GF_NOT_SUPPORTED;
+		}
+		ctx->split = GF_TRUE;
+		if (ctx->decinfo == DECINFO_AUTO)
+			ctx->decinfo = DECINFO_FIRST;
+		break;
+
+	case GF_CODECID_AV1:
+		av1mode = 0;
+		p = gf_filter_pid_get_property_str(ctx->ipid, "obu:mode");
+		if (p) av1mode = p->value.uint;
+		if (av1mode==1) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("av1b") );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("video/x-av1b") );
+		} else if (av1mode==2) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("ivf") );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("video/x-ivf") );
+		} else {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("obu") );
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("video/x-av1") );
+		}
+		break;
+	case GF_CODECID_RAW:
+		ctx->dcfg = NULL;
+		ctx->dcfg_size = 0;
+		if (stype==GF_STREAM_VISUAL) {
+			strcpy(szExt, gf_pixel_fmt_sname(ctx->target_pfmt ? ctx->target_pfmt : pf));
+			p = gf_filter_pid_caps_query(ctx->opid, GF_PROP_PID_FILE_EXT);
+			if (p) {
+				strncpy(szExt, p->value.string, GF_4CC_MSIZE-1);
+				szExt[GF_4CC_MSIZE-1] = 0;
+				if (!strcmp(szExt, "bmp")) {
+					ctx->is_bmp = GF_TRUE;
+					//request BGR
+					ctx->target_pfmt = GF_PIXEL_BGR;
+					ctx->split = GF_TRUE;
+				} else {
+					ctx->target_pfmt = gf_pixel_fmt_parse(szExt);
+					if (!ctx->target_pfmt) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Cannot guess pixel format from extension type %s\n", szExt));
+						return GF_NOT_SUPPORTED;
+					}
+					strcpy(szExt, gf_pixel_fmt_sname(ctx->target_pfmt));
+				}
+				//forcing pixel format regardless of extension
+				if (ctx->pfmt) {
+					if (pf != ctx->pfmt) {
+						gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->pfmt));
+						//make sure we reconfigure
+						ctx->codecid = 0;
+						pf = ctx->pfmt;
+					}
+				}
+				//use extension to derive pixel format
+				else if (pf != ctx->target_pfmt) {
+					gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_PIXFMT, &PROP_UINT(ctx->target_pfmt));
+					strcpy(szExt, gf_pixel_fmt_sname(ctx->target_pfmt));
+					//make sure we reconfigure
+					ctx->codecid = 0;
+				}
+			}
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_STRIDE);
+			ctx->stride = p ? p->value.uint : 0;
+
+			if (!ctx->stride) {
+				gf_pixel_get_size_info(ctx->target_pfmt, ctx->w, ctx->h, NULL, &ctx->stride, NULL, NULL, NULL);
+			}
+
+		} else if (stype==GF_STREAM_AUDIO) {
+			strcpy(szExt, gf_audio_fmt_sname(ctx->target_pfmt ? ctx->target_afmt : sfmt));
+			p = gf_filter_pid_caps_query(ctx->opid, GF_PROP_PID_FILE_EXT);
+			if (p) {
+				strncpy(szExt, p->value.string, GF_4CC_MSIZE-1);
+				szExt[GF_4CC_MSIZE-1] = 0;
+				if (!strcmp(szExt, "wav")) {
+					ctx->is_wav = GF_TRUE;
+					//request PCMs16 ?
+//					ctx->target_afmt = GF_AUDIO_FMT_S16;
+					ctx->target_afmt = sfmt;
+				} else {
+					ctx->target_afmt = gf_audio_fmt_parse(szExt);
+					strcpy(szExt, gf_audio_fmt_sname(ctx->target_afmt));
+				}
+				//forcing sample format regardless of extension
+				if (ctx->afmt) {
+					if (sfmt != ctx->afmt) {
+						gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->afmt));
+						//make sure we reconfigure
+						ctx->codecid = 0;
+						sfmt = ctx->afmt;
+					}
+				}
+				//use extension to derive sample format
+				else if (sfmt != ctx->target_afmt) {
+					gf_filter_pid_negociate_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT, &PROP_UINT(ctx->target_afmt));
+					strcpy(szExt, gf_audio_fmt_sname(ctx->target_afmt));
+					//make sure we reconfigure
+					ctx->codecid = 0;
+				}
+			}
+
+		} else {
+			strcpy(szExt, gf_4cc_to_str(cid));
+		}
+		if (ctx->is_bmp) strcpy(szExt, "bmp");
+		else if (ctx->is_wav) {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_REPLACE) );
+			strcpy(szExt, "wav");
+		} else if (!strlen(szExt)) strcpy(szExt, "raw");
+
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING( szExt ) );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("application/octet-string") );
+		if (!ctx->codecid) return GF_OK;
+		break;
+
+	default:
+		if (!strcmp(szCodecExt, "raw")) {
+			strcpy(szExt, gf_4cc_to_str(cid));
+			if (!strlen(szExt)) strcpy(szExt, "raw");
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING( szExt ) );
+		} else {
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING( szCodecExt ) );
+		}
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING(mimetype) );
+		break;
+	}
+
+	if (ctx->decinfo == DECINFO_AUTO)
+		ctx->decinfo = DECINFO_NO;
+
+	name = gf_codecid_name(cid);
+	if (ctx->exporter) {
+		if (w && h) {
+			if (cid==GF_CODECID_RAW) name = gf_pixel_fmt_name(pf);
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - Size %dx%d\n", name, w, h));
+		} else if (sr && chan) {
+			if (cid==GF_CODECID_RAW) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting PCM %s SampleRate %d %d channels %d bits per sample\n", gf_audio_fmt_name(sfmt), sr, chan, gf_audio_fmt_bit_depth(sfmt) ));
+			} else {
+				if (!nb_bps)
+					nb_bps = gf_audio_fmt_bit_depth(sfmt);
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s - SampleRate %d %d channels %d bits per sample\n", name, sr, chan, nb_bps ));
+			}
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", name));
+		}
+	}
+
+	//avoid creating a file when dumping individual samples
+	if (ctx->split) {
+		p = gf_filter_pid_get_property(pid, GF_PROP_PID_NB_FRAMES);
+		if (!p || (p->value.uint>1))
+			gf_filter_pid_set_property(ctx->opid, GF_PROP_PCK_FILENUM, &PROP_UINT(0) );
+		else
+			ctx->split = GF_FALSE;
+	} else if (ctx->frame) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PCK_FILENUM, &PROP_UINT(0) );
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p) ctx->duration = p->value.lfrac;
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+static GF_FilterPacket *writegen_write_j2k(GF_GenDumpCtx *ctx, char *data, u32 data_size, GF_FilterPacket *in_pck)
+{
+	u32 size;
+	u8 *output;
+	GF_FilterPacket *dst_pck;
+	char sig[8];
+	sig[0] = sig[1] = sig[2] = 0;
+	sig[3] = 0xC;
+	sig[4] = 'j';
+	sig[5] = 'P';
+	sig[6] = sig[7] = ' ';
+
+	if ((data_size>16) && !memcmp(data, sig, 8)) {
+		return gf_filter_pck_new_ref(ctx->opid, NULL, 0, in_pck);
+	}
+
+	size = data_size + 8*4 /*jP%20%20 + ftyp*/ + ctx->dcfg_size + 8;
+
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs, output, size);
+
+	gf_bs_write_u32(ctx->bs, 12);
+	gf_bs_write_u32(ctx->bs, GF_ISOM_BOX_TYPE_JP);
+	gf_bs_write_u32(ctx->bs, 0x0D0A870A);
+	gf_bs_write_u32(ctx->bs, 20);
+	gf_bs_write_u32(ctx->bs, GF_ISOM_BOX_TYPE_FTYP);
+	gf_bs_write_u32(ctx->bs, GF_ISOM_BRAND_JP2);
+	gf_bs_write_u32(ctx->bs, 0);
+	gf_bs_write_u32(ctx->bs, GF_ISOM_BRAND_JP2);
+
+	//todo, write colr and other info ?
+	if (ctx->dcfg) {
+		gf_bs_write_u32(ctx->bs, 8+ctx->dcfg_size);
+		gf_bs_write_u32(ctx->bs, GF_ISOM_BOX_TYPE_JP2H);
+		gf_bs_write_data(ctx->bs, ctx->dcfg, ctx->dcfg_size);
+	}
+	gf_bs_write_data(ctx->bs, data, data_size);
+
+	return dst_pck;
+}
+
+#ifdef WIN32
+#include <windows.h>
+#else
+typedef struct tagBITMAPFILEHEADER
+{
+	u16	bfType;
+	u32	bfSize;
+	u16	bfReserved1;
+	u16	bfReserved2;
+	u32 bfOffBits;
+} BITMAPFILEHEADER;
+
+typedef struct tagBITMAPINFOHEADER {
+	u32	biSize;
+	s32	biWidth;
+	s32	biHeight;
+	u16	biPlanes;
+	u16	biBitCount;
+	u32	biCompression;
+	u32	biSizeImage;
+	s32	biXPelsPerMeter;
+	s32	biYPelsPerMeter;
+	u32	biClrUsed;
+	u32	biClrImportant;
+} BITMAPINFOHEADER;
+
+#define BI_RGB        0L
+
+#endif
+
+static GF_FilterPacket *writegen_write_bmp(GF_GenDumpCtx *ctx, char *data, u32 data_size)
+{
+	u32 size;
+	u8 *output;
+	BITMAPFILEHEADER fh;
+	BITMAPINFOHEADER fi;
+	GF_FilterPacket *dst_pck;
+	u32 i;
+
+	size = ctx->w*ctx->h*3 + 54; //14 + 40 = size of BMP file header and BMP file info;
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+	memset(&fh, 0, sizeof(fh));
+	fh.bfType = 19778;
+	fh.bfOffBits = 54;
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs, output, size);
+
+	gf_bs_write_data(ctx->bs, (const char *) &fh.bfType, 2);
+	gf_bs_write_data(ctx->bs, (const char *) &fh.bfSize, 4);
+	gf_bs_write_data(ctx->bs, (const char *) &fh.bfReserved1, 2);
+	gf_bs_write_data(ctx->bs, (const char *) &fh.bfReserved2, 2);
+	gf_bs_write_data(ctx->bs, (const char *) &fh.bfOffBits, 4);
+
+	memset(&fi, 0, sizeof(char)*40);
+	fi.biSize = 40;
+	fi.biWidth = ctx->w;
+	fi.biHeight = ctx->h;
+	fi.biPlanes = 1;
+	fi.biBitCount = 24;
+	fi.biCompression = BI_RGB;
+	fi.biSizeImage = ctx->w * ctx->h * 3;
+
+	memcpy(output+14, &fi, sizeof(char)*40);
+	//reverse lines
+	output += sizeof(u8) * 54;
+	for (i=ctx->h; i>0; i--) {
+		u8 *ptr = data + (i-1)*ctx->stride;
+		memcpy(output, ptr, sizeof(u8)*3*ctx->w);
+		output += 3*ctx->w;
+	}
+	return dst_pck;
+}
+
+static void writegen_write_wav_header(GF_GenDumpCtx *ctx)
+{
+	u32 size;
+	u8 *output;
+	GF_FilterPacket *dst_pck;
+	const GF_PropertyValue *p;
+	u32 nb_ch, sample_rate, afmt, bps;
+	const char chunkID[] = {'R', 'I', 'F', 'F'};
+	const char format[] = {'W', 'A', 'V', 'E'};
+	const char subchunk1ID[] = {'f', 'm', 't', ' '};
+	const char subchunk2ID[] = {'d', 'a', 't', 'a'};
+
+	if (ctx->is_wav!=1) return;
+	ctx->is_wav = 2;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_SAMPLE_RATE);
+	if (!p) return;
+	sample_rate = p->value.uint;
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_NUM_CHANNELS);
+	if (!p) return;
+	nb_ch = p->value.uint;
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_AUDIO_FORMAT);
+	if (!p) return;
+	afmt = p->value.uint;
+
+	bps = gf_audio_fmt_bit_depth(afmt);
+
+	size = 44;
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+
+	if (!ctx->bs) ctx->bs = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs, output, size);
+
+	gf_bs_write_data(ctx->bs, chunkID, 4);
+	gf_bs_write_u32_le(ctx->bs, (u32) ctx->nb_bytes + 36);
+	gf_bs_write_data(ctx->bs, format, 4);
+
+	gf_bs_write_data(ctx->bs, subchunk1ID, 4);
+	gf_bs_write_u32_le(ctx->bs, 16); //subchunk1 size
+	gf_bs_write_u16_le(ctx->bs, 1); //audio format
+	gf_bs_write_u16_le(ctx->bs, nb_ch);
+	gf_bs_write_u32_le(ctx->bs, sample_rate);
+	gf_bs_write_u32_le(ctx->bs, sample_rate * nb_ch * bps / 8); //byte rate
+	gf_bs_write_u16_le(ctx->bs, nb_ch * bps / 8); // block align
+	gf_bs_write_u16_le(ctx->bs, bps);
+
+	gf_bs_write_data(ctx->bs, subchunk2ID, 4);
+	gf_bs_write_u32_le(ctx->bs, (u32) ctx->nb_bytes);
+
+	gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+	gf_filter_pck_set_byte_offset(dst_pck, 0);
+	gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+	gf_filter_pck_send(dst_pck);
+}
+
+GF_Err writegen_process(GF_Filter *filter)
+{
+	GF_GenDumpCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	char *data;
+	u32 pck_size;
+	Bool do_abort = GF_FALSE;
+	Bool split = ctx->split;
+	if (!ctx->ipid) return GF_EOS;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck || !ctx->codecid) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->is_wav) writegen_write_wav_header(ctx);
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+	ctx->sample_num++;
+
+	if (ctx->sstart) {
+		if (ctx->sstart > ctx->sample_num) {
+			gf_filter_pid_drop_packet(ctx->ipid);
+			return GF_OK;
+		}
+		if ((ctx->sstart <= ctx->send) && (ctx->sample_num>ctx->send) ) {
+			do_abort = GF_TRUE;
+		}
+	} else if (ctx->dur.num && ctx->dur.den) {
+		u64 dts = gf_filter_pck_get_dts(pck);
+		if (dts==GF_FILTER_NO_TS)
+		dts = gf_filter_pck_get_cts(pck);
+
+		if (!ctx->first_dts_plus_one) {
+			ctx->first_dts_plus_one = dts+1;
+		} else {
+			if (ctx->dur.den * (dts + 1 - ctx->first_dts_plus_one) > ctx->dur.num * gf_filter_pck_get_timescale(pck)) {
+				do_abort = GF_TRUE;
+			}
+		}
+	}
+	if (do_abort) {
+		GF_FilterEvent evt;
+		gf_filter_pid_drop_packet(ctx->ipid);
+		GF_FEVT_INIT(evt, GF_FEVT_STOP, ctx->ipid);
+		gf_filter_pid_send_event(ctx->ipid, &evt);
+		return GF_OK;
+	}
+
+	//except in dash mode, force a new file if GF_PROP_PCK_FILENUM is set
+	if (!ctx->dash_mode && (gf_filter_pck_get_property(pck, GF_PROP_PCK_FILENUM) != NULL)) {
+		ctx->cfg_sent = GF_FALSE;
+		ctx->first = GF_TRUE;
+	}
+
+	if (ctx->frame) {
+		split = GF_TRUE;
+	} else if (ctx->dcfg_size && gf_filter_pck_get_sap(pck) && !ctx->is_mj2k && (ctx->decinfo!=DECINFO_NO) && !ctx->cfg_sent) {
+		dst_pck = gf_filter_pck_new_shared(ctx->opid, ctx->dcfg, ctx->dcfg_size, NULL);
+		gf_filter_pck_merge_properties(pck, dst_pck);
+		gf_filter_pck_set_framing(dst_pck, ctx->first, GF_FALSE);
+		ctx->first = GF_FALSE;
+		gf_filter_pck_set_readonly(dst_pck);
+		gf_filter_pck_send(dst_pck);
+		if ((ctx->decinfo==DECINFO_FIRST) && !ctx->split) {
+			ctx->dcfg_size = 0;
+			ctx->dcfg = NULL;
+		}
+		ctx->cfg_sent = GF_TRUE;
+		return GF_OK;
+	}
+	ctx->cfg_sent = GF_FALSE;
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+	if (ctx->is_mj2k) {
+		dst_pck = writegen_write_j2k(ctx, data, pck_size, pck);
+	} else if (ctx->is_bmp) {
+		dst_pck = writegen_write_bmp(ctx, data, pck_size);
+	} else if (ctx->is_wav && ctx->first) {
+		u8 * output;
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid, 44, &output);
+		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_FALSE);
+		gf_filter_pck_set_corrupted(dst_pck, GF_TRUE);
+		ctx->first = GF_FALSE;
+		gf_filter_pck_send(dst_pck);
+		ctx->nb_bytes += 44;
+		return GF_OK;
+	} else {
+		dst_pck = gf_filter_pck_new_ref(ctx->opid, NULL, 0, pck);
+	}
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	//don't keep byte offset
+	gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+
+	if (split) {
+		gf_filter_pck_set_property(dst_pck, GF_PROP_PCK_FILENUM, &PROP_UINT(ctx->sample_num) );
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_TRUE);
+	} else {
+		gf_filter_pck_set_framing(dst_pck, ctx->first, GF_FALSE);
+		ctx->first = GF_FALSE;
+	}
+
+	gf_filter_pck_send(dst_pck);
+	gf_filter_pck_set_seek_flag(dst_pck, 0);
+	ctx->nb_bytes += pck_size;
+
+	if (ctx->exporter) {
+		u32 timescale = gf_filter_pck_get_timescale(pck);
+		u64 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 += gf_filter_pck_get_duration(pck);
+			ts *= ctx->duration.den;
+			ts /= timescale;
+			gf_set_progress("Exporting", ts, ctx->duration.num);
+		}
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+/*
+	We list capabilities per codec type, associating the codec type to the file extension. This allows,
+	when matching to an output filter accepting a given file extension to match the codec type in write_gen caps, and
+	setup the right filter chain
+*/
+static GF_FilterCapability GenDumpCaps[] =
+{
+	//raw color dump YUV and RGB - keep it as first for field extension assignment
+	//cf below
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "gpac"),
+	{0},
+	//raw audio dump - keep it as second for field extension assignment
+	//cf below
+	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),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "gpac" ),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "bmp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "image/bmp"),
+	{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_RAW),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "wav"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/wav|audio/wave"),
+	{0},
+
+	//we accept unframed AVC (annex B format)
+	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_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_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "264|h264|avc|svc|mvc"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/avc|video/h264|video/svc|video/mvc"),
+	{0},
+
+	//we accept unframed HEVC (annex B format)
+	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_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_LHVC),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "265|h265|hvc|hevc|shvc|lhvc"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/hevc|video/lhvc|video/shvc|video/mhvc"),
+	{0},
+
+	//we accept unframed OBU (without size field)
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AV1),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP8),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP9),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_VP10),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "obu|av1|av1b|ivf"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/x-ivf|video/av1"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG4_PART2),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_BOOL(GF_CAPS_INPUT,GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "cmp|m4ve"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/mp4v-es"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_H263),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_S263),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "h263|263|s263"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/h263"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG1),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "m1v"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/mpgv-es"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_422),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SNR),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_HIGH),
+	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_SIMPLE),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_MPEG2_SPATIAL),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "m2v"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/mpgv-es"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4H),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AP4X),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCH),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCS),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_APCN),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "prores"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/prores"),
+	{0},
+
+	//we accept unframed AAC + ADTS
+	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),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED,GF_PROP_PID_UNFRAMED_LATM, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "aac|adts"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-m4a|audio/aac|audio/aacp|audio/x-aac"),
+	{0},
+
+	//we accept unframed AAC + LATM
+	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_LATM, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "latm"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/aac+latm"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_PNG),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "png"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "image/png"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_JPEG),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "jpg|jpeg"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "image/jpg"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_J2K),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "jp2|j2k"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "image/jp2"),
+	{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_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "mp3|mp1|mp2"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/mp3|audio/x-mp3"),
+	{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_AMR),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_AMR_WB),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "amr"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/amr"),
+	{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_SMV),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "smv"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/smv"),
+	{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_EVRC_PV),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_EVRC),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "evc"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/evrc"),
+	{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_AC3),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "ac3"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-ac3|audio/ac3"),
+	{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_EAC3),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "eac3"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-eac3|audio/eac3"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SIMPLE_TEXT),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_META_TEXT),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SUBS_TEXT),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "txt"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "x-subtitle/srt|subtitle/srt|text/srt"),
+	{0},
+
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_META_XML),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SUBS_XML),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "xml|txml|ttml"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "subtitle/ttml|text/ttml|application/xml+ttml"),
+	{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_QCELP),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "qcelp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/qcelp"),
+	{0},
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_VISUAL),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_THEORA),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "theo"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "video/x-theora"),
+	{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_VORBIS),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "vorb"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-vorbis"),
+	{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_SPEEX),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "spx"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/x-speex"),
+	{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_FLAC),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "flac"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/flac"),
+	{0},
+
+	//anything else: only for explicit dump (filter loaded on purpose), otherwise don't load for filter link resolution
+	CAP_UINT(GF_CAPS_OUTPUT_LOADED_FILTER, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "*"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "*"),
+	//for the rest, we include everything, only specifies excluded ones from above and non-handled ones
+	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_AVC),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_AVC_PS),
+	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_MVC),
+	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_MPEG4_PART2),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	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_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_RAW),
+
+	//WebVTT needs rewrite
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_WEBVTT),
+	//systems streams not dumpable to file
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_BIFS),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_BIFS_V2),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_OD_V1),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_OD_V2),
+	//this one need QCP
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_QCELP),
+
+	//other not supported (yet)
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_THEORA),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED,  GF_PROP_PID_CODECID, GF_CODECID_VORBIS)
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_GenDumpCtx, _n)
+static GF_FilterArgs GenDumpArgs[] =
+{
+	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(pfmt), "pixel format for raw extract. If not set, derived from extension", GF_PROP_PIXFMT, "none", NULL, 0},
+	{ OFFS(afmt), "audio format for raw extract. If not set, derived from extension", GF_PROP_PCMFMT, "none", NULL, 0},
+	{ OFFS(decinfo), "decoder config insert mode\n"
+	"- no: never inserted\n"
+	"- first: inserted on first packet\n"
+	"- sap: inserted at each SAP\n"
+	"- auto: selects between no and first based on media type", GF_PROP_UINT, "auto", "no|first|sap|auto", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(split), "force one file per decoded frame.", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(frame), "force single frame dump with no rewrite. In this mode, all codecids are supported", GF_PROP_BOOL, "false", NULL, 0},
+	{ OFFS(sstart), "start number of frame to forward. If 0, all samples are forwarded", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(send), "end number of frame to forward. If less than start frame, all samples after start are forwarded", GF_PROP_UINT, "0", NULL, 0},
+	{ OFFS(dur), "duration of media to forward after first sample. If 0, all samples are forwarded", GF_PROP_FRACTION, "0", NULL, 0},
+	{0}
+};
+
+static GF_Err writegen_initialize(GF_Filter *filter);
+
+void writegen_finalize(GF_Filter *filter)
+{
+	GF_GenDumpCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+}
+
+GF_FilterRegister GenDumpRegister = {
+	.name = "writegen",
+	GF_FS_SET_DESCRIPTION("Stream to file")
+	GF_FS_SET_HELP("Generic single stream to file converter, used when extracting/converting PIDs.\n"
+	"The writegen filter should usually not be explicetly loaded without a source ID specified, since the filter would likely match any pid connection.")
+	.private_size = sizeof(GF_GenDumpCtx),
+	.args = GenDumpArgs,
+	.initialize = writegen_initialize,
+	.finalize = writegen_finalize,
+	SETCAPS(GenDumpCaps),
+	.configure_pid = writegen_configure_pid,
+	.process = writegen_process
+};
+
+static const GF_FilterCapability FrameDumpCaps[] =
+{
+	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_STREAM_TYPE, GF_STREAM_UNKNOWN),
+	CAP_UINT(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE)
+};
+
+static GF_Err writegen_initialize(GF_Filter *filter)
+{
+	GF_GenDumpCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->frame) {
+		return gf_filter_override_caps(filter, (const GF_FilterCapability *) FrameDumpCaps, sizeof(FrameDumpCaps) / sizeof(GF_FilterCapability));
+	}
+	return GF_OK;
+}
+
+
+const GF_FilterRegister *writegen_register(GF_FilterSession *session)
+{
+
+	//assign runtime caps on first load
+	if (!strcmp(GenDumpCaps[3].val.value.string, "gpac")) {
+		GenDumpCaps[3].val.value.string = (char *) gf_pixel_fmt_all_shortnames();
+		GenDumpCaps[8].val.value.string = (char *) gf_audio_fmt_all_shortnames();
+		GenDumpArgs[1].min_max_enum = gf_pixel_fmt_all_names();
+		GenDumpArgs[2].min_max_enum = gf_audio_fmt_all_names();
+	}
+
+	return &GenDumpRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/write_nhml.c Added

@@ -0,0 +1,953 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NHML stream to file 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/base_coding.h>
+
+#include <gpac/internal/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_ZLIB
+#include <zlib.h>
+#endif
+
+typedef struct
+{
+	//opts
+	const char *name;
+	Bool exporter, dims, pckp, nhmlonly, chksum;
+	FILE *filep;
+
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid_nhml, *opid_mdia, *opid_info;
+
+	u32 codecid;
+	u32 streamtype;
+	u32 oti;
+	u32 chan, sr, bps, w, h;
+	const char *dcfg;
+	u32 dcfg_size;
+	char *media_file, *info_file;
+	const char *szRootName;
+
+	GF_Fraction64 duration;
+	Bool first;
+	Bool uncompress, is_dims, is_stpp;
+
+	GF_BitStream *bs_w, *bs_r;
+	u8 *nhml_buffer;
+	u32 nhml_buffer_size;
+	char *b64_buffer;
+	u32 b64_buffer_size;
+	u64 mdia_pos;
+	u32 pck_num;
+
+	Bool side_streams_config;
+} GF_NHMLDumpCtx;
+
+GF_Err nhmldump_config_side_stream(GF_Filter *filter, GF_NHMLDumpCtx *ctx)
+{
+	char *mime=NULL, *name;
+	char fileName[GF_MAX_PATH+1];
+	const GF_PropertyValue *p;
+	GF_FileIO *gfio = NULL;
+
+	if (ctx->name) {
+		strncpy(fileName, ctx->name, GF_MAX_PATH);
+		fileName[GF_MAX_PATH] = 0;
+	} else {
+		char *url = gf_filter_pid_get_destination(ctx->opid_nhml);
+		if (url) {
+			if (!strncmp(url, "gfio://", 7)) {
+				gfio = gf_fileio_from_url(url);
+				strncpy(fileName, gf_fileio_translate_url(url), GF_MAX_PATH);
+			} else {
+				strncpy(fileName, url, GF_MAX_PATH);
+			}
+			fileName[GF_MAX_PATH] = 0;
+			gf_free(url);
+ 		} else {
+			strcpy(fileName, "dump");
+		}
+	}
+	name = gf_file_ext_start(fileName);
+	if (name) {
+		name[0] = 0;
+	}
+
+	if (!ctx->opid_mdia && !ctx->nhmlonly)
+		ctx->opid_mdia = gf_filter_pid_new(filter);
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (p) {
+		ctx->dcfg = p->value.data.ptr;
+		ctx->dcfg_size = p->value.data.size;
+
+		if (!ctx->opid_info && !ctx->nhmlonly) {
+			ctx->opid_info = gf_filter_pid_new(filter);
+		}
+
+	} else if (ctx->opid_info) {
+		gf_filter_pid_remove(ctx->opid_info);
+	}
+	if (ctx->info_file) gf_free(ctx->info_file);
+	ctx->info_file = NULL;
+
+	if (ctx->opid_mdia) {
+		GF_Err e;
+		char *res_name;
+		gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+		gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_MIME, &PROP_STRING(mime) );
+
+		name = gf_file_ext_start(fileName);
+		if (name) name[0] = 0;
+		strcat(fileName, ".media");
+		if (gfio) {
+			res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+		} else {
+			res_name = fileName;
+		}
+		if (!ctx->exporter) {
+			gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_OUTPATH, &PROP_STRING(res_name) );
+		}
+
+		if (ctx->media_file) gf_free(ctx->media_file);
+		ctx->media_file = gf_strdup(fileName);
+		gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_FILE_EXT, &PROP_STRING("media") );
+
+		if (!ctx->exporter) {
+			GF_Filter *o_media = gf_filter_connect_destination(filter, res_name, &e);
+			if (o_media) gf_filter_set_source(o_media, filter, NULL);
+		}
+	}
+
+	if (ctx->opid_info) {
+		char *res_name;
+		GF_Err e;
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_MIME, &PROP_STRING(mime) );
+
+		name = gf_file_ext_start(fileName);
+		if (name) name[0] = 0;
+		strcat(fileName, ".info");
+		if (gfio) {
+			res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+		} else {
+			res_name = fileName;
+		}
+		if (!ctx->exporter) {
+			gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_OUTPATH, &PROP_STRING(res_name) );
+		}
+
+		if (ctx->info_file) gf_free(ctx->info_file);
+		ctx->info_file = gf_strdup(fileName);
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_FILE_EXT, &PROP_STRING("info") );
+
+		if (!ctx->exporter) {
+			GF_Filter *o_info = gf_filter_connect_destination(filter, res_name, &e);
+			if (o_info) gf_filter_set_source(o_info, filter, NULL);
+		}
+	}
+
+	if (ctx->opid_mdia)
+		gf_filter_pid_set_name(ctx->opid_mdia, "media");
+	if (ctx->opid_info)
+		gf_filter_pid_set_name(ctx->opid_info, "info");
+
+	ctx->side_streams_config = GF_TRUE;
+	return GF_OK;
+}
+
+GF_Err nhmldump_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 cid;
+	char *mime=NULL, *name;
+	const GF_PropertyValue *p;
+	GF_NHMLDumpCtx *ctx = gf_filter_get_udta(filter);
+
+	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);
+		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;
+	cid = p->value.uint;
+
+	if (ctx->codecid == cid) {
+		return GF_OK;
+	}
+	ctx->codecid = cid;
+
+	if (ctx->codecid<GF_CODECID_LAST_MPEG4_MAPPING) {
+		ctx->oti = ctx->codecid;
+	} else {
+		ctx->oti = gf_codecid_oti(ctx->codecid);
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	ctx->streamtype = p ? p->value.uint : GF_STREAM_UNKNOWN;
+
+	if (!ctx->opid_nhml && !ctx->filep)
+		ctx->opid_nhml = gf_filter_pid_new(filter);
+
+	ctx->side_streams_config = GF_FALSE;
+	if (ctx->nhmlonly)
+		ctx->side_streams_config = GF_TRUE;
+
+	ctx->is_dims = GF_FALSE;
+	if ((ctx->codecid == GF_CODECID_DIMS) && ctx->dims) {
+		if (ctx->opid_mdia) {
+			gf_filter_pid_remove(ctx->opid_mdia);
+			ctx->opid_mdia = NULL;
+		}
+		ctx->is_dims = GF_TRUE;
+		ctx->side_streams_config = GF_TRUE;
+	}
+
+	//file pointer set, we act as a sink, send play
+	if (!ctx->ipid && ctx->filep) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_PLAY, pid);
+		gf_filter_pid_send_event(pid, &evt);
+	}
+	ctx->ipid = pid;
+
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	ctx->sr = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	ctx->chan = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+	ctx->bps = p ? gf_audio_fmt_bit_depth(p->value.uint) : 16;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+	ctx->w = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+	ctx->h = p ? p->value.uint : 0;
+
+	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));
+		} 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));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", name));
+		}
+	}
+
+	if (ctx->opid_nhml) {
+		char *ext;
+		mime = ctx->dims ? "application/dims" : "application/x-nhml";
+		ext = ctx->dims ? "dims" : "nhml";
+
+		if (ctx->name) {
+			char fileName[GF_MAX_PATH+1];
+			strncpy(fileName, ctx->name, GF_MAX_PATH);
+			fileName[GF_MAX_PATH] = 0;
+			name = gf_file_ext_start(fileName);
+			if (name) {
+				name[0] = 0;
+				gf_filter_pid_set_property(ctx->opid_nhml, GF_PROP_PID_OUTPATH, &PROP_STRING(ctx->name) );
+			} else {
+				strcat(fileName, ".nhml");
+				gf_filter_pid_set_property(ctx->opid_nhml, GF_PROP_PID_OUTPATH, &PROP_STRING(fileName) );
+			}
+		}
+
+		gf_filter_pid_set_property(ctx->opid_nhml, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+		gf_filter_pid_set_property(ctx->opid_nhml, GF_PROP_PID_MIME, &PROP_STRING(mime) );
+		gf_filter_pid_set_property(ctx->opid_nhml, GF_PROP_PID_FILE_EXT, &PROP_STRING(ext) );
+	}
+
+
+	ctx->first = GF_TRUE;
+	ctx->is_stpp = (cid==GF_CODECID_SUBS_XML) ? GF_TRUE : GF_FALSE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p) ctx->duration = p->value.lfrac;
+
+
+	if (ctx->opid_nhml)
+		gf_filter_pid_set_name(ctx->opid_nhml, "nhml");
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	return GF_OK;
+}
+
+#define NHML_PRINT_4CC(_code, _pname, _name) \
+		if (_code) p = gf_filter_pid_get_property(ctx->ipid, _code); \
+		else p = gf_filter_pid_get_property_str(ctx->ipid, _pname); \
+		if (p) { \
+			sprintf(nhml, "%s=\"%s\" ", _name, gf_4cc_to_str(p->value.uint)); \
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml)); \
+		}
+
+#define NHML_PRINT_UINT(_code, _pname, _name) \
+		if (_code) p = gf_filter_pid_get_property(ctx->ipid, _code); \
+		else p = gf_filter_pid_get_property_str(ctx->ipid, _pname); \
+		if (p) { \
+			sprintf(nhml, "%s=\"%d\" ", _name, p->value.uint); \
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml)); \
+		}
+
+#define NHML_PRINT_STRING(_code, _pname, _name) \
+		if (_code) p = gf_filter_pid_get_property(ctx->ipid, _code); \
+		else p = gf_filter_pid_get_property_str(ctx->ipid, _pname); \
+		if (p) { \
+			sprintf(nhml, "%s=\"%s\" ", _name, p->value.string); \
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml)); \
+		}
+
+
+
+static void nhmldump_send_header(GF_NHMLDumpCtx *ctx)
+{
+	GF_FilterPacket *dst_pck;
+	char nhml[1024];
+	u32 size;
+	u8 *output;
+	const GF_PropertyValue *p;
+
+	ctx->szRootName = "NHNTStream";
+	if (ctx->dims) {
+		ctx->szRootName = "DIMSStream";
+	}
+
+	if (!ctx->filep) {
+		sprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+
+	/*write header*/
+	sprintf(nhml, "<%s version=\"1.0\" ", ctx->szRootName);
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+
+	NHML_PRINT_UINT(GF_PROP_PID_ID, NULL, "trackID")
+	NHML_PRINT_UINT(GF_PROP_PID_TIMESCALE, NULL, "timeScale")
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_IN_IOD);
+	if (p && p->value.boolean) {
+		sprintf(nhml, "inRootOD=\"yes\" ");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+
+	if (ctx->oti && (ctx->oti<GF_CODECID_LAST_MPEG4_MAPPING)) {
+		sprintf(nhml, "streamType=\"%d\" objectTypeIndication=\"%d\" ", ctx->streamtype, ctx->oti);
+		gf_bs_write_data(ctx->bs_w, nhml, (u32)strlen(nhml));
+	} else {
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_SUBTYPE);
+		if (p) {
+			sprintf(nhml, "%s=\"%s\" ", "mediaType", gf_4cc_to_str(p->value.uint));
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+			NHML_PRINT_4CC(GF_PROP_PID_ISOM_SUBTYPE, "mediaSubType", "mediaSubType")
+		} else {
+			NHML_PRINT_4CC(GF_PROP_PID_CODECID, NULL, "codecID")
+		}
+	}
+
+	if (ctx->w && ctx->h) {
+		//compatibility with old arch, we might want to remove this
+		switch (ctx->streamtype) {
+		case GF_STREAM_VISUAL:
+		case GF_STREAM_SCENE:
+			sprintf(nhml, "width=\"%d\" height=\"%d\" ", ctx->w, ctx->h);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+			break;
+		default:
+			break;
+		}
+	}
+	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);
+		sprintf(nhml, "bitsPerSample=\"%d\" ", gf_audio_fmt_bit_depth(p->value.uint));
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+
+	NHML_PRINT_4CC(0, "codec_vendor", "codecVendor")
+	NHML_PRINT_UINT(0, "codec_version", "codecVersion")
+	NHML_PRINT_UINT(0, "codec_revision", "codecRevision")
+	NHML_PRINT_STRING(0, "compressor_name", "compressorName")
+	NHML_PRINT_UINT(0, "temporal_quality", "temporalQuality")
+	NHML_PRINT_UINT(0, "spatial_quality", "spatialQuality")
+	NHML_PRINT_UINT(0, "hres", "horizontalResolution")
+	NHML_PRINT_UINT(0, "vres", "verticalResolution")
+	NHML_PRINT_UINT(GF_PROP_PID_BIT_DEPTH_Y, NULL, "bitDepth")
+
+	NHML_PRINT_STRING(0, "meta:xmlns", "xml_namespace")
+	NHML_PRINT_STRING(0, "meta:schemaloc", "xml_schema_location")
+	NHML_PRINT_STRING(0, "meta:mime", "mime_type")
+
+	NHML_PRINT_STRING(0, "meta:config", "config")
+	NHML_PRINT_STRING(0, "meta:aux_mimes", "aux_mime_type")
+
+	if (ctx->codecid == GF_CODECID_DIMS) {
+		if (gf_filter_pid_get_property_str(ctx->ipid, "meta:xmlns")==NULL) {
+			sprintf(nhml, "xmlns=\"http://www.3gpp.org/richmedia\" ");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+
+		NHML_PRINT_UINT(0, "dims:profile", "profile")
+		NHML_PRINT_UINT(0, "dims:level", "level")
+		NHML_PRINT_UINT(0, "dims:pathComponents", "pathComponents")
+
+		p = gf_filter_pid_get_property_str(ctx->ipid, "dims:fullRequestHost");
+		if (p) {
+			sprintf(nhml, "useFullRequestHost=\"%s\" ", p->value.boolean ? "yes" : "no");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		p = gf_filter_pid_get_property_str(ctx->ipid, "dims:streamType");
+		if (p) {
+			sprintf(nhml, "stream_type=\"%s\" ", p->value.boolean ? "primary" : "secondary");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		p = gf_filter_pid_get_property_str(ctx->ipid, "dims:redundant");
+		if (p) {
+			sprintf(nhml, "contains_redundant=\"%s\" ", (p->value.uint==1) ? "main" : ((p->value.uint==1) ? "redundant" : "main+redundant") );
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		NHML_PRINT_UINT(0, "dims:scriptTypes", "scriptTypes")
+	}
+
+	//send DCD
+	if (ctx->opid_info) {
+		sprintf(nhml, "specificInfoFile=\"%s\" ", gf_file_basename(ctx->info_file) );
+		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);
+	}
+
+	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 ));
+		}
+	}
+
+	if (ctx->opid_mdia) {
+		sprintf(nhml, "baseMediaFile=\"%s\" ", gf_file_basename(ctx->media_file) );
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+	sprintf(nhml, ">\n");
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+	gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->nhml_buffer, &size, &ctx->nhml_buffer_size);
+
+	if (ctx->filep) {
+		gf_fwrite(ctx->nhml_buffer, size, ctx->filep);
+		return;
+	}
+
+	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_TRUE, GF_FALSE);
+	gf_filter_pck_send(dst_pck);
+}
+
+static void nhmldump_send_dims(GF_NHMLDumpCtx *ctx, char *data, u32 data_size, GF_FilterPacket *pck)
+{
+	char nhml[1024];
+	u32 size;
+	u8 *output;
+	GF_FilterPacket *dst_pck;
+	u64 dts = gf_filter_pck_get_dts(pck);
+	u64 cts = gf_filter_pck_get_cts(pck);
+
+	if (dts==GF_FILTER_NO_TS) dts = cts;
+	if (cts==GF_FILTER_NO_TS) cts = dts;
+
+	if (!ctx->bs_r) ctx->bs_r = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
+	else gf_bs_reassign_buffer(ctx->bs_r, data, data_size);
+
+	while (gf_bs_available(ctx->bs_r)) {
+		u64 pos = gf_bs_get_position(ctx->bs_r);
+		size = gf_bs_read_u16(ctx->bs_r);
+		u8 flags = gf_bs_read_u8(ctx->bs_r);
+		u8 prev;
+
+		if (pos+size+2 > data_size)
+			break;
+
+		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));
+
+		/*DIMS flags*/
+		if (flags & GF_DIMS_UNIT_S) {
+			sprintf(nhml, " is-Scene=\"yes\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		if (flags & GF_DIMS_UNIT_M) {
+			sprintf(nhml, " is-RAP=\"yes\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		if (flags & GF_DIMS_UNIT_I) {
+			sprintf(nhml, " is-redundant=\"yes\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		if (flags & GF_DIMS_UNIT_D) {
+			sprintf(nhml, " redundant-exit=\"yes\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		if (flags & GF_DIMS_UNIT_P) {
+			sprintf(nhml, " priority=\"high\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		if (flags & GF_DIMS_UNIT_C) {
+			sprintf(nhml, " compressed=\"yes\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		sprintf(nhml, ">");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		if (ctx->uncompress && (flags & GF_DIMS_UNIT_C)) {
+#ifndef GPAC_DISABLE_ZLIB
+			char svg_data[2049];
+			int err;
+			u32 done = 0;
+			z_stream d_stream;
+			d_stream.zalloc = (alloc_func)0;
+			d_stream.zfree = (free_func)0;
+			d_stream.opaque = (voidpf)0;
+			d_stream.next_in  = (Bytef*) data+pos+3;
+			d_stream.avail_in = size-1;
+			d_stream.next_out = (Bytef*)svg_data;
+			d_stream.avail_out = 2048;
+
+			err = inflateInit(&d_stream);
+			if (err == Z_OK) {
+				while ((s32) d_stream.total_in < size-1) {
+					err = inflate(&d_stream, Z_NO_FLUSH);
+					if (err < Z_OK) break;
+					svg_data[d_stream.total_out - done] = 0;
+					gf_bs_write_data(ctx->bs_w, svg_data, (u32) strlen(svg_data));
+
+					if (err== Z_STREAM_END) break;
+					done = (u32) d_stream.total_out;
+					d_stream.avail_out = 2048;
+					d_stream.next_out = (Bytef*)svg_data;
+				}
+				inflateEnd(&d_stream);
+			}
+#else
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Error: your version of GPAC was compiled with no libz support."));
+			gf_bs_del(ctx->bs_r);
+			return;
+#endif
+		} else {
+			gf_bs_write_data(ctx->bs_w, data+pos+3, size-1);
+		}
+		sprintf(nhml, "</DIMSUnit>\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+		data[pos+2+size] = prev;
+		gf_bs_skip_bytes(ctx->bs_r, size-1);
+	}
+
+	gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->nhml_buffer, &size, &ctx->nhml_buffer_size);
+
+	if (ctx->filep) {
+		gf_fwrite(ctx->nhml_buffer, size, ctx->filep);
+		return;
+	}
+
+	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);
+}
+
+
+static void nhmldump_pck_property(GF_NHMLDumpCtx *ctx, u32 p4cc, const char *pname, const GF_PropertyValue *att)
+{
+	u32 i;
+	char nhml[1024];
+	char pval[GF_PROP_DUMP_ARG_SIZE];
+	if (!pname) pname = gf_props_4cc_get_name(p4cc);
+
+	sprintf(nhml, "%s=\"", pname ? pname : gf_4cc_to_str(p4cc));
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+	switch (att->type) {
+	case GF_PROP_DATA:
+	case GF_PROP_CONST_DATA:
+	case GF_PROP_DATA_NO_COPY:
+		sprintf(nhml, "0x");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		for (i=0; i<att->value.data.size; i++) {
+			sprintf(nhml, "%02X", (unsigned char) att->value.data.ptr[i]);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		nhml[0] = 0;
+		break;
+	default:
+		sprintf(nhml, "%s", gf_props_dump_val(att, pval, GF_FALSE, NULL) );
+		break;
+	}
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	sprintf(nhml, "\"");
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+}
+
+static void nhmldump_send_frame(GF_NHMLDumpCtx *ctx, char *data, u32 data_size, GF_FilterPacket *pck)
+{
+	GF_FilterPacket *dst_pck;
+	char nhml[1024];
+	const GF_PropertyValue *p;
+	u32 size;
+	u8 *output;
+	GF_FilterSAPType sap = gf_filter_pck_get_sap(pck);
+	u64 dts = gf_filter_pck_get_dts(pck);
+	u64 cts = gf_filter_pck_get_cts(pck);
+
+	if (dts==GF_FILTER_NO_TS) dts = cts;
+	if (cts==GF_FILTER_NO_TS) cts = dts;
+
+	ctx->pck_num++;
+	sprintf(nhml, "<NHNTSample number=\"%d\" DTS=\""LLU"\" dataLength=\"%d\" ", ctx->pck_num, dts, data_size);
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	if (ctx->pckp || (cts != dts) ) {
+		sprintf(nhml, "CTSOffset=\"%d\" ", (s32) ((s64)cts - (s64)dts));
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+	if (sap==GF_FILTER_SAP_1) {
+		sprintf(nhml, "isRAP=\"yes\" ");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	} else if (sap) {
+		sprintf(nhml, "SAPType=\"%d\" ", sap);
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	} else if (ctx->pckp) {
+		sprintf(nhml, "isRAP=\"no\" ");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		if (sap==GF_FILTER_SAP_4) {
+			s32 roll = gf_filter_pck_get_roll_info(pck);
+			sprintf(nhml, "SAPType=\"4\" roll=\"%d\" ", roll);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+	}
+
+	if (ctx->pckp) {
+		u64 bo;
+		u32 duration, idx;
+		sprintf(nhml, "mediaOffset=\""LLU"\" ", ctx->mdia_pos);
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+		bo = gf_filter_pck_get_byte_offset(pck);
+		if (bo!=GF_FILTER_NO_BO) {
+			sprintf(nhml, "sourceByteOffset=\""LLU"\" ", bo);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		duration = gf_filter_pck_get_duration(pck);
+		if (duration) {
+			sprintf(nhml, "duration=\"%d\" ", duration);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = gf_filter_pck_get_carousel_version(pck);
+		if (idx) {
+			sprintf(nhml, "carouselVersion=\"%d\" ", idx);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+		idx = 0;
+		while (1) {
+			u32 prop_4cc;
+			const char *prop_name;
+			p = gf_filter_pck_enum_properties(pck, &idx, &prop_4cc, &prop_name);
+			if (!p) break;
+			if (prop_4cc == GF_PROP_PCK_SUBS) continue;
+			nhmldump_pck_property(ctx, prop_4cc, prop_name, p);
+		}
+	}
+
+	if (ctx->chksum) {
+		if (ctx->chksum==1) {
+			u32 crc = gf_crc_32(data, data_size);
+			sprintf(nhml, "crc=\"%08X\" ", crc);
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		} else {
+			u32 j;
+			u8 hash[GF_SHA1_DIGEST_SIZE];
+			gf_sha1_csum(data, data_size, hash);
+			sprintf(nhml, "sha1=\"");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+			for (j=0; j<20; j++) {
+				sprintf(nhml, "%02X", hash[j]);
+				gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+			}
+			sprintf(nhml, "\" ");
+			gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		}
+	}
+
+	sprintf(nhml, ">\n");
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+	p = gf_filter_pck_get_property(pck, GF_PROP_PCK_SUBS);
+	if (p) {
+		u32 offset_in_sample = 0;
+		Bool first_subs = GF_TRUE;
+		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);
+
+		//(data) binary blob containing N [(u32)flags(u32)size(u32)reserved(u8)priority(u8) discardable]
+		while (gf_bs_available(ctx->bs_r)) {
+			u32 s_flags = gf_bs_read_u32(ctx->bs_r);
+			u32 s_size = gf_bs_read_u32(ctx->bs_r);
+			u32 s_res = gf_bs_read_u32(ctx->bs_r);
+			u8 s_prio = gf_bs_read_u8(ctx->bs_r);
+			u8 s_discard = gf_bs_read_u8(ctx->bs_r);
+
+
+			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));
+				break;
+			}
+
+			if (ctx->is_stpp && ctx->nhmlonly) {
+				if (first_subs) {
+					sprintf(nhml, "<NHNTSubSample>\n");
+					gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+					gf_bs_write_data(ctx->bs_w, data, s_size);
+
+					sprintf(nhml, "</NHNTSubSample>\n");
+					gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+				} else {
+					u32 d_size;
+					if (ctx->b64_buffer_size<2*s_size) {
+						ctx->b64_buffer_size = 2 * s_size;
+						ctx->b64_buffer = gf_realloc(ctx->b64_buffer, ctx->b64_buffer_size);
+					}
+					d_size = gf_base64_encode(data + offset_in_sample, s_size, ctx->b64_buffer, ctx->b64_buffer_size);
+					ctx->b64_buffer[d_size] = 0;
+					sprintf(nhml, "<NHNTSubSample data=\"data:application/octet-string;base64,");
+					gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+					gf_bs_write_data(ctx->bs_w, ctx->b64_buffer, d_size);
+					sprintf(nhml, "\">\n");
+					gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+				}
+			} else {
+				sprintf(nhml, "<NHNTSubSample size=\"%d\" flags=\"%d\" reserved=\"%d\" priority=\"%d\" discard=\"%d\" />\n", s_size, s_flags, s_res, s_prio, s_discard);
+				gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+			}
+			first_subs = GF_FALSE;
+		}
+	} else if (ctx->is_stpp && ctx->nhmlonly) {
+		sprintf(nhml, "<NHNTSubSample><![CDATA[\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+		gf_bs_write_data(ctx->bs_w, data, data_size);
+		sprintf(nhml, "]]></NHNTSubSample>\n");
+		gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+	}
+	sprintf(nhml, "</NHNTSample>\n");
+	gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+	gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->nhml_buffer, &size, &ctx->nhml_buffer_size);
+
+	if (ctx->filep) {
+		gf_fwrite(ctx->nhml_buffer, size, ctx->filep);
+		return;
+	}
+
+	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);
+
+	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);
+		gf_filter_pck_merge_properties(pck, dst_pck);
+		//keep byte offset ?
+//		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+
+		gf_filter_pck_set_framing(dst_pck, ctx->first, GF_FALSE);
+		gf_filter_pck_send(dst_pck);
+	}
+}
+
+
+GF_Err nhmldump_process(GF_Filter *filter)
+{
+	GF_NHMLDumpCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck;
+	char *data;
+	u32 pck_size;
+
+	if (!ctx->side_streams_config) {
+		return nhmldump_config_side_stream(filter, ctx);
+	}
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->bs_w && ctx->szRootName) {
+				char nhml[1024];
+				u32 size;
+				gf_bs_reassign_buffer(ctx->bs_w, ctx->nhml_buffer, ctx->nhml_buffer_size);
+				sprintf(nhml, "</%s>\n", ctx->szRootName);
+				gf_bs_write_data(ctx->bs_w, nhml, (u32) strlen(nhml));
+
+				gf_bs_get_content_no_truncate(ctx->bs_w, &ctx->nhml_buffer, &size, &ctx->nhml_buffer_size);
+
+				if (ctx->filep) {
+					gf_fwrite(ctx->nhml_buffer, size, ctx->filep);
+				} else {
+					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);
+				}
+				ctx->szRootName = NULL;
+			}
+			if (ctx->opid_nhml) gf_filter_pid_set_eos(ctx->opid_nhml);
+			if (ctx->opid_mdia) gf_filter_pid_set_eos(ctx->opid_mdia);
+			if (ctx->opid_info) gf_filter_pid_set_eos(ctx->opid_info);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (!ctx->bs_w) ctx->bs_w = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	else gf_bs_reassign_buffer(ctx->bs_w, ctx->nhml_buffer, ctx->nhml_buffer_size);
+
+	if (ctx->first) {
+		nhmldump_send_header(ctx);
+		gf_bs_reassign_buffer(ctx->bs_w, ctx->nhml_buffer, ctx->nhml_buffer_size);
+	}
+
+	//get media data
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+	//send data
+	if (ctx->is_dims) {
+		nhmldump_send_dims(ctx, data, pck_size, pck);
+	} else {
+		nhmldump_send_frame(ctx, data, pck_size, pck);
+	}
+	ctx->first = GF_FALSE;
+
+
+	if (ctx->exporter) {
+		u32 timescale = gf_filter_pck_get_timescale(pck);
+		u64 ts = gf_filter_pck_get_cts(pck);
+		gf_set_progress("Exporting", ts*ctx->duration.den, ctx->duration.num*timescale);
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+static GF_Err nhmldump_initialize(GF_Filter *filter)
+{
+	return GF_OK;
+}
+
+static void nhmldump_finalize(GF_Filter *filter)
+{
+	GF_NHMLDumpCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs_r) gf_bs_del(ctx->bs_r);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+	if (ctx->nhml_buffer) gf_free(ctx->nhml_buffer);
+	if (ctx->b64_buffer) gf_free(ctx->b64_buffer);
+	if (ctx->info_file) gf_free(ctx->info_file);
+	if (ctx->media_file) gf_free(ctx->media_file);
+}
+
+static const GF_FilterCapability NHMLDumpCaps[] =
+{
+	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),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "nhml|dims|dml"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "application/x-nhml|application/dims"),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_NHMLDumpCtx, _n)
+static const GF_FilterArgs NHMLDumpArgs[] =
+{
+	{ 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(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"
+	"- none: no checksum\n"
+	"- crc: CRC32 checksum\n"
+	"- sha1: SHA1 checksum"
+	"", GF_PROP_UINT, "none", "none|crc|sha1", GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(filep), "dump directly to the given FILE pointer (used by MP4Box)", GF_PROP_POINTER, NULL, NULL, GF_FS_ARG_HINT_HIDE},
+	{0}
+};
+
+
+GF_FilterRegister NHMLDumpRegister = {
+	.name = "nhmlw",
+	GF_FS_SET_DESCRIPTION("NHML writer")
+	GF_FS_SET_HELP("This filter converts a single stream to an NHML output file.\n"
+	"NHML documentation is available at https://wiki.gpac.io/NHML-Format\n")
+	.private_size = sizeof(GF_NHMLDumpCtx),
+	.args = NHMLDumpArgs,
+	.initialize = nhmldump_initialize,
+	.finalize = nhmldump_finalize,
+	SETCAPS(NHMLDumpCaps),
+	.configure_pid = nhmldump_configure_pid,
+	.process = nhmldump_process
+};
+
+const GF_FilterRegister *nhmldump_register(GF_FilterSession *session)
+{
+	return &NHMLDumpRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/write_nhnt.c Added

@@ -0,0 +1,390 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / NHNT stream to file 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/internal/isomedia_dev.h>
+
+
+typedef struct
+{
+	//opts
+	Bool exporter, large;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid_nhnt, *opid_mdia, *opid_info;
+
+	u32 codecid;
+	u32 streamtype;
+	u32 oti;
+
+	const char *dcfg;
+	u32 dcfg_size;
+
+	GF_Fraction64 duration;
+	Bool first;
+
+	GF_BitStream *bs;
+	u64 mdia_pos;
+	Bool configure_side_streams;
+} GF_NHNTDumpCtx;
+
+GF_Err nhntdump_config_side_streams(GF_Filter *filter, GF_NHNTDumpCtx *ctx)
+{
+	const GF_PropertyValue *p;
+	char *name, *url, *res_name;
+	char fileName[GF_MAX_PATH+1];
+	GF_FileIO *gfio = NULL;
+	GF_Err e;
+
+	url = gf_filter_pid_get_destination(ctx->opid_nhnt);
+	if (url) {
+		if (!strncmp(url, "gfio://", 7)) {
+			gfio = gf_fileio_from_url(url);
+			strncpy(fileName, gf_fileio_translate_url(url), GF_MAX_PATH);
+		} else {
+			strncpy(fileName, url, GF_MAX_PATH);
+		}
+		fileName[GF_MAX_PATH] = 0;
+		gf_free(url);
+	} else {
+		strcpy(fileName, "dump");
+	}
+
+	name = gf_file_ext_start(fileName);
+	if (name) {
+		name[0] = 0;
+	}
+	if (!ctx->opid_mdia)
+		ctx->opid_mdia = gf_filter_pid_new(filter);
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DECODER_CONFIG);
+	if (p) {
+		ctx->dcfg = p->value.data.ptr;
+		ctx->dcfg_size = p->value.data.size;
+
+		if (!ctx->opid_info)
+			ctx->opid_info = gf_filter_pid_new(filter);
+
+	} else if (ctx->opid_info) {
+		gf_filter_pid_remove(ctx->opid_info);
+	}
+
+	gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+	gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_FILE_EXT, &PROP_STRING("media") );
+	gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_MIME, &PROP_STRING("application/x-nhnt") );
+
+	if (!ctx->exporter) {
+		name = gf_file_ext_start(fileName);
+		if (name) name[0] = 0;
+		strcat(fileName, ".media");
+		if (gfio) {
+			res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+		} else {
+			res_name = fileName;
+		}
+		gf_filter_pid_set_property(ctx->opid_mdia, GF_PROP_PID_OUTPATH, &PROP_STRING(res_name) );
+
+		GF_Filter *o_media = gf_filter_connect_destination(filter, res_name, &e);
+		if (o_media) gf_filter_set_source(o_media, filter, NULL);
+	}
+
+
+	if (ctx->opid_info) {
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_FILE_EXT, &PROP_STRING("info") );
+		gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_MIME, &PROP_STRING("application/x-nhnt") );
+
+		if (!ctx->exporter) {
+			name = gf_file_ext_start(fileName);
+			if (name) name[0] = 0;
+			strcat(fileName, ".info");
+			if (gfio) {
+				res_name = (char *) gf_fileio_factory(gfio, gf_file_basename(fileName) );
+			} else {
+				res_name = fileName;
+			}
+			gf_filter_pid_set_property(ctx->opid_info, GF_PROP_PID_OUTPATH, &PROP_STRING(res_name) );
+
+			GF_Filter *o_info = gf_filter_connect_destination(filter, res_name, &e);
+			if (o_info) gf_filter_set_source(o_info, filter, NULL);
+		}
+
+	}
+	ctx->configure_side_streams = GF_FALSE;
+	return GF_OK;
+}
+
+GF_Err nhntdump_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 cid, chan, sr, bps, w, h;
+	const char *name;
+	const GF_PropertyValue *p;
+	GF_NHNTDumpCtx *ctx = gf_filter_get_udta(filter);
+
+	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);
+		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;
+	cid = p->value.uint;
+
+	if (ctx->codecid == cid) {
+		return GF_OK;
+	}
+	ctx->codecid = cid;
+	ctx->configure_side_streams = GF_TRUE;
+
+	if (ctx->codecid<GF_CODECID_LAST_MPEG4_MAPPING) ctx->oti = ctx->codecid;
+	else {
+		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) ));
+		return GF_NOT_SUPPORTED;
+	}
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+	ctx->streamtype = p ? p->value.uint : GF_STREAM_UNKNOWN;
+
+	if (!ctx->opid_nhnt)
+		ctx->opid_nhnt = gf_filter_pid_new(filter);
+
+	ctx->ipid = pid;
+
+
+	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);
+	chan = p ? p->value.uint : 0;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+	bps = p ? gf_audio_fmt_bit_depth(p->value.uint) : 16;
+	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;
+
+
+	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));
+		} 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));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", name));
+		}
+	}
+
+	gf_filter_pid_set_property(ctx->opid_nhnt, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+	gf_filter_pid_set_property(ctx->opid_nhnt, GF_PROP_PID_FILE_EXT, &PROP_STRING("nhnt") );
+	gf_filter_pid_set_property(ctx->opid_nhnt, GF_PROP_PID_MIME, &PROP_STRING("application/x-nhnt") );
+
+
+	ctx->first = GF_TRUE;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p) ctx->duration = p->value.lfrac;
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+GF_Err nhntdump_process(GF_Filter *filter)
+{
+	GF_NHNTDumpCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data;
+	u8 *output;
+	u32 size, pck_size;
+	u64 dts, cts;
+
+	if (ctx->configure_side_streams) {
+		return nhntdump_config_side_streams(filter, ctx);
+	}
+
+	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_nhnt);
+			gf_filter_pid_set_eos(ctx->opid_mdia);
+			if (ctx->opid_info) gf_filter_pid_set_eos(ctx->opid_info);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->first) {
+		u32 nhnt_hdr_size = 4+1+1+1+2+3+4+4+4;
+		const GF_PropertyValue *p;
+
+		dst_pck = gf_filter_pck_new_alloc(ctx->opid_nhnt, nhnt_hdr_size, &output);
+		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);
+
+		/*write header*/
+		/*'NHnt' format*/
+		gf_bs_write_data(ctx->bs, ctx->large ? "NHnl" : "NHnt", 4);
+		/*version 1*/
+		gf_bs_write_u8(ctx->bs, 0);
+		/*streamType*/
+		gf_bs_write_u8(ctx->bs, ctx->streamtype);
+		/*OTI*/
+		gf_bs_write_u8(ctx->bs, ctx->oti);
+		/*reserved*/
+		gf_bs_write_u16(ctx->bs, 0);
+		/*bufferDB*/
+		//p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_DB_SIZE);
+		gf_bs_write_u24(ctx->bs, 0);
+		/*avg BitRate*/
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_BITRATE);
+		gf_bs_write_u32(ctx->bs, p ? p->value.uint : 0);
+		/*max bitrate*/
+		//p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_MAX_RATE);
+		gf_bs_write_u32(ctx->bs, 0);
+		/*timescale*/
+		p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_TIMESCALE);
+		gf_bs_write_u32(ctx->bs, p ? p->value.uint : 1000);
+
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
+		gf_filter_pck_send(dst_pck);
+
+		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);
+		}
+	}
+
+	//get media data
+	data = (char *) 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);
+	//send nhnt data
+	gf_bs_reassign_buffer(ctx->bs, output, size);
+
+	/*dump nhnt info*/
+	gf_bs_write_u24(ctx->bs, pck_size);
+	gf_bs_write_int(ctx->bs, gf_filter_pck_get_sap(pck) ? 1 : 0, 1);
+	/*AU start & end flag always true*/
+	gf_bs_write_int(ctx->bs, 1, 1);
+	gf_bs_write_int(ctx->bs, 1, 1);
+	/*reserved*/
+	gf_bs_write_int(ctx->bs, 0, 3);
+	gf_bs_write_int(ctx->bs, gf_filter_pck_get_sap(pck) ? 0 : 1, 2);
+
+	dts = gf_filter_pck_get_dts(pck);
+	cts = gf_filter_pck_get_cts(pck);
+	if (ctx->large) {
+		gf_bs_write_u64(ctx->bs, ctx->mdia_pos);
+		gf_bs_write_u64(ctx->bs, cts);
+		gf_bs_write_u64(ctx->bs, dts);
+	} else {
+		gf_bs_write_u32(ctx->bs, (u32) ctx->mdia_pos);
+		gf_bs_write_u32(ctx->bs, (u32) cts);
+		gf_bs_write_u32(ctx->bs, (u32) dts);
+	}
+	ctx->mdia_pos += pck_size;
+	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);
+	gf_filter_pck_merge_properties(pck, dst_pck);
+	//keep byte offset ?
+//	gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+
+	gf_filter_pck_set_framing(dst_pck, ctx->first, GF_FALSE);
+	gf_filter_pck_send(dst_pck);
+
+	ctx->first = GF_FALSE;
+
+	if (ctx->exporter) {
+		u32 timescale = gf_filter_pck_get_timescale(pck);
+		u64 ts = gf_filter_pck_get_cts(pck);
+		gf_set_progress("Exporting", ts*ctx->duration.den, ctx->duration.num*timescale);
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+static void nhntdump_finalize(GF_Filter *filter)
+{
+	GF_NHNTDumpCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs) gf_bs_del(ctx->bs);
+}
+
+static const GF_FilterCapability NHNTDumpCaps[] =
+{
+	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),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "nhnt"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "application/x-nhnt"),
+};
+
+#define OFFS(_n)	#_n, offsetof(GF_NHNTDumpCtx, _n)
+static const GF_FilterArgs NHNTDumpArgs[] =
+{
+	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(large), "use large file mode", GF_PROP_BOOL, "false", NULL, 0},
+	{0}
+};
+
+
+GF_FilterRegister NHNTDumpRegister = {
+	.name = "nhntw",
+	GF_FS_SET_DESCRIPTION("NHNT writer")
+	GF_FS_SET_HELP("This filter converts a single stream to an NHNT output file.\n"
+	"NHNT documentation is available at https://wiki.gpac.io/NHNT-Format\n")
+	.private_size = sizeof(GF_NHNTDumpCtx),
+	.args = NHNTDumpArgs,
+	.finalize = nhntdump_finalize,
+	SETCAPS(NHNTDumpCaps),
+	.configure_pid = nhntdump_configure_pid,
+	.process = nhntdump_process
+};
+
+const GF_FilterRegister *nhntdump_register(GF_FilterSession *session)
+{
+	return &NHNTDumpRegister;
+}
+

gpac-1.0.0.tar.gz/src/filters/write_qcp.c Added

@@ -0,0 +1,381 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / QCP stream to file 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/internal/media_dev.h>
+
+
+typedef struct
+{
+	//opts
+	Bool exporter, mpeg2;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 codecid;
+	Bool first;
+
+	GF_Fraction64 duration;
+
+	char GUID[16];
+	u32 qcp_type, needs_rate_byte;
+	QCPRateTable rtable[8];
+	unsigned int *qcp_rates, rt_cnt;	/*contains constants*/
+	Bool has_qcp_pad;
+	Bool needs_final_pach;
+	u32 data_size;
+	u32 nb_frames;
+
+} GF_QCPMxCtx;
+
+
+/*QCP codec GUIDs*/
+static const char *QCP_QCELP_GUID_1 = "\x41\x6D\x7F\x5E\x15\xB1\xD0\x11\xBA\x91\x00\x80\x5F\xB4\xB9\x7E";
+static const char *QCP_EVRC_GUID = "\x8D\xD4\x89\xE6\x76\x90\xB5\x46\x91\xEF\x73\x6A\x51\x00\xCE\xB4";
+static const char *QCP_SMV_GUID = "\x75\x2B\x7C\x8D\x97\xA7\x46\xED\x98\x5E\xD5\x3C\x8C\xC7\x5F\x84";
+
+GF_Err qcpmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	u32 sr, chan, bps;
+	const GF_PropertyValue *p;
+	GF_QCPMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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->codecid = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+	if (!p) return GF_NOT_SUPPORTED;
+	sr = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+	if (!p) return GF_NOT_SUPPORTED;
+	chan = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_AUDIO_FORMAT);
+	bps = p ? gf_audio_fmt_bit_depth(p->value.uint) : 16;
+
+
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(filter);
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_STREAM_TYPE, &PROP_UINT(GF_STREAM_FILE) );
+	}
+
+	switch (ctx->codecid) {
+	case GF_CODECID_QCELP:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("qcp") );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("audio/qcp") );
+		ctx->qcp_type = 1;
+		memcpy(ctx->GUID, QCP_QCELP_GUID_1, sizeof(char)*16);
+		break;
+	case GF_CODECID_EVRC_PV:
+	case GF_CODECID_EVRC:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("evc") );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("audio/qcp") );
+		memcpy(ctx->GUID, QCP_EVRC_GUID, sizeof(char)*16);
+		ctx->qcp_type = 3;
+		break;
+	case GF_CODECID_SMV:
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("smv") );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("audio/qcp") );
+		ctx->qcp_type = 2;
+		memcpy(ctx->GUID, QCP_SMV_GUID, sizeof(char)*16);
+		break;
+	}
+
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_FILE_EXT, &PROP_STRING("qcp") );
+	gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("audio/qcp") );
+	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));
+	}
+
+	ctx->ipid = pid;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p) ctx->duration = p->value.lfrac;
+
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+
+	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"));
+		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"));
+		ctx->nb_frames = 0;
+	} else {
+		ctx->nb_frames = (u32) p->value.uint;
+	}
+
+	if (!ctx->data_size || !ctx->nb_frames) {
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_DISABLE_PROGRESSIVE, &PROP_UINT(GF_PID_FILE_PATCH_REPLACE) );
+		ctx->needs_final_pach = GF_TRUE;
+	}
+
+	return GF_OK;
+}
+
+static void qcpmx_send_header(GF_QCPMxCtx *ctx, u32 data_size, u32 frame_count)
+{
+	const GF_PropertyValue *p;
+	Bool needs_rate_octet;
+	char szName[80];
+	u32 i, tot_size, size, sample_size, avg_rate;
+	u32 block_size = 160;
+	u32 sample_rate = 8000;
+	GF_BitStream *bs;
+	u8 *output;
+	GF_FilterPacket *dst_pck;
+
+	if (ctx->qcp_type==1) {
+		ctx->qcp_rates = (unsigned int*)GF_QCELP_RATE_TO_SIZE;
+		ctx->rt_cnt = GF_QCELP_RATE_TO_SIZE_NB;
+	} else {
+		ctx->qcp_rates = (unsigned int*)GF_SMV_EVRC_RATE_TO_SIZE;
+		ctx->rt_cnt = GF_SMV_EVRC_RATE_TO_SIZE_NB;
+	}
+
+	/*dumps full table...*/
+	for (i=0; i<ctx->rt_cnt; i++) {
+		ctx->rtable[i].rate_idx = ctx->qcp_rates[2*i];
+		ctx->rtable[i].pck_size = ctx->qcp_rates[2*i+1];
+	}
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_FRAME_SIZE);
+	sample_size = p ? p->value.uint : block_size;
+
+	/*check sample format - packetvideo doesn't include rate octet...*/
+	needs_rate_octet = (ctx->codecid==GF_CODECID_EVRC_PV) ? GF_TRUE : GF_FALSE;
+
+	if (needs_rate_octet) data_size += frame_count;
+	ctx->has_qcp_pad = (data_size % 2) ? GF_TRUE : GF_FALSE;
+
+	p = gf_filter_pid_get_property(ctx->ipid, GF_PROP_PID_BITRATE);
+	if (p) avg_rate = p->value.uint;
+	else avg_rate = frame_count ? 8*data_size*sample_rate/frame_count/block_size : 0;
+
+	/*QLCM + fmt + vrat + data*/
+	size = tot_size = 4+ 8+150 + 8+8 + 8 + data_size;
+	/*pad is included in riff size*/
+	if (ctx->has_qcp_pad) {
+		tot_size++;
+	}
+	size += 8;
+	size -= data_size;
+	dst_pck = gf_filter_pck_new_alloc(ctx->opid, size, &output);
+	bs = gf_bs_new(output, size, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_data(bs, "RIFF", 4);
+	gf_bs_write_u32_le(bs, tot_size);
+	gf_bs_write_data(bs, "QLCM", 4);
+	gf_bs_write_data(bs, "fmt ", 4);
+	gf_bs_write_u32_le(bs, 150);/*fmt chunk size*/
+	gf_bs_write_u8(bs, 1);
+	gf_bs_write_u8(bs, 0);
+	gf_bs_write_data(bs, ctx->GUID, 16);
+	gf_bs_write_u16_le(bs, 1);
+	memset(szName, 0, 80);
+	strcpy(szName, (ctx->qcp_type==1) ? "QCELP-GPACExport" : ((ctx->qcp_type==2) ? "SMV-GPACExport" : "EVRC-GPACExport"));
+	gf_bs_write_data(bs, szName, 80);
+	gf_bs_write_u16_le(bs, avg_rate);
+	gf_bs_write_u16_le(bs, sample_size);
+	gf_bs_write_u16_le(bs, block_size);
+	gf_bs_write_u16_le(bs, sample_rate);
+	gf_bs_write_u16_le(bs, avg_rate);
+	gf_bs_write_u32_le(bs, ctx->rt_cnt);
+	for (i=0; i<8; i++) {
+		if (i<ctx->rt_cnt) {
+			/*frame size MINUS rate octet*/
+			gf_bs_write_u8(bs, ctx->rtable[i].pck_size - 1);
+			gf_bs_write_u8(bs, ctx->rtable[i].rate_idx);
+		} else {
+			gf_bs_write_u16(bs, 0);
+		}
+	}
+	memset(szName, 0, 80);
+	gf_bs_write_data(bs, szName, 20);/*reserved*/
+	gf_bs_write_data(bs, "vrat", 4);
+	gf_bs_write_u32_le(bs, 8);/*vrat chunk size*/
+	gf_bs_write_u32_le(bs, ctx->rt_cnt);
+	gf_bs_write_u32_le(bs, frame_count);
+	gf_bs_write_data(bs, "data", 4);
+	gf_bs_write_u32_le(bs, data_size);/*data chunk size*/
+
+	ctx->needs_rate_byte = needs_rate_octet ? 1 : 0;
+
+	gf_bs_del(bs);
+
+	if (!ctx->first) {
+		assert(ctx->needs_final_pach);
+		gf_filter_pck_set_framing(dst_pck, GF_FALSE, GF_FALSE);
+		gf_filter_pck_set_seek_flag(dst_pck, GF_TRUE);
+		gf_filter_pck_set_byte_offset(dst_pck, 0);
+	} else {
+		gf_filter_pck_set_framing(dst_pck, GF_TRUE, GF_FALSE);
+		gf_filter_pck_set_byte_offset(dst_pck, GF_FILTER_NO_BO);
+		ctx->first = GF_FALSE;
+	}
+
+	gf_filter_pck_send(dst_pck);
+}
+
+GF_Err qcpmx_process(GF_Filter *filter)
+{
+	GF_QCPMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u32 pck_size, size;
+
+	pck = gf_filter_pid_get_packet(ctx->ipid);
+	if (!pck) {
+		if (gf_filter_pid_is_eos(ctx->ipid)) {
+			if (ctx->needs_final_pach) {
+				qcpmx_send_header(ctx, ctx->data_size, ctx->nb_frames);
+				ctx->needs_final_pach = GF_FALSE;
+			}
+			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);
+			}
+			gf_filter_pid_set_eos(ctx->opid);
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	if (ctx->first) {
+		qcpmx_send_header(ctx, ctx->data_size, ctx->nb_frames);
+	}
+
+	data = (char *) gf_filter_pck_get_data(pck, &pck_size);
+
+	size = pck_size;
+	ctx->data_size += pck_size;
+	ctx->nb_frames ++;
+
+	/*fix rate octet for QCP*/
+	if (ctx->needs_rate_byte) {
+		u32 j;
+		u32 rate_found = 0;
+		size ++;
+
+		for (j=0; j<ctx->rt_cnt; j++) {
+			if (ctx->qcp_rates[2*j+1] == pck_size) {
+				rate_found = ctx->qcp_rates[2*j];
+				break;
+			}
+		}
+		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_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);
+	} else {
+		dst_pck = gf_filter_pck_new_ref(ctx->opid, data, size, pck);
+	}
+
+	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, ctx->first, GF_FALSE);
+	ctx->first = GF_FALSE;
+
+	gf_filter_pck_send(dst_pck);
+
+	if (ctx->exporter) {
+		u32 timescale = gf_filter_pck_get_timescale(pck);
+		u64 ts = gf_filter_pck_get_cts(pck);
+		gf_set_progress("Exporting", ts*ctx->duration.den, ctx->duration.num*timescale);
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+static const GF_FilterCapability QCPMxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_AUDIO),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_QCELP),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_EVRC),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_EVRC_PV),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_SMV),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "qcp"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "audio/qcp"),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_QCPMxCtx, _n)
+static const GF_FilterArgs QCPMxArgs[] =
+{
+	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+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.")
+	.private_size = sizeof(GF_QCPMxCtx),
+	.args = QCPMxArgs,
+	SETCAPS(QCPMxCaps),
+	.configure_pid = qcpmx_configure_pid,
+	.process = qcpmx_process
+};
+
+
+const GF_FilterRegister *qcpmx_register(GF_FilterSession *session)
+{
+	return &QCPMxRegister;
+}

gpac-1.0.0.tar.gz/src/filters/write_vtt.c Added

@@ -0,0 +1,322 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / WebVTT stream to file 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/webvtt.h>
+#include <gpac/internal/media_dev.h>
+
+
+typedef struct
+{
+	//opts
+	Bool exporter, merge;
+
+	//only one input pid declared
+	GF_FilterPid *ipid;
+	//only one output pid declared
+	GF_FilterPid *opid;
+
+	u32 codecid;
+	Bool first;
+
+	GF_Fraction64 duration;
+	char *dcd;
+
+	GF_BitStream *bs_w;
+	u8 *cues_buffer;
+	u32 cues_buffer_size;
+
+	GF_WebVTTParser *parser;
+
+} GF_WebVTTMxCtx;
+
+static void vttmx_write_cue(void *ctx, GF_WebVTTCue *cue);
+
+GF_Err vttmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_remove)
+{
+	const GF_PropertyValue *p;
+	GF_WebVTTMxCtx *ctx = gf_filter_get_udta(filter);
+
+	if (is_remove) {
+		ctx->ipid = NULL;
+		gf_filter_pid_remove(ctx->opid);
+		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->codecid = p->value.uint;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DECODER_CONFIG);
+	if (!p) return GF_NOT_SUPPORTED;
+	if (ctx->dcd && !strcmp(ctx->dcd, p->value.string)) return GF_OK;
+	if (ctx->dcd) gf_free(ctx->dcd);
+
+	if ((p->type==GF_PROP_DATA) || (p->type==GF_PROP_DATA_NO_COPY)) {
+		ctx->dcd = gf_malloc(p->value.data.size+1);
+		memcpy(ctx->dcd, p->value.data.ptr, p->value.data.size);
+		ctx->dcd[p->value.data.size]=0;
+	} else {
+		ctx->dcd = gf_strdup(p->value.string);
+	}
+	if (!ctx->opid) {
+		ctx->opid = gf_filter_pid_new(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_FILE_EXT, &PROP_STRING("vtt") );
+		gf_filter_pid_set_property(ctx->opid, GF_PROP_PID_MIME, &PROP_STRING("text/vtt") );
+		ctx->first = GF_TRUE;
+
+		if (ctx->exporter) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Exporting %s\n", gf_codecid_name(ctx->codecid)));
+		}
+
+	}
+	ctx->ipid = pid;
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+	if (p) ctx->duration = p->value.lfrac;
+
+	if (ctx->parser) gf_webvtt_parser_del(ctx->parser);
+	ctx->parser = NULL;
+	if (ctx->merge) {
+		ctx->parser = gf_webvtt_parser_new();
+		gf_webvtt_parser_cue_callback(ctx->parser, vttmx_write_cue, ctx);
+	}
+	gf_filter_pid_set_framing_mode(pid, GF_TRUE);
+	return GF_OK;
+}
+
+void vttmx_timestamp_dump(GF_BitStream *bs, GF_WebVTTTimestamp *ts, Bool dump_hour)
+{
+	char szTS[200];
+	szTS[0] = 0;
+	if (dump_hour || ts->hour != 0) {
+		sprintf(szTS, "%02u:", ts->hour);
+	}
+	sprintf(szTS, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
+	gf_bs_write_data(bs, szTS, (u32) strlen(szTS) );
+}
+
+void webvtt_write_cue(GF_BitStream *bs, GF_WebVTTCue *cue)
+{
+	if (!cue) return;
+	if (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 (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) {
+		gf_bs_write_data(bs, cue->post_text, (u32) strlen(cue->post_text));
+		gf_bs_write_data(bs, "\n\n", 2);
+	}
+}
+
+static void vttmx_write_cue(void *udta, GF_WebVTTCue *cue)
+{
+	GF_WebVTTMxCtx *ctx = (GF_WebVTTMxCtx *)udta;
+	webvtt_write_cue(ctx->bs_w, cue);
+}
+
+void vttmx_parser_flush(GF_WebVTTMxCtx *ctx)
+{
+	u8 *output;
+	u64 duration = ctx->duration.num;
+	duration *= 1000;
+	duration /= ctx->duration.den;
+
+	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);
+
+	gf_webvtt_parser_finalize(ctx->parser, duration);
+
+	if (gf_bs_get_position(ctx->bs_w)) {
+		GF_FilterPacket *dst_pck;
+		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);
+
+		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_webvtt_parser_del(ctx->parser);
+	ctx->parser = NULL;
+
+}
+GF_Err vttmx_process(GF_Filter *filter)
+{
+	GF_WebVTTMxCtx *ctx = gf_filter_get_udta(filter);
+	GF_FilterPacket *pck, *dst_pck;
+	u8 *data, *output;
+	u64 start_ts;
+	u32 i, pck_size, size, timescale;
+	GF_List *cues;
+
+	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);
+			if (ctx->parser) {
+				vttmx_parser_flush(ctx);
+			}
+			return GF_EOS;
+		}
+		return GF_OK;
+	}
+
+	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);
+		memcpy(output, ctx->dcd, size-2);
+		output[size-2] = '\n';
+		output[size-1] = '\n';
+		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, ctx->first, GF_FALSE);
+		ctx->first = GF_FALSE;
+		gf_filter_pck_send(dst_pck);
+	}
+
+	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);
+	if (ctx->parser) {
+		gf_webvtt_merge_cues(ctx->parser, start_ts, cues);
+	} else {
+		for (i = 0; i < gf_list_count(cues); i++) {
+			GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, i);
+			vttmx_write_cue(ctx, cue);
+			gf_webvtt_cue_del(cue);
+		}
+	}
+	gf_list_del(cues);
+
+	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);
+
+		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, ctx->first, GF_FALSE);
+		ctx->first = GF_FALSE;
+
+		gf_filter_pck_send(dst_pck);
+	}
+
+	if (ctx->exporter) {
+		u64 ts = gf_filter_pck_get_cts(pck);
+		timescale = gf_filter_pck_get_timescale(pck);
+		gf_set_progress("Exporting", ts*ctx->duration.den, ctx->duration.num*timescale);
+	}
+
+	gf_filter_pid_drop_packet(ctx->ipid);
+
+	return GF_OK;
+}
+
+static void vttmx_finalize(GF_Filter *filter)
+{
+	GF_WebVTTMxCtx *ctx = gf_filter_get_udta(filter);
+	if (ctx->bs_w) gf_bs_del(ctx->bs_w);
+	if (ctx->dcd) gf_free(ctx->dcd);
+	if (ctx->cues_buffer) gf_free(ctx->cues_buffer);
+
+	if (ctx->parser) gf_webvtt_parser_del(ctx->parser);
+}
+
+static const GF_FilterCapability WebVTTMxCaps[] =
+{
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_STREAM_TYPE, GF_STREAM_TEXT),
+	CAP_UINT(GF_CAPS_INPUT,GF_PROP_PID_CODECID, GF_CODECID_WEBVTT),
+	CAP_BOOL(GF_CAPS_INPUT_EXCLUDED, GF_PROP_PID_UNFRAMED, GF_TRUE),
+	CAP_UINT(GF_CAPS_OUTPUT, GF_PROP_PID_STREAM_TYPE, GF_STREAM_FILE),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_FILE_EXT, "vtt"),
+	CAP_STRING(GF_CAPS_OUTPUT, GF_PROP_PID_MIME, "subtitle/vtt|text/vtt"),
+};
+
+
+#define OFFS(_n)	#_n, offsetof(GF_WebVTTMxCtx, _n)
+static const GF_FilterArgs WebVTTMxArgs[] =
+{
+	{ OFFS(exporter), "compatibility with old exporter, displays export results", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{ OFFS(merge), "merge VTT cue if needed", GF_PROP_BOOL, "false", NULL, GF_FS_ARG_HINT_ADVANCED},
+	{0}
+};
+
+
+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.")
+	.private_size = sizeof(GF_WebVTTMxCtx),
+	.args = WebVTTMxArgs,
+	.finalize = vttmx_finalize,
+	SETCAPS(WebVTTMxCaps),
+	.configure_pid = vttmx_configure_pid,
+	.process = vttmx_process
+};
+
+
+const GF_FilterRegister *vttmx_register(GF_FilterSession *session)
+{
+	return &WebVTTMxRegister;
+}

gpac-0.8.0.tar.gz/src/ietf/rtcp.c -> gpac-1.0.0.tar.gz/src/ietf/rtcp.c Changed

@@ -30,29 +30,27 @@
 
 #include <gpac/bitstream.h>
 
-#ifndef _WIN32_WCE
-#include <time.h>
-#endif
-
 GF_EXPORT
-u32 gf_rtp_read_rtcp(GF_RTPChannel *ch, char *buffer, u32 buffer_size)
+u32 gf_rtp_read_rtcp(GF_RTPChannel *ch, u8 *buffer, u32 buffer_size)
 {
 	GF_Err e;
 	u32 res;
 
 	//only if the socket exist (otherwise RTSP interleaved channel)
 	if (!ch || !ch->rtcp) return 0;
-
-	e = gf_sk_receive(ch->rtcp, buffer, buffer_size, 0, &res);
+	if (ch->no_select) {
+		e = gf_sk_receive_no_select(ch->rtcp, buffer, buffer_size, &res);
+	} else {
+		e = gf_sk_receive(ch->rtcp, buffer, buffer_size, &res);
+	}
 	if (e) return 0;
 	return res;
 }
 
 GF_EXPORT
-GF_Err gf_rtp_decode_rtcp(GF_RTPChannel *ch, char *pck, u32 pck_size, Bool *has_sr)
+GF_Err gf_rtp_decode_rtcp(GF_RTPChannel *ch, u8 *pck, u32 pck_size, Bool *has_sr)
 {
 	GF_RTCPHeader rtcp_hdr;
-	GF_BitStream *bs;
 	char sdes_buffer[300];
 	u32 i, sender_ssrc, cur_ssrc, val, sdes_type, sdes_len, res, first;
 	GF_Err e = GF_OK;
@@ -61,24 +59,22 @@
 
 	//bad RTCP packet
 	if (pck_size < 4 ) return GF_NON_COMPLIANT_BITSTREAM;
-	bs = gf_bs_new(pck, pck_size, GF_BITSTREAM_READ);
+	gf_bs_reassign_buffer(ch->bs_r, pck, pck_size);
 
 	first = 1;
 	while (pck_size) {
 		//global header
-		rtcp_hdr.Version = gf_bs_read_int(bs, 2);
+		rtcp_hdr.Version = gf_bs_read_int(ch->bs_r, 2);
 		if (rtcp_hdr.Version != 2 ) {
-			gf_bs_del(bs);
 			return GF_NOT_SUPPORTED;
 		}
-		rtcp_hdr.Padding = gf_bs_read_int(bs, 1);
-		rtcp_hdr.Count = gf_bs_read_int(bs, 5);
-		rtcp_hdr.PayloadType = gf_bs_read_u8(bs);
-		rtcp_hdr.Length = 1 + gf_bs_read_u16(bs);
+		rtcp_hdr.Padding = gf_bs_read_int(ch->bs_r, 1);
+		rtcp_hdr.Count = gf_bs_read_int(ch->bs_r, 5);
+		rtcp_hdr.PayloadType = gf_bs_read_u8(ch->bs_r);
+		rtcp_hdr.Length = 1 + gf_bs_read_u16(ch->bs_r);
 
 		//check pck size
 		if (pck_size < (u32) rtcp_hdr.Length * 4) {
-			gf_bs_del(bs);
 			//we return OK
 			return GF_CORRUPTED_DATA;
 		}
@@ -93,8 +89,7 @@
 			if ( ( (rtcp_hdr.PayloadType!=200) && (rtcp_hdr.PayloadType!=201) )
 			        || rtcp_hdr.Padding
 			   ) {
-				gf_bs_del(bs);
-				GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTCP] Corrupted RTCP packet: payload type %d (200 or 201 expected) - Padding %d (0 expected)\n", rtcp_hdr.PayloadType, rtcp_hdr.Padding));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTCP] Corrupted RTCP packet: payload type %d (200 or 201 expected) - Padding %d (0 expected)\n", rtcp_hdr.PayloadType, rtcp_hdr.Padding));
 				return GF_CORRUPTED_DATA;
 			}
 			first = 0;
@@ -105,23 +100,22 @@
 		//Sender report - we assume there's only one sender
 		case 200:
 			/*sender ssrc*/
-			sender_ssrc = gf_bs_read_u32(bs);
+			sender_ssrc = gf_bs_read_u32(ch->bs_r);
 			rtcp_hdr.Length -= 1;
 			/*not for us...*/
 			if (ch->SenderSSRC && (ch->SenderSSRC != sender_ssrc)) break;
 
 			if (ch->first_SR) {
-				ch->first_SR = 0;
 				gf_rtp_get_next_report_time(ch);
 				ch->SenderSSRC = sender_ssrc;
 			}
 			ch->last_report_time = gf_rtp_get_report_time();
 
-			ch->last_SR_NTP_sec = gf_bs_read_u32(bs);
-			ch->last_SR_NTP_frac = gf_bs_read_u32(bs);
-			ch->last_SR_rtp_time = gf_bs_read_u32(bs);
-			/*nb_pck =  */gf_bs_read_u32(bs);
-			/*nb_bytes =*/gf_bs_read_u32(bs);
+			ch->last_SR_NTP_sec = gf_bs_read_u32(ch->bs_r);
+			ch->last_SR_NTP_frac = gf_bs_read_u32(ch->bs_r);
+			ch->last_SR_rtp_time = gf_bs_read_u32(ch->bs_r);
+			/*nb_pck =  */gf_bs_read_u32(ch->bs_r);
+			/*nb_bytes =*/gf_bs_read_u32(ch->bs_r);
 
 			rtcp_hdr.Length -= 5;
 			if (has_sr) *has_sr = GF_TRUE;
@@ -130,11 +124,12 @@
 			if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_INFO))  {
 #ifndef _WIN32_WCE
 				time_t gtime = ch->last_SR_NTP_sec - GF_NTP_SEC_1900_TO_1970;
-				const char *ascTime = asctime(gmtime(&gtime));
+				const char *ascTime = asctime(gf_gmtime(&gtime));
 #else
 				const char *ascTime = "Not Available";
 #endif
-				GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] RTCP SR: SSRC %d - RTP Time %d - Nb Pck %d - Nb Bytes %d - Time %s\n",
+				GF_LOG(ch->first_SR ? GF_LOG_INFO : GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] RTCP %sSR: SSRC %d - RTP Time %u - Nb Pck %d - Nb Bytes %d - Time %s\n",
+											   ch->first_SR ? "Initial " : "",
 				                                 ch->SenderSSRC,
 				                                 ch->last_SR_rtp_time,
 				                                 ch->total_pck,
@@ -144,13 +139,15 @@
 			}
 #endif
 
+			ch->first_SR = 0;
+
 			//common encoding for SR and RR
 			goto process_reports;
 
 
 		case 201:
 			//sender ssrc
-			/*sender_ssrc = */gf_bs_read_u32(bs);
+			/*sender_ssrc = */gf_bs_read_u32(ch->bs_r);
 			rtcp_hdr.Length -= 1;
 
 process_reports:
@@ -160,19 +157,19 @@
 			//to add
 			for (i=0; i<rtcp_hdr.Count; i++) {
 				//ssrc slot
-				cur_ssrc = gf_bs_read_u32(bs);
+				cur_ssrc = gf_bs_read_u32(ch->bs_r);
 				//frac lost
-				gf_bs_read_u8(bs);
+				gf_bs_read_u8(ch->bs_r);
 				//cumulative lost
-				gf_bs_read_u24(bs);
+				gf_bs_read_u24(ch->bs_r);
 				//extended seq num
-				gf_bs_read_u32(bs);
+				gf_bs_read_u32(ch->bs_r);
 				//jitter
-				gf_bs_read_u32(bs);
+				gf_bs_read_u32(ch->bs_r);
 				//LSR
-				gf_bs_read_u32(bs);
+				gf_bs_read_u32(ch->bs_r);
 				//DLSR
-				gf_bs_read_u32(bs);
+				gf_bs_read_u32(ch->bs_r);
 
 				rtcp_hdr.Length -= 6;
 			}
@@ -183,17 +180,17 @@
 		//SDES
 		case 202:
 			for (i=0; i<rtcp_hdr.Count; i++) {
-				/*cur_ssrc = */gf_bs_read_u32(bs);
+				/*cur_ssrc = */gf_bs_read_u32(ch->bs_r);
 				rtcp_hdr.Length -= 1;
 
 				val = 0;
 				while (1) {
-					sdes_type = gf_bs_read_u8(bs);
+					sdes_type = gf_bs_read_u8(ch->bs_r);
 					val += 1;
 					if (!sdes_type) break;
-					sdes_len = gf_bs_read_u8(bs);
+					sdes_len = gf_bs_read_u8(ch->bs_r);
 					val += 1;
-					gf_bs_read_data(bs, sdes_buffer, sdes_len);
+					gf_bs_read_data(ch->bs_r, sdes_buffer, sdes_len);
 					sdes_buffer[sdes_len] = 0;
 					val += sdes_len;
 				}
@@ -201,7 +198,7 @@
 				//re-align on 32bit
 				res = val%4;
 				if (res) {
-					gf_bs_skip_bytes(bs, (4-res));
+					gf_bs_skip_bytes(ch->bs_r, (4-res));
 					val = val/4 + 1;
 				} else {
 					val = val/4;
@@ -213,7 +210,7 @@
 		//BYE packet - close the channel - we work with 1 SSRC only */
 		case 203:
 			for (i=0; i<rtcp_hdr.Count; i++) {
-				cur_ssrc = gf_bs_read_u32(bs);
+				cur_ssrc = gf_bs_read_u32(ch->bs_r);
 				rtcp_hdr.Length -= 1;
 				if (ch->SenderSSRC == cur_ssrc) {
 					e = GF_EOS;
@@ -222,7 +219,7 @@
 			}
 			//extra info - skip it
 			while (rtcp_hdr.Length) {
-				gf_bs_read_u32(bs);
+				gf_bs_read_u32(ch->bs_r);
 				rtcp_hdr.Length -= 1;
 			}
 			break;
@@ -248,26 +245,18 @@
 		*/
 		default:
 			//read all till end
-			gf_bs_read_data(bs, sdes_buffer, rtcp_hdr.Length*4);
+			gf_bs_read_data(ch->bs_r, sdes_buffer, rtcp_hdr.Length*4);
 			rtcp_hdr.Length = 0;
 			break;
 		}
 		//WE SHALL CONSUME EVERYTHING otherwise the packet is bad
 		if (rtcp_hdr.Length) {
-			gf_bs_del(bs);
 			return GF_CORRUPTED_DATA;
 		}
 	}
-
-	gf_bs_del(bs);
 	return e;
 }
 
-u32 gf_rtp_get_ntp_frac(u32 sec, u32 frac)
-{
-	return ( ((sec  & 0x0000ffff) << 16) |  ((frac & 0xffff0000) >> 16));
-}
-
 static u32 RTCP_FormatReport(GF_RTPChannel *ch, GF_BitStream *bs, u32 NTP_Time)
 {
 	u32 length, is_sr, sec, frac, expected, val, size;
@@ -355,7 +344,11 @@
 	//RTP specs annexe A.8
 	gf_bs_write_u32(bs, ( ch->Jitter >> 4));
 	//LSR
-	val = ch->last_SR_NTP_sec ? gf_rtp_get_ntp_frac(ch->last_SR_NTP_sec, ch->last_SR_NTP_frac) : 0;
+	if (ch->last_SR_NTP_sec) {
+		val = ( ((ch->last_SR_NTP_sec  & 0x0000ffff) << 16) |  ((ch->last_SR_NTP_frac & 0xffff0000) >> 16));
+	} else {
+		val = 0;
+	}
 	gf_bs_write_u32(bs, val);
 
 	// DLSR
@@ -366,11 +359,11 @@
 	if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_DEBUG))  {
 #ifndef _WIN32_WCE
 		time_t gtime = ch->last_SR_NTP_sec - GF_NTP_SEC_1900_TO_1970;
-		const char *ascTime = asctime(gmtime(&gtime));
+		const char *ascTime = asctime(gf_gmtime(&gtime));
 #else
 		const char *ascTime = "Not Available";
 #endif
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] RTCP-RR\t%d\t%d\t%d\t%d\t%d\t%s\n",
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] RTCP-RR: SSRC %d Jitter %d extended %d expect_diff %d loss_diff %d time %s\n",
 		                                  ch->SSRC,
 		                                  ch->Jitter >> 4,
 		                                  extended,
@@ -455,13 +448,11 @@
 }
 
 GF_EXPORT
-GF_Err gf_rtp_send_bye(GF_RTPChannel *ch,
-                       GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
-                       void *rtsp_cbk)
+GF_Err gf_rtp_send_bye(GF_RTPChannel *ch)
 {
 	GF_BitStream *bs;
 	u32 report_size;
-	char *report_buf;
+	u8 *report_buf;
 	GF_Err e = GF_OK;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -486,8 +477,8 @@
 	if (ch->rtcp) {
 		e = gf_sk_send(ch->rtcp, report_buf, report_size);
 	} else {
-		if (RTP_TCPCallback)
-			e = RTP_TCPCallback(rtsp_cbk, report_buf, report_size);
+		if (ch->send_interleave)
+			e = ch->send_interleave(ch->interleave_cbk1, ch->interleave_cbk2, GF_TRUE, report_buf, report_size);
 		else
 			e = GF_BAD_PARAM;
 	}
@@ -496,14 +487,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_rtp_send_rtcp_report(GF_RTPChannel *ch,
-                               GF_Err (*RTP_TCPCallback)(void *cbk, char *pck, u32 pck_size),
-                               void *rtsp_cbk)
+GF_Err gf_rtp_send_rtcp_report(GF_RTPChannel *ch)
 {
 	u32 Time, report_size;
 	GF_BitStream *bs;
-	char *report_buf;
+	u8 *report_buf;
 	GF_Err e = GF_OK;
+	
 
 	/*skip first SR when acting as a receiver*/
 	if (!ch->forced_ntp_sec && ch->first_SR) return GF_OK;
@@ -527,12 +517,11 @@
 	gf_bs_get_content(bs, &report_buf, &report_size);
 	gf_bs_del(bs);
 
-
 	if (ch->rtcp) {
 		e = gf_sk_send(ch->rtcp, report_buf, report_size);
 	} else {
-		if (RTP_TCPCallback)
-			e = RTP_TCPCallback(rtsp_cbk, report_buf, report_size);
+		if (ch->send_interleave)
+			e = ch->send_interleave(ch->interleave_cbk1, ch->interleave_cbk2, GF_TRUE, report_buf, report_size);
 		else
 			e = GF_BAD_PARAM;
 	}
@@ -553,12 +542,23 @@
 	return e;
 }
 
+#if 0 //unused
+
+enum
+{
+	GF_RTCP_INFO_NAME = 0,
+	GF_RTCP_INFO_EMAIL,
+	GF_RTCP_INFO_PHONE,
+	GF_RTCP_INFO_LOCATION,
+	GF_RTCP_INFO_TOOL,
+	GF_RTCP_INFO_NOTE,
+	GF_RTCP_INFO_PRIV
+};
 
 
 #define RTCP_SAFE_FREE(p) if (p) gf_free(p);	\
 					p = NULL;
 
-GF_EXPORT
 GF_Err gf_rtp_set_info_rtcp(GF_RTPChannel *ch, u32 InfoCode, char *info_string)
 {
 	if (!ch) return GF_BAD_PARAM;
@@ -598,4 +598,7 @@
 	return GF_OK;
 }
 
+#endif
+
+
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/src/ietf/rtp.c -> gpac-1.0.0.tar.gz/src/ietf/rtp.c Changed

@@ -39,6 +39,8 @@
 		return NULL;
 	tmp->first_SR = 1;
 	tmp->SSRC = gf_rand();
+	tmp->bs_r = gf_bs_new("d", 1, GF_BITSTREAM_READ);
+	tmp->bs_w = gf_bs_new("d", 1, GF_BITSTREAM_WRITE);
 	return tmp;
 }
 
@@ -62,6 +64,8 @@
 	if (ch->s_tool) gf_free(ch->s_tool);
 	if (ch->s_note) gf_free(ch->s_note);
 	if (ch->s_priv) gf_free(ch->s_priv);
+	if (ch->bs_r) gf_bs_del(ch->bs_r);
+	if (ch->bs_w) gf_bs_del(ch->bs_w);
 	memset(ch, 0, sizeof(GF_RTPChannel));
 	gf_free(ch);
 }
@@ -100,8 +104,13 @@
 	} else {
 		ch->net_info.source = gf_strdup(remote_address);
 	}
-	if (trans_info->SSRC) ch->SenderSSRC = trans_info->SSRC;
-
+	if (trans_info->SSRC) {
+		if (trans_info->is_sender) {
+			ch->SSRC = trans_info->SSRC;
+		} else {
+			ch->SenderSSRC = trans_info->SSRC;
+		}
+	}
 	//check we REALLY have unicast or multicast
 	if (gf_sk_is_multicast_address(ch->net_info.source) && ch->net_info.IsUnicast) return GF_SERVICE_ERROR;
 	return GF_OK;
@@ -114,11 +123,14 @@
 	if (ch->rtp) gf_sk_reset(ch->rtp);
 	if (ch->rtcp) gf_sk_reset(ch->rtcp);
 	if (ch->po) gf_rtp_reorderer_reset(ch->po);
-	/*also reset ssrc*/
-	//ch->SenderSSRC = 0;
 	ch->first_SR = 1;
 }
 
+GF_EXPORT
+void gf_rtp_reset_ssrc(GF_RTPChannel *ch)
+{
+	if (ch) ch->SenderSSRC = 0;
+}
 
 GF_EXPORT
 void gf_rtp_enable_nat_keepalive(GF_RTPChannel *ch, u32 nat_timeout)
@@ -135,7 +147,7 @@
 GF_Err gf_rtp_set_info_rtp(GF_RTPChannel *ch, u32 seq_num, u32 rtp_time, u32 ssrc)
 {
 	if (!ch) return GF_BAD_PARAM;
-	ch->rtp_time = rtp_time;
+	ch->CurrentTime = ch->rtp_time = seq_num ? (1 + rtp_time) : 0;
 	ch->last_pck_sn = 0;
 	ch->rtp_first_SN = seq_num;
 	ch->num_sn_loops = 0;
@@ -219,7 +231,7 @@
 			//else bind and set remote destination
 			else {
 				if (!ch->net_info.port_first) ch->net_info.port_first = ch->net_info.client_port_first;
-				e = gf_sk_bind(ch->rtp, local_ip,ch->net_info.port_first, ch->net_info.destination, ch->net_info.client_port_first, GF_SOCK_REUSE_PORT);
+				e = gf_sk_bind(ch->rtp, local_ip,ch->net_info.port_first, ch->net_info.destination, ch->net_info.client_port_first, GF_SOCK_REUSE_PORT | GF_SOCK_FAKE_BIND);
 				if (e) return e;
 			}
 		} else {
@@ -231,13 +243,6 @@
 		}
 		if (UDPBufferSize) gf_sk_set_buffer_size(ch->rtp, IsSource, UDPBufferSize);
 
-		if (IsSource) {
-			if (ch->send_buffer) gf_free(ch->send_buffer);
-			ch->send_buffer = (char *) gf_malloc(sizeof(char) * PathMTU);
-			ch->send_buffer_size = PathMTU;
-		}
-
-
 		//create re-ordering queue for UDP only, and receive
 		if (ReorederingSize && !IsSource) {
 			if (!MaxReorderDelay) MaxReorderDelay = 200;
@@ -259,7 +264,7 @@
 				e = gf_sk_bind(ch->rtcp, local_ip, ch->net_info.client_port_last, ch->net_info.source, port, GF_SOCK_REUSE_PORT);
 				if (e) return e;
 			} else {
-				e = gf_sk_bind(ch->rtcp, local_ip, ch->net_info.port_last, ch->net_info.destination, ch->net_info.client_port_last, GF_SOCK_REUSE_PORT);
+				e = gf_sk_bind(ch->rtcp, local_ip, ch->net_info.port_last, ch->net_info.destination, ch->net_info.client_port_last, GF_SOCK_REUSE_PORT | GF_SOCK_FAKE_BIND);
 				if (e) return e;
 			}
 		} else {
@@ -270,6 +275,12 @@
 		}
 	}
 
+	if (IsSource) {
+		if (ch->send_buffer) gf_free(ch->send_buffer);
+		ch->send_buffer_size = PathMTU + 12;
+		ch->send_buffer = (char *) gf_malloc(sizeof(char) * ch->send_buffer_size);
+	}
+
 	//format CNAME if not done yet
 	if (!ch->CName) {
 		//this is the real CName setup
@@ -279,7 +290,7 @@
 			char name[GF_MAX_IP_NAME_LEN];
 
 			size_t start;
-			gf_get_user_name(name, 1024);
+			gf_get_user_name(name);
 			if (strlen(name)) strcat(name, "@");
 			start = strlen(name);
 			//get host IP or loopback if error
@@ -288,7 +299,6 @@
 		}
 	}
 
-
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_DEBUG))  {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP] Packet Log Format: SSRC SequenceNumber TimeStamp NTP@recvTime deviance, Jiter, PckLost PckTotal BytesTotal\n"));
@@ -325,49 +335,89 @@
 	d = 0.5 + ((Double) gf_rand()) / ((Double) RAND_MAX);
 	/*of a minimal 5sec interval expressed in 1/65536 of a sec*/
 	d = 5.0 * d * 65536;
-	/*we should estimate bandwidth sharing too, but as we only support one sender*/
+	/*we should estimate bandwidth sharing too*/
 	ch->next_report_time = gf_rtp_get_report_time() + (u32) d;
 }
 
+GF_EXPORT
+u32 gf_rtp_read_flush(GF_RTPChannel *ch, u8 *buffer, u32 buffer_size)
+{
+	char *pck;
+	u32 res = 0;
+	if (!ch->po) return 0;
+
+	//pck queue may need to be flushed
+	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_TRUE);
+	if (pck) {
+		memcpy(buffer, pck, res);
+		gf_free(pck);
+	}
+	return res;
+}
 
 GF_EXPORT
-u32 gf_rtp_read_rtp(GF_RTPChannel *ch, char *buffer, u32 buffer_size)
+u32 gf_rtp_flush_rtp(GF_RTPChannel *ch, u8 *buffer, u32 buffer_size)
+{
+	u32 res;
+	char *pck;
+
+	//only if the socket exist (otherwise RTSP interleaved channel)
+	if (!ch || !ch->rtp || !ch->po) return 0;
+
+	//pck queue may need to be flushed
+	pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE);
+	if (pck) {
+		memcpy(buffer, pck, res);
+		gf_free(pck);
+		return res;
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_rtp_read_rtp(GF_RTPChannel *ch, u8 *buffer, u32 buffer_size)
 {
 	GF_Err e;
 	u32 seq_num, res;
-	char *pck;
 
 	//only if the socket exist (otherwise RTSP interleaved channel)
 	if (!ch || !ch->rtp) return 0;
 
-	e = gf_sk_receive(ch->rtp, buffer, buffer_size, 0, &res);
-	if (!res || e || (res < 12)) res = 0;
+	if (ch->no_select) {
+		e = gf_sk_receive_no_select(ch->rtp, buffer, buffer_size, &res);
+	} else {
+		e = gf_sk_receive(ch->rtp, buffer, buffer_size, &res);
+	}
+	if (!res || e || (res < 12)) {
+		assert(res==0);
+		res = 0;
+	}
 	if (res) {
 		ch->total_bytes+=res;
 		ch->total_pck++;
 	}
 	//add the packet to our Queue if any
 	if (ch->po) {
+		char *pck;
 		if (res) {
-			seq_num = ((buffer[2] << 8) & 0xFF00) | (buffer[3] & 0xFF);
+			seq_num = ((((u32)buffer[2]) << 8) & 0xFF00) | (buffer[3] & 0xFF);
 			gf_rtp_reorderer_add(ch->po, (void *) buffer, res, seq_num);
 		}
 
 		//pck queue may need to be flushed
-		pck = (char *) gf_rtp_reorderer_get(ch->po, &res);
+		pck = (char *) gf_rtp_reorderer_get(ch->po, &res, GF_FALSE);
 		if (pck) {
 			memcpy(buffer, pck, res);
 			gf_free(pck);
 		}
 	}
 	/*monitor keep-alive period*/
-	if (ch->nat_keepalive_time_period) {
+	if (ch->nat_keepalive_time_period && !ch->send_interleave) {
 		u32 now = gf_sys_clock();
 		if (res) {
 			ch->last_nat_keepalive_time = now;
 		} else {
 			if (now - ch->last_nat_keepalive_time >= ch->nat_keepalive_time_period) {
-#if 0
 				char rtp_nat[12];
 				rtp_nat[0] = (u8) 0xC0;
 				rtp_nat[1] = ch->PayloadType;
@@ -381,8 +431,7 @@
 				rtp_nat[9] = (ch->SenderSSRC>>16)&0xFF;
 				rtp_nat[10] = (ch->SenderSSRC>>8)&0xFF;
 				rtp_nat[11] = (ch->SenderSSRC)&0xFF;
-#endif
-				e = gf_sk_send(ch->rtp, buffer, 12);
+				e = gf_sk_send(ch->rtp, rtp_nat, 12);
 				if (e) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Error sending NAT keep-alive packet: %s - disabling NAT\n", gf_error_to_string(e) ));
 					ch->nat_keepalive_time_period = 0;
@@ -398,7 +447,7 @@
 
 
 GF_EXPORT
-GF_Err gf_rtp_decode_rtp(GF_RTPChannel *ch, char *pck, u32 pck_size, GF_RTPHeader *rtp_hdr, u32 *PayloadStart)
+GF_Err gf_rtp_decode_rtp(GF_RTPChannel *ch, u8 *pck, u32 pck_size, GF_RTPHeader *rtp_hdr, u32 *PayloadStart)
 {
 	GF_Err e;
 	s32 deviance, delta;
@@ -408,30 +457,29 @@
 	if (!rtp_hdr) return GF_BAD_PARAM;
 	e = GF_OK;
 
+	gf_bs_reassign_buffer(ch->bs_r, pck, pck_size);
 	//we need to uncompress the RTP header
-	rtp_hdr->Version = (pck[0] & 0xC0 ) >> 6;
+	rtp_hdr->Version = gf_bs_read_int(ch->bs_r, 2);
 	if (rtp_hdr->Version != 2) return GF_NOT_SUPPORTED;
 
-	rtp_hdr->Padding = ( pck[0] & 0x20 ) >> 5;
-	rtp_hdr->Extension = ( pck[0] & 0x10 ) >> 4;
-	rtp_hdr->CSRCCount = pck[0] & 0x0F;
-	rtp_hdr->Marker = ( pck[1] & 0x80 ) >> 7;
-	rtp_hdr->PayloadType = pck[1] & 0x7F;
+	rtp_hdr->Padding = gf_bs_read_int(ch->bs_r, 1);
+	rtp_hdr->Extension = gf_bs_read_int(ch->bs_r, 1);
+	rtp_hdr->CSRCCount = gf_bs_read_int(ch->bs_r, 4);
+	rtp_hdr->Marker = gf_bs_read_int(ch->bs_r, 1);
+	rtp_hdr->PayloadType = gf_bs_read_int(ch->bs_r, 7);
 
 	/*we don't support multiple CSRC now. Only one source (the server) is allowed*/
 	if (rtp_hdr->CSRCCount) return GF_NOT_SUPPORTED;
 	/*SeqNum*/
-	rtp_hdr->SequenceNumber = ((pck[2] << 8) & 0xFF00) | (pck[3] & 0xFF);
+	rtp_hdr->SequenceNumber = gf_bs_read_u16(ch->bs_r);
 	/*TS*/
-	rtp_hdr->TimeStamp = (u32) ((pck[4]<<24) &0xFF000000) | ((pck[5]<<16) & 0xFF0000) | ((pck[6]<<8) & 0xFF00) | ((pck[7]) & 0xFF);
+	rtp_hdr->TimeStamp = gf_bs_read_u32(ch->bs_r);
 	/*SSRC*/
-	rtp_hdr->SSRC = ((pck[8]<<24) &0xFF000000) | ((pck[9]<<16) & 0xFF0000) | ((pck[10]<<8) & 0xFF00) | ((pck[11]) & 0xFF);
-	/*first we only work with one payload type...*/
-	if (rtp_hdr->PayloadType != ch->PayloadType) return GF_NOT_SUPPORTED;
+	rtp_hdr->SSRC = gf_bs_read_u32(ch->bs_r);
 
 	/*update RTP time if we didn't get the info*/
 	if (!ch->rtp_time) {
-		ch->rtp_time = rtp_hdr->TimeStamp;
+		ch->rtp_time = 1 + rtp_hdr->TimeStamp;
 		ch->rtp_first_SN = rtp_hdr->SequenceNumber;
 		ch->num_sn_loops = 0;
 	}
@@ -440,7 +488,6 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTP] Assigning SSRC to %d because none was specified through SDP/RTSP\n", ch->SenderSSRC));
 	}
 
-
 	if (!ch->ntp_init && ch->SenderSSRC && (ch->SenderSSRC != rtp_hdr->SSRC) ) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] SSRC mismatch: %d vs %d\n", rtp_hdr->SSRC, ch->SenderSSRC));
 		return GF_IP_NETWORK_EMPTY;
@@ -459,12 +506,16 @@
 	}
 
 	if (ch->last_SR_rtp_time) {
-		s32 diff_sec = ((s32) rtp_hdr->TimeStamp - (s32) ch->last_SR_rtp_time) / (s32) ch->TimeScale;
+		s64 diff_sec;
 		u32 sec = ch->last_SR_NTP_sec;
 		s64 frac;
-		//frac = ch->last_SR_NTP_frac;
 
-		frac = (s32) rtp_hdr->TimeStamp - (s32) ch->last_SR_rtp_time - diff_sec*(s32)ch->TimeScale;
+		frac = (s64) rtp_hdr->TimeStamp;
+		frac -= (s64) ch->last_SR_rtp_time;
+		if (frac<0) frac += 0xFFFFFFFF;
+		diff_sec = frac / ch->TimeScale;
+
+		frac -= diff_sec*ch->TimeScale;
 		frac *= 0xFFFFFFFF;
 		frac /= ch->TimeScale;
 		frac += ch->last_SR_NTP_frac;
@@ -472,7 +523,7 @@
 			sec += 1;
 			frac -= 0xFFFFFFFF;
 		}
-		rtp_hdr->recomputed_ntp_ts = sec + diff_sec;
+		rtp_hdr->recomputed_ntp_ts = sec + (s32) diff_sec;
 		rtp_hdr->recomputed_ntp_ts <<= 32;
 		rtp_hdr->recomputed_ntp_ts |= frac;
 	}
@@ -515,7 +566,6 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_RTP, GF_LOG_DEBUG))  {
-		ch->total_pck++;
 		ch->total_bytes += pck_size-12;
 
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[RTP]\t%d\t%d\t%u\t%d\t%d\t%d\t%d\t%d\t%d\n",
@@ -554,9 +604,9 @@
 Double gf_rtp_get_current_time(GF_RTPChannel *ch)
 {
 	Double ret;
-	if (!ch) return 0.0;
+	if (!ch || !ch->rtp_time) return 0.0;
 	ret = (Double) ch->CurrentTime;
-	ret -= (Double) ch->rtp_time;
+	ret -= (Double) (ch->rtp_time-1);
 	ret /= ch->TimeScale;
 	return ret;
 }
@@ -567,14 +617,12 @@
 
 
 GF_EXPORT
-GF_Err gf_rtp_send_packet(GF_RTPChannel *ch, GF_RTPHeader *rtp_hdr, char *pck, u32 pck_size, Bool fast_send)
+GF_Err gf_rtp_send_packet(GF_RTPChannel *ch, GF_RTPHeader *rtp_hdr, u8 *pck, u32 pck_size, Bool fast_send)
 {
 	GF_Err e;
 	u32 i, Start;
 	char *hdr = NULL;
 
-	GF_BitStream *bs;
-
 	if (!ch || !rtp_hdr
 	        || !ch->send_buffer
 	        || !pck
@@ -582,34 +630,42 @@
 
 	if (rtp_hdr->CSRCCount) fast_send = GF_FALSE;
 
-	if (12 + pck_size + 4*rtp_hdr->CSRCCount > ch->send_buffer_size) return GF_IO_ERR;
+	if (12 + pck_size + 4*rtp_hdr->CSRCCount > ch->send_buffer_size)
+		return GF_IO_ERR;
 
 	if (fast_send) {
 		hdr = pck - 12;
-		bs = gf_bs_new(hdr, 12, GF_BITSTREAM_WRITE);
+		gf_bs_reassign_buffer(ch->bs_w, hdr, 12);
 	} else {
-		bs = gf_bs_new(ch->send_buffer, ch->send_buffer_size, GF_BITSTREAM_WRITE);
+		gf_bs_reassign_buffer(ch->bs_w, ch->send_buffer, ch->send_buffer_size);
 	}
 	//write header
-	gf_bs_write_int(bs, rtp_hdr->Version, 2);
-	gf_bs_write_int(bs, rtp_hdr->Padding, 1);
-	gf_bs_write_int(bs, rtp_hdr->Extension, 1);
-	gf_bs_write_int(bs, rtp_hdr->CSRCCount, 4);
-	gf_bs_write_int(bs, rtp_hdr->Marker, 1);
-	gf_bs_write_int(bs, rtp_hdr->PayloadType, 7);
-	gf_bs_write_u16(bs, rtp_hdr->SequenceNumber);
-	gf_bs_write_u32(bs, rtp_hdr->TimeStamp);
-	gf_bs_write_u32(bs, ch->SSRC);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->Version, 2);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->Padding, 1);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->Extension, 1);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->CSRCCount, 4);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->Marker, 1);
+	gf_bs_write_int(ch->bs_w, rtp_hdr->PayloadType, 7);
+	gf_bs_write_u16(ch->bs_w, rtp_hdr->SequenceNumber);
+	gf_bs_write_u32(ch->bs_w, rtp_hdr->TimeStamp);
+	gf_bs_write_u32(ch->bs_w, ch->SSRC);
 
 	for (i=0; i<rtp_hdr->CSRCCount; i++) {
-		gf_bs_write_u32(bs, rtp_hdr->CSRC[i]);
+		gf_bs_write_u32(ch->bs_w, rtp_hdr->CSRC[i]);
 	}
 	//nb: RTP header is always aligned
-	Start = (u32) gf_bs_get_position(bs);
-	gf_bs_del(bs);
+	Start = (u32) gf_bs_get_position(ch->bs_w);
 
+	if (ch->send_interleave) {
+		if (fast_send) {
+			e = ch->send_interleave(ch->interleave_cbk1, ch->interleave_cbk2, GF_FALSE, hdr, pck_size+12);
+		} else {
+			memcpy(ch->send_buffer + Start, pck, pck_size);
+			e = ch->send_interleave(ch->interleave_cbk1, ch->interleave_cbk2, GF_FALSE, ch->send_buffer, Start + pck_size);
+		}
+	}
 	//copy payload
-	if (fast_send) {
+	else if (fast_send) {
 		e = gf_sk_send(ch->rtp, hdr, pck_size+12);
 	} else {
 		memcpy(ch->send_buffer + Start, pck, pck_size);
@@ -633,7 +689,7 @@
 	ch->last_pck_ts = rtp_hdr->TimeStamp;
 	gf_net_get_ntp(&ch->last_pck_ntp_sec, &ch->last_pck_ntp_frac);
 
-	if (!ch->no_auto_rtcp) gf_rtp_send_rtcp_report(ch, NULL, NULL);
+	if (!ch->no_auto_rtcp) gf_rtp_send_rtcp_report(ch);
 	return GF_OK;
 }
 
@@ -658,13 +714,14 @@
 	return ch->TimeScale;
 }
 
-GF_EXPORT
+#if 0 //unused
 u32 gf_rtp_is_active(GF_RTPChannel *ch)
 {
 	if (!ch) return 0;
 	if (!ch->rtp_first_SN && !ch->rtp_time) return 0;
 	return 1;
 }
+#endif
 
 GF_EXPORT
 u8 gf_rtp_get_low_interleave_id(GF_RTPChannel *ch)
@@ -721,28 +778,28 @@
 
 
 GF_EXPORT
-GF_Err gf_rtp_setup_payload(GF_RTPChannel *ch, GF_RTPMap *map)
+GF_Err gf_rtp_setup_payload(GF_RTPChannel *ch, u32 PayloadType, u32 ClockRate)
 {
-	if (!ch || !map) return GF_BAD_PARAM;
-	ch->PayloadType = map->PayloadType;
-	ch->TimeScale = map->ClockRate;
+	if (!ch || !PayloadType || !ClockRate) return GF_BAD_PARAM;
+	ch->PayloadType = PayloadType;
+	ch->TimeScale = ClockRate;
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_RTSPTransport *gf_rtp_get_transport(GF_RTPChannel *ch)
+const GF_RTSPTransport *gf_rtp_get_transport(GF_RTPChannel *ch)
 {
 	if (!ch) return NULL;
 	return &ch->net_info;
 }
 
-GF_EXPORT
+#if 0 //unused
 u32 gf_rtp_get_local_ssrc(GF_RTPChannel *ch)
 {
 	if (!ch) return 0;
 	return ch->SSRC;
 }
-
+#endif
 
 #if 0
 "#RTP log format:\n"
@@ -799,29 +856,27 @@
 	return tmp;
 }
 
-static void DelItem(GF_POItem *it)
-{
-	if (it) {
-		if (it->next) DelItem(it->next);
-		gf_free(it->pck);
-		gf_free(it);
-	}
-}
-
-
 GF_EXPORT
 void gf_rtp_reorderer_del(GF_RTPReorder *po)
 {
-	if (po->in) DelItem(po->in);
+	gf_rtp_reorderer_reset(po);
 	gf_free(po);
 }
 
 GF_EXPORT
 void gf_rtp_reorderer_reset(GF_RTPReorder *po)
 {
+	GF_POItem *item;
 	if (!po) return;
 
-	if (po->in) DelItem(po->in);
+	item = po->in;
+	while (item) {
+		GF_POItem *next = item->next;
+		gf_free(item->pck);
+		gf_free(item);
+		item = next;
+	}
+
 	po->head_seqnum = 0;
 	po->Count = 0;
 	po->IsInit = 0;
@@ -922,7 +977,7 @@
 //ever received packet if its SeqNum was unknown
 //the BUFFER is yours, you must delete it
 GF_EXPORT
-void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size)
+void *gf_rtp_reorderer_get(GF_RTPReorder *po, u32 *pck_size, Bool force_flush)
 {
 	GF_POItem *t;
 	u32 bounds;
@@ -960,6 +1015,9 @@
 	//update timing
 	else {
 check_timeout:
+
+		if (force_flush) goto send_it;
+
 		if (!po->LastTime) {
 			po->LastTime = gf_sys_clock();
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("[rtp] Packet Reorderer: starting timeout at %d\n", po->LastTime));
@@ -988,5 +1046,15 @@
 	return ret;
 }
 
+GF_Err gf_rtp_set_interleave_callbacks(GF_RTPChannel *ch, gf_rtp_tcp_callback RTP_TCPCallback, void *cbk1, void *cbk2)
+{
+	if (!ch) return GF_BAD_PARAM;
+	ch->send_interleave = RTP_TCPCallback;
+	ch->interleave_cbk1 = cbk1;
+	ch->interleave_cbk2 = cbk2;
+	return GF_OK;
+}
+
+
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/src/ietf/rtp_depacketizer.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_depacketizer.c Changed

@@ -27,16 +27,28 @@
 
 #ifndef GPAC_DISABLE_STREAMING
 
-#include <gpac/esi.h>
 #include <gpac/base_coding.h>
 #include <gpac/constants.h>
 #include <gpac/isomedia.h>
 #include <gpac/mpeg4_odf.h>
 #include <gpac/avparse.h>
 
+static void gf_rtp_parse_pass_through(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
+{
+	if (!rtp) return;
+
+	rtp->sl_hdr.accessUnitStartFlag = 1;
+	if (rtp->sl_hdr.compositionTimeStamp != hdr->TimeStamp)
+		rtp->sl_hdr.accessUnitStartFlag = 1;
 
+	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+	rtp->sl_hdr.decodingTimeStamp = hdr->TimeStamp;
+	rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
+	rtp->sl_hdr.randomAccessPointFlag = 1;
+	rtp->on_sl_packet(rtp->udta, payload, size, &rtp->sl_hdr, GF_OK);
+}
 
-static void gf_rtp_parse_mpeg4(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_mpeg4(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u32 aux_size, first_idx, au_hdr_size, num_au;
 	u64 pay_start, au_size;
@@ -46,8 +58,6 @@
 	hdr_bs = gf_bs_new(payload, size, GF_BITSTREAM_READ);
 	aux_bs = gf_bs_new(payload, size, GF_BITSTREAM_READ);
 
-//	fprintf(stderr, "parsing packet %d size %d ts %d M %d\n", hdr->SequenceNumber, size, hdr->TimeStamp, hdr->Marker);
-
 	/*global AU header len*/
 	au_hdr_size = 0;
 	if (rtp->sl_map.auh_first_min_len) {
@@ -180,6 +190,8 @@
 				au_hdr_size -= 1;
 				if (rtp->sl_hdr.randomAccessPointFlag)
 					rtp->sl_hdr.randomAccessPointFlag=1;
+			} else {
+				rtp->sl_hdr.randomAccessPointFlag=1;
 			}
 			/*stream state - map directly to seqNum*/
 			if (rtp->sl_map.StreamStateIndication) {
@@ -240,7 +252,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-static void gf_rtp_parse_mpeg12_audio(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_mpeg12_audio(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u16 offset;
 	u32 mp3hdr, ts;
@@ -264,12 +276,20 @@
 
 		/*frame start if no offset*/
 		rtp->sl_hdr.accessUnitStartFlag = offset ? 0 : 1;
+		rtp->sl_hdr.randomAccessPointFlag = 1;
 
 		/*new frame, store size*/
 		rtp->sl_hdr.compositionTimeStampFlag = 0;
 		if (rtp->sl_hdr.accessUnitStartFlag) {
-			mp3hdr = GF_4CC((u8) payload[0], (u8) payload[1], (u8) payload[2], (u8) payload[3]);
+			mp3hdr = GF_4CC((u32) payload[0], (u8) payload[1], (u8) payload[2], (u8) payload[3]);
 			rtp->sl_hdr.accessUnitLength = gf_mp3_frame_size(mp3hdr);
+			rtp->sl_hdr.channels = gf_mp3_num_channels(mp3hdr);
+			rtp->sl_hdr.samplerate = gf_mp3_sampling_rate(mp3hdr);
+			if (rtp->sl_hdr.samplerate) {
+				rtp->sl_hdr.au_duration = gf_mp3_window_size(mp3hdr);
+				rtp->sl_hdr.au_duration *= rtp->clock_rate;
+				rtp->sl_hdr.au_duration /= rtp->sl_hdr.samplerate;
+			}
 			rtp->sl_hdr.compositionTimeStampFlag = 1;
 		}
 		if (!rtp->sl_hdr.accessUnitLength) break;
@@ -301,7 +321,7 @@
 
 #endif
 
-static void gf_rtp_parse_mpeg12_video(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_mpeg12_video(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u8 pic_type;
 
@@ -334,9 +354,9 @@
 	}
 }
 
-static void gf_rtp_parse_amr(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_amr(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
-	unsigned char c, type;
+	unsigned char c;
 	char *data;
 	/*we support max 30 frames in one RTP packet...*/
 	u32 nbFrame, i, frame_size;
@@ -354,6 +374,7 @@
 	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
 	/*then each frame*/
 	for (i=0; i<nbFrame; i++) {
+		u8 type;
 		c = payload[i + 1];
 		type = ((c & 0x78) >> 3);
 		if (rtp->payt==GF_RTP_PAYT_AMR) {
@@ -365,6 +386,7 @@
 		rtp->sl_hdr.compositionTimeStampFlag = 1;
 		rtp->sl_hdr.accessUnitStartFlag = 1;
 		rtp->sl_hdr.accessUnitEndFlag = 0;
+		rtp->sl_hdr.randomAccessPointFlag = 1;
 		/*send TOC*/
 		rtp->on_sl_packet(rtp->udta, &payload[i+1], 1, &rtp->sl_hdr, GF_OK);
 		rtp->sl_hdr.packetSequenceNumber ++;
@@ -379,7 +401,7 @@
 }
 
 
-static void gf_rtp_parse_h263(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_h263(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	GF_BitStream *bs;
 	Bool P_bit, V_bit;
@@ -414,10 +436,9 @@
 		rtp->sl_hdr.accessUnitStartFlag = 1;
 		rtp->sl_hdr.accessUnitEndFlag = 0;
 
-		if (rtp->sl_hdr.accessUnitStartFlag) {
-			/*the first 16 bytes are NOT sent on the wire*/
-			rtp->sl_hdr.randomAccessPointFlag = (payload[offset+2]&0x02) ? 0 : 1;
-		}
+		/*the first 16 bytes are NOT sent on the wire*/
+		rtp->sl_hdr.randomAccessPointFlag = (payload[offset+2]&0x02) ? 0 : 1;
+
 		/*send missing start code*/
 		rtp->on_sl_packet(rtp->udta, (char *) blank, 2, &rtp->sl_hdr, GF_OK);
 		/*send payload*/
@@ -438,7 +459,7 @@
 static void gf_rtp_ttxt_flush(GF_RTPDepacketizer *rtp, u32 ts)
 {
 	GF_BitStream *bs;
-	char *data;
+	u8 *data;
 	u32 data_size;
 	if (!rtp->inter_bs) return;
 
@@ -473,7 +494,7 @@
 	rtp->nb_txt_frag = rtp->cur_txt_frag = rtp->sidx = rtp->txt_len = rtp->nb_mod_frag = 0;
 }
 
-static void gf_rtp_parse_ttxt(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_ttxt(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	Bool is_utf_16;
 	u32 type, ttu_len, duration, ts, sidx, txt_size;
@@ -585,7 +606,7 @@
 
 static void gf_rtp_h264_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
 {
-	char *data;
+	u8 *data;
 	u32 data_size, nal_s;
 	if (!rtp->inter_bs) return;
 
@@ -608,7 +629,7 @@
 	/*set F-bit since nal is corrupted*/
 //	if (missed_end) data[4] |= 0x80;
 
-	rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+	rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
 	rtp->sl_hdr.compositionTimeStampFlag = 1;
 	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
 	rtp->sl_hdr.decodingTimeStampFlag = 0;
@@ -619,7 +640,7 @@
 	gf_free(data);
 }
 
-void gf_rtp_parse_h264(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+void gf_rtp_parse_h264(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	char nalhdr[4];
 	u32 nal_type;
@@ -629,19 +650,12 @@
 
 	/*set start*/
 	if (rtp->sl_hdr.compositionTimeStamp != hdr->TimeStamp) {
-		if (rtp->flags & GF_RTP_UNRELIABLE_M) {
-			rtp->sl_hdr.accessUnitEndFlag = 1;
-			rtp->on_sl_packet(rtp->udta, NULL, 0, &rtp->sl_hdr, GF_OK);
-		}
 		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;
-	} else if (rtp->sl_hdr.accessUnitEndFlag) {
-		rtp->flags |= GF_RTP_UNRELIABLE_M;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[H264 RTP] error in Marker bit - switching to unreliable mode\n"));
 	}
 
 	/*single NALU*/
@@ -672,7 +686,7 @@
 		rtp->sl_hdr.accessUnitStartFlag = 0;
 		rtp->sl_hdr.compositionTimeStampFlag = 1;
 		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
-		rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+		rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
 
 		/*send NAL payload*/
 		rtp->on_sl_packet(rtp->udta, payload, size, &rtp->sl_hdr, GF_OK);
@@ -709,7 +723,7 @@
 				rtp->sl_hdr.accessUnitStartFlag = 0;
 				rtp->sl_hdr.compositionTimeStampFlag = 0;
 			}
-			rtp->sl_hdr.accessUnitEndFlag = (!(rtp->flags & GF_RTP_UNRELIABLE_M) && hdr->Marker && (offset+nal_size==size)) ? 1 : 0;
+			rtp->sl_hdr.accessUnitEndFlag = (hdr->Marker && (offset+nal_size==size)) ? 1 : 0;
 			if (send) rtp->on_sl_packet(rtp->udta, payload+offset, nal_size, &rtp->sl_hdr, GF_OK);
 			offset += nal_size;
 		}
@@ -750,7 +764,7 @@
 
 static void gf_rtp_hevc_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
 {
-	char *data;
+	u8 *data;
 	u32 data_size, nal_s;
 	if (!rtp->inter_bs) return;
 
@@ -768,7 +782,7 @@
 	/*set F-bit since nal is corrupted*/
 	if (missed_end) data[4] |= 0x80;
 
-	rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+	rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
 	rtp->sl_hdr.compositionTimeStampFlag = 1;
 	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
 	rtp->sl_hdr.decodingTimeStampFlag = 0;
@@ -778,7 +792,7 @@
 	gf_free(data);
 }
 
-static void gf_rtp_parse_hevc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_hevc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u32 nal_type;
 	char nalu_size[4];
@@ -787,19 +801,12 @@
 
 	/*set start*/
 	if (rtp->sl_hdr.compositionTimeStamp != hdr->TimeStamp) {
-		if (rtp->flags & GF_RTP_UNRELIABLE_M) {
-			rtp->sl_hdr.accessUnitEndFlag = 1;
-			rtp->on_sl_packet(rtp->udta, NULL, 0, &rtp->sl_hdr, GF_OK);
-		}
 		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;
-	} else if (rtp->sl_hdr.accessUnitEndFlag) {
-		rtp->flags |= GF_RTP_UNRELIABLE_M;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[HEVC RTP] error in Marker bit - switching to unreliable mode\n"));
 	}
 
 	/*Single NALU*/
@@ -822,7 +829,7 @@
 		rtp->sl_hdr.accessUnitStartFlag = 0;
 		rtp->sl_hdr.compositionTimeStampFlag = 1;
 		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
-		rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+		rtp->sl_hdr.accessUnitEndFlag = hdr->Marker;
 
 		/*send NAL payload*/
 		rtp->on_sl_packet(rtp->udta, payload, size, &rtp->sl_hdr, GF_OK);
@@ -851,7 +858,7 @@
 
 			rtp->sl_hdr.accessUnitStartFlag = 0;
 			rtp->sl_hdr.compositionTimeStampFlag = 0;
-			rtp->sl_hdr.accessUnitEndFlag = (!(rtp->flags & GF_RTP_UNRELIABLE_M) && hdr->Marker && (offset+nal_size==size)) ? 1 : 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;
 		}
@@ -892,7 +899,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-static void gf_rtp_parse_latm(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_latm(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u32 remain, latm_hdr_size, latm_size;
 
@@ -920,6 +927,7 @@
 }
 #endif
 
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 static void gf_rtp_parse_3gpp_dims(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
 {
 	u32 du_size, offset, dsize, hdr_size;
@@ -997,27 +1005,30 @@
 	}
 
 }
+#endif
+
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-static void gf_rtp_parse_ac3(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+static void gf_rtp_parse_ac3(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	u8 ft;
 
 	rtp->sl_hdr.compositionTimeStampFlag = 1;
 	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+	rtp->sl_hdr.randomAccessPointFlag = 1;
 	ft = payload[0];
 	/*nb_pck = payload[1];*/
 	payload += 2;
 	size -= 2;
 
 	if (!ft) {
-		GF_AC3Header hdr;
-		memset(&hdr, 0, sizeof(GF_AC3Header));
+		GF_AC3Header ac3hdr;
+		memset(&ac3hdr, 0, sizeof(GF_AC3Header));
 		rtp->sl_hdr.accessUnitStartFlag = rtp->sl_hdr.accessUnitEndFlag = 1;
 		while (size) {
 			u32 offset;
-			if (!gf_ac3_parser((u8*)payload, size, &offset, &hdr, GF_FALSE)) {
+			if (!gf_ac3_parser((u8*)payload, size, &offset, &ac3hdr, GF_FALSE)) {
 				return;
 			}
 			if (offset) {
@@ -1025,10 +1036,10 @@
 				payload+=offset;
 				size-=offset;
 			}
-			rtp->on_sl_packet(rtp->udta, payload, hdr.framesize, &rtp->sl_hdr, GF_OK);
-			if (size < hdr.framesize) return;
-			size -= hdr.framesize;
-			payload += hdr.framesize;
+			rtp->on_sl_packet(rtp->udta, payload, ac3hdr.framesize, &rtp->sl_hdr, GF_OK);
+			if (size < ac3hdr.framesize) return;
+			size -= ac3hdr.framesize;
+			payload += ac3hdr.framesize;
 			rtp->sl_hdr.compositionTimeStamp += 1536;
 		}
 		rtp->flags |= GF_RTP_NEW_AU;
@@ -1080,7 +1091,9 @@
 	else if (!stricmp(map->payload_name, "AMR-WB")) return GF_RTP_PAYT_AMR_WB;
 	else if (!stricmp(map->payload_name, "3gpp-tt")) return GF_RTP_PAYT_3GPP_TEXT;
 	else if (!stricmp(map->payload_name, "H264")) return GF_RTP_PAYT_H264_AVC;
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	else if (!stricmp(map->payload_name, "richmedia+xml")) return GF_RTP_PAYT_3GPP_DIMS;
+#endif
 	else if (!stricmp(map->payload_name, "ac3")) return GF_RTP_PAYT_AC3;
 	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;
@@ -1136,7 +1149,7 @@
 	}
 	/*object type indication (not needed when IOD is here)*/
 	else if (!stricmp(param_name, "ObjectType")) {
-		rtp->sl_map.ObjectTypeIndication = atoi(param_val);
+		rtp->sl_map.CodecID = atoi(param_val);
 	}
 	else if (!stricmp(param_name, "StreamType"))
 		rtp->sl_map.StreamType = atoi(param_val);
@@ -1145,12 +1158,12 @@
 		/*in case no IOD and no streamType/OTI in the file*/
 		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.ObjectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
 		}
 		/*in case no IOD and no streamType/OTI in the file*/
 		else if (!stricmp(param_val, "avc-video") ) {
 			rtp->sl_map.StreamType = GF_STREAM_VISUAL;
-			rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_AVC;
+			rtp->sl_map.CodecID = GF_CODECID_AVC;
 		}
 	}
 
@@ -1208,18 +1221,20 @@
 	/*reset sl map*/
 	memset(&rtp->sl_map, 0, sizeof(GP_RTPSLMap));
 
-	if (!stricmp(map->payload_name, "enc-mpeg4-generic")) rtp->flags |= GF_RTP_HAS_ISMACRYP;
+	if (map && !stricmp(map->payload_name, "enc-mpeg4-generic")) rtp->flags |= GF_RTP_HAS_ISMACRYP;
 
 
 	/*then process all FMTPs*/
-	i=0;
-	while ((fmtp = (GF_SDP_FMTP*)gf_list_enum(media->FMTP, &i))) {
-		GF_X_Attribute *att;
-		//we work with only one PayloadType for now
-		if (fmtp->PayloadType != map->PayloadType) continue;
-		j=0;
-		while ((att = (GF_X_Attribute *)gf_list_enum(fmtp->Attributes, &j))) {
-			payt_set_param(rtp, att->Name, att->Value);
+	if (media) {
+		i=0;
+		while ((fmtp = (GF_SDP_FMTP*)gf_list_enum(media->FMTP, &i))) {
+			GF_X_Attribute *att;
+			//we work with only one PayloadType for now
+			if (map && (fmtp->PayloadType != map->PayloadType)) continue;
+			j=0;
+			while ((att = (GF_X_Attribute *)gf_list_enum(fmtp->Attributes, &j))) {
+				payt_set_param(rtp, att->Name, att->Value);
+			}
 		}
 	}
 
@@ -1276,7 +1291,7 @@
 		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		gf_bs_del(bs);
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+		rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
 
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_latm;
@@ -1301,36 +1316,38 @@
 		rtp->sl_map.auh_min_len = rtp->sl_map.auh_first_min_len;
 		rtp->sl_map.auh_first_min_len += rtp->sl_map.IndexLength;
 		rtp->sl_map.auh_min_len += rtp->sl_map.IndexDeltaLength;
+		if (!map) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Missing required payload map\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		/*RFC3016 flags*/
 		if (!stricmp(map->payload_name, "MP4V-ES")) {
 			rtp->sl_map.StreamType = GF_STREAM_VISUAL;
-			rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
+			rtp->sl_map.CodecID = GF_CODECID_MPEG4_PART2;
 		}
 		else if (!strnicmp(map->payload_name, "AAC", 3)) {
 			rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-			rtp->sl_map.ObjectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
 		}
 		else if (!stricmp(map->payload_name, "MP4A-LATM")) {
 			rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-			rtp->sl_map.ObjectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+			rtp->sl_map.CodecID = GF_CODECID_AAC_MPEG4;
 		}
 		/*MPEG-4 video, check RAPs if not indicated*/
-		if ((rtp->sl_map.StreamType == GF_STREAM_VISUAL) && (rtp->sl_map.ObjectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) && !rtp->sl_map.RandomAccessIndication) {
+		if ((rtp->sl_map.StreamType == GF_STREAM_VISUAL) && (rtp->sl_map.CodecID == GF_CODECID_MPEG4_PART2) && !rtp->sl_map.RandomAccessIndication) {
 			rtp->flags |= GF_RTP_M4V_CHECK_RAP;
 		}
 #ifndef GPAC_DISABLE_AV_PARSERS
-		if ((rtp->sl_map.ObjectTypeIndication == GPAC_OTI_AUDIO_AAC_MPEG4) && !rtp->sl_map.config) {
+		if ((rtp->sl_map.CodecID == GF_CODECID_AAC_MPEG4) && !rtp->sl_map.config && media) {
 			GF_M4ADecSpecInfo cfg;
-			GF_RTPMap*map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
+			GF_RTPMap *a_map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
 
 			memset(&cfg, 0, sizeof(GF_M4ADecSpecInfo));
 			cfg.audioPL = rtp->sl_map.PL_ID;
-			cfg.nb_chan = map->AudioChannels;
-			cfg.nb_chan = 1;
-			cfg.base_sr = map->ClockRate/2;
-			cfg.sbr_sr = map->ClockRate;
-			cfg.base_object_type = GF_M4A_AAC_LC;
-			cfg.base_object_type = 5;
+			cfg.nb_chan = a_map->AudioChannels ? a_map->AudioChannels : 1;
+			cfg.base_sr = a_map->ClockRate/2;
+			cfg.sbr_sr = a_map->ClockRate;
+			cfg.base_object_type = GF_M4A_AAC_SBR;
 			cfg.sbr_object_type = GF_M4A_AAC_MAIN;
 			gf_m4a_write_config(&cfg, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		}
@@ -1341,7 +1358,7 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 	case GF_RTP_PAYT_MPEG12_AUDIO:
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
+		rtp->sl_map.CodecID = GF_CODECID_MPEG2_PART3;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_mpeg12_audio;
 		break;
@@ -1352,77 +1369,52 @@
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		rtp->sl_map.StreamType = GF_STREAM_VISUAL;
 		/*FIXME: how to differentiate MPEG1 from MPEG2 video before any frame is received??*/
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
+		rtp->sl_map.CodecID = GF_CODECID_MPEG1;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_mpeg12_video;
 		break;
 	case GF_RTP_PAYT_AMR:
 	case GF_RTP_PAYT_AMR_WB:
-	{
-		GF_BitStream *bs;
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-		/*create DSI*/
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		if (rtp->payt == GF_RTP_PAYT_AMR) {
-			gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_3GP_AMR);
-			gf_bs_write_u32(bs, 8000);
-			gf_bs_write_u16(bs, 1);
-			gf_bs_write_u16(bs, 160);
-		} else {
-			gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_3GP_AMR_WB);
-			gf_bs_write_u32(bs, 16000);
-			gf_bs_write_u16(bs, 1);
-			gf_bs_write_u16(bs, 320);
-		}
-		gf_bs_write_u8(bs, 16);
-		gf_bs_write_u8(bs, 1);
-		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
-		gf_bs_del(bs);
+		rtp->sl_map.CodecID = (rtp->payt == GF_RTP_PAYT_AMR) ? GF_CODECID_AMR : GF_CODECID_AMR_WB;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_amr;
-	}
-	break;
+		break;
 	case GF_RTP_PAYT_H263:
-	{
-		u32 x, y, w, h;
-		GF_X_Attribute *att;
-		GF_BitStream *bs;
-		x = y = w = h = 0;
-		j=0;
-		while ((att = (GF_X_Attribute *)gf_list_enum(media->Attributes, &j))) {
-			if (stricmp(att->Name, "cliprect")) continue;
-			/*only get the display area*/
-			sscanf(att->Value, "%u,%u,%u,%u", &y, &x, &h, &w);
+		if (media) {
+			GF_X_Attribute *att;
+			j=0;
+			while ((att = (GF_X_Attribute *)gf_list_enum(media->Attributes, &j))) {
+				if (stricmp(att->Name, "cliprect")) continue;
+				/*only get the display area*/
+				sscanf(att->Value, "%u,%u,%u,%u", &rtp->y, &rtp->x, &rtp->h, &rtp->w);
+			}
 		}
-
 		rtp->sl_map.StreamType = GF_STREAM_VISUAL;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-		/*create DSI*/
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_H263);
-		gf_bs_write_u16(bs, w);
-		gf_bs_write_u16(bs, h);
-		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
-		gf_bs_del(bs);
+		rtp->sl_map.CodecID = GF_CODECID_H263;
+
 		/*we signal RAPs*/
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
+
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_h263;
-	}
-	break;
+		break;
+
 	case GF_RTP_PAYT_3GPP_TEXT:
 	{
 		char *tx3g, *a_tx3g;
 		GF_BitStream *bs;
 		u32 nb_desc;
-		GF_SDP_FMTP *fmtp;
 		GF_TextConfig tcfg;
 		memset(&tcfg, 0, sizeof(GF_TextConfig));
 		tcfg.tag = GF_ODF_TEXT_CFG_TAG;
 		tcfg.Base3GPPFormat = 0x10;
 		tcfg.MPEGExtendedFormat = 0x10;
 		tcfg.profileLevel = 0x10;
+		if (!map || !media) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Missing required payload map\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
 		tcfg.timescale = map->ClockRate;
 		tcfg.sampleDescriptionFlags = 1;
 		tx3g = NULL;
@@ -1493,7 +1485,7 @@
 		gf_bs_write_u16(bs, tcfg.vert_offset);
 		gf_bs_get_content(bs, &rtp->sl_map.config, &rtp->sl_map.configSize);
 		rtp->sl_map.StreamType = GF_STREAM_TEXT;
-		rtp->sl_map.ObjectTypeIndication = 0x08;
+		rtp->sl_map.CodecID = GF_CODECID_TEXT_MPEG4;
 		gf_bs_del(bs);
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_ttxt;
@@ -1503,15 +1495,20 @@
 	case GF_RTP_PAYT_H264_AVC:
 	case GF_RTP_PAYT_H264_SVC:
 	{
-		GF_SDP_FMTP *fmtp;
-		GF_AVCConfig *avcc = gf_odf_avc_cfg_new();
+		GF_AVCConfig *avcc;
+		if (!map || !media) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Missing required payload map\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		avcc = gf_odf_avc_cfg_new();
 		avcc->AVCProfileIndication = (rtp->sl_map.PL_ID>>16) & 0xFF;
 		avcc->profile_compatibility = (rtp->sl_map.PL_ID>>8) & 0xFF;
 		avcc->AVCLevelIndication = rtp->sl_map.PL_ID & 0xFF;
 		avcc->configurationVersion = 1;
 		avcc->nal_unit_size = 4;
 		rtp->sl_map.StreamType = 4;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_AVC;
+		rtp->sl_map.CodecID = GF_CODECID_AVC;
 		/*we will signal RAPs*/
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*rewrite sps and pps*/
@@ -1574,12 +1571,16 @@
 	case GF_RTP_PAYT_LHVC:
 #ifndef GPAC_DISABLE_HEVC
 	{
-		GF_SDP_FMTP *fmtp;
-		GF_HEVCConfig *hevcc = gf_odf_hevc_cfg_new();
+		GF_HEVCConfig *hevcc;
+		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;
 		rtp->sl_map.StreamType = 4;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+		rtp->sl_map.CodecID = GF_CODECID_HEVC;
 		/*we will signal RAPs*/
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		i=0;
@@ -1653,10 +1654,11 @@
 	break;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	/*todo - rewrite DIMS config*/
 	case GF_RTP_PAYT_3GPP_DIMS:
 		rtp->sl_map.StreamType = GF_STREAM_SCENE;
-		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_SCENE_DIMS;
+		rtp->sl_map.CodecID = GF_CODECID_DIMS;
 		/*we will signal RAPs*/
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*we map DIMS CTR to AU seq num, hence 3 bits*/
@@ -1665,49 +1667,128 @@
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_3gpp_dims;
 		break;
+#endif
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 	case GF_RTP_PAYT_AC3:
 		rtp->sl_map.StreamType = GF_STREAM_AUDIO;
-		rtp->sl_map.ObjectTypeIndication = 0xA5;
+		rtp->sl_map.CodecID = GF_CODECID_AC3;
 		rtp->sl_map.RandomAccessIndication = GF_TRUE;
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_ac3;
 		break;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 	default:
-		return GF_NOT_SUPPORTED;
+		if (rtp->payt >= GF_RTP_PAYT_LAST_STATIC_DEFINED)
+			return GF_NOT_SUPPORTED;
+		rtp->depacketize = gf_rtp_parse_pass_through;
+		return GF_OK;
 	}
 	return GF_OK;
 }
 
+const GF_RTPStaticMap static_payloads [] =
+{
+	{ GF_RTP_PAYT_PCMU, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_GSM, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_G723, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_DVI4_8K, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_DVI4_16K, 16000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_LPC, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_PCMA, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_G722, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_L16_STEREO, 44100, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_L16_MONO, 44100, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_QCELP_BASIC, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_CN, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_MPEG12_AUDIO, 90000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_G728, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_DVI4_11K, 11025, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_DVI4_22K, 22050, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_G729, 8000, GF_STREAM_AUDIO},
+	{ GF_RTP_PAYT_CelB, 90000, GF_STREAM_VISUAL},
+	{ GF_RTP_PAYT_JPEG, 90000, GF_STREAM_VISUAL},
+	{ GF_RTP_PAYT_nv, 90000, GF_STREAM_VISUAL},
+	{ GF_RTP_PAYT_H261, 90000, GF_STREAM_VISUAL},
+	{ GF_RTP_PAYT_MPEG12_VIDEO, 90000, GF_STREAM_VISUAL},
+	{ GF_RTP_PAYT_MP2T, 90000, GF_STREAM_FILE, 0, "video/mp2t"},
+	{ GF_RTP_PAYT_H263, 90000, GF_STREAM_VISUAL}
+};
+
+static const GF_RTPStaticMap *gf_rtp_is_valid_static_payt(u32 payt)
+{
+	u32 i, count = sizeof(static_payloads) / sizeof(struct rtp_static_payt);
+	if (payt>= GF_RTP_PAYT_LAST_STATIC_DEFINED) return NULL;
+	for (i=0; i<count; i++) {
+		if (static_payloads[i].fmt == payt) {
+			return &static_payloads[i];
+		}
+	}
+	return NULL;
+}
+
+
 GF_EXPORT
-GF_RTPDepacketizer *gf_rtp_depacketizer_new(GF_SDPMedia *media, void (*sl_packet_cbk)(void *udta, char *payload, u32 size, GF_SLHeader *hdr, GF_Err e), void *udta)
+GF_RTPDepacketizer *gf_rtp_depacketizer_new(GF_SDPMedia *media, u32 hdr_payt, gf_rtp_packet_cbk sl_packet_cbk, void *udta)
 {
 	GF_Err e;
-	GF_RTPMap *map;
+	GF_RTPMap *map = NULL;
 	u32 payt;
 	GF_RTPDepacketizer *tmp;
+	u32 clock_rate;
+	const GF_RTPStaticMap *static_map = NULL;
 
 	/*check RTP map. For now we only support 1 RTPMap*/
-	if (!sl_packet_cbk || !media || media->fmt_list || (gf_list_count(media->RTPMaps) > 1)) return NULL;
+	if (!sl_packet_cbk || (!media && !hdr_payt)) return NULL;
+	if (media && (gf_list_count(media->RTPMaps) > 1)) return NULL;
 
-	/*check payload type*/
-	map = (GF_RTPMap *)gf_list_get(media->RTPMaps, 0);
+#ifdef GPAC_ENABEL_COVERAGE
+	if (gf_sys_is_cov_mode())
+		gf_rtp_is_valid_static_payt(22);
+#endif
 
-	payt = gf_rtp_get_payload_type(map, media);
-	if (!payt) return NULL;
+	if (!media) {
+		static_map = gf_rtp_is_valid_static_payt(hdr_payt);
+		if (!static_map) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP: Invalid/unsupported static payload type %d\n", hdr_payt));
+			return NULL;
+		}
+		clock_rate = static_map->clock_rate;
+		payt = hdr_payt;
+	} else {
+		/*check payload type*/
+		map = (GF_RTPMap *)gf_list_get(media->RTPMaps, 0);
+		if (!map) {
+			//we deal with at most one format
+			if (!media->fmt_list || strchr(media->fmt_list, ' ')) return NULL;
+
+			payt = atoi(media->fmt_list);
+			static_map = gf_rtp_is_valid_static_payt(payt);
+			if (!static_map) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("RTP: Invalid static payload type %d\n", payt));
+				return NULL;
+			}
+			clock_rate = static_map->clock_rate;
+		} else {
+			payt = gf_rtp_get_payload_type(map, media);
+			if (!payt) return NULL;
+			clock_rate = map->ClockRate;
+		}
+	}
 
 	GF_SAFEALLOC(tmp, GF_RTPDepacketizer);
 	if (!tmp) return NULL;
 	tmp->payt = payt;
+	tmp->static_map = static_map;
 
 	e = gf_rtp_payt_setup(tmp, map, media);
 	if (e) {
 		gf_free(tmp);
 		return NULL;
 	}
+
 	assert(tmp->depacketize);
-	tmp->clock_rate = map->ClockRate;
+	tmp->clock_rate = clock_rate;
 	tmp->on_sl_packet = sl_packet_cbk;
 	tmp->udta = udta;
 	return tmp;
@@ -1740,7 +1821,7 @@
 }
 
 GF_EXPORT
-void gf_rtp_depacketizer_process(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+void gf_rtp_depacketizer_process(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, u8 *payload, u32 size)
 {
 	assert(rtp && rtp->depacketize);
 	rtp->sl_hdr.sender_ntp = hdr->recomputed_ntp_ts;
@@ -1748,7 +1829,7 @@
 }
 
 
-GF_EXPORT
+#if 0 //unused
 void gf_rtp_depacketizer_get_slconfig(GF_RTPDepacketizer *rtp, GF_SLConfig *slc)
 {
 	memset(slc, 0, sizeof(GF_SLConfig));
@@ -1791,6 +1872,7 @@
 		}
 	}
 }
+#endif
 
 
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/src/ietf/rtp_packetizer.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_packetizer.c Changed

@@ -41,11 +41,11 @@
                                      void (*OnNewPacket)(void *cbk, GF_RTPHeader *header),
                                      void (*OnPacketDone)(void *cbk, GF_RTPHeader *header),
                                      void (*OnDataReference)(void *cbk, u32 payload_size, u32 offset_from_orig),
-                                     void (*OnData)(void *cbk, char *data, u32 data_size, Bool is_head)
+                                     void (*OnData)(void *cbk, u8 *data, u32 data_size, Bool is_head)
                                     )
 {
 	GP_RTPPacketizer *tmp;
-	if (!rtp_payt || !cbk_obj | !OnPacketDone) return NULL;
+	if (!rtp_payt || !cbk_obj || !OnPacketDone) return NULL;
 
 	GF_SAFEALLOC(tmp, GP_RTPPacketizer);
 	if (!tmp) return NULL;
@@ -84,7 +84,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_rtp_builder_process(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex)
+GF_Err gf_rtp_builder_process(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex)
 {
 	if (!builder) return GF_BAD_PARAM;
 
@@ -113,13 +113,17 @@
 		return gp_rtp_builder_do_smv(builder, data, data_size, IsAUEnd, FullAUSize);
 	case GF_RTP_PAYT_LATM:
 		return gp_rtp_builder_do_latm(builder, data, data_size, IsAUEnd, FullAUSize, duration);
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	case GF_RTP_PAYT_3GPP_DIMS:
 		return gp_rtp_builder_do_dims(builder, data, data_size, IsAUEnd, FullAUSize, duration);
+#endif
 	case GF_RTP_PAYT_AC3:
 		return gp_rtp_builder_do_ac3(builder, data, data_size, IsAUEnd, FullAUSize);
 	case GF_RTP_PAYT_HEVC:
 	case GF_RTP_PAYT_LHVC:
 		return gp_rtp_builder_do_hevc(builder, data, data_size, IsAUEnd, FullAUSize);
+	case GF_RTP_PAYT_MP2T:
+		return gp_rtp_builder_do_mp2t(builder, data, data_size, IsAUEnd, FullAUSize);
 	default:
 		return GF_NOT_SUPPORTED;
 	}
@@ -129,7 +133,7 @@
 //Compute the #params of the slMap
 GF_EXPORT
 void gf_rtp_builder_init(GP_RTPPacketizer *builder, u8 PayloadType, u32 PathMTU, u32 max_ptime,
-                         u32 StreamType, u32 OTI, u32 PL_ID,
+                         u32 StreamType, u32 codecid, u32 PL_ID,
                          u32 avgSize, u32 maxSize,
                          u32 avgTS, u32 maxDTS,
                          u32 IV_length, u32 KI_length,
@@ -141,7 +145,7 @@
 	builder->Path_MTU = PathMTU;
 	builder->PayloadType = PayloadType;
 	builder->slMap.StreamType = StreamType;
-	builder->slMap.ObjectTypeIndication = OTI;
+	builder->slMap.CodecID = codecid;
 	builder->slMap.PL_ID = PL_ID;
 	builder->max_ptime = max_ptime;
 	if (pref_mode) strcpy(builder->slMap.mode, pref_mode);
@@ -207,7 +211,7 @@
 		builder->flags &= 0x07;
 		/*disable aggregation for visual streams, except for AVC where STAP/MTAP can be used*/
 		if (StreamType==GF_STREAM_VISUAL) {
-			if ((OTI != GPAC_OTI_VIDEO_AVC) && (OTI != GPAC_OTI_VIDEO_SVC) && (OTI != GPAC_OTI_VIDEO_MVC) && (OTI != GPAC_OTI_VIDEO_HEVC) && (OTI != GPAC_OTI_VIDEO_LHVC)) {
+			if ((codecid != GF_CODECID_AVC) && (codecid != GF_CODECID_SVC) && (codecid != GF_CODECID_MVC) && (codecid != GF_CODECID_HEVC) && (codecid != GF_CODECID_LHVC)) {
 				builder->flags &= ~GP_RTP_PCK_USE_MULTI;
 			}
 		}
@@ -328,7 +332,7 @@
 		builder->flags &= ~GP_RTP_PCK_SIGNAL_AU_IDX;
 		builder->flags &= ~GP_RTP_PCK_USE_INTERLEAVING;
 		builder->flags &= ~GP_RTP_PCK_KEY_IDX_PER_AU;
-		gf_rtp_builder_init(builder, PayloadType, PathMTU, max_ptime, StreamType, OTI, PL_ID, avgSize, maxSize, avgTS, maxDTS, IV_length, KI_length, pref_mode);
+		gf_rtp_builder_init(builder, PayloadType, PathMTU, max_ptime, StreamType, codecid, PL_ID, avgSize, maxSize, avgTS, maxDTS, IV_length, KI_length, pref_mode);
 		return;
 	}
 
@@ -377,7 +381,7 @@
 		builder->slMap.IV_delta_length = gf_get_bit_size(maxSize);
 	}
 	/*ISMACryp video mode*/
-	if ((builder->slMap.StreamType==GF_STREAM_VISUAL) && (builder->slMap.ObjectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2)
+	if ((builder->slMap.StreamType==GF_STREAM_VISUAL) && (builder->slMap.CodecID==GF_CODECID_MPEG4_PART2)
 	        && (builder->flags & GP_RTP_PCK_SIGNAL_RAP) && builder->slMap.IV_length
 	        && !(builder->flags & GP_RTP_PCK_SIGNAL_AU_IDX) && !(builder->flags & GP_RTP_PCK_SIGNAL_SIZE)
 	        /*shall have SignalTS*/
@@ -386,7 +390,7 @@
 		strcpy(builder->slMap.mode, "mpeg4-video");
 	}
 	/*ISMACryp AVC video mode*/
-	else if ((builder->slMap.StreamType==GF_STREAM_VISUAL) && (builder->slMap.ObjectTypeIndication==GPAC_OTI_VIDEO_AVC)
+	else if ((builder->slMap.StreamType==GF_STREAM_VISUAL) && (builder->slMap.CodecID==GF_CODECID_AVC)
 	         && (builder->flags & GP_RTP_PCK_SIGNAL_RAP) && builder->slMap.IV_length
 	         && !(builder->flags & GP_RTP_PCK_SIGNAL_AU_IDX) && !(builder->flags & GP_RTP_PCK_SIGNAL_SIZE)
 	         /*shall have SignalTS*/
@@ -411,8 +415,9 @@
 	}
 }
 
-void gp_rtp_builder_set_cryp_info(GP_RTPPacketizer *builder, u64 IV, char *key_indicator, Bool is_encrypted)
+void gf_rtp_builder_set_cryp_info(GP_RTPPacketizer *builder, u64 IV, char *key_indicator, Bool is_encrypted)
 {
+	if (!builder) return;
 	if (!key_indicator) {
 		if (builder->key_indicator) {
 			/*force flush if no provision for keyIndicator per AU*/
@@ -441,13 +446,13 @@
 }
 
 GF_EXPORT
-Bool gf_rtp_builder_get_payload_name(GP_RTPPacketizer *rtpb, char *szPayloadName, char *szMediaName)
+Bool gf_rtp_builder_get_payload_name(GP_RTPPacketizer *rtpb, char szPayloadName[20], char szMediaName[20])
 {
 	u32 flags = rtpb->flags;
 
 	switch (rtpb->rtp_payt) {
 	case GF_RTP_PAYT_MPEG4:
-		if ((rtpb->slMap.StreamType==GF_STREAM_VISUAL) && (rtpb->slMap.ObjectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2)) {
+		if ((rtpb->slMap.StreamType==GF_STREAM_VISUAL) && (rtpb->slMap.CodecID==GF_CODECID_MPEG4_PART2)) {
 			strcpy(szMediaName, "video");
 			/*ISMACryp video*/
 			if ( (flags & GP_RTP_PCK_SIGNAL_RAP) && rtpb->slMap.IV_length
@@ -508,7 +513,11 @@
 		return GF_TRUE;
 	case GF_RTP_PAYT_EVRC_SMV:
 		strcpy(szMediaName, "audio");
-		strcpy(szPayloadName, (rtpb->slMap.ObjectTypeIndication==0xA0) ? "EVRC" : "SMV");
+		if ((rtpb->slMap.CodecID==0xA0) || (rtpb->slMap.CodecID==GF_CODECID_EVRC))
+			strcpy(szPayloadName, "EVRC");
+		else
+			strcpy(szPayloadName, "SMV");
+
 		/*header-free version*/
 		if (rtpb->auh_size<=1) strcat(szPayloadName, "0");
 		return GF_TRUE;
@@ -516,10 +525,12 @@
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "MP4A-LATM");
 		return GF_TRUE;
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	case GF_RTP_PAYT_3GPP_DIMS:
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "richmedia+xml");
 		return GF_TRUE;
+#endif
 	case GF_RTP_PAYT_AC3:
 		strcpy(szMediaName, "audio");
 		strcpy(szPayloadName, "ac3");
@@ -548,7 +559,7 @@
 GF_EXPORT
 GF_Err gf_rtp_builder_format_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, char *dsi, u32 dsi_size)
 {
-	char buffer[20000], dsiString[20000];
+	char buffer[20100], dsiString[20000];
 	u32 i, k;
 	Bool is_first = GF_TRUE;
 
@@ -583,7 +594,7 @@
 	}
 
 	/*optional fields*/
-	if (builder->slMap.ObjectTypeIndication) SDP_ADD_INT("objectType", builder->slMap.ObjectTypeIndication);
+	if (builder->slMap.CodecID) SDP_ADD_INT("objectType", builder->slMap.CodecID);
 	if (builder->slMap.ConstantSize) SDP_ADD_INT("constantSize", builder->slMap.ConstantSize);
 	if (builder->slMap.ConstantDuration) SDP_ADD_INT("constantDuration", builder->slMap.ConstantDuration);
 	if (builder->slMap.maxDisplacement) SDP_ADD_INT("maxDisplacement", builder->slMap.maxDisplacement);

gpac-0.8.0.tar.gz/src/ietf/rtp_pck_3gpp.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_pck_3gpp.c Changed

@@ -31,7 +31,7 @@
 
 static void rtp_amr_flush(GP_RTPPacketizer *builder)
 {
-	char *hdr;
+	u8 *hdr;
 	u32 hdr_size;
 	if (!builder->bytesInPacket) return;
 	gf_bs_get_content(builder->pck_hdr, &hdr, &hdr_size);
@@ -46,7 +46,7 @@
 	builder->last_au_sn = 0;
 }
 
-GF_Err gp_rtp_builder_do_amr(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_amr(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 offset, rtp_ts, block_size;
 
@@ -128,7 +128,7 @@
 	return 0;
 }
 
-GF_Err gp_rtp_builder_do_qcelp(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_qcelp(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 offset, rtp_ts;
 	u8 hdr;
@@ -190,12 +190,11 @@
 	return GF_OK;
 }
 
-
 static void rtp_evrc_smv_flush(GP_RTPPacketizer *builder)
 {
 	if (!builder->bytesInPacket) return;
 	if (builder->auh_size>1) {
-		char *hdr;
+		u8 *hdr;
 		u32 hdr_size;
 		/*padding*/
 		if (builder->last_au_sn % 2) gf_bs_write_int(builder->pck_hdr, 0, 4);
@@ -213,7 +212,7 @@
 	builder->last_au_sn = 0;
 }
 
-GF_Err gp_rtp_builder_do_smv(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_smv(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 offset, rtp_ts;
 
@@ -282,10 +281,9 @@
 	return GF_OK;
 }
 
-GF_Err gp_rtp_builder_do_h263(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_h263(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
-	GF_BitStream *bs;
-	char hdr[2];
+	u8 hdr[2];
 	Bool Pbit;
 	u32 offset, size, max_size;
 
@@ -302,6 +300,7 @@
 	max_size = builder->Path_MTU - 2;
 
 	while(data_size > 0) {
+		GF_BitStream *bs;
 		if(data_size > max_size) {
 			size = max_size;
 			builder->rtp_header.Marker = 0;
@@ -338,10 +337,46 @@
 	return GF_OK;
 }
 
-GF_Err gp_rtp_builder_do_tx3g(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex)
+GF_Err gp_rtp_builder_do_mp2t(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+{
+	u32 offset, size, max_size;
+
+	builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+
+	if (!data) return GF_OK;
+
+	max_size = builder->Path_MTU;
+	offset = 0;
+	while (data_size > 0) {
+		if (data_size > max_size) {
+			size = max_size / 188;
+			size *= 188;
+		} else {
+			size = data_size;
+		}
+
+		data_size -= size;
+
+		/*create new RTP Packet */
+		builder->rtp_header.SequenceNumber += 1;
+		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
+
+		/*add payload*/
+		if (builder->OnDataReference)
+			builder->OnDataReference(builder->cbk_obj, size, offset);
+		else
+			builder->OnData(builder->cbk_obj, data + offset, size, GF_TRUE);
+
+		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+
+		offset += size;
+	}
+	return GF_OK;
+}
+GF_Err gp_rtp_builder_do_tx3g(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration, u8 descIndex)
 {
 	GF_BitStream *bs;
-	char *hdr;
+	u8 *hdr;
 	u32 samp_size, txt_size, pay_start, hdr_size, txt_done, cur_frag, nb_frag;
 	Bool is_utf_16 = GF_FALSE;
 
@@ -546,6 +581,7 @@
 }
 
 
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 GF_Err gp_rtp_builder_do_dims(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration)
 {
 	u32 frag_state;
@@ -669,6 +705,7 @@
 	gf_bs_del(bs);
 	return GF_OK;
 }
+#endif
 
 
 
@@ -687,7 +724,7 @@
 	builder->ac3_ft = 0;
 }
 
-GF_Err gp_rtp_builder_do_ac3(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_ac3(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	char hdr[2];
 	u32 offset, nb_pck;

gpac-0.8.0.tar.gz/src/ietf/rtp_pck_mpeg12.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_pck_mpeg12.c Changed

@@ -32,7 +32,7 @@
 
 static void mpa12_do_flush(GP_RTPPacketizer *builder, Bool start_new)
 {
-	char *tmp;
+	u8 *tmp;
 	u32 tmp_size;
 	/*flush*/
 	if (builder->pck_hdr) {
@@ -65,7 +65,7 @@
 	builder->bytesInPacket = 0;
 }
 
-GF_Err gp_rtp_builder_do_mpeg12_audio(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_mpeg12_audio(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 pck_size;
 	u16 offset;
@@ -114,12 +114,12 @@
 #define MPEG12_PICTURE_START_CODE         0x00000100
 #define MPEG12_SEQUENCE_START_CODE        0x000001b3
 
-GF_Err gp_rtp_builder_do_mpeg12_video(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_mpeg12_video(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 startcode, pic_type, max_pck_size, offset, prev_slice, next_slice;
 	Bool start_with_slice, slices_done, got_slice, first_slice, have_seq;
-	char mpv_hdr[4];
-	char *payload, *buffer;
+	u8 mpv_hdr[4];
+	u8 *payload, *buffer;
 
 	/*no flsuh (no aggregation)*/
 	if (!data) return GF_OK;
@@ -152,7 +152,7 @@
 	mpv_hdr[3] = 0;
 
 	if ((pic_type==2) || (pic_type== 3)) {
-		mpv_hdr[3] = payload[3] << 5;
+		mpv_hdr[3] = (u8) ((((u32)payload[3]) << 5) & 0xf);
 		if ((payload[4] & 0x80) != 0) mpv_hdr[3] |= 0x10;
 		if (pic_type == 3) mpv_hdr[3] |= (payload[4] >> 3) & 0xf;
 	}

gpac-0.8.0.tar.gz/src/ietf/rtp_pck_mpeg4.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_pck_mpeg4.c Changed

@@ -202,9 +202,9 @@
 }
 
 
-GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_mpeg4(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize)
 {
-	char *sl_buffer, *payl_buffer;
+	u8 *sl_buffer, *payl_buffer;
 	u32 sl_buffer_size, payl_buffer_size;
 	u32 auh_size_tmp, bytesLeftInPacket, infoSize, pckSize;
 	u64 pos;
@@ -399,7 +399,7 @@
 }
 
 
-GF_Err gp_rtp_builder_do_avc(GP_RTPPacketizer *builder, char *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_avc(GP_RTPPacketizer *builder, u8 *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 do_flush, bytesLeft, size, nal_type;
 	char shdr[2];
@@ -425,6 +425,7 @@
 	/*need a new RTP packet*/
 	if (!builder->bytesInPacket) {
 		builder->rtp_header.PayloadType = builder->PayloadType;
+		builder->rtp_header.Marker = 0;
 		builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
 		builder->rtp_header.SequenceNumber += 1;
 		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
@@ -534,7 +535,7 @@
 	return GF_OK;
 }
 
-GF_Err gp_rtp_builder_do_hevc(GP_RTPPacketizer *builder, char *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
+GF_Err gp_rtp_builder_do_hevc(GP_RTPPacketizer *builder, u8 *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
 {
 	u32 do_flush, bytesLeft, size;
 
@@ -698,11 +699,10 @@
 	builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
 }
 
-GF_Err gp_rtp_builder_do_latm(GP_RTPPacketizer *builder, char *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration)
+GF_Err gp_rtp_builder_do_latm(GP_RTPPacketizer *builder, u8 *data, u32 data_size, u8 IsAUEnd, u32 FullAUSize, u32 duration)
 {
 	u32 size, latm_hdr_size, i, data_offset;
 	Bool fragmented;
-	unsigned char *latm_hdr;
 
 	if (!data) {
 		latm_flush(builder);
@@ -722,6 +722,7 @@
 	data_offset = 0;
 	fragmented = GF_FALSE;
 	while (data_size > 0) {
+		u8 *latm_hdr;
 		latm_hdr_size = (data_size / 255) + 1;
 		/*fragmenting*/
 		if (latm_hdr_size + data_size > builder->Path_MTU) {

gpac-0.8.0.tar.gz/src/ietf/rtp_streamer.c -> gpac-1.0.0.tar.gz/src/ietf/rtp_streamer.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 / IETF RTP/RTSP/SDP sub-project
@@ -34,6 +34,9 @@
 
 #if !defined(GPAC_DISABLE_STREAMING) && !defined(GPAC_DISABLE_ISOM)
 
+/*for ISOBMFF subtypes*/
+#include <gpac/isomedia.h>
+
 struct __rtp_streamer
 {
 	GP_RTPPacketizer *packetizer;
@@ -60,15 +63,19 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Error %s sending RTP packet\n", gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP] Error %s sending RTP packet SN %u - TS %u\n", gf_error_to_string(e), header->SequenceNumber, header->TimeStamp));
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_RTP, ("RTP SN %u - TS %u - M %u - Size %u\n", header->SequenceNumber, header->TimeStamp, header->Marker, rtp->payload_len + 12));
 	}
+#else
+	if (e) {
+		fprintf(stderr, "Error %s sending RTP packet SN %u - TS %u\n", gf_error_to_string(e), header->SequenceNumber, header->TimeStamp);
+	}
 #endif
 	rtp->payload_len = 0;
 }
 
-static void rtp_stream_on_data(void *cbk, char *data, u32 data_size, Bool is_head)
+static void rtp_stream_on_data(void *cbk, u8 *data, u32 data_size, Bool is_head)
 {
 	GF_RTPStreamer *rtp = (GF_RTPStreamer*)cbk;
 	if (!data ||!data_size) return;
@@ -87,6 +94,26 @@
 	rtp->payload_len += data_size;
 }
 
+
+GF_Err gf_rtp_streamer_init_rtsp(GF_RTPStreamer *rtp, u32 path_mtu, GF_RTSPTransport  *tr, const char *ifce_addr)
+{
+	GF_Err res;
+
+	if (!rtp->channel) rtp->channel = gf_rtp_new();
+
+	res = gf_rtp_setup_transport(rtp->channel, tr, tr->destination);
+	if (res !=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Cannot setup RTP transport info: %s\n", gf_error_to_string(res) ));
+		return res;
+	}
+
+	res = gf_rtp_initialize(rtp->channel, 0, GF_TRUE, path_mtu, 0, 0, (char *)ifce_addr);
+	if (res !=0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("Cannot initialize RTP sockets: %s\n", gf_error_to_string(res) ));
+		return res;
+	}
+	return GF_OK;
+}
 static GF_Err rtp_stream_init_channel(GF_RTPStreamer *rtp, u32 path_mtu, const char * dest, int port, int ttl, const char *ifce_addr)
 {
 	GF_RTSPTransport tr;
@@ -129,15 +156,13 @@
 }
 
 GF_EXPORT
-GF_RTPStreamer *gf_rtp_streamer_new_extended(u32 streamType, u32 oti, u32 timeScale,
+GF_RTPStreamer *gf_rtp_streamer_new(u32 streamType, u32 codecid, u32 timeScale,
         const char *ip_dest, u16 port, u32 MTU, u8 TTL, const char *ifce_addr,
-        u32 flags, char *dsi, u32 dsi_len,
-
+        u32 flags, const u8 *dsi, u32 dsi_len,
         u32 PayloadType, u32 sample_rate, u32 nb_ch,
         Bool is_crypted, u32 IV_length, u32 KI_length,
         u32 MinSize, u32 MaxSize, u32 avgTS, u32 maxDTSDelta, u32 const_dur, u32 bandwidth, u32 max_ptime,
-        u32 au_sn_len
-                                            )
+        u32 au_sn_len, Bool for_rtsp)
 {
 	GF_SLConfig slc;
 	GF_RTPStreamer *stream;
@@ -168,252 +193,212 @@
 
 	/*timed-text is a bit special, we support multiple stream descriptions & co*/
 	switch (streamType) {
-	case GF_STREAM_TEXT:
-		if (oti!=GPAC_OTI_TEXT_MPEG4)
-			return NULL;
-
-		rtp_type = GF_RTP_PAYT_3GPP_TEXT;
-		/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
-		PL_ID = 0x10;
-		break;
 	case GF_STREAM_AUDIO:
 		required_rate = sample_rate;
-		switch (oti) {
-		/*AAC*/
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-			PL_ID = 0x01;
-			mpeg4mode = "AAC";
-			rtp_type = GF_RTP_PAYT_MPEG4;
-			required_rate = sample_rate;
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (dsi) {
-				GF_M4ADecSpecInfo a_cfg;
-				gf_m4a_get_config(dsi, dsi_len, &a_cfg);
-				//nb_ch = a_cfg.nb_chan;
-				//sample_rate = a_cfg.base_sr;
-				PL_ID = a_cfg.audioPL;
-				switch (a_cfg.base_object_type) {
-				case GF_M4A_AAC_MAIN:
-				case GF_M4A_AAC_LC:
-					if (flags & GP_RTP_PCK_USE_LATM_AAC) {
-						rtp_type = GF_RTP_PAYT_LATM;
-						break;
-					}
-				case GF_M4A_AAC_SBR:
-				case GF_M4A_AAC_PS:
-				case GF_M4A_AAC_LTP:
-				case GF_M4A_AAC_SCALABLE:
-				case GF_M4A_ER_AAC_LC:
-				case GF_M4A_ER_AAC_LTP:
-				case GF_M4A_ER_AAC_SCALABLE:
-					mpeg4mode = "AAC";
-					break;
-				case GF_M4A_CELP:
-				case GF_M4A_ER_CELP:
-					mpeg4mode = "CELP";
-					break;
-				}
-			}
-#endif
-			break;
-
-		/*MPEG1/2 audio*/
-		case GPAC_OTI_AUDIO_MPEG2_PART3:
-		case GPAC_OTI_AUDIO_MPEG1:
-			if (!is_crypted) {
-				rtp_type = GF_RTP_PAYT_MPEG12_AUDIO;
-				/*use official RTP/AVP payload type*/
-				OfficialPayloadType = 14;
-				required_rate = 90000;
-			}
-			/*encrypted MP3 must be sent through MPEG-4 generic to signal all ISMACryp stuff*/
-			else {
-				rtp_type = GF_RTP_PAYT_MPEG4;
-			}
-			break;
-
-		/*QCELP audio*/
-		case GPAC_OTI_AUDIO_13K_VOICE:
-			rtp_type = GF_RTP_PAYT_QCELP;
-			OfficialPayloadType = 12;
-			required_rate = 8000;
-			//nb_ch = 1;
-			break;
-
-		/*EVRC/SVM audio*/
-		case GPAC_OTI_AUDIO_EVRC_VOICE:
-		case GPAC_OTI_AUDIO_SMV_VOICE:
-			rtp_type = GF_RTP_PAYT_EVRC_SMV;
-			required_rate = 8000;
-			//nb_ch = 1;
-		}
-
 		break;
-
 	case GF_STREAM_VISUAL:
 		rtp_type = GF_RTP_PAYT_MPEG4;
 		required_rate = default_rtp_rate;
 		if (is_crypted) {
 			/*that's another pain with ISMACryp, even if no B-frames the DTS is signaled...*/
-			if (oti==GPAC_OTI_VIDEO_MPEG4_PART2) force_dts_delta = 22;
+			if (codecid==GF_CODECID_MPEG4_PART2) force_dts_delta = 22;
 			flags |= GP_RTP_PCK_SIGNAL_RAP | GP_RTP_PCK_SIGNAL_TS;
 		}
-
-		switch (oti) {
-		/*ISO/IEC 14496-2*/
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			PL_ID = 1;
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (dsi) {
-				GF_M4VDecSpecInfo vhdr;
-				gf_m4v_get_config(dsi, dsi_len, &vhdr);
-				PL_ID = vhdr.VideoPL;
-			}
-#endif
-			break;
-
-		/*MPEG1/2 video*/
-		case GPAC_OTI_VIDEO_MPEG1:
-		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-		case GPAC_OTI_VIDEO_MPEG2_MAIN:
-		case GPAC_OTI_VIDEO_MPEG2_SNR:
-		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-		case GPAC_OTI_VIDEO_MPEG2_HIGH:
-		case GPAC_OTI_VIDEO_MPEG2_422:
-			if (!is_crypted) {
-				rtp_type = GF_RTP_PAYT_MPEG12_VIDEO;
-				OfficialPayloadType = 32;
-			}
-			break;
-		/*AVC/H.264*/
-		case GPAC_OTI_VIDEO_AVC:
-			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			rtp_type = GF_RTP_PAYT_H264_AVC;
-			PL_ID = 0x0F;
-			break;
-		/*H264-SVC*/
-		case GPAC_OTI_VIDEO_SVC:
-		case GPAC_OTI_VIDEO_MVC:
-			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			rtp_type = GF_RTP_PAYT_H264_SVC;
-			PL_ID = 0x0F;
-			break;
-		/*HEVC*/
-		case GPAC_OTI_VIDEO_HEVC:
-			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			rtp_type = GF_RTP_PAYT_HEVC;
-			PL_ID = 0x0F;
-			break;
-		/*LHVC*/
-		case GPAC_OTI_VIDEO_LHVC:
-			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			rtp_type = GF_RTP_PAYT_LHVC;
-			PL_ID = 0x0F;
-			break;
-		}
 		break;
-
 	case GF_STREAM_SCENE:
 	case GF_STREAM_OD:
-		if (oti == GPAC_OTI_SCENE_DIMS) {
+		if (codecid == GF_CODECID_DIMS) {
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 			rtp_type = GF_RTP_PAYT_3GPP_DIMS;
 			has_mpeg4_mapping = GF_FALSE;
+#else
+			gf_free(stream);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] 3GPP DIMS over RTP disabled in build\n", streamType));
+			return NULL;
+#endif
 		} else {
 			rtp_type = GF_RTP_PAYT_MPEG4;
 		}
 		break;
+	}
 
+	switch (codecid) {
+	/*AAC*/
+	case GF_CODECID_AAC_MPEG4:
+	case GF_CODECID_AAC_MPEG2_MP:
+	case GF_CODECID_AAC_MPEG2_LCP:
+	case GF_CODECID_AAC_MPEG2_SSRP:
+		PL_ID = 0x01;
+		mpeg4mode = "AAC";
+		rtp_type = GF_RTP_PAYT_MPEG4;
+		required_rate = sample_rate;
 
-	case GF_STREAM_4CC:
-		switch (oti) {
-		case GF_ISOM_SUBTYPE_3GP_H263:
-			rtp_type = GF_RTP_PAYT_H263;
-			required_rate = 90000;
-			streamType = GF_STREAM_VISUAL;
-			OfficialPayloadType = 34;
-			/*not 100% compliant (short header is missing) but should still work*/
-			oti = GPAC_OTI_VIDEO_MPEG4_PART2;
-			PL_ID = 0x01;
-			break;
-		case GF_ISOM_SUBTYPE_3GP_AMR:
-			required_rate = 8000;
-			rtp_type = GF_RTP_PAYT_AMR;
-			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = GF_FALSE;
-//			nb_ch = 1;
-			break;
-		case GF_ISOM_SUBTYPE_3GP_AMR_WB:
-			required_rate = 16000;
-			rtp_type = GF_RTP_PAYT_AMR_WB;
-			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = GF_FALSE;
-//			nb_ch = 1;
-			break;
-		case GF_ISOM_SUBTYPE_AC3:
-			rtp_type = GF_RTP_PAYT_AC3;
-			streamType = GF_STREAM_AUDIO;
-			has_mpeg4_mapping = GF_TRUE;
-//			nb_ch = 1;
-			break;
-		case GF_ISOM_SUBTYPE_AVC_H264:
-		case GF_ISOM_SUBTYPE_AVC2_H264:
-		case GF_ISOM_SUBTYPE_AVC3_H264:
-		case GF_ISOM_SUBTYPE_AVC4_H264:
-		case GF_ISOM_SUBTYPE_SVC_H264:
-		case GF_ISOM_SUBTYPE_MVC_H264:
-		{
-			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
-			rtp_type = GF_RTP_PAYT_H264_AVC;
-			streamType = GF_STREAM_VISUAL;
-			oti = GPAC_OTI_VIDEO_AVC;
-			PL_ID = 0x0F;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (dsi) {
+			GF_M4ADecSpecInfo a_cfg;
+			gf_m4a_get_config((u8 *)dsi, dsi_len, &a_cfg);
+			//nb_ch = a_cfg.nb_chan;
+			//sample_rate = a_cfg.base_sr;
+			PL_ID = a_cfg.audioPL;
+			switch (a_cfg.base_object_type) {
+			case GF_M4A_AAC_MAIN:
+			case GF_M4A_AAC_LC:
+				if (flags & GP_RTP_PCK_USE_LATM_AAC) {
+					rtp_type = GF_RTP_PAYT_LATM;
+					break;
+				}
+			case GF_M4A_AAC_SBR:
+			case GF_M4A_AAC_PS:
+			case GF_M4A_AAC_LTP:
+			case GF_M4A_AAC_SCALABLE:
+			case GF_M4A_ER_AAC_LC:
+			case GF_M4A_ER_AAC_LTP:
+			case GF_M4A_ER_AAC_SCALABLE:
+				mpeg4mode = "AAC";
+				break;
+			case GF_M4A_CELP:
+			case GF_M4A_ER_CELP:
+				mpeg4mode = "CELP";
+				break;
+			}
 		}
+#endif
 		break;
-		case GF_ISOM_SUBTYPE_3GP_QCELP:
-			required_rate = 8000;
-			rtp_type = GF_RTP_PAYT_QCELP;
-			streamType = GF_STREAM_AUDIO;
-			oti = GPAC_OTI_AUDIO_13K_VOICE;
-			OfficialPayloadType = 12;
-//			nb_ch = 1;
-			break;
-		case GF_ISOM_SUBTYPE_3GP_EVRC:
-		case GF_ISOM_SUBTYPE_3GP_SMV:
-			required_rate = 8000;
-			rtp_type = GF_RTP_PAYT_EVRC_SMV;
-			streamType = GF_STREAM_AUDIO;
-			oti = (oti==GF_ISOM_SUBTYPE_3GP_EVRC) ? GPAC_OTI_AUDIO_EVRC_VOICE : GPAC_OTI_AUDIO_SMV_VOICE;
-//			nb_ch = 1;
-			break;
-		case GF_ISOM_SUBTYPE_MP3:
+
+	/*MPEG1/2 audio*/
+	case GF_CODECID_MPEG2_PART3:
+	case GF_CODECID_MPEG_AUDIO:
+		if (!is_crypted) {
 			rtp_type = GF_RTP_PAYT_MPEG12_AUDIO;
 			/*use official RTP/AVP payload type*/
 			OfficialPayloadType = 14;
 			required_rate = 90000;
-			break;
+		}
+		/*encrypted MP3 must be sent through MPEG-4 generic to signal all ISMACryp stuff*/
+		else {
+			rtp_type = GF_RTP_PAYT_MPEG4;
+		}
+		break;
 
-		case GF_ISOM_SUBTYPE_TEXT:
-		case GF_ISOM_SUBTYPE_TX3G:
-			rtp_type = GF_RTP_PAYT_3GPP_TEXT;
-			/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
-			PL_ID = 0x10;
-			break;
+	/*ISO/IEC 14496-2*/
+	case GF_CODECID_MPEG4_PART2:
+		PL_ID = 1;
+#ifndef GPAC_DISABLE_AV_PARSERS
+		if (dsi) {
+			GF_M4VDecSpecInfo vhdr;
+			gf_m4v_get_config((u8 *)dsi, dsi_len, &vhdr);
+			PL_ID = vhdr.VideoPL;
+		}
+#endif
+		break;
 
+	/*MPEG1/2 video*/
+	case GF_CODECID_MPEG1:
+	case GF_CODECID_MPEG2_SIMPLE:
+	case GF_CODECID_MPEG2_MAIN:
+	case GF_CODECID_MPEG2_SNR:
+	case GF_CODECID_MPEG2_SPATIAL:
+	case GF_CODECID_MPEG2_HIGH:
+	case GF_CODECID_MPEG2_422:
+		if (!is_crypted) {
+			rtp_type = GF_RTP_PAYT_MPEG12_VIDEO;
+			OfficialPayloadType = 32;
 		}
 		break;
+	/*AVC/H.264*/
+	case GF_CODECID_AVC:
+		required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+		rtp_type = GF_RTP_PAYT_H264_AVC;
+		PL_ID = 0x0F;
+		break;
+	/*H264-SVC*/
+	case GF_CODECID_SVC:
+	case GF_CODECID_MVC:
+		required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+		rtp_type = GF_RTP_PAYT_H264_SVC;
+		PL_ID = 0x0F;
+		break;
+
+	/*HEVC*/
+	case GF_CODECID_HEVC:
+		required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+		rtp_type = GF_RTP_PAYT_HEVC;
+		PL_ID = 0x0F;
+		break;
+	/*LHVC*/
+	case GF_CODECID_LHVC:
+		required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+		rtp_type = GF_RTP_PAYT_LHVC;
+		PL_ID = 0x0F;
+		break;
+
+	case GF_CODECID_H263:
+		rtp_type = GF_RTP_PAYT_H263;
+		required_rate = 90000;
+		streamType = GF_STREAM_VISUAL;
+		OfficialPayloadType = 34;
+		/*not 100% compliant (short header is missing) but should still work*/
+		codecid = GF_CODECID_MPEG4_PART2;
+		PL_ID = 0x01;
+		break;
+	case GF_CODECID_AMR:
+		required_rate = 8000;
+		rtp_type = GF_RTP_PAYT_AMR;
+		streamType = GF_STREAM_AUDIO;
+		has_mpeg4_mapping = GF_FALSE;
+		break;
+	case GF_CODECID_AMR_WB:
+		required_rate = 16000;
+		rtp_type = GF_RTP_PAYT_AMR_WB;
+		streamType = GF_STREAM_AUDIO;
+		has_mpeg4_mapping = GF_FALSE;
+		break;
+	case GF_CODECID_AC3:
+		rtp_type = GF_RTP_PAYT_AC3;
+		streamType = GF_STREAM_AUDIO;
+		has_mpeg4_mapping = GF_TRUE;
+		break;
+
+	case GF_CODECID_QCELP:
+		required_rate = 8000;
+		rtp_type = GF_RTP_PAYT_QCELP;
+		streamType = GF_STREAM_AUDIO;
+		codecid = GF_CODECID_QCELP;
+		OfficialPayloadType = 12;
+//			nb_ch = 1;
+		break;
+	case GF_CODECID_EVRC:
+	case GF_CODECID_SMV:
+		required_rate = 8000;
+		rtp_type = GF_RTP_PAYT_EVRC_SMV;
+		streamType = GF_STREAM_AUDIO;
+		codecid = (codecid==GF_ISOM_SUBTYPE_3GP_EVRC) ? GF_CODECID_EVRC : GF_CODECID_SMV;
+//			nb_ch = 1;
+		break;
+	case GF_CODECID_TX3G:
+		rtp_type = GF_RTP_PAYT_3GPP_TEXT;
+		/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
+		PL_ID = 0x10;
+		break;
+	case GF_CODECID_TEXT_MPEG4:
+		rtp_type = GF_RTP_PAYT_3GPP_TEXT;
+		/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
+		PL_ID = 0x10;
+		break;
+	case GF_CODECID_FAKE_MP2T:
+		rtp_type = GF_RTP_PAYT_MP2T;
+		PayloadType = OfficialPayloadType = GF_RTP_PAYT_MP2T;
+		required_rate = 90000;
+		break;
 
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] Unsupported stream type %x\n", streamType));
-		return NULL;
+		if (!rtp_type) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] Unsupported stream type %x\n", streamType));
+			return NULL;
+		}
+		break;
 	}
 
-	/*not supported*/
-	if (!rtp_type) return NULL;
-
 	/*override hinter type if requested and possible*/
 	if (has_mpeg4_mapping && (flags & GP_RTP_PCK_FORCE_MPEG4)) {
 		rtp_type = GF_RTP_PAYT_MPEG4;
@@ -472,18 +457,21 @@
 		return NULL;
 	}
 
-	gf_rtp_builder_init(stream->packetizer, PayloadType, MTU, max_ptime,
-	                    streamType, oti, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
+	gf_rtp_builder_init(stream->packetizer, (u8) PayloadType, MTU, max_ptime,
+	                    streamType, codecid, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
 
 
 	if (force_dts_delta) stream->packetizer->slMap.DTSDeltaLength = force_dts_delta;
 
-	e = rtp_stream_init_channel(stream, MTU + 12, ip_dest, port, TTL, ifce_addr);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] Failed to create RTP channel - error %s\n", gf_error_to_string(e) ));
-		gf_free(stream);
-		return NULL;
+	if (!for_rtsp) {
+		e = rtp_stream_init_channel(stream, MTU + 12, ip_dest, port, TTL, ifce_addr);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] Failed to create RTP channel - error %s\n", gf_error_to_string(e) ));
+			gf_free(stream);
+			return NULL;
+		}
 	}
+
 	stream->ts_scale = slc.timestampResolution;
 	stream->ts_scale /= timeScale;
 
@@ -495,17 +483,6 @@
 
 
 GF_EXPORT
-GF_RTPStreamer *gf_rtp_streamer_new(u32 streamType, u32 oti, u32 timeScale,
-                                    const char *ip_dest, u16 port, u32 MTU, u8 TTL, const char *ifce_addr,
-                                    u32 flags, char *dsi, u32 dsi_len)
-{
-	return gf_rtp_streamer_new_extended(streamType, oti, timeScale, ip_dest, port, MTU, TTL, ifce_addr, flags, dsi, dsi_len,
-
-	                                    96, 0, 0, GF_FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-}
-
-GF_EXPORT
 void gf_rtp_streamer_del(GF_RTPStreamer *streamer)
 {
 	if (streamer) {
@@ -518,45 +495,20 @@
 
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_STREAMING)
 
-void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, GF_ISOFile *file, u32 track)
+void gf_media_format_ttxt_sdp(GP_RTPPacketizer *builder, char *payload_name, char *sdpLine, u32 w, u32 h, s32 tx, s32 ty, s16 l, u32 max_w, u32 max_h, char *tx3g_base64)
 {
 	char buffer[2000];
-	u32 w, h, i, m_w, m_h;
-	s32 tx, ty;
-	s16 l;
 	sprintf(sdpLine, "a=fmtp:%d sver=60; ", builder->PayloadType);
-	gf_isom_get_track_layout_info(file, track, &w, &h, &tx, &ty, &l);
+
 	sprintf(buffer, "width=%d; height=%d; tx=%d; ty=%d; layer=%d; ", w, h, tx, ty, l);
 	strcat(sdpLine, buffer);
-	m_w = w;
-	m_h = h;
-	for (i=0; i<gf_isom_get_track_count(file); i++) {
-		switch (gf_isom_get_media_type(file, i+1)) {
-		case GF_ISOM_MEDIA_SCENE:
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-			gf_isom_get_track_layout_info(file, i+1, &w, &h, &tx, &ty, &l);
-			if (w>m_w) m_w = w;
-			if (h>m_h) m_h = h;
-			break;
-		default:
-			break;
-		}
-	}
-	sprintf(buffer, "max-w=%d; max-h=%d", m_w, m_h);
+
+	sprintf(buffer, "max-w=%d; max-h=%d", max_w, max_h);
 	strcat(sdpLine, buffer);
 
-	strcat(sdpLine, "; tx3g=");
-	for (i=0; i<gf_isom_get_sample_description_count(file, track); i++) {
-		char *tx3g;
-		u32 tx3g_len, len;
-		gf_isom_text_get_encoded_tx3g(file, track, i+1, GF_RTP_TX3G_SIDX_OFFSET, &tx3g, &tx3g_len);
-		len = gf_base64_encode(tx3g, tx3g_len, buffer, 2000);
-		gf_free(tx3g);
-		buffer[len] = 0;
-		if (i) strcat(sdpLine, ", ");
-		strcat(sdpLine, buffer);
+	if (tx3g_base64) {
+		strcat(sdpLine, "; tx3g=");
+		strcat(sdpLine, tx3g_base64);
 	}
 }
 
@@ -564,22 +516,28 @@
 
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_append_sdp_extended(GF_RTPStreamer *rtp, u16 ESID, char *dsi, u32 dsi_len, GF_ISOFile *isofile, u32 isotrack, char *KMS_URI, u32 width, u32 height, char **out_sdp_buffer)
+GF_Err gf_rtp_streamer_append_sdp_extended(GF_RTPStreamer *rtp, u16 ESID, const u8 *dsi, u32 dsi_len, const u8 *dsi_enh, u32 dsi_enh_len, char *KMS_URI, u32 width, u32 height, u32 tw, u32 th, s32 tx, s32 ty, s16 tl, Bool for_rtsp, char **out_sdp_buffer)
 {
 	u32 size;
-	u16 port;
+	u16 port=0;
 	char mediaName[30], payloadName[30];
 	char sdp[20000], sdpLine[10000];
 
 	if (!out_sdp_buffer) return GF_BAD_PARAM;
 
 	gf_rtp_builder_get_payload_name(rtp->packetizer, payloadName, mediaName);
-	gf_rtp_get_ports(rtp->channel, &port, NULL);
+	if (!for_rtsp)
+		gf_rtp_get_ports(rtp->channel, &port, NULL);
 
-	sprintf(sdp, "m=%s %d RTP/%s %d\n", mediaName, port, rtp->packetizer->slMap.IV_length ? "SAVP" : "AVP", rtp->packetizer->PayloadType);
+	sprintf(sdp, "m=%s %d RTP/%s %d\n", mediaName, for_rtsp ? 0 : port, rtp->packetizer->slMap.IV_length ? "SAVP" : "AVP", rtp->packetizer->PayloadType);
 	sprintf(sdpLine, "a=rtpmap:%d %s/%d\n", rtp->packetizer->PayloadType, payloadName, rtp->packetizer->sl_config.timestampResolution);
 	strcat(sdp, sdpLine);
-	if (ESID && (rtp->packetizer->rtp_payt != GF_RTP_PAYT_3GPP_DIMS)) {
+
+	if (ESID
+#if GPAC_ENABLE_3GPP_DIMS_RTP
+		&& (rtp->packetizer->rtp_payt != GF_RTP_PAYT_3GPP_DIMS)
+#endif
+	 ) {
 		sprintf(sdpLine, "a=mpeg4-esid:%d\n", ESID);
 		strcat(sdp, sdpLine);
 	}
@@ -602,7 +560,7 @@
 	}
 	/*Text*/
 	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_3GPP_TEXT) {
-		gf_media_format_ttxt_sdp(rtp->packetizer, payloadName, sdpLine, isofile, isotrack);
+		gf_media_format_ttxt_sdp(rtp->packetizer, payloadName, sdpLine, tw, th, tx, ty, tl, width, height, (u8 *)dsi_enh);
 		strcat(sdpLine, "\n");
 	}
 	/*EVRC/SMV in non header-free mode*/
@@ -611,7 +569,7 @@
 	}
 	/*H264/AVC*/
 	else if ((rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_AVC) || (rtp->packetizer->rtp_payt == GF_RTP_PAYT_H264_SVC)) {
-		GF_AVCConfig *avcc = dsi ? gf_odf_avc_cfg_read(dsi, dsi_len) : NULL;
+		GF_AVCConfig *avcc = dsi ? gf_odf_avc_cfg_read((u8*)dsi, dsi_len) : NULL;
 
 		if (avcc) {
 			sprintf(sdpLine, "a=fmtp:%d profile-level-id=%02X%02X%02X; packetization-mode=1", rtp->packetizer->PayloadType, avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
@@ -643,7 +601,7 @@
 	}
 	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(dsi, dsi_len, GF_FALSE) : NULL;
+		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read((u8*)dsi, dsi_len, GF_FALSE) : NULL;
 		if (hevcc) {
 			u32 count, i, j, b64s;
 			char b64[200];
@@ -673,7 +631,7 @@
 	}
 	/*MPEG-4 decoder config*/
 	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_MPEG4) {
-		gf_rtp_builder_format_sdp(rtp->packetizer, payloadName, sdpLine, dsi, dsi_len);
+		gf_rtp_builder_format_sdp(rtp->packetizer, payloadName, sdpLine, (u8*)dsi, dsi_len);
 		strcat(sdpLine, "\n");
 
 		if (rtp->packetizer->slMap.IV_length && KMS_URI) {
@@ -686,6 +644,7 @@
 			strcat(sdpLine, "\n");
 		}
 	}
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	/*DIMS decoder config*/
 	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_3GPP_DIMS) {
 		sprintf(sdpLine, "a=fmtp:%d Version-profile=%d", rtp->packetizer->PayloadType, 10);
@@ -694,10 +653,11 @@
 		}
 		strcat(sdpLine, "\n");
 	}
+#endif
 	/*MPEG-4 Audio LATM*/
 	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_LATM) {
 		GF_BitStream *bs;
-		char *config_bytes;
+		u8 *config_bytes;
 		u32 config_size;
 
 		/* form config string */
@@ -739,100 +699,65 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_rtp_streamer_append_sdp_decoding_dependency(GF_ISOFile *isofile, u32 isotrack, u8 *payload_type, char **out_sdp_buffer)
-{
-	u32 size, i, ref_track;
-	s32 count;
-	char sdp[20000], sdpLine[10000];
-
-	sprintf(sdp, "a=mid:L%d\n", isotrack);
 
-	count = gf_isom_get_reference_count(isofile, isotrack, GF_ISOM_REF_SCAL);
-	if (count > 0)
-	{
-		sprintf(sdpLine, "a=depend:%d lay", payload_type[isotrack-1]);
-		strcat(sdp, sdpLine);
-		for (i = 0; i < (u32) count; i++)
-		{
-			gf_isom_get_reference(isofile, isotrack, GF_ISOM_REF_SCAL, i+1, &ref_track);
-			sprintf(sdpLine, " L%d:%d", ref_track, payload_type[ref_track-1]);
-			strcat(sdp, sdpLine);
-		}
-		strcat(sdp, "\n");
-	}
-
-	size = (u32) strlen(sdp) + (*out_sdp_buffer ? (u32) strlen(*out_sdp_buffer) : 0) + 1;
-	if ( !*out_sdp_buffer) {
-		*out_sdp_buffer = (char*)gf_malloc(sizeof(char)*size);
-		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
-		strcpy(*out_sdp_buffer, sdp);
-	} else {
-		*out_sdp_buffer = (char*)gf_realloc(*out_sdp_buffer, sizeof(char)*size);
-		if (! *out_sdp_buffer) return GF_OUT_OF_MEM;
-		strcat(*out_sdp_buffer, sdp);
-	}
-	return GF_OK;
-}
 
 GF_EXPORT
 char *gf_rtp_streamer_format_sdp_header(char *app_name, char *ip_dest, char *session_name, char *iod64)
 {
 	u64 size;
 	char *sdp, *tmp_fn = NULL;
-	FILE *tmp = gf_temp_file_new(&tmp_fn);
+	FILE *tmp = gf_file_temp(&tmp_fn);
 	if (!tmp) return NULL;
 
 	/* write SDP header*/
-	fprintf(tmp, "v=0\n");
-	fprintf(tmp, "o=%s 3326096807 1117107880000 IN IP%d %s\n", app_name, gf_net_is_ipv6(ip_dest) ? 6 : 4, ip_dest);
-	fprintf(tmp, "s=%s\n", (session_name ? session_name : "GPAC Scene Streaming Session"));
-	fprintf(tmp, "c=IN IP%d %s\n", gf_net_is_ipv6(ip_dest) ? 6 : 4, ip_dest);
-	fprintf(tmp, "t=0 0\n");
+	gf_fprintf(tmp, "v=0\n");
+	gf_fprintf(tmp, "o=%s 3326096807 1117107880000 IN IP%d %s\n", app_name, gf_net_is_ipv6(ip_dest) ? 6 : 4, ip_dest);
+	gf_fprintf(tmp, "s=%s\n", (session_name ? session_name : "GPAC Scene Streaming Session"));
+	gf_fprintf(tmp, "c=IN IP%d %s\n", gf_net_is_ipv6(ip_dest) ? 6 : 4, ip_dest);
+	gf_fprintf(tmp, "t=0 0\n");
 
-	if (iod64) fprintf(tmp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", iod64);
+	if (iod64)
+		gf_fprintf(tmp, "a=mpeg4-iod:\"data:application/mpeg4-iod;base64,%s\"\n", iod64);
 
-	gf_fseek(tmp, 0, SEEK_END);
-	size = gf_ftell(tmp);
-	gf_fseek(tmp, 0, SEEK_SET);
+	size = gf_fsize(tmp);
 	sdp = (char*)gf_malloc(sizeof(char) * (size_t)(size+1));
-	size = fread(sdp, 1, (size_t)size, tmp);
+	size = gf_fread(sdp, (size_t)size, tmp);
 	sdp[size] = 0;
 	gf_fclose(tmp);
-	gf_delete_file(tmp_fn);
+	gf_file_delete(tmp_fn);
 	gf_free(tmp_fn);
 	return sdp;
 }
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_append_sdp(GF_RTPStreamer *rtp, u16 ESID, char *dsi, u32 dsi_len, char *KMS_URI, char **out_sdp_buffer)
+GF_Err gf_rtp_streamer_append_sdp(GF_RTPStreamer *rtp, u16 ESID, const u8 *dsi, u32 dsi_len, char *KMS_URI, char **out_sdp_buffer)
 {
-	return gf_rtp_streamer_append_sdp_extended(rtp, ESID, dsi, dsi_len, NULL, 0, KMS_URI, 0, 0, out_sdp_buffer);
+	return gf_rtp_streamer_append_sdp_extended(rtp, ESID, dsi, dsi_len, NULL, 0, KMS_URI, 0, 0, 0, 0, 0, 0, 0, GF_FALSE, out_sdp_buffer);
 }
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_send_data(GF_RTPStreamer *rtp, char *data, u32 size, u32 fullsize, u64 cts, u64 dts, Bool is_rap, Bool au_start, Bool au_end, u32 au_sn, u32 sampleDuration, u32 sampleDescIndex)
+GF_Err gf_rtp_streamer_send_data(GF_RTPStreamer *rtp, u8 *data, u32 size, u32 fullsize, u64 cts, u64 dts, Bool is_rap, Bool au_start, Bool au_end, u32 au_sn, u32 sampleDuration, u32 sampleDescIndex)
 {
 	rtp->packetizer->sl_header.compositionTimeStamp = (u64) (cts*rtp->ts_scale);
 	rtp->packetizer->sl_header.decodingTimeStamp = (u64) (dts*rtp->ts_scale);
 	rtp->packetizer->sl_header.randomAccessPointFlag = is_rap;
 	rtp->packetizer->sl_header.accessUnitStartFlag = au_start;
 	rtp->packetizer->sl_header.accessUnitEndFlag = au_end;
-	rtp->packetizer->sl_header.randomAccessPointFlag = is_rap;
 	rtp->packetizer->sl_header.AU_sequenceNumber = au_sn;
 	sampleDuration = (u32) (sampleDuration * rtp->ts_scale);
+	if (au_start && size) rtp->packetizer->nb_aus++;
 
 	return gf_rtp_builder_process(rtp->packetizer, data, size, (u8) au_end, fullsize, sampleDuration, sampleDescIndex);
 }
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_send_au(GF_RTPStreamer *rtp, char *data, u32 size, u64 cts, u64 dts, Bool is_rap)
+GF_Err gf_rtp_streamer_send_au(GF_RTPStreamer *rtp, u8 *data, u32 size, u64 cts, u64 dts, Bool is_rap)
 {
 	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, GF_TRUE, GF_TRUE, 0, 0, 0);
 }
 
 GF_EXPORT
-GF_Err gf_rtp_streamer_send_au_with_sn(GF_RTPStreamer *rtp, char *data, u32 size, u64 cts, u64 dts, Bool is_rap, u32 inc_au_sn)
+GF_Err gf_rtp_streamer_send_au_with_sn(GF_RTPStreamer *rtp, u8 *data, u32 size, u64 cts, u64 dts, Bool is_rap, u32 inc_au_sn)
 {
 	if (inc_au_sn) rtp->packetizer->sl_header.AU_sequenceNumber += inc_au_sn;
 	return gf_rtp_streamer_send_data(rtp, data, size, size, cts, dts, is_rap, GF_TRUE, GF_TRUE, rtp->packetizer->sl_header.AU_sequenceNumber, 0, 0);
@@ -852,13 +777,32 @@
 	streamer->channel->forced_ntp_frac = force_ntp_type ? ntp_frac : 0;
 	if (force_ntp_type==2)
 		streamer->channel->next_report_time = 0;
-	return gf_rtp_send_rtcp_report(streamer->channel, NULL, NULL);
+	return gf_rtp_send_rtcp_report(streamer->channel);
+}
+
+GF_EXPORT
+GF_Err gf_rtp_streamer_send_bye(GF_RTPStreamer *streamer)
+{
+	return gf_rtp_send_bye(streamer->channel);
 }
 
 GF_EXPORT
 u8 gf_rtp_streamer_get_payload_type(GF_RTPStreamer *streamer)
 {
-	return streamer->packetizer->PayloadType;
+	return streamer ? streamer->packetizer->PayloadType : 0;
+}
+
+GF_EXPORT
+u16 gf_rtp_streamer_get_next_rtp_sn(GF_RTPStreamer *streamer)
+{
+	return streamer->packetizer->rtp_header.SequenceNumber+1;
+}
+
+GF_EXPORT
+GF_Err gf_rtp_streamer_set_interleave_callbacks(GF_RTPStreamer *streamer, gf_rtp_tcp_callback RTP_TCPCallback, void *cbk1, void *cbk2)
+{
+
+ 	return gf_rtp_set_interleave_callbacks(streamer->channel, RTP_TCPCallback, cbk1, cbk2);
 }
 
 #endif /*GPAC_DISABLE_STREAMING && GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/ietf/rtsp_command.c -> gpac-1.0.0.tar.gz/src/ietf/rtsp_command.c Changed

@@ -48,8 +48,6 @@
 GF_EXPORT
 void gf_rtsp_command_reset(GF_RTSPCommand *com)
 {
-	GF_RTSPTransport *trans;
-	GF_X_Attribute *att;
 	if (!com) return;
 
 	//free all headers
@@ -83,12 +81,12 @@
 	com->Range = NULL;
 
 	while (gf_list_count(com->Transports)) {
-		trans = (GF_RTSPTransport *) gf_list_get(com->Transports, 0);
+		GF_RTSPTransport *trans = (GF_RTSPTransport *) gf_list_get(com->Transports, 0);
 		gf_list_rem(com->Transports, 0);
 		gf_rtsp_transport_del(trans);
 	}
 	while (gf_list_count(com->Xtensions)) {
-		att = (GF_X_Attribute*)gf_list_get(com->Xtensions, 0);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(com->Xtensions, 0);
 		gf_list_rem(com->Xtensions, 0);
 		gf_free(att->Name);
 		gf_free(att->Value);
@@ -111,12 +109,10 @@
                          unsigned char **out_buffer, u32 *out_size)
 {
 	u32 i, cur_pos, size, count;
-	char *buffer, temp[50];
-	GF_RTSPTransport *trans;
-	GF_X_Attribute *att;
+	char *buffer;
 
 	*out_buffer = NULL;
-
+	
 	size = RTSP_WRITE_STEPALLOC;
 	buffer = (char *) gf_malloc(size);
 	cur_pos = 0;
@@ -186,6 +182,7 @@
 	if (count) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Transport: ");
 		for (i=0; i<count; i++) {
+			GF_RTSPTransport *trans;
 			//line separator for headers
 			if (i) RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n ,");
 			trans = (GF_RTSPTransport *) gf_list_get(com->Transports, i);
@@ -238,7 +235,7 @@
 			}
 			if (trans->SSRC) {
 				RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, ";ssrc=");
-				RTSP_WRITE_INT(buffer, size, cur_pos, trans->SSRC, 0);
+				RTSP_WRITE_HEX(buffer, size, cur_pos, trans->SSRC, 0);
 			}
 		}
 		//done with transport
@@ -249,7 +246,7 @@
 	//eXtensions
 	count = gf_list_count(com->Xtensions);
 	for (i=0; i<count; i++) {
-		att = (GF_X_Attribute *) gf_list_get(com->Xtensions, i);
+		GF_X_Attribute *att = (GF_X_Attribute *) gf_list_get(com->Xtensions, i);
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "x-");
 		RTSP_WRITE_HEADER(buffer, size, cur_pos, att->Name, att->Value);
 	}
@@ -292,7 +289,7 @@
 	        && strcmp(com->method, GF_RTSP_PLAY)
 	        && strcmp(com->method, GF_RTSP_PAUSE)
 	        && strcmp(com->method, GF_RTSP_RECORD)
-	        && strcmp(com->method, GF_RTSP_REDIRECTE)
+	        && strcmp(com->method, GF_RTSP_REDIRECT)
 	        && strcmp(com->method, GF_RTSP_TEARDOWN)
 	        && strcmp(com->method, GF_RTSP_OPTIONS)
 
@@ -418,7 +415,8 @@
 	else if (!stricmp(Header, "Range")) com->Range = gf_rtsp_range_parse(Value);
 	else if (!stricmp(Header, "Referer")) com->Referer = gf_strdup(Value);
 	else if (!stricmp(Header, "Scale")) sscanf(Value, "%lf", &com->Scale);
-	else if (!stricmp(Header, "Session")) com->Session = gf_strdup(Value);
+	else if (!stricmp(Header, "Session"))
+		com->Session = gf_strdup(Value);
 	else if (!stricmp(Header, "Speed")) sscanf(Value, "%lf", &com->Speed);
 	else if (!stricmp(Header, "User_Agent")) com->User_Agent = gf_strdup(Value);
 	//Transports
@@ -451,7 +449,7 @@
 	u32 Size;
 
 	Size = sess->CurrentSize - sess->CurrentPos;
-	buffer = sess->TCPBuffer + sess->CurrentPos;
+	buffer = sess->tcp_buffer + sess->CurrentPos;
 
 	//by default the command is wrong ;)
 	com->StatusCode = NC_RTSP_Bad_Request;
@@ -471,7 +469,7 @@
 	com->service_name = gf_strdup(ValBuf);
 
 	//RTSP version
-	Pos = gf_token_get(LineBuffer, Pos, "\t\r\n", ValBuf, 1024);
+	Pos = gf_token_get(LineBuffer, Pos, " \t\r\n", ValBuf, 1024);
 	if (Pos <= 0) return GF_OK;
 	if (strcmp(ValBuf, GF_RTSP_VERSION)) {
 		com->StatusCode = NC_RTSP_RTSP_Version_Not_Supported;
@@ -483,6 +481,21 @@
 	return gf_rtsp_parse_header(buffer + ret, Size - ret, BodyStart, com, NULL);
 }
 
+char *RTSP_DEFINED_METHODS[] =
+{
+	GF_RTSP_DESCRIBE,
+	GF_RTSP_SETUP,
+	GF_RTSP_PLAY,
+	GF_RTSP_PAUSE,
+	GF_RTSP_RECORD,
+	GF_RTSP_TEARDOWN,
+	GF_RTSP_GET_PARAMETER,
+	GF_RTSP_SET_PARAMETER,
+	GF_RTSP_OPTIONS,
+	GF_RTSP_ANNOUNCE,
+	GF_RTSP_REDIRECT,
+	NULL
+};
 
 GF_EXPORT
 GF_Err gf_rtsp_get_command(GF_RTSPSession *sess, GF_RTSPCommand *com)
@@ -497,19 +510,30 @@
 	if (!sess->connection) return GF_IP_CONNECTION_CLOSED;
 
 	//lock
-	gf_mx_p(sess->mx);
-
 	//fill TCP buffer
 	e = gf_rtsp_fill_buffer(sess);
 	if (e) goto exit;
+	if (sess->TCPChannels)
 	//this is upcoming, interleaved data
-	if (strncmp(sess->TCPBuffer+sess->CurrentPos, "RTSP", 4)) {
-		e = GF_IP_NETWORK_EMPTY;
-		goto exit;
+	if (sess->interleaved) {
+		u32 i=0;
+		Bool sync = GF_FALSE;
+		while (RTSP_DEFINED_METHODS[i]) {
+			if (!strncmp(sess->tcp_buffer+sess->CurrentPos, RTSP_DEFINED_METHODS[i], strlen(RTSP_DEFINED_METHODS[i]) ) ) {
+				sync = GF_TRUE;
+				break;
+			}
+		}
+		if (!sync) {
+			e = GF_IP_NETWORK_EMPTY;
+			goto exit;
+		}
 	}
 	e = gf_rtsp_read_reply(sess);
 	if (e) goto exit;
 
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Got Command:\n%s\n", sess->tcp_buffer+sess->CurrentPos));
+
 	gf_rtsp_get_body_info(sess, &BodyStart, &size);
 	e = RTSP_ParseCommandHeader(sess, com, BodyStart);
 	//before returning an error we MUST reset the TCP buffer
@@ -517,12 +541,13 @@
 	//copy the body if any
 	if (!e && com->Content_Length) {
 		com->body = (char *) gf_malloc(sizeof(char) * (com->Content_Length));
-		memcpy(com->body, sess->TCPBuffer+sess->CurrentPos + BodyStart, com->Content_Length);
+		memcpy(com->body, sess->tcp_buffer+sess->CurrentPos + BodyStart, com->Content_Length);
 	}
 	//reset TCP buffer
 	sess->CurrentPos += BodyStart + com->Content_Length;
 
-	if (!com->CSeq) com->StatusCode = NC_RTSP_Bad_Request;
+	if (!com->CSeq)
+		com->StatusCode = NC_RTSP_Bad_Request;
 
 	if (e || (com->StatusCode != NC_RTSP_OK)) goto exit;
 
@@ -565,7 +590,6 @@
 	}
 
 exit:
-	gf_mx_v(sess->mx);
 	return e;
 }

gpac-0.8.0.tar.gz/src/ietf/rtsp_common.c -> gpac-1.0.0.tar.gz/src/ietf/rtsp_common.c Changed

@@ -61,11 +61,11 @@
 	u32 i;
 	s32 start;
 	char *buffer;
-	char *cl_str, val[30];
+	char *cl_str;
 
 	*body_start = *body_size = 0;
 
-	buffer = sess->TCPBuffer + sess->CurrentPos;
+	buffer = sess->tcp_buffer + sess->CurrentPos;
 	start = gf_token_find(buffer, 0, sess->CurrentSize - sess->CurrentPos, "\r\n\r\n");
 	if (start<=0) {
 		return;
@@ -79,6 +79,7 @@
 	if (!cl_str) cl_str = strstr(buffer, "Content-length: ");
 
 	if (cl_str) {
+		char val[30];
 		cl_str += 16;
 		i = 0;
 		while (cl_str[i] != '\r') {
@@ -106,17 +107,15 @@
 	if (!res) return gf_rtsp_fill_buffer(sess);
 
 	ptr = (char *)gf_malloc(sizeof(char) * res);
-	memcpy(ptr, sess->TCPBuffer+sess->CurrentPos, res);
-	memcpy(sess->TCPBuffer, ptr, res);
+	memcpy(ptr, sess->tcp_buffer + sess->CurrentPos, res);
+	memcpy(sess->tcp_buffer, ptr, res);
 	gf_free(ptr);
 
 	sess->CurrentPos = 0;
 	sess->CurrentSize = res;
 
 	//now read from current pos
-	e = gf_sk_receive(sess->connection, sess->TCPBuffer + sess->CurrentSize,
-	                  RTSP_TCP_BUF_SIZE - sess->CurrentSize,
-	                  0, &res);
+	e = gf_sk_receive(sess->connection, sess->tcp_buffer + sess->CurrentSize, sess->SockBufferSize - sess->CurrentSize, &res);
 
 	if (!e) {
 		sess->CurrentSize += res;
@@ -132,16 +131,16 @@
 	if (!sess->connection) return GF_IP_NETWORK_EMPTY;
 
 	if (sess->CurrentSize == sess->CurrentPos) {
-		e = gf_sk_receive(sess->connection, sess->TCPBuffer, RTSP_TCP_BUF_SIZE, 0, &sess->CurrentSize);
+		e = gf_sk_receive(sess->connection, sess->tcp_buffer, sess->SockBufferSize, &sess->CurrentSize);
 		sess->CurrentPos = 0;
-		sess->TCPBuffer[sess->CurrentSize] = 0;
+		sess->tcp_buffer[sess->CurrentSize] = 0;
 		if (e) sess->CurrentSize = 0;
 	} else if (!sess->CurrentSize) e = GF_IP_NETWORK_EMPTY;
 	return e;
 }
 
 
-GF_RTSPTransport *gf_rtsp_transport_parse(char *buffer)
+GF_RTSPTransport *gf_rtsp_transport_parse(u8 *buffer)
 {
 	Bool IsFirst;
 	char buf[100], param_name[100], param_val[100];
@@ -222,7 +221,7 @@
 
 
 
-GF_Err gf_rtsp_parse_header(char *buffer, u32 BufferSize, u32 BodyStart, GF_RTSPCommand *com, GF_RTSPResponse *rsp)
+GF_Err gf_rtsp_parse_header(u8 *buffer, u32 BufferSize, u32 BodyStart, GF_RTSPCommand *com, GF_RTSPResponse *rsp)
 {
 	char LineBuffer[1024];
 	char HeaderBuf[100], ValBuf[1024], temp[400];

gpac-0.8.0.tar.gz/src/ietf/rtsp_response.c -> gpac-1.0.0.tar.gz/src/ietf/rtsp_response.c Changed

@@ -49,9 +49,6 @@
 GF_EXPORT
 void gf_rtsp_response_reset(GF_RTSPResponse *rsp)
 {
-	GF_RTPInfo *inf;
-	GF_RTSPTransport *trans;
-	GF_X_Attribute *att;
 	if (!rsp) return;
 
 	//free all headers
@@ -103,19 +100,19 @@
 	rsp->SessionTimeOut = 0;
 
 	while (gf_list_count(rsp->Transports)) {
-		trans = (GF_RTSPTransport*) gf_list_get(rsp->Transports, 0);
+		GF_RTSPTransport *trans = (GF_RTSPTransport*) gf_list_get(rsp->Transports, 0);
 		gf_list_rem(rsp->Transports, 0);
 		gf_rtsp_transport_del(trans);
 	}
 
 	while (gf_list_count(rsp->RTP_Infos)) {
-		inf = (GF_RTPInfo*) gf_list_get(rsp->RTP_Infos, 0);
+		GF_RTPInfo *inf = (GF_RTPInfo*) gf_list_get(rsp->RTP_Infos, 0);
 		gf_list_rem(rsp->RTP_Infos, 0);
 		if (inf->url) gf_free(inf->url);
 		gf_free(inf);
 	}
 	while (gf_list_count(rsp->Xtensions)) {
-		att = (GF_X_Attribute*)gf_list_get(rsp->Xtensions, 0);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(rsp->Xtensions, 0);
 		gf_list_rem(rsp->Xtensions, 0);
 		gf_free(att->Name);
 		gf_free(att->Value);
@@ -325,7 +322,7 @@
 	u32 Size;
 
 	Size = sess->CurrentSize - sess->CurrentPos;
-	buffer = sess->TCPBuffer + sess->CurrentPos;
+	buffer = sess->tcp_buffer + sess->CurrentPos;
 
 	//parse first line
 	ret = gf_token_get_line(buffer, 0, Size, LineBuffer, 1024);
@@ -376,11 +373,6 @@
 	if (!sess || !rsp) return GF_BAD_PARAM;
 	gf_rtsp_response_reset(rsp);
 
-
-	//LOCK
-	gf_mx_p(sess->mx);
-
-
 	e = gf_rtsp_check_connection(sess);
 	if (e)
 		goto exit;
@@ -391,7 +383,7 @@
 		goto exit;
 
 	//this is interleaved data
-	if (!IsRTSPMessage(sess->TCPBuffer+sess->CurrentPos) ) {
+	if (!IsRTSPMessage(sess->tcp_buffer+sess->CurrentPos) ) {
 		gf_rtsp_session_read(sess);
 		e = GF_IP_NETWORK_EMPTY;
 		goto exit;
@@ -407,10 +399,10 @@
 	//copy the body if any
 	if (!e && rsp->Content_Length) {
 		rsp->body = (char *)gf_malloc(sizeof(char) * (rsp->Content_Length));
-		memcpy(rsp->body, sess->TCPBuffer+sess->CurrentPos + BodyStart, rsp->Content_Length);
+		memcpy(rsp->body, sess->tcp_buffer+sess->CurrentPos + BodyStart, rsp->Content_Length);
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Got Response:\n%s\n", sess->TCPBuffer+sess->CurrentPos));
+	GF_LOG(GF_LOG_INFO, GF_LOG_RTP, ("[RTSP] Got Response:\n%s\n", sess->tcp_buffer+sess->CurrentPos));
 
 	//reset TCP buffer
 	sess->CurrentPos += BodyStart + rsp->Content_Length;
@@ -438,7 +430,6 @@
 	//to an aggreagated sequence of requests
 	//if we have reseted the connection (due to an APP error) return empty
 	if (rsp->CSeq && sess->CSeq > rsp->CSeq + sess->NbPending) {
-		gf_mx_v(sess->mx);
 		return gf_rtsp_get_response(sess, rsp);
 	}
 
@@ -478,8 +469,6 @@
 			sess->http = NULL;
 		}
 	}
-
-	gf_mx_v(sess->mx);
 	return e;
 }
 
@@ -487,11 +476,7 @@
                           unsigned char **out_buffer, u32 *out_size)
 {
 	u32 i, cur_pos, size, count;
-	char *buffer, temp[50];
-	GF_RTSPTransport *trans;
-	GF_X_Attribute *att;
-	GF_RTPInfo *info;
-
+	char *buffer;
 
 	*out_buffer = NULL;
 
@@ -575,6 +560,7 @@
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "RTPInfo: ");
 
 		for (i=0; i<count; i++) {
+			GF_RTPInfo *info;
 			//line separator for headers
 			if (i) RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n ,");
 			info = (GF_RTPInfo*)gf_list_get(rsp->RTP_Infos, i);
@@ -611,6 +597,7 @@
 	if (count) {
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "Transport: ");
 		for (i=0; i<count; i++) {
+			GF_RTSPTransport *trans;
 			//line separator for headers
 			if (i) RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "\r\n ,");
 			trans = (GF_RTSPTransport*)gf_list_get(rsp->Transports, i);
@@ -663,7 +650,7 @@
 			}
 			if (trans->SSRC) {
 				RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, ";ssrc=");
-				RTSP_WRITE_INT(buffer, size, cur_pos, trans->SSRC, 0);
+				RTSP_WRITE_HEX(buffer, size, cur_pos, trans->SSRC, 0);
 			}
 		}
 		//done with transport
@@ -679,7 +666,7 @@
 	//eXtensions
 	count = gf_list_count(rsp->Xtensions);
 	for (i=0; i<count; i++) {
-		att = (GF_X_Attribute*)gf_list_get(rsp->Xtensions, i);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(rsp->Xtensions, i);
 		RTSP_WRITE_ALLOC_STR(buffer, size, cur_pos, "x-");
 		RTSP_WRITE_HEADER(buffer, size, cur_pos, att->Name, att->Value);
 	}
@@ -707,14 +694,10 @@
 	if (rsp->CSeq > sess->CSeq) return GF_BAD_PARAM;
 
 	e = RTSP_WriteResponse(sess, rsp, (unsigned char **) &buffer, &size);
-	if (e) goto exit;
-
-	//send buffer
-	e = gf_rtsp_send_data(sess, buffer, size);
-	if (e) return e;
-//	fprintf(stderr, "RTSP Send Response\n\n%s\n\n", buffer);
-
-exit:
+	if (!e) {
+		//send buffer
+		e = gf_rtsp_send_data(sess, buffer, size);
+	}
 	if (buffer) gf_free(buffer);
 	return e;
 }

gpac-0.8.0.tar.gz/src/ietf/rtsp_session.c -> gpac-1.0.0.tar.gz/src/ietf/rtsp_session.c Changed

@@ -29,6 +29,8 @@
 
 #ifndef GPAC_DISABLE_STREAMING
 
+/*default packet size to use when storing incomplete packets*/
+#define RTSP_PCK_SIZE			1000
 
 GF_Err RTSP_UnpackURL(char *sURL, char *Server, u16 *Port, char *Service, Bool *useTCP)
 {
@@ -136,9 +138,10 @@
 		sess->HasTunnel = GF_TRUE;
 	}
 
+	gf_rtsp_set_buffer_size(sess, RTSP_PCK_SIZE);
+
 	sess->Server = gf_strdup(server);
 	sess->Service = gf_strdup(service);
-	sess->mx = gf_mx_new("RTSPSession");
 	sess->TCPChannels = gf_list_new();
 	gf_rtsp_session_reset(sess, GF_FALSE);
 	return sess;
@@ -150,7 +153,6 @@
 {
 	if (!sess) return;
 
-	gf_mx_p(sess->mx);
 	if (sess->RTSP_State == GF_RTSP_STATE_WAIT_FOR_CONTROL) {
 		strcpy(sess->RTSPLastRequest, "RESET");
 		//skip all we haven't received
@@ -158,18 +160,12 @@
 		sess->NbPending = 0;
 	}
 	sess->RTSP_State = GF_RTSP_STATE_INIT;
-	gf_mx_v(sess->mx);
-}
-
-void RTSP_AcknowledgeError(GF_RTSPSession *sess)
-{
 }
 
 void RemoveTCPChannels(GF_RTSPSession *sess)
 {
-	GF_TCPChan *ch;
 	while (gf_list_count(sess->TCPChannels)) {
-		ch = (GF_TCPChan*)gf_list_get(sess->TCPChannels, 0);
+		GF_TCPChan *ch = (GF_TCPChan*)gf_list_get(sess->TCPChannels, 0);
 		gf_free(ch);
 		gf_list_rem(sess->TCPChannels, 0);
 	}
@@ -179,8 +175,6 @@
 GF_EXPORT
 void gf_rtsp_session_reset(GF_RTSPSession *sess, Bool ResetConnection)
 {
-	gf_mx_p(sess->mx);
-
 	sess->last_session_id = NULL;
 	sess->NeedConnection = 1;
 
@@ -200,7 +194,6 @@
 	sess->CurrentPos = sess->CurrentSize = 0;
 	strcpy(sess->RTSPLastRequest, "");
 	RemoveTCPChannels(sess);
-	gf_mx_v(sess->mx);
 }
 
 GF_EXPORT
@@ -216,8 +209,8 @@
 	if (sess->Service) gf_free(sess->Service);
 	gf_list_del(sess->TCPChannels);
 	if (sess->rtsp_pck_buf) gf_free(sess->rtsp_pck_buf);
-	if (sess->MobileIP) gf_free(sess->MobileIP);
-	gf_mx_del(sess->mx);
+	gf_free(sess->tcp_buffer);
+
 	gf_free(sess);
 }
 
@@ -227,51 +220,38 @@
 	u32 state;
 	if (!sess) return GF_RTSP_STATE_INVALIDATED;
 
-	gf_mx_p(sess->mx);
 	state = sess->RTSP_State;
-	gf_mx_v(sess->mx);
 	return state;
 }
 
-GF_EXPORT
-void gf_rtsp_set_mobile_ip(GF_RTSPSession *sess, char *MobileIP)
-{
-	if (sess->MobileIP) gf_free(sess->MobileIP);
-	sess->MobileIP = NULL;
-	if (MobileIP) sess->MobileIP = gf_strdup(MobileIP);
-}
-
-
-GF_EXPORT
+#if 0 //unused
 char *gf_rtsp_get_last_request(GF_RTSPSession *sess)
 {
-	char *ret;
 	if (!sess) return NULL;
-	gf_mx_p(sess->mx);
-	ret = sess->RTSPLastRequest;
-	gf_mx_v(sess->mx);
-	return ret;
+	return sess->RTSPLastRequest;
 }
+#endif
 
 
 //check whether the url contains server and service name
 //no thread protection as this is const throughout the session
 GF_EXPORT
-u32 gf_rtsp_is_my_session(GF_RTSPSession *sess, char *url)
+Bool gf_rtsp_is_my_session(GF_RTSPSession *sess, char *url)
 {
-	if (!sess) return 0;
-	if (!strstr(url, sess->Server)) return 0;
+	if (!sess) return GF_FALSE;
+	if (!strstr(url, sess->Server)) return GF_FALSE;
 	//same url or sub-url
-	if (strstr(url, sess->Service)) return 1;
-	return 0;
+	if (strstr(url, sess->Service)) return GF_TRUE;
+	return GF_FALSE;
 }
 
-GF_EXPORT
+#if 0 //unused
 const char *gf_rtsp_get_last_session_id(GF_RTSPSession *sess)
 {
 	if (!sess) return NULL;
 	return sess->last_session_id;
 }
+#endif
 
 GF_EXPORT
 char *gf_rtsp_get_server_name(GF_RTSPSession *sess)
@@ -281,13 +261,6 @@
 }
 
 GF_EXPORT
-char *gf_rtsp_get_service_name(GF_RTSPSession *sess)
-{
-	if (!sess) return NULL;
-	return sess->Service;
-}
-
-GF_EXPORT
 u16 gf_rtsp_get_session_port(GF_RTSPSession *sess)
 {
 	return (sess ? sess->Port : 0);
@@ -305,13 +278,20 @@
 		if (!sess->connection) return GF_OUT_OF_MEM;
 	}
 	//the session is down, reconnect
-	e = gf_sk_connect(sess->connection, sess->Server, sess->Port, sess->MobileIP);
+	e = gf_sk_connect(sess->connection, sess->Server, sess->Port, NULL);
 	if (e) return e;
 
 	if (sess->SockBufferSize) gf_sk_set_buffer_size(sess->connection, GF_FALSE, sess->SockBufferSize);
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode())
+		gf_rtsp_http_tunnel_start(NULL, NULL);
+#endif
+
 	if (!sess->http && sess->HasTunnel) {
-		e = gf_rtsp_http_tunnel_start(sess, "toto is the king of RTSP");
+		const char *ua = gf_opts_get_key("core", "user-agent");
+		if (!ua) ua = "GPAC " GPAC_VERSION;
+		e = gf_rtsp_http_tunnel_start(sess, (char *)ua);
 		if (e) return e;
 	}
 	sess->NeedConnection = 0;
@@ -319,7 +299,7 @@
 }
 
 
-GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, char *buffer, u32 Size)
+GF_Err gf_rtsp_send_data(GF_RTSPSession *sess, u8 *buffer, u32 Size)
 {
 	GF_Err e;
 	u32 Size64;
@@ -369,7 +349,7 @@
 	if (!sess) return GF_SERVICE_ERROR;
 
 	Size = sess->CurrentSize - sess->CurrentPos;
-	buffer = sess->TCPBuffer + sess->CurrentPos;
+	buffer = sess->tcp_buffer + sess->CurrentPos;
 
 	if (!Size) return GF_IP_NETWORK_EMPTY;
 
@@ -447,38 +427,12 @@
 }
 
 
-
-
-
-
-
-
-/*
-		Exposed API, thread-safe
-*/
-
-GF_Err RTSP_ResetInterleaving(GF_RTSPSession *sess, Bool ResetChannels)
-{
-	if (!sess) return GF_BAD_PARAM;
-
-	gf_mx_p(sess->mx);
-	sess->payloadSize = 0;
-	sess->pck_start = 0;
-	sess->InterID = (u8) -1;
-	if (ResetChannels) RemoveTCPChannels(sess);
-	gf_mx_v(sess->mx);
-
-	return GF_OK;
-}
-
-
 GF_EXPORT
 GF_Err gf_rtsp_session_read(GF_RTSPSession *sess)
 {
 	GF_Err e;
 	if (!sess) return GF_BAD_PARAM;
 
-	gf_mx_p(sess->mx);
 	e = gf_rtsp_fill_buffer(sess);
 	if (!e) {
 		//only read if not RTSP
@@ -487,7 +441,6 @@
 			if (e) break;
 		}
 	}
-	gf_mx_v(sess->mx);
 	return e;
 }
 
@@ -495,13 +448,15 @@
 GF_EXPORT
 u32 gf_rtsp_unregister_interleave(GF_RTSPSession *sess, u8 LowInterID)
 {
+	u32 res;
 	GF_TCPChan *ptr;
+	if (!sess) return 0;
 
-	gf_mx_p(sess->mx);
 	ptr = GetTCPChannel(sess, LowInterID, LowInterID, GF_TRUE);
 	if (ptr) gf_free(ptr);
-	gf_mx_v(sess->mx);
-	return gf_list_count(sess->TCPChannels);
+	res = gf_list_count(sess->TCPChannels);
+	if (!res) sess->interleaved = GF_FALSE;
+	return res;
 }
 
 GF_EXPORT
@@ -511,7 +466,6 @@
 
 	if (!sess) return GF_BAD_PARAM;
 
-	gf_mx_p(sess->mx);
 	//do NOT register twice
 	ptr = GetTCPChannel(sess, LowInterID, HighInterID, GF_FALSE);
 	if (!ptr) {
@@ -521,33 +475,25 @@
 		ptr->rtcpID = HighInterID;
 		gf_list_add(sess->TCPChannels, ptr);
 	}
-	gf_mx_v(sess->mx);
+	sess->interleaved=GF_TRUE;
 	return GF_OK;
 }
 
 
 GF_EXPORT
-GF_Err gf_rtsp_set_interleave_callback(GF_RTSPSession *sess,
-                                       GF_Err (*SignalData)(GF_RTSPSession *sess, void *chan, char *buffer, u32 bufferSize, Bool IsRTCP)
-                                      )
+GF_Err gf_rtsp_set_interleave_callback(GF_RTSPSession *sess, gf_rtsp_interleave_callback SignalData)
 {
 	if (!sess) return GF_BAD_PARAM;
 
-	gf_mx_p(sess->mx);
-
 	//only if existing
 	if (SignalData) sess->RTSP_SignalData = SignalData;
 
-	//gf_realloc or alloc
-	if (sess->rtsp_pck_buf && sess->rtsp_pck_size != RTSP_PCK_SIZE) {
-		sess->rtsp_pck_size = RTSP_PCK_SIZE;
-		sess->rtsp_pck_buf = (char *)gf_realloc(sess->rtsp_pck_buf, sizeof(char)*sess->rtsp_pck_size);
-	} else if (!sess->rtsp_pck_buf) {
+	if (!sess->rtsp_pck_buf || (sess->rtsp_pck_size != RTSP_PCK_SIZE) ) {
+		if (!sess->rtsp_pck_buf)
+			sess->pck_start = 0;
 		sess->rtsp_pck_size = RTSP_PCK_SIZE;
 		sess->rtsp_pck_buf = (char *)gf_realloc(sess->rtsp_pck_buf, sizeof(char)*sess->rtsp_pck_size);
-		sess->pck_start = 0;
 	}
-	gf_mx_v(sess->mx);
 	return GF_OK;
 }
 
@@ -555,7 +501,9 @@
 GF_Err gf_rtsp_set_buffer_size(GF_RTSPSession *sess, u32 BufferSize)
 {
 	if (!sess) return GF_BAD_PARAM;
+	if (sess->SockBufferSize >= BufferSize) return GF_OK;
 	sess->SockBufferSize = BufferSize;
+	sess->tcp_buffer = gf_realloc(sess->tcp_buffer, BufferSize);
 	return GF_OK;
 }
 
@@ -567,16 +515,25 @@
 #define HTTP_RSP_OK	"HTTP/1.0 200 OK"
 
 
-void RTSP_GenerateHTTPCookie(GF_RTSPSession *sess)
+//http tunnelling start.
+GF_EXPORT
+GF_Err gf_rtsp_http_tunnel_start(GF_RTSPSession *sess, char *UserAgent)
 {
+	GF_Err e;
+	u32 size;
+	s32 pos;
 	u32 i, num, temp;
+	char buffer[GF_RTSP_DEFAULT_BUFFER];
+
+	if (!sess || !UserAgent) return GF_BAD_PARAM;
 
+	//generate http cookie
 	if (HTTP_RandInit) {
 		gf_rand_init(GF_FALSE);
 		HTTP_RandInit = GF_FALSE;
 	}
 	if (!sess->CookieRadLen) {
-		strcpy(sess->HTTP_Cookie, "MPEG4M4");
+		strcpy(sess->HTTP_Cookie, "GPACROH");
 		sess->CookieRadLen = 8;
 	}
 	num = gf_rand();
@@ -585,20 +542,6 @@
 		sess->HTTP_Cookie[sess->CookieRadLen + i] = (u8) temp + sess->HTTP_Cookie[0];
 	}
 	sess->HTTP_Cookie[sess->CookieRadLen + i] = 0;
-}
-
-
-
-
-//http tunnelling start.
-GF_Err gf_rtsp_http_tunnel_start(GF_RTSPSession *sess, char *UserAgent)
-{
-	GF_Err e;
-	u32 size;
-	s32 pos;
-	char buffer[GF_RTSP_DEFAULT_BUFFER];
-
-	RTSP_GenerateHTTPCookie(sess);
 
 	//  1. send "GET /sample.mov HTTP/1.0\r\n ..."
 	memset(buffer, 0, GF_RTSP_DEFAULT_BUFFER);
@@ -615,7 +558,7 @@
 	if (e) return e;
 
 	//	2. wait for "HTTP/1.0 200 OK"
-	e = gf_sk_receive_wait(sess->connection, buffer, GF_RTSP_DEFAULT_BUFFER, 0, &size, HTTP_WAIT_SEC);
+	e = gf_sk_receive_wait(sess->connection, buffer, GF_RTSP_DEFAULT_BUFFER, &size, HTTP_WAIT_SEC);
 	if (e) return e;
 
 	//get HTTP/1.0 200 OK
@@ -626,8 +569,7 @@
 	sess->http = gf_sk_new(GF_SOCK_TYPE_TCP);
 	if (!sess->http ) return GF_IP_NETWORK_FAILURE;
 
-	/*mobileIP is enabled, bind first*/
-	if (gf_sk_connect(sess->http, sess->Server, sess->Port, sess->MobileIP)) return GF_IP_CONNECTION_FAILURE;
+	if (gf_sk_connect(sess->http, sess->Server, sess->Port, NULL)) return GF_IP_CONNECTION_FAILURE;
 
 	memset(buffer, 0, GF_RTSP_DEFAULT_BUFFER);
 	pos = 0;
@@ -693,13 +635,13 @@
 	sess->ConnectionType = fam;
 	gf_sk_get_host_name(name);
 	sess->Server = gf_strdup(name);
-
+	gf_rtsp_set_buffer_size(sess, 4096);
 	sess->TCPChannels = gf_list_new();
 	return sess;
 }
 
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_rtsp_load_service_name(GF_RTSPSession *sess, char *URL)
 {
 	char server[1024], service[1024];
@@ -722,7 +664,7 @@
 	sess->Service = gf_strdup(service);
 	return GF_OK;
 }
-
+#endif
 
 GF_EXPORT
 char *gf_rtsp_generate_session_id(GF_RTSPSession *sess)
@@ -747,7 +689,7 @@
 
 
 GF_EXPORT
-GF_Err gf_rtsp_get_session_ip(GF_RTSPSession *sess, char *buffer)
+GF_Err gf_rtsp_get_session_ip(GF_RTSPSession *sess, char buffer[GF_MAX_IP_NAME_LEN])
 {
 	if (!sess || !sess->connection) return GF_BAD_PARAM;
 	gf_sk_get_local_ip(sess->connection, buffer);
@@ -755,7 +697,7 @@
 }
 
 
-GF_EXPORT
+#if 0 //unused
 u8 gf_rtsp_get_next_interleave_id(GF_RTSPSession *sess)
 {
 	u32 i;
@@ -769,7 +711,7 @@
 	}
 	return id;
 }
-
+#endif
 
 GF_EXPORT
 GF_Err gf_rtsp_get_remote_address(GF_RTSPSession *sess, char *buf)
@@ -778,4 +720,21 @@
 	return gf_sk_get_remote_address(sess->connection, buf);
 }
 
+GF_EXPORT
+GF_Err gf_rtsp_session_write_interleaved(GF_RTSPSession *sess, u32 idx, u8 *pck, u32 pck_size)
+{
+	GF_Err e;
+	char streamID[4];
+	if (!sess || !sess->connection) return GF_BAD_PARAM;
+
+	streamID[0] = '$';
+	streamID[1] = (u8) idx;
+	streamID[2] = (pck_size>>8) & 0xFF;
+	streamID[3] = pck_size & 0xFF;
+
+	e = gf_sk_send_wait(sess->connection, streamID, 4, 20);
+	e |= gf_sk_send_wait(sess->connection, pck, pck_size, 20);
+	return e;
+}
+
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/src/ietf/sdp.c -> gpac-1.0.0.tar.gz/src/ietf/sdp.c Changed

@@ -47,10 +47,9 @@
 GF_EXPORT
 void gf_sdp_fmtp_del(GF_SDP_FMTP *fmtp)
 {
-	GF_X_Attribute *att;
 	if (!fmtp) return;
 	while (gf_list_count(fmtp->Attributes)) {
-		att = (GF_X_Attribute*)gf_list_get(fmtp->Attributes, 0);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(fmtp->Attributes, 0);
 		gf_list_rem(fmtp->Attributes, 0);
 		if (att->Name) gf_free(att->Name);
 		if (att->Value) gf_free(att->Value);
@@ -77,8 +76,6 @@
 	s32 pos;
 	u32 PayT;
 	char comp[3000];
-	GF_RTPMap *map;
-	GF_SDP_FMTP *fmtp;
 	GF_X_Attribute *att;
 
 	pos = gf_token_get(buffer, 0, " :\t\r\n", comp, 3000);
@@ -182,6 +179,7 @@
 		return;
 	}
 	if (!strcmp(comp, "rtpmap")) {
+		GF_RTPMap *map;
 		if (!media) return;
 		map = (GF_RTPMap*)gf_malloc(sizeof(GF_RTPMap));
 		pos = gf_token_get(buffer, pos, ": \r\n", comp, 3000);
@@ -197,6 +195,7 @@
 	}
 	//FMTP
 	if (!strcmp(comp, "fmtp")) {
+		GF_SDP_FMTP *fmtp;
 		if (!media) return;
 		pos = gf_token_get(buffer, pos, ": \r\n", comp, 3000);
 		PayT = atoi(comp);
@@ -245,22 +244,17 @@
 GF_EXPORT
 void gf_sdp_media_del(GF_SDPMedia *media)
 {
-	GF_SDPBandwidth *bw;
-	GF_RTPMap *map;
-	GF_SDPConnection *conn;
-	GF_SDP_FMTP *fmtp;
-	GF_X_Attribute *att;
 	if (!media) return;
 
 	while (gf_list_count(media->FMTP)) {
-		fmtp = (GF_SDP_FMTP*)gf_list_get(media->FMTP, 0);
+		GF_SDP_FMTP *fmtp = (GF_SDP_FMTP*)gf_list_get(media->FMTP, 0);
 		gf_list_rem(media->FMTP, 0);
 		gf_sdp_fmtp_del(fmtp);
 	}
 	gf_list_del(media->FMTP);
 
 	while (gf_list_count(media->Attributes)) {
-		att = (GF_X_Attribute*)gf_list_get(media->Attributes, 0);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(media->Attributes, 0);
 		gf_list_rem(media->Attributes, 0);
 		if (att->Name) gf_free(att->Name);
 		if (att->Value) gf_free(att->Value);
@@ -269,7 +263,7 @@
 	gf_list_del(media->Attributes);
 
 	while (gf_list_count(media->RTPMaps)) {
-		map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
+		GF_RTPMap *map = (GF_RTPMap*)gf_list_get(media->RTPMaps, 0);
 		gf_free(map->payload_name);
 		gf_free(map);
 		gf_list_rem(media->RTPMaps, 0);
@@ -277,14 +271,14 @@
 	gf_list_del(media->RTPMaps);
 
 	while (gf_list_count(media->Connections)) {
-		conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
+		GF_SDPConnection *conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
 		gf_list_rem(media->Connections, 0);
 		gf_sdp_conn_del(conn);
 	}
 	gf_list_del(media->Connections);
 
 	while (gf_list_count(media->Bandwidths)) {
-		bw = (GF_SDPBandwidth*)gf_list_get(media->Bandwidths, 0);
+		GF_SDPBandwidth *bw = (GF_SDPBandwidth*)gf_list_get(media->Bandwidths, 0);
 		gf_list_rem(media->Bandwidths, 0);
 		if (bw->name) gf_free(bw->name);
 		gf_free(bw);
@@ -357,33 +351,28 @@
 GF_EXPORT
 void gf_sdp_info_reset(GF_SDPInfo *sdp)
 {
-	GF_SDPBandwidth *bw;
-	GF_SDPMedia *media;
-	GF_SDPTiming *timing;
-	GF_X_Attribute *att;
-
 	if (!sdp) return;
 
 	while (gf_list_count(sdp->media_desc)) {
-		media = (GF_SDPMedia*)gf_list_get(sdp->media_desc, 0);
+		GF_SDPMedia *media = (GF_SDPMedia*)gf_list_get(sdp->media_desc, 0);
 		gf_list_rem(sdp->media_desc, 0);
 		gf_sdp_media_del(media);
 	}
 	while (gf_list_count(sdp->Attributes)) {
-		att = (GF_X_Attribute*)gf_list_get(sdp->Attributes, 0);
+		GF_X_Attribute *att = (GF_X_Attribute*)gf_list_get(sdp->Attributes, 0);
 		gf_list_rem(sdp->Attributes, 0);
 		if (att->Name) gf_free(att->Name);
 		if (att->Value) gf_free(att->Value);
 		gf_free(att);
 	}
 	while (gf_list_count(sdp->b_bandwidth)) {
-		bw = (GF_SDPBandwidth*)gf_list_get(sdp->b_bandwidth, 0);
+		GF_SDPBandwidth *bw = (GF_SDPBandwidth*)gf_list_get(sdp->b_bandwidth, 0);
 		gf_list_rem(sdp->b_bandwidth, 0);
 		if (bw->name) gf_free(bw->name);
 		gf_free(bw);
 	}
 	while (gf_list_count(sdp->Timing)) {
-		timing = (GF_SDPTiming*)gf_list_get(sdp->Timing, 0);
+		GF_SDPTiming *timing = (GF_SDPTiming*)gf_list_get(sdp->Timing, 0);
 		gf_list_rem(sdp->Timing, 0);
 		gf_free(timing);
 	}
@@ -444,7 +433,7 @@
 }
 
 //translate h || m || d in sec. Fractions are not allowed with this writing
-s32 SDP_MakeSeconds(char *buf)
+static s32 SDP_MakeSeconds(char *buf)
 {
 	s32 sign;
 	char num[30], *test;
@@ -492,6 +481,12 @@
 
 	if (!sdp) return GF_BAD_PARAM;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		SDP_MakeSeconds("30m");
+	}
+#endif
+
 	//Clean SDP info
 	gf_sdp_info_reset(sdp);
 
@@ -614,7 +609,7 @@
 			timing->RepeatInterval = SDP_MakeSeconds(comp);
 			pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 			timing->ActiveDuration = SDP_MakeSeconds(comp);
-			while (1) {
+			while (pos>=0) {
 				pos = gf_token_get(LineBuf, pos, " \t\r\n", comp, 3000);
 				if (pos <= 0) break;
 				timing->OffsetFromStart[timing->NbRepeatOffsets] = SDP_MakeSeconds(comp);
@@ -723,8 +718,9 @@
 }
 
 
+#if 0 //unused
 
-GF_Err SDP_CheckConnection(GF_SDPConnection *conn)
+static GF_Err SDP_CheckConnection(GF_SDPConnection *conn)
 {
 	if (!conn) return GF_BAD_PARAM;
 	if (!conn->host || !conn->add_type || !conn->net_type) return GF_REMOTE_SERVICE_ERROR;
@@ -739,7 +735,6 @@
 
 //return GF_BAD_PARAM if invalid structure, GF_REMOTE_SERVICE_ERROR if bad formatting
 //or GF_OK
-GF_EXPORT
 GF_Err gf_sdp_info_check(GF_SDPInfo *sdp)
 {
 	GF_Err e;
@@ -870,7 +865,6 @@
 		SDP_WRITE_ALLOC_STR("\r\n", 0);		\
 	}
 
-GF_EXPORT
 GF_Err gf_sdp_info_write(GF_SDPInfo *sdp, char **out_str_buf)
 {
 	char *buf;
@@ -1165,5 +1159,7 @@
 	*out_str_buf = buf;
 	return GF_OK;
 }
+#endif
+
 
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.8.0.tar.gz/src/isomedia/avc_ext.c -> gpac-1.0.0.tar.gz/src/isomedia/avc_ext.c Changed

gpac-0.8.0.tar.gz/src/isomedia/box_code_3gpp.c -> gpac-1.0.0.tar.gz/src/isomedia/box_code_3gpp.c Changed

gpac-0.8.0.tar.gz/src/isomedia/box_code_adobe.c -> gpac-1.0.0.tar.gz/src/isomedia/box_code_adobe.c Changed

@@ -1,8 +1,8 @@
 /*
  *			GPAC - Multimedia Framework C SDK
  *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
+ *			Author: Romain Bouqueau, Jean Le Feuvre
+ *			Copyright (c) Romain Bouqueau 2012- Telecom Paris 2019-
  *				All rights reserved
  *
  *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
@@ -33,7 +33,7 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void abst_del(GF_Box *s)
+void abst_box_del(GF_Box *s)
 {
 	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
 	if (ptr == NULL) return;
@@ -57,6 +57,7 @@
 	}
 	gf_list_del(ptr->quality_entry_table);
 
+
 	while (gf_list_count(ptr->segment_run_table_entries)) {
 		gf_isom_box_del((GF_Box *)gf_list_get(ptr->segment_run_table_entries, 0));
 		gf_list_rem(ptr->segment_run_table_entries, 0);
@@ -72,7 +73,7 @@
 	gf_free(ptr);
 }
 
-GF_Err abst_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err abst_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
 	int i;
@@ -80,6 +81,7 @@
 	char *tmp_str;
 	GF_Err e;
 
+	ISOM_DECREASE_SIZE(ptr, 25)
 	ptr->bootstrapinfo_version = gf_bs_read_u32(bs);
 	ptr->profile = gf_bs_read_int(bs, 2);
 	ptr->live = gf_bs_read_int(bs, 1);
@@ -91,8 +93,10 @@
 
 	i=0;
 	if (ptr->size<8) return GF_ISOM_INVALID_FILE;
-	tmp_strsize=(u32)ptr->size-8;
+	tmp_strsize =(u32)ptr->size-8;
 	tmp_str = gf_malloc(sizeof(char)*tmp_strsize);
+	if (!tmp_str) return GF_OUT_OF_MEM;
+	memset(tmp_str, 0, sizeof(char)*tmp_strsize);
 
 	while (tmp_strsize) {
 		tmp_str[i] = gf_bs_read_u8(bs);
@@ -101,8 +105,9 @@
 			break;
 		i++;
 	}
-	if (i)
+	if (i) {
 		ptr->movie_identifier = gf_strdup(tmp_str);
+	}
 
 	ptr->server_entry_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->server_entry_count; i++) {
@@ -115,7 +120,9 @@
 				break;
 			j++;
 		}
-		gf_list_insert(ptr->server_entry_table, gf_strdup(tmp_str), i);
+		if (j) {
+			gf_list_insert(ptr->server_entry_table, gf_strdup(tmp_str), i);
+		}
 	}
 
 	ptr->quality_entry_count = gf_bs_read_u8(bs);
@@ -129,7 +136,10 @@
 				break;
 			j++;
 		}
-		gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
+
+		if (j) {
+			gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
+		}
 	}
 
 	i=0;
@@ -141,8 +151,9 @@
 			break;
 		i++;
 	}
-	if (i)
+	if (i) {
 		ptr->drm_data = gf_strdup(tmp_str);
+	}
 
 	i=0;
 	tmp_strsize=(u32)ptr->size-8;
@@ -153,23 +164,32 @@
 			break;
 		i++;
 	}
-	if (i)
+	if (i) {
 		ptr->meta_data = gf_strdup(tmp_str);
+	}
 
 	ptr->segment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->segment_run_table_count; i++) {
-		GF_AdobeSegmentRunTableBox *asrt;
+		GF_AdobeSegmentRunTableBox *asrt = NULL;
 		e = gf_isom_box_parse((GF_Box **)&asrt, bs);
-		if (e) return e;
-		gf_list_insert(ptr->segment_run_table_entries, asrt, i);
+		if (e) {
+			if (asrt) gf_isom_box_del((GF_Box*)asrt);
+			gf_free(tmp_str);
+			return e;
+		}
+		gf_list_add(ptr->segment_run_table_entries, asrt);
 	}
 
 	ptr->fragment_run_table_count = gf_bs_read_u8(bs);
 	for (i=0; i<ptr->fragment_run_table_count; i++) {
-		GF_AdobeFragmentRunTableBox *afrt;
+		GF_AdobeFragmentRunTableBox *afrt = NULL;
 		e = gf_isom_box_parse((GF_Box **)&afrt, bs);
-		if (e) return e;
-		gf_list_insert(ptr->fragment_run_table_entries, afrt, i);
+		if (e) {
+			if (afrt) gf_isom_box_del((GF_Box*)afrt);
+			gf_free(tmp_str);
+			return e;
+		}
+		gf_list_add(ptr->fragment_run_table_entries, afrt);
 	}
 
 	gf_free(tmp_str);
@@ -177,7 +197,7 @@
 	return GF_OK;
 }
 
-GF_Box *abst_New()
+GF_Box *abst_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeBootstrapInfoBox, GF_ISOM_BOX_TYPE_ABST);
 	tmp->server_entry_table = gf_list_new();
@@ -189,7 +209,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err abst_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err abst_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	unsigned int i;
@@ -248,10 +268,10 @@
 	return GF_OK;
 }
 
-GF_Err abst_Size(GF_Box *s)
+GF_Err abst_box_size(GF_Box *s)
 {
 	GF_Err e;
-	int i;
+	u32 i;
 	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
 
 	s->size += 25
@@ -284,13 +304,12 @@
 		if (e) return e;
 		s->size += box->size;
 	}
-
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void afra_del(GF_Box *s)
+void afra_box_del(GF_Box *s)
 {
 	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
 	if (ptr == NULL) return;
@@ -310,11 +329,12 @@
 	gf_free(ptr);
 }
 
-GF_Err afra_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err afra_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	unsigned int i;
 	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 9)
 	ptr->long_ids = gf_bs_read_int(bs, 1);
 	ptr->long_offsets = gf_bs_read_int(bs, 1);
 	ptr->global_entries = gf_bs_read_int(bs, 1);
@@ -322,35 +342,49 @@
 	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))
+		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;
 
+		ISOM_DECREASE_SIZE(ptr, 8)
 		ae->time = gf_bs_read_u64(bs);
-		if (ptr->long_offsets)
+		if (ptr->long_offsets) {
+			ISOM_DECREASE_SIZE(ptr, 8)
 			ae->offset = gf_bs_read_u64(bs);
-		else
+		} else {
+			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) {
+		ISOM_DECREASE_SIZE(ptr, 4)
 		ptr->global_entry_count = gf_bs_read_u32(bs);
 		for (i=0; i<ptr->global_entry_count; i++) {
 			GF_GlobalAfraEntry *ae = gf_malloc(sizeof(GF_GlobalAfraEntry));
-
+			if (!ae) return GF_OUT_OF_MEM;
+			ISOM_DECREASE_SIZE(ptr, 8)
 			ae->time = gf_bs_read_u64(bs);
 			if (ptr->long_ids) {
+				ISOM_DECREASE_SIZE(ptr, 8)
 				ae->segment = gf_bs_read_u32(bs);
 				ae->fragment = gf_bs_read_u32(bs);
 			} else {
+				ISOM_DECREASE_SIZE(ptr, 4)
 				ae->segment = gf_bs_read_u16(bs);
 				ae->fragment = gf_bs_read_u16(bs);
 			}
 			if (ptr->long_offsets) {
+				ISOM_DECREASE_SIZE(ptr, 16)
 				ae->afra_offset = gf_bs_read_u64(bs);
 				ae->offset_from_afra = gf_bs_read_u64(bs);
 			} else {
+				ISOM_DECREASE_SIZE(ptr, 8)
 				ae->afra_offset = gf_bs_read_u32(bs);
 				ae->offset_from_afra = gf_bs_read_u32(bs);
 			}
@@ -362,7 +396,7 @@
 	return GF_OK;
 }
 
-GF_Box *afra_New()
+GF_Box *afra_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeFragRandomAccessBox, GF_ISOM_BOX_TYPE_AFRA);
 	tmp->local_access_entries = gf_list_new();
@@ -372,7 +406,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err afra_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err afra_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	unsigned int i;
@@ -423,7 +457,7 @@
 }
 
 
-GF_Err afra_Size(GF_Box *s)
+GF_Err afra_box_size(GF_Box *s)
 {
 	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
 
@@ -436,7 +470,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void asrt_del(GF_Box *s)
+void asrt_box_del(GF_Box *s)
 {
 	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
 	if (ptr == NULL) return;
@@ -456,16 +490,21 @@
 	gf_free(ptr);
 }
 
-GF_Err asrt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err asrt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	unsigned int i;
 	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 1)
 	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	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;
+		u32 tmp_strsize=(u32)ptr->size;
 		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		if (!tmp_str) return GF_OUT_OF_MEM;
 		while (tmp_strsize) {
 			tmp_str[j] = gf_bs_read_u8(bs);
 			tmp_strsize--;
@@ -473,12 +512,19 @@
 				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)
+		return GF_ISOM_INVALID_FILE;
+
 	for (i=0; i<ptr->segment_run_entry_count; i++) {
 		GF_AdobeSegmentRunEntry *sre = gf_malloc(sizeof(GF_AdobeSegmentRunEntry));
+		if (!sre) return GF_OUT_OF_MEM;
+		ISOM_DECREASE_SIZE(ptr, 8)
 		sre->first_segment = gf_bs_read_u32(bs);
 		sre->fragment_per_segment = gf_bs_read_u32(bs);
 		gf_list_insert(ptr->segment_run_entry_table, sre, i);
@@ -487,7 +533,7 @@
 	return GF_OK;
 }
 
-GF_Box *asrt_New()
+GF_Box *asrt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeSegmentRunTableBox, GF_ISOM_BOX_TYPE_ASRT);
 	tmp->quality_segment_url_modifiers = gf_list_new();
@@ -497,7 +543,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err asrt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err asrt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	unsigned int i;
@@ -523,7 +569,7 @@
 }
 
 
-GF_Err asrt_Size(GF_Box *s)
+GF_Err asrt_box_size(GF_Box *s)
 {
 	int i;
 	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
@@ -540,7 +586,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void afrt_del(GF_Box *s)
+void afrt_box_del(GF_Box *s)
 {
 	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
 	if (ptr == NULL) return;
@@ -560,18 +606,23 @@
 	gf_free(ptr);
 }
 
-GF_Err afrt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err afrt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	unsigned int i;
 	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 5)
 	ptr->timescale = gf_bs_read_u32(bs);
 
 	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	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);
+		if (!tmp_str) return GF_OUT_OF_MEM;
 		while (tmp_strsize) {
 			tmp_str[j] = gf_bs_read_u8(bs);
 			tmp_strsize--;
@@ -579,24 +630,31 @@
 				break;
 			j++;
 		}
+		ISOM_DECREASE_SIZE(ptr, j)
 		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
 	}
 
 	ptr->fragment_run_entry_count = gf_bs_read_u32(bs);
+	if (ptr->size < ptr->fragment_run_entry_count*16)
+		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;
+		ISOM_DECREASE_SIZE(ptr, 16)
 		fre->first_fragment = gf_bs_read_u32(bs);
 		fre->first_fragment_timestamp = gf_bs_read_u64(bs);
 		fre->fragment_duration = gf_bs_read_u32(bs);
-		if (!fre->fragment_duration)
+		if (!fre->fragment_duration) {
+			ISOM_DECREASE_SIZE(ptr, 1)
 			fre->discontinuity_indicator = gf_bs_read_u8(bs);
+		}
 		gf_list_insert(ptr->fragment_run_entry_table, fre, i);
 	}
 
 	return GF_OK;
 }
 
-GF_Box *afrt_New()
+GF_Box *afrt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeFragmentRunTableBox, GF_ISOM_BOX_TYPE_AFRT);
 	tmp->quality_segment_url_modifiers = gf_list_new();
@@ -606,7 +664,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err afrt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err afrt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	unsigned int i;
@@ -636,7 +694,7 @@
 }
 
 
-GF_Err afrt_Size(GF_Box *s)
+GF_Err afrt_box_size(GF_Box *s)
 {
 	u32 i;
 	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;

gpac-0.8.0.tar.gz/src/isomedia/box_code_apple.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2006-2019
  *				All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -27,14 +27,14 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-void ilst_del(GF_Box *s)
+void ilst_box_del(GF_Box *s)
 {
 	GF_ItemListBox *ptr = (GF_ItemListBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err ilst_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ilst_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 sub_type;
@@ -57,7 +57,7 @@
 			}
 
 			ISOM_DECREASE_SIZE(ptr, a->size);
-			gf_list_add(ptr->other_boxes, a);
+			gf_list_add(ptr->child_boxes, a);
 		} else {
 			gf_bs_read_u32(bs);
 			ISOM_DECREASE_SIZE(ptr, 4);
@@ -66,16 +66,16 @@
 	return GF_OK;
 }
 
-GF_Box *ilst_New()
+GF_Box *ilst_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ItemListBox, GF_ISOM_BOX_TYPE_ILST);
-	tmp->other_boxes = gf_list_new();
+	tmp->child_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ilst_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ilst_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 //	GF_ItemListBox *ptr = (GF_ItemListBox *)s;
@@ -87,25 +87,21 @@
 }
 
 
-GF_Err ilst_Size(GF_Box *s)
+GF_Err ilst_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ilst_item_del(GF_Box *s)
+void ilst_item_box_del(GF_Box *s)
 {
 	GF_ListItemBox *ptr = (GF_ListItemBox *) s;
 	if (ptr == NULL) return;
-	if (ptr->data != NULL) {
-		if (ptr->data->data) gf_free(ptr->data->data);
-		gf_free(ptr->data);
-	}
 	gf_free(ptr);
 }
 
-GF_Err ilst_item_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err ilst_item_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 sub_type;
@@ -116,33 +112,55 @@
 	if (sub_type == GF_ISOM_BOX_TYPE_DATA ) {
 		e = gf_isom_box_parse(&a, bs);
 
-		if (!e && ptr->size < a->size) {
+		if (!e && a && (ptr->size < a->size)) {
 			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), ptr->size, a->size, __FILE__, __LINE__ )); \
 			e = GF_ISOM_INVALID_FILE;
 		}
+		if (!a) e = GF_ISOM_INVALID_FILE;
+
 		if (e) {
 			if (a) gf_isom_box_del(a);
 			return e;
 		}
+		if (!a) return GF_NON_COMPLIANT_BITSTREAM;
 
 		ISOM_DECREASE_SIZE(ptr, a->size);
 
-		if (a && ptr->data) gf_isom_box_del((GF_Box *) ptr->data);
+		if (ptr->data) gf_isom_box_del_parent(&ptr->child_boxes, (GF_Box *) ptr->data);
 
 		/* otherwise a->data will always overflow */
-		if (a && a->size > 4 && a->type != GF_ISOM_BOX_TYPE_VOID)
+		if (a->size > 4 && (a->type != GF_ISOM_BOX_TYPE_VOID)) {
 			ptr->data = (GF_DataBox *)a;
-		else {
+			if (!ptr->child_boxes) ptr->child_boxes = gf_list_new();
+			gf_list_add(ptr->child_boxes, ptr->data);
+		} else {
 			ptr->data = NULL;
 			gf_isom_box_del(a);
 		}
 	}
 	/*QT way*/
 	else {
-		ptr->data->type = 0;
+		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);
+		if (e==GF_OK) return GF_OK;
+		//reset content and retry - this deletes ptr->data !!
+		gf_isom_box_array_del(s->child_boxes);
+		s->child_boxes=NULL;
+		gf_bs_seek(bs, pos);
+		s->size = prev_size;
+
+		ptr->data = (GF_DataBox *)gf_isom_box_new_parent(&ptr->child_boxes, GF_ISOM_BOX_TYPE_DATA);
+		//nope, check qt-style
+		ptr->data->qt_style = GF_TRUE;
+		ISOM_DECREASE_SIZE(ptr, 2);
 		ptr->data->dataSize = gf_bs_read_u16(bs);
 		gf_bs_read_u16(bs);
+
 		ptr->data->data = (char *) gf_malloc(sizeof(char)*(ptr->data->dataSize + 1));
+		if (!ptr->data->data) return GF_OUT_OF_MEM;
+
 		gf_bs_read_data(bs, ptr->data->data, ptr->data->dataSize);
 		ptr->data->data[ptr->data->dataSize] = 0;
 		ISOM_DECREASE_SIZE(ptr, ptr->data->dataSize);
@@ -150,23 +168,21 @@
 	return GF_OK;
 }
 
-GF_Box *ilst_item_New()
+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(GF_ISOM_BOX_TYPE_DATA);
-
+	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;
 	}
-
 	return (GF_Box *)tmp;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ilst_item_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ilst_item_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ListItemBox *ptr = (GF_ListItemBox *) s;
@@ -174,27 +190,38 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
-	/*iTune way*/
-	if (ptr->data->type) return gf_isom_box_write((GF_Box* )ptr->data, bs);
-	/*QT way*/
-	gf_bs_write_u16(bs, ptr->data->dataSize);
-	gf_bs_write_u16(bs, 0);
-	gf_bs_write_data(bs, ptr->data->data, ptr->data->dataSize);
+	/*generic box list*/
+	if (ptr->child_boxes && !ptr->data) {
+	}
+	//empty ilst
+	else if (!ptr->data) {
+	}
+	/*iTune way: data-box-encapsulated box list*/
+	else if (!ptr->data->qt_style) {
+	}
+	/*QT way: raw data*/
+	else {
+		gf_bs_write_u16(bs, ptr->data->dataSize);
+		gf_bs_write_u16(bs, 0);
+		gf_bs_write_data(bs, ptr->data->data, ptr->data->dataSize);
+		ptr->size = 0; //abort
+	}
 	return GF_OK;
 }
 
-GF_Err ilst_item_Size(GF_Box *s)
+GF_Err ilst_item_box_size(GF_Box *s)
 {
-	GF_Err e;
 	GF_ListItemBox *ptr = (GF_ListItemBox *)s;
 
-	/*iTune way*/
-	if (ptr->data && ptr->data->type) {
-		e = gf_isom_box_size((GF_Box *)ptr->data);
-		if (e) return e;
-		ptr->size += ptr->data->size;
+	/*generic box list*/
+	if (ptr->child_boxes && !ptr->data) {
 	}
-	/*QT way*/
+	/*iTune way: data-box-encapsulated box list*/
+	else if (ptr->data && !ptr->data->qt_style) {
+		u32 pos=0;
+		gf_isom_check_position(s, (GF_Box* ) ptr->data, &pos);
+	}
+	/*QT way: raw data*/
 	else if (ptr->data) {
 		ptr->size += ptr->data->dataSize + 4;
 	}
@@ -203,7 +230,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void databox_del(GF_Box *s)
+void databox_box_del(GF_Box *s)
 {
 	GF_DataBox *ptr = (GF_DataBox *) s;
 	if (ptr == NULL) return;
@@ -213,17 +240,17 @@
 
 }
 
-GF_Err databox_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err databox_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_DataBox *ptr = (GF_DataBox *)s;
 
-	ptr->reserved = gf_bs_read_int(bs, 32);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->reserved = gf_bs_read_u32(bs);
 
 	if (ptr->size) {
 		ptr->dataSize = (u32) ptr->size;
 		ptr->data = (char*)gf_malloc(ptr->dataSize * sizeof(ptr->data[0]) + 1);
-		if (ptr->data == NULL) return GF_OUT_OF_MEM;
+		if (!ptr->data) return GF_OUT_OF_MEM;
 		ptr->data[ptr->dataSize] = 0;
 		gf_bs_read_data(bs, ptr->data, ptr->dataSize);
 	}
@@ -231,7 +258,7 @@
 	return GF_OK;
 }
 
-GF_Box *databox_New()
+GF_Box *databox_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataBox, GF_ISOM_BOX_TYPE_DATA);
 
@@ -240,7 +267,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err databox_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err databox_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DataBox *ptr = (GF_DataBox *) s;
@@ -254,7 +281,7 @@
 	return GF_OK;
 }
 
-GF_Err databox_Size(GF_Box *s)
+GF_Err databox_box_size(GF_Box *s)
 {
 	GF_DataBox *ptr = (GF_DataBox *)s;
 
@@ -267,20 +294,20 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void alis_del(GF_Box *s)
+void alis_box_del(GF_Box *s)
 {
 	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err alis_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err alis_box_read(GF_Box *s, GF_BitStream *bs)
 {
 //	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
 	return GF_OK;
 }
 
-GF_Box *alis_New()
+GF_Box *alis_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataEntryAliasBox, GF_QT_BOX_TYPE_ALIS);
 	return (GF_Box *)tmp;
@@ -288,7 +315,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err alis_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err alis_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 //	GF_DataEntryAliasBox *ptr = (GF_DataEntryAliasBox *)s;
@@ -298,28 +325,28 @@
 	return GF_OK;
 }
 
-GF_Err alis_Size(GF_Box *s)
+GF_Err alis_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void wide_del(GF_Box *s)
+void wide_box_del(GF_Box *s)
 {
 	if (s == NULL) return;
 	gf_free(s);
 }
 
 
-GF_Err wide_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err wide_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	gf_bs_skip_bytes(bs, s->size);
 	s->size = 0;
 	return GF_OK;
 }
 
-GF_Box *wide_New()
+GF_Box *wide_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_WideBox, GF_QT_BOX_TYPE_WIDE);
 	return (GF_Box *)tmp;
@@ -327,7 +354,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err wide_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err wide_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	e = gf_isom_box_write_header(s, bs);
@@ -335,7 +362,7 @@
 	return GF_OK;
 }
 
-GF_Err wide_Size(GF_Box *s)
+GF_Err wide_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
@@ -345,7 +372,6 @@
 GF_MetaBox *gf_isom_apple_get_meta_extensions(GF_ISOFile *mov)
 {
 	u32 i;
-	GF_MetaBox *meta;
 	GF_UserDataMap *map;
 
 	if (!mov || !mov->moov) return NULL;
@@ -354,8 +380,8 @@
 	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_META, NULL);
 	if (!map) return NULL;
 
-	for(i = 0; i < gf_list_count(map->other_boxes); i++) {
-		meta = (GF_MetaBox*)gf_list_get(map->other_boxes, i);
+	for(i = 0; i < gf_list_count(map->boxes); i++) {
+		GF_MetaBox *meta = (GF_MetaBox*)gf_list_get(map->boxes, i);
 
 		if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return meta;
 	}
@@ -374,31 +400,31 @@
 	if (!mov || !mov->moov) return NULL;
 
 	if (!mov->moov->udta) {
-		e = moov_AddBox((GF_Box*)mov->moov, gf_isom_box_new(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));
 		if (e) return NULL;
 	}
 
 	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_META, NULL);
 	if (map) {
-		for(i = 0; i < gf_list_count(map->other_boxes); i++) {
-			meta = (GF_MetaBox*)gf_list_get(map->other_boxes, i);
+		for(i = 0; i < gf_list_count(map->boxes); i++) {
+			meta = (GF_MetaBox*)gf_list_get(map->boxes, i);
 
 			if(meta != NULL && meta->handler != NULL && meta->handler->handlerType == GF_ISOM_HANDLER_TYPE_MDIR) return 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(GF_ISOM_BOX_TYPE_HDLR);
+		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;
-		if (!meta->other_boxes) meta->other_boxes = gf_list_new();
-		gf_list_add(meta->other_boxes, gf_isom_box_new(GF_ISOM_BOX_TYPE_ILST));
-		udta_AddBox((GF_Box *)mov->moov->udta, (GF_Box *)meta);
+		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;
@@ -407,12 +433,12 @@
 
 
 
-void gmin_del(GF_Box *s)
+void gmin_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err gmin_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gmin_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_GenericMediaHeaderInfoBox *ptr = (GF_GenericMediaHeaderInfoBox *)s;
 	ISOM_DECREASE_SIZE(ptr, 12);
@@ -425,7 +451,7 @@
 	return GF_OK;
 }
 
-GF_Box *gmin_New()
+GF_Box *gmin_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GenericMediaHeaderInfoBox, GF_QT_BOX_TYPE_GMIN);
 	return (GF_Box *)tmp;
@@ -435,7 +461,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gmin_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gmin_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_GenericMediaHeaderInfoBox *ptr = (GF_GenericMediaHeaderInfoBox *)s;
@@ -452,7 +478,7 @@
 	return GF_OK;
 }
 
-GF_Err gmin_Size(GF_Box *s)
+GF_Err gmin_box_size(GF_Box *s)
 {
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
 	ptr->size += 12;
@@ -464,12 +490,12 @@
 
 
 
-void clef_del(GF_Box *s)
+void clef_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err clef_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err clef_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ApertureBox *ptr = (GF_ApertureBox *)s;
 	ISOM_DECREASE_SIZE(ptr, 8);
@@ -478,7 +504,7 @@
 	return GF_OK;
 }
 
-GF_Box *clef_New()
+GF_Box *clef_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ApertureBox, GF_QT_BOX_TYPE_CLEF);
 	return (GF_Box *)tmp;
@@ -487,7 +513,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err clef_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err clef_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ApertureBox *ptr = (GF_ApertureBox *)s;
@@ -499,7 +525,7 @@
 	return GF_OK;
 }
 
-GF_Err clef_Size(GF_Box *s)
+GF_Err clef_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -508,7 +534,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void tmcd_del(GF_Box *s)
+void tmcd_box_del(GF_Box *s)
 {
 	if (s == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
@@ -516,7 +542,7 @@
 }
 
 
-GF_Err tmcd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tmcd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TimeCodeSampleEntryBox *ptr = (GF_TimeCodeSampleEntryBox *)s;
 	GF_Err e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)s, bs);
@@ -527,13 +553,13 @@
 	ptr->flags = gf_bs_read_u32(bs);
 	ptr->timescale = gf_bs_read_u32(bs);
 	ptr->frame_duration = gf_bs_read_u32(bs);
-	ptr->frames_per_sec = gf_bs_read_u8(bs);
+	ptr->frames_per_counter_tick = gf_bs_read_u8(bs);
 	gf_bs_read_u8(bs); //reserved
 
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
-GF_Box *tmcd_New()
+GF_Box *tmcd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TimeCodeSampleEntryBox, GF_QT_BOX_TYPE_TMCD);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
@@ -543,7 +569,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tmcd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tmcd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TimeCodeSampleEntryBox *ptr = (GF_TimeCodeSampleEntryBox *)s;
@@ -557,23 +583,23 @@
 	gf_bs_write_u32(bs, ptr->flags);
 	gf_bs_write_u32(bs, ptr->timescale);
 	gf_bs_write_u32(bs, ptr->frame_duration);
-	gf_bs_write_u8(bs, ptr->frames_per_sec);
+	gf_bs_write_u8(bs, ptr->frames_per_counter_tick);
 	gf_bs_write_u8(bs, 0); //reserved
 
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err tmcd_Size(GF_Box *s)
+GF_Err tmcd_box_size(GF_Box *s)
 {
 	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
 	ptr->size += 8 + 18;
-	return gf_isom_box_array_size(s, ptr->protections);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void tcmi_del(GF_Box *s)
+void tcmi_box_del(GF_Box *s)
 {
 	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
 	if (ptr->font) gf_free(ptr->font);
@@ -581,7 +607,7 @@
 }
 
 
-GF_Err tcmi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tcmi_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 len;
 	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
@@ -603,6 +629,7 @@
 		len = (u32) ptr->size;
 	if (len) {
 		ptr->font = gf_malloc(len+1);
+		if (!ptr->font) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->font, len);
 		ptr->size -= len;
 		ptr->font[len]=0;
@@ -610,9 +637,9 @@
 	return GF_OK;
 }
 
-GF_Box *tcmi_New()
+GF_Box *tcmi_box_new()
 {
-	ISOM_DECL_BOX_ALLOC(GF_TimeCodeMediaInformationBox, GF_QT_BOX_TYPE_TMCD);
+	ISOM_DECL_BOX_ALLOC(GF_TimeCodeMediaInformationBox, GF_QT_BOX_TYPE_TCMI);
 	tmp->text_size = 12;
 	tmp->text_color_red = 0xFFFF;
 	tmp->text_color_green = 0xFFFF;
@@ -623,7 +650,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tcmi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tcmi_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 len;
@@ -649,7 +676,7 @@
 	return GF_OK;
 }
 
-GF_Err tcmi_Size(GF_Box *s)
+GF_Err tcmi_box_size(GF_Box *s)
 {
 	GF_TimeCodeMediaInformationBox *ptr = (GF_TimeCodeMediaInformationBox *)s;
 	ptr->size += 21;
@@ -661,13 +688,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void fiel_del(GF_Box *s)
+void fiel_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 
-GF_Err fiel_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fiel_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_FieldInfoBox *ptr = (GF_FieldInfoBox *)s;
 
@@ -678,7 +705,7 @@
 	return GF_OK;
 }
 
-GF_Box *fiel_New()
+GF_Box *fiel_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_FieldInfoBox, GF_QT_BOX_TYPE_FIEL);
 	return (GF_Box *)tmp;
@@ -687,7 +714,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fiel_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fiel_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_FieldInfoBox *ptr = (GF_FieldInfoBox *)s;
@@ -698,7 +725,7 @@
 	return GF_OK;
 }
 
-GF_Err fiel_Size(GF_Box *s)
+GF_Err fiel_box_size(GF_Box *s)
 {
 	s->size += 2;
 	return GF_OK;
@@ -707,13 +734,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void gama_del(GF_Box *s)
+void gama_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 
-GF_Err gama_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gama_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_GamaInfoBox *ptr = (GF_GamaInfoBox *)s;
 
@@ -723,7 +750,7 @@
 	return GF_OK;
 }
 
-GF_Box *gama_New()
+GF_Box *gama_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GamaInfoBox, GF_QT_BOX_TYPE_GAMA);
 	return (GF_Box *)tmp;
@@ -732,7 +759,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gama_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gama_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_GamaInfoBox *ptr = (GF_GamaInfoBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -741,7 +768,7 @@
 	return GF_OK;
 }
 
-GF_Err gama_Size(GF_Box *s)
+GF_Err gama_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -750,13 +777,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void chrm_del(GF_Box *s)
+void chrm_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 
-GF_Err chrm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err chrm_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ChromaInfoBox *ptr = (GF_ChromaInfoBox *)s;
 
@@ -766,7 +793,7 @@
 	return GF_OK;
 }
 
-GF_Box *chrm_New()
+GF_Box *chrm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ChromaInfoBox, GF_QT_BOX_TYPE_CHRM);
 	return (GF_Box *)tmp;
@@ -775,7 +802,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err chrm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err chrm_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ChromaInfoBox *ptr = (GF_ChromaInfoBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -784,7 +811,7 @@
 	return GF_OK;
 }
 
-GF_Err chrm_Size(GF_Box *s)
+GF_Err chrm_box_size(GF_Box *s)
 {
 	s->size += 2;
 	return GF_OK;
@@ -793,15 +820,16 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void chan_del(GF_Box *s)
+void chan_box_del(GF_Box *s)
 {
 	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
 	if (ptr->audio_descs) gf_free(ptr->audio_descs);
+	if (ptr->ext_data) gf_free(ptr->ext_data);
 	gf_free(s);
 }
 
 
-GF_Err chan_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err chan_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
@@ -811,7 +839,12 @@
 	ptr->bitmap = gf_bs_read_u32(bs);
 	ptr->num_audio_description = gf_bs_read_u32(bs);
 
+	if (ptr->size < ptr->num_audio_description*20)
+		return GF_ISOM_INVALID_FILE;
+
 	ptr->audio_descs = gf_malloc(sizeof(GF_AudioChannelDescription) * ptr->num_audio_description);
+	if (!ptr->audio_descs) return GF_OUT_OF_MEM;
+	
 	for (i=0; i<ptr->num_audio_description; i++) {
 		GF_AudioChannelDescription *adesc = &ptr->audio_descs[i];
 		ISOM_DECREASE_SIZE(s, 20);
@@ -826,10 +859,17 @@
 		ptr->size=0;
 		gf_bs_skip_bytes(bs, 20);
 	}
+	if (ptr->size<10000) {
+		ptr->ext_data_size = (u32) ptr->size;
+		ptr->ext_data = gf_malloc(sizeof(u8) * ptr->ext_data_size);
+		if (!ptr->ext_data) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, (char *)ptr->ext_data, (u32) ptr->size);
+		ptr->size = 0;
+	}
 	return GF_OK;
 }
 
-GF_Box *chan_New()
+GF_Box *chan_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ChannelLayoutInfoBox, GF_QT_BOX_TYPE_CHAN);
 	return (GF_Box *)tmp;
@@ -838,7 +878,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err chan_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err chan_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -859,14 +899,19 @@
 		gf_bs_write_float(bs, adesc->coordinates[1]);
 		gf_bs_write_float(bs, adesc->coordinates[2]);
 	}
-
+	if (ptr->ext_data) {
+		gf_bs_write_data(bs, ptr->ext_data, ptr->ext_data_size);
+	}
 	return GF_OK;
 }
 
-GF_Err chan_Size(GF_Box *s)
+GF_Err chan_box_size(GF_Box *s)
 {
 	GF_ChannelLayoutInfoBox *ptr = (GF_ChannelLayoutInfoBox *)s;
 	s->size += 12 + 20 * ptr->num_audio_description;
+	if (ptr->ext_data) {
+		s->size += ptr->ext_data_size;
+	}
 	return GF_OK;
 }
 
@@ -874,4 +919,53 @@
 
 
 
+void load_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+
+GF_Err load_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_TrackLoadBox *ptr = (GF_TrackLoadBox *)s;
+	ISOM_DECREASE_SIZE(s, 16);
+	ptr->preload_start_time = gf_bs_read_u32(bs);
+	ptr->preload_duration = gf_bs_read_u32(bs);
+	ptr->preload_flags = gf_bs_read_u32(bs);
+	ptr->default_hints = gf_bs_read_u32(bs);
+	return GF_OK;
+}
+
+GF_Box *load_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_TrackLoadBox, GF_QT_BOX_TYPE_LOAD);
+	return (GF_Box *)tmp;
+}
+
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err load_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_TrackLoadBox *ptr = (GF_TrackLoadBox *)s;
+
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->preload_start_time);
+	gf_bs_write_u32(bs, ptr->preload_duration);
+	gf_bs_write_u32(bs, ptr->preload_flags);
+	gf_bs_write_u32(bs, ptr->default_hints);
+	return GF_OK;
+}
+
+GF_Err load_box_size(GF_Box *s)
+{
+	s->size += 16;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/isomedia/box_code_base.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,7 +29,7 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-void co64_del(GF_Box *s)
+void co64_box_del(GF_Box *s)
 {
 	GF_ChunkLargeOffsetBox *ptr;
 	ptr = (GF_ChunkLargeOffsetBox *) s;
@@ -38,7 +38,7 @@
 	gf_free(ptr);
 }
 
-GF_Err co64_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err co64_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 entries;
 	GF_ChunkLargeOffsetBox *ptr = (GF_ChunkLargeOffsetBox *) s;
@@ -60,7 +60,7 @@
 	return GF_OK;
 }
 
-GF_Box *co64_New()
+GF_Box *co64_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ChunkLargeOffsetBox, GF_ISOM_BOX_TYPE_CO64);
 	return (GF_Box *)tmp;
@@ -69,7 +69,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err co64_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err co64_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -84,7 +84,7 @@
 	return GF_OK;
 }
 
-GF_Err co64_Size(GF_Box *s)
+GF_Err co64_box_size(GF_Box *s)
 {
 	GF_ChunkLargeOffsetBox *ptr = (GF_ChunkLargeOffsetBox *) s;
 
@@ -94,7 +94,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void cprt_del(GF_Box *s)
+void cprt_box_del(GF_Box *s)
 {
 	GF_CopyrightBox *ptr = (GF_CopyrightBox *) s;
 	if (ptr == NULL) return;
@@ -104,7 +104,7 @@
 }
 
 
-GF_Box *chpl_New()
+GF_Box *chpl_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ChapterListBox, GF_ISOM_BOX_TYPE_CHPL);
 	tmp->list = gf_list_new();
@@ -112,7 +112,7 @@
 	return (GF_Box *)tmp;
 }
 
-void chpl_del(GF_Box *s)
+void chpl_box_del(GF_Box *s)
 {
 	GF_ChapterListBox *ptr = (GF_ChapterListBox *) s;
 	if (ptr == NULL) return;
@@ -127,12 +127,13 @@
 }
 
 /*this is using chpl format according to some NeroRecode samples*/
-GF_Err chpl_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err chpl_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_ChapterEntry *ce;
 	u32 nb_chaps, len, i, count;
 	GF_ChapterListBox *ptr = (GF_ChapterListBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 5)
 	/*reserved or ???*/
 	gf_bs_read_u32(bs);
 	nb_chaps = gf_bs_read_u8(bs);
@@ -141,10 +142,14 @@
 	while (nb_chaps) {
 		GF_SAFEALLOC(ce, GF_ChapterEntry);
 		if (!ce) return GF_OUT_OF_MEM;
+		ISOM_DECREASE_SIZE(ptr, 9)
 		ce->start_time = gf_bs_read_u64(bs);
 		len = gf_bs_read_u8(bs);
+		if (ptr->size<len) return GF_ISOM_INVALID_FILE;
 		if (len) {
 			ce->name = (char *)gf_malloc(sizeof(char)*(len+1));
+			if (!ce->name) return GF_OUT_OF_MEM;
+			ISOM_DECREASE_SIZE(ptr, len)
 			gf_bs_read_data(bs, ce->name, len);
 			ce->name[len] = 0;
 		} else {
@@ -168,7 +173,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err chpl_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err chpl_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 count, i;
@@ -195,7 +200,7 @@
 	return GF_OK;
 }
 
-GF_Err chpl_Size(GF_Box *s)
+GF_Err chpl_box_size(GF_Box *s)
 {
 	u32 count, i;
 	GF_ChapterListBox *ptr = (GF_ChapterListBox *)s;
@@ -214,16 +219,16 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Err cprt_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err cprt_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_CopyrightBox *ptr = (GF_CopyrightBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 2);
 	gf_bs_read_int(bs, 1);
 	//the spec is unclear here, just says "the value 0 is interpreted as undetermined"
 	ptr->packedLanguageCode[0] = gf_bs_read_int(bs, 5);
 	ptr->packedLanguageCode[1] = gf_bs_read_int(bs, 5);
 	ptr->packedLanguageCode[2] = gf_bs_read_int(bs, 5);
-	ISOM_DECREASE_SIZE(ptr, 2);
 
 	//but before or after compaction ?? We assume before
 	if (ptr->packedLanguageCode[0] || ptr->packedLanguageCode[1] || ptr->packedLanguageCode[2]) {
@@ -244,7 +249,7 @@
 	return GF_OK;
 }
 
-GF_Box *cprt_New()
+GF_Box *cprt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_CopyrightBox, GF_ISOM_BOX_TYPE_CPRT);
 	tmp->packedLanguageCode[0] = 'u';
@@ -256,7 +261,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err cprt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err cprt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_CopyrightBox *ptr = (GF_CopyrightBox *) s;
@@ -277,7 +282,7 @@
 	return GF_OK;
 }
 
-GF_Err cprt_Size(GF_Box *s)
+GF_Err cprt_box_size(GF_Box *s)
 {
 	GF_CopyrightBox *ptr = (GF_CopyrightBox *)s;
 
@@ -289,7 +294,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void kind_del(GF_Box *s)
+void kind_box_del(GF_Box *s)
 {
 	GF_KindBox *ptr = (GF_KindBox *) s;
 	if (ptr == NULL) return;
@@ -298,7 +303,7 @@
 	gf_free(ptr);
 }
 
-GF_Err kind_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err kind_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_KindBox *ptr = (GF_KindBox *)s;
 
@@ -307,30 +312,30 @@
 		char *data;
 		u32 schemeURIlen;
 		data = (char*)gf_malloc(bytesToRead * sizeof(char));
-		if (data == NULL) return GF_OUT_OF_MEM;
+		if (!data) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, data, bytesToRead);
 		/*safety check in case the string is not null-terminated*/
 		if (data[bytesToRead-1]) {
-			char *str = (char*)gf_malloc((u32) bytesToRead + 1);
-			memcpy(str, data, (u32) bytesToRead);
-			str[ptr->size] = 0;
-			gf_free(data);
-			data = str;
+			data = (char*)gf_realloc(data, sizeof(char)*(bytesToRead + 1));
+			if (!data) return GF_OUT_OF_MEM;
+			data[bytesToRead] = 0;
 			bytesToRead++;
 		}
 		ptr->schemeURI = gf_strdup(data);
+		if (!ptr->schemeURI) return GF_OUT_OF_MEM;
 		schemeURIlen = (u32) strlen(data);
 		if (bytesToRead > schemeURIlen+1) {
 			/* read the value */
 			char *data_value = data + schemeURIlen +1;
 			ptr->value = gf_strdup(data_value);
+			if (!ptr->value) return GF_OUT_OF_MEM;
 		}
 		gf_free(data);
 	}
 	return GF_OK;
 }
 
-GF_Box *kind_New()
+GF_Box *kind_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_KindBox, GF_ISOM_BOX_TYPE_KIND);
 	return (GF_Box *)tmp;
@@ -338,25 +343,29 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err kind_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err kind_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_KindBox *ptr = (GF_KindBox *) s;
 
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_data(bs, ptr->schemeURI, (u32) (strlen(ptr->schemeURI) + 1 ));
-	if (ptr->value) {
+    if (ptr->schemeURI)
+        gf_bs_write_data(bs, ptr->schemeURI, (u32) (strlen(ptr->schemeURI) + 1 ));
+    else
+        gf_bs_write_u8(bs, 0);
+
+    if (ptr->value) {
 		gf_bs_write_data(bs, ptr->value, (u32) (strlen(ptr->value) + 1) );
 	}
 	return GF_OK;
 }
 
-GF_Err kind_Size(GF_Box *s)
+GF_Err kind_box_size(GF_Box *s)
 {
 	GF_KindBox *ptr = (GF_KindBox *)s;
 
-	ptr->size += strlen(ptr->schemeURI) + 1;
+    ptr->size += (ptr->schemeURI ? strlen(ptr->schemeURI) : 0) + 1;
 	if (ptr->value) {
 		ptr->size += strlen(ptr->value) + 1;
 	}
@@ -365,7 +374,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ctts_del(GF_Box *s)
+void ctts_box_del(GF_Box *s)
 {
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *)s;
 	if (ptr->entries) gf_free(ptr->entries);
@@ -374,14 +383,14 @@
 
 
 
-GF_Err ctts_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ctts_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	u32 sampleCount;
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *)s;
 
-	ptr->nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->nb_entries = gf_bs_read_u32(bs);
 
 	if (ptr->nb_entries > ptr->size / 8) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in ctts\n", ptr->nb_entries));
@@ -393,12 +402,16 @@
 	if (!ptr->entries) return GF_OUT_OF_MEM;
 	sampleCount = 0;
 	for (i=0; i<ptr->nb_entries; i++) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->entries[i].sampleCount = gf_bs_read_u32(bs);
 		if (ptr->version)
 			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);
 	}
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	ptr->w_LastSampleNumber = sampleCount;
@@ -406,7 +419,7 @@
 	return GF_OK;
 }
 
-GF_Box *ctts_New()
+GF_Box *ctts_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_CompositionOffsetBox, GF_ISOM_BOX_TYPE_CTTS);
 	return (GF_Box *) tmp;
@@ -416,7 +429,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ctts_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ctts_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -436,7 +449,7 @@
 	return GF_OK;
 }
 
-GF_Err ctts_Size(GF_Box *s)
+GF_Err ctts_box_size(GF_Box *s)
 {
 	GF_CompositionOffsetBox *ptr = (GF_CompositionOffsetBox *) s;
 
@@ -446,7 +459,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void cslg_del(GF_Box *s)
+void cslg_box_del(GF_Box *s)
 {
 	GF_CompositionToDecodeBox *ptr = (GF_CompositionToDecodeBox *)s;
 	if (ptr == NULL) return;
@@ -454,10 +467,11 @@
 	return;
 }
 
-GF_Err cslg_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err cslg_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_CompositionToDecodeBox *ptr = (GF_CompositionToDecodeBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 20);
 	ptr->compositionToDTSShift = gf_bs_read_int(bs, 32);
 	ptr->leastDecodeToDisplayDelta = gf_bs_read_int(bs, 32);
 	ptr->greatestDecodeToDisplayDelta = gf_bs_read_int(bs, 32);
@@ -466,7 +480,7 @@
 	return GF_OK;
 }
 
-GF_Box *cslg_New()
+GF_Box *cslg_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_CompositionToDecodeBox, GF_ISOM_BOX_TYPE_CSLG);
 	return (GF_Box *) tmp;
@@ -474,7 +488,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err cslg_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err cslg_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_CompositionToDecodeBox *ptr = (GF_CompositionToDecodeBox *)s;
@@ -489,7 +503,7 @@
 	return GF_OK;
 }
 
-GF_Err cslg_Size(GF_Box *s)
+GF_Err cslg_box_size(GF_Box *s)
 {
 	GF_CompositionToDecodeBox *ptr = (GF_CompositionToDecodeBox *)s;
 
@@ -498,14 +512,14 @@
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ccst_del(GF_Box *s)
+void ccst_box_del(GF_Box *s)
 {
 	GF_CodingConstraintsBox *ptr = (GF_CodingConstraintsBox *)s;
 	if (ptr) gf_free(ptr);
 	return;
 }
 
-GF_Err ccst_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ccst_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_CodingConstraintsBox *ptr = (GF_CodingConstraintsBox *)s;
 
@@ -517,7 +531,7 @@
 	return GF_OK;
 }
 
-GF_Box *ccst_New()
+GF_Box *ccst_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_CodingConstraintsBox, GF_ISOM_BOX_TYPE_CCST);
 	return (GF_Box *) tmp;
@@ -525,7 +539,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ccst_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ccst_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_CodingConstraintsBox *ptr = (GF_CodingConstraintsBox *)s;
@@ -539,7 +553,7 @@
 	return GF_OK;
 }
 
-GF_Err ccst_Size(GF_Box *s)
+GF_Err ccst_box_size(GF_Box *s)
 {
 	GF_CodingConstraintsBox *ptr = (GF_CodingConstraintsBox *)s;
 	ptr->size += 4;
@@ -548,7 +562,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void url_del(GF_Box *s)
+void url_box_del(GF_Box *s)
 {
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 	if (ptr == NULL) return;
@@ -558,7 +572,7 @@
 }
 
 
-GF_Err url_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err url_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 
@@ -570,7 +584,7 @@
 	return GF_OK;
 }
 
-GF_Box *url_New()
+GF_Box *url_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataEntryURLBox, GF_ISOM_BOX_TYPE_URL);
 	return (GF_Box *)tmp;
@@ -578,7 +592,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err url_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err url_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
@@ -594,7 +608,7 @@
 	return GF_OK;
 }
 
-GF_Err url_Size(GF_Box *s)
+GF_Err url_box_size(GF_Box *s)
 {
 	GF_DataEntryURLBox *ptr = (GF_DataEntryURLBox *)s;
 
@@ -606,7 +620,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void urn_del(GF_Box *s)
+void urn_box_del(GF_Box *s)
 {
 	GF_DataEntryURNBox *ptr = (GF_DataEntryURNBox *)s;
 	if (ptr == NULL) return;
@@ -616,7 +630,7 @@
 }
 
 
-GF_Err urn_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err urn_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, to_read;
 	char *tmpName;
@@ -655,7 +669,7 @@
 	memcpy(ptr->nameURN, tmpName, i + 1);
 
 	if (tmpName[to_read - 1] != 0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] urn box cointains invalid location field\n" ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] urn box contains invalid location field\n" ));
 	}
 	else {
 		ptr->location = (char*)gf_malloc(sizeof(char) * (to_read - i - 1));
@@ -672,7 +686,7 @@
 	return GF_OK;
 }
 
-GF_Box *urn_New()
+GF_Box *urn_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataEntryURNBox, GF_ISOM_BOX_TYPE_URN);
 	return (GF_Box *)tmp;
@@ -681,7 +695,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err urn_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err urn_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DataEntryURNBox *ptr = (GF_DataEntryURNBox *)s;
@@ -701,7 +715,7 @@
 	return GF_OK;
 }
 
-GF_Err urn_Size(GF_Box *s)
+GF_Err urn_box_size(GF_Box *s)
 {
 	GF_DataEntryURNBox *ptr = (GF_DataEntryURNBox *)s;
 
@@ -714,7 +728,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void unkn_del(GF_Box *s)
+void unkn_box_del(GF_Box *s)
 {
 	GF_UnknownBox *ptr = (GF_UnknownBox *) s;
 	if (!s) return;
@@ -723,7 +737,7 @@
 }
 
 
-GF_Err unkn_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err unkn_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 bytesToRead, sub_size, sub_a;
@@ -759,22 +773,22 @@
 
 	if (e == GF_OK) {
 		gf_bs_seek(sub_bs, 0);
-		e = gf_isom_box_array_read(s, sub_bs, gf_isom_box_add_default);
+		e = gf_isom_box_array_read(s, sub_bs, NULL);
 	}
 	gf_bs_del(sub_bs);
 	if (e==GF_OK) {
 		gf_free(ptr->data);
 		ptr->data = NULL;
 		ptr->dataSize = 0;
-	} else if (s->other_boxes) {
-		gf_isom_box_array_del(s->other_boxes);
-		s->other_boxes=NULL;
+	} else if (s->child_boxes) {
+		gf_isom_box_array_del(s->child_boxes);
+		s->child_boxes=NULL;
 	}
 
 	return GF_OK;
 }
 
-GF_Box *unkn_New()
+GF_Box *unkn_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_UnknownBox, GF_ISOM_BOX_TYPE_UNKNOWN);
 	return (GF_Box *) tmp;
@@ -782,12 +796,13 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err unkn_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err unkn_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	u32 type = s->type;
+	u32 type;
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
 	if (!s) return GF_BAD_PARAM;
+	type = s->type;
 	ptr->type = ptr->original_4cc;
 	e = gf_isom_box_write_header(s, bs);
 	ptr->type = type;
@@ -799,7 +814,7 @@
 	return GF_OK;
 }
 
-GF_Err unkn_Size(GF_Box *s)
+GF_Err unkn_box_size(GF_Box *s)
 {
 	GF_UnknownBox *ptr = (GF_UnknownBox *)s;
 
@@ -812,18 +827,18 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void def_cont_box_del(GF_Box *s)
+void def_parent_box_del(GF_Box *s)
 {
 	if (s) gf_free(s);
 }
 
 
-GF_Err def_cont_box_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err def_parent_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
-GF_Box *def_cont_box_New()
+GF_Box *def_parent_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_Box, 0);
 	return (GF_Box *) tmp;
@@ -831,19 +846,51 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITEHintSa
 
-GF_Err def_cont_box_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err def_parent_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err def_cont_box_Size(GF_Box *s)
+GF_Err def_parent_box_size(GF_Box *s)
+{
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void def_parent_full_box_del(GF_Box *s)
+{
+	if (s) gf_free(s);
+}
+
+
+GF_Err def_parent_full_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_box_array_read(s, bs, NULL);
+}
+
+GF_Box *def_parent_full_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_Box, 0);
+	return (GF_Box *) tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITEHintSa
+
+GF_Err def_parent_full_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_full_box_write(s, bs);
+}
+
+GF_Err def_parent_full_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void uuid_del(GF_Box *s)
+void uuid_box_del(GF_Box *s)
 {
 	GF_UnknownUUIDBox *ptr = (GF_UnknownUUIDBox *) s;
 	if (!s) return;
@@ -852,7 +899,7 @@
 }
 
 
-GF_Err uuid_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err uuid_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 bytesToRead;
 	GF_UnknownUUIDBox *ptr = (GF_UnknownUUIDBox *)s;
@@ -868,7 +915,7 @@
 	return GF_OK;
 }
 
-GF_Box *uuid_New()
+GF_Box *uuid_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_UnknownUUIDBox, GF_ISOM_BOX_TYPE_UUID);
 	return (GF_Box *) tmp;
@@ -876,7 +923,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err uuid_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err uuid_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_UnknownUUIDBox *ptr = (GF_UnknownUUIDBox*)s;
@@ -890,7 +937,7 @@
 	return GF_OK;
 }
 
-GF_Err uuid_Size(GF_Box *s)
+GF_Err uuid_box_size(GF_Box *s)
 {
 	GF_UnknownUUIDBox*ptr = (GF_UnknownUUIDBox*)s;
 	ptr->size += ptr->dataSize;
@@ -900,47 +947,42 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void dinf_del(GF_Box *s)
+void dinf_box_del(GF_Box *s)
 {
-	GF_DataInformationBox *ptr = (GF_DataInformationBox *)s;
-	if (ptr == NULL) return;
-	gf_isom_box_del((GF_Box *)ptr->dref);
-	gf_free(ptr);
+	gf_free(s);
 }
 
 
-GF_Err dinf_AddBox(GF_Box *s, GF_Box *a)
+GF_Err dinf_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->dref = (GF_DataReferenceBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err dinf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_box_array_read(s, bs, dinf_AddBox);
+	GF_DataInformationBox *dinf;
+	GF_Err e = gf_isom_box_array_read(s, bs, dinf_on_child_box);
 	if (e) {
 		return e;
 	}
-	if (!((GF_DataInformationBox *)s)->dref) {
-		GF_Box* dref;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing dref box in dinf\n"));
-		dref = gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
-		((GF_DataInformationBox *)s)->dref = (GF_DataReferenceBox *)dref;
-		gf_isom_box_add_for_dump_mode(s, dref);
+	dinf = (GF_DataInformationBox *)s;
+	if (!dinf->dref) {
+		if (! (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_NO_LOGS) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing dref box in dinf\n"));
+		}
+		dinf->dref = (GF_DataReferenceBox *) gf_isom_box_new_parent(&dinf->child_boxes, GF_ISOM_BOX_TYPE_DREF);
 	}
 	return GF_OK;
 }
 
-GF_Box *dinf_New()
+GF_Box *dinf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataInformationBox, GF_ISOM_BOX_TYPE_DINF);
 	return (GF_Box *)tmp;
@@ -948,35 +990,19 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err dinf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dinf_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_DataInformationBox *ptr = (GF_DataInformationBox *)s;
-
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	if (ptr->dref) {
-		e = gf_isom_box_write((GF_Box *)ptr->dref, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err dinf_Size(GF_Box *s)
+GF_Err dinf_box_size(GF_Box *s)
 {
-	GF_Err e;
-	GF_DataInformationBox *ptr = (GF_DataInformationBox *)s;
-	if (ptr->dref) {
-		e = gf_isom_box_size((GF_Box *) ptr->dref);
-		if (e) return e;
-		ptr->size += ptr->dref->size;
-	}
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void dref_del(GF_Box *s)
+void dref_box_del(GF_Box *s)
 {
 	GF_DataReferenceBox *ptr = (GF_DataReferenceBox *) s;
 	if (ptr == NULL) return;
@@ -984,23 +1010,15 @@
 }
 
 
-GF_Err dref_AddDataEntry(GF_Box *ptr, GF_Box *entry)
-{
-	return gf_isom_box_add_default(ptr, entry);
-}
-
-GF_Err dref_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dref_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DataReferenceBox *ptr = (GF_DataReferenceBox *)s;
-
-	if (ptr == NULL) return GF_BAD_PARAM;
-	gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
-
-	return gf_isom_box_array_read(s, bs, dref_AddDataEntry);
+	gf_bs_read_u32(bs);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
-GF_Box *dref_New()
+GF_Box *dref_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DataReferenceBox, GF_ISOM_BOX_TYPE_DREF);
 	return (GF_Box *)tmp;
@@ -1009,7 +1027,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err dref_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dref_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 count;
@@ -1018,12 +1036,12 @@
 
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	count = ptr->other_boxes ? gf_list_count(ptr->other_boxes) : 0;
+	count = ptr->child_boxes ? gf_list_count(ptr->child_boxes) : 0;
 	gf_bs_write_u32(bs, count);
 	return GF_OK;
 }
 
-GF_Err dref_Size(GF_Box *s)
+GF_Err dref_box_size(GF_Box *s)
 {
 	GF_DataReferenceBox *ptr = (GF_DataReferenceBox *)s;
 	if (!s) return GF_BAD_PARAM;
@@ -1034,34 +1052,32 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void edts_del(GF_Box *s)
+void edts_box_del(GF_Box *s)
 {
-	GF_EditBox *ptr = (GF_EditBox *) s;
-	gf_isom_box_del((GF_Box *)ptr->editList);
-	gf_free(ptr);
+	gf_free(s);
 }
 
 
-GF_Err edts_AddBox(GF_Box *s, GF_Box *a)
+GF_Err edts_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_EditBox *ptr = (GF_EditBox *)s;
 	if (a->type == GF_ISOM_BOX_TYPE_ELST) {
-		if (ptr->editList) return GF_BAD_PARAM;
+		if (ptr->editList) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->editList = (GF_EditListBox *)a;
 		return GF_OK;
 	} else {
-		return gf_isom_box_add_default(s, a);
+		return GF_OK;
 	}
 	return GF_OK;
 }
 
 
-GF_Err edts_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err edts_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, edts_AddBox);
+	return gf_isom_box_array_read(s, bs, edts_on_child_box);
 }
 
-GF_Box *edts_New()
+GF_Box *edts_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_EditBox, GF_ISOM_BOX_TYPE_EDTS);
 	return (GF_Box *) tmp;
@@ -1069,43 +1085,35 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err edts_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err edts_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
 	GF_EditBox *ptr = (GF_EditBox *)s;
 
 	//here we have a trick: if editList is empty, skip the box
 	if (ptr->editList && gf_list_count(ptr->editList->entryList)) {
-		e = gf_isom_box_write_header(s, bs);
-		if (e) return e;
-		e = gf_isom_box_write((GF_Box *) ptr->editList, bs);
-		if (e) return e;
+		return gf_isom_box_write_header(s, bs);
+	} else {
+		s->size = 0;
 	}
 	return GF_OK;
 }
 
-GF_Err edts_Size(GF_Box *s)
+GF_Err edts_box_size(GF_Box *s)
 {
-	GF_Err e;
 	GF_EditBox *ptr = (GF_EditBox *)s;
 
 	//here we have a trick: if editList is empty, skip the box
 	if (!ptr->editList || ! gf_list_count(ptr->editList->entryList)) {
 		ptr->size = 0;
-	} else {
-		e = gf_isom_box_size((GF_Box *)ptr->editList);
-		if (e) return e;
-		ptr->size += ptr->editList->size;
 	}
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void elst_del(GF_Box *s)
+void elst_box_del(GF_Box *s)
 {
 	GF_EditListBox *ptr;
-	GF_EdtsEntry *p;
 	u32 nb_entries;
 	u32 i;
 
@@ -1113,23 +1121,22 @@
 	if (ptr == NULL) return;
 	nb_entries = gf_list_count(ptr->entryList);
 	for (i = 0; i < nb_entries; i++) {
-		p = (GF_EdtsEntry*)gf_list_get(ptr->entryList, i);
+		GF_EdtsEntry *p = (GF_EdtsEntry*)gf_list_get(ptr->entryList, i);
 		if (p) gf_free(p);
 	}
 	gf_list_del(ptr->entryList);
 	gf_free(ptr);
 }
 
-GF_Err elst_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err elst_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 entries;
 	s32 tr;
 	u32 nb_entries;
-	GF_EdtsEntry *p;
 	GF_EditListBox *ptr = (GF_EditListBox *)s;
 
-	nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	nb_entries = gf_bs_read_u32(bs);
 
 	if (ptr->version == 1) {
 		if (nb_entries > ptr->size / 20) {
@@ -1145,16 +1152,19 @@
 
 
 	for (entries = 0; entries < nb_entries; entries++) {
-		p = (GF_EdtsEntry *) gf_malloc(sizeof(GF_EdtsEntry));
+		GF_EdtsEntry *p = (GF_EdtsEntry *) gf_malloc(sizeof(GF_EdtsEntry));
 		if (!p) return GF_OUT_OF_MEM;
 		if (ptr->version == 1) {
+			ISOM_DECREASE_SIZE(ptr, 16);
 			p->segmentDuration = gf_bs_read_u64(bs);
 			p->mediaTime = (s64) gf_bs_read_u64(bs);
 		} else {
+			ISOM_DECREASE_SIZE(ptr, 8);
 			p->segmentDuration = gf_bs_read_u32(bs);
 			tr = gf_bs_read_u32(bs);
 			p->mediaTime = (s64) tr;
 		}
+		ISOM_DECREASE_SIZE(ptr, 4);
 		p->mediaRate = gf_bs_read_u16(bs);
 		gf_bs_read_u16(bs);
 		gf_list_add(ptr->entryList, p);
@@ -1162,7 +1172,7 @@
 	return GF_OK;
 }
 
-GF_Box *elst_New()
+GF_Box *elst_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_EditListBox, GF_ISOM_BOX_TYPE_ELST);
 	tmp->entryList = gf_list_new();
@@ -1175,12 +1185,11 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err elst_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err elst_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
 	u32 nb_entries;
-	GF_EdtsEntry *p;
 	GF_EditListBox *ptr = (GF_EditListBox *)s;
 	if (!ptr) return GF_BAD_PARAM;
 
@@ -1189,7 +1198,7 @@
 	if (e) return e;
 	gf_bs_write_u32(bs, nb_entries);
 	for (i = 0; i < nb_entries; i++ ) {
-		p = (GF_EdtsEntry*)gf_list_get(ptr->entryList, i);
+		GF_EdtsEntry *p = (GF_EdtsEntry*)gf_list_get(ptr->entryList, i);
 		if (ptr->version == 1) {
 			gf_bs_write_u64(bs, p->segmentDuration);
 			gf_bs_write_u64(bs, p->mediaTime);
@@ -1203,7 +1212,7 @@
 	return GF_OK;
 }
 
-GF_Err elst_Size(GF_Box *s)
+GF_Err elst_box_size(GF_Box *s)
 {
 	u32 durtimebytes;
 	u32 i, nb_entries;
@@ -1228,7 +1237,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void esds_del(GF_Box *s)
+void esds_box_del(GF_Box *s)
 {
 	GF_ESDBox *ptr = (GF_ESDBox *)s;
 	if (ptr == NULL)	return;
@@ -1237,18 +1246,16 @@
 }
 
 
-GF_Err esds_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err esds_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e=GF_OK;
 	u32 descSize;
-	char *enc_desc;
-	u32 SLIsPredefined(GF_SLConfig *sl);
 	GF_ESDBox *ptr = (GF_ESDBox *)s;
 
 	descSize = (u32) (ptr->size);
 
 	if (descSize) {
-		enc_desc = (char*)gf_malloc(sizeof(char) * descSize);
+		char *enc_desc = (char*)gf_malloc(sizeof(char) * descSize);
 		if (!enc_desc) return GF_OUT_OF_MEM;
 		//get the payload
 		gf_bs_read_data(bs, enc_desc, descSize);
@@ -1268,7 +1275,7 @@
 			ptr->desc = NULL;
 		} else {
 			/*fix broken files*/
-			if (!ptr->desc->URLString) {
+			if (ptr->desc && !ptr->desc->URLString) {
 				if (!ptr->desc->slConfig) {
 					ptr->desc->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 					ptr->desc->slConfig->predefined = SLPredef_MP4;
@@ -1282,7 +1289,7 @@
 	return e;
 }
 
-GF_Box *esds_New()
+GF_Box *esds_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ESDBox, GF_ISOM_BOX_TYPE_ESDS);
 	return (GF_Box *)tmp;
@@ -1291,13 +1298,17 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err esds_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err esds_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	char *enc_desc;
+	u8 *enc_desc;
 	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;
+    }
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	e = gf_odf_desc_write((GF_Descriptor *)ptr->desc, &enc_desc, &descSize);
@@ -1308,7 +1319,7 @@
 	return GF_OK;
 }
 
-GF_Err esds_Size(GF_Box *s)
+GF_Err esds_box_size(GF_Box *s)
 {
 	u32 descSize = 0;
 	GF_ESDBox *ptr = (GF_ESDBox *)s;
@@ -1319,7 +1330,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void free_del(GF_Box *s)
+void free_box_del(GF_Box *s)
 {
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
 	if (ptr->data) gf_free(ptr->data);
@@ -1327,7 +1338,7 @@
 }
 
 
-GF_Err free_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err free_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 bytesToRead;
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
@@ -1338,13 +1349,14 @@
 
 	if (bytesToRead) {
 		ptr->data = (char*)gf_malloc(bytesToRead * sizeof(char));
+		if (!ptr->data) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->data, bytesToRead);
 		ptr->dataSize = bytesToRead;
 	}
 	return GF_OK;
 }
 
-GF_Box *free_New()
+GF_Box *free_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_FreeSpaceBox, GF_ISOM_BOX_TYPE_FREE);
 	return (GF_Box *)tmp;
@@ -1352,7 +1364,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err free_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err free_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
@@ -1379,7 +1391,7 @@
 	return GF_OK;
 }
 
-GF_Err free_Size(GF_Box *s)
+GF_Err free_box_size(GF_Box *s)
 {
 	GF_FreeSpaceBox *ptr = (GF_FreeSpaceBox *)s;
 	ptr->size += ptr->dataSize;
@@ -1388,37 +1400,35 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ftyp_del(GF_Box *s)
+void ftyp_box_del(GF_Box *s)
 {
 	GF_FileTypeBox *ptr = (GF_FileTypeBox *) s;
 	if (ptr->altBrand) gf_free(ptr->altBrand);
 	gf_free(ptr);
 }
 
-GF_Box *ftyp_New()
+GF_Box *ftyp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_FileTypeBox, GF_ISOM_BOX_TYPE_FTYP);
 	return (GF_Box *)tmp;
 }
 
-GF_Err ftyp_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err ftyp_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 i;
 	GF_FileTypeBox *ptr = (GF_FileTypeBox *)s;
 
-	if (ptr->size < 8) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Found ftyp with size < 8, likely broken!\n"));
-		return GF_BAD_PARAM;
-	}
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->majorBrand = gf_bs_read_u32(bs);
 	ptr->minorVersion = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 8);
 
+	if (ptr->size % 4) return GF_ISOM_INVALID_FILE;
 	ptr->altCount = ( (u32) (ptr->size)) / 4;
 	if (!ptr->altCount) return GF_OK;
-	if (ptr->altCount * 4 != (u32) (ptr->size)) return GF_ISOM_INVALID_FILE;
 
 	ptr->altBrand = (u32*)gf_malloc(sizeof(u32)*ptr->altCount);
+	if (!ptr->altBrand) return GF_OUT_OF_MEM;
+
 	for (i = 0; i<ptr->altCount; i++) {
 		ptr->altBrand[i] = gf_bs_read_u32(bs);
 	}
@@ -1429,7 +1439,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ftyp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ftyp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -1445,7 +1455,7 @@
 	return GF_OK;
 }
 
-GF_Err ftyp_Size(GF_Box *s)
+GF_Err ftyp_box_size(GF_Box *s)
 {
 	GF_FileTypeBox *ptr = (GF_FileTypeBox *)s;
 
@@ -1457,7 +1467,7 @@
 
 
 
-void gnrm_del(GF_Box *s)
+void gnrm_box_del(GF_Box *s)
 {
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)ptr);
@@ -1465,7 +1475,7 @@
 	gf_free(ptr);
 }
 
-GF_Box *gnrm_New()
+GF_Box *gnrm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GenericSampleEntryBox, GF_ISOM_BOX_TYPE_GNRM);
 
@@ -1474,14 +1484,14 @@
 }
 
 //dummy
-GF_Err gnrm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gnrm_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gnrm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gnrm_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
@@ -1497,7 +1507,7 @@
 	return GF_OK;
 }
 
-GF_Err gnrm_Size(GF_Box *s)
+GF_Err gnrm_box_size(GF_Box *s)
 {
 	GF_GenericSampleEntryBox *ptr = (GF_GenericSampleEntryBox *)s;
 	s->type = GF_ISOM_BOX_TYPE_GNRM;
@@ -1508,7 +1518,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void gnrv_del(GF_Box *s)
+void gnrv_box_del(GF_Box *s)
 {
 	GF_GenericVisualSampleEntryBox *ptr = (GF_GenericVisualSampleEntryBox *)s;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)ptr);
@@ -1516,14 +1526,14 @@
 	gf_free(ptr);
 }
 
-GF_Box *gnrv_New()
+GF_Box *gnrv_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GenericVisualSampleEntryBox, GF_ISOM_BOX_TYPE_GNRV);
 	gf_isom_video_sample_entry_init((GF_VisualSampleEntryBox*) tmp);
 	return (GF_Box *)tmp;
 }
 //dummy
-GF_Err gnrv_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gnrv_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return GF_OK;
 }
@@ -1531,7 +1541,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gnrv_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gnrv_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_GenericVisualSampleEntryBox *ptr = (GF_GenericVisualSampleEntryBox *)s;
@@ -1547,7 +1557,7 @@
 	return GF_OK;
 }
 
-GF_Err gnrv_Size(GF_Box *s)
+GF_Err gnrv_box_size(GF_Box *s)
 {
 	GF_GenericVisualSampleEntryBox *ptr = (GF_GenericVisualSampleEntryBox *)s;
 	s->type = GF_ISOM_BOX_TYPE_GNRV;
@@ -1560,7 +1570,7 @@
 
 
 
-void gnra_del(GF_Box *s)
+void gnra_box_del(GF_Box *s)
 {
 	GF_GenericAudioSampleEntryBox *ptr = (GF_GenericAudioSampleEntryBox *)s;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)ptr);
@@ -1568,21 +1578,21 @@
 	gf_free(ptr);
 }
 
-GF_Box *gnra_New()
+GF_Box *gnra_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GenericAudioSampleEntryBox, GF_ISOM_BOX_TYPE_GNRA);
 	gf_isom_audio_sample_entry_init((GF_AudioSampleEntryBox*) tmp);
 	return (GF_Box *)tmp;
 }
 //dummy
-GF_Err gnra_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gnra_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return GF_OK;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err gnra_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gnra_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_GenericAudioSampleEntryBox *ptr = (GF_GenericAudioSampleEntryBox *)s;
@@ -1600,7 +1610,7 @@
 	return GF_OK;
 }
 
-GF_Err gnra_Size(GF_Box *s)
+GF_Err gnra_box_size(GF_Box *s)
 {
 	GF_GenericAudioSampleEntryBox *ptr = (GF_GenericAudioSampleEntryBox *)s;
 	s->type = GF_ISOM_BOX_TYPE_GNRA;
@@ -1611,7 +1621,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void hdlr_del(GF_Box *s)
+void hdlr_box_del(GF_Box *s)
 {
 	GF_HandlerBox *ptr = (GF_HandlerBox *)s;
 	if (ptr == NULL) return;
@@ -1620,41 +1630,42 @@
 }
 
 
-GF_Err hdlr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err hdlr_box_read(GF_Box *s, GF_BitStream *bs)
 {
+	u64 cookie;
 	GF_HandlerBox *ptr = (GF_HandlerBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 20);
 	ptr->reserved1 = gf_bs_read_u32(bs);
 	ptr->handlerType = gf_bs_read_u32(bs);
 	gf_bs_read_data(bs, (char*)ptr->reserved2, 12);
 
-	ISOM_DECREASE_SIZE(ptr, 20);
+	cookie = gf_bs_get_cookie(bs);
+	if (ptr->handlerType==GF_ISOM_MEDIA_VISUAL)
+		cookie |= GF_ISOM_BS_COOKIE_VISUAL_TRACK;
+	else
+		cookie &= ~GF_ISOM_BS_COOKIE_VISUAL_TRACK;
+	gf_bs_set_cookie(bs, cookie);
 
 	if (ptr->size) {
-		size_t len;
 		ptr->nameUTF8 = (char*)gf_malloc((u32) ptr->size);
-		if (ptr->nameUTF8 == NULL) return GF_OUT_OF_MEM;
+		if (!ptr->nameUTF8) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->nameUTF8, (u32) ptr->size);
-		/*safety check in case the string is not null-terminated*/
+
+		//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]) {
-			char *str = (char*)gf_malloc((u32) ptr->size + 1);
-			memcpy(str, ptr->nameUTF8, (u32) ptr->size);
-			str[ptr->size] = 0;
-			gf_free(ptr->nameUTF8);
-			ptr->nameUTF8 = str;
-		}
-		//patch for old QT files
-		if (ptr->size > 1 && ptr->nameUTF8[0] == ptr->size-1) {
-			len = strlen(ptr->nameUTF8 + 1);
-			memmove(ptr->nameUTF8, ptr->nameUTF8+1, len );
-			ptr->nameUTF8[len] = 0;
+			memmove(ptr->nameUTF8, ptr->nameUTF8+1, sizeof(char) * (u32) (ptr->size-1) );
+			ptr->nameUTF8[ptr->size-1] = 0;
 			ptr->store_counted_string = GF_TRUE;
 		}
 	}
 	return GF_OK;
 }
 
-GF_Box *hdlr_New()
+GF_Box *hdlr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HandlerBox, GF_ISOM_BOX_TYPE_HDLR);
 	return (GF_Box *)tmp;
@@ -1663,7 +1674,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err hdlr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err hdlr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_HandlerBox *ptr = (GF_HandlerBox *)s;
@@ -1688,7 +1699,7 @@
 	return GF_OK;
 }
 
-GF_Err hdlr_Size(GF_Box *s)
+GF_Err hdlr_box_size(GF_Box *s)
 {
 	GF_HandlerBox *ptr = (GF_HandlerBox *)s;
 	ptr->size += 20 + 1; //null term or counted string
@@ -1701,21 +1712,21 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void hinf_del(GF_Box *s)
+void hinf_box_del(GF_Box *s)
 {
 	GF_HintInfoBox *hinf = (GF_HintInfoBox *)s;
 	gf_free(hinf);
 }
 
-GF_Box *hinf_New()
+GF_Box *hinf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HintInfoBox, GF_ISOM_BOX_TYPE_HINF);
 
-	tmp->other_boxes = gf_list_new();
+	tmp->child_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-GF_Err hinf_AddBox(GF_Box *s, GF_Box *a)
+GF_Err hinf_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_MAXRBox *maxR;
 	GF_HintInfoBox *hinf = (GF_HintInfoBox *)s;
@@ -1723,37 +1734,37 @@
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_MAXR:
 		i=0;
-		while ((maxR = (GF_MAXRBox *)gf_list_enum(hinf->other_boxes, &i))) {
+		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))
-				return GF_ISOM_INVALID_FILE;
+				ERROR_ON_DUPLICATED_BOX(a, s)
 		}
 		break;
 	}
-	return gf_isom_box_add_default(s, a);
+	return GF_OK;
 }
 
 
-GF_Err hinf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err hinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, hinf_AddBox);
+	return gf_isom_box_array_read(s, bs, hinf_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err hinf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err hinf_box_write(GF_Box *s, GF_BitStream *bs)
 {
 //	GF_HintInfoBox *ptr = (GF_HintInfoBox *)s;
 	if (!s) return GF_BAD_PARAM;
 	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err hinf_Size(GF_Box *s)
+GF_Err hinf_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void hmhd_del(GF_Box *s)
+void hmhd_box_del(GF_Box *s)
 {
 	GF_HintMediaHeaderBox *ptr = (GF_HintMediaHeaderBox *)s;
 	if (ptr == NULL) return;
@@ -1761,10 +1772,11 @@
 }
 
 
-GF_Err hmhd_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err hmhd_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_HintMediaHeaderBox *ptr = (GF_HintMediaHeaderBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 16);
 	ptr->maxPDUSize = gf_bs_read_u16(bs);
 	ptr->avgPDUSize = gf_bs_read_u16(bs);
 	ptr->maxBitrate = gf_bs_read_u32(bs);
@@ -1773,7 +1785,7 @@
 	return GF_OK;
 }
 
-GF_Box *hmhd_New()
+GF_Box *hmhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HintMediaHeaderBox, GF_ISOM_BOX_TYPE_HMHD);
 	return (GF_Box *)tmp;
@@ -1782,7 +1794,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err hmhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err hmhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_HintMediaHeaderBox *ptr = (GF_HintMediaHeaderBox *)s;
@@ -1797,7 +1809,7 @@
 	return GF_OK;
 }
 
-GF_Err hmhd_Size(GF_Box *s)
+GF_Err hmhd_box_size(GF_Box *s)
 {
 	GF_HintMediaHeaderBox *ptr = (GF_HintMediaHeaderBox *)s;
 	ptr->size += 16;
@@ -1806,18 +1818,18 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *hnti_New()
+GF_Box *hnti_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HintTrackInfoBox, GF_ISOM_BOX_TYPE_HNTI);
 	return (GF_Box *)tmp;
 }
 
-void hnti_del(GF_Box *a)
+void hnti_box_del(GF_Box *a)
 {
 	gf_free(a);
 }
 
-GF_Err hnti_AddBox(GF_Box *s, GF_Box *a)
+GF_Err hnti_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_HintTrackInfoBox *hnti = (GF_HintTrackInfoBox *)s;
 	if (!hnti || !a) return GF_BAD_PARAM;
@@ -1826,28 +1838,28 @@
 	//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) return GF_BAD_PARAM;
+		if (hnti->SDP) ERROR_ON_DUPLICATED_BOX(a, s)
 		hnti->SDP = a;
 		break;
 	default:
 		break;
 	}
-	return gf_isom_box_add_default(s, a);
+	return GF_OK;
 }
 
-GF_Err hnti_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err hnti_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, hnti_AddBox, s->type);
+	return gf_isom_box_array_read_ex(s, bs, hnti_on_child_box, s->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err hnti_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err hnti_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	return gf_isom_box_write_header(s, bs);
 }
 
 
-GF_Err hnti_Size(GF_Box *s)
+GF_Err hnti_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
@@ -1857,14 +1869,14 @@
 		GF_SDPBox
 **********************************************************/
 
-void sdp_del(GF_Box *s)
+void sdp_box_del(GF_Box *s)
 {
 	GF_SDPBox *ptr = (GF_SDPBox *)s;
 	if (ptr->sdpText) gf_free(ptr->sdpText);
 	gf_free(ptr);
 
 }
-GF_Err sdp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err sdp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 length;
 	GF_SDPBox *ptr = (GF_SDPBox *)s;
@@ -1879,13 +1891,13 @@
 	ptr->sdpText[length] = 0;
 	return GF_OK;
 }
-GF_Box *sdp_New()
+GF_Box *sdp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SDPBox, GF_ISOM_BOX_TYPE_SDP);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err sdp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sdp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SDPBox *ptr = (GF_SDPBox *)s;
@@ -1893,14 +1905,16 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	//don't write the NULL char!!!
-	gf_bs_write_data(bs, ptr->sdpText, (u32) strlen(ptr->sdpText));
+	if (ptr->sdpText)
+		gf_bs_write_data(bs, ptr->sdpText, (u32) strlen(ptr->sdpText));
 	return GF_OK;
 }
-GF_Err sdp_Size(GF_Box *s)
+GF_Err sdp_box_size(GF_Box *s)
 {
 	GF_SDPBox *ptr = (GF_SDPBox *)s;
 	//don't count the NULL char!!!
-	ptr->size += strlen(ptr->sdpText);
+	if (ptr->sdpText)
+		ptr->size += strlen(ptr->sdpText);
 	return GF_OK;
 }
 
@@ -1909,14 +1923,14 @@
 
 
 
-void rtp_hnti_del(GF_Box *s)
+void rtp_hnti_box_del(GF_Box *s)
 {
 	GF_RTPBox *ptr = (GF_RTPBox *)s;
 	if (ptr->sdpText) gf_free(ptr->sdpText);
 	gf_free(ptr);
 
 }
-GF_Err rtp_hnti_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err rtp_hnti_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 length;
 	GF_RTPBox *ptr = (GF_RTPBox *)s;
@@ -1935,14 +1949,14 @@
 	return GF_OK;
 }
 
-GF_Box *rtp_hnti_New()
+GF_Box *rtp_hnti_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_RTPBox, GF_ISOM_BOX_TYPE_RTP);
 	tmp->subType = GF_ISOM_BOX_TYPE_SDP;
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err rtp_hnti_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rtp_hnti_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_RTPBox *ptr = (GF_RTPBox *)s;
@@ -1955,7 +1969,7 @@
 	return GF_OK;
 }
 
-GF_Err rtp_hnti_Size(GF_Box *s)
+GF_Err rtp_hnti_box_size(GF_Box *s)
 {
 	GF_RTPBox *ptr = (GF_RTPBox *)s;
 	ptr->size += 4 + strlen(ptr->sdpText);
@@ -1969,24 +1983,25 @@
 		TRPY GF_Box
 **********************************************************/
 
-void trpy_del(GF_Box *s)
+void trpy_box_del(GF_Box *s)
 {
 	gf_free((GF_TRPYBox *)s);
 }
-GF_Err trpy_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trpy_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TRPYBox *ptr = (GF_TRPYBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->nbBytes = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *trpy_New()
+GF_Box *trpy_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TRPYBox, GF_ISOM_BOX_TYPE_TRPY);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err trpy_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trpy_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TRPYBox *ptr = (GF_TRPYBox *)s;
@@ -1997,7 +2012,7 @@
 	gf_bs_write_u64(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err trpy_Size(GF_Box *s)
+GF_Err trpy_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2008,17 +2023,18 @@
 		TOTL GF_Box
 **********************************************************/
 
-void totl_del(GF_Box *s)
+void totl_box_del(GF_Box *s)
 {
 	gf_free((GF_TRPYBox *)s);
 }
-GF_Err totl_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err totl_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TOTLBox *ptr = (GF_TOTLBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nbBytes = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *totl_New()
+GF_Box *totl_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TOTLBox, GF_ISOM_BOX_TYPE_TOTL);
 	return (GF_Box *)tmp;
@@ -2026,7 +2042,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err totl_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err totl_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TOTLBox *ptr = (GF_TOTLBox *)s;
@@ -2036,7 +2052,7 @@
 	gf_bs_write_u32(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err totl_Size(GF_Box *s)
+GF_Err totl_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2048,24 +2064,25 @@
 		NUMP GF_Box
 **********************************************************/
 
-void nump_del(GF_Box *s)
+void nump_box_del(GF_Box *s)
 {
 	gf_free((GF_NUMPBox *)s);
 }
-GF_Err nump_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err nump_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_NUMPBox *ptr = (GF_NUMPBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->nbPackets = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *nump_New()
+GF_Box *nump_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_NUMPBox, GF_ISOM_BOX_TYPE_NUMP);
 	return (GF_Box *)tmp;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err nump_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err nump_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_NUMPBox *ptr = (GF_NUMPBox *)s;
@@ -2075,7 +2092,7 @@
 	gf_bs_write_u64(bs, ptr->nbPackets);
 	return GF_OK;
 }
-GF_Err nump_Size(GF_Box *s)
+GF_Err nump_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2087,23 +2104,24 @@
 		NPCK GF_Box
 **********************************************************/
 
-void npck_del(GF_Box *s)
+void npck_box_del(GF_Box *s)
 {
 	gf_free((GF_NPCKBox *)s);
 }
-GF_Err npck_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err npck_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_NPCKBox *ptr = (GF_NPCKBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nbPackets = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *npck_New()
+GF_Box *npck_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_NPCKBox, GF_ISOM_BOX_TYPE_NPCK);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err npck_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err npck_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_NPCKBox *ptr = (GF_NPCKBox *)s;
@@ -2113,7 +2131,7 @@
 	gf_bs_write_u32(bs, ptr->nbPackets);
 	return GF_OK;
 }
-GF_Err npck_Size(GF_Box *s)
+GF_Err npck_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2125,24 +2143,25 @@
 		TPYL GF_Box
 **********************************************************/
 
-void tpyl_del(GF_Box *s)
+void tpyl_box_del(GF_Box *s)
 {
 	gf_free((GF_NTYLBox *)s);
 }
-GF_Err tpyl_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tpyl_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_NTYLBox *ptr = (GF_NTYLBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->nbBytes = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *tpyl_New()
+GF_Box *tpyl_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_NTYLBox, GF_ISOM_BOX_TYPE_TPYL);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tpyl_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tpyl_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_NTYLBox *ptr = (GF_NTYLBox *)s;
@@ -2152,7 +2171,7 @@
 	gf_bs_write_u64(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err tpyl_Size(GF_Box *s)
+GF_Err tpyl_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2163,23 +2182,24 @@
 		TPAY GF_Box
 **********************************************************/
 
-void tpay_del(GF_Box *s)
+void tpay_box_del(GF_Box *s)
 {
 	gf_free((GF_TPAYBox *)s);
 }
-GF_Err tpay_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tpay_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TPAYBox *ptr = (GF_TPAYBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->nbBytes = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *tpay_New()
+GF_Box *tpay_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TPAYBox, GF_ISOM_BOX_TYPE_TPAY);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tpay_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tpay_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TPAYBox *ptr = (GF_TPAYBox *)s;
@@ -2189,7 +2209,7 @@
 	gf_bs_write_u32(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err tpay_Size(GF_Box *s)
+GF_Err tpay_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2201,25 +2221,26 @@
 		MAXR GF_Box
 **********************************************************/
 
-void maxr_del(GF_Box *s)
+void maxr_box_del(GF_Box *s)
 {
 	gf_free((GF_MAXRBox *)s);
 }
-GF_Err maxr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err maxr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MAXRBox *ptr = (GF_MAXRBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->granularity = gf_bs_read_u32(bs);
 	ptr->maxDataRate = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *maxr_New()
+GF_Box *maxr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MAXRBox, GF_ISOM_BOX_TYPE_MAXR);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err maxr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err maxr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MAXRBox *ptr = (GF_MAXRBox *)s;
@@ -2230,7 +2251,7 @@
 	gf_bs_write_u32(bs, ptr->maxDataRate);
 	return GF_OK;
 }
-GF_Err maxr_Size(GF_Box *s)
+GF_Err maxr_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2242,23 +2263,24 @@
 		DMED GF_Box
 **********************************************************/
 
-void dmed_del(GF_Box *s)
+void dmed_box_del(GF_Box *s)
 {
 	gf_free((GF_DMEDBox *)s);
 }
-GF_Err dmed_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dmed_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DMEDBox *ptr = (GF_DMEDBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->nbBytes = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *dmed_New()
+GF_Box *dmed_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DMEDBox, GF_ISOM_BOX_TYPE_DMED);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err dmed_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dmed_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DMEDBox *ptr = (GF_DMEDBox *)s;
@@ -2268,7 +2290,7 @@
 	gf_bs_write_u64(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err dmed_Size(GF_Box *s)
+GF_Err dmed_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2279,23 +2301,24 @@
 		DIMM GF_Box
 **********************************************************/
 
-void dimm_del(GF_Box *s)
+void dimm_box_del(GF_Box *s)
 {
 	gf_free((GF_DIMMBox *)s);
 }
-GF_Err dimm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dimm_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DIMMBox *ptr = (GF_DIMMBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8)
 	ptr->nbBytes = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *dimm_New()
+GF_Box *dimm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DIMMBox, GF_ISOM_BOX_TYPE_DIMM);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err dimm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dimm_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DIMMBox *ptr = (GF_DIMMBox *)s;
@@ -2305,7 +2328,7 @@
 	gf_bs_write_u64(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err dimm_Size(GF_Box *s)
+GF_Err dimm_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2316,23 +2339,24 @@
 		DREP GF_Box
 **********************************************************/
 
-void drep_del(GF_Box *s)
+void drep_box_del(GF_Box *s)
 {
 	gf_free((GF_DREPBox *)s);
 }
-GF_Err drep_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err drep_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DREPBox *ptr = (GF_DREPBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8)
 	ptr->nbBytes = gf_bs_read_u64(bs);
 	return GF_OK;
 }
-GF_Box *drep_New()
+GF_Box *drep_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DREPBox, GF_ISOM_BOX_TYPE_DREP);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err drep_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err drep_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DREPBox *ptr = (GF_DREPBox *)s;
@@ -2342,7 +2366,7 @@
 	gf_bs_write_u64(bs, ptr->nbBytes);
 	return GF_OK;
 }
-GF_Err drep_Size(GF_Box *s)
+GF_Err drep_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -2355,23 +2379,24 @@
 		TMIN GF_Box
 **********************************************************/
 
-void tmin_del(GF_Box *s)
+void tmin_box_del(GF_Box *s)
 {
 	gf_free((GF_TMINBox *)s);
 }
-GF_Err tmin_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tmin_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TMINBox *ptr = (GF_TMINBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->minTime = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *tmin_New()
+GF_Box *tmin_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TMINBox, GF_ISOM_BOX_TYPE_TMIN);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tmin_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tmin_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TMINBox *ptr = (GF_TMINBox *)s;
@@ -2381,7 +2406,7 @@
 	gf_bs_write_u32(bs, ptr->minTime);
 	return GF_OK;
 }
-GF_Err tmin_Size(GF_Box *s)
+GF_Err tmin_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2393,23 +2418,24 @@
 		TMAX GF_Box
 **********************************************************/
 
-void tmax_del(GF_Box *s)
+void tmax_box_del(GF_Box *s)
 {
 	gf_free((GF_TMAXBox *)s);
 }
-GF_Err tmax_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tmax_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TMAXBox *ptr = (GF_TMAXBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->maxTime = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *tmax_New()
+GF_Box *tmax_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TMAXBox, GF_ISOM_BOX_TYPE_TMAX);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tmax_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tmax_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TMAXBox *ptr = (GF_TMAXBox *)s;
@@ -2419,7 +2445,7 @@
 	gf_bs_write_u32(bs, ptr->maxTime);
 	return GF_OK;
 }
-GF_Err tmax_Size(GF_Box *s)
+GF_Err tmax_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2431,23 +2457,24 @@
 		PMAX GF_Box
 **********************************************************/
 
-void pmax_del(GF_Box *s)
+void pmax_box_del(GF_Box *s)
 {
 	gf_free((GF_PMAXBox *)s);
 }
-GF_Err pmax_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err pmax_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PMAXBox *ptr = (GF_PMAXBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->maxSize = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *pmax_New()
+GF_Box *pmax_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PMAXBox, GF_ISOM_BOX_TYPE_PMAX);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err pmax_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pmax_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_PMAXBox *ptr = (GF_PMAXBox *)s;
@@ -2457,7 +2484,7 @@
 	gf_bs_write_u32(bs, ptr->maxSize);
 	return GF_OK;
 }
-GF_Err pmax_Size(GF_Box *s)
+GF_Err pmax_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2469,23 +2496,24 @@
 		DMAX GF_Box
 **********************************************************/
 
-void dmax_del(GF_Box *s)
+void dmax_box_del(GF_Box *s)
 {
 	gf_free((GF_DMAXBox *)s);
 }
-GF_Err dmax_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dmax_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_DMAXBox *ptr = (GF_DMAXBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->maxDur = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *dmax_New()
+GF_Box *dmax_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DMAXBox, GF_ISOM_BOX_TYPE_DMAX);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err dmax_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dmax_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DMAXBox *ptr = (GF_DMAXBox *)s;
@@ -2495,7 +2523,7 @@
 	gf_bs_write_u32(bs, ptr->maxDur);
 	return GF_OK;
 }
-GF_Err dmax_Size(GF_Box *s)
+GF_Err dmax_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2507,34 +2535,35 @@
 		PAYT GF_Box
 **********************************************************/
 
-void payt_del(GF_Box *s)
+void payt_box_del(GF_Box *s)
 {
 	GF_PAYTBox *payt = (GF_PAYTBox *)s;
 	if (payt->payloadString) gf_free(payt->payloadString);
 	gf_free(payt);
 }
-GF_Err payt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err payt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 length;
 	GF_PAYTBox *ptr = (GF_PAYTBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 5 );
 	ptr->payloadCode = gf_bs_read_u32(bs);
 	length = gf_bs_read_u8(bs);
+	ISOM_DECREASE_SIZE(ptr, length);
 	ptr->payloadString = (char*)gf_malloc(sizeof(char) * (length+1) );
 	if (! ptr->payloadString) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->payloadString, length);
 	ptr->payloadString[length] = 0;
 
-	ISOM_DECREASE_SIZE(ptr, (4+length+1) );
 	return GF_OK;
 }
-GF_Box *payt_New()
+GF_Box *payt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PAYTBox, GF_ISOM_BOX_TYPE_PAYT);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err payt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err payt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 len;
 	GF_Err e;
@@ -2543,12 +2572,12 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->payloadCode);
-	len = (u32) strlen(ptr->payloadString);
+    len = ptr->payloadString ? (u32) strlen(ptr->payloadString) : 0;
 	gf_bs_write_u8(bs, len);
 	if (len) gf_bs_write_data(bs, ptr->payloadString, len);
 	return GF_OK;
 }
-GF_Err payt_Size(GF_Box *s)
+GF_Err payt_box_size(GF_Box *s)
 {
 	GF_PAYTBox *ptr = (GF_PAYTBox *)s;
 	s->size += 4 + 1;
@@ -2562,13 +2591,13 @@
 		PAYT GF_Box
 **********************************************************/
 
-void name_del(GF_Box *s)
+void name_box_del(GF_Box *s)
 {
 	GF_NameBox *name = (GF_NameBox *)s;
 	if (name->string) gf_free(name->string);
 	gf_free(name);
 }
-GF_Err name_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err name_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 length;
 	GF_NameBox *ptr = (GF_NameBox *)s;
@@ -2581,13 +2610,13 @@
 	ptr->string[length] = 0;
 	return GF_OK;
 }
-GF_Box *name_New()
+GF_Box *name_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_NameBox, GF_ISOM_BOX_TYPE_NAME);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err name_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err name_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_NameBox *ptr = (GF_NameBox *)s;
@@ -2599,7 +2628,7 @@
 	}
 	return GF_OK;
 }
-GF_Err name_Size(GF_Box *s)
+GF_Err name_box_size(GF_Box *s)
 {
 	GF_NameBox *ptr = (GF_NameBox *)s;
 	if (ptr->string) ptr->size += strlen(ptr->string) + 1;
@@ -2608,24 +2637,25 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void tssy_del(GF_Box *s)
+void tssy_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
-GF_Err tssy_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tssy_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TimeStampSynchronyBox *ptr = (GF_TimeStampSynchronyBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 1)
 	gf_bs_read_int(bs, 6);
 	ptr->timestamp_sync = gf_bs_read_int(bs, 2);
 	return GF_OK;
 }
-GF_Box *tssy_New()
+GF_Box *tssy_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TimeStampSynchronyBox, GF_ISOM_BOX_TYPE_TSSY);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tssy_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tssy_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TimeStampSynchronyBox *ptr = (GF_TimeStampSynchronyBox *)s;
@@ -2636,7 +2666,7 @@
 	gf_bs_write_int(bs, ptr->timestamp_sync, 2);
 	return GF_OK;
 }
-GF_Err tssy_Size(GF_Box *s)
+GF_Err tssy_box_size(GF_Box *s)
 {
 	s->size += 1;
 	return GF_OK;
@@ -2644,15 +2674,12 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void srpp_del(GF_Box *s)
+void srpp_box_del(GF_Box *s)
 {
-	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
-	if (ptr->info) gf_isom_box_del((GF_Box*)ptr->info);
-	if (ptr->scheme_type) gf_isom_box_del((GF_Box*)ptr->scheme_type);
 	gf_free(s);
 }
 
-GF_Err srpp_AddBox(GF_Box *s, GF_Box *a)
+GF_Err srpp_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
 	switch(a->type) {
@@ -2665,10 +2692,10 @@
 		ptr->scheme_type = (GF_SchemeTypeBox *)a;
 		return GF_OK;
 	}
-	return gf_isom_box_add_default(s, a);
+	return GF_OK;
 }
 
-GF_Err srpp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err srpp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
 
@@ -2676,16 +2703,16 @@
 	ptr->encryption_algorithm_rtp = gf_bs_read_u32(bs);
 	ptr->encryption_algorithm_rtcp = gf_bs_read_u32(bs);
 	ptr->integrity_algorithm_rtp = gf_bs_read_u32(bs);
-	ptr->integrity_algorithm_rtp = gf_bs_read_u32(bs);
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	ptr->integrity_algorithm_rtcp = gf_bs_read_u32(bs);
+	return gf_isom_box_array_read(s, bs, srpp_on_child_box);
 }
-GF_Box *srpp_New()
+GF_Box *srpp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SRTPProcessBox, GF_ISOM_BOX_TYPE_SRPP);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err srpp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err srpp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
@@ -2697,55 +2724,40 @@
 	gf_bs_write_u32(bs, ptr->encryption_algorithm_rtcp);
 	gf_bs_write_u32(bs, ptr->integrity_algorithm_rtp);
 	gf_bs_write_u32(bs, ptr->integrity_algorithm_rtcp);
-	if (ptr->info) {
-		e = gf_isom_box_write((GF_Box*)ptr->info, bs);
-		if (e) return e;
-	}
-	if (ptr->scheme_type) {
-		e = gf_isom_box_write((GF_Box*)ptr->scheme_type, bs);
-		if (e) return e;
-	}
+
 	return GF_OK;
 }
-GF_Err srpp_Size(GF_Box *s)
+GF_Err srpp_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos = 0;
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *)s;
-
 	s->size += 16;
-	if (ptr->info) {
-		e = gf_isom_box_size((GF_Box*)ptr->info);
-		if (e) return e;
-		ptr->size += ptr->info->size;
-	}
-	if (ptr->scheme_type) {
-		e = gf_isom_box_size((GF_Box*)ptr->scheme_type);
-		if (e) return e;
-		ptr->size += ptr->scheme_type->size;
-	}
+	gf_isom_check_position(s, (GF_Box*)ptr->info, &pos);
+	gf_isom_check_position(s, (GF_Box*)ptr->scheme_type, &pos);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
 
-void rssr_del(GF_Box *s)
+void rssr_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
-GF_Err rssr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err rssr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ReceivedSsrcBox *ptr = (GF_ReceivedSsrcBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->ssrc = gf_bs_read_u32(bs);
 	return GF_OK;
 }
-GF_Box *rssr_New()
+GF_Box *rssr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ReceivedSsrcBox, GF_ISOM_BOX_TYPE_RSSR);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err rssr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rssr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ReceivedSsrcBox *ptr = (GF_ReceivedSsrcBox *)s;
@@ -2754,7 +2766,7 @@
 	gf_bs_write_u32(bs, ptr->ssrc);
 	return GF_OK;
 }
-GF_Err rssr_Size(GF_Box *s)
+GF_Err rssr_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -2764,7 +2776,7 @@
 
 
 
-void iods_del(GF_Box *s)
+void iods_box_del(GF_Box *s)
 {
 	GF_ObjectDescriptorBox *ptr = (GF_ObjectDescriptorBox *)s;
 	if (ptr == NULL) return;
@@ -2773,7 +2785,7 @@
 }
 
 
-GF_Err iods_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err iods_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 descSize;
@@ -2783,6 +2795,8 @@
 	//use the OD codec...
 	descSize = (u32) (ptr->size);
 	desc = (char*)gf_malloc(sizeof(char) * descSize);
+	if (!desc) return GF_OUT_OF_MEM;
+
 	gf_bs_read_data(bs, desc, descSize);
 	e = gf_odf_desc_read(desc, descSize, &ptr->descriptor);
 	//OK, free our desc
@@ -2790,7 +2804,7 @@
 	return e;
 }
 
-GF_Box *iods_New()
+GF_Box *iods_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ObjectDescriptorBox, GF_ISOM_BOX_TYPE_IODS);
 	return (GF_Box *)tmp;
@@ -2800,11 +2814,11 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err iods_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err iods_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 descSize;
-	char *desc;
+	u8 *desc;
 	GF_ObjectDescriptorBox *ptr = (GF_ObjectDescriptorBox *)s;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
@@ -2817,7 +2831,7 @@
 	return GF_OK;
 }
 
-GF_Err iods_Size(GF_Box *s)
+GF_Err iods_box_size(GF_Box *s)
 {
 	GF_ObjectDescriptorBox *ptr = (GF_ObjectDescriptorBox *)s;
 
@@ -2827,7 +2841,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void mdat_del(GF_Box *s)
+void mdat_box_del(GF_Box *s)
 {
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
 	if (!s) return;
@@ -2837,7 +2851,7 @@
 }
 
 
-GF_Err mdat_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mdat_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
@@ -2850,7 +2864,7 @@
 	return GF_OK;
 }
 
-GF_Box *mdat_New()
+GF_Box *mdat_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MediaDataBox, GF_ISOM_BOX_TYPE_MDAT);
 	return (GF_Box *)tmp;
@@ -2858,7 +2872,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mdat_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mdat_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
@@ -2866,14 +2880,14 @@
 	if (e) return e;
 
 	//make sure we have some data ...
-	//if not, we handle that independantly (edit files)
+	//if not, we handle that independently (edit files)
 	if (ptr->data) {
 		gf_bs_write_data(bs, ptr->data, (u32) ptr->dataSize);
 	}
 	return GF_OK;
 }
 
-GF_Err mdat_Size(GF_Box *s)
+GF_Err mdat_box_size(GF_Box *s)
 {
 	GF_MediaDataBox *ptr = (GF_MediaDataBox *)s;
 	ptr->size += ptr->dataSize;
@@ -2882,23 +2896,25 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void mdhd_del(GF_Box *s)
+void mdhd_box_del(GF_Box *s)
 {
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err mdhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mdhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
 
 	if (ptr->version == 1) {
+		ISOM_DECREASE_SIZE(ptr, 28)
 		ptr->creationTime = gf_bs_read_u64(bs);
 		ptr->modificationTime = gf_bs_read_u64(bs);
 		ptr->timeScale = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u64(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 16)
 		ptr->creationTime = gf_bs_read_u32(bs);
 		ptr->modificationTime = gf_bs_read_u32(bs);
 		ptr->timeScale = gf_bs_read_u32(bs);
@@ -2911,6 +2927,7 @@
 
 	ptr->original_duration = ptr->duration;
 
+	ISOM_DECREASE_SIZE(ptr, 4)
 	//our padding bit
 	gf_bs_read_int(bs, 1);
 	//the spec is unclear here, just says "the value 0 is interpreted as undetermined"
@@ -2931,7 +2948,7 @@
 	return GF_OK;
 }
 
-GF_Box *mdhd_New()
+GF_Box *mdhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MediaHeaderBox, GF_ISOM_BOX_TYPE_MDHD);
 
@@ -2944,7 +2961,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mdhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mdhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
@@ -2970,7 +2987,7 @@
 	return GF_OK;
 }
 
-GF_Err mdhd_Size(GF_Box *s)
+GF_Err mdhd_box_size(GF_Box *s)
 {
 	GF_MediaHeaderBox *ptr = (GF_MediaHeaderBox *)s;
 	ptr->version = (ptr->duration>0xFFFFFFFF) ? 1 : 0;
@@ -2983,48 +3000,53 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void mdia_del(GF_Box *s)
+void mdia_box_del(GF_Box *s)
 {
 	GF_MediaBox *ptr = (GF_MediaBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->mediaHeader) gf_isom_box_del((GF_Box *)ptr->mediaHeader);
-	if (ptr->information) gf_isom_box_del((GF_Box *)ptr->information);
-	if (ptr->handler) gf_isom_box_del((GF_Box *)ptr->handler);
+	if (ptr->nalu_parser) gf_bs_del(ptr->nalu_parser);
+	if (ptr->nalu_out_bs) gf_bs_del(ptr->nalu_out_bs);
+	if (ptr->nalu_ps_bs) gf_bs_del(ptr->nalu_ps_bs);
+	if (ptr->extracted_bs) gf_bs_del(ptr->extracted_bs);
+	if (ptr->extracted_samp) gf_isom_sample_del(&ptr->extracted_samp);
+	if (ptr->in_sample_buffer) gf_free(ptr->in_sample_buffer);
+	if (ptr->tmp_nal_copy_buffer) gf_free(ptr->tmp_nal_copy_buffer);
 	gf_free(ptr);
 }
 
 
-GF_Err mdia_AddBox(GF_Box *s, GF_Box *a)
+GF_Err mdia_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->mediaHeader = (GF_MediaHeaderBox *)a;
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_HDLR:
 		if (ptr->handler) ERROR_ON_DUPLICATED_BOX(a, ptr)
-
-			ptr->handler = (GF_HandlerBox *)a;
+		ptr->handler = (GF_HandlerBox *)a;
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_MINF:
 		if (ptr->information) ERROR_ON_DUPLICATED_BOX(a, ptr)
-
-			ptr->information = (GF_MediaInformationBox *)a;
+		ptr->information = (GF_MediaInformationBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
-GF_Err mdia_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mdia_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_box_array_read(s, bs, mdia_AddBox);
+	GF_Err e;
+	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);
+	gf_bs_set_cookie(bs, cookie);
+
 	if (e) return e;
 	if (!((GF_MediaBox *)s)->information) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MediaInformationBox\n"));
@@ -3041,7 +3063,7 @@
 	return GF_OK;
 }
 
-GF_Box *mdia_New()
+GF_Box *mdia_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MediaBox, GF_ISOM_BOX_TYPE_MDIA);
 	return (GF_Box *)tmp;
@@ -3049,71 +3071,42 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mdia_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mdia_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_MediaBox *ptr = (GF_MediaBox *)s;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	//Header first
-	if (ptr->mediaHeader) {
-		e = gf_isom_box_write((GF_Box *) ptr->mediaHeader, bs);
-		if (e) return e;
-	}
-	//then handler
-	if (ptr->handler) {
-		e = gf_isom_box_write((GF_Box *) ptr->handler, bs);
-		if (e) return e;
-	}
-	if (ptr->information) {
-		e = gf_isom_box_write((GF_Box *) ptr->information, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err mdia_Size(GF_Box *s)
+GF_Err mdia_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos = 0;
 	GF_MediaBox *ptr = (GF_MediaBox *)s;
-
-	if (ptr->mediaHeader) {
-		e = gf_isom_box_size((GF_Box *) ptr->mediaHeader);
-		if (e) return e;
-		ptr->size += ptr->mediaHeader->size;
-	}
-	if (ptr->handler) {
-		e = gf_isom_box_size((GF_Box *) ptr->handler);
-		if (e) return e;
-		ptr->size += ptr->handler->size;
-	}
-	if (ptr->information) {
-		e = gf_isom_box_size((GF_Box *) ptr->information);
-		if (e) return e;
-		ptr->size += ptr->information->size;
-	}
+	//Header first
+	gf_isom_check_position(s, (GF_Box*)ptr->mediaHeader, &pos);
+	//then handler
+	gf_isom_check_position(s, (GF_Box*)ptr->handler, &pos);
+	//then info
+	gf_isom_check_position(s, (GF_Box*)ptr->information, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void mfra_del(GF_Box *s)
+void mfra_box_del(GF_Box *s)
 {
 	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->mfro) gf_isom_box_del((GF_Box*)ptr->mfro);
-	gf_isom_box_array_del(ptr->tfra_list);
+	gf_list_del(ptr->tfra_list);
 	gf_free(ptr);
 }
 
-GF_Box *mfra_New()
+GF_Box *mfra_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieFragmentRandomAccessBox, GF_ISOM_BOX_TYPE_MFRA);
 	tmp->tfra_list = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-GF_Err mfra_AddBox(GF_Box *s, GF_Box *a)
+GF_Err mfra_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
 	switch(a->type) {
@@ -3123,53 +3116,35 @@
 		if (ptr->mfro) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->mfro = (GF_MovieFragmentRandomAccessOffsetBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err mfra_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mfra_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, mfra_AddBox);
+	return gf_isom_box_array_read(s, bs, mfra_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mfra_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mfra_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
-
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	e = gf_isom_box_array_write(s, ptr->tfra_list, bs);
-	if (e) return e;
-	if (ptr->mfro) {
-		e = gf_isom_box_write((GF_Box *) ptr->mfro, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err mfra_Size(GF_Box *s)
+GF_Err mfra_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_MovieFragmentRandomAccessBox *ptr = (GF_MovieFragmentRandomAccessBox *)s;
-
-	if (ptr->mfro) {
-		e = gf_isom_box_size((GF_Box *)ptr->mfro);
-		if (e) return e;
-		ptr->size += ptr->mfro->size;
-	}
-	return gf_isom_box_array_size(s, ptr->tfra_list);
+	gf_isom_check_position_list(s, ptr->tfra_list, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->mfro, &pos);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void tfra_del(GF_Box *s)
+void tfra_box_del(GF_Box *s)
 {
 	GF_TrackFragmentRandomAccessBox *ptr = (GF_TrackFragmentRandomAccessBox *)s;
 	if (ptr == NULL) return;
@@ -3177,34 +3152,29 @@
 	gf_free(ptr);
 }
 
-GF_Box *tfra_New()
+GF_Box *tfra_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackFragmentRandomAccessBox, GF_ISOM_BOX_TYPE_TFRA);
 	return (GF_Box *)tmp;
 }
 
-GF_Err tfra_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tfra_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_RandomAccessEntry *p = 0;
 	GF_TrackFragmentRandomAccessBox *ptr = (GF_TrackFragmentRandomAccessBox *)s;
 
-	if (ptr->size < 12)
-		return GF_ISOM_INVALID_FILE;
+	ISOM_DECREASE_SIZE(ptr, 12);
 
 	ptr->track_id = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
-
 	if (gf_bs_read_int(bs, 26) != 0)
 		return GF_ISOM_INVALID_FILE;
 
 	ptr->traf_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
 	ptr->trun_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
 	ptr->sample_bits = (gf_bs_read_int(bs, 2) + 1) * 8;
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	ptr->nb_entries = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	if (ptr->version == 1) {
 		if (ptr->nb_entries > ptr->size / (16+(ptr->traf_bits+ptr->trun_bits+ptr->sample_bits)/8)) {
@@ -3248,7 +3218,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tfra_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tfra_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -3282,7 +3252,7 @@
 	return GF_OK;
 }
 
-GF_Err tfra_Size(GF_Box *s)
+GF_Err tfra_box_size(GF_Box *s)
 {
 	GF_TrackFragmentRandomAccessBox *ptr = (GF_TrackFragmentRandomAccessBox *)s;
 
@@ -3296,33 +3266,32 @@
 
 
 
-void mfro_del(GF_Box *s)
+void mfro_box_del(GF_Box *s)
 {
 	GF_MovieFragmentRandomAccessOffsetBox *ptr = (GF_MovieFragmentRandomAccessOffsetBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Box *mfro_New()
+GF_Box *mfro_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieFragmentRandomAccessOffsetBox, GF_ISOM_BOX_TYPE_MFRO);
 	return (GF_Box *)tmp;
 }
 
-GF_Err mfro_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mfro_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MovieFragmentRandomAccessOffsetBox *ptr = (GF_MovieFragmentRandomAccessOffsetBox *)s;
 
-	ptr->container_size = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
-
+	ptr->container_size = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mfro_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mfro_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MovieFragmentRandomAccessOffsetBox *ptr = (GF_MovieFragmentRandomAccessOffsetBox *)s;
@@ -3334,7 +3303,7 @@
 	return GF_OK;
 }
 
-GF_Err mfro_Size(GF_Box *s)
+GF_Err mfro_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -3343,7 +3312,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void elng_del(GF_Box *s)
+void elng_box_del(GF_Box *s)
 {
 	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
 	if (ptr == NULL) return;
@@ -3351,7 +3320,7 @@
 	gf_free(ptr);
 }
 
-GF_Err elng_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err elng_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
 
@@ -3362,6 +3331,7 @@
 		/*safety check in case the string is not null-terminated*/
 		if (ptr->extended_language[ptr->size-1]) {
 			char *str = (char*)gf_malloc((u32) ptr->size + 1);
+			if (!str) return GF_OUT_OF_MEM;
 			memcpy(str, ptr->extended_language, (u32) ptr->size);
 			str[ptr->size] = 0;
 			gf_free(ptr->extended_language);
@@ -3371,7 +3341,7 @@
 	return GF_OK;
 }
 
-GF_Box *elng_New()
+GF_Box *elng_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MediaBox, GF_ISOM_BOX_TYPE_ELNG);
 	return (GF_Box *)tmp;
@@ -3379,7 +3349,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err elng_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err elng_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
@@ -3391,7 +3361,7 @@
 	return GF_OK;
 }
 
-GF_Err elng_Size(GF_Box *s)
+GF_Err elng_box_size(GF_Box *s)
 {
 	GF_ExtendedLanguageBox *ptr = (GF_ExtendedLanguageBox *)s;
 
@@ -3405,21 +3375,22 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void mfhd_del(GF_Box *s)
+void mfhd_box_del(GF_Box *s)
 {
 	GF_MovieFragmentHeaderBox *ptr = (GF_MovieFragmentHeaderBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err mfhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mfhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MovieFragmentHeaderBox *ptr = (GF_MovieFragmentHeaderBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->sequence_number = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
-GF_Box *mfhd_New()
+GF_Box *mfhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieFragmentHeaderBox, GF_ISOM_BOX_TYPE_MFHD);
 	return (GF_Box *)tmp;
@@ -3429,7 +3400,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err mfhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mfhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MovieFragmentHeaderBox *ptr = (GF_MovieFragmentHeaderBox *) s;
@@ -3441,7 +3412,7 @@
 	return GF_OK;
 }
 
-GF_Err mfhd_Size(GF_Box *s)
+GF_Err mfhd_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -3454,7 +3425,7 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-void minf_del(GF_Box *s)
+void minf_box_del(GF_Box *s)
 {
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	if (ptr == NULL) return;
@@ -3463,13 +3434,10 @@
 	if (ptr->dataHandler) {
 		gf_isom_datamap_close(ptr);
 	}
-	if (ptr->InfoHeader) gf_isom_box_del((GF_Box *)ptr->InfoHeader);
-	if (ptr->dataInformation) gf_isom_box_del((GF_Box *)ptr->dataInformation);
-	if (ptr->sampleTable) gf_isom_box_del((GF_Box *)ptr->sampleTable);
 	gf_free(ptr);
 }
 
-GF_Err minf_AddBox(GF_Box *s, GF_Box *a)
+GF_Err minf_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	switch (a->type) {
@@ -3492,52 +3460,39 @@
 		if (ptr->sampleTable ) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->sampleTable = (GF_SampleTableBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
-GF_Err minf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err minf_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	GF_Err e;
-	e = gf_isom_box_array_read(s, bs, minf_AddBox);
-	if (! ptr->dataInformation) {
-		GF_Box *dinf, *dref, *url;
-		Bool dump_mode = GF_FALSE;
+
+	e = gf_isom_box_array_read(s, bs, minf_on_child_box);
+
+	if (!e && ! ptr->dataInformation) {
+		GF_Box *url;
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing DataInformationBox\n"));
 		//commented on purpose, we are still able to handle the file, we only throw an error but keep processing
 //		e = GF_ISOM_INVALID_FILE;
 
 		//add a dinf box to avoid any access to a null dinf
-		dinf = gf_isom_box_new(GF_ISOM_BOX_TYPE_DINF);
-		if (!dinf) return GF_OUT_OF_MEM;
-		if (ptr->InfoHeader && gf_list_find(ptr->other_boxes, ptr->InfoHeader)>=0) dump_mode = GF_TRUE;
-		if (ptr->sampleTable && gf_list_find(ptr->other_boxes, ptr->sampleTable)>=0) dump_mode = GF_TRUE;
-
-		ptr->dataInformation = (GF_DataInformationBox *)dinf;
-
-		dref = gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
-		if (!dref) return GF_OUT_OF_MEM;
-		e = dinf_AddBox(dinf, dref);
+		ptr->dataInformation = (GF_DataInformationBox *) gf_isom_box_new_parent(&ptr->child_boxes, GF_ISOM_BOX_TYPE_DINF);
+		if (!ptr->dataInformation) return GF_OUT_OF_MEM;
+
+		ptr->dataInformation->dref = (GF_DataReferenceBox *) gf_isom_box_new_parent(&ptr->dataInformation->child_boxes, GF_ISOM_BOX_TYPE_DREF);
+		if (!ptr->dataInformation->dref) return GF_OUT_OF_MEM;
 
-		url = gf_isom_box_new(GF_ISOM_BOX_TYPE_URL);
+		url = gf_isom_box_new_parent(&ptr->dataInformation->dref->child_boxes, GF_ISOM_BOX_TYPE_URL);
 		if (!url) return GF_OUT_OF_MEM;
 		((GF_FullBox*)url)->flags = 1;
-		e = gf_isom_box_add_default(dref, url);
-
-		if (dump_mode) {
-			gf_list_add(ptr->other_boxes, ptr->dataInformation);
-			if (!dinf->other_boxes) dinf->other_boxes = gf_list_new();
-			gf_list_add(dinf->other_boxes, dref);
-		}
 	}
 	return e;
 }
 
-GF_Box *minf_New()
+GF_Box *minf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MediaInformationBox, GF_ISOM_BOX_TYPE_MINF);
 	return (GF_Box *)tmp;
@@ -3546,53 +3501,21 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err minf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err minf_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
-	if (!s) return GF_BAD_PARAM;
-
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	//Header first
-	if (ptr->InfoHeader) {
-		e = gf_isom_box_write((GF_Box *) ptr->InfoHeader, bs);
-		if (e) return e;
-	}
-	//then dataInfo
-	if (ptr->dataInformation) {
-		e = gf_isom_box_write((GF_Box *) ptr->dataInformation, bs);
-		if (e) return e;
-	}
-	//then sampleTable
-	if (ptr->sampleTable) {
-		e = gf_isom_box_write((GF_Box *) ptr->sampleTable, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err minf_Size(GF_Box *s)
+GF_Err minf_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
-
-	if (ptr->InfoHeader) {
-		e = gf_isom_box_size((GF_Box *) ptr->InfoHeader);
-		if (e) return e;
-		ptr->size += ptr->InfoHeader->size;
-	}
-	if (ptr->dataInformation) {
-		e = gf_isom_box_size((GF_Box *) ptr->dataInformation);
-		if (e) return e;
-		ptr->size += ptr->dataInformation->size;
-	}
-	if (ptr->sampleTable) {
-		e = gf_isom_box_size((GF_Box *) ptr->sampleTable);
-		if (e) return e;
-		ptr->size += ptr->sampleTable->size;
-	}
+	//Header first
+	gf_isom_check_position(s, (GF_Box *)ptr->InfoHeader, &pos);
+	//then dataInfo
+	gf_isom_check_position(s, (GF_Box *)ptr->dataInformation, &pos);
+	//then sampleTable
+	gf_isom_check_position(s, (GF_Box *)ptr->sampleTable, &pos);
 	return GF_OK;
 }
 
@@ -3600,40 +3523,40 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void moof_del(GF_Box *s)
+void moof_box_del(GF_Box *s)
 {
 	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *)s;
 	if (ptr == NULL) return;
 
-	if (ptr->mfhd) gf_isom_box_del((GF_Box *) ptr->mfhd);
-	gf_isom_box_array_del(ptr->TrackList);
+	gf_list_del(ptr->TrackList);
+	if (ptr->PSSHs) gf_list_del(ptr->PSSHs);
 	if (ptr->mdat) gf_free(ptr->mdat);
 	gf_free(ptr);
 }
 
-GF_Err moof_AddBox(GF_Box *s, GF_Box *a)
+GF_Err moof_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->mfhd = (GF_MovieFragmentHeaderBox *) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRAF:
 		return gf_list_add(ptr->TrackList, a);
 	case GF_ISOM_BOX_TYPE_PSSH:
-	default:
-		return gf_isom_box_add_default(s, a);
+		if (!ptr->PSSHs) ptr->PSSHs = gf_list_new();
+		return gf_list_add(ptr->PSSHs, a);
 	}
+	return GF_OK;
 }
 
-GF_Err moof_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err moof_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, moof_AddBox);
+	return gf_isom_box_array_read(s, bs, moof_on_child_box);
 }
 
-GF_Box *moof_New()
+GF_Box *moof_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieFragmentBox, GF_ISOM_BOX_TYPE_MOOF);
 	tmp->TrackList = gf_list_new();
@@ -3643,125 +3566,90 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err moof_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err moof_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *) s;
-	if (!s) return GF_BAD_PARAM;
-
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	//Header First
-	if (ptr->mfhd) {
-		e = gf_isom_box_write((GF_Box *) ptr->mfhd, bs);
-		if (e) return e;
-	}
-//then the track list
-return gf_isom_box_array_write(s, ptr->TrackList, bs);
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err moof_Size(GF_Box *s)
+GF_Err moof_box_size(GF_Box *s)
 {
-	GF_Err e;
-	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *)s;
-
-	if (ptr->mfhd) {
-		e = gf_isom_box_size((GF_Box *)ptr->mfhd);
-		if (e) return e;
-		ptr->size += ptr->mfhd->size;
-	}
-	return gf_isom_box_array_size(s, ptr->TrackList);
+	u32 pos=0;
+	GF_MovieFragmentBox *ptr = (GF_MovieFragmentBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	//Header First
+	gf_isom_check_position(s, (GF_Box *)ptr->mfhd, &pos);
+	//then PSSH
+	gf_isom_check_position_list(s, ptr->PSSHs, &pos);
+	//then the track list
+	gf_isom_check_position_list(s, ptr->TrackList, &pos);
+	return GF_OK;
 }
 
 
-
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
-void moov_del(GF_Box *s)
+void moov_box_del(GF_Box *s)
 {
 	GF_MovieBox *ptr = (GF_MovieBox *)s;
 	if (ptr == NULL) return;
-
-	if (ptr->mvhd) gf_isom_box_del((GF_Box *)ptr->mvhd);
-	if (ptr->meta) gf_isom_box_del((GF_Box *)ptr->meta);
-	if (ptr->iods) gf_isom_box_del((GF_Box *)ptr->iods);
-	if (ptr->udta) gf_isom_box_del((GF_Box *)ptr->udta);
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (ptr->mvex) gf_isom_box_del((GF_Box *)ptr->mvex);
-#endif
-
-	gf_isom_box_array_del(ptr->trackList);
+	gf_list_del(ptr->trackList);
 	gf_free(ptr);
 }
 
-
-GF_Err moov_AddBox(GF_Box *s, GF_Box *a)
+GF_Err moov_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->iods = (GF_ObjectDescriptorBox *)a;
 		//if no IOD, delete the box
 		if (!ptr->iods->descriptor) {
 			ptr->iods = NULL;
-			gf_isom_box_del(a);
+			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;
+		ptr->mvhd = (GF_MovieHeaderBox *)a;
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_UDTA:
 		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->udta = (GF_UserDataBox *)a;
+		ptr->udta = (GF_UserDataBox *)a;
 		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 = (GF_MovieExtendsBox *)a;
 		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;
+		ptr->meta = (GF_MetaBox *)a;
 		return GF_OK;
 
 	case GF_ISOM_BOX_TYPE_TRAK:
 		//set our pointer to this obj
 		((GF_TrackBox *)a)->moov = ptr;
 		return gf_list_add(ptr->trackList, a);
-	case GF_ISOM_BOX_TYPE_PSSH:
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
+	return GF_OK;
 }
 
 
-GF_Err moov_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err moov_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	e = gf_isom_box_array_read(s, bs, moov_AddBox);
-	if (e) {
-		return e;
-	}
-	else {
-		if (!((GF_MovieBox *)s)->mvhd) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MovieHeaderBox\n"));
-			return GF_ISOM_INVALID_FILE;
-		}
-	}
-	return e;
+	return gf_isom_box_array_read(s, bs, moov_on_child_box);
 }
 
-GF_Box *moov_New()
+GF_Box *moov_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieBox, GF_ISOM_BOX_TYPE_MOOV);
 	tmp->trackList = gf_list_new();
@@ -3777,140 +3665,95 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err moov_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err moov_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
+	return gf_isom_box_write_header(s, bs);
+}
+
+GF_Err moov_box_size(GF_Box *s)
+{
+	u32 pos=0;
 	GF_MovieBox *ptr = (GF_MovieBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
 
-	if (ptr->mvhd) {
-		e = gf_isom_box_write((GF_Box *) ptr->mvhd, bs);
-		if (e) return e;
-	}
-	if (ptr->iods) {
-		e = gf_isom_box_write((GF_Box *) ptr->iods, bs);
-		if (e) return e;
-	}
-	if (ptr->meta) {
-		e = gf_isom_box_write((GF_Box *) ptr->meta, bs);
-		if (e) return e;
-	}
+	gf_isom_check_position(s, (GF_Box *) ptr->mvhd, &pos);
+	gf_isom_check_position(s, (GF_Box *) ptr->iods, &pos);
+	gf_isom_check_position(s, (GF_Box *) ptr->meta, &pos);
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (ptr->mvex && !ptr->mvex_after_traks) {
-		e = gf_isom_box_write((GF_Box *) ptr->mvex, bs);
-		if (e) return e;
+		gf_isom_check_position(s, (GF_Box *) ptr->mvex, &pos);
 	}
 #endif
-
-	e = gf_isom_box_array_write(s, ptr->trackList, bs);
-	if (e) return e;
+	gf_isom_check_position_list(s, ptr->trackList, &pos);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (ptr->mvex && ptr->mvex_after_traks) {
-		e = gf_isom_box_write((GF_Box *) ptr->mvex, bs);
-		if (e) return e;
+		gf_isom_check_position(s, (GF_Box *) ptr->mvex, &pos);
 	}
 #endif
-
-	if (ptr->udta) {
-		e = gf_isom_box_write((GF_Box *) ptr->udta, bs);
-		if (e) return e;
-	}
 	return GF_OK;
 }
 
-GF_Err moov_Size(GF_Box *s)
-{
-	GF_Err e;
-	GF_MovieBox *ptr = (GF_MovieBox *)s;
-
-	if (ptr->mvhd) {
-		e = gf_isom_box_size((GF_Box *) ptr->mvhd);
-		if (e) return e;
-		ptr->size += ptr->mvhd->size;
-	}
-	if (ptr->iods) {
-		e = gf_isom_box_size((GF_Box *) ptr->iods);
-		if (e) return e;
-		ptr->size += ptr->iods->size;
-	}
-	if (ptr->udta) {
-		e = gf_isom_box_size((GF_Box *) ptr->udta);
-		if (e) return e;
-		ptr->size += ptr->udta->size;
-	}
-	if (ptr->meta) {
-		e = gf_isom_box_size((GF_Box *) ptr->meta);
-		if (e) return e;
-		ptr->size += ptr->meta->size;
-	}
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (ptr->mvex) {
-		e = gf_isom_box_size((GF_Box *) ptr->mvex);
-		if (e) return e;
-		ptr->size += ptr->mvex->size;
-	}
-#endif
-
-	return gf_isom_box_array_size(s, ptr->trackList);
-}
-
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void audio_sample_entry_del(GF_Box *s)
+void audio_sample_entry_box_del(GF_Box *s)
 {
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	if (ptr == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
-
-	if (ptr->esd && (ptr->is_qtff!=2))
-		gf_isom_box_del((GF_Box *)ptr->esd);
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
-	if (ptr->cfg_opus) gf_isom_box_del((GF_Box *)ptr->cfg_opus);
-	if (ptr->cfg_ac3) gf_isom_box_del((GF_Box *)ptr->cfg_ac3);
-	if (ptr->cfg_3gpp) gf_isom_box_del((GF_Box *)ptr->cfg_3gpp);
 	gf_free(ptr);
 }
 
-GF_Err audio_sample_entry_AddBox(GF_Box *s, GF_Box *a)
+GF_Err audio_sample_entry_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_UnknownBox *wave = NULL;
 	Bool drop_wave=GF_FALSE;
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
+
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_ESDS:
 		if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->esd = (GF_ESDBox *)a;
-		ptr->is_qtff = 0;
-		break;
-	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(ptr->protections, a);
+		ptr->esd = (GF_ESDBox *)a;
+		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
+
 	case GF_ISOM_BOX_TYPE_DAMR:
 	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;
 		/*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;
+		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;
+		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;
 		break;
 	case GF_ISOM_BOX_TYPE_MHA1:
 	case GF_ISOM_BOX_TYPE_MHA2:
 	case GF_ISOM_BOX_TYPE_MHM1:
 	case GF_ISOM_BOX_TYPE_MHM2:
+		if (ptr->cfg_mha) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->cfg_mha = (GF_MHAConfigBox *) a;
+		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;
+		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		break;
 
 	case GF_ISOM_BOX_TYPE_UNKNOWN:
@@ -3920,71 +3763,100 @@
 			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->other_boxes)) {
+ 			if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->child_boxes)) {
  				u32 i;
-                for (i =0; i<gf_list_count(wave->other_boxes); i++) {
-                    GF_Box *inner_box = (GF_Box *)gf_list_get(wave->other_boxes, i);
+                for (i =0; i<gf_list_count(wave->child_boxes); i++) {
+                    GF_Box *inner_box = (GF_Box *)gf_list_get(wave->child_boxes, i);
                     if (inner_box->type == GF_ISOM_BOX_TYPE_ESDS) {
                         ptr->esd = (GF_ESDBox *)inner_box;
- 						if (ptr->is_qtff & 1<<16) {
-                        	gf_list_rem(a->other_boxes, i);
+ 						if (ptr->qtff_mode & GF_ISOM_AUDIO_QTFF_CONVERT_FLAG) {
+                        	gf_list_rem(a->child_boxes, i);
                         	drop_wave=GF_TRUE;
+                        	ptr->compression_id = 0;
+                        	gf_list_add(ptr->child_boxes, inner_box);
 						}
                     }
                 }
 				if (drop_wave) {
-					gf_isom_box_del(a);
-                	ptr->is_qtff = 0;
+					gf_isom_box_del_parent(&ptr->child_boxes, a);
+                	ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
+					ptr->version = 0;
 					return GF_OK;
 				}
-                ptr->is_qtff = 2;
-                return gf_isom_box_add_default(s, a);
+                ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_EXT_VALID;
+                return GF_OK;
             }
-            gf_isom_box_del(a);
+            gf_isom_box_del_parent(&ptr->child_boxes, a);
             return GF_ISOM_INVALID_MEDIA;
 
 		}
- 		ptr->is_qtff &= ~(1<<16);
+ 		ptr->qtff_mode &= ~GF_ISOM_AUDIO_QTFF_CONVERT_FLAG;
 
- 		if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->other_boxes)) {
-			ptr->is_qtff = 2;
+ 		if ((wave->original_4cc == GF_QT_BOX_TYPE_WAVE) && gf_list_count(wave->child_boxes)) {
+			ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_NOEXT;
 		}
-		return gf_isom_box_add_default(s, a);
+		return GF_OK;
 	case GF_QT_BOX_TYPE_WAVE:
+	{
+		u32 subtype = 0;
+		GF_Box **cfg_ptr = NULL;
 		if (s->type == GF_ISOM_BOX_TYPE_MP4A) {
-			if (ptr->esd) ERROR_ON_DUPLICATED_BOX(a, ptr)
+			cfg_ptr = (GF_Box **) &ptr->esd;
+			subtype = GF_ISOM_BOX_TYPE_ESDS;
+		}
+		else if (s->type == GF_ISOM_BOX_TYPE_AC3) {
+			cfg_ptr = (GF_Box **) &ptr->cfg_ac3;
+			subtype = GF_ISOM_BOX_TYPE_DAC3;
+		}
+		else if (s->type == GF_ISOM_BOX_TYPE_EC3) {
+			cfg_ptr = (GF_Box **) &ptr->cfg_ac3;
+			subtype = GF_ISOM_BOX_TYPE_DEC3;
+		}
+		else if (s->type == GF_ISOM_BOX_TYPE_OPUS) {
+			cfg_ptr = (GF_Box **) &ptr->cfg_opus;
+			subtype = GF_ISOM_BOX_TYPE_DOPS;
+		}
+		else if ((s->type == GF_ISOM_BOX_TYPE_MHA1) || (s->type == GF_ISOM_BOX_TYPE_MHA2)) {
+			cfg_ptr = (GF_Box **) &ptr->cfg_mha;
+			subtype = GF_ISOM_BOX_TYPE_MHAC;
+		}
+
+		if (cfg_ptr) {
+			if (*cfg_ptr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 
 			//wave subboxes may have been properly parsed
- 			if (gf_list_count(a->other_boxes)) {
+ 			if (gf_list_count(a->child_boxes)) {
  				u32 i;
-                for (i =0; i<gf_list_count(a->other_boxes); i++) {
-                    GF_Box *inner_box = (GF_Box *)gf_list_get(a->other_boxes, i);
-                    if (inner_box->type == GF_ISOM_BOX_TYPE_ESDS) {
-                        ptr->esd = (GF_ESDBox *)inner_box;
- 						if (ptr->is_qtff & 1<<16) {
-                        	gf_list_rem(a->other_boxes, i);
+                for (i =0; i<gf_list_count(a->child_boxes); i++) {
+                    GF_Box *inner_box = (GF_Box *)gf_list_get(a->child_boxes, i);
+                    if (inner_box->type == subtype) {
+                        *cfg_ptr = inner_box;
+ 						if (ptr->qtff_mode & GF_ISOM_AUDIO_QTFF_CONVERT_FLAG) {
+                        	gf_list_rem(a->child_boxes, i);
                         	drop_wave=GF_TRUE;
+                        	gf_list_add(ptr->child_boxes, inner_box);
 						}
 						break;
                     }
                 }
 				if (drop_wave) {
-					gf_isom_box_del(a);
-                	ptr->is_qtff = 0;
+					gf_isom_box_del_parent(&ptr->child_boxes, a);
+                	ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
+					ptr->compression_id = 0;
+					ptr->version = 0;
 					return GF_OK;
 				}
-                ptr->is_qtff = 2;
-                return gf_isom_box_add_default(s, a);
+                ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_EXT_VALID;
+                return GF_OK;
             }
 		}
- 		ptr->is_qtff = 2;
-		return gf_isom_box_add_default(s, a);
-	default:
-		return gf_isom_box_add_default(s, a);
+	}
+ 		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_EXT_VALID;
+		return GF_OK;
 	}
 	return GF_OK;
 }
-GF_Err audio_sample_entry_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err audio_sample_entry_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MPEGAudioSampleEntryBox *ptr;
 	char *data;
@@ -3999,7 +3871,7 @@
 	gf_bs_seek(bs, start + 8);
 	v = gf_bs_read_u16(bs);
 	if (v)
-		ptr->is_qtff = 1;
+		ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_NOEXT;
 
 	//try to disambiguate QTFF v1 and MP4 v1 audio sample entries ...
 	if (v==1) {
@@ -4014,7 +3886,7 @@
 		if (isalnum(b)) nb_alnum++;
 		if (isalnum(c)) nb_alnum++;
 		if (isalnum(d)) nb_alnum++;
-		if (nb_alnum>2) ptr->is_qtff = 0;
+		if (nb_alnum>2) ptr->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 	}
 
 	gf_bs_seek(bs, start);
@@ -4025,24 +3897,53 @@
 
 	//when cookie is set on bs, always convert qtff-style mp4a to isobmff-style
 	//since the conversion is done in addBox and we don't have the bitstream there (arg...), flag the box
- 	if (gf_bs_get_cookie(bs)) {
- 		ptr->is_qtff |= 1<<16;
+ 	if (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_QT_CONV) {
+ 		ptr->qtff_mode |= GF_ISOM_AUDIO_QTFF_CONVERT_FLAG;
  	}
 
-	e = gf_isom_box_array_read(s, bs, audio_sample_entry_AddBox);
-	if (!e) return GF_OK;
+	e = gf_isom_box_array_read(s, bs, audio_sample_entry_on_child_box);
+	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);
+
+			if (sinf && sinf->original_format) {
+				u32 type = sinf->original_format->data_format;
+				switch (type) {
+				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:
+					if (ptr->cfg_3gpp) ptr->cfg_3gpp->cfg.type = type;
+					break;
+				}
+			}
+		}
+		return GF_OK;
+	}
 	if (size<8) return GF_ISOM_INVALID_FILE;
 
+
 	/*hack for some weird files (possibly recorded with live.com tools, needs further investigations)*/
 	gf_bs_seek(bs, pos);
 	data = (char*)gf_malloc(sizeof(char) * size);
+	if (!data) return GF_OUT_OF_MEM;
+
 	gf_bs_read_data(bs, data, size);
 	for (i=0; i<size-8; i++) {
 		if (GF_4CC((u32)data[i+4], (u8)data[i+5], (u8)data[i+6], (u8)data[i+7]) == GF_ISOM_BOX_TYPE_ESDS) {
 			GF_BitStream *mybs = gf_bs_new(data + i, size - i, GF_BITSTREAM_READ);
+			if (ptr->esd) gf_isom_box_del_parent(&ptr->child_boxes, (GF_Box *)ptr->esd);
+			ptr->esd = NULL;
 			e = gf_isom_box_parse((GF_Box **)&ptr->esd, mybs);
-			if (!e) gf_isom_box_add_for_dump_mode((GF_Box*)ptr, (GF_Box*)ptr->esd);
 			gf_bs_del(mybs);
+			if (e==GF_OK) {
+				if (!ptr->child_boxes) ptr->child_boxes = gf_list_new();
+				gf_list_add(ptr->child_boxes, ptr->esd);
+			} else if (ptr->esd) {
+				gf_isom_box_del((GF_Box *)ptr->esd);
+				ptr->esd = NULL;
+			}
 			break;
 		}
 	}
@@ -4050,14 +3951,14 @@
 	return e;
 }
 
-GF_Box *audio_sample_entry_New()
+GF_Box *audio_sample_entry_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGAudioSampleEntryBox, GF_ISOM_BOX_TYPE_MP4A);
 	gf_isom_audio_sample_entry_init((GF_AudioSampleEntryBox*)tmp);
 	return (GF_Box *)tmp;
 }
 
-GF_Box *enca_New()
+GF_Box *enca_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGAudioSampleEntryBox, GF_ISOM_BOX_TYPE_ENCA);
 	gf_isom_audio_sample_entry_init((GF_AudioSampleEntryBox*)tmp);
@@ -4067,73 +3968,35 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err audio_sample_entry_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err audio_sample_entry_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_isom_audio_sample_entry_write((GF_AudioSampleEntryBox*)s, bs);
-
-	if (ptr->is_qtff)
-		return gf_isom_box_array_write(s, ptr->protections, bs);
-
-	if (ptr->esd) {
-		e = gf_isom_box_write((GF_Box *)ptr->esd, bs);
-		if (e) return e;
-	}
-	if (ptr->cfg_3gpp) {
-		e = gf_isom_box_write((GF_Box *)ptr->cfg_3gpp, bs);
-		if (e) return e;
-	}
-	if (ptr->cfg_opus) {
-		e = gf_isom_box_write((GF_Box *)ptr->cfg_opus, bs);
-		if (e) return e;
-	}
-	if (ptr->cfg_ac3) {
-		e = gf_isom_box_write((GF_Box *)ptr->cfg_ac3, bs);
-		if (e) return e;
-	}
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err audio_sample_entry_Size(GF_Box *s)
+GF_Err audio_sample_entry_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_MPEGAudioSampleEntryBox *ptr = (GF_MPEGAudioSampleEntryBox *)s;
-
 	gf_isom_audio_sample_entry_size((GF_AudioSampleEntryBox*)s);
+	if (ptr->qtff_mode)
+		return GF_OK;
 
-	if (ptr->is_qtff)
-		return gf_isom_box_array_size(s, ptr->protections);
-
-	if (ptr->esd) {
-		e = gf_isom_box_size((GF_Box *)ptr->esd);
-		if (e) return e;
-		ptr->size += ptr->esd->size;
-	}
-	if (ptr->cfg_3gpp) {
-		e = gf_isom_box_size((GF_Box *)ptr->cfg_3gpp);
-		if (e) return e;
-		ptr->size += ptr->cfg_3gpp->size;
-	}
-	if (ptr->cfg_opus) {
-		e = gf_isom_box_size((GF_Box *)ptr->cfg_opus);
-		if (e) return e;
-		ptr->size += ptr->cfg_opus->size;
-	}
-	if (ptr->cfg_ac3) {
-		e = gf_isom_box_size((GF_Box *)ptr->cfg_ac3);
-		if (e) return e;
-		ptr->size += ptr->cfg_ac3->size;
-	}
-	return gf_isom_box_array_size(s, ptr->protections);
+	gf_isom_check_position(s, (GF_Box *)ptr->esd, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->cfg_3gpp, &pos);
+	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);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void gen_sample_entry_del(GF_Box *s)
+void gen_sample_entry_box_del(GF_Box *s)
 {
 	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
 	if (ptr == NULL) return;
@@ -4142,17 +4005,17 @@
 }
 
 
-GF_Err gen_sample_entry_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gen_sample_entry_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	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, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
-GF_Box *gen_sample_entry_New()
+GF_Box *gen_sample_entry_box_new()
 {
-	ISOM_DECL_BOX_ALLOC(GF_SampleEntryBox, GF_QT_BOX_TYPE_C608);//type will be overriten
+	ISOM_DECL_BOX_ALLOC(GF_SampleEntryBox, GF_QT_SUBTYPE_C608);//type will be overriten
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
 	return (GF_Box *)tmp;
 }
@@ -4160,7 +4023,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gen_sample_entry_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gen_sample_entry_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
@@ -4169,47 +4032,40 @@
 
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err gen_sample_entry_Size(GF_Box *s)
+GF_Err gen_sample_entry_box_size(GF_Box *s)
 {
 	GF_SampleEntryBox *ptr = (GF_SampleEntryBox *)s;
 	ptr->size += 8;
-	return gf_isom_box_array_size(s, ptr->protections);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void mp4s_del(GF_Box *s)
+void mp4s_box_del(GF_Box *s)
 {
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
 	if (ptr == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
-
-	if (ptr->esd) gf_isom_box_del((GF_Box *)ptr->esd);
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
 	gf_free(ptr);
 }
 
-GF_Err mp4s_AddBox(GF_Box *s, GF_Box *a)
+GF_Err mp4s_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
-		break;
-	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(ptr->protections, a);
+		ptr->esd = (GF_ESDBox *)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err mp4s_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mp4s_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
@@ -4218,27 +4074,29 @@
 	if (e) return e;
 
 	ISOM_DECREASE_SIZE(ptr, 8);
-	return gf_isom_box_array_read(s, bs, mp4s_AddBox);
+	return gf_isom_box_array_read(s, bs, mp4s_on_child_box);
 }
 
-GF_Box *mp4s_New()
+GF_Box *mp4s_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGSampleEntryBox, GF_ISOM_BOX_TYPE_MP4S);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	tmp->internal_type = GF_ISOM_SAMPLE_ENTRY_MP4S;
 	return (GF_Box *)tmp;
 }
 
-GF_Box *encs_New()
+GF_Box *encs_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGSampleEntryBox, GF_ISOM_BOX_TYPE_ENCS);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	tmp->internal_type = GF_ISOM_SAMPLE_ENTRY_MP4S;
 	return (GF_Box *)tmp;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mp4s_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mp4s_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
@@ -4247,72 +4105,39 @@
 	if (e) return e;
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
-	e = gf_isom_box_write((GF_Box *)ptr->esd, bs);
-	if (e) return e;
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+    return GF_OK;
 }
 
-GF_Err mp4s_Size(GF_Box *s)
+GF_Err mp4s_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_MPEGSampleEntryBox *ptr = (GF_MPEGSampleEntryBox *)s;
-
-	ptr->size += 8;
-	e = gf_isom_box_size((GF_Box *)ptr->esd);
-	if (e) return e;
-	ptr->size += ptr->esd->size;
-	return gf_isom_box_array_size(s, ptr->protections);
+	s->size += 8;
+	gf_isom_check_position(s, (GF_Box *)ptr->esd, &pos);
+    return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void video_sample_entry_del(GF_Box *s)
+void video_sample_entry_box_del(GF_Box *s)
 {
 	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
 	if (ptr == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
 
-	if (ptr->esd) gf_isom_box_del((GF_Box *)ptr->esd);
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
 	/*for publishing*/
 	if (ptr->emul_esd) gf_odf_desc_del((GF_Descriptor *)ptr->emul_esd);
-
-	if (ptr->avc_config) gf_isom_box_del((GF_Box *) ptr->avc_config);
-	if (ptr->svc_config) gf_isom_box_del((GF_Box *) ptr->svc_config);
-	if (ptr->mvc_config) gf_isom_box_del((GF_Box *) ptr->mvc_config);
-	if (ptr->hevc_config) gf_isom_box_del((GF_Box *) ptr->hevc_config);
-	if (ptr->lhvc_config) gf_isom_box_del((GF_Box *) ptr->lhvc_config);
-	if (ptr->av1_config) gf_isom_box_del((GF_Box *)ptr->av1_config);
-	if (ptr->vp_config) gf_isom_box_del((GF_Box *)ptr->vp_config);
-	if (ptr->cfg_3gpp) gf_isom_box_del((GF_Box *)ptr->cfg_3gpp);
-
-	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
-	if (ptr->ipod_ext) gf_isom_box_del((GF_Box *)ptr->ipod_ext);
-
-	if (ptr->pasp) gf_isom_box_del((GF_Box *)ptr->pasp);
-	if (ptr->clap) gf_isom_box_del((GF_Box *)ptr->clap);
-	if (ptr->colr) gf_isom_box_del((GF_Box*)ptr->colr);
-	if (ptr->mdcv) gf_isom_box_del((GF_Box*)ptr->mdcv);
-	if (ptr->clli) gf_isom_box_del((GF_Box*)ptr->clli);
-	if (ptr->rinf) gf_isom_box_del((GF_Box *)ptr->rinf);
-	if (ptr->ccst) gf_isom_box_del((GF_Box *)ptr->ccst);
-
-	if (ptr->rvcc) gf_isom_box_del((GF_Box *)ptr->rvcc);
-	if (ptr->auxi) gf_isom_box_del((GF_Box *)ptr->auxi);
-
 	gf_free(ptr);
 }
 
-GF_Err video_sample_entry_AddBox(GF_Box *s, GF_Box *a)
+GF_Err video_sample_entry_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
-		break;
-	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(ptr->protections, a);
+		ptr->esd = (GF_ESDBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_RINF:
 		if (ptr->rinf) ERROR_ON_DUPLICATED_BOX(a, ptr)
@@ -4320,108 +4145,110 @@
 		break;
 	case GF_ISOM_BOX_TYPE_AVCC:
 		if (ptr->avc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->avc_config = (GF_AVCConfigurationBox *)a;
+		ptr->avc_config = (GF_AVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_HVCC:
 		if (ptr->hevc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->hevc_config = (GF_HEVCConfigurationBox *)a;
+		ptr->hevc_config = (GF_HEVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SVCC:
 		if (ptr->svc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->svc_config = (GF_AVCConfigurationBox *)a;
+		ptr->svc_config = (GF_AVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_MVCC:
 		if (ptr->mvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->mvc_config = (GF_AVCConfigurationBox *)a;
+		ptr->mvc_config = (GF_AVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_LHVC:
 		if (ptr->lhvc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->lhvc_config = (GF_HEVCConfigurationBox *)a;
+		ptr->lhvc_config = (GF_HEVCConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_AV1C:
 		if (ptr->av1_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->av1_config = (GF_AV1ConfigurationBox *)a;
+		ptr->av1_config = (GF_AV1ConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_VPCC:
 		if (ptr->vp_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->vp_config = (GF_VPConfigurationBox *)a;
+		ptr->vp_config = (GF_VPConfigurationBox *)a;
 		break;
-	case GF_ISOM_BOX_TYPE_M4DS:
-		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
+	case GF_ISOM_BOX_TYPE_DVCC:
+		if (ptr->dovi_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->dovi_config = (GF_DOVIConfigurationBox*)a;
 		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;
 		} else {
-			return gf_isom_box_add_default(s, a);
+			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;
 		/*for 3GP config, remember sample entry type in config*/
 		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;
+		return GF_OK;
+
 	case GF_ISOM_BOX_TYPE_PASP:
-		if (ptr->pasp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->pasp = (GF_PixelAspectRatioBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_CLAP:
-		if (ptr->clap) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->clap = (GF_CleanApertureBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_COLR:
-		if (ptr->colr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->colr = (GF_ColourInformationBox*)a;
-		break;
 	case GF_ISOM_BOX_TYPE_MDCV:
-		if (ptr->mdcv) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->mdcv = (GF_MasteringDisplayColourVolumeBox*)a;
-		break;
 	case GF_ISOM_BOX_TYPE_CLLI:
-		if (ptr->clli) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->clli = (GF_ContentLightLevelBox*)a;
-		break;
 	case GF_ISOM_BOX_TYPE_CCST:
-		if (ptr->ccst) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->ccst = (GF_CodingConstraintsBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_AUXI:
-		if (ptr->auxi) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->auxi = (GF_AuxiliaryTypeInfoBox *)a;
-		break;
 	case GF_ISOM_BOX_TYPE_RVCC:
-		if (ptr->rvcc) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->rvcc = (GF_RVCConfigurationBox *)a;
-		break;
-	default:
-		return gf_isom_box_add_default(s, a);
+	case GF_ISOM_BOX_TYPE_M4DS:
+		if (!gf_isom_box_check_unique(s->child_boxes, a)) {
+			ERROR_ON_DUPLICATED_BOX(a, ptr)
+		}
+		return GF_OK;
 	}
 	return GF_OK;
 }
 
-GF_Err video_sample_entry_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err video_sample_entry_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MPEGVisualSampleEntryBox *mp4v = (GF_MPEGVisualSampleEntryBox*)s;
 	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_AddBox);
+	e = gf_isom_box_array_read(s, bs, video_sample_entry_on_child_box);
 	if (e) return e;
 	/*this is an AVC sample desc*/
-	if (mp4v->avc_config || mp4v->svc_config || mp4v->mvc_config) AVC_RewriteESDescriptor(mp4v);
+	if (mp4v->avc_config || mp4v->svc_config || mp4v->mvc_config)
+		AVC_RewriteESDescriptor(mp4v);
 	/*this is an HEVC sample desc*/
 	if (mp4v->hevc_config || mp4v->lhvc_config || (mp4v->type==GF_ISOM_BOX_TYPE_HVT1))
 		HEVC_RewriteESDescriptor(mp4v);
 	/*this is an AV1 sample desc*/
 	if (mp4v->av1_config)
 		AV1_RewriteESDescriptor(mp4v);
+	/*this is a VP8-9 sample desc*/
+	if (mp4v->vp_config)
+		VP9_RewriteESDescriptor(mp4v);
+
+	if (s->type==GF_ISOM_BOX_TYPE_ENCV) {
+		GF_ProtectionSchemeInfoBox *sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(s->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+
+		if (sinf && sinf->original_format) {
+			u32 type = sinf->original_format->data_format;
+			switch (type) {
+			case GF_ISOM_SUBTYPE_3GP_H263:
+				if (mp4v->cfg_3gpp) mp4v->cfg_3gpp->cfg.type = type;
+				break;
+			}
+		}
+	}
 	return GF_OK;
 }
 
-GF_Box *video_sample_entry_New()
+GF_Box *video_sample_entry_box_new()
 {
 	GF_MPEGVisualSampleEntryBox *tmp;
 	GF_SAFEALLOC(tmp, GF_MPEGVisualSampleEntryBox);
@@ -4434,257 +4261,48 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err video_sample_entry_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err video_sample_entry_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
-	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_isom_video_sample_entry_write((GF_VisualSampleEntryBox *)s, bs);
-
-	/*mp4v*/
-	if (ptr->esd) {
-		e = gf_isom_box_write((GF_Box *)ptr->esd, bs);
-		if (e) return e;
-	}
-	/*mp4v*/
-	else if (ptr->cfg_3gpp) {
-		e = gf_isom_box_write((GF_Box *)ptr->cfg_3gpp, bs);
-		if (e) return e;
-	}
-	/*avc or hevc or av1*/
-	else {
-		if (ptr->avc_config && ptr->avc_config->config) {
-			e = gf_isom_box_write((GF_Box *) ptr->avc_config, bs);
-			if (e) return e;
-		}
-		if (ptr->hevc_config && ptr->hevc_config->config) {
-			e = gf_isom_box_write((GF_Box *) ptr->hevc_config, bs);
-			if (e) return e;
-		}
-		if (ptr->ipod_ext)	{
-			e = gf_isom_box_write((GF_Box *) ptr->ipod_ext, bs);
-			if (e) return e;
-		}
-		if (ptr->descr)	{
-			e = gf_isom_box_write((GF_Box *) ptr->descr, bs);
-			if (e) return e;
-		}
-		if (ptr->svc_config && ptr->svc_config->config) {
-			e = gf_isom_box_write((GF_Box *) ptr->svc_config, bs);
-			if (e) return e;
-		}
-		if (ptr->mvc_config && ptr->mvc_config->config) {
-			e = gf_isom_box_write((GF_Box *) ptr->mvc_config, bs);
-			if (e) return e;
-		}
-		if (ptr->lhvc_config && ptr->lhvc_config->config) {
-			e = gf_isom_box_write((GF_Box *) ptr->lhvc_config, bs);
-			if (e) return e;
-		}
-		if (ptr->av1_config && ptr->av1_config->config) {
-			e = gf_isom_box_write((GF_Box *)ptr->av1_config, bs);
-			if (e) return e;
-		}
-		if (ptr->vp_config && ptr->vp_config->config) {
-			e = gf_isom_box_write((GF_Box *)ptr->vp_config, bs);
-			if (e) return e;
-		}
-	}
-	if (ptr->clap) {
-		e = gf_isom_box_write((GF_Box*)ptr->clap, bs);
-		if (e) return e;
-	}
-	if (ptr->pasp) {
-		e = gf_isom_box_write((GF_Box *)ptr->pasp, bs);
-		if (e) return e;
-	}
-	if (ptr->colr) {
-		e = gf_isom_box_write((GF_Box*)ptr->colr, bs);
-		if (e) return e;
-	}
-	if (ptr->mdcv) {
-		e = gf_isom_box_write((GF_Box*)ptr->mdcv, bs);
-		if (e) return e;
-	}
-	if (ptr->clli) {
-		e = gf_isom_box_write((GF_Box*)ptr->clli, bs);
-		if (e) return e;
-	}
-	if (ptr->ccst) {
-		e = gf_isom_box_write((GF_Box *)ptr->ccst, bs);
-		if (e) return e;
-	}
-	if (ptr->auxi) {
-		e = gf_isom_box_write((GF_Box *)ptr->auxi, bs);
-		if (e) return e;
-	}
-	if (ptr->rvcc) {
-		e = gf_isom_box_write((GF_Box *)ptr->rvcc, bs);
-		if (e) return e;
-	}
-	if (ptr->rinf) {
-		e = gf_isom_box_write((GF_Box *)ptr->rinf, bs);
-		if (e) return e;
-	}
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err video_sample_entry_Size(GF_Box *s)
+GF_Err video_sample_entry_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
-
 	gf_isom_video_sample_entry_size((GF_VisualSampleEntryBox *)s);
 
-	if (ptr->esd) {
-		e = gf_isom_box_size((GF_Box *)ptr->esd);
-		if (e) return e;
-		ptr->size += ptr->esd->size;
-	} else if (ptr->cfg_3gpp) {
-		e = gf_isom_box_size((GF_Box *)ptr->cfg_3gpp);
-		if (e) return e;
-		ptr->size += ptr->cfg_3gpp->size;
-	} else {
-		switch (ptr->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_SVC2:
-		case GF_ISOM_BOX_TYPE_MVC1:
-		case GF_ISOM_BOX_TYPE_MVC2:
-			if (!ptr->avc_config && !ptr->svc_config  && !ptr->mvc_config)
-				return GF_ISOM_INVALID_FILE;
-			break;
-		case GF_ISOM_BOX_TYPE_VP08:
-		case GF_ISOM_BOX_TYPE_VP09:
-			if (!ptr->vp_config) {
-				return GF_ISOM_INVALID_FILE;
-			}
-			break;
-		case GF_ISOM_BOX_TYPE_AV01:
-			if (!ptr->av1_config) {
-				return GF_ISOM_INVALID_FILE;
-			}
-			break;
-		case GF_ISOM_BOX_TYPE_HVC1:
-		case GF_ISOM_BOX_TYPE_HEV1:
-		case GF_ISOM_BOX_TYPE_HVC2:
-		case GF_ISOM_BOX_TYPE_HEV2:
-		case GF_ISOM_BOX_TYPE_LHV1:
-		case GF_ISOM_BOX_TYPE_LHE1:
-		//commented on purpose, HVT1 tracks have no config associated
-//		case GF_ISOM_BOX_TYPE_HVT1:
-//		case GF_ISOM_BOX_TYPE_HVT2:
-			if (!ptr->hevc_config && !ptr->lhvc_config) {
-				return GF_ISOM_INVALID_FILE;
-			}
-			break;
-		default:
-			break;
-		}
-
-		if (ptr->hevc_config && ptr->hevc_config->config) {
-			e = gf_isom_box_size((GF_Box *)ptr->hevc_config);
-			if (e) return e;
-			ptr->size += ptr->hevc_config->size;
-		}
-
-		if (ptr->avc_config && ptr->avc_config->config) {
-			e = gf_isom_box_size((GF_Box *) ptr->avc_config);
-			if (e) return e;
-			ptr->size += ptr->avc_config->size;
-		}
-
-		if (ptr->svc_config && ptr->svc_config->config) {
-			e = gf_isom_box_size((GF_Box *) ptr->svc_config);
-			if (e) return e;
-			ptr->size += ptr->svc_config->size;
-		}
+	/*make sure we write the config box first, we don't care about the rest*/
 
-		if (ptr->mvc_config && ptr->mvc_config->config) {
-			e = gf_isom_box_size((GF_Box *) ptr->mvc_config);
-			if (e) return e;
-			ptr->size += ptr->mvc_config->size;
-		}
+	/*mp4v*/
+	gf_isom_check_position(s, (GF_Box *)ptr->esd, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->cfg_3gpp, &pos);
+	/*avc / SVC + MVC*/
+	gf_isom_check_position(s, (GF_Box *)ptr->avc_config, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->svc_config, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->mvc_config, &pos);
+
+	/*HEVC*/
+	gf_isom_check_position(s, (GF_Box *)ptr->hevc_config, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->lhvc_config, &pos);
+
+	/*AV1*/
+	gf_isom_check_position(s, (GF_Box *)ptr->av1_config, &pos);
 
-		if (ptr->lhvc_config && ptr->lhvc_config->config) {
-			e = gf_isom_box_size((GF_Box *) ptr->lhvc_config);
-			if (e) return e;
-			ptr->size += ptr->lhvc_config->size;
-		}
+	/*VPx*/
+	gf_isom_check_position(s, (GF_Box *)ptr->vp_config, &pos);
 
-		if (ptr->av1_config && ptr->av1_config->config) {
-			e = gf_isom_box_size((GF_Box *)ptr->av1_config);
-			if (e) return e;
-			ptr->size += ptr->av1_config->size;
-		}
+	/*JP2H*/
+	gf_isom_check_position(s, (GF_Box *)ptr->jp2h, &pos);
 
-		if (ptr->vp_config && ptr->vp_config->config) {
-			e = gf_isom_box_size((GF_Box *)ptr->vp_config);
-			if (e) return e;
-			ptr->size += ptr->vp_config->size;
-		}
+	/*DolbyVision*/
+	gf_isom_check_position(s, (GF_Box *)ptr->dovi_config, &pos);
 
-		if (ptr->ipod_ext) {
-			e = gf_isom_box_size((GF_Box *) ptr->ipod_ext);
-			if (e) return e;
-			ptr->size += ptr->ipod_ext->size;
-		}
-		if (ptr->descr) {
-			e = gf_isom_box_size((GF_Box *) ptr->descr);
-			if (e) return e;
-			ptr->size += ptr->descr->size;
-		}
-	}
-	if (ptr->pasp) {
-		e = gf_isom_box_size((GF_Box *)ptr->pasp);
-		if (e) return e;
-		ptr->size += ptr->pasp->size;
-	}
-	if (ptr->colr) {
-		e = gf_isom_box_size((GF_Box*)ptr->colr);
-		if (e) return e;
-		ptr->size += ptr->colr->size;
-	}
-	if (ptr->mdcv) {
-		e = gf_isom_box_size((GF_Box*)ptr->mdcv);
-		if (e) return e;
-		ptr->size += ptr->mdcv->size;
-	}
-	if (ptr->clli) {
-		e = gf_isom_box_size((GF_Box*)ptr->clli);
-		if (e) return e;
-		ptr->size += ptr->clli->size;
-	}
-	if (ptr->clap) {
-		e = gf_isom_box_size((GF_Box *)ptr->clap);
-		if (e) return e;
-		ptr->size += ptr->clap->size;
-	}
-	if (ptr->ccst) {
-		e = gf_isom_box_size((GF_Box *)ptr->ccst);
-		if (e) return e;
-		ptr->size += ptr->ccst->size;
-	}
-	if (ptr->auxi) {
-		e = gf_isom_box_size((GF_Box *)ptr->auxi);
-		if (e) return e;
-		ptr->size += ptr->auxi->size;
-	}
-	if (ptr->rvcc) {
-		e = gf_isom_box_size((GF_Box *)ptr->rvcc);
-		if (e) return e;
-		ptr->size += ptr->rvcc->size;
-	}
-	if (ptr->rinf) {
-		e = gf_isom_box_size((GF_Box *)ptr->rinf);
-		if (e) return e;
-		ptr->size += ptr->rinf->size;
-	}
-	return gf_isom_box_array_size(s, ptr->protections);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -4693,21 +4311,17 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void mvex_del(GF_Box *s)
+void mvex_box_del(GF_Box *s)
 {
 	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->mehd) gf_isom_box_del((GF_Box*)ptr->mehd);
-	gf_isom_box_array_del(ptr->TrackExList);
-	gf_isom_box_array_del(ptr->TrackExPropList);
-	ptr->mehd = NULL;
-	ptr->TrackExList = NULL;
-	ptr->TrackExPropList = NULL;
+	gf_list_del(ptr->TrackExList);
+	gf_list_del(ptr->TrackExPropList);
 	gf_free(ptr);
 }
 
 
-GF_Err mvex_AddBox(GF_Box *s, GF_Box *a)
+GF_Err mvex_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *)s;
 
@@ -4717,23 +4331,21 @@
 	case GF_ISOM_BOX_TYPE_TREP:
 		return gf_list_add(ptr->TrackExPropList, a);
 	case GF_ISOM_BOX_TYPE_MEHD:
-		if (ptr->mehd) break;
+		if (ptr->mehd) ERROR_ON_DUPLICATED_BOX(a, s)
 		ptr->mehd = (GF_MovieExtendsHeaderBox*)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
 
-GF_Err mvex_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mvex_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, mvex_AddBox);
+	return gf_isom_box_array_read(s, bs, mvex_on_child_box);
 }
 
-GF_Box *mvex_New()
+GF_Box *mvex_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieExtendsBox, GF_ISOM_BOX_TYPE_MVEX);
 	tmp->TrackExList = gf_list_new();
@@ -4755,63 +4367,49 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err mvex_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mvex_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *) s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	if (ptr->mehd) {
-		e = gf_isom_box_write((GF_Box *)ptr->mehd, bs);
-		if (e) return e;
-	}
-	e = gf_isom_box_array_write(s, ptr->TrackExList, bs);
-	if (e) return e;
-	return gf_isom_box_array_write(s, ptr->TrackExPropList, bs);
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err mvex_Size(GF_Box *s)
+GF_Err mvex_box_size(GF_Box *s)
 {
-	GF_Err e;
-	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *)s;
-
-	if (ptr->mehd) {
-		e = gf_isom_box_size((GF_Box *)ptr->mehd);
-		if (e) return e;
-		ptr->size += ptr->mehd->size;
-	}
-	e = gf_isom_box_array_size(s, ptr->TrackExList);
-	if (e) return e;
-	return gf_isom_box_array_size(s, ptr->TrackExPropList);
+	u32 pos=0;
+	GF_MovieExtendsBox *ptr = (GF_MovieExtendsBox *) s;
+	gf_isom_check_position(s, (GF_Box *)ptr->mehd, &pos);
+	gf_isom_check_position_list(s, ptr->TrackExList, &pos);
+	gf_isom_check_position_list(s, ptr->TrackExPropList, &pos);
+	return GF_OK;
 }
 
 
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *mehd_New()
+GF_Box *mehd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieExtendsHeaderBox, GF_ISOM_BOX_TYPE_MEHD);
 	return (GF_Box *)tmp;
 }
-void mehd_del(GF_Box *s)
+void mehd_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
-GF_Err mehd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mehd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MovieExtendsHeaderBox *ptr = (GF_MovieExtendsHeaderBox *)s;
 
 	if (ptr->version==1) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->fragment_duration = gf_bs_read_u64(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->fragment_duration = (u64) gf_bs_read_u32(bs);
 	}
 	return GF_OK;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err mehd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mehd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MovieExtendsHeaderBox *ptr = (GF_MovieExtendsHeaderBox *)s;
 	GF_Err e = gf_isom_full_box_write(s, bs);
@@ -4823,7 +4421,7 @@
 	}
 	return GF_OK;
 }
-GF_Err mehd_Size(GF_Box *s)
+GF_Err mehd_box_size(GF_Box *s)
 {
 	GF_MovieExtendsHeaderBox *ptr = (GF_MovieExtendsHeaderBox *)s;
 	ptr->version = (ptr->fragment_duration>0xFFFFFFFF) ? 1 : 0;
@@ -4835,7 +4433,7 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-void mvhd_del(GF_Box *s)
+void mvhd_box_del(GF_Box *s)
 {
 	GF_MovieHeaderBox *ptr = (GF_MovieHeaderBox *)s;
 	if (ptr == NULL) return;
@@ -4843,16 +4441,18 @@
 }
 
 
-GF_Err mvhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mvhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MovieHeaderBox *ptr = (GF_MovieHeaderBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
 	if (ptr->version == 1) {
+		ISOM_DECREASE_SIZE(ptr, 28);
 		ptr->creationTime = gf_bs_read_u64(bs);
 		ptr->modificationTime = gf_bs_read_u64(bs);
 		ptr->timeScale = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u64(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 16);
 		ptr->creationTime = gf_bs_read_u32(bs);
 		ptr->modificationTime = gf_bs_read_u32(bs);
 		ptr->timeScale = gf_bs_read_u32(bs);
@@ -4862,6 +4462,7 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Movie header timescale is invalid (0) - defaulting to 600\n" ));
 		ptr->timeScale = 600;
 	}
+	ISOM_DECREASE_SIZE(ptr, 80);
 	ptr->preferredRate = gf_bs_read_u32(bs);
 	ptr->preferredVolume = gf_bs_read_u16(bs);
 	gf_bs_read_data(bs, ptr->reserved, 10);
@@ -4885,7 +4486,7 @@
 	return GF_OK;
 }
 
-GF_Box *mvhd_New()
+GF_Box *mvhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MovieHeaderBox, GF_ISOM_BOX_TYPE_MVHD);
 
@@ -4904,7 +4505,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mvhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mvhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MovieHeaderBox *ptr = (GF_MovieHeaderBox *)s;
@@ -4943,7 +4544,7 @@
 	return GF_OK;
 }
 
-GF_Err mvhd_Size(GF_Box *s)
+GF_Err mvhd_box_size(GF_Box *s)
 {
 	GF_MovieHeaderBox *ptr = (GF_MovieHeaderBox *)s;
 	if (ptr->duration==(u64) -1) ptr->version = 0;
@@ -4957,7 +4558,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void nmhd_del(GF_Box *s)
+void nmhd_box_del(GF_Box *s)
 {
 	GF_MPEGMediaHeaderBox *ptr = (GF_MPEGMediaHeaderBox *)s;
 	if (ptr == NULL) return;
@@ -4966,12 +4567,12 @@
 
 
 
-GF_Err nmhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err nmhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return GF_OK;
 }
 
-GF_Box *nmhd_New()
+GF_Box *nmhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MPEGMediaHeaderBox, GF_ISOM_BOX_TYPE_NMHD);
 	return (GF_Box *)tmp;
@@ -4980,12 +4581,12 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err nmhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err nmhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err nmhd_Size(GF_Box *s)
+GF_Err nmhd_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
@@ -4994,7 +4595,7 @@
 
 
 
-void padb_del(GF_Box *s)
+void padb_box_del(GF_Box *s)
 {
 	GF_PaddingBitsBox *ptr = (GF_PaddingBitsBox *) s;
 	if (ptr == NULL) return;
@@ -5003,14 +4604,19 @@
 }
 
 
-GF_Err padb_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err padb_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 i;
 	GF_PaddingBitsBox *ptr = (GF_PaddingBitsBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->SampleCount = gf_bs_read_u32(bs);
+	if (ptr->size < ptr->SampleCount/2) //half byte per sample
+		return GF_ISOM_INVALID_FILE;
 
 	ptr->padbits = (u8 *)gf_malloc(sizeof(u8)*ptr->SampleCount);
+	if (!ptr->padbits) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->SampleCount; i += 2) {
 		gf_bs_read_int(bs, 1);
 		if (i+1 < ptr->SampleCount) {
@@ -5024,7 +4630,7 @@
 	return GF_OK;
 }
 
-GF_Box *padb_New()
+GF_Box *padb_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PaddingBitsBox, GF_ISOM_BOX_TYPE_PADB);
 	return (GF_Box *)tmp;
@@ -5034,7 +4640,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err padb_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err padb_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_Err e;
@@ -5057,7 +4663,7 @@
 	return GF_OK;
 }
 
-GF_Err padb_Size(GF_Box *s)
+GF_Err padb_box_size(GF_Box *s)
 {
 	GF_PaddingBitsBox *ptr = (GF_PaddingBitsBox *)s;
 	ptr->size += 4;
@@ -5069,22 +4675,23 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void rely_del(GF_Box *s)
+void rely_box_del(GF_Box *s)
 {
 	GF_RelyHintBox *rely = (GF_RelyHintBox *)s;
 	gf_free(rely);
 }
 
-GF_Err rely_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err rely_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_RelyHintBox *ptr = (GF_RelyHintBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 1);
 	ptr->reserved = gf_bs_read_int(bs, 6);
-	ptr->prefered = gf_bs_read_int(bs, 1);
+	ptr->preferred = gf_bs_read_int(bs, 1);
 	ptr->required = gf_bs_read_int(bs, 1);
 	return GF_OK;
 }
 
-GF_Box *rely_New()
+GF_Box *rely_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_RelyHintBox, GF_ISOM_BOX_TYPE_RELY);
 	return (GF_Box *)tmp;
@@ -5092,7 +4699,7 @@
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err rely_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rely_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_RelyHintBox *ptr = (GF_RelyHintBox *)s;
@@ -5100,12 +4707,12 @@
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_int(bs, ptr->reserved, 6);
-	gf_bs_write_int(bs, ptr->prefered, 1);
+	gf_bs_write_int(bs, ptr->preferred, 1);
 	gf_bs_write_int(bs, ptr->required, 1);
 	return GF_OK;
 }
 
-GF_Err rely_Size(GF_Box *s)
+GF_Err rely_box_size(GF_Box *s)
 {
 	s->size += 1;
 	return GF_OK;
@@ -5113,26 +4720,27 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void rtpo_del(GF_Box *s)
+void rtpo_box_del(GF_Box *s)
 {
 	GF_RTPOBox *rtpo = (GF_RTPOBox *)s;
 	gf_free(rtpo);
 }
 
-GF_Err rtpo_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err rtpo_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_RTPOBox *ptr = (GF_RTPOBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->timeOffset = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
-GF_Box *rtpo_New()
+GF_Box *rtpo_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_RTPOBox, GF_ISOM_BOX_TYPE_RTPO);
 	return (GF_Box *)tmp;
 }
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err rtpo_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rtpo_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_RTPOBox *ptr = (GF_RTPOBox *)s;
@@ -5146,14 +4754,14 @@
 	return GF_OK;
 }
 
-GF_Err rtpo_Size(GF_Box *s)
+GF_Err rtpo_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void smhd_del(GF_Box *s)
+void smhd_box_del(GF_Box *s)
 {
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
 	if (ptr == NULL ) return;
@@ -5161,15 +4769,16 @@
 }
 
 
-GF_Err smhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err smhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->balance = gf_bs_read_u16(bs);
 	ptr->reserved = gf_bs_read_u16(bs);
 	return GF_OK;
 }
 
-GF_Box *smhd_New()
+GF_Box *smhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SoundMediaHeaderBox, GF_ISOM_BOX_TYPE_SMHD);
 	return (GF_Box *)tmp;
@@ -5178,7 +4787,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err smhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err smhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
@@ -5189,7 +4798,7 @@
 	return GF_OK;
 }
 
-GF_Err smhd_Size(GF_Box *s)
+GF_Err smhd_box_size(GF_Box *s)
 {
 	GF_SoundMediaHeaderBox *ptr = (GF_SoundMediaHeaderBox *)s;
 
@@ -5202,20 +4811,21 @@
 
 
 
-void snro_del(GF_Box *s)
+void snro_box_del(GF_Box *s)
 {
 	GF_SeqOffHintEntryBox *snro = (GF_SeqOffHintEntryBox *)s;
 	gf_free(snro);
 }
 
-GF_Err snro_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err snro_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SeqOffHintEntryBox *ptr = (GF_SeqOffHintEntryBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->SeqOffset = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
-GF_Box *snro_New()
+GF_Box *snro_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SeqOffHintEntryBox, GF_ISOM_BOX_TYPE_SNRO);
 	return (GF_Box *)tmp;
@@ -5223,7 +4833,7 @@
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err snro_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err snro_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SeqOffHintEntryBox *ptr = (GF_SeqOffHintEntryBox *)s;
@@ -5235,7 +4845,7 @@
 	return GF_OK;
 }
 
-GF_Err snro_Size(GF_Box *s)
+GF_Err snro_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -5243,95 +4853,86 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stbl_del(GF_Box *s)
+void stbl_box_del(GF_Box *s)
 {
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
 	if (ptr == NULL) return;
 
-	if (ptr->ChunkOffset) gf_isom_box_del(ptr->ChunkOffset);
-	if (ptr->CompositionOffset) gf_isom_box_del((GF_Box *) ptr->CompositionOffset);
-	if (ptr->CompositionToDecode) gf_isom_box_del((GF_Box *) ptr->CompositionToDecode);
-	if (ptr->DegradationPriority) gf_isom_box_del((GF_Box *) ptr->DegradationPriority);
-	if (ptr->SampleDescription) gf_isom_box_del((GF_Box *) ptr->SampleDescription);
-	if (ptr->SampleSize) gf_isom_box_del((GF_Box *) ptr->SampleSize);
-	if (ptr->SampleToChunk) gf_isom_box_del((GF_Box *) ptr->SampleToChunk);
-	if (ptr->ShadowSync) gf_isom_box_del((GF_Box *) ptr->ShadowSync);
-	if (ptr->SyncSample) gf_isom_box_del((GF_Box *) ptr->SyncSample);
-	if (ptr->TimeToSample) gf_isom_box_del((GF_Box *) ptr->TimeToSample);
-	if (ptr->SampleDep) gf_isom_box_del((GF_Box *) ptr->SampleDep);
-	if (ptr->PaddingBits) gf_isom_box_del((GF_Box *) ptr->PaddingBits);
-	if (ptr->sub_samples) gf_isom_box_array_del(ptr->sub_samples);
-	if (ptr->sampleGroups) gf_isom_box_array_del(ptr->sampleGroups);
-	if (ptr->sampleGroupsDescription) gf_isom_box_array_del(ptr->sampleGroupsDescription);
-
-	if (ptr->sai_sizes) gf_isom_box_array_del(ptr->sai_sizes);
-	if (ptr->sai_offsets) gf_isom_box_array_del(ptr->sai_offsets);
+	if (ptr->sub_samples) gf_list_del(ptr->sub_samples);
+	if (ptr->sampleGroups) gf_list_del(ptr->sampleGroups);
+	if (ptr->sampleGroupsDescription) gf_list_del(ptr->sampleGroupsDescription);
+	if (ptr->sai_sizes) gf_list_del(ptr->sai_sizes);
+	if (ptr->sai_offsets) gf_list_del(ptr->sai_offsets);
 	if (ptr->traf_map) {
-		if (ptr->traf_map->sample_num) gf_free(ptr->traf_map->sample_num);
+		if (ptr->traf_map->frag_starts) {
+			u32 i;
+			for (i=0; i<ptr->traf_map->nb_entries; i++) {
+				if (ptr->traf_map->frag_starts[i].moof_template)
+					gf_free(ptr->traf_map->frag_starts[i].moof_template);
+			}
+			gf_free(ptr->traf_map->frag_starts);
+		}
 		gf_free(ptr->traf_map);
 	}
-
 	gf_free(ptr);
 }
 
-GF_Err stbl_AddBox(GF_Box *s, GF_Box *a)
+GF_Err stbl_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->TimeToSample = (GF_TimeToSampleBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_CTTS:
 		if (ptr->CompositionOffset) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->CompositionOffset = (GF_CompositionOffsetBox *)a;
+		ptr->CompositionOffset = (GF_CompositionOffsetBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_CSLG:
 		if (ptr->CompositionToDecode) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->CompositionToDecode = (GF_CompositionToDecodeBox *)a;
+		ptr->CompositionToDecode = (GF_CompositionToDecodeBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSS:
 		if (ptr->SyncSample) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->SyncSample = (GF_SyncSampleBox *)a;
+		ptr->SyncSample = (GF_SyncSampleBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSD:
 		if (ptr->SampleDescription) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->SampleDescription  =(GF_SampleDescriptionBox *)a;
+		ptr->SampleDescription  =(GF_SampleDescriptionBox *)a;
 		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;
+		ptr->SampleSize = (GF_SampleSizeBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STSC:
 		if (ptr->SampleToChunk) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->SampleToChunk = (GF_SampleToChunkBox *)a;
+		ptr->SampleToChunk = (GF_SampleToChunkBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_PADB:
 		if (ptr->PaddingBits) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->PaddingBits = (GF_PaddingBitsBox *) a;
+		ptr->PaddingBits = (GF_PaddingBitsBox *) a;
 		break;
 
 	//WARNING: AS THIS MAY CHANGE DYNAMICALLY DURING EDIT,
 	case GF_ISOM_BOX_TYPE_CO64:
 	case GF_ISOM_BOX_TYPE_STCO:
-		if (ptr->ChunkOffset) {
-			gf_isom_box_del(ptr->ChunkOffset);
-		}
+		if (ptr->ChunkOffset) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->ChunkOffset = a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_STSH:
 		if (ptr->ShadowSync) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->ShadowSync = (GF_ShadowSyncBox *)a;
+		ptr->ShadowSync = (GF_ShadowSyncBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_STDP:
 		if (ptr->DegradationPriority) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->DegradationPriority = (GF_DegradationPriorityBox *)a;
+		ptr->DegradationPriority = (GF_DegradationPriorityBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SDTP:
 		if (ptr->SampleDep) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->SampleDep= (GF_SampleDependencyTypeBox *)a;
+		ptr->SampleDep = (GF_SampleDependencyTypeBox *)a;
 		break;
 
 	case GF_ISOM_BOX_TYPE_SUBS:
@@ -5369,8 +4970,6 @@
 		if (!ptr->sai_offsets) ptr->sai_offsets = gf_list_new();
 		gf_list_add(ptr->sai_offsets, a);
 		break;
-	default:
-		return gf_isom_box_add_default((GF_Box *)ptr, a);
 	}
 	return GF_OK;
 }
@@ -5378,25 +4977,37 @@
 
 
 
-GF_Err stbl_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stbl_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	//we need to parse DegPrior in a special way
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
 
-	e = gf_isom_box_array_read(s, bs, stbl_AddBox);
+	e = gf_isom_box_array_read(s, bs, stbl_on_child_box);
 	if (e) return e;
 
 	if (!ptr->SyncSample)
 		ptr->no_sync_found = 1;
 
 	ptr->nb_sgpd_in_stbl = gf_list_count(ptr->sampleGroupsDescription);
-	ptr->nb_other_boxes_in_stbl = gf_list_count(ptr->other_boxes);
+	ptr->nb_stbl_boxes = gf_list_count(ptr->child_boxes);
+
+	if (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_CLONE_TRACK)
+		return GF_OK;
+//	return GF_OK;
 
+	//these boxes are mandatory !
+	if (!ptr->SampleToChunk || !ptr->SampleSize || !ptr->ChunkOffset || !ptr->TimeToSample)
+		return GF_ISOM_INVALID_FILE;
+	//sanity check
+	if (ptr->SampleSize->sampleCount) {
+		if (!ptr->TimeToSample->nb_entries || !ptr->SampleToChunk->nb_entries)
+			return GF_ISOM_INVALID_FILE;
+	}
 	return GF_OK;
 }
 
-GF_Box *stbl_New()
+GF_Box *stbl_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleTableBox, GF_ISOM_BOX_TYPE_STBL);
 	//maxSamplePer chunk is 10 by default
@@ -5409,174 +5020,43 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stbl_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stbl_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	if (ptr->SampleDescription) {
-		e = gf_isom_box_write((GF_Box *) ptr->SampleDescription, bs);
-		if (e) return e;
-	}
-	if (ptr->TimeToSample) {
-		e = gf_isom_box_write((GF_Box *) ptr->TimeToSample, bs);
-		if (e) return e;
-	}
-	if (ptr->CompositionOffset)	{
-		e = gf_isom_box_write((GF_Box *) ptr->CompositionOffset, bs);
-		if (e) return e;
-	}
-	if (ptr->CompositionToDecode)	{
-		e = gf_isom_box_write((GF_Box *) ptr->CompositionToDecode, bs);
-		if (e) return e;
-	}
-	if (ptr->SyncSample) {
-		e = gf_isom_box_write((GF_Box *) ptr->SyncSample, bs);
-		if (e) return e;
-	}
-	if (ptr->ShadowSync) {
-		e = gf_isom_box_write((GF_Box *) ptr->ShadowSync, bs);
-		if (e) return e;
-	}
-	if (ptr->SampleToChunk) {
-		e = gf_isom_box_write((GF_Box *) ptr->SampleToChunk, bs);
-		if (e) return e;
-	}
-	if (ptr->SampleSize) {
-		e = gf_isom_box_write((GF_Box *) ptr->SampleSize, bs);
-		if (e) return e;
-	}
-	if (ptr->ChunkOffset) {
-		e = gf_isom_box_write(ptr->ChunkOffset, bs);
-		if (e) return e;
-	}
-	if (ptr->DegradationPriority) {
-		e = gf_isom_box_write((GF_Box *) ptr->DegradationPriority, bs);
-		if (e) return e;
-	}
-	if (ptr->SampleDep && ptr->SampleDep->sampleCount) {
-		e = gf_isom_box_write((GF_Box *) ptr->SampleDep, bs);
-		if (e) return e;
-	}
-	if (ptr->PaddingBits) {
-		e = gf_isom_box_write((GF_Box *) ptr->PaddingBits, bs);
-		if (e) return e;
-	}
-	if (ptr->sub_samples) {
-		e = gf_isom_box_array_write(s, ptr->sub_samples, bs);
-		if (e) return e;
-	}
-	if (ptr->sampleGroupsDescription) {
-		e = gf_isom_box_array_write(s, ptr->sampleGroupsDescription, bs);
-		if (e) return e;
-	}
-	if (ptr->sampleGroups) {
-		e = gf_isom_box_array_write(s, ptr->sampleGroups, bs);
-		if (e) return e;
-	}
-	if (ptr->sai_sizes) {
-		e = gf_isom_box_array_write(s, ptr->sai_sizes, bs);
-		if (e) return e;
-	}
-	if (ptr->sai_offsets) {
-		e = gf_isom_box_array_write(s, ptr->sai_offsets, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err stbl_Size(GF_Box *s)
+GF_Err stbl_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_SampleTableBox *ptr = (GF_SampleTableBox *)s;
 
-	//Mandatory boxs (but not internally :)
-	if (ptr->SampleDescription) {
-		e = gf_isom_box_size((GF_Box *) ptr->SampleDescription);
-		if (e) return e;
-		ptr->size += ptr->SampleDescription->size;
-	}
-	if (ptr->SampleSize) {
-		e = gf_isom_box_size((GF_Box *) ptr->SampleSize);
-		if (e) return e;
-		ptr->size += ptr->SampleSize->size;
-	}
-	if (ptr->SampleToChunk) {
-		e = gf_isom_box_size((GF_Box *) ptr->SampleToChunk);
-		if (e) return e;
-		ptr->size += ptr->SampleToChunk->size;
-	}
-	if (ptr->TimeToSample) {
-		e = gf_isom_box_size((GF_Box *) ptr->TimeToSample);
-		if (e) return e;
-		ptr->size += ptr->TimeToSample->size;
-	}
-	if (ptr->ChunkOffset) {
-		e = gf_isom_box_size(ptr->ChunkOffset);
-		if (e) return e;
-		ptr->size += ptr->ChunkOffset->size;
-	}
-
-	//optional boxs
-	if (ptr->CompositionOffset)	{
-		e = gf_isom_box_size((GF_Box *) ptr->CompositionOffset);
-		if (e) return e;
-		ptr->size += ptr->CompositionOffset->size;
-	}
-	if (ptr->CompositionToDecode)	{
-		e = gf_isom_box_size((GF_Box *) ptr->CompositionToDecode);
-		if (e) return e;
-		ptr->size += ptr->CompositionToDecode->size;
-	}
-	if (ptr->DegradationPriority) {
-		e = gf_isom_box_size((GF_Box *) ptr->DegradationPriority);
-		if (e) return e;
-		ptr->size += ptr->DegradationPriority->size;
-	}
-	if (ptr->ShadowSync) {
-		e = gf_isom_box_size((GF_Box *) ptr->ShadowSync);
-		if (e) return e;
-		ptr->size += ptr->ShadowSync->size;
-	}
-	if (ptr->SyncSample) {
-		e = gf_isom_box_size((GF_Box *) ptr->SyncSample);
-		if (e) return e;
-		ptr->size += ptr->SyncSample->size;
-	}
-	if (ptr->SampleDep && ptr->SampleDep->sampleCount) {
-		e = gf_isom_box_size((GF_Box *) ptr->SampleDep);
-		if (e) return e;
-		ptr->size += ptr->SampleDep->size;
-	}
-	//padb
-	if (ptr->PaddingBits) {
-		e = gf_isom_box_size((GF_Box *) ptr->PaddingBits);
-		if (e) return e;
-		ptr->size += ptr->PaddingBits->size;
-	}
+	gf_isom_check_position(s, (GF_Box *)ptr->SampleDescription, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->TimeToSample, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->CompositionOffset, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->CompositionToDecode, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->SyncSample, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->ShadowSync, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->SampleToChunk, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->SampleSize, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->ChunkOffset, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->DegradationPriority, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->SampleDep, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->PaddingBits, &pos);
 
 	if (ptr->sub_samples) {
-		e = gf_isom_box_array_size(s, ptr->sub_samples);
-		if (e) return e;
+		gf_isom_check_position_list(s, ptr->sub_samples, &pos);
 	}
-	if (ptr->sampleGroups) {
-		e = gf_isom_box_array_size(s, ptr->sampleGroups);
-		if (e) return e;
+	if (ptr->sampleGroupsDescription && !ptr->skip_sample_groups) {
+		gf_isom_check_position_list(s, ptr->sampleGroupsDescription, &pos);
 	}
-	if (ptr->sampleGroupsDescription) {
-		e = gf_isom_box_array_size(s, ptr->sampleGroupsDescription);
-		if (e) return e;
+	if (ptr->sampleGroups) {
+		gf_isom_check_position_list(s, ptr->sampleGroups, &pos);
 	}
 	if (ptr->sai_sizes) {
-		e = gf_isom_box_array_size(s, ptr->sai_sizes);
-		if (e) return e;
+		gf_isom_check_position_list(s, ptr->sai_sizes, &pos);
 	}
 	if (ptr->sai_offsets) {
-		e = gf_isom_box_array_size(s, ptr->sai_offsets);
-		if (e) return e;
+		gf_isom_check_position_list(s, ptr->sai_offsets, &pos);
 	}
 	return GF_OK;
 }
@@ -5584,7 +5064,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stco_del(GF_Box *s)
+void stco_box_del(GF_Box *s)
 {
 	GF_ChunkOffsetBox *ptr = (GF_ChunkOffsetBox *)s;
 	if (ptr == NULL) return;
@@ -5593,13 +5073,13 @@
 }
 
 
-GF_Err stco_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stco_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 entries;
 	GF_ChunkOffsetBox *ptr = (GF_ChunkOffsetBox *)s;
 
-	ptr->nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->nb_entries = gf_bs_read_u32(bs);
 	if (ptr->nb_entries > ptr->size / 4) {
 		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;
@@ -5617,7 +5097,7 @@
 	return GF_OK;
 }
 
-GF_Box *stco_New()
+GF_Box *stco_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ChunkOffsetBox, GF_ISOM_BOX_TYPE_STCO);
 	return (GF_Box *)tmp;
@@ -5627,7 +5107,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stco_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stco_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -5642,7 +5122,7 @@
 }
 
 
-GF_Err stco_Size(GF_Box *s)
+GF_Err stco_box_size(GF_Box *s)
 {
 	GF_ChunkOffsetBox *ptr = (GF_ChunkOffsetBox *)s;
 
@@ -5654,7 +5134,7 @@
 
 
 
-void stdp_del(GF_Box *s)
+void stdp_box_del(GF_Box *s)
 {
 	GF_DegradationPriorityBox *ptr = (GF_DegradationPriorityBox *)s;
 	if (ptr == NULL ) return;
@@ -5663,7 +5143,7 @@
 }
 
 //this is called through stbl_read...
-GF_Err stdp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stdp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 entry;
 	GF_DegradationPriorityBox *ptr = (GF_DegradationPriorityBox *)s;
@@ -5681,7 +5161,7 @@
 	return GF_OK;
 }
 
-GF_Box *stdp_New()
+GF_Box *stdp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_DegradationPriorityBox, GF_ISOM_BOX_TYPE_STDP);
 	return (GF_Box *)tmp;
@@ -5690,7 +5170,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stdp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stdp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -5704,7 +5184,7 @@
 	return GF_OK;
 }
 
-GF_Err stdp_Size(GF_Box *s)
+GF_Err stdp_box_size(GF_Box *s)
 {
 	GF_DegradationPriorityBox *ptr = (GF_DegradationPriorityBox *)s;
 
@@ -5715,7 +5195,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stsc_del(GF_Box *s)
+void stsc_box_del(GF_Box *s)
 {
 	GF_SampleToChunkBox *ptr = (GF_SampleToChunkBox *)s;
 	if (ptr == NULL) return;
@@ -5724,21 +5204,25 @@
 }
 
 
-GF_Err stsc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stsc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_SampleToChunkBox *ptr = (GF_SampleToChunkBox *)s;
 
-	ptr->nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->nb_entries = gf_bs_read_u32(bs);
+
 	if (ptr->nb_entries > ptr->size / 12) {
 		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;
 	}
 
 	ptr->alloc_size = ptr->nb_entries;
-	ptr->entries = gf_malloc(sizeof(GF_StscEntry)*ptr->alloc_size);
-	if (!ptr->entries) return GF_OUT_OF_MEM;
+	ptr->entries = NULL;
+	if (ptr->nb_entries) {
+		ptr->entries = gf_malloc(sizeof(GF_StscEntry)*ptr->alloc_size);
+		if (!ptr->entries) return GF_OUT_OF_MEM;
+	}
 
 	for (i = 0; i < ptr->nb_entries; i++) {
 		ptr->entries[i].firstChunk = gf_bs_read_u32(bs);
@@ -5761,7 +5245,7 @@
 	return GF_OK;
 }
 
-GF_Box *stsc_New()
+GF_Box *stsc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleToChunkBox, GF_ISOM_BOX_TYPE_STSC);
 	return (GF_Box *)tmp;
@@ -5770,7 +5254,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stsc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stsc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -5787,7 +5271,7 @@
 	return GF_OK;
 }
 
-GF_Err stsc_Size(GF_Box *s)
+GF_Err stsc_box_size(GF_Box *s)
 {
 	GF_SampleToChunkBox *ptr = (GF_SampleToChunkBox *)s;
 
@@ -5797,21 +5281,20 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void stsd_del(GF_Box *s)
+void stsd_box_del(GF_Box *s)
 {
 	GF_SampleDescriptionBox *ptr = (GF_SampleDescriptionBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err stsd_AddBox(GF_Box *s, GF_Box *a)
+GF_Err stsd_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_UnknownBox *def;
-	GF_SampleDescriptionBox *ptr = (GF_SampleDescriptionBox *)s;
 	if (!a) return GF_OK;
 
 	if (gf_box_valid_in_parent(a, "stsd")) {
-		return gf_isom_box_add_default((GF_Box*)ptr, a);
+		return GF_OK;
 	}
 	switch (a->type) {
 	//unknown sample description: we need a specific box to handle the data ref index
@@ -5820,10 +5303,10 @@
 		def = (GF_UnknownBox *)a;
 		/*we need at least 8 bytes for unknown sample entries*/
 		if (def->dataSize < 8) {
-			gf_isom_box_del(a);
+			gf_isom_box_del_parent(&s->child_boxes, a);
 			return GF_ISOM_INVALID_MEDIA;
 		}
-		return gf_isom_box_add_default((GF_Box*)ptr, a);
+		return GF_OK;
 
 	default:
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Cannot process box of type %s\n", gf_4cc_to_str(a->type)));
@@ -5832,25 +5315,25 @@
 }
 
 
-GF_Err stsd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stsd_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(s, 4)
+	gf_bs_read_u32(bs);
 
-	return gf_isom_box_array_read_ex(s, bs, stsd_AddBox, GF_ISOM_BOX_TYPE_STSD);
+	return gf_isom_box_array_read_ex(s, bs, stsd_on_child_box, GF_ISOM_BOX_TYPE_STSD);
 }
 
-GF_Box *stsd_New()
+GF_Box *stsd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleDescriptionBox, GF_ISOM_BOX_TYPE_STSD);
-	tmp->other_boxes = gf_list_new();
+	tmp->child_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stsd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stsd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 nb_entries;
@@ -5858,12 +5341,12 @@
 
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	nb_entries = gf_list_count(ptr->other_boxes);
+	nb_entries = gf_list_count(ptr->child_boxes);
 	gf_bs_write_u32(bs, nb_entries);
 	return GF_OK;
 }
 
-GF_Err stsd_Size(GF_Box *s)
+GF_Err stsd_box_size(GF_Box *s)
 {
 	GF_SampleDescriptionBox *ptr = (GF_SampleDescriptionBox *)s;
 	ptr->size += 4;
@@ -5873,7 +5356,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stsh_del(GF_Box *s)
+void stsh_box_del(GF_Box *s)
 {
 	u32 i = 0;
 	GF_StshEntry *ent;
@@ -5888,17 +5371,19 @@
 
 
 
-GF_Err stsh_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stsh_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 count, i;
-	GF_StshEntry *ent;
 	GF_ShadowSyncBox *ptr = (GF_ShadowSyncBox *)s;
 
+	ISOM_DECREASE_SIZE(s, 4)
 	count = gf_bs_read_u32(bs);
+	if (ptr->size < count*8)
+		return GF_ISOM_INVALID_FILE;
 
 	for (i = 0; i < count; i++) {
-		ent = (GF_StshEntry *) gf_malloc(sizeof(GF_StshEntry));
+		GF_StshEntry *ent = (GF_StshEntry *) gf_malloc(sizeof(GF_StshEntry));
 		if (!ent) return GF_OUT_OF_MEM;
 		ent->shadowedSampleNumber = gf_bs_read_u32(bs);
 		ent->syncSampleNumber = gf_bs_read_u32(bs);
@@ -5908,7 +5393,7 @@
 	return GF_OK;
 }
 
-GF_Box *stsh_New()
+GF_Box *stsh_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ShadowSyncBox, GF_ISOM_BOX_TYPE_STSH);
 
@@ -5923,7 +5408,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stsh_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stsh_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -5941,7 +5426,7 @@
 	return GF_OK;
 }
 
-GF_Err stsh_Size(GF_Box *s)
+GF_Err stsh_box_size(GF_Box *s)
 {
 	GF_ShadowSyncBox *ptr = (GF_ShadowSyncBox *)s;
 	ptr->size += 4 + (8 * gf_list_count(ptr->entries));
@@ -5952,7 +5437,7 @@
 
 
 
-void stss_del(GF_Box *s)
+void stss_box_del(GF_Box *s)
 {
 	GF_SyncSampleBox *ptr = (GF_SyncSampleBox *)s;
 	if (ptr == NULL) return;
@@ -5960,14 +5445,14 @@
 	gf_free(ptr);
 }
 
-GF_Err stss_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stss_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_SyncSampleBox *ptr = (GF_SyncSampleBox *)s;
 
-	ptr->nb_entries = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
-	if (ptr->nb_entries > ptr->size / 4) {
+	ptr->nb_entries = gf_bs_read_u32(bs);
+	if (ptr->size <  ptr->nb_entries * 4) {
 		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;
 	}
@@ -5982,7 +5467,7 @@
 	return GF_OK;
 }
 
-GF_Box *stss_New()
+GF_Box *stss_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SyncSampleBox, GF_ISOM_BOX_TYPE_STSS);
 	return (GF_Box*)tmp;
@@ -5991,7 +5476,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stss_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stss_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -6006,7 +5491,7 @@
 	return GF_OK;
 }
 
-GF_Err stss_Size(GF_Box *s)
+GF_Err stss_box_size(GF_Box *s)
 {
 	GF_SyncSampleBox *ptr = (GF_SyncSampleBox *)s;
 	ptr->size += 4 + (4 * ptr->nb_entries);
@@ -6016,7 +5501,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stsz_del(GF_Box *s)
+void stsz_box_del(GF_Box *s)
 {
 	GF_SampleSizeBox *ptr = (GF_SampleSizeBox *)s;
 	if (ptr == NULL) return;
@@ -6025,7 +5510,7 @@
 }
 
 
-GF_Err stsz_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stsz_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, estSize;
 	GF_SampleSizeBox *ptr = (GF_SampleSizeBox *)s;
@@ -6033,16 +5518,15 @@
 
 	//support for CompactSizes
 	if (s->type == GF_ISOM_BOX_TYPE_STSZ) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->sampleSize = gf_bs_read_u32(bs);
 		ptr->sampleCount = gf_bs_read_u32(bs);
-
-		ISOM_DECREASE_SIZE(ptr, 8);
 	} else {
 		//24-reserved
+		ISOM_DECREASE_SIZE(ptr, 8);
 		gf_bs_read_int(bs, 24);
 		i = gf_bs_read_u8(bs);
 		ptr->sampleCount = gf_bs_read_u32(bs);
-		ISOM_DECREASE_SIZE(ptr, 8);
 		switch (i) {
 		case 4:
 		case 8:
@@ -6074,10 +5558,14 @@
 				return GF_ISOM_INVALID_FILE;
 			}
 			ptr->sizes = (u32 *) gf_malloc(ptr->sampleCount * sizeof(u32));
-			ptr->alloc_size = ptr->sampleCount;
 			if (! ptr->sizes) return GF_OUT_OF_MEM;
+			ptr->alloc_size = ptr->sampleCount;
 			for (i = 0; i < ptr->sampleCount; i++) {
 				ptr->sizes[i] = gf_bs_read_u32(bs);
+				if (ptr->max_size < ptr->sizes[i])
+					ptr->max_size = ptr->sizes[i];
+				ptr->total_size += ptr->sizes[i];
+				ptr->total_samples++;
 			}
 		}
 	} else {
@@ -6116,12 +5604,16 @@
 				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;
 }
 
-GF_Box *stsz_New()
+GF_Box *stsz_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleSizeBox, 0);
 
@@ -6132,7 +5624,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stsz_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stsz_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -6178,7 +5670,7 @@
 	return GF_OK;
 }
 
-GF_Err stsz_Size(GF_Box *s)
+GF_Err stsz_box_size(GF_Box *s)
 {
 	u32 i, fieldSize, size;
 	GF_SampleSizeBox *ptr = (GF_SampleSizeBox *)s;
@@ -6244,7 +5736,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void stts_del(GF_Box *s)
+void stts_box_del(GF_Box *s)
 {
 	GF_TimeToSampleBox *ptr = (GF_TimeToSampleBox *)s;
 	if (ptr->entries) gf_free(ptr->entries);
@@ -6252,7 +5744,7 @@
 }
 
 
-GF_Err stts_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stts_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_TimeToSampleBox *ptr = (GF_TimeToSampleBox *)s;
@@ -6260,9 +5752,10 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	ptr->w_LastDTS = 0;
 #endif
-	ptr->nb_entries = gf_bs_read_u32(bs);
+
 	ISOM_DECREASE_SIZE(ptr, 4);
-	if (ptr->nb_entries > ptr->size / 8) {
+	ptr->nb_entries = gf_bs_read_u32(bs);
+	if (ptr->size < ptr->nb_entries * 8) {
 		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;
 	}
@@ -6270,6 +5763,7 @@
 	ptr->alloc_size = ptr->nb_entries;
 	ptr->entries = gf_malloc(sizeof(GF_SttsEntry)*ptr->alloc_size);
 	if (!ptr->entries) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->nb_entries; i++) {
 		ptr->entries[i].sampleCount = gf_bs_read_u32(bs);
 		ptr->entries[i].sampleDelta = gf_bs_read_u32(bs);
@@ -6277,6 +5771,8 @@
 		ptr->w_currentSampleNum += ptr->entries[i].sampleCount;
 		ptr->w_LastDTS += (u64)ptr->entries[i].sampleCount * ptr->entries[i].sampleDelta;
 #endif
+		if (ptr->max_ts_delta<ptr->entries[i].sampleDelta)
+			ptr->max_ts_delta = ptr->entries[i].sampleDelta;
 
 		if (!ptr->entries[i].sampleDelta) {
 			if ((i+1<ptr->nb_entries) ) {
@@ -6301,7 +5797,7 @@
 	return GF_OK;
 }
 
-GF_Box *stts_New()
+GF_Box *stts_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TimeToSampleBox, GF_ISOM_BOX_TYPE_STTS);
 	return (GF_Box *)tmp;
@@ -6310,7 +5806,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stts_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stts_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -6326,7 +5822,7 @@
 	return GF_OK;
 }
 
-GF_Err stts_Size(GF_Box *s)
+GF_Err stts_box_size(GF_Box *s)
 {
 	GF_TimeToSampleBox *ptr = (GF_TimeToSampleBox *)s;
 	ptr->size += 4 + (8 * ptr->nb_entries);
@@ -6339,39 +5835,45 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void tfhd_del(GF_Box *s)
+void tfhd_box_del(GF_Box *s)
 {
 	GF_TrackFragmentHeaderBox *ptr = (GF_TrackFragmentHeaderBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err tfhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tfhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackFragmentHeaderBox *ptr = (GF_TrackFragmentHeaderBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->trackID = gf_bs_read_u32(bs);
 
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRAF_BASE_OFFSET) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->base_data_offset = gf_bs_read_u64(bs);
 	}
 	if (ptr->flags & GF_ISOM_TRAF_SAMPLE_DESC) {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->sample_desc_index = gf_bs_read_u32(bs);
 	}
 	if (ptr->flags & GF_ISOM_TRAF_SAMPLE_DUR) {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->def_sample_duration = gf_bs_read_u32(bs);
 	}
 	if (ptr->flags & GF_ISOM_TRAF_SAMPLE_SIZE) {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->def_sample_size = gf_bs_read_u32(bs);
 	}
 	if (ptr->flags & GF_ISOM_TRAF_SAMPLE_FLAGS) {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->def_sample_flags = gf_bs_read_u32(bs);
 	}
 	return GF_OK;
 }
 
-GF_Box *tfhd_New()
+GF_Box *tfhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackFragmentHeaderBox, GF_ISOM_BOX_TYPE_TFHD);
 	//NO FLAGS SET BY DEFAULT
@@ -6383,7 +5885,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err tfhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tfhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackFragmentHeaderBox *ptr = (GF_TrackFragmentHeaderBox *) s;
@@ -6412,7 +5914,7 @@
 	return GF_OK;
 }
 
-GF_Err tfhd_Size(GF_Box *s)
+GF_Err tfhd_box_size(GF_Box *s)
 {
 	GF_TrackFragmentHeaderBox *ptr = (GF_TrackFragmentHeaderBox *)s;
 	ptr->size += 4;
@@ -6431,20 +5933,21 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-void tims_del(GF_Box *s)
+void tims_box_del(GF_Box *s)
 {
 	GF_TSHintEntryBox *tims = (GF_TSHintEntryBox *)s;
 	gf_free(tims);
 }
 
-GF_Err tims_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tims_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TSHintEntryBox *ptr = (GF_TSHintEntryBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->timeScale = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
-GF_Box *tims_New()
+GF_Box *tims_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TSHintEntryBox, GF_ISOM_BOX_TYPE_TIMS);
 	return (GF_Box *)tmp;
@@ -6452,7 +5955,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tims_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tims_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TSHintEntryBox *ptr = (GF_TSHintEntryBox *)s;
@@ -6463,7 +5966,7 @@
 	return GF_OK;
 }
 
-GF_Err tims_Size(GF_Box *s)
+GF_Err tims_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -6472,7 +5975,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void tkhd_del(GF_Box *s)
+void tkhd_box_del(GF_Box *s)
 {
 	GF_TrackHeaderBox *ptr = (GF_TrackHeaderBox *)s;
 	if (ptr == NULL) return;
@@ -6481,23 +5984,28 @@
 }
 
 
-GF_Err tkhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tkhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackHeaderBox *ptr = (GF_TrackHeaderBox *)s;
 
 	if (ptr->version == 1) {
+		ISOM_DECREASE_SIZE(ptr, 32);
 		ptr->creationTime = gf_bs_read_u64(bs);
 		ptr->modificationTime = gf_bs_read_u64(bs);
 		ptr->trackID = gf_bs_read_u32(bs);
 		ptr->reserved1 = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u64(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 20);
 		ptr->creationTime = gf_bs_read_u32(bs);
 		ptr->modificationTime = gf_bs_read_u32(bs);
 		ptr->trackID = gf_bs_read_u32(bs);
 		ptr->reserved1 = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u32(bs);
 	}
+	ptr->initial_duration = ptr->duration;
+
+	ISOM_DECREASE_SIZE(ptr, 60);
 	ptr->reserved2[0] = gf_bs_read_u32(bs);
 	ptr->reserved2[1] = gf_bs_read_u32(bs);
 	ptr->layer = gf_bs_read_u16(bs);
@@ -6518,7 +6026,7 @@
 	return GF_OK;
 }
 
-GF_Box *tkhd_New()
+GF_Box *tkhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackHeaderBox, GF_ISOM_BOX_TYPE_TKHD);
 	tmp->matrix[0] = 0x00010000;
@@ -6531,7 +6039,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tkhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tkhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackHeaderBox *ptr = (GF_TrackHeaderBox *)s;
@@ -6571,7 +6079,7 @@
 	return GF_OK;
 }
 
-GF_Err tkhd_Size(GF_Box *s)
+GF_Err tkhd_box_size(GF_Box *s)
 {
 	GF_TrackHeaderBox *ptr = (GF_TrackHeaderBox *)s;
 
@@ -6588,41 +6096,37 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void traf_del(GF_Box *s)
+void traf_box_del(GF_Box *s)
 {
 	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->tfhd) gf_isom_box_del((GF_Box *) ptr->tfhd);
-	if (ptr->sdtp) gf_isom_box_del((GF_Box *) ptr->sdtp);
-	if (ptr->sub_samples) gf_isom_box_array_del(ptr->sub_samples);
-	if (ptr->tfdt) gf_isom_box_del((GF_Box *) ptr->tfdt);
-	if (ptr->sample_encryption) gf_isom_box_del((GF_Box *) ptr->sample_encryption);
-	gf_isom_box_array_del(ptr->TrackRuns);
-	if (ptr->sampleGroups) gf_isom_box_array_del(ptr->sampleGroups);
-	if (ptr->sampleGroupsDescription) gf_isom_box_array_del(ptr->sampleGroupsDescription);
-	if (ptr->sai_sizes) gf_isom_box_array_del(ptr->sai_sizes);
-	if (ptr->sai_offsets) gf_isom_box_array_del(ptr->sai_offsets);
+	if (ptr->sub_samples) gf_list_del(ptr->sub_samples);
+	gf_list_del(ptr->TrackRuns);
+	if (ptr->sampleGroups) gf_list_del(ptr->sampleGroups);
+	if (ptr->sampleGroupsDescription) gf_list_del(ptr->sampleGroupsDescription);
+	if (ptr->sai_sizes) gf_list_del(ptr->sai_sizes);
+	if (ptr->sai_offsets) gf_list_del(ptr->sai_offsets);
 	gf_free(ptr);
 }
 
-GF_Err traf_AddBox(GF_Box *s, GF_Box *a)
+GF_Err traf_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->tfhd = (GF_TrackFragmentHeaderBox *) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TRUN:
 		return gf_list_add(ptr->TrackRuns, a);
 	case GF_ISOM_BOX_TYPE_SDTP:
 		if (ptr->sdtp) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->sdtp = (GF_SampleDependencyTypeBox *)a;
+		ptr->sdtp = (GF_SampleDependencyTypeBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TFDT:
 		if (ptr->tfdt) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->tfdt = (GF_TFBaseMediaDecodeTimeBox*) a;
+		ptr->tfdt = (GF_TFBaseMediaDecodeTimeBox*) a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SUBS:
 		if (!ptr->sub_samples) ptr->sub_samples = gf_list_new();
@@ -6651,24 +6155,22 @@
 			ptr->sample_encryption->traf = ptr;
 			return GF_OK;
 		} else {
-			return gf_isom_box_add_default(s, a);
+			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;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
-GF_Err traf_Read(GF_Box *s, GF_BitStream *bs)
+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_AddBox);
+	GF_Err e = gf_isom_box_array_read(s, bs, traf_on_child_box);
 	if (e) return e;
 
 	if (!ptr->tfhd) {
@@ -6678,7 +6180,7 @@
 	return GF_OK;
 }
 
-GF_Box *traf_New()
+GF_Box *traf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackFragmentBox, GF_ISOM_BOX_TYPE_TRAF);
 	tmp->TrackRuns = gf_list_new();
@@ -6689,31 +6191,32 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Box *tfxd_New()
+GF_Box *tfxd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MSSTimeExtBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_TFXD;
 	return (GF_Box *)tmp;
 }
 
-void tfxd_del(GF_Box *s)
+void tfxd_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 
-GF_Err tfxd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tfxd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MSSTimeExtBox *ptr = (GF_MSSTimeExtBox *)s;
-	if (ptr->size<4) return GF_ISOM_INVALID_FILE;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->version = gf_bs_read_u8(bs);
 	ptr->flags = gf_bs_read_u24(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	if (ptr->version == 0x01) {
+		ISOM_DECREASE_SIZE(ptr, 16);
 		ptr->absolute_time_in_track_timescale = gf_bs_read_u64(bs);
 		ptr->fragment_duration_in_track_timescale = gf_bs_read_u64(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->absolute_time_in_track_timescale = gf_bs_read_u32(bs);
 		ptr->fragment_duration_in_track_timescale = gf_bs_read_u32(bs);
 	}
@@ -6721,9 +6224,9 @@
 	return GF_OK;
 }
 
-GF_Err tfxd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tfxd_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = GF_OK;
+	GF_Err e;
 	GF_MSSTimeExtBox *uuid = (GF_MSSTimeExtBox*)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
@@ -6736,123 +6239,43 @@
 	return GF_OK;
 }
 
-GF_Err tfxd_Size(GF_Box *s)
+GF_Err tfxd_box_size(GF_Box *s)
 {
 	s->size += 20;
 	return GF_OK;
 }
 
-GF_Err traf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err traf_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *) s;
-	if (!s) return GF_BAD_PARAM;
+	return gf_isom_box_write_header(s, bs);
+}
 
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
+GF_Err traf_box_size(GF_Box *s)
+{
+	u32 pos=0;
+	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *) s;
 
 	//Header first
-	if (ptr->tfhd) {
-		e = gf_isom_box_write((GF_Box *) ptr->tfhd, bs);
-		if (e) return e;
-	}
-	if (ptr->sub_samples) {
-		e = gf_isom_box_array_write(s, ptr->sub_samples, bs);
-		if (e) return e;
-	}
-	if (ptr->tfdt) {
-		e = gf_isom_box_write((GF_Box *) ptr->tfdt, bs);
-		if (e) return e;
-	}
-	if (ptr->sdtp) {
-		e = gf_isom_box_write((GF_Box *) ptr->sdtp, bs);
-		if (e) return e;
-	}
-	if (ptr->sampleGroupsDescription) {
-		e = gf_isom_box_array_write(s, ptr->sampleGroupsDescription, bs);
-		if (e) return e;
-	}
-	if (ptr->sampleGroups) {
-		e = gf_isom_box_array_write(s, ptr->sampleGroups, bs);
-		if (e) return e;
-	}
-	if (ptr->sai_sizes) {
-		e = gf_isom_box_array_write(s, ptr->sai_sizes, bs);
-		if (e) return e;
-	}
-	if (ptr->sai_offsets) {
-		e = gf_isom_box_array_write(s, ptr->sai_offsets, bs);
-		if (e) return e;
-	}
-
-	if (ptr->sample_encryption) {
-		e = gf_isom_box_write((GF_Box *) ptr->sample_encryption, bs);
-		if (e) return e;
-	}
+	gf_isom_check_position(s, (GF_Box *)ptr->tfhd, &pos);
+	gf_isom_check_position_list(s, ptr->sub_samples, &pos);
 
-	e = gf_isom_box_array_write(s, ptr->TrackRuns, bs);
-	if (e) return e;
+	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);
 
-	//tfxd should be last ...
-	if (ptr->tfxd) {
-		e = gf_isom_box_write((GF_Box *) ptr->tfxd, bs);
-		if (e) return e;
-	}
-	return GF_OK;
-}
+	gf_isom_check_position(s, (GF_Box *)ptr->sample_encryption, &pos);
 
-GF_Err traf_Size(GF_Box *s)
-{
-	GF_Err e;
-	GF_TrackFragmentBox *ptr = (GF_TrackFragmentBox *)s;
+	gf_isom_check_position_list(s, ptr->TrackRuns, &pos);
 
-	if (ptr->tfhd) {
-		e = gf_isom_box_size((GF_Box *) ptr->tfhd);
-		if (e) return e;
-		ptr->size += ptr->tfhd->size;
-	}
-	if (ptr->sub_samples) {
-		e = gf_isom_box_array_size(s, ptr->sub_samples);
-		if (e) return e;
-	}
-	if (ptr->sdtp) {
-		e = gf_isom_box_size((GF_Box *) ptr->sdtp);
-		if (e) return e;
-		ptr->size += ptr->sdtp->size;
-	}
-	if (ptr->tfdt) {
-		e = gf_isom_box_size((GF_Box *) ptr->tfdt);
-		if (e) return e;
-		ptr->size += ptr->tfdt->size;
-	}
+	//when sdtp is present (smooth-like) write it after the trun box
+	gf_isom_check_position(s, (GF_Box *)ptr->sdtp, &pos);
 
-	if (ptr->sampleGroups) {
-		e = gf_isom_box_array_size(s, ptr->sampleGroups);
-		if (e) return e;
-	}
-	if (ptr->sampleGroupsDescription) {
-		e = gf_isom_box_array_size(s, ptr->sampleGroupsDescription);
-		if (e) return e;
-	}
-	if (ptr->sai_sizes) {
-		e = gf_isom_box_array_size(s, ptr->sai_sizes);
-		if (e) return e;
-	}
-	if (ptr->sai_offsets) {
-		e = gf_isom_box_array_size(s, ptr->sai_offsets);
-		if (e) return e;
-	}
-	if (ptr->sample_encryption) {
-		e = gf_isom_box_size((GF_Box *) ptr->sample_encryption);
-		if (e) return e;
-		ptr->size += ptr->sample_encryption->size;
-	}
-	if (ptr->tfxd) {
-		e = gf_isom_box_size((GF_Box *)ptr->tfxd);
-		if (e) return e;
-		s->size += ptr->tfxd->size;
-	}
-	return gf_isom_box_array_size(s, ptr->TrackRuns);
+	//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*/
@@ -6860,20 +6283,14 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-void trak_del(GF_Box *s)
+void trak_box_del(GF_Box *s)
 {
-	GF_TrackBox *ptr = (GF_TrackBox *) s;
-	if (ptr == NULL) return;
-
-	if (ptr->Header) gf_isom_box_del((GF_Box *)ptr->Header);
-	if (ptr->udta) gf_isom_box_del((GF_Box *)ptr->udta);
-	if (ptr->Media) gf_isom_box_del((GF_Box *)ptr->Media);
-	if (ptr->References) gf_isom_box_del((GF_Box *)ptr->References);
-	if (ptr->editBox) gf_isom_box_del((GF_Box *)ptr->editBox);
-	if (ptr->meta) gf_isom_box_del((GF_Box *)ptr->meta);
-	if (ptr->name) gf_free(ptr->name);
-	if (ptr->groups) gf_isom_box_del((GF_Box *)ptr->groups);
-	gf_free(ptr);
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_TrackBox *ptr = (GF_TrackBox *)s;
+	if (ptr->chunk_cache)
+		gf_bs_del(ptr->chunk_cache);
+#endif
+	gf_free(s);
 }
 
 static void gf_isom_check_sample_desc(GF_TrackBox *trak)
@@ -6881,6 +6298,8 @@
 	GF_BitStream *bs;
 	GF_UnknownBox *a;
 	u32 i;
+	GF_Err e;
+	GF_SampleTableBox *stbl;
 
 	if (!trak->Media || !trak->Media->information) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no media box !\n" ));
@@ -6888,19 +6307,18 @@
 	}
 	if (!trak->Media->information->sampleTable) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample table !\n" ));
-		trak->Media->information->sampleTable = (GF_SampleTableBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STBL);
-		gf_isom_box_add_for_dump_mode((GF_Box *)trak->Media->information, (GF_Box *)trak->Media->information->sampleTable);
+		trak->Media->information->sampleTable = (GF_SampleTableBox *) gf_isom_box_new_parent(&trak->Media->information->child_boxes, GF_ISOM_BOX_TYPE_STBL);
 	}
+	stbl = trak->Media->information->sampleTable;
 
-	if (!trak->Media->information->sampleTable->SampleDescription) {
+	if (!stbl->SampleDescription) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Track with no sample description box !\n" ));
-		trak->Media->information->sampleTable->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSD);
-		gf_isom_box_add_for_dump_mode((GF_Box *)trak->Media->information->sampleTable, (GF_Box *)trak->Media->information->sampleTable->SampleDescription);
+		stbl->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSD);
 		return;
 	}
 
 	i=0;
-	while ((a = (GF_UnknownBox*)gf_list_enum(trak->Media->information->sampleTable->SampleDescription->other_boxes, &i))) {
+	while ((a = (GF_UnknownBox*)gf_list_enum(trak->Media->information->sampleTable->SampleDescription->child_boxes, &i))) {
 		switch (a->type) {
 		case GF_ISOM_BOX_TYPE_MP4S:
 		case GF_ISOM_BOX_TYPE_ENCS:
@@ -6960,22 +6378,36 @@
 		case GF_ISOM_BOX_TYPE_MHA2:
 		case GF_ISOM_BOX_TYPE_MHM1:
 		case GF_ISOM_BOX_TYPE_MHM2:
-		case GF_QT_BOX_TYPE_AUDIO_RAW:
-		case GF_QT_BOX_TYPE_AUDIO_TWOS:
-		case GF_QT_BOX_TYPE_AUDIO_SOWT:
-		case GF_QT_BOX_TYPE_AUDIO_FL32:
-		case GF_QT_BOX_TYPE_AUDIO_FL64:
-		case GF_QT_BOX_TYPE_AUDIO_IN24:
-		case GF_QT_BOX_TYPE_AUDIO_IN32:
-		case GF_QT_BOX_TYPE_AUDIO_ULAW:
-		case GF_QT_BOX_TYPE_AUDIO_ALAW:
-		case GF_QT_BOX_TYPE_AUDIO_ADPCM:
-		case GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM:
-		case GF_QT_BOX_TYPE_AUDIO_DVCA:
-		case GF_QT_BOX_TYPE_AUDIO_QDMC:
-		case GF_QT_BOX_TYPE_AUDIO_QDMC2:
-		case GF_QT_BOX_TYPE_AUDIO_QCELP:
-		case GF_QT_BOX_TYPE_AUDIO_kMP3:
+		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_QT_SUBTYPE_YUV444:
+		case GF_QT_SUBTYPE_YUV422_10:
+		case GF_QT_SUBTYPE_YUV444_10:
+		case GF_ISOM_BOX_TYPE_IPCM:
+		case GF_ISOM_BOX_TYPE_FPCM:
 			continue;
 
 		case GF_ISOM_BOX_TYPE_UNKNOWN:
@@ -7003,10 +6435,9 @@
 		if (gf_bs_available(bs)) { \
 			u64 pos = gf_bs_get_position(bs); \
 			u32 count_subb = 0; \
-			GF_Err e;\
-			gf_bs_set_cookie(bs, 1);\
-			e = gf_isom_box_array_read((GF_Box *) _box, bs, gf_isom_box_add_default); \
-			count_subb = _box->other_boxes ? gf_list_count(_box->other_boxes) : 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); \
@@ -7026,12 +6457,13 @@
 		} \
 		_box->size = 0; \
 		_box->EntryType = a->original_4cc; \
-		gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, i-1); \
+		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->other_boxes, _box, i-1); \
+		gf_list_insert(trak->Media->information->sampleTable->SampleDescription->child_boxes, _box, i-1); \
 
 
-		/*only process visual or audio*/
+		/*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) {
         case GF_ISOM_MEDIA_VISUAL:
 		case GF_ISOM_MEDIA_AUXV:
@@ -7060,7 +6492,6 @@
 
 		default:
 		{
-			GF_Err e;
 			GF_GenericSampleEntryBox *genm = (GF_GenericSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRM);
 			genm->size = a->size-8;
 			bs = gf_bs_new(a->data, a->dataSize, GF_BITSTREAM_READ);
@@ -7077,62 +6508,63 @@
 }
 
 
-GF_Err trak_AddBox(GF_Box *s, GF_Box *a)
+GF_Err trak_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->Header = (GF_TrackHeaderBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_EDTS:
 		if (ptr->editBox) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->editBox = (GF_EditBox *)a;
+		ptr->editBox = (GF_EditBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UDTA:
 		if (ptr->udta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->udta = (GF_UserDataBox *)a;
+		ptr->udta = (GF_UserDataBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_META:
 		if (ptr->meta) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->meta = (GF_MetaBox *)a;
+		ptr->meta = (GF_MetaBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TREF:
 		if (ptr->References) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->References = (GF_TrackReferenceBox *)a;
+		ptr->References = (GF_TrackReferenceBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_MDIA:
 		if (ptr->Media) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->Media = (GF_MediaBox *)a;
+		ptr->Media = (GF_MediaBox *)a;
 		((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;
 		return GF_OK;
+	case GF_QT_BOX_TYPE_TAPT:
+		if (ptr->Aperture) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->Aperture = (GF_Box *)a;
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_SENC:
 		ptr->sample_encryption = (GF_SampleEncryptionBox*)a;
-		return gf_isom_box_add_default((GF_Box *)ptr, a);
+		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;
-			return gf_isom_box_add_default((GF_Box *)ptr, a);
+			return GF_OK;
 		}
-
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
-GF_Err trak_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trak_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
-	e = gf_isom_box_array_read(s, bs, trak_AddBox);
+	e = gf_isom_box_array_read(s, bs, trak_on_child_box);
 	if (e) return e;
 	gf_isom_check_sample_desc(ptr);
 
@@ -7148,9 +6580,15 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid MediaBox\n"));
 		return GF_ISOM_INVALID_FILE;
 	}
+	if (!ptr->Media->information->sampleTable->SampleSize || (ptr->Media->information->sampleTable->SampleSize->sampleCount==0)) {
+		if (ptr->Header->initial_duration) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Track with no samples but duration defined, ignoring duration\n"));
+			ptr->Header->initial_duration = 0;
+		}
+	}
 
-	for (i=0; i<gf_list_count(ptr->Media->information->sampleTable->other_boxes); i++) {
-		GF_Box *a = gf_list_get(ptr->Media->information->sampleTable->other_boxes, i);
+	for (i=0; i<gf_list_count(ptr->Media->information->sampleTable->child_boxes); i++) {
+		GF_Box *a = gf_list_get(ptr->Media->information->sampleTable->child_boxes, i);
 		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
 			ptr->sample_encryption = (struct __sample_encryption_box *) a;
 			break;
@@ -7163,7 +6601,7 @@
 	return e;
 }
 
-GF_Box *trak_New()
+GF_Box *trak_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackBox, GF_ISOM_BOX_TYPE_TRAK);
 	return (GF_Box *)tmp;
@@ -7172,90 +6610,35 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err trak_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trak_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_TrackBox *ptr = (GF_TrackBox *)s;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	if (ptr->Header) {
-		e = gf_isom_box_write((GF_Box *) ptr->Header, bs);
-		if (e) return e;
-	}
-	if (ptr->References) {
-		e = gf_isom_box_write((GF_Box *) ptr->References, bs);
-		if (e) return e;
-	}
-	if (ptr->editBox) {
-		e = gf_isom_box_write((GF_Box *) ptr->editBox, bs);
-		if (e) return e;
-	}
-	if (ptr->Media) {
-		e = gf_isom_box_write((GF_Box *) ptr->Media, bs);
-		if (e) return e;
-	}
-	if (ptr->meta) {
-		e = gf_isom_box_write((GF_Box *) ptr->meta, bs);
-		if (e) return e;
-	}
-	if (ptr->groups) {
-		e = gf_isom_box_write((GF_Box *) ptr->groups, bs);
-		if (e) return e;
-	}
-	if (ptr->udta) {
-		e = gf_isom_box_write((GF_Box *) ptr->udta, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err trak_Size(GF_Box *s)
+GF_Err trak_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_TrackBox *ptr = (GF_TrackBox *)s;
 
-	if (ptr->Header) {
-		e = gf_isom_box_size((GF_Box *) ptr->Header);
+	if (ptr->sample_encryption && ptr->sample_encryption->load_needed) {
+		GF_Err e = senc_Parse(ptr->moov->mov->movieFileMap->bs, ptr, NULL, ptr->sample_encryption);
 		if (e) return e;
-		ptr->size += ptr->Header->size;
-	}
-	if (ptr->udta) {
-		e = gf_isom_box_size((GF_Box *) ptr->udta);
-		if (e) return e;
-		ptr->size += ptr->udta->size;
-	}
-	if (ptr->References) {
-		e = gf_isom_box_size((GF_Box *) ptr->References);
-		if (e) return e;
-		ptr->size += ptr->References->size;
-	}
-	if (ptr->editBox) {
-		e = gf_isom_box_size((GF_Box *) ptr->editBox);
-		if (e) return e;
-		ptr->size += ptr->editBox->size;
-	}
-	if (ptr->Media) {
-		e = gf_isom_box_size((GF_Box *) ptr->Media);
-		if (e) return e;
-		ptr->size += ptr->Media->size;
-	}
-	if (ptr->meta) {
-		e = gf_isom_box_size((GF_Box *) ptr->meta);
-		if (e) return e;
-		ptr->size += ptr->meta->size;
-	}
-	if (ptr->groups) {
-		e = gf_isom_box_size((GF_Box *) ptr->groups);
-		if (e) return e;
-		ptr->size += ptr->groups->size;
 	}
+
+	gf_isom_check_position(s, (GF_Box *)ptr->Header, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->Aperture, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->References, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->editBox, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->Media, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->meta, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->groups, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->udta, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void stri_del(GF_Box *s)
+void stri_box_del(GF_Box *s)
 {
 	GF_SubTrackInformationBox *ptr = (GF_SubTrackInformationBox *)s;
 	if (ptr == NULL) return;
@@ -7263,24 +6646,25 @@
 	gf_free(ptr);
 }
 
-GF_Err stri_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stri_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	size_t i;
 	GF_SubTrackInformationBox *ptr = (GF_SubTrackInformationBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 8)
 	ptr->switch_group = gf_bs_read_u16(bs);
 	ptr->alternate_group = gf_bs_read_u16(bs);
 	ptr->sub_track_id = gf_bs_read_u32(bs);
-	ptr->size -= 8;
 	ptr->attribute_count = ptr->size / 4;
 	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++) {
+		ISOM_DECREASE_SIZE(ptr, 4)
 		ptr->attribute_list[i] = gf_bs_read_u32(bs);
 	}
 	return GF_OK;
 }
 
-GF_Box *stri_New()
+GF_Box *stri_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SubTrackInformationBox, GF_ISOM_BOX_TYPE_STRI);
 	return (GF_Box *)tmp;
@@ -7289,7 +6673,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stri_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stri_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -7306,7 +6690,7 @@
 	return GF_OK;
 }
 
-GF_Err stri_Size(GF_Box *s)
+GF_Err stri_box_size(GF_Box *s)
 {
 	GF_SubTrackInformationBox *ptr = (GF_SubTrackInformationBox *)s;
 
@@ -7316,7 +6700,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void stsg_del(GF_Box *s)
+void stsg_box_del(GF_Box *s)
 {
 	GF_SubTrackSampleGroupBox *ptr = (GF_SubTrackSampleGroupBox *)s;
 	if (ptr == NULL) return;
@@ -7324,7 +6708,7 @@
 	gf_free(ptr);
 }
 
-GF_Err stsg_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stsg_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_SubTrackSampleGroupBox *ptr = (GF_SubTrackSampleGroupBox *)s;
@@ -7340,7 +6724,7 @@
 	return GF_OK;
 }
 
-GF_Box *stsg_New()
+GF_Box *stsg_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SubTrackSampleGroupBox, GF_ISOM_BOX_TYPE_STSG);
 	return (GF_Box *)tmp;
@@ -7349,7 +6733,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stsg_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stsg_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -7365,7 +6749,7 @@
 	return GF_OK;
 }
 
-GF_Err stsg_Size(GF_Box *s)
+GF_Err stsg_box_size(GF_Box *s)
 {
 	GF_SubTrackSampleGroupBox *ptr = (GF_SubTrackSampleGroupBox *)s;
 	ptr->size += 6 + 4 * ptr->nb_groups;
@@ -7375,49 +6759,44 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void strk_del(GF_Box *s)
+void strk_box_del(GF_Box *s)
 {
-	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
-	if (ptr == NULL) return;
-	if (ptr->info) gf_isom_box_del((GF_Box *)ptr->info);
-	gf_free(ptr);
+	gf_free(s);
 }
 
-GF_Err strk_AddBox(GF_Box *s, GF_Box *a)
+GF_Err strk_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->info = (GF_SubTrackInformationBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_STRD:
 		if (ptr->strd) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->strd = a;
+		ptr->strd = a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
 
-GF_Err strk_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err strk_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
-	e = gf_isom_box_array_read(s, bs, strk_AddBox);
+	e = gf_isom_box_array_read(s, bs, strk_on_child_box);
 	if (e) return e;
 
 	if (!ptr->info) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing SubTrackInformationBox\n"));
 		return GF_ISOM_INVALID_FILE;
 	}
-	return e;
+	return GF_OK;
 }
 
-GF_Box *strk_New()
+GF_Box *strk_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SubTrackBox, GF_ISOM_BOX_TYPE_STRK);
 	return (GF_Box *)tmp;
@@ -7426,41 +6805,19 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err strk_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err strk_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	if (ptr->info) {
-		e = gf_isom_box_write((GF_Box *)ptr->info, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err strk_Size(GF_Box *s)
+GF_Err strk_box_size(GF_Box *s)
 {
-	GF_Err e;
-	GF_SubTrackBox *ptr = (GF_SubTrackBox *)s;
-
-	if (ptr->info) {
-		e = gf_isom_box_size((GF_Box *)ptr->info);
-		if (e) return e;
-		ptr->size += ptr->info->size;
-	}
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Err tref_AddBox(GF_Box *ptr, GF_Box *a)
-{
-	return gf_isom_box_add_default(ptr, a);
-}
-
-void tref_del(GF_Box *s)
+void tref_box_del(GF_Box *s)
 {
 	GF_TrackReferenceBox *ptr = (GF_TrackReferenceBox *)s;
 	if (ptr == NULL) return;
@@ -7468,12 +6825,12 @@
 }
 
 
-GF_Err tref_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tref_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, gf_isom_box_add_default, s->type);
+	return gf_isom_box_array_read_ex(s, bs, NULL, s->type);
 }
 
-GF_Box *tref_New()
+GF_Box *tref_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackReferenceBox, GF_ISOM_BOX_TYPE_TREF);
 	return (GF_Box *)tmp;
@@ -7481,20 +6838,20 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tref_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tref_box_write(GF_Box *s, GF_BitStream *bs)
 {
 //	GF_TrackReferenceBox *ptr = (GF_TrackReferenceBox *)s;
 	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err tref_Size(GF_Box *s)
+GF_Err tref_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void reftype_del(GF_Box *s)
+void reftype_box_del(GF_Box *s)
 {
 	GF_TrackReferenceTypeBox *ptr = (GF_TrackReferenceTypeBox *)s;
 	if (!ptr) return;
@@ -7503,7 +6860,7 @@
 }
 
 
-GF_Err reftype_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err reftype_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 bytesToRead;
 	u32 i;
@@ -7513,7 +6870,7 @@
 	if (!bytesToRead) return GF_OK;
 
 	ptr->trackIDCount = (u32) (bytesToRead) / sizeof(u32);
-	ptr->trackIDs = (u32 *) gf_malloc(ptr->trackIDCount * sizeof(u32));
+	ptr->trackIDs = (GF_ISOTrackID *) gf_malloc(ptr->trackIDCount * sizeof(GF_ISOTrackID));
 	if (!ptr->trackIDs) return GF_OUT_OF_MEM;
 
 	for (i = 0; i < ptr->trackIDCount; i++) {
@@ -7522,14 +6879,14 @@
 	return GF_OK;
 }
 
-GF_Box *reftype_New()
+GF_Box *reftype_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackReferenceTypeBox, GF_ISOM_BOX_TYPE_REFT);
 	return (GF_Box *)tmp;
 }
 
 
-GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex)
+GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, GF_ISOTrackID trackID, u16 *outRefIndex)
 {
 	u32 i;
 	if (!ref || !trackID) return GF_BAD_PARAM;
@@ -7543,7 +6900,7 @@
 		}
 	}
 
-	ref->trackIDs = (u32 *) gf_realloc(ref->trackIDs, (ref->trackIDCount + 1) * sizeof(u32) );
+	ref->trackIDs = (GF_ISOTrackID *) gf_realloc(ref->trackIDs, (ref->trackIDCount + 1) * sizeof(GF_ISOTrackID) );
 	if (!ref->trackIDs) return GF_OUT_OF_MEM;
 	ref->trackIDs[ref->trackIDCount] = trackID;
 	ref->trackIDCount++;
@@ -7555,14 +6912,12 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err reftype_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err reftype_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
 	GF_TrackReferenceTypeBox *ptr = (GF_TrackReferenceTypeBox *)s;
 	ptr->type = ptr->reference_type;
-	if (!ptr->trackIDCount) return GF_OK;
-
 	e = gf_isom_box_write_header(s, bs);
 	ptr->type = GF_ISOM_BOX_TYPE_REFT;
 	if (e) return e;
@@ -7573,12 +6928,10 @@
 }
 
 
-GF_Err reftype_Size(GF_Box *s)
+GF_Err reftype_box_size(GF_Box *s)
 {
 	GF_TrackReferenceTypeBox *ptr = (GF_TrackReferenceTypeBox *)s;
-	if (!ptr->trackIDCount)
-		ptr->size=0;
-	else
+	if (ptr->trackIDCount)
 		ptr->size += (ptr->trackIDCount * sizeof(u32));
 	return GF_OK;
 }
@@ -7589,7 +6942,7 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void trex_del(GF_Box *s)
+void trex_box_del(GF_Box *s)
 {
 	GF_TrackExtendsBox *ptr = (GF_TrackExtendsBox *)s;
 	if (ptr == NULL) return;
@@ -7597,10 +6950,11 @@
 }
 
 
-GF_Err trex_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trex_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackExtendsBox *ptr = (GF_TrackExtendsBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 20);
 	ptr->trackID = gf_bs_read_u32(bs);
 	ptr->def_sample_desc_index = gf_bs_read_u32(bs);
 	ptr->def_sample_duration = gf_bs_read_u32(bs);
@@ -7609,7 +6963,7 @@
 	return GF_OK;
 }
 
-GF_Box *trex_New()
+GF_Box *trex_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackExtendsBox, GF_ISOM_BOX_TYPE_TREX);
 	return (GF_Box *)tmp;
@@ -7620,7 +6974,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err trex_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trex_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackExtendsBox *ptr = (GF_TrackExtendsBox *) s;
@@ -7637,7 +6991,7 @@
 	return GF_OK;
 }
 
-GF_Err trex_Size(GF_Box *s)
+GF_Err trex_box_size(GF_Box *s)
 {
 	GF_TrackExtendsBox *ptr = (GF_TrackExtendsBox *)s;
 	ptr->size += 20;
@@ -7650,7 +7004,7 @@
 
 
 
-void trep_del(GF_Box *s)
+void trep_box_del(GF_Box *s)
 {
 	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
 	if (ptr == NULL) return;
@@ -7658,20 +7012,20 @@
 }
 
 
-GF_Err trep_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trep_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
 
-	ptr->trackID = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->trackID = gf_bs_read_u32(bs);
 
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
-GF_Box *trep_New()
+GF_Box *trep_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackExtensionPropertiesBox, GF_ISOM_BOX_TYPE_TREP);
-	tmp->other_boxes = gf_list_new();
+	tmp->child_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
@@ -7680,7 +7034,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err trep_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trep_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *) s;
@@ -7692,7 +7046,7 @@
 	return GF_OK;
 }
 
-GF_Err trep_Size(GF_Box *s)
+GF_Err trep_box_size(GF_Box *s)
 {
 	GF_TrackExtensionPropertiesBox *ptr = (GF_TrackExtensionPropertiesBox *)s;
 	ptr->size += 4;
@@ -7709,85 +7063,239 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-void trun_del(GF_Box *s)
+void trun_box_del(GF_Box *s)
 {
-	GF_TrunEntry *p;
 	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *)s;
 	if (ptr == NULL) return;
 
 	while (gf_list_count(ptr->entries)) {
-		p = (GF_TrunEntry*)gf_list_get(ptr->entries, 0);
+		GF_TrunEntry *p = (GF_TrunEntry*)gf_list_get(ptr->entries, 0);
 		gf_list_rem(ptr->entries, 0);
 		gf_free(p);
 	}
 	gf_list_del(ptr->entries);
 	if (ptr->cache) gf_bs_del(ptr->cache);
+	if (ptr->sample_order) gf_free(ptr->sample_order);
 	gf_free(ptr);
 }
 
-GF_Err trun_Read(GF_Box *s, GF_BitStream *bs)
+#ifdef GF_ENABLE_CTRN
+
+static u32 ctrn_field_size(u32 field_idx)
+{
+	if (field_idx==3) return 4;
+	return field_idx;
+}
+
+u32 gf_isom_ctrn_field_size_bits(u32 field_idx)
+{
+	if (field_idx==3) return 32;
+	return field_idx*8;
+}
+static u32 ctrn_read_flags(GF_BitStream *bs, u32 nbbits)
+{
+	u32 val = gf_bs_read_int(bs, nbbits);
+	if (nbbits==16) val <<= 16;
+	else if (nbbits==8) val <<= 24;
+	return val;
+}
+
+static GF_Err ctrn_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 i, count, flags, first_idx=0;
+	Bool inherit_dur, inherit_size, inherit_flags, inherit_ctso;
+	GF_TrunEntry *ent;
+	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *)s;
+	flags = ptr->flags;
+	ptr->ctrn_flags = flags;
+	ptr->flags = 0;
+
+	ptr->sample_count = gf_bs_read_u16(bs);
+	ISOM_DECREASE_SIZE(ptr, 2);
+
+	if (flags & GF_ISOM_TRUN_DATA_OFFSET) {
+		if (flags & GF_ISOM_CTRN_DATAOFFSET_16) {
+			ptr->data_offset = gf_bs_read_u16(bs);
+			ISOM_DECREASE_SIZE(ptr, 2);
+		} else {
+			ptr->data_offset = gf_bs_read_u32(bs);
+			ISOM_DECREASE_SIZE(ptr, 4);
+		}
+		ptr->flags |= GF_ISOM_TRUN_DATA_OFFSET;
+	}
+	if (flags & GF_ISOM_CTRN_CTSO_MULTIPLIER) {
+		ptr->ctso_multiplier = gf_bs_read_u16(bs);
+		ISOM_DECREASE_SIZE(ptr, 2);
+	}
+	/*no sample dur/sample_flag/size/ctso for first or following, create a pack sample */
+	if (! (flags & 0x00FFFF00)) {
+		GF_SAFEALLOC(ent, GF_TrunEntry);
+		if (!ent) return GF_OUT_OF_MEM;
+		ent->nb_pack = ptr->sample_count;
+		gf_list_add(ptr->entries, ent);
+		return GF_OK;
+	}
+	/*allocate all entries*/
+	for (i=0; i<ptr->sample_count; i++) {
+		GF_SAFEALLOC(ent, GF_TrunEntry);
+		if (!ent) return GF_OUT_OF_MEM;
+		gf_list_add(ptr->entries, ent);
+	}
+	//unpack flags
+	ptr->ctrn_first_dur = (flags>>22) & 0x3;
+	ptr->ctrn_first_size = (flags>>20) & 0x3;
+	ptr->ctrn_first_sample_flags = (flags>>18) & 0x3;
+	ptr->ctrn_first_ctts = (flags>>16) & 0x3;
+	ptr->ctrn_dur = (flags>>14) & 0x3;
+	ptr->ctrn_size = (flags>>12) & 0x3;
+	ptr->ctrn_sample_flags = (flags>>10) & 0x3;
+	ptr->ctrn_ctts = (flags>>8) & 0x3;
+
+	inherit_dur = flags & GF_ISOM_CTRN_INHERIT_DUR;
+	inherit_size = flags & GF_ISOM_CTRN_INHERIT_SIZE;
+	inherit_flags = flags & GF_ISOM_CTRN_INHERIT_FLAGS;
+	inherit_ctso = flags & GF_ISOM_CTRN_INHERIT_CTSO;
+
+	if (flags & GF_ISOM_CTRN_FIRST_SAMPLE) {
+		ent = gf_list_get(ptr->entries, 0);
+		first_idx = 1;
+		if (!inherit_dur && ptr->ctrn_first_dur) {
+			ent->Duration = gf_bs_read_int(bs, gf_isom_ctrn_field_size_bits(ptr->ctrn_first_dur) );
+			ISOM_DECREASE_SIZE(ptr, ctrn_field_size(ptr->ctrn_first_dur) );
+		}
+		if (!inherit_size && ptr->ctrn_first_size) {
+			ent->size = gf_bs_read_int(bs, gf_isom_ctrn_field_size_bits(ptr->ctrn_first_size) );
+			ISOM_DECREASE_SIZE(ptr, ctrn_field_size(ptr->ctrn_first_size) );
+		}
+		if (!inherit_flags && ptr->ctrn_first_sample_flags) {
+			ent->flags = ctrn_read_flags(bs, gf_isom_ctrn_field_size_bits(ptr->ctrn_first_sample_flags) );
+			ISOM_DECREASE_SIZE(ptr, ctrn_field_size(ptr->ctrn_first_sample_flags) );
+		}
+		if (!inherit_ctso && ptr->ctrn_first_ctts) {
+			ent->CTS_Offset = gf_bs_read_int(bs, gf_isom_ctrn_field_size_bits(ptr->ctrn_first_ctts) );
+			ISOM_DECREASE_SIZE(ptr, ctrn_field_size(ptr->ctrn_first_ctts) );
+			if (ptr->ctso_multiplier)
+				ent->CTS_Offset *= (s32) ptr->ctso_multiplier;
+		}
+	}
+	count = ptr->sample_count - first_idx;
+	if (!inherit_dur && ptr->ctrn_dur) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ptr->ctrn_dur);
+		ISOM_DECREASE_SIZE(ptr, count * nbbits / 8);
+		for (i=first_idx; i<ptr->sample_count; i++) {
+			ent = gf_list_get(ptr->entries, i);
+			ent->Duration = gf_bs_read_int(bs, nbbits);
+		}
+	}
+	if (!inherit_size && ptr->ctrn_size) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ptr->ctrn_size);
+		ISOM_DECREASE_SIZE(ptr, count * nbbits / 8);
+		for (i=first_idx; i<ptr->sample_count; i++) {
+			ent = gf_list_get(ptr->entries, i);
+			ent->size = gf_bs_read_int(bs, nbbits);
+		}
+	}
+	if (!inherit_flags && ptr->ctrn_sample_flags) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ptr->ctrn_sample_flags);
+		ISOM_DECREASE_SIZE(ptr, count * nbbits / 8);
+		for (i=first_idx; i<ptr->sample_count; i++) {
+			ent = gf_list_get(ptr->entries, i);
+			ent->flags = ctrn_read_flags(bs, nbbits);
+		}
+	}
+	if (!inherit_ctso && ptr->ctrn_ctts) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ptr->ctrn_ctts);
+		ISOM_DECREASE_SIZE(ptr, count * nbbits / 8);
+		for (i=first_idx; i<ptr->sample_count; i++) {
+			ent = gf_list_get(ptr->entries, i);
+			ent->CTS_Offset = gf_bs_read_int(bs, nbbits);
+			if (ptr->ctso_multiplier)
+				ent->CTS_Offset *= (s32) ptr->ctso_multiplier;
+		}
+	}
+
+	return GF_OK;
+}
+#endif
+
+GF_Err trun_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_TrunEntry *p;
 	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *)s;
 
+#ifdef GF_ENABLE_CTRN
+	if (ptr->type == GF_ISOM_BOX_TYPE_CTRN) {
+		ptr->type = GF_ISOM_BOX_TYPE_TRUN;
+		ptr->use_ctrn = GF_TRUE;
+		return ctrn_box_read(s, bs);
+	}
+#endif
+
 	//check this is a good file
 	if ((ptr->flags & GF_ISOM_TRUN_FIRST_FLAG) && (ptr->flags & GF_ISOM_TRUN_FLAGS))
 		return GF_ISOM_INVALID_FILE;
 
-	ptr->sample_count = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->sample_count = gf_bs_read_u32(bs);
 
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRUN_DATA_OFFSET) {
-		ptr->data_offset = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->data_offset = gf_bs_read_u32(bs);
 	}
 	if (ptr->flags & GF_ISOM_TRUN_FIRST_FLAG) {
-		ptr->first_sample_flags = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->first_sample_flags = gf_bs_read_u32(bs);
 	}
 	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
 		GF_SAFEALLOC(p, GF_TrunEntry);
+		if (!p) return GF_OUT_OF_MEM;
 		p->nb_pack = ptr->sample_count;
 		gf_list_add(ptr->entries, p);
-		return GF_OK;
-	}
-
-	//read each entry (even though nothing may be written)
-	for (i=0; i<ptr->sample_count; i++) {
-		u32 trun_size = 0;
-		p = (GF_TrunEntry *) gf_malloc(sizeof(GF_TrunEntry));
-		if (!p) return GF_OUT_OF_MEM;
-		memset(p, 0, sizeof(GF_TrunEntry));
+	} else {
 
-		if (ptr->flags & GF_ISOM_TRUN_DURATION) {
-			p->Duration = gf_bs_read_u32(bs);
-			trun_size += 4;
-		}
-		if (ptr->flags & GF_ISOM_TRUN_SIZE) {
-			p->size = gf_bs_read_u32(bs);
-			trun_size += 4;
-		}
-		//SHOULDN'T BE USED IF GF_ISOM_TRUN_FIRST_FLAG IS DEFINED
-		if (ptr->flags & GF_ISOM_TRUN_FLAGS) {
-			p->flags = gf_bs_read_u32(bs);
-			trun_size += 4;
-		}
-		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
-			if (ptr->version==0) {
-				p->CTS_Offset = (u32) gf_bs_read_u32(bs);
-			} else {
-				p->CTS_Offset = (s32) gf_bs_read_u32(bs);
+		//read each entry (even though nothing may be written)
+		for (i=0; i<ptr->sample_count; i++) {
+			u32 trun_size = 0;
+			p = (GF_TrunEntry *) gf_malloc(sizeof(GF_TrunEntry));
+			if (!p) return GF_OUT_OF_MEM;
+			memset(p, 0, sizeof(GF_TrunEntry));
+
+			if (ptr->flags & GF_ISOM_TRUN_DURATION) {
+				p->Duration = gf_bs_read_u32(bs);
+				trun_size += 4;
+			}
+			if (ptr->flags & GF_ISOM_TRUN_SIZE) {
+				p->size = gf_bs_read_u32(bs);
+				trun_size += 4;
 			}
+			//SHOULDN'T BE USED IF GF_ISOM_TRUN_FIRST_FLAG IS DEFINED
+			if (ptr->flags & GF_ISOM_TRUN_FLAGS) {
+				p->flags = gf_bs_read_u32(bs);
+				trun_size += 4;
+			}
+			if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
+				if (ptr->version==0) {
+					p->CTS_Offset = (u32) gf_bs_read_u32(bs);
+				} else {
+					p->CTS_Offset = (s32) gf_bs_read_u32(bs);
+				}
+				trun_size += 4;
+			}
+			gf_list_add(ptr->entries, p);
+			ISOM_DECREASE_SIZE(ptr, trun_size);
 		}
-		gf_list_add(ptr->entries, p);
-		ISOM_DECREASE_SIZE(ptr, trun_size);
+	}
+	/*todo parse sample reorder*/
+	if (ptr->size) {
+		gf_bs_skip_bytes(bs, ptr->size);
+		ptr->size = 0;
 	}
 	return GF_OK;
 }
 
-GF_Box *trun_New()
+GF_Box *trun_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackFragmentRunBox, GF_ISOM_BOX_TYPE_TRUN);
 	tmp->entries = gf_list_new();
@@ -7795,19 +7303,110 @@
 	return (GF_Box *)tmp;
 }
 
+#ifndef GPAC_DISABLE_ISOM_WRITE
 
+#ifdef GF_ENABLE_CTRN
+static void ctrn_write_sample_flags(GF_BitStream *bs, u32 flags, u32 field_size)
+{
+	if (!field_size) return;
 
-#ifndef GPAC_DISABLE_ISOM_WRITE
+	if (field_size==8) flags = flags>>24;
+	else if (field_size==16) flags = flags>>16;
+	gf_bs_write_int(bs, flags, field_size);
+}
 
 
-GF_Err trun_Write(GF_Box *s, GF_BitStream *bs)
+static void ctrn_write_ctso(GF_TrackFragmentRunBox *ctrn, GF_BitStream *bs, u32 ctso, u32 field_size)
+{
+	if (!field_size) return;
+
+	if (ctrn->ctso_multiplier) {
+		gf_bs_write_int(bs, ctso / ctrn->ctso_multiplier, field_size);
+	} else {
+		gf_bs_write_int(bs, ctso, field_size);
+	}
+}
+
+GF_Err ctrn_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i, count, flags;
+	GF_TrunEntry *ent;
+	GF_TrackFragmentRunBox *ctrn = (GF_TrackFragmentRunBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	flags = ctrn->flags;
+	ctrn->flags = ctrn->ctrn_flags;
+	ctrn->type = GF_ISOM_BOX_TYPE_CTRN;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	ctrn->flags = flags;
+	ctrn->type = GF_ISOM_BOX_TYPE_TRUN;
+
+	gf_bs_write_u16(bs, ctrn->sample_count);
+	if (ctrn->flags & GF_ISOM_TRUN_DATA_OFFSET) {
+		if (ctrn->ctrn_flags & GF_ISOM_CTRN_DATAOFFSET_16) {
+			gf_bs_write_u16(bs, ctrn->data_offset);
+		} else {
+			gf_bs_write_u32(bs, ctrn->data_offset);
+		}
+	}
+	if (ctrn->ctso_multiplier) {
+		gf_bs_write_u16(bs, ctrn->ctso_multiplier);
+	}
+	/*we always write first sample using first flags*/
+	ent = gf_list_get(ctrn->entries, 0);
+	gf_bs_write_int(bs, ent->Duration, gf_isom_ctrn_field_size_bits(ctrn->ctrn_first_dur) );
+	gf_bs_write_int(bs, ent->size, gf_isom_ctrn_field_size_bits(ctrn->ctrn_first_size) );
+	ctrn_write_sample_flags(bs, ent->flags, gf_isom_ctrn_field_size_bits(ctrn->ctrn_first_sample_flags) );
+	ctrn_write_ctso(ctrn,bs, ent->CTS_Offset, gf_isom_ctrn_field_size_bits(ctrn->ctrn_first_ctts) );
+
+	count = gf_list_count(ctrn->entries);
+	if (ctrn->ctrn_dur) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ctrn->ctrn_dur);
+		for (i=1; i<count; i++) {
+			GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+			gf_bs_write_int(bs, a_ent->Duration, nbbits);
+		}
+	}
+	if (ctrn->ctrn_size) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ctrn->ctrn_size);
+		for (i=1; i<count; i++) {
+			GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+			gf_bs_write_int(bs, a_ent->size, nbbits);
+		}
+	}
+	if (ctrn->ctrn_sample_flags) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ctrn->ctrn_sample_flags);
+		for (i=1; i<count; i++) {
+			GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+			ctrn_write_sample_flags(bs, a_ent->flags, nbbits);
+		}
+	}
+	if (ctrn->ctrn_ctts) {
+		u32 nbbits = gf_isom_ctrn_field_size_bits(ctrn->ctrn_ctts);
+		for (i=1; i<count; i++) {
+			GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+			ctrn_write_ctso(ctrn, bs, a_ent->CTS_Offset, nbbits);
+		}
+	}
+
+	return GF_OK;
+}
+#endif
+
+GF_Err trun_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_TrunEntry *p;
 	GF_Err e;
 	u32 i, count;
 	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
+#ifdef GF_ENABLE_CTRN
+	if (ptr->use_ctrn)
+		return ctrn_box_write(s, bs);
+#endif
+
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 
@@ -7821,45 +7420,233 @@
 		gf_bs_write_u32(bs, ptr->first_sample_flags);
 	}
 
-	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
-		return GF_OK;
+	if (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) )  {
+
+		count = gf_list_count(ptr->entries);
+		for (i=0; i<count; i++) {
+			GF_TrunEntry *p = (GF_TrunEntry*)gf_list_get(ptr->entries, i);
+
+			if (ptr->flags & GF_ISOM_TRUN_DURATION) {
+				gf_bs_write_u32(bs, p->Duration);
+			}
+			if (ptr->flags & GF_ISOM_TRUN_SIZE) {
+				gf_bs_write_u32(bs, p->size);
+			}
+			//SHOULDN'T BE USED IF GF_ISOM_TRUN_FIRST_FLAG IS DEFINED
+			if (ptr->flags & GF_ISOM_TRUN_FLAGS) {
+				gf_bs_write_u32(bs, p->flags);
+			}
+			if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
+				if (ptr->version==0) {
+					gf_bs_write_u32(bs, p->CTS_Offset);
+				} else {
+					gf_bs_write_u32(bs, (u32) p->CTS_Offset);
+				}
+			}
+		}
 	}
 
-	count = gf_list_count(ptr->entries);
-	for (i=0; i<count; i++) {
-		p = (GF_TrunEntry*)gf_list_get(ptr->entries, i);
+	if (ptr->sample_order) {
+		u32 nb_bits = 8;
+		if (ptr->sample_count>0xFFFFFF) nb_bits = 32;
+		else if (ptr->sample_count>0xFFFF) nb_bits = 24;
+		else if (ptr->sample_count>0xFF) nb_bits = 16;
 
-		if (ptr->flags & GF_ISOM_TRUN_DURATION) {
-			gf_bs_write_u32(bs, p->Duration);
+		for (i=0; i<ptr->sample_count; i++) {
+			gf_bs_write_int(bs, ptr->sample_order[i], nb_bits);
 		}
-		if (ptr->flags & GF_ISOM_TRUN_SIZE) {
-			gf_bs_write_u32(bs, p->size);
+	}
+	return GF_OK;
+}
+
+#ifdef GF_ENABLE_CTRN
+static u32 ctrn_sample_flags_to_index(u32 val)
+{
+	if (!val) return 0;
+	if (val & 0x0000FFFF)
+		return 3;
+	if (val & 0x00FF0000)
+		return 2;
+	return 1;
+}
+static u32 ctrn_u32_to_index(u32 val)
+{
+	if (!val) return 0;
+	if (val<=255) return 1;
+	if (val<=65535) return 2;
+	return 3;
+}
+static u32 ctrn_s32_to_index(s32 val)
+{
+	if (!val) return 0;
+	if (ABS(val)<=127) return 1;
+	if (ABS(val)<=32767) return 2;
+	return 3;
+}
+static u32 ctrn_ctts_to_index(GF_TrackFragmentRunBox *ctrn, s32 ctts)
+{
+	if (!(ctrn->flags & GF_ISOM_TRUN_CTS_OFFSET))
+		return 0;
+
+	if (!ctts) return 0;
+
+	if (ctrn->version) {
+		if (ctrn->ctso_multiplier) return ctrn_s32_to_index(ctts / ctrn->ctso_multiplier);
+		return ctrn_s32_to_index(ctts);
+	}
+	assert(ctts>0);
+	if (ctrn->ctso_multiplier) return ctrn_u32_to_index((u32)ctts / ctrn->ctso_multiplier);
+	return ctrn_s32_to_index((u32)ctts);
+}
+
+static GF_Err ctrn_box_size(GF_TrackFragmentRunBox *ctrn)
+{
+	Bool use_ctso_multi = GF_TRUE;
+	u32 i, count;
+	GF_TrunEntry *ent;
+
+	ctrn->ctrn_flags = 0;
+	ctrn->ctrn_first_dur = ctrn->ctrn_first_size = ctrn->ctrn_first_sample_flags = ctrn->ctrn_first_ctts = 0;
+	ctrn->ctrn_dur = ctrn->ctrn_size = ctrn->ctrn_sample_flags = ctrn->ctrn_ctts = 0;
+
+	ctrn->size += 2; //16 bits for sample count
+	if (ctrn->flags & GF_ISOM_TRUN_DATA_OFFSET) {
+		ctrn->ctrn_flags |= GF_ISOM_TRUN_DATA_OFFSET;
+		if (ABS(ctrn->data_offset) < 32767) {
+			ctrn->size += 2;
+			ctrn->ctrn_flags |= GF_ISOM_CTRN_DATAOFFSET_16;
+		} else
+			ctrn->size += 4;
+	}
+
+	count = gf_list_count(ctrn->entries);
+	if (ctrn->ctso_multiplier && (ctrn->flags & GF_ISOM_TRUN_CTS_OFFSET) && (ctrn->ctso_multiplier<=0xFFFF) ) {
+		for (i=0; i<count; i++) {
+			GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+			if (a_ent->CTS_Offset % ctrn->ctso_multiplier) {
+				use_ctso_multi = GF_FALSE;
+				break;
+			}
 		}
-		//SHOULDN'T BE USED IF GF_ISOM_TRUN_FIRST_FLAG IS DEFINED
-		if (ptr->flags & GF_ISOM_TRUN_FLAGS) {
-			gf_bs_write_u32(bs, p->flags);
+	} else {
+		use_ctso_multi = GF_FALSE;
+	}
+	if (ctrn->use_inherit) {
+		use_ctso_multi = GF_FALSE;
+		ctrn->ctrn_flags |= 0xB0; //duration=1,size=0,flags=1,cts=1 << 4
+	}
+
+	if (use_ctso_multi) {
+		ctrn->size += 2;
+		ctrn->ctrn_flags |= GF_ISOM_CTRN_CTSO_MULTIPLIER;
+	} else {
+		ctrn->ctso_multiplier = 0;
+	}
+
+	/*we always write first sample using first flags*/
+	ent = gf_list_get(ctrn->entries, 0);
+	ctrn->ctrn_flags |= GF_ISOM_CTRN_FIRST_SAMPLE;
+
+	if (!ctrn->use_inherit && (ctrn->flags & GF_ISOM_TRUN_DURATION)) {
+		ctrn->ctrn_first_dur = ctrn_u32_to_index(ent->Duration);
+		if (ctrn->ctrn_first_dur) {
+			ctrn->size += ctrn_field_size(ctrn->ctrn_first_dur);
+			ctrn->ctrn_flags |= ctrn->ctrn_first_dur<<22;
 		}
-		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) {
-			if (ptr->version==0) {
-				gf_bs_write_u32(bs, p->CTS_Offset);
-			} else {
-				gf_bs_write_u32(bs, (u32) p->CTS_Offset);
-			}
+	}
+
+	if (ctrn->flags & GF_ISOM_TRUN_SIZE) {
+		ctrn->ctrn_first_size = ctrn_u32_to_index(ent->size);
+		if (ctrn->ctrn_first_size) {
+			ctrn->size += ctrn_field_size(ctrn->ctrn_first_size);
+			ctrn->ctrn_flags |= ctrn->ctrn_first_size<<20;
 		}
 	}
+
+	if (!ctrn->use_inherit && (ctrn->flags & GF_ISOM_TRUN_FLAGS)) {
+		ctrn->ctrn_first_sample_flags = ctrn_sample_flags_to_index(ent->flags);
+		if (ctrn->ctrn_first_sample_flags) {
+			ctrn->size += ctrn_field_size(ctrn->ctrn_first_sample_flags);
+			ctrn->ctrn_flags |= ctrn->ctrn_first_sample_flags<<18;
+		}
+	}
+	if (!ctrn->use_inherit && (ctrn->flags & GF_ISOM_TRUN_CTS_OFFSET)) {
+		ctrn->ctrn_first_ctts = ctrn_ctts_to_index(ctrn, ent->CTS_Offset);
+		if (ctrn->ctrn_first_ctts) {
+			ctrn->size += ctrn_field_size(ctrn->ctrn_first_ctts);
+			ctrn->ctrn_flags |= ctrn->ctrn_first_ctts<<16;
+		}
+	}
+
+	for (i=1; i<count; i++) {
+		u8 field_idx;
+		GF_TrunEntry *a_ent = gf_list_get(ctrn->entries, i);
+
+		if (!ctrn->use_inherit && (ctrn->flags & GF_ISOM_TRUN_DURATION)) {
+			field_idx = ctrn_u32_to_index(a_ent->Duration);
+			if (ctrn->ctrn_dur < field_idx)
+				ctrn->ctrn_dur = field_idx;
+		}
+		if (ctrn->flags & GF_ISOM_TRUN_SIZE) {
+			field_idx = ctrn_u32_to_index(a_ent->size);
+			if (ctrn->ctrn_size < field_idx)
+				ctrn->ctrn_size = field_idx;
+		}
+		if (!ctrn->use_inherit && (ctrn->flags & GF_ISOM_TRUN_FLAGS)) {
+			field_idx = ctrn_sample_flags_to_index(a_ent->flags);
+			if (ctrn->ctrn_sample_flags < field_idx)
+				ctrn->ctrn_sample_flags = field_idx;
+		}
+		if (!ctrn->use_inherit) {
+			field_idx = ctrn_ctts_to_index(ctrn, a_ent->CTS_Offset);
+			if (ctrn->ctrn_ctts < field_idx)
+				ctrn->ctrn_ctts = field_idx;
+		}
+	}
+	count-=1;
+	if (ctrn->ctrn_dur) {
+		ctrn->size += count * ctrn_field_size(ctrn->ctrn_dur);
+		ctrn->ctrn_flags |= ctrn->ctrn_dur<<14;
+	}
+	if (ctrn->ctrn_size) {
+		ctrn->size += count * ctrn_field_size(ctrn->ctrn_size);
+		ctrn->ctrn_flags |= ctrn->ctrn_size<<12;
+	}
+	if (ctrn->ctrn_sample_flags) {
+		ctrn->size += count * ctrn_field_size(ctrn->ctrn_sample_flags);
+		ctrn->ctrn_flags |= ctrn->ctrn_sample_flags<<10;
+	}
+	if (ctrn->ctrn_ctts) {
+		ctrn->size += count * ctrn_field_size(ctrn->ctrn_ctts);
+		ctrn->ctrn_flags |= ctrn->ctrn_ctts<<8;
+	}
 	return GF_OK;
 }
+#endif
 
-GF_Err trun_Size(GF_Box *s)
+GF_Err trun_box_size(GF_Box *s)
 {
 	u32 i, count;
 	GF_TrackFragmentRunBox *ptr = (GF_TrackFragmentRunBox *)s;
 
+#ifdef GF_ENABLE_CTRN
+	if (ptr->use_ctrn)
+		return ctrn_box_size(ptr);
+#endif
+
 	ptr->size += 4;
 	//The rest depends on the flags
 	if (ptr->flags & GF_ISOM_TRUN_DATA_OFFSET) ptr->size += 4;
 	if (ptr->flags & GF_ISOM_TRUN_FIRST_FLAG) ptr->size += 4;
 
+	if (ptr->sample_order) {
+		u32 nb_bytes = 1;
+		if (ptr->sample_count>0xFFFFFF) nb_bytes = 4;
+		else if (ptr->sample_count>0xFFFF) nb_bytes = 3;
+		else if (ptr->sample_count>0xFF) nb_bytes = 2;
+		ptr->size += ptr->sample_count*nb_bytes;
+	}
+
 	if (! (ptr->flags & (GF_ISOM_TRUN_DURATION | GF_ISOM_TRUN_SIZE | GF_ISOM_TRUN_FLAGS | GF_ISOM_TRUN_CTS_OFFSET) ) ) {
 		return GF_OK;
 	}
@@ -7873,7 +7660,6 @@
 		if (ptr->flags & GF_ISOM_TRUN_FLAGS) ptr->size += 4;
 		if (ptr->flags & GF_ISOM_TRUN_CTS_OFFSET) ptr->size += 4;
 	}
-
 	return GF_OK;
 }
 
@@ -7884,20 +7670,21 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-void tsro_del(GF_Box *s)
+void tsro_box_del(GF_Box *s)
 {
 	GF_TimeOffHintEntryBox *tsro = (GF_TimeOffHintEntryBox *)s;
 	gf_free(tsro);
 }
 
-GF_Err tsro_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tsro_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TimeOffHintEntryBox *ptr = (GF_TimeOffHintEntryBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->TimeOffset = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
-GF_Box *tsro_New()
+GF_Box *tsro_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TimeOffHintEntryBox, GF_ISOM_BOX_TYPE_TSRO);
 	return (GF_Box *)tmp;
@@ -7905,7 +7692,7 @@
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tsro_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tsro_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TimeOffHintEntryBox *ptr = (GF_TimeOffHintEntryBox *)s;
@@ -7917,7 +7704,7 @@
 	return GF_OK;
 }
 
-GF_Err tsro_Size(GF_Box *s)
+GF_Err tsro_box_size(GF_Box *s)
 {
 	s->size += 4;
 	return GF_OK;
@@ -7925,7 +7712,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void udta_del(GF_Box *s)
+void udta_box_del(GF_Box *s)
 {
 	u32 i;
 	GF_UserDataMap *map;
@@ -7933,7 +7720,7 @@
 	if (ptr == NULL) return;
 	i=0;
 	while ((map = (GF_UserDataMap *)gf_list_enum(ptr->recordList, &i))) {
-		gf_isom_box_array_del(map->other_boxes);
+		gf_isom_box_array_del(map->boxes);
 		gf_free(map);
 	}
 	gf_list_del(ptr->recordList);
@@ -7955,7 +7742,7 @@
 	return NULL;
 }
 
-GF_Err udta_AddBox(GF_Box *s, GF_Box *a)
+GF_Err udta_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_Err e;
 	u32 box_type;
@@ -7964,12 +7751,14 @@
 	if (!ptr) return GF_BAD_PARAM;
 	if (!a) return GF_OK;
 
+	//detach from parent list if any
+	gf_list_del_item(ptr->child_boxes, a);
+
 	/* for unknown udta boxes, we reference them by their original box type */
 	box_type = a->type;
 	if (box_type == GF_ISOM_BOX_TYPE_UNKNOWN) {
 		GF_UnknownBox* unkn = (GF_UnknownBox *)a;
-		if (unkn)
-			box_type = unkn->original_4cc;
+		box_type = unkn->original_4cc;
 	}
 
 	map = udta_getEntry(ptr, box_type, (a->type==GF_ISOM_BOX_TYPE_UUID) ? & ((GF_UUIDBox *)a)->uuid : NULL);
@@ -7981,21 +7770,21 @@
 		map->boxType = box_type;
 		if (a->type == GF_ISOM_BOX_TYPE_UUID)
 			memcpy(map->uuid, ((GF_UUIDBox *)a)->uuid, 16);
-		map->other_boxes = gf_list_new();
-		if (!map->other_boxes) {
+		map->boxes = gf_list_new();
+		if (!map->boxes) {
 			gf_free(map);
 			return GF_OUT_OF_MEM;
 		}
 		e = gf_list_add(ptr->recordList, map);
 		if (e) return e;
 	}
-	return gf_list_add(map->other_boxes, a);
+	return gf_list_add(map->boxes, a);
 }
 
 
-GF_Err udta_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err udta_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e = gf_isom_box_array_read(s, bs, udta_AddBox);
+	GF_Err e = gf_isom_box_array_read(s, bs, udta_on_child_box);
 	if (e) return e;
 	if (s->size==4) {
 		u32 val = gf_bs_read_u32(bs);
@@ -8007,7 +7796,7 @@
 	return GF_OK;
 }
 
-GF_Box *udta_New()
+GF_Box *udta_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_UserDataBox, GF_ISOM_BOX_TYPE_UDTA);
 	tmp->recordList = gf_list_new();
@@ -8021,7 +7810,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err udta_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err udta_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -8034,13 +7823,13 @@
 	while ((map = (GF_UserDataMap *)gf_list_enum(ptr->recordList, &i))) {
 		//warning: here we are not passing the actual "parent" of the list
 		//but the UDTA box. The parent itself is not an box, we don't care about it
-		e = gf_isom_box_array_write(s, map->other_boxes, bs);
+		e = gf_isom_box_array_write(s, map->boxes, bs);
 		if (e) return e;
 	}
 	return GF_OK;
 }
 
-GF_Err udta_Size(GF_Box *s)
+GF_Err udta_box_size(GF_Box *s)
 {
 	GF_Err e;
 	u32 i;
@@ -8051,7 +7840,7 @@
 	while ((map = (GF_UserDataMap *)gf_list_enum(ptr->recordList, &i))) {
 		//warning: here we are not passing the actual "parent" of the list
 		//but the UDTA box. The parent itself is not an box, we don't care about it
-		e = gf_isom_box_array_size(s, map->other_boxes);
+		e = gf_isom_box_array_size(s, map->boxes);
 		if (e) return e;
 	}
 	return GF_OK;
@@ -8060,7 +7849,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void vmhd_del(GF_Box *s)
+void vmhd_box_del(GF_Box *s)
 {
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
 	if (ptr == NULL) return;
@@ -8068,15 +7857,16 @@
 }
 
 
-GF_Err vmhd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err vmhd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->reserved = gf_bs_read_u64(bs);
 	return GF_OK;
 }
 
-GF_Box *vmhd_New()
+GF_Box *vmhd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_VideoMediaHeaderBox, GF_ISOM_BOX_TYPE_VMHD);
 	tmp->flags = 1;
@@ -8087,7 +7877,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err vmhd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err vmhd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
@@ -8098,7 +7888,7 @@
 	return GF_OK;
 }
 
-GF_Err vmhd_Size(GF_Box *s)
+GF_Err vmhd_box_size(GF_Box *s)
 {
 	GF_VideoMediaHeaderBox *ptr = (GF_VideoMediaHeaderBox *)s;
 	ptr->size += 8;
@@ -8107,19 +7897,19 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void void_del(GF_Box *s)
+void void_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 
-GF_Err void_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err void_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	if (s->size) return GF_ISOM_INVALID_FILE;
 	return GF_OK;
 }
 
-GF_Box *void_New()
+GF_Box *void_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_VOID);
 	return tmp;
@@ -8128,13 +7918,13 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err void_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err void_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	gf_bs_write_u32(bs, 0);
 	return GF_OK;
 }
 
-GF_Err void_Size(GF_Box *s)
+GF_Err void_box_size(GF_Box *s)
 {
 	s->size = 4;
 	return GF_OK;
@@ -8144,15 +7934,14 @@
 
 
 
-GF_Box *pdin_New()
+GF_Box *pdin_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ProgressiveDownloadBox, GF_ISOM_BOX_TYPE_PDIN);
-	tmp->flags = 1;
 	return (GF_Box *)tmp;
 }
 
 
-void pdin_del(GF_Box *s)
+void pdin_box_del(GF_Box *s)
 {
 	GF_ProgressiveDownloadBox *ptr = (GF_ProgressiveDownloadBox*)s;
 	if (ptr == NULL) return;
@@ -8162,14 +7951,16 @@
 }
 
 
-GF_Err pdin_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err pdin_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_ProgressiveDownloadBox *ptr = (GF_ProgressiveDownloadBox*)s;
 
 	ptr->count = (u32) (ptr->size) / 8;
 	ptr->rates = (u32*)gf_malloc(sizeof(u32)*ptr->count);
+	if (!ptr->rates) return GF_OUT_OF_MEM;
 	ptr->times = (u32*)gf_malloc(sizeof(u32)*ptr->count);
+	if (!ptr->times) return GF_OUT_OF_MEM;
 	for (i=0; i<ptr->count; i++) {
 		ptr->rates[i] = gf_bs_read_u32(bs);
 		ptr->times[i] = gf_bs_read_u32(bs);
@@ -8180,7 +7971,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err pdin_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pdin_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -8194,7 +7985,7 @@
 	return GF_OK;
 }
 
-GF_Err pdin_Size(GF_Box *s)
+GF_Err pdin_box_size(GF_Box *s)
 {
 	GF_ProgressiveDownloadBox *ptr = (GF_ProgressiveDownloadBox *)s;
 	ptr->size += 8*ptr->count;
@@ -8206,15 +7997,14 @@
 
 
 
-GF_Box *sdtp_New()
+GF_Box *sdtp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleDependencyTypeBox, GF_ISOM_BOX_TYPE_SDTP);
-	tmp->flags = 1;
 	return (GF_Box *)tmp;
 }
 
 
-void sdtp_del(GF_Box *s)
+void sdtp_box_del(GF_Box *s)
 {
 	GF_SampleDependencyTypeBox *ptr = (GF_SampleDependencyTypeBox*)s;
 	if (ptr == NULL) return;
@@ -8223,7 +8013,7 @@
 }
 
 
-GF_Err sdtp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err sdtp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SampleDependencyTypeBox *ptr = (GF_SampleDependencyTypeBox*)s;
 
@@ -8232,6 +8022,7 @@
 	else if (ptr->sampleCount > (u32) ptr->size) return GF_ISOM_INVALID_FILE;
 
 	ptr->sample_info = (u8 *) gf_malloc(sizeof(u8)*ptr->sampleCount);
+	if (!ptr->sample_info) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, (char*)ptr->sample_info, ptr->sampleCount);
 	ISOM_DECREASE_SIZE(ptr, ptr->sampleCount);
 	return GF_OK;
@@ -8240,7 +8031,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err sdtp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sdtp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SampleDependencyTypeBox *ptr = (GF_SampleDependencyTypeBox *)s;
@@ -8250,7 +8041,7 @@
 	return GF_OK;
 }
 
-GF_Err sdtp_Size(GF_Box *s)
+GF_Err sdtp_box_size(GF_Box *s)
 {
 	GF_SampleDependencyTypeBox *ptr = (GF_SampleDependencyTypeBox *)s;
 	ptr->size += ptr->sampleCount;
@@ -8260,14 +8051,14 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *pasp_New()
+GF_Box *pasp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PixelAspectRatioBox, GF_ISOM_BOX_TYPE_PASP);
 	return (GF_Box *)tmp;
 }
 
 
-void pasp_del(GF_Box *s)
+void pasp_box_del(GF_Box *s)
 {
 	GF_PixelAspectRatioBox *ptr = (GF_PixelAspectRatioBox*)s;
 	if (ptr == NULL) return;
@@ -8275,19 +8066,19 @@
 }
 
 
-GF_Err pasp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err pasp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PixelAspectRatioBox *ptr = (GF_PixelAspectRatioBox*)s;
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->hSpacing = gf_bs_read_u32(bs);
 	ptr->vSpacing = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 8);
 	return GF_OK;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err pasp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pasp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PixelAspectRatioBox *ptr = (GF_PixelAspectRatioBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -8297,7 +8088,7 @@
 	return GF_OK;
 }
 
-GF_Err pasp_Size(GF_Box *s)
+GF_Err pasp_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -8307,14 +8098,14 @@
 
 
 
-GF_Box *clap_New()
+GF_Box *clap_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_CleanApertureBox, GF_ISOM_BOX_TYPE_CLAP);
 	return (GF_Box *)tmp;
 }
 
 
-void clap_del(GF_Box *s)
+void clap_box_del(GF_Box *s)
 {
 	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)s;
 	if (ptr == NULL) return;
@@ -8322,7 +8113,7 @@
 }
 
 
-GF_Err clap_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err clap_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)s;
 	ISOM_DECREASE_SIZE(ptr, 32);
@@ -8340,7 +8131,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err clap_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err clap_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_CleanApertureBox *ptr = (GF_CleanApertureBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -8356,7 +8147,7 @@
 	return GF_OK;
 }
 
-GF_Err clap_Size(GF_Box *s)
+GF_Err clap_box_size(GF_Box *s)
 {
 	s->size += 32;
 	return GF_OK;
@@ -8367,7 +8158,7 @@
 
 
 
-GF_Box *metx_New()
+GF_Box *metx_box_new()
 {
 	//type is overridden by the box constructor
 	ISOM_DECL_BOX_ALLOC(GF_MetaDataSampleEntryBox, GF_ISOM_BOX_TYPE_METX);
@@ -8376,7 +8167,7 @@
 }
 
 
-void metx_del(GF_Box *s)
+void metx_box_del(GF_Box *s)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox*)s;
 	if (ptr == NULL) return;
@@ -8386,30 +8177,26 @@
 	if (ptr->xml_namespace) gf_free(ptr->xml_namespace);
 	if (ptr->xml_schema_loc) gf_free(ptr->xml_schema_loc);
 	if (ptr->mime_type) gf_free(ptr->mime_type);
-	if (ptr->config) gf_isom_box_del((GF_Box *)ptr->config);
 	gf_free(ptr);
 }
 
 
-GF_Err metx_AddBox(GF_Box *s, GF_Box *a)
+GF_Err metx_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_SINF:
-		gf_list_add(ptr->protections, a);
-		break;
+		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;
+		ptr->config = (GF_TextConfigBox *)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err metx_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err metx_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 size, i;
 	GF_Err e;
@@ -8418,9 +8205,11 @@
 
 	e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)ptr, bs);
 	if (e) return e;
+	ISOM_DECREASE_SIZE(ptr, 8);
 
-	size = (u32) ptr->size - 8;
+	size = (u32) ptr->size;
 	str = gf_malloc(sizeof(char)*size);
+	if (!str) return GF_OUT_OF_MEM;
 
 	i=0;
 
@@ -8499,13 +8288,13 @@
 	}
 	ptr->size = size;
 	gf_free(str);
-	return gf_isom_box_array_read(s, bs, metx_AddBox);
+	return gf_isom_box_array_read(s, bs, metx_on_child_box);
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err metx_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err metx_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox *)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -8543,18 +8332,13 @@
 			gf_bs_write_data(bs, ptr->mime_type, (u32) strlen(ptr->mime_type));
 
 		gf_bs_write_u8(bs, 0);
-
-		if (ptr->config) {
-			gf_isom_box_write((GF_Box *)ptr->config, bs);
-		}
 	}
 
-	return gf_isom_box_array_write(s, ptr->protections, bs);
+	return GF_OK;
 }
 
-GF_Err metx_Size(GF_Box *s)
+GF_Err metx_box_size(GF_Box *s)
 {
-	GF_Err e;
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox *)s;
 	ptr->size += 8;
 
@@ -8586,28 +8370,22 @@
 		if (ptr->mime_type)
 			ptr->size += strlen(ptr->mime_type);
 		ptr->size++;
-
-		if (ptr->config) {
-			e = gf_isom_box_size((GF_Box *)ptr->config);
-			if (e) return e;
-			ptr->size += ptr->config->size;
-		}
 	}
-	return gf_isom_box_array_size(s, ptr->protections);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
 /* SimpleTextSampleEntry */
-GF_Box *txtc_New()
+GF_Box *txtc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TextConfigBox, GF_ISOM_BOX_TYPE_TXTC);
 	return (GF_Box *)tmp;
 }
 
 
-void txtc_del(GF_Box *s)
+void txtc_box_del(GF_Box *s)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox*)s;
 	if (ptr == NULL) return;
@@ -8616,34 +8394,20 @@
 	gf_free(ptr);
 }
 
-GF_Err txtc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err txtc_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	u32 size, i;
-	char *str;
 	GF_TextConfigBox *ptr = (GF_TextConfigBox*)s;
-
-	size = (u32) ptr->size;
-	str = (char *)gf_malloc(sizeof(char)*size);
-
-	i=0;
-
-	while (size) {
-		str[i] = gf_bs_read_u8(bs);
-		size--;
-		if (!str[i])
-			break;
-		i++;
-	}
-	if (i) ptr->config = gf_strdup(str);
-	gf_free(str);
-
+	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);
+	ptr->config[ptr->size] = 0;
 	return GF_OK;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err txtc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err txtc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox *)s;
 	GF_Err e = gf_isom_full_box_write(s, bs);
@@ -8655,7 +8419,7 @@
 	return GF_OK;
 }
 
-GF_Err txtc_Size(GF_Box *s)
+GF_Err txtc_box_size(GF_Box *s)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox *)s;
 	if (ptr->config)
@@ -8666,66 +8430,38 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *dac3_New()
+GF_Box *dac3_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AC3ConfigBox, GF_ISOM_BOX_TYPE_DAC3);
 	return (GF_Box *)tmp;
 }
 
-GF_Box *dec3_New()
+GF_Box *dec3_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AC3ConfigBox, GF_ISOM_BOX_TYPE_DAC3);
 	tmp->cfg.is_ec3 = 1;
 	return (GF_Box *)tmp;
 }
 
-void dac3_del(GF_Box *s)
+void dac3_box_del(GF_Box *s)
 {
 	GF_AC3ConfigBox *ptr = (GF_AC3ConfigBox *)s;
 	gf_free(ptr);
 }
 
+GF_Err gf_isom_ac3_config_parse_bs(GF_BitStream *bs, Bool is_ec3, GF_AC3Config *cfg);
 
-GF_Err dac3_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dac3_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AC3ConfigBox *ptr = (GF_AC3ConfigBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
-
-	if (ptr->cfg.is_ec3) {
-		u32 i;
-		ptr->cfg.brcode = gf_bs_read_int(bs, 13);
-		ptr->cfg.nb_streams = gf_bs_read_int(bs, 3) + 1;
-		for (i=0; i<ptr->cfg.nb_streams; i++) {
-			ptr->cfg.streams[i].fscod = gf_bs_read_int(bs, 2);
-			ptr->cfg.streams[i].bsid = gf_bs_read_int(bs, 5);
-			ptr->cfg.streams[i].bsmod = gf_bs_read_int(bs, 5);
-			ptr->cfg.streams[i].acmod = gf_bs_read_int(bs, 3);
-			ptr->cfg.streams[i].lfon = gf_bs_read_int(bs, 1);
-			gf_bs_read_int(bs, 3);
-			ptr->cfg.streams[i].nb_dep_sub = gf_bs_read_int(bs, 4);
-			if (ptr->cfg.streams[i].nb_dep_sub) {
-				ptr->cfg.streams[i].chan_loc = gf_bs_read_int(bs, 9);
-			} else {
-				gf_bs_read_int(bs, 1);
-			}
-		}
-	} else {
-		ptr->cfg.nb_streams = 1;
-		ptr->cfg.streams[0].fscod = gf_bs_read_int(bs, 2);
-		ptr->cfg.streams[0].bsid = gf_bs_read_int(bs, 5);
-		ptr->cfg.streams[0].bsmod = gf_bs_read_int(bs, 3);
-		ptr->cfg.streams[0].acmod = gf_bs_read_int(bs, 3);
-		ptr->cfg.streams[0].lfon = gf_bs_read_int(bs, 1);
-		ptr->cfg.brcode = gf_bs_read_int(bs, 5);
-		gf_bs_read_int(bs, 5);
-	}
-	return GF_OK;
+	return gf_isom_ac3_config_parse_bs(bs, ptr->cfg.is_ec3, &ptr->cfg);
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err dac3_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dac3_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AC3ConfigBox *ptr = (GF_AC3ConfigBox *)s;
@@ -8765,7 +8501,7 @@
 	return GF_OK;
 }
 
-GF_Err dac3_Size(GF_Box *s)
+GF_Err dac3_box_size(GF_Box *s)
 {
 	GF_AC3ConfigBox *ptr = (GF_AC3ConfigBox *)s;
 
@@ -8787,7 +8523,7 @@
 
 
 
-void lsrc_del(GF_Box *s)
+void lsrc_box_del(GF_Box *s)
 {
 	GF_LASERConfigurationBox *ptr = (GF_LASERConfigurationBox *)s;
 	if (ptr == NULL) return;
@@ -8796,16 +8532,17 @@
 }
 
 
-GF_Err lsrc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err lsrc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_LASERConfigurationBox *ptr = (GF_LASERConfigurationBox *)s;
 	ptr->hdr_size = (u32) ptr->size;
 	ptr->hdr = gf_malloc(sizeof(char)*ptr->hdr_size);
+	if (!ptr->hdr) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->hdr, ptr->hdr_size);
 	return GF_OK;
 }
 
-GF_Box *lsrc_New()
+GF_Box *lsrc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_LASERConfigurationBox, GF_ISOM_BOX_TYPE_LSRC);
 	return (GF_Box *)tmp;
@@ -8814,7 +8551,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err lsrc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err lsrc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_LASERConfigurationBox *ptr = (GF_LASERConfigurationBox *)s;
@@ -8824,7 +8561,7 @@
 	return GF_OK;
 }
 
-GF_Err lsrc_Size(GF_Box *s)
+GF_Err lsrc_box_size(GF_Box *s)
 {
 	GF_LASERConfigurationBox *ptr = (GF_LASERConfigurationBox *)s;
 	ptr->size += ptr->hdr_size;
@@ -8834,37 +8571,32 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void lsr1_del(GF_Box *s)
+void lsr1_box_del(GF_Box *s)
 {
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox *)s;
 	if (ptr == NULL) return;
 	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
-
 	if (ptr->slc) gf_odf_desc_del((GF_Descriptor *)ptr->slc);
-	if (ptr->lsr_config) gf_isom_box_del((GF_Box *) ptr->lsr_config);
-	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
 	gf_free(ptr);
 }
 
-GF_Err lsr1_AddBox(GF_Box *s, GF_Box *a)
+GF_Err lsr1_on_child_box(GF_Box *s, GF_Box *a)
 {
 	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;
+		ptr->lsr_config = (GF_LASERConfigurationBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_M4DS:
 		if (ptr->descr) ERROR_ON_DUPLICATED_BOX(a, ptr)
-			ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
+		ptr->descr = (GF_MPEG4ExtensionDescriptorsBox *)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err lsr1_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err lsr1_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox*)s;
@@ -8874,10 +8606,10 @@
 
 	ISOM_DECREASE_SIZE(ptr, 8);
 
-	return gf_isom_box_array_read(s, bs, lsr1_AddBox);
+	return gf_isom_box_array_read(s, bs, lsr1_on_child_box);
 }
 
-GF_Box *lsr1_New()
+GF_Box *lsr1_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_LASeRSampleEntryBox, GF_ISOM_BOX_TYPE_LSR1);
 	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
@@ -8888,7 +8620,7 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err lsr1_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err lsr1_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox *)s;
@@ -8897,40 +8629,22 @@
 
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
-	if (ptr->lsr_config) {
-		e = gf_isom_box_write((GF_Box *)ptr->lsr_config, bs);
-		if (e) return e;
-	}
-	if (ptr->descr) {
-		e = gf_isom_box_write((GF_Box *)ptr->descr, bs);
-		if (e) return e;
-	}
-	return e;
+	return GF_OK;
 }
 
-GF_Err lsr1_Size(GF_Box *s)
+GF_Err lsr1_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_LASeRSampleEntryBox *ptr = (GF_LASeRSampleEntryBox *)s;
-
 	s->size += 8;
-	if (ptr->lsr_config) {
-		e = gf_isom_box_size((GF_Box *)ptr->lsr_config);
-		if (e) return e;
-		ptr->size += ptr->lsr_config->size;
-	}
-	if (ptr->descr) {
-		e = gf_isom_box_size((GF_Box *)ptr->descr);
-		if (e) return e;
-		ptr->size += ptr->descr->size;
-	}
+	gf_isom_check_position(s, (GF_Box *)ptr->lsr_config, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void sidx_del(GF_Box *s)
+void sidx_box_del(GF_Box *s)
 {
 	GF_SegmentIndexBox *ptr = (GF_SegmentIndexBox *) s;
 	if (ptr == NULL) return;
@@ -8938,29 +8652,30 @@
 	gf_free(ptr);
 }
 
-GF_Err sidx_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err sidx_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 i;
 	GF_SegmentIndexBox *ptr = (GF_SegmentIndexBox*) s;
 
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->reference_ID = gf_bs_read_u32(bs);
 	ptr->timescale = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 8);
 
 	if (ptr->version==0) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->earliest_presentation_time = gf_bs_read_u32(bs);
 		ptr->first_offset = gf_bs_read_u32(bs);
-		ISOM_DECREASE_SIZE(ptr, 8);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 16);
 		ptr->earliest_presentation_time = gf_bs_read_u64(bs);
 		ptr->first_offset = gf_bs_read_u64(bs);
-		ISOM_DECREASE_SIZE(ptr, 16);
 	}
+	ISOM_DECREASE_SIZE(ptr, 4);
 	gf_bs_read_u16(bs); /* reserved */
 	ptr->nb_refs = gf_bs_read_u16(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	ptr->refs = gf_malloc(sizeof(GF_SIDXReference)*ptr->nb_refs);
+	if (!ptr->refs) return GF_OUT_OF_MEM;
 	for (i=0; i<ptr->nb_refs; i++) {
 		ptr->refs[i].reference_type = gf_bs_read_int(bs, 1);
 		ptr->refs[i].reference_size = gf_bs_read_int(bs, 31);
@@ -8974,7 +8689,7 @@
 	return GF_OK;
 }
 
-GF_Box *sidx_New()
+GF_Box *sidx_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SegmentIndexBox, GF_ISOM_BOX_TYPE_SIDX);
 	return (GF_Box *)tmp;
@@ -8983,7 +8698,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err sidx_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sidx_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -9014,7 +8729,7 @@
 	return GF_OK;
 }
 
-GF_Err sidx_Size(GF_Box *s)
+GF_Err sidx_box_size(GF_Box *s)
 {
 	GF_SegmentIndexBox *ptr = (GF_SegmentIndexBox*) s;
 
@@ -9030,13 +8745,13 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ssix_del(GF_Box *s)
+void ssix_box_del(GF_Box *s)
 {
 	u32 i;
 	GF_SubsegmentIndexBox *ptr = (GF_SubsegmentIndexBox *)s;
 	if (ptr == NULL) return;
 	if (ptr->subsegments) {
-		for (i = 0; i < ptr->subsegment_count; i++) {
+		for (i = 0; i < ptr->subsegment_alloc; i++) {
 			GF_SubsegmentInfo *subsegment = &ptr->subsegments[i];
 			if (subsegment->ranges) gf_free(subsegment->ranges);
 		}
@@ -9045,32 +8760,39 @@
 	gf_free(ptr);
 }
 
-GF_Err ssix_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ssix_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i,j;
 	GF_SubsegmentIndexBox *ptr = (GF_SubsegmentIndexBox*)s;
 
-	if (ptr->size < 4) return GF_BAD_PARAM;
+	ISOM_DECREASE_SIZE(ptr, 4)
 	ptr->subsegment_count = gf_bs_read_u32(bs);
-	ptr->size -= 4;
-	ptr->subsegments = gf_malloc(ptr->subsegment_count*sizeof(GF_SubsegmentInfo));
+	//each subseg has at least one range_count (4 bytes), abort if not enough bytes (broken box)
+	if (ptr->size < ptr->subsegment_count*4)
+		return GF_ISOM_INVALID_FILE;
+
+	GF_SAFE_ALLOC_N(ptr->subsegments, ptr->subsegment_count, GF_SubsegmentInfo);
+	if (!ptr->subsegments)
+	    return GF_OUT_OF_MEM;
 	for (i = 0; i < ptr->subsegment_count; i++) {
 		GF_SubsegmentInfo *subseg = &ptr->subsegments[i];
-		if (ptr->size < 4) return GF_BAD_PARAM;
+		ISOM_DECREASE_SIZE(ptr, 4)
 		subseg->range_count = gf_bs_read_u32(bs);
-		ptr->size -= 4;
-		if (ptr->size < subseg->range_count*4) return GF_BAD_PARAM;
+		//each range is 4 bytes, abort if not enough bytes
+		if (ptr->size < subseg->range_count*4)
+			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;
 		for (j = 0; j < subseg->range_count; j++) {
+			ISOM_DECREASE_SIZE(ptr, 4)
 			subseg->ranges[j].level = gf_bs_read_u8(bs);
 			subseg->ranges[j].range_size = gf_bs_read_u24(bs);
-			ptr->size -= 4;
 		}
 	}
 	return GF_OK;
 }
 
-GF_Box *ssix_New()
+GF_Box *ssix_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SubsegmentIndexBox, GF_ISOM_BOX_TYPE_SSIX);
 	return (GF_Box *)tmp;
@@ -9079,7 +8801,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ssix_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ssix_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i, j;
@@ -9099,7 +8821,7 @@
 	return GF_OK;
 }
 
-GF_Err ssix_Size(GF_Box *s)
+GF_Err ssix_box_size(GF_Box *s)
 {
 	u32 i;
 	GF_SubsegmentIndexBox *ptr = (GF_SubsegmentIndexBox*)s;
@@ -9113,7 +8835,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void leva_del(GF_Box *s)
+void leva_box_del(GF_Box *s)
 {
 	GF_LevelAssignmentBox *ptr = (GF_LevelAssignmentBox *)s;
 	if (ptr == NULL) return;
@@ -9121,38 +8843,48 @@
 	gf_free(ptr);
 }
 
-GF_Err leva_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err leva_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_LevelAssignmentBox *ptr = (GF_LevelAssignmentBox*)s;
 
-	if (ptr->size < 4) return GF_BAD_PARAM;
+	ISOM_DECREASE_SIZE(ptr, 1)
 	ptr->level_count = gf_bs_read_u8(bs);
-	ptr->size -= 4;
+	//each level is at least 5 bytes
+	if (ptr->size < ptr->level_count * 5)
+		return GF_ISOM_INVALID_FILE;
+
 	GF_SAFE_ALLOC_N(ptr->levels, ptr->level_count, GF_LevelAssignment);
+	if (!ptr->levels) return GF_OUT_OF_MEM;
+
 	for (i = 0; i < ptr->level_count; i++) {
 		GF_LevelAssignment *level = &ptr->levels[i];
 		u8 tmp;
-		if (ptr->size < 5) return GF_BAD_PARAM;
+		if (!level || ptr->size < 5) return GF_BAD_PARAM;
+		ISOM_DECREASE_SIZE(ptr, 5)
+
 		level->track_id = gf_bs_read_u32(bs);
 		tmp = gf_bs_read_u8(bs);
 		level->padding_flag = tmp >> 7;
 		level->type = tmp & 0x7F;
 		if (level->type == 0) {
+			ISOM_DECREASE_SIZE(ptr, 4)
 			level->grouping_type = gf_bs_read_u32(bs);
 		}
 		else if (level->type == 1) {
+			ISOM_DECREASE_SIZE(ptr, 8)
 			level->grouping_type = gf_bs_read_u32(bs);
 			level->grouping_type_parameter = gf_bs_read_u32(bs);
 		}
 		else if (level->type == 4) {
+			ISOM_DECREASE_SIZE(ptr, 4)
 			level->sub_track_id = gf_bs_read_u32(bs);
 		}
 	}
 	return GF_OK;
 }
 
-GF_Box *leva_New()
+GF_Box *leva_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_LevelAssignmentBox, GF_ISOM_BOX_TYPE_LEVA);
 	return (GF_Box *)tmp;
@@ -9161,7 +8893,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err leva_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err leva_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -9188,7 +8920,7 @@
 	return GF_OK;
 }
 
-GF_Err leva_Size(GF_Box *s)
+GF_Err leva_box_size(GF_Box *s)
 {
 	u32 i;
 	GF_LevelAssignmentBox *ptr = (GF_LevelAssignmentBox*)s;
@@ -9207,13 +8939,13 @@
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *pcrb_New()
+GF_Box *pcrb_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PcrInfoBox, GF_ISOM_BOX_TYPE_PCRB);
 	return (GF_Box *)tmp;
 }
 
-void pcrb_del(GF_Box *s)
+void pcrb_box_del(GF_Box *s)
 {
 	GF_PcrInfoBox *ptr = (GF_PcrInfoBox *) s;
 	if (ptr == NULL) return;
@@ -9221,15 +8953,16 @@
 	gf_free(ptr);
 }
 
-GF_Err pcrb_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err pcrb_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 i;
 	GF_PcrInfoBox *ptr = (GF_PcrInfoBox*) s;
 
-	ptr->subsegment_count = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->subsegment_count = gf_bs_read_u32(bs);
 
 	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++) {
 		u64 data1 = gf_bs_read_u32(bs);
 		u64 data2 = gf_bs_read_u16(bs);
@@ -9242,7 +8975,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err pcrb_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pcrb_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -9263,7 +8996,7 @@
 	return GF_OK;
 }
 
-GF_Err pcrb_Size(GF_Box *s)
+GF_Err pcrb_box_size(GF_Box *s)
 {
 	GF_PcrInfoBox *ptr = (GF_PcrInfoBox*) s;
 
@@ -9276,14 +9009,14 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *subs_New()
+GF_Box *subs_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SubSampleInformationBox, GF_ISOM_BOX_TYPE_SUBS);
 	tmp->Samples = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void subs_del(GF_Box *s)
+void subs_box_del(GF_Box *s)
 {
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *)s;
 	if (ptr == NULL) return;
@@ -9308,12 +9041,11 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err subs_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err subs_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i, j, entry_count;
 	u16 subsample_count;
-	GF_SubSampleInfoEntry *pSamp;
 	GF_SubSampleEntry *pSubSamp;
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *) s;
 
@@ -9324,7 +9056,7 @@
 	gf_bs_write_u32(bs, entry_count);
 
 	for (i=0; i<entry_count; i++) {
-		pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
+		GF_SubSampleInfoEntry *pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
 		subsample_count = gf_list_count(pSamp->SubSamples);
 		gf_bs_write_u32(bs, pSamp->sample_delta);
 		gf_bs_write_u16(bs, subsample_count);
@@ -9344,10 +9076,9 @@
 	return e;
 }
 
-GF_Err subs_Size(GF_Box *s)
+GF_Err subs_box_size(GF_Box *s)
 {
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *) s;
-	GF_SubSampleInfoEntry *pSamp;
 	u32 entry_count, i;
 	u16 subsample_count;
 
@@ -9355,7 +9086,7 @@
 	ptr->size += 4;
 	entry_count = gf_list_count(ptr->Samples);
 	for (i=0; i<entry_count; i++) {
-		pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
+		GF_SubSampleInfoEntry *pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
 		subsample_count = gf_list_count(pSamp->SubSamples);
 		// 4 byte for sample_delta, 2 byte for subsample_count
 		// and 6 + (4 or 2) bytes for each subsample
@@ -9366,14 +9097,14 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Err subs_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err subs_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *)s;
 	u32 entry_count, i, j;
 	u16 subsample_count;
 
-	entry_count = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	entry_count = gf_bs_read_u32(bs);
 
 	for (i=0; i<entry_count; i++) {
 		u32 subs_size=0;
@@ -9414,35 +9145,35 @@
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 
-GF_Box *tfdt_New()
+GF_Box *tfdt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TFBaseMediaDecodeTimeBox, GF_ISOM_BOX_TYPE_TFDT);
 	return (GF_Box *)tmp;
 }
 
-void tfdt_del(GF_Box *s)
+void tfdt_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
 /*this is using chpl format according to some NeroRecode samples*/
-GF_Err tfdt_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err tfdt_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_TFBaseMediaDecodeTimeBox *ptr = (GF_TFBaseMediaDecodeTimeBox *)s;
 
 	if (ptr->version==1) {
-		ptr->baseMediaDecodeTime = gf_bs_read_u64(bs);
 		ISOM_DECREASE_SIZE(ptr, 8);
+		ptr->baseMediaDecodeTime = gf_bs_read_u64(bs);
 	} else {
-		ptr->baseMediaDecodeTime = (u32) gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->baseMediaDecodeTime = (u32) gf_bs_read_u32(bs);
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tfdt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tfdt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TFBaseMediaDecodeTimeBox *ptr = (GF_TFBaseMediaDecodeTimeBox *) s;
@@ -9457,7 +9188,7 @@
 	return GF_OK;
 }
 
-GF_Err tfdt_Size(GF_Box *s)
+GF_Err tfdt_box_size(GF_Box *s)
 {
 	GF_TFBaseMediaDecodeTimeBox *ptr = (GF_TFBaseMediaDecodeTimeBox *)s;
 
@@ -9476,32 +9207,32 @@
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
 
-GF_Box *rvcc_New()
+GF_Box *rvcc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_RVCConfigurationBox, GF_ISOM_BOX_TYPE_RVCC);
 	return (GF_Box *)tmp;
 }
 
-void rvcc_del(GF_Box *s)
+void rvcc_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err rvcc_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err rvcc_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_RVCConfigurationBox *ptr = (GF_RVCConfigurationBox*)s;
-	ptr->predefined_rvc_config = gf_bs_read_u16(bs);
 	ISOM_DECREASE_SIZE(ptr, 2);
+	ptr->predefined_rvc_config = gf_bs_read_u16(bs);
 	if (!ptr->predefined_rvc_config) {
-		ptr->rvc_meta_idx = gf_bs_read_u16(bs);
 		ISOM_DECREASE_SIZE(ptr, 2);
+		ptr->rvc_meta_idx = gf_bs_read_u16(bs);
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err rvcc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rvcc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_RVCConfigurationBox *ptr = (GF_RVCConfigurationBox*) s;
@@ -9516,7 +9247,7 @@
 	return GF_OK;
 }
 
-GF_Err rvcc_Size(GF_Box *s)
+GF_Err rvcc_box_size(GF_Box *s)
 {
 	GF_RVCConfigurationBox *ptr = (GF_RVCConfigurationBox *)s;
 	ptr->size += 2;
@@ -9528,46 +9259,48 @@
 
 
 
-GF_Box *sbgp_New()
+GF_Box *sbgp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleGroupBox, GF_ISOM_BOX_TYPE_SBGP);
 	return (GF_Box *)tmp;
 }
-void sbgp_del(GF_Box *a)
+void sbgp_box_del(GF_Box *a)
 {
 	GF_SampleGroupBox *p = (GF_SampleGroupBox *)a;
 	if (p->sample_entries) gf_free(p->sample_entries);
 	gf_free(p);
 }
 
-GF_Err sbgp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err sbgp_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_SampleGroupBox *ptr = (GF_SampleGroupBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->grouping_type = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	if (ptr->version==1) {
-		ptr->grouping_type_parameter = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(ptr, 4);
+		ptr->grouping_type_parameter = gf_bs_read_u32(bs);
 	}
 	ptr->entry_count = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
+
+	if (ptr->size < sizeof(GF_SampleGroupEntry)*ptr->entry_count)
+	    return GF_ISOM_INVALID_FILE;
 
 	ptr->sample_entries = gf_malloc(sizeof(GF_SampleGroupEntry)*ptr->entry_count);
-	if (!ptr->sample_entries) return GF_IO_ERR;
+	if (!ptr->sample_entries) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->entry_count; i++) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->sample_entries[i].sample_count = gf_bs_read_u32(bs);
 		ptr->sample_entries[i].group_description_index = gf_bs_read_u32(bs);
-
-		ISOM_DECREASE_SIZE(ptr, 8);
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err sbgp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sbgp_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_Err e;
@@ -9587,7 +9320,7 @@
 	return GF_OK;
 }
 
-GF_Err sbgp_Size(GF_Box *s)
+GF_Err sbgp_box_size(GF_Box *s)
 {
 	GF_SampleGroupBox *p = (GF_SampleGroupBox*)s;
 
@@ -9604,8 +9337,8 @@
 static void *sgpd_parse_entry(u32 grouping_type, GF_BitStream *bs, u32 entry_size, u32 *total_bytes)
 {
 	Bool null_size_ok = GF_FALSE;
+	GF_DefaultSampleGroupDescriptionEntry *def_ptr;
 
-	GF_DefaultSampleGroupDescriptionEntry *ptr;
 	switch (grouping_type) {
 	case GF_ISOM_SAMPLE_GROUP_ROLL:
 	case GF_ISOM_SAMPLE_GROUP_PROL:
@@ -9672,7 +9405,11 @@
 		*total_bytes = 20;
 		if ((ptr->IsProtected == 1) && !ptr->Per_Sample_IV_size) {
 			ptr->constant_IV_size = gf_bs_read_u8(bs);
-			assert((ptr->constant_IV_size == 8) || (ptr->constant_IV_size == 16));
+			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"));
+				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;
 		}
@@ -9730,7 +9467,7 @@
 			rle = gf_bs_read_int(bs, 1);
 			entry_count = gf_bs_read_int(bs, large_size ? 16 : 8);
 			gf_bs_seek(bs, start);
-			entry_size = 1 + large_size ? 2 : 1;
+			entry_size = 1 + (large_size ? 2 : 1);
 			entry_size += entry_count * 2;
 			if (rle) entry_size += entry_count * (large_size ? 2 : 1);
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] nalm sample group does not indicate entry size, deprecated in spec\n"));
@@ -9756,15 +9493,19 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] %s sample group does not indicate entry size and is not implemented, cannot parse!\n", gf_4cc_to_str( grouping_type) ));
 		return NULL;
 	}
-	GF_SAFEALLOC(ptr, GF_DefaultSampleGroupDescriptionEntry);
-	if (!ptr) return NULL;
+	GF_SAFEALLOC(def_ptr, GF_DefaultSampleGroupDescriptionEntry);
+	if (!def_ptr) return NULL;
 	if (entry_size) {
-		ptr->length = entry_size;
-		ptr->data = (u8 *) gf_malloc(sizeof(u8)*ptr->length);
-		gf_bs_read_data(bs, (char *) ptr->data, ptr->length);
+		def_ptr->length = entry_size;
+		def_ptr->data = (u8 *) gf_malloc(sizeof(u8)*def_ptr->length);
+		if (!def_ptr->data) {
+			gf_free(def_ptr);
+			return NULL;
+		}
+		gf_bs_read_data(bs, (char *) def_ptr->data, def_ptr->length);
 		*total_bytes = entry_size;
 	}
-	return ptr;
+	return def_ptr;
 }
 
 static void	sgpd_del_entry(u32 grouping_type, void *entry)
@@ -9876,7 +9617,7 @@
 }
 #endif
 
-GF_Box *sgpd_New()
+GF_Box *sgpd_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleGroupDescriptionBox, GF_ISOM_BOX_TYPE_SGPD);
 	/*version 0 is deprecated, use v1 by default*/
@@ -9885,7 +9626,7 @@
 	return (GF_Box *)tmp;
 }
 
-void sgpd_del(GF_Box *a)
+void sgpd_box_del(GF_Box *a)
 {
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)a;
 	while (gf_list_count(p->group_descriptions)) {
@@ -9897,24 +9638,23 @@
 	gf_free(p);
 }
 
-GF_Err sgpd_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err sgpd_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 entry_count;
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)s;
 
+	ISOM_DECREASE_SIZE(p, 8);
 	p->grouping_type = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(p, 4);
 
 	if (p->version>=1) {
-		p->default_length = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(p, 4);
+		p->default_length = gf_bs_read_u32(bs);
 	}
 	if (p->version>=2) {
-		p->default_description_index = gf_bs_read_u32(bs);
 		ISOM_DECREASE_SIZE(p, 4);
+		p->default_description_index = gf_bs_read_u32(bs);
 	}
 	entry_count = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(p, 4);
 
 	if (entry_count>p->size)
 		return GF_ISOM_INVALID_FILE;
@@ -9940,7 +9680,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err sgpd_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sgpd_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)s;
@@ -9964,7 +9704,7 @@
 	return GF_OK;
 }
 
-GF_Err sgpd_Size(GF_Box *s)
+GF_Err sgpd_box_size(GF_Box *s)
 {
 	u32 i;
 	GF_SampleGroupDescriptionBox *p = (GF_SampleGroupDescriptionBox *)s;
@@ -9996,7 +9736,7 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void saiz_del(GF_Box *s)
+void saiz_box_del(GF_Box *s)
 {
 	GF_SampleAuxiliaryInfoSizeBox*ptr = (GF_SampleAuxiliaryInfoSizeBox*)s;
 	if (ptr == NULL) return;
@@ -10005,29 +9745,35 @@
 }
 
 
-GF_Err saiz_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err saiz_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SampleAuxiliaryInfoSizeBox*ptr = (GF_SampleAuxiliaryInfoSizeBox*)s;
 
 	if (ptr->flags & 1) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->aux_info_type = gf_bs_read_u32(bs);
 		ptr->aux_info_type_parameter = gf_bs_read_u32(bs);
-
-		ISOM_DECREASE_SIZE(ptr, 8);
 	}
+	ISOM_DECREASE_SIZE(ptr, 5);
 	ptr->default_sample_info_size = gf_bs_read_u8(bs);
 	ptr->sample_count = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 5);
 
 	if (ptr->default_sample_info_size == 0) {
+		if (ptr->size < sizeof(u8)*ptr->sample_count)
+		    return GF_ISOM_INVALID_FILE;
+
 		ptr->sample_info_size = gf_malloc(sizeof(u8)*ptr->sample_count);
-		gf_bs_read_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
+		ptr->sample_alloc = ptr->sample_count;
+		if (!ptr->sample_info_size)
+		    return GF_OUT_OF_MEM;
+
 		ISOM_DECREASE_SIZE(ptr, ptr->sample_count);
+		gf_bs_read_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
 	}
 	return GF_OK;
 }
 
-GF_Box *saiz_New()
+GF_Box *saiz_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleAuxiliaryInfoSizeBox, GF_ISOM_BOX_TYPE_SAIZ);
 	return (GF_Box *)tmp;
@@ -10035,7 +9781,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err saiz_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err saiz_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SampleAuxiliaryInfoSizeBox*ptr = (GF_SampleAuxiliaryInfoSizeBox*) s;
@@ -10050,12 +9796,15 @@
 	gf_bs_write_u8(bs, ptr->default_sample_info_size);
 	gf_bs_write_u32(bs, ptr->sample_count);
 	if (!ptr->default_sample_info_size) {
-		gf_bs_write_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
+		if (!ptr->sample_info_size)
+			gf_bs_write_u8(bs, 0);
+		else
+			gf_bs_write_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
 	}
 	return GF_OK;
 }
 
-GF_Err saiz_Size(GF_Box *s)
+GF_Err saiz_box_size(GF_Box *s)
 {
 	GF_SampleAuxiliaryInfoSizeBox *ptr = (GF_SampleAuxiliaryInfoSizeBox*)s;
 
@@ -10069,47 +9818,50 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-void saio_del(GF_Box *s)
+void saio_box_del(GF_Box *s)
 {
 	GF_SampleAuxiliaryInfoOffsetBox *ptr = (GF_SampleAuxiliaryInfoOffsetBox*)s;
 	if (ptr == NULL) return;
 	if (ptr->offsets) gf_free(ptr->offsets);
-	if (ptr->offsets_large) gf_free(ptr->offsets_large);
+	if (ptr->cached_data) gf_free(ptr->cached_data);
 	gf_free(ptr);
 }
 
 
-GF_Err saio_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err saio_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SampleAuxiliaryInfoOffsetBox *ptr = (GF_SampleAuxiliaryInfoOffsetBox *)s;
 
 	if (ptr->flags & 1) {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->aux_info_type = gf_bs_read_u32(bs);
 		ptr->aux_info_type_parameter = gf_bs_read_u32(bs);
-		ISOM_DECREASE_SIZE(ptr, 8);
 	}
-	ptr->entry_count = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->entry_count = gf_bs_read_u32(bs);
 
 	if (ptr->entry_count) {
 		u32 i;
+		if (ptr->size < (ptr->version == 0 ? 4 : 8) * ptr->entry_count)
+			return GF_ISOM_INVALID_FILE;
+		ptr->offsets = gf_malloc(sizeof(u64)*ptr->entry_count);
+		if (!ptr->offsets)
+			return GF_OUT_OF_MEM;
+		ptr->entry_alloc = ptr->entry_count;
 		if (ptr->version==0) {
-			ptr->offsets = gf_malloc(sizeof(u32)*ptr->entry_count);
+			ISOM_DECREASE_SIZE(ptr, 4*ptr->entry_count);
 			for (i=0; i<ptr->entry_count; i++)
 				ptr->offsets[i] = gf_bs_read_u32(bs);
-
-			ISOM_DECREASE_SIZE(ptr, 4*ptr->entry_count);
 		} else {
-			ptr->offsets_large = gf_malloc(sizeof(u64)*ptr->entry_count);
-			for (i=0; i<ptr->entry_count; i++)
-				ptr->offsets_large[i] = gf_bs_read_u64(bs);
 			ISOM_DECREASE_SIZE(ptr, 8*ptr->entry_count);
+			for (i=0; i<ptr->entry_count; i++)
+				ptr->offsets[i] = gf_bs_read_u64(bs);
 		}
 	}
 	return GF_OK;
 }
 
-GF_Box *saio_New()
+GF_Box *saio_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleAuxiliaryInfoOffsetBox, GF_ISOM_BOX_TYPE_SAIO);
 	return (GF_Box *)tmp;
@@ -10117,7 +9869,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err saio_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err saio_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SampleAuxiliaryInfoOffsetBox *ptr = (GF_SampleAuxiliaryInfoOffsetBox *) s;
@@ -10134,37 +9886,34 @@
 	gf_bs_write_u32(bs, ptr->entry_count);
 	if (ptr->entry_count) {
 		u32 i;
-		//store position in bitstream before writing data - offsets can be NULL if a single offset is rewritten later on (cf senc_write)
+		//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) {
 			if (!ptr->offsets) {
 				gf_bs_write_u32(bs, 0);
 			} else {
 				for (i=0; i<ptr->entry_count; i++)
-					gf_bs_write_u32(bs, ptr->offsets[i]);
+					gf_bs_write_u32(bs, (u32) ptr->offsets[i]);
 			}
 		} else {
-			if (!ptr->offsets_large) {
+			if (!ptr->offsets) {
 				gf_bs_write_u64(bs, 0);
 			} else {
 				for (i=0; i<ptr->entry_count; i++)
-					gf_bs_write_u64(bs, ptr->offsets_large[i]);
+					gf_bs_write_u64(bs, ptr->offsets[i]);
 			}
 		}
 	}
 	return GF_OK;
 }
 
-GF_Err saio_Size(GF_Box *s)
+GF_Err saio_box_size(GF_Box *s)
 {
 	GF_SampleAuxiliaryInfoOffsetBox *ptr = (GF_SampleAuxiliaryInfoOffsetBox*)s;
 
 	if (ptr->aux_info_type || ptr->aux_info_type_parameter) {
 		ptr->flags |= 1;
 	}
-	if (ptr->offsets_large) {
-		ptr->version = 1;
-	}
 
 	if (ptr->flags & 1) ptr->size += 8;
 	ptr->size += 4;
@@ -10174,10 +9923,9 @@
 	case GF_ISOM_CBC_SCHEME:
 	case GF_ISOM_CENS_SCHEME:
 	case GF_ISOM_CBCS_SCHEME:
-		if (ptr->offsets_large) gf_free(ptr->offsets_large);
 		if (ptr->offsets) gf_free(ptr->offsets);
-		ptr->offsets_large = NULL;
 		ptr->offsets = NULL;
+		ptr->entry_alloc = 0;
 		ptr->entry_count = 1;
 		break;
 	}
@@ -10188,33 +9936,36 @@
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 
-void prft_del(GF_Box *s)
+void prft_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err prft_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err prft_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) s;
 
+	ISOM_DECREASE_SIZE(ptr, 12);
 	ptr->refTrackID = gf_bs_read_u32(bs);
 	ptr->ntp = gf_bs_read_u64(bs);
 	if (ptr->version==0) {
+		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->timestamp = gf_bs_read_u32(bs);
 	} else {
+		ISOM_DECREASE_SIZE(ptr, 8);
 		ptr->timestamp = gf_bs_read_u64(bs);
 	}
 	return GF_OK;
 }
 
-GF_Box *prft_New()
+GF_Box *prft_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ProducerReferenceTimeBox, GF_ISOM_BOX_TYPE_PRFT);
 	return (GF_Box *)tmp;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err prft_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err prft_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) s;
@@ -10233,7 +9984,7 @@
 	return GF_OK;
 }
 
-GF_Err prft_Size(GF_Box *s)
+GF_Err prft_box_size(GF_Box *s)
 {
 	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox*)s;
 
@@ -10242,7 +9993,7 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *trgr_New()
+GF_Box *trgr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackGroupBox, GF_ISOM_BOX_TYPE_TRGR);
 	tmp->groups = gf_list_new();
@@ -10253,75 +10004,72 @@
 	return (GF_Box *)tmp;
 }
 
-void trgr_del(GF_Box *s)
+void trgr_box_del(GF_Box *s)
 {
 	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
 	if (ptr == NULL) return;
-	gf_isom_box_array_del(ptr->groups);
+	gf_list_del(ptr->groups);
 	gf_free(ptr);
 }
 
 
-GF_Err trgr_AddBox(GF_Box *s, GF_Box *a)
+GF_Err trgr_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
 	return gf_list_add(ptr->groups, a);
 }
 
 
-GF_Err trgr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trgr_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, trgr_AddBox, s->type);
+	return gf_isom_box_array_read_ex(s, bs, trgr_on_child_box, s->type);
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err trgr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trgr_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *) s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	return gf_isom_box_array_write(s, ptr->groups, bs);
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err trgr_Size(GF_Box *s)
+GF_Err trgr_box_size(GF_Box *s)
 {
-	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
-	return gf_isom_box_array_size(s, ptr->groups);
+	u32 pos=0;
+	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *) s;
+	gf_isom_check_position_list(s, ptr->groups, &pos);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *trgt_New()
+GF_Box *trgt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackGroupTypeBox, GF_ISOM_BOX_TYPE_TRGT);
 	return (GF_Box *)tmp;
 }
 
-void trgt_del(GF_Box *s)
+void trgt_box_del(GF_Box *s)
 {
 	GF_TrackGroupTypeBox *ptr = (GF_TrackGroupTypeBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err trgt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err trgt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackGroupTypeBox *ptr = (GF_TrackGroupTypeBox *)s;
-	ptr->track_group_id = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
+	ptr->track_group_id = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err trgt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trgt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackGroupTypeBox *ptr = (GF_TrackGroupTypeBox *) s;
@@ -10334,7 +10082,7 @@
 	return GF_OK;
 }
 
-GF_Err trgt_Size(GF_Box *s)
+GF_Err trgt_box_size(GF_Box *s)
 {
 	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *)s;
 
@@ -10346,13 +10094,13 @@
 
 
 
-GF_Box *stvi_New()
+GF_Box *stvi_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_StereoVideoBox, GF_ISOM_BOX_TYPE_STVI);
 	return (GF_Box *)tmp;
 }
 
-void stvi_del(GF_Box *s)
+void stvi_box_del(GF_Box *s)
 {
 	GF_StereoVideoBox *ptr = (GF_StereoVideoBox *)s;
 	if (ptr == NULL) return;
@@ -10360,7 +10108,7 @@
 	gf_free(ptr);
 }
 
-GF_Err stvi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err stvi_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_StereoVideoBox *ptr = (GF_StereoVideoBox *)s;
 
@@ -10370,7 +10118,10 @@
 	ptr->stereo_scheme = gf_bs_read_u32(bs);
 	ptr->sit_len = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, ptr->sit_len);
+
 	ptr->stereo_indication_type = gf_malloc(sizeof(char)*ptr->sit_len);
+	if (!ptr->stereo_indication_type) return GF_OUT_OF_MEM;
+
 	gf_bs_read_data(bs, ptr->stereo_indication_type, ptr->sit_len);
 	return GF_OK;
 }
@@ -10378,7 +10129,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err stvi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err stvi_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_StereoVideoBox *ptr = (GF_StereoVideoBox *) s;
@@ -10395,7 +10146,7 @@
 	return GF_OK;
 }
 
-GF_Err stvi_Size(GF_Box *s)
+GF_Err stvi_box_size(GF_Box *s)
 {
 	GF_StereoVideoBox *ptr = (GF_StereoVideoBox *)s;
 
@@ -10407,24 +10158,22 @@
 
 
 
-GF_Box *fiin_New()
+GF_Box *fiin_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(FDItemInformationBox, GF_ISOM_BOX_TYPE_FIIN);
 	return (GF_Box *)tmp;
 }
 
-void fiin_del(GF_Box *s)
+void fiin_box_del(GF_Box *s)
 {
 	FDItemInformationBox *ptr = (FDItemInformationBox *)s;
 	if (ptr == NULL) return;
-	if (ptr->partition_entries) gf_isom_box_array_del(ptr->partition_entries);
-	if (ptr->session_info) gf_isom_box_del((GF_Box*)ptr->session_info);
-	if (ptr->group_id_to_name) gf_isom_box_del((GF_Box*)ptr->group_id_to_name);
+	if (ptr->partition_entries) gf_list_del(ptr->partition_entries);
 	gf_free(ptr);
 }
 
 
-GF_Err fiin_AddBox(GF_Box *s, GF_Box *a)
+GF_Err fiin_on_child_box(GF_Box *s, GF_Box *a)
 {
 	FDItemInformationBox *ptr = (FDItemInformationBox *)s;
 	switch(a->type) {
@@ -10439,25 +10188,23 @@
 		if (ptr->group_id_to_name) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->group_id_to_name = (GroupIdToNameBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err fiin_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fiin_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	FDItemInformationBox *ptr = (FDItemInformationBox *)s;
 
 	ISOM_DECREASE_SIZE(ptr, 2);
 	gf_bs_read_u16(bs);
-	return gf_isom_box_array_read(s, bs, fiin_AddBox);
+	return gf_isom_box_array_read(s, bs, fiin_on_child_box);
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fiin_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fiin_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	FDItemInformationBox *ptr = (FDItemInformationBox *) s;
@@ -10466,58 +10213,34 @@
 	if (e) return e;
 
 	gf_bs_write_u16(bs, gf_list_count(ptr->partition_entries) );
-	e = gf_isom_box_array_write(s, ptr->partition_entries, bs);
-	if (e) return e;
-	if (ptr->session_info) gf_isom_box_write((GF_Box*)ptr->session_info, bs);
-	if (ptr->group_id_to_name) gf_isom_box_write((GF_Box*)ptr->group_id_to_name, bs);
 	return GF_OK;
 }
 
-GF_Err fiin_Size(GF_Box *s)
+GF_Err fiin_box_size(GF_Box *s)
 {
-	GF_Err e;
-	FDItemInformationBox *ptr = (FDItemInformationBox *)s;
-
-	ptr->size+= 2;
-	if (ptr->partition_entries) {
-		e = gf_isom_box_array_size(s, ptr->partition_entries);
-		if (e) return e;
-	}
-	if (ptr->session_info) {
-		e = gf_isom_box_size((GF_Box *)ptr->session_info);
-		if (e) return e;
-		ptr->size += ptr->session_info->size;
-	}
-	if (ptr->group_id_to_name) {
-		e = gf_isom_box_size((GF_Box *) ptr->group_id_to_name);
-		if (e) return e;
-		ptr->size += ptr->group_id_to_name->size;
-	}
-
+	u32 pos=0;
+	FDItemInformationBox *ptr = (FDItemInformationBox *) s;
+	s->size+= 2;
+	gf_isom_check_position_list(s, ptr->partition_entries, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *paen_New()
+GF_Box *paen_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(FDPartitionEntryBox, GF_ISOM_BOX_TYPE_PAEN);
 	return (GF_Box *)tmp;
 }
 
-void paen_del(GF_Box *s)
+void paen_box_del(GF_Box *s)
 {
-	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *)s;
-	if (ptr == NULL) return;
-	if (ptr->blocks_and_symbols) gf_isom_box_del((GF_Box*)ptr->blocks_and_symbols);
-	if (ptr->FEC_symbol_locations) gf_isom_box_del((GF_Box*)ptr->FEC_symbol_locations);
-	if (ptr->File_symbol_locations) gf_isom_box_del((GF_Box*)ptr->File_symbol_locations);
-	gf_free(ptr);
+	gf_free(s);
 }
 
 
-GF_Err paen_AddBox(GF_Box *s, GF_Box *a)
+GF_Err paen_on_child_box(GF_Box *s, GF_Box *a)
 {
 	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *)s;
 	switch(a->type) {
@@ -10533,64 +10256,25 @@
 		if (ptr->File_symbol_locations) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->File_symbol_locations = (FileReservoirBox *)a;
 		return GF_OK;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err paen_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err paen_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, fiin_AddBox);
+	return gf_isom_box_array_read(s, bs, fiin_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err paen_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err paen_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *) s;
 	if (!s) return GF_BAD_PARAM;
-
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	if (ptr->blocks_and_symbols) {
-		e = gf_isom_box_write((GF_Box *)ptr->blocks_and_symbols, bs);
-		if (e) return e;
-	}
-	if (ptr->FEC_symbol_locations) {
-		e = gf_isom_box_write((GF_Box *)ptr->FEC_symbol_locations, bs);
-		if (e) return e;
-	}
-	if (ptr->File_symbol_locations) {
-		e = gf_isom_box_write((GF_Box *)ptr->File_symbol_locations, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err paen_Size(GF_Box *s)
+GF_Err paen_box_size(GF_Box *s)
 {
-	GF_Err e;
-	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *)s;
-
-	if (ptr->blocks_and_symbols) {
-		e = gf_isom_box_size((GF_Box *)ptr->blocks_and_symbols);
-		if (e) return e;
-		ptr->size += ptr->blocks_and_symbols->size;
-	}
-	if (ptr->FEC_symbol_locations) {
-		e = gf_isom_box_size((GF_Box *) ptr->FEC_symbol_locations);
-		if (e) return e;
-		ptr->size += ptr->FEC_symbol_locations->size;
-	}
-	if (ptr->File_symbol_locations) {
-		e = gf_isom_box_size((GF_Box *) ptr->File_symbol_locations);
-		if (e) return e;
-		ptr->size += ptr->File_symbol_locations->size;
-	}
-
 	return GF_OK;
 }
 
@@ -10599,13 +10283,13 @@
 
 
 
-GF_Box *fpar_New()
+GF_Box *fpar_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(FilePartitionBox, GF_ISOM_BOX_TYPE_FPAR);
 	return (GF_Box *)tmp;
 }
 
-void fpar_del(GF_Box *s)
+void fpar_box_del(GF_Box *s)
 {
 	FilePartitionBox *ptr = (FilePartitionBox *)s;
 	if (ptr == NULL) return;
@@ -10620,6 +10304,8 @@
 	u32 i=0;
 
 	*out_str = gf_malloc(sizeof(char)*len);
+	if (! *out_str) return GF_OUT_OF_MEM;
+
 	while (1) {
 		ISOM_DECREASE_SIZE(s, 1 );
 		(*out_str)[i] = gf_bs_read_u8(bs);
@@ -10643,7 +10329,7 @@
 	return GF_OK;
 }
 
-GF_Err fpar_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fpar_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_Err e;
@@ -10664,8 +10350,13 @@
 
 	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)
+		return GF_ISOM_INVALID_FILE;
+
 	ISOM_DECREASE_SIZE(ptr, ptr->nb_entries * 6 );
 	GF_SAFE_ALLOC_N(ptr->entries, ptr->nb_entries, FilePartitionEntry);
+	if (!ptr->entries) return GF_OUT_OF_MEM;
+
 	for (i=0;i < ptr->nb_entries; i++) {
 		ptr->entries[i].block_count = gf_bs_read_u16(bs);
 		ptr->entries[i].block_size = gf_bs_read_u32(bs);
@@ -10676,7 +10367,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fpar_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fpar_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -10708,7 +10399,7 @@
 	return GF_OK;
 }
 
-GF_Err fpar_Size(GF_Box *s)
+GF_Err fpar_box_size(GF_Box *s)
 {
 	FilePartitionBox *ptr = (FilePartitionBox *)s;
 
@@ -10723,13 +10414,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *fecr_New()
+GF_Box *fecr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(FECReservoirBox, GF_ISOM_BOX_TYPE_FECR);
 	return (GF_Box *)tmp;
 }
 
-void fecr_del(GF_Box *s)
+void fecr_box_del(GF_Box *s)
 {
 	FECReservoirBox *ptr = (FECReservoirBox *)s;
 	if (ptr == NULL) return;
@@ -10737,7 +10428,7 @@
 	gf_free(ptr);
 }
 
-GF_Err fecr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fecr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	FECReservoirBox *ptr = (FECReservoirBox *)s;
@@ -10747,6 +10438,8 @@
 
 	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;
+
 	for (i=0; i<ptr->nb_entries; i++) {
 		ptr->entries[i].item_id = gf_bs_read_int(bs, ptr->version ? 32 : 16);
 		ptr->entries[i].symbol_count = gf_bs_read_u32(bs);
@@ -10757,7 +10450,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fecr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fecr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -10774,7 +10467,7 @@
 	return GF_OK;
 }
 
-GF_Err fecr_Size(GF_Box *s)
+GF_Err fecr_box_size(GF_Box *s)
 {
 	FECReservoirBox *ptr = (FECReservoirBox *)s;
 	ptr->size += (ptr->version ? 4 : 2) +  ptr->nb_entries * (ptr->version ? 8 : 6);
@@ -10785,13 +10478,13 @@
 
 
 
-GF_Box *segr_New()
+GF_Box *segr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(FDSessionGroupBox, GF_ISOM_BOX_TYPE_SEGR);
 	return (GF_Box *)tmp;
 }
 
-void segr_del(GF_Box *s)
+void segr_box_del(GF_Box *s)
 {
 	u32 i;
 	FDSessionGroupBox *ptr = (FDSessionGroupBox *)s;
@@ -10804,33 +10497,42 @@
 	gf_free(ptr);
 }
 
-GF_Err segr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err segr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, k;
 	FDSessionGroupBox *ptr = (FDSessionGroupBox *)s;
 
 	ISOM_DECREASE_SIZE(ptr, 2);
 	ptr->num_session_groups = gf_bs_read_u16(bs);
-	if (ptr->num_session_groups*3>ptr->size) {
+	if (ptr->size < ptr->num_session_groups) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Invalid number of entries %d in segr\n", ptr->num_session_groups));
 		ptr->num_session_groups = 0;
 		return GF_ISOM_INVALID_FILE;
 	}
 
 	GF_SAFE_ALLOC_N(ptr->session_groups, ptr->num_session_groups, SessionGroupEntry);
+	if (!ptr->session_groups) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->num_session_groups; i++) {
 		ptr->session_groups[i].nb_groups = gf_bs_read_u8(bs);
 		ISOM_DECREASE_SIZE(ptr, 1);
+
+		ISOM_DECREASE_SIZE(ptr, ptr->session_groups[i].nb_groups*4);
+
 		GF_SAFE_ALLOC_N(ptr->session_groups[i].group_ids, ptr->session_groups[i].nb_groups, u32);
+		if (!ptr->session_groups[i].group_ids) return GF_OUT_OF_MEM;
+
 		for (k=0; k<ptr->session_groups[i].nb_groups; k++) {
-			ISOM_DECREASE_SIZE(ptr, 4);
 			ptr->session_groups[i].group_ids[k] = gf_bs_read_u32(bs);
 		}
 
 		ptr->session_groups[i].nb_channels = gf_bs_read_u16(bs);
+		ISOM_DECREASE_SIZE(ptr, ptr->session_groups[i].nb_channels*4);
+
 		GF_SAFE_ALLOC_N(ptr->session_groups[i].channels, ptr->session_groups[i].nb_channels, u32);
+		if (!ptr->session_groups[i].channels) return GF_OUT_OF_MEM;
+
 		for (k=0; k<ptr->session_groups[i].nb_channels; k++) {
-			ISOM_DECREASE_SIZE(ptr, 4);
 			ptr->session_groups[i].channels[k] = gf_bs_read_u32(bs);
 		}
 	}
@@ -10840,7 +10542,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err segr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err segr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, k;
 	GF_Err e;
@@ -10865,7 +10567,7 @@
 	return GF_OK;
 }
 
-GF_Err segr_Size(GF_Box *s)
+GF_Err segr_box_size(GF_Box *s)
 {
 	u32 i;
 	FDSessionGroupBox *ptr = (FDSessionGroupBox *)s;
@@ -10882,13 +10584,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *gitn_New()
+GF_Box *gitn_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GroupIdToNameBox, GF_ISOM_BOX_TYPE_GITN);
 	return (GF_Box *)tmp;
 }
 
-void gitn_del(GF_Box *s)
+void gitn_box_del(GF_Box *s)
 {
 	u32 i;
 	GroupIdToNameBox *ptr = (GroupIdToNameBox *)s;
@@ -10900,7 +10602,7 @@
 	gf_free(ptr);
 }
 
-GF_Err gitn_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err gitn_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_Err e;
@@ -10908,8 +10610,12 @@
 
 	ISOM_DECREASE_SIZE(ptr, 2);
 	ptr->nb_entries = gf_bs_read_u16(bs);
+	if (ptr->size < ptr->nb_entries*4)
+		return GF_ISOM_INVALID_FILE;
 
 	GF_SAFE_ALLOC_N(ptr->entries, ptr->nb_entries, GroupIdNameEntry);
+	if (!ptr->entries) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->nb_entries; i++) {
 		ISOM_DECREASE_SIZE(ptr, 4);
 		ptr->entries[i].group_id = gf_bs_read_u32(bs);
@@ -10923,7 +10629,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gitn_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err gitn_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -10941,7 +10647,7 @@
 	return GF_OK;
 }
 
-GF_Err gitn_Size(GF_Box *s)
+GF_Err gitn_box_size(GF_Box *s)
 {
 	u32 i;
 	GroupIdToNameBox *ptr = (GroupIdToNameBox *)s;
@@ -10958,13 +10664,13 @@
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
-GF_Box *fdpa_New()
+GF_Box *fdpa_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_FDpacketBox, GF_ISOM_BOX_TYPE_FDPA);
 	return (GF_Box *)tmp;
 }
 
-void fdpa_del(GF_Box *s)
+void fdpa_box_del(GF_Box *s)
 {
 	u32 i;
 	GF_FDpacketBox *ptr = (GF_FDpacketBox *)s;
@@ -10979,7 +10685,7 @@
 	gf_free(ptr);
 }
 
-GF_Err fdpa_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fdpa_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_FDpacketBox *ptr = (GF_FDpacketBox *)s;
@@ -10993,24 +10699,32 @@
 	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->header_ext_count*2>ptr->size) {
+	if (ptr->size < ptr->header_ext_count*2) {
 		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;
 	}
 
 	GF_SAFE_ALLOC_N(ptr->headers, ptr->header_ext_count, GF_LCTheaderExtension);
+	if (!ptr->headers) return GF_OUT_OF_MEM;
+
 	for (i=0; i<ptr->header_ext_count; i++) {
 		ptr->headers[i].header_extension_type = gf_bs_read_u8(bs);
 		ISOM_DECREASE_SIZE(ptr, 1);
 
 		if (ptr->headers[i].header_extension_type > 127) {
+			ISOM_DECREASE_SIZE(ptr, 3);
 			gf_bs_read_data(bs, (char *) ptr->headers[i].content, 3);
 		} else {
 			ISOM_DECREASE_SIZE(ptr, 1);
 			ptr->headers[i].data_length = gf_bs_read_u8(bs);
 			if (ptr->headers[i].data_length) {
 				ptr->headers[i].data_length = 4*ptr->headers[i].data_length - 2;
+				if (ptr->size < sizeof(char) * ptr->headers[i].data_length)
+				    return GF_ISOM_INVALID_FILE;
 				ptr->headers[i].data = gf_malloc(sizeof(char) * ptr->headers[i].data_length);
+				if (!ptr->headers[i].data) return GF_OUT_OF_MEM;
+
+				ISOM_DECREASE_SIZE(ptr, ptr->headers[i].data_length);
 				gf_bs_read_data(bs, ptr->headers[i].data, ptr->headers[i].data_length);
 			}
 		}
@@ -11020,7 +10734,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fdpa_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fdpa_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -11035,7 +10749,7 @@
 	gf_bs_write_int(bs, ptr->info.session_close_bit, 1);
 	gf_bs_write_int(bs, ptr->info.object_close_bit, 1);
 	gf_bs_write_int(bs, 0, 4);
-	ptr->info.transport_object_identifier = gf_bs_read_u16(bs);
+	gf_bs_write_u16(bs, ptr->info.transport_object_identifier);
 	gf_bs_write_u16(bs, ptr->header_ext_count);
 	for (i=0; i<ptr->header_ext_count; i++) {
 		gf_bs_write_u8(bs, ptr->headers[i].header_extension_type);
@@ -11051,7 +10765,7 @@
 	return GF_OK;
 }
 
-GF_Err fdpa_Size(GF_Box *s)
+GF_Err fdpa_box_size(GF_Box *s)
 {
 	u32 i;
 	GF_FDpacketBox *ptr = (GF_FDpacketBox *)s;
@@ -11072,23 +10786,22 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *extr_New()
+GF_Box *extr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ExtraDataBox, GF_ISOM_BOX_TYPE_EXTR);
 	return (GF_Box *)tmp;
 }
 
-void extr_del(GF_Box *s)
+void extr_box_del(GF_Box *s)
 {
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *)s;
 	if (ptr == NULL) return;
 	if (ptr->feci) gf_isom_box_del((GF_Box*)ptr->feci);
-
 	if (ptr->data) gf_free(ptr->data);
 	gf_free(ptr);
 }
 
-GF_Err extr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err extr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *)s;
@@ -11098,6 +10811,7 @@
 	if (!ptr->feci || ptr->feci->size > ptr->size) return GF_ISOM_INVALID_MEDIA;
 	ptr->data_length = (u32) (ptr->size - ptr->feci->size);
 	ptr->data = gf_malloc(sizeof(char)*ptr->data_length);
+	if (!ptr->data) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->data, ptr->data_length);
 
 	return GF_OK;
@@ -11106,7 +10820,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err extr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err extr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *) s;
@@ -11123,17 +10837,15 @@
 	return GF_OK;
 }
 
-GF_Err extr_Size(GF_Box *s)
+GF_Err extr_box_size(GF_Box *s)
 {
-	GF_Err e;
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *) s;
-
+	ptr->size += ptr->data_length;
 	if (ptr->feci) {
-		e = gf_isom_box_size((GF_Box *)ptr->feci);
+		GF_Err e = gf_isom_box_size((GF_Box*)ptr->feci);
 		if (e) return e;
 		ptr->size += ptr->feci->size;
 	}
-	ptr->size += ptr->data_length;
 	return GF_OK;
 }
 
@@ -11141,7 +10853,7 @@
 
 
 
-GF_Box *fdsa_New()
+GF_Box *fdsa_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_HintSample, GF_ISOM_BOX_TYPE_FDSA);
 	if (!tmp) return NULL;
@@ -11150,15 +10862,14 @@
 	return (GF_Box*)tmp;
 }
 
-void fdsa_del(GF_Box *s)
+void fdsa_box_del(GF_Box *s)
 {
 	GF_HintSample *ptr = (GF_HintSample *)s;
-	gf_isom_box_array_del(ptr->packetTable);
-	if (ptr->extra_data) gf_isom_box_del((GF_Box*)ptr->extra_data);
+	gf_list_del(ptr->packetTable);
 	gf_free(ptr);
 }
 
-GF_Err fdsa_AddBox(GF_Box *s, GF_Box *a)
+GF_Err fdsa_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_HintSample *ptr = (GF_HintSample *)s;
 	switch(a->type) {
@@ -11169,20 +10880,18 @@
 		if (ptr->extra_data) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->extra_data = (GF_ExtraDataBox*)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
-GF_Err fdsa_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err fdsa_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, fdsa_AddBox);
+	return gf_isom_box_array_read(s, bs, fdsa_on_child_box);
 }
 
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err fdsa_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err fdsa_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_HintSample *ptr = (GF_HintSample *) s;
@@ -11200,17 +10909,9 @@
 	return GF_OK;
 }
 
-GF_Err fdsa_Size(GF_Box *s)
+GF_Err fdsa_box_size(GF_Box *s)
 {
-	GF_HintSample *ptr = (GF_HintSample*)s;
-	GF_Err e;
-
-	 if (ptr->extra_data) {
-		e = gf_isom_box_size((GF_Box *)ptr->extra_data);
-		if (e) return e;
-		ptr->size += ptr->extra_data->size;
-	}
-	return gf_isom_box_array_size(s, ptr->packetTable);
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -11218,7 +10919,7 @@
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
 
-void trik_del(GF_Box *s)
+void trik_box_del(GF_Box *s)
 {
 	GF_TrickPlayBox *ptr = (GF_TrickPlayBox *) s;
 	if (ptr == NULL) return;
@@ -11226,13 +10927,13 @@
 	gf_free(ptr);
 }
 
-GF_Err trik_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err trik_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	u32 i;
 	GF_TrickPlayBox *ptr = (GF_TrickPlayBox *) s;
 	ptr->entry_count = (u32) ptr->size;
 	ptr->entries = (GF_TrickPlayBoxEntry *) gf_malloc(ptr->entry_count * sizeof(GF_TrickPlayBoxEntry) );
-	if (ptr->entries == NULL) return GF_OUT_OF_MEM;
+	if (!ptr->entries) return GF_OUT_OF_MEM;
 
 	for (i=0; i< ptr->entry_count; i++) {
 		ptr->entries[i].pic_type = gf_bs_read_int(bs, 2);
@@ -11241,7 +10942,7 @@
 	return GF_OK;
 }
 
-GF_Box *trik_New()
+GF_Box *trik_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrickPlayBox, GF_ISOM_BOX_TYPE_TRIK);
 	return (GF_Box *)tmp;
@@ -11249,7 +10950,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err trik_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err trik_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -11265,7 +10966,7 @@
 	return GF_OK;
 }
 
-GF_Err trik_Size(GF_Box *s)
+GF_Err trik_box_size(GF_Box *s)
 {
 	GF_TrickPlayBox *ptr = (GF_TrickPlayBox *) s;
 	ptr->size += 8 * ptr->entry_count;
@@ -11275,12 +10976,12 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void bloc_del(GF_Box *s)
+void bloc_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err bloc_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err bloc_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_BaseLocationBox *ptr = (GF_BaseLocationBox *) s;
 
@@ -11293,7 +10994,7 @@
 	return GF_OK;
 }
 
-GF_Box *bloc_New()
+GF_Box *bloc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_BaseLocationBox, GF_ISOM_BOX_TYPE_TRIK);
 	return (GF_Box *)tmp;
@@ -11301,7 +11002,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err bloc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err bloc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -11317,7 +11018,7 @@
 	return GF_OK;
 }
 
-GF_Err bloc_Size(GF_Box *s)
+GF_Err bloc_box_size(GF_Box *s)
 {
 	s->size += 1024;
 	return GF_OK;
@@ -11325,14 +11026,14 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void ainf_del(GF_Box *s)
+void ainf_box_del(GF_Box *s)
 {
 	GF_AssetInformationBox *ptr = (GF_AssetInformationBox *) s;
 	if (ptr->APID) gf_free(ptr->APID);
 	gf_free(s);
 }
 
-GF_Err ainf_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err ainf_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_AssetInformationBox *ptr = (GF_AssetInformationBox *) s;
 
@@ -11341,7 +11042,7 @@
 	return gf_isom_read_null_terminated_string(s, bs, s->size, &ptr->APID);
 }
 
-GF_Box *ainf_New()
+GF_Box *ainf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AssetInformationBox, GF_ISOM_BOX_TYPE_AINF);
 	return (GF_Box *)tmp;
@@ -11349,7 +11050,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ainf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ainf_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AssetInformationBox *ptr = (GF_AssetInformationBox *) s;
@@ -11357,28 +11058,30 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->profile_version);
-	gf_bs_write_data(bs, ptr->APID, (u32) strlen(ptr->APID) + 1);
+    if (ptr->APID)
+        gf_bs_write_data(bs, ptr->APID, (u32) strlen(ptr->APID) );
+    gf_bs_write_u8(bs, 0);
 	return GF_OK;
 }
 
-GF_Err ainf_Size(GF_Box *s)
+GF_Err ainf_box_size(GF_Box *s)
 {
 	GF_AssetInformationBox *ptr = (GF_AssetInformationBox *) s;
-	s->size += 4 +  strlen(ptr->APID) + 1;
+    s->size += 4 + (ptr->APID ? strlen(ptr->APID) : 0 ) + 1;
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void mhac_del(GF_Box *s)
+void mhac_box_del(GF_Box *s)
 {
 	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
 	if (ptr->mha_config) gf_free(ptr->mha_config);
 	gf_free(s);
 }
 
-GF_Err mhac_Read(GF_Box *s,GF_BitStream *bs)
+GF_Err mhac_box_read(GF_Box *s,GF_BitStream *bs)
 {
 	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
 
@@ -11389,13 +11092,16 @@
 	ptr->mha_config_size = gf_bs_read_u16(bs);
 	if (ptr->mha_config_size) {
 		ISOM_DECREASE_SIZE(s, ptr->mha_config_size)
+
 		ptr->mha_config = gf_malloc(sizeof(char)*ptr->mha_config_size);
+		if (!ptr->mha_config) return GF_OUT_OF_MEM;
+
 		gf_bs_read_data(bs, ptr->mha_config, ptr->mha_config_size);
 	}
 	return GF_OK;
 }
 
-GF_Box *mhac_New()
+GF_Box *mhac_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MHAConfigBox, GF_ISOM_BOX_TYPE_MHAC);
 	tmp->configuration_version = 1;
@@ -11404,12 +11110,12 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mhac_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mhac_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
 
-	e = gf_isom_box_write(s, bs);
+	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u8(bs, ptr->configuration_version);
 	gf_bs_write_u8(bs, ptr->mha_pl_indication);
@@ -11421,7 +11127,7 @@
 	return GF_OK;
 }
 
-GF_Err mhac_Size(GF_Box *s)
+GF_Err mhac_box_size(GF_Box *s)
 {
 	GF_MHAConfigBox *ptr = (GF_MHAConfigBox *) s;
 	s->size += 5;
@@ -11432,9 +11138,112 @@
 #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_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;
+		return GF_OK;
+	case GF_ISOM_BOX_TYPE_COLR:
+		if (ptr->colr) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->colr = (GF_ColourInformationBox*)a;
+		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);
+}
+
+GF_Box *jp2h_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_J2KHeaderBox, GF_ISOM_BOX_TYPE_JP2H);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err jp2h_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	return gf_isom_box_write_header(s, bs);
+}
+
+GF_Err jp2h_box_size(GF_Box *s)
+{
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void ihdr_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err ihdr_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_J2KImageHeaderBox *ptr = (GF_J2KImageHeaderBox *) s;
+
+	ISOM_DECREASE_SIZE(s, 14)
+
+	ptr->height = gf_bs_read_u32(bs);
+	ptr->width = gf_bs_read_u32(bs);
+	ptr->nb_comp = gf_bs_read_u16(bs);
+	ptr->bpc = gf_bs_read_u8(bs);
+	ptr->Comp = gf_bs_read_u8(bs);
+	ptr->UnkC = gf_bs_read_u8(bs);
+	ptr->IPR = gf_bs_read_u8(bs);
+
+	return GF_OK;
+}
+
+GF_Box *ihdr_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_J2KImageHeaderBox, GF_ISOM_BOX_TYPE_IHDR);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err ihdr_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_J2KImageHeaderBox *ptr = (GF_J2KImageHeaderBox *) s;
+
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->height);
+	gf_bs_write_u32(bs, ptr->width);
+	gf_bs_write_u16(bs, ptr->nb_comp);
+	gf_bs_write_u8(bs, ptr->bpc);
+	gf_bs_write_u8(bs, ptr->Comp);
+	gf_bs_write_u8(bs, ptr->UnkC);
+	gf_bs_write_u8(bs, ptr->IPR);
+	return GF_OK;
+}
+
+GF_Err ihdr_box_size(GF_Box *s)
+{
+	s->size += 14;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
 /* Dolby Vision */
 
-GF_Box *dvcC_New()
+GF_Box *dvcC_box_new()
 {
 	GF_DOVIConfigurationBox *tmp = (GF_DOVIConfigurationBox *)gf_malloc(sizeof(GF_DOVIConfigurationBox));
 	if (tmp == NULL) return NULL;
@@ -11443,17 +11252,20 @@
 	return (GF_Box *)tmp;
 }
 
-void dvcC_del(GF_Box *s)
+void dvcC_box_del(GF_Box *s)
 {
 	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox*)s;
 	gf_free(ptr);
 }
 
-GF_Err dvcC_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err dvcC_box_read(GF_Box *s, GF_BitStream *bs)
 {
+	u32 i;
+	u32 data[5];
 	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *)s;
 
 	//GF_DOVIDecoderConfigurationRecord
+	ISOM_DECREASE_SIZE(ptr, 24)
 	ptr->DOVIConfig.dv_version_major = gf_bs_read_u8(bs);
 	ptr->DOVIConfig.dv_version_minor = gf_bs_read_u8(bs);
 	ptr->DOVIConfig.dv_profile = gf_bs_read_int(bs, 7);
@@ -11461,24 +11273,20 @@
 	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);
-	{
-		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, ("[iso file] dvcC reserved bytes are not zero\n"));
-				//return GF_ISOM_INVALID_FILE;
-			}
+
+	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;
 		}
 	}
-
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err dvcC_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err dvcC_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *) s;
@@ -11495,12 +11303,16 @@
 	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_int(bs, 0, 5*32);
+    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 dvcC_Size(GF_Box *s)
+GF_Err dvcC_box_size(GF_Box *s)
 {
 	GF_DOVIConfigurationBox *ptr = (GF_DOVIConfigurationBox *)s;
 
@@ -11511,4 +11323,616 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
+GF_Box *dOps_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_OpusSpecificBox, GF_ISOM_BOX_TYPE_DOPS);
+	return (GF_Box *)tmp;
+}
+
+void dOps_box_del(GF_Box *s)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	if (ptr) gf_free(ptr);
+}
+
+GF_Err dOps_box_read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->OutputChannelCount = gf_bs_read_u8(bs);
+	ptr->PreSkip = gf_bs_read_u16(bs);
+	ptr->InputSampleRate = gf_bs_read_u32(bs);
+	ptr->OutputGain = gf_bs_read_u16(bs);
+	ptr->ChannelMappingFamily = gf_bs_read_u8(bs);
+	ISOM_DECREASE_SIZE(ptr, 11)
+	if (ptr->size) {
+		ISOM_DECREASE_SIZE(ptr, 2+ptr->OutputChannelCount);
+		ptr->StreamCount = gf_bs_read_u8(bs);
+		ptr->CoupledCount = gf_bs_read_u8(bs);
+		gf_bs_read_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err dOps_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_u8(bs, ptr->OutputChannelCount);
+	gf_bs_write_u16(bs, ptr->PreSkip);
+	gf_bs_write_u32(bs, ptr->InputSampleRate);
+	gf_bs_write_u16(bs, ptr->OutputGain);
+	gf_bs_write_u8(bs, ptr->ChannelMappingFamily);
+	if (ptr->ChannelMappingFamily) {
+		gf_bs_write_u8(bs, ptr->StreamCount);
+		gf_bs_write_u8(bs, ptr->CoupledCount);
+		gf_bs_write_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
+	}
+	return GF_OK;
+}
+
+GF_Err dOps_box_size(GF_Box *s)
+{
+	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
+	ptr->size += 11;
+	if (ptr->ChannelMappingFamily)
+		ptr->size += 2 + ptr->OutputChannelCount;
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void dfla_box_del(GF_Box *s)
+{
+	GF_FLACConfigBox *ptr = (GF_FLACConfigBox *) s;
+	if (ptr->data) gf_free(ptr->data);
+	gf_free(ptr);
+}
+
+GF_Err dfla_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_FLACConfigBox *ptr = (GF_FLACConfigBox *) s;
+	ptr->dataSize = (u32) ptr->size;
+	ptr->size=0;
+	ptr->data = gf_malloc(ptr->dataSize);
+	gf_bs_read_data(bs, ptr->data, ptr->dataSize);
+	return GF_OK;
+}
+
+GF_Box *dfla_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_FLACConfigBox, GF_ISOM_BOX_TYPE_DFLA);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err dfla_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_FLACConfigBox *ptr = (GF_FLACConfigBox *) s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_data(bs, ptr->data, ptr->dataSize);
+	return GF_OK;
+}
+
+GF_Err dfla_box_size(GF_Box *s)
+{
+	GF_FLACConfigBox *ptr = (GF_FLACConfigBox *) s;
+	ptr->size += ptr->dataSize;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+void mvcg_box_del(GF_Box *s)
+{
+	GF_MultiviewGroupBox *ptr = (GF_MultiviewGroupBox *) s;
+	if (ptr->entries) gf_free(ptr->entries);
+	gf_free(ptr);
+}
+
+GF_Err mvcg_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	u32 i;
+	GF_MultiviewGroupBox *ptr = (GF_MultiviewGroupBox *) s;
+	ISOM_DECREASE_SIZE(s, 7)
+	ptr->multiview_group_id = gf_bs_read_u32(bs);
+	ptr->num_entries = gf_bs_read_u16(bs);
+	gf_bs_read_u8(bs);
+	ptr->entries = gf_malloc(ptr->num_entries * sizeof(MVCIEntry));
+	memset(ptr->entries, 0, ptr->num_entries * sizeof(MVCIEntry));
+	for (i=0; i<ptr->num_entries; i++) {
+		ISOM_DECREASE_SIZE(s, 1)
+		ptr->entries[i].entry_type = gf_bs_read_u8(bs);
+		switch (ptr->entries[i].entry_type) {
+		case 0:
+			ISOM_DECREASE_SIZE(s, 4)
+			ptr->entries[i].trackID = gf_bs_read_u32(bs);
+			break;
+		case 1:
+			ISOM_DECREASE_SIZE(s, 6)
+			ptr->entries[i].trackID = gf_bs_read_u32(bs);
+			ptr->entries[i].tierID = gf_bs_read_u16(bs);
+			break;
+		case 2:
+			ISOM_DECREASE_SIZE(s, 2)
+			gf_bs_read_int(bs, 6);
+			ptr->entries[i].output_view_id = gf_bs_read_int(bs, 10);
+			break;
+		case 3:
+			ISOM_DECREASE_SIZE(s, 4)
+			gf_bs_read_int(bs, 6)	;
+			ptr->entries[i].start_view_id = gf_bs_read_int(bs, 10);
+			ptr->entries[i].view_count = gf_bs_read_u16(bs);
+			break;
+		}
+	}
+	return gf_isom_box_array_read(s, bs, NULL);
+}
+
+GF_Box *mvcg_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_MultiviewGroupBox, GF_ISOM_BOX_TYPE_MVCG);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err mvcg_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i;
+	GF_MultiviewGroupBox *ptr = (GF_MultiviewGroupBox *) s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+
+	gf_bs_write_u32(bs, ptr->multiview_group_id);
+	gf_bs_write_u16(bs, ptr->num_entries);
+	gf_bs_write_u8(bs, 0);
+
+	for (i=0; i<ptr->num_entries; i++) {
+		gf_bs_write_u8(bs, ptr->entries[i].entry_type);
+		switch (ptr->entries[i].entry_type) {
+		case 0:
+			gf_bs_write_u32(bs, ptr->entries[i].trackID);
+			break;
+		case 1:
+			gf_bs_write_u32(bs, ptr->entries[i].trackID);
+			gf_bs_write_u16(bs, ptr->entries[i].tierID);
+			break;
+		case 2:
+			gf_bs_write_int(bs, 0, 6);
+			gf_bs_write_int(bs, ptr->entries[i].output_view_id, 10);
+			break;
+		case 3:
+			gf_bs_write_int(bs, 0, 6)	;
+			gf_bs_write_int(bs, ptr->entries[i].start_view_id, 10);
+			gf_bs_write_u16(bs, ptr->entries[i].view_count);
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err mvcg_box_size(GF_Box *s)
+{
+	u32 i;
+	GF_MultiviewGroupBox *ptr = (GF_MultiviewGroupBox *) s;
+
+	ptr->size += 7;
+	for (i=0; i<ptr->num_entries; i++) {
+		switch (ptr->entries[i].entry_type) {
+		case 0:
+			ptr->size += 1 + 4;
+			break;
+		case 1:
+			ptr->size += 1 + 6;
+			break;
+		case 2:
+			ptr->size += 1 + 2;
+			break;
+		case 3:
+			ptr->size += 1 + 4;
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void vwid_box_del(GF_Box *s)
+{
+	u32 i;
+	GF_ViewIdentifierBox *ptr = (GF_ViewIdentifierBox *) s;
+	if (ptr->num_views) {
+		for (i=0; i<ptr->num_views; i++) {
+			if (ptr->views[i].view_refs)
+				gf_free(ptr->views[i].view_refs);
+		}
+		gf_free(ptr->views);
+	}
+	gf_free(ptr);
+}
+
+GF_Err vwid_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	u32 i;
+	GF_ViewIdentifierBox *ptr = (GF_ViewIdentifierBox *) s;
+	ISOM_DECREASE_SIZE(s, 3)
+	gf_bs_read_int(bs, 2);
+	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)
+		return GF_ISOM_INVALID_FILE;
+
+	ptr->views = gf_malloc(sizeof(ViewIDEntry)*ptr->num_views);
+	for (i=0; i<ptr->num_views; i++) {
+		u32 j;
+		ISOM_DECREASE_SIZE(s, 6)
+
+		gf_bs_read_int(bs, 6);
+		ptr->views[i].view_id = gf_bs_read_int(bs, 10);
+		gf_bs_read_int(bs, 6);
+		ptr->views[i].view_order_index = gf_bs_read_int(bs, 10);
+		ptr->views[i].texture_in_stream = gf_bs_read_int(bs, 1);
+		ptr->views[i].texture_in_track = gf_bs_read_int(bs, 1);
+		ptr->views[i].depth_in_stream = gf_bs_read_int(bs, 1);
+		ptr->views[i].depth_in_track = gf_bs_read_int(bs, 1);
+		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)
+			return GF_ISOM_INVALID_FILE;
+
+		ptr->views[i].view_refs = gf_malloc(sizeof(ViewIDRefViewEntry)*ptr->views[i].num_ref_views);
+		for (j=0; j<ptr->views[i].num_ref_views; j++) {
+			ISOM_DECREASE_SIZE(s, 2)
+			gf_bs_read_int(bs, 4);
+			ptr->views[i].view_refs[j].dep_comp_idc = gf_bs_read_int(bs, 2);
+			ptr->views[i].view_refs[j].ref_view_id = gf_bs_read_int(bs, 10);
+		}
+	}
+	return GF_OK;
+}
+
+GF_Box *vwid_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ViewIdentifierBox, GF_ISOM_BOX_TYPE_VWID);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err vwid_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 i, j;
+	GF_ViewIdentifierBox *ptr = (GF_ViewIdentifierBox *) s;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_int(bs, 0, 2);
+	gf_bs_write_int(bs, ptr->min_temporal_id, 3);
+	gf_bs_write_int(bs, ptr->max_temporal_id, 3);
+	gf_bs_write_u16(bs, ptr->num_views);
+
+	for (i=0; i<ptr->num_views; i++) {
+		gf_bs_write_int(bs, 0, 6);
+		gf_bs_write_int(bs, ptr->views[i].view_id, 10);
+		gf_bs_write_int(bs, 0, 6);
+		gf_bs_write_int(bs, ptr->views[i].view_order_index, 10);
+
+		gf_bs_write_int(bs, ptr->views[i].texture_in_stream, 1);
+		gf_bs_write_int(bs, ptr->views[i].texture_in_track, 1);
+		gf_bs_write_int(bs, ptr->views[i].depth_in_stream, 1);
+		gf_bs_write_int(bs, ptr->views[i].depth_in_track, 1);
+		gf_bs_write_int(bs, ptr->views[i].base_view_type, 2);
+		gf_bs_write_int(bs, ptr->views[i].num_ref_views, 10);
+
+		for (j=0; j<ptr->views[i].num_ref_views; j++) {
+			gf_bs_write_int(bs, 0, 4);
+			gf_bs_write_int(bs, ptr->views[i].view_refs[j].dep_comp_idc, 2);
+			gf_bs_write_int(bs, ptr->views[i].view_refs[j].ref_view_id, 10);
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err vwid_box_size(GF_Box *s)
+{
+	u32 i;
+	GF_ViewIdentifierBox *ptr = (GF_ViewIdentifierBox *) s;
+	ptr->size += 3;
+	for (i=0; i<ptr->num_views; i++) {
+		ptr->size += 6 + 2 * ptr->views[i].num_ref_views;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+void pcmC_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err pcmC_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_PCMConfigBox *ptr = (GF_PCMConfigBox *) s;
+
+	ISOM_DECREASE_SIZE(s, 2)
+	ptr->format_flags = gf_bs_read_u8(bs);
+	ptr->PCM_sample_size = gf_bs_read_u8(bs);
+	return GF_OK;
+}
+
+GF_Box *pcmC_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_PCMConfigBox, GF_ISOM_BOX_TYPE_PCMC);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err pcmC_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_PCMConfigBox *ptr = (GF_PCMConfigBox *) s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	gf_bs_write_u8(bs, ptr->format_flags);
+	gf_bs_write_u8(bs, ptr->PCM_sample_size);
+	return GF_OK;
+}
+
+GF_Err pcmC_box_size(GF_Box *s)
+{
+	s->size += 2;
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+
+void chnl_box_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err chnl_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_ChannelLayoutBox *ptr = (GF_ChannelLayoutBox *) s;
+
+	ISOM_DECREASE_SIZE(s, 1)
+	ptr->layout.stream_structure = gf_bs_read_u8(bs);
+	if (ptr->layout.stream_structure & 1) {
+		ISOM_DECREASE_SIZE(s, 1)
+		ptr->layout.definedLayout = gf_bs_read_u8(bs);
+		if (ptr->layout.definedLayout) {
+			u32 remain = (u32) ptr->size;
+			if (ptr->layout.stream_structure & 2) remain--;
+			ptr->layout.channels_count = 0;
+			while (remain) {
+				ISOM_DECREASE_SIZE(s, 1)
+				ptr->layout.layouts[ptr->layout.channels_count].position = gf_bs_read_u8(bs);
+				remain--;
+				if (ptr->layout.layouts[ptr->layout.channels_count].position == 126) {
+					ISOM_DECREASE_SIZE(s, 3)
+					ptr->layout.layouts[ptr->layout.channels_count].azimuth = gf_bs_read_int(bs, 16);
+					ptr->layout.layouts[ptr->layout.channels_count].elevation = gf_bs_read_int(bs, 8);
+					remain-=3;
+				}
+			}
+		} else {
+			ISOM_DECREASE_SIZE(s, 8)
+			ptr->layout.omittedChannelsMap = gf_bs_read_u64(bs);
+		}
+	}
+	if (ptr->layout.stream_structure & 2) {
+		ISOM_DECREASE_SIZE(s, 1)
+		ptr->layout.object_count = gf_bs_read_u8(bs);
+	}
+	return GF_OK;
+}
+
+GF_Box *chnl_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ChannelLayoutBox, GF_ISOM_BOX_TYPE_CHNL);
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err chnl_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ChannelLayoutBox *ptr = (GF_ChannelLayoutBox *) s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u8(bs, ptr->layout.stream_structure);
+	if (ptr->layout.stream_structure & 1) {
+		gf_bs_write_u8(bs, ptr->layout.definedLayout);
+		if (ptr->layout.definedLayout==0) {
+			u32 i;
+			for (i=0; i<ptr->layout.channels_count; i++) {
+				gf_bs_write_u8(bs, ptr->layout.layouts[i].position);
+				if (ptr->layout.layouts[i].position==126) {
+					gf_bs_write_int(bs, ptr->layout.layouts[i].azimuth, 16);
+					gf_bs_write_int(bs, ptr->layout.layouts[i].elevation, 8);
+				}
+			}
+		} else {
+			gf_bs_write_u64(bs, ptr->layout.omittedChannelsMap);
+		}
+	}
+	if (ptr->layout.stream_structure & 2) {
+		gf_bs_write_u8(bs, ptr->layout.object_count);
+	}
+	return GF_OK;
+}
+
+GF_Err chnl_box_size(GF_Box *s)
+{
+	GF_ChannelLayoutBox *ptr = (GF_ChannelLayoutBox *) s;
+	s->size += 1;
+	if (ptr->layout.stream_structure & 1) {
+		s->size += 1;
+		if (ptr->layout.definedLayout==0) {
+			u32 i;
+			for (i=0; i<ptr->layout.channels_count; i++) {
+				s->size+=1;
+				if (ptr->layout.layouts[i].position==126)
+					s->size+=3;
+			}
+		} else {
+			s->size += 8;
+		}
+	}
+	if (ptr->layout.stream_structure & 2) {
+		s->size += 1;
+	}
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+
+GF_Box *emsg_box_new()
+{
+	ISOM_DECL_BOX_ALLOC(GF_EventMessageBox, GF_ISOM_BOX_TYPE_EMSG);
+	return (GF_Box *)tmp;
+}
+
+void emsg_box_del(GF_Box *s)
+{
+	GF_EventMessageBox *ptr = (GF_EventMessageBox *) s;
+	if (ptr == NULL) return;
+	if (ptr->scheme_id_uri) gf_free(ptr->scheme_id_uri);
+	if (ptr->value) gf_free(ptr->value);
+	if (ptr->message_data) gf_free(ptr->message_data);
+	gf_free(ptr);
+}
+
+GF_Err emsg_box_read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_EventMessageBox *ptr = (GF_EventMessageBox*) s;
+
+	if (ptr->version==0) {
+		e = gf_isom_read_null_terminated_string(s, bs, ptr->size, &ptr->scheme_id_uri);
+		if (e) return e;
+		e = gf_isom_read_null_terminated_string(s, bs, ptr->size, &ptr->value);
+		if (e) return e;
+
+		ISOM_DECREASE_SIZE(ptr, 16);
+		ptr->timescale = gf_bs_read_u32(bs);
+		ptr->presentation_time_delta = gf_bs_read_u32(bs);
+		ptr->event_duration = gf_bs_read_u32(bs);
+		ptr->event_id = gf_bs_read_u32(bs);
+	} else if (ptr->version==1) {
+		ISOM_DECREASE_SIZE(ptr, 20);
+		ptr->timescale = gf_bs_read_u32(bs);
+		ptr->presentation_time_delta = gf_bs_read_u64(bs);
+		ptr->event_duration = gf_bs_read_u32(bs);
+		ptr->event_id = gf_bs_read_u32(bs);
+
+		e = gf_isom_read_null_terminated_string(s, bs, ptr->size, &ptr->scheme_id_uri);
+		if (e) return e;
+		e = gf_isom_read_null_terminated_string(s, bs, ptr->size, &ptr->value);
+		if (e) return e;
+	} else {
+		return GF_OK;
+	}
+	if (ptr->size) {
+		if (ptr->size>0xFFFFFFFUL) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] emsg message data size too big ("LLU") to be loaded\n", ptr->size));
+			return GF_OUT_OF_MEM;
+		}
+		ptr->message_data_size = (u32) ptr->size;
+		ptr->message_data = gf_malloc(ptr->message_data_size);
+		if (!ptr->message_data) return GF_OUT_OF_MEM;
+		gf_bs_read_data(bs, ptr->message_data, ptr->message_data_size);
+		ptr->size = 0;
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err emsg_box_write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 len;
+	GF_EventMessageBox *ptr = (GF_EventMessageBox*) s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	if (ptr->version==1) {
+		gf_bs_write_u32(bs, ptr->timescale);
+		gf_bs_write_u64(bs, ptr->presentation_time_delta);
+		gf_bs_write_u32(bs, ptr->event_duration);
+		gf_bs_write_u32(bs, ptr->event_id);
+	}
+
+	len = ptr->scheme_id_uri ? (u32) strlen(ptr->scheme_id_uri) : 0;
+	if (len) gf_bs_write_data(bs, ptr->scheme_id_uri, len);
+	gf_bs_write_u8(bs, 0);
+
+	len = ptr->value ? (u32) strlen(ptr->value) : 0;
+	if (len) gf_bs_write_data(bs, ptr->value, len);
+	gf_bs_write_u8(bs, 0);
+
+	if (ptr->version==0) {
+		gf_bs_write_u32(bs, ptr->timescale);
+		gf_bs_write_u32(bs, (u32) ptr->presentation_time_delta);
+		gf_bs_write_u32(bs, ptr->event_duration);
+		gf_bs_write_u32(bs, ptr->event_id);
+	}
+	if (ptr->message_data)
+		gf_bs_write_data(bs, ptr->message_data, ptr->message_data_size);
+	return GF_OK;
+}
+
+GF_Err emsg_box_size(GF_Box *s)
+{
+	GF_EventMessageBox *ptr = (GF_EventMessageBox*) s;
+
+	ptr->size += 4;
+	if (ptr->version) {
+		ptr->size += 20;
+	} else {
+		ptr->size += 16;
+	}
+	ptr->size+=2; //1 NULL-terminated strings
+	if (ptr->scheme_id_uri) ptr->size += strlen(ptr->scheme_id_uri);
+	if (ptr->value) ptr->size += strlen(ptr->value);
+	if (ptr->message_data)
+		ptr->size += ptr->message_data_size;
+
+	return GF_OK;
+}
+#endif // GPAC_DISABLE_ISOM_WRITE
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/isomedia/box_code_drm.c -> gpac-1.0.0.tar.gz/src/isomedia/box_code_drm.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -28,111 +28,83 @@
 #ifndef GPAC_DISABLE_ISOM
 
 /* ProtectionInfo Box */
-GF_Box *sinf_New()
+GF_Box *sinf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ProtectionSchemeInfoBox, GF_ISOM_BOX_TYPE_SINF);
 	return (GF_Box *)tmp;
 }
 
-void sinf_del(GF_Box *s)
+void sinf_box_del(GF_Box *s)
 {
-	GF_ProtectionSchemeInfoBox *ptr = (GF_ProtectionSchemeInfoBox *)s;
-	if (ptr == NULL) return;
-	if (ptr->original_format) gf_isom_box_del((GF_Box *)ptr->original_format);
-	if (ptr->info) gf_isom_box_del((GF_Box *)ptr->info);
-	if (ptr->scheme_type) gf_isom_box_del((GF_Box *)ptr->scheme_type);
-	gf_free(ptr);
+	gf_free(s);
 }
 
-GF_Err sinf_AddBox(GF_Box *s, GF_Box *a)
+GF_Err sinf_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_ProtectionSchemeInfoBox *ptr = (GF_ProtectionSchemeInfoBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_FRMA:
-		if (ptr->original_format) return GF_ISOM_INVALID_FILE;
+		if (ptr->original_format) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->original_format = (GF_OriginalFormatBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SCHM:
-		if (ptr->scheme_type) return GF_ISOM_INVALID_FILE;
+		if (ptr->scheme_type) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->scheme_type = (GF_SchemeTypeBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_SCHI:
-		if (ptr->info) return GF_ISOM_INVALID_FILE;
+		if (ptr->info) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->info = (GF_SchemeInformationBox*)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err sinf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err sinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, sinf_AddBox);
+	return gf_isom_box_array_read(s, bs, sinf_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err sinf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err sinf_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_ProtectionSchemeInfoBox *ptr = (GF_ProtectionSchemeInfoBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	//frma
-	e = gf_isom_box_write((GF_Box *) ptr->original_format, bs);
-	if (e) return e;
-	// schm
-	e = gf_isom_box_write((GF_Box *) ptr->scheme_type, bs);
-	if (e) return e;
-	// schi
-	e = gf_isom_box_write((GF_Box *) ptr->info, bs);
-	if (e) return e;
-	return GF_OK;
+	return  gf_isom_box_write_header(s, bs);
 }
 
-GF_Err sinf_Size(GF_Box *s)
+GF_Err sinf_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_ProtectionSchemeInfoBox *ptr = (GF_ProtectionSchemeInfoBox *)s;
-	if (!s) return GF_BAD_PARAM;
-
-	e = gf_isom_box_size((GF_Box *) ptr->original_format);
-	if (e) return e;
-	ptr->size += ptr->original_format->size;
-	e = gf_isom_box_size((GF_Box *) ptr->scheme_type);
-	if (e) return e;
-	ptr->size += ptr->scheme_type->size;
-	e = gf_isom_box_size((GF_Box *) ptr->info);
-	if (e) return e;
-	ptr->size += ptr->info->size;
-	return GF_OK;
+	gf_isom_check_position(s, (GF_Box *)ptr->original_format, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->scheme_type, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->info, &pos);
+    return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* OriginalFormat Box */
-GF_Box *frma_New()
+GF_Box *frma_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OriginalFormatBox, GF_ISOM_BOX_TYPE_FRMA);
 	return (GF_Box *)tmp;
 }
 
-void frma_del(GF_Box *s)
+void frma_box_del(GF_Box *s)
 {
 	GF_OriginalFormatBox *ptr = (GF_OriginalFormatBox *)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err frma_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err frma_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_OriginalFormatBox *ptr = (GF_OriginalFormatBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	ptr->data_format = gf_bs_read_u32(bs);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err frma_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err frma_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_OriginalFormatBox *ptr = (GF_OriginalFormatBox *)s;
@@ -143,7 +115,7 @@
 	return GF_OK;
 }
 
-GF_Err frma_Size(GF_Box *s)
+GF_Err frma_box_size(GF_Box *s)
 {
 	GF_OriginalFormatBox *ptr = (GF_OriginalFormatBox *)s;
 	ptr->size += 4;
@@ -152,13 +124,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* SchemeType Box */
-GF_Box *schm_New()
+GF_Box *schm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SchemeTypeBox, GF_ISOM_BOX_TYPE_SCHM);
 	return (GF_Box *)tmp;
 }
 
-void schm_del(GF_Box *s)
+void schm_box_del(GF_Box *s)
 {
 	GF_SchemeTypeBox *ptr = (GF_SchemeTypeBox *)s;
 	if (ptr == NULL) return;
@@ -166,13 +138,13 @@
 	gf_free(ptr);
 }
 
-GF_Err schm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err schm_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SchemeTypeBox *ptr = (GF_SchemeTypeBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 8);
 	ptr->scheme_type = gf_bs_read_u32(bs);
 	ptr->scheme_version = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 8);
 
 	if (ptr->size && (ptr->flags & 0x000001)) {
 		u32 len = (u32) (ptr->size);
@@ -184,7 +156,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err schm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err schm_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_SchemeTypeBox *ptr = (GF_SchemeTypeBox *) s;
@@ -193,67 +165,63 @@
 	if (e) return e;
 	gf_bs_write_u32(bs, ptr->scheme_type);
 	gf_bs_write_u32(bs, ptr->scheme_version);
-	if (ptr->flags & 0x000001) gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
+	if (ptr->flags & 0x000001) {
+		if (ptr->URI)
+			gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
+		else
+			gf_bs_write_u8(bs, 0);
+	}
 	return GF_OK;
 }
 
-GF_Err schm_Size(GF_Box *s)
+GF_Err schm_box_size(GF_Box *s)
 {
 	GF_SchemeTypeBox *ptr = (GF_SchemeTypeBox *) s;
 	if (!s) return GF_BAD_PARAM;
 	ptr->size += 8;
-	if (ptr->flags & 0x000001) ptr->size += strlen(ptr->URI)+1;
+	if (ptr->flags & 0x000001) ptr->size += 1 + (ptr->URI ? strlen(ptr->URI) : 0);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* SchemeInformation Box */
-GF_Box *schi_New()
+GF_Box *schi_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SchemeInformationBox, GF_ISOM_BOX_TYPE_SCHI);
 	return (GF_Box *)tmp;
 }
 
-void schi_del(GF_Box *s)
+void schi_box_del(GF_Box *s)
 {
-	GF_SchemeInformationBox *ptr = (GF_SchemeInformationBox *)s;
-	if (ptr == NULL) return;
-	if (ptr->ikms) gf_isom_box_del((GF_Box *)ptr->ikms);
-	if (ptr->isfm) gf_isom_box_del((GF_Box *)ptr->isfm);
-	if (ptr->islt) gf_isom_box_del((GF_Box *)ptr->islt);
-	if (ptr->odkm) gf_isom_box_del((GF_Box *)ptr->odkm);
-	if (ptr->tenc) gf_isom_box_del((GF_Box *)ptr->tenc);
-	if (ptr->piff_tenc) gf_isom_box_del((GF_Box *)ptr->piff_tenc);
-	if (ptr->adkm) gf_isom_box_del((GF_Box *)ptr->adkm);
-	gf_free(ptr);
+	gf_free(s);
 }
 
-GF_Err schi_AddBox(GF_Box *s, GF_Box *a)
+GF_Err schi_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_SchemeInformationBox *ptr = (GF_SchemeInformationBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_IKMS:
-		if (ptr->ikms) return GF_ISOM_INVALID_FILE;
+		if (ptr->ikms) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->ikms = (GF_ISMAKMSBox*)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ISFM:
-		if (ptr->isfm) return GF_ISOM_INVALID_FILE;
+		if (ptr->isfm) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->isfm = (GF_ISMASampleFormatBox*)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ISLT:
-		if (ptr->islt) return GF_ISOM_INVALID_FILE;
+		if (ptr->islt) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->islt = (GF_ISMACrypSaltBox*)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ODKM:
-		if (ptr->odkm) return GF_ISOM_INVALID_FILE;
+		if (ptr->odkm) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->odkm = (GF_OMADRMKMSBox*)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_TENC:
-		if (ptr->tenc) return GF_ISOM_INVALID_FILE;
+		if (ptr->tenc) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->tenc = (GF_TrackEncryptionBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ADKM:
-		if (ptr->adkm) return GF_ISOM_INVALID_FILE;
+		if (ptr->adkm) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->adkm = (GF_AdobeDRMKeyManagementSystemBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UUID:
@@ -262,112 +230,48 @@
 			ptr->piff_tenc = (GF_PIFFTrackEncryptionBox *)a;
 			return GF_OK;
 		} else {
-			return gf_isom_box_add_default(s, a);
+			return GF_OK;
 		}
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
+	return GF_OK;
 }
 
-GF_Err schi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err schi_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, schi_AddBox);
+	return gf_isom_box_array_read(s, bs, schi_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err schi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err schi_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_SchemeInformationBox *ptr = (GF_SchemeInformationBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-
-	if (ptr->ikms) {
-		e = gf_isom_box_write((GF_Box *) ptr->ikms, bs);
-		if (e) return e;
-	}
-	if (ptr->isfm) {
-		e = gf_isom_box_write((GF_Box *) ptr->isfm, bs);
-		if (e) return e;
-	}
-	if (ptr->islt) {
-		e = gf_isom_box_write((GF_Box *) ptr->islt, bs);
-		if (e) return e;
-	}
-	if (ptr->odkm) {
-		e = gf_isom_box_write((GF_Box *) ptr->odkm, bs);
-		if (e) return e;
-	}
-	if (ptr->tenc) {
-		e = gf_isom_box_write((GF_Box *) ptr->tenc, bs);
-		if (e) return e;
-	}
-	if (ptr->adkm) {
-		e = gf_isom_box_write((GF_Box *) ptr->adkm, bs);
-		if (e) return e;
-	}
-	if (ptr->piff_tenc) {
-		e = gf_isom_box_write((GF_Box *) ptr->piff_tenc, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err schi_Size(GF_Box *s)
+GF_Err schi_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_SchemeInformationBox *ptr = (GF_SchemeInformationBox *)s;
-	if (!s) return GF_BAD_PARAM;
 
-	if (ptr->ikms) {
-		e = gf_isom_box_size((GF_Box *) ptr->ikms);
-		if (e) return e;
-		ptr->size += ptr->ikms->size;
-	}
-	if (ptr->isfm) {
-		e = gf_isom_box_size((GF_Box *) ptr->isfm);
-		if (e) return e;
-		ptr->size += ptr->isfm->size;
-	}
-	if (ptr->islt) {
-		e = gf_isom_box_size((GF_Box *) ptr->islt);
-		if (e) return e;
-		ptr->size += ptr->isfm->size;
-	}
-	if (ptr->odkm) {
-		e = gf_isom_box_size((GF_Box *) ptr->odkm);
-		if (e) return e;
-		ptr->size += ptr->odkm->size;
-	}
-	if (ptr->tenc) {
-		e = gf_isom_box_size((GF_Box *) ptr->tenc);
-		if (e) return e;
-		ptr->size += ptr->tenc->size;
-	}
-	if (ptr->adkm) {
-		e = gf_isom_box_size((GF_Box *) ptr->adkm);
-		if (e) return e;
-		ptr->size += ptr->adkm->size;
-	}
-	if (ptr->piff_tenc) {
-		e = gf_isom_box_size((GF_Box *) ptr->piff_tenc);
-		if (e) return e;
-		ptr->size += ptr->piff_tenc->size;
-	}
+	gf_isom_check_position(s, (GF_Box *)ptr->ikms, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->isfm, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->islt, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->odkm, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->tenc, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->adkm, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->piff_tenc, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* ISMAKMS Box */
-GF_Box *iKMS_New()
+GF_Box *iKMS_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ISMAKMSBox, GF_ISOM_BOX_TYPE_IKMS);
 	return (GF_Box *)tmp;
 }
 
-void iKMS_del(GF_Box *s)
+void iKMS_box_del(GF_Box *s)
 {
 	GF_ISMAKMSBox *ptr = (GF_ISMAKMSBox *)s;
 	if (ptr == NULL) return;
@@ -375,7 +279,7 @@
 	gf_free(ptr);
 }
 
-GF_Err iKMS_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err iKMS_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 len;
 	GF_ISMAKMSBox *ptr = (GF_ISMAKMSBox *)s;
@@ -388,33 +292,35 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err iKMS_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err iKMS_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ISMAKMSBox *ptr = (GF_ISMAKMSBox *)s;
 	if (!s) return GF_BAD_PARAM;
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI)+1);
+    if (ptr->URI)
+        gf_bs_write_data(bs, ptr->URI, (u32) strlen(ptr->URI));
+    gf_bs_write_u8(bs, 0);
 	return GF_OK;
 }
 
-GF_Err iKMS_Size(GF_Box *s)
+GF_Err iKMS_box_size(GF_Box *s)
 {
 	GF_ISMAKMSBox *ptr = (GF_ISMAKMSBox *)s;
-	ptr->size += strlen(ptr->URI)+1;
+    ptr->size += (ptr->URI ? strlen(ptr->URI) : 0) + 1;
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* ISMASampleFormat Box */
-GF_Box *iSFM_New()
+GF_Box *iSFM_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ISMASampleFormatBox, GF_ISOM_BOX_TYPE_ISFM);
 	return (GF_Box *)tmp;
 }
 
-void iSFM_del(GF_Box *s)
+void iSFM_box_del(GF_Box *s)
 {
 	GF_ISMASampleFormatBox *ptr = (GF_ISMASampleFormatBox *)s;
 	if (ptr == NULL) return;
@@ -422,10 +328,11 @@
 }
 
 
-GF_Err iSFM_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err iSFM_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ISMASampleFormatBox *ptr = (GF_ISMASampleFormatBox *)s;
 
+	ISOM_DECREASE_SIZE(ptr, 3);
 	ptr->selective_encryption = gf_bs_read_int(bs, 1);
 	gf_bs_read_int(bs, 7);
 	ptr->key_indicator_length = gf_bs_read_u8(bs);
@@ -434,7 +341,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err iSFM_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err iSFM_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ISMASampleFormatBox *ptr = (GF_ISMASampleFormatBox *)s;
@@ -448,7 +355,7 @@
 	return GF_OK;
 }
 
-GF_Err iSFM_Size(GF_Box *s)
+GF_Err iSFM_box_size(GF_Box *s)
 {
 	GF_ISMASampleFormatBox *ptr = (GF_ISMASampleFormatBox *)s;
 	ptr->size += 3;
@@ -457,13 +364,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 /* ISMASampleFormat Box */
-GF_Box *iSLT_New()
+GF_Box *iSLT_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ISMACrypSaltBox, GF_ISOM_BOX_TYPE_ISLT);
 	return (GF_Box *)tmp;
 }
 
-void iSLT_del(GF_Box *s)
+void iSLT_box_del(GF_Box *s)
 {
 	GF_ISMACrypSaltBox *ptr = (GF_ISMACrypSaltBox *)s;
 	if (ptr == NULL) return;
@@ -471,7 +378,7 @@
 }
 
 
-GF_Err iSLT_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err iSLT_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ISMACrypSaltBox *ptr = (GF_ISMACrypSaltBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
@@ -481,7 +388,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err iSLT_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err iSLT_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ISMACrypSaltBox *ptr = (GF_ISMACrypSaltBox *)s;
@@ -493,7 +400,7 @@
 	return GF_OK;
 }
 
-GF_Err iSLT_Size(GF_Box *s)
+GF_Err iSLT_box_size(GF_Box *s)
 {
 	s->size += 8;
 	return GF_OK;
@@ -503,14 +410,14 @@
 
 
 /* OMADRMCommonHeader Box */
-GF_Box *ohdr_New()
+GF_Box *ohdr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMCommonHeaderBox, GF_ISOM_BOX_TYPE_OHDR);
-	tmp->other_boxes = gf_list_new();
+	tmp->child_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void ohdr_del(GF_Box *s)
+void ohdr_box_del(GF_Box *s)
 {
 	GF_OMADRMCommonHeaderBox *ptr = (GF_OMADRMCommonHeaderBox*)s;
 	if (ptr == NULL) return;
@@ -520,51 +427,49 @@
 	gf_free(ptr);
 }
 
-GF_Err ohdr_AddBox(GF_Box *s, GF_Box *a)
-{
-	return gf_isom_box_add_default(s, a);
-}
-
-GF_Err ohdr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ohdr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u16 cid_len, ri_len;
 	GF_OMADRMCommonHeaderBox *ptr = (GF_OMADRMCommonHeaderBox*)s;
 
+	ISOM_DECREASE_SIZE(ptr, (1+1+8+2+2+2) );
 	ptr->EncryptionMethod = gf_bs_read_u8(bs);
 	ptr->PaddingScheme = gf_bs_read_u8(bs);
 	ptr->PlaintextLength = gf_bs_read_u64(bs);
 	cid_len = gf_bs_read_u16(bs);
 	ri_len = gf_bs_read_u16(bs);
 	ptr->TextualHeadersLen = gf_bs_read_u16(bs);
-	ISOM_DECREASE_SIZE(ptr, (1+1+8+2+2+2) );
 
 	if (ptr->size<cid_len+ri_len+ptr->TextualHeadersLen) return GF_ISOM_INVALID_FILE;
 
 	if (cid_len) {
 		ptr->ContentID = (char *)gf_malloc(sizeof(char)*(cid_len+1));
+		if (!ptr->ContentID) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->ContentID, cid_len);
 		ptr->ContentID[cid_len]=0;
 	}
 
 	if (ri_len) {
 		ptr->RightsIssuerURL = (char *)gf_malloc(sizeof(char)*(ri_len+1));
+		if (!ptr->RightsIssuerURL) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->RightsIssuerURL, ri_len);
 		ptr->RightsIssuerURL[ri_len]=0;
 	}
 
 	if (ptr->TextualHeadersLen) {
 		ptr->TextualHeaders = (char *)gf_malloc(sizeof(char)*(ptr->TextualHeadersLen+1));
+		if (!ptr->TextualHeaders) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->TextualHeaders, ptr->TextualHeadersLen);
 		ptr->TextualHeaders[ptr->TextualHeadersLen] = 0;
 	}
 
 	ISOM_DECREASE_SIZE(ptr, (cid_len+ri_len+ptr->TextualHeadersLen) );
 
-	return gf_isom_box_array_read(s, bs, ohdr_AddBox);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err ohdr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ohdr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u16 cid_len, ri_len;
 	GF_Err e;
@@ -590,7 +495,7 @@
 	return GF_OK;
 }
 
-GF_Err ohdr_Size(GF_Box *s)
+GF_Err ohdr_box_size(GF_Box *s)
 {
 	GF_OMADRMCommonHeaderBox *ptr = (GF_OMADRMCommonHeaderBox *)s;
 	ptr->size += 1+1+8+2+2+2;
@@ -603,13 +508,13 @@
 
 
 /* OMADRMGroupID Box */
-GF_Box *grpi_New()
+GF_Box *grpi_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMGroupIDBox, GF_ISOM_BOX_TYPE_GRPI);
 	return (GF_Box *)tmp;
 }
 
-void grpi_del(GF_Box *s)
+void grpi_box_del(GF_Box *s)
 {
 	GF_OMADRMGroupIDBox *ptr = (GF_OMADRMGroupIDBox *)s;
 	if (ptr == NULL) return;
@@ -618,31 +523,32 @@
 	gf_free(ptr);
 }
 
-GF_Err grpi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err grpi_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u16 gid_len;
 	GF_OMADRMGroupIDBox *ptr = (GF_OMADRMGroupIDBox*)s;
 
+	ISOM_DECREASE_SIZE(ptr, (1+2+2) );
 	gid_len = gf_bs_read_u16(bs);
 	ptr->GKEncryptionMethod = gf_bs_read_u8(bs);
 	ptr->GKLength = gf_bs_read_u16(bs);
 
-	ISOM_DECREASE_SIZE(ptr, (1+2+2) );
-
 	if (ptr->size<gid_len+ptr->GKLength) return GF_ISOM_INVALID_FILE;
 
 	ptr->GroupID = gf_malloc(sizeof(char)*(gid_len+1));
+	if (!ptr->GroupID) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->GroupID, gid_len);
 	ptr->GroupID[gid_len]=0;
 
 	ptr->GroupKey = (char *)gf_malloc(sizeof(char)*ptr->GKLength);
+	if (!ptr->GroupKey) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->GroupKey, ptr->GKLength);
 	ISOM_DECREASE_SIZE(ptr, (gid_len+ptr->GKLength) );
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err grpi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err grpi_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u16 gid_len;
@@ -659,7 +565,7 @@
 	return GF_OK;
 }
 
-GF_Err grpi_Size(GF_Box *s)
+GF_Err grpi_box_size(GF_Box *s)
 {
 	GF_OMADRMGroupIDBox *ptr = (GF_OMADRMGroupIDBox *)s;
 	ptr->size += 2+2+1 + ptr->GKLength;
@@ -672,26 +578,26 @@
 
 
 /* OMADRMMutableInformation Box */
-GF_Box *mdri_New()
+GF_Box *mdri_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMMutableInformationBox, GF_ISOM_BOX_TYPE_MDRI);
 	return (GF_Box *)tmp;
 }
 
-void mdri_del(GF_Box *s)
+void mdri_box_del(GF_Box *s)
 {
 	GF_OMADRMMutableInformationBox*ptr = (GF_OMADRMMutableInformationBox*)s;
 	if (ptr == NULL) return;
 	gf_free(ptr);
 }
 
-GF_Err mdri_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mdri_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err mdri_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mdri_box_write(GF_Box *s, GF_BitStream *bs)
 {
 //	GF_OMADRMMutableInformationBox*ptr = (GF_OMADRMMutableInformationBox*)s;
 	GF_Err e = gf_isom_box_write_header(s, bs);
@@ -699,7 +605,7 @@
 	return GF_OK;
 }
 
-GF_Err mdri_Size(GF_Box *s)
+GF_Err mdri_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
@@ -707,19 +613,19 @@
 
 
 /* OMADRMTransactionTracking Box */
-GF_Box *odtt_New()
+GF_Box *odtt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMTransactionTrackingBox, GF_ISOM_BOX_TYPE_ODTT);
 	return (GF_Box *)tmp;
 }
 
-void odtt_del(GF_Box *s)
+void odtt_box_del(GF_Box *s)
 {
 	GF_OMADRMTransactionTrackingBox *ptr = (GF_OMADRMTransactionTrackingBox*)s;
 	gf_free(ptr);
 }
 
-GF_Err odtt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err odtt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_OMADRMTransactionTrackingBox *ptr = (GF_OMADRMTransactionTrackingBox *)s;
 
@@ -729,7 +635,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err odtt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err odtt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_OMADRMTransactionTrackingBox *ptr = (GF_OMADRMTransactionTrackingBox*)s;
@@ -740,7 +646,7 @@
 	return GF_OK;
 }
 
-GF_Err odtt_Size(GF_Box *s)
+GF_Err odtt_box_size(GF_Box *s)
 {
 	s->size += 16;
 	return GF_OK;
@@ -750,32 +656,33 @@
 
 
 /* OMADRMRightsObject Box */
-GF_Box *odrb_New()
+GF_Box *odrb_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMRightsObjectBox, GF_ISOM_BOX_TYPE_ODRB);
 	return (GF_Box *)tmp;
 }
 
-void odrb_del(GF_Box *s)
+void odrb_box_del(GF_Box *s)
 {
 	GF_OMADRMRightsObjectBox *ptr = (GF_OMADRMRightsObjectBox*)s;
 	if (ptr->oma_ro) gf_free(ptr->oma_ro);
 	gf_free(ptr);
 }
 
-GF_Err odrb_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err odrb_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_OMADRMRightsObjectBox *ptr = (GF_OMADRMRightsObjectBox *)s;
 
 	ptr->oma_ro_size = (u32) ptr->size;
 	ptr->oma_ro = (char*) gf_malloc(sizeof(char)*ptr->oma_ro_size);
+	if (!ptr->oma_ro) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->oma_ro, ptr->oma_ro_size);
 	ptr->size = 0;
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err odrb_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err odrb_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_OMADRMRightsObjectBox *ptr = (GF_OMADRMRightsObjectBox *)s;
@@ -786,7 +693,7 @@
 	return GF_OK;
 }
 
-GF_Err odrb_Size(GF_Box *s)
+GF_Err odrb_box_size(GF_Box *s)
 {
 	GF_OMADRMRightsObjectBox *ptr = (GF_OMADRMRightsObjectBox *)s;
 	s->size += ptr->oma_ro_size;
@@ -798,18 +705,15 @@
 
 
 /* OMADRMKMS Box */
-GF_Box *odkm_New()
+GF_Box *odkm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OMADRMKMSBox, GF_ISOM_BOX_TYPE_ODKM);
 	return (GF_Box *)tmp;
 }
 
-void odkm_del(GF_Box *s)
+void odkm_box_del(GF_Box *s)
 {
-	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox *)s;
-	if (ptr->hdr) gf_isom_box_del((GF_Box*)ptr->hdr);
-	if (ptr->fmt) gf_isom_box_del((GF_Box*)ptr->fmt);
-	gf_free(ptr);
+	gf_free(s);
 }
 
 GF_Err odkm_Add(GF_Box *s, GF_Box *a)
@@ -817,57 +721,34 @@
 	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_OHDR:
-		if (ptr->hdr) gf_isom_box_del((GF_Box*)ptr->hdr);
+		if (ptr->hdr) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->hdr = (GF_OMADRMCommonHeaderBox *)a;
 		return GF_OK;
 	case GF_ISOM_BOX_TYPE_ODAF:
-		if (ptr->fmt) gf_isom_box_del((GF_Box*)ptr->fmt);
+		if (ptr->fmt) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->fmt = (GF_OMADRMAUFormatBox*)a;
 		return GF_OK;
-	default:
-		gf_isom_box_del(a);
-		return GF_OK;
 	}
+	return GF_OK;
 }
 
-GF_Err odkm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err odkm_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return gf_isom_box_array_read(s, bs, odkm_Add);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err odkm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err odkm_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	if (ptr->hdr) {
-		e = gf_isom_box_write((GF_Box*)ptr->hdr, bs);
-		if (e) return e;
-	}
-	if (ptr->fmt) {
-		e = gf_isom_box_write((GF_Box*)ptr->fmt, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err odkm_Size(GF_Box *s)
+GF_Err odkm_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox *)s;
-	if (ptr->hdr) {
-		e = gf_isom_box_size((GF_Box*)ptr->hdr);
-		if (e) return e;
-		ptr->size += ptr->hdr->size;
-	}
-	if (ptr->fmt) {
-		e = gf_isom_box_size((GF_Box*)ptr->fmt);
-		if (e) return e;
-		ptr->size += ptr->fmt->size;
-	}
+	gf_isom_check_position(s, (GF_Box *)ptr->hdr, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->fmt, &pos);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
@@ -875,13 +756,13 @@
 
 
 
-GF_Box *pssh_New()
+GF_Box *pssh_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ProtectionSystemHeaderBox, GF_ISOM_BOX_TYPE_PSSH);
 	return (GF_Box *)tmp;
 }
 
-void pssh_del(GF_Box *s)
+void pssh_box_del(GF_Box *s)
 {
 	GF_ProtectionSystemHeaderBox *ptr = (GF_ProtectionSystemHeaderBox*)s;
 	if (ptr == NULL) return;
@@ -890,7 +771,7 @@
 	gf_free(ptr);
 }
 
-GF_Err pssh_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err pssh_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ProtectionSystemHeaderBox *ptr = (GF_ProtectionSystemHeaderBox *)s;
 
@@ -901,7 +782,11 @@
 		ISOM_DECREASE_SIZE(ptr, 4);
 		if (ptr->KID_count) {
 			u32 i;
+			if (ptr->size < ptr->KID_count * sizeof(bin128))
+				return GF_ISOM_INVALID_FILE;
 			ptr->KIDs = gf_malloc(ptr->KID_count*sizeof(bin128));
+			if (!ptr->KIDs)
+				return GF_OUT_OF_MEM;
 			for (i=0; i<ptr->KID_count; i++) {
 				gf_bs_read_data(bs, (char *) ptr->KIDs[i], 16);
 				ISOM_DECREASE_SIZE(ptr, 16);
@@ -911,7 +796,11 @@
 	ptr->private_data_size = gf_bs_read_u32(bs);
 	ISOM_DECREASE_SIZE(ptr, 4);
 	if (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)
+			return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 		ISOM_DECREASE_SIZE(ptr, ptr->private_data_size);
 	}
@@ -920,7 +809,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err pssh_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pssh_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ProtectionSystemHeaderBox *ptr = (GF_ProtectionSystemHeaderBox *) s;
@@ -943,7 +832,7 @@
 	return GF_OK;
 }
 
-GF_Err pssh_Size(GF_Box *s)
+GF_Err pssh_box_size(GF_Box *s)
 {
 	GF_ProtectionSystemHeaderBox *ptr = (GF_ProtectionSystemHeaderBox*)s;
 
@@ -959,21 +848,23 @@
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Box *tenc_New()
+GF_Box *tenc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TrackEncryptionBox, GF_ISOM_BOX_TYPE_TENC);
 	return (GF_Box *)tmp;
 }
 
-void tenc_del(GF_Box *s)
+void tenc_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err tenc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tenc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*)s;
 
+	ISOM_DECREASE_SIZE(ptr, 20);
+
 	gf_bs_read_u8(bs); //reserved
 	if (!ptr->version) {
 		gf_bs_read_u8(bs); //reserved
@@ -985,20 +876,21 @@
 	ptr->Per_Sample_IV_Size = gf_bs_read_u8(bs);
 	gf_bs_read_data(bs, (char *) ptr->KID, 16);
 
-	ISOM_DECREASE_SIZE(ptr, 20);
 
 	if ((ptr->isProtected == 1) && !ptr->Per_Sample_IV_Size) {
 		ptr->constant_IV_size = gf_bs_read_u8(bs);
-		gf_bs_read_data(bs, (char *) ptr->constant_IV, ptr->constant_IV_size);
-		ISOM_DECREASE_SIZE(ptr, (1 + ptr->constant_IV_size) );
+		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);
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err tenc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tenc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox *) s;
@@ -1023,7 +915,7 @@
 	return GF_OK;
 }
 
-GF_Err tenc_Size(GF_Box *s)
+GF_Err tenc_box_size(GF_Box *s)
 {
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*)s;
 	ptr->size += 20;
@@ -1034,37 +926,37 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *piff_tenc_New()
+GF_Box *piff_tenc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PIFFTrackEncryptionBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_TENC;
 	return (GF_Box *)tmp;
 }
 
-void piff_tenc_del(GF_Box *s)
+void piff_tenc_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err piff_tenc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_tenc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PIFFTrackEncryptionBox *ptr = (GF_PIFFTrackEncryptionBox*)s;
 
-	if (ptr->size<4) return GF_ISOM_INVALID_FILE;
+	ISOM_DECREASE_SIZE(ptr, 4);
+	//PIFF TENC extends UUID and fullbox
 	ptr->version = gf_bs_read_u8(bs);
 	ptr->flags = gf_bs_read_u24(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
+	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);
-	ISOM_DECREASE_SIZE(ptr, 20);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err piff_tenc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_tenc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_PIFFTrackEncryptionBox *ptr = (GF_PIFFTrackEncryptionBox *) s;
@@ -1081,7 +973,7 @@
 	return GF_OK;
 }
 
-GF_Err piff_tenc_Size(GF_Box *s)
+GF_Err piff_tenc_box_size(GF_Box *s)
 {
 	GF_PIFFTrackEncryptionBox *ptr = (GF_PIFFTrackEncryptionBox*)s;
 	ptr->size += 24;
@@ -1090,7 +982,7 @@
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Box *piff_psec_New()
+GF_Box *piff_psec_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleEncryptionBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_PSEC;
@@ -1098,7 +990,7 @@
 	return (GF_Box *)tmp;
 }
 
-void piff_psec_del(GF_Box *s)
+void piff_psec_box_del(GF_Box *s)
 {
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
 	while (gf_list_count(ptr->samp_aux_info)) {
@@ -1111,19 +1003,20 @@
 }
 
 
-GF_Err piff_psec_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_psec_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
-	if (ptr->size<4) return GF_ISOM_INVALID_FILE;
+
+	ISOM_DECREASE_SIZE(ptr, 4);
+	//PIFF PSEC extends UUID and fullbox
 	ptr->version = gf_bs_read_u8(bs);
 	ptr->flags = gf_bs_read_u24(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	if (ptr->flags & 1) {
+		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);
-		ISOM_DECREASE_SIZE(ptr, 20);
 	}
 	if (ptr->IV_size == 0)
 		ptr->IV_size = 8; //default to 8
@@ -1152,7 +1045,10 @@
 
 	pos = gf_bs_get_position(bs);
 	if (pos>0xFFFFFFFFULL) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] \"senc\" offset larger than 32-bits , \"saio\" box version must be 1 .\n"));
+		if (ptr->cenc_saio && !ptr->cenc_saio->version) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] saio offset larger than 32-bits but box version 0 enforced. Retry without \"saio32\" option\n"));
+			return GF_BAD_PARAM;
+		}
 	}
 	e = gf_bs_seek(bs, ptr->cenc_saio->offset_first_offset_field);
 	if (e) return e;
@@ -1166,27 +1062,40 @@
 		new_pos = pos;
 	}
 
-	if (ptr->cenc_saio->offsets_large) {
+	if (ptr->cenc_saio->offsets) {
 		u32 i;
-		u64 old_offset = ptr->cenc_saio->offsets_large[0];
+		u64 old_offset = ptr->cenc_saio->offsets[0];
 		for (i=0; i<ptr->cenc_saio->entry_count; i++) {
-			gf_bs_write_u64(bs, new_pos + ptr->cenc_saio->offsets_large[i] - old_offset);
-			ptr->cenc_saio->offsets_large[i] = new_pos + ptr->cenc_saio->offsets_large[i] - old_offset;
+			if (ptr->cenc_saio->version) {
+				gf_bs_write_u64(bs, new_pos + ptr->cenc_saio->offsets[i] - old_offset);
+			} else {
+				gf_bs_write_u32(bs, (u32) (new_pos + ptr->cenc_saio->offsets[i] - old_offset));
+			}
+			ptr->cenc_saio->offsets[i] = new_pos + ptr->cenc_saio->offsets[i] - old_offset;
 		}
 	} else {
-		gf_bs_write_u64(bs, new_pos);
+		if (ptr->cenc_saio->version) {
+			gf_bs_write_u64(bs, new_pos);
+		} else {
+			gf_bs_write_u32(bs, (u32) new_pos);
+		}
 	}
 
 	return gf_bs_seek(bs, pos);
 }
 
-GF_Err piff_psec_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_psec_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 sample_count;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	if (!sample_count) {
+		ptr->size = 0;
+		return GF_OK;
+	}
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	gf_bs_write_u8(bs, ptr->version);
@@ -1218,63 +1127,76 @@
 	return GF_OK;
 }
 
-GF_Err piff_psec_Size(GF_Box *s)
+GF_Err piff_psec_box_size(GF_Box *s)
 {
 	u32 i, sample_count;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox*)s;
 
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	if (!sample_count) {
+		ptr->size = 0;
+		return GF_OK;
+	}
+
 	ptr->size += 4;
 	if (ptr->flags & 1) {
 		ptr->size += 20;
 	}
 	ptr->size += 4;
-	sample_count = gf_list_count(ptr->samp_aux_info);
-	if (sample_count) {
-		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;
-		}
+
+	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;
 	}
 	return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Box *piff_pssh_New()
+GF_Box *piff_pssh_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PIFFProtectionSystemHeaderBox, GF_ISOM_BOX_TYPE_UUID);
 	tmp->internal_4cc = GF_ISOM_BOX_UUID_PSSH;
 	return (GF_Box *)tmp;
 }
 
-void piff_pssh_del(GF_Box *s)
+void piff_pssh_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err piff_pssh_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_pssh_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox*)s;
 
+	ISOM_DECREASE_SIZE(ptr, 24);
+	//PIFF PSSH extends UUID and fullbox
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->flags = gf_bs_read_u24(bs);
 	gf_bs_read_data(bs, (char *) ptr->SystemID, 16);
 	ptr->private_data_size = gf_bs_read_u32(bs);
 
-	ISOM_DECREASE_SIZE(ptr, 20);
-
+	if (ptr->size < sizeof(char)*ptr->private_data_size)
+	    return GF_ISOM_INVALID_FILE;
 	ptr->private_data = gf_malloc(sizeof(char)*ptr->private_data_size);
-	gf_bs_read_data(bs, (char *) ptr->private_data, ptr->private_data_size);
+	if (!ptr->private_data)
+	    return GF_OUT_OF_MEM;
+
 	ISOM_DECREASE_SIZE(ptr, ptr->private_data_size);
+	gf_bs_read_data(bs, (char *) ptr->private_data, ptr->private_data_size);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err piff_pssh_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err piff_pssh_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox *) s;
-	GF_Err e = gf_isom_full_box_write(s, bs);
+	GF_Err e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_u24(bs, ptr->flags);
 
 	gf_bs_write_data(bs, (char *) ptr->SystemID, 16);
 	gf_bs_write_u32(bs, ptr->private_data_size);
@@ -1282,7 +1204,7 @@
 	return GF_OK;
 }
 
-GF_Err piff_pssh_Size(GF_Box *s)
+GF_Err piff_pssh_box_size(GF_Box *s)
 {
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox*)s;
 
@@ -1291,13 +1213,13 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *senc_New()
+GF_Box *senc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleEncryptionBox, GF_ISOM_BOX_TYPE_SENC);
 	return (GF_Box *)tmp;
 }
 
-void senc_del(GF_Box *s)
+void senc_box_del(GF_Box *s)
 {
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
 	while (gf_list_count(ptr->samp_aux_info)) {
@@ -1316,8 +1238,12 @@
 #endif
 {
 	GF_Err e;
-	u32 i, j, count;
+	Bool parse_failed = GF_FALSE;
+	u32 i, j, 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;
 
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (!traf)
@@ -1326,139 +1252,211 @@
 
 	gf_bs_seek(bs, senc->bs_offset);
 
-	count = gf_bs_read_u32(bs);
-	if (!senc->samp_aux_info) senc->samp_aux_info = gf_list_new();
-	for (i=0; i<count; i++) {
-		u32 is_encrypted;
-		u32 samp_count;
-		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-		memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
+	//BOX + version/flags
+	if (senc_size<12) return GF_BAD_PARAM;
+	senc_size -= 12;
+
+	if (senc->is_piff) {
+		//UUID
+		if (senc_size<16) return GF_BAD_PARAM;
+		senc_size -= 16;
+	}
+	if (senc->flags & 2) subs_size = 8;
+
+	if (senc_size<4) return GF_BAD_PARAM;
 
-		samp_count = i+1;
+	sample_number = 1;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-		if (trak) samp_count += trak->sample_count_at_seg_start;
+	if (trak) sample_number += trak->sample_count_at_seg_start;
 #endif
 
+	count = gf_bs_read_u32(bs);
+	senc_size -= 4;
+
+	def_IV_size = 0;
+	//check the target size if we have one subsample
+	if (senc_size >= count * (16 + subs_size)) {
+		def_IV_size = 16;
+	}
+	else if (senc_size >= count * (8 + subs_size)) {
+		def_IV_size = 8;
+	}
+	else if (senc_size >= count * (subs_size)) {
+		def_IV_size = 0;
+	}
+
+	if (!senc->samp_aux_info) senc->samp_aux_info = gf_list_new();
+	for (i=0; i<count; i++) {
+		Bool is_encrypted;
+		GF_CENCSampleAuxInfo *sai;
+		GF_SAFEALLOC(sai, GF_CENCSampleAuxInfo);
+		if (!sai) return GF_OUT_OF_MEM;
+
 		if (trak) {
-			e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, samp_count, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
+			e = gf_isom_get_sample_cenc_info_ex(trak, traf, senc, sample_number, &is_encrypted, &sai->IV_size, NULL, NULL, NULL, NULL, NULL);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", samp_count, gf_error_to_string(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);
 				return e;
 			}
 		}
 		//no init movie setup (segment dump/inspaction, assume default encrypted and 16 bytes IV
 		else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] no moov found, cannot get cenc default info, assuming isEncrypted, IV size 16\n" ));
+			if (do_warn) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isobmf] no moov found, cannot get cenc default info, assuming isEncrypted, IV size %d (computed from senc size)\n", def_IV_size));
+				do_warn = GF_FALSE;
+			}
 			is_encrypted = GF_TRUE;
-			sai->IV_size = 16;
+			sai->IV_size = def_IV_size;
 		}
-		//while this would technically be correct, senc mandates that sample_count = all samples in traf/track
-		//regardless of their encryption state
-		//if (is_encrypted)
-		{
-			if (sai->IV_size)
+		if (senc_size < sai->IV_size) {
+			parse_failed = GF_TRUE;
+			gf_isom_cenc_samp_aux_info_del(sai);
+			break;
+		}
+
+		sample_number++;
+
+		//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;
+			}
+			if (sai->IV_size) {
 				gf_bs_read_data(bs, (char *)sai->IV, sai->IV_size);
+				senc_size -= sai->IV_size;
+			}
 
 			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;
+
+				if ((s32) senc_size < 2 + sai->subsample_count * 6) {
+					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;
 			}
+		} else {
+			i--;
 		}
 		gf_list_add(senc->samp_aux_info, sai);
 	}
 	gf_bs_seek(bs, pos);
+	if (parse_failed) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] cannot parse senc, missing IV/crypto state\n"));
+	}
 	return GF_OK;
 }
 
 
-GF_Err senc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err senc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
+	ISOM_DECREASE_SIZE(ptr, 4);
 	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
 	ptr->version = gf_bs_read_u8(bs);
 	ptr->flags = gf_bs_read_u24(bs);
-	ISOM_DECREASE_SIZE(ptr, 4);
 
 	ptr->bs_offset = gf_bs_get_position(bs);
 	gf_bs_skip_bytes(bs, ptr->size);
 	ptr->size = 0;
+	ptr->load_needed = GF_TRUE;
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
-GF_Err senc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err senc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i, j;
 	u32 sample_count;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) s;
+
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	if (!sample_count) {
+		ptr->size = 0;
+		return GF_OK;
+	}
+
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
 	gf_bs_write_u8(bs, ptr->version);
 	gf_bs_write_u24(bs, ptr->flags);
 
-	sample_count = gf_list_count(ptr->samp_aux_info);
 	gf_bs_write_u32(bs, sample_count);
-	if (sample_count) {
 
-		e = store_senc_info(ptr, bs);
-		if (e) return e;
+	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 (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);
+		//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 (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);
 			}
 		}
 	}
 	return GF_OK;
 }
 
-GF_Err senc_Size(GF_Box *s)
+GF_Err senc_box_size(GF_Box *s)
 {
 	u32 sample_count;
 	u32 i;
 	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox*)s;
+	sample_count = gf_list_count(ptr->samp_aux_info);
+
+	if (!sample_count) {
+		ptr->size = 0;
+		return GF_OK;
+	}
+
 	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
 	ptr->size += 4; //version and flags
 
 	ptr->size += 4; //sample count
-	sample_count = gf_list_count(ptr->samp_aux_info);
-	if (sample_count) {
-		for (i = 0; i < sample_count; i++) {
-			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+	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;
+		ptr->size += sai->IV_size;
 
-			if (ptr->flags & 0x00000002)
-				ptr->size += 2 + 6*sai->subsample_count;
-		}
+		if (ptr->flags & 0x00000002)
+			ptr->size += 2 + 6*sai->subsample_count;
 	}
 	return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *adkm_New()
+GF_Box *adkm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMKeyManagementSystemBox, GF_ISOM_BOX_TYPE_ADKM);
 	tmp->version = 1;
@@ -1466,73 +1464,51 @@
 	return (GF_Box *)tmp;
 }
 
-void adkm_del(GF_Box *s)
+void adkm_box_del(GF_Box *s)
 {
 	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
 	if (!ptr) return;
-	if (ptr->header) gf_isom_box_del((GF_Box *)ptr->header);
-	if (ptr->au_format) gf_isom_box_del((GF_Box *)ptr->au_format);
 	gf_free(s);
 }
 
-GF_Err adkm_AddBox(GF_Box *s, GF_Box *a)
+GF_Err adkm_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_AHDR:
-		if (ptr->header) return GF_ISOM_INVALID_FILE;
+		if (ptr->header) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->header = (GF_AdobeDRMHeaderBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_ADAF:
-		if (ptr->au_format) return GF_ISOM_INVALID_FILE;
+		if (ptr->au_format) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->au_format = (GF_AdobeDRMAUFormatBox *)a;
 		break;
-
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err adkm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err adkm_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, adkm_AddBox);
+	return gf_isom_box_array_read(s, bs, adkm_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err adkm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err adkm_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	//ahdr
-	e = gf_isom_box_write((GF_Box *) ptr->header, bs);
-	if (e) return e;
-	//adaf
-	e = gf_isom_box_write((GF_Box *) ptr->au_format, bs);
-	if (e) return e;
-
-	return GF_OK;
+	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err adkm_Size(GF_Box *s)
+GF_Err adkm_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_size((GF_Box *) ptr->header);
-	if (e) return e;
-	ptr->size += ptr->header->size;
-	e = gf_isom_box_size((GF_Box *) ptr->au_format);
-	if (e) return e;
-	ptr->size += ptr->au_format->size;
-	return GF_OK;
+	gf_isom_check_position(s, (GF_Box *)ptr->header, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->au_format, &pos);
+    return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *ahdr_New()
+GF_Box *ahdr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMHeaderBox, GF_ISOM_BOX_TYPE_AHDR);
 	tmp->version = 2;
@@ -1540,62 +1516,45 @@
 	return (GF_Box *)tmp;
 }
 
-void ahdr_del(GF_Box *s)
+void ahdr_box_del(GF_Box *s)
 {
-	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
-	if (!ptr) return;
-	if (ptr->std_enc_params) gf_isom_box_del((GF_Box *)ptr->std_enc_params);
 	gf_free(s);
 }
 
 
-GF_Err ahdr_AddBox(GF_Box *s, GF_Box *a)
+GF_Err ahdr_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_APRM:
-		if (ptr->std_enc_params) return GF_ISOM_INVALID_FILE;
+		if (ptr->std_enc_params) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)a;
 		break;
-
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err ahdr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ahdr_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, ahdr_AddBox);
+	return gf_isom_box_array_read(s, bs, ahdr_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err ahdr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ahdr_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	e = gf_isom_box_write((GF_Box *) ptr->std_enc_params, bs);
-	if (e) return e;
-
-	return GF_OK;
+	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err ahdr_Size(GF_Box *s)
+GF_Err ahdr_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_size((GF_Box *) ptr->std_enc_params);
-	if (e) return e;
-	ptr->size += ptr->std_enc_params->size;
-	return GF_OK;
+	gf_isom_check_position(s, (GF_Box *)ptr->std_enc_params, &pos);
+    return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *aprm_New()
+GF_Box *aprm_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeStdEncryptionParamsBox, GF_ISOM_BOX_TYPE_APRM);
 	tmp->version = 1;
@@ -1603,73 +1562,49 @@
 	return (GF_Box *)tmp;
 }
 
-void aprm_del(GF_Box *s)
+void aprm_box_del(GF_Box *s)
 {
-	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
-	if (!ptr) return;
-	if (ptr->enc_info) gf_isom_box_del((GF_Box *)ptr->enc_info);
-	if (ptr->key_info) gf_isom_box_del((GF_Box *)ptr->key_info);
 	gf_free(s);
 }
 
-GF_Err aprm_AddBox(GF_Box *s, GF_Box *a)
+GF_Err aprm_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_AEIB:
-		if (ptr->enc_info) return GF_ISOM_INVALID_FILE;
+		if (ptr->enc_info) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->enc_info = (GF_AdobeEncryptionInfoBox *)a;
 		break;
 	case GF_ISOM_BOX_TYPE_AKEY:
-		if (ptr->key_info) return GF_ISOM_INVALID_FILE;
+		if (ptr->key_info) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->key_info = (GF_AdobeKeyInfoBox *)a;
 		break;
-
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err aprm_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err aprm_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, aprm_AddBox);
+	return gf_isom_box_array_read(s, bs, aprm_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err aprm_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err aprm_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	//aeib
-	e = gf_isom_box_write((GF_Box *) ptr->enc_info, bs);
-	if (e) return e;
-	//akey
-	e = gf_isom_box_write((GF_Box *) ptr->key_info, bs);
-	if (e) return e;
-
-	return GF_OK;
+	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err aprm_Size(GF_Box *s)
+GF_Err aprm_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_size((GF_Box *) ptr->enc_info);
-	if (e) return e;
-	ptr->size += ptr->enc_info->size;
-	e = gf_isom_box_size((GF_Box *) ptr->key_info);
-	if (e) return e;
-	ptr->size += ptr->key_info->size;
-	return GF_OK;
+	gf_isom_check_position(s, (GF_Box *)ptr->enc_info, &pos);
+	gf_isom_check_position(s, (GF_Box *)ptr->key_info, &pos);
+    return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *aeib_New()
+GF_Box *aeib_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeEncryptionInfoBox, GF_ISOM_BOX_TYPE_AEIB);
 	tmp->version = 1;
@@ -1677,7 +1612,7 @@
 	return (GF_Box *)tmp;
 }
 
-void aeib_del(GF_Box *s)
+void aeib_box_del(GF_Box *s)
 {
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
 	if (!ptr) return;
@@ -1685,15 +1620,15 @@
 	gf_free(ptr);
 }
 
-GF_Err aeib_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err aeib_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
 	u32 len;
 
 	len = (u32) ptr->size - 1;
 	if (len) {
-		if (ptr->enc_algo) return GF_ISOM_INVALID_FILE;
 		ptr->enc_algo = (char *)gf_malloc(len*sizeof(char));
+		if (!ptr->enc_algo) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->enc_algo, len);
 	}
 	ptr->key_length = gf_bs_read_u8(bs);
@@ -1703,7 +1638,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err aeib_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err aeib_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox *) s;
@@ -1718,7 +1653,7 @@
 	return GF_OK;
 }
 
-GF_Err aeib_Size(GF_Box *s)
+GF_Err aeib_box_size(GF_Box *s)
 {
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
 	if (ptr->enc_algo)
@@ -1728,7 +1663,7 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *akey_New()
+GF_Box *akey_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeKeyInfoBox, GF_ISOM_BOX_TYPE_AKEY);
 	tmp->version = 1;
@@ -1736,67 +1671,50 @@
 	return (GF_Box *)tmp;
 }
 
-void akey_del(GF_Box *s)
+void akey_box_del(GF_Box *s)
 {
-	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
-	if (!ptr) return;
-	if (ptr->params) gf_isom_box_del((GF_Box *)ptr->params);
 	gf_free(s);
 }
 
-GF_Err akey_AddBox(GF_Box *s, GF_Box *a)
+GF_Err akey_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_FLXS:
-		if (ptr->params) return GF_ISOM_INVALID_FILE;
+		if (ptr->params) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->params = (GF_AdobeFlashAccessParamsBox *)a;
 		break;
-	default:
-		return gf_isom_box_add_default(s, a);
 	}
 	return GF_OK;
 }
 
-GF_Err akey_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err akey_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, akey_AddBox);
+	return gf_isom_box_array_read(s, bs, akey_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err akey_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err akey_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-	e = gf_isom_box_write((GF_Box *) ptr->params, bs);
-	if (e) return e;
-
-	return GF_OK;
+	return gf_isom_full_box_write(s, bs);
 }
 
-GF_Err akey_Size(GF_Box *s)
+GF_Err akey_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_size((GF_Box *) ptr->params);
-	if (e) return e;
-	ptr->size += ptr->params->size;
-	e = gf_isom_box_size((GF_Box *) ptr->params);
-	return e;
+	gf_isom_check_position(s, (GF_Box *)ptr->params, &pos);
+    return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *flxs_New()
+GF_Box *flxs_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeFlashAccessParamsBox, GF_ISOM_BOX_TYPE_FLXS);
 	return (GF_Box *)tmp;
 }
 
-void flxs_del(GF_Box *s)
+void flxs_box_del(GF_Box *s)
 {
 	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
 	if (!ptr) return;
@@ -1805,15 +1723,15 @@
 	gf_free(ptr);
 }
 
-GF_Err flxs_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err flxs_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
 	u32 len;
 
 	len = (u32) ptr->size;
 	if (len) {
-		if (ptr->metadata) return GF_ISOM_INVALID_FILE;
 		ptr->metadata = (char *)gf_malloc(len*sizeof(char));
+		if (!ptr->metadata) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->metadata, len);
 	}
 	return GF_OK;
@@ -1821,7 +1739,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err flxs_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err flxs_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox *) s;
@@ -1835,7 +1753,7 @@
 	return GF_OK;
 }
 
-GF_Err flxs_Size(GF_Box *s)
+GF_Err flxs_box_size(GF_Box *s)
 {
 	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
 	if (ptr->metadata)
@@ -1844,31 +1762,31 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
-GF_Box *adaf_New()
+GF_Box *adaf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMAUFormatBox, GF_ISOM_BOX_TYPE_ADAF);
 	return (GF_Box *)tmp;
 }
 
-void adaf_del(GF_Box *s)
+void adaf_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-GF_Err adaf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err adaf_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox*)s;
 
+	ISOM_DECREASE_SIZE(ptr, 3);
 	ptr->selective_enc = gf_bs_read_u8(bs);
 	gf_bs_read_u8(bs);//resersed
 	ptr->IV_length = gf_bs_read_u8(bs);
-	ISOM_DECREASE_SIZE(ptr, 3);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err adaf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err adaf_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox *) s;
@@ -1882,7 +1800,7 @@
 	return GF_OK;
 }
 
-GF_Err adaf_Size(GF_Box *s)
+GF_Err adaf_box_size(GF_Box *s)
 {
 	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox*)s;
 	ptr->size += 3;

gpac-0.8.0.tar.gz/src/isomedia/box_code_meta.c -> gpac-1.0.0.tar.gz/src/isomedia/box_code_meta.c Changed

gpac-0.8.0.tar.gz/src/isomedia/box_dump.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,7 +29,6 @@
 #include <gpac/color.h>
 #include <gpac/avparse.h>
 #include <gpac/base_coding.h>
-#include <time.h>
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
@@ -37,31 +36,31 @@
 static void dump_data(FILE *trace, char *data, u32 dataLength)
 {
 	u32 i;
-	fprintf(trace, "data:application/octet-string,");
+	gf_fprintf(trace, "data:application/octet-string,");
 	for (i=0; i<dataLength; i++) {
-		fprintf(trace, "%02X", (unsigned char) data[i]);
+		gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 }
 
 static void dump_data_hex(FILE *trace, char *data, u32 dataLength)
 {
 	u32 i;
-	fprintf(trace, "0x");
+	gf_fprintf(trace, "0x");
 	for (i=0; i<dataLength; i++) {
-		fprintf(trace, "%02X", (unsigned char) data[i]);
+		gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 }
 
-static void dump_data_attribute(FILE *trace, char *name, char *data, u32 data_size)
+static void dump_data_attribute(FILE *trace, char *name, u8 *data, u32 data_size)
 {
 	u32 i;
 	if (!data || !data_size) {
-		fprintf(trace, "%s=\"\"", name);
+		gf_fprintf(trace, "%s=\"\"", name);
 		return;
 	}
-	fprintf(trace, "%s=\"0x", name);
-	for (i=0; i<data_size; i++) fprintf(trace, "%02X", (unsigned char) data[i]);
-	fprintf(trace, "\" ");
+	gf_fprintf(trace, "%s=\"0x", name);
+	for (i=0; i<data_size; i++) gf_fprintf(trace, "%02X", (unsigned char) data[i]);
+	gf_fprintf(trace, "\" ");
 }
 
 static void dump_data_string(FILE *trace, char *data, u32 dataLength)
@@ -70,33 +69,28 @@
 	for (i=0; i<dataLength; i++) {
 		switch ((unsigned char) data[i]) {
 		case '\'':
-			fprintf(trace, "&apos;");
+			gf_fprintf(trace, "&apos;");
 			break;
 		case '\"':
-			fprintf(trace, "&quot;");
+			gf_fprintf(trace, "&quot;");
 			break;
 		case '&':
-			fprintf(trace, "&amp;");
+			gf_fprintf(trace, "&amp;");
 			break;
 		case '>':
-			fprintf(trace, "&gt;");
+			gf_fprintf(trace, "&gt;");
 			break;
 		case '<':
-			fprintf(trace, "&lt;");
+			gf_fprintf(trace, "&lt;");
 			break;
 		default:
-			fprintf(trace, "%c", (u8) data[i]);
+			gf_fprintf(trace, "%c", (u8) data[i]);
 			break;
 		}
 	}
 }
 
 
-GF_Err gf_isom_box_dump(void *ptr, FILE * trace)
-{
-	return gf_isom_box_dump_ex(ptr, trace, 0);
-}
-
 GF_Err gf_isom_box_array_dump(GF_List *list, FILE * trace)
 {
 	u32 i;
@@ -109,40 +103,42 @@
 	return GF_OK;
 }
 
-extern Bool use_dump_mode;
-
+static Bool dump_skip_samples = GF_FALSE;
 GF_EXPORT
-GF_Err gf_isom_dump(GF_ISOFile *mov, FILE * trace)
+GF_Err gf_isom_dump(GF_ISOFile *mov, FILE * trace, Bool skip_init, Bool skip_samples)
 {
 	u32 i;
 	const char *fname;
 	GF_Box *box;
 	if (!mov || !trace) return GF_BAD_PARAM;
 
-	use_dump_mode = mov->dump_mode_alloc;
-	fprintf(trace, "\n");
+	gf_fprintf(trace, "\n");
 
 	fname = strrchr(mov->fileName, '/');
 	if (!fname) fname = strrchr(mov->fileName, '\\');
 	if (!fname) fname = mov->fileName;
 	else fname+=1;
-	fprintf(trace, "<IsoMediaFile xmlns=\"urn:mpeg:isobmff:schema:file:2016\" Name=\"%s\">\n", fname);
+	gf_fprintf(trace, "<IsoMediaFile xmlns=\"urn:mpeg:isobmff:schema:file:2016\" Name=\"%s\">\n", fname);
 
+	dump_skip_samples = skip_samples;
 	i=0;
+	if (skip_init)
+		i = mov->nb_box_init_seg;
+
 	while ((box = (GF_Box *)gf_list_enum(mov->TopBoxes, &i))) {
 		if (box->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
-			fprintf(trace, "\n");
+			gf_fprintf(trace, "\n");
 		} else if (box->type==GF_ISOM_BOX_TYPE_UUID) {
 		} else if (!gf_isom_box_is_file_level(box)) {
-			fprintf(trace, "\n", gf_4cc_to_str(box->type));
+			gf_fprintf(trace, "\n", gf_4cc_to_str(box->type));
 		}
 		gf_isom_box_dump(box, trace);
 	}
-	fprintf(trace, "</IsoMediaFile>\n");
+	gf_fprintf(trace, "</IsoMediaFile>\n");
 	return GF_OK;
 }
 
-GF_Err reftype_dump(GF_Box *a, FILE * trace)
+GF_Err reftype_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TrackReferenceTypeBox *p = (GF_TrackReferenceTypeBox *)a;
@@ -150,19 +146,19 @@
 	p->type = p->reference_type;
 
 	gf_isom_box_dump_start(a, "TrackReferenceTypeBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<p->trackIDCount; i++) {
-		fprintf(trace, "<TrackReferenceEntry TrackID=\"%d\"/>\n", p->trackIDs[i]);
+		gf_fprintf(trace, "<TrackReferenceEntry TrackID=\"%d\"/>\n", p->trackIDs[i]);
 	}
 	if (!p->size)
-		fprintf(trace, "<TrackReferenceEntry TrackID=\"\"/>\n");
+		gf_fprintf(trace, "<TrackReferenceEntry TrackID=\"\"/>\n");
 
 	gf_isom_box_dump_done("TrackReferenceTypeBox", a, trace);
 	p->type = GF_ISOM_BOX_TYPE_REFT;
 	return GF_OK;
 }
 
-GF_Err ireftype_dump(GF_Box *a, FILE * trace)
+GF_Err ireftype_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_ItemReferenceTypeBox *p = (GF_ItemReferenceTypeBox *)a;
@@ -170,12 +166,12 @@
 
 	p->type = p->reference_type;
 	gf_isom_box_dump_start(a, "ItemReferenceBox", trace);
-	fprintf(trace, "from_item_id=\"%d\">\n", p->from_item_id);
+	gf_fprintf(trace, "from_item_id=\"%d\">\n", p->from_item_id);
 	for (i = 0; i < p->reference_count; i++) {
-		fprintf(trace, "<ItemReferenceBoxEntry ItemID=\"%d\"/>\n", p->to_item_IDs[i]);
+		gf_fprintf(trace, "<ItemReferenceBoxEntry ItemID=\"%d\"/>\n", p->to_item_IDs[i]);
 	}
 	if (!p->size)
-		fprintf(trace, "<ItemReferenceBoxEntry ItemID=\"\"/>\n");
+		gf_fprintf(trace, "<ItemReferenceBoxEntry ItemID=\"\"/>\n");
 
 	gf_isom_box_dump_done("ItemReferenceBox", a, trace);
 
@@ -183,108 +179,98 @@
 	return GF_OK;
 }
 
-GF_Err free_dump(GF_Box *a, FILE * trace)
+GF_Err free_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_FreeSpaceBox *p = (GF_FreeSpaceBox *)a;
 	gf_isom_box_dump_start(a, (a->type==GF_ISOM_BOX_TYPE_FREE) ? "FreeSpaceBox" : "SkipBox", trace);
-	fprintf(trace, "dataSize=\"%d\">\n", p->dataSize);
+	gf_fprintf(trace, "dataSize=\"%d\">\n", p->dataSize);
 	gf_isom_box_dump_done( (a->type==GF_ISOM_BOX_TYPE_FREE) ? "FreeSpaceBox" : "SkipBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err wide_dump(GF_Box *a, FILE * trace)
+GF_Err wide_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "WideBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("WideBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mdat_dump(GF_Box *a, FILE * trace)
+GF_Err mdat_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MediaDataBox *p;
 	const char *name = (a->type==GF_ISOM_BOX_TYPE_IDAT ? "ItemDataBox" : "MediaDataBox");
 	p = (GF_MediaDataBox *)a;
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, "dataSize=\""LLD"\">\n", LLD_CAST p->dataSize);
+	gf_fprintf(trace, "dataSize=\""LLD"\">\n", p->dataSize);
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err moov_dump(GF_Box *a, FILE * trace)
+GF_Err moov_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MovieBox *p;
-	p = (GF_MovieBox *)a;
+	GF_MovieBox *p = (GF_MovieBox *) a;
 	gf_isom_box_dump_start(a, "MovieBox", trace);
-	fprintf(trace, ">\n");
-	if (p->iods) gf_isom_box_dump(p->iods, trace);
-	if (p->meta) gf_isom_box_dump(p->meta, trace);
-	//dump only if size
-	if (p->size)
-		gf_isom_box_dump_ex(p->mvhd, trace,GF_ISOM_BOX_TYPE_MVHD);
-
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (p->mvex) gf_isom_box_dump(p->mvex, trace);
-#endif
-
-	gf_isom_box_array_dump(p->trackList, trace);
-	if (p->udta) gf_isom_box_dump(p->udta, trace);
+	if (p->compressed_diff)
+		gf_fprintf(trace, "compressedSize=\""LLU"\"", p->size - p->compressed_diff);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mvhd_dump(GF_Box *a, FILE * trace)
+GF_Err mvhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieHeaderBox *p;
 
 	p = (GF_MovieHeaderBox *) a;
 
 	gf_isom_box_dump_start(a, "MovieHeaderBox", trace);
-	fprintf(trace, "CreationTime=\""LLD"\" ", LLD_CAST p->creationTime);
-	fprintf(trace, "ModificationTime=\""LLD"\" ", LLD_CAST p->modificationTime);
-	fprintf(trace, "TimeScale=\"%d\" ", p->timeScale);
-	fprintf(trace, "Duration=\""LLD"\" ", LLD_CAST p->duration);
-	fprintf(trace, "NextTrackID=\"%d\">\n", p->nextTrackID);
+	gf_fprintf(trace, "CreationTime=\""LLD"\" ", p->creationTime);
+	gf_fprintf(trace, "ModificationTime=\""LLD"\" ", p->modificationTime);
+	gf_fprintf(trace, "TimeScale=\"%d\" ", p->timeScale);
+	gf_fprintf(trace, "Duration=\""LLD"\" ", p->duration);
+	gf_fprintf(trace, "NextTrackID=\"%d\">\n", p->nextTrackID);
 
 	gf_isom_box_dump_done("MovieHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mdhd_dump(GF_Box *a, FILE * trace)
+GF_Err mdhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MediaHeaderBox *p;
 
 	p = (GF_MediaHeaderBox *)a;
 	gf_isom_box_dump_start(a, "MediaHeaderBox", trace);
-	fprintf(trace, "CreationTime=\""LLD"\" ", LLD_CAST p->creationTime);
-	fprintf(trace, "ModificationTime=\""LLD"\" ", LLD_CAST p->modificationTime);
-	fprintf(trace, "TimeScale=\"%d\" ", p->timeScale);
-	fprintf(trace, "Duration=\""LLD"\" ", LLD_CAST p->duration);
-	fprintf(trace, "LanguageCode=\"%c%c%c\">\n", p->packedLanguage[0], p->packedLanguage[1], p->packedLanguage[2]);
+	gf_fprintf(trace, "CreationTime=\""LLD"\" ", p->creationTime);
+	gf_fprintf(trace, "ModificationTime=\""LLD"\" ", p->modificationTime);
+	gf_fprintf(trace, "TimeScale=\"%d\" ", p->timeScale);
+	gf_fprintf(trace, "Duration=\""LLD"\" ", p->duration);
+	gf_fprintf(trace, "LanguageCode=\"%c%c%c\">\n", p->packedLanguage[0], p->packedLanguage[1], p->packedLanguage[2]);
 	gf_isom_box_dump_done("MediaHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err vmhd_dump(GF_Box *a, FILE * trace)
+GF_Err vmhd_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "VideoMediaHeaderBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("VideoMediaHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err gmin_dump(GF_Box *a, FILE * trace)
+GF_Err gmin_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericMediaHeaderInfoBox *p = (GF_GenericMediaHeaderInfoBox *)a;
 	gf_isom_box_dump_start(a, "GenericMediaHeaderInformationBox", trace);
-	fprintf(trace, " graphicsMode=\"%d\" opcolorRed=\"%d\" opcolorGreen=\"%d\" opcolorBlue=\"%d\" balance=\"%d\">\n",
+	gf_fprintf(trace, " graphicsMode=\"%d\" opcolorRed=\"%d\" opcolorGreen=\"%d\" opcolorBlue=\"%d\" balance=\"%d\">\n",
 		p->graphics_mode, p->op_color_red, p->op_color_green, p->op_color_blue, p->balance);
 	gf_isom_box_dump_done("GenericMediaHeaderInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err clef_dump(GF_Box *a, FILE * trace)
+GF_Err clef_box_dump(GF_Box *a, FILE * trace)
 {
+	Float w, h;
 	const char *name = "TrackCleanApertureDimensionsBox";
 	GF_ApertureBox *p = (GF_ApertureBox *)a;
 	if (p->type==GF_QT_BOX_TYPE_PROF)
@@ -293,121 +279,82 @@
 		name = "TrackEncodedPixelsDimensionsBox";
 
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, " width=\"%d.%d\" height=\"%d.%d\">\n", (p->width>>16), p->width&0xFFFF, p->height>>16, p->height&0xFFFF);
+	w = (Float) (p->width&0xFFFF);
+	w /= 0xFFFF;
+	w += (p->width>>16);
+
+	h = (Float) (p->height&0xFFFF);
+	h /= 0xFFFF;
+	h += (p->height>>16);
+
+	gf_fprintf(trace, " width=\"%g\" height=\"%g\">\n", w, h);
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err smhd_dump(GF_Box *a, FILE * trace)
+GF_Err smhd_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "SoundMediaHeaderBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SoundMediaHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err hmhd_dump(GF_Box *a, FILE * trace)
+GF_Err hmhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_HintMediaHeaderBox *p;
 
 	p = (GF_HintMediaHeaderBox *)a;
 
 	gf_isom_box_dump_start(a, "HintMediaHeaderBox", trace);
-	fprintf(trace, "MaximumPDUSize=\"%d\" ", p->maxPDUSize);
-	fprintf(trace, "AveragePDUSize=\"%d\" ", p->avgPDUSize);
-	fprintf(trace, "MaxBitRate=\"%d\" ", p->maxBitrate);
-	fprintf(trace, "AverageBitRate=\"%d\">\n", p->avgBitrate);
+	gf_fprintf(trace, "MaximumPDUSize=\"%d\" ", p->maxPDUSize);
+	gf_fprintf(trace, "AveragePDUSize=\"%d\" ", p->avgPDUSize);
+	gf_fprintf(trace, "MaxBitRate=\"%d\" ", p->maxBitrate);
+	gf_fprintf(trace, "AverageBitRate=\"%d\">\n", p->avgBitrate);
 
 	gf_isom_box_dump_done("HintMediaHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err nmhd_dump(GF_Box *a, FILE * trace)
+GF_Err nmhd_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "MPEGMediaHeaderBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MPEGMediaHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stbl_dump(GF_Box *a, FILE * trace)
+GF_Err stbl_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_SampleTableBox *p;
-	p = (GF_SampleTableBox *)a;
 	gf_isom_box_dump_start(a, "SampleTableBox", trace);
-	fprintf(trace, ">\n");
-
-	if (p->size)
-		gf_isom_box_dump_ex(p->SampleDescription, trace, GF_ISOM_BOX_TYPE_STSD);
-	if (p->size)
-		gf_isom_box_dump_ex(p->TimeToSample, trace, GF_ISOM_BOX_TYPE_STTS);
-
-	if (p->CompositionOffset) gf_isom_box_dump(p->CompositionOffset, trace);
-	if (p->CompositionToDecode) gf_isom_box_dump(p->CompositionToDecode, trace);
-	if (p->SyncSample) gf_isom_box_dump(p->SyncSample, trace);
-	if (p->ShadowSync) gf_isom_box_dump(p->ShadowSync, trace);
-
-	if (p->size)
-		gf_isom_box_dump_ex(p->SampleToChunk, trace, GF_ISOM_BOX_TYPE_STSC);
-	if (p->size)
-		gf_isom_box_dump_ex(p->SampleSize, trace, GF_ISOM_BOX_TYPE_STSZ);
-	if (p->size)
-		gf_isom_box_dump_ex(p->ChunkOffset, trace, GF_ISOM_BOX_TYPE_STCO);
-
-	if (p->DegradationPriority) gf_isom_box_dump(p->DegradationPriority, trace);
-	if (p->SampleDep) gf_isom_box_dump(p->SampleDep, trace);
-	if (p->PaddingBits) gf_isom_box_dump(p->PaddingBits, trace);
-	if (p->sub_samples) gf_isom_box_array_dump(p->sub_samples, trace);
-	if (p->sampleGroupsDescription) gf_isom_box_array_dump(p->sampleGroupsDescription, trace);
-	if (p->sampleGroups) gf_isom_box_array_dump(p->sampleGroups, trace);
-	if (p->sai_sizes) {
-		u32 i;
-		for (i = 0; i < gf_list_count(p->sai_sizes); i++) {
-			GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(p->sai_sizes, i);
-			gf_isom_box_dump(saiz, trace);
-		}
-	}
-
-	if (p->sai_offsets) {
-		u32 i;
-		for (i = 0; i < gf_list_count(p->sai_offsets); i++) {
-			GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(p->sai_offsets, i);
-			gf_isom_box_dump(saio, trace);
-		}
-	}
-
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SampleTableBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dinf_dump(GF_Box *a, FILE * trace)
+GF_Err dinf_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_DataInformationBox *p;
-	p = (GF_DataInformationBox *)a;
 	gf_isom_box_dump_start(a, "DataInformationBox", trace);
-	fprintf(trace, ">\n");
-	if (p->size)
-		gf_isom_box_dump_ex(p->dref, trace, GF_ISOM_BOX_TYPE_DREF);
-
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("DataInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err url_dump(GF_Box *a, FILE * trace)
+GF_Err url_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DataEntryURLBox *p;
 
 	p = (GF_DataEntryURLBox *)a;
 	gf_isom_box_dump_start(a, "URLDataEntryBox", trace);
 	if (p->location) {
-		fprintf(trace, " URL=\"%s\">\n", p->location);
+		gf_fprintf(trace, " URL=\"%s\">\n", p->location);
 	} else {
-		fprintf(trace, ">\n");
+		gf_fprintf(trace, ">\n");
 		if (p->size) {
 			if (! (p->flags & 1) ) {
-				fprintf(trace, "\n");
+				gf_fprintf(trace, "\n");
 			} else {
-				fprintf(trace, "\n");
+				gf_fprintf(trace, "\n");
 			}
 		}
 	}
@@ -415,48 +362,48 @@
 	return GF_OK;
 }
 
-GF_Err urn_dump(GF_Box *a, FILE * trace)
+GF_Err urn_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DataEntryURNBox *p;
 
 	p = (GF_DataEntryURNBox *)a;
 	gf_isom_box_dump_start(a, "URNDataEntryBox", trace);
-	if (p->nameURN) fprintf(trace, " URN=\"%s\"", p->nameURN);
-	if (p->location) fprintf(trace, " URL=\"%s\"", p->location);
-	fprintf(trace, ">\n");
+	if (p->nameURN) gf_fprintf(trace, " URN=\"%s\"", p->nameURN);
+	if (p->location) gf_fprintf(trace, " URL=\"%s\"", p->location);
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done("URNDataEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err alis_dump(GF_Box *a, FILE * trace)
+GF_Err alis_box_dump(GF_Box *a, FILE * trace)
 {
 //	GF_DataEntryAliasBox *p = (GF_DataEntryAliasBox *)a;
 	gf_isom_box_dump_start(a, "AliasDataEntryBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done("AliasDataEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err cprt_dump(GF_Box *a, FILE * trace)
+GF_Err cprt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_CopyrightBox *p;
 
 	p = (GF_CopyrightBox *)a;
 	gf_isom_box_dump_start(a, "CopyrightBox", trace);
-	fprintf(trace, "LanguageCode=\"%s\" CopyrightNotice=\"%s\">\n", p->packedLanguageCode, p->notice);
+	gf_fprintf(trace, "LanguageCode=\"%s\" CopyrightNotice=\"%s\">\n", p->packedLanguageCode, p->notice);
 	gf_isom_box_dump_done("CopyrightBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err kind_dump(GF_Box *a, FILE * trace)
+GF_Err kind_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_KindBox *p;
 
 	p = (GF_KindBox *)a;
 	gf_isom_box_dump_start(a, "KindBox", trace);
-	fprintf(trace, "schemeURI=\"%s\" value=\"%s\">\n", p->schemeURI, (p->value ? p->value : ""));
+	gf_fprintf(trace, "schemeURI=\"%s\" value=\"%s\">\n", p->schemeURI, (p->value ? p->value : ""));
 	gf_isom_box_dump_done("KindBox", a, trace);
 	return GF_OK;
 }
@@ -465,6 +412,7 @@
 static char *format_duration(u64 dur, u32 timescale, char *szDur)
 {
 	u32 h, m, s, ms;
+	if (!timescale) return NULL;
 	dur = (u32) (( ((Double) (s64) dur)/timescale)*1000);
 	h = (u32) (dur / 3600000);
 	dur -= h*3600000;
@@ -479,137 +427,129 @@
 
 static void dump_escape_string(FILE * trace, char *name)
 {
-	u32 i, len = (u32) strlen(name);
+	u32 i, len = name ? (u32) strlen(name) : 0;
 	for (i=0; i<len; i++) {
-		if (name[i]=='"') fprintf(trace, "&quot;");
-		else fputc(name[i], trace);
+		if (name[i]=='"') gf_fprintf(trace, "&quot;");
+		else gf_fputc(name[i], trace);
 	}
 }
 
-GF_Err chpl_dump(GF_Box *a, FILE * trace)
+GF_Err chpl_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, count;
-	char szDur[20];
 	GF_ChapterListBox *p = (GF_ChapterListBox *)a;
 	gf_isom_box_dump_start(a, "ChapterListBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (p->size) {
 		count = gf_list_count(p->list);
 		for (i=0; i<count; i++) {
+			char szDur[20];
 			GF_ChapterEntry *ce = (GF_ChapterEntry *)gf_list_get(p->list, i);
-			fprintf(trace, "<Chapter name=\"");
+			gf_fprintf(trace, "<Chapter name=\"");
 			dump_escape_string(trace, ce->name);
-			fprintf(trace, "\" startTime=\"%s\" />\n", format_duration(ce->start_time, 1000*10000, szDur));
+			gf_fprintf(trace, "\" startTime=\"%s\" />\n", format_duration(ce->start_time, 1000*10000, szDur));
 		}
 	} else {
-		fprintf(trace, "<Chapter name=\"\" startTime=\"\"/>\n");
+		gf_fprintf(trace, "<Chapter name=\"\" startTime=\"\"/>\n");
 	}
-
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		format_duration(0, 0, NULL);
+		dump_escape_string(NULL, NULL);
+	}
+#endif
 	gf_isom_box_dump_done("ChapterListBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err pdin_dump(GF_Box *a, FILE * trace)
+GF_Err pdin_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_ProgressiveDownloadBox *p = (GF_ProgressiveDownloadBox *)a;
 	gf_isom_box_dump_start(a, "ProgressiveDownloadBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (p->size) {
 		for (i=0; i<p->count; i++) {
-			fprintf(trace, "<DownloadInfo rate=\"%d\" estimatedTime=\"%d\" />\n", p->rates[i], p->times[i]);
+			gf_fprintf(trace, "<DownloadInfo rate=\"%d\" estimatedTime=\"%d\" />\n", p->rates[i], p->times[i]);
 		}
 	} else {
-		fprintf(trace, "<DownloadInfo rate=\"\" estimatedTime=\"\" />\n");
+		gf_fprintf(trace, "<DownloadInfo rate=\"\" estimatedTime=\"\" />\n");
 	}
 	gf_isom_box_dump_done("ProgressiveDownloadBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err hdlr_dump(GF_Box *a, FILE * trace)
+GF_Err hdlr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_HandlerBox *p = (GF_HandlerBox *)a;
 	gf_isom_box_dump_start(a, "HandlerBox", trace);
 	if (p->nameUTF8 && (u32) p->nameUTF8[0] == strlen(p->nameUTF8)-1) {
-		fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8+1);
+		gf_fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8+1);
 	} else {
-		fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8);
+		gf_fprintf(trace, "hdlrType=\"%s\" Name=\"%s\" ", gf_4cc_to_str(p->handlerType), p->nameUTF8);
 	}
-	fprintf(trace, "reserved1=\"%d\" reserved2=\"", p->reserved1);
+	gf_fprintf(trace, "reserved1=\"%d\" reserved2=\"", p->reserved1);
 	dump_data(trace, (char *) p->reserved2, 12);
-	fprintf(trace, "\"");
+	gf_fprintf(trace, "\"");
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("HandlerBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iods_dump(GF_Box *a, FILE * trace)
+GF_Err iods_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ObjectDescriptorBox *p;
 
 	p = (GF_ObjectDescriptorBox *)a;
 	gf_isom_box_dump_start(a, "ObjectDescriptorBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (p->descriptor) {
 #ifndef GPAC_DISABLE_OD_DUMP
 		gf_odf_dump_desc(p->descriptor, trace, 1, GF_TRUE);
 #else
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 #endif
 	} else if (p->size) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	}
 	gf_isom_box_dump_done("ObjectDescriptorBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trak_dump(GF_Box *a, FILE * trace)
+GF_Err trak_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackBox *p;
 
 	p = (GF_TrackBox *)a;
 	gf_isom_box_dump_start(a, "TrackBox", trace);
-	fprintf(trace, ">\n");
-	if (p->Header) {
-		gf_isom_box_dump(p->Header, trace);
-	} else if (p->size) {
-		fprintf(trace, "\n");
+	gf_fprintf(trace, ">\n");
+	if (p->size && !p->Header) {
+		gf_fprintf(trace, "\n");
 	}
-	if (p->References) gf_isom_box_dump(p->References, trace);
-	if (p->meta) gf_isom_box_dump(p->meta, trace);
-	if (p->editBox) gf_isom_box_dump(p->editBox, trace);
-	if (p->Media) gf_isom_box_dump(p->Media, trace);
-	if (p->groups) gf_isom_box_dump(p->groups, trace);
-	if (p->udta) gf_isom_box_dump(p->udta, trace);
 	gf_isom_box_dump_done("TrackBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mp4s_dump(GF_Box *a, FILE * trace)
+GF_Err mp4s_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MPEGSampleEntryBox *p;
 
 	p = (GF_MPEGSampleEntryBox *)a;
 	gf_isom_box_dump_start(a, "MPEGSystemsSampleDescriptionBox", trace);
-	fprintf(trace, "DataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
-	if (p->esd) {
-		gf_isom_box_dump(p->esd, trace);
-	} else if (p->size) {
-		fprintf(trace, "\n");
-	}
-	if (a->type == GF_ISOM_BOX_TYPE_ENCS) {
-		gf_isom_box_array_dump(p->protections, trace);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
+	if (!p->esd && p->size) {
+		gf_fprintf(trace, "\n");
 	}
 	gf_isom_box_dump_done("MPEGSystemsSampleDescriptionBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err video_sample_entry_dump(GF_Box *a, FILE * trace)
+GF_Err video_sample_entry_box_dump(GF_Box *a, FILE * trace)
 {
 	Bool full_dump=GF_FALSE;
 	GF_MPEGVisualSampleEntryBox *p = (GF_MPEGVisualSampleEntryBox *)a;
@@ -644,66 +584,75 @@
 	case GF_ISOM_SUBTYPE_3GP_H263:
 		name = "H263SampleDescriptionBox";
 		break;
-	case GF_QT_BOX_TYPE_APCH:
-	case GF_QT_BOX_TYPE_APCO:
-	case GF_QT_BOX_TYPE_APCN:
-	case GF_QT_BOX_TYPE_APCS:
-	case GF_QT_BOX_TYPE_APCF:
-	case GF_QT_BOX_TYPE_AP4X:
-	case GF_QT_BOX_TYPE_AP4H:
+	case GF_ISOM_SUBTYPE_MJP2:
+		name = "MJ2KSampleDescriptionBox";
+		break;
+	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:
 		name = "ProResSampleEntryBox";
 		full_dump=GF_TRUE;
 		break;
+	case GF_QT_SUBTYPE_RAW:
+		name = "RGBSampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUV422:
+		name = "YUV422SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUV422_10:
+		name = "YUV422_10_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUV444:
+		name = "YUV444SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
+	case GF_QT_SUBTYPE_YUV444_10:
+		name = "YUV444_10_SampleEntryBox";
+		full_dump=GF_TRUE;
+		break;
 	default:
 		//DO NOT TOUCH FOR NOW, this breaks all hashes
 		name = "MPEGVisualSampleDescriptionBox";
+		break;
 	}
 
 
 	gf_isom_box_dump_start(a, name, trace);
 
-	fprintf(trace, " DataReferenceIndex=\"%d\" Width=\"%d\" Height=\"%d\"", p->dataReferenceIndex, p->Width, p->Height);
+	gf_fprintf(trace, " DataReferenceIndex=\"%d\" Width=\"%d\" Height=\"%d\"", p->dataReferenceIndex, p->Width, p->Height);
 
 	if (full_dump) {
-		fprintf(trace, " Version=\"%d\" Revision=\"%d\" Vendor=\"%s\" TemporalQuality=\"%d\" SpatialQuality=\"%d\" FramesPerSample=\"%d\" ColorTableIndex=\"%d\"",
+		Float dpih, dpiv;
+		gf_fprintf(trace, " Version=\"%d\" Revision=\"%d\" Vendor=\"%s\" TemporalQuality=\"%d\" SpatialQuality=\"%d\" FramesPerSample=\"%d\" ColorTableIndex=\"%d\"",
 			p->version, p->revision, gf_4cc_to_str(p->vendor), p->temporal_quality, p->spatial_quality, p->frames_per_sample, p->color_table_index);
-		fprintf(trace, " XDPI=\"%d.%d\" YDPI=\"%d.%d\" BitDepth=\"%d\"", p->horiz_res>>16, p->horiz_res&0xFFFF, p->vert_res>>16, p->vert_res&0xFFFF, p->bit_depth);
-	} else {
-		//dump reserved info
-		fprintf(trace, " XDPI=\"%d\" YDPI=\"%d\" BitDepth=\"%d\"", p->horiz_res, p->vert_res, p->bit_depth);
-	}
-	if (strlen((const char*)p->compressor_name) )
-		fprintf(trace, " CompressorName=\"%s\"\n", p->compressor_name+1);
-
 
-	fprintf(trace, ">\n");
+		dpih = (Float) (p->horiz_res&0xFFFF);
+		dpih /= 0xFFFF;
+		dpih += (p->vert_res>>16);
+		dpiv = (Float) (p->vert_res&0xFFFF);
+		dpiv /= 0xFFFF;
+		dpiv += (p->vert_res>>16);
 
-	if (p->esd) {
-		gf_isom_box_dump(p->esd, trace);
+		gf_fprintf(trace, " XDPI=\"%g\" YDPI=\"%g\" BitDepth=\"%d\"", dpih, dpiv, p->bit_depth);
 	} else {
-		if (p->hevc_config) gf_isom_box_dump(p->hevc_config, trace);
-		if (p->avc_config) gf_isom_box_dump(p->avc_config, trace);
-		if (p->ipod_ext) gf_isom_box_dump(p->ipod_ext, trace);
-		if (p->descr) gf_isom_box_dump(p->descr, trace);
-		if (p->svc_config) gf_isom_box_dump(p->svc_config, trace);
-		if (p->mvc_config) gf_isom_box_dump(p->mvc_config, trace);
-		if (p->lhvc_config) gf_isom_box_dump(p->lhvc_config, trace);
-		if (p->av1_config) gf_isom_box_dump(p->av1_config, trace);
-		if (p->cfg_3gpp) gf_isom_box_dump(p->cfg_3gpp, trace);
-	}
-	if (a->type == GF_ISOM_BOX_TYPE_ENCV) {
-		gf_isom_box_array_dump(p->protections, trace);
-	}
-	if (p->pasp) gf_isom_box_dump(p->pasp, trace);
-	if (p->mdcv) gf_isom_box_dump(p->colr, trace);
-	if (p->mdcv) gf_isom_box_dump(p->mdcv, trace);
-	if (p->clli) gf_isom_box_dump(p->clli, trace);
-	if (p->clap) gf_isom_box_dump(p->clap, trace);
-	if (p->ccst) gf_isom_box_dump(p->ccst, trace);
-	if (p->auxi) gf_isom_box_dump(p->auxi, trace);
-	if (p->rvcc) gf_isom_box_dump(p->rvcc, trace);
-	if (p->rinf) gf_isom_box_dump(p->rinf, trace);
+		//dump reserved info
+		gf_fprintf(trace, " XDPI=\"%d\" YDPI=\"%d\" BitDepth=\"%d\"", p->horiz_res, p->vert_res, p->bit_depth);
+	}
+	if (strlen((const char*)p->compressor_name) ) {
+		if (isalnum(p->compressor_name[0])) {
+			gf_fprintf(trace, " CompressorName=\"%s\"\n", p->compressor_name);
+		} else {
+			gf_fprintf(trace, " CompressorName=\"%s\"\n", p->compressor_name+1);
+		}
+	}
 
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
@@ -711,22 +660,30 @@
 
 void base_audio_entry_dump(GF_AudioSampleEntryBox *p, FILE * trace)
 {
-	fprintf(trace, " DataReferenceIndex=\"%d\"", p->dataReferenceIndex);
+	gf_fprintf(trace, " DataReferenceIndex=\"%d\"", p->dataReferenceIndex);
 	if (p->version)
-		fprintf(trace, " Version=\"%d\"", p->version);
-	fprintf(trace, " SampleRate=\"%d\"", p->samplerate_hi);
-	fprintf(trace, " Channels=\"%d\" BitsPerSample=\"%d\"", p->channel_count, p->bitspersample);
-	if (p->is_qtff)
-		fprintf(trace, " isQTFF=\"%d\"", p->is_qtff);
-
+		gf_fprintf(trace, " Version=\"%d\"", p->version);
+	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);
+		gf_fprintf(trace, " qtRevisionLevel=\"%d\"", p->revision);
+		gf_fprintf(trace, " qtVendor=\"%d\"", p->vendor);
+		gf_fprintf(trace, " qtCompressionId=\"%d\"", p->compression_id);
+		gf_fprintf(trace, " qtPacketSize=\"%d\"", p->packet_size);
+		if (p->version == 1) {
+			gf_fprintf(trace, " qtSamplesPerPacket=\"%d\"", p->extensions[0]<<24 | p->extensions[1]<<16 | p->extensions[2]<<8 | p->extensions[3]);
+			gf_fprintf(trace, " qtBytesPerPacket=\"%d\"", p->extensions[4]<<24 | p->extensions[5]<<16 | p->extensions[6]<<8 | p->extensions[7]);
+			gf_fprintf(trace, " qtBytesPerFrame=\"%d\"", p->extensions[8]<<24 | p->extensions[9]<<16 | p->extensions[10]<<8 | p->extensions[11]);
+			gf_fprintf(trace, " qtBytesPerSample=\"%d\"", p->extensions[12]<<24 | p->extensions[13]<<16 | p->extensions[14]<<8 | p->extensions[15]);
+		}
+	}
 }
 
-GF_Err audio_sample_entry_dump(GF_Box *a, FILE * trace)
+GF_Err audio_sample_entry_box_dump(GF_Box *a, FILE * trace)
 {
 	char *szName;
 	const char *error=NULL;
-	/*Bool is_3gpp = GF_FALSE;
-	Bool is_mp4a = GF_FALSE;*/
 	GF_MPEGAudioSampleEntryBox *p = (GF_MPEGAudioSampleEntryBox *)a;
 
 	switch (p->type) {
@@ -785,41 +742,22 @@
 
 	gf_isom_box_dump_start(a, szName, trace);
 	base_audio_entry_dump((GF_AudioSampleEntryBox *)p, trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (error) {
-		fprintf(trace, "%s\n", error);
-	} else {
-		if (p->esd)
-			gf_isom_box_dump(p->esd, trace);
-
-		if (p->cfg_3gpp)
-			gf_isom_box_dump(p->cfg_3gpp, trace);
-
-		if (p->cfg_opus)
-			gf_isom_box_dump(p->cfg_opus, trace);
-
-		if (p->cfg_ac3)
-			gf_isom_box_dump(p->cfg_ac3, trace);
-
-		if (p->cfg_mha)
-			gf_isom_box_dump(p->cfg_mha, trace);
-	}
-
-	if (a->type == GF_ISOM_BOX_TYPE_ENCA) {
-		gf_isom_box_array_dump(p->protections, trace);
+		gf_fprintf(trace, "%s\n", error);
 	}
 	gf_isom_box_dump_done(szName, a, trace);
 	return GF_OK;
 }
 
-GF_Err gen_sample_entry_dump(GF_Box *a, FILE * trace)
+GF_Err gen_sample_entry_box_dump(GF_Box *a, FILE * trace)
 {
 	char *szName;
 	GF_SampleEntryBox *p = (GF_SampleEntryBox *)a;
 
 	switch (p->type) {
-	case GF_QT_BOX_TYPE_C608:
+	case GF_QT_SUBTYPE_C608:
 		szName = "ClosedCaption";
 		break;
 	default:
@@ -828,70 +766,61 @@
 	}
 
 	gf_isom_box_dump_start(a, szName, trace);
-	fprintf(trace, ">\n");
-
-	if (p->protections && gf_list_count(p->protections) ) {
-		gf_isom_box_array_dump(p->protections, trace);
-	}
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(szName, a, trace);
 	return GF_OK;
 }
 
-GF_Err gnrm_dump(GF_Box *a, FILE * trace)
+GF_Err gnrm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericSampleEntryBox *p = (GF_GenericSampleEntryBox *)a;
 	if (p->EntryType)
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "SampleDescriptionEntryBox", trace);
-	fprintf(trace, "DataReferenceIndex=\"%d\" ExtensionDataSize=\"%d\">\n", p->dataReferenceIndex, p->data_size);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" ExtensionDataSize=\"%d\">\n", p->dataReferenceIndex, p->data_size);
 	a->type = GF_ISOM_BOX_TYPE_GNRM;
 	gf_isom_box_dump_done("SampleDescriptionEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err gnrv_dump(GF_Box *a, FILE * trace)
+GF_Err gnrv_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericVisualSampleEntryBox *p = (GF_GenericVisualSampleEntryBox *)a;
 	if (p->EntryType)
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "VisualSampleDescriptionBox", trace);
-	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",
-	        p->dataReferenceIndex, p->version, p->revision, p->vendor, p->temporal_quality, p->spatial_quality, p->Width, p->Height, p->horiz_res, p->vert_res, p->compressor_name+1, p->bit_depth);
+	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",
+	        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;
 	gf_isom_box_dump_done("VisualSampleDescriptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err gnra_dump(GF_Box *a, FILE * trace)
+GF_Err gnra_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GenericAudioSampleEntryBox *p = (GF_GenericAudioSampleEntryBox *)a;
 	if (p->EntryType)
 		a->type = p->EntryType;
 
 	gf_isom_box_dump_start(a, "AudioSampleDescriptionBox", trace);
-	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\">\n",
 	        p->dataReferenceIndex, p->version, p->revision, p->vendor, p->channel_count, p->bitspersample, p->samplerate_hi);
 	a->type = GF_ISOM_BOX_TYPE_GNRA;
 	gf_isom_box_dump_done("AudioSampleDescriptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err edts_dump(GF_Box *a, FILE * trace)
+GF_Err edts_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_EditBox *p;
-
-	p = (GF_EditBox *)a;
 	gf_isom_box_dump_start(a, "EditBox", trace);
-	fprintf(trace, ">\n");
-	if (p->size)
-		gf_isom_box_dump_ex(p->editList, trace, GF_ISOM_BOX_TYPE_ELST);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("EditBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err udta_dump(GF_Box *a, FILE * trace)
+GF_Err udta_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_UserDataBox *p;
 	GF_UserDataMap *map;
@@ -899,102 +828,109 @@
 
 	p = (GF_UserDataBox *)a;
 	gf_isom_box_dump_start(a, "UserDataBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	i=0;
 	while ((map = (GF_UserDataMap *)gf_list_enum(p->recordList, &i))) {
-		gf_isom_box_array_dump(map->other_boxes, trace);
+		gf_isom_box_array_dump(map->boxes, trace);
 	}
 	gf_isom_box_dump_done("UserDataBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dref_dump(GF_Box *a, FILE * trace)
+GF_Err dref_box_dump(GF_Box *a, FILE * trace)
 {
 //	GF_DataReferenceBox *p = (GF_DataReferenceBox *)a;
 	gf_isom_box_dump_start(a, "DataReferenceBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("DataReferenceBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stsd_dump(GF_Box *a, FILE * trace)
+GF_Err stsd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SampleDescriptionBox *p = (GF_SampleDescriptionBox *)a;
 	gf_isom_box_dump_start(a, "SampleDescriptionBox", trace);
 	if (p->version)
-		fprintf(trace, " version=\"%d\"", p->version);
-	fprintf(trace, ">\n");
+		gf_fprintf(trace, " version=\"%d\"", p->version);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SampleDescriptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stts_dump(GF_Box *a, FILE * trace)
+GF_Err stts_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeToSampleBox *p;
 	u32 i, nb_samples;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_TimeToSampleBox *)a;
 	gf_isom_box_dump_start(a, "TimeToSampleBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	nb_samples = 0;
 	for (i=0; i<p->nb_entries; i++) {
-		fprintf(trace, "<TimeToSampleEntry SampleDelta=\"%d\" SampleCount=\"%d\"/>\n", p->entries[i].sampleDelta, p->entries[i].sampleCount);
+		gf_fprintf(trace, "<TimeToSampleEntry SampleDelta=\"%d\" SampleCount=\"%d\"/>\n", p->entries[i].sampleDelta, p->entries[i].sampleCount);
 		nb_samples += p->entries[i].sampleCount;
 	}
 	if (p->size)
-		fprintf(trace, "\n", nb_samples);
+		gf_fprintf(trace, "\n", nb_samples);
 	else
-		fprintf(trace, "<TimeToSampleEntry SampleDelta=\"\" SampleCount=\"\"/>\n");
+		gf_fprintf(trace, "<TimeToSampleEntry SampleDelta=\"\" SampleCount=\"\"/>\n");
 
 	gf_isom_box_dump_done("TimeToSampleBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ctts_dump(GF_Box *a, FILE * trace)
+GF_Err ctts_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_CompositionOffsetBox *p;
 	u32 i, nb_samples;
 	p = (GF_CompositionOffsetBox *)a;
+
+	if (dump_skip_samples)
+		return GF_OK;
+
 	gf_isom_box_dump_start(a, "CompositionOffsetBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	nb_samples = 0;
 	for (i=0; i<p->nb_entries; i++) {
-		fprintf(trace, "<CompositionOffsetEntry CompositionOffset=\"%d\" SampleCount=\"%d\"/>\n", p->entries[i].decodingOffset, p->entries[i].sampleCount);
+		gf_fprintf(trace, "<CompositionOffsetEntry CompositionOffset=\"%d\" SampleCount=\"%d\"/>\n", p->entries[i].decodingOffset, p->entries[i].sampleCount);
 		nb_samples += p->entries[i].sampleCount;
 	}
 	if (p->size)
-		fprintf(trace, "\n", nb_samples);
+		gf_fprintf(trace, "\n", nb_samples);
 	else
-		fprintf(trace, "<CompositionOffsetEntry CompositionOffset=\"\" SampleCount=\"\"/>\n");
+		gf_fprintf(trace, "<CompositionOffsetEntry CompositionOffset=\"\" SampleCount=\"\"/>\n");
 
 	gf_isom_box_dump_done("CompositionOffsetBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err cslg_dump(GF_Box *a, FILE * trace)
+GF_Err cslg_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_CompositionToDecodeBox *p;
 
 	p = (GF_CompositionToDecodeBox *)a;
 	gf_isom_box_dump_start(a, "CompositionToDecodeBox", trace);
-	fprintf(trace, "compositionToDTSShift=\"%d\" leastDecodeToDisplayDelta=\"%d\" compositionStartTime=\"%d\" compositionEndTime=\"%d\">\n", p->leastDecodeToDisplayDelta, p->greatestDecodeToDisplayDelta, p->compositionStartTime, p->compositionEndTime);
+	gf_fprintf(trace, "compositionToDTSShift=\"%d\" leastDecodeToDisplayDelta=\"%d\" greatestDecodeToDisplayDelta=\"%d\" compositionStartTime=\"%d\" compositionEndTime=\"%d\">\n", p->compositionToDTSShift, p->leastDecodeToDisplayDelta, p->greatestDecodeToDisplayDelta, p->compositionStartTime, p->compositionEndTime);
 	gf_isom_box_dump_done("CompositionToDecodeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ccst_dump(GF_Box *a, FILE * trace)
+GF_Err ccst_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_CodingConstraintsBox *p = (GF_CodingConstraintsBox *)a;
 	gf_isom_box_dump_start(a, "CodingConstraintsBox", trace);
-	fprintf(trace, "all_ref_pics_intra=\"%d\" intra_pred_used=\"%d\" max_ref_per_pic=\"%d\" reserved=\"%d\">\n", p->all_ref_pics_intra, p->intra_pred_used, p->max_ref_per_pic, p->reserved);
+	gf_fprintf(trace, "all_ref_pics_intra=\"%d\" intra_pred_used=\"%d\" max_ref_per_pic=\"%d\" reserved=\"%d\">\n", p->all_ref_pics_intra, p->intra_pred_used, p->max_ref_per_pic, p->reserved);
 	gf_isom_box_dump_done("CodingConstraintsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stsh_dump(GF_Box *a, FILE * trace)
+GF_Err stsh_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ShadowSyncBox *p;
 	u32 i;
@@ -1002,19 +938,19 @@
 
 	p = (GF_ShadowSyncBox *)a;
 	gf_isom_box_dump_start(a, "SyncShadowBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", gf_list_count(p->entries));
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", gf_list_count(p->entries));
 	i=0;
 	while ((t = (GF_StshEntry *)gf_list_enum(p->entries, &i))) {
-		fprintf(trace, "<SyncShadowEntry ShadowedSample=\"%d\" SyncSample=\"%d\"/>\n", t->shadowedSampleNumber, t->syncSampleNumber);
+		gf_fprintf(trace, "<SyncShadowEntry ShadowedSample=\"%d\" SyncSample=\"%d\"/>\n", t->shadowedSampleNumber, t->syncSampleNumber);
 	}
 	if (!p->size) {
-		fprintf(trace, "<SyncShadowEntry ShadowedSample=\"\" SyncSample=\"\"/>\n");
+		gf_fprintf(trace, "<SyncShadowEntry ShadowedSample=\"\" SyncSample=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SyncShadowBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err elst_dump(GF_Box *a, FILE * trace)
+GF_Err elst_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_EditListBox *p;
 	u32 i;
@@ -1022,31 +958,34 @@
 
 	p = (GF_EditListBox *)a;
 	gf_isom_box_dump_start(a, "EditListBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", gf_list_count(p->entryList));
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", gf_list_count(p->entryList));
 
 	i=0;
 	while ((t = (GF_EdtsEntry *)gf_list_enum(p->entryList, &i))) {
-		fprintf(trace, "<EditListEntry Duration=\""LLD"\" MediaTime=\""LLD"\" MediaRate=\"%u\"/>\n", LLD_CAST t->segmentDuration, LLD_CAST t->mediaTime, t->mediaRate);
+		gf_fprintf(trace, "<EditListEntry Duration=\""LLD"\" MediaTime=\""LLD"\" MediaRate=\"%u\"/>\n", t->segmentDuration, t->mediaTime, t->mediaRate);
 	}
 	if (!p->size) {
-		fprintf(trace, "<EditListEntry Duration=\"\" MediaTime=\"\" MediaRate=\"\"/>\n");
+		gf_fprintf(trace, "<EditListEntry Duration=\"\" MediaTime=\"\" MediaRate=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("EditListBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stsc_dump(GF_Box *a, FILE * trace)
+GF_Err stsc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SampleToChunkBox *p;
 	u32 i, nb_samples;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_SampleToChunkBox *)a;
 	gf_isom_box_dump_start(a, "SampleToChunkBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	nb_samples = 0;
 	for (i=0; i<p->nb_entries; i++) {
-		fprintf(trace, "<SampleToChunkEntry FirstChunk=\"%d\" SamplesPerChunk=\"%d\" SampleDescriptionIndex=\"%d\"/>\n", p->entries[i].firstChunk, p->entries[i].samplesPerChunk, p->entries[i].sampleDescriptionIndex);
+		gf_fprintf(trace, "<SampleToChunkEntry FirstChunk=\"%d\" SamplesPerChunk=\"%d\" SampleDescriptionIndex=\"%d\"/>\n", p->entries[i].firstChunk, p->entries[i].samplesPerChunk, p->entries[i].sampleDescriptionIndex);
 		if (i+1<p->nb_entries) {
 			nb_samples += (p->entries[i+1].firstChunk - p->entries[i].firstChunk) * p->entries[i].samplesPerChunk;
 		} else {
@@ -1054,19 +993,21 @@
 		}
 	}
 	if (p->size)
-		fprintf(trace, "\n", nb_samples);
+		gf_fprintf(trace, "\n", nb_samples);
 	else
-		fprintf(trace, "<SampleToChunkEntry FirstChunk=\"\" SamplesPerChunk=\"\" SampleDescriptionIndex=\"\"/>\n");
+		gf_fprintf(trace, "<SampleToChunkEntry FirstChunk=\"\" SamplesPerChunk=\"\" SampleDescriptionIndex=\"\"/>\n");
 
 	gf_isom_box_dump_done("SampleToChunkBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stsz_dump(GF_Box *a, FILE * trace)
+GF_Err stsz_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SampleSizeBox *p;
 	u32 i;
 	p = (GF_SampleSizeBox *)a;
+	if (dump_skip_samples)
+		return GF_OK;
 
 	if (a->type == GF_ISOM_BOX_TYPE_STSZ) {
 		gf_isom_box_dump_start(a, "SampleSizeBox", trace);
@@ -1075,117 +1016,126 @@
 		gf_isom_box_dump_start(a, "CompactSampleSizeBox", trace);
 	}
 
-	fprintf(trace, "SampleCount=\"%d\"",  p->sampleCount);
+	gf_fprintf(trace, "SampleCount=\"%d\"",  p->sampleCount);
 	if (a->type == GF_ISOM_BOX_TYPE_STSZ) {
 		if (p->sampleSize) {
-			fprintf(trace, " ConstantSampleSize=\"%d\"", p->sampleSize);
+			gf_fprintf(trace, " ConstantSampleSize=\"%d\"", p->sampleSize);
 		}
 	} else {
-		fprintf(trace, " SampleSizeBits=\"%d\"", p->sampleSize);
+		gf_fprintf(trace, " SampleSizeBits=\"%d\"", p->sampleSize);
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if ((a->type != GF_ISOM_BOX_TYPE_STSZ) || !p->sampleSize) {
 		if (!p->sizes && p->size) {
-			fprintf(trace, "\n");
-		} else {
+			gf_fprintf(trace, "\n");
+		} else if (p->sizes) {
 			for (i=0; i<p->sampleCount; i++) {
-				fprintf(trace, "<SampleSizeEntry Size=\"%d\"/>\n", p->sizes[i]);
+				gf_fprintf(trace, "<SampleSizeEntry Size=\"%d\"/>\n", p->sizes[i]);
 			}
 		}
 	}
 	if (!p->size) {
-		fprintf(trace, "<SampleSizeEntry Size=\"\"/>\n");
+		gf_fprintf(trace, "<SampleSizeEntry Size=\"\"/>\n");
 	}
 	gf_isom_box_dump_done((a->type == GF_ISOM_BOX_TYPE_STSZ) ? "SampleSizeBox" : "CompactSampleSizeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stco_dump(GF_Box *a, FILE * trace)
+GF_Err stco_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ChunkOffsetBox *p;
 	u32 i;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_ChunkOffsetBox *)a;
 	gf_isom_box_dump_start(a, "ChunkOffsetBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	if (!p->offsets && p->size) {
-		fprintf(trace, "\n");
-	} else {
+		gf_fprintf(trace, "\n");
+	} else if (p->offsets) {
 		for (i=0; i<p->nb_entries; i++) {
-			fprintf(trace, "<ChunkEntry offset=\"%u\"/>\n", p->offsets[i]);
+			gf_fprintf(trace, "<ChunkEntry offset=\"%u\"/>\n", p->offsets[i]);
 		}
 	}
 	if (!p->size) {
-		fprintf(trace, "<ChunkEntry offset=\"\"/>\n");
+		gf_fprintf(trace, "<ChunkEntry offset=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("ChunkOffsetBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stss_dump(GF_Box *a, FILE * trace)
+GF_Err stss_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SyncSampleBox *p;
 	u32 i;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_SyncSampleBox *)a;
 	gf_isom_box_dump_start(a, "SyncSampleBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	if (!p->sampleNumbers && p->size) {
-		fprintf(trace, "\n");
-	} else {
+		gf_fprintf(trace, "\n");
+	} else if (p->sampleNumbers) {
 		for (i=0; i<p->nb_entries; i++) {
-			fprintf(trace, "<SyncSampleEntry sampleNumber=\"%u\"/>\n", p->sampleNumbers[i]);
+			gf_fprintf(trace, "<SyncSampleEntry sampleNumber=\"%u\"/>\n", p->sampleNumbers[i]);
 		}
 	}
 	if (!p->size) {
-			fprintf(trace, "<SyncSampleEntry sampleNumber=\"\"/>\n");
+			gf_fprintf(trace, "<SyncSampleEntry sampleNumber=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SyncSampleBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stdp_dump(GF_Box *a, FILE * trace)
+GF_Err stdp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DegradationPriorityBox *p;
 	u32 i;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_DegradationPriorityBox *)a;
 	gf_isom_box_dump_start(a, "DegradationPriorityBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	if (!p->priorities && p->size) {
-		fprintf(trace, "\n");
-	} else {
+		gf_fprintf(trace, "\n");
+	} else if (p->priorities) {
 		for (i=0; i<p->nb_entries; i++) {
-			fprintf(trace, "<DegradationPriorityEntry DegradationPriority=\"%d\"/>\n", p->priorities[i]);
+			gf_fprintf(trace, "<DegradationPriorityEntry DegradationPriority=\"%d\"/>\n", p->priorities[i]);
 		}
 	}
 	if (!p->size) {
-		fprintf(trace, "<DegradationPriorityEntry DegradationPriority=\"\"/>\n");
+		gf_fprintf(trace, "<DegradationPriorityEntry DegradationPriority=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("DegradationPriorityBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err sdtp_dump(GF_Box *a, FILE * trace)
+GF_Err sdtp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SampleDependencyTypeBox *p;
 	u32 i;
 
 	p = (GF_SampleDependencyTypeBox*)a;
 	gf_isom_box_dump_start(a, "SampleDependencyTypeBox", trace);
-	fprintf(trace, "SampleCount=\"%d\">\n", p->sampleCount);
+	gf_fprintf(trace, "SampleCount=\"%d\">\n", p->sampleCount);
 
-	if (!p->sample_info && p->size) {
-		fprintf(trace, "\n");
+	if (!p->sample_info) {
+		gf_fprintf(trace, "\n");
 	} else {
 		for (i=0; i<p->sampleCount; i++) {
 			const char *type;
 			u8 flag = p->sample_info[i];
-			fprintf(trace, "<SampleDependencyEntry ");
+			gf_fprintf(trace, "<SampleDependencyEntry ");
 			switch ( (flag >> 6) & 3) {
 			case 1: type="openGOP"; break;
 			case 2: type="no"; break;
@@ -1193,7 +1143,7 @@
 			default:
 			case 0: type="unknown"; break;
 			}
-			fprintf(trace, "isLeading=\"%s\" ", type);
+			gf_fprintf(trace, "isLeading=\"%s\" ", type);
 
 			switch ( (flag >> 4) & 3) {
 			case 1: type="yes"; break;
@@ -1202,7 +1152,7 @@
 			default:
 			case 0: type="unknown"; break;
 			}
-			fprintf(trace, "dependsOnOther=\"%s\" ", type);
+			gf_fprintf(trace, "dependsOnOther=\"%s\" ", type);
 
 			switch ( (flag >> 2) & 3) {
 			case 1: type="yes"; break;
@@ -1211,7 +1161,7 @@
 			default:
 			case 0: type="unknown"; break;
 			}
-			fprintf(trace, "dependedOn=\"%s\" ", type);
+			gf_fprintf(trace, "dependedOn=\"%s\" ", type);
 
 			switch ( flag & 3) {
 			case 1: type="yes"; break;
@@ -1220,186 +1170,161 @@
 			default:
 			case 0: type="unknown"; break;
 			}
-			fprintf(trace, "hasRedundancy=\"%s\"/>\n", type);
+			gf_fprintf(trace, "hasRedundancy=\"%s\"/>\n", type);
 		}
 	}
 	if (!p->size) {
-		fprintf(trace, "<SampleDependencyEntry dependsOnOther=\"unknown|yes|no|RESERVED\" dependedOn=\"unknown|yes|no|RESERVED\" hasRedundancy=\"unknown|yes|no|RESERVED\"/>\n");
+		gf_fprintf(trace, "<SampleDependencyEntry dependsOnOther=\"unknown|yes|no|RESERVED\" dependedOn=\"unknown|yes|no|RESERVED\" hasRedundancy=\"unknown|yes|no|RESERVED\"/>\n");
 	}
 	gf_isom_box_dump_done("SampleDependencyTypeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err co64_dump(GF_Box *a, FILE * trace)
+GF_Err co64_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ChunkLargeOffsetBox *p;
 	u32 i;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	p = (GF_ChunkLargeOffsetBox *)a;
 	gf_isom_box_dump_start(a, "ChunkLargeOffsetBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->nb_entries);
 
 	if (!p->offsets && p->size) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 #endif
 	} else if (p->size) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	}
 	gf_isom_box_dump_done("MPEG4ESDescriptorBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err minf_dump(GF_Box *a, FILE * trace)
+GF_Err minf_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MediaInformationBox *p;
-
-	p = (GF_MediaInformationBox *)a;
 	gf_isom_box_dump_start(a, "MediaInformationBox", trace);
-	fprintf(trace, ">\n");
-
-	if (p->size)
-		gf_isom_box_dump_ex(p->InfoHeader, trace, GF_ISOM_BOX_TYPE_NMHD);
-	if (p->size)
-		gf_isom_box_dump_ex(p->dataInformation, trace, GF_ISOM_BOX_TYPE_DINF);
-	if (p->size)
-		gf_isom_box_dump_ex(p->sampleTable, trace, GF_ISOM_BOX_TYPE_STBL);
-
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MediaInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tkhd_dump(GF_Box *a, FILE * trace)
+GF_Err tkhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackHeaderBox *p;
 	p = (GF_TrackHeaderBox *)a;
 	gf_isom_box_dump_start(a, "TrackHeaderBox", trace);
 
-	fprintf(trace, "CreationTime=\""LLD"\" ModificationTime=\""LLD"\" TrackID=\"%u\" Duration=\""LLD"\"",
-	        LLD_CAST p->creationTime, LLD_CAST p->modificationTime, p->trackID, LLD_CAST p->duration);
+	gf_fprintf(trace, "CreationTime=\""LLD"\" ModificationTime=\""LLD"\" TrackID=\"%u\" Duration=\""LLD"\"",
+			p->creationTime, p->modificationTime, p->trackID, p->duration);
 
-	if (p->alternate_group) fprintf(trace, " AlternateGroupID=\"%d\"", p->alternate_group);
+	if (p->alternate_group) gf_fprintf(trace, " AlternateGroupID=\"%d\"", p->alternate_group);
 	if (p->volume) {
-		fprintf(trace, " Volume=\"%.2f\"", (Float)p->volume / 256);
+		gf_fprintf(trace, " Volume=\"%.2f\"", (Float)p->volume / 256);
 	} else if (p->width || p->height) {
-		fprintf(trace, " Width=\"%.2f\" Height=\"%.2f\"", (Float)p->width / 65536, (Float)p->height / 65536);
-		if (p->layer) fprintf(trace, " Layer=\"%d\"", p->layer);
+		gf_fprintf(trace, " Width=\"%.2f\" Height=\"%.2f\"", (Float)p->width / 65536, (Float)p->height / 65536);
+		if (p->layer) gf_fprintf(trace, " Layer=\"%d\"", p->layer);
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	if (p->width || p->height) {
-		fprintf(trace, "<Matrix m11=\"0x%.8x\" m12=\"0x%.8x\" m13=\"0x%.8x\" ", p->matrix[0], p->matrix[1], p->matrix[2]);
-		fprintf(trace, "m21=\"0x%.8x\" m22=\"0x%.8x\" m23=\"0x%.8x\" ", p->matrix[3], p->matrix[4], p->matrix[5]);
-		fprintf(trace, "m31=\"0x%.8x\" m32=\"0x%.8x\" m33=\"0x%.8x\"/>\n", p->matrix[6], p->matrix[7], p->matrix[8]);
+		gf_fprintf(trace, "<Matrix m11=\"0x%.8x\" m12=\"0x%.8x\" m13=\"0x%.8x\" ", p->matrix[0], p->matrix[1], p->matrix[2]);
+		gf_fprintf(trace, "m21=\"0x%.8x\" m22=\"0x%.8x\" m23=\"0x%.8x\" ", p->matrix[3], p->matrix[4], p->matrix[5]);
+		gf_fprintf(trace, "m31=\"0x%.8x\" m32=\"0x%.8x\" m33=\"0x%.8x\"/>\n", p->matrix[6], p->matrix[7], p->matrix[8]);
 	}
 
 	gf_isom_box_dump_done("TrackHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tref_dump(GF_Box *a, FILE * trace)
+GF_Err tref_box_dump(GF_Box *a, FILE * trace)
 {
-//	GF_TrackReferenceBox *p = (GF_TrackReferenceBox *)a;
 	gf_isom_box_dump_start(a, "TrackReferenceBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("TrackReferenceBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mdia_dump(GF_Box *a, FILE * trace)
+GF_Err mdia_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MediaBox *p = (GF_MediaBox *)a;
 	gf_isom_box_dump_start(a, "MediaBox", trace);
-	fprintf(trace, ">\n");
-	if (p->size)
-		gf_isom_box_dump_ex(p->mediaHeader, trace, GF_ISOM_BOX_TYPE_MDHD);
-	if (p->size)
-		gf_isom_box_dump_ex(p->handler, trace,GF_ISOM_BOX_TYPE_HDLR);
-	if (p->size)
-		gf_isom_box_dump_ex(p->information, trace, GF_ISOM_BOX_TYPE_MINF);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MediaBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mfra_dump(GF_Box *a, FILE * trace)
+GF_Err mfra_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MovieFragmentRandomAccessBox *p = (GF_MovieFragmentRandomAccessBox *)a;
-	u32 i, count;
-	GF_TrackFragmentRandomAccessBox *tfra;
-
 	gf_isom_box_dump_start(a, "MovieFragmentRandomAccessBox", trace);
-	fprintf(trace, ">\n");
-	count = gf_list_count(p->tfra_list);
-	for (i=0; i<count; i++) {
-		tfra = (GF_TrackFragmentRandomAccessBox *)gf_list_get(p->tfra_list, i);
-		gf_isom_box_dump_ex(tfra, trace, GF_ISOM_BOX_TYPE_TFRA);
-	}
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieFragmentRandomAccessBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tfra_dump(GF_Box *a, FILE * trace)
+GF_Err tfra_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TrackFragmentRandomAccessBox *p = (GF_TrackFragmentRandomAccessBox *)a;
 	gf_isom_box_dump_start(a, "TrackFragmentRandomAccessBox", trace);
-	fprintf(trace, "TrackId=\"%u\" number_of_entries=\"%u\">\n", p->track_id, p->nb_entries);
+	gf_fprintf(trace, "TrackId=\"%u\" number_of_entries=\"%u\">\n", p->track_id, p->nb_entries);
 	for (i=0; i<p->nb_entries; i++) {
-		fprintf(trace, "<RandomAccessEntry time=\""LLU"\" moof_offset=\""LLU"\" traf=\"%u\" trun=\"%u\" sample=\"%u\"/>\n",
+		gf_fprintf(trace, "<RandomAccessEntry time=\""LLU"\" moof_offset=\""LLU"\" traf=\"%u\" trun=\"%u\" sample=\"%u\"/>\n",
 			p->entries[i].time, p->entries[i].moof_offset,
 			p->entries[i].traf_number, p->entries[i].trun_number, p->entries[i].sample_number);
 	}
 	if (!p->size) {
-		fprintf(trace, "<RandomAccessEntry time=\"\" moof_offset=\"\" traf=\"\" trun=\"\" sample=\"\"/>\n");
+		gf_fprintf(trace, "<RandomAccessEntry time=\"\" moof_offset=\"\" traf=\"\" trun=\"\" sample=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("TrackFragmentRandomAccessBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mfro_dump(GF_Box *a, FILE * trace)
+GF_Err mfro_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieFragmentRandomAccessOffsetBox *p = (GF_MovieFragmentRandomAccessOffsetBox *)a;
 
 	gf_isom_box_dump_start(a, "MovieFragmentRandomAccessOffsetBox", trace);
 
-	fprintf(trace, "container_size=\"%d\" >\n", p->container_size);
+	gf_fprintf(trace, "container_size=\"%d\" >\n", p->container_size);
 	gf_isom_box_dump_done("MovieFragmentRandomAccessOffsetBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err elng_dump(GF_Box *a, FILE * trace)
+GF_Err elng_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ExtendedLanguageBox *p = (GF_ExtendedLanguageBox *)a;
 	gf_isom_box_dump_start(a, "ExtendedLanguageBox", trace);
-	fprintf(trace, "LanguageCode=\"%s\">\n", p->extended_language);
+	gf_fprintf(trace, "LanguageCode=\"%s\">\n", p->extended_language);
 	gf_isom_box_dump_done("ExtendedLanguageBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err unkn_dump(GF_Box *a, FILE * trace)
+GF_Err unkn_box_dump(GF_Box *a, FILE * trace)
 {
 	const char *name = "UnknownBox";
 	GF_UnknownBox *u = (GF_UnknownBox *)a;
@@ -1411,96 +1336,101 @@
 	if (u->dataSize && u->dataSize<100)
 		dump_data_attribute(trace, "data", u->data, u->dataSize);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		dump_data_string(NULL, NULL, 0);
+	}
+#endif
 	return GF_OK;
 }
 
-GF_Err uuid_dump(GF_Box *a, FILE * trace)
+GF_Err uuid_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "UUIDBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("UUIDBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err void_dump(GF_Box *a, FILE * trace)
+GF_Err void_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "VoidBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("VoidBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ftyp_dump(GF_Box *a, FILE * trace)
+GF_Err ftyp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_FileTypeBox *p;
 	u32 i;
 
 	p = (GF_FileTypeBox *)a;
 	gf_isom_box_dump_start(a, (a->type == GF_ISOM_BOX_TYPE_FTYP ? "FileTypeBox" : "SegmentTypeBox"), trace);
-	fprintf(trace, "MajorBrand=\"%s\" MinorVersion=\"%d\">\n", gf_4cc_to_str(p->majorBrand), p->minorVersion);
+	gf_fprintf(trace, "MajorBrand=\"%s\" MinorVersion=\"%d\">\n", gf_4cc_to_str(p->majorBrand), p->minorVersion);
 
 	for (i=0; i<p->altCount; i++) {
-		fprintf(trace, "<BrandEntry AlternateBrand=\"%s\"/>\n", gf_4cc_to_str(p->altBrand[i]));
+		gf_fprintf(trace, "<BrandEntry AlternateBrand=\"%s\"/>\n", gf_4cc_to_str(p->altBrand[i]));
 	}
 	if (!p->type) {
-		fprintf(trace, "<BrandEntry AlternateBrand=\"4CC\"/>\n");
+		gf_fprintf(trace, "<BrandEntry AlternateBrand=\"4CC\"/>\n");
 	}
 	gf_isom_box_dump_done((a->type == GF_ISOM_BOX_TYPE_FTYP ? "FileTypeBox" : "SegmentTypeBox"), a, trace);
 	return GF_OK;
 }
 
-GF_Err padb_dump(GF_Box *a, FILE * trace)
+GF_Err padb_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PaddingBitsBox *p;
 	u32 i;
 
 	p = (GF_PaddingBitsBox *)a;
 	gf_isom_box_dump_start(a, "PaddingBitsBox", trace);
-	fprintf(trace, "EntryCount=\"%d\">\n", p->SampleCount);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", p->SampleCount);
 	for (i=0; i<p->SampleCount; i+=1) {
-		fprintf(trace, "<PaddingBitsEntry PaddingBits=\"%d\"/>\n", p->padbits[i]);
+		gf_fprintf(trace, "<PaddingBitsEntry PaddingBits=\"%d\"/>\n", p->padbits[i]);
 	}
 	if (!p->size) {
-		fprintf(trace, "<PaddingBitsEntry PaddingBits=\"\"/>\n");
+		gf_fprintf(trace, "<PaddingBitsEntry PaddingBits=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("PaddingBitsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err gppc_dump(GF_Box *a, FILE * trace)
+GF_Err gppc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_3GPPConfigBox *p = (GF_3GPPConfigBox *)a;
 	switch (p->cfg.type) {
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
 		gf_isom_box_dump_start(a, "AMRConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
-		fprintf(trace, " FramesPerSample=\"%d\" SupportedModes=\"%x\" ModeRotating=\"%d\"", p->cfg.frames_per_sample, p->cfg.AMR_mode_set, p->cfg.AMR_mode_change_period);
-		fprintf(trace, ">\n");
+		gf_fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
+		gf_fprintf(trace, " FramesPerSample=\"%d\" SupportedModes=\"%x\" ModeRotating=\"%d\"", p->cfg.frames_per_sample, p->cfg.AMR_mode_set, p->cfg.AMR_mode_change_period);
+		gf_fprintf(trace, ">\n");
 		gf_isom_box_dump_done("AMRConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_EVRC:
 		gf_isom_box_dump_start(a, "EVRCConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
+		gf_fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("EVRCConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_QCELP:
 		gf_isom_box_dump_start(a, "QCELPConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
+		gf_fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("QCELPConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 		gf_isom_box_dump_start(a, "SMVConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
+		gf_fprintf(trace, "Vendor=\"%s\" Version=\"%d\" FramesPerSample=\"%d\" >\n", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version, p->cfg.frames_per_sample);
 		gf_isom_box_dump_done("SMVConfigurationBox", a, trace);
 		break;
 	case GF_ISOM_SUBTYPE_3GP_H263:
 		gf_isom_box_dump_start(a, "H263ConfigurationBox", trace);
-		fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
-		fprintf(trace, " Profile=\"%d\" Level=\"%d\"", p->cfg.H263_profile, p->cfg.H263_level);
-		fprintf(trace, ">\n");
+		gf_fprintf(trace, "Vendor=\"%s\" Version=\"%d\"", gf_4cc_to_str(p->cfg.vendor), p->cfg.decoder_version);
+		gf_fprintf(trace, " Profile=\"%d\" Level=\"%d\"", p->cfg.H263_profile, p->cfg.H263_level);
+		gf_fprintf(trace, ">\n");
 		gf_isom_box_dump_done("H263ConfigurationBox", a, trace);
 		break;
 	default:
@@ -1510,7 +1440,7 @@
 }
 
 
-GF_Err avcc_dump(GF_Box *a, FILE * trace)
+GF_Err avcc_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, count;
 	GF_AVCConfigurationBox *p = (GF_AVCConfigurationBox *) a;
@@ -1518,76 +1448,76 @@
 	char boxname[256];
 	sprintf(boxname, "%sConfigurationBox", name);
 	gf_isom_box_dump_start(a, boxname, trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
-	fprintf(trace, "<%sDecoderConfigurationRecord", name);
+	gf_fprintf(trace, "<%sDecoderConfigurationRecord", name);
 
 	if (! p->config) {
 		if (p->size) {
-			fprintf(trace, ">\n");
-			fprintf(trace, "\n");
+			gf_fprintf(trace, ">\n");
+			gf_fprintf(trace, "\n");
 		} else {
 
-			fprintf(trace, " configurationVersion=\"\" AVCProfileIndication=\"\" profile_compatibility=\"\" AVCLevelIndication=\"\" nal_unit_size=\"\" complete_representation=\"\"");
+			gf_fprintf(trace, " configurationVersion=\"\" AVCProfileIndication=\"\" profile_compatibility=\"\" AVCLevelIndication=\"\" nal_unit_size=\"\" complete_representation=\"\"");
 
-			fprintf(trace, " chroma_format=\"\" luma_bit_depth=\"\" chroma_bit_depth=\"\"");
-			fprintf(trace, ">\n");
+			gf_fprintf(trace, " chroma_format=\"\" luma_bit_depth=\"\" chroma_bit_depth=\"\"");
+			gf_fprintf(trace, ">\n");
 
-			fprintf(trace, "<SequenceParameterSet size=\"\" content=\"\"/>\n");
-			fprintf(trace, "<PictureParameterSet size=\"\" content=\"\"/>\n");
-			fprintf(trace, "<SequenceParameterSetExtensions size=\"\" content=\"\"/>\n");
+			gf_fprintf(trace, "<SequenceParameterSet size=\"\" content=\"\"/>\n");
+			gf_fprintf(trace, "<PictureParameterSet size=\"\" content=\"\"/>\n");
+			gf_fprintf(trace, "<SequenceParameterSetExtensions size=\"\" content=\"\"/>\n");
 		}
-		fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
+		gf_fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
 		gf_isom_box_dump_done(boxname, a, trace);
 		return GF_OK;
 	}
 
-	fprintf(trace, " configurationVersion=\"%d\" AVCProfileIndication=\"%d\" profile_compatibility=\"%d\" AVCLevelIndication=\"%d\" nal_unit_size=\"%d\"", p->config->configurationVersion, p->config->AVCProfileIndication, p->config->profile_compatibility, p->config->AVCLevelIndication, p->config->nal_unit_size);
+	gf_fprintf(trace, " configurationVersion=\"%d\" AVCProfileIndication=\"%d\" profile_compatibility=\"%d\" AVCLevelIndication=\"%d\" nal_unit_size=\"%d\"", p->config->configurationVersion, p->config->AVCProfileIndication, p->config->profile_compatibility, p->config->AVCLevelIndication, p->config->nal_unit_size);
 
 
 	if ((p->type==GF_ISOM_BOX_TYPE_SVCC) || (p->type==GF_ISOM_BOX_TYPE_MVCC) )
-		fprintf(trace, " complete_representation=\"%d\"", p->config->complete_representation);
+		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)) {
-			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);
+			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);
 		}
 	}
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	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);
-		fprintf(trace, "<SequenceParameterSet size=\"%d\" content=\"", c->size);
+		gf_fprintf(trace, "<SequenceParameterSet size=\"%d\" content=\"", c->size);
 		dump_data(trace, c->data, c->size);
-		fprintf(trace, "\"/>\n");
+		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);
-		fprintf(trace, "<PictureParameterSet size=\"%d\" content=\"", c->size);
+		gf_fprintf(trace, "<PictureParameterSet size=\"%d\" content=\"", c->size);
 		dump_data(trace, c->data, c->size);
-		fprintf(trace, "\"/>\n");
+		gf_fprintf(trace, "\"/>\n");
 	}
 
 	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);
-			fprintf(trace, "<SequenceParameterSetExtensions size=\"%d\" content=\"", c->size);
+			gf_fprintf(trace, "<SequenceParameterSetExtensions size=\"%d\" content=\"", c->size);
 			dump_data(trace, c->data, c->size);
-			fprintf(trace, "\"/>\n");
+			gf_fprintf(trace, "\"/>\n");
 		}
 	}
 
-	fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
+	gf_fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
 
 	gf_isom_box_dump_done(boxname, a, trace);
 	return GF_OK;
 }
 
-GF_Err hvcc_dump(GF_Box *a, FILE * trace)
+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";
@@ -1596,188 +1526,188 @@
 
 	sprintf(boxname, "%sConfigurationBox", name);
 	gf_isom_box_dump_start(a, boxname, trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (! p->config) {
 		if (p->size) {
-			fprintf(trace, "\n");
+			gf_fprintf(trace, "\n");
 		} else {
-			fprintf(trace, "<%sDecoderConfigurationRecord nal_unit_size=\"\" configurationVersion=\"\" ", name);
+			gf_fprintf(trace, "<%sDecoderConfigurationRecord nal_unit_size=\"\" configurationVersion=\"\" ", name);
 			if (a->type==GF_ISOM_BOX_TYPE_HVCC) {
-				fprintf(trace, "profile_space=\"\" tier_flag=\"\" profile_idc=\"\" general_profile_compatibility_flags=\"\" progressive_source_flag=\"\" interlaced_source_flag=\"\" non_packed_constraint_flag=\"\" frame_only_constraint_flag=\"\" constraint_indicator_flags=\"\" level_idc=\"\" ");
+				gf_fprintf(trace, "profile_space=\"\" tier_flag=\"\" profile_idc=\"\" general_profile_compatibility_flags=\"\" progressive_source_flag=\"\" interlaced_source_flag=\"\" non_packed_constraint_flag=\"\" frame_only_constraint_flag=\"\" constraint_indicator_flags=\"\" level_idc=\"\" ");
 			}
-			fprintf(trace, "min_spatial_segmentation_idc=\"\" parallelismType=\"\" ");
+			gf_fprintf(trace, "min_spatial_segmentation_idc=\"\" parallelismType=\"\" ");
 
 			if (a->type==GF_ISOM_BOX_TYPE_HVCC)
-				fprintf(trace, "chroma_format=\"\" luma_bit_depth=\"\" chroma_bit_depth=\"\" avgFrameRate=\"\" constantFrameRate=\"\" numTemporalLayers=\"\" temporalIdNested=\"\"");
+				gf_fprintf(trace, "chroma_format=\"\" luma_bit_depth=\"\" chroma_bit_depth=\"\" avgFrameRate=\"\" constantFrameRate=\"\" numTemporalLayers=\"\" temporalIdNested=\"\"");
 
-			fprintf(trace, ">\n");
-			fprintf(trace, "<ParameterSetArray nalu_type=\"\" complete_set=\"\">\n");
-			fprintf(trace, "<ParameterSet size=\"\" content=\"\"/>\n");
-			fprintf(trace, "</ParameterSetArray>\n");
-			fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
+			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, "</%sDecoderConfigurationRecord>\n", name);
 		}
-		fprintf(trace, "</%sConfigurationBox>\n", name);
+		gf_fprintf(trace, "</%sConfigurationBox>\n", name);
 		return GF_OK;
 	}
 
-	fprintf(trace, "<%sDecoderConfigurationRecord nal_unit_size=\"%d\" ", name, p->config->nal_unit_size);
-	fprintf(trace, "configurationVersion=\"%u\" ", p->config->configurationVersion);
+	gf_fprintf(trace, "<%sDecoderConfigurationRecord nal_unit_size=\"%d\" ", name, p->config->nal_unit_size);
+	gf_fprintf(trace, "configurationVersion=\"%u\" ", p->config->configurationVersion);
 	if (a->type==GF_ISOM_BOX_TYPE_HVCC) {
-		fprintf(trace, "profile_space=\"%u\" ", p->config->profile_space);
-		fprintf(trace, "tier_flag=\"%u\" ", p->config->tier_flag);
-		fprintf(trace, "profile_idc=\"%u\" ", p->config->profile_idc);
-		fprintf(trace, "general_profile_compatibility_flags=\"%X\" ", p->config->general_profile_compatibility_flags);
-		fprintf(trace, "progressive_source_flag=\"%u\" ", p->config->progressive_source_flag);
-		fprintf(trace, "interlaced_source_flag=\"%u\" ", p->config->interlaced_source_flag);
-		fprintf(trace, "non_packed_constraint_flag=\"%u\" ", p->config->non_packed_constraint_flag);
-		fprintf(trace, "frame_only_constraint_flag=\"%u\" ", p->config->frame_only_constraint_flag);
-		fprintf(trace, "constraint_indicator_flags=\""LLX"\" ", p->config->constraint_indicator_flags);
-		fprintf(trace, "level_idc=\"%d\" ", p->config->level_idc);
+		gf_fprintf(trace, "profile_space=\"%u\" ", p->config->profile_space);
+		gf_fprintf(trace, "tier_flag=\"%u\" ", p->config->tier_flag);
+		gf_fprintf(trace, "profile_idc=\"%u\" ", p->config->profile_idc);
+		gf_fprintf(trace, "general_profile_compatibility_flags=\"%X\" ", p->config->general_profile_compatibility_flags);
+		gf_fprintf(trace, "progressive_source_flag=\"%u\" ", p->config->progressive_source_flag);
+		gf_fprintf(trace, "interlaced_source_flag=\"%u\" ", p->config->interlaced_source_flag);
+		gf_fprintf(trace, "non_packed_constraint_flag=\"%u\" ", p->config->non_packed_constraint_flag);
+		gf_fprintf(trace, "frame_only_constraint_flag=\"%u\" ", p->config->frame_only_constraint_flag);
+		gf_fprintf(trace, "constraint_indicator_flags=\""LLX"\" ", p->config->constraint_indicator_flags);
+		gf_fprintf(trace, "level_idc=\"%d\" ", p->config->level_idc);
 	}
-	fprintf(trace, "min_spatial_segmentation_idc=\"%u\" ", p->config->min_spatial_segmentation_idc);
-	fprintf(trace, "parallelismType=\"%u\" ", p->config->parallelismType);
+	gf_fprintf(trace, "min_spatial_segmentation_idc=\"%u\" ", p->config->min_spatial_segmentation_idc);
+	gf_fprintf(trace, "parallelismType=\"%u\" ", p->config->parallelismType);
 
 	if (a->type==GF_ISOM_BOX_TYPE_HVCC)
-		fprintf(trace, "chroma_format=\"%s\" luma_bit_depth=\"%u\" chroma_bit_depth=\"%u\" avgFrameRate=\"%u\" constantFrameRate=\"%u\" numTemporalLayers=\"%u\" temporalIdNested=\"%u\"",
+		gf_fprintf(trace, "chroma_format=\"%s\" luma_bit_depth=\"%u\" chroma_bit_depth=\"%u\" avgFrameRate=\"%u\" constantFrameRate=\"%u\" numTemporalLayers=\"%u\" temporalIdNested=\"%u\"",
 	        gf_avc_hevc_get_chroma_format_name(p->config->chromaFormat), p->config->luma_bit_depth, p->config->chroma_bit_depth, p->config->avgFrameRate, p->config->constantFrameRate, p->config->numTemporalLayers, p->config->temporalIdNested);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	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);
-		fprintf(trace, "<ParameterSetArray nalu_type=\"%d\" complete_set=\"%d\">\n", ar->type, ar->array_completeness);
+		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);
-			fprintf(trace, "<ParameterSet size=\"%d\" content=\"", c->size);
+			gf_fprintf(trace, "<ParameterSet size=\"%d\" content=\"", c->size);
 			dump_data(trace, c->data, c->size);
-			fprintf(trace, "\"/>\n");
+			gf_fprintf(trace, "\"/>\n");
 		}
-		fprintf(trace, "</ParameterSetArray>\n");
+		gf_fprintf(trace, "</ParameterSetArray>\n");
 	}
 
-	fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
+	gf_fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
 
 	gf_isom_box_dump_done(boxname, a, trace);
 	return GF_OK;
 }
 
-GF_Err av1c_dump(GF_Box *a, FILE *trace) {
+GF_Err av1c_box_dump(GF_Box *a, FILE *trace) {
 	GF_AV1ConfigurationBox *ptr = (GF_AV1ConfigurationBox*)a;
-	fprintf(trace, "<AV1ConfigurationBox>\n");
+	gf_fprintf(trace, "<AV1ConfigurationBox>\n");
 	if (ptr->config) {
 		u32 i, obu_count = gf_list_count(ptr->config->obu_array);
 
-		fprintf(trace, "<AV1Config version=\"%u\" profile=\"%u\" level_idx0=\"%u\" tier=\"%u\" ", (u32)ptr->config->version, (u32)ptr->config->seq_profile, (u32)ptr->config->seq_level_idx_0, (u32)ptr->config->seq_tier_0);
-		fprintf(trace, "high_bitdepth=\"%u\" twelve_bit=\"%u\" monochrome=\"%u\" ", (u32)ptr->config->high_bitdepth, (u32)ptr->config->twelve_bit, (u32)ptr->config->monochrome);
-		fprintf(trace, "chroma_subsampling_x=\"%u\" chroma_subsampling_y=\"%u\" chroma_sample_position=\"%u\" ", (u32)ptr->config->chroma_subsampling_x, (u32)ptr->config->chroma_subsampling_y, (u32)ptr->config->chroma_sample_position);
-		fprintf(trace, "initial_presentation_delay=\"%u\" OBUs_count=\"%u\">\n", ptr->config->initial_presentation_delay_minus_one+1, obu_count);
+		gf_fprintf(trace, "<AV1Config version=\"%u\" profile=\"%u\" level_idx0=\"%u\" tier=\"%u\" ", (u32)ptr->config->version, (u32)ptr->config->seq_profile, (u32)ptr->config->seq_level_idx_0, (u32)ptr->config->seq_tier_0);
+		gf_fprintf(trace, "high_bitdepth=\"%u\" twelve_bit=\"%u\" monochrome=\"%u\" ", (u32)ptr->config->high_bitdepth, (u32)ptr->config->twelve_bit, (u32)ptr->config->monochrome);
+		gf_fprintf(trace, "chroma_subsampling_x=\"%u\" chroma_subsampling_y=\"%u\" chroma_sample_position=\"%u\" ", (u32)ptr->config->chroma_subsampling_x, (u32)ptr->config->chroma_subsampling_y, (u32)ptr->config->chroma_sample_position);
+		gf_fprintf(trace, "initial_presentation_delay=\"%u\" OBUs_count=\"%u\">\n", ptr->config->initial_presentation_delay_minus_one+1, obu_count);
 
 		for (i=0; i<obu_count; i++) {
-			GF_AV1_OBUArrayEntry *a = gf_list_get(ptr->config->obu_array, i);
-			fprintf(trace, "<OBU type=\"%d\" name=\"%s\" size=\"%d\" content=\"", a->obu_type, av1_get_obu_name(a->obu_type), (u32) a->obu_length);
-			dump_data(trace, (char *)a->obu, (u32) a->obu_length);
-			fprintf(trace, "\"/>\n");
+			GF_AV1_OBUArrayEntry *obu_a = gf_list_get(ptr->config->obu_array, i);
+			gf_fprintf(trace, "<OBU type=\"%d\" name=\"%s\" size=\"%d\" content=\"", obu_a->obu_type, gf_av1_get_obu_name(obu_a->obu_type), (u32) obu_a->obu_length);
+			dump_data(trace, (char *)obu_a->obu, (u32) obu_a->obu_length);
+			gf_fprintf(trace, "\"/>\n");
 		}
-		fprintf(trace, "</AV1Config>\n");
+		gf_fprintf(trace, "</AV1Config>\n");
 	}
-	fprintf(trace, "</AV1ConfigurationBox>\n");
+	gf_fprintf(trace, "</AV1ConfigurationBox>\n");
 	return GF_OK;
 }
 
 
-GF_Err vpcc_dump(GF_Box *a, FILE *trace) {
+GF_Err vpcc_box_dump(GF_Box *a, FILE *trace) {
 	GF_VPConfigurationBox *ptr = (GF_VPConfigurationBox*)a;
-	fprintf(trace, "<VPConfigurationBox>\n");
+	gf_fprintf(trace, "<VPConfigurationBox>\n");
 	if (ptr->config) {
-		fprintf(trace, "<VPConfig");
+		gf_fprintf(trace, "<VPConfig");
 
-		fprintf(trace, " profile=\"%u\"", ptr->config->profile);
-		fprintf(trace, " level=\"%u\"", ptr->config->level);
-		fprintf(trace, " bit_depth=\"%u\"", ptr->config->bit_depth);
-		fprintf(trace, " chroma_subsampling=\"%u\"", ptr->config->chroma_subsampling);
-		fprintf(trace, " video_fullRange_flag=\"%u\"", ptr->config->video_fullRange_flag);
-		fprintf(trace, " colour_primaries=\"%u\"", ptr->config->colour_primaries);
-		fprintf(trace, " transfer_characteristics=\"%u\"", ptr->config->transfer_characteristics);
-		fprintf(trace, " matrix_coefficients=\"%u\"", ptr->config->matrix_coefficients);
-		fprintf(trace, " codec_initdata_size=\"%u\"", ptr->config->codec_initdata_size);
+		gf_fprintf(trace, " profile=\"%u\"", ptr->config->profile);
+		gf_fprintf(trace, " level=\"%u\"", ptr->config->level);
+		gf_fprintf(trace, " bit_depth=\"%u\"", ptr->config->bit_depth);
+		gf_fprintf(trace, " chroma_subsampling=\"%u\"", ptr->config->chroma_subsampling);
+		gf_fprintf(trace, " video_fullRange_flag=\"%u\"", ptr->config->video_fullRange_flag);
+		gf_fprintf(trace, " colour_primaries=\"%u\"", ptr->config->colour_primaries);
+		gf_fprintf(trace, " transfer_characteristics=\"%u\"", ptr->config->transfer_characteristics);
+		gf_fprintf(trace, " matrix_coefficients=\"%u\"", ptr->config->matrix_coefficients);
+		gf_fprintf(trace, " codec_initdata_size=\"%u\"", ptr->config->codec_initdata_size);
 
-		fprintf(trace, ">\n</VPConfig>\n");
+		gf_fprintf(trace, ">\n</VPConfig>\n");
 	}
-	fprintf(trace, "</VPConfigurationBox>\n");
+	gf_fprintf(trace, "</VPConfigurationBox>\n");
 	return GF_OK;
 }
 
-GF_Err SmDm_dump(GF_Box *a, FILE *trace) {
+GF_Err SmDm_box_dump(GF_Box *a, FILE *trace) {
 	GF_SMPTE2086MasteringDisplayMetadataBox * ptr = (GF_SMPTE2086MasteringDisplayMetadataBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "SMPTE2086MasteringDisplayMetadataBox", trace);
-	fprintf(trace, "primaryRChromaticity_x=\"%u\" ", ptr->primaryRChromaticity_x);
-	fprintf(trace, "primaryRChromaticity_y=\"%u\" ", ptr->primaryRChromaticity_y);
-	fprintf(trace, "primaryGChromaticity_x=\"%u\" ", ptr->primaryGChromaticity_x);
-	fprintf(trace, "primaryGChromaticity_y=\"%u\" ", ptr->primaryGChromaticity_y);
-	fprintf(trace, "primaryBChromaticity_x=\"%u\" ", ptr->primaryBChromaticity_x);
-	fprintf(trace, "primaryBChromaticity_y=\"%u\" ", ptr->primaryBChromaticity_y);
-	fprintf(trace, "whitePointChromaticity_x=\"%u\" ", ptr->whitePointChromaticity_x);
-	fprintf(trace, "whitePointChromaticity_y=\"%u\" ", ptr->whitePointChromaticity_y);
-	fprintf(trace, "luminanceMax=\"%u\" ", ptr->luminanceMax);
-	fprintf(trace, "luminanceMin=\"%u\">\n", ptr->luminanceMin);
+	gf_fprintf(trace, "primaryRChromaticity_x=\"%u\" ", ptr->primaryRChromaticity_x);
+	gf_fprintf(trace, "primaryRChromaticity_y=\"%u\" ", ptr->primaryRChromaticity_y);
+	gf_fprintf(trace, "primaryGChromaticity_x=\"%u\" ", ptr->primaryGChromaticity_x);
+	gf_fprintf(trace, "primaryGChromaticity_y=\"%u\" ", ptr->primaryGChromaticity_y);
+	gf_fprintf(trace, "primaryBChromaticity_x=\"%u\" ", ptr->primaryBChromaticity_x);
+	gf_fprintf(trace, "primaryBChromaticity_y=\"%u\" ", ptr->primaryBChromaticity_y);
+	gf_fprintf(trace, "whitePointChromaticity_x=\"%u\" ", ptr->whitePointChromaticity_x);
+	gf_fprintf(trace, "whitePointChromaticity_y=\"%u\" ", ptr->whitePointChromaticity_y);
+	gf_fprintf(trace, "luminanceMax=\"%u\" ", ptr->luminanceMax);
+	gf_fprintf(trace, "luminanceMin=\"%u\">\n", ptr->luminanceMin);
 	gf_isom_box_dump_done("SMPTE2086MasteringDisplayMetadataBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err CoLL_dump(GF_Box *a, FILE *trace) {
+GF_Err CoLL_box_dump(GF_Box *a, FILE *trace) {
 	GF_VPContentLightLevelBox * ptr = (GF_VPContentLightLevelBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "VPContentLightLevelBox", trace);
-	fprintf(trace, "maxCLL=\"%u\" maxFALL=\"%u\">\n", ptr->maxCLL, ptr->maxFALL);
+	gf_fprintf(trace, "maxCLL=\"%u\" maxFALL=\"%u\">\n", ptr->maxCLL, ptr->maxFALL);
 	gf_isom_box_dump_done("VPContentLightLevelBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err m4ds_dump(GF_Box *a, FILE * trace)
+GF_Err m4ds_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_Descriptor *desc;
 	GF_MPEG4ExtensionDescriptorsBox *p = (GF_MPEG4ExtensionDescriptorsBox *) a;
 	gf_isom_box_dump_start(a, "MPEG4ExtensionDescriptorsBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	i=0;
 	while ((desc = (GF_Descriptor *)gf_list_enum(p->descriptors, &i))) {
 #ifndef GPAC_DISABLE_OD_DUMP
 		gf_odf_dump_desc(desc, trace, 1, GF_TRUE);
 #else
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 #endif
 	}
 	gf_isom_box_dump_done("MPEG4ExtensionDescriptorsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err btrt_dump(GF_Box *a, FILE * trace)
+GF_Err btrt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_BitRateBox *p = (GF_BitRateBox*)a;
 	gf_isom_box_dump_start(a, "BitRateBox", trace);
-	fprintf(trace, "BufferSizeDB=\"%d\" avgBitRate=\"%d\" maxBitRate=\"%d\">\n", p->bufferSizeDB, p->avgBitrate, p->maxBitrate);
+	gf_fprintf(trace, "BufferSizeDB=\"%d\" avgBitRate=\"%d\" maxBitRate=\"%d\">\n", p->bufferSizeDB, p->avgBitrate, p->maxBitrate);
 	gf_isom_box_dump_done("BitRateBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ftab_dump(GF_Box *a, FILE * trace)
+GF_Err ftab_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_FontTableBox *p = (GF_FontTableBox *)a;
 	gf_isom_box_dump_start(a, "FontTableBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<p->entry_count; i++) {
-		fprintf(trace, "<FontRecord ID=\"%d\" name=\"%s\"/>\n", p->fonts[i].fontID, p->fonts[i].fontName ? p->fonts[i].fontName : "NULL");
+		gf_fprintf(trace, "<FontRecord ID=\"%d\" name=\"%s\"/>\n", p->fonts[i].fontID, p->fonts[i].fontName ? p->fonts[i].fontName : "NULL");
 	}
 	if (!p->size) {
-		fprintf(trace, "<FontRecord ID=\"\" name=\"\"/>\n");
+		gf_fprintf(trace, "<FontRecord ID=\"\" name=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("FontTableBox", a, trace);
 	return GF_OK;
@@ -1785,511 +1715,490 @@
 
 static void tx3g_dump_rgba8(FILE * trace, char *name, u32 col)
 {
-	fprintf(trace, "%s=\"%x %x %x %x\"", name, (col>>16)&0xFF, (col>>8)&0xFF, (col)&0xFF, (col>>24)&0xFF);
+	gf_fprintf(trace, "%s=\"%x %x %x %x\"", name, (col>>16)&0xFF, (col>>8)&0xFF, (col)&0xFF, (col>>24)&0xFF);
 }
 static void tx3g_dump_rgb16(FILE * trace, char *name, char col[6])
 {
-	fprintf(trace, "%s=\"%x %x %x\"", name, *((u16*)col), *((u16*)(col+1)), *((u16*)(col+2)));
+	gf_fprintf(trace, "%s=\"%x %x %x\"", name, *((u16*)col), *((u16*)(col+2)), *((u16*)(col+4)));
 }
 static void tx3g_dump_box(FILE * trace, GF_BoxRecord *rec)
 {
-	fprintf(trace, "<BoxRecord top=\"%d\" left=\"%d\" bottom=\"%d\" right=\"%d\"/>\n", rec->top, rec->left, rec->bottom, rec->right);
+	gf_fprintf(trace, "<BoxRecord top=\"%d\" left=\"%d\" bottom=\"%d\" right=\"%d\"/>\n", rec->top, rec->left, rec->bottom, rec->right);
 }
 static void tx3g_dump_style(FILE * trace, GF_StyleRecord *rec)
 {
-	fprintf(trace, "<StyleRecord startChar=\"%d\" endChar=\"%d\" fontID=\"%d\" styles=\"", rec->startCharOffset, rec->endCharOffset, rec->fontID);
+	gf_fprintf(trace, "<StyleRecord startChar=\"%d\" endChar=\"%d\" fontID=\"%d\" styles=\"", rec->startCharOffset, rec->endCharOffset, rec->fontID);
 	if (!rec->style_flags) {
-		fprintf(trace, "Normal");
+		gf_fprintf(trace, "Normal");
 	} else {
-		if (rec->style_flags & 1) fprintf(trace, "Bold ");
-		if (rec->style_flags & 2) fprintf(trace, "Italic ");
-		if (rec->style_flags & 4) fprintf(trace, "Underlined ");
+		if (rec->style_flags & 1) gf_fprintf(trace, "Bold ");
+		if (rec->style_flags & 2) gf_fprintf(trace, "Italic ");
+		if (rec->style_flags & 4) gf_fprintf(trace, "Underlined ");
 	}
-	fprintf(trace, "\" fontSize=\"%d\" ", rec->font_size);
+	gf_fprintf(trace, "\" fontSize=\"%d\" ", rec->font_size);
 	tx3g_dump_rgba8(trace, "textColor", rec->text_color);
-	fprintf(trace, "/>\n");
+	gf_fprintf(trace, "/>\n");
 }
 
-GF_Err tx3g_dump(GF_Box *a, FILE * trace)
+GF_Err tx3g_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_Tx3gSampleEntryBox *p = (GF_Tx3gSampleEntryBox *)a;
 	gf_isom_box_dump_start(a, "Tx3gSampleEntryBox", trace);
-	fprintf(trace, "dataReferenceIndex=\"%d\" displayFlags=\"%x\" horizontal-justification=\"%d\" vertical-justification=\"%d\" ",
+	gf_fprintf(trace, "dataReferenceIndex=\"%d\" displayFlags=\"%x\" horizontal-justification=\"%d\" vertical-justification=\"%d\" ",
 	        p->dataReferenceIndex, p->displayFlags, p->horizontal_justification, p->vertical_justification);
 
 	tx3g_dump_rgba8(trace, "backgroundColor", p->back_color);
-	fprintf(trace, ">\n");
-	fprintf(trace, "<DefaultBox>\n");
+	gf_fprintf(trace, ">\n");
+	gf_fprintf(trace, "<DefaultBox>\n");
 	tx3g_dump_box(trace, &p->default_box);
 
-	fprintf(trace, "<DefaultStyle>\n");
+	gf_fprintf(trace, "<DefaultStyle>\n");
 	tx3g_dump_style(trace, &p->default_style);
-	fprintf(trace, "</DefaultStyle>\n");
-	if (p->size) {
-		gf_isom_box_dump_ex(p->font_table, trace, GF_ISOM_BOX_TYPE_FTAB);
-	}
+	gf_fprintf(trace, "</DefaultStyle>\n");
 	gf_isom_box_dump_done("Tx3gSampleEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err text_dump(GF_Box *a, FILE * trace)
+GF_Err text_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextSampleEntryBox *p = (GF_TextSampleEntryBox *)a;
 	gf_isom_box_dump_start(a, "TextSampleEntryBox", trace);
-	fprintf(trace, "dataReferenceIndex=\"%d\" displayFlags=\"%x\" textJustification=\"%d\"  ",
+	gf_fprintf(trace, "dataReferenceIndex=\"%d\" displayFlags=\"%x\" textJustification=\"%d\"  ",
 	        p->dataReferenceIndex, p->displayFlags, p->textJustification);
 	if (p->textName)
-		fprintf(trace, "textName=\"%s\" ", p->textName);
+		gf_fprintf(trace, "textName=\"%s\" ", p->textName);
 	tx3g_dump_rgb16(trace, "background-color", p->background_color);
 	tx3g_dump_rgb16(trace, " foreground-color", p->foreground_color);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
-	fprintf(trace, "<DefaultBox>\n");
+	gf_fprintf(trace, "<DefaultBox>\n");
 	tx3g_dump_box(trace, &p->default_box);
 	gf_isom_box_dump_done("DefaultBox", a, trace);
 	gf_isom_box_dump_done("TextSampleEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err styl_dump(GF_Box *a, FILE * trace)
+GF_Err styl_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TextStyleBox*p = (GF_TextStyleBox*)a;
 	gf_isom_box_dump_start(a, "TextStyleBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<p->entry_count; i++) tx3g_dump_style(trace, &p->styles[i]);
 	if (!p->size) {
-		fprintf(trace, "<StyleRecord startChar=\"\" endChar=\"\" fontID=\"\" styles=\"Normal|Bold|Italic|Underlined\" fontSize=\"\" textColor=\"\" />\n");
+		gf_fprintf(trace, "<StyleRecord startChar=\"\" endChar=\"\" fontID=\"\" styles=\"Normal|Bold|Italic|Underlined\" fontSize=\"\" textColor=\"\" />\n");
 	}
 	gf_isom_box_dump_done("TextStyleBox", a, trace);
 	return GF_OK;
 }
-GF_Err hlit_dump(GF_Box *a, FILE * trace)
+GF_Err hlit_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextHighlightBox*p = (GF_TextHighlightBox*)a;
 	gf_isom_box_dump_start(a, "TextHighlightBox", trace);
-	fprintf(trace, "startcharoffset=\"%d\" endcharoffset=\"%d\">\n", p->startcharoffset, p->endcharoffset);
+	gf_fprintf(trace, "startcharoffset=\"%d\" endcharoffset=\"%d\">\n", p->startcharoffset, p->endcharoffset);
 	gf_isom_box_dump_done("TextHighlightBox", a, trace);
 	return GF_OK;
 }
-GF_Err hclr_dump(GF_Box *a, FILE * trace)
+GF_Err hclr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextHighlightColorBox*p = (GF_TextHighlightColorBox*)a;
 	gf_isom_box_dump_start(a, "TextHighlightColorBox", trace);
 	tx3g_dump_rgba8(trace, "highlight_color", p->hil_color);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("TextHighlightColorBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err krok_dump(GF_Box *a, FILE * trace)
+GF_Err krok_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TextKaraokeBox*p = (GF_TextKaraokeBox*)a;
 	gf_isom_box_dump_start(a, "TextKaraokeBox", trace);
-	fprintf(trace, "highlight_starttime=\"%d\">\n", p->highlight_starttime);
+	gf_fprintf(trace, "highlight_starttime=\"%d\">\n", p->highlight_starttime);
 	for (i=0; i<p->nb_entries; i++) {
-		fprintf(trace, "<KaraokeRecord highlight_endtime=\"%d\" start_charoffset=\"%d\" end_charoffset=\"%d\"/>\n", p->records[i].highlight_endtime, p->records[i].start_charoffset, p->records[i].end_charoffset);
+		gf_fprintf(trace, "<KaraokeRecord highlight_endtime=\"%d\" start_charoffset=\"%d\" end_charoffset=\"%d\"/>\n", p->records[i].highlight_endtime, p->records[i].start_charoffset, p->records[i].end_charoffset);
 	}
 	if (!p->size) {
-		fprintf(trace, "<KaraokeRecord highlight_endtime=\"\" start_charoffset=\"\" end_charoffset=\"\"/>\n");
+		gf_fprintf(trace, "<KaraokeRecord highlight_endtime=\"\" start_charoffset=\"\" end_charoffset=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("TextKaraokeBox", a, trace);
 	return GF_OK;
 }
-GF_Err dlay_dump(GF_Box *a, FILE * trace)
+GF_Err dlay_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextScrollDelayBox*p = (GF_TextScrollDelayBox*)a;
 	gf_isom_box_dump_start(a, "TextScrollDelayBox", trace);
-	fprintf(trace, "scroll_delay=\"%d\">\n", p->scroll_delay);
+	gf_fprintf(trace, "scroll_delay=\"%d\">\n", p->scroll_delay);
 	gf_isom_box_dump_done("TextScrollDelayBox", a, trace);
 	return GF_OK;
 }
-GF_Err href_dump(GF_Box *a, FILE * trace)
+GF_Err href_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextHyperTextBox*p = (GF_TextHyperTextBox*)a;
 	gf_isom_box_dump_start(a, "TextHyperTextBox", trace);
-	fprintf(trace, "startcharoffset=\"%d\" endcharoffset=\"%d\" URL=\"%s\" altString=\"%s\">\n", p->startcharoffset, p->endcharoffset, p->URL ? p->URL : "NULL", p->URL_hint ? p->URL_hint : "NULL");
+	gf_fprintf(trace, "startcharoffset=\"%d\" endcharoffset=\"%d\" URL=\"%s\" altString=\"%s\">\n", p->startcharoffset, p->endcharoffset, p->URL ? p->URL : "NULL", p->URL_hint ? p->URL_hint : "NULL");
 	gf_isom_box_dump_done("TextHyperTextBox", a, trace);
 	return GF_OK;
 }
-GF_Err tbox_dump(GF_Box *a, FILE * trace)
+GF_Err tbox_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextBoxBox*p = (GF_TextBoxBox*)a;
 	gf_isom_box_dump_start(a, "TextBoxBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	tx3g_dump_box(trace, &p->box);
 	gf_isom_box_dump_done("TextBoxBox", a, trace);
 	return GF_OK;
 }
-GF_Err blnk_dump(GF_Box *a, FILE * trace)
+GF_Err blnk_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextBlinkBox*p = (GF_TextBlinkBox*)a;
 	gf_isom_box_dump_start(a, "TextBlinkBox", trace);
-	fprintf(trace, "start_charoffset=\"%d\" end_charoffset=\"%d\">\n", p->startcharoffset, p->endcharoffset);
+	gf_fprintf(trace, "start_charoffset=\"%d\" end_charoffset=\"%d\">\n", p->startcharoffset, p->endcharoffset);
 	gf_isom_box_dump_done("TextBlinkBox", a, trace);
 	return GF_OK;
 }
-GF_Err twrp_dump(GF_Box *a, FILE * trace)
+GF_Err twrp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextWrapBox*p = (GF_TextWrapBox*)a;
 	gf_isom_box_dump_start(a, "TextWrapBox", trace);
-	fprintf(trace, "wrap_flag=\"%s\">\n", p->wrap_flag ? ( (p->wrap_flag>1) ? "Reserved" : "Automatic" ) : "No Wrap");
+	gf_fprintf(trace, "wrap_flag=\"%s\">\n", p->wrap_flag ? ( (p->wrap_flag>1) ? "Reserved" : "Automatic" ) : "No Wrap");
 	gf_isom_box_dump_done("TextWrapBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err meta_dump(GF_Box *a, FILE * trace)
+GF_Err meta_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MetaBox *p;
-	p = (GF_MetaBox *)a;
 	gf_isom_box_dump_start(a, "MetaBox", trace);
-	fprintf(trace, ">\n");
-
-	if (p->handler) gf_isom_box_dump(p->handler, trace);
-	if (p->primary_resource) gf_isom_box_dump(p->primary_resource, trace);
-	if (p->file_locations) gf_isom_box_dump(p->file_locations, trace);
-	if (p->item_locations) gf_isom_box_dump(p->item_locations, trace);
-	if (p->protections) gf_isom_box_dump(p->protections, trace);
-	if (p->item_infos) gf_isom_box_dump(p->item_infos, trace);
-	if (p->IPMP_control) gf_isom_box_dump(p->IPMP_control, trace);
-	if (p->item_refs) gf_isom_box_dump(p->item_refs, trace);
-	if (p->item_props) gf_isom_box_dump(p->item_props, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MetaBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err xml_dump(GF_Box *a, FILE * trace)
+GF_Err xml_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_XMLBox *p = (GF_XMLBox *)a;
 	gf_isom_box_dump_start(a, "XMLBox", trace);
-	fprintf(trace, ">\n");
-	fprintf(trace, "<![CDATA[\n");
+	gf_fprintf(trace, ">\n");
+	gf_fprintf(trace, "<![CDATA[\n");
 	if (p->xml)
-		gf_fwrite(p->xml, strlen(p->xml), 1, trace);
-	fprintf(trace, "]]>\n");
+		gf_fwrite(p->xml, strlen(p->xml), trace);
+	gf_fprintf(trace, "]]>\n");
 	gf_isom_box_dump_done("XMLBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err bxml_dump(GF_Box *a, FILE * trace)
+GF_Err bxml_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_BinaryXMLBox *p = (GF_BinaryXMLBox *)a;
 	gf_isom_box_dump_start(a, "BinaryXMLBox", trace);
-	fprintf(trace, "binarySize=\"%d\">\n", p->data_length);
+	gf_fprintf(trace, "binarySize=\"%d\">\n", p->data_length);
 	gf_isom_box_dump_done("BinaryXMLBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err pitm_dump(GF_Box *a, FILE * trace)
+GF_Err pitm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PrimaryItemBox *p = (GF_PrimaryItemBox *)a;
 	gf_isom_box_dump_start(a, "PrimaryItemBox", trace);
-	fprintf(trace, "item_ID=\"%d\">\n", p->item_ID);
+	gf_fprintf(trace, "item_ID=\"%d\">\n", p->item_ID);
 	gf_isom_box_dump_done("PrimaryItemBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ipro_dump(GF_Box *a, FILE * trace)
+GF_Err ipro_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ItemProtectionBox *p = (GF_ItemProtectionBox *)a;
 	gf_isom_box_dump_start(a, "ItemProtectionBox", trace);
-	fprintf(trace, ">\n");
-	gf_isom_box_array_dump(p->protection_information, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ItemProtectionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err infe_dump(GF_Box *a, FILE * trace)
+GF_Err infe_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ItemInfoEntryBox *p = (GF_ItemInfoEntryBox *)a;
 	gf_isom_box_dump_start(a, "ItemInfoEntryBox", trace);
-	fprintf(trace, "item_ID=\"%d\" item_protection_index=\"%d\" item_name=\"%s\" content_type=\"%s\" content_encoding=\"%s\" item_type=\"%s\">\n", p->item_ID, p->item_protection_index, p->item_name, p->content_type, p->content_encoding, gf_4cc_to_str(p->item_type));
+	gf_fprintf(trace, "item_ID=\"%d\" item_protection_index=\"%d\" item_name=\"%s\" content_type=\"%s\" content_encoding=\"%s\" item_type=\"%s\">\n", p->item_ID, p->item_protection_index, p->item_name, p->content_type, p->content_encoding, gf_4cc_to_str(p->item_type));
 	gf_isom_box_dump_done("ItemInfoEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iinf_dump(GF_Box *a, FILE * trace)
+GF_Err iinf_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ItemInfoBox *p = (GF_ItemInfoBox *)a;
 	gf_isom_box_dump_start(a, "ItemInfoBox", trace);
-	fprintf(trace, ">\n");
-	gf_isom_box_array_dump(p->item_infos, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ItemInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iloc_dump(GF_Box *a, FILE * trace)
+GF_Err iloc_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, j, count, count2;
 	GF_ItemLocationBox *p = (GF_ItemLocationBox*)a;
 	gf_isom_box_dump_start(a, "ItemLocationBox", trace);
-	fprintf(trace, "offset_size=\"%d\" length_size=\"%d\" base_offset_size=\"%d\" index_size=\"%d\">\n", p->offset_size, p->length_size, p->base_offset_size, p->index_size);
+	gf_fprintf(trace, "offset_size=\"%d\" length_size=\"%d\" base_offset_size=\"%d\" index_size=\"%d\">\n", p->offset_size, p->length_size, p->base_offset_size, p->index_size);
 	count = gf_list_count(p->location_entries);
 	for (i=0; i<count; i++) {
 		GF_ItemLocationEntry *ie = (GF_ItemLocationEntry *)gf_list_get(p->location_entries, i);
 		count2 = gf_list_count(ie->extent_entries);
-		fprintf(trace, "<ItemLocationEntry item_ID=\"%d\" data_reference_index=\"%d\" base_offset=\""LLD"\" construction_method=\"%d\">\n", ie->item_ID, ie->data_reference_index, LLD_CAST ie->base_offset, ie->construction_method);
+		gf_fprintf(trace, "<ItemLocationEntry item_ID=\"%d\" data_reference_index=\"%d\" base_offset=\""LLD"\" construction_method=\"%d\">\n", ie->item_ID, ie->data_reference_index, ie->base_offset, ie->construction_method);
 		for (j=0; j<count2; j++) {
 			GF_ItemExtentEntry *iee = (GF_ItemExtentEntry *)gf_list_get(ie->extent_entries, j);
-			fprintf(trace, "<ItemExtentEntry extent_offset=\""LLD"\" extent_length=\""LLD"\" extent_index=\""LLD"\" />\n", LLD_CAST iee->extent_offset, LLD_CAST iee->extent_length, LLD_CAST iee->extent_index);
+			gf_fprintf(trace, "<ItemExtentEntry extent_offset=\""LLD"\" extent_length=\""LLD"\" extent_index=\""LLD"\" />\n", iee->extent_offset, iee->extent_length, iee->extent_index);
 		}
-		fprintf(trace, "</ItemLocationEntry>\n");
+		gf_fprintf(trace, "</ItemLocationEntry>\n");
 	}
 	if (!p->size) {
-		fprintf(trace, "<ItemLocationEntry item_ID=\"\" data_reference_index=\"\" base_offset=\"\" construction_method=\"\">\n");
-		fprintf(trace, "<ItemExtentEntry extent_offset=\"\" extent_length=\"\" extent_index=\"\" />\n");
-		fprintf(trace, "</ItemLocationEntry>\n");
+		gf_fprintf(trace, "<ItemLocationEntry item_ID=\"\" data_reference_index=\"\" base_offset=\"\" construction_method=\"\">\n");
+		gf_fprintf(trace, "<ItemExtentEntry extent_offset=\"\" extent_length=\"\" extent_index=\"\" />\n");
+		gf_fprintf(trace, "</ItemLocationEntry>\n");
 	}
 	gf_isom_box_dump_done("ItemLocationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iref_dump(GF_Box *a, FILE * trace)
+GF_Err iref_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ItemReferenceBox *p = (GF_ItemReferenceBox *)a;
 	gf_isom_box_dump_start(a, "ItemReferenceBox", trace);
-	fprintf(trace, ">\n");
-	gf_isom_box_array_dump(p->references, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ItemReferenceBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err hinf_dump(GF_Box *a, FILE * trace)
+GF_Err hinf_box_dump(GF_Box *a, FILE * trace)
 {
 //	GF_HintInfoBox *p  = (GF_HintInfoBox *)a;
 	gf_isom_box_dump_start(a, "HintInfoBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("HintInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trpy_dump(GF_Box *a, FILE * trace)
+GF_Err trpy_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TRPYBox *p = (GF_TRPYBox *)a;
 	gf_isom_box_dump_start(a, "LargeTotalRTPBytesBox", trace);
-	fprintf(trace, "RTPBytesSent=\""LLD"\">\n", LLD_CAST p->nbBytes);
+	gf_fprintf(trace, "RTPBytesSent=\""LLD"\">\n", p->nbBytes);
 	gf_isom_box_dump_done("LargeTotalRTPBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err totl_dump(GF_Box *a, FILE * trace)
+GF_Err totl_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TOTLBox *p;
 
 	p = (GF_TOTLBox *)a;
 	gf_isom_box_dump_start(a, "TotalRTPBytesBox", trace);
-	fprintf(trace, "RTPBytesSent=\"%d\">\n", p->nbBytes);
+	gf_fprintf(trace, "RTPBytesSent=\"%d\">\n", p->nbBytes);
 	gf_isom_box_dump_done("TotalRTPBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err nump_dump(GF_Box *a, FILE * trace)
+GF_Err nump_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_NUMPBox *p;
 
 	p = (GF_NUMPBox *)a;
 	gf_isom_box_dump_start(a, "LargeTotalPacketBox", trace);
-	fprintf(trace, "PacketsSent=\""LLD"\">\n", LLD_CAST p->nbPackets);
+	gf_fprintf(trace, "PacketsSent=\""LLD"\">\n", p->nbPackets);
 	gf_isom_box_dump_done("LargeTotalPacketBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err npck_dump(GF_Box *a, FILE * trace)
+GF_Err npck_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_NPCKBox *p;
 	p = (GF_NPCKBox *)a;
 	gf_isom_box_dump_start(a, "TotalPacketBox", trace);
-	fprintf(trace, "packetsSent=\"%d\">\n", p->nbPackets);
+	gf_fprintf(trace, "packetsSent=\"%d\">\n", p->nbPackets);
 	gf_isom_box_dump_done("TotalPacketBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tpyl_dump(GF_Box *a, FILE * trace)
+GF_Err tpyl_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_NTYLBox *p;
 	p = (GF_NTYLBox *)a;
 	gf_isom_box_dump_start(a, "LargeTotalMediaBytesBox", trace);
-	fprintf(trace, "BytesSent=\""LLD"\">\n", LLD_CAST p->nbBytes);
+	gf_fprintf(trace, "BytesSent=\""LLD"\">\n", p->nbBytes);
 	gf_isom_box_dump_done("LargeTotalMediaBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tpay_dump(GF_Box *a, FILE * trace)
+GF_Err tpay_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TPAYBox *p;
 	p = (GF_TPAYBox *)a;
 	gf_isom_box_dump_start(a, "TotalMediaBytesBox", trace);
-	fprintf(trace, "BytesSent=\"%d\">\n", p->nbBytes);
+	gf_fprintf(trace, "BytesSent=\"%d\">\n", p->nbBytes);
 	gf_isom_box_dump_done("TotalMediaBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err maxr_dump(GF_Box *a, FILE * trace)
+GF_Err maxr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MAXRBox *p;
 	p = (GF_MAXRBox *)a;
 	gf_isom_box_dump_start(a, "MaxDataRateBox", trace);
-	fprintf(trace, "MaxDataRate=\"%d\" Granularity=\"%d\">\n", p->maxDataRate, p->granularity);
+	gf_fprintf(trace, "MaxDataRate=\"%d\" Granularity=\"%d\">\n", p->maxDataRate, p->granularity);
 	gf_isom_box_dump_done("MaxDataRateBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dmed_dump(GF_Box *a, FILE * trace)
+GF_Err dmed_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DMEDBox *p;
 
 	p = (GF_DMEDBox *)a;
 	gf_isom_box_dump_start(a, "BytesFromMediaTrackBox", trace);
-	fprintf(trace, "BytesSent=\""LLD"\">\n", LLD_CAST p->nbBytes);
+	gf_fprintf(trace, "BytesSent=\""LLD"\">\n", p->nbBytes);
 	gf_isom_box_dump_done("BytesFromMediaTrackBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dimm_dump(GF_Box *a, FILE * trace)
+GF_Err dimm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DIMMBox *p;
 	p = (GF_DIMMBox *)a;
 	gf_isom_box_dump_start(a, "ImmediateDataBytesBox", trace);
-	fprintf(trace, "BytesSent=\""LLD"\">\n", LLD_CAST p->nbBytes);
+	gf_fprintf(trace, "BytesSent=\""LLD"\">\n", p->nbBytes);
 	gf_isom_box_dump_done("ImmediateDataBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err drep_dump(GF_Box *a, FILE * trace)
+GF_Err drep_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DREPBox *p;
 	p = (GF_DREPBox *)a;
 	gf_isom_box_dump_start(a, "RepeatedDataBytesBox", trace);
-	fprintf(trace, "RepeatedBytes=\""LLD"\">\n", LLD_CAST p->nbBytes);
+	gf_fprintf(trace, "RepeatedBytes=\""LLD"\">\n", p->nbBytes);
 	gf_isom_box_dump_done("RepeatedDataBytesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tssy_dump(GF_Box *a, FILE * trace)
+GF_Err tssy_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeStampSynchronyBox *p = (GF_TimeStampSynchronyBox *)a;
 	gf_isom_box_dump_start(a, "TimeStampSynchronyBox", trace);
-	fprintf(trace, "timestamp_sync=\"%d\">\n", p->timestamp_sync);
+	gf_fprintf(trace, "timestamp_sync=\"%d\">\n", p->timestamp_sync);
 	gf_isom_box_dump_done("TimeStampSynchronyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err rssr_dump(GF_Box *a, FILE * trace)
+GF_Err rssr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ReceivedSsrcBox *p = (GF_ReceivedSsrcBox *)a;
 	gf_isom_box_dump_start(a, "ReceivedSsrcBox", trace);
-	fprintf(trace, "SSRC=\"%d\">\n", p->ssrc);
+	gf_fprintf(trace, "SSRC=\"%d\">\n", p->ssrc);
 	gf_isom_box_dump_done("ReceivedSsrcBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tmin_dump(GF_Box *a, FILE * trace)
+GF_Err tmin_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TMINBox *p;
 	p = (GF_TMINBox *)a;
 	gf_isom_box_dump_start(a, "MinTransmissionTimeBox", trace);
-	fprintf(trace, "MinimumTransmitTime=\"%d\">\n", p->minTime);
+	gf_fprintf(trace, "MinimumTransmitTime=\"%d\">\n", p->minTime);
 	gf_isom_box_dump_done("MinTransmissionTimeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tmax_dump(GF_Box *a, FILE * trace)
+GF_Err tmax_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TMAXBox *p;
 	p = (GF_TMAXBox *)a;
 	gf_isom_box_dump_start(a, "MaxTransmissionTimeBox", trace);
-	fprintf(trace, "MaximumTransmitTime=\"%d\">\n", p->maxTime);
+	gf_fprintf(trace, "MaximumTransmitTime=\"%d\">\n", p->maxTime);
 	gf_isom_box_dump_done("MaxTransmissionTimeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err pmax_dump(GF_Box *a, FILE * trace)
+GF_Err pmax_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PMAXBox *p;
 	p = (GF_PMAXBox *)a;
 	gf_isom_box_dump_start(a, "MaxPacketSizeBox", trace);
-	fprintf(trace, "MaximumSize=\"%d\">\n", p->maxSize);
+	gf_fprintf(trace, "MaximumSize=\"%d\">\n", p->maxSize);
 	gf_isom_box_dump_done("MaxPacketSizeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dmax_dump(GF_Box *a, FILE * trace)
+GF_Err dmax_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DMAXBox *p;
 	p = (GF_DMAXBox *)a;
 	gf_isom_box_dump_start(a, "MaxPacketDurationBox", trace);
-	fprintf(trace, "MaximumDuration=\"%d\">\n", p->maxDur);
+	gf_fprintf(trace, "MaximumDuration=\"%d\">\n", p->maxDur);
 	gf_isom_box_dump_done("MaxPacketDurationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err payt_dump(GF_Box *a, FILE * trace)
+GF_Err payt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PAYTBox *p;
 	p = (GF_PAYTBox *)a;
 	gf_isom_box_dump_start(a, "PayloadTypeBox", trace);
-	fprintf(trace, "PayloadID=\"%d\" PayloadString=\"%s\">\n", p->payloadCode, p->payloadString);
+	gf_fprintf(trace, "PayloadID=\"%d\" PayloadString=\"%s\">\n", p->payloadCode, p->payloadString);
 	gf_isom_box_dump_done("PayloadTypeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err name_dump(GF_Box *a, FILE * trace)
+GF_Err name_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_NameBox *p;
 	p = (GF_NameBox *)a;
 	gf_isom_box_dump_start(a, "NameBox", trace);
-	fprintf(trace, "Name=\"%s\">\n", p->string);
+	gf_fprintf(trace, "Name=\"%s\">\n", p->string);
 	gf_isom_box_dump_done("NameBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err rely_dump(GF_Box *a, FILE * trace)
+GF_Err rely_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_RelyHintBox *p;
 	p = (GF_RelyHintBox *)a;
 	gf_isom_box_dump_start(a, "RelyTransmissionBox", trace);
-	fprintf(trace, "Prefered=\"%d\" required=\"%d\">\n", p->prefered, p->required);
+	gf_fprintf(trace, "preferred=\"%d\" required=\"%d\">\n", p->preferred, p->required);
 	gf_isom_box_dump_done("RelyTransmissionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err snro_dump(GF_Box *a, FILE * trace)
+GF_Err snro_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SeqOffHintEntryBox *p;
 	p = (GF_SeqOffHintEntryBox *)a;
 	gf_isom_box_dump_start(a, "PacketSequenceOffsetBox", trace);
-	fprintf(trace, "SeqNumOffset=\"%d\">\n", p->SeqOffset);
+	gf_fprintf(trace, "SeqNumOffset=\"%d\">\n", p->SeqOffset);
 	gf_isom_box_dump_done("PacketSequenceOffsetBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tims_dump(GF_Box *a, FILE * trace)
+GF_Err tims_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TSHintEntryBox *p;
 	p = (GF_TSHintEntryBox *)a;
 	gf_isom_box_dump_start(a, "RTPTimeScaleBox", trace);
-	fprintf(trace, "TimeScale=\"%d\">\n", p->timeScale);
+	gf_fprintf(trace, "TimeScale=\"%d\">\n", p->timeScale);
 	gf_isom_box_dump_done("RTPTimeScaleBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tsro_dump(GF_Box *a, FILE * trace)
+GF_Err tsro_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeOffHintEntryBox *p;
 	p = (GF_TimeOffHintEntryBox *)a;
 	gf_isom_box_dump_start(a, "TimeStampOffsetBox", trace);
-	fprintf(trace, "TimeStampOffset=\"%d\">\n", p->TimeOffset);
+	gf_fprintf(trace, "TimeStampOffset=\"%d\">\n", p->TimeOffset);
 	gf_isom_box_dump_done("TimeStampOffsetBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err ghnt_dump(GF_Box *a, FILE * trace)
+GF_Err ghnt_box_dump(GF_Box *a, FILE * trace)
 {
 	char *name;
 	GF_HintSampleEntryBox *p;
@@ -2309,257 +2218,336 @@
 		name = "GenericHintSampleEntryBox";
 	}
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, "DataReferenceIndex=\"%d\" HintTrackVersion=\"%d\" LastCompatibleVersion=\"%d\"", p->dataReferenceIndex, p->HintTrackVersion, p->LastCompatibleVersion);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" HintTrackVersion=\"%d\" LastCompatibleVersion=\"%d\"", p->dataReferenceIndex, p->HintTrackVersion, p->LastCompatibleVersion);
 	if ((a->type == GF_ISOM_BOX_TYPE_RTP_STSD) || (a->type == GF_ISOM_BOX_TYPE_SRTP_STSD) || (a->type == GF_ISOM_BOX_TYPE_RRTP_STSD) || (a->type == GF_ISOM_BOX_TYPE_RTCP_STSD)) {
-		fprintf(trace, " MaxPacketSize=\"%d\"", p->MaxPacketSize);
+		gf_fprintf(trace, " MaxPacketSize=\"%d\"", p->MaxPacketSize);
 	} else if (a->type == GF_ISOM_BOX_TYPE_FDP_STSD) {
-		fprintf(trace, " partition_entry_ID=\"%d\" FEC_overhead=\"%d\"", p->partition_entry_ID, p->FEC_overhead);
+		gf_fprintf(trace, " partition_entry_ID=\"%d\" FEC_overhead=\"%d\"", p->partition_entry_ID, p->FEC_overhead);
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err hnti_dump(GF_Box *a, FILE * trace)
+GF_Err hnti_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "HintTrackInfoBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("HintTrackInfoBox", NULL, trace);
 	return GF_OK;
 }
 
-GF_Err sdp_dump(GF_Box *a, FILE * trace)
+GF_Err sdp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SDPBox *p = (GF_SDPBox *)a;
 	gf_isom_box_dump_start(a, "SDPBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	if (p->sdpText)
-		fprintf(trace, "\n", p->sdpText);
+		gf_fprintf(trace, "\n", p->sdpText);
 	gf_isom_box_dump_done("SDPBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err rtp_hnti_dump(GF_Box *a, FILE * trace)
+GF_Err rtp_hnti_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_RTPBox *p = (GF_RTPBox *)a;
 	gf_isom_box_dump_start(a, "RTPMovieHintInformationBox", trace);
-	fprintf(trace, "descriptionformat=\"%s\">\n", gf_4cc_to_str(p->subType));
+	gf_fprintf(trace, "descriptionformat=\"%s\">\n", gf_4cc_to_str(p->subType));
 	if (p->sdpText)
-		fprintf(trace, "\n", p->sdpText);
+		gf_fprintf(trace, "\n", p->sdpText);
 	gf_isom_box_dump_done("RTPMovieHintInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err rtpo_dump(GF_Box *a, FILE * trace)
+GF_Err rtpo_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_RTPOBox *p;
 	p = (GF_RTPOBox *)a;
 	gf_isom_box_dump_start(a, "RTPTimeOffsetBox", trace);
-	fprintf(trace, "PacketTimeOffset=\"%d\">\n", p->timeOffset);
+	gf_fprintf(trace, "PacketTimeOffset=\"%d\">\n", p->timeOffset);
 	gf_isom_box_dump_done("RTPTimeOffsetBox", a, trace);
 	return GF_OK;
 }
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
-GF_Err mvex_dump(GF_Box *a, FILE * trace)
+GF_Err mvex_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_MovieExtendsBox *p;
-	p = (GF_MovieExtendsBox *)a;
 	gf_isom_box_dump_start(a, "MovieExtendsBox", trace);
-	fprintf(trace, ">\n");
-	if (p->mehd) gf_isom_box_dump(p->mehd, trace);
-	gf_isom_box_array_dump(p->TrackExList, trace);
-	gf_isom_box_array_dump(p->TrackExPropList, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieExtendsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mehd_dump(GF_Box *a, FILE * trace)
+GF_Err mehd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieExtendsHeaderBox *p = (GF_MovieExtendsHeaderBox*)a;
 	gf_isom_box_dump_start(a, "MovieExtendsHeaderBox", trace);
-	fprintf(trace, "fragmentDuration=\""LLD"\" >\n", LLD_CAST p->fragment_duration);
+	gf_fprintf(trace, "fragmentDuration=\""LLD"\" >\n", p->fragment_duration);
 	gf_isom_box_dump_done("MovieExtendsHeaderBox", a, trace);
 	return GF_OK;
 }
 
 void sample_flags_dump(const char *name, u32 sample_flags, FILE * trace)
 {
-	fprintf(trace, "<%s", name);
-	fprintf(trace, " IsLeading=\"%d\"", GF_ISOM_GET_FRAG_LEAD(sample_flags) );
-	fprintf(trace, " SampleDependsOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDS(sample_flags) );
-	fprintf(trace, " SampleIsDependedOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDED(sample_flags) );
-	fprintf(trace, " SampleHasRedundancy=\"%d\"", GF_ISOM_GET_FRAG_REDUNDANT(sample_flags) );
-	fprintf(trace, " SamplePadding=\"%d\"", GF_ISOM_GET_FRAG_PAD(sample_flags) );
-	fprintf(trace, " SampleSync=\"%d\"", GF_ISOM_GET_FRAG_SYNC(sample_flags));
-	fprintf(trace, " SampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_DEG(sample_flags));
-	fprintf(trace, "/>\n");
+	gf_fprintf(trace, "<%s", name);
+	gf_fprintf(trace, " IsLeading=\"%d\"", GF_ISOM_GET_FRAG_LEAD(sample_flags) );
+	gf_fprintf(trace, " SampleDependsOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDS(sample_flags) );
+	gf_fprintf(trace, " SampleIsDependedOn=\"%d\"", GF_ISOM_GET_FRAG_DEPENDED(sample_flags) );
+	gf_fprintf(trace, " SampleHasRedundancy=\"%d\"", GF_ISOM_GET_FRAG_REDUNDANT(sample_flags) );
+	gf_fprintf(trace, " SamplePadding=\"%d\"", GF_ISOM_GET_FRAG_PAD(sample_flags) );
+	gf_fprintf(trace, " SampleSync=\"%d\"", GF_ISOM_GET_FRAG_SYNC(sample_flags));
+	gf_fprintf(trace, " SampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_DEG(sample_flags));
+	gf_fprintf(trace, "/>\n");
 }
 
-GF_Err trex_dump(GF_Box *a, FILE * trace)
+GF_Err trex_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackExtendsBox *p;
 	p = (GF_TrackExtendsBox *)a;
 	gf_isom_box_dump_start(a, "TrackExtendsBox", trace);
-	fprintf(trace, "TrackID=\"%d\"", p->trackID);
-	fprintf(trace, " SampleDescriptionIndex=\"%d\" SampleDuration=\"%d\" SampleSize=\"%d\"", p->def_sample_desc_index, p->def_sample_duration, p->def_sample_size);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, "TrackID=\"%d\"", p->trackID);
+	gf_fprintf(trace, " SampleDescriptionIndex=\"%d\" SampleDuration=\"%d\" SampleSize=\"%d\"", p->def_sample_desc_index, p->def_sample_duration, p->def_sample_size);
+	gf_fprintf(trace, ">\n");
 	sample_flags_dump("DefaultSampleFlags", p->def_sample_flags, trace);
 	gf_isom_box_dump_done("TrackExtendsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trep_dump(GF_Box *a, FILE * trace)
+GF_Err trep_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackExtensionPropertiesBox *p = (GF_TrackExtensionPropertiesBox*)a;
 	gf_isom_box_dump_start(a, "TrackExtensionPropertiesBox", trace);
-	fprintf(trace, "TrackID=\"%d\">\n", p->trackID);
+	gf_fprintf(trace, "TrackID=\"%d\">\n", p->trackID);
 	gf_isom_box_dump_done("TrackExtensionPropertiesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err moof_dump(GF_Box *a, FILE * trace)
+GF_Err moof_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieFragmentBox *p;
 	p = (GF_MovieFragmentBox *)a;
 	gf_isom_box_dump_start(a, "MovieFragmentBox", trace);
-	fprintf(trace, "TrackFragments=\"%d\">\n", gf_list_count(p->TrackList));
-	if (p->mfhd) gf_isom_box_dump(p->mfhd, trace);
-	gf_isom_box_array_dump(p->TrackList, trace);
+	gf_fprintf(trace, "TrackFragments=\"%d\"", gf_list_count(p->TrackList));
+	if (p->compressed_diff)
+		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("MovieFragmentBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mfhd_dump(GF_Box *a, FILE * trace)
+GF_Err mfhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MovieFragmentHeaderBox *p;
 	p = (GF_MovieFragmentHeaderBox *)a;
 	gf_isom_box_dump_start(a, "MovieFragmentHeaderBox", trace);
-	fprintf(trace, "FragmentSequenceNumber=\"%d\">\n", p->sequence_number);
+	gf_fprintf(trace, "FragmentSequenceNumber=\"%d\">\n", p->sequence_number);
 	gf_isom_box_dump_done("MovieFragmentHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err traf_dump(GF_Box *a, FILE * trace)
+GF_Err traf_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_TrackFragmentBox *p;
-	p = (GF_TrackFragmentBox *)a;
 	gf_isom_box_dump_start(a, "TrackFragmentBox", trace);
-	fprintf(trace, ">\n");
-	if (p->tfhd) gf_isom_box_dump(p->tfhd, trace);
-	if (p->sdtp) gf_isom_box_dump(p->sdtp, trace);
-	if (p->tfdt) gf_isom_box_dump(p->tfdt, trace);
-	if (p->sub_samples) gf_isom_box_array_dump(p->sub_samples, trace);
-	if (p->sampleGroupsDescription) gf_isom_box_array_dump(p->sampleGroupsDescription, trace);
-	if (p->sampleGroups) gf_isom_box_array_dump(p->sampleGroups, trace);
-	gf_isom_box_array_dump(p->TrackRuns, trace);
-	if (p->sai_sizes) gf_isom_box_array_dump(p->sai_sizes, trace);
-	if (p->sai_offsets) gf_isom_box_array_dump(p->sai_offsets, trace);
-	if (p->sample_encryption) gf_isom_box_dump(p->sample_encryption, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("TrackFragmentBox", a, trace);
 	return GF_OK;
 }
 
-static void frag_dump_sample_flags(FILE * trace, u32 flags)
+static void frag_dump_sample_flags(FILE * trace, u32 flags, u32 field_idx)
 {
-	fprintf(trace, " SamplePadding=\"%d\" Sync=\"%d\" DegradationPriority=\"%d\" IsLeading=\"%d\" DependsOn=\"%d\" IsDependedOn=\"%d\" HasRedundancy=\"%d\"",
+	if (!field_idx) return;
+	if (field_idx==1) {
+		gf_fprintf(trace, " IsLeading=\"%d\" DependsOn=\"%d\"", GF_ISOM_GET_FRAG_LEAD(flags), GF_ISOM_GET_FRAG_DEPENDS(flags));
+	} else if (field_idx==2) {
+		gf_fprintf(trace, " IsLeading=\"%d\" DependsOn=\"%d\" IsDependedOn=\"%d\" HasRedundancy=\"%d\" SamplePadding=\"%d\" Sync=\"%d\"",
+	        GF_ISOM_GET_FRAG_LEAD(flags), GF_ISOM_GET_FRAG_DEPENDS(flags), GF_ISOM_GET_FRAG_DEPENDED(flags), GF_ISOM_GET_FRAG_REDUNDANT(flags), GF_ISOM_GET_FRAG_PAD(flags), GF_ISOM_GET_FRAG_SYNC(flags));
+	} else {
+		gf_fprintf(trace, " SamplePadding=\"%d\" Sync=\"%d\" DegradationPriority=\"%d\" IsLeading=\"%d\" DependsOn=\"%d\" IsDependedOn=\"%d\" HasRedundancy=\"%d\"",
 	        GF_ISOM_GET_FRAG_PAD(flags), GF_ISOM_GET_FRAG_SYNC(flags), GF_ISOM_GET_FRAG_DEG(flags),
 	        GF_ISOM_GET_FRAG_LEAD(flags), GF_ISOM_GET_FRAG_DEPENDS(flags), GF_ISOM_GET_FRAG_DEPENDED(flags), GF_ISOM_GET_FRAG_REDUNDANT(flags));
+	}
 }
 
-GF_Err tfhd_dump(GF_Box *a, FILE * trace)
+GF_Err tfhd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackFragmentHeaderBox *p;
 	p = (GF_TrackFragmentHeaderBox *)a;
 	gf_isom_box_dump_start(a, "TrackFragmentHeaderBox", trace);
-	fprintf(trace, "TrackID=\"%u\"", p->trackID);
+	gf_fprintf(trace, "TrackID=\"%u\"", p->trackID);
 
 	if (p->flags & GF_ISOM_TRAF_BASE_OFFSET) {
-		fprintf(trace, " BaseDataOffset=\""LLU"\"", p->base_data_offset);
+		gf_fprintf(trace, " BaseDataOffset=\""LLU"\"", p->base_data_offset);
 	} else {
-		fprintf(trace, " BaseDataOffset=\"%s\"", (p->flags & GF_ISOM_MOOF_BASE_OFFSET) ? "moof" : "moof-or-previous-traf");
+		gf_fprintf(trace, " BaseDataOffset=\"%s\"", (p->flags & GF_ISOM_MOOF_BASE_OFFSET) ? "moof" : "moof-or-previous-traf");
 	}
 
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_DESC)
-		fprintf(trace, " SampleDescriptionIndex=\"%u\"", p->sample_desc_index);
+		gf_fprintf(trace, " SampleDescriptionIndex=\"%u\"", p->sample_desc_index);
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_DUR)
-		fprintf(trace, " SampleDuration=\"%u\"", p->def_sample_duration);
+		gf_fprintf(trace, " SampleDuration=\"%u\"", p->def_sample_duration);
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_SIZE)
-		fprintf(trace, " SampleSize=\"%u\"", p->def_sample_size);
+		gf_fprintf(trace, " SampleSize=\"%u\"", p->def_sample_size);
 
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_FLAGS) {
-		frag_dump_sample_flags(trace, p->def_sample_flags);
+		frag_dump_sample_flags(trace, p->def_sample_flags, 3);
 	}
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done("TrackFragmentHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tfxd_dump(GF_Box *a, FILE * trace)
+GF_Err tfxd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MSSTimeExtBox *ptr = (GF_MSSTimeExtBox*)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "MSSTimeExtensionBox", trace);
-	fprintf(trace, "AbsoluteTime=\""LLU"\" FragmentDuration=\""LLU"\">\n", ptr->absolute_time_in_track_timescale, ptr->fragment_duration_in_track_timescale);
-	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
+	gf_fprintf(trace, "AbsoluteTime=\""LLU"\" FragmentDuration=\""LLU"\">\n", ptr->absolute_time_in_track_timescale, ptr->fragment_duration_in_track_timescale);
+	gf_fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
 	gf_isom_box_dump_done("MSSTimeExtensionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trun_dump(GF_Box *a, FILE * trace)
+GF_Err trun_box_dump(GF_Box *a, FILE * trace)
 {
-	u32 i;
-	GF_TrunEntry *ent;
+	u32 i, flags;
+	Bool full_dump = GF_FALSE;
 	GF_TrackFragmentRunBox *p;
 
 	p = (GF_TrackFragmentRunBox *)a;
+	flags = p->flags;
+#ifdef GF_ENABLE_CTRN
+	if (p->use_ctrn) {
+		p->flags = p->ctrn_flags;
+		p->type = GF_ISOM_BOX_TYPE_CTRN;
+	}
+	gf_isom_box_dump_start(a, p->use_ctrn ? "CompactTrackRunBox" : "TrackRunBox", trace);
+#else
 	gf_isom_box_dump_start(a, "TrackRunBox", trace);
-	fprintf(trace, "SampleCount=\"%d\"", p->sample_count);
+#endif
+	p->flags = flags;
+	p->type = GF_ISOM_BOX_TYPE_TRUN;
+	gf_fprintf(trace, "SampleCount=\"%d\"", p->sample_count);
 
 	if (p->flags & GF_ISOM_TRUN_DATA_OFFSET)
-		fprintf(trace, " DataOffset=\"%d\"", p->data_offset);
-	fprintf(trace, ">\n");
+		gf_fprintf(trace, " DataOffset=\"%d\"", p->data_offset);
 
-	if (p->flags & GF_ISOM_TRUN_FIRST_FLAG) {
-		sample_flags_dump("FirstSampleFlags", p->first_sample_flags, trace);
+#ifdef GF_ENABLE_CTRN
+	if (p->use_ctrn) {
+		if (p->ctrn_flags & GF_ISOM_CTRN_DATAOFFSET_16)
+			gf_fprintf(trace, " dataOffset16Bits=\"yes\"");
+
+		if (p->ctso_multiplier)
+			gf_fprintf(trace, " ctsoMultiplier=\"%d\"", p->ctso_multiplier);
+
+		if (p->ctrn_flags & GF_ISOM_CTRN_INHERIT_DUR)
+			gf_fprintf(trace, " inheritDuration=\"yes\"");
+		if (p->ctrn_flags & GF_ISOM_CTRN_INHERIT_SIZE)
+			gf_fprintf(trace, " inheritSize=\"yes\"");
+		if (p->ctrn_flags & GF_ISOM_CTRN_INHERIT_FLAGS)
+			gf_fprintf(trace, " inheritFlags=\"yes\"");
+		if (p->ctrn_flags & GF_ISOM_CTRN_INHERIT_CTSO)
+			gf_fprintf(trace, " inheritCTSOffset=\"yes\"");
+
+		gf_fprintf(trace, " firstSampleDurationBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_first_dur));
+		gf_fprintf(trace, " firstSampleSizeBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_first_size));
+		gf_fprintf(trace, " firstSampleFlagsBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_first_sample_flags));
+		gf_fprintf(trace, " firstSampleCTSOBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_first_ctts));
+		gf_fprintf(trace, " sampleDurationBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_dur));
+		gf_fprintf(trace, " sampleSizeBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_size));
+		gf_fprintf(trace, " sampleFlagsBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_sample_flags));
+		gf_fprintf(trace, " sampleCTSOBits=\"%d\"", gf_isom_ctrn_field_size_bits(p->ctrn_ctts));
+		if (p->ctrn_flags & 0x00FFFF00)
+			full_dump = GF_TRUE;
+
+		gf_fprintf(trace, ">\n");
+	} else
+#endif
+	{
+		gf_fprintf(trace, ">\n");
+
+		if (p->flags & GF_ISOM_TRUN_FIRST_FLAG) {
+			sample_flags_dump("FirstSampleFlags", p->first_sample_flags, trace);
+		}
+		if (p->flags & (GF_ISOM_TRUN_DURATION|GF_ISOM_TRUN_SIZE|GF_ISOM_TRUN_CTS_OFFSET|GF_ISOM_TRUN_FLAGS)) {
+			full_dump = GF_TRUE;
+		}
 	}
 
-	if (p->flags & (GF_ISOM_TRUN_DURATION|GF_ISOM_TRUN_SIZE|GF_ISOM_TRUN_CTS_OFFSET|GF_ISOM_TRUN_FLAGS)) {
+	if (full_dump) {
+		GF_TrunEntry *ent;
 		i=0;
 		while ((ent = (GF_TrunEntry *)gf_list_enum(p->entries, &i))) {
 
-			fprintf(trace, "<TrackRunEntry");
+			gf_fprintf(trace, "<TrackRunEntry");
 
-			if (p->flags & GF_ISOM_TRUN_DURATION)
-				fprintf(trace, " Duration=\"%u\"", ent->Duration);
-			if (p->flags & GF_ISOM_TRUN_SIZE)
-				fprintf(trace, " Size=\"%u\"", ent->size);
-			if (p->flags & GF_ISOM_TRUN_CTS_OFFSET)
+#ifdef GF_ENABLE_CTRN
+			if (p->use_ctrn) {
+				if ((i==1) && (p->ctrn_flags&GF_ISOM_CTRN_FIRST_SAMPLE) ) {
+					if (p->ctrn_first_dur)
+						gf_fprintf(trace, " Duration=\"%u\"", ent->Duration);
+					if (p->ctrn_first_size)
+						gf_fprintf(trace, " Size=\"%u\"", ent->size);
+					if (p->ctrn_first_ctts) {
+						if (p->version == 0)
+							gf_fprintf(trace, " CTSOffset=\"%u\"", (u32) ent->CTS_Offset);
+						else
+							gf_fprintf(trace, " CTSOffset=\"%d\"", ent->CTS_Offset);
+					}
+					if (p->ctrn_first_sample_flags)
+						frag_dump_sample_flags(trace, ent->flags, p->ctrn_first_sample_flags);
+				} else {
+					if (p->ctrn_dur)
+						gf_fprintf(trace, " Duration=\"%u\"", ent->Duration);
+					if (p->ctrn_size)
+						gf_fprintf(trace, " Size=\"%u\"", ent->size);
+					if (p->ctrn_ctts) {
+						if (p->version == 0)
+							gf_fprintf(trace, " CTSOffset=\"%u\"", (u32) ent->CTS_Offset);
+						else
+							gf_fprintf(trace, " CTSOffset=\"%d\"", ent->CTS_Offset);
+					}
+					if (p->ctrn_sample_flags)
+						frag_dump_sample_flags(trace, ent->flags, p->ctrn_sample_flags);
+				}
+			} else
+#endif
 			{
-				if (p->version == 0)
-					fprintf(trace, " CTSOffset=\"%u\"", (u32) ent->CTS_Offset);
-				else
-					fprintf(trace, " CTSOffset=\"%d\"", ent->CTS_Offset);
-			}
 
-			if (p->flags & GF_ISOM_TRUN_FLAGS) {
-				frag_dump_sample_flags(trace, ent->flags);
+				if (p->flags & GF_ISOM_TRUN_DURATION)
+					gf_fprintf(trace, " Duration=\"%u\"", ent->Duration);
+				if (p->flags & GF_ISOM_TRUN_SIZE)
+					gf_fprintf(trace, " Size=\"%u\"", ent->size);
+				if (p->flags & GF_ISOM_TRUN_CTS_OFFSET)
+				{
+					if (p->version == 0)
+						gf_fprintf(trace, " CTSOffset=\"%u\"", (u32) ent->CTS_Offset);
+					else
+						gf_fprintf(trace, " CTSOffset=\"%d\"", ent->CTS_Offset);
+				}
+
+				if (p->flags & GF_ISOM_TRUN_FLAGS) {
+					frag_dump_sample_flags(trace, ent->flags, 3);
+				}
 			}
-			fprintf(trace, "/>\n");
+			gf_fprintf(trace, "/>\n");
 		}
 	} else if (p->size) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	} else {
-		fprintf(trace, "<TrackRunEntry Duration=\"\" Size=\"\" CTSOffset=\"\"");
-		frag_dump_sample_flags(trace, 0);
-		fprintf(trace, "/>\n");
+		gf_fprintf(trace, "<TrackRunEntry Duration=\"\" Size=\"\" CTSOffset=\"\"");
+		frag_dump_sample_flags(trace, 0, 3);
+		gf_fprintf(trace, "/>\n");
 	}
 
+#ifdef GF_ENABLE_CTRN
+	gf_isom_box_dump_done(p->use_ctrn ? "CompactTrackRunBox" : "TrackRunBox", a, trace);
+#else
 	gf_isom_box_dump_done("TrackRunBox", a, trace);
+#endif
 	return GF_OK;
 }
 
@@ -2569,35 +2557,35 @@
 
 GF_Err DTE_Dump(GF_List *dte, FILE * trace)
 {
-	GF_GenericDTE *p;
-	GF_ImmediateDTE *i_p;
-	GF_SampleDTE *s_p;
-	GF_StreamDescDTE *sd_p;
 	u32 i, count;
 
 	count = gf_list_count(dte);
 	for (i=0; i<count; i++) {
+		GF_GenericDTE *p;
+		GF_ImmediateDTE *i_p;
+		GF_SampleDTE *s_p;
+		GF_StreamDescDTE *sd_p;
 		p = (GF_GenericDTE *)gf_list_get(dte, i);
 		switch (p->source) {
 		case 0:
-			fprintf(trace, "<EmptyDataEntry/>\n");
+			gf_fprintf(trace, "<EmptyDataEntry/>\n");
 			break;
 		case 1:
 			i_p = (GF_ImmediateDTE *) p;
-			fprintf(trace, "<ImmediateDataEntry DataSize=\"%d\"/>\n", i_p->dataLength);
+			gf_fprintf(trace, "<ImmediateDataEntry DataSize=\"%d\"/>\n", i_p->dataLength);
 			break;
 		case 2:
 			s_p = (GF_SampleDTE *) p;
-			fprintf(trace, "<SampleDataEntry DataSize=\"%d\" SampleOffset=\"%d\" SampleNumber=\"%d\" TrackReference=\"%d\"/>\n",
+			gf_fprintf(trace, "<SampleDataEntry DataSize=\"%d\" SampleOffset=\"%d\" SampleNumber=\"%d\" TrackReference=\"%d\"/>\n",
 			        s_p->dataLength, s_p->byteOffset, s_p->sampleNumber, s_p->trackRefIndex);
 			break;
 		case 3:
 			sd_p = (GF_StreamDescDTE *) p;
-			fprintf(trace, "<SampleDescriptionEntry DataSize=\"%d\" DescriptionOffset=\"%d\" StreamDescriptionindex=\"%d\" TrackReference=\"%d\"/>\n",
+			gf_fprintf(trace, "<SampleDescriptionEntry DataSize=\"%d\" DescriptionOffset=\"%d\" StreamDescriptionindex=\"%d\" TrackReference=\"%d\"/>\n",
 			        sd_p->dataLength, sd_p->byteOffset, sd_p->streamDescIndex, sd_p->trackRefIndex);
 			break;
 		default:
-			fprintf(trace, "<UnknownTableEntry/>\n");
+			gf_fprintf(trace, "<UnknownTableEntry/>\n");
 			break;
 		}
 	}
@@ -2658,7 +2646,7 @@
 
 	count = gf_list_count(s->packetTable);
 
-	fprintf(trace, "<%sHintSample SampleNumber=\"%d\" DecodingTime=\""LLD"\" RandomAccessPoint=\"%d\" PacketCount=\"%u\" reserved=\"%u\">\n", szName, SampleNum, LLD_CAST tmp->DTS, tmp->IsRAP, s->packetCount, s->reserved);
+	gf_fprintf(trace, "<%sHintSample SampleNumber=\"%d\" DecodingTime=\""LLD"\" RandomAccessPoint=\"%d\" PacketCount=\"%u\" reserved=\"%u\">\n", szName, SampleNum, tmp->DTS, tmp->IsRAP, s->packetCount, s->reserved);
 
 	if (s->hint_subtype==GF_ISOM_BOX_TYPE_FDP_STSD) {
 		e = gf_isom_box_dump((GF_Box*) s, trace);
@@ -2666,7 +2654,7 @@
 	}
 
 	if (s->packetCount != count) {
-		fprintf(trace, "\n", szName, s->packetCount, count);
+		gf_fprintf(trace, "\n", szName, s->packetCount, count);
 	}
 
 
@@ -2675,41 +2663,40 @@
 
 		if (pck->hint_subtype==GF_ISOM_BOX_TYPE_RTCP_STSD) {
 			GF_RTCPPacket *rtcp_pck = (GF_RTCPPacket *) pck;
-			fprintf(trace, "<RTCPHintPacket PacketNumber=\"%d\" V=\"%d\" P=\"%d\" Count=\"%d\" PayloadType=\"%d\" ",
+			gf_fprintf(trace, "<RTCPHintPacket PacketNumber=\"%d\" V=\"%d\" P=\"%d\" Count=\"%d\" PayloadType=\"%d\" ",
 		        i+1,  rtcp_pck->Version, rtcp_pck->Padding, rtcp_pck->Count, rtcp_pck->PayloadType);
 
 			if (rtcp_pck->data) dump_data_attribute(trace, "payload", (char*)rtcp_pck->data, rtcp_pck->length);
-			fprintf(trace, ">\n");
-			fprintf(trace, "</RTCPHintPacket>\n");
+			gf_fprintf(trace, ">\n");
+			gf_fprintf(trace, "</RTCPHintPacket>\n");
 
 		} else {
-			fprintf(trace, "<RTPHintPacket PacketNumber=\"%d\" P=\"%d\" X=\"%d\" M=\"%d\" PayloadType=\"%d\"",
+			gf_fprintf(trace, "<RTPHintPacket PacketNumber=\"%d\" P=\"%d\" X=\"%d\" M=\"%d\" PayloadType=\"%d\"",
 		        i+1,  pck->P_bit, pck->X_bit, pck->M_bit, pck->payloadType);
 
-			fprintf(trace, " SequenceNumber=\"%d\" RepeatedPacket=\"%d\" DropablePacket=\"%d\" RelativeTransmissionTime=\"%d\" FullPacketSize=\"%d\">\n",
+			gf_fprintf(trace, " SequenceNumber=\"%d\" RepeatedPacket=\"%d\" DropablePacket=\"%d\" RelativeTransmissionTime=\"%d\" FullPacketSize=\"%d\">\n",
 		        pck->SequenceNumber, pck->R_bit, pck->B_bit, pck->relativeTransTime, gf_isom_hint_rtp_length(pck));
 
 
 			//TLV is made of Boxes
 			count2 = gf_list_count(pck->TLV);
 			if (count2) {
-				fprintf(trace, "<PrivateExtensionTable EntryCount=\"%d\">\n", count2);
-				gf_isom_box_array_dump(pck->TLV, trace);
-				fprintf(trace, "</PrivateExtensionTable>\n");
+				gf_fprintf(trace, "<PrivateExtensionTable EntryCount=\"%d\">\n", count2);
+				gf_fprintf(trace, "</PrivateExtensionTable>\n");
 			}
 			//DTE is made of NON boxes
 			count2 = gf_list_count(pck->DataTable);
 			if (count2) {
-				fprintf(trace, "<PacketDataTable EntryCount=\"%d\">\n", count2);
+				gf_fprintf(trace, "<PacketDataTable EntryCount=\"%d\">\n", count2);
 				DTE_Dump(pck->DataTable, trace);
-				fprintf(trace, "</PacketDataTable>\n");
+				gf_fprintf(trace, "</PacketDataTable>\n");
 			}
-			fprintf(trace, "</RTPHintPacket>\n");
+			gf_fprintf(trace, "</RTPHintPacket>\n");
 		}
 	}
 
 err_exit:
-	fprintf(trace, "</%sHintSample>\n", szName);
+	gf_fprintf(trace, "</%sHintSample>\n", szName);
 	gf_isom_sample_del(&tmp);
 	gf_isom_hint_sample_del(s);
 	return e;
@@ -2719,7 +2706,7 @@
 
 static void tx3g_dump_box_nobox(FILE * trace, GF_BoxRecord *rec)
 {
-	fprintf(trace, "<TextBox top=\"%d\" left=\"%d\" bottom=\"%d\" right=\"%d\"/>\n", rec->top, rec->left, rec->bottom, rec->right);
+	gf_fprintf(trace, "<TextBox top=\"%d\" left=\"%d\" bottom=\"%d\" right=\"%d\"/>\n", rec->top, rec->left, rec->bottom, rec->right);
 }
 
 static void tx3g_print_char_offsets(FILE * trace, u32 start, u32 end, u32 *shift_offset, u32 so_count)
@@ -2739,26 +2726,26 @@
 			}
 		}
 	}
-	if (start || end) fprintf(trace, "fromChar=\"%d\" toChar=\"%d\" ", start, end);
+	if (start || end) gf_fprintf(trace, "fromChar=\"%d\" toChar=\"%d\" ", start, end);
 }
 
 static void tx3g_dump_style_nobox(FILE * trace, GF_StyleRecord *rec, u32 *shift_offset, u32 so_count)
 {
-	fprintf(trace, "<Style ");
+	gf_fprintf(trace, "<Style ");
 	if (rec->startCharOffset || rec->endCharOffset)
 		tx3g_print_char_offsets(trace, rec->startCharOffset, rec->endCharOffset, shift_offset, so_count);
 
-	fprintf(trace, "styles=\"");
+	gf_fprintf(trace, "styles=\"");
 	if (!rec->style_flags) {
-		fprintf(trace, "Normal");
+		gf_fprintf(trace, "Normal");
 	} else {
-		if (rec->style_flags & 1) fprintf(trace, "Bold ");
-		if (rec->style_flags & 2) fprintf(trace, "Italic ");
-		if (rec->style_flags & 4) fprintf(trace, "Underlined ");
+		if (rec->style_flags & 1) gf_fprintf(trace, "Bold ");
+		if (rec->style_flags & 2) gf_fprintf(trace, "Italic ");
+		if (rec->style_flags & 4) gf_fprintf(trace, "Underlined ");
 	}
-	fprintf(trace, "\" fontID=\"%d\" fontSize=\"%d\" ", rec->fontID, rec->font_size);
+	gf_fprintf(trace, "\" fontID=\"%d\" fontSize=\"%d\" ", rec->fontID, rec->font_size);
 	tx3g_dump_rgba8(trace, "color", rec->text_color);
-	fprintf(trace, "/>\n");
+	gf_fprintf(trace, "/>\n");
 }
 
 static char *tx3g_format_time(u64 ts, u32 timescale, char *szDur, Bool is_srt)
@@ -2785,7 +2772,7 @@
 	GF_Box *a;
 	Bool has_scroll;
 	char szDur[100];
-	GF_Tx3gSampleEntryBox *txt;
+	GF_Tx3gSampleEntryBox *txt_e;
 
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, track);
 	if (!trak) return GF_BAD_PARAM;
@@ -2797,8 +2784,8 @@
 		return GF_BAD_PARAM;
 	}
 
-	txt = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, 0);
-	switch (txt->type) {
+	txt_e = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+	switch (txt_e->type) {
 	case GF_ISOM_BOX_TYPE_TX3G:
 	case GF_ISOM_BOX_TYPE_TEXT:
 		break;
@@ -2809,114 +2796,115 @@
 	}
 
 	if (box_dump) {
-		fprintf(dump, "<TextTrack trackID=\"%d\" version=\"1.1\">\n", gf_isom_get_track_id(the_file, track) );
+		gf_fprintf(dump, "<TextTrack trackID=\"%d\" version=\"1.1\">\n", gf_isom_get_track_id(the_file, track) );
 	} else {
-		fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-		fprintf(dump, "\n");
+		gf_fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+		gf_fprintf(dump, "\n");
 
-		fprintf(dump, "<TextStream version=\"1.1\">\n");
+		gf_fprintf(dump, "<TextStream version=\"1.1\">\n");
 	}
-	fprintf(dump, "<TextStreamHeader width=\"%d\" height=\"%d\" layer=\"%d\" translation_x=\"%d\" translation_y=\"%d\">\n", trak->Header->width >> 16 , trak->Header->height >> 16, trak->Header->layer, trak->Header->matrix[6] >> 16, trak->Header->matrix[7] >> 16);
+	gf_fprintf(dump, "<TextStreamHeader width=\"%d\" height=\"%d\" layer=\"%d\" translation_x=\"%d\" translation_y=\"%d\">\n", trak->Header->width >> 16 , trak->Header->height >> 16, trak->Header->layer, trak->Header->matrix[6] >> 16, trak->Header->matrix[7] >> 16);
 
-	nb_descs = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	nb_descs = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 	for (i=0; i<nb_descs; i++) {
-		GF_Tx3gSampleEntryBox *txt = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		txt_e = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
+		if (!txt_e) break;
 
 		if (box_dump) {
-			gf_isom_box_dump((GF_Box*) txt, dump);
-		} else if  (txt->type==GF_ISOM_BOX_TYPE_TX3G) {
-			fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
-			switch (txt->horizontal_justification) {
+			gf_isom_box_dump((GF_Box*) txt_e, dump);
+		} else if  (txt_e->type==GF_ISOM_BOX_TYPE_TX3G) {
+			gf_fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
+			switch (txt_e->horizontal_justification) {
 			case 1:
-				fprintf(dump, "center");
+				gf_fprintf(dump, "center");
 				break;
 			case -1:
-				fprintf(dump, "right");
+				gf_fprintf(dump, "right");
 				break;
 			default:
-				fprintf(dump, "left");
+				gf_fprintf(dump, "left");
 				break;
 			}
-			fprintf(dump, "\" verticalJustification=\"");
-			switch (txt->vertical_justification) {
+			gf_fprintf(dump, "\" verticalJustification=\"");
+			switch (txt_e->vertical_justification) {
 			case 1:
-				fprintf(dump, "center");
+				gf_fprintf(dump, "center");
 				break;
 			case -1:
-				fprintf(dump, "bottom");
+				gf_fprintf(dump, "bottom");
 				break;
 			default:
-				fprintf(dump, "top");
+				gf_fprintf(dump, "top");
 				break;
 			}
-			fprintf(dump, "\" ");
-			tx3g_dump_rgba8(dump, "backColor", txt->back_color);
-			fprintf(dump, " verticalText=\"%s\"", (txt->displayFlags & GF_TXT_VERTICAL) ? "yes" : "no");
-			fprintf(dump, " fillTextRegion=\"%s\"", (txt->displayFlags & GF_TXT_FILL_REGION) ? "yes" : "no");
-			fprintf(dump, " continuousKaraoke=\"%s\"", (txt->displayFlags & GF_TXT_KARAOKE) ? "yes" : "no");
+			gf_fprintf(dump, "\" ");
+			tx3g_dump_rgba8(dump, "backColor", txt_e->back_color);
+			gf_fprintf(dump, " verticalText=\"%s\"", (txt_e->displayFlags & GF_TXT_VERTICAL) ? "yes" : "no");
+			gf_fprintf(dump, " fillTextRegion=\"%s\"", (txt_e->displayFlags & GF_TXT_FILL_REGION) ? "yes" : "no");
+			gf_fprintf(dump, " continuousKaraoke=\"%s\"", (txt_e->displayFlags & GF_TXT_KARAOKE) ? "yes" : "no");
 			has_scroll = GF_FALSE;
-			if (txt->displayFlags & GF_TXT_SCROLL_IN) {
+			if (txt_e->displayFlags & GF_TXT_SCROLL_IN) {
 				has_scroll = GF_TRUE;
-				if (txt->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
-				else fprintf(dump, " scroll=\"In\"");
-			} else if (txt->displayFlags & GF_TXT_SCROLL_OUT) {
+				if (txt_e->displayFlags & GF_TXT_SCROLL_OUT) gf_fprintf(dump, " scroll=\"InOut\"");
+				else gf_fprintf(dump, " scroll=\"In\"");
+			} else if (txt_e->displayFlags & GF_TXT_SCROLL_OUT) {
 				has_scroll = GF_TRUE;
-				fprintf(dump, " scroll=\"Out\"");
+				gf_fprintf(dump, " scroll=\"Out\"");
 			} else {
-				fprintf(dump, " scroll=\"None\"");
+				gf_fprintf(dump, " scroll=\"None\"");
 			}
 			if (has_scroll) {
-				u32 mode = (txt->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
+				u32 mode = (txt_e->displayFlags & GF_TXT_SCROLL_DIRECTION)>>7;
 				switch (mode) {
 				case GF_TXT_SCROLL_CREDITS:
-					fprintf(dump, " scrollMode=\"Credits\"");
+					gf_fprintf(dump, " scrollMode=\"Credits\"");
 					break;
 				case GF_TXT_SCROLL_MARQUEE:
-					fprintf(dump, " scrollMode=\"Marquee\"");
+					gf_fprintf(dump, " scrollMode=\"Marquee\"");
 					break;
 				case GF_TXT_SCROLL_DOWN:
-					fprintf(dump, " scrollMode=\"Down\"");
+					gf_fprintf(dump, " scrollMode=\"Down\"");
 					break;
 				case GF_TXT_SCROLL_RIGHT:
-					fprintf(dump, " scrollMode=\"Right\"");
+					gf_fprintf(dump, " scrollMode=\"Right\"");
 					break;
 				default:
-					fprintf(dump, " scrollMode=\"Unknown\"");
+					gf_fprintf(dump, " scrollMode=\"Unknown\"");
 					break;
 				}
 			}
-			fprintf(dump, ">\n");
-			fprintf(dump, "<FontTable>\n");
-			if (txt->font_table) {
-				for (j=0; j<txt->font_table->entry_count; j++) {
-					fprintf(dump, "<FontTableEntry fontName=\"%s\" fontID=\"%d\"/>\n", txt->font_table->fonts[j].fontName, txt->font_table->fonts[j].fontID);
+			gf_fprintf(dump, ">\n");
+			gf_fprintf(dump, "<FontTable>\n");
+			if (txt_e->font_table) {
+				for (j=0; j<txt_e->font_table->entry_count; j++) {
+					gf_fprintf(dump, "<FontTableEntry fontName=\"%s\" fontID=\"%d\"/>\n", txt_e->font_table->fonts[j].fontName, txt_e->font_table->fonts[j].fontID);
 
 				}
 			}
-			fprintf(dump, "</FontTable>\n");
-			if ((txt->default_box.bottom == txt->default_box.top) || (txt->default_box.right == txt->default_box.left)) {
-				txt->default_box.top = txt->default_box.left = 0;
-				txt->default_box.right = trak->Header->width / 65536;
-				txt->default_box.bottom = trak->Header->height / 65536;
-			}
-			tx3g_dump_box_nobox(dump, &txt->default_box);
-			tx3g_dump_style_nobox(dump, &txt->default_style, NULL, 0);
-			fprintf(dump, "</TextSampleDescription>\n");
+			gf_fprintf(dump, "</FontTable>\n");
+			if ((txt_e->default_box.bottom == txt_e->default_box.top) || (txt_e->default_box.right == txt_e->default_box.left)) {
+				txt_e->default_box.top = txt_e->default_box.left = 0;
+				txt_e->default_box.right = trak->Header->width / 65536;
+				txt_e->default_box.bottom = trak->Header->height / 65536;
+			}
+			tx3g_dump_box_nobox(dump, &txt_e->default_box);
+			tx3g_dump_style_nobox(dump, &txt_e->default_style, NULL, 0);
+			gf_fprintf(dump, "</TextSampleDescription>\n");
 		} else {
-			GF_TextSampleEntryBox *text = (GF_TextSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
-			fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
+			GF_TextSampleEntryBox *text = (GF_TextSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
+			gf_fprintf(dump, "<TextSampleDescription horizontalJustification=\"");
 			switch (text->textJustification) {
 			case 1:
-				fprintf(dump, "center");
+				gf_fprintf(dump, "center");
 				break;
 			case -1:
-				fprintf(dump, "right");
+				gf_fprintf(dump, "right");
 				break;
 			default:
-				fprintf(dump, "left");
+				gf_fprintf(dump, "left");
 				break;
 			}
-			fprintf(dump, "\"");
+			gf_fprintf(dump, "\"");
 
 			tx3g_dump_rgb16(dump, " backColor", text->background_color);
 
@@ -2927,70 +2915,70 @@
 			}
 
 			if (text->displayFlags & GF_TXT_SCROLL_IN) {
-				if (text->displayFlags & GF_TXT_SCROLL_OUT) fprintf(dump, " scroll=\"InOut\"");
-				else fprintf(dump, " scroll=\"In\"");
+				if (text->displayFlags & GF_TXT_SCROLL_OUT) gf_fprintf(dump, " scroll=\"InOut\"");
+				else gf_fprintf(dump, " scroll=\"In\"");
 			} else if (text->displayFlags & GF_TXT_SCROLL_OUT) {
-				fprintf(dump, " scroll=\"Out\"");
+				gf_fprintf(dump, " scroll=\"Out\"");
 			} else {
-				fprintf(dump, " scroll=\"None\"");
+				gf_fprintf(dump, " scroll=\"None\"");
 			}
-			fprintf(dump, ">\n");
+			gf_fprintf(dump, ">\n");
 
 			tx3g_dump_box_nobox(dump, &text->default_box);
-			fprintf(dump, "</TextSampleDescription>\n");
+			gf_fprintf(dump, "</TextSampleDescription>\n");
 		}
 	}
-	fprintf(dump, "</TextStreamHeader>\n");
+	gf_fprintf(dump, "</TextStreamHeader>\n");
 
 	last_DTS = 0;
 	count = gf_isom_get_sample_count(the_file, track);
 	for (i=0; i<count; i++) {
 		GF_BitStream *bs;
-		GF_TextSample *txt;
+		GF_TextSample *s_txt;
 		GF_ISOSample *s = gf_isom_get_sample(the_file, track, i+1, &di);
 		if (!s) continue;
 
-		fprintf(dump, "<TextSample sampleTime=\"%s\" sampleDescriptionIndex=\"%d\"", tx3g_format_time(s->DTS, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE), di);
+		gf_fprintf(dump, "<TextSample sampleTime=\"%s\" sampleDescriptionIndex=\"%d\"", tx3g_format_time(s->DTS, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE), di);
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
-		txt = gf_isom_parse_texte_sample(bs);
+		s_txt = gf_isom_parse_text_sample(bs);
 		gf_bs_del(bs);
 
 		if (!box_dump) {
-			if (txt->highlight_color) {
-				fprintf(dump, " ");
-				tx3g_dump_rgba8(dump, "highlightColor", txt->highlight_color->hil_color);
+			if (s_txt->highlight_color) {
+				gf_fprintf(dump, " ");
+				tx3g_dump_rgba8(dump, "highlightColor", s_txt->highlight_color->hil_color);
 			}
-			if (txt->scroll_delay) {
-				Double delay = txt->scroll_delay->scroll_delay;
+			if (s_txt->scroll_delay) {
+				Double delay = s_txt->scroll_delay->scroll_delay;
 				delay /= trak->Media->mediaHeader->timeScale;
-				fprintf(dump, " scrollDelay=\"%g\"", delay);
+				gf_fprintf(dump, " scrollDelay=\"%g\"", delay);
 			}
-			if (txt->wrap) fprintf(dump, " wrap=\"%s\"", (txt->wrap->wrap_flag==0x01) ? "Automatic" : "None");
+			if (s_txt->wrap) gf_fprintf(dump, " wrap=\"%s\"", (s_txt->wrap->wrap_flag==0x01) ? "Automatic" : "None");
 		}
 
 		so_count = 0;
 
-		fprintf(dump, " xml:space=\"preserve\">");
-		if (!txt->len) {
+		gf_fprintf(dump, " xml:space=\"preserve\">");
+		if (!s_txt->len) {
 			last_DTS = (u32) trak->Media->mediaHeader->duration;
 		} else {
 			unsigned short utf16Line[10000];
 			last_DTS = s->DTS;
 			/*UTF16*/
-			if ((txt->len>2) && ((unsigned char) txt->text[0] == (unsigned char) 0xFE) && ((unsigned char) txt->text[1] == (unsigned char) 0xFF)) {
+			if ((s_txt->len>2) && ((unsigned char) s_txt->text[0] == (unsigned char) 0xFE) && ((unsigned char) s_txt->text[1] == (unsigned char) 0xFF)) {
 				/*copy 2 more chars because the lib always add 2 '0' at the end for UTF16 end of string*/
-				memcpy((char *) utf16Line, txt->text+2, sizeof(char) * (txt->len));
+				memcpy((char *) utf16Line, s_txt->text+2, sizeof(char) * (s_txt->len));
 				len = gf_utf8_wcslen((const u16*)utf16Line);
 			} else {
 				char *str;
-				str = txt->text;
+				str = s_txt->text;
 				len = gf_utf8_mbstowcs((u16*)utf16Line, 10000, (const char **) &str);
 			}
 			if (len != (size_t) -1) {
 				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) ) {
-						fprintf(dump, "\n");
+						gf_fprintf(dump, "\n");
 						if ((utf16Line[j]=='\r') && (utf16Line[j+1]=='\n')) {
 							shift_offset[so_count] = j;
 							so_count++;
@@ -3000,25 +2988,25 @@
 					else {
 						switch (utf16Line[j]) {
 						case '\'':
-							fprintf(dump, "&apos;");
+							gf_fprintf(dump, "&apos;");
 							break;
 						case '\"':
-							fprintf(dump, "&quot;");
+							gf_fprintf(dump, "&quot;");
 							break;
 						case '&':
-							fprintf(dump, "&amp;");
+							gf_fprintf(dump, "&amp;");
 							break;
 						case '>':
-							fprintf(dump, "&gt;");
+							gf_fprintf(dump, "&gt;");
 							break;
 						case '<':
-							fprintf(dump, "&lt;");
+							gf_fprintf(dump, "&lt;");
 							break;
 						default:
 							if (utf16Line[j] < 128) {
-								fprintf(dump, "%c", (u8) utf16Line[j]);
+								gf_fprintf(dump, "%c", (u8) utf16Line[j]);
 							} else {
-								fprintf(dump, "&#%d;", utf16Line[j]);
+								gf_fprintf(dump, "&#%d;", utf16Line[j]);
 							}
 							break;
 						}
@@ -3029,27 +3017,27 @@
 
 		if (box_dump) {
 
-			if (txt->highlight_color)
-				gf_isom_box_dump((GF_Box*) txt->highlight_color, dump);
-			if (txt->scroll_delay)
-				gf_isom_box_dump((GF_Box*) txt->scroll_delay, dump);
-			if (txt->wrap)
-				gf_isom_box_dump((GF_Box*) txt->wrap, dump);
-			if (txt->box)
-				gf_isom_box_dump((GF_Box*) txt->box, dump);
-			if (txt->styles)
-				gf_isom_box_dump((GF_Box*) txt->styles, dump);
+			if (s_txt->highlight_color)
+				gf_isom_box_dump((GF_Box*) s_txt->highlight_color, dump);
+			if (s_txt->scroll_delay)
+				gf_isom_box_dump((GF_Box*) s_txt->scroll_delay, dump);
+			if (s_txt->wrap)
+				gf_isom_box_dump((GF_Box*) s_txt->wrap, dump);
+			if (s_txt->box)
+				gf_isom_box_dump((GF_Box*) s_txt->box, dump);
+			if (s_txt->styles)
+				gf_isom_box_dump((GF_Box*) s_txt->styles, dump);
 		} else {
 
-			if (txt->box) tx3g_dump_box_nobox(dump, &txt->box->box);
-			if (txt->styles) {
-				for (j=0; j<txt->styles->entry_count; j++) {
-					tx3g_dump_style_nobox(dump, &txt->styles->styles[j], shift_offset, so_count);
+			if (s_txt->box) tx3g_dump_box_nobox(dump, &s_txt->box->box);
+			if (s_txt->styles) {
+				for (j=0; j<s_txt->styles->entry_count; j++) {
+					tx3g_dump_style_nobox(dump, &s_txt->styles->styles[j], shift_offset, so_count);
 				}
 			}
 		}
 		j=0;
-		while ((a = (GF_Box *)gf_list_enum(txt->others, &j))) {
+		while ((a = (GF_Box *)gf_list_enum(s_txt->others, &j))) {
 			if (box_dump) {
 				gf_isom_box_dump((GF_Box*) a, dump);
 				continue;
@@ -3057,22 +3045,22 @@
 
 			switch (a->type) {
 			case GF_ISOM_BOX_TYPE_HLIT:
-				fprintf(dump, "<Highlight ");
+				gf_fprintf(dump, "<Highlight ");
 				tx3g_print_char_offsets(dump, ((GF_TextHighlightBox *)a)->startcharoffset, ((GF_TextHighlightBox *)a)->endcharoffset, shift_offset, so_count);
-				fprintf(dump, "/>\n");
+				gf_fprintf(dump, "/>\n");
 				break;
 			case GF_ISOM_BOX_TYPE_HREF:
 			{
 				GF_TextHyperTextBox *ht = (GF_TextHyperTextBox *)a;
-				fprintf(dump, "<HyperLink ");
+				gf_fprintf(dump, "<HyperLink ");
 				tx3g_print_char_offsets(dump, ht->startcharoffset, ht->endcharoffset, shift_offset, so_count);
-				fprintf(dump, "URL=\"%s\" URLToolTip=\"%s\"/>\n", ht->URL ? ht->URL : "", ht->URL_hint ? ht->URL_hint : "");
+				gf_fprintf(dump, "URL=\"%s\" URLToolTip=\"%s\"/>\n", ht->URL ? ht->URL : "", ht->URL_hint ? ht->URL_hint : "");
 			}
 			break;
 			case GF_ISOM_BOX_TYPE_BLNK:
-				fprintf(dump, "<Blinking ");
+				gf_fprintf(dump, "<Blinking ");
 				tx3g_print_char_offsets(dump, ((GF_TextBlinkBox *)a)->startcharoffset, ((GF_TextBlinkBox *)a)->endcharoffset, shift_offset, so_count);
-				fprintf(dump, "/>\n");
+				gf_fprintf(dump, "/>\n");
 				break;
 			case GF_ISOM_BOX_TYPE_KROK:
 			{
@@ -3081,47 +3069,47 @@
 				GF_TextKaraokeBox *krok = (GF_TextKaraokeBox *)a;
 				t = krok->highlight_starttime;
 				t /= trak->Media->mediaHeader->timeScale;
-				fprintf(dump, "<Karaoke startTime=\"%g\">\n", t);
+				gf_fprintf(dump, "<Karaoke startTime=\"%g\">\n", t);
 				for (k=0; k<krok->nb_entries; k++) {
 					t = krok->records[k].highlight_endtime;
 					t /= trak->Media->mediaHeader->timeScale;
-					fprintf(dump, "<KaraokeRange ");
+					gf_fprintf(dump, "<KaraokeRange ");
 					tx3g_print_char_offsets(dump, krok->records[k].start_charoffset, krok->records[k].end_charoffset, shift_offset, so_count);
-					fprintf(dump, "endTime=\"%g\"/>\n", t);
+					gf_fprintf(dump, "endTime=\"%g\"/>\n", t);
 				}
-				fprintf(dump, "</Karaoke>\n");
+				gf_fprintf(dump, "</Karaoke>\n");
 			}
 				break;
 			}
 		}
 
-		fprintf(dump, "</TextSample>\n");
+		gf_fprintf(dump, "</TextSample>\n");
 		gf_isom_sample_del(&s);
-		gf_isom_delete_text_sample(txt);
+		gf_isom_delete_text_sample(s_txt);
 		gf_set_progress("TTXT Extract", i, count);
 	}
 	if (last_DTS < trak->Media->mediaHeader->duration) {
-		fprintf(dump, "<TextSample sampleTime=\"%s\" text=\"\" />\n", tx3g_format_time(trak->Media->mediaHeader->duration, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE));
+		gf_fprintf(dump, "<TextSample sampleTime=\"%s\" text=\"\" />\n", tx3g_format_time(trak->Media->mediaHeader->duration, trak->Media->mediaHeader->timeScale, szDur, GF_FALSE));
 	}
 
 	if (box_dump) {
-		fprintf(dump, "</TextTrack>\n");
+		gf_fprintf(dump, "</TextTrack>\n");
 	} else {
-		fprintf(dump, "</TextStream>\n");
+		gf_fprintf(dump, "</TextStream>\n");
 	}
 	if (count) gf_set_progress("TTXT Extract", count, count);
 	return GF_OK;
 }
 
+#include <gpac/webvtt.h>
 static GF_Err gf_isom_dump_srt_track(GF_ISOFile *the_file, u32 track, FILE *dump)
 {
 	u32 i, j, k, count, di, len, ts, cur_frame;
 	u64 start, end;
 	GF_Tx3gSampleEntryBox *txtd;
-	GF_BitStream *bs;
 	char szDur[100];
-
 	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;
 	switch (trak->Media->handler->handlerType) {
 	case GF_ISOM_MEDIA_TEXT:
@@ -3135,8 +3123,19 @@
 	cur_frame = 0;
 	end = 0;
 
+	switch (subtype) {
+	case GF_ISOM_SUBTYPE_TX3G:
+	case GF_ISOM_SUBTYPE_TEXT:
+	case GF_ISOM_SUBTYPE_STXT:
+	case GF_ISOM_SUBTYPE_WVTT:
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
 	count = gf_isom_get_sample_count(the_file, track);
 	for (i=0; i<count; i++) {
+		GF_BitStream *bs;
 		GF_TextSample *txt;
 		GF_ISOSample *s = gf_isom_get_sample(the_file, track, i+1, &di);
 		if (!s) continue;
@@ -3156,20 +3155,57 @@
 			end = gf_isom_get_media_duration(the_file, track) ;
 		}
 		cur_frame++;
-		fprintf(dump, "%d\n", cur_frame);
+		gf_fprintf(dump, "%d\n", cur_frame);
 		tx3g_format_time(start, ts, szDur, GF_TRUE);
-		fprintf(dump, "%s --> ", szDur);
+		gf_fprintf(dump, "%s --> ", szDur);
 		tx3g_format_time(end, ts, szDur, GF_TRUE);
-		fprintf(dump, "%s\n", szDur);
+		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);
+			GF_List *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);
+			for (j = 0; j < gf_list_count(cues); j++) {
+				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, j);
+				webvtt_write_cue(bs, cue);
+				gf_webvtt_cue_del(cue);
+			}
+			gf_list_del(cues);
+			gf_bs_write_u16(bs, 0);
+			gf_bs_get_content(bs, &data, &data_len);
+			gf_bs_del(bs);
 
+			if (data) {
+				gf_fprintf(dump, "%s\n", data);
+				gf_free(data);
+			} else {
+				gf_fprintf(dump, "\n");
+			}
+			continue;
+		} else if (subtype == GF_ISOM_SUBTYPE_STXT) {
+			if (s->dataLength)
+			gf_fprintf(dump, "%s\n", s->data);
+			continue;
+		}
+		else if ((subtype!=GF_ISOM_SUBTYPE_TX3G) && (subtype!=GF_ISOM_SUBTYPE_TEXT)) {
+			gf_fprintf(dump, "unknwon\n");
+			continue;
+		}
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
-		txt = gf_isom_parse_texte_sample(bs);
+		txt = gf_isom_parse_text_sample(bs);
 		gf_bs_del(bs);
 
-		txtd = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, di-1);
+		txtd = (GF_Tx3gSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, di-1);
 
-		if (!txt->len) {
-			fprintf(dump, "\n");
+		if (!txt || !txt->len) {
+			gf_fprintf(dump, "\n");
 		} else {
 			u32 styles, char_num, new_styles, color, new_color;
 			u16 utf16Line[10000];
@@ -3209,21 +3245,21 @@
 					}
 				}
 				if (new_styles != styles) {
-					if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "<b>");
-					if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "<i>");
-					if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "<u>");
-
-					if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) fprintf(dump, "</u>");
-					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) fprintf(dump, "</i>");
-					if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) fprintf(dump, "</b>");
+					if ((new_styles & GF_TXT_STYLE_BOLD) && !(styles & GF_TXT_STYLE_BOLD)) gf_fprintf(dump, "<b>");
+					if ((new_styles & GF_TXT_STYLE_ITALIC) && !(styles & GF_TXT_STYLE_ITALIC)) gf_fprintf(dump, "<i>");
+					if ((new_styles & GF_TXT_STYLE_UNDERLINED) && !(styles & GF_TXT_STYLE_UNDERLINED)) gf_fprintf(dump, "<u>");
+
+					if ((styles & GF_TXT_STYLE_UNDERLINED) && !(new_styles & GF_TXT_STYLE_UNDERLINED)) gf_fprintf(dump, "</u>");
+					if ((styles & GF_TXT_STYLE_ITALIC) && !(new_styles & GF_TXT_STYLE_ITALIC)) gf_fprintf(dump, "</i>");
+					if ((styles & GF_TXT_STYLE_BOLD) && !(new_styles & GF_TXT_STYLE_BOLD)) gf_fprintf(dump, "</b>");
 
 					styles = new_styles;
 				}
 				if (new_color != color) {
 					if (new_color ==txtd->default_style.text_color) {
-						fprintf(dump, "</font>");
+						gf_fprintf(dump, "</font>");
 					} else {
-						fprintf(dump, "<font color=\"%s\">", gf_color_get_name(new_color) );
+						gf_fprintf(dump, "<font color=\"%s\">", gf_color_get_name(new_color) );
 					}
 					color = new_color;
 				}
@@ -3232,7 +3268,7 @@
 				is_new_line = GF_FALSE;
 				if ((utf16Line[j]=='\n') || (utf16Line[j]=='\r') ) {
 					if ((utf16Line[j]=='\r') && (utf16Line[j+1]=='\n')) j++;
-					fprintf(dump, "\n");
+					gf_fprintf(dump, "\n");
 					is_new_line = GF_TRUE;
 				}
 
@@ -3246,28 +3282,28 @@
 					sl = gf_utf8_wcstombs(szChar, 30, (const unsigned short **) &swz);
 					if (sl == (size_t)-1) sl=0;
 					szChar[(u32) sl]=0;
-					fprintf(dump, "%s", szChar);
+					gf_fprintf(dump, "%s", szChar);
 				}
 				char_num++;
 			}
 			new_styles = 0;
 			if (new_styles != styles) {
-				if (styles & GF_TXT_STYLE_UNDERLINED) fprintf(dump, "</u>");
-				if (styles & GF_TXT_STYLE_ITALIC) fprintf(dump, "</i>");
-				if (styles & GF_TXT_STYLE_BOLD) fprintf(dump, "</b>");
+				if (styles & GF_TXT_STYLE_UNDERLINED) gf_fprintf(dump, "</u>");
+				if (styles & GF_TXT_STYLE_ITALIC) gf_fprintf(dump, "</i>");
+				if (styles & GF_TXT_STYLE_BOLD) gf_fprintf(dump, "</b>");
 
 //				styles = 0;
 			}
 
 			if (color != txtd->default_style.text_color) {
-				fprintf(dump, "</font>");
+				gf_fprintf(dump, "</font>");
 //				color = txtd->default_style.text_color;
 			}
-			fprintf(dump, "\n");
+			gf_fprintf(dump, "\n");
 		}
 		gf_isom_sample_del(&s);
 		gf_isom_delete_text_sample(txt);
-		fprintf(dump, "\n");
+		gf_fprintf(dump, "\n");
 		gf_set_progress("SRT Extract", i, count);
 	}
 	if (count) gf_set_progress("SRT Extract", i, count);
@@ -3295,17 +3331,17 @@
 	strcpy(nhmlFileName, the_file->fileName);
 	strcat(nhmlFileName, ".nhml");
 	nhmlFile = gf_fopen(nhmlFileName, "wt");
-	fprintf(nhmlFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-	fprintf(nhmlFile, "<NHNTStream streamType=\"3\" objectTypeIndication=\"10\" timeScale=\"%d\" baseMediaFile=\"file.svg\" inRootOD=\"yes\">\n", trak->Media->mediaHeader->timeScale);
-	fprintf(nhmlFile, "<NHNTSample isRAP=\"yes\" DTS=\"0\" xmlFrom=\"doc.start\" xmlTo=\"text_1.start\"/>\n");
+	gf_fprintf(nhmlFile, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	gf_fprintf(nhmlFile, "<NHNTStream streamType=\"3\" objectTypeIndication=\"10\" timeScale=\"%d\" baseMediaFile=\"file.svg\" inRootOD=\"yes\">\n", trak->Media->mediaHeader->timeScale);
+	gf_fprintf(nhmlFile, "<NHNTSample isRAP=\"yes\" DTS=\"0\" xmlFrom=\"doc.start\" xmlTo=\"text_1.start\"/>\n");
 
 	ts = trak->Media->mediaHeader->timeScale;
 	cur_frame = 0;
 	end = 0;
 
-	fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-	fprintf(dump, "<svg version=\"1.2\" baseProfile=\"tiny\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"%d\" height=\"%d\" fill=\"black\">\n", trak->Header->width >> 16 , trak->Header->height >> 16);
-	fprintf(dump, "<g transform=\"translate(%d, %d)\" text-anchor=\"middle\">\n", (trak->Header->width >> 16)/2 , (trak->Header->height >> 16)/2);
+	gf_fprintf(dump, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	gf_fprintf(dump, "<svg version=\"1.2\" baseProfile=\"tiny\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"%d\" height=\"%d\" fill=\"black\">\n", trak->Header->width >> 16 , trak->Header->height >> 16);
+	gf_fprintf(dump, "<g transform=\"translate(%d, %d)\" text-anchor=\"middle\">\n", (trak->Header->width >> 16)/2 , (trak->Header->height >> 16)/2);
 
 	count = gf_isom_get_sample_count(the_file, track);
 	for (i=0; i<count; i++) {
@@ -3328,33 +3364,33 @@
 
 		cur_frame++;
 		bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
-		txt = gf_isom_parse_texte_sample(bs);
+		txt = gf_isom_parse_text_sample(bs);
 		gf_bs_del(bs);
 
 		if (!txt->len) continue;
 
-		fprintf(dump, " <text id=\"text_%d\" display=\"none\">%s\n", cur_frame, txt->text);
-		fprintf(dump, "  <set attributeName=\"display\" to=\"inline\" begin=\"%g\" end=\"%g\"/>\n", ((s64)start*1.0)/ts, ((s64)end*1.0)/ts);
-		fprintf(dump, "  <discard begin=\"%g\"/>\n", ((s64)end*1.0)/ts);
-		fprintf(dump, " </text>\n");
+		gf_fprintf(dump, " <text id=\"text_%d\" display=\"none\">%s\n", cur_frame, txt->text);
+		gf_fprintf(dump, "  <set attributeName=\"display\" to=\"inline\" begin=\"%g\" end=\"%g\"/>\n", ((s64)start*1.0)/ts, ((s64)end*1.0)/ts);
+		gf_fprintf(dump, "  <discard begin=\"%g\"/>\n", ((s64)end*1.0)/ts);
+		gf_fprintf(dump, " </text>\n");
 		gf_isom_sample_del(&s);
 		gf_isom_delete_text_sample(txt);
-		fprintf(dump, "\n");
+		gf_fprintf(dump, "\n");
 		gf_set_progress("SRT Extract", i, count);
 
 		if (i == count - 2) {
-			fprintf(nhmlFile, "<NHNTSample isRAP=\"no\" DTS=\"%f\" xmlFrom=\"text_%d.start\" xmlTo=\"doc.end\"/>\n", ((s64)start*1.0), cur_frame);
+			gf_fprintf(nhmlFile, "<NHNTSample isRAP=\"no\" DTS=\"%f\" xmlFrom=\"text_%d.start\" xmlTo=\"doc.end\"/>\n", ((s64)start*1.0), cur_frame);
 		} else {
-			fprintf(nhmlFile, "<NHNTSample isRAP=\"no\" DTS=\"%f\" xmlFrom=\"text_%d.start\" xmlTo=\"text_%d.start\"/>\n", ((s64)start*1.0), cur_frame, cur_frame+1);
+			gf_fprintf(nhmlFile, "<NHNTSample isRAP=\"no\" DTS=\"%f\" xmlFrom=\"text_%d.start\" xmlTo=\"text_%d.start\"/>\n", ((s64)start*1.0), cur_frame, cur_frame+1);
 		}
 
 	}
-	fprintf(dump, "</g>\n");
-	fprintf(dump, "</svg>\n");
+	gf_fprintf(dump, "</g>\n");
+	gf_fprintf(dump, "</svg>\n");
 
-	fprintf(nhmlFile, "</NHNTStream>\n");
+	gf_fprintf(nhmlFile, "</NHNTStream>\n");
 	gf_fclose(nhmlFile);
-	gf_delete_file(nhmlFileName);
+	gf_file_delete(nhmlFileName);
 	if (count) gf_set_progress("SRT Extract", i, count);
 	return GF_OK;
 }
@@ -3377,88 +3413,72 @@
 
 
 /* ISMA 1.0 Encryption and Authentication V 1.0  dump */
-GF_Err sinf_dump(GF_Box *a, FILE * trace)
+GF_Err sinf_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ProtectionSchemeInfoBox *p;
-	p = (GF_ProtectionSchemeInfoBox *)a;
 	gf_isom_box_dump_start(a, "ProtectionSchemeInfoBox", trace);
-	fprintf(trace, ">\n");
-	if (p->size)
-		gf_isom_box_dump_ex(p->original_format, trace, GF_ISOM_BOX_TYPE_FRMA);
-	if (p->size)
-		gf_isom_box_dump_ex(p->scheme_type, trace, GF_ISOM_BOX_TYPE_SCHM);
-	if (p->size)
-		gf_isom_box_dump_ex(p->info, trace, GF_ISOM_BOX_TYPE_SCHI);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ProtectionSchemeInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err frma_dump(GF_Box *a, FILE * trace)
+GF_Err frma_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OriginalFormatBox *p;
 	p = (GF_OriginalFormatBox *)a;
 	gf_isom_box_dump_start(a, "OriginalFormatBox", trace);
-	fprintf(trace, "data_format=\"%s\">\n", gf_4cc_to_str(p->data_format));
+	gf_fprintf(trace, "data_format=\"%s\">\n", gf_4cc_to_str(p->data_format));
 	gf_isom_box_dump_done("OriginalFormatBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err schm_dump(GF_Box *a, FILE * trace)
+GF_Err schm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SchemeTypeBox *p;
 	p = (GF_SchemeTypeBox *)a;
 	gf_isom_box_dump_start(a, "SchemeTypeBox", trace);
-	fprintf(trace, "scheme_type=\"%s\" scheme_version=\"%d\" ", gf_4cc_to_str(p->scheme_type), p->scheme_version);
-	if (p->URI) fprintf(trace, "scheme_uri=\"%s\"", p->URI);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, "scheme_type=\"%s\" scheme_version=\"%d\" ", gf_4cc_to_str(p->scheme_type), p->scheme_version);
+	if (p->URI) gf_fprintf(trace, "scheme_uri=\"%s\"", p->URI);
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done("SchemeTypeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err schi_dump(GF_Box *a, FILE * trace)
+GF_Err schi_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_SchemeInformationBox *p;
-	p = (GF_SchemeInformationBox *)a;
 	gf_isom_box_dump_start(a, "SchemeInformationBox", trace);
-	fprintf(trace, ">\n");
-	if (p->ikms) gf_isom_box_dump(p->ikms, trace);
-	if (p->isfm) gf_isom_box_dump(p->isfm, trace);
-	if (p->islt) gf_isom_box_dump(p->islt, trace);
-	if (p->odkm) gf_isom_box_dump(p->odkm, trace);
-	if (p->tenc) gf_isom_box_dump(p->tenc, trace);
-	if (p->adkm) gf_isom_box_dump(p->adkm, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SchemeInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iKMS_dump(GF_Box *a, FILE * trace)
+GF_Err iKMS_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ISMAKMSBox *p;
 	p = (GF_ISMAKMSBox *)a;
 	gf_isom_box_dump_start(a, "KMSBox", trace);
-	fprintf(trace, "kms_URI=\"%s\">\n", p->URI);
+	gf_fprintf(trace, "kms_URI=\"%s\">\n", p->URI);
 	gf_isom_box_dump_done("KMSBox", a, trace);
 	return GF_OK;
 
 }
 
-GF_Err iSFM_dump(GF_Box *a, FILE * trace)
+GF_Err iSFM_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ISMASampleFormatBox *p;
 	const char *name = (a->type==GF_ISOM_BOX_TYPE_ISFM) ? "ISMASampleFormat" : "OMADRMAUFormatBox";
 	p = (GF_ISMASampleFormatBox *)a;
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, "selective_encryption=\"%d\" key_indicator_length=\"%d\" IV_length=\"%d\">\n", p->selective_encryption, p->key_indicator_length, p->IV_length);
+	gf_fprintf(trace, "selective_encryption=\"%d\" key_indicator_length=\"%d\" IV_length=\"%d\">\n", p->selective_encryption, p->key_indicator_length, p->IV_length);
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err iSLT_dump(GF_Box *a, FILE * trace)
+GF_Err iSLT_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ISMACrypSaltBox *p = (GF_ISMACrypSaltBox *)a;
 	gf_isom_box_dump_start(a, "ISMACrypSaltBox", trace);
-	fprintf(trace, "salt=\""LLU"\">\n", p->salt);
+	gf_fprintf(trace, "salt=\""LLU"\">\n", p->salt);
 	gf_isom_box_dump_done("ISMACrypSaltBox", a, trace);
 	return GF_OK;
 }
@@ -3475,7 +3495,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 
-	fprintf(trace, "<ISMACrypSampleDescriptions>\n");
+	gf_fprintf(trace, "<ISMACrypSampleDescriptions>\n");
 	count = gf_isom_get_sample_description_count(the_file, trackNumber);
 	for (i=0; i<count; i++) {
 		e = Media_GetSampleDesc(trak->Media, i+1, (GF_SampleEntryBox **) &entry, NULL);
@@ -3492,7 +3512,7 @@
 		}
 		gf_isom_box_dump(entry, trace);
 	}
-	fprintf(trace, "</ISMACrypSampleDescriptions>\n");
+	gf_fprintf(trace, "</ISMACrypSampleDescriptions>\n");
 	return GF_OK;
 }
 
@@ -3512,15 +3532,15 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	fprintf(trace, "<ISMACrypSample SampleNumber=\"%d\" DataSize=\"%d\" CompositionTime=\""LLD"\" ", SampleNum, isma_samp->dataLength, LLD_CAST (samp->DTS+samp->CTS_Offset) );
-	if (samp->CTS_Offset) fprintf(trace, "DecodingTime=\""LLD"\" ", LLD_CAST samp->DTS);
-	if (gf_isom_has_sync_points(the_file, trackNumber)) fprintf(trace, "RandomAccessPoint=\"%s\" ", samp->IsRAP ? "Yes" : "No");
-	fprintf(trace, "IsEncrypted=\"%s\" ", (isma_samp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? "Yes" : "No");
+	gf_fprintf(trace, "<ISMACrypSample SampleNumber=\"%d\" DataSize=\"%d\" CompositionTime=\""LLD"\" ", SampleNum, isma_samp->dataLength, (samp->DTS+samp->CTS_Offset) );
+	if (samp->CTS_Offset) gf_fprintf(trace, "DecodingTime=\""LLD"\" ", samp->DTS);
+	if (gf_isom_has_sync_points(the_file, trackNumber)) gf_fprintf(trace, "RandomAccessPoint=\"%s\" ", samp->IsRAP ? "Yes" : "No");
+	gf_fprintf(trace, "IsEncrypted=\"%s\" ", (isma_samp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? "Yes" : "No");
 	if (isma_samp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
-		fprintf(trace, "IV=\""LLD"\" ", LLD_CAST isma_samp->IV);
+		gf_fprintf(trace, "IV=\""LLD"\" ", isma_samp->IV);
 		if (isma_samp->key_indicator) dump_data_attribute(trace, "KeyIndicator", (char*)isma_samp->key_indicator, isma_samp->KI_length);
 	}
-	fprintf(trace, "/>\n");
+	gf_fprintf(trace, "/>\n");
 
 	gf_isom_sample_del(&samp);
 	gf_isom_ismacryp_delete_sample(isma_samp);
@@ -3532,9 +3552,8 @@
 
 /* Apple extensions */
 
-GF_Err ilst_item_dump(GF_Box *a, FILE * trace)
+GF_Err ilst_item_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_BitStream *bs;
 	u32 val;
 	Bool no_dump = GF_FALSE;
 	char *name = "UnknownBox";
@@ -3613,6 +3632,7 @@
 	gf_isom_box_dump_start(a, name, trace);
 
 	if (!no_dump) {
+		GF_BitStream *bs;
 		switch (itune->type) {
 		case GF_ISOM_BOX_TYPE_DISK:
 		case GF_ISOM_BOX_TYPE_TRKN:
@@ -3620,67 +3640,67 @@
 			gf_bs_read_int(bs, 16);
 			val = gf_bs_read_int(bs, 16);
 			if (itune->type==GF_ISOM_BOX_TYPE_DISK) {
-				fprintf(trace, " DiskNumber=\"%d\" NbDisks=\"%d\" ", val, gf_bs_read_int(bs, 16) );
+				gf_fprintf(trace, " DiskNumber=\"%d\" NbDisks=\"%d\" ", val, gf_bs_read_int(bs, 16) );
 			} else {
-				fprintf(trace, " TrackNumber=\"%d\" NbTracks=\"%d\" ", val, gf_bs_read_int(bs, 16) );
+				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);
-			fprintf(trace, " BPM=\"%d\" ", gf_bs_read_int(bs, 16) );
+			gf_fprintf(trace, " BPM=\"%d\" ", gf_bs_read_int(bs, 16) );
 			gf_bs_del(bs);
 			break;
 		case GF_ISOM_BOX_TYPE_CPIL:
-			fprintf(trace, " IsCompilation=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
+			gf_fprintf(trace, " IsCompilation=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
 			break;
 		case GF_ISOM_BOX_TYPE_PGAP:
-			fprintf(trace, " IsGapeless=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
+			gf_fprintf(trace, " IsGapeless=\"%s\" ", (itune->data && itune->data->data && itune->data->data[0]) ? "yes" : "no");
 			break;
 		default:
 			if (strcmp(name, "UnknownBox") && itune->data && itune->data->data) {
-				fprintf(trace, " value=\"");
+				gf_fprintf(trace, " value=\"");
 				if (itune->data && itune->data->data[0]) {
 					dump_data_string(trace, itune->data->data, itune->data->dataSize);
 				} else {
 					dump_data(trace, itune->data->data, itune->data->dataSize);
 				}
-				fprintf(trace, "\" ");
+				gf_fprintf(trace, "\" ");
 			}
 			break;
 		}
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 
-GF_Err abst_dump(GF_Box *a, FILE * trace)
+GF_Err abst_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_AdobeBootstrapInfoBox *p = (GF_AdobeBootstrapInfoBox*)a;
 	gf_isom_box_dump_start(a, "AdobeBootstrapBox", trace);
 
-	fprintf(trace, "BootstrapinfoVersion=\"%u\" Profile=\"%u\" Live=\"%u\" Update=\"%u\" TimeScale=\"%u\" CurrentMediaTime=\""LLU"\" SmpteTimeCodeOffset=\""LLU"\" ",
+	gf_fprintf(trace, "BootstrapinfoVersion=\"%u\" Profile=\"%u\" Live=\"%u\" Update=\"%u\" TimeScale=\"%u\" CurrentMediaTime=\""LLU"\" SmpteTimeCodeOffset=\""LLU"\" ",
 	        p->bootstrapinfo_version, p->profile, p->live, p->update, p->time_scale, p->current_media_time, p->smpte_time_code_offset);
 	if (p->movie_identifier)
-		fprintf(trace, "MovieIdentifier=\"%s\" ", p->movie_identifier);
+		gf_fprintf(trace, "MovieIdentifier=\"%s\" ", p->movie_identifier);
 	if (p->drm_data)
-		fprintf(trace, "DrmData=\"%s\" ", p->drm_data);
+		gf_fprintf(trace, "DrmData=\"%s\" ", p->drm_data);
 	if (p->meta_data)
-		fprintf(trace, "MetaData=\"%s\" ", p->meta_data);
-	fprintf(trace, ">\n");
+		gf_fprintf(trace, "MetaData=\"%s\" ", p->meta_data);
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<p->server_entry_count; i++) {
 		char *str = (char*)gf_list_get(p->server_entry_table, i);
-		fprintf(trace, "<ServerEntry>%s</ServerEntry>\n", str);
+		gf_fprintf(trace, "<ServerEntry>%s</ServerEntry>\n", str);
 	}
 
 	for (i=0; i<p->quality_entry_count; i++) {
 		char *str = (char*)gf_list_get(p->quality_entry_table, i);
-		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+		gf_fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
 	}
 
 	for (i=0; i<p->segment_run_table_count; i++)
@@ -3693,22 +3713,22 @@
 	return GF_OK;
 }
 
-GF_Err afra_dump(GF_Box *a, FILE * trace)
+GF_Err afra_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_AdobeFragRandomAccessBox *p = (GF_AdobeFragRandomAccessBox*)a;
 	gf_isom_box_dump_start(a, "AdobeFragmentRandomAccessBox", trace);
 
-	fprintf(trace, "LongIDs=\"%u\" LongOffsets=\"%u\" TimeScale=\"%u\">\n", p->long_ids, p->long_offsets, p->time_scale);
+	gf_fprintf(trace, "LongIDs=\"%u\" LongOffsets=\"%u\" TimeScale=\"%u\">\n", p->long_ids, p->long_offsets, p->time_scale);
 
 	for (i=0; i<p->entry_count; i++) {
 		GF_AfraEntry *ae = (GF_AfraEntry *)gf_list_get(p->local_access_entries, i);
-		fprintf(trace, "<LocalAccessEntry Time=\""LLU"\" Offset=\""LLU"\"/>\n", ae->time, ae->offset);
+		gf_fprintf(trace, "<LocalAccessEntry Time=\""LLU"\" Offset=\""LLU"\"/>\n", ae->time, ae->offset);
 	}
 
 	for (i=0; i<p->global_entry_count; i++) {
 		GF_GlobalAfraEntry *gae = (GF_GlobalAfraEntry *)gf_list_get(p->global_access_entries, i);
-		fprintf(trace, "<GlobalAccessEntry Time=\""LLU"\" Segment=\"%u\" Fragment=\"%u\" AfraOffset=\""LLU"\" OffsetFromAfra=\""LLU"\"/>\n",
+		gf_fprintf(trace, "<GlobalAccessEntry Time=\""LLU"\" Segment=\"%u\" Fragment=\"%u\" AfraOffset=\""LLU"\" OffsetFromAfra=\""LLU"\"/>\n",
 		        gae->time, gae->segment, gae->fragment, gae->afra_offset, gae->offset_from_afra);
 	}
 
@@ -3716,47 +3736,47 @@
 	return GF_OK;
 }
 
-GF_Err afrt_dump(GF_Box *a, FILE * trace)
+GF_Err afrt_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_AdobeFragmentRunTableBox *p = (GF_AdobeFragmentRunTableBox*)a;
 	gf_isom_box_dump_start(a, "AdobeFragmentRunTableBox", trace);
 
-	fprintf(trace, "TimeScale=\"%u\">\n", p->timescale);
+	gf_fprintf(trace, "TimeScale=\"%u\">\n", p->timescale);
 
 	for (i=0; i<p->quality_entry_count; i++) {
 		char *str = (char*)gf_list_get(p->quality_segment_url_modifiers, i);
-		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+		gf_fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
 	}
 
 	for (i=0; i<p->fragment_run_entry_count; i++) {
 		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(p->fragment_run_entry_table, i);
-		fprintf(trace, "<FragmentRunEntry FirstFragment=\"%u\" FirstFragmentTimestamp=\""LLU"\" FirstFragmentDuration=\"%u\"", fre->first_fragment, fre->first_fragment_timestamp, fre->fragment_duration);
+		gf_fprintf(trace, "<FragmentRunEntry FirstFragment=\"%u\" FirstFragmentTimestamp=\""LLU"\" FirstFragmentDuration=\"%u\"", fre->first_fragment, fre->first_fragment_timestamp, fre->fragment_duration);
 		if (!fre->fragment_duration)
-			fprintf(trace, " DiscontinuityIndicator=\"%u\"", fre->discontinuity_indicator);
-		fprintf(trace, "/>\n");
+			gf_fprintf(trace, " DiscontinuityIndicator=\"%u\"", fre->discontinuity_indicator);
+		gf_fprintf(trace, "/>\n");
 	}
 
 	gf_isom_box_dump_done("AdobeFragmentRunTableBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err asrt_dump(GF_Box *a, FILE * trace)
+GF_Err asrt_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_AdobeSegmentRunTableBox *p = (GF_AdobeSegmentRunTableBox*)a;
 	gf_isom_box_dump_start(a, "AdobeSegmentRunTableBox", trace);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<p->quality_entry_count; i++) {
 		char *str = (char*)gf_list_get(p->quality_segment_url_modifiers, i);
-		fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
+		gf_fprintf(trace, "<QualityEntry>%s</QualityEntry>\n", str);
 	}
 
 	for (i=0; i<p->segment_run_entry_count; i++) {
 		GF_AdobeSegmentRunEntry *sre = (GF_AdobeSegmentRunEntry *)gf_list_get(p->segment_run_entry_table, i);
-		fprintf(trace, "<SegmentRunEntry FirstSegment=\"%u\" FragmentsPerSegment=\"%u\"/>\n", sre->first_segment, sre->fragment_per_segment);
+		gf_fprintf(trace, "<SegmentRunEntry FirstSegment=\"%u\" FragmentsPerSegment=\"%u\"/>\n", sre->first_segment, sre->fragment_per_segment);
 	}
 
 	gf_isom_box_dump_done("AdobeSegmentRunTableBox", a, trace);
@@ -3765,7 +3785,7 @@
 
 #endif /*GPAC_DISABLE_ISOM_ADOBE*/
 
-GF_Err ilst_dump(GF_Box *a, FILE * trace)
+GF_Err ilst_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_Box *tag;
@@ -3773,150 +3793,146 @@
 	GF_ItemListBox *ptr;
 	ptr = (GF_ItemListBox *)a;
 	gf_isom_box_dump_start(a, "ItemListBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	i=0;
-	while ( (tag = (GF_Box*)gf_list_enum(ptr->other_boxes, &i))) {
-		e = ilst_item_dump(tag, trace);
+	while ( (tag = (GF_Box*)gf_list_enum(ptr->child_boxes, &i))) {
+		e = ilst_item_box_dump(tag, trace);
 		if(e) return e;
 	}
 	gf_isom_box_dump_done("ItemListBox", NULL, trace);
 	return GF_OK;
 }
 
-GF_Err databox_dump(GF_Box *a, FILE * trace)
+GF_Err databox_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "data", trace);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("data", a, trace);
 	return GF_OK;
 }
 
-GF_Err ohdr_dump(GF_Box *a, FILE * trace)
+GF_Err ohdr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OMADRMCommonHeaderBox *ptr = (GF_OMADRMCommonHeaderBox *)a;
 	gf_isom_box_dump_start(a, "OMADRMCommonHeaderBox", trace);
 
-	fprintf(trace, "EncryptionMethod=\"%d\" PaddingScheme=\"%d\" PlaintextLength=\""LLD"\" ",
+	gf_fprintf(trace, "EncryptionMethod=\"%d\" PaddingScheme=\"%d\" PlaintextLength=\""LLD"\" ",
 	        ptr->EncryptionMethod, ptr->PaddingScheme, ptr->PlaintextLength);
-	if (ptr->RightsIssuerURL) fprintf(trace, "RightsIssuerURL=\"%s\" ", ptr->RightsIssuerURL);
-	if (ptr->ContentID) fprintf(trace, "ContentID=\"%s\" ", ptr->ContentID);
+	if (ptr->RightsIssuerURL) gf_fprintf(trace, "RightsIssuerURL=\"%s\" ", ptr->RightsIssuerURL);
+	if (ptr->ContentID) gf_fprintf(trace, "ContentID=\"%s\" ", ptr->ContentID);
 	if (ptr->TextualHeaders) {
 		u32 i, offset;
 		char *start = ptr->TextualHeaders;
-		fprintf(trace, "TextualHeaders=\"");
+		gf_fprintf(trace, "TextualHeaders=\"");
 		i=offset=0;
 		while (i<ptr->TextualHeadersLen) {
 			if (start[i]==0) {
-				fprintf(trace, "%s ", start+offset);
+				gf_fprintf(trace, "%s ", start+offset);
 				offset=i+1;
 			}
 			i++;
 		}
-		fprintf(trace, "%s\"  ", start+offset);
+		gf_fprintf(trace, "%s\"  ", start+offset);
 	}
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("OMADRMCommonHeaderBox", a, trace);
 	return GF_OK;
 }
-GF_Err grpi_dump(GF_Box *a, FILE * trace)
+GF_Err grpi_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OMADRMGroupIDBox *ptr = (GF_OMADRMGroupIDBox *)a;
 	gf_isom_box_dump_start(a, "OMADRMGroupIDBox", trace);
 
-	fprintf(trace, "GroupID=\"%s\" EncryptionMethod=\"%d\" GroupKey=\" ", ptr->GroupID, ptr->GKEncryptionMethod);
+	gf_fprintf(trace, "GroupID=\"%s\" EncryptionMethod=\"%d\" GroupKey=\" ", ptr->GroupID, ptr->GKEncryptionMethod);
 	if (ptr->GroupKey)
 		dump_data(trace, ptr->GroupKey, ptr->GKLength);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("OMADRMGroupIDBox", a, trace);
 	return GF_OK;
 }
-GF_Err mdri_dump(GF_Box *a, FILE * trace)
+GF_Err mdri_box_dump(GF_Box *a, FILE * trace)
 {
 	//GF_OMADRMMutableInformationBox *ptr = (GF_OMADRMMutableInformationBox*)a;
 	gf_isom_box_dump_start(a, "OMADRMMutableInformationBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("OMADRMMutableInformationBox", a, trace);
 	return GF_OK;
 }
-GF_Err odtt_dump(GF_Box *a, FILE * trace)
+GF_Err odtt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OMADRMTransactionTrackingBox *ptr = (GF_OMADRMTransactionTrackingBox *)a;
 	gf_isom_box_dump_start(a, "OMADRMTransactionTrackingBox", trace);
 
-	fprintf(trace, "TransactionID=\"");
+	gf_fprintf(trace, "TransactionID=\"");
 	dump_data(trace, ptr->TransactionID, 16);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("OMADRMTransactionTrackingBox", a, trace);
 	return GF_OK;
 }
-GF_Err odrb_dump(GF_Box *a, FILE * trace)
+GF_Err odrb_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OMADRMRightsObjectBox*ptr = (GF_OMADRMRightsObjectBox*)a;
 	gf_isom_box_dump_start(a, "OMADRMRightsObjectBox", trace);
 
-	fprintf(trace, "OMARightsObject=\"");
+	gf_fprintf(trace, "OMARightsObject=\"");
 	dump_data(trace, ptr->oma_ro, ptr->oma_ro_size);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("OMADRMRightsObjectBox", a, trace);
 	return GF_OK;
 }
-GF_Err odkm_dump(GF_Box *a, FILE * trace)
+GF_Err odkm_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_OMADRMKMSBox *ptr = (GF_OMADRMKMSBox*)a;
 	gf_isom_box_dump_start(a, "OMADRMKMSBox", trace);
-
-	fprintf(trace, ">\n");
-	if (ptr->hdr) gf_isom_box_dump((GF_Box *)ptr->hdr, trace);
-	if (ptr->fmt) gf_isom_box_dump((GF_Box *)ptr->fmt, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("OMADRMKMSBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err pasp_dump(GF_Box *a, FILE * trace)
+GF_Err pasp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PixelAspectRatioBox *ptr = (GF_PixelAspectRatioBox*)a;
 	gf_isom_box_dump_start(a, "PixelAspectRatioBox", trace);
-	fprintf(trace, "hSpacing=\"%d\" vSpacing=\"%d\" >\n", ptr->hSpacing, ptr->vSpacing);
+	gf_fprintf(trace, "hSpacing=\"%d\" vSpacing=\"%d\" >\n", ptr->hSpacing, ptr->vSpacing);
 	gf_isom_box_dump_done("PixelAspectRatioBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err clap_dump(GF_Box *a, FILE * trace)
+GF_Err clap_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_CleanApertureBox *ptr = (GF_CleanApertureBox*)a;
 	gf_isom_box_dump_start(a, "CleanApertureBox", trace);
-	fprintf(trace, "cleanApertureWidthN=\"%d\" cleanApertureWidthD=\"%d\" ", ptr->cleanApertureWidthN, ptr->cleanApertureWidthD);
-	fprintf(trace, "cleanApertureHeightN=\"%d\" cleanApertureHeightD=\"%d\" ", ptr->cleanApertureHeightN, ptr->cleanApertureHeightD);
-	fprintf(trace, "horizOffN=\"%d\" horizOffD=\"%d\" ", ptr->horizOffN, ptr->horizOffD);
-	fprintf(trace, "vertOffN=\"%d\" vertOffD=\"%d\"", ptr->vertOffN, ptr->vertOffD);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, "cleanApertureWidthN=\"%d\" cleanApertureWidthD=\"%d\" ", ptr->cleanApertureWidthN, ptr->cleanApertureWidthD);
+	gf_fprintf(trace, "cleanApertureHeightN=\"%d\" cleanApertureHeightD=\"%d\" ", ptr->cleanApertureHeightN, ptr->cleanApertureHeightD);
+	gf_fprintf(trace, "horizOffN=\"%d\" horizOffD=\"%d\" ", ptr->horizOffN, ptr->horizOffD);
+	gf_fprintf(trace, "vertOffN=\"%d\" vertOffD=\"%d\"", ptr->vertOffN, ptr->vertOffD);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("CleanApertureBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err tsel_dump(GF_Box *a, FILE * trace)
+GF_Err tsel_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TrackSelectionBox *ptr = (GF_TrackSelectionBox *)a;
 	gf_isom_box_dump_start(a, "TrackSelectionBox", trace);
 
-	fprintf(trace, "switchGroup=\"%d\" >\n", ptr->switchGroup);
+	gf_fprintf(trace, "switchGroup=\"%d\" >\n", ptr->switchGroup);
 	for (i=0; i<ptr->attributeListCount; i++) {
-		fprintf(trace, "<TrackSelectionCriteria value=\"%s\"/>\n", gf_4cc_to_str(ptr->attributeList[i]) );
+		gf_fprintf(trace, "<TrackSelectionCriteria value=\"%s\"/>\n", gf_4cc_to_str(ptr->attributeList[i]) );
 	}
 	if (!ptr->size)
-		fprintf(trace, "<TrackSelectionCriteria value=\"\"/>\n");
+		gf_fprintf(trace, "<TrackSelectionCriteria value=\"\"/>\n");
 
 	gf_isom_box_dump_done("TrackSelectionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err metx_dump(GF_Box *a, FILE * trace)
+GF_Err metx_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox*)a;
 	const char *name;
@@ -3943,100 +3959,91 @@
 	gf_isom_box_dump_start(a, name, trace);
 
 	if (ptr->type==GF_ISOM_BOX_TYPE_METX) {
-		fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
-		if (ptr->xml_schema_loc) fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
-		if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
+		gf_fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
+		if (ptr->xml_schema_loc) gf_fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
+		if (ptr->content_encoding) gf_fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
 
 	} else if (ptr->type==GF_ISOM_BOX_TYPE_STPP) {
-		fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
-		if (ptr->xml_schema_loc) fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
-		if (ptr->mime_type) fprintf(trace, "auxiliary_mime_types=\"%s\" ", ptr->mime_type);
+		gf_fprintf(trace, "namespace=\"%s\" ", ptr->xml_namespace);
+		if (ptr->xml_schema_loc) gf_fprintf(trace, "schema_location=\"%s\" ", ptr->xml_schema_loc);
+		if (ptr->mime_type) gf_fprintf(trace, "auxiliary_mime_types=\"%s\" ", ptr->mime_type);
 	}
 	//mett, sbtt, stxt
 	else {
-		fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type);
-		if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
+		gf_fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type);
+		if (ptr->content_encoding) gf_fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
 	}
-	fprintf(trace, ">\n");
-
-	if ((ptr->type!=GF_ISOM_BOX_TYPE_METX) && (ptr->type!=GF_ISOM_BOX_TYPE_STPP) ) {
-		if (ptr->config) gf_isom_box_dump(ptr->config, trace);
-	}
-	gf_isom_box_array_dump(ptr->protections, trace);
-
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err txtc_dump(GF_Box *a, FILE * trace)
+GF_Err txtc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TextConfigBox *ptr = (GF_TextConfigBox*)a;
 	const char *name = "TextConfigBox";
 
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
-	if (ptr->config) fprintf(trace, "<![CDATA[%s]]>", ptr->config);
+	if (ptr->config) gf_fprintf(trace, "<![CDATA[%s]]>", ptr->config);
 
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err dims_dump(GF_Box *a, FILE * trace)
+GF_Err dims_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DIMSSampleEntryBox *p = (GF_DIMSSampleEntryBox*)a;
 	gf_isom_box_dump_start(a, "DIMSSampleEntryBox", trace);
-	fprintf(trace, "dataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
-	if (p->config) gf_isom_box_dump(p->config, trace);
-	if (p->scripts) gf_isom_box_dump(p->scripts, trace);
-	gf_isom_box_array_dump(p->protections, trace);
+	gf_fprintf(trace, "dataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
 	gf_isom_box_dump_done("DIMSSampleEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err diST_dump(GF_Box *a, FILE * trace)
+GF_Err diST_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DIMSScriptTypesBox *p = (GF_DIMSScriptTypesBox*)a;
 	gf_isom_box_dump_start(a, "DIMSScriptTypesBox", trace);
-	fprintf(trace, "types=\"%s\">\n", p->content_script_types);
+	gf_fprintf(trace, "types=\"%s\">\n", p->content_script_types);
 	gf_isom_box_dump_done("DIMSScriptTypesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err dimC_dump(GF_Box *a, FILE * trace)
+GF_Err dimC_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DIMSSceneConfigBox *p = (GF_DIMSSceneConfigBox *)a;
 	gf_isom_box_dump_start(a, "DIMSSceneConfigBox", trace);
-	fprintf(trace, "profile=\"%d\" level=\"%d\" pathComponents=\"%d\" useFullRequestHosts=\"%d\" streamType=\"%d\" containsRedundant=\"%d\" textEncoding=\"%s\" contentEncoding=\"%s\" >\n",
+	gf_fprintf(trace, "profile=\"%d\" level=\"%d\" pathComponents=\"%d\" useFullRequestHosts=\"%d\" streamType=\"%d\" containsRedundant=\"%d\" textEncoding=\"%s\" contentEncoding=\"%s\" >\n",
 	        p->profile, p->level, p->pathComponents, p->fullRequestHost, p->streamType, p->containsRedundant, p->textEncoding, p->contentEncoding);
 	gf_isom_box_dump_done("DIMSSceneConfigBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err dOps_dump(GF_Box *a, FILE * trace)
+GF_Err dOps_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OpusSpecificBox *p = (GF_OpusSpecificBox *)a;
 
 	gf_isom_box_dump_start(a, "OpusSpecificBox", trace);
-	fprintf(trace, "version=\"%d\" OutputChannelCount=\"%d\" PreSkip=\"%d\" InputSampleRate=\"%d\" OutputGain=\"%d\" ChannelMappingFamily=\"%d\"",
+	gf_fprintf(trace, "version=\"%d\" OutputChannelCount=\"%d\" PreSkip=\"%d\" InputSampleRate=\"%d\" OutputGain=\"%d\" ChannelMappingFamily=\"%d\"",
 		p->version, p->OutputChannelCount, p->PreSkip, p->InputSampleRate, p->OutputGain, p->ChannelMappingFamily);
 
 	if (p->ChannelMappingFamily) {
 		u32 i;
-		fprintf(trace, " StreamCount=\"%d\" CoupledStreamCount=\"%d\" channelMapping=\"", p->StreamCount, p->CoupledCount);
+		gf_fprintf(trace, " StreamCount=\"%d\" CoupledStreamCount=\"%d\" channelMapping=\"", p->StreamCount, p->CoupledCount);
 		for (i=0; i<p->OutputChannelCount; i++) {
-			fprintf(trace, "%s%d", i ? " " : "", p->ChannelMapping[i]);
+			gf_fprintf(trace, "%s%d", i ? " " : "", p->ChannelMapping[i]);
 		}
-		fprintf(trace, "\"");
+		gf_fprintf(trace, "\"");
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("OpusSpecificBox", a, trace);
 
 	return GF_OK;
 }
 
-GF_Err dac3_dump(GF_Box *a, FILE * trace)
+GF_Err dac3_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AC3ConfigBox *p = (GF_AC3ConfigBox *)a;
 
@@ -4045,185 +4052,185 @@
 		a->type = GF_ISOM_BOX_TYPE_DEC3;
 		gf_isom_box_dump_start(a, "EC3SpecificBox", trace);
 		a->type = GF_ISOM_BOX_TYPE_DAC3;
-		fprintf(trace, "nb_streams=\"%d\" data_rate=\"%d\">\n", p->cfg.nb_streams, p->cfg.brcode);
+		gf_fprintf(trace, "nb_streams=\"%d\" data_rate=\"%d\">\n", p->cfg.nb_streams, p->cfg.brcode);
 		for (i=0; i<p->cfg.nb_streams; i++) {
-			fprintf(trace, "<EC3StreamConfig fscod=\"%d\" bsid=\"%d\" bsmod=\"%d\" acmod=\"%d\" lfon=\"%d\" num_sub_dep=\"%d\" chan_loc=\"%d\"/>\n",
-			        p->cfg.streams[i].fscod, p->cfg.streams[i].bsid, p->cfg.streams[i].bsmod, p->cfg.streams[i].acmod, p->cfg.streams[i].lfon, p->cfg.streams[i].nb_dep_sub, p->cfg.streams[i].chan_loc);
+			gf_fprintf(trace, "<EC3StreamConfig fscod=\"%d\" bsid=\"%d\" bsmod=\"%d\" acmod=\"%d\" lfon=\"%d\" asvc=\"%d\" num_sub_dep=\"%d\" chan_loc=\"%d\"/>\n",
+			        p->cfg.streams[i].fscod, p->cfg.streams[i].bsid, p->cfg.streams[i].bsmod, p->cfg.streams[i].acmod, p->cfg.streams[i].lfon, p->cfg.streams[i].asvc, p->cfg.streams[i].nb_dep_sub, p->cfg.streams[i].chan_loc);
 		}
 		gf_isom_box_dump_done("EC3SpecificBox", a, trace);
 	} else {
 		gf_isom_box_dump_start(a, "AC3SpecificBox", trace);
-		fprintf(trace, "fscod=\"%d\" bsid=\"%d\" bsmod=\"%d\" acmod=\"%d\" lfon=\"%d\" bit_rate_code=\"%d\">\n",
+		gf_fprintf(trace, "fscod=\"%d\" bsid=\"%d\" bsmod=\"%d\" acmod=\"%d\" lfon=\"%d\" bit_rate_code=\"%d\">\n",
 		        p->cfg.streams[0].fscod, p->cfg.streams[0].bsid, p->cfg.streams[0].bsmod, p->cfg.streams[0].acmod, p->cfg.streams[0].lfon, p->cfg.brcode);
 		gf_isom_box_dump_done("AC3SpecificBox", a, trace);
 	}
 	return GF_OK;
 }
 
-GF_Err dvcC_dump(GF_Box *a, FILE * trace)
+GF_Err dvcC_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_DOVIConfigurationBox *p = (GF_DOVIConfigurationBox *)a;
 	gf_isom_box_dump_start(a, "DOVIConfigurationBox", trace);
-	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\">\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);
 	gf_isom_box_dump_done("DOVIConfigurationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err lsrc_dump(GF_Box *a, FILE * trace)
+GF_Err lsrc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_LASERConfigurationBox *p = (GF_LASERConfigurationBox *)a;
 	gf_isom_box_dump_start(a, "LASeRConfigurationBox", trace);
 	dump_data_attribute(trace, "LASeRHeader", p->hdr, p->hdr_size);
-	fprintf(trace, ">");
+	gf_fprintf(trace, ">");
 	gf_isom_box_dump_done("LASeRConfigurationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err lsr1_dump(GF_Box *a, FILE * trace)
+GF_Err lsr1_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_LASeRSampleEntryBox *p = (GF_LASeRSampleEntryBox*)a;
 	gf_isom_box_dump_start(a, "LASeRSampleEntryBox", trace);
-	fprintf(trace, "DataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
-	if (p->lsr_config) gf_isom_box_dump(p->lsr_config, trace);
-	if (p->descr) gf_isom_box_dump(p->descr, trace);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\">\n", p->dataReferenceIndex);
 	gf_isom_box_dump_done("LASeRSampleEntryBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err sidx_dump(GF_Box *a, FILE * trace)
+GF_Err sidx_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SegmentIndexBox *p = (GF_SegmentIndexBox *)a;
 	gf_isom_box_dump_start(a, "SegmentIndexBox", trace);
-	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);
 
-	fprintf(trace, ">\n");
+	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)
+		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
+	gf_fprintf(trace, ">\n");
+
 	for (i=0; i<p->nb_refs; i++) {
-		fprintf(trace, "<Reference type=\"%d\" size=\"%d\" duration=\"%d\" startsWithSAP=\"%d\" SAP_type=\"%d\" SAPDeltaTime=\"%d\"/>\n", p->refs[i].reference_type, p->refs[i].reference_size, p->refs[i].subsegment_duration, p->refs[i].starts_with_SAP, p->refs[i].SAP_type, p->refs[i].SAP_delta_time);
+		gf_fprintf(trace, "<Reference type=\"%d\" size=\"%d\" duration=\"%d\" startsWithSAP=\"%d\" SAP_type=\"%d\" SAPDeltaTime=\"%d\"/>\n", p->refs[i].reference_type, p->refs[i].reference_size, p->refs[i].subsegment_duration, p->refs[i].starts_with_SAP, p->refs[i].SAP_type, p->refs[i].SAP_delta_time);
 	}
 	if (!p->size) {
-		fprintf(trace, "<Reference type=\"\" size=\"\" duration=\"\" startsWithSAP=\"\" SAP_type=\"\" SAPDeltaTime=\"\"/>\n");
+		gf_fprintf(trace, "<Reference type=\"\" size=\"\" duration=\"\" startsWithSAP=\"\" SAP_type=\"\" SAPDeltaTime=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SegmentIndexBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ssix_dump(GF_Box *a, FILE * trace)
+GF_Err ssix_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, j;
 	GF_SubsegmentIndexBox *p = (GF_SubsegmentIndexBox *)a;
 	gf_isom_box_dump_start(a, "SubsegmentIndexBox", trace);
 
-	fprintf(trace, "subsegment_count=\"%d\" >\n", p->subsegment_count);
+	gf_fprintf(trace, "subsegment_count=\"%d\"", p->subsegment_count);
+	if (p->compressed_diff)
+		gf_fprintf(trace, " compressedSize=\""LLU"\"", p->size - p->compressed_diff);
+	gf_fprintf(trace, ">\n");
+
 	for (i = 0; i < p->subsegment_count; i++) {
-		fprintf(trace, "<Subsegment range_count=\"%d\">\n", p->subsegments[i].range_count);
+		gf_fprintf(trace, "<Subsegment range_count=\"%d\">\n", p->subsegments[i].range_count);
 		for (j = 0; j < p->subsegments[i].range_count; j++) {
-			fprintf(trace, "<Range level=\"%d\" range_size=\"%d\"/>\n", p->subsegments[i].ranges[j].level, p->subsegments[i].ranges[j].range_size);
+			gf_fprintf(trace, "<Range level=\"%d\" range_size=\"%d\"/>\n", p->subsegments[i].ranges[j].level, p->subsegments[i].ranges[j].range_size);
 		}
-		fprintf(trace, "</Subsegment>\n");
+		gf_fprintf(trace, "</Subsegment>\n");
 	}
 	if (!p->size) {
-		fprintf(trace, "<Subsegment range_count=\"\">\n");
-		fprintf(trace, "<Range level=\"\" range_size=\"\"/>\n");
-		fprintf(trace, "</Subsegment>\n");
+		gf_fprintf(trace, "<Subsegment range_count=\"\">\n");
+		gf_fprintf(trace, "<Range level=\"\" range_size=\"\"/>\n");
+		gf_fprintf(trace, "</Subsegment>\n");
 	}
 	gf_isom_box_dump_done("SubsegmentIndexBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err leva_dump(GF_Box *a, FILE * trace)
+GF_Err leva_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_LevelAssignmentBox *p = (GF_LevelAssignmentBox *)a;
 	gf_isom_box_dump_start(a, "LevelAssignmentBox", trace);
 
-	fprintf(trace, "level_count=\"%d\" >\n", p->level_count);
+	gf_fprintf(trace, "level_count=\"%d\" >\n", p->level_count);
 	for (i = 0; i < p->level_count; i++) {
-		fprintf(trace, "<Assignement track_id=\"%d\" padding_flag=\"%d\" assignement_type=\"%d\" grouping_type=\"%s\" grouping_type_parameter=\"%d\" sub_track_id=\"%d\" />\n", p->levels[i].track_id, p->levels[i].padding_flag, p->levels[i].type, gf_4cc_to_str(p->levels[i].grouping_type) , p->levels[i].grouping_type_parameter, p->levels[i].sub_track_id);
+		gf_fprintf(trace, "<Assignement track_id=\"%d\" padding_flag=\"%d\" assignement_type=\"%d\" grouping_type=\"%s\" grouping_type_parameter=\"%d\" sub_track_id=\"%d\" />\n", p->levels[i].track_id, p->levels[i].padding_flag, p->levels[i].type, gf_4cc_to_str(p->levels[i].grouping_type) , p->levels[i].grouping_type_parameter, p->levels[i].sub_track_id);
 	}
 	if (!p->size) {
-		fprintf(trace, "<Assignement track_id=\"\" padding_flag=\"\" assignement_type=\"\" grouping_type=\"\" grouping_type_parameter=\"\" sub_track_id=\"\" />\n");
+		gf_fprintf(trace, "<Assignement track_id=\"\" padding_flag=\"\" assignement_type=\"\" grouping_type=\"\" grouping_type_parameter=\"\" sub_track_id=\"\" />\n");
 	}
 	gf_isom_box_dump_done("LevelAssignmentBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err strk_dump(GF_Box *a, FILE * trace)
+GF_Err strk_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_SubTrackBox *p = (GF_SubTrackBox *)a;
 	gf_isom_box_dump_start(a, "SubTrackBox", trace);
-	fprintf(trace, ">\n");
-	if (p->info) {
-		gf_isom_box_dump(p->info, trace);
-	}
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("SubTrackBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stri_dump(GF_Box *a, FILE * trace)
+GF_Err stri_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SubTrackInformationBox *p = (GF_SubTrackInformationBox *)a;
 	gf_isom_box_dump_start(a, "SubTrackInformationBox", trace);
 
-	fprintf(trace, "switch_group=\"%d\" alternate_group=\"%d\" sub_track_id=\"%d\">\n", p->switch_group, p->alternate_group, p->sub_track_id);
+	gf_fprintf(trace, "switch_group=\"%d\" alternate_group=\"%d\" sub_track_id=\"%d\">\n", p->switch_group, p->alternate_group, p->sub_track_id);
 
 	for (i = 0; i < p->attribute_count; i++) {
-		fprintf(trace, "<SubTrackInformationAttribute value=\"%s\"/>\n", gf_4cc_to_str(p->attribute_list[i]) );
+		gf_fprintf(trace, "<SubTrackInformationAttribute value=\"%s\"/>\n", gf_4cc_to_str(p->attribute_list[i]) );
 	}
 	if (!p->size)
-		fprintf(trace, "<SubTrackInformationAttribute value=\"\"/>\n");
+		gf_fprintf(trace, "<SubTrackInformationAttribute value=\"\"/>\n");
 
 	gf_isom_box_dump_done("SubTrackInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stsg_dump(GF_Box *a, FILE * trace)
+GF_Err stsg_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SubTrackSampleGroupBox *p = (GF_SubTrackSampleGroupBox *)a;
 	gf_isom_box_dump_start(a, "SubTrackSampleGroupBox", trace);
 
 	if (p->grouping_type)
-		fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(p->grouping_type) );
-	fprintf(trace, ">\n");
+		gf_fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(p->grouping_type) );
+	gf_fprintf(trace, ">\n");
 
 	for (i = 0; i < p->nb_groups; i++) {
-		fprintf(trace, "<SubTrackSampleGroupBoxEntry group_description_index=\"%d\"/>\n", p->group_description_index[i]);
+		gf_fprintf(trace, "<SubTrackSampleGroupBoxEntry group_description_index=\"%d\"/>\n", p->group_description_index[i]);
 	}
 	if (!p->size)
-		fprintf(trace, "<SubTrackSampleGroupBoxEntry group_description_index=\"\"/>\n");
+		gf_fprintf(trace, "<SubTrackSampleGroupBoxEntry group_description_index=\"\"/>\n");
 
 	gf_isom_box_dump_done("SubTrackSampleGroupBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err pcrb_dump(GF_Box *a, FILE * trace)
+GF_Err pcrb_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_PcrInfoBox *p = (GF_PcrInfoBox *)a;
 	gf_isom_box_dump_start(a, "MPEG2TSPCRInfoBox", trace);
-	fprintf(trace, "subsegment_count=\"%d\">\n", p->subsegment_count);
+	gf_fprintf(trace, "subsegment_count=\"%d\">\n", p->subsegment_count);
 
 	for (i=0; i<p->subsegment_count; i++) {
-		fprintf(trace, "<PCRInfo PCR=\""LLU"\" />\n", p->pcr_values[i]);
+		gf_fprintf(trace, "<PCRInfo PCR=\""LLU"\" />\n", p->pcr_values[i]);
 	}
 	if (!p->size) {
-		fprintf(trace, "<PCRInfo PCR=\"\" />\n");
+		gf_fprintf(trace, "<PCRInfo PCR=\"\" />\n");
 	}
 	gf_isom_box_dump_done("MPEG2TSPCRInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err subs_dump(GF_Box *a, FILE * trace)
+GF_Err subs_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 entry_count, i, j;
 	u16 subsample_count;
-	GF_SubSampleInfoEntry *pSamp;
 	GF_SubSampleEntry *pSubSamp;
 	GF_SubSampleInformationBox *ptr = (GF_SubSampleInformationBox *) a;
 
@@ -4232,25 +4239,25 @@
 	entry_count = gf_list_count(ptr->Samples);
 	gf_isom_box_dump_start(a, "SubSampleInformationBox", trace);
 
-	fprintf(trace, "EntryCount=\"%d\">\n", entry_count);
+	gf_fprintf(trace, "EntryCount=\"%d\">\n", entry_count);
 
 	for (i=0; i<entry_count; i++) {
-		pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
+		GF_SubSampleInfoEntry *pSamp = (GF_SubSampleInfoEntry*) gf_list_get(ptr->Samples, i);
 
 		subsample_count = gf_list_count(pSamp->SubSamples);
 
-		fprintf(trace, "<SampleEntry SampleDelta=\"%d\" SubSampleCount=\"%d\">\n", pSamp->sample_delta, subsample_count);
+		gf_fprintf(trace, "<SampleEntry SampleDelta=\"%d\" SubSampleCount=\"%d\">\n", pSamp->sample_delta, subsample_count);
 
 		for (j=0; j<subsample_count; j++) {
 			pSubSamp = (GF_SubSampleEntry*) gf_list_get(pSamp->SubSamples, j);
-			fprintf(trace, "<SubSample Size=\"%u\" Priority=\"%u\" Discardable=\"%d\" Reserved=\"%08X\"/>\n", pSubSamp->subsample_size, pSubSamp->subsample_priority, pSubSamp->discardable, pSubSamp->reserved);
+			gf_fprintf(trace, "<SubSample Size=\"%u\" Priority=\"%u\" Discardable=\"%d\" Reserved=\"%08X\"/>\n", pSubSamp->subsample_size, pSubSamp->subsample_priority, pSubSamp->discardable, pSubSamp->reserved);
 		}
-		fprintf(trace, "</SampleEntry>\n");
+		gf_fprintf(trace, "</SampleEntry>\n");
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<SampleEntry SampleDelta=\"\" SubSampleCount=\"\">\n");
-		fprintf(trace, "<SubSample Size=\"\" Priority=\"\" Discardable=\"\" Reserved=\"\"/>\n");
-		fprintf(trace, "</SampleEntry>\n");
+		gf_fprintf(trace, "<SampleEntry SampleDelta=\"\" SubSampleCount=\"\">\n");
+		gf_fprintf(trace, "<SubSample Size=\"\" Priority=\"\" Discardable=\"\" Reserved=\"\"/>\n");
+		gf_fprintf(trace, "</SampleEntry>\n");
 	}
 
 	gf_isom_box_dump_done("SubSampleInformationBox", a, trace);
@@ -4258,55 +4265,58 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err tfdt_dump(GF_Box *a, FILE * trace)
+GF_Err tfdt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TFBaseMediaDecodeTimeBox *ptr = (GF_TFBaseMediaDecodeTimeBox*) a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "TrackFragmentBaseMediaDecodeTimeBox", trace);
 
-	fprintf(trace, "baseMediaDecodeTime=\""LLD"\">\n", ptr->baseMediaDecodeTime);
+	gf_fprintf(trace, "baseMediaDecodeTime=\""LLD"\">\n", ptr->baseMediaDecodeTime);
 	gf_isom_box_dump_done("TrackFragmentBaseMediaDecodeTimeBox", a, trace);
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
-GF_Err rvcc_dump(GF_Box *a, FILE * trace)
+GF_Err rvcc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_RVCConfigurationBox *ptr = (GF_RVCConfigurationBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "RVCConfigurationBox", trace);
-	fprintf(trace, "predefined=\"%d\"", ptr->predefined_rvc_config);
-	if (! ptr->predefined_rvc_config) fprintf(trace, " rvc_meta_idx=\"%d\"", ptr->rvc_meta_idx);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, "predefined=\"%d\"", ptr->predefined_rvc_config);
+	if (! ptr->predefined_rvc_config) gf_fprintf(trace, " rvc_meta_idx=\"%d\"", ptr->rvc_meta_idx);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("RVCConfigurationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err sbgp_dump(GF_Box *a, FILE * trace)
+GF_Err sbgp_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SampleGroupBox *ptr = (GF_SampleGroupBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	gf_isom_box_dump_start(a, "SampleGroupBox", trace);
 
 	if (ptr->grouping_type)
-		fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(ptr->grouping_type) );
+		gf_fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(ptr->grouping_type) );
 
 	if (ptr->version==1) {
 		if (isalnum(ptr->grouping_type_parameter&0xFF)) {
-			fprintf(trace, " grouping_type_parameter=\"%s\"", gf_4cc_to_str(ptr->grouping_type_parameter) );
+			gf_fprintf(trace, " grouping_type_parameter=\"%s\"", gf_4cc_to_str(ptr->grouping_type_parameter) );
 		} else {
-			fprintf(trace, " grouping_type_parameter=\"%d\"", ptr->grouping_type_parameter);
+			gf_fprintf(trace, " grouping_type_parameter=\"%d\"", ptr->grouping_type_parameter);
 		}
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<ptr->entry_count; i++) {
-		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_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"%d\" group_description_index=\"%d\"/>\n", ptr->sample_entries[i].sample_count, ptr->sample_entries[i].group_description_index );
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<SampleGroupBoxEntry sample_count=\"\" group_description_index=\"\"/>\n");
+		gf_fprintf(trace, "<SampleGroupBoxEntry sample_count=\"\" group_description_index=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SampleGroupBox", a, trace);
 	return GF_OK;
@@ -4317,78 +4327,78 @@
 	u32 i, count;
 
 	if (!ptr) {
-		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|Auxilary|unknown\" num_profile_tier_level=\"\" num_operating_points=\"\" dependency_layers=\"\">\n");
 
-		fprintf(trace, " <ProfileTierLevel general_profile_space=\"\" general_tier_flag=\"\" general_profile_idc=\"\" general_profile_compatibility_flags=\"\" general_constraint_indicator_flags=\"\" />\n");
+		gf_fprintf(trace, " <ProfileTierLevel general_profile_space=\"\" general_tier_flag=\"\" general_profile_idc=\"\" general_profile_compatibility_flags=\"\" general_constraint_indicator_flags=\"\" />\n");
 
-		fprintf(trace, "<OperatingPoint output_layer_set_idx=\"\" max_temporal_id=\"\" layer_count=\"\" minPicWidth=\"\" minPicHeight=\"\" maxPicWidth=\"\" maxPicHeight=\"\" maxChromaFormat=\"\" maxBitDepth=\"\" frame_rate_info_flag=\"\" bit_rate_info_flag=\"\" avgFrameRate=\"\" constantFrameRate=\"\" maxBitRate=\"\" avgBitRate=\"\"/>\n");
+		gf_fprintf(trace, "<OperatingPoint output_layer_set_idx=\"\" max_temporal_id=\"\" layer_count=\"\" minPicWidth=\"\" minPicHeight=\"\" maxPicWidth=\"\" maxPicHeight=\"\" maxChromaFormat=\"\" maxBitDepth=\"\" frame_rate_info_flag=\"\" bit_rate_info_flag=\"\" avgFrameRate=\"\" constantFrameRate=\"\" maxBitRate=\"\" avgBitRate=\"\"/>\n");
 
-		fprintf(trace, "<Layer dependent_layerID=\"\" num_layers_dependent_on=\"\" dependent_on_layerID=\"\" dimension_identifier=\"\"/>\n");
-		fprintf(trace, "</OperatingPointsInformation>\n");
+		gf_fprintf(trace, "<Layer dependent_layerID=\"\" num_layers_dependent_on=\"\" dependent_on_layerID=\"\" dimension_identifier=\"\"/>\n");
+		gf_fprintf(trace, "</OperatingPointsInformation>\n");
 		return;
 	}
 
 
-	fprintf(trace, "<OperatingPointsInformation");
-	fprintf(trace, " scalability_mask=\"%u (", ptr->scalability_mask);
+	gf_fprintf(trace, "<OperatingPointsInformation");
+	gf_fprintf(trace, " scalability_mask=\"%u (", ptr->scalability_mask);
 	switch (ptr->scalability_mask) {
 	case 2:
-		fprintf(trace, "Multiview");
+		gf_fprintf(trace, "Multiview");
 		break;
 	case 4:
-		fprintf(trace, "Spatial scalability");
+		gf_fprintf(trace, "Spatial scalability");
 		break;
 	case 8:
-		fprintf(trace, "Auxilary");
+		gf_fprintf(trace, "Auxilary");
 		break;
 	default:
-		fprintf(trace, "unknown");
+		gf_fprintf(trace, "unknown");
 	}
-	fprintf(trace, ")\" num_profile_tier_level=\"%u\"", gf_list_count(ptr->profile_tier_levels) );
-	fprintf(trace, " num_operating_points=\"%u\" dependency_layers=\"%u\"", gf_list_count(ptr->operating_points), gf_list_count(ptr->dependency_layers));
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ")\" num_profile_tier_level=\"%u\"", gf_list_count(ptr->profile_tier_levels) );
+	gf_fprintf(trace, " num_operating_points=\"%u\" dependency_layers=\"%u\"", gf_list_count(ptr->operating_points), gf_list_count(ptr->dependency_layers));
+	gf_fprintf(trace, ">\n");
 
 
 	count=gf_list_count(ptr->profile_tier_levels);
 	for (i = 0; i < count; i++) {
 		LHEVC_ProfileTierLevel *ptl = (LHEVC_ProfileTierLevel *)gf_list_get(ptr->profile_tier_levels, i);
-		fprintf(trace, " <ProfileTierLevel general_profile_space=\"%u\" general_tier_flag=\"%u\" general_profile_idc=\"%u\" general_profile_compatibility_flags=\"%X\" general_constraint_indicator_flags=\""LLX"\" />\n", ptl->general_profile_space, ptl->general_tier_flag, ptl->general_profile_idc, ptl->general_profile_compatibility_flags, ptl->general_constraint_indicator_flags);
+		gf_fprintf(trace, " <ProfileTierLevel general_profile_space=\"%u\" general_tier_flag=\"%u\" general_profile_idc=\"%u\" general_profile_compatibility_flags=\"%X\" general_constraint_indicator_flags=\""LLX"\" />\n", ptl->general_profile_space, ptl->general_tier_flag, ptl->general_profile_idc, ptl->general_profile_compatibility_flags, ptl->general_constraint_indicator_flags);
 	}
 
 
 	count=gf_list_count(ptr->operating_points);
 	for (i = 0; i < count; i++) {
 		LHEVC_OperatingPoint *op = (LHEVC_OperatingPoint *)gf_list_get(ptr->operating_points, i);
-		fprintf(trace, "<OperatingPoint output_layer_set_idx=\"%u\"", op->output_layer_set_idx);
-		fprintf(trace, " max_temporal_id=\"%u\" layer_count=\"%u\"", op->max_temporal_id, op->layer_count);
-		fprintf(trace, " minPicWidth=\"%u\" minPicHeight=\"%u\"", op->minPicWidth, op->minPicHeight);
-		fprintf(trace, " maxPicWidth=\"%u\" maxPicHeight=\"%u\"", op->maxPicWidth, op->maxPicHeight);
-		fprintf(trace, " maxChromaFormat=\"%u\" maxBitDepth=\"%u\"", op->maxChromaFormat, op->maxBitDepth);
-		fprintf(trace, " frame_rate_info_flag=\"%u\" bit_rate_info_flag=\"%u\"", op->frame_rate_info_flag, op->bit_rate_info_flag);
+		gf_fprintf(trace, "<OperatingPoint output_layer_set_idx=\"%u\"", op->output_layer_set_idx);
+		gf_fprintf(trace, " max_temporal_id=\"%u\" layer_count=\"%u\"", op->max_temporal_id, op->layer_count);
+		gf_fprintf(trace, " minPicWidth=\"%u\" minPicHeight=\"%u\"", op->minPicWidth, op->minPicHeight);
+		gf_fprintf(trace, " maxPicWidth=\"%u\" maxPicHeight=\"%u\"", op->maxPicWidth, op->maxPicHeight);
+		gf_fprintf(trace, " maxChromaFormat=\"%u\" maxBitDepth=\"%u\"", op->maxChromaFormat, op->maxBitDepth);
+		gf_fprintf(trace, " frame_rate_info_flag=\"%u\" bit_rate_info_flag=\"%u\"", op->frame_rate_info_flag, op->bit_rate_info_flag);
 		if (op->frame_rate_info_flag)
-			fprintf(trace, " avgFrameRate=\"%u\" constantFrameRate=\"%u\"", op->avgFrameRate, op->constantFrameRate);
+			gf_fprintf(trace, " avgFrameRate=\"%u\" constantFrameRate=\"%u\"", op->avgFrameRate, op->constantFrameRate);
 		if (op->bit_rate_info_flag)
-			fprintf(trace, " maxBitRate=\"%u\" avgBitRate=\"%u\"", op->maxBitRate, op->avgBitRate);
-		fprintf(trace, "/>\n");
+			gf_fprintf(trace, " maxBitRate=\"%u\" avgBitRate=\"%u\"", op->maxBitRate, op->avgBitRate);
+		gf_fprintf(trace, "/>\n");
 	}
 	count=gf_list_count(ptr->dependency_layers);
 	for (i = 0; i < count; i++) {
 		u32 j;
 		LHEVC_DependentLayer *dep = (LHEVC_DependentLayer *)gf_list_get(ptr->dependency_layers, i);
-		fprintf(trace, "<Layer dependent_layerID=\"%u\" num_layers_dependent_on=\"%u\"", dep->dependent_layerID, dep->num_layers_dependent_on);
+		gf_fprintf(trace, "<Layer dependent_layerID=\"%u\" num_layers_dependent_on=\"%u\"", dep->dependent_layerID, dep->num_layers_dependent_on);
 		if (dep->num_layers_dependent_on) {
-			fprintf(trace, " dependent_on_layerID=\"");
+			gf_fprintf(trace, " dependent_on_layerID=\"");
 			for (j = 0; j < dep->num_layers_dependent_on; j++)
-				fprintf(trace, "%d ", dep->dependent_on_layerID[j]);
-			fprintf(trace, "\"");
+				gf_fprintf(trace, "%d ", dep->dependent_on_layerID[j]);
+			gf_fprintf(trace, "\"");
 		}
-		fprintf(trace, " dimension_identifier=\"");
+		gf_fprintf(trace, " dimension_identifier=\"");
 		for (j = 0; j < 16; j++)
 			if (ptr->scalability_mask & (1 << j))
-				fprintf(trace, "%d ", dep->dimension_identifier[j]);
-		fprintf(trace, "\"/>\n");
+				gf_fprintf(trace, "%d ", dep->dimension_identifier[j]);
+		gf_fprintf(trace, "\"/>\n");
 	}
-	fprintf(trace, "</OperatingPointsInformation>\n");
+	gf_fprintf(trace, "</OperatingPointsInformation>\n");
 	return;
 }
 
@@ -4396,19 +4406,19 @@
 {
 	u32 i, count;
 	if (!ptr) {
-		fprintf(trace, "<LayerInformation num_layers=\"\">\n");
-		fprintf(trace, "<LayerInfoItem layer_id=\"\" min_temporalId=\"\" max_temporalId=\"\" sub_layer_presence_flags=\"\"/>\n");
-		fprintf(trace, "</LayerInformation>\n");
+		gf_fprintf(trace, "<LayerInformation num_layers=\"\">\n");
+		gf_fprintf(trace, "<LayerInfoItem layer_id=\"\" min_temporalId=\"\" max_temporalId=\"\" sub_layer_presence_flags=\"\"/>\n");
+		gf_fprintf(trace, "</LayerInformation>\n");
 		return;
 	}
 
 	count = gf_list_count(ptr->num_layers_in_track);
-	fprintf(trace, "<LayerInformation num_layers=\"%d\">\n", count );
+	gf_fprintf(trace, "<LayerInformation num_layers=\"%d\">\n", count );
 	for (i = 0; i < count; i++) {
 		LHVCLayerInfoItem *li = (LHVCLayerInfoItem *)gf_list_get(ptr->num_layers_in_track, i);
-		fprintf(trace, "<LayerInfoItem layer_id=\"%d\" min_temporalId=\"%d\" max_temporalId=\"%d\" sub_layer_presence_flags=\"%d\"/>\n", li->layer_id, li->min_TemporalId, li->max_TemporalId, li->sub_layer_presence_flags);
+		gf_fprintf(trace, "<LayerInfoItem layer_id=\"%d\" min_temporalId=\"%d\" max_temporalId=\"%d\" sub_layer_presence_flags=\"%d\"/>\n", li->layer_id, li->min_TemporalId, li->max_TemporalId, li->sub_layer_presence_flags);
 	}
-	fprintf(trace, "</LayerInformation>\n");
+	gf_fprintf(trace, "</LayerInformation>\n");
 	return;
 }
 
@@ -4419,38 +4429,38 @@
 	Bool full_picture, has_dep, tile_group;
 
 	if (!data) {
-		fprintf(trace, "<TileRegionGroupEntry ID=\"\" tileGroup=\"\" independent=\"\" full_picture=\"\" filter_disabled=\"\" x=\"\" y=\"\" w=\"\" h=\"\">\n");
-		fprintf(trace, "<TileRegionDependency tileID=\"\"/>\n");
-		fprintf(trace, "</TileRegionGroupEntry>\n");
+		gf_fprintf(trace, "<TileRegionGroupEntry ID=\"\" tileGroup=\"\" independent=\"\" full_picture=\"\" filter_disabled=\"\" x=\"\" y=\"\" w=\"\" h=\"\">\n");
+		gf_fprintf(trace, "<TileRegionDependency tileID=\"\"/>\n");
+		gf_fprintf(trace, "</TileRegionGroupEntry>\n");
 		return;
 	}
 
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 	id = gf_bs_read_u16(bs);
 	tile_group = gf_bs_read_int(bs, 1);
-	fprintf(trace, "<TileRegionGroupEntry ID=\"%d\" tileGroup=\"%d\" ", id, tile_group);
+	gf_fprintf(trace, "<TileRegionGroupEntry ID=\"%d\" tileGroup=\"%d\" ", id, tile_group);
 	if (tile_group) {
 		independent = gf_bs_read_int(bs, 2);
 		full_picture = (Bool)gf_bs_read_int(bs, 1);
 		filter_disabled = gf_bs_read_int(bs, 1);
 		has_dep = gf_bs_read_int(bs, 1);
 		gf_bs_read_int(bs, 2);
-		fprintf(trace, "independent=\"%d\" full_picture=\"%d\" filter_disabled=\"%d\" ", independent, full_picture, filter_disabled);
+		gf_fprintf(trace, "independent=\"%d\" full_picture=\"%d\" filter_disabled=\"%d\" ", independent, full_picture, filter_disabled);
 
 		if (!full_picture) {
-			fprintf(trace, "x=\"%d\" y=\"%d\" ", gf_bs_read_u16(bs), gf_bs_read_u16(bs));
+			gf_fprintf(trace, "x=\"%d\" y=\"%d\" ", gf_bs_read_u16(bs), gf_bs_read_u16(bs));
 		}
-		fprintf(trace, "w=\"%d\" h=\"%d\" ", gf_bs_read_u16(bs), gf_bs_read_u16(bs));
+		gf_fprintf(trace, "w=\"%d\" h=\"%d\" ", gf_bs_read_u16(bs), gf_bs_read_u16(bs));
 		if (!has_dep) {
-			fprintf(trace, "/>\n");
+			gf_fprintf(trace, "/>\n");
 		} else {
 			u32 count = gf_bs_read_u16(bs);
-			fprintf(trace, ">\n");
+			gf_fprintf(trace, ">\n");
 			while (count) {
 				count--;
-				fprintf(trace, "<TileRegionDependency tileID=\"%d\"/>\n", gf_bs_read_u16(bs) );
+				gf_fprintf(trace, "<TileRegionDependency tileID=\"%d\"/>\n", gf_bs_read_u16(bs) );
 			}
-			fprintf(trace, "</TileRegionGroupEntry>\n");
+			gf_fprintf(trace, "</TileRegionGroupEntry>\n");
 		}
 	}
 	gf_bs_del(bs);
@@ -4464,9 +4474,9 @@
 	u32 entry_count;
 
 	if (!data) {
-		fprintf(trace, "<NALUMap rle=\"\" large_size=\"\">\n");
-		fprintf(trace, "<NALUMapEntry NALU_startNumber=\"\" groupID=\"\"/>\n");
-		fprintf(trace, "</NALUMap>\n");
+		gf_fprintf(trace, "<NALUMap rle=\"\" large_size=\"\">\n");
+		gf_fprintf(trace, "<NALUMapEntry NALU_startNumber=\"\" groupID=\"\"/>\n");
+		gf_fprintf(trace, "</NALUMap>\n");
 		return;
 	}
 
@@ -4475,26 +4485,26 @@
 	large_size = gf_bs_read_int(bs, 1);
 	rle = gf_bs_read_int(bs, 1);
 	entry_count = gf_bs_read_int(bs, large_size ? 16 : 8);
-	fprintf(trace, "<NALUMap rle=\"%d\" large_size=\"%d\">\n", rle, large_size);
+	gf_fprintf(trace, "<NALUMap rle=\"%d\" large_size=\"%d\">\n", rle, large_size);
 
 	while (entry_count) {
 		u32 ID;
-		fprintf(trace, "<NALUMapEntry ");
+		gf_fprintf(trace, "<NALUMapEntry ");
 		if (rle) {
 			u32 start_num = gf_bs_read_int(bs, large_size ? 16 : 8);
-			fprintf(trace, "NALU_startNumber=\"%d\" ", start_num);
+			gf_fprintf(trace, "NALU_startNumber=\"%d\" ", start_num);
 		}
 		ID = gf_bs_read_u16(bs);
-		fprintf(trace, "groupID=\"%d\"/>\n", ID);
+		gf_fprintf(trace, "groupID=\"%d\"/>\n", ID);
 		entry_count--;
 	}
 	gf_bs_del(bs);
-	fprintf(trace, "</NALUMap>\n");
+	gf_fprintf(trace, "</NALUMap>\n");
 	return;
 }
 
 
-GF_Err sgpd_dump(GF_Box *a, FILE * trace)
+GF_Err sgpd_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SampleGroupDescriptionBox *ptr = (GF_SampleGroupDescriptionBox*) a;
@@ -4503,39 +4513,39 @@
 	gf_isom_box_dump_start(a, "SampleGroupDescriptionBox", trace);
 
 	if (ptr->grouping_type)
-		fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(ptr->grouping_type) );
-	if (ptr->version==1) fprintf(trace, " default_length=\"%d\"", ptr->default_length);
-	if ((ptr->version>=2) && ptr->default_description_index) fprintf(trace, " default_group_index=\"%d\"", ptr->default_description_index);
-	fprintf(trace, ">\n");
+		gf_fprintf(trace, "grouping_type=\"%s\"", gf_4cc_to_str(ptr->grouping_type) );
+	if (ptr->version==1) gf_fprintf(trace, " default_length=\"%d\"", ptr->default_length);
+	if ((ptr->version>=2) && ptr->default_description_index) gf_fprintf(trace, " default_group_index=\"%d\"", ptr->default_description_index);
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<gf_list_count(ptr->group_descriptions); i++) {
 		void *entry = gf_list_get(ptr->group_descriptions, i);
 		switch (ptr->grouping_type) {
 		case GF_ISOM_SAMPLE_GROUP_ROLL:
-			fprintf(trace, "<RollRecoveryEntry roll_distance=\"%d\" />\n", ((GF_RollRecoveryEntry*)entry)->roll_distance );
+			gf_fprintf(trace, "<RollRecoveryEntry roll_distance=\"%d\" />\n", ((GF_RollRecoveryEntry*)entry)->roll_distance );
 			break;
 		case GF_ISOM_SAMPLE_GROUP_PROL:
-			fprintf(trace, "<AudioPreRollEntry roll_distance=\"%d\" />\n", ((GF_RollRecoveryEntry*)entry)->roll_distance );
+			gf_fprintf(trace, "<AudioPreRollEntry roll_distance=\"%d\" />\n", ((GF_RollRecoveryEntry*)entry)->roll_distance );
 			break;
 		case GF_ISOM_SAMPLE_GROUP_TELE:
-			fprintf(trace, "<TemporalLevelEntry level_independently_decodable=\"%d\"/>\n", ((GF_TemporalLevelEntry*)entry)->level_independently_decodable);
+			gf_fprintf(trace, "<TemporalLevelEntry level_independently_decodable=\"%d\"/>\n", ((GF_TemporalLevelEntry*)entry)->level_independently_decodable);
 			break;
 		case GF_ISOM_SAMPLE_GROUP_RAP:
-			fprintf(trace, "<VisualRandomAccessEntry num_leading_samples_known=\"%s\"", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples_known ? "yes" : "no");
+			gf_fprintf(trace, "<VisualRandomAccessEntry num_leading_samples_known=\"%s\"", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples_known ? "yes" : "no");
 			if (((GF_VisualRandomAccessEntry*)entry)->num_leading_samples_known)
-				fprintf(trace, " num_leading_samples=\"%d\"", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples);
-			fprintf(trace, "/>\n");
+				gf_fprintf(trace, " num_leading_samples=\"%d\"", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples);
+			gf_fprintf(trace, "/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SYNC:
-			fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"%d\"/>\n", ((GF_SYNCEntry*)entry)->NALU_type);
+			gf_fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"%d\"/>\n", ((GF_SYNCEntry*)entry)->NALU_type);
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
-			fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->IsProtected, ((GF_CENCSampleEncryptionGroupEntry*)entry)->Per_Sample_IV_size);
+			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) {
-				fprintf(trace, "\" constant_IV_size=\"%d\"  constant_IV=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->constant_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);
 			}
-			fprintf(trace, "\"/>\n");
+			gf_fprintf(trace, "\"/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_OINF:
 			oinf_entry_dump(entry, trace);
@@ -4551,33 +4561,33 @@
 			nalm_dump(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SAP:
-			fprintf(trace, "<SAPEntry dependent_flag=\"%d\" SAP_type=\"%d\" />\n", ((GF_SAPEntry*)entry)->dependent_flag, ((GF_SAPEntry*)entry)->SAP_type);
+			gf_fprintf(trace, "<SAPEntry dependent_flag=\"%d\" SAP_type=\"%d\" />\n", ((GF_SAPEntry*)entry)->dependent_flag, ((GF_SAPEntry*)entry)->SAP_type);
 			break;
 		default:
-			fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
+			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			dump_data(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
-			fprintf(trace, "\"/>\n");
+			gf_fprintf(trace, "\"/>\n");
 		}
 	}
 	if (!ptr->size) {
 		switch (ptr->grouping_type) {
 		case GF_ISOM_SAMPLE_GROUP_ROLL:
-			fprintf(trace, "<RollRecoveryEntry roll_distance=\"\"/>\n");
+			gf_fprintf(trace, "<RollRecoveryEntry roll_distance=\"\"/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_PROL:
-			fprintf(trace, "<AudioPreRollEntry roll_distance=\"\"/>\n");
+			gf_fprintf(trace, "<AudioPreRollEntry roll_distance=\"\"/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_TELE:
-			fprintf(trace, "<TemporalLevelEntry level_independently_decodable=\"\"/>\n");
+			gf_fprintf(trace, "<TemporalLevelEntry level_independently_decodable=\"\"/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_RAP:
-			fprintf(trace, "<VisualRandomAccessEntry num_leading_samples_known=\"yes|no\" num_leading_samples=\"\" />\n");
+			gf_fprintf(trace, "<VisualRandomAccessEntry num_leading_samples_known=\"yes|no\" num_leading_samples=\"\" />\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SYNC:
-			fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"\" />\n");
+			gf_fprintf(trace, "<SyncSampleGroupEntry NAL_unit_type=\"\" />\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SEIG:
-			fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"\" IV_size=\"\" KID=\"\" constant_IV_size=\"\"  constant_IV=\"\"/>\n");
+			gf_fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"\" IV_size=\"\" KID=\"\" constant_IV_size=\"\"  constant_IV=\"\"/>\n");
 			break;
 		case GF_ISOM_SAMPLE_GROUP_OINF:
 			oinf_entry_dump(NULL, trace);
@@ -4592,10 +4602,10 @@
 			nalm_dump(trace, NULL, 0);
 			break;
 		case GF_ISOM_SAMPLE_GROUP_SAP:
-			fprintf(trace, "<SAPEntry dependent_flag=\"\" SAP_type=\"\" />\n");
+			gf_fprintf(trace, "<SAPEntry dependent_flag=\"\" SAP_type=\"\" />\n");
 			break;
 		default:
-			fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"\" data=\"\"/>\n");
+			gf_fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"\" data=\"\"/>\n");
 		}
 	}
 
@@ -4603,249 +4613,261 @@
 	return GF_OK;
 }
 
-GF_Err saiz_dump(GF_Box *a, FILE * trace)
+GF_Err saiz_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SampleAuxiliaryInfoSizeBox *ptr = (GF_SampleAuxiliaryInfoSizeBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	gf_isom_box_dump_start(a, "SampleAuxiliaryInfoSizeBox", trace);
 
-	fprintf(trace, "default_sample_info_size=\"%d\" sample_count=\"%d\"", ptr->default_sample_info_size, ptr->sample_count);
+	gf_fprintf(trace, "default_sample_info_size=\"%d\" sample_count=\"%d\"", ptr->default_sample_info_size, ptr->sample_count);
 	if (ptr->flags & 1) {
 		if (isalnum(ptr->aux_info_type>>24)) {
-			fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
+			gf_fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
 		} else {
-			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+			gf_fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
 		}
 	}
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	if (ptr->default_sample_info_size==0) {
 		for (i=0; i<ptr->sample_count; i++) {
-			fprintf(trace, "<SAISize size=\"%d\" />\n", ptr->sample_info_size[i]);
+			gf_fprintf(trace, "<SAISize size=\"%d\" />\n", ptr->sample_info_size[i]);
 		}
 	}
 	if (!ptr->size) {
-			fprintf(trace, "<SAISize size=\"\" />\n");
+			gf_fprintf(trace, "<SAISize size=\"\" />\n");
 	}
 	gf_isom_box_dump_done("SampleAuxiliaryInfoSizeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err saio_dump(GF_Box *a, FILE * trace)
+GF_Err saio_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_SampleAuxiliaryInfoOffsetBox *ptr = (GF_SampleAuxiliaryInfoOffsetBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
+	if (dump_skip_samples)
+		return GF_OK;
+
 	gf_isom_box_dump_start(a, "SampleAuxiliaryInfoOffsetBox", trace);
 
-	fprintf(trace, "entry_count=\"%d\"", ptr->entry_count);
+	gf_fprintf(trace, "entry_count=\"%d\"", ptr->entry_count);
 	if (ptr->flags & 1) {
 		if (isalnum(ptr->aux_info_type>>24)) {
-			fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
+			gf_fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
 		} else {
-			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+			gf_fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
 		}
 	}
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	if (ptr->version==0) {
 		for (i=0; i<ptr->entry_count; i++) {
-			fprintf(trace, "<SAIChunkOffset offset=\"%d\"/>\n", ptr->offsets[i]);
+			gf_fprintf(trace, "<SAIChunkOffset offset=\"%d\"/>\n", (u32) ptr->offsets[i]);
 		}
 	} else {
 		for (i=0; i<ptr->entry_count; i++) {
-			fprintf(trace, "<SAIChunkOffset offset=\""LLD"\"/>\n", ptr->offsets_large[i]);
+			gf_fprintf(trace, "<SAIChunkOffset offset=\""LLD"\"/>\n", ptr->offsets[i]);
 		}
 	}
 	if (!ptr->size) {
-			fprintf(trace, "<SAIChunkOffset offset=\"\"/>\n");
+			gf_fprintf(trace, "<SAIChunkOffset offset=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("SampleAuxiliaryInfoOffsetBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err pssh_dump(GF_Box *a, FILE * trace)
+GF_Err pssh_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ProtectionSystemHeaderBox *ptr = (GF_ProtectionSystemHeaderBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "ProtectionSystemHeaderBox", trace);
 
-	fprintf(trace, "SystemID=\"");
+	gf_fprintf(trace, "SystemID=\"");
 	dump_data_hex(trace, (char *) ptr->SystemID, 16);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 
 	if (ptr->KID_count) {
 		u32 i;
 		for (i=0; i<ptr->KID_count; i++) {
-			fprintf(trace, " <PSSHKey KID=\"");
+			gf_fprintf(trace, " <PSSHKey KID=\"");
 			dump_data_hex(trace, (char *) ptr->KIDs[i], 16);
-			fprintf(trace, "\"/>\n");
+			gf_fprintf(trace, "\"/>\n");
 		}
 	}
 	if (ptr->private_data_size) {
-		fprintf(trace, " <PSSHData size=\"%d\" value=\"", ptr->private_data_size);
+		gf_fprintf(trace, " <PSSHData size=\"%d\" value=\"", ptr->private_data_size);
 		dump_data_hex(trace, (char *) ptr->private_data, ptr->private_data_size);
-		fprintf(trace, "\"/>\n");
+		gf_fprintf(trace, "\"/>\n");
 	}
 	if (!ptr->size) {
-		fprintf(trace, " <PSSHKey KID=\"\"/>\n");
-		fprintf(trace, " <PSSHData size=\"\" value=\"\"/>\n");
+		gf_fprintf(trace, " <PSSHKey KID=\"\"/>\n");
+		gf_fprintf(trace, " <PSSHData size=\"\" value=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("ProtectionSystemHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tenc_dump(GF_Box *a, FILE * trace)
+GF_Err tenc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackEncryptionBox *ptr = (GF_TrackEncryptionBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "TrackEncryptionBox", trace);
 
-	fprintf(trace, "isEncrypted=\"%d\"", ptr->isProtected);
+	gf_fprintf(trace, "isEncrypted=\"%d\"", ptr->isProtected);
 	if (ptr->Per_Sample_IV_Size)
-		fprintf(trace, " IV_size=\"%d\" KID=\"", ptr->Per_Sample_IV_Size);
+		gf_fprintf(trace, " IV_size=\"%d\" KID=\"", ptr->Per_Sample_IV_Size);
 	else {
-		fprintf(trace, " constant_IV_size=\"%d\" constant_IV=\"", ptr->constant_IV_size);
+		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);
-		fprintf(trace, "\"  KID=\"");
+		gf_fprintf(trace, "\"  KID=\"");
 	}
 	dump_data_hex(trace, (char *) ptr->KID, 16);
 	if (ptr->version)
-		fprintf(trace, "\" crypt_byte_block=\"%d\" skip_byte_block=\"%d", ptr->crypt_byte_block, ptr->skip_byte_block);
-	fprintf(trace, "\">\n");
+		gf_fprintf(trace, "\" crypt_byte_block=\"%d\" skip_byte_block=\"%d", ptr->crypt_byte_block, ptr->skip_byte_block);
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("TrackEncryptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err piff_pssh_dump(GF_Box *a, FILE * trace)
+GF_Err piff_pssh_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "PIFFProtectionSystemHeaderBox", trace);
+	fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ptr->version, ptr->flags);
 
-	fprintf(trace, "SystemID=\"");
+	gf_fprintf(trace, "SystemID=\"");
 	dump_data_hex(trace, (char *) ptr->SystemID, 16);
-	fprintf(trace, "\" PrivateData=\"");
+	gf_fprintf(trace, "\" PrivateData=\"");
 	dump_data_hex(trace, (char *) ptr->private_data, ptr->private_data_size);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("PIFFProtectionSystemHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err piff_tenc_dump(GF_Box *a, FILE * trace)
+GF_Err piff_tenc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_PIFFTrackEncryptionBox *ptr = (GF_PIFFTrackEncryptionBox*) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "PIFFTrackEncryptionBox", trace);
+	fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ptr->version, ptr->flags);
 
-	fprintf(trace, "AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
+	gf_fprintf(trace, "AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
 	dump_data_hex(trace,(char *) ptr->KID, 16);
-	fprintf(trace, "\">\n");
+	gf_fprintf(trace, "\">\n");
 	gf_isom_box_dump_done("PIFFTrackEncryptionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err piff_psec_dump(GF_Box *a, FILE * trace)
+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);
-	fprintf(trace, "sampleCount=\"%d\"", sample_count);
+	gf_fprintf(trace, "sampleCount=\"%d\"", sample_count);
 	if (ptr->flags & 1) {
-		fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
+		gf_fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
 		dump_data(trace, (char *) ptr->KID, 16);
-		fprintf(trace, "\"");
+		gf_fprintf(trace, "\"");
 	}
-	fprintf(trace, ">\n");
+	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) {
-				fprintf(trace, "<PIFFSampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
+				gf_fprintf(trace, "<PIFFSampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
 				if (cenc_sample->IV_size) {
-					fprintf(trace, " IV=\"");
+					gf_fprintf(trace, " IV=\"");
 					dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
-					fprintf(trace, "\"");
+					gf_fprintf(trace, "\"");
 				}
 				if (ptr->flags & 0x2) {
-					fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
-					fprintf(trace, ">\n");
+					gf_fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
+					gf_fprintf(trace, ">\n");
 
 					for (j=0; j<cenc_sample->subsample_count; j++) {
-						fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
+						gf_fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
 					}
 				} else {
-					fprintf(trace, ">\n");
+					gf_fprintf(trace, ">\n");
 				}
-				fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
+				gf_fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
 			}
 		}
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<PIFFSampleEncryptionEntry IV=\"\" SubsampleCount=\"\">\n");
-		fprintf(trace, "<PIFFSubSampleEncryptionEntry NumClearBytes=\"\" NumEncryptedBytes=\"\"/>\n");
-		fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
+		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;
 }
 
-GF_Err senc_dump(GF_Box *a, FILE * trace)
+GF_Err senc_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, j, sample_count;
 	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);
 	sample_count = gf_list_count(ptr->samp_aux_info);
-	fprintf(trace, "sampleCount=\"%d\">\n", sample_count);
+	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
-	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", ptr->version, ptr->flags);
+	gf_fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", ptr->version, ptr->flags);
 	for (i=0; i<sample_count; i++) {
 		GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 
 		if (cenc_sample) {
-			fprintf(trace, "<SampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
+			gf_fprintf(trace, "<SampleEncryptionEntry sampleNumber=\"%d\" IV_size=\"%u\"", i+1, cenc_sample->IV_size);
 			if (cenc_sample->IV_size) {
-				fprintf(trace, " IV=\"");
+				gf_fprintf(trace, " IV=\"");
 				dump_data_hex(trace, (char *) cenc_sample->IV, cenc_sample->IV_size);
-				fprintf(trace, "\"");
+				gf_fprintf(trace, "\"");
 			}
 			if (ptr->flags & 0x2) {
-				fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
-				fprintf(trace, ">\n");
+				gf_fprintf(trace, " SubsampleCount=\"%d\"", cenc_sample->subsample_count);
+				gf_fprintf(trace, ">\n");
 
 				for (j=0; j<cenc_sample->subsample_count; j++) {
-					fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
+					gf_fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
 				}
 			} else {
-				fprintf(trace, ">\n");
+				gf_fprintf(trace, ">\n");
 			}
-			fprintf(trace, "</SampleEncryptionEntry>\n");
+			gf_fprintf(trace, "</SampleEncryptionEntry>\n");
 		}
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<SampleEncryptionEntry sampleCount=\"\" IV=\"\" SubsampleCount=\"\">\n");
-		fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"\" NumEncryptedBytes=\"\"/>\n");
-		fprintf(trace, "</SampleEncryptionEntry>\n");
+		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);
 	return GF_OK;
 }
 
-GF_Err prft_dump(GF_Box *a, FILE * trace)
+GF_Err prft_box_dump(GF_Box *a, FILE * trace)
 {
 	Double fracs;
 	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) a;
@@ -4858,109 +4880,96 @@
 		}
 		secs = 0;
 	}
-	t = *gmtime(&secs);
+	t = *gf_gmtime(&secs);
 	fracs = (Double) (ptr->ntp & 0xFFFFFFFFULL);
 	fracs /= 0xFFFFFFFF;
 	fracs *= 1000;
 	gf_isom_box_dump_start(a, "ProducerReferenceTimeBox", trace);
 
-	fprintf(trace, "referenceTrackID=\"%d\" timestamp=\""LLU"\" NTP=\""LLU"\" UTC=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\">\n", ptr->refTrackID, ptr->timestamp, ptr->ntp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, (u32) t.tm_sec, (u32) fracs);
+	gf_fprintf(trace, "referenceTrackID=\"%d\" timestamp=\""LLU"\" NTP=\""LLU"\" UTC=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\">\n", ptr->refTrackID, ptr->timestamp, ptr->ntp, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, (u32) t.tm_sec, (u32) fracs);
 	gf_isom_box_dump_done("ProducerReferenceTimeBox", a, trace);
 
 	return GF_OK;
 }
 
-GF_Err adkm_dump(GF_Box *a, FILE * trace)
+GF_Err adkm_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeDRMKeyManagementSystemBox", trace);
 
-	fprintf(trace, ">\n");
-	if (ptr->header) gf_isom_box_dump((GF_Box *)ptr->header, trace);
-	if (ptr->au_format) gf_isom_box_dump((GF_Box *)ptr->au_format, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AdobeDRMKeyManagementSystemBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ahdr_dump(GF_Box *a, FILE * trace)
+GF_Err ahdr_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeDRMHeaderBox", trace);
-	fprintf(trace, ">\n");
-	if (ptr->std_enc_params) gf_isom_box_dump((GF_Box *)ptr->std_enc_params, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AdobeDRMHeaderBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err aprm_dump(GF_Box *a, FILE * trace)
+GF_Err aprm_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeStdEncryptionParamsBox", trace);
-	fprintf(trace, ">\n");
-	if (ptr->enc_info) gf_isom_box_dump((GF_Box *)ptr->enc_info, trace);
-	if (ptr->key_info) gf_isom_box_dump((GF_Box *)ptr->key_info, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AdobeStdEncryptionParamsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err aeib_dump(GF_Box *a, FILE * trace)
+GF_Err aeib_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeEncryptionInfoBox", trace);
-	fprintf(trace, "EncryptionAlgorithm=\"%s\" KeyLength=\"%d\">\n", ptr->enc_algo, ptr->key_length);
+	gf_fprintf(trace, "EncryptionAlgorithm=\"%s\" KeyLength=\"%d\">\n", ptr->enc_algo, ptr->key_length);
 	gf_isom_box_dump_done("AdobeEncryptionInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err akey_dump(GF_Box *a, FILE * trace)
+GF_Err akey_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeKeyInfoBox", trace);
-	fprintf(trace, ">\n");
-	if (ptr->params) gf_isom_box_dump((GF_Box *)ptr->params, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AdobeKeyInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err flxs_dump(GF_Box *a, FILE * trace)
+GF_Err flxs_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeFlashAccessParamsBox", trace);
-	fprintf(trace, ">\n");
-	if (ptr->metadata)
-		fprintf(trace, "<FmrmsV2Metadata=\"%s\"/>\n", ptr->metadata);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AdobeFlashAccessParamsBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err adaf_dump(GF_Box *a, FILE * trace)
+GF_Err adaf_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "AdobeDRMAUFormatBox ", trace);
-	fprintf(trace, "SelectiveEncryption=\"%d\" IV_length=\"%d\">\n", ptr->selective_enc ? 1 : 0, ptr->IV_length);
+	gf_fprintf(trace, "SelectiveEncryption=\"%d\" IV_length=\"%d\">\n", ptr->selective_enc ? 1 : 0, ptr->IV_length);
 	gf_isom_box_dump_done("AdobeDRMAUFormatBox", a, trace);
 	return GF_OK;
 }
 
 /* Image File Format dump */
-GF_Err ispe_dump(GF_Box *a, FILE * trace)
+GF_Err ispe_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ImageSpatialExtentsPropertyBox *ptr = (GF_ImageSpatialExtentsPropertyBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "ImageSpatialExtentsPropertyBox", trace);
-	fprintf(trace, "image_width=\"%d\" image_height=\"%d\">\n", ptr->image_width, ptr->image_height);
+	gf_fprintf(trace, "image_width=\"%d\" image_height=\"%d\">\n", ptr->image_width, ptr->image_height);
 	gf_isom_box_dump_done("ImageSpatialExtentsPropertyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err colr_dump(GF_Box *a, FILE * trace)
+GF_Err colr_box_dump(GF_Box *a, FILE * trace)
 {
 	u8 *prof_data_64=NULL;
 	u32 size_64;
@@ -4968,248 +4977,252 @@
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "ColourInformationBox", trace);
-	switch (ptr->colour_type) {
-	case GF_ISOM_SUBTYPE_NCLC:
-		fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients);
-		break;
-	case GF_ISOM_SUBTYPE_NCLX:
-		fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\" full_range_flag=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients, ptr->full_range_flag);
-		break;
-	case GF_ISOM_SUBTYPE_PROF:
-	case GF_ISOM_SUBTYPE_RICC:
-		fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
-		if (ptr->opaque != NULL) {
-			fprintf(trace, "<profile><![CDATA[");
-			size_64 = 2*ptr->opaque_size;
-			prof_data_64 = gf_malloc(size_64);
-			size_64 = gf_base64_encode((const char *) ptr->opaque, ptr->opaque_size, (char *)prof_data_64, size_64);
-			prof_data_64[size_64] = 0;
-			fprintf(trace, "%s", prof_data_64);
-			fprintf(trace, "]]></profile>");
+
+	if (ptr->is_jp2) {
+		gf_fprintf(trace, "method=\"%d\" precedence=\"%d\" approx=\"%d\"", ptr->method, ptr->precedence, ptr->approx);
+		if (ptr->opaque_size) {
+			gf_fprintf(trace, " colour=\"");
+			dump_data_hex(trace, ptr->opaque,ptr->opaque_size);
+			gf_fprintf(trace, "\"");
+		}
+		gf_fprintf(trace, ">\n");
+	} else {
+		switch (ptr->colour_type) {
+		case GF_ISOM_SUBTYPE_NCLC:
+			gf_fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients);
+			break;
+		case GF_ISOM_SUBTYPE_NCLX:
+			gf_fprintf(trace, "colour_type=\"%s\" colour_primaries=\"%d\" transfer_characteristics=\"%d\" matrix_coefficients=\"%d\" full_range_flag=\"%d\">\n", gf_4cc_to_str(ptr->colour_type), ptr->colour_primaries, ptr->transfer_characteristics, ptr->matrix_coefficients, ptr->full_range_flag);
+			break;
+		case GF_ISOM_SUBTYPE_PROF:
+		case GF_ISOM_SUBTYPE_RICC:
+			gf_fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
+			if (ptr->opaque != NULL) {
+				gf_fprintf(trace, "<profile><![CDATA[");
+				size_64 = 2*ptr->opaque_size;
+				prof_data_64 = gf_malloc(size_64);
+				size_64 = gf_base64_encode((const char *) ptr->opaque, ptr->opaque_size, (char *)prof_data_64, size_64);
+				prof_data_64[size_64] = 0;
+				gf_fprintf(trace, "%s", prof_data_64);
+				gf_fprintf(trace, "]]></profile>");
+			}
+			break;
+		default:
+			gf_fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
+			break;
 		}
-		break;
-	default:
-		fprintf(trace, "colour_type=\"%s\">\n", gf_4cc_to_str(ptr->colour_type));
-		break;
 	}
 
 	gf_isom_box_dump_done("ColourInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err pixi_dump(GF_Box *a, FILE * trace)
+GF_Err pixi_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_PixelInformationPropertyBox *ptr = (GF_PixelInformationPropertyBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "PixelInformationPropertyBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i = 0; i < ptr->num_channels; i++) {
-		fprintf(trace, "<BitPerChannel bits_per_channel=\"%d\"/>\n", ptr->bits_per_channel[i]);
+		gf_fprintf(trace, "<BitPerChannel bits_per_channel=\"%d\"/>\n", ptr->bits_per_channel[i]);
 	}
 	if (!ptr->size)
-		fprintf(trace, "<BitPerChannel bits_per_channel=\"\"/>\n");
+		gf_fprintf(trace, "<BitPerChannel bits_per_channel=\"\"/>\n");
 
 	gf_isom_box_dump_done("PixelInformationPropertyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err rloc_dump(GF_Box *a, FILE * trace)
+GF_Err rloc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_RelativeLocationPropertyBox *ptr = (GF_RelativeLocationPropertyBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "RelativeLocationPropertyBox", trace);
-	fprintf(trace, "horizontal_offset=\"%d\" vertical_offset=\"%d\">\n", ptr->horizontal_offset, ptr->vertical_offset);
+	gf_fprintf(trace, "horizontal_offset=\"%d\" vertical_offset=\"%d\">\n", ptr->horizontal_offset, ptr->vertical_offset);
 	gf_isom_box_dump_done("RelativeLocationPropertyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err irot_dump(GF_Box *a, FILE * trace)
+GF_Err irot_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ImageRotationBox *ptr = (GF_ImageRotationBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "ImageRotationBox", trace);
-	fprintf(trace, "angle=\"%d\">\n", (ptr->angle*90));
+	gf_fprintf(trace, "angle=\"%d\">\n", (ptr->angle*90));
 	gf_isom_box_dump_done("ImageRotationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err clli_dump(GF_Box *a, FILE * trace)
+GF_Err clli_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ContentLightLevelBox *ptr = (GF_ContentLightLevelBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "ContentLightLevelBox", trace);
-	fprintf(trace, "max_content_light_level=\"%u\" max_pic_average_light_level=\"%u\">\n", ptr->max_content_light_level, ptr->max_pic_average_light_level);
+	gf_fprintf(trace, "max_content_light_level=\"%u\" max_pic_average_light_level=\"%u\">\n", ptr->clli.max_content_light_level, ptr->clli.max_pic_average_light_level);
 	gf_isom_box_dump_done("ContentLightLevelBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err mdcv_dump(GF_Box *a, FILE * trace)
+GF_Err mdcv_box_dump(GF_Box *a, FILE * trace)
 {
 	int c = 0;
 	GF_MasteringDisplayColourVolumeBox *ptr = (GF_MasteringDisplayColourVolumeBox *)a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "MasteringDisplayColourVolumeBox", trace);
 	for (c = 0; c < 3; c++) {
-		fprintf(trace, "display_primaries[%d].x=\"%u\" display_primaries[%d].y=\"%u\"", c, ptr->display_primaries[c].x, c, ptr->display_primaries[c].y);
+		gf_fprintf(trace, "display_primaries_%d_x=\"%u\" display_primaries_%d_y=\"%u\" ", c, ptr->mdcv.display_primaries[c].x, c, ptr->mdcv.display_primaries[c].y);
 	}
-	fprintf(trace, "white_point_x=\"%u\" white_point_y=\"%u\" max_display_mastering_luminance=\"%u\" min_display_mastering_luminance=\"%u\">\n", ptr->white_point_x, ptr->white_point_y, ptr->max_display_mastering_luminance, ptr->min_display_mastering_luminance);
+	gf_fprintf(trace, "white_point_x=\"%u\" white_point_y=\"%u\" max_display_mastering_luminance=\"%u\" min_display_mastering_luminance=\"%u\">\n", ptr->mdcv.white_point_x, ptr->mdcv.white_point_y, ptr->mdcv.max_display_mastering_luminance, ptr->mdcv.min_display_mastering_luminance);
 	gf_isom_box_dump_done("MasteringDisplayColourVolumeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ipco_dump(GF_Box *a, FILE * trace)
+GF_Err ipco_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "ItemPropertyContainerBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ItemPropertyContainerBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err iprp_dump(GF_Box *a, FILE * trace)
+GF_Err iprp_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_ItemPropertiesBox *ptr = (GF_ItemPropertiesBox *)a;
 	gf_isom_box_dump_start(a, "ItemPropertiesBox", trace);
-	fprintf(trace, ">\n");
-	if (ptr->property_container) gf_isom_box_dump(ptr->property_container, trace);
-	if (ptr->property_association) gf_isom_box_dump(ptr->property_association, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("ItemPropertiesBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ipma_dump(GF_Box *a, FILE * trace)
+GF_Err ipma_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, j;
 	GF_ItemPropertyAssociationBox *ptr = (GF_ItemPropertyAssociationBox *)a;
-	u32 entry_count = gf_list_count(ptr->entries);
+	u32 entry_count;
 	if (!a) return GF_BAD_PARAM;
+	entry_count = gf_list_count(ptr->entries);
 	gf_isom_box_dump_start(a, "ItemPropertyAssociationBox", trace);
-	fprintf(trace, "entry_count=\"%d\">\n", entry_count);
+	gf_fprintf(trace, "entry_count=\"%d\">\n", entry_count);
 	for (i = 0; i < entry_count; i++) {
 		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ptr->entries, i);
-		u32 association_count = gf_list_count(entry->essential);
-		fprintf(trace, "<AssociationEntry item_ID=\"%d\" association_count=\"%d\">\n", entry->item_id, association_count);
-		for (j = 0; j < association_count; j++) {
-			Bool *ess = (Bool *)gf_list_get(entry->essential, j);
-			u32 *prop_index = (u32 *)gf_list_get(entry->property_index, j);
-			fprintf(trace, "<Property index=\"%d\" essential=\"%d\"/>\n", *prop_index, *ess);
+		gf_fprintf(trace, "<AssociationEntry item_ID=\"%d\" association_count=\"%d\">\n", entry->item_id, entry->nb_associations);
+		for (j = 0; j < entry->nb_associations; j++) {
+			gf_fprintf(trace, "<Property index=\"%d\" essential=\"%d\"/>\n", entry->associations[j].index, entry->associations[j].essential);
 		}
-		fprintf(trace, "</AssociationEntry>\n");
+		gf_fprintf(trace, "</AssociationEntry>\n");
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<AssociationEntry item_ID=\"\" association_count=\"\">\n");
-		fprintf(trace, "<Property index=\"\" essential=\"\"/>\n");
-		fprintf(trace, "</AssociationEntry>\n");
+		gf_fprintf(trace, "<AssociationEntry item_ID=\"\" association_count=\"\">\n");
+		gf_fprintf(trace, "<Property index=\"\" essential=\"\"/>\n");
+		gf_fprintf(trace, "</AssociationEntry>\n");
 	}
 	gf_isom_box_dump_done("ItemPropertyAssociationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err auxc_dump(GF_Box *a, FILE * trace)
+GF_Err auxc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AuxiliaryTypePropertyBox *ptr = (GF_AuxiliaryTypePropertyBox *)a;
 
 	gf_isom_box_dump_start(a, "AuxiliaryTypePropertyBox", trace);
-	fprintf(trace, "aux_type=\"%s\" ", ptr->aux_urn);
+	gf_fprintf(trace, "aux_type=\"%s\" ", ptr->aux_urn);
 	dump_data_attribute(trace, "aux_subtype", ptr->data, ptr->data_size);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AuxiliaryTypePropertyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err auxi_dump(GF_Box *a, FILE * trace)
+GF_Err auxi_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)a;
 
 	gf_isom_box_dump_start(a, "AuxiliaryTypeInfoBox", trace);
-	fprintf(trace, "aux_track_type=\"%s\" ", ptr->aux_track_type);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, "aux_track_type=\"%s\" ", ptr->aux_track_type);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("AuxiliaryTypeInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err oinf_dump(GF_Box *a, FILE * trace)
+GF_Err oinf_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_OINFPropertyBox *ptr = (GF_OINFPropertyBox *)a;
 	gf_isom_box_dump_start(a, "OperatingPointsInformationPropertyBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	oinf_entry_dump(ptr->oinf, trace);
 
 	gf_isom_box_dump_done("OperatingPointsInformationPropertyBox", a, trace);
 	return GF_OK;
 }
-GF_Err tols_dump(GF_Box *a, FILE * trace)
+GF_Err tols_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TargetOLSPropertyBox *ptr = (GF_TargetOLSPropertyBox *)a;
 	gf_isom_box_dump_start(a, "TargetOLSPropertyBox", trace);
-	fprintf(trace, "target_ols_index=\"%d\">\n", ptr->target_ols_index);
+	gf_fprintf(trace, "target_ols_index=\"%d\">\n", ptr->target_ols_index);
 
 	gf_isom_box_dump_done("TargetOLSPropertyBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trgr_dump(GF_Box *a, FILE * trace)
+GF_Err trgr_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_TrackGroupBox *ptr = (GF_TrackGroupBox *) a;
 	gf_isom_box_dump_start(a, "TrackGroupBox", trace);
-	fprintf(trace, ">\n");
-	gf_isom_box_array_dump(ptr->groups, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("TrackGroupBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err trgt_dump(GF_Box *a, FILE * trace)
+GF_Err trgt_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackGroupTypeBox *ptr = (GF_TrackGroupTypeBox *) a;
 	a->type = ptr->group_type;
 	gf_isom_box_dump_start(a, "TrackGroupTypeBox", trace);
 	a->type = GF_ISOM_BOX_TYPE_TRGT;
-	fprintf(trace, "track_group_id=\"%d\">\n", ptr->track_group_id);
+	gf_fprintf(trace, "track_group_id=\"%d\">\n", ptr->track_group_id);
 	gf_isom_box_dump_done("TrackGroupTypeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err grpl_dump(GF_Box *a, FILE * trace)
+GF_Err grpl_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "GroupListBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("GroupListBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err grptype_dump(GF_Box *a, FILE * trace)
+GF_Err grptype_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_EntityToGroupTypeBox *ptr = (GF_EntityToGroupTypeBox *) a;
 	a->type = ptr->grouping_type;
 	gf_isom_box_dump_start(a, "EntityToGroupTypeBox", trace);
 	a->type = GF_ISOM_BOX_TYPE_GRPT;
-	fprintf(trace, "group_id=\"%d\">\n", ptr->group_id);
+	gf_fprintf(trace, "group_id=\"%d\">\n", ptr->group_id);
 
 	for (i=0; i<ptr->entity_id_count ; i++)
-		fprintf(trace, "<EntityToGroupTypeBoxEntry EntityID=\"%d\"/>\n", ptr->entity_ids[i]);
+		gf_fprintf(trace, "<EntityToGroupTypeBoxEntry EntityID=\"%d\"/>\n", ptr->entity_ids[i]);
 
 	if (!ptr->size)
-		fprintf(trace, "<EntityToGroupTypeBoxEntry EntityID=\"\"/>\n");
+		gf_fprintf(trace, "<EntityToGroupTypeBoxEntry EntityID=\"\"/>\n");
 
 	gf_isom_box_dump_done("EntityToGroupTypeBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err stvi_dump(GF_Box *a, FILE * trace)
+GF_Err stvi_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_StereoVideoBox *ptr = (GF_StereoVideoBox *) a;
 	gf_isom_box_dump_start(a, "StereoVideoBox", trace);
 
-	fprintf(trace, "single_view_allowed=\"%d\" stereo_scheme=\"%d\" ", ptr->single_view_allowed, ptr->stereo_scheme);
+	gf_fprintf(trace, "single_view_allowed=\"%d\" stereo_scheme=\"%d\" ", ptr->single_view_allowed, ptr->stereo_scheme);
 	dump_data_attribute(trace, "stereo_indication_type", ptr->stereo_indication_type, ptr->sit_len);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("StereoVideoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err def_cont_box_dump(GF_Box *a, FILE *trace)
+GF_Err def_parent_box_dump(GF_Box *a, FILE *trace)
 {
 	char *name = "GenericContainerBox";
 
@@ -5232,31 +5245,35 @@
 	}
 
 	gf_isom_box_dump_start(a, name, trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done(name, a, trace);
 	return GF_OK;
 }
 
-GF_Err fiin_dump(GF_Box *a, FILE * trace)
+GF_Err def_parent_full_box_dump(GF_Box *a, FILE *trace)
 {
-	FDItemInformationBox *ptr = (FDItemInformationBox *) a;
-	gf_isom_box_dump_start(a, "FDItemInformationBox", trace);
-
-	fprintf(trace, ">\n");
-	if (ptr->partition_entries)
-		gf_isom_box_array_dump(ptr->partition_entries, trace);
-
-	if (ptr->session_info)
-		gf_isom_box_dump(ptr->session_info, trace);
+	char *name = "GenericFullBox";
 
-	if (ptr->group_id_to_name)
-		gf_isom_box_dump(ptr->group_id_to_name, trace);
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_MVCI:
+		name = "MultiviewInformationBox";
+		break;
+	}
 
+	gf_isom_box_dump_start(a, name, trace);
+	gf_fprintf(trace, ">\n");
+	gf_isom_box_dump_done(name, a, trace);
+	return GF_OK;
+}
+GF_Err fiin_box_dump(GF_Box *a, FILE * trace)
+{
+	gf_isom_box_dump_start(a, "FDItemInformationBox", trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("FDItemInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err fecr_dump(GF_Box *a, FILE * trace)
+GF_Err fecr_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	char *box_name;
@@ -5268,311 +5285,442 @@
 	}
 	gf_isom_box_dump_start(a, box_name, trace);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<ptr->nb_entries; i++) {
-		fprintf(trace, "<%sEntry itemID=\"%d\" symbol_count=\"%d\"/>\n", box_name, ptr->entries[i].item_id, ptr->entries[i].symbol_count);
+		gf_fprintf(trace, "<%sEntry itemID=\"%d\" symbol_count=\"%d\"/>\n", box_name, ptr->entries[i].item_id, ptr->entries[i].symbol_count);
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<%sEntry itemID=\"\" symbol_count=\"\"/>\n", box_name);
+		gf_fprintf(trace, "<%sEntry itemID=\"\" symbol_count=\"\"/>\n", box_name);
 	}
 	gf_isom_box_dump_done(box_name, a, trace);
 	return GF_OK;
 }
 
-GF_Err gitn_dump(GF_Box *a, FILE * trace)
+GF_Err gitn_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GroupIdToNameBox *ptr = (GroupIdToNameBox *) a;
 	gf_isom_box_dump_start(a, "GroupIdToNameBox", trace);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<ptr->nb_entries; i++) {
-		fprintf(trace, "<GroupIdToNameBoxEntry groupID=\"%d\" name=\"%s\"/>\n", ptr->entries[i].group_id, ptr->entries[i].name);
+		gf_fprintf(trace, "<GroupIdToNameBoxEntry groupID=\"%d\" name=\"%s\"/>\n", ptr->entries[i].group_id, ptr->entries[i].name);
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<GroupIdToNameBoxEntryEntry groupID=\"\" name=\"\"/>\n");
+		gf_fprintf(trace, "<GroupIdToNameBoxEntryEntry groupID=\"\" name=\"\"/>\n");
 	}
 
 	gf_isom_box_dump_done("GroupIdToNameBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err paen_dump(GF_Box *a, FILE * trace)
+GF_Err paen_box_dump(GF_Box *a, FILE * trace)
 {
-	FDPartitionEntryBox *ptr = (FDPartitionEntryBox *) a;
 	gf_isom_box_dump_start(a, "FDPartitionEntryBox", trace);
-
-	fprintf(trace, ">\n");
-	if (ptr->blocks_and_symbols)
-		gf_isom_box_dump(ptr->blocks_and_symbols, trace);
-
-	if (ptr->FEC_symbol_locations)
-		gf_isom_box_dump(ptr->FEC_symbol_locations, trace);
-
-	if (ptr->FEC_symbol_locations)
-		gf_isom_box_dump(ptr->FEC_symbol_locations, trace);
-
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("FDPartitionEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err fpar_dump(GF_Box *a, FILE * trace)
+GF_Err fpar_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	FilePartitionBox *ptr = (FilePartitionBox *) a;
 	gf_isom_box_dump_start(a, "FilePartitionBox", trace);
 
-	fprintf(trace, "itemID=\"%d\" FEC_encoding_ID=\"%d\" FEC_instance_ID=\"%d\" max_source_block_length=\"%d\" encoding_symbol_length=\"%d\" max_number_of_encoding_symbols=\"%d\" ", ptr->itemID, ptr->FEC_encoding_ID, ptr->FEC_instance_ID, ptr->max_source_block_length, ptr->encoding_symbol_length, ptr->max_number_of_encoding_symbols);
+	gf_fprintf(trace, "itemID=\"%d\" FEC_encoding_ID=\"%d\" FEC_instance_ID=\"%d\" max_source_block_length=\"%d\" encoding_symbol_length=\"%d\" max_number_of_encoding_symbols=\"%d\" ", ptr->itemID, ptr->FEC_encoding_ID, ptr->FEC_instance_ID, ptr->max_source_block_length, ptr->encoding_symbol_length, ptr->max_number_of_encoding_symbols);
 
 	if (ptr->scheme_specific_info)
 		dump_data_attribute(trace, "scheme_specific_info", (char*)ptr->scheme_specific_info, (u32)strlen(ptr->scheme_specific_info) );
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<ptr->nb_entries; i++) {
-		fprintf(trace, "<FilePartitionBoxEntry block_count=\"%d\" block_size=\"%d\"/>\n", ptr->entries[i].block_count, ptr->entries[i].block_size);
+		gf_fprintf(trace, "<FilePartitionBoxEntry block_count=\"%d\" block_size=\"%d\"/>\n", ptr->entries[i].block_count, ptr->entries[i].block_size);
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<FilePartitionBoxEntry block_count=\"\" block_size=\"\"/>\n");
+		gf_fprintf(trace, "<FilePartitionBoxEntry block_count=\"\" block_size=\"\"/>\n");
 	}
 
 	gf_isom_box_dump_done("FilePartitionBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err segr_dump(GF_Box *a, FILE * trace)
+GF_Err segr_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, k;
 	FDSessionGroupBox *ptr = (FDSessionGroupBox *) a;
 	gf_isom_box_dump_start(a, "FDSessionGroupBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	for (i=0; i<ptr->num_session_groups; i++) {
-		fprintf(trace, "<FDSessionGroupBoxEntry groupIDs=\"");
+		gf_fprintf(trace, "<FDSessionGroupBoxEntry groupIDs=\"");
 		for (k=0; k<ptr->session_groups[i].nb_groups; k++) {
-			fprintf(trace, "%d ", ptr->session_groups[i].group_ids[k]);
+			gf_fprintf(trace, "%d ", ptr->session_groups[i].group_ids[k]);
 		}
-		fprintf(trace, "\" channels=\"");
+		gf_fprintf(trace, "\" channels=\"");
 		for (k=0; k<ptr->session_groups[i].nb_channels; k++) {
-			fprintf(trace, "%d ", ptr->session_groups[i].channels[k]);
+			gf_fprintf(trace, "%d ", ptr->session_groups[i].channels[k]);
 		}
-		fprintf(trace, "\"/>\n");
+		gf_fprintf(trace, "\"/>\n");
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<FDSessionGroupBoxEntry groupIDs=\"\" channels=\"\"/>\n");
+		gf_fprintf(trace, "<FDSessionGroupBoxEntry groupIDs=\"\" channels=\"\"/>\n");
 	}
 
 	gf_isom_box_dump_done("FDSessionGroupBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err srpp_dump(GF_Box *a, FILE * trace)
+GF_Err srpp_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_SRTPProcessBox *ptr = (GF_SRTPProcessBox *) a;
 	gf_isom_box_dump_start(a, "SRTPProcessBox", trace);
 
-	fprintf(trace, "encryption_algorithm_rtp=\"%d\" encryption_algorithm_rtcp=\"%d\" integrity_algorithm_rtp=\"%d\" integrity_algorithm_rtcp=\"%d\">\n", ptr->encryption_algorithm_rtp, ptr->encryption_algorithm_rtcp, ptr->integrity_algorithm_rtp, ptr->integrity_algorithm_rtcp);
-
-	if (ptr->info) gf_isom_box_dump(ptr->info, trace);
-	if (ptr->scheme_type) gf_isom_box_dump(ptr->scheme_type, trace);
-
+	gf_fprintf(trace, "encryption_algorithm_rtp=\"%d\" encryption_algorithm_rtcp=\"%d\" integrity_algorithm_rtp=\"%d\" integrity_algorithm_rtcp=\"%d\">\n", ptr->encryption_algorithm_rtp, ptr->encryption_algorithm_rtcp, ptr->integrity_algorithm_rtp, ptr->integrity_algorithm_rtcp);
 	gf_isom_box_dump_done("SRTPProcessBox", a, trace);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
-GF_Err fdpa_dump(GF_Box *a, FILE * trace)
+GF_Err fdpa_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_FDpacketBox *ptr = (GF_FDpacketBox *) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "FDpacketBox", trace);
-	fprintf(trace, "sender_current_time_present=\"%d\" expected_residual_time_present=\"%d\" session_close_bit=\"%d\" object_close_bit=\"%d\" transport_object_identifier=\"%d\">\n", ptr->info.sender_current_time_present, ptr->info.expected_residual_time_present, ptr->info.session_close_bit, ptr->info.object_close_bit, ptr->info.transport_object_identifier);
+	gf_fprintf(trace, "sender_current_time_present=\"%d\" expected_residual_time_present=\"%d\" session_close_bit=\"%d\" object_close_bit=\"%d\" transport_object_identifier=\"%d\">\n", ptr->info.sender_current_time_present, ptr->info.expected_residual_time_present, ptr->info.session_close_bit, ptr->info.object_close_bit, ptr->info.transport_object_identifier);
 
 	for (i=0; i<ptr->header_ext_count; i++) {
-		fprintf(trace, "<FDHeaderExt type=\"%d\"", ptr->headers[i].header_extension_type);
+		gf_fprintf(trace, "<FDHeaderExt type=\"%d\"", ptr->headers[i].header_extension_type);
 		if (ptr->headers[i].header_extension_type > 127) {
 			dump_data_attribute(trace, "content", (char *) ptr->headers[i].content, 3);
 		} else if (ptr->headers[i].data_length) {
 			dump_data_attribute(trace, "data", ptr->headers[i].data, ptr->headers[i].data_length);
 		}
-		fprintf(trace, "/>\n");
+		gf_fprintf(trace, "/>\n");
 	}
 	if (!ptr->size) {
-		fprintf(trace, "<FDHeaderExt type=\"\" content=\"\" data=\"\"/>\n");
+		gf_fprintf(trace, "<FDHeaderExt type=\"\" content=\"\" data=\"\"/>\n");
 	}
 	gf_isom_box_dump_done("FDpacketBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err extr_dump(GF_Box *a, FILE * trace)
+GF_Err extr_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ExtraDataBox *ptr = (GF_ExtraDataBox *) a;
 	if (!a) return GF_BAD_PARAM;
 	gf_isom_box_dump_start(a, "ExtraDataBox", trace);
 	dump_data_attribute(trace, "data", ptr->data, ptr->data_length);
-	fprintf(trace, ">\n");
-	if (ptr->feci) {
-		gf_isom_box_dump((GF_Box *)ptr->feci, trace);
-	}
+	gf_fprintf(trace, ">\n");
+	if (ptr->feci)
+		gf_isom_box_dump(ptr->feci, trace);
 	gf_isom_box_dump_done("ExtraDataBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err fdsa_dump(GF_Box *a, FILE * trace)
+GF_Err fdsa_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_Err e;
 	GF_HintSample *ptr = (GF_HintSample *) a;
 	if (!a) return GF_BAD_PARAM;
 
 	gf_isom_box_dump_start(a, "FDSampleBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	e = gf_isom_box_array_dump(ptr->packetTable, trace);
 	if (e) return e;
-	if (ptr->extra_data) {
-		e = gf_isom_box_dump((GF_Box *)ptr->extra_data, trace);
-		if (e) return e;
-	}
 	gf_isom_box_dump_done("FDSampleBox", a, trace);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_HINTING*/
 
-GF_Err trik_dump(GF_Box *a, FILE * trace)
+GF_Err trik_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_TrickPlayBox *p = (GF_TrickPlayBox *) a;
 
 	gf_isom_box_dump_start(a, "TrickPlayBox", trace);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	for (i=0; i<p->entry_count; i++) {
-		fprintf(trace, "<TrickPlayBoxEntry pic_type=\"%d\" dependency_level=\"%d\"/>\n", p->entries[i].pic_type, p->entries[i].dependency_level);
+		gf_fprintf(trace, "<TrickPlayBoxEntry pic_type=\"%d\" dependency_level=\"%d\"/>\n", p->entries[i].pic_type, p->entries[i].dependency_level);
 	}
 	if (!p->size)
-		fprintf(trace, "<TrickPlayBoxEntry pic_type=\"\" dependency_level=\"\"/>\n");
+		gf_fprintf(trace, "<TrickPlayBoxEntry pic_type=\"\" dependency_level=\"\"/>\n");
 
 	gf_isom_box_dump_done("TrickPlayBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err bloc_dump(GF_Box *a, FILE * trace)
+GF_Err bloc_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_BaseLocationBox *p = (GF_BaseLocationBox *) a;
 
 	gf_isom_box_dump_start(a, "BaseLocationBox", trace);
 
-	fprintf(trace, "baseLocation=\"%s\" basePurlLocation=\"%s\">\n", p->baseLocation, p->basePurlLocation);
+	gf_fprintf(trace, "baseLocation=\"%s\" basePurlLocation=\"%s\">\n", p->baseLocation, p->basePurlLocation);
 	gf_isom_box_dump_done("BaseLocationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err ainf_dump(GF_Box *a, FILE * trace)
+GF_Err ainf_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_AssetInformationBox *p = (GF_AssetInformationBox *) a;
 
 	gf_isom_box_dump_start(a, "AssetInformationBox", trace);
 
-	fprintf(trace, "profile_version=\"%d\" APID=\"%s\">\n", p->profile_version, p->APID);
+	gf_fprintf(trace, "profile_version=\"%d\" APID=\"%s\">\n", p->profile_version, p->APID);
 	gf_isom_box_dump_done("AssetInformationBox", a, trace);
 	return GF_OK;
 }
 
 
-GF_Err mhac_dump(GF_Box *a, FILE * trace)
+GF_Err mhac_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_MHAConfigBox *p = (GF_MHAConfigBox *) a;
 
 	gf_isom_box_dump_start(a, "MHAConfigurationBox", trace);
 
-	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=\"%d\" referenceChannelLayout=\"%d\">\n", p->configuration_version, p->mha_pl_indication, p->reference_channel_layout);
 	gf_isom_box_dump_done("MHAConfigurationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tmcd_dump(GF_Box *a, FILE * trace)
+GF_Err tmcd_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeCodeSampleEntryBox *p = (GF_TimeCodeSampleEntryBox *) a;
 
 	gf_isom_box_dump_start(a, "TimeCodeSampleEntryBox", trace);
 
-	fprintf(trace, "DataReferenceIndex=\"%d\" Flags=\"%08X\" TimeScale=\"%d\" FrameDuration=\"%d\" FramesPerSec=\"%d\">\n", p->dataReferenceIndex, p->flags, p->timescale, p->frame_duration, p->frames_per_sec);
+	gf_fprintf(trace, "DataReferenceIndex=\"%d\" Flags=\"%08X\" TimeScale=\"%d\" FrameDuration=\"%d\" FramesPerTick=\"%d\">\n", p->dataReferenceIndex, p->flags, p->timescale, p->frame_duration, p->frames_per_counter_tick);
 
 	gf_isom_box_dump_done("TimeCodeSampleEntryBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err tcmi_dump(GF_Box *a, FILE * trace)
+GF_Err tcmi_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_TimeCodeMediaInformationBox *p = (GF_TimeCodeMediaInformationBox *) a;
 
 	gf_isom_box_dump_start(a, "TimeCodeMediaInformationBox", trace);
-	fprintf(trace, "textFont=\"%d\" textFace=\"%d\" textSize=\"%d\" textColorRed=\"%d\" textColorGreen=\"%d\" textColorBlue=\"%d\" backColorRed=\"%d\" backColorGreen=\"%d\" backColorBlue=\"%d\"",
+	gf_fprintf(trace, "textFont=\"%d\" textFace=\"%d\" textSize=\"%d\" textColorRed=\"%d\" textColorGreen=\"%d\" textColorBlue=\"%d\" backColorRed=\"%d\" backColorGreen=\"%d\" backColorBlue=\"%d\"",
 			p->text_font, p->text_face, p->text_size, p->text_color_red, p->text_color_green, p->text_color_blue, p->back_color_red, p->back_color_green, p->back_color_blue);
 	if (p->font)
-		fprintf(trace, " font=\"%s\"", p->font);
+		gf_fprintf(trace, " font=\"%s\"", p->font);
 
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 
 	gf_isom_box_dump_done("TimeCodeMediaInformationBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err fiel_dump(GF_Box *a, FILE * trace)
+GF_Err fiel_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_FieldInfoBox *p = (GF_FieldInfoBox *) a;
 
 	gf_isom_box_dump_start(a, "FieldInfoBox", trace);
-	fprintf(trace, "count=\"%d\" order=\"%d\">\n", p->field_count, p->field_order);
+	gf_fprintf(trace, "count=\"%d\" order=\"%d\">\n", p->field_count, p->field_order);
 	gf_isom_box_dump_done("FieldInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err gama_dump(GF_Box *a, FILE * trace)
+GF_Err gama_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_GamaInfoBox *p = (GF_GamaInfoBox *) a;
 
 	gf_isom_box_dump_start(a, "GamaInfoBox", trace);
-	fprintf(trace, "gama=\"%d\">\n", p->gama);
+	gf_fprintf(trace, "gama=\"%d\">\n", p->gama);
 	gf_isom_box_dump_done("GamaInfoBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err chrm_dump(GF_Box *a, FILE * trace)
+GF_Err chrm_box_dump(GF_Box *a, FILE * trace)
 {
 	GF_ChromaInfoBox *p = (GF_ChromaInfoBox *) a;
 	if (a->type==GF_QT_BOX_TYPE_ENDA) {
 		gf_isom_box_dump_start(a, "AudioEndianBox", trace);
-		fprintf(trace, "littleEndian=\"%d\">\n", p->chroma);
+		gf_fprintf(trace, "littleEndian=\"%d\">\n", p->chroma);
 		gf_isom_box_dump_done("AudioEndianBox", a, trace);
 	} else {
 		gf_isom_box_dump_start(a, "ChromaInfoBox", trace);
-		fprintf(trace, "chroma=\"%d\">\n", p->chroma);
+		gf_fprintf(trace, "chroma=\"%d\">\n", p->chroma);
 		gf_isom_box_dump_done("ChromaInfoBox", a, trace);
 	}
 	return GF_OK;
 }
 
-GF_Err chan_dump(GF_Box *a, FILE * trace)
+GF_Err chan_box_dump(GF_Box *a, FILE * trace)
 {
 	u32 i;
 	GF_ChannelLayoutInfoBox *p = (GF_ChannelLayoutInfoBox *) a;
 
 	gf_isom_box_dump_start(a, "ChannelLayoutInfoBox", trace);
-	fprintf(trace, "layout=\"%d\" bitmap=\"%d\">\n", p->layout_tag, p->bitmap);
+	gf_fprintf(trace, "layout=\"%d\" bitmap=\"%d\">\n", p->layout_tag, p->bitmap);
 	for (i=0; i<p->num_audio_description; i++) {
 		GF_AudioChannelDescription *adesc = &p->audio_descs[i];
-		fprintf(trace, "<AudioChannelDescription label=\"%d\" flags=\"%08X\" coordinates=\"%f %f %f\"/>\n", adesc->label, adesc->flags, adesc->coordinates[0], adesc->coordinates[1], adesc->coordinates[2]);
+		gf_fprintf(trace, "<AudioChannelDescription label=\"%d\" flags=\"%08X\" coordinates=\"%f %f %f\"/>\n", adesc->label, adesc->flags, adesc->coordinates[0], adesc->coordinates[1], adesc->coordinates[2]);
 	}
 	gf_isom_box_dump_done("ChannelLayoutInfoBox", a, trace);
 	return GF_OK;
 }
 
+
+GF_Err jp2h_box_dump(GF_Box *a, FILE * trace)
+{
+	gf_isom_box_dump_start(a, "JP2HeaderBox", trace);
+	gf_fprintf(trace, ">\n");
+	gf_isom_box_dump_done("JP2HeaderBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err ihdr_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_J2KImageHeaderBox  *p = (GF_J2KImageHeaderBox *) a;
+	gf_isom_box_dump_start(a, "ImageHeaderBox", trace);
+	gf_fprintf(trace, "width=\"%d\" height=\"%d\" nb_comp=\"%d\" BPC=\"%d\" Compression=\"%d\" UnkC=\"%d\" IPR=\"%d\">\n", p->width, p->height, p->nb_comp, p->bpc, p->Comp, p->UnkC, p->IPR);
+	gf_isom_box_dump_done("ImageHeaderBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err dfla_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_FLACConfigBox *ptr = (GF_FLACConfigBox *)a;
+	gf_isom_box_dump_start(a, "FLACSpecificBox", trace);
+	gf_fprintf(trace, " dataSize=\"%d\">\n", ptr->dataSize);
+	gf_isom_box_dump_done("FLACSpecificBox", a, trace);
+	return GF_OK;
+}
+
+
+GF_Err mvcg_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i;
+	GF_MultiviewGroupBox *ptr = (GF_MultiviewGroupBox *)a;
+	gf_isom_box_dump_start(a, "MultiviewGroupBox", trace);
+	gf_fprintf(trace, " multiview_group_id=\"%d\">\n", ptr->multiview_group_id);
+	for (i=0; i<ptr->num_entries; i++) {
+		gf_fprintf(trace, "<MVCIEntry type=\"%d\"", ptr->entries[i].entry_type);
+		switch (ptr->entries[i].entry_type) {
+		case 0:
+			gf_fprintf(trace, " trackID=\"%d\"", ptr->entries[i].trackID);
+			break;
+		case 1:
+			gf_fprintf(trace, " trackID=\"%d\" tierID=\"%d\"", ptr->entries[i].trackID, ptr->entries[i].tierID);
+			break;
+		case 2:
+			gf_fprintf(trace, " output_view_id=\"%d\"", ptr->entries[i].output_view_id);
+			break;
+		case 3:
+			gf_fprintf(trace, " start_view_id=\"%d\" view_count=\"%d\"", ptr->entries[i].start_view_id, ptr->entries[i].view_count);
+			break;
+		}
+		gf_fprintf(trace, "/>\n");
+	}
+	gf_isom_box_dump_done("MultiviewGroupBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err vwid_box_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, j;
+	GF_ViewIdentifierBox *ptr = (GF_ViewIdentifierBox *) a;
+	gf_isom_box_dump_start(a, "ViewIdentifierBox", trace);
+	gf_fprintf(trace, " min_temporal_id=\"%d\" max_temporal_id=\"%d\">\n", ptr->min_temporal_id, ptr->max_temporal_id);
+	for (i=0; i<ptr->num_views; i++) {
+		gf_fprintf(trace, "<ViewInfo viewid=\"%d\" viewOrderindex=\"%d\" texInStream=\"%d\" texInTrack=\"%d\" depthInStream=\"%d\" depthInTrack=\"%d\" baseViewId=\"%d\">\n",
+			ptr->views[i].view_id,
+			ptr->views[i].view_order_index,
+			ptr->views[i].texture_in_stream,
+			ptr->views[i].texture_in_track,
+			ptr->views[i].depth_in_stream,
+			ptr->views[i].depth_in_track,
+			ptr->views[i].base_view_type
+		);
+		for (j=0; j<ptr->views[i].num_ref_views; j++) {
+			gf_fprintf(trace, "<RefViewInfo dependentComponentIDC=\"%d\" referenceViewID=\"%d\"/>\n", ptr->views[i].view_refs[j].dep_comp_idc, ptr->views[i].view_refs[j].ref_view_id);
+		}
+		gf_fprintf(trace, "</ViewInfo>\n");
+	}
+	gf_isom_box_dump_done("ViewIdentifierBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err pcmC_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_PCMConfigBox *p = (GF_PCMConfigBox *) a;
+
+	gf_isom_box_dump_start(a, "PCMConfigurationBox", trace);
+	gf_fprintf(trace, " format_flags=\"%d\" PCM_sample_size=\"%d\">\n", p->format_flags, p->PCM_sample_size);
+	gf_isom_box_dump_done("PCMConfigurationBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err chnl_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_ChannelLayoutBox *p = (GF_ChannelLayoutBox *) a;
+	gf_isom_box_dump_start(a, "ChannelLayoutBox", trace);
+	gf_fprintf(trace, " stream_structure=\"%d\"", p->layout.stream_structure);
+	if (p->layout.stream_structure & 2)
+		gf_fprintf(trace, " object_count=\"%d\"", p->layout.object_count);
+
+	if (p->layout.stream_structure & 1) {
+		gf_fprintf(trace, " definedLayout=\"%d\"", p->layout.definedLayout);
+		if (p->layout.definedLayout!=0) {
+			gf_fprintf(trace, " omittedChannelsMap=\""LLU"\"", p->layout.omittedChannelsMap);
+		}
+	}
+
+	gf_fprintf(trace, ">\n");
+	if ((p->layout.stream_structure & 1) && (p->layout.definedLayout==0)) {
+		u32 i;
+		for (i=0; i<p->layout.channels_count; i++) {
+			gf_fprintf(trace, "<Speaker position=\"%d\"", p->layout.layouts[i].position);
+			if (p->layout.layouts[i].position==126) {
+				gf_fprintf(trace, " azimuth=\"%d\" elevation=\"%d\"", p->layout.layouts[i].azimuth, p->layout.layouts[i].elevation);
+			}
+			gf_fprintf(trace, "/>\n");
+		}
+	}
+
+	gf_isom_box_dump_done("ChannelLayoutBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err load_box_dump(GF_Box *a, FILE * trace)
+{
+	GF_TrackLoadBox *p = (GF_TrackLoadBox *) a;
+
+	gf_isom_box_dump_start(a, "TrackLoadBox", trace);
+	fprintf(trace, "preload_start_time=\"%d\" preload_duration=\"%d\" preload_flags=\"%d\" default_hints=\"%d\">\n", p->preload_start_time, p->preload_duration, p->preload_flags, p->default_hints);
+	gf_isom_box_dump_done("TrackLoadBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err emsg_box_dump(GF_Box *a, FILE * trace)
+{
+	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);
+
+	if (p->scheme_id_uri)
+		fprintf(trace, " scheme_id_uri=\"%s\"", p->scheme_id_uri);
+	if (p->value)
+		fprintf(trace, " value=\"%s\"", p->value);
+
+	if (p->message_data)
+		dump_data_attribute(trace, " message_data", p->message_data, p->message_data_size);
+
+	gf_isom_box_dump_done("EventMessageBox", a, trace);
+	return GF_OK;
+}
+
 
 #endif /*GPAC_DISABLE_ISOM_DUMP*/

gpac-0.8.0.tar.gz/src/isomedia/box_funcs.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -27,14 +27,10 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-//only used in dump mode
-static Bool skip_box_dump_del = GF_FALSE;
-Bool use_dump_mode = GF_FALSE;
-
 //Add this funct to handle incomplete files...
 //bytesExpected is 0 most of the time. If the file is incomplete, bytesExpected
 //is the number of bytes missing to parse the box...
-GF_Err gf_isom_parse_root_box(GF_Box **outBox, GF_BitStream *bs, u64 *bytesExpected, Bool progressive_mode)
+GF_Err gf_isom_parse_root_box(GF_Box **outBox, GF_BitStream *bs, u32 *box_type, u64 *bytesExpected, Bool progressive_mode)
 {
 	GF_Err ret;
 	u64 start;
@@ -44,6 +40,7 @@
 		if (!*outBox) {
 			// We could not even read the box size, we at least need 8 bytes
 			*bytesExpected = 8;
+			if (box_type) *box_type = 0;
 			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box - start "LLU"\n", start));
 		}
 		else {
@@ -52,6 +49,8 @@
 				type = ((GF_UnknownBox *) (*outBox))->original_4cc;
 
 			*bytesExpected = (*outBox)->size;
+			if (box_type) *box_type = (*outBox)->type;
+
 			GF_LOG(progressive_mode ? GF_LOG_DEBUG : GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete box %s - start "LLU" size "LLU"\n", gf_4cc_to_str(type), start, (*outBox)->size));
 			gf_isom_box_del(*outBox);
 			*outBox = NULL;
@@ -61,7 +60,7 @@
 	return ret;
 }
 
-u32 gf_isom_solve_uuid_box(char *UUID)
+u32 gf_isom_solve_uuid_box(u8 *UUID)
 {
 	u32 i;
 	char strUUID[33], strChar[3];
@@ -91,20 +90,24 @@
 
 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;
-	u64 size, start, payload_start, end;
+	u32 type, uuid_type, hdr_size, restore_type;
+	u64 size, start, comp_start, payload_start, end;
 	char uuid[16];
 	GF_Err e;
+	GF_BitStream *uncomp_bs = NULL;
+	u8 *uncomp_data = NULL;
+	u32 compressed_size=0;
 	GF_Box *newBox;
-	Bool skip_logs = gf_bs_get_cookie(bs) ? GF_TRUE : GF_FALSE;
-
+	Bool skip_logs = (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_NO_LOGS ) ? GF_TRUE : GF_FALSE;
+	Bool is_special = GF_TRUE;
+	
 	if ((bs == NULL) || (outBox == NULL) ) return GF_BAD_PARAM;
 	*outBox = NULL;
 	if (gf_bs_available(bs) < 8) {
 		return GF_ISOM_INCOMPLETE_FILE;
 	}
 
-	start = gf_bs_get_position(bs);
+	comp_start = start = gf_bs_get_position(bs);
 
 	uuid_type = 0;
 	size = (u64) gf_bs_read_u32(bs);
@@ -130,7 +133,42 @@
 					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));
 				}
 				return GF_OK;
-//				return GF_ISOM_INVALID_FILE;
+			}
+		}
+		if (is_root_box && (size>=8)) {
+			Bool do_uncompress = GF_FALSE;
+			u8 *compb = NULL;
+			u32 osize = 0;
+			if (type==GF_4CC('!', 'm', 'o', 'f')) {
+				do_uncompress = GF_TRUE;
+				type = GF_ISOM_BOX_TYPE_MOOF;
+			}
+			else if (type==GF_4CC('!', 'm', 'o', 'v')) {
+				do_uncompress = GF_TRUE;
+				type = GF_ISOM_BOX_TYPE_MOOV;
+			}
+			else if (type==GF_4CC('!', 's', 'i', 'x')) {
+				do_uncompress = GF_TRUE;
+				type = GF_ISOM_BOX_TYPE_SIDX;
+			}
+			else if (type==GF_4CC('!', 's', 's', 'x')) {
+				do_uncompress = GF_TRUE;
+				type = GF_ISOM_BOX_TYPE_SSIX;
+			}
+
+			if (do_uncompress) {
+				compb = gf_malloc((u32) (size-8));
+
+				compressed_size = (u32) (size - 8);
+				gf_bs_read_data(bs, compb, compressed_size);
+				gf_gz_decompress_payload(compb, compressed_size, &uncomp_data, &osize);
+
+				//keep size as complete box size for tests below
+				size = osize + 8;
+				uncomp_bs = gf_bs_new(uncomp_data, osize, GF_BITSTREAM_READ);
+				bs = uncomp_bs;
+				start = 0;
+				gf_free(compb);
 			}
 		}
 	}
@@ -153,12 +191,22 @@
 		size = gf_bs_read_u64(bs);
 		hdr_size += 8;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Read Box type %s size "LLD" start "LLD"\n", gf_4cc_to_str(type), LLD_CAST size, LLD_CAST start));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Read Box type %s size "LLD" start "LLD"\n", gf_4cc_to_str(type), size,  start));
 
 	if ( size < hdr_size ) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box size "LLD" less than box header size %d\n", LLD_CAST size, hdr_size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box size "LLD" less than box header size %d\n", size, hdr_size));
 		return GF_ISOM_INVALID_FILE;
 	}
+	restore_type = 0;
+	if ((parent_type==GF_ISOM_BOX_TYPE_STSD) && (type==GF_QT_SUBTYPE_RAW) ) {
+		u64 cookie = gf_bs_get_cookie(bs);
+		restore_type = type;
+		if (cookie & GF_ISOM_BS_COOKIE_VISUAL_TRACK)
+			type = GF_QT_SUBTYPE_RAW_VID;
+		else
+			type = GF_QT_SUBTYPE_RAW_AUD;
+
+	}
 
 	//some special boxes (references and track groups) are handled by a single generic box with an associated ref/group type
 	if (parent_type && (parent_type == GF_ISOM_BOX_TYPE_TREF)) {
@@ -179,17 +227,21 @@
 		((GF_EntityToGroupTypeBox*)newBox)->grouping_type = type;
 	} else {
 		//OK, create the box based on the type
+		is_special = GF_FALSE;
 		newBox = gf_isom_box_new_ex(uuid_type ? uuid_type : type, parent_type, skip_logs, is_root_box);
 		if (!newBox) return GF_OUT_OF_MEM;
 	}
 
 	//OK, init and read this box
-	if (type==GF_ISOM_BOX_TYPE_UUID) {
+	if (type==GF_ISOM_BOX_TYPE_UUID && !is_special) {
 		memcpy(((GF_UUIDBox *)newBox)->uuid, uuid, 16);
 		((GF_UUIDBox *)newBox)->internal_4cc = uuid_type;
 	}
 
 	if (!newBox->type) newBox->type = type;
+	if (restore_type)
+		newBox->type = restore_type;
+
 	payload_start = gf_bs_get_position(bs);
 
 retry_unknown_box:
@@ -203,24 +255,48 @@
 
 	newBox->size = size - hdr_size;
 
-	if (newBox->size) {
-		e = gf_isom_full_box_read(newBox, bs);
-		if (!e) e = gf_isom_box_read(newBox, bs);
-		newBox->size = size;
-		end = gf_bs_get_position(bs);
-	} else {
-		newBox->size = size;
-		//empty box
-		e = GF_OK;
-		end = gf_bs_get_position(bs);
+	e = gf_isom_full_box_read(newBox, bs);
+	if (!e) e = gf_isom_box_read(newBox, bs);
+	newBox->size = size;
+	end = gf_bs_get_position(bs);
+
+	if (uncomp_bs) {
+		gf_free(uncomp_data);
+		gf_bs_del(uncomp_bs);
+		if (e) {
+			gf_isom_box_del(newBox);
+			*outBox = NULL;
+			return e;
+		}
+		//move size to real bitstream offsets for tests below
+		size -= 8;
+		//remember compressed vs real size info for moof in order to properly recompute data_offset/base_data_offset
+		if (type==GF_ISOM_BOX_TYPE_MOOF) {
+			((GF_MovieFragmentBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
+		}
+		//remember compressed vs real size info for moov in order to properly recompute chunk offset
+		else if (type==GF_ISOM_BOX_TYPE_MOOV) {
+			((GF_MovieBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
+			((GF_MovieBox *)newBox)->file_offset = comp_start;
+		}
+		//remember compressed vs real size info for dump
+		else if (type==GF_ISOM_BOX_TYPE_SIDX) {
+			((GF_SegmentIndexBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
+		}
+		//remember compressed vs real size info for dump
+		else if (type==GF_ISOM_BOX_TYPE_SSIX) {
+			((GF_SubsegmentIndexBox *)newBox)->compressed_diff = (s32)size - (s32)compressed_size;
+		}
 	}
 
+
 	if (e && (e != GF_ISOM_INCOMPLETE_FILE)) {
 		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);
@@ -235,7 +311,7 @@
 
 	if (end-start > size) {
 		if (!skip_logs) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" size "LLU" (start "LLU") invalid (read "LLU")\n", gf_4cc_to_str(type), LLU_CAST size, start, LLU_CAST (end-start) ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" size "LLU" (start "LLU") invalid (read "LLU")\n", gf_4cc_to_str(type), size, start, (end-start) ));
 		}
 		/*let's still try to load the file since no error was notified*/
 		gf_bs_seek(bs, start+size);
@@ -259,23 +335,40 @@
 	return gf_isom_box_parse_ex(outBox, bs, 0, GF_FALSE);
 }
 
-void gf_isom_box_array_del(GF_List *other_boxes)
+void gf_isom_box_array_del(GF_List *boxlist)
 {
 	u32 count, i;
-	GF_Box *a;
-	if (!other_boxes) return;
-	count = gf_list_count(other_boxes);
+	if (!boxlist) return;
+	count = gf_list_count(boxlist);
 	for (i = 0; i < count; i++) {
-		a = (GF_Box *)gf_list_get(other_boxes, i);
+		GF_Box *a = (GF_Box *)gf_list_get(boxlist, i);
 		if (a) gf_isom_box_del(a);
 	}
-	gf_list_del(other_boxes);
+	gf_list_del(boxlist);
+}
+
+void gf_isom_box_array_reset_parent(GF_List **child_boxes, GF_List *boxlist)
+{
+	u32 count, i;
+	if (!boxlist) return;
+	count = gf_list_count(boxlist);
+	for (i = 0; i < count; i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(boxlist, i);
+		if (a) gf_isom_box_del_parent(child_boxes, a);
+	}
+	gf_list_reset(boxlist);
+}
+void gf_isom_box_array_del_parent(GF_List **child_boxes, GF_List *boxlist)
+{
+	if (!boxlist) return;
+	gf_isom_box_array_reset_parent(child_boxes, boxlist);
+	gf_list_del(boxlist);
 }
 
 
-GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b))
+GF_Err gf_isom_box_array_read(GF_Box *parent, GF_BitStream *bs, GF_Err (*check_child_box)(GF_Box *par, GF_Box *b))
 {
-	return gf_isom_box_array_read_ex(parent, bs, add_box, parent->type);
+	return gf_isom_box_array_read_ex(parent, bs, check_child_box, parent->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -296,10 +389,11 @@
 	gf_bs_write_u32(bs, ptr->type);
 	if (ptr->type == GF_ISOM_BOX_TYPE_UUID) {
 		u32 i;
-		char uuid[16];
+		Bool conv_uuid = GF_TRUE;
+		GF_UUIDBox *uuidb = (GF_UUIDBox *)ptr;
 		char strUUID[32];
 
-		switch (((GF_UUIDBox*)ptr)->internal_4cc) {
+		switch (uuidb->internal_4cc) {
 		case GF_ISOM_BOX_UUID_TENC:
 			memcpy(strUUID, "8974dbce7be74c5184f97148f9882554", 32);
 			break;
@@ -316,24 +410,28 @@
 			memcpy(strUUID, "6D1D9B0542D544E680E2141DAFF757B2", 32);
 			break;
 		default:
-			memset(strUUID, 0, 32);
+			conv_uuid = GF_FALSE;
 			break;
 		}
 
-		for (i = 0; i < 16; i++) {
-			char t[3];
-			t[2] = 0;
-			t[0] = strUUID[2*i];
-			t[1] = strUUID[2*i+1];
-			uuid[i] = (u8) strtol(t, NULL, 16);
+		if (conv_uuid) {
+			char uuid[16];
+			for (i = 0; i < 16; i++) {
+				char t[3];
+				t[2] = 0;
+				t[0] = strUUID[2*i];
+				t[1] = strUUID[2*i+1];
+				uuid[i] = (u8) strtol(t, NULL, 16);
+			}
+			gf_bs_write_data(bs, uuid, 16);
+		} else {
+			gf_bs_write_data(bs, uuidb->uuid, 16);
 		}
-
-		gf_bs_write_data(bs, uuid, 16);
 	}
 	if (ptr->size > 0xFFFFFFFF)
 		gf_bs_write_u64(bs, ptr->size);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Written Box type %s size "LLD" start "LLD"\n", gf_4cc_to_str(ptr->type), LLD_CAST ptr->size, LLD_CAST start));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Written Box type %s size "LLD" start "LLD"\n", gf_4cc_to_str(ptr->type), ptr->size, start));
 
 	return GF_OK;
 }
@@ -353,12 +451,11 @@
 GF_Err gf_isom_box_array_write(GF_Box *parent, GF_List *list, GF_BitStream *bs)
 {
 	u32 count, i;
-	GF_Box *a;
 	GF_Err e;
-	if (!list) return GF_BAD_PARAM;
+	if (!list) return GF_OK;
 	count = gf_list_count(list);
 	for (i = 0; i < count; i++) {
-		a = (GF_Box *)gf_list_get(list, i);
+		GF_Box *a = (GF_Box *)gf_list_get(list, i);
 		if (a) {
 			e = gf_isom_box_write(a, bs);
 			if (e) {
@@ -375,12 +472,11 @@
 {
 	GF_Err e;
 	u32 count, i;
-	GF_Box *a;
-	if (! list) return GF_BAD_PARAM;
+	if (! list) return GF_OK;
 
 	count = gf_list_count(list);
 	for (i = 0; i < count; i++) {
-		a = (GF_Box *)gf_list_get(list, i);
+		GF_Box *a = (GF_Box *)gf_list_get(list, i);
 		if (a) {
 			e = gf_isom_box_size(a);
 			if (e) {
@@ -397,23 +493,23 @@
 
 
 
-GF_Box * unkn_New();
-void unkn_del(GF_Box *);
-GF_Err unkn_Read(GF_Box *s, GF_BitStream *bs);
-GF_Err unkn_Write(GF_Box *s, GF_BitStream *bs);
-GF_Err unkn_Size(GF_Box *s);
-GF_Err unkn_dump(GF_Box *a, FILE * trace);
+GF_Box * unkn_box_new();
+void unkn_box_del(GF_Box *);
+GF_Err unkn_box_read(GF_Box *s, GF_BitStream *bs);
+GF_Err unkn_box_write(GF_Box *s, GF_BitStream *bs);
+GF_Err unkn_box_size(GF_Box *s);
+GF_Err unkn_box_dump(GF_Box *a, FILE * trace);
 
 //definition of boxes new/del/read/write/size. For now still exported since some files other than box_funcs.c call them
 //this should be fixed by only using gf_isom_box_new
 
 #define ISOM_BOX_IMPL_DECL(a_name) \
-		GF_Box * a_name##_New(); \
-		void a_name##_del(GF_Box *); \
-		GF_Err a_name##_Read(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_Write(GF_Box *s, GF_BitStream *bs); \
-		GF_Err a_name##_Size(GF_Box *s);\
-		GF_Err a_name##_dump(GF_Box *a, FILE * trace);
+		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);
 
 ISOM_BOX_IMPL_DECL(reftype)
 ISOM_BOX_IMPL_DECL(ireftype)
@@ -469,7 +565,8 @@
 ISOM_BOX_IMPL_DECL(gnrv)
 ISOM_BOX_IMPL_DECL(gnra)
 ISOM_BOX_IMPL_DECL(pdin)
-ISOM_BOX_IMPL_DECL(def_cont_box)
+ISOM_BOX_IMPL_DECL(def_parent)
+ISOM_BOX_IMPL_DECL(def_parent_full)
 
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
@@ -622,6 +719,8 @@
 ISOM_BOX_IMPL_DECL(dec3)
 ISOM_BOX_IMPL_DECL(lsrc)
 ISOM_BOX_IMPL_DECL(lsr1)
+ISOM_BOX_IMPL_DECL(mvcg)
+ISOM_BOX_IMPL_DECL(vwid)
 
 ISOM_BOX_IMPL_DECL(subs)
 
@@ -639,6 +738,7 @@
 ISOM_BOX_IMPL_DECL(leva)
 ISOM_BOX_IMPL_DECL(pcrb)
 ISOM_BOX_IMPL_DECL(tfdt)
+ISOM_BOX_IMPL_DECL(emsg)
 
 #endif
 
@@ -727,31 +827,37 @@
 
 ISOM_BOX_IMPL_DECL(grptype)
 
+ISOM_BOX_IMPL_DECL(jp2h)
+ISOM_BOX_IMPL_DECL(ihdr)
+ISOM_BOX_IMPL_DECL(load)
 
 /* Dolby Vision */
 ISOM_BOX_IMPL_DECL(dvcC)
 ISOM_BOX_IMPL_DECL(dvhe)
+ISOM_BOX_IMPL_DECL(dfla)
 
+ISOM_BOX_IMPL_DECL(pcmC)
+ISOM_BOX_IMPL_DECL(chnl)
 
 
 
-#define BOX_DEFINE(__type, b_rad, __par) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, "p12", GF_FALSE}
+#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_S(__type, b_rad, __par, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 0, 0, __par, __spec, GF_FALSE }
+#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 FBOX_DEFINE(__type, b_rad, __par, __max_v) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __par, "p12", GF_FALSE }
+#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_FLAGS(__type, b_rad, __par, __max_v, flags) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, "p12", GF_FALSE }
+#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##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, flags, __par, __spec, 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##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, 0, 1+__max_v, 0, __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 TREF_DEFINE(__type, b_rad, __par, __4cc, __spec) { __type, b_rad##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 0, 0, __par, __spec, GF_FALSE }
+#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##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1+max_version, 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##_New, b_rad##_del, b_rad##_Read, b_rad##_Write, b_rad##_Size, b_rad##_dump, __4cc, 1, 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 }
 
 static struct box_registry_entry {
 	u32 box_4cc;
@@ -933,7 +1039,7 @@
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TSEL, tsel, "udta", 0),
 	BOX_DEFINE( 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_cont_box, "strk"),
+	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"),
@@ -946,6 +1052,9 @@
 	BOX_DEFINE( 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"),
@@ -1023,12 +1132,16 @@
 	BOX_DEFINE( 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
+	FBOX_DEFINE_FLAGS(GF_ISOM_BOX_TYPE_CTRN, trun, "traf", 0, 0),
+#endif
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_TFDT, tfdt, "traf", 1),
 	BOX_DEFINE( GF_ISOM_BOX_TYPE_STYP, ftyp, "file"),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_PRFT, prft, "file", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SIDX, sidx, "file", 1),
 	FBOX_DEFINE( GF_ISOM_BOX_TYPE_SSIX, ssix, "file", 0),
-	BOX_DEFINE( GF_ISOM_BOX_TYPE_PCRB, pcrb, "file"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_PCRB, pcrb, "file", "dash"),
+	FBOX_DEFINE_S( GF_ISOM_BOX_TYPE_EMSG, emsg, "file", 1, "dash"),
 #endif
 
 
@@ -1037,14 +1150,14 @@
 	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( GF_ISOM_BOX_TYPE_M4DS, m4ds, "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_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", "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_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"),
@@ -1059,13 +1172,20 @@
 	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_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( GF_ISOM_BOX_TYPE_MHAC, mhac, "mha1 mha2 mhm1 mhm2", "mpegh3Daudio"),
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_MHAC, mhac, "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"),
+	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"),
@@ -1079,9 +1199,11 @@
 	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(GF_ISOM_BOX_TYPE_DOPS, dOps, "Opus", "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( GF_ISOM_BOX_TYPE_LSRC, lsrc, "lsr1", "p20"),
@@ -1110,6 +1232,8 @@
 	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"),
+	//defined as a secondary box for now to avoid conflicts with master hashes
+	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_COLR, colr, "jp2h", "iff"),
 	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"),
@@ -1136,15 +1260,15 @@
 	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( GF_ISOM_BOX_TYPE_DAMR, gppc, "samr sawb", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DEVC, gppc, "sevc", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DQCP, gppc, "sqcp", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_DSMV, gppc, "ssmv", "3gpp"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_D263, gppc, "s263", "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( GF_ISOM_BOX_TYPE_TEXT, text, "stsd", "apple"),
-	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_FTAB, ftab, "tx3g text", "3gpp"),
+	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"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HLIT, hlit, "text_sample", "3gpp"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_HCLR, hclr, "text_sample", "3gpp"),
@@ -1156,7 +1280,7 @@
 	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( GF_ISOM_BOX_TYPE_DIMC, dimC, "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"),
 
 
@@ -1209,19 +1333,20 @@
 	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"),
 	BOX_DEFINE_S( GF_ISOM_BOX_TYPE_iTunesSpecificInfo, ilst_item, "ilst data", "apple"),
-	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_GMHD, def_cont_box, "minf", "apple"),
-	BOX_DEFINE_S(GF_QT_BOX_TYPE_TAPT, def_cont_box, "trak", "apple"),
+	BOX_DEFINE_S(GF_ISOM_BOX_TYPE_GMHD, def_parent, "minf", "apple"),
+	BOX_DEFINE_S(GF_QT_BOX_TYPE_LOAD, load, "trak", "apple"),
+	BOX_DEFINE_S(GF_QT_BOX_TYPE_TAPT, def_parent, "trak", "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_GMIN, gmin, "gmhd", 0, "apple"),
 	FBOX_DEFINE_FLAGS_S( GF_QT_BOX_TYPE_ALIS, alis, "dref", 0, 1, "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_CLEF, clef, "tapt", 0, "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_PROF, clef, "tapt", 0, "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_ENOF, clef, "tapt", 0, "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_WAVE, def_cont_box, "audio_sample_entry", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_WAVE, def_parent, "audio_sample_entry", "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_CHAN, chan, "audio_sample_entry", 0, "apple"),
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_FRMA, frma, "wave", "apple"),
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_TERMINATOR, unkn, "wave", "apple"),
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_ENDA, chrm, "wave", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, def_cont_box, "gmhd", "apple"),
+	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, def_parent, "gmhd", "apple"),
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_NAME, unkn, "tmcd", "apple"),
 	FBOX_DEFINE_S( GF_QT_BOX_TYPE_TCMI, tcmi, "tmcd", 0, "apple"),
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_FIEL, fiel, "video_sample_entry", "apple"),
@@ -1231,36 +1356,36 @@
 
 	//QT and prores sample entry types
 	BOX_DEFINE_S( GF_QT_BOX_TYPE_TMCD, tmcd, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_C608, gen_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCH, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCO, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCS, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCF, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_APCN, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AP4X, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AP4H, video_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_RAW, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_TWOS, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_SOWT, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_FL32, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_FL64, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IN24, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IN32, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ULAW, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ALAW, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_ADPCM, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_DVCA, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QDMC, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QDMC2, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_QCELP, audio_sample_entry, "stsd", "apple"),
-	BOX_DEFINE_S( GF_QT_BOX_TYPE_AUDIO_kMP3, audio_sample_entry, "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"),
 
 	//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", "dolby"),
-	{GF_ISOM_BOX_TYPE_DEC3, dec3_New, dac3_del, dac3_Read, dac3_Write, dac3_Size, dac3_dump, 0, 0, 0, "ec-3", "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"),
 
@@ -1294,10 +1419,22 @@
 	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(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(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"),
+	FBOX_DEFINE_S(GF_ISOM_BOX_TYPE_DFLA, dfla, "fLaC enca", 0, "Flac"),
+
 };
 
 Bool gf_box_valid_in_parent(GF_Box *a, const char *parent_4cc)
@@ -1336,6 +1473,8 @@
 
 			if (strstr(box_registry[i].parents_4cc, "sample_entry") != NULL) {
 				u32 j = get_box_reg_idx(parent_type, 0);
+				if (parent_type==GF_QT_SUBTYPE_RAW)
+					return i;
 				if (box_registry[j].parents_4cc && (strstr(box_registry[j].parents_4cc, "stsd") != NULL))
 					return i;
 			}
@@ -1349,19 +1488,20 @@
 	GF_Box *a;
 	s32 idx = get_box_reg_idx(boxType, parentType);
 	if (idx==0) {
-#ifndef GPAC_DISABLE_LOGS
-		if (!skip_logs && (boxType != GF_ISOM_BOX_TYPE_UNKNOWN)) {
+#ifndef GPAC_DISABLE_LOG
+		if (!skip_logs && (boxType != GF_ISOM_BOX_TYPE_UNKNOWN) && (boxType != GF_ISOM_BOX_TYPE_UUID)) {
 			switch (parentType) {
 			case GF_ISOM_BOX_TYPE_ILST:
 			case GF_ISOM_BOX_TYPE_META:
 			case GF_ISOM_BOX_TYPE_UDTA:
 			case GF_ISOM_BOX_TYPE_UNKNOWN:
+			case GF_ISOM_BOX_TYPE_iTunesSpecificInfo:
 				break;
 			default:
 				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) {
-					char szName[10];
+					char szName[GF_4CC_MSIZE];
 					strcpy(szName, gf_4cc_to_str(parentType));
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] Unknown box type %s in parent %s\n", gf_4cc_to_str(boxType), szName));
 				} else {
@@ -1372,12 +1512,14 @@
 		}
 #endif
         if (boxType==GF_ISOM_BOX_TYPE_UUID) {
-            a = uuid_New();
+            a = uuid_box_new();
             if (a) a->registry = &box_registry[1];
         } else {
-            a = unkn_New();
-            ((GF_UnknownBox *)a)->original_4cc = boxType;
-            if (a) a->registry = &box_registry[0];
+            a = unkn_box_new();
+            if (a) {
+            	((GF_UnknownBox *)a)->original_4cc = boxType;
+            	a->registry = &box_registry[0];
+			}
         }
 		return a;
 	}
@@ -1392,6 +1534,11 @@
 			}
 		}
 		a->registry = &box_registry[idx];
+
+		if ((a->type==GF_ISOM_BOX_TYPE_COLR) && (parentType==GF_ISOM_BOX_TYPE_JP2H)) {
+			((GF_ColourInformationBox *)a)->is_jp2 = GF_TRUE;
+		}
+
 	}
 	return a;
 }
@@ -1402,17 +1549,11 @@
 	return gf_isom_box_new_ex(boxType, 0, 0, GF_FALSE);
 }
 
-void gf_isom_box_add_for_dump_mode(GF_Box *parent, GF_Box *a)
-{
-	if (use_dump_mode && a && (!parent->other_boxes || (gf_list_find(parent->other_boxes, a)<0) ) )
-		gf_isom_box_add_default(parent, a);
-}
-
-GF_Err gf_isom_box_array_read_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type)
+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 e;
 	GF_Box *a = NULL;
-	Bool skip_logs = gf_bs_get_cookie(bs) ? GF_TRUE : GF_FALSE;
+	Bool skip_logs = (gf_bs_get_cookie(bs) & GF_ISOM_BS_COOKIE_NO_LOGS ) ? GF_TRUE : GF_FALSE;
 
 	//we may have terminators in some QT files (4 bytes set to 0 ...)
 	while (parent->size>=8) {
@@ -1462,58 +1603,53 @@
 				else if (a->type==GF_ISOM_BOX_TYPE_UUID) parent_OK = GF_TRUE;
 			}
 			if (! parent_OK && !skip_logs) {
-				char szName[5];
-				strcpy(szName, parent_code);
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is invalid in container %s\n", gf_4cc_to_str(a->type), szName));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Box \"%s\" is invalid in container %s\n", gf_4cc_to_str(a->type), parent_code));
 			}
 		}
 
-		e = add_box(parent, a);
-		if (e) {
-			if (e == GF_ISOM_INVALID_MEDIA) return GF_OK;
-			gf_isom_box_del(a);
-			return e;
+		//always register boxes
+		if (!parent->child_boxes) {
+			parent->child_boxes = gf_list_new();
+			if (!parent->child_boxes) return GF_OUT_OF_MEM;
 		}
-		//in dump mode store all boxes in other_boxes if not done, so that we can dump the original order
-		gf_isom_box_add_for_dump_mode(parent, a);
-	}
-	return GF_OK;
-}
+		e = gf_list_add(parent->child_boxes, a);
+		if (e) return e;
 
-GF_EXPORT
-GF_Err gf_isom_box_add_default(GF_Box *a, GF_Box *subbox)
-{
-	if (!a->other_boxes) {
-		a->other_boxes = gf_list_new();
-		if (!a->other_boxes) return GF_OUT_OF_MEM;
+		if (check_child_box) {
+			e = check_child_box(parent, a);
+			if (e) {
+				if (e == GF_ISOM_INVALID_MEDIA) return GF_OK;
+				//if the box is no longer present, consider it destroyed
+				if (gf_list_find(parent->child_boxes, a) >=0) {
+					gf_isom_box_del_parent(&parent->child_boxes, a);
+				}
+				return e;
+			}
+		}
 	}
-	return gf_list_add(a->other_boxes, subbox);
+	return GF_OK;
 }
 
 GF_EXPORT
 void gf_isom_box_del(GF_Box *a)
 {
-	GF_List *other_boxes;
+	GF_List *child_boxes;
+	const struct box_registry_entry *a_box_registry;
 	if (!a) return;
-	if (skip_box_dump_del) return;
 
-	other_boxes	= a->other_boxes;
-	a->other_boxes = NULL;
+	child_boxes	= a->child_boxes;
+	a->child_boxes = NULL;
 
-	if (!a->registry) {
+	a_box_registry = a->registry;
+	if (!a_box_registry) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Delete invalid box type %s without registry\n", gf_4cc_to_str(a->type) ));
 	} else {
-		if (use_dump_mode) {
-			skip_box_dump_del = GF_TRUE;
-			a->registry->del_fn(a);
-			skip_box_dump_del = GF_FALSE;
-		} else {
-			a->registry->del_fn(a);
-		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Delete box type %s\n", gf_4cc_to_str(a->type) ));
+		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
-	if (other_boxes) {
-		gf_isom_box_array_del(other_boxes);
+	if (child_boxes) {
+		gf_isom_box_array_del(child_boxes);
 	}
 }
 
@@ -1540,17 +1676,56 @@
 	return a->registry->write_fn(a, bs);
 }
 
+
+void gf_isom_check_position(GF_Box *s, GF_Box *child, u32 *pos)
+{
+	if (!s || !s->child_boxes || !child || !pos) return;
+	if (s->internal_flags & GF_ISOM_ORDER_FREEZE)
+		return;
+
+	s32 cur_pos = gf_list_find(s->child_boxes, child);
+
+	assert (cur_pos >= 0);
+
+	if (cur_pos != (s32) *pos) {
+		gf_list_del_item(s->child_boxes, child);
+		gf_list_insert(s->child_boxes, child, *pos);
+	}
+	(*pos)++;
+}
+
+void gf_isom_check_position_list(GF_Box *s, GF_List *childlist, u32 *pos)
+{
+	u32 i, count;
+	if (!s || (s->internal_flags & GF_ISOM_ORDER_FREEZE))
+		return;
+	count = gf_list_count(childlist);
+	for (i=0; i<count; i++) {
+		GF_Box *child = gf_list_get(childlist, i);
+		gf_isom_check_position(s, child, pos);
+	}
+}
+
+
 GF_EXPORT
 GF_Err gf_isom_box_write(GF_Box *a, GF_BitStream *bs)
 {
 	GF_Err e;
 	u64 pos = gf_bs_get_position(bs);
 	if (!a) return GF_BAD_PARAM;
-	if (a->registry->disabled) return GF_OK;
+	//box has been disabled, do not write
+	if (!a->size) return GF_OK;
+	
+	if (a->registry->disabled) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box %s disabled registry, skip write\n", gf_4cc_to_str(a->type)));
+		return GF_OK;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] Box %s size %d write\n", gf_4cc_to_str(a->type), a->size));
 	e = gf_isom_box_write_listing(a, bs);
 	if (e) return e;
-	if (a->other_boxes) {
-		e = gf_isom_box_array_write(a, a->other_boxes, bs);
+	if (a->child_boxes) {
+		e = gf_isom_box_array_write(a, a->child_boxes, bs);
 	}
 	pos = gf_bs_get_position(bs) - pos;
 	if (pos != a->size) {
@@ -1582,19 +1757,22 @@
 	return a->registry->size_fn(a);
 }
 
-
 GF_EXPORT
 GF_Err gf_isom_box_size(GF_Box *a)
 {
 	GF_Err e;
+	if (!a) return GF_BAD_PARAM;
 	if (a->registry->disabled) {
 		a->size = 0;
 		return GF_OK;
 	}
 	e = gf_isom_box_size_listing(a);
 	if (e) return e;
-	if (a->other_boxes) {
-		e = gf_isom_box_array_size(a, a->other_boxes);
+	//box size set to 0 (not even a header), abort traversal
+	if (!a->size) return GF_OK;
+
+	if (a->child_boxes) {
+		e = gf_isom_box_array_size(a, a->child_boxes);
 		if (e) return e;
 	}
 	return GF_OK;
@@ -1606,10 +1784,9 @@
 {
 	if (ptr->registry->max_version_plus_one) {
 		GF_FullBox *self = (GF_FullBox *) ptr;
-		if (ptr->size<4) return GF_ISOM_INVALID_FILE;
+		ISOM_DECREASE_SIZE(ptr, 4)
 		self->version = gf_bs_read_u8(bs);
 		self->flags = gf_bs_read_u24(bs);
-		ptr->size -= 4;
 	}
 	return GF_OK;
 }
@@ -1621,13 +1798,14 @@
 	u32 i;
 	u32 nb_versions=0;
 	GF_Err e;
-	GF_Box *a;
 
 	if (box_registry[idx].max_version_plus_one) {
 		nb_versions = box_registry[idx].max_version_plus_one - 1;
 	}
 	for (i = 0; i <= nb_versions; i++) {
-		a = gf_isom_box_new(box_registry[idx].box_4cc);
+		GF_Box *a = box_registry[idx].new_fn();
+		if (!a) return GF_OUT_OF_MEM;
+
 		a->registry = &box_registry[idx];
 
 		if (box_registry[idx].alt_4cc) {
@@ -1682,53 +1860,43 @@
 
 GF_Err gf_isom_box_dump_start(GF_Box *a, const char *name, FILE * trace)
 {
-	fprintf(trace, "<%s ", name);
+	gf_fprintf(trace, "<%s ", name);
 	if (a->size > 0xFFFFFFFF) {
-		fprintf(trace, "LargeSize=\""LLU"\" ", LLU_CAST a->size);
+		gf_fprintf(trace, "LargeSize=\""LLU"\" ", a->size);
 	} else {
-		fprintf(trace, "Size=\"%u\" ", (u32) a->size);
+		gf_fprintf(trace, "Size=\"%u\" ", (u32) a->size);
 	}
 	if (a->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
-		fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(((GF_UnknownBox*)a)->original_4cc));
+		gf_fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(((GF_UnknownBox*)a)->original_4cc));
 	} else {
-		fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(a->type));
+		gf_fprintf(trace, "Type=\"%s\" ", gf_4cc_to_str(a->type));
 	}
 
 	if (a->type == GF_ISOM_BOX_TYPE_UUID) {
 		u32 i;
-		fprintf(trace, "UUID=\"{");
+		gf_fprintf(trace, "UUID=\"{");
 		for (i=0; i<16; i++) {
-			fprintf(trace, "%02X", (unsigned char) ((GF_UUIDBox*)a)->uuid[i]);
-			if ((i<15) && (i%4)==3) fprintf(trace, "-");
+			gf_fprintf(trace, "%02X", (unsigned char) ((GF_UUIDBox*)a)->uuid[i]);
+			if ((i<15) && (i%4)==3) gf_fprintf(trace, "-");
 		}
-		fprintf(trace, "}\" ");
+		gf_fprintf(trace, "}\" ");
 	}
 
 	if (a->registry->max_version_plus_one) {
-		fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ((GF_FullBox*)a)->version,((GF_FullBox*)a)->flags);
+		gf_fprintf(trace, "Version=\"%d\" Flags=\"%d\" ", ((GF_FullBox*)a)->version,((GF_FullBox*)a)->flags);
 	}
 
-	fprintf(trace, "Specification=\"%s\" ", a->registry->spec);
-	fprintf(trace, "Container=\"%s\" ", a->registry->parents_4cc);
-	//disable all box dumping until end of this box
-	if (use_dump_mode) {
-		skip_box_dump_del = GF_TRUE;
-	}
+	gf_fprintf(trace, "Specification=\"%s\" ", a->registry->spec);
+	gf_fprintf(trace, "Container=\"%s\" ", a->registry->parents_4cc);
 	return GF_OK;
 }
 
-GF_Err gf_isom_box_dump_ex(void *ptr, FILE * trace, u32 box_4cc)
+GF_Err gf_isom_box_dump(void *ptr, FILE * trace)
 {
 	GF_Box *a = (GF_Box *) ptr;
 
-	if (skip_box_dump_del) return GF_OK;
-
 	if (!a) {
-		if (box_4cc) {
-			fprintf(trace, "\n", gf_4cc_to_str(box_4cc) );
-		} else {
-			fprintf(trace, "\n");
-		}
+		gf_fprintf(trace, "\n");
 		return GF_OK;
 	}
 	if (!a->registry) {
@@ -1741,13 +1909,11 @@
 
 void gf_isom_box_dump_done(const char *name, GF_Box *ptr, FILE *trace)
 {
-	//enable box dumping and dump other_boxes which contains all source boxes in order
-	skip_box_dump_del = GF_FALSE;
-	if (ptr && ptr->other_boxes) {
-		gf_isom_box_array_dump(ptr->other_boxes, trace);
+	if (ptr && ptr->child_boxes) {
+		gf_isom_box_array_dump(ptr->child_boxes, trace);
 	}
 	if (name)
-		fprintf(trace, "</%s>\n", name);
+		gf_fprintf(trace, "</%s>\n", name);
 }
 
 Bool gf_isom_box_is_file_level(GF_Box *s)
@@ -1760,4 +1926,71 @@
 #endif
 
 
+GF_Box *gf_isom_box_find_child(GF_List *children, u32 code)
+{
+	u32 i, count;
+	if (!children) return NULL;
+	count = gf_list_count(children);
+	for (i=0; i<count; i++) {
+		GF_Box *c = gf_list_get(children, i);
+		if (c->type==code) return c;
+
+		if (c->type==GF_ISOM_BOX_TYPE_UNKNOWN) {
+			if (((GF_UnknownBox*)c)->original_4cc==code)
+				return c;
+		}
+		if (c->type==GF_ISOM_BOX_TYPE_UUID) {
+			if (((GF_UUIDBox*)c)->internal_4cc==code)
+				return c;
+		}
+	}
+	return NULL;
+}
+
+Bool gf_isom_box_check_unique(GF_List *children, GF_Box *a)
+{
+	u32 i, count;
+	if (!children) return GF_TRUE;
+	count = gf_list_count(children);
+	for (i=0; i<count; i++) {
+		GF_Box *c = gf_list_get(children, i);
+		if (c==a) continue;
+		if (c->type==a->type) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+void gf_isom_box_del_parent(GF_List **child_boxes, GF_Box*b)
+{
+	if (child_boxes) {
+		gf_list_del_item(*child_boxes, b);
+		if (!gf_list_count(*child_boxes)) {
+			gf_list_del(*child_boxes);
+			*child_boxes = NULL;
+		}
+	}
+	gf_isom_box_del(b);
+}
+
+GF_Box *gf_isom_box_new_parent(GF_List **parent, u32 code)
+{
+	GF_Box *b = gf_isom_box_new(code);
+	if (!b) return NULL;
+	if (! (*parent) ) (*parent)  = gf_list_new();
+	gf_list_add(*parent, b);
+	return b;
+}
+
+void gf_isom_box_freeze_order(GF_Box *box)
+{
+	u32 i=0;
+	GF_Box *child;
+	if (!box) return;
+	box->internal_flags |= GF_ISOM_ORDER_FREEZE;
+
+	while ((child = gf_list_enum(box->child_boxes, &i))) {
+		gf_isom_box_freeze_order(child);
+	}
+
+}
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/isomedia/data_map.c -> gpac-1.0.0.tar.gz/src/isomedia/data_map.c Changed

gpac-0.8.0.tar.gz/src/isomedia/drm_sample.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2005-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -44,7 +44,7 @@
 }
 
 
-GF_ISMASample *gf_isom_ismacryp_sample_from_data(char *data, u32 dataLength, Bool use_selective_encryption, u8 KI_length, u8 IV_length)
+GF_ISMASample *gf_isom_ismacryp_sample_from_data(u8 *data, u32 dataLength, Bool use_selective_encryption, u8 KI_length, u8 IV_length)
 {
 	GF_ISMASample *s;
 	GF_BitStream *bs;
@@ -82,11 +82,13 @@
 		if (KI_length) {
 			if (s->dataLength < KI_length) goto exit;
 			s->key_indicator = (u8 *)gf_malloc(KI_length);
+			if (!s->key_indicator) goto exit;
 			gf_bs_read_data(bs, (char*)s->key_indicator, KI_length);
 			s->dataLength -= KI_length;
 		}
 	}
 	s->data = (char*)gf_malloc(sizeof(char)*s->dataLength);
+	if (!s->data) goto exit;
 	gf_bs_read_data(bs, s->data, s->dataLength);
 	gf_bs_del(bs);
 	return s;
@@ -96,7 +98,7 @@
 	return NULL;
 }
 
-GF_Err gf_isom_ismacryp_sample_to_sample(GF_ISMASample *s, GF_ISOSample *dest)
+GF_Err gf_isom_ismacryp_sample_to_sample(const GF_ISMASample *s, GF_ISOSample *dest)
 {
 	GF_BitStream *bs;
 	if (!s || !dest) return GF_BAD_PARAM;
@@ -130,7 +132,9 @@
 	if (!sea) return NULL;
 
 	i = 0;
-	while ((sinf = (GF_ProtectionSchemeInfoBox*)gf_list_enum(sea->protections, &i))) {
+	while ((sinf = (GF_ProtectionSchemeInfoBox*)gf_list_enum(sea->child_boxes, &i))) {
+		if (sinf->type != GF_ISOM_BOX_TYPE_SINF) continue;
+
 		if (sinf->original_format && sinf->scheme_type && sinf->info) {
 			if (!scheme_type || (sinf->scheme_type->scheme_type == scheme_type)) {
 				if (out_sea)
@@ -143,7 +147,7 @@
 }
 
 GF_EXPORT
-GF_ISMASample *gf_isom_get_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, GF_ISOSample *samp, u32 sampleDescriptionIndex)
+GF_ISMASample *gf_isom_get_ismacryp_sample(GF_ISOFile *the_file, u32 trackNumber, const GF_ISOSample *samp, u32 sampleDescriptionIndex)
 {
 	GF_TrackBox *trak;
 	GF_ISMASampleFormatBox *fmt;
@@ -180,18 +184,25 @@
 u32 gf_isom_is_media_encrypted(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
 {
 	GF_TrackBox *trak;
+	u32 i, count;
 	GF_ProtectionSchemeInfoBox *sinf;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return 0;
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
+	for (i=0; i<count; i++) {
+		if (sampleDescriptionIndex && (i+1 != sampleDescriptionIndex))
+			continue;
 
-	sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, 0, NULL);
-	if (!sinf) return 0;
+		sinf = isom_get_sinf_entry(trak, i+1, 0, NULL);
+		if (!sinf) continue;
 
-	/*non-encrypted or non-ISMA*/
-	if (!sinf || !sinf->scheme_type) return 0;
-	if (sinf->scheme_type->scheme_type == GF_4CC('p','i','f','f')) return GF_4CC('c','e','n','c');
-	return sinf->scheme_type->scheme_type;
+		/*non-encrypted or non-ISMA*/
+		if (!sinf->scheme_type) return 0;
+		if (sinf->scheme_type->scheme_type == GF_ISOM_PIFF_SCHEME) return GF_ISOM_CENC_SCHEME;
+		return sinf->scheme_type->scheme_type;
+	}
+	return 0;
 }
 
 GF_EXPORT
@@ -339,15 +350,17 @@
 	if (!sinf) sinf = isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, &sea);
 	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) return GF_OK;
 
 	sea->type = sinf->original_format->data_format;
-	gf_isom_box_array_del(sea->protections);
-	sea->protections = gf_list_new();
+	while (1) {
+		GF_Box *b = gf_isom_box_find_child(sea->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+		if (!b) break;
+		gf_isom_box_del_parent(&sea->child_boxes, b);
+	}
 	if (sea->type == GF_ISOM_BOX_TYPE_264B) sea->type = GF_ISOM_BOX_TYPE_AVC1;
 	if (sea->type == GF_ISOM_BOX_TYPE_265B) sea->type = GF_ISOM_BOX_TYPE_HVC1;
-	if (sea->type == GF_ISOM_BOX_TYPE_AV1B) sea->type = GF_ISOM_BOX_TYPE_AV01;
-	if (sea->type == GF_ISOM_BOX_TYPE_VP9B) sea->type = GF_ISOM_BOX_TYPE_VP09;
 	return GF_OK;
 }
 
@@ -395,6 +408,13 @@
 	if (e) return e;
 
 	original_format = sea->type;
+	if (original_format==GF_ISOM_BOX_TYPE_GNRA) {
+		original_format = ((GF_GenericAudioSampleEntryBox*)sea)->EntryType;
+	} else if (original_format==GF_ISOM_BOX_TYPE_GNRV) {
+		original_format = ((GF_GenericVisualSampleEntryBox*)sea)->EntryType;
+	} else if (original_format==GF_ISOM_BOX_TYPE_GNRM) {
+		original_format = ((GF_GenericSampleEntryBox*)sea)->EntryType;
+	}
 
 	/* Replacing the Media Type */
 	switch (sea->type) {
@@ -434,13 +454,9 @@
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_VP09:
-		if (is_isma)
-			original_format = GF_ISOM_BOX_TYPE_VP9B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_AV01:
-		if (is_isma)
-			original_format = GF_ISOM_BOX_TYPE_AV1B;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
@@ -461,27 +477,38 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] cannot set protection entry: file is already encrypted.\n"));
 		return GF_BAD_PARAM;
 	default:
-		return GF_BAD_PARAM;
+		if (sea->internal_type == GF_ISOM_SAMPLE_ENTRY_AUDIO) {
+			sea->type = GF_ISOM_BOX_TYPE_ENCA;
+		} else if (sea->internal_type == GF_ISOM_SAMPLE_ENTRY_VIDEO) {
+			sea->type = GF_ISOM_BOX_TYPE_ENCV;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] unsupported entry type %s for CENC.\n", gf_4cc_to_str(sea->type) ));
+			return GF_BAD_PARAM;
+		}
 	}
 
-	sinf = (GF_ProtectionSchemeInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SINF);
-	gf_list_add(sea->protections, sinf);
+	sinf = (GF_ProtectionSchemeInfoBox *)gf_isom_box_new_parent(&sea->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+	if (!sinf) return GF_OUT_OF_MEM;
+
+	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 = (GF_SchemeTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SCHM);
 	sinf->scheme_type->version = version;
 	sinf->scheme_type->flags = flags;
 	sinf->scheme_type->scheme_type = scheme_type;
 	sinf->scheme_type->scheme_version = scheme_version;
-	if (sinf->scheme_type->flags == 1) {
+	if (scheme_uri && (sinf->scheme_type->flags == 1)) {
 		sinf->scheme_type->URI = (char *)gf_malloc(sizeof(char)*strlen(scheme_uri));
+		if (!sinf->scheme_type->URI) return GF_OUT_OF_MEM;
 		memmove(sinf->scheme_type->URI, scheme_uri, strlen(scheme_uri));
 	}
 
-	sinf->original_format = (GF_OriginalFormatBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_FRMA);
+	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;
 
 	//common to isma, cenc and oma
-	sinf->info = (GF_SchemeInformationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SCHI);
+	sinf->info = (GF_SchemeInformationBox *)gf_isom_box_new_parent(&sinf->child_boxes, GF_ISOM_BOX_TYPE_SCHI);
 
 	*out_sinf = sinf;
 	return GF_OK;
@@ -504,10 +531,14 @@
 		sinf->scheme_type->URI = gf_strdup(scheme_uri);
 	}
 
-	sinf->info->ikms = (GF_ISMAKMSBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IKMS);
+	sinf->info->ikms = (GF_ISMAKMSBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_IKMS);
+	if (!sinf->info->ikms) return GF_OUT_OF_MEM;
 	sinf->info->ikms->URI = gf_strdup(kms_URI);
+	if (!sinf->info->ikms->URI) return GF_OUT_OF_MEM;
+
+	sinf->info->isfm = (GF_ISMASampleFormatBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_ISFM);
+	if (!sinf->info->isfm) return GF_OUT_OF_MEM;
 
-	sinf->info->isfm = (GF_ISMASampleFormatBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ISFM);
 	sinf->info->isfm->selective_encryption = selective_encryption;
 	sinf->info->isfm->key_indicator_length = KI_length;
 	sinf->info->isfm->IV_length = IV_length;
@@ -525,13 +556,16 @@
 	e = isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, GF_ISOM_OMADRM_SCHEME, 0x00000200, NULL, GF_FALSE, &sinf);
 	if (e) return e;
 
-	sinf->info->odkm = (GF_OMADRMKMSBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ODKM);
-	sinf->info->odkm->fmt = (GF_OMADRMAUFormatBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_ODAF);
+	sinf->info->odkm = (GF_OMADRMKMSBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_ODKM);
+	if (!sinf->info->odkm) return GF_OUT_OF_MEM;
+	sinf->info->odkm->fmt = (GF_OMADRMAUFormatBox*)gf_isom_box_new_parent(&sinf->info->odkm->child_boxes, GF_ISOM_BOX_TYPE_ODAF);
+	if (!sinf->info->odkm->fmt) return GF_OUT_OF_MEM;
 	sinf->info->odkm->fmt->selective_encryption = selective_encryption;
 	sinf->info->odkm->fmt->key_indicator_length = KI_length;
 	sinf->info->odkm->fmt->IV_length = IV_length;
 
-	sinf->info->odkm->hdr = (GF_OMADRMCommonHeaderBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_OHDR);
+	sinf->info->odkm->hdr = (GF_OMADRMCommonHeaderBox*)gf_isom_box_new_parent(&sinf->info->odkm->child_boxes, GF_ISOM_BOX_TYPE_OHDR);
+	if (!sinf->info->odkm->hdr) return GF_OUT_OF_MEM;
 	sinf->info->odkm->hdr->EncryptionMethod = encryption_type;
 	sinf->info->odkm->hdr->PaddingScheme = (encryption_type==0x01) ? 1 : 0;
 	sinf->info->odkm->hdr->PlaintextLength = plainTextLength;
@@ -539,11 +573,33 @@
 	if (kms_URI) sinf->info->odkm->hdr->RightsIssuerURL = gf_strdup(kms_URI);
 	if (textual_headers) {
 		sinf->info->odkm->hdr->TextualHeaders = (char*)gf_malloc(sizeof(char)*textual_headers_len);
+		if (!sinf->info->odkm->hdr->TextualHeaders) return GF_OUT_OF_MEM;
 		memcpy(sinf->info->odkm->hdr->TextualHeaders, textual_headers, sizeof(char)*textual_headers_len);
 		sinf->info->odkm->hdr->TextualHeadersLen = textual_headers_len;
 	}
 	return GF_OK;
 }
+
+GF_Err gf_isom_set_generic_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, u32 scheme_version, char *scheme_uri, char *kms_URI)
+{
+	GF_Err e;
+	GF_ProtectionSchemeInfoBox *sinf;
+
+	//setup generic protection
+	e = isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, scheme_type, scheme_version, NULL, GF_TRUE, &sinf);
+	if (e) return e;
+
+	if (scheme_uri) {
+		sinf->scheme_type->flags |= 0x000001;
+		sinf->scheme_type->URI = gf_strdup(scheme_uri);
+	}
+
+	if (kms_URI) {
+		sinf->info->ikms = (GF_ISMAKMSBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_IKMS);
+		sinf->info->ikms->URI = gf_strdup(kms_URI);
+	}
+	return GF_OK;
+}
 #endif // GPAC_DISABLE_ISOM_WRITE
 
 GF_EXPORT
@@ -552,17 +608,26 @@
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *sea;
 	GF_ProtectionSchemeInfoBox *sinf;
+	u32 i, count;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
-	Media_GetSampleDesc(trak->Media, sampleDescriptionIndex, &sea, NULL);
-	if (!sea) return GF_BAD_PARAM;
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
+	for (i=0; i<count; i++) {
+		if (sampleDescriptionIndex && (i+1 != sampleDescriptionIndex)) continue;
 
-	sinf = (GF_ProtectionSchemeInfoBox*)gf_list_get(sea->protections, 0);
-	if (outOriginalFormat && sinf && sinf->original_format) {
-		*outOriginalFormat = sinf->original_format->data_format;
+		Media_GetSampleDesc(trak->Media, i+1, &sea, NULL);
+		if (!sea) return GF_BAD_PARAM;
+		sinf = (GF_ProtectionSchemeInfoBox*) gf_isom_box_find_child(sea->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+		if (!sinf) continue;
+
+		if (outOriginalFormat && sinf->original_format) {
+			*outOriginalFormat = sinf->original_format->data_format;
+		}
+		return GF_OK;
 	}
+	if (outOriginalFormat) *outOriginalFormat = 0;
 	return GF_OK;
 }
 
@@ -573,25 +638,33 @@
 {
 	GF_TrackBox *trak;
 	GF_ProtectionSchemeInfoBox *sinf;
+	u32 i, count;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_FALSE;
 
-//	if (trak->sample_encryption) return GF_TRUE;
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
+	for (i=0; i<count; i++) {
+		if (sampleDescriptionIndex && (i+1 != sampleDescriptionIndex)) continue;
 
-	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);
+		sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_CENC_SCHEME, NULL);
+		if (!sinf) sinf = isom_get_sinf_entry(trak, i+1, GF_ISOM_CBC_SCHEME, NULL);
+		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) return GF_FALSE;
+		if (!sinf) continue;
 
-	/*non-encrypted or non-CENC*/
-	if (!sinf->info || !sinf->info->tenc || !sinf->scheme_type)
-		return GF_FALSE;
+		/*non-encrypted or non-CENC*/
+		if (!sinf->info || (!sinf->info->tenc && !sinf->info->piff_tenc) || !sinf->scheme_type)
+			return GF_FALSE;
+
+		//TODO: validate the fields in tenc for each scheme type
+		return GF_TRUE;
+
+	}
+	return GF_FALSE;
 
-	//TODO: validate the fields in tenc for each scheme type
-	return GF_TRUE;
 }
 
 GF_EXPORT
@@ -608,6 +681,7 @@
 	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) return GF_BAD_PARAM;
 
@@ -642,45 +716,32 @@
 	e = isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, scheme_type, scheme_version, NULL, GF_FALSE, &sinf);
 	if (e) return e;
 
-	sinf->info->tenc = (GF_TrackEncryptionBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_TENC);
-	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 (scheme_type==GF_ISOM_PIFF_SCHEME) {
+		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->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));
+		}
 	}
 	return GF_OK;
 }
 
-#if 0
-
-GF_Err gf_isom_set_cenc_saio(GF_ISOFile *the_file, u32 trackNumber)
-{
-	GF_SampleTableBox *stbl;
-	GF_SampleAuxiliaryInfoOffsetBox *saio;
-	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
-
-	stbl = trak->Media->information->sampleTable;
-	if (!stbl)
-		return GF_BAD_PARAM;
-
-	saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
-	saio->aux_info_type = GF_ISOM_CENC_SCHEME;
-	saio->aux_info_type_parameter = 0;
-
-	if (!stbl->sai_offsets) stbl->sai_offsets = gf_list_new();
-	gf_list_add(stbl->sai_offsets, saio);
-
-	return GF_OK;
-}
-#endif
 
 GF_Err gf_isom_remove_cenc_saiz(GF_ISOFile *the_file, u32 trackNumber)
 {
@@ -705,7 +766,7 @@
 		default:
 			continue;
 		}
-		gf_isom_box_del((GF_Box *)saiz);
+		gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *)saiz);
 		gf_list_rem(stbl->sai_sizes, i);
 		i--;
 	}
@@ -741,7 +802,7 @@
 		default:
 			continue;
 		}
-		gf_isom_box_del((GF_Box *)saio);
+		gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *)saio);
 		gf_list_rem(stbl->sai_offsets, i);
 		i--;
 	}
@@ -754,29 +815,98 @@
 	return GF_OK;
 }
 
-GF_Err gf_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KIDs, char *data, u32 len) {
-	GF_ProtectionSystemHeaderBox *pssh;
-
-	pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PSSH);
-	if (!pssh)
-		return GF_IO_ERR;
-	memmove((char *)pssh->SystemID, systemID, 16);
-	pssh->version = version;
-	if (version) {
-		pssh->KID_count = KID_count;
-		if (KID_count) {
-			if (!pssh->KIDs) pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-			memmove(pssh->KIDs, KIDs, pssh->KID_count*sizeof(bin128));
+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_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) {
+		if (!file->moof) return GF_BAD_PARAM;
+		if (!file->moof->PSSHs) file->moof->PSSHs = gf_list_new();
+		child_boxes = &file->moof->PSSHs;
+	} else {
+		if (!file->moov->child_boxes) file->moov->child_boxes = gf_list_new();
+		child_boxes = &file->moov->child_boxes;
+	}
+
+	while ((a = gf_list_enum(*child_boxes, &i))) {
+		GF_UUIDBox *uuid = (GF_UUIDBox *)a;
+		if (a->type==GF_ISOM_BOX_TYPE_PSSH) {
+			pssh = (GF_ProtectionSystemHeaderBox *)a;
+			if (!memcmp(pssh->SystemID, systemID, sizeof(bin128))) break;
+			pssh = NULL;
+		} else if ((a->type==GF_ISOM_BOX_TYPE_UUID) && (uuid->internal_4cc==GF_ISOM_BOX_UUID_PSSH)) {
+			pssh_piff = (GF_PIFFProtectionSystemHeaderBox *)a;
+			if (!memcmp(pssh_piff->SystemID, systemID, sizeof(bin128))) break;
+			pssh_piff = NULL;
+		}
+	}
+	//we had a pssh with same ID but different private data, keep both...
+	if (pssh && pssh->private_data && len && memcmp(pssh->private_data, data, sizeof(char)*len) ) {
+		pssh = NULL;
+	}
+	else if (pssh_piff && pssh_piff->private_data && len && memcmp(pssh_piff->private_data, data, sizeof(char)*len) ) {
+		pssh_piff = NULL;
+	}
+
+	if (!pssh && !pssh_piff) {
+		if (use_piff) {
+			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;
+		} 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;
 		}
 	}
-	pssh->private_data_size = len;
-	if (!pssh->private_data)
-		pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
-	memmove((char *)pssh->private_data, data, pssh->private_data_size);
 
-	if (!mp4->moov->other_boxes) mp4->moov->other_boxes = gf_list_new();
-	gf_list_add(mp4->moov->other_boxes, pssh);
+	if (pssh && KID_count) {
+		u32 j;
+		for (j=0; j<KID_count; j++) {
+			Bool found = GF_FALSE;
+			for (i=0; i<pssh->KID_count; i++) {
+				if (!memcmp(pssh->KIDs[i], KIDs[j], sizeof(bin128))) found = GF_TRUE;
+			}
 
+			if (!found) {
+				pssh->KIDs = gf_realloc(pssh->KIDs, sizeof(bin128) * (pssh->KID_count+1));
+				if (!pssh->KIDs) return GF_OUT_OF_MEM;
+				memcpy(pssh->KIDs[pssh->KID_count], KIDs[j], sizeof(bin128));
+				pssh->KID_count++;
+			}
+		}
+		if (!pssh->version)
+			pssh->version = 1;
+	}
+
+	if (pssh) {
+		if (!pssh->private_data_size) {
+			pssh->private_data_size = len;
+			if (len) {
+				if (!pssh->private_data) {
+					pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
+					if (!pssh->private_data) return GF_OUT_OF_MEM;
+				}
+				memcpy((char *)pssh->private_data, data, pssh->private_data_size);
+			}
+		}
+	} else if (pssh_piff) {
+		if (!pssh_piff->private_data_size) {
+			pssh_piff->private_data_size = len;
+			if (len) {
+				if (!pssh_piff->private_data) {
+					pssh_piff->private_data = (u8 *)gf_malloc(pssh_piff->private_data_size*sizeof(char));
+					if (!pssh_piff->private_data) return GF_OUT_OF_MEM;
+				}
+				memcpy((char *)pssh_piff->private_data, data, pssh_piff->private_data_size);
+			}
+		}
+	}
 	return GF_OK;
 }
 
@@ -792,34 +922,30 @@
 	if (!stbl)
 		return GF_BAD_PARAM;
 
-	for (i = 0; i < gf_list_count(stbl->other_boxes); i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(stbl->other_boxes, i);
+	for (i = 0; i < gf_list_count(stbl->child_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(stbl->child_boxes, i);
 		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
-			gf_isom_box_del(a);
-			gf_list_rem(stbl->other_boxes, i);
+			gf_isom_box_del_parent(&stbl->child_boxes, a);
 			i--;
 		}
 		else if (a->type == GF_ISOM_BOX_TYPE_SENC) {
-			gf_isom_box_del(a);
-			gf_list_rem(stbl->other_boxes, i);
+			gf_isom_box_del_parent(&stbl->child_boxes, a);
 			i--;
 		}
 	}
 
-	if (!gf_list_count(stbl->other_boxes)) {
-		gf_list_del(stbl->other_boxes);
-		stbl->other_boxes = NULL;
+	if (!gf_list_count(stbl->child_boxes)) {
+		gf_list_del(stbl->child_boxes);
+		stbl->child_boxes = NULL;
 	}
-	for (i = 0; i < gf_list_count(trak->other_boxes); i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(trak->other_boxes, i);
+	for (i = 0; i < gf_list_count(trak->child_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(trak->child_boxes, i);
 		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
-			gf_isom_box_del(a);
-			gf_list_rem(trak->other_boxes, i);
+			gf_isom_box_del_parent(&trak->child_boxes, a);
 			i--;
 		}
 		else if (a->type == GF_ISOM_BOX_TYPE_SENC) {
-			gf_isom_box_del(a);
-			gf_list_rem(trak->other_boxes, i);
+			gf_isom_box_del_parent(&trak->child_boxes, a);
 			i--;
 		}
 	}
@@ -840,7 +966,7 @@
 		GF_SampleGroupDescriptionBox *a = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
 		if (a->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG) {
 			gf_list_rem(stbl->sampleGroupsDescription, i);
-			gf_isom_box_del((GF_Box *) a);
+			gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) a);
 			i--;
 		}
 	}
@@ -853,7 +979,7 @@
 		GF_SampleGroupBox *a = (GF_SampleGroupBox *)gf_list_get(stbl->sampleGroups, i);
 		if (a->grouping_type == GF_ISOM_SAMPLE_GROUP_SEIG) {
 			gf_list_rem(stbl->sampleGroups, i);
-			gf_isom_box_del((GF_Box *) a);
+			gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) a);
 			i--;
 		}
 	}
@@ -868,18 +994,20 @@
 GF_Err gf_isom_remove_pssh_box(GF_ISOFile *the_file)
 {
 	u32 i;
-	for (i = 0; i < gf_list_count(the_file->moov->other_boxes); i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(the_file->moov->other_boxes, i);
-		if ((a->type == GF_ISOM_BOX_UUID_PSSH) || (a->type == GF_ISOM_BOX_TYPE_PSSH)) {
-			gf_list_rem(the_file->moov->other_boxes, i);
-			gf_isom_box_del(a);
+	for (i = 0; i < gf_list_count(the_file->moov->child_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(the_file->moov->child_boxes, i);
+		GF_UUIDBox *uuid = (GF_UUIDBox *)a;
+		if ((a->type == GF_ISOM_BOX_TYPE_PSSH)
+			|| ((a->type == GF_ISOM_BOX_TYPE_UUID) && (uuid->internal_4cc == GF_ISOM_BOX_UUID_PSSH))
+		) {
+			gf_isom_box_del_parent(&the_file->moov->child_boxes, a);
 			i--;
 		}
 	}
 
-	if (!gf_list_count(the_file->moov->other_boxes)) {
-		gf_list_del(the_file->moov->other_boxes);
-		the_file->moov->other_boxes = NULL;
+	if (!gf_list_count(the_file->moov->child_boxes)) {
+		gf_list_del(the_file->moov->child_boxes);
+		the_file->moov->child_boxes = NULL;
 	}
 
 	return GF_OK;
@@ -938,44 +1066,53 @@
 		return GF_NOT_SUPPORTED;
 	}
 	//senc will be written and destroyed with the other boxes
-	return gf_isom_box_add_default((GF_Box *) trak, (GF_Box *) trak->sample_encryption);
+	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)
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox  *traf, u32 len, Bool saio_32bits)
 {
 	u32  i;
+	GF_List **child_boxes = stbl ? &stbl->child_boxes : &traf->child_boxes;
 	if (!senc->cenc_saiz) {
-		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIZ);
+		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_TYPE_SAIZ);
+		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;
 		if (stbl)
-			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
+			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
 		else
-			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saiz);
+			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saiz);
 	}
 	if (!senc->cenc_saio) {
-		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
+		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_TYPE_SAIO);
+		if (!senc->cenc_saio) return;
 		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
-		senc->cenc_saio->version = 1;
+		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_saio->entry_count = 1;
 		if (stbl)
-			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
+			stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
 		else
-			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saio);
+			traf_on_child_box((GF_Box*)traf, (GF_Box *)senc->cenc_saio);
 	}
 
 	if (!senc->cenc_saiz->sample_count || ((senc->cenc_saiz->default_sample_info_size==len) && len) ) {
 		senc->cenc_saiz->sample_count ++;
 		senc->cenc_saiz->default_sample_info_size = len;
 	} else {
-		senc->cenc_saiz->sample_info_size = (u8*)gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+		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;
 
-		if (senc->cenc_saiz->default_sample_info_size) {
+			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->default_sample_info_size || (senc->cenc_saiz->sample_count==1)) {
 			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;
@@ -985,31 +1122,37 @@
 	}
 }
 
-void 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, u64 offset, u32 len)
 {
 	u32  i;
+	assert(stbl);
 	if (!senc->cenc_saiz) {
-		senc->cenc_saiz = (GF_SampleAuxiliaryInfoSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_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;
-		if (stbl)
-			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
+		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saiz);
 	}
 	if (!senc->cenc_saio) {
-		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
+		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SAIO);
+		if (!senc->cenc_saio) return GF_OUT_OF_MEM;
 		//force using version 1 for saio box, it could be redundant when we use 64 bits for offset
 		senc->cenc_saio->version = 1;
 		senc->cenc_saio->aux_info_type = GF_ISOM_CENC_SCHEME;
 		senc->cenc_saio->aux_info_type_parameter = 0;
-		if (stbl)
-			stbl_AddBox((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
+		stbl_on_child_box((GF_Box*)stbl, (GF_Box *)senc->cenc_saio);
 	}
 
 	if (!senc->cenc_saiz->sample_count || (senc->cenc_saiz->default_sample_info_size==len)) {
 		senc->cenc_saiz->sample_count ++;
 		senc->cenc_saiz->default_sample_info_size = len;
 	} else {
-		senc->cenc_saiz->sample_info_size = (u8*)gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+		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;
+			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;
+		}
 
 		if (senc->cenc_saiz->default_sample_info_size) {
 			for (i=0; i<senc->cenc_saiz->sample_count; i++)
@@ -1021,18 +1164,27 @@
 	}
 
 	if (!senc->cenc_saio->entry_count) {
-		senc->cenc_saio->offsets_large = (u64 *)gf_malloc(sizeof(u64));
-		senc->cenc_saio->offsets_large[0] = offset;
+		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 {
-		senc->cenc_saio->offsets_large = (u64*)gf_realloc(senc->cenc_saio->offsets_large, sizeof(u64)*(senc->cenc_saio->entry_count+1));
-		senc->cenc_saio->offsets_large[senc->cenc_saio->entry_count] = offset;
+		if (senc->cenc_saio->entry_count >= senc->cenc_saio->entry_alloc) {
+			senc->cenc_saio->entry_alloc += 50;
+			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;
 		senc->cenc_saio->entry_count++;
 	}
+	if (offset > 0xFFFFFFFFUL)
+		senc->cenc_saio->version=1;
+	return GF_OK;
 }
 #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, char *buf, u32 len, Bool use_subsamples, char *clear_IV)
+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)
 {
 	u32 i;
 	GF_SampleEncryptionBox *senc;
@@ -1052,18 +1204,21 @@
 		return GF_NOT_SUPPORTED;
 	}
 
-	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-	if (!sai) return GF_OUT_OF_MEM;
-
-	memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
 	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);
@@ -1072,16 +1227,23 @@
 		gf_bs_del(bs);
 	} else if (len) {
 		u32 olen = len;
+
+		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;
+			/*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) {
@@ -1096,9 +1258,8 @@
 		len = IV_size + 2 + 6*sai->subsample_count;
 	}
 
-	gf_list_add(senc->samp_aux_info, sai);
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, len);
+	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, len, use_saio_32bit);
 #endif
 
 	return GF_OK;
@@ -1108,7 +1269,7 @@
 GF_EXPORT
 void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp)
 {
-	//if (samp->IV) gf_free(samp->IV);
+	if (!samp) return;
 	if (samp->subsamples) gf_free(samp->subsamples);
 	gf_free(samp);
 }
@@ -1117,6 +1278,7 @@
 {
 	u32 i, c1, c2;
 	GF_List *sai_sizes, *sai_offsets;
+	u32 sinf_fmt = 0;
 	Bool has_saiz, has_saio;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	GF_TrackFragmentBox *traf=(GF_TrackFragmentBox *)_traf;
@@ -1143,6 +1305,23 @@
 		u32 saiz_aux_info_type = saiz->aux_info_type;
 		if (!saiz_aux_info_type) saiz_aux_info_type = scheme_type;
 
+
+		if (!saiz_aux_info_type) {
+			GF_SampleEntryBox *entry = NULL;
+			GF_ProtectionSchemeInfoBox *sinf = NULL;
+			if (stbl) {
+				entry = gf_list_get(stbl->SampleDescription->child_boxes, 0);
+			} else {
+				entry = gf_list_get(traf->trex->track->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+			}
+
+			if (entry)
+				sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+
+			if (sinf && sinf->scheme_type) {
+				saiz_aux_info_type = sinf_fmt = sinf->scheme_type->scheme_type;
+			}
+		}
 		if (!saiz_aux_info_type && (c1==1) && (c2==1)) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] saiz box without flags nor aux info type and no default scheme, ignoring\n"));
 			continue;
@@ -1153,6 +1332,7 @@
 		case GF_ISOM_CBC_SCHEME:
 		case GF_ISOM_CENS_SCHEME:
 		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
 			has_saiz = GF_TRUE;
 			break;
 		}
@@ -1162,7 +1342,23 @@
 		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(sai_offsets, i);
 		u32 saio_aux_info_type = saio->aux_info_type;
 		if (!saio_aux_info_type) saio_aux_info_type = scheme_type;
+		if (!saio_aux_info_type) saio_aux_info_type = sinf_fmt;
+
+		if (!saio_aux_info_type) {
+			GF_SampleEntryBox *entry = NULL;
+			GF_ProtectionSchemeInfoBox *sinf = NULL;
+			if (stbl) {
+				entry = gf_list_get(stbl->SampleDescription->child_boxes, 0);
+			} else {
+				entry = gf_list_get(traf->trex->track->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+			}
+			if (entry)
+				sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_SINF);
 
+			if (sinf && sinf->scheme_type) {
+				saio_aux_info_type = sinf_fmt = sinf->scheme_type->scheme_type;
+			}
+		}
 		if (!saio_aux_info_type && (c1==1) && (c2==1)) {
 			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;
@@ -1172,6 +1368,7 @@
 		case GF_ISOM_CBC_SCHEME:
 		case GF_ISOM_CENS_SCHEME:
 		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
 			has_saio = GF_TRUE;
 			break;
 		}
@@ -1192,14 +1389,13 @@
 #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)
+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)
 {
-	GF_BitStream *bs;
 	u32  prev_sai_size, size, i, j, nb_saio;
 	u64 cur_position, offset;
 	GF_Err e = GF_OK;
-	char *buffer;
-
+	GF_SampleAuxiliaryInfoOffsetBox *saio_cenc=NULL;
+	GF_SampleAuxiliaryInfoSizeBox *saiz_cenc=NULL;
 	nb_saio = size = prev_sai_size = 0;
 	offset = 0;
 
@@ -1213,18 +1409,21 @@
 		case GF_ISOM_CBC_SCHEME:
 		case GF_ISOM_CENS_SCHEME:
 		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
 			break;
 		default:
 			continue;
 		}
 
 		if (saio->entry_count == 1)
-			offset = saio->version ? saio->offsets_large[0] : saio->offsets[0];
+			offset = saio->offsets[0];
 		else
-			offset = saio->version ? saio->offsets_large[sampleNumber-1]: saio->offsets[sampleNumber-1];
+			offset = saio->offsets[sampleNumber-1];
 		nb_saio = saio->entry_count;
+		saio_cenc = saio;
 		break;
 	}
+	if (!saio_cenc) return GF_ISOM_INVALID_FILE;
 
 	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_sizes); i++) {
 		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(mdia->information->sampleTable->sai_sizes, i);
@@ -1236,6 +1435,7 @@
 		case GF_ISOM_CBC_SCHEME:
 		case GF_ISOM_CENS_SCHEME:
 		case GF_ISOM_CBCS_SCHEME:
+		case GF_ISOM_PIFF_SCHEME:
 			break;
 		default:
 			continue;
@@ -1243,51 +1443,95 @@
 		if (sampleNumber>saiz->sample_count) {
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
-		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];
+		if ((nb_saio==1) && !saio_cenc->total_size) {
+			for (j = 0; j < saiz->sample_count; j++) {
+				saio_cenc->total_size += saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+			}
+		}
+		if (saiz->cached_sample_num+1== sampleNumber) {
+			prev_sai_size = saiz->cached_prev_size;
+		} else {
+			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];
+		saiz_cenc=saiz;
 		break;
 	}
+	if (!saiz_cenc) return GF_BAD_PARAM;
+
+	saiz_cenc->cached_sample_num = sampleNumber;
+	saiz_cenc->cached_prev_size = prev_sai_size + size;
+
+	if (saio_cenc->total_size) {
+		if (!saio_cenc->cached_data) {
+			saio_cenc->cached_data = gf_malloc(sizeof(u8)*saio_cenc->total_size);
+			if (!saio_cenc->cached_data) return GF_OUT_OF_MEM;
+			cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
+			gf_bs_seek(mdia->information->dataHandler->bs, offset);
+			gf_bs_read_data(mdia->information->dataHandler->bs, saio_cenc->cached_data, saio_cenc->total_size);
+			gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
+		}
+		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;
+				}
+				memcpy((*out_buffer), saio_cenc->cached_data + prev_sai_size, size);
+			}
+			(*out_size) = size;
+		}
+		return GF_OK;
+	}
 
 	offset += (nb_saio == 1) ? prev_sai_size : 0;
 	cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
 	gf_bs_seek(mdia->information->dataHandler->bs, offset);
-	buffer = (char *)gf_malloc(size);
-	gf_bs_read_data(mdia->information->dataHandler->bs, buffer, size);
-	gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
 
-	*sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
-	memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo));
-	if (size) {
-		bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
-		gf_bs_read_data(bs, (char *)(*sai)->IV, IV_size);
-		if (size > IV_size) {
-			(*sai)->subsample_count = gf_bs_read_u16(bs);
-			(*sai)->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
-			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);
+	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);
+				}
 			}
 		}
-		gf_bs_del(bs);
+	} 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_free(buffer);
+	gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
 
 	return e;
 }
 
 
-GF_EXPORT
-GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type)
+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_TrackBox *trak;
 	GF_SampleTableBox *stbl;
 	GF_SampleEncryptionBox *senc = NULL;
-	u32 type;
+	u32 type, scheme_type = -1;
 	GF_CENCSampleAuxInfo *a_sai;
 	u8 IV_size, constant_IV_size;
 	bin128 constant_IV;
-	u32 is_Protected, scheme_type=-1;
+	Bool is_Protected;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
@@ -1308,29 +1552,30 @@
 		if (container_type) *container_type = type;
 	}
 
-	if (!sai) return GF_OK; /*we need only container_type*/
+	if (!sai && !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) {
+	if (sai && *sai) {
 		gf_isom_cenc_samp_aux_info_del(*sai);
 		*sai = NULL;
 	}
-	gf_isom_get_cenc_info(the_file, trackNumber, 1, NULL, &scheme_type, NULL, 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);
 
 	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
-	if (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);
+	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 (!senc)
 		return GF_OK;
 
 	//senc is not loaded by default, do it now
 	if (!gf_list_count(senc->samp_aux_info)) {
-		GF_Err e = senc_Parse(the_file->movieFileMap->bs, trak, NULL, senc);
+		GF_Err e = senc_Parse(trak->Media->information->dataHandler->bs, trak, NULL, senc);
 		if (e) return e;
 	}
 
@@ -1347,17 +1592,23 @@
 	}
 	if (!a_sai) {
 		if (!IV_size && constant_IV_size) return GF_OK;
-		return GF_NOT_SUPPORTED;
+		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 != 0) ? (*sai)->IV_size : 8/*default for modern PIFF/CENC with AES-CTR*/;
+		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);
 		}
 	}
@@ -1365,10 +1616,21 @@
 	return GF_OK;
 }
 
-void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *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_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)
 {
-	GF_ProtectionSchemeInfoBox *sinf;
+	return gf_isom_cenc_get_sample_aux_info_internal(the_file, trackNumber, sampleNumber, sampleDescIndex, NULL, container_type, out_buffer, outSize);
+}
 
+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)
+{
+	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);
@@ -1376,11 +1638,34 @@
 	if (constant_IV) memset(*constant_IV, 0, 16);
 	if (crypt_byte_block) *crypt_byte_block = 0;
 	if (skip_byte_block) *skip_byte_block = 0;
+	if (container_type) *container_type = 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) {
+		u32 i, nb_stsd = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
+		for (i=0; i<nb_stsd; i++) {
+			GF_ProtectionSchemeInfoBox *a_sinf;
+			GF_SampleEntryBox *sentry=NULL;
+			if (i+1==sampleDescriptionIndex) continue;
+			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;
+			return;
+		}
+	}
 
 	if (sinf && sinf->info && sinf->info->tenc) {
 		if (default_IsEncrypted) *default_IsEncrypted = sinf->info->tenc->isProtected;
@@ -1390,7 +1675,14 @@
 		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;
-
+		//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);
+		//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;
@@ -1399,15 +1691,22 @@
 		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) {
+		if (trak->sample_encryption->type == GF_ISOM_BOX_TYPE_SENC) *container_type = GF_ISOM_BOX_TYPE_SENC;
+		else if (trak->sample_encryption->type == GF_ISOM_BOX_TYPE_UUID) *container_type = ((GF_UUIDBox*)trak->sample_encryption)->internal_4cc;
 	}
 }
 
 GF_EXPORT
-void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *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(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_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return;
-	gf_isom_cenc_get_default_info_ex(trak, sampleDescriptionIndex, default_IsEncrypted, default_IV_size, default_KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
+	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);
 }
 
 /*
@@ -1426,32 +1725,41 @@
 	return GF_NOT_SUPPORTED;
 #endif
 
-	sinf->info->adkm = (GF_AdobeDRMKeyManagementSystemBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ADKM);
+	sinf->info->adkm = (GF_AdobeDRMKeyManagementSystemBox *)gf_isom_box_new_parent(&sinf->info->child_boxes, GF_ISOM_BOX_TYPE_ADKM);
+	if (!sinf->info->adkm) return GF_OUT_OF_MEM;
+
+	sinf->info->adkm->header = (GF_AdobeDRMHeaderBox *)gf_isom_box_new_parent(&sinf->info->adkm->child_boxes, GF_ISOM_BOX_TYPE_AHDR);
+	if (!sinf->info->adkm->header) return GF_OUT_OF_MEM;
 
-	sinf->info->adkm->header = (GF_AdobeDRMHeaderBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AHDR);
+	sinf->info->adkm->header->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)gf_isom_box_new_parent(& sinf->info->adkm->header->child_boxes, GF_ISOM_BOX_TYPE_APRM);
+	if (!sinf->info->adkm->header->std_enc_params) return GF_OUT_OF_MEM;
 
-	sinf->info->adkm->header->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_APRM);
+	sinf->info->adkm->header->std_enc_params->enc_info = (GF_AdobeEncryptionInfoBox *)gf_isom_box_new_parent(&sinf->info->adkm->header->std_enc_params->child_boxes, GF_ISOM_BOX_TYPE_AEIB);
+	if (!sinf->info->adkm->header->std_enc_params->enc_info) return GF_OUT_OF_MEM;
 
-	sinf->info->adkm->header->std_enc_params->enc_info = (GF_AdobeEncryptionInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AEIB);
-	if (sinf->info->adkm->header->std_enc_params->enc_info->enc_algo)
-		gf_free(sinf->info->adkm->header->std_enc_params->enc_info->enc_algo);
 	sinf->info->adkm->header->std_enc_params->enc_info->enc_algo = (char *)gf_malloc(8*sizeof(char));
-	strncpy(sinf->info->adkm->header->std_enc_params->enc_info->enc_algo, "AES-CBC", 7);
-	sinf->info->adkm->header->std_enc_params->enc_info->enc_algo[7] = 0;
+	if (!sinf->info->adkm->header->std_enc_params->enc_info->enc_algo) return GF_OUT_OF_MEM;
+
+	strcpy(sinf->info->adkm->header->std_enc_params->enc_info->enc_algo, "AES-CBC");
 	sinf->info->adkm->header->std_enc_params->enc_info->key_length = 16;
 
-	sinf->info->adkm->header->std_enc_params->key_info = (GF_AdobeKeyInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AKEY);
+	sinf->info->adkm->header->std_enc_params->key_info = (GF_AdobeKeyInfoBox *)gf_isom_box_new_parent(&sinf->info->adkm->header->std_enc_params->child_boxes, GF_ISOM_BOX_TYPE_AKEY);
+	if (!sinf->info->adkm->header->std_enc_params->key_info) return GF_OUT_OF_MEM;
+
+	sinf->info->adkm->header->std_enc_params->key_info->params = (GF_AdobeFlashAccessParamsBox *)gf_isom_box_new_parent(&sinf->info->adkm->header->std_enc_params->key_info->child_boxes, GF_ISOM_BOX_TYPE_FLXS);
+	if (!sinf->info->adkm->header->std_enc_params->key_info->params) return GF_OUT_OF_MEM;
 
-	sinf->info->adkm->header->std_enc_params->key_info->params = (GF_AdobeFlashAccessParamsBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_FLXS);
 	if (metadata && len) {
-		if (sinf->info->adkm->header->std_enc_params->key_info->params->metadata)
-			gf_free(sinf->info->adkm->header->std_enc_params->key_info->params->metadata);
 		sinf->info->adkm->header->std_enc_params->key_info->params->metadata = (char *)gf_malloc((len+1)*sizeof(char));
+		if (!sinf->info->adkm->header->std_enc_params->key_info->params->metadata) return GF_OUT_OF_MEM;
+
 		strncpy(sinf->info->adkm->header->std_enc_params->key_info->params->metadata, metadata, len);
 		sinf->info->adkm->header->std_enc_params->key_info->params->metadata[len] = 0;
 	}
 
-	sinf->info->adkm->au_format = (GF_AdobeDRMAUFormatBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ADAF);
+	sinf->info->adkm->au_format = (GF_AdobeDRMAUFormatBox *)gf_isom_box_new_parent(&sinf->info->adkm->child_boxes, GF_ISOM_BOX_TYPE_ADAF);
+	if (!sinf->info->adkm->au_format) return GF_OUT_OF_MEM;
+
 	sinf->info->adkm->au_format->selective_enc = is_selective_enc ? 0x10 : 0x00;
 	sinf->info->adkm->au_format->IV_length = 16;
 
@@ -1479,7 +1787,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion)
+GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, const char **outMetadata)
 {
 	GF_TrackBox *trak;
 	GF_ProtectionSchemeInfoBox *sinf;
@@ -1498,6 +1806,15 @@
 	if (outSchemeType) *outSchemeType = sinf->scheme_type->scheme_type;
 	if (outSchemeVersion) *outSchemeVersion = sinf->scheme_type->scheme_version;
 
+	if (outMetadata) {
+		*outMetadata = NULL;
+		if (sinf->info && sinf->info->adkm && sinf->info->adkm->header && sinf->info->adkm->header->std_enc_params && sinf->info->adkm->header->std_enc_params->key_info
+			&& sinf->info->adkm->header->std_enc_params->key_info->params && sinf->info->adkm->header->std_enc_params->key_info->params->metadata)
+		{
+			*outMetadata = sinf->info->adkm->header->std_enc_params->key_info->params->metadata;
+		}
+	}
+
 	return GF_OK;
 }

gpac-0.8.0.tar.gz/src/isomedia/hint_track.c -> gpac-1.0.0.tar.gz/src/isomedia/hint_track.c Changed

gpac-0.8.0.tar.gz/src/isomedia/hinting.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -27,7 +27,7 @@
 
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_HINTING)
 
-GF_Box *ghnt_New()
+GF_Box *ghnt_box_new()
 {
 	GF_HintSampleEntryBox *tmp;
 	GF_SAFEALLOC(tmp, GF_HintSampleEntryBox);
@@ -41,7 +41,7 @@
 	return (GF_Box *)tmp;
 }
 
-void ghnt_del(GF_Box *s)
+void ghnt_box_del(GF_Box *s)
 {
 	GF_HintSampleEntryBox *ptr;
 
@@ -50,13 +50,14 @@
 	gf_free(ptr);
 }
 
-GF_Err ghnt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ghnt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_HintSampleEntryBox *ptr = (GF_HintSampleEntryBox *)s;
 	if (ptr == NULL) return GF_BAD_PARAM;
 
-	if (ptr->size < 16) return GF_ISOM_INVALID_FILE;
+	//sample entry + 4 bytes in box
+	ISOM_DECREASE_SIZE(ptr, 12)
 
 	e = gf_isom_base_sample_entry_read((GF_SampleEntryBox *)ptr, bs);
 	if (e) return e;
@@ -64,22 +65,21 @@
 	ptr->HintTrackVersion = gf_bs_read_u16(bs);
 	ptr->LastCompatibleVersion = gf_bs_read_u16(bs);
 
-	ptr->size -= 12;
 	if ((s->type == GF_ISOM_BOX_TYPE_RTP_STSD) || (s->type == GF_ISOM_BOX_TYPE_SRTP_STSD) || (s->type == GF_ISOM_BOX_TYPE_RRTP_STSD) || (s->type == GF_ISOM_BOX_TYPE_RTCP_STSD)) {
+		ISOM_DECREASE_SIZE(ptr, 4)
 		ptr->MaxPacketSize = gf_bs_read_u32(bs);
-		ptr->size -= 4;
 	} else if (s->type == GF_ISOM_BOX_TYPE_FDP_STSD) {
+		ISOM_DECREASE_SIZE(ptr, 4)
 		ptr->partition_entry_ID = gf_bs_read_u16(bs);
 		ptr->FEC_overhead = gf_bs_read_u16(bs);
-		ptr->size -= 4;
 
 	}
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ghnt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ghnt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_HintSampleEntryBox *ptr = (GF_HintSampleEntryBox *)s;
@@ -94,7 +94,7 @@
 	return GF_OK;
 }
 
-GF_Err ghnt_Size(GF_Box *s)
+GF_Err ghnt_box_size(GF_Box *s)
 {
 	GF_HintSampleEntryBox *ptr = (GF_HintSampleEntryBox *)s;
 	ptr->size += 16;
@@ -129,15 +129,13 @@
 
 void gf_isom_hint_sample_del(GF_HintSample *ptr)
 {
-	GF_HintPacket *pck;
-
 	if (ptr->hint_subtype==GF_ISOM_BOX_TYPE_FDP_STSD) {
 		gf_isom_box_del((GF_Box*)ptr);
 		return;
 	}
 
 	while (gf_list_count(ptr->packetTable)) {
-		pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, 0);
+		GF_HintPacket *pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, 0);
 		gf_isom_hint_pck_del(pck);
 		gf_list_rem(ptr->packetTable, 0);
 	}
@@ -155,8 +153,8 @@
 	}
 	if (ptr->extra_data)
 		gf_isom_box_del((GF_Box*)ptr->extra_data);
-	if (ptr->other_boxes)
-		gf_isom_box_array_del(ptr->other_boxes);
+	if (ptr->child_boxes)
+		gf_isom_box_array_del(ptr->child_boxes);
 
 	gf_free(ptr);
 }
@@ -165,9 +163,10 @@
 {
 	u16 i;
 	u32 type;
-	GF_HintPacket *pck;
 	GF_Err e;
+#ifndef GPAC_DISABLE_LOG
 	char *szName = (ptr->hint_subtype==GF_ISOM_BOX_TYPE_RTCP_STSD) ? "RTCP" : "RTP";
+#endif
 	u64 sizeIn, sizeOut;
 
 	sizeIn = gf_bs_available(bs);
@@ -198,6 +197,7 @@
 	}
 	
 	for (i = 0; i < ptr->packetCount; i++) {
+		GF_HintPacket *pck;
 		if (! gf_bs_available(bs) ) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso] %s hint sample has no more data but still %d entries to read\n", szName, ptr->packetCount-i));
 			return GF_ISOM_INVALID_MEDIA;
@@ -220,6 +220,7 @@
 	if ((u32)sizeOut < sampleSize) {
 		ptr->dataLength = sampleSize - (u32)sizeOut;
 		ptr->AdditionalData = (char*)gf_malloc(sizeof(char) * ptr->dataLength);
+		if (!ptr->AdditionalData) return GF_OUT_OF_MEM;
 		gf_bs_read_data(bs, ptr->AdditionalData, ptr->dataLength);
 	}
 	return GF_OK;
@@ -231,7 +232,6 @@
 GF_Err gf_isom_hint_sample_write(GF_HintSample *ptr, GF_BitStream *bs)
 {
 	u32 count, i;
-	GF_HintPacket *pck;
 	GF_Err e;
 
 	if (ptr->hint_subtype==GF_ISOM_BOX_TYPE_FDP_STSD) {
@@ -245,7 +245,7 @@
 	gf_bs_write_u16(bs, ptr->reserved);
 	//write the packet table
 	for (i=0; i<count; i++) {
-		pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, i);
+		GF_HintPacket *pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, i);
 		e = gf_isom_hint_pck_write(pck, bs);
 		if (e) return e;
 	}
@@ -260,8 +260,6 @@
 u32 gf_isom_hint_sample_size(GF_HintSample *ptr)
 {
 	u32 size, count, i;
-	GF_HintPacket *pck;
-
 	if (ptr->hint_subtype==GF_ISOM_BOX_TYPE_FDP_STSD) {
 		gf_isom_box_size((GF_Box*)ptr);
 		size = (u32) ptr->size;
@@ -269,7 +267,7 @@
 		size = 4;
 		count = gf_list_count(ptr->packetTable);
 		for (i=0; i<count; i++) {
-			pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, i);
+			GF_HintPacket *pck = (GF_HintPacket *)gf_list_get(ptr->packetTable, i);
 			size += gf_isom_hint_pck_size(pck);
 		}
 		size += ptr->dataLength;
@@ -425,7 +423,7 @@
 GF_GenericDTE *New_EmptyDTE()
 {
 	GF_EmptyDTE *dte = (GF_EmptyDTE *)gf_malloc(sizeof(GF_EmptyDTE));
-	dte->source = 0;
+	if (dte) dte->source = 0;
 	return (GF_GenericDTE *)dte;
 }
 
@@ -443,6 +441,7 @@
 GF_GenericDTE *New_SampleDTE()
 {
 	GF_SampleDTE *dte = (GF_SampleDTE *)gf_malloc(sizeof(GF_SampleDTE));
+	if (!dte) return NULL;
 	dte->source = 2;
 	//can be -1 in QT , so init at -2
 	dte->trackRefIndex = (s8) -2;
@@ -457,6 +456,7 @@
 GF_GenericDTE *New_StreamDescDTE()
 {
 	GF_StreamDescDTE *dte = (GF_StreamDescDTE *)gf_malloc(sizeof(GF_StreamDescDTE));
+	if (!dte) return NULL;
 	dte->source = 3;
 	dte->byteOffset = 0;
 	dte->dataLength = 0;
@@ -607,11 +607,11 @@
 
 GF_Err Write_ImmediateDTE(GF_ImmediateDTE *dte, GF_BitStream *bs)
 {
-	char data[14];
 	gf_bs_write_u8(bs, dte->source);
 	gf_bs_write_u8(bs, dte->dataLength);
 	gf_bs_write_data(bs, dte->data, dte->dataLength);
 	if (dte->dataLength < 14) {
+		char data[14];
 		memset(data, 0, 14);
 		gf_bs_write_data(bs, data, 14 - dte->dataLength);
 	}
@@ -691,10 +691,9 @@
 
 void gf_isom_hint_rtp_del(GF_RTPPacket *ptr)
 {
-	GF_GenericDTE *p;
 	//the DTE
 	while (gf_list_count(ptr->DataTable)) {
-		p = (GF_GenericDTE *)gf_list_get(ptr->DataTable, 0);
+		GF_GenericDTE *p = (GF_GenericDTE *)gf_list_get(ptr->DataTable, 0);
 		DelDTE(p);
 		gf_list_rem(ptr->DataTable, 0);
 	}
@@ -710,7 +709,6 @@
 	u8 hasTLV, type;
 	u16 i, count;
 	u32 TLVsize, tempSize;
-	GF_GenericDTE *dte;
 	GF_Box *a;
 
 	ptr->relativeTransTime = gf_bs_read_u32(bs);
@@ -745,6 +743,7 @@
 
 	//read the DTEs
 	for (i=0; i<count; i++) {
+		GF_GenericDTE *dte;
 		Bool add_it = 0;
 		type = gf_bs_read_u8(bs);
 		dte = NewDTE(type);
@@ -777,12 +776,11 @@
 GF_Err gf_isom_hint_rtp_offset(GF_RTPPacket *ptr, u32 offset, u32 HintSampleNumber)
 {
 	u32 count, i;
-	GF_GenericDTE *dte;
 	GF_Err e;
 
 	count = gf_list_count(ptr->DataTable);
 	for (i=0; i<count; i++) {
-		dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
+		GF_GenericDTE *dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
 		e = OffsetDTE(dte, offset, HintSampleNumber);
 		if (e) return e;
 	}
@@ -794,7 +792,6 @@
 u32 gf_isom_hint_rtp_length(GF_RTPPacket *ptr)
 {
 	u32 size, count, i;
-	GF_GenericDTE *dte;
 
 	//64 bit header
 	size = 8;
@@ -802,7 +799,7 @@
 	size += 4;
 	count = gf_list_count(ptr->DataTable);
 	for (i=0; i<count; i++) {
-		dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
+		GF_GenericDTE *dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
 		switch (dte->source) {
 		case 0:
 			break;
@@ -849,7 +846,6 @@
 	GF_Err e;
 	u32 TLVcount, DTEcount, i;
 	GF_Box none;
-	GF_GenericDTE *dte;
 
 	gf_bs_write_u32(bs, ptr->relativeTransTime);
 	//RTP Header
@@ -883,7 +879,7 @@
 	}
 	//write the DTE...
 	for (i = 0; i < DTEcount; i++) {
-		dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
+		GF_GenericDTE *dte = (GF_GenericDTE *)gf_list_get(ptr->DataTable, i);
 		e = WriteDTE(dte, bs);
 		if (e) return e;
 	}
@@ -924,6 +920,7 @@
 		return GF_ISOM_INVALID_MEDIA;
 	}
 	ptr->data = gf_malloc(sizeof(char) * ptr->length);
+	if (!ptr->data) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, ptr->data, ptr->length);
 	return GF_OK;
 }
@@ -958,7 +955,22 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_EXPORT
+
+
+#if 0 //unused
+
+/*small hint reader - performs data caching*/
+
+/*resets hint reading parameters, returns an error if the hint type is not supported for reading
+packet sequence number is always reseted to 0
+@sample_start: indicates from where the packets should be read (regular 1-based sample number)
+@ts_offset: constant offset for timestamps, must be expressed in media timescale (which is the hint timescale).
+	usually 0 (no offset)
+@sn_offset: offset for packet sequence number (first packet will have a SN of 1 + sn_offset)
+	usually 0
+@ssrc: sync source identifier for RTP
+*/
+
 GF_Err gf_isom_reset_hint_reader(GF_ISOFile *the_file, u32 trackNumber, u32 sample_start, u32 ts_offset, u32 sn_offset, u32 ssrc)
 {
 	GF_Err e;
@@ -1045,7 +1057,18 @@
 	return samp;
 }
 
-GF_EXPORT
+/*reads next hint packet. ALl packets are read in transmission (decoding) order
+returns an error if not supported, or GF_EOS when no more packets are available
+currently only RTP reader is supported
+@pck_data, @pck_size: output packet data (must be freed by caller) - contains all info to be sent
+	on the wire, eg for RTP contains the RTP header and the data
+@disposable (optional): indicates that the packet can be dropped when late (B-frames & co)
+@repeated (optional): indicates this is a repeated packet (same one has already been sent)
+@trans_ts (optional): indicates the transmission time of the packet, expressed in hint timescale, taking into account
+the ts_offset specified in gf_isom_reset_hint_reader. Depending on packets this may not be the same
+as the hint sample timestamp + ts_offset, some packets may need to be sent earlier (B-frames)
+@sample_num (optional): indicates hint sample number the packet belongs to
+*/
 GF_Err gf_isom_next_hint_packet(GF_ISOFile *the_file, u32 trackNumber, char **pck_data, u32 *pck_size, Bool *disposable, Bool *repeated, u32 *trans_ts, u32 *sample_num)
 {
 	GF_RTPPacket *pck;
@@ -1167,4 +1190,7 @@
 	return GF_OK;
 }
 
+#endif
+
+
 #endif /* !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_HINTING)*/

gpac-0.8.0.tar.gz/src/isomedia/iff.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,19 +29,19 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
-GF_Box *ispe_New()
+GF_Box *ispe_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ImageSpatialExtentsPropertyBox, GF_ISOM_BOX_TYPE_ISPE);
 	return (GF_Box *)tmp;
 }
 
-void ispe_del(GF_Box *a)
+void ispe_box_del(GF_Box *a)
 {
 	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox *)a;
 	gf_free(p);
 }
 
-GF_Err ispe_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ispe_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox *)s;
 
@@ -57,7 +57,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err ispe_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ispe_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox*)s;
@@ -71,7 +71,7 @@
 	return GF_OK;
 }
 
-GF_Err ispe_Size(GF_Box *s)
+GF_Err ispe_box_size(GF_Box *s)
 {
 	GF_ImageSpatialExtentsPropertyBox *p = (GF_ImageSpatialExtentsPropertyBox*)s;
 	if (p->version == 0 && p->flags == 0) {
@@ -85,110 +85,136 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *colr_New()
+GF_Box *colr_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ColourInformationBox, GF_ISOM_BOX_TYPE_COLR);
 	return (GF_Box *)tmp;
 }
 
-void colr_del(GF_Box *a)
+void colr_box_del(GF_Box *a)
 {
 	GF_ColourInformationBox *p = (GF_ColourInformationBox *)a;
 	if (p->opaque) gf_free(p->opaque);
 	gf_free(p);
 }
 
-GF_Err colr_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err colr_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ColourInformationBox *p = (GF_ColourInformationBox *)s;
 
-	p->colour_type = gf_bs_read_u32(bs);
-	p->size -= 4;
-	switch (p->colour_type) {
-	case GF_ISOM_SUBTYPE_NCLX:
-		p->colour_primaries = gf_bs_read_u16(bs);
-		p->transfer_characteristics = gf_bs_read_u16(bs);
-		p->matrix_coefficients = gf_bs_read_u16(bs);
-		p->full_range_flag = (gf_bs_read_u8(bs) & 0x80 ? GF_TRUE : GF_FALSE);
-		break;
-	case GF_ISOM_SUBTYPE_NCLC:
-		p->colour_primaries = gf_bs_read_u16(bs);
-		p->transfer_characteristics = gf_bs_read_u16(bs);
-		p->matrix_coefficients = gf_bs_read_u16(bs);
-		break;
-	default:
-		p->opaque = gf_malloc(sizeof(u8)*(size_t)p->size);
-		p->opaque_size = (u32) p->size;
-		gf_bs_read_data(bs, (char *) p->opaque, p->opaque_size);
-		break;
+	if (p->is_jp2) {
+		ISOM_DECREASE_SIZE(p, 3);
+		p->method = gf_bs_read_u8(bs);
+		p->precedence = gf_bs_read_u8(bs);
+		p->approx = gf_bs_read_u8(bs);
+		if (p->size) {
+			p->opaque = gf_malloc(sizeof(u8)*(size_t)p->size);
+			p->opaque_size = (u32) p->size;
+			gf_bs_read_data(bs, (char *) p->opaque, p->opaque_size);
+		}
+	} else {
+		ISOM_DECREASE_SIZE(p, 4);
+		p->colour_type = gf_bs_read_u32(bs);
+		switch (p->colour_type) {
+		case GF_ISOM_SUBTYPE_NCLX:
+			ISOM_DECREASE_SIZE(p, 7);
+			p->colour_primaries = gf_bs_read_u16(bs);
+			p->transfer_characteristics = gf_bs_read_u16(bs);
+			p->matrix_coefficients = gf_bs_read_u16(bs);
+			p->full_range_flag = (gf_bs_read_u8(bs) & 0x80) ? GF_TRUE : GF_FALSE;
+			break;
+		case GF_ISOM_SUBTYPE_NCLC:
+			ISOM_DECREASE_SIZE(p, 6);
+			p->colour_primaries = gf_bs_read_u16(bs);
+			p->transfer_characteristics = gf_bs_read_u16(bs);
+			p->matrix_coefficients = gf_bs_read_u16(bs);
+			break;
+		default:
+			p->opaque = gf_malloc(sizeof(u8)*(size_t)p->size);
+			p->opaque_size = (u32) p->size;
+			gf_bs_read_data(bs, (char *) p->opaque, p->opaque_size);
+			break;
+		}
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err colr_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err colr_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ColourInformationBox *p = (GF_ColourInformationBox*)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
 
-	switch (p->colour_type) {
-	case GF_ISOM_SUBTYPE_NCLX:
-		gf_bs_write_u32(bs, p->colour_type);
-		gf_bs_write_u16(bs, p->colour_primaries);
-		gf_bs_write_u16(bs, p->transfer_characteristics);
-		gf_bs_write_u16(bs, p->matrix_coefficients);
-		gf_bs_write_u8(bs, (p->full_range_flag == GF_TRUE ? 0x80 : 0));
-		break;
-	case GF_ISOM_SUBTYPE_NCLC:
-		gf_bs_write_u32(bs, p->colour_type);
-		gf_bs_write_u16(bs, p->colour_primaries);
-		gf_bs_write_u16(bs, p->transfer_characteristics);
-		gf_bs_write_u16(bs, p->matrix_coefficients);
-		break;
-	default:
-		gf_bs_write_u32(bs, p->colour_type);
-		gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
-		break;
+	if (p->is_jp2) {
+		gf_bs_write_u8(bs, p->method);
+		gf_bs_write_u8(bs, p->precedence);
+		gf_bs_write_u8(bs, p->approx);
+		if (p->opaque_size)
+			gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
+	} else {
+		switch (p->colour_type) {
+		case GF_ISOM_SUBTYPE_NCLX:
+			gf_bs_write_u32(bs, p->colour_type);
+			gf_bs_write_u16(bs, p->colour_primaries);
+			gf_bs_write_u16(bs, p->transfer_characteristics);
+			gf_bs_write_u16(bs, p->matrix_coefficients);
+			gf_bs_write_u8(bs, (p->full_range_flag == GF_TRUE ? 0x80 : 0));
+			break;
+		case GF_ISOM_SUBTYPE_NCLC:
+			gf_bs_write_u32(bs, p->colour_type);
+			gf_bs_write_u16(bs, p->colour_primaries);
+			gf_bs_write_u16(bs, p->transfer_characteristics);
+			gf_bs_write_u16(bs, p->matrix_coefficients);
+			break;
+		default:
+			gf_bs_write_u32(bs, p->colour_type);
+			gf_bs_write_data(bs, (char *)p->opaque, p->opaque_size);
+			break;
+		}
 	}
 	return GF_OK;
 }
 
-GF_Err colr_Size(GF_Box *s)
+GF_Err colr_box_size(GF_Box *s)
 {
 	GF_ColourInformationBox *p = (GF_ColourInformationBox*)s;
 
-	switch (p->colour_type) {
-	case GF_ISOM_SUBTYPE_NCLX:
-		p->size += 11;
-		break;
-	case GF_ISOM_SUBTYPE_NCLC:
-		p->size += 10;
-		break;
-	default:
-		p->size += 4 + p->opaque_size;
-		break;
+	if (p->is_jp2) {
+		p->size += 3 + p->opaque_size;
+	} else {
+		switch (p->colour_type) {
+		case GF_ISOM_SUBTYPE_NCLX:
+			p->size += 11;
+			break;
+		case GF_ISOM_SUBTYPE_NCLC:
+			p->size += 10;
+			break;
+		default:
+			p->size += 4 + p->opaque_size;
+			break;
+		}
 	}
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *pixi_New()
+GF_Box *pixi_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_PixelInformationPropertyBox, GF_ISOM_BOX_TYPE_PIXI);
 	return (GF_Box *)tmp;
 }
 
-void pixi_del(GF_Box *a)
+void pixi_box_del(GF_Box *a)
 {
 	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox *)a;
 	if (p->bits_per_channel) gf_free(p->bits_per_channel);
 	gf_free(p);
 }
 
-GF_Err pixi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err pixi_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox *)s;
@@ -197,6 +223,7 @@
 		p->num_channels = gf_bs_read_u8(bs);
 		p->bits_per_channel = (u8 *)gf_malloc(p->num_channels);
 		for (i = 0; i < p->num_channels; i++) {
+			ISOM_DECREASE_SIZE(p, 1)
 			p->bits_per_channel[i] = gf_bs_read_u8(bs);
 		}
 		return GF_OK;
@@ -208,7 +235,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err pixi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err pixi_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i;
 	GF_Err e;
@@ -225,7 +252,7 @@
 	return GF_OK;
 }
 
-GF_Err pixi_Size(GF_Box *s)
+GF_Err pixi_box_size(GF_Box *s)
 {
 	GF_PixelInformationPropertyBox *p = (GF_PixelInformationPropertyBox*)s;
 	if (p->version == 0 && p->flags == 0) {
@@ -239,19 +266,19 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *rloc_New()
+GF_Box *rloc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_RelativeLocationPropertyBox, GF_ISOM_BOX_TYPE_RLOC);
 	return (GF_Box *)tmp;
 }
 
-void rloc_del(GF_Box *a)
+void rloc_box_del(GF_Box *a)
 {
 	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox *)a;
 	gf_free(p);
 }
 
-GF_Err rloc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err rloc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox *)s;
 
@@ -267,7 +294,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err rloc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err rloc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox*)s;
@@ -281,7 +308,7 @@
 	return GF_OK;
 }
 
-GF_Err rloc_Size(GF_Box *s)
+GF_Err rloc_box_size(GF_Box *s)
 {
 	GF_RelativeLocationPropertyBox *p = (GF_RelativeLocationPropertyBox*)s;
 	if (p->version == 0 && p->flags == 0) {
@@ -295,19 +322,19 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *irot_New()
+GF_Box *irot_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ImageRotationBox, GF_ISOM_BOX_TYPE_IROT);
 	return (GF_Box *)tmp;
 }
 
-void irot_del(GF_Box *a)
+void irot_box_del(GF_Box *a)
 {
 	GF_ImageRotationBox *p = (GF_ImageRotationBox *)a;
 	gf_free(p);
 }
 
-GF_Err irot_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err irot_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ImageRotationBox *p = (GF_ImageRotationBox *)s;
 	p->angle = gf_bs_read_u8(bs) & 0x3;
@@ -315,7 +342,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err irot_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err irot_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ImageRotationBox *p = (GF_ImageRotationBox*)s;
@@ -325,7 +352,7 @@
 	return GF_OK;
 }
 
-GF_Err irot_Size(GF_Box *s)
+GF_Err irot_box_size(GF_Box *s)
 {
 	GF_ImageRotationBox *p = (GF_ImageRotationBox*)s;
 	p->size += 1;
@@ -334,147 +361,108 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *ipco_New()
+GF_Box *ipco_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ItemPropertyContainerBox, GF_ISOM_BOX_TYPE_IPCO);
-	tmp->other_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void ipco_del(GF_Box *s)
+void ipco_box_del(GF_Box *s)
 {
 	GF_ItemPropertyContainerBox *p = (GF_ItemPropertyContainerBox *)s;
 	gf_free(p);
 }
 
-GF_Err ipco_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ipco_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err ipco_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ipco_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	if (!s) return GF_BAD_PARAM;
 	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err ipco_Size(GF_Box *s)
+GF_Err ipco_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *iprp_New()
+GF_Box *iprp_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ItemPropertiesBox, GF_ISOM_BOX_TYPE_IPRP);
-	tmp->other_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void iprp_del(GF_Box *s)
+void iprp_box_del(GF_Box *s)
 {
-	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
-	if (p->property_container) gf_isom_box_del((GF_Box *)p->property_container);
-	if (p->property_association) gf_isom_box_del((GF_Box *)p->property_association);
-	gf_free(p);
+	gf_free(s);
 }
 
-static GF_Err iprp_AddBox(GF_Box *s, GF_Box *a)
+static GF_Err iprp_on_child_box(GF_Box *s, GF_Box *a)
 {
 	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_IPCO:
-		if (p->property_container) {
-			return GF_ISOM_INVALID_FILE;
-		}
+		if (p->property_container) ERROR_ON_DUPLICATED_BOX(a, p)
 		p->property_container = (GF_ItemPropertyContainerBox*)a;
 		break;
 	case GF_ISOM_BOX_TYPE_IPMA:
-		if (p->property_association) {
-			return GF_ISOM_INVALID_FILE;
-		}
+		if (p->property_association) ERROR_ON_DUPLICATED_BOX(a, p)
 		p->property_association = (GF_ItemPropertyAssociationBox*)a;
 		break;
 	default:
-		return gf_isom_box_add_default(s, a);
+		return GF_OK;
 	}
 	return GF_OK;
 }
 
-GF_Err iprp_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err iprp_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, iprp_AddBox);
+	return gf_isom_box_array_read(s, bs, iprp_on_child_box);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err iprp_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err iprp_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	if (p->property_container) {
-		e = gf_isom_box_write((GF_Box *) p->property_container, bs);
-		if (e) return e;
-	}
-	if (p->property_association) {
-		e = gf_isom_box_write((GF_Box *) p->property_association, bs);
-		if (e) return e;
-	}
-	return GF_OK;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err iprp_Size(GF_Box *s)
+GF_Err iprp_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_ItemPropertiesBox *p = (GF_ItemPropertiesBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	if (p->property_container) {
-		e = gf_isom_box_size((GF_Box *) p->property_container);
-		if (e) return e;
-		p->size += p->property_container->size;
-	}
-	if (p->property_association) {
-		e = gf_isom_box_size((GF_Box *) p->property_association);
-		if (e) return e;
-		p->size += p->property_association->size;
-	}
+	gf_isom_check_position(s, (GF_Box*)p->property_container, &pos);
+	gf_isom_check_position(s, (GF_Box*)p->property_association, &pos);
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *ipma_New()
+GF_Box *ipma_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ItemPropertyAssociationBox, GF_ISOM_BOX_TYPE_IPMA);
 	tmp->entries = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void ipma_del(GF_Box *a)
+void ipma_box_del(GF_Box *a)
 {
 	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox *)a;
 	if (p->entries) {
-		u32 i, j;
-		u32 count, count2;
+		u32 i;
+		u32 count;
 		count = gf_list_count(p->entries);
 
 		for (i = 0; i < count; i++) {
 			GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(p->entries, i);
 			if (entry) {
-				count2 = gf_list_count(entry->essential);
-				for (j = 0; j < count2; j++) {
-					Bool *essential = (Bool *)gf_list_get(entry->essential, j);
-					Bool *prop_index = (Bool *)gf_list_get(entry->property_index, j);
-					gf_free(essential);
-					gf_free(prop_index);
-				}
-				gf_list_del(entry->essential);
-				gf_list_del(entry->property_index);
+				gf_free(entry->associations);
 				gf_free(entry);
 			}
 		}
@@ -483,51 +471,50 @@
 	gf_free(p);
 }
 
-GF_Err ipma_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err ipma_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, j;
 	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox *)s;
-	u32 entry_count, association_count;
+	u32 entry_count;
 
+	ISOM_DECREASE_SIZE(p, 4)
 	entry_count = gf_bs_read_u32(bs);
 	for (i = 0; i < entry_count; i++) {
 		GF_ItemPropertyAssociationEntry *entry;
 		GF_SAFEALLOC(entry, GF_ItemPropertyAssociationEntry);
 		if (!entry) return GF_OUT_OF_MEM;
-		entry->essential = gf_list_new();
-		entry->property_index = gf_list_new();
 		gf_list_add(p->entries, entry);
 		if (p->version == 0) {
+			ISOM_DECREASE_SIZE(p, 3)
 			entry->item_id = gf_bs_read_u16(bs);
 		} else {
+			ISOM_DECREASE_SIZE(p, 5)
 			entry->item_id = gf_bs_read_u32(bs);
 		}
-		association_count = gf_bs_read_u8(bs);
-		for (j = 0; j < association_count; j++) {
-			Bool *ess = (Bool *)gf_malloc(sizeof(Bool));
-			u32 *prop_index = (u32 *)gf_malloc(sizeof(u32));
+		entry->nb_associations = gf_bs_read_u8(bs);
+		entry->associations = gf_malloc(sizeof(GF_ItemPropertyAssociationSlot) * entry->nb_associations);
+		if (!entry->associations) return GF_OUT_OF_MEM;
+		for (j = 0; j < entry->nb_associations; j++) {
 			if (p->flags & 1) {
 				u16 tmp = gf_bs_read_u16(bs);
-				*ess = (tmp >> 15 ? GF_TRUE: GF_FALSE);
-				*prop_index = (tmp & 0x7FFF);
+				entry->associations[j].essential = (tmp >> 15) ? GF_TRUE : GF_FALSE;
+				entry->associations[j].index = (tmp & 0x7FFF);
 			} else {
 				u8 tmp = gf_bs_read_u8(bs);
-				*ess = (tmp >> 7 ? GF_TRUE: GF_FALSE);
-				*prop_index = (tmp & 0x7F);
+				entry->associations[j].essential = (tmp >> 7) ? GF_TRUE : GF_FALSE;
+				entry->associations[j].index = (tmp & 0x7F);
 			}
-			gf_list_add(entry->essential, ess);
-			gf_list_add(entry->property_index, prop_index);
 		}
 	}
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err ipma_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err ipma_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, j;
 	GF_Err e;
-	u32 entry_count, association_count;
+	u32 entry_count;
 	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox*)s;
 
 	e = gf_isom_full_box_write(s, bs);
@@ -541,25 +528,22 @@
 		} else {
 			gf_bs_write_u32(bs, entry->item_id);
 		}
-		association_count = gf_list_count(entry->essential);
-		gf_bs_write_u8(bs, association_count);
-		for (j = 0; j < association_count; j++) {
-			Bool *ess = (Bool *)gf_list_get(entry->essential, j);
-			u32 *prop_index = (u32 *)gf_list_get(entry->property_index, j);
+		gf_bs_write_u8(bs, entry->nb_associations);
+		for (j = 0; j < entry->nb_associations; j++) {
 			if (p->flags & 1) {
-				gf_bs_write_u16(bs, (u16)( ( (*ess ? 1 : 0) << 15) | (*prop_index & 0x7F) ) );
+				gf_bs_write_u16(bs, (u16)( ( (entry->associations[j].essential ? 1 : 0) << 15) | (entry->associations[j].index & 0x7F) ) );
 			} else {
-				gf_bs_write_u8(bs, (u32)(( (*ess ? 1 : 0) << 7) | *prop_index));
+				gf_bs_write_u8(bs, (u32)(( (entry->associations[j].essential ? 1 : 0) << 7) | entry->associations[j].index));
 			}
 		}
 	}
 	return GF_OK;
 }
 
-GF_Err ipma_Size(GF_Box *s)
+GF_Err ipma_box_size(GF_Box *s)
 {
 	u32 i;
-	u32 entry_count, association_count;
+	u32 entry_count;
 	GF_ItemPropertyAssociationBox *p = (GF_ItemPropertyAssociationBox*)s;
 
 	entry_count = gf_list_count(p->entries);
@@ -572,11 +556,10 @@
 	p->size += entry_count;
 	for (i = 0; i < entry_count; i++) {
 		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(p->entries, i);
-		association_count = gf_list_count(entry->essential);
 		if (p->flags & 1) {
-			p->size += association_count * 2;
+			p->size += entry->nb_associations * 2;
 		} else {
-			p->size += association_count;
+			p->size += entry->nb_associations;
 		}
 	}
 	return GF_OK;
@@ -584,40 +567,39 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *grpl_New()
+GF_Box *grpl_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_GroupListBox, GF_ISOM_BOX_TYPE_GRPL);
-	tmp->other_boxes = gf_list_new();
 	return (GF_Box *)tmp;
 }
 
-void grpl_del(GF_Box *s)
+void grpl_box_del(GF_Box *s)
 {
 	GF_GroupListBox *p = (GF_GroupListBox *)s;
 	gf_free(p);
 }
 
-GF_Err grpl_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err grpl_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read_ex(s, bs, gf_isom_box_add_default, s->type);
+	return gf_isom_box_array_read_ex(s, bs, NULL, s->type);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err grpl_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err grpl_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	if (!s) return GF_BAD_PARAM;
 	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err grpl_Size(GF_Box *s)
+GF_Err grpl_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-void grptype_del(GF_Box *s)
+void grptype_box_del(GF_Box *s)
 {
 	GF_EntityToGroupTypeBox *ptr = (GF_EntityToGroupTypeBox *)s;
 	if (!ptr) return;
@@ -626,17 +608,15 @@
 }
 
 
-GF_Err grptype_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err grptype_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	u32 bytesToRead;
 	u32 i;
 	GF_EntityToGroupTypeBox *ptr = (GF_EntityToGroupTypeBox *)s;
 
-	bytesToRead = (u32) (ptr->size);
-	if (!bytesToRead) return GF_OK;
+	ISOM_DECREASE_SIZE(ptr, 8)
 	ptr->group_id = gf_bs_read_u32(bs);
 	ptr->entity_id_count = gf_bs_read_u32(bs);
-	ISOM_DECREASE_SIZE(ptr, 8)
+
 	if (ptr->entity_id_count*4 > ptr->size) return GF_ISOM_INVALID_FILE;
 
 	ptr->entity_ids = (u32 *) gf_malloc(ptr->entity_id_count * sizeof(u32));
@@ -648,7 +628,7 @@
 	return GF_OK;
 }
 
-GF_Box *grptype_New()
+GF_Box *grptype_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_EntityToGroupTypeBox, GF_ISOM_BOX_TYPE_GRPT);
 	//the group type code is assign in gf_isom_box_parse_ex
@@ -657,7 +637,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err grptype_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err grptype_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	u32 i;
@@ -677,7 +657,7 @@
 }
 
 
-GF_Err grptype_Size(GF_Box *s)
+GF_Err grptype_box_size(GF_Box *s)
 {
 	GF_EntityToGroupTypeBox *ptr = (GF_EntityToGroupTypeBox *)s;
 	ptr->size += 8 + 4*ptr->entity_id_count;
@@ -687,13 +667,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *auxc_New()
+GF_Box *auxc_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AuxiliaryTypePropertyBox, GF_ISOM_BOX_TYPE_AUXC);
 	return (GF_Box *)tmp;
 }
 
-void auxc_del(GF_Box *a)
+void auxc_box_del(GF_Box *a)
 {
 	GF_AuxiliaryTypePropertyBox *p = (GF_AuxiliaryTypePropertyBox *)a;
 	if (p->aux_urn) gf_free(p->aux_urn);
@@ -701,7 +681,7 @@
 	gf_free(p);
 }
 
-GF_Err auxc_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err auxc_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AuxiliaryTypePropertyBox *p = (GF_AuxiliaryTypePropertyBox *)s;
 	GF_Err e;
@@ -715,7 +695,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err auxc_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err auxc_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AuxiliaryTypePropertyBox *p = (GF_AuxiliaryTypePropertyBox*)s;
@@ -723,22 +703,24 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	//with terminating 0
-	gf_bs_write_data(bs, p->aux_urn, (u32) strlen(p->aux_urn) + 1 );
+    if (p->aux_urn)
+        gf_bs_write_data(bs, p->aux_urn, (u32) strlen(p->aux_urn) );
+    gf_bs_write_u8(bs, 0);
 	gf_bs_write_data(bs, p->data, p->data_size);
 
 	return GF_OK;
 }
 
-GF_Err auxc_Size(GF_Box *s)
+GF_Err auxc_box_size(GF_Box *s)
 {
 	GF_AuxiliaryTypePropertyBox *p = (GF_AuxiliaryTypePropertyBox*)s;
-	p->size += strlen(p->aux_urn) + 1 + p->data_size;
+    p->size += (p->aux_urn ? strlen(p->aux_urn) : 0) + 1 + p->data_size;
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-void auxi_del(GF_Box *s)
+void auxi_box_del(GF_Box *s)
 {
 	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
 	if (ptr->aux_track_type) gf_free(ptr->aux_track_type);
@@ -746,13 +728,13 @@
 	return;
 }
 
-GF_Err auxi_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err auxi_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
 	return gf_isom_read_null_terminated_string(s, bs, s->size, &ptr->aux_track_type);
 }
 
-GF_Box *auxi_New()
+GF_Box *auxi_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_AuxiliaryTypeInfoBox, GF_ISOM_BOX_TYPE_AUXI);
 	return (GF_Box *) tmp;
@@ -760,7 +742,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err auxi_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err auxi_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
@@ -768,40 +750,42 @@
 	e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
 	//with terminating 0
-	gf_bs_write_data(bs, ptr->aux_track_type, (u32) strlen(ptr->aux_track_type) + 1 );
+    if (ptr->aux_track_type)
+        gf_bs_write_data(bs, ptr->aux_track_type, (u32) strlen(ptr->aux_track_type) );
+    gf_bs_write_u8(bs, 0);
 	return GF_OK;
 }
 
-GF_Err auxi_Size(GF_Box *s)
+GF_Err auxi_box_size(GF_Box *s)
 {
 	GF_AuxiliaryTypeInfoBox *ptr = (GF_AuxiliaryTypeInfoBox *)s;
-	ptr->size += strlen(ptr->aux_track_type) + 1;
+    ptr->size += (ptr->aux_track_type ? strlen(ptr->aux_track_type) : 0 )+ 1;
 	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
-GF_Box *oinf_New()
+GF_Box *oinf_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_OINFPropertyBox, GF_ISOM_BOX_TYPE_OINF);
 	tmp->oinf = gf_isom_oinf_new_entry();
 	return (GF_Box *)tmp;
 }
 
-void oinf_del(GF_Box *a)
+void oinf_box_del(GF_Box *a)
 {
 	GF_OINFPropertyBox *p = (GF_OINFPropertyBox *)a;
 	if (p->oinf) gf_isom_oinf_del_entry(p->oinf);
 	gf_free(p);
 }
 
-GF_Err oinf_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err oinf_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_OINFPropertyBox *p = (GF_OINFPropertyBox *)s;
 	return gf_isom_oinf_read_entry(p->oinf, bs);
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err oinf_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err oinf_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_OINFPropertyBox *p = (GF_OINFPropertyBox*)s;
@@ -811,7 +795,7 @@
 	return gf_isom_oinf_write_entry(p->oinf, bs);
 }
 
-GF_Err oinf_Size(GF_Box *s)
+GF_Err oinf_box_size(GF_Box *s)
 {
 	GF_OINFPropertyBox *p = (GF_OINFPropertyBox*)s;
 	if (!p->oinf) return GF_BAD_PARAM;
@@ -821,18 +805,18 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
-GF_Box *tols_New()
+GF_Box *tols_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_TargetOLSPropertyBox, GF_ISOM_BOX_TYPE_TOLS);
 	return (GF_Box *)tmp;
 }
 
-void tols_del(GF_Box *a)
+void tols_box_del(GF_Box *a)
 {
 	gf_free(a);
 }
 
-GF_Err tols_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err tols_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_TargetOLSPropertyBox *p = (GF_TargetOLSPropertyBox *)s;
 
@@ -842,7 +826,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err tols_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err tols_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_TargetOLSPropertyBox *p = (GF_TargetOLSPropertyBox*)s;
@@ -853,7 +837,7 @@
 	return GF_OK;
 }
 
-GF_Err tols_Size(GF_Box *s)
+GF_Err tols_box_size(GF_Box *s)
 {
 	GF_TargetOLSPropertyBox *p = (GF_TargetOLSPropertyBox*)s;
 	p->size += 2;
@@ -863,40 +847,41 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *clli_New()
+GF_Box *clli_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_ContentLightLevelBox, GF_ISOM_BOX_TYPE_CLLI);
 	return (GF_Box *)tmp;
 }
 
-void clli_del(GF_Box *a)
+void clli_box_del(GF_Box *a)
 {
 	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox *)a;
 	gf_free(p);
 }
 
-GF_Err clli_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err clli_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox *)s;
-	p->max_content_light_level = gf_bs_read_u16(bs);
-	p->max_pic_average_light_level = gf_bs_read_u16(bs);
+	ISOM_DECREASE_SIZE(p, 4)
+	p->clli.max_content_light_level = gf_bs_read_u16(bs);
+	p->clli.max_pic_average_light_level = gf_bs_read_u16(bs);
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err clli_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err clli_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox*)s;
 	e = gf_isom_box_write_header(s, bs);
 	if (e) return e;
-	gf_bs_write_u16(bs, p->max_content_light_level);
-	gf_bs_write_u16(bs, p->max_pic_average_light_level);
+	gf_bs_write_u16(bs, p->clli.max_content_light_level);
+	gf_bs_write_u16(bs, p->clli.max_pic_average_light_level);
 	return GF_OK;
 }
 
-GF_Err clli_Size(GF_Box *s)
+GF_Err clli_box_size(GF_Box *s)
 {
 	GF_ContentLightLevelBox *p = (GF_ContentLightLevelBox*)s;
 	p->size += 4;
@@ -906,37 +891,38 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
-GF_Box *mdcv_New()
+GF_Box *mdcv_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_MasteringDisplayColourVolumeBox, GF_ISOM_BOX_TYPE_MDCV);
 	return (GF_Box *)tmp;
 }
 
-void mdcv_del(GF_Box *a)
+void mdcv_box_del(GF_Box *a)
 {
 	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox *)a;
 	gf_free(p);
 }
 
-GF_Err mdcv_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err mdcv_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	int c = 0;
 	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox *)s;
+	ISOM_DECREASE_SIZE(p, 24)
 	for (c = 0; c<3; c++) {
-		p->display_primaries[c].x = gf_bs_read_u16(bs);
-		p->display_primaries[c].y = gf_bs_read_u16(bs);
+		p->mdcv.display_primaries[c].x = gf_bs_read_u16(bs);
+		p->mdcv.display_primaries[c].y = gf_bs_read_u16(bs);
 	}
-	p->white_point_x = gf_bs_read_u16(bs);
-	p->white_point_y = gf_bs_read_u16(bs);
-	p->max_display_mastering_luminance = gf_bs_read_u32(bs);
-	p->min_display_mastering_luminance = gf_bs_read_u32(bs);
+	p->mdcv.white_point_x = gf_bs_read_u16(bs);
+	p->mdcv.white_point_y = gf_bs_read_u16(bs);
+	p->mdcv.max_display_mastering_luminance = gf_bs_read_u32(bs);
+	p->mdcv.min_display_mastering_luminance = gf_bs_read_u32(bs);
 
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err mdcv_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err mdcv_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	int c = 0;
 	GF_Err e;
@@ -945,18 +931,18 @@
 	if (e) return e;
 
 	for (c = 0; c<3; c++) {
-		gf_bs_write_u16(bs, p->display_primaries[c].x);
-		gf_bs_write_u16(bs, p->display_primaries[c].y);
+		gf_bs_write_u16(bs, p->mdcv.display_primaries[c].x);
+		gf_bs_write_u16(bs, p->mdcv.display_primaries[c].y);
 	}
-	gf_bs_write_u16(bs, p->white_point_x);
-	gf_bs_write_u16(bs, p->white_point_y);
-	gf_bs_write_u32(bs, p->max_display_mastering_luminance);
-	gf_bs_write_u32(bs, p->min_display_mastering_luminance);
+	gf_bs_write_u16(bs, p->mdcv.white_point_x);
+	gf_bs_write_u16(bs, p->mdcv.white_point_y);
+	gf_bs_write_u32(bs, p->mdcv.max_display_mastering_luminance);
+	gf_bs_write_u32(bs, p->mdcv.min_display_mastering_luminance);
 	
 	return GF_OK;
 }
 
-GF_Err mdcv_Size(GF_Box *s)
+GF_Err mdcv_box_size(GF_Box *s)
 {
 	GF_MasteringDisplayColourVolumeBox *p = (GF_MasteringDisplayColourVolumeBox*)s;
 	p->size += 24;
@@ -967,8 +953,8 @@
 
 
 
-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) {
+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;
@@ -994,11 +980,13 @@
 		GF_List *tile_item_ids;
 		char sz_item_name[256];
 		GF_TileItemMode orig_tile_mode;
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
+#ifndef GPAC_DISABLE_AV_PARSERS
 		e = gf_media_split_hevc_tiles(movie, 0);
 #else
 		e = GF_NOT_SUPPORTED;
 #endif
+
 		if (e) return e;
 		tile_item_ids = gf_list_new();
 		orig_tile_mode = image_props->tile_mode;
@@ -1006,6 +994,8 @@
 		count = gf_isom_get_reference_count(movie, imported_track, GF_ISOM_REF_SABT);
 		for (i = 0; i < count; i++) {
 			u32 *tile_item_id = gf_malloc(sizeof(u32));
+			if (!tile_item_id) return GF_OUT_OF_MEM;
+
 			*tile_item_id = item_id + i+1;
 			gf_list_add(tile_item_ids, tile_item_id);
 			e = gf_isom_get_reference(movie, imported_track, GF_ISOM_REF_SABT, 1, &tile_track);
@@ -1035,157 +1025,203 @@
 		gf_list_del(tile_item_ids);
 		return GF_OK;
 	}
-	else {
-		/* 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);
-		switch (subtype) {
-		case GF_ISOM_SUBTYPE_AVC_H264:
-		case GF_ISOM_SUBTYPE_AVC2_H264:
-		case GF_ISOM_SUBTYPE_AVC3_H264:
-		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);
-			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_avc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_ISOM_SUBTYPE_AVC_H264;
-			config_needed = 1;
-			num_channels = 3;
-			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
-			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			break;
-		case GF_ISOM_SUBTYPE_SVC_H264:
-			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_SVCC);
-			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_svc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_ISOM_SUBTYPE_SVC_H264;
-			config_needed = 1;
-			num_channels = 3;
-			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
-			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			break;
-		case GF_ISOM_SUBTYPE_MVC_H264:
-			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_MVCC);
-			((GF_AVCConfigurationBox *)config_box)->config = gf_isom_mvc_config_get(movie, imported_track, imported_sample_desc_index);
-			item_type = GF_ISOM_SUBTYPE_MVC_H264;
-			config_needed = 1;
-			num_channels = 3;
-			bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
-			bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			break;
-		case GF_ISOM_SUBTYPE_HVC1:
-		case GF_ISOM_SUBTYPE_HEV1:
-		case GF_ISOM_SUBTYPE_HVC2:
-		case GF_ISOM_SUBTYPE_HEV2:
-		case GF_ISOM_SUBTYPE_HVT1:
-		case GF_ISOM_SUBTYPE_LHV1:
-		case GF_ISOM_SUBTYPE_LHE1:
-			config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
-			((GF_HEVCConfigurationBox *)config_box)->config = gf_isom_hevc_config_get(movie, imported_track, imported_sample_desc_index);
-			if (subtype == GF_ISOM_SUBTYPE_HVT1) {
-				item_type = GF_ISOM_SUBTYPE_HVT1;
-			}
-			else {
-				item_type = GF_ISOM_SUBTYPE_HVC1;
-			}
-			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);
-				item_type = GF_ISOM_SUBTYPE_LHV1;
-			}
-			num_channels = 3;
-			bits_per_channel[0] = ((GF_HEVCConfigurationBox *)config_box)->config->luma_bit_depth;
-			bits_per_channel[1] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			bits_per_channel[2] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
-			//media_brand = GF_ISOM_BRAND_HEIC;
-			break;
-		case GF_ISOM_SUBTYPE_AV01:
-			{
-				config_box = gf_isom_box_new(GF_ISOM_BOX_TYPE_AV1C);
-				((GF_AV1ConfigurationBox *)config_box)->config = gf_isom_av1_config_get(movie, imported_track, imported_sample_desc_index);
-				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;
-				if (((GF_AV1ConfigurationBox *)config_box)->config->monochrome) {
-					num_channels = 1;
-					bits_per_channel[0] = depth;
-					bits_per_channel[1] = 0;
-					bits_per_channel[2] = 0;
-				} else {
-					num_channels = 3;
-					bits_per_channel[0] = depth;
-					bits_per_channel[1] = depth;
-					bits_per_channel[2] = depth;
-				}
-				//media_brand = GF_ISOM_BRAND_AVIF;
-			}
-			break;
-		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec not supported to create HEIF image items\n"));
-			return GF_NOT_SUPPORTED;
-		}
-		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;
-		}
-		/* Get some images properties from the track data */
-		e = gf_isom_get_visual_info(movie, imported_track, imported_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;
-		}
-		e = gf_isom_get_pixel_aspect_ratio(movie, imported_track, imported_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));
+
+import_next_sample:
+
+	/* 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);
+	switch (subtype) {
+	case GF_ISOM_SUBTYPE_AVC_H264:
+	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	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;
+		item_type = GF_ISOM_SUBTYPE_AVC_H264;
+		config_needed = 1;
+		num_channels = 3;
+		bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+		bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		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;
+		item_type = GF_ISOM_SUBTYPE_SVC_H264;
+		config_needed = 1;
+		num_channels = 3;
+		bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+		bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		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;
+		item_type = GF_ISOM_SUBTYPE_MVC_H264;
+		config_needed = 1;
+		num_channels = 3;
+		bits_per_channel[0] = ((GF_AVCConfigurationBox *)config_box)->config->luma_bit_depth;
+		bits_per_channel[1] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		bits_per_channel[2] = ((GF_AVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		break;
+	case GF_ISOM_SUBTYPE_HVC1:
+	case GF_ISOM_SUBTYPE_HEV1:
+	case GF_ISOM_SUBTYPE_HVC2:
+	case GF_ISOM_SUBTYPE_HEV2:
+	case GF_ISOM_SUBTYPE_HVT1:
+	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 (subtype == GF_ISOM_SUBTYPE_HVT1) {
+			item_type = GF_ISOM_SUBTYPE_HVT1;
 		}
-		if (!image_props->width && !image_props->height) {
-			image_props->width = w;
-			image_props->height = h;
+		else {
+			item_type = GF_ISOM_SUBTYPE_HVC1;
 		}
-		if (!image_props->hSpacing && !image_props->vSpacing) {
-			image_props->hSpacing = hSpacing;
-			image_props->vSpacing = vSpacing;
+		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;
+			item_type = GF_ISOM_SUBTYPE_LHV1;
 		}
-		image_props->config = config_box;
-		if (!image_props->num_channels) {
-			image_props->num_channels = num_channels;
-			image_props->bits_per_channel[0] = bits_per_channel[0];
-			image_props->bits_per_channel[1] = bits_per_channel[1];
-			image_props->bits_per_channel[2] = bits_per_channel[2];
+		num_channels = 3;
+		bits_per_channel[0] = ((GF_HEVCConfigurationBox *)config_box)->config->luma_bit_depth;
+		bits_per_channel[1] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		bits_per_channel[2] = ((GF_HEVCConfigurationBox *)config_box)->config->chroma_bit_depth;
+		//media_brand = GF_ISOM_BRAND_HEIC;
+		break;
+	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;
+			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;
+			if (((GF_AV1ConfigurationBox *)config_box)->config->monochrome) {
+				num_channels = 1;
+				bits_per_channel[0] = depth;
+				bits_per_channel[1] = 0;
+				bits_per_channel[2] = 0;
+			} else {
+				num_channels = 3;
+				bits_per_channel[0] = depth;
+				bits_per_channel[1] = depth;
+				bits_per_channel[2] = depth;
+			}
+			//media_brand = GF_ISOM_BRAND_AVIF;
 		}
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: Codec not supported to create HEIF image items\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	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;
+	}
+	/* Get some images properties from the track data */
+	e = gf_isom_get_visual_info(movie, imported_track, imported_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;
+	}
+	e = gf_isom_get_pixel_aspect_ratio(movie, imported_track, imported_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));
+	}
+	if (!image_props->width && !image_props->height) {
+		image_props->width = w;
+		image_props->height = h;
+	}
+	if (!image_props->hSpacing && !image_props->vSpacing) {
+		image_props->hSpacing = hSpacing;
+		image_props->vSpacing = vSpacing;
+	}
+	image_props->config = config_box;
+	if (!image_props->num_channels) {
+		image_props->num_channels = num_channels;
+		image_props->bits_per_channel[0] = bits_per_channel[0];
+		image_props->bits_per_channel[1] = bits_per_channel[1];
+		image_props->bits_per_channel[2] = bits_per_channel[2];
+	}
 
-		timescale = gf_isom_get_media_timescale(movie, imported_track);
-		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);
-		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 (e || !sample || !sample->IsRAP) {
+	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);
+	}
+	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 (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));
+		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error no sync sample found after time %g\n", image_props->time));
-			if (sample) gf_isom_sample_del(&sample);
-			if (config_box) gf_isom_box_del(config_box);
-			return GF_BAD_PARAM;
 		}
-		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);
-
-		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, 1);
-		//}
-		gf_isom_sample_del(&sample);
+		if (sample) gf_isom_sample_del(&sample);
 		if (config_box) gf_isom_box_del(config_box);
-		return e;
+		return GF_BAD_PARAM;
+	}
+
+	if (!item_id) {
+		e = gf_isom_meta_get_next_item_id(movie, root_meta, meta_track_number, &item_id);
+		if (e) return e;
+	}
+
+	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);
+
+	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->time<0) {
+		if (sample_number >= gf_isom_get_sample_count(movie, imported_track)) return e;
+		sample_number++;
+		item_id=0;
+		//avoid recursion this could get quite big
+		goto import_next_sample;
 	}
+	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+
 }
 
+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)
+{
+
+ 	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-0.8.0.tar.gz/src/isomedia/isom_intern.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -31,11 +31,9 @@
 /**************************************************************
 		Some Local functions for movie creation
 **************************************************************/
-GF_Err gf_isom_parse_root_box(GF_Box **outBox, GF_BitStream *bs, u64 *bytesExpected, Bool progressive_mode);
+GF_Err gf_isom_parse_root_box(GF_Box **outBox, GF_BitStream *bs, u32 *boxType, u64 *bytesExpected, Bool progressive_mode);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, u64 *cumulated_offset, Bool is_first_merge);
-
 GF_Err MergeFragment(GF_MovieFragmentBox *moof, GF_ISOFile *mov)
 {
 	GF_Err e;
@@ -52,14 +50,18 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error: %s not received before merging fragment\n", mov->moov ? "mvex" : "moov" ));
 		return GF_ISOM_INVALID_FILE;
 	}
-	//and all fragments must be continous - we do not throw an error as we may still want to be able to concatenate dependent representations in DASH and
-	//we will likely a-have R1(moofSN 1, 3, 5, 7) plus R2(moofSN 2, 4, 6, 8)
+	//and all fragments should be continous but:
+	//- dash with dependent representations may likely give R1(moofSN 1, 3, 5, 7) plus R2(moofSN 2, 4, 6, 8)
+	//- smooth muxed in a single file may end up with V(1),A(1), V(2),A(2) ...
+	//we do not throw an error if not as we may still want to be able to concatenate dependent representations in DASH and
 	if (mov->NextMoofNumber && moof->mfhd && (mov->NextMoofNumber >= moof->mfhd->sequence_number)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: wrong sequence number: got %d but last one was %d\n", moof->mfhd->sequence_number, mov->NextMoofNumber));
-//		return GF_ISOM_INVALID_FILE;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[iso file] wrong sequence number: got %d but last one was %d\n", moof->mfhd->sequence_number, mov->NextMoofNumber));
 	}
 
 	base_data_offset = mov->current_top_box_start;
+	if (moof->compressed_diff)
+		base_data_offset -= moof->compressed_diff;
+
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(moof->TrackList, &i))) {
 		if (!traf->tfhd) {
@@ -84,7 +86,7 @@
 			return GF_ISOM_INVALID_FILE;
 		}
 
-		e = MergeTrack(trak, traf, mov->current_top_box_start, &base_data_offset, !trak->first_traf_merged);
+		e = MergeTrack(trak, traf, moof, mov->current_top_box_start, moof->compressed_diff, &base_data_offset, !trak->first_traf_merged);
 		if (e) return e;
 
 		trak->present_in_scalable_segment = 1;
@@ -94,30 +96,33 @@
 		if (trak->Header->duration > MaxDur)
 			MaxDur = trak->Header->duration;
 
-		trak->first_traf_merged = 1;
+		trak->first_traf_merged = GF_TRUE;
 	}
 
-	if (moof->other_boxes) {
+	if (moof->child_boxes) {
 		GF_Box *a;
 		i = 0;
-		while ((a = (GF_Box *)gf_list_enum(moof->other_boxes, &i))) {
+		while ((a = (GF_Box *)gf_list_enum(moof->child_boxes, &i))) {
 			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
-				GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PSSH);
+				GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new_parent(&mov->moov->child_boxes, GF_ISOM_BOX_TYPE_PSSH);
+				if (!pssh) return GF_OUT_OF_MEM;
 				memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
-				pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
-				pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-				memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+				if (((GF_ProtectionSystemHeaderBox *)a)->KIDs && ((GF_ProtectionSystemHeaderBox *)a)->KID_count > 0) {
+					pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
+					pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+					if (!pssh->KIDs) return GF_OUT_OF_MEM;
+
+					memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+				}
 				pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
 				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);
-
-				if (!mov->moov->other_boxes) mov->moov->other_boxes = gf_list_new();
-				gf_list_add(mov->moov->other_boxes, pssh);
 			}
 		}
 	}
 
-	mov->NextMoofNumber = moof->mfhd->sequence_number;
+	mov->NextMoofNumber = moof->mfhd ? moof->mfhd->sequence_number : 0;
 	//update movie duration
 	if (mov->moov->mvhd->duration < MaxDur) mov->moov->mvhd->duration = MaxDur;
 	return GF_OK;
@@ -130,8 +135,13 @@
 	if (gf_list_count(mov->moov->trackList) == 1 && gf_list_count(mov->moof->TrackList) == 1) {
 		GF_TrackFragmentBox *traf = (GF_TrackFragmentBox*)gf_list_get(mov->moof->TrackList, 0);
 		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(mov->moov->trackList, 0);
+		if (!traf->tfhd || !trak->Header) return;
 		if ((traf->tfhd->trackID != trak->Header->trackID)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: trackID of MOOF/TRAF(%u) is not the same as MOOV/TRAK(%u). Trying to fix.\n", traf->tfhd->trackID, trak->Header->trackID));
+			if (!mov->is_smooth) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: trackID of MOOF/TRAF(%u) is not the same as MOOV/TRAK(%u). Trying to fix.\n", traf->tfhd->trackID, trak->Header->trackID));
+			} else {
+				trak->Header->trackID = traf->tfhd->trackID;
+			}
 			traf->tfhd->trackID = trak->Header->trackID;
 		}
 	}
@@ -170,15 +180,53 @@
 			if (sample_index < traf->sdtp->sampleCount) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error: TRAF box of track id=%u list less samples than SDTP.\n", traf->tfhd->trackID));
 			}
-			gf_isom_box_del((GF_Box*)traf->sdtp);
+			gf_isom_box_del_parent(&traf->child_boxes, (GF_Box*)traf->sdtp);
 			traf->sdtp = NULL;
 		}
 	}
 }
 
+void gf_isom_push_mdat_end(GF_ISOFile *mov, u64 mdat_end)
+{
+	u32 i, count = gf_list_count(mov->moov->trackList);
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_TrafToSampleMap *traf_map;
+		GF_TrackBox *trak = gf_list_get(mov->moov->trackList, i);
+		if (!trak->Media->information->sampleTable->traf_map) continue;
+
+		traf_map = trak->Media->information->sampleTable->traf_map;
+		for (j=traf_map->nb_entries; j>0; j--) {
+			if (!traf_map->frag_starts[j-1].mdat_end) {
+				traf_map->frag_starts[j-1].mdat_end = mdat_end;
+				break;
+			}
+		}
+	}
+}
+
+void gf_isom_setup_traf_inheritance(GF_ISOFile *mov)
+{
+	u32 i, count;
+	if (!mov->moov->mvex)
+		return;
+	count = gf_list_count(mov->moov->trackList);
+
+	for (i=0; i<count; i++) {
+		u32 refTrackNum=0;
+		gf_isom_get_reference(mov, i+1, GF_ISOM_REF_TRIN, 1, &refTrackNum);
+		if (refTrackNum) {
+			GF_ISOTrackID tkid = gf_isom_get_track_id(mov, i+1);
+			GF_ISOTrackID reftkid = gf_isom_get_track_id(mov, refTrackNum);
+			GF_TrackExtendsBox *trex = GetTrex(mov->moov, tkid);
+			if (trex) trex->inherit_from_traf_id = reftkid;
+		}
+	}
+}
+
 #endif
 
-GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u64 *bytesMissing, Bool progressive_mode)
+GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u32 *boxType, u64 *bytesMissing, Bool progressive_mode)
 {
 	GF_Box *a;
 	u64 totSize;
@@ -191,7 +239,11 @@
 
 	/*restart from where we stopped last*/
 	totSize = mov->current_top_box_start;
-	gf_bs_seek(mov->movieFileMap->bs, mov->current_top_box_start);
+	if (mov->bytes_removed) {
+		assert(totSize >= mov->bytes_removed);
+		totSize -= mov->bytes_removed;
+	}
+	gf_bs_seek(mov->movieFileMap->bs, totSize);
 #endif
 
 
@@ -199,11 +251,11 @@
 	while (gf_bs_available(mov->movieFileMap->bs)) {
 		*bytesMissing = 0;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs);
+		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));
 #endif
 
-		e = gf_isom_parse_root_box(&a, mov->movieFileMap->bs, bytesMissing, progressive_mode);
+		e = gf_isom_parse_root_box(&a, mov->movieFileMap->bs, boxType, bytesMissing, progressive_mode);
 
 		if (e >= 0) {
 
@@ -227,6 +279,7 @@
 		case GF_ISOM_BOX_TYPE_MOOV:
 			if (mov->moov) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate MOOV detected!\n"));
+				gf_isom_box_del(a);
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->moov = (GF_MovieBox *)a;
@@ -234,14 +287,23 @@
 			mov->moov->mov = mov;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			if (mov->moov->mvex) mov->moov->mvex->mov = mov;
+
+			if (! (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
+				gf_isom_setup_traf_inheritance(mov);
+			}
 #endif
 			e = gf_list_add(mov->TopBoxes, a);
 			if (e) return e;
 
 			totSize += a->size;
 
+            if (!mov->moov->mvhd) {
+                GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MovieHeaderBox\n"));
+                return GF_ISOM_INVALID_FILE;
+            }
+
 			//dump senc info in dump mode
-			if (mov->dump_mode_alloc) {
+			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				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);
@@ -252,12 +314,14 @@
 					}
 				}
 			}
+
 			break;
 
 		/*META box*/
 		case GF_ISOM_BOX_TYPE_META:
 			if (mov->meta) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate META detected!\n"));
+				gf_isom_box_del(a);
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->meta = (GF_MetaBox *)a;
@@ -282,14 +346,20 @@
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 				else if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) gf_list_add(mov->TopBoxes, a);
 #endif
-				else gf_isom_box_del(a);
+				else gf_isom_box_del(a); //in other modes we don't care
+
+
+				if (mov->signal_frag_bounds && !(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) ) {
+					gf_isom_push_mdat_end(mov, gf_bs_get_position(mov->movieFileMap->bs) );
+				}
 			}
 			/*if we don't have any MDAT yet, create one (edit-write mode)
 			We only work with one mdat, but we're puting it at the place
 			of the first mdat found when opening a file for editing*/
-			else if (!mov->mdat && (mov->openMode != GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_CAT_FRAGMENTS)) {
+			else if (!mov->mdat && (mov->openMode != GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_KEEP_FRAGMENTS)) {
 				gf_isom_box_del(a);
 				mov->mdat = (GF_MediaDataBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDAT);
+				if (!mov->mdat) return GF_OUT_OF_MEM;
 				e = gf_list_add(mov->TopBoxes, mov->mdat);
 				if (e) {
 					return e;
@@ -328,7 +398,7 @@
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		case GF_ISOM_BOX_TYPE_STYP:
 		{
-			u32 brand = ((GF_SegmentTypeBox *)a)->majorBrand;
+			u32 brand = ((GF_FileTypeBox *)a)->majorBrand;
 			switch (brand) {
 			case GF_ISOM_BRAND_SISX:
 			case GF_ISOM_BRAND_RISX:
@@ -347,6 +417,31 @@
 			if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) {
 				e = gf_list_add(mov->TopBoxes, a);
 				if (e) return e;
+			} else if (mov->signal_frag_bounds && !(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)  && (mov->openMode!=GF_ISOM_OPEN_KEEP_FRAGMENTS)
+			) {
+				if (a->type==GF_ISOM_BOX_TYPE_SIDX) {
+					if (mov->root_sidx) gf_isom_box_del( (GF_Box *) mov->root_sidx);
+					mov->root_sidx = (GF_SegmentIndexBox *) a;
+					mov->sidx_start_offset = mov->current_top_box_start;
+					mov->sidx_end_offset = gf_bs_get_position(mov->movieFileMap->bs);
+
+				}
+				else if (a->type==GF_ISOM_BOX_TYPE_STYP) {
+					mov->styp_start_offset = mov->current_top_box_start;
+
+					if (mov->seg_styp) gf_isom_box_del(mov->seg_styp);
+					mov->seg_styp = a;
+				} else if (a->type==GF_ISOM_BOX_TYPE_SSIX) {
+					if (mov->seg_ssix) gf_isom_box_del(mov->seg_ssix);
+					mov->seg_ssix = a;
+				} else {
+					gf_isom_box_del(a);
+				}
+				gf_isom_push_mdat_end(mov, mov->current_top_box_start);
+			} else if (!mov->NextMoofNumber && (a->type==GF_ISOM_BOX_TYPE_SIDX)) {
+				if (mov->main_sidx) gf_isom_box_del( (GF_Box *) mov->main_sidx);
+				mov->main_sidx = (GF_SegmentIndexBox *) a;
+				mov->main_sidx_end_pos = mov->current_top_box_start + a->size;
 			} else {
 				gf_isom_box_del(a);
 			}
@@ -394,10 +489,12 @@
 							}
 						}
 						//we should only parse senc/psec when no saiz/saio is present, otherwise we fetch the info directly
-						if (traf->trex && traf->trex->track && traf->sample_encryption) {
+						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;
 						}
 					}
 				} else {
@@ -410,16 +507,33 @@
 					}
 
 				}
-			} else if (mov->openMode==GF_ISOM_OPEN_CAT_FRAGMENTS) {
+			} else if (mov->openMode==GF_ISOM_OPEN_KEEP_FRAGMENTS) {
 				mov->NextMoofNumber = mov->moof->mfhd->sequence_number+1;
 				mov->moof = NULL;
 				gf_isom_box_del(a);
 			} else {
 				/*merge all info*/
 				e = MergeFragment((GF_MovieFragmentBox *)a, mov);
-				if (e) return e;
 				gf_isom_box_del(a);
+				if (e) return e;
 			}
+
+			//done with moov
+			if (mov->root_sidx) {
+				gf_isom_box_del((GF_Box *) mov->root_sidx);
+				mov->root_sidx = NULL;
+			}
+			if (mov->root_ssix) {
+				gf_isom_box_del(mov->seg_ssix);
+				mov->root_ssix = NULL;
+			}
+			if (mov->seg_styp) {
+				gf_isom_box_del(mov->seg_styp);
+				mov->seg_styp = NULL;
+			}
+			mov->sidx_start_offset = 0;
+			mov->sidx_end_offset = 0;
+			mov->styp_start_offset = 0;
 			break;
 #endif
 		case GF_ISOM_BOX_TYPE_UNKNOWN:
@@ -459,7 +573,7 @@
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		/*remember where we left, in case we append an entire number of movie fragments*/
-		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs);
+		mov->current_top_box_start = gf_bs_get_position(mov->movieFileMap->bs) + mov->bytes_removed;
 #endif
 	}
 
@@ -491,8 +605,8 @@
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 		/*in edit mode with successfully loaded fragments, delete all fragment signaling since
 		file is no longer fragmented*/
-		if ((mov->openMode > GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_CAT_FRAGMENTS) && mov->moov->mvex) {
-			gf_isom_box_del((GF_Box *)mov->moov->mvex);
+		if ((mov->openMode > GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_KEEP_FRAGMENTS) && mov->moov->mvex) {
+			gf_isom_box_del_parent(&mov->moov->child_boxes, (GF_Box *)mov->moov->mvex);
 			mov->moov->mvex = NULL;
 		}
 #endif
@@ -500,8 +614,9 @@
 	}
 
 	//create a default mdat if none was found
-	if (!mov->mdat && (mov->openMode != GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_CAT_FRAGMENTS)) {
+	if (!mov->mdat && (mov->openMode != GF_ISOM_OPEN_READ) && (mov->openMode != GF_ISOM_OPEN_KEEP_FRAGMENTS)) {
 		mov->mdat = (GF_MediaDataBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDAT);
+		if (!mov->mdat) return GF_OUT_OF_MEM;
 		e = gf_list_add(mov->TopBoxes, mov->mdat);
 		if (e) return e;
 	}
@@ -529,13 +644,12 @@
 
 	/*default storage mode is flat*/
 	mov->storageMode = GF_ISOM_STORE_FLAT;
+	mov->es_id_default_sync = -1;
 	return mov;
 }
 
-extern Bool use_dump_mode;
-
 //Create and parse the movie for READ - EDIT only
-GF_ISOFile *gf_isom_open_file(const char *fileName, u32 OpenMode, const char *tmp_dir)
+GF_ISOFile *gf_isom_open_file(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir)
 {
 	GF_Err e;
 	u64 bytes;
@@ -545,6 +659,11 @@
 	mov->fileName = gf_strdup(fileName);
 	mov->openMode = OpenMode;
 
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (OpenMode==GF_ISOM_OPEN_READ_DUMP)
+		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;
@@ -563,7 +682,6 @@
 		}
 
 		if (OpenMode == GF_ISOM_OPEN_READ_DUMP) {
-			mov->dump_mode_alloc = GF_TRUE;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 			mov->FragmentsFlags |= GF_ISOM_FRAG_READ_DEBUG;
 #endif
@@ -609,25 +727,47 @@
 #endif
 	}
 
-	use_dump_mode = mov->dump_mode_alloc;
-
 	//OK, let's parse the movie...
-	mov->LastError = gf_isom_parse_movie_boxes(mov, &bytes, 0);
+	mov->LastError = gf_isom_parse_movie_boxes(mov, NULL, &bytes, 0);
 
+#if 0
 	if (!mov->LastError && (OpenMode == GF_ISOM_OPEN_CAT_FRAGMENTS)) {
 		gf_isom_datamap_del(mov->movieFileMap);
 		/*reopen the movie file map in cat mode*/
 		mov->LastError = gf_isom_datamap_new(fileName, tmp_dir, GF_ISOM_DATA_MAP_CAT, & mov->movieFileMap);
 	}
+#endif
+
 	if (mov->LastError) {
 		gf_isom_set_last_error(NULL, mov->LastError);
 		gf_isom_delete_movie(mov);
 		return NULL;
 	}
-	use_dump_mode = GF_FALSE;
+
+	mov->nb_box_init_seg = gf_list_count(mov->TopBoxes);
 	return mov;
 }
 
+GF_Err gf_isom_set_write_callback(GF_ISOFile *mov,
+ 			GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size),
+			GF_Err (*on_block_patch)(void *usr_data, u8 *block, u32 block_size, u64 block_offset, Bool is_insert),
+ 			void *usr_data,
+ 			u32 block_size)
+{
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	if (mov->finalName && !strcmp(mov->finalName, "_gpac_isobmff_redirect")) {}
+	else if (mov->fileName && !strcmp(mov->fileName, "_gpac_isobmff_redirect")) {}
+	else return GF_BAD_PARAM;
+	mov->on_block_out = on_block_out;
+	mov->on_block_patch = on_block_patch;
+	mov->on_block_out_usr_data = usr_data;
+	mov->on_block_out_block_size = block_size;
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
 
 u64 gf_isom_get_mp4time()
 {
@@ -642,7 +782,6 @@
 void gf_isom_delete_movie(GF_ISOFile *mov)
 {
 	if (!mov) return;
-	use_dump_mode = mov->dump_mode_alloc;
 
 	//these are our two main files
 	if (mov->movieFileMap) gf_isom_datamap_del(mov->movieFileMap);
@@ -659,23 +798,31 @@
 	gf_isom_box_array_del(mov->moof_list);
 	if (mov->mfra)
 		gf_isom_box_del((GF_Box*)mov->mfra);
+	if (mov->sidx_pts_store)
+		gf_free(mov->sidx_pts_store);
+	if (mov->sidx_pts_next_store)
+		gf_free(mov->sidx_pts_next_store);
+
+	if (mov->main_sidx)
+		gf_isom_box_del((GF_Box*)mov->main_sidx);
+
+	if (mov->block_buffer)
+		gf_free(mov->block_buffer);
 #endif
 	if (mov->last_producer_ref_time)
 		gf_isom_box_del((GF_Box *) mov->last_producer_ref_time);
 	if (mov->fileName) gf_free(mov->fileName);
-	use_dump_mode = GF_FALSE;
 	gf_free(mov);
 }
 
-GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, u32 trackID)
+GF_TrackBox *gf_isom_get_track_from_id(GF_MovieBox *moov, GF_ISOTrackID trackID)
 {
 	u32 i, count;
-	GF_TrackBox *trak;
 	if (!moov || !trackID) return NULL;
 
 	count = gf_list_count(moov->trackList);
 	for (i = 0; i<count; i++) {
-		trak = (GF_TrackBox*)gf_list_get(moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(moov->trackList, i);
 		if (trak->Header->trackID == trackID) return trak;
 	}
 	return NULL;
@@ -684,12 +831,11 @@
 GF_TrackBox *gf_isom_get_track_from_original_id(GF_MovieBox *moov, u32 originalID, u32 originalFile)
 {
 	u32 i, count;
-	GF_TrackBox *trak;
 	if (!moov || !originalID) return NULL;
 
 	count = gf_list_count(moov->trackList);
 	for (i = 0; i<count; i++) {
-		trak = (GF_TrackBox*)gf_list_get(moov->trackList, i);
+		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(moov->trackList, i);
 		if ((trak->originalFile == originalFile) && (trak->originalID == originalID)) return trak;
 	}
 	return NULL;
@@ -927,32 +1073,40 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-void gf_isom_insert_moov(GF_ISOFile *file)
+GF_Err gf_isom_insert_moov(GF_ISOFile *file)
 {
-	u64 now;
 	GF_MovieHeaderBox *mvhd;
-	if (file->moov) return;
+	if (file->moov) return GF_OK;
 
 	//OK, create our boxes (mvhd, iods, ...)
 	file->moov = (GF_MovieBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MOOV);
+	if (!file->moov) return GF_OUT_OF_MEM;
 	file->moov->mov = file;
 	//Header SetUp
-	now = gf_isom_get_mp4time();
-	mvhd = (GF_MovieHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MVHD);
-	mvhd->creationTime = now;
-	if (!file->keep_utc)
-		mvhd->modificationTime = now;
+	mvhd = (GF_MovieHeaderBox *) gf_isom_box_new_parent(&file->moov->child_boxes, GF_ISOM_BOX_TYPE_MVHD);
+	if (!mvhd) return GF_OUT_OF_MEM;
+
+	if (gf_sys_is_test_mode() ) {
+		mvhd->creationTime = mvhd->modificationTime = 0;
+	} else {
+		u64 now = gf_isom_get_mp4time();
+		mvhd->creationTime = now;
+		if (!file->keep_utc)
+			mvhd->modificationTime = now;
+	}
+
 	mvhd->nextTrackID = 1;
 	//600 is our default movie TimeScale
 	mvhd->timeScale = 600;
 
 	file->interleavingTime = mvhd->timeScale;
-	moov_AddBox((GF_Box*)file->moov, (GF_Box *)mvhd);
+	moov_on_child_box((GF_Box*)file->moov, (GF_Box *)mvhd);
 	gf_list_add(file->TopBoxes, file->moov);
+	return GF_OK;
 }
 
 //Create the movie for WRITE only
-GF_ISOFile *gf_isom_create_movie(const char *fileName, u32 OpenMode, const char *tmp_dir)
+GF_ISOFile *gf_isom_create_movie(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir)
 {
 	GF_Err e;
 
@@ -989,6 +1143,11 @@
 
 	//create an MDAT
 	mov->mdat = (GF_MediaDataBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDAT);
+	if (!mov->mdat) {
+		gf_isom_set_last_error(NULL, GF_OUT_OF_MEM);
+		gf_isom_delete_movie(mov);
+		return NULL;
+	}
 	gf_list_add(mov->TopBoxes, mov->mdat);
 
 	//default behaviour is capture mode, no interleaving (eg, no rewrite of mdat)

gpac-0.8.0.tar.gz/src/isomedia/isom_read.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -67,6 +67,18 @@
 	return 0;
 }
 
+GF_EXPORT
+GF_Err gf_isom_freeze_order(GF_ISOFile *file)
+{
+	u32 i=0;
+	GF_Box *box;
+	if (!file) return GF_BAD_PARAM;
+	while ((box=gf_list_enum(file->TopBoxes, &i))) {
+		gf_isom_box_freeze_order(box);
+	}
+	return GF_OK;
+}
+
 /**************************************************************
 					Sample Manip
 **************************************************************/
@@ -84,37 +96,14 @@
 GF_EXPORT
 void gf_isom_sample_del(GF_ISOSample **samp)
 {
-	if (! *samp) return;
+	if (!samp || ! *samp) return;
 	if ((*samp)->data && (*samp)->dataLength) gf_free((*samp)->data);
 	gf_free(*samp);
 	*samp = NULL;
 }
 
-GF_EXPORT
-u32 gf_isom_probe_file(const char *fileName)
+static u32 gf_isom_probe_type(u32 type)
 {
-	u32 type = 0;
-
-	if (!strncmp(fileName, "gmem://", 7)) {
-		u32 size;
-		u8 *mem_address;
-		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return 0;
-		}
-		if (size>8)
-			type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
-	} else {
-		unsigned char data[4];
-		FILE *f = gf_fopen(fileName, "rb");
-		if (!f) return 0;
-		type = 0;
-		if (fread(data, 1, 4, f) == 4) {
-			if (fread(data, 1, 4, f) == 4) {
-				type = GF_4CC((u32)data[0], (u8)data[1], (u8)data[2], (u8)data[3]);
-			}
-		}
-		gf_fclose(f);
-	}
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_FTYP:
 	case GF_ISOM_BOX_TYPE_MOOV:
@@ -123,6 +112,8 @@
 	case GF_ISOM_BOX_TYPE_MOOF:
 	case GF_ISOM_BOX_TYPE_STYP:
 	case GF_ISOM_BOX_TYPE_SIDX:
+	case GF_ISOM_BOX_TYPE_EMSG:
+	case GF_ISOM_BOX_TYPE_PRFT:
 		return 3;
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/*Adobe specific*/
@@ -144,6 +135,55 @@
 	}
 }
 
+GF_EXPORT
+u32 gf_isom_probe_file_range(const char *fileName, u64 start_range, u64 end_range)
+{
+	u32 type = 0;
+
+	if (!strncmp(fileName, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (gf_blob_get_data(fileName, &mem_address, &size) != GF_OK) {
+			return 0;
+		}
+		if (!size) return 0;
+		if (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]);
+	} else {
+		u32 nb_read;
+		unsigned char data[4];
+		FILE *f = gf_fopen(fileName, "rb");
+		if (!f) return 0;
+		if (start_range) gf_fseek(f, start_range, SEEK_SET);
+		type = 0;
+		nb_read = (u32) gf_fread(data, 4, f);
+		if (nb_read == 4) {
+			if (gf_fread(data, 4, f) == 4) {
+				type = GF_4CC(data[0], data[1], data[2], data[3]);
+			}
+		}
+		gf_fclose(f);
+		if (!nb_read) return 0;
+	}
+	return gf_isom_probe_type(type);
+}
+
+GF_EXPORT
+u32 gf_isom_probe_file(const char *fileName)
+{
+	return gf_isom_probe_file_range(fileName, 0, 0);
+}
+
+GF_EXPORT
+u32 gf_isom_probe_data(const u8*inBuf, u32 inSize)
+{
+	u32 type;
+	if (inSize < 8) return 0;
+	type = GF_4CC(inBuf[4], inBuf[5], inBuf[6], inBuf[7]);
+	return gf_isom_probe_type(type);
+}
+
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 #include <gpac/internal/media_dev.h>
 #endif
@@ -165,6 +205,7 @@
 	char *sep, *val;
 	GF_TrackBox *trak;
 	GF_TrackExtendsBox *trex;
+	GF_SampleTableBox *stbl;
 
 	sz4cc[0] = 0;
 
@@ -212,53 +253,77 @@
 	}
 
 	file->moov = (GF_MovieBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MOOV);
+	if (!file->moov) return GF_OUT_OF_MEM;
+	gf_list_add(file->TopBoxes, file->moov);
 	file->moov->mov = file;
 	file->is_smooth = GF_TRUE;
-	file->moov->mvhd = (GF_MovieHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MVHD);
+	file->moov->mvhd = (GF_MovieHeaderBox *) gf_isom_box_new_parent(&file->moov->child_boxes, GF_ISOM_BOX_TYPE_MVHD);
+	if (!file->moov->mvhd) return GF_OUT_OF_MEM;
 	file->moov->mvhd->timeScale = timescale;
-	file->moov->mvex = (GF_MovieExtendsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MVEX);
-	trex = (GF_TrackExtendsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREX);
+	file->moov->mvex = (GF_MovieExtendsBox *) gf_isom_box_new_parent(&file->moov->child_boxes, GF_ISOM_BOX_TYPE_MVEX);
+	if (!file->moov->mvex) return GF_OUT_OF_MEM;
+	trex = (GF_TrackExtendsBox *) gf_isom_box_new_parent(&file->moov->mvex->child_boxes, GF_ISOM_BOX_TYPE_TREX);
+	if (!trex) return GF_OUT_OF_MEM;
+
 	trex->def_sample_desc_index = 1;
 	trex->trackID = 1;
 	gf_list_add(file->moov->mvex->TrackExList, trex);
 
-	trak = (GF_TrackBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRAK);
+	trak = (GF_TrackBox *) gf_isom_box_new_parent(&file->moov->child_boxes, GF_ISOM_BOX_TYPE_TRAK);
+	if (!trak) return GF_OUT_OF_MEM;
 	trak->moov = file->moov;
 	gf_list_add(file->moov->trackList, trak);
 
-	trak->Header = (GF_TrackHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TKHD);
+	trak->Header = (GF_TrackHeaderBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TKHD);
+	if (!trak->Header) return GF_OUT_OF_MEM;
 	trak->Header->trackID = 1;
 	trak->Header->flags |= 1;
 	trak->Header->width = width;
 	trak->Header->height = height;
 
-	trak->Media = (GF_MediaBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDIA);
+	trak->Media = (GF_MediaBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_MDIA);
+	if (!trak->Media) return GF_OUT_OF_MEM;
 	trak->Media->mediaTrack = trak;
-	trak->Media->mediaHeader = (GF_MediaHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDHD);
+	trak->Media->mediaHeader = (GF_MediaHeaderBox *) gf_isom_box_new_parent(&trak->Media->child_boxes, GF_ISOM_BOX_TYPE_MDHD);
+	if (!trak->Media->mediaHeader) return GF_OUT_OF_MEM;
 	trak->Media->mediaHeader->timeScale = timescale;
 
-	trak->Media->handler = (GF_HandlerBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HDLR);
+	trak->Media->handler = (GF_HandlerBox *) gf_isom_box_new_parent(&trak->Media->child_boxes,GF_ISOM_BOX_TYPE_HDLR);
+	if (!trak->Media->handler) return GF_OUT_OF_MEM;
     //we assume by default vide for handler type (only used for smooth streaming)
 	trak->Media->handler->handlerType = width ? GF_ISOM_MEDIA_VISUAL : GF_ISOM_MEDIA_AUDIO;
 
-	trak->Media->information = (GF_MediaInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MINF);
-	trak->Media->information->sampleTable = (GF_SampleTableBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STBL);
-	trak->Media->information->sampleTable->SampleSize = (GF_SampleSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSZ);
-	trak->Media->information->sampleTable->TimeToSample = (GF_TimeToSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STTS);
-	trak->Media->information->sampleTable->ChunkOffset = (GF_Box *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STCO);
-	trak->Media->information->sampleTable->SampleToChunk = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
-	trak->Media->information->sampleTable->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
+	trak->Media->information = (GF_MediaInformationBox *) gf_isom_box_new_parent(&trak->Media->child_boxes, GF_ISOM_BOX_TYPE_MINF);
+	if (!trak->Media->information) return GF_OUT_OF_MEM;
+	trak->Media->information->sampleTable = (GF_SampleTableBox *) gf_isom_box_new_parent(&trak->Media->information->child_boxes, GF_ISOM_BOX_TYPE_STBL);
+	if (!trak->Media->information->sampleTable) return GF_OUT_OF_MEM;
 
-	trak->Media->information->sampleTable->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSD);
+	stbl = trak->Media->information->sampleTable;
+	stbl->SampleSize = (GF_SampleSizeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSZ);
+	if (!stbl->SampleSize) return GF_OUT_OF_MEM;
+	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;
+	stbl->ChunkOffset = (GF_Box *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STCO);
+	if (!stbl->ChunkOffset) return GF_OUT_OF_MEM;
+	stbl->SampleToChunk = (GF_SampleToChunkBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSC);
+	if (!stbl->SampleToChunk) return GF_OUT_OF_MEM;
+	stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSS);
+	if (!stbl->SyncSample) return GF_OUT_OF_MEM;
+	stbl->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSD);
+	if (!stbl->SampleDescription) return GF_OUT_OF_MEM;
 
 	trak->dts_at_seg_start = tfdt;
 
 
 	if (!stricmp(sz4cc, "H264")) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 		u32 pos = 0;
 		u32 end, sc_size=0;
-		GF_MPEGVisualSampleEntryBox *avc =  (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
-		avc->avc_config =  (GF_AVCConfigurationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
+#endif
+		GF_MPEGVisualSampleEntryBox *avc =  (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new_parent(&stbl->SampleDescription->child_boxes, GF_ISOM_BOX_TYPE_AVC1);
+		if (!avc) return GF_OUT_OF_MEM;
+		avc->avc_config =  (GF_AVCConfigurationBox *) gf_isom_box_new_parent(&avc->child_boxes, GF_ISOM_BOX_TYPE_AVCC);
+		if (!avc->avc_config) return GF_OUT_OF_MEM;
 
 		avc->Width = width;
 		avc->Height = height;
@@ -269,7 +334,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 		//locate pps and sps
-		end = gf_media_nalu_next_start_code((u8 *) CodecParams, CodecParamLen, &sc_size);
+		gf_media_nalu_next_start_code((u8 *) CodecParams, CodecParamLen, &sc_size);
 		pos += sc_size;
 		while (pos<CodecParamLen) {
 			GF_AVCConfigSlot *slc;
@@ -279,8 +344,10 @@
 			if (!end) end = CodecParamLen;
 
 			GF_SAFEALLOC(slc, GF_AVCConfigSlot);
+			if (!slc) break;
 			slc->size = end;
 			slc->data = gf_malloc(sizeof(char)*slc->size);
+			if (!slc->data) return GF_OUT_OF_MEM;
 			memcpy(slc->data, nal, sizeof(char)*slc->size);
 
 			nal_type = nal[0] & 0x1F;
@@ -304,16 +371,18 @@
 #endif
 
 		AVC_RewriteESDescriptor(avc);
-		gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, avc);
 	}
 	else if (!stricmp(sz4cc, "AACL")) {
 #ifndef GPAC_DISABLE_AV_PARSERS
 		GF_M4ADecSpecInfo aacinfo;
 #endif
 
-		GF_MPEGAudioSampleEntryBox *aac =  (GF_MPEGAudioSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MP4A);
-		aac->esd = (GF_ESDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ESDS);
+		GF_MPEGAudioSampleEntryBox *aac =  (GF_MPEGAudioSampleEntryBox *) gf_isom_box_new_parent(&stbl->SampleDescription->child_boxes, GF_ISOM_BOX_TYPE_MP4A);
+		if (!aac) return GF_OUT_OF_MEM;
+		aac->esd = (GF_ESDBox *) gf_isom_box_new_parent(&aac->child_boxes, GF_ISOM_BOX_TYPE_ESDS);
+		if (!aac->esd) return GF_OUT_OF_MEM;
 		aac->esd->desc = gf_odf_desc_esd_new(2);
+		if (!aac->esd->desc) return GF_OUT_OF_MEM;
 #ifndef GPAC_DISABLE_AV_PARSERS
 		memset(&aacinfo, 0, sizeof(GF_M4ADecSpecInfo));
 		aacinfo.nb_chan = nb_channels;
@@ -322,12 +391,10 @@
 		gf_m4a_write_config(&aacinfo, &aac->esd->desc->decoderConfig->decoderSpecificInfo->data, &aac->esd->desc->decoderConfig->decoderSpecificInfo->dataLength);
 #endif
 		aac->esd->desc->decoderConfig->streamType = GF_STREAM_AUDIO;
-		aac->esd->desc->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+		aac->esd->desc->decoderConfig->objectTypeIndication = GF_CODECID_AAC_MPEG4;
 		aac->bitspersample = bps;
 		aac->samplerate_hi = sample_rate;
 		aac->channel_count = nb_channels;
-
-		gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, aac);
 	}
 
 	return GF_OK;
@@ -338,7 +405,7 @@
 			the file map is regular (through FILE handles)
 **************************************************************/
 GF_EXPORT
-GF_Err gf_isom_open_progressive(const char *fileName, u64 start_range, u64 end_range, GF_ISOFile **the_file, u64 *BytesMissing)
+GF_Err gf_isom_open_progressive_ex(const char *fileName, u64 start_range, u64 end_range, Bool enable_frag_bounds, GF_ISOFile **the_file, u64 *BytesMissing, u32 *outBoxType)
 {
 	GF_Err e;
 	GF_ISOFile *movie;
@@ -353,6 +420,7 @@
 
 	movie->fileName = gf_strdup(fileName);
 	movie->openMode = GF_ISOM_OPEN_READ;
+	movie->signal_frag_bounds = enable_frag_bounds;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 	movie->editFileMap = NULL;
@@ -375,7 +443,7 @@
 			gf_bs_truncate(movie->movieFileMap->bs);
 			gf_bs_seek(movie->movieFileMap->bs, start_range);
 		}
-		e = gf_isom_parse_movie_boxes(movie, BytesMissing, GF_TRUE);
+		e = gf_isom_parse_movie_boxes(movie, outBoxType, BytesMissing, GF_TRUE);
 
 	}
 	if (e == GF_ISOM_INCOMPLETE_FILE) {
@@ -398,12 +466,18 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_open_progressive(const char *fileName, u64 start_range, u64 end_range, Bool enable_frag_bounds, GF_ISOFile **the_file, u64 *BytesMissing)
+{
+	return gf_isom_open_progressive_ex(fileName, start_range, end_range, enable_frag_bounds, the_file, BytesMissing, NULL);
+}
+
 /**************************************************************
 					File Reading
 **************************************************************/
 
 GF_EXPORT
-GF_ISOFile *gf_isom_open(const char *fileName, u32 OpenMode, const char *tmp_dir)
+GF_ISOFile *gf_isom_open(const char *fileName, GF_ISOOpenMode OpenMode, const char *tmp_dir)
 {
 	GF_ISOFile *movie;
 	MP4_API_IO_Err = GF_OK;
@@ -420,7 +494,7 @@
 		movie = gf_isom_create_movie(fileName, OpenMode, tmp_dir);
 		break;
 	case GF_ISOM_OPEN_EDIT:
-	case GF_ISOM_OPEN_CAT_FRAGMENTS:
+	case GF_ISOM_OPEN_KEEP_FRAGMENTS:
 		movie = gf_isom_open_file(fileName, OpenMode, tmp_dir);
 		break;
 	case GF_ISOM_WRITE_EDIT:
@@ -435,9 +509,16 @@
 	return (GF_ISOFile *) movie;
 }
 
-GF_EXPORT
+
+#if 0
+/*! gets access to the data bitstream  - see \ref gf_isom_open
+\param isom_file the target ISO file
+\param out_bs set to the file input bitstream - do NOT destroy
+\return error if any
+*/
 GF_Err gf_isom_get_bs(GF_ISOFile *movie, GF_BitStream **out_bs)
 {
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	if (!movie || movie->openMode != GF_ISOM_OPEN_WRITE || !movie->editFileMap) //memory mode
 		return GF_NOT_SUPPORTED;
 
@@ -450,7 +531,12 @@
 		movie->moof->fragment_offset = 0;
 
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
+#endif
+
 
 GF_EXPORT
 GF_Err gf_isom_write(GF_ISOFile *movie) {
@@ -469,9 +555,10 @@
 			if (e) return e;
 			//in case of mfra box usage -> create mfro, calculate box sizes and write it out
 			if (movie->mfra) {
-				if (!movie->mfra->mfro)
-					movie->mfra->mfro = (GF_MovieFragmentRandomAccessOffsetBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_MFRO);
-
+				if (!movie->mfra->mfro) {
+					movie->mfra->mfro = (GF_MovieFragmentRandomAccessOffsetBox *)gf_isom_box_new_parent(&movie->mfra->child_boxes, GF_ISOM_BOX_TYPE_MFRO);
+					if (!movie->mfra->mfro) return GF_OUT_OF_MEM;
+				}
 				e = gf_isom_box_size((GF_Box *)movie->mfra);
 				if (e) return e;
 				movie->mfra->mfro->container_size = (u32) movie->mfra->size;
@@ -480,7 +567,7 @@
 			}
 		} else
 #endif
-			e = WriteToFile(movie);
+			e = WriteToFile(movie, GF_FALSE);
 	}
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
@@ -502,14 +589,12 @@
 GF_EXPORT
 GF_Err gf_isom_close(GF_ISOFile *movie)
 {
-	GF_Err e;
+	GF_Err e=GF_OK;
 	if (movie == NULL) return GF_ISOM_INVALID_FILE;
 	e = gf_isom_write(movie);
-	if (e) return e;
-
 	//free and return;
 	gf_isom_delete_movie(movie);
-	return GF_OK;
+	return e;
 }
 
 
@@ -520,6 +605,12 @@
 	return GF_TRUE;
 }
 
+GF_EXPORT
+void gf_isom_disable_odf_conversion(GF_ISOFile *movie, Bool disable)
+{
+	if (movie) movie->disable_odf_translate = disable;
+}
+
 //this funct is used for exchange files, where the iods contains an OD
 GF_EXPORT
 GF_Descriptor *gf_isom_get_root_od(GF_ISOFile *movie)
@@ -537,18 +628,28 @@
 	if (!movie || !movie->moov) return NULL;
 	if (!movie->moov->iods) return NULL;
 
+	if (movie->disable_odf_translate) {
+		//duplicate our descriptor
+		movie->LastError = gf_odf_desc_copy((GF_Descriptor *) movie->moov->iods->descriptor, &desc);
+		if (movie->LastError) return NULL;
+		return desc;
+	}
 	od = NULL;
 	iod = NULL;
 
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_OD_TAG:
 		od = (GF_ObjectDescriptor*)gf_malloc(sizeof(GF_ObjectDescriptor));
+		if (!od) return NULL;
+
 		memset(od, 0, sizeof(GF_ObjectDescriptor));
 		od->ESDescriptors = gf_list_new();
 		useIOD = 0;
 		break;
 	case GF_ODF_ISOM_IOD_TAG:
 		iod = (GF_InitialObjectDescriptor*)gf_malloc(sizeof(GF_InitialObjectDescriptor));
+		if (!iod) return NULL;
+
 		memset(iod, 0, sizeof(GF_InitialObjectDescriptor));
 		iod->ESDescriptors = gf_list_new();
 		useIOD = 1;
@@ -639,20 +740,19 @@
 
 
 GF_EXPORT
-u32 gf_isom_get_track_id(GF_ISOFile *movie, u32 trackNumber)
+GF_ISOTrackID gf_isom_get_track_id(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_TrackBox *trak;
 	if (!movie) return 0;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Header) return 0;
 	return trak->Header->trackID;
 }
 
 
 GF_EXPORT
-u32 gf_isom_get_track_by_id(GF_ISOFile *the_file, u32 trackID)
+u32 gf_isom_get_track_by_id(GF_ISOFile *the_file, GF_ISOTrackID trackID)
 {
-	GF_TrackBox *trak;
 	u32 count;
 	u32 i;
 	if (the_file == NULL) return 0;
@@ -660,15 +760,15 @@
 	count = gf_isom_get_track_count(the_file);
 	if (!count) return 0;
 	for (i = 0; i < count; i++) {
-		trak = gf_isom_get_track_from_file(the_file, i+1);
-		if (!trak) return 0;
+		GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, i+1);
+		if (!trak || !trak->Header) return 0;
 		if (trak->Header->trackID == trackID) return i+1;
 	}
 	return 0;
 }
 
 GF_EXPORT
-u32 gf_isom_get_track_original_id(GF_ISOFile *movie, u32 trackNumber)
+GF_ISOTrackID gf_isom_get_track_original_id(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_TrackBox *trak;
 	if (!movie) return 0;
@@ -696,7 +796,7 @@
 	while (NULL != (a = (GF_Box*)gf_list_enum(file->TopBoxes, &i))) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (a->type == GF_ISOM_BOX_TYPE_STYP) {
-			GF_SegmentTypeBox *styp = (GF_SegmentTypeBox *)a;
+			GF_FileTypeBox *styp = (GF_FileTypeBox *)a;
 			*brand = styp->majorBrand;
 			*version = styp->minorVersion;
 			return GF_TRUE;
@@ -820,7 +920,7 @@
 u8 gf_isom_is_track_in_root_od(GF_ISOFile *movie, u32 trackNumber)
 {
 	u32 i;
-	u32 trackID;
+	GF_ISOTrackID trackID;
 	GF_Descriptor *desc;
 	GF_ES_ID_Inc *inc;
 	GF_List *inc_list;
@@ -843,7 +943,7 @@
 	if (!trackID) return 2;
 	i=0;
 	while ((inc = (GF_ES_ID_Inc*)gf_list_enum(inc_list, &i))) {
-		if (inc->trackID == trackID) return 1;
+		if (inc->trackID == (u32) trackID) return 1;
 	}
 	return 0;
 }
@@ -858,10 +958,19 @@
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 
-	if (!trak) return 2;
+	if (!trak || !trak->Header) return 2;
 	return (trak->Header->flags & 1) ? 1 : 0;
 }
 
+GF_EXPORT
+u32 gf_isom_get_track_flags(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	return trak->Header->flags;
+}
+
 
 //get the track duration
 //return 0 if bad param
@@ -892,12 +1001,12 @@
 	}
 	*lang = NULL;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
-	count = gf_list_count(trak->Media->other_boxes);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+	count = gf_list_count(trak->Media->child_boxes);
 	if (count>0) {
 		u32 i;
 		for (i = 0; i < count; i++) {
-			GF_Box *box = (GF_Box *)gf_list_get(trak->Media->other_boxes, i);
+			GF_Box *box = (GF_Box *)gf_list_get(trak->Media->child_boxes, i);
 			if (box->type == GF_ISOM_BOX_TYPE_ELNG) {
 				*lang = gf_strdup(((GF_ExtendedLanguageBox *)box)->extended_language);
 				return GF_OK;
@@ -928,7 +1037,7 @@
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
 	if (!map) return 0;
 
-	return gf_list_count(map->other_boxes);
+	return gf_list_count(map->boxes);
 }
 
 GF_EXPORT
@@ -948,7 +1057,7 @@
 		GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -958,7 +1067,7 @@
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
 	if (!map) return GF_BAD_PARAM;
 
-	kindBox = (GF_KindBox *)gf_list_get(map->other_boxes, index);
+	kindBox = (GF_KindBox *)gf_list_get(map->boxes, index);
 	if (!kindBox) return GF_BAD_PARAM;
 
 	*scheme = gf_strdup(kindBox->schemeURI);
@@ -999,7 +1108,7 @@
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_TrackReferenceTypeBox *dpnd;
-	u32 refTrackNum;
+	GF_ISOTrackID refTrackNum;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 
 	*refTrack = 0;
@@ -1010,7 +1119,7 @@
 	if (e) return e;
 	if (!dpnd) return GF_BAD_PARAM;
 
-	if (referenceIndex > dpnd->trackIDCount) return GF_BAD_PARAM;
+	if (!referenceIndex || (referenceIndex > dpnd->trackIDCount)) return GF_BAD_PARAM;
 
 	//the spec allows a NULL reference
 	//(ex, to force desync of a track, set a sync ref with ID = 0)
@@ -1027,7 +1136,7 @@
 //Return the referenced track ID 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
-GF_Err gf_isom_get_reference_ID(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 referenceIndex, u32 *refTrackID)
+GF_Err gf_isom_get_reference_ID(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 referenceIndex, GF_ISOTrackID *refTrackID)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1052,7 +1161,7 @@
 //Return referenceIndex if the given track has a reference to the given TreckID of a given ReferenceType
 //return 0 if error
 GF_EXPORT
-u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, u32 refTrackID)
+u32 gf_isom_has_track_reference(GF_ISOFile *movie, u32 trackNumber, u32 referenceType, GF_ISOTrackID refTrackID)
 {
 	u32 i;
 	GF_TrackBox *trak;
@@ -1111,7 +1220,7 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return 0;
 
-	return gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	return gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 }
 
 
@@ -1125,6 +1234,7 @@
 	e = GetESD(movie->moov, gf_isom_get_track_id(movie, trackNumber), StreamDescriptionIndex, &esd);
 	if (e && (e!= GF_ISOM_INVALID_MEDIA)) {
 		movie->LastError = e;
+		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
 		return NULL;
 	}
 
@@ -1180,7 +1290,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Media || !trak->Media->mediaHeader) return 0;
 
 	return trak->Media->mediaHeader->original_duration;
 }
@@ -1191,7 +1301,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Media || !trak->Media->mediaHeader) return 0;
 	return trak->Media->mediaHeader->timeScale;
 }
 
@@ -1203,7 +1313,7 @@
 	if (!mov || !mov->moov || !mov->moov->udta) return 0;
 	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_CPRT, NULL);
 	if (!map) return 0;
-	return gf_list_count(map->other_boxes);
+	return gf_list_count(map->boxes);
 }
 
 GF_EXPORT
@@ -1218,15 +1328,15 @@
 	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_CPRT, NULL);
 	if (!map) return GF_OK;
 
-	if (Index > gf_list_count(map->other_boxes)) return GF_BAD_PARAM;
+	if (Index > gf_list_count(map->boxes)) return GF_BAD_PARAM;
 
-	cprt = (GF_CopyrightBox*)gf_list_get(map->other_boxes, Index-1);
+	cprt = (GF_CopyrightBox*)gf_list_get(map->boxes, Index-1);
 	(*threeCharCode) = cprt->packedLanguageCode;
 	(*notice) = cprt->notice;
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0
 GF_Err gf_isom_get_watermark(GF_ISOFile *mov, bin128 UUID, u8** data, u32* length)
 {
 	GF_UserDataMap *map;
@@ -1238,14 +1348,16 @@
 	map = udta_getEntry(mov->moov->udta, GF_ISOM_BOX_TYPE_UUID, (bin128 *) & UUID);
 	if (!map) return GF_NOT_SUPPORTED;
 
-	wm = (GF_UnknownUUIDBox*)gf_list_get(map->other_boxes, 0);
+	wm = (GF_UnknownUUIDBox*)gf_list_get(map->boxes, 0);
 	if (!wm) return GF_NOT_SUPPORTED;
 
 	*data = (u8 *) gf_malloc(sizeof(char)*wm->dataSize);
+	if (! *data) return GF_OUT_OF_MEM;
 	memcpy(*data, wm->data, wm->dataSize);
 	*length = wm->dataSize;
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 u32 gf_isom_get_chapter_count(GF_ISOFile *movie, u32 trackNumber)
@@ -1267,7 +1379,7 @@
 	if (!udta) return 0;
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	if (!map) return 0;
-	lst = (GF_ChapterListBox *)gf_list_get(map->other_boxes, 0);
+	lst = (GF_ChapterListBox *)gf_list_get(map->boxes, 0);
 	if (!lst) return 0;
 	return gf_list_count(lst->list);
 }
@@ -1293,7 +1405,7 @@
 	if (!udta) return GF_BAD_PARAM;
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	if (!map) return GF_BAD_PARAM;
-	lst = (GF_ChapterListBox *)gf_list_get(map->other_boxes, 0);
+	lst = (GF_ChapterListBox *)gf_list_get(map->boxes, 0);
 	if (!lst) return GF_BAD_PARAM;
 
 	ce = (GF_ChapterEntry *)gf_list_get(lst->list, Index-1);
@@ -1320,6 +1432,7 @@
 {
 	switch (entryType) {
 	case GF_ISOM_BOX_TYPE_MP4S:
+	case GF_ISOM_BOX_TYPE_LSR1:
 	case GF_ISOM_BOX_TYPE_MP4A:
 	case GF_ISOM_BOX_TYPE_MP4V:
 	case GF_ISOM_BOX_TYPE_ENCA:
@@ -1332,7 +1445,7 @@
 	}
 }
 
-Bool IsMP4EncryptedDescription(u32 entryType)
+Bool gf_isom_is_encrypted_entry(u32 entryType)
 {
 	switch (entryType) {
 	case GF_ISOM_BOX_TYPE_ENCA:
@@ -1348,16 +1461,19 @@
 Bool gf_isom_is_track_encrypted(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
-	GF_Box *entry;
+	u32 i=0;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return 2;
-	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, 0);
-	if (!entry) return 2;
-	if (IsMP4EncryptedDescription(entry->type)) return GF_TRUE;
+	while (1) {
+		GF_Box *entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
+		if (!entry) break;
+		if (gf_isom_is_encrypted_entry(entry->type)) return GF_TRUE;
 
-	if (gf_isom_is_cenc_media(the_file, trackNumber, 1))
-		return GF_TRUE;
+		if (gf_isom_is_cenc_media(the_file, trackNumber, i+1))
+			return GF_TRUE;
 
+		i++;
+	}
 	return GF_FALSE;
 }
 
@@ -1368,12 +1484,12 @@
 	GF_Box *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !DescriptionIndex || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable) return 0;
-	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
 	if (!entry) return 0;
 
 	//filter MPEG sub-types
 	if (IsMP4Description(entry->type)) {
-		if (IsMP4EncryptedDescription(entry->type)) return GF_ISOM_SUBTYPE_MPEG4_CRYP;
+		if (gf_isom_is_encrypted_entry(entry->type)) return GF_ISOM_SUBTYPE_MPEG4_CRYP;
 		else return GF_ISOM_SUBTYPE_MPEG4;
 	}
 	if (entry->type == GF_ISOM_BOX_TYPE_GNRV) {
@@ -1392,10 +1508,17 @@
 u32 gf_isom_get_mpeg4_subtype(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
 	GF_TrackBox *trak;
-	GF_Box *entry;
+	GF_Box *entry=NULL;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !DescriptionIndex) return 0;
-	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+
+	if (trak->Media
+		&& trak->Media->information
+		&& trak->Media->information->sampleTable
+		&& trak->Media->information->sampleTable->SampleDescription
+	) {
+		entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, DescriptionIndex-1);
+	}
 	if (!entry) return 0;
 
 	//filter MPEG sub-types
@@ -1437,7 +1560,7 @@
 GF_Err gf_isom_get_data_reference(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const char **outURL, const char **outURN)
 {
 	GF_TrackBox *trak;
-	GF_DataEntryURLBox *url;
+	GF_DataEntryURLBox *url=NULL;
 	GF_DataEntryURNBox *urn;
 	u32 drefIndex;
 	GF_Err e;
@@ -1452,10 +1575,15 @@
 	if (e) return e;
 	if (!drefIndex) return GF_BAD_PARAM;
 
-	url = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->other_boxes, drefIndex - 1);
+	if (trak->Media
+		&& trak->Media->information
+		&& trak->Media->information->dataInformation
+		&& trak->Media->information->dataInformation->dref
+	) {
+		url = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->child_boxes, drefIndex - 1);
+	}
 	if (!url) return GF_ISOM_INVALID_FILE;
 
-	*outURL = *outURN = NULL;
 	if (url->type == GF_ISOM_BOX_TYPE_URL) {
 		*outURL = url->location;
 		*outURN = NULL;
@@ -1477,7 +1605,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !trak->Media->information->sampleTable->SampleSize) return 0;
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleSize) return 0;
 	return trak->Media->information->sampleTable->SampleSize->sampleCount
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 	       + trak->sample_count_at_seg_start
@@ -1490,7 +1618,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleSize) return 0;
 	return trak->Media->information->sampleTable->SampleSize->sampleSize;
 }
 
@@ -1499,7 +1627,7 @@
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->TimeToSample) return 0;
 	if (trak->Media->information->sampleTable->TimeToSample->nb_entries != 1) return 0;
 	return trak->Media->information->sampleTable->TimeToSample->entries[0].sampleDelta;
 }
@@ -1512,13 +1640,15 @@
 	if (!trak) return GF_FALSE;
 	trak->pack_num_samples = 0;
 	//we only activate sample packing for raw audio
-	if (!trak->Media->handler) return GF_FALSE;
+	if (!trak->Media || !trak->Media->handler) return GF_FALSE;
 	if (trak->Media->handler->handlerType != GF_ISOM_MEDIA_AUDIO) return GF_FALSE;
 	//and sample duration of 1
+	if (!trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->TimeToSample) return GF_FALSE;
 	if (trak->Media->information->sampleTable->TimeToSample->nb_entries != 1) return GF_FALSE;
+	if (!trak->Media->information->sampleTable->TimeToSample->entries) return GF_FALSE;
 	if (trak->Media->information->sampleTable->TimeToSample->entries[0].sampleDelta != 1) return GF_FALSE;
 	//and sample with constant size
-	if (!trak->Media->information->sampleTable->SampleSize->sampleSize) return GF_FALSE;
+	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;
 }
@@ -1571,7 +1701,7 @@
 GF_EXPORT
 GF_Err gf_isom_get_sample_flags(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *isLeading, u32 *dependsOn, u32 *dependedOn, u32 *redundant)
 {
-	GF_TrackBox *trak = NULL;
+	GF_TrackBox *trak;
 	*isLeading = 0;
 	*dependsOn = 0;
 	*dependedOn = 0;
@@ -1586,7 +1716,7 @@
 //this index allows to retrieve the stream description if needed (2 media in 1 track)
 //return NULL if error
 GF_EXPORT
-GF_ISOSample *gf_isom_get_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex)
+GF_ISOSample *gf_isom_get_sample_ex(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, GF_ISOSample *static_sample, u64 *data_offset)
 {
 	GF_Err e;
 	u32 descIndex;
@@ -1596,7 +1726,13 @@
 	if (!trak) return NULL;
 
 	if (!sampleNumber) return NULL;
-	samp = gf_isom_sample_new();
+	if (static_sample) {
+		samp = static_sample;
+		if (static_sample->dataLength && !static_sample->alloc_size)
+			static_sample->alloc_size = static_sample->dataLength;
+	} else {
+		samp = gf_isom_sample_new();
+	}
 	if (!samp) return NULL;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1605,10 +1741,13 @@
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
 
-	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, GF_FALSE, NULL);
+	e = Media_GetSample(trak->Media, sampleNumber, &samp, &descIndex, GF_FALSE, data_offset);
+	if (static_sample && !static_sample->alloc_size)
+		static_sample->alloc_size = static_sample->dataLength;
+
 	if (e) {
 		gf_isom_set_last_error(the_file, e);
-		gf_isom_sample_del(&samp);
+		if (!static_sample) gf_isom_sample_del(&samp);
 		return NULL;
 	}
 	if (sampleDescriptionIndex) *sampleDescriptionIndex = descIndex;
@@ -1620,6 +1759,12 @@
 }
 
 GF_EXPORT
+GF_ISOSample *gf_isom_get_sample(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex)
+{
+	return gf_isom_get_sample_ex(the_file, trackNumber, sampleNumber, sampleDescriptionIndex, NULL, NULL);
+}
+
+GF_EXPORT
 u32 gf_isom_get_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
 {
 	u32 dur;
@@ -1651,26 +1796,67 @@
 }
 
 GF_EXPORT
-u8 gf_isom_get_sample_sync(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
+u32 gf_isom_get_max_sample_size(GF_ISOFile *the_file, u32 trackNumber)
+{
+	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->SampleSize) return 0;
+
+	return trak->Media->information->sampleTable->SampleSize->max_size;
+}
+
+GF_EXPORT
+u32 gf_isom_get_avg_sample_size(GF_ISOFile *the_file, u32 trackNumber)
+{
+	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->SampleSize) return 0;
+
+	if ( trak->Media->information->sampleTable->SampleSize->sampleSize)
+		return trak->Media->information->sampleTable->SampleSize->sampleSize;
+
+	if (!trak->Media->information->sampleTable->SampleSize->total_samples) return 0;
+	return (u32) (trak->Media->information->sampleTable->SampleSize->total_size / trak->Media->information->sampleTable->SampleSize->total_samples);
+}
+
+GF_EXPORT
+u32 gf_isom_get_max_sample_delta(GF_ISOFile *the_file, u32 trackNumber)
+{
+	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->TimeToSample) return 0;
+
+	return trak->Media->information->sampleTable->TimeToSample->max_ts_delta;
+}
+
+GF_EXPORT
+u32 gf_isom_get_max_sample_cts_offset(GF_ISOFile *the_file, u32 trackNumber)
 {
-	SAPType is_rap;
+	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;
+}
+
+
+GF_EXPORT
+Bool gf_isom_get_sample_sync(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
+{
+	GF_ISOSAPType is_rap;
 	GF_Err e;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !sampleNumber) return 0;
+	if (!trak || !sampleNumber) return GF_FALSE;
 
-	if (! trak->Media->information->sampleTable->SyncSample) return 1;
+	if (! trak->Media->information->sampleTable->SyncSample) return GF_TRUE;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if (sampleNumber<=trak->sample_count_at_seg_start) return 0;
+	if (sampleNumber<=trak->sample_count_at_seg_start) return GF_FALSE;
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
 	e = stbl_GetSampleRAP(trak->Media->information->sampleTable->SyncSample, sampleNumber, &is_rap, NULL, NULL);
-	if (e) return 0;
-	return is_rap;
+	if (e) return GF_FALSE;
+	return is_rap ? GF_TRUE : GF_FALSE;
 }
 
 //same as gf_isom_get_sample but doesn't fetch media data
 GF_EXPORT
-GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, u64 *data_offset)
+GF_ISOSample *gf_isom_get_sample_info_ex(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, u64 *data_offset, GF_ISOSample *static_sample)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1683,12 +1869,18 @@
 	if (sampleNumber<=trak->sample_count_at_seg_start) return NULL;
 	sampleNumber -= trak->sample_count_at_seg_start;
 #endif
-	samp = gf_isom_sample_new();
-	if (!samp) return NULL;
+	if (static_sample) {
+		samp = static_sample;
+	} else {
+		samp = gf_isom_sample_new();
+		if (!samp) return NULL;
+	}
+
 	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, GF_TRUE, data_offset);
 	if (e) {
 		gf_isom_set_last_error(the_file, e);
-		gf_isom_sample_del(&samp);
+		if (!static_sample)
+			gf_isom_sample_del(&samp);
 		return NULL;
 	}
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1697,7 +1889,14 @@
 	return samp;
 }
 
-//same as gf_isom_get_sample but doesn't fetch media data
+GF_EXPORT
+GF_ISOSample *gf_isom_get_sample_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u32 *sampleDescriptionIndex, u64 *data_offset)
+{
+	return gf_isom_get_sample_info_ex(the_file, trackNumber, sampleNumber, sampleDescriptionIndex, data_offset, NULL);
+}
+
+
+//get sample dts
 GF_EXPORT
 u64 gf_isom_get_sample_dts(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
 {
@@ -1715,7 +1914,6 @@
 	return dts;
 }
 
-
 GF_EXPORT
 Bool gf_isom_is_self_contained(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
 {
@@ -1750,17 +1948,16 @@
 //return NULL if error
 //WARNING: the sample may not be sync even though the sync was requested (depends on the media)
 GF_EXPORT
-GF_Err gf_isom_get_sample_for_media_time(GF_ISOFile *the_file, u32 trackNumber, u64 desiredTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *SampleNum)
+GF_Err gf_isom_get_sample_for_media_time(GF_ISOFile *the_file, u32 trackNumber, u64 desiredTime, u32 *StreamDescriptionIndex, GF_ISOSearchMode SearchMode, GF_ISOSample **sample, u32 *SampleNum, u64 *data_offset)
 {
 	GF_Err e;
 	u32 sampleNumber, prevSampleNumber, syncNum, shadowSync;
 	GF_TrackBox *trak;
 	GF_ISOSample *shadow;
 	GF_SampleTableBox *stbl;
+	Bool static_sample = GF_FALSE;
 	u8 useShadow, IsSync;
 
-	if (!sample) return GF_BAD_PARAM;
-
 	if (SampleNum) *SampleNum = 0;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
@@ -1851,9 +2048,14 @@
 
 	//OK sampleNumber is exactly the sample we need (except for shadow)
 
-	*sample = gf_isom_sample_new();
-	if (*sample == NULL) return GF_OUT_OF_MEM;
-
+	if (sample) {
+		if (*sample) {
+			static_sample = GF_TRUE;
+		} else {
+			*sample = gf_isom_sample_new();
+			if (*sample == NULL) return GF_OUT_OF_MEM;
+		}
+	}
 	//we are in shadow mode, we need to browse both SyncSample and ShadowSyncSample to get
 	//the desired sample...
 	if (SearchMode == GF_ISOM_SEARCH_SYNC_SHADOW) {
@@ -1870,12 +2072,16 @@
 		}
 	}
 
-	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, GF_FALSE, NULL);
+	e = Media_GetSample(trak->Media, sampleNumber, sample, StreamDescriptionIndex, GF_FALSE, data_offset);
 	if (e) {
-		gf_isom_sample_del(sample);
+		if (!static_sample)
+			gf_isom_sample_del(sample);
+		else if (! (*sample)->alloc_size && (*sample)->data && (*sample)->dataLength )
+		 	(*sample)->alloc_size =  (*sample)->dataLength;
+
 		return e;
 	}
-	if (! (*sample)->IsRAP) {
+	if (sample && ! (*sample)->IsRAP) {
 		Bool has_roll, is_rap;
 		e = gf_isom_get_sample_rap_roll_info(the_file, trackNumber, sampleNumber, &is_rap, &has_roll, NULL);
 		if (e) return e;
@@ -1890,7 +2096,7 @@
 	}
 
 	//in shadow mode, we only get the data of the shadowing sample !
-	if (useShadow) {
+	if (sample && useShadow) {
 		//we have to use StreamDescriptionIndex in case the sample data is in another desc
 		//though this is unlikely as non optimized...
 		shadow = gf_isom_get_sample(the_file, trackNumber, shadowSync, StreamDescriptionIndex);
@@ -1904,11 +2110,14 @@
 		shadow->dataLength = 0;
 		gf_isom_sample_del(&shadow);
 	}
+	if (static_sample && ! (*sample)->alloc_size )
+		 (*sample)->alloc_size =  (*sample)->dataLength;
+		 
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *the_file, u32 trackNumber, u64 movieTime, u32 *StreamDescriptionIndex, u8 SearchMode, GF_ISOSample **sample, u32 *sampleNumber)
+GF_Err gf_isom_get_sample_for_movie_time(GF_ISOFile *the_file, u32 trackNumber, u64 movieTime, u32 *StreamDescriptionIndex, GF_ISOSearchMode SearchMode, GF_ISOSample **sample, u32 *sampleNumber, u64 *data_offset)
 {
 	Double tsscale;
 	GF_Err e;
@@ -1921,22 +2130,11 @@
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
-	if (*sample || !sample) return GF_BAD_PARAM;
-	//check 0-duration tracks (BIFS and co). Check we're not searching forward
-	if (!trak->Header->duration) {
-		if (movieTime && ( (SearchMode == GF_ISOM_SEARCH_SYNC_FORWARD) || (SearchMode == GF_ISOM_SEARCH_FORWARD)) ) {
-			*sample = NULL;
-			if (sampleNumber) *sampleNumber = 0;
-			*StreamDescriptionIndex = 0;
-			return GF_EOS;
-		}
-	}
-	else if ((movieTime * trak->moov->mvhd->timeScale > trak->Header->duration * trak->Media->mediaHeader->timeScale)
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	         && !trak->dts_at_seg_start
-#endif
-	        ) {
-		*sample = NULL;
+	//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)
+	) {
 		if (sampleNumber) *sampleNumber = 0;
 		*StreamDescriptionIndex = 0;
 		return GF_EOS;
@@ -1959,12 +2157,18 @@
 			else
 				e = GetPrevMediaTime(trak, movieTime, &mediaTime);
 			if (e) return e;
-			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, (u32) mediaTime, StreamDescriptionIndex, GF_ISOM_SEARCH_SYNC_FORWARD, sample, sampleNumber);
+			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, (u32) mediaTime, StreamDescriptionIndex, GF_ISOM_SEARCH_SYNC_FORWARD, sample, sampleNumber, data_offset);
 		}
 		if (sampleNumber) *sampleNumber = 0;
-		*sample = gf_isom_sample_new();
-		if (! *sample) return GF_OUT_OF_MEM;
-		(*sample)->DTS = movieTime;
+		if (sample) {
+			if (! (*sample)) {
+				*sample = gf_isom_sample_new();
+				if (! *sample) return GF_OUT_OF_MEM;
+			}
+			(*sample)->DTS = movieTime;
+			(*sample)->dataLength = 0;
+			(*sample)->CTS_Offset = 0;
+		}
 		return GF_OK;
 	}
 	/*dwell edit in non-sync mode, fetch next/prev sample depending on mode.
@@ -1977,7 +2181,7 @@
 			else
 				e = GetPrevMediaTime(trak, movieTime, &mediaTime);
 			if (e) return e;
-			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, (u32) mediaTime, StreamDescriptionIndex, GF_ISOM_SEARCH_SYNC_FORWARD, sample, sampleNumber);
+			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, (u32) mediaTime, StreamDescriptionIndex, GF_ISOM_SEARCH_SYNC_FORWARD, sample, sampleNumber, data_offset);
 		}
 	}
 
@@ -1985,7 +2189,7 @@
 	tsscale /= trak->moov->mvhd->timeScale;
 
 	//OK, we have a sample so fetch it
-	e = gf_isom_get_sample_for_media_time(the_file, trackNumber, mediaTime, StreamDescriptionIndex, SearchMode, sample, &sampNum);
+	e = gf_isom_get_sample_for_media_time(the_file, trackNumber, mediaTime, StreamDescriptionIndex, SearchMode, sample, &sampNum, data_offset);
 	if (e) {
 		if (e==GF_EOS) {
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -1994,8 +2198,8 @@
 				return e;
 #endif
 
-			if (nextMediaTime)
-				return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber);
+			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;
 	}
@@ -2003,7 +2207,7 @@
 	//OK, now the trick: we have to rebuild the time stamps, according
 	//to the media time scale (used by SLConfig) - add the edit start time but stay in
 	//the track TS
-	if (useEdit) {
+	if (sample && useEdit) {
 		u64 _ts = (u64)(segStartTime * tsscale);
 
 		(*sample)->DTS += _ts;
@@ -2016,7 +2220,7 @@
 	}
 	if (sampleNumber) *sampleNumber = sampNum;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	if ( (*sample) ) (*sample)->DTS += trak->dts_at_seg_start;
+	if (sample && (*sample) ) (*sample)->DTS += trak->dts_at_seg_start;
 #endif
 
 	return GF_OK;
@@ -2080,7 +2284,7 @@
 
 //get the number of edited segment
 GF_EXPORT
-u32 gf_isom_get_edit_segment_count(GF_ISOFile *the_file, u32 trackNumber)
+u32 gf_isom_get_edits_count(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -2093,7 +2297,7 @@
 
 //Get the desired segment information
 GF_EXPORT
-GF_Err gf_isom_get_edit_segment(GF_ISOFile *the_file, u32 trackNumber, u32 SegmentIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, u8 *EditMode)
+GF_Err gf_isom_get_edit(GF_ISOFile *the_file, u32 trackNumber, u32 SegmentIndex, u64 *EditTime, u64 *SegmentDuration, u64 *MediaTime, GF_ISOEditType *EditMode)
 {
 	u32 i;
 	u64 startTime;
@@ -2141,7 +2345,7 @@
 	GF_TrackBox *trak;
 
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return 0;
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable) return 0;
 	if (trak->Media->information->sampleTable->SyncSample) {
 		if (!trak->Media->information->sampleTable->SyncSample->nb_entries) return 2;
 		return 1;
@@ -2166,15 +2370,15 @@
 GF_EXPORT
 GF_Err gf_isom_get_brand_info(GF_ISOFile *movie, u32 *brand, u32 *minorVersion, u32 *AlternateBrandsCount)
 {
-	if (!movie || !brand) return GF_BAD_PARAM;
+	if (!movie) return GF_BAD_PARAM;
 	if (!movie->brand) {
-		*brand = 0;
-		if (minorVersion) *minorVersion = 0;
+		if (brand) *brand = GF_ISOM_BRAND_ISOM;
+		if (minorVersion) *minorVersion = 1;
 		if (AlternateBrandsCount) *AlternateBrandsCount = 0;
 		return GF_OK;
 	}
 
-	*brand = movie->brand->majorBrand;
+	if (brand) *brand = movie->brand->majorBrand;
 	if (minorVersion) *minorVersion = movie->brand->minorVersion;
 	if (AlternateBrandsCount) *AlternateBrandsCount = movie->brand->altCount;
 	return GF_OK;
@@ -2189,6 +2393,13 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+const u32 *gf_isom_get_brands(GF_ISOFile *movie)
+{
+	if (!movie || !movie->brand) return NULL;
+	return movie->brand->altBrand;
+}
+
 GF_Err gf_isom_get_sample_padding_bits(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, u8 *NbBits)
 {
 	GF_TrackBox *trak;
@@ -2282,7 +2493,7 @@
 
 	i=0;
 	while ((map = (GF_UserDataMap*)gf_list_enum(udta->recordList, &i))) {
-		count = gf_list_count(map->other_boxes);
+		count = gf_list_count(map->boxes);
 
 		if ((map->boxType == GF_ISOM_BOX_TYPE_UUID) && !memcmp(map->uuid, UUID, 16)) return count;
 		else if (map->boxType == UserDataType) return count;
@@ -2291,7 +2502,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, char **userData, u32 *userDataSize)
+GF_Err gf_isom_get_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex, u8 **userData, u32 *userDataSize)
 {
 	GF_UserDataMap *map;
 	GF_UnknownBox *ptr;
@@ -2327,8 +2538,8 @@
 
 found:
 	if (UserDataIndex) {
-		if (UserDataIndex > gf_list_count(map->other_boxes) ) return GF_BAD_PARAM;
-		ptr = (GF_UnknownBox*)gf_list_get(map->other_boxes, UserDataIndex-1);
+		if (UserDataIndex > gf_list_count(map->boxes) ) return GF_BAD_PARAM;
+		ptr = (GF_UnknownBox*)gf_list_get(map->boxes, UserDataIndex-1);
 
 		if (ptr->type == GF_ISOM_BOX_TYPE_UNKNOWN) {
 			*userData = (char *)gf_malloc(sizeof(char)*ptr->dataSize);
@@ -2351,7 +2562,7 @@
 	//serialize all boxes
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	i=0;
-	while ( (ptr = (GF_UnknownBox*)gf_list_enum(map->other_boxes, &i))) {
+	while ( (ptr = (GF_UnknownBox*)gf_list_enum(map->boxes, &i))) {
 		u32 type, s, data_size;
 		char *data=NULL;
 		if (ptr->type == GF_ISOM_BOX_TYPE_UNKNOWN) {
@@ -2375,9 +2586,9 @@
 		if (type==GF_ISOM_BOX_TYPE_UUID) gf_bs_write_data(bs, (char *) map->uuid, 16);
 		if (data) {
 			gf_bs_write_data(bs, data, data_size);
-		} else if (ptr->other_boxes) {
+		} else if (ptr->child_boxes) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-			gf_isom_box_array_write((GF_Box *)ptr, ptr->other_boxes, bs);
+			gf_isom_box_array_write((GF_Box *)ptr, ptr->child_boxes, bs);
 #else
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("ISOBMF: udta is a box-list - cannot export in read-only version of libisom in GPAC\n" ));
 #endif
@@ -2585,7 +2796,7 @@
 #else
 	u64 prevsize, size;
 	u32 i;
-	if (!movie || !movie->movieFileMap || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
+	if (!movie || !movie->movieFileMap || !movie->moov) return GF_BAD_PARAM;
 	if (movie->openMode != GF_ISOM_OPEN_READ) return GF_BAD_PARAM;
 
 	/*refresh size*/
@@ -2622,8 +2833,10 @@
 	prevsize = gf_bs_get_refreshed_size(movie->movieFileMap->bs);
 	if (prevsize==size) return GF_OK;
 
+	if (!movie->moov->mvex)
+		return GF_OK;
 	//ok parse root boxes
-	return gf_isom_parse_movie_boxes(movie, MissingBytes, GF_TRUE);
+	return gf_isom_parse_movie_boxes(movie, NULL, MissingBytes, GF_TRUE);
 #endif
 }
 
@@ -2639,21 +2852,94 @@
 GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start)
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	u32 i, count;
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
-	*top_box_start = movie->current_top_box_start;
+	if (top_box_start) *top_box_start = movie->current_top_box_start;
 	movie->current_top_box_start = 0;
+	movie->NextMoofNumber = 0;
 	if (movie->moov->mvex && movie->single_moof_mode) {
 		movie->single_moof_state = 0;
 	}
+	count = gf_list_count(movie->moov->trackList);
+	for (i=0; i<count; i++) {
+		GF_TrackBox *tk = gf_list_get(movie->moov->trackList, i);
+		tk->first_traf_merged = GF_FALSE;
+	}
+#endif
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_current_top_box_offset(GF_ISOFile *movie, u64 *current_top_box_offset)
+{
+	if (!movie || !movie->moov || !current_top_box_offset) return GF_BAD_PARAM;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	*current_top_box_offset = movie->current_top_box_start;
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_removed_bytes(GF_ISOFile *movie, u64 bytes_removed)
+{
+	if (!movie || !movie->moov) return GF_BAD_PARAM;
+	movie->bytes_removed = bytes_removed;
+	return GF_OK;
+}
+
+GF_Err gf_isom_purge_samples(GF_ISOFile *the_file, u32 trackNumber, u32 nb_samples)
+{
+	GF_TrackBox *trak;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_Err e;
+	GF_TrackExtendsBox *trex;
+	GF_SampleTableBox *stbl;
 #endif
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	/*if trex is already set, restore flags*/
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	trex = the_file->moov->mvex ? GetTrex(the_file->moov, gf_isom_get_track_id(the_file,trackNumber) ) : NULL;
+	if (!trex) return GF_BAD_PARAM;
+
+	//first unpack chunk offsets and CTS
+	e = stbl_UnpackOffsets(trak->Media->information->sampleTable);
+	if (e) return e;
+	e = stbl_unpackCTS(trak->Media->information->sampleTable);
+	if (e) return e;
+
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl->TimeToSample || !stbl->SampleSize || !stbl->SampleToChunk) return GF_ISOM_INVALID_FILE;
+	//then remove first sample
+	while (nb_samples) {
+		//do NOT change the order DTS, CTS, size chunk
+		stbl_RemoveDTS(stbl, 1, 0);
+		stbl_RemoveCTS(stbl, 1);
+		stbl_RemoveSize(stbl, 1);
+		stbl_RemoveChunk(stbl, 1);
+		stbl_RemoveRAP(stbl, 1);
+		stbl_RemoveShadow(stbl, 1);
+		stbl_RemoveRedundant(stbl, 1);
+		stbl_RemoveSubSample(stbl, 1);
+		stbl_RemovePaddingBits(stbl, 1);
+		stbl_RemoveSampleGroup(stbl, 1);
+		nb_samples--;
+	}
 	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
+
 #define RECREATE_BOX(_a, __cast)	\
     if (_a) {	\
         type = _a->type;\
-        gf_isom_box_del((GF_Box *)_a);\
-        _a = __cast gf_isom_box_new(type);\
+        gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *)_a);\
+        _a = __cast gf_isom_box_new_parent(&stbl->child_boxes, type);\
     }\
 
 
@@ -2662,10 +2948,10 @@
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	u32 i, j;
-	GF_Box *a;
 
 	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;
@@ -2692,38 +2978,43 @@
 		RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 		RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 
-		gf_isom_box_array_del(stbl->sai_offsets);
+		gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_offsets);
 		stbl->sai_offsets = NULL;
 
-		gf_isom_box_array_del(stbl->sai_sizes);
+		gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_sizes);
 		stbl->sai_sizes = NULL;
 
-		gf_isom_box_array_del(stbl->sampleGroups);
+		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(a);
+			gf_isom_box_del_parent(&stbl->child_boxes, a);
 			j--;
 			gf_list_rem(stbl->sampleGroupsDescription, j);
 		}
 
-		j = stbl->nb_other_boxes_in_stbl;
-		while ((a = (GF_Box *)gf_list_enum(stbl->other_boxes, &j))) {
-			gf_isom_box_del(a);
+#if 0
+		j = stbl->nb_stbl_boxes;
+		while ((a = (GF_Box *)gf_list_enum(stbl->child_boxes, &j))) {
+			gf_isom_box_del_parent(&stbl->child_boxes, a);
 			j--;
-			gf_list_rem(stbl->other_boxes, j);
 		}
+#endif
 
 		if (reset_sample_count) {
 			trak->Media->information->sampleTable->SampleSize->sampleCount = 0;
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 			trak->sample_count_at_seg_start = 0;
+			trak->dts_at_seg_start = 0;
+			trak->first_traf_merged = GF_FALSE;
 #endif
 		}
 
 	}
-
+	if (reset_sample_count) {
+		movie->NextMoofNumber = 0;
+	}
 #endif
 	return GF_OK;
 
@@ -2739,6 +3030,7 @@
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	has_scalable = gf_isom_needs_layer_reconstruction(movie);
 	base_track_sample_count = 0;
+	movie->moov->compressed_diff = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = (GF_TrackBox*)gf_list_get(movie->moov->trackList, i);
 		trak->first_traf_merged = GF_FALSE;
@@ -2798,47 +3090,54 @@
 			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 
-			gf_isom_box_array_del(stbl->sai_offsets);
+			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_offsets);
 			stbl->sai_offsets = NULL;
 
-			gf_isom_box_array_del(stbl->sai_sizes);
+			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sai_sizes);
 			stbl->sai_sizes = NULL;
 
-			gf_isom_box_array_del(stbl->sampleGroups);
+			gf_isom_box_array_del_parent(&stbl->child_boxes, stbl->sampleGroups);
 			stbl->sampleGroups = NULL;
 
 			if (trak->sample_encryption) {
-				gf_list_del_item(trak->other_boxes, trak->sample_encryption);
-				if (trak->Media->information->sampleTable->other_boxes) {
-					gf_list_del_item(trak->Media->information->sampleTable->other_boxes, 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((GF_Box*)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(a);
+				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;
+			}
 
-			j = stbl->nb_other_boxes_in_stbl;
-			while ((a = (GF_Box *)gf_list_enum(stbl->other_boxes, &j))) {
-				gf_isom_box_del(a);
+#if 0 // TO CHECK
+			j = ptr->nb_stbl_boxes;
+			while ((a = (GF_Box *)gf_list_enum(stbl->child_boxes, &j))) {
+				gf_isom_box_del_parent(&stbl->child_boxes, a);
 				j--;
-				gf_list_rem(stbl->other_boxes, j);
 			}
+#endif
 		}
 
 
 		j = 0;
-		while ((a = (GF_Box *)gf_list_enum(movie->moov->other_boxes, &j))) {
+		while ((a = (GF_Box *)gf_list_enum(movie->moov->child_boxes, &j))) {
 			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
-				gf_isom_box_del(a);
+				gf_isom_box_del_parent(&movie->moov->child_boxes, a);
 				j--;
-				gf_list_rem(movie->moov->other_boxes, j);
 			}
 		}
 	}
@@ -2850,7 +3149,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, u32 flags)
+GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, GF_ISOSegOpenMode flags)
 {
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return GF_NOT_SUPPORTED;
@@ -2881,6 +3180,7 @@
 		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
 		if (e) return e;
 	}
+	movie->moov->compressed_diff = 0;
 	movie->current_top_box_start = 0;
 
 	if (end_range > start_range) {
@@ -2904,9 +3204,8 @@
 	}
 	if (no_order_check) movie->NextMoofNumber = 0;
 
-
 	//ok parse root boxes
-	e = gf_isom_parse_movie_boxes(movie, &MissingBytes, GF_TRUE);
+	e = gf_isom_parse_movie_boxes(movie, NULL, &MissingBytes, GF_TRUE);
 
 	if (!is_scalable_segment)
 		return e;
@@ -2931,13 +3230,14 @@
 }
 
 GF_EXPORT
-u32 gf_isom_get_highest_track_in_scalable_segment(GF_ISOFile *movie, u32 for_base_track)
+GF_ISOTrackID gf_isom_get_highest_track_in_scalable_segment(GF_ISOFile *movie, u32 for_base_track)
 {
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return 0;
 #else
 	s32 max_ref;
-	u32 i, j, track_id;
+	u32 i, j;
+	GF_ISOTrackID track_id;
 
 	max_ref = 0;
 	track_id = 0;
@@ -2956,7 +3256,6 @@
 			case GF_ISOM_SUBTYPE_LHV1:
 				ref = gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_BASE);
 				if (ref<=0) continue;
-				ref_type = GF_ISOM_REF_BASE;
 				break;
 			default:
 				continue;
@@ -2998,7 +3297,7 @@
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !StreamDescriptionIndex || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable) return 0;
 
-	entry = (GF_GenericVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
+	entry = (GF_GenericVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex-1);
 	//no entry or MPEG entry:
 	if (!entry || IsMP4Description(entry->type) ) return NULL;
 	//if we handle the description return false
@@ -3100,9 +3399,9 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) return movie->LastError = GF_BAD_PARAM;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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;
 
@@ -3120,20 +3419,49 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *SampleRate, u32 *Channels, u8 *bitsPerSample)
+GF_Err gf_isom_get_visual_bit_depth(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, u16* bitDepth)
+{
+	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);
+
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+
+	//valid for MPEG visual, JPG and 3GPP H263
+	if (entry->internal_type == GF_ISOM_SAMPLE_ENTRY_VIDEO) {
+		*bitDepth = ((GF_VisualSampleEntryBox*)entry)->bit_depth;
+	} else {
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+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_SampleDescriptionBox *stsd;
+	GF_SampleDescriptionBox *stsd = NULL;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
-	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (trak->Media && trak->Media->information && trak->Media->information->sampleTable && trak->Media->information->sampleTable->SampleDescription)
+		stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) return movie->LastError = GF_BAD_PARAM;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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;
 
@@ -3147,6 +3475,33 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_get_audio_layout(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_AudioChannelLayout *layout)
+{
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_SampleDescriptionBox *stsd;
+	GF_ChannelLayoutBox *chnl;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !layout) return GF_BAD_PARAM;
+	memset(layout, 0, sizeof(GF_AudioChannelLayout));
+
+	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);
+	//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;
+	chnl = (GF_ChannelLayoutBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CHNL);
+	if (!chnl) return GF_NOT_FOUND;
+
+	memcpy(layout, &chnl->layout, sizeof(GF_AudioChannelLayout));
+	return GF_OK;
+}
+GF_EXPORT
 GF_Err gf_isom_get_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *hSpacing, u32 *vSpacing)
 {
 	GF_TrackBox *trak;
@@ -3160,17 +3515,18 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) return movie->LastError = GF_BAD_PARAM;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_OK;
 
 	//valid for MPEG visual, JPG and 3GPP H263
 	if (entry->internal_type==GF_ISOM_SAMPLE_ENTRY_VIDEO) {
-		if (entry->pasp) {
-			*hSpacing = entry->pasp->hSpacing;
-			*vSpacing = entry->pasp->vSpacing;
+		GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_PASP);
+		if (pasp) {
+			*hSpacing = pasp->hSpacing;
+			*vSpacing = pasp->vSpacing;
 		}
 		return GF_OK;
 	} else {
@@ -3184,16 +3540,15 @@
 	GF_TrackBox *trak;
 	GF_VisualSampleEntryBox *entry;
 	GF_SampleDescriptionBox *stsd;
-	u32 i, count;
 
 	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->other_boxes)) return movie->LastError = GF_BAD_PARAM;
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) return movie->LastError = GF_BAD_PARAM;
 
-	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_VisualSampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_OK;
 
@@ -3201,19 +3556,15 @@
 	if (entry->internal_type!=GF_ISOM_SAMPLE_ENTRY_VIDEO) {
 		return GF_BAD_PARAM;
 	}
-	count = gf_list_count(entry->other_boxes);
-	for (i=0; i<count; i++) {
-		GF_ColourInformationBox *clr = gf_list_get(entry->other_boxes, i);
-		if (clr->type != GF_ISOM_BOX_TYPE_COLR) continue;
+	GF_ColourInformationBox *clr = (GF_ColourInformationBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_COLR);
+	if (!clr) return GF_NOT_FOUND;
 
-		if (colour_type) *colour_type = clr->colour_type;
-		if (colour_primaries) *colour_primaries = clr->colour_primaries;
-		if (transfer_characteristics) *transfer_characteristics = clr->transfer_characteristics;
-		if (matrix_coefficients) *matrix_coefficients = clr->matrix_coefficients;
-		if (full_range_flag) *full_range_flag = clr->full_range_flag;
-		return GF_OK;
-	}
-	return GF_NOT_FOUND;
+	if (colour_type) *colour_type = clr->colour_type;
+	if (colour_primaries) *colour_primaries = clr->colour_primaries;
+	if (transfer_characteristics) *transfer_characteristics = clr->transfer_characteristics;
+	if (matrix_coefficients) *matrix_coefficients = clr->matrix_coefficients;
+	if (full_range_flag) *full_range_flag = clr->full_range_flag;
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -3228,10 +3579,10 @@
 
 
 GF_EXPORT
-u8 gf_isom_get_pl_indication(GF_ISOFile *movie, u8 PL_Code)
+u8 gf_isom_get_pl_indication(GF_ISOFile *movie, GF_ISOProfileLevelType PL_Code)
 {
 	GF_IsomInitialObjectDescriptor *iod;
-	if (!movie || !movie->moov) return 0;
+	if (!movie || !movie->moov) return 0xFF;
 	if (!movie->moov->iods || !movie->moov->iods->descriptor) return 0xFF;
 	if (movie->moov->iods->descriptor->tag != GF_ODF_ISOM_IOD_TAG) return 0xFF;
 
@@ -3288,6 +3639,7 @@
 	GF_TrackBox *tk = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!tk) return 0;
 	stsz = tk->Media->information->sampleTable->SampleSize;
+	if (!stsz) return 0;
 	if (stsz->sampleSize) return stsz->sampleSize*stsz->sampleCount;
 	size = 0;
 	for (i=0; i<stsz->sampleCount; i++) size += stsz->sizes[i];
@@ -3392,7 +3744,7 @@
 			if (gf_isom_get_sample_count(file, i+1)>1) nb_m4s++;
 		}
 		else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT)) nb_text++;
-		else if ((mtype==GF_ISOM_MEDIA_AUDIO) || gf_isom_is_video_subtype(mtype) ) {
+		else if ((mtype==GF_ISOM_MEDIA_AUDIO) || gf_isom_is_video_handler_type(mtype) ) {
 			switch (mstype) {
 			case GF_ISOM_SUBTYPE_3GP_AMR:
 			case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -3426,29 +3778,29 @@
 				GF_DecoderConfig *dcd = gf_isom_get_decoder_config(file, i+1, 1);
 				switch (dcd->streamType) {
 				case GF_STREAM_VISUAL:
-					if (dcd->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) nb_m4v++;
-					else if ((dcd->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (dcd->objectTypeIndication==GPAC_OTI_VIDEO_SVC) || (dcd->objectTypeIndication==GPAC_OTI_VIDEO_MVC)) nb_avc++;
+					if (dcd->objectTypeIndication==GF_CODECID_MPEG4_PART2) nb_m4v++;
+					else if ((dcd->objectTypeIndication==GF_CODECID_AVC) || (dcd->objectTypeIndication==GF_CODECID_SVC) || (dcd->objectTypeIndication==GF_CODECID_MVC)) nb_avc++;
 					else nb_v++;
 					break;
 				case GF_STREAM_AUDIO:
 					switch (dcd->objectTypeIndication) {
-					case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-					case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-					case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-					case GPAC_OTI_AUDIO_AAC_MPEG4:
+					case GF_CODECID_AAC_MPEG2_MP:
+					case GF_CODECID_AAC_MPEG2_LCP:
+					case GF_CODECID_AAC_MPEG2_SSRP:
+					case GF_CODECID_AAC_MPEG4:
 						nb_aac++;
 						break;
-					case GPAC_OTI_AUDIO_MPEG2_PART3:
-					case GPAC_OTI_AUDIO_MPEG1:
+					case GF_CODECID_MPEG2_PART3:
+					case GF_CODECID_MPEG_AUDIO:
 						nb_mp3++;
 						break;
-					case GPAC_OTI_AUDIO_EVRC_VOICE:
+					case GF_CODECID_EVRC:
 						nb_evrc++;
 						break;
-					case GPAC_OTI_AUDIO_SMV_VOICE:
+					case GF_CODECID_SMV:
 						nb_smv++;
 						break;
-					case GPAC_OTI_AUDIO_13K_VOICE:
+					case GF_CODECID_QCELP:
 						nb_qcelp++;
 						break;
 					default:
@@ -3532,7 +3884,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_apple_get_tag(GF_ISOFile *mov, u32 tag, const char **data, u32 *data_len)
+GF_Err gf_isom_apple_get_tag(GF_ISOFile *mov, GF_ISOiTunesTag tag, const u8 **data, u32 *data_len)
 {
 	u32 i;
 	GF_ListItemBox *info;
@@ -3545,13 +3897,13 @@
 	meta = gf_isom_apple_get_meta_extensions(mov);
 	if (!meta) return GF_URL_ERROR;
 
-	ilst = gf_ismo_locate_box(meta->other_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
+	ilst = gf_ismo_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;
 
 	i=0;
-	while ( (info=(GF_ListItemBox*)gf_list_enum(ilst->other_boxes, &i))) {
+	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;
@@ -3570,7 +3922,7 @@
 //	if (info->data->flags != 0x1) return GF_URL_ERROR;
 	*data = info->data->data;
 	*data_len = info->data->dataSize;
-	if ((tag==GF_ISOM_ITUNE_COVER_ART) && (info->data->flags==14)) *data_len |= (1<<31);
+	if ((tag==GF_ISOM_ITUNE_COVER_ART) && (info->data->flags==14)) *data_len |= 0x80000000; //(1<<31);
 	return GF_OK;
 }
 
@@ -3584,14 +3936,14 @@
 	GF_TrackBox *trak;
 
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
+	if (!trak || !trak->Header) return GF_BAD_PARAM;
 	*alternateGroupID = trak->Header->alternate_group;
 	*nb_groups = 0;
 	if (!trak->udta) return GF_OK;
 
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (!map) return GF_OK;
-	*nb_groups = gf_list_count(map->other_boxes);
+	*nb_groups = gf_list_count(map->boxes);
 	return GF_OK;
 }
 
@@ -3607,7 +3959,7 @@
 
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (!map) return NULL;
-	tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, group_index-1);
+	tsel = (GF_TrackSelectionBox*)gf_list_get(map->boxes, group_index-1);
 	*switchGroupID = tsel->switchGroup;
 	*criteriaListSize = tsel->attributeListCount;
 	return (const u32 *) tsel->attributeList;
@@ -3654,7 +4006,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 *rvc_predefined, char **data, u32 *size, const char **mime)
+GF_Err gf_isom_get_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 *rvc_predefined, u8 **data, u32 *size, const char **mime)
 {
 	GF_MPEGVisualSampleEntryBox *entry;
 	GF_TrackBox *trak;
@@ -3666,16 +4018,17 @@
 	if (!trak) return GF_BAD_PARAM;
 
 
-	entry = (GF_MPEGVisualSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescriptionIndex-1);
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex-1);
 	if (!entry ) return GF_BAD_PARAM;
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	if (!entry->rvcc) return GF_BAD_PARAM;
+	GF_RVCConfigurationBox *rvcc = (GF_RVCConfigurationBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_RVCC);
+	if (!rvcc) return GF_NOT_FOUND;
 
-	*rvc_predefined = entry->rvcc->predefined_rvc_config;
-	if (entry->rvcc->rvc_meta_idx) {
+	*rvc_predefined = rvcc->predefined_rvc_config;
+	if (rvcc->rvc_meta_idx) {
 		if (!data || !size) return GF_OK;
-		return gf_isom_extract_meta_item_mem(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx, data, size, mime, GF_FALSE);
+		return gf_isom_extract_meta_item_mem(movie, GF_FALSE, track, rvcc->rvc_meta_idx, data, size, NULL, mime, GF_FALSE);
 	}
 	return GF_OK;
 }
@@ -3811,11 +4164,11 @@
 				continue;
 			}
 			/*we found our sample*/
-			group_desc_index = 1 + sg->sample_entries[j].group_description_index;
+			group_desc_index = sg->sample_entries[j].group_description_index;
 			break;
 		}
 		/*no sampleGroup info associated*/
-		if (group_desc_index <= 1) continue;
+		if (!group_desc_index) continue;
 
 		sgdesc = NULL;
 		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription); j++) {
@@ -3835,7 +4188,8 @@
 			if (has_roll) *has_roll = GF_TRUE;
 			if (roll_distance) {
 				GF_RollRecoveryEntry *roll_entry = (GF_RollRecoveryEntry *) gf_list_get(sgdesc->group_descriptions, group_desc_index - 1);
-				if (roll_entry) *roll_distance = roll_entry->roll_distance;
+				if (roll_entry)
+					*roll_distance = roll_entry->roll_distance;
 			}
 			break;
 		}
@@ -3843,11 +4197,11 @@
 	return GF_OK;
 }
 
-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)
+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;
 
-	if (!trak || !sample_description_index) return NULL;
+	if (!trak || !sample_group_description_index) return NULL;
 	if (!trak->Media->information->sampleTable->sampleGroupsDescription) return NULL;
 
 	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
@@ -3855,19 +4209,19 @@
 		GF_SampleGroupDescriptionBox *sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
 		if (sgdesc->grouping_type != grouping_type) continue;
 
-		if (sgdesc->default_description_index && !sample_description_index) sample_description_index = sgdesc->default_description_index;
+		if (sgdesc->default_description_index && !sample_group_description_index) sample_group_description_index = sgdesc->default_description_index;
 
 		if (default_index) *default_index = sgdesc->default_description_index ;
 		if (out_sgdp) *out_sgdp = sgdesc;
 
-		if (!sample_description_index) return NULL;
-		return (GF_DefaultSampleGroupDescriptionEntry*)gf_list_get(sgdesc->group_descriptions, sample_description_index-1);
+		if (!sample_group_description_index) return NULL;
+		return (GF_DefaultSampleGroupDescriptionEntry*)gf_list_get(sgdesc->group_descriptions, sample_group_description_index-1);
 	}
 	return NULL;
 }
 
 GF_EXPORT
-Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const char **data, u32 *size)
+Bool gf_isom_get_sample_group_info(GF_ISOFile *the_file, u32 trackNumber, u32 sample_description_index, u32 grouping_type, u32 *default_index, const u8 **data, u32 *size)
 {
 	GF_DefaultSampleGroupDescriptionEntry *sg_entry;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3925,39 +4279,44 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *movie, u32 trackID, u32 *nb_samples, u64 *duration)
+GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *movie, GF_ISOTrackID trackID, u32 *nb_samples, u64 *duration)
 {
 	u32 i=0;
 	u32 k, l;
-	u64 def_duration, samp_dur;
 	GF_MovieFragmentBox *moof;
 	GF_TrackFragmentBox *traf;
 
 	*nb_samples = 0;
 	*duration = 0;
 	while ((moof=(GF_MovieFragmentBox*)gf_list_enum(movie->TopBoxes, &i))) {
-		if (moof->type==GF_ISOM_BOX_TYPE_MOOF) {
-			u32 j=0;
-			while ((traf=(GF_TrackFragmentBox*)gf_list_enum( moof->TrackList, &j))) {
-				if (traf->tfhd->trackID != trackID)
-					continue;
+		u32 j=0;
+		if (moof->type!=GF_ISOM_BOX_TYPE_MOOF) continue;
 
-				def_duration = 0;
-				if (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) def_duration = traf->tfhd->def_sample_duration;
-				else if (traf->trex) def_duration = traf->trex->def_sample_duration;
-
-				for (k=0; k<gf_list_count(traf->TrackRuns); k++) {
-					GF_TrackFragmentRunBox *trun = (GF_TrackFragmentRunBox*)gf_list_get(traf->TrackRuns, k);
-					*nb_samples += gf_list_count(trun->entries);
+		while ((traf=(GF_TrackFragmentBox*)gf_list_enum( moof->TrackList, &j))) {
+			u64 def_duration, samp_dur=0;
 
-					for (l=0; l<gf_list_count(trun->entries); l++) {
-						GF_TrunEntry *ent = (GF_TrunEntry*)gf_list_get(trun->entries, l);
+			if (traf->tfhd->trackID != trackID)
+				continue;
 
-						samp_dur = def_duration;
-						if (trun->flags & GF_ISOM_TRUN_DURATION) samp_dur = ent->Duration;
+			def_duration = 0;
+			if (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) def_duration = traf->tfhd->def_sample_duration;
+			else if (traf->trex) def_duration = traf->trex->def_sample_duration;
+
+			for (k=0; k<gf_list_count(traf->TrackRuns); k++) {
+				GF_TrackFragmentRunBox *trun = (GF_TrackFragmentRunBox*)gf_list_get(traf->TrackRuns, k);
+				u32 nb_ent = gf_list_count(trun->entries);
+				*nb_samples += trun->sample_count;
+
+				for (l=0; l<gf_list_count(trun->entries); l++) {
+					GF_TrunEntry *ent = (GF_TrunEntry*)gf_list_get(trun->entries, l);
+
+					samp_dur = def_duration;
+					if (trun->flags & GF_ISOM_TRUN_DURATION) samp_dur = ent->Duration;
+					if (nb_ent == trun->sample_count)
 						*duration += samp_dur;
-					}
 				}
+				if (nb_ent != trun->sample_count)
+					*duration += samp_dur * trun->sample_count;
 			}
 		}
 	}
@@ -3966,7 +4325,7 @@
 #endif
 
 GF_EXPORT
-GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode)
+GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, GF_ISONaluExtractMode nalu_extract_mode)
 {
 	GF_TrackReferenceTypeBox *dpnd;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
@@ -3984,7 +4343,7 @@
 }
 
 GF_EXPORT
-u32 gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber)
+GF_ISONaluExtractMode gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return 0;
@@ -4036,19 +4395,12 @@
 
 
 GF_EXPORT
-void gf_isom_no_version_date_info(GF_ISOFile *file, Bool drop_info)
-{
-	if (!file) return;
-	file->drop_date_version_info = drop_info;
-}
-
-GF_EXPORT
 u32 gf_isom_get_pssh_count(GF_ISOFile *file)
 {
 	u32 count=0;
 	u32 i=0;
 	GF_Box *a_box;
-	while ((a_box = (GF_Box*)gf_list_enum(file->moov->other_boxes, &i))) {
+	while ((a_box = (GF_Box*)gf_list_enum(file->moov->child_boxes, &i))) {
 		if (a_box->type != GF_ISOM_BOX_TYPE_PSSH) continue;
 		count++;
 	}
@@ -4063,7 +4415,7 @@
 	GF_BitStream *bs;
 	u32 count=1;
 	GF_Box *pssh;
-	while ((pssh = (GF_Box *)gf_list_enum(file->moov->other_boxes, &i))) {
+	while ((pssh = (GF_Box *)gf_list_enum(file->moov->child_boxes, &i))) {
 		if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
 		if (count == pssh_index) break;
 		count++;
@@ -4072,19 +4424,19 @@
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	e = gf_isom_box_write(pssh, bs);
 	if (!e) {
-		gf_bs_get_content(bs, (char **)pssh_data, pssh_size);
+		gf_bs_get_content(bs, pssh_data, pssh_size);
 	}
 	gf_bs_del(bs);
 	return e;
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size)
+GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *version, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size)
 {
 	u32 count=1;
 	u32 i=0;
 	GF_ProtectionSystemHeaderBox *pssh;
-	while ((pssh = (GF_ProtectionSystemHeaderBox *)gf_list_enum(file->moov->other_boxes, &i))) {
+	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++;
@@ -4092,6 +4444,7 @@
 	if (!pssh) return GF_BAD_PARAM;
 
 	if (SystemID) memcpy(SystemID, pssh->SystemID, 16);
+	if (version) *version = pssh->version;
 	if (KID_count) *KID_count = pssh->KID_count;
 	if (KIDs) *KIDs = (const bin128 *) pssh->KIDs;
 	if (private_data_size) *private_data_size = pssh->private_data_size;
@@ -4101,9 +4454,9 @@
 
 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, u32 *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_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)
 #else
-GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, void *traf, GF_SampleEncryptionBox *senc, u32 sample_number, u32 *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_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)
 #endif
 {
 	GF_SampleGroupBox *sample_group;
@@ -4123,18 +4476,23 @@
 	if (constant_IV_size) *constant_IV_size = 0;
 	if (constant_IV) memset(*constant_IV, 0, 16);
 
+	if (!trak) return GF_BAD_PARAM;
+
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	if (traf)
-		return GF_BAD_PARAM;
+		return GF_NOT_SUPPORTED;
+#else
+	sample_number -= trak->sample_count_at_seg_start;
 #endif
 
-	if (trak && trak->Media->information->sampleTable->SampleSize && trak->Media->information->sampleTable->SampleSize->sampleCount>=sample_number) {
+	if (trak->Media->information->sampleTable->SampleSize && trak->Media->information->sampleTable->SampleSize->sampleCount>=sample_number) {
 		stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, NULL);
 	} else {
-		//this is dump mode of fragments, we haven't merged tables yet :(
-		descIndex = 1;
+		//this is dump mode of fragments, we haven't merged tables yet - use current stsd idx indicated in trak
+		descIndex = trak->current_traf_stsd_idx;
+		if (!descIndex) descIndex = 1;
 	}
-	gf_isom_cenc_get_default_info_ex(trak, descIndex, IsEncrypted, IV_size, KID, constant_IV_size, constant_IV, crypt_byte_block, skip_byte_block);
+	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);
 
 	sample_group = NULL;
 	group_desc_index = 0;
@@ -4196,16 +4554,17 @@
 			if (sgdesc->grouping_type==sample_group->grouping_type) break;
 			sgdesc = NULL;
 		}
-	} else if (traf) {
-		group_desc_index -= 0x10000;
+	}
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	else if (traf) {
+		group_desc_index -= 0x10000;
 		for (j=0; j<gf_list_count(traf->sampleGroupsDescription); j++) {
 			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(traf->sampleGroupsDescription, j);
 			if (sgdesc->grouping_type==sample_group->grouping_type) break;
 			sgdesc = NULL;
 		}
-#endif
 	}
+#endif
 	/*no sampleGroup description found for this group (invalid file)*/
 	if (!sgdesc) return GF_ISOM_INVALID_FILE;
 
@@ -4221,23 +4580,27 @@
 	if (constant_IV) memmove(*constant_IV, entry->constant_IV, 16);
 
 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) ) {
-		if (!senc->is_piff) {
-			senc->is_piff = GF_TRUE;
-			senc->IV_size=8;
+	if (( (senc && senc->is_piff) || (trak->moov && trak->moov->mov->is_smooth) ) && IV_size && !(*IV_size) ) {
+		if (!senc) {
+			*IV_size = 8;
+			if (IsEncrypted) *IsEncrypted = GF_TRUE;
+		} else {
+			if (!senc->is_piff) {
+				senc->is_piff = GF_TRUE;
+				senc->IV_size = 8;
+			}
+			assert(senc->IV_size);
+			*IV_size = senc->IV_size;
+			if (IsEncrypted) *IsEncrypted = GF_TRUE;
 		}
-		assert(senc->IV_size);
-		*IV_size = senc->IV_size;
-		*IsEncrypted = GF_TRUE;
 	}
 
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID,
+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_TrackBox *trak = gf_isom_get_track_from_file(movie, track);
@@ -4247,7 +4610,7 @@
 }
 
 GF_EXPORT
-Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, u32 *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info)
+Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, GF_ISOTrackID *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info)
 {
 	if (!file) return GF_FALSE;
 	if (refTrackID) *refTrackID = 0;
@@ -4287,7 +4650,7 @@
 }
 
 
-void gf_isom_parse_trif_info(const char *data, u32 size, u32 *id, u32 *independent, Bool *full_picture, u32 *x, u32 *y, u32 *w, u32 *h)
+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)
 {
 	GF_BitStream *bs;
 	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
@@ -4313,7 +4676,7 @@
 GF_EXPORT
 Bool gf_isom_get_tile_info(GF_ISOFile *file, u32 trackNumber, u32 sample_description_index, u32 *default_sample_group_index, u32 *id, u32 *independent, Bool *full_picture, u32 *x, u32 *y, u32 *w, u32 *h)
 {
-	const char *data;
+	const u8 *data;
 	u32 size;
 
 	if (!gf_isom_get_sample_group_info(file, trackNumber, sample_description_index, GF_ISOM_SAMPLE_GROUP_TRIF, default_sample_group_index, &data, &size))
@@ -4323,12 +4686,6 @@
 }
 
 GF_EXPORT
-Bool gf_isom_drop_date_version_info_enabled(GF_ISOFile *file)
-{
-    return file->drop_date_version_info;
-}
-
-GF_EXPORT
 Bool gf_isom_get_oinf_info(GF_ISOFile *file, u32 trackNumber, GF_OperatingPointsInformation **ptr)
 {
 	u32 oref_track, def_index=0;
@@ -4349,7 +4706,50 @@
 }
 
 GF_EXPORT
-Bool gf_isom_is_video_subtype(u32 mtype)
+GF_Err gf_isom_set_byte_offset(GF_ISOFile *file, s64 byte_offset)
+{
+	if (!file) return GF_BAD_PARAM;
+	file->read_byte_offset = byte_offset;
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_isom_get_nalu_length_field(GF_ISOFile *file, u32 track, u32 StreamDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_MPEGVisualSampleEntryBox *ve;
+	GF_SampleDescriptionBox *stsd;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) {
+		file->LastError = GF_BAD_PARAM;
+		return 0;
+	}
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd || !StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		file->LastError = GF_BAD_PARAM;
+		return 0;
+	}
+
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (!entry || ! gf_isom_is_nalu_based_entry(trak->Media, entry)) {
+		file->LastError = GF_BAD_PARAM;
+		return 0;
+	}
+
+	ve = (GF_MPEGVisualSampleEntryBox*)entry;
+	if (ve->avc_config) return ve->avc_config->config->nal_unit_size;
+	if (ve->svc_config) return ve->svc_config->config->nal_unit_size;
+	if (ve->hevc_config) return ve->hevc_config->config->nal_unit_size;
+	if (ve->lhvc_config) return ve->lhvc_config->config->nal_unit_size;
+	return 0;
+}
+
+GF_EXPORT
+Bool gf_isom_is_video_handler_type(u32 mtype)
 {
 	switch (mtype) {
 	case GF_ISOM_MEDIA_VISUAL:
@@ -4375,11 +4775,11 @@
 	if (!trak || !trak->Media) return GF_BAD_PARAM;
 
 	mrate = arate = dbsize = 0;
-	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	count = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 	for (i=0; i<count; i++) {
 		if ((sampleDescIndex>0) && (i+1 != sampleDescIndex)) continue;
 
-		ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		ent = (GF_SampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
 		if (!ent) return GF_BAD_PARAM;
 		a = gf_isom_sample_entry_get_bitrate(ent, GF_FALSE);
 		if (a) {
@@ -4393,7 +4793,7 @@
 		case GF_ISOM_BOX_TYPE_ENCV:
 		case GF_ISOM_BOX_TYPE_ENCA:
 		case GF_ISOM_BOX_TYPE_ENCS:
-			sinf = gf_list_get(ent->protections, 0);
+			sinf = (GF_ProtectionSchemeInfoBox *) gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_SINF);
 			if (sinf && sinf->original_format) type = sinf->original_format->data_format;
 			break;
 		}
@@ -4421,13 +4821,21 @@
 	return GF_OK;
 }
 
+void gf_isom_enable_traf_map_templates(GF_ISOFile *movie)
+{
+	if (movie)
+		movie->signal_frag_bounds=GF_TRUE;
+}
+
 GF_EXPORT
-Bool gf_isom_sample_was_traf_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum)
+Bool gf_isom_sample_is_fragment_start(GF_ISOFile *movie, u32 trackNumber, u32 sampleNum, GF_ISOFragmentBoundaryInfo *frag_info)
 {
 	u32 i;
 	GF_TrackBox *trak;
 	GF_TrafToSampleMap *tmap;
 
+	if (frag_info) memset(frag_info, 0, sizeof(GF_ISOFragmentBoundaryInfo));
+
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media) return GF_FALSE;
 	if (!trak->Media->information->sampleTable->traf_map) return GF_FALSE;
@@ -4435,10 +4843,138 @@
 	tmap = trak->Media->information->sampleTable->traf_map;
 	if (!tmap) return GF_FALSE;
 	for (i=0; i<tmap->nb_entries; i++) {
-		if (tmap->sample_num[i] == sampleNum) return GF_TRUE;
-		if (tmap->sample_num[i] > sampleNum) return GF_FALSE;
+		GF_TrafMapEntry *finfo = &tmap->frag_starts[i];
+		if (finfo->sample_num == sampleNum) {
+			if (frag_info) {
+				frag_info->frag_start = finfo->moof_start;
+				frag_info->mdat_end = finfo->mdat_end;
+				frag_info->moof_template = finfo->moof_template;
+				frag_info->moof_template_size = finfo->moof_template_size;
+				frag_info->seg_start_plus_one = finfo->seg_start_plus_one;
+				frag_info->sidx_start = finfo->sidx_start;
+				frag_info->sidx_end = finfo->sidx_end;
+			}
+			return GF_TRUE;
+		}
+
+		if (tmap->frag_starts[i].sample_num > sampleNum) return GF_FALSE;
 	}
 	return GF_FALSE;
 }
 
+
+
+
+GF_EXPORT
+GF_Err gf_isom_get_jp2_config(GF_ISOFile *movie, u32 trackNumber, u32 sampleDesc, u8 **out_dsi, u32 *out_size)
+{
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	GF_BitStream *bs;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription) return GF_ISOM_INVALID_FILE;
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDesc-1);
+	if (!entry || !entry->jp2h) return GF_BAD_PARAM;
+	if (!entry->jp2h->ihdr) return GF_ISOM_INVALID_FILE;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_isom_box_array_write((GF_Box*)entry->jp2h, entry->jp2h->child_boxes, bs);
+	gf_bs_get_content(bs, out_dsi, out_size);
+	gf_bs_del(bs);
+	return GF_OK;
+}
+
+
+Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type)
+{
+	Bool res = GF_FALSE;
+#ifndef GPAC_DISABLE_ISOM_WRITE
+	GF_BitStream *bs1, *bs2;
+	u8 *buf1, *buf2;
+	u32 len1, len2;
+
+	if (!ptr1 || !ptr2)
+		return GF_FALSE;
+
+	bs1 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr1, bs1);
+	} else {
+		gf_isom_box_write((GF_Box *)ptr1, bs1);
+	}
+	gf_bs_get_content(bs1, &buf1, &len1);
+	gf_bs_del(bs1);
+
+	bs2 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr2, bs2);
+	} else {
+		gf_isom_box_write((GF_Box *)ptr2, bs2);
+	}
+	gf_bs_get_content(bs2, &buf2, &len2);
+	gf_bs_del(bs2);
+
+
+	if ((len1==len2) && !memcmp(buf1, buf2, len1))
+		res = GF_TRUE;
+
+	gf_free(buf1);
+	gf_free(buf2);
+#endif
+	return res;
+}
+
+GF_EXPORT
+u64 gf_isom_get_track_magic(GF_ISOFile *movie, u32 trackNumber)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return 0;
+	return trak->magic;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_file_offset_for_time(GF_ISOFile *movie, Double start_time, u64 *max_offset)
+{
+	u32 i;
+	u64 start_ts, cur_start_time;
+	u64 offset=0;
+	if (!movie || !movie->moov)
+		return GF_BAD_PARAM;
+
+	if (!movie->main_sidx) return GF_NOT_SUPPORTED;
+	start_ts = (u64) (start_time * movie->main_sidx->timescale);
+	cur_start_time = 0;
+	offset = movie->main_sidx->first_offset + movie->main_sidx_end_pos;
+
+	for (i=0; i<movie->main_sidx->nb_refs; i++) {
+		if (cur_start_time >= start_ts) {
+			*max_offset = offset;
+			return GF_OK;
+		}
+		cur_start_time += movie->main_sidx->refs[i].subsegment_duration;
+		offset += movie->main_sidx->refs[i].reference_size;
+	}
+
+	return GF_EOS;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_sidx_duration(GF_ISOFile *movie, u64 *sidx_dur, u32 *sidx_timescale)
+{
+	u64 dur=0;
+	u32 i;
+	if (!movie || !movie->moov || !sidx_timescale || !sidx_dur)
+		return GF_BAD_PARAM;
+
+	if (!movie->main_sidx) return GF_NOT_SUPPORTED;
+	*sidx_timescale = movie->main_sidx->timescale;
+
+	for (i=0; i<movie->main_sidx->nb_refs; i++) {
+		dur += movie->main_sidx->refs[i].subsegment_duration;
+	}
+	*sidx_dur = dur;
+	return GF_OK;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/isomedia/isom_store.c -> gpac-1.0.0.tar.gz/src/isomedia/isom_store.c Changed

@@ -3,7 +3,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2000-2019
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,7 +29,9 @@
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
 #define GPAC_ISOM_CPRT_NOTICE "IsoMedia File Produced with GPAC"
-#define GPAC_ISOM_CPRT_NOTICE_VERSION GPAC_ISOM_CPRT_NOTICE" "GPAC_FULL_VERSION
+
+#include <gpac/revision.h>
+#define GPAC_ISOM_CPRT_NOTICE_VERSION GPAC_ISOM_CPRT_NOTICE" "GPAC_VERSION "-rev" GPAC_GIT_REVISION
 
 static GF_Err gf_isom_insert_copyright(GF_ISOFile *movie)
 {
@@ -44,7 +46,7 @@
 				if (!strcmp(_free->data, GPAC_ISOM_CPRT_NOTICE_VERSION)) return GF_OK;
 				if (strstr(_free->data, GPAC_ISOM_CPRT_NOTICE)) {
 					gf_free(_free->data);
-					_free->data = gf_strdup(movie->drop_date_version_info ? GPAC_ISOM_CPRT_NOTICE : GPAC_ISOM_CPRT_NOTICE_VERSION);
+					_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);
 					return GF_OK;
 				}
@@ -54,7 +56,7 @@
 	a = gf_isom_box_new(GF_ISOM_BOX_TYPE_FREE);
 	if (!a) return GF_OUT_OF_MEM;
 	_free = (GF_FreeSpaceBox *)a;
-	_free->data = gf_strdup(movie->drop_date_version_info ? GPAC_ISOM_CPRT_NOTICE : GPAC_ISOM_CPRT_NOTICE_VERSION);
+	_free->data = gf_strdup(gf_sys_is_test_mode() ? GPAC_ISOM_CPRT_NOTICE : GPAC_ISOM_CPRT_NOTICE_VERSION);
 	_free->dataSize = (u32) strlen(_free->data) + 1;
 	if (!_free->data) return GF_OUT_OF_MEM;
 	return gf_list_add(movie->TopBoxes, _free);
@@ -67,7 +69,7 @@
 	/*timeScale of the media (for interleaving)*/
 	u32 timeScale;
 	/*this is for generic, time-based interleaving. Expressed in Media TimeScale*/
-	u32 chunkDur;
+	u64 chunkDur;
 	u32 chunkSize;
 	u32 constant_size, constant_dur;
 
@@ -84,21 +86,22 @@
 	GF_SampleToChunkBox *stsc;
 	/*we don't know if it's a large offset or not*/
 	GF_Box *stco;
+	//track uses a box requiring seeking into the moov during write, we cannot dispatch blocks
+	Bool prevent_dispatch;
 } TrackWriter;
 
 typedef struct
 {
 	char *buffer;
-	u32 size;
+	u32 alloc_size;
 	GF_ISOFile *movie;
 	u32 total_samples, nb_done;
 } MovieWriter;
 
 void CleanWriters(GF_List *writers)
 {
-	TrackWriter *writer;
 	while (gf_list_count(writers)) {
-		writer = (TrackWriter*)gf_list_get(writers, 0);
+		TrackWriter *writer = (TrackWriter*)gf_list_get(writers, 0);
 		gf_isom_box_del(writer->stco);
 		gf_isom_box_del((GF_Box *)writer->stsc);
 		gf_free(writer);
@@ -106,7 +109,7 @@
 	}
 }
 
-void ResetWriters(GF_List *writers)
+GF_Err ResetWriters(GF_List *writers)
 {
 	u32 i;
 	TrackWriter *writer;
@@ -119,6 +122,7 @@
 		writer->sampleNumber = 1;
 		gf_isom_box_del((GF_Box *)writer->stsc);
 		writer->stsc = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
+		if (!writer->stsc) return GF_OUT_OF_MEM;
 		if (writer->stco->type == GF_ISOM_BOX_TYPE_STCO) {
 			gf_free(((GF_ChunkOffsetBox *)writer->stco)->offsets);
 			((GF_ChunkOffsetBox *)writer->stco)->offsets = NULL;
@@ -131,6 +135,7 @@
 			((GF_ChunkLargeOffsetBox *)writer->stco)->alloc_size = 0;
 		}
 	}
+	return GF_OK;
 }
 
 GF_Err SetupWriters(MovieWriter *mw, GF_List *writers, u8 interleaving)
@@ -155,6 +160,9 @@
 		writer->timeScale = trak->Media->mediaHeader->timeScale;
 		writer->all_dref_mode = Media_SelfContainedType(writer->mdia);
 
+		if (trak->sample_encryption)
+			writer->prevent_dispatch = GF_TRUE;
+
 		writer->isDone = 0;
 		writer->DTSprev = 0;
 		writer->chunkDur = 0;
@@ -170,11 +178,13 @@
 			writer->constant_size = writer->constant_dur = 0;
 
 		writer->stsc = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
+		if (!writer->stsc) return GF_OUT_OF_MEM;
 		if (writer->stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
 			writer->stco = gf_isom_box_new(GF_ISOM_BOX_TYPE_STCO);
 		} else {
 			writer->stco = gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
 		}
+		if (!writer->stco) return GF_OUT_OF_MEM;
 		/*stops from chunk escape*/
 		if (interleaving) writer->stbl->MaxSamplePerChunk = 0;
 		/*for progress, assume only one descIndex*/
@@ -190,6 +200,8 @@
 				gf_list_insert(writers, writer, 0);
 			}
 		}
+		if (movie->sample_groups_in_traf && trak->Media->information->sampleTable)
+			trak->Media->information->sampleTable->skip_sample_groups = GF_TRUE;
 	}
 	return GF_OK;
 
@@ -289,6 +301,43 @@
 
 }
 
+#define COMP_BOX_COST_BYTES		8
+
+GF_Err gf_isom_write_compressed_box(GF_ISOFile *mov, GF_Box *root_box, u32 repl_type, GF_BitStream *bs, u32 *box_csize)
+{
+#ifdef GPAC_DISABLE_ZLIB
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e;
+	GF_BitStream *comp_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	e = gf_isom_box_write(root_box, comp_bs);
+
+	if (!e) {
+		u8 *box_data;
+		u32 box_size, comp_size;
+
+		if (box_csize)
+			*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);
+		if (mov->force_compress || (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);
+				gf_bs_write_data(bs, box_data, comp_size);
+			}
+			if (box_csize)
+				*box_csize = comp_size + COMP_BOX_COST_BYTES;
+		} else if (bs) {
+			gf_bs_write_data(bs, box_data, box_size);
+		}
+		gf_free(box_data);
+	}
+	gf_bs_del(comp_bs);
+	return e;
+#endif /*GPAC_DISABLE_ZLIB*/
+}
 
 //replace the chunk and offset tables...
 static GF_Err WriteMoovAndMeta(GF_ISOFile *movie, GF_List *writers, GF_BitStream *bs)
@@ -308,21 +357,41 @@
 	}
 
 	if (movie->moov) {
+		Bool prevent_dispatch = GF_FALSE;
 		//switch all our tables
 		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;
+			if (writer->prevent_dispatch)
+				prevent_dispatch = GF_TRUE;
+		}
+		if (prevent_dispatch) {
+			gf_bs_prevent_dispatch(bs, GF_TRUE);
 		}
 		//write the moov box...
 		e = gf_isom_box_size((GF_Box *)movie->moov);
 		if (e) return e;
-		e = gf_isom_box_write((GF_Box *)movie->moov, bs);
+
+		if ((movie->compress_mode==GF_ISO_COMP_ALL) || (movie->compress_mode==GF_ISO_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);
+		}
+
+		if (prevent_dispatch) {
+			gf_bs_prevent_dispatch(bs, GF_FALSE);
+		}
+
 		//and re-switch our table. We have to do it that way because it is
 		//needed when the moov is written first
 		i=0;
@@ -332,8 +401,13 @@
 			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);
 		}
 		if (e) return e;
 	}
@@ -345,10 +419,10 @@
 {
 	u32 i;
 	u64 size;
-	TrackWriter *writer;
 
 	size = 0;
 	if (movie->moov) {
+		TrackWriter *writer;
 		gf_isom_box_size((GF_Box *)movie->moov);
 		size = movie->moov->size;
 		if (size > 0xFFFFFFFF) size += 8;
@@ -373,6 +447,15 @@
 	return size;
 }
 
+static void muxer_report_progress(MovieWriter *mw)
+{
+	if (mw->movie->progress_cbk) {
+		mw->movie->progress_cbk(mw->movie->progress_cbk_udta, mw->nb_done, mw->total_samples);
+	} else {
+		gf_set_progress("ISO File Writing", mw->nb_done, mw->total_samples);
+	}
+}
+
 //Write a sample to the file - this is only called for self-contained media
 GF_Err WriteSample(MovieWriter *mw, u32 size, u64 offset, u8 isEdited, GF_BitStream *bs, u32 nb_samp)
 {
@@ -381,9 +464,9 @@
 
 	if (!size) return GF_OK;
 
-	if (size>mw->size) {
+	if (size>mw->alloc_size) {
 		mw->buffer = (char*)gf_realloc(mw->buffer, size);
-		mw->size = size;
+		mw->alloc_size = size;
 	}
 
 	if (!mw->buffer) return GF_OUT_OF_MEM;
@@ -403,7 +486,7 @@
 		return GF_IO_ERR;
 
 	mw->nb_done+=nb_samp;
-	gf_set_progress("ISO File Writing", mw->nb_done, mw->total_samples);
+	muxer_report_progress(mw);
 	return GF_OK;
 }
 
@@ -427,12 +510,13 @@
 		nb_in_run = nb_samp_left_in_src_chunk;
 	} else {
 
-		chunk_dur =  movie->interleavingTime * tkw->timeScale;
-		chunk_dur /= movie->moov->mvhd->timeScale;
+		chunk_dur = movie->interleavingTime * tkw->timeScale;
+		if (movie->moov && movie->moov->mvhd && movie->moov->mvhd->timeScale)
+			chunk_dur /= movie->moov->mvhd->timeScale;
+
 		chunk_dur -= tkw->chunkDur;
 
 		if (chunk_dur <= tkw->chunkDur) return;
-
 		chunk_dur -= tkw->constant_dur;
 
 		nb_in_run = (u32) (chunk_dur / tkw->constant_dur);
@@ -447,7 +531,7 @@
 
 	chunk_dur = nb_in_run * tkw->constant_dur;
 
-	tkw->chunkDur += (u32) chunk_dur;
+	tkw->chunkDur += (u32) chunk_dur - tkw->constant_dur; //because tkw->chunkDur already include duration of first sample of chunk
 	tkw->DTSprev += chunk_dur - tkw->constant_dur; //because nb_samp += nb_in_run-1
 
 	*nb_samp = nb_in_run;
@@ -499,9 +583,7 @@
 				if (!iinf->data_len) {
 					src = gf_fopen(iinf->full_path, "rb");
 					if (!src) continue;
-					gf_fseek(src, 0, SEEK_END);
-					it_size = gf_ftell(src);
-					gf_fseek(src, 0, SEEK_SET);
+					it_size = gf_fsize(src);
 				} else {
 					it_size = iinf->data_len;
 				}
@@ -509,6 +591,7 @@
 
 				if (!gf_list_count(iloc->extent_entries)) {
 					GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+					if (!entry) return GF_OUT_OF_MEM;
 					gf_list_add(iloc->extent_entries, entry);
 				}
 				entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
@@ -522,7 +605,7 @@
 						u64 remain = entry->extent_length;
 						while (remain) {
 							u32 size_cache = (remain>4096) ? 4096 : (u32) remain;
-							size_t read = fread(cache_data, sizeof(char), size_cache, src);
+							size_t read = gf_fread(cache_data, size_cache, src);
 							if (read ==(size_t) -1) break;
 							gf_bs_write_data(bs, cache_data, (u32) read);
 							remain -= (u32) read;
@@ -534,7 +617,6 @@
 				if (src) gf_fclose(src);
 			}
 			else if (gf_list_count(iloc->extent_entries)) {
-				u32 j;
 				j=0;
 				while ((entry = (GF_ItemExtentEntry *)gf_list_enum(iloc->extent_entries, &j))) {
 					if (entry->extent_index) continue;
@@ -566,6 +648,7 @@
 			/*we MUST have at least one extent for the dref data*/
 			if (!gf_list_count(iloc->extent_entries)) {
 				GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+				if (!entry) return GF_OUT_OF_MEM;
 				gf_list_add(iloc->extent_entries, entry);
 			}
 			entry = (GF_ItemExtentEntry *)gf_list_get(iloc->extent_entries, 0);
@@ -698,15 +781,15 @@
 
 
 //write the file track by track, with moov box before or after the mdat
-GF_Err WriteFlat(MovieWriter *mw, u8 moovFirst, GF_BitStream *bs)
+static GF_Err WriteFlat(MovieWriter *mw, u8 moovFirst, GF_BitStream *bs, Bool non_seakable, Bool for_fragments, GF_BitStream *moov_bs)
 {
 	GF_Err e;
 	u32 i;
 	u64 offset, finalOffset, totSize, begin, firstSize, finalSize;
-	GF_Box *a;
+	GF_Box *a, *cprt_box=NULL;
 	GF_List *writers = gf_list_new();
 	GF_ISOFile *movie = mw->movie;
-
+	s32 moov_meta_pos=-1;
 	begin = totSize = 0;
 
 	//first setup the writers
@@ -714,7 +797,7 @@
 	if (e) goto exit;
 
 	if (!moovFirst) {
-		if (movie->openMode == GF_ISOM_OPEN_WRITE) {
+		if ((movie->openMode == GF_ISOM_OPEN_WRITE) && !non_seakable) {
 			begin = 0;
 			totSize = gf_isom_datamap_get_offset(movie->editFileMap);
 			/*start boxes have not been written yet, do it*/
@@ -748,7 +831,7 @@
 				if (movie->pdin) begin += movie->pdin->size;
 			}
 			totSize -= begin;
-		} else {
+		} else if (!non_seakable || for_fragments) {
 			if (movie->is_jp2) {
 				gf_bs_write_u32(bs, 12);
 				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_JP);
@@ -776,6 +859,7 @@
 			/*written by hand*/
 			case GF_ISOM_BOX_TYPE_MOOV:
 			case GF_ISOM_BOX_TYPE_META:
+				moov_meta_pos = i-1;
 			case GF_ISOM_BOX_TYPE_FTYP:
 			case GF_ISOM_BOX_TYPE_PDIN:
 #ifndef GPAC_DISABLE_ISOM_ADOBE
@@ -791,25 +875,82 @@
 					if (e) goto exit;
 					continue;
 				}
-				//to avoid computing the size each time write always 4 + 4 + 8 bytes before
-				begin = gf_bs_get_position(bs);
-				gf_bs_write_u64(bs, 0);
-				gf_bs_write_u64(bs, 0);
-				e = DoWrite(mw, writers, bs, 0, gf_bs_get_position(bs));
-				if (e) goto exit;
-				totSize = gf_bs_get_position(bs) - begin;
+				if (non_seakable) {
+					begin = gf_bs_get_position(bs);
+					//do a sim pass to get the true mdat size
+					e = DoWrite(mw, writers, bs, 1, begin);
+					if (e) goto exit;
+
+					if (movie->mdat->dataSize > 0xFFFFFFFF) {
+						gf_bs_write_u32(bs, 1);
+					} else {
+						gf_bs_write_u32(bs, (u32) movie->mdat->dataSize + 8);
+					}
+					gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
+					if (movie->mdat->dataSize > 0xFFFFFFFF) gf_bs_write_u64(bs, movie->mdat->dataSize + 8 + 8);
+					//reset writers and write samples
+					ResetWriters(writers);
+					e = DoWrite(mw, writers, bs, 0, gf_bs_get_position(bs));
+					if (e) goto exit;
+					movie->mdat->size = movie->mdat->dataSize;
+					totSize = 0;
+				} else {
+					//to avoid computing the size each time write always 4 + 4 + 8 bytes before
+					begin = gf_bs_get_position(bs);
+					gf_bs_write_u64(bs, 0);
+					gf_bs_write_u64(bs, 0);
+					e = DoWrite(mw, writers, bs, 0, gf_bs_get_position(bs));
+					if (e) goto exit;
+					totSize = gf_bs_get_position(bs) - begin;
+				}
 				break;
+
+			case GF_ISOM_BOX_TYPE_FREE:
+				//for backward compat with old arch, keep copyright before moov
+				if (((GF_FreeSpaceBox*)a)->dataSize>4) {
+					GF_FreeSpaceBox *fr = (GF_FreeSpaceBox*) a;
+					if ((fr->dataSize>20) && !strncmp(fr->data, "IsoMedia File", 13)) {
+						e = gf_isom_box_size(a);
+						if (e) goto exit;
+						e = gf_isom_box_write(a, bs);
+						if (e) goto exit;
+						cprt_box = a;
+						break;
+					}
+				}
 			default:
-				e = gf_isom_box_size(a);
-				if (e) goto exit;
-				e = gf_isom_box_write(a, bs);
-				if (e) goto exit;
+				if (moov_meta_pos < 0) {
+					e = gf_isom_box_size(a);
+					if (e) goto exit;
+					e = gf_isom_box_write(a, bs);
+					if (e) goto exit;
+				}
 				break;
 			}
 		}
 
+		if (moov_bs) {
+			e = DoWrite(mw, writers, bs, 1, movie->mdat->bsOffset);
+			if (e) goto exit;
+
+			firstSize = GetMoovAndMetaSize(movie, writers);
+
+			offset = firstSize;
+			e = ShiftOffset(movie, writers, offset);
+			if (e) goto exit;
+			//get the size and see if it has changed (eg, we moved to 64 bit offsets)
+			finalSize = GetMoovAndMetaSize(movie, writers);
+			if (firstSize != finalSize) {
+				finalOffset = finalSize;
+				//OK, now we're sure about the final size.
+				//we don't need to re-emulate, as the only thing that changed is the offset
+				//so just shift the offset
+				e = ShiftOffset(movie, writers, finalOffset - offset);
+				if (e) goto exit;
+			}
+		}
 		//OK, write the movie box.
-		e = WriteMoovAndMeta(movie, writers, bs);
+		e = WriteMoovAndMeta(movie, writers, moov_bs ? moov_bs : bs);
 		if (e) goto exit;
 
 #ifndef GPAC_DISABLE_ISOM_ADOBE
@@ -840,8 +981,28 @@
 			gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
 			if (totSize > 0xFFFFFFFF) gf_bs_write_u64(bs, totSize);
 			e = gf_bs_seek(bs, offset);
+			movie->mdat->size = totSize;
+		}
+
+		//then the rest
+		i = (u32) (moov_meta_pos + 1);
+		while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
+			if (a==cprt_box) continue;
+
+			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_PDIN:
+			case GF_ISOM_BOX_TYPE_MDAT:
+				break;
+			default:
+				e = gf_isom_box_size(a);
+				if (e) goto exit;
+				e = gf_isom_box_write(a, bs);
+				if (e) goto exit;
+			}
 		}
-		movie->mdat->size = totSize;
 		goto exit;
 	}
 
@@ -868,6 +1029,39 @@
 		e = gf_isom_box_write((GF_Box *)movie->pdin, bs);
 		if (e) goto exit;
 	}
+
+	//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:
+			moov_meta_pos = i-1;
+			break;
+		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_PDIN:
+		case GF_ISOM_BOX_TYPE_MDAT:
+			break;
+		//for backward compat with old arch keep out copyright after moov
+		case GF_ISOM_BOX_TYPE_FREE:
+			if (((GF_FreeSpaceBox*)a)->dataSize>4) {
+				GF_FreeSpaceBox *fr = (GF_FreeSpaceBox*) a;
+				if ((fr->dataSize>20) && !strncmp(fr->data, "IsoMedia File", 13)) {
+					cprt_box = a;
+					break;
+				}
+			}
+		default:
+			if (moov_meta_pos<0) {
+				e = gf_isom_box_size(a);
+				if (e) goto exit;
+				e = gf_isom_box_write(a, bs);
+				if (e) goto exit;
+			}
+			break;
+		}
+	}
+
 	//What we will do is first emulate the write from the beginning...
 	//note: this will set the size of the mdat
 	e = DoWrite(mw, writers, bs, 1, gf_bs_get_position(bs));
@@ -900,9 +1094,11 @@
 	ResetWriters(writers);
 	e = DoWrite(mw, writers, bs, 0, 0);
 	if (e) goto exit;
+
 	//then the rest
 	i=0;
 	while ((a = (GF_Box*)gf_list_enum(movie->TopBoxes, &i))) {
+		if ((i-1<= (u32) moov_meta_pos) && (a!=cprt_box)) continue;
 		switch (a->type) {
 		case GF_ISOM_BOX_TYPE_MOOV:
 		case GF_ISOM_BOX_TYPE_META:
@@ -1054,7 +1250,8 @@
 		//go to next group
 		curGroupID ++;
 	}
-	movie->mdat->dataSize = totSize;
+	if (movie->mdat)
+		movie->mdat->dataSize = totSize;
 	return GF_OK;
 }
 
@@ -1070,6 +1267,7 @@
 	GF_Err e;
 	u32 descIndex, sampSize, chunkNumber;
 	u64 DTS;
+	u32 moov_timescale;
 	u16 curGroupID;
 	Bool forceNewChunk, writeGroup;
 	GF_StscEntry *stsc_ent;
@@ -1091,9 +1289,11 @@
 		memset(blank, 0, sizeof(char)*1024*1024);
 		while (i<count) {
 			u32 res = gf_bs_write_data(bs, blank, 1024*1024);
-			if (res != 1024*1024) fprintf(stderr, "error writing to disk: only %d bytes written\n", res);
+			if (res != 1024*1024) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("error writing to disk: only %d bytes written\n", res));
+			}
 			i++;
-			fprintf(stderr, "writing blank block: %.02f done - %d/%d \r", (100.0*i)/count , i, count);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("writing blank block: %.02f done - %d/%d \r", (100.0*i)/count , i, count));
 		}
 		gf_free(blank);
 	}
@@ -1139,6 +1339,8 @@
 	offset += mdatSize;
 #endif
 
+	moov_timescale = movie->moov && movie->moov->mvhd ? movie->moov->mvhd->timeScale : 1000;
+
 	count = gf_list_count(writers);
 	//browse each groups
 	while (1) {
@@ -1165,6 +1367,8 @@
 				while (1) {
 					Bool self_contained;
 					u32 nb_samp = 1;
+					u32 sample_dur;
+					u64 chunk_prev_dur;
 					//To Check: are empty sample tables allowed ???
 					if (tmp->sampleNumber > tmp->stbl->SampleSize->sampleCount) {
 						tmp->isDone = 1;
@@ -1173,10 +1377,10 @@
 					}
 
 					//OK, get the current sample in this track
-					stbl_GetSampleDTS(tmp->stbl->TimeToSample, tmp->sampleNumber, &DTS);
+					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) *  movie->moov->mvhd->timeScale > movie->interleavingTime * tmp->timeScale
+					if ( ( (DTS - tmp->DTSprev) + tmp->chunkDur) * moov_timescale > movie->interleavingTime * tmp->timeScale
 					        /*drift check: reject sample if outside our check window*/
 					        || (drift_inter && chunkLastDTS && ( ((u64)tmp->DTSprev*chunkLastScale) > ((u64)chunkLastDTS*tmp->timeScale)) )
 					   ) {
@@ -1186,6 +1390,7 @@
 						} else {
 							//this one is full. go to next one (exit the loop)
 							tmp->chunkDur = 0;
+							//forceNewChunk = 0;
 							break;
 						}
 					} else {
@@ -1194,10 +1399,21 @@
 					//OK, we can write this track
 					curWriter = tmp;
 
-					//small check for first 2 samples (DTS = 0 :)
-					if (tmp->sampleNumber == 2 && !tmp->chunkDur) forceNewChunk = 0;
+					//small check for first 2 samples (DTS = 0)
+					//only in the old mode can chunkdur be 0 for dts 0
+					if (tmp->sampleNumber == 2 && !tmp->chunkDur && gf_sys_old_arch_compat() ) {
+						forceNewChunk = 0;
+					}
 
-					tmp->chunkDur += (u32) (DTS - tmp->DTSprev);
+					chunk_prev_dur = tmp->chunkDur;
+					//FIXME we do not apply patch in test mode for now since this breaks all our hashes, remove this
+					//once we move to filters permanently
+					if (!gf_sys_old_arch_compat()) {
+						tmp->chunkDur += sample_dur;
+					} else {
+						//old style, compute based on DTS diff
+						tmp->chunkDur += (u32) (DTS - tmp->DTSprev);
+					}
 					tmp->DTSprev = DTS;
 
 					e = stbl_GetSampleInfos(curWriter->stbl, curWriter->sampleNumber, &sampOffset, &chunkNumber, &descIndex, &stsc_ent);
@@ -1213,6 +1429,7 @@
 
 					if (curWriter->stbl->MaxChunkSize && (curWriter->chunkSize + sampSize > curWriter->stbl->MaxChunkSize)) {
 						curWriter->chunkSize = 0;
+						tmp->chunkDur -= chunk_prev_dur;
 						forceNewChunk = 1;
 					}
 					curWriter->chunkSize += sampSize;
@@ -1265,7 +1482,7 @@
 
 					this ensures a proper drift regulation (max DTS diff is less than the interleaving window)
 					*/
-					chunkLastDTS += curWriter->timeScale * movie->interleavingTime / movie->moov->mvhd->timeScale;
+					chunkLastDTS += curWriter->timeScale * movie->interleavingTime / moov_timescale;
 				}
 			}
 			//no sample found, we're done with this group
@@ -1288,7 +1505,8 @@
 {
 	GF_Err e;
 	u32 i;
-	GF_Box *a;
+	s32 moov_meta_pos=-1;
+	GF_Box *a, *cprt_box=NULL;
 	u64 firstSize, finalSize, offset, finalOffset;
 	GF_List *writers = gf_list_new();
 	GF_ISOFile *movie = mw->movie;
@@ -1316,6 +1534,38 @@
 		if (e) goto exit;
 	}
 
+	//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:
+			moov_meta_pos = i-1;
+			break;
+		case GF_ISOM_BOX_TYPE_FTYP:
+		case GF_ISOM_BOX_TYPE_PDIN:
+		case GF_ISOM_BOX_TYPE_MDAT:
+			break;
+		case GF_ISOM_BOX_TYPE_FREE:
+			//for backward compat with old arch, keep copyright before moov
+			if (((GF_FreeSpaceBox*)a)->dataSize>4) {
+				GF_FreeSpaceBox *fr = (GF_FreeSpaceBox*) a;
+				if ((fr->dataSize>20) && !strncmp(fr->data, "IsoMedia File", 13)) {
+					cprt_box = a;
+					break;
+				}
+			}
+		default:
+			if (moov_meta_pos<0) {
+				e = gf_isom_box_size(a);
+				if (e) goto exit;
+				e = gf_isom_box_write(a, bs);
+				if (e) goto exit;
+			}
+			break;
+		}
+	}
+
 	e = DoInterleave(mw, writers, bs, 1, gf_bs_get_position(bs), drift_inter);
 	if (e) goto exit;
 
@@ -1354,9 +1604,12 @@
 	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))) {
+		if ((i-1 < (u32) moov_meta_pos) && (a != cprt_box))
+			continue;
 		switch (a->type) {
 		case GF_ISOM_BOX_TYPE_MOOV:
 		case GF_ISOM_BOX_TYPE_META:
@@ -1379,11 +1632,10 @@
 }
 
 extern u32 default_write_buffering_size;
+GF_Err gf_isom_flush_chunk(GF_TrackBox *trak, Bool is_final);
 
-GF_Err WriteToFile(GF_ISOFile *movie)
+GF_Err WriteToFile(GF_ISOFile *movie, Bool for_fragments)
 {
-	FILE *stream;
-	GF_BitStream *bs;
 	MovieWriter mw;
 	GF_Err e = GF_OK;
 	if (!movie) return GF_BAD_PARAM;
@@ -1396,48 +1648,135 @@
 	memset(&mw, 0, sizeof(mw));
 	mw.movie = movie;
 
-	if (movie->drop_date_version_info && movie->moov) {
+
+	if (movie->moov) {
 		u32 i;
 		GF_TrackBox *trak;
-		movie->moov->mvhd->creationTime = 0;
-		movie->moov->mvhd->modificationTime = 0;
+		if (gf_sys_is_test_mode()) {
+			movie->moov->mvhd->creationTime = 0;
+			movie->moov->mvhd->modificationTime = 0;
+		}
 		i=0;
 		while ( (trak = gf_list_enum(movie->moov->trackList, &i))) {
-			trak->Header->creationTime = 0;
-			trak->Header->modificationTime = 0;
-			if (trak->Media->handler->nameUTF8 && strstr(trak->Media->handler->nameUTF8, "@GPAC")) {
-				gf_free(trak->Media->handler->nameUTF8);
-				trak->Media->handler->nameUTF8 = gf_strdup("MediaHandler");
+			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")) {
+					gf_free(trak->Media->handler->nameUTF8);
+					trak->Media->handler->nameUTF8 = gf_strdup("MediaHandler");
+				}
+				trak->Media->mediaHeader->creationTime = 0;
+				trak->Media->mediaHeader->modificationTime = 0;
+			}
+			if (trak->chunk_cache) {
+				gf_isom_flush_chunk(trak, GF_TRUE);
 			}
-			trak->Media->mediaHeader->creationTime = 0;
-			trak->Media->mediaHeader->modificationTime = 0;
 		}
 	}
-
 	//capture mode: we don't need a new bitstream
 	if (movie->openMode == GF_ISOM_OPEN_WRITE) {
-		e = WriteFlat(&mw, 0, movie->editFileMap->bs);
+		if (!strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
+			GF_BitStream *bs, *moov_bs=NULL;
+			u64 mdat_end = gf_bs_get_position(movie->editFileMap->bs);
+			u64 mdat_start = movie->mdat->bsOffset;
+			u64 mdat_size = mdat_end - mdat_start;
+
+			if (for_fragments) {
+				if (!movie->on_block_out) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Missing output block callback, cannot write\n"));
+					return GF_BAD_PARAM;
+				}
+				bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+				e = WriteFlat(&mw, 0, bs, GF_TRUE, GF_TRUE, NULL);
+				movie->fragmented_file_pos = gf_bs_get_position(bs);
+				gf_bs_del(bs);
+				return e;
+			}
+			//seek at end in case we had a read of the file
+			gf_bs_seek(movie->editFileMap->bs, gf_bs_get_size(movie->editFileMap->bs) );
+
+			if ((movie->storageMode==GF_ISOM_STORE_FASTSTART) && mdat_start && mdat_size) {
+				moov_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			}
+			//write as non-seekable
+			e = WriteFlat(&mw, 0, movie->editFileMap->bs, GF_TRUE, GF_FALSE, moov_bs);
+
+			movie->fragmented_file_pos = gf_bs_get_position(movie->editFileMap->bs);
+
+			if (mdat_start && mdat_size) {
+				u8 data[16];
+				if (!movie->on_block_out) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Missing output block patch callback, cannot patch mdat size in flat storage\n"));
+					return GF_BAD_PARAM;
+				}
+
+				//create a patch packet for mdat covering out 16 bytes (cf FlushCapture)
+				bs = gf_bs_new(data, 16, GF_BITSTREAM_WRITE);
+				gf_bs_write_u32(bs, (mdat_size>0xFFFFFFFF) ? 1 : (u32) mdat_size);
+				gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_MDAT);
+				if  (mdat_size>0xFFFFFFFF)
+					gf_bs_write_u64(bs, mdat_size);
+				else
+					gf_bs_write_u64(bs, 0);
+				gf_bs_del(bs);
+				movie->on_block_patch(movie->on_block_out_usr_data, data, 16, mdat_start, GF_FALSE);
+			}
+
+			if (moov_bs) {
+				u8 *moov_data;
+				u32 moov_size;
+
+				gf_bs_get_content(moov_bs, &moov_data, &moov_size);
+				gf_bs_del(moov_bs);
+
+				movie->on_block_patch(movie->on_block_out_usr_data, moov_data, moov_size, mdat_start, GF_TRUE);
+				gf_free(moov_data);
+			}
+		} else {
+			GF_BitStream *moov_bs = NULL;
+			if ((movie->storageMode==GF_ISOM_STORE_STREAMABLE) || (movie->storageMode==GF_ISOM_STORE_FASTSTART) ) {
+				moov_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			}
+			e = WriteFlat(&mw, 0, movie->editFileMap->bs, GF_FALSE, GF_FALSE, moov_bs);
+			if (moov_bs) {
+				u8 *moov_data;
+				u32 moov_size;
+
+				gf_bs_get_content(moov_bs, &moov_data, &moov_size);
+				gf_bs_del(moov_bs);
+				if (!e)
+					e = gf_bs_insert_data(movie->editFileMap->bs, moov_data, moov_size, movie->mdat->bsOffset);
+					
+				gf_free(moov_data);
+			}
+		}
 	} else {
-		u32 buffer_size = movie->editFileMap ? gf_bs_get_output_buffering(movie->editFileMap->bs) : 0;
-		Bool is_stdout = 0;
-		if (!strcmp(movie->finalName, "std"))
-			is_stdout = 1;
-
-		//OK, we need a new bitstream
-		stream = is_stdout ? stdout : gf_fopen(movie->finalName, "w+b");
-		if (!stream)
-			return GF_IO_ERR;
-		bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
+		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"));
+				return GF_BAD_PARAM;
+			}
+			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 (!strcmp(movie->finalName, "std"))
+				is_stdout = GF_TRUE;
+
+			//OK, we need a new bitstream
+			stream = is_stdout ? stdout : gf_fopen(movie->finalName, "w+b");
+			if (!stream)
+				return GF_IO_ERR;
+			bs = gf_bs_from_file(stream, GF_BITSTREAM_WRITE);
+		}
 		if (!bs) {
 			if (!is_stdout)
 				gf_fclose(stream);
 			return GF_OUT_OF_MEM;
 		}
 
-		if (buffer_size) {
-			gf_bs_set_output_buffering(bs, buffer_size);
-		}
-
 		switch (movie->storageMode) {
 		case GF_ISOM_STORE_TIGHT:
 		case GF_ISOM_STORE_INTERLEAVED:
@@ -1447,10 +1786,10 @@
 			e = WriteInterleaved(&mw, bs, 1);
 			break;
 		case GF_ISOM_STORE_STREAMABLE:
-			e = WriteFlat(&mw, 1, bs);
+			e = WriteFlat(&mw, 1, bs, is_stdout, GF_FALSE, NULL);
 			break;
 		default:
-			e = WriteFlat(&mw, 0, bs);
+			e = WriteFlat(&mw, 0, bs, is_stdout, GF_FALSE, NULL);
 			break;
 		}
 
@@ -1460,7 +1799,8 @@
 	}
 	if (mw.buffer) gf_free(mw.buffer);
 	if (mw.nb_done<mw.total_samples) {
-		gf_set_progress("ISO File Writing", mw.total_samples, mw.total_samples);
+		mw.nb_done = mw.total_samples;
+		muxer_report_progress(&mw);
 	}
 	return e;
 }

gpac-0.8.0.tar.gz/src/isomedia/isom_write.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -30,7 +30,7 @@
 
 #if !defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)
 
-GF_Err CanAccessMovie(GF_ISOFile *movie, u32 Mode)
+GF_Err CanAccessMovie(GF_ISOFile *movie, GF_ISOOpenMode Mode)
 {
 	if (!movie) return GF_BAD_PARAM;
 	if (movie->openMode < Mode) return GF_ISOM_INVALID_MODE;
@@ -61,6 +61,16 @@
 	/*make sure nothing was added*/
 	if (gf_bs_get_position(movie->editFileMap->bs)) return GF_OK;
 
+	if (!strcmp(movie->fileName, "_gpac_isobmff_redirect")) {
+		if (!movie->on_block_out) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Missing output block callback, cannot write\n"));
+			return GF_BAD_PARAM;
+		}
+
+		gf_bs_del(movie->editFileMap->bs);
+		movie->editFileMap->bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+	}
+
 	/*add all first boxes*/
 	if (movie->brand) {
 		e = gf_isom_box_size((GF_Box *)movie->brand);
@@ -74,11 +84,13 @@
 		e = gf_isom_box_write((GF_Box *)movie->pdin, movie->editFileMap->bs);
 		if (e) return e;
 	}
+	movie->mdat->bsOffset = gf_bs_get_position(movie->editFileMap->bs);
 
 	/*we have a trick here: the data will be stored on the fly, so the first
 	thing in the file is the MDAT. As we don't know if we have a large file (>4 GB) or not
 	do as if we had one and write 16 bytes: 4 (type) + 4 (size) + 8 (largeSize)...*/
-	gf_bs_write_int(movie->editFileMap->bs, 0, 128);
+	gf_bs_write_long_int(movie->editFileMap->bs, 0, 64);
+	gf_bs_write_long_int(movie->editFileMap->bs, 0, 64);
 	return GF_OK;
 }
 
@@ -109,9 +121,10 @@
 	if (!od) return GF_OUT_OF_MEM;
 	((GF_IsomObjectDescriptor *)od)->objectDescriptorID = 1;
 
-	iods = (GF_ObjectDescriptorBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_IODS);
+	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_AddBox((GF_Box*)moov, (GF_Box *)iods);
+	return moov_on_child_box((GF_Box*)moov, (GF_Box *)iods);
 }
 
 //add a track to the root OD
@@ -123,7 +136,8 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
 
@@ -151,7 +165,7 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	if (!movie->moov || !movie->moov->iods) return GF_OK;
-	gf_isom_box_del((GF_Box *)movie->moov->iods);
+	gf_isom_box_del_parent(&movie->moov->child_boxes, (GF_Box *)movie->moov->iods);
 	movie->moov->iods = NULL;
 	return GF_OK;
 }
@@ -171,9 +185,10 @@
 
 	if (!gf_isom_is_track_in_root_od(movie, trackNumber)) return GF_OK;
 
-	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
-	if (!movie->moov->iods) return GF_OUT_OF_MEM;
-
+	if (!movie->moov->iods) {
+		e = AddMovieIOD(movie->moov, 0);
+		if (e) return e;
+	}
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_IOD_TAG:
 		esds = ((GF_IsomInitialObjectDescriptor *)movie->moov->iods->descriptor)->ES_ID_IncDescriptors;
@@ -188,7 +203,7 @@
 	//get the desc
 	i=0;
 	while ((inc = (GF_ES_ID_Inc*)gf_list_enum(esds, &i))) {
-		if (inc->trackID == gf_isom_get_track_id(movie, trackNumber)) {
+		if (inc->trackID == (u32) gf_isom_get_track_id(movie, trackNumber)) {
 			gf_odf_desc_del((GF_Descriptor *)inc);
 			gf_list_rem(esds, i-1);
 			break;
@@ -222,7 +237,7 @@
 
 //sets the enable flag of a track
 GF_EXPORT
-GF_Err gf_isom_set_track_enabled(GF_ISOFile *movie, u32 trackNumber, u8 enableTrack)
+GF_Err gf_isom_set_track_enabled(GF_ISOFile *movie, u32 trackNumber, Bool enableTrack)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -241,14 +256,35 @@
 	return GF_OK;
 }
 
+//sets the enable flag of a track
 GF_EXPORT
-GF_Err gf_isom_set_media_language(GF_ISOFile *movie, u32 trackNumber, char *code)
+GF_Err gf_isom_set_track_flags(GF_ISOFile *movie, u32 trackNumber, u32 flags, GF_ISOMTrackFlagOp op)
 {
 	GF_Err e;
 	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) return GF_BAD_PARAM;
+	if (op==GF_ISOM_TKFLAGS_ADD)
+		trak->Header->flags |= flags;
+	else if (op==GF_ISOM_TKFLAGS_REM)
+		trak->Header->flags &= ~flags;
+	else
+		trak->Header->flags = flags;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_media_language(GF_ISOFile *movie, u32 trackNumber, char *code)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !code) return GF_BAD_PARAM;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -277,20 +313,17 @@
 		u32 i, count;
 		GF_ExtendedLanguageBox *elng;
 		elng = NULL;
-		count = gf_list_count(trak->Media->other_boxes);
+		count = gf_list_count(trak->Media->child_boxes);
 		for (i = 0; i < count; i++) {
-			GF_Box *box = (GF_Box *)gf_list_get(trak->Media->other_boxes, i);
+			GF_Box *box = (GF_Box *)gf_list_get(trak->Media->child_boxes, i);
 			if (box->type == GF_ISOM_BOX_TYPE_ELNG) {
 				elng = (GF_ExtendedLanguageBox *)box;
 				break;
 			}
 		}
 		if (!elng && (strlen(code) > 3)) {
-			elng = (GF_ExtendedLanguageBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ELNG);
-			if (!count) {
-				trak->Media->other_boxes = gf_list_new();
-			}
-			gf_list_add(trak->Media->other_boxes, elng);
+			elng = (GF_ExtendedLanguageBox *)gf_isom_box_new_parent(&trak->Media->child_boxes, GF_ISOM_BOX_TYPE_ELNG);
+			if (!elng) return GF_OUT_OF_MEM;
 		}
 		if (elng) {
 			if (elng->extended_language) {
@@ -304,20 +337,24 @@
 	return GF_OK;
 }
 
-static void gf_isom_set_root_iod(GF_ISOFile *movie)
+static GF_Err gf_isom_set_root_iod(GF_ISOFile *movie)
 {
 	GF_IsomInitialObjectDescriptor *iod;
 	GF_IsomObjectDescriptor *od;
-
-	gf_isom_insert_moov(movie);
+	GF_Err e;
+	
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 	if (!movie->moov->iods) {
 		AddMovieIOD(movie->moov, 1);
-		return;
+		return GF_OK;
 	}
 	//if OD, switch to IOD
-	if (movie->moov->iods->descriptor->tag == GF_ODF_ISOM_IOD_TAG) return;
+	if (movie->moov->iods->descriptor->tag == GF_ODF_ISOM_IOD_TAG) return GF_OK;
 	od = (GF_IsomObjectDescriptor *) movie->moov->iods->descriptor;
 	iod = (GF_IsomInitialObjectDescriptor*)gf_malloc(sizeof(GF_IsomInitialObjectDescriptor));
+	if (!iod) return GF_OUT_OF_MEM;
+
 	memset(iod, 0, sizeof(GF_IsomInitialObjectDescriptor));
 
 	iod->ES_ID_IncDescriptors = od->ES_ID_IncDescriptors;
@@ -337,20 +374,24 @@
 
 	gf_odf_desc_del((GF_Descriptor *) od);
 	movie->moov->iods->descriptor = (GF_Descriptor *)iod;
+	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *movie, GF_Descriptor *theDesc)
+GF_Err gf_isom_add_desc_to_root_od(GF_ISOFile *movie, const GF_Descriptor *theDesc)
 {
 	GF_Err e;
 	GF_Descriptor *desc, *dupDesc;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
-	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
-	if (!movie->moov->iods) return GF_OUT_OF_MEM;
+	if (!movie->moov->iods) {
+		e = AddMovieIOD(movie->moov, 0);
+		if (e) return e;
+	}
 	if (theDesc->tag==GF_ODF_IPMP_TL_TAG) gf_isom_set_root_iod(movie);
 
 	desc = movie->moov->iods->descriptor;
@@ -360,7 +401,7 @@
 	case GF_ODF_ISOM_IOD_TAG:
 	case GF_ODF_ISOM_OD_TAG:
 		//duplicate the desc
-		e = gf_odf_desc_copy(theDesc, &dupDesc);
+		e = gf_odf_desc_copy((GF_Descriptor *)theDesc, &dupDesc);
 		if (e) return e;
 		//add it (MUST BE  (I)OD level desc)
 		movie->LastError = gf_odf_desc_add_desc(desc, dupDesc);
@@ -382,7 +423,8 @@
 	GF_Err e;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (movie->moov->mvhd->timeScale == timeScale) return GF_OK;
 
@@ -393,7 +435,7 @@
 		movie->moov->mvex->mehd->fragment_duration *= timeScale;
 		movie->moov->mvex->mehd->fragment_duration /= movie->moov->mvhd->timeScale;
 	}
-	
+
 	i=0;
 	while ((trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
 		trak->Header->duration *= timeScale;
@@ -408,7 +450,10 @@
 			}
 		}
 	}
-
+	if (movie->moov->mvex && movie->moov->mvex->mehd) {
+		movie->moov->mvex->mehd->fragment_duration *= timeScale;
+		movie->moov->mvex->mehd->fragment_duration /= movie->moov->mvhd->timeScale;
+	}
 	movie->moov->mvhd->timeScale = timeScale;
 	movie->interleavingTime = timeScale;
 	return GF_OK;
@@ -416,7 +461,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_set_pl_indication(GF_ISOFile *movie, u8 PL_Code, u8 ProfileLevel)
+GF_Err gf_isom_set_pl_indication(GF_ISOFile *movie, u8 PL_Code, GF_ISOProfileLevelType ProfileLevel)
 {
 	GF_IsomInitialObjectDescriptor *iod;
 	GF_Err e;
@@ -424,7 +469,9 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	gf_isom_set_root_iod(movie);
+	e = gf_isom_set_root_iod(movie);
+	if (e) return e;
+
 	iod = (GF_IsomInitialObjectDescriptor *)movie->moov->iods->descriptor;
 
 	switch (PL_Code) {
@@ -457,9 +504,12 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	gf_isom_insert_moov(movie);
-	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
-	if (!movie->moov->iods) return GF_OUT_OF_MEM;
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
+	if (!movie->moov->iods) {
+		e = AddMovieIOD(movie->moov, 0);
+		if (e) return e;
+	}
 
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_OD_TAG:
@@ -475,15 +525,18 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_root_od_url(GF_ISOFile *movie, char *url_string)
+GF_Err gf_isom_set_root_od_url(GF_ISOFile *movie, const char *url_string)
 {
 	GF_Err e;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
-	if (!movie->moov->iods) AddMovieIOD(movie->moov, 0);
-	if (!movie->moov->iods) return GF_OUT_OF_MEM;
+	if (!movie->moov->iods) {
+		e = AddMovieIOD(movie->moov, 0);
+		if (e) return e;
+	}
 
 	switch (movie->moov->iods->descriptor->tag) {
 	case GF_ODF_ISOM_OD_TAG:
@@ -500,12 +553,54 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_ISOTrackID gf_isom_get_last_created_track_id(GF_ISOFile *movie)
+{
+	return movie ? movie->last_created_track_id : 0;
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_load_extra_boxes(GF_ISOFile *movie, u8 *moov_boxes, u32 moov_boxes_size, Bool udta_only)
+{
+	GF_BitStream *bs;
+
+	GF_Err e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
+
+	bs = gf_bs_new(moov_boxes, moov_boxes_size, GF_BITSTREAM_READ);
+
+	//we may have terminators in some QT files (4 bytes set to 0 ...)
+	while (gf_bs_available(bs) >= 8) {
+		GF_Box *a_box;
+		e = gf_isom_box_parse_ex((GF_Box**)&a_box, bs, GF_ISOM_BOX_TYPE_MOOV, GF_FALSE);
+		if (e || !a_box) goto exit;
+
+		if (a_box->type == GF_ISOM_BOX_TYPE_UDTA) {
+			if (movie->moov->udta) gf_isom_box_del_parent(&movie->moov->child_boxes, (GF_Box*)movie->moov->udta);
+			movie->moov->udta = (GF_UserDataBox*) a_box;
 
+			if (!movie->moov->child_boxes) movie->moov->child_boxes = gf_list_new();
+			gf_list_add(movie->moov->child_boxes, a_box);
+
+		} else if (!udta_only && (a_box->type!=GF_ISOM_BOX_TYPE_PSSH) ) {
+			if (!movie->moov->child_boxes) movie->moov->child_boxes = gf_list_new();
+			gf_list_add(movie->moov->child_boxes, a_box);
+		} else {
+			gf_isom_box_del(a_box);
+		}
+	}
+exit:
+	gf_bs_del(bs);
+	return e;
+}
 
 //creates a new Track. If trackID = 0, the trackID is chosen by the API
 //returns the track number or 0 if error
 GF_EXPORT
-u32 gf_isom_new_track(GF_ISOFile *movie, u32 trakID, u32 MediaType, u32 TimeScale)
+u32 gf_isom_new_track_from_template(GF_ISOFile *movie, GF_ISOTrackID trakID, u32 MediaType, u32 TimeScale, u8 *tk_box, u32 tk_box_size, Bool udta_only)
 {
 	GF_Err e;
 	u64 now;
@@ -513,13 +608,15 @@
 	GF_TrackBox *trak;
 	GF_TrackHeaderBox *tkhd;
 	GF_MediaBox *mdia;
+	GF_UserDataBox *udta = NULL;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) {
 		gf_isom_set_last_error(movie, e);
 		return 0;
 	}
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 
 	isHint = 0;
@@ -561,85 +658,176 @@
 		}
 	}
 
-	//OK, now create a track...
-	trak = (GF_TrackBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRAK);
-	if (!trak) {
-		gf_isom_set_last_error(movie, GF_OUT_OF_MEM);
-		return 0;
-	}
-	tkhd = (GF_TrackHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TKHD);
-	if (!tkhd) {
-		gf_isom_set_last_error(movie, GF_OUT_OF_MEM);
-		gf_isom_box_del((GF_Box *)trak);
-		return 0;
+	if (tk_box) {
+		GF_BitStream *bs = gf_bs_new(tk_box, tk_box_size, GF_BITSTREAM_READ);
+		gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_NO_LOGS|GF_ISOM_BS_COOKIE_CLONE_TRACK);
+
+		e = gf_isom_box_parse_ex((GF_Box**)&trak, bs, GF_ISOM_BOX_TYPE_MOOV, GF_FALSE);
+		gf_bs_del(bs);
+		if (e) trak = NULL;
+		else if (udta_only) {
+			udta = trak->udta;
+			trak->udta = NULL;
+			gf_isom_box_del((GF_Box*)trak);
+		} else {
+			Bool tpl_ok = GF_TRUE;
+			if (!trak->Header || !trak->Media || !trak->Media->handler || !trak->Media->mediaHeader || !trak->Media->information) tpl_ok = GF_FALSE;
+
+			else {
+				if (!MediaType) MediaType = trak->Media->handler->handlerType;
+				e = NewMedia(&trak->Media, MediaType, TimeScale);
+				if (e) tpl_ok = GF_FALSE;
+			}
+			if (!tpl_ok) {
+				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;
+			}
+		}
 	}
 	now = gf_isom_get_mp4time();
-	tkhd->creationTime = now;
-	if (!movie->keep_utc)
-		tkhd->modificationTime = now;
-	//OK, set up the media trak
-	e = NewMedia(&mdia, MediaType, TimeScale);
-	if (e) {
-		gf_isom_box_del((GF_Box *)mdia);
-		gf_isom_box_del((GF_Box *)trak);
-		gf_isom_box_del((GF_Box *)tkhd);
-		return 0;
-	}
-	//OK, add this media to our track
-	mdia->mediaTrack = trak;
+	if (!trak) {
+		//OK, now create a track...
+		trak = (GF_TrackBox *) gf_isom_box_new_parent(&movie->moov->child_boxes, GF_ISOM_BOX_TYPE_TRAK);
+		if (!trak) {
+			gf_isom_set_last_error(movie, GF_OUT_OF_MEM);
+			return 0;
+		}
+		tkhd = (GF_TrackHeaderBox *) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TKHD);
+		if (!tkhd) {
+			gf_isom_set_last_error(movie, GF_OUT_OF_MEM);
+			return 0;
+		}
 
-	e = trak_AddBox((GF_Box*)trak, (GF_Box *) tkhd);
-	if (e) goto err_exit;
-	e = trak_AddBox((GF_Box*)trak, (GF_Box *) mdia);
-	if (e) goto err_exit;
-	tkhd->trackID = trakID;
+		//OK, set up the media trak
+		e = NewMedia(&mdia, MediaType, TimeScale);
+		if (e) {
+			gf_isom_box_del((GF_Box *)mdia);
+			return 0;
+		}
+		assert(trak->child_boxes);
+		gf_list_add(trak->child_boxes, mdia);
 
+		//OK, add this media to our track
+		mdia->mediaTrack = trak;
 
-	//some default properties for Audio, Visual or private tracks
-	switch (MediaType) {
-	case GF_ISOM_MEDIA_VISUAL:
-    case GF_ISOM_MEDIA_AUXV:
-    case GF_ISOM_MEDIA_PICT:
-	case GF_ISOM_MEDIA_SCENE:
-	case GF_ISOM_MEDIA_TEXT:
-	case GF_ISOM_MEDIA_SUBT:
-		/*320-240 pix in 16.16*/
-		tkhd->width = 0x01400000;
-		tkhd->height = 0x00F00000;
-		break;
-	case GF_ISOM_MEDIA_AUDIO:
-		tkhd->volume = 0x0100;
-		break;
-	}
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) tkhd);
+		if (e) goto err_exit;
+		e = trak_on_child_box((GF_Box*)trak, (GF_Box *) mdia);
+		if (e) goto err_exit;
+		tkhd->trackID = trakID;
+
+		if (gf_sys_is_test_mode() ) {
+			tkhd->creationTime = 0;
+			mdia->mediaHeader->creationTime = 0;
+		} else {
+			tkhd->creationTime = now;
+			mdia->mediaHeader->creationTime = now;
+		}
+
+	} else {
+		tkhd = trak->Header;
+		tkhd->trackID = trakID;
+		mdia = trak->Media;
+		mdia->mediaTrack = trak;
+		mdia->mediaHeader->timeScale = TimeScale;
+		if (mdia->handler->handlerType != MediaType) {
+			mdia->handler->handlerType = MediaType;
+			tkhd->width = 0;
+			tkhd->height = 0;
+			tkhd->volume = 0;
+		} else {
+			MediaType = 0;
+		}
+		trak->Header->duration = 0;
+		mdia->mediaHeader->duration = 0;
 
-	mdia->mediaHeader->creationTime = mdia->mediaHeader->modificationTime = now;
-	trak->Header->creationTime = trak->Header->modificationTime = now;
+		if (!movie->moov->child_boxes) movie->moov->child_boxes = gf_list_new();
+		gf_list_add(movie->moov->child_boxes, trak);
+	}
+	if (MediaType) {
+		//some default properties for Audio, Visual or private tracks
+		switch (MediaType) {
+		case GF_ISOM_MEDIA_VISUAL:
+		case GF_ISOM_MEDIA_AUXV:
+		case GF_ISOM_MEDIA_PICT:
+		case GF_ISOM_MEDIA_SCENE:
+		case GF_ISOM_MEDIA_TEXT:
+		case GF_ISOM_MEDIA_SUBT:
+			/*320-240 pix in 16.16*/
+			tkhd->width = 0x01400000;
+			tkhd->height = 0x00F00000;
+			break;
+		case GF_ISOM_MEDIA_AUDIO:
+			tkhd->volume = 0x0100;
+			break;
+		}
+	}
+	movie->last_created_track_id = tkhd->trackID;
+	
+	if (!movie->keep_utc && !gf_sys_is_test_mode() ) {
+		tkhd->modificationTime = now;
+	 	mdia->mediaHeader->modificationTime = now;
+	}
 
 	//OK, add our trak
-	e = moov_AddBox((GF_Box*)movie->moov, (GF_Box *)trak);
+	e = moov_on_child_box((GF_Box*)movie->moov, (GF_Box *)trak);
 	if (e) goto err_exit;
 	//set the new ID available
 	if (trakID+1> movie->moov->mvhd->nextTrackID)
 		movie->moov->mvhd->nextTrackID = trakID+1;
 
+	trak->udta = udta;
+
 	//and return our track number
 	return gf_isom_get_track_by_id(movie, trakID);
 
 err_exit:
-	if (tkhd) gf_isom_box_del((GF_Box *)tkhd);
+	//tkhd is registered with track and will be destroyed there
 	if (trak) gf_isom_box_del((GF_Box *)trak);
 	if (mdia) gf_isom_box_del((GF_Box *)mdia);
 	return 0;
 }
 
+GF_EXPORT
+u32 gf_isom_new_track(GF_ISOFile *movie, GF_ISOTrackID trakID, u32 MediaType, u32 TimeScale)
+{
+	return gf_isom_new_track_from_template(movie, trakID, MediaType, TimeScale, NULL, 0, GF_FALSE);
+}
+
+GF_EXPORT
+GF_Err gf_isom_remove_stream_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_Err e;
+	GF_SampleEntryBox *entry;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	entry = (GF_SampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex - 1);
+	if (!entry) return GF_BAD_PARAM;
+	gf_list_rem(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex - 1);
+	gf_isom_box_del((GF_Box *)entry);
+	return GF_OK;
+}
 
 //Create a new StreamDescription in the file. The URL and URN are used to describe external media
 GF_EXPORT
 GF_Err gf_isom_new_mpeg4_description(GF_ISOFile *movie,
                                      u32 trackNumber,
-                                     GF_ESD *esd,
-                                     char *URLname,
-                                     char *URNname,
+                                     const GF_ESD *esd,
+                                     const char *URLname,
+                                     const char *URNname,
                                      u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
@@ -656,10 +844,10 @@
 	        !esd->slConfig) return GF_BAD_PARAM;
 
 	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	//duplicate our desc
@@ -672,12 +860,95 @@
 		gf_odf_desc_del((GF_Descriptor *)new_esd);
 		return e;
 	}
-	if (new_esd->URLString) {
+	return e;
+}
+
+GF_Err gf_isom_flush_chunk(GF_TrackBox *trak, Bool is_final)
+{
+	GF_Err e;
+	u64 data_offset;
+	u32 sample_number;
+	u8 *chunk_data;
+	u32 chunk_size, chunk_alloc;
+	if (!trak->chunk_cache) return GF_OK;
+
+	gf_bs_get_content_no_truncate(trak->chunk_cache, &chunk_data, &chunk_size, &chunk_alloc);
+
+	data_offset = gf_isom_datamap_get_offset(trak->Media->information->dataHandler);
+
+	e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, chunk_data, chunk_size);
+	if (e) return e;
 
+	sample_number = 1 + trak->Media->information->sampleTable->SampleSize->sampleCount;
+	sample_number -= trak->nb_samples_in_cache;
+
+	e = stbl_AddChunkOffset(trak->Media, sample_number, trak->chunk_stsd_idx, data_offset, trak->nb_samples_in_cache);
+
+	if (is_final) {
+		gf_free(chunk_data);
+		gf_bs_del(trak->chunk_cache);
+		trak->chunk_cache = NULL;
+	} else {
+		gf_bs_reassign_buffer(trak->chunk_cache, chunk_data, chunk_alloc);
 	}
 	return e;
 }
 
+static GF_Err trak_add_sample(GF_ISOFile *movie, GF_TrackBox *trak, const GF_ISOSample *sample, u32 descIndex, u64 data_offset, u32 syncShadowSampleNum)
+{
+	Bool skip_data = GF_FALSE;
+	GF_Err e;
+
+	//faststart mode with interleaving time, cache data until we have a full chunk
+	if ((movie->storageMode==GF_ISOM_STORE_FASTSTART) && movie->interleavingTime) {
+		Bool flush_chunk = GF_FALSE;
+		u64 stime = sample->DTS;
+		stime *= movie->moov->mvhd->timeScale;
+		stime /= trak->Media->mediaHeader->timeScale;
+
+		if (stime - trak->first_dts_chunk > movie->interleavingTime)
+			flush_chunk = GF_TRUE;
+
+		if (movie->next_flush_chunk_time < stime)
+			flush_chunk = GF_TRUE;
+
+		if (trak->chunk_stsd_idx != descIndex)
+			flush_chunk = GF_TRUE;
+
+		if (trak->Media->information->sampleTable->MaxChunkSize && trak->Media->information->sampleTable->MaxChunkSize < trak->chunk_cache_size + sample->dataLength)
+			flush_chunk = GF_TRUE;
+
+		if (flush_chunk) {
+			movie->next_flush_chunk_time = stime + movie->interleavingTime;
+			if (trak->chunk_cache) {
+				e = gf_isom_flush_chunk(trak, GF_FALSE);
+				if (e) return e;
+			}
+			trak->nb_samples_in_cache = 0;
+			trak->chunk_cache_size = 0;
+			trak->first_dts_chunk = stime;
+		}
+		if (!trak->chunk_cache)
+			trak->chunk_cache = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_bs_write_data(trak->chunk_cache, sample->data, sample->dataLength);
+		trak->nb_samples_in_cache += sample->nb_pack ? sample->nb_pack : 1;
+		trak->chunk_cache_size += sample->dataLength;
+		trak->chunk_stsd_idx = descIndex;
+
+		skip_data = GF_TRUE;
+	}
+
+	e = Media_AddSample(trak->Media, data_offset, sample, descIndex, syncShadowSampleNum);
+	if (e) return e;
+
+	if (!skip_data && sample->dataLength) {
+		e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
+		if (e) return e;
+	}
+
+	return GF_OK;
+}
+
 //Add samples to a track. Use streamDescriptionIndex to specify the desired stream (if several)
 GF_EXPORT
 GF_Err gf_isom_add_sample(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ISOSample *sample)
@@ -717,7 +988,7 @@
 
 
 	//get this dataRef and return false if not self contained
-	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->other_boxes, dataRefIndex - 1);
+	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->child_boxes, dataRefIndex - 1);
 	if (!Dentry || Dentry->flags != 1) return GF_BAD_PARAM;
 
 	//Open our data map. We are adding stuff, so use EDIT
@@ -730,21 +1001,19 @@
 	/*rewrite OD frame*/
 	if (trak->Media->handler->handlerType == GF_ISOM_MEDIA_OD) {
 		GF_ISOSample *od_sample = NULL;
+
 		e = Media_ParseODFrame(trak->Media, sample, &od_sample);
 		if (e) return e;
-		e = Media_AddSample(trak->Media, data_offset, od_sample, descIndex, 0);
-		if (e) return e;
-		e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, od_sample->data, od_sample->dataLength);
-		if (e) return e;
-		if (od_sample) gf_isom_sample_del(&od_sample);
+
+		e = trak_add_sample(movie, trak, od_sample, descIndex, data_offset, 0);
+
+		if (od_sample)
+			gf_isom_sample_del(&od_sample);
 	} else {
-		e = Media_AddSample(trak->Media, data_offset, sample, descIndex, 0);
-		if (e) return e;
-		if (sample->dataLength) {
-			e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
-			if (e) return e;
-		}
+		e = trak_add_sample(movie, trak, sample, descIndex, data_offset, 0);
 	}
+	if (e) return e;
+
 
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
@@ -794,7 +1063,7 @@
 	trak->Media->information->sampleTable->currentEntryIndex = descIndex;
 
 	//get this dataRef and return false if not self contained
-	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->other_boxes, dataRefIndex - 1);
+	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->child_boxes, dataRefIndex - 1);
 	if (!Dentry || Dentry->flags != 1) return GF_BAD_PARAM;
 
 	//Open our data map. We are adding stuff, so use EDIT
@@ -808,12 +1077,13 @@
 	if (trak->Media->handler->handlerType == GF_ISOM_MEDIA_OD) {
 		GF_ISOSample *od_sample = NULL;
 		e = Media_ParseODFrame(trak->Media, sample, &od_sample);
-		if (!e) e = Media_AddSample(trak->Media, data_offset, od_sample, descIndex, sampleNum);
-		if (!e) e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, od_sample->data, od_sample->dataLength);
-		if (od_sample) gf_isom_sample_del(&od_sample);
+		if (e) return e;
+
+		e = trak_add_sample(movie, trak, od_sample, descIndex, data_offset, sampleNum);
+		if (od_sample)
+			gf_isom_sample_del(&od_sample);
 	} else {
-		e = Media_AddSample(trak->Media, data_offset, sample, descIndex, sampleNum);
-		if (!e) e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, sample->data, sample->dataLength);
+		e = trak_add_sample(movie, trak, sample, descIndex, data_offset, sampleNum);
 	}
 	if (e) return e;
 	if (offset_times) sample->DTS -= 1;
@@ -826,24 +1096,8 @@
 	return SetTrackDuration(trak);
 }
 
-GF_Err gf_isom_set_sample_rap(GF_ISOFile *movie, u32 trackNumber)
-{
-	GF_SampleTableBox *stbl;
-	GF_Err e;
-	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) return GF_BAD_PARAM;
-	stbl = trak->Media->information->sampleTable;
-	if (!stbl->SyncSample) stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
-	return stbl_AddRAP(stbl->SyncSample, stbl->SampleSize->sampleCount);
-
-}
-
 GF_EXPORT
-GF_Err gf_isom_append_sample_data(GF_ISOFile *movie, u32 trackNumber, char *data, u32 data_size)
+GF_Err gf_isom_append_sample_data(GF_ISOFile *movie, u32 trackNumber, u8 *data, u32 data_size)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -869,7 +1123,7 @@
 	if (!entry || !dataRefIndex) return GF_BAD_PARAM;
 
 	//get this dataRef and return false if not self contained
-	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->other_boxes, dataRefIndex - 1);
+	Dentry = (GF_DataEntryURLBox*)gf_list_get(trak->Media->information->dataInformation->dref->child_boxes, dataRefIndex - 1);
 	if (!Dentry || Dentry->flags != 1) return GF_BAD_PARAM;
 
 	//Open our data map. We are adding stuff, so use EDIT
@@ -877,8 +1131,13 @@
 	if (e) return e;
 
 	//add the media data
-	e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, data, data_size);
-	if (e) return e;
+	if (trak->chunk_cache) {
+		gf_bs_write_data(trak->chunk_cache, data, data_size);
+		trak->chunk_cache_size += data_size;
+	} else {
+		e = gf_isom_datamap_add_data(trak->Media->information->dataHandler, data, data_size);
+		if (e) return e;
+	}
 	//update data size
 	return stbl_SampleSizeAppend(trak->Media->information->sampleTable->SampleSize, data_size);
 }
@@ -926,7 +1185,7 @@
 
 
 	//get this dataRef and return false if self contained
-	Dentry =(GF_DataEntryURLBox*) gf_list_get(trak->Media->information->dataInformation->dref->other_boxes, dataRefIndex - 1);
+	Dentry =(GF_DataEntryURLBox*) gf_list_get(trak->Media->information->dataInformation->dref->child_boxes, dataRefIndex - 1);
 	if (Dentry->flags == 1) return GF_BAD_PARAM;
 
 	//add the meta data
@@ -944,14 +1203,15 @@
 
 //set the duration of the last media sample. If not set, the duration of the last sample is the
 //duration of the previous one if any, or 1000 (default value).
-GF_EXPORT
-GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *movie, u32 trackNumber, u32 duration)
+static GF_Err gf_isom_set_last_sample_duration_internal(GF_ISOFile *movie, u32 trackNumber, u64 dur_num, u32 dur_den, u32 mode)
 {
 	GF_TrackBox *trak;
 	GF_SttsEntry *ent;
 	GF_TimeToSampleBox *stts;
 	u64 mdur;
+	u32 duration;
 	GF_Err e;
+	Bool is_patch = GF_FALSE;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -959,17 +1219,60 @@
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
+	if (mode==0) {
+		duration = (u32) dur_num;
+	} else if (mode==1) {
+		duration = (u32) dur_num;
+		if (dur_den) {
+			duration *= trak->Media->mediaHeader->timeScale;
+			duration /= dur_den;
+		}
+	} else {
+		is_patch = GF_TRUE;
+	}
 	mdur = trak->Media->mediaHeader->duration;
 	stts = trak->Media->information->sampleTable->TimeToSample;
 	if (!stts->nb_entries) return GF_BAD_PARAM;
+
+	if (is_patch) {
+		u32 i, avg_dur, nb_samp=0;
+		u64 cum_dur=0;
+		for (i=0; i<stts->nb_entries; i++) {
+			ent = (GF_SttsEntry*) &stts->entries[i];
+			cum_dur += ent->sampleCount*ent->sampleDelta;
+			nb_samp += ent->sampleCount;
+		}
+		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->w_LastDTS = dur_num - avg_dur;
+		return GF_OK;
+	}
 	//get the last entry
 	ent = (GF_SttsEntry*) &stts->entries[stts->nb_entries-1];
+	if ((mode==1) && !duration && !dur_den) {
+		//same as previous, nothing to adjust
+		if (ent->sampleCount>1) return GF_OK;
+		if (stts->nb_entries==1) return GF_OK;
+		duration = stts->entries[stts->nb_entries-2].sampleDelta;
+	}
 
 	mdur -= ent->sampleDelta;
 	mdur += duration;
+
 	//we only have one sample
 	if (ent->sampleCount == 1) {
-		ent->sampleDelta = duration;
+		ent->sampleDelta = (u32) duration;
+		if (mode && (stts->nb_entries>1) && (stts->entries[stts->nb_entries-2].sampleDelta==duration)) {
+			stts->entries[stts->nb_entries-2].sampleCount++;
+			stts->nb_entries--;
+			//and update the write cache
+			stts->w_currentSampleNum = trak->Media->information->sampleTable->SampleSize->sampleCount;
+		}
 	} else {
 		if (ent->sampleDelta == duration) return GF_OK;
 		ent->sampleCount -= 1;
@@ -980,7 +1283,7 @@
 			if (!stts->entries) return GF_OUT_OF_MEM;
 		}
 		stts->entries[stts->nb_entries].sampleCount = 1;
-		stts->entries[stts->nb_entries].sampleDelta = duration;
+		stts->entries[stts->nb_entries].sampleDelta = (u32) duration;
 		stts->nb_entries++;
 		//and update the write cache
 		stts->w_currentSampleNum = trak->Media->information->sampleTable->SampleSize->sampleCount;
@@ -991,6 +1294,24 @@
 	return SetTrackDuration(trak);
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_last_sample_duration(GF_ISOFile *movie, u32 trackNumber, u32 duration)
+{
+	return gf_isom_set_last_sample_duration_internal(movie, trackNumber, duration, 0, 0);
+}
+
+GF_EXPORT
+GF_Err gf_isom_patch_last_sample_duration(GF_ISOFile *movie, u32 trackNumber, u64 next_dts)
+{
+	return gf_isom_set_last_sample_duration_internal(movie, trackNumber, next_dts, 0, 2);
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_last_sample_duration_ex(GF_ISOFile *movie, u32 trackNumber, u32 dur_num, u32 dur_den)
+{
+	return gf_isom_set_last_sample_duration_internal(movie, trackNumber, dur_num, dur_den, 1);
+}
+
 //update a sample data in the media. Note that the sample MUST exists
 GF_EXPORT
 GF_Err gf_isom_update_sample(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, GF_ISOSample *sample, Bool data_only)
@@ -1080,6 +1401,7 @@
 
 	e = unpack_track(trak);
 	if (e) return e;
+	//do NOT change the order DTS, CTS, size chunk
 
 	//remove DTS
 	e = stbl_RemoveDTS(trak->Media->information->sampleTable, sampleNumber, trak->Media->mediaHeader->timeScale);
@@ -1090,7 +1412,7 @@
 		if (e) return e;
 	}
 	//remove size
-	e = stbl_RemoveSize(trak->Media->information->sampleTable->SampleSize, sampleNumber);
+	e = stbl_RemoveSize(trak->Media->information->sampleTable, sampleNumber);
 	if (e) return e;
 	//remove sampleToChunk and chunk
 	e = stbl_RemoveChunk(trak->Media->information->sampleTable, sampleNumber);
@@ -1106,10 +1428,9 @@
 		if (e) return e;
 	}
 	//remove shadow
-	if (trak->Media->information->sampleTable->ShadowSync) {
-		e = stbl_RemoveShadow(trak->Media->information->sampleTable->ShadowSync, sampleNumber);
-		if (e) return e;
-	}
+	e = stbl_RemoveShadow(trak->Media->information->sampleTable, sampleNumber);
+	if (e) return e;
+
 	//remove padding
 	e = stbl_RemovePaddingBits(trak->Media->information->sampleTable, sampleNumber);
 	if (e) return e;
@@ -1148,7 +1469,7 @@
 
 //Add a system descriptor to the ESD of a stream(EDIT or WRITE mode only)
 GF_EXPORT
-GF_Err gf_isom_add_desc_to_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_Descriptor *theDesc)
+GF_Err gf_isom_add_desc_to_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, const GF_Descriptor *theDesc)
 {
 	GF_IPIPtr *ipiD;
 	GF_Err e;
@@ -1158,7 +1479,8 @@
 	GF_ESD *esd;
 	GF_TrackReferenceBox *tref;
 	GF_TrackReferenceTypeBox *dpnd;
-
+	GF_MPEGVisualSampleEntryBox *entry;
+	u32 msubtype;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -1169,21 +1491,40 @@
 	e = Media_GetESD(trak->Media, StreamDescriptionIndex, &esd, GF_TRUE);
 	if (e) return e;
 
+	entry = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex-1);
+	if (!entry) return GF_BAD_PARAM;
+	msubtype = entry->type;
+	if ((msubtype==GF_ISOM_BOX_TYPE_ENCV) || (msubtype==GF_ISOM_BOX_TYPE_ENCA))
+		gf_isom_get_original_format_type(movie, trackNumber, StreamDescriptionIndex, &msubtype);
+
 	//duplicate the desc
-	e = gf_odf_desc_copy(theDesc, &desc);
+	e = gf_odf_desc_copy((GF_Descriptor *)theDesc, &desc);
 	if (e) return e;
 
 	//and add it to the ESD EXCEPT IPI PTR (we need to translate from ES_ID to TrackID!!!
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
 	switch (desc->tag) {
 	case GF_ODF_IPI_PTR_TAG:
 		goto insertIPI;
-
 	default:
+		break;
+	}
+
+	if ((msubtype==GF_ISOM_BOX_TYPE_MP4S) || (msubtype==GF_ISOM_BOX_TYPE_MP4V) || (msubtype==GF_ISOM_BOX_TYPE_MP4A)) {
 		return gf_odf_desc_add_desc((GF_Descriptor *)esd, desc);
 	}
 
+	if (trak->Media->handler->handlerType!=GF_ISOM_MEDIA_VISUAL) {
+		gf_odf_desc_del(desc);
+		return GF_NOT_SUPPORTED;
+	}
+	GF_MPEG4ExtensionDescriptorsBox *mdesc = (GF_MPEG4ExtensionDescriptorsBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_M4DS);
+	if (!mdesc) {
+		mdesc = (GF_MPEG4ExtensionDescriptorsBox *) gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_M4DS);
+	}
+	return gf_list_add(mdesc->descriptors, desc);
 
 insertIPI:
 	if (esd->ipiPtr) {
@@ -1194,8 +1535,9 @@
 	ipiD = (GF_IPIPtr *) desc;
 	//find a tref
 	if (!trak->References) {
-		tref = (GF_TrackReferenceBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREF);
-		e = trak_AddBox((GF_Box*)trak, (GF_Box *)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);
 		if (e) return e;
 	}
 	tref = trak->References;
@@ -1204,17 +1546,16 @@
 	if (e) return e;
 	if (!dpnd) {
 		tmpRef = 0;
-		dpnd = (GF_TrackReferenceTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_REFT);
+		dpnd = (GF_TrackReferenceTypeBox *) gf_isom_box_new_parent(&tref->child_boxes, GF_ISOM_BOX_TYPE_REFT);
+		if (!dpnd) return GF_OUT_OF_MEM;
 		dpnd->reference_type = GF_ISOM_BOX_TYPE_IPIR;
-		e = tref_AddBox((GF_Box*)tref, (GF_Box *) dpnd);
-		if (e) return e;
 		e = reftype_AddRefTrack(dpnd, ipiD->IPI_ES_Id, &tmpRef);
 		if (e) return e;
 		//and replace the tag and value...
 		ipiD->IPI_ES_Id = tmpRef;
 		ipiD->tag = GF_ODF_ISOM_IPI_PTR_TAG;
 	} else {
-		//Watch out! ONLY ONE IPI dependancy is allowed per stream
+		//Watch out! ONLY ONE IPI dependency is allowed per stream
 		dpnd->trackIDCount = 1;
 		dpnd->trackIDs[0] = ipiD->IPI_ES_Id;
 		//and replace the tag and value...
@@ -1229,7 +1570,7 @@
 //use carefully. Very useful when you made a lot of changes (IPMP, IPI, OCI, ...)
 //THIS WILL REPLACE THE WHOLE DESCRIPTOR ...
 GF_EXPORT
-GF_Err gf_isom_change_mpeg4_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_ESD *newESD)
+GF_Err gf_isom_change_mpeg4_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, const GF_ESD *newESD)
 {
 	GF_Err e;
 	GF_ESD *esd;
@@ -1246,10 +1587,10 @@
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
 
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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;
 
@@ -1282,10 +1623,10 @@
 	if (!stsd) {
 		return movie->LastError = GF_ISOM_INVALID_FILE;
 	}
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1333,10 +1674,10 @@
 	if (!stsd) {
 		return movie->LastError = GF_ISOM_INVALID_FILE;
 	}
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(stsd->other_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;
 	entry->bit_depth = bitDepth;
@@ -1344,12 +1685,11 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing, Bool force_par)
+GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, s32 hSpacing, s32 vSpacing, Bool force_par)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
-	GF_VisualSampleEntryBox*vent;
 	GF_SampleDescriptionBox *stsd;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1359,10 +1699,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1370,25 +1710,22 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	vent = (GF_VisualSampleEntryBox*)entry;
-	if (!hSpacing || !vSpacing || (((s32)hSpacing > 0) && (hSpacing == vSpacing) && !force_par))  {
-		if (vent->pasp) gf_isom_box_del((GF_Box*)vent->pasp);
-		vent->pasp = NULL;
+	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);
 		return GF_OK;
 	}
-	if (!vent->pasp) vent->pasp = (GF_PixelAspectRatioBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_PASP);
-	if ((s32) hSpacing<0) {
-		vent->pasp->hSpacing = 1;
-		vent->pasp->vSpacing = 1;
-	} else {
-		vent->pasp->hSpacing = hSpacing;
-		vent->pasp->vSpacing = vSpacing;
+	if (!pasp) {
+		pasp = (GF_PixelAspectRatioBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_PASP);
+		if (!pasp) return GF_OUT_OF_MEM;
 	}
+	pasp->hSpacing = (u32) hSpacing;
+	pasp->vSpacing = (u32) vSpacing;
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_visual_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 colour_type, u16 colour_primaries, u16 transfer_characteristics, u16 matrix_coefficients, Bool full_range_flag, char *icc_data, u32 icc_size)
+GF_Err gf_isom_set_visual_color_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 colour_type, u16 colour_primaries, u16 transfer_characteristics, u16 matrix_coefficients, Bool full_range_flag, u8 *icc_data, u32 icc_size)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1403,10 +1740,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1414,15 +1751,14 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_OK;
 
-	clr = ((GF_MPEGVisualSampleEntryBox *)entry)->colr;
+	clr = (GF_ColourInformationBox *) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_COLR);
 	if (!colour_type) {
-		if (clr) gf_isom_box_del((GF_Box *)clr);
-		((GF_MPEGVisualSampleEntryBox *)entry)->colr = NULL;
+		if (clr) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box *)clr);
 		return GF_OK;
 	}
 	if (!clr) {
-		clr = (GF_ColourInformationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_COLR);
-		((GF_MPEGVisualSampleEntryBox *)entry)->colr = clr;
+		clr = (GF_ColourInformationBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_COLR);
+		if (!clr) return GF_OUT_OF_MEM;
 	}
 	clr->colour_type = colour_type;
 	clr->colour_primaries = colour_primaries;
@@ -1432,10 +1768,11 @@
 	if (clr->opaque) gf_free(clr->opaque);
 	clr->opaque = NULL;
 	clr->opaque_size = 0;
-	if ((colour_type=GF_ISOM_SUBTYPE_RICC) || (colour_type=GF_ISOM_SUBTYPE_PROF)) {
+	if ((colour_type==GF_ISOM_SUBTYPE_RICC) || (colour_type==GF_ISOM_SUBTYPE_PROF)) {
 		clr->opaque_size = icc_data ? icc_size : 0;
 		if (clr->opaque_size) {
 			clr->opaque = gf_malloc(sizeof(char)*clr->opaque_size);
+			if (!clr->opaque) return GF_OUT_OF_MEM;
 			memcpy(clr->opaque, icc_data, sizeof(char)*clr->opaque_size);
 		}
 	}
@@ -1443,14 +1780,55 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_hdr(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_MasteringDisplayColourVolumeInfo *mdcv, GF_ContentLightLevelInfo *clli)
+GF_Err gf_isom_set_dolby_vision_profile(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 dv_profile)
+{
+	GF_Err e;
+	GF_TrackBox* trak;
+	GF_SampleEntryBox* entry;
+	GF_SampleDescriptionBox* stsd;
+	GF_DOVIConfigurationBox* dovi = NULL;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	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);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	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;
+		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->type = GF_ISOM_BOX_TYPE_DVHE;
+	dovi->DOVIConfig.dv_profile = dv_profile;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_high_dynamic_range_info(GF_ISOFile* movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_MasteringDisplayColourVolumeInfo* mdcv, GF_ContentLightLevelInfo* clli)
 {
 	GF_Err e;
 	GF_TrackBox* trak;
 	GF_SampleEntryBox* entry;
-	GF_VisualSampleEntryBox* vent;
 	GF_SampleDescriptionBox* stsd;
-	u32 i;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1460,10 +1838,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox*)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox*)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)
@@ -1471,23 +1849,21 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	vent = (GF_VisualSampleEntryBox*)entry;
-
-	/*mdcv*/
-	if (!vent->mdcv) vent->mdcv = (GF_MasteringDisplayColourVolumeBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_MDCV);
-	for (i = 0; i < 3; ++i) {
-		vent->mdcv->display_primaries[i].x = mdcv->display_primaries[i].x;
-		vent->mdcv->display_primaries[i].y = mdcv->display_primaries[i].y;
+	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;
 	}
-	vent->mdcv->min_display_mastering_luminance = mdcv->min_display_mastering_luminance;
-	vent->mdcv->max_display_mastering_luminance = mdcv->max_display_mastering_luminance;
+	mdcvb->mdcv = *mdcv;
 
 	/*clli*/
-	if (!vent->clli) vent->clli = (GF_ContentLightLevelBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CLLI);
-	vent->clli->max_content_light_level = clli->max_content_light_level;
-	vent->clli->max_pic_average_light_level = clli->max_pic_average_light_level;
-
-	return e;
+	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;
+	}
+	cllib->clli = *clli;
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -1496,7 +1872,6 @@
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
-	GF_VisualSampleEntryBox*vent;
 	GF_SampleDescriptionBox *stsd;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1506,10 +1881,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1517,21 +1892,138 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	vent = (GF_VisualSampleEntryBox*)entry;
+	GF_CleanApertureBox *clap = (GF_CleanApertureBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CLAP);
 	if (!cleanApertureHeightD || !cleanApertureWidthD || !horizOffD || !vertOffD) {
-		if (vent->clap) gf_isom_box_del((GF_Box*)vent->clap);
-		vent->clap = NULL;
+		if (clap) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box*)clap);
+		return GF_OK;
+	}
+	if (!clap) {
+		clap = (GF_CleanApertureBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_CLAP);
+		if (!clap) return GF_OUT_OF_MEM;
+	}
+
+	clap->cleanApertureWidthN = cleanApertureWidthN;
+	clap->cleanApertureWidthD = cleanApertureWidthD;
+	clap->cleanApertureHeightN = cleanApertureHeightN;
+	clap->cleanApertureHeightD = cleanApertureHeightD;
+	clap->horizOffN = horizOffN;
+	clap->horizOffD = horizOffD;
+	clap->vertOffN = vertOffN;
+	clap->vertOffD = vertOffD;
+	return GF_OK;
+}
+
+#include <gpac/maths.h>
+GF_Err gf_isom_update_aperture_info(GF_ISOFile *movie, u32 trackNumber, Bool remove)
+{
+	GF_Err e;
+	GF_Box *box, *enof, *prof, *clef;
+	GF_TrackBox *trak;
+	GF_VisualSampleEntryBox *ventry;
+	GF_PixelAspectRatioBox *pasp;
+	GF_CleanApertureBox *clap;
+	u32 j, hspacing, vspacing, clap_width_num, clap_width_den, clap_height_num, clap_height_den, high, low;
+	Double width, height;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	if (remove) {
+		if (trak->Aperture) {
+			gf_isom_box_del(trak->Aperture);
+			trak->Aperture = NULL;
+		}
 		return GF_OK;
 	}
-	if (!vent->clap) vent->clap = (GF_CleanApertureBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CLAP);
-	vent->clap->cleanApertureWidthN = cleanApertureWidthN;
-	vent->clap->cleanApertureWidthD = cleanApertureWidthD;
-	vent->clap->cleanApertureHeightN = cleanApertureHeightN;
-	vent->clap->cleanApertureHeightD = cleanApertureHeightD;
-	vent->clap->horizOffN = horizOffN;
-	vent->clap->horizOffD = horizOffD;
-	vent->clap->vertOffN = vertOffN;
-	vent->clap->vertOffD = vertOffD;
+	enof = prof = clef = NULL;
+	if (!trak->Aperture) {
+		trak->Aperture = gf_isom_box_new_parent(&trak->child_boxes, GF_QT_BOX_TYPE_TAPT);
+		if (!trak->Aperture) return GF_OUT_OF_MEM;
+	}
+	if (!trak->Aperture->child_boxes) {
+		trak->Aperture->child_boxes = gf_list_new();
+		if (!trak->Aperture->child_boxes)
+			return GF_OUT_OF_MEM;
+	}
+
+	j=0;
+	while ( (box = gf_list_enum(trak->Aperture->child_boxes, &j))) {
+		switch (box->type) {
+		case GF_QT_BOX_TYPE_CLEF: clef = box; break;
+		case GF_QT_BOX_TYPE_PROF: prof = box; break;
+		case GF_QT_BOX_TYPE_ENOF: enof = box; break;
+		}
+	}
+	if (!clef) {
+		clef = gf_isom_box_new(GF_QT_BOX_TYPE_CLEF);
+		if (!clef) return GF_OUT_OF_MEM;
+		gf_list_add(trak->Aperture->child_boxes, clef);
+	}
+	if (!enof) {
+		enof = gf_isom_box_new(GF_QT_BOX_TYPE_ENOF);
+		if (!enof) return GF_OUT_OF_MEM;
+		gf_list_add(trak->Aperture->child_boxes, enof);
+	}
+	if (!prof) {
+		prof = gf_isom_box_new(GF_QT_BOX_TYPE_PROF);
+		if (!prof) return GF_OUT_OF_MEM;
+		gf_list_add(trak->Aperture->child_boxes, prof);
+	}
+
+	ventry = (GF_VisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, 0);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (ventry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	if (ventry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
+
+	pasp = (GF_PixelAspectRatioBox *) gf_isom_box_find_child(ventry->child_boxes, GF_ISOM_BOX_TYPE_PASP);
+	hspacing = vspacing = 0;
+	if (pasp) {
+		hspacing = pasp->hSpacing;
+		vspacing = pasp->vSpacing;
+	}
+	clap_width_num = ventry->Width;
+	clap_width_den = 1;
+	clap_height_num = ventry->Height;
+	clap_height_den = 1;
+	clap = (GF_CleanApertureBox *) gf_isom_box_find_child(ventry->child_boxes, GF_ISOM_BOX_TYPE_CLAP);
+	if (clap) {
+		clap_width_num = clap->cleanApertureWidthN;
+		clap_width_den = clap->cleanApertureWidthD;
+		clap_height_num = clap->cleanApertureHeightN;
+		clap_height_den = clap->cleanApertureHeightD;
+	}
+	//enof: encoded pixels in 16.16
+	((GF_ApertureBox *)enof)->width = (ventry->Width)<<16;
+	((GF_ApertureBox *)enof)->height = (ventry->Height)<<16;
+
+	//prof: encoded pixels + pasp in 16.16
+	width = (Float) (ventry->Width * hspacing);
+	width /= vspacing;
+	high = (u32) floor((Float)width);
+	low = (u32) ( 0xFFFF * (width - (Double)high) );
+	((GF_ApertureBox *)prof)->width = (high)<<16 | low;
+	((GF_ApertureBox *)prof)->height = (ventry->Height)<<16;
+
+	//clef: encoded pixels + pasp + clap in 16.16
+	width = (Double) (clap_width_num * hspacing);
+	width /= clap_width_den * vspacing;
+	height = (Float) clap_height_num;
+	height /= clap_height_den;
+
+	high = (u32) floor((Float)width);
+	low = (u32) (0xFFFF * (width - (Double)high));
+	((GF_ApertureBox *)clef)->width = (high)<<16 | low;
+	high = (u32) floor((Float)height);
+	low = (u32) (0xFFFF * (height - (Double)high));
+	((GF_ApertureBox *)clef)->height = (high)<<16 | low;
+
+
 	return GF_OK;
 }
 
@@ -1541,7 +2033,6 @@
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
-	GF_VisualSampleEntryBox*vent;
 	GF_SampleDescriptionBox *stsd;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1551,10 +2042,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1562,16 +2053,18 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	vent = (GF_VisualSampleEntryBox*)entry;
+	GF_CodingConstraintsBox*ccst = (GF_CodingConstraintsBox*) gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_CCST);
 	if (remove)  {
-		if (vent->ccst) gf_isom_box_del((GF_Box*)vent->ccst);
-		vent->ccst = NULL;
+		if (ccst) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box*)ccst);
 		return GF_OK;
 	}
-	if (!vent->ccst) vent->ccst = (GF_CodingConstraintsBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_CCST);
-	vent->ccst->all_ref_pics_intra = all_ref_pics_intra;
-	vent->ccst->intra_pred_used = intra_pred_used;
-	vent->ccst->max_ref_per_pic = max_ref_per_pic;
+	if (!ccst) {
+		ccst = (GF_CodingConstraintsBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_CCST);
+		if (!ccst) return GF_OUT_OF_MEM;
+	}
+	ccst->all_ref_pics_intra = all_ref_pics_intra;
+	ccst->intra_pred_used = intra_pred_used;
+	ccst->max_ref_per_pic = max_ref_per_pic;
 	return GF_OK;
 }
 
@@ -1581,7 +2074,6 @@
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
-	GF_VisualSampleEntryBox*vent;
 	GF_SampleDescriptionBox *stsd;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -1591,10 +2083,10 @@
 
 	stsd = trak->Media->information->sampleTable->SampleDescription;
 	if (!stsd) return movie->LastError = GF_ISOM_INVALID_FILE;
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1602,14 +2094,16 @@
 
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	vent = (GF_VisualSampleEntryBox*)entry;
+	GF_AuxiliaryTypeInfoBox *auxi = (GF_AuxiliaryTypeInfoBox *)gf_isom_box_find_child(entry->child_boxes, GF_ISOM_BOX_TYPE_AUXI);
 	if (remove)  {
-		if (vent->auxi) gf_isom_box_del((GF_Box*)vent->auxi);
-		vent->ccst = NULL;
+		if (auxi) gf_isom_box_del_parent(&entry->child_boxes, (GF_Box*)auxi);
 		return GF_OK;
 	}
-	if (!vent->auxi) vent->auxi = (GF_AuxiliaryTypeInfoBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_AUXI);
-	vent->auxi->aux_track_type = gf_strdup("urn:mpeg:mpegB:cicp:systems:auxiliary:alpha");
+	if (!auxi) {
+		auxi = (GF_AuxiliaryTypeInfoBox*)gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_AUXI);
+		if (!auxi) return GF_OUT_OF_MEM;
+	}
+	auxi->aux_track_type = gf_strdup("urn:mpeg:mpegB:cicp:systems:auxiliary:alpha");
 	return GF_OK;
 }
 
@@ -1617,10 +2111,21 @@
 GF_Err gf_isom_set_audio_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 sampleRate, u32 nbChannels, u8 bitsPerSample, GF_AudioSampleEntryImportMode asemode)
 {
 	GF_Err e;
+	u32 i, old_qtff_mode=GF_ISOM_AUDIO_QTFF_NONE;
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
 	GF_AudioSampleEntryBox*aud_entry;
 	GF_SampleDescriptionBox *stsd;
+	GF_Box *wave_box = NULL;
+	GF_Box *gf_isom_audio_sample_get_audio_codec_cfg_box(GF_AudioSampleEntryBox *ptr);
+	GF_Box *codec_ext = NULL;
+#if 0
+	GF_ChannelLayoutInfoBox *chan=NULL;
+#endif
+	GF_OriginalFormatBox *frma=NULL;
+	GF_ChromaInfoBox *enda=NULL;
+	GF_ESDBox *esds=NULL;
+	GF_Box *terminator=NULL;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
@@ -1631,10 +2136,10 @@
 	if (!stsd) {
 		return movie->LastError = GF_ISOM_INVALID_FILE;
 	}
-	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->other_boxes)) {
+	if (!StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
 		return movie->LastError = GF_BAD_PARAM;
 	}
-	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
+	entry = (GF_SampleEntryBox *)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)
@@ -1650,58 +2155,182 @@
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2:
 		stsd->version = 0;
 		aud_entry->version = 0;
-		aud_entry->is_qtff = 0;
+		aud_entry->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		aud_entry->channel_count = 2;
 		break;
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_NOT_SET:
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_BS:
 		stsd->version = 0;
 		aud_entry->version = 0;
-		aud_entry->is_qtff = 0;
+		aud_entry->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		aud_entry->channel_count = nbChannels;
 		break;
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG:
 		stsd->version = 1;
 		aud_entry->version = 1;
-		aud_entry->is_qtff = 0;
+		aud_entry->qtff_mode = GF_ISOM_AUDIO_QTFF_NONE;
 		aud_entry->channel_count = nbChannels;
 		break;
 	case GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF:
 		stsd->version = 0;
 		aud_entry->version = 1;
-		aud_entry->is_qtff = 1;
 		aud_entry->channel_count = nbChannels;
+		old_qtff_mode = aud_entry->qtff_mode;
+		if (aud_entry->qtff_mode != GF_ISOM_AUDIO_QTFF_ON_EXT_VALID)
+			aud_entry->qtff_mode = GF_ISOM_AUDIO_QTFF_ON_NOEXT;
 		break;
 	}
-	if (aud_entry->is_qtff) {
-		GF_UnknownBox *wave=NULL;
-		u32 i, count = gf_list_count(aud_entry->other_boxes);
-		for (i=0; i<count; i++) {
-			wave = gf_list_get(aud_entry->other_boxes, i);
-			if (wave->type==GF_QT_BOX_TYPE_WAVE)
-				break;
-			if (wave->type != GF_ISOM_BOX_TYPE_UNKNOWN) {
-				wave = NULL;
-			} else if (wave->original_4cc!=GF_QT_BOX_TYPE_WAVE) {
-				wave = NULL;
-			} else {
-				break;
-			}
+
+	aud_entry->compression_id = 0;
+
+	//check for wave+children and chan for QTFF or remove them for isobmff
+	for (i=0; i<gf_list_count(aud_entry->child_boxes); i++) {
+		GF_Box *b = gf_list_get(aud_entry->child_boxes, i);
+		if ((b->type != GF_QT_BOX_TYPE_WAVE) && (b->type != GF_QT_BOX_TYPE_CHAN) ) continue;
+		if (asemode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF) {
+			if (b->type == GF_QT_BOX_TYPE_WAVE) wave_box = b;
+#if 0
+			else chan = (GF_ChannelLayoutInfoBox *)b;
+#endif
+
+		} else {
+			gf_isom_box_del_parent(&aud_entry->child_boxes, b);
+			i--;
 		}
-		if (wave)
-			aud_entry->is_qtff=2;
+	}
 
-		if (aud_entry->type==GF_ISOM_BOX_TYPE_MP4A)
-			aud_entry->compression_id = -2;
-		else
-			aud_entry->compression_id = 0;
+	//TODO: insert channelLayout for ISOBMFF
+	if (asemode!=GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF) return GF_OK;
+
+	if (aud_entry->type==GF_ISOM_BOX_TYPE_MP4A)
+		aud_entry->compression_id = -2;
+
+	if (!aud_entry->child_boxes) aud_entry->child_boxes = gf_list_new();
+
+#if 0
+	if (!chan) {
+		chan = (GF_ChannelLayoutInfoBox *) gf_isom_box_new_parent(&aud_entry->child_boxes, GF_QT_BOX_TYPE_CHAN);
+	}
+	//TODO, proper channel mapping
+	chan->layout_tag = (nbChannels==2) ? 6750210 : 6553601;
+#endif
+
+	codec_ext = gf_isom_audio_sample_get_audio_codec_cfg_box((GF_AudioSampleEntryBox *)aud_entry);
+	if (!codec_ext) return GF_OK;
+
+	if (!wave_box) {
+		wave_box = gf_isom_box_new_parent(&aud_entry->child_boxes, GF_QT_BOX_TYPE_WAVE);
+	}
+
+	for (i=0; i<gf_list_count(wave_box->child_boxes); i++) {
+		GF_Box *b = gf_list_get(wave_box->child_boxes, i);
+		switch (b->type) {
+		case GF_QT_BOX_TYPE_ENDA:
+			enda = (GF_ChromaInfoBox *)b;
+			break;
+		case GF_QT_BOX_TYPE_FRMA:
+			frma = (GF_OriginalFormatBox *)b;
+			break;
+		case GF_ISOM_BOX_TYPE_ESDS:
+			esds = (GF_ESDBox *)b;
+			break;
+		case GF_ISOM_BOX_TYPE_UNKNOWN:
+			if ( ((GF_UnknownBox*)b)->original_4cc == 0)
+				terminator = b;
+			break;
+		case 0:
+			terminator = b;
+			break;
+		}
+	}
+	if (!wave_box->child_boxes) wave_box->child_boxes = gf_list_new();
+
+	//do not use new_parent, we do this manually to ensure the order
+	aud_entry->qtff_mode = old_qtff_mode ? old_qtff_mode : GF_ISOM_AUDIO_QTFF_ON_NOEXT;
+	if (!frma) {
+		frma = (GF_OriginalFormatBox *)gf_isom_box_new(GF_QT_BOX_TYPE_FRMA);
+	} else {
+		gf_list_del_item(wave_box->child_boxes, frma);
+	}
+	gf_list_add(wave_box->child_boxes, frma);
+
+	if (esds) gf_list_del_item(wave_box->child_boxes, esds);
+	if (!esds && (aud_entry->type==GF_ISOM_BOX_TYPE_MP4A) && ((GF_MPEGAudioSampleEntryBox*)aud_entry)->esd) {
+		gf_list_del_item(entry->child_boxes, (GF_Box *) ((GF_MPEGAudioSampleEntryBox*)aud_entry)->esd);
+		gf_list_add(wave_box->child_boxes, (GF_Box *) ((GF_MPEGAudioSampleEntryBox*)aud_entry)->esd);
+	}
+
+	if (!enda) {
+		enda = (GF_ChromaInfoBox *)gf_isom_box_new(GF_QT_BOX_TYPE_ENDA);
+	} else {
+		gf_list_del_item(wave_box->child_boxes, enda);
+	}
+	enda->chroma=1;
+	gf_list_add(wave_box->child_boxes, enda);
+
+	if (!terminator) {
+		terminator = gf_isom_box_new(0);
+	} else {
+		gf_list_del_item(wave_box->child_boxes, terminator);
+	}
+	gf_list_add(wave_box->child_boxes, terminator);
+
+	if (aud_entry->type==GF_ISOM_BOX_TYPE_GNRA) {
+		frma->data_format = ((GF_GenericAudioSampleEntryBox*) aud_entry)->EntryType;
+	} else {
+		frma->data_format = aud_entry->type;
+	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_audio_layout(GF_ISOFile *movie, u32 trackNumber, u32 sampleDescriptionIndex, GF_AudioChannelLayout *layout)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_AudioSampleEntryBox*aud_entry;
+	GF_SampleDescriptionBox *stsd;
+	GF_ChannelLayoutBox *chnl;
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	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 (!sampleDescriptionIndex || sampleDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		return movie->LastError = GF_BAD_PARAM;
+	}
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->child_boxes, sampleDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (entry == NULL) return GF_BAD_PARAM;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	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);
+		if (e) return e;
+	}
+	chnl = (GF_ChannelLayoutBox *) gf_isom_box_find_child(aud_entry->child_boxes, GF_ISOM_BOX_TYPE_CHNL);
+	if (!chnl) {
+		chnl = (GF_ChannelLayoutBox *)gf_isom_box_new_parent(&aud_entry->child_boxes, GF_ISOM_BOX_TYPE_CHNL);
+		if (!chnl) return GF_OUT_OF_MEM;
+	}
+	aud_entry->channel_count = layout->channels_count;
+	memcpy(&chnl->layout, layout, sizeof(GF_AudioChannelLayout));
 	return GF_OK;
 }
 
 //set the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)
 GF_EXPORT
-GF_Err gf_isom_set_storage_mode(GF_ISOFile *movie, u8 storageMode)
+GF_Err gf_isom_set_storage_mode(GF_ISOFile *movie, GF_ISOStorageMode storageMode)
 {
 	GF_Err e;
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -1713,6 +2342,7 @@
 	case GF_ISOM_STORE_INTERLEAVED:
 	case GF_ISOM_STORE_DRIFT_INTERLEAVED:
 	case GF_ISOM_STORE_TIGHT:
+	case GF_ISOM_STORE_FASTSTART:
 		movie->storageMode = storageMode;
 		return GF_OK;
 	default:
@@ -1720,10 +2350,22 @@
 	}
 }
 
+
 GF_EXPORT
-void gf_isom_force_64bit_chunk_offset(GF_ISOFile *file, Bool set_on)
+GF_Err gf_isom_enable_compression(GF_ISOFile *file, GF_ISOCompressMode compress_mode, Bool force_compress)
 {
+	if (!file) return GF_BAD_PARAM;
+	file->compress_mode = compress_mode;
+	file->force_compress = force_compress;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_force_64bit_chunk_offset(GF_ISOFile *file, Bool set_on)
+{
+	if (!file) return GF_BAD_PARAM;
 	file->force_co64 = set_on;
+	return GF_OK;
 }
 
 
@@ -1731,7 +2373,7 @@
 //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_segment(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, u8 EditMode)
+GF_Err gf_isom_set_edit(GF_ISOFile *movie, u32 trackNumber, u64 EditTime, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode)
 {
 	GF_TrackBox *trak;
 	GF_EditBox *edts;
@@ -1749,15 +2391,15 @@
 
 	edts = trak->editBox;
 	if (! edts) {
-		edts = (GF_EditBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_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_AddBox((GF_Box*)trak, (GF_Box *)edts);
+		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts);
 	}
 	elst = edts->editList;
 	if (!elst) {
-		elst = (GF_EditListBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_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_AddBox((GF_Box*)edts, (GF_Box *)elst);
+		edts_on_child_box((GF_Box*)edts, (GF_Box *)elst);
 	}
 
 	startTime = 0;
@@ -1822,11 +2464,10 @@
 
 //remove the edit segments for the whole track
 GF_EXPORT
-GF_Err gf_isom_remove_edit_segments(GF_ISOFile *movie, u32 trackNumber)
+GF_Err gf_isom_remove_edits(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
-	GF_EdtsEntry *ent;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
 
@@ -1836,13 +2477,13 @@
 	if (!trak->editBox || !trak->editBox->editList) return GF_OK;
 
 	while (gf_list_count(trak->editBox->editList->entryList)) {
-		ent = (GF_EdtsEntry*)gf_list_get(trak->editBox->editList->entryList, 0);
+		GF_EdtsEntry *ent = (GF_EdtsEntry*)gf_list_get(trak->editBox->editList->entryList, 0);
 		gf_free(ent);
 		e = gf_list_rem(trak->editBox->editList->entryList, 0);
 		if (e) return e;
 	}
 	//then delete the GF_EditBox...
-	gf_isom_box_del((GF_Box *)trak->editBox);
+	gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *)trak->editBox);
 	trak->editBox = NULL;
 	return SetTrackDuration(trak);
 }
@@ -1850,7 +2491,7 @@
 
 //remove the edit segments for the whole track
 GF_EXPORT
-GF_Err gf_isom_remove_edit_segment(GF_ISOFile *movie, u32 trackNumber, u32 seg_index)
+GF_Err gf_isom_remove_edit(GF_ISOFile *movie, u32 trackNumber, u32 seg_index)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1862,7 +2503,7 @@
 	if (e) return e;
 
 	if (!trak->editBox || !trak->editBox->editList) return GF_OK;
-	if (gf_list_count(trak->editBox->editList->entryList)<=1) return gf_isom_remove_edit_segments(movie, trackNumber);
+	if (gf_list_count(trak->editBox->editList->entryList)<=1) return gf_isom_remove_edits(movie, trackNumber);
 
 	ent = (GF_EdtsEntry*) gf_list_get(trak->editBox->editList->entryList, seg_index-1);
 	gf_list_rem(trak->editBox->editList->entryList, seg_index-1);
@@ -1874,7 +2515,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_append_edit_segment(GF_ISOFile *movie, u32 trackNumber, u64 EditDuration, u64 MediaTime, u8 EditMode)
+GF_Err gf_isom_append_edit(GF_ISOFile *movie, u32 trackNumber, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1885,14 +2526,16 @@
 	if (e) return e;
 
 	if (!trak->editBox) {
-		GF_EditBox *edts = (GF_EditBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_EDTS);
+		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_AddBox((GF_Box*)trak, (GF_Box *)edts);
+		trak_on_child_box((GF_Box*)trak, (GF_Box *)edts);
+		assert(trak->editBox);
 	}
 	if (!trak->editBox->editList) {
-		GF_EditListBox *elst = (GF_EditListBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ELST);
+		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_AddBox((GF_Box*)trak->editBox, (GF_Box *)elst);
+		edts_on_child_box((GF_Box*)trak->editBox, (GF_Box *)elst);
+		assert(trak->editBox->editList);
 	}
 	ent = (GF_EdtsEntry *)gf_malloc(sizeof(GF_EdtsEntry));
 	if (!ent) return GF_OUT_OF_MEM;
@@ -1917,7 +2560,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_modify_edit_segment(GF_ISOFile *movie, u32 trackNumber, u32 seg_index, u64 EditDuration, u64 MediaTime, u8 EditMode)
+GF_Err gf_isom_modify_edit(GF_ISOFile *movie, u32 trackNumber, u32 seg_index, u64 EditDuration, u64 MediaTime, GF_ISOEditType EditMode)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -1956,7 +2599,8 @@
 	GF_Err e;
 	GF_TrackBox *the_trak, *trak;
 	GF_TrackReferenceTypeBox *tref;
-	u32 i, j, k, *newRefs, descIndex;
+	u32 i, j, k, descIndex;
+	GF_ISOTrackID *newRefs;
 	u8 found;
 	GF_ISOSample *samp;
 	the_trak = gf_isom_get_track_from_file(movie, trackNumber);
@@ -2020,10 +2664,10 @@
 	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->other_boxes)) continue;
+		if (! trak->References || ! gf_list_count(trak->References->child_boxes)) continue;
 
 		j=0;
-		while ((tref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->other_boxes, &j))) {
+		while ((tref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->child_boxes, &j))) {
 			if (tref->reference_type==GF_ISOM_REF_SCAL)
 				continue;
 
@@ -2034,11 +2678,11 @@
 			if (!found) continue;
 			//no more refs, remove this ref_type
 			if (found == tref->trackIDCount) {
-				gf_isom_box_del((GF_Box *)tref);
+				gf_isom_box_del_parent(&trak->References->child_boxes, (GF_Box *)tref);
 				j--;
-				gf_list_rem(trak->References->other_boxes, j);
 			} else {
-				newRefs = (u32*)gf_malloc(sizeof(u32) * (tref->trackIDCount - found));
+				newRefs = (GF_ISOTrackID*)gf_malloc(sizeof(GF_ISOTrackID) * (tref->trackIDCount - found));
+				if (!newRefs) return GF_OUT_OF_MEM;
 				found = 0;
 				for (k = 0; k < tref->trackIDCount; k++) {
 					if (tref->trackIDs[k] != the_trak->Header->trackID) {
@@ -2053,14 +2697,14 @@
 			}
 		}
 		//a little opt: remove the ref box if empty...
-		if (! gf_list_count(trak->References->other_boxes)) {
-			gf_isom_box_del((GF_Box *)trak->References);
+		if (! gf_list_count(trak->References->child_boxes)) {
+			gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *)trak->References);
 			trak->References = NULL;
 		}
 	}
 
 	//delete the track
-	gf_isom_box_del((GF_Box *)the_trak);
+	gf_isom_box_del_parent(&movie->moov->child_boxes, (GF_Box *)the_trak);
 
 	/*update next track ID*/
 	movie->moov->mvhd->nextTrackID = 0;
@@ -2092,22 +2736,24 @@
 
 	if (!notice || !threeCharCode) return GF_BAD_PARAM;
 
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (!movie->moov->udta) {
-		e = moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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));
 		if (e) return e;
 	}
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_CPRT, NULL);
 
 	if (map) {
 		//try to find one in our language...
-		count = gf_list_count(map->other_boxes);
+		count = gf_list_count(map->boxes);
 		for (i=0; i<count; i++) {
-			ptr = (GF_CopyrightBox*)gf_list_get(map->other_boxes, i);
+			ptr = (GF_CopyrightBox*)gf_list_get(map->boxes, i);
 			if (!strcmp(threeCharCode, (const char *) ptr->packedLanguageCode)) {
 				gf_free(ptr->notice);
 				ptr->notice = (char*)gf_malloc(sizeof(char) * (strlen(notice) + 1));
+				if (!ptr->notice) return GF_OUT_OF_MEM;
 				strcpy(ptr->notice, notice);
 				return GF_OK;
 			}
@@ -2115,11 +2761,13 @@
 	}
 	//nope, create one
 	ptr = (GF_CopyrightBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_CPRT);
+	if (!ptr) return GF_OUT_OF_MEM;
 
 	memcpy(ptr->packedLanguageCode, threeCharCode, 4);
 	ptr->notice = (char*)gf_malloc(sizeof(char) * (strlen(notice)+1));
+	if (!ptr->notice) return GF_OUT_OF_MEM;
 	strcpy(ptr->notice, notice);
-	return udta_AddBox((GF_Box *)movie->moov->udta, (GF_Box *) ptr);
+	return udta_on_child_box((GF_Box *)movie->moov->udta, (GF_Box *) ptr);
 }
 
 GF_EXPORT
@@ -2134,13 +2782,14 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -2150,9 +2799,9 @@
 
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
 	if (map) {
-		count = gf_list_count(map->other_boxes);
+		count = gf_list_count(map->boxes);
 		for (i=0; i<count; i++) {
-			GF_Box *b = (GF_Box *)gf_list_get(map->other_boxes, i);
+			GF_Box *b = (GF_Box *)gf_list_get(map->boxes, i);
 			if (b->type == GF_ISOM_BOX_TYPE_KIND) {
 				GF_KindBox *kb = (GF_KindBox *)b;
 				if (!strcmp(kb->schemeURI, schemeURI) &&
@@ -2169,7 +2818,7 @@
 
 	ptr->schemeURI = gf_strdup(schemeURI);
 	if (value) ptr->value = gf_strdup(value);
-	return udta_AddBox((GF_Box *)udta, (GF_Box *) ptr);
+	return udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr);
 }
 
 GF_EXPORT
@@ -2182,13 +2831,14 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 			if (e) return e;
 		}
 		udta = trak->udta;
@@ -2197,15 +2847,14 @@
 	}
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_KIND, NULL);
 	if (map) {
-		for (i=0; i<gf_list_count(map->other_boxes); i++) {
-			GF_Box *b = (GF_Box *)gf_list_get(map->other_boxes, i);
+		for (i=0; i<gf_list_count(map->boxes); i++) {
+			GF_Box *b = (GF_Box *)gf_list_get(map->boxes, i);
 			if (b->type == GF_ISOM_BOX_TYPE_KIND) {
 				GF_KindBox *kb = (GF_KindBox *)b;
 				if (!schemeURI ||
 				        (!strcmp(kb->schemeURI, schemeURI) &&
 				         ((value && kb->value && !strcmp(value, kb->value)) || (!value && !kb->value)))) {
-					gf_isom_box_del(b);
-					gf_list_rem(map->other_boxes, i);
+					gf_isom_box_del_parent(&map->boxes, b);
 					i--;
 				}
 			}
@@ -2227,19 +2876,20 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
 		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 			if (e) return e;
 		}
 		udta = trak->udta;
 	} else {
 		if (!movie->moov->udta) {
-			e = moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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));
 			if (e) return e;
 		}
 		udta = movie->moov->udta;
@@ -2249,11 +2899,11 @@
 	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_AddBox((GF_Box *)udta, (GF_Box *) ptr);
+		e = udta_on_child_box((GF_Box *)udta, (GF_Box *) ptr);
 		if (e) return e;
 		map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	} else {
-		ptr = (GF_ChapterListBox*)gf_list_get(map->other_boxes, 0);
+		ptr = (GF_ChapterListBox*)gf_list_get(map->boxes, 0);
 	}
 	if (!map) return GF_OUT_OF_MEM;
 
@@ -2261,7 +2911,7 @@
 	if (!ptr) {
 		ptr = (GF_ChapterListBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_CHPL);
 		if (!ptr) return GF_OUT_OF_MEM;
-		gf_list_add(map->other_boxes, ptr);
+		gf_list_add(map->boxes, ptr);
 	}
 
 	GF_SAFEALLOC(ce, GF_ChapterEntry);
@@ -2297,27 +2947,22 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(GF_ISOM_BOX_TYPE_UDTA));
-			if (e) return e;
-		}
+		if (!trak->udta) return GF_OK;
 		udta = trak->udta;
 	} else {
-		if (!movie->moov->udta) {
-			e = moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(GF_ISOM_BOX_TYPE_UDTA));
-			if (e) return e;
-		}
+		if (!movie->moov->udta) return GF_OK;
 		udta = movie->moov->udta;
 	}
 
 	map = udta_getEntry(udta, GF_ISOM_BOX_TYPE_CHPL, NULL);
 	if (!map) return GF_OK;
-	ptr = (GF_ChapterListBox*)gf_list_get(map->other_boxes, 0);
+	ptr = (GF_ChapterListBox*)gf_list_get(map->boxes, 0);
 	if (!ptr) return GF_OK;
 
 	if (index) {
@@ -2336,13 +2981,13 @@
 	}
 	if (!gf_list_count(ptr->list)) {
 		gf_list_del_item(udta->recordList, map);
-		gf_isom_box_array_del(map->other_boxes);
+		gf_isom_box_array_del(map->boxes);
 		gf_free(map);
 	}
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_remove_copyright(GF_ISOFile *movie, u32 index)
 {
 	GF_Err e;
@@ -2352,7 +2997,8 @@
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 
 	if (!index) return GF_BAD_PARAM;
 	if (!movie->moov->udta) return GF_OK;
@@ -2360,26 +3006,24 @@
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_CPRT, NULL);
 	if (!map) return GF_OK;
 
-	count = gf_list_count(map->other_boxes);
+	count = gf_list_count(map->boxes);
 	if (index>count) return GF_BAD_PARAM;
 
-	ptr = (GF_CopyrightBox*)gf_list_get(map->other_boxes, index-1);
+	ptr = (GF_CopyrightBox*)gf_list_get(map->boxes, index-1);
 	if (ptr) {
-		gf_list_rem(map->other_boxes, index-1);
+		gf_list_rem(map->boxes, index-1);
 		if (ptr->notice) gf_free(ptr->notice);
 		gf_free(ptr);
 	}
 	/*last copyright, remove*/
-	if (!gf_list_count(map->other_boxes)) {
+	if (!gf_list_count(map->boxes)) {
 		gf_list_del_item(movie->moov->udta->recordList, map);
-		gf_list_del(map->other_boxes);
+		gf_list_del(map->boxes);
 		gf_free(map);
 	}
 	return GF_OK;
 }
 
-
-GF_EXPORT
 GF_Err gf_isom_set_watermark(GF_ISOFile *movie, bin128 UUID, u8* data, u32 length)
 {
 	GF_Err e;
@@ -2389,18 +3033,20 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 
-	gf_isom_insert_moov(movie);
+	e = gf_isom_insert_moov(movie);
+	if (e) return e;
 	if (!movie->moov->udta) {
-		e = moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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));
 		if (e) return e;
 	}
 
 	map = udta_getEntry(movie->moov->udta, GF_ISOM_BOX_TYPE_UUID, (bin128 *) & UUID);
 	if (map) {
-		ptr = (GF_UnknownUUIDBox *)gf_list_get(map->other_boxes, 0);
+		ptr = (GF_UnknownUUIDBox *)gf_list_get(map->boxes, 0);
 		if (ptr) {
 			gf_free(ptr->data);
 			ptr->data = (char*)gf_malloc(length);
+			if (!ptr->data) return GF_OUT_OF_MEM;
 			memcpy(ptr->data, data, length);
 			ptr->dataSize = length;
 			return GF_OK;
@@ -2408,12 +3054,16 @@
 	}
 	//nope, create one
 	ptr = (GF_UnknownUUIDBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_UUID);
+	if (!ptr) return GF_OUT_OF_MEM;
+
 	memcpy(ptr->uuid, UUID, 16);
 	ptr->data = (char*)gf_malloc(length);
+	if (!ptr->data) return GF_OUT_OF_MEM;
 	memcpy(ptr->data, data, length);
 	ptr->dataSize = length;
-	return udta_AddBox((GF_Box *)movie->moov->udta, (GF_Box *) ptr);
+	return udta_on_child_box((GF_Box *)movie->moov->udta, (GF_Box *) ptr);
 }
+#endif
 
 //set the interleaving time of media data (INTERLEAVED mode only)
 //InterleaveTime is in MovieTimeScale
@@ -2429,27 +3079,13 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-u32 gf_isom_get_interleave_time(GF_ISOFile *movie)
-{
-	return movie ? movie->interleavingTime : 0;
-}
-
-//set the storage mode of a file (FLAT, STREAMABLE, INTERLEAVED)
-GF_EXPORT
-u8 gf_isom_get_storage_mode(GF_ISOFile *movie)
-{
-	return movie ? movie->storageMode : 0;
-}
-
-
 
 
 //use a compact track version for sample size. This is not usually recommended
 //except for speech codecs where the track has a lot of small samples
 //compaction is done automatically while writing based on the track's sample sizes
 GF_EXPORT
-GF_Err gf_isom_use_compact_size(GF_ISOFile *movie, u32 trackNumber, u8 CompactionOn)
+GF_Err gf_isom_use_compact_size(GF_ISOFile *movie, u32 trackNumber, Bool CompactionOn)
 {
 	GF_TrackBox *trak;
 	u32 i, size;
@@ -2502,6 +3138,7 @@
 		//this is a weird table indeed ;)
 		if (stsz->sizes) gf_free(stsz->sizes);
 		stsz->sizes = (u32*) gf_malloc(sizeof(u32)*stsz->sampleCount);
+		if (!stsz->sizes) return GF_OUT_OF_MEM;
 		memset(stsz->sizes, stsz->sampleSize, sizeof(u32));
 	}
 	//set the SampleSize to 0 while the file is open
@@ -2530,6 +3167,7 @@
 
 	if (!movie->brand) {
 		movie->brand = (GF_FileTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_FTYP);
+		if (!movie->brand) return GF_OUT_OF_MEM;
 		gf_list_add(movie->TopBoxes, movie->brand);
 	}
 
@@ -2538,6 +3176,7 @@
 
 	if (!movie->brand->altBrand) {
 		movie->brand->altBrand = (u32*)gf_malloc(sizeof(u32));
+		if (!movie->brand->altBrand) return GF_OUT_OF_MEM;
 		movie->brand->altBrand[0] = MajorBrand;
 		movie->brand->altCount = 1;
 		return GF_OK;
@@ -2559,7 +3198,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *movie, u32 Brand, u8 AddIt)
+GF_Err gf_isom_modify_alternate_brand(GF_ISOFile *movie, u32 Brand, Bool AddIt)
 {
 	u32 i, k, *p;
 
@@ -2647,6 +3286,7 @@
 
 	if (!movie->brand) {
 		movie->brand = (GF_FileTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_FTYP);
+		if (!movie->brand) return GF_OUT_OF_MEM;
 		gf_list_add(movie->TopBoxes, movie->brand);
 	}
 	p = (u32*)gf_malloc(sizeof(u32));
@@ -2658,7 +3298,7 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_set_sample_padding_bits(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u8 NbBits)
 {
 	GF_TrackBox *trak;
@@ -2673,7 +3313,7 @@
 	//set Padding info
 	return stbl_SetPaddingBits(trak->Media->information->sampleTable, sampleNumber, NbBits);
 }
-
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_remove_user_data_item(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, u32 UserDataIndex)
@@ -2712,17 +3352,15 @@
 
 found:
 
-	if (UserDataIndex > gf_list_count(map->other_boxes) ) return GF_BAD_PARAM;
+	if (UserDataIndex > gf_list_count(map->boxes) ) return GF_BAD_PARAM;
 	//delete the box
-	a = (GF_Box*)gf_list_get(map->other_boxes, UserDataIndex-1);
-
-	gf_list_rem(map->other_boxes, UserDataIndex-1);
-	gf_isom_box_del(a);
+	a = (GF_Box*)gf_list_get(map->boxes, UserDataIndex-1);
+	gf_isom_box_del_parent(&map->boxes, a);
 
 	//remove the map if empty
-	if (!gf_list_count(map->other_boxes)) {
+	if (!gf_list_count(map->boxes)) {
 		gf_list_rem(udta->recordList, i-1);
-		gf_isom_box_array_del(map->other_boxes);
+		gf_isom_box_array_del(map->boxes);
 		gf_free(map);
 	}
 	//but we keep the UDTA no matter what
@@ -2765,7 +3403,7 @@
 found:
 
 	gf_list_rem(udta->recordList, i-1);
-	gf_isom_box_array_del(map->other_boxes);
+	gf_isom_box_array_del(map->boxes);
 	gf_free(map);
 
 	//but we keep the UDTA no matter what
@@ -2773,7 +3411,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, char *data, u32 DataLength)
+GF_Err gf_isom_add_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataType, bin128 UUID, u8 *data, u32 DataLength)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -2787,10 +3425,10 @@
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->udta) trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 		udta = trak->udta;
 	} else {
-		if (!movie->moov->udta) moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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));
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_OUT_OF_MEM;
@@ -2798,28 +3436,32 @@
 	//create a default box
 	if (UserDataType) {
 		GF_UnknownBox *a = (GF_UnknownBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_UNKNOWN);
+		if (!a) return GF_OUT_OF_MEM;
 		a->original_4cc = UserDataType;
 		if (DataLength) {
 			a->data = (char*)gf_malloc(sizeof(char)*DataLength);
+			if (!a->data) return GF_OUT_OF_MEM;
 			memcpy(a->data, data, DataLength);
 			a->dataSize = DataLength;
 		}
-		return udta_AddBox((GF_Box *)udta, (GF_Box *) a);
+		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a);
 	} else {
 		GF_UnknownUUIDBox *a = (GF_UnknownUUIDBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_UUID);
+		if (!a) return GF_OUT_OF_MEM;
 		memcpy(a->uuid, UUID, 16);
 		if (DataLength) {
 			a->data = (char*)gf_malloc(sizeof(char)*DataLength);
+			if (!a->data) return GF_OUT_OF_MEM;
 			memcpy(a->data, data, DataLength);
 			a->dataSize = DataLength;
 		}
-		return udta_AddBox((GF_Box *)udta, (GF_Box *) a);
+		return udta_on_child_box((GF_Box *)udta, (GF_Box *) a);
 	}
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *movie, u32 trackNumber, char *data, u32 DataLength)
+GF_Err gf_isom_add_user_data_boxes(GF_ISOFile *movie, u32 trackNumber, u8 *data, u32 DataLength)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -2832,11 +3474,11 @@
 	if (trackNumber) {
 		trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->udta) trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 		udta = trak->udta;
 	} else {
 		if (!movie->moov) return GF_BAD_PARAM;
-		if (!movie->moov->udta) moov_AddBox((GF_Box*)movie->moov, gf_isom_box_new(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));
 		udta = movie->moov->udta;
 	}
 	if (!udta) return GF_OUT_OF_MEM;
@@ -2846,7 +3488,7 @@
 		GF_Box *a;
 		e = gf_isom_box_parse(&a, bs);
 		if (e) break;
-		e = udta_AddBox((GF_Box *)udta, a);
+		e = udta_on_child_box((GF_Box *)udta, a);
 		if (e) break;
 	}
 	gf_bs_del(bs);
@@ -2878,10 +3520,11 @@
 	return GF_OK;
 }
 
+GF_EXPORT
 GF_Err gf_isom_clone_box(GF_Box *src, GF_Box **dst)
 {
 	GF_Err e;
-	char *data;
+	u8 *data;
 	u32 data_size;
 	GF_BitStream *bs;
 
@@ -2904,7 +3547,12 @@
 	return e;
 }
 
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh, Bool mvex_after_traks)
+#if 0 //unused
+/*clones the entire movie file to destination. Tracks can be cloned if clone_tracks is set, in which case hint tracks can be
+kept if keep_hint_tracks is set
+if keep_pssh, all pssh boxes will be kept
+fragment information (mvex) is not kept*/
+GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh)
 {
 	GF_Err e;
 	u32 i;
@@ -2950,11 +3598,10 @@
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 		if (dest_file->moov->mvex) {
-			gf_isom_box_del((GF_Box *)dest_file->moov->mvex);
+			gf_isom_box_del_parent(&dest_file->moov->child_boxes, (GF_Box *)dest_file->moov->mvex);
 			dest_file->moov->mvex = NULL;
 		}
 #endif
-		dest_file->moov->mvex_after_traks = mvex_after_traks;
 
 		if (clone_tracks) {
 			for (i=0; i<gf_list_count(orig_file->moov->trackList); i++) {
@@ -2976,11 +3623,10 @@
 
 	if (!keep_pssh) {
 		i=0;
-		while ((box = (GF_Box*)gf_list_get(dest_file->moov->other_boxes, i++))) {
+		while ((box = (GF_Box*)gf_list_get(dest_file->moov->child_boxes, i++))) {
 			if (box->type == GF_ISOM_BOX_TYPE_PSSH) {
 				i--;
-				gf_list_rem(dest_file->moov->other_boxes, i);
-				gf_isom_box_del(box);
+				gf_isom_box_del_parent(&dest_file->moov->child_boxes, box);
 			}
 		}
 	}
@@ -3019,24 +3665,229 @@
 
 	return GF_OK;
 }
+#endif
+
+
+GF_EXPORT
+GF_Err gf_isom_get_raw_user_data(GF_ISOFile *file, u8 **output, u32 *output_size)
+{
+	GF_BitStream *bs;
+	GF_Err e;
+	GF_Box *b;
+	u32 i;
+
+	*output = NULL;
+	*output_size = 0;
+	if (!file || !file->moov || (!file->moov->udta && !file->moov->child_boxes)) return GF_OK;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	if (file->moov->udta) {
+		e = gf_isom_box_size( (GF_Box *) file->moov->udta);
+		if (e) goto exit;
+		e = gf_isom_box_write((GF_Box *) file->moov->udta, bs);
+		if (e) goto exit;
+	}
+	e = GF_OK;
+	i=0;
+	while ((b = gf_list_enum(file->moov->child_boxes, &i))) {
+		switch (b->type) {
+		case GF_ISOM_BOX_TYPE_TRAK:
+		case GF_ISOM_BOX_TYPE_MVHD:
+		case GF_ISOM_BOX_TYPE_MVEX:
+		case GF_ISOM_BOX_TYPE_IODS:
+		case GF_ISOM_BOX_TYPE_META:
+			continue;
+		}
+		e = gf_isom_box_size( (GF_Box *) b);
+		if (e) goto exit;
+		e = gf_isom_box_write((GF_Box *) b, bs);
+		if (e) goto exit;
+	}
+
+	gf_bs_get_content(bs, output, output_size);
+
+exit:
+	gf_bs_del(bs);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_track_template(GF_ISOFile *file, u32 track, u8 **output, u32 *output_size)
+{
+	GF_TrackBox *trak;
+	GF_BitStream *bs;
+	GF_DataReferenceBox *dref;
+	GF_SampleTableBox *stbl, *stbl_temp;
+	GF_SampleEncryptionBox *senc;
+	u32 i, count;
+
+	*output = NULL;
+	*output_size = 0;
+	/*get orig sample desc and clone it*/
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+
+	//don't serialize dref
+	dref = NULL;
+	if (trak->Media->information->dataInformation) {
+		dref = trak->Media->information->dataInformation->dref;
+		trak->Media->information->dataInformation->dref = NULL;
+		gf_list_del_item(trak->Media->information->dataInformation->child_boxes, dref);
+	}
+
+	//don't serialize stbl but create a temp one
+	stbl_temp = (GF_SampleTableBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STBL);
+	if (!stbl_temp->child_boxes) stbl_temp->child_boxes = gf_list_new();
+	stbl = trak->Media->information->sampleTable;
+	gf_list_del_item(trak->Media->information->child_boxes, stbl);
+
+	trak->Media->information->sampleTable = stbl_temp;
+	gf_list_add(trak->Media->information->child_boxes, stbl_temp);
+
+	/*do not clone sampleDescription table but create an empty one*/
+	stbl_temp->SampleDescription = (GF_SampleDescriptionBox *) gf_isom_box_new_parent(&stbl_temp->child_boxes, GF_ISOM_BOX_TYPE_STSD);
+
+	/*clone sampleGroups description tables if any*/
+	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_list_add(stbl_temp->child_boxes, b);
+	}
+	/*clone CompositionToDecode table, we may remove it later*/
+	stbl_temp->CompositionToDecode = stbl->CompositionToDecode;
+	gf_list_add(stbl_temp->child_boxes, stbl->CompositionToDecode);
+
+
+	//don't serialize senc
+	senc = trak->sample_encryption;
+	if (senc) {
+		assert(trak->child_boxes);
+		gf_list_del_item(trak->child_boxes, senc);
+		trak->sample_encryption = NULL;
+	}
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_isom_box_size( (GF_Box *) trak);
+	gf_isom_box_write((GF_Box *) trak, bs);
+	gf_bs_get_content(bs, output, output_size);
+	gf_bs_del(bs);
+
+	//restore our pointers
+	if (dref) {
+		trak->Media->information->dataInformation->dref = dref;
+		gf_list_add(trak->Media->information->dataInformation->child_boxes, dref);
+	}
+	trak->Media->information->sampleTable = stbl;
+	gf_list_add(trak->Media->information->child_boxes, stbl);
+	gf_list_del_item(trak->Media->information->child_boxes, stbl_temp);
+	if (senc) {
+		trak->sample_encryption = senc;
+		gf_list_add(trak->child_boxes, senc);
+	}
+
+	stbl_temp->sampleGroupsDescription = NULL;
+	count = gf_list_count(stbl->sampleGroupsDescription);
+	for (i=0;i<count; i++) {
+		GF_Box *b = gf_list_get(stbl->sampleGroupsDescription, i);
+		gf_list_del_item(stbl_temp->child_boxes, b);
+	}
+
+	stbl_temp->CompositionToDecode = NULL;
+	gf_list_del_item(stbl_temp->child_boxes, stbl->CompositionToDecode);
+	gf_isom_box_del((GF_Box *)stbl_temp);
+	return GF_OK;
+
+}
 
 GF_EXPORT
-GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, u32 flags, u32 *dest_track)
+GF_Err gf_isom_get_trex_template(GF_ISOFile *file, u32 track, u8 **output, u32 *output_size)
+{
+	GF_TrackBox *trak;
+	GF_BitStream *bs;
+	u32 i;
+	GF_TrackExtendsBox *trex = NULL;
+	GF_TrackExtensionPropertiesBox *trexprop = NULL;
+
+	*output = NULL;
+	*output_size = 0;
+	/*get orig sample desc and clone it*/
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !trak->Media) return GF_BAD_PARAM;
+	if (!file->moov->mvex) return GF_NOT_FOUND;
+	for (i=0; i<gf_list_count(file->moov->mvex->TrackExList); i++) {
+		trex = gf_list_get(file->moov->mvex->TrackExList, i);
+		if (trex->trackID == trak->Header->trackID) break;
+		trex = NULL;
+	}
+	if (!trex) return GF_NOT_FOUND;
+
+	for (i=0; i<gf_list_count(file->moov->mvex->TrackExPropList); i++) {
+		trexprop = gf_list_get(file->moov->mvex->TrackExPropList, i);
+		if (trexprop->trackID== trak->Header->trackID) break;
+		trexprop = NULL;
+	}
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_isom_box_size( (GF_Box *) trex);
+	gf_isom_box_write((GF_Box *) trex, bs);
+
+	if (trexprop) {
+		gf_isom_box_size( (GF_Box *) trexprop);
+		gf_isom_box_write((GF_Box *) trexprop, bs);
+	}
+	gf_bs_get_content(bs, output, output_size);
+	gf_bs_del(bs);
+
+	return GF_OK;
+
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_stsd_template(GF_ISOFile *file, u32 track, u32 stsd_idx, u8 **output, u32 *output_size)
+{
+	GF_TrackBox *trak;
+	GF_BitStream *bs;
+	GF_Box *ent;
+
+	*output = NULL;
+	*output_size = 0;
+	/*get orig sample desc and clone it*/
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !stsd_idx || !trak->Media || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription) return GF_BAD_PARAM;
+
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, stsd_idx-1);
+	if (!ent) return GF_BAD_PARAM;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_isom_box_size( (GF_Box *) ent);
+	gf_isom_box_write((GF_Box *) ent, bs);
+	gf_bs_get_content(bs, output, output_size);
+	gf_bs_del(bs);
+	return GF_OK;
+
+}
+
+
+GF_EXPORT
+GF_Err gf_isom_clone_track(GF_ISOFile *orig_file, u32 orig_track, GF_ISOFile *dest_file, GF_ISOTrackCloneFlags flags, u32 *dest_track)
 {
 	GF_TrackBox *trak, *new_tk;
 	GF_BitStream *bs;
-	char *data;
-	const char *buffer;
+	u8 *data;
+	const u8 *buffer;
 	u32 data_size;
 	Double ts_scale;
+	u32 i, count;
 	GF_Err e;
-	GF_SampleEntryBox *entry;
 	GF_SampleTableBox *stbl, *stbl_temp;
 	GF_SampleEncryptionBox *senc;
 
 	e = CanAccessMovie(dest_file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
-	gf_isom_insert_moov(dest_file);
+	e = gf_isom_insert_moov(dest_file);
+	if (e) return e;
 
 	/*get orig sample desc and clone it*/
 	trak = gf_isom_get_track_from_file(orig_file, orig_track);
@@ -3044,18 +3895,32 @@
 
 	stbl = trak->Media->information->sampleTable;
 	stbl_temp = (GF_SampleTableBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STBL);
+	if (!stbl_temp->child_boxes) stbl_temp->child_boxes = gf_list_new();
+
+	trak->Media->information->sampleTable = stbl_temp;
+	gf_list_add(trak->Media->information->child_boxes, stbl_temp);
+	gf_list_del_item(trak->Media->information->child_boxes, stbl);
+
+	if (!stbl_temp->child_boxes) stbl_temp->child_boxes = gf_list_new();
+
 	/*clone sampleDescription table*/
 	stbl_temp->SampleDescription = stbl->SampleDescription;
+	gf_list_add(stbl_temp->child_boxes, stbl->SampleDescription);
 	/*also clone sampleGroups description tables if any*/
 	stbl_temp->sampleGroupsDescription = stbl->sampleGroupsDescription;
-	trak->Media->information->sampleTable = stbl_temp;
+	count = gf_list_count(stbl->sampleGroupsDescription);
+	for (i=0; i<count; i++) {
+		GF_Box *b = gf_list_get(stbl->sampleGroupsDescription, i);
+		gf_list_add(stbl_temp->child_boxes, b);
+	}
 	/*clone CompositionToDecode table, we may remove it later*/
 	stbl_temp->CompositionToDecode = stbl->CompositionToDecode;
+	gf_list_add(stbl_temp->child_boxes, stbl->CompositionToDecode);
 
 	senc = trak->sample_encryption;
 	if (senc) {
-		assert(trak->other_boxes);
-		gf_list_del_item(trak->other_boxes, senc);
+		assert(trak->child_boxes);
+		gf_list_del_item(trak->child_boxes, senc);
 		trak->sample_encryption = NULL;
 	}
 
@@ -3067,29 +3932,53 @@
 	gf_bs_del(bs);
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 	if (flags & GF_ISOM_CLONE_TRACK_NO_QT)
-		gf_bs_set_cookie(bs, 1);
+		gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_QT_CONV | GF_ISOM_BS_COOKIE_CLONE_TRACK);
+	else
+		gf_bs_set_cookie(bs, GF_ISOM_BS_COOKIE_CLONE_TRACK);
+
 	e = gf_isom_box_parse((GF_Box **) &new_tk, bs);
 	gf_bs_del(bs);
 	gf_free(data);
+
 	trak->Media->information->sampleTable = stbl;
+	gf_list_del_item(trak->Media->information->child_boxes, stbl_temp);
+	gf_list_add(trak->Media->information->child_boxes, stbl);
+
 	if (senc) {
 		trak->sample_encryption = senc;
-		gf_list_add(trak->other_boxes, senc);
+		gf_list_add(trak->child_boxes, senc);
 	}
+	gf_list_del_item(stbl_temp->child_boxes, stbl_temp->SampleDescription);
 	stbl_temp->SampleDescription = NULL;
+
+	count = gf_list_count(stbl->sampleGroupsDescription);
+	for (i=0; i<count; i++) {
+		GF_Box *b = gf_list_get(stbl->sampleGroupsDescription, i);
+		gf_list_del_item(stbl_temp->child_boxes, b);
+	}
 	stbl_temp->sampleGroupsDescription = NULL;
+
+	gf_list_del_item(stbl_temp->child_boxes, stbl_temp->CompositionToDecode);
 	stbl_temp->CompositionToDecode = NULL;
 	gf_isom_box_del((GF_Box *)stbl_temp);
 
-	if (e) return e;
+	if (e) {
+		if (new_tk) gf_isom_box_del((GF_Box *)new_tk);
+		return e;
+	}
+
 
 
 	/*create default boxes*/
 	stbl = new_tk->Media->information->sampleTable;
-	stbl->ChunkOffset = gf_isom_box_new(GF_ISOM_BOX_TYPE_STCO);
-	stbl->SampleSize = (GF_SampleSizeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSZ);
-	stbl->SampleToChunk = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
-	stbl->TimeToSample = (GF_TimeToSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STTS);
+	stbl->ChunkOffset = gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STCO);
+	if (!stbl->ChunkOffset) return GF_OUT_OF_MEM;
+	stbl->SampleSize = (GF_SampleSizeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSZ);
+	if (!stbl->SampleSize) return GF_OUT_OF_MEM;
+	stbl->SampleToChunk = (GF_SampleToChunkBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSC);
+	if (!stbl->SampleToChunk) return GF_OUT_OF_MEM;
+	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;
 
 	/*check trackID validity before adding track*/
 	if (gf_isom_get_track_by_id(dest_file, new_tk->Header->trackID)) {
@@ -3101,42 +3990,51 @@
 		}
 		new_tk->Header->trackID = ID;
 	}
-
-	moov_AddBox((GF_Box*)dest_file->moov, (GF_Box *)new_tk);
+	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);
 
 	/*set originalID*/
 	new_tk->originalID = trak->Header->trackID;
 	/*set originalFile*/
 	buffer = gf_isom_get_filename(orig_file);
-	new_tk->originalFile = gf_crc_32(buffer, sizeof(buffer));
+	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) {
-		u32 i, count = gf_list_count(new_tk->editBox->editList->entryList);
+		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 (!new_tk->Media->information->dataInformation->dref) return GF_BAD_PARAM;
+
 	/*reset data ref*/
 	if (! (flags & GF_ISOM_CLONE_TRACK_KEEP_DREF) ) {
-		gf_isom_box_array_del(new_tk->Media->information->dataInformation->dref->other_boxes);
-		new_tk->Media->information->dataInformation->dref->other_boxes = gf_list_new();
+		GF_SampleEntryBox *entry;
+		Bool use_alis = GF_FALSE;
+		if (! (flags & GF_ISOM_CLONE_TRACK_NO_QT)) {
+			GF_Box *b = gf_list_get(new_tk->Media->information->dataInformation->dref->child_boxes, 0);
+			if (b && b->type==GF_QT_BOX_TYPE_ALIS)
+				use_alis = GF_TRUE;
+		}
+		gf_isom_box_array_del(new_tk->Media->information->dataInformation->dref->child_boxes);
+		new_tk->Media->information->dataInformation->dref->child_boxes = gf_list_new();
 		/*update data ref*/
-		entry = (GF_SampleEntryBox*)gf_list_get(new_tk->Media->information->sampleTable->SampleDescription->other_boxes, 0);
+		entry = (GF_SampleEntryBox*)gf_list_get(new_tk->Media->information->sampleTable->SampleDescription->child_boxes, 0);
 		if (entry) {
 			u32 dref;
-			Media_CreateDataRef(dest_file, new_tk->Media->information->dataInformation->dref, NULL, NULL, &dref);
+			Media_CreateDataRef(dest_file, new_tk->Media->information->dataInformation->dref, use_alis ?  "alis" : NULL, NULL, &dref);
 			entry->dataReferenceIndex = dref;
 		}
 	} else {
-		u32 i;
-		for (i=0; i<gf_list_count(new_tk->Media->information->dataInformation->dref->other_boxes); i++) {
-			GF_DataEntryBox *dref_entry = (GF_DataEntryBox *)gf_list_get(new_tk->Media->information->dataInformation->dref->other_boxes, i);
+		for (i=0; i<gf_list_count(new_tk->Media->information->dataInformation->dref->child_boxes); i++) {
+			GF_DataEntryBox *dref_entry = (GF_DataEntryBox *)gf_list_get(new_tk->Media->information->dataInformation->dref->child_boxes, i);
 			if (dref_entry->flags & 1) {
 				dref_entry->flags &= ~1;
 				e = Media_SetDrefURL((GF_DataEntryURLBox *)dref_entry, orig_file->fileName, dest_file->finalName);
@@ -3153,6 +4051,8 @@
 	return GF_OK;
 }
 
+#if 0
+/*clones all sampleDescription entries in new track, after an optional reset of existing entries*/
 GF_Err gf_isom_clone_sample_descriptions(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, Bool reset_existing)
 {
 	u32 i;
@@ -3166,25 +4066,26 @@
 	if (!src_trak || !src_trak->Media) return GF_BAD_PARAM;
 
 	if (reset_existing) {
-		gf_isom_box_array_del(dst_trak->Media->information->sampleTable->SampleDescription->other_boxes);
-		dst_trak->Media->information->sampleTable->SampleDescription->other_boxes = gf_list_new();
+		gf_isom_box_array_del(dst_trak->Media->information->sampleTable->SampleDescription->child_boxes);
+		dst_trak->Media->information->sampleTable->SampleDescription->child_boxes = gf_list_new();
 	}
 
-	for (i=0; i<gf_list_count(src_trak->Media->information->sampleTable->SampleDescription->other_boxes); i++) {
+	for (i=0; i<gf_list_count(src_trak->Media->information->sampleTable->SampleDescription->child_boxes); i++) {
 		u32 outDesc;
 		e = gf_isom_clone_sample_description(the_file, trackNumber, orig_file, orig_track, i+1, NULL, NULL, &outDesc);
 		if (e) break;
 	}
 	return e;
 }
+#endif
 
 
 GF_EXPORT
-GF_Err gf_isom_clone_sample_description(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, u32 orig_desc_index, char *URLname, char *URNname, u32 *outDescriptionIndex)
+GF_Err gf_isom_clone_sample_description(GF_ISOFile *the_file, u32 trackNumber, GF_ISOFile *orig_file, u32 orig_track, u32 orig_desc_index, const char *URLname, const char *URNname, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
 	GF_BitStream *bs;
-	char *data;
+	u8 *data;
 	u32 data_size;
 	GF_Box *entry;
 	GF_Err e;
@@ -3198,7 +4099,7 @@
 	trak = gf_isom_get_track_from_file(orig_file, orig_track);
 	if (!trak || !trak->Media) return GF_BAD_PARAM;
 
-	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, orig_desc_index-1);
+	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, orig_desc_index-1);
 	if (!entry) return GF_BAD_PARAM;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -3218,22 +4119,22 @@
 	if (!trak || !trak->Media) goto exit;
 
 	/*get or create the data ref*/
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 	if (e) goto exit;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 		if (e) goto exit;
 	}
 	if (!the_file->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	/*overwrite dref*/
 	((GF_SampleEntryBox *)entry)->dataReferenceIndex = dataRefIndex;
-	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
-	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, entry);
+	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 
 	/*also clone track w/h info*/
     mtype = gf_isom_get_media_type(the_file, trackNumber);
-	if (gf_isom_is_video_subtype(mtype) ) {
+	if (gf_isom_is_video_handler_type(mtype) ) {
 		gf_isom_set_visual_info(the_file, trackNumber, (*outDescriptionIndex), ((GF_VisualSampleEntryBox*)entry)->Width, ((GF_VisualSampleEntryBox*)entry)->Height);
 	}
 	return e;
@@ -3244,7 +4145,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *movie, u32 trackNumber, char *URLname, char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex)
+GF_Err gf_isom_new_generic_sample_description(GF_ISOFile *movie, u32 trackNumber, const char *URLname, const char *URNname, GF_GenericSampleDescription *udesc, u32 *outDescriptionIndex)
 {
 	GF_TrackBox *trak;
 	GF_Err e;
@@ -3257,16 +4158,16 @@
 	if (!trak || !trak->Media || !udesc) return GF_BAD_PARAM;
 
 	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 	if (e) return e;
 	if (!dataRefIndex) {
-		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
+		e = Media_CreateDataRef(movie, trak->Media->information->dataInformation->dref, (char *)URLname, (char *)URNname, &dataRefIndex);
 		if (e) return e;
 	}
 	if (!movie->keep_utc)
 		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
-	if (gf_isom_is_video_subtype(trak->Media->handler->handlerType)) {
+	if (gf_isom_is_video_handler_type(trak->Media->handler->handlerType)) {
 		GF_GenericVisualSampleEntryBox *entry;
 		//create a new entry
 		entry = (GF_GenericVisualSampleEntryBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_GNRV);
@@ -3306,7 +4207,7 @@
 			memcpy(entry->data, udesc->extension_buf, udesc->extension_buf_size);
 			entry->data_size = udesc->extension_buf_size;
 		}
-		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
+		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, entry);
 	}
 	else if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_AUDIO) {
 		GF_GenericAudioSampleEntryBox *gena;
@@ -3333,6 +4234,7 @@
 		gena->channel_count = udesc->nb_channels ? udesc->nb_channels : 2;
 		gena->samplerate_hi = udesc->samplerate;
 		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);
@@ -3343,7 +4245,7 @@
 			memcpy(gena->data, udesc->extension_buf, udesc->extension_buf_size);
 			gena->data_size = udesc->extension_buf_size;
 		}
-		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, gena);
+		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, gena);
 	}
 	else {
 		GF_GenericSampleEntryBox *genm;
@@ -3372,15 +4274,16 @@
 			memcpy(genm->data, udesc->extension_buf, udesc->extension_buf_size);
 			genm->data_size = udesc->extension_buf_size;
 		}
-		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, genm);
+		e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->child_boxes, genm);
 	}
-	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
+	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes);
 	return e;
 }
 
 //use carefully. Very useful when you made a lot of changes (IPMP, IPI, OCI, ...)
 //THIS WILL REPLACE THE WHOLE DESCRIPTOR ...
-GF_EXPORT
+#if 0 //unused
+/*change the data field of an unknown sample description*/
 GF_Err gf_isom_change_generic_sample_description(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, GF_GenericSampleDescription *udesc)
 {
 	GF_TrackBox *trak;
@@ -3393,7 +4296,7 @@
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !StreamDescriptionIndex) return GF_BAD_PARAM;
 
-	entry = (GF_GenericVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, StreamDescriptionIndex-1);
+	entry = (GF_GenericVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, StreamDescriptionIndex-1);
 	if (!entry) return GF_BAD_PARAM;
 	if (entry->type == GF_ISOM_BOX_TYPE_GNRV) {
 		entry->vendor = udesc->vendor_code;
@@ -3464,9 +4367,10 @@
 	}
 	return GF_BAD_PARAM;
 }
+#endif
 
+#if 0
 /*removes given stream description*/
-GF_EXPORT
 GF_Err gf_isom_remove_sample_description(GF_ISOFile *movie, u32 trackNumber, u32 streamDescIndex)
 {
 	GF_TrackBox *trak;
@@ -3477,16 +4381,17 @@
 	if (e) return e;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !trak->Media || !streamDescIndex) return GF_BAD_PARAM;
-	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, streamDescIndex-1);
+	entry = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, streamDescIndex-1);
 	if (!entry) return GF_BAD_PARAM;
-	gf_list_rem(trak->Media->information->sampleTable->SampleDescription->other_boxes, streamDescIndex-1);
+	gf_list_rem(trak->Media->information->sampleTable->SampleDescription->child_boxes, streamDescIndex-1);
 	gf_isom_box_del(entry);
 	return GF_OK;
 }
+#endif
 
 //sets a track reference
 GF_EXPORT
-GF_Err gf_isom_set_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferencedTrackID)
+GF_Err gf_isom_set_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, GF_ISOTrackID ReferencedTrackID)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
@@ -3499,8 +4404,9 @@
 	//no tref, create one
 	tref = trak->References;
 	if (!tref) {
-		tref = (GF_TrackReferenceBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREF);
-		e = trak_AddBox((GF_Box*)trak, (GF_Box *) 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);
 		if (e) return e;
 	}
 	//find a ref of the given type
@@ -3508,23 +4414,22 @@
 	if (e) return e;
 
 	if (!dpnd) {
-		dpnd = (GF_TrackReferenceTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_REFT);
+		dpnd = (GF_TrackReferenceTypeBox *) gf_isom_box_new_parent(&tref->child_boxes, GF_ISOM_BOX_TYPE_REFT);
+		if (!dpnd) return GF_OUT_OF_MEM;
 		dpnd->reference_type = referenceType;
-		e = tref_AddBox((GF_Box*)tref, (GF_Box *)dpnd);
-		if (e) return e;
 	}
 	//add the ref
 	return reftype_AddRefTrack(dpnd, ReferencedTrackID, NULL);
 }
 
 //removes a track reference
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_remove_track_reference(GF_ISOFile *the_file, u32 trackNumber, u32 referenceType, u32 ReferenceIndex)
 {
 	GF_Err e;
 	GF_TrackBox *trak;
 	GF_TrackReferenceBox *tref;
-	GF_TrackReferenceTypeBox *dpnd, *tmp;
+	GF_TrackReferenceTypeBox *dpnd;
 	u32 i, k, *newIDs;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !ReferenceIndex) return GF_BAD_PARAM;
@@ -3539,17 +4444,13 @@
 	if (ReferenceIndex > dpnd->trackIDCount) return GF_BAD_PARAM;
 	//last one
 	if (dpnd->trackIDCount==1) {
-		i=0;
-		while ((tmp = (GF_TrackReferenceTypeBox *)gf_list_enum(tref->other_boxes, &i))) {
-			if (tmp==dpnd) {
-				gf_list_rem(tref->other_boxes, i-1);
-				gf_isom_box_del((GF_Box *) dpnd);
-				return GF_OK;
-			}
-		}
+		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;
+
 	for (i=0; i<dpnd->trackIDCount; i++) {
 		if (i+1 != ReferenceIndex) {
 			newIDs[k] = dpnd->trackIDs[i];
@@ -3561,7 +4462,7 @@
 	dpnd->trackIDs = newIDs;
 	return GF_OK;
 }
-
+#endif
 
 //sets a track reference
 GF_EXPORT
@@ -3573,7 +4474,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	if (trak->References) {
-		gf_isom_box_del((GF_Box *)trak->References);
+		gf_isom_box_del_parent(&trak->child_boxes, (GF_Box *)trak->References);
 		trak->References = NULL;
 	}
 	return GF_OK;
@@ -3583,16 +4484,17 @@
 
 //changes track ID
 GF_EXPORT
-GF_Err gf_isom_set_track_id(GF_ISOFile *movie, u32 trackNumber, u32 trackID)
+GF_Err gf_isom_set_track_id(GF_ISOFile *movie, u32 trackNumber, GF_ISOTrackID trackID)
 {
 	GF_TrackReferenceTypeBox *ref;
 	GF_TrackBox *trak, *a_trak;
 	u32 i, j, k;
 
+	if (!movie) return GF_BAD_PARAM;
 	trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (trak && (trak->Header->trackID==trackID)) return GF_OK;
 	a_trak = gf_isom_get_track_from_id(movie->moov, trackID);
-	if (!movie || !trak || a_trak) return GF_BAD_PARAM;
+	if (!trak || a_trak) return GF_BAD_PARAM;
 
 	if (movie->moov->mvhd->nextTrackID<=trackID)
 		movie->moov->mvhd->nextTrackID = trackID;
@@ -3602,7 +4504,7 @@
 	while ((a_trak = (GF_TrackBox*)gf_list_enum(movie->moov->trackList, &i))) {
 		if (!a_trak->References) continue;
 		j=0;
-		while ((ref = (GF_TrackReferenceTypeBox *)gf_list_enum(a_trak->References->other_boxes, &j))) {
+		while ((ref = (GF_TrackReferenceTypeBox *)gf_list_enum(a_trak->References->child_boxes, &j))) {
 			for (k=0; k<ref->trackIDCount; k++) {
 				if (ref->trackIDs[k]==trak->Header->trackID) {
 					ref->trackIDs[k] = trackID;
@@ -3616,7 +4518,8 @@
 	if (movie->moov->iods && movie->moov->iods->descriptor) {
 		GF_ES_ID_Inc *inc;
 		GF_IsomObjectDescriptor *od = (GF_IsomObjectDescriptor *)movie->moov->iods->descriptor;
-		u32 i = 0;
+
+		i=0;
 		while ((inc = (GF_ES_ID_Inc*)gf_list_enum(od->ES_ID_IncDescriptors, &i))) {
 			if (inc->trackID==trak->Header->trackID) inc->trackID = trackID;
 		}
@@ -3640,7 +4543,7 @@
 		return GF_OK;
 
 	i=0;
-	while ((ref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->other_boxes, &i))) {
+	while ((ref = (GF_TrackReferenceTypeBox *)gf_list_enum(trak->References->child_boxes, &i))) {
 		for (k=0; k < ref->trackIDCount; k++) {
 			a_trak = gf_isom_get_track_from_original_id(movie->moov, ref->trackIDs[k], trak->originalFile);
 			if (a_trak) {
@@ -3656,6 +4559,30 @@
 	return GF_OK;
 }
 
+#if 0 //unused
+
+/*! changes the sample description index of a sample
+\param isom_file the destination ISO file
+\param trackNumber the destination track
+\param sampleNum the target sample number
+\param fnewSampleDescIndex the new sample description index to assign to the sample
+\return error if any
+*/
+GF_EXPORT
+GF_Err gf_isom_change_sample_desc_index(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 newSampleDescIndex)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !sample_number || !newSampleDescIndex) return GF_BAD_PARAM;
+	if (!trak->is_unpacked) {
+		unpack_track(trak);
+	}
+	if (!trak->Media->information->sampleTable->SampleToChunk) return GF_BAD_PARAM;
+	if (trak->Media->information->sampleTable->SampleToChunk->nb_entries < sample_number) return GF_BAD_PARAM;
+	trak->Media->information->sampleTable->SampleToChunk->entries[sample_number-1].sampleDescriptionIndex = newSampleDescIndex;
+	return GF_OK;
+}
+
+/*modify CTS offset of a given sample (used for B-frames) - MUST be called in unpack mode only*/
 GF_EXPORT
 GF_Err gf_isom_modify_cts_offset(GF_ISOFile *the_file, u32 trackNumber, u32 sample_number, u32 offset)
 {
@@ -3667,6 +4594,7 @@
 	trak->Media->information->sampleTable->CompositionOffset->entries[sample_number - 1].decodingOffset = offset;
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_shift_cts_offset(GF_ISOFile *the_file, u32 trackNumber, s32 offset_shift)
@@ -3684,17 +4612,21 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_remove_cts_info(GF_ISOFile *the_file, u32 trackNumber)
 {
+	GF_SampleTableBox *stbl;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
-	if (!trak->Media->information->sampleTable->CompositionOffset) return GF_OK;
 
-	gf_isom_box_del((GF_Box *)trak->Media->information->sampleTable->CompositionOffset);
-	trak->Media->information->sampleTable->CompositionOffset = NULL;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl->CompositionOffset) return GF_OK;
+
+	gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *)stbl->CompositionOffset);
+	stbl->CompositionOffset = NULL;
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_set_cts_packing(GF_ISOFile *the_file, u32 trackNumber, Bool unpack)
@@ -3702,22 +4634,28 @@
 	GF_Err e;
 	GF_Err stbl_repackCTS(GF_CompositionOffsetBox *ctts);
 	GF_Err stbl_unpackCTS(GF_SampleTableBox *stbl);
+	GF_SampleTableBox *stbl;
 
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak) return GF_BAD_PARAM;
+
+	stbl = trak->Media->information->sampleTable;
 	if (unpack) {
-		if (!trak->Media->information->sampleTable->CompositionOffset) trak->Media->information->sampleTable->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CTTS);
-		e = stbl_unpackCTS(trak->Media->information->sampleTable);
+		if (!stbl->CompositionOffset) {
+			stbl->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_CTTS);
+			if (!stbl->CompositionOffset) return GF_OUT_OF_MEM;
+		}
+		e = stbl_unpackCTS(stbl);
 	} else {
-		if (!trak->Media->information->sampleTable->CompositionOffset) return GF_OK;
-		e = stbl_repackCTS(trak->Media->information->sampleTable->CompositionOffset);
+		if (!stbl->CompositionOffset) return GF_OK;
+		e = stbl_repackCTS(stbl->CompositionOffset);
 	}
 	if (e) return e;
 	return SetTrackDuration(trak);
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_track_matrix(GF_ISOFile *the_file, u32 trackNumber, u32 matrix[9])
+GF_Err gf_isom_set_track_matrix(GF_ISOFile *the_file, u32 trackNumber, s32 matrix[9])
 {
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Header) return GF_BAD_PARAM;
@@ -3739,154 +4677,84 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_track_name(GF_ISOFile *the_file, u32 trackNumber, char *name)
-{
-	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
-	if (trak->name) gf_free(trak->name);
-	trak->name = NULL;
-	if (name) trak->name = gf_strdup(name);
-	return GF_OK;
-}
-
-GF_EXPORT
-const char *gf_isom_get_track_name(GF_ISOFile *the_file, u32 trackNumber)
+GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 newTS, u32 new_tsinc, Bool force_rescale)
 {
-	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return NULL;
-	return trak->name;
-}
+	Double scale;
+	u32 old_ts_inc=0;
+	u32 old_timescale;
+	GF_TrackBox *trak;
+	GF_SampleTableBox *stbl;
 
-GF_EXPORT
-GF_Err gf_isom_store_movie_config(GF_ISOFile *movie, Bool remove_all)
-{
-	u32 i, count, len;
-	char *data;
-	GF_BitStream *bs;
-	bin128 binID;
-	if (movie == NULL) return GF_BAD_PARAM;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !trak->Media->mediaHeader) return GF_BAD_PARAM;
+	if ((trak->Media->mediaHeader->timeScale==newTS) && !new_tsinc)
+		return GF_EOS;
 
-	gf_isom_remove_user_data(movie, 0, GF_VENDOR_GPAC, binID);
-	count = gf_isom_get_track_count(movie);
-	for (i=0; i<count; i++) gf_isom_remove_user_data(movie, i+1, GF_VENDOR_GPAC, binID);
+	scale = newTS;
+	scale /= trak->Media->mediaHeader->timeScale;
+	old_timescale = trak->Media->mediaHeader->timeScale;
+	trak->Media->mediaHeader->timeScale = newTS;
 
-	if (remove_all) return GF_OK;
+	stbl = trak->Media->information->sampleTable;
+	if (new_tsinc) {
+		u32 i;
+		if (!stbl->TimeToSample || !stbl->TimeToSample->nb_entries)
+			return GF_BAD_PARAM;
 
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	/*update movie: storage mode and interleaving type*/
-	gf_bs_write_u8(bs, 0xFE); /*marker*/
-	gf_bs_write_u8(bs, movie->storageMode);
-	gf_bs_write_u32(bs, movie->interleavingTime);
-	gf_bs_get_content(bs, &data, &len);
-	gf_bs_del(bs);
-	gf_isom_add_user_data(movie, 0, GF_VENDOR_GPAC, binID, data, len);
-	gf_free(data);
-	/*update tracks: interleaving group/priority and track edit name*/
-	for (i=0; i<count; i++) {
-		u32 j;
-		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, i+1);
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		gf_bs_write_u8(bs, 0xFE);	/*marker*/
-		gf_bs_write_u32(bs, trak->Media->information->sampleTable->groupID);
-		gf_bs_write_u32(bs, trak->Media->information->sampleTable->trackPriority);
-		len = trak->name ? (u32) strlen(trak->name) : 0;
-		gf_bs_write_u32(bs, len);
-		for (j=0; j<len; j++) gf_bs_write_u8(bs, trak->name[j]);
-		gf_bs_get_content(bs, &data, &len);
-		gf_bs_del(bs);
-		gf_isom_add_user_data(movie, i+1, GF_VENDOR_GPAC, binID, data, len);
-		gf_free(data);
-	}
-	return GF_OK;
-}
+		for (i=0; i<stbl->TimeToSample->nb_entries; i++) {
+			if (!old_ts_inc)
+				old_ts_inc = stbl->TimeToSample->entries[i].sampleDelta;
+			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))
+			return GF_EOS;
 
-GF_EXPORT
-GF_Err gf_isom_load_movie_config(GF_ISOFile *movie)
-{
-	u32 i, count, len;
-	char *data;
-	GF_BitStream *bs;
-	Bool found_cfg;
-	bin128 binID;
-	if (movie == NULL) return GF_BAD_PARAM;
-
-	found_cfg = GF_FALSE;
-	/*restore movie*/
-	count = gf_isom_get_user_data_count(movie, 0, GF_VENDOR_GPAC, binID);
-	for (i=0; i<count; i++) {
-		data = NULL;
-		gf_isom_get_user_data(movie, 0, GF_VENDOR_GPAC, binID, i+1, &data, &len);
-		if (!data) continue;
-		/*check marker*/
-		if ((unsigned char) data[0] != 0xFE) {
-			gf_free(data);
-			continue;
+		force_rescale = GF_TRUE;
+		stbl->TimeToSample->entries[0].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;
+				stbl->CompositionOffset->entries[i].decodingOffset = old_offset;
+			}
 		}
-		bs = gf_bs_new(data, len, GF_BITSTREAM_READ);
-		gf_bs_read_u8(bs);	/*marker*/
-		movie->storageMode = gf_bs_read_u8(bs);
-		movie->interleavingTime = gf_bs_read_u32(bs);
-		gf_bs_del(bs);
-		gf_free(data);
-		found_cfg = GF_TRUE;
-		break;
-	}
+		if (stbl->CompositionToDecode) {
+			stbl->CompositionToDecode->compositionEndTime *= new_tsinc;
+			stbl->CompositionToDecode->compositionEndTime /= old_ts_inc;
 
-	for (i=0; i<gf_isom_get_track_count(movie); i++) {
-		u32 j;
-		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, i+1);
-		count = gf_isom_get_user_data_count(movie, i+1, GF_VENDOR_GPAC, binID);
-		for (j=0; j<count; j++) {
-			data = NULL;
-			gf_isom_get_user_data(movie, i+1, GF_VENDOR_GPAC, binID, j+1, &data, &len);
-			if (!data) continue;
-			/*check marker*/
-			if ((unsigned char) data[0] != 0xFE) {
-				gf_free(data);
-				continue;
+			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;
+
+			stbl->CompositionToDecode->leastDecodeToDisplayDelta *= new_tsinc;
+			stbl->CompositionToDecode->leastDecodeToDisplayDelta /= old_ts_inc;
+		}
+		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;
 			}
-			bs = gf_bs_new(data, len, GF_BITSTREAM_READ);
-			gf_bs_read_u8(bs);	/*marker*/
-			trak->Media->information->sampleTable->groupID = gf_bs_read_u32(bs);
-			trak->Media->information->sampleTable->trackPriority = gf_bs_read_u32(bs);
-			len = gf_bs_read_u32(bs);
-			if (len) {
-				u32 k;
-				trak->name = (char*)gf_malloc(sizeof(char)*(len+1));
-				for (k=0; k<len; k++) trak->name[k] = gf_bs_read_u8(bs);
-				trak->name[k] = 0;
-			}
-			gf_bs_del(bs);
-			gf_free(data);
-			found_cfg = GF_TRUE;
-			break;
 		}
 	}
-	return found_cfg ? GF_OK : GF_NOT_SUPPORTED;
-}
 
-GF_EXPORT
-GF_Err gf_isom_set_media_timescale(GF_ISOFile *the_file, u32 trackNumber, u32 newTS, Bool force_rescale)
-{
-	Double scale;
-	GF_TrackBox *trak;
-	trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak || !trak->Media | !trak->Media->mediaHeader) return GF_BAD_PARAM;
-	if (trak->Media->mediaHeader->timeScale==newTS) return GF_OK;
-
-	scale = newTS;
-	scale /= trak->Media->mediaHeader->timeScale;
-	trak->Media->mediaHeader->timeScale = newTS;
 	if (!force_rescale) {
 		u32 i, k, idx, last_delta;
-		GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 		u64 cur_dts;
 		u64*DTSs = NULL;
 		s64*CTSs = NULL;
 
 		if (trak->editBox) {
 			GF_EdtsEntry *ent;
-			u32 i=0;
+			i=0;
 			while ((ent = (GF_EdtsEntry*)gf_list_enum(trak->editBox->editList->entryList, &i))) {
 				ent->mediaTime = (u32) (scale*ent->mediaTime);
 			}
@@ -3899,11 +4767,12 @@
 		cur_dts = 0;
 		//unpack the DTSs
 		DTSs = (u64*)gf_malloc(sizeof(u64) * (stbl->SampleSize->sampleCount) );
-		CTSs = NULL;
-
 		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++) {
@@ -3925,7 +4794,6 @@
 		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->nb_entries = 1;
 			stbl->TimeToSample->entries[0].sampleDelta = (u32) DTSs[0];
 			stbl->TimeToSample->entries[0].sampleCount = 1;
 			idx=0;
@@ -3955,7 +4823,6 @@
 			//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->nb_entries = 1;
 			stbl->CompositionOffset->entries[0].decodingOffset = (s32) (CTSs[0] - DTSs[0]);
 			stbl->CompositionOffset->entries[0].sampleCount = 1;
 			idx=0;
@@ -3991,7 +4858,7 @@
 Bool gf_isom_box_equal(GF_Box *a, GF_Box *b)
 {
 	Bool ret;
-	char *data1, *data2;
+	u8 *data1, *data2;
 	u32 data1_size, data2_size;
 	GF_BitStream *bs;
 
@@ -4037,18 +4904,18 @@
 	if (!trak2 || !trak2->Media) return GF_FALSE;
 
 	if (trak1->Media->handler->handlerType != trak2->Media->handler->handlerType) return GF_FALSE;
-	count = gf_list_count(trak1->Media->information->sampleTable->SampleDescription->other_boxes);
-	if (count != gf_list_count(trak2->Media->information->sampleTable->SampleDescription->other_boxes)) {
+	count = gf_list_count(trak1->Media->information->sampleTable->SampleDescription->child_boxes);
+	if (count != gf_list_count(trak2->Media->information->sampleTable->SampleDescription->child_boxes)) {
 		if (!sdesc_index1 && !sdesc_index2) return GF_FALSE;
 	}
 
 	need_memcmp = GF_TRUE;
 	for (i=0; i<count; i++) {
-		GF_Box *ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->other_boxes, i);
-		GF_Box *ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->other_boxes, 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);
 
-		if (sdesc_index1) ent1 = (GF_Box *)gf_list_get(trak1->Media->information->sampleTable->SampleDescription->other_boxes, sdesc_index1 - 1);
-		if (sdesc_index2) ent2 = (GF_Box *)gf_list_get(trak2->Media->information->sampleTable->SampleDescription->other_boxes, sdesc_index2 - 1);
+		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 (!ent1 || !ent2) return GF_FALSE;
 		if (ent1->type != ent2->type) return GF_FALSE;
@@ -4141,7 +5008,7 @@
 			GF_WebVTTSampleEntryBox *wvtt1 = (GF_WebVTTSampleEntryBox *)ent1;
 			GF_WebVTTSampleEntryBox *wvtt2 = (GF_WebVTTSampleEntryBox *)ent2;
 			if (wvtt1->config && wvtt2->config &&
-			        (wvtt1->config->string && wvtt1->config->string && !strcmp(wvtt1->config->string, wvtt2->config->string))) {
+			        (wvtt1->config->string && wvtt2->config->string && !strcmp(wvtt1->config->string, wvtt2->config->string))) {
 				return GF_TRUE;
 			}
 			return GF_FALSE;
@@ -4176,22 +5043,34 @@
 			return GF_FALSE;
 		}
 		case GF_ISOM_BOX_TYPE_MP3:
-		case GF_QT_BOX_TYPE_AUDIO_RAW:
-		case GF_QT_BOX_TYPE_AUDIO_TWOS:
-		case GF_QT_BOX_TYPE_AUDIO_SOWT:
-		case GF_QT_BOX_TYPE_AUDIO_FL32:
-		case GF_QT_BOX_TYPE_AUDIO_FL64:
-		case GF_QT_BOX_TYPE_AUDIO_IN24:
-		case GF_QT_BOX_TYPE_AUDIO_IN32:
-		case GF_QT_BOX_TYPE_AUDIO_ULAW:
-		case GF_QT_BOX_TYPE_AUDIO_ALAW:
-		case GF_QT_BOX_TYPE_AUDIO_ADPCM:
-		case GF_QT_BOX_TYPE_AUDIO_IMA_ADPCM:
-		case GF_QT_BOX_TYPE_AUDIO_DVCA:
-		case GF_QT_BOX_TYPE_AUDIO_QDMC:
-		case GF_QT_BOX_TYPE_AUDIO_QDMC2:
-		case GF_QT_BOX_TYPE_AUDIO_QCELP:
-		case GF_QT_BOX_TYPE_AUDIO_kMP3:
+		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:
+			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_YUV444:
+		case GF_QT_SUBTYPE_YUV422_10:
+		case GF_QT_SUBTYPE_YUV444_10:
 			return GF_TRUE;
 		}
 
@@ -4239,7 +5118,7 @@
 
 
 //set shadowing on/off
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_remove_sync_shadows(GF_ISOFile *movie, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -4251,19 +5130,20 @@
 
 	stbl = trak->Media->information->sampleTable;
 	if (stbl->ShadowSync) {
-		gf_isom_box_del((GF_Box *) stbl->ShadowSync);
+		gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) stbl->ShadowSync);
 		stbl->ShadowSync = NULL;
 	}
 	return GF_OK;
 }
 
-//fill the sync shadow table
-GF_EXPORT
+/*Use this function to do the shadowing if you use shadowing.
+the sample to be shadowed MUST be a non-sync sample (ignored if not)
+the sample shadowing must be a Sync sample (error if not)*/
 GF_Err gf_isom_set_sync_shadow(GF_ISOFile *movie, u32 trackNumber, u32 sampleNumber, u32 syncSample)
 {
 	GF_TrackBox *trak;
 	GF_SampleTableBox *stbl;
-	SAPType isRAP;
+	GF_ISOSAPType isRAP;
 	GF_Err e;
 
 	if (movie->openMode == GF_ISOM_OPEN_READ) return GF_ISOM_INVALID_MODE;
@@ -4271,7 +5151,10 @@
 	if (!trak || !sampleNumber || !syncSample) return GF_BAD_PARAM;
 
 	stbl = trak->Media->information->sampleTable;
-	if (!stbl->ShadowSync) stbl->ShadowSync = (GF_ShadowSyncBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSH);
+	if (!stbl->ShadowSync) {
+		stbl->ShadowSync = (GF_ShadowSyncBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSH);
+		if (!stbl->ShadowSync) return GF_OUT_OF_MEM;
+	}
 
 	//if no sync, skip
 	if (!stbl->SyncSample) return GF_OK;
@@ -4287,6 +5170,7 @@
 
 	return stbl_SetSyncShadow(stbl->ShadowSync, sampleNumber, syncSample);
 }
+#endif
 
 //set the GroupID of a track (only used for interleaving)
 GF_EXPORT
@@ -4334,7 +5218,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_set_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig *slConfig)
+GF_Err gf_isom_set_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, const GF_SLConfig *slConfig)
 {
 	GF_TrackBox *trak;
 	GF_SampleEntryBox *entry;
@@ -4374,7 +5258,7 @@
 	return gf_odf_desc_copy((GF_Descriptor *) slConfig, (GF_Descriptor **) slc);
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_get_extraction_slc(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex, GF_SLConfig **slConfig)
 {
 	GF_TrackBox *trak;
@@ -4413,7 +5297,6 @@
 	return gf_odf_desc_copy((GF_Descriptor *) slc, (GF_Descriptor **) slConfig);
 }
 
-GF_EXPORT
 u32 gf_isom_get_track_group(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -4422,7 +5305,6 @@
 	return trak->Media->information->sampleTable->groupID;
 }
 
-GF_EXPORT
 u32 gf_isom_get_track_priority_in_group(GF_ISOFile *the_file, u32 trackNumber)
 {
 	GF_TrackBox *trak;
@@ -4430,12 +5312,18 @@
 	if (!trak) return 0;
 	return trak->Media->information->sampleTable->trackPriority;
 }
+#endif
 
 
 GF_EXPORT
 GF_Err gf_isom_make_interleave(GF_ISOFile *file, Double TimeInSec)
 {
 	GF_Err e;
+	if (!file) return GF_BAD_PARAM;
+
+	if (file->storageMode==GF_ISOM_STORE_FASTSTART) {
+		return gf_isom_set_interleave_time(file, (u32) (TimeInSec * gf_isom_get_timescale(file)));
+	}
 	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;
@@ -4459,10 +5347,8 @@
 		FILE *f = gf_fopen(nameUTF8+7, "rb");
 		u64 size;
 		if (!f) return GF_URL_ERROR;
-		gf_fseek(f, 0, SEEK_END);
-		size = gf_ftell(f);
-		gf_fseek(f, 0, SEEK_SET);
-		if (3!=fread(BOM, sizeof(char), 3, f)) {
+		size = gf_fsize(f);
+		if (3!=gf_fread(BOM, 3, f)) {
 			gf_fclose(f);
 			return GF_CORRUPTED_DATA;
 		}
@@ -4474,7 +5360,11 @@
 		}
 		else gf_fseek(f, 0, SEEK_SET);
 		trak->Media->handler->nameUTF8 = (char*)gf_malloc(sizeof(char)*(size_t)(size+1));
-		size = fread(trak->Media->handler->nameUTF8, sizeof(char), (size_t)size, f);
+		if (!trak->Media->handler->nameUTF8) {
+			gf_fclose(f);
+			return GF_OUT_OF_MEM;
+		}
+		size = gf_fread(trak->Media->handler->nameUTF8, (size_t)size, f);
 		trak->Media->handler->nameUTF8[size] = 0;
 		gf_fclose(f);
 	} else {
@@ -4528,7 +5418,8 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
+/*clones root OD from input to output file, without copying root OD track references*/
 GF_Err gf_isom_clone_root_od(GF_ISOFile *input, GF_ISOFile *output)
 {
 	GF_List *esds;
@@ -4539,7 +5430,8 @@
 	e = gf_isom_remove_root_od(output);
 	if (e) return e;
 	if (!input->moov || !input->moov->iods || !input->moov->iods->descriptor) return GF_OK;
-	gf_isom_insert_moov(output);
+	e = gf_isom_insert_moov(output);
+	if (e) return e;
 	e = AddMovieIOD(output->moov, 0);
 	if (e) return e;
 	if (output->moov->iods->descriptor) gf_odf_desc_del(output->moov->iods->descriptor);
@@ -4565,6 +5457,7 @@
 	}
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_set_media_type(GF_ISOFile *movie, u32 trackNumber, u32 new_type)
@@ -4582,20 +5475,21 @@
 	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 	if (!trak || !sampleDescriptionIndex || !new_type) return GF_BAD_PARAM;
 
-	entry = (GF_SampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescriptionIndex - 1);
+	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;
 	return GF_OK;
 }
 
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_set_JPEG2000(GF_ISOFile *mov, Bool set_on)
 {
 	if (!mov) return GF_BAD_PARAM;
 	mov->is_jp2 = set_on;
 	return GF_OK;
 }
+#endif
 
 GF_Err gf_isom_remove_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID)
 {
@@ -4608,10 +5502,10 @@
 	} else if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		list = trak->other_boxes;
+		list = trak->child_boxes;
 	} else {
 		if (!movie) return GF_BAD_PARAM;
-		list = movie->moov->other_boxes;
+		list = movie->moov->child_boxes;
 	}
 
 	count = list ? gf_list_count(list) : 0;
@@ -4628,37 +5522,40 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, const char *data, u32 data_size)
+GF_Err gf_isom_add_uuid(GF_ISOFile *movie, u32 trackNumber, bin128 UUID, const u8 *data, u32 data_size)
 {
 	GF_List *list;
     u32 btype;
 	GF_Box *box;
 	GF_UnknownUUIDBox *uuidb;
 
-	if (!data_size || !data) return GF_OK;
-
+	if (data_size && !data) return GF_BAD_PARAM;
 	if (trackNumber==(u32) -1) {
 		if (!movie) return GF_BAD_PARAM;
 		list = movie->TopBoxes;
 	} else if (trackNumber) {
 		GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
 		if (!trak) return GF_BAD_PARAM;
-		if (!trak->other_boxes) trak->other_boxes = gf_list_new();
-		list = trak->other_boxes;
+		if (!trak->child_boxes) trak->child_boxes = gf_list_new();
+		list = trak->child_boxes;
 	} else {
 		if (!movie) return GF_BAD_PARAM;
-		if (!movie->moov->other_boxes) movie->moov->other_boxes = gf_list_new();
-		list = movie->moov->other_boxes;
+		if (!movie->moov->child_boxes) movie->moov->child_boxes = gf_list_new();
+		list = movie->moov->child_boxes;
 	}
     btype = gf_isom_solve_uuid_box((char *) UUID);
     if (!btype) btype = GF_ISOM_BOX_TYPE_UUID;
     box = gf_isom_box_new(btype);
+    if (!box) return GF_OUT_OF_MEM;
 	uuidb = (GF_UnknownUUIDBox*)box;
 	uuidb->internal_4cc = gf_isom_solve_uuid_box((char *) UUID);
 	memcpy(uuidb->uuid, UUID, sizeof(bin128));
 	uuidb->dataSize = data_size;
-	uuidb->data = (char*)gf_malloc(sizeof(char)*data_size);
-	memcpy(uuidb->data, data, sizeof(char)*data_size);
+	if (data_size) {
+		uuidb->data = (char*)gf_malloc(sizeof(char)*data_size);
+		if (!uuidb->data) return GF_OUT_OF_MEM;
+		memcpy(uuidb->data, data, sizeof(char)*data_size);
+	}
 	gf_list_add(list, uuidb);
 	return GF_OK;
 }
@@ -4666,7 +5563,7 @@
 /*Apple extensions*/
 
 GF_EXPORT
-GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, u32 tag, const char *data, u32 data_len)
+GF_Err gf_isom_apple_set_tag(GF_ISOFile *mov, GF_ISOiTunesTag tag, const u8 *data, u32 data_len)
 {
 	GF_BitStream *bs;
 	GF_Err e;
@@ -4682,11 +5579,9 @@
 	meta = gf_isom_apple_create_meta_extensions(mov);
 	if (!meta) return GF_BAD_PARAM;
 
-	ilst = gf_ismo_locate_box(meta->other_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
+	ilst = gf_ismo_locate_box(meta->child_boxes, GF_ISOM_BOX_TYPE_ILST, NULL);
 	if (!ilst) {
-		ilst = (GF_ItemListBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_ILST);
-		if (!meta->other_boxes) meta->other_boxes = gf_list_new();
-		gf_list_add(meta->other_boxes, ilst);
+		ilst = (GF_ItemListBox *) gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_ILST);
 	}
 
 	if (tag==GF_ISOM_ITUNE_GENRE) {
@@ -4696,10 +5591,9 @@
 	}
 	/*remove tag*/
 	i = 0;
-	while ((info = (GF_ListItemBox*)gf_list_enum(ilst->other_boxes, &i))) {
+	while ((info = (GF_ListItemBox*)gf_list_enum(ilst->child_boxes, &i))) {
 		if (info->type==btype) {
-			gf_list_rem(ilst->other_boxes, i-1);
-			gf_isom_box_del((GF_Box *) info);
+			gf_isom_box_del_parent(&ilst->child_boxes, (GF_Box *) info);
 			info = NULL;
 			break;
 		}
@@ -4732,6 +5626,7 @@
 		}
 		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)) {
@@ -4746,6 +5641,7 @@
 		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;
@@ -4760,14 +5656,13 @@
 	}
 
 	if (!info || (tag==GF_ISOM_ITUNE_ALL) ) {
-		if (!gf_list_count(ilst->other_boxes) || (tag==GF_ISOM_ITUNE_ALL) ) {
-			gf_list_del_item(meta->other_boxes, ilst);
-			gf_isom_box_del((GF_Box *) ilst);
+		if (!gf_list_count(ilst->child_boxes) || (tag==GF_ISOM_ITUNE_ALL) ) {
+			gf_isom_box_del_parent(&meta->child_boxes, (GF_Box *) ilst);
 		}
 		return GF_OK;
 	}
 
-	return gf_list_add(ilst->other_boxes, info);
+	return gf_list_add(ilst->child_boxes, info);
 }
 
 GF_EXPORT
@@ -4798,7 +5693,7 @@
 		GF_TrackBox *trak_ref = gf_isom_get_track_from_file(movie, trackRefGroup);
 		if (trak_ref != trak) {
 			if (!trak_ref || !trak_ref->Header->alternate_group) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Track %d has not an alternate group - skipping\n", trak_ref->Header->trackID));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Track %d has not an alternate group - skipping\n", trak_ref ? trak_ref->Header->trackID : 0));
 				return GF_BAD_PARAM;
 			}
 			alternateGroupID = trak_ref->Header->alternate_group;
@@ -4825,9 +5720,9 @@
 				u32 j, count;
 				map = udta_getEntry(a_trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 				if (map) {
-					count = gf_list_count(map->other_boxes);
+					count = gf_list_count(map->boxes);
 					for (j=0; j<count; j++) {
-						tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, j);
+						tsel = (GF_TrackSelectionBox*)gf_list_get(map->boxes, j);
 
 						if (*switchGroupID) {
 							if (tsel->switchGroup==next_switch_group_id) {
@@ -4852,7 +5747,7 @@
 	tsel = NULL;
 	if (*switchGroupID) {
 		if (!trak->udta) {
-			e = trak_AddBox((GF_Box*)trak, gf_isom_box_new(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));
 			if (e) return e;
 		}
 
@@ -4860,16 +5755,17 @@
 
 		/*locate tsel box with no switch group*/
 		if (map)  {
-			u32 j, count = gf_list_count(map->other_boxes);
+			u32 j, count = gf_list_count(map->boxes);
 			for (j=0; j<count; j++) {
-				tsel = (GF_TrackSelectionBox*)gf_list_get(map->other_boxes, j);
+				tsel = (GF_TrackSelectionBox*)gf_list_get(map->boxes, j);
 				if (tsel->switchGroup == *switchGroupID) break;
 				tsel = NULL;
 			}
 		}
 		if (!tsel) {
 			tsel = (GF_TrackSelectionBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_TSEL);
-			e = udta_AddBox((GF_Box *)trak->udta, (GF_Box *) tsel);
+			if (!tsel) return GF_OUT_OF_MEM;
+			e = udta_on_child_box((GF_Box *)trak->udta, (GF_Box *) tsel);
 			if (e) return e;
 		}
 
@@ -4877,6 +5773,7 @@
 		tsel->attributeListCount = criteriaListCount;
 		if (tsel->attributeList) gf_free(tsel->attributeList);
 		tsel->attributeList = (u32*)gf_malloc(sizeof(u32)*criteriaListCount);
+		if (!tsel->attributeList) return GF_OUT_OF_MEM;
 		memcpy(tsel->attributeList, criteriaList, sizeof(u32)*criteriaListCount);
 	}
 	return GF_OK;
@@ -4889,7 +5786,7 @@
 	map = udta_getEntry(trak->udta, GF_ISOM_BOX_TYPE_TSEL, NULL);
 	if (map) {
 		gf_list_del_item(trak->udta->recordList, map);
-		gf_isom_box_array_del(map->other_boxes);
+		gf_isom_box_array_del(map->boxes);
 		gf_free(map);
 	}
 
@@ -4961,7 +5858,8 @@
 		sub_samples = NULL;
 	}
 	if (!sub_samples) {
-		sub_samples = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
+		sub_samples = (GF_SubSampleInformationBox *) gf_isom_box_new_parent(&trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_SUBS);
+		if (!sub_samples) return GF_OUT_OF_MEM;
 		gf_list_add(trak->Media->information->sampleTable->sub_samples, sub_samples);
 		sub_samples->version = (subSampleSize>0xFFFF) ? 1 : 0;
 		sub_samples->flags = flags;
@@ -4971,7 +5869,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_set_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 rvc_predefined, char *mime, char *data, u32 size)
+GF_Err gf_isom_set_rvc_config(GF_ISOFile *movie, u32 track, u32 sampleDescriptionIndex, u16 rvc_predefined, char *mime, u8 *data, u32 size)
 {
 	GF_MPEGVisualSampleEntryBox *entry;
 	GF_Err e;
@@ -4984,33 +5882,35 @@
 	if (!trak) return GF_BAD_PARAM;
 
 
-	entry = (GF_MPEGVisualSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sampleDescriptionIndex-1);
+	entry = (GF_MPEGVisualSampleEntryBox *) gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex-1);
 	if (!entry ) return GF_BAD_PARAM;
 	if (entry->internal_type != GF_ISOM_SAMPLE_ENTRY_VIDEO) return GF_BAD_PARAM;
 
-	if (entry->rvcc && entry->rvcc->rvc_meta_idx) {
-		gf_isom_remove_meta_item(movie, GF_FALSE, track, entry->rvcc->rvc_meta_idx);
-		entry->rvcc->rvc_meta_idx = 0;
+	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);
+		rvcc->rvc_meta_idx = 0;
 	}
 
-	if (!entry->rvcc) {
-		entry->rvcc = (GF_RVCConfigurationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_RVCC);
+	if (!rvcc) {
+		rvcc = (GF_RVCConfigurationBox *) gf_isom_box_new_parent(&entry->child_boxes, GF_ISOM_BOX_TYPE_RVCC);
+		if (!rvcc) return GF_OUT_OF_MEM;
 	}
-	entry->rvcc->predefined_rvc_config = rvc_predefined;
+	rvcc->predefined_rvc_config = rvc_predefined;
 	if (!rvc_predefined) {
 		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, 1);
+		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);
 		if (e) return e;
-		entry->rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, GF_FALSE, track);
+		rvcc->rvc_meta_idx = gf_isom_get_meta_item_count(movie, GF_FALSE, track);
 	}
 	return GF_OK;
 }
 
 /*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)
+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_SampleGroupBox *sgroup = NULL;
 	u32 i, count, last_sample_in_entry;
@@ -5024,9 +5924,14 @@
 	}
 	if (!sgroup) {
 		sgroup = (GF_SampleGroupBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SBGP);
+		if (!sgroup) return GF_OUT_OF_MEM;
 		sgroup->grouping_type = grouping_type;
 		sgroup->grouping_type_parameter = grouping_type_parameter;
-		gf_list_add(sampleGroups, sgroup);
+//		gf_list_add(sampleGroups, sgroup);
+		//crude patch to align old arch and filters
+		gf_list_insert(sampleGroups, sgroup, 0);
+		assert(parent);
+		gf_list_add(parent, sgroup);
 	}
 	/*used in fragments, means we are adding the last sample*/
 	if (!sample_number) {
@@ -5042,9 +5947,10 @@
 		u32 idx = 0;
 		sgroup->entry_count = (sample_number>1) ? 2 : 1;
 		sgroup->sample_entries = (GF_SampleGroupEntry*)gf_malloc(sizeof(GF_SampleGroupEntry) * sgroup->entry_count );
+		if (!sgroup->sample_entries) return GF_OUT_OF_MEM;
 		if (sample_number>1) {
 			sgroup->sample_entries[0].sample_count = sample_number-1;
-			sgroup->sample_entries[0].group_description_index = 0;
+			sgroup->sample_entries[0].group_description_index = sampleGroupDescriptionIndex ? 0 : 1;
 			idx = 1;
 		}
 		sgroup->sample_entries[idx].sample_count = 1;
@@ -5099,37 +6005,59 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 grouping_type)
+static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf, u32 grouping_type, Bool *is_traf_sgdp)
 #else
-static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, void *traf, u32 grouping_type)
+static GF_SampleGroupDescriptionBox *get_sgdp(GF_SampleTableBox *stbl, void *traf, u32 grouping_type, Bool *is_traf_sgdp)
 #endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 {
-	GF_List *groupList;
+	GF_List *groupList=NULL;
+	GF_List **parent=NULL;
 	GF_SampleGroupDescriptionBox *sgdesc=NULL;
 	u32 count, i;
-	/*look in stbl or traf for sample sampleGroupsDescription*/
+
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	if (traf) {
-		if (!traf->sampleGroupsDescription)
-			traf->sampleGroupsDescription = gf_list_new();
-		groupList = traf->sampleGroupsDescription;
-	} else
+	if (!stbl && traf && traf->trex->track->Media->information->sampleTable)
+		stbl = traf->trex->track->Media->information->sampleTable;
 #endif
-	{
-		if (!stbl->sampleGroupsDescription)
+	if (stbl) {
+		if (!stbl->sampleGroupsDescription && !traf)
 			stbl->sampleGroupsDescription = gf_list_new();
+
 		groupList = stbl->sampleGroupsDescription;
+		if (is_traf_sgdp) *is_traf_sgdp = GF_FALSE;
+		parent = &stbl->child_boxes;
+
+		count = gf_list_count(groupList);
+		for (i=0; i<count; i++) {
+			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(groupList, i);
+			if (sgdesc->grouping_type==grouping_type) break;
+			sgdesc = NULL;
+		}
 	}
+	
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	/*look in stbl or traf for sample sampleGroupsDescription*/
+	if (!sgdesc && traf) {
+		if (!traf->sampleGroupsDescription)
+			traf->sampleGroupsDescription = gf_list_new();
+		groupList = traf->sampleGroupsDescription;
+		parent = &traf->child_boxes;
+		if (is_traf_sgdp) *is_traf_sgdp = GF_TRUE;
 
-	count = gf_list_count(groupList);
-	for (i=0; i<count; i++) {
-		sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(groupList, i);
-		if (sgdesc->grouping_type==grouping_type) break;
-		sgdesc = NULL;
+		count = gf_list_count(groupList);
+		for (i=0; i<count; i++) {
+			sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(groupList, i);
+			if (sgdesc->grouping_type==grouping_type) break;
+			sgdesc = NULL;
+		}
 	}
+#endif
+
 	if (!sgdesc) {
-		sgdesc = (GF_SampleGroupDescriptionBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SGPD);
+		sgdesc = (GF_SampleGroupDescriptionBox *) gf_isom_box_new_parent(parent, GF_ISOM_BOX_TYPE_SGPD);
+		if (!sgdesc) return NULL;
 		sgdesc->grouping_type = grouping_type;
+		assert(groupList);
 		gf_list_add(groupList, sgdesc);
 	}
 	return sgdesc;
@@ -5141,14 +6069,15 @@
 static GF_Err gf_isom_set_sample_group_info_ex(GF_SampleTableBox *stbl, void *traf, 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))
 #endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 {
-	GF_List *groupList;
+	GF_List *groupList, *parent;
 	void *entry;
+	Bool is_traf_sgpd;
 	GF_SampleGroupDescriptionBox *sgdesc = NULL;
 	u32 i, entry_idx;
 
 	if (!stbl && !traf) return GF_BAD_PARAM;
 
-	sgdesc = get_sgdp(stbl, traf, grouping_type);
+	sgdesc = get_sgdp(stbl, traf, grouping_type, &is_traf_sgpd);
 	if (!sgdesc) return GF_OUT_OF_MEM;
 
 	entry = NULL;
@@ -5162,10 +6091,15 @@
 	if (!entry && sg_create_entry) {
 		entry = sg_create_entry(udta);
 		if (!entry) return GF_IO_ERR;
+		if (traf && !is_traf_sgpd) {
+			sgdesc = get_sgdp(NULL, traf, grouping_type, &is_traf_sgpd);
+		}
 		gf_list_add(sgdesc->group_descriptions, entry);
 	}
-	if (!entry) entry_idx = 0;
-	else entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
+	if (!entry)
+		entry_idx = 0;
+	else
+		entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
 
 	/*look in stbl or traf for sample sampleGroups*/
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
@@ -5173,31 +6107,59 @@
 		if (!traf->sampleGroups)
 			traf->sampleGroups = gf_list_new();
 		groupList = traf->sampleGroups;
-		if (entry) entry_idx |= 0x10000;
+		parent = traf->child_boxes;
+		if (entry_idx && is_traf_sgpd)
+			entry_idx |= 0x10000;
 	} else
 #endif
 	{
 		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, entry_idx);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, entry_idx, parent);
 }
 
 /*for now not exported*/
-static GF_Err gf_isom_set_sample_group_info(GF_ISOFile *movie, u32 track, 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(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;
+	GF_TrackBox *trak=NULL;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_TrackFragmentBox *traf=NULL;
+#endif
+	if (!trafID && (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;
+	}
 
-	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
-	if (e) return e;
+	if (trafID) {
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+		if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) )
+			return GF_BAD_PARAM;
 
-	trak = gf_isom_get_track_from_file(movie, track);
-	if (!trak) return GF_BAD_PARAM;
+		traf = gf_isom_get_traf(movie, trafID);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+
+	} else if (track) {
+		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;
+	}
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	return gf_isom_set_sample_group_info_ex(trak ? trak->Media->information->sampleTable : NULL, traf, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
+#else
+	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
+#endif
 
-	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, NULL, sample_number, grouping_type, grouping_type_parameter, udta, sg_create_entry, sg_compare_entry);
 }
 
 
@@ -5217,7 +6179,7 @@
 	if (!trak) return GF_BAD_PARAM;
 
 
-	sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type);
+	sgdesc = get_sgdp(trak->Media->information->sampleTable, NULL, grouping_type, NULL);
 	if (!sgdesc) return GF_OUT_OF_MEM;
 
 	if (grouping_type==GF_ISOM_SAMPLE_GROUP_OINF) {
@@ -5288,7 +6250,6 @@
 {
 	GF_Err e;
 	GF_TrackBox *trak;
-	GF_SampleGroupDescriptionBox *sgdesc = NULL;
 	u32 count, i;
 
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
@@ -5297,21 +6258,30 @@
 	trak = gf_isom_get_track_from_file(movie, track);
 	if (!trak) return GF_BAD_PARAM;
 
-	if (!trak->Media->information->sampleTable->sampleGroupsDescription)
-		return GF_OK;
-
-	count = gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription);
-	for (i=0; i<count; i++) {
-		sgdesc = (GF_SampleGroupDescriptionBox*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, i);
-		if (sgdesc->grouping_type==grouping_type) {
-			gf_isom_box_del((GF_Box*)sgdesc);
-			gf_list_rem(trak->Media->information->sampleTable->sampleGroupsDescription, i);
-			i--;
-			count--;
+	if (trak->Media->information->sampleTable->sampleGroupsDescription) {
+		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==grouping_type) {
+				gf_isom_box_del_parent(&trak->Media->information->sampleTable->child_boxes, (GF_Box*)sgdesc);
+				gf_list_rem(trak->Media->information->sampleTable->sampleGroupsDescription, i);
+				i--;
+				count--;
+			}
+		}
+	}
+	if (trak->Media->information->sampleTable->sampleGroups) {
+		count = gf_list_count(trak->Media->information->sampleTable->sampleGroups);
+		for (i=0; i<count; i++) {
+			GF_SampleGroupBox *sgroup = gf_list_get(trak->Media->information->sampleTable->sampleGroups, i);
+			if (sgroup->grouping_type==grouping_type) {
+				gf_isom_box_del_parent(&trak->Media->information->sampleTable->child_boxes, (GF_Box*)sgroup);
+				gf_list_rem(trak->Media->information->sampleTable->sampleGroups, i);
+				i--;
+				count--;
+			}
 		}
-		sgdesc = NULL;
 	}
-
 	return GF_OK;
 }
 
@@ -5331,7 +6301,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);
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex, trak->Media->information->sampleTable->child_boxes);
 }
 
 void *sg_rap_create_entry(void *udta)
@@ -5354,9 +6324,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_sample_rap_group(GF_ISOFile *movie, u32 track, u32 sample_number, u32 num_leading_samples)
+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);
+}
+
+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, track, sample_number, GF_ISOM_SAMPLE_GROUP_RAP, 0, &num_leading_samples, sg_rap_create_entry, sg_rap_compare_entry);
+	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);
 }
 
 
@@ -5379,220 +6354,113 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *movie, u32 track, u32 sample_number, s16 roll_distance)
+GF_Err gf_isom_set_sample_roll_group(GF_ISOFile *movie, u32 track, u32 sample_number, Bool is_roll, s16 roll_distance)
+{
+	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_ROLL, 0, &roll_distance, is_roll ? sg_roll_create_entry : NULL, is_roll ? sg_roll_compare_entry : NULL);
+}
+
+GF_EXPORT
+GF_Err gf_isom_fragment_set_sample_roll_group(GF_ISOFile *movie, GF_ISOTrackID trackID, u32 sample_number_in_frag, Bool is_roll, s16 roll_distance)
 {
-	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_ROLL, 0, &roll_distance, sg_roll_create_entry, sg_roll_compare_entry);
+	return gf_isom_set_sample_group_info(movie, 0, trackID, sample_number_in_frag, GF_ISOM_SAMPLE_GROUP_ROLL, 0, &roll_distance, is_roll ? sg_roll_create_entry : NULL, is_roll ? sg_roll_compare_entry : NULL);
 }
 
+
 void *sg_encryption_create_entry(void *udta)
 {
-	GF_CENCSampleEncryptionGroupEntry *entry;
-	GF_BitStream *bs;
+	GF_CENCSampleEncryptionGroupEntry *entry, *from_entry;
 	GF_SAFEALLOC(entry, GF_CENCSampleEncryptionGroupEntry);
 	if (!entry) return NULL;
-	bs = gf_bs_new((char *) udta, sizeof(GF_CENCSampleEncryptionGroupEntry), GF_BITSTREAM_READ);
-	gf_bs_read_u8(bs); //reserved
-	entry->crypt_byte_block = gf_bs_read_int(bs, 4);
-	entry->skip_byte_block = gf_bs_read_int(bs, 4);
-	entry->IsProtected = gf_bs_read_u8(bs);
-	entry->Per_Sample_IV_size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, (char *)entry->KID, 16);
-	if ((entry->IsProtected == 1) && !entry->Per_Sample_IV_size) {
-		entry->constant_IV_size = gf_bs_read_u8(bs);
-		assert((entry->constant_IV_size == 8) || (entry->constant_IV_size == 16));
-		gf_bs_read_data(bs, (char *)entry->constant_IV, entry->constant_IV_size);
-	}
-	gf_bs_del(bs);
+	from_entry = (GF_CENCSampleEncryptionGroupEntry *)udta;
+	memcpy(entry, from_entry, sizeof(GF_CENCSampleEncryptionGroupEntry) );
 	return entry;
 }
 
-Bool sg_encryption_compare_entry(void *udta, void *entry)
+Bool sg_encryption_compare_entry(void *udta, void *_entry)
 {
-	u8 isEncrypted;
-	u8 IV_size;
-	bin128 KID;
-	u8 constant_IV_size=0;
-	bin128 constant_IV;
-	u8 crypt_byte_block, skip_byte_block;
-	GF_BitStream *bs;
-	GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
-	Bool is_identical;
-	bs = gf_bs_new((char *) udta, sizeof(GF_CENCSampleEncryptionGroupEntry), GF_BITSTREAM_READ);
-	gf_bs_read_u8(bs); //reserved
-	crypt_byte_block = gf_bs_read_int(bs, 4);
-	skip_byte_block = gf_bs_read_int(bs, 4);
-	isEncrypted = gf_bs_read_u8(bs);
-	IV_size = gf_bs_read_u8(bs);
-	gf_bs_read_data(bs, (char *)KID, 16);
-	if (isEncrypted && !IV_size) {
-		constant_IV_size = gf_bs_read_u8(bs);
-		gf_bs_read_data(bs, (char *)constant_IV, 16);
-	}
-	gf_bs_del(bs);
+	GF_CENCSampleEncryptionGroupEntry *entry = (GF_CENCSampleEncryptionGroupEntry *)_entry;
+	GF_CENCSampleEncryptionGroupEntry *with_entry = (GF_CENCSampleEncryptionGroupEntry *)udta;
+	if (!memcmp(entry, with_entry, sizeof(GF_CENCSampleEncryptionGroupEntry)))
+		return GF_TRUE;
 
-	is_identical = GF_TRUE;
-	if ((isEncrypted != seig->IsProtected) || (IV_size != seig->Per_Sample_IV_size) || (strncmp((const char *)KID, (const char *)seig->KID, 16)))
-		is_identical = GF_FALSE;
-	if ((crypt_byte_block != seig->crypt_byte_block) || (skip_byte_block != seig->skip_byte_block))
-		is_identical = GF_FALSE;
-	if ((isEncrypted == 1) && !IV_size) {
-		if ((constant_IV_size != seig->constant_IV_size) || (strncmp((const char *)constant_IV, (const char *)seig->constant_IV, constant_IV_size)))
-			is_identical = GF_FALSE;
-	}
-	return is_identical;
+	return GF_FALSE;
 }
 
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf)
-{
-	if (sgpd_in_traf) {
-		void *entry = NULL;
-		u32 i, count;
-		GF_SampleGroupDescriptionBox *sgdesc = NULL;
-		GF_BitStream *bs;
-
-		count = gf_list_count(stbl->sampleGroupsDescription);
-		for (i = 0; i < count; i++) {
-			sgdesc = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
-			if (sgdesc->grouping_type == grouping_type)
-				break;
-			sgdesc = NULL;
-		}
-		if (!sgdesc)
-			return GF_BAD_PARAM;
-
-		entry = gf_list_get(sgdesc->group_descriptions, sampleGroupDescriptionIndex-1);
-		if (!entry)
-			return GF_BAD_PARAM;
-
-		switch (grouping_type) {
-		case GF_ISOM_SAMPLE_GROUP_RAP:
-		{
-			char udta[2];
-			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
-			gf_bs_write_u8(bs, ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples_known);
-			gf_bs_write_u8(bs, ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples);
-			gf_bs_del(bs);
-			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
-		}
-		case GF_ISOM_SAMPLE_GROUP_SYNC:
-		{
-			char udta[1];
-			bs = gf_bs_new(udta, 1*sizeof(char), GF_BITSTREAM_WRITE);
-			gf_bs_write_int(bs, 0, 2);
-			gf_bs_write_int(bs, ((GF_SYNCEntry *)entry)->NALU_type, 6);
-			gf_bs_del(bs);
-			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
-		}
-		case GF_ISOM_SAMPLE_GROUP_ROLL:
-		{
-			char udta[2];
-			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
-			gf_bs_write_u16(bs, ((GF_RollRecoveryEntry *)entry)->roll_distance);
-			gf_bs_del(bs);
-			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_roll_create_entry, sg_roll_compare_entry);
-		}
-		case GF_ISOM_SAMPLE_GROUP_SEIG:
-		{
-			char *udta;
-			u32 size;
-			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			GF_Err e = GF_OK;
-			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_bs_get_content(bs, &udta, &size);
-			gf_bs_del(bs);
-
-			e = gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
-			gf_free(udta);
-			return e;
-		}
-		default:
-			return GF_BAD_PARAM;
-		}
-	}
-
-	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex);
-}
-#endif /* GPAC_DISABLE_ISOM_FRAGMENTS */
 
 /*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 IV_size, bin128 KeyID, u8 crypt_byte_block, u8 skip_byte_block, u8 constant_IV_size, bin128 constant_IV)
 {
-	char *udta;
-	u32 size;
-	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	GF_Err e = GF_OK;
+	GF_CENCSampleEncryptionGroupEntry entry;
 	if ((IV_size!=0) && (IV_size!=8) && (IV_size!=16)) return GF_BAD_PARAM;
-	gf_bs_write_u8(bs, 0x0);
-	gf_bs_write_int(bs, crypt_byte_block, 4);
-	gf_bs_write_int(bs, skip_byte_block, 4);
-	gf_bs_write_u8(bs, isEncrypted);
-	gf_bs_write_u8(bs, IV_size);
-	gf_bs_write_data(bs, (char *) KeyID, 16);
-	if ((isEncrypted == 1) && !IV_size) {
-		gf_bs_write_u8(bs, constant_IV_size);
-		gf_bs_write_data(bs,(char *) constant_IV, constant_IV_size);
-	}
-	gf_bs_get_content(bs, &udta, &size);
-	gf_bs_del(bs);
 
-	e = gf_isom_set_sample_group_info(movie, track, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, udta, sg_encryption_create_entry, sg_encryption_compare_entry);
-	gf_free(udta);
-	return e;
+	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);
 }
 
-/*sample encryption information group can be in stbl or traf*/
 GF_EXPORT
-GF_Err gf_isom_set_sample_cenc_default(GF_ISOFile *movie, u32 track, u32 sample_number)
+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, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, NULL, NULL, NULL);
+	return gf_isom_set_sample_group_info(movie, track, 0, sample_number, GF_ISOM_SAMPLE_GROUP_SEIG, 0, NULL, NULL, NULL);
 }
 
-static GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, GF_TrackBox *trak)
+GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, u32 ctts_shift)
 {
 	u32 i, shift;
 	u64 duration;
 	GF_CompositionOffsetBox *ctts;
 	GF_CompositionToDecodeBox *cslg;
 	s32 leastCTTS, greatestCTTS;
+	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;
 
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
-	shift = ctts->entries[0].decodingOffset;
+	shift = ctts->version ? ctts_shift : ctts->entries[0].decodingOffset;
 	leastCTTS = GF_INT_MAX;
 	greatestCTTS = 0;
 	for (i=0; i<ctts->nb_entries; i++) {
-		ctts->entries[i].decodingOffset -= shift;
+		if (!ctts->version)
+			ctts->entries[i].decodingOffset -= shift;
+
 		if ((s32)ctts->entries[i].decodingOffset < leastCTTS)
 			leastCTTS = ctts->entries[i].decodingOffset;
 		if ((s32)ctts->entries[i].decodingOffset > greatestCTTS)
 			greatestCTTS = ctts->entries[i].decodingOffset;
 	}
-	ctts->version = 1;
-	gf_isom_remove_edit_segments(file, track);
+	if (!ctts->version) {
+		ctts->version = 1;
+		gf_isom_remove_edits(file, track);
+	}
 
-	if (!trak->Media->information->sampleTable->CompositionToDecode)
-		trak->Media->information->sampleTable->CompositionToDecode = (GF_CompositionToDecodeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CSLG);
+	if (!trak->Media->information->sampleTable->CompositionToDecode) {
+		trak->Media->information->sampleTable->CompositionToDecode = (GF_CompositionToDecodeBox *) gf_isom_box_new_parent(&trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_CSLG);
+		if (!trak->Media->information->sampleTable->CompositionToDecode)
+			return GF_OUT_OF_MEM;
+	}
 
 	cslg = trak->Media->information->sampleTable->CompositionToDecode;
-
-	cslg->compositionToDTSShift = shift;
-	cslg->leastDecodeToDisplayDelta = leastCTTS;
-	cslg->greatestDecodeToDisplayDelta = greatestCTTS;
-	cslg->compositionStartTime = 0;
-	/*for our use case (first CTS set to 0), the composition end time is the media duration if it fits on 32 bits*/
-	duration = gf_isom_get_media_duration(file, track);
-	cslg->compositionEndTime = (duration<0x7FFFFFFF) ? (s32) duration : 0;
+	if (cslg) {
+		cslg->compositionToDTSShift = shift;
+		cslg->leastDecodeToDisplayDelta = leastCTTS;
+		cslg->greatestDecodeToDisplayDelta = greatestCTTS;
+		cslg->compositionStartTime = 0;
+		/*for our use case (first CTS set to 0), the composition end time is the media duration if it fits on 32 bits*/
+		duration = gf_isom_get_media_duration(file, track);
+		cslg->compositionEndTime = (duration<0x7FFFFFFF) ? (s32) duration : 0;
+	}
 
 	gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO4, GF_TRUE);
 	return GF_OK;
@@ -5628,14 +6496,14 @@
 		for (i=0; i<ctts->nb_entries; i++) {
 			ctts->entries[i].decodingOffset += shift;
 		}
-		gf_isom_box_del((GF_Box *)cslg);
+		gf_isom_box_del_parent(&trak->Media->information->sampleTable->child_boxes, (GF_Box *)cslg);
 		trak->Media->information->sampleTable->CompositionToDecode = NULL;
 	}
 	if (! trak->editBox && shift>0) {
 		u64 dur = trak->Media->mediaHeader->duration;
 		dur *= file->moov->mvhd->timeScale;
 		dur /= trak->Media->mediaHeader->timeScale;
-		gf_isom_set_edit_segment(file, gf_list_find(file->moov->trackList, trak)+1, 0, dur, shift, GF_ISOM_EDIT_NORMAL);
+		gf_isom_set_edit(file, gf_list_find(file->moov->trackList, trak)+1, 0, dur, shift, GF_ISOM_EDIT_NORMAL);
 	}
 	ctts->version = 0;
 	gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_ISO4, GF_FALSE);
@@ -5656,18 +6524,23 @@
 	if (!trak) return GF_BAD_PARAM;
 
 	ctts = trak->Media->information->sampleTable->CompositionOffset;
-	if (!ctts) return GF_OK;
+	if (!ctts) {
+		if (!use_negative_offsets && trak->Media->information->sampleTable->CompositionToDecode) {
+			gf_isom_box_del_parent(&trak->Media->information->sampleTable->child_boxes, (GF_Box *)trak->Media->information->sampleTable->CompositionToDecode);
+			trak->Media->information->sampleTable->CompositionToDecode = NULL;
+		}
+		return GF_OK;
+	}
 
 	if (use_negative_offsets) {
-		if (ctts->version==1) return GF_OK;
-		return gf_isom_set_ctts_v1(file, track, trak);
+		return gf_isom_set_ctts_v1(file, track, 0);
 	} else {
 		if (ctts->version==0) return GF_OK;
 		return gf_isom_set_ctts_v0(file, trak);
 	}
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_set_sync_table(GF_ISOFile *file, u32 track)
 {
 	GF_Err e;
@@ -5679,50 +6552,30 @@
 	trak = gf_isom_get_track_from_file(file, track);
 	if (!trak) return GF_BAD_PARAM;
 
-	trak->Media->information->sampleTable->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
+	if (!trak->Media->information->sampleTable->SyncSample) {
+		trak->Media->information->sampleTable->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new_parent(&trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_STSS);
+
+		if (!trak->Media->information->sampleTable->SyncSample)
+			return GF_OUT_OF_MEM;
+	}
 	return GF_OK;
 }
+#endif
 
-Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type)
+GF_Err gf_isom_set_sample_flags(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
 {
-	Bool res = GF_FALSE;
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	GF_BitStream *bs1, *bs2;
-	char *buf1, *buf2;
-	u32 len1, len2;
-
-	if (!ptr1 || !ptr2)
-		return GF_FALSE;
-
-	bs1 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (grouping_type) {
-		sgpd_write_entry(grouping_type, ptr1, bs1);
-	} else {
-		gf_isom_box_write((GF_Box *)ptr1, bs1);
-	}
-	gf_bs_get_content(bs1, &buf1, &len1);
-	gf_bs_del(bs1);
-
-	bs2 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (grouping_type) {
-		sgpd_write_entry(grouping_type, ptr2, bs2);
-	} else {
-		gf_isom_box_write((GF_Box *)ptr2, bs2);
-	}
-	gf_bs_get_content(bs2, &buf2, &len2);
-	gf_bs_del(bs2);
-
+	GF_Err e;
+	GF_TrackBox *trak;
 
-	if ((len1==len2) && !memcmp(buf1, buf2, len1))
-		res = GF_TRUE;
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
 
-	gf_free(buf1);
-	gf_free(buf2);
-#endif
-	return res;
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+	return stbl_SetDependencyType(trak->Media->information->sampleTable, sampleNumber, isLeading, dependsOn, dependedOn, redundant);
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_isom_sample_set_dep_info(GF_ISOFile *file, u32 track, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
 {
 	GF_TrackBox *trak;
@@ -5732,6 +6585,7 @@
 
 	return stbl_AddDependencyType(trak->Media->information->sampleTable, sampleNumber, isLeading, dependsOn, dependedOn, redundant);
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_isom_copy_sample_info(GF_ISOFile *dst, u32 dst_track, GF_ISOFile *src, u32 src_track, u32 sampleNumber)
@@ -5782,7 +6636,8 @@
 			dst_subs=NULL;
 		}
 		if (!dst_subs) {
-			dst_subs = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
+			dst_subs = (GF_SubSampleInformationBox *) gf_isom_box_new_parent(&dst_trak->Media->information->sampleTable->child_boxes, GF_ISOM_BOX_TYPE_SUBS);
+			if (!dst_subs) return GF_OUT_OF_MEM;
 			dst_subs->version=0;
 			dst_subs->flags = subs_flags;
 			gf_list_add(dst_trak->Media->information->sampleTable->sub_samples, dst_subs);
@@ -5865,7 +6720,7 @@
 
 
 				/*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);
+				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;
 			}
@@ -5887,11 +6742,11 @@
 	trak = gf_isom_get_track_from_file(file, track);
 	if (!trak) return GF_BAD_PARAM;
 
-	for (i=0; i < gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes); i++) {
+	for (i=0; i < gf_list_count(trak->Media->information->sampleTable->SampleDescription->child_boxes); i++) {
 		GF_Tx3gSampleEntryBox *txt;
 		if (desc_index && (i+1 != desc_index)) continue;
 
-		txt = (GF_Tx3gSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, i);
+		txt = (GF_Tx3gSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, i);
 		if (txt->type != GF_ISOM_BOX_TYPE_TX3G) continue;
 
 		switch (op_type) {
@@ -5941,7 +6796,6 @@
 	u32 i;
 	u64 trackDuration;
 	GF_EdtsEntry *ent;
-	GF_EditListBox *elst;
 	GF_Err e;
 	GF_TrackBox *trak;
 
@@ -5964,7 +6818,7 @@
 	//entries' duration (always expressed in MovieTimeScale)
 	if (trak->editBox && trak->editBox->editList) {
 		u64 editListDuration = 0;
-		elst = trak->editBox->editList;
+		GF_EditListBox *elst = trak->editBox->editList;
 		i=0;
 		while ((ent = (GF_EdtsEntry*)gf_list_enum(elst->entryList, &i))) {
 			if (ent->segmentDuration > trackDuration)
@@ -5978,8 +6832,10 @@
 					diff /= trak->Media->mediaHeader->timeScale;
 					if (diff < ent->segmentDuration)
 						ent->segmentDuration -= diff;
+					/*
 					else
 						diff = 0;
+					*/
 				}
 			}
 			if ((ent->mediaTime>=0) && ((u64) ent->mediaTime>=trak->Media->mediaHeader->duration)) {
@@ -6005,22 +6861,27 @@
 	u32 i;
 	i = 0;
 
-	while ((a = (GF_Box *)gf_list_enum(input->moov->other_boxes, &i))) {
+	while ((a = (GF_Box *)gf_list_enum(input->moov->child_boxes, &i))) {
 		if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
-			GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PSSH);
+			GF_List **child_boxes = &output->moov->child_boxes;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			if (in_moof)
+				child_boxes = &output->moof->child_boxes;
+#endif
+
+			GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)gf_isom_box_new_parent(child_boxes, GF_ISOM_BOX_TYPE_PSSH);
+			if (!pssh) return GF_OUT_OF_MEM;
 			memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
-			pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
-			pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
-			memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+			if (((GF_ProtectionSystemHeaderBox *)a)->KIDs && ((GF_ProtectionSystemHeaderBox *)a)->KID_count > 0) {
+				pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
+				pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+				if (!pssh->KIDs) return GF_OUT_OF_MEM;
+				memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+			}
 			pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
 			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);
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-			gf_isom_box_add_default(in_moof ? (GF_Box*)output->moof : (GF_Box*)output->moov, (GF_Box*)pssh);
-#else
-			gf_isom_box_add_default((GF_Box*)output->moov, (GF_Box*)pssh);
-#endif
 		}
 	}
 	return GF_OK;
@@ -6039,7 +6900,8 @@
 
 	trak = gf_isom_get_track_from_file(file, track_number);
 	if (!trak) return GF_BAD_PARAM;
-	if (!trak->groups) trak->groups = (GF_TrackGroupBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRGR);
+	if (!trak->groups) trak->groups = (GF_TrackGroupBox*) gf_isom_box_new_parent(&trak->child_boxes, GF_ISOM_BOX_TYPE_TRGR);
+	if (!trak->groups) return GF_OUT_OF_MEM;
 
 	for (j=0; j<gf_list_count(file->moov->trackList); j++) {
 		GF_TrackBox *a_trak = gf_list_get(file->moov->trackList, j);
@@ -6056,7 +6918,7 @@
 				if (a_trak==trak) {
 					if (!do_add) {
 						gf_list_rem(trak->groups->groups, i);
-						gf_isom_box_del((GF_Box *)trgt);
+						gf_isom_box_del_parent(&trak->groups->child_boxes, (GF_Box *)trgt);
 					}
 					return GF_OK;
 				}
@@ -6064,14 +6926,68 @@
 		}
 	}
 	//not found, add new group
-	trgt = (GF_TrackGroupTypeBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRGT);
+	trgt = (GF_TrackGroupTypeBox*) gf_isom_box_new_parent(&trak->groups->child_boxes, GF_ISOM_BOX_TYPE_TRGT);
+	if (!trgt) return GF_OUT_OF_MEM;
 	trgt->track_group_id = track_group_id;
 	trgt->group_type = group_type;
 	return gf_list_add(trak->groups->groups, trgt);
 }
 
 GF_EXPORT
-GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *file, u32 track, u32 stsd_idx, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, char *compressor_name, s16 color_table_index)
+GF_Err gf_isom_set_nalu_length_field(GF_ISOFile *file, u32 track, u32 StreamDescriptionIndex, u32 nalu_size_length)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *entry;
+	GF_MPEGVisualSampleEntryBox *ve;
+	GF_SampleDescriptionBox *stsd;
+
+	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;
+
+	stsd = trak->Media->information->sampleTable->SampleDescription;
+	if (!stsd || !StreamDescriptionIndex || StreamDescriptionIndex > gf_list_count(stsd->child_boxes)) {
+		return GF_BAD_PARAM;
+	}
+
+	entry = (GF_SampleEntryBox *)gf_list_get(stsd->child_boxes, StreamDescriptionIndex - 1);
+	//no support for generic sample entries (eg, no MPEG4 descriptor)
+	if (!entry || ! gf_isom_is_nalu_based_entry(trak->Media, entry)) {
+		return GF_BAD_PARAM;
+	}
+
+	ve = (GF_MPEGVisualSampleEntryBox*)entry;
+	if (ve->avc_config) ve->avc_config->config->nal_unit_size = nalu_size_length;
+	if (ve->svc_config) ve->svc_config->config->nal_unit_size = nalu_size_length;
+	if (ve->hevc_config) ve->hevc_config->config->nal_unit_size = nalu_size_length;
+	if (ve->lhvc_config) ve->lhvc_config->config->nal_unit_size = nalu_size_length;
+	return GF_OK;
+}
+
+GF_Err gf_isom_set_sample_group_in_traf(GF_ISOFile *file)
+{
+	GF_Err e;
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	file->sample_groups_in_traf = GF_TRUE;
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_isom_set_progress_callback(GF_ISOFile *file, void (*progress_cbk)(void *udta, u64 nb_done, u64 nb_total), void *progress_cbk_udta)
+{
+	if (file) {
+		file->progress_cbk = progress_cbk;
+		file->progress_cbk_udta = progress_cbk_udta;
+
+	}
+}
+
+GF_Err gf_isom_update_video_sample_entry_fields(GF_ISOFile *file, u32 track, u32 stsd_idx, u16 revision, u32 vendor, u32 temporalQ, u32 spatialQ, u32 horiz_res, u32 vert_res, u16 frames_per_sample, const char *compressor_name, s16 color_table_index)
 {
 
 	GF_TrackBox *trak;
@@ -6092,7 +7008,7 @@
 	default:
 		return GF_BAD_PARAM;
 	}
-	vid_ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, stsd_idx-1);
+	vid_ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, stsd_idx-1);
 	if (!vid_ent)
 		return GF_BAD_PARAM;
 
@@ -6110,6 +7026,374 @@
 	return GF_OK;
 }
 
-#endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/
 
+GF_Err gf_isom_update_sample_description_from_template(GF_ISOFile *file, u32 track, u32 sampleDescriptionIndex, u8 *data, u32 size)
+{
+	GF_BitStream *bs;
+	GF_TrackBox *trak;
+	GF_Box *ent, *tpl_ent;
+	GF_Err e;
+	/*get orig sample desc and clone it*/
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak || !sampleDescriptionIndex) return GF_BAD_PARAM;
+
+	if (!trak->Media || !trak->Media->handler || !trak->Media->information || !trak->Media->information->sampleTable || !trak->Media->information->sampleTable->SampleDescription)
+		return GF_ISOM_INVALID_FILE;
 
+	ent = gf_list_get(trak->Media->information->sampleTable->SampleDescription->child_boxes, sampleDescriptionIndex-1);
+	if (!ent) return GF_BAD_PARAM;
+
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+//	e = gf_isom_box_parse(&tpl_ent, bs);
+	e = gf_isom_box_parse_ex (&tpl_ent, bs, GF_ISOM_BOX_TYPE_STSD, GF_FALSE);
+	gf_bs_del(bs);
+	if (e) return e;
+
+	while (gf_list_count(tpl_ent->child_boxes)) {
+		u32 j=0;
+		Bool found = GF_FALSE;
+		GF_Box *abox = gf_list_pop_front(tpl_ent->child_boxes);
+
+		switch (abox->type) {
+		case GF_ISOM_BOX_TYPE_SINF:
+		case GF_ISOM_BOX_TYPE_RINF:
+		case GF_ISOM_BOX_TYPE_BTRT:
+			found = GF_TRUE;
+			break;
+		}
+
+		if (found) {
+			gf_isom_box_del(abox);
+			continue;
+		}
+		
+		if (!ent->child_boxes) ent->child_boxes = gf_list_new();
+		for (j=0; j<gf_list_count(ent->child_boxes); j++) {
+			GF_Box *b = gf_list_get(ent->child_boxes, j);
+			if (b->type == abox->type) {
+				found = GF_TRUE;
+				break;
+			}
+		}
+		if (!found) {
+			gf_list_add(ent->child_boxes, abox);
+		} else {
+			gf_isom_box_del(abox);
+		}
+	}
+	gf_isom_box_del(tpl_ent);
+
+	//patch for old export
+	GF_Box *abox = gf_isom_box_find_child(ent->child_boxes, GF_ISOM_BOX_TYPE_SINF);
+	if (abox) {
+		gf_list_del_item(ent->child_boxes, abox);
+		gf_list_add(ent->child_boxes, abox);
+	}
+	return GF_OK;
+}
+
+#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)
+{
+	GF_Err e;
+	GF_DOMParser *dom;
+	u32 i;
+	GF_XMLNode *root;
+	u8 *box_data=NULL;
+	u32 box_data_size;
+	if (!file || !box_patch_filename) return GF_BAD_PARAM;
+	dom = gf_xml_dom_new();
+	if (strstr(box_patch_filename, "<?xml")) {
+		e = gf_xml_dom_parse_string(dom, (char *) box_patch_filename);
+	} else {
+		e = gf_xml_dom_parse(dom, box_patch_filename, NULL, NULL);
+	}
+	if (e) goto err_exit;
+
+	root = gf_xml_dom_get_root(dom);
+	if (!root || strcmp(root->name, "GPACBOXES")) {
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		goto err_exit;
+	}
+
+	//compute size of each child boxes to freeze the order
+	if (for_fragments) {
+		u32 count = file->moof ? gf_list_count(file->moof->child_boxes) : 0;
+		for (i=0; i<count; i++) {
+			GF_Box *box = gf_list_get(file->moof->child_boxes, i);
+			if (!(box->internal_flags & GF_ISOM_ORDER_FREEZE)) {
+				gf_isom_box_size(box);
+				gf_isom_box_freeze_order(box);
+			}
+		}
+	} else {
+		for (i=0; i<gf_list_count(file->TopBoxes); i++) {
+			GF_Box *box = gf_list_get(file->TopBoxes, i);
+			if (!(box->internal_flags & GF_ISOM_ORDER_FREEZE)) {
+				gf_isom_box_size(box);
+				gf_isom_box_freeze_order(box);
+			}
+		}
+	}
+
+	for (i=0; i<gf_list_count(root->content); i++) {
+		u32 j;
+		u32 path_len;
+		Bool essential_prop=GF_FALSE;
+		u32 trackID=globalTrackID;
+		u32 item_id=trackID;
+		Bool is_frag_box;
+		char *box_path=NULL;
+		GF_Box *parent_box = NULL;
+		GF_XMLNode *box_edit = gf_list_get(root->content, i);
+		if (!box_edit->name || strcmp(box_edit->name, "Box")) continue;
+
+		for (j=0; j<gf_list_count(box_edit->attributes);j++) {
+			GF_XMLAttribute *att = gf_list_get(box_edit->attributes, j);
+			if (!strcmp(att->name, "path")) box_path = att->value;
+			else if (!strcmp(att->name, "essential")) {
+				if (!strcmp(att->value, "yes") || !strcmp(att->value, "true") || !strcmp(att->value, "1")) {
+					essential_prop=GF_TRUE;
+				}
+			}
+			else if (!strcmp(att->name, "itemID"))
+				item_id = atoi(att->value);
+			else if (!globalTrackID && !strcmp(att->name, "trackID"))
+				trackID = atoi(att->value);
+		}
+
+		if (!box_path) continue;
+		path_len = (u32) strlen(box_path);
+
+		is_frag_box = !strncmp(box_path, "traf", 4) ? GF_TRUE : GF_FALSE;
+
+		if (for_fragments && !is_frag_box) continue;
+		else if (!for_fragments && is_frag_box) continue;
+
+		gf_xml_parse_bit_sequence(box_edit, box_patch_filename, &box_data, &box_data_size);
+		if (box_data_size && (box_data_size<4) ) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Wrong BS specification for box, shall either be empty or at least 4 bytes for box type\n"));
+			e = GF_NON_COMPLIANT_BITSTREAM;
+			goto err_exit;
+		}
+
+		while (box_path && (path_len>=4)) {
+			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;
+			GF_BitStream *bs;
+			s32 insert_pos = -1;
+			box_path+=4;
+			path_len-=4;
+
+			if (!parent_box) {
+				box=gf_isom_box_find_child(file->TopBoxes, box_type);
+				if (!box) {
+					if (box_type==GF_ISOM_BOX_TYPE_TRAK) {
+						if (trackID) {
+							box = (GF_Box *) gf_isom_get_track_from_file(file, gf_isom_get_track_by_id(file, trackID) );
+						}
+						if (!box && gf_list_count(file->moov->trackList)==1) {
+							box = gf_list_get(file->moov->trackList, 0);
+						}
+					}
+					else if (box_type==GF_ISOM_BOX_TYPE_TRAF) {
+						if (trackID) {
+							box = (GF_Box *) gf_isom_get_traf(file, trackID);
+						}
+						if (!box && file->moof && gf_list_count(file->moof->TrackList)==1) {
+							box = gf_list_get(file->moof->TrackList, 0);
+						}
+					}
+				}
+				if (!box) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Cannot locate box type %s at root or as track\n", gf_4cc_to_str(box_type) ));
+					e = GF_BAD_PARAM;
+					goto err_exit;
+				}
+			} else {
+				box = gf_isom_box_find_child(parent_box->child_boxes, box_type);
+				if (!box) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Cannot locate box type %s at child of %s\n", gf_4cc_to_str(box_type), gf_4cc_to_str(parent_box->type)));
+					e = GF_BAD_PARAM;
+					goto err_exit;
+				}
+			}
+			// '.' is child access
+			if (path_len && (box_path[0]=='.')) {
+				box_path += 1;
+				path_len-=1;
+				parent_box = box;
+				continue;
+			}
+
+			if (parent_box && !parent_box->child_boxes) parent_box->child_boxes = gf_list_new();
+			parent_list = parent_box ? &parent_box->child_boxes : &file->TopBoxes;
+
+			// '+' is append after, '-' is insert before
+			if (path_len && ((box_path[0]=='-') || (box_path[0]=='+')) ) {
+				s32 idx = gf_list_find(*parent_list, box);
+				assert(idx>=0);
+				if (box_path[0]=='+') insert_pos = idx+1;
+				else insert_pos = idx;
+			}
+			else if (path_len) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] Invalid path %s, expecting either '-', '+' or '.' as separators\n", box_path));
+				e = GF_NON_COMPLIANT_BITSTREAM;
+				goto err_exit;
+			}
+
+			if (!box_data) {
+				if (insert_pos>=0) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ISOBMFF] Invalid path %s for box removal, ignoring position\n", box_path));
+				}
+				switch (box->type) {
+				case GF_ISOM_BOX_TYPE_MOOV:
+					file->moov = NULL;
+					break;
+				case GF_ISOM_BOX_TYPE_MDAT:
+					file->mdat = NULL;
+					break;
+				case GF_ISOM_BOX_TYPE_PDIN:
+					file->pdin = NULL;
+					break;
+				case GF_ISOM_BOX_TYPE_FTYP:
+					file->brand = NULL;
+					break;
+				case GF_ISOM_BOX_TYPE_META:
+					if ((GF_Box *) file->meta == box) file->meta = NULL;
+					break;
+				}
+				gf_isom_box_del_parent(parent_list, box);
+			} else {
+				u32 size;
+
+				bs = gf_bs_new(box_data, box_data_size, GF_BITSTREAM_READ);
+				size = gf_bs_read_u32(bs);
+				if (size != box_data_size) {
+					GF_UnknownBox *new_box = (GF_UnknownBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_UNKNOWN);
+					new_box->original_4cc = size;
+					new_box->dataSize = (u32) gf_bs_available(bs);
+					new_box->data = gf_malloc(sizeof(u8)*new_box->dataSize);
+					gf_bs_read_data(bs, new_box->data, new_box->dataSize);
+					if (insert_pos<0) {
+						gf_list_add(box->child_boxes, new_box);
+						insert_pos = gf_list_find(box->child_boxes, new_box);
+					} else {
+						gf_list_insert(*parent_list, new_box, insert_pos);
+					}
+
+					if (parent_box && (parent_box->type==GF_ISOM_BOX_TYPE_IPRP)) {
+						GF_ItemPropertyAssociationBox *ipma = (GF_ItemPropertyAssociationBox *) gf_isom_box_find_child(parent_box->child_boxes, GF_ISOM_BOX_TYPE_IPMA);
+						if (!item_id) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ISOBMFF] Inserting box in ipco without itemID, no association added\n"));
+						} else if (ipma) {
+							u32 nb_asso, k;
+							GF_ItemPropertyAssociationEntry *entry = NULL;
+							nb_asso = gf_list_count(ipma->entries);
+							for (k=0; k<nb_asso;k++) {
+								entry = gf_list_get(ipma->entries, k);
+								if (entry->item_id==item_id) break;
+								entry = NULL;
+							}
+							if (!entry) {
+								GF_SAFEALLOC(entry, GF_ItemPropertyAssociationEntry);
+								if (!entry) return GF_OUT_OF_MEM;
+								gf_list_add(ipma->entries, entry);
+								entry->item_id = item_id;
+							}
+							entry->associations = gf_realloc(entry->associations, sizeof(GF_ItemPropertyAssociationSlot) * (entry->nb_associations+1));
+							entry->associations[entry->nb_associations].essential = essential_prop;
+							entry->associations[entry->nb_associations].index = 1+insert_pos;
+							entry->nb_associations++;
+						}
+					}
+				} else {
+					u32 box_idx = 0;
+
+					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);
+						if (e) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMFF] failed to parse box\n", box_path));
+							gf_bs_del(bs);
+							goto err_exit;
+						}
+						if (insert_pos<0) {
+							gf_list_add(box->child_boxes, new_box);
+						} else {
+							gf_list_insert(*parent_list, new_box, insert_pos+box_idx);
+							box_idx++;
+						}
+					}
+				}
+				gf_bs_del(bs);
+
+			}
+			gf_free(box_data);
+			box_data = NULL;
+			box_path = NULL;
+		}
+	}
+
+err_exit:
+
+	gf_xml_dom_del(dom);
+	if (box_data) gf_free(box_data);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_track_magic(GF_ISOFile *movie, u32 trackNumber, u64 magic)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	trak->magic = magic;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_set_track_index(GF_ISOFile *movie, u32 trackNumber, u32 index, void (*track_num_changed)(void *udta, u32 old_track_num, u32 new_track_num), void *udta)
+{
+	u32 i, count;
+	GF_List *tracks;
+	u32 prev_index=0, prev_pos=0;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(movie, trackNumber);
+	if (!trak || !index) return GF_BAD_PARAM;
+	trak->index = index;
+	tracks = gf_list_new();
+	count = gf_list_count(movie->moov->trackList);
+	//sort tracks in new list
+	for (i=0; i<count; i++) {
+		GF_TrackBox *a_tk = gf_list_get(movie->moov->trackList, i);
+		if (!a_tk->index) {
+			gf_list_insert(tracks, a_tk, 0);
+		} else if (a_tk->index < prev_index) {
+			gf_list_insert(tracks, a_tk, prev_pos);
+		} else {
+			gf_list_add(tracks, a_tk);
+		}
+		prev_pos = gf_list_count(tracks) - 1;
+		prev_index = a_tk->index;
+	}
+	if (gf_list_count(tracks) != count) {
+		gf_list_del(tracks);
+		return GF_OUT_OF_MEM;
+	}
+	if (track_num_changed) {
+		for (i=0; i<count; i++) {
+			GF_TrackBox *a_tk = gf_list_get(tracks, i);
+			s32 old_pos = gf_list_find(movie->moov->trackList, a_tk);
+			assert(old_pos>=0);
+			if (old_pos != i)
+				track_num_changed(udta, old_pos+1, i+1);
+		}
+	}
+	gf_list_del(movie->moov->trackList);
+	movie->moov->trackList = tracks;
+	return GF_OK;
+}
+
+#endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.8.0.tar.gz/src/isomedia/media.c -> gpac-1.0.0.tar.gz/src/isomedia/media.c Changed

gpac-0.8.0.tar.gz/src/isomedia/media_odf.c -> gpac-1.0.0.tar.gz/src/isomedia/media_odf.c Changed

gpac-0.8.0.tar.gz/src/isomedia/meta.c -> gpac-1.0.0.tar.gz/src/isomedia/meta.c Changed

@@ -2,7 +2,7 @@
  *					GPAC Multimedia Framework
  *
  *			Authors: Cyril Concolato - Jean le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2019
+ *			Copyright (c) Telecom ParisTech 2005-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -55,9 +55,9 @@
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
 	if (!meta) return 0;
 
-	count = gf_list_count(meta->other_boxes);
+	count = gf_list_count(meta->child_boxes);
 	for (i=0; i<count; i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(meta->other_boxes, i);
+		GF_Box *a = (GF_Box *)gf_list_get(meta->child_boxes, i);
 		if (a->type == GF_ISOM_BOX_TYPE_XML) return 1;
 		if (a->type == GF_ISOM_BOX_TYPE_BXML) return 2;
 	}
@@ -74,9 +74,9 @@
 	if (!meta) return GF_BAD_PARAM;
 
 	/*Find XMLBox*/
-	count = gf_list_count(meta->other_boxes);
+	count = gf_list_count(meta->child_boxes);
 	for (i = 0; i <count; i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(meta->other_boxes, i);
+		GF_Box *a = (GF_Box *)gf_list_get(meta->child_boxes, i);
 		if ((a->type == GF_ISOM_BOX_TYPE_XML) || (a->type == GF_ISOM_BOX_TYPE_BXML) ) {
 			xml = (GF_XMLBox *)a;
 			break;
@@ -86,7 +86,7 @@
 
 	didfile = gf_fopen(outName, "wb");
 	if (!didfile) return GF_IO_ERR;
-	gf_fwrite(xml->xml, strlen(xml->xml), 1, didfile);
+	gf_fwrite(xml->xml, strlen(xml->xml), didfile);
 	gf_fclose(didfile);
 
 	if (is_binary) *is_binary = (xml->type==GF_ISOM_BOX_TYPE_BXML) ? 1 : 0;
@@ -100,9 +100,9 @@
 	if (!meta) return NULL;
 
 	/*Find XMLBox*/
-	count = gf_list_count(meta->other_boxes);
+	count = gf_list_count(meta->child_boxes);
 	for (i = 0; i <count; i++) {
-		GF_Box *a = (GF_Box *)gf_list_get(meta->other_boxes, i);
+		GF_Box *a = (GF_Box *)gf_list_get(meta->child_boxes, i);
 		if (a->type == GF_ISOM_BOX_TYPE_XML) {
 			*is_binary = 0;
 			return (GF_XMLBox *)a;
@@ -154,7 +154,7 @@
 		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->other_boxes, iloc->data_reference_index-1);
+				GF_Box *a = (GF_Box *)gf_list_get(meta->file_locations->dref->child_boxes, iloc->data_reference_index-1);
 				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) {
@@ -179,24 +179,21 @@
 GF_EXPORT
 u32 gf_isom_get_meta_item_by_id(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_ID)
 {
-	GF_ItemInfoEntryBox *iinf;
 	u32 i, count;
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
 	if (!meta || !meta->item_infos || !meta->item_locations) return 0;
 	count = gf_list_count(meta->item_infos->item_infos);
 	for (i=0; i<count; i++) {
-		iinf = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, i);
+		GF_ItemInfoEntryBox *iinf = (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, i);
 		if (iinf->item_ID==item_ID) return i+1;
 	}
 	return 0;
 }
 
-GF_EXPORT
-GF_Err gf_isom_extract_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name, char **out_data, u32 *out_size, const char **out_mime, Bool use_annex_b)
+static GF_Err gf_isom_extract_meta_item_intern(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name, u8 **out_data, u32 *out_size, u32 *out_alloc_size, const char **out_mime, Bool use_annex_b)
 {
 	GF_BitStream *item_bs;
 	char szPath[1024];
-	GF_ItemExtentEntry *extent_entry;
 	FILE *resource = NULL;
 	u32 i, count;
 	GF_ItemLocationEntry *location_entry;
@@ -242,31 +239,29 @@
 
 	/* offsets are expressed from the start of the idat box instead of the start of the file */
 	if (location_entry->construction_method == 1) {
-		int found = 0;
+		Bool found = GF_FALSE;
 
-		count = gf_list_count(meta->other_boxes);
+		count = gf_list_count(meta->child_boxes);
 		for (i = 0; i <count; i++) {
-			GF_Box *a = (GF_Box *)gf_list_get(meta->other_boxes, i);
+			GF_Box *a = (GF_Box *)gf_list_get(meta->child_boxes, i);
 
 			if (a->type == GF_ISOM_BOX_TYPE_IDAT) {
-
 				GF_MediaDataBox *p = (GF_MediaDataBox *)a;
 				idat_offset = p->bsOffset;
-				found = 1;
+				found = GF_TRUE;
 				break;
-
-			}
-			if (!found) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Item %d references an inexistant idat box\n", item_num));
-				return GF_BAD_PARAM;
 			}
 		}
+		if (!found) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[IsoMedia] Item %d references an inexistant idat box\n", item_num));
+			return GF_BAD_PARAM;
+		}
 	}
 	/* when construction_method==1, data_reference_index is ignored */
 	/*FIXME*/
 	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->other_boxes, location_entry->data_reference_index-1);
+		GF_Box *a = (GF_Box *)gf_list_get(meta->file_locations->dref->child_boxes, location_entry->data_reference_index-1);
 		if (a->type==GF_ISOM_BOX_TYPE_URL) {
 			item_url = ((GF_DataEntryURLBox*)a)->location;
 		} else if (a->type==GF_ISOM_BOX_TYPE_URN) {
@@ -280,7 +275,7 @@
 	/*don't extract self-reference item*/
 	count = gf_list_count(location_entry->extent_entries);
 	if (!location_entry->base_offset && (count==1)) {
-		extent_entry = (GF_ItemExtentEntry *)gf_list_get(location_entry->extent_entries, 0);
+		GF_ItemExtentEntry *extent_entry = (GF_ItemExtentEntry *)gf_list_get(location_entry->extent_entries, 0);
 		if (!extent_entry->extent_length
 #ifndef GPAC_DISABLE_ISOM_WRITE
 		        && !extent_entry->original_extent_offset
@@ -292,7 +287,7 @@
 
 
 	if (out_data) {
-		item_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		item_bs = gf_bs_new(*out_data, *out_size, GF_BITSTREAM_WRITE_DYN);
 	} else if (dump_file_name) {
 		strcpy(szPath, dump_file_name);
 		resource = gf_fopen(szPath, "wb");
@@ -305,23 +300,30 @@
 	}
 
 	if ((item_type == GF_ISOM_SUBTYPE_HVC1) || (item_type == GF_ISOM_SUBTYPE_AVC_H264) ) {
-		u32 i, count, j, c2;
+		u32 j, nb_assoc;
 		GF_HEVCConfigurationBox *hvcc = NULL;
 		GF_AVCConfigurationBox *avcc = NULL;
 		if (! meta->item_props) return GF_NON_COMPLIANT_BITSTREAM;
-		if (! meta->item_props->property_container) return GF_NON_COMPLIANT_BITSTREAM;
-		if (! meta->item_props->property_association) return GF_NON_COMPLIANT_BITSTREAM;
-
-		count = gf_list_count(meta->item_props->property_association->entries);
-		for (i=0; i<count; i++) {
+		if (! meta->item_props->property_container) {
+			if (item_bs) gf_bs_del(item_bs);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (! meta->item_props->property_association) {
+			if (item_bs) gf_bs_del(item_bs);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		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;
-			c2 = gf_list_count(e->property_index);
-			for (j=0; j<c2; j++) {
-				u32 *idx = gf_list_get(e->property_index, j);
-				if (! (*idx) ) continue;
-				hvcc = gf_list_get(meta->item_props->property_container->other_boxes, (*idx) - 1);
-				if (!hvcc) return GF_NON_COMPLIANT_BITSTREAM;
+			for (j=0; j<e->nb_associations; j++) {
+				u32 idx = e->associations[j].index;
+				if (! idx) continue;
+				hvcc = gf_list_get(meta->item_props->property_container->child_boxes, idx - 1);
+				if (!hvcc) {
+					if (item_bs) gf_bs_del(item_bs);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
 				if (hvcc->type == GF_ISOM_BOX_TYPE_HVCC) break;
 				if (hvcc->type == GF_ISOM_BOX_TYPE_AVCC) {
 					avcc = (GF_AVCConfigurationBox *) hvcc;
@@ -390,7 +392,7 @@
 		}
 	}
 	if (out_data) {
-		gf_bs_get_content(item_bs, out_data, out_size);
+		gf_bs_get_content_no_truncate(item_bs, out_data, out_size, out_alloc_size);
 	}
 	if (resource) {
 		gf_fclose(resource);
@@ -402,13 +404,13 @@
 GF_EXPORT
 GF_Err gf_isom_extract_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, const char *dump_file_name)
 {
-	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, dump_file_name, NULL, NULL, NULL, GF_TRUE);
+	return gf_isom_extract_meta_item_intern(file, root_meta, track_num, item_id, dump_file_name, NULL, NULL, NULL, NULL, GF_TRUE);
 }
 
 GF_EXPORT
-GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, char **out_data, u32 *out_size, const char **out_mime, Bool use_annex_b)
+GF_Err gf_isom_extract_meta_item_mem(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_id, u8 **out_data, u32 *out_size, u32 *out_alloc_size, const char **out_mime, Bool use_annex_b)
 {
-	return gf_isom_extract_meta_item_extended(file, root_meta, track_num, item_id, NULL, out_data, out_size, out_mime, use_annex_b);
+	return gf_isom_extract_meta_item_intern(file, root_meta, track_num, item_id, NULL, out_data, out_size, out_alloc_size, out_mime, use_annex_b);
 }
 
 GF_EXPORT
@@ -436,19 +438,25 @@
 	if (!meta) {
 		if (!metaType) return GF_OK;
 		meta = (GF_MetaBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_META);
+		if (!meta) return GF_OUT_OF_MEM;
 		if (root_meta) {
 			file->meta = meta;
 			gf_list_add(file->TopBoxes, meta);
 		} else {
-			gf_isom_insert_moov(file);
+			e = gf_isom_insert_moov(file);
+			if (e) return e;
 			if (!track_num) {
 				file->moov->meta = meta;
+				if (!file->moov->child_boxes) file->moov->child_boxes = gf_list_new();
+				gf_list_add(file->moov->child_boxes, meta);
 			} else {
 				GF_TrackBox *tk = (GF_TrackBox *)gf_list_get(file->moov->trackList, track_num-1);
 				if (!tk) {
 					gf_isom_box_del((GF_Box *)meta);
 					return GF_BAD_PARAM;
 				}
+				if (!tk->child_boxes) tk->child_boxes = gf_list_new();
+				gf_list_add(tk->child_boxes, meta);
 				tk->meta = meta;
 			}
 		}
@@ -459,25 +467,27 @@
 			file->meta = NULL;
 		} else if (file->moov) {
 			if (!track_num) {
-				gf_isom_box_del((GF_Box *)file->moov->meta);
+				gf_isom_box_del_parent(&file->moov->child_boxes, (GF_Box *)file->moov->meta);
 				file->moov->meta = NULL;
 			} else {
 				GF_TrackBox *tk = (GF_TrackBox *)gf_list_get(file->moov->trackList, track_num-1);
 				if (!tk) return GF_BAD_PARAM;
-				gf_isom_box_del((GF_Box *)tk->meta);
+				gf_isom_box_del_parent(&tk->child_boxes, (GF_Box *)tk->meta);
 				tk->meta = NULL;
 			}
 		}
 		return GF_OK;
 	}
 
-	if (!meta->handler)
-		meta->handler = (GF_HandlerBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HDLR);
-
+	if (!meta->handler) {
+		meta->handler = (GF_HandlerBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_HDLR);
+		if (!meta->handler) return GF_OUT_OF_MEM;
+	}
 	if (meta->handler->nameUTF8) gf_free(meta->handler->nameUTF8);
 	meta->handler->handlerType = metaType;
 	sprintf(szName, "GPAC %s Handler", gf_4cc_to_str(metaType));
 	meta->handler->nameUTF8 = gf_strdup(szName);
+	if (!meta->handler->nameUTF8) return GF_OUT_OF_MEM;
 	return GF_OK;
 }
 
@@ -489,12 +499,12 @@
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
 	if (!meta) return GF_BAD_PARAM;
 	i=0;
-	while ((a = (GF_Box*)gf_list_enum(meta->other_boxes, &i))) {
+	while ((a = (GF_Box*)gf_list_enum(meta->child_boxes, &i))) {
 		switch (a->type) {
 		case GF_ISOM_BOX_TYPE_XML:
 		case GF_ISOM_BOX_TYPE_BXML:
-			gf_list_rem(meta->other_boxes, i-1);
-			gf_isom_box_del(a);
+			gf_isom_box_del_parent(&meta->child_boxes, a);
+			i--;
 			return GF_OK;
 		}
 	}
@@ -505,10 +515,9 @@
 GF_Err gf_isom_set_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, char *XMLFileName, Bool IsBinaryXML)
 {
 	GF_Err e;
-	FILE *xmlfile;
 	GF_XMLBox *xml;
 	GF_MetaBox *meta;
-	u32 length, bread;
+	u32 length;
 
 	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
@@ -519,31 +528,13 @@
 	e = gf_isom_remove_meta_xml(file, root_meta, track_num);
 	if (e) return e;
 
-	xml = (GF_XMLBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_XML);
+	xml = (GF_XMLBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_XML);
 	if (!xml) return GF_OUT_OF_MEM;
-	gf_list_add(meta->other_boxes, xml);
 	if (IsBinaryXML) xml->type = GF_ISOM_BOX_TYPE_BXML;
 
 
 	/*assume 32bit max size = 4Go should be sufficient for a DID!!*/
-	xmlfile = gf_fopen(XMLFileName, "rb");
-	if (!xmlfile) return GF_URL_ERROR;
-	gf_fseek(xmlfile, 0, SEEK_END);
-	assert(gf_ftell(xmlfile) < 1<<31);
-	length = (u32) gf_ftell(xmlfile);
-	gf_fseek(xmlfile, 0, SEEK_SET);
-	xml->xml = (char*)gf_malloc(sizeof(unsigned char)*(length+1));
-	bread =  (u32) fread(xml->xml, 1, sizeof(unsigned char)*length, xmlfile);
-	if (ferror(xmlfile) || (bread != length)) {
-		gf_free(xml->xml);
-		xml->xml = NULL;
-		return GF_BAD_PARAM;
-	}
-	else {
-		xml->xml[length] = '\0';
-	}
-	gf_fclose(xmlfile);
-	return GF_OK;
+	return gf_file_load_data(XMLFileName, (u8 **) &xml->xml, &length);
 }
 
 GF_EXPORT
@@ -562,14 +553,14 @@
 	e = gf_isom_remove_meta_xml(file, root_meta, track_num);
 	if (e) return e;
 
-	xml = (GF_XMLBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_XML);
+	xml = (GF_XMLBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_XML);
 	if (!xml) return GF_OUT_OF_MEM;
-	gf_list_add(meta->other_boxes, xml);
 	if (IsBinaryXML) xml->type = GF_ISOM_BOX_TYPE_BXML;
 
 
 	/*assume 32bit max size = 4Go should be sufficient for a DID!!*/
 	xml->xml = (char*)gf_malloc(sizeof(unsigned char)*data_size);
+	if (!xml->xml) return GF_OUT_OF_MEM;
 	memcpy(xml->xml, data, sizeof(unsigned char)*data_size);
 	return GF_OK;
 }
@@ -577,7 +568,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 count2, j;
+	u32 j;
 	GF_ItemPropertyAssociationBox *ipma = NULL;
 	GF_ItemPropertyContainerBox *ipco = NULL;
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
@@ -593,11 +584,12 @@
 	for (i = 0; i < count; i++) {
 		GF_ItemPropertyAssociationEntry *entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
 		if (entry->item_id == item_id) {
-			count2 = gf_list_count(entry->property_index);
-			for (j = 0; j < count2; j++) {
-				u32 *index = (u32 *)gf_list_get(entry->property_index, j);
-				GF_Box *b = (GF_Box *)gf_list_get(ipco->other_boxes, *index - 1);
+			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:
 				{
@@ -651,9 +643,9 @@
 static s32 meta_find_prop(GF_ItemPropertyContainerBox *boxes, GF_ImageItemProperties *prop) {
 	u32 i;
 	u32 count;
-	count = gf_list_count(boxes->other_boxes);
+	count = gf_list_count(boxes->child_boxes);
 	for (i = 0; i < count; i++) {
-		GF_Box *b = (GF_Box *)gf_list_get(boxes->other_boxes, i);
+		GF_Box *b = (GF_Box *)gf_list_get(boxes->child_boxes, i);
 		switch(b->type) {
 		case GF_ISOM_BOX_TYPE_ISPE:
 		{
@@ -710,75 +702,74 @@
 	return -1;
 }
 
-static void meta_add_item_property_association(GF_ItemPropertyAssociationBox *ipma, u32 item_ID, u32 prop_index, Bool essential) {
+static GF_Err meta_add_item_property_association(GF_ItemPropertyAssociationBox *ipma, u32 item_ID, u32 prop_index, Bool essential) {
 	u32 i, count;
 	GF_ItemPropertyAssociationEntry *found_entry = NULL;
-	Bool *ess = (Bool *)gf_malloc(sizeof(Bool));
-	u32 *index = (u32 *)gf_malloc(sizeof(u32));
 
-	*ess = essential;
-	*index = prop_index;
 	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) {
-			found_entry = entry;
-			break;
-		}
+		found_entry = (GF_ItemPropertyAssociationEntry *)gf_list_get(ipma->entries, i);
+		if (found_entry->item_id == item_ID) break;
+		found_entry = NULL;
 	}
 	if (!found_entry) {
 		GF_SAFEALLOC(found_entry, GF_ItemPropertyAssociationEntry);
-		if (!found_entry) return;
-
+		if (!found_entry) return GF_OUT_OF_MEM;
 		gf_list_add(ipma->entries, found_entry);
 		found_entry->item_id = item_ID;
-		found_entry->essential = gf_list_new();
-		found_entry->property_index= gf_list_new();
 	}
-	gf_list_add(found_entry->essential, ess);
-	gf_list_add(found_entry->property_index, index);
+	found_entry->associations = gf_realloc(found_entry->associations, sizeof(GF_ItemPropertyAssociationSlot) * (found_entry->nb_associations+1));
+	if (!found_entry->associations) return GF_OUT_OF_MEM;
+
+	found_entry->associations[found_entry->nb_associations].essential = essential;
+	found_entry->associations[found_entry->nb_associations].index = prop_index;
+	found_entry->nb_associations++;
+	return GF_OK;
 }
-	
-static void meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, GF_ImageItemProperties *image_props) {
+
+static GF_Err meta_process_image_properties(GF_MetaBox *meta, u32 item_ID, GF_ImageItemProperties *image_props)
+{
 	GF_ImageItemProperties searchprop;
 	GF_ItemPropertyAssociationBox *ipma;
 	GF_ItemPropertyContainerBox *ipco;
 	s32 prop_index;
+	GF_Err e;
 	memset(&searchprop, 0, sizeof(GF_ImageItemProperties));
 
 	if (!meta->item_props) {
-		meta->item_props = (GF_ItemPropertiesBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IPRP);
-		meta->item_props->property_container = (GF_ItemPropertyContainerBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IPCO);
+		meta->item_props = (GF_ItemPropertiesBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_IPRP);
+		if (!meta->item_props) return GF_OUT_OF_MEM;
+		meta->item_props->property_container = (GF_ItemPropertyContainerBox *)gf_isom_box_new_parent(&meta->item_props->child_boxes, GF_ISOM_BOX_TYPE_IPCO);
+		if (!meta->item_props->property_container) return GF_OUT_OF_MEM;
 		ipco = meta->item_props->property_container;
-		ipma = (GF_ItemPropertyAssociationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IPMA);
+		ipma = (GF_ItemPropertyAssociationBox *)gf_isom_box_new_parent(&meta->item_props->child_boxes, GF_ISOM_BOX_TYPE_IPMA);
+		if (!ipma) return GF_OUT_OF_MEM;
 		meta->item_props->property_association = ipma;
 	} else {
 		ipco = meta->item_props->property_container;
 		ipma = meta->item_props->property_association;
 	}
+	if (!ipco->child_boxes)
+		ipco->child_boxes = gf_list_new();
 
 	if (strlen(image_props->iccPath) > 0) {
-		FILE *fp = gf_fopen(image_props->iccPath, "rb");
-		if (fp) {
-			size_t read;
-			GF_ColourInformationBox *colr = (GF_ColourInformationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_COLR);
+		u32 size;
+		u8 *data;
+		e = gf_file_load_data(image_props->iccPath, &data, &size);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error opening ICC colour profile file at %s\n", &image_props->iccPath));
+
+		} else {
+
+			GF_ColourInformationBox *colr = (GF_ColourInformationBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_COLR);
+			if (!colr) return GF_OUT_OF_MEM;
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] reading ICC colour profile from file %s\n", &image_props->iccPath));
 			colr->colour_type = GF_ISOM_SUBTYPE_PROF;
-			fseek(fp,0,SEEK_END);
-			colr->opaque_size = (u32)ftell(fp);
-			fseek(fp,0,SEEK_SET);
-			colr->opaque = malloc(colr->opaque_size);
-			read = gf_fread(colr->opaque, 1, colr->opaque_size, fp);
-			gf_fclose(fp);
-			if (ferror(fp) || read != colr->opaque_size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error reading ICC colour profile from file %s\n", &image_props->iccPath));
-			} else {
-				gf_list_add(ipco->other_boxes, colr);
-				prop_index = gf_list_count(ipco->other_boxes) - 1;
-				meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
-			}
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Error opening ICC colour profile file at %s\n", &image_props->iccPath));
+			colr->opaque_size = size;
+			colr->opaque = data;
+
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
+			meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
 		}
 	}
 
@@ -787,13 +778,14 @@
 		searchprop.height = image_props->height;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ISPE);
+			GF_ImageSpatialExtentsPropertyBox *ispe = (GF_ImageSpatialExtentsPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_ISPE);
+			if (!ispe) return GF_OUT_OF_MEM;
 			ispe->image_width = image_props->width;
 			ispe->image_height = image_props->height;
-			gf_list_add(ipco->other_boxes, ispe);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		if (e) return e;
 		searchprop.width = 0;
 		searchprop.height = 0;
 	}
@@ -802,13 +794,14 @@
 		searchprop.vOffset = image_props->vOffset;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_RLOC);
+			GF_RelativeLocationPropertyBox *rloc = (GF_RelativeLocationPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_RLOC);
+			if (!rloc) return GF_OUT_OF_MEM;
 			rloc->horizontal_offset = image_props->hOffset;
 			rloc->vertical_offset = image_props->vOffset;
-			gf_list_add(ipco->other_boxes, rloc);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
 		searchprop.hOffset = 0;
 		searchprop.vOffset = 0;
 	}
@@ -817,13 +810,14 @@
 		searchprop.vSpacing = image_props->vSpacing;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PASP);
+			GF_PixelAspectRatioBox *pasp = (GF_PixelAspectRatioBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_PASP);
+			if (!pasp) return GF_OUT_OF_MEM;
 			pasp->hSpacing = image_props->hSpacing;
 			pasp->vSpacing = image_props->vSpacing;
-			gf_list_add(ipco->other_boxes, pasp);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_FALSE);
+		if (e) return e;
 		searchprop.hSpacing = 0;
 		searchprop.vSpacing = 0;
 	}
@@ -831,34 +825,37 @@
 		searchprop.angle = image_props->angle;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_ImageRotationBox *irot = (GF_ImageRotationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IROT);
+			GF_ImageRotationBox *irot = (GF_ImageRotationBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_IROT);
+			if (!irot) return GF_OUT_OF_MEM;
 			irot->angle = image_props->angle/90;
-			gf_list_add(ipco->other_boxes, irot);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
 		searchprop.angle = 0;
 	}
 	if (image_props->config) {
 		searchprop.config = image_props->config;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			gf_list_add(ipco->other_boxes, gf_isom_clone_config_box(image_props->config));
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			gf_list_add(ipco->child_boxes, gf_isom_clone_config_box(image_props->config));
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
 		searchprop.config = NULL;
 	}
 	if (image_props->alpha) {
 		searchprop.alpha = image_props->alpha;
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_AuxiliaryTypePropertyBox *auxC = (GF_AuxiliaryTypePropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AUXC);
+			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:alpha");
-			gf_list_add(ipco->other_boxes, auxC);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		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) {
@@ -866,16 +863,19 @@
 		memcpy(searchprop.bits_per_channel, image_props->bits_per_channel, 3);
 		prop_index = meta_find_prop(ipco, &searchprop);
 		if (prop_index < 0) {
-			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PIXI);
+			GF_PixelInformationPropertyBox *pixi = (GF_PixelInformationPropertyBox *)gf_isom_box_new_parent(&ipco->child_boxes, GF_ISOM_BOX_TYPE_PIXI);
+			if (!pixi) return GF_OUT_OF_MEM;
 			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);
-			gf_list_add(ipco->other_boxes, pixi);
-			prop_index = gf_list_count(ipco->other_boxes) - 1;
+			prop_index = gf_list_count(ipco->child_boxes) - 1;
 		}
-		meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		e = meta_add_item_property_association(ipma, item_ID, prop_index + 1, GF_TRUE);
+		if (e) return e;
 		searchprop.num_channels = 0;
 	}
+	return GF_OK;
 }
 
 GF_EXPORT
@@ -941,16 +941,24 @@
 	if (meta->item_infos) {
 		u32 item_count = gf_list_count(meta->item_infos->item_infos);
 		for (i = 0; i < item_count; i++) {
-			GF_ItemInfoEntryBox *e= (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, i);
-			if (e->item_ID > lastItemID) lastItemID = e->item_ID;
-			if (item_id == e->item_ID) {
+			GF_ItemInfoEntryBox *iinf_e= (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, i);
+			if (iinf_e->item_ID > lastItemID) lastItemID = iinf_e->item_ID;
+			if (item_id == iinf_e->item_ID) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IsoMedia] Item with id %d already exists, ignoring id\n", item_id));
 				item_id = 0;
 			}
 		}
+	} else {
+		meta->item_infos = (GF_ItemInfoBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_IINF);
 	}
 
-	infe = (GF_ItemInfoEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_INFE);
+	/*Creation an ItemLocation Box if it does not exist*/
+	if (!meta->item_locations)
+		meta->item_locations = (GF_ItemLocationBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_ILOC);
+
+	infe = (GF_ItemInfoEntryBox *)gf_isom_box_new_parent(&meta->item_infos->child_boxes, GF_ISOM_BOX_TYPE_INFE);
+	if (!infe) return GF_OUT_OF_MEM;
+
 	if (item_id) {
 		infe->item_ID = item_id;
 	} else {
@@ -976,7 +984,7 @@
 	/*Creation of the ItemLocation */
 	location_entry = (GF_ItemLocationEntry*)gf_malloc(sizeof(GF_ItemLocationEntry));
 	if (!location_entry) {
-		gf_isom_box_del((GF_Box *)infe);
+		gf_isom_box_del_parent(&meta->item_infos->child_boxes, (GF_Box *)infe);
 		return GF_OUT_OF_MEM;
 	}
 	memset(location_entry, 0, sizeof(GF_ItemLocationEntry));
@@ -985,15 +993,13 @@
 	/*Creates an mdat if it does not exist*/
 	if (!file->mdat) {
 		file->mdat = (GF_MediaDataBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_MDAT);
+		if (!file->mdat) return GF_OUT_OF_MEM;
 		gf_list_add(file->TopBoxes, file->mdat);
 	}
 
-	/*Creation an ItemLocation Box if it does not exist*/
-	if (!meta->item_locations) meta->item_locations = (GF_ItemLocationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_ILOC);
 	gf_list_add(meta->item_locations->location_entries, location_entry);
 	location_entry->item_ID = infe->item_ID;
 
-	if (!meta->item_infos) meta->item_infos = (GF_ItemInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IINF);
 	e = gf_list_add(meta->item_infos->item_infos, infe);
 	if (e) return e;
 
@@ -1001,7 +1007,8 @@
 		if (image_props->hidden) {
 			infe->flags = 0x1;
 		}
-		meta_process_image_properties(meta, infe->item_ID, image_props);
+		e = meta_process_image_properties(meta, infe->item_ID, image_props);
+		if (e) return e;
 	}
 
 	/*0: the current file*/
@@ -1009,6 +1016,7 @@
 	if (self_reference) {
 		GF_ItemExtentEntry *entry;
 		GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+		if (!entry) return GF_OUT_OF_MEM;
 		gf_list_add(location_entry->extent_entries, entry);
 		if (!infe->item_name) infe->item_name = gf_strdup("");
 		return GF_OK;
@@ -1017,8 +1025,15 @@
 	/*file not copied, just referenced*/
 	if (URL || URN) {
 		u32 dataRefIndex;
-		if (!meta->file_locations) meta->file_locations = (GF_DataInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DINF);
-		if (!meta->file_locations->dref) meta->file_locations->dref = (GF_DataReferenceBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DREF);
+		if (!meta->file_locations) {
+			meta->file_locations = (GF_DataInformationBox *) gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_DINF);
+			if (!meta->file_locations) return GF_OUT_OF_MEM;
+		}
+		if (!meta->file_locations->dref) {
+			meta->file_locations->dref = (GF_DataReferenceBox *) gf_isom_box_new_parent(&meta->file_locations->child_boxes, GF_ISOM_BOX_TYPE_DREF);
+			if (!meta->file_locations->dref) return GF_OUT_OF_MEM;
+		}
+
 		e = Media_FindDataRef(meta->file_locations->dref, (char *) URL, (char *) URN, &dataRefIndex);
 		if (e) return e;
 		if (!dataRefIndex) {
@@ -1037,6 +1052,7 @@
 			u32 *item_index;
 			GF_ItemExtentEntry *entry;
 			GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+			if (!entry) return GF_OUT_OF_MEM;
 			gf_list_add(location_entry->extent_entries, entry);
 			item_index = (u32 *)gf_list_get(item_extent_refs, i);
 			gf_isom_meta_add_item_ref(file, root_meta, track_num, infe->item_ID, *item_index, GF_ISOM_REF_ILOC, &(entry->extent_index));
@@ -1048,6 +1064,7 @@
 			FILE *src;
 			GF_ItemExtentEntry *entry;
 			GF_SAFEALLOC(entry, GF_ItemExtentEntry);
+			if (!entry) return GF_OUT_OF_MEM;
 
 			location_entry->base_offset = gf_bs_get_position(file->editFileMap->bs);
 
@@ -1070,14 +1087,12 @@
 				if (src) {
 					char cache_data[4096];
 					u64 remain;
-					gf_fseek(src, 0, SEEK_END);
-					entry->extent_length = gf_ftell(src);
-					gf_fseek(src, 0, SEEK_SET);
+					entry->extent_length = gf_fsize(src);
 
 					remain = entry->extent_length;
 					while (remain) {
 						u32 size_cache = (remain > 4096) ? 4096 : (u32)remain;
-						size_t read = fread(cache_data, 1, size_cache, src);
+						size_t read = gf_fread(cache_data, size_cache, src);
 						if (read == (size_t)-1) break;
 						gf_bs_write_data(file->editFileMap->bs, cache_data, (u32)read);
 						remain -= (u32)read;
@@ -1094,6 +1109,8 @@
 		else if (!location_entry->data_reference_index) {
 			if (data) {
 				infe->full_path = (char *)gf_malloc(sizeof(char) * data_len);
+				if (!infe->full_path) return GF_OUT_OF_MEM;
+				
 				memcpy(infe->full_path, data, sizeof(char) * data_len);
 				infe->data_len = data_len;
 			}
@@ -1146,7 +1163,7 @@
 			break;
 		}
 	}
-	gf_isom_box_del((GF_Box *)iinf);
+	gf_isom_box_del_parent(&meta->item_infos->child_boxes, (GF_Box *)iinf);
 	return GF_OK;
 }
 
@@ -1158,8 +1175,9 @@
 	/*either one or the other*/
 	if (gf_isom_has_meta_xml(file, root_meta, track_num)) return GF_BAD_PARAM;
 
-	if (meta->primary_resource) gf_isom_box_del((GF_Box*)meta->primary_resource);
-	meta->primary_resource = (GF_PrimaryItemBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_PITM);
+	if (meta->primary_resource) gf_isom_box_del_parent(&meta->child_boxes, (GF_Box*)meta->primary_resource);
+	meta->primary_resource = (GF_PrimaryItemBox*) gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_PITM);
+	if (!meta->primary_resource) return GF_OUT_OF_MEM;
 	meta->primary_resource->item_ID = item_id;
 	return GF_OK;
 }
@@ -1176,7 +1194,8 @@
 	GF_MetaBox *meta = gf_isom_get_meta(file, root_meta, track_num);
 	if (!meta) return GF_BAD_PARAM;
 	if (!meta->item_refs) {
-		meta->item_refs = (GF_ItemReferenceBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_IREF);
+		meta->item_refs = (GF_ItemReferenceBox *)gf_isom_box_new_parent(&meta->child_boxes, GF_ISOM_BOX_TYPE_IREF);
+		if (!meta->item_refs) return GF_OUT_OF_MEM;
 	}
 	count = gf_list_count(meta->item_refs->references);
 	for (i = 0; i < count; i++) {
@@ -1187,7 +1206,8 @@
 		}
 	}
 	if (index < 0) {
-		ref = (GF_ItemReferenceTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_REFI);
+		ref = (GF_ItemReferenceTypeBox *)gf_isom_box_new_parent(&meta->item_refs->child_boxes, GF_ISOM_BOX_TYPE_REFI);
+		if (!ref) return GF_OUT_OF_MEM;
 		gf_list_add(meta->item_refs->references, ref);
 		ref->reference_type = type;
 		ref->from_item_id = from_id;

gpac-0.8.0.tar.gz/src/isomedia/movie_fragments.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,7 +29,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 
-GF_TrackExtendsBox *GetTrex(GF_MovieBox *moov, u32 TrackID)
+GF_TrackExtendsBox *GetTrex(GF_MovieBox *moov, GF_ISOTrackID TrackID)
 {
 	u32 i;
 	GF_TrackExtendsBox *trex;
@@ -40,7 +40,7 @@
 	return NULL;
 }
 
-GF_TrackExtensionPropertiesBox *GetTrep(GF_MovieBox *moov, u32 TrackID)
+GF_TrackExtensionPropertiesBox *GetTrep(GF_MovieBox *moov, GF_ISOTrackID TrackID)
 {
 	u32 i;
 	GF_TrackExtensionPropertiesBox *trep;
@@ -51,15 +51,14 @@
 	return NULL;
 }
 
-GF_TrackFragmentBox *GetTraf(GF_ISOFile *mov, u32 TrackID)
+GF_TrackFragmentBox *gf_isom_get_traf(GF_ISOFile *mov, GF_ISOTrackID TrackID)
 {
 	u32 i;
-	GF_TrackFragmentBox *traf;
 	if (!mov->moof) return NULL;
 
 	//reverse browse the TRAFs, as there may be more than one per track ...
 	for (i=gf_list_count(mov->moof->TrackList); i>0; i--) {
-		traf = (GF_TrackFragmentBox *)gf_list_get(mov->moof->TrackList, i-1);
+		GF_TrackFragmentBox *traf = (GF_TrackFragmentBox *)gf_list_get(mov->moof->TrackList, i-1);
 		if (traf->tfhd->trackID == TrackID) return traf;
 	}
 	return NULL;
@@ -71,7 +70,8 @@
 {
 	if (!movie->moov->mvex) return GF_BAD_PARAM;
 	if (!movie->moov->mvex->mehd) {
-		movie->moov->mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_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->mvhd->duration = 0;
@@ -80,7 +80,7 @@
 
 
 GF_EXPORT
-GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *movie, u32 media_segment_type)
+GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *movie, u32 media_segment_type, Bool mvex_after_tracks)
 {
 	GF_Err e;
 	u32 i;
@@ -88,15 +88,19 @@
 	GF_TrackExtendsBox *trex;
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
 
+#if 0
 	if (movie->openMode==GF_ISOM_OPEN_CAT_FRAGMENTS) {
 		/*from now on we are in write mode*/
 		movie->openMode = GF_ISOM_OPEN_WRITE;
 		store_file = GF_FALSE;
 		movie->append_segment = GF_TRUE;
-	} else {
+	} else
+#endif
+	{
 		movie->NextMoofNumber = 1;
 	}
-
+	movie->moov->mvex_after_traks = mvex_after_tracks;
+	
 	//this is only allowed in write mode
 	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_ISOM_INVALID_MODE;
 
@@ -104,9 +108,9 @@
 	movie->FragmentsFlags = 0;
 
 	if (store_file) {
-		/*"dash" brand: this is a DASH Initialization Segment*/
+		/* add DASH brand if requested*/
 		if (media_segment_type)
-			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_DASH, 1);
+			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_DASH, GF_TRUE);
 
 		if (!movie->moov->mvex->mehd || !movie->moov->mvex->mehd->fragment_duration) {
 			//update durations
@@ -121,13 +125,14 @@
 				trep = GetTrep(movie->moov, trex->trackID);
 
 				if (!trep) {
-					trep = (GF_TrackExtensionPropertiesBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREP);
+					trep = (GF_TrackExtensionPropertiesBox*) gf_isom_box_new_parent(&movie->moov->mvex->child_boxes, GF_ISOM_BOX_TYPE_TREP);
+					if (!trep) return GF_OUT_OF_MEM;
 					trep->trackID = trex->trackID;
 					gf_list_add(movie->moov->mvex->TrackExPropList, trep);
 				}
 
 				if (!trex->track->Media->information->sampleTable->SampleSize || ! trex->track->Media->information->sampleTable->SampleSize->sampleCount) {
-					gf_list_add(trep->other_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
+					gf_list_add(trep->child_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
 					trex->track->Media->information->sampleTable->CompositionToDecode = NULL;
 				} else {
 					GF_CompositionToDecodeBox *cslg;
@@ -136,8 +141,8 @@
 					GF_SAFEALLOC(cslg, GF_CompositionToDecodeBox);
 					if (!cslg) return GF_OUT_OF_MEM;
 					memcpy(cslg, trex->track->Media->information->sampleTable->CompositionToDecode, sizeof(GF_CompositionToDecodeBox) );
-					cslg->other_boxes = gf_list_new();
-					gf_list_add(trep->other_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
+					cslg->child_boxes = gf_list_new();
+					gf_list_add(trep->child_boxes, trex->track->Media->information->sampleTable->CompositionToDecode);
 				}
 			}
 
@@ -152,8 +157,13 @@
 		}
 
 		//write movie
-		e = WriteToFile(movie);
+		e = WriteToFile(movie, GF_TRUE);
 		if (e) return e;
+
+		if (movie->on_block_out) {
+			gf_bs_seek(movie->editFileMap->bs, 0);
+			gf_bs_truncate(movie->editFileMap->bs);
+		}
 	}
 
 	//make sure we do have all we need. If not this is not an error, just consider
@@ -166,7 +176,7 @@
 		//we could also check all our data refs are local but we'll do that at run time
 		//in order to allow a mix of both (remote refs in MOOV and local in MVEX)
 
-		//one thing that MUST be done is OD cross-dependancies. The movie fragment spec
+		//one thing that MUST be done is OD cross-dependencies. The movie fragment spec
 		//is broken here, since it cannot allow dynamic insertion of new ESD and their
 		//dependancies
 	}
@@ -177,6 +187,8 @@
 	if (media_segment_type) {
 		movie->use_segments = GF_TRUE;
 		movie->moof_list = gf_list_new();
+	} else if (movie->on_block_out) {
+		movie->moof_list = gf_list_new();
 	}
 
 	/*set brands for segment*/
@@ -195,7 +207,7 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, u32 TrackID,
+GF_Err gf_isom_change_track_fragment_defaults(GF_ISOFile *movie, GF_ISOTrackID TrackID,
         u32 DefaultSampleDescriptionIndex,
         u32 DefaultSampleDuration,
         u32 DefaultSampleSize,
@@ -241,14 +253,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *movie, u32 TrackID,
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *movie, GF_ISOTrackID TrackID,
                                     u32 DefaultSampleDescriptionIndex,
                                     u32 DefaultSampleDuration,
                                     u32 DefaultSampleSize,
                                     u8 DefaultSampleIsSync,
                                     u8 DefaultSamplePadding,
                                     u16 DefaultDegradationPriority,
-                                    u8 force_traf_flags)
+                                    Bool force_traf_flags)
 {
 	GF_MovieExtendsBox *mvex;
 	GF_TrackExtendsBox *trex;
@@ -266,34 +278,109 @@
 
 	//create MVEX if needed
 	if (!movie->moov->mvex) {
-		mvex = (GF_MovieExtendsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MVEX);
-		moov_AddBox((GF_Box*)movie->moov, (GF_Box *) 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);
 	} else {
 		mvex = movie->moov->mvex;
 	}
 	if (!mvex->mehd) {
-		mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MEHD);
+		mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new_parent(&mvex->child_boxes, GF_ISOM_BOX_TYPE_MEHD);
+		if (!mvex->mehd) return GF_OUT_OF_MEM;
 	}
 
 	trex = GetTrex(movie->moov, TrackID);
 	if (!trex) {
-		trex = (GF_TrackExtendsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TREX);
+		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_AddBox((GF_Box*)mvex, (GF_Box *) trex);
+		mvex_on_child_box((GF_Box*)mvex, (GF_Box *) trex);
 	}
 	trex->track = trak;
 	return gf_isom_change_track_fragment_defaults(movie, TrackID, DefaultSampleDescriptionIndex, DefaultSampleDuration, DefaultSampleSize, DefaultSampleIsSync, DefaultSamplePadding, DefaultDegradationPriority, force_traf_flags);
 }
 
+GF_EXPORT
+GF_Err gf_isom_enable_traf_inherit(GF_ISOFile *movie, GF_ISOTrackID TrackID, GF_ISOTrackID BaseTrackID)
+{
+	GF_TrackBox *trak;
+	GF_TrackExtendsBox *trex;
+	GF_Err e=GF_OK;
+	u32 track_num;
+	if (!movie || !TrackID || !BaseTrackID)
+		return GF_BAD_PARAM;
+	trak = gf_isom_get_track_from_id(movie->moov, TrackID);
+	if (!trak) return GF_BAD_PARAM;
+	track_num = 1 + gf_list_find(movie->moov->trackList, trak);
+
+	e = gf_isom_set_track_reference(movie, track_num, GF_ISOM_REF_TRIN, BaseTrackID);
+	if (e) return e;
+
+	trex = GetTrex(movie->moov, TrackID);
+	if (!trex) return GF_BAD_PARAM;
+	trex->inherit_from_traf_id = BaseTrackID;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_setup_track_fragment_template(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *boxes, u32 boxes_size, u8 force_traf_flags)
+{
+	GF_MovieExtendsBox *mvex;
+	GF_TrackBox *trak;
+	GF_BitStream *bs;
+	GF_Err e=GF_OK;
+	trak = gf_isom_get_track_from_id(movie->moov, TrackID);
+	if (!trak) return GF_BAD_PARAM;
+
+	bs = gf_bs_new(boxes, boxes_size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Box *box=NULL;
+		gf_isom_box_parse(&box, bs);
+		if (!box) {
+			e = GF_BAD_PARAM;
+			break;
+		}
+
+		if (box->type==GF_ISOM_BOX_TYPE_TREX) {
+			GF_TrackExtendsBox *trex_o=NULL;
+			GF_TrackExtendsBox *trex = (GF_TrackExtendsBox *) box;
+
+			//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);
+			} else {
+				mvex = movie->moov->mvex;
+			}
+			if (!mvex->mehd) {
+				mvex->mehd = (GF_MovieExtendsHeaderBox *) gf_isom_box_new_parent(&mvex->child_boxes, GF_ISOM_BOX_TYPE_MEHD);
+			}
+
+			trex_o = GetTrex(movie->moov, TrackID);
+			if (trex_o) {
+				gf_list_del_item(movie->moov->mvex->TrackExList, trex_o);
+				gf_isom_box_del_parent(&movie->moov->mvex->child_boxes, (GF_Box *)trex_o);
+			}
+			trex->trackID = TrackID;
+			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);
+		}
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
 
 u32 GetNumUsedValues(GF_TrackFragmentBox *traf, u32 value, u32 index)
 {
 	u32 i, j, NumValue = 0;
 	GF_TrackFragmentRunBox *trun;
-	GF_TrunEntry *ent;
 
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
+		GF_TrunEntry *ent;
 		j=0;
 		while ((ent = (GF_TrunEntry *)gf_list_enum(trun->entries, &j))) {
 			switch (index) {
@@ -388,29 +475,53 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_fragment_option(GF_ISOFile *movie, u32 TrackID, u32 Code, u32 Param)
+GF_Err gf_isom_set_fragment_option(GF_ISOFile *movie, GF_ISOTrackID TrackID, GF_ISOTrackFragmentOption Code, u32 Param)
 {
 	GF_TrackFragmentBox *traf;
 	if (!movie || !movie->moov) return GF_BAD_PARAM;
 	//this is only allowed in write mode
 	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_ISOM_INVALID_MODE;
 
-	traf = GetTraf(movie, TrackID);
-	if (!traf) return GF_BAD_PARAM;
 	switch (Code) {
 	case GF_ISOM_TRAF_EMPTY:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
 		traf->tfhd->EmptyDuration = Param;
 		break;
 	case GF_ISOM_TRAF_RANDOM_ACCESS:
-		traf->tfhd->IFrameSwitching = Param;
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->IFrameSwitching = Param;
 		break;
 	case GF_ISOM_TRAF_DATA_CACHE:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
 		//don't cache only one sample ...
 		traf->DataCache = Param > 1 ? Param : 0;
 		break;
 	case GF_ISOM_TFHD_FORCE_MOOF_BASE_OFFSET:
 		movie->force_moof_base_offset = Param;
 		break;
+	case GF_ISOM_TRAF_USE_SAMPLE_DEPS_BOX:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->use_sdtp = (u8) Param;
+		break;
+	case GF_ISOM_TRUN_FORCE:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->force_new_trun = 1;
+		break;
+	case GF_ISOM_TRUN_SET_INTERLEAVE_ID:
+		traf = gf_isom_get_traf(movie, TrackID);
+		if (!traf) return GF_BAD_PARAM;
+		traf->DataCache = 1;
+		traf->use_sample_interleave = 1;
+		if (traf->interleave_id != Param) {
+			traf->force_new_trun = 1;
+			traf->interleave_id = Param;
+		}
+		break;
 	}
 	return GF_OK;
 }
@@ -420,16 +531,16 @@
 void update_trun_offsets(GF_ISOFile *movie, s32 offset)
 {
 #ifndef USE_BASE_DATA_OFFSET
-	GF_TrackFragmentRunBox *trun;
 	u32 i, j;
 	GF_TrackFragmentBox *traf;
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
+		GF_TrackFragmentRunBox *trun;
 		/*remove base data*/
 		traf->tfhd->base_data_offset = 0;
 		j=0;
 		while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &j))) {
-			if (j==1) {
+			if ((j==1) || traf->use_sample_interleave) {
 				trun->data_offset += offset;
 			} else {
 				trun->data_offset = 0;
@@ -449,7 +560,7 @@
 	   2 - use default values from track extends header */
 	u32 UseDefaultSize, UseDefaultDur, UseDefaultFlag;
 	GF_TrackFragmentRunBox *trun;
-	GF_TrunEntry *ent, *first_ent;
+	GF_TrunEntry *ent;
 
 	sampleCount = 0;
 
@@ -471,7 +582,7 @@
 		while (gf_list_count(traf->TrackRuns)) {
 			trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 0);
 			gf_list_rem(traf->TrackRuns, 0);
-			gf_isom_box_del((GF_Box *)trun);
+			gf_isom_box_del_parent(&traf->child_boxes, (GF_Box *)trun);
 		}
 		traf->tfhd->flags |= GF_ISOM_TRAF_DUR_EMPTY;
 		if (traf->tfhd->EmptyDuration != traf->trex->def_sample_duration) {
@@ -488,13 +599,13 @@
 
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox *)gf_list_enum(traf->TrackRuns, &i))) {
+		GF_TrunEntry *first_ent = NULL;
 		RunSize = 0;
 		RunDur = 0;
 		RunFlags = 0;
 		UseCTS = 0;
 		NeedFlags = 0;
 
-		first_ent = NULL;
 		//process all samples in run
 		count = gf_list_count(trun->entries);
 		for (j=0; j<count; j++) {
@@ -600,7 +711,8 @@
 
 		//run data offset if the offset indicated is 0 (first sample in this MDAT) don't
 		//indicate it
-		if (trun->data_offset) trun->flags |= GF_ISOM_TRUN_DATA_OFFSET;
+		if (trun->data_offset)
+			trun->flags |= GF_ISOM_TRUN_DATA_OFFSET;
 
 		sampleCount += trun->sample_count;
 	}
@@ -619,7 +731,7 @@
 	return sampleCount;
 }
 
-static u32 moof_get_sap_info(GF_MovieFragmentBox *moof, u32 refTrackID, u32 *sap_delta, Bool *starts_with_sap)
+static u32 moof_get_sap_info(GF_MovieFragmentBox *moof, GF_ISOTrackID refTrackID, u32 *sap_delta, Bool *starts_with_sap)
 {
 	u32 i, j, count, delta, earliest_cts, sap_type, sap_sample_num, cur_sample;
 	Bool first = GF_TRUE;
@@ -644,7 +756,7 @@
 	count = traf->sampleGroups ? gf_list_count(traf->sampleGroups) : 0;
 	for (i=0; i<count; i++) {
 		GF_SampleGroupBox *sg;
-		u32 j, first_sample;
+		u32 first_sample;
 		Bool rap_type = GF_FALSE;
 		sg = (GF_SampleGroupBox*)gf_list_get(traf->sampleGroups, i);
 
@@ -716,10 +828,9 @@
 	return 0;
 }
 
-u32 moof_get_duration(GF_MovieFragmentBox *moof, u32 refTrackID)
+u32 moof_get_duration(GF_MovieFragmentBox *moof, GF_ISOTrackID refTrackID)
 {
 	u32 i, j, duration;
-	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf = NULL;
 	GF_TrackFragmentRunBox *trun;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
@@ -732,6 +843,7 @@
 	duration = 0;
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
+		GF_TrunEntry *ent;
 		j=0;
 		while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
 			if (ent->flags & GF_ISOM_TRAF_SAMPLE_DUR)
@@ -743,11 +855,10 @@
 	return duration;
 }
 
-static u64 moof_get_earliest_cts(GF_MovieFragmentBox *moof, u32 refTrackID)
+static u64 moof_get_earliest_cts(GF_MovieFragmentBox *moof, GF_ISOTrackID refTrackID)
 {
 	u32 i, j;
 	u64 cts, duration;
-	GF_TrunEntry *ent;
 	GF_TrackFragmentBox *traf=NULL;
 	GF_TrackFragmentRunBox *trun;
 	for (i=0; i<gf_list_count(moof->TrackList); i++) {
@@ -758,9 +869,10 @@
 	if (!traf) return 0;
 
 	duration = 0;
-	cts = LLU_CAST (-1);
+	cts = (u64) -1;
 	i=0;
 	while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
+		GF_TrunEntry *ent;
 		j=0;
 		while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
 			if (duration + ent->CTS_Offset < cts)
@@ -771,16 +883,19 @@
 	return cts;
 }
 
-GF_Err StoreFragment(GF_ISOFile *movie, Bool load_mdat_only, s32 data_offset_diff, u32 *moof_size)
+
+GF_Err gf_isom_write_compressed_box(GF_ISOFile *mov, GF_Box *root_box, u32 repl_type, GF_BitStream *bs, u32 *box_csize);
+
+static GF_Err StoreFragment(GF_ISOFile *movie, Bool load_mdat_only, s32 data_offset_diff, u32 *moof_size, Bool reassign_bs)
 {
 	GF_Err e;
 	u64 moof_start, pos;
 	u32 size, i, s_count, mdat_size;
 	s32 offset;
-	char *buffer;
+	u8 *buffer;
 	GF_TrackFragmentBox *traf;
 	GF_TrackFragmentRunBox *trun;
-	GF_BitStream *bs;
+	GF_BitStream *bs, *bs_orig;
 	if (!movie->moof) return GF_OK;
 
 	bs = movie->editFileMap->bs;
@@ -789,25 +904,115 @@
 	//1 - flush all caches
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
+		u32 j, nb_written, last_gid, cur_sample_idx;
+		/*do not write empty senc*/
+		if (traf->sample_encryption && !gf_list_count(traf->sample_encryption->samp_aux_info)) {
+			gf_list_del_item(traf->child_boxes, traf->sample_encryption);
+			gf_isom_box_del((GF_Box *) traf->sample_encryption);
+			traf->sample_encryption = NULL;
+			/*remove saiz and saio (todo, check if other saiz/saio types are used*/
+			for (j=0; j<gf_list_count(traf->sai_sizes); j++) {
+				GF_SampleAuxiliaryInfoSizeBox *saiz = gf_list_get(traf->sai_sizes, j);
+				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 0:
+					gf_list_rem(traf->sai_sizes, j);
+					gf_list_del_item(traf->child_boxes, saiz);
+					gf_isom_box_del((GF_Box *)saiz);
+					j--;
+					break;
+				}
+			}
+			for (j=0; j<gf_list_count(traf->sai_offsets); j++) {
+				GF_SampleAuxiliaryInfoOffsetBox *saio = gf_list_get(traf->sai_offsets, j);
+				switch (saio->aux_info_type) {
+				case GF_ISOM_CENC_SCHEME:
+				case GF_ISOM_CBC_SCHEME:
+				case GF_ISOM_CENS_SCHEME:
+				case GF_ISOM_CBCS_SCHEME:
+				case 0:
+					gf_list_rem(traf->sai_offsets, j);
+					gf_list_del_item(traf->child_boxes, saio);
+					gf_isom_box_del((GF_Box *)saio);
+					j--;
+					break;
+				}
+			}
+		}
 		if (!traf->DataCache) continue;
 		s_count = gf_list_count(traf->TrackRuns);
 		if (!s_count) continue;
-		trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, s_count-1);
-		if (!trun->cache || !trun->sample_count) continue;
 
-		//update offset
-		trun->data_offset = (u32) (gf_bs_get_position(bs) - movie->moof->fragment_offset - 8);
-		//write cache
-		gf_bs_get_content(trun->cache, &buffer, &size);
-		gf_bs_write_data(bs, buffer, size);
-		gf_bs_del(trun->cache);
-		gf_free(buffer);
-		trun->cache = NULL;
+		//store all cached truns - there may be more than one when using sample interleaving in truns
+		nb_written = 0;
+		last_gid = 0;
+		cur_sample_idx = 0;
+		while (nb_written<s_count) {
+			u32 min_next_gid = 0xFFFFFFFF;
+
+			for (j=0; j<s_count; j++) {
+				trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, j);
+				//done
+				if (!trun->cache || !trun->sample_count) continue;
+
+				if (!traf->use_sample_interleave || (last_gid!=trun->interleave_id)) {
+					if (trun->interleave_id < min_next_gid)
+						min_next_gid = trun->interleave_id;
+					continue;
+				}
+
+				//update offset
+				trun->data_offset = (u32) (gf_bs_get_position(bs) - movie->moof->fragment_offset - 8);
+				//write cache
+				gf_bs_get_content(trun->cache, &buffer, &size);
+				gf_bs_write_data(bs, buffer, size);
+				gf_bs_del(trun->cache);
+				gf_free(buffer);
+				trun->cache = NULL;
+				trun->first_sample_idx = cur_sample_idx;
+				cur_sample_idx += trun->sample_count;
+
+				nb_written++;
+			}
+			last_gid = min_next_gid;
+		}
+
 		traf->DataCache=0;
+
+		/*merge all truns*/
+		if (traf->merge_sample_interleave) {
+			u32 k, cur_idx = 0;
+			trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 0);
+			trun->sample_order = gf_malloc(sizeof(u32) * cur_sample_idx);
+
+			for (k=0; k<trun->sample_count; k++) {
+				trun->sample_order[cur_idx] = trun->first_sample_idx + k;
+				cur_idx ++;
+			}
+
+			while (s_count>1) {
+				GF_TrackFragmentRunBox *atrun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, 1);
+				trun->sample_count += atrun->sample_count;
+				gf_list_transfer(trun->entries, atrun->entries);
+
+				for (k=0; k<atrun->sample_count; k++) {
+					trun->sample_order[cur_idx] = atrun->first_sample_idx + k;
+					cur_idx ++;
+				}
+				gf_list_rem(traf->TrackRuns, 1);
+				gf_list_del_item(traf->child_boxes, atrun);
+				gf_isom_box_del((GF_Box*)atrun);
+				s_count--;
+			}
+
+		}
 	}
 
 	if (load_mdat_only) {
-		u64 pos = gf_bs_get_position(bs);
+		pos = gf_bs_get_position(bs);
 		if (movie->moof->fragment_offset > pos)
 			return GF_CORRUPTED_DATA;
 
@@ -827,8 +1032,8 @@
 			gf_bs_del(bs);
 			movie->editFileMap->bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		} else {
-			u64 offset = movie->segment_start;
-			e = gf_bs_seek(bs, offset);
+			u64 frag_offset = movie->segment_start;
+			e = gf_bs_seek(bs, frag_offset);
 			if (e) return e;
 			/*write mdat size*/
 			gf_bs_write_u32(bs, (u32) movie->moof->mdat_size);
@@ -836,11 +1041,11 @@
 			movie->moof->mdat = (char*)gf_malloc(sizeof(char) * movie->moof->mdat_size);
 			if (!movie->moof->mdat) return GF_OUT_OF_MEM;
 
-			e = gf_bs_seek(bs, offset);
+			e = gf_bs_seek(bs, frag_offset);
 			if (e) return e;
 			gf_bs_read_data(bs, movie->moof->mdat, movie->moof->mdat_size);
 
-			e = gf_bs_seek(bs, offset);
+			e = gf_bs_seek(bs, frag_offset);
 			if (e) return e;
 			gf_bs_truncate(bs);
 		}
@@ -890,7 +1095,7 @@
 		if (!traf->tfhd->EmptyDuration && !s_count) {
 			i--;
 			gf_list_rem(movie->moof->TrackList, i);
-			gf_isom_box_del((GF_Box *) traf);
+			gf_isom_box_del_parent(&movie->moof->child_boxes, (GF_Box *) traf);
 			continue;
 		}
 	}
@@ -899,6 +1104,7 @@
 	/*rewind bitstream and load mdat in memory */
 	if (movie->moof_first && !movie->moof->mdat) {
 		buffer = (char*)gf_malloc(sizeof(char)*mdat_size);
+		if (!buffer) return GF_OUT_OF_MEM;
 		e = gf_bs_seek(bs, movie->moof->fragment_offset);
 		if (e) return e;
 		gf_bs_read_data(bs, buffer, mdat_size);
@@ -923,6 +1129,9 @@
 			/*offset increases by moof size*/
 			traf->tfhd->base_data_offset += movie->moof->size;
 			traf->tfhd->base_data_offset += data_offset_diff;
+			if (movie->on_block_out) {
+				traf->tfhd->base_data_offset += movie->fragmented_file_pos;
+			}
 		}
 	}
 #ifndef USE_BASE_DATA_OFFSET
@@ -936,6 +1145,10 @@
 	}
 #endif
 
+	bs_orig = bs;
+	if (reassign_bs && movie->on_block_out) {
+		bs = gf_bs_new_cbk(movie->on_block_out, movie->on_block_out_usr_data, movie->on_block_out_block_size);
+	}
 
 	if (movie->moof->ntp) {
 		gf_bs_write_u32(bs, 8*4);
@@ -947,13 +1160,28 @@
 		gf_bs_write_u64(bs, movie->moof->timestamp);
 	}
 
+	if (moof_size) *moof_size = (u32) movie->moof->size;
+
 	pos = gf_bs_get_position(bs);
+
 	i=0;
 	while ((traf = (GF_TrackFragmentBox*)gf_list_enum(movie->moof->TrackList, &i))) {
 		traf->moof_start_in_bs = pos;
 	}
 
-	e = gf_isom_box_write((GF_Box *) movie->moof, bs);
+	/*we don't want to dispatch any block until done writing the moof*/
+	if (movie->on_block_out)
+		gf_bs_prevent_dispatch(bs, GF_TRUE);
+
+	if (movie->compress_mode>GF_ISO_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);
+	}
+
+	if (movie->on_block_out)
+		gf_bs_prevent_dispatch(bs, GF_FALSE);
+
 	if (e) return e;
 
 	//rewrite mdat after moof
@@ -966,7 +1194,17 @@
 		gf_free(buffer);
 	}
 
-	if (moof_size) *moof_size = (u32) movie->moof->size;
+	if (bs != bs_orig) {
+		u64 frag_size = gf_bs_get_position(bs);
+		gf_bs_del(bs);
+		movie->fragmented_file_pos += frag_size;
+		gf_bs_seek(bs_orig, 0);
+		gf_bs_truncate(bs_orig);
+	}
+	else if (movie->on_block_out) {
+		u64 frag_size = gf_bs_get_position(bs);
+		movie->fragmented_file_pos += frag_size;
+	}
 
 	if (!movie->use_segments) {
 		gf_isom_box_del((GF_Box *) movie->moof);
@@ -1008,27 +1246,41 @@
 	if (gf_list_count(movie->moof_list)) return GF_BAD_PARAM;
 
 	movie->root_sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
+	if (!movie->root_sidx) return GF_OUT_OF_MEM;
 	/*we don't write anything between sidx and following moov*/
 	movie->root_sidx->first_offset = 0;
 
 	/*for now we only store one ref per subsegment and don't support daisy-chaining*/
 	movie->root_sidx->nb_refs = nb_segs;
 
+	if (use_ssix) {
+		movie->root_ssix = (GF_SubsegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SSIX);
+		movie->root_ssix->subsegment_count = nb_segs;
+		movie->root_ssix->subsegment_alloc = movie->root_ssix->subsegment_count;
+	}
+
+	//dynamic mode
+	if (!nb_segs) {
+		movie->dyn_root_sidx = GF_TRUE;
+		return GF_OK;
+	}
+
 	movie->root_sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference) * movie->root_sidx->nb_refs);
+	if (!movie->root_sidx->refs) return GF_OUT_OF_MEM;
 	memset(movie->root_sidx->refs, 0, sizeof(GF_SIDXReference) * movie->root_sidx->nb_refs);
 
 	movie->root_sidx_index = 0;
 
 	if (use_ssix) {
-		movie->root_ssix = (GF_SubsegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SSIX);
 		movie->root_ssix->subsegments = gf_malloc(sizeof(GF_SubsegmentInfo) * nb_segs);
-		movie->root_ssix->subsegment_count = nb_segs;
+		if (!movie->root_ssix->subsegments) return GF_OUT_OF_MEM;
 		for (i=0; i<nb_segs; i++) {
 			movie->root_ssix->subsegments[i].range_count = 2;
 			movie->root_ssix->subsegments[i].ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
+			if (!movie->root_ssix->subsegments[i].ranges) return GF_OUT_OF_MEM;
 			movie->root_ssix->subsegments[i].ranges[0].level = 0;
 			movie->root_ssix->subsegments[i].ranges[0].range_size = 0;
-			movie->root_ssix->subsegments[i].ranges[1].level = 0xFF;
+			movie->root_ssix->subsegments[i].ranges[1].level = 1;
 			movie->root_ssix->subsegments[i].ranges[1].range_size = 0;
 		}
 	}
@@ -1049,6 +1301,7 @@
 		e = gf_isom_box_write((GF_Box *) movie->root_ssix, bs);
 		if (e) return e;
 	}
+
 	//include ssix in index range - spec is not clear whether this is forbidden
 	if (start_range) *start_range = (u32) movie->root_sidx_offset;
 	if (end_range) *end_range = (u32) gf_bs_get_position(bs)-1;
@@ -1059,17 +1312,17 @@
 
 static GF_Err gf_isom_write_styp(GF_ISOFile *movie, Bool last_segment)
 {
-	GF_Err e = GF_OK;
 	/*write STYP if we write to a different file or if we write the last segment*/
-	if (!movie->append_segment && !movie->segment_start && !movie->styp_written) {
+	if (movie->use_segments && !movie->append_segment && !movie->segment_start && !movie->styp_written) {
+		GF_Err e;
 
 		/*modify brands STYP*/
 
 		/*"msix" brand: this is a DASH Initialization Segment*/
-		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_MSIX, 1);
+		gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_MSIX, GF_TRUE);
 		if (last_segment) {
 			/*"lmsg" brand: this is the last DASH Segment*/
-			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_LMSG, 1);
+			gf_isom_modify_alternate_brand(movie, GF_ISOM_BRAND_LMSG, GF_TRUE);
 		}
 
 		movie->brand->type = GF_ISOM_BOX_TYPE_STYP;
@@ -1086,7 +1339,7 @@
 GF_EXPORT
 GF_Err gf_isom_flush_fragments(GF_ISOFile *movie, Bool last_segment)
 {
-	GF_BitStream *temp_bs = NULL;
+	GF_BitStream *temp_bs = NULL, *orig_bs;
 	GF_Err e;
 
 	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
@@ -1094,7 +1347,7 @@
 
 	/*flush our fragment (store in mem)*/
 	if (movie->moof) {
-		e = StoreFragment(movie, GF_TRUE, 0, NULL);
+		e = StoreFragment(movie, GF_TRUE, 0, NULL, GF_FALSE);
 		if (e) return e;
 	}
 
@@ -1105,10 +1358,15 @@
 
 	gf_bs_seek(movie->editFileMap->bs, movie->segment_start);
 	gf_bs_truncate(movie->editFileMap->bs);
+	orig_bs = movie->editFileMap->bs;
+	if (movie->on_block_out) {
+		if (!movie->block_buffer) movie->block_buffer_size = movie->on_block_out_block_size;
+		movie->editFileMap->bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+	}
 
 	/*write styp to file if needed*/
 	e = gf_isom_write_styp(movie, last_segment);
-	if (e) return e;
+	if (e) goto exit;
 
 	/*write all pending fragments to file*/
 	while (gf_list_count(movie->moof_list)) {
@@ -1121,8 +1379,8 @@
 		offset_diff = (s32) (gf_bs_get_position(movie->editFileMap->bs) - movie->moof->fragment_offset);
 		movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
 
-		e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size);
-		if (e) return e;
+		e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size, GF_FALSE);
+		if (e) goto exit;
 
 		gf_isom_box_del((GF_Box *) movie->moof);
 		movie->moof = NULL;
@@ -1151,7 +1409,17 @@
 		movie->segment_bs = movie->editFileMap->bs;
 		movie->editFileMap->bs = temp_bs;
 	}
-	return GF_OK;
+
+	if (orig_bs != movie->editFileMap->bs) {
+		u32 tmpsize;
+		gf_bs_get_content_no_truncate(movie->editFileMap->bs, &movie->block_buffer, &tmpsize, &movie->block_buffer_size);
+		gf_bs_del(movie->editFileMap->bs);
+		movie->editFileMap->bs = orig_bs;
+		//we are dispatching through callbacks, the movie segment start is always 0
+		movie->segment_start = 0;
+	}
+exit:
+	return e;
 }
 
 typedef struct
@@ -1180,12 +1448,12 @@
 
 static void compute_seg_size(GF_ISOFile *movie, u64 *out_seg_size)
 {
-	u64 final_size;
+	u64 final_size = 0;
 	if (out_seg_size) {
 		if (movie->append_segment) {
 			final_size = gf_bs_get_position(movie->movieFileMap->bs);
 			final_size -= movie->segment_start;
-		} else {
+		} else if (movie->editFileMap) {
 			final_size = gf_bs_get_position(movie->editFileMap->bs);
 		}
 		*out_seg_size = final_size;
@@ -1195,11 +1463,10 @@
 static u32 moof_get_first_sap_end(GF_MovieFragmentBox *moof)
 {
 	u32 i, count = gf_list_count(moof->TrackList);
-	u32 base_offset = 0;
 	for (i=0; i<count; i++) {
 		u32 j, nb_trun;
 		GF_TrackFragmentBox *traf = gf_list_get(moof->TrackList, i);
-		base_offset = (u32) traf->tfhd->base_data_offset;
+		u32 base_offset = (u32) traf->tfhd->base_data_offset;
 
 		nb_trun = gf_list_count(traf->TrackRuns);
 		for (j=0; j<nb_trun; j++) {
@@ -1218,19 +1485,128 @@
 	return 0;
 }
 
+static u64 estimate_next_moof_earliest_presentation_time(u64 ref_track_decode_time, s32 ts_shift, u32 refTrackID, GF_ISOFile *movie)
+{
+	u32 i, j, nb_aus, nb_ctso, nb_moof;
+	u64 duration;
+	GF_TrunEntry *ent;
+	GF_TrackFragmentBox *traf=NULL;
+	GF_TrackFragmentRunBox *trun;
+	u32 timescale;
+	u64 min_next_cts = -1;
+
+	GF_MovieFragmentBox *moof = gf_list_get(movie->moof_list, 0);
+
+	for (i=0; i<gf_list_count(moof->TrackList); i++) {
+		traf = (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, i);
+		if (traf->tfhd->trackID==refTrackID) break;
+		traf = NULL;
+	}
+	//no ref track, nothing to estimate
+	if (!traf) return -1;
+	timescale = traf->trex->track->Media->mediaHeader->timeScale;
+
+	nb_aus = 0;
+	duration = 0;
+	nb_ctso = 0;
+	nb_moof = 0;
+
+	while ((moof = (GF_MovieFragmentBox*)gf_list_enum(movie->moof_list, &nb_moof))) {
+
+		for (i=0; i<gf_list_count(moof->TrackList); i++) {
+			traf = (GF_TrackFragmentBox*)gf_list_get(moof->TrackList, i);
+			if (traf->tfhd->trackID==refTrackID) break;
+			traf = NULL;
+		}
+		if (!traf) continue;
+
+		i=0;
+		while ((trun = (GF_TrackFragmentRunBox*)gf_list_enum(traf->TrackRuns, &i))) {
+			j=0;
+			while ((ent = (GF_TrunEntry*)gf_list_enum(trun->entries, &j))) {
+				if (nb_aus + 1 + movie->sidx_pts_store_count > movie->sidx_pts_store_alloc) {
+					movie->sidx_pts_store_alloc = movie->sidx_pts_store_count+nb_aus+1;
+					movie->sidx_pts_store = gf_realloc(movie->sidx_pts_store, sizeof(u64) * movie->sidx_pts_store_alloc);
+					movie->sidx_pts_next_store = gf_realloc(movie->sidx_pts_next_store, sizeof(u64) * movie->sidx_pts_store_alloc);
+				}
+				//get PTS for this AU, push to regular list
+				movie->sidx_pts_store[movie->sidx_pts_store_count + nb_aus] = get_presentation_time( ref_track_decode_time + duration + ent->CTS_Offset, ts_shift);
+				//get PTS for this AU shifted by its presentation duration, push to shifted list
+				movie->sidx_pts_next_store[movie->sidx_pts_store_count + nb_aus] = get_presentation_time( ref_track_decode_time + duration + ent->CTS_Offset + ent->Duration, ts_shift);
+				duration += ent->Duration;
+				if (ent->CTS_Offset)
+					nb_ctso++;
+
+				nb_aus++;
+			}
+		}
+	}
+
+	movie->sidx_pts_store_count += nb_aus;
+
+	//no AUs, nothing to estimate
+	if (!nb_aus) {
+		movie->sidx_pts_store_count = 0;
+		return -1;
+	}
+	//no cts offset, assume earliest PTS in next segment is last PTS in this segment + duration
+	if (!nb_ctso) {
+		min_next_cts = movie->sidx_pts_next_store[movie->sidx_pts_store_count - 1];
+		movie->sidx_pts_store_count = 0;
+		return min_next_cts;
+	}
+
+	//look for all shifted PTS of this segment in the regular list. If found in the shifted list, the AU is in this segment
+	//remove from both list
+	for (i=0; i<movie->sidx_pts_store_count; i++) {
+		for (j=i; j<movie->sidx_pts_store_count; j++) {
+			/*
+
+ 			if (movie->sidx_pts_next_store[i] == movie->sidx_pts_store[j]) {
+ 			
+			take care of misaligned timescale eg 24fps but 10000 timescale), we may not find exactly
+			the same sample - if diff is below one ms consider it a match
+			not doing so would accumulate PTSs in the list, slowing down the muxing*/
+			s64 diff = movie->sidx_pts_next_store[i];
+			diff -= (s64) movie->sidx_pts_store[j];
+			if (timescale>1000) {
+				if (ABS(diff) * 1000 < 1 * timescale)
+					diff = 0;
+			}
+			if (diff==0) {
+				if (movie->sidx_pts_store_count >= i + 1)
+					memmove(&movie->sidx_pts_next_store[i], &movie->sidx_pts_next_store[i+1], sizeof(u64) * (movie->sidx_pts_store_count - i - 1) );
+				if (movie->sidx_pts_store_count >= j + 1)
+					memmove(&movie->sidx_pts_store[j], &movie->sidx_pts_store[j+1], sizeof(u64) * (movie->sidx_pts_store_count - j - 1) );
+				movie->sidx_pts_store_count--;
+				i--;
+				break;
+			}
+		}
+	}
+	//the shifted list contain all AUs not yet in this segment, keep the smallest to compute the earliest PTS in next seg
+	//note that we assume the durations were correctly set
+	for (i=0; i<movie->sidx_pts_store_count; i++) {
+		if (min_next_cts > movie->sidx_pts_next_store[i])
+			min_next_cts = movie->sidx_pts_next_store[i];
+	}
+	return min_next_cts;
+}
+
 
 GF_EXPORT
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 ts_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size)
+GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, GF_ISOTrackID referenceTrackID, u64 ref_track_decode_time, s32 ts_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool use_ssix, Bool last_segment, Bool close_segment_handle, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range, u64 *out_seg_size)
 {
 	GF_SegmentIndexBox *sidx=NULL;
 	GF_SegmentIndexBox *root_sidx=NULL;
 	GF_SubsegmentIndexBox *ssix=NULL;
 	GF_List *daisy_sidx = NULL;
+	GF_BitStream *orig_bs;
 	u64 sidx_start, sidx_end;
 	Bool first_frag_in_subseg;
 	Bool no_sidx = GF_FALSE;
 	u32 count, cur_idx, cur_dur, sidx_dur, sidx_idx, idx_offset, frag_count;
-	u64 last_top_box_pos, root_prev_offset, local_sidx_start, local_sidx_end, prev_earliest_cts;
+	u64 last_top_box_pos, root_prev_offset, local_sidx_start, local_sidx_end, prev_earliest_cts, next_earliest_cts;
 	GF_TrackBox *trak = NULL;
 	GF_Err e;
 	/*number of subsegment in this segment (eg nb references in the first SIDX found)*/
@@ -1256,7 +1632,7 @@
 
 	/*store fragment*/
 	if (movie->moof) {
-		e = StoreFragment(movie, GF_TRUE, 0, NULL);
+		e = StoreFragment(movie, GF_TRUE, 0, NULL, GF_FALSE);
 		if (e) return e;
 	}
 	/*restore final bitstream*/
@@ -1307,14 +1683,22 @@
 		no_sidx = GF_TRUE;
 	}
 
+	orig_bs = movie->editFileMap->bs;
+	if (movie->on_block_out) {
+		if (!movie->block_buffer) movie->block_buffer_size = movie->on_block_out_block_size;
+		movie->editFileMap->bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+		if (referenceTrackID) gf_bs_prevent_dispatch(movie->editFileMap->bs, GF_TRUE);
+	}
+
 	e = gf_isom_write_styp(movie, last_segment);
-	if (e) return e;
+	if (e) goto exit;
 
 	frags_per_subseg = 0;
 	subseg_per_sidx = 0;
 	frags_per_subsidx = 0;
 
 	prev_earliest_cts = 0;
+	next_earliest_cts = 0;
 
 	if (daisy_chain_sidx)
 		daisy_sidx = gf_list_new();
@@ -1325,10 +1709,14 @@
 
 		prev_earliest_cts = get_presentation_time( ref_track_decode_time + moof_get_earliest_cts((GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
 
+		//we don't trust ref_track_next_cts to be the earliest in the following segment
+		next_earliest_cts = estimate_next_moof_earliest_presentation_time(ref_track_decode_time, ts_shift, referenceTrackID, movie);
+
 		if (movie->root_sidx) {
 			sidx = movie->root_sidx;
 		} else {
 			sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
+			if (!sidx) return GF_OUT_OF_MEM;
 		}
 		sidx->reference_ID = referenceTrackID;
 		sidx->timescale = trak->Media->mediaHeader->timeScale;
@@ -1400,27 +1788,32 @@
 			}
 
 			sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
+			if (!sidx->refs) return GF_OUT_OF_MEM;
 			memset(sidx->refs, 0, sizeof(GF_SIDXReference)*sidx->nb_refs);
 
 			/*remember start of sidx*/
 			sidx_start = gf_bs_get_position(movie->editFileMap->bs);
 
 			e = gf_isom_box_size((GF_Box *) sidx);
-			if (e) return e;
+			if (e) goto exit;
 			e = gf_isom_box_write((GF_Box *) sidx, movie->editFileMap->bs);
-			if (e) return e;
+			if (e) goto exit;
 
 			if (use_ssix && !ssix && !movie->root_ssix) {
 				u32 k;
 				ssix = (GF_SubsegmentIndexBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SSIX);
+				if (!ssix) return GF_OUT_OF_MEM;
 				ssix->subsegments = gf_malloc(sizeof(GF_SubsegmentInfo) * sidx->nb_refs);
+				if (!ssix->subsegments) return GF_OUT_OF_MEM;
 				ssix->subsegment_count = sidx->nb_refs;
+				ssix->subsegment_alloc = ssix->subsegment_count;
 				for (k=0; k<sidx->nb_refs; k++) {
 					GF_SubsegmentInfo *subs = &ssix->subsegments[k];
 					subs->range_count = 2;
 					subs->ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
+					if (!subs->ranges) return GF_OUT_OF_MEM;
 					subs->ranges[0].level = 1;
-					subs->ranges[1].level = 0xFF;
+					subs->ranges[1].level = 2;
 					subs->ranges[0].range_size = subs->ranges[1].range_size = 0;
 				}
 
@@ -1435,6 +1828,10 @@
 			if (daisy_sidx) {
 				SIDXEntry *entry;
 				GF_SAFEALLOC(entry, SIDXEntry);
+				if (!entry) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
 				entry->sidx = sidx;
 				entry->start_offset = sidx_start;
 				gf_list_add(daisy_sidx, entry);
@@ -1471,6 +1868,7 @@
 		if (!no_sidx && !sidx && (root_sidx || daisy_chain_sidx) ) {
 			u32 subsegments_remaining;
 			sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
+			if (!sidx) return GF_OUT_OF_MEM;
 			sidx->reference_ID = referenceTrackID;
 			sidx->timescale = trak ? trak->Media->mediaHeader->timeScale : 1000;
 			sidx->earliest_presentation_time = get_presentation_time( ref_track_decode_time + sidx_dur + moof_get_earliest_cts(movie->moof, referenceTrackID), ts_shift);
@@ -1490,6 +1888,7 @@
 				sidx->nb_refs += 1;
 			}
 			sidx->refs = (GF_SIDXReference*)gf_malloc(sizeof(GF_SIDXReference)*sidx->nb_refs);
+			if (!sidx->refs) return GF_OUT_OF_MEM;
 			memset(sidx->refs, 0, sizeof(GF_SIDXReference)*sidx->nb_refs);
 
 			if (root_sidx)
@@ -1500,9 +1899,9 @@
 
 			/*write it*/
 			e = gf_isom_box_size((GF_Box *) sidx);
-			if (e) return e;
+			if (e) goto exit;
 			e = gf_isom_box_write((GF_Box *) sidx, movie->editFileMap->bs);
-			if (e) return e;
+			if (e) goto exit;
 
 			local_sidx_end = gf_bs_get_position(movie->editFileMap->bs);
 
@@ -1512,7 +1911,10 @@
 			if (daisy_sidx) {
 				SIDXEntry *entry;
 				GF_SAFEALLOC(entry, SIDXEntry);
-				if (!entry) return GF_OUT_OF_MEM;
+				if (!entry) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
 				entry->sidx = sidx;
 				entry->start_offset = local_sidx_start;
 				gf_list_add(daisy_sidx, entry);
@@ -1525,10 +1927,13 @@
 		if (!e) {
 			Bool generate_ssix = GF_FALSE;
 			if (movie->root_ssix) generate_ssix = GF_TRUE;
-			else if (use_ssix) generate_ssix = GF_TRUE;
-
-			e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size);
+			else if (use_ssix && ssix) generate_ssix = GF_TRUE;
 
+			e = StoreFragment(movie, GF_FALSE, offset_diff, &moof_size, GF_FALSE);
+			if (e) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 
 			if (sidx) {
 				u32 cur_index = idx_offset + cur_idx;
@@ -1536,8 +1941,8 @@
 				/*do not compute earliest CTS if single segment sidx since we only have set the info for one subsegment*/
 				if (!movie->root_sidx && first_frag_in_subseg) {
 					u64 first_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur +  moof_get_earliest_cts(movie->moof, referenceTrackID), ts_shift);
-					u32 subseg_dur = (u32) (first_cts - prev_earliest_cts);
 					if (cur_index) {
+						u32 subseg_dur = (u32) (first_cts - prev_earliest_cts);
 						sidx->refs[cur_index-1].subsegment_duration = subseg_dur;
 						if (root_sidx) root_sidx->refs[sidx_idx].subsegment_duration += subseg_dur;
 					}
@@ -1545,6 +1950,11 @@
 					first_frag_in_subseg = GF_FALSE;
 				}
 
+				if (sidx->nb_refs<=cur_index) {
+					sidx->nb_refs = cur_index+1;
+					sidx->refs = gf_realloc(sidx->refs, sizeof(GF_SIDXReference)*sidx->nb_refs);
+					memset(&sidx->refs[cur_index], 0, sizeof(GF_SIDXReference));
+				}
 
 				/*we refer to next moof*/
 				sidx->refs[cur_index].reference_type = GF_FALSE;
@@ -1567,15 +1977,30 @@
 				count++;
 
 				if (generate_ssix) {
-					if (movie->root_ssix)
+					u32 last_sseg_range0_size, remain_size;
+					if (movie->root_ssix) {
 						ssix = movie->root_ssix;
-
-					//get
+						if (ssix->subsegment_count <= cur_index) {
+							assert(ssix->subsegment_count == cur_index);
+							ssix->subsegment_count = cur_index+1;
+							ssix->subsegment_alloc = ssix->subsegment_count;
+							ssix->subsegments = gf_realloc(ssix->subsegments, ssix->subsegment_count * sizeof(GF_SubsegmentInfo));
+							ssix->subsegments[cur_index].range_count = 2;
+							ssix->subsegments[cur_index].ranges = gf_malloc(sizeof(GF_SubsegmentRangeInfo)*2);
+						}
+					}
+					assert(ssix);
 					ssix->subsegments[cur_index].ranges[0].level = 1;
 					ssix->subsegments[cur_index].ranges[0].range_size = moof_get_first_sap_end(movie->moof);
 
-					ssix->subsegments[cur_index].ranges[1].level = 0xFF;
-					ssix->subsegments[cur_index].ranges[1].range_size = sidx->refs[cur_index].reference_size - ssix->subsegments[count-1].ranges[0].range_size;
+					last_sseg_range0_size = (cur_index < ssix->subsegment_count) ? ssix->subsegments[cur_index].ranges[0].range_size : 0;
+					ssix->subsegments[cur_index].ranges[1].level = 2;
+
+					remain_size = sidx->refs[cur_index].reference_size - last_sseg_range0_size;
+					ssix->subsegments[cur_index].ranges[1].range_size = remain_size;
+					if (remain_size>0xFFFFFF) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Remaining subsegment size %d larger than max ssix range size 0xFFFFFF, file might be broken\n", remain_size));
+					}
 
 					if (movie->root_ssix)
 						ssix = NULL;
@@ -1593,14 +2018,21 @@
 				/*switching to next SIDX*/
 				if ((cur_idx==subseg_per_sidx) || !frag_count) {
 					u32 subseg_dur;
-					u64 next_cts;
 					/*update last ref duration*/
-					if (gf_list_count(movie->moof_list)) {
-						next_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts((GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
+
+					//get next segment earliest cts - if estimation failed, use ref_track_next_cts
+					if ((next_earliest_cts==-1) || (next_earliest_cts < prev_earliest_cts))  {
+						u64 next_cts;
+						if (gf_list_count(movie->moof_list)) {
+							next_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts((GF_MovieFragmentBox*)gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
+						} else {
+							next_cts = get_presentation_time( ref_track_next_cts, ts_shift);
+						}
+						subseg_dur = (u32) (next_cts - prev_earliest_cts);
 					} else {
-						next_cts = get_presentation_time( ref_track_next_cts, ts_shift);
+						subseg_dur = (u32) (next_earliest_cts - prev_earliest_cts);
 					}
-					subseg_dur = (u32) (next_cts - prev_earliest_cts);
+
 					if (movie->root_sidx) {
 						sidx->refs[idx_offset].subsegment_duration = subseg_dur;
 					}
@@ -1610,9 +2042,12 @@
 					} else {
 						sidx->refs[sidx->nb_refs-1].subsegment_duration = subseg_dur;
 					}
-					if (root_sidx) root_sidx->refs[sidx_idx].subsegment_duration += subseg_dur;
 
 					if (root_sidx) {
+
+						root_sidx->refs[sidx_idx].subsegment_duration += subseg_dur;
+
+
 						root_sidx->refs[sidx_idx].reference_size = (u32) (gf_bs_get_position(movie->editFileMap->bs) - local_sidx_start);
 						if (!sidx_idx) {
 							root_sidx->earliest_presentation_time = sidx->earliest_presentation_time;
@@ -1647,7 +2082,7 @@
 	}
 
 	if (movie->root_sidx) {
-		if (last_segment) {
+		if (last_segment && !movie->dyn_root_sidx) {
 			assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
 
 			sidx_rewrite(movie->root_sidx, movie->editFileMap->bs, movie->root_sidx_offset, movie->root_ssix);
@@ -1663,7 +2098,7 @@
 			gf_isom_box_del((GF_Box*)ssix);
 
 		compute_seg_size(movie, out_seg_size);
-		return GF_OK;
+		goto exit;
 	}
 
 	if (sidx) {
@@ -1679,7 +2114,8 @@
 	if (daisy_sidx) {
 		u32 i, j;
 		u64 last_entry_end_offset = 0;
-		u32 count = gf_list_count(daisy_sidx);
+
+		count = gf_list_count(daisy_sidx);
 		for (i=count; i>1; i--) {
 			SIDXEntry *entry = (SIDXEntry*)gf_list_get(daisy_sidx, i-2);
 			SIDXEntry *next_entry = (SIDXEntry*)gf_list_get(daisy_sidx, i-1);
@@ -1735,6 +2171,120 @@
 	}
 	compute_seg_size(movie, out_seg_size);
 
+exit:
+	if (movie->editFileMap && (orig_bs != movie->editFileMap->bs)) {
+		u32 tmpsize;
+		gf_bs_get_content_no_truncate(movie->editFileMap->bs, &movie->block_buffer, &tmpsize, &movie->block_buffer_size);
+		gf_bs_del(movie->editFileMap->bs);
+		movie->editFileMap->bs = orig_bs;
+	}
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_flush_sidx(GF_ISOFile *movie, u32 sidx_max_size, Bool exact_range)
+{
+	GF_BitStream *bs;
+	GF_Err e;
+	u32 size;
+	//and only at setup
+	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
+	if (movie->openMode != GF_ISOM_OPEN_WRITE) return GF_ISOM_INVALID_MODE;
+
+	if (! movie->on_block_out) return GF_BAD_PARAM;
+	if (! movie->root_sidx) return GF_BAD_PARAM;
+
+	if (!movie->block_buffer_size) movie->block_buffer_size = movie->on_block_out_block_size;
+	bs = gf_bs_new_cbk_buffer(movie->on_block_out, movie->on_block_out_usr_data, movie->block_buffer, movie->block_buffer_size);
+	gf_bs_prevent_dispatch(bs, GF_TRUE);
+	
+	assert(movie->root_sidx_index == movie->root_sidx->nb_refs);
+
+	if (exact_range)
+		movie->root_sidx->version = 1;
+		
+	e = gf_isom_box_size((GF_Box*)movie->root_sidx);
+	size = (u32) movie->root_sidx->size;
+	if (movie->root_ssix) {
+		e = gf_isom_box_size((GF_Box*)movie->root_ssix);
+		size += (u32) movie->root_ssix->size;
+		movie->root_sidx->first_offset = (u32) movie->root_ssix->size;
+	}
+
+	if (sidx_max_size && (size > sidx_max_size) ) {
+#ifndef GPAC_DISABLE_LOG
+		u32 orig_seg_count = movie->root_sidx->nb_refs;
+#endif
+		//trash 8 bytes to be able to write a free box before
+		sidx_max_size -= 8;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] SIDX size %d is larger than allocated SIDX block %d, merging final segments\n", movie->root_sidx->size, sidx_max_size));
+		while (movie->root_sidx->nb_refs>2) {
+			movie->root_sidx->refs[movie->root_sidx->nb_refs-2].subsegment_duration += movie->root_sidx->refs[movie->root_sidx->nb_refs-1].subsegment_duration;
+			movie->root_sidx->refs[movie->root_sidx->nb_refs-2].reference_size += movie->root_sidx->refs[movie->root_sidx->nb_refs-1].reference_size;
+			movie->root_sidx->nb_refs--;
+			if (movie->root_ssix) {
+				movie->root_ssix->subsegments[movie->root_ssix->subsegment_count-2].ranges[1].range_size += movie->root_ssix->subsegments[movie->root_ssix->subsegment_count-1].ranges[0].range_size;
+				movie->root_ssix->subsegments[movie->root_ssix->subsegment_count-2].ranges[1].range_size += movie->root_ssix->subsegments[movie->root_ssix->subsegment_count-1].ranges[1].range_size;
+				movie->root_ssix->subsegment_count--;
+			}
+
+			e = gf_isom_box_size((GF_Box*)movie->root_sidx);
+			size = (u32) movie->root_sidx->size;
+			if (movie->root_ssix) {
+				e = gf_isom_box_size((GF_Box*)movie->root_ssix);
+				size += (u32) movie->root_ssix->size;
+				movie->root_sidx->first_offset = (u32) movie->root_ssix->size;
+			}
+
+			if (size < sidx_max_size) break;
+		}
+		if (size > sidx_max_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso fragment] SIDX size %d is larger than allocated SIDX block and no more segments to merge\n", size, sidx_max_size));
+			return GF_IO_ERR;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Merged %d segments in SIDX to fit allocated block, remaining segments %d\n", orig_seg_count - movie->root_sidx->nb_refs, movie->root_sidx->nb_refs));
+		}
+	}
+	if (!e) {
+		if (movie->root_ssix) {
+			gf_isom_box_size((GF_Box *) movie->root_ssix);
+
+			if (movie->compress_mode>=GF_ISO_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 ...
+				e = gf_isom_write_compressed_box(movie, (GF_Box *) movie->root_ssix, GF_4CC('!', 's', 's', 'x'), NULL, &ssix_comp_size);
+				movie->root_sidx->first_offset = ssix_comp_size;
+			} else {
+				movie->root_sidx->first_offset = (u32) movie->root_ssix->size;
+			}
+		}
+		if (!e) {
+			if (movie->compress_mode>=GF_ISO_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);
+			}
+		}
+
+		if (!e && movie->root_ssix) {
+			if (movie->compress_mode>=GF_ISO_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);
+			}
+		}
+	}
+
+	gf_isom_box_del((GF_Box*) movie->root_sidx);
+	movie->root_sidx = NULL;
+	if (movie->root_ssix) {
+		gf_isom_box_del((GF_Box*) movie->root_ssix);
+		movie->root_ssix = NULL;
+	}
+
+	gf_bs_get_content_no_truncate(bs, &movie->block_buffer, &size, &movie->block_buffer_size);
+	gf_bs_del(bs);
 	return e;
 }
 
@@ -1744,7 +2294,7 @@
 	if (movie->use_segments) {
 		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 0, GF_FALSE, GF_FALSE, 1, 0, NULL, NULL, NULL);
 	} else {
-		return StoreFragment(movie, GF_FALSE, 0, NULL);
+		return StoreFragment(movie, GF_FALSE, 0, NULL, GF_TRUE);
 	}
 }
 
@@ -1774,6 +2324,7 @@
 		/*if movieFileMap is not null, we are concatenating segments to the original movie, force a copy*/
 		if (movie->movieFileMap)
 			movie->append_segment = GF_TRUE;
+		movie->styp_written = GF_TRUE;
 	}
 
 	/*create a memory bitstream for all file IO until final flush*/
@@ -1785,7 +2336,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp, u64 timestamp)
+GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, GF_ISOTrackID reference_track_ID, u64 ntp, u64 timestamp)
 {
 	if (!movie->moof) return GF_BAD_PARAM;
 	movie->moof->reference_track_ID = reference_track_ID;
@@ -1795,7 +2346,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_traf_mss_timeext(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp_in_track_timescale, u64 traf_duration_in_track_timescale)
+GF_Err gf_isom_set_traf_mss_timeext(GF_ISOFile *movie, GF_ISOTrackID reference_track_ID, u64 ntp_in_track_timescale, u64 traf_duration_in_track_timescale)
 {
 	u32 i;
 	if (!movie || !movie->moof)
@@ -1805,8 +2356,9 @@
 		if (!traf)
 			return GF_BAD_PARAM;
 		if (traf->tfxd)
-			gf_isom_box_del((GF_Box*)traf->tfxd);
-		traf->tfxd = (GF_MSSTimeExtBox *)gf_isom_box_new(GF_ISOM_BOX_UUID_TFXD);
+			gf_isom_box_del_parent(&traf->child_boxes, (GF_Box*)traf->tfxd);
+		traf->tfxd = (GF_MSSTimeExtBox *)gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_UUID_TFXD);
+		if (!traf->tfxd) return GF_OUT_OF_MEM;
 		traf->tfxd->absolute_time_in_track_timescale = ntp_in_track_timescale;
 		traf->tfxd->fragment_duration_in_track_timescale = traf_duration_in_track_timescale;
 	}
@@ -1814,12 +2366,17 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_start_fragment(GF_ISOFile *movie, Bool moof_first)
+GF_Err gf_isom_start_fragment(GF_ISOFile *movie, GF_ISOStartFragmentFlags flags)
 {
 	u32 i, count;
 	GF_TrackExtendsBox *trex;
 	GF_TrackFragmentBox *traf;
 	GF_Err e;
+	Bool moof_first = (flags & GF_ISOM_FRAG_MOOF_FIRST) ? GF_TRUE : GF_FALSE;
+#ifdef GF_ENABLE_CTRN
+	Bool use_ctrn = (flags & GF_ISOM_FRAG_USE_COMPACT) ? GF_TRUE : GF_FALSE;
+#endif
+
 	//and only at setup
 	if (!movie || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) )
 		return GF_BAD_PARAM;
@@ -1835,21 +2392,24 @@
 
 	//store existing fragment
 	if (movie->moof) {
-		e = StoreFragment(movie, movie->use_segments ? GF_TRUE : GF_FALSE, 0, NULL);
+		e = StoreFragment(movie, movie->use_segments ? GF_TRUE : GF_FALSE, 0, NULL, movie->use_segments ? GF_TRUE : GF_FALSE);
 		if (e) return e;
 	}
 
 	//create new fragment
 	movie->moof = (GF_MovieFragmentBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MOOF);
-	movie->moof->mfhd = (GF_MovieFragmentHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MFHD);
+	if (!movie->moof) return GF_OUT_OF_MEM;
+	movie->moof->mfhd = (GF_MovieFragmentHeaderBox *) gf_isom_box_new_parent(&movie->moof->child_boxes, GF_ISOM_BOX_TYPE_MFHD);
+	if (!movie->moof->mfhd) return GF_OUT_OF_MEM;
 	movie->moof->mfhd->sequence_number = movie->NextMoofNumber;
 	movie->NextMoofNumber ++;
-	if (movie->use_segments)
+	if (movie->use_segments || movie->on_block_out)
 		gf_list_add(movie->moof_list, movie->moof);
 
 
 	/*remember segment offset*/
 	movie->moof->fragment_offset = gf_bs_get_position(movie->editFileMap->bs);
+
 	/*prepare MDAT*/
 	gf_bs_write_u32(movie->editFileMap->bs, 0);
 	gf_bs_write_u32(movie->editFileMap->bs, GF_ISOM_BOX_TYPE_MDAT);
@@ -1857,19 +2417,27 @@
 	//we create a TRAF for each setup track, unused ones will be removed at store time
 	for (i=0; i<count; i++) {
 		trex = (GF_TrackExtendsBox*)gf_list_get(movie->moov->mvex->TrackExList, i);
-		traf = (GF_TrackFragmentBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRAF);
+		traf = (GF_TrackFragmentBox *) gf_isom_box_new_parent(&movie->moof->child_boxes, GF_ISOM_BOX_TYPE_TRAF);
+		if (!traf) return GF_OUT_OF_MEM;
 		traf->trex = trex;
-		traf->tfhd = (GF_TrackFragmentHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TFHD);
+		traf->tfhd = (GF_TrackFragmentHeaderBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_TFHD);
+		if (!traf->tfhd) return GF_OUT_OF_MEM;
 		traf->tfhd->trackID = trex->trackID;
 		//add 8 bytes (MDAT size+type) to avoid the data_offset in the first trun
 		traf->tfhd->base_data_offset = movie->moof->fragment_offset + 8;
+#ifdef GF_ENABLE_CTRN
+		traf->use_ctrn = use_ctrn;
+		if (trex->inherit_from_traf_id)
+			traf->use_inherit = GF_TRUE;
+#endif
 		gf_list_add(movie->moof->TrackList, traf);
 
 		if (movie->mfra) {
 			GF_TrackFragmentRandomAccessBox *tfra;
 			GF_RandomAccessEntry *raf;
 			if (!traf->trex->tfra) {
-				tfra = (GF_TrackFragmentRandomAccessBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_TFRA);
+				tfra = (GF_TrackFragmentRandomAccessBox *)gf_isom_box_new_parent(&movie->mfra->child_boxes, GF_ISOM_BOX_TYPE_TFRA);
+				if (!tfra) return GF_OUT_OF_MEM;
 				tfra->track_id = traf->trex->trackID;
 				tfra->traf_bits = 8;
 				tfra->trun_bits = 8;
@@ -1892,6 +2460,85 @@
 	return GF_OK;
 }
 
+
+GF_Err gf_isom_set_fragment_template(GF_ISOFile *movie, u8 *tpl_data, u32 tpl_size, Bool *has_tfdt, GF_SegmentIndexBox **out_sidx)
+{
+	GF_BitStream *bs;
+	GF_Err e=GF_OK;
+	if (out_sidx) *out_sidx = NULL;
+	if (!movie->moof) return GF_BAD_PARAM;
+
+	bs = gf_bs_new(tpl_data, tpl_size, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		GF_Box *a;
+		e = gf_isom_box_parse(&a, bs);
+		if (e) break;
+		if (a->type==GF_ISOM_BOX_TYPE_STYP) {
+			if (movie->brand) {
+				gf_list_del_item(movie->TopBoxes, movie->brand);
+				gf_isom_box_del((GF_Box *)movie->brand);
+			}
+			movie->brand = (GF_FileTypeBox *) a;
+			gf_list_add(movie->TopBoxes, movie->brand);
+			continue;
+		}
+		if (a->type==GF_ISOM_BOX_TYPE_MOOF) {
+			u32 i, count, j, nb_trex;
+			s32 idx;
+			Bool single_track=GF_FALSE;
+			GF_MovieFragmentBox *moof = (GF_MovieFragmentBox *)a;
+
+			moof->fragment_offset = movie->moof->fragment_offset;
+			nb_trex = gf_list_count(movie->moov->mvex->TrackExList);
+			count = gf_list_count(moof->TrackList);
+			for (i=0; i<count; i++) {
+				GF_TrackFragmentBox *traf = gf_list_get(moof->TrackList, i);
+				GF_TrackBox *trak = traf->tfhd ? gf_isom_get_track_from_id(movie->moov, traf->tfhd->trackID) : NULL;
+				if (traf->tfhd && !trak && !single_track && (gf_list_count(movie->moov->trackList)==1)) {
+					trak = gf_list_get(movie->moov->trackList, 0);
+					single_track = GF_TRUE;
+					traf->tfhd->trackID = trak->Header->trackID;
+				}
+				for (j=0; j<nb_trex && trak; j++) {
+					GF_TrackExtendsBox *trex = gf_list_get(movie->moov->mvex->TrackExList, j);
+					if (trex->trackID == traf->tfhd->trackID) {
+						traf->trex = trex;
+						break;
+					}
+				}
+				if (!trak || !traf->trex) {
+					gf_list_rem(moof->TrackList, i);
+					i--;
+					count--;
+					gf_isom_box_del((GF_Box*)traf);
+					continue;
+				}
+				traf->tfhd->base_data_offset = movie->moof->fragment_offset + 8;
+				if (traf->tfdt && has_tfdt)
+					*has_tfdt = GF_TRUE;
+			}
+			//remove old moof and switch with this one
+			idx = gf_list_find(movie->moof_list, movie->moof);
+			if (idx>=0) {
+				gf_list_rem(movie->moof_list, idx);
+				gf_list_add(movie->moof_list, moof);
+			}
+			gf_isom_box_del((GF_Box *)movie->moof);
+			movie->moof = moof;
+			continue;
+		}
+		if (a->type==GF_ISOM_BOX_TYPE_SIDX) {
+			if (out_sidx && !*out_sidx) {
+				*out_sidx = (GF_SegmentIndexBox *) a;
+				continue;
+			}
+		}
+		gf_isom_box_del(a);
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
 static
 u32 GetRunSize(GF_TrackFragmentRunBox *trun)
 {
@@ -1906,24 +2553,26 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, u32 TrackID, const GF_ISOSample *sample, u32 DescIndex,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *movie, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redundant_coding)
 {
 	u32 count, buffer_size;
-	char *buffer;
+	u8 *buffer;
 	u64 pos;
 	GF_ISOSample *od_sample = NULL;
-	GF_TrunEntry *ent;
+	GF_TrunEntry *ent, *prev_ent;
 	GF_TrackFragmentBox *traf, *traf_2;
 	GF_TrackFragmentRunBox *trun;
+
 	if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) || !sample)
 		return GF_BAD_PARAM;
 
-	traf = GetTraf(movie, TrackID);
+	traf = gf_isom_get_traf(movie, TrackID);
 	if (!traf)
 		return GF_BAD_PARAM;
 
-	if (!traf->tfhd->sample_desc_index) traf->tfhd->sample_desc_index = DescIndex ? DescIndex : traf->trex->def_sample_desc_index;
+	if (!traf->tfhd->sample_desc_index)
+		traf->tfhd->sample_desc_index = DescIndex ? DescIndex : traf->trex->def_sample_desc_index;
 
 	pos = gf_bs_get_position(movie->editFileMap->bs);
 
@@ -1931,7 +2580,7 @@
 	//WARNING: we change stream description, create a new TRAF
 	if ( DescIndex && (traf->tfhd->sample_desc_index != DescIndex)) {
 		//if we're caching flush the current run
-		if (traf->DataCache) {
+		if (traf->DataCache && !traf->use_sample_interleave) {
 			count = gf_list_count(traf->TrackRuns);
 			if (count) {
 				trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, count-1);
@@ -1943,16 +2592,20 @@
 				gf_free(buffer);
 			}
 		}
-		traf_2 = (GF_TrackFragmentBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRAF);
+		traf_2 = (GF_TrackFragmentBox *) gf_isom_box_new_parent(&movie->moof->child_boxes, GF_ISOM_BOX_TYPE_TRAF);
+		if (!traf_2) return GF_OUT_OF_MEM;
 		traf_2->trex = traf->trex;
-		traf_2->tfhd = (GF_TrackFragmentHeaderBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TFHD);
+		traf_2->tfhd = (GF_TrackFragmentHeaderBox *) gf_isom_box_new_parent(&traf_2->child_boxes, GF_ISOM_BOX_TYPE_TFHD);
+		if (!traf_2->tfhd) return GF_OUT_OF_MEM;
 		traf_2->tfhd->trackID = traf->tfhd->trackID;
 		//keep the same offset
 		traf_2->tfhd->base_data_offset = movie->moof->fragment_offset + 8;
 		gf_list_add(movie->moof->TrackList, traf_2);
 
 		//duplicate infos
-		traf_2->tfhd->IFrameSwitching = traf->tfhd->IFrameSwitching;
+		traf_2->IFrameSwitching = traf->IFrameSwitching;
+		traf_2->use_sample_interleave = traf->use_sample_interleave;
+		traf_2->interleave_id = traf->interleave_id;
 		traf_2->DataCache  = traf->DataCache;
 		traf_2->tfhd->sample_desc_index  = DescIndex;
 
@@ -1961,8 +2614,8 @@
 	}
 
 	pos = gf_bs_get_position(movie->editFileMap->bs);
-	//add TRUN entry
-	count = gf_list_count(traf->TrackRuns);
+	//check if we need a new trun entry
+	count = (traf->use_sample_interleave && traf->force_new_trun) ? 0 : gf_list_count(traf->TrackRuns);
 	if (count) {
 		trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, count-1);
 		//check data offset when no caching as trun entries shall ALWAYS be contiguous samples
@@ -1970,14 +2623,17 @@
 			count = 0;
 
 		//check I-frame detection
-		if (traf->tfhd->IFrameSwitching && sample->IsRAP)
+		if (traf->IFrameSwitching && sample->IsRAP)
+			count = 0;
+
+		if (traf->DataCache && (traf->DataCache==trun->sample_count) && !traf->use_sample_interleave)
 			count = 0;
 
-		if (traf->DataCache && (traf->DataCache==trun->sample_count) )
+		if (traf->force_new_trun)
 			count = 0;
 
 		//if data cache is on and we're changing TRUN, store the cache and update data offset
-		if (!count && traf->DataCache) {
+		if (!count && traf->DataCache && !traf->use_sample_interleave) {
 			trun->data_offset = (u32) (pos - movie->moof->fragment_offset - 8);
 			gf_bs_get_content(trun->cache, &buffer, &buffer_size);
 			gf_bs_write_data(movie->editFileMap->bs, buffer, buffer_size);
@@ -1986,13 +2642,21 @@
 			gf_free(buffer);
 		}
 	}
+	traf->force_new_trun = 0;
 
 	//new run
 	if (!count) {
-		trun = (GF_TrackFragmentRunBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TRUN);
+		trun = (GF_TrackFragmentRunBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_TRUN);
+		if (!trun) return GF_OUT_OF_MEM;
 		//store data offset (we have the 8 btyes offset of the MDAT)
 		trun->data_offset = (u32) (pos - movie->moof->fragment_offset - 8);
 		gf_list_add(traf->TrackRuns, trun);
+#ifdef GF_ENABLE_CTRN
+		trun->use_ctrn = traf->use_ctrn;
+		trun->use_inherit = traf->use_inherit;
+		trun->ctso_multiplier = traf->trex->def_sample_duration;
+#endif
+		trun->interleave_id = traf->interleave_id;
 
 		//if we use data caching, create a bitstream
 		if (traf->DataCache)
@@ -2003,6 +2667,7 @@
 	if (!ent) return GF_OUT_OF_MEM;
 	ent->CTS_Offset = sample->CTS_Offset;
 	ent->Duration = Duration;
+	ent->dts = sample->DTS;
 	ent->size = sample->dataLength;
 	ent->nb_pack = sample->nb_pack;
 	ent->flags = GF_ISOM_FORMAT_FRAG_FLAGS(PaddingBits, sample->IsRAP, DegradationPriority);
@@ -2010,6 +2675,11 @@
 		ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(0, 2, 0, (redundant_coding ? 1 : 0) );
 		ent->SAP_type = sample->IsRAP;
 	}
+	prev_ent = gf_list_last(trun->entries);
+	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);
+	}
 	gf_list_add(trun->entries, ent);
 
 	if (sample->CTS_Offset<0) {
@@ -2056,80 +2726,111 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_add_sai(GF_ISOFile *output, GF_ISOFile *input, u32 TrackID, u32 SampleNum)
+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)
 {
-	u32 trackNum;
-	GF_Err e = GF_OK;
+	GF_CENCSampleAuxInfo *sai;
+	GF_TrackFragmentBox  *traf = gf_isom_get_traf(output, TrackID);
+	u32 i;
+	GF_SampleEncryptionBox *senc;
 
-	trackNum = gf_isom_get_track_by_id(input, TrackID);
-	if (gf_isom_is_cenc_media(input, trackNum, 1)) {
-		GF_CENCSampleAuxInfo *sai;
-		GF_TrackFragmentBox  *traf = GetTraf(output, TrackID);
-		GF_TrackBox  *src_trak = gf_isom_get_track_from_file(input, TrackID);
-		u32 boxType;
-		GF_SampleEncryptionBox *senc;
-		u8 IV_size;
-		u32 IsEncrypted;
-
-		if (!traf)  return GF_BAD_PARAM;
-
-		sai = NULL;
-		gf_isom_get_sample_cenc_info(input, trackNum, SampleNum, &IsEncrypted, &IV_size, NULL, NULL, NULL, NULL, NULL);
-		e = gf_isom_cenc_get_sample_aux_info(input, trackNum, SampleNum, &sai, &boxType);
-		if (e) return e;
-		//no associated SAI (constant IV and no subsample)
-		if (!sai) return GF_OK;
-		
-		sai->IV_size = IV_size;
+	if (!traf)  return GF_BAD_PARAM;
 
-		switch (boxType) {
-		case GF_ISOM_BOX_UUID_PSEC:
-			//have we seen cases where the psec box is in trak but not in traf ? to check
-			if (!traf->sample_encryption) {
-				GF_SampleEncryptionBox *psec = (GF_SampleEncryptionBox *) src_trak->sample_encryption;
-				if (!psec) return GF_ISOM_INVALID_FILE;
-				traf->sample_encryption = gf_isom_create_piff_psec_box(1, 0, psec->AlgorithmID, psec->IV_size, psec->KID);
-				if (!traf->sample_encryption)
-					return GF_OUT_OF_MEM;
-				traf->sample_encryption->traf = traf;
-			}
+	if (!traf->sample_encryption) {
+		if (!traf->trex->track->sample_encryption) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isofile] trying to add CENC SAI without storage box allocated\n" ));
+			return GF_BAD_PARAM;
+		}
+		if (traf->trex->track->sample_encryption->type == GF_ISOM_BOX_TYPE_SENC) {
+			traf->sample_encryption = gf_isom_create_samp_enc_box(0, 0);
+		} else {
+			GF_SampleEncryptionBox *psec = (GF_SampleEncryptionBox *) traf->trex->track->sample_encryption;
+			if (!psec) return GF_ISOM_INVALID_FILE;
+			traf->sample_encryption = gf_isom_create_piff_psec_box(1, 0, psec->AlgorithmID, psec->IV_size, psec->KID);
+		}
+		if (!traf->sample_encryption) return GF_OUT_OF_MEM;
+		traf->sample_encryption->traf = traf;
 
-			senc = (GF_SampleEncryptionBox *) traf->sample_encryption;
-			break;
-		case GF_ISOM_BOX_TYPE_SENC:
-			if (!traf->sample_encryption) {
-				traf->sample_encryption = gf_isom_create_samp_enc_box(0, 0);
-				traf->sample_encryption->traf = traf;
-			}
+		if (!traf->child_boxes) traf->child_boxes = gf_list_new();
+		gf_list_add(traf->child_boxes, traf->sample_encryption);
+	}
+	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);
+		return GF_OK;
+	}
 
-			if (!traf->sample_encryption) {
-				return GF_IO_ERR;
+	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 ));
+			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;
 			}
-			senc = (GF_SampleEncryptionBox *) traf->sample_encryption;
-			break;
-		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[isofile] Unsupported encryption storage box %s\n", gf_4cc_to_str(boxType) ));
-			return GF_NOT_SUPPORTED;
 		}
+	}
 
-		gf_list_add(senc->samp_aux_info, sai);
-		if (sai->subsample_count) senc->flags = 0x00000002;
+	gf_list_add(senc->samp_aux_info, sai);
+	if (sai->subsample_count) senc->flags = 0x00000002;
 
-		//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);
-		}
-		// 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);
-		}
+	//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);
 	}
-
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, u32 TrackID, char *data, u32 data_size, u8 PaddingBits)
+GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, GF_ISOTrackID TrackID, u8 *data, u32 data_size, u8 PaddingBits)
 {
 	u32 count;
 	u8 rap;
@@ -2139,7 +2840,7 @@
 	GF_TrackFragmentRunBox *trun;
 	if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
 
-	traf = GetTraf(movie, TrackID);
+	traf = gf_isom_get_traf(movie, TrackID);
 	if (!traf || !traf->tfhd->sample_desc_index) return GF_BAD_PARAM;
 
 	//add TRUN entry
@@ -2167,14 +2868,14 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, u32 TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
+GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, GF_ISOTrackID TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
 {
 	u32 i, count, last_sample;
 	GF_TrackFragmentBox *traf;
 	GF_SubSampleInformationBox *subs = NULL;
 	if (!movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
 
-	traf = GetTraf(movie, TrackID);
+	traf = gf_isom_get_traf(movie, TrackID);
 	if (!traf || !traf->tfhd->sample_desc_index) return GF_BAD_PARAM;
 
 	/*compute last sample number in traf*/
@@ -2195,14 +2896,77 @@
 		subs=NULL;
 	}
 	if (!subs) {
-		subs = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
+		subs = (GF_SubSampleInformationBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_SUBS);
+		if (!subs) return GF_OUT_OF_MEM;
 		subs->version = (subSampleSize>0xFFFF) ? 1 : 0;
 		subs->flags = flags;
 	}
 	return gf_isom_add_subsample_info(subs, last_sample, subSampleSize, priority, reserved, discardable);
 }
 
-GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
+#if 0 //unused
+static GF_Err gf_isom_copy_sample_group_entry_to_traf(GF_TrackFragmentBox *traf, GF_SampleTableBox *stbl, u32 grouping_type, u32 grouping_type_parameter, u32 sampleGroupDescriptionIndex, Bool sgpd_in_traf)
+{
+	if (sgpd_in_traf) {
+		void *entry = NULL;
+		u32 i, count;
+		GF_SampleGroupDescriptionBox *sgdesc = NULL;
+		GF_BitStream *bs;
+
+		count = gf_list_count(stbl->sampleGroupsDescription);
+		for (i = 0; i < count; i++) {
+			sgdesc = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
+			if (sgdesc->grouping_type == grouping_type)
+				break;
+			sgdesc = NULL;
+		}
+		if (!sgdesc)
+			return GF_BAD_PARAM;
+
+		entry = gf_list_get(sgdesc->group_descriptions, sampleGroupDescriptionIndex-1);
+		if (!entry)
+			return GF_BAD_PARAM;
+
+		switch (grouping_type) {
+		case GF_ISOM_SAMPLE_GROUP_RAP:
+		{
+			char udta[2];
+			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_u8(bs, ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples_known);
+			gf_bs_write_u8(bs, ((GF_VisualRandomAccessEntry *)entry)->num_leading_samples);
+			gf_bs_del(bs);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
+		}
+		case GF_ISOM_SAMPLE_GROUP_SYNC:
+		{
+			char udta[1];
+			bs = gf_bs_new(udta, 1*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_int(bs, 0, 2);
+			gf_bs_write_int(bs, ((GF_SYNCEntry *)entry)->NALU_type, 6);
+			gf_bs_del(bs);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_rap_create_entry, sg_rap_compare_entry);
+		}
+		case GF_ISOM_SAMPLE_GROUP_ROLL:
+		{
+			char udta[2];
+			bs = gf_bs_new(udta, 2*sizeof(char), GF_BITSTREAM_WRITE);
+			gf_bs_write_u16(bs, ((GF_RollRecoveryEntry *)entry)->roll_distance);
+			gf_bs_del(bs);
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, udta, sg_roll_create_entry, sg_roll_compare_entry);
+		}
+		case GF_ISOM_SAMPLE_GROUP_SEIG:
+		{
+			return gf_isom_set_sample_group_info_ex(NULL, traf, 0, grouping_type, 0, entry, sg_encryption_create_entry, sg_encryption_compare_entry);
+		}
+		default:
+			return GF_BAD_PARAM;
+		}
+	}
+
+	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, grouping_type_parameter, sampleGroupDescriptionIndex);
+}
+/*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)
 {
 	u32 i, count, last_sample, idx, subs_flags;
 	GF_SubSampleInfoEntry *sub_sample;
@@ -2213,7 +2977,7 @@
 	GF_TrackFragmentRunBox *trun;
 	if (!dest->moof || !(dest->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
 
-	traf = GetTraf(dest, TrackID);
+	traf = gf_isom_get_traf(dest, TrackID);
 	if (!traf || !traf->tfhd->sample_desc_index) return GF_BAD_PARAM;
 
 	trak = gf_isom_get_track_from_file(orig, track);
@@ -2235,7 +2999,28 @@
 		if (e) return e;
 
 		GF_ISOM_RESET_FRAG_DEPEND_FLAGS(ent->flags);
-		ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(0, dependsOn, dependedOn, redundant);
+
+		if (traf->use_sdtp) {
+			u8 sflags=0;
+			if (!traf->sdtp) {
+				traf->sdtp = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+				if (!traf->sdtp) return GF_OUT_OF_MEM;
+			}
+			sflags |= isLeading << 6;
+			sflags |= dependsOn << 4;
+			sflags |= dependedOn << 2;
+			sflags |= redundant;
+
+			traf->sdtp->sample_info = gf_realloc(traf->sdtp->sample_info, sizeof(u8)*(traf->sdtp->sampleCount+1));
+			traf->sdtp->sample_info[traf->sdtp->sampleCount] = (u8) sflags;
+			traf->sdtp->sampleCount++;
+
+			if (traf->use_sdtp==2) {
+				ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(isLeading, dependsOn, dependedOn, redundant);
+			}
+		} else {
+			ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(isLeading, dependsOn, dependedOn, redundant);
+		}
 	}
 
 	/*copy subsample info if any*/
@@ -2267,7 +3052,8 @@
 			subs_traf = NULL;
 		}
 		if (!subs_traf) {
-			subs_traf = (GF_SubSampleInformationBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SUBS);
+			subs_traf = (GF_SubSampleInformationBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_SUBS);
+			if (!subs_traf) return GF_OUT_OF_MEM;
 			subs_traf->version = 0;
 			subs_traf->flags = subs_flags;
 			gf_list_add(traf->sub_samples, subs_traf);
@@ -2320,40 +3106,83 @@
 	}
 	return GF_OK;
 }
+#endif
+
+
+GF_Err gf_isom_fragment_set_sample_flags(GF_ISOFile *movie, GF_ISOTrackID trackID, u32 is_leading, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	u32 count;
+	GF_TrackFragmentBox *traf;
+	GF_TrunEntry *ent;
+	GF_TrackFragmentRunBox *trun;
+	if (!movie || !movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
+
+	traf = gf_isom_get_traf(movie, trackID);
+	if (!traf->tfhd->sample_desc_index) return GF_BAD_PARAM;
+
+	count = gf_list_count(traf->TrackRuns);
+	if (!count) return GF_BAD_PARAM;
+	trun = (GF_TrackFragmentRunBox *)gf_list_get(traf->TrackRuns, count-1);
+	count = gf_list_count(trun->entries);
+	if (!count) return GF_BAD_PARAM;
+
+	ent = (GF_TrunEntry *)gf_list_get(trun->entries, count-1);
+
+	GF_ISOM_RESET_FRAG_DEPEND_FLAGS(ent->flags);
+
+	if (traf->use_sdtp) {
+		u8 sflags=0;
+		if (!traf->sdtp) {
+			traf->sdtp = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
+			if (!traf->sdtp) return GF_OUT_OF_MEM;
+		}
+		sflags |= is_leading << 6;
+		sflags |= dependsOn << 4;
+		sflags |= dependedOn << 2;
+		sflags |= redundant;
+
+		traf->sdtp->sample_info = gf_realloc(traf->sdtp->sample_info, sizeof(u8)*(traf->sdtp->sampleCount+1));
+		traf->sdtp->sample_info[traf->sdtp->sampleCount] = (u8) sflags;
+		traf->sdtp->sampleCount++;
+		if (traf->use_sdtp==2) {
+			ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(is_leading, dependsOn, dependedOn, redundant);
+		}
+	} else {
+		ent->flags |= GF_ISOM_GET_FRAG_DEPEND_FLAGS(is_leading, dependsOn, dependedOn, redundant);
+	}
+	return GF_OK;
+}
 
 
 #endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
-u32 gf_isom_is_track_fragmented(GF_ISOFile *movie, u32 TrackID)
+Bool gf_isom_is_track_fragmented(GF_ISOFile *movie, GF_ISOTrackID TrackID)
 {
-	if (!movie || !movie->moov || !movie->moov->mvex) return 0;
-	return (GetTrex(movie->moov, TrackID) != NULL) ? 1 : 0;
+	if (!movie || !movie->moov || !movie->moov->mvex) return GF_FALSE;
+	return (GetTrex(movie->moov, TrackID) != NULL) ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
-u32 gf_isom_is_fragmented(GF_ISOFile *movie)
+Bool gf_isom_is_fragmented(GF_ISOFile *movie)
 {
-	if (!movie || !movie->moov) return 0;
+	if (!movie || !movie->moov) return GF_FALSE;
 	/* By default if the Moov has an mvex, the file is fragmented */
-	if (movie->moov->mvex) return 1;
-	/* deprecated old code */
-	/*only check moof number (in read mode, mvex can be deleted on the fly)*/
-	//return movie->NextMoofNumber ? 1 : 0;
-	return 0;
+	if (movie->moov->mvex) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
-GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, u32 TrackID, u64 decode_time)
+GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, GF_ISOTrackID TrackID, u64 decode_time)
 {
 	GF_TrackFragmentBox *traf;
 	if (!movie || !movie->moof || !(movie->FragmentsFlags & GF_ISOM_FRAG_WRITE_READY) ) return GF_BAD_PARAM;
 
-	traf = GetTraf(movie, TrackID);
+	traf = gf_isom_get_traf(movie, TrackID);
 	if (!traf) return GF_BAD_PARAM;
 
 	if (!traf->tfdt) {
-		traf->tfdt = (GF_TFBaseMediaDecodeTimeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_TFDT);
+		traf->tfdt = (GF_TFBaseMediaDecodeTimeBox *) gf_isom_box_new_parent(&traf->child_boxes, GF_ISOM_BOX_TYPE_TFDT);
 		if (!traf->tfdt) return GF_OUT_OF_MEM;
 	}
 	traf->tfdt->baseMediaDecodeTime = decode_time;
@@ -2370,34 +3199,34 @@
 
 #else
 
-GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *the_file, u32 media_segment_type)
+GF_Err gf_isom_finalize_for_fragment(GF_ISOFile *the_file, u32 media_segment_type, Bool mvex_after_tracks)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, u32 TrackID,
+GF_Err gf_isom_setup_track_fragment(GF_ISOFile *the_file, GF_ISOTrackID TrackID,
                                     u32 DefaultSampleDescriptionIndex,
                                     u32 DefaultSampleDuration,
                                     u32 DefaultSampleSize,
                                     u8 DefaultSampleIsSync,
                                     u8 DefaultSamplePadding,
                                     u16 DefaultDegradationPriority,
-                                    u8 u8 force_traf_flags)
+                                    Bool u8 force_traf_flags)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_set_fragment_option(GF_ISOFile *the_file, u32 TrackID, u32 Code, u32 Param)
+GF_Err gf_isom_set_fragment_option(GF_ISOFile *the_file, GF_ISOTrackID TrackID, GF_ISOTrackFragmentOption Code, u32 Param)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_start_fragment(GF_ISOFile *the_file, u32 free_data_insert_size)
+GF_Err gf_isom_start_fragment(GF_ISOFile *the_file, GF_ISOStartFragmentFlags flags)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, u32 TrackID, const GF_ISOSample *sample, u32 DescIndex,
+GF_Err gf_isom_fragment_add_sample(GF_ISOFile *the_file, GF_ISOTrackID TrackID, const GF_ISOSample *sample, u32 DescIndex,
                                    u32 Duration, u8 PaddingBits, u16 DegradationPriority, Bool redCoded)
 {
 	return GF_NOT_SUPPORTED;
@@ -2405,28 +3234,28 @@
 
 
 GF_EXPORT
-u32 gf_isom_is_track_fragmented(GF_ISOFile *the_file, u32 TrackID)
+Bool gf_isom_is_track_fragmented(GF_ISOFile *the_file, GF_ISOTrackID TrackID)
 {
-	return 0;
+	return GF_FALSE;
 }
 
 GF_EXPORT
-u32 gf_isom_is_fragmented(GF_ISOFile *the_file)
+Bool gf_isom_is_fragmented(GF_ISOFile *the_file)
 {
-	return 0;
+	return GF_FALSE;
 }
 
-GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, u32 TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
+GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, GF_ISOTrackID TrackID, u32 flags, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
+GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, GF_ISOTrackID TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, u32 TrackID, u64 decode_time)
+GF_Err gf_isom_set_traf_base_media_decode_time(GF_ISOFile *movie, GF_ISOTrackID TrackID, u64 decode_time)
 {
 	return GF_NOT_SUPPORTED;
 }
@@ -2440,6 +3269,15 @@
 {
 	return GF_NOT_SUPPORTED;
 }
+GF_Err gf_isom_fragment_set_sample_flags(GF_ISOFile *movie, GF_ISOTrackID trackID, u32 is_leading, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+GF_Err gf_isom_set_fragment_template(GF_ISOFile *movie, u8 *tpl_data, u32 tpl_size, Bool *has_tfdt)
+{
+	return GF_NOT_SUPPORTED;
+}
 
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS)*/

gpac-0.8.0.tar.gz/src/isomedia/sample_descs.c -> gpac-1.0.0.tar.gz/src/isomedia/sample_descs.c Changed

gpac-0.8.0.tar.gz/src/isomedia/stbl_read.c -> gpac-1.0.0.tar.gz/src/isomedia/stbl_read.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -38,10 +38,11 @@
 	(*prevSampleNumber) = 0;
 
 	if (!stbl->TimeToSample) return GF_ISOM_INVALID_FILE;
-	/*if (!stbl->CompositionOffset) useCTS = 0;
-	FIXME: CTS is ALWAYS disabled for now to make sure samples are fetched in
-	decoding order. */
-	useCTS = 0;
+
+	/*CTS is ALWAYS disabled for now to make sure samples are fetched in decoding order. useCTS is therefore disabled*/
+#if 0
+	if (!stbl->CompositionOffset) useCTS = 0;
+#endif
 
 	//our cache
 	if (stbl->TimeToSample->r_FirstSampleInEntry &&
@@ -58,6 +59,7 @@
 		stbl->TimeToSample->r_currentEntryIndex = 0;
 	}
 
+#if 0
 	//we need to validate our cache if we are using CTS because of B-frames and co...
 	if (i && useCTS) {
 		while (1) {
@@ -80,14 +82,18 @@
 			}
 		}
 	}
+#endif
 
 	//look for the DTS from this entry
 	count = stbl->TimeToSample->nb_entries;
 	for (; i<count; i++) {
 		ent = &stbl->TimeToSample->entries[i];
+#if 0
 		if (useCTS) {
 			stbl_GetSampleCTS(stbl->CompositionOffset, curSampNum, &CTSOffset);
-		} else {
+		} else
+#endif
+		{
 			CTSOffset = 0;
 		}
 		for (j=0; j<ent->sampleCount; j++) {
@@ -125,14 +131,15 @@
 //Get the Size of a given sample
 GF_Err stbl_GetSampleSize(GF_SampleSizeBox *stsz, u32 SampleNumber, u32 *Size)
 {
-	if (!stsz || !SampleNumber || SampleNumber > stsz->sampleCount) return GF_BAD_PARAM;
-
-	(*Size) = 0;
+	if (!stsz || !SampleNumber || (SampleNumber > stsz->sampleCount))
+		return GF_BAD_PARAM;
 
 	if (stsz->sampleSize && (stsz->type != GF_ISOM_BOX_TYPE_STZ2)) {
 		(*Size) = stsz->sampleSize;
 	} else if (stsz->sizes) {
 		(*Size) = stsz->sizes[SampleNumber - 1];
+	} else {
+		(*Size) = 0;
 	}
 	return GF_OK;
 }
@@ -230,7 +237,7 @@
 	return stbl_GetSampleDTS_and_Duration(stts, SampleNumber, DTS, NULL);
 }
 //Retrieve closes RAP for a given sample - if sample is RAP, sets the RAP flag
-GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
+GF_Err stbl_GetSampleRAP(GF_SyncSampleBox *stss, u32 SampleNumber, GF_ISOSAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
 {
 	u32 i;
 	if (prevRAP) *prevRAP = 0;
@@ -261,7 +268,7 @@
 	return GF_OK;
 }
 
-GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, SAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
+GF_Err stbl_SearchSAPs(GF_SampleTableBox *stbl, u32 SampleNumber, GF_ISOSAPType *IsRAP, u32 *prevRAP, u32 *nextRAP)
 {
 	u32 i, j, count, count2;
 	assert(prevRAP);
@@ -327,13 +334,11 @@
 
 			/*store previous & next sample RAP - note that we do not store the closest previous RAP, only the first of the previous RAP group
 			as RAPs are usually isolated this should not be an issue*/
-			if (prevRAP && (first_rap_in_entry <= SampleNumber)) {
+			if (first_rap_in_entry <= SampleNumber) {
 				*prevRAP = first_rap_in_entry;
 			}
-			if (nextRAP) {
-				*nextRAP = last_rap_in_entry;
-			}
-
+			*nextRAP = last_rap_in_entry;
+			
 			/*sample lies in this (rap) group, it is rap*/
 			if (is_rap_group) {
 				if ((first_rap_in_entry <= SampleNumber) && (SampleNumber <= last_rap_in_entry)) {
@@ -362,18 +367,21 @@
 void GetGhostNum(GF_StscEntry *ent, u32 EntryIndex, u32 count, GF_SampleTableBox *stbl)
 {
 	GF_StscEntry *nextEnt;
-	GF_ChunkOffsetBox *stco;
-	GF_ChunkLargeOffsetBox *co64;
 	u32 ghostNum = 1;
 
+	if (!ent) {
+		stbl->SampleToChunk->ghostNumber = 0;
+		return;
+	}
+
 	if (!ent->nextChunk) {
 		if (EntryIndex+1 == count) {
 			//not specified in the spec, what if the last sample to chunk is no written?
 			if (stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
-				stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
+				GF_ChunkOffsetBox *stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
 				ghostNum = (stco->nb_entries > ent->firstChunk) ? (1 + stco->nb_entries - ent->firstChunk) : 1;
 			} else {
-				co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
+				GF_ChunkLargeOffsetBox *co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
 				ghostNum = (co64->nb_entries > ent->firstChunk) ? (1 + co64->nb_entries - ent->firstChunk) : 1;
 			}
 		} else {
@@ -400,9 +408,9 @@
 	(*chunkNumber) = (*descIndex) = 0;
 	if (out_ent) (*out_ent) = NULL;
 	if (!stbl || !sampleNumber) return GF_BAD_PARAM;
-	if (!stbl->ChunkOffset || !stbl->SampleToChunk) return GF_ISOM_INVALID_FILE;
+	if (!stbl->ChunkOffset || !stbl->SampleToChunk || !stbl->SampleSize) return GF_ISOM_INVALID_FILE;
 
-	if (stbl->SampleToChunk->nb_entries == stbl->SampleSize->sampleCount) {
+	if (stbl->SampleSize && stbl->SampleToChunk->nb_entries == stbl->SampleSize->sampleCount) {
 		ent = &stbl->SampleToChunk->entries[sampleNumber-1];
 		if (!ent) return GF_BAD_PARAM;
 		(*descIndex) = ent->sampleDescriptionIndex;
@@ -410,24 +418,29 @@
 		if (out_ent) *out_ent = ent;
 		if ( stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
 			stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
+			if (!stco->offsets) return GF_ISOM_INVALID_FILE;
+
 			(*offset) = (u64) stco->offsets[sampleNumber - 1];
 		} else {
 			co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
+			if (!co64->offsets) return GF_ISOM_INVALID_FILE;
+
 			(*offset) = co64->offsets[sampleNumber - 1];
 		}
 		return GF_OK;
 	}
 
-	//check our cache
+	//check our cache: if desired sample is at or above current cache entry, start from here
 	if (stbl->SampleToChunk->firstSampleInCurrentChunk &&
-	        (stbl->SampleToChunk->firstSampleInCurrentChunk < sampleNumber)) {
+	        (stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber)) {
 
 		i = stbl->SampleToChunk->currentIndex;
-//		ent = gf_list_get(stbl->SampleToChunk->entryList, i);
 		ent = &stbl->SampleToChunk->entries[stbl->SampleToChunk->currentIndex];
 		GetGhostNum(ent, i, stbl->SampleToChunk->nb_entries, stbl);
 		k = stbl->SampleToChunk->currentChunk;
-	} else {
+	}
+	//otherwise start from first entry
+	else {
 		i = 0;
 		stbl->SampleToChunk->currentIndex = 0;
 		stbl->SampleToChunk->currentChunk = 1;
@@ -439,18 +452,29 @@
 
 	//first get the chunk
 	for (; i < stbl->SampleToChunk->nb_entries; i++) {
-		//browse from the current chunk we're browsing from index 1
-		for (; k <= stbl->SampleToChunk->ghostNumber; k++) {
-			if ((stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber)
-				&& (stbl->SampleToChunk->firstSampleInCurrentChunk + ent->samplesPerChunk > sampleNumber)
-			) {
-				goto sample_found;
-			}
+		assert(stbl->SampleToChunk->firstSampleInCurrentChunk <= sampleNumber);
+		assert (k <= stbl->SampleToChunk->ghostNumber);
 
-			//nope, get to next chunk
-			stbl->SampleToChunk->firstSampleInCurrentChunk += ent->samplesPerChunk;
-			stbl->SampleToChunk->currentChunk ++;
+
+		//check if sample is in current chunk
+		u32 max_chunks_in_entry = stbl->SampleToChunk->ghostNumber - k;
+		u32 nb_chunks_for_sample = sampleNumber - stbl->SampleToChunk->firstSampleInCurrentChunk;
+		if (ent->samplesPerChunk) 
+			nb_chunks_for_sample /= ent->samplesPerChunk;
+
+		if (
+			(nb_chunks_for_sample <= max_chunks_in_entry)
+			&& (stbl->SampleToChunk->firstSampleInCurrentChunk + (nb_chunks_for_sample+1) * ent->samplesPerChunk > sampleNumber)
+		) {
+
+			stbl->SampleToChunk->firstSampleInCurrentChunk += nb_chunks_for_sample * ent->samplesPerChunk;
+			stbl->SampleToChunk->currentChunk += nb_chunks_for_sample;
+			goto sample_found;
 		}
+		max_chunks_in_entry += 1;
+		stbl->SampleToChunk->firstSampleInCurrentChunk += max_chunks_in_entry * ent->samplesPerChunk;
+		stbl->SampleToChunk->currentChunk += max_chunks_in_entry;
+
 		//not in this entry, get the next entry if not the last one
 		if (i+1 != stbl->SampleToChunk->nb_entries) {
 			ent = &stbl->SampleToChunk->entries[i+1];
@@ -470,12 +494,13 @@
 	(*descIndex) = ent->sampleDescriptionIndex;
 	(*chunkNumber) = ent->firstChunk + stbl->SampleToChunk->currentChunk - 1;
 	if (out_ent) *out_ent = ent;
-	assert((*chunkNumber));
+	if (! *chunkNumber)
+		return GF_ISOM_INVALID_FILE;
 	
 	//ok, get the size of all the previous samples in the chunk
 	offsetInChunk = 0;
 	//constant size
-	if (stbl->SampleSize->sampleSize) {
+	if (stbl->SampleSize && stbl->SampleSize->sampleSize) {
 		u32 diff = sampleNumber - stbl->SampleToChunk->firstSampleInCurrentChunk;
 		offsetInChunk += diff * stbl->SampleSize->sampleSize;
 	} else {

gpac-0.8.0.tar.gz/src/isomedia/stbl_write.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / ISO Media File Format sub-project
@@ -29,7 +29,11 @@
 
 /*macro used for table gf_realloc - we allocate much more than needed in order to keep the number of
 gf_realloc low, which greatly impacts performances for large files*/
-#define ALLOC_INC(a)	a = ((a<10) ? 100 : (a*3)/2);
+#define ALLOC_INC(a) {\
+		u32 new_a = ((a<10) ? 100 : (a*3)/2);\
+		if (new_a < a) return GF_OUT_OF_MEM;\
+		a = new_a;\
+	}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -94,7 +98,13 @@
 			//use this one and adjust...
 			ent->sampleDelta = (u32) (DTS - stts->w_LastDTS);
 #endif
+
 			ent->sampleCount ++;
+			//little opt, merge last entry with previous one if same delta
+			if ((stts->nb_entries>=2) && (ent->sampleDelta== stts->entries[stts->nb_entries-2].sampleDelta)) {
+				stts->entries[stts->nb_entries-2].sampleCount += ent->sampleCount;
+				stts->nb_entries--;
+			}
 			stts->w_currentSampleNum ++;
 			stts->w_LastDTS = DTS;
 			(*sampleNumber) = stts->w_currentSampleNum;
@@ -146,9 +156,9 @@
 		return GF_BAD_PARAM;
 	}
 
-	/*we will at most insert 2 new entries*/
-	if (stts->nb_entries+2 >= stts->alloc_size) {
-		stts->alloc_size += 2;
+	/*we will at most insert 3 new entries*/
+	if (stts->nb_entries+3 >= stts->alloc_size) {
+		stts->alloc_size += 3;
 		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) );
@@ -158,7 +168,7 @@
 	j=0;
 	stts->nb_entries = 1;
 	stts->entries[0].sampleCount = 1;
-	stts->entries[0].sampleDelta = (u32) DTSs[1] /* - (DTS[0] wichis 0)*/;
+	stts->entries[0].sampleDelta = (u32) DTSs[1] /* - (DTS[0] which is 0)*/;
 	for (i=1; i<stbl->SampleSize->sampleCount+1; i++) {
 		if (i == stbl->SampleSize->sampleCount) {
 			//and by default, our last sample has the same delta as the prev
@@ -193,7 +203,7 @@
 			memset(&ctts->entries[ctts->nb_entries], 0, sizeof(GF_DttsEntry)*(ctts->alloc_size-ctts->nb_entries) );
 		}
 		if (!ctts->entries) return GF_OUT_OF_MEM;
-		
+
 		ctts->entries[ctts->nb_entries].decodingOffset = offset;
 		ctts->entries[ctts->nb_entries].sampleCount = 1;
 		ctts->nb_entries++;
@@ -229,7 +239,8 @@
 	if (ctts->w_LastSampleNumber < sampleNumber) {
 		//add some 0 till we get to the sample
 		while (ctts->w_LastSampleNumber + 1 != sampleNumber) {
-			AddCompositionOffset(ctts, 0);
+			GF_Err e = AddCompositionOffset(ctts, 0);
+			if (e) return e;
 		}
 		return AddCompositionOffset(ctts, offset);
 	}
@@ -258,6 +269,7 @@
 	if (ctts->nb_entries+2>=ctts->alloc_size) {
 		ctts->alloc_size += 2;
 		ctts->entries = gf_realloc(ctts->entries, sizeof(GF_DttsEntry)*ctts->alloc_size);
+		if (!ctts->entries) return GF_OUT_OF_MEM;
 		memset(&ctts->entries[ctts->nb_entries], 0, sizeof(GF_DttsEntry)*(ctts->alloc_size-ctts->nb_entries) );
 	}
 
@@ -311,7 +323,7 @@
 GF_Err stbl_unpackCTS(GF_SampleTableBox *stbl)
 {
 	GF_DttsEntry *packed;
-	u32 i, j, remain, count;
+	u32 i, j, count;
 	GF_CompositionOffsetBox *ctts;
 	ctts = stbl->CompositionOffset;
 	if (!ctts || ctts->unpack_mode) return GF_OK;
@@ -327,6 +339,8 @@
 			if (ctts->nb_entries == ctts->alloc_size) {
 				ALLOC_INC(ctts->alloc_size);
 				ctts->entries = gf_realloc(ctts->entries, sizeof(GF_DttsEntry)*ctts->alloc_size);
+				if (!ctts->entries) return GF_OUT_OF_MEM;
+
 				memset(&ctts->entries[ctts->nb_entries], 0, sizeof(GF_DttsEntry)*(ctts->alloc_size-ctts->nb_entries) );
 			}
 			ctts->entries[ctts->nb_entries].decodingOffset = packed[i].decodingOffset;
@@ -336,17 +350,16 @@
 	}
 	gf_free(packed);
 
-	remain = stbl->SampleSize->sampleCount - ctts->nb_entries;
-	while (remain) {
+	while (stbl->SampleSize->sampleCount > ctts->nb_entries) {
 		if (ctts->nb_entries == ctts->alloc_size) {
 			ALLOC_INC(ctts->alloc_size);
 			ctts->entries = gf_realloc(ctts->entries, sizeof(GF_DttsEntry)*ctts->alloc_size);
+			if (!ctts->entries) return GF_OUT_OF_MEM;
 			memset(&ctts->entries[ctts->nb_entries], 0, sizeof(GF_DttsEntry)*(ctts->alloc_size-ctts->nb_entries) );
 		}
 		ctts->entries[ctts->nb_entries].decodingOffset = 0;
 		ctts->entries[ctts->nb_entries].sampleCount = 1;
 		ctts->nb_entries++;
-		remain--;
 	}
 	return GF_OK;
 }
@@ -486,16 +499,17 @@
 	GF_SampleDependencyTypeBox *sdtp;
 
 	if (stbl->SampleDep == NULL) {
-		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
 		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
 	}
 	sdtp = stbl->SampleDep;
 	if (sdtp->sampleCount + 1 < sampleNumber) {
 		u32 missed = sampleNumber-1 - sdtp->sampleCount;
 		sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount+missed) );
+		if (!sdtp->sample_info) return GF_OUT_OF_MEM;
 		memset(&sdtp->sample_info[sdtp->sampleCount], 0, sizeof(u8) * missed );
 		while (missed) {
-			SAPType isRAP;
+			GF_ISOSAPType isRAP;
 			if (stbl->SyncSample) stbl_GetSampleRAP(stbl->SyncSample, sdtp->sampleCount+1, &isRAP, NULL, NULL);
 			else isRAP = 1;
 			sdtp->sample_info[sdtp->sampleCount] = isRAP ? 0x20 : 0;
@@ -518,22 +532,53 @@
 	return GF_OK;
 }
 
+GF_Err stbl_SetDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
+{
+	GF_SampleDependencyTypeBox *sdtp;
+	u32 flags;
+	if (stbl->SampleDep == NULL) {
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
+		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
+	}
+	sdtp = stbl->SampleDep;
+
+	flags = 0;
+	flags |= isLeading << 6;
+	flags |= dependsOn << 4;
+	flags |= dependedOn << 2;
+	flags |= redundant;
+
+	if (sdtp->sampleCount < sampleNumber) {
+		u32 i;
+		sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * sampleNumber);
+		if (!sdtp->sample_info) return GF_OUT_OF_MEM;
+
+		for (i=sdtp->sampleCount; i<sampleNumber; i++) {
+			sdtp->sample_info[i] = 0;
+		}
+		sdtp->sampleCount = sampleNumber;
+	}
+	sdtp->sample_info[sampleNumber-1] = flags;
+	return GF_OK;
+}
+
 GF_Err stbl_AddDependencyType(GF_SampleTableBox *stbl, u32 sampleNumber, u32 isLeading, u32 dependsOn, u32 dependedOn, u32 redundant)
 {
 	u32 flags;
 	GF_SampleDependencyTypeBox *sdtp;
 
 	if (stbl->SampleDep == NULL) {
-		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
 		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
 	}
 	sdtp = stbl->SampleDep;
 	if (sdtp->sampleCount + 1 < sampleNumber) {
 		u32 missed = sampleNumber-1 - sdtp->sampleCount;
 		sdtp->sample_info = (u8*) gf_realloc(sdtp->sample_info, sizeof(u8) * (sdtp->sampleCount+missed) );
+		if (!sdtp->sample_info) return GF_OUT_OF_MEM;
 		memset(&sdtp->sample_info[sdtp->sampleCount], 0, sizeof(u8) * missed );
 		while (missed) {
-			SAPType isRAP;
+			GF_ISOSAPType isRAP;
 			if (stbl->SyncSample) stbl_GetSampleRAP(stbl->SyncSample, sdtp->sampleCount+1, &isRAP, NULL, NULL);
 			else isRAP = 1;
 			sdtp->sample_info[sdtp->sampleCount] = isRAP ? (2<<4) : 0;
@@ -571,7 +616,7 @@
 	GF_SampleDependencyTypeBox *sdtp;
 	u32 flags;
 	if (stbl->SampleDep == NULL) {
-		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
 		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
 	}
 	sdtp = stbl->SampleDep;
@@ -630,7 +675,7 @@
 	stbl = mdia->information->sampleTable;
 	stsc = stbl->SampleToChunk;
 
-	if (stsc->w_lastSampleNumber + 1 < sampleNumber ) return GF_BAD_PARAM;
+//	if (stsc->w_lastSampleNumber + 1 < sampleNumber ) return GF_BAD_PARAM;
 	if (!nb_pack_samples)
 		nb_pack_samples = 1;
 
@@ -657,32 +702,48 @@
 		u32 samples_in_next_entry = 0;
 		u32 next_entry_first_chunk = 1;
 		for (i=0; i<stsc->nb_entries; i++) {
-			u32 k, nb_chunks = 1;
+			u32 nb_chunks = 1;
 			ent = &stsc->entries[i];
 			if (i+1<stsc->nb_entries) nb_chunks = stsc->entries[i+1].firstChunk - ent->firstChunk;
 			for (k=0; k<nb_chunks; k++) {
 				if ((cur_samp <= sampleNumber) && (ent->samplesPerChunk + cur_samp > sampleNumber)) {
 					insert_idx = i;
-					samples_in_next_entry = ent->samplesPerChunk - (sampleNumber-cur_samp);
-					ent->samplesPerChunk = sampleNumber-cur_samp;
+					//stsc entry has samples before inserted sample, split
+					if (sampleNumber>cur_samp) {
+						samples_in_next_entry = ent->samplesPerChunk - (sampleNumber-cur_samp);
+						ent->samplesPerChunk = sampleNumber-cur_samp;
+					}
 					break;
 				}
-				if (insert_idx>=0) break;
 				cur_samp += ent->samplesPerChunk;
 				next_entry_first_chunk++;
 			}
+			if (insert_idx>=0) break;
 		}
+		//we need to split the entry
 		if (samples_in_next_entry) {
-			memmove(&stsc->entries[insert_idx+3], &stsc->entries[insert_idx+2], sizeof(GF_StscEntry)*(stsc->nb_entries+1-insert_idx));
-			ent = &stsc->entries[insert_idx+1];
+			memmove(&stsc->entries[insert_idx+3], &stsc->entries[insert_idx+1], sizeof(GF_StscEntry)*(stsc->nb_entries - insert_idx - 1));
+			//copy over original entry
+			ent = &stsc->entries[insert_idx];
 			stsc->entries[insert_idx+2] = *ent;
 			stsc->entries[insert_idx+2].samplesPerChunk = samples_in_next_entry;
-			stsc->entries[insert_idx+2].firstChunk = next_entry_first_chunk + 2;
+			stsc->entries[insert_idx+2].firstChunk = next_entry_first_chunk + 1;
+
+			//setup new entry
+			ent = &stsc->entries[insert_idx+1];
+			ent->firstChunk = next_entry_first_chunk;
+
 			stsc->nb_entries += 2;
 		} else {
-			memmove(&stsc->entries[insert_idx+1], &stsc->entries[insert_idx], sizeof(GF_StscEntry)*(stsc->nb_entries+1-insert_idx));
-			ent = &stsc->entries[insert_idx+1];
-			ent->firstChunk = next_entry_first_chunk +1;
+			if (insert_idx<0) {
+				ent = &stsc->entries[stsc->nb_entries];
+				insert_idx = stsc->nb_entries;
+			} else {
+				memmove(&stsc->entries[insert_idx+1], &stsc->entries[insert_idx], sizeof(GF_StscEntry)*(stsc->nb_entries+1-insert_idx));
+				ent = &stsc->entries[insert_idx+1];
+			}
+
+			ent->firstChunk = next_entry_first_chunk;
 			stsc->nb_entries += 1;
 		}
 		new_chunk_idx = next_entry_first_chunk;
@@ -717,7 +778,8 @@
 		stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
 		//if the new offset is a large one, we have to rewrite our table entry by entry (32->64 bit conv)...
 		if (offset > 0xFFFFFFFF) {
-			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
+			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_CO64);
+			if (!co64) return GF_OUT_OF_MEM;
 			co64->nb_entries = stco->nb_entries + 1;
 			co64->alloc_size = co64->nb_entries;
 			co64->offsets = (u64*)gf_malloc(sizeof(u64) * co64->nb_entries);
@@ -731,7 +793,7 @@
 				co64->offsets[i+k] = (u64) stco->offsets[i];
 			}
 			if (!k) co64->offsets[co64->nb_entries - 1] = offset;
-			gf_isom_box_del(stbl->ChunkOffset);
+			gf_isom_box_del_parent(&stbl->child_boxes, stbl->ChunkOffset);
 			stbl->ChunkOffset = (GF_Box *) co64;
 		} else {
 			//no, we can use this one.
@@ -795,7 +857,6 @@
 		}
 	}
 
-
 	return GF_OK;
 }
 
@@ -821,7 +882,8 @@
 	if (stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
 		//if the new offset is a large one, we have to rewrite our table...
 		if (offset > 0xFFFFFFFF) {
-			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
+			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_CO64);
+			if (!co64) return GF_OUT_OF_MEM;
 			co64->nb_entries = ((GF_ChunkOffsetBox *)stbl->ChunkOffset)->nb_entries;
 			co64->alloc_size = co64->nb_entries;
 			co64->offsets = (u64*)gf_malloc(sizeof(u64)*co64->nb_entries);
@@ -830,7 +892,7 @@
 				co64->offsets[i] = (u64) ((GF_ChunkOffsetBox *)stbl->ChunkOffset)->offsets[i];
 			}
 			co64->offsets[ent->firstChunk - 1] = offset;
-			gf_isom_box_del(stbl->ChunkOffset);
+			gf_isom_box_del_parent(&stbl->child_boxes, stbl->ChunkOffset);
 			stbl->ChunkOffset = (GF_Box *) co64;
 			return GF_OK;
 		}
@@ -852,7 +914,8 @@
 	if (ctts->w_LastSampleNumber < sampleNumber) {
 		//add some 0 till we get to the sample
 		while (ctts->w_LastSampleNumber + 1 != sampleNumber) {
-			AddCompositionOffset(ctts, 0);
+			GF_Err e = AddCompositionOffset(ctts, 0);
+			if (e) return e;
 		}
 		return AddCompositionOffset(ctts, offset);
 	}
@@ -1026,6 +1089,7 @@
 				if (j+1==stts->alloc_size) {
 					stts->alloc_size++;
 					stts->entries = gf_realloc(stts->entries, sizeof(GF_SttsEntry) * stts->alloc_size);
+					if (!stts->entries) return GF_OUT_OF_MEM;
 				}
 				j++;
 				stts->entries[j].sampleCount = 1;
@@ -1052,11 +1116,13 @@
 GF_Err stbl_RemoveCTS(GF_SampleTableBox *stbl, u32 sampleNumber)
 {
 	GF_CompositionOffsetBox *ctts = stbl->CompositionOffset;
+	if (!ctts) return GF_OK;
+
 	assert(ctts->unpack_mode);
 
 	//last one...
 	if (stbl->SampleSize->sampleCount == 1) {
-		gf_isom_box_del((GF_Box *) ctts);
+		gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) ctts);
 		stbl->CompositionOffset = NULL;
 		return GF_OK;
 	}
@@ -1073,8 +1139,9 @@
 	return GF_OK;
 }
 
-GF_Err stbl_RemoveSize(GF_SampleSizeBox *stsz, u32 sampleNumber)
+GF_Err stbl_RemoveSize(GF_SampleTableBox *stbl, u32 sampleNumber)
 {
+	GF_SampleSizeBox *stsz = stbl->SampleSize;
 	//last sample
 	if (stsz->sampleCount == 1) {
 		if (stsz->sizes) gf_free(stsz->sizes);
@@ -1102,6 +1169,30 @@
 	u64 *Loffsets;
 	GF_SampleToChunkBox *stsc = stbl->SampleToChunk;
 
+	//raw audio or constant sample size and dur
+	if (stsc->nb_entries < stbl->SampleSize->sampleCount) {
+		if (sampleNumber==stbl->SampleSize->sampleCount+1) {
+			GF_StscEntry *ent = &stsc->entries[stsc->nb_entries-1];
+			if (ent->samplesPerChunk)
+				ent->samplesPerChunk--;
+			if (!ent->samplesPerChunk) {
+				stsc->nb_entries--;
+
+				if (stbl->ChunkOffset->type == GF_ISOM_BOX_TYPE_STCO) {
+					((GF_ChunkOffsetBox *)stbl->ChunkOffset)->nb_entries --;
+				} else {
+					((GF_ChunkLargeOffsetBox *)stbl->ChunkOffset)->nb_entries --;
+				}
+				if (stsc->nb_entries) {
+					ent = &stsc->entries[stsc->nb_entries-1];
+					ent->nextChunk --;
+				}
+			}
+			return GF_OK;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] removing sample in middle of track not supported for constant size and duration samples\n"));
+		return GF_NOT_SUPPORTED;
+	}
 	//remove the entry in SampleToChunk (1 <-> 1 in edit mode)
 	memmove(&stsc->entries[sampleNumber-1], &stsc->entries[sampleNumber], sizeof(GF_StscEntry)*(stsc->nb_entries-sampleNumber));
 	stsc->nb_entries--;
@@ -1173,6 +1264,8 @@
 	u32 i;
 
 	GF_SyncSampleBox *stss = stbl->SyncSample;
+	if (!stss) return GF_OK;
+
 	//we remove the only one around...
 	if (stss->nb_entries == 1) {
 		if (stss->sampleNumbers[0] != sampleNumber) return GF_OK;
@@ -1209,14 +1302,18 @@
 	i = stbl->SampleDep->sampleCount - SampleNumber;
 	if (i) memmove(&stbl->SampleDep->sample_info[SampleNumber-1], & stbl->SampleDep->sample_info[SampleNumber], sizeof(u8)*i);
 	stbl->SampleDep->sample_info = (u8*)gf_realloc(stbl->SampleDep->sample_info, sizeof(u8) * (stbl->SampleDep->sampleCount-1));
+	if (!stbl->SampleDep->sample_info) return GF_OUT_OF_MEM;
 	stbl->SampleDep->sampleCount-=1;
 	return GF_OK;
 }
 
-GF_Err stbl_RemoveShadow(GF_ShadowSyncBox *stsh, u32 sampleNumber)
+GF_Err stbl_RemoveShadow(GF_SampleTableBox *stbl, u32 sampleNumber)
 {
 	u32 i;
+	GF_ShadowSyncBox *stsh;
 	GF_StshEntry *ent;
+	if (!stbl->ShadowSync) return GF_OK;
+	stsh = stbl->ShadowSync;
 
 	//we loop for the whole chain cause the spec doesn't say if we can have several
 	//shadows for 1 sample...
@@ -1241,7 +1338,10 @@
 	if (SampleNumber > stbl->SampleSize->sampleCount) return GF_BAD_PARAM;
 
 	//create the table
-	if (!stbl->PaddingBits) stbl->PaddingBits = (GF_PaddingBitsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_PADB);
+	if (!stbl->PaddingBits) {
+		stbl->PaddingBits = (GF_PaddingBitsBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_PADB);
+		if (!stbl->PaddingBits) return GF_OUT_OF_MEM;
+	}
 
 	//alloc
 	if (!stbl->PaddingBits->padbits || !stbl->PaddingBits->SampleCount) {
@@ -1276,7 +1376,7 @@
 
 	//last sample - remove the table
 	if (stbl->PaddingBits->SampleCount == 1) {
-		gf_isom_box_del((GF_Box *) stbl->PaddingBits);
+		gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) stbl->PaddingBits);
 		stbl->PaddingBits = NULL;
 		return GF_OK;
 	}
@@ -1359,7 +1459,7 @@
 			gf_list_rem(stbl->sampleGroups, i);
 			i--;
 			count--;
-			gf_isom_box_del((GF_Box *) e);
+			gf_isom_box_del_parent(&stbl->child_boxes, (GF_Box *) e);
 		}
 	}
 	return GF_OK;
@@ -1368,7 +1468,6 @@
 GF_Err stbl_SampleSizeAppend(GF_SampleSizeBox *stsz, u32 data_size)
 {
 	u32 i;
-	u32 single_size = 0;
 	if (!stsz || !stsz->sampleCount) return GF_BAD_PARAM;
 
 	//we must realloc our table
@@ -1381,6 +1480,7 @@
 	if (!stsz->sizes) {
 		stsz->sampleSize = data_size;
 	} else {
+		u32 single_size;
 		stsz->sizes[stsz->sampleCount-1] += data_size;
 
 		single_size = stsz->sizes[0];
@@ -1403,7 +1503,7 @@
 
 
 
-void stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack)
+GF_Err stbl_AppendTime(GF_SampleTableBox *stbl, u32 duration, u32 nb_pack)
 {
 	GF_TimeToSampleBox *stts = stbl->TimeToSample;
 
@@ -1411,21 +1511,23 @@
 	if (stts->nb_entries) {
 		if (stts->entries[stts->nb_entries-1].sampleDelta == duration) {
 			stts->entries[stts->nb_entries-1].sampleCount += nb_pack;
-			return;
+			return GF_OK;
 		}
 	}
 	if (stts->nb_entries==stts->alloc_size) {
 		ALLOC_INC(stts->alloc_size);
 		stts->entries = gf_realloc(stts->entries, sizeof(GF_SttsEntry)*stts->alloc_size);
-		if (!stts->entries) return;
+		if (!stts->entries) return GF_OUT_OF_MEM;
 		memset(&stts->entries[stts->nb_entries], 0, sizeof(GF_SttsEntry)*(stts->alloc_size-stts->nb_entries) );
 	}
 	stts->entries[stts->nb_entries].sampleCount = nb_pack;
 	stts->entries[stts->nb_entries].sampleDelta = duration;
 	stts->nb_entries++;
+	if (stts->max_ts_delta < duration ) stts->max_ts_delta = duration;
+	return GF_OK;
 }
 
-void stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack)
+GF_Err stbl_AppendSize(GF_SampleTableBox *stbl, u32 size, u32 nb_pack)
 {
 	u32 i;
 	if (!nb_pack) nb_pack = 1;
@@ -1433,20 +1535,20 @@
 	if (!stbl->SampleSize->sampleCount) {
 		stbl->SampleSize->sampleSize = size;
 		stbl->SampleSize->sampleCount += nb_pack;
-		return;
+		return GF_OK;
 	}
 	if (stbl->SampleSize->sampleSize && (stbl->SampleSize->sampleSize==size)) {
 		stbl->SampleSize->sampleCount += nb_pack;
-		return;
+		return GF_OK;
 	}
-	if (!stbl->SampleSize->sizes || (stbl->SampleSize->sampleCount==stbl->SampleSize->alloc_size)) {
+	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 >= stbl->SampleSize->alloc_size)
-			stbl->SampleSize->alloc_size = stbl->SampleSize->sampleCount+1;
+		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;
+		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) {
@@ -1455,60 +1557,65 @@
 		}
 	}
 	stbl->SampleSize->sampleSize = 0;
-	stbl->SampleSize->sizes[stbl->SampleSize->sampleCount] = size;
+	for (i=0; i<nb_pack; i++) {
+		stbl->SampleSize->sizes[stbl->SampleSize->sampleCount+i] = size;
+	}
 	stbl->SampleSize->sampleCount += nb_pack;
+	if (size > stbl->SampleSize->max_size)
+		stbl->SampleSize->max_size = size;
+	stbl->SampleSize->total_size += size;
+	stbl->SampleSize->total_samples += nb_pack;
+	return GF_OK;
 }
 
 
 
-void stbl_AppendChunk(GF_SampleTableBox *stbl, u64 offset)
+GF_Err stbl_AppendChunk(GF_SampleTableBox *stbl, u64 offset)
 {
 	GF_ChunkOffsetBox *stco;
 	GF_ChunkLargeOffsetBox *co64;
-	u32 *new_offsets, i;
-	u64 *off_64;
-
+	u32 i;
+	
 	//we may have to convert the table...
 	if (stbl->ChunkOffset->type==GF_ISOM_BOX_TYPE_STCO) {
 		stco = (GF_ChunkOffsetBox *)stbl->ChunkOffset;
 
 		if (offset>0xFFFFFFFF) {
-			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
+			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_CO64);
+			if (!co64) return GF_OUT_OF_MEM;
 			co64->nb_entries = stco->nb_entries + 1;
+			if (co64->nb_entries<=stco->nb_entries) return GF_OUT_OF_MEM;
 			co64->alloc_size = co64->nb_entries;
 			co64->offsets = (u64*)gf_malloc(sizeof(u64) * co64->nb_entries);
-			if (!co64->offsets) return;
+			if (!co64->offsets) return GF_OUT_OF_MEM;
 			for (i=0; i<stco->nb_entries; i++) co64->offsets[i] = stco->offsets[i];
 			co64->offsets[i] = offset;
-			gf_isom_box_del(stbl->ChunkOffset);
+			gf_isom_box_del_parent(&stbl->child_boxes, stbl->ChunkOffset);
 			stbl->ChunkOffset = (GF_Box *) co64;
-			return;
+			return GF_OK;
 		}
 		//we're fine
-		new_offsets = (u32*)gf_malloc(sizeof(u32)*(stco->nb_entries+1));
-		if (!new_offsets) return;
-		for (i=0; i<stco->nb_entries; i++) new_offsets[i] = stco->offsets[i];
-		new_offsets[i] = (u32) offset;
-		if (stco->offsets) gf_free(stco->offsets);
-		stco->offsets = new_offsets;
+		stco->alloc_size = stco->nb_entries + 1;
+		if (stco->alloc_size < stco->nb_entries + 1) return GF_OUT_OF_MEM;
+		stco->offsets = gf_realloc(stco->offsets, sizeof(u32)*stco->alloc_size);
+		if (!stco->offsets) return GF_OUT_OF_MEM;
+		stco->offsets[stco->nb_entries] = (u32) offset;
 		stco->nb_entries += 1;
-		stco->alloc_size = stco->nb_entries;
-	}
-	//large offsets
-	else {
-		co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
-		off_64 = (u64*)gf_malloc(sizeof(u64)*(co64->nb_entries+1));
-		if (!off_64) return;
-		for (i=0; i<co64->nb_entries; i++) off_64[i] = co64->offsets[i];
-		off_64[i] = offset;
-		if (co64->offsets) gf_free(co64->offsets);
-		co64->offsets = off_64;
-		co64->nb_entries += 1;
-		co64->alloc_size = co64->nb_entries;
+		return GF_OK;
 	}
+
+	co64 = (GF_ChunkLargeOffsetBox *)stbl->ChunkOffset;
+	co64->alloc_size = co64->nb_entries+1;
+	if (co64->alloc_size < co64->nb_entries + 1) return GF_OUT_OF_MEM;
+
+	co64->offsets = gf_realloc(co64->offsets, sizeof(u64)*co64->alloc_size);
+	if (!co64->offsets) return GF_OUT_OF_MEM;
+	co64->offsets[co64->nb_entries] = offset;
+	co64->alloc_size = co64->nb_entries;
+	return GF_OK;
 }
 
-void stbl_AppendSampleToChunk(GF_SampleTableBox *stbl, u32 DescIndex, u32 samplesInChunk)
+GF_Err stbl_AppendSampleToChunk(GF_SampleTableBox *stbl, u32 DescIndex, u32 samplesInChunk)
 {
 	u32 nextChunk;
 	GF_SampleToChunkBox *stsc= stbl->SampleToChunk;
@@ -1520,7 +1627,7 @@
 		ent = &stsc->entries[stsc->nb_entries-1];
 		//good we can use this one
 		if ( (ent->sampleDescriptionIndex == DescIndex) && (ent->samplesPerChunk==samplesInChunk))
-			return;
+			return GF_OK;
 
 		//set the next chunk btw ...
 		ent->nextChunk = nextChunk;
@@ -1528,7 +1635,7 @@
 	if (stsc->nb_entries==stsc->alloc_size) {
 		ALLOC_INC(stsc->alloc_size);
 		stsc->entries = gf_realloc(stsc->entries, sizeof(GF_StscEntry)*stsc->alloc_size);
-		if (!stsc->entries) return;
+		if (!stsc->entries) return GF_OUT_OF_MEM;
 		memset(&stsc->entries[stsc->nb_entries], 0, sizeof(GF_StscEntry)*(stsc->alloc_size - stsc->nb_entries) );
 	}
 	//ok we need a new entry - this assumes this function is called AFTER AppendChunk
@@ -1538,120 +1645,160 @@
 	ent->samplesPerChunk = samplesInChunk;
 	ent->isEdited = 0;
 	stsc->nb_entries++;
+	return GF_OK;
 }
 
 //called AFTER AddSize
-void stbl_AppendRAP(GF_SampleTableBox *stbl, u8 isRap)
+GF_Err stbl_AppendRAP(GF_SampleTableBox *stbl, u8 isRap)
 {
 	u32 i;
 
 	//no sync table
 	if (!stbl->SyncSample) {
 		//all samples RAP - no table
-		if (isRap) return;
+		if (isRap) return GF_OK;
 
 		//nope, create one
-		stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
+		stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STSS);
+		if (!stbl->SyncSample) return GF_OUT_OF_MEM;
+
 		if (stbl->SampleSize->sampleCount > 1) {
 			stbl->SyncSample->sampleNumbers = (u32*)gf_malloc(sizeof(u32) * (stbl->SampleSize->sampleCount-1));
-			if (!stbl->SyncSample->sampleNumbers) return;
+			if (!stbl->SyncSample->sampleNumbers) return GF_OUT_OF_MEM;
 			for (i=0; i<stbl->SampleSize->sampleCount-1; i++)
 				stbl->SyncSample->sampleNumbers[i] = i+1;
 
 		}
 		stbl->SyncSample->nb_entries = stbl->SampleSize->sampleCount-1;
 		stbl->SyncSample->alloc_size = stbl->SyncSample->nb_entries;
-		return;
+		return GF_OK;
 	}
-	if (!isRap) return;
+	if (!isRap) return GF_OK;
 
 	if (stbl->SyncSample->alloc_size == stbl->SyncSample->nb_entries) {
 		ALLOC_INC(stbl->SyncSample->alloc_size);
 		stbl->SyncSample->sampleNumbers = (u32*) gf_realloc(stbl->SyncSample->sampleNumbers, sizeof(u32) * stbl->SyncSample->alloc_size);
-		if (!stbl->SyncSample->sampleNumbers) return;
+		if (!stbl->SyncSample->sampleNumbers) return GF_OUT_OF_MEM;
 		memset(&stbl->SyncSample->sampleNumbers[stbl->SyncSample->nb_entries], 0, sizeof(u32) * (stbl->SyncSample->alloc_size-stbl->SyncSample->nb_entries) );
 	}
 	stbl->SyncSample->sampleNumbers[stbl->SyncSample->nb_entries] = stbl->SampleSize->sampleCount;
 	stbl->SyncSample->nb_entries += 1;
+	return GF_OK;
 }
 
-void stbl_AppendTrafMap(GF_SampleTableBox *stbl)
+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_TrafToSampleMap *tmap;
-
+	GF_TrafMapEntry *tmap_ent;
 	if (!stbl->traf_map) {
 		//nope, create one
 		GF_SAFEALLOC(stbl->traf_map, GF_TrafToSampleMap);
-		if (!stbl->traf_map) return;
+		if (!stbl->traf_map) return GF_OUT_OF_MEM;
 	}
 	tmap = stbl->traf_map;
-	if (tmap->nb_entries >= stbl->SampleSize->sampleCount)
+	if (tmap->nb_entries >= stbl->SampleSize->sampleCount) {
+		u32 i;
+		for (i=0; i<tmap->nb_entries; i++) {
+			if (tmap->frag_starts[i].moof_template)
+				gf_free(tmap->frag_starts[i].moof_template);
+		}
+		memset(tmap->frag_starts, 0, sizeof(GF_TrafMapEntry)*tmap->nb_alloc);
 		tmap->nb_entries = 0;
+	}
 
 	if (tmap->nb_entries + 1 > tmap->nb_alloc) {
 		tmap->nb_alloc++;
-		tmap->sample_num = gf_realloc(tmap->sample_num, sizeof(u32) * tmap->nb_alloc);
+		tmap->frag_starts = gf_realloc(tmap->frag_starts, sizeof(GF_TrafMapEntry) * tmap->nb_alloc);
+		if (!tmap->frag_starts) return GF_OUT_OF_MEM;
 	}
-	tmap->sample_num[tmap->nb_entries] = stbl->SampleSize->sampleCount;
+	tmap_ent = &tmap->frag_starts[tmap->nb_entries];
 	tmap->nb_entries += 1;
+
+	memset(tmap_ent, 0, sizeof(GF_TrafMapEntry));
+	tmap_ent->sample_num = stbl->SampleSize->sampleCount;
+	tmap_ent->moof_template = moof_template;
+	tmap_ent->moof_template_size = moof_template_size;
+	tmap_ent->moof_start = frag_start_offset;
+	tmap_ent->sidx_start = sidx_start;
+	tmap_ent->sidx_end = sidx_end;
+	if (is_seg_start)
+		tmap_ent->seg_start_plus_one = 1 + seg_start_offset;
+
+	return GF_OK;
 }
 
-void stbl_AppendPadding(GF_SampleTableBox *stbl, u8 padding)
+GF_Err stbl_AppendPadding(GF_SampleTableBox *stbl, u8 padding)
 {
-	u32 i;
-	u8 *pad_bits;
-	if (!stbl->PaddingBits) stbl->PaddingBits = (GF_PaddingBitsBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_PADB);
-
-	pad_bits = (u8*)gf_malloc(sizeof(u8) * stbl->SampleSize->sampleCount);
-	if (!pad_bits) return;
-	memset(pad_bits, 0, sizeof(u8) * stbl->SampleSize->sampleCount);
-	for (i=0; i<stbl->PaddingBits->SampleCount; i++) pad_bits[i] = stbl->PaddingBits->padbits[i];
-	pad_bits[stbl->SampleSize->sampleCount-1] = padding;
-	if (stbl->PaddingBits->padbits) gf_free(stbl->PaddingBits->padbits);
-	stbl->PaddingBits->padbits = pad_bits;
+	if (!stbl->PaddingBits) {
+		stbl->PaddingBits = (GF_PaddingBitsBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_PADB);
+		if (!stbl->PaddingBits) return GF_OUT_OF_MEM;
+	}
+	stbl->PaddingBits->padbits = (u8*)gf_realloc(stbl->PaddingBits->padbits, sizeof(u8) * stbl->SampleSize->sampleCount);
+	if (!stbl->PaddingBits->padbits) return GF_OUT_OF_MEM;
+	stbl->PaddingBits->padbits[stbl->SampleSize->sampleCount-1] = padding;
 	stbl->PaddingBits->SampleCount = stbl->SampleSize->sampleCount;
+	return GF_OK;
 }
 
-void stbl_AppendCTSOffset(GF_SampleTableBox *stbl, s32 offset)
+GF_Err stbl_AppendCTSOffset(GF_SampleTableBox *stbl, s32 offset)
 {
 	GF_CompositionOffsetBox *ctts;
 
-	if (!stbl->CompositionOffset) stbl->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CTTS);
-
+	if (!stbl->CompositionOffset) {
+		stbl->CompositionOffset = (GF_CompositionOffsetBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_CTTS);
+		if (!stbl->CompositionOffset) return GF_OUT_OF_MEM;
+	}
 	ctts = stbl->CompositionOffset;
 
 	if (ctts->nb_entries && (ctts->entries[ctts->nb_entries-1].decodingOffset == offset) ) {
 		ctts->entries[ctts->nb_entries-1].sampleCount++;
-		return;
+		return GF_OK;
 	}
 	if (ctts->nb_entries==ctts->alloc_size) {
 		ALLOC_INC(ctts->alloc_size);
 		ctts->entries = gf_realloc(ctts->entries, sizeof(GF_DttsEntry)*ctts->alloc_size);
+		if (!ctts->entries) return GF_OUT_OF_MEM;
 		memset(&ctts->entries[ctts->nb_entries], 0, sizeof(GF_DttsEntry)*(ctts->alloc_size-ctts->nb_entries) );
 	}
 	ctts->entries[ctts->nb_entries].decodingOffset = offset;
 	ctts->entries[ctts->nb_entries].sampleCount = 1;
 	ctts->nb_entries++;
 	if (offset<0) ctts->version=1;
+
+	if (ABS(offset) > ctts->max_ts_delta) ctts->max_ts_delta = ABS(offset);
+
+	return GF_OK;
 }
 
-void stbl_AppendDegradation(GF_SampleTableBox *stbl, u16 DegradationPriority)
+GF_Err stbl_AppendDegradation(GF_SampleTableBox *stbl, u16 DegradationPriority)
 {
-	if (!stbl->DegradationPriority) stbl->DegradationPriority = (GF_DegradationPriorityBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STDP);
+	if (!stbl->DegradationPriority) {
+		stbl->DegradationPriority = (GF_DegradationPriorityBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_STDP);
+		if (!stbl->DegradationPriority) return GF_OUT_OF_MEM;
+	}
 
 	stbl->DegradationPriority->priorities = (u16 *)gf_realloc(stbl->DegradationPriority->priorities, sizeof(u16) * stbl->SampleSize->sampleCount);
+	if (!stbl->DegradationPriority->priorities) return GF_OUT_OF_MEM;
 	stbl->DegradationPriority->priorities[stbl->SampleSize->sampleCount-1] = DegradationPriority;
 	stbl->DegradationPriority->nb_entries = stbl->SampleSize->sampleCount;
+	return GF_OK;
 }
 
-void stbl_AppendDepType(GF_SampleTableBox *stbl, u32 DepType)
+#if 0
+GF_Err stbl_AppendDepType(GF_SampleTableBox *stbl, u32 DepType)
 {
-	if (!stbl->SampleDep) stbl->SampleDep= (GF_SampleDependencyTypeBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SDTP);
+	if (!stbl->SampleDep) {
+		stbl->SampleDep = (GF_SampleDependencyTypeBox *) gf_isom_box_new_parent(&stbl->child_boxes, GF_ISOM_BOX_TYPE_SDTP);
+		if (!stbl->SampleDep) return GF_OUT_OF_MEM;
+	}
 	stbl->SampleDep->sample_info = (u8*)gf_realloc(stbl->SampleDep->sample_info, sizeof(u8)*stbl->SampleSize->sampleCount );
+	if (!stbl->SampleDep->sample_info) return GF_OUT_OF_MEM;
 	stbl->SampleDep->sample_info[stbl->SampleDep->sampleCount] = DepType;
 	stbl->SampleDep->sampleCount = stbl->SampleSize->sampleCount;
-
+	return GF_OK;
 }
+#endif
+
 
 
 
@@ -1711,6 +1858,7 @@
 
 	//create a new SampleToChunk table
 	stsc_tmp = (GF_SampleToChunkBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSC);
+	if (!stsc_tmp) return GF_OUT_OF_MEM;
 
 	stsc_tmp->nb_entries = stsc_tmp->alloc_size = stbl->SampleSize->sampleCount;
 	stsc_tmp->entries = gf_malloc(sizeof(GF_StscEntry)*stsc_tmp->nb_entries);
@@ -1743,6 +1891,8 @@
 
 
 	//done, remove our previous tables
+	gf_list_del_item(stbl->child_boxes, stbl->ChunkOffset);
+	gf_list_del_item(stbl->child_boxes, stbl->SampleToChunk);
 	gf_isom_box_del(stbl->ChunkOffset);
 	gf_isom_box_del((GF_Box *)stbl->SampleToChunk);
 	//and set these ones...
@@ -1752,6 +1902,9 @@
 		stbl->ChunkOffset = (GF_Box *)co64_tmp;
 	}
 	stbl->SampleToChunk = stsc_tmp;
+	gf_list_add(stbl->child_boxes, stbl->ChunkOffset);
+	gf_list_add(stbl->child_boxes, stbl->SampleToChunk);
+
 	stbl->SampleToChunk->currentIndex = 0;
 	stbl->SampleToChunk->currentChunk = 0;
 	stbl->SampleToChunk->firstSampleInCurrentChunk = 0;
@@ -1766,14 +1919,14 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-static GFINLINE GF_Err stbl_AddOffset(GF_Box **a, u64 offset)
+static GFINLINE GF_Err stbl_AddOffset(GF_SampleTableBox *stbl, GF_Box **old_stco, u64 offset)
 {
 	GF_ChunkOffsetBox *stco;
 	GF_ChunkLargeOffsetBox *co64;
 	u32 i;
 
-	if ((*a)->type == GF_ISOM_BOX_TYPE_STCO) {
-		stco = (GF_ChunkOffsetBox *) *a;
+	if ((*old_stco)->type == GF_ISOM_BOX_TYPE_STCO) {
+		stco = (GF_ChunkOffsetBox *) *old_stco;
 		//if dataOffset is bigger than 0xFFFFFFFF, move to LARGE offset
 		if (offset > 0xFFFFFFFF) {
 			co64 = (GF_ChunkLargeOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_CO64);
@@ -1790,8 +1943,11 @@
 			}
 			co64->offsets[i] = offset;
 			//delete the box...
-			gf_isom_box_del(*a);
-			*a = (GF_Box *)co64;
+			gf_isom_box_del_parent(&stbl->child_boxes, *old_stco);
+			*old_stco = (GF_Box *)co64;
+
+			assert (stbl->child_boxes);
+			gf_list_add(stbl->child_boxes, *old_stco);
 			return GF_OK;
 		}
 		//OK, stick with regular...
@@ -1806,7 +1962,7 @@
 		stco->nb_entries += 1;
 	} else {
 		//this is a large offset
-		co64 = (GF_ChunkLargeOffsetBox *) *a;
+		co64 = (GF_ChunkLargeOffsetBox *) *old_stco;
 		if (co64->nb_entries==co64->alloc_size) {
 			ALLOC_INC(co64->alloc_size);
 			co64->offsets = (u64*)gf_realloc(co64->offsets, co64->alloc_size * sizeof(u64));
@@ -1827,7 +1983,7 @@
 {
 	GF_Err e;
 	u8 newChunk;
-	GF_StscEntry *ent, *newEnt, *cur_ent;
+	GF_StscEntry *newEnt, *cur_ent;
 
 	if (!stbl) return GF_ISOM_INVALID_FILE;
 
@@ -1862,7 +2018,7 @@
 	//OK, we have to create a new chunk...
 	//check if we can remove the current sampleToChunk entry (same properties)
 	if (the_stsc->nb_entries > 1) {
-		ent = &the_stsc->entries[the_stsc->nb_entries - 2];
+		GF_StscEntry *ent = &the_stsc->entries[the_stsc->nb_entries - 2];
 		if (!ent) return GF_OUT_OF_MEM;
 		if ( (ent->sampleDescriptionIndex == cur_ent->sampleDescriptionIndex)
 		        && (ent->samplesPerChunk == cur_ent->samplesPerChunk)
@@ -1874,7 +2030,7 @@
 	}
 
 	//add our offset
-	e = stbl_AddOffset(the_stco, data_offset);
+	e = stbl_AddOffset(stbl, the_stco, data_offset);
 	if (e) return e;
 
 	if (the_stsc->nb_entries==the_stsc->alloc_size) {

gpac-0.8.0.tar.gz/src/isomedia/track.c -> gpac-1.0.0.tar.gz/src/isomedia/track.c Changed

gpac-0.8.0.tar.gz/src/isomedia/ttml.c -> gpac-1.0.0.tar.gz/src/isomedia/ttml.c Changed

gpac-0.8.0.tar.gz/src/isomedia/tx3g.c -> gpac-1.0.0.tar.gz/src/isomedia/tx3g.c Changed

gpac-1.0.0.tar.gz/src/jsmods Added

gpac-1.0.0.tar.gz/src/jsmods/WebGLRenderingContextBase.c Added

@@ -0,0 +1,2151 @@
+/* !! AUTOGENERATED FILE - DO NOT MODIFY !! 
+
+WebGLRenderingContextBase implementation for QJS
+*/
+
+
+static JSValue wgl_getContextAttributes(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_isContextLost(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getSupportedExtensions(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getExtension(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_activeTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_attachShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	GLuint shader = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_GLID(shader, argv[1], WebGLShader_class_id);
+	glAttachShader(program, shader);
+	return ret_val_js;
+}
+
+static JSValue wgl_bindAttribLocation(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	u32 index = 0;
+	const char * name = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_U32(index, argv[1]);
+	WGL_GET_STRING(name, argv[2]);
+	glBindAttribLocation(program, index, name);
+	JS_FreeCString(ctx, name);
+	return ret_val_js;
+}
+
+static JSValue wgl_bindBuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	GLuint buffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_GLID(buffer, argv[1], WebGLBuffer_class_id);
+	glBindBuffer(target, buffer);
+	return ret_val_js;
+}
+
+JSValue wgl_bindFramebuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_bindRenderbuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	GLuint renderbuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_GLID(renderbuffer, argv[1], WebGLRenderbuffer_class_id);
+	glBindRenderbuffer(target, renderbuffer);
+	return ret_val_js;
+}
+
+static JSValue wgl_bindTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_blendColor(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float red = 0;
+	Float green = 0;
+	Float blue = 0;
+	Float alpha = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT_CLAMP(red, argv[0]);
+	WGL_GET_FLOAT_CLAMP(green, argv[1]);
+	WGL_GET_FLOAT_CLAMP(blue, argv[2]);
+	WGL_GET_FLOAT_CLAMP(alpha, argv[3]);
+	glBlendColor(red, green, blue, alpha);
+	return ret_val_js;
+}
+
+static JSValue wgl_blendEquation(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mode = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mode, argv[0]);
+	glBlendEquation(mode);
+	return ret_val_js;
+}
+
+static JSValue wgl_blendEquationSeparate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 modeRGB = 0;
+	u32 modeAlpha = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(modeRGB, argv[0]);
+	WGL_GET_U32(modeAlpha, argv[1]);
+	glBlendEquationSeparate(modeRGB, modeAlpha);
+	return ret_val_js;
+}
+
+static JSValue wgl_blendFunc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 sfactor = 0;
+	u32 dfactor = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(sfactor, argv[0]);
+	WGL_GET_U32(dfactor, argv[1]);
+	glBlendFunc(sfactor, dfactor);
+	return ret_val_js;
+}
+
+static JSValue wgl_blendFuncSeparate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 srcRGB = 0;
+	u32 dstRGB = 0;
+	u32 srcAlpha = 0;
+	u32 dstAlpha = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(srcRGB, argv[0]);
+	WGL_GET_U32(dstRGB, argv[1]);
+	WGL_GET_U32(srcAlpha, argv[2]);
+	WGL_GET_U32(dstAlpha, argv[3]);
+	glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
+	return ret_val_js;
+}
+
+static JSValue wgl_bufferData(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u8 * data = NULL;
+	u32 data_size = 0;
+	u32 usage = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	if(!JS_IsObject(argv[1])) {
+		WGL_GET_U32(data_size, argv[1]);
+	} else {
+		data = wgl_GetArrayBuffer(ctx, &data_size, argv[1]);
+	}
+	WGL_GET_U32(usage, argv[2]);
+	glBufferData(target, data_size, data, usage);
+	return ret_val_js;
+}
+
+static JSValue wgl_bufferSubData(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u64 offset = 0;
+	u8 * data = NULL;
+	u32 data_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U64(offset, argv[1]);
+	if(!JS_IsObject(argv[2])) {
+		WGL_GET_U32(data_size, argv[2]);
+	} else {
+		data = wgl_GetArrayBuffer(ctx, &data_size, argv[2]);
+	}
+	glBufferSubData(target, (size_t) offset, data_size, data);
+	return ret_val_js;
+}
+
+static JSValue wgl_checkFramebufferStatus(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	u32 ret_val = 0;
+	ret_val = glCheckFramebufferStatus(target);
+	return JS_NewInt32(ctx, ret_val);
+}
+
+static JSValue wgl_clear(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mask = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mask, argv[0]);
+	glClear(mask);
+	return ret_val_js;
+}
+
+static JSValue wgl_clearColor(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float red = 0;
+	Float green = 0;
+	Float blue = 0;
+	Float alpha = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT_CLAMP(red, argv[0]);
+	WGL_GET_FLOAT_CLAMP(green, argv[1]);
+	WGL_GET_FLOAT_CLAMP(blue, argv[2]);
+	WGL_GET_FLOAT_CLAMP(alpha, argv[3]);
+	glClearColor(red, green, blue, alpha);
+	return ret_val_js;
+}
+
+static JSValue wgl_clearDepth(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float depth = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT_CLAMP(depth, argv[0]);
+#if defined(GPAC_USE_GLES2)
+	glClearDepthf(
+#else
+	glClearDepth(
+#endif
+		depth);
+	return ret_val_js;
+}
+
+static JSValue wgl_clearStencil(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	s32 s = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_S32(s, argv[0]);
+	glClearStencil(s);
+	return ret_val_js;
+}
+
+static JSValue wgl_colorMask(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Bool red = 0;
+	Bool green = 0;
+	Bool blue = 0;
+	Bool alpha = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_BOOL(red, argv[0]);
+	WGL_GET_BOOL(green, argv[1]);
+	WGL_GET_BOOL(blue, argv[2]);
+	WGL_GET_BOOL(alpha, argv[3]);
+	glColorMask(red, green, blue, alpha);
+	return ret_val_js;
+}
+
+static JSValue wgl_compileShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint shader = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(shader, argv[0], WebGLShader_class_id);
+	glCompileShader(shader);
+	return ret_val_js;
+}
+
+static JSValue wgl_compressedTexImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	s32 level = 0;
+	u32 internalformat = 0;
+	u32 width = 0;
+	u32 height = 0;
+	s32 border = 0;
+	u8 * data = NULL;
+	u32 data_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<7) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_U32(internalformat, argv[2]);
+	WGL_GET_U32(width, argv[3]);
+	WGL_GET_U32(height, argv[4]);
+	WGL_GET_S32(border, argv[5]);
+	if(!JS_IsArray(ctx, argv[6])) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	data = wgl_GetArrayBuffer(ctx, &data_size, argv[6]);
+	glCompressedTexImage2D(target, level, internalformat, width, height, border, data_size, data);
+	return ret_val_js;
+}
+
+static JSValue wgl_compressedTexSubImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	s32 level = 0;
+	s32 xoffset = 0;
+	s32 yoffset = 0;
+	u32 width = 0;
+	u32 height = 0;
+	u32 format = 0;
+	u8 * data = NULL;
+	u32 data_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<8) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_S32(xoffset, argv[2]);
+	WGL_GET_S32(yoffset, argv[3]);
+	WGL_GET_U32(width, argv[4]);
+	WGL_GET_U32(height, argv[5]);
+	WGL_GET_U32(format, argv[6]);
+	if(!JS_IsArray(ctx, argv[7])) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	data = wgl_GetArrayBuffer(ctx, &data_size, argv[7]);
+	glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, data_size, data);
+	return ret_val_js;
+}
+
+static JSValue wgl_copyTexImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	s32 level = 0;
+	u32 internalformat = 0;
+	s32 x = 0;
+	s32 y = 0;
+	u32 width = 0;
+	u32 height = 0;
+	s32 border = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<8) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_U32(internalformat, argv[2]);
+	WGL_GET_S32(x, argv[3]);
+	WGL_GET_S32(y, argv[4]);
+	WGL_GET_U32(width, argv[5]);
+	WGL_GET_U32(height, argv[6]);
+	WGL_GET_S32(border, argv[7]);
+	glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
+	return ret_val_js;
+}
+
+static JSValue wgl_copyTexSubImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	s32 level = 0;
+	s32 xoffset = 0;
+	s32 yoffset = 0;
+	s32 x = 0;
+	s32 y = 0;
+	u32 width = 0;
+	u32 height = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<8) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_S32(xoffset, argv[2]);
+	WGL_GET_S32(yoffset, argv[3]);
+	WGL_GET_S32(x, argv[4]);
+	WGL_GET_S32(y, argv[5]);
+	WGL_GET_U32(width, argv[6]);
+	WGL_GET_U32(height, argv[7]);
+	glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
+	return ret_val_js;
+}
+
+static JSValue wgl_createBuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	WGL_CHECK_CONTEXT
+	GF_WebGLObject *wglo;
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	glGenBuffers(1, &wglo->gl_id);
+	ret_val_js = JS_NewObjectClass(ctx, WebGLBuffer_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLBuffer_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	return ret_val_js;
+}
+
+static JSValue wgl_createFramebuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	WGL_CHECK_CONTEXT
+	GF_WebGLObject *wglo;
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	glGenFramebuffers(1, &wglo->gl_id);
+	ret_val_js = JS_NewObjectClass(ctx, WebGLFramebuffer_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLFramebuffer_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	return ret_val_js;
+}
+
+static JSValue wgl_createProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	WGL_CHECK_CONTEXT
+	GF_WebGLObject *wglo;
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	wglo->gl_id = glCreateProgram();
+	ret_val_js = JS_NewObjectClass(ctx, WebGLProgram_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLProgram_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	return ret_val_js;
+}
+
+static JSValue wgl_createRenderbuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	WGL_CHECK_CONTEXT
+	GF_WebGLObject *wglo;
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	glGenRenderbuffers(1, &wglo->gl_id);
+	ret_val_js = JS_NewObjectClass(ctx, WebGLRenderbuffer_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLRenderbuffer_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	return ret_val_js;
+}
+
+static JSValue wgl_createShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	u32 type = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(type, argv[0]);
+	GF_WebGLObject *wglo;
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	wglo->gl_id = glCreateShader(type);
+	ret_val_js = JS_NewObjectClass(ctx, WebGLShader_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLShader_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	return ret_val_js;
+}
+
+static JSValue wgl_createTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_cullFace(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mode = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mode, argv[0]);
+	glCullFace(mode);
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteBuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint buffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(buffer, argv[0], WebGLBuffer_class_id);
+	glDeleteBuffers(1, &buffer);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLBuffer_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteFramebuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint framebuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(framebuffer, argv[0], WebGLFramebuffer_class_id);
+	glDeleteFramebuffers(1, &framebuffer);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLFramebuffer_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	glDeleteProgram(program);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLProgram_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteRenderbuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint renderbuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(renderbuffer, argv[0], WebGLRenderbuffer_class_id);
+	glDeleteRenderbuffers(1, &renderbuffer);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLRenderbuffer_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint shader = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(shader, argv[0], WebGLShader_class_id);
+	glDeleteShader(shader);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLShader_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_deleteTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint texture = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(texture, argv[0], WebGLTexture_class_id);
+	glDeleteTextures(1, &texture);
+	{
+	GF_WebGLObject *glo = JS_GetOpaque(argv[0], WebGLTexture_class_id);
+	if (glo) {
+	glo->gl_id=0;
+	JS_FreeValue(ctx, glo->obj);
+	glo->obj = JS_UNDEFINED;
+	gf_list_del_item(glo->par_ctx->all_objects, glo);
+	}
+	}
+	return ret_val_js;
+}
+
+static JSValue wgl_depthFunc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 func = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(func, argv[0]);
+	glDepthFunc(func);
+	return ret_val_js;
+}
+
+static JSValue wgl_depthMask(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Bool flag = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_BOOL(flag, argv[0]);
+	glDepthMask(flag);
+	return ret_val_js;
+}
+
+static JSValue wgl_depthRange(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float zNear = 0;
+	Float zFar = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT_CLAMP(zNear, argv[0]);
+	WGL_GET_FLOAT_CLAMP(zFar, argv[1]);
+#if defined(GPAC_USE_GLES2)
+	glDepthRangef(
+#else
+	glDepthRange(
+#endif
+		zNear, zFar);
+	return ret_val_js;
+}
+
+static JSValue wgl_detachShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	GLuint shader = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_GLID(shader, argv[1], WebGLShader_class_id);
+	glDetachShader(program, shader);
+	return ret_val_js;
+}
+
+static JSValue wgl_disable(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 cap = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(cap, argv[0]);
+	glDisable(cap);
+	return ret_val_js;
+}
+
+static JSValue wgl_disableVertexAttribArray(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 index = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(index, argv[0]);
+	glDisableVertexAttribArray(index);
+	return ret_val_js;
+}
+
+static JSValue wgl_drawArrays(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mode = 0;
+	s32 first = 0;
+	u32 count = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mode, argv[0]);
+	WGL_GET_S32(first, argv[1]);
+	WGL_GET_U32(count, argv[2]);
+	glDrawArrays(mode, first, count);
+	return ret_val_js;
+}
+
+static JSValue wgl_drawElements(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mode = 0;
+	u32 count = 0;
+	u32 type = 0;
+	u64 offset = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mode, argv[0]);
+	WGL_GET_U32(count, argv[1]);
+	WGL_GET_U32(type, argv[2]);
+	WGL_GET_U64(offset, argv[3]);
+#ifdef GPAC_64_BITS
+	glDrawElements(mode, count, type, (void *)offset);
+#else
+	glDrawElements(mode, count, type, (void *) (u32) offset);
+#endif
+	return ret_val_js;
+}
+
+static JSValue wgl_enable(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 cap = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(cap, argv[0]);
+	glEnable(cap);
+	return ret_val_js;
+}
+
+static JSValue wgl_enableVertexAttribArray(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 index = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(index, argv[0]);
+	glEnableVertexAttribArray(index);
+	return ret_val_js;
+}
+
+static JSValue wgl_finish(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	WGL_CHECK_CONTEXT
+	glFinish();
+	return ret_val_js;
+}
+
+static JSValue wgl_flush(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	WGL_CHECK_CONTEXT
+	glFlush();
+	return ret_val_js;
+}
+
+static JSValue wgl_framebufferRenderbuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 attachment = 0;
+	u32 renderbuffertarget = 0;
+	GLuint renderbuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(attachment, argv[1]);
+	WGL_GET_U32(renderbuffertarget, argv[2]);
+	WGL_GET_GLID(renderbuffer, argv[3], WebGLRenderbuffer_class_id);
+	glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
+	return ret_val_js;
+}
+
+static JSValue wgl_framebufferTexture2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 attachment = 0;
+	u32 textarget = 0;
+	GLuint texture = 0;
+	s32 level = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<5) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(attachment, argv[1]);
+	WGL_GET_U32(textarget, argv[2]);
+	WGL_GET_GLID(texture, argv[3], WebGLTexture_class_id);
+	WGL_GET_S32(level, argv[4]);
+	glFramebufferTexture2D(target, attachment, textarget, texture, level);
+	return ret_val_js;
+}
+
+static JSValue wgl_frontFace(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mode = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mode, argv[0]);
+	glFrontFace(mode);
+	return ret_val_js;
+}
+
+static JSValue wgl_generateMipmap(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	glGenerateMipmap(target);
+	return ret_val_js;
+}
+
+static JSValue wgl_getActiveAttrib(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint program = 0;
+	u32 index = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_U32(index, argv[1]);
+	return webgl_getActiveAttrib(ctx, program, index);
+}
+
+static JSValue wgl_getActiveUniform(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint program = 0;
+	u32 index = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_U32(index, argv[1]);
+	return webgl_getActiveUniform(ctx, program, index);
+}
+
+static JSValue wgl_getAttachedShaders(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint program = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	return webgl_getAttachedShaders(ctx, JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id), program);
+}
+
+static JSValue wgl_getAttribLocation(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint program = 0;
+	const char * name = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_STRING(name, argv[1]);
+	s32 ret_val = 0;
+	ret_val = glGetAttribLocation(program, name);
+	JS_FreeCString(ctx, name);
+	return JS_NewInt32(ctx, ret_val);
+}
+
+static JSValue wgl_getBufferParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getError(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	WGL_CHECK_CONTEXT
+	u32 ret_val = 0;
+	ret_val = glGetError();
+	ret_val_js = JS_NewInt32(ctx, ret_val);
+	return ret_val_js;
+}
+
+static JSValue wgl_getFramebufferAttachmentParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getProgramParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getProgramInfoLog(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getRenderbufferParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getShaderParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getShaderPrecisionFormat(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getShaderInfoLog(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getShaderSource(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getTexParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getUniform(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getUniformLocation(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getVertexAttrib(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_getVertexAttribOffset(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_hint(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 mode = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(mode, argv[1]);
+	glHint(target, mode);
+	return ret_val_js;
+}
+
+static JSValue wgl_isBuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint buffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(buffer, argv[0], WebGLBuffer_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsBuffer(buffer);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isEnabled(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 cap = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(cap, argv[0]);
+	Bool ret_val = 0;
+	ret_val = glIsEnabled(cap);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isFramebuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint framebuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(framebuffer, argv[0], WebGLFramebuffer_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsFramebuffer(framebuffer);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint program = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsProgram(program);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isRenderbuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint renderbuffer = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(renderbuffer, argv[0], WebGLRenderbuffer_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsRenderbuffer(renderbuffer);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isShader(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint shader = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(shader, argv[0], WebGLShader_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsShader(shader);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_isTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLuint texture = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(texture, argv[0], WebGLTexture_class_id);
+	Bool ret_val = 0;
+	ret_val = glIsTexture(texture);
+	return JS_NewBool(ctx, ret_val);
+}
+
+static JSValue wgl_lineWidth(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float width = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT(width, argv[0]);
+	glLineWidth(width);
+	return ret_val_js;
+}
+
+static JSValue wgl_linkProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	glLinkProgram(program);
+	return ret_val_js;
+}
+
+static JSValue wgl_pixelStorei(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 pname = 0;
+	s32 param = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(pname, argv[0]);
+	WGL_GET_S32(param, argv[1]);
+	glPixelStorei(pname, param);
+	return ret_val_js;
+}
+
+static JSValue wgl_polygonOffset(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float factor = 0;
+	Float units = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT(factor, argv[0]);
+	WGL_GET_FLOAT(units, argv[1]);
+	glPolygonOffset(factor, units);
+	return ret_val_js;
+}
+
+static JSValue wgl_readPixels(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_renderbufferStorage(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 internalformat = 0;
+	u32 width = 0;
+	u32 height = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(internalformat, argv[1]);
+	WGL_GET_U32(width, argv[2]);
+	WGL_GET_U32(height, argv[3]);
+	glRenderbufferStorage(target, internalformat, width, height);
+	return ret_val_js;
+}
+
+static JSValue wgl_sampleCoverage(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	Float value = 0;
+	Bool invert = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_FLOAT_CLAMP(value, argv[0]);
+	WGL_GET_BOOL(invert, argv[1]);
+	glSampleCoverage(value, invert);
+	return ret_val_js;
+}
+
+static JSValue wgl_scissor(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	s32 x = 0;
+	s32 y = 0;
+	u32 width = 0;
+	u32 height = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_S32(x, argv[0]);
+	WGL_GET_S32(y, argv[1]);
+	WGL_GET_U32(width, argv[2]);
+	WGL_GET_U32(height, argv[3]);
+	glScissor(x, y, width, height);
+	return ret_val_js;
+}
+
+static JSValue wgl_shaderSource(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_stencilFunc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 func = 0;
+	s32 ref = 0;
+	u32 mask = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(func, argv[0]);
+	WGL_GET_S32(ref, argv[1]);
+	WGL_GET_U32(mask, argv[2]);
+	glStencilFunc(func, ref, mask);
+	return ret_val_js;
+}
+
+static JSValue wgl_stencilFuncSeparate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 face = 0;
+	u32 func = 0;
+	s32 ref = 0;
+	u32 mask = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(face, argv[0]);
+	WGL_GET_U32(func, argv[1]);
+	WGL_GET_S32(ref, argv[2]);
+	WGL_GET_U32(mask, argv[3]);
+	glStencilFuncSeparate(face, func, ref, mask);
+	return ret_val_js;
+}
+
+static JSValue wgl_stencilMask(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 mask = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(mask, argv[0]);
+	glStencilMask(mask);
+	return ret_val_js;
+}
+
+static JSValue wgl_stencilMaskSeparate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 face = 0;
+	u32 mask = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(face, argv[0]);
+	WGL_GET_U32(mask, argv[1]);
+	glStencilMaskSeparate(face, mask);
+	return ret_val_js;
+}
+
+static JSValue wgl_stencilOp(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 fail = 0;
+	u32 zfail = 0;
+	u32 zpass = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(fail, argv[0]);
+	WGL_GET_U32(zfail, argv[1]);
+	WGL_GET_U32(zpass, argv[2]);
+	glStencilOp(fail, zfail, zpass);
+	return ret_val_js;
+}
+
+static JSValue wgl_stencilOpSeparate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 face = 0;
+	u32 fail = 0;
+	u32 zfail = 0;
+	u32 zpass = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(face, argv[0]);
+	WGL_GET_U32(fail, argv[1]);
+	WGL_GET_U32(zfail, argv[2]);
+	WGL_GET_U32(zpass, argv[3]);
+	glStencilOpSeparate(face, fail, zfail, zpass);
+	return ret_val_js;
+}
+
+static JSValue wgl_texImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_texParameterf(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 pname = 0;
+	Float param = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	WGL_GET_FLOAT(param, argv[2]);
+	glTexParameterf(target, pname, param);
+	return ret_val_js;
+}
+
+static JSValue wgl_texParameteri(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	u32 pname = 0;
+	s32 param = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	WGL_GET_S32(param, argv[2]);
+	glTexParameteri(target, pname, param);
+	return ret_val_js;
+}
+
+static JSValue wgl_texSubImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_uniform1f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float x = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_FLOAT(x, argv[1]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform1f(location, x);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform1fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &v, &v_size, 1, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform1fv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform1i(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 x = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_S32(x, argv[1]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform1i(location, x);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform1iv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_INT32_VEC(ctx, argv[1], (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform1iv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform2f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float x = 0;
+	Float y = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform2f(location, x, y);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform2fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &v, &v_size, 2, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform2fv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform2i(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 x = 0;
+	s32 y = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_S32(x, argv[1]);
+	WGL_GET_S32(y, argv[2]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform2i(location, x, y);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform2iv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_INT32_VEC(ctx, argv[1], (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform2iv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform3f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float x = 0;
+	Float y = 0;
+	Float z = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	WGL_GET_FLOAT(z, argv[3]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform3f(location, x, y, z);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform3fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &v, &v_size, 3, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform3fv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform3i(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 x = 0;
+	s32 y = 0;
+	s32 z = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_S32(x, argv[1]);
+	WGL_GET_S32(y, argv[2]);
+	WGL_GET_S32(z, argv[3]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform3i(location, x, y, z);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform3iv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_INT32_VEC(ctx, argv[1], (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform3iv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform4f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float x = 0;
+	Float y = 0;
+	Float z = 0;
+	Float w = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<5) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	WGL_GET_FLOAT(z, argv[3]);
+	WGL_GET_FLOAT(w, argv[4]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform4f(location, x, y, z, w);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform4fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Float * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &v, &v_size, 4, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform4fv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform4i(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 x = 0;
+	s32 y = 0;
+	s32 z = 0;
+	s32 w = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<5) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_S32(x, argv[1]);
+	WGL_GET_S32(y, argv[2]);
+	WGL_GET_S32(z, argv[3]);
+	WGL_GET_S32(w, argv[4]);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform4i(location, x, y, z, w);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniform4iv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	s32 * v = NULL;
+	u32 v_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	if (!WGL_LOAD_INT32_VEC(ctx, argv[1], (s32 **) &v, &v_size, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);;
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniform4iv(location, v_size, v);
+	if (v) gf_free(v);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniformMatrix2fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Bool transpose = 0;
+	Float * value = NULL;
+	u32 value_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_BOOL(transpose, argv[1]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[2], (Float **) &value, &value_size, 2, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniformMatrix2fv(location, value_size, transpose, value);
+	if (value) gf_free(value);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniformMatrix3fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Bool transpose = 0;
+	Float * value = NULL;
+	u32 value_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_BOOL(transpose, argv[1]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[2], (Float **) &value, &value_size, 3, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniformMatrix3fv(location, value_size, transpose, value);
+	if (value) gf_free(value);
+	return ret_val_js;
+}
+
+static JSValue wgl_uniformMatrix4fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint location = 0;
+	Bool transpose = 0;
+	Float * value = NULL;
+	u32 value_size = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(location, argv[0], WebGLUniformLocation_class_id);
+	WGL_GET_BOOL(transpose, argv[1]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[2], (Float **) &value, &value_size, 4, 1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	/*hack for GPAC textures, we create uniforms with loc -2 for such textures*/
+	if ((s32) location>=0)
+		glUniformMatrix4fv(location, value_size, transpose, value);
+	if (value) gf_free(value);
+	return ret_val_js;
+}
+
+static JSValue wgl_useProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+static JSValue wgl_validateProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	glValidateProgram(program);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib1f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float x = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	WGL_GET_FLOAT(x, argv[1]);
+	glVertexAttrib1f(indx, x);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib1fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float values[1];
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &values, NULL, 1, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	glVertexAttrib1fv(indx, values);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib2f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float x = 0;
+	Float y = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	glVertexAttrib2f(indx, x, y);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib2fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float values[2];
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &values, NULL, 2, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	glVertexAttrib2fv(indx, values);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib3f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float x = 0;
+	Float y = 0;
+	Float z = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	WGL_GET_FLOAT(z, argv[3]);
+	glVertexAttrib3f(indx, x, y, z);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib3fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float values[3];
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &values, NULL, 3, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	glVertexAttrib3fv(indx, values);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib4f(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float x = 0;
+	Float y = 0;
+	Float z = 0;
+	Float w = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<5) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	WGL_GET_FLOAT(x, argv[1]);
+	WGL_GET_FLOAT(y, argv[2]);
+	WGL_GET_FLOAT(z, argv[3]);
+	WGL_GET_FLOAT(w, argv[4]);
+	glVertexAttrib4f(indx, x, y, z, w);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttrib4fv(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	Float values[4];
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	if (!WGL_LOAD_FLOAT_VEC(ctx, argv[1], (Float **) &values, NULL, 4, 0)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	glVertexAttrib4fv(indx, values);
+	return ret_val_js;
+}
+
+static JSValue wgl_vertexAttribPointer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 indx = 0;
+	s32 size = 0;
+	u32 type = 0;
+	Bool normalized = 0;
+	u32 stride = 0;
+	u64 offset = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<6) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(indx, argv[0]);
+	WGL_GET_S32(size, argv[1]);
+	WGL_GET_U32(type, argv[2]);
+	WGL_GET_BOOL(normalized, argv[3]);
+	WGL_GET_U32(stride, argv[4]);
+	WGL_GET_U64(offset, argv[5]);
+#ifdef GPAC_64_BITS
+	glVertexAttribPointer(indx, size, type, normalized, stride, (void *)offset);
+#else
+	glVertexAttribPointer(indx, size, type, normalized, stride, (void *)(u32)offset);
+#endif
+	return ret_val_js;
+}
+
+static JSValue wgl_viewport(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	s32 x = 0;
+	s32 y = 0;
+	u32 width = 0;
+	u32 height = 0;
+	WGL_CHECK_CONTEXT
+	if (argc<4) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_S32(x, argv[0]);
+	WGL_GET_S32(y, argv[1]);
+	WGL_GET_U32(width, argv[2]);
+	WGL_GET_U32(height, argv[3]);
+	glViewport(x, y, width, height);
+	return ret_val_js;
+}
+static const JSCFunctionListEntry WebGLRenderingContextBase_funcs[] =
+{
+	JS_PROP_INT32_DEF("DEPTH_BUFFER_BIT", 0x00000100, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BUFFER_BIT", 0x00000400, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COLOR_BUFFER_BIT", 0x00004000, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("POINTS", 0x0000, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINES", 0x0001, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINE_LOOP", 0x0002, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINE_STRIP", 0x0003, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TRIANGLES", 0x0004, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TRIANGLE_STRIP", 0x0005, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TRIANGLE_FAN", 0x0006, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ZERO", 0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE", 1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SRC_COLOR", 0x0300, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_SRC_COLOR", 0x0301, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SRC_ALPHA", 0x0302, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_SRC_ALPHA", 0x0303, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DST_ALPHA", 0x0304, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_DST_ALPHA", 0x0305, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DST_COLOR", 0x0306, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_DST_COLOR", 0x0307, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SRC_ALPHA_SATURATE", 0x0308, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FUNC_ADD", 0x8006, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_EQUATION", 0x8009, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_EQUATION_ALPHA", 0x883D, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FUNC_SUBTRACT", 0x800A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FUNC_REVERSE_SUBTRACT", 0x800B, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_DST_RGB", 0x80C8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_SRC_RGB", 0x80C9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_DST_ALPHA", 0x80CA, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_SRC_ALPHA", 0x80CB, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CONSTANT_COLOR", 0x8001, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_CONSTANT_COLOR", 0x8002, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CONSTANT_ALPHA", 0x8003, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ONE_MINUS_CONSTANT_ALPHA", 0x8004, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND_COLOR", 0x8005, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ARRAY_BUFFER", 0x8892, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ELEMENT_ARRAY_BUFFER", 0x8893, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ARRAY_BUFFER_BINDING", 0x8894, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ELEMENT_ARRAY_BUFFER_BINDING", 0x8895, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STREAM_DRAW", 0x88E0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STATIC_DRAW", 0x88E4, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DYNAMIC_DRAW", 0x88E8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BUFFER_SIZE", 0x8764, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BUFFER_USAGE", 0x8765, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CURRENT_VERTEX_ATTRIB", 0x8626, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRONT", 0x0404, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BACK", 0x0405, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRONT_AND_BACK", 0x0408, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CULL_FACE", 0x0B44, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLEND", 0x0BE2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DITHER", 0x0BD0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_TEST", 0x0B90, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_TEST", 0x0B71, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SCISSOR_TEST", 0x0C11, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("POLYGON_OFFSET_FILL", 0x8037, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLE_ALPHA_TO_COVERAGE", 0x809E, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLE_COVERAGE", 0x80A0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NO_ERROR", 0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INVALID_ENUM", 0x0500, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INVALID_VALUE", 0x0501, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INVALID_OPERATION", 0x0502, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("OUT_OF_MEMORY", 0x0505, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CW", 0x0900, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CCW", 0x0901, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINE_WIDTH", 0x0B21, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ALIASED_POINT_SIZE_RANGE", 0x846D, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ALIASED_LINE_WIDTH_RANGE", 0x846E, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CULL_FACE_MODE", 0x0B45, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRONT_FACE", 0x0B46, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_RANGE", 0x0B70, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_WRITEMASK", 0x0B72, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_CLEAR_VALUE", 0x0B73, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_FUNC", 0x0B74, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_CLEAR_VALUE", 0x0B91, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_FUNC", 0x0B92, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_FAIL", 0x0B94, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_PASS_DEPTH_FAIL", 0x0B95, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_PASS_DEPTH_PASS", 0x0B96, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_REF", 0x0B97, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_VALUE_MASK", 0x0B93, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_WRITEMASK", 0x0B98, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_FUNC", 0x8800, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_FAIL", 0x8801, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_PASS_DEPTH_FAIL", 0x8802, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_PASS_DEPTH_PASS", 0x8803, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_REF", 0x8CA3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_VALUE_MASK", 0x8CA4, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BACK_WRITEMASK", 0x8CA5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VIEWPORT", 0x0BA2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SCISSOR_BOX", 0x0C10, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COLOR_CLEAR_VALUE", 0x0C22, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COLOR_WRITEMASK", 0x0C23, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNPACK_ALIGNMENT", 0x0CF5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("PACK_ALIGNMENT", 0x0D05, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_TEXTURE_SIZE", 0x0D33, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_VIEWPORT_DIMS", 0x0D3A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SUBPIXEL_BITS", 0x0D50, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RED_BITS", 0x0D52, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("GREEN_BITS", 0x0D53, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BLUE_BITS", 0x0D54, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ALPHA_BITS", 0x0D55, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_BITS", 0x0D56, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_BITS", 0x0D57, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("POLYGON_OFFSET_UNITS", 0x2A00, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("POLYGON_OFFSET_FACTOR", 0x8038, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_BINDING_2D", 0x8069, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLE_BUFFERS", 0x80A8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLES", 0x80A9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLE_COVERAGE_VALUE", 0x80AA, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLE_COVERAGE_INVERT", 0x80AB, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COMPRESSED_TEXTURE_FORMATS", 0x86A3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DONT_CARE", 0x1100, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FASTEST", 0x1101, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NICEST", 0x1102, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("GENERATE_MIPMAP_HINT", 0x8192, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BYTE", 0x1400, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_BYTE", 0x1401, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SHORT", 0x1402, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_SHORT", 0x1403, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INT", 0x1404, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_INT", 0x1405, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT", 0x1406, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_COMPONENT", 0x1902, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ALPHA", 0x1906, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RGB", 0x1907, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RGBA", 0x1908, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LUMINANCE", 0x1909, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LUMINANCE_ALPHA", 0x190A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_SHORT_4_4_4_4", 0x8033, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_SHORT_5_5_5_1", 0x8034, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNSIGNED_SHORT_5_6_5", 0x8363, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAGMENT_SHADER", 0x8B30, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_SHADER", 0x8B31, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_VERTEX_ATTRIBS", 0x8869, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_VERTEX_UNIFORM_VECTORS", 0x8DFB, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_VARYING_VECTORS", 0x8DFC, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_COMBINED_TEXTURE_IMAGE_UNITS", 0x8B4D, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_VERTEX_TEXTURE_IMAGE_UNITS", 0x8B4C, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_TEXTURE_IMAGE_UNITS", 0x8872, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_FRAGMENT_UNIFORM_VECTORS", 0x8DFD, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SHADER_TYPE", 0x8B4F, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DELETE_STATUS", 0x8B80, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINK_STATUS", 0x8B82, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VALIDATE_STATUS", 0x8B83, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ATTACHED_SHADERS", 0x8B85, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ACTIVE_UNIFORMS", 0x8B86, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ACTIVE_ATTRIBUTES", 0x8B89, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SHADING_LANGUAGE_VERSION", 0x8B8C, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CURRENT_PROGRAM", 0x8B8D, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NEVER", 0x0200, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LESS", 0x0201, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("EQUAL", 0x0202, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LEQUAL", 0x0203, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("GREATER", 0x0204, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NOTEQUAL", 0x0205, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("GEQUAL", 0x0206, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ALWAYS", 0x0207, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("KEEP", 0x1E00, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("REPLACE", 0x1E01, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INCR", 0x1E02, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DECR", 0x1E03, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INVERT", 0x150A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INCR_WRAP", 0x8507, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DECR_WRAP", 0x8508, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VENDOR", 0x1F00, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERER", 0x1F01, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERSION", 0x1F02, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NEAREST", 0x2600, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINEAR", 0x2601, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NEAREST_MIPMAP_NEAREST", 0x2700, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINEAR_MIPMAP_NEAREST", 0x2701, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NEAREST_MIPMAP_LINEAR", 0x2702, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LINEAR_MIPMAP_LINEAR", 0x2703, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_MAG_FILTER", 0x2800, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_MIN_FILTER", 0x2801, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_WRAP_S", 0x2802, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_WRAP_T", 0x2803, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_2D", 0x0DE1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE", 0x1702, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP", 0x8513, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_BINDING_CUBE_MAP", 0x8514, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_POSITIVE_X", 0x8515, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_NEGATIVE_X", 0x8516, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_POSITIVE_Y", 0x8517, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_NEGATIVE_Y", 0x8518, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_POSITIVE_Z", 0x8519, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE_CUBE_MAP_NEGATIVE_Z", 0x851A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_CUBE_MAP_TEXTURE_SIZE", 0x851C, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE0", 0x84C0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE1", 0x84C1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE2", 0x84C2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE3", 0x84C3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE4", 0x84C4, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE5", 0x84C5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE6", 0x84C6, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE7", 0x84C7, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE8", 0x84C8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE9", 0x84C9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE10", 0x84CA, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE11", 0x84CB, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE12", 0x84CC, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE13", 0x84CD, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE14", 0x84CE, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE15", 0x84CF, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE16", 0x84D0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE17", 0x84D1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE18", 0x84D2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE19", 0x84D3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE20", 0x84D4, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE21", 0x84D5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE22", 0x84D6, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE23", 0x84D7, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE24", 0x84D8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE25", 0x84D9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE26", 0x84DA, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE27", 0x84DB, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE28", 0x84DC, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE29", 0x84DD, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE30", 0x84DE, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("TEXTURE31", 0x84DF, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("ACTIVE_TEXTURE", 0x84E0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("REPEAT", 0x2901, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CLAMP_TO_EDGE", 0x812F, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MIRRORED_REPEAT", 0x8370, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_VEC2", 0x8B50, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_VEC3", 0x8B51, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_VEC4", 0x8B52, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INT_VEC2", 0x8B53, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INT_VEC3", 0x8B54, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INT_VEC4", 0x8B55, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BOOL", 0x8B56, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BOOL_VEC2", 0x8B57, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BOOL_VEC3", 0x8B58, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BOOL_VEC4", 0x8B59, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_MAT2", 0x8B5A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_MAT3", 0x8B5B, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FLOAT_MAT4", 0x8B5C, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLER_2D", 0x8B5E, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("SAMPLER_CUBE", 0x8B60, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_ENABLED", 0x8622, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_SIZE", 0x8623, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_STRIDE", 0x8624, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_TYPE", 0x8625, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_NORMALIZED", 0x886A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_POINTER", 0x8645, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", 0x889F, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("IMPLEMENTATION_COLOR_READ_TYPE", 0x8B9A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("IMPLEMENTATION_COLOR_READ_FORMAT", 0x8B9B, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COMPILE_STATUS", 0x8B81, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LOW_FLOAT", 0x8DF0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MEDIUM_FLOAT", 0x8DF1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("HIGH_FLOAT", 0x8DF2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("LOW_INT", 0x8DF3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MEDIUM_INT", 0x8DF4, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("HIGH_INT", 0x8DF5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER", 0x8D40, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER", 0x8D41, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RGBA4", 0x8056, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RGB5_A1", 0x8057, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RGB565", 0x8D62, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_COMPONENT16", 0x81A5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_INDEX", 0x1901, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_INDEX8", 0x8D48, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_STENCIL", 0x84F9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_WIDTH", 0x8D42, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_HEIGHT", 0x8D43, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_INTERNAL_FORMAT", 0x8D44, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_RED_SIZE", 0x8D50, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_GREEN_SIZE", 0x8D51, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_BLUE_SIZE", 0x8D52, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_ALPHA_SIZE", 0x8D53, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_DEPTH_SIZE", 0x8D54, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_STENCIL_SIZE", 0x8D55, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE", 0x8CD0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_ATTACHMENT_OBJECT_NAME", 0x8CD1, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL", 0x8CD2, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE", 0x8CD3, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("COLOR_ATTACHMENT0", 0x8CE0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_ATTACHMENT", 0x8D00, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("STENCIL_ATTACHMENT", 0x8D20, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("DEPTH_STENCIL_ATTACHMENT", 0x821A, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("NONE", 0, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_COMPLETE", 0x8CD5, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_INCOMPLETE_ATTACHMENT", 0x8CD6, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT", 0x8CD7, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_INCOMPLETE_DIMENSIONS", 0x8CD9, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_UNSUPPORTED", 0x8CDD, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("FRAMEBUFFER_BINDING", 0x8CA6, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("RENDERBUFFER_BINDING", 0x8CA7, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("MAX_RENDERBUFFER_SIZE", 0x84E8, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("INVALID_FRAMEBUFFER_OPERATION", 0x0506, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNPACK_FLIP_Y_WEBGL", 0x9240, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNPACK_PREMULTIPLY_ALPHA_WEBGL", 0x9241, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("CONTEXT_LOST_WEBGL", 0x9242, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("UNPACK_COLORSPACE_CONVERSION_WEBGL", 0x9243, JS_PROP_CONFIGURABLE),
+	JS_PROP_INT32_DEF("BROWSER_DEFAULT_WEBGL", 0x9244, JS_PROP_CONFIGURABLE),
+	JS_CGETSET_MAGIC_DEF("canvas", WebGLRenderingContextBase_getProperty, NULL, WebGLRenderingContextBase_PROP_canvas),
+	JS_CGETSET_MAGIC_DEF("drawingBufferWidth", WebGLRenderingContextBase_getProperty, NULL, WebGLRenderingContextBase_PROP_drawingBufferWidth),
+	JS_CGETSET_MAGIC_DEF("drawingBufferHeight", WebGLRenderingContextBase_getProperty, NULL, WebGLRenderingContextBase_PROP_drawingBufferHeight),
+	JS_CFUNC_DEF("getContextAttributes", 0, wgl_getContextAttributes),
+	JS_CFUNC_DEF("isContextLost", 0, wgl_isContextLost),
+	JS_CFUNC_DEF("getSupportedExtensions", 0, wgl_getSupportedExtensions),
+	JS_CFUNC_DEF("getExtension", 0, wgl_getExtension),
+	JS_CFUNC_DEF("activeTexture", 0, wgl_activeTexture),
+	JS_CFUNC_DEF("attachShader", 0, wgl_attachShader),
+	JS_CFUNC_DEF("bindAttribLocation", 0, wgl_bindAttribLocation),
+	JS_CFUNC_DEF("bindBuffer", 0, wgl_bindBuffer),
+	JS_CFUNC_DEF("bindFramebuffer", 0, wgl_bindFramebuffer),
+	JS_CFUNC_DEF("bindRenderbuffer", 0, wgl_bindRenderbuffer),
+	JS_CFUNC_DEF("bindTexture", 0, wgl_bindTexture),
+	JS_CFUNC_DEF("blendColor", 0, wgl_blendColor),
+	JS_CFUNC_DEF("blendEquation", 0, wgl_blendEquation),
+	JS_CFUNC_DEF("blendEquationSeparate", 0, wgl_blendEquationSeparate),
+	JS_CFUNC_DEF("blendFunc", 0, wgl_blendFunc),
+	JS_CFUNC_DEF("blendFuncSeparate", 0, wgl_blendFuncSeparate),
+	JS_CFUNC_DEF("bufferData", 0, wgl_bufferData),
+	JS_CFUNC_DEF("bufferSubData", 0, wgl_bufferSubData),
+	JS_CFUNC_DEF("checkFramebufferStatus", 0, wgl_checkFramebufferStatus),
+	JS_CFUNC_DEF("clear", 0, wgl_clear),
+	JS_CFUNC_DEF("clearColor", 0, wgl_clearColor),
+	JS_CFUNC_DEF("clearDepth", 0, wgl_clearDepth),
+	JS_CFUNC_DEF("clearStencil", 0, wgl_clearStencil),
+	JS_CFUNC_DEF("colorMask", 0, wgl_colorMask),
+	JS_CFUNC_DEF("compileShader", 0, wgl_compileShader),
+	JS_CFUNC_DEF("compressedTexImage2D", 0, wgl_compressedTexImage2D),
+	JS_CFUNC_DEF("compressedTexSubImage2D", 0, wgl_compressedTexSubImage2D),
+	JS_CFUNC_DEF("copyTexImage2D", 0, wgl_copyTexImage2D),
+	JS_CFUNC_DEF("copyTexSubImage2D", 0, wgl_copyTexSubImage2D),
+	JS_CFUNC_DEF("createBuffer", 0, wgl_createBuffer),
+	JS_CFUNC_DEF("createFramebuffer", 0, wgl_createFramebuffer),
+	JS_CFUNC_DEF("createProgram", 0, wgl_createProgram),
+	JS_CFUNC_DEF("createRenderbuffer", 0, wgl_createRenderbuffer),
+	JS_CFUNC_DEF("createShader", 0, wgl_createShader),
+	JS_CFUNC_DEF("createTexture", 0, wgl_createTexture),
+	JS_CFUNC_DEF("cullFace", 0, wgl_cullFace),
+	JS_CFUNC_DEF("deleteBuffer", 0, wgl_deleteBuffer),
+	JS_CFUNC_DEF("deleteFramebuffer", 0, wgl_deleteFramebuffer),
+	JS_CFUNC_DEF("deleteProgram", 0, wgl_deleteProgram),
+	JS_CFUNC_DEF("deleteRenderbuffer", 0, wgl_deleteRenderbuffer),
+	JS_CFUNC_DEF("deleteShader", 0, wgl_deleteShader),
+	JS_CFUNC_DEF("deleteTexture", 0, wgl_deleteTexture),
+	JS_CFUNC_DEF("depthFunc", 0, wgl_depthFunc),
+	JS_CFUNC_DEF("depthMask", 0, wgl_depthMask),
+	JS_CFUNC_DEF("depthRange", 0, wgl_depthRange),
+	JS_CFUNC_DEF("detachShader", 0, wgl_detachShader),
+	JS_CFUNC_DEF("disable", 0, wgl_disable),
+	JS_CFUNC_DEF("disableVertexAttribArray", 0, wgl_disableVertexAttribArray),
+	JS_CFUNC_DEF("drawArrays", 0, wgl_drawArrays),
+	JS_CFUNC_DEF("drawElements", 0, wgl_drawElements),
+	JS_CFUNC_DEF("enable", 0, wgl_enable),
+	JS_CFUNC_DEF("enableVertexAttribArray", 0, wgl_enableVertexAttribArray),
+	JS_CFUNC_DEF("finish", 0, wgl_finish),
+	JS_CFUNC_DEF("flush", 0, wgl_flush),
+	JS_CFUNC_DEF("framebufferRenderbuffer", 0, wgl_framebufferRenderbuffer),
+	JS_CFUNC_DEF("framebufferTexture2D", 0, wgl_framebufferTexture2D),
+	JS_CFUNC_DEF("frontFace", 0, wgl_frontFace),
+	JS_CFUNC_DEF("generateMipmap", 0, wgl_generateMipmap),
+	JS_CFUNC_DEF("getActiveAttrib", 0, wgl_getActiveAttrib),
+	JS_CFUNC_DEF("getActiveUniform", 0, wgl_getActiveUniform),
+	JS_CFUNC_DEF("getAttachedShaders", 0, wgl_getAttachedShaders),
+	JS_CFUNC_DEF("getAttribLocation", 0, wgl_getAttribLocation),
+	JS_CFUNC_DEF("getBufferParameter", 0, wgl_getBufferParameter),
+	JS_CFUNC_DEF("getParameter", 0, wgl_getParameter),
+	JS_CFUNC_DEF("getError", 0, wgl_getError),
+	JS_CFUNC_DEF("getFramebufferAttachmentParameter", 0, wgl_getFramebufferAttachmentParameter),
+	JS_CFUNC_DEF("getProgramParameter", 0, wgl_getProgramParameter),
+	JS_CFUNC_DEF("getProgramInfoLog", 0, wgl_getProgramInfoLog),
+	JS_CFUNC_DEF("getRenderbufferParameter", 0, wgl_getRenderbufferParameter),
+	JS_CFUNC_DEF("getShaderParameter", 0, wgl_getShaderParameter),
+	JS_CFUNC_DEF("getShaderPrecisionFormat", 0, wgl_getShaderPrecisionFormat),
+	JS_CFUNC_DEF("getShaderInfoLog", 0, wgl_getShaderInfoLog),
+	JS_CFUNC_DEF("getShaderSource", 0, wgl_getShaderSource),
+	JS_CFUNC_DEF("getTexParameter", 0, wgl_getTexParameter),
+	JS_CFUNC_DEF("getUniform", 0, wgl_getUniform),
+	JS_CFUNC_DEF("getUniformLocation", 0, wgl_getUniformLocation),
+	JS_CFUNC_DEF("getVertexAttrib", 0, wgl_getVertexAttrib),
+	JS_CFUNC_DEF("getVertexAttribOffset", 0, wgl_getVertexAttribOffset),
+	JS_CFUNC_DEF("hint", 0, wgl_hint),
+	JS_CFUNC_DEF("isBuffer", 0, wgl_isBuffer),
+	JS_CFUNC_DEF("isEnabled", 0, wgl_isEnabled),
+	JS_CFUNC_DEF("isFramebuffer", 0, wgl_isFramebuffer),
+	JS_CFUNC_DEF("isProgram", 0, wgl_isProgram),
+	JS_CFUNC_DEF("isRenderbuffer", 0, wgl_isRenderbuffer),
+	JS_CFUNC_DEF("isShader", 0, wgl_isShader),
+	JS_CFUNC_DEF("isTexture", 0, wgl_isTexture),
+	JS_CFUNC_DEF("lineWidth", 0, wgl_lineWidth),
+	JS_CFUNC_DEF("linkProgram", 0, wgl_linkProgram),
+	JS_CFUNC_DEF("pixelStorei", 0, wgl_pixelStorei),
+	JS_CFUNC_DEF("polygonOffset", 0, wgl_polygonOffset),
+	JS_CFUNC_DEF("readPixels", 0, wgl_readPixels),
+	JS_CFUNC_DEF("renderbufferStorage", 0, wgl_renderbufferStorage),
+	JS_CFUNC_DEF("sampleCoverage", 0, wgl_sampleCoverage),
+	JS_CFUNC_DEF("scissor", 0, wgl_scissor),
+	JS_CFUNC_DEF("shaderSource", 0, wgl_shaderSource),
+	JS_CFUNC_DEF("stencilFunc", 0, wgl_stencilFunc),
+	JS_CFUNC_DEF("stencilFuncSeparate", 0, wgl_stencilFuncSeparate),
+	JS_CFUNC_DEF("stencilMask", 0, wgl_stencilMask),
+	JS_CFUNC_DEF("stencilMaskSeparate", 0, wgl_stencilMaskSeparate),
+	JS_CFUNC_DEF("stencilOp", 0, wgl_stencilOp),
+	JS_CFUNC_DEF("stencilOpSeparate", 0, wgl_stencilOpSeparate),
+	JS_CFUNC_DEF("texImage2D", 0, wgl_texImage2D),
+	JS_CFUNC_DEF("texParameterf", 0, wgl_texParameterf),
+	JS_CFUNC_DEF("texParameteri", 0, wgl_texParameteri),
+	JS_CFUNC_DEF("texSubImage2D", 0, wgl_texSubImage2D),
+	JS_CFUNC_DEF("uniform1f", 0, wgl_uniform1f),
+	JS_CFUNC_DEF("uniform1fv", 0, wgl_uniform1fv),
+	JS_CFUNC_DEF("uniform1i", 0, wgl_uniform1i),
+	JS_CFUNC_DEF("uniform1iv", 0, wgl_uniform1iv),
+	JS_CFUNC_DEF("uniform2f", 0, wgl_uniform2f),
+	JS_CFUNC_DEF("uniform2fv", 0, wgl_uniform2fv),
+	JS_CFUNC_DEF("uniform2i", 0, wgl_uniform2i),
+	JS_CFUNC_DEF("uniform2iv", 0, wgl_uniform2iv),
+	JS_CFUNC_DEF("uniform3f", 0, wgl_uniform3f),
+	JS_CFUNC_DEF("uniform3fv", 0, wgl_uniform3fv),
+	JS_CFUNC_DEF("uniform3i", 0, wgl_uniform3i),
+	JS_CFUNC_DEF("uniform3iv", 0, wgl_uniform3iv),
+	JS_CFUNC_DEF("uniform4f", 0, wgl_uniform4f),
+	JS_CFUNC_DEF("uniform4fv", 0, wgl_uniform4fv),
+	JS_CFUNC_DEF("uniform4i", 0, wgl_uniform4i),
+	JS_CFUNC_DEF("uniform4iv", 0, wgl_uniform4iv),
+	JS_CFUNC_DEF("uniformMatrix2fv", 0, wgl_uniformMatrix2fv),
+	JS_CFUNC_DEF("uniformMatrix3fv", 0, wgl_uniformMatrix3fv),
+	JS_CFUNC_DEF("uniformMatrix4fv", 0, wgl_uniformMatrix4fv),
+	JS_CFUNC_DEF("useProgram", 0, wgl_useProgram),
+	JS_CFUNC_DEF("validateProgram", 0, wgl_validateProgram),
+	JS_CFUNC_DEF("vertexAttrib1f", 0, wgl_vertexAttrib1f),
+	JS_CFUNC_DEF("vertexAttrib1fv", 0, wgl_vertexAttrib1fv),
+	JS_CFUNC_DEF("vertexAttrib2f", 0, wgl_vertexAttrib2f),
+	JS_CFUNC_DEF("vertexAttrib2fv", 0, wgl_vertexAttrib2fv),
+	JS_CFUNC_DEF("vertexAttrib3f", 0, wgl_vertexAttrib3f),
+	JS_CFUNC_DEF("vertexAttrib3fv", 0, wgl_vertexAttrib3fv),
+	JS_CFUNC_DEF("vertexAttrib4f", 0, wgl_vertexAttrib4f),
+	JS_CFUNC_DEF("vertexAttrib4fv", 0, wgl_vertexAttrib4fv),
+	JS_CFUNC_DEF("vertexAttribPointer", 0, wgl_vertexAttribPointer),
+	JS_CFUNC_DEF("viewport", 0, wgl_viewport),
+};

gpac-1.0.0.tar.gz/src/jsmods/evg.c Added

@@ -0,0 +1,6631 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / JavaScript vector graphics bindings
+ *
+ *  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.
+ *
+ */
+
+
+/*
+	ANY CHANGE TO THE API MUST BE REFLECTED IN THE DOCUMENTATION IN gpac/share/doc/idl/evg.idl
+	(no way to define inline JS doc with doxygen)
+*/
+
+
+#include <gpac/setup.h>
+
+#ifdef GPAC_HAS_QJS
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/nodes_x3d.h>
+/*dom events*/
+#include <gpac/evg.h>
+
+#include "../scenegraph/qjs_common.h"
+
+#include <gpac/internal/compositor_dev.h>
+
+/*for texture from png/rgb*/
+#include <gpac/bitstream.h>
+#include <gpac/avparse.h>
+#include <gpac/network.h>
+
+
+#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);
+
+//not used, wau too slow - we kept the code for future testing
+//#define EVG_USE_JS_SHADER
+
+typedef struct
+{
+	u32 width, height, pf, stride, stride_uv, nb_comp;
+	char *data;
+	u32 data_size;
+	Bool owns_data;
+	u32 flags;
+	GF_EVGStencil *stencil;
+	JSValue param_fun, obj;
+	JSContext *ctx;
+} GF_JSTexture;
+
+#define MAX_ATTR_DIM	4
+typedef struct
+{
+	Float values[MAX_ATTR_DIM];
+	u32 dim;
+	u8 comp_type;
+} EVG_VAIRes;
+
+enum
+{
+	GF_EVG_VAI_VERTEX_INDEX=0,
+	GF_EVG_VAI_VERTEX,
+	GF_EVG_VAI_PRIMITIVE,
+};
+
+typedef struct
+{
+	u32 prim_idx;
+	u32 nb_comp;
+	Float *values;
+	u32 nb_values;
+	JSValue ab;
+#ifdef EVG_USE_JS_SHADER
+	JSValue res;
+#endif
+	u32 interp_type;
+
+	Float anchors[3][MAX_ATTR_DIM];
+	EVG_VAIRes result;
+
+	Bool normalize;
+} EVG_VAI;
+
+typedef struct
+{
+	u32 nb_comp, att_type;
+	Float *values;
+	u32 nb_values;
+	JSValue ab;
+	JSValue res;
+	u32 interp_type;
+
+	Bool normalize;
+} EVG_VA;
+
+enum
+{
+	COMP_X = 1,//x or r or s
+	COMP_Y = 1<<1,//y or g or t
+	COMP_Z = 1<<2, //z or b
+	COMP_Q = 1<<3, //w/q or a
+	COMP_V2_XY = COMP_X|COMP_Y,
+	COMP_V2_XZ = COMP_X|COMP_Z,
+	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
+};
+
+typedef struct
+{
+	u8 op_type;
+	u8 cond_type;
+	u8 left_value_type;
+	u8 right_value_type;
+	s32 left_value, right_value, right_value_second;
+	char *uni_name;
+	JSValue tx_ref;
+	GF_JSTexture *tx;
+
+	//we separate VAI/MX from base value in order to be able to assign a VAI value
+	union {
+        struct {
+			EVG_VAI *vai;
+			JSValue ref;
+		} vai;
+        struct {
+			EVG_VA *va;
+			JSValue ref;
+		} va;
+        struct {
+			GF_Matrix *mx;
+			JSValue ref;
+		} mx;
+	};
+
+	union {
+		Float vec[4];
+		s32 ival;
+		Bool bval;
+	};
+} ShaderOp;
+
+enum
+{
+	GF_EVG_SHADER_FRAGMENT=1,
+	GF_EVG_SHADER_VERTEX,
+};
+
+typedef struct
+{
+	char *name;
+	union {
+		GF_Vec4 vecval;
+		s32 ival;
+		Bool bval;
+	};
+	u8 value_type;
+} ShaderVar;
+
+typedef struct
+{
+	u32 mode;
+	u32 nb_ops, alloc_ops;
+	ShaderOp *ops;
+	u32 nb_vars, alloc_vars;
+	ShaderVar *vars;
+	Bool invalid, disable_early_z;
+} EVGShader;
+
+typedef struct
+{
+	u32 width, height, pf, stride, stride_uv, mem_size;
+	char *data;
+	Bool owns_data;
+	Bool center_coords;
+	GF_EVGSurface *surface;
+	u32 composite_op;
+	JSValue alpha_cbk;
+	JSValue frag_shader;
+	Bool frag_is_cbk;
+	JSValue vert_shader;
+	Bool vert_is_cbk;
+
+	JSValue depth_buffer;
+
+
+	EVGShader *frag, *vert;
+
+	JSContext *ctx;
+	JSValue obj;
+#ifdef EVG_USE_JS_SHADER
+	JSValue frag_obj;
+	JSValue vert_obj;
+#endif
+
+} GF_JSCanvas;
+
+
+
+typedef struct
+{
+	GF_FontManager *fm;
+	GF_Path *path;
+	char *fontname;
+	Double font_size;
+	u32 align;
+	u32 baseline;
+	u32 styles;
+	GF_List *spans;
+	Bool horizontal;
+	Bool flip;
+	Double maxWidth;
+	Double lineSpacing;
+	Fixed min_x, min_y, max_x, max_y, max_w, max_h;
+	GF_Font *font;
+	Bool path_for_centered;
+} GF_JSText;
+
+
+JSClassID canvas_class_id;
+JSClassID canvas3d_class_id;
+JSClassID path_class_id;
+JSClassID mx2d_class_id;
+JSClassID colmx_class_id;
+JSClassID stencil_class_id;
+JSClassID texture_class_id;
+JSClassID text_class_id;
+JSClassID matrix_class_id;
+#ifdef EVG_USE_JS_SHADER
+JSClassID fragment_class_id;
+JSClassID vertex_class_id;
+JSClassID vaires_class_id;
+#endif
+JSClassID vai_class_id;
+JSClassID va_class_id;
+JSClassID shader_class_id;
+
+static void text_set_path(GF_JSCanvas *canvas, GF_JSText *text);
+
+Bool get_color_from_args(JSContext *c, int argc, JSValueConst *argv, u32 idx, Double *a, Double *r, Double *g, Double *b);
+static Bool get_color(JSContext *c, JSValueConst obj, Double *a, Double *r, Double *g, Double *b);
+
+static void canvas_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return;
+	JS_FreeValueRT(rt, canvas->alpha_cbk);
+	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);
+#endif
+	JS_FreeValueRT(rt, canvas->depth_buffer);
+
+	if (canvas->owns_data)
+		gf_free(canvas->data);
+	if (canvas->surface)
+		gf_evg_surface_delete(canvas->surface);
+	gf_free(canvas);
+}
+
+static void canvas3d_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_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);
+#endif
+	JS_MarkValue(rt, canvas->depth_buffer, mark_func);
+}
+
+JSClassDef canvas3d_class = {
+	"Canvas3D",
+	.finalizer = canvas3d_finalize,
+	.gc_mark = canvas3d_gc_mark
+};
+
+enum
+{
+	GF_EVG_CENTERED = 0,
+	GF_EVG_PATH,
+	GF_EVG_MATRIX,
+	GF_EVG_MATRIX_3D,
+	GF_EVG_CLIPPER,
+	GF_EVG_COMPOSITE_OP,
+	GF_EVG_ALPHA_FUN,
+	GF_EVG_FRAG_SHADER,
+	GF_EVG_VERT_SHADER,
+	GF_EVG_CCW,
+	GF_EVG_BACKCULL,
+	GF_EVG_MINDEPTH,
+	GF_EVG_MAXDEPTH,
+	GF_EVG_DEPTHTEST,
+	GF_EVG_ANTIALIAS,
+	GF_EVG_POINTSIZE,
+	GF_EVG_POINTSMOOTH,
+	GF_EVG_LINESIZE,
+	GF_EVG_CLIP_ZERO,
+	GF_EVG_DEPTH_BUFFER,
+	GF_EVG_DEPTH_TEST,
+	GF_EVG_WRITE_DEPTH,
+};
+
+u8 evg_get_alpha(void *cbk, u8 src_alpha, s32 x, s32 y)
+{
+	u32 res_a=0;
+	GF_JSCanvas *canvas = cbk;
+	JSValue ret, args[3];
+	args[0] = JS_NewInt32(canvas->ctx, src_alpha);
+	args[1] = JS_NewInt32(canvas->ctx, x);
+	args[2] = JS_NewInt32(canvas->ctx, y);
+	ret = JS_Call(canvas->ctx, canvas->alpha_cbk, canvas->obj, 3, args);
+	JS_ToInt32(canvas->ctx, &res_a, ret);
+	return res_a;
+
+}
+
+static JSValue canvas_constructor_internal(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv, Bool is_3d)
+{
+	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_Err e;
+
+	if (argc<3)
+		return JS_EXCEPTION;
+	if (JS_ToInt32(c, &width, argv[0]))
+		return JS_EXCEPTION;
+	if (JS_ToInt32(c, &height, argv[1]))
+		return JS_EXCEPTION;
+	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;
+	}
+	if (!width || !height || !pf)
+		return JS_EXCEPTION;
+
+	if (argc>3) {
+		s32 idx=0;
+		if (JS_IsObject(argv[3])) {
+			data = JS_GetArrayBuffer(c, &data_size, argv[3]);
+			if (!data) return JS_EXCEPTION;
+			idx=1;
+		} else if (!JS_IsInteger(argv[3]))
+			return JS_EXCEPTION;
+
+		if (argc>3+idx) {
+			if (JS_ToInt32(c, &stride, argv[3+idx]))
+				return JS_EXCEPTION;
+			if (argc>4+idx) {
+				if (JS_ToInt32(c, &stride_uv, argv[4+idx]))
+					return JS_EXCEPTION;
+			}
+		}
+	}
+	GF_SAFEALLOC(canvas, GF_JSCanvas);
+
+	if (!canvas)
+		return JS_EXCEPTION;
+
+	if (!gf_pixel_get_size_info(pf, width, height, &osize, &stride, &stride_uv, NULL, NULL)) {
+		gf_free(canvas);
+		return JS_EXCEPTION;
+	}
+	if (data && (data_size<osize)) {
+		gf_free(canvas);
+		return JS_EXCEPTION;
+	}
+
+	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;
+#ifdef EVG_USE_JS_SHADER
+	canvas->frag_obj = JS_UNDEFINED;
+	canvas->vert_obj = JS_UNDEFINED;
+#endif
+	canvas->depth_buffer = JS_UNDEFINED;
+	canvas->ctx = c;
+	if (data) {
+		canvas->data = data;
+		canvas->owns_data = GF_FALSE;
+	} else {
+		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 {
+		canvas->surface = gf_evg_surface_new(GF_TRUE);
+		canvas->center_coords = GF_TRUE;
+	}
+	if (!canvas->surface)
+		e = GF_BAD_PARAM;
+	else
+		e = gf_evg_surface_attach_to_buffer(canvas->surface, canvas->data, canvas->width, canvas->height, 0, canvas->stride, canvas->pf);
+	if (e) {
+		if (canvas->owns_data) gf_free(canvas->data);
+		gf_evg_surface_delete(canvas->surface);
+		gf_free(canvas);
+		return JS_EXCEPTION;
+	}
+	canvas->obj = JS_NewObjectClass(c, is_3d ? canvas3d_class_id : canvas_class_id);
+	if (JS_IsException(canvas->obj)) return canvas->obj;
+
+	JS_SetOpaque(canvas->obj, canvas);
+	return canvas->obj;
+}
+
+static JSValue canvas_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return canvas_constructor_internal(c, new_target, argc, argv, GF_FALSE);
+}
+
+static JSValue canvas_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return JS_EXCEPTION;
+	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);
+	}
+	return JS_UNDEFINED;
+}
+
+Bool canvas_get_irect(JSContext *c, JSValueConst obj, GF_IRect *rc)
+{
+	JSValue v;
+	int res;
+	memset(rc, 0, sizeof(GF_IRect));
+
+#define GET_PROP( _n, _f)\
+	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)
+#undef GET_PROP
+	return GF_TRUE;
+}
+
+static JSValue canvas_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas_class_id);
+	if (!canvas) return JS_EXCEPTION;
+	switch (magic) {
+	case GF_EVG_CENTERED:
+		canvas->center_coords = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
+		gf_evg_surface_set_center_coords(canvas->surface, canvas->center_coords);
+		return JS_UNDEFINED;
+
+	case GF_EVG_PATH:
+		if (JS_IsNull(value)) {
+			gf_evg_surface_set_path(canvas->surface, NULL);
+		} else {
+			GF_Path *gp = JS_GetOpaque(value, path_class_id);
+			if (gp)
+				gf_evg_surface_set_path(canvas->surface, gp);
+			else {
+				GF_JSText *text = JS_GetOpaque(value, text_class_id);
+				if (text) {
+					text_set_path(canvas, text);
+				}
+			}
+		}
+		return JS_UNDEFINED;
+
+	case GF_EVG_MATRIX:
+		if (JS_IsNull(value)) {
+			gf_evg_surface_set_matrix(canvas->surface, NULL);
+		} else {
+			GF_Matrix2D *mx = JS_GetOpaque(value, mx2d_class_id);
+			gf_evg_surface_set_matrix(canvas->surface, mx);
+		}
+		return JS_UNDEFINED;
+
+	case GF_EVG_MATRIX_3D:
+		if (JS_IsNull(value)) {
+			gf_evg_surface_set_matrix(canvas->surface, NULL);
+		} else {
+			GF_Matrix *mx = JS_GetOpaque(value, matrix_class_id);
+			gf_evg_surface_set_matrix_3d(canvas->surface, mx);
+		}
+		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);
+			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;
+		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)) {
+			canvas->alpha_cbk = JS_UNDEFINED;
+			gf_evg_surface_set_alpha_callback(canvas->surface, NULL, NULL);
+		} else {
+			canvas->alpha_cbk = JS_DupValue(c, value);
+			gf_evg_surface_set_alpha_callback(canvas->surface, evg_get_alpha, canvas);
+		}
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+
+static JSValue canvas_clear_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_float, Bool is_3d)
+{
+	s32 i;
+	s32 idx=0;
+	GF_Err e;
+	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);
+	if (!canvas)
+		return JS_EXCEPTION;
+
+	irc = NULL;
+	if (argc && JS_IsObject(argv[0])) {
+		irc = &rc;
+		idx=1;
+		if (!canvas_get_irect(c, argv[0], &rc))
+			return JS_EXCEPTION;
+	}
+	if ((argc>idx) && JS_IsString(argv[idx])) {
+		const char *str = JS_ToCString(c, argv[0]);
+		col = gf_color_parse(str);
+		JS_FreeCString(c, str);
+	} else {
+		if (argc>4+idx) argc = 4+idx;
+		for (i=idx; i<argc; i++) {
+			s32 v;
+			if (use_float) {
+				Double d;
+				if (JS_ToFloat64(c, &d, argv[i]))
+					return JS_EXCEPTION;
+				v = (s32) (d*255);
+			} else if (JS_ToInt32(c, &v, argv[i])) {
+				return JS_EXCEPTION;
+			}
+
+			if (v<0) v = 0;
+			else if (v>255) v = 255;
+
+			if (i==idx) r=v;
+			else if (i==idx+1) g=v;
+			else if (i==idx+2) b=v;
+			else a=v;
+		}
+		col = GF_COL_ARGB(a, r, g, b) ;
+	}
+	e = gf_evg_surface_clear(canvas->surface, irc, col);
+	if (e)
+		return JS_EXCEPTION;
+	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);
+}
+static JSValue canvas_clearf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_clear_ex(c, obj, argc, argv, GF_TRUE, GF_FALSE);
+}
+
+static JSValue canvas_rgb_yuv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool to_rgb, Bool is_3d)
+{
+	GF_Err e;
+	Double _r=0, _g=0, _b=0, _a=1.0;
+	Float r=0, g=0, b=0, a=1.0;
+	Bool as_array = GF_FALSE;
+	u32 arg_idx=0;
+	Float y, u, v;
+	JSValue ret;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, is_3d ? canvas3d_class_id : canvas_class_id);
+	if (!canvas || !argc)
+		return JS_EXCEPTION;
+
+	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;
+	r = (Float) _r;
+	g = (Float) _g;
+	b = (Float) _b;
+	a = (Float) _a;
+	if (to_rgb) {
+		e = gf_evg_yuv_to_rgb_f(canvas->surface, r, g, b, &y, &u, &v);
+	} else {
+		e = gf_gf_evg_rgb_to_yuv_f(canvas->surface, r, g, b, &y, &u, &v);
+	}
+	if (e)
+		return JS_EXCEPTION;
+	if (as_array) {
+		ret = JS_NewArray(c);
+		JS_SetPropertyStr(c, ret, "length", JS_NewInt32(c, 4) );
+		JS_SetPropertyUint32(c, ret, 0, JS_NewFloat64(c, y) );
+		JS_SetPropertyUint32(c, ret, 1, JS_NewFloat64(c, u) );
+		JS_SetPropertyUint32(c, ret, 2, JS_NewFloat64(c, v) );
+		JS_SetPropertyUint32(c, ret, 3, JS_NewFloat64(c, a) );
+	} else {
+		ret = JS_NewObject(c);
+		JS_SetPropertyStr(c, ret, "r", JS_NewFloat64(c, y) );
+		JS_SetPropertyStr(c, ret, "g", JS_NewFloat64(c, u) );
+		JS_SetPropertyStr(c, ret, "b", JS_NewFloat64(c, v) );
+		JS_SetPropertyStr(c, ret, "a", JS_NewFloat64(c, a) );
+	}
+	return ret;
+}
+
+static JSValue canvas_reassign_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_3d)
+{
+	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;
+
+	if (canvas->owns_data) {
+		gf_free(canvas->data);
+		canvas->owns_data = GF_FALSE;
+	}
+	canvas->data = NULL;
+	data = JS_GetArrayBuffer(c, &data_size, argv[0]);
+	if (!data || (data_size<canvas->mem_size)) {
+		e = GF_BAD_PARAM;
+	} else {
+		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;
+	return JS_UNDEFINED;
+}
+
+static JSValue canvas_reassign(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_reassign_ex(c, obj, argc, argv, GF_FALSE);
+}
+
+static JSValue canvas_toYUV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_FALSE, GF_FALSE);
+}
+
+static JSValue canvas_toRGB(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_TRUE, GF_FALSE);
+}
+
+static JSValue canvas_fill(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_EVGStencil *stencil;
+	GF_JSTexture *tx;
+	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;
+	}
+	tx = JS_GetOpaque(argv[0], texture_class_id);
+	if (tx) {
+		gf_evg_surface_fill(canvas->surface, tx->stencil);
+		return JS_UNDEFINED;
+	}
+	return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry canvas_funcs[] =
+{
+	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),
+};
+
+
+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);
+}
+
+static JSValue canvas3d_toYUV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_FALSE, GF_TRUE);
+}
+
+static JSValue canvas3d_toRGB(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas_rgb_yuv(c, obj, argc, argv, GF_TRUE, GF_TRUE);
+}
+
+Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag);
+
+#ifdef EVG_USE_JS_SHADER
+static Bool evg_frag_shader_fun(void *udta, GF_EVGFragmentParam *frag)
+{
+	Bool frag_valid;
+	JSValue res;
+	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
+	if (!canvas) return GF_FALSE;
+
+	JS_SetOpaque(canvas->frag_obj, frag);
+	res = JS_Call(canvas->ctx, canvas->frag_shader, canvas->obj, 1, &canvas->frag_obj);
+	frag_valid = frag->frag_valid ? 1 : 0;
+	if (JS_IsException(res)) frag_valid = GF_FALSE;
+	else if (!JS_IsUndefined(res)) frag_valid = JS_ToBool(canvas->ctx, res) ? GF_TRUE : GF_FALSE;
+	JS_FreeValue(canvas->ctx, res);
+	return frag_valid;
+}
+
+static Bool evg_vert_shader_fun(void *udta, GF_EVGVertexParam *vertex)
+{
+	Bool vert_valid=GF_TRUE;
+	JSValue res;
+	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
+	if (!canvas) return GF_FALSE;
+
+	JS_SetOpaque(canvas->vert_obj, vertex);
+	res = JS_Call(canvas->ctx, canvas->frag_shader, canvas->obj, 1, &canvas->vert_obj);
+	if (JS_IsException(res)) vert_valid = GF_FALSE;
+	else if (!JS_IsUndefined(res)) vert_valid = JS_ToBool(canvas->ctx, res) ? GF_TRUE : GF_FALSE;
+	JS_FreeValue(canvas->ctx, res);
+	return vert_valid;
+}
+#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)
+{
+	GF_Err e;
+	GF_Matrix mx;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
+	if (!canvas) return JS_EXCEPTION;
+
+	gf_mx_init(mx);
+	if (argc) {
+		if (JS_IsArray(c, argv[0])) {
+			u32 i, len=0;
+			JSValue v = JS_GetPropertyStr(c, argv[0], "length");
+			JS_ToInt32(c, &len, v);
+			JS_FreeValue(c, v);
+			if (len < 16) return JS_EXCEPTION;
+			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;
+				mx.m[i] =  FLT2FIX(val);
+			}
+		} else {
+			return js_throw_err_msg(c, GF_NOT_SUPPORTED, "only float array currently supported for matrices");
+		}
+	}
+	if (is_proj)
+		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;
+}
+static JSValue canvas3d_projection(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas3d_set_matrix(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue canvas3d_modelview(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return canvas3d_set_matrix(c, obj, argc, argv, GF_FALSE);
+}
+
+uint8_t *evg_get_array(JSContext *ctx, JSValueConst obj, u32 *size)
+{
+	JSValue v;
+	/*ArrayBuffer*/
+	size_t psize;
+	uint8_t *res = JS_GetArrayBuffer(ctx, &psize, obj);
+	if (res) {
+		*size = (u32) psize;
+		return res;
+	}
+	/*ArrayView*/
+	v = JS_GetPropertyStr(ctx, obj, "buffer");
+	if (JS_IsUndefined(v)) return NULL;
+	res = JS_GetArrayBuffer(ctx, &psize, v);
+	JS_FreeValue(ctx, v);
+	*size = (u32) psize;
+	return res;
+}
+static JSValue canvas3d_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;
+
+	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 (argc>2) {
+		JS_ToInt32(c, (s32 *)&prim_type, argv[2]);
+		if (!prim_type) return JS_EXCEPTION;
+		if (argc>3) {
+			JS_ToInt32(c, &nb_comp, argv[3]);
+			if ((nb_comp<2) || (nb_comp>4)) return JS_EXCEPTION;
+		}
+	}
+	if (vx_size % nb_comp)
+		return JS_EXCEPTION;
+	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;
+
+	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)
+{
+	GF_Err e = GF_OK;
+	Float z = 0;
+	GF_JSCanvas *canvas = JS_GetOpaque(obj, canvas3d_class_id);
+	if (!canvas || argc<1) return JS_EXCEPTION;
+	if (argc>1) {
+		EVG_GET_FLOAT(z, argv[1]);
+	}
+
+	GF_Path *gp = JS_GetOpaque(argv[0], path_class_id);
+	if (gp) {
+		e = gf_evg_surface_draw_path(canvas->surface, gp, z);
+	} else {
+		GF_JSText *text = JS_GetOpaque(argv[0], text_class_id);
+		if (text) {
+			text_update_path(text, GF_TRUE);
+			e = gf_evg_surface_draw_path(canvas->surface, text->path, z);
+		}
+	}
+	if (e) return js_throw_err(ctx, e);
+	return JS_UNDEFINED;
+}
+static JSValue canvas3d_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;
+	if (argc)
+		EVG_GET_FLOAT(depth, argv[0]);
+
+	e = gf_evg_surface_clear_depth(canvas->surface, depth);
+	if (e) return JS_EXCEPTION;
+	return JS_UNDEFINED;
+}
+static JSValue canvas3d_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;
+	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);;
+		if (JS_ToInt32(ctx, &y, argv[1])) return js_throw_err(ctx, GF_BAD_PARAM);;
+		if (JS_ToInt32(ctx, &w, argv[2])) return js_throw_err(ctx, GF_BAD_PARAM);;
+		if (JS_ToInt32(ctx, &h, argv[3])) return js_throw_err(ctx, GF_BAD_PARAM);;
+	} else {
+		x = y = 0;
+		w = canvas->width;
+		h = canvas->height;
+	}
+	e = gf_evg_surface_viewport(canvas->surface, x, y, w, h);
+	if (e) return JS_EXCEPTION;
+	return JS_UNDEFINED;
+}
+
+
+enum
+{
+	EVG_OP_IF=1,
+	EVG_OP_ELSE,
+	EVG_OP_ELSEIF,
+	EVG_OP_END,
+	EVG_OP_GOTO,
+	EVG_OP_ASSIGN,
+	EVG_OP_DISCARD,
+	EVG_OP_ADD,
+	EVG_OP_SUB,
+	EVG_OP_MUL,
+	EVG_OP_DIV,
+	EVG_OP_NEG,
+	EVG_OP_LESS,
+	EVG_OP_LESS_EQUAL,
+	EVG_OP_GREATER,
+	EVG_OP_GREATER_EQUAL,
+	EVG_OP_EQUAL,
+	EVG_OP_NOT_EQUAL,
+	EVG_OP_SAMPLER,
+	EVG_OP_SAMPLER_YUV,
+
+	EVG_OP_PRINT,
+
+	EVG_OP_NORMALIZE,
+	EVG_OP_LENGTH,
+	EVG_OP_DISTANCE,
+	EVG_OP_DOT,
+	EVG_OP_CROSS,
+	EVG_OP_POW,
+	EVG_OP_SIN,
+	EVG_OP_ASIN,
+	EVG_OP_COS,
+	EVG_OP_ACOS,
+	EVG_OP_TAN,
+	EVG_OP_ATAN,
+	EVG_OP_LOG,
+	EVG_OP_EXP,
+	EVG_OP_LOG2,
+	EVG_OP_EXP2,
+	EVG_OP_SINH,
+	EVG_OP_COSH,
+	EVG_OP_SQRT,
+	EVG_OP_INVERSE_SQRT,
+	EVG_OP_ABS,
+	EVG_OP_SIGN,
+	EVG_OP_FLOOR,
+	EVG_OP_CEIL,
+	EVG_OP_FRACT,
+	EVG_OP_MOD,
+	EVG_OP_MIN,
+	EVG_OP_MAX,
+	EVG_OP_CLAMP,
+	EVG_OP_RGB2YUV,
+	EVG_OP_YUV2RGB,
+
+	EVG_FIRST_VAR_ID
+};
+
+enum
+{
+	VAR_FRAG_ARGB=1,
+	VAR_FRAG_YUV,
+	VAR_FRAG_X,
+	VAR_FRAG_Y,
+	VAR_FRAG_DEPTH,
+	VAR_FRAG_W,
+	VAR_UNIFORM,
+	VAR_VERTEX_IN,
+	VAR_VERTEX_OUT,
+	VAR_VAI,
+	VAR_VA,
+	VAR_MATRIX,
+};
+
+
+static GFINLINE Float isqrtf(Float v)
+{
+	v = sqrtf(v);
+	if (v) v = 1 / v;
+	return v;
+}
+static GFINLINE Float signf(Float v)
+{
+	if (v==0) return 0;
+	if (v>0) return 1.0;
+	return -1.0;
+}
+static GFINLINE Float fractf(Float v)
+{
+	return v - floorf(v);
+}
+static GFINLINE Float _modf(Float x, Float y)
+{
+	if (!y) return 0.0;
+	return x - y * floorf(x/y);
+}
+
+
+
+#if defined(WIN32) && !defined(__GNUC__)
+# include <intrin.h>
+# define GPAC_HAS_SSE2
+#else
+# ifdef __SSE2__
+#  include <emmintrin.h>
+#  define GPAC_HAS_SSE2
+# endif
+#endif
+
+#ifdef GPAC_HAS_SSE2
+
+static Float evg_float_clamp(Float val, Float minval, Float maxval)
+{
+    _mm_store_ss( &val, _mm_min_ss( _mm_max_ss(_mm_set_ss(val),_mm_set_ss(minval)), _mm_set_ss(maxval) ) );
+    return val;
+}
+#else
+
+#define evg_float_clamp(_val, _minval, _maxval)\
+	(_val<_minval) ? _minval : (_val>_maxval) ? _maxval : _val;
+
+#endif
+
+
+/*
+
+*/
+
+static Bool evg_shader_ops(GF_JSCanvas *canvas, EVGShader *shader, GF_EVGFragmentParam *frag, GF_EVGVertexParam *vert)
+{
+	u32 op_idx, dim;
+	GF_Vec4 tmpl, tmpr;
+	GF_Vec4 *left_val, *right_val, *right2_val;
+	u32 if_level=0;
+	u32 nif_level=0;
+	Bool cond_res;
+
+	//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;
+
+	for (op_idx=0; op_idx<shader->nb_ops; op_idx++) {
+		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 (!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;
+			}
+			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++;
+				}
+			} 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;
+		}
+
+		dim=4;
+		if (op->left_value==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) {
+			left_val = &frag->color;
+			left_val_type = COMP_V4;
+			frag->frag_valid = GF_EVG_FRAG_YUV;
+		} else if (op->left_value==VAR_FRAG_X) {
+			left_val = &tmpl;
+			tmpl.x = frag->screen_x;
+			left_val_type = COMP_FLOAT;
+		} else if (op->left_value==VAR_FRAG_Y) {
+			left_val = &tmpl;
+			tmpl.x = frag->screen_y;
+			left_val_type = COMP_FLOAT;
+		} else if (op->left_value==VAR_FRAG_W) {
+			left_val = &tmpl;
+			tmpl.x = frag->persp_denum;
+			left_val_type = COMP_FLOAT;
+		} else if (op->left_value==VAR_FRAG_DEPTH) {
+			left_val = (GF_Vec4 *) &frag->depth;
+			left_val_type = COMP_FLOAT;
+		} else if (op->left_value==VAR_VERTEX_IN) {
+			left_val = (GF_Vec4 *) &vert->in_vertex;
+			left_val_type = COMP_V4;
+		} else if (op->left_value==VAR_VERTEX_OUT) {
+			left_val = (GF_Vec4 *) &vert->out_vertex;
+			left_val_type = COMP_V4;
+		} else if (op->left_value==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) {
+			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;
+		}
+
+		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;
+
+			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_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;
+					}
+				} else {
+					gf_vec_norm((GF_Vec *) right_val);
+				}
+
+			}
+			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));
+			shader->invalid = GF_TRUE;
+			return GF_FALSE;
+		}
+
+#define GET_FIRST_COMP\
+					idx=0;\
+					while (1) {\
+						if (op->right_value_type & (1<<idx))\
+							break;\
+						if (idx==3)\
+							break;\
+						idx++;\
+					}\
+
+#define GET_NEXT_COMP\
+					has_next = GF_FALSE;\
+					next_idx = idx;\
+					while (1) {\
+						if (next_idx==3)\
+							break;\
+						if (op->right_value_type & (1<< (next_idx+1)) ) {\
+							has_next = GF_TRUE;\
+							next_idx = idx+1;\
+							break;\
+						}\
+						next_idx++;\
+					}\
+					if (has_next) idx = next_idx;\
+
+		switch (op->op_type) {
+		case EVG_OP_ASSIGN:
+			//full assignment
+			if (op->left_value_type==COMP_V4) {
+				if (left_val_type_ptr) {
+					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)) {
+					*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]; }
+				}
+			}
+			//partial assignment, only valid for float sources
+			else {
+				Bool use_const = GF_FALSE;
+				Float cval;
+				if (right_val_type==COMP_FLOAT) {
+					use_const = GF_TRUE;
+					cval = right_val->x;
+				} else if (right_val_type==COMP_INT) {
+					use_const = GF_TRUE;
+					cval = (Float) ( *(s32*)right_val);
+				}
+				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;
+					if (op->left_value_type & COMP_Z) left_val->z = cval;
+					if (op->left_value_type & COMP_Q) left_val->q = cval;
+				} else {
+					Float *srcs = (Float *) &right_val->x;
+
+					GET_FIRST_COMP
+					if (op->left_value_type & COMP_X) { left_val->x = srcs[idx]; GET_NEXT_COMP }
+					if (op->left_value_type & COMP_Y) { left_val->y = srcs[idx]; GET_NEXT_COMP }
+					if (op->left_value_type & COMP_Z) { left_val->z = srcs[idx]; GET_NEXT_COMP }
+					if (op->left_value_type & COMP_Q) { left_val->q = srcs[idx]; }
+				}
+			}
+			if (norm_result)
+				gf_vec_norm((GF_Vec *)left_val);
+			break;
+
+#define BASE_OP(_opv, _opv2)\
+			if (op->left_value_type==COMP_V4) {\
+				if (right_val_type==COMP_INT) {\
+					if (left_val_type == COMP_INT) {\
+						*((s32 *) left_val) _opv *(s32 *) right_val;\
+					} else if (left_val_type == COMP_FLOAT) {\
+						left_val->x _opv *(s32 *) right_val;\
+					} else {\
+						left_val->x _opv *(s32 *) right_val;\
+						left_val->y _opv *(s32 *) right_val;\
+						left_val->z _opv *(s32 *) right_val;\
+						left_val->q _opv *(s32 *) right_val;\
+					}\
+				} else if (right_val_type==COMP_FLOAT) {\
+					if (left_val_type == COMP_INT) {\
+						left_val->x = *((s32 *) left_val) _opv2 right_val->x;\
+						*left_val_type_ptr = COMP_FLOAT;\
+					} else if (left_val_type == COMP_FLOAT) {\
+						left_val->x _opv right_val->x;\
+					} else {\
+						left_val->x _opv right_val->x;\
+						left_val->y _opv right_val->x;\
+						left_val->z _opv right_val->x;\
+						left_val->q _opv right_val->x;\
+					}\
+				} else if (right_val_type==COMP_BOOL) {\
+				} else {\
+					Float *srcs = (Float *) &right_val->x;\
+					GET_FIRST_COMP\
+					if (left_val_type & COMP_X) { left_val->x _opv srcs[idx]; GET_NEXT_COMP } \
+					if (left_val_type & COMP_Y) { left_val->y _opv srcs[idx]; GET_NEXT_COMP } \
+					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]; }\
+				}\
+			}\
+			else {\
+				Bool use_const = GF_FALSE;\
+				Float cval;\
+				if (right_val_type==COMP_FLOAT) {\
+					use_const = GF_TRUE;\
+					cval = right_val->x;\
+				} else if (right_val_type==COMP_INT) {\
+					use_const = GF_TRUE;\
+					cval = (Float) ( *(s32*)right_val);\
+				}\
+				if (use_const) {\
+					if (op->left_value_type & COMP_X) left_val->x _opv cval;\
+					if (op->left_value_type & COMP_Y) left_val->y _opv cval;\
+					if (op->left_value_type & COMP_Z) left_val->z _opv cval;\
+					if (op->left_value_type & COMP_Q) left_val->q _opv cval;\
+				} else {\
+					Float *srcs = (Float *) &right_val->x;\
+					GET_FIRST_COMP\
+					if (op->left_value_type & COMP_X) { left_val->x _opv srcs[idx]; GET_NEXT_COMP }\
+					if (op->left_value_type & COMP_Y) { left_val->y _opv srcs[idx]; GET_NEXT_COMP }\
+					if (op->left_value_type & COMP_Z) { left_val->z _opv srcs[idx]; GET_NEXT_COMP }\
+					if (op->left_value_type & COMP_Q) left_val->q _opv srcs[idx];\
+				}\
+			}\
+
+		case EVG_OP_MUL:
+			BASE_OP(*=, *)
+			break;
+		case EVG_OP_DIV:
+			BASE_OP(/=, /)
+			break;
+		case EVG_OP_ADD:
+			BASE_OP(+=, +)
+			break;
+		case EVG_OP_SUB:
+			BASE_OP(-=, -)
+			break;
+		case EVG_OP_NEG:
+			BASE_OP(= !, *)
+			break;
+		case EVG_OP_IF:
+#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) {\
+					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;\
+				} else {\
+					cond_res = ( (left_val->x _opv *(s32 *) right_val) && \
+							(left_val->y _opv *(s32 *) right_val) && \
+							(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) {\
+				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) {\
+					cond_res = (left_val->x _opv right_val->x) ? GF_TRUE : GF_FALSE;\
+				} else {\
+					cond_res = ( (left_val->x _opv right_val->x) &&\
+							(left_val->y _opv right_val->x) &&\
+							(left_val->z _opv right_val->x) && \
+							(left_val->q _opv right_val->x) ) ? GF_TRUE : GF_FALSE;\
+				}\
+			} else {\
+				cond_res=GF_TRUE;\
+				Float *srcs = (Float *) &right_val->x;\
+				GET_FIRST_COMP\
+				if (left_val_type & COMP_X) { if (! (left_val->x _opv srcs[idx]) ) cond_res = GF_FALSE; GET_NEXT_COMP } \
+				if (left_val_type & COMP_Y) { if (! (left_val->y _opv srcs[idx]) ) cond_res = GF_FALSE; GET_NEXT_COMP } \
+				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; }\
+			}\
+		}\
+		else {\
+			Bool use_const = GF_FALSE;\
+			Float cval;\
+			if (right_val_type==COMP_FLOAT) {\
+				use_const = GF_TRUE;\
+				cval = right_val->x;\
+			} else if (right_val_type==COMP_INT) {\
+				use_const = GF_TRUE;\
+				cval = (Float) ( *(s32*)right_val);\
+			}\
+			if (use_const) {\
+				cond_res=GF_TRUE;\
+				if (op->left_value_type & COMP_X) if (! (left_val->x _opv cval) ) cond_res=GF_FALSE;\
+				if (op->left_value_type & COMP_Y) if (! (left_val->y _opv cval) ) cond_res=GF_FALSE;\
+				if (op->left_value_type & COMP_Z) if (! (left_val->z _opv cval) ) cond_res=GF_FALSE;\
+				if (op->left_value_type & COMP_Q) if (! (left_val->q _opv cval) ) cond_res=GF_FALSE;\
+			} else {\
+				Float *srcs = (Float *) &right_val->x;\
+				GET_FIRST_COMP\
+				if (op->left_value_type & COMP_X) { if (! (left_val->x _opv srcs[idx]) ) cond_res=GF_FALSE; GET_NEXT_COMP }\
+				if (op->left_value_type & COMP_Y) { if (! (left_val->y _opv srcs[idx]) ) cond_res=GF_FALSE; GET_NEXT_COMP }\
+				if (op->left_value_type & COMP_Z) { if (! (left_val->z _opv srcs[idx]) ) cond_res=GF_FALSE; GET_NEXT_COMP }\
+				if (op->left_value_type & COMP_Q) { if (! (left_val->q _opv srcs[idx]) ) cond_res=GF_FALSE; }\
+			}\
+		}
+
+			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;
+
+			if (cond_res) if_level++;
+			else nif_level++;
+
+			break;
+
+		case EVG_OP_SAMPLER:
+			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);
+			} else {
+				gf_evg_stencil_get_pixel_f(op->tx->stencil, right_val->x, right_val->y, &tmpr.x, &tmpr.y, &tmpr.z, &tmpr.q);
+				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;
+				if (op->left_value_type & COMP_Q) left_val->q = tmpr.q;
+			}
+			break;
+
+		case EVG_OP_SAMPLER_YUV:
+			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);
+			} 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);
+				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;
+				if (op->left_value_type & COMP_Q) left_val->q = tmpr.q;
+			}
+			break;
+		case EVG_OP_DISCARD:
+			frag->frag_valid = 0;
+			return GF_TRUE;
+		case EVG_OP_NORMALIZE:
+			if (left_val_type_ptr) {
+				*left_val_type_ptr = COMP_V4;
+			}
+			*left_val = *right_val;
+			gf_vec_norm((GF_Vec *)left_val);
+			break;
+		case EVG_OP_LENGTH:
+			if (left_val_type_ptr) {
+				*left_val_type_ptr = COMP_FLOAT;
+			}
+			left_val->x = gf_vec_len_p( (GF_Vec *) right_val);
+			break;
+		case EVG_OP_DISTANCE:
+			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;
+			gf_vec_diff(tmpr, *right_val, *right2_val);
+			left_val->x = gf_vec_len_p( (GF_Vec *) &tmpr);
+			break;
+
+		case EVG_OP_DOT:
+			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;
+			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;
+			* (GF_Vec *) left_val = gf_vec_cross_p( (GF_Vec *) right_val, (GF_Vec *) right2_val);
+			break;
+
+#define BASE_FUN2(__fun) \
+	if (left_val_type_ptr) {\
+		*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;\
+	if (right_val_type==COMP_FLOAT) {\
+		left_val->x = __fun(right_val->x, right2_val->x);\
+	} else {\
+		if (right_val_type&COMP_X) {\
+			left_val->x = __fun(right_val->x, right2_val->x);\
+		}\
+		if (right_val_type&COMP_Y) {\
+			left_val->y = __fun(right_val->y, right2_val->y);\
+		}\
+		if (right_val_type&COMP_Z) {\
+			left_val->z = __fun(right_val->z, right2_val->z);\
+		}\
+		if (right_val_type&COMP_Q) {\
+			left_val->q = __fun(right_val->z, right2_val->q);\
+		}\
+	}\
+
+
+#define BASE_FUN(__fun) \
+		if (left_val_type_ptr) {\
+			*left_val_type_ptr = right_val_type;\
+		}\
+		if (right_val_type==COMP_FLOAT) {\
+			left_val->x = (Float) __fun(right_val->x);\
+		} else {\
+			if (right_val_type&COMP_X) {\
+				left_val->x = (Float) __fun(right_val->x);\
+			}\
+			if (right_val_type&COMP_Y) {\
+				left_val->y = (Float) __fun(right_val->y);\
+			}\
+			if (right_val_type&COMP_Z) {\
+				left_val->z = (Float) __fun(right_val->z);\
+			}\
+			if (right_val_type&COMP_Q) {\
+				left_val->q = (Float) __fun(right_val->z);\
+			}\
+		}\
+
+		case EVG_OP_POW:
+			BASE_FUN2(powf)
+			break;
+		case EVG_OP_SIN:
+			BASE_FUN(sinf)
+			break;
+		case EVG_OP_ASIN:
+			BASE_FUN(asinf)
+			break;
+		case EVG_OP_COS:
+			BASE_FUN(cosf)
+			break;
+		case EVG_OP_ACOS:
+			BASE_FUN(acosf)
+			break;
+		case EVG_OP_TAN:
+			BASE_FUN(tanf)
+			break;
+		case EVG_OP_ATAN:
+			BASE_FUN2(atan2f)
+			break;
+		case EVG_OP_LOG:
+			BASE_FUN(logf)
+			break;
+		case EVG_OP_EXP:
+			BASE_FUN(expf)
+			break;
+		case EVG_OP_LOG2:
+			BASE_FUN(log2f)
+			break;
+		case EVG_OP_EXP2:
+			BASE_FUN(exp2f)
+			break;
+		case EVG_OP_SINH:
+			BASE_FUN(sinhf)
+			break;
+		case EVG_OP_COSH:
+			BASE_FUN(coshf)
+			break;
+		case EVG_OP_SQRT:
+			BASE_FUN(sqrtf)
+			break;
+		case EVG_OP_INVERSE_SQRT:
+			BASE_FUN(isqrtf)
+			break;
+		case EVG_OP_ABS:
+			BASE_FUN(ABS)
+			break;
+		case EVG_OP_SIGN:
+			BASE_FUN(signf)
+			break;
+		case EVG_OP_FLOOR:
+			BASE_FUN(floorf)
+			break;
+		case EVG_OP_CEIL:
+			BASE_FUN(ceilf)
+			break;
+		case EVG_OP_FRACT:
+			BASE_FUN(fractf)
+			break;
+		case EVG_OP_MOD:
+			BASE_FUN2(_modf)
+			break;
+		case EVG_OP_MIN:
+			BASE_FUN2(MIN)
+			break;
+		case EVG_OP_MAX:
+			BASE_FUN2(MAX)
+			break;
+		case EVG_OP_CLAMP:
+			if (left_val_type_ptr) {
+				*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;
+			if (right_val_type==COMP_FLOAT) {
+				left_val->x = evg_float_clamp(left_val->x, right_val->x, right2_val->x);
+			} else {
+				if (right_val_type&COMP_X) {
+					left_val->x = evg_float_clamp(left_val->x, right_val->x, right2_val->x);
+				}
+				if (right_val_type&COMP_Y) {
+					left_val->y = evg_float_clamp(left_val->y, right_val->y, right2_val->x);
+				}
+				if (right_val_type&COMP_Z) {
+					left_val->z = evg_float_clamp(left_val->z, right_val->z, right2_val->x);
+				}
+				if (right_val_type&COMP_Q) {
+					left_val->q = evg_float_clamp(left_val->q, right_val->z, right2_val->x);
+				}
+			}
+			break;
+		case EVG_OP_RGB2YUV:
+			if (left_val_type_ptr) {
+				*left_val_type_ptr = right_val_type;
+			}
+			left_val->q = right_val->q;
+			gf_gf_evg_rgb_to_yuv_f(canvas->surface, right_val->x, right_val->y, right_val->z, &left_val->x, &left_val->y, &left_val->z);
+			break;
+		case EVG_OP_YUV2RGB:
+			if (left_val_type_ptr) {
+				*left_val_type_ptr = right_val_type;
+			}
+			left_val->q = right_val->q;
+			gf_evg_yuv_to_rgb_f(canvas->surface, right_val->x, right_val->y, right_val->z, &left_val->x, &left_val->y, &left_val->z);
+			break;
+
+		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);
+			}
+			if (right_val_type==COMP_FLOAT) {
+				fprintf(stderr, "%g\n", right_val->x);
+			} else if (right_val_type==COMP_INT) {
+				fprintf(stderr, "%d\n", * (s32 *) &right_val);
+			} else {
+				if (right_val_type&COMP_X) fprintf(stderr, "x=%g ", right_val->x);
+				if (right_val_type&COMP_Y) fprintf(stderr, "y=%g ", right_val->y);
+				if (right_val_type&COMP_Z) fprintf(stderr, "z=%g ", right_val->z);
+				if (right_val_type&COMP_Q) fprintf(stderr, "q=%g ", right_val->q);
+				fprintf(stderr, "\n");
+			}
+
+			break;
+		}
+	}
+	return GF_TRUE;
+}
+
+static Bool evg_frag_shader_ops(void *udta, GF_EVGFragmentParam *frag)
+{
+	GF_JSCanvas *canvas = (GF_JSCanvas *)udta;
+	if (!canvas->frag || canvas->frag->invalid) return GF_FALSE;
+	return evg_shader_ops(canvas, canvas->frag, frag, NULL);
+}
+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);
+}
+
+static void shader_reset(JSRuntime *rt, EVGShader *shader)
+{
+	u32 i;
+	for (i=0; i<shader->nb_ops; i++) {
+		if (shader->ops[i].right_value==VAR_VAI) {
+			JS_FreeValueRT(rt, shader->ops[i].vai.ref);
+		}
+		else if (shader->ops[i].right_value==VAR_MATRIX) {
+			JS_FreeValueRT(rt, shader->ops[i].mx.ref);
+		}
+		else if (shader->ops[i].right_value==VAR_VA) {
+			JS_FreeValueRT(rt, shader->ops[i].va.ref);
+		}
+		else if (shader->ops[i].left_value==VAR_VAI) {
+			JS_FreeValueRT(rt, shader->ops[i].vai.ref);
+		}
+		else if (shader->ops[i].left_value==VAR_MATRIX) {
+			JS_FreeValueRT(rt, shader->ops[i].mx.ref);
+		}
+
+		if (shader->ops[i].uni_name) {
+			gf_free(shader->ops[i].uni_name);
+			shader->ops[i].uni_name = NULL;
+		}
+		if (shader->ops[i].op_type==EVG_OP_SAMPLER) {
+			JS_FreeValueRT(rt, shader->ops[i].tx_ref);
+			shader->ops[i].tx_ref = JS_UNDEFINED;
+		}
+		shader->ops[i].right_value = 0;
+	}
+	shader->nb_ops = 0;
+	for (i=0; i<shader->nb_vars; i++) {
+		if (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;
+}
+static void shader_finalize(JSRuntime *rt, JSValue obj)
+{
+	EVGShader *shader = JS_GetOpaque(obj, shader_class_id);
+	if (!shader) return;
+	shader_reset(rt, shader);
+	gf_free(shader->ops);
+	gf_free(shader->vars);
+	gf_free(shader);
+}
+
+static void shader_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	u32 i;
+	EVGShader *shader = JS_GetOpaque(obj, shader_class_id);
+	if (!shader) return;
+	for (i=0; i<shader->nb_ops; i++) {
+		if (shader->ops[i].tx)
+			JS_MarkValue(rt, shader->ops[i].tx_ref, mark_func);
+
+		if (shader->ops[i].right_value==VAR_VAI) {
+			JS_MarkValue(rt, shader->ops[i].vai.ref, mark_func);
+		}
+		else if (shader->ops[i].right_value==VAR_MATRIX) {
+			JS_MarkValue(rt, shader->ops[i].mx.ref, mark_func);
+		}
+		else if (shader->ops[i].right_value==VAR_VA) {
+			JS_MarkValue(rt, shader->ops[i].va.ref, mark_func);
+		}
+		else if (shader->ops[i].left_value==VAR_VAI) {
+			JS_MarkValue(rt, shader->ops[i].vai.ref, mark_func);
+		}
+		else if (shader->ops[i].left_value==VAR_MATRIX) {
+			JS_MarkValue(rt, shader->ops[i].mx.ref, mark_func);
+		}
+	}
+}
+
+JSClassDef shader_class = {
+	.class_name = "Shader",
+	.finalizer = shader_finalize,
+	.gc_mark = shader_gc_mark
+};
+
+static u32 get_builtin_var_name(EVGShader *shader, const char *val_name)
+{
+	u32 i;
+	if (shader->mode==GF_EVG_SHADER_FRAGMENT) {
+		if (!strcmp(val_name, "fragColor") || !strcmp(val_name, "fragRGBA")) return VAR_FRAG_ARGB;
+		if (!strcmp(val_name, "fragYUVA")) return VAR_FRAG_YUV;
+		if (!strcmp(val_name, "fragDepth") || !strcmp(val_name, "fragZ")) return VAR_FRAG_DEPTH;
+		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 (shader->mode==GF_EVG_SHADER_VERTEX) {
+		if (!strcmp(val_name, "vertex")) return VAR_VERTEX_IN;
+		if (!strcmp(val_name, "vertexOut")) return VAR_VERTEX_OUT;
+	}
+
+	if (val_name[0] == '.') return VAR_UNIFORM;
+
+	for (i=0; i<shader->nb_vars; i++) {
+		if (!strcmp(shader->vars[i].name, val_name)) {
+			return EVG_FIRST_VAR_ID+i+1;
+		}
+	}
+	return 0;
+}
+static u8 get_value_type(const char *comp)
+{
+	if (!strcmp(comp, "x") || !strcmp(comp, "r") || !strcmp(comp, "s")) return COMP_X;
+	if (!strcmp(comp, "y") || !strcmp(comp, "g") || !strcmp(comp, "t")) return COMP_Y;
+	if (!strcmp(comp, "z") || !strcmp(comp, "b")) return COMP_Z;
+	if (!strcmp(comp, "q") || !strcmp(comp, "a")) return COMP_Q;
+	if (!strcmp(comp, "xyz") || !strcmp(comp, "rgb")) return COMP_V3;
+	if (!strcmp(comp, "xy") || !strcmp(comp, "rg") || !strcmp(comp, "st")) return COMP_V2_XY;
+	if (!strcmp(comp, "xz") || !strcmp(comp, "rb")) return COMP_V2_XZ;
+	if (!strcmp(comp, "yz") || !strcmp(comp, "gb")) return COMP_V2_YZ;
+	return COMP_V4;
+}
+
+
+static JSValue shader_push(JSContext *ctx, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *val_name=NULL, *arg_str;
+	const char *op_name;
+	char *uni_name=NULL;
+	Bool dual_right_val = GF_FALSE;
+	u32 var_idx=0;
+	u32 left_op_idx=0, right_op_idx=0, right_op2_idx=0;
+	u8 left_value_type=COMP_V4, right_value_type=COMP_V4;
+	u8 op_type=0;
+	u8 cond_type=0;
+	ShaderOp new_op;
+	EVGShader *shader = JS_GetOpaque(obj, shader_class_id);
+	if (!shader) return JS_EXCEPTION;
+	shader->invalid = GF_FALSE;
+	if (!argc) {
+		shader_reset(JS_GetRuntime(ctx), shader);
+		return JS_UNDEFINED;
+	}
+
+	memset(&new_op, 0, sizeof(ShaderOp));
+	new_op.op_type = 0;
+	new_op.tx_ref = JS_UNDEFINED;
+
+	if (JS_IsObject(argv[0])) {
+		new_op.vai.vai = JS_GetOpaque(argv[0], vai_class_id);
+		if (!new_op.vai.vai) {
+			shader->invalid = GF_TRUE;
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid left-operand value, must be a VAI");
+		}
+		new_op.vai.ref = JS_DupValue(ctx, argv[0]);
+		left_op_idx = VAR_VAI;
+	} else {
+
+		arg_str = JS_ToCString(ctx, argv[0]);
+		if (!arg_str) {
+			shader->invalid = GF_TRUE;
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid left-operand value, must be a string");
+		}
+		val_name = arg_str;
+		while ((val_name[0]==' ') || (val_name[0]=='\t'))
+			val_name++;
+
+		if (!strcmp(val_name, "if")) {
+			op_type = EVG_OP_IF;
+			JS_FreeCString(ctx, arg_str);
+			arg_str = JS_ToCString(ctx, argv[1]);
+			if (!arg_str) {
+				shader->invalid = GF_TRUE;
+				return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid if first var, must be a string");
+			}
+			var_idx=1;
+			val_name = arg_str;
+		}
+		else if (!strcmp(val_name, "else")) {
+			op_type = EVG_OP_ELSE;
+			JS_FreeCString(ctx, arg_str);
+			goto op_parsed;
+		}
+		else if (!strcmp(val_name, "discard")) {
+			if (shader->mode==GF_EVG_SHADER_VERTEX) {
+				shader->invalid = GF_TRUE;
+				return js_throw_err_msg(ctx, GF_BAD_PARAM, "discard is invalid in vertex shader");
+			}
+			op_type = EVG_OP_DISCARD;
+			JS_FreeCString(ctx, arg_str);
+			goto op_parsed;
+		}
+		else if (!strcmp(val_name, "elseif")) {
+			op_type = EVG_OP_ELSEIF;
+			var_idx=1;
+		}
+		else if (!strcmp(val_name, "goto")) {
+			op_type = EVG_OP_GOTO;
+			JS_FreeCString(ctx, arg_str);
+
+			if (JS_IsString(argv[1])) {
+				arg_str = JS_ToCString(ctx, argv[1]);
+				if (arg_str[0] != '.') {
+					shader->invalid = GF_TRUE;
+					return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid goto var, must be a uniform string");
+				}
+				right_op_idx = VAR_UNIFORM;
+				uni_name = gf_strdup(arg_str+1);
+				JS_FreeCString(ctx, arg_str);
+			} else if (JS_ToInt32(ctx, &left_op_idx, argv[1]) ) {
+				shader->invalid = GF_TRUE;
+				return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid goto var, must be a number greater than 1, 1 being the first instruction in the stack");
+			}
+			goto op_parsed;
+		}
+		else if (!strcmp(val_name, "end")) {
+			op_type = EVG_OP_END;
+			JS_FreeCString(ctx, arg_str);
+			goto op_parsed;
+		}
+		else if (!strcmp(val_name, "print")) {
+			op_type = EVG_OP_PRINT;
+			JS_FreeCString(ctx, arg_str);
+			var_idx=-1;
+			goto parse_right_val;
+		}
+		else if (!strcmp(val_name, "toRGB")) {
+			op_type = EVG_OP_YUV2RGB;
+			JS_FreeCString(ctx, arg_str);
+			var_idx=-1;
+			goto parse_right_val;
+		}
+		else if (!strcmp(val_name, "toYUV")) {
+			op_type = EVG_OP_RGB2YUV;
+			JS_FreeCString(ctx, arg_str);
+			var_idx=-1;
+			goto parse_right_val;
+		}
+
+		char *sep = strchr(val_name, '.');
+		if (sep) sep[0] = 0;
+		left_op_idx = get_builtin_var_name(shader, val_name);
+		if (!left_op_idx) {
+			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->vars[shader->nb_vars].name = gf_strdup(val_name);
+			shader->nb_vars++;
+			left_op_idx = EVG_FIRST_VAR_ID + shader->nb_vars;
+		}
+		if (sep) {
+			left_value_type = get_value_type(sep+1);
+			sep[0] = '.';
+		}
+		JS_FreeCString(ctx, arg_str);
+	}
+
+	op_name = JS_ToCString(ctx, argv[var_idx+1]);
+	if (!op_name) {
+		shader->invalid = GF_TRUE;
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid operand type, must be a string");
+	}
+	if (!strcmp(op_name, "=")) {
+		op_type = EVG_OP_ASSIGN;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "+=")) {
+		op_type = EVG_OP_ADD;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "-=")) {
+		op_type = EVG_OP_SUB;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "*=")) {
+		op_type = EVG_OP_MUL;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "/=")) {
+		op_type = EVG_OP_DIV;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "=!")) {
+		op_type = EVG_OP_NEG;
+		if (left_op_idx==VAR_FRAG_DEPTH)
+			shader->disable_early_z = GF_TRUE;
+	} else if (!strcmp(op_name, "<")) {
+		cond_type = EVG_OP_LESS;
+	} else if (!strcmp(op_name, "<=")) {
+		cond_type = EVG_OP_LESS_EQUAL;
+	} else if (!strcmp(op_name, ">")) {
+		cond_type = EVG_OP_GREATER;
+	} else if (!strcmp(op_name, ">=")) {
+		cond_type = EVG_OP_GREATER_EQUAL;
+	} else if (!strcmp(op_name, "==")) {
+		cond_type = EVG_OP_EQUAL;
+	} else if (!strcmp(op_name, "!=")) {
+		cond_type = EVG_OP_NOT_EQUAL;
+	} else if (!strcmp(op_name, "sampler") || !strcmp(op_name, "samplerYUV") ) {
+		new_op.tx = JS_GetOpaque(argv[var_idx+2], texture_class_id);
+		if (!strcmp(op_name, "samplerYUV")) op_type = EVG_OP_SAMPLER_YUV;
+		else op_type = EVG_OP_SAMPLER;
+
+		if (!new_op.tx) {
+			JS_FreeCString(ctx, val_name);
+			shader->invalid = GF_TRUE;
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid texture object for 2D sampler");
+		}
+		new_op.tx_ref = argv[var_idx+2];
+		var_idx++;
+	} else if (!strcmp(op_name, "normalize")) {
+		op_type = EVG_OP_NORMALIZE;
+	} else if (!strcmp(op_name, "length")) {
+		op_type = EVG_OP_LENGTH;
+	} else if (!strcmp(op_name, "distance")) {
+		op_type = EVG_OP_DISTANCE;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "dot")) {
+		op_type = EVG_OP_DOT;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "cross")) {
+		op_type = EVG_OP_CROSS;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "pow")) {
+		op_type = EVG_OP_POW;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "sin")) {
+		op_type = EVG_OP_SIN;
+	} else if (!strcmp(op_name, "asin")) {
+		op_type = EVG_OP_ASIN;
+	} else if (!strcmp(op_name, "cos")) {
+		op_type = EVG_OP_COS;
+	} else if (!strcmp(op_name, "acos")) {
+		op_type = EVG_OP_ACOS;
+	} else if (!strcmp(op_name, "tan")) {
+		op_type = EVG_OP_TAN;
+	} else if (!strcmp(op_name, "atan")) {
+		op_type = EVG_OP_ATAN;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "log")) {
+		op_type = EVG_OP_LOG;
+	} else if (!strcmp(op_name, "exp")) {
+		op_type = EVG_OP_EXP;
+	} else if (!strcmp(op_name, "log2")) {
+		op_type = EVG_OP_LOG2;
+	} else if (!strcmp(op_name, "exp2")) {
+		op_type = EVG_OP_EXP2;
+	} else if (!strcmp(op_name, "sinh")) {
+		op_type = EVG_OP_SINH;
+	} else if (!strcmp(op_name, "cosh")) {
+		op_type = EVG_OP_COSH;
+	} else if (!strcmp(op_name, "sqrt")) {
+		op_type = EVG_OP_SQRT;
+	} else if (!strcmp(op_name, "inversesqrt")) {
+		op_type = EVG_OP_INVERSE_SQRT;
+	} else if (!strcmp(op_name, "abs")) {
+		op_type = EVG_OP_ABS;
+	} else if (!strcmp(op_name, "sign")) {
+		op_type = EVG_OP_SIGN;
+	} else if (!strcmp(op_name, "floor")) {
+		op_type = EVG_OP_FLOOR;
+	} else if (!strcmp(op_name, "ceil")) {
+		op_type = EVG_OP_CEIL;
+	} else if (!strcmp(op_name, "fract")) {
+		op_type = EVG_OP_FRACT;
+	} else if (!strcmp(op_name, "mod")) {
+		op_type = EVG_OP_MOD;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "min")) {
+		op_type = EVG_OP_MIN;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "max")) {
+		op_type = EVG_OP_MAX;
+		dual_right_val = GF_TRUE;
+	} else if (!strcmp(op_name, "clamp")) {
+		op_type = EVG_OP_CLAMP;
+		dual_right_val = GF_TRUE;
+	} else {
+		JS_FreeCString(ctx, val_name);
+		shader->invalid = GF_TRUE;
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid operand type, must be a string");
+	}
+	JS_FreeCString(ctx, op_name);
+
+parse_right_val:
+	if (JS_IsString(argv[var_idx+2])) {
+		val_name = JS_ToCString(ctx, argv[var_idx+2]);
+		if (!val_name) {
+			shader->invalid = GF_TRUE;
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid right-operand value, must be a string");
+		}
+
+		char *sep = strchr(val_name+1, '.');
+		if (sep) sep[0] = 0;
+		right_op_idx = get_builtin_var_name(shader, val_name);
+		if (right_op_idx==VAR_UNIFORM) {
+			uni_name = gf_strdup(val_name+1);
+		}
+		if (sep) sep[0] = '.';
+
+		if (!right_op_idx) {
+			JSValue ret = js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid right-operand value, undefined variable %s", val_name);
+			JS_FreeCString(ctx, val_name);
+			shader->invalid = GF_TRUE;
+			if (uni_name) gf_free(uni_name);
+			return ret;
+		}
+		if (sep) {
+			right_value_type = get_value_type(sep+1);
+		}
+		JS_FreeCString(ctx, val_name);
+	}
+	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;
+		JS_FreeValue(ctx, comp);
+		if (length>4) length=4;
+		right_value_type = 0;
+		for (idx=0;idx<length; idx++) {
+			comp = JS_GetPropertyUint32(ctx, argv[var_idx+2], idx);
+			EVG_GET_FLOAT(new_op.vec[idx], comp);
+			right_value_type |= 1<<idx;
+			JS_FreeValue(ctx, comp);
+		}
+	}
+	else if (JS_IsObject(argv[var_idx+2])) {
+		EVG_VAI *vai = JS_GetOpaque(argv[var_idx+2], vai_class_id);
+		GF_Matrix *mx = JS_GetOpaque(argv[var_idx+2], matrix_class_id);
+		EVG_VA *va = (shader->mode==GF_EVG_SHADER_VERTEX) ? JS_GetOpaque(argv[var_idx+2], va_class_id) : NULL;
+
+		if (vai) {
+			new_op.vai.vai = vai;
+			new_op.vai.ref = JS_DupValue(ctx, argv[var_idx+2]);
+			right_op_idx = VAR_VAI;
+		} else if (mx) {
+			new_op.mx.mx = mx;
+			new_op.mx.ref = JS_DupValue(ctx, argv[var_idx+2]);
+			right_op_idx = VAR_MATRIX;
+		} else if (va) {
+			new_op.va.va = va;
+			new_op.va.ref = JS_DupValue(ctx, argv[var_idx+2]);
+			right_op_idx = VAR_VA;
+		} else {
+			shader->invalid = GF_TRUE;
+			if (uni_name) gf_free(uni_name);
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "unknown object type for right operand");
+		}
+	}
+	else if (JS_IsBool(argv[var_idx+2])) {
+		new_op.bval = JS_ToBool(ctx, argv[var_idx+2]) ? GF_TRUE : GF_FALSE;
+		right_value_type = COMP_BOOL;
+	}
+	else if (JS_IsNumber(argv[var_idx+2])) {
+		if (JS_IsInteger(argv[var_idx+2])) {
+			JS_ToInt32(ctx, &new_op.ival, argv[var_idx+2]);
+			right_value_type = COMP_INT;
+		} else {
+			Double v;
+			JS_ToFloat64(ctx, &v, argv[var_idx+2]);
+			new_op.vec[0] = (Float) v;
+			right_value_type = COMP_FLOAT;
+		}
+	}
+
+	if (dual_right_val) {
+		Bool is_ok=GF_FALSE;
+		if ((u32) argc<=var_idx+3) {}
+		else {
+			val_name = JS_ToCString(ctx, argv[var_idx+3]);
+			if (val_name) {
+				right_op2_idx = get_builtin_var_name(shader, val_name);
+				if (right_op2_idx >= EVG_FIRST_VAR_ID) {
+					is_ok=GF_TRUE;
+				}
+			}
+			JS_FreeCString(ctx, val_name);
+		}
+		if (!is_ok) {
+			JSValue ret = js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid second right-operand value, only local variable allowed");
+			JS_FreeCString(ctx, val_name);
+			shader->invalid = GF_TRUE;
+			if (uni_name) gf_free(uni_name);
+			return ret;
+		}
+	}
+
+op_parsed:
+
+	if (dual_right_val && !right_op2_idx) {
+		shader->invalid = GF_TRUE;
+		if (uni_name) gf_free(uni_name);
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "invalid second right-operand value, only local variable allowed");
+	}
+	new_op.op_type = op_type;
+	if (!new_op.op_type) {
+		shader->invalid = GF_TRUE;
+		if (uni_name) gf_free(uni_name);
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "unknown operation type");
+	}
+	new_op.cond_type = cond_type;
+	new_op.left_value = left_op_idx;
+	new_op.right_value = right_op_idx;
+	new_op.left_value_type = left_value_type;
+	new_op.right_value_type = right_value_type;
+	new_op.right_value_second = right_op2_idx;
+	if (new_op.tx) {
+		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;
+		shader->ops = gf_realloc(shader->ops, sizeof(ShaderOp)*shader->alloc_ops);
+		shader->ops[shader->nb_ops].uni_name = NULL;
+	}
+	if (shader->ops[shader->nb_ops].uni_name) {
+		gf_free(shader->ops[shader->nb_ops].uni_name);
+		shader->ops[shader->nb_ops].uni_name = NULL;
+	}
+
+	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);
+}
+
+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;
+
+	for (i=0; i<shader->nb_ops; i++) {
+		JSValue v;
+		ShaderOp *op = &shader->ops[i];
+		if (!op->uni_name) continue;
+		v = JS_GetPropertyStr(ctx, obj, op->uni_name);
+		if (JS_IsUndefined(v)) return js_throw_err_msg(ctx, GF_BAD_PARAM, "uniform %s cannot be found in shader", op->uni_name);
+		if (JS_IsBool(v)) {
+			op->right_value_type = COMP_BOOL;
+			op->bval = JS_ToBool(ctx, v) ? GF_TRUE : GF_FALSE;
+		}
+		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;
+			} else {
+				op->right_value_type = COMP_FLOAT;
+				EVG_GET_FLOAT(op->vec[0], v)
+			}
+		}
+		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;
+			JS_FreeValue(ctx, comp);
+			if (length>4) length=4;
+			op->right_value_type = 0;
+			for (idx=0;idx<length; idx++) {
+				comp = JS_GetPropertyUint32(ctx, v, idx);
+				EVG_GET_FLOAT(op->vec[idx], comp);
+				op->right_value_type |= 1<<idx;
+				JS_FreeValue(ctx, comp);
+			}
+		}
+		else if (JS_IsObject(v)) {
+			u32 data_size;
+			Float *vals;
+			u32 idx;
+			u8 *data = evg_get_array(ctx, v, &data_size);
+			if (data) {
+				if (data_size%4) return JS_EXCEPTION;
+				vals = (Float*)data;
+				data_size/= sizeof(Float);
+				if (data_size>4) data_size=4;
+				op->right_value_type = 0;
+				for (idx=0;idx<data_size; idx++) {
+					op->vec[idx] = vals[idx];
+					op->right_value_type |= 1<<idx;
+				}
+			} else {
+				JSValue comp;
+				op->right_value_type = 0;
+#define GET_COMP(_name, _idx, _mask)\
+				comp = JS_GetPropertyStr(ctx, v, _name);\
+				if (!JS_IsUndefined(comp)) { EVG_GET_FLOAT(op->vec[_idx], comp); op->right_value_type |= _mask; }\
+				JS_FreeValue(ctx, comp);\
+
+				GET_COMP("x", 0, COMP_X);
+				GET_COMP("r", 0, COMP_X);
+				GET_COMP("s", 0, COMP_X);
+
+				GET_COMP("y", 1, COMP_Y);
+				GET_COMP("g", 1, COMP_Y);
+				GET_COMP("t", 1, COMP_Y);
+
+				GET_COMP("z", 2, COMP_Z);
+				GET_COMP("b", 2, COMP_Z);
+
+				GET_COMP("q", 3, COMP_Q);
+				GET_COMP("w", 3, COMP_Q);
+				GET_COMP("a", 3, COMP_Q);
+
+			}
+		}
+		JS_FreeValue(ctx, v);
+
+	}
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry shader_funcs[] =
+{
+	JS_CFUNC_DEF("push", 0, shader_push),
+	JS_CFUNC_DEF("update", 0, shader_update),
+};
+
+static JSValue canvas3d_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_SAFEALLOC(shader, EVGShader);
+	if (!shader)
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	shader->mode = mode;
+	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)
+{
+	return canvas_constructor_internal(c, new_target, argc, argv, GF_TRUE);
+}
+
+#ifdef EVG_USE_JS_SHADER
+
+JSClassDef fragment_class = {
+	.class_name = "Fragment",
+};
+
+enum {
+	EVG_FRAG_SCREENX,
+	EVG_FRAG_SCREENY,
+	EVG_FRAG_DEPTH,
+	EVG_FRAG_R,
+	EVG_FRAG_G,
+	EVG_FRAG_B,
+	EVG_FRAG_A,
+	EVG_FRAG_Y,
+	EVG_FRAG_U,
+	EVG_FRAG_V,
+	EVG_FRAG_RGBA,
+	EVG_FRAG_RGB,
+	EVG_FRAG_YUV,
+	EVG_FRAG_YUVA,
+};
+
+static JSValue fragment_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_EVGFragmentParam *frag = JS_GetOpaque(obj, fragment_class_id);
+	if (!frag) return JS_EXCEPTION;
+	switch (magic) {
+	case EVG_FRAG_SCREENX: return JS_NewFloat64(c, frag->screen_x);
+	case EVG_FRAG_SCREENY: return JS_NewFloat64(c, frag->screen_y);
+	case EVG_FRAG_DEPTH: return JS_NewFloat64(c, frag->depth);
+	}
+	return JS_UNDEFINED;
+}
+static JSValue fragment_setProperty(JSContext *ctx, JSValueConst obj, JSValueConst value, int magic)
+{
+	EVG_VAIRes *vr;
+	GF_EVGFragmentType frag_type = GF_EVG_FRAG_RGB;
+
+	GF_EVGFragmentParam *frag = JS_GetOpaque(obj, fragment_class_id);
+	if (!frag) return JS_EXCEPTION;
+	switch (magic) {
+	case EVG_FRAG_DEPTH:
+		EVG_GET_FLOAT(frag->depth, value)
+		break;
+	case EVG_FRAG_Y:
+		frag_type = GF_EVG_FRAG_YUV;
+	case EVG_FRAG_R:
+		EVG_GET_FLOAT(frag->color.x, value)
+		CLAMPCOLF(frag->color.x)
+		frag->frag_valid = frag_type;
+		break;
+	case EVG_FRAG_U:
+		frag_type = GF_EVG_FRAG_YUV;
+	case EVG_FRAG_G:
+		EVG_GET_FLOAT(frag->color.y, value)
+		CLAMPCOLF(frag->color.y)
+		frag->frag_valid = frag_type;
+		break;
+	case EVG_FRAG_V:
+		frag_type = GF_EVG_FRAG_YUV;
+	case EVG_FRAG_B:
+		EVG_GET_FLOAT(frag->color.z, value)
+		CLAMPCOLF(frag->color.z)
+		frag->frag_valid = frag_type;
+		break;
+	case EVG_FRAG_A:
+		EVG_GET_FLOAT(frag->color.q, value)
+		CLAMPCOLF(frag->color.q)
+		if (!frag->frag_valid)
+			frag->frag_valid = GF_EVG_FRAG_RGB;
+		break;
+	case EVG_FRAG_YUVA:
+		frag_type = GF_EVG_FRAG_YUV;
+	case EVG_FRAG_RGBA:
+		vr = JS_GetOpaque(value, vaires_class_id);
+		if (vr) {
+			frag->color.x = vr->values[0];
+			frag->color.y = vr->values[1];
+			frag->color.z = vr->values[2];
+			frag->color.q = vr->values[3];
+			frag->frag_valid = frag_type;
+		} else {
+			Double a, r, g, b;
+			a=1.0;
+			if (!get_color_from_args(ctx, 1, &value, 0, &a, &r, &g, &b))
+				return JS_EXCEPTION;
+			frag->color.q = (Float) a;
+			frag->color.x = (Float) r;
+			frag->color.y = (Float) g;
+			frag->color.z = (Float) b;
+			frag->frag_valid = GF_EVG_FRAG_RGB;
+		}
+		break;
+	case EVG_FRAG_YUV:
+		frag_type = GF_EVG_FRAG_YUV;
+	case EVG_FRAG_RGB:
+		vr = JS_GetOpaque(value, vaires_class_id);
+		if (vr) {
+			frag->color.x = vr->values[0];
+			frag->color.y = vr->values[1];
+			frag->color.z = vr->values[2];
+			frag->frag_valid = frag_type;
+		} else
+			return JS_EXCEPTION;
+	default:
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry fragment_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", fragment_getProperty, NULL, EVG_FRAG_SCREENX),
+	JS_CGETSET_MAGIC_DEF("y", fragment_getProperty, NULL, EVG_FRAG_SCREENY),
+	JS_CGETSET_MAGIC_DEF("z", fragment_getProperty, fragment_setProperty, EVG_FRAG_DEPTH),
+	JS_ALIAS_DEF("depth", "z"),
+	JS_CGETSET_MAGIC_DEF("r", NULL, fragment_setProperty, EVG_FRAG_R),
+	JS_CGETSET_MAGIC_DEF("g", NULL, fragment_setProperty, EVG_FRAG_G),
+	JS_CGETSET_MAGIC_DEF("b", NULL, fragment_setProperty, EVG_FRAG_B),
+	JS_CGETSET_MAGIC_DEF("a", NULL, fragment_setProperty, EVG_FRAG_A),
+	JS_ALIAS_DEF("Y", "r"),
+	JS_ALIAS_DEF("U", "g"),
+	JS_ALIAS_DEF("V", "b"),
+	JS_CGETSET_MAGIC_DEF("rgba", NULL, fragment_setProperty, EVG_FRAG_RGBA),
+	JS_CGETSET_MAGIC_DEF("rgb", NULL, fragment_setProperty, EVG_FRAG_RGB),
+	JS_CGETSET_MAGIC_DEF("yuv", NULL, fragment_setProperty, EVG_FRAG_YUV),
+	JS_CGETSET_MAGIC_DEF("yuva", NULL, fragment_setProperty, EVG_FRAG_YUVA),
+};
+
+JSClassDef vertex_class = {
+	.class_name = "Vertex",
+};
+
+enum {
+	EVG_VERTEX_IN,
+	EVG_VERTEX_OUT,
+};
+
+static JSValue vertex_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	JSValue res;
+	GF_EVGVertexParam *vert= JS_GetOpaque(obj, vertex_class_id);
+	if (!vert) return JS_EXCEPTION;
+	switch (magic) {
+	case EVG_VERTEX_IN: 
+		res = JS_NewObject(c);
+		JS_SetPropertyStr(c, res, "x", JS_NewFloat64(c, vert->in_vertex.x));
+		JS_SetPropertyStr(c, res, "y", JS_NewFloat64(c, vert->in_vertex.y));
+		JS_SetPropertyStr(c, res, "z", JS_NewFloat64(c, vert->in_vertex.z));
+		JS_SetPropertyStr(c, res, "q", JS_NewFloat64(c, vert->in_vertex.q));
+		return res;
+	}
+	return JS_UNDEFINED;
+}
+static JSValue vertex_setProperty(JSContext *ctx, JSValueConst obj, JSValueConst value, int magic)
+{
+	Double _f;
+	JSValue v;
+	GF_EVGVertexParam *vert= JS_GetOpaque(obj, vertex_class_id);
+	if (!vert) return JS_EXCEPTION;
+	switch (magic) {
+	case EVG_VERTEX_OUT:
+		v = JS_GetPropertyStr(ctx, value, "x");
+		EVG_GET_FLOAT(_f, v);
+		vert->out_vertex.x = FLT2FIX(_f);
+		v = JS_GetPropertyStr(ctx, value, "y");
+		EVG_GET_FLOAT(_f, v);
+		vert->out_vertex.y = FLT2FIX(_f);
+		v = JS_GetPropertyStr(ctx, value, "z");
+		EVG_GET_FLOAT(_f, v);
+		vert->out_vertex.z = FLT2FIX(_f);
+		v = JS_GetPropertyStr(ctx, value, "q");
+		EVG_GET_FLOAT(_f, v);
+		vert->out_vertex.q = FLT2FIX(_f);
+
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+static const JSCFunctionListEntry vertex_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("vertex", vertex_getProperty, NULL, EVG_VERTEX_IN),
+	JS_CGETSET_MAGIC_DEF("vertexOut", NULL, vertex_setProperty, EVG_VERTEX_OUT),
+};
+#endif // EVG_USE_JS_SHADER
+
+Bool vai_call_lerp(EVG_VAI *vai, GF_EVGFragmentParam *frag)
+{
+	u32 i;
+	
+	//different primitive, setup inperpolation points
+	if (frag->prim_index != vai->prim_idx) {
+		u32 idx;
+		vai->prim_idx = frag->prim_index;
+		//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)
+				nb_v_per_prim=2;
+
+			if (vai->interp_type==GF_EVG_VAI_VERTEX_INDEX) {
+				idx = frag->idx1 * vai->nb_comp;
+			} else {
+				idx = frag->prim_index * nb_v_per_prim * vai->nb_comp;
+			}
+			if (idx+vai->nb_comp > vai->nb_values)
+				return GF_FALSE;
+			for (i=0; i<vai->nb_comp; i++) {
+				vai->anchors[0][i] = vai->values[idx+i];
+			}
+
+			if (vai->interp_type==GF_EVG_VAI_VERTEX_INDEX) {
+				idx = frag->idx2 * vai->nb_comp;
+			} else {
+				idx = (frag->prim_index * nb_v_per_prim + 1) * vai->nb_comp;
+			}
+			if (idx+vai->nb_comp > vai->nb_values)
+				return GF_FALSE;
+			for (i=0; i<vai->nb_comp; i++) {
+				vai->anchors[1][i] = vai->values[idx+i];
+			}
+			if (frag->ptype!=GF_EVG_LINES) {
+				if (vai->interp_type==GF_EVG_VAI_VERTEX_INDEX) {
+					idx = frag->idx3 * vai->nb_comp;
+				} else {
+					idx = (frag->prim_index * nb_v_per_prim + 2) * vai->nb_comp;
+				}
+				if (idx+vai->nb_comp > vai->nb_values)
+					return GF_FALSE;
+				for (i=0; i<vai->nb_comp; i++) {
+					vai->anchors[2][i] = vai->values[idx+i];
+				}
+			}
+		}
+	}
+	if (vai->interp_type==GF_EVG_VAI_PRIMITIVE) {
+		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;
+		}
+	} 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;
+		}
+	}
+	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 (len) {
+				vai->result.values[0]/=len;
+				vai->result.values[1]/=len;
+			}
+		} else {
+			gf_vec_norm((GF_Vec *) &vai->result.values[0]);
+		}
+	}
+	return GF_TRUE;
+}
+
+#ifdef EVG_USE_JS_SHADER
+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;
+	GF_EVGFragmentParam *frag = JS_GetOpaque(argv[0], fragment_class_id);
+	if (!frag) return JS_EXCEPTION;
+
+	if (!vai_call_lerp(vai, frag))
+		return JS_EXCEPTION;
+	return JS_DupValue(c, vai->res);
+}
+#endif
+
+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;
+	switch (magic) {
+	case 0:
+		vai->normalize = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue vai_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	EVG_VAI *vai;
+	JSValue obj;
+	u8 *data=NULL;
+	u32 data_size=0;
+	u32 nb_comp;
+	s32 interp_type = GF_EVG_VAI_VERTEX_INDEX;
+	if (argc<1)
+		return js_throw_err_msg(c, GF_BAD_PARAM, "Missing parameter for VertexAttribInterpolator");
+
+	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 (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;
+		data_size /= sizeof(Float);
+		if (data_size % nb_comp) return JS_EXCEPTION;
+
+		if (argc>2) {
+			if (JS_ToInt32(c, &interp_type, argv[2])) return JS_EXCEPTION;
+		}
+	} else {
+		if (JS_ToInt32(c, &nb_comp, argv[0])) return JS_EXCEPTION;
+	}
+
+	GF_SAFEALLOC(vai, EVG_VAI);
+	if (!vai)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	vai->nb_comp = nb_comp;
+	vai->values = (Float *)data;
+	vai->nb_values = data_size;
+	if (data)
+		vai->ab = JS_DupValue(c, argv[0]);
+
+	vai->prim_idx = (u32) -1;
+	vai->interp_type = interp_type;
+
+#ifdef EVG_USE_JS_SHADER
+	vai->res = JS_NewObjectClass(c, vaires_class_id);
+	JS_SetOpaque(vai->res, &vai->result);
+	JS_SetPropertyStr(c, vai->res, "length", JS_NewInt32(c, nb_comp));
+#endif
+	vai->result.dim = nb_comp;
+	if (nb_comp==1) vai->result.comp_type = COMP_X;
+	else if (nb_comp==2) vai->result.comp_type = COMP_V2_XY;
+	else if (nb_comp==3) vai->result.comp_type = COMP_V3;
+	else vai->result.comp_type = COMP_V4;
+
+	obj = JS_NewObjectClass(c, vai_class_id);
+	JS_SetOpaque(obj, vai);
+	return obj;
+}
+static void vai_finalize(JSRuntime *rt, JSValue obj)
+{
+	EVG_VAI *vai = JS_GetOpaque(obj, vai_class_id);
+	if (!vai) return;
+	JS_FreeValueRT(rt, vai->ab);
+#ifdef EVG_USE_JS_SHADER
+	JS_FreeValueRT(rt, vai->res);
+#endif
+	gf_free(vai);
+}
+
+static void vai_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	EVG_VAI *vai = JS_GetOpaque(obj, vai_class_id);
+	if (!vai) return;
+	JS_MarkValue(rt, vai->ab, mark_func);
+#ifdef EVG_USE_JS_SHADER
+	JS_MarkValue(rt, vai->res, mark_func);
+#endif
+}
+
+JSClassDef vai_class = {
+	.class_name = "VertexAttribInterpolator",
+	.finalizer = vai_finalize,
+	.gc_mark = vai_gc_mark
+};
+static const JSCFunctionListEntry vai_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("normalize", NULL, vai_setProperty, 0),
+#ifdef EVG_USE_JS_SHADER
+	JS_CFUNC_DEF("lerp", 0, vai_lerp),
+#endif
+};
+
+static JSValue va_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	EVG_VA *va;
+	JSValue obj;
+	u8 *data=NULL;
+	u32 data_size;
+	u32 nb_comp;
+	s32 interp_type = GF_EVG_VAI_VERTEX_INDEX;
+	if (argc<2)
+		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 (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;
+	data_size /= sizeof(Float);
+	if (data_size % nb_comp) return JS_EXCEPTION;
+
+	if (argc>2) {
+		if (JS_ToInt32(c, &interp_type, argv[2])) return JS_EXCEPTION;
+	}
+
+	GF_SAFEALLOC(va, EVG_VA);
+	if (!va)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	va->nb_comp = nb_comp;
+	va->values = (Float *)data;
+	va->nb_values = data_size;
+	va->ab = JS_DupValue(c, argv[0]);
+	va->interp_type = interp_type;
+	if (va->nb_comp==1) va->att_type = COMP_FLOAT;
+	else if (va->nb_comp==2) va->att_type = COMP_V2_XY;
+	else if (va->nb_comp==3) va->att_type = COMP_V3;
+	else va->att_type = COMP_V4;
+
+	obj = JS_NewObjectClass(c, va_class_id);
+	JS_SetOpaque(obj, va);
+	return obj;
+}
+
+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;
+	switch (magic) {
+	case 0:
+		va->normalize = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
+		break;
+	}
+	return JS_UNDEFINED;
+}
+static void va_finalize(JSRuntime *rt, JSValue obj)
+{
+	EVG_VA *va = JS_GetOpaque(obj, va_class_id);
+	if (!va) return;
+	JS_FreeValueRT(rt, va->ab);
+	gf_free(va);
+}
+
+static void va_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	EVG_VA *va = JS_GetOpaque(obj, va_class_id);
+	if (!va) return;
+	JS_MarkValue(rt, va->ab, mark_func);
+}
+
+JSClassDef va_class = {
+	.class_name = "VertexAttrib",
+	.finalizer = va_finalize,
+	.gc_mark = va_gc_mark
+};
+static const JSCFunctionListEntry va_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("normalize", NULL, va_setProperty, 0),
+};
+
+#ifdef EVG_USE_JS_SHADER
+
+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 (magic<MAX_ATTR_DIM) {
+		return JS_NewFloat64(c, vr->values[magic]);
+	}
+	return JS_UNDEFINED;
+}
+static const JSCFunctionListEntry vaires_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", vaires_getProperty, NULL, 0),
+	JS_CGETSET_MAGIC_DEF("y", vaires_getProperty, NULL, 1),
+	JS_CGETSET_MAGIC_DEF("z", vaires_getProperty, NULL, 2),
+	JS_CGETSET_MAGIC_DEF("w", vaires_getProperty, NULL, 3),
+	JS_ALIAS_DEF("r", "x"),
+	JS_ALIAS_DEF("g", "y"),
+	JS_ALIAS_DEF("b", "z"),
+	JS_ALIAS_DEF("a", "w"),
+	JS_ALIAS_DEF("s", "x"),
+	JS_ALIAS_DEF("t", "y"),
+};
+
+JSClassDef vaires_class = {
+	.class_name = "VAIResult",
+};
+
+#endif //EVG_USE_JS_SHADER
+
+static void mx2d_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
+	if (!mx) return;
+	gf_free(mx);
+}
+JSClassDef mx2d_class = {
+	"Matrix2D",
+	.finalizer = mx2d_finalize
+};
+
+enum
+{
+	//these 6 magics map to m[x] of the matrix, DO NOT MODIFY
+	MX2D_XX = 0,
+	MX2D_XY,
+	MX2D_TX,
+	MX2D_YX,
+	MX2D_YY,
+	MX2D_TY,
+	MX2D_IDENTITY,
+};
+
+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 ((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));
+	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 ((magic>=MX2D_XX) && (magic<=MX2D_TY)) {
+		Double d;
+		if (JS_ToFloat64(c, &d, value))
+			return JS_EXCEPTION;
+		mx->m[magic] = FIX2FLT(d);
+		return JS_UNDEFINED;
+	}
+	if (magic==MX2D_IDENTITY) {
+		if (JS_ToBool(c, value))
+			gf_mx2d_init(*mx);
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+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;
+	GF_Matrix2D *amx = JS_GetOpaque(argv[0], mx2d_class_id);
+	if (!mx) return JS_EXCEPTION;
+	if ((argc>1) && JS_ToBool(c, argv[1]))
+		gf_mx2d_pre_multiply(mx, amx);
+	else
+		gf_mx2d_add_matrix(mx, amx);
+	return JS_DupValue(c, obj);
+}
+
+static JSValue mx2d_translate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double tx, ty;
+	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
+	if (!mx || (argc<1)) return JS_EXCEPTION;
+
+	if (JS_IsObject(argv[0])) {
+		JSValue v;
+#define GETD(_arg, _name, _res)\
+		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		v = JS_GetPropertyStr(c, _arg, _name);\
+		JS_ToFloat64(c, &_res, v);\
+		JS_FreeValue(c, v);\
+
+		GETD(argv[0], "x", tx);
+		GETD(argv[0], "y", ty);
+#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;
+	} else {
+		return JS_EXCEPTION;
+	}
+	gf_mx2d_add_translation(mx, FLT2FIX(tx), FLT2FIX(ty));
+	return JS_DupValue(c, obj);
+}
+static JSValue mx2d_rotate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	gf_mx2d_add_rotation(mx, FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a) );
+	return JS_DupValue(c, obj);
+}
+static JSValue mx2d_scale(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 (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;
+		gf_mx2d_add_scale_at(mx, FLT2FIX(sx), FLT2FIX(sy), FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a));
+		return JS_DupValue(c, obj);
+	}
+	return JS_EXCEPTION;
+}
+
+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;
+	gf_mx2d_add_skew(mx, FLT2FIX(sx), FLT2FIX(sy));
+	return JS_DupValue(c, obj);
+}
+static JSValue mx2d_skew_x(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	gf_mx2d_add_skew_x(mx, FLT2FIX(s));
+	return JS_DupValue(c, obj);
+}
+static JSValue mx2d_skew_y(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	gf_mx2d_add_skew_y(mx, FLT2FIX(s));
+	return JS_DupValue(c, obj);
+}
+
+static JSValue mx2d_apply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Fixed x, y, w=0, h=0;
+	Double d;
+	JSValue v;
+	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;
+	v = JS_GetPropertyStr(c, argv[0], "x");
+	res = JS_ToFloat64(c, &d, v);
+	JS_FreeValue(c, v);
+	if (res) return JS_EXCEPTION;
+	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;
+	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;
+		is_rect++;
+		w = FLT2FIX(d);
+	}
+	JS_FreeValue(c, v);
+
+	v = JS_GetPropertyStr(c, argv[0], "h");
+	if (!JS_IsUndefined(v) && JS_IsNumber(v)) {
+		res = JS_ToFloat64(c, &d, v);
+		JS_FreeValue(c, v);
+		if (res) return JS_EXCEPTION;
+		is_rect++;
+		h = FLT2FIX(d);
+	}
+	JS_FreeValue(c, v);
+
+	if (is_rect) {
+		GF_Rect rc;
+		rc.x = x;
+		rc.y = y;
+		rc.width = w;
+		rc.height = h;
+		gf_mx2d_apply_rect(mx, &rc);
+		v = JS_NewObject(c);
+		JS_SetPropertyStr(c, v, "x", JS_NewFloat64(c, FIX2FLT(rc.x)));
+		JS_SetPropertyStr(c, v, "y", JS_NewFloat64(c, FIX2FLT(rc.y)));
+		JS_SetPropertyStr(c, v, "w", JS_NewFloat64(c, FIX2FLT(rc.width)));
+		JS_SetPropertyStr(c, v, "h", JS_NewFloat64(c, FIX2FLT(rc.height)));
+		return v;
+
+	} else {
+		GF_Point2D pt;
+		pt.x = x;
+		pt.y = y;
+		gf_mx2d_apply_point(mx, &pt);
+		v = JS_NewObject(c);
+		JS_SetPropertyStr(c, v, "x", JS_NewFloat64(c, FIX2FLT(pt.x)));
+		JS_SetPropertyStr(c, v, "y", JS_NewFloat64(c, FIX2FLT(pt.y)));
+		return v;
+	}
+	return JS_EXCEPTION;
+}
+
+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;
+	gf_mx2d_inverse(mx);
+	return JS_DupValue(c, obj);
+}
+
+static JSValue mx2d_copy(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Matrix2D *nmx;
+	JSValue nobj;
+	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
+	if (!mx) return JS_EXCEPTION;
+	GF_SAFEALLOC(nmx, GF_Matrix2D);
+	if (!nmx)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	gf_mx2d_copy(*nmx, *mx);
+	nobj = JS_NewObjectClass(c, mx2d_class_id);
+	JS_SetOpaque(nobj, nmx);
+	return nobj;
+}
+
+static JSValue mx2d_decompose_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 opt)
+{
+	GF_Point2D scale;
+	GF_Point2D translate;
+	Fixed rotate;
+	GF_Matrix2D *mx = JS_GetOpaque(obj, mx2d_class_id);
+	if (!mx) return JS_EXCEPTION;
+	if (!gf_mx2d_decompose(mx, &scale, &rotate, &translate))
+		return JS_NULL;
+	if (opt==0) {
+		JSValue nobj = JS_NewObject(c);
+		JS_SetPropertyStr(c, nobj, "x", JS_NewFloat64(c, FIX2FLT(scale.x)) );
+		JS_SetPropertyStr(c, nobj, "y", JS_NewFloat64(c, FIX2FLT(scale.y)) );
+		return nobj;
+	}
+	if (opt==1) {
+		JSValue nobj = JS_NewObject(c);
+		JS_SetPropertyStr(c, nobj, "x", JS_NewFloat64(c, FIX2FLT(translate.x)) );
+		JS_SetPropertyStr(c, nobj, "y", JS_NewFloat64(c, FIX2FLT(translate.y)) );
+		return nobj;
+	}
+	if (opt==2) {
+		return JS_NewFloat64(c, FIX2FLT(rotate) );
+	}
+	return JS_EXCEPTION;
+}
+
+static JSValue mx2d_get_scale(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return mx2d_decompose_ex(c, obj, argc, argv, 0);
+}
+static JSValue mx2d_get_translate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return mx2d_decompose_ex(c, obj, argc, argv, 1);
+}
+static JSValue mx2d_get_rotate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return mx2d_decompose_ex(c, obj, argc, argv, 2);
+}
+
+static const JSCFunctionListEntry mx2d_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("xx", mx2d_getProperty, mx2d_setProperty, MX2D_XX),
+	JS_CGETSET_MAGIC_DEF("xy", mx2d_getProperty, mx2d_setProperty, MX2D_XY),
+	JS_CGETSET_MAGIC_DEF("tx", mx2d_getProperty, mx2d_setProperty, MX2D_TX),
+	JS_CGETSET_MAGIC_DEF("yx", mx2d_getProperty, mx2d_setProperty, MX2D_YX),
+	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_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),
+	JS_CFUNC_DEF("inverse", 0, mx2d_inverse),
+	JS_CFUNC_DEF("copy", 0, mx2d_copy),
+	JS_CFUNC_DEF("add", 0, mx2d_multiply),
+	JS_CFUNC_DEF("translate", 0, mx2d_translate),
+	JS_CFUNC_DEF("rotate", 0, mx2d_rotate),
+	JS_CFUNC_DEF("scale", 0, mx2d_scale),
+	JS_CFUNC_DEF("skew", 0, mx2d_skew),
+	JS_CFUNC_DEF("skew_x", 0, mx2d_skew_x),
+	JS_CFUNC_DEF("skew_y", 0, mx2d_skew_y),
+	JS_CFUNC_DEF("apply", 0, mx2d_apply),
+};
+
+static JSValue mx2d_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue obj;
+	GF_Matrix2D *mx;
+	GF_SAFEALLOC(mx, GF_Matrix2D);
+	if (!mx)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	mx->m[MX2D_XX] = mx->m[MX2D_YY] = FIX_ONE;
+	obj = JS_NewObjectClass(c, mx2d_class_id);
+	JS_SetOpaque(obj, mx);
+	if ((argc==1) && JS_IsObject(argv[0])) {
+		GF_Matrix2D *amx = JS_GetOpaque(argv[0], mx2d_class_id);
+		if (amx) gf_mx2d_copy(*mx, *amx);
+	}
+	else if (argc==6) {
+		u32 i;
+		Double d;
+		for (i=0; i<6; i++) {
+			if (JS_ToFloat64(c, &d, argv[i])) return JS_EXCEPTION;
+			mx->m[i] = FLT2FIX(d);
+		}
+	}
+	return obj;
+}
+
+static void colmx_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_ColorMatrix *mx = JS_GetOpaque(obj, colmx_class_id);
+	if (!mx) return;
+	gf_free(mx);
+}
+JSClassDef colmx_class = {
+	"ColorMatrix",
+	.finalizer = colmx_finalize
+};
+
+static JSValue colmx_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue obj;
+	GF_ColorMatrix *cmx;
+	GF_SAFEALLOC(cmx, GF_ColorMatrix);
+	if (!cmx)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	gf_cmx_init(cmx);
+	obj = JS_NewObjectClass(c, colmx_class_id);
+	JS_SetOpaque(obj, cmx);
+	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 (argc==20) {
+		u32 i;
+		Double d;
+		for (i=0; i<20; i++) {
+			if (JS_ToFloat64(c, &d, argv[i])) return JS_EXCEPTION;
+			cmx->m[i] = FLT2FIX(d);
+		}
+		cmx->identity = 0;
+	}
+	return obj;
+}
+enum
+{
+	//these 6 magics map to m[x] of the matrix, DO NOT MODIFY
+	CMX_MRR = 0,
+	CMX_MRG,
+	CMX_MRB,
+	CMX_MRA,
+	CMX_TR,
+	CMX_MGR,
+	CMX_MGG,
+	CMX_MGB,
+	CMX_MGA,
+	CMX_TG,
+	CMX_MBR,
+	CMX_MBG,
+	CMX_MBB,
+	CMX_MBA,
+	CMX_TB,
+	CMX_MAR,
+	CMX_MAG,
+	CMX_MAB,
+	CMX_MAA,
+	CMX_TA,
+	CMX_IDENTITY,
+};
+
+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 ((magic>=CMX_MRR) && (magic<=CMX_TA)) {
+		return JS_NewFloat64(c, FIX2FLT(cmx->m[magic]));
+	}
+	if (magic==CMX_IDENTITY)
+		return JS_NewBool(c, cmx->identity);
+	return JS_UNDEFINED;
+}
+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 ((magic>=CMX_MRR) && (magic<=CMX_TA)) {
+		Double d;
+		if (JS_ToFloat64(c, &d, value))
+			return JS_EXCEPTION;
+		cmx->m[magic] = FIX2FLT(d);
+		cmx->identity = GF_FALSE;
+		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;
+	GF_ColorMatrix *with = JS_GetOpaque(argv[0], colmx_class_id);
+	if (!cmx) return JS_EXCEPTION;
+	gf_cmx_multiply(cmx, with);
+	return JS_DupValue(c, obj);
+}
+
+static Bool get_color(JSContext *c, JSValueConst obj, Double *a, Double *r, Double *g, Double *b)
+{
+	JSValue v;
+	int res;
+	if (JS_IsArray(c, obj)) {
+		u32 i, len;
+		v = JS_GetPropertyStr(c, obj, "length");
+		res = JS_ToInt32(c, &len, v);
+		JS_FreeValue(c, v);
+		if (res) return GF_FALSE;
+		if (len>4) len=4;
+		for (i=0; i<len; i++) {
+			Double d;
+			v = JS_GetPropertyUint32(c, obj, i);
+			res = JS_ToFloat64(c, &d, v);
+			if (res) return GF_FALSE;
+			JS_FreeValue(c, v);
+			if (!i) *r = d;
+			else if (i==1) *g = d;
+			else if (i==2) *b = d;
+			else *a = d;
+		}
+		return GF_TRUE;
+	}
+	v = JS_GetPropertyStr(c, obj, "r");
+	res = JS_ToFloat64(c, r, v);
+	JS_FreeValue(c, v);
+	if (res) return GF_FALSE;
+	v = JS_GetPropertyStr(c, obj, "g");
+	res = JS_ToFloat64(c, g, v);
+	JS_FreeValue(c, v);
+	if (res) return GF_FALSE;
+	v = JS_GetPropertyStr(c, obj, "b");
+	res = JS_ToFloat64(c, b, v);
+	JS_FreeValue(c, v);
+	if (res) return GF_FALSE;
+	v = JS_GetPropertyStr(c, obj, "a");
+	JS_ToFloat64(c, a, v);
+	JS_FreeValue(c, v);
+
+	if (*r<0) *r=0;
+	if (*g<0) *g=0;
+	if (*b<0) *b=0;
+	if (*a<0) *a=0;
+
+	return GF_TRUE;
+}
+static JSValue colmx_apply_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_int)
+{
+	GF_Color col;
+	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 (JS_IsString(argv[0])) {
+		const char *str = JS_ToCString(c, argv[0]);
+		col = gf_color_parse(str);
+		JS_FreeCString(c, str);
+
+		if (!use_int) {
+			a = GF_COL_A(col);
+			r = GF_COL_R(col);
+			g = GF_COL_G(col);
+			b = GF_COL_B(col);
+			r/=255;
+			g/=255;
+			b/=255;
+			a/=255;
+		}
+
+	} else if (JS_IsObject(argv[0])) {
+		if (!get_color(c, argv[0], &a, &r, &g, &b))
+			return JS_EXCEPTION;
+		if (use_int) {
+			r*=255;
+			g*=255;
+			b*=255;
+			a*=255;
+			if (a>255) a=255;
+			if (r>255) r=255;
+			if (g>255) g=255;
+			if (b>255) b=255;
+			col = GF_COL_ARGB(a, r, g, b);
+		}
+	} else {
+		return JS_EXCEPTION;
+	}
+	if (use_int) {
+		GF_Color res = gf_cmx_apply(cmx, col);
+		nobj = JS_NewObject(c);
+		JS_SetPropertyStr(c, nobj, "r", JS_NewInt32(c, GF_COL_R(res)) );
+		JS_SetPropertyStr(c, nobj, "g", JS_NewInt32(c, GF_COL_G(res)) );
+		JS_SetPropertyStr(c, nobj, "b", JS_NewInt32(c, GF_COL_B(res)) );
+		JS_SetPropertyStr(c, nobj, "a", JS_NewInt32(c, GF_COL_A(res)) );
+		return nobj;
+	} else {
+		Fixed fr=FLT2FIX(r), fg=FLT2FIX(g), fb=FLT2FIX(b), fa=FLT2FIX(a);
+
+		gf_cmx_apply_fixed(cmx, &fa, &fr, &fg, &fb);
+		nobj = JS_NewObject(c);
+		JS_SetPropertyStr(c, nobj, "r", JS_NewFloat64(c, FIX2FLT(fr)) );
+		JS_SetPropertyStr(c, nobj, "g", JS_NewFloat64(c, FIX2FLT(fg)) );
+		JS_SetPropertyStr(c, nobj, "b", JS_NewFloat64(c, FIX2FLT(fb)) );
+		JS_SetPropertyStr(c, nobj, "a", JS_NewFloat64(c, FIX2FLT(fa)) );
+		return nobj;
+	}
+	return JS_EXCEPTION;
+}
+static JSValue colmx_apply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return colmx_apply_color(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue colmx_applyf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return colmx_apply_color(c, obj, argc, argv, GF_FALSE);
+}
+
+static const JSCFunctionListEntry colmx_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("rr", colmx_getProperty, colmx_setProperty, CMX_MRR),
+	JS_CGETSET_MAGIC_DEF("rg", colmx_getProperty, colmx_setProperty, CMX_MRG),
+	JS_CGETSET_MAGIC_DEF("rb", colmx_getProperty, colmx_setProperty, CMX_MRB),
+	JS_CGETSET_MAGIC_DEF("ra", colmx_getProperty, colmx_setProperty, CMX_MRA),
+	JS_CGETSET_MAGIC_DEF("tr", colmx_getProperty, colmx_setProperty, CMX_TR),
+	JS_CGETSET_MAGIC_DEF("gr", colmx_getProperty, colmx_setProperty, CMX_MGR),
+	JS_CGETSET_MAGIC_DEF("gg", colmx_getProperty, colmx_setProperty, CMX_MGG),
+	JS_CGETSET_MAGIC_DEF("gb", colmx_getProperty, colmx_setProperty, CMX_MGB),
+	JS_CGETSET_MAGIC_DEF("ga", colmx_getProperty, colmx_setProperty, CMX_MGA),
+	JS_CGETSET_MAGIC_DEF("tg", colmx_getProperty, colmx_setProperty, CMX_TG),
+	JS_CGETSET_MAGIC_DEF("br", colmx_getProperty, colmx_setProperty, CMX_MBR),
+	JS_CGETSET_MAGIC_DEF("bg", colmx_getProperty, colmx_setProperty, CMX_MBG),
+	JS_CGETSET_MAGIC_DEF("bb", colmx_getProperty, colmx_setProperty, CMX_MBB),
+	JS_CGETSET_MAGIC_DEF("ba", colmx_getProperty, colmx_setProperty, CMX_MBA),
+	JS_CGETSET_MAGIC_DEF("tb", colmx_getProperty, colmx_setProperty, CMX_TB),
+	JS_CGETSET_MAGIC_DEF("ar", colmx_getProperty, colmx_setProperty, CMX_MAR),
+	JS_CGETSET_MAGIC_DEF("ag", colmx_getProperty, colmx_setProperty, CMX_MAG),
+	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_CFUNC_DEF("multiply", 0, colmx_multiply),
+	JS_CFUNC_DEF("apply", 0, colmx_apply),
+	JS_CFUNC_DEF("applyf", 0, colmx_applyf),
+};
+
+
+
+static void path_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Path *path = JS_GetOpaque(obj, path_class_id);
+	if (!path) return;
+	gf_path_del(path);
+}
+JSClassDef path_class = {
+	"Path",
+	.finalizer = path_finalize
+};
+
+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 (opt==0) {
+		gf_path_close(gp);
+		return JS_DupValue(c, obj);
+	}
+	if (opt==1) {
+		gf_path_reset(gp);
+		return JS_DupValue(c, obj);
+	}
+	if (opt==2) {
+		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;
+}
+static JSValue path_reset(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return path_close_reset(c, obj, argc, argv, 1);
+}
+static JSValue path_close(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return path_close_reset(c, obj, argc, argv, 0);
+}
+static JSValue path_clone(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return path_close_reset(c, obj, argc, argv, 2);
+}
+static JSValue path_line_move(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_line)
+{
+	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 (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;
+	return JS_DupValue(c, obj);
+}
+static JSValue path_line_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return path_line_move(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue path_move_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return path_line_move(c, obj, argc, argv, GF_FALSE);
+}
+static JSValue path_cubic_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	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;
+	return JS_DupValue(c, obj);
+}
+static JSValue path_quadratic_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	e = gf_path_add_quadratic_to(gp, FLT2FIX(c_x), FLT2FIX(c_y), FLT2FIX(x), FLT2FIX(y));
+	if (e) return JS_EXCEPTION;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_rect(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double ox=0, oy=0, w=0, h=0;
+	s32 idx=0;
+	GF_Err e;
+
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || (argc<3)) return JS_EXCEPTION;
+
+	if (JS_IsObject(argv[0])) {
+		JSValue v;
+#define GETD(_arg, _name, _res)\
+		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		v = JS_GetPropertyStr(c, _arg, _name);\
+		JS_ToFloat64(c, &_res, v);\
+		JS_FreeValue(c, v);\
+
+		GETD(argv[0], "x", ox);
+		GETD(argv[0], "y", oy);
+#undef GETD
+
+		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;
+		idx=2;
+	} else {
+		return JS_EXCEPTION;
+	}
+	if (JS_ToFloat64(c, &w, argv[idx])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &h, argv[idx+1])) return JS_EXCEPTION;
+	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;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_ellipse(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double cx=0, cy=0, a_axis=0, b_axis=0;
+	GF_Err e;
+	u32 idx=0;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp) return JS_EXCEPTION;
+	if (argc==3) {
+		JSValue v;
+#define GETD(_arg, _name, _res)\
+		if (! JS_IsObject(_arg)) return JS_EXCEPTION;\
+		v = JS_GetPropertyStr(c, _arg, _name);\
+		JS_ToFloat64(c, &_res, v);\
+		JS_FreeValue(c, v);\
+
+		GETD(argv[0], "x", cx);
+		GETD(argv[0], "y", cy);
+#undef GETD
+
+		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;
+		idx=2;
+	} else {
+		return JS_EXCEPTION;
+	}
+	if (JS_ToFloat64(c, &a_axis, argv[idx])) return JS_EXCEPTION;
+	if (JS_ToFloat64(c, &b_axis, argv[idx+1])) return JS_EXCEPTION;
+	e = gf_path_add_ellipse(gp, FLT2FIX(cx), FLT2FIX(cy), FLT2FIX(a_axis), FLT2FIX(b_axis));
+	if (e) return JS_EXCEPTION;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_bezier(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	s32 i;
+	GF_Point2D *pts;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || (argc<3)) return JS_EXCEPTION;
+	pts = gf_malloc(sizeof(GF_Point2D)* argc);
+	memset(pts, 0, sizeof(GF_Point2D)* argc);
+	for (i=0; i<argc; i++) {
+		JSValue v;
+		Double d;
+		if (! JS_IsObject(argv[i]))
+			continue;
+		v = JS_GetPropertyStr(c, argv[i], "x");
+		JS_ToFloat64(c, &d, v);
+		pts[i].x = FLT2FIX(d);
+		JS_FreeValue(c, v);
+		v = JS_GetPropertyStr(c, argv[i], "y");
+		JS_ToFloat64(c, &d, v);
+		pts[i].x = FLT2FIX(d);
+		JS_FreeValue(c, v);
+	}
+	e = gf_path_add_bezier(gp, pts, argc);
+	gf_free(pts);
+	if (e) return JS_EXCEPTION;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_arc_bifs(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double end_x=0, end_y=0, fa_x=0, fa_y=0, fb_x=0, fb_y=0;
+	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 (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;
+	return JS_DupValue(c, obj);
+}
+
+
+static JSValue path_arc_svg(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double end_x=0, end_y=0, r_x=0, r_y=0, x_axis_rotation=0;
+	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 (argc>4) {
+		if (JS_ToFloat64(c, &x_axis_rotation, argv[4])) return JS_EXCEPTION;
+		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;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_arc(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double radius=0, start=0, end=0;
+	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 (argc>3)
+		if (JS_ToInt32(c, &close, argv[3])) return JS_EXCEPTION;
+	e = gf_path_add_arc(gp, FLT2FIX(radius), FLT2FIX(start), FLT2FIX(end), close);
+	if (e) return JS_EXCEPTION;
+	return JS_DupValue(c, obj);
+}
+
+static JSValue path_add_path(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_Matrix2D *mx=NULL;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || !argc) return JS_EXCEPTION;
+	GF_Path *subgp = JS_GetOpaque(argv[0], path_class_id);
+	if (!gp) return JS_EXCEPTION;
+	if (argc>1)
+		mx = JS_GetOpaque(argv[1], mx2d_class_id);
+	e = gf_path_add_subpath(gp, subgp, mx);
+	if (e) return JS_EXCEPTION;
+	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;
+	gf_path_flatten(gp);
+	return JS_DupValue(c, obj);
+}
+static JSValue path_get_flat(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue nobj;
+	GF_Path *gp_flat;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp) return JS_EXCEPTION;
+	gp_flat = gf_path_get_flatten(gp);
+	if (!gp) return JS_NULL;
+	nobj = JS_NewObjectClass(c, path_class_id);
+	if (JS_IsException(nobj)) return nobj;
+	JS_SetOpaque(nobj, gp_flat);
+	return nobj;
+}
+
+static JSValue path_point_over(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double x, y;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || !argc) return JS_EXCEPTION;
+	if (argc==1) {
+		Double d;
+		int res;
+		JSValue v;
+		if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+#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;\
+		_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;
+	} else {
+		return JS_EXCEPTION;
+	}
+	return JS_NewBool(c, gf_path_point_over(gp, FLT2FIX(x), FLT2FIX(y)));
+}
+
+
+static JSValue path_outline(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Path *outline;
+	GF_PenSettings pen;
+	GF_DashSettings dash;
+	JSValue v, dashes;
+	Double d;
+	int i, res;
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp || !argc || !JS_IsObject(argv[0]) ) return JS_EXCEPTION;
+	memset(&pen, 0, sizeof(GF_PenSettings));
+
+#define GETIT_F(_arg, _name, _var) \
+		v = JS_GetPropertyStr(c, _arg, _name);\
+		if (!JS_IsUndefined(v)) {\
+			res = JS_ToFloat64(c, &d, v);\
+			JS_FreeValue(c, v);\
+			if (res) return JS_EXCEPTION;\
+			_var = FLT2FIX(d);\
+		}\
+
+#define GETIT_I(_arg, _name, _var) \
+		v = JS_GetPropertyStr(c, _arg, _name);\
+		if (!JS_IsUndefined(v)) {\
+			res = JS_ToInt32(c, &i, v);\
+			JS_FreeValue(c, v);\
+			if (res) return JS_EXCEPTION;\
+			_var = i;\
+		}\
+
+	GETIT_F(argv[0], "width", pen.width);
+	GETIT_F(argv[0], "miter", pen.miterLimit);
+	GETIT_F(argv[0], "offset", pen.dash_offset);
+	GETIT_F(argv[0], "length", pen.path_length);
+	GETIT_I(argv[0], "cap", pen.cap);
+	GETIT_I(argv[0], "join", pen.join);
+	GETIT_I(argv[0], "align", pen.align);
+	GETIT_I(argv[0], "dash", pen.dash);
+
+
+#undef GETTIT_F
+#undef GETTIT_I
+
+	dash.num_dash = 0;
+	dash.dashes = NULL;
+	dashes = JS_GetPropertyStr(c, argv[0], "dashes");
+	if (JS_IsArray(c, dashes) && !JS_IsNull(v)) {
+		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);
+		}
+	}
+	JS_FreeValue(c, dashes);
+
+	outline = gf_path_get_outline(gp, pen);
+	if (dash.dashes) gf_free(dash.dashes);
+
+	if (!outline) return JS_EXCEPTION;
+	v = JS_NewObjectClass(c, path_class_id);
+	JS_SetOpaque(v, outline);
+	return v;
+}
+
+enum
+{
+	PATH_EMPTY=0,
+	PATH_ZERO_NONZERO,
+	PATH_BOUNDS,
+	PATH_CONTROL_BOUNDS,
+};
+
+
+static JSValue path_bounds_ex(JSContext *c, GF_Path *gp, Bool is_ctrl)
+{
+	JSValue nobj;
+	GF_Err e;
+	GF_Rect rc;
+	if (is_ctrl)
+	 	e = gf_path_get_control_bounds(gp, &rc);
+	else
+		e = gf_path_get_bounds(gp, &rc);
+	if (e) return JS_EXCEPTION;
+	nobj = JS_NewObject(c);
+	JS_SetPropertyStr(c, nobj, "x", JS_NewFloat64(c, rc.x));
+	JS_SetPropertyStr(c, nobj, "y", JS_NewFloat64(c, rc.y));
+	JS_SetPropertyStr(c, nobj, "w", JS_NewFloat64(c, rc.width));
+	JS_SetPropertyStr(c, nobj, "h", JS_NewFloat64(c, rc.height));
+	return nobj;
+}
+static JSValue path_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_Path *gp = JS_GetOpaque(obj, path_class_id);
+	if (!gp) return JS_EXCEPTION;
+	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_BOUNDS: return path_bounds_ex(c, gp, GF_FALSE);
+	case PATH_CONTROL_BOUNDS: return path_bounds_ex(c, gp, GF_TRUE);
+	}
+	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;
+	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;
+	}
+	return JS_UNDEFINED;
+}
+static JSValue path_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue obj;
+	GF_Path *path = gf_path_new();
+	if (!path) return JS_EXCEPTION;
+	obj = JS_NewObjectClass(c, path_class_id);
+	if (JS_IsException(obj)) return obj;
+	JS_SetOpaque(obj, path);
+	return obj;
+}
+static const JSCFunctionListEntry path_funcs[] =
+{
+	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("bounds", path_getProperty, NULL, PATH_BOUNDS),
+	JS_CGETSET_MAGIC_DEF("ctrl_bounds", path_getProperty, NULL, PATH_CONTROL_BOUNDS),
+
+	JS_CFUNC_DEF("point_over", 0, path_point_over),
+	JS_CFUNC_DEF("get_flatten", 0, path_get_flat),
+	JS_CFUNC_DEF("flatten", 0, path_flatten),
+	JS_CFUNC_DEF("add_path", 0, path_add_path),
+	JS_CFUNC_DEF("arc", 0, path_arc),
+	JS_CFUNC_DEF("arc_svg", 0, path_arc_svg),
+	JS_CFUNC_DEF("arc_bifs", 0, path_arc_bifs),
+	JS_CFUNC_DEF("bezier", 0, path_bezier),
+	JS_CFUNC_DEF("ellipse", 0, path_ellipse),
+	JS_CFUNC_DEF("rectangle", 0, path_rect),
+	JS_CFUNC_DEF("quadratic_to", 0, path_quadratic_to),
+	JS_CFUNC_DEF("cubic_to", 0, path_cubic_to),
+	JS_CFUNC_DEF("line_to", 0, path_line_to),
+	JS_CFUNC_DEF("move_to", 0, path_move_to),
+	JS_CFUNC_DEF("clone", 0, path_clone),
+	JS_CFUNC_DEF("reset", 0, path_reset),
+	JS_CFUNC_DEF("close", 0, path_close),
+	JS_CFUNC_DEF("outline", 0, path_outline),
+
+};
+
+
+static void stencil_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) return;
+	gf_evg_stencil_delete(stencil);
+}
+JSClassDef stencil_class = {
+	"Stencil",
+	.finalizer = stencil_finalize
+};
+
+enum
+{
+	STENCIL_CMX,
+	STENCIL_MAT,
+	STENCIL_GRADMOD,
+};
+
+static JSValue stencil_set_linear(JSContext *c, GF_EVGStencil *stencil, int argc, JSValueConst *argv)
+{
+	int res;
+	JSValue v;
+	Double d;
+	Fixed start_x=0, start_y=0, end_x=0, end_y=0;
+	s32 idx=0;
+	if (argc<2) return JS_EXCEPTION;
+
+#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;\
+		_var = FLT2FIX(d);\
+
+	if (JS_IsObject(argv[0])) {
+		GETIT(argv[0], "x", start_x)
+		GETIT(argv[0], "y", start_y)
+		idx=1;
+	} else {
+		if (JS_ToFloat64(c, &d, argv[0])) return JS_EXCEPTION;
+		start_x = FLT2FIX(d);
+		if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+		start_y = FLT2FIX(d);
+		idx=2;
+	}
+	if (argc<=idx) {
+		end_x = start_x;
+		end_y = start_y;
+		start_x = 0;
+		start_y = 0;
+	} else if (JS_IsObject(argv[idx])) {
+		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;
+		end_x = FLT2FIX(d);
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		end_y = FLT2FIX(d);
+	}
+#undef GETIT
+	gf_evg_stencil_set_linear_gradient(stencil, start_x, start_y, end_x, end_y);
+	return JS_UNDEFINED;
+}
+
+static JSValue stencil_set_radial(JSContext *c, GF_EVGStencil *stencil, int argc, JSValueConst *argv)
+{
+	int res;
+	JSValue v;
+	Double d;
+	Fixed cx=0, cy=0, fx=0, fy=0, rx=0, ry=0;
+	s32 idx=0;
+	if (argc<3) return JS_EXCEPTION;
+
+#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;\
+		_var = FLT2FIX(d);\
+
+	if (JS_IsObject(argv[0])) {
+		GETIT(argv[0], "x", cx)
+		GETIT(argv[0], "y", cy)
+		idx+=1;
+	} else {
+		if (JS_ToFloat64(c, &d, argv[0])) return JS_EXCEPTION;
+		cx = FLT2FIX(d);
+		if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+		cy = FLT2FIX(d);
+		idx+=2;
+	}
+
+	if (JS_IsObject(argv[idx])) {
+		GETIT(argv[idx], "x", fx)
+		GETIT(argv[idx], "y", fy)
+		idx+=1;
+	} else if (argc>idx+1) {
+		if (JS_ToFloat64(c, &d, argv[idx])) return JS_EXCEPTION;
+		fx = FLT2FIX(d);
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		fy = FLT2FIX(d);
+		idx+=2;
+	}
+
+	if (JS_IsObject(argv[idx])) {
+		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;
+		rx = FLT2FIX(d);
+		if (JS_ToFloat64(c, &d, argv[idx+1])) return JS_EXCEPTION;
+		ry = FLT2FIX(d);
+	}
+#undef GETIT
+	gf_evg_stencil_set_radial_gradient(stencil, cx, cy, fx, fy, rx, ry);
+	return JS_UNDEFINED;
+}
+
+
+static JSValue stencil_set_points(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_StencilType type;
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) return JS_EXCEPTION;
+
+	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;
+}
+
+Bool get_color_from_args(JSContext *c, int argc, JSValueConst *argv, u32 idx, Double *a, Double *r, Double *g, Double *b)
+{
+	if (argc<(s32) idx) return GF_FALSE;
+	if (JS_IsString(argv[idx])) {
+		GF_Color col;
+		const char *str = JS_ToCString(c, argv[idx]);
+		col = gf_color_parse(str);
+		JS_FreeCString(c, str);
+		*a = ((Double)GF_COL_A(col)) / 255;
+		*r = ((Double)GF_COL_R(col)) / 255;
+		*g = ((Double)GF_COL_G(col)) / 255;
+		*b = ((Double)GF_COL_B(col)) / 255;
+	} else if (JS_IsObject(argv[idx])) {
+		if (!get_color(c, argv[idx], a, r, g, b)) {
+			return GF_FALSE;
+		}
+	} else if (argc>(s32) idx) {
+		if (JS_ToFloat64(c, r, argv[idx]))
+			return GF_FALSE;
+		if (argc>(s32)idx+1) {
+			if (JS_ToFloat64(c, g, argv[idx+1]))
+				return GF_FALSE;
+			if (argc>(s32) idx+2) {
+				if (JS_ToFloat64(c, b, argv[idx+2]))
+					return GF_FALSE;
+				if (argc>(s32)idx+3) {
+					if (JS_ToFloat64(c, a, argv[idx+3]))
+						return GF_FALSE;
+				}
+			}
+		}
+	}
+	return GF_TRUE;
+}
+
+static JSValue stencil_set_stop_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_int)
+{
+	Double pos=0;
+	GF_StencilType type;
+	GF_Color col;
+	GF_EVGStencil *stencil = JS_GetOpaque(obj, stencil_class_id);
+	if (!stencil) return JS_EXCEPTION;
+	type = gf_evg_stencil_type(stencil);
+	if ((type!=GF_STENCIL_LINEAR_GRADIENT) && (type!=GF_STENCIL_RADIAL_GRADIENT)) return JS_EXCEPTION;
+	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_IsString(argv[1])) {
+		const char *str = JS_ToCString(c, argv[1]);
+		col = gf_color_parse(str);
+		JS_FreeCString(c, str);
+	} 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;
+		}
+		if (!use_int) {
+			a *= 255;
+			r *= 255;
+			g *= 255;
+			b *= 255;
+		}
+		col = GF_COL_ARGB(a, r, g, b);
+	}
+	gf_evg_stencil_push_gradient_interpolation(stencil, FLT2FIX(pos), col);
+	return JS_UNDEFINED;
+}
+static JSValue stencil_set_stop(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_stop_ex(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue stencil_set_stopf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_stop_ex(c, obj, argc, argv, GF_FALSE);
+}
+
+static JSValue stencil_set_color_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_int)
+{
+	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;
+	type = gf_evg_stencil_type(stencil);
+	if (type!=GF_STENCIL_SOLID) return JS_EXCEPTION;
+
+	if (JS_IsString(argv[0])) {
+		GF_Color col;
+		const char *str = JS_ToCString(c, argv[0]);
+		col = gf_color_parse(str);
+		JS_FreeCString(c, str);
+		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;
+	}
+	if (!use_int) {
+		r*=255;
+		g*=255;
+		b*=255;
+		a*=255;
+	}
+	gf_evg_stencil_set_brush_color(stencil, GF_COL_ARGB(a, r, g, b));
+	return JS_UNDEFINED;
+}
+
+static JSValue stencil_set_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_color_ex(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue stencil_set_colorf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_color_ex(c, obj, argc, argv, GF_FALSE);
+}
+
+static JSValue stencil_set_alpha_ex(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool use_int)
+{
+	Double a=1.0;
+	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 JS_EXCEPTION;
+		stencil = tx->stencil;
+	}
+
+	if (argc) {
+		JS_ToFloat64(c, &a, argv[0]);
+	}
+	if (a<0) a=0;
+	if (!use_int) {
+		a*=255;
+	}
+	if (a>255) a = 255;
+	gf_evg_stencil_set_alpha(stencil, (u8) a);
+	return JS_UNDEFINED;
+}
+
+static JSValue stencil_set_alpha(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_alpha_ex(c, obj, argc, argv, GF_TRUE);
+}
+static JSValue stencil_set_alphaf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return stencil_set_alpha_ex(c, obj, argc, argv, GF_FALSE);
+}
+
+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;
+
+	switch (magic) {
+	case STENCIL_CMX:
+		if (JS_IsNull(value)) {
+			gf_evg_stencil_set_color_matrix(stencil, NULL);
+		} else {
+			GF_ColorMatrix *cmx = JS_GetOpaque(value, colmx_class_id);
+			gf_evg_stencil_set_color_matrix(stencil, cmx);
+		}
+		return JS_UNDEFINED;
+	case STENCIL_GRADMOD:
+		if (JS_ToInt32(c, &v, value)) return JS_EXCEPTION;
+		gf_evg_stencil_set_gradient_mode(stencil, v);
+		return JS_UNDEFINED;
+	case STENCIL_MAT:
+		if (JS_IsNull(value)) {
+			gf_evg_stencil_set_matrix(stencil, NULL);
+		} else {
+			GF_Matrix2D *mx = JS_GetOpaque(value, mx2d_class_id);
+			gf_evg_stencil_set_matrix(stencil, mx);
+		}
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry stencil_funcs[] =
+{
+	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_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("set_points", 0, stencil_set_points),
+	JS_CFUNC_DEF("set_stop", 0, stencil_set_stop),
+	JS_CFUNC_DEF("set_stopf", 0, stencil_set_stopf),
+};
+
+
+static JSValue stencil_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv, GF_StencilType type)
+{
+	JSValue obj;
+	GF_EVGStencil *stencil = gf_evg_stencil_new(type);
+	if (!stencil) return JS_EXCEPTION;
+	obj = JS_NewObjectClass(c, stencil_class_id);
+	if (JS_IsException(obj)) return obj;
+	JS_SetOpaque(obj, stencil);
+	return obj;
+}
+static JSValue solid_brush_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return stencil_constructor(c, new_target, argc, argv, GF_STENCIL_SOLID);
+}
+static JSValue linear_gradient_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return stencil_constructor(c, new_target, argc, argv, GF_STENCIL_LINEAR_GRADIENT);
+}
+static JSValue radial_gradient_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return stencil_constructor(c, new_target, argc, argv, GF_STENCIL_RADIAL_GRADIENT);
+}
+
+static void texture_reset(GF_JSTexture *tx)
+{
+	if (tx->owns_data && tx->data) {
+		gf_free(tx->data);
+	}
+	tx->data = NULL;
+	tx->data_size = 0;
+	tx->owns_data = GF_FALSE;
+}
+
+static void texture_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx) return;
+	texture_reset(tx);
+	if (tx->stencil)
+		gf_evg_stencil_delete(tx->stencil);
+	JS_FreeValueRT(rt, tx->param_fun);
+	gf_free(tx);
+}
+
+static void texture_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx) return;
+	JS_MarkValue(rt, tx->param_fun, mark_func);
+}
+
+JSClassDef texture_class = {
+	"Texture",
+	.finalizer = texture_finalize,
+	.gc_mark = texture_gc_mark
+};
+
+enum
+{
+	TX_MAPPING = 0,
+	TX_FILTER,
+	TX_CMX,
+	TX_REPEAT_S,
+	TX_REPEAT_T,
+	TX_FLIP_X,
+	TX_FLIP_Y,
+	TX_MAT,
+	TX_WIDTH,
+	TX_HEIGHT,
+	TX_NB_COMP,
+	TX_PIXFMT,
+	TX_DATA,
+};
+
+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;
+	switch (magic) {
+	case TX_REPEAT_S:
+		return JS_NewBool(c, (tx->flags & GF_TEXTURE_REPEAT_S));
+	case TX_REPEAT_T:
+		return JS_NewBool(c, (tx->flags & GF_TEXTURE_REPEAT_T));
+	case TX_FLIP_X:
+		return JS_NewBool(c, (tx->flags & GF_TEXTURE_FLIP_X));
+	case TX_FLIP_Y:
+		return JS_NewBool(c, (tx->flags & GF_TEXTURE_FLIP_Y));
+	case TX_WIDTH:
+		return JS_NewInt32(c, tx->width);
+	case TX_HEIGHT:
+		return JS_NewInt32(c, tx->height);
+	case TX_PIXFMT:
+		return JS_NewInt32(c, tx->pf);
+	case TX_NB_COMP:
+		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_NULL;
+	}
+	return JS_UNDEFINED;
+}
+static JSValue texture_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	u32 v;
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil) return JS_EXCEPTION;
+
+	switch (magic) {
+	case TX_FILTER:
+		if (JS_ToInt32(c, &v, value)) return JS_EXCEPTION;
+		gf_evg_stencil_set_filter(tx->stencil, v);
+		return JS_UNDEFINED;
+	case TX_CMX:
+		if (JS_IsNull(value)) {
+			gf_evg_stencil_set_color_matrix(tx->stencil, NULL);
+		} else {
+			GF_ColorMatrix *cmx = JS_GetOpaque(value, colmx_class_id);
+			gf_evg_stencil_set_color_matrix(tx->stencil, cmx);
+		}
+		return JS_UNDEFINED;
+	case TX_REPEAT_S:
+		if (JS_ToBool(c, value)) tx->flags |= GF_TEXTURE_REPEAT_S;
+		else tx->flags &= ~GF_TEXTURE_REPEAT_S;
+		gf_evg_stencil_set_mapping(tx->stencil, tx->flags);
+		return JS_UNDEFINED;
+	case TX_REPEAT_T:
+		if (JS_ToBool(c, value)) tx->flags |= GF_TEXTURE_REPEAT_T;
+		else tx->flags &= ~GF_TEXTURE_REPEAT_T;
+		gf_evg_stencil_set_mapping(tx->stencil, tx->flags);
+		return JS_UNDEFINED;
+	case TX_FLIP_X:
+		if (JS_ToBool(c, value)) tx->flags |= GF_TEXTURE_FLIP_X;
+		else tx->flags &= ~GF_TEXTURE_FLIP_X;
+		gf_evg_stencil_set_mapping(tx->stencil, tx->flags);
+		return JS_UNDEFINED;
+	case TX_FLIP_Y:
+		if (JS_ToBool(c, value)) tx->flags |= GF_TEXTURE_FLIP_Y;
+		else tx->flags &= ~GF_TEXTURE_FLIP_Y;
+		gf_evg_stencil_set_mapping(tx->stencil, tx->flags);
+		return JS_UNDEFINED;
+	case TX_MAT:
+		if (JS_IsNull(value)) {
+			gf_evg_stencil_set_matrix(tx->stencil, NULL);
+		} else {
+			GF_Matrix2D *mx = JS_GetOpaque(value, mx2d_class_id);
+			gf_evg_stencil_set_matrix(tx->stencil, mx);
+		}
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+
+#define min_f(a, b, c)  (fminf(a, fminf(b, c)))
+#define max_f(a, b, c)  (fmaxf(a, fmaxf(b, c)))
+
+void rgb2hsv(const u8 src_r, const u8 src_g, const u8 src_b, u8 *dst_h, u8 *dst_s, u8 *dst_v)
+{
+    float h, s, v; // h:0-360.0, s:0.0-1.0, v:0.0-1.0
+    float r = src_r / 255.0f;
+    float g = src_g / 255.0f;
+    float b = src_b / 255.0f;
+
+    float max = max_f(r, g, b);
+    float min = min_f(r, g, b);
+
+    v = max;
+    if (max == 0.0f) {
+        s = 0;
+        h = 0;
+    } else if (max - min == 0.0f) {
+        s = 0;
+        h = 0;
+    } else {
+        s = (max - min) / max;
+
+        if (max == r) {
+            h = 60 * ((g - b) / (max - min)) + 0;
+        } else if (max == g) {
+            h = 60 * ((b - r) / (max - min)) + 120;
+        } else {
+            h = 60 * ((r - g) / (max - min)) + 240;
+        }
+    }
+    if (h < 0) h += 360.0f;
+
+    *dst_h = (u8)(h / 2);   // dst_h : 0-180
+    *dst_s = (u8)(s * 255); // dst_s : 0-255
+    *dst_v = (u8)(v * 255); // dst_v : 0-255
+}
+
+void hsv2rgb(u8 src_h, u8 src_s, u8 src_v, u8 *dst_r, u8 *dst_g, u8 *dst_b)
+{
+	float r, g, b; // 0.0-1.0
+	float h = src_h *   2.0f; // 0-360
+	float s = src_s / 255.0f; // 0.0-1.0
+	float v = src_v / 255.0f; // 0.0-1.0
+
+	int   hi = (int)(h / 60.0f) % 6;
+	float f  = (h / 60.0f) - hi;
+	float p  = v * (1.0f - s);
+	float q  = v * (1.0f - s * f);
+	float t  = v * (1.0f - s * (1.0f - f));
+
+	switch(hi) {
+	case 0: r = v; g = t; b = p; break;
+	case 1: r = q; g = v; b = p; break;
+	case 2: r = p; g = v; b = t; break;
+	case 3: r = p; g = q; b = v; break;
+	case 4: r = t; g = p; b = v; break;
+	case 5:
+	default:
+		r = v; g = p; b = q; break;
+	}
+
+	*dst_r = (u8)(r * 255); // dst_r : 0-255
+	*dst_g = (u8)(g * 255); // dst_r : 0-255
+	*dst_b = (u8)(b * 255); // dst_r : 0-255
+}
+
+enum
+{
+	EVG_CONV_RGB_TO_HSV=0,
+	EVG_CONV_HSV_TO_RGB,
+	EVG_CONV_YUV_TO_RGB,
+	EVG_CONV_RGB_TO_YUV,
+};
+
+static JSValue texture_convert(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 conv_type)
+{
+	JSValue nobj;
+	u32 i, j, dst_pf, nb_comp;
+	GF_JSCanvas *canvas=NULL;
+	GF_JSTexture *tx_hsv;
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil) return JS_EXCEPTION;
+	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");
+	}
+
+	switch (tx->pf) {
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		dst_pf = GF_PIXEL_RGBA;
+		nb_comp = 4;
+		break;
+	default:
+		dst_pf = GF_PIXEL_RGB;
+		nb_comp = 3;
+		break;
+	}
+
+	GF_SAFEALLOC(tx_hsv, GF_JSTexture);
+	if (!tx_hsv)
+		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++) {
+			u8 a, r, g, b;
+			u32 col = gf_evg_stencil_get_pixel(tx->stencil, i, j);
+
+			if (conv_type == EVG_CONV_RGB_TO_HSV ) {
+				a = GF_COL_A(col);
+				r = GF_COL_R(col);
+				g = GF_COL_G(col);
+				b = GF_COL_B(col);
+				rgb2hsv(r, g, b, &r, &g, &b);
+			} else if (conv_type == EVG_CONV_HSV_TO_RGB ) {
+				a = GF_COL_A(col);
+				r = GF_COL_R(col);
+				g = GF_COL_G(col);
+				b = GF_COL_B(col);
+				hsv2rgb(r, g, b, &r, &g, &b);
+			} else if (conv_type == EVG_CONV_RGB_TO_YUV ) {
+				col = gf_evg_argb_to_ayuv(canvas->surface, col);
+				a = GF_COL_A(col);
+				r = GF_COL_R(col);
+				g = GF_COL_G(col);
+				b = GF_COL_B(col);
+			} else {
+				col = gf_evg_ayuv_to_argb(canvas->surface, col);
+				a = GF_COL_A(col);
+				r = GF_COL_R(col);
+				g = GF_COL_G(col);
+				b = GF_COL_B(col);
+			}
+			dst[0] = r;
+			dst[1] = g;
+			dst[2] = b;
+			if (nb_comp==4) {
+				dst[3] = a;
+				dst += 4;
+			} else {
+				dst += 3;
+			}
+		}
+	}
+	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);
+	nobj = JS_NewObjectClass(c, texture_class_id);
+	JS_SetOpaque(nobj, tx_hsv);
+	return nobj;
+}
+static JSValue texture_rgb2hsv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_convert(c, obj, argc, argv, EVG_CONV_RGB_TO_HSV);
+}
+static JSValue texture_hsv2rgb(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_convert(c, obj, argc, argv, EVG_CONV_HSV_TO_RGB);
+}
+static JSValue texture_rgb2yuv(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_convert(c, obj, argc, argv, EVG_CONV_RGB_TO_YUV);
+}
+static JSValue texture_yuv2rgb(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_convert(c, obj, argc, argv, EVG_CONV_YUV_TO_RGB);
+}
+
+static JSValue texture_split(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue nobj;
+	u32 i, j, idx, pix_shift=0;
+	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 (JS_ToInt32(c, &idx, argv[0])) return JS_EXCEPTION;
+	if (idx>=tx->nb_comp) return JS_EXCEPTION;
+
+	src.x = src.y = 0;
+	src.width = tx->width;
+	src.height = tx->height;
+	if (argc>1) {
+		JSValue v;
+		int res;
+		if (!JS_IsObject(argv[1])) return JS_EXCEPTION;
+
+#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;\
+
+		GETIT("x", x)
+		GETIT("y", y)
+		GETIT("w", width)
+		GETIT("h", height)
+#undef GETIT
+	}
+
+	GF_SAFEALLOC(tx_split, GF_JSTexture);
+	if (!tx_split)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	tx_split->width = src.width;
+	tx_split->height = src.height;
+	tx_split->pf = GF_PIXEL_GREYSCALE;
+	tx_split->nb_comp = 1;
+	tx_split->stride = tx_split->width;
+	tx_split->data_size = tx_split->width * tx_split->height;
+	tx_split->data = gf_malloc(sizeof(char) * tx_split->data_size);
+	tx_split->owns_data = GF_TRUE;
+
+	pix_shift = 0;
+	if (idx==0) {
+		pix_shift = 16; //R component
+	} else if (idx==1) {
+		if ((tx->pf == GF_PIXEL_ALPHAGREY) || (tx->pf == GF_PIXEL_GREYALPHA)) pix_shift = 24; //alpha
+		else pix_shift = 8; //green
+	} else if (idx==2) {
+		pix_shift = 0; //blue
+	} else if (idx==3) {
+		pix_shift = 24; //alpha
+	}
+	for (j=0; j<tx_split->height; j++) {
+		u8 *dst = tx_split->data + j*tx_split->stride;
+		for (i=0; i<tx_split->width; i++) {
+			u32 col = gf_evg_stencil_get_pixel(tx->stencil, src.x + i, src.y + j);
+			*dst++ = (col >> pix_shift) & 0xFF;
+		}
+	}
+	tx_split->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
+	gf_evg_stencil_set_texture(tx_split->stencil, tx_split->data, tx_split->width, tx_split->height, tx_split->stride, tx_split->pf);
+	nobj = JS_NewObjectClass(c, texture_class_id);
+	JS_SetOpaque(nobj, tx_split);
+	return nobj;
+}
+static JSValue texture_convolution(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue v, kernv, nobj;
+	u32 i, j, kw=0, kh=0, kl=0, hkh, hkw;
+	s32 *kdata;
+	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 (!JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+
+	v = JS_GetPropertyStr(c, argv[0], "w");
+	JS_ToInt32(c, &kw, v);
+	JS_FreeValue(c, v);
+	v = JS_GetPropertyStr(c, argv[0], "h");
+	JS_ToInt32(c, &kh, v);
+	JS_FreeValue(c, v);
+	v = JS_GetPropertyStr(c, argv[0], "norm");
+	if (!JS_IsUndefined(v))
+		JS_ToInt32(c, &knorm, v);
+	JS_FreeValue(c, v);
+	if (!kh || !kw)
+		return JS_EXCEPTION;
+	if (!(kh%2) || !(kw%2))
+		return JS_EXCEPTION;
+	kernv = JS_GetPropertyStr(c, argv[0], "k");
+	if (JS_IsUndefined(kernv))
+		return JS_EXCEPTION;
+
+	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;
+	}
+	kl = kw*kh;
+	kdata = gf_malloc(sizeof(s32)*kl);
+	for (j=0; j<kh; j++) {
+		for (i=0; i<kw; i++) {
+			u32 idx = j*kw + i;
+			v = JS_GetPropertyUint32(c, kernv, idx);
+			JS_ToInt32(c, &kdata[idx] , v);
+			JS_FreeValue(c, v);
+		}
+	}
+	JS_FreeValue(c, kernv);
+
+	GF_SAFEALLOC(tx_conv, GF_JSTexture);
+	if (!tx_conv)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	tx_conv->width = tx->width;
+	tx_conv->height = tx->height;
+	tx_conv->pf = GF_PIXEL_RGB;
+	tx_conv->nb_comp = 3;
+	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;
+
+	hkh = kh/2;
+	hkw = kw/2;
+	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++) {
+			u32 k, l, nb_pix=0;
+			s32 kr = 0;
+			s32 kg = 0;
+			s32 kb = 0;
+
+			for (k=0; k<kh; k++) {
+				if (j+k < hkh) continue;
+				if (j+k >= tx_conv->height + hkh) continue;
+
+				for (l=0; l<kw; l++) {
+					s32 kv;
+					if (i+l < hkw) continue;
+					else if (i+l >= tx_conv->width + hkw) continue;
+
+					u32 col = gf_evg_stencil_get_pixel(tx->stencil, i+l-hkw, j+k-hkh);
+					kv = kdata[k*kw + l];
+					kr += kv * (s32) GF_COL_R(col);
+					kg += kv * (s32) GF_COL_G(col);
+					kb += kv * (s32) GF_COL_B(col);
+					nb_pix++;
+				}
+			}
+
+			if (nb_pix!=kl) {
+				u32 n = knorm ? knorm : 1;
+				if (nb_pix) n *= nb_pix;
+				kr = (kr * kl / n);
+				kg = (kg * kl / n);
+				kb = (kb * kl / n);
+			} else if (knorm) {
+				kr /= knorm;
+				kg /= knorm;
+				kb /= knorm;
+			}
+#define SET_CLAMP(_d, _s)\
+			if (_s<0) _d = 0;\
+			else if (_s>255) _d = 255;\
+			else _d = (u8) _s;
+
+			SET_CLAMP(dst[0], kr)
+			SET_CLAMP(dst[1], kg)
+			SET_CLAMP(dst[2], kb)
+
+			dst += 3;
+		}
+	}
+	gf_free(kdata);
+
+	tx_conv->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
+	gf_evg_stencil_set_texture(tx_conv->stencil, tx_conv->data, tx_conv->width, tx_conv->height, tx_conv->stride, tx_conv->pf);
+	nobj = JS_NewObjectClass(c, texture_class_id);
+	JS_SetOpaque(nobj, tx_conv);
+	return nobj;
+}
+
+
+static JSValue texture_update(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	u32 width=0, height=0, pf=0, stride=0, stride_uv=0;
+	u8 *data=NULL;
+	u8 *p_u=NULL;
+	u8 *p_v=NULL;
+	u8 *p_a=NULL;
+
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil || !argc) return JS_EXCEPTION;
+
+	if (JS_IsObject(argv[0])) {
+		//create from canvas object
+		GF_JSCanvas *canvas = JS_GetOpaque(argv[0], canvas_class_id);
+		if (canvas) {
+			width = canvas->width;
+			height = canvas->height;
+			stride = canvas->stride;
+			stride_uv = canvas->stride_uv;
+			data = canvas->data;
+			pf = canvas->pf;
+		}
+		//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);
+		} else {
+			return js_throw_err(c, GF_BAD_PARAM);
+		}
+	} else {
+		return js_throw_err(c, GF_BAD_PARAM);
+	}
+
+	tx->owns_data = GF_FALSE;
+	tx->width = width;
+	tx->height = height;
+	tx->pf = pf;
+	tx->stride = stride;
+	tx->stride_uv = stride_uv;
+	tx->data = data;
+	if (p_u || p_v) {
+		e = gf_evg_stencil_set_texture_planes(tx->stencil, tx->width, tx->height, tx->pf, data, tx->stride, p_u, p_v, tx->stride_uv, p_a, tx->stride);
+		 if (e) return js_throw_err(c, e);
+	} else {
+		assert(data);
+		e = gf_evg_stencil_set_texture(tx->stencil, tx->data, tx->width, tx->height, tx->stride, tx->pf);
+		if (e) return js_throw_err(c, e);
+	}
+
+	if (tx->pf) {
+		tx->nb_comp = gf_pixel_get_nb_comp(tx->pf);
+		gf_pixel_get_size_info(tx->pf, tx->width, tx->height, NULL, NULL, NULL, NULL, NULL);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue texture_get_pixel_internal(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_float)
+{
+	Bool as_array=GF_FALSE;
+	JSValue ret;
+	Double x, y;
+	Float r, g, b, a;
+
+	GF_JSTexture *tx = JS_GetOpaque(obj, texture_class_id);
+	if (!tx || !tx->stencil || (argc<2) ) return JS_EXCEPTION;
+
+	if (is_float) {
+		if (JS_ToFloat64(c, &x, argv[0])) return JS_EXCEPTION;
+		if (JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+	} else {
+		s32 _x, _y;
+		if (JS_ToInt32(c, &_x, argv[0])) return JS_EXCEPTION;
+		if (JS_ToInt32(c, &_y, argv[1])) return JS_EXCEPTION;
+		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);
+
+	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) );
+	} 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) );
+	}
+	return ret;
+}
+static JSValue texture_get_pixel(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_get_pixel_internal(c, obj, argc, argv, GF_FALSE);
+}
+
+static JSValue texture_get_pixelf(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return texture_get_pixel_internal(c, obj, argc, argv, GF_TRUE);
+}
+
+static GF_Err texture_load_data(JSContext *c, GF_JSTexture *tx, u8 *data, u32 size)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+	u8 *dsi=NULL;
+	u32 codecid, width, height, pf, dsi_len, osize;
+
+	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
+	gf_img_parse(bs, &codecid, &width, &height, &dsi, &dsi_len);
+	gf_bs_del(bs);
+
+	e = GF_NOT_SUPPORTED;
+	if (codecid==GF_CODECID_PNG) {
+		e = gf_img_png_dec(data, size, &width, &height, &pf, NULL, &osize);
+		if (e ==GF_BUFFER_TOO_SMALL) {
+			tx->owns_data = GF_TRUE;
+			tx->data_size = osize;
+			tx->data = gf_malloc(sizeof(char) * osize);
+			e = gf_img_png_dec(data, size, &width, &height, &pf, tx->data, &osize);
+			if (e==GF_OK) {
+				tx->width = width;
+				tx->height = height;
+				tx->pf = pf;
+			}
+		}
+	}
+	if (codecid==GF_CODECID_JPEG) {
+		e = gf_img_jpeg_dec(data, size, &width, &height, &pf, NULL, &osize, 0);
+		if (e ==GF_BUFFER_TOO_SMALL) {
+			tx->owns_data = GF_TRUE;
+			tx->data_size = osize;
+			tx->data = gf_malloc(sizeof(char) * osize);
+			e = gf_img_jpeg_dec(data, size, &width, &height, &pf, tx->data, &osize, 0);
+			if (e==GF_OK) {
+				tx->width = width;
+				tx->height = height;
+				tx->pf = pf;
+			}
+		}
+	}
+	if (dsi) gf_free(dsi);
+
+	if (e != GF_OK) {
+		return e;
+	}
+	tx->nb_comp = gf_pixel_get_nb_comp(tx->pf);
+	gf_pixel_get_size_info(tx->pf, tx->width, tx->height, NULL, &tx->stride, NULL, NULL, NULL);
+	e = gf_evg_stencil_set_texture(tx->stencil, tx->data, tx->width, tx->height, tx->stride, tx->pf);
+	if (e != GF_OK) {
+		return e;
+	}
+	return GF_OK;
+}
+static GF_Err texture_load_file(JSContext *c, GF_JSTexture *tx, const char *fileName, Bool rel_to_script)
+{
+	u8 *data;
+	u32 size;
+	GF_Err e;
+	char *full_url = NULL;
+
+	if (rel_to_script) {
+		const char *par_url = jsf_get_script_filename(c);
+		full_url = gf_url_concatenate(par_url, fileName);
+		fileName = full_url;
+	}
+	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;
+	}
+	if (full_url) gf_free(full_url);
+	e = texture_load_data(c, tx, data, size);
+	gf_free(data);
+	return e;
+}
+
+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("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),
+	JS_CGETSET_MAGIC_DEF("flip_v", texture_getProperty, texture_setProperty, TX_FLIP_Y),
+	JS_CGETSET_MAGIC_DEF("width", texture_getProperty, NULL, TX_WIDTH),
+	JS_CGETSET_MAGIC_DEF("height", texture_getProperty, NULL, TX_HEIGHT),
+	JS_CGETSET_MAGIC_DEF("pixfmt", texture_getProperty, NULL, TX_PIXFMT),
+	JS_CGETSET_MAGIC_DEF("comp", texture_getProperty, NULL, TX_NB_COMP),
+	JS_CGETSET_MAGIC_DEF("data", texture_getProperty, NULL, TX_DATA),
+
+	JS_CFUNC_DEF("set_alpha", 0, stencil_set_alpha),
+	JS_CFUNC_DEF("set_alphaf", 0, stencil_set_alphaf),
+	JS_CFUNC_DEF("rgb2hsv", 0, texture_rgb2hsv),
+	JS_CFUNC_DEF("hsv2rgb", 0, texture_hsv2rgb),
+	JS_CFUNC_DEF("rgb2yuv", 0, texture_rgb2yuv),
+	JS_CFUNC_DEF("yuv2rgb", 0, texture_yuv2rgb),
+	JS_CFUNC_DEF("convolution", 0, texture_convolution),
+	JS_CFUNC_DEF("split", 0, texture_split),
+	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),
+
+};
+
+
+static void evg_param_tex_callback(void *cbk, u32 x, u32 y, Float *r, Float *g, Float *b, Float *a)
+{
+	Double compv;
+	JSValue ret, v, argv[2];
+	GF_JSTexture *tx = (GF_JSTexture *)cbk;
+	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);
+	JS_FreeValue(tx->ctx, argv[0]);
+	JS_FreeValue(tx->ctx, argv[1]);
+
+	*r = *g = *b = 0.0;
+	*a = 1.0;
+#define GETCOMP(_comp)\
+	v = JS_GetPropertyStr(tx->ctx, ret, #_comp);\
+	if (!JS_IsUndefined(v)) {\
+		JS_ToFloat64(tx->ctx, &compv, v);\
+		JS_FreeValue(tx->ctx, v);\
+		*_comp = (Float) compv;\
+	}\
+
+	GETCOMP(r)
+	GETCOMP(g)
+	GETCOMP(b)
+	GETCOMP(a)
+
+#undef GETCOMP
+	JS_FreeValue(tx->ctx, ret);
+}
+
+static JSValue texture_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	Bool use_screen_coords=GF_FALSE;
+	JSValue obj;
+	JSValue tx_fun=JS_UNDEFINED;
+	u32 width=0, height=0, pf=0, stride=0, stride_uv=0;
+	size_t data_size=0;
+	u8 *data=NULL;
+	u8 *p_u=NULL;
+	u8 *p_v=NULL;
+	u8 *p_a=NULL;
+	GF_JSTexture *tx;
+	GF_SAFEALLOC(tx, GF_JSTexture);
+	if (!tx)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	tx->stencil = gf_evg_stencil_new(GF_STENCIL_TEXTURE);
+	if (!tx->stencil) {
+		gf_free(tx);
+		return JS_EXCEPTION;
+	}
+	if (!argc) goto done;
+
+	if (JS_IsString(argv[0])) {
+		GF_Err e;
+		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);
+		JS_FreeCString(c, str);
+		if (e) {
+			if (tx->stencil) gf_evg_stencil_delete(tx->stencil);
+			gf_free(tx);
+			return js_throw_err_msg(c, e, "Failed to load texture: %s", gf_error_to_string(e));
+		}
+		goto done;
+	}
+	if (JS_IsObject(argv[0])) {
+
+		//create from canvas object
+		GF_JSCanvas *canvas = JS_GetOpaque(argv[0], canvas_class_id);
+		if (canvas) {
+			width = canvas->width;
+			height = canvas->height;
+			stride = canvas->stride;
+			stride_uv = canvas->stride_uv;
+			data = canvas->data;
+			pf = canvas->pf;
+		}
+		//create from filter packet
+		else if (jsf_is_packet(c, argv[0])) {
+			GF_Err 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) goto error;
+
+			if (!stride) {
+				gf_pixel_get_size_info(pf, width, height, NULL, &stride, &stride_uv, NULL, NULL);
+			}
+		} else {
+			data = JS_GetArrayBuffer(c, &data_size, argv[0]);
+			if (data) {
+				GF_Err e = texture_load_data(c, tx, data, (u32) data_size);
+				if (e) {
+					if (tx->stencil) gf_evg_stencil_delete(tx->stencil);
+					gf_free(tx);
+					return js_throw_err_msg(c, e, "Failed to load texture: %s", gf_error_to_string(e));
+				}
+				goto done;
+			}
+			goto error;
+		}
+	}
+	//arraybuffer
+	else {
+		if (argc<4) goto error;
+		if (JS_ToInt32(c, &width, argv[0])) goto error;
+		if (JS_ToInt32(c, &height, argv[1])) goto error;
+		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])) {
+			goto error;
+		}
+		if (JS_IsFunction(c, argv[3])) {
+			tx_fun = argv[3];
+		}
+		else if (JS_IsObject(argv[3])) {
+			data = JS_GetArrayBuffer(c, &data_size, argv[3]);
+		}
+		if (!width || !height || !pf || (!data && JS_IsUndefined(tx_fun)))
+			goto error;
+
+		if (argc>4) {
+			if (JS_ToInt32(c, &stride, argv[4]))
+				goto error;
+			if (argc>5) {
+				if (JS_ToInt32(c, &stride_uv, argv[5]))
+					goto error;
+			}
+		}
+	}
+
+	tx->owns_data = GF_FALSE;
+	tx->width = width;
+	tx->height = height;
+	tx->pf = pf;
+	tx->stride = stride;
+	tx->stride_uv = stride_uv;
+	tx->data = data;
+	if (p_u || p_v) {
+		if (gf_evg_stencil_set_texture_planes(tx->stencil, tx->width, tx->height, tx->pf, data, tx->stride, p_u, p_v, tx->stride_uv, p_a, tx->stride) != GF_OK)
+			goto error;
+	} else if (data) {
+		if (gf_evg_stencil_set_texture(tx->stencil, tx->data, tx->width, tx->height, tx->stride, tx->pf) != GF_OK)
+			goto error;
+	} else {
+		use_screen_coords = stride ? GF_TRUE : GF_FALSE;
+		if (gf_evg_stencil_set_texture_parametric(tx->stencil, tx->width, tx->height, tx->pf, evg_param_tex_callback, tx, use_screen_coords) != GF_OK)
+			goto error;
+		tx->param_fun = JS_DupValue(c, tx_fun);
+		tx->ctx = c;
+	}
+
+done:
+	if (tx->pf) {
+		tx->nb_comp = gf_pixel_get_nb_comp(tx->pf);
+		gf_pixel_get_size_info(tx->pf, tx->width, tx->height, NULL, NULL, NULL, NULL, NULL);
+	}
+	obj = JS_NewObjectClass(c, texture_class_id);
+	if (JS_IsException(obj)) return obj;
+	JS_SetOpaque(obj, tx);
+	tx->obj = obj;
+	return obj;
+
+error:
+	if (tx->stencil) gf_evg_stencil_delete(tx->stencil);
+	gf_free(tx);
+	return js_throw_err_msg(c, GF_BAD_PARAM, "Failed to create texture");
+}
+
+Bool js_evg_is_texture(JSContext *ctx, JSValue this_obj)
+{
+	GF_JSTexture *tx = JS_GetOpaque(this_obj, texture_class_id);
+	if (!tx) return GF_FALSE;
+	return GF_TRUE;
+}
+
+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)
+{
+	GF_JSTexture *tx = JS_GetOpaque(this_obj, texture_class_id);
+	if (!tx) return GF_FALSE;
+	if (width) *width = tx->width;
+	if (height) *height = tx->height;
+	if (pixfmt) *pixfmt = tx->pf;
+	if (stride) *stride = tx->stride;
+	if (stride_uv) *stride_uv = tx->stride_uv;
+	if (!tx->data) return GF_TRUE;
+	if (p_data) *p_data = tx->data;
+	if (p_u) *p_u = NULL;
+	if (p_v) *p_v = NULL;
+	if (p_a) *p_a = NULL;
+	return GF_TRUE;
+}
+
+static void text_reset(GF_JSText *txt)
+{
+	if (txt->path) gf_path_del(txt->path);
+	txt->path = NULL;
+	while (gf_list_count(txt->spans)) {
+		GF_TextSpan *s = gf_list_pop_back(txt->spans);
+		gf_font_manager_delete_span(txt->fm, s);
+	}
+	txt->min_x = txt->min_y = txt->max_x = txt->max_y = txt->max_w = txt->max_h = 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);
+	gf_list_del(txt->spans);
+	gf_free(txt);
+}
+
+enum{
+	TXT_FONT=0,
+	TXT_FONTSIZE,
+	TXT_ALIGN,
+	TXT_BASELINE,
+	TXT_HORIZ,
+	TXT_FLIP,
+	TXT_UNDERLINED,
+	TXT_BOLD,
+	TXT_ITALIC,
+	TXT_SMALLCAP,
+	TXT_STRIKEOUT,
+	TXT_MAX_WIDTH,
+	TXT_LINESPACING,
+};
+
+enum
+{
+	TXT_BL_TOP=0,
+	TXT_BL_HANGING,
+	TXT_BL_MIDDLE,
+	TXT_BL_ALPHABETIC,
+	TXT_BL_IDEOGRAPHIC,
+	TXT_BL_BOTTOM,
+};
+enum
+{
+	TXT_AL_START=0,
+	TXT_AL_END,
+	TXT_AL_LEFT,
+	TXT_AL_RIGHT,
+	TXT_AL_CENTER
+};
+
+static JSValue text_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
+	if (!txt) return JS_EXCEPTION;
+	switch (magic) {
+	case TXT_FONT: return JS_NewString(c, txt->fontname);
+	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);
+	case TXT_HORIZ: return JS_NewBool(c, txt->horizontal);
+	case TXT_FLIP: return JS_NewBool(c, txt->flip);
+	case TXT_MAX_WIDTH: return JS_NewFloat64(c, txt->maxWidth);
+	case TXT_LINESPACING: return JS_NewFloat64(c, txt->lineSpacing);
+	case TXT_BOLD: return JS_NewBool(c, txt->styles & GF_FONT_WEIGHT_100);
+	case TXT_ITALIC: return JS_NewBool(c, txt->styles & GF_FONT_ITALIC);
+	case TXT_UNDERLINED: return JS_NewBool(c, txt->styles & GF_FONT_UNDERLINED);
+	case TXT_SMALLCAP: return JS_NewBool(c, txt->styles & GF_FONT_SMALLCAPS);
+	case TXT_STRIKEOUT: return JS_NewBool(c, txt->styles & GF_FONT_STRIKEOUT);
+	}
+	return JS_UNDEFINED;
+}
+
+static void text_update_path(GF_JSText *txt, Bool for_centered)
+{
+	Fixed cy, ascent, descent, scale_x, ls;
+	u32 i, nb_lines;
+
+	if ((txt->path_for_centered == for_centered) && txt->path) {
+		return;
+	}
+	if (txt->path) gf_path_del(txt->path);
+	txt->path = NULL;
+	if (!txt->font)
+		return;
+
+	txt->path_for_centered = for_centered;
+
+	cy = FLT2FIX((txt->font_size * txt->font->baseline) / txt->font->em_size);
+
+	ascent = FLT2FIX((txt->font_size*txt->font->ascent) / txt->font->em_size);
+	if (txt->lineSpacing)
+		ls = FLT2FIX((txt->lineSpacing*txt->font->line_spacing) / txt->font->em_size);
+	else
+		ls = FLT2FIX((txt->font_size*txt->font->line_spacing) / txt->font->em_size);
+	descent = -FLT2FIX((txt->font_size*txt->font->descent) / txt->font->em_size);
+	scale_x = 0;
+	if (txt->maxWidth && txt->max_w && (txt->max_w > txt->maxWidth)) {
+		scale_x = gf_divfix(FLT2FIX(txt->maxWidth), INT2FIX(txt->max_w) );
+	}
+
+	if (txt->baseline==TXT_BL_TOP) {
+		cy = ascent;
+	} else if (txt->baseline==TXT_BL_BOTTOM) {
+		cy = -descent;
+	} else if (txt->baseline==TXT_BL_MIDDLE) {
+		Fixed mid = (ascent + descent)/2;
+		cy = mid;
+	}
+
+	txt->path = gf_path_new();
+	nb_lines = gf_list_count(txt->spans);
+	for (i=0; i<nb_lines; i++) {
+		Fixed cx=0;
+		u32 flags;
+		GF_Path *path;
+		GF_Matrix2D mx;
+		GF_TextSpan *span = gf_list_get(txt->spans, i);
+		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))
+		) {
+			cx = 0;
+		}
+		else if ((txt->align == TXT_AL_RIGHT)
+		|| ((txt->align == TXT_AL_END) && !(span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT))
+		|| ((txt->align == TXT_AL_START) && (span->flags & GF_TEXT_SPAN_RIGHT_TO_LEFT))
+		) {
+			cx = txt->max_w - span->bounds.width;
+		} else if (txt->align == TXT_AL_CENTER) {
+			cx = (txt->max_w - span->bounds.width) / 2;
+		}
+		gf_mx2d_init(mx);
+
+		gf_mx2d_add_translation(&mx, cx, cy);
+		if (scale_x)
+			gf_mx2d_add_scale(&mx, scale_x, FIX_ONE);
+
+		flags = span->flags;
+		if (txt->path_for_centered) {
+			if (txt->flip)
+				span->flags |= GF_TEXT_SPAN_FLIP;
+		} else {
+			if (!txt->flip)
+				span->flags |= GF_TEXT_SPAN_FLIP;
+		}
+
+		path = gf_font_span_create_path(span);
+		gf_path_add_subpath(txt->path, path, &mx);
+		gf_path_del(path);
+		span->flags = flags;
+
+		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);
+}
+
+static void text_set_text_from_value(GF_JSText *txt, GF_Font *font, JSContext *c, JSValueConst value)
+{
+	const char *str = JS_ToCString(c, value);
+	char *start = (char *) str;
+	while (start) {
+		GF_TextSpan *span;
+		char *nline = strchr(str, '\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);
+		if (span) {
+			if (txt->horizontal)
+				span->flags |= GF_TEXT_SPAN_HORIZONTAL;
+			gf_list_add(txt->spans, span);
+		}
+
+		if (!nline) break;
+		nline[0] = '\n';
+		start = nline + 1;
+	}
+	JS_FreeCString(c, str);
+}
+
+static JSValue text_get_path(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue nobj;
+	Bool is_center = GF_TRUE;
+	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
+	if (!txt) return JS_EXCEPTION;
+	if (argc) is_center = JS_ToBool(c, argv[0]);
+
+	text_update_path(txt, is_center);
+	if (!txt->path) return JS_NULL;
+	nobj = JS_NewObjectClass(c, path_class_id);
+	JS_SetOpaque(nobj, gf_path_clone(txt->path));
+	return nobj;
+}
+
+static JSValue text_set_text(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	s32 i, j, nb_lines;
+	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
+	if (!txt) return JS_EXCEPTION;
+	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);
+
+	for (i=0; i<argc; i++) {
+		if (JS_IsArray(c, argv[i])) {
+			JSValue v = JS_GetPropertyStr(c, argv[i], "length");
+			JS_ToInt32(c, &nb_lines, v);
+			JS_FreeValue(c, v);
+
+			for (j=0; j<nb_lines; j++) {
+				v = JS_GetPropertyUint32(c, argv[i], j);
+				text_set_text_from_value(txt, txt->font, c, v);
+				JS_FreeValue(c, v);
+			}
+		} else {
+			text_set_text_from_value(txt, txt->font, c, argv[i]);
+		}
+	}
+
+	nb_lines = gf_list_count(txt->spans);
+	for (i=0; i<nb_lines; i++) {
+		GF_TextSpan *span = gf_list_get(txt->spans, i);
+		gf_font_manager_refresh_span_bounds(span);
+		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;
+		} else {
+			if (txt->min_x > span->bounds.x)
+				txt->min_x = span->bounds.x;
+			if (txt->min_y > span->bounds.y)
+				txt->min_y = span->bounds.y;
+			if (txt->max_w < span->bounds.width)
+				txt->max_w = span->bounds.width;
+			if (txt->max_h < span->bounds.height)
+				txt->max_h = span->bounds.height;
+			if (txt->max_x < span->bounds.x + span->bounds.width)
+				txt->max_x = span->bounds.x + span->bounds.width;
+			if (txt->max_y < span->bounds.y + span->bounds.height)
+				txt->max_y = span->bounds.y + span->bounds.height;
+		}
+	}
+
+	return JS_UNDEFINED;
+}
+
+static JSValue text_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	const char *str;
+	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
+	if (!txt) return JS_EXCEPTION;
+
+	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);
+		break;
+	case TXT_BASELINE:
+		if (JS_ToInt32(c, &txt->baseline, value)) return JS_EXCEPTION;
+		return JS_UNDEFINED;
+	case TXT_ALIGN:
+		if (JS_ToInt32(c, &txt->align, value)) return JS_EXCEPTION;
+		return JS_UNDEFINED;
+	case TXT_FONTSIZE:
+		if (JS_ToFloat64(c, &txt->font_size, value)) return JS_EXCEPTION;
+		break;
+	case TXT_HORIZ:
+		txt->horizontal = JS_ToBool(c, value);
+		break;
+	case TXT_FLIP:
+		txt->flip = JS_ToBool(c, value);
+		break;
+#define TOG_FLAG(_val) \
+		if (JS_ToBool(c, value)) \
+			txt->styles |= _val;\
+		else\
+			txt->styles &= ~_val;\
+
+
+	case TXT_UNDERLINED:
+		TOG_FLAG(GF_FONT_UNDERLINED);
+		break;
+	case TXT_ITALIC:
+		TOG_FLAG(GF_FONT_ITALIC);
+		break;
+	case TXT_BOLD:
+		TOG_FLAG(GF_FONT_WEIGHT_100);
+		break;
+	case TXT_STRIKEOUT:
+		TOG_FLAG(GF_FONT_STRIKEOUT);
+		break;
+	case TXT_SMALLCAP:
+		TOG_FLAG(GF_FONT_SMALLCAPS);
+		break;
+#undef TOG_FLAG
+
+	case TXT_MAX_WIDTH:
+		JS_ToFloat64(c, &txt->maxWidth, value);
+		break;
+	case TXT_LINESPACING:
+		JS_ToFloat64(c, &txt->lineSpacing, value);
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue text_measure(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	GF_JSText *txt = JS_GetOpaque(obj, text_class_id);
+	if (!txt) return JS_EXCEPTION;
+	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->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) );
+		JS_SetPropertyStr(c, res, "descent", JS_NewInt32(c, txt->font->descent) );
+		JS_SetPropertyStr(c, res, "line_spacing", JS_NewInt32(c, txt->font->line_spacing) );
+		JS_SetPropertyStr(c, res, "underlined", JS_NewInt32(c, txt->font->underline) );
+		JS_SetPropertyStr(c, res, "baseline", JS_NewInt32(c, txt->font->baseline) );
+		JS_SetPropertyStr(c, res, "max_advance_h", JS_NewInt32(c, txt->font->max_advance_h) );
+		JS_SetPropertyStr(c, res, "max_advance_v", JS_NewInt32(c, txt->font->max_advance_v) );
+	}
+	return res;
+}
+
+static const JSCFunctionListEntry text_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("font", text_getProperty, text_setProperty, TXT_FONT),
+	JS_CGETSET_MAGIC_DEF("fontsize", text_getProperty, text_setProperty, TXT_FONTSIZE),
+	JS_CGETSET_MAGIC_DEF("align", text_getProperty, text_setProperty, TXT_ALIGN),
+	JS_CGETSET_MAGIC_DEF("baseline", text_getProperty, text_setProperty, TXT_BASELINE),
+	JS_CGETSET_MAGIC_DEF("horizontal", text_getProperty, text_setProperty, TXT_HORIZ),
+	JS_CGETSET_MAGIC_DEF("flip", text_getProperty, text_setProperty, TXT_FLIP),
+	JS_CGETSET_MAGIC_DEF("underline", text_getProperty, text_setProperty, TXT_UNDERLINED),
+	JS_CGETSET_MAGIC_DEF("bold", text_getProperty, text_setProperty, TXT_BOLD),
+	JS_CGETSET_MAGIC_DEF("italic", text_getProperty, text_setProperty, TXT_ITALIC),
+	JS_CGETSET_MAGIC_DEF("maxWidth", text_getProperty, text_setProperty, TXT_MAX_WIDTH),
+	JS_CGETSET_MAGIC_DEF("lineSpacing", text_getProperty, text_setProperty, TXT_LINESPACING),
+	JS_CFUNC_DEF("set_text", 0, text_set_text),
+	JS_CFUNC_DEF("measure", 0, text_measure),
+	JS_CFUNC_DEF("get_path", 0, text_get_path),
+};
+
+JSClassDef text_class = {
+	"Text",
+	.finalizer = text_finalize
+};
+static JSValue text_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue obj;
+	GF_JSText *txt;
+	GF_SAFEALLOC(txt, GF_JSText);
+	if (!txt)
+		return js_throw_err(c, GF_OUT_OF_MEM);
+	txt->fm = jsf_get_font_manager(c);
+
+	if (!txt->fm) {
+		gf_free(txt);
+		return JS_EXCEPTION;
+	}
+	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);
+	}
+	txt->font_size = 12.0;
+	txt->horizontal = GF_TRUE;
+	txt->align = TXT_AL_START;
+	txt->baseline = TXT_BL_ALPHABETIC;
+
+	obj = JS_NewObjectClass(c, text_class_id);
+	if (JS_IsException(obj)) return obj;
+	JS_SetOpaque(obj, txt);
+	return obj;
+}
+
+
+
+enum
+{
+	MX_PROP_IDENTITY=0,
+	MX_PROP_YAW,
+	MX_PROP_PITCH,
+	MX_PROP_ROLL,
+	MX_PROP_TRANLATE,
+	MX_PROP_SCALE,
+	MX_PROP_ROTATE,
+	MX_PROP_SHEAR,
+	MX_PROP_M,
+};
+
+static void mx_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Matrix *mx = JS_GetOpaque(obj, matrix_class_id);
+	if (mx) gf_free(mx);
+}
+
+JSClassDef matrix_class = {
+	.class_name = "Matrix",
+	.finalizer = mx_finalize
+};
+
+#define MAKEVEC(_v) \
+		res = JS_NewObject(ctx);\
+		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, FIX2FLT(_v.x) ));\
+		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, FIX2FLT(_v.y) ));\
+		JS_SetPropertyStr(ctx, res, "z", JS_NewFloat64(ctx, FIX2FLT(_v.z) ));\
+		return res;\
+
+#define MAKEVEC4(_v) \
+		res = JS_NewObject(ctx);\
+		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, FIX2FLT(_v.x) ));\
+		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, FIX2FLT(_v.y) ));\
+		JS_SetPropertyStr(ctx, res, "z", JS_NewFloat64(ctx, FIX2FLT(_v.z) ));\
+		JS_SetPropertyStr(ctx, res, "w", JS_NewFloat64(ctx, FIX2FLT(_v.q) ));\
+		return res;\
+
+#define MAKERECT(_v) \
+		res = JS_NewObject(ctx);\
+		JS_SetPropertyStr(ctx, res, "x", JS_NewFloat64(ctx, FIX2FLT(_v.x) ));\
+		JS_SetPropertyStr(ctx, res, "y", JS_NewFloat64(ctx, FIX2FLT(_v.y) ));\
+		JS_SetPropertyStr(ctx, res, "width", JS_NewFloat64(ctx, FIX2FLT(_v.width) ));\
+		JS_SetPropertyStr(ctx, res, "height", JS_NewFloat64(ctx, FIX2FLT(_v.height) ));\
+		return res;\
+
+static JSValue mx_getProperty(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	JSValue res;
+	Fixed yaw, pitch, roll;
+	GF_Vec tr, sc, sh;
+	GF_Vec4 ro;
+	u32 i;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx) return JS_EXCEPTION;
+	switch (magic) {
+	case MX_PROP_IDENTITY: return JS_NewBool(ctx, gf_mx2d_is_identity(*mx));
+	case MX_PROP_YAW:
+		gf_mx_get_yaw_pitch_roll(mx, &yaw, &pitch, &roll);
+		return JS_NewFloat64(ctx, FIX2FLT(yaw));
+	case MX_PROP_PITCH:
+		gf_mx_get_yaw_pitch_roll(mx, &yaw, &pitch, &roll);
+		return JS_NewFloat64(ctx, FIX2FLT(pitch));
+	case MX_PROP_ROLL:
+		gf_mx_get_yaw_pitch_roll(mx, &yaw, &pitch, &roll);
+		return JS_NewFloat64(ctx, FIX2FLT(roll));
+
+	case MX_PROP_TRANLATE:
+		gf_mx_decompose(mx, &tr, &sc, &ro, &sh);
+		MAKEVEC(tr)
+
+	case MX_PROP_SCALE:
+		gf_mx_decompose(mx, &tr, &sc, &ro, &sh);
+		MAKEVEC(sc)
+
+	case MX_PROP_ROTATE:
+		gf_mx_decompose(mx, &tr, &sc, &ro, &sh);
+		MAKEVEC4(ro)
+
+	case MX_PROP_SHEAR:
+		gf_mx_decompose(mx, &tr, &sc, &ro, &sh);
+		MAKEVEC(sh)
+
+	case MX_PROP_M:
+		res = JS_NewArray(ctx);
+		for (i=0; i<16; i++)
+			JS_SetPropertyUint32(ctx, res, i, JS_NewFloat64(ctx, mx->m[i]));
+		return res;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue mx_setProperty(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+	JSValue v;
+	u32 i, len;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx) return JS_EXCEPTION;
+
+
+	switch (magic) {
+	case MX_PROP_IDENTITY:
+	 	gf_mx_init(*mx);
+	 	break;
+	case MX_PROP_M:
+		if (!JS_IsArray(ctx, value)) return JS_EXCEPTION;
+		v = JS_GetPropertyStr(ctx, value, "length");
+		len=0;
+		JS_ToInt32(ctx, &len, v);
+		JS_FreeValue(ctx, v);
+		if (len != 16) return JS_EXCEPTION;
+		for (i=0; i<len; i++) {
+			Double _d;
+			v = JS_GetPropertyUint32(ctx, value, i);
+			JS_ToFloat64(ctx, &_d, v);
+			JS_FreeValue(ctx, v);
+			mx->m[i] = FLT2FIX(_d);
+		}
+	 	break;
+	}
+	return JS_UNDEFINED;
+}
+
+
+static JSValue mx_copy(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;
+	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);
+}
+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;
+	GF_Matrix *mx2 = JS_GetOpaque(argv[0], matrix_class_id);
+	if (!mx2) return JS_EXCEPTION;
+	if (gf_mx_equal(mx, mx2)) return JS_TRUE;
+	return JS_FALSE;
+}
+
+#define WGL_GET_VEC3(_x, _y, _z, _arg)\
+{\
+	JSValue v;\
+	v = JS_GetPropertyStr(ctx, _arg, "x");\
+	EVG_GET_FLOAT(_x, v);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "y");\
+	EVG_GET_FLOAT(_y, v);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "z");\
+	EVG_GET_FLOAT(_z, v);\
+	JS_FreeValue(ctx, v);\
+}
+
+#define WGL_GET_VEC3F(_v, _arg)\
+{\
+	JSValue v;\
+	Double _f;\
+	v = JS_GetPropertyStr(ctx, _arg, "x");\
+	EVG_GET_FLOAT(_f, v);\
+	_v.x = FLT2FIX(_f);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "y");\
+	EVG_GET_FLOAT(_f, v);\
+	_v.y = FLT2FIX(_f);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "z");\
+	EVG_GET_FLOAT(_f, v);\
+	_v.z = FLT2FIX(_f);\
+	JS_FreeValue(ctx, v);\
+}
+
+#define WGL_GET_VEC4(_x, _y, _z, _q, _arg)\
+{\
+	JSValue v;\
+	v = JS_GetPropertyStr(ctx, _arg, "x");\
+	EVG_GET_FLOAT(_x, v);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "y");\
+	EVG_GET_FLOAT(_y, v);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "z");\
+	EVG_GET_FLOAT(_z, v);\
+	JS_FreeValue(ctx, v);\
+	v = JS_GetPropertyStr(ctx, _arg, "w");\
+	if (JS_IsUndefined(v)) v = JS_GetPropertyStr(ctx, _arg, "q");\
+	if (JS_IsUndefined(v)) v = JS_GetPropertyStr(ctx, _arg, "angle");\
+	EVG_GET_FLOAT(_q, v);\
+	JS_FreeValue(ctx, v);\
+}
+
+
+static JSValue mx_translate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Double vx, vy, vz;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx || !argc) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) {
+		if (argc<3) return JS_EXCEPTION;
+		EVG_GET_FLOAT(vx, argv[0])
+		EVG_GET_FLOAT(vy, argv[1])
+		EVG_GET_FLOAT(vz, argv[2])
+	} else {
+		WGL_GET_VEC3(vx, vy, vz, argv[0])
+	}
+	gf_mx_add_translation(mx, FLT2FIX(vx), FLT2FIX(vy), FLT2FIX(vz));
+	return JS_DupValue(ctx, this_val);
+}
+static JSValue mx_scale(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Double vx, vy, vz;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx || !argc) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) {
+		if (argc<3) return JS_EXCEPTION;
+		EVG_GET_FLOAT(vx, argv[0])
+		EVG_GET_FLOAT(vy, argv[1])
+		EVG_GET_FLOAT(vz, argv[2])
+	} else {
+		WGL_GET_VEC3(vx, vy, vz, argv[0])
+	}
+	gf_mx_add_scale(mx, FLT2FIX(vx), FLT2FIX(vy), FLT2FIX(vz));
+	return JS_DupValue(ctx, this_val);
+}
+static JSValue mx_rotate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Double vx, vy, vz, angle;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx || !argc) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) {
+		if (argc<4) return JS_EXCEPTION;
+		EVG_GET_FLOAT(vx, argv[0])
+		EVG_GET_FLOAT(vy, argv[1])
+		EVG_GET_FLOAT(vz, argv[2])
+		EVG_GET_FLOAT(angle, argv[3])
+	} else {
+		WGL_GET_VEC4(vx, vy, vz, angle, argv[0])
+	}
+	gf_mx_add_rotation(mx, FLT2FIX(angle), FLT2FIX(vx), FLT2FIX(vy), FLT2FIX(vz));
+	return JS_DupValue(ctx, this_val);
+}
+static JSValue mx_add(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;
+	GF_Matrix *mx2 = JS_GetOpaque(argv[0], matrix_class_id);
+	if (!mx2) return JS_EXCEPTION;
+	if ((argc>1) && JS_ToBool(ctx, argv[1])) {
+		gf_mx_add_matrix_4x4(mx, mx2);
+	} else {
+		gf_mx_add_matrix(mx, 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 (argc && JS_ToBool(ctx, argv[0])) {
+		gf_mx_inverse_4x4(mx);
+	} else {
+		gf_mx_inverse(mx);
+	}
+	return JS_DupValue(ctx, this_val);
+}
+
+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;
+	gf_mx_transpose(mx);
+	return JS_DupValue(ctx, this_val);
+}
+
+static JSValue mx_apply(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Fixed width, height, x, y;
+	GF_Vec pt;
+	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;
+
+	/*try rect*/
+	v = JS_GetPropertyStr(ctx, argv[0], "width");
+	if (!JS_IsUndefined(v)) {
+		GF_Rect rc;
+		EVG_GET_FLOAT(width, v);
+		JS_FreeValue(ctx, v);
+		v = JS_GetPropertyStr(ctx, argv[0], "height");
+		EVG_GET_FLOAT(height, v);
+		JS_FreeValue(ctx, v);
+		v = JS_GetPropertyStr(ctx, argv[0], "x");
+		EVG_GET_FLOAT(x, v);
+		JS_FreeValue(ctx, v);
+		v = JS_GetPropertyStr(ctx, argv[0], "y");
+		EVG_GET_FLOAT(y, v);
+		JS_FreeValue(ctx, v);
+		rc.x = FLT2FIX(x);
+		rc.y = FLT2FIX(y);
+		rc.width = FLT2FIX(width);
+		rc.height = FLT2FIX(height);
+		gf_mx_apply_rect(mx, &rc);
+		MAKERECT(rc)
+	}
+	JS_FreeValue(ctx, v);
+
+	v = JS_GetPropertyStr(ctx, argv[0], "q");
+	if (JS_IsUndefined(v)) v = JS_GetPropertyStr(ctx, argv[0], "w");
+	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;
+		pt4.q = FLT2FIX(_v);
+
+		WGL_GET_VEC3F(pt4, argv[0])
+		gf_mx_apply_vec_4x4(mx, &pt4);
+		MAKEVEC4(pt4)
+	}
+	JS_FreeValue(ctx, v);
+
+	/*try bbox ?*/
+
+	/*try vec*/
+	WGL_GET_VEC3F(pt, argv[0])
+	gf_mx_apply_vec(mx, &pt);
+	MAKEVEC(pt)
+
+/*
+
+void gf_mx_apply_vec(GF_Matrix *mx, GF_Vec *pt);
+void gf_mx_apply_rect(GF_Matrix *_this, GF_Rect *rc);
+void gf_mx_apply_bbox(GF_Matrix *mx, GF_BBox *b);
+void gf_mx_apply_bbox_sphere(GF_Matrix *mx, GF_BBox *box);
+void gf_mx_apply_vec_4x4(GF_Matrix *mx, GF_Vec4 *vec);
+*/
+	return JS_UNDEFINED;
+}
+
+static JSValue mx_ortho(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+	EVG_GET_FLOAT(left, argv[0])
+	EVG_GET_FLOAT(right, argv[1])
+	EVG_GET_FLOAT(bottom, argv[2])
+	EVG_GET_FLOAT(top, argv[3])
+	EVG_GET_FLOAT(z_near, argv[4])
+	EVG_GET_FLOAT(z_far, argv[5])
+	if ((argc>6) && JS_ToBool(ctx, argv[6])) {
+		gf_mx_ortho_reverse_z(mx, FLT2FIX(left), FLT2FIX(right), FLT2FIX(bottom), FLT2FIX(top), FLT2FIX(z_near), FLT2FIX(z_far));
+	} else {
+		gf_mx_ortho(mx, FLT2FIX(left), FLT2FIX(right), FLT2FIX(bottom), FLT2FIX(top), FLT2FIX(z_near), FLT2FIX(z_far));
+	}
+	return JS_DupValue(ctx, this_val);
+}
+static JSValue mx_perspective(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Double fov, ar, z_near, z_far;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx || (argc<4)) return JS_EXCEPTION;
+	EVG_GET_FLOAT(fov, argv[0])
+	EVG_GET_FLOAT(ar, argv[1])
+	EVG_GET_FLOAT(z_near, argv[2])
+	EVG_GET_FLOAT(z_far, argv[3])
+	if ((argc>4) && JS_ToBool(ctx, argv[4])) {
+		gf_mx_perspective_reverse_z(mx, FLT2FIX(fov), FLT2FIX(ar), FLT2FIX(z_near), FLT2FIX(z_far));
+	} else {
+		gf_mx_perspective(mx, FLT2FIX(fov), FLT2FIX(ar), FLT2FIX(z_near), FLT2FIX(z_far));
+	}
+	return JS_DupValue(ctx, this_val);
+}
+static JSValue mx_lookat(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Vec pos, target, up;
+	GF_Matrix *mx = JS_GetOpaque(this_val, matrix_class_id);
+	if (!mx || (argc<3) ) return JS_EXCEPTION;
+
+	WGL_GET_VEC3F(pos, argv[0]);
+	WGL_GET_VEC3F(target, argv[1]);
+	WGL_GET_VEC3F(up, argv[2]);
+
+	gf_mx_lookat(mx, pos, target, up);
+	return JS_DupValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry mx_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("identity", mx_getProperty, mx_setProperty, MX_PROP_IDENTITY),
+	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),
+	JS_CGETSET_MAGIC_DEF("roll", mx_getProperty, NULL, MX_PROP_ROLL),
+	JS_CGETSET_MAGIC_DEF("dec_translate", mx_getProperty, NULL, MX_PROP_TRANLATE),
+	JS_CGETSET_MAGIC_DEF("dec_scale", mx_getProperty, NULL, MX_PROP_SCALE),
+	JS_CGETSET_MAGIC_DEF("dec_rotate", mx_getProperty, NULL, MX_PROP_ROTATE),
+	JS_CGETSET_MAGIC_DEF("dec_shear", mx_getProperty, NULL, MX_PROP_SHEAR),
+	JS_CFUNC_DEF("copy", 0, mx_copy),
+	JS_CFUNC_DEF("equal", 0, mx_equal),
+	JS_CFUNC_DEF("translate", 0, mx_translate),
+	JS_CFUNC_DEF("scale", 0, mx_scale),
+	JS_CFUNC_DEF("rotate", 0, mx_rotate),
+	JS_CFUNC_DEF("add", 0, mx_add),
+	JS_CFUNC_DEF("inverse", 0, mx_inverse),
+	JS_CFUNC_DEF("transpose", 0, mx_transpose),
+	JS_CFUNC_DEF("apply", 0, mx_apply),
+	JS_CFUNC_DEF("ortho", 0, mx_ortho),
+	JS_CFUNC_DEF("perspective", 0, mx_perspective),
+	JS_CFUNC_DEF("lookat", 0, mx_lookat),
+};
+/*
+void gf_mx_rotate_vector(GF_Matrix *mx, GF_Vec *pt);
+*/
+
+static JSValue mx_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	GF_Matrix *mx;
+	GF_SAFEALLOC(mx, GF_Matrix);
+	if (!mx)
+		return js_throw_err(ctx, GF_OUT_OF_MEM);
+	gf_mx_init(*mx);
+	res = JS_NewObjectClass(ctx, matrix_class_id);
+	JS_SetOpaque(res, mx);
+	if (argc) {
+		GF_Matrix *from = JS_GetOpaque(argv[0], matrix_class_id);
+		if (from) {
+			gf_mx_copy(*mx, *from);
+		} else if (argc>=3) {
+			GF_Vec x_axis, y_axis, z_axis;
+			WGL_GET_VEC3F(x_axis, argv[0])
+			WGL_GET_VEC3F(y_axis, argv[1])
+			WGL_GET_VEC3F(z_axis, argv[2])
+			gf_mx_rotation_matrix_from_vectors(mx, x_axis, y_axis,z_axis);
+		}
+	}
+	return res;
+}
+
+
+static JSValue evg_pixel_size(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 pfmt=0;
+	if (!argc) return js_throw_err_msg(ctx, GF_BAD_PARAM, "missing pixel format parameter");
+	if (JS_IsString(argv[0])) {
+		const char *s = JS_ToCString(ctx, argv[0]);
+		if (s) {
+			pfmt = gf_pixel_fmt_parse(s);
+			JS_FreeCString(ctx, s);
+		}
+	} else if (JS_IsNumber(argv[0])) {
+		JS_ToInt32(ctx, &pfmt, argv[0]);
+	}
+	if (!pfmt) return js_throw_err_msg(ctx, GF_BAD_PARAM, "missing pixel format parameter");
+	return JS_NewInt32(ctx, gf_pixel_get_bytes_per_pixel(pfmt));
+}
+
+
+static int js_evg_load_module(JSContext *c, JSModuleDef *m)
+{
+	JSValue ctor;
+	JSValue proto;
+	JSValue global;
+
+	if (!canvas_class_id) {
+		JSRuntime *rt = JS_GetRuntime(c);
+
+		JS_NewClassID(&canvas_class_id);
+		JS_NewClass(rt, canvas_class_id, &canvas_class);
+
+		JS_NewClassID(&path_class_id);
+		JS_NewClass(rt, path_class_id, &path_class);
+
+		JS_NewClassID(&mx2d_class_id);
+		JS_NewClass(rt, mx2d_class_id, &mx2d_class);
+
+		JS_NewClassID(&colmx_class_id);
+		JS_NewClass(rt, colmx_class_id, &colmx_class);
+
+		JS_NewClassID(&stencil_class_id);
+		JS_NewClass(rt, stencil_class_id, &stencil_class);
+
+		JS_NewClassID(&texture_class_id);
+		JS_NewClass(rt, texture_class_id, &texture_class);
+
+		JS_NewClassID(&text_class_id);
+		JS_NewClass(rt, text_class_id, &text_class);
+
+		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);
+
+		JS_NewClassID(&shader_class_id);
+		JS_NewClass(rt, shader_class_id, &shader_class);
+
+		JS_NewClassID(&vai_class_id);
+		JS_NewClass(rt, vai_class_id, &vai_class);
+
+		JS_NewClassID(&va_class_id);
+		JS_NewClass(rt, va_class_id, &va_class);
+
+#ifdef EVG_USE_JS_SHADER
+		JS_NewClassID(&fragment_class_id);
+		JS_NewClass(rt, fragment_class_id, &fragment_class);
+
+		JS_NewClassID(&vertex_class_id);
+		JS_NewClass(rt, vertex_class_id, &vertex_class);
+
+		JS_NewClassID(&vaires_class_id);
+		JS_NewClass(rt, vaires_class_id, &vaires_class);
+#endif// EVG_USE_JS_SHADER
+
+	}
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, canvas_funcs, countof(canvas_funcs));
+    JS_SetClassProto(c, canvas_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, path_funcs, countof(path_funcs));
+    JS_SetClassProto(c, path_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, mx2d_funcs, countof(mx2d_funcs));
+    JS_SetClassProto(c, mx2d_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, colmx_funcs, countof(colmx_funcs));
+    JS_SetClassProto(c, colmx_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, stencil_funcs, countof(stencil_funcs));
+    JS_SetClassProto(c, stencil_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, texture_funcs, countof(texture_funcs));
+    JS_SetClassProto(c, texture_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, text_funcs, countof(text_funcs));
+    JS_SetClassProto(c, text_class_id, proto);
+
+	proto = JS_NewObject(c);
+    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));
+    JS_SetClassProto(c, fragment_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, vertex_funcs, countof(vertex_funcs));
+    JS_SetClassProto(c, vertex_class_id, proto);
+
+	proto = JS_NewObject(c);
+	JS_SetPropertyFunctionList(c, proto, vaires_funcs, countof(vaires_funcs));
+	JS_SetClassProto(c, vaires_class_id, proto);
+#endif
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, shader_funcs, countof(shader_funcs));
+    JS_SetClassProto(c, shader_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, vai_funcs, countof(vai_funcs));
+    JS_SetClassProto(c, vai_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, va_funcs, countof(va_funcs));
+    JS_SetClassProto(c, va_class_id, proto);
+
+
+	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_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));
+	JS_SetPropertyStr(c, global, "GF_TEXTURE_FILTER_MID", JS_NewInt32(c, GF_TEXTURE_FILTER_MID));
+	JS_SetPropertyStr(c, global, "GF_TEXTURE_FILTER_HIGH_QUALITY", JS_NewInt32(c, GF_TEXTURE_FILTER_HIGH_QUALITY));
+
+	JS_SetPropertyStr(c, global, "GF_PATH2D_ARC_OPEN", JS_NewInt32(c, GF_PATH2D_ARC_OPEN));
+	JS_SetPropertyStr(c, global, "GF_PATH2D_ARC_OPEN", JS_NewInt32(c, GF_PATH2D_ARC_OPEN));
+	JS_SetPropertyStr(c, global, "GF_PATH2D_ARC_PIE", JS_NewInt32(c, GF_PATH2D_ARC_PIE));
+
+	JS_SetPropertyStr(c, global, "GF_PATH_LINE_CENTER", JS_NewInt32(c, GF_PATH_LINE_CENTER));
+	JS_SetPropertyStr(c, global, "GF_PATH_LINE_INSIDE", JS_NewInt32(c, GF_PATH_LINE_INSIDE));
+	JS_SetPropertyStr(c, global, "GF_PATH_LINE_OUTSIDE", JS_NewInt32(c, GF_PATH_LINE_OUTSIDE));
+	JS_SetPropertyStr(c, global, "GF_LINE_CAP_FLAT", JS_NewInt32(c, GF_LINE_CAP_FLAT));
+	JS_SetPropertyStr(c, global, "GF_LINE_CAP_ROUND", JS_NewInt32(c, GF_LINE_CAP_ROUND));
+	JS_SetPropertyStr(c, global, "GF_LINE_CAP_SQUARE", JS_NewInt32(c, GF_LINE_CAP_SQUARE));
+	JS_SetPropertyStr(c, global, "GF_LINE_CAP_TRIANGLE", JS_NewInt32(c, GF_LINE_CAP_TRIANGLE));
+	JS_SetPropertyStr(c, global, "GF_LINE_JOIN_MITER", JS_NewInt32(c, GF_LINE_JOIN_MITER));
+	JS_SetPropertyStr(c, global, "GF_LINE_JOIN_ROUND", JS_NewInt32(c, GF_LINE_JOIN_ROUND));
+	JS_SetPropertyStr(c, global, "GF_LINE_JOIN_BEVEL", JS_NewInt32(c, GF_LINE_JOIN_BEVEL));
+	JS_SetPropertyStr(c, global, "GF_LINE_JOIN_MITER_SVG", JS_NewInt32(c, GF_LINE_JOIN_MITER_SVG));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_PLAIN", JS_NewInt32(c, GF_DASH_STYLE_PLAIN));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DASH", JS_NewInt32(c, GF_DASH_STYLE_DASH));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DOT", JS_NewInt32(c, GF_DASH_STYLE_DOT));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DASH_DOT", JS_NewInt32(c, GF_DASH_STYLE_DASH_DOT));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DASH_DASH_DOT", JS_NewInt32(c, GF_DASH_STYLE_DASH_DASH_DOT));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_DASH_DOT_DOT", JS_NewInt32(c, GF_DASH_STYLE_DASH_DOT_DOT));
+	JS_SetPropertyStr(c, global, "GF_DASH_STYLE_SVG", JS_NewInt32(c, GF_DASH_STYLE_SVG));
+
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_TOP", JS_NewInt32(c, TXT_BL_TOP));
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_HANGING", JS_NewInt32(c, TXT_BL_HANGING));
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_MIDDLE", JS_NewInt32(c, TXT_BL_MIDDLE));
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_ALPHABETIC", JS_NewInt32(c, TXT_BL_ALPHABETIC));
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_IDEOGRAPHIC", JS_NewInt32(c, TXT_BL_IDEOGRAPHIC));
+	JS_SetPropertyStr(c, global, "GF_TEXT_BASELINE_BOTTOM", JS_NewInt32(c, TXT_BL_BOTTOM));
+
+	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_START", JS_NewInt32(c, TXT_AL_START));
+	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_END", JS_NewInt32(c, TXT_AL_END));
+	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_LEFT", JS_NewInt32(c, TXT_AL_LEFT));
+	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_RIGHT", JS_NewInt32(c, TXT_AL_RIGHT));
+	JS_SetPropertyStr(c, global, "GF_TEXT_ALIGN_CENTER", JS_NewInt32(c, TXT_AL_CENTER));
+
+	JS_SetPropertyStr(c, global, "GF_EVG_SRC_ATOP", JS_NewInt32(c, GF_EVG_SRC_ATOP));
+	JS_SetPropertyStr(c, global, "GF_EVG_SRC_IN", JS_NewInt32(c, GF_EVG_SRC_IN));
+	JS_SetPropertyStr(c, global, "GF_EVG_SRC_OUT", JS_NewInt32(c, GF_EVG_SRC_OUT));
+	JS_SetPropertyStr(c, global, "GF_EVG_SRC_OVER", JS_NewInt32(c, GF_EVG_SRC_OVER));
+	JS_SetPropertyStr(c, global, "GF_EVG_DST_ATOP", JS_NewInt32(c, GF_EVG_DST_ATOP));
+	JS_SetPropertyStr(c, global, "GF_EVG_DST_IN", JS_NewInt32(c, GF_EVG_DST_IN));
+	JS_SetPropertyStr(c, global, "GF_EVG_DST_OUT", JS_NewInt32(c, GF_EVG_DST_OUT));
+	JS_SetPropertyStr(c, global, "GF_EVG_DST_OVER", JS_NewInt32(c, GF_EVG_DST_OVER));
+	JS_SetPropertyStr(c, global, "GF_EVG_LIGHTER", JS_NewInt32(c, GF_EVG_LIGHTER));
+	JS_SetPropertyStr(c, global, "GF_EVG_COPY", JS_NewInt32(c, GF_EVG_COPY));
+	JS_SetPropertyStr(c, global, "GF_EVG_XOR", JS_NewInt32(c, GF_EVG_XOR));
+
+	JS_SetPropertyStr(c, global, "GF_EVG_POINTS", JS_NewInt32(c, GF_EVG_POINTS));
+	JS_SetPropertyStr(c, global, "GF_EVG_POLYGON", JS_NewInt32(c, GF_EVG_POLYGON));
+	JS_SetPropertyStr(c, global, "GF_EVG_LINES", JS_NewInt32(c, GF_EVG_LINES));
+	JS_SetPropertyStr(c, global, "GF_EVG_TRIANGLES", JS_NewInt32(c, GF_EVG_TRIANGLES));
+	JS_SetPropertyStr(c, global, "GF_EVG_QUADS", JS_NewInt32(c, GF_EVG_QUADS));
+	JS_SetPropertyStr(c, global, "GF_EVG_LINE_STRIP", JS_NewInt32(c, GF_EVG_LINE_STRIP));
+	JS_SetPropertyStr(c, global, "GF_EVG_TRIANGLE_STRIP", JS_NewInt32(c, GF_EVG_TRIANGLE_STRIP));
+	JS_SetPropertyStr(c, global, "GF_EVG_TRIANGLE_FAN", JS_NewInt32(c, GF_EVG_TRIANGLE_FAN));
+
+	JS_SetPropertyStr(c, global, "GF_EVG_SHADER_FRAGMENT", JS_NewInt32(c, GF_EVG_SHADER_FRAGMENT));
+	JS_SetPropertyStr(c, global, "GF_EVG_SHADER_VERTEX", JS_NewInt32(c, GF_EVG_SHADER_VERTEX));
+
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_NEVER", JS_NewInt32(c, GF_EVGDEPTH_NEVER));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_ALWAYS", JS_NewInt32(c, GF_EVGDEPTH_ALWAYS));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_ALWAYS", JS_NewInt32(c, GF_EVGDEPTH_ALWAYS));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_EQUAL", JS_NewInt32(c, GF_EVGDEPTH_EQUAL));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_NEQUAL", JS_NewInt32(c, GF_EVGDEPTH_NEQUAL));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_LESS", JS_NewInt32(c, GF_EVGDEPTH_LESS));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_LESS_EQUAL", JS_NewInt32(c, GF_EVGDEPTH_LESS_EQUAL));
+	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_VAI_VERTEX_INDEX", JS_NewInt32(c, GF_EVG_VAI_VERTEX_INDEX));
+	JS_SetPropertyStr(c, global, "GF_EVG_VAI_VERTEX", JS_NewInt32(c, GF_EVG_VAI_VERTEX));
+	JS_SetPropertyStr(c, global, "GF_EVG_VAI_PRIMITIVE", JS_NewInt32(c, GF_EVG_VAI_PRIMITIVE));
+
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_DISABLE", JS_NewInt32(c, GF_EVGDEPTH_DISABLE));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_NEVER", JS_NewInt32(c, GF_EVGDEPTH_NEVER));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_ALWAYS", JS_NewInt32(c, GF_EVGDEPTH_ALWAYS));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_EQUAL", JS_NewInt32(c, GF_EVGDEPTH_EQUAL));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_NEQUAL", JS_NewInt32(c, GF_EVGDEPTH_NEQUAL));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_LESS", JS_NewInt32(c, GF_EVGDEPTH_LESS));
+	JS_SetPropertyStr(c, global, "GF_EVGDEPTH_LESS_EQUAL", JS_NewInt32(c, GF_EVGDEPTH_LESS_EQUAL));
+	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_FreeValue(c, global);
+
+
+	/*export constructors*/
+	ctor = JS_NewCFunction2(c, canvas_constructor, "Canvas", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "Canvas", ctor);
+	ctor = JS_NewCFunction2(c, path_constructor, "Path", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "Path", ctor);
+	ctor = JS_NewCFunction2(c, mx2d_constructor, "Matrix2D", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "Matrix2D", ctor);
+	ctor = JS_NewCFunction2(c, colmx_constructor, "ColorMatrix", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "ColorMatrix", ctor);
+	ctor = JS_NewCFunction2(c, solid_brush_constructor, "SolidBrush", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "SolidBrush", ctor);
+	ctor = JS_NewCFunction2(c, linear_gradient_constructor, "LinearGradient", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "LinearGradient", ctor);
+	ctor = JS_NewCFunction2(c, radial_gradient_constructor, "RadialGradient", 1, JS_CFUNC_constructor, 0);
+    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);
+    JS_SetModuleExport(c, m, "Matrix", ctor);
+	ctor = JS_NewCFunction2(c, vai_constructor, "VertexAttribInterpolator", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "VertexAttribInterpolator", ctor);
+	ctor = JS_NewCFunction2(c, va_constructor, "VertexAttrib", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "VertexAttrib", ctor);
+
+	ctor = JS_NewCFunction2(c, evg_pixel_size, "PixelSize", 1, JS_CFUNC_generic, 0);
+    JS_SetModuleExport(c, m, "PixelSize", ctor);
+
+	return 0;
+}
+
+void qjs_module_init_evg(JSContext *ctx)
+{
+	JSModuleDef *m;
+	m = JS_NewCModule(ctx, "evg", js_evg_load_module);
+	if (!m) return;
+
+	JS_AddModuleExport(ctx, m, "Canvas");
+	JS_AddModuleExport(ctx, m, "Path");
+	JS_AddModuleExport(ctx, m, "Matrix2D");
+	JS_AddModuleExport(ctx, m, "ColorMatrix");
+	JS_AddModuleExport(ctx, m, "SolidBrush");
+	JS_AddModuleExport(ctx, m, "LinearGradient");
+	JS_AddModuleExport(ctx, m, "RadialGradient");
+	JS_AddModuleExport(ctx, m, "Texture");
+	JS_AddModuleExport(ctx, m, "Text");
+	JS_AddModuleExport(ctx, m, "Matrix");
+	JS_AddModuleExport(ctx, m, "Canvas3D");
+    JS_AddModuleExport(ctx, m, "VertexAttribInterpolator");
+    JS_AddModuleExport(ctx, m, "VertexAttrib");
+    JS_AddModuleExport(ctx, m, "PixelSize");
+    return;
+}
+
+
+#endif
+

gpac-1.0.0.tar.gz/src/jsmods/scene_js.c Added

@@ -0,0 +1,2162 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2007-2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / JavaScript Compositor extensions
+ *
+ *  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/setup.h>
+
+#ifdef GPAC_HAS_QJS
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/nodes_x3d.h>
+/*dom events*/
+#include <gpac/events.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/options.h>
+#include <gpac/xml.h>
+
+
+#include <gpac/internal/scenegraph_dev.h>
+
+#include "../scenegraph/qjs_common.h"
+
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/term_info.h>
+
+#define GPAC_JS_RTI_REFRESH_RATE	200
+
+
+typedef struct
+{
+	GF_Compositor *compositor;
+	JSValue evt_fun;
+	GF_FSEventListener evt_filter;
+	GF_Event *evt;
+
+	JSContext *c;
+	JSValue evt_filter_obj, evt_obj, gpac_obj;
+
+	u32 rti_refresh_rate;
+	GF_SystemRTInfo rti;
+
+	//list of config files for storage
+	GF_List *storages;
+
+	GF_List *event_queue;
+	GF_Mutex *event_mx;
+
+} GF_GPACJSExt;
+
+enum {
+	GJS_OM_PROP_ID=1,
+	GJS_OM_PROP_NB_RES,
+	GJS_OM_PROP_URL,
+	GJS_OM_PROP_DUR,
+	GJS_OM_PROP_CLOCK,
+	GJS_OM_PROP_DRIFT,
+	GJS_OM_PROP_STATUS,
+	GJS_OM_PROP_BUFFER,
+	GJS_OM_PROP_DB_COUNT,
+	GJS_OM_PROP_CB_COUNT,
+	GJS_OM_PROP_CB_CAP,
+	GJS_OM_PROP_TYPE,
+	GJS_OM_PROP_SAMPLERATE,
+	GJS_OM_PROP_CHANNELS,
+	GJS_OM_PROP_LANG,
+	GJS_OM_PROP_WIDTH,
+	GJS_OM_PROP_HEIGHT,
+	GJS_OM_PROP_PIXELFORMAT,
+	GJS_OM_PROP_PAR,
+	GJS_OM_PROP_DEC_FRAMES,
+	GJS_OM_PROP_DROP_FRAMES,
+	GJS_OM_PROP_DEC_TIME_MAX,
+	GJS_OM_PROP_DEC_TIME_TOTAL,
+	GJS_OM_PROP_AVG_RATE,
+	GJS_OM_PROP_MAX_RATE,
+	GJS_OM_PROP_SERVICE_HANDLER,
+	GJS_OM_PROP_CODEC,
+	GJS_OM_PROP_NB_QUALITIES,
+	GJS_OM_PROP_MAX_BUFFER,
+	GJS_OM_PROP_MIN_BUFFER,
+	GJS_OM_PROP_FRAME_DUR,
+	GJS_OM_PROP_NB_IRAP,
+	GJS_OM_PROP_IRAP_DEC_TIME,
+	GJS_OM_PROP_IRAP_MAX_TIME,
+	GJS_OM_PROP_SERVICE_ID,
+	GJS_OM_PROP_SELECTED_SERVICE,
+	GJS_OM_PROP_BANDWIDTH_DOWN,
+	GJS_OM_PROP_NB_HTTP,
+	GJS_OM_PROP_TIMESHIFT_DEPTH,
+	GJS_OM_PROP_TIMESHIFT_TIME,
+	GJS_OM_PROP_IS_ADDON,
+	GJS_OM_PROP_MAIN_ADDON_ON,
+	GJS_OM_PROP_IS_OVER,
+	GJS_OM_PROP_IS_VR_SCENE,
+	GJS_OM_PROP_DYNAMIC_SCENE,
+	GJS_OM_PROP_SERVICE_NAME,
+	GJS_OM_PROP_NTP_DIFF,
+	GJS_OM_PROP_MAIN_ADDON_URL,
+	GJS_OM_PROP_REVERSE_PLAYBACK,
+	GJS_OM_PROP_SCALABLE_ENHANCEMENT,
+	GJS_OM_PROP_MAIN_ADDON_MEDIATIME,
+	GJS_OM_PROP_DEPENDENT_GROUPS,
+	GJS_OM_PROP_DISABLED,
+	GJS_OM_PROP_NTP_SENDER_DIFF,
+};
+
+enum {
+	GJS_GPAC_PROP_LAST_WORK_DIR=1,
+	GJS_GPAC_PROP_BATTERY_ON,
+	GJS_GPAC_PROP_BATTERY_CHARGE,
+	GJS_GPAC_PROP_BATTERY_PERCENT,
+	GJS_GPAC_PROP_BATTERY_LIFETIME,
+	GJS_GPAC_PROP_BATTERY_LIFETIME_FULL,
+	GJS_GPAC_PROP_HOSTNAME,
+	GJS_GPAC_PROP_FULLSCREEN,
+	GJS_GPAC_PROP_CURRENT_PATH,
+	GJS_GPAC_PROP_VOLUME,
+	GJS_GPAC_PROP_NAVIGATION,
+	GJS_GPAC_PROP_NAVIGATION_TYPE,
+	GJS_GPAC_PROP_HARDWARE_YUV,
+	GJS_GPAC_PROP_HARDWARE_RGB,
+	GJS_GPAC_PROP_HARDWARE_RGBA,
+	GJS_GPAC_PROP_HARDWARE_STRETCH,
+	GJS_GPAC_PROP_SCREEN_WIDTH,
+	GJS_GPAC_PROP_SCREEN_HEIGHT,
+	GJS_GPAC_PROP_HTTP_MAX_RATE,
+	GJS_GPAC_PROP_HTTP_RATE,
+	GJS_GPAC_PROP_FPS,
+	GJS_GPAC_PROP_CPU,
+	GJS_GPAC_PROP_NB_CORES,
+	GJS_GPAC_PROP_MEMORY_SYSTEM,
+	GJS_GPAC_PROP_MEMORY,
+	GJS_GPAC_PROP_ARGC,
+	GJS_GPAC_PROP_CAPTION,
+	GJS_GPAC_PROP_FOCUS_HIGHLIGHT,
+	GJS_GPAC_PROP_DPI_X,
+	GJS_GPAC_PROP_DPI_Y,
+	GJS_GPAC_PROP_SENSORS_ACTIVE,
+	GJS_GPAC_PROP_SIM_FPS,
+	GJS_GPAC_PROP_HAS_OPENGL,
+	GJS_GPAC_PROP_ZOOM,
+	GJS_GPAC_PROP_TEXT_SEL,
+
+};
+
+enum {
+	GJS_EVT_PROP_KEYCODE = 1,
+	GJS_EVT_PROP_MOUSE_X,
+	GJS_EVT_PROP_MOUSE_Y,
+	GJS_EVT_PROP_PICKED,
+	GJS_EVT_PROP_WHEEL,
+	GJS_EVT_PROP_BUTTON,
+	GJS_EVT_PROP_TYPE,
+	GJS_EVT_PROP_NAME,
+	GJS_EVT_PROP_HWKEY,
+	GJS_EVT_PROP_TARGET_URL,
+	GJS_EVT_PROP_FILES,
+};
+
+static JSClassID gpac_class_id = 0;
+static JSClassID odm_class_id = 0;
+static JSClassID gpacevt_class_id = 0;
+static JSClassID any_class_id = 0;
+
+static void gpac_js_finalize(JSRuntime *rt, JSValue obj);
+
+static void gpac_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+	GF_GPACJSExt *ext = JS_GetOpaque(val, gpac_class_id);
+    if (ext) {
+		JS_MarkValue(rt, ext->evt_fun, mark_func);
+    }
+}
+
+JSClassDef gpacClass = {
+    "JSGPAC",
+    .finalizer = gpac_js_finalize,
+    .gc_mark = gpac_gc_mark
+};
+JSClassDef gpacEvtClass = {
+    "GPACEVT"
+};
+JSClassDef odmClass = {
+    "MediaObject"
+};
+JSClassDef anyClass = {
+	"GPACOBJECT"
+};
+
+
+static GF_Compositor *gpac_get_compositor(JSContext *c, JSValue obj)
+{
+	GF_GPACJSExt *ext = JS_GetOpaque(obj, gpac_class_id);
+	return ext ? ext->compositor : NULL;
+}
+
+static JSValue gpac_getProperty(JSContext *ctx, JSValueConst this_val, int prop_id)
+{
+	Bool bval;
+	u32  uval;
+	JSValue ret;
+	char *str;
+	const char *res;
+	GF_GPACJSExt *ext = JS_GetOpaque(this_val, gpac_class_id);
+	GF_Compositor *compositor = ext ? ext->compositor : NULL;
+	if (!ext || !compositor) return JS_EXCEPTION;
+
+	switch (prop_id) {
+	case GJS_GPAC_PROP_LAST_WORK_DIR:
+		res = gf_opts_get_key("General", "LastWorkingDir");
+		if (!res) res = gf_opts_get_key("core", "mod-dirs");
+#ifdef WIN32
+		if (!res) res = "C:\\";
+#elif defined(GPAC_CONFIG_DARWIN)
+		if (!res) res = "/Users";
+#else
+		if (!res) res = "/home/";
+#endif
+		return JS_NewString(ctx, res);
+
+	case GJS_GPAC_PROP_BATTERY_ON:
+		bval = GF_FALSE;
+		gf_sys_get_battery_state(&bval, NULL, NULL, NULL, NULL);
+		return JS_NewBool(ctx, bval);
+
+	case GJS_GPAC_PROP_BATTERY_CHARGE:
+		uval = 0;
+		gf_sys_get_battery_state(NULL, &uval, NULL, NULL, NULL);
+		return JS_NewBool(ctx, uval ? 1 : 0);
+
+	case GJS_GPAC_PROP_BATTERY_PERCENT:
+		uval=0;
+		gf_sys_get_battery_state(NULL, NULL, &uval, NULL, NULL);
+		return JS_NewInt32(ctx, uval);
+
+	case GJS_GPAC_PROP_BATTERY_LIFETIME:
+		uval=0;
+		gf_sys_get_battery_state(NULL, NULL, NULL, &uval, NULL);
+		return JS_NewInt32(ctx, uval);
+
+	case GJS_GPAC_PROP_BATTERY_LIFETIME_FULL:
+		uval=0;
+		gf_sys_get_battery_state(NULL, NULL, NULL, NULL, &uval);
+		return JS_NewInt32(ctx, uval);
+
+	case GJS_GPAC_PROP_HOSTNAME:
+	{
+		char hostname[100];
+		gf_sk_get_host_name((char*)hostname);
+		return JS_NewString(ctx, hostname);
+	}
+		break;
+
+	case GJS_GPAC_PROP_FULLSCREEN:
+		return JS_NewBool(ctx, compositor->fullscreen);
+
+	case GJS_GPAC_PROP_CURRENT_PATH:
+		str = gf_url_concatenate(compositor->root_scene->root_od->scene_ns->url, "");
+		if (!str) str = gf_strdup("");
+		ret = JS_NewString(ctx, str);
+		gf_free(str);
+		return ret;
+
+	case GJS_GPAC_PROP_VOLUME:
+		return JS_NewInt32(ctx, gf_sc_get_option(compositor, GF_OPT_AUDIO_VOLUME));
+
+	case GJS_GPAC_PROP_NAVIGATION:
+		return JS_NewInt32(ctx, gf_sc_get_option(compositor, GF_OPT_NAVIGATION));
+
+	case GJS_GPAC_PROP_NAVIGATION_TYPE:
+		return JS_NewInt32(ctx, gf_sc_get_option(compositor, GF_OPT_NAVIGATION_TYPE) );
+
+	case GJS_GPAC_PROP_HARDWARE_YUV:
+		return JS_NewBool(ctx, (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_YUV) ? 1 : 0 );
+
+	case GJS_GPAC_PROP_HARDWARE_RGB:
+		return JS_NewBool(ctx, (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
+
+	case GJS_GPAC_PROP_HARDWARE_RGBA:
+		bval = (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
+#ifndef GPAC_DISABLE_3D
+		if (compositor->hybrid_opengl || compositor->is_opengl) bval = 1;
+#endif
+		return JS_NewBool(ctx, bval);
+
+	case GJS_GPAC_PROP_HARDWARE_STRETCH:
+		return JS_NewBool(ctx, (compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_STRETCH) ? 1 : 0 );
+
+	case GJS_GPAC_PROP_SCREEN_WIDTH:
+		return JS_NewInt32(ctx, compositor->video_out->max_screen_width);
+
+	case GJS_GPAC_PROP_SCREEN_HEIGHT:
+		return JS_NewInt32(ctx, compositor->video_out->max_screen_height);
+
+	case GJS_GPAC_PROP_HTTP_MAX_RATE:
+	{
+		GF_DownloadManager *dm = gf_sc_get_downloader(compositor);
+		if (dm)
+			return JS_NewInt32(ctx, gf_dm_get_data_rate(dm));
+	}
+		break;
+
+	case GJS_GPAC_PROP_HTTP_RATE:
+	{
+		GF_DownloadManager *dm = gf_sc_get_downloader(compositor);
+		if (dm)
+			return JS_NewInt32(ctx, gf_dm_get_global_rate(dm) / 1000);
+	}
+		break;
+
+	case GJS_GPAC_PROP_FPS:
+		return JS_NewFloat64(ctx, gf_sc_get_fps(compositor, 0) );
+
+	case GJS_GPAC_PROP_SIM_FPS:
+		return JS_NewFloat64(ctx, ((Double)compositor->fps.den)/compositor->fps.num);
+
+	case GJS_GPAC_PROP_HAS_OPENGL:
+		return JS_NewBool(ctx, (compositor->ogl != GF_SC_GLMODE_OFF) ? 1 : 0);
+
+	case GJS_GPAC_PROP_CPU:
+		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+		return JS_NewInt32(ctx, ext->rti.process_cpu_usage);
+
+	case GJS_GPAC_PROP_NB_CORES:
+		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+		return JS_NewInt32(ctx, ext->rti.nb_cores);
+
+	case GJS_GPAC_PROP_MEMORY_SYSTEM:
+		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+		return JS_NewFloat64(ctx, (Double) ext->rti.physical_memory);
+
+	case GJS_GPAC_PROP_MEMORY:
+		gf_sys_get_rti(ext->rti_refresh_rate, &ext->rti, 0);
+		return JS_NewInt64(ctx, ext->rti.process_memory);
+
+	case GJS_GPAC_PROP_ARGC:
+		return JS_NewInt32(ctx, gf_sys_get_argc() );
+
+	case GJS_GPAC_PROP_DPI_X:
+		return JS_NewInt32(ctx, compositor->video_out->dpi_x);
+
+	case GJS_GPAC_PROP_DPI_Y:
+		return JS_NewInt32(ctx, compositor->video_out->dpi_y);
+
+	case GJS_GPAC_PROP_SENSORS_ACTIVE:
+		return JS_NewBool(ctx, compositor->orientation_sensors_active);
+
+	case GJS_GPAC_PROP_ZOOM:
+		if (compositor->root_scene && compositor->root_scene->graph->script_action) {
+			GF_JSAPIParam jspar;
+			memset(&jspar, 0, sizeof(GF_JSAPIParam));
+			compositor->root_scene->graph->script_action(compositor->root_scene->graph->script_action_cbck, GF_JSAPI_OP_GET_SCALE, NULL, &jspar);
+#ifdef GPAC_ENABLE_COVERAGE
+			if (gf_sys_is_cov_mode()) {
+				compositor->root_scene->graph->script_action(compositor->root_scene->graph->script_action_cbck, GF_JSAPI_OP_GET_VIEWPORT, NULL, &jspar);
+			}
+#endif
+			return JS_NewFloat64(ctx, FIX2FLT(jspar.val) );
+		} else {
+			return JS_NewFloat64(ctx, 1.0 );
+		}
+		break;
+	case GJS_GPAC_PROP_TEXT_SEL:
+		str = (char *) gf_sc_get_selected_text(compositor);
+		if (!str) str = "";
+		return JS_NewString(ctx, str);
+	}
+	return JS_UNDEFINED;
+}
+
+
+static JSValue gpac_setProperty(JSContext *ctx, JSValueConst this_val, JSValueConst value, int magic)
+{
+#ifndef GPAC_CONFIG_IOS
+	Bool bval;
+#endif
+	s32 ival;
+	Double dval;
+	const char *prop_val;
+	GF_GPACJSExt *ext = JS_GetOpaque(this_val, gpac_class_id);
+	GF_Compositor *compositor = ext ? ext->compositor : NULL;
+	if (!ext || !compositor) return JS_EXCEPTION;
+
+	switch (magic) {
+	case GJS_GPAC_PROP_LAST_WORK_DIR:
+		if (!JS_IsString(value)) return JS_EXCEPTION;
+		prop_val = JS_ToCString(ctx, value);
+		gf_opts_set_key("General", "LastWorkingDir", prop_val);
+		JS_FreeCString(ctx, prop_val);
+		break;
+	case GJS_GPAC_PROP_CAPTION:
+	{
+		GF_Event evt;
+		if (!JS_IsString(value)) return JS_EXCEPTION;
+		prop_val = JS_ToCString(ctx, value);
+		evt.type = GF_EVENT_SET_CAPTION;
+		if (prop_val && !strnicmp(prop_val, "gpac://", 7)) {
+			evt.caption.caption = prop_val + 7;
+		} else {
+			evt.caption.caption = prop_val;
+		}
+		gf_sc_user_event(compositor, &evt);
+		JS_FreeCString(ctx, prop_val);
+	}
+		break;
+	case GJS_GPAC_PROP_FULLSCREEN:
+		/*no fullscreen for iOS (always on)*/
+#ifndef GPAC_CONFIG_IOS
+		bval = JS_ToBool(ctx, value);
+		if (compositor->fullscreen != bval) {
+			gf_sc_set_option(compositor, GF_OPT_FULLSCREEN, bval);
+		}
+#endif
+		break;
+	case GJS_GPAC_PROP_VOLUME:
+		if (!JS_ToFloat64(ctx, &dval, value)) {
+			gf_sc_set_option(compositor, GF_OPT_AUDIO_VOLUME, (u32) dval);
+		} else if (!JS_ToInt32(ctx, &ival, value)) {
+			gf_sc_set_option(compositor, GF_OPT_AUDIO_VOLUME, (u32) ival);
+		}
+		break;
+
+	case GJS_GPAC_PROP_NAVIGATION:
+		if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+		gf_sc_set_option(compositor, GF_OPT_NAVIGATION, (u32) ival);
+		break;
+	case GJS_GPAC_PROP_NAVIGATION_TYPE:
+		gf_sc_set_option(compositor, GF_OPT_NAVIGATION_TYPE, 0);
+		break;
+	case GJS_GPAC_PROP_HTTP_MAX_RATE:
+	{
+		GF_DownloadManager *dm = gf_sc_get_downloader(compositor);
+		if (dm) {
+			if (JS_ToInt32(ctx, &ival, value)) return JS_EXCEPTION;
+			gf_dm_set_data_rate(dm, (u32) ival);
+		}
+	}
+		break;
+	case GJS_GPAC_PROP_FOCUS_HIGHLIGHT:
+		compositor->disable_focus_highlight = JS_ToBool(ctx, value);
+		break;
+	case GJS_GPAC_PROP_SENSORS_ACTIVE:
+	{
+		GF_Event evt;
+		compositor->orientation_sensors_active = JS_ToBool(ctx, value);
+		//send activation for sensors
+		memset(&evt, 0, sizeof(GF_Event));
+		evt.type = GF_EVENT_SENSOR_REQUEST;
+		evt.activate_sensor.activate = compositor->orientation_sensors_active;
+		evt.activate_sensor.sensor_type = GF_EVENT_SENSOR_ORIENTATION;
+		if (gf_sc_send_event(compositor, &evt) == GF_FALSE) {
+			compositor->orientation_sensors_active = GF_FALSE;
+		}
+	}
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue gpac_get_option(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *opt = NULL;
+	const char *sec_name, *key_name;
+	char arg_val[GF_PROP_DUMP_ARG_SIZE];
+	s32 idx = -1;
+	GF_Compositor *compositor = gpac_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;
+
+	sec_name = JS_ToCString(ctx, argv[0]);
+	key_name = NULL;
+	if (JS_IsNumber(argv[1])) {
+		JS_ToInt32(ctx, &idx, argv[1]);
+	} else if (JS_IsString(argv[1]) ) {
+		key_name = JS_ToCString(ctx, argv[1]);
+	}
+
+	if (sec_name && !stricmp(sec_name, "General") && key_name && !strcmp(key_name, "Version")) {
+		opt = gf_gpac_version();
+	} else if (sec_name && key_name) {
+		if (!strcmp(sec_name, "Compositor")) {
+			opt = gf_filter_get_arg_str(compositor->filter, key_name, arg_val);
+		} else {
+			opt = gf_opts_get_key(sec_name, key_name);
+		}
+	} else if (sec_name && (idx>=0)) {
+		opt = gf_opts_get_key_name(sec_name, idx);
+	} else {
+		opt = NULL;
+	}
+
+	JS_FreeCString(ctx, key_name);
+	JS_FreeCString(ctx, sec_name);
+
+	if (opt) {
+		return JS_NewString(ctx, opt);
+	}
+	return JS_NULL;
+}
+
+static JSValue gpac_set_option(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *sec_name, *key_name, *key_val;
+	GF_Compositor *compositor = gpac_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;
+
+	sec_name = JS_ToCString(ctx, argv[0]);
+	key_name = JS_ToCString(ctx, argv[1]);
+	key_val = NULL;
+	if (JS_IsString(argv[2]))
+		key_val = JS_ToCString(ctx, argv[2]);
+
+	if (!strcmp(sec_name, "Compositor")) {
+		gf_filter_send_update(compositor->filter, NULL, key_name, key_val, 0);
+	} else {
+		gf_opts_set_key(sec_name, key_name, key_val);
+	}
+	JS_FreeCString(ctx, sec_name);
+	JS_FreeCString(ctx, key_name);
+	if (key_val) {
+		JS_FreeCString(ctx, key_val);
+	}
+	return JS_UNDEFINED;
+}
+
+
+static JSValue gpac_get_arg(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 idx;
+	if (argc < 1) return JS_EXCEPTION;
+
+	if (JS_ToInt32(ctx, &idx, argv[0]))
+		return JS_EXCEPTION;
+
+	const char *arg = gf_sys_get_arg(idx);
+	if (arg) {
+		return JS_NewString(ctx, arg);
+	}
+	return JS_NULL;
+}
+
+static JSValue gpac_set_arg_used(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 idx;
+	Bool used;
+	if (argc < 2) return JS_EXCEPTION;
+
+	if (JS_ToInt32(ctx, &idx, argv[0]))
+		return JS_EXCEPTION;
+	used = JS_ToBool(ctx, argv[1]);
+
+	gf_sys_mark_arg_used(idx, used);
+	return JS_UNDEFINED;
+}
+
+static JSValue gpac_set_back_color(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 r, g, b, a, i;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+	if (argc < 3) return JS_EXCEPTION;
+	r = g = b = 0;
+	a = 255;
+	for (i=0; i<(u32) argc; i++) {
+		Double d;
+		u32 v;
+		if (! JS_ToFloat64(ctx, &d, argv[i])) {
+		} else {
+			return JS_EXCEPTION;
+		}
+		d*=255;
+		v = 0;
+		if (d>0) {
+			v = (u32) d;
+			if (v>255)  v = 255;
+		}
+		if (i==0) r = v;
+		else if (i==1) g = v;
+		else if (i==2) b = v;
+		else if (i==3) a = v;
+	}
+	compositor->back_color = compositor->bc = GF_COL_ARGB(a, r, g, b);
+	gf_sc_invalidate(compositor, NULL);
+	return JS_UNDEFINED;
+}
+
+
+static JSValue gpac_switch_quality(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+	if (argc < 1) return JS_EXCEPTION;
+
+	if (!JS_IsBool(argv[0]))
+		return JS_EXCEPTION;
+	Bool up = JS_ToBool(ctx, argv[0]) ? GF_TRUE : GF_FALSE;
+	gf_scene_switch_quality(compositor->root_scene, up);
+	return JS_UNDEFINED;
+}
+
+
+#if 0 //unused
+static JSValue gpac_reload(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Event evt;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_RELOAD;
+	gf_filter_ui_event(compositor->filter, &evt);
+	return JS_UNDEFINED;
+}
+#endif
+
+static JSValue gpac_navigation_supported(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 type;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+	if (argc < 1) return JS_EXCEPTION;
+
+	if (! JS_IsInteger(argv[0]) ) {
+		return JS_NewBool(ctx, 0);
+	}
+	if (JS_ToInt32(ctx, &type, argv[0]))
+		return JS_EXCEPTION;
+	return JS_NewBool(ctx, gf_sc_navigation_supported(compositor, type) ? 1 : 0 );
+}
+
+typedef struct
+{
+	JSContext *c;
+	JSValue array;
+	Bool is_dir;
+	u32 idx;
+} enum_dir_cbk;
+
+static Bool enum_dir_fct(void *cbck, char *file_name, char *file_path, GF_FileEnumInfo *file_info)
+{
+	u32 i, len;
+	char *sep;
+	JSValue s;
+	JSValue obj;
+	enum_dir_cbk *cbk = (enum_dir_cbk*)cbck;
+
+	if (file_name && (file_name[0]=='.')) return 0;
+
+	obj = JS_NewObject(cbk->c);
+	JS_SetPropertyStr(cbk->c, obj, "name", JS_NewString(cbk->c, file_name) );
+
+	sep=NULL;
+	len = (u32) strlen(file_path);
+	for (i=0; i<len; i++) {
+		sep = strchr("/\\", file_path[len-i-1]);
+		if (sep) {
+			sep = file_path+len-i-1;
+			break;
+		}
+	}
+	if (sep) {
+		sep[0] = '/';
+		sep[1] = 0;
+		s = JS_NewString(cbk->c, file_path);
+	} else {
+		s = JS_NewString(cbk->c, file_path);
+	}
+	JS_SetPropertyStr(cbk->c, obj, "path", s);
+
+	JS_SetPropertyStr(cbk->c, obj, "directory", JS_NewBool(cbk->c, cbk->is_dir) );
+	JS_SetPropertyStr(cbk->c, obj, "drive", JS_NewBool(cbk->c, file_info->drive) );
+	JS_SetPropertyStr(cbk->c, obj, "hidden", JS_NewBool(cbk->c, file_info->hidden) );
+	JS_SetPropertyStr(cbk->c, obj, "system", JS_NewBool(cbk->c, file_info->system) );
+	JS_SetPropertyStr(cbk->c, obj, "size", JS_NewInt64(cbk->c, file_info->size) );
+	JS_SetPropertyStr(cbk->c, obj, "last_modified", JS_NewInt64(cbk->c, file_info->last_modified) );
+
+	JS_SetPropertyUint32(cbk->c, cbk->array, cbk->idx, obj);
+	cbk->idx++;
+	return 0;
+}
+
+static JSValue gpac_enum_directory(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err err;
+	enum_dir_cbk cbk;
+	char *url = NULL;
+	const char *dir = NULL;
+	const char *filter = NULL;
+	char *an_url;
+	Bool dir_only = 0;
+	Bool browse_root = 0;
+	GF_Compositor *compositor;
+
+	if ((argc >= 1) && JS_IsString(argv[0])) {
+		dir = JS_ToCString(ctx, argv[0]);
+		if (!strcmp(dir, "/")) browse_root = 1;
+	}
+	if ((argc >= 2) && JS_IsString(argv[1])) {
+		filter = JS_ToCString(ctx, argv[1]);
+		if (!strcmp(filter, "dir")) {
+			dir_only = 1;
+			filter = NULL;
+		} else if (!strlen(filter)) {
+			JS_FreeCString(ctx, filter);
+			filter=NULL;
+		}
+	}
+	if ((argc >= 3) && JS_IsBool(argv[2])) {
+		if (JS_ToBool(ctx, argv[2])) {
+			url = gf_url_concatenate(dir, "..");
+			if (dir && ( !strcmp(url, "..") || (url[0]==0) )) {
+				if ((dir[1]==':') && ((dir[2]=='/') || (dir[2]=='\\')) ) browse_root = 1;
+				else if (!strcmp(dir, "/")) browse_root = 1;
+			}
+			if (!strcmp(url, "/")) browse_root = 1;
+		}
+	}
+
+	if ( (!dir || !strlen(dir) ) && (!url || !strlen(url))) browse_root = 1;
+
+	if (browse_root) {
+		cbk.c = ctx;
+		cbk.idx = 0;
+		cbk.array = JS_NewArray(ctx);
+		if (JS_IsException(cbk.array)) return cbk.array;
+		cbk.is_dir = 1;
+		gf_enum_directory("/", 1, enum_dir_fct, &cbk, NULL);
+		if (url) gf_free(url);
+		JS_FreeCString(ctx, dir);
+		JS_FreeCString(ctx, filter);
+		return cbk.array;
+	}
+
+	cbk.c = ctx;
+	cbk.array = JS_NewArray(ctx);
+	if (JS_IsException(cbk.array)) return cbk.array;
+	cbk.is_dir = 1;
+	cbk.idx = 0;
+
+	compositor = gpac_get_compositor(ctx, this_val);
+
+	/*concatenate with service url*/
+	an_url = gf_url_concatenate(compositor->root_scene->root_od->scene_ns->url, url ? url : dir);
+	if (an_url) {
+		gf_free(url);
+		url = an_url;
+	}
+	err = gf_enum_directory(url ? url : dir, 1, enum_dir_fct, &cbk, NULL);
+	if (err) return JS_EXCEPTION;
+
+	if (!dir_only) {
+		cbk.is_dir = 0;
+		err = gf_enum_directory(url ? url : dir, 0, enum_dir_fct, &cbk, filter);
+		if (err) return JS_EXCEPTION;
+	}
+
+	if (url) gf_free(url);
+	JS_FreeCString(ctx, dir);
+	JS_FreeCString(ctx, filter);
+	return cbk.array;
+}
+
+static JSValue gpac_set_size(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Bool override_size_info = 0;
+	u32 w, h;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+	if (argc<2) return JS_EXCEPTION;
+
+	w = h = 0;
+	if (JS_ToInt32(ctx, &w, argv[0]))
+		return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, &h, argv[1]))
+		return JS_EXCEPTION;
+
+	if (argc > 2)
+		override_size_info = JS_ToBool(ctx, argv[2]);
+
+	if (w && h) {
+		GF_Event evt;
+		if (override_size_info) {
+			compositor->scene_width = w;
+			compositor->scene_height = h;
+			compositor->has_size_info = 1;
+			compositor->recompute_ar = 1;
+			return JS_UNDEFINED;
+		}
+		if (compositor->os_wnd) {
+			evt.type = GF_EVENT_SCENE_SIZE;
+			evt.size.width = w;
+			evt.size.height = h;
+			gf_sc_send_event(compositor, &evt);
+		} else {
+			gf_sc_set_size(compositor, w, h);
+		}
+	} else if (override_size_info) {
+		compositor->has_size_info = 0;
+		compositor->recompute_ar = 1;
+	}
+
+	return JS_UNDEFINED;
+}
+
+
+static JSValue gpac_exit(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Event evt;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = GF_EVENT_QUIT;
+	if (argc)
+		JS_ToInt32(ctx, (s32 *) &evt.message.error, argv[0]);
+		
+	gf_sc_send_event(compositor, &evt);
+	return JS_UNDEFINED;
+}
+
+static JSValue gpac_set_3d(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Bool type_3d;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!argc) return JS_EXCEPTION;
+	type_3d = JS_ToBool(ctx, argv[0]);
+
+	if (compositor->inherit_type_3d != type_3d) {
+		compositor->inherit_type_3d = type_3d;
+		compositor->root_visual_setup = 0;
+		gf_sc_reset_graphics(compositor);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue gpac_move_window(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Event evt;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (argc < 2) return JS_EXCEPTION;
+
+	evt.type = GF_EVENT_MOVE;
+	evt.move.relative = 1;
+	if (JS_ToInt32(ctx, &evt.move.x, argv[0]))
+		return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, &evt.move.y, argv[1]))
+		return JS_EXCEPTION;
+
+	if (argc ==3) {
+		evt.move.relative = JS_ToBool(ctx, argv[2]);
+	}
+	compositor->video_out->ProcessEvent(compositor->video_out, &evt);
+	return JS_UNDEFINED;
+}
+
+
+static JSValue gpac_error_string(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	if (argc < 1) return JS_EXCEPTION;
+	if (JS_ToInt32(ctx, (int32_t *) &e, argv[0]))
+		return JS_EXCEPTION;
+	return JS_NewString(ctx, gf_error_to_string(e) );
+}
+
+#if 0 //unused
+static JSValue gpac_get_scene_time(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_SceneGraph *sg = NULL;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor) return JS_EXCEPTION;
+
+	if (!argc || !JS_IsObject(argv[0]) ) {
+		sg = compositor->root_scene->graph;
+	} else {
+		GF_Node *n = gf_sg_js_get_node(c, JSVAL_TO_OBJECT(argv[0]));
+		sg = n ? n->sgprivate->scenegraph : compositor->root_scene->graph;
+	}
+	return JS_NewFloat64(ctx, sg->GetSceneTime(sg->userpriv) );
+}
+#endif
+
+static JSValue gpac_trigger_gc(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_SceneGraph *sg;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	sg = compositor->root_scene->graph;
+	sg->trigger_gc = GF_TRUE;
+	return JS_UNDEFINED;
+}
+
+static GF_FilterPid *gjs_enum_pids(void *udta, u32 *idx)
+{
+	GF_Scene *scene = (GF_Scene *)udta;
+	GF_ObjectManager *odm = gf_list_get(scene->resources, *idx);
+	if (odm) return odm->pid;
+	return NULL;
+}
+
+static JSValue odm_getProperty(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
+	GF_MediaInfo odi;
+	char *str;
+	GF_Scene *scene;
+	Double dval;
+	u32 i, count;
+
+	switch (magic) {
+	case GJS_OM_PROP_ID:
+		return JS_NewInt32(ctx, odm->ID);
+	case GJS_OM_PROP_NB_RES:
+		return JS_NewInt32(ctx, odm->subscene ? gf_list_count(odm->subscene->resources) : 0);
+	case GJS_OM_PROP_URL:
+		if (odm->scene_ns)
+			return JS_NewString(ctx, odm->scene_ns->url);
+		return JS_NULL;
+	case GJS_OM_PROP_DUR:
+		return JS_NewFloat64(ctx, odm->duration / 1000.0);
+	case GJS_OM_PROP_CLOCK:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewFloat64(ctx, odi.current_time);
+	case GJS_OM_PROP_DRIFT:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.clock_drift);
+	case GJS_OM_PROP_STATUS:
+		gf_odm_get_object_info(odm, &odi);
+		if (odi.status==0) str = "Stopped";
+		else if (odi.status==1) str = "Playing";
+		else if (odi.status==2) str = "Paused";
+		else if (odi.status==3) str = "Not Setup";
+		else str = "Setup Failed";
+		return JS_NewString(ctx, str);
+	case GJS_OM_PROP_BUFFER:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.buffer);
+	case GJS_OM_PROP_DB_COUNT:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.db_unit_count);
+	case GJS_OM_PROP_CB_COUNT:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.cb_unit_count);
+	case GJS_OM_PROP_CB_CAP:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.cb_max_count);
+	case GJS_OM_PROP_TYPE:
+		if (odm->type==GF_STREAM_SCENE) str = "Scene";
+		else if (odm->type==GF_STREAM_OD) str = "OD";
+		else if (odm->type==GF_STREAM_VISUAL) str = "Video";
+		else if (odm->type==GF_STREAM_AUDIO) str = "Audio";
+		else if (odm->type==GF_STREAM_TEXT) str = "Text";
+		else if (odm->subscene) str = "Subscene";
+		else str = (char*) gf_stream_type_name(odm->type);
+		return JS_NewString(ctx, str);
+	case GJS_OM_PROP_SAMPLERATE:
+		return JS_NewInt32(ctx, odm->mo ? odm->mo->sample_rate : 0);
+	case GJS_OM_PROP_CHANNELS:
+		return JS_NewInt32(ctx, odm->mo ? odm->mo->num_channels : 0);
+	case GJS_OM_PROP_LANG:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewString(ctx, odi.lang_code ? odi.lang_code : gf_4cc_to_str(odi.lang) );
+	case GJS_OM_PROP_WIDTH:
+		return JS_NewInt32(ctx, odm->mo ? odm->mo->width : 0);
+	case GJS_OM_PROP_HEIGHT:
+		return JS_NewInt32(ctx, odm->mo ? odm->mo->height : 0);
+	case GJS_OM_PROP_PIXELFORMAT:
+		return JS_NewString(ctx, odm->mo ? gf_4cc_to_str(odm->mo->pixelformat) : "none");
+	case GJS_OM_PROP_PAR:
+		if (odm->mo && odm->mo->pixel_ar) {
+			char szPar[50];
+			sprintf(szPar, "%d:%d", (odm->mo->pixel_ar>>16)&0xFF, (odm->mo->pixel_ar)&0xFF );
+			return JS_NewString(ctx, szPar);
+		} else if (odm->mo && odm->mo->width) {
+			return JS_NewString(ctx, "1:1");
+		}
+		return JS_NULL;
+	case GJS_OM_PROP_DEC_FRAMES:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.nb_dec_frames);
+	case GJS_OM_PROP_DROP_FRAMES:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.nb_dropped);
+	case GJS_OM_PROP_DEC_TIME_MAX:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.max_dec_time);
+	case GJS_OM_PROP_DEC_TIME_TOTAL:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt64(ctx, odi.total_dec_time);
+	case GJS_OM_PROP_AVG_RATE:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.avg_bitrate);
+	case GJS_OM_PROP_MAX_RATE:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.max_bitrate);
+	case GJS_OM_PROP_SERVICE_HANDLER:
+		gf_odm_get_object_info(odm, &odi);
+            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");
+	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);
+			gf_filter_release_property(pe);
+
+			if (nb_qualities)
+				return JS_NewInt32(ctx, nb_qualities);
+		}
+		//use input channels
+		if (odm->extra_pids) {
+			return JS_NewInt32(ctx, 1 + gf_list_count(odm->extra_pids));
+		}
+		//use number of scalable addons
+		if (odm->upper_layer_odm) {
+			count = 0;
+			while (odm) {
+				odm = odm->upper_layer_odm;
+				count++;
+			}
+			return JS_NewInt32(ctx, count);
+		}
+		return JS_NewInt32(ctx, 1);
+
+	case GJS_OM_PROP_MAX_BUFFER:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.max_buffer);
+	case GJS_OM_PROP_MIN_BUFFER:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.min_buffer);
+	case GJS_OM_PROP_FRAME_DUR:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.au_duration);
+	case GJS_OM_PROP_NB_IRAP:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.nb_iraps);
+	case GJS_OM_PROP_IRAP_DEC_TIME:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt64(ctx, odi.irap_total_dec_time);
+	case GJS_OM_PROP_IRAP_MAX_TIME:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.irap_max_dec_time);
+	case GJS_OM_PROP_SERVICE_ID:
+		return JS_NewInt32(ctx, odm->ServiceID);
+	case GJS_OM_PROP_SELECTED_SERVICE:
+		return JS_NewInt32(ctx,  (!odm->addon && odm->subscene) ? odm->subscene->selected_service_id : odm->parentscene->selected_service_id);
+		break;
+	case GJS_OM_PROP_BANDWIDTH_DOWN:
+        if (odm->scene_ns->source_filter) {
+			JSValue ret;
+            GF_PropertyEntry *pe=NULL;
+            const GF_PropertyValue *prop = gf_filter_get_info(odm->scene_ns->source_filter, GF_PROP_PID_DOWN_RATE, &pe);
+            ret = JS_NewInt32(ctx, prop ? prop->value.uint/1000 : 0);
+            gf_filter_release_property(pe);
+            return ret;
+        }
+        return JS_NewInt32(ctx, 0);
+
+	case GJS_OM_PROP_NB_HTTP:
+		if (odm->scene_ns->source_filter) {
+			return JS_NewInt32(ctx, gf_filter_count_source_by_protocol(odm->scene_ns->source_filter, "http", GF_TRUE, gjs_enum_pids, odm->subscene ? odm->subscene : odm->parentscene ) );
+		}
+		return JS_NewInt32(ctx, 0);
+	case GJS_OM_PROP_TIMESHIFT_DEPTH:
+		if ((s32) odm->timeshift_depth > 0) {
+			return JS_NewFloat64(ctx, ((Double) odm->timeshift_depth) / 1000.0 );
+		}
+		return JS_NewFloat64(ctx, 0.0);
+
+	case GJS_OM_PROP_TIMESHIFT_TIME:
+		dval = 0.0;
+		if (!odm->timeshift_depth) {
+			return JS_NewInt32(ctx, 0);
+		}
+
+		scene = odm->subscene ? odm->subscene : odm->parentscene;
+		//we may need to check the main addon for timeshifting
+		if (scene->main_addon_selected) {
+			count = gf_list_count(scene->resources);
+			for (i=0; i < count; i++) {
+				GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+				if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+					odm = an_odm;
+				}
+			}
+		}
+
+		if (odm->timeshift_depth) {
+			GF_FilterPid *pid = odm->pid;
+			if (!pid && odm->subscene) {
+				odm = gf_list_get(odm->subscene->resources, 0);
+				pid = odm->pid;
+			}
+			if (pid) {
+				GF_PropertyEntry *pe=NULL;
+				const GF_PropertyValue *p = gf_filter_pid_get_info(pid, GF_PROP_PID_TIMESHIFT_TIME, &pe);
+				if (p) dval = p->value.number;
+				gf_filter_release_property(pe);
+			}
+		} else if (scene->main_addon_selected) {
+			GF_Clock *ck = scene->root_od->ck;
+			if (ck) {
+				u32 now = gf_clock_time(ck) ;
+				u32 live = scene->obj_clock_at_main_activation + gf_sys_clock() - scene->sys_clock_at_main_activation;
+				dval = ((Double) live) / 1000.0;
+				dval -= ((Double) now) / 1000.0;
+
+				if (dval<0) {
+					GF_Event evt;
+					memset(&evt, 0, sizeof(evt));
+					evt.type = GF_EVENT_TIMESHIFT_UNDERRUN;
+					gf_sc_send_event(scene->compositor, &evt);
+					dval=0;
+				} else if (dval && dval*1000 > scene->timeshift_depth) {
+					GF_Event evt;
+					memset(&evt, 0, sizeof(evt));
+					evt.type = GF_EVENT_TIMESHIFT_OVERFLOW;
+					gf_sc_send_event(scene->compositor, &evt);
+					dval=scene->timeshift_depth;
+					dval/=1000;
+				}
+			}
+		}
+		return JS_NewFloat64(ctx, dval);
+
+	case GJS_OM_PROP_IS_ADDON:
+		return JS_NewBool(ctx,  (odm->addon || (!odm->subscene && odm->parentscene->root_od->addon)) );
+
+	case GJS_OM_PROP_MAIN_ADDON_ON:
+		scene = odm->subscene ? odm->subscene : odm->parentscene;
+		return JS_NewBool(ctx,  scene->main_addon_selected );
+	case GJS_OM_PROP_IS_OVER:
+		scene = odm->subscene ? odm->subscene : odm->parentscene;
+		return JS_NewBool(ctx,  gf_sc_is_over(scene->compositor, scene->graph));
+
+	case GJS_OM_PROP_DYNAMIC_SCENE:
+		return JS_NewBool(ctx, odm->subscene && odm->subscene->is_dynamic_scene);
+
+	case GJS_OM_PROP_SERVICE_NAME:
+		if (odm->pid) {
+			const GF_PropertyValue *p = gf_filter_pid_get_property(odm->pid, GF_PROP_PID_SERVICE_NAME);
+			if (p && p->value.string)
+				return JS_NewString(ctx, p->value.string);
+		}
+		return JS_NULL;
+
+	case GJS_OM_PROP_NTP_DIFF:
+		gf_odm_get_object_info(odm, &odi);
+		return JS_NewInt32(ctx, odi.ntp_diff);
+
+	case GJS_OM_PROP_NTP_SENDER_DIFF:
+		if (odm->last_drawn_frame_ntp_sender && odm->last_drawn_frame_ntp_receive) {
+			s32 diff = gf_net_ntp_diff_ms(odm->last_drawn_frame_ntp_receive, odm->last_drawn_frame_ntp_sender);
+			return JS_NewInt32(ctx, diff);
+		}
+		return JS_NULL;
+
+	case GJS_OM_PROP_MAIN_ADDON_URL:
+		scene = odm->subscene ? odm->subscene : odm->parentscene;
+		count = gf_list_count(scene->resources);
+		for (i=0; i < count; i++) {
+			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				if (!strstr(an_odm->addon->url, "://")) {
+					char szURL[GF_MAX_PATH];
+					sprintf(szURL, "gpac://%s", an_odm->addon->url);
+					return JS_NewString(ctx, szURL);
+				} else {
+					return JS_NewString(ctx, an_odm->addon->url);
+				}
+			}
+		}
+		return JS_NULL;
+
+	case GJS_OM_PROP_REVERSE_PLAYBACK:
+		if (odm->pid) {
+			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 JS_NewBool(ctx, GF_TRUE);
+		}
+		return JS_NewBool(ctx, GF_FALSE );
+
+	case GJS_OM_PROP_SCALABLE_ENHANCEMENT:
+		return JS_NewBool(ctx, odm && (odm->lower_layer_odm || odm->scalable_addon));
+
+	case GJS_OM_PROP_MAIN_ADDON_MEDIATIME:
+		scene = odm->subscene ? odm->subscene : odm->parentscene;
+		count = gf_list_count(scene->resources);
+
+		if (! scene->main_addon_selected) count = 0;
+
+		for (i=0; i < count; i++) {
+			GF_ObjectManager *an_odm = gf_list_get(scene->resources, i);
+			if (an_odm && an_odm->addon && (an_odm->addon->addon_type==GF_ADDON_TYPE_MAIN)) {
+				if (an_odm->duration) {
+					Double now = gf_clock_time(scene->root_od->ck) / 1000.0;
+					now -= ((Double) an_odm->addon->media_pts) / 90000.0;
+					now += ((Double) an_odm->addon->media_timestamp) / an_odm->addon->media_timescale;
+					return JS_NewFloat64(ctx, now);
+				}
+			}
+		}
+		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);
+		}
+#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);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue gjs_odm_get_quality(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
+	const GF_PropertyValue *prop;
+	GF_PropertyEntry *pe=NULL;
+	char *qdesc;
+	const char *id="", *mime="", *codec="";
+	u32 sr=0, ch=0, w=0, h=0, bw=0, par_n=1, par_d=1, tile_adaptation_mode=0,dependent_group_index=0;
+	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 (JS_ToInt32(ctx, &idx, argv[0]))
+		return JS_EXCEPTION;
+
+#if 0 //FILTER_FIXME
+	if (argc>=2) dep_idx = JSVAL_TO_INT(argv[1]);
+#endif
+
+	if (!odm->pid) return JS_NULL;
+
+	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);
+	if (!qdesc) {
+		gf_filter_release_property(pe);
+		return JS_NULL;
+	}
+	JSValue a = JS_NewObject(ctx);
+	if (JS_IsException(a))
+		return a;
+
+	while (qdesc) {
+		char *sep=strstr(qdesc, "::");
+		if (sep) sep[0]=0;
+
+		if (!strncmp(qdesc, "id=", 3)) {
+			id = NULL;
+			JS_SetPropertyStr(ctx, a, "ID", JS_NewString(ctx, qdesc+3) );
+		} else if (!strncmp(qdesc, "mime=", 5)) {
+			mime = NULL;
+			JS_SetPropertyStr(ctx, a, "mime", JS_NewString(ctx, qdesc+5));
+		} else if (!strncmp(qdesc, "codec=", 6)) {
+			codec = NULL;
+			JS_SetPropertyStr(ctx, a, "codec", JS_NewString(ctx, qdesc+6));
+		}
+		else if (!strncmp(qdesc, "bw=", 3)) bw = atoi(qdesc+3);
+		else if (!strncmp(qdesc, "w=", 2)) w = atoi(qdesc+2);
+		else if (!strncmp(qdesc, "h=", 2)) h = atoi(qdesc+2);
+		else if (!strncmp(qdesc, "sr=", 3)) sr = atoi(qdesc+3);
+		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 (!strncmp(qdesc, "fps=", 4)) {
+			u32 fd=25, fn=1;
+			if (sscanf(qdesc, "fps=%d/%d", &fn, &fd) != 2) {
+				fd=1;
+				sscanf(qdesc, "fps=%d", &fn);
+			}
+			fps = ((Double)fn) / fd;
+		}
+		else if (!strncmp(qdesc, "sar=", 4)) {
+			sscanf(qdesc, "sar=%d/%d", &par_n, &par_d);
+		}
+		if (!sep) break;
+		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;
+
+	gf_filter_release_property(pe);
+
+	if (id)
+		JS_SetPropertyStr(ctx, a, "ID", JS_NewString(ctx, id));
+	if (mime)
+		JS_SetPropertyStr(ctx, a, "mime", JS_NewString(ctx, mime));
+	if (codec)
+		JS_SetPropertyStr(ctx, a, "codec", JS_NewString(ctx, codec));
+
+	JS_SetPropertyStr(ctx, a, "width", JS_NewInt32(ctx, w));
+	JS_SetPropertyStr(ctx, a, "height", JS_NewInt32(ctx, h));
+	JS_SetPropertyStr(ctx, a, "bandwidth", JS_NewInt32(ctx, bw));
+	JS_SetPropertyStr(ctx, a, "interlaced", JS_NewBool(ctx, ilced));
+	JS_SetPropertyStr(ctx, a, "fps", JS_NewFloat64(ctx, fps) );
+	JS_SetPropertyStr(ctx, a, "samplerate", JS_NewInt32(ctx, sr));
+	JS_SetPropertyStr(ctx, a, "channels", JS_NewInt32(ctx, ch));
+	JS_SetPropertyStr(ctx, a, "par_num", JS_NewInt32(ctx, par_n));
+	JS_SetPropertyStr(ctx, a, "par_den", JS_NewInt32(ctx, par_d));
+	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));
+
+	return a;
+}
+
+static JSValue gjs_odm_get_srd(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
+	s32 x, y, w, h;
+
+	if (!odm) return JS_EXCEPTION;
+
+	x = y = w = h = 0;
+	if (argc) {
+#if 0 //FILTER_FIXME
+	 	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;
+		}
+#endif
+	} else if (odm && odm->mo && odm->mo->srd_w && odm->mo->srd_h) {
+		x = odm->mo->srd_x;
+		y = odm->mo->srd_y;
+		w = odm->mo->srd_w;
+		h = odm->mo->srd_h;
+	}
+
+	if (w && h) {
+		JSValue a = JS_NewObject(ctx);
+		if (JS_IsException(a)) return a;
+
+		JS_SetPropertyStr(ctx, a, "x", JS_NewInt32(ctx, x));
+		JS_SetPropertyStr(ctx, a, "y", JS_NewInt32(ctx, y));
+		JS_SetPropertyStr(ctx, a, "w", JS_NewInt32(ctx, w));
+		JS_SetPropertyStr(ctx, a, "h", JS_NewInt32(ctx, h));
+		return a;
+	}
+	return JS_NULL;
+}
+
+static JSValue gjs_odm_select_quality(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s32 idx = -1;
+	s32 tile_mode = -1;
+	u32 dep_idx = 0;
+	GF_FilterEvent evt;
+	GF_ObjectManager *odm = JS_GetOpaque(this_val, odm_class_id);
+
+	if (!odm || !odm->pid) return JS_EXCEPTION;
+
+	if ((argc>=1) && JS_IsString(argv[0])) {
+		const char *ID = JS_ToCString(ctx, argv[0]);
+		if (!strcmp(ID, "auto")) {
+			idx = -1;
+		} else {
+			idx = atoi(ID);
+		}
+		JS_FreeCString(ctx, ID);
+
+		if (argc>=2) {
+			if (JS_ToInt32(ctx, &dep_idx, argv[1]))
+				return JS_EXCEPTION;
+		}
+	}
+	else if ((argc==1) && JS_IsInteger(argv[0])) {
+		if (JS_ToInt32(ctx, &tile_mode, argv[0]))
+			return JS_EXCEPTION;
+		if (tile_mode<0)
+			return JS_UNDEFINED;
+	}
+
+	GF_FEVT_INIT(evt, GF_FEVT_QUALITY_SWITCH, odm->pid);
+
+	if (tile_mode>=0) {
+		evt.quality_switch.set_tile_mode_plus_one = 1 + tile_mode;
+	} else {
+		evt.quality_switch.dependent_group_index = dep_idx;
+		evt.quality_switch.q_idx = idx;
+	}
+	gf_filter_pid_send_event(odm->pid, &evt);
+	return JS_UNDEFINED;
+}
+
+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->subscene || !odm->subscene->main_addon_selected) return JS_UNDEFINED;
+
+	gf_scene_resume_live(odm->subscene);
+	return JS_UNDEFINED;
+}
+
+static JSValue gjs_odm_select_service(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 sid;
+	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, &sid, argv[0]))
+		return JS_EXCEPTION;
+
+	gf_scene_set_service_id(odm->subscene ? odm->subscene : odm->parentscene, sid);
+	return JS_UNDEFINED;
+}
+
+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;
+
+#ifndef GPAC_DISABLE_PLAYER
+	gf_scene_select_object(odm->parentscene, odm);
+#endif
+	return JS_UNDEFINED;
+}
+
+static JSValue gjs_odm_get_resource(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_ObjectManager *an_odm = NULL;
+	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->subscene) {
+		an_odm = gf_list_get(odm->subscene->resources, idx);
+	}
+	if (an_odm && an_odm->scene_ns) {
+		JSValue anobj = JS_NewObjectClass(ctx, odm_class_id);
+		JS_SetOpaque(anobj, an_odm);
+		return anobj;
+	}
+	return JS_NULL;
+}
+
+static JSValue gjs_odm_addon_layout(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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->subscene)
+		gf_scene_set_addon_layout_info(odm->subscene, pos, size);
+	return JS_UNDEFINED;
+}
+
+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;
+		addon_info.timeline_id = -100;
+		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
+	}
+}
+
+static JSValue gjs_odm_enable_addon(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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 (! JS_IsString(argv[0]) ) {
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			do_enable_addon(odm, NULL, GF_TRUE, GF_FALSE);
+		}
+#endif
+		return JS_UNDEFINED;
+	}
+	if (argc==2)
+		do_disable = JS_ToBool(ctx, argv[1]);
+	addon_url = JS_ToCString(ctx, argv[0]);
+	if (addon_url) {
+		do_enable_addon(odm, (char *) addon_url, GF_TRUE, do_disable);
+	}
+	JS_FreeCString(ctx, addon_url);
+	return JS_UNDEFINED;
+}
+
+static JSValue gjs_odm_declare_addon(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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;
+
+	addon_url = JS_ToCString(ctx, argv[0]);
+	if (addon_url && strcmp(addon_url, "gtest")) {
+		do_enable_addon(odm, (char *)addon_url, GF_FALSE, GF_FALSE);
+	}
+	JS_FreeCString(ctx, addon_url);
+	return JS_UNDEFINED;
+}
+
+static JSValue gpac_get_object_manager(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue anobj;
+	u32 i, count;
+	GF_ObjectManager *odm = NULL;
+	const char *service_url = NULL;
+	GF_GPACJSExt *gjs = JS_GetOpaque(this_val, gpac_class_id);
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	GF_Scene *scene = compositor->root_scene;
+	if (!gjs) return JS_EXCEPTION;
+
+	if (JS_IsString(argv[0]) ) {
+		const char *url;
+		char *an_url;
+		u32 url_len;
+		url = service_url = JS_ToCString(ctx, argv[0]);
+		if (!service_url) {
+			return JS_NULL;
+		}
+		if (!strncmp(service_url, "gpac://", 7)) url = service_url + 7;
+		if (!strncmp(service_url, "file://", 7)) url = service_url + 7;
+		url_len = (u32) strlen(url);
+		an_url = strchr(url, '#');
+		if (an_url) url_len -= (u32) strlen(an_url);
+
+		count = gf_list_count(scene->resources);
+		for (i=0; i<count; i++) {
+			odm = gf_list_get(scene->resources, i);
+			if (odm->scene_ns) {
+				an_url = odm->scene_ns->url;
+				if (!strncmp(an_url, "gpac://", 7)) an_url = an_url + 7;
+				if (!strncmp(an_url, "file://", 7)) an_url = an_url + 7;
+				if (!strncmp(an_url, url, url_len))
+					break;
+			}
+			odm = NULL;
+		}
+	}
+
+	JS_FreeCString(ctx, service_url);
+
+	if (!odm) return JS_NULL;
+
+	anobj = JS_NewObjectClass(ctx, odm_class_id);
+	if (JS_IsException(anobj)) return anobj;
+
+	JS_SetOpaque(anobj, odm);
+	return anobj;
+}
+
+
+static JSValue gpacevt_getProperty(JSContext *ctx, JSValueConst this_val, int magic)
+{
+	GF_GPACJSExt *gjs = JS_GetOpaque(this_val, gpacevt_class_id);
+	if (!gjs || !gjs->evt) return JS_EXCEPTION;
+	GF_Event *evt = gjs->evt;
+
+	switch (magic) {
+	case GJS_EVT_PROP_KEYCODE:
+#ifndef GPAC_DISABLE_SVG
+		return JS_NewString(ctx, gf_dom_get_key_name(evt->key.key_code) );
+#else
+		return JS_NULL;
+#endif
+
+	case GJS_EVT_PROP_MOUSE_X:
+		return JS_NewInt32(ctx, evt->mouse.x);
+	case GJS_EVT_PROP_MOUSE_Y:
+		return JS_NewInt32(ctx, evt->mouse.y);
+	case GJS_EVT_PROP_PICKED:
+		if (gjs->compositor->hit_appear) return JS_NewBool(ctx, 1);
+		else if (gf_list_count(gjs->compositor->previous_sensors) ) return JS_NewBool(ctx, 1);
+		else if (gjs->compositor->text_selection) return JS_NewBool(ctx, 1);
+		else return JS_NewBool(ctx, 0);
+
+	case GJS_EVT_PROP_WHEEL:
+		return JS_NewFloat64(ctx, FIX2FLT(evt->mouse.wheel_pos));
+	case GJS_EVT_PROP_BUTTON:
+		return JS_NewInt32(ctx,  evt->mouse.button);
+	case GJS_EVT_PROP_TYPE:
+		return JS_NewInt32(ctx, evt->type);
+	case GJS_EVT_PROP_NAME:
+#ifndef GPAC_DISABLE_SVG
+		return JS_NewString(ctx, gf_dom_event_get_name(evt->type) );
+#else
+		return JS_NULL;
+#endif
+
+	case GJS_EVT_PROP_HWKEY:
+		return JS_NewInt32(ctx, evt->key.hw_code);
+	case GJS_EVT_PROP_TARGET_URL:
+		return JS_NewString(ctx, evt->navigate.to_url);
+	case GJS_EVT_PROP_FILES:
+	{
+		u32 i, idx;
+		JSValue files_array = JS_NewArray(ctx);
+		idx=0;
+		for (i=0; i<evt->open_file.nb_files; i++) {
+			if (evt->open_file.files[i]) {
+				JS_SetPropertyUint32(ctx, files_array, idx, JS_NewString(ctx, evt->open_file.files[i]) );
+				idx++;
+			}
+		}
+		return files_array;
+	}
+	}
+	return JS_UNDEFINED;
+}
+
+static Bool gjs_event_filter_process(GF_GPACJSExt *gjs, GF_Event *evt)
+{
+	s32 res;
+	JSValue rval;
+
+	gjs->evt = evt;
+	JS_SetOpaque(gjs->evt_obj, gjs);
+	rval = JS_Call(gjs->c, gjs->evt_fun, gjs->evt_filter_obj, 1, &gjs->evt_obj);
+	JS_SetOpaque(gjs->evt_obj, NULL);
+	gjs->evt = NULL;
+
+	res = 0;
+	if (JS_IsBool(rval))
+		res = JS_ToBool(gjs->c, rval);
+	else if (JS_IsNumber(rval))
+		JS_ToInt32(gjs->c, &res, rval);
+
+	JS_FreeValue(gjs->c, rval);
+	return res ? GF_TRUE : GF_FALSE;
+}
+
+static Bool gjs_event_filter(void *udta, GF_Event *evt, Bool consumed_by_compositor)
+{
+	u32 lock_fail;
+	Bool res;
+	GF_GPACJSExt *gjs = (GF_GPACJSExt *)udta;
+	if (consumed_by_compositor) return 0;
+
+	if (gjs->evt != NULL) return 0;
+
+	lock_fail=0;
+	res = gf_mx_try_lock(gjs->compositor->mx);
+	if (!res) {
+		lock_fail=1;
+	} else {
+		res = gf_js_try_lock(gjs->c);
+		if (!res) lock_fail=2;
+	}
+	if (lock_fail) {
+		GF_Event *evt_clone;
+		gf_mx_p(gjs->event_mx);
+		evt_clone = gf_malloc(sizeof(GF_Event));
+		memcpy(evt_clone, evt, sizeof(GF_Event));
+		gf_list_add(gjs->event_queue, evt_clone);
+		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[GPACJS] Couldn't lock % mutex, queing event\n", (lock_fail==2) ? "JavaScript" : "Compositor"));
+		gf_mx_v(gjs->event_mx);
+
+		if (lock_fail==2){
+			gf_mx_v(gjs->compositor->mx);
+		}
+		return 0;
+	}
+
+	gf_mx_p(gjs->event_mx);
+	while (gf_list_count(gjs->event_queue)) {
+		GF_Event *an_evt = (GF_Event *) gf_list_pop_front(gjs->event_queue);
+		gjs_event_filter_process(gjs, an_evt);
+		gf_free(an_evt);
+	}
+	gf_mx_v(gjs->event_mx);
+
+	res = gjs_event_filter_process(gjs, evt);
+
+	gf_mx_v(gjs->compositor->mx);
+	gf_js_lock(gjs->c, 0);
+	return res;
+}
+
+static JSValue gpac_set_event_filter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_GPACJSExt *gjs = JS_GetOpaque(this_val, gpac_class_id);
+	if (!gjs || !argc)
+		return JS_EXCEPTION;
+
+	if (!JS_IsNull(argv[0]) && !JS_IsUndefined(argv[0]) && !JS_IsFunction(ctx, argv[0]))
+		return JS_EXCEPTION;
+
+	JS_FreeValue(gjs->c, gjs->evt_fun);
+	gjs->evt_fun = JS_DupValue(ctx, argv[0]);
+	gjs->evt_filter_obj = this_val;
+	gjs->c = ctx;
+	gjs->evt_filter.udta = gjs;
+	gjs->evt_filter.on_event = gjs_event_filter;
+
+	gf_filter_add_event_listener(gjs->compositor->filter, &gjs->evt_filter);
+	return JS_UNDEFINED;
+}
+
+GF_Node *gf_sg_js_get_node(struct JSContext *c, JSValue obj);
+
+static JSValue gpac_set_focus(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Node *elt;
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor || !argc) return JS_EXCEPTION;
+
+	if (JS_IsNull(argv[0])) {
+		gf_sc_focus_switch_ring(compositor, 0, NULL, 0);
+		return JS_UNDEFINED;
+	}
+
+	if (JS_IsString(argv[0])) {
+		const char *focus_type = JS_ToCString(ctx, argv[0]);
+		if (!stricmp(focus_type, "previous")) {
+			gf_sc_focus_switch_ring(compositor, 1, NULL, 0);
+		}
+		else if (!stricmp(focus_type, "next")) {
+			gf_sc_focus_switch_ring(compositor, 0, NULL, 0);
+		}
+		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;
+		gf_sc_focus_switch_ring(compositor, 0, elt, 2);
+	}
+	return JS_UNDEFINED;
+}
+
+#if 0 //unused
+static JSValue gpac_get_scene(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Node *elt;
+	u32 w, h;
+	JSValue scene_obj;
+#ifndef GPAC_DISABLE_SCENEGRAPH
+	GF_SceneGraph *sg;
+#endif
+	GF_Scene *scene=NULL;
+	GF_GPACJSExt *gjs = (GF_GPACJSExt *)JS_GetOpaque(this_val, gpac_class_id);
+	if (!gjs || !argc || !JS_IsObject(argv[0])) return JS_EXCEPTION;
+
+	elt = gf_sg_js_get_node(ctx, argv[0]);
+	if (!elt) return JS_EXCEPTION;
+	switch (elt->sgprivate->tag) {
+#ifndef GPAC_DISABLE_VRML
+	case TAG_MPEG4_Inline:
+		scene = (GF_Scene *)gf_node_get_private(elt);
+		break;
+#endif
+
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Inline:
+		scene = (GF_Scene *)gf_node_get_private(elt);
+		break;
+#endif
+
+#ifndef GPAC_DISABLE_SVG
+	case TAG_SVG_animation:
+		sg = gf_sc_animation_get_scenegraph(elt);
+		scene = (GF_Scene *)gf_sg_get_private(sg);
+		break;
+#endif
+	default:
+		return JS_EXCEPTION;
+	}
+	if (!scene) return JS_EXCEPTION;
+
+
+	scene_obj = JS_NewObjectClass(ctx, any_class_id);
+	if (JS_IsException(scene_obj)) return scene_obj;
+	JS_SetOpaque(scene_obj, scene);
+	gf_sg_get_scene_size_info(scene->graph, &w, &h);
+	JS_SetPropertyStr(ctx, scene_obj, "width", JS_NewInt32(ctx, w));
+	JS_SetPropertyStr(ctx, scene_obj, "height", JS_NewInt32(ctx, h));
+	JS_SetPropertyStr(ctx, scene_obj, "connected", JS_NewBool(ctx, scene->graph ? 1 : 0));
+	return scene_obj;
+}
+#endif
+
+static JSValue gpac_show_keyboard(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Compositor *compositor = gpac_get_compositor(ctx, this_val);
+	if (!compositor || !argc) return JS_EXCEPTION;
+
+	GF_Event evt;
+	memset(&evt, 0, sizeof(GF_Event));
+	evt.type = JS_ToBool(ctx, argv[0]) ? GF_EVENT_TEXT_EDITING_START : GF_EVENT_TEXT_EDITING_END;
+	gf_sc_user_event(compositor, &evt);
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry gpac_evt_funcs[] = {
+	JS_CGETSET_MAGIC_DEF("keycode", gpacevt_getProperty, NULL, GJS_EVT_PROP_KEYCODE),
+	JS_CGETSET_MAGIC_DEF("mouse_x", gpacevt_getProperty, NULL, GJS_EVT_PROP_MOUSE_X),
+	JS_CGETSET_MAGIC_DEF("mouse_y", gpacevt_getProperty, NULL, GJS_EVT_PROP_MOUSE_Y),
+	JS_CGETSET_MAGIC_DEF("picked", gpacevt_getProperty, NULL, GJS_EVT_PROP_PICKED),
+	JS_CGETSET_MAGIC_DEF("wheel", gpacevt_getProperty, NULL, GJS_EVT_PROP_WHEEL),
+	JS_CGETSET_MAGIC_DEF("button", gpacevt_getProperty, NULL, GJS_EVT_PROP_BUTTON),
+	JS_CGETSET_MAGIC_DEF("type", gpacevt_getProperty, NULL, GJS_EVT_PROP_TYPE),
+	JS_CGETSET_MAGIC_DEF("name", gpacevt_getProperty, NULL, GJS_EVT_PROP_NAME),
+	JS_CGETSET_MAGIC_DEF("hwkey", gpacevt_getProperty, NULL, GJS_EVT_PROP_HWKEY),
+	JS_CGETSET_MAGIC_DEF("url", gpacevt_getProperty, NULL, GJS_EVT_PROP_TARGET_URL),
+	JS_CGETSET_MAGIC_DEF("dropfiles", gpacevt_getProperty, NULL, GJS_EVT_PROP_FILES),
+};
+
+static const JSCFunctionListEntry gpac_funcs[] = {
+	JS_CGETSET_MAGIC_DEF("last_working_directory", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_LAST_WORK_DIR),
+	JS_CGETSET_MAGIC_DEF("batteryOn", gpac_getProperty, NULL, GJS_GPAC_PROP_BATTERY_ON),
+	JS_CGETSET_MAGIC_DEF("batteryCharging", gpac_getProperty, NULL, GJS_GPAC_PROP_BATTERY_CHARGE),
+	JS_CGETSET_MAGIC_DEF("batteryPercent", gpac_getProperty, NULL, GJS_GPAC_PROP_BATTERY_PERCENT),
+	JS_CGETSET_MAGIC_DEF("batteryLifeTime", gpac_getProperty, NULL, GJS_GPAC_PROP_BATTERY_LIFETIME),
+	JS_CGETSET_MAGIC_DEF("batteryFullLifeTime", gpac_getProperty, NULL, GJS_GPAC_PROP_BATTERY_LIFETIME_FULL),
+	JS_CGETSET_MAGIC_DEF("hostname", gpac_getProperty, NULL, GJS_GPAC_PROP_HOSTNAME),
+	JS_CGETSET_MAGIC_DEF("fullscreen", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_FULLSCREEN),
+	JS_CGETSET_MAGIC_DEF("current_path", gpac_getProperty, NULL, GJS_GPAC_PROP_CURRENT_PATH),
+	JS_CGETSET_MAGIC_DEF("volume", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_VOLUME),
+	JS_CGETSET_MAGIC_DEF("navigation", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_NAVIGATION),
+	JS_CGETSET_MAGIC_DEF("navigation_type", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_NAVIGATION_TYPE),
+	JS_CGETSET_MAGIC_DEF("hardware_yuv", gpac_getProperty, NULL, GJS_GPAC_PROP_HARDWARE_YUV),
+	JS_CGETSET_MAGIC_DEF("hardware_rgb", gpac_getProperty, NULL, GJS_GPAC_PROP_HARDWARE_RGB),
+	JS_CGETSET_MAGIC_DEF("hardware_rgba", gpac_getProperty, NULL, GJS_GPAC_PROP_HARDWARE_RGBA),
+	JS_CGETSET_MAGIC_DEF("hardware_stretch", gpac_getProperty, NULL, GJS_GPAC_PROP_HARDWARE_STRETCH),
+	JS_CGETSET_MAGIC_DEF("screen_width", gpac_getProperty, NULL, GJS_GPAC_PROP_SCREEN_WIDTH),
+	JS_CGETSET_MAGIC_DEF("screen_height", gpac_getProperty, NULL, GJS_GPAC_PROP_SCREEN_HEIGHT),
+	JS_CGETSET_MAGIC_DEF("http_max_bitrate", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_HTTP_MAX_RATE),
+	JS_CGETSET_MAGIC_DEF("http_bitrate", gpac_getProperty, NULL, GJS_GPAC_PROP_HTTP_RATE),
+	JS_CGETSET_MAGIC_DEF("fps", gpac_getProperty, NULL, GJS_GPAC_PROP_FPS),
+	JS_CGETSET_MAGIC_DEF("sim_fps", gpac_getProperty, NULL, GJS_GPAC_PROP_SIM_FPS),
+	JS_CGETSET_MAGIC_DEF("has_opengl", gpac_getProperty, NULL, GJS_GPAC_PROP_HAS_OPENGL),
+	JS_CGETSET_MAGIC_DEF("cpu", gpac_getProperty, NULL, GJS_GPAC_PROP_CPU),
+	JS_CGETSET_MAGIC_DEF("nb_cores", gpac_getProperty, NULL, GJS_GPAC_PROP_NB_CORES),
+	JS_CGETSET_MAGIC_DEF("system_memory", gpac_getProperty, NULL, GJS_GPAC_PROP_MEMORY_SYSTEM),
+	JS_CGETSET_MAGIC_DEF("memory", gpac_getProperty, NULL, GJS_GPAC_PROP_MEMORY),
+	JS_CGETSET_MAGIC_DEF("argc", gpac_getProperty, NULL, GJS_GPAC_PROP_ARGC),
+	JS_CGETSET_MAGIC_DEF("caption", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_CAPTION),
+	JS_CGETSET_MAGIC_DEF("focus_highlight", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_FOCUS_HIGHLIGHT),
+	JS_CGETSET_MAGIC_DEF("dpi_x", gpac_getProperty, NULL, GJS_GPAC_PROP_DPI_X),
+	JS_CGETSET_MAGIC_DEF("dpi_y", gpac_getProperty, NULL, GJS_GPAC_PROP_DPI_Y),
+	JS_CGETSET_MAGIC_DEF("sensors_active", gpac_getProperty, gpac_setProperty, GJS_GPAC_PROP_SENSORS_ACTIVE),
+	JS_CGETSET_MAGIC_DEF("zoom", gpac_getProperty, NULL, GJS_GPAC_PROP_ZOOM),
+	JS_CGETSET_MAGIC_DEF("text_selection", gpac_getProperty, NULL, GJS_GPAC_PROP_TEXT_SEL),
+	JS_CFUNC_DEF("get_option", 0, gpac_get_option),
+	JS_CFUNC_DEF("set_option", 0, gpac_set_option),
+	JS_CFUNC_DEF("get_arg", 0, gpac_get_arg),
+	JS_CFUNC_DEF("set_arg_used", 0, gpac_set_arg_used),
+	JS_CFUNC_DEF("enum_directory", 0, gpac_enum_directory),
+	JS_CFUNC_DEF("set_size", 0, gpac_set_size),
+	JS_CFUNC_DEF("exit", 0, gpac_exit),
+	JS_CFUNC_DEF("set_3d", 0, gpac_set_3d),
+	JS_CFUNC_DEF("move_window", 0, gpac_move_window),
+	JS_CFUNC_DEF("set_event_filter", 0, gpac_set_event_filter),
+	JS_CFUNC_DEF("set_focus", 0, gpac_set_focus),
+	JS_CFUNC_DEF("error_string", 0, gpac_error_string),
+	JS_CFUNC_DEF("show_keyboard", 0, gpac_show_keyboard),
+	JS_CFUNC_DEF("trigger_gc", 0, gpac_trigger_gc),
+	JS_CFUNC_DEF("get_object_manager", 0, gpac_get_object_manager),
+	JS_CFUNC_DEF("switch_quality", 0, gpac_switch_quality),
+	JS_CFUNC_DEF("navigation_supported", 0, gpac_navigation_supported),
+	JS_CFUNC_DEF("set_back_color", 0, gpac_set_back_color)
+};
+
+static const JSCFunctionListEntry odm_funcs[] = {
+	JS_CGETSET_MAGIC_DEF("ID", odm_getProperty, NULL, GJS_OM_PROP_ID),
+	JS_CGETSET_MAGIC_DEF("nb_resources", odm_getProperty, NULL, GJS_OM_PROP_NB_RES),
+	JS_CGETSET_MAGIC_DEF("service_url", odm_getProperty, NULL, GJS_OM_PROP_URL),
+	JS_CGETSET_MAGIC_DEF("duration", odm_getProperty, NULL, GJS_OM_PROP_DUR),
+	JS_CGETSET_MAGIC_DEF("clock_time", odm_getProperty, NULL, GJS_OM_PROP_CLOCK),
+	JS_CGETSET_MAGIC_DEF("clock_drift", odm_getProperty, NULL, GJS_OM_PROP_DRIFT),
+	JS_CGETSET_MAGIC_DEF("status", odm_getProperty, NULL, GJS_OM_PROP_STATUS),
+	JS_CGETSET_MAGIC_DEF("buffer", odm_getProperty, NULL, GJS_OM_PROP_BUFFER),
+	JS_CGETSET_MAGIC_DEF("db_unit_count", odm_getProperty, NULL, GJS_OM_PROP_DB_COUNT),
+	JS_CGETSET_MAGIC_DEF("cb_unit_count", odm_getProperty, NULL, GJS_OM_PROP_CB_COUNT),
+	JS_CGETSET_MAGIC_DEF("cb_capacity", odm_getProperty, NULL, GJS_OM_PROP_CB_CAP),
+	JS_CGETSET_MAGIC_DEF("type", odm_getProperty, NULL, GJS_OM_PROP_TYPE),
+	JS_CGETSET_MAGIC_DEF("samplerate", odm_getProperty, NULL, GJS_OM_PROP_SAMPLERATE),
+	JS_CGETSET_MAGIC_DEF("channels", odm_getProperty, NULL, GJS_OM_PROP_CHANNELS),
+	JS_CGETSET_MAGIC_DEF("lang", odm_getProperty, NULL, GJS_OM_PROP_LANG),
+	JS_CGETSET_MAGIC_DEF("width", odm_getProperty, NULL, GJS_OM_PROP_WIDTH),
+	JS_CGETSET_MAGIC_DEF("height", odm_getProperty, NULL, GJS_OM_PROP_HEIGHT),
+	JS_CGETSET_MAGIC_DEF("pixelformt", odm_getProperty, NULL, GJS_OM_PROP_PIXELFORMAT),
+	JS_CGETSET_MAGIC_DEF("par", odm_getProperty, NULL, GJS_OM_PROP_PAR),
+	JS_CGETSET_MAGIC_DEF("dec_frames", odm_getProperty, NULL, GJS_OM_PROP_DEC_FRAMES),
+	JS_CGETSET_MAGIC_DEF("drop_frames", odm_getProperty, NULL, GJS_OM_PROP_DROP_FRAMES),
+	JS_CGETSET_MAGIC_DEF("max_dec_time", odm_getProperty, NULL, GJS_OM_PROP_DEC_TIME_MAX),
+	JS_CGETSET_MAGIC_DEF("total_dec_time", odm_getProperty, NULL, GJS_OM_PROP_DEC_TIME_TOTAL),
+	JS_CGETSET_MAGIC_DEF("avg_bitrate", odm_getProperty, NULL, GJS_OM_PROP_AVG_RATE),
+	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_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),
+	JS_CGETSET_MAGIC_DEF("frame_duration", odm_getProperty, NULL, GJS_OM_PROP_FRAME_DUR),
+	JS_CGETSET_MAGIC_DEF("irap_frames", odm_getProperty, NULL, GJS_OM_PROP_NB_IRAP),
+	JS_CGETSET_MAGIC_DEF("irap_dec_time", odm_getProperty, NULL, GJS_OM_PROP_IRAP_DEC_TIME),
+	JS_CGETSET_MAGIC_DEF("irap_max_time", odm_getProperty, NULL, GJS_OM_PROP_IRAP_MAX_TIME),
+	JS_CGETSET_MAGIC_DEF("service_id", odm_getProperty, NULL, GJS_OM_PROP_SERVICE_ID),
+	JS_CGETSET_MAGIC_DEF("selected_service", odm_getProperty, NULL, GJS_OM_PROP_SELECTED_SERVICE),
+	JS_CGETSET_MAGIC_DEF("bandwidth_down", odm_getProperty, NULL, GJS_OM_PROP_BANDWIDTH_DOWN),
+	JS_CGETSET_MAGIC_DEF("nb_http", odm_getProperty, NULL, GJS_OM_PROP_NB_HTTP),
+	JS_CGETSET_MAGIC_DEF("timeshift_depth", odm_getProperty, NULL, GJS_OM_PROP_TIMESHIFT_DEPTH),
+	JS_CGETSET_MAGIC_DEF("timeshift_time", odm_getProperty, NULL, GJS_OM_PROP_TIMESHIFT_TIME),
+	JS_CGETSET_MAGIC_DEF("is_addon", odm_getProperty, NULL, GJS_OM_PROP_IS_ADDON),
+	JS_CGETSET_MAGIC_DEF("main_addon_on", odm_getProperty, NULL, GJS_OM_PROP_MAIN_ADDON_ON),
+	JS_CGETSET_MAGIC_DEF("is_over", odm_getProperty, NULL, GJS_OM_PROP_IS_OVER),
+	JS_CGETSET_MAGIC_DEF("dynamic_scene", odm_getProperty, NULL, GJS_OM_PROP_DYNAMIC_SCENE),
+	JS_CGETSET_MAGIC_DEF("service_name", odm_getProperty, NULL, GJS_OM_PROP_SERVICE_NAME),
+	JS_CGETSET_MAGIC_DEF("ntp_diff", odm_getProperty, NULL, GJS_OM_PROP_NTP_DIFF),
+	JS_CGETSET_MAGIC_DEF("ntp_sender_diff", odm_getProperty, NULL, GJS_OM_PROP_NTP_SENDER_DIFF),
+	JS_CGETSET_MAGIC_DEF("main_addon_url", odm_getProperty, NULL, GJS_OM_PROP_MAIN_ADDON_URL),
+	JS_CGETSET_MAGIC_DEF("reverse_playback_supported", odm_getProperty, NULL, GJS_OM_PROP_REVERSE_PLAYBACK),
+	JS_CGETSET_MAGIC_DEF("scalable_enhancement", odm_getProperty, NULL, GJS_OM_PROP_SCALABLE_ENHANCEMENT),
+	JS_CGETSET_MAGIC_DEF("main_addon_media_time", odm_getProperty, NULL, GJS_OM_PROP_MAIN_ADDON_MEDIATIME),
+	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_CFUNC_DEF("declare_addon", 0, gjs_odm_declare_addon),
+	JS_CFUNC_DEF("enable_addon", 0, gjs_odm_enable_addon),
+	JS_CFUNC_DEF("addon_layout", 0, gjs_odm_addon_layout),
+	JS_CFUNC_DEF("get_resource", 0, gjs_odm_get_resource),
+	JS_CFUNC_DEF("get_quality", 0, gjs_odm_get_quality),
+	JS_CFUNC_DEF("select_service", 0, gjs_odm_select_service),
+	JS_CFUNC_DEF("select_quality", 0, gjs_odm_select_quality),
+	JS_CFUNC_DEF("disable_main_addon", 0, gjs_odm_disable_main_addon),
+	JS_CFUNC_DEF("select", 0, gjs_odm_select),
+	JS_CFUNC_DEF("get_srd", 0, gjs_odm_get_srd),
+};
+
+static void gpac_js_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_GPACJSExt *gjs = JS_GetOpaque(obj, gpac_class_id);
+	if (!gjs) return;
+
+	JS_SetOpaque(obj, NULL);
+
+	while (gf_list_count(gjs->storages)) {
+		GF_Config *cfg = (GF_Config *) gf_list_pop_back(gjs->storages);
+		gf_cfg_discard_changes(cfg);
+		gf_cfg_del(cfg);
+	}
+	gf_list_del(gjs->storages);
+
+	while (gf_list_count(gjs->event_queue)) {
+		GF_Event *evt = (GF_Event *) gf_list_pop_back(gjs->event_queue);
+		gf_free(evt);
+	}
+	gf_list_del(gjs->event_queue);
+	gf_mx_del(gjs->event_mx);
+
+	/*if we destroy the script context holding the gpac event filter (only one for the time being), remove the filter*/
+	JS_FreeValueRT(rt, gjs->evt_fun);
+	if (gjs->evt_filter.udta) {
+		gf_filter_remove_event_listener(gjs->compositor->filter, &gjs->evt_filter);
+		gjs->evt_filter.udta = NULL;
+	}
+
+	gf_free(gjs);
+}
+
+static int js_scene_init(JSContext *c, JSModuleDef *m)
+{
+	GF_JSAPIParam par;
+	GF_GPACJSExt *gjs;
+	GF_SAFEALLOC(gjs, GF_GPACJSExt);
+	GF_SceneGraph *scene;
+	if (!gjs) {
+		return -1;
+	}
+	gjs->rti_refresh_rate = GPAC_JS_RTI_REFRESH_RATE;
+	gjs->storages = gf_list_new();
+	gjs->event_queue = gf_list_new();
+	gjs->event_mx = gf_mx_new("GPACJSEvt");
+	gjs->evt_fun = JS_UNDEFINED;
+	gjs->gpac_obj = JS_UNDEFINED;
+	gjs->evt_obj = JS_UNDEFINED;
+
+	scene = JS_GetContextOpaque(c);
+	if (!scene) return -1;
+	if (scene->__reserved_null) {
+		GF_Node *n = JS_GetContextOpaque(c);
+		scene = n->sgprivate->scenegraph;
+	}
+
+	if (!gpac_class_id) {
+		JS_NewClassID(&gpac_class_id);
+		JS_NewClass(JS_GetRuntime(c), gpac_class_id, &gpacClass);
+
+		JS_NewClassID(&odm_class_id);
+		JS_NewClass(JS_GetRuntime(c), odm_class_id, &odmClass);
+	}
+	JSValue proto = JS_NewObjectClass(c, odm_class_id);
+	JS_SetPropertyFunctionList(c, proto, odm_funcs, countof(odm_funcs));
+	JS_SetClassProto(c, odm_class_id, proto);
+
+	JS_NewClassID(&gpacevt_class_id);
+	JS_NewClass(JS_GetRuntime(c), gpacevt_class_id, &gpacEvtClass);
+
+	JS_NewClassID(&any_class_id);
+	JS_NewClass(JS_GetRuntime(c), any_class_id, &anyClass);
+
+	JSValue global = JS_GetGlobalObject(c);
+
+	gjs->gpac_obj = JS_NewObjectClass(c, gpac_class_id);
+	JS_SetPropertyFunctionList(c, gjs->gpac_obj, gpac_funcs, countof(gpac_funcs));
+	JS_SetOpaque(gjs->gpac_obj, gjs);
+//	JS_SetPropertyStr(c, global, "gpac", gjs->gpac_obj);
+
+	if (scene->script_action) {
+		if (scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_COMPOSITOR, scene->RootNode, &par)) {
+			gjs->compositor = par.compositor;
+		}
+	}
+
+	gjs->evt_obj = JS_NewObjectClass(c, gpacevt_class_id);
+	JS_SetPropertyFunctionList(c, gjs->evt_obj, gpac_evt_funcs, countof(gpac_evt_funcs));
+	JS_SetOpaque(gjs->evt_obj, NULL);
+	JS_SetPropertyStr(c, global, "gpacevt", gjs->evt_obj);
+
+#define DECLARE_CONST(_val) \
+	JS_SetPropertyStr(c, global, #_val, JS_NewInt32(c, _val));
+
+	DECLARE_CONST(GF_EVENT_CLICK);
+	DECLARE_CONST(GF_EVENT_MOUSEUP);
+	DECLARE_CONST(GF_EVENT_MOUSEDOWN);
+	DECLARE_CONST(GF_EVENT_MOUSEMOVE);
+	DECLARE_CONST(GF_EVENT_MOUSEWHEEL);
+	DECLARE_CONST(GF_EVENT_DBLCLICK);
+	DECLARE_CONST(GF_EVENT_KEYUP);
+	DECLARE_CONST(GF_EVENT_KEYDOWN);
+	DECLARE_CONST(GF_EVENT_TEXTINPUT);
+	DECLARE_CONST(GF_EVENT_CONNECT);
+	DECLARE_CONST(GF_EVENT_NAVIGATE_INFO);
+	DECLARE_CONST(GF_EVENT_NAVIGATE);
+	DECLARE_CONST(GF_EVENT_DROPFILE);
+	DECLARE_CONST(GF_EVENT_ADDON_DETECTED);
+	DECLARE_CONST(GF_EVENT_QUALITY_SWITCHED);
+	DECLARE_CONST(GF_EVENT_TIMESHIFT_DEPTH);
+	DECLARE_CONST(GF_EVENT_TIMESHIFT_UPDATE);
+	DECLARE_CONST(GF_EVENT_TIMESHIFT_OVERFLOW);
+	DECLARE_CONST(GF_EVENT_TIMESHIFT_UNDERRUN);
+	DECLARE_CONST(GF_EVENT_QUIT);
+	DECLARE_CONST(GF_EVENT_MAIN_ADDON_STATE);
+	DECLARE_CONST(GF_EVENT_SCENE_SIZE);
+
+	DECLARE_CONST(GF_NAVIGATE_NONE);
+	DECLARE_CONST(GF_NAVIGATE_WALK);
+	DECLARE_CONST(GF_NAVIGATE_FLY);
+	DECLARE_CONST(GF_NAVIGATE_PAN);
+	DECLARE_CONST(GF_NAVIGATE_GAME);
+	DECLARE_CONST(GF_NAVIGATE_SLIDE);
+	DECLARE_CONST(GF_NAVIGATE_EXAMINE);
+	DECLARE_CONST(GF_NAVIGATE_ORBIT);
+	DECLARE_CONST(GF_NAVIGATE_VR);
+
+	DECLARE_CONST(GF_NAVIGATE_TYPE_NONE);
+	DECLARE_CONST(GF_NAVIGATE_TYPE_2D);
+	DECLARE_CONST(GF_NAVIGATE_TYPE_3D);
+
+	JS_FreeValue(c, global);
+
+    JS_SetModuleExport(c, m, "gpac", gjs->gpac_obj);
+	return 0;
+}
+
+
+void qjs_module_init_scenejs(JSContext *ctx)
+{
+	JSModuleDef *m;
+	m = JS_NewCModule(ctx, "scenejs", js_scene_init);
+	if (!m) return;
+
+	JS_AddModuleExport(ctx, m, "gpac");
+	return;
+}
+
+
+#endif
+

gpac-1.0.0.tar.gz/src/jsmods/storage.c Added

@@ -0,0 +1,231 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2007-2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / JavaScript Storage bindings
+ *
+ *  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.
+ *
+ */
+
+/*
+	ANY CHANGE TO THE API MUST BE REFLECTED IN THE DOCUMENTATION IN gpac/share/doc/idl/storage.js
+	(no way to define inline JS doc with doxygen)
+*/
+
+#include <gpac/setup.h>
+
+#ifdef GPAC_HAS_QJS
+
+#include <gpac/config_file.h>
+#include "../scenegraph/qjs_common.h"
+
+
+static JSClassID storage_class_id = 0;
+GF_List *all_storages = NULL;
+
+static void storage_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Config *cfg = JS_GetOpaque(obj, storage_class_id);
+	if (!cfg) return;
+	if (all_storages) {
+		gf_list_del_item(all_storages, cfg);
+		if (!gf_list_count(all_storages)) {
+			gf_list_del(all_storages);
+			all_storages = NULL;
+		}
+	}
+	gf_cfg_del(cfg);
+}
+
+JSClassDef storageClass = {
+    "Storage",
+    .finalizer = storage_finalize,
+};
+
+
+static JSValue js_storage_get_option(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *opt = NULL;
+	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 (!JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[1]) && !JS_IsInteger(argv[1])) return JS_EXCEPTION;
+
+	sec_name = JS_ToCString(ctx, argv[0]);
+	if (!strcmp(sec_name, "GPAC")) {
+		JS_FreeCString(ctx, sec_name);
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Cannot access section 'GPAC' from script\n");
+	}
+
+	key_name = NULL;
+	if (JS_IsInteger(argv[1])) {
+		JS_ToInt32(ctx, &idx, argv[1]);
+	} else if (JS_IsString(argv[1]) ) {
+		key_name = JS_ToCString(ctx, argv[1]);
+	}
+
+	if (key_name) {
+		opt = gf_cfg_get_key(config, sec_name, key_name);
+	} else if (idx>=0) {
+		opt = gf_cfg_get_key_name(config, sec_name, idx);
+	} else {
+		opt = NULL;
+	}
+
+	JS_FreeCString(ctx, key_name);
+	JS_FreeCString(ctx, sec_name);
+
+	if (opt) {
+		return JS_NewString(ctx, opt);
+	}
+	return JS_NULL;
+}
+
+static JSValue js_storage_set_option(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	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 (!JS_IsString(argv[0])) return JS_EXCEPTION;
+	if (!JS_IsString(argv[1])) return JS_EXCEPTION;
+
+	sec_name = JS_ToCString(ctx, argv[0]);
+	if (!strcmp(sec_name, "GPAC")) {
+		JS_FreeCString(ctx, sec_name);
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Cannot access section 'GPAC' from script\n");
+	}
+	key_name = JS_ToCString(ctx, argv[1]);
+	key_val = NULL;
+	if (JS_IsString(argv[2]))
+		key_val = JS_ToCString(ctx, argv[2]);
+
+	gf_cfg_set_key(config, sec_name, key_name, key_val);
+
+	JS_FreeCString(ctx, sec_name);
+	JS_FreeCString(ctx, key_name);
+	JS_FreeCString(ctx, key_val);
+	return JS_UNDEFINED;
+}
+
+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;
+	gf_cfg_save(config);
+	return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry storage_funcs[] = {
+	JS_CFUNC_DEF("get_option", 0, js_storage_get_option),
+	JS_CFUNC_DEF("set_option", 0, js_storage_set_option),
+	JS_CFUNC_DEF("save", 0, js_storage_save),
+};
+
+static JSValue storage_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	char szFile[GF_MAX_PATH];
+	JSValue anobj;
+	GF_Config *storage = NULL;
+	const char *storage_url = NULL;
+	u32 i, count;
+	u8 hash[20];
+	char temp[3];
+
+	if (!JS_IsString(argv[0]) )
+		return JS_EXCEPTION;
+
+	storage_url = JS_ToCString(ctx, argv[0]);
+	if (!storage_url) return JS_NULL;
+
+	szFile[0]=0;
+	gf_sha1_csum((u8 *)storage_url, (u32) strlen(storage_url), hash);
+	for (i=0; i<20; i++) {
+		sprintf(temp, "%02X", hash[i]);
+		strcat(szFile, temp);
+	}
+	strcat(szFile, ".cfg");
+
+	count = gf_list_count(all_storages);
+	for (i=0; i<count; i++) {
+		GF_Config *a_cfg = gf_list_get(all_storages, i);
+		const char *cfg_name = gf_cfg_get_filename(a_cfg);
+
+		if (strstr(cfg_name, szFile)) {
+			storage = a_cfg;
+			break;
+		}
+	}
+
+	if (!storage) {
+		const char *storage_dir = gf_opts_get_key("core", "store-dir");
+
+		storage = gf_cfg_force_new(storage_dir, szFile);
+		if (storage) {
+			gf_cfg_set_key(storage, "GPAC", "StorageURL", storage_url);
+			gf_list_add(all_storages, storage);
+		}
+	}
+
+	JS_FreeCString(ctx, storage_url);
+
+	anobj = JS_NewObjectClass(ctx, storage_class_id);
+	if (JS_IsException(anobj)) return anobj;
+	JS_SetOpaque(anobj, storage);
+	return anobj;
+}
+
+static int js_storage_init(JSContext *c, JSModuleDef *m)
+{
+	if (!storage_class_id) {
+		JS_NewClassID(&storage_class_id);
+		JS_NewClass(JS_GetRuntime(c), storage_class_id, &storageClass);
+
+		assert(!all_storages);
+		all_storages = gf_list_new();
+	}
+
+	JSValue proto = JS_NewObjectClass(c, storage_class_id);
+	JS_SetPropertyFunctionList(c, proto, storage_funcs, countof(storage_funcs));
+	JS_SetClassProto(c, storage_class_id, proto);
+
+	JSValue ctor = JS_NewCFunction2(c, storage_constructor, "Storage", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "Storage", ctor);
+	return 0;
+}
+
+
+void qjs_module_init_storage(JSContext *ctx)
+{
+	JSModuleDef *m;
+	m = JS_NewCModule(ctx, "storage", js_storage_init);
+	if (!m) return;
+
+	JS_AddModuleExport(ctx, m, "Storage");
+	return;
+}
+
+
+#endif
+

gpac-1.0.0.tar.gz/src/jsmods/webgl.c Added

@@ -0,0 +1,2029 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / JavaScript WebGL bindings
+ *
+ *  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.
+ *
+ */
+
+
+/*
+	ANY CHANGE TO THE API MUST BE REFLECTED IN THE DOCUMENTATION IN gpac/share/doc/idl/webgl.idl
+	(no way to define inline JS doc with doxygen)
+*/
+
+#include <gpac/setup.h>
+#ifdef GPAC_HAS_QJS
+
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+#include "webgl.h"
+
+JSClassID WebGLRenderingContextBase_class_id;
+
+static void webgl_finalize(JSRuntime *rt, JSValue obj)
+{
+	u32 i, count;
+	GF_WebGLContext *glctx = JS_GetOpaque(obj, WebGLRenderingContextBase_class_id);
+	if (!glctx) return;
+	JS_FreeValueRT(rt, glctx->canvas);
+	JS_FreeValueRT(rt, glctx->tex_frame_flush);
+	JS_FreeValueRT(rt, glctx->depth_frame_flush);
+
+	count = gf_list_count(glctx->all_objects);
+	for (i=0; i<count; i++) {
+		GF_WebGLObject *glo = gf_list_get(glctx->all_objects, i);
+		glo->par_ctx = NULL;
+		if (!JS_IsUndefined(glo->obj))
+			JS_FreeValueRT(rt, glo->obj);
+	}
+	gf_list_del(glctx->all_objects);
+	count = gf_list_count(glctx->named_textures);
+	for (i=0; i<count; i++) {
+		GF_WebGLNamedTexture *named_tx = gf_list_get(glctx->named_textures, i);
+		named_tx->par_ctx = NULL;
+	}
+	gf_list_del(glctx->named_textures);
+
+	glDeleteTextures(1, &glctx->tex_id);
+	glDeleteRenderbuffers(1, &glctx->depth_id);
+	glDeleteFramebuffers(1, &glctx->fbo_id);
+	gf_free(glctx);
+}
+static void webgl_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+	u32 i, count;
+	GF_WebGLContext *glctx = JS_GetOpaque(val, WebGLRenderingContextBase_class_id);
+	if (!glctx) return;
+	if (!JS_IsUndefined(glctx->tex_frame_flush))
+		JS_MarkValue(rt, glctx->depth_frame_flush, mark_func);
+	if (!JS_IsUndefined(glctx->depth_frame_flush))
+		JS_MarkValue(rt, glctx->tex_frame_flush, mark_func);
+	if (!JS_IsUndefined(glctx->canvas))
+		JS_MarkValue(rt, glctx->canvas, mark_func);
+	count = gf_list_count(glctx->all_objects);
+	for (i=0; i<count; i++) {
+		GF_WebGLObject *glo = gf_list_get(glctx->all_objects, i);
+		if (!JS_IsUndefined(glo->obj))
+			JS_MarkValue(rt, glo->obj, mark_func);
+	}
+}
+JSClassDef WebGLRenderingContextBase_class =
+{
+	.class_name = "WebGLContext",
+	.finalizer = webgl_finalize,
+	.gc_mark = webgl_gc_mark,
+};
+
+JSClassID WebGLProgram_class_id;
+JSClassID WebGLShader_class_id;
+JSClassID WebGLBuffer_class_id;
+JSClassID WebGLFramebuffer_class_id;
+JSClassID WebGLRenderbuffer_class_id;
+JSClassID WebGLTexture_class_id;
+JSClassID WebGLUniformLocation_class_id;
+JSClassID NamedTexture_class_id;
+
+#define DEF_WGLOBJ_CLASS1(_name, _destr) \
+static void _name##_finalize(JSRuntime *rt, JSValue obj)\
+{\
+	GF_WebGLObject *glo = JS_GetOpaque(obj, _name##_class_id);\
+	if (!glo) return;\
+	if (glo->gl_id) _destr(glo->gl_id);\
+	if (glo->par_ctx) gf_list_del_item(glo->par_ctx->all_objects, glo);\
+	gf_free(glo);\
+}\
+JSClassDef _name##_class =\
+{\
+	.class_name = "#_name",\
+	.finalizer = _name##_finalize,\
+};
+
+#define DEF_WGLOBJ_CLASS2(_name, _destr) \
+static void _name##_finalize(JSRuntime *rt, JSValue obj)\
+{\
+	GF_WebGLObject *glo = JS_GetOpaque(obj, _name##_class_id);\
+	if (!glo) return;\
+	if (glo->gl_id) _destr(1, &glo->gl_id);\
+	gf_free(glo);\
+}\
+JSClassDef _name##_class =\
+{\
+	.class_name = "#_name",\
+	.finalizer = _name##_finalize,\
+};
+
+#define DEF_WGLOBJ_CLASS3(_name) \
+static void _name##_finalize(JSRuntime *rt, JSValue obj)\
+{\
+	GF_WebGLObject *glo = JS_GetOpaque(obj, _name##_class_id);\
+	if (!glo) return;\
+	gf_free(glo);\
+}\
+JSClassDef _name##_class =\
+{\
+	.class_name = "#_name",\
+	.finalizer = _name##_finalize,\
+};
+
+
+DEF_WGLOBJ_CLASS1(WebGLProgram, glDeleteProgram)
+DEF_WGLOBJ_CLASS1(WebGLShader, glDeleteShader)
+DEF_WGLOBJ_CLASS2(WebGLBuffer, glDeleteBuffers)
+DEF_WGLOBJ_CLASS2(WebGLFramebuffer, glDeleteFramebuffers)
+DEF_WGLOBJ_CLASS2(WebGLRenderbuffer, glDeleteRenderbuffers)
+DEF_WGLOBJ_CLASS2(WebGLTexture, glDeleteTextures)
+DEF_WGLOBJ_CLASS3(WebGLUniformLocation)
+
+
+#undef DEF_WGLOBJ_CLASS1
+#undef DEF_WGLOBJ_CLASS2
+#undef DEF_WGLOBJ_CLASS3
+
+static void NamedTexture_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(obj, NamedTexture_class_id);
+	if (!named_tx) return;
+	if (named_tx->par_ctx)
+		gf_list_del_item(named_tx->par_ctx->named_textures, named_tx);
+
+	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);
+	gf_free(named_tx);
+}
+JSClassDef NamedTexture_class =
+{
+	.class_name = "NamedTexture",
+	.finalizer = NamedTexture_finalize
+};
+
+
+
+Bool WGL_LOAD_INT32_VEC(JSContext *ctx, JSValue val, s32 **values, u32 *v_size, u32 dim)
+{
+	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 (! *values) {
+		*values = gf_malloc(sizeof(s32) * len);
+		*v_size = len;
+	} else {
+		if (len>dim) len=dim;
+	}
+	for (i=0; i<len; i++) {
+		v = JS_GetPropertyUint32(ctx, val, i);
+		res = JS_ToInt32(ctx, & ( (*values)[i]), v);
+		JS_FreeValue(ctx, v);
+		if (res) return GF_FALSE;
+	}
+
+	return GF_TRUE;
+}
+
+Bool WGL_LOAD_FLOAT_VEC(JSContext *ctx, JSValue val, Float **values, u32 *v_size, u32 dim, Bool is_matrix)
+{
+	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 (! *values) {
+		*values = gf_malloc(sizeof(Float) * len);
+		if (is_matrix)
+			*v_size = len/dim/dim;
+		else
+			*v_size = len/dim;
+	} else {
+		if (len>dim) len = dim;
+	}
+	for (i=0; i<len; i++) {
+		Double aval;
+		v = JS_GetPropertyUint32(ctx, val, i);
+		res = JS_ToFloat64(ctx, &aval, v);
+		JS_FreeValue(ctx, v);
+		if (res) return GF_FALSE;
+		(*values) [i] = (Float) aval;
+	}
+	return GF_TRUE;
+}
+
+uint8_t *wgl_GetArrayBuffer(JSContext *ctx, u32 *size, JSValueConst obj)
+{
+	JSValue v;
+	/*ArrayBuffer*/
+	size_t psize;
+	uint8_t *res = JS_GetArrayBuffer(ctx, &psize, obj);
+	if (res) {
+		*size = (u32) psize;
+		return res;
+	}
+	/*ArrayView*/
+	v = JS_GetPropertyStr(ctx, obj, "buffer");
+	if (JS_IsUndefined(v)) return NULL;
+	res = JS_GetArrayBuffer(ctx, &psize, v);
+	JS_FreeValue(ctx, v);
+	*size = (u32) psize;
+	return res;
+}
+
+static JSValue WebGLRenderingContextBase_getProperty(JSContext *ctx, JSValueConst obj, int magic)
+{
+	GF_WebGLContext *glc = JS_GetOpaque(obj, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	switch (magic) {
+	case WebGLRenderingContextBase_PROP_canvas:
+		return JS_DupValue(ctx, glc->canvas);
+	case WebGLRenderingContextBase_PROP_drawingBufferWidth:
+		return JS_NewInt32(ctx, glc->width);
+	case WebGLRenderingContextBase_PROP_drawingBufferHeight:
+		return JS_NewInt32(ctx, glc->height);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue webgl_getActiveAttribOrUniform(JSContext *ctx, GLuint program, u32 index, Bool is_attr)
+{
+	char szAttName[1001];
+	GLint size, att_len=0;
+	GLenum type;
+	JSValue info;
+	if (is_attr) {
+		glGetActiveAttrib(program, index, 1000, &att_len, &size, &type, szAttName);
+	} else {
+		glGetActiveUniform(program, index, 1000, &att_len, &size, &type, szAttName);
+	}
+	if (att_len>1000) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	szAttName[att_len] = 0;
+	info = JS_NewObject(ctx);
+	JS_SetPropertyStr(ctx, info, "size", JS_NewInt32(ctx, size));
+	JS_SetPropertyStr(ctx, info, "type", JS_NewInt32(ctx, type));
+	JS_SetPropertyStr(ctx, info, "name", JS_NewString(ctx, szAttName));
+	return info;
+}
+JSValue webgl_getActiveAttrib(JSContext *ctx, GLuint program, u32 index)
+{
+	return webgl_getActiveAttribOrUniform(ctx, program, index, GF_TRUE);
+}
+JSValue webgl_getActiveUniform(JSContext *ctx, GLuint program, u32 index)
+{
+	return webgl_getActiveAttribOrUniform(ctx, program, index, GF_FALSE);
+}
+JSValue webgl_getAttachedShaders(JSContext *ctx, GF_WebGLContext *glc, GLuint program)
+{
+	JSValue ret;
+	GLuint shaders[20];
+	u32 i, scount=0;
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	glGetAttachedShaders(program, 20, &scount, shaders);
+	if (!scount) return JS_NULL;
+	ret = JS_NewArray(ctx);
+	for (i=0; i<scount; i++) {
+		u32 j, count = gf_list_count(glc->all_objects);
+		for (j=0; j<count; j++) {
+			GF_WebGLObject *glo = gf_list_get(glc->all_objects, j);
+			if (glo->class_id != WebGLShader_class_id) continue;
+			if (glo->gl_id == shaders[i]) {
+				JS_SetPropertyUint32(ctx, ret, i, JS_DupValue(ctx, glo->obj) );
+				break;
+			}
+		}
+	}
+	return ret;
+}
+
+/*WebGL 1.0 autogen code*/
+#include "WebGLRenderingContextBase.c"
+
+
+static JSValue wgl_getContextAttributes(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	ret = JS_NewObject(ctx);
+	JS_SetPropertyStr(ctx, ret, "alpha", JS_NewBool(ctx, glc->actual_attrs.alpha));
+	if (glc->actual_attrs.depth== WGL_DEPTH_TEXTURE) {
+		JS_SetPropertyStr(ctx, ret, "depth", JS_NewString(ctx, "texture"));
+	} else {
+		JS_SetPropertyStr(ctx, ret, "depth", JS_NewBool(ctx, glc->actual_attrs.depth));
+	}
+	JS_SetPropertyStr(ctx, ret, "stencil", JS_NewBool(ctx, glc->actual_attrs.stencil));
+	JS_SetPropertyStr(ctx, ret, "antialias", JS_NewBool(ctx, glc->actual_attrs.antialias));
+	JS_SetPropertyStr(ctx, ret, "premultipliedAlpha", JS_NewBool(ctx, glc->actual_attrs.premultipliedAlpha));
+	JS_SetPropertyStr(ctx, ret, "preserveDrawingBuffer", JS_NewBool(ctx, glc->actual_attrs.preserveDrawingBuffer));
+	JS_SetPropertyStr(ctx, ret, "failIfMajorPerformanceCaveat", JS_NewBool(ctx, glc->actual_attrs.failIfMajorPerformanceCaveat));
+	JS_SetPropertyStr(ctx, ret, "desynchronized", JS_NewBool(ctx, glc->actual_attrs.desynchronized));
+	return ret;
+}
+
+static JSValue wgl_isContextLost(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return JS_FALSE;
+}
+static JSValue wgl_getSupportedExtensions(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	char *gl_exts;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (argc && JS_ToBool(ctx, argv[0])) {
+		JSValue res;
+		u32 idx=0;
+		gl_exts = (char *) glGetString(GL_EXTENSIONS);
+		res = JS_NewArray(ctx);
+		while (gl_exts) {
+			char *sep = strchr(gl_exts, ' ');
+			if (sep) sep[0] = 0;
+			JS_SetPropertyUint32(ctx, res, idx, JS_NewString(ctx, gl_exts));
+			idx++;
+			if (!sep) break;
+			if (sep) sep[0] = ' ';
+			gl_exts = sep+1;
+		}
+		JS_SetPropertyStr(ctx, res, "length", JS_NewInt32(ctx, idx));
+		return res;
+	}
+	return JS_NewArray(ctx);
+}
+
+static JSValue wgl_getExtension(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	const char *gl_exts, *ext;
+	Bool found = GF_FALSE;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (!argc) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	ext = JS_ToCString(ctx, argv[0]);
+
+	gl_exts = (const char *) glGetString(GL_EXTENSIONS);
+	if (strstr(gl_exts, ext)) {
+		found = GF_TRUE;
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[WebGL] getExtension not yet implemented, cannot fetch extension for %s\n", ext));
+	}
+
+	JS_FreeCString(ctx, ext);
+	if (!found) return JS_NULL;
+	return JS_NULL;
+}
+
+static JSValue wgl_getBufferParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	u32 pname = 0;
+	GLint params;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	glGetBufferParameteriv(target, pname, &params);
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s32 ints[4];
+	u32 i, count;
+	JSValue ret;
+	Float floats[4];
+	GLboolean bools[4];
+	u32 pname = 0;
+	u32 nb_floats = 0;
+	u32 nb_ints = 0;
+	u32 nb_bools = 0;
+	const char *str;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(pname, argv[0]);
+
+	switch (pname) {
+	//Floatx2
+	case GL_ALIASED_LINE_WIDTH_RANGE:
+	case GL_ALIASED_POINT_SIZE_RANGE:
+	case GL_DEPTH_RANGE:
+		glGetFloatv(pname, floats);
+		nb_floats = 2;
+		break;
+	//WebGLBuffer
+	case GL_ARRAY_BUFFER_BINDING:
+	case GL_ELEMENT_ARRAY_BUFFER_BINDING:
+		glGetIntegerv(pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLBuffer_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	//Floatx4
+	case GL_BLEND_COLOR:
+	case GL_COLOR_CLEAR_VALUE:
+		glGetFloatv(pname, floats);
+		nb_floats = 4;
+		break;
+	//boolx4
+	case GL_COLOR_WRITEMASK:
+		glGetBooleanv(pname, bools);
+		nb_bools = 4;
+		break;
+
+	//uint array
+	case GL_COMPRESSED_TEXTURE_FORMATS:
+	{
+		glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, ints);
+		s32 *tx_ints = gf_malloc(sizeof(s32)*ints[0]);
+		glGetIntegerv(pname, tx_ints);
+		ret = JS_NewArray(ctx);
+		for (i=0; (s32)i<ints[0]; i++) {
+			JS_SetPropertyUint32(ctx, ret, i, JS_NewInt32(ctx, tx_ints[i]));
+		}
+		gf_free(ints);
+		return ret;
+	}
+		break;
+	//WebGLProgram
+	case GL_CURRENT_PROGRAM:
+		glGetIntegerv(pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLProgram_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	//WebGLFramebuffer
+	case GL_FRAMEBUFFER_BINDING:
+		glGetIntegerv(pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLFramebuffer_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	//WebGLRenderbuffer
+	case GL_RENDERBUFFER_BINDING:
+		glGetIntegerv(pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLRenderbuffer_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	//WebGLTexture
+	case GL_TEXTURE_BINDING_2D:
+	case GL_TEXTURE_BINDING_CUBE_MAP:
+		glGetIntegerv(pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLTexture_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		//todo: do we want to expose
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	//bool
+	case GL_BLEND:
+	case GL_CULL_FACE:
+	case GL_DEPTH_TEST:
+	case GL_DEPTH_WRITEMASK:
+	case GL_DITHER:
+	case GL_POLYGON_OFFSET_FILL:
+	case GL_SAMPLE_ALPHA_TO_COVERAGE:
+	case GL_SAMPLE_COVERAGE:
+	case GL_SAMPLE_COVERAGE_INVERT:
+	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;
+
+	//floats
+	case GL_DEPTH_CLEAR_VALUE:
+	case GL_LINE_WIDTH:
+	case GL_POLYGON_OFFSET_FACTOR:
+	case GL_POLYGON_OFFSET_UNITS:
+	case GL_SAMPLE_COVERAGE_VALUE:
+		glGetFloatv(pname, floats);
+		return JS_NewFloat64(ctx, floats[0]);
+	//intx2
+	case GL_MAX_VIEWPORT_DIMS:
+		glGetIntegerv(pname, ints);
+		nb_ints = 2;
+		break;
+	//intx4
+	case GL_SCISSOR_BOX:
+	case GL_VIEWPORT:
+		glGetIntegerv(pname, ints);
+		nb_ints = 4;
+		break;
+	//strings
+	case GL_RENDERER:
+	case GL_SHADING_LANGUAGE_VERSION:
+	case GL_VENDOR:
+	case GL_VERSION:
+		str = glGetString(pname);
+		return JS_NewString(ctx, str ? str : "");
+
+	//all the rest is enum or int
+	default:
+		glGetIntegerv(pname, ints);
+		return JS_NewInt32(ctx, ints[0]);
+		break;
+	}
+
+	if (nb_floats) {
+		ret = JS_NewArray(ctx);
+		for (i=0; i<nb_floats; i++) {
+			JS_SetPropertyUint32(ctx, ret, i, JS_NewFloat64(ctx, floats[i]));
+		}
+		return ret;
+	}
+
+	if (nb_ints) {
+		ret = JS_NewArray(ctx);
+		for (i=0; i<nb_ints; i++) {
+			JS_SetPropertyUint32(ctx, ret, i, JS_NewInt32(ctx, ints[i]));
+		}
+		return ret;
+	}
+
+	if (nb_bools) {
+		ret = JS_NewArray(ctx);
+		for (i=0; i<nb_bools; i++) {
+			JS_SetPropertyUint32(ctx, ret, i, JS_NewBool(ctx, bools[i]));
+		}
+		return ret;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue wgl_getFramebufferAttachmentParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	u32 attachment = 0;
+	u32 pname = 0;
+	GLint params;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (argc<3) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(attachment, argv[1]);
+	WGL_GET_U32(pname, argv[2]);
+	glGetFramebufferAttachmentParameteriv (target, attachment, pname, &params);
+	if (pname==GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) {
+		u32 i, count;
+		if (!params) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLTexture_class_id) {
+				if (ob->gl_id == params) return JS_DupValue(ctx, ob->obj);
+			} else if (ob->class_id==WebGLRenderbuffer_class_id) {
+				if (ob->gl_id == params) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+	}
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getProgramParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLint program=0;
+	u32 pname = 0;
+	GLint params;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_U32(pname, argv[1]);
+	glGetProgramiv(program, pname, &params);
+	switch (pname) {
+	case GL_DELETE_STATUS:
+	case GL_LINK_STATUS:
+	case GL_VALIDATE_STATUS:
+		return params ? JS_TRUE : JS_FALSE;
+	default:
+		break;
+	}
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getRenderbufferParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	u32 pname = 0;
+	GLint params;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	glGetRenderbufferParameteriv(target, pname, &params);
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getShaderParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLint shader=0;
+	u32 pname = 0;
+	GLint params;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(shader, argv[0], WebGLShader_class_id);
+	WGL_GET_U32(pname, argv[1]);
+	glGetShaderiv(shader, pname, &params);
+	switch (pname) {
+	case GL_DELETE_STATUS:
+	case GL_COMPILE_STATUS:
+		return params ? JS_TRUE : JS_FALSE;
+	default:
+		break;
+	}
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getShaderPrecisionFormat(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret;
+	u32 shader_type = 0;
+	u32 prec_type = 0;
+	GLint range[2];
+	GLint precision;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(shader_type, argv[0]);
+	WGL_GET_U32(prec_type, argv[1]);
+
+#if defined(GPAC_USE_GLES2)
+	glGetShaderPrecisionFormat(shader_type, prec_type, range, &precision);
+#else
+	range[0] = 0;
+	range[1] = 128;
+	precision = 128;
+#endif
+	ret = JS_NewObject(ctx);
+	JS_SetPropertyStr(ctx, ret, "rangeMin", JS_NewInt32(ctx, range[0]));
+	JS_SetPropertyStr(ctx, ret, "rangeMax", JS_NewInt32(ctx, range[1]));
+	JS_SetPropertyStr(ctx, ret, "precision", JS_NewInt32(ctx, precision));
+	return ret;
+}
+static JSValue wgl_getInfoLog(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, u32 type)
+{
+	JSValue ret;
+	int info_length;
+	char *info;
+	GLint program_shader=0;
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	if (type==0) {
+		WGL_GET_GLID(program_shader, argv[0], WebGLProgram_class_id);
+		glGetProgramiv(program_shader, GL_INFO_LOG_LENGTH, &info_length);
+	} else {
+		WGL_GET_GLID(program_shader, argv[0], WebGLShader_class_id);
+		if (type==1) {
+			glGetShaderiv(program_shader, GL_INFO_LOG_LENGTH, &info_length);
+		} else {
+			glGetShaderiv(program_shader, GL_SHADER_SOURCE_LENGTH, &info_length);
+		}
+	}
+	info = gf_malloc(sizeof(char)*(info_length+1));
+	if (type==0) {
+		glGetProgramInfoLog(program_shader, info_length, &info_length, info);
+	} else if (type==1) {
+		glGetShaderInfoLog(program_shader, info_length, &info_length, info);
+	} else {
+		glGetShaderSource(program_shader, info_length, &info_length, info);
+	}
+	info[info_length] = 0;
+	ret = JS_NewString(ctx, info);
+	gf_free(info);
+	return ret;
+}
+
+static JSValue wgl_getProgramInfoLog(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return wgl_getInfoLog(ctx, this_val, argc, argv, 0);
+}
+static JSValue wgl_getShaderInfoLog(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return wgl_getInfoLog(ctx, this_val, argc, argv, 1);
+}
+static JSValue wgl_getShaderSource(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return wgl_getInfoLog(ctx, this_val, argc, argv, 2);
+}
+static JSValue wgl_getTexParameter(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	u32 pname = 0;
+	GLint params;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	glGetTexParameteriv(target, pname, &params);
+	return JS_NewInt32(ctx, params);
+}
+static JSValue wgl_getUniform(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLint program_shader=0;
+	GLint location=0;
+	GLint i, j, activeUniforms=0;
+	GLsizei len;
+	GLint size, length;
+	GLenum type, base_type;
+	Bool found = GF_FALSE;
+	GLfloat values_f[16];
+	GLint values_i[4];
+	GLuint values_ui[4];
+	JSValue res;
+	char name[1024], sname[1150];
+
+	WGL_CHECK_CONTEXT
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	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
+	//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
+
+	glGetProgramiv(program_shader, GL_ACTIVE_UNIFORMS, &activeUniforms);
+	for (i=0; i<activeUniforms; i++) {
+		glGetActiveUniform(program_shader, i, 1024, &len, &size, &type, name);
+		if ((len>3) && !strcmp(name+len-3, "[0]")) {
+			len -= 3;
+			name[len] = 0;
+		}
+
+		for (j=0; j<size; j++) {
+			strcpy(sname, name);
+			if ((size > 1) && (j >= 1)) {
+				char szIdx[100];
+                sprintf(szIdx, "[%d]", j);
+                strcat(sname, szIdx);
+            }
+			GLint loc = glGetUniformLocation(program_shader, sname);
+			if (loc == location) {
+				found = GF_TRUE;
+				break;
+			}
+		}
+		if (found) break;
+	}
+	if (!found) {
+		return js_throw_err_msg(ctx, WGL_INVALID_VALUE, "[WebGL] uniform not found");
+	}
+	switch (type) {
+	case GL_BOOL: base_type = GL_BOOL; length = 1; break;
+	case GL_BOOL_VEC2: base_type = GL_BOOL; length = 2; break;
+	case GL_BOOL_VEC3: base_type = GL_BOOL; length = 3; break;
+	case GL_BOOL_VEC4: base_type = GL_BOOL; length = 4; break;
+	case GL_INT: base_type = GL_INT; length = 1; break;
+	case GL_INT_VEC2: base_type = GL_INT; length = 2; break;
+	case GL_INT_VEC3: base_type = GL_INT; length = 3; break;
+	case GL_INT_VEC4: base_type = GL_INT; length = 4; break;
+	case GL_FLOAT: base_type = GL_FLOAT; length = 1; break;
+	case GL_FLOAT_VEC2: base_type = GL_FLOAT; length = 2; break;
+	case GL_FLOAT_VEC3: base_type = GL_FLOAT; length = 3; break;
+	case GL_FLOAT_VEC4: base_type = GL_FLOAT; length = 4; break;
+	case GL_FLOAT_MAT2: base_type = GL_FLOAT; length = 4; break;
+	case GL_FLOAT_MAT3: base_type = GL_FLOAT; length = 9; break;
+	case GL_FLOAT_MAT4: base_type = GL_FLOAT; length = 16; break;
+	case GL_SAMPLER_2D:
+	case GL_SAMPLER_CUBE:
+		base_type = GL_INT;
+		length = 1;
+		break;
+	default:
+		return js_throw_err_msg(ctx, WGL_INVALID_VALUE, "[WebGL] uniform type not supported");
+	}
+
+#define RETURN_SINGLE_OR_ARRAY(__fun, __arr) \
+		if (length == 1) return __fun(ctx, __arr[0]);\
+		res = JS_NewArray(ctx);\
+		JS_SetPropertyStr(ctx, res, "length", JS_NewInt32(ctx, length));\
+		for (i=0; i<length; i++)\
+			JS_SetPropertyUint32(ctx, res, i, __fun(ctx, __arr[i]) );\
+		return res;
+
+	switch (base_type) {
+	case GL_FLOAT:
+		glGetUniformfv(program_shader, location, values_f);
+		RETURN_SINGLE_OR_ARRAY(JS_NewFloat64, values_f);
+
+	case GL_INT:
+		glGetUniformiv(program_shader, location, values_i);
+		RETURN_SINGLE_OR_ARRAY(JS_NewInt32, values_i);
+
+	case GL_UNSIGNED_INT:
+		//TODO - support for GLES3 is needed for this one, for now use the integer version
+		glGetUniformiv(program_shader, location, values_ui);
+		RETURN_SINGLE_OR_ARRAY(JS_NewInt64, values_ui);
+
+	case GL_BOOL:
+		glGetUniformiv(program_shader, location, values_i);
+		RETURN_SINGLE_OR_ARRAY(JS_NewBool, values_i);
+
+	default:
+		break;
+	}
+
+#undef RETURN_GLANY_SINGLE_OR_ARRAY
+
+	return js_throw_err_msg(ctx, WGL_INVALID_VALUE, "[WebGL] uniform type not supported");
+}
+
+static JSValue wgl_getVertexAttrib(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret;
+	u32 i, count;
+	u32 index = 0;
+	u32 pname = 0;
+	Float floats[4];
+	s32 ints[4];
+	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(index, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	switch (pname) {
+	case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING:
+		glGetVertexAttribiv(index, pname, ints);
+		if (!ints[0]) return JS_NULL;
+		count = gf_list_count(glc->all_objects);
+		for (i=0; i<count; i++) {
+			GF_WebGLObject *ob = gf_list_get(glc->all_objects, i);
+			if (ob->class_id==WebGLBuffer_class_id) {
+				if (ob->gl_id==ints[0]) return JS_DupValue(ctx, ob->obj);
+			}
+		}
+		return js_throw_err(ctx, WGL_INVALID_VALUE);
+	case GL_CURRENT_VERTEX_ATTRIB:
+		glGetVertexAttribfv(index, pname, floats);
+		ret = JS_NewArray(ctx);
+		for (i=0; i<4; i++)
+			JS_SetPropertyUint32(ctx, ret, i, JS_NewFloat64(ctx, floats[i]));
+		return ret;
+	case GL_VERTEX_ATTRIB_ARRAY_ENABLED:
+	case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED:
+		glGetVertexAttribiv(index, pname, ints);
+		return ints[0] ? JS_TRUE : JS_FALSE;
+	case GL_VERTEX_ATTRIB_ARRAY_SIZE:
+	case GL_VERTEX_ATTRIB_ARRAY_STRIDE:
+	case GL_VERTEX_ATTRIB_ARRAY_TYPE:
+		glGetVertexAttribiv(index, pname, ints);
+		return JS_NewInt32(ctx, ints[0]);
+	}
+	return js_throw_err(ctx, WGL_INVALID_VALUE);
+}
+static JSValue wgl_getVertexAttribOffset(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 index = 0;
+	u32 pname = 0;
+	void *ptr = NULL;
+	WGL_CHECK_CONTEXT
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(index, argv[0]);
+	WGL_GET_U32(pname, argv[1]);
+	glGetVertexAttribPointerv(index, pname, &ptr);
+#ifdef GPAC_64_BITS
+	return JS_NewInt64(ctx, (u64) ptr);
+#else
+	return JS_NewInt64(ctx, (u32) ptr);
+#endif
+}
+static JSValue wgl_readPixels(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	s32 x = 0;
+	s32 y = 0;
+	u32 width = 0;
+	u32 height = 0;
+	u32 format = 0;
+	u32 type = 0;
+	u32 req_size=0;
+	u8 *ab;
+	u32 ab_size;
+	WGL_CHECK_CONTEXT
+	if (argc<7) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_S32(x, argv[0]);
+	WGL_GET_S32(y, argv[1]);
+	WGL_GET_U32(width, argv[2]);
+	WGL_GET_U32(height, argv[3]);
+	WGL_GET_U32(format, argv[4]);
+	WGL_GET_U32(type, argv[5]);
+	ab = wgl_GetArrayBuffer(ctx, &ab_size, argv[6]);
+	if (!ab) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	req_size = width * height;
+	if (format==GL_RGB) {
+		req_size *= 3;
+	} else if (format==GL_RGBA) {
+		req_size *= 4;
+	} else {
+		return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	}
+	if (type==GL_UNSIGNED_BYTE) {
+	} else if (type==GL_UNSIGNED_SHORT) {
+		req_size *= 2;
+	} else if (type==GL_FLOAT) {
+		req_size *= 4;
+	} else {
+		return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	}
+	if (req_size>ab_size) {
+		return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	}
+	glReadPixels(x, y, width, height, format, type, ab);
+
+	return JS_UNDEFINED;
+}
+
+GF_WebGLNamedTexture *wgl_locate_named_tx(GF_WebGLContext *glc, char *name)
+{
+	u32 i, count = gf_list_count(glc->named_textures);
+	for (i=0; i<count; i++) {
+		GF_WebGLNamedTexture *tx = gf_list_get(glc->named_textures, i);
+		if (!strcmp(tx->tx_name, name)) return tx;
+	}
+	return NULL;
+}
+
+static JSValue wgl_shaderSource(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GLint shader=0;
+	Bool has_gptx=GF_FALSE;
+	char *source, *gf_source=NULL;
+	const char *final_source;
+	u32 len = 0;
+	u32 count, i;
+	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_GLID(shader, argv[0], WebGLShader_class_id);
+	source = (char *) JS_ToCString(ctx, argv[1]);
+	if (!source) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	count = gf_list_count(glc->named_textures);
+	for (i=0; i<count; i++) {
+		u32 namelen;
+		GF_WebGLNamedTexture *named_tx = gf_list_get(glc->named_textures, i);
+		char *a_source = source;
+		namelen = (u32) strlen(named_tx->tx_name);
+
+		while (a_source) {
+			char *loc = strstr(source, "texture2D");
+			if (!loc) break;
+			loc += 9;
+			while (loc[0] && strchr(" (\n\t", loc[0])) loc++;
+			if (strchr(" ,)\n\t", loc[namelen])) {
+				has_gptx = GF_TRUE;
+				break;
+			}
+			a_source = loc;
+		}
+		if (has_gptx) break;
+	}
+
+	if (has_gptx) {
+		char *o_src;
+		char *main_fn = NULL;
+		char *start = strstr(source, "void main(");
+		if (!start) {
+			JS_FreeCString(ctx, source);
+			return js_throw_err_msg(ctx, WGL_INVALID_VALUE, "Missing main in shader");
+		}
+		start[0] = 0;
+		//strip all sample2D declarations for GPACTextures
+		o_src = source;
+		while (o_src) {
+			char c;
+			Bool found = GF_FALSE;
+			char *sep, *start = strstr(o_src, "uniform sampler2D ");
+			if (!start) {
+				gf_dynstrcat(&gf_source, o_src, NULL);
+				break;
+			}
+			sep = start + strlen("uniform sampler2D ");
+			for (i=0; i<count; i++) {
+				u32 namelen;
+				GF_WebGLNamedTexture *named_tx = gf_list_get(glc->named_textures, i);
+				namelen = (u32) strlen(named_tx->tx_name);
+				if (strncmp(sep, named_tx->tx_name, namelen)) continue;
+
+				if (strchr(" \n\t;", sep[namelen])) {
+					sep += namelen;
+					while (sep[0] && strchr(" ;", sep[0])) sep++;
+					start[0] = 0;
+					gf_dynstrcat(&gf_source, o_src, NULL);
+					start[0] = 'u';
+					o_src = sep;
+					found = GF_TRUE;
+					break;
+				}
+				if (found) break;
+			}
+			if (found) continue;
+			c = sep[0];
+			sep[0] = 0;
+			gf_dynstrcat(&gf_source, o_src, NULL);
+			sep[0] = c;
+			o_src = sep;
+		}
+
+		start[0] = 'v';
+
+		while (start && start[0]) {
+			char c;
+			char *next;
+			GF_WebGLNamedTexture *named_tx;
+			char *end_gfTx;
+			char *has_gfTx = strstr(start, "texture2D");
+			if (!has_gfTx) {
+				gf_dynstrcat(&main_fn, start, NULL);
+				break;
+			}
+
+			end_gfTx = has_gfTx + strlen("texture2D");
+			while (end_gfTx[0] && strchr(" (\n", end_gfTx[0]))
+				end_gfTx++;
+			next = end_gfTx;
+			while (next[0] && !strchr(" (,)\n", next[0]))
+				next++;
+
+			c = next[0];
+			next[0] = 0;
+			named_tx = wgl_locate_named_tx(glc, end_gfTx);
+
+			//not a named texture, do not replace code
+			if (!named_tx) {
+				next[0] = c;
+				has_gfTx[0] = 0;
+				gf_dynstrcat(&main_fn, start, NULL);
+				has_gfTx[0] = 't';
+				gf_dynstrcat(&main_fn, "texture2D", NULL);
+				start = has_gfTx + 9;
+				continue;
+			}
+			//named texture but unknown pixel format, cannot create shader
+			if (!named_tx->tx.pix_fmt) {
+				JSValue ret = js_throw_err_msg(ctx, WGL_INVALID_VALUE, "NamedTexture %s pixel format undefined, cannot create shader", has_gfTx);
+				JS_FreeCString(ctx, source);
+				gf_free(gf_source);
+				return ret;
+			}
+			next[0] = c;
+
+			has_gfTx[0] = 0;
+			gf_dynstrcat(&main_fn, start, NULL);
+			has_gfTx[0] = 't';
+
+			gf_dynstrcat(&main_fn, named_tx->tx_name, NULL);
+			gf_dynstrcat(&main_fn, "_sample(", NULL);
+			while (next[0] && strchr(" ,", next[0]))
+				next++;
+
+			if (gf_gl_txw_insert_fragment_shader(named_tx->tx.pix_fmt, named_tx->tx_name, &gf_source))
+				named_tx->shader_attached = GF_TRUE;
+
+			start = next;
+		}
+		gf_dynstrcat(&gf_source, main_fn, NULL);
+		gf_free(main_fn);
+		final_source = gf_source;
+	} else {
+		final_source = source;
+	}
+	len = (u32) strlen(final_source);
+	glShaderSource(shader, 1, &final_source, &len);
+
+	JS_FreeCString(ctx, source);
+	if (gf_source) gf_free(gf_source);
+	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)
+{
+	GF_FilterPacket *pck = NULL;
+	GF_FilterFrameInterface *frame_ifce = NULL;
+	const u8 *data=NULL;
+
+	/*try GF_FilterPacket*/
+	if (jsf_is_packet(c, pck_obj)) {
+		pck = (GF_FilterPacket *) jsf_get_packet(c, pck_obj);
+		if (!pck) return js_throw_err(c, WGL_INVALID_VALUE);
+
+		frame_ifce = gf_filter_pck_get_frame_interface(pck);
+	}
+	/*try evg Texture*/
+	else if (js_evg_is_texture(c, pck_obj)) {
+	} else {
+		return js_throw_err(c, WGL_INVALID_VALUE);
+	}
+
+	//setup texture
+	if (!named_tx->tx.pix_fmt) {
+		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 (!gf_gl_txw_setup(&named_tx->tx, pix_fmt, width, height, stride, uv_stride, GF_FALSE, frame_ifce)) {
+			return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Pixel format %s unknown, cannot setup NamedTexture\n", gf_4cc_to_str(pix_fmt));
+		}
+	}
+
+	//fetch data
+	if (!frame_ifce) {
+		u32 size=0;
+		if (pck) {
+			data = gf_filter_pck_get_data(pck, &size);
+			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);
+			if (!data)
+				return js_throw_err_msg(c, WGL_INVALID_VALUE, "[WebGL] Unable to fetch EVG texture data, cannot setup NamedTexture\n");
+		}
+	}
+
+	gf_gl_txw_upload(&named_tx->tx, data, frame_ifce);
+
+	return JS_UNDEFINED;
+}
+
+static JSValue wgl_texImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	s32 level = 0;
+	s32 internalformat = 0;
+	u32 width = 0;
+	u32 height = 0;
+	s32 border = 0;
+	u32 format = 0;
+	u32 type = 0;
+	u32 pixfmt;
+	u32 stride;
+	u32 stride_uv;
+	u8 *p_u, *p_v, *p_a;
+	u8 *pix_buf;
+	u32 pix_buf_size=0;
+
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	if (argc<6) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_S32(internalformat, argv[2]);
+	/*from texture object*/
+	if (JS_IsObject(argv[5])) {
+
+		WGL_GET_U32(format, argv[3]);
+		WGL_GET_U32(type, argv[4]);
+	}
+	/*from array buffer*/
+	else {
+		if (argc==8) {
+
+		} else if ((argc<9) || (!JS_IsObject(argv[8]) && !JS_IsNull(argv[8]))) {
+			return js_throw_err(ctx, WGL_INVALID_VALUE);
+		}
+
+		WGL_GET_U32(width, argv[3]);
+		WGL_GET_U32(height, argv[4]);
+		WGL_GET_S32(border, argv[5]);
+		WGL_GET_U32(format, argv[6]);
+		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);
+		return JS_UNDEFINED;
+	}
+
+	/*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);
+	}
+
+	/*check if this is an EVG texture*/
+	if (js_evg_get_texture_info(ctx, argv[5], &width, &height, &pixfmt, &pix_buf, &stride, &p_u, &p_v, &stride_uv, &p_a)) {
+		switch (pixfmt) {
+		case GF_PIXEL_GREYSCALE:
+			format = GL_LUMINANCE;
+			type = GL_TEXTURE_2D;
+			break;
+		case GF_PIXEL_ALPHAGREY:
+		case GF_PIXEL_GREYALPHA:
+			format = GL_LUMINANCE_ALPHA;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		case GF_PIXEL_RGB:
+			format = GL_RGB;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		case GF_PIXEL_RGBA:
+			format = GL_RGBA;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		default:
+			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);
+		return JS_UNDEFINED;
+	}
+	/*otherwise not supported*/
+	return js_throw_err(ctx, WGL_INVALID_OPERATION);
+}
+
+static JSValue wgl_texSubImage2D(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 target = 0;
+	s32 level = 0;
+	s32 xoffset = 0;
+	s32 yoffset = 0;
+	u32 width = 0;
+	u32 height = 0;
+	u32 format = 0;
+	u32 type = 0;
+	u32 pixfmt, stride, stride_uv;
+	u8 *pix_buf, *p_u, *p_v, *p_a;
+	u32 pix_buf_size=0;
+	WGL_CHECK_CONTEXT
+	if (argc<7) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	WGL_GET_U32(target, argv[0]);
+	WGL_GET_S32(level, argv[1]);
+	WGL_GET_S32(xoffset, argv[2]);
+	WGL_GET_S32(yoffset, argv[3]);
+	/*from texture object*/
+	if (JS_IsObject(argv[6])) {
+
+		WGL_GET_U32(format, argv[4]);
+		WGL_GET_U32(type, argv[5]);
+	}
+	/*from array buffer*/
+	else {
+		if ((argc<9) || !JS_IsObject(argv[8])) {
+			return js_throw_err(ctx, WGL_INVALID_VALUE);
+		}
+
+		WGL_GET_U32(width, argv[4]);
+		WGL_GET_U32(height, argv[5]);
+		WGL_GET_U32(format, argv[6]);
+		WGL_GET_U32(type, argv[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);
+		return JS_UNDEFINED;
+	}
+
+	/*check if this is an EVG texture*/
+	if (js_evg_get_texture_info(ctx, argv[6], &width, &height, &pixfmt, &pix_buf, &stride, &p_u, &p_v, &stride_uv, &p_a)) {
+		switch (pixfmt) {
+		case GF_PIXEL_GREYSCALE:
+			format = GL_LUMINANCE;
+			type = GL_TEXTURE_2D;
+			break;
+		case GF_PIXEL_ALPHAGREY:
+		case GF_PIXEL_GREYALPHA:
+			format = GL_LUMINANCE_ALPHA;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		case GF_PIXEL_RGB:
+			format = GL_RGB;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		case GF_PIXEL_RGBA:
+			format = GL_RGBA;
+			type = GL_UNSIGNED_BYTE;
+			break;
+		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);
+		return JS_UNDEFINED;
+	}
+	return js_throw_err(ctx, WGL_INVALID_OPERATION);
+}
+
+static JSValue wgl_useProgram(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	GLuint program = 0;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_GLID(program, argv[0], WebGLProgram_class_id);
+	glUseProgram(program);
+	glc->active_program = program;
+	return ret_val_js;
+}
+static JSValue wgl_activeTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 texture = 0;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	if (argc<1) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(texture, argv[0]);
+	glActiveTexture(texture);
+	glc->active_texture = texture;
+	return ret_val_js;
+}
+
+static JSValue wgl_createTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	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])) {
+		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);
+
+		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_name);
+		JS_FreeCString(ctx, tx_name);
+		ret_val_js = JS_NewObjectClass(ctx, NamedTexture_class_id);
+		JS_SetOpaque(ret_val_js, named_tx);
+		gf_list_add(glc->named_textures, named_tx);
+	} else {
+		GF_WebGLObject *wglo;
+		GF_SAFEALLOC(wglo, GF_WebGLObject);
+		if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+		wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+		glGenTextures(1, &wglo->gl_id);
+		ret_val_js = JS_NewObjectClass(ctx, WebGLTexture_class_id);
+		JS_SetOpaque(ret_val_js, wglo);
+		wglo->obj = JS_DupValue(ctx, ret_val_js);
+		wglo->class_id = WebGLTexture_class_id;
+		gf_list_add(wglo->par_ctx->all_objects, wglo);
+	}
+	return ret_val_js;
+}
+
+
+static JSValue wgl_bindTexture(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_WebGLObject *tx = NULL;
+	GF_WebGLNamedTexture *named_tx = NULL;
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	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;
+
+	WGL_GET_U32(target, argv[0]);
+	tx = JS_GetOpaque(argv[1], WebGLTexture_class_id);
+	if (!tx)
+		named_tx = JS_GetOpaque(argv[1], NamedTexture_class_id);
+	if (!tx && !named_tx) {
+		glBindTexture(target, 0);
+		return ret_val_js;
+	}
+	if (tx) {
+		glBindTexture(target, tx->gl_id);
+		return ret_val_js;
+	}
+	glc->bound_named_texture = named_tx;
+
+	GL_CHECK_ERR()
+
+	/*this happens when using regular calls instead of pck_tx.upload(ipck):
+		  gl.bindTexture(gl.TEXTURE_2D, pck_tx);
+		  gl.texImage2D(gl.TEXTURE_2D, 0, 0, 0, 0, ipck);
+
+	in this case, the shader is not yet created but we do not throw an error for the sake of compatibility with usual GL programming
+	*/
+	if (!named_tx->shader_attached || !glc->active_program)
+		return JS_UNDEFINED;
+
+	if (!gf_gl_txw_bind(&named_tx->tx, named_tx->tx_name, glc->active_program, glc->active_texture)) {
+		return js_throw_err(ctx, WGL_INVALID_OPERATION);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue wgl_getUniformLocation(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js;
+	GLuint program = 0;
+	GLint uni_loc=0;
+	const char * name = 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_GLID(program, argv[0], WebGLProgram_class_id);
+	WGL_GET_STRING(name, argv[1]);
+	GF_WebGLObject *wglo;
+
+	uni_loc = glGetUniformLocation(program, name);
+	if (uni_loc<0) {
+		u32 i, count = gf_list_count(glc->named_textures);
+		uni_loc = -1;
+		for (i=0; i<count; i++) {
+			GF_WebGLNamedTexture *named_tx = gf_list_get(glc->named_textures, i);
+			if (!strcmp(named_tx->tx_name, name)) {
+				uni_loc = -2;
+				break;
+			}
+		}
+		if (uni_loc==-1)
+			return JS_NULL;
+	}
+	GF_SAFEALLOC(wglo, GF_WebGLObject);
+	if (!wglo) return js_throw_err(ctx, WGL_OUT_OF_MEMORY);
+	wglo->par_ctx = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	wglo->gl_id = uni_loc;
+
+	ret_val_js = JS_NewObjectClass(ctx, WebGLUniformLocation_class_id);
+	JS_SetOpaque(ret_val_js, wglo);
+	wglo->obj = JS_DupValue(ctx, ret_val_js);
+	wglo->class_id = WebGLUniformLocation_class_id;
+	gf_list_add(wglo->par_ctx->all_objects, wglo);
+	JS_FreeCString(ctx, name);
+	return ret_val_js;
+}
+
+JSValue wgl_bindFramebuffer(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue ret_val_js = JS_UNDEFINED;
+	u32 target = 0;
+	GLuint framebuffer = 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(target, argv[0]);
+	WGL_GET_GLID(framebuffer, argv[1], WebGLFramebuffer_class_id);
+	if (framebuffer)
+		glBindFramebuffer(target, framebuffer);
+	else
+		glBindFramebuffer(target, glc->fbo_id);
+	return ret_val_js;
+}
+
+
+void webgl_pck_tex_depth_del(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck, Bool is_depth)
+{
+	JSValue *fun = NULL;
+	GF_FilterFrameInterface *f_ifce = gf_filter_pck_get_frame_interface(pck);
+	if (!f_ifce) return;
+	GF_WebGLContext *glc = (GF_WebGLContext *)f_ifce->user_data;
+	if (!glc) return;
+
+	if (is_depth)
+		fun = &glc->depth_frame_flush;
+	else
+		fun = &glc->tex_frame_flush;
+
+	if (!JS_IsUndefined(*fun)) {
+		JSValue ret = JS_Call(glc->ctx, *fun, JS_UNDEFINED, 0, NULL);
+		JS_FreeValue(glc->ctx, ret);
+
+		JS_FreeValue(glc->ctx, *fun);
+		*fun = JS_UNDEFINED;
+	}
+}
+void webgl_pck_tex_del(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck)
+{
+	webgl_pck_tex_depth_del(filter, PID, pck, GF_FALSE);
+}
+
+void webgl_pck_depth_del(GF_Filter *filter, GF_FilterPid *PID, GF_FilterPacket *pck)
+{
+	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 *frame_flush_fun = NULL;
+	GF_WebGLContext *glc;
+	if (argc<2) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	if (!JS_IsFunction(ctx, argv[1])) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	glc = JS_GetOpaque(argv[0], WebGLRenderingContextBase_class_id);
+	if (!glc) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	if ((argc>2) && JS_ToBool(ctx, argv[2]) ) {
+		if (glc->actual_attrs.depth != WGL_DEPTH_TEXTURE)
+			return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+		*pck_del = webgl_pck_depth_del;
+		frame_flush_fun = &glc->depth_frame_flush;
+		*f_ifce = &glc->depth_f_ifce;
+	} else {
+		*pck_del = webgl_pck_tex_del;
+		frame_flush_fun = &glc->tex_frame_flush;
+		*f_ifce = &glc->tex_f_ifce;
+	}
+	if (!JS_IsUndefined(*frame_flush_fun))
+		return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	JS_FreeValue(ctx, *frame_flush_fun);
+	glc->tex_frame_flush = JS_UNDEFINED;
+	if (JS_IsFunction(ctx, argv[1])) {
+		*frame_flush_fun = JS_DupValue(ctx, argv[1]);
+	}
+	return JS_TRUE;
+}
+
+static GF_Err webgl_get_texture(GF_FilterFrameInterface *ifce, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_Matrix *texcoordmatrix)
+{
+	GF_WebGLContext *glc = ifce->user_data;
+	if (!glc) return GF_BAD_PARAM;
+	if (plane_idx) return GF_BAD_PARAM;
+	*gl_tex_id = glc->tex_id;
+	*gl_tex_format = GL_TEXTURE_2D;
+	if (texcoordmatrix)
+		gf_mx_add_scale(texcoordmatrix, FIX_ONE, -FIX_ONE, FIX_ONE);
+	return GF_OK;
+}
+static GF_Err webgl_get_depth(GF_FilterFrameInterface *ifce, u32 plane_idx, u32 *gl_tex_format, u32 *gl_tex_id, GF_Matrix *texcoordmatrix)
+{
+	GF_WebGLContext *glc = ifce->user_data;
+	if (!glc) return GF_BAD_PARAM;
+	if (plane_idx) return GF_BAD_PARAM;
+	*gl_tex_id = glc->depth_id;
+	*gl_tex_format = GL_TEXTURE_2D;
+	if (texcoordmatrix)
+		gf_mx_add_scale(texcoordmatrix, FIX_ONE, -FIX_ONE, FIX_ONE);
+	return GF_OK;
+}
+static JSValue webgl_setup_fbo(JSContext *ctx, GF_WebGLContext *glc, u32 width, u32 height)
+{
+	glc->width = width;
+	glc->height = height;
+
+	if (glc->creation_attrs.primary) {
+		return JS_UNDEFINED;
+	}
+	/*create fbo*/
+	glGenTextures(1, &glc->tex_id);
+	if (!glc->tex_id) {
+		gf_free(glc);
+		return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to create OpenGL texture %d", glGetError() );
+	}
+	glBindTexture(GL_TEXTURE_2D, glc->tex_id);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexImage2D(GL_TEXTURE_2D, 0, glc->actual_attrs.alpha ? GL_RGBA : GL_RGB, width, height, 0, glc->actual_attrs.alpha ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE, NULL);
+
+	glGenFramebuffers(1, &glc->fbo_id);
+	if (!glc->fbo_id) {
+		glDeleteTextures(1, &glc->tex_id);
+		gf_free(glc);
+		return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to create OpenGL Framebuffer %d", glGetError() );
+	}
+	glBindFramebuffer(GL_FRAMEBUFFER, glc->fbo_id);
+	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, glc->tex_id, 0);
+
+	if (glc->actual_attrs.depth != WGL_DEPTH_NO) {
+		if (glc->actual_attrs.depth==WGL_DEPTH_TEXTURE) {
+			glGenTextures(1, &glc->depth_id);
+			if (!glc->depth_id) {
+				glDeleteTextures(1, &glc->tex_id);
+				glDeleteFramebuffers(1, &glc->fbo_id);
+				gf_free(glc);
+				return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to create OpenGL depth texture %d", glGetError() );
+			}
+			glBindTexture(GL_TEXTURE_2D, glc->depth_id);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			glTexImage2D(GL_TEXTURE_2D, 0,
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+					GL_DEPTH_COMPONENT16,
+#else
+					GL_DEPTH_COMPONENT24,
+#endif
+					width, height, 0, GL_DEPTH_COMPONENT, GL_INT, NULL);
+
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, glc->depth_id, 0);
+
+		} else {
+			glGenRenderbuffers(1, &glc->depth_id);
+			if (!glc->depth_id) {
+				glDeleteTextures(1, &glc->tex_id);
+				glDeleteFramebuffers(1, &glc->fbo_id);
+				gf_free(glc);
+				return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to create OpenGL depth renderbuffer %d", glGetError() );
+			}
+
+			glBindRenderbuffer(GL_RENDERBUFFER, glc->depth_id);
+#if defined(GPAC_CONFIG_IOS) ||  defined(GPAC_CONFIG_ANDROID)
+			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, width, height);
+#else
+			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height);
+#endif
+			glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, glc->depth_id);
+		}
+	}
+   	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+   	switch (status) {
+   	case GL_FRAMEBUFFER_COMPLETE:
+   		break;
+	default:
+		glDeleteTextures(1, &glc->tex_id);
+		glDeleteRenderbuffers(1, &glc->depth_id);
+		glDeleteFramebuffers(1, &glc->fbo_id);
+		gf_free(glc);
+		return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to initialize OpenGL FBO:  %08x", status );
+   }
+
+	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+	return JS_UNDEFINED;
+}
+static JSValue webgl_constructor(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	u32 idx=0;
+	u32 width = 0;
+	u32 height = 0;
+	GF_Err e;
+	GF_WebGLContext *glc;
+	JSValue v;
+	Bool fake_canvas = GF_FALSE;
+
+	if (argc && JS_IsObject(argv[0])) {
+		v = JS_GetPropertyStr(ctx, argv[0], "width");
+		JS_ToInt32(ctx, &width, v);
+		JS_FreeValue(ctx, v);
+
+		v = JS_GetPropertyStr(ctx, argv[0], "height");
+		JS_ToInt32(ctx, &height, v);
+		JS_FreeValue(ctx, v);
+		idx=1;
+		fake_canvas = GF_TRUE;
+	} else if (argc>=2) {
+		WGL_GET_S32(width, argv[0]);
+		WGL_GET_S32(height, argv[1]);
+		idx=2;
+	}
+	if (!width || !height) {
+		return js_throw_err_msg(ctx, GF_BAD_PARAM, "Invalid width/height %dx%d while creating OpenGL context", width, height);
+	}
+
+	e = jsf_request_opengl(ctx);
+	if (e) return js_throw_err_msg(ctx, e, "Failed to load OpenGL");
+	GF_SAFEALLOC(glc, GF_WebGLContext);
+	if (!glc) return js_throw_err_msg(ctx, GF_OUT_OF_MEM, "Failed to allocate OpenGL context");
+	glc->creation_attrs.alpha = GF_TRUE;
+	glc->creation_attrs.depth = WGL_DEPTH_YES;
+	glc->creation_attrs.antialias = GF_TRUE;
+	glc->creation_attrs.premultipliedAlpha = GF_TRUE;
+	if ((argc>(s32)idx) && JS_IsObject(argv[idx])) {
+#define GET_BOOL(_opt)\
+		v = JS_GetPropertyStr(ctx, argv[idx], #_opt);\
+		if (!JS_IsUndefined(v)) glc->creation_attrs._opt = JS_ToBool(ctx, v);\
+		JS_FreeValue(ctx, v);\
+
+		GET_BOOL(alpha)
+		GET_BOOL(stencil)
+		GET_BOOL(antialias)
+		GET_BOOL(premultipliedAlpha)
+		GET_BOOL(preserveDrawingBuffer)
+		GET_BOOL(failIfMajorPerformanceCaveat)
+		GET_BOOL(desynchronized)
+		GET_BOOL(primary)
+#undef GET_BOOL
+
+		v = JS_GetPropertyStr(ctx, argv[idx], "depth");
+		if (!JS_IsUndefined(v)) {
+			if (JS_IsString(v)) {
+				const char *depth_mode = JS_ToCString(ctx, v);
+				if (!strcmp(depth_mode, "false") || !strcmp(depth_mode, "no"))
+					glc->creation_attrs.depth = WGL_DEPTH_NO;
+				else if (!strcmp(depth_mode, "true") || !strcmp(depth_mode, "yes"))
+					glc->creation_attrs.depth = WGL_DEPTH_YES;
+				else if (!strcmp(depth_mode, "texture"))
+					glc->creation_attrs.depth = WGL_DEPTH_TEXTURE;
+				JS_FreeCString(ctx, depth_mode);
+			} else {
+				glc->creation_attrs.depth = JS_ToBool(ctx, v) ? WGL_DEPTH_YES : WGL_DEPTH_NO;
+			}
+		}
+		JS_FreeValue(ctx, v);
+
+		if (glc->creation_attrs.primary && (glc->creation_attrs.depth == WGL_DEPTH_TEXTURE)) {
+			gf_free(glc);
+			return js_throw_err_msg(ctx, GF_BAD_PARAM, "Cannot setup WebGL context as primary and output depth texture at the same time");
+		}
+
+		v = JS_GetPropertyStr(ctx, argv[idx], "powerPreference");
+		if (!JS_IsUndefined(v)) {
+			const char *str = JS_ToCString(ctx, v);
+			if (str && !strcmp(str, "low-power")) glc->creation_attrs.powerPreference = WGL_POWER_LOWPOWER;
+			else if (str && !strcmp(str, "high-performance")) glc->creation_attrs.powerPreference = WGL_POWER_HIGHPERF;
+		}
+		JS_FreeValue(ctx, v);
+	}
+	glc->actual_attrs = glc->creation_attrs;
+
+	res = webgl_setup_fbo(ctx, glc, width, height);
+	if (!JS_IsUndefined(res)) return res;
+
+	//not supported
+	glc->actual_attrs.preserveDrawingBuffer = GF_FALSE;
+
+	v = JS_NewObjectClass(ctx, WebGLRenderingContextBase_class_id);
+	JS_SetOpaque(v, glc);
+
+	glc->tex_f_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+	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.user_data = glc;
+	glc->tex_frame_flush = JS_UNDEFINED;
+
+	glc->depth_f_ifce.flags = GF_FRAME_IFCE_BLOCKING;
+	glc->depth_f_ifce.get_gl_texture = webgl_get_depth;
+	glc->depth_f_ifce.user_data = glc;
+	glc->depth_frame_flush = JS_UNDEFINED;
+
+	if (fake_canvas) {
+		glc->canvas = JS_DupValue(ctx, argv[0]);
+	} else {
+		glc->canvas = JS_NewObject(ctx);
+		JS_SetPropertyStr(ctx, glc->canvas, "width", JS_NewInt32(ctx, width));
+		JS_SetPropertyStr(ctx, glc->canvas, "height", JS_NewInt32(ctx, height));
+	}
+	JS_SetPropertyStr(ctx, glc->canvas, "clientWidth", JS_NewInt32(ctx, width));
+	JS_SetPropertyStr(ctx, glc->canvas, "clientHeight", JS_NewInt32(ctx, height));
+	glc->ctx = ctx;
+	glc->all_objects = gf_list_new();
+	glc->named_textures = gf_list_new();
+
+	return v;
+}
+
+static JSValue wgl_activate_gl(JSContext *ctx, GF_WebGLContext *glc, Bool activate)
+{
+	if (activate) {
+		u32 i, count;
+		//clear error
+		glGetError();
+		jsf_set_gl_active(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:
+				return js_throw_err_msg(ctx, GF_IO_ERR, "Failed to bind OpenGL FBO:  %X", status );
+			}
+		}
+
+		count = gf_list_count(glc->named_textures);
+		for (i=0; i<count; i++) {
+			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;
+	} else {
+#if!defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+#endif
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(GL_TEXTURE_2D, 0);
+		glDisable(GL_TEXTURE_2D);
+		//clear error
+		glGetError();
+	}
+	return JS_UNDEFINED;
+}
+static JSValue wgl_activate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Bool activate;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc|| (argc<1)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_BOOL(activate, argv[0]);
+	return wgl_activate_gl(ctx, glc, activate);
+}
+
+static JSValue wgl_resize(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	JSValue res;
+	u32 width, height;
+	GF_WebGLContext *glc = JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id);
+	if (!glc|| (argc<2)) return js_throw_err(ctx, WGL_INVALID_VALUE);
+	WGL_GET_U32(width, argv[0]);
+	WGL_GET_U32(height, argv[1]);
+	if (!width || !height) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	res = wgl_activate_gl(ctx, glc, GF_FALSE);
+	if (!JS_IsUndefined(res)) return res;
+
+	glDeleteTextures(1, &glc->tex_id);
+	glc->tex_id = 0;
+	glDeleteRenderbuffers(1, &glc->depth_id);
+	glc->depth_id = 0;
+	glDeleteFramebuffers(1, &glc->fbo_id);
+	glc->fbo_id = 0;
+
+	res = webgl_setup_fbo(ctx, glc, width, height);
+	if (!JS_IsUndefined(res)) return res;
+
+	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);
+}
+static JSValue wgl_named_tx_reconfigure(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(this_val, NamedTexture_class_id);
+	if (!named_tx) return js_throw_err(ctx, WGL_INVALID_VALUE);
+
+	gf_gl_txw_reset(&named_tx->tx);
+
+	named_tx->shader_attached = GF_FALSE;
+	return JS_UNDEFINED;
+}
+
+
+/*GPAC extensions*/
+static const JSCFunctionListEntry webgl_funcs[] =
+{
+	JS_CFUNC_DEF("activate", 0, wgl_activate),
+	JS_CFUNC_DEF("resize", 0, wgl_resize),
+};
+
+enum
+{
+	WGL_GPTX_NB_TEXTURES = 0,
+	WGL_GPTX_GLTX_IN,
+	WGL_GPTX_NAME,
+	WGL_GPTX_PBO,
+};
+
+static JSValue wgl_named_tx_getProperty(JSContext *ctx, JSValueConst obj, int magic)
+{
+	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(obj, NamedTexture_class_id);
+	if (!named_tx) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	switch (magic) {
+	case WGL_GPTX_NB_TEXTURES:
+		return JS_NewInt32(ctx, named_tx->tx.nb_textures);
+	case WGL_GPTX_GLTX_IN:
+		return named_tx->tx.internal_textures ? JS_FALSE : JS_TRUE;
+	case WGL_GPTX_NAME:
+		return JS_NewString(ctx, named_tx->tx_name);
+	case WGL_GPTX_PBO:
+		return (named_tx->tx.pbo_state>GF_GL_PBO_NONE) ? JS_TRUE : JS_FALSE;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue wgl_named_tx_setProperty(JSContext *ctx, JSValueConst obj, JSValueConst value, int magic)
+{
+	GF_WebGLNamedTexture *named_tx = JS_GetOpaque(obj, NamedTexture_class_id);
+	if (!named_tx) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+	switch (magic) {
+	case WGL_GPTX_PBO:
+		named_tx->tx.pbo_state = JS_ToBool(ctx, value) ? GF_GL_PBO_BOTH : GF_GL_PBO_NONE;
+		break;
+	}
+	return JS_UNDEFINED;
+}
+/*GPAC extensions*/
+static const JSCFunctionListEntry webgl_named_tx_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("nb_textures", wgl_named_tx_getProperty, NULL, WGL_GPTX_NB_TEXTURES),
+	JS_CGETSET_MAGIC_DEF("is_gl_input", wgl_named_tx_getProperty, wgl_named_tx_setProperty, WGL_GPTX_GLTX_IN),
+	JS_CGETSET_MAGIC_DEF("name", wgl_named_tx_getProperty, wgl_named_tx_setProperty, WGL_GPTX_NAME),
+	JS_CGETSET_MAGIC_DEF("pbo", wgl_named_tx_getProperty, wgl_named_tx_setProperty, WGL_GPTX_PBO),
+	JS_CFUNC_DEF("reconfigure", 0, wgl_named_tx_reconfigure),
+	JS_CFUNC_DEF("upload", 0, wgl_named_tx_upload),
+};
+
+
+static int js_webgl_load_module(JSContext *c, JSModuleDef *m)
+{
+	JSValue ctor;
+	JSValue proto;
+	JSRuntime *rt = JS_GetRuntime(c);
+
+	if (!WebGLRenderingContextBase_class_id) {
+#define INITCLASS(_name)\
+		JS_NewClassID(& _name##_class_id);\
+		JS_NewClass(rt, _name##_class_id, & _name##_class);\
+
+		INITCLASS(WebGLRenderingContextBase)
+		INITCLASS(WebGLProgram)
+		INITCLASS(WebGLShader)
+		INITCLASS(WebGLBuffer)
+		INITCLASS(WebGLFramebuffer)
+		INITCLASS(WebGLRenderbuffer)
+		INITCLASS(WebGLTexture)
+		INITCLASS(WebGLUniformLocation)
+		INITCLASS(NamedTexture)
+#undef INITCLASS
+
+	}
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, webgl_funcs, countof(webgl_funcs));
+    JS_SetPropertyFunctionList(c, proto, WebGLRenderingContextBase_funcs, countof(WebGLRenderingContextBase_funcs));
+    JS_SetClassProto(c, WebGLRenderingContextBase_class_id, proto);
+
+	proto = JS_NewObject(c);
+    JS_SetPropertyFunctionList(c, proto, webgl_named_tx_funcs, countof(webgl_named_tx_funcs));
+    JS_SetClassProto(c, NamedTexture_class_id, proto);
+
+	/*export constructors*/
+	ctor = JS_NewCFunction2(c, webgl_constructor, "WebGLContext", 1, JS_CFUNC_constructor, 0);
+    JS_SetModuleExport(c, m, "WebGLContext", ctor);
+	return 0;
+}
+
+void qjs_module_init_webgl(JSContext *ctx)
+{
+	JSModuleDef *m;
+	m = JS_NewCModule(ctx, "webgl", js_webgl_load_module);
+	if (!m) return;
+
+	JS_AddModuleExport(ctx, m, "WebGLContext");
+}
+
+#else
+#include "../scenegraph/qjs_common.h"
+void qjs_module_init_webgl(JSContext *ctx)
+{
+}
+#endif // !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+
+#endif //GPAC_HAS_QJS
+

gpac-1.0.0.tar.gz/src/jsmods/webgl.h Added

@@ -0,0 +1,159 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / WebGL JavaScript extension
+ *
+ *  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/setup.h>
+
+#ifdef GPAC_HAS_QJS
+
+#include "../scenegraph/qjs_common.h"
+#include "../compositor/gl_inc.h"
+#include <gpac/filters.h>
+
+typedef enum {
+	WGL_POWER_DEFAULT=0,
+	WGL_POWER_LOWPOWER,
+	WGL_POWER_HIGHPERF,
+} WebGLPowerPreference;
+
+typedef enum {
+	WGL_DEPTH_NO=0,
+	WGL_DEPTH_YES,
+	WGL_DEPTH_TEXTURE,
+} WebGLDepthAttach;
+
+typedef struct
+{
+	Bool alpha;
+    WebGLDepthAttach depth;
+    Bool stencil;
+    Bool antialias;
+    Bool premultipliedAlpha;
+    Bool preserveDrawingBuffer;
+    WebGLPowerPreference powerPreference;
+    Bool failIfMajorPerformanceCaveat;
+    Bool desynchronized;
+    Bool primary;
+} GF_WebGLContextAttributes;
+
+typedef struct
+{
+	GF_FilterFrameInterface tex_f_ifce;
+	GF_FilterFrameInterface depth_f_ifce;
+	/*internal*/
+	GF_WebGLContextAttributes creation_attrs;
+	GF_WebGLContextAttributes actual_attrs;
+	GLint tex_id, depth_id, stencil_id, fbo_id;
+	u32 width, height;
+
+	JSValue canvas;
+
+	JSContext *ctx;
+	JSValue tex_frame_flush;
+	JSValue depth_frame_flush;
+
+	GF_List *all_objects;
+	GF_List *named_textures;
+	GLint active_program;
+	GLint active_texture;
+
+	struct _wgl_named_texture *bound_named_texture;
+} GF_WebGLContext;
+
+typedef struct
+{
+	GLuint gl_id;
+	GF_WebGLContext *par_ctx;
+	JSValue obj; //object reference
+	JSClassID class_id; //object class
+} GF_WebGLObject;
+
+
+typedef struct _wgl_named_texture
+{
+	Bool shader_attached;
+	GF_WebGLContext *par_ctx;
+	char *tx_name;
+
+	GF_GLTextureWrapper tx;
+} 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);
+
+Bool js_evg_is_texture(JSContext *ctx, JSValue this_obj);
+
+
+typedef GLuint WebGLContextAttributes;
+typedef GF_WebGLObject *WebGLProgram;
+typedef GF_WebGLObject *WebGLShader;
+typedef GF_WebGLObject *WebGLBuffer;
+typedef GF_WebGLObject *WebGLFramebuffer;
+typedef GF_WebGLObject *WebGLRenderbuffer;
+typedef GF_WebGLObject *WebGLTexture;
+typedef GF_WebGLObject *WebGLUniformLocation;
+
+#define WGL_NO_ERROR	0
+#define WGL_INVALID_ENUM 0x0500
+#define WGL_INVALID_VALUE 0x0501
+#define WGL_INVALID_OPERATION 0x0502
+#define WGL_OUT_OF_MEMORY 0x0505
+
+
+enum
+{
+	WebGLRenderingContextBase_PROP_canvas,
+	WebGLRenderingContextBase_PROP_drawingBufferWidth,
+	WebGLRenderingContextBase_PROP_drawingBufferHeight,
+};
+
+
+#define WGL_GET_BOOL(_name, _jsval) _name = JS_ToBool(ctx, _jsval)
+#define WGL_GET_U32(_name, _jsval) if (JS_ToInt32(ctx, &_name, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE)
+#define WGL_GET_S32(_name, _jsval) if (JS_ToInt32(ctx, &_name, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE)
+#define WGL_GET_U64(_name, _jsval) if (JS_ToInt64(ctx, &_name, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE)
+#define WGL_GET_S64(_name, _jsval) if (JS_ToInt64(ctx, &_name, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE)
+#define WGL_GET_S16(_name, _jsval) { s32 _v; if (JS_ToInt32(ctx, &_v, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE); _name = (s16) _v; }
+#define WGL_GET_U16(_name, _jsval) { s32 _v; if (JS_ToInt32(ctx, &_v, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE); _name = (u16) _v; }
+#define WGL_GET_FLOAT(_name, _jsval) { Double _v; if (JS_ToFloat64(ctx, &_v, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE); _name = (Float) _v; }
+#define WGL_GET_FLOAT_CLAMP(_name, _jsval) { Double _v; if (JS_ToFloat64(ctx, &_v, _jsval)) return js_throw_err(ctx, WGL_INVALID_VALUE); _name = (Float) (_v>1.0 ? 1.0 : (_v<0 ? 0.0 : _v) ); }
+
+#define WGL_GET_GLID(_name, _jsval, _class_id) {\
+	if (!JS_IsNull(_jsval)) {\
+		GF_WebGLObject *_gl_obj = JS_GetOpaque(_jsval, _class_id);\
+		if (!_gl_obj) return js_throw_err(ctx, WGL_INVALID_VALUE);\
+		if (_gl_obj->par_ctx != JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id)) return js_throw_err(ctx, WGL_INVALID_OPERATION);\
+		_name = _gl_obj->gl_id;\
+	} else {\
+		_name = 0;\
+	}\
+}
+
+#define WGL_GET_STRING(_name, _jsval) _name = JS_ToCString(ctx, _jsval)
+
+#define WGL_CHECK_CONTEXT \
+	if (!JS_GetOpaque(this_val, WebGLRenderingContextBase_class_id)) return js_throw_err(ctx, WGL_INVALID_OPERATION);
+
+
+#endif
+

gpac-1.0.0.tar.gz/src/jsmods/xhr.c Added

@@ -0,0 +1,1424 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2007-2020
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / JavaScript XmlHttpRequest bindings
+ *
+ *  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.
+ *
+ */
+
+/*
+	ANY CHANGE TO THE API MUST BE REFLECTED IN THE DOCUMENTATION IN gpac/share/doc/idl/xhr.idl
+	(no way to define inline JS doc with doxygen)
+*/
+
+#include <gpac/setup.h>
+
+#ifdef GPAC_HAS_QJS
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+#include <gpac/nodes_mpeg4.h>
+#include <gpac/nodes_x3d.h>
+/*dom events*/
+#include <gpac/events.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/options.h>
+#include <gpac/xml.h>
+
+
+#include <gpac/internal/scenegraph_dev.h>
+
+#include "../quickjs/quickjs.h"
+#include "../scenegraph/qjs_common.h"
+
+typedef struct __xhr_context XMLHTTPContext;
+
+/************************************************************
+ *
+ *	xmlHttpRequest implementation
+ *
+ *************************************************************/
+typedef enum {
+	XHR_ONABORT,
+	XHR_ONERROR,
+	XHR_ONLOAD,
+	XHR_ONLOADEND,
+	XHR_ONLOADSTART,
+	XHR_ONPROGRESS,
+	XHR_ONREADYSTATECHANGE,
+	XHR_ONTIMEOUT,
+	XHR_READYSTATE,
+	XHR_RESPONSE,
+	XHR_RESPONSETYPE,
+	XHR_RESPONSETEXT,
+	XHR_RESPONSEXML,
+	XHR_STATUS,
+	XHR_STATUSTEXT,
+	XHR_TIMEOUT,
+	XHR_UPLOAD,
+	XHR_WITHCREDENTIALS,
+	XHR_STATIC_UNSENT,
+	XHR_STATIC_OPENED,
+	XHR_STATIC_HEADERS_RECEIVED,
+	XHR_STATIC_LOADING,
+	XHR_STATIC_DONE,
+	XHR_CACHE,
+} XHR_JSProperty;
+
+typedef enum {
+	XHR_READYSTATE_UNSENT			= 0,
+	XHR_READYSTATE_OPENED			= 1,
+	XHR_READYSTATE_HEADERS_RECEIVED = 2,
+	XHR_READYSTATE_LOADING			= 3,
+	XHR_READYSTATE_DONE				= 4
+} XHR_ReadyState;
+
+typedef enum {
+	XHR_RESPONSETYPE_NONE,
+	XHR_RESPONSETYPE_ARRAYBUFFER,
+	XHR_RESPONSETYPE_BLOB,
+	XHR_RESPONSETYPE_DOCUMENT,
+	XHR_RESPONSETYPE_JSON,
+	XHR_RESPONSETYPE_TEXT,
+	XHR_RESPONSETYPE_SAX,
+	XHR_RESPONSETYPE_PUSH,
+} XHR_ResponseType;
+
+typedef enum {
+	XHR_CACHETYPE_NORMAL,
+	XHR_CACHETYPE_NONE,
+	XHR_CACHETYPE_MEMORY,
+} XHR_CacheType;
+
+struct __xhr_context
+{
+	JSContext *c;
+	JSValue _this;
+
+	/* callback functions */
+	JSValue onabort;
+	JSValue onerror;
+	JSValue onreadystatechange;
+	JSValue onload;
+	JSValue onloadstart;
+	JSValue onloadend;
+	JSValue onprogress;
+	JSValue ontimeout;
+
+	XHR_ReadyState readyState;
+	Bool async;
+
+	/* GPAC extension to control the caching of XHR-downloaded resources */
+	XHR_CacheType  cache;
+
+	/*header/header-val, terminated by NULL*/
+	char **headers;
+	u32 cur_header;
+	char **recv_headers;
+
+	char *method, *url;
+	GF_DownloadSession *sess;
+	char *data;
+	u32 size;
+	JSValue arraybuffer;
+	GF_Err ret_code;
+	u32 html_status;
+	char *statusText;
+	char *mime;
+	u32 timeout;
+	XHR_ResponseType responseType;
+	Bool withCredentials;
+	Bool isFile;
+
+	GF_SAXParser *sax;
+	GF_List *node_stack;
+
+	GF_DOMEventTarget *event_target;
+
+	/* dom graph in which the XHR is created */
+	GF_SceneGraph *owning_graph;
+	/* dom graph used to parse XML into */
+	GF_SceneGraph *document;
+
+	Bool js_dom_loaded;
+};
+
+GF_JSClass xhrClass;
+
+#if 0 //unused
+GF_SceneGraph *xml_http_get_scenegraph(XMLHTTPContext *ctx)
+{
+	return ctx->owning_graph;
+}
+#endif
+
+static void xml_http_reset_recv_hdr(XMLHTTPContext *ctx)
+{
+	u32 nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) {
+			gf_free(ctx->recv_headers[nb_hdr]);
+			gf_free(ctx->recv_headers[nb_hdr+1]);
+			nb_hdr+=2;
+		}
+		gf_free(ctx->recv_headers);
+		ctx->recv_headers = NULL;
+	}
+}
+
+static void xml_http_append_recv_header(XMLHTTPContext *ctx, const char *hdr, const char *val)
+{
+	u32 nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) nb_hdr+=2;
+	}
+	ctx->recv_headers = (char **)gf_realloc(ctx->recv_headers, sizeof(char*)*(nb_hdr+3));
+	ctx->recv_headers[nb_hdr] = gf_strdup(hdr);
+	ctx->recv_headers[nb_hdr+1] = gf_strdup(val ? val : "");
+	ctx->recv_headers[nb_hdr+2] = NULL;
+}
+
+static void xml_http_append_send_header(XMLHTTPContext *ctx, char *hdr, char *val)
+{
+	if (!hdr) return;
+
+	if (ctx->headers) {
+		u32 nb_hdr = 0;
+		while (ctx->headers && ctx->headers[nb_hdr]) {
+			if (stricmp(ctx->headers[nb_hdr], hdr)) {
+				nb_hdr+=2;
+				continue;
+			}
+			/*ignore these ones*/
+			if (!stricmp(hdr, "Accept-Charset")
+			        || !stricmp(hdr, "Accept-Encoding")
+			        || !stricmp(hdr, "Content-Length")
+			        || !stricmp(hdr, "Expect")
+			        || !stricmp(hdr, "Date")
+			        || !stricmp(hdr, "Host")
+			        || !stricmp(hdr, "Keep-Alive")
+			        || !stricmp(hdr, "Referer")
+			        || !stricmp(hdr, "TE")
+			        || !stricmp(hdr, "Trailer")
+			        || !stricmp(hdr, "Transfer-Encoding")
+			        || !stricmp(hdr, "Upgrade")
+			   ) {
+				return;
+			}
+
+			/*replace content for these ones*/
+			if (!stricmp(hdr, "Authorization")
+			        || !stricmp(hdr, "Content-Base")
+			        || !stricmp(hdr, "Content-Location")
+			        || !stricmp(hdr, "Content-MD5")
+			        || !stricmp(hdr, "Content-Range")
+			        || !stricmp(hdr, "Content-Type")
+			        || !stricmp(hdr, "Content-Version")
+			        || !stricmp(hdr, "Delta-Base")
+			        || !stricmp(hdr, "Depth")
+			        || !stricmp(hdr, "Destination")
+			        || !stricmp(hdr, "ETag")
+			        || !stricmp(hdr, "From")
+			        || !stricmp(hdr, "If-Modified-Since")
+			        || !stricmp(hdr, "If-Range")
+			        || !stricmp(hdr, "If-Unmodified-Since")
+			        || !stricmp(hdr, "Max-Forwards")
+			        || !stricmp(hdr, "MIME-Version")
+			        || !stricmp(hdr, "Overwrite")
+			        || !stricmp(hdr, "Proxy-Authorization")
+			        || !stricmp(hdr, "SOAPAction")
+			        || !stricmp(hdr, "Timeout") ) {
+				gf_free(ctx->headers[nb_hdr+1]);
+				ctx->headers[nb_hdr+1] = gf_strdup(val);
+				return;
+			}
+			/*append value*/
+			else {
+				char *new_val = (char *)gf_malloc(sizeof(char) * (strlen(ctx->headers[nb_hdr+1])+strlen(val)+3));
+				sprintf(new_val, "%s, %s", ctx->headers[nb_hdr+1], val);
+				gf_free(ctx->headers[nb_hdr+1]);
+				ctx->headers[nb_hdr+1] = new_val;
+				return;
+			}
+		}
+	}
+	xml_http_append_recv_header(ctx, hdr, val);
+}
+
+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) {
+		gf_free(ctx->data);
+		ctx->data = NULL;
+	}
+	ctx->size = 0;
+}
+
+static void xml_http_reset_partial(XMLHTTPContext *ctx)
+{
+	xml_http_reset_recv_hdr(ctx);
+	xml_http_del_data(ctx);
+	if (ctx->mime) {
+		gf_free(ctx->mime);
+		ctx->mime = NULL;
+	}
+	if (ctx->statusText) {
+		gf_free(ctx->statusText);
+		ctx->statusText = NULL;
+	}
+	ctx->cur_header = 0;
+	ctx->html_status = 0;
+}
+
+static void xml_http_reset(XMLHTTPContext *ctx)
+{
+	if (ctx->method) {
+		gf_free(ctx->method);
+		ctx->method = NULL;
+	}
+	if (ctx->url) {
+		gf_free(ctx->url);
+		ctx->url = NULL;
+	}
+
+	xml_http_reset_partial(ctx);
+
+	if (ctx->sess) {
+		GF_DownloadSession *tmp = ctx->sess;
+		ctx->sess = NULL;
+		gf_dm_sess_abort(tmp);
+		gf_dm_sess_del(tmp);
+	}
+
+	if (ctx->url) {
+		gf_free(ctx->url);
+		ctx->url = NULL;
+	}
+	if (ctx->sax) {
+		gf_xml_sax_del(ctx->sax);
+		ctx->sax = NULL;
+	}
+	if (ctx->node_stack) {
+		gf_list_del(ctx->node_stack);
+		ctx->node_stack = NULL;
+	}
+	if (ctx->document) {
+		if (ctx->js_dom_loaded) {
+			dom_js_unload();
+			ctx->js_dom_loaded = GF_FALSE;
+		}
+
+		gf_node_unregister(ctx->document->RootNode, NULL);
+		/*we're sure the graph is a "nomade" one since we initially put the refcount to 1 ourselves*/
+		ctx->document->reference_count--;
+		if (!ctx->document->reference_count) {
+			gf_sg_js_dom_pre_destroy(JS_GetRuntime(ctx->c), ctx->document, NULL);
+			gf_sg_del(ctx->document);
+		}
+	}
+	ctx->document = NULL;
+	ctx->size = 0;
+	ctx->async = GF_FALSE;
+	ctx->readyState = XHR_READYSTATE_UNSENT;
+	ctx->ret_code = GF_OK;
+}
+
+static void xml_http_finalize(JSRuntime *rt, JSValue obj)
+{
+	XMLHTTPContext *ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return;
+	JS_FreeValueRT(rt, ctx->onabort);
+	JS_FreeValueRT(rt, ctx->onerror);
+	JS_FreeValueRT(rt, ctx->onload);
+	JS_FreeValueRT(rt, ctx->onloadend);
+	JS_FreeValueRT(rt, ctx->onloadstart);
+	JS_FreeValueRT(rt, ctx->onprogress);
+	JS_FreeValueRT(rt, ctx->onreadystatechange);
+	JS_FreeValueRT(rt, ctx->ontimeout);
+	xml_http_reset(ctx);
+	if (ctx->event_target)
+		gf_dom_event_target_del(ctx->event_target);
+
+	gf_free(ctx);
+}
+
+static GFINLINE GF_SceneGraph *xml_get_scenegraph(JSContext *c)
+{
+	GF_SceneGraph *scene;
+	JSValue global = JS_GetGlobalObject(c);
+	scene = (GF_SceneGraph *) JS_GetOpaque_Nocheck(global);
+	JS_FreeValue(c, global);
+	return scene;
+}
+
+void xhr_get_event_target(JSContext *c, JSValue obj, GF_SceneGraph **sg, GF_DOMEventTarget **target)
+{
+	if (c) {
+		/*XHR interface*/
+		XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
+		if (!ctx) return;
+
+		*sg = xml_get_scenegraph(c);
+		*target = ctx->event_target;
+	}
+
+}
+
+static JSValue xml_http_constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	XMLHTTPContext *p;
+	JSValue obj;
+
+	GF_SAFEALLOC(p, XMLHTTPContext);
+	if (!p) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[WHR] Failed to allocate XHR object\n"));
+		return JS_EXCEPTION;
+	}
+	obj = JS_NewObjectClass(c, xhrClass.class_id);
+	p->c = c;
+	p->_this = obj;
+	p->owning_graph = xml_get_scenegraph(c);
+	if (p->owning_graph)
+		p->event_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_XHR, p);
+
+	p->onabort = JS_NULL;
+	p->onerror = JS_NULL;
+	p->onreadystatechange = JS_NULL;
+	p->onload = JS_NULL;
+	p->onloadstart = JS_NULL;
+	p->onloadend = JS_NULL;
+	p->onprogress = JS_NULL;
+	p->ontimeout = JS_NULL;
+
+	JS_SetOpaque(obj, p);
+	return obj;
+}
+
+static void xml_http_fire_event(XMLHTTPContext *ctx, GF_EventType evtType)
+{
+	GF_DOM_Event xhr_evt;
+	if (!ctx->event_target)
+		return;
+
+	memset(&xhr_evt, 0, sizeof(GF_DOM_Event));
+	xhr_evt.type = evtType;
+	xhr_evt.target = ctx->event_target->ptr;
+	xhr_evt.target_type = ctx->event_target->ptr_type;
+	gf_sg_fire_dom_event(ctx->event_target, &xhr_evt, ctx->owning_graph, NULL);
+}
+
+static void xml_http_state_change(XMLHTTPContext *ctx)
+{
+#ifndef GPAC_DISABLE_VRML
+	GF_SceneGraph *scene;
+	GF_Node *n;
+#endif
+
+	gf_js_lock(ctx->c, GF_TRUE);
+	if (! JS_IsNull(ctx->onreadystatechange)) {
+		JSValue ret = JS_Call(ctx->c, ctx->onreadystatechange, ctx->_this, 0, NULL);
+		if (JS_IsException(ret))
+			js_dump_error(ctx->c);
+		JS_FreeValue(ctx->c, ret);
+	}
+
+	js_do_loop(ctx->c);
+	gf_js_lock(ctx->c, GF_FALSE);
+
+	if (! ctx->owning_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;
+	n = (GF_Node *)JS_GetContextOpaque(ctx->c);
+	gf_js_vrml_flush_event_out(n, (GF_ScriptPriv *)n->sgprivate->UserPrivate);
+#endif
+}
+
+
+static JSValue xml_http_open(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *val;
+	GF_JSAPIParam par;
+	XMLHTTPContext *ctx;
+	GF_SceneGraph *scene;
+
+	ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	/*reset*/
+	if (ctx->readyState) xml_http_reset(ctx);
+
+	if (argc<2) return JS_EXCEPTION;
+	/*method is a string*/
+	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	/*url is a string*/
+	if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+
+	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;
+	}
+
+	ctx->method = gf_strdup(val);
+	JS_FreeCString(c, val);
+
+	/*concatenate URL*/
+	scene = xml_get_scenegraph(c);
+#ifndef GPAC_DISABLE_VRML
+	while (scene && scene->pOwningProto && scene->parent_scene) scene = scene->parent_scene;
+#endif
+
+	par.uri.nb_params = 0;
+	val = JS_ToCString(c, argv[1]);
+	par.uri.url = (char *) val;
+	ctx->url = NULL;
+	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);
+	}
+	JS_FreeCString(c, val);
+
+	/*async defaults to true*/
+	ctx->async = GF_TRUE;
+	if (argc>2) {
+		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;
+			/*TODO*/
+			if (argc>4) {
+				if (!JS_CHECK_STRING(argv[4])) return JS_EXCEPTION;
+				val = JS_ToCString(c, argv[4]);
+				/*TODO*/
+			} else {
+				val = JS_ToCString(c, argv[3]);
+			}
+		}
+		JS_FreeCString(c, val);
+	}
+	/*OPEN success*/
+	ctx->readyState = XHR_READYSTATE_OPENED;
+	xml_http_state_change(ctx);
+	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_START);
+	if (JS_IsFunction(c, ctx->onloadstart) ) {
+		return JS_Call(ctx->c, ctx->onloadstart, ctx->_this, 0, NULL);
+	}
+	return JS_TRUE;
+}
+
+static JSValue xml_http_set_header(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *hdr, *val;
+	XMLHTTPContext *ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	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;
+
+	hdr = JS_ToCString(c, argv[0]);
+	val = JS_ToCString(c, argv[1]);
+	xml_http_append_send_header(ctx, (char *)hdr, (char *)val);
+	JS_FreeCString(c, hdr);
+	JS_FreeCString(c, val);
+	return JS_TRUE;
+}
+static void xml_http_sax_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
+{
+	u32 i;
+	GF_DOMFullAttribute *prev = NULL;
+	GF_DOMFullNode *par;
+	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
+	GF_DOMFullNode *node = (GF_DOMFullNode *) gf_node_new(ctx->document, TAG_DOMFullNode);
+
+	node->name = gf_strdup(node_name);
+	for (i=0; i<nb_attributes; i++) {
+		/* special case for 'xml:id' to be parsed as an ID
+		NOTE: we do not test for the 'id' attribute because without DTD we are not sure that it's an ID */
+		if (!stricmp(attributes[i].name, "xml:id")) {
+			u32 id = gf_sg_get_max_node_id(ctx->document) + 1;
+			gf_node_set_id((GF_Node *)node, id, attributes[i].value);
+		} else {
+			GF_DOMFullAttribute *att;
+			GF_SAFEALLOC(att, GF_DOMFullAttribute);
+			if (!att) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XHR] Fail to allocate DOM attribute\n"));
+				continue;
+			}
+			att->tag = TAG_DOM_ATT_any;
+			att->name = gf_strdup(attributes[i].name);
+			att->data_type = (u16) DOM_String_datatype;
+			att->data = gf_svg_create_attribute_value(att->data_type);
+			*((char **)att->data) = gf_strdup(attributes[i].value);
+			if (prev) prev->next = (GF_DOMAttribute*)att;
+			else node->attributes = (GF_DOMAttribute*)att;
+			prev = att;
+		}
+	}
+	par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	gf_node_register((GF_Node*)node, (GF_Node*)par);
+	if (par) {
+		gf_node_list_add_child(&par->children, (GF_Node*)node);
+	} else {
+		assert(!ctx->document->RootNode);
+		ctx->document->RootNode = (GF_Node*)node;
+	}
+	gf_list_add(ctx->node_stack, node);
+}
+
+static void xml_http_sax_end(void *sax_cbck, const char *node_name, const char *name_space)
+{
+	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	if (par) {
+		/*depth mismatch*/
+		if (strcmp(par->name, node_name)) return;
+		gf_list_rem_last(ctx->node_stack);
+	}
+}
+static void xml_http_sax_text(void *sax_cbck, const char *content, Bool is_cdata)
+{
+	XMLHTTPContext *ctx = (XMLHTTPContext *)sax_cbck;
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	if (par) {
+		u32 i, len;
+		GF_DOMText *txt;
+		/*basic check, remove all empty text nodes*/
+		len = (u32) strlen(content);
+		for (i=0; i<len; i++) {
+			if (!strchr(" \n\r\t", content[i])) break;
+		}
+		if (i==len) return;
+
+		txt = gf_dom_add_text_node((GF_Node *)par, gf_strdup(content) );
+		txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
+	}
+}
+
+static void xml_http_terminate(XMLHTTPContext *ctx, GF_Err error)
+{
+	/*if we get here, destroy downloader*/
+	if (ctx->sess) {
+		gf_dm_sess_del(ctx->sess);
+		ctx->sess = NULL;
+	}
+
+	/*but stay in loaded mode*/
+	ctx->readyState = XHR_READYSTATE_DONE;
+	xml_http_state_change(ctx);
+	xml_http_fire_event(ctx, GF_EVENT_LOAD);
+	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_DONE);
+	if (JS_IsFunction(ctx->c, ctx->onload)) {
+		JSValue rval = JS_Call(ctx->c, ctx->onload, ctx->_this, 0, NULL);
+		if (JS_IsException(rval)) js_dump_error(ctx->c);
+		JS_FreeValue(ctx->c, rval);
+	}
+	if (JS_IsFunction(ctx->c, ctx->onloadend)) {
+		JSValue rval = JS_Call(ctx->c, ctx->onloadend, ctx->_this, 0, NULL);
+		if (JS_IsException(rval)) js_dump_error(ctx->c);
+		JS_FreeValue(ctx->c, rval);
+	}
+}
+
+static void xml_http_on_data(void *usr_cbk, GF_NETIO_Parameter *parameter)
+{
+	Bool locked = GF_FALSE;
+	XMLHTTPContext *ctx = (XMLHTTPContext *)usr_cbk;
+
+	/*make sure we can grab JS and the session is not destroyed*/
+	while (ctx->sess) {
+		if (gf_js_try_lock(ctx->c) ) {
+			locked = GF_TRUE;
+			break;
+		}
+		gf_sleep(1);
+	}
+	/*if session not set, we've had an abort*/
+	if (!ctx->sess && !ctx->isFile) {
+		if (locked)
+			gf_js_lock(ctx->c, GF_FALSE);
+		return;
+	}
+
+	if (!ctx->isFile) {
+		assert( locked );
+		gf_js_lock(ctx->c, GF_FALSE);
+		locked = GF_FALSE;
+	}
+	switch (parameter->msg_type) {
+	case GF_NETIO_SETUP:
+		/*nothing to do*/
+		goto exit;
+	case GF_NETIO_CONNECTED:
+		/*nothing to do*/
+		goto exit;
+	case GF_NETIO_WAIT_FOR_REPLY:
+		/*reset send() state (data, current header) and prepare recv headers*/
+		xml_http_reset_partial(ctx);
+		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
+		xml_http_state_change(ctx);
+		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
+		if (JS_IsFunction(ctx->c, ctx->onprogress) ) {
+			JSValue rval = JS_Call(ctx->c, ctx->onprogress, ctx->_this, 0, NULL);
+			if (JS_IsException(rval)) js_dump_error(ctx->c);
+			JS_FreeValue(ctx->c, rval);
+		}
+		goto exit;
+	/*this is signaled sent AFTER headers*/
+	case GF_NETIO_PARSE_REPLY:
+		ctx->html_status = parameter->reply;
+		if (parameter->value) {
+			ctx->statusText = gf_strdup(parameter->value);
+		}
+		ctx->readyState = XHR_READYSTATE_LOADING;
+		xml_http_state_change(ctx);
+		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
+		xml_http_state_change(ctx);
+		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
+		if (JS_IsFunction(ctx->c, ctx->onprogress) ) {
+			JSValue rval = JS_Call(ctx->c, ctx->onprogress, ctx->_this, 0, NULL);
+			if (JS_IsException(rval)) js_dump_error(ctx->c);
+			JS_FreeValue(ctx->c, rval);
+		}
+		goto exit;
+
+	case GF_NETIO_GET_METHOD:
+		parameter->name = ctx->method;
+		goto exit;
+	case GF_NETIO_GET_HEADER:
+		if (ctx->headers && ctx->headers[2*ctx->cur_header]) {
+			parameter->name = ctx->headers[2*ctx->cur_header];
+			parameter->value = ctx->headers[2*ctx->cur_header+1];
+			ctx->cur_header++;
+		}
+		goto exit;
+	case GF_NETIO_GET_CONTENT:
+		if (ctx->data) {
+			parameter->data = ctx->data;
+			parameter->size = (u32) strlen(ctx->data);
+		}
+		goto exit;
+	case GF_NETIO_PARSE_HEADER:
+		xml_http_append_recv_header(ctx, parameter->name, parameter->value);
+		/*prepare SAX parser*/
+		if (ctx->responseType != XHR_RESPONSETYPE_SAX) goto exit;
+		if (strcmp(parameter->name, "Content-Type")) goto exit;
+		if (!strncmp(parameter->value, "application/xml", 15)
+		        || !strncmp(parameter->value, "text/xml", 8)
+		        || strstr(parameter->value, "+xml")
+		        || strstr(parameter->value, "/xml")
+//			|| !strncmp(parameter->value, "text/plain", 10)
+		   ) {
+			assert(!ctx->sax);
+			ctx->sax = gf_xml_sax_new(xml_http_sax_start, xml_http_sax_end, xml_http_sax_text, ctx);
+			ctx->node_stack = gf_list_new();
+			ctx->document = gf_sg_new();
+			/*mark this doc as "nomade", and let it leave until all references to it are destroyed*/
+			ctx->document->reference_count = 1;
+		}
+		goto exit;
+	case GF_NETIO_DATA_EXCHANGE:
+		if (parameter->data && parameter->size) {
+			if (ctx->sax) {
+				GF_Err e;
+				if (!ctx->size) e = gf_xml_sax_init(ctx->sax, (unsigned char *) parameter->data);
+				else e = gf_xml_sax_parse(ctx->sax, parameter->data);
+				if (e) {
+					gf_xml_sax_del(ctx->sax);
+					ctx->sax = NULL;
+				}
+				goto exit;
+			}
+
+			/*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;
+			}
+
+			if (ctx->responseType!=XHR_RESPONSETYPE_PUSH) {
+				ctx->data = (char *)gf_realloc(ctx->data, sizeof(char)*(ctx->size+parameter->size+1));
+				memcpy(ctx->data + ctx->size, parameter->data, sizeof(char)*parameter->size);
+				ctx->size += parameter->size;
+				ctx->data[ctx->size] = 0;
+			}
+
+			if (JS_IsFunction(ctx->c, ctx->onprogress) ) {
+				JSValue prog_evt = JS_NewObject(ctx->c);
+				JSValue buffer_ab=JS_UNDEFINED;
+				u32 bps=0;
+				u64 tot_size=0;
+				gf_dm_sess_get_stats(ctx->sess, NULL, NULL, &tot_size, NULL, &bps, NULL);
+				JS_SetPropertyStr(ctx->c, prog_evt, "lengthComputable", JS_NewBool(ctx->c, tot_size ? 1 : 0));
+				JS_SetPropertyStr(ctx->c, prog_evt, "loaded", JS_NewInt64(ctx->c, ctx->size));
+				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);
+					JS_SetPropertyStr(ctx->c, prog_evt, "buffer", buffer_ab);
+				}
+
+				JSValue rval = JS_Call(ctx->c, ctx->onprogress, ctx->_this, 1, &prog_evt);
+				if (JS_IsException(rval)) js_dump_error(ctx->c);
+				JS_FreeValue(ctx->c, rval);
+				if (ctx->responseType==XHR_RESPONSETYPE_PUSH) {
+					JS_DetachArrayBuffer(ctx->c, buffer_ab);
+				}
+				JS_FreeValue(ctx->c, prog_evt);
+			}
+		}
+		goto exit;
+	case GF_NETIO_DATA_TRANSFERED:
+		/* No return, go till the end of the function */
+		break;
+	case GF_NETIO_DISCONNECTED:
+		goto exit;
+	case GF_NETIO_STATE_ERROR:
+		ctx->ret_code = parameter->error;
+		/* 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;
+	}
+	if (ctx->async) {
+		xml_http_terminate(ctx, parameter->error);
+	}
+
+exit:
+	if (locked) {
+		gf_js_lock(ctx->c, GF_FALSE);
+	}
+}
+
+static GF_Err xml_http_process_local(XMLHTTPContext *ctx)
+{
+	/* For XML Http Requests to files, we fake the processing by calling the HTTP callbacks */
+	GF_NETIO_Parameter par;
+	u64 fsize;
+	char contentLengthHeader[256];
+	FILE *responseFile;
+
+	/*opera-style local host*/
+	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_fopen(ctx->url+16, "rb");
+	/*regular-style local host*/
+	else if (!strnicmp(ctx->url, "file://", 7)) responseFile = gf_fopen(ctx->url+7, "rb");
+	/* other types: e.g. "C:\" */
+	else responseFile = gf_fopen(ctx->url, "rb");
+
+	if (!responseFile) {
+		ctx->html_status = 404;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] cannot open local file %s\n", ctx->url));
+		xml_http_fire_event(ctx, GF_EVENT_ERROR);
+		if (JS_IsFunction(ctx->c, ctx->onerror) ) {
+			JSValue rval = JS_Call(ctx->c, ctx->onerror, ctx->_this, 0, NULL);
+			if (JS_IsException(rval)) js_dump_error(ctx->c);
+			JS_FreeValue(ctx->c, rval);
+		}
+		return GF_BAD_PARAM;
+	}
+	ctx->isFile = GF_TRUE;
+
+	par.msg_type = GF_NETIO_WAIT_FOR_REPLY;
+	xml_http_on_data(ctx, &par);
+
+	fsize = gf_fsize(responseFile);
+
+	ctx->html_status = 200;
+
+	ctx->data = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
+	fsize = gf_fread(ctx->data, (size_t)fsize, responseFile);
+	gf_fclose(responseFile);
+	ctx->data[fsize] = 0;
+	ctx->size = (u32)fsize;
+
+	memset(&par, 0, sizeof(GF_NETIO_Parameter));
+	par.msg_type = GF_NETIO_PARSE_HEADER;
+	par.name = "Content-Type";
+	if (ctx->responseType == XHR_RESPONSETYPE_SAX) {
+		par.value = "application/xml";
+	} else if (ctx->responseType == XHR_RESPONSETYPE_DOCUMENT) {
+		par.value = "application/xml";
+	} else {
+		par.value = "application/octet-stream";
+	}
+	xml_http_on_data(ctx, &par);
+
+	memset(&par, 0, sizeof(GF_NETIO_Parameter));
+	par.msg_type = GF_NETIO_PARSE_HEADER;
+	par.name = "Content-Length";
+	sprintf(contentLengthHeader, "%d", ctx->size);
+	par.value = contentLengthHeader;
+	xml_http_on_data(ctx, &par);
+
+
+	if (ctx->sax) {
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = GF_NETIO_DATA_EXCHANGE;
+		par.data = ctx->data;
+		par.size = ctx->size;
+		ctx->size = 0;
+		xml_http_on_data(ctx, &par);
+		ctx->size = par.size;
+	}
+
+	memset(&par, 0, sizeof(GF_NETIO_Parameter));
+	par.msg_type = GF_NETIO_DATA_TRANSFERED;
+	xml_http_on_data(ctx, &par);
+
+	if (!ctx->async) {
+		xml_http_terminate(ctx, GF_OK);
+	}
+	return GF_OK;
+}
+
+static JSValue xml_http_send(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Err e;
+	GF_JSAPIParam par;
+	GF_SceneGraph *scene;
+	const char *data = NULL;
+	XMLHTTPContext *ctx = (XMLHTTPContext *) JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_EXCEPTION;
+	if (ctx->sess) return JS_EXCEPTION;
+
+	scene = xml_get_scenegraph(c);
+	if (scene) {
+		par.dnld_man = NULL;
+		if (scene->script_action)
+			scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
+	} else {
+		par.dnld_man = jsf_get_download_manager(c);
+	}
+	if (!par.dnld_man) return JS_EXCEPTION;
+
+	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;
+
+			/*NOT SUPPORTED YET, we must serialize the sg*/
+			return JS_EXCEPTION;
+		} else {
+			if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+			data = JS_ToCString(c, argv[0]);
+		}
+	}
+
+	/*reset previous text*/
+	xml_http_del_data(ctx);
+	ctx->data = data ? gf_strdup(data) : NULL;
+	JS_FreeCString(c, data);
+
+	if (!strncmp(ctx->url, "http://", 7)) {
+		u32 flags = GF_NETIO_SESSION_NOTIFY_DATA;
+		if (!ctx->async)
+			flags |= GF_NETIO_SESSION_NOT_THREADED;
+
+		if (ctx->cache != XHR_CACHETYPE_NORMAL) {
+			if (ctx->cache == XHR_CACHETYPE_NONE) {
+				flags |= GF_NETIO_SESSION_NOT_CACHED;
+			}
+			if (ctx->cache == XHR_CACHETYPE_MEMORY) {
+				flags |= GF_NETIO_SESSION_MEMORY_CACHE;
+			}
+		}
+		ctx->sess = gf_dm_sess_new(par.dnld_man, ctx->url, flags, xml_http_on_data, ctx, &e);
+		if (!ctx->sess) return JS_EXCEPTION;
+
+		/*start our download (whether the session is threaded or not)*/
+		e = gf_dm_sess_process(ctx->sess);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
+		}
+		if (!ctx->async) {
+			xml_http_terminate(ctx, e);
+		}
+	} else {
+		e = xml_http_process_local(ctx);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
+		}
+	}
+
+	return JS_TRUE;
+}
+
+static JSValue xml_http_abort(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_DownloadSession *sess;
+	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	sess = ctx->sess;
+	ctx->sess = NULL;
+	if (sess) gf_dm_sess_del(sess);
+
+	xml_http_fire_event(ctx, GF_EVENT_ABORT);
+	xml_http_reset(ctx);
+	if (JS_IsFunction(c, ctx->onabort)) {
+		return JS_Call(ctx->c, ctx->onabort, ctx->_this, 0, NULL);
+	}
+	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;
+
+	/*must be received or loaded*/
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_EXCEPTION;
+	nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) {
+			if (szVal) gf_dynstrcat(&szVal, "\r\n", NULL);
+			gf_dynstrcat(&szVal, ctx->recv_headers[nb_hdr], NULL);
+			gf_dynstrcat(&szVal, ctx->recv_headers[nb_hdr+1], ": ");
+			nb_hdr+=2;
+		}
+	}
+
+	if (!szVal) {
+		return JS_NULL;
+	}
+	res = JS_NewString(c, szVal);
+	gf_free(szVal);
+	return res;
+}
+
+static JSValue xml_http_get_header(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 nb_hdr;
+	const char *hdr;
+	char *szVal = NULL;
+	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	/*must be received or loaded*/
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_EXCEPTION;
+	hdr = JS_ToCString(c, argv[0]);
+
+	nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) {
+			if (!strcmp(ctx->recv_headers[nb_hdr], hdr)) {
+				gf_dynstrcat(&szVal, ctx->recv_headers[nb_hdr+1], ", ");
+			}
+			nb_hdr+=2;
+		}
+	}
+	JS_FreeCString(c, hdr);
+	if (!szVal) {
+		return JS_NULL;
+	}
+	JSValue res = JS_NewString(c, szVal);
+	gf_free(szVal);
+	return res;
+}
+
+static GF_Err xml_http_load_dom(XMLHTTPContext *ctx)
+{
+	GF_Err e;
+	GF_DOMParser *parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse_string(parser, ctx->data);
+	if (!e) {
+		e = gf_sg_init_from_xml_node(ctx->document, gf_xml_dom_get_root(parser));
+	}
+	gf_xml_dom_del(parser);
+	return e;
+}
+
+
+static JSValue xml_http_overrideMimeType(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *mime;
+	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx || !argc) return JS_EXCEPTION;
+
+	if (!JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	mime = JS_ToCString(c, argv[0]);
+	if (ctx->mime) gf_free(ctx->mime);
+	ctx->mime = gf_strdup(mime);
+	JS_FreeCString(c, mime);
+	return JS_TRUE;
+}
+
+static JSValue xml_http_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	XMLHTTPContext *ctx = JS_GetOpaque(obj, xhrClass.class_id);
+	if (!ctx) return JS_EXCEPTION;
+
+	switch (magic) {
+	case XHR_ONABORT: return JS_DupValue(c, ctx->onabort);
+	case XHR_ONERROR: return JS_DupValue(c, ctx->onerror);
+	case XHR_ONLOAD: return JS_DupValue(c, ctx->onload);
+	case XHR_ONLOADSTART: return JS_DupValue(c, ctx->onloadstart);
+	case XHR_ONLOADEND: return JS_DupValue(c, ctx->onloadend);
+	case XHR_ONPROGRESS: return JS_DupValue(c, ctx->onprogress);
+	case XHR_ONREADYSTATECHANGE: return JS_DupValue(c, ctx->onreadystatechange);
+	case XHR_ONTIMEOUT: return JS_DupValue(c, ctx->ontimeout);
+	case XHR_READYSTATE: return JS_NewInt32(c, ctx->readyState);
+	case XHR_RESPONSETEXT:
+		if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_NULL;
+		if (ctx->data) {
+			return JS_NewString(c, ctx->data);
+		} else {
+			return JS_NULL;
+		}
+
+	case XHR_RESPONSEXML:
+		if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_NULL;
+		if (ctx->data) {
+			if (!ctx->document) {
+				ctx->document = gf_sg_new();
+				/*mark this doc as "nomade", and let it leave until all references to it are destroyed*/
+				ctx->document->reference_count = 1;
+				xml_http_load_dom(ctx);
+			}
+			if (!ctx->js_dom_loaded) {
+				dom_js_load(ctx->document, c);
+				ctx->js_dom_loaded = GF_TRUE;
+			}
+			return dom_document_construct_external(c, ctx->document);
+		} else {
+			return JS_NULL;
+		}
+
+	case XHR_RESPONSE:
+		if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_NULL;
+
+		if (ctx->data) {
+			switch(ctx->responseType)
+			{
+			case XHR_RESPONSETYPE_NONE:
+			case XHR_RESPONSETYPE_TEXT:
+				return JS_NewString(c, ctx->data);
+
+			case XHR_RESPONSETYPE_ARRAYBUFFER:
+				if (JS_IsUndefined(ctx->arraybuffer)) {
+					ctx->arraybuffer = JS_NewArrayBuffer(c, ctx->data, ctx->size, NULL, ctx, 1);
+				}
+				return JS_DupValue(c, ctx->arraybuffer);
+				break;
+			case XHR_RESPONSETYPE_DOCUMENT:
+				if (ctx->data) {
+					if (!ctx->document) {
+						ctx->document = gf_sg_new();
+						/*mark this doc as "nomade", and let it leave until all references to it are destroyed*/
+						ctx->document->reference_count = 1;
+						xml_http_load_dom(ctx);
+					}
+					if (!ctx->js_dom_loaded) {
+						dom_js_load(ctx->document, c);
+						ctx->js_dom_loaded = GF_TRUE;
+					}
+					return dom_document_construct_external(c, ctx->document);
+				}
+				return JS_NULL;
+			case XHR_RESPONSETYPE_JSON:
+				return JS_ParseJSON(c, ctx->data, ctx->size, "responseJSON");
+			case XHR_RESPONSETYPE_PUSH:
+				return JS_EXCEPTION;
+			default:
+				/*other	types not supported	*/
+				break;
+			}
+		}
+		return JS_NULL;
+
+	case XHR_STATUS:
+		return JS_NewInt32(c, ctx->html_status);
+
+	case XHR_STATUSTEXT:
+		if (ctx->statusText) {
+			return JS_NewString(c, ctx->statusText);
+		}
+		return JS_NULL;
+	case XHR_TIMEOUT:
+		return JS_NewInt32(c, ctx->timeout);
+	case XHR_WITHCREDENTIALS:
+		return ctx->withCredentials ? JS_TRUE : JS_FALSE;
+	case XHR_UPLOAD:
+		/* TODO */
+		return JS_EXCEPTION;
+	case XHR_RESPONSETYPE:
+		switch (ctx->responseType) {
+		case XHR_RESPONSETYPE_NONE: return JS_NewString(c, "");
+		case XHR_RESPONSETYPE_ARRAYBUFFER: return JS_NewString(c, "arraybuffer");
+		case XHR_RESPONSETYPE_BLOB: return JS_NewString(c, "blob");
+		case XHR_RESPONSETYPE_DOCUMENT: return JS_NewString(c, "document");
+		case XHR_RESPONSETYPE_SAX: return JS_NewString(c, "sax");
+		case XHR_RESPONSETYPE_JSON: return JS_NewString(c, "json");
+		case XHR_RESPONSETYPE_TEXT: return JS_NewString(c, "text");
+		case XHR_RESPONSETYPE_PUSH: return JS_NewString(c, "push");
+		}
+		return JS_NULL;
+	case XHR_STATIC_UNSENT:
+		return JS_NewInt32(c, XHR_READYSTATE_UNSENT);
+	case XHR_STATIC_OPENED:
+		return JS_NewInt32(c, XHR_READYSTATE_OPENED);
+	case XHR_STATIC_HEADERS_RECEIVED:
+		return JS_NewInt32(c, XHR_READYSTATE_HEADERS_RECEIVED);
+	case XHR_STATIC_LOADING:
+		return JS_NewInt32(c, XHR_READYSTATE_LOADING);
+	case XHR_STATIC_DONE:
+		return JS_NewInt32(c, XHR_READYSTATE_DONE);
+	case XHR_CACHE:
+		switch (ctx->cache) {
+		case XHR_CACHETYPE_NORMAL: return JS_NewString(c, "normal");
+		case XHR_CACHETYPE_NONE:  return JS_NewString(c, "none");
+		case XHR_CACHETYPE_MEMORY: return JS_NewString(c, "memory");
+		}
+		return JS_NULL;
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+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;
+
+#define SET_CBK(_sym) \
+		if (JS_IsFunction(c, value) || JS_IsUndefined(value) || JS_IsNull(value)) {\
+			JS_FreeValue(c, ctx->_sym);\
+			ctx->_sym = JS_DupValue(c, value);\
+			return JS_TRUE;\
+		}\
+		return JS_EXCEPTION;\
+
+	switch (magic) {
+	case XHR_ONERROR:
+		SET_CBK(onerror)
+
+	case XHR_ONABORT:
+		SET_CBK(onabort)
+
+	case XHR_ONLOAD:
+		SET_CBK(onload)
+
+	case XHR_ONLOADSTART:
+		SET_CBK(onloadstart)
+
+	case XHR_ONLOADEND:
+		SET_CBK(onloadend)
+
+	case XHR_ONPROGRESS:
+		SET_CBK(onprogress)
+
+	case XHR_ONREADYSTATECHANGE:
+		SET_CBK(onreadystatechange)
+
+	case XHR_ONTIMEOUT:
+		SET_CBK(ontimeout)
+
+	case XHR_TIMEOUT:
+		if (JS_ToInt32(c, &ctx->timeout, value)) return JS_EXCEPTION;
+		return JS_TRUE;
+
+	case XHR_WITHCREDENTIALS:
+		ctx->withCredentials = JS_ToBool(c, value) ? GF_TRUE : GF_FALSE;
+		return JS_TRUE;
+	case XHR_RESPONSETYPE:
+	{
+		const char *str = JS_ToCString(c, value);
+		if (!str || !strcmp(str, "")) {
+			ctx->responseType = XHR_RESPONSETYPE_NONE;
+		} else if (!strcmp(str, "arraybuffer")) {
+			ctx->responseType = XHR_RESPONSETYPE_ARRAYBUFFER;
+		} else if (!strcmp(str, "blob")) {
+			ctx->responseType = XHR_RESPONSETYPE_BLOB;
+		} else if (!strcmp(str, "document")) {
+			ctx->responseType = XHR_RESPONSETYPE_DOCUMENT;
+		} else if (!strcmp(str, "json")) {
+			ctx->responseType = XHR_RESPONSETYPE_JSON;
+		} else if (!strcmp(str, "text")) {
+			ctx->responseType = XHR_RESPONSETYPE_TEXT;
+		} else if (!strcmp(str, "sax")) {
+			ctx->responseType = XHR_RESPONSETYPE_SAX;
+		} else if (!strcmp(str, "push")) {
+			ctx->responseType = XHR_RESPONSETYPE_PUSH;
+		}
+		JS_FreeCString(c, str);
+		return JS_TRUE;
+	}
+	case XHR_CACHE:
+	{
+		const char *str = JS_ToCString(c, value);
+		if (!str) return JS_EXCEPTION;
+		if (!strcmp(str, "normal")) {
+			ctx->cache = XHR_CACHETYPE_NORMAL;
+		} else if (!strcmp(str, "none")) {
+			ctx->cache = XHR_CACHETYPE_NONE;
+		} else if (!strcmp(str, "memory")) {
+			ctx->cache = XHR_CACHETYPE_MEMORY;
+		}
+		JS_FreeCString(c, str);
+		return JS_TRUE;
+	}
+	/*all other properties are read-only*/
+	default:
+		break;
+	}
+	return JS_FALSE;
+}
+
+static const JSCFunctionListEntry xhr_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("onabort", xml_http_getProperty, xml_http_setProperty, XHR_ONABORT),
+	JS_CGETSET_MAGIC_DEF("onerror", xml_http_getProperty, xml_http_setProperty, XHR_ONERROR),
+	JS_CGETSET_MAGIC_DEF("onload", xml_http_getProperty, xml_http_setProperty, XHR_ONLOAD),
+	JS_CGETSET_MAGIC_DEF("onloadend", xml_http_getProperty, xml_http_setProperty, XHR_ONLOADEND),
+	JS_CGETSET_MAGIC_DEF("onloadstart", xml_http_getProperty, xml_http_setProperty, XHR_ONLOADSTART),
+	JS_CGETSET_MAGIC_DEF("onprogress", xml_http_getProperty, xml_http_setProperty, XHR_ONPROGRESS),
+	JS_CGETSET_MAGIC_DEF("onreadystatechange", xml_http_getProperty, xml_http_setProperty, XHR_ONREADYSTATECHANGE),
+	JS_CGETSET_MAGIC_DEF("ontimeout", xml_http_getProperty, xml_http_setProperty, XHR_ONTIMEOUT),
+	JS_CGETSET_MAGIC_DEF("readyState", xml_http_getProperty, NULL, XHR_READYSTATE),
+	JS_CGETSET_MAGIC_DEF("response", xml_http_getProperty, NULL, XHR_RESPONSE),
+	JS_CGETSET_MAGIC_DEF("responseType", xml_http_getProperty, xml_http_setProperty, XHR_RESPONSETYPE),
+	JS_CGETSET_MAGIC_DEF("responseText", xml_http_getProperty, NULL, XHR_RESPONSETEXT),
+	JS_CGETSET_MAGIC_DEF("responseXML", xml_http_getProperty, NULL, XHR_RESPONSEXML),
+	JS_CGETSET_MAGIC_DEF("status", xml_http_getProperty, NULL, XHR_STATUS),
+	JS_CGETSET_MAGIC_DEF("statusText", xml_http_getProperty, NULL, XHR_STATUSTEXT),
+	JS_CGETSET_MAGIC_DEF("timeout", xml_http_getProperty, xml_http_setProperty, XHR_TIMEOUT),
+	JS_CGETSET_MAGIC_DEF("upload", xml_http_getProperty, NULL, XHR_UPLOAD),
+	JS_CGETSET_MAGIC_DEF("withCredentials", xml_http_getProperty, xml_http_setProperty, XHR_WITHCREDENTIALS),
+	JS_CGETSET_MAGIC_DEF("cache", xml_http_getProperty, xml_http_setProperty, XHR_CACHE),
+
+	JS_CFUNC_DEF("abort", 0, xml_http_abort),
+	JS_CFUNC_DEF("getAllResponseHeaders", 0, xml_http_get_all_headers),
+	JS_CFUNC_DEF("getResponseHeader", 1, xml_http_get_header),
+	JS_CFUNC_DEF("open", 2, xml_http_open),
+	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
+};
+
+static void xml_http_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    XMLHTTPContext *ctx = JS_GetOpaque(val, xhrClass.class_id);
+    if (!ctx) return;
+
+	JS_MarkValue(rt, ctx->onabort, mark_func);
+	JS_MarkValue(rt, ctx->onerror, mark_func);
+	JS_MarkValue(rt, ctx->onload, mark_func);
+	JS_MarkValue(rt, ctx->onloadend, mark_func);
+	JS_MarkValue(rt, ctx->onloadstart, mark_func);
+	JS_MarkValue(rt, ctx->onprogress, mark_func);
+	JS_MarkValue(rt, ctx->onreadystatechange, mark_func);
+	JS_MarkValue(rt, ctx->ontimeout, mark_func);
+}
+
+static JSValue xhr_load_class(JSContext *c)
+{
+	if (! xhrClass.class_id) {
+		JS_NewClassID(&xhrClass.class_id);
+		xhrClass.class.class_name = "XMLHttpRequest";
+		xhrClass.class.finalizer = xml_http_finalize;
+		xhrClass.class.gc_mark = xml_http_gc_mark;
+		JS_NewClass(JS_GetRuntime(c), xhrClass.class_id, &xhrClass.class);
+	}
+	JSValue proto = JS_NewObjectClass(c, xhrClass.class_id);
+	JS_SetPropertyFunctionList(c, proto, xhr_Funcs, countof(xhr_Funcs));
+	JS_SetClassProto(c, xhrClass.class_id, proto);
+	JS_SetPropertyStr(c, proto, "UNSENT",	JS_NewInt32(c, XHR_STATIC_UNSENT));
+	JS_SetPropertyStr(c, proto, "OPENED",	JS_NewInt32(c, XHR_STATIC_OPENED));
+	JS_SetPropertyStr(c, proto, "HEADERS_RECEIVED",	JS_NewInt32(c, XHR_STATIC_HEADERS_RECEIVED));
+	JS_SetPropertyStr(c, proto, "LOADING",	JS_NewInt32(c, XHR_STATIC_LOADING));
+	JS_SetPropertyStr(c, proto, "DONE",	JS_NewInt32(c, XHR_STATIC_DONE));
+
+	return JS_NewCFunction2(c, xml_http_constructor, "XMLHttpRequest", 1, JS_CFUNC_constructor, 0);
+}
+
+void qjs_module_init_xhr_global(JSContext *c, JSValue global)
+{
+	if (c) {
+		JSValue ctor = xhr_load_class(c);
+		JS_SetPropertyStr(c, global, "XMLHttpRequest", ctor);
+	}
+}
+
+static int js_xhr_load_module(JSContext *c, JSModuleDef *m)
+{
+	JSValue global = JS_GetGlobalObject(c);
+	JSValue ctor = xhr_load_class(c);
+	JS_FreeValue(c, global);
+    JS_SetModuleExport(c, m, "XMLHttpRequest", ctor);
+	return 0;
+}
+void qjs_module_init_xhr(JSContext *ctx)
+{
+	JSModuleDef *m;
+	m = JS_NewCModule(ctx, "xhr", js_xhr_load_module);
+	if (!m) return;
+
+	JS_AddModuleExport(ctx, m, "XMLHttpRequest");
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		qjs_module_init_xhr_global(NULL, JS_TRUE);
+		xhr_get_event_target(NULL, JS_TRUE, NULL, NULL);
+	}
+#endif
+	return;
+}
+
+
+#endif
+

gpac-0.8.0.tar.gz/src/laser/lsr_dec.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2005-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / LASeR codec sub-project
@@ -53,9 +53,9 @@
 	if (!tmp) return NULL;
 	tmp->streamInfo = gf_list_new();
 	tmp->font_table = gf_list_new();
-	tmp->defered_hrefs = gf_list_new();
-	tmp->defered_listeners = gf_list_new();
-	tmp->defered_anims = gf_list_new();
+	tmp->deferred_hrefs = gf_list_new();
+	tmp->deferred_listeners = gf_list_new();
+	tmp->deferred_anims = gf_list_new();
 	tmp->unresolved_commands = gf_list_new();
 	tmp->sg = graph;
 	return tmp;
@@ -79,16 +79,16 @@
 	}
 	gf_list_del(codec->font_table);
 #if 0
-	while (gf_list_count(codec->defered_hrefs)) {
-		XMLRI *iri = (XMLRI *)gf_list_last(codec->defered_hrefs);
-		gf_list_rem_last(codec->defered_hrefs);
+	while (gf_list_count(codec->deferred_hrefs)) {
+		XMLRI *iri = (XMLRI *)gf_list_last(codec->deferred_hrefs);
+		gf_list_rem_last(codec->deferred_hrefs);
 		if (iri->string) gf_free(iri->string);
 		iri->string = NULL;
 	}
 #endif
-	gf_list_del(codec->defered_hrefs);
-	gf_list_del(codec->defered_anims);
-	gf_list_del(codec->defered_listeners);
+	gf_list_del(codec->deferred_hrefs);
+	gf_list_del(codec->deferred_anims);
+	gf_list_del(codec->deferred_listeners);
 	gf_list_del(codec->unresolved_commands);
 	gf_free(codec);
 }
@@ -105,7 +105,7 @@
 
 
 GF_EXPORT
-GF_Err gf_laser_decoder_configure_stream(GF_LASeRCodec *codec, u16 ESID, char *dsi, u32 dsi_len)
+GF_Err gf_laser_decoder_configure_stream(GF_LASeRCodec *codec, u16 ESID, u8 *dsi, u32 dsi_len)
 {
 	LASeRStreamInfo *info;
 	GF_BitStream *bs;
@@ -167,7 +167,13 @@
 }
 
 GF_EXPORT
-GF_Err gf_laser_decode_au(GF_LASeRCodec *codec, u16 ESID, const char *data, u32 data_len)
+Bool gf_laser_decode_has_conditionnals(GF_LASeRCodec *codec)
+{
+	return codec && codec->has_conditionnals ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+GF_Err gf_laser_decode_au(GF_LASeRCodec *codec, u16 ESID, const u8 *data, u32 data_len)
 {
 	GF_Err e;
 	if (!codec || !data || !data_len) return GF_BAD_PARAM;
@@ -193,7 +199,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, char *data, u32 data_len, GF_List *com_list)
+GF_Err gf_laser_decode_command_list(GF_LASeRCodec *codec, u16 ESID, u8 *data, u32 data_len, GF_List *com_list)
 {
 	GF_Err e;
 	u32 i;
@@ -276,10 +282,11 @@
 	gf_bs_read_data(lsr->bs, *out_data, len);
 	*out_len = len;
 #else
-	while (len) {
+	while (len && gf_bs_available(lsr->bs) ) {
 		gf_bs_read_int(lsr->bs, 8);
 		len--;
 	}
+	if (len) lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
 #endif
 }
 
@@ -401,7 +408,7 @@
 		sprintf(NodeID, "N%d", nID-1);
 		href->string = gf_strdup(NodeID);
 		if (href->type!=0xFF)
-			gf_list_add(lsr->defered_hrefs, href);
+			gf_list_add(lsr->deferred_hrefs, href);
 		href->type = XMLRI_ELEMENTID;
 		return;
 	}
@@ -516,7 +523,7 @@
 	gf_dom_add_text_node(elt, str);
 }
 
-static void lsr_read_byte_align_string_list(GF_LASeRCodec *lsr, GF_List *l, const char *name, Bool is_iri)
+static void lsr_read_byte_align_string_list(GF_LASeRCodec *lsr, GF_List *l, const char *name, Bool is_iri, Bool is_font)
 {
 	XMLRI *iri;
 	char *text, *sep, *sep2, *cur;
@@ -530,40 +537,58 @@
 	cur = text;
 	while (cur) {
 		sep = strchr(cur, '\'');
+		if (!sep && is_font) {
+			sep = strchr(cur, ',');
+			if (!sep) sep = strchr(cur, ';');
+		}
 		if (!sep) {
 			if (is_iri) {
 				GF_SAFEALLOC(iri, XMLRI);
-				iri->string = gf_strdup(cur);
-				iri->type = XMLRI_STRING;
-				gf_list_add(l, iri);
+				if (iri) {
+					iri->string = gf_strdup(cur);
+					iri->type = XMLRI_STRING;
+					gf_list_add(l, iri);
+				}
 			} else {
 				gf_list_add(l, gf_strdup(cur));
 			}
 			break;
 		}
 		sep2 = strchr(sep + 1, '\'');
-		if (!sep2) {
+		if (!sep2 && !is_font) {
 			if (is_iri) {
 				GF_SAFEALLOC(iri, XMLRI);
-				iri->string = gf_strdup(cur);
-				iri->type = XMLRI_STRING;
-				gf_list_add(l, iri);
+				if (iri) {
+					iri->string = gf_strdup(cur);
+					iri->type = XMLRI_STRING;
+					gf_list_add(l, iri);
+				}
 			} else {
 				gf_list_add(l, gf_strdup(cur));
 			}
 			break;
 		}
-		sep2[0] = 0;
+		if (sep2)
+			sep2[0] = 0;
+		else
+			sep[0] = 0;
 		if (is_iri) {
 			GF_SAFEALLOC(iri, XMLRI);
-			iri->string = gf_strdup(sep+1);
-			iri->type = XMLRI_STRING;
-			gf_list_add(l, iri);
+			if (iri) {
+				iri->string = gf_strdup(sep+1);
+				iri->type = XMLRI_STRING;
+				gf_list_add(l, iri);
+			}
 		} else {
 			gf_list_add(l, gf_strdup(sep+1));
 		}
-		sep2[0] = '\'';
-		cur = sep2 + 1;
+		if (sep2) {
+			sep2[0] = '\'';
+			cur = sep2 + 1;
+		} else {
+			sep[0] = ';';
+			cur = sep + 1;
+		}
 	}
 	gf_free(text);
 }
@@ -706,9 +731,9 @@
 	}
 
 	/*update all pending HREFs*/
-	count = gf_list_count(lsr->defered_hrefs);
+	count = gf_list_count(lsr->deferred_hrefs);
 	for (i=0; i<count; i++) {
-		XMLRI *href = (XMLRI *)gf_list_get(lsr->defered_hrefs, i);
+		XMLRI *href = (XMLRI *)gf_list_get(lsr->deferred_hrefs, i);
 		char *str_id = href->string;
 		if (str_id[0] == '#') str_id++;
 		/*skip 'N'*/
@@ -717,18 +742,18 @@
 			href->target = (SVG_Element*) n;
 			gf_free(href->string);
 			href->string = NULL;
-			gf_list_rem(lsr->defered_hrefs, i);
+			gf_list_rem(lsr->deferred_hrefs, i);
 			i--;
 			count--;
 		}
 	}
 
 	/*update unresolved listeners*/
-	count = gf_list_count(lsr->defered_listeners);
+	count = gf_list_count(lsr->deferred_listeners);
 	for (i=0; i<count; i++) {
 		GF_Node *par;
 		XMLRI *observer = NULL;
-		GF_Node *listener = (GF_Node *)gf_list_get(lsr->defered_listeners, i);
+		GF_Node *listener = (GF_Node *)gf_list_get(lsr->deferred_listeners, i);
 
 		par = NULL;
 		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_observer, GF_FALSE, GF_FALSE, &info) == GF_OK) {
@@ -757,17 +782,17 @@
 
 		assert(par);
 		gf_node_dom_listener_add(par, listener);
-		gf_list_rem(lsr->defered_listeners, i);
+		gf_list_rem(lsr->deferred_listeners, i);
 		i--;
 		count--;
 	}
 
 	/*update all pending animations*/
-	count = gf_list_count(lsr->defered_anims);
+	count = gf_list_count(lsr->deferred_anims);
 	for (i=0; i<count; i++) {
-		SVG_Element *elt = (SVG_Element *)gf_list_get(lsr->defered_anims, i);
+		SVG_Element *elt = (SVG_Element *)gf_list_get(lsr->deferred_anims, i);
 		if (lsr_setup_smil_anim(lsr, elt, NULL)) {
-			gf_list_rem(lsr->defered_anims, i);
+			gf_list_rem(lsr->deferred_anims, i);
 			i--;
 			count--;
 			gf_node_init((GF_Node*)elt);
@@ -1054,6 +1079,8 @@
 static void lsr_read_event_type(GF_LASeRCodec *lsr, XMLEV_Event *evtType)
 {
 	u32 flag;
+	memset(evtType, 0, sizeof(XMLEV_Event));
+
 	GF_LSR_READ_INT(lsr, flag, 1, "choice");
 	if (!flag) {
 		char *evtName, *sep;
@@ -1358,7 +1385,7 @@
 							break;
 						case 4:
 							lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_requiredFonts, GF_TRUE, GF_FALSE, &info);
-							lsr_read_byte_align_string(lsr, info.far_ptr, "requiredFonts");
+							lsr_read_byte_align_string_list(lsr, *(GF_List **)info.far_ptr, "requiredFonts", GF_FALSE, GF_TRUE);
 							break;
 						}
 					}
@@ -1490,10 +1517,10 @@
 			GF_LSR_READ_INT(lsr, *(SVG_Visibility*)info.far_ptr, 2, "visibility");
 			break;
 		case TAG_SVG_ATT_requiredExtensions:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredExtensions", GF_TRUE);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredExtensions", GF_TRUE, GF_FALSE);
 			break;
 		case TAG_SVG_ATT_requiredFormats:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredFormats", GF_FALSE);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "requiredFormats", GF_FALSE, GF_FALSE);
 			break;
 		case TAG_SVG_ATT_requiredFeatures:
 		{
@@ -1505,7 +1532,7 @@
 		}
 		break;
 		case TAG_SVG_ATT_systemLanguage:
-			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "systemLanguage", GF_FALSE);
+			lsr_read_byte_align_string_list(lsr, *(GF_List**)info.far_ptr, "systemLanguage", GF_FALSE, GF_FALSE);
 			break;
 		case TAG_XML_ATT_base:
 			lsr_read_byte_align_string(lsr, &((XMLRI*)info.far_ptr)->string, "xml:base");
@@ -1797,11 +1824,13 @@
 			GF_Matrix2D *mat;
 			SVG_Point *pt = (SVG_Point *)val->value;
 			GF_SAFEALLOC(mat, GF_Matrix2D);
-			gf_mx2d_init(*mat);
-			mat->m[2] = pt->x;
-			mat->m[5] = pt->y;
+			if (mat) {
+				gf_mx2d_init(*mat);
+				mat->m[2] = pt->x;
+				mat->m[5] = pt->y;
+				val->value = mat;
+			}
 			gf_free(pt);
-			val->value = mat;
 		}
 		break;
 	}
@@ -1809,7 +1838,23 @@
 static void lsr_translate_anim_values(SMIL_AnimateValues *val, u32 coded_type)
 {
 	u32 i, count;
-	GF_List *list = val->values;
+	GF_List *list, *new_list;
+
+	list = val->values;
+	switch (val->type) {
+	case SVG_StrokeDashArray_datatype:
+		break;
+	case SVG_ViewBox_datatype:
+		break;
+	case SVG_Coordinates_datatype:
+		break;
+	case SVG_Motion_datatype:
+		if (coded_type!=9) return;
+		break;
+	default:
+		return;
+	}
+	val->values = new_list = gf_list_new();
 	count = gf_list_count(list);
 	for (i=0; i<count; i++) {
 		switch (val->type) {
@@ -1833,10 +1878,9 @@
 					da->array.units[j] = 0;
 					gf_free(v);
 				}
-				gf_list_del(l);
-				gf_list_rem(list, i);
-				gf_list_insert(list, da, i);
 			}
+			gf_list_del(l);
+			gf_list_add(new_list, da);
 		}
 		break;
 		case SVG_ViewBox_datatype:
@@ -1857,8 +1901,7 @@
 				gf_list_rem_last(l);
 			}
 			gf_list_del(l);
-			gf_list_rem(list, i);
-			gf_list_insert(list, vb, i);
+			gf_list_add(new_list, vb);
 		}
 		break;
 		case SVG_Coordinates_datatype:
@@ -1879,26 +1922,24 @@
 
 			coords = (SVG_Coordinates*)gf_malloc(sizeof(SVG_Coordinates));
 			*coords = l;
-			gf_list_rem(list, i);
-			gf_list_insert(list, coords, i);
+			gf_list_add(new_list, coords);
 		}
 		break;
 
 		case SVG_Motion_datatype:
-			if (coded_type==9) {
-				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_list_rem(list, i);
-				gf_list_insert(list, m, i);
-				gf_free(pt);
-			}
+ 		{
+			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_free(pt);
+			gf_list_add(new_list, m);
+		}
 			break;
 		}
 	}
-
+	gf_list_del(list);
 }
 
 static Bool lsr_init_smil_times(GF_LASeRCodec *lsr, SVG_Element *anim, GF_List *times, SVG_Element *parent)
@@ -1991,7 +2032,9 @@
 	if (gf_node_get_attribute_by_tag((GF_Node *)anim, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info)==GF_OK) {
 		name = info.far_ptr;
 	}
-	if (!name) return GF_FALSE;
+	if (!name) {
+		return GF_FALSE;
+	}
 
 	if (!name->field_ptr) {
 		if (gf_node_get_attribute_by_tag((GF_Node *)target, name->type, GF_TRUE, GF_FALSE, &info)!=GF_OK) return GF_FALSE;
@@ -2043,6 +2086,7 @@
 			SMIL_AnimateValues *values = info.far_ptr;
 			coded_type = values->type;
 			values->type = is_animateMotion ? SVG_Motion_datatype : name->type;
+			values->laser_strings = 0;
 			lsr_translate_anim_values(values, coded_type);
 		}
 	}
@@ -2232,7 +2276,8 @@
 	}
 	case 12:
 		GF_SAFEALLOC(iri, XMLRI);
-		lsr_read_any_uri(lsr, iri, name);
+		if (iri)
+			lsr_read_any_uri(lsr, iri, name);
 		return iri;
 	default:
 		lsr_read_extension(lsr, name);
@@ -2463,6 +2508,8 @@
 
 	GF_LSR_READ_INT(lsr, coded_type, 4, "type");
 	values->type = coded_type;
+	values->laser_strings = 1;
+
 	count = lsr_read_vluimsbf5(lsr, "count");
 	for (i=0; i<count; i++) {
 		void *att = lsr_read_an_anim_value(lsr, coded_type, "a_value");
@@ -2532,17 +2579,17 @@
 	count = lsr_read_vluimsbf5(lsr, "count");
 	if (tag == TAG_SVG_ATT_text_rotate) {
 		for (i=0; i<count; i++) {
-			SVG_Number *n = (SVG_Number *)gf_malloc(sizeof(SVG_Number));
-			n->type = SVG_NUMBER_VALUE;
-			n->value = lsr_read_fixed_16_8(lsr, "val");
-			gf_list_add(*coords, n);
+			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);
 		}
 	}
 	else {
 		for (i=0; i<count; i++) {
-			Fixed *n = (Fixed *)gf_malloc(sizeof(Fixed));
-			*n = lsr_read_fixed_16_8(lsr, "val");
-			gf_list_add(*coords, n);
+			Fixed *num = (Fixed *)gf_malloc(sizeof(Fixed));
+			*num = lsr_read_fixed_16_8(lsr, "val");
+			gf_list_add(*coords, num);
 		}
 	}
 }
@@ -2587,7 +2634,7 @@
 			GF_LSR_READ_INT(lsr, nb_dx, 5, "bitsx");
 			GF_LSR_READ_INT(lsr, nb_dy, 5, "bitsy");
 			for (i=1; i<count; i++) {
-				SVG_Point *pt = (SVG_Point *)gf_malloc(sizeof(SVG_Point));
+				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);
@@ -2617,14 +2664,14 @@
 	}
 	/*first MoveTo is skipped in LASeR*/
 	pt = (GF_Point2D*)gf_list_get(pts, 0);
-	if (!pt) {
-		gf_list_del(pts);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Empty path found.\n"));
-		return;
+	if (pt) {
+		ct_orig = orig = *pt;
+		gf_path_add_move_to_vec(path, pt);
+	} else {
+		orig.x = orig.y = 0;
+		ct_orig = orig;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] Empty path found.\n"));
 	}
-	ct_orig = orig = *pt;
-
-	gf_path_add_move_to_vec(path, pt);
 	cur_pt = 1;
 	count = lsr_read_vluimsbf5(lsr, "nbOfTypes");
 	for (i=0; i<count; i++) {
@@ -2710,7 +2757,10 @@
 
 #else
 	u32 i, count, c;
-	u8 *type;
+	if (!path) {
+		lsr->last_error = GF_BAD_PARAM;
+		return;
+	}
 	lsr_read_point_sequence(lsr, path->points, "seq");
 	while (gf_list_count(path->commands)) {
 		u8 *v = (u8 *)gf_list_last(path->commands);
@@ -2720,7 +2770,7 @@
 
 	count = lsr_read_vluimsbf5(lsr, "nbOfTypes");
 	for (i=0; i<count; i++) {
-		type = (u8 *)gf_malloc(sizeof(u8));
+		u8 *type = (u8 *)gf_malloc(sizeof(u8));
 		GF_LSR_READ_INT(lsr, c, 5, name);
 
 		switch (c) {
@@ -2810,7 +2860,7 @@
 static void lsr_read_sync_reference(GF_LASeRCodec *lsr, GF_Node *n)
 {
 	u32 flag;
-	GF_LSR_READ_INT(lsr, flag, 1, "syncReference");
+	GF_LSR_READ_INT(lsr, flag, 1, "hasSyncReference");
 	if (flag) {
 		GF_FieldInfo info;
 		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_syncReference, GF_TRUE, 0, &info);
@@ -2881,7 +2931,7 @@
 {
 	GF_FieldInfo info;
 	u32 flag;
-	GF_LSR_READ_INT(lsr, flag, 1, "transformBehavior");
+	GF_LSR_READ_INT(lsr, flag, 1, "hasTransformBehavior");
 	if (flag) {
 		lsr->last_error = gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_transformBehavior, GF_TRUE, 0, &info);
 		GF_LSR_READ_INT(lsr, *(SVG_TransformBehavior*)info.far_ptr, 4, "transformBehavior");
@@ -3108,7 +3158,7 @@
 	lsr_read_any_attribute(lsr, elt, 1);
 
 	if (!lsr_setup_smil_anim(lsr, (SVG_Element*)elt, parent)) {
-		gf_list_add(lsr->defered_anims, elt);
+		gf_list_add(lsr->deferred_anims, elt);
 		lsr_read_group_content_post_init(lsr, (SVG_Element*)elt, 1);
 	} else {
 		lsr_read_group_content(lsr, elt, 0);
@@ -3149,7 +3199,7 @@
 	lsr_read_any_attribute(lsr, elt, 1);
 
 	if (!lsr_setup_smil_anim(lsr, (SVG_Element*)elt, parent)) {
-		gf_list_add(lsr->defered_anims, elt);
+		gf_list_add(lsr->deferred_anims, elt);
 		lsr_read_group_content_post_init(lsr, (SVG_Element*)elt, 1);
 	} else {
 		lsr_read_group_content_post_init(lsr, (SVG_Element*)elt, 0);
@@ -3217,7 +3267,7 @@
 	lsr_read_any_attribute(lsr, elt, 1);
 
 	if (!lsr_setup_smil_anim(lsr, (SVG_Element*)elt, parent)) {
-		gf_list_add(lsr->defered_anims, elt);
+		gf_list_add(lsr->deferred_anims, elt);
 		lsr_read_group_content_post_init(lsr, (SVG_Element*)elt, 1);
 	} else {
 		lsr_read_group_content(lsr, elt, 0);
@@ -3273,6 +3323,7 @@
 	lsr_read_any_attribute(lsr, elt, 1);
 	lsr_read_command_list(lsr, NULL, (SVG_Element*)elt, 0);
 
+	lsr->has_conditionnals = GF_TRUE;
 	gf_node_init(elt);
 	return elt;
 }
@@ -3515,7 +3566,7 @@
 
 	if (same_type) {
 		if (lsr->prev_polygon) {
-			lsr_restore_base(lsr, (SVG_Element*)elt, (SVG_Element *)lsr->prev_polygon, (same_type==2) ? 0 : 0, (same_type==3) ? 0 : 0);
+			lsr_restore_base(lsr, (SVG_Element*)elt, (SVG_Element *)lsr->prev_polygon, /*(same_type==2) ? 1 : */ 0, /*(same_type==3) ? 1 : */ 0);
 		} else {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] samepolyXXX coded in bitstream but no polyXXX defined !\n"));
 		}
@@ -3667,7 +3718,7 @@
 	lsr_read_any_attribute(lsr, elt, 1);
 
 	if (!lsr_setup_smil_anim(lsr, (SVG_Element*)elt, parent)) {
-		gf_list_add(lsr->defered_anims, elt);
+		gf_list_add(lsr->deferred_anims, elt);
 		lsr_read_group_content_post_init(lsr, (SVG_Element*)elt, 1);
 	} else {
 		lsr_read_group_content(lsr, elt, 0);
@@ -4047,7 +4098,7 @@
 		if (!par) post_pone = 1;
 
 		if (post_pone) {
-			gf_list_add(lsr->defered_listeners, elt);
+			gf_list_add(lsr->deferred_listeners, elt);
 		} else {
 			if (!par) par = parent;
 			gf_node_dom_listener_add((GF_Node *)par, elt);
@@ -4443,7 +4494,7 @@
 	if (!skip_init) gf_node_init((GF_Node*)elt);
 }
 
-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)
+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;
@@ -4451,17 +4502,34 @@
 
 	switch (fieldType) {
 	case SVG_Points_datatype/*ITYPE_point*/:
+	{
+		ListOfXXX *res;
+		GF_SAFEALLOC(res, ListOfXXX);
+		if (!res) return NULL;
+		*res = gf_list_new();
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
-		if (!pt) {
-			lsr->last_error = GF_OUT_OF_MEM;
-			return NULL;
+		if (pt) {
+			lsr_read_coordinate(lsr, &num, 0, "coordX");
+			pt->x = num.value;
+			lsr_read_coordinate(lsr, &num, 0, "coordY");
+			pt->y = num.value;
+			gf_list_add(*res, pt);
 		}
-		lsr_read_coordinate(lsr, &num, 0, "coordX");
-		pt->x = num.value;
-		lsr_read_coordinate(lsr, &num, 0, "coordY");
-		pt->y = num.value;
-		return pt;
+		return res;
+	}
 	case SMIL_KeySplines_datatype/*ITYPE_float*/:
+	{
+		ListOfXXX *res;
+		GF_SAFEALLOC(res, ListOfXXX);
+		if (!res) return NULL;
+		*res = gf_list_new();
+		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
+		if (f_val) {
+			*f_val = lsr_read_fixed_16_8(lsr, "floatValue");
+			gf_list_add(*res, f_val);
+		}
+		return res;
+	}
 	case SVG_StrokeDashArray_datatype:
 	case SVG_ViewBox_datatype:
 		f_val = (Fixed*)gf_malloc(sizeof(Fixed));
@@ -4472,19 +4540,38 @@
 		*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;
+		*res = gf_list_new();
 		f_val = lsr_read_fraction_12_item(lsr);
-		return f_val;
+		if (f_val) gf_list_add(*res, f_val);
+		return res;
+	}
 	case SMIL_KeyPoints_datatype/*ITYPE_0to1 - keyPoints*/:
+	{
+		ListOfXXX *res;
+		GF_SAFEALLOC(res, ListOfXXX);
+		if (!res) return NULL;
+		*res = gf_list_new();
 		pt = (SVG_Point*)gf_malloc(sizeof(SVG_Point));
-		if (!pt) {
-			lsr->last_error = GF_OUT_OF_MEM;
-			return NULL;
+		if (pt) {
+			pt->x = lsr_read_fixed_clamp(lsr, "valueX");
+			pt->y = lsr_read_fixed_clamp(lsr, "valueY");
+			gf_list_add(*res, pt);
 		}
-		pt->x = lsr_read_fixed_clamp(lsr, "valueX");
-		pt->y = lsr_read_fixed_clamp(lsr, "valueY");
-		return pt;
+		return res;
+	}
 	case SMIL_Times_datatype/*ITYPE_smil_time*/:
-		return lsr_read_smil_time(lsr, node);
+	{
+		ListOfXXX *res;
+		GF_SAFEALLOC(res, ListOfXXX);
+		if (!res) return NULL;
+		*res = gf_list_new();
+		gf_list_add(*res, lsr_read_smil_time(lsr, node) );
+		return res;
+	}
 	default:
 		lsr_read_extension(lsr, "privateData");
 		break;
@@ -4646,8 +4733,8 @@
 		if ((att_tag==TAG_XLINK_ATT_href) || (att_tag==TAG_SVG_ATT_syncReference)) {
 			lsr_read_any_uri(lsr, (XMLRI*)val, "val");
 		} else {
-			Bool is_default, is_escape;
-			u32 escape_val, ID;
+			Bool is_escape;
+			u32 ID;
 			escape_val = ID = 0;
 			is_escape = 0;
 			GF_LSR_READ_INT(lsr, is_default, 1, "isDefault");
@@ -4665,13 +4752,13 @@
 				else {
 					((SVG_Focus*)val)->type = SVG_FOCUS_IRI;
 					((SVG_Focus*)val)->target.type = XMLRI_ELEMENTID;
-					((SVG_Focus*)val)->target.target = gf_sg_find_node(lsr->sg, ID);
+					((SVG_Focus*)val)->target.node_id = ID;
 				}
 			} else {
 				if (is_default) ((XMLRI*)val)->type = XMLRI_STRING;
 				else {
-					((XMLRI*)val)->type = XMLRI_ELEMENTID;
-					((XMLRI*)val)->target = gf_sg_find_node(lsr->sg, ID);
+					((XMLRI *)val)->type = XMLRI_ELEMENTID;
+					((XMLRI *)val)->node_id = ID;
 				}
 			}
 		}
@@ -4713,8 +4800,7 @@
 			}
 		}
 	}
-	break;
-	break;
+		break;
 	case LASeR_Choice_datatype:
 		GF_LSR_READ_INT(lsr, is_default, 1, "isDefaultValue");
 		if (is_default) ((LASeR_Choice *)val)->type = LASeR_CHOICE_ALL;
@@ -4765,7 +4851,7 @@
 static GF_Err lsr_read_add_replace_insert(GF_LASeRCodec *lsr, GF_List *com_list, u32 com_type)
 {
 	GF_FieldInfo info;
-	GF_Node *n, *operandNode, *new_node;
+	GF_Node *n, *operandNode;
 	GF_Command *com;
 	GF_CommandField *field;
 	s32 idx, att_type, op_att_type;
@@ -4917,7 +5003,7 @@
 					lsr_read_update_value(lsr, NULL, field->fieldIndex, field->fieldType, field->field_ptr, n ? n->sgprivate->tag : 0);
 				}
 			} else {
-				field->field_ptr = lsr_read_update_value_indexed(lsr, (GF_Node*)n, field_type, NULL, idx, com_type==LSR_UPDATE_INSERT, 1);
+				field->field_ptr = lsr_read_update_value_indexed(lsr, (GF_Node*)n, field_type, NULL, idx, com_type==LSR_UPDATE_INSERT, 1, &field->fieldType);
 			}
 		} else {
 			GF_Point2D matrix_tmp;
@@ -5010,32 +5096,37 @@
 					SVG_Point *pt;
 					Fixed *v1, *v2;
 					//SMIL_Time *t;
-					void *prev;
-					void *tmp = lsr_read_update_value_indexed(lsr, (GF_Node*)n, field_type, info.far_ptr, idx, com_type==LSR_UPDATE_INSERT, 0);
+					void *prev, *new_item;
+					void *tmp = lsr_read_update_value_indexed(lsr, (GF_Node*)n, field_type, info.far_ptr, idx, com_type==LSR_UPDATE_INSERT, 0, NULL);
 					switch (field_type) {
 					/*generic GF_List containers, no type translation needed*/
 					case SMIL_KeyTimes_datatype/*ITYPE_keyTime*/:
 					case SMIL_KeySplines_datatype/*ITYPE_float*/:
 					case SVG_Points_datatype/*ITYPE_point*/:
 					case SMIL_Times_datatype/*ITYPE_smil_time*/:
+						new_item = gf_list_pop_front(*(GF_List **)tmp);
 						if (com_type==LSR_UPDATE_INSERT) {
-							gf_list_insert(*(SVG_Coordinates*)info.far_ptr, tmp, idx);
+							gf_list_insert(*(SVG_Coordinates*)info.far_ptr, new_item, idx);
 						} else {
 							prev = gf_list_get(*(SVG_Coordinates*)info.far_ptr, idx);
 							gf_free(prev);
 							gf_list_rem(*(SVG_Coordinates*)info.far_ptr, idx);
-							gf_list_insert(*(SVG_Coordinates*)info.far_ptr, tmp, idx);
+							gf_list_insert(*(SVG_Coordinates*)info.far_ptr, new_item, idx);
 						}
 						gf_node_changed((GF_Node*)n, NULL);
+						gf_list_del(*(GF_List **)tmp);
+						gf_free(tmp);
 						break;
 					/*list of floats - to check when implementing it...*/
 					case SMIL_KeyPoints_datatype/*ITYPE_0to1 - keyPoints*/:
-						pt = (SVG_Point*)tmp;
+						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);
+						gf_list_del(*(GF_List **)tmp);
+						gf_free(tmp);
 
 						if (com_type==LSR_UPDATE_INSERT) {
 							gf_list_insert(*(SVG_Coordinates*)info.far_ptr, v1, idx);
@@ -5097,7 +5188,7 @@
 					tmp.far_ptr = gf_svg_create_attribute_value(info.fieldType);
 					lsr_read_update_value(lsr, n, fieldIndex, field_type, tmp.far_ptr, n->sgprivate->tag);
 				} else {
-					tmp.far_ptr = lsr_read_update_value_indexed(lsr, n, field_type, NULL, idx, 0, 1);
+					tmp.far_ptr = lsr_read_update_value_indexed(lsr, n, field_type, NULL, idx, 0, 1, NULL);
 				}
 				gf_svg_attributes_add(&info, &tmp, &info, 0);
 				gf_svg_delete_attribute_value(info.fieldType, tmp.far_ptr, gf_node_get_graph(n));
@@ -5139,8 +5230,6 @@
 	/*list replacement*/
 	GF_LSR_READ_INT(lsr, type, 1, "opt_group");
 	if (type) {
-		if (!com_type /*|| (idx!=-1) */)
-			return GF_NON_COMPLIANT_BITSTREAM;
 
 		if (com_list) {
 			u32 count;
@@ -5166,7 +5255,7 @@
 				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, n);
+					gf_node_register(new_node, NULL);
 					gf_node_list_add_child_last(& field->node_list, new_node, &last);
 					count--;
 				}
@@ -5180,7 +5269,7 @@
 
 			if (com_type==LSR_UPDATE_REPLACE) {
 				if (idx>=0) {
-					new_node = gf_node_list_del_child_idx(&elt->children, idx);
+					GF_Node *new_node = gf_node_list_del_child_idx(&elt->children, idx);
 					if (new_node) gf_node_unregister(new_node, n);
 				} else {
 					gf_node_unregister_children(n, elt->children);
@@ -5189,7 +5278,7 @@
 			}
 			if ((com_type==LSR_UPDATE_INSERT) || (gf_lsr_anim_type_to_attribute(att_type) == TAG_LSR_ATT_children)) {
 				while (count) {
-					new_node = lsr_read_update_content_model(lsr, elt);
+					GF_Node *new_node = lsr_read_update_content_model(lsr, elt);
 					if (new_node) {
 						if (idx>=0) {
 							gf_node_list_insert_child(&elt->children, new_node, idx);
@@ -5204,7 +5293,7 @@
 			}
 			/*node replacement*/
 			else if ((att_type==-1) && (count==1)) {
-				new_node = lsr_read_update_content_model(lsr, elt);
+				GF_Node *new_node = lsr_read_update_content_model(lsr, elt);
 				gf_node_replace((GF_Node*)elt, new_node, 0);
 			}
 		}
@@ -5228,7 +5317,6 @@
 	lsr_read_any_attribute(lsr, NULL, 1);
 	if (com_list) {
 		GF_Command *com;
-		GF_CommandField *field;
 		com = gf_sg_command_new(lsr->sg, GF_SG_LSR_DELETE);
 		gf_list_add(com_list, com);
 		com->node = gf_sg_find_node(lsr->sg, idref);
@@ -5240,7 +5328,7 @@
 		}
 
 		if ((idx>=0) || (att_type>=0)) {
-			field = gf_sg_command_field_new(com);
+			GF_CommandField *field = gf_sg_command_field_new(com);
 			field->pos = idx;
 			if (att_type>=0) {
 				field->fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
@@ -5249,13 +5337,12 @@
 			}
 		}
 	} else {
-		s32 fieldIndex = -1;
 		SVG_Element *elt = (SVG_Element *) gf_sg_find_node(lsr->sg, idref);
 		if (!elt)
 			return GF_NON_COMPLIANT_BITSTREAM;
 
 		if (att_type>=0) {
-			fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
+			s32 fieldIndex = gf_lsr_anim_type_to_attribute(att_type);
 			gf_node_get_field((GF_Node*)elt, fieldIndex, &info);
 			/*TODO implement*/
 		}
@@ -5469,14 +5556,13 @@
 		case LSR_UPDATE_EXTEND:
 		{
 			u32 extID;
-			GF_Node *n;
 			GF_LSR_READ_INT(lsr, extID, lsr->info->cfg.extensionIDBits, "extensionID");
 			/*len = */lsr_read_vluimsbf5(lsr, "len");
 			if (extID==2) {
-				u32 j;
+				u32 j, sub_count;
 				lsr_read_vluimsbf5(lsr, "reserved");
-				/*sub_count = */lsr_read_vluimsbf5(lsr, "occ2");
-				for (j=0; j<count; j++) {
+				sub_count = lsr_read_vluimsbf5(lsr, "occ2");
+				for (j=0; j<sub_count; j++) {
 					u32 k, occ3;
 					GF_LSR_READ_INT(lsr, k, 2, "reserved");
 					occ3 = lsr_read_vluimsbf5(lsr, "occ3");

gpac-0.8.0.tar.gz/src/laser/lsr_enc.c -> gpac-1.0.0.tar.gz/src/laser/lsr_enc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / LASeR codec sub-project
@@ -35,6 +35,7 @@
 
 #define GF_LSR_WRITE_INT(_codec, _val, _nbBits, _str)	{\
 	gf_bs_write_int(_codec->bs, _val, _nbBits);	\
+	assert(_str);\
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODING, ("[LASeR] %s\t\t%d\t\t%d\n", _str, _nbBits, _val)); \
 	}\
  
@@ -107,7 +108,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, char **out_data, u32 *out_data_length)
+GF_Err gf_laser_encoder_get_config(GF_LASeRCodec *codec, u16 ESID, u8 **out_data, u32 *out_data_length)
 {
 	GF_BitStream *bs;
 	if (!codec || !out_data || !out_data_length) return GF_BAD_PARAM;
@@ -149,7 +150,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_context, char **out_data, u32 *out_data_length)
+GF_Err gf_laser_encode_au(GF_LASeRCodec *codec, u16 ESID, GF_List *command_list, Bool reset_context, u8 **out_data, u32 *out_data_length)
 {
 	GF_Err e;
 	if (!codec || !command_list || !out_data || !out_data_length) return GF_BAD_PARAM;
@@ -177,7 +178,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, char **out_data, u32 *out_data_length)
+GF_Err gf_laser_encoder_get_rap(GF_LASeRCodec *codec, u8 **out_data, u32 *out_data_length)
 {
 	GF_Err e;
 	if (!codec->info) codec->info = (LASeRStreamInfo*)gf_list_get(codec->streamInfo, 0);
@@ -269,13 +270,15 @@
 static void lsr_write_codec_IDREF(GF_LASeRCodec *lsr, XMLRI *href, const char *name)
 {
 	u32 nID = 0;
-	if (href && href->target) nID = gf_node_get_id((GF_Node *)href->target);
+	if (href && href->target)
+		nID = gf_node_get_id((GF_Node *)href->target);
 	else if (name[0]=='#') {
 		GF_Node *n = gf_sg_find_node_by_name(lsr->sg, (char *) name + 1);
 		if (n) nID = gf_node_get_id((GF_Node *)href->target);
-	}
-	else nID = 1+href->lsr_stream_id;
-
+	} else if (href)
+		nID = 1+href->lsr_stream_id;
+	else
+		nID=1;
 	assert(nID);
 
 	lsr_write_vluimsbf5(lsr, nID-1, name);
@@ -396,7 +399,7 @@
 		} else {
 			str = (char*)gf_list_get(l, i);
 		}
-		strcat(text, str);
+		strncat(text, str, 4096-strlen(text)-1);
 		if (i+1<count) strcat(text, ";");
 	}
 	lsr_write_byte_align_string(lsr, text, name);
@@ -437,9 +440,9 @@
 	GF_LSR_WRITE_INT(lsr, (iri->type==XMLRI_ELEMENTID) ? 1 : 0, 1, "hasID");
 	if (iri->type==XMLRI_ELEMENTID) lsr_write_codec_IDREF(lsr, iri, "idref");
 
-	GF_LSR_WRITE_INT(lsr, (iri->type==XMLRI_STREAMID) ? 1 : 0, 1, "hasID");
+	GF_LSR_WRITE_INT(lsr, (iri->type==XMLRI_STREAMID) ? 1 : 0, 1, "hasStreamID");
 	if (iri->type==XMLRI_STREAMID)
-		lsr_write_codec_IDREF(lsr, iri, "ref");
+		lsr_write_codec_IDREF(lsr, iri, "href");
 }
 
 static void lsr_write_paint(GF_LASeRCodec *lsr, SVG_Paint *paint, const char *name)
@@ -533,18 +536,18 @@
 
 static void lsr_write_any_attribute(GF_LASeRCodec *lsr, SVG_Element *node, Bool skippable)
 {
-	if (1) {
-		if (skippable) GF_LSR_WRITE_INT(lsr, 0, 1, "has_attrs");
-	} else {
-		if (skippable) GF_LSR_WRITE_INT(lsr, 1, 1, "has_attrs");
-		/*
-				do () {
-					GF_LSR_WRITE_INT(lsr, 0, lsr->info->cfg.extensionIDBits, "reserved");
-				    lsr_write_vluimsbf5(lsr, 0, "len");//len in BITS
-					GF_LSR_WRITE_INT(lsr, 0, 0, "reserved_val");
-				} while ()
-		*/
-	}
+#if 1
+	if (skippable) GF_LSR_WRITE_INT(lsr, 0, 1, "has_attrs");
+#else
+	if (skippable) GF_LSR_WRITE_INT(lsr, 1, 1, "has_attrs");
+	/*
+			do () {
+				GF_LSR_WRITE_INT(lsr, 0, lsr->info->cfg.extensionIDBits, "reserved");
+				lsr_write_vluimsbf5(lsr, 0, "len");//len in BITS
+				GF_LSR_WRITE_INT(lsr, 0, 0, "reserved_val");
+			} while ()
+	*/
+#endif
 }
 
 static void lsr_write_private_attributes(GF_LASeRCodec *lsr, SVG_Element *elt)
@@ -875,7 +878,6 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Unsupported LASER event %d\n", evtType) );
 			GF_LSR_WRITE_INT(lsr, 0, 6, "event");
 			break;
-			return;
 		}
 		switch (evtType) {
 		case GF_EVENT_KEYDOWN:
@@ -1105,7 +1107,17 @@
 				len +=1;
 				break;
 			case TAG_SVG_ATT_requiredFonts:
-				len += 8 * (u32) strlen(*(SVG_String*)att->data);
+			{
+				GF_List *l = *(GF_List **)att->data;
+				u32 str_len = 0;
+				for (i=0; i<gf_list_count(l); i++) {
+					char *st = gf_list_get(l, i);
+					str_len += (u32) strlen(st);
+					if (i) str_len += 1;
+				}
+
+				len += 8 * (u32) str_len;
+
 				/*get vluimsbf5 field size with one extra word (4 bits, enough to code string alignment)*/
 				size = lsr_get_vluimsbf5_size(len, 1);
 				cur_bits = gf_bs_get_bit_position(lsr->bs) + lsr->info->cfg.extensionIDBits + size + 5;
@@ -1115,6 +1127,7 @@
 					cur_bits++;
 				}
 				is_string = GF_TRUE;
+			}
 				break;
 			default:
 				len +=2;
@@ -1144,11 +1157,11 @@
 				break;
 			case TAG_SVG_ATT_fullscreen:
 				GF_LSR_WRITE_INT(lsr, 3, 3, "attributeRARE");
-				GF_LSR_WRITE_INT(lsr, *(SVG_Boolean *)att->data ? 1 : 0, 2, "fullscreen");
+				GF_LSR_WRITE_INT(lsr, *(SVG_Boolean *)att->data ? 1 : 0, 1, "fullscreen");
 				break;
 			case TAG_SVG_ATT_requiredFonts:
 				GF_LSR_WRITE_INT(lsr, 4, 3, "attributeRARE");
-				lsr_write_byte_align_string(lsr, *(SVG_String*)att->data, "requiredFonts");
+				lsr_write_byte_align_string_list(lsr, *(GF_List **)att->data, "requiredFonts", GF_FALSE);
 				break;
 			}
 			GF_LSR_WRITE_INT(lsr, 0, 1, "hasNextExtension");
@@ -1277,6 +1290,7 @@
 				if (iri->type != XMLRI_STRING) continue;
 				ext = strchr(iri->string, '#');
 				if (!ext) continue;
+				ext++;
 				if (!stricmp(ext, "Animation")) {
 					vals[tot_count] = 0;
 					tot_count++;
@@ -1604,11 +1618,13 @@
 	if (!anim_type->type) anim_type->type = gf_xml_get_attribute_type(anim_type->tag);
 	a_type = gf_lsr_anim_type_from_attribute(anim_type->tag);
 	if (a_type<0) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Unsupported attributeName %s\n", anim_type->name));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] Unsupported attributeName %s for animatable type, skipping\n", anim_type->name));
+		GF_LSR_WRITE_INT(lsr, 0, 1, "hasAttributeName");
+	} else {
+		GF_LSR_WRITE_INT(lsr, 1, 1, "hasAttributeName");
+		GF_LSR_WRITE_INT(lsr, 0, 1, "choice");
+		GF_LSR_WRITE_INT(lsr, (u8) a_type, 8, "attributeType");
 	}
-	GF_LSR_WRITE_INT(lsr, 1, 1, "hasAttributeName");
-	GF_LSR_WRITE_INT(lsr, 0, 1, "choice");
-	GF_LSR_WRITE_INT(lsr, (u8) a_type, 8, "attributeType");
 }
 
 static void lsr_write_anim_fill(GF_LASeRCodec *lsr, u8 *animFreeze)
@@ -1773,12 +1789,12 @@
 		{
 			SVG_Number  *n = (SVG_Number *) val;
 			if (n->type != SVG_NUMBER_VALUE) {
-				u8 val = 0;
-				if (n->type==SVG_NUMBER_INHERIT) val=1;
+				u8 value = 0;
+				if (n->type==SVG_NUMBER_INHERIT) value=1;
 				/*fixe me spec is not clear here regarding what values should be used ...*/
 				
 				GF_LSR_WRITE_INT(lsr, 1, 1, "escapeFlag");
-				GF_LSR_WRITE_INT(lsr, val, 2, "escapeEnum");
+				GF_LSR_WRITE_INT(lsr, value, 2, "escapeEnum");
 				return;
 			} else {
 				GF_LSR_WRITE_INT(lsr, 0, 1, "escapeFlag");
@@ -1928,7 +1944,7 @@
 	} else {
 		u32 type = svg_type_to_lsr_anim(val->type, 0, NULL, val->value);
 		if (type==255) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] unsupported anim type %d - skipping\n", val->type ));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] unsupported anim type %d (%s) - skipping\n", val->type , gf_svg_attribute_type_to_string(val->type) ));
 			GF_LSR_WRITE_INT(lsr, 0, 1, name);
 		} else {
 			GF_LSR_WRITE_INT(lsr, 1, 1, name);
@@ -1949,7 +1965,7 @@
 	}
 	type = svg_type_to_lsr_anim(anims->type, 0, anims->values, NULL);
 	if (type==255) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] unsupported anim type %d - skipping\n", anims->type ));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[LASeR] unsupported anim type %d (%s) - skipping\n", anims->type, gf_svg_attribute_type_to_string(anims->type) ));
 		GF_LSR_WRITE_INT(lsr, 0, 1, name);
 	} else {
 		GF_LSR_WRITE_INT(lsr, 1, 1, name);
@@ -2052,26 +2068,26 @@
 			c_y = pt->y;
 			nb_dx = nb_dy = 0;
 			for (i=1; i<count; i++) {
-				SVG_Point *pt = (SVG_Point *)gf_list_get(*pts, i);
-				k = lsr_get_bit_size(lsr, pt->x - c_x);
+				SVG_Point *a_pt = (SVG_Point *)gf_list_get(*pts, i);
+				k = lsr_get_bit_size(lsr, a_pt->x - c_x);
 				if (k>nb_dx) nb_dx = k;
-				k = lsr_get_bit_size(lsr, pt->y - c_y);
+				k = lsr_get_bit_size(lsr, a_pt->y - c_y);
 				if (k>nb_dy) nb_dy = k;
-				c_x = pt->x;
-				c_y = pt->y;
+				c_x = a_pt->x;
+				c_y = a_pt->y;
 			}
 			GF_LSR_WRITE_INT(lsr, nb_dx, 5, "bitsx");
 			GF_LSR_WRITE_INT(lsr, nb_dy, 5, "bitsy");
 			c_x = pt->x;
 			c_y = pt->y;
 			for (i=1; i<count; i++) {
-				SVG_Point *pt = (SVG_Point *)gf_list_get(*pts, i);
-				k = lsr_translate_coords(lsr, pt->x - c_x, nb_dx);
+				SVG_Point *a_pt = (SVG_Point *)gf_list_get(*pts, i);
+				k = lsr_translate_coords(lsr, a_pt->x - c_x, nb_dx);
 				GF_LSR_WRITE_INT(lsr, k, nb_dx, "dx");
-				k = lsr_translate_coords(lsr, pt->y - c_y, nb_dy);
+				k = lsr_translate_coords(lsr, a_pt->y - c_y, nb_dy);
 				GF_LSR_WRITE_INT(lsr, k, nb_dy, "dy");
-				c_x = pt->x;
-				c_y = pt->y;
+				c_x = a_pt->x;
+				c_y = a_pt->y;
 			}
 		}
 	}
@@ -2080,7 +2096,14 @@
 {
 #if USE_GF_PATH
 	u32 i, *contour, nb_types;
-	GF_List *pts = gf_list_new();
+	GF_List *pts;
+
+	if (!path) {
+		lsr_write_vluimsbf5(lsr, 0, "nbPoints");
+		lsr_write_vluimsbf5(lsr, 0, "nbOfTypes");
+		return;
+	}
+	pts = gf_list_new();
 
 	contour = path->contours;
 	nb_types = 0;
@@ -2247,10 +2270,18 @@
 
 static void lsr_write_value_with_units(GF_LASeRCodec *lsr, SVG_Number *n, const char *name)
 {
+	s32 val;
+
+	if (!n) {
+		GF_LSR_WRITE_INT(lsr, 0, 32, name);
+		GF_LSR_WRITE_INT(lsr, 0, 3, "units");
+		return;
+	}
+
 #ifdef GPAC_FIXED_POINT
-	s32 val = n->value >> 8;
+	val = n->value >> 8;
 #else
-	s32 val = (s32) (n->value * (1<<8) );
+	val = (s32) (n->value * (1<<8) );
 #endif
 	GF_LSR_WRITE_INT(lsr, val, 32, name);
 	switch (n->type) {
@@ -2511,7 +2542,7 @@
 	lsr_write_repeat_duration(lsr, atts.repeatDur);
 	lsr_write_anim_restart(lsr, atts.restart);
 	lsr_write_sync_behavior(lsr, atts.syncBehavior, "syncBehavior");
-	lsr_write_sync_tolerance(lsr, atts.syncTolerance, "syncBehavior");
+	lsr_write_sync_tolerance(lsr, atts.syncTolerance, "syncTolerance");
 	lsr_write_content_type(lsr, atts.xlink_type, "type");
 	lsr_write_href(lsr, atts.xlink_href);
 
@@ -2922,7 +2953,7 @@
 	lsr_write_id(lsr, (GF_Node *) elt);
 	lsr_write_rare(lsr, (GF_Node *) elt);
 	GF_LSR_WRITE_INT(lsr, (atts.externalResourcesRequired && *atts.externalResourcesRequired) ? 1 : 0, 1, "externalResourcesRequired");
-	lsr_write_script_type(lsr, atts.xlink_type);
+	lsr_write_script_type(lsr, atts.type);
 	lsr_write_href(lsr, atts.xlink_href);
 	lsr_write_any_attribute(lsr, elt, GF_TRUE);
 	lsr_write_group_content(lsr, elt, GF_FALSE);
@@ -3212,7 +3243,7 @@
 	lsr_write_repeat_duration(lsr, atts.repeatDur);
 	lsr_write_anim_restart(lsr, atts.restart);
 	lsr_write_sync_behavior(lsr, atts.syncBehavior, "syncBehavior");
-	lsr_write_sync_tolerance(lsr, atts.syncTolerance, "syncBehavior");
+	lsr_write_sync_tolerance(lsr, atts.syncTolerance, "syncTolerance");
 	lsr_write_transform_behavior(lsr, atts.transformBehavior);
 	lsr_write_content_type(lsr, atts.xlink_type, "type");
 	lsr_write_coordinate_ptr(lsr, atts.width, GF_TRUE, "width");
@@ -3224,7 +3255,7 @@
 	lsr_write_clip_time(lsr, atts.clipEnd, "clipEnd");
 
 	GF_LSR_WRITE_INT(lsr, fs_value ? 1 : 0, 1, "hasFullscreen");
-	if (atts.fullscreen) GF_LSR_WRITE_INT(lsr, fs_value - 1, 1, "fullscreen");
+	if (fs_value) GF_LSR_WRITE_INT(lsr, fs_value - 1, 1, "fullscreen");
 
 	GF_LSR_WRITE_INT(lsr, atts.syncReference ? 1 : 0, 1, "hasSyncReference");
 	if (atts.syncReference) lsr_write_any_uri(lsr, atts.syncReference, "syncReference");
@@ -3620,6 +3651,10 @@
 			GF_LSR_WRITE_INT(lsr, LSR_UPDATE_CONTENT_MODEL_listener, 6, "ch6");
 			lsr_write_listener(lsr, node);
 			break;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[LASeR] Cannot encode node %s as command child node\n", gf_node_get_class_name((GF_Node*)node)));
+			lsr->last_error = GF_NON_COMPLIANT_BITSTREAM;
+			break;
 		}
 	}
 }
@@ -3655,7 +3690,6 @@
 
 static void lsr_write_update_value(GF_LASeRCodec *lsr, SVG_Element *elt, u32 fieldType, u32 att_tag, u32 transformType, void *val, Bool is_indexed)
 {
-	SVG_Number *n;
 	if (is_indexed) {
 		assert(gf_list_count(*(GF_List **)val));
 		switch (fieldType) {
@@ -3674,8 +3708,9 @@
 		break;
 		case SMIL_KeyPoints_datatype:/*0to1*/
 		{
-			Fixed *f = (Fixed*)gf_list_get(*(GF_List **)val, 0);
-			lsr_write_fixed_clamp(lsr, *f, "v");
+			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");
 		}
 		break;
 		case SMIL_KeySplines_datatype:/*float*/
@@ -3693,7 +3728,8 @@
 				GF_LSR_WRITE_INT(lsr, (f==0) ? 0 : 1, 1, "isZero");
 			} else {
 				GF_LSR_WRITE_INT(lsr, 0, 1, "hasShort");
-				lsr_write_fixed_clamp(lsr, f, "timevalue");
+				f *= 4096;
+				GF_LSR_WRITE_INT(lsr, (u32) f, 12, "timevalue");
 			}
 		}
 		break;
@@ -3707,6 +3743,7 @@
 			break;
 		}
 	} else {
+		SVG_Number *n;
 		switch (fieldType) {
 		case SVG_Boolean_datatype:
 			GF_LSR_WRITE_INT(lsr, *(SVG_Boolean*)val ? 1 : 0, 1, "val");
@@ -3789,11 +3826,14 @@
 			n = (SVG_Number*)val;
 			lsr_write_coordinate(lsr, n->value, GF_FALSE, "val");
 			break;
+		//only applies to text x,y and not updatable in laser
+#if 0
 		case SVG_Coordinates_datatype:
 			GF_LSR_WRITE_INT(lsr, 0, 1, "isInherit");
 			GF_LSR_WRITE_INT(lsr, 0, 1, "escapeFlag");
 			lsr_write_float_list(lsr, (GF_List **)val, "val");
 			break;
+#endif
 		case XMLRI_datatype:
 			if ((att_tag==TAG_XLINK_ATT_href) || (att_tag==TAG_SVG_ATT_syncReference)) {
 				lsr_write_any_uri(lsr, (XMLRI*)val, "val");
@@ -3806,12 +3846,12 @@
 			}
 			break;
 		case SVG_Focus_datatype:
-			if ( (((SVG_Focus*)val)->type == SVG_FOCUS_AUTO) || !((SVG_Focus*)val)->target.target) {
-				GF_LSR_WRITE_INT(lsr, 1, 1, "isDefault");
-			} else if (((SVG_Focus*)val)->type == SVG_FOCUS_SELF) {
+			if (((SVG_Focus*)val)->type == SVG_FOCUS_SELF) {
 				GF_LSR_WRITE_INT(lsr, 0, 1, "isDefault");
 				GF_LSR_WRITE_INT(lsr, 1, 1, "isEscape");
 				GF_LSR_WRITE_INT(lsr, 1, 2, "escapeEnumVal");
+			} else if ( (((SVG_Focus*)val)->type == SVG_FOCUS_AUTO) || !((SVG_Focus*)val)->target.target) {
+				GF_LSR_WRITE_INT(lsr, 1, 1, "isDefault");
 			} else {
 				GF_LSR_WRITE_INT(lsr, 0, 1, "isDefault");
 				GF_LSR_WRITE_INT(lsr, 0, 1, "isEscape");
@@ -3848,6 +3888,8 @@
 			}
 		}
 		break;
+		//only applies to svg viewport and not updatable in laser
+#if 0
 		case SVG_ViewBox_datatype:
 		{
 			SVG_ViewBox *b = (SVG_ViewBox *)val;
@@ -3860,6 +3902,7 @@
 			lsr_write_fixed_16_8(lsr, b->width, "height");
 		}
 		break;
+#endif
 		case SVG_FontFamily_datatype:
 		{
 			SVG_FontFamily *ff = (SVG_FontFamily *)val;
@@ -3943,7 +3986,7 @@
 			GF_LSR_WRITE_INT(lsr, 1, 1, "has_operandAttribute");
 			GF_LSR_WRITE_INT(lsr, opAttType, 8, "operandAttribute");
 			GF_LSR_WRITE_INT(lsr, 1, 1, "has_operandElementId");
-			lsr_write_vluimsbf5(lsr, com->fromNodeID-1, "operandElementId");
+			lsr_write_codec_IDREF_Node(lsr, com->node, "operandElementId");
 		} else {
 			GF_LSR_WRITE_INT(lsr, 0, 1, "has_operandAttribute");
 			GF_LSR_WRITE_INT(lsr, 0, 1, "has_operandElementId");
@@ -3953,7 +3996,7 @@
 	if (field && !field->new_node && !field->node_list && !com->fromNodeID) {
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_value");
 		lsr_write_update_value(lsr, (SVG_Element *)com->node, field_type, field->fieldIndex, tr_type, field->field_ptr, (field->pos>=0) ? GF_TRUE : GF_FALSE);
-	} else if (is_text_node) {
+	} else if (field && is_text_node) {
 		GF_DOMText *t = (GF_DOMText *)field->new_node;
 		GF_LSR_WRITE_INT(lsr, 1, 1, "has_value");
 		lsr_write_update_value(lsr, (SVG_Element *)com->node, DOM_String_datatype, field->fieldIndex, 0, &t->textContent, (field->pos>=0) ? GF_TRUE : GF_FALSE);
@@ -4092,7 +4135,7 @@
 				GF_LSR_WRITE_INT(lsr, 0, 1, "has_stringvalue");
 			}
 			GF_LSR_WRITE_INT(lsr, 0, 1, "has_attr_any");
-			return GF_OK;
+			break;
 
 		case GF_SG_LSR_ACTIVATE:
 		case GF_SG_LSR_DEACTIVATE:
@@ -4127,7 +4170,7 @@
 exit:
 	/*script is aligned*/
 	if (cond)	{
-		char *data;
+		u8 *data;
 		u32 data_size;
 		gf_bs_get_content(lsr->bs, &data, &data_size);
 		gf_bs_del(lsr->bs);
@@ -4207,7 +4250,7 @@
 				if (!strcmp(an->name, "fill")) check_anim_col = 1; /*we're sure this is not SMIL fill, it is not animatable*/
 				else if (!strcmp(an->name, "stroke")) check_anim_col = 1;
 				else if (!strcmp(an->name, "color")) check_anim_col = 1;
-				else if (!strcmp(an->name, "solid-olor")) check_anim_col = 2;
+				else if (!strcmp(an->name, "solid-color")) check_anim_col = 2;
 				else if (!strcmp(an->name, "stop-color")) check_anim_col = 2;
 				else if (!strcmp(an->name, "font-family")) check_anim_font = 1;
 			}
@@ -4295,7 +4338,9 @@
 		GF_LSR_WRITE_INT(lsr, reset_encoding_context ? 1 : 0, 1, "resetEncodingContext");
 	}
 	GF_LSR_WRITE_INT(lsr, 0, 1, "opt_group");
-	if (0) lsr_write_extension(lsr, NULL, 0, "ext");
+#if 0
+	lsr_write_extension(lsr, NULL, 0, "ext");
+#endif
 
 	/*clean all tables*/
 	if (reset_encoding_context) {
@@ -4398,7 +4443,9 @@
 		if (e) return e;
 	}
 	GF_LSR_WRITE_INT(lsr, 0, 1, "opt_group");
-	if (0) lsr_write_extension(lsr, NULL, 0, "ext");
+#if 0
+	lsr_write_extension(lsr, NULL, 0, "ext");
+#endif
 	return GF_OK;
 }

gpac-0.8.0.tar.gz/src/media_tools/ait.c -> gpac-1.0.0.tar.gz/src/media_tools/ait.c Changed

@@ -42,8 +42,10 @@
 	GF_M2TS_AIT_CARRY *ses;
 	GF_SAFEALLOC(ses, GF_M2TS_AIT_CARRY);
 	es = (GF_M2TS_ES *)ses;
-	es->flags = GF_M2TS_ES_IS_SECTION;
-	ses->service_id = service_id;
+	if (es) {
+		es->flags = GF_M2TS_ES_IS_SECTION;
+		ses->service_id = service_id;
+	}
 	return es;
 }
 
@@ -58,12 +60,13 @@
 
 
 	if (evt_type == GF_M2TS_EVT_AIT_FOUND) {
-		GF_M2TS_AIT* ait;
 		GF_M2TS_AIT_CARRY* ait_carry = (GF_M2TS_AIT_CARRY*)pck->stream;
 		data = pck->data;
 
 		if(!check_ait_already_received(ts->ChannelAppList,ait_carry->pid,data)) {
+			GF_M2TS_AIT* ait;
 			GF_SAFEALLOC(ait, GF_M2TS_AIT);
+			if (!ait) return;
 			u32_data_size = pck->data_len;
 			u32_table_id = data[0];
 			ait->pid = ait_carry->pid;
@@ -81,12 +84,10 @@
 {
 
 	GF_BitStream *bs;
-	u8 temp_descriptor_tag;
 	u32 data_shift, app_desc_data_shift, ait_app_data_shift;
 	u32 nb_of_protocol;
 
 	data_shift = 0;
-	temp_descriptor_tag = 0;
 	ait_app_data_shift = 0;
 	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
 
@@ -142,6 +143,8 @@
 
 		GF_M2TS_AIT_APPLICATION_DECODE* application;
 		GF_SAFEALLOC(application,GF_M2TS_AIT_APPLICATION_DECODE);
+		if (!application) break;
+
 		application->application_descriptors = gf_list_new();
 		application->index_app_desc_id = 0;
 
@@ -157,7 +160,7 @@
 		nb_of_protocol = 0;
 
 		while (app_desc_data_shift< application->application_descriptors_loop_length) {
-			temp_descriptor_tag = gf_bs_read_int(bs,8);
+			u8 temp_descriptor_tag = gf_bs_read_int(bs,8);
 			switch (temp_descriptor_tag) {
 			case APPLICATION_DESCRIPTOR:
 			{
@@ -165,6 +168,8 @@
 				u8 i;
 				GF_M2TS_APPLICATION_DESCRIPTOR *application_descriptor;
 				GF_SAFEALLOC(application_descriptor, GF_M2TS_APPLICATION_DESCRIPTOR);
+				if (!application_descriptor) break;
+
 				application_descriptor->descriptor_tag = temp_descriptor_tag;
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
@@ -200,6 +205,8 @@
 				u64 pre_processing_pos;
 				GF_M2TS_APPLICATION_NAME_DESCRIPTOR* name_descriptor;
 				GF_SAFEALLOC(name_descriptor, GF_M2TS_APPLICATION_NAME_DESCRIPTOR);
+				if (!name_descriptor) break;
+
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
 				name_descriptor->descriptor_tag = temp_descriptor_tag;
@@ -225,6 +232,8 @@
 				u64 pre_processing_pos;
 				GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR* protocol_descriptor;
 				GF_SAFEALLOC(protocol_descriptor, GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR);
+				if (!protocol_descriptor) break;
+
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
 				nb_of_protocol++;
@@ -238,6 +247,8 @@
 				{
 					GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE* Carousel_selector_byte;
 					GF_SAFEALLOC(Carousel_selector_byte, GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE);
+					if (!Carousel_selector_byte) break;
+
 					Carousel_selector_byte->remote_connection = gf_bs_read_int(bs,1);
 					gf_bs_read_int(bs,7); /* bit shifting */
 					if (Carousel_selector_byte->remote_connection) {
@@ -254,8 +265,10 @@
 					u32 i;
 					GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte;
 					GF_SAFEALLOC(Transport_http_selector_byte, GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE);
+					if (!Transport_http_selector_byte) break;
+
 					Transport_http_selector_byte->URL_base_length = gf_bs_read_int(bs,8);
-					//fprintf(stderr, "Transport_http_selector_byte->URL_base_length %d \n",Transport_http_selector_byte->URL_base_length);
+
 					Transport_http_selector_byte->URL_base_byte = (char*)gf_calloc(Transport_http_selector_byte->URL_base_length+1,sizeof(char));
 					gf_bs_read_data(bs,Transport_http_selector_byte->URL_base_byte ,(u32)(Transport_http_selector_byte->URL_base_length));
 					Transport_http_selector_byte->URL_base_byte[Transport_http_selector_byte->URL_base_length] = 0;
@@ -303,6 +316,8 @@
 				u64 pre_processing_pos;
 				GF_M2TS_SIMPLE_APPLICATION_LOCATION* Simple_application_location;
 				GF_SAFEALLOC(Simple_application_location, GF_M2TS_SIMPLE_APPLICATION_LOCATION);
+				if (!Simple_application_location) break;
+
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
 				Simple_application_location->descriptor_tag = temp_descriptor_tag;
@@ -326,6 +341,8 @@
 				u64 pre_processing_pos;
 				GF_M2TS_APPLICATION_USAGE* Application_usage;
 				GF_SAFEALLOC(Application_usage, GF_M2TS_APPLICATION_USAGE);
+				if (!Application_usage) break;
+
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
 				Application_usage->descriptor_tag = temp_descriptor_tag;
@@ -347,6 +364,8 @@
 				u32 i;
 				GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR* boundary_descriptor;
 				GF_SAFEALLOC(boundary_descriptor, GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR);
+				if (!boundary_descriptor) break;
+
 				application->application_descriptors_id[application->index_app_desc_id] = temp_descriptor_tag;
 				application->index_app_desc_id++;
 				boundary_descriptor->descriptor_tag = temp_descriptor_tag;
@@ -367,7 +386,6 @@
 				if (pre_processing_pos+boundary_descriptor->descriptor_length != gf_bs_get_position(bs)) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] Descriptor data processed length error. Difference between byte shifting %d and descriptor length %d \n",(gf_bs_get_position(bs) -  pre_processing_pos),boundary_descriptor->descriptor_length));
 					if (boundary_descriptor->boundary_extension_count > 0) {
-						u32 i;
 						for (i=0; i<boundary_descriptor->boundary_extension_count; i++) {
 							if (boundary_descriptor->boundary_extension_info[i].boundary_extension_length > 0) {
 								gf_free(boundary_descriptor->boundary_extension_info[i].boundary_extension_byte);
@@ -428,6 +446,7 @@
 
 	if(!ChanAppInfo) {
 		GF_SAFEALLOC(ChanAppInfo,GF_M2TS_CHANNEL_APPLICATION_INFO);
+		if (!ChanAppInfo) return;
 		ChanAppInfo->service_id = ait->service_id;
 		ChanAppInfo->Application = gf_list_new();
 		ChanAppInfo->ait_pid = ait->pid;
@@ -442,6 +461,8 @@
 		GF_M2TS_AIT_APPLICATION* Application;
 		GF_M2TS_AIT_APPLICATION_DECODE* application_decoded;
 		GF_SAFEALLOC(Application,GF_M2TS_AIT_APPLICATION);
+		if (!Application) break;
+		
 		gf_list_add(ChanAppInfo->Application,Application);
 		Application->http_url = NULL;
 		Application->carousel_url = NULL;
@@ -603,8 +624,6 @@
 	u32 nb_of_ait;
 	u32 version_number;
 
-	nb_of_ait = 0;
-
 	nb_of_ait = gf_list_count(ChannelAppList);
 
 	if(nb_of_ait) {
@@ -641,7 +660,6 @@
 	u32 common_descr_numb, app_numb;
 
 	/* delete de Elementary Stream part of the AIT structure */
-	common_descr_numb = 0;
 	app_numb = 0;
 
 	/* delete the common descriptors */
@@ -668,7 +686,7 @@
 
 	u32 app_desc_num,i,app_descr_index;
 
-	app_desc_num = app_descr_index = i = 0;
+	app_descr_index = i = 0;
 	app_desc_num = gf_list_count(application_decode->application_descriptors);
 
 	while (app_desc_num != 0) {
@@ -701,7 +719,6 @@
 			}
 			case TRANSPORT_HTTP:
 			{
-				u32 i;
 				GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE* Transport_http_selector_byte = (GF_M2TS_TRANSPORT_HTTP_SELECTOR_BYTE*)protocol_descriptor->selector_byte;
 				gf_free(Transport_http_selector_byte->URL_base_byte);
 				if (Transport_http_selector_byte->URL_extension_count) {
@@ -736,7 +753,6 @@
 		}
 		case APPLICATION_BOUNDARY_DESCRIPTOR:
 		{
-			u32 i;
 			GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR* boundary_descriptor = (GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR*)gf_list_get(application_decode->application_descriptors, 0);
 			if (boundary_descriptor->boundary_extension_count > 0) {
 				for (i=0; i<boundary_descriptor->boundary_extension_count; i++) {

gpac-0.8.0.tar.gz/src/media_tools/atsc_dmx.c -> gpac-1.0.0.tar.gz/src/media_tools/atsc_dmx.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-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools ATSC demux sub-project
@@ -84,6 +84,7 @@
 	GF_LCTObjectStatus status;
 	Bool closed_flag;
 	u32 download_time_ms;
+	u32 last_gather_time;
 
 	GF_ATSCLCTChannel *rlct;
 
@@ -130,12 +131,14 @@
 	const char *ip_ifce;
 	const char *base_dir;
 	GF_Socket *sock;
-	char *buffer;
+	u8 *buffer;
 	u32 buffer_size;
-	char *unz_buffer;
+	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;
@@ -235,7 +238,7 @@
 	GF_Err e;
 	GF_SAFEALLOC(atscd, GF_ATSCDmx);
 	if (!atscd) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ATSC] Failed to allocate ATSC demuxer\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate ATSC demuxer\n"));
 		return NULL;
 	}
 	atscd->ip_ifce = ifce;
@@ -243,25 +246,25 @@
 	if (dir && !gf_dir_exists(dir)) {
 		e = gf_mkdir(dir);
 		if (e == GF_IO_ERR) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to create output dir %s - using memory mode\n", dir));
+			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_CONTAINER, ("[ATSC] Failed to allocate DOM parser\n" ));
+		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_CONTAINER, ("[ATSC] Failed to allocate ATSC service list\n" ));
+		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_CONTAINER, ("[ATSC] Failed to allocate ATSC object reservoir\n" ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate ATSC object reservoir\n" ));
 		gf_atsc3_dmx_del(atscd);
 		return NULL;
 	}
@@ -272,13 +275,13 @@
 	atscd->buffer_size = 10000;
 	atscd->buffer = gf_malloc(atscd->buffer_size);
 	if (!atscd->buffer) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[ATSC] Failed to allocate socket buffer\n"));
+		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_CORE, ("[ATSC] Failed to allocate socket buffer\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate socket buffer\n"));
 		gf_atsc3_dmx_del(atscd);
 		return NULL;
 	}
@@ -286,14 +289,14 @@
 	atscd->active_sockets = gf_sk_group_new();
 	if (!atscd->active_sockets) {
 		gf_atsc3_dmx_del(atscd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[ATSC] Failed to create socket group\n"));
+		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_NETWORK, ("[ATSC] Failed to create UDP socket\n"));
+		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);
@@ -302,7 +305,7 @@
 	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_NETWORK, ("[ATSC] Failed to bind to multicast address on interface %s\n", ifce ? ifce : "default"));
+		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);
@@ -310,6 +313,7 @@
 	//create static bs
 	atscd->bs = gf_bs_new((char*)&e, 1, GF_BITSTREAM_READ);
 
+	atscd->reorder_timeout = 5000;
 	return atscd;
 }
 
@@ -375,6 +379,15 @@
 	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;
@@ -412,21 +425,21 @@
 			}
 
 			if (!dst_ip || !dst_port) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] No service destination IP or port found for service %d - ignoring service\n", service_id));
+				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_CONTAINER, ("[ATSC] Unknown ATSC service signaling protocol %d for service %d - ignoring service\n", service_id, protocol));
+				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_CONTAINER, ("[ATSC] Found service %d destination IP %s port %d\n", service_id, dst_ip, dst_port));
+			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_CONTAINER, ("[ATSC] Failed to allocate service %d\n", service_id));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to allocate service %d\n", service_id));
 				continue;
 			}
 			service->service_id = service_id;
@@ -436,7 +449,7 @@
 			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_CONTAINER, ("[ATSC] Failed to setup multicast on %s:%d for service %d\n", dst_ip, dst_port, service_id));
+				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;
 			}
@@ -459,13 +472,17 @@
 				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_CONTAINER, ("[ATSC] Failed to create output service dir %s, working in memory mode\n", service->output_dir));
+						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;
 
@@ -477,27 +494,44 @@
 			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_CONTAINER, ("[ATSC] Service %d : moving object tsi %u toi %u to reservoir\n", s->service_id, obj->tsi, obj->toi));
+	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_CONTAINER, GF_LOG_DEBUG)){
+	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_CONTAINER, ("[ATSC] Service %d : active objects TOIs for tsi %u: ", s->service_id, obj->tsi));
+		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_CONTAINER, (" %u", o->toi));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, (" %u", o->toi));
 		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("\n"));
 	}
 #endif
 
@@ -512,6 +546,7 @@
 	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);
@@ -532,13 +567,13 @@
 	FILE *out;
 
 	if (!obj->rlct) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : internal error, no LCT ROUTE channel defined for object TSI %u TOI %u\n", s->service_id, obj->tsi, obj->toi));
+		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_CONTAINER, ("[ATSC] Service %d : object TSI %u TOI %u partial received only\n", s->service_id, obj->tsi, obj->toi));
+		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;
@@ -554,18 +589,21 @@
 			sprintf(szPath, obj->rlct->toi_template, obj->toi);
 		}
 #ifndef GPAC_DISABLE_LOG
-		if (partial || gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] 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));
+		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_CONTAINER, ("[ATSC] 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));
+			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://%d@%p", obj->total_length, obj->payload);
+			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);
@@ -605,7 +643,7 @@
 	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_CONTAINER, ("[ATSC] Service %d failed to create output dir %s\n", s->service_id, szPath ));
+			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;
 		}
 	}
@@ -613,14 +651,14 @@
 
 	out = gf_fopen(szPath, "wb");
 	if (!out) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to create file %s\n", s->service_id, szPath ));
+		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) fwrite(obj->payload, 1, (size_t) obj->total_length, out);
+		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_CONTAINER, ("[ATSC] Service %d failed to write DASH resource file %d written for %d total\n", s->service_id, 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;
 		}
 
@@ -638,10 +676,10 @@
 
 	}
 #ifndef GPAC_DISABLE_LOG
-	if (partial || gf_log_tool_level_on(GF_LOG_CONTAINER, GF_LOG_DEBUG)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] 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));
+	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_CONTAINER, ("[ATSC] 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));
+		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
@@ -666,23 +704,22 @@
 	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;
-		if (nb_objs) {
-			char szFileName[1024];
-			sprintf(szFileName, o->rlct->toi_template, o->toi);
-			sprintf(szPath, "%s/%s", s->output_dir, szFileName);
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d deleting file %s (TSI %u TOI %u)\n", s->service_id, szPath, o->tsi, o->toi));
-			gf_delete_file(szPath);
-			i--;
-			count--;
-			gf_atsc3_obj_to_reservoir(atscd, s, o);
-			nb_objs--;
-		}
+
+		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;
 }
@@ -693,7 +730,7 @@
 	u64 start_offset = 0;
 	obj->status = GF_LCT_OBJ_DONE;
 	for (i=0; i<obj->nb_frags; i++) {
-		if (start_offset != obj->frags[0].offset) {
+		if (start_offset != obj->frags[i].offset) {
 			obj->status = GF_LCT_OBJ_DONE_ERR;
 			break;
 		}
@@ -712,15 +749,18 @@
 	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_CONTAINER, ("[ATSC] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, 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_CONTAINER, ("[ATSC] Service %d TSI %u TOI %u LCT fragment on already dispatched object, skipping\n", s->service_id, tsi, 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;
 		}
 	}
@@ -748,7 +788,7 @@
 		if (!obj) {
 			GF_SAFEALLOC(obj, GF_LCTObject);
 			if (!obj) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to allocate LCT object TSI %u TOI %u\n", s->service_id, toi, tsi ));
+				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;
@@ -761,18 +801,18 @@
 		if (tsi && rlct) obj->rlct = rlct;
 
 		if (!total_len) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u started without total-length assigned !\n", s->service_id, tsi, toi ));
+			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_CONTAINER, ("[ATSC] Service %d starting object TSI %u TOI %u total-length %d\n", s->service_id, tsi, toi, total_len));
+			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_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u was started without total-length assigned, assigning to %u\n", s->service_id, tsi, toi, 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_CONTAINER, ("[ATSC] 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));
+		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
@@ -784,10 +824,10 @@
 			} else {
 				gf_atsc3_obj_to_reservoir(atscd, s, o);
 			}
- 			s->last_active_obj = obj;
-		} else if (in_order) {
-			u32 count = gf_list_count(s->objects);
- 			s->last_active_obj = obj;
+		}
+		//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);
@@ -796,7 +836,16 @@
 				if (o->tsi != obj->tsi) continue;
 				if (o->status>=GF_LCT_OBJ_DONE_ERR) continue;
 
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] 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 (!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);
@@ -811,6 +860,7 @@
 				}
 			}
 		}
+		s->last_active_obj = obj;
 	}
 	*gather_obj = obj;
 	assert(obj->toi == toi);
@@ -818,14 +868,16 @@
 
 	//keep receiving if we are done with errors
 	if (obj->status >= GF_LCT_OBJ_DONE) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u already received - skipping\n", s->service_id, tsi, toi ));
+		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_CONTAINER, ("[ATSC] Service %d LCT fragment already received\n", s->service_id));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d LCT fragment already received\n", s->service_id));
 			return GF_OK;
 		}
 
@@ -833,7 +885,7 @@
 		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_CONTAINER, ("[ATSC] Service %d Overlapping LCT fragment, not supported\n", s->service_id));
+				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) {
@@ -868,6 +920,7 @@
 		obj->nb_bytes += size;
 	}
 	obj->nb_recv_frags++;
+	obj->status = GF_LCT_OBJ_RECEPTION;
 
 	assert(obj->toi == toi);
 	assert(obj->tsi == tsi);
@@ -885,7 +938,7 @@
 	assert(obj->alloc_size >= start_offset + size);
 
 	memcpy(obj->payload + start_offset, data, size);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] 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));
+	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);
@@ -898,7 +951,7 @@
 			done = GF_TRUE;
 		}
 		else if (close_flag) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d object TSI %u TOI %u closed flag found but not yet completed\n", s->service_id, tsi, toi ));
+			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;
@@ -929,15 +982,15 @@
 		FILE *out;
 		char szPath[GF_MAX_PATH];
 		sprintf(szPath, "%s/%s", s->output_dir, content_location);
-		out = gf_fopen(szPath, "w");
+		out = gf_fopen(szPath, "wb");
 		if (!out) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to create MPD file %s\n", s->service_id, szPath ));
+			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) fwrite(content, 1, (size_t) len, out);
+			u32 bytes = (u32) gf_fwrite(content, (size_t) len, out);
 			gf_fclose(out);
 			if (bytes != len) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d failed to write MPD file %d written for %d total\n", s->service_id, 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;
 			}
 		}
@@ -950,12 +1003,12 @@
 		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 ));
 	}
-	else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[ATSC] Service %d received MPD file %s content:\n%s\n", s->service_id, content_location, content ));
-	}
-	return GF_NOT_SUPPORTED;
+	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)
@@ -968,7 +1021,7 @@
 	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_CONTAINER, ("[ATSC] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		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;
 	}
 
@@ -1004,7 +1057,7 @@
 	if (!s->stsid_crc) {
 		s->stsid_crc = crc;
 	} else if (s->stsid_crc != crc) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d update of S-TSID not yet supported, skipping\n", s->service_id));
+		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;
@@ -1013,7 +1066,7 @@
 	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_CONTAINER, ("[ATSC] Service %d failed to parse S-TSID: %s\n", s->service_id, gf_error_to_string(e) ));
+		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;
@@ -1036,6 +1089,8 @@
 		}
 
 		GF_SAFEALLOC(rsess, GF_ATSCRouteSession);
+		if (!rsess) return GF_OUT_OF_MEM;
+
 		rsess->channels = gf_list_new();
 
 		//need a new socket for the session
@@ -1044,7 +1099,7 @@
 			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_CONTAINER, ("[ATSC] Service %d  failed to setup mcast for route session on %s:%d\n", s->service_id, dst_ip, dst_port));
+				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);
@@ -1066,7 +1121,7 @@
 				if (!strcmp(att->name, "tsi")) sscanf(att->value, "%u", &tsi);
 			}
 			if (!tsi) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing TSI in LS/ROUTE session\n", s->service_id));
+				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;
@@ -1076,7 +1131,7 @@
 				srcf = NULL;
 			}
 			if (!srcf) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing srcFlow in LS/ROUTE session\n", s->service_id));
+				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
@@ -1087,7 +1142,7 @@
 				if (!strcmp(node->name, "EFDT")) efdt = node;
 			}
 			if (!efdt) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d missing EFDT element in LS/ROUTE session, not supported\n", s->service_id));
+				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;
 			}
 
@@ -1096,8 +1151,8 @@
 				if (node->type != GF_XML_NODE_TYPE) continue;
 				//Korean version
 				if (!strcmp(node->name, "FileTemplate")) {
-					GF_XMLNode *content = gf_list_get(node->content, 0);
-					if (content->type==GF_XML_TEXT_TYPE) file_template = content->name;
+					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;
@@ -1137,24 +1192,26 @@
 			}
 
 			if (!init_file_name) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] 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));
+				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_CONTAINER, ("[ATSC] Service %d missing file TOI template in LS/ROUTE session, not supported - skipping stream\n", s->service_id));
+				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_CONTAINER, ("[ATSC] Service %d wrong TOI template %s in LS/ROUTE session\n", s->service_id, file_template));
+				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;
@@ -1183,19 +1240,19 @@
 						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_CONTAINER, ("[ATSC] Service %d payload format indicates srcFecPayloadId %d (reserved), assuming 0\n", s->service_id, 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_CONTAINER, ("[ATSC] Service %d payload formatID %d not supported\n", s->service_id, lreg->format_id));
+							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_CONTAINER, ("[ATSC] Service %d payload formatID %d reserved, assuming 1\n", s->service_id, lreg->format_id));
+							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_CONTAINER, ("[ATSC] Service %d more payload formats than supported (8 max)\n", s->service_id));
+						GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Service %d more payload formats than supported (8 max)\n", s->service_id));
 						break;
 					}
 				}
@@ -1206,7 +1263,7 @@
 	}
 
 	if (!nb_lct_channels) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d does not have any supported LCT channels\n", s->service_id));
+		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;
@@ -1220,7 +1277,7 @@
 	GF_Err e;
 
 	//uncompress bundle
-	if (object->toi & (1<<31) ) {
+	if (object->toi & 0x80000000 /*(1<<31)*/ ) {
 		u32 raw_size;
 		if (object->total_length > atscd->buffer_size) {
 			atscd->buffer_size = object->total_length;
@@ -1230,7 +1287,7 @@
 		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_CONTAINER, ("[ATSC] Service %d failed to decompress signaling bundle: %s\n", s->service_id, gf_error_to_string(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;
@@ -1246,13 +1303,13 @@
 	if (!strncmp(payload, "Content-Type: multipart/", 24)) {
 		sep = strstr(payload, "boundary=\"");
 		if (!sep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d cannot find multipart boundary in package:\n%s\n", s->service_id, payload ));
+			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;
 		}
-		if (sep) payload = sep + 10;
+		payload = sep + 10;
 		sep = strstr(payload, "\"");
 		if (!sep) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d multipart boundary not properly formatted in package:\n%s\n", s->service_id, payload ));
+			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;
@@ -1283,26 +1340,28 @@
 			while (strchr("\r\n", payload[i]) == NULL) i++;
 
 			if (!strnicmp(payload, "Content-Type: ", 14)) {
-				strncpy(szContentType, payload+14, i-14);
-				szContentType[i-14]=0;
+				u32 copy = MIN(i-14, 100);
+				strncpy(szContentType, payload+14, copy);
+				szContentType[copy]=0;
 				payload += i;
 			}
 			else if (!strnicmp(payload, "Content-Location: ", 18)) {
-				strncpy(szContentLocation, payload+18, i-18);
-				szContentLocation[i-18]=0;
+				u32 copy = MIN(i-18, 1024);
+				strncpy(szContentLocation, payload+18, copy);
+				szContentLocation[copy]=0;
 				payload += i;
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d unrecognized header entity in package:\n%s\n", s->service_id, payload ));
+				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_CONTAINER, ("[ATSC] Service %d package type %s location %s content:\n%s\n", s->service_id, szContentType, szContentLocation, payload ));
+			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_CONTAINER, ("[ATSC] Service %d %s not properly formatted in package:\n%s\n", s->service_id, boundary ? "multipart boundary" : "entity", payload ));
-			if (sep) sep[0] = boundary[0];
+			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;
 		}
@@ -1311,7 +1370,7 @@
 			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_CONTAINER, ("[ATSC] 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_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;
 			}
@@ -1321,7 +1380,7 @@
 				s->mpd_version = mpd_version+1;
 				gf_atsc3_service_setup_dash(atscd, s, payload, szContentLocation);
 			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d same MPD version, ignoring\n",s->service_id));
+				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
@@ -1330,7 +1389,7 @@
 				s->stsid_version = stsid_version+1;
 				gf_atsc3_service_setup_stsid(atscd, s, payload, szContentLocation);
 			} else {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d same S-TSID version, ignoring\n",s->service_id));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_ATSC, ("[ATSC3] Service %d same S-TSID version, ignoring\n",s->service_id));
 			}
 		}
 		if (!sep) break;
@@ -1374,9 +1433,9 @@
 	GF_LCTObject *gather_object=NULL;
 
 	if (route_sess) {
-		e = gf_sk_receive_no_select(route_sess->sock, atscd->buffer, atscd->buffer_size, 0, &nb_read);
+		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, 0, &nb_read);
+		e = gf_sk_receive_no_select(s->sock, atscd->buffer, atscd->buffer_size, &nb_read);
 	}
 
 	if (e != GF_OK) return e;
@@ -1404,36 +1463,36 @@
 	cp = gf_bs_read_int(atscd->bs, 8);
 
 	if (v!=1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong LCT header version %d\n", s->service_id, v));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header C %d, expecting 0\n", s->service_id, C));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header PSI %d, expecting b00 or b10\n", s->service_id, psi));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header S, shall be 1\n", s->service_id));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header S, shall be b01\n", s->service_id));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header H, shall be 0\n", s->service_id));
+		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_CONTAINER, ("[ATSC] Service %d : wrong ROUTE LCT header len %d, shall be at least 4 0\n", s->service_id, hdr_len));
+		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_CONTAINER, ("[ATSC] Service %d : FEC ROUTE not implemented\n", s->service_id));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Service %d : FEC ROUTE not implemented\n", s->service_id));
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -1455,8 +1514,8 @@
 			in_session = GF_TRUE;
 			rlct = s->last_active_obj->rlct;
 		} else {
-			u32 i=0;
 			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))) {
@@ -1470,7 +1529,7 @@
 			}
 		}
 		if (!in_session) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : no session with TSI %u defined, skipping packet\n", s->service_id, tsi));
+			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++) {
@@ -1481,13 +1540,13 @@
 		}
 	} else {
 		//check TOI for TSI 0
-		/*a_G = toi & (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;*/
+		//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;
@@ -1496,7 +1555,7 @@
 
 		//for now we only care about S and M
 		if (!a_S && ! a_M) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] Service %d : SLT bundle without MPD or S-TSID, skipping packet\n", s->service_id));
+			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;
 		}
 	}
@@ -1523,18 +1582,18 @@
 
 		case GF_LCT_EXT_TOL48:
 			if (hel!=2) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Service %d : wrong HEL %d for TOL48 LCT extension, expecing 2\n", s->service_id, hel));
+				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_CONTAINER, ("[ATSC] Service %d : unsupported header extension HEL %d HET %d\n", s->service_id, hel, het));
+			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_CONTAINER, ("[ATSC] Service %d : wrong HEL %d for LCT extension %d, remainign header size %d\n", s->service_id, hel, het, hdr_len));
+			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;
@@ -1544,7 +1603,7 @@
 	start_offset = gf_bs_read_u32(atscd->bs);
 	pos = (u32) gf_bs_get_position(atscd->bs);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[ATSC] 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));
+	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);
 
@@ -1576,7 +1635,7 @@
 	u32 raw_size = atscd->unz_buffer_size;
 	GF_XMLNode *root;
 
-	e = gf_sk_receive_no_select(atscd->sock, atscd->buffer, atscd->buffer_size, 0, &read);
+	e = gf_sk_receive_no_select(atscd->sock, atscd->buffer, atscd->buffer_size, &read);
 	if (e)
 		return e;
 
@@ -1590,7 +1649,7 @@
 	lls_group_count = 1 + atscd->buffer[2];
 	lls_table_version = atscd->buffer[3];
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[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));
+	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;
@@ -1618,24 +1677,24 @@
 
 	e = gf_gz_decompress_payload(&atscd->buffer[4], read-4, &atscd->unz_buffer, &raw_size);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ATSC] Failed to decompress %s table: %s\n", name, gf_error_to_string(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_CONTAINER, ("[ATSCDmx] SLT table - payload:\n%s\n", atscd->unz_buffer));
+	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_CONTAINER, ("[ATSC] Failed to parse SLT XML: %s\n", gf_error_to_string(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_CONTAINER, ("[ATSC] Failed to get XML root for %s table\n", name ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_ATSC, ("[ATSC3] Failed to get XML root for %s table\n", name ));
 		return e;
 	}
 
@@ -1658,10 +1717,10 @@
 	GF_Err e;
 
 	//check all active sockets
-	e = gf_sk_group_select(atscd->active_sockets, 10);
+	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)) {
+	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;
 	}
@@ -1669,12 +1728,11 @@
 	count = gf_list_count(atscd->services);
 	for (i=0; i<count; i++) {
 		u32 j;
-		GF_Err e;
 		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)) {
+		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;
 		}
@@ -1683,7 +1741,7 @@
 
 		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)) {
+			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;
 			}
@@ -1769,12 +1827,12 @@
 			return;
 		}
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ATSC] Failed to remove object %s from service, object not found\n", fileName));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_ATSC, ("[ATSC3] Failed to remove object %s from service, object not found\n", fileName));
 }
 
 
 GF_EXPORT
-void gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id)
+Bool gf_atsc3_dmx_remove_first_object(GF_ATSCDmx *atscd, u32 service_id)
 {
 	u32 i=0;
 	GF_ATSCService *s=NULL;
@@ -1783,13 +1841,21 @@
 		if (s->service_id == service_id) break;
 		s = NULL;
 	}
-	if (!s) return;
+	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;
 
-	obj = gf_list_get(s->objects, 0);
-	if (obj) {
-		assert(obj != s->last_active_obj);
 		gf_atsc3_obj_to_reservoir(atscd, s, obj);
+		return GF_TRUE;
 	}
+	return GF_FALSE;
 }
 
 GF_EXPORT

gpac-0.8.0.tar.gz/src/media_tools/av_parsers.c -> gpac-1.0.0.tar.gz/src/media_tools/av_parsers.c Changed

gpac-0.8.0.tar.gz/src/media_tools/avilib.c -> gpac-1.0.0.tar.gz/src/media_tools/avilib.c Changed

@@ -1,8 +1,8 @@
 /*
  *  avilib.c
  *
- *  Copyright (C) Thomas Östreich - June 2001
- *  multiple audio track support Copyright (C) 2002 Thomas Östreich
+ *  Copyright (C) Thomas ostreich - June 2001
+ *  multiple audio track support Copyright (C) 2002 Thomas ostreich
  *
  *  Original code:
  *  Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
@@ -32,9 +32,6 @@
 #include <gpac/internal/avilib.h>
 
 
-#define PACKAGE "GPAC/avilib"
-#define VERSION GPAC_FULL_VERSION
-
 #define INFO_LIST
 
 // add a new riff chunk after XX MB
@@ -66,11 +63,10 @@
 
 static u32 avi_read(FILE *fd, char *buf, u32 len)
 {
-	s32 n = 0;
 	u32 r = 0;
 
 	while (r < len) {
-		n = (s32) fread(buf + r, 1, len - r, fd);
+		s32 n = (s32) gf_fread(buf + r, len - r, fd);
 		if (n == 0) break;
 		if (n < 0) return r;
 		r += n;
@@ -81,11 +77,10 @@
 
 static u32 avi_write (FILE *fd, char *buf, u32 len)
 {
-	s32 n = 0;
 	u32 r = 0;
 
 	while (r < len) {
-		n = (u32) gf_fwrite (buf + r, 1, len - r, fd);
+		s32 n = (u32) gf_fwrite (buf + r, len - r, fd);
 		if (n < 0)
 			return n;
 
@@ -548,10 +543,8 @@
 
 static int avi_add_index_entry(avi_t *AVI, unsigned char *tag, int flags, u64 pos, u64 len)
 {
-	void *ptr;
-
 	if(AVI->n_idx>=AVI->max_idx) {
-		ptr = gf_realloc((void *)AVI->idx,(AVI->max_idx+4096)*16);
+		void *ptr = gf_realloc((void *)AVI->idx,(AVI->max_idx+4096)*16);
 
 		if(ptr == 0) {
 			AVI_errno = AVI_ERR_NO_MEM;
@@ -579,6 +572,7 @@
 	return 0;
 }
 
+#if 0
 /* Returns 1 if more audio is in that video junk */
 int AVI_can_read_audio(avi_t *AVI)
 {
@@ -603,6 +597,8 @@
 	if (AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].pos < AVI->video_index[AVI->video_pos].pos) return 1;
 	else return 0;
 }
+#endif
+
 /*
    AVI_open_output_file: Open an AVI File and write a bunch
                          of zero bytes as space for the header.
@@ -737,7 +733,7 @@
 //ThOe write preliminary AVI file header: 0 frames, max vid/aud size
 int avi_update_header(avi_t *AVI)
 {
-	int njunk, sampsize, hasIndex, ms_per_frame, frate, flag;
+	int njunk, ms_per_frame, frate, flag;
 	int movi_len, hdrl_start, strl_start;
 	u32 j;
 	unsigned char AVI_header[HEADERBYTES];
@@ -748,7 +744,7 @@
 	movi_len = AVI_MAX_LEN - HEADERBYTES + 4;
 
 	//assume index will be written
-	hasIndex=1;
+//	int hasIndex=1;
 
 	if(AVI->fps < 0.001) {
 		frate=0;
@@ -795,8 +791,10 @@
 	OUTLONG(0);                  /* PaddingGranularity (whatever that might be) */
 	/* Other sources call it 'reserved' */
 	flag = AVIF_ISINTERLEAVED;
-	if(hasIndex) flag |= AVIF_HASINDEX;
-	if(hasIndex && AVI->must_use_index) flag |= AVIF_MUSTUSEINDEX;
+	//if (hasIndex)
+		flag |= AVIF_HASINDEX;
+	if (/*hasIndex && */AVI->must_use_index)
+		flag |= AVIF_MUSTUSEINDEX;
 	OUTLONG(flag);               /* Flags */
 	OUTLONG(0);                  // no frames yet
 	OUTLONG(0);                  /* InitialFrames */
@@ -877,8 +875,7 @@
 	/* Start the audio stream list ---------------------------------- */
 
 	for(j=0; j<AVI->anum; ++j) {
-
-		sampsize = avi_sampsize(AVI, j);
+		int sampsize = avi_sampsize(AVI, j);
 
 		OUT4CC ("LIST");
 		OUTLONG(0);        /* Length of list in bytes, don't know yet */
@@ -1006,7 +1003,7 @@
 
 static int avi_close_output_file(avi_t *AVI)
 {
-	int ret, njunk, sampsize, hasIndex, ms_per_frame, frate, idxerror, flag;
+	int njunk, hasIndex, ms_per_frame, frate, idxerror, flag;
 	u64 movi_len;
 	int hdrl_start, strl_start;
 	u32 j;
@@ -1053,9 +1050,7 @@
 		}
 		// The AVI->video_superindex->nEntriesInUse contains the offset
 		AVI->video_superindex->stdindex[ cur_std_idx+1 ]->qwBaseOffset = AVI->pos;
-	}
 
-	if (AVI->is_opendml) {
 		// Correct!
 		movi_len = AVI->video_superindex->stdindex[ 1 ]->qwBaseOffset - HEADERBYTES+4 - AVI->n_idx*16 - 8;
 	} else {
@@ -1072,7 +1067,7 @@
 	hasIndex = 1;
 	if (!AVI->is_opendml) {
 		//   GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu, index_len=%ld             \n", AVI->pos, AVI->n_idx*16));
-		ret = avi_add_chunk(AVI, (unsigned char *)"idx1", (unsigned char *)AVI->idx, AVI->n_idx*16);
+		int ret = avi_add_chunk(AVI, (unsigned char *)"idx1", (unsigned char *)AVI->idx, AVI->n_idx*16);
 		hasIndex = (ret==0);
 		//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[avilib] pos=%lu, index_len=%d\n", AVI->pos, hasIndex));
 
@@ -1254,7 +1249,7 @@
 			unsigned int avgbsec = 0;
 			unsigned int scalerate = 0;
 
-			sampsize = avi_sampsize(AVI, j);
+			int sampsize = avi_sampsize(AVI, j);
 			sampsize = AVI->track[j].a_fmt==0x1?sampsize*4:sampsize;
 
 			nBlockAlign = (AVI->track[j].a_rate<32000)?576:1152;
@@ -1442,8 +1437,11 @@
 	OUT4CC ("ISFT");
 	//OUTLONG(MAX_INFO_STRLEN);
 	memset(id_str, 0, MAX_INFO_STRLEN);
-
-	snprintf(id_str, MAX_INFO_STRLEN, "%s-%s", PACKAGE, VERSION);
+	if (gf_sys_is_test_mode()) {
+		snprintf(id_str, MAX_INFO_STRLEN, "GPAC/avilib");
+	} else {
+		snprintf(id_str, MAX_INFO_STRLEN, "GPAC/avilib-%s", gf_gpac_version());
+	}
 	real_id_len = id_len = (u32) strlen(id_str)+1;
 	if (id_len&1) id_len++;
 
@@ -1595,7 +1593,7 @@
 }
 
 GF_EXPORT
-int AVI_write_frame(avi_t *AVI, char *data, int bytes, int keyframe)
+int AVI_write_frame(avi_t *AVI, u8 *data, int bytes, int keyframe)
 {
 	s64 pos;
 
@@ -1614,6 +1612,7 @@
 	return 0;
 }
 
+#if 0 //unused
 int AVI_dup_frame(avi_t *AVI)
 {
 	if(AVI->mode==AVI_MODE_READ) {
@@ -1627,9 +1626,10 @@
 	AVI->must_use_index = 1;
 	return 0;
 }
+#endif
 
 GF_EXPORT
-int AVI_write_audio(avi_t *AVI, char *data, int bytes)
+int AVI_write_audio(avi_t *AVI, u8 *data, int bytes)
 {
 	if(AVI->mode==AVI_MODE_READ) {
 		AVI_errno = AVI_ERR_NOT_PERM;
@@ -1642,8 +1642,9 @@
 	return 0;
 }
 
+#if 0 //unused
 
-int AVI_append_audio(avi_t *AVI, char *data, int bytes)
+int AVI_append_audio(avi_t *AVI, u8 *data, int bytes)
 {
 
 	// won't work for >2gb
@@ -1684,7 +1685,6 @@
 	return 0;
 }
 
-
 u64 AVI_bytes_remain(avi_t *AVI)
 {
 	if(AVI->mode==AVI_MODE_READ) return 0;
@@ -1698,6 +1698,7 @@
 
 	return (AVI->pos + 8 + 16*AVI->n_idx);
 }
+#endif
 
 int AVI_set_audio_track(avi_t *AVI, u32 track)
 {
@@ -1714,6 +1715,7 @@
 	return(AVI->aptr);
 }
 
+#if 0 //unused
 void AVI_set_audio_vbr(avi_t *AVI, int is_vbr)
 {
 	AVI->track[AVI->aptr].a_vbr = is_vbr;
@@ -1723,6 +1725,7 @@
 {
 	return(AVI->track[AVI->aptr].a_vbr);
 }
+#endif
 
 
 /*******************************************************************
@@ -1787,10 +1790,10 @@
 	for (j = 0; j < AVI->anum; j++)
 		if (AVI->wave_format_ex[j])
 			gf_free(AVI->wave_format_ex[j]);
+	if (AVI->extradata)
+		gf_free(AVI->extradata);
 
 	gf_free(AVI);
-	AVI=NULL;
-
 	return ret;
 }
 
@@ -1805,7 +1808,7 @@
 
 avi_t *AVI_open_input_file(char *filename, int getIndex)
 {
-	avi_t *AVI=NULL;
+	avi_t *AVI;
 
 	/* Create avi_t structure */
 
@@ -1841,6 +1844,7 @@
 	return AVI;
 }
 
+#if 0
 avi_t *AVI_open_fd(FILE *fd, int getIndex)
 {
 	avi_t *AVI=NULL;
@@ -1872,6 +1876,7 @@
 	else
 		return AVI;
 }
+#endif
 
 int avi_parse_input_file(avi_t *AVI, int getIndex)
 {
@@ -1893,19 +1898,23 @@
 	s64 oldpos=-1, newpos=-1;
 
 	int aud_chunks = 0;
-	/* Read first 12 bytes and check that this is an AVI file */
-
-	if( avi_read(AVI->fdes,data,12) != 12 ) ERR_EXIT(AVI_ERR_READ)
+	if (!AVI) {
+	   AVI_errno = AVI_ERR_OPEN;
+	   return 0;
+	}
 
-		if( strnicmp(data  ,"RIFF",4) !=0 ||
-		        strnicmp(data+8,"AVI ",4) !=0 ) ERR_EXIT(AVI_ERR_NO_AVI)
+	/* Read first 12 bytes and check that this is an AVI file */
+	if (avi_read(AVI->fdes,data,12) != 12 )
+		ERR_EXIT(AVI_ERR_READ)
 
-			/* Go through the AVI file and extract the header list,
-			   the start position of the 'movi' list and an optionally
-			   present idx1 tag */
+	if (strnicmp(data  ,"RIFF",4) !=0 || strnicmp(data+8,"AVI ",4) !=0 )
+		ERR_EXIT(AVI_ERR_NO_AVI)
 
-			hdrl_data = 0;
+	/* Go through the AVI file and extract the header list,
+	   the start position of the 'movi' list and an optionally
+	   present idx1 tag */
 
+	hdrl_data = 0;
 
 	while(1)
 	{
@@ -2077,6 +2086,12 @@
 						memcpy(AVI->compressor2, hdrl_data+i+16, 4);
 						AVI->compressor2[4] = 0;
 
+						if (n>40) {
+							AVI->extradata_size = (u32) (n - 40);
+							AVI->extradata = gf_malloc(sizeof(u8)* AVI->extradata_size);
+							memcpy(AVI->extradata, hdrl_data + i + 40, AVI->extradata_size);
+						}
+
 					}
 					else if(lasttag == 2)
 					{
@@ -2288,14 +2303,14 @@
 	if(!AVI->track[0].a_chans) AVI->track[0].audio_strn = 99;
 
 	{
-		int i=0;
+		int tk=0;
 		for(j=0; j<AVI->anum+1; ++j) {
 			if (j == AVI->video_strn) continue;
-			AVI->track[i].audio_tag[0] = j/10 + '0';
-			AVI->track[i].audio_tag[1] = j%10 + '0';
-			AVI->track[i].audio_tag[2] = 'w';
-			AVI->track[i].audio_tag[3] = 'b';
-			++i;
+			AVI->track[tk].audio_tag[0] = j/10 + '0';
+			AVI->track[tk].audio_tag[1] = j%10 + '0';
+			AVI->track[tk].audio_tag[2] = 'w';
+			AVI->track[tk].audio_tag[3] = 'b';
+			++tk;
 		}
 	}
 
@@ -2385,7 +2400,7 @@
 	// read extended index chunks
 	if (AVI->is_opendml) {
 		u64 offset = 0;
-		int hdrl_len = 4+4+2+1+1+4+4+8+4;
+		hdrl_len = 4+4+2+1+1+4+4+8+4;
 		char *en, *chunk_start;
 		int k = 0;
 		u32 audtr = 0;
@@ -2751,10 +2766,12 @@
 	return AVI->compressor2;
 }
 
+#if 0
 int AVI_max_video_chunk(avi_t *AVI)
 {
 	return AVI->max_len;
 }
+#endif
 
 int AVI_audio_tracks(avi_t *AVI)
 {
@@ -2771,10 +2788,12 @@
 	return AVI->track[AVI->aptr].mp3rate;
 }
 
+#if 0 //unused
 int AVI_audio_padrate(avi_t *AVI)
 {
 	return AVI->track[AVI->aptr].padrate;
 }
+#endif
 
 int AVI_audio_bits(avi_t *AVI)
 {
@@ -2866,6 +2885,7 @@
 	return 0;
 }
 
+#if 0 //unused
 int AVI_set_audio_bitrate(avi_t *AVI, int bitrate)
 {
 	if(AVI->mode==AVI_MODE_READ) {
@@ -2876,9 +2896,9 @@
 	AVI->track[AVI->aptr].mp3rate = bitrate;
 	return 0;
 }
+#endif
 
-
-int AVI_read_frame(avi_t *AVI, char *vidbuf, int *keyframe)
+int AVI_read_frame(avi_t *AVI, u8 *vidbuf, int *keyframe)
 {
 	int n;
 
@@ -2914,6 +2934,7 @@
 	return n;
 }
 
+#if 0 //unused
 int AVI_get_audio_position_index(avi_t *AVI)
 {
 	if(AVI->mode==AVI_MODE_WRITE) {
@@ -2948,11 +2969,12 @@
 
 	return 0;
 }
+#endif
 
 
 int AVI_set_audio_position(avi_t *AVI, int byte)
 {
-	int n0, n1, n;
+	int n0, n1;
 
 	if(AVI->mode==AVI_MODE_WRITE) {
 		AVI_errno = AVI_ERR_NOT_PERM;
@@ -2972,7 +2994,7 @@
 
 	while(n0<n1-1)
 	{
-		n = (n0+n1)/2;
+		int n = (n0+n1)/2;
 		if(AVI->track[AVI->aptr].audio_index[n].tot>(u32) byte)
 			n1 = n;
 		else
@@ -2985,9 +3007,10 @@
 	return 0;
 }
 
-int AVI_read_audio(avi_t *AVI, char *audbuf, int bytes, int *continuous)
+
+int AVI_read_audio(avi_t *AVI, u8 *audbuf, int bytes, int *continuous)
 {
-	int nr, left, todo;
+	int nr, todo;
 	s64 pos;
 
 	if(AVI->mode==AVI_MODE_WRITE) {
@@ -3010,7 +3033,7 @@
 	while(bytes>0)
 	{
 		s64 ret;
-		left = (int) (AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].len - AVI->track[AVI->aptr].audio_posb);
+		int left = (int) (AVI->track[AVI->aptr].audio_index[AVI->track[AVI->aptr].audio_posc].len - AVI->track[AVI->aptr].audio_posb);
 		if(left==0)
 		{
 			if(AVI->track[AVI->aptr].audio_posc>=AVI->track[AVI->aptr].audio_chunks-1) return nr;
@@ -3040,6 +3063,7 @@
 }
 
 
+#if 0 //unused
 /* AVI_read_data: Special routine for reading the next audio or video chunk
                   without having an index of the file. */
 
@@ -3111,6 +3135,7 @@
 {
 	return((u64) AVI_MAX_LEN);
 }
+#endif
 
 
 #endif /*GPAC_DISABLE_AVILIB*/

gpac-1.0.0.tar.gz/src/media_tools/crypt_tools.c Added

@@ -0,0 +1,661 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Media Tools 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/crypt_tools.h>
+#include <gpac/xml.h>
+#include <gpac/base_coding.h>
+#include <gpac/constants.h>
+#include <gpac/filters.h>
+#include <gpac/network.h>
+
+
+#if !defined(GPAC_DISABLE_CRYPTO)
+
+static u32 cryptinfo_get_crypt_type(char *cr_type)
+{
+	if (!stricmp(cr_type, "ISMA") || !stricmp(cr_type, "iAEC"))
+		return GF_CRYPT_TYPE_ISMA;
+	else if (!stricmp(cr_type, "CENC AES-CTR") || !stricmp(cr_type, "cenc"))
+		return GF_CRYPT_TYPE_CENC;
+	else if (!stricmp(cr_type, "piff"))
+		return GF_CRYPT_TYPE_PIFF;
+	else if (!stricmp(cr_type, "CENC AES-CBC") || !stricmp(cr_type, "cbc1"))
+		return GF_CRYPT_TYPE_CBC1;
+	else if (!stricmp(cr_type, "ADOBE") || !stricmp(cr_type, "adkm"))
+		return GF_CRYPT_TYPE_ADOBE;
+	else if (!stricmp(cr_type, "CENC AES-CTR Pattern") || !stricmp(cr_type, "cens"))
+		return GF_CRYPT_TYPE_CENS;
+	else if (!stricmp(cr_type, "CENC AES-CBC Pattern") || !stricmp(cr_type, "cbcs"))
+		return GF_CRYPT_TYPE_CBCS;
+	else if (!stricmp(cr_type, "OMA"))
+		return GF_ISOM_OMADRM_SCHEME;
+
+	GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Unrecognized crypto type %s\n", cr_type));
+	return 0;
+}
+
+static void cryptinfo_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
+{
+	GF_XMLAttribute *att;
+	GF_TrackCryptInfo *tkc;
+	u32 i;
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
+
+	if (!strcmp(node_name, "OMATextHeader")) {
+		info->in_text_header = 1;
+		return;
+	}
+	if (!strcmp(node_name, "GPACDRM")) {
+		for (i=0; i<nb_attributes; i++) {
+			att = (GF_XMLAttribute *) &attributes[i];
+			if (!stricmp(att->name, "type")) {
+				info->def_crypt_type = cryptinfo_get_crypt_type(att->value);
+			}
+		}
+		return;
+	}
+	if (!strcmp(node_name, "CrypTrack")) {
+		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"));
+			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;
+		gf_list_add(info->tcis, tkc);
+
+		for (i=0; i<nb_attributes; i++) {
+			att = (GF_XMLAttribute *) &attributes[i];
+			if (!stricmp(att->name, "trackID") || !stricmp(att->name, "ID")) {
+				if (!strcmp(att->value, "*")) info->has_common_key = 1;
+				else {
+					tkc->trackID = atoi(att->value);
+					has_common_key = GF_FALSE;
+				}
+			}
+			else if (!stricmp(att->name, "type")) {
+				tkc->scheme_type = cryptinfo_get_crypt_type(att->value);
+			}
+			else if (!stricmp(att->name, "forceType")) {
+				tkc->force_type = GF_TRUE;
+			}
+			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] );
+                if (e != GF_OK) {
+                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value in CrypTrack\n"));
+                    return;
+                }
+			}
+			else if (!stricmp(att->name, "salt")) {
+				u32 len, j;
+				char *sKey = att->value;
+				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
+				len = (u32) strlen(sKey);
+				for (j=0; j<len; j+=2) {
+					char szV[5];
+					u32 v;
+					sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
+					sscanf(szV, "%x", &v);
+					tkc->first_IV[j/2] = v;
+					if (j>=30) break;
+				}
+			}
+			else if (!stricmp(att->name, "kms_URI") || !stricmp(att->name, "rightsIssuerURL")) {
+				if (tkc->KMS_URI) gf_free(tkc->KMS_URI);
+				tkc->KMS_URI = gf_strdup(att->value);
+			}
+			else if (!stricmp(att->name, "scheme_URI") || !stricmp(att->name, "contentID")) {
+				if (tkc->Scheme_URI) gf_free(tkc->Scheme_URI);
+				tkc->Scheme_URI = gf_strdup(att->value);
+			}
+			else if (!stricmp(att->name, "selectiveType")) {
+				if (!stricmp(att->value, "Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAP;
+				else if (!stricmp(att->value, "Non-Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_NON_RAP;
+				else if (!stricmp(att->value, "Rand")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAND;
+				else if (!strnicmp(att->value, "Rand", 4)) {
+					tkc->sel_enc_type = GF_CRYPT_SELENC_RAND_RANGE;
+					tkc->sel_enc_range = atoi(&att->value[4]);
+				}
+				else if (sscanf(att->value, "%u", &tkc->sel_enc_range)==1) {
+					if (tkc->sel_enc_range==1) tkc->sel_enc_range = 0;
+					else tkc->sel_enc_type = GF_CRYPT_SELENC_RANGE;
+				}
+				else if (!strnicmp(att->value, "Preview", 7)) {
+					tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
+				}
+				else if (!strnicmp(att->value, "Clear", 5)) {
+					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR;
+				}
+				else if (!strnicmp(att->value, "ForceClear", 10)) {
+					char *sep = strchr(att->value, '=');
+					if (sep) tkc->sel_enc_range = atoi(sep+1);
+					tkc->sel_enc_type = GF_CRYPT_SELENC_CLEAR_FORCED;
+				}
+				else if (!stricmp(att->value, "None")) {
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized selective mode %s, ignoring\n", att->value));
+				}
+			}
+			else if (!stricmp(att->name, "clearStsd")) {
+				if (!strcmp(att->value, "none")) tkc->force_clear_stsd_idx = 0;
+				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));
+				}
+			}
+			else if (!stricmp(att->name, "Preview")) {
+				tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
+				sscanf(att->value, "%u", &tkc->sel_enc_range);
+			}
+			else if (!stricmp(att->name, "ipmpType")) {
+				if (!stricmp(att->value, "None")) tkc->ipmp_type = 0;
+				else if (!stricmp(att->value, "IPMP")) tkc->sel_enc_type = 1;
+				else if (!stricmp(att->value, "IPMPX")) tkc->sel_enc_type = 2;
+			}
+			else if (!stricmp(att->name, "ipmpDescriptorID")) tkc->ipmp_desc_id = atoi(att->value);
+			else if (!stricmp(att->name, "encryptionMethod")) {
+				if (!strcmp(att->value, "AES_128_CBC")) tkc->encryption = 1;
+				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));
+				}
+			}
+			else if (!stricmp(att->name, "transactionID")) {
+				if (strlen(att->value)<=16) strcpy(tkc->TransactionID, att->value);
+			}
+			else if (!stricmp(att->name, "textualHeaders")) {
+			}
+			else if (!stricmp(att->name, "IsEncrypted")) {
+				if (!stricmp(att->value, "1"))
+					tkc->IsEncrypted = 1;
+				else
+					tkc->IsEncrypted = 0;
+			}
+			else if (!stricmp(att->name, "IV_size")) {
+				tkc->IV_size = atoi(att->value);
+			}
+			else if (!stricmp(att->name, "first_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->first_IV[j/2] = v;
+					}
+					if (!tkc->IV_size) tkc->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));
+				}
+			}
+			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 {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Unrecognized roll parameter %s, ignoring\n", att->value));
+				}
+			}
+			else if (!stricmp(att->name, "metadata")) {
+				u32 l = 2 * (u32) strlen(att->value);
+				tkc->metadata = gf_malloc(sizeof(char) * l);
+				l = gf_base64_encode(att->value, (u32) strlen(att->value), tkc->metadata, l);
+				tkc->metadata[l] = 0;
+			}
+			else if (!stricmp(att->name, "crypt_byte_block")) {
+				tkc->crypt_byte_block = atoi(att->value);
+			}
+			else if (!stricmp(att->name, "skip_byte_block")) {
+				tkc->skip_byte_block = atoi(att->value);
+			}
+			else if (!stricmp(att->name, "clear_bytes")) {
+				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));
+			}
+			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->constant_IV[j/2] = v;
+					}
+				}
+				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;
+			}
+			else if (!stricmp(att->name, "blockAlign")) {
+				if (!strcmp(att->value, "disable")) tkc->block_align = 1;
+				else if (!strcmp(att->value, "always")) tkc->block_align = 2;
+				else tkc->block_align = 0;
+			}
+		}
+		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->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) ));
+				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;
+				} 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)));
+				}
+			}
+		}
+		if (tkc->scheme_type == GF_ISOM_OMADRM_SCHEME) {
+			/*default to AES 128 in OMA*/
+			tkc->encryption = 2;
+		}
+
+	}
+
+	if (!strcmp(node_name, "key")) {
+		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));
+
+		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]);
+                if (e != GF_OK) {
+                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[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]);
+                if (e != GF_OK) {
+                    GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannnot parse key value\n"));
+                    return;
+                }
+			}
+		}
+		tkc->KID_count++;
+	}
+}
+
+static void cryptinfo_node_end(void *sax_cbck, const char *node_name, const char *name_space)
+{
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
+	if (!strcmp(node_name, "OMATextHeader")) {
+		info->in_text_header = 0;
+		return;
+	}
+}
+
+static void cryptinfo_text(void *sax_cbck, const char *text, Bool is_cdata)
+{
+	u32 len, len2;
+	GF_TrackCryptInfo *tkc;
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
+
+	if (!info->in_text_header) return;
+
+	tkc = (GF_TrackCryptInfo *) gf_list_last(info->tcis);
+	len = (u32) strlen(text);
+	len2 = tkc->TextualHeaders ? (u32) strlen(tkc->TextualHeaders) : 0;
+
+	tkc->TextualHeaders = gf_realloc(tkc->TextualHeaders, sizeof(char) * (len+len2+1));
+	if (!len2) strcpy(tkc->TextualHeaders, "");
+	strcat(tkc->TextualHeaders, text);
+}
+
+void gf_crypt_info_del(GF_CryptInfo *info)
+{
+	while (gf_list_count(info->tcis)) {
+		GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
+		if (tci->KIDs) gf_free(tci->KIDs);
+		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);
+		gf_list_rem_last(info->tcis);
+		gf_free(tci);
+	}
+	gf_list_del(info->tcis);
+	gf_free(info);
+}
+
+GF_CryptInfo *gf_crypt_info_load(const char *file, GF_Err *out_err)
+{
+	GF_Err e;
+	GF_CryptInfo *info;
+	GF_SAXParser *sax;
+	GF_SAFEALLOC(info, GF_CryptInfo);
+	if (!info) {
+		if (out_err) *out_err = GF_OUT_OF_MEM;
+		return NULL;
+	}
+	info->tcis = gf_list_new();
+	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) ));
+		if (out_err) *out_err = e;
+		gf_crypt_info_del(info);
+		info = NULL;
+	} else {
+		if (out_err) *out_err = GF_OK;
+	}
+	gf_xml_sax_del(sax);
+	return info;
+}
+
+static Bool on_decrypt_event(void *_udta, GF_Event *evt)
+{
+	Double progress;
+	u32 *prev_progress = (u32 *)_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)
+		return GF_FALSE;
+
+	*prev_progress = (u32) progress;
+#ifndef GPAC_DISABLE_LOG
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Decrypting: % 2.2f %%\r", progress));
+#else
+	fprintf(stderr, "Decrypting: % 2.2f %%\r", progress);
+#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];
+	GF_Filter *src, *dst, *dcrypt;
+	GF_FilterSession *fsess;
+	GF_Err e = GF_OK;
+	u32 progress = (u32) -1;
+
+	fsess = gf_fs_new_defaults(0);
+	if (!fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Failed to create filter session\n"));
+		return GF_OUT_OF_MEM;
+	}
+	sprintf(szArgs, "mp4dmx:mov=%p", mp4);
+	if (fragment_name) {
+		strcat(szArgs, ":sigfrag:catseg=");
+		strcat(szArgs, fragment_name);
+	}
+	src = gf_fs_load_filter(fsess, szArgs, &e);
+	if (!src) {
+		gf_fs_del(fsess);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load demux filter for source file\n"));
+		return e;
+	}
+
+	sprintf(szArgs, "cdcrypt:FID=1:cfile=%s", drm_file);
+	dcrypt = gf_fs_load_filter(fsess, szArgs, &e);
+	if (!dcrypt) {
+		gf_fs_del(fsess);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load decryptor filter\n"));
+		return e;
+	}
+
+	sprintf(szArgs, "SID=1");
+	if (fragment_name) {
+		strcat(szArgs, ":sseg:noinit:store=frag:cdur=1000000000");
+	} else {
+		if (interleave_time) {
+			char an_arg[100];
+			sprintf(an_arg, ":cdur=%g", interleave_time);
+			strcat(szArgs, an_arg);
+		} else {
+			strcat(szArgs, ":store=flat");
+		}
+	}
+
+	dst = gf_fs_load_destination(fsess, dst_file, szArgs, NULL, &e);
+	if (!dst) {
+		gf_fs_del(fsess);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Decrypter] Cannot load destination muxer\n"));
+		return GF_FILTER_NOT_FOUND;
+	}
+
+	if (!gf_sys_is_test_mode()
+#ifndef GPAC_DISABLE_LOG
+		&& (gf_log_get_tool_level(GF_LOG_APP)!=GF_LOG_QUIET)
+#endif
+		&& !gf_sys_is_quiet()
+	) {
+		gf_fs_enable_reporting(fsess, GF_TRUE);
+		gf_fs_set_ui_callback(fsess, on_decrypt_event, &progress);
+	}
+#ifdef GPAC_ENABLE_COVERAGE
+	else if (gf_sys_is_cov_mode()) {
+		on_decrypt_event(NULL, NULL);
+	}
+#endif //GPAC_ENABLE_COVERAGE
+
+	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 (fs_dump_flags & 1) gf_fs_print_stats(fsess);
+	if (fs_dump_flags & 2) gf_fs_print_connections(fsess);
+
+	gf_fs_del(fsess);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_decrypt_fragment(GF_ISOFile *mp4, const char *drm_file, const char *dst_file, const char *fragment_name, u32 fs_dump_flags)
+{
+	return gf_decrypt_file_ex(mp4, drm_file, dst_file, 0, fragment_name, fs_dump_flags);
+}
+GF_EXPORT
+GF_Err gf_decrypt_file(GF_ISOFile *mp4, const char *drm_file, const char *dst_file, Double interleave_time, u32 fs_dump_flags)
+{
+	return gf_decrypt_file_ex(mp4, drm_file, dst_file, interleave_time, NULL, fs_dump_flags);
+}
+static Bool on_crypt_event(void *_udta, GF_Event *evt)
+{
+	Double progress;
+	u32 *prev_progress = (u32 *)_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)
+		return GF_FALSE;
+
+	*prev_progress = (u32) progress;
+#ifndef GPAC_DISABLE_LOG
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Encrypting: % 2.2f %%\r", progress));
+#else
+	fprintf(stderr, "Encrypting: % 2.2f %%\r", progress);
+#endif
+	return GF_FALSE;
+}
+
+static GF_Err gf_crypt_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=NULL;
+	char an_arg[100];
+	char *arg_dst=NULL;
+	u32 progress = (u32) -1;
+	GF_Filter *src, *dst, *crypt;
+	GF_FilterSession *fsess;
+	GF_Err e = GF_OK;
+
+	fsess = gf_fs_new_defaults(0);
+	if (!fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Encrypter] Failed to create filter session\n"));
+		return GF_OUT_OF_MEM;
+	}
+
+	sprintf(an_arg, "mp4dmx:mov=%p", mp4);
+	gf_dynstrcat(&szArgs, an_arg, NULL);
+	if (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, ("[Encrypter] Cannot load demux for source file: %s\n", gf_error_to_string(e)));
+		return e;
+	}
+
+	gf_dynstrcat(&szArgs, "cecrypt:FID=1:cfile=", NULL);
+	gf_dynstrcat(&szArgs, drm_file, NULL);
+	crypt = gf_fs_load_filter(fsess, szArgs, &e);
+
+	gf_free(szArgs);
+	szArgs = NULL;
+
+	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) ));
+		return e;
+	}
+
+	gf_dynstrcat(&szArgs, "SID=1", NULL);
+	if (fragment_name) {
+		gf_dynstrcat(&szArgs, ":sseg:noinit:store=frag:cdur=1000000000", NULL);
+	} else {
+		if (interleave_time) {
+			sprintf(an_arg, ":cdur=%g", interleave_time);
+			gf_dynstrcat(&szArgs, an_arg, NULL);
+		} else {
+			gf_dynstrcat(&szArgs, ":store=flat", NULL);
+		}
+	}
+
+	arg_dst = gf_url_colon_suffix(dst_file);
+	if (arg_dst) {
+		gf_dynstrcat(&szArgs, arg_dst, NULL);
+		arg_dst[0]=0;
+	}
+	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, ("[Encrypter] Cannot load destination muxer\n"));
+		return GF_FILTER_NOT_FOUND;
+	}
+
+	if (!gf_sys_is_test_mode()
+#ifndef GPAC_DISABLE_LOG
+		&& (gf_log_get_tool_level(GF_LOG_APP)!=GF_LOG_QUIET)
+#endif
+		&& !gf_sys_is_quiet()
+	) {
+		gf_fs_enable_reporting(fsess, GF_TRUE);
+		gf_fs_set_ui_callback(fsess, on_crypt_event, &progress);
+	}
+#ifdef GPAC_ENABLE_COVERAGE
+	else if (gf_sys_is_cov_mode()) {
+		on_crypt_event(NULL, NULL);
+	}
+#endif //GPAC_ENABLE_COVERAGE
+	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 (fs_dump_flags & 1) gf_fs_print_stats(fsess);
+	if (fs_dump_flags & 2) gf_fs_print_connections(fsess);
+	gf_fs_del(fsess);
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_crypt_fragment(GF_ISOFile *mp4, const char *drm_file, const char *dst_file, const char *fragment_name, u32 fs_dump_flags)
+{
+	return gf_crypt_file_ex(mp4, drm_file, dst_file, 0, fragment_name, fs_dump_flags);
+}
+
+GF_EXPORT
+GF_Err gf_crypt_file(GF_ISOFile *mp4, const char *drm_file, const char *dst_file, Double interleave_time, u32 fs_dump_flags)
+{
+	return gf_crypt_file_ex(mp4, drm_file, dst_file, interleave_time, NULL, fs_dump_flags);
+
+}
+#endif /* !defined(GPAC_DISABLE_ISOM_WRITE)*/
+

gpac-0.8.0.tar.gz/src/media_tools/dash_client.c -> gpac-1.0.0.tar.gz/src/media_tools/dash_client.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-
+ *			Copyright (c) Telecom ParisTech 2010-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Adaptive HTTP Streaming
@@ -26,19 +26,13 @@
 #include <gpac/thread.h>
 #include <gpac/network.h>
 #include <gpac/dash.h>
-#include <gpac/internal/mpd.h>
+#include <gpac/mpd.h>
 #include <gpac/internal/m3u8.h>
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/base_coding.h>
 #include <string.h>
 #include <sys/stat.h>
 
-#ifdef _WIN32_WCE
-#include <winbase.h>
-#else
-#include <time.h>
-#endif
-
 #include <math.h>
 
 
@@ -49,6 +43,8 @@
 
 /*set to 1 if you want MPD to use SegmentTemplate if possible instead of SegmentList*/
 #define M3U8_TO_MPD_USE_TEMPLATE	0
+/*set to 1 if you want MPD to use SegmentTimeline*/
+#define M3U8_TO_MPD_USE_SEGTIMELINE	0
 
 typedef enum {
 	GF_DASH_STATE_STOPPED = 0,
@@ -81,9 +77,10 @@
 	u32 max_cache_duration, max_width, max_height;
 	u8 max_bit_per_pixel;
 	u32 auto_switch_count;
-	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering, estimate_utc_drift, ntp_forced;
+	Bool keep_files, disable_switching, allow_local_mpd_update, estimate_utc_drift, ntp_forced;
 	Bool is_m3u8, is_smooth;
-
+	Bool split_adaptation_set;
+	GF_DASHLowLatencyMode low_latency_mode;
 	//set when MPD downloading fails. Will resetup DASH live once MPD is sync again
 	Bool in_error;
 
@@ -127,9 +124,7 @@
 	GF_DASH_STATE dash_state;
 	Bool mpd_stop_request;
 	Bool in_period_setup;
-
-	u32 nb_buffering;
-	u32 idle_interval;
+	Bool all_groups_done_notified;
 
 	s64 utc_drift_estimate;
 	s32 utc_shift;
@@ -137,9 +132,11 @@
 	Double start_range_period;
 
 	Double speed;
+	Bool is_rt_speed;
 	u32 probe_times_before_switch;
 	Bool agressive_switching;
 	u32 min_wait_ms_before_next_request;
+	u32 min_wait_sys_clock;
 
 	Bool force_mpd_update;
 
@@ -147,7 +144,8 @@
 
 	u32 min_timeout_between_404, segment_lost_after_ms;
 
-	Bool use_threaded_download;
+	GF_DASHThreadMode thread_mode;
+
 	Bool ignore_xlink;
 
 	//0: not atsc - 1: atsc but clock not init 2- atsc clock init
@@ -163,6 +161,7 @@
 	s32 debug_group_index;
 	Bool disable_speed_adaptation;
 
+	Bool period_groups_setup;
 	u32 tile_rate_decrease;
 	GF_DASHTileAdaptationMode tile_adapt_mode;
 
@@ -242,6 +241,8 @@
 
 	Double start_playback_range;
 
+	Bool group_setup;
+
 	Bool was_segment_base;
 	/*local file playback, do not delete them*/
 	Bool local_files;
@@ -271,7 +272,7 @@
 	u32 nb_segments_since_switch;
 
 	//stats of last downloaded segment
-	u32 total_size, bytes_per_sec;
+	u32 total_size, bytes_per_sec, bytes_done, backup_Bps;
 
 
 	Bool segment_must_be_streamed;
@@ -347,6 +348,10 @@
 
 	/* current segment index in BBA and BOLA algorithm */
 	u32 current_index;
+
+	//in non-threaded mode, indicates that the demux for this group has nothing to do...
+	Bool force_early_fetch;
+	Bool is_low_latency;
 };
 
 static void gf_dash_solve_period_xlink(GF_DashClient *dash, GF_List *period_list, u32 period_idx);
@@ -369,32 +374,6 @@
 	return NULL;
 }
 
-static void gf_dash_buffer_off(GF_DASH_Group *group)
-{
-	if (!group->dash->enable_buffering) return;
-	if (group->buffering) {
-		assert(group->dash->nb_buffering);
-		group->dash->nb_buffering--;
-		if (!group->dash->nb_buffering) {
-			group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_BUFFER_DONE, -1, GF_OK);
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Session buffering done\n"));
-		}
-		group->buffering = GF_FALSE;
-	}
-}
-
-static void gf_dash_buffer_on(GF_DASH_Group *group)
-{
-	if (!group->dash->enable_buffering) return;
-
-	if (!group->buffering) {
-		if (!group->dash->nb_buffering) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
-		}
-		group->dash->nb_buffering++;
-		group->buffering = GF_TRUE;
-	}
-}
 
 static u64 dash_get_fetch_time(GF_DashClient *dash)
 {
@@ -431,56 +410,18 @@
 	return nb_rep_need;
 }
 
-GF_EXPORT
-void gf_dash_get_buffer_info(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
-{
-	u32 nb_buffering = 0;
-	if (dash->nb_buffering) {
-		u32 i, j, nb_groups;
-		*total_buffer = 0;
-		*media_buffered = 0;
-		nb_groups = gf_list_count(dash->groups);
-		for (i=0; i<nb_groups; i++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			if (group->buffering) {
-				u32 buffer = 0;
-				*total_buffer += (u32) (group->segment_duration*group->max_buffer_segments*1000);
-				for (j=0; j<group->nb_cached_segments; j++) {
-					buffer += group->cached[j].duration;
-				}
-				*media_buffered += buffer;
-				nb_buffering += gf_dash_group_count_rep_needed(group);
-			}
-		}
-		if (*media_buffered > *total_buffer)
-			*media_buffered  = *total_buffer;
-		if (nb_buffering) {
-			*total_buffer /= nb_buffering;
-			*media_buffered /= nb_buffering;
-		}
-	}
-}
-
-static void gf_dash_update_buffering(GF_DASH_Group *group, GF_DashClient *dash)
-{
-	if (dash->nb_buffering) {
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFERING, -1, GF_OK);
-
-		if (group->cached[0].duration && group->nb_cached_segments>=group->max_buffer_segments)
-			gf_dash_buffer_off(group);
-	}
-}
-
-
-GF_EXPORT
-Bool gf_dash_check_mpd_root_type(const char *local_url)
+static
+u32 gf_dash_check_mpd_root_type(const char *local_url)
 {
 	if (local_url) {
 		char *rtype = gf_xml_get_root_type(local_url, NULL);
 		if (rtype) {
-			Bool handled = GF_FALSE;
+			u32 handled = 0;
 			if (!strcmp(rtype, "MPD")) {
-				handled = GF_TRUE;
+				handled = 1;
+			}
+			else if (!strcmp(rtype, "SmoothStreamingMedia")) {
+				handled = 2;
 			}
 			gf_free(rtype);
 			return handled;
@@ -581,7 +522,7 @@
 				}
 				start = sep;
 				end = sep+4;
-				while (start && start>seg_url && (*(start-1)=='0')) { start--; nb_space++;}
+				while (start>seg_url && (*(start-1)=='0')) { start--; nb_space++;}
 				start[0]=0;
 				len = (u32) strlen(seg_url)-2;
 				if (!strncmp(val, seg_url+2, len)) {
@@ -606,8 +547,8 @@
 						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+1>=startNum) {
-							timeline_offset_ms = seg_dur*(number+1-startNum);
+						if (number>=startNum) {
+							timeline_offset_ms = seg_dur*(number-startNum);
 						}
 						found = GF_TRUE;
 					}
@@ -638,7 +579,7 @@
 	}
 	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));
-	} else if (val) {
+	} else {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] No ATSC entity on HTPP request\n"));
 	}
 
@@ -650,13 +591,20 @@
 			group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
 			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 {
+			s64 drift_estimate = 0;
+			u64 utc = 0;
 			val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Date");
-			if (val) {
-				u64 utc = gf_net_parse_date(val);
-				if (utc) {
-					group->dash->utc_drift_estimate = ((s64) fetch_time - (s64) utc);
-					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));
-				}
+			if (val)
+				utc = gf_net_parse_date(val);
+			if (utc)
+				drift_estimate = ((s64) fetch_time - (s64) utc);
+
+			//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;
+				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));
 			}
 		}
 	}
@@ -682,9 +630,9 @@
 			time_t gtime1, gtime2;
 			struct tm *t1, *t2;
 			gtime1 = current_time / 1000;
-			t1 = gmtime(&gtime1);
+			t1 = gf_gmtime(&gtime1);
 			gtime2 = availabilityStartTime / 1000;
-			t2 = gmtime(&gtime2);
+			t2 = gf_gmtime(&gtime2);
 			if (t1 == t2) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Slight drift in UTC clock at time %d-%02d-%02dT%02d:%02d:%02dZ: diff AST - now %d ms\n", 1900+t1->tm_year, t1->tm_mon+1, t1->tm_mday, t1->tm_hour, t1->tm_min, t1->tm_sec, (s32) (availabilityStartTime - current_time) ));
 				current_time = 0;
@@ -731,7 +679,6 @@
 				&& (!ap->duration || (seg_end_ms<=start + ap->duration))
 			) {
 				if (i != group->dash->active_period_index) {
-					group->dash->initial_period_tunein = GF_FALSE;
 					group->dash->reinit_period_index = 1+i;
 					group->dash->start_range_period = (Double) seg_start_ms;
 					group->dash->start_range_period -= ap->start;
@@ -820,12 +767,19 @@
 		if (rep->segment_template->availability_time_offset) ast_offset = rep->segment_template->availability_time_offset;
 	}
 
+	group->is_low_latency = GF_FALSE;
+	if (group->dash->low_latency_mode==GF_DASH_LL_DISABLE) {
+		ast_offset = 0;
+	} else if (ast_offset>0) {
+		group->is_low_latency = GF_TRUE;
+	}
 	if (timeline) {
 		u64 start_segtime = 0;
 		u64 segtime = 0;
 		u64 current_time_rescale;
 		u64 timeline_duration = 0;
 		u32 count;
+		u64 last_s_dur=0;
 		u32 i, seg_idx = 0;
 
 		current_time_rescale = current_time;
@@ -842,6 +796,16 @@
 			timeline_duration += (1+ent->repeat_count)*ent->duration;
 
 			if (i+1 == count) timeline_duration -= ent->duration;
+			last_s_dur=ent->duration;
+		}
+
+
+		if (!group->dash->mpd->minimum_update_period) {
+			last_s_dur *= 1000;
+			last_s_dur /= timescale;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] dynamic MPD but no update period specified and SegmentTimeline used - will use segment duration %d ms as default update rate\n", last_s_dur));
+
+			group->dash->mpd->minimum_update_period = (u32) last_s_dur;
 		}
 
 		for (i=0; i<count; i++) {
@@ -850,7 +814,7 @@
 			if (!segtime) {
 				start_segtime = segtime = ent->start_time;
 
-				//if current time is before the start of the previous segement, consider our timing is broken
+				//if current time is before the start of the previous segment, consider our timing is broken
 				if (current_time_rescale + ent->duration < segtime) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] current time "LLU" is before start time "LLU" of first segment in timeline (timescale %d) by %g sec - using first segment as starting point\n", current_time_rescale, segtime, timescale, (segtime-current_time_rescale)*1.0/timescale));
 					group->download_segment_index = seg_idx;
@@ -881,15 +845,18 @@
 				segtime += ent->duration;
 				repeat--;
 				seg_idx++;
+				last_s_dur=ent->duration;
 			}
 		}
 		//check if we're ahead of time but "reasonnably" ahead (max 1 min) - otherwise consider the timing is broken
-		if ((current_time_rescale >= segtime) && (current_time_rescale <= segtime + 60*timescale)) {
+		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;
-			group->nb_segments_in_rep = 10;
-			group->start_playback_range = (current_time)/1000.0;
+			group->nb_segments_in_rep = seg_idx;
+			group->start_playback_range = current_time/1000.0;
 			group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
+			//force an update in half the target period
+			group->dash->last_update_time = gf_sys_clock() + group->dash->mpd->minimum_update_period/2;
 		} else {
 			//NOT FOUND !!
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time_rescale, start_segtime, segtime));
@@ -897,6 +864,7 @@
 			group->nb_segments_in_rep = 10;
 			group->broken_timing = GF_TRUE;
 		}
+
 		return;
 	}
 
@@ -929,7 +897,6 @@
 					if (ap->start) start = ap->start;
 
 					if ((seg_start_ms>=ap->start) && (!ap->duration || (seg_end_ms<=start + ap->duration))) {
-						group->dash->initial_period_tunein = GF_FALSE;
 						group->dash->reinit_period_index = 1+i;
 						group->dash->start_range_period = (Double) seg_start_ms;
 						group->dash->start_range_period -= ap->start;
@@ -946,25 +913,26 @@
 		//not time shifting, we are at the live edge, we must stick to start of segment otherwise we won't have enough data to play until next segment is ready
 
 		if (!group->dash->initial_time_shift_value) {
-			Double ms_in_seg;
+			Double time_in_seg;
+			//by default playback starts at begining of segment
 			group->start_playback_range = shift * group->segment_duration;
 
-			ms_in_seg = (Double) current_time/1000.0;
-			ms_in_seg -= group->start_playback_range;
+			time_in_seg = (Double) current_time/1000.0;
+			time_in_seg -= group->start_playback_range;
 
 			//if low latency, try to adjust
 			if (ast_offset) {
-				Double ast_diff;
+				Double ast_diff_d;
 				if (ast_offset>group->segment_duration) ast_offset = group->segment_duration;
-				ast_diff = group->segment_duration - ast_offset;
+				ast_diff_d = group->segment_duration - ast_offset;
 
 				//we assume that in low latency mode, chunks are made available every (group->segment_duration - ast_offset)
 				//we need to seek such that the remaining time R satisfies now + R = NextSegAST
 				//hence S(n) + ms_in_seg + R = S(n+1) + Aoffset
 				//which gives us R = S(n+1) + Aoffset - S(n) - ms_in_seg = D + Aoffset - ms_in_seg
 				//seek = D - R = D - (D + Aoffset - ms_in_seg) = ms_in_seg - Ao
-				if (ms_in_seg > ast_diff) {
-					group->start_playback_range += ms_in_seg - ast_diff;
+				if (time_in_seg > ast_diff_d) {
+					group->start_playback_range += time_in_seg - ast_diff_d;
 				}
 			}
 		} else {
@@ -978,7 +946,7 @@
 			group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] AST at init "LLD"\n", group->ast_at_init));
 
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At current time "LLD" ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%f - %.03f seconds in segment\n", current_time, start_number, shift, group->segment_duration, group->start_playback_range ? group->start_playback_range - shift*group->segment_duration : 0));
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] At current time "LLD" ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%f - %.03f seconds in segment (start range %g)\n", current_time, start_number, shift, group->segment_duration, group->start_playback_range ? group->start_playback_range - shift*group->segment_duration : 0, group->start_playback_range));
 		} else {
 			group->download_segment_index += start_number;
 			if (group->download_segment_index > group->start_number_at_last_ast) {
@@ -1018,8 +986,8 @@
 
 /*!
 * 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
+\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;
@@ -1034,9 +1002,9 @@
 
 /*!
 * Returns true if mime type of a given URL is an M3U8 mime-type
-* \param url The url to check
-* \param mime The mime-type to check
-* \return true if mime-type is OK for M3U8
+\param url The url to check
+\param mime The mime-type to check
+\return true if mime-type is OK for M3U8
 */
 static Bool gf_dash_is_m3u8_mime(const char *url, const char * mime) {
 	u32 i;
@@ -1095,6 +1063,7 @@
 	GF_Err e;
 	GF_DASHFileIO *dash_io = dash->dash_io;
 
+	if (!dash_io) return GF_BAD_PARAM;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
 
 	if (group) {
@@ -1168,11 +1137,9 @@
 				return GF_OK;
 			}
 #endif
-		}
 
-		/*file cannot be cached on disk !*/
-		if (group) {
-			if (dash_io->get_cache_name(dash_io, group->segment_download) == NULL) {
+			/*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);
@@ -1430,8 +1397,7 @@
 	seg_ast += seg_dur;
 	seg_ast *= 1000;
 	seg_ast += group->period->start + group->ast_at_init;
-
-	return (u64) seg_ast;
+ 	return (u64) seg_ast;
 }
 
 static u32 gf_dash_get_index_in_timeline(GF_MPD_SegmentTimeline *timeline, u64 segment_start, u64 start_timescale, u64 timescale)
@@ -1519,16 +1485,19 @@
 	}
 
 	if (group) {
+#ifndef GPAC_DISABLE_LOG
 		u32 prev_idx = group->download_segment_index;
+#endif
 		group->nb_segments_in_rep = nb_new_segs;
 		group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, group->current_start_time, group->current_timescale, timescale ? timescale : group->current_timescale);
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Updated SegmentTimeline: New segment number %d - old %d - start time "LLD"\n", group->download_segment_index , prev_idx, group->current_start_time));
 	} else {
-		u32 i;
 		for (i=0; i<gf_list_count(dash->groups); i++) {
 			GF_DASH_Group *a_group = gf_list_get(dash->groups, i);
+#ifndef GPAC_DISABLE_LOG
 			u32 prev_idx = a_group->download_segment_index;
+#endif
 			a_group->nb_segments_in_rep = nb_new_segs;
 			a_group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, a_group->current_start_time, a_group->current_timescale, timescale ? timescale : a_group->current_timescale);
 
@@ -1541,7 +1510,7 @@
 	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO) ) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] New SegmentTimeline: \n"));
 		for (idx=0; idx<gf_list_count(new_timeline->entries); idx++) {
-			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(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));
 		}
 	}
@@ -1603,6 +1572,7 @@
 				GF_MPD_SegmentURL *seg_url = gf_list_get(segment_list->segment_URLs, 0);
 				gf_list_rem(segment_list->segment_URLs, 0);
 				gf_mpd_segment_url_free(seg_url);
+				i--;
 			}
 		}
 		group->nb_segments_purged += nb_removed;
@@ -1618,6 +1588,7 @@
 	const char *local_url;
 	char *url;
 	GF_DOMParser *parser;
+	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));
 
@@ -1708,6 +1679,11 @@
 	}
 }
 
+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) ));
+	group->done = GF_TRUE;
+}
 
 static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
 {
@@ -1753,7 +1729,7 @@
 	} else {
 		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
 		if (local_url) {
-			gf_delete_file(local_url);
+			gf_file_delete(local_url);
 		}
 		//use the redirected url stored in base URL - DO NOT USE the redirected URL of the session since
 		//the session may have been reused for period XLINK dowload.
@@ -1798,13 +1774,13 @@
 		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
 		if (gf_dash_is_m3u8_mime(purl, mime) || strstr(purl, ".m3u8")) {
 			new_mpd = gf_mpd_new();
-			e = gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, new_mpd, GF_FALSE, dash->keep_files, 0);
+			e = gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, M3U8_TO_MPD_USE_SEGTIMELINE, &dash->getter, new_mpd, GF_FALSE, dash->keep_files);
 			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)));
 				gf_mpd_del(new_mpd);
 				return GF_NON_COMPLIANT_BITSTREAM;
 			}
-		} else if (!gf_dash_is_dash_mime(mime)) {
+		} 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));
 		}
 
@@ -1826,12 +1802,16 @@
 
 	// parse the mpd file for filling the GF_MPD structure. Note: for m3u8, MPD has been fetched above
 	if (!new_mpd) {
-		if (!gf_dash_check_mpd_root_type(local_url)) {
+		u32 res = gf_dash_check_mpd_root_type(local_url);
+		if ((res==1) && dash->is_smooth) res = 0;
+		else if ((res==2) && !dash->is_smooth) res = 0;
+
+		if (!res) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		}
 
-		if (gf_sha1_file( local_url, signature)) {
+		if (gf_sha1_file( local_url, signature) != GF_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] : cannot SHA1 file %s\n", local_url));
 			return GF_IO_ERR;
 		}
@@ -1877,6 +1857,10 @@
 		}
 		if (dash->ignore_xlink)
 			dash_purge_xlink(new_mpd);
+
+		if (!e && dash->split_adaptation_set)
+			gf_mpd_split_adaptation_sets(new_mpd);
+
 	}
 
 	assert(new_mpd);
@@ -1884,11 +1868,13 @@
 	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
 	if (fetch_only  && !period) goto exit;
 
+#ifndef GPAC_DISABLE_LOG
 	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Updated manifest:\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 : "none"));
 	}
+#endif
 
 	//if current period was a remote period, do a pass on the new manifest periods, check for xlink
 	if (period->origin_base_url) {
@@ -1901,7 +1887,7 @@
 				( (new_period->start+new_period->duration >= period->start + period->duration) || (!new_period->duration))
 			) {
 				const char *base_url;
-				u32 j, insert_idx;
+				u32 insert_idx;
 				if (period->type == GF_MPD_TYPE_DYNAMIC) {
 					gf_dash_solve_period_xlink(dash, new_mpd->periods, i);
 					goto restart_period_check;
@@ -1946,13 +1932,13 @@
 	if (!new_period) {
 		if (dash->mpd->type == GF_MPD_TYPE_DYNAMIC) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] current active period not found in MPD update - assuming end of active period and switching to first period in new MPD\n"));
-			new_period = gf_list_get(new_mpd->periods, 0);
+
 			//assume the old period is no longer valid
 			dash->active_period_index = 0;
 			dash->request_period_switch = GF_TRUE;
 			for (i=0; i<gf_list_count(dash->groups); i++) {
 				GF_DASH_Group *group = gf_list_get(dash->groups, i);
-				group->done = GF_TRUE;
+				gf_dash_mark_group_done(group);
 				group->adaptation_set = NULL;
 			}
 			goto exit;
@@ -2087,7 +2073,6 @@
 				//if we have a xlink_href in segment_list, solve it
 				while (new_rep->segment_list->xlink_href && (group->active_rep_index==rep_idx)) {
 					u32 retry=10;
-					GF_Err e;
 					Bool is_static = GF_FALSE;
 					u64 dur = 0;
 
@@ -2330,24 +2315,29 @@
 		if (!period->duration && new_period->duration) {
 			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("End of period upcoming, current segment index for group #%d: %d\n", group_idx+1, group->download_segment_index));
 			if (group->download_segment_index > (s32) group->nb_segments_in_rep)
-				group->done = GF_TRUE;
+				gf_dash_mark_group_done(group);
 		}
 
 	}
 
 exit:
-	/*swap representations - we don't need to update download_segment_index as it still points to the right entry in the merged list*/
-	if (dash->mpd)
+	/*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);
+	}
 	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"));
 	}
+#endif
 
 	return GF_OK;
 }
@@ -2417,7 +2407,7 @@
 			return;
 
 		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not reslove XLINK %s in time - using old representation\n", rep->segment_list->xlink_href));
+			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;
 			return;
 		}
@@ -2454,7 +2444,7 @@
 				group->hls_next_start_time = 0;
 
 				//check in new list where the start is
-				for (k=0; k<gf_list_count(rep->segment_list->segment_URLs); k++) {
+				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);
 
@@ -2607,6 +2597,11 @@
 	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)
@@ -2635,13 +2630,16 @@
 		char *sep;
 		sep = strstr(*out_url, ";base64,");
 		if (sep) {
-			char *decoded_base64_data;
+			GF_Blob *blob;
 			u32 len;
 			sep+=8;
 			len = (u32)strlen(sep) + 1;
-			decoded_base64_data = (char *)gf_malloc(len);
-			len = gf_base64_decode(sep, len, decoded_base64_data, len);
-			sprintf(*out_url, "gmem://%d@%p", len, decoded_base64_data);
+			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"));
@@ -2662,11 +2660,18 @@
 	if (!group->irap_max_dec_time && !group->avg_dec_time) {
 		return 0;
 	}
-	bytes_per_sec = group->bytes_per_sec;
+	bytes_per_sec = group->backup_Bps;
 	max_dl_speed = 8.0*bytes_per_sec / rep->bandwidth;
 
 	//if framerate is not in MPD, suppose that it is 25 fps
-	framerate = rep->framerate ? rep->framerate->num : 25;
+	framerate = 25;
+	if (rep->framerate) {
+		framerate = rep->framerate->num;
+		if (rep->framerate->den) {
+			framerate /= rep->framerate->den;
+		}
+	}
+
 	if (group->decode_only_rap)
 		max_decoding_speed = group->irap_max_dec_time ? 1000000.0 / group->irap_max_dec_time : 0;
 	else
@@ -2674,14 +2679,12 @@
 	max_available_speed = max_decoding_speed > max_dl_speed ? max_dl_speed : max_decoding_speed;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation %s max playout rate: in MPD %f - calculated by stat: %f\n", rep->id, rep->max_playout_rate, max_available_speed));
 
-	return max_available_speed/2; // for testing and debug
+	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)
 {
 	const char *url;
-	u32 buffer_ms = 0;
-	Double bitrate, time;
 	GF_MPD_Representation *rep;
 
 	if (!group->nb_cached_segments)
@@ -2700,30 +2703,47 @@
 	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) {
+			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));
+			}
+			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;
+
 #ifndef GPAC_DISABLE_LOG
 	if (gf_log_tool_level_on(GF_LOG_DASH, GF_LOG_INFO)) {
-		u32 i;
+		u32 i, buffer_ms = 0;
+		Double bitrate, time;
 		//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);
 		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;
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-	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;
-	}
-	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));
+		bitrate=0;
+		time=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;
+		}
+		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));
+	}
 #endif
 }
 
@@ -2737,12 +2757,18 @@
 	if (group->buffering)
 		return GF_OK;
 
-	download_rate = group->dash->dash_io->get_bytes_per_sec(group->dash->dash_io, group->segment_download);
-	if (!download_rate) 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;
 
-	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);
 	time_until_end = 0;
 	if (tot_size) {
 		time_until_end = 1000*(tot_size-done) / download_rate;
@@ -2752,7 +2778,7 @@
 	if (download_rate<group->min_bitrate) group->min_bitrate = download_rate;
 	if (download_rate>group->max_bitrate) group->max_bitrate = download_rate;
 
-	if (!download_rate || (download_rate > group->active_bitrate)) {
+	if (download_rate > group->active_bitrate) {
 		return GF_OK;
 	}
 
@@ -2765,7 +2791,6 @@
 		return GF_OK;
 	}
 
-
 	//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 "
@@ -2791,9 +2816,12 @@
 			"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 ));
 
-	group->download_abort_type = 2;
-	group->dash->dash_io->abort(group->dash->dash_io, group->segment_download);
-
+	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);
+	}
 	//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;
 
@@ -2806,7 +2834,7 @@
 				"segment\n"));
 	} else {
 		u32 target_rate;
-		//compute min bitrate needed to fetch the segement in another rep, with the time remaining
+		//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;
 
@@ -2941,13 +2969,11 @@
 			new_rep->playback.probe_switch_count++;
 			if (new_rep->playback.probe_switch_count > dash->probe_times_before_switch) {
 				new_rep->playback.probe_switch_count = 0;
-			}
-			else {
+			} else {
 				new_index = group->active_rep_index;
 			}
 		}
 	}
-
 	return new_index;
 }
 
@@ -3085,6 +3111,7 @@
 	u32 r; // reservoir
 	u32 cu; // cushion
 	u32 buf_now = group->buffer_occupancy_ms;
+	u32 buf_max = group->buffer_max_ms;
 	double f_buf_now;
 
 	/* We don't use the segment duration as advertised in the MPD because it may not be there due to segment timeline*/
@@ -3092,10 +3119,12 @@
 
 	rate_min = ((GF_MPD_Representation *)gf_list_get(group->adaptation_set->representations, 0))->bandwidth;
 	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
 	   NOTE: This is not described in the paper
 	*/
-	if (group->buffer_occupancy_ms + segment_duration_ms > group->buffer_max_ms) {
+	if (group->buffer_occupancy_ms + segment_duration_ms > buf_max) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] BBA-0: not enough space to download new segment: %d\n", group->buffer_occupancy_ms));
 		return -1;
 	}
@@ -3118,15 +3147,15 @@
      * the size of cushion is between 37.5% and 90% of the buffer size
 	 * the rate map is piece-wise
      */
-	if (group->buffer_max_ms <= segment_duration_ms) {
+	if (buf_max <= segment_duration_ms) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] BBA-0: cannot initialize BBA-0 given the buffer size (%d) and segment duration (%d)\n", group->buffer_max_ms, group->segment_duration*1000));
 		return -1;
 	}
-	r = (u32)(37.5*group->buffer_max_ms / 100);
+	r = (u32)(37.5*buf_max / 100);
 	if (r < segment_duration_ms) {
 		r = segment_duration_ms;
 	}
-	cu = (u32)((90-37.5)*group->buffer_max_ms / 100);
+	cu = (u32)((90-37.5)*buf_max / 100);
 
 	if (buf_now <= r) {
 		f_buf_now = rate_min;
@@ -3162,7 +3191,9 @@
 	}
 
 	if (new_index != -1) {
+#ifndef GPAC_DISABLE_LOG
 		GF_MPD_Representation *result = gf_list_get(group->adaptation_set->representations, (u32)new_index);
+#endif
 		// increment the segment number for debug purposes
 		group->current_index++;
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] BBA-0: buffer %d ms, segment number %d, new quality %d with rate %d\n", group->buffer_occupancy_ms, group->current_index, new_index, result->bandwidth));
@@ -3221,8 +3252,8 @@
 
 	// Computing the log-based utility of each segment (recomputing each time for period changes)
 	for (k = 0; k < nb_reps; k++) {
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, k);
-		rep->playback.bola_v = log(((Double)rep->bandwidth) / min_rep->bandwidth);
+		GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
+		a_rep->playback.bola_v = log(((Double)a_rep->bandwidth) / min_rep->bandwidth);
 	}
 
 	if (dash->adaptation_algorithm == GF_DASH_ALGO_BOLA_BASIC) {
@@ -3297,7 +3328,9 @@
 	}
 
 	if (new_index != -1) {
+#ifndef GPAC_DISABLE_LOG
 		GF_MPD_Representation *result = gf_list_get(group->adaptation_set->representations, (u32)new_index);
+#endif
 		// increment the segment number for debug purposes
 		group->current_index++;
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] BOLA: buffer %d ms, segment number %d, new quality %d with rate %d\n", group->buffer_occupancy_ms, group->current_index, new_index, result->bandwidth));
@@ -3315,7 +3348,6 @@
 	s32 new_index, old_index;
 	GF_DASH_Group *base_group;
 	GF_MPD_Representation *rep;
-	GF_MPD_Representation *new_rep;
 	Bool force_lower_complexity;
 
 	/* Don't do adaptation if configured switching to happen systematically (debug) */
@@ -3358,7 +3390,7 @@
 	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)) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing a lower complexity to achieve desired playback 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 {
@@ -3438,7 +3470,7 @@
 	group->rate_adaptation_postponed = GF_FALSE;
 
 	if (new_index != group->active_rep_index) {
-		new_rep = gf_list_get(group->adaptation_set->representations, (u32)new_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));
 			return;
@@ -3476,6 +3508,23 @@
 	group->buffer_occupancy_at_last_seg = group->buffer_occupancy_ms;
 }
 
+static char *gf_dash_get_fileio_url(const char *base_url, char *res_url)
+{
+	const char *new_res;
+	GF_FileIO *gfio;
+	if (!base_url)
+		return NULL;
+	if (strncmp(base_url, "gfio://", 7))
+		return res_url;
+
+	gfio = gf_fileio_from_url(base_url);
+
+	new_res = gf_fileio_factory(gfio, res_url);
+	if (!new_res) return res_url;
+	gf_free(res_url);
+	return gf_strdup(new_res);
+}
+
 static GF_Err gf_dash_download_init_segment(GF_DashClient *dash, GF_DASH_Group *group)
 {
 	GF_Err e;
@@ -3490,6 +3539,7 @@
 	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;
 
@@ -3506,6 +3556,12 @@
 	base_url = dash->base_url;
 	if (group->period->origin_base_url) base_url = group->period->origin_base_url;
 
+	base_url_orig = base_url;
+	if (base_url && !strncmp(base_url, "gfio://", 7)) {
+		GF_FileIO *gfio = gf_fileio_from_url(base_url);
+		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);
 	if (e) {
 		if (e != GF_IP_NETWORK_EMPTY) {
@@ -3531,10 +3587,15 @@
 		group->dont_delete_first_segment = 1;
 	}
 
+	base_url = base_url_orig;
+	base_init_url = gf_dash_get_fileio_url(base_url, base_init_url);
+
 	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, "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)) {
+		if ( strnicmp(base_init_url, "gmem://", 7) && strnicmp(base_init_url, "gfio://", 7)) {
 			FILE *ftest = gf_fopen(base_init_url, "rb");
 			if (!ftest) {
 				if (group->current_base_url_idx + 1 < gf_mpd_get_base_url_count(dash->mpd, group->period, group->adaptation_set, rep) ){
@@ -3543,8 +3604,7 @@
 					return gf_dash_download_init_segment(dash, group);
 				}
 			} else {
-				gf_fseek(ftest, 0, SEEK_END);
-				file_size = (u32) gf_ftell(ftest);
+				file_size = (u32) gf_fsize(ftest);
 				gf_fclose(ftest);
 			}
 		}
@@ -3563,9 +3623,6 @@
 		group->nb_cached_segments = 1;
 		/*do not erase local files*/
 		group->local_files = group->was_segment_base ? 0 : 1;
-		if (group->local_files) {
-			gf_dash_buffer_off(group);
-		}
 
 		group->download_segment_index += nb_segment_read;
 		init_segment_local_url = group->cached[0].cache;
@@ -3614,6 +3671,70 @@
 
 	group->max_bitrate = 0;
 	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) {
+
+					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;
+				}
+			}
+		}
+		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);
 
@@ -3754,7 +3875,6 @@
 
 	group->nb_cached_segments = 1;
 	group->download_segment_index += nb_segment_read;
-	gf_dash_update_buffering(group, dash);
 
 	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 ));
 
@@ -3816,7 +3936,7 @@
 				if (nURL) {
 					u32 len = (u32) strlen(nURL);
 					if (nURL[len] != '/') {
-						GF_Err e = gf_dash_download_resource(dash, &(group->segment_download), nURL, 0, 0, 1, group);
+						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)) {
@@ -3870,24 +3990,21 @@
 
 static void gf_dash_group_reset(GF_DashClient *dash, GF_DASH_Group *group)
 {
-	if (group->buffering) {
-		gf_dash_buffer_off(group);
-	}
 	if (group->urlToDeleteNext) {
 		if (!dash->keep_files && !group->local_files)
-			dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
+			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) {
-		dash->dash_io->del(dash->dash_io, 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 --;
+		group->nb_cached_segments--;
 		if (!dash->keep_files && !group->local_files)
-			gf_delete_file(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]);
 	}
@@ -3898,7 +4015,7 @@
 static void gf_dash_reset_groups(GF_DashClient *dash)
 {
 	/*send playback destroy event*/
-	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_DESTROY_PLAYBACK, -1, GF_OK);
+	if (dash->dash_io) dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_DESTROY_PLAYBACK, -1, GF_OK);
 
 	while (gf_list_count(dash->groups)) {
 		GF_DASH_Group *group = gf_list_last(dash->groups);
@@ -3933,6 +4050,7 @@
 	dash->SRDs = NULL;
 }
 
+#ifndef GPAC_DISABLE_LOG
 static u32 gf_dash_get_start_number(GF_DASH_Group *group, GF_MPD_Representation *rep)
 {
 	if (rep->segment_list && rep->segment_list->start_number) return rep->segment_list->start_number;
@@ -3945,6 +4063,7 @@
 
 	return 0;
 }
+#endif
 
 static GF_MPD_Representation *gf_dash_find_rep(GF_DashClient *dash, const char *dependency_id, GF_DASH_Group **rep_group)
 {
@@ -4019,7 +4138,7 @@
 GF_Err gf_dash_setup_groups(GF_DashClient *dash)
 {
 	GF_Err e;
-	u32 i, j, count, nb_dependant_rep;
+	u32 i, j, count, nb_dependent_rep;
 	GF_MPD_Period *period;
 
 	if (!dash->groups) {
@@ -4038,7 +4157,7 @@
 		Bool has_dependent_representations = GF_FALSE;
 		GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, i);
 		for (j=0; j<gf_list_count(dash->groups); j++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, j);
+			group = gf_list_get(dash->groups, j);
 			if (group->adaptation_set==set) {
 				found = 1;
 				break;
@@ -4058,15 +4177,17 @@
 		group->dash = dash;
 		group->adaptation_set = set;
 		group->period = period;
-		if (dash->use_threaded_download)
-			group->download_th = gf_th_new("DashGroupDownload");
+		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->cache_mutex = gf_mx_new("DashGroupMutex");
+		}
 
 		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? GF_TRUE : GF_FALSE;
 
 		seg_dur = 0;
-		nb_dependant_rep = 0;
+		nb_dependent_rep = 0;
 		for (j=0; j<gf_list_count(set->representations); j++) {
 			Double dur;
 			u32 nb_seg, k;
@@ -4133,7 +4254,7 @@
 				GF_MPD_Descriptor *mpd_desc = gf_list_get(rep->essential_properties, k);
 
 				//we don't know any defined scheme for now
-				if (1) {
+				if (! strstr(mpd_desc->scheme_id_uri, "gpac") ) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation with unrecognized EssentialProperty %s - ignoring because not supported\n", mpd_desc->scheme_id_uri));
 					rep->playback.disabled = 1;
 					break;
@@ -4186,7 +4307,7 @@
 			if (!rep->playback.enhancement_rep_index_plus_one)
 				group->max_complementary_rep_index = j;
 			if (!rep->playback.disabled && rep->dependency_id)
-				nb_dependant_rep++;
+				nb_dependent_rep++;
 		}
 
 		if (!seg_dur && !dash->is_m3u8) {
@@ -4213,8 +4334,13 @@
 					group->max_cached_segments ++;
 			}
 #endif
-			group->max_cached_segments *= (nb_dependant_rep+1);
-			group->max_buffer_segments *= (nb_dependant_rep+1);
+			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);
 		}
 
 		if (!has_dependent_representations)
@@ -4242,7 +4368,7 @@
 	count = gf_list_count(dash->groups);
 	for (i=0; i<count; i++) {
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
-		u32 j = gf_dash_group_get_dependency_group(dash, i);
+		j = gf_dash_group_get_dependency_group(dash, i);
 		if (i != j) {
 			GF_DASH_Group *base_group = gf_list_get(dash->groups, j);
 			assert(base_group);
@@ -4280,7 +4406,7 @@
 	return GF_OK;
 }
 
-static GF_Err gf_dash_load_sidx(GF_BitStream *bs, GF_MPD_Representation *rep, Bool seperate_index, u64 sidx_offset)
+static GF_Err gf_dash_load_sidx(GF_BitStream *bs, GF_MPD_Representation *rep, Bool separate_index, u64 sidx_offset)
 {
 #ifdef GPAC_DISABLE_ISOM
 	return GF_NOT_SUPPORTED;
@@ -4303,7 +4429,7 @@
 	gf_bs_seek(bs, sidx_offset);
 
 	anchor_position = sidx_offset + size;
-	if (seperate_index)
+	if (separate_index)
 		anchor_position = 0;
 
 	e = gf_isom_box_parse((GF_Box **) &sidx, bs);
@@ -4314,13 +4440,13 @@
 	offset = sidx->first_offset + anchor_position;
 	rep->segment_list->timescale = sidx->timescale;
 	for (i=0; i<sidx->nb_refs; i++) {
-		GF_MPD_SegmentURL *seg;
 		if (sidx->refs[i].reference_type) {
-			e = gf_dash_load_sidx(bs, rep, seperate_index, offset);
+			e = gf_dash_load_sidx(bs, rep, separate_index, offset);
 			if (e) {
 				break;
 			}
 		} else {
+			GF_MPD_SegmentURL *seg;
 			GF_SAFEALLOC(seg, GF_MPD_SegmentURL);
 			if (!seg) return GF_OUT_OF_MEM;
 			GF_SAFEALLOC(seg->media_range, GF_MPD_ByteRange);
@@ -4341,20 +4467,22 @@
 #endif
 }
 
-static GF_Err gf_dash_load_representation_sidx(GF_DASH_Group *group, GF_MPD_Representation *rep, const char *cache_name, Bool seperate_index, Bool needs_mov_range)
+static GF_Err gf_dash_load_representation_sidx(GF_DASH_Group *group, GF_MPD_Representation *rep, const char *cache_name, Bool separate_index, Bool needs_mov_range)
 {
 	GF_Err e;
 	GF_BitStream *bs;
 	FILE *f=NULL;
+	if (!cache_name) return GF_BAD_PARAM;
+
 	if (!strncmp(cache_name, "gmem://", 7)) {
 		u32 size;
-		char *mem_address;
-		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_IO_ERR;
-		}
+		u8 *mem_address;
+		e = gf_blob_get_data(cache_name, &mem_address, &size);
+		if (e) return e;
+
 		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
 	} else {
-		FILE *f = gf_fopen(cache_name, "rb");
+		f = gf_fopen(cache_name, "rb");
 		if (!f) return GF_IO_ERR;
 		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
 	}
@@ -4367,12 +4495,13 @@
 
 			if (needs_mov_range && (type==GF_ISOM_BOX_TYPE_MOOV )) {
 				GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
-				rep->segment_list->initialization_segment->byte_range->end_range = gf_bs_get_position(bs);
+				if (rep->segment_list->initialization_segment->byte_range)
+					rep->segment_list->initialization_segment->byte_range->end_range = gf_bs_get_position(bs);
 			}
 			continue;
 		}
 		gf_bs_seek(bs, gf_bs_get_position(bs)-8);
-		e = gf_dash_load_sidx(bs, rep, seperate_index, gf_bs_get_position(bs) );
+		e = gf_dash_load_sidx(bs, rep, separate_index, gf_bs_get_position(bs) );
 
 		/*we could also parse the sub sidx*/
 		break;
@@ -4386,11 +4515,12 @@
 {
 	*box_type = *box_size = 0;
 	if (!strncmp(cache_name, "gmem://", 7)) {
+		GF_Err e;
 		u32 size;
 		u8 *mem_address;
-		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_IO_ERR;
-		}
+		e = gf_blob_get_data(cache_name, &mem_address, &size);
+		if (e) return e;
+
 		if (offset+8 > size)
 			return GF_IO_ERR;
 		mem_address += offset;
@@ -4402,9 +4532,9 @@
 		if (!f) return GF_IO_ERR;
 		if (gf_fseek(f, offset, SEEK_SET))
 			return GF_IO_ERR;
-		if (fread(data, 1, 4, f) == 4) {
+		if (gf_fread(data, 4, f) == 4) {
 			*box_size = GF_4CC(data[0], data[1], data[2], data[3]);
-			if (fread(data, 1, 4, f) == 4) {
+			if (gf_fread(data, 4, f) == 4) {
 				*box_type = GF_4CC(data[0], data[1], data[2], data[3]);
 			}
 		}
@@ -4420,8 +4550,11 @@
 	GF_Err e = GF_OK;
 	char *init_url = NULL;
 	char *index_url = NULL;
+	GF_DASHFileIOSession *download_sess = &group->segment_download;
 	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
 
+	if (!group->dash->thread_mode) 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;
 		if (rep->segment_list || group->adaptation_set->segment_list || group->period->segment_list) return GF_OK;
@@ -4516,33 +4649,34 @@
 					sidx_file = (char *)init_url;
 				}
 			}
-			/*we need to download the init segement, at least partially*/
+			/*we need to download the init segment, at least partially*/
 			else {
 				u32 offset = 0;
 				u32 box_type = 0;
 				u32 box_size = 0;
+				u32 sidx_start = 0;
 				const char *cache_name;
 
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloading init segment and SIDX for representation %s\n", init_url));
 
 				/*download first 8 bytes and check if we do have a box starting there*/
-				e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, 7, 1, group);
+				e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, 7, 1, group);
 				if (e) goto exit;
-				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
 				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
 				offset = 8;
 				while (box_type) {
 					/*we got the moov, stop here */
 					if (!index_in_base && (box_type==GF_ISOM_BOX_TYPE_MOOV)) {
-						e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, offset+box_size-9, 2, group);
+						e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, offset+box_size-9, 2, group);
 						break;
 					} else {
 						const u32 offset_ori = offset;
-						e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
+						e = gf_dash_download_resource(group->dash, download_sess, init_url, offset, offset+box_size-1, 2, group);
 						if (e < 0) goto exit;
 						offset += box_size;
 						/*we need to refresh the cache name because of our memory astorage thing ...*/
-						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
 						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
 						if (e == GF_IO_ERR) {
 							/*if the socket was closed then gf_dash_download_resource() with gmem:// was reset - retry*/
@@ -4551,14 +4685,15 @@
 								offset -= 8;
 								/*FIXME sidx found, reload the full resource*/
 								GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] have to re-downloading init and SIDX for rep %s\n", init_url));
-								e = gf_dash_download_resource(group->dash, &(group->segment_download), init_url, 0, offset+box_size-1, 2, group);
+								e = gf_dash_download_resource(group->dash, download_sess, init_url, 0, offset+box_size-1, 2, group);
 								break;
 							}
 						}
 
-						if (box_type == GF_ISOM_BOX_TYPE_SIDX)
+						if (box_type == GF_ISOM_BOX_TYPE_SIDX) {
+							if (!sidx_start) sidx_start = offset;
 							has_seen_sidx = 1;
-						else if (has_seen_sidx)
+						} else if (has_seen_sidx)
 							break;
 					}
 				}
@@ -4577,7 +4712,7 @@
 				}
 				rep->segment_list->segment_URLs = gf_list_new();
 
-				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
 				if (init_in_base) {
 					char szName[100];
 					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
@@ -4585,42 +4720,50 @@
 						e = GF_OUT_OF_MEM;
 						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);
+						}
+					}
 					//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 ..
-					if (!strnicmp(cache_name, "gmem://", 7)) {
-						char *mem_address;
-						if (sscanf(cache_name, "gmem://%d@%p", &rep->playback.init_segment_size, &mem_address) != 2) {
-							e = GF_IO_ERR;
+					else if (!strnicmp(cache_name, "gmem://", 7)) {
+						u8 *mem_address;
+						e = gf_blob_get_data(cache_name, &mem_address, &rep->playback.init_segment.size);
+						if (e) {
 							goto exit;
 						}
-						rep->playback.init_segment_data = gf_malloc(sizeof(char) * rep->playback.init_segment_size);
-						memcpy(rep->playback.init_segment_data, mem_address, sizeof(char) * rep->playback.init_segment_size);
+						rep->playback.init_segment.data = gf_malloc(sizeof(char) * rep->playback.init_segment.size);
+						memcpy(rep->playback.init_segment.data, mem_address, sizeof(char) * rep->playback.init_segment.size);
 
-						sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
+						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;
 					} else {
 						FILE *t = gf_fopen(cache_name, "rb");
 						if (t) {
 							s32 res;
-							fseek(t, 0, SEEK_END);
-							rep->playback.init_segment_size = (u32) gf_ftell(t);
-							fseek(t, 0, SEEK_SET);
-
-							rep->playback.init_segment_data = gf_malloc(sizeof(char) * rep->playback.init_segment_size);
-							res = (s32) fread(rep->playback.init_segment_data, sizeof(char), rep->playback.init_segment_size, t);
-							if (res != rep->playback.init_segment_size) {
+							rep->playback.init_segment.size = (u32) gf_fsize(t);
+
+							rep->playback.init_segment.data = gf_malloc(sizeof(char) * rep->playback.init_segment.size);
+							res = (s32) gf_fread(rep->playback.init_segment.data, rep->playback.init_segment.size, t);
+							if (res != rep->playback.init_segment.size) {
 								GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to store init segment\n"));
 							} else if (rep->segment_list && rep->segment_list->initialization_segment) {
-								sprintf(szName, "gmem://%d@%p", rep->playback.init_segment_size, rep->playback.init_segment_data);
+								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;
 							}
 						}
 					}
-
-					cache_name = rep->segment_list->initialization_segment->sourceURL;
-					//cleanup cache right away
-					group->dash->dash_io->delete_cache_file(group->dash->dash_io, group->segment_download, init_url);
+					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) {
@@ -4630,9 +4773,9 @@
 		}
 		/*we have index url, download it*/
 		if (! index_in_base) {
-			e = gf_dash_download_resource(group->dash, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
+			e = gf_dash_download_resource(group->dash, download_sess, index_url, index_start_range, index_end_range, 1, group);
 			if (e) goto exit;
-			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, *download_sess);
 		}
 
 		/*load sidx*/
@@ -4642,6 +4785,11 @@
 			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);
+		}
+
 		/*reset all seg based stuff*/
 		if (rep->segment_base) {
 			gf_mpd_segment_base_free(rep->segment_base);
@@ -4679,11 +4827,11 @@
 	GF_MPD_Period *period;
 	GF_DASHFileIOSession xlink_sess=NULL;
 
-	gf_mx_p(dash->dash_mutex);
+	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)) {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return;
 	}
 	start = period->start;
@@ -4693,7 +4841,7 @@
 		//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);
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return;
 	}
 
@@ -4724,15 +4872,16 @@
 			if (strchr(purl, '?')) strcat(full_url, "&");
 			else strcat(full_url, "?");
 
+			//append the query string
 			strcat(full_url, dash->query_string);
+			//if =PID is given, replace by period ID
 			sep = strstr(dash->query_string, "=PID");
 			if (sep && period->ID) {
 				char *sep2 = strstr(full_url, "=PID");
-				if (sep2) sep2[1] = 0;
+				assert(sep2);
+				sep2[1] = 0;
 				strcat(full_url, period->ID);
 				strcat(full_url, sep+4);
-			} else {
-				strcat(full_url, dash->query_string);
 			}
 
 			/*use non-persistent connection for MPD*/
@@ -4749,7 +4898,7 @@
 		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;
-		gf_mx_v(dash->dash_mutex);
+		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;
@@ -4777,7 +4926,7 @@
 		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;
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (url) gf_free(url);
 		return;
 	}
@@ -4798,13 +4947,16 @@
 		gf_free(period->xlink_href);
 		period->xlink_href = NULL;
 		gf_mpd_del(new_mpd);
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		if (url) gf_free(url);
 		return;
 	}
 
 	gf_list_rem(period_list, period_idx);
 
+	if (dash->split_adaptation_set)
+		gf_mpd_split_adaptation_sets(new_mpd);
+
 	if (!period->duration) {
 		GF_MPD_Period *next_period = gf_list_get(period_list, period_idx);
 		if (next_period && next_period->start)
@@ -4845,7 +4997,7 @@
 
 	gf_mpd_del(new_mpd);
 
-	gf_mx_v(dash->dash_mutex);
+	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)
@@ -4928,7 +5080,7 @@
 	struct _dash_srd_desc *srd;
 	count = dash->SRDs ? gf_list_count(dash->SRDs) : 0;
 	for (i=0; i<count; i++) {
-		struct _dash_srd_desc *srd = gf_list_get(dash->SRDs, i);
+		srd = gf_list_get(dash->SRDs, i);
 		if (srd->id==srd_id) return srd;
 	}
 	if (!do_create) return NULL;
@@ -5016,7 +5168,9 @@
 			&& (gf_list_count(dash->groups)>1)
 		) {
 			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, 0);
-			if ((!rep->segment_template || !rep->segment_template->initialization) && (!rep->segment_list || !rep->segment_list->initialization_segment)) {
+			if ((!rep->segment_template || !rep->segment_template->initialization)
+				&& (!rep->segment_list || (!rep->segment_list->initialization_segment && !rep->segment_list->xlink_href))
+			) {
 				group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
 				continue;
 			}
@@ -5042,8 +5196,13 @@
 				}
 				if (res) {
 					group->srd_desc = gf_dash_get_srd_desc(dash, id, GF_TRUE);
-					group->srd_desc->srd_fw = w;
-					group->srd_desc->srd_fh = h;
+					if (!w) w = group->srd_x + group->srd_w;
+					if (!h) h = group->srd_y + group->srd_h;
+
+					if (w>group->srd_desc->srd_fw)
+						group->srd_desc->srd_fw = w;
+					if (h>group->srd_desc->srd_fh)
+						group->srd_desc->srd_fh = h;
 				}
 
 			} else {
@@ -5086,8 +5245,13 @@
 				}
 				if (res) {
 					group->srd_desc = gf_dash_get_srd_desc(dash, id, GF_TRUE);
-					group->srd_desc->srd_fw = w;
-					group->srd_desc->srd_fh = h;
+					if (!w) w = group->srd_x + group->srd_w;
+					if (!h) h = group->srd_y + group->srd_h;
+
+					if (w>group->srd_desc->srd_fw)
+						group->srd_desc->srd_fw = w;
+					if (h>group->srd_desc->srd_fh)
+						group->srd_desc->srd_fh = h;
 				}
 			}
 		}
@@ -5149,10 +5313,8 @@
 
 			if (rep_i) {
 				Bool ok;
-				char *sep;
 				if (rep->codecs && rep_sel->codecs) {
-
-					sep = strchr(rep_sel->codecs, '.');
+					char *sep = strchr(rep_sel->codecs, '.');
 					if (sep) sep[0] = 0;
 					ok = !strnicmp(rep->codecs, rep_sel->codecs, strlen(rep_sel->codecs) );
 					//check for scalable coding
@@ -5344,11 +5506,6 @@
 	return GF_OK;
 }
 
-static Bool gf_dash_is_seamless_period_switch(GF_DashClient *dash)
-{
-	return 0;
-}
-
 
 static void gf_dash_group_check_time(GF_DASH_Group *group)
 {
@@ -5407,26 +5564,44 @@
 
 static DownloadGroupStatus dash_download_group_download(GF_DashClient *dash, GF_DASH_Group *group, GF_DASH_Group *base_group, Bool has_dep_following);
 
+static GFINLINE void dash_set_min_wait(GF_DashClient *dash, u32 min_wait)
+{
+	if (!dash->min_wait_ms_before_next_request || (min_wait < dash->min_wait_ms_before_next_request)) {
+		dash->min_wait_ms_before_next_request = min_wait;
+		dash->min_wait_sys_clock = gf_sys_clock();
+	}
+}
 
 /*TODO decide what is the best, fetch from another representation or ignore ...*/
 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 = gf_sys_clock();
+	u32 clock_time;
 	Bool will_retry = GF_FALSE;
+	Bool is_live = GF_FALSE;
+	if (!dash || !group)
+		return GF_DASH_DownloadCancel;
+
+	clock_time = gf_sys_clock();
 
-	if (!dash->min_wait_ms_before_next_request || (dash->min_timeout_between_404 < dash->min_wait_ms_before_next_request))
-		dash->min_wait_ms_before_next_request = dash->min_timeout_between_404;
+	dash_set_min_wait(dash, dash->min_timeout_between_404);
 
 	group->retry_after_utc = dash->min_timeout_between_404 + gf_net_get_utc();
+	if (!group->period->origin_base_url && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC))
+		is_live = GF_TRUE;
 
 	if (e==GF_REMOTE_SERVICE_ERROR) {
-		group->done = 1;
+		gf_dash_mark_group_done(group);
+	}
+	//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) ) {
+		gf_dash_mark_group_done(group);
 	}
 	else if (group->maybe_end_of_stream) {
 		if (group->maybe_end_of_stream==2) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stopping playback\n", new_base_seg_url, gf_error_to_string(e)));
 			group->maybe_end_of_stream = 0;
-			group->done = 1;
+			gf_dash_mark_group_done(group);
 		}
 		group->maybe_end_of_stream++;
 	} else if (group->segment_in_valid_range) {
@@ -5437,7 +5612,7 @@
 			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"));
-			group->done = 1;
+			gf_dash_mark_group_done(group);
 		}
 		group->segment_in_valid_range=0;
 	} else if (group->prev_segment_ok && !group->time_at_first_failure) {
@@ -5455,22 +5630,28 @@
 		if (key_url) gf_free(key_url);
 		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 100ms safety
+	//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");
+			Bool is_loop = (val && !strcmp(val, "yes")) ? GF_TRUE : GF_FALSE;
 			//if explicit loop or more than 5 consecutive seg lost restart synchro
-			if ((group->nb_consecutive_segments_lost >= 5) || (val && !strcmp(val, "yes"))) {
+			if ((group->nb_consecutive_segments_lost >= 5) || is_loop) {
 				u32 i=0;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC loop detected, reseting timeline\n"));
+				if (is_loop) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] ATSC loop detected, reseting 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));
+				}
 				dash->utc_drift_estimate = 0;
+				dash->initial_period_tunein = GF_TRUE;
 				dash->atsc_clock_state = 1;
 				while ((group = gf_list_enum(dash->groups, &i))) {
 					group->start_number_at_last_ast = 0;
 					gf_dash_group_timeline_setup(dash->mpd, group, 0);
-					group->loop_detected = GF_TRUE;
+					group->loop_detected = is_loop;
 					group->time_at_first_failure = 0;
 					group->prev_segment_ok = GF_TRUE;
 				}
@@ -5480,7 +5661,7 @@
 			}
 		}
 		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));
+			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;
 		}
@@ -5489,18 +5670,17 @@
 		//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 (dash->min_wait_ms_before_next_request || (dash->min_wait_ms_before_next_request > 1000))
-				dash->min_wait_ms_before_next_request = 1000;
+			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)));
+			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 {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing in backward - start of playlist reached - assuming end of stream\n"));
-				group->done = 1;
+				gf_dash_mark_group_done(group);
 			}
 		}
 	}
@@ -5535,15 +5715,17 @@
 	u32 representation_index;
 	u32 clock_time, file_size=0, Bps=0;
 	Bool empty_file = GF_FALSE;
-	const char *base_url = NULL;
+	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;
 	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->selection != GF_DASH_GROUP_SELECTED) return GF_DASH_DownloadSuccess;
 
@@ -5586,12 +5768,12 @@
 
 				if (dyn_type==GF_MPD_TYPE_STATIC) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in static period (dynamic MPD) - group is done\n"));
-					group->done = 1;
+					gf_dash_mark_group_done(group);
 					return GF_DASH_DownloadCancel;
 				}
 				else if ((dyn_type==GF_MPD_TYPE_DYNAMIC) && group->period->duration) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in period (dynamic mode) - group is done\n"));
-					group->done = 1;
+					gf_dash_mark_group_done(group);
 					return GF_DASH_DownloadCancel;
 				}
 				else if (! group->maybe_end_of_stream) {
@@ -5620,13 +5802,13 @@
 					}
 
 					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", now - group->time_at_first_reload_required));
-					group->done = 1;
+					gf_dash_mark_group_done(group);
 					return GF_DASH_DownloadCancel;
 				}
 			} else {
 				/* 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"));
-				group->done = 1;
+				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);
 				return GF_DASH_DownloadCancel;
@@ -5655,8 +5837,7 @@
 
 		if (group->retry_after_utc > (u64) now) {
 			to_wait = (u32) (group->retry_after_utc - (u64) now);
-			if (!dash->min_wait_ms_before_next_request || ((u32) to_wait < dash->min_wait_ms_before_next_request))
-				dash->min_wait_ms_before_next_request = to_wait;
+			dash_set_min_wait(dash, (u32) to_wait);
 
 			return GF_DASH_DownloadCancel;
 		}
@@ -5664,15 +5845,24 @@
 		clock_time = gf_sys_clock();
 		to_wait = (s32) (segment_ast - now);
 
+		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));
+				to_wait = 0;
+			} else {
+				//we officially reached segment AST
+				group->force_early_fetch = GF_FALSE;
+			}
+		}
+
 		/*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)/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 (!dash->min_wait_ms_before_next_request || ((u32) to_wait < dash->min_wait_ms_before_next_request))
-				dash->min_wait_ms_before_next_request = to_wait;
+
+			dash_set_min_wait(dash, (u32) to_wait);
 
 			return GF_DASH_DownloadCancel;
 		} else {
@@ -5696,28 +5886,31 @@
 
 	if (e || !new_base_seg_url) {
 		if (e==GF_EOS) {
-			group->done = GF_TRUE;
+			gf_dash_mark_group_done(group);
 		} else {
 			/*do something!!*/
 			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);
 		return GF_DASH_DownloadCancel;
 	}
 	use_byterange = (start_range || end_range) ? 1 : 0;
 
 	if (use_byterange) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
+		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));
 	}
 
 	/*local file*/
-	if (!strstr(new_base_seg_url, "://") || (!strnicmp(new_base_seg_url, "file://", 7) || !strnicmp(new_base_seg_url, "gmem://", 7)) ) {
+	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;
-		gf_dash_buffer_off(group);
 		if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+			if (new_base_seg_url) gf_free(new_base_seg_url);
 			gf_dash_switch_group_representation(dash, group);
 			/*restart*/
 			return GF_DASH_DownloadRestart;
@@ -5729,19 +5922,21 @@
 				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));
 				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 {
-			gf_fseek(ftest, 0, SEEK_END);
-			file_size = (u32) gf_ftell(ftest);
+			file_size = (u32) gf_fsize(ftest);
 			gf_fclose(ftest);
 		}
 		group->current_base_url_idx = 0;
-	} else {
-		const char *hdr;
+	} else if (dash->thread_mode) {
 		base_group->max_bitrate = 0;
 		base_group->min_bitrate = (u32)-1;
 
@@ -5769,7 +5964,7 @@
 			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 too early ?\n", new_base_seg_url));
+				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));
 			}
 			group->time_at_first_failure = 0;
 		}
@@ -5806,14 +6001,18 @@
 		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;
+		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 )) {
-		gf_mx_p(group->cache_mutex);
+	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);
@@ -5823,8 +6022,13 @@
 
 			cache_entry->cache = gf_strdup(local_file_name);
 			cache_entry->url = gf_strdup( resource_name );
-			cache_entry->start_range = 0;
-			cache_entry->end_range = 0;
+			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;
@@ -5844,9 +6048,9 @@
 			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++;
-			gf_dash_update_buffering(group, dash);
 		}
-		dash_store_stats(dash, group, Bps, file_size, rep->playback.broadcast_flag);
+		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) {
@@ -5862,7 +6066,7 @@
 				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"));
-				group->done = 1;
+				gf_dash_mark_group_done(group);
 			}
 			group->has_pending_enhancement = GF_FALSE;
 		}
@@ -5874,7 +6078,7 @@
 			}
 		}
 
-		gf_mx_v(group->cache_mutex);
+		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
@@ -5931,7 +6135,7 @@
 	Bool force_rep_idx = GF_FALSE;
 	Bool local_file_mode = GF_FALSE;
 	GF_MPD_Representation *rep, *rep_new;
-	u32 total_rate, bandwidths[20], groups_per_quality[20], max_level;
+	u32 total_rate, max_fsize, 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;
 
@@ -5940,6 +6144,7 @@
 	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
@@ -5954,9 +6159,14 @@
 		GF_DASH_Group *group = gf_list_get(dash->groups, i);
 		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
 		if (group->local_files) local_files ++;
-		if (!group->bytes_per_sec) continue;
+		if (!group->bytes_per_sec) {
+			if (!for_postponed_only && !dash->thread_mode)
+				return;
+			continue;
+		}
 		if (group->done) continue;
 
+		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) {
 			u32 j;
@@ -5969,16 +6179,21 @@
 				}
 			}
 		} else {
-			//keep min rate to perform rate adaptation
-			if (total_rate > group->bytes_per_sec)
-				total_rate = group->bytes_per_sec;
+			//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;
+				}
+			}
 		}
 	}
 	if (total_rate == (u32) -1) {
 		total_rate = 0;
 	}
 	if (local_files==count) {
-		total_rate = dash->dash_io->get_bytes_per_sec(dash->dash_io, NULL);
+		total_rate = dash->dash_io->get_bytes_per_sec ? dash->dash_io->get_bytes_per_sec(dash->dash_io, NULL) : 0;
 		if (!total_rate) local_file_mode = GF_TRUE;
 	} else if (!total_rate) {
 		return;
@@ -6153,10 +6368,8 @@
 				dash_do_rate_adaptation(dash, group);
 		} else {
 			dash_do_rate_adaptation(dash, group);
-
-			if (!group->rate_adaptation_postponed)
-				group->bytes_per_sec = 0;
 		}
+		group->bytes_per_sec = group->backup_Bps;
 	}
 }
 
@@ -6164,7 +6377,7 @@
 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;
 
 	while (1) {
@@ -6178,38 +6391,27 @@
 	return 0;
 }
 
-static u32 dash_main_thread_proc(void *par)
+
+static GF_Err dash_setup_period_and_groups(GF_DashClient *dash)
 {
+	u32 i, group_count;
 	GF_Err e;
-	GF_DashClient *dash = (GF_DashClient*) par;
-	u32 i, group_count, ret = 0;
-	Bool go_on = GF_TRUE;
-	Bool first_period_in_mpd = GF_TRUE;
-
-	assert(dash);
-	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 */
-	gf_mx_p(dash->dash_mutex);
-	dash->dash_state = GF_DASH_STATE_SETUP;
-	gf_mx_v(dash->dash_mutex);
-	dash->in_period_setup = 1;
+	//don't resetup the entire period, only the broken group(s) ...
+	if (!dash->period_groups_setup) {
+		/*setup period*/
+		e = gf_dash_setup_period(dash);
+		if (e) {
+			//move to stop state before sending the error event otherwise we might deadlock when disconnecting the dash client
+			dash->dash_state = GF_DASH_STATE_STOPPED;
+			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
+			return e;
+		}
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, -1, GF_OK);
 
-	/*setup period*/
-	e = gf_dash_setup_period(dash);
-	if (e) {
-		//move to stop state before sending the error event otherwise we might deadlock when disconnecting the dash client
-		dash->dash_state = GF_DASH_STATE_STOPPED;
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
-		ret = 1;
-		goto exit;
+		dash->period_groups_setup = GF_TRUE;
+		dash->all_groups_done_notified = GF_FALSE;
 	}
-	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, -1, GF_OK);
 
 	e = GF_OK;
 	group_count = gf_list_count(dash->groups);
@@ -6218,291 +6420,390 @@
 		if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE)
 			continue;
 
-		//by default all groups are started (init seg download and buffering). They will be (de)selected by the user
-		if (first_period_in_mpd) {
-			gf_dash_buffer_on(group);
-		}
-		gf_mx_p(group->cache_mutex);
+		if (group->group_setup) continue;
+
+		if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 		e = gf_dash_download_init_segment(dash, group);
-		gf_mx_v(group->cache_mutex);
+
+		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+		//might happen with broadcast DASH (eg ATSC3)
 		if (e == GF_IP_NETWORK_EMPTY) {
-			gf_dash_buffer_off(group);
 			if (dash->mpd_stop_request)
-				goto exit;
+				return GF_OK;
 
 			if (dash->reinit_period_index) {
 				gf_dash_reset_groups(dash);
 				dash->active_period_index = dash->reinit_period_index-1;
 				dash->reinit_period_index = 0;
-				goto restart_period;
+				dash->period_groups_setup = GF_FALSE;
+				return dash_setup_period_and_groups(dash);
 			}
 
-			gf_sleep(30);
-			i--;
-			continue;
+			return e;
 		}
+		group->group_setup = GF_TRUE;
 		if (e) break;
 	}
-	first_period_in_mpd = 0;
+	dash->initial_period_tunein = GF_FALSE;
 
 	/*if error signal to the user*/
 	if (e != GF_OK) {
 		//move to stop state before sending the error event otherwise we might deadlock when disconnecting the dash client
 		dash->dash_state = GF_DASH_STATE_STOPPED;
 		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
-		ret = 1;
-		goto exit;
+		return e;
 	}
 
+	return GF_OK;
+}
 
-	dash->last_update_time = gf_sys_clock();
+static void dash_do_groups(GF_DashClient *dash)
+{
+	GF_Err e;
+	u32 i, group_count = gf_list_count(dash->groups);
 
-	gf_mx_p(dash->dash_mutex);
-	dash->dash_state = GF_DASH_STATE_CONNECTING;
-	gf_mx_v(dash->dash_mutex);
+	dash->min_wait_ms_before_next_request = 0;
+
+	/*for each selected groups*/
+	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) {
+				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;
+		}
 
-	/*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) {
-		ret = 1;
-		goto exit;
+		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;
+		}
 	}
-	if (dash->mpd_stop_request) {
-		ret = 1;
-		goto exit;
+
+	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;
+			}
+		}
+		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);
+}
 
-	gf_mx_p(dash->dash_mutex);
-	dash->in_period_setup = 0;
-	dash->dash_state = GF_DASH_STATE_RUNNING;
-	gf_mx_v(dash->dash_mutex);
+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;
+	Bool has_postponed_rate_adaptation;
 
-	dash->min_wait_ms_before_next_request = 0;
-	while (go_on) {
-		Bool has_postponed_rate_adaptation = GF_FALSE;
+	(*cache_is_full) = GF_TRUE;
+	has_postponed_rate_adaptation = GF_FALSE;
 
-		/*wait until next segment is needed*/
-		while (!dash->mpd_stop_request) {
-			Bool all_groups_done_notified = GF_FALSE;
-			u32 timer = gf_sys_clock() - dash->last_update_time;
+	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));
+		}
+		dash->force_mpd_update = 0;
 
-			/*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));
-				}
-				dash->force_mpd_update = 0;
-
-				gf_mx_p(dash->dash_mutex);
-				e = gf_dash_update_manifest(dash);
-				gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
+		e = gf_dash_update_manifest(dash);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 
-				group_count = gf_list_count(dash->groups);
-				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));
-				}
-			} else {
-				Bool all_groups_done = GF_TRUE;
-				Bool cache_full = GF_TRUE;
+		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));
+		}
+	} else {
+		Bool all_groups_done = GF_TRUE;
+		Bool cache_full = GF_TRUE;
 
-				has_postponed_rate_adaptation = GF_FALSE;
+		has_postponed_rate_adaptation = GF_FALSE;
 
-				/*wait if nothing is ready to be downloaded*/
-				if (dash->min_wait_ms_before_next_request > 1) {
-					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);
-				}
-
-				/*check if cache is not full*/
-				dash->tsb_exceeded = 0;
-				dash->time_in_tsb = 0;
-				for (i=0; i<group_count; i++) {
-					GF_MPD_Type dyn_type = dash->mpd->type;
-					GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		/*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 (group->period->origin_base_url) dyn_type = group->period->type;
+		/*check if cache is not full*/
+		dash->tsb_exceeded = 0;
+		dash->time_in_tsb = 0;
+		for (i=0; i<group_count; i++) {
+			GF_MPD_Type type = dash->mpd->type;
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
 
-					gf_mx_p(group->cache_mutex);
+			if (group->period->origin_base_url)
+				type = group->period->type;
 
-					if ((group->selection != GF_DASH_GROUP_SELECTED)
-						|| group->depend_on_group
-						|| (group->done && !group->nb_cached_segments)
-					) {
-						gf_mx_v(group->cache_mutex);
-						continue;
-					}
-					all_groups_done = 0;
-					if (!group->done && (dyn_type==GF_MPD_TYPE_DYNAMIC) ) {
-						gf_dash_group_check_time(group);
-					}
-					//cache is full, notify client some segments are pending
-					if ((group->nb_cached_segments == group->max_cached_segments)
-						&& !dash->request_period_switch
-						&& !group->has_pending_enhancement
-					) {
-						dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
-					}
-					if (group->done && group->nb_cached_segments)
-					{
-						dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
-					}
+			if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
-					if (group->nb_cached_segments<group->max_cached_segments) {
-						cache_full = 0;
-					}
-					if (group->rate_adaptation_postponed)
-						has_postponed_rate_adaptation = GF_TRUE;
+			if ((group->selection != GF_DASH_GROUP_SELECTED)
+				|| group->depend_on_group
+				|| (group->done && !group->nb_cached_segments)
+			) {
+				if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+				continue;
+			}
+			all_groups_done = 0;
+			if (type==GF_MPD_TYPE_DYNAMIC) {
+				gf_dash_group_check_time(group);
+			}
+			//cache is full, notify client some segments are pending
+			if ((group->nb_cached_segments == group->max_cached_segments)
+				&& !dash->request_period_switch
+				&& !group->has_pending_enhancement
+			) {
+				dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
+			}
+			if (group->done && group->nb_cached_segments) {
+				dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, i, GF_OK);
+			}
 
-					gf_mx_v(group->cache_mutex);
-					if (!cache_full)
-						break;
-				}
+			if (group->nb_cached_segments<group->max_cached_segments) {
+				cache_full = 0;
+			}
+			if (group->rate_adaptation_postponed)
+				has_postponed_rate_adaptation = GF_TRUE;
 
-				if (dash->tsb_exceeded) {
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_TIMESHIFT_OVERFLOW, (s32) dash->tsb_exceeded, GF_OK);
-					dash->tsb_exceeded = 0;
-				} else if (dash->time_in_tsb != dash->prev_time_in_tsb) {
-					dash->prev_time_in_tsb = dash->time_in_tsb;
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_TIMESHIFT_UPDATE, 0, GF_OK);
-				}
+			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+			if (!cache_full)
+				break;
+		}
 
+		if (dash->tsb_exceeded) {
+			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_TIMESHIFT_OVERFLOW, (s32) dash->tsb_exceeded, GF_OK);
+			dash->tsb_exceeded = 0;
+		} else if (dash->time_in_tsb != dash->prev_time_in_tsb) {
+			dash->prev_time_in_tsb = dash->time_in_tsb;
+			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_TIMESHIFT_UPDATE, 0, GF_OK);
+		}
 
-				if (!cache_full) break;
 
-				//seek request
-				if (dash->request_period_switch==2) all_groups_done = 1;
+		if (!cache_full) {
+			(*cache_is_full) = GF_FALSE;
+		} else {
+			//seek request
+			if (dash->request_period_switch==2) all_groups_done = 1;
 
-				if (all_groups_done && dash->next_period_checked) {
-					dash->next_period_checked = 1;
-					//check if we can continue next period with the same groups
-					if (gf_dash_is_seamless_period_switch(dash)) {
-						all_groups_done = 0;
-					}
-				}
-				if (all_groups_done && dash->request_period_switch) {
-					gf_dash_reset_groups(dash);
-					if (dash->request_period_switch == 1) {
-						if (dash->speed<0) {
-							if (dash->active_period_index) {
-								dash->active_period_index--;
-							}
-						} else {
-							dash->active_period_index++;
+			if (all_groups_done && dash->next_period_checked) {
+				dash->next_period_checked = 1;
+			}
+			if (all_groups_done && dash->request_period_switch) {
+				gf_dash_reset_groups(dash);
+				if (dash->request_period_switch == 1) {
+					if (dash->speed<0) {
+						if (dash->active_period_index) {
+							dash->active_period_index--;
 						}
+					} else {
+						dash->active_period_index++;
 					}
+				}
 
-					dash->request_period_switch = 0;
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switching to period #%d\n", dash->active_period_index+1));
-					goto restart_period;
-				}
-				if (!all_groups_done)
-					dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CACHE_FULL, 0, GF_OK);
-				else if (!all_groups_done_notified) {
-					all_groups_done_notified = GF_TRUE;
+				(*cache_is_full) = GF_FALSE;
+				dash->request_period_switch = 0;
+				dash->period_groups_setup = GF_FALSE;
+				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->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);
 				}
-				gf_sleep(30);
+
+			} else {
+				(*cache_is_full) = GF_TRUE;
+				return GF_OK;
 			}
 		}
+	}
 
-		/* stop the thread if requested */
-		if (dash->mpd_stop_request) {
-			break;
-		}
+	if (!dash->mpd_stop_request && has_postponed_rate_adaptation) {
+		dash_global_rate_adaptation(dash, GF_TRUE);
+	}
+	return GF_OK;
+}
 
-		dash->min_wait_ms_before_next_request = 0;
+static GF_Err gf_dash_process_internal(GF_DashClient *dash)
+{
+	GF_Err e;
+	Bool cache_is_full;
+	if (dash->mpd_stop_request) return GF_EOS;
+
+	switch (dash->dash_state) {
+	case GF_DASH_STATE_SETUP:
+		dash->in_period_setup = 1;
+		e = dash_setup_period_and_groups(dash);
+		if (e) return e;
+
+		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;
 
-		if (has_postponed_rate_adaptation) {
-			dash_global_rate_adaptation(dash, GF_TRUE);
+	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:
+		e = dash_check_mpd_update_and_cache(dash, &cache_is_full);
+		if (e || cache_is_full) {
+			return GF_OK;
 		}
+		if (dash->dash_state == GF_DASH_STATE_SETUP)
+			return GF_OK;
 
 		dash->initial_period_tunein = GF_FALSE;
+		dash_do_groups(dash);
+		return GF_OK;
+	case GF_DASH_STATE_STOPPED:
+		return GF_EOS;
+	}
+	return GF_OK;
+}
 
-		/*for each selected groups*/
-		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) {
-					gf_dash_group_reset(dash, group);
-				}
-				group->download_th_done = GF_TRUE;
-				continue;
-			}
+GF_Err gf_dash_process(GF_DashClient *dash)
+{
+	if (dash->thread_mode) return GF_BAD_PARAM;
+	return gf_dash_process_internal(dash);
+}
 
-			if (group->depend_on_group) continue;
-			//not yet scheduled for download
-			if (group->rate_adaptation_postponed) {
-				group->download_th_done = GF_TRUE;
-				continue;
-			}
+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->use_threaded_download) {
-				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;
-			}
-		}
+	if (!dash)
+		return 0;
 
-		while (dash->use_threaded_download) {
-			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 (!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;
+	}
 
-				if (!group->download_th_done) {
-					all_done = GF_FALSE;
-					break;
-				}
-			}
-			if (all_done)
-				break;
-			gf_sleep(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);
 		}
 
-		dash_global_rate_adaptation(dash, GF_FALSE);
+		/* stop the thread if requested */
+		if (dash->mpd_stop_request) {
+			break;
+		}
+		dash_do_groups(dash);
 	}
 
 exit:
 	/* Signal that the download thread has ended */
-	gf_mx_p(dash->dash_mutex);
+	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;
-	gf_mx_v(dash->dash_mutex);
+	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)
 {
-	u32 i, count;
+	u32 i, count, active_period_plus_one;
 	u64 cumul_start = 0;
 	Bool is_dyn = GF_FALSE;
 	GF_MPD_Period *period;
@@ -6526,22 +6827,24 @@
 restart:
 	count = gf_list_count(dash->mpd->periods);
 	cumul_start = 0;
+	active_period_plus_one = 0;
 	for (i = 0; i<count; i++) {
 		period = gf_list_get(dash->mpd->periods, i);
 
 		if (period->xlink_href && !period->duration) {
-			gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
-			goto restart;
+			if (!active_period_plus_one || period->xlink_actuate_on_load) {
+				gf_dash_solve_period_xlink(dash, dash->mpd->periods, i);
+				goto restart;
+			}
 		}
 
 		if ((period->start > time) || (cumul_start > time)) {
-			break;
-		}
-
-		cumul_start += period->duration;
+		} else {
+			cumul_start += period->duration;
 
-		if (time < cumul_start) {
-			break;
+			if (!active_period_plus_one && (time < cumul_start)) {
+				active_period_plus_one = i+1;
+			}
 		}
 	}
 	if (is_dyn) {
@@ -6550,42 +6853,46 @@
 			if (!period->xlink_href && !period->origin_base_url) return i;
 		}
 	}
-	return (i>=1 ? (i-1) : 0);
+	return active_period_plus_one ? active_period_plus_one-1 : 0;
 }
 
 static void gf_dash_download_stop(GF_DashClient *dash)
 {
 	u32 i;
 	assert(dash);
-	gf_mx_p(dash->dash_mutex);
+	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) {
-				if (group->segment_download)
-					dash->dash_io->abort(dash->dash_io, group->segment_download);
-				group->done = 1;
+				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;
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		while (1) {
 			/* waiting for the download thread to stop */
-			gf_mx_p(dash->dash_mutex);
+			if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 			if (dash->dash_state == GF_DASH_STATE_STOPPED) {
 				/* it's stopped we can continue */
-				gf_mx_v(dash->dash_mutex);
+				if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 				break;
 			}
-			gf_mx_v(dash->dash_mutex);
+			if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		}
 	} else {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	}
 	dash->mpd_stop_request = GF_TRUE;
 }
@@ -6603,7 +6910,7 @@
 	Bool at_period_boundary=GF_FALSE;
 	u32 i, period_idx;
 	u32 nb_retry = 10;
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 
 	dash->start_range_period = 0;
 	start_time = 0;
@@ -6648,17 +6955,19 @@
 		at_period_boundary = GF_TRUE;
 	}
 
-	gf_mx_v(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	if (at_period_boundary) return GF_TRUE;
 	return dash->request_period_switch ? 1 : 0;
 }
 
 static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group, Double seek_to, Bool is_dynamic)
 {
-	GF_Err e = GF_OK;
+	GF_Err e;
 	u32 first_downloaded, last_downloaded, segment_idx, orig_idx;
 
-	gf_mx_p(group->cache_mutex);
+	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) {
@@ -6679,7 +6988,7 @@
 		}
 		/*we are seeking in our download range, just go on*/
 		if ((segment_idx>=first_downloaded) && (segment_idx<=last_downloaded)) {
-			gf_mx_v(group->cache_mutex);
+			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 			return;
 		}
 
@@ -6710,15 +7019,15 @@
 		group->segment_download = NULL;
 	}
 	while (group->nb_cached_segments) {
-		group->nb_cached_segments --;
+		group->nb_cached_segments--;
 		if (!dash->keep_files && !group->local_files && !group->segment_must_be_streamed)
-			gf_delete_file(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->done = 0;
 
-	gf_mx_v(group->cache_mutex);
+	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 }
 
 GF_EXPORT
@@ -6726,20 +7035,19 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
 	if (!group) return;
-	gf_mx_p(dash->dash_mutex);
+	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);
-	gf_mx_v(dash->dash_mutex);
+	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;
 
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 
 	if (dash->active_period_index) {
 		Double dur = 0;
-		u32 i;
 		for (i=0; i<dash->active_period_index; i++) {
 			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, dash->active_period_index-1);
 			dur += period->duration/1000.0;
@@ -6751,7 +7059,7 @@
 		gf_dash_seek_group(dash, group, seek_time, is_dynamic);
 	}
 
-	gf_mx_v(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 
@@ -6761,9 +7069,15 @@
 	GF_DASHFileIOSession *sess;
 	GF_DashClient *dash = (GF_DashClient*) getter->udta;
 	if (!getter->session) {
-		sess = dash->dash_io->create(dash->dash_io, 1, url, -1);
-		if (!sess) return GF_IO_ERR;
-		getter->session = sess;
+		if (!dash->mpd_dnload || (dash->thread_mode!=GF_DASH_THREAD_NONE)) {
+			sess = dash->dash_io->create(dash->dash_io, 1, url, -1);
+			if (!sess) return GF_IO_ERR;
+			getter->session = sess;
+			e = GF_OK;
+		} else {
+			sess = getter->session = dash->mpd_dnload;
+			e = dash->dash_io->setup_from_url(dash->dash_io, getter->session, url, -1);
+		}
 	}
 	else {
 		u32 group_idx = -1, i;
@@ -6781,7 +7095,9 @@
 		}
 		sess = (GF_DASHFileIOSession *)getter->session;
 	}
-	e = dash->dash_io->init(dash->dash_io, sess);
+	if (!e)
+		e = dash->dash_io->init(dash->dash_io, sess);
+
 	if (e) {
 		dash->dash_io->del(dash->dash_io, sess);
 		if (getter->session == sess)
@@ -6846,7 +7162,7 @@
 		if (strstr(manifest_url, ".m3u8")) {
 			dash->is_m3u8 = GF_TRUE;
 		}
-	} else if (strstr(manifest_url, "://")) {
+	} else if (strstr(manifest_url, "://") && strncmp(manifest_url, "gfio://", 7)) {
 		const char *reloc_url, *mtype;
 		char mime[128];
 		e = gf_dash_download_resource(dash, &(dash->mpd_dnload), manifest_url, 0, 0, 1, NULL);
@@ -6894,7 +7210,7 @@
 			dash->is_m3u8 = 1;
 	}
 
-	if (is_local) {
+	if (is_local && strncmp(manifest_url, "gfio://", 7)) {
 		FILE *f = gf_fopen(local_url, "rt");
 		if (!f) {
 			sep_cgi = strrchr(local_url, '?');
@@ -6913,6 +7229,8 @@
 	}
 	dash->mpd_fetch_time = dash_get_fetch_time(dash);
 
+	gf_dash_reset_groups(dash);
+
 	if (dash->mpd)
 		gf_mpd_del(dash->mpd);
 
@@ -6927,19 +7245,23 @@
 		if (is_local) {
 			char *sep;
 			strcpy(local_path, local_url);
-			sep = strrchr(local_path, '.');
+			sep = gf_file_ext_start(local_path);
 			if (sep) sep[0]=0;
 			strcat(local_path, ".mpd");
 
-			e = gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE, dash->keep_files, 0);
+			e = gf_m3u8_to_mpd(local_url, manifest_url, local_path, 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);
 		} else {
 			const char *redirected_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
 			if (!redirected_url) redirected_url=manifest_url;
 
-			e = gf_m3u8_to_mpd(local_url, redirected_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter, dash->mpd, GF_FALSE, dash->keep_files, 0);
+			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);
 		}
 	} else {
-		if (!dash->is_smooth && !gf_dash_check_mpd_root_type(local_url)) {
+		u32 res = gf_dash_check_mpd_root_type(local_url);
+		if (res==2) {
+			dash->is_smooth = 1;
+		}
+		if (!dash->is_smooth && !res) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: wrong file type %s\n", local_url));
 			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
 			dash->mpd_dnload = NULL;
@@ -6970,6 +7292,9 @@
 		}
 		gf_xml_dom_del(mpd_parser);
 
+		if (!e && dash->split_adaptation_set)
+			gf_mpd_split_adaptation_sets(dash->mpd);
+
 		if (dash->ignore_xlink)
 			dash_purge_xlink(dash->mpd);
 
@@ -6989,6 +7314,7 @@
 		goto exit;
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH client initialized from MPD at UTC time "LLU" - availabilityStartTime "LLU"\n", dash->mpd_fetch_time , dash->mpd->availabilityStartTime));
+
 	if (is_local && dash->mpd->minimum_update_period) {
 		e = gf_dash_update_manifest(dash);
 		if (e != GF_OK) {
@@ -7010,13 +7336,19 @@
 		goto exit;
 	}
 
+	dash->dash_state = GF_DASH_STATE_SETUP;
 	dash->mpd_stop_request = 0;
-	e = gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
+	if (dash->thread_mode) {
+		return gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
+	} else {
+		return GF_OK;
+	}
 
-	return e;
 exit:
-	dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-	dash->mpd_dnload = NULL;
+	if (dash->dash_io) {
+		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+		dash->mpd_dnload = NULL;
+	}
 
 	if (dash->mpd)
 		gf_mpd_del(dash->mpd);
@@ -7028,20 +7360,24 @@
 void gf_dash_close(GF_DashClient *dash)
 {
 	assert(dash);
-	gf_dash_download_stop(dash);
 
-	gf_mx_p(dash->dash_mutex);
-	if (dash->mpd_dnload) {
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
+	if (dash->dash_io) {
+		gf_dash_download_stop(dash);
+		if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
+		if (dash->mpd_dnload) {
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+		}
+
+		if (dash->getter.del_session)
+			dash->getter.del_session(&dash->getter);
+
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	}
-	gf_mpd_getter_del_session(&dash->getter);
 	if (dash->mpd)
 		gf_mpd_del(dash->mpd);
 	dash->mpd = NULL;
 
-	gf_mx_v(dash->dash_mutex);
-
 	if (dash->dash_state != GF_DASH_STATE_CONNECTING)
 		gf_dash_reset_groups(dash);
 }
@@ -7078,30 +7414,38 @@
 }
 
 GF_EXPORT
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, Bool enable_buffering, u32 initial_time_shift_percent)
+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)
 {
 	GF_DashClient *dash;
+	if (!dash_io) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create client withou sync IO for HTTP\n"));
+		return NULL;
+	}
+
 	GF_SAFEALLOC(dash, GF_DashClient);
 	if (!dash) return NULL;
 	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;
-	dash->dash_thread = gf_th_new("DashClientMainThread");
-	dash->dash_mutex = gf_mx_new("DashClientMainMutex");
+	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" );
 
 	dash->max_cache_duration = max_cache_duration;
-	dash->enable_buffering = enable_buffering;
 	dash->initial_time_shift_value = initial_time_shift_percent;
 
 	dash->auto_switch_count = auto_switch_count;
 	dash->keep_files = keep_files;
 	dash->disable_switching = disable_switching;
 	dash->first_select_mode = first_select_mode;
-	dash->idle_interval = 1000;
 	dash->min_timeout_between_404 = 500;
 	dash->segment_lost_after_ms = 100;
 	dash->debug_group_index = -1;
@@ -7109,16 +7453,27 @@
 	dash->atsc_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;
 }
 
 GF_EXPORT
 void gf_dash_del(GF_DashClient *dash)
 {
+	//force group cleanup
+	dash->dash_state = GF_DASH_STATE_STOPPED;
 	gf_dash_close(dash);
-
-	gf_th_del(dash->dash_thread);
-	gf_mx_del(dash->dash_mutex);
+	if (dash->dash_thread)
+		gf_th_del(dash->dash_thread);
+	if (dash->dash_mutex) gf_mx_del(dash->dash_mutex);
 
 	if (dash->mimeTypeForM3U8Segments) gf_free(dash->mimeTypeForM3U8Segments);
 	if (dash->base_url) gf_free(dash->base_url);
@@ -7127,12 +7482,6 @@
 }
 
 GF_EXPORT
-void gf_dash_set_idle_interval(GF_DashClient *dash, u32 idle_time_ms)
-{
-	dash->idle_interval = idle_time_ms;
-}
-
-GF_EXPORT
 void gf_dash_enable_utc_drift_compensation(GF_DashClient *dash, Bool estimate_utc_drift)
 {
 	dash->estimate_utc_drift = estimate_utc_drift;
@@ -7194,11 +7543,9 @@
 GF_EXPORT
 void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source)
 {
-	GF_MPD_ProgramInfo *info = gf_list_get(dash->mpd->program_infos, 0);
-	if (info) {
-		*title = info->title;
-		*source = info->source;
-	}
+	GF_MPD_ProgramInfo *info = dash ? gf_list_get(dash->mpd->program_infos, 0) : NULL;
+	if (title) *title = info ? info->title : NULL;
+	if (source) *source = info ? info->source : NULL;
 }
 
 
@@ -7245,7 +7592,7 @@
 		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);
 
-			gf_mx_p(group->cache_mutex);
+			if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
 			group->force_switch_bandwidth = 1;
 			if (!group->base_rep_index_plus_one)
@@ -7276,11 +7623,10 @@
 					for remote, we should let the user decide*/
 					while (group->nb_cached_segments > keep_seg_index + 1) {
 						group->nb_cached_segments--;
-						gf_dash_update_buffering(group, dash);
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
+						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_delete_file( 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]);
 
@@ -7308,11 +7654,10 @@
 						while (group->nb_cached_segments > keep_seg_index + 1) {
 							Bool decrease_download_segment_index = (group->cached[group->nb_cached_segments-1].representation_index == current_idx) ? GF_TRUE : GF_FALSE;
 							group->nb_cached_segments--;
-							gf_dash_update_buffering(group, dash);
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
+							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_delete_file( 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]);
@@ -7333,8 +7678,7 @@
 							if (group->cached[k].representation_index != current_idx)
 								continue;
 							group->nb_cached_segments--;
-							gf_dash_update_buffering(group, dash);
-							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[k].url));
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Group %d switching quality - delete cached segment: %s\n", i, group->cached[k].url));
 							if (k != group->nb_cached_segments) {
 								memmove(&group->cached[k], &group->cached[k+1], (group->nb_cached_segments-k)*sizeof(segment_cache_entry));
 							}
@@ -7349,7 +7693,7 @@
 			if (group->srd_desc)
 				gf_dash_set_tiles_quality(dash, group->srd_desc);
 
-			gf_mx_v(group->cache_mutex);
+			if (group->cache_mutex) gf_mx_v(group->cache_mutex);
 		}
 	}
 }
@@ -7483,13 +7827,12 @@
 {
 	u32 i, len;
 	s32 lang_idx;
-	char *sep;
 	GF_List *groups_selected;
 	if (!lang_code_rfc_5646) return;
 
 	groups_selected = gf_list_new();
 
-	gf_mx_p(dash->dash_mutex);
+	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++) {
@@ -7509,6 +7852,7 @@
 		const char *n3cc = gf_lang_get_3cc(lang_idx);
 
 		for (i=0; i<gf_list_count(dash->groups); i++) {
+			char *sep;
 			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;
@@ -7546,7 +7890,7 @@
 		}
 	}
 
-	gf_mx_v(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 
 	gf_list_del(groups_selected);
 }
@@ -7554,7 +7898,16 @@
 GF_EXPORT
 Bool gf_dash_is_running(GF_DashClient *dash)
 {
-	return (dash->dash_state==GF_DASH_STATE_STOPPED) ? 0 : 1;
+	return (dash->dash_state==GF_DASH_STATE_STOPPED) ? GF_FALSE : GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_dash_is_in_setup(GF_DashClient *dash)
+{
+	if (dash->dash_state==GF_DASH_STATE_SETUP) return GF_TRUE;
+	if (dash->dash_state==GF_DASH_STATE_CONNECTING) return GF_TRUE;
+	if (dash->request_period_switch) return GF_TRUE;
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -7571,7 +7924,17 @@
 GF_EXPORT
 Bool gf_dash_in_last_period(GF_DashClient *dash, Bool check_eos)
 {
-	Bool res = (dash->active_period_index+1 < gf_list_count(dash->mpd->periods)) ? 0 : 1;
+	Bool res;
+
+	switch (dash->dash_state) {
+	case GF_DASH_STATE_SETUP:
+	case GF_DASH_STATE_CONNECTING:
+		return GF_FALSE;
+	default:
+		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) {
@@ -7593,6 +7956,9 @@
 {
 	u32 i;
 	if (!dash) return;
+	if (!speed) speed = 1.0;
+	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_MPD_Representation *active_rep;
@@ -7628,6 +7994,8 @@
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playing at %f speed \n", speed));
 		dash->speed = speed;
+		dash->is_rt_speed = (ABS(speed - 1.0)<0.1) ? GF_TRUE : GF_FALSE;
+
 	}
 }
 
@@ -7636,7 +8004,8 @@
 u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx)
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return group->max_cached_segments;
+	if (group) return group->max_cached_segments;
+	return 0;
 }
 
 
@@ -7646,23 +8015,24 @@
 	u32 res = 0;
 	GF_DASH_Group *group;
 
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
-	gf_mx_p(group->cache_mutex);
-
-	*group_is_done = 0;
 	if (!group) {
 		*group_is_done = 1;
-	} else {
-		*group_is_done = group->done;
-		res = group->nb_cached_segments;
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
+		return 0;
+	}
+	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
-		if (group->buffering) {
-			res = 0;
-		}
+	*group_is_done = group->done;
+	res = group->nb_cached_segments;
+
+	if (group->buffering) {
+		res = 0;
 	}
-	gf_mx_v(group->cache_mutex);
-	gf_mx_v(dash->dash_mutex);
+
+	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	return res;
 }
 
@@ -7672,14 +8042,14 @@
 	GF_DASH_Group *group;
 	Bool delete_next;
 
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
-	gf_mx_p(group->cache_mutex);
+	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
 discard_segment:
 	if (!group->nb_cached_segments) {
-		gf_mx_v(group->cache_mutex);
-		gf_mx_v(dash->dash_mutex);
+		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;
@@ -7722,8 +8092,8 @@
 			goto discard_segment;
 	}
 
-	gf_mx_v(group->cache_mutex);
-	gf_mx_v(dash->dash_mutex);
+	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 GF_EXPORT
@@ -7731,15 +8101,15 @@
 {
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
 	if (group) {
-		gf_mx_p(dash->dash_mutex);
-		gf_mx_p(group->cache_mutex);
+		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);
 		}
-		gf_mx_v(group->cache_mutex);
-		gf_mx_v(dash->dash_mutex);
+		if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	}
 }
 
@@ -7772,19 +8142,28 @@
 	if (switching_index) *switching_index = -1;
 	if (has_next_segment) *has_next_segment = GF_FALSE;
 
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
 
 	if (!group) {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return GF_BAD_PARAM;
 	}
 
-	gf_mx_p(group->cache_mutex);
+	if (group->cache_mutex) gf_mx_p(group->cache_mutex);
 
 	if (!group->nb_cached_segments) {
-		gf_mx_v(group->cache_mutex);
-		gf_mx_v(dash->dash_mutex);
+		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
+			&& dash->is_rt_speed
+			&& !dash->time_in_tsb
+		) {
+			group->force_early_fetch = GF_TRUE;
+			dash->min_wait_ms_before_next_request = 1;
+		}
 		return GF_BUFFER_TOO_SMALL;
 	}
 
@@ -7808,13 +8187,12 @@
 		}
 
 		if (err) {
-			gf_mx_v(dash->dash_mutex);
+			if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 			return err;
 		}
 		index ++;
 		dependent_representation_index--;
 	}
-	assert(dependent_representation_index==0);
 
 	*url = group->cached[index].cache;
 	if (start_range)
@@ -7840,7 +8218,7 @@
 
 	if (group->cached[index].has_dep_following) {
 		if (has_next_segment) *has_next_segment = GF_TRUE;
-	} else if (group->cached[index+1].cache && group->adaptation_set) {
+	} 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);
@@ -7849,8 +8227,8 @@
 				*has_next_segment = GF_TRUE;
 		}
 	}
-	gf_mx_v(group->cache_mutex);
-	gf_mx_v(dash->dash_mutex);
+	if (group->cache_mutex) gf_mx_v(group->cache_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	return GF_OK;
 }
 
@@ -7859,20 +8237,20 @@
 {
 	GF_DASH_Group *group;
 
-	*url = NULL;
+	if (url) *url = NULL;
 	if (switching_url) *switching_url = NULL;
 	if (original_url) *original_url = NULL;
 	if (switching_index) *switching_index = -1;
 
-	gf_mx_p(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_p(dash->dash_mutex);
 	group = gf_list_get(dash->groups, idx);
 	if (!group) {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return GF_BAD_PARAM;
 	}
 
 	if (!group->is_downloading) {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return GF_OK;
 	}
 
@@ -7884,11 +8262,11 @@
 
 	//no download yet
 	if ( ! dash->dash_io->get_bytes_done(dash->dash_io, group->segment_download)) {
-		gf_mx_v(dash->dash_mutex);
+		if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 		return GF_OK;
 	}
 
-	*url = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
+	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) {
@@ -7898,7 +8276,7 @@
 		if (switching_url)
 			*switching_url = rep->playback.cached_init_segment_url;
 	}
-	gf_mx_v(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 	return GF_OK;
 }
 
@@ -7906,7 +8284,7 @@
 void gf_dash_seek(GF_DashClient *dash, Double start_range)
 {
 	Bool is_dynamic = GF_FALSE;
-	gf_mx_p(dash->dash_mutex);
+	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));
 
@@ -7936,7 +8314,7 @@
 		/*if no, seek in group*/
 		gf_dash_seek_groups(dash, start_range, is_dynamic);
 	}
-	gf_mx_v(dash->dash_mutex);
+	if (dash->dash_mutex) gf_mx_v(dash->dash_mutex);
 }
 
 GF_EXPORT
@@ -7947,13 +8325,6 @@
 }
 
 GF_EXPORT
-Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return gf_dash_get_segment_start_time(group, NULL);
-}
-
-GF_EXPORT
 void gf_dash_set_utc_shift(GF_DashClient *dash, s32 shift_utc_sec)
 {
 	if (dash) dash->utc_shift = shift_utc_sec;
@@ -7997,25 +8368,6 @@
 	return GF_OK;
 }
 
-
-GF_EXPORT
-GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	GF_MPD_Representation *rep;
-	if (!group) return GF_BAD_PARAM;
-	rep = gf_list_get(group->adaptation_set->representations, representation_idx);
-	if (!rep) return GF_BAD_PARAM;
-
-	if (width) *width = rep->width ? rep->width : group->adaptation_set->width;
-	if (height) *height = rep->height ? rep->height : group->adaptation_set->height;
-	if (codecs) *codecs = rep->codecs ? rep->codecs : group->adaptation_set->codecs;
-	if (bandwidth) *bandwidth = rep->bandwidth;
-	if (audio_samplerate) *audio_samplerate = rep->samplerate ? rep->samplerate : group->adaptation_set->samplerate;
-
-	return GF_OK;
-}
-
 GF_EXPORT
 Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 idx)
 {
@@ -8044,7 +8396,7 @@
 	return dash ? dash->mpd->min_buffer_time : 0;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_dash_resync_to_segment(GF_DashClient *dash, const char *latest_segment_name, const char *earliest_segment_name)
 {
 	Bool found = GF_FALSE;
@@ -8214,6 +8566,8 @@
 	//TODO segment list addressing:
 	return GF_OK;
 }
+#endif
+
 
 GF_EXPORT
 GF_Err gf_dash_set_max_resolution(GF_DashClient *dash, u32 width, u32 height, u8 max_display_bpp)
@@ -8234,6 +8588,19 @@
 }
 
 GF_EXPORT
+void gf_dash_split_adaptation_sets(GF_DashClient *dash)
+{
+	dash->split_adaptation_set = GF_TRUE;
+}
+
+GF_EXPORT
+void gf_dash_set_low_latency_mode(GF_DashClient *dash, GF_DASHLowLatencyMode low_lat_mode)
+{
+	dash->low_latency_mode = low_lat_mode;
+}
+
+
+GF_EXPORT
 void gf_dash_set_user_buffer(GF_DashClient *dash, u32 buffer_time_ms)
 {
 	if (dash) dash->user_buffer_ms = buffer_time_ms;
@@ -8443,11 +8810,19 @@
 }
 
 GF_EXPORT
-GF_Err gf_dash_group_select_quality(GF_DashClient *dash, u32 idx, const char *ID)
+GF_Err gf_dash_group_select_quality(GF_DashClient *dash, u32 idx, const char *ID, u32 q_idx)
 {
 	u32 i, count;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group || !ID) return GF_BAD_PARAM;
+	if (!group) return GF_BAD_PARAM;
+
+	if (!ID) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, q_idx);
+		if (!rep) return GF_BAD_PARAM;
+		group->force_representation_idx_plus_one = q_idx+1;
+		group->force_switch_bandwidth = 1;
+		return GF_OK;
+	}
 
 	count = gf_list_count(group->adaptation_set->representations);
 	for (i=0; i<count; i++) {
@@ -8461,6 +8836,13 @@
 	return GF_BAD_PARAM;
 }
 
+GF_EXPORT
+s32 gf_dash_group_get_active_quality(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return -1;
+	return group->active_rep_index;
+}
 
 
 GF_EXPORT
@@ -8579,12 +8961,6 @@
 }
 
 GF_EXPORT
-void gf_dash_set_threaded_download(GF_DashClient *dash, Bool use_threads)
-{
-	dash->use_threaded_download = use_threads;
-}
-
-GF_EXPORT
 void gf_dash_ignore_xlink(GF_DashClient *dash, Bool ignore_xlink)
 {
 	dash->ignore_xlink = ignore_xlink;
@@ -8618,7 +8994,7 @@
 
 
 GF_EXPORT
-GF_Err gf_dash_group_set_visible_rect(GF_DashClient *dash, u32 idx, u32 min_x, u32 max_x, u32 min_y, u32 max_y)
+GF_Err gf_dash_group_set_visible_rect(GF_DashClient *dash, u32 idx, u32 min_x, u32 max_x, u32 min_y, u32 max_y, Bool is_gaze)
 {
 	u32 i, count;
 	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
@@ -8640,16 +9016,31 @@
 		GF_DASH_Group *a_group = gf_list_get(group->groups_depending_on, i);
 		if (!a_group->srd_w || !a_group->srd_h) continue;
 
-		//single rectangle case
-		if (min_x<max_x) {
-			if (a_group->srd_x+a_group->srd_h <min_x) is_visible = GF_FALSE;
-			else if (a_group->srd_x>max_x) is_visible = GF_FALSE;
+		if (is_gaze) {
+
+			if (min_x < a_group->srd_x)
+				is_visible = GF_FALSE;
+			else if (min_x > a_group->srd_x + a_group->srd_w)
+				is_visible = GF_FALSE;
+			else if (min_y < a_group->srd_y)
+				is_visible = GF_FALSE;
+			else if (min_y > a_group->srd_y + a_group->srd_h)
+				is_visible = GF_FALSE;
+
 		} else {
-			if ( (a_group->srd_x>max_x) && (a_group->srd_x+a_group->srd_w<min_x)) is_visible = GF_FALSE;
-		}
 
-		if (a_group->srd_y>max_y) is_visible = GF_FALSE;
-		else if (a_group->srd_y+a_group->srd_h < min_y) is_visible = GF_FALSE;
+			//single rectangle case
+			if (min_x<max_x) {
+				if (a_group->srd_x+a_group->srd_w <min_x) is_visible = GF_FALSE;
+				else if (a_group->srd_x>max_x) is_visible = GF_FALSE;
+			} else {
+				if ( (a_group->srd_x>max_x) && (a_group->srd_x+a_group->srd_w<min_x)) is_visible = GF_FALSE;
+			}
+
+			if (a_group->srd_y>max_y) is_visible = GF_FALSE;
+			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;
 
@@ -8658,6 +9049,73 @@
 	return GF_OK;
 }
 
+void gf_dash_set_group_download_state(GF_DashClient *dash, u32 idx, GF_Err err)
+{
+	GF_MPD_Representation *rep;
+	Bool has_dep_following;
+	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
+	if (group->force_early_fetch && err) {
+		err = GF_URL_ERROR;
+	}
+
+	if (!err) {
+		group->force_early_fetch = GF_FALSE;
+		return;
+	}
+	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;
+	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);
+
+	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);
+
+
+	if (dash->speed>=0) {
+		group->download_segment_index--;
+	} else {
+		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)
+{
+	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 (file_size==bytes_done) {
+		dash_global_rate_adaptation(dash, GF_FALSE);
+	}
+}
+
+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;
+		else dash->min_wait_ms_before_next_request = 0;
+		return dash->min_wait_ms_before_next_request;
+	}
+	return 0;
+}
 
 GF_EXPORT
 Bool gf_dash_all_groups_done(GF_DashClient *dash)
@@ -8678,6 +9136,15 @@
 	if (dash) dash->query_string = query_string;
 }
 
+GF_EXPORT
+u32 gf_dash_group_get_as_id(GF_DashClient *dash, u32 group_idx)
+{
+	GF_DASH_Group *group;
+	if (!dash) return 0;
+	group = gf_list_get(dash->groups, group_idx);
+	if (!group) return 0;
+	return group->adaptation_set->id;
+}
 
 #endif //GPAC_DISABLE_DASH_CLIENT

gpac-0.8.0.tar.gz/src/media_tools/dash_segmenter.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -23,61 +23,24 @@
  *
  */
 
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-#include <gpac/mpegts.h>
-#include <gpac/config_file.h>
+#include <gpac/media_tools.h>
 #include <gpac/network.h>
-#include <gpac/base_coding.h>
-#ifdef _WIN32_WCE
-#include <winbase.h>
-#else
-#include <time.h>
-#endif
-#include <gpac/internal/isomedia_dev.h>
-#include <gpac/internal/mpd.h>
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-#ifdef GPAC_DISABLE_ISOM
-/*we should need a better way to work with sidx when no isom is defined*/
-#define GPAC_DISABLE_MPEG2TS
-#endif
-
-//#define GENERATE_VIRTUAL_REP_SRD
+#include <gpac/mpd.h>
+#include <gpac/filters.h>
 
-typedef struct _dash_segment_input GF_DashSegInput;
-
-struct _dash_component
+struct __gf_dash_segmenter
 {
-	u32 ID;/*audio/video/text/ ...*/
-	u32 media_type;/*audio/video/text/ ...*/
-	char szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
-	/*for video */
-	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap, hevc_tile_type;
-
-	/*for audio*/
-	u32 sample_rate, channels;
-	/*apply to any media. We use 5 bytes because we may use copy data converted from gf_4cc_to_str which is 5 bytes*/
-	char *lang;
-	Double duration;
-};
+	GF_FilterSession *fsess;
+	GF_Filter *output;
 
+	GF_List *inputs;
 
-struct __gf_dash_segmenter
-{
+	char *title, *copyright, *moreInfoURL, *sourceInfo, *lang;
+	char *locations, *base_urls;
 	char *mpd_name;
-	GF_DashSegInput *inputs;
-	u32 nb_inputs;
 	GF_DashProfile profile;
-	char *title;
-	char *location;
-	char *source;
-	char *copyright;
-	char *moreInfoURL;
-	//has to be freed
-	char **base_urls;
-	u32 nb_base_urls;
 
+	GF_DashDynamicMode dash_mode;
 	u32 use_url_template;
 	Bool use_segment_timeline;
 	Bool single_segment;
@@ -87,10 +50,11 @@
 
 	Double segment_duration;
 	Double fragment_duration;
+	Double sub_duration;
 	//has to be freed
 	char *seg_rad_name;
 	const char *seg_ext;
-	const char *init_seg_ext;
+	const char *seg_init_ext;
 	u32 segment_marker_4cc;
 	Bool enable_sidx;
 	u32 subsegs_per_sidx;
@@ -98,10 +62,9 @@
 
 	Bool fragments_start_with_rap;
 	char *tmpdir;
-	GF_DashDynamicMode dash_mode;
 	Double mpd_update_time;
 	s32 time_shift_depth;
-	Double min_buffer;
+	u32 min_buffer_time;
 	s32 ast_offset_ms;
 	u32 dash_scale;
 	Bool fragments_in_memory;
@@ -111,6121 +74,95 @@
 
 	GF_DASHPSSHMode pssh_mode;
 	Bool samplegroups_in_traf;
-    Bool single_traf_per_moof;
+    Bool single_traf_per_moof, single_trun_per_traf;
 	Bool tfdt_per_traf;
 	Double mpd_live_duration;
 	Bool insert_utc;
 	Bool real_time;
-	u32 start_date_sec_ntp, start_date_sec_ntp_ms_frac;
-	u32 nb_secs_to_discard;
-	const char *dash_profile_extension;
+	char *utc_start_date;
 
-	GF_Config *dash_ctx;
-
-
-	Double subduration;
-
-	FILE *mpd;
-	Bool segment_alignment_disabled;
-	u32 single_file_mode;
-	const char *bs_switch_segment_file;
-	Bool inband_param_set;
-	Bool force_period_end;
-	Bool force_session_end;
-
-	/*set if seg_rad_name depends on input file name (had %s in it). In this case, SegmentTemplate cannot be used at adaptation set level*/
-	Bool variable_seg_rad_name;
-
-	/*If true, disable generation date printing in mpd headers*/
-	Bool force_test_mode;
+	const char *dash_profile_extension;
 
 	GF_DASH_ContentLocationMode cp_location_mode;
 
-	Double max_segment_duration;
 	Bool no_cache;
+
 	Bool disable_loop;
+	GF_DASH_SplitMode split_mode;
 
-	/* indicates if a segment must contain its theorical boundary */
-	Bool split_on_bound;
+	Bool mvex_after_traks;
+	u32 sdtp_in_traf;
+	
+	//some HLS options
+	Bool hls_clock;
 
-	/* used to segment video as close to the boundary as possible */
-	Bool split_on_closest;
 	const char *cues_file;
 	Bool strict_cues;
 
-	Bool mvex_after_traks;
-};
-
-struct _dash_segment_input
-{
-	char *file_name;
-	char representationID[100];
-	char *periodID;
-	Double media_duration; /*forced media duration*/
-	u32 nb_baseURL;
-	char **baseURL;
-	char *xlink;
-	u32 nb_roles;
-	char **roles;
-	u32 nb_rep_descs;
-	char **rep_descs;
-	u32 nb_as_descs;
-	char **as_descs;
-	u32 nb_as_c_descs;
-	char **as_c_descs;
-	u32 nb_p_descs;
-	char **p_descs;
-	u32 bandwidth;
-	u32 dependency_bandwidth;
-	char *dependencyID;
-	Bool sscale;
-
-	/*if 0, input is disabled*/
-	u32 adaptation_set;
-	/*if 0, input is disabled*/
-	u32 period;
-	u32 group_id;
-	/*only set for the first representation in the AdaptationSet*/
-	u32 nb_rep_in_adaptation_set;
-	Double period_duration;
-
-	/*media-format specific functions*/
-	/*assigns the different media to the same adaptation set or group than the input_idx one*/
-	GF_Err (* dasher_input_classify) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type);
-	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenter *opts);
-	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenter *dash_opts, GF_DashSwitchingMode bs_switch_mode, Bool *disable_bs_switching);
-	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *opts, Bool first_in_set);
-
-	/*shall be set after call to dasher_input_classify*/
-	char szMime[50];
-
-	u32 single_track_num;
-	//information for scalability
-	u32 trackNum, lower_layer_track, nb_representations, idx_representations;
-	//increase sequence number between consecutive segments by this amount (for scalable reps)
-	u32 moof_seqnum_increase;
-
-	u32 protection_scheme_type;
-
-#ifdef GENERATE_VIRTUAL_REP_SRD
-	Bool virtual_representation;
-#endif
-
-	Double segment_duration;
-	/*all these shall be set after call to dasher_get_components_info*/
-	Double duration;
-	struct _dash_component components[20];
-	u32 nb_components;
-
-	//spatial info for tiling
-	u32 x, y, w, h;
-
-	Bool disable_inband_param_set;
-	//0: PID specified, 1 or more: specified, indicates the number of time the period was instantiated
-	u32 period_id_not_specified;
-
-	Bool init_segment_generated;
-	char *init_seg_url;
-	u32 use_bs_switching; //0: no, 1: yes, 2: kaked for hevc tiles
-
-
-	Bool get_component_info_done;
-	//cached isobmf input
-	GF_ISOFile *isobmf_input;
-	Bool no_cache;
-
-	Double clamp_duration;
+	//not yet exposed through API
+	Bool disable_segment_alignment;
+	Bool enable_mix_codecs;
+	Bool enable_sar_mix;
+	Bool check_duration;
+
+	const char *dash_state;
+
+	u64 next_gen_ntp_ms;
+	u64 mpd_time_ms;
+
+	Bool dash_mode_changed;
+	u32 print_stats_graph;
+	s32 dash_filter_idx_plus_one;
+	u32 last_prog;
 };
 
 
-
-#define EXTRACT_FORMAT(_nb_chars)	\
-			strcpy(szFmt, "%d");	\
-			char_template+=_nb_chars;	\
-			if (seg_rad_name[char_template]=='%') {	\
-				char *sep = strchr(seg_rad_name+char_template, '$');	\
-				if (sep) {	\
-					sep[0] = 0;	\
-					strcpy(szFmt, seg_rad_name+char_template);	\
-					char_template += (u32) strlen(seg_rad_name+char_template);	\
-					sep[0] = '$';	\
-				}	\
-			}	\
-			char_template+=1;	\
-
-GF_EXPORT
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
-{
-	char szFmt[20];
-	Bool has_number= GF_FALSE;
-	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? GF_TRUE : GF_FALSE;
-	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? GF_TRUE : GF_FALSE;
-	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? GF_TRUE : GF_FALSE;
-	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? GF_TRUE : GF_FALSE;
-	Bool needs_init;
-	u32 char_template = 0;
-	Bool skip_output = GF_FALSE;
-	char tmp[100];
-	strcpy(segment_name, "");
-
-	if (seg_type==GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT) {
-		seg_type = GF_DASH_TEMPLATE_SEGMENT;
-		skip_output = GF_TRUE;
-	}
-
-	needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
-
-	if (seg_rad_name && (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$Bandwidth$")))
-		needs_init = GF_FALSE;
-
-	if (!seg_rad_name) {
-		strcpy(segment_name, output_file_name); //already contains base_url
-	} else {
-		char c;
-		const size_t seg_rad_name_len = strlen(seg_rad_name);
-		while (char_template <= seg_rad_name_len) {
-			c = seg_rad_name[char_template];
-
-			if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) ) {
-				char_template += 18;
-				strcat(segment_name, rep_id);
-				needs_init = GF_FALSE;
-			}
-			else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
-				EXTRACT_FORMAT(10);
-
-				sprintf(tmp, szFmt, bandwidth);
-				strcat(segment_name, tmp);
-				needs_init = GF_FALSE;
-			}
-			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
-				EXTRACT_FORMAT(5);
-				if (is_init || is_init_template) continue;
-				/*replace %d to LLD*/
-				szFmt[strlen(szFmt)-1]=0;
-				strcat(szFmt, &LLD[1]);
-				sprintf(tmp, szFmt, start_time);
-				strcat(segment_name, tmp);
-				has_number = GF_TRUE;
-			}
-			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
-				EXTRACT_FORMAT(7);
-
-				if (is_init || is_init_template) continue;
-				sprintf(tmp, szFmt, segment_number);
-				strcat(segment_name, tmp);
-				has_number = GF_TRUE;
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
-				char *sep = strchr(seg_rad_name + char_template+6, '$');
-				if (sep) sep[0] = 0;
-				if (is_init || is_init_template) {
-					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init = GF_FALSE;
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
-				char *sep = strchr(seg_rad_name + char_template+7, '$');
-				if (sep) sep[0] = 0;
-				if (is_index) {
-					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init = GF_FALSE;
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Path=", 6)) {
-				char *sep = strchr(seg_rad_name + char_template+6, '$');
-				if (sep) sep[0] = 0;
-				if (!is_template && !is_init_template) {
-					strcat(segment_name, seg_rad_name + char_template+6);
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Segment=", 9)) {
-				char *sep = strchr(seg_rad_name + char_template+9, '$');
-				if (sep) sep[0] = 0;
-				if (!is_init && !is_init_template) {
-					strcat(segment_name, seg_rad_name + char_template+9);
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-
-			else {
-				char_template+=1;
-				if (c=='\\') c = '/';
-
-				sprintf(tmp, "%c", c);
-				strcat(segment_name, tmp);
-			}
-		}
-	}
-
-	if (is_template && !strstr(seg_rad_name, "$Number") && !strstr(seg_rad_name, "$Time")) {
-		if (use_segment_timeline) {
-			strcat(segment_name, "$Time$");
-		} else {
-			strcat(segment_name, "$Number$");
-		}
-	}
-
-	if (needs_init)
-		strcat(segment_name, "init");
-
-	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
-		if (use_segment_timeline) {
-			sprintf(tmp, LLU, start_time);
-			strcat(segment_name, tmp);
-		}
-		else {
-			sprintf(tmp, "%d", segment_number);
-			strcat(segment_name, tmp);
-		}
-	}
-	if (seg_ext) {
-		strcat(segment_name, ".");
-		strcat(segment_name, seg_ext);
-	}
-
-	if ((seg_type != GF_DASH_TEMPLATE_TEMPLATE) && (seg_type != GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) && !skip_output) {
-		char *sep = strrchr(segment_name, '/');
-		if (sep) {
-			char c = sep[0];
-			sep[0] = 0;
-			if (!gf_dir_exists(segment_name)) {
-				gf_mkdir(segment_name);
-			}
-			sep[0] = c;
-		}
-	}
-
-	return GF_OK;
-}
-
-const char *gf_dasher_strip_output_dir(const char *mpd_url, const char *path)
-{
-	char c;
-	const char *res;
-	char *sep;
-	if (!mpd_url || !path) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[DASH] invalid call to strip_output_dir\n"));
-		return "";
-	}
-	sep = strrchr(mpd_url, '/');
-	if (!sep) sep = strrchr(mpd_url, '\\');
-	if (!sep) return path;
-	c = sep[0];
-	sep[0] = 0;
-	if (!strncmp(mpd_url, path, strlen(mpd_url))) {
-		res = path + strlen(mpd_url) + 1;
-	} else {
-		res = path;
-	}
-	sep[0] = c;
-	return res;
-}
-
-GF_Err gf_dasher_store_segment_info(GF_DASHSegmenter *dasher, const char *representationID, const char *SegmentName, u64 segStartTime, u64 segEndTime, u64 scale)
-{
-	char szKey[512];
-	if (!dasher->dash_ctx) return GF_OK;
-
-	sprintf(szKey, ""LLU"-"LLU"-"LLU"@%s", segStartTime, segEndTime-segStartTime, scale, representationID);
-	return gf_cfg_set_key(dasher->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
-}
-
-
-#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_AVCConfig *avcc;
-#ifndef GPAC_DISABLE_HEVC
-	GF_HEVCConfig *hvcc;
-#endif
-
-	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);
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[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"));
-			return e;
-		}
-
-		if (originalFormat) subtype = originalFormat;
-	}
-
-	switch (subtype) {
-	case GF_ISOM_SUBTYPE_MPEG4:
-		esd = gf_isom_get_esd(movie, track, 1);
-		if (esd && esd->decoderConfig) {
-			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);
-				} else {
-					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", esd->decoderConfig->objectTypeIndication);
-				}
-				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);
-				}
-				break;
-			default:
-				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", esd->decoderConfig->objectTypeIndication);
-				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;
-		}
-	case GF_ISOM_SUBTYPE_AVC_H264:
-	case GF_ISOM_SUBTYPE_AVC2_H264:
-	case GF_ISOM_SUBTYPE_AVC3_H264:
-	case GF_ISOM_SUBTYPE_AVC4_H264:
-		//FIXME: in avc1 with multiple descriptor, we should take the right description index
-		avcc = gf_isom_avc_config_get(movie, track, 1);
-		if (force_inband) {
-			if (subtype==GF_ISOM_SUBTYPE_AVC_H264)
-				subtype = GF_ISOM_SUBTYPE_AVC3_H264;
-			else if (subtype==GF_ISOM_SUBTYPE_AVC2_H264)
-				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);
-			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;
-		}
-	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);
-			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;
-		}
-#ifndef GPAC_DISABLE_HEVC
-	case GF_ISOM_SUBTYPE_HVC1:
-	case GF_ISOM_SUBTYPE_HEV1:
-	case GF_ISOM_SUBTYPE_HVC2:
-	case GF_ISOM_SUBTYPE_HEV2:
-	case GF_ISOM_SUBTYPE_HVT1:
-	case GF_ISOM_SUBTYPE_LHV1:
-	case GF_ISOM_SUBTYPE_LHE1:
-		if (force_inband) {
-			if (subtype==GF_ISOM_SUBTYPE_HVC1) subtype = GF_ISOM_SUBTYPE_HEV1;
-			else if (subtype==GF_ISOM_SUBTYPE_HVC2) subtype = GF_ISOM_SUBTYPE_HEV2;
-		}
-		hvcc = gf_isom_hevc_config_get(movie, track, 1);
-		if (!hvcc) {
-			hvcc = gf_isom_lhvc_config_get(movie, track, 1);
-		}
-		if (subtype==GF_ISOM_SUBTYPE_HVT1) {
-			u32 refTrack;
-			gf_isom_get_reference(movie, track, GF_ISOM_REF_TBAS, 1, &refTrack);
-			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
-			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);
-						}
-					}
-				}
-			}
-
-			gf_odf_hevc_cfg_del(hvcc);
-		} else {
-			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
-		}
-		return GF_OK;
-#endif /*GPAC_DISABLE_HEVC*/
-
-#ifndef GPAC_DISABLE_AV1
-	case GF_ISOM_SUBTYPE_AV01: {
-		GF_AV1Config *av1c = NULL;
-		AV1State av1_state;
-		GF_BitStream *bs = NULL;
-		GF_Err e = GF_OK;
-		u32 i = 0;
-
-		memset(&av1_state, 0, sizeof(AV1State));
-		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_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.%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);
-
-		/* "All the other fields [...] are optional, mutually inclusive (all or none) fields." https://aomediacodec.github.io/av1-isobmff/ */
-		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.%01u.%01u%01u%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,
-				av1_state.color_primaries, av1_state.transfer_characteristics, av1_state.matrix_coefficients, av1_state.color_range);
-			strcat(szCodec, tmp);
-		}
-
-		gf_odf_av1_cfg_del(av1c);
-		av1_reset_frame_state(&av1_state.frame_state);
-		return GF_OK;
-	}
-#endif /*GPAC_DISABLE_AV1*/
-
-
-	case GF_ISOM_SUBTYPE_VP08:
-	case GF_ISOM_SUBTYPE_VP09:
-	{
-		GF_VPConfig *vpcc = NULL;
-
-		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;
-		}
-
-		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);
-
-
-		gf_odf_vp_cfg_del(vpcc);
-
-		return GF_OK;
-	}
-
-	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 GF_OK;
-}
-
-#endif //GPAC_DISABLE_ISOM
-
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-
-typedef struct
-{
-	/* indicates if the track under fragmentation is the reference for sidx or prft boxes*/
-	Bool is_ref_track;
-
-	Bool done;
-	u32 TrackID;
-	u32 SampleNum, SampleCount;
-	u64 FragmentLength;
-	u32 OriginalTrack;
-	u32 finalSampleDescriptionIndex;
-	u32 TimeScale, MediaType, sample_duration;
-	u64 last_sample_cts, next_sample_dts, InitialTSOffset, loop_ts_offset;
-	Bool all_sample_raps, splitable;
-	/* carry of the amount of time of the current sample already used in the previous segment */
-	u32 split_sample_dts_shift;
-	s32 media_time_to_pres_time_shift;
-	u64 min_cts_in_segment;
-	u64 start_tfdt;
-
-	u32 cues_timescale;
-	u32 nb_cues;
-	GF_DASHCueInfo *cues;
-	Bool cues_use_edits;
-} GF_ISOMTrackFragmenter;
-
-static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num, Bool *is_eos)
-{
-	GF_ISOSample *samp;
-	u64 time;
-	Bool is_rap, has_roll;
-	u32 i, found_sample = 0;
-	for (i=sample_num; i<=sample_count; i++) {
-		if (gf_isom_get_sample_sync(input, track, i)) {
-			found_sample = i;
-			break;
-		}
-		gf_isom_get_sample_rap_roll_info(input, track, i, &is_rap, &has_roll, NULL);
-		if (is_rap || has_roll) {
-			found_sample = i;
-			break;
-		}
-	}
-	//TRICK: if we don't found next RAP, return time of the last sample in track
-	if (!found_sample) {
-		found_sample = sample_count;
-		*is_eos = GF_TRUE;
-	}
-	samp = gf_isom_get_sample_info(input, track, found_sample, NULL, NULL);
-	time = samp->DTS;
-	gf_isom_sample_del(&samp);
-	return time;
-}
-
-static void get_canon_urn(bin128 URN, char *res)
-{
-	char sres[4];
-	u32 i;
-	/* Output canonical UIID form */
-	strcpy(res, "");
-	for (i=0; i<4; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
-	strcat(res, "-");
-	for (i=4; i<6; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
-	strcat(res, "-");
-	for (i=6; i<8; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
-	strcat(res, "-");
-	for (i=8; i<10; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
-	strcat(res, "-");
-	for (i=10; i<16; i++) { sprintf(sres, "%02x", URN[i]); strcat(res, sres); }
-}
-
-static const char *get_drm_kms_name(const char *canURN)
-{
-	if (!stricmp(canURN, "67706163-6365-6E63-6472-6D746F6F6C31")) return "GPAC1.0";
-	else if (!stricmp(canURN, "5E629AF5-38DA-4063-8977-97FFBD9902D4")) return "Marlin1.0";
-	else if (!strcmp(canURN, "adb41c24-2dbf-4a6d-958b-4457c0d27b95")) return "MediaAccess3.0";
-	else if (!strcmp(canURN, "A68129D3-575B-4F1A-9CBA-3223846CF7C3")) return "VideoGuard";
-	else if (!strcmp(canURN, "9a04f079-9840-4286-ab92-e65be0885f95")) return "PlayReady";
-	else if (!strcmp(canURN, "9a27dd82-fde2-4725-8cbc-4234aa06ec09")) return "VCAS";
-	else if (!strcmp(canURN, "F239E769-EFA3-4850-9C16-A903C6932EFB")) return "Adobe";
-	else if (!strcmp(canURN, "1f83e1e8-6ee9-4f0d-ba2f-5ec4e3ed1a66")) return "SecureMedia";
-	else if (!strcmp(canURN, "644FE7B5-260F-4FAD-949A-0762FFB054B4")) return "CMLA (OMA DRM)";
-	else if (!strcmp(canURN, "6a99532d-869f-5922-9a91-113ab7b1e2f3")) return "MobiTVDRM";
-	else if (!strcmp(canURN, "35BF197B-530E-42D7-8B65-1B4BF415070F")) return "DivX DRM";
-	else if (!strcmp(canURN, "B4413586-C58C-FFB0-94A5-D4896C1AF6C3")) return "VODRM";
-	else if (!strcmp(canURN, "edef8ba9-79d6-4ace-a3c8-27dcd51d21ed")) return "Widevine";
-	else if (!strcmp(canURN, "80a6be7e-1448-4c37-9e70-d5aebe04c8d2")) return "Irdeto";
-	else if (!strcmp(canURN, "dcf4e3e3-62f1-5818-7ba6-0a6fe33ff3dd")) return "CA 1.0, DRM+ 2.0";
-	else if (!strcmp(canURN, "45d481cb-8fe0-49c0-ada9-ab2d2455b2f2")) return "CoreCrypt";
-	else if (!strcmp(canURN, "616C7469-6361-7374-2D50-726F74656374")) return "altiProtect";
-	else if (!strcmp(canURN, "992c46e6-c437-4899-b6a0-50fa91ad0e39")) return "Arris SecureMedia SteelKnot version 1";
-	else if (!strcmp(canURN, "1077efec-c0b2-4d02-ace3-3c1e52e2fb4b")) return "cenc initData";
-	else if (!strcmp(canURN, "e2719d58-a985-b3c9-781a-b030af78d30e")) return "ClearKey1.0";
-	else if (!strcmp(canURN, "94CE86FB-07FF-4F43-ADB8-93D2FA968CA2")) return "FairPlay";
-	else if (!strcmp(canURN, "279fe473-512c-48fe-ade8-d176fee6b40f")) return "Arris Titanium";
-	else if (!strcmp(canURN, "aa11967f-cc01-4a4a-8e99-c5d3dddfea2d")) return "UDRM";
-	return "unknown";
-}
-
-static GF_Err gf_isom_write_content_protection(GF_ISOFile *input, FILE *mpd, u32 protected_track, GF_DASHSegmenter *dasher, u8 indent)
-{
-	char sCan[40];
-	u32 prot_scheme	= gf_isom_is_media_encrypted(input, protected_track, 1);
-	if (gf_isom_is_cenc_media(input, protected_track, 1)) {
-		bin128 default_KID;
-		u32 i, count;
-		gf_isom_cenc_get_default_info(input, protected_track, 1, NULL, NULL, &default_KID, NULL, NULL, NULL, NULL);
-		for (i=0; i<indent; i++)
-			fprintf(mpd, " ");
-
-		get_canon_urn(default_KID, sCan);
-		fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:mpeg:dash:mp4protection:2011\" value=\"%s\" cenc:default_KID=\"%s\"/>\n", gf_4cc_to_str(prot_scheme), sCan );
-
-		if (dasher->pssh_mode <= GF_DASH_PSSH_MOOF) {
-			return GF_OK;
-		}
-
-		//add pssh
-		count = gf_isom_get_pssh_count(input);
-		for (i=0; i<count; i++) {
-			GF_Err e;
-			u32 j;
-			bin128 sysID;
-			u8 *pssh_data=NULL;
-			u8 *pssh_data_64=NULL;
-			u32 pssh_len, size_64;
-
-			gf_isom_get_pssh_info(input, i+1, sysID, NULL, NULL, NULL, NULL);
-
-			e = gf_isom_get_pssh(input, i+1, &pssh_data, &pssh_len);
-			if (e) continue;
-
-			for (j=0; j<indent; j++)
-				fprintf(mpd, " ");
-			get_canon_urn(sysID, sCan);
-			fprintf(mpd, "<ContentProtection schemeIdUri=\"urn:uuid:%s\" value=\"%s\">\n", sCan, get_drm_kms_name(sCan) );
-
-			size_64 = 2*pssh_len;
-			pssh_data_64 = gf_malloc(size_64);
-			size_64 = gf_base64_encode((const char *)pssh_data, pssh_len, (char *)pssh_data_64, size_64);
-			pssh_data_64[size_64] = 0;
-
-			for (j=0; j<=indent; j++)
-				fprintf(mpd, " ");
-			fprintf(mpd, "<cenc:pssh>%s</cenc:pssh>\n", pssh_data_64);
-			gf_free(pssh_data_64);
-			gf_free(pssh_data);
-			for (j=0; j<indent; j++)
-				fprintf(mpd, " ");
-			fprintf(mpd, "</ContentProtection>\n");
-		}
-	}
-	//todo for ISMA or OMA DRM
-
-	return GF_OK;
-}
-
-static void gf_dash_append_segment_timeline(GF_BitStream *mpd_timeline_bs, u64 segment_start, u64 segment_end, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
-{
-	char szMPDTempLine[2048];
-	u64 segment_dur = segment_end - segment_start;
-
-	if (*previous_segment_duration == segment_dur) {
-		*segment_timeline_repeat_count = *segment_timeline_repeat_count + 1;
-		return;
-	}
-
-	if (*previous_segment_duration) {
-		if (*segment_timeline_repeat_count) {
-			sprintf(szMPDTempLine, " r=\"%d\"/>\n", *segment_timeline_repeat_count);
-		} else {
-			sprintf(szMPDTempLine, "/>\n");
-		}
-		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-	}
-	*previous_segment_duration = segment_dur;
-	if (*first_segment_in_timeline) {
-		sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"", segment_start, segment_dur);
-		*first_segment_in_timeline = GF_FALSE;
-	} else {
-		sprintf(szMPDTempLine, "     <S d=\""LLU"\"", segment_dur);
-	}
-	gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-	*segment_timeline_repeat_count = 0;
-}
-
-static void gf_dash_load_segment_timeline(GF_DASHSegmenter *dasher, GF_BitStream *mpd_timeline_bs, const char *representationID, u64 *previous_segment_duration , Bool *first_segment_in_timeline,u32 *segment_timeline_repeat_count)
-{
-	u32 i, count;
-	u64 scale;
-	char szRepID[100];
-
-	*first_segment_in_timeline = GF_TRUE;
-	*segment_timeline_repeat_count = 0;
-	*previous_segment_duration = 0;
-
-	count = gf_cfg_get_key_count(dasher->dash_ctx, "SegmentsStartTimes");
-	for (i=0; i<count; i++) {
-		u64 start, dur;
-		const char *fileName = gf_cfg_get_key_name(dasher->dash_ctx, "SegmentsStartTimes", i);
-		const char *MPDTime = gf_cfg_get_key(dasher->dash_ctx, "SegmentsStartTimes", fileName);
-		if (!fileName)
-			break;
-
-		sscanf(MPDTime, ""LLU"-"LLU"-"LLU"@%s", &start, &dur, &scale, szRepID);
-		if (strcmp(representationID, szRepID)) continue;
-
-		gf_dash_append_segment_timeline(mpd_timeline_bs, start, start+dur, previous_segment_duration, first_segment_in_timeline, segment_timeline_repeat_count);
-	}
-}
-
-static u64 get_presentation_time(u64 media_time, s32 ts_shift)
-{
-	if ((ts_shift<0) && (media_time < -ts_shift)) {
-		media_time = 0;
-	} else {
-		media_time += ts_shift;
-	}
-	return media_time ;
-}
-
-static Bool is_splitable(u32 media_type)
-{
-	switch (media_type) {
-	case GF_ISOM_MEDIA_TEXT:
-	case GF_ISOM_MEDIA_SUBT:
-	case GF_ISOM_MEDIA_MPEG_SUBT:
-		return GF_TRUE;
-	default:
-		return GF_FALSE;
-	}
-}
-
-static GF_Err isom_get_audio_info_with_m4a_sbr_ps(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 *SampleRate, u32 *Channels, u8 *bitsPerSample)
-{
-	GF_M4ADecSpecInfo a_cfg;
-	GF_ESD *esd;
-	GF_Err e = gf_isom_get_audio_info(movie, trackNumber, StreamDescriptionIndex, SampleRate, Channels, bitsPerSample);
-	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: could not get audio info (2), %s\n", gf_error_to_string(e)));
-		return e;
-	}
-	if (gf_isom_get_media_subtype(movie, trackNumber, StreamDescriptionIndex) != GF_ISOM_SUBTYPE_MPEG4)
-		return GF_OK;
-
-	esd = gf_isom_get_esd(movie, trackNumber, 1);
-	if (!esd) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: broken MPEG-4 Track, no ESD found\n"));
-		return GF_OK;
-	}
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_AUDIO_AAC_MPEG4:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-	case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-		break;
-	default:
-		gf_odf_desc_del((GF_Descriptor*)esd);
-		return GF_OK;
-	}
-	e = gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
-	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: corrupted AAC Config, %s\n", gf_error_to_string(e)));
-		return GF_NOT_SUPPORTED;
-	}
-	if (SampleRate && a_cfg.has_sbr) {
-		*SampleRate = a_cfg.sbr_sr;
-	}
-	if (Channels) *Channels = a_cfg.nb_chan;
-	gf_odf_desc_del((GF_Descriptor*)esd);
-	return e;
-}
-
-
-static u32 cicp_get_channel_config(u32 nb_chan,u32 nb_surr, u32 nb_lfe)
-{
-	if ( !nb_chan && !nb_surr && !nb_lfe) return 0;
-	else if ((nb_chan==1) && !nb_surr && !nb_lfe) return 1;
-	else if ((nb_chan==2) && !nb_surr && !nb_lfe) return 2;
-	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==5) && (nb_surr==2) && (nb_lfe==1)) return 7;
-	else if ((nb_chan==2) && (nb_surr==1) && !nb_lfe) return 9;
-	else if ((nb_chan==2) && (nb_surr==2) && !nb_lfe) return 10;
-	else if ((nb_chan==3) && (nb_surr==3) && (nb_lfe==1)) return 11;
-	else if ((nb_chan==3) && (nb_surr==4) && (nb_lfe==1)) return 12;
-	else if ((nb_chan==11) && (nb_surr==11) && (nb_lfe==2)) return 13;
-	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_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));
-	return 0;
-
-}
-
-
-
-static GF_Err isom_segment_file(GF_ISOFile *input, const char *output_file, GF_DASHSegmenter *dasher, GF_DashSegInput *dash_input, Bool first_in_set)
-{
-	u8 NbBits;
-	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done=0;
-	u32 sample_duration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
-	u32 nb_video, nb_auxv, nb_pict, nb_audio, nb_text, nb_scene, mpd_timescale;
-	u8 defaultPadding;
-	u16 defaultDegradationPriority;
-	GF_Err e;
-	char sOpt[100], sKey[100];
-	char szCodecs[200], szCodec[RFC6381_CODEC_NAME_SIZE_MAX];
-	u32 cur_seg, fragment_index, max_sap_type;
-	GF_ISOFile *output, *bs_switch_segment;
-	GF_ISOSample *sample, *next;
-	GF_List *fragmenters;
-	u64 MaxFragmentDuration, MaxSegmentDuration, period_duration;
-	Double segment_start_time=0, SegmentDuration, maxFragDurationOverSegment;
-	u64 presentationTimeOffset = 0;
-	Double file_duration, max_segment_duration;
-	u32 nb_segments, width, height, sample_rate, nb_channels, nb_surround, nb_lfe, sar_w, sar_h, fps_num, fps_denum, startNumber;
-	u32 nbFragmentInSegment = 0;
-	char *langCode = NULL;
-	u32 index_start_range, index_end_range;
-	Bool force_switch_segment = GF_FALSE;
-	Bool switch_segment = GF_FALSE;
-	Bool split_seg_at_rap = dasher->segments_start_with_rap;
-	Bool split_at_rap = GF_FALSE;
-	Bool has_rap = GF_FALSE;
-	Bool next_sample_rap = GF_FALSE;
-	Bool flush_all_samples = GF_FALSE;
-	Bool simulation_pass = GF_FALSE;
-	Bool init_segment_deleted = GF_FALSE;
-	Bool first_segment_in_timeline = GF_TRUE;
-	Bool store_utc = GF_FALSE;
-	u64 previous_segment_duration = 0;
-	u32 segment_timeline_repeat_count = 0;
-	//u64 last_ref_cts = 0;
-	u64 start_range, end_range, file_size, init_seg_size, ref_track_first_dts, ref_track_next_cts;
-	u32 tfref_timescale = 0;
-	u32 bandwidth = 0;
-	GF_ISOMTrackFragmenter *tf, *tfref;
-	GF_BitStream *mpd_bs = NULL;
-	GF_BitStream *mpd_timeline_bs = NULL;
-	char szMPDTempLine[2048];
-	char SegmentName[GF_MAX_PATH];
-	char RepSecName[200];
-	char RepURLsSecName[200];
-	const char *opt;
-	GF_Fraction max_track_duration = {0, 1};
-	Bool bs_switching_is_output = GF_FALSE;
-	Bool store_dash_params = GF_FALSE;
-	Bool dash_moov_setup = GF_FALSE;
-	Bool segments_start_with_sap = GF_TRUE;
-	Bool first_sample_in_segment = GF_FALSE;
-	u32 *segments_info = NULL;
-	u32 nb_segments_info = 0;
-	u32 protected_track = 0;
-	Double min_seg_dur, max_seg_dur, total_seg_dur, last_seg_dur;
-	Bool is_bs_switching = GF_FALSE;
-	Bool use_url_template = dasher->use_url_template;
-	const char *seg_rad_name = dasher->seg_rad_name;
-	const char *seg_ext = dasher->seg_ext;
-	const char *init_seg_ext = dasher->init_seg_ext;
-	const char *bs_switching_segment_name = NULL;
-	u64 generation_start_utc = 0;
-	u64 ntpts = 0;
-	Bool seg_dur_adjusted = GF_FALSE;
-	u32 nb_enc = 0;
-	u32 cue_start = 0;
-	u32 force_timescale = 0;
-	SegmentName[0] = 0;
-	SegmentDuration = 0;
-	nb_samp = 0;
-	fragmenters = NULL;
-
-	if (!dash_input) return GF_BAD_PARAM;
-	if (!init_seg_ext) init_seg_ext = "mp4";
-	if (!seg_ext) seg_ext = "m4s";
-
-	if (dasher->real_time && dasher->dash_ctx) {
-		u32 sec, frac;
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
-		sscanf(opt, "%u:%u", &sec, &frac);
-
-		generation_start_utc = sec - GF_NTP_SEC_1900_TO_1970;
-		generation_start_utc *= 1000;
-		generation_start_utc += ((u64) frac) * 1000 / 0xFFFFFFFFUL;
-	}
-
-	if (dasher->insert_utc) {
-		ntpts = gf_net_get_ntp_ts();
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Sampling NTP TS "LLU" at "LLU" us, at UTC "LLU"\n", ntpts, gf_sys_clock_high_res(), gf_net_get_utc()));
-	}
-
-	bs_switch_segment = NULL;
-	if (dasher->bs_switch_segment_file) {
-		bs_switch_segment = gf_isom_open(dasher->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
-		if (bs_switch_segment) {
-			bs_switching_segment_name = gf_dasher_strip_output_dir(dasher->mpd_name, dasher->bs_switch_segment_file);
-			is_bs_switching = GF_TRUE;
-		}
-	}
-
-	sprintf(RepSecName, "Representation_%s", dash_input ? dash_input->representationID : "");
-	sprintf(RepURLsSecName, "URLs_%s", dash_input ? dash_input->representationID : "");
-
-	bandwidth = dash_input ? dash_input->bandwidth : 0;
-	file_duration = 0;
-
-	startNumber = 1;
-
-	//create output file
-	/*need to precompute bandwidth*/
-	if ((!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$"))
-#ifdef GENERATE_VIRTUAL_REP_SRD
-	        || dash_input->virtual_representation
-#endif
-	   ) {
-		for (i=0; i<gf_isom_get_track_count(input); i++) {
-			Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
-			tk_dur /= gf_isom_get_media_timescale(input, i+1);
-			if (file_duration < tk_dur ) {
-				file_duration = tk_dur;
-			}
-		}
-		bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
-	}
-
-	if (dasher->dash_ctx) {
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "Setup");
-		if (!opt || stricmp(opt, "yes") ) {
-			store_dash_params=GF_TRUE;
-			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "ID", dash_input->representationID);
-		}
-	}
-
-	opt = dasher->dash_ctx ? gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegment") : NULL;
-	if (opt) {
-		output = gf_isom_open(opt, GF_ISOM_OPEN_CAT_FRAGMENTS, dasher->tmpdir);
-		dash_moov_setup = GF_TRUE;
-	} else {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->nb_baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
-		output = gf_isom_open(SegmentName, GF_ISOM_OPEN_WRITE, dasher->tmpdir);
-	}
-	if (!output) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOBMF DASH] Cannot open %s for writing\n", opt ? opt : SegmentName));
-		e = gf_isom_last_error(NULL);
-		goto err_exit;
-	}
-	else if (dasher->force_test_mode) {
-		gf_isom_no_version_date_info(output, 1);
-	}
-
-	if (store_dash_params) {
-		const char *name;
-
-		if (!gf_cfg_get_key(dasher->dash_ctx, "DASH", "SegmentTemplate"))
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "SegmentTemplate", seg_rad_name);
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Source", gf_isom_get_filename(input) );
-
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Setup", "yes");
-		name = SegmentName;
-		if (bs_switch_segment) name = gf_isom_get_filename(bs_switch_segment);
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "InitializationSegment", name);
-
-		/*store BS flag per rep - it should be stored per adaptation set but we dson't have a key for adaptation sets right now*/
-		if (/*first_in_set && */ is_bs_switching)
-			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "BitstreamSwitching", "yes");
-	} else if (dasher->dash_ctx) {
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "BitstreamSwitching");
-		if (opt && !strcmp(opt, "yes")) {
-			is_bs_switching = GF_TRUE;
-			if (bs_switch_segment)
-				gf_isom_delete(bs_switch_segment);
-			bs_switch_segment = output;
-			bs_switching_is_output = GF_TRUE;
-			bs_switching_segment_name = gf_dasher_strip_output_dir(dasher->mpd_name, gf_isom_get_filename(bs_switch_segment));
-		}
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "Bandwidth");
-		if (opt) sscanf(opt, "%u", &bandwidth);
-
-		if (dasher->use_segment_timeline) {
-			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NbSegmentsRemoved");
-			if (opt) {
-				u32 nb_removed = atoi(opt);
-				startNumber = 1 + nb_removed;
-			}
-		}
-	}
-
-	mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	//if segment alignment not set or if first in AS, create SegmentTimeline
-	if (dasher->use_segment_timeline && (first_in_set || dasher->segment_alignment_disabled) ) {
-		mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		sprintf(szMPDTempLine, "    <SegmentTimeline>\n");
-		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-
-		if (dasher->dash_ctx) {
-			gf_dash_load_segment_timeline(dasher, mpd_timeline_bs, dash_input->representationID, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
-		}
-	}
-
-	szCodecs[0] = 0;
-	nb_sync = 0;
-	nb_samp = 0;
-	fragmenters = gf_list_new();
-
-
-#ifdef GENERATE_VIRTUAL_REP_SRD
-	if (dash_input->virtual_representation) {
-		char *virtual_url;
-		FILE *vseg;
-		GF_BitStream *bs;
-		gf_media_get_rfc_6381_codec_name(input, dash_input->trackNum, szCodec, dasher->inband_param_set, GF_TRUE);
-		if (strlen(szCodecs)) strcat(szCodecs, ",");
-		strcpy(szCodecs, szCodec);
-
-		sprintf(SegmentName, "virtual_rep_%d_segment.m4s", dash_input->idx_representations);
-		virtual_url = gf_url_concatenate(output_file, SegmentName);
-		vseg = gf_fopen(virtual_url, "w");
-		bs = gf_bs_from_file(vseg, GF_BITSTREAM_WRITE);
-		gf_bs_write_u32(bs, 20);
-		gf_bs_write_u32(bs, GF_ISOM_BOX_TYPE_STYP);
-		gf_bs_write_u32(bs, GF_ISOM_BRAND_MSDH);
-		gf_bs_write_u32(bs, 0);
-		gf_bs_write_u32(bs, GF_ISOM_BRAND_MSDH);
-		gf_bs_del(bs);
-		gf_fclose(vseg);
-
-		gf_free(virtual_url);
-
-		output = NULL;
-		goto restart_fragmentation_pass;
-	}
-#endif
-
-	if (! dash_moov_setup) {
-		Bool keep_pssh = GF_FALSE;
-		if ((dasher->pssh_mode==GF_DASH_PSSH_MOOV) || (dasher->pssh_mode==GF_DASH_PSSH_MOOV_MPD))
-			keep_pssh = GF_TRUE;
-		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE, keep_pssh, dasher->mvex_after_traks);
-		if (e) goto err_exit;
-
-		/*because of movie fragments MOOF based offset, brand <= ISO4 is forbidden*/
-		/*because of tfdt in traf, brand <= ISO5 is forbidden*/
-		gf_isom_set_brand_info(output, GF_ISOM_BRAND_ISO6, 1);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISOM, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO1, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO2, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO3, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO4, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_ISO5, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_AVC1, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP41, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
-
-		gf_isom_remove_root_od(output);
-	}
-
-	MaxFragmentDuration = (u32) (dasher->dash_scale * dasher->fragment_duration);
-	MaxSegmentDuration = (u32) (dasher->dash_scale * dasher->segment_duration);
-
-	/*in single segment mode, only one big SIDX is written between the end of the moov and the first fragment.
-	To speed-up writing, we do a first fragmentation pass without writing any sample to compute the number of segments and fragments per segment
-	in order to allocate / write to file the sidx before the fragmentation. The sidx will then be rewritten when closing the last segment*/
-	if (dasher->single_file_mode==1) {
-		simulation_pass = GF_TRUE;
-		seg_rad_name = NULL;
-	}
-	/*if single file is requested, store all segments in the same file*/
-	else if (dasher->single_file_mode==2) {
-		seg_rad_name = NULL;
-	}
-
-	index_start_range = index_end_range = 0;
-
-	tf = tfref = NULL;
-	file_duration = 0;
-	width = height = sample_rate = nb_channels = nb_surround = nb_lfe = sar_w = sar_h = fps_num = fps_denum = 0;
-	langCode = NULL;
-
-
-	mpd_timescale = nb_video = nb_auxv = nb_pict = nb_audio = nb_text = nb_scene = 0;
-	//duplicates all tracks
-	for (i=0; i<gf_isom_get_track_count(input); i++) {
-		u32 _w, _h, _nb_ch, vidtype;
-		u32 _sr = 0;
-		u32 mtype = gf_isom_get_media_type(input, i+1);
-		if (mtype == GF_ISOM_MEDIA_HINT) continue;
-
-		if (dash_input->trackNum && ((i+1) != dash_input->trackNum))
-			continue;
-
-		if (dash_input->single_track_num && ((i+1) != dash_input->single_track_num))
-			continue;
-
-		if (!dash_moov_setup) {
-
-			if (!force_timescale && dash_input->sscale) {
-				force_timescale = gf_isom_get_media_timescale(input, i+1);
-			}
-
-			e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
-			if (e) goto err_exit;
-
-			if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
-
-			/*remove sgpd in stbl; it would be in traf*/
-			if (dasher->samplegroups_in_traf) {
-				GF_TrackBox *trak = (GF_TrackBox *)gf_isom_get_track_from_file(output, TrackNum);
-				if (!trak) continue;
-				while (gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription)) {
-					GF_Box* box = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, 0);
-					gf_isom_box_del(box);
-					gf_list_rem(trak->Media->information->sampleTable->sampleGroupsDescription, 0);
-				}
-			}
-			if (dash_input->bandwidth) {
-				gf_isom_update_bitrate(output, TrackNum, 0, dash_input->bandwidth, dash_input->bandwidth, 0);
-			}
-
-// Commenting it the code for Timed Text tracks, it may happen that we have only one long sample, fragmentation is useful
-#if 0
-			//if only one sample, don't fragment track
-			if (gf_isom_get_sample_count(input, i+1) == 1) {
-				sample = gf_isom_get_sample(input, i+1, 1, &descIndex);
-				e = gf_isom_add_sample(output, TrackNum, 1, sample);
-				gf_isom_sample_del(&sample);
-				if (e) goto err_exit;
-
-				continue;
-			}
-#endif
-		} else {
-			TrackNum = gf_isom_get_track_by_id(output, gf_isom_get_track_id(input, i+1));
-		}
-
-		//if encrypted, do not touch the media
-		if (!gf_isom_is_media_encrypted(input, i+1, 1)) {
-			/*set extraction mode whether setup or not*/
-			vidtype = gf_isom_get_avc_svc_type(input, i+1, 1);
-			if (vidtype==GF_ISOM_AVCTYPE_AVC_ONLY) {
-				/*for AVC we concatenate SPS/PPS unless SVC base*/
-				if (!dash_input->trackNum && dasher->inband_param_set && !dash_input->disable_inband_param_set)
-					gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
-			}
-			else if (vidtype > GF_ISOM_AVCTYPE_AVC_ONLY) {
-				/*for SVC we don't want any rewrite of extractors, and we don't concatenate SPS/PPS*/
-				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
-			}
-
-			vidtype = gf_isom_get_hevc_lhvc_type(input, i+1, 1);
-			if (vidtype == GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-
-				u32 mode = GF_ISOM_NALU_EXTRACT_INSPECT;	//because of tile tracks
-
-				/*concatenate SPS/PPS unless LHVC base*/
-				if (!dash_input->trackNum && dasher->inband_param_set && !dash_input->disable_inband_param_set)
-					mode |= GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
-
-				gf_isom_set_nalu_extract_mode(input, i+1, mode);
-			}
-			else if (vidtype > GF_ISOM_HEVCTYPE_HEVC_ONLY) {
-				gf_isom_set_nalu_extract_mode(input, i+1, GF_ISOM_NALU_EXTRACT_INSPECT);
-			}
-		} else {
-			nb_enc ++;
-		}
-
-		if (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
-        else if (mtype == GF_ISOM_MEDIA_AUXV) nb_auxv++;
-        else if (mtype == GF_ISOM_MEDIA_PICT) nb_pict++;
-		else if (mtype == GF_ISOM_MEDIA_AUDIO) nb_audio++;
-		else if (mtype == GF_ISOM_MEDIA_TEXT || mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT) nb_text++;
-		else if (mtype == GF_ISOM_MEDIA_SCENE) nb_scene++;
-		else if (mtype == GF_ISOM_MEDIA_DIMS) nb_scene++;
-
-		//setup fragmenters
-		if (! dash_moov_setup) {
-			//new initialization segment, setup fragmentation
-			gf_isom_get_fragment_defaults(input, i+1,
-			                              &sample_duration, &defaultSize, &defaultDescriptionIndex,
-			                              &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-
-			e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-											 defaultDescriptionIndex, sample_duration,
-											 defaultSize, (u8) defaultRandomAccess,
-											 defaultPadding, defaultDegradationPriority,
-											 dasher->no_fragments_defaults ? 1 : 0);
-
-			if (e) goto err_exit;
-		} else {
-			gf_isom_get_fragment_defaults(output, TrackNum,
-			                              &sample_duration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-		}
-
-		gf_media_get_rfc_6381_codec_name(input, i+1, szCodec, dasher->inband_param_set, GF_TRUE);
-		if (strlen(szCodecs)) strcat(szCodecs, ",");
-		strcat(szCodecs, szCodec);
-
-		GF_SAFEALLOC(tf, GF_ISOMTrackFragmenter);
-		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
-		tf->SampleCount = gf_isom_get_sample_count(input, i+1);
-		tf->OriginalTrack = i+1;
-		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
-		tf->MediaType = gf_isom_get_media_type(input, i+1);
-		tf->sample_duration = sample_duration;
-		mpd_timescale = tf->TimeScale;
-		gf_isom_enable_raw_pack(input, i+1, 2048);
-
-		if ( (max_track_duration.num / max_track_duration.den) < gf_isom_get_track_duration(input, i+1)) {
-			max_track_duration.num = gf_isom_get_track_duration(input, i+1);
-			max_track_duration.den = 1;
-		}
-
-		/* We set the reference track (for use in the sidx or prft) to be the track that has the greatest number of sync samples,
-		  but not all of them. E.g. in audio+video we want the video to be used
-		  if for all tracks all samples are sync, we will pick anyone (see below)
-		  NOTE: This might be problematic if the file has multiple video tracks that are not sync sample aligned */
-		if (gf_isom_get_sync_point_count(input, i+1)>nb_sync) {
-			tfref = tf;
-			nb_sync = gf_isom_get_sync_point_count(input, i+1);
-		} else if (!gf_isom_has_sync_points(input, i+1)) {
-			tf->all_sample_raps = GF_TRUE;
-		}
-
-		tf->finalSampleDescriptionIndex = 1;
-
-		if (dasher->cues_file) {
-			e = gf_mpd_load_cues(dasher->cues_file, tf->TrackID, &tf->cues_timescale, &tf->cues_use_edits, &tf->cues, &tf->nb_cues);
-			if (e) goto err_exit;
-		}
-
-
-		/*figure out if we have an initial TS*/
-		if (!dash_moov_setup) {
-			u32 j, edit_count = gf_isom_get_edit_segment_count(input, i+1);
-			Double scale = tf->TimeScale;
-			scale /= gf_isom_get_timescale(input);
-
-			/*remove all segments*/
-			gf_isom_remove_edit_segments(output, TrackNum);
-			tf->media_time_to_pres_time_shift = 0;
-			//clone all edits before first nomal, and stop at first normal setting duration to 0
-			for (j=0; j<edit_count; j++) {
-				u64 EditTime, SegDuration, MediaTime;
-				u8 EditMode;
-
-				/*get first edit*/
-				gf_isom_get_edit_segment(input, i+1, j+1, &EditTime, &SegDuration, &MediaTime, &EditMode);
-
-				if (EditMode==GF_ISOM_EDIT_NORMAL)
-					SegDuration = 0;
-
-				gf_isom_set_edit_segment(output, TrackNum, EditTime, SegDuration, MediaTime, EditMode);
-
-				if (EditMode==GF_ISOM_EDIT_NORMAL) {
-					tf->media_time_to_pres_time_shift -= (s32) MediaTime;
-					break;
-				}
-				tf->media_time_to_pres_time_shift += (u32) (scale*SegDuration);
-			}
-
-			gf_isom_set_brand_info(output, GF_ISOM_BRAND_ISO6, 1);
-
-			/*DASH self-init media segment*/
-			if (dasher->single_file_mode==1) {
-				gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_DSMS, 1);
-			} else {
-				gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_DASH, 1);
-			}
-
-			/*locate sample description in list if given*/
-			if (bs_switch_segment) {
-				u32 s_count;
-				u32 sample_descs_track = gf_isom_get_track_by_id(bs_switch_segment, tf->TrackID);
-				if (!sample_descs_track) {
-					e = GF_BAD_PARAM;
-					goto err_exit;
-
-				}
-
-				//the initialization segment is not yet setup for fragmentation
-				if (! gf_isom_is_track_fragmented(bs_switch_segment, tf->TrackID)) {
-					e = GF_BAD_PARAM;
-					if (e) goto err_exit;
-				}
-				/*otherwise override the fragment defauls so that we are consistent with the shared init segment*/
-				else {
-					e = gf_isom_get_fragment_defaults(bs_switch_segment, sample_descs_track,
-					                                  &sample_duration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-					if (e) goto err_exit;
-
-					e = gf_isom_change_track_fragment_defaults(output, tf->TrackID,
-					        defaultDescriptionIndex, sample_duration, defaultSize, defaultRandomAccess, defaultPadding, defaultDegradationPriority, dasher->no_fragments_defaults);
-					if (e) goto err_exit;
-				}
-
-				/*and search in new ones the new index*/
-				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track);
-
-				/*more than one sampleDesc, we will need to indicate all the sample descs in the file in case we produce a single file,
-				otherwise the file would not be compliant*/
-				if (s_count > 1) {
-					gf_isom_clone_sample_descriptions(output, TrackNum, bs_switch_segment, sample_descs_track, GF_TRUE);
-				}
-
-				/*and search in new ones the new index*/
-				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track);
-				if (s_count>1) {
-					u32 k;
-					/*remove all sample descs*/
-					for (k=0; k<s_count; k++) {
-						/*search in original file if we have the sample desc*/
-						if (gf_isom_is_same_sample_description(input, TrackNum, 1, bs_switch_segment, sample_descs_track, k+1)) {
-							tf->finalSampleDescriptionIndex = k+1;
-						}
-					}
-				}
-			}
-		}
-		/*restore track decode times*/
-		else {
-			char *opt, sKey[100];
-			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) sscanf(opt, LLU, & tf->InitialTSOffset);
-
-			/*store presentationTimeOffset on the first rep*/
-			if (store_dash_params)
-				presentationTimeOffset = tf->InitialTSOffset;
-		}
-
-		tf->splitable = is_splitable(mtype);
-
-		/*get language, width/height/layout info, audio info*/
-		switch (mtype) {
-		case GF_ISOM_MEDIA_TEXT:
-		case GF_ISOM_MEDIA_SUBT:
-		case GF_ISOM_MEDIA_MPEG_SUBT:
-			gf_isom_get_media_language(input, i+1, &langCode);
-		case GF_ISOM_MEDIA_VISUAL:
-        case GF_ISOM_MEDIA_AUXV:
-        case GF_ISOM_MEDIA_PICT:
-		case GF_ISOM_MEDIA_SCENE:
-		case GF_ISOM_MEDIA_DIMS:
-			e = gf_isom_get_visual_info(input, i+1, 1, &_w, &_h);
-			if (e == GF_OK) {
-				if (_w>width) width = _w;
-				if (_h>height) height = _h;
-			} else {
-				width  = 0;
-				height = 0;
-			}
-			break;
-		case GF_ISOM_MEDIA_AUDIO:
-			//DASH-IF and MPEG disagree here:
-			if (dasher->profile == GF_DASH_PROFILE_AVC264_LIVE || dasher->profile == GF_DASH_PROFILE_AVC264_ONDEMAND)
-			{
-				isom_get_audio_info_with_m4a_sbr_ps(input, i+1, 1, &_sr, &_nb_ch, NULL);
-			}
-			else {
-				gf_isom_get_audio_info(input, i+1, 1, &_sr, &_nb_ch, NULL);
-				isom_get_audio_info_with_m4a_sbr_ps(input, i+1, 1, NULL, &_nb_ch, NULL);
-			}
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (gf_isom_get_media_subtype(input, i+1, 1)==GF_ISOM_SUBTYPE_AC3) {
-				GF_AC3Config *ac3 = gf_isom_ac3_config_get(input, i+1, 1);
-				if (ac3) {
-					int i;
-					nb_lfe = ac3->streams[0].lfon ? 1 : 0;
-					_nb_ch = gf_ac3_get_channels(ac3->streams[0].acmod);
-					for (i=0; i<ac3->streams[0].nb_dep_sub; ++i) {
-						assert(ac3->streams[0].nb_dep_sub == 1);
-						_nb_ch += gf_ac3_get_channels(ac3->streams[0].chan_loc);
-					}
-					gf_free(ac3);
-				}
-			}
-#endif
-			if (_sr>sample_rate) sample_rate = _sr;
-			if (_nb_ch>nb_channels) nb_channels = _nb_ch;
-			gf_isom_get_media_language(input, i+1, &langCode);
-			break;
-		}
-
-		if (gf_isom_is_video_subtype(mtype) ) {
-			/*get duration of 2nd sample*/
-			u32 sample_dur = gf_isom_get_sample_duration(input, i+1, 2);
-			gf_isom_get_pixel_aspect_ratio(input, i+1, 1, &sar_w, &sar_h);
-			if (! fps_num || ! fps_denum) {
-				fps_num = tf->TimeScale;
-				fps_denum = sample_dur;
-			}
-			else if (fps_num *sample_dur < tf->TimeScale * fps_denum) {
-				fps_num = tf->TimeScale;
-				fps_denum = sample_dur;
-			}
-		}
-
-
-		if (file_duration < ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale ) {
-			file_duration = ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale;
-		}
-		gf_list_add(fragmenters, tf);
-
-		if (gf_isom_is_media_encrypted(input, i+1, 1)) {
-			protected_track = i+1;
-		}
-
-		nb_samp += tf->SampleCount;
-	}
-
-	if (!nb_enc) {
-		gf_isom_remove_pssh_box(output);
-	}
-
-	if (gf_list_count(fragmenters)>1)
-		mpd_timescale = 1000;
-
-	/* Finalize the selection of the reference track for sidx computations */
-	if (!tfref) {
-		/* if we did not find a track in which all samples are not sync samples, we pick the first track to be the reference */
-		tfref = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
-		assert(tfref);
-	} else {
-		//put tfref in first pos
-		gf_list_del_item(fragmenters, tfref);
-		gf_list_insert(fragmenters, tfref, 0);
-	}
-	tfref->is_ref_track = GF_TRUE;
-	tfref_timescale = tfref->TimeScale;
-	ref_track_id = tfref->TrackID;
-	if (tfref->all_sample_raps)
-		split_seg_at_rap = GF_TRUE;
-
-	if (!dash_moov_setup) {
-		max_track_duration.den *= gf_isom_get_timescale(input);
-		max_track_duration.num *= gf_isom_get_timescale(output);
-		gf_isom_set_movie_duration(output, max_track_duration.num / max_track_duration.den );
-	}
-
-	//if single segment, add msix brand if we use indexes
-	gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MSIX, ((dasher->single_file_mode==1) && dasher->enable_sidx) ? 1 : 0);
-
-	if (force_timescale)
-		gf_isom_set_timescale(output, force_timescale);
-
-	//flush movie
-	e = gf_isom_finalize_for_fragment(output, 1);
-	if (e) goto err_exit;
-
-	nb_done = 0;
-	for (i=0; i<gf_list_count(fragmenters); i++) {
-		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-		if (tf->SampleCount)
-			nb_done += tf->SampleCount - tf->SampleNum;
-	}
-	if (!nb_done) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No samples in movie, rewriting moof and exit\n"));
-		goto err_exit;
-	}
-
-	start_range = 0;
-	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
-	init_seg_size = file_size;
-
-	if (dasher->dash_ctx) {
-		if (store_dash_params) {
-			char szVal[1024];
-			sprintf(szVal, LLU, init_seg_size);
-			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
-		} else {
-			const char *opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegmentSize");
-			if (opt) init_seg_size = atoi(opt);
-		}
-	}
-
-	max_sap_type = 0;
-	if (dasher->force_session_end) {
-		if (dasher->dash_ctx) {
-			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "MaxSAPType");
-			if (opt) max_sap_type = atoi(opt);
-			else {
-				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "PrevPeriodMaxSAPType");
-				if (opt) max_sap_type = atoi(opt);
-			}
-		}
-
-		goto write_rep_only;
-	}
-
-
-restart_fragmentation_pass:
-
-	for (i=0; i<gf_list_count(fragmenters); i++) {
-		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-		tf->split_sample_dts_shift = 0;
-	}
-	segment_start_time = 0;
-	nb_segments = 0;
-
-	nb_tracks_done = 0;
-	ref_track_first_dts = (u64) -1;
-	nb_done = 0;
-
-	switch_segment=GF_TRUE;
-
-	if (!seg_rad_name) use_url_template = GF_FALSE;
-
-	cur_seg = 1;
-	fragment_index = 1;
-	if (dash_input->moof_seqnum_increase) {
-		fragment_index = dash_input->idx_representations + 1;
-	}
-	period_duration = 0;
-	split_at_rap = GF_FALSE;
-	has_rap = GF_FALSE;
-	next_sample_rap = GF_FALSE;
-	flush_all_samples = GF_FALSE;
-	force_switch_segment = GF_FALSE;
-	max_sap_type = 0;
-	ref_track_next_cts = 0;
-
-	/*setup previous URL list*/
-	if (dasher->dash_ctx) {
-		const char *opt;
-		char sKey[100];
-		count = gf_cfg_get_key_count(dasher->dash_ctx, RepURLsSecName);
-		for (i=0; i<count; i++) {
-			const char *key_name = gf_cfg_get_key_name(dasher->dash_ctx, RepURLsSecName, i);
-			opt = gf_cfg_get_key(dasher->dash_ctx, RepURLsSecName, key_name);
-			sprintf(szMPDTempLine, "      %s\n", opt);
-			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-		}
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NextSegmentIndex");
-		if (opt) {
-			cur_seg = atoi(opt);
-		}
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "NextFragmentIndex");
-		if (opt) fragment_index = atoi(opt);
-		opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "CumulatedDuration");
-		if (opt) sscanf(opt, LLU, &period_duration);
-
-		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) tf->SampleNum = atoi(opt);
-
-			sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) sscanf(opt, LLU, &tf->last_sample_cts);
-
-			sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) {
-				sscanf(opt, LLU, &tf->next_sample_dts);
-			}
-
-			sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
-			opt = gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) tf->media_time_to_pres_time_shift = atoi(opt);
-
-			sprintf(sKey, "TKID_%d_LoopTSOffset", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dasher->dash_ctx, RepSecName, sKey);
-			if (opt) sscanf(opt, LLU, &tf->loop_ts_offset);
-
-			if (dasher->nb_secs_to_discard) {
-				GF_ISOSample *sample = gf_isom_get_sample_info(input, tf->OriginalTrack, tf->SampleCount, &descIndex, NULL);
-				u32 last_sample_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleCount);
-				u64 track_dur = (u64) ((s64) last_sample_dur + sample->DTS + sample->CTS_Offset + tf->media_time_to_pres_time_shift);
-				u64 pos = dasher->nb_secs_to_discard;
-				u64 period_dur = track_dur * dasher->dash_scale / tf->TimeScale;
-				u32 nb_seg_in_track = (u32) ( period_dur / (dasher->segment_duration * dasher->dash_scale) );
-				if (nb_seg_in_track * dasher->segment_duration * dasher->dash_scale < period_dur)
-					nb_seg_in_track++;
-				pos *= tf->TimeScale;
-				while (1) {
-					if (pos < track_dur) break;
-					pos -= track_dur;
-					tf->InitialTSOffset += sample->DTS + last_sample_dur;
-					cur_seg += nb_seg_in_track;
-					period_duration += period_dur;
-				}
-				gf_isom_sample_del(&sample);
-
-				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-				sprintf(sOpt, LLU, tf->InitialTSOffset);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
-			}
-		}
-	}
-
-	gf_isom_set_next_moof_number(output, dasher->initial_moof_sn + fragment_index);
-
-
-	max_segment_duration = 0;
-	min_seg_dur = max_seg_dur = total_seg_dur = last_seg_dur = 0;
-
-	while ( (count = gf_list_count(fragmenters)) ) {
-		Bool store_pssh = GF_FALSE;
-		u32 ref_SAP_type = 0;
-		u32 ref_start_SAP_type = 0;
-#ifdef GENERATE_VIRTUAL_REP_SRD
-		if (dash_input->virtual_representation)
-			break;
-#endif
-
-		if (switch_segment) {
-			if (dasher->subduration && (segment_start_time + MaxSegmentDuration/2 >= dasher->dash_scale * dasher->subduration)) {
-				/*done with file (next segment will exceed of more than half the requested subduration : store all fragmenters state and abord*/
-				break;
-			}
-
-			SegmentDuration = 0;
-			switch_segment = GF_FALSE;
-			first_sample_in_segment = GF_TRUE;
-
-			if (simulation_pass) {
-				segments_info = (u32 *)gf_realloc(segments_info, sizeof(u32) * (nb_segments_info+1) );
-				segments_info[nb_segments_info] = 0;
-				nb_segments_info++;
-				e = GF_OK;
-			} else {
-				start_range = gf_isom_get_file_size(output);
-				if (seg_rad_name) {
-					u64 s_start = (u64)( (period_duration + (u64)segment_start_time) * mpd_timescale );
-					s_start /= dasher->dash_scale;
-
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, s_start, bandwidth, cur_seg, dasher->use_segment_timeline);
-					e = gf_isom_start_segment(output, SegmentName, dasher->fragments_in_memory);
-
-					/*we are in bitstream switching mode, delete init segment*/
-					if (is_bs_switching && !init_segment_deleted) {
-						init_segment_deleted = GF_TRUE;
-						if (dasher->bs_switch_segment_file && strcmp(dasher->bs_switch_segment_file, gf_isom_get_filename(output))) {
-							gf_delete_file(gf_isom_get_filename(output));
-						}
-					}
-
-					if (!use_url_template) {
-						const char *name = gf_dasher_strip_output_dir(dasher->mpd_name, SegmentName);
-						sprintf(szMPDTempLine, "     <SegmentURL media=\"%s\"/>\n", name );
-						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						if (dasher->dash_ctx) {
-							char szKey[100], szVal[4046];
-							sprintf(szKey, "UrlInfo%d", cur_seg );
-							sprintf(szVal, "<SegmentURL media=\"%s\"/>", name);
-							gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
-						}
-					}
-				} else {
-					e = gf_isom_start_segment(output, NULL, dasher->fragments_in_memory);
-				}
-				switch (dasher->pssh_mode) {
-				case GF_DASH_PSSH_MOOF:
-				case GF_DASH_PSSH_MOOF_MPD:
-					store_pssh = GF_TRUE;
-					break;
-				default:
-					break;
-				}
-
-				if (tfref /* tfref set to NULL after its last sample is processed */ && dasher->insert_utc) {
-					store_utc = GF_TRUE;
-				}
-			}
-
-			cur_seg++;
-			if (e) goto err_exit;
-		}
-
-		maxFragDurationOverSegment=0;
-
-		sample = NULL;
-
-		if (simulation_pass) {
-			segments_info[nb_segments_info-1] ++;
-			e = GF_OK;
-		} else {
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, starting fragment %d\n", SegmentName, nbFragmentInSegment));
-			e = gf_isom_start_fragment(output, GF_TRUE);
-			if (e) goto err_exit;
-
-			for (i=0; i<count; i++) {
-				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-				if (tf->done) continue;
-
-				if (dasher->initial_tfdt && (tf->TimeScale != dasher->dash_scale)) {
-					Double scale = tf->TimeScale;
-					scale /= dasher->dash_scale;
-					tf->start_tfdt = (u64) (dasher->initial_tfdt*scale) + tf->InitialTSOffset + tf->next_sample_dts;
-				} else {
-					tf->start_tfdt = tf->InitialTSOffset + tf->next_sample_dts;
-				}
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d, tfdt "LLD" on TrackID %d\n", SegmentName, nbFragmentInSegment, tf->start_tfdt, tf->TrackID));
-
-				gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->start_tfdt);
-				if (!SegmentDuration) tf->min_cts_in_segment = (u64)-1;
-
-				if (!mpd_timeline_bs && use_url_template) {
-					Double sdur = ((Double)MaxSegmentDuration) / dasher->dash_scale;
-					Double diff = (cur_seg-2) * sdur;
-					diff -= ((Double)tf->start_tfdt) / tf->TimeScale;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Drift control for segment %d: segment_boundary=%.2f\t media_time=%.2f\tdrift=%.2f\n", cur_seg, (cur_seg - 2) * sdur, ((Double)tf->start_tfdt) / tf->TimeScale, diff));
-					if (ABS(diff) > sdur/2) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment %s (Number #%d): drift between MPD timeline and tfdt exceeds 50%% of segment duration (MPD time minus TFDT %lf secs) - bitstream will not be compliant, try increasing segment duration or reencoding for better keyframe alignment\n", SegmentName, cur_seg-1, diff));
-					}
-				}
-			}
-			if (store_pssh) {
-				e = gf_isom_clone_pssh(output, input, GF_TRUE);
-			}
-		}
-
-		//process track by track
-		for (i=0; i<count; i++) {
-			Bool has_roll, is_rap;
-			s32 roll_distance;
-			u32 SAP_type = 0;
-
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			if (tf->is_ref_track)
-				has_rap = GF_FALSE;
-
-			if (tf->done) continue;
-			//if not the first TRAF in our moof and single traf per moof is requested, start a new moof
-			if (!simulation_pass && dasher->single_traf_per_moof && (i>0) ) {
-				e = gf_isom_start_fragment(output, GF_TRUE);
-				if (e) goto err_exit;
-                if (dasher->tfdt_per_traf) {
-                    tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-                    if (tf->done) continue;
-                    gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->start_tfdt);
-                }
-			}
-
-			//ok write samples
-			while (1) {
-				u64 last_sample_dts;
-				Bool loop_track = GF_FALSE;
-				Bool force_eos = GF_FALSE;
-				Bool stop_frag = GF_FALSE;
-				Bool is_redundant_sample = GF_FALSE;
-				u32 split_sample_duration = 0;
-				u32 next_sample_num_offset = 1;
-				Double clamp_duration = dash_input->clamp_duration;
-				if (!clamp_duration) clamp_duration = dash_input->media_duration;
-
-				/*first sample in the fragment */
-				if (!sample) {
-					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
-					if (!sample) {
-						e = gf_isom_last_error(input);
-						goto err_exit;
-					}
-					sample->DTS += tf->loop_ts_offset;
-
-					/*FIXME - use negative ctts to indicate "past" DTS for splitted sample*/
-					/* take into account the possible split of the last sample in the previous fragment */
-					if (tf->split_sample_dts_shift) {
-						sample->DTS += tf->split_sample_dts_shift;
-						is_redundant_sample = GF_TRUE;
-					}
-
-					/*also get SAP type - this is not needed if sample is not NULL as SAP type was computed for "next sample" in previous loop*/
-					if (sample->IsRAP) {
-						SAP_type = sample->IsRAP;
-					} else {
-						SAP_type = 0;
-						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, &roll_distance);
-						if (e==GF_OK) {
-							if (is_rap) SAP_type = 3;
-							else if (has_roll && (roll_distance>=0) ) SAP_type = 4;
-						}
-					}
-				}
-
-				if (!tf->FragmentLength && tf->is_ref_track) {
-					ref_start_SAP_type = SAP_type;
-				}
-
-				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
-				if (sample->nb_pack) {
-					next_sample_num_offset = sample->nb_pack;
-				}
-
-				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1 + next_sample_num_offset, &j);
-
-				if (next) sample_duration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum+1 + next_sample_num_offset);
-				if (clamp_duration && next && clamp_duration*tf->TimeScale < next->DTS + sample_duration) {
-					gf_isom_sample_del(&next);
-					next = NULL;
-				}
-
-				if (next) {
-					next->DTS += tf->loop_ts_offset;
-					sample_duration = (u32) (next->DTS - sample->DTS);
-				}
-				//in dynamic mode we will loop, pay attention to the timing
-				else if (!dasher->disable_loop) {
-					if (clamp_duration) {
-						/* simple round with (int)+.5 to avoid trucating .99999 to 0 */
-						sample_duration = (u32)(clamp_duration*tf->TimeScale - (sample->DTS - tf->loop_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 (sample_duration==0)
-							sample_duration=1;
-					} else {
-						sample_duration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - (sample->DTS - tf->loop_ts_offset) );
-
-						assert(tf->SampleNum+1 == tf->SampleCount);
-					}
-
-					tf->loop_ts_offset = tf->next_sample_dts + sample_duration;
-					loop_track = GF_TRUE;
-					next = gf_isom_get_sample(input, tf->OriginalTrack, 1, &j);
-					next->DTS += tf->loop_ts_offset;
-				} else if (clamp_duration) {
-					if (tf->MediaType!=GF_ISOM_MEDIA_AUDIO) {
-						sample_duration = (u32)(clamp_duration*tf->TimeScale - (sample->DTS - tf->loop_ts_offset) + 0.5);
-					} else {
-						sample_duration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum+1);
-					}
-					force_eos = GF_TRUE;
-				} else {
-					sample_duration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack) - (sample->DTS - tf->loop_ts_offset));
-				}
-
-				if (sample->nb_pack) {
-					sample_duration /= sample->nb_pack;
-				}
-
-				if (tf->splitable) {
-					/* Evaluate if we need to split the current sample
-					(if it goes beyond the segment boundary,
-					we do not split a sample if it exceeds the fragment boundary) */
-					if (tf->is_ref_track) {
-						u64 frag_dur = (tf->FragmentLength + sample_duration) * dasher->dash_scale / tf->TimeScale;
-						/*if media segment about to be produced is longer than max segment length, force segment split*/
-						if (SegmentDuration + frag_dur > MaxSegmentDuration) {
-							split_sample_duration = sample_duration;
-							sample_duration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dasher->dash_scale - tf->FragmentLength);
-							assert(sample_duration);
-							split_sample_duration -= sample_duration;
-
-							/*since we split this sample we have to stop fragmenting afterwards*/
-							stop_frag = GF_TRUE;
-							nb_samp++;
-						}
-					} else if (tfref
-					           /* we split the sample not at the "perfect" segment boundary
-							   but at the "real" segment boundary given by the end of the last sample of the reference track (if any)
-							   there may not be a reference track anymore if all samples have been used */
-					           && ((tf->next_sample_dts + sample_duration) * tfref_timescale > tfref->next_sample_dts * tf->TimeScale)) {
-						split_sample_duration = sample_duration;
-						sample_duration = (u32) ( (tfref->next_sample_dts * tf->TimeScale)/tfref_timescale - tf->next_sample_dts );
-						split_sample_duration -= sample_duration;
-
-						/*since we split this sample we have to stop fragmenting afterwards*/
-						stop_frag = GF_TRUE;
-						nb_samp++;
-					}
-				}
-
-				assert(!next || ((s32) sample_duration > 0));
-
-				if (tf->is_ref_track) {
-					if (segments_start_with_sap && first_sample_in_segment) {
-						first_sample_in_segment = GF_FALSE;
-						if (!SAP_type) segments_start_with_sap = GF_FALSE;
-					}
-					if (ref_track_first_dts > sample->DTS)
-						ref_track_first_dts = sample->DTS;
-
-					if (next) {
-						u64 next_cts = next->DTS + next->CTS_Offset;
-						if (split_sample_duration)
-							next_cts -= split_sample_duration;
-
-						if (ref_track_next_cts<next_cts) {
-							ref_track_next_cts = next_cts;
-						}
-					} else {
-						if (tf->MediaType==GF_ISOM_MEDIA_AUDIO) {
-							ref_track_next_cts += sample_duration;
-						} else {
-							u64 last_cts = gf_isom_get_media_duration(input, tf->OriginalTrack);
-							u64 dur = (u64) ((dash_input->clamp_duration ? dash_input->clamp_duration : dash_input->media_duration) * tf->TimeScale);
-							if (dur < last_cts)
-								last_cts = dur;
-
-							if (last_cts > ref_track_next_cts) ref_track_next_cts = last_cts;
-							else ref_track_next_cts += sample_duration;
-						}
-					}
-				}
-
-				if (simulation_pass) {
-					e = GF_OK;
-				} else {
-					if (tf->is_ref_track && store_utc) {
-						//frame timestamp is composition time (tfdt + cts_offset) in movie timeline (eg take edit list into account) still in media timescale
-						u64 associated_pts = tf->start_tfdt + sample->CTS_Offset + tf->media_time_to_pres_time_shift;
-						gf_isom_set_fragment_reference_time(output, tf->TrackID, ntpts, associated_pts);
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, storing NTP TS "LLU" at "LLU" us, at UTC "LLU"\n", SegmentName, ntpts, gf_sys_clock_high_res(), gf_net_get_utc()));
-						ntpts = gf_net_get_ntp_ts();
-
-						store_utc = GF_FALSE;
-					}
-
-					/*override descIndex with final index used in file*/
-					descIndex = tf->finalSampleDescriptionIndex;
-					e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex,
-					                                sample_duration, NbBits, 0, is_redundant_sample);
-					if (e)
-						goto err_exit;
-
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d, current fragment length %d, adding sample with DTS %d from TrackID %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength, sample->DTS, tf->TrackID));
-
-					if (sample->DTS + sample->CTS_Offset < tf->min_cts_in_segment)
-						tf->min_cts_in_segment = sample->DTS + sample->CTS_Offset;
-
-					e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
-					if (e)
-						goto err_exit;
-
-					/*copy subsample information*/
-					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, dasher->samplegroups_in_traf);
-					if (e)
-						goto err_exit;
-
-					gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
-					nb_done++;
-				}
-
-				tf->last_sample_cts = sample->DTS + sample->CTS_Offset;
-				tf->next_sample_dts = sample->DTS + sample_duration;
-				last_sample_dts = sample->DTS;
-
-				if (split_sample_duration) {
-					gf_isom_sample_del(&next);
-					sample->DTS += sample_duration;
-				} else {
-					gf_isom_sample_del(&sample);
-					sample = next;
-					tf->SampleNum += next_sample_num_offset;
-					tf->split_sample_dts_shift = 0;
-				}
-				tf->FragmentLength += sample_duration;
-
-				//done with current sample
-
-				if (loop_track)
-					tf->SampleNum = 0;
-
-				if (force_eos)
-					tf->SampleNum = tf->SampleCount;
-
-				/*compute SAP type*/
-				if (sample) {
-					if (sample->IsRAP) {
-						SAP_type = sample->IsRAP;
-					} else {
-						SAP_type = 0;
-						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, NULL);
-						if (e==GF_OK) {
-							if (is_rap)
-								SAP_type = 3;
-							else if (has_roll && (roll_distance>=0) )
-								SAP_type = 4;
-						}
-					}
-				}
-
-				if (next && SAP_type) {
-					if (tf->is_ref_track) {
-						if (split_seg_at_rap) {
-							Bool next_sap_is_eos=GF_FALSE;
-							u64 next_sap_time;
-							u64 frag_dur, next_dur, cur_frag_dur;
-							next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
-							if (!next_dur) next_dur = sample_duration;
-							/*duration of fragment if we add this rap*/
-							frag_dur = (tf->FragmentLength+next_dur)*dasher->dash_scale / tf->TimeScale;
-							cur_frag_dur = (tf->FragmentLength)*dasher->dash_scale / tf->TimeScale;
-							next_sample_rap = GF_TRUE;
-							next_sap_time = isom_get_next_sap_time(input, tf->OriginalTrack, tf->SampleCount, tf->SampleNum + 2, &next_sap_is_eos);
-
-							/*if no more SAP after this one, do not switch segment*/
-							if (next_sap_time) {
-								u64 next_sap_dur;
-								Bool do_split = GF_FALSE;
-
-								next_sap_time += tf->loop_ts_offset;
-
-								/*this is the fragment duration if we add up to the next SAP */
-								next_sap_dur = frag_dur + (s64) (next_sap_time - tf->next_sample_dts - next_dur) * dasher->dash_scale / tf->TimeScale;
-
-								if (!tf->splitable) {
-
-									/**
-									*** we are at a RAP now, if we keep it in the current segment, we'll have to advance at least to the next RAP
-									*** so we check if the next RAP fit into the limit
-									*** there are two behaviors for segment limits:
-									*** 1. we go as close the segment boundary in media time without going over
-									***    i.e. segment_start = max{ RAP <= segment_number*dash_duration }
-									*** 2. we allow segment to grow up to 150% of the dash duration without drifting more than 50% of dash duration
-									*** audio uses 1., video uses 2. by default and 1. if -bound is specified
-									**/
-
-									// method 1.
-									if (tf->all_sample_raps || dasher->split_on_bound) {
-
-										if (next_sap_time * dasher->dash_scale / (double)tf->TimeScale <= (cur_seg - 1)*MaxSegmentDuration) {
-												if (SegmentDuration + next_sap_dur > MaxSegmentDuration)
-													GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Adjusting for drift for segment %d trackID %d: \tnext_sap_time: %.2f\tsegment_boundary: %d\t segment_duration: %d\n", cur_seg, tf->TrackID, next_sap_time * dasher->dash_scale / (double)tf->TimeScale, (cur_seg - 1)*MaxSegmentDuration, next_sap_dur));
-										}
-										else {
-											do_split = GF_TRUE;
-										}
-
-									}
-									// method 2.
-									else {
-
-										if (SegmentDuration + next_sap_dur >= 3 * MaxSegmentDuration / 2) {
-											do_split = GF_TRUE;
-										}
-
-										else if (!tf->all_sample_raps && !mpd_timeline_bs && use_url_template) {
-
-											Double diff_next, diff_current;
-											Double sdur = ((Double)MaxSegmentDuration) / dasher->dash_scale;
-
-											/* tfdt of first sample in next segment
-											** minus segment start time of next segment
-											** should be less than 50% of duration.
-											** If not we need to break into smaller segments
-											*/
-
-											diff_next = ((Double)next_sap_time) / tf->TimeScale - (cur_seg-1) * sdur;
-											diff_current = ((Double)tf->next_sample_dts) / tf->TimeScale - (cur_seg - 1) * sdur;
-
-											if (diff_next > sdur/2) {
-												do_split = GF_TRUE;
-												seg_dur_adjusted = GF_TRUE;
-												GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Stopping because of drift between next_sap_time=%2.f and boundary=%.2f (drift: %.2f)\n", next_sap_time / (double)tf->TimeScale, (cur_seg-1) * sdur, diff_next));
-											}
-
-											if (dasher->split_on_closest && ABS(diff_next) > ABS(diff_current)) {
-												do_split = GF_TRUE;
-												GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Stopping because of drift between next_sap_time=%.2f and boundary=%.2f (drift: %.2f) is bigger than current drift at %.2f (%.2f).\n", next_sap_time / (double)tf->TimeScale, (cur_seg - 1) * sdur, diff_next, ((Double)tf->next_sample_dts) / tf->TimeScale, diff_current));
-											}
-											//handle the case where we are exactly aligned and not at the end of stream
-											if (!dasher->split_on_closest && !dasher->split_on_bound && !diff_current && (SegmentDuration + cur_frag_dur == MaxSegmentDuration) && !next_sap_is_eos) {
-												do_split = GF_TRUE;
-											}
-										}
-
-									}
-
-
-								}
-
-
-								if (do_split) {
-									split_at_rap = GF_TRUE;
-									/*force new segment*/
-									force_switch_segment = GF_TRUE;
-									stop_frag = GF_TRUE;
-									GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %d trackID %d: Splitting at time %.2f\tnext_sap_time: %.2f\tsegment_boundary: %d\t segment_duration: %d\n", cur_seg, tf->TrackID, tf->next_sample_dts * dasher->dash_scale / (double)tf->TimeScale, next_sap_time * dasher->dash_scale / (double)tf->TimeScale, (cur_seg - 1)*MaxSegmentDuration, next_sap_dur));
-
-								}
-							}
-						} else if (!has_rap) {
-							if (tf->FragmentLength == sample_duration) has_rap = 2;
-							else has_rap = 1;
-						}
-					}
-				} else {
-					next_sample_rap = GF_FALSE;
-				}
-
-				if (tf->cues && sample) {
-					u32 cidx;
-					GF_DASHCueInfo *cue=NULL;
-					Bool is_split = GF_FALSE;
-					s32 has_mismatch = -1;
-					s32 strip_from = -1;
-
-					stop_frag = GF_FALSE;
-					force_switch_segment = GF_FALSE;
-
-					for (cidx=cue_start;cidx<tf->nb_cues; cidx++) {
-						cue = &tf->cues[cidx];
-						if (cue->sample_num) {
-							//ignore first sample
-							if (cue->sample_num==1) continue;
-
-							if (cue->sample_num == tf->SampleNum+1) {
-								is_split = GF_TRUE;
-								break;
-							} else if (cue->sample_num < tf->SampleNum+1) {
-								if (cue->sample_num == tf->SampleNum) {
-									strip_from = cidx;
-								} else {
-									has_mismatch = cidx;
-								}
-							} else {
-								break;
-							}
-						}
-						else if (cue->dts) {
-							u64 ts = cue->dts * tf->TimeScale;
-							u64 ts2 = sample->DTS * tf->cues_timescale;
-							if (ts == ts2) {
-								is_split = GF_TRUE;
-								break;
-							} else if (ts < ts2) {
-								if (last_sample_dts * tf->cues_timescale == ts) {
-									strip_from = cidx;
-								} else {
-									has_mismatch = cidx;
-								}
-							} else {
-								break;
-							}
-						}
-						else if (cue->cts) {
-							s64 ts = cue->cts * tf->TimeScale;
-							s64 ts2 = (sample->DTS + sample->CTS_Offset) * tf->cues_timescale;
-
-							//cues are given in track timeline (presentation time), substract the media time to pres time offset
-							if (tf->cues_use_edits) {
-								ts -= (s64) (tf->media_time_to_pres_time_shift) * tf->TimeScale;
-							}
-							if (ts == ts2) {
-								is_split = GF_TRUE;
-								break;
-							} else if (ts < ts2) {
-								if (tf->last_sample_cts * tf->cues_timescale == ts) {
-									strip_from = cidx;
-								} else {
-									has_mismatch = cidx;
-								}
-							} else {
-								break;
-							}
-						}
-					}
-					if (is_split) {
-						if (!next_sample_rap) {
-							GF_LOG(dasher->strict_cues ?  GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] cue found (sn %d - dts "LLD" - cts "LLD") for track ID %d but sample %d is not RAP !\n", cue->sample_num, cue->dts, cue->cts, tf->TrackID, tf->SampleNum+1));
-							if (dasher->strict_cues) {
-								e = GF_BAD_PARAM;
-								goto err_exit;
-							}
-						}
-						stop_frag = GF_TRUE;
-						force_switch_segment = GF_TRUE;
-						if (!simulation_pass) {
-							tf->cues[cidx].is_processed = GF_TRUE;
-						}
-						cue_start = cidx+1;
-					} else if (strip_from>=0) {
-						cue_start = strip_from+1;
-					}
-
-					if (has_mismatch>=0) {
-						cue = &tf->cues[has_mismatch];
-						GF_LOG(dasher->strict_cues ?  GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] found cue (sn %d - dts "LLD" - cts "LLD") in track ID %d before current sample (sn %d - dts "LLD" - cts "LLD") , buggy source cues ?\n", cue->sample_num, cue->dts, cue->cts, tf->TrackID, tf->SampleNum+1, sample->DTS, sample->DTS + sample->CTS_Offset));
-							if (dasher->strict_cues) {
-								e = GF_BAD_PARAM;
-								goto err_exit;
-							}
-					}
-				} else if (tf->SampleNum==tf->SampleCount) {
-					stop_frag = GF_TRUE;
-				} else if (tf->is_ref_track) {
-					/* NOTE: we don't need to check for split_sample_duration because if it is used, stop_frag should already be TRUE */
-					/*fragmenting on "clock" track: no drift control*/
-					if (!dasher->fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
-						Bool segment_dur_exceeded = GF_FALSE;
-						Bool last_frag_in_seg = GF_FALSE;
-						u64 seg_dur = (u64) (SegmentDuration + (tf->FragmentLength * dasher->dash_scale / tf->TimeScale));
-
-						if (seg_dur >= MaxSegmentDuration) {
-							last_frag_in_seg = GF_TRUE;
-							segment_dur_exceeded = GF_TRUE;
-						}
-
-						if ((!last_frag_in_seg && (tf->FragmentLength * dasher->dash_scale >= MaxFragmentDuration * tf->TimeScale))
-						        /* if we don't split segment at rap and if the current fragment makes the segment longer than required, stop the current fragment */
-						        || (!split_seg_at_rap && segment_dur_exceeded)
-								/* this can only happen if seg==MaxSegmentDuration, stop to avoid split with sample_duration==0 on next loop */
-								|| (tf->splitable && segment_dur_exceeded)
-						   ) {
-
-							stop_frag = GF_TRUE;
-						}
-					}
-				}
-				/*do not abort fragment if ref track is done, put everything in the last fragment*/
-				else if (!flush_all_samples) {
-					u64 ept_next;
-					u64 tref_ept_next = get_presentation_time(ref_track_next_cts, tfref->media_time_to_pres_time_shift);
-					/*get next sample dts: if greater than tref EPT, abort. This ensures that we have at most
-					one au wihth EPT less than ref EPT*/
-					u64 next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
-					if (!next_dur) next_dur = sample_duration;
-					ept_next = get_presentation_time(tf->next_sample_dts + next_dur, tf->media_time_to_pres_time_shift);
-					/*fragmenting on "non-clock" track: drift control*/
-					if (ept_next * tfref_timescale > tref_ept_next * tf->TimeScale)
-						stop_frag = GF_TRUE;
-				}
-
-				if (stop_frag) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done with fragment %d, fragment length %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength));
-					gf_isom_sample_del(&sample);
-					sample = next = NULL;
-
-					if (!ref_SAP_type)
-						ref_SAP_type = SAP_type ? SAP_type : ref_start_SAP_type;
-
-					//only compute max dur over segment for the track used for indexing / deriving MPD start time
-					if (!tfref || (tf->is_ref_track)) {
-						Double f_dur = (Double)( tf->FragmentLength ) * dasher->dash_scale / tf->TimeScale;
-						if (maxFragDurationOverSegment <= f_dur) {
-							maxFragDurationOverSegment = f_dur;
-						}
-					}
-					tf->FragmentLength = 0;
-					/* propagate the portion of the current 'split' sample that has already been used in this fragment
-					   to the next fragment */
-					if (split_sample_duration)
-						tf->split_sample_dts_shift += sample_duration;
-
-					//if (tf==tfref)
-					//last_ref_cts = tf->last_sample_cts;
-
-					break;
-				}
-			}
-
-			if (tf->SampleNum==tf->SampleCount) {
-				tf->done = GF_TRUE;
-				nb_tracks_done++;
-				if (tf->is_ref_track) {
-					tfref = NULL;
-					flush_all_samples = GF_TRUE;
-				}
-			}
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, done with fragment %d, fragment length %d\n", SegmentName, nbFragmentInSegment, tf->FragmentLength));
-
-		SegmentDuration += maxFragDurationOverSegment;
-
-		/*if no simulation and no SIDX or realtime is used, flush fragments as we write them*/
-		if (!simulation_pass && (!dasher->enable_sidx || dasher->real_time) ) {
-
-			if (tfref && dasher->real_time) {
-				u64 utc, end_time = tfref->InitialTSOffset + tfref->next_sample_dts - tfref->sample_duration;
-				end_time *= 1000;
-				end_time /= tfref->TimeScale;
-
-				assert(tfref->InitialTSOffset + tfref->next_sample_dts >= tfref->sample_duration);
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, going to sleep before flushing fragment %d at "LLU" us, at UTC "LLU" (flush target UTC "LLU")\n", SegmentName, nbFragmentInSegment, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + end_time));
-				while (1) {
-					utc = gf_net_get_utc();
-					if (utc >= generation_start_utc + end_time) break;
-					gf_sleep(1);
-				}
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, flushing fragment %d at "LLU" us, at UTC "LLU" (flush target UTC "LLU")\n", SegmentName, nbFragmentInSegment,
-				                                   gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + end_time));
-			}
-
-			e = gf_isom_flush_fragments(output, flush_all_samples ? GF_TRUE : GF_FALSE);
-			if (e) goto err_exit;
-
-			nbFragmentInSegment++;
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s, fragment %d flushed\n", SegmentName, nbFragmentInSegment));
-
-		if (force_switch_segment || flush_all_samples || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap || tf->splitable))) {
-			//don't update min_seg_dur if this is the last segment
-			if (!min_seg_dur || (!flush_all_samples && (min_seg_dur>SegmentDuration)))
-				min_seg_dur = SegmentDuration;
-
-			//remember max sap type at start of segment
-			if (!max_sap_type && ref_SAP_type)
-				max_sap_type = ref_SAP_type;
-			else if (ref_SAP_type > max_sap_type)
-				max_sap_type = ref_SAP_type;
-
-			if (max_seg_dur < SegmentDuration)
-				max_seg_dur = SegmentDuration;
-
-			total_seg_dur += SegmentDuration;
-			last_seg_dur = SegmentDuration;
-
-			if (mpd_timeline_bs) {
-				u64 s_start, s_end;
-
-				u32 tick_adjust = 0;
-				//since dash scale and ref track used for segmentation may not have the same timescale we will have drift in segment timelines. Adjust it
-				if (tfref) {
-					s64 seg_start_time_min_cts = (s64) (tfref->min_cts_in_segment + tfref->media_time_to_pres_time_shift) * dasher->dash_scale;
-					u64 seg_start_time_mpd = (period_duration + (u64)segment_start_time) * tfref->TimeScale;
-
-					//if first CTS in segment is less than 0, this means that we have AUs that are not presented due to edit list.
-					//adjust the segment duration accordingly.
-					if (seg_start_time_min_cts<0) {
-						s64 mpd_time_adjust = seg_start_time_min_cts / tfref->TimeScale;
-						if ((s64) SegmentDuration < - mpd_time_adjust) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Segment duration is less than media time from edit list (%d vs %d)\n", MaxSegmentDuration, -tfref->media_time_to_pres_time_shift));
-							e = GF_BAD_PARAM;
-							goto err_exit;
-						}
-						SegmentDuration += mpd_time_adjust;
-						seg_start_time_min_cts=0;
-					}
-
-					if (seg_start_time_mpd != seg_start_time_min_cts) {
-						//compute diff in dash timescale
-						Double diff = (Double) seg_start_time_min_cts;
-						diff -= (Double) seg_start_time_mpd;
-						diff /= tfref->TimeScale;
-
-						//if we are ahead we will adjust keep track of how many ticks we miss
-						if (diff >= 1) {
-							tick_adjust = (u32) diff;
-							if (tick_adjust > 1) {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Drift between minCTS of segment and MPD start time is %g s\n", diff/dasher->dash_scale));
-							}
-						}
-					}
-				}
-
-				s_start = (u64)( (period_duration + (u64)segment_start_time) * mpd_timescale );
-				s_end = (u64)( (period_duration + (u64)(segment_start_time + SegmentDuration) + tick_adjust)*mpd_timescale );
-				s_start /= dasher->dash_scale;
-				s_end /= dasher->dash_scale;
-
-				//adjust
-				period_duration += tick_adjust;
-
-				gf_dash_append_segment_timeline(mpd_timeline_bs, s_start, s_end, &previous_segment_duration, &first_segment_in_timeline, &segment_timeline_repeat_count);
-				gf_dasher_store_segment_info(dasher, dash_input->representationID, SegmentName, s_start, s_end, mpd_timescale);
-			}
-			else {
-				gf_dasher_store_segment_info(dasher, dash_input->representationID, SegmentName, period_duration + (u64)segment_start_time, (u64)(period_duration + segment_start_time + SegmentDuration), dasher->dash_scale);
-			}
-			if (dasher->max_segment_duration * dasher->dash_scale < SegmentDuration) {
-				dasher->max_segment_duration = (Double) SegmentDuration;
-				dasher->max_segment_duration /= dasher->dash_scale;
-			}
-
-
-			segment_start_time += SegmentDuration;
-			nb_segments++;
-			/*if (max_segment_duration * dasher->dash_scale <= SegmentDuration) {
-				max_segment_duration = (Double) (s64) SegmentDuration;
-				max_segment_duration /= dasher->dash_scale;
-			}*/
-			force_switch_segment = GF_FALSE;
-			switch_segment = GF_TRUE;
-			SegmentDuration = 0;
-			split_at_rap = GF_FALSE;
-			has_rap = GF_FALSE;
-			/*restore fragment duration*/
-			MaxFragmentDuration = (u32) (dasher->fragment_duration * dasher->dash_scale);
-
-			if (!simulation_pass) {
-				u64 idx_start_range, idx_end_range;
-				Bool last_segment = flush_all_samples ? GF_TRUE : GF_FALSE;
-
-				if (dasher->subduration && (segment_start_time + MaxSegmentDuration/2 >= dasher->dash_scale * dasher->subduration)) {
-					//onDemand with subdur: if we are done dashing the content set last segment to TRUE to flush sidx
-					//live and end of period forced, force last segment
-					if (dasher->force_period_end || (dasher->single_file_mode==1) )
-						last_segment = GF_TRUE;
-				}
-
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU" - segment AST "LLU" (MPD AST "LLU")\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc(), generation_start_utc + period_duration + (u64)segment_start_time, generation_start_utc ));
-				gf_isom_close_segment(output, dasher->enable_sidx ? dasher->subsegs_per_sidx : 0, dasher->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dasher->daisy_chain_sidx, dasher->use_ssix, last_segment, GF_FALSE, dasher->segment_marker_4cc, &idx_start_range, &idx_end_range, NULL);
-				nbFragmentInSegment = 0;
-
-				//take care of scalable reps
-				if (dash_input->moof_seqnum_increase) {
-					u32 frag_index = gf_isom_get_next_moof_number(output) - 1 + dash_input->moof_seqnum_increase;
-					gf_isom_set_next_moof_number(output, frag_index);
-				}
-
-				ref_track_first_dts = (u64) -1;
-
-				if (!seg_rad_name) {
-					file_size = gf_isom_get_file_size(output);
-					end_range = file_size - 1;
-					if (dasher->single_file_mode!=1) {
-						sprintf(szMPDTempLine, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
-						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						if (idx_start_range || idx_end_range) {
-							sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
-							gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						}
-						gf_bs_write_data(mpd_bs, "/>\n", 3);
-
-						if (dasher->dash_ctx) {
-							char szKey[100], szVal[4046];
-							sprintf(szKey, "UrlInfo%d", cur_seg );
-							sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-							gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
-						}
-					}
-				} else {
-					file_size += gf_isom_get_file_size(output);
-				}
-			}
-
-			/*next fragment will exceed segment length, abort fragment at next rap (possibly after MaxSegmentDuration)*/
-			if (split_seg_at_rap && SegmentDuration && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
-				if (!split_at_rap) {
-					split_at_rap = GF_TRUE;
-				}
-			}
-		}
-		if (nb_tracks_done==count)
-			break;
-	}
-
-	if (simulation_pass) {
-		/*OK, we have all segments and frags per segments*/
-		gf_isom_allocate_sidx(output, dasher->subsegs_per_sidx, dasher->daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range, dasher->use_ssix );
-		gf_free(segments_info);
-		segments_info = NULL;
-		simulation_pass = GF_FALSE;
-		/*reset fragmenters*/
-		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			tf->done = GF_FALSE;
-			tf->last_sample_cts = 0;
-			tf->next_sample_dts = 0;
-			tf->FragmentLength = 0;
-			tf->SampleNum = 0;
-			if (tf->is_ref_track)
-				tfref = tf;
-		}
-		cue_start = 0;
-		goto restart_fragmentation_pass;
-	}
-
-	/*flush last segment*/
-	if (!switch_segment) {
-		u64 idx_start_range, idx_end_range;
-
-		segment_start_time += SegmentDuration;
-		total_seg_dur += SegmentDuration;
-		last_seg_dur = SegmentDuration;
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Closing segment %s at "LLU" us, at UTC "LLU"\n", SegmentName, gf_sys_clock_high_res(), gf_net_get_utc()));
-		gf_isom_close_segment(output, dasher->enable_sidx ? dasher->subsegs_per_sidx : 0, dasher->enable_sidx ? ref_track_id : 0, ref_track_first_dts, tfref ? tfref->media_time_to_pres_time_shift : tf->media_time_to_pres_time_shift, ref_track_next_cts, dasher->daisy_chain_sidx, dasher->use_ssix, GF_TRUE, GF_FALSE, dasher->segment_marker_4cc, &idx_start_range, &idx_end_range, NULL);
-		nb_segments++;
-
-		if (!seg_rad_name) {
-			file_size = gf_isom_get_file_size(output);
-			end_range = file_size - 1;
-			if (dasher->single_file_mode!=1) {
-				sprintf(szMPDTempLine, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);
-				gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-				if (idx_start_range || idx_end_range) {
-					sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
-					gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-				}
-				gf_bs_write_data(mpd_bs, "/>\n", 3);
-
-				if (dasher->dash_ctx) {
-					char szKey[100], szVal[4046];
-					sprintf(szKey, "UrlInfo%d", cur_seg );
-					sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-					gf_cfg_set_key(dasher->dash_ctx, RepURLsSecName, szKey, szVal);
-				}
-			}
-		} else {
-			file_size += gf_isom_get_file_size(output);
-		}
-	}
-	//close timeline
-	if (mpd_timeline_bs) {
-		if (previous_segment_duration * dasher->dash_scale == SegmentDuration * mpd_timescale) {
-			segment_timeline_repeat_count ++;
-			sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-		} else {
-			if (previous_segment_duration) {
-				if (segment_timeline_repeat_count) {
-					sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-				} else {
-					sprintf(szMPDTempLine, "/>\n");
-				}
-				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-			}
-			if (SegmentDuration) {
-				if (first_segment_in_timeline) {
-					sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) segment_start_time, (u64) SegmentDuration );
-					first_segment_in_timeline = GF_FALSE;
-				} else {
-					sprintf(szMPDTempLine, "     <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
-				}
-				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-			}
-		}
-
-		sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
-		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-	}
-	else if (!dasher->use_segment_timeline) {
-		if (3*min_seg_dur < max_seg_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration variation is higher than the +/- 50%% allowed by DASH-IF (min %g, max %g) - please reconsider encoding\n", (Double) min_seg_dur / dasher->dash_scale, (Double) max_seg_dur / dasher->dash_scale));
-		}
-		if (dasher->dash_ctx) {
-			if (!seg_dur_adjusted && ((Double) max_seg_dur / dasher->dash_scale < dasher->segment_duration/2)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segment duration is smaller than required (require %g s but DASH-ing only %g s)\n", dasher->segment_duration, (Double) max_seg_dur / dasher->dash_scale));
-			}
-			max_segment_duration = max_seg_dur;
-			max_segment_duration /= 1000;
-		} else {
-			if (nb_segments == 1) {
-				max_segment_duration = (Double) total_seg_dur;
-				max_segment_duration /= nb_segments * dasher->dash_scale;
-			} else {
-				max_segment_duration = (Double) (total_seg_dur - last_seg_dur);
-				max_segment_duration /= (nb_segments - 1) * dasher->dash_scale;
-			}
-		}
-	}
-
-
-write_rep_only:
-
-    if (!bandwidth) {
-    	for (i=0; i<gf_list_count(fragmenters); i++) {
-    		u32 bw=0;
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			gf_isom_get_bitrate(input, tf->OriginalTrack, 0, &bw, NULL, NULL);
-			if (!bw) {
-				u64 msize = gf_isom_get_media_data_size(input, tf->OriginalTrack);
-				msize *= 8;
-				bw = (u32) (msize / file_duration);
-			}
-			bandwidth += (u32) bw;
-		}
-	}
-
-    bandwidth += dash_input->dependency_bandwidth;
-    dash_input->bandwidth = bandwidth;
-
-
-	/* max segment duration */
-	if (dasher->dash_ctx) {
-		Double seg_dur;
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
-		if (opt) {
-			seg_dur = atof(opt);
-			if (seg_dur < max_segment_duration) {
-				sprintf(sOpt, "%f", max_segment_duration);
-				gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-			} else {
-				max_segment_duration = seg_dur;
-			}
-		} else {
-			sprintf(sOpt, "%f", max_segment_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-		}
-	}
-
-	max_segment_duration = dasher->segment_duration;
-
-	/* Write adaptation set content protection element */
-	if (protected_track && first_in_set && (dasher->cp_location_mode != GF_DASH_CPMODE_REPRESENTATION)) {
-		gf_isom_write_content_protection(input, dasher->mpd, protected_track, dasher, 3);
-	}
-
-	if (use_url_template) {
-		/*segment template does not depend on file name, write the template at the adaptationSet level*/
-		if (!dasher->variable_seg_rad_name && first_in_set) {
-			const char *rad_name = gf_dasher_strip_output_dir(dasher->mpd_name, seg_rad_name);
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, 0, 0, dasher->use_segment_timeline);
-			fprintf(dasher->mpd, "   <SegmentTemplate media=\"%s\"", SegmentName);
-
-			/*in BS switching we share the same IS for all reps*/
-			if (is_bs_switching) {
-				strcpy(SegmentName, bs_switching_segment_name);
-			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, 0, 0, dasher->use_segment_timeline);
-			}
-			fprintf(dasher->mpd, " initialization=\"%s\"", SegmentName);
-
-			fprintf(dasher->mpd, " timescale=\"%d\"", mpd_timescale);
-			fprintf(dasher->mpd, " startNumber=\"%d\"", startNumber);
-			if (!dasher->use_segment_timeline) {
-				fprintf(dasher->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
-			}
-
-			if (presentationTimeOffset)
-				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-
-			if (dasher->ast_offset_ms<0) {
-				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-			}
-
-			if (mpd_timeline_bs) {
-				char *mpd_seg_info = NULL;
-				u32 size;
-				fprintf(dasher->mpd, ">\n");
-
-				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
-				gf_free(mpd_seg_info);
-				fprintf(dasher->mpd, "   </SegmentTemplate>\n");
-			} else {
-				fprintf(dasher->mpd, "/>\n");
-			}
-		}
-		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
-		else if ((is_bs_switching || mpd_timeline_bs) && first_in_set && !dasher->segment_alignment_disabled) {
-			fprintf(dasher->mpd, "   <SegmentTemplate");
-			if (is_bs_switching) {
-				fprintf(dasher->mpd, " initialization=\"%s\"", bs_switching_segment_name);
-				if (presentationTimeOffset)
-					fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-			}
-			if (dasher->ast_offset_ms<0) {
-				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-			}
-
-			if (mpd_timeline_bs) {
-				char *mpd_seg_info = NULL;
-				u32 size;
-
-
-				fprintf(dasher->mpd, " timescale=\"%d\">\n", mpd_timescale);
-
-				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
-				gf_free(mpd_seg_info);
-				fprintf(dasher->mpd, "   </SegmentTemplate>\n");
-			} else {
-				fprintf(dasher->mpd, "/>\n");
-			}
-		}
-	}
-	else if ((dasher->single_file_mode!=1) && mpd_timeline_bs) {
-		char *mpd_seg_info = NULL;
-		u32 size;
-
-		fprintf(dasher->mpd, "   <SegmentList timescale=\"%d\"", dasher->dash_scale);
-		if (dasher->ast_offset_ms<0) {
-			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-		}
-		fprintf(dasher->mpd, "\n");
-
-		gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
-		gf_free(mpd_seg_info);
-		fprintf(dasher->mpd, "   </SegmentList>\n");
-	}
-
-	fprintf(dasher->mpd, "   <Representation ");
-	if ( strlen(dash_input->representationID) ) fprintf(dasher->mpd, "id=\"%s\"", dash_input->representationID);
-	else fprintf(dasher->mpd, "id=\"%p\"", output);
-
-	fprintf(dasher->mpd, " mimeType=\"%s/mp4\" codecs=\"%s\"", (!nb_audio && !nb_video && !nb_auxv) ? "application" : (!nb_video && !nb_auxv ? "audio" : "video"), szCodecs);
-	if (width && height) {
-		fprintf(dasher->mpd, " width=\"%u\" height=\"%u\"", width, height);
-
-		/*this is a video track*/
-		if (fps_num || fps_denum) {
-			gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-			if (fps_denum>1)
-				fprintf(dasher->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
-			else
-				fprintf(dasher->mpd, " frameRate=\"%d\"", fps_num);
-
-			if (!sar_w) sar_w = 1;
-			if (!sar_h) sar_h = 1;
-			fprintf(dasher->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
-		}
-	}
-	if (sample_rate) fprintf(dasher->mpd, " audioSamplingRate=\"%d\"", sample_rate);
-
-	//single segment (onDemand profiles, assumes we always start with an IDR), don't write
-	if (dasher->single_file_mode != 1) {
-		if (segments_start_with_sap || split_seg_at_rap) {
-			//don't write startWithSAP on final dynamic->static conversion, we don't have the info
-			if (max_sap_type != 1) {
-				fprintf(dasher->mpd, " startWithSAP=\"%d\"", max_sap_type);
-			}
-		} else {
-			fprintf(dasher->mpd, " startWithSAP=\"0\"");
-		}
-	}
-
-
-	//only appears at AdaptationSet level - need to rewrite the DASH segementer to allow writing this at the proper place
-//		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dasher->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
-
-	fprintf(dasher->mpd, " bandwidth=\"%d\"", bandwidth);
-	if (dash_input->dependencyID)
-		fprintf(dasher->mpd, " dependencyId=\"%s\"", dash_input->dependencyID);
-	fprintf(dasher->mpd, ">\n");
-
-	/* baseURLs */
-	if (dash_input->nb_baseURL) {
-		for (i=0; i<dash_input->nb_baseURL; i++) {
-			fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n", dash_input->baseURL[i]);
-		}
-	}
-
-	/* writing Representation level descriptors */
-	if (dash_input->nb_rep_descs) {
-		for (i=0; i<dash_input->nb_rep_descs; i++) {
-			if (strchr(dash_input->rep_descs[i], '<') != NULL) {
-				fprintf(dasher->mpd, "    %s\n", dash_input->rep_descs[i]);
-			}
-		}
-	}
-
-	if (nb_channels && !is_bs_switching) {
-		if (!nb_surround && !nb_lfe) {
-			fprintf(dasher->mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", nb_channels );
-		} else {
-			fprintf(dasher->mpd, "    <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:mpegB:cicp:ChannelConfiguration\" value=\"%d\"/>\n", cicp_get_channel_config(nb_channels, nb_surround, nb_lfe) );
-		}
-	}
-
-	/* Write content protection element in representation */
-	if (protected_track && (dasher->cp_location_mode != GF_DASH_CPMODE_ADAPTATION_SET)) {
-		gf_isom_write_content_protection(input, dasher->mpd, protected_track, dasher, 4);
-	}
-
-	if (use_url_template) {
-		/*segment template depends on file name, but the template at the representation level*/
-		if (dasher->variable_seg_rad_name) {
-			const char *rad_name = gf_dasher_strip_output_dir(dasher->mpd_name, seg_rad_name);
-#ifdef GENERATE_VIRTUAL_REP_SRD
-			//if virtual rep, SegmentName already contains the name of the empty media segment used
-			if (!dash_input->virtual_representation)
-#endif
-			{
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
-			}
-
-			fprintf(dasher->mpd, "    <SegmentTemplate media=\"%s\"", SegmentName);
-
-			//don't write init if scalable rep
-			if (!is_bs_switching && !dash_input->idx_representations) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, rad_name, !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, 0, 0, dasher->use_segment_timeline);
-				fprintf(dasher->mpd, " initialization=\"%s\"", SegmentName);
-			}
-			fprintf(dasher->mpd, " timescale=\"%d\"", mpd_timescale);
-			fprintf(dasher->mpd, " startNumber=\"%d\"", startNumber);
-			if (!dasher->use_segment_timeline) {
-				fprintf(dasher->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale + 0.5));
-			}
-			if (presentationTimeOffset)
-				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-
-			if (dasher->ast_offset_ms<0) {
-				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-			}
-
-			if (mpd_timeline_bs && (!first_in_set || dasher->segment_alignment_disabled) ) {
-				char *mpd_seg_info = NULL;
-				u32 size;
-				fprintf(dasher->mpd, ">\n");
-
-				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
-				gf_free(mpd_seg_info);
-				fprintf(dasher->mpd, "   </SegmentTemplate>\n");
-			} else {
-				fprintf(dasher->mpd, "/>\n");
-			}
-		}
-	} else if (dasher->single_file_mode==1) {
-#ifdef GENERATE_VIRTUAL_REP_SRD
-		if (dash_input->virtual_representation) {
-			fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n", SegmentName);
-			fprintf(dasher->mpd, "    <SegmentBase />\n");
-		} else
-#endif
-		{
-			fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dasher->mpd_name,  gf_isom_get_filename(output) ) );
-			fprintf(dasher->mpd, "    <SegmentBase indexRangeExact=\"true\" indexRange=\"%d-%d\"", index_start_range, index_end_range);
-
-			if (presentationTimeOffset)
-				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-			if (!is_bs_switching) {
-				fprintf(dasher->mpd, ">\n");
-				fprintf(dasher->mpd, "     <Initialization range=\"%d-%d\"/>\n", 0, index_start_range-1);
-				fprintf(dasher->mpd, "    </SegmentBase>\n");
-			} else {
-				fprintf(dasher->mpd, "/>\n");
-			}
-		}
-	} else {
-		if (!seg_rad_name) {
-			fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n", gf_dasher_strip_output_dir(dasher->mpd_name,  gf_isom_get_filename(output) ) );
-		}
-		fprintf(dasher->mpd, "    <SegmentList");
-		if (!mpd_timeline_bs) {
-			fprintf(dasher->mpd, " timescale=\"%d\" duration=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale + 0.5));
-		}
-		if (presentationTimeOffset) {
-			fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset);
-		}
-		if (dasher->ast_offset_ms<0) {
-			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-		}
-		fprintf(dasher->mpd, ">\n");
-		/*we are not in bitstreamSwitching mode*/
-		if (!is_bs_switching) {
-			fprintf(dasher->mpd, "     <Initialization");
-			if (!seg_rad_name) {
-				fprintf(dasher->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
-			} else {
-#ifdef GENERATE_VIRTUAL_REP_SRD
-				//if virtual rep, SegmentName already contains the name of the empty media segment used
-				if (!dash_input->virtual_representation)
-#endif
-				{
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name,  seg_rad_name) , !stricmp(init_seg_ext, "null") ? NULL : init_seg_ext, 0, bandwidth, 0, dasher->use_segment_timeline);
-				}
-				fprintf(dasher->mpd, " sourceURL=\"%s\"", SegmentName);
-			}
-			fprintf(dasher->mpd, "/>\n");
-		}
-	}
-	if (mpd_bs) {
-		char *mpd_seg_info = NULL;
-		u32 size;
-		gf_bs_get_content(mpd_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dasher->mpd);
-		gf_free(mpd_seg_info);
-	}
-
-	if (!use_url_template && (dasher->single_file_mode!=1)) {
-		fprintf(dasher->mpd, "    </SegmentList>\n");
-	}
-
-	fprintf(dasher->mpd, "   </Representation>\n");
-
-
-	/*store context*/
-	if (dasher->dash_ctx) {
-		period_duration += (u64)segment_start_time; //change to get a Double period duration
-		count = gf_list_count(fragmenters);
-		for (i=0; i<count; i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-
-			/*InitialTSOffset is used when joining different files - if we are still in the same file , do not update it*/
-			if (tf->done) {
-				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-				sprintf(sOpt, LLU, tf->InitialTSOffset + tf->next_sample_dts);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
-			}
-
-			if (dasher->subduration) {
-				sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
-				sprintf(sOpt, "%d", tf->SampleNum);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-
-				sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
-				sprintf(sOpt, LLU, tf->last_sample_cts);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-
-				sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
-				sprintf(sOpt, LLU, tf->next_sample_dts);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-
-				sprintf(sKey, "TKID_%d_MediaTimeToPresTime", tf->TrackID);
-				sprintf(sOpt, "%d", tf->media_time_to_pres_time_shift);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
-
-				sprintf(sKey, "TKID_%d_LoopTSOffset", tf->TrackID);
-				sprintf(sOpt, LLU, tf->loop_ts_offset);
-				gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, (tf->done && dasher->disable_loop) ? NULL : sOpt);
-
-			}
-		}
-		sprintf(sOpt, "%d", cur_seg);
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
-
-		fragment_index = gf_isom_get_next_moof_number(output);
-		sprintf(sOpt, "%d", fragment_index);
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
-
-		sprintf(sKey, "MaxSAPType");
-		sprintf(sOpt, "%d", max_sap_type);
-		gf_cfg_set_key(dasher->dash_ctx, RepSecName, sKey, sOpt);
-
-		if (!dasher->force_session_end) {
-			sprintf(sOpt, LLU, period_duration);
-			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
-		}
-		if (store_dash_params) {
-			sprintf(sOpt, "%u", bandwidth);
-			gf_cfg_set_key(dasher->dash_ctx, RepSecName, "Bandwidth", sOpt);
-		}
-		//done with this file
-		if ((nb_tracks_done==count) && dasher->disable_loop) {
-			dasher->force_period_end = GF_TRUE;
-		}
-
-	}
-
-err_exit:
-	if (langCode) {
-		gf_free(langCode);
-	}
-	if (fragmenters) {
-		while (gf_list_count(fragmenters)) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
-			if (!e && tf->nb_cues) {
-				for (i = 0; i < tf->nb_cues; i++) {
-					if (!tf->cues[i].is_processed) {
-						GF_LOG(dasher->strict_cues ? GF_LOG_ERROR : GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Track ID %d has cue #%d not processed after segmentation\n", tf->TrackID, i));
-						if (dasher->strict_cues) e = GF_BAD_PARAM;
-					}
-				}
-			}
-			if (tf->cues) gf_free(tf->cues);
-			gf_free(tf);
-			gf_list_rem(fragmenters, 0);
-		}
-		gf_list_del(fragmenters);
-	}
-	if (output) {
-		if (e) gf_isom_delete(output);
-		else gf_isom_close(output);
-	}
-	if (!bs_switching_is_output && bs_switch_segment)
-		gf_isom_delete(bs_switch_segment);
-	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
-	if (mpd_bs) gf_bs_del(mpd_bs);
-	if (mpd_timeline_bs) gf_bs_del(mpd_timeline_bs);
-	return e;
-}
-
-
-static GF_Err dasher_isom_get_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
-{
-	u32 i;
-	GF_ISOFile *in;
-	Double dur;
-	GF_Err e;
-
-	in = gf_isom_open(input->file_name, GF_ISOM_OPEN_READ, NULL);
-	input->duration = 0;
-	for (i=0; i<gf_isom_get_track_count(in); i++) {
-		u32 mtype = gf_isom_get_media_type(in, i+1);
-
-		if (input->trackNum && (input->trackNum != i+1))
-			continue;
-
-		if (input->single_track_num && (input->single_track_num != i+1))
-			continue;
-
-		if (mtype == GF_ISOM_MEDIA_HINT)
-			continue;
-
-		//we allow single sample tracks to be dashed, might want to disable BIFS and OD ...
-
-		dur = 0;
-		if (gf_isom_get_edit_segment_count(in, i+1)) {
-			dur = (Double) gf_isom_get_track_duration(in, i+1);
-			dur /= gf_isom_get_timescale(in);
-		}
-		if (!dur) {
-			dur = (Double) gf_isom_get_media_duration(in, i+1);
-			dur /= gf_isom_get_media_timescale(in, i+1);
-		}
-		if (dur > input->duration) input->duration = dur;
-
-		input->components[input->nb_components].duration = dur;
-
-		input->components[input->nb_components].ID = gf_isom_get_track_id(in, i+1);
-		input->components[input->nb_components].media_type = mtype;
-		gf_isom_get_media_language(in, i+1, &input->components[input->nb_components].lang);
-
-        if (gf_isom_is_video_subtype(mtype)) {
-			gf_isom_get_visual_info(in, i+1, 1, &input->components[input->nb_components].width, &input->components[input->nb_components].height);
-
-			input->components[input->nb_components].fps_num = gf_isom_get_media_timescale(in, i+1);
-			/*get duration of track or of 2nd sample otherwise*/
-			if (gf_isom_get_track_duration(in, i + 1)) {
-				input->components[input->nb_components].fps_denum = (u32)(gf_isom_get_media_duration(in, i+1) / gf_isom_get_sample_count(in, i+1) );
-			} else {
-				input->components[input->nb_components].fps_denum = gf_isom_get_sample_duration(in, i+1, 2);
-			}
-			gf_isom_get_pixel_aspect_ratio(in, i+1, 1, &input->components[input->nb_components].sar_num, &input->components[input->nb_components].sar_denum);
-
-			switch (gf_isom_get_media_subtype(in, i+1, 1) ) {
-			case GF_ISOM_SUBTYPE_HVT1:
-				input->components[input->nb_components].hevc_tile_type = 2;
-				break;
-			case GF_ISOM_SUBTYPE_HVC2:
-			case GF_ISOM_SUBTYPE_HEV2:
-				if (gf_isom_get_reference_count(in, i+1, GF_ISOM_REF_SABT)>0)
-					input->components[input->nb_components].hevc_tile_type = 1;
-				break;
-			default:
-				break;
-			}
-		}
-		/*non-video tracks, get lang*/
-		else if (mtype == GF_ISOM_MEDIA_AUDIO) {
-			u8 bps;
-			e = isom_get_audio_info_with_m4a_sbr_ps(in, i+1, 1, &input->components[input->nb_components].sample_rate, &input->components[input->nb_components].channels, &bps);
-			if (e) {
-				if (opts->profile == GF_DASH_PROFILE_AVC264_LIVE || opts->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
-					//DASH-IF IOP 3.3 mandates the SBR/PS info
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("DASH input: could not get audio info, %s\n", gf_error_to_string(e)));
-					goto error_exit;
-				}
-			}
-		}
-
-		input->nb_components++;
-	}
-	return gf_isom_close(in);
-
-error_exit:
-	gf_isom_close(in);
-	return e;
-}
-
-static Bool dasher_inputs_have_same_roles(GF_DashSegInput *d1, GF_DashSegInput *d2)
-{
-	if (d1->roles && d2->roles) {
-		if (d1->nb_roles != d2->nb_roles)
-			return GF_FALSE;
-		else {
-			u32 r1, r2;
-			for (r1=0; r1<d1->nb_roles; r1++) {
-				Bool found = GF_FALSE;
-				for (r2=0; r2<d2->nb_roles; r2++) {
-					if (!strcmp(d1->roles[r1], d2->roles[r2])) {
-						found = GF_TRUE;
-						break;
-					}
-				}
-				if (!found) return GF_FALSE;
-			}
-			return GF_TRUE;
-		}
-	}
-	if (!d1->roles && !d2->roles)
-		return GF_TRUE;
-
-	return GF_FALSE;
-}
-
-static GF_Err dasher_isom_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
-{
-	u32 i, j;
-	GF_ISOFile *set_file;
-
-	if (input_idx+1>=nb_dash_inputs)
-		return GF_OK;
-
-	set_file = gf_isom_open(dash_inputs[input_idx].file_name, GF_ISOM_OPEN_READ, NULL);
-
-	for (i=input_idx+1; i<nb_dash_inputs; i++) {
-		Bool has_same_desc = GF_TRUE;
-		Bool valid_in_adaptation_set = GF_TRUE;
-		Bool assign_to_group = GF_TRUE;
-		GF_ISOFile *in;
-
-		if (dash_inputs[input_idx].period != dash_inputs[i].period)
-			continue;
-
-		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
-			continue;
-
-		if (! dasher_inputs_have_same_roles(&dash_inputs[input_idx], &dash_inputs[i]) ) {
-			continue;
-		}
-
-		/* 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 (dash_inputs[input_idx].nb_as_descs != dash_inputs[i].nb_as_descs)
-			continue;
-		for (j = 0; j < dash_inputs[input_idx].nb_as_descs; j++) {
-			if (strcmp(dash_inputs[input_idx].as_descs[j], dash_inputs[i].as_descs[j])) {
-				has_same_desc= GF_FALSE;
-				break;
-			}
-		}
-		if (!has_same_desc) continue;
-
-		if (dash_inputs[input_idx].x != dash_inputs[i].x) continue;
-		if (dash_inputs[input_idx].y != dash_inputs[i].y) continue;
-		if (dash_inputs[input_idx].w != dash_inputs[i].w) continue;
-		if (dash_inputs[input_idx].h != dash_inputs[i].h) continue;
-#ifdef GENERATE_VIRTUAL_REP_SRD
-		if (dash_inputs[i].virtual_representation) continue;
-#endif
-
-		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-
-		for (j=0; j<gf_isom_get_track_count(set_file); j++) {
-			u32 mtype, msub_type;
-			Bool same_codec = GF_TRUE;
-			u32 track = gf_isom_get_track_by_id(in, gf_isom_get_track_id(set_file, j+1));
-
-			if (dash_inputs[input_idx].single_track_num && ((j + 1) != dash_inputs[input_idx].single_track_num))
-				continue;
-
-			if (!track) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-
-			if (dash_inputs[input_idx].single_track_num && (dash_inputs[input_idx].single_track_num != j+1))
-				continue;
-
-			if (dash_inputs[i].single_track_num) {
-				track = dash_inputs[i].single_track_num;
-			}
-
-			mtype = gf_isom_get_media_type(set_file, j+1);
-			if (mtype != gf_isom_get_media_type(in, track)) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-			msub_type = gf_isom_get_media_subtype(set_file, j+1, 1);
-			if (msub_type != gf_isom_get_media_subtype(in, track, 1)) same_codec = GF_FALSE;
-			if ((msub_type==GF_ISOM_SUBTYPE_MPEG4)
-			        || (msub_type==GF_ISOM_SUBTYPE_MPEG4_CRYP)
-			        || (msub_type==GF_ISOM_SUBTYPE_AVC_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_AVC2_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_AVC3_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_AVC4_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_SVC_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_MVC_H264)
-			        || (msub_type==GF_ISOM_SUBTYPE_HVC1)
-			        || (msub_type==GF_ISOM_SUBTYPE_HEV1)
-			        || (msub_type==GF_ISOM_SUBTYPE_HVC2)
-			        || (msub_type==GF_ISOM_SUBTYPE_HEV2)
-			        || (msub_type==GF_ISOM_SUBTYPE_LSR1)
-			   ) {
-				GF_DecoderConfig *dcd1 = gf_isom_get_decoder_config(set_file, j+1, 1);
-				GF_DecoderConfig *dcd2 = gf_isom_get_decoder_config(in, track, 1);
-				if (dcd1 && dcd2 && (dcd1->streamType==dcd2->streamType) && (dcd1->objectTypeIndication==dcd2->objectTypeIndication)) {
-					same_codec = GF_TRUE;
-				} else {
-					same_codec = GF_FALSE;
-				}
-				if (dcd1) gf_odf_desc_del((GF_Descriptor *)dcd1);
-				if (dcd2) gf_odf_desc_del((GF_Descriptor *)dcd2);
-			}
-
-			if (!same_codec) {
-				valid_in_adaptation_set = GF_FALSE;
-				break;
-			}
-
-			if (!gf_isom_is_video_subtype(mtype) && (mtype!=GF_ISOM_MEDIA_HINT)) {
-				char *lang1, *lang2;
-				lang1 = lang2 = NULL;
-				gf_isom_get_media_language(set_file, j+1, &lang1);
-				gf_isom_get_media_language(in, track, &lang2);
-				if (lang1 && lang2 && stricmp(lang1, lang2)) {
-					valid_in_adaptation_set = GF_FALSE;
-					gf_free(lang1);
-					gf_free(lang2);
-					break;
-				}
-				if (lang1) gf_free(lang1);
-				if (lang2) gf_free(lang2);
-			}
-			if (gf_isom_is_video_subtype(mtype) ) {
-				u32 w1, h1, w2, h2, sap_type;
-				Bool rap, roll;
-				s32 roll_dist;
-
-				gf_isom_get_track_layout_info(set_file, j+1, &w1, &h1, NULL, NULL, NULL);
-				gf_isom_get_track_layout_info(in, track, &w2, &h2, NULL, NULL, NULL);
-
-				if (h1*w2 != h2*w1) {
-					u32 hs1, hs2, vs1, vs2, vw1, vh1, vw2, vh2;
-					u64 ar1, ar2;
-
-					//check same sample aspect ratio
-					gf_isom_get_pixel_aspect_ratio(set_file, j+1, 1, &hs1, &vs1);
-					gf_isom_get_pixel_aspect_ratio(in, track, 1, &hs2, &vs2);
-
-					//check same image aspect ratio
-					gf_isom_get_visual_info(set_file, j+1, 1, &vw1, &vh1);
-					gf_isom_get_visual_info(in, track, 1, &vw2, &vh2);
-
-					ar1 = vh1*vw2;
-					ar1*= hs2*vs1;
-
-					ar2 = vh2*vw1;
-					ar2 *= hs1*vs2;
-					if (ar1 != ar2) {
-						gf_isom_get_track_layout_info(in, track, &w2, &h2, NULL, NULL, NULL);
-						valid_in_adaptation_set = GF_FALSE;
-						break;
-					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Files have non-proportional track layouts (%dx%d vs %dx%d) but sample size and aspect ratio match, assuming precision issue\n", w1, h1, w2, h2));
-					}
-				}
-
-				gf_isom_get_sample_rap_roll_info(in, track, 0, &rap, &roll, &roll_dist);
-				if (roll_dist>0) sap_type = 4;
-				else if (roll) sap_type = 3;
-				else if (rap) sap_type = 1;
-				else sap_type = 1;
-				if (*max_sap_type < sap_type) *max_sap_type = sap_type;
-			}
-		}
-		gf_isom_close(in);
-		if (valid_in_adaptation_set) {
-			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
-			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
-		} else if (assign_to_group) {
-			if (!dash_inputs[input_idx].group_id) {
-				(*current_group_id) ++;
-				dash_inputs[input_idx].group_id = (*current_group_id);
-			}
-			dash_inputs[i].group_id = (*current_group_id);
-		}
-	}
-	gf_isom_close(set_file);
-	return GF_OK;
-}
-
-static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenter *dash_opts, GF_DashSwitchingMode bs_switch_mode, Bool *disable_bs_switching)
-{
-	u64 max_track_duration = 0;
-	GF_Err e = GF_OK;
-	u32 i;
-	u32 single_track_id = 0;
-	Bool sps_merge_failed = GF_FALSE;
-	Bool use_avc3 = GF_FALSE;
-	Bool use_hevc = GF_FALSE;
-	Bool use_inband_param_set;
-	u32 probe_inband_param_set;
-	u32 first_track = 0;
-	Bool single_segment = (dash_opts->single_file_mode==1) ? GF_TRUE : GF_FALSE;
-	GF_ISOFile *init_seg;
-	u32 force_timescale = 0;
-	GF_DashSegInput *first_dash_input = NULL;
-
-
-	probe_inband_param_set = dash_opts->inband_param_set ? 1 : 0;
-
-restart_init:
-
-	init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
-	if (dash_opts->force_test_mode) {
-		gf_isom_no_version_date_info(init_seg, 1);
-	}
-	max_track_duration = 0;
-
-	for (i=0; i<nb_dash_inputs; i++) {
-		u32 j;
-		GF_ISOFile *in;
-
-		if (dash_inputs[i].adaptation_set != adaptation_set)
-			continue;
-
-		//no inband param set for scalable files
-		use_inband_param_set = dash_inputs[i].trackNum ? GF_FALSE : dash_opts->inband_param_set;
-
-		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-		if (!in) {
-			e = gf_isom_last_error(NULL);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string(e)));
-			return e;
-		}
-
-		if (bs_switch_mode == GF_DASH_BSMODE_MULTIPLE_ENTRIES) {
-			if (gf_isom_get_track_count(in)>1) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot use multi-stsd mode on files with multiple tracks\n"));
-				return GF_NOT_SUPPORTED;
-			}
-		}
-
-
-		for (j=0; j<gf_isom_get_track_count(in); j++) {
-			u32 track;
-
-			if (dash_inputs[i].single_track_num) {
-				if (dash_inputs[i].single_track_num != j+1)
-					continue;
-
-				if (!single_track_id)
-					single_track_id = gf_isom_get_track_id(in, j+1);
-				//if not the same ID between the two tracks we cannot create a legal file with bitstream switching enabled
-				else if (single_track_id != gf_isom_get_track_id(in, j+1)) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Track IDs different between representations, disabling bitstream switching\n"));
-					*disable_bs_switching = GF_TRUE;
-					gf_isom_delete(init_seg);
-					gf_delete_file(szInitName);
-					return GF_OK;
-				}
-			}
-
-			track = gf_isom_get_track_by_id(init_seg, gf_isom_get_track_id(in, j+1));
-
-			if (track) {
-				u32 outDescIndex;
-				if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
-					e = GF_NOT_SUPPORTED;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
-					gf_isom_delete(init_seg);
-					gf_isom_delete(in);
-					return e;
-				}
-retry_track:
-
-				if (bs_switch_mode == GF_DASH_BSMODE_MULTIPLE_ENTRIES) {
-					gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
-				}
-
-				/*if not the same sample desc we might need to clone it*/
-				else if (! gf_isom_is_same_sample_description(in, j+1, 1, init_seg, track, 1)) {
-					u32 merge_mode = 1;
-					u32 stype1, stype2;
-					stype1 = gf_isom_get_media_subtype(in, j+1, 1);
-					stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
-					if (stype1 != stype2) merge_mode = 0;
-					switch (stype1) {
-					case GF_ISOM_SUBTYPE_AVC_H264:
-					case GF_ISOM_SUBTYPE_AVC2_H264:
-					case GF_ISOM_SUBTYPE_MPEG4_CRYP:
-						if (use_avc3)
-							merge_mode = 2;
-						break;
-					case GF_ISOM_SUBTYPE_SVC_H264:
-					case GF_ISOM_SUBTYPE_MVC_H264:
-						break;
-					case GF_ISOM_SUBTYPE_AVC3_H264:
-					case GF_ISOM_SUBTYPE_AVC4_H264:
-						/*we don't want to clone SPS/PPS since they are already inside the samples*/
-						merge_mode = 2;
-						break;
-					case GF_ISOM_SUBTYPE_HVC1:
-					case GF_ISOM_SUBTYPE_HVC2:
-						if (use_hevc)
-							merge_mode = 2;
-						break;
-					case GF_ISOM_SUBTYPE_HEV1:
-					case GF_ISOM_SUBTYPE_HEV2:
-						/*we don't want to clone SPS/PPS since they are already inside the samples*/
-						merge_mode = 2;
-						break;
-					case GF_ISOM_SUBTYPE_LHV1:
-						break;
-					case GF_ISOM_SUBTYPE_LHE1:
-						merge_mode = 2;
-						break;
-					default:
-						merge_mode = 0;
-						break;
-					}
-					if (merge_mode==1) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-						u32 k, l, sps_id1, sps_id2;
-#endif
-						GF_AVCConfig *avccfg1 = gf_isom_avc_config_get(in, j+1, 1);
-						GF_AVCConfig *avccfg2 = gf_isom_avc_config_get(init_seg, track, 1);
-#ifndef GPAC_DISABLE_AV_PARSERS
-						for (k=0; k<gf_list_count(avccfg2->sequenceParameterSets); k++) {
-							GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg2->sequenceParameterSets, k);
-							gf_avc_get_sps_info(slc->data, slc->size, &sps_id1, NULL, NULL, NULL, NULL);
-							for (l=0; l<gf_list_count(avccfg1->sequenceParameterSets); l++) {
-								GF_AVCConfigSlot *slc_orig = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, l);
-								gf_avc_get_sps_info(slc_orig->data, slc_orig->size, &sps_id2, NULL, NULL, NULL, NULL);
-								if (sps_id2==sps_id1) {
-									merge_mode = 0;
-									break;
-								}
-							}
-						}
-#endif
-						/*no conflicts in SPS ids, merge all SPS in a single sample desc*/
-						if (merge_mode==1) {
-							while (gf_list_count(avccfg1->sequenceParameterSets)) {
-								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, 0);
-								gf_list_rem(avccfg1->sequenceParameterSets, 0);
-								gf_list_add(avccfg2->sequenceParameterSets, slc);
-							}
-							while (gf_list_count(avccfg1->pictureParameterSets)) {
-								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->pictureParameterSets, 0);
-								gf_list_rem(avccfg1->pictureParameterSets, 0);
-								gf_list_add(avccfg2->pictureParameterSets, slc);
-							}
-							gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
-						} else {
-							sps_merge_failed = GF_TRUE;
-						}
-						gf_odf_avc_cfg_del(avccfg1);
-						gf_odf_avc_cfg_del(avccfg2);
-					}
-
-					//check if we can get rid of inband params
-					if (!merge_mode && use_inband_param_set && probe_inband_param_set) {
-						probe_inband_param_set = 0;
-
-						switch (gf_isom_get_media_subtype(init_seg, first_track, 1)) {
-						case GF_ISOM_SUBTYPE_HVC1:
-						case GF_ISOM_SUBTYPE_HVC2:
-							gf_isom_hevc_set_inband_config(init_seg, track, 1);
-							use_hevc = GF_TRUE;
-							sps_merge_failed = GF_FALSE;
-							break;
-						case GF_ISOM_SUBTYPE_AVC_H264:
-						case GF_ISOM_SUBTYPE_AVC2_H264:
-						case GF_ISOM_SUBTYPE_SVC_H264:
-						case GF_ISOM_SUBTYPE_MVC_H264:
-							gf_isom_avc_set_inband_config(init_seg, track, 1);
-							use_avc3 = GF_TRUE;
-							sps_merge_failed = GF_FALSE;
-							break;
-						}
-						goto retry_track;
-					}
-
-
-					/*cannot merge, clone*/
-					if (merge_mode==0) {
-
-						if (use_inband_param_set && (use_avc3 || use_hevc) ) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Couldn't merge %s parameter sets - using in-band config\n", use_hevc ? "HEVC" : "AVC" ));
-							gf_isom_delete(init_seg);
-							goto restart_init;
-						}
-						gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
-					}
-				}
-			} else {
-				u32 sample_duration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
-				u8 defaultPadding;
-				u16 defaultDegradationPriority;
-
-				gf_isom_clone_track(in, j+1, init_seg, 0, &track);
-
-				switch (gf_isom_get_media_subtype(in, j+1, 1)) {
-				case GF_ISOM_SUBTYPE_AVC_H264:
-				case GF_ISOM_SUBTYPE_AVC2_H264:
-				case GF_ISOM_SUBTYPE_SVC_H264:
-				case GF_ISOM_SUBTYPE_MVC_H264:
-					if (!probe_inband_param_set) {
-						if (use_inband_param_set) {
-							gf_isom_avc_set_inband_config(init_seg, track, 1);
-							use_avc3 = GF_TRUE;
-						}
-					} else {
-						first_track = track;
-					}
-					break;
-				case GF_ISOM_SUBTYPE_HVC1:
-				case GF_ISOM_SUBTYPE_HVC2:
-					//todo enble comparison of hevc xPS
-					probe_inband_param_set=0;
-
-					if (use_inband_param_set) {
-						gf_isom_hevc_set_inband_config(init_seg, track, 1);
-					}
-					use_hevc = GF_TRUE;
-					break;
-
-				case GF_ISOM_SUBTYPE_AVC3_H264:
-				case GF_ISOM_SUBTYPE_AVC4_H264:
-				case GF_ISOM_SUBTYPE_HEV1:
-				case GF_ISOM_SUBTYPE_HEV2:
-					probe_inband_param_set = 0;
-					break;
-				}
-
-				gf_isom_get_fragment_defaults(in, j+1, &sample_duration, &defaultSize,
-				                              &defaultDescriptionIndex, &defaultRandomAccess,
-				                              &defaultPadding, &defaultDegradationPriority);
-				//setup for fragmentation
-				e = gf_isom_setup_track_fragment(init_seg, gf_isom_get_track_id(init_seg, track),
-				                                 defaultDescriptionIndex, sample_duration,
-				                                 defaultSize, (u8) defaultRandomAccess,
-				                                 defaultPadding, defaultDegradationPriority, 0);
-				if (e) break;
-			}
-			if (!e) {
-				u32 k, edit_count=gf_isom_get_edit_segment_count(in, j+1);
-
-				/*remove all segments*/
-				gf_isom_remove_edit_segments(init_seg, track);
-				//clone all edits before first nomal, and stop at first normal setting duration to 0
-				for (k=0; k<edit_count; k++) {
-					u64 EditTime, SegDuration, MediaTime;
-					u8 EditMode;
-
-					/*get first edit*/
-					gf_isom_get_edit_segment(in, j+1, k+1, &EditTime, &SegDuration, &MediaTime, &EditMode);
-
-					if (EditMode==GF_ISOM_EDIT_NORMAL) {
-						gf_isom_set_edit_segment(init_seg, track, EditTime, 0, MediaTime, EditMode);
-						break;
-					}
-
-					gf_isom_set_edit_segment(init_seg, track, EditTime, SegDuration, MediaTime, EditMode);
-				}
-
-				if (max_track_duration < gf_isom_get_track_duration(in, j+1)) {
-					max_track_duration = gf_isom_get_track_duration(in, j+1);
-				}
-
-				if (!first_dash_input && !force_timescale && dash_inputs[i].sscale) {
-					force_timescale = gf_isom_get_media_timescale(in, j+1);
-				}
-			}
-		}
-
-		if (!first_dash_input) {
-			first_dash_input = &dash_inputs[i];
-
-			//force ISO6 since we use tfdt all over the place
-			gf_isom_set_brand_info(init_seg, GF_ISOM_BRAND_ISO6, 1);
-			gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_ISOM, 0);
-
-			/*DASH self-init media segment*/
-			if (single_segment) {
-				gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_DSMS, 1);
-			} else {
-				gf_isom_modify_alternate_brand(init_seg, GF_ISOM_BRAND_DASH, 1);
-			}
-
-			if ((dash_opts->pssh_mode==GF_DASH_PSSH_MOOV) || (dash_opts->pssh_mode==GF_DASH_PSSH_MOOV_MPD) ) {
-				e = gf_isom_clone_pssh(init_seg, in, GF_FALSE);
-			}
-
-			gf_isom_set_movie_duration(init_seg, max_track_duration);
-		}
-		gf_isom_close(in);
-	}
-	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
-		*disable_bs_switching = GF_TRUE;
-		gf_isom_delete(init_seg);
-		gf_delete_file(szInitName);
-		return GF_OK;
-	} else if (sps_merge_failed) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not merge AVC|H264 SPS from different files (same SPS ID used) - disabling bitstream switching\n"));
-		*disable_bs_switching = GF_TRUE;
-		gf_isom_delete(init_seg);
-		gf_delete_file(szInitName);
-		return GF_OK;
-	} else {
-		if (force_timescale) gf_isom_set_timescale(init_seg, force_timescale);
-
-		e = gf_isom_close(init_seg);
-
-		if (probe_inband_param_set) {
-			for (i=0; i<nb_dash_inputs; i++) {
-				if (dash_inputs[i].adaptation_set != adaptation_set)
-					continue;
-
-				dash_inputs[i].disable_inband_param_set = GF_TRUE;
-			}
-		}
-	}
-	return e;
-}
-
-static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dasher, Bool first_in_set)
-{
-	GF_Err e = GF_OK;
-
-	if (!dash_input->isobmf_input) {
-		GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dasher->tmpdir);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] ISOBMFF opened\n"));
-
-		if (!gf_isom_get_track_count(in)) {
-			gf_isom_delete(in);
-			return GF_BAD_PARAM;
-		}
-
-#if 0
-		if (dash_input->media_duration) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing media duration to %lfs.\n", dash_input->media_duration));
-			e = dasher_isom_force_duration(in, dash_input->media_duration, dasher->fragment_duration);
-			if (e) {
-				gf_isom_delete(in);
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Media duration couldn't be forced. Aborting.\n"));
-				return e;
-			}
-		}
-#endif
-
-		dash_input->isobmf_input = in;
-	}
-
-
-	e = isom_segment_file(dash_input->isobmf_input, szOutName, dasher, dash_input, first_in_set);
-	if(dash_input->no_cache){
-		gf_isom_delete(dash_input->isobmf_input);
-		dash_input->isobmf_input=NULL;
-	}
-	return e;
-}
-
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-static GF_Err dasher_generic_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
-{
-#ifdef GPAC_DISABLE_MEDIA_IMPORT
-	return GF_NOT_SUPPORTED;
-#else
-	GF_Err e;
-	u32 i, j, k;
-	GF_MediaImporter in, probe;
-
-	memset(&in, 0, sizeof(GF_MediaImporter));
-	in.flags = GF_IMPORT_PROBE_ONLY;
-	in.in_name = (char *)dash_inputs[input_idx].file_name;
-	e = gf_media_import(&in);
-	if (e) return e;
-
-	for (i=input_idx+1; i<nb_dash_inputs; i++) {
-		Bool valid_in_adaptation_set = GF_TRUE;
-		Bool assign_to_group = GF_TRUE;
-
-		if (dash_inputs[input_idx].period != dash_inputs[i].period)
-			continue;
-
-		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
-			continue;
-
-		if (! dasher_inputs_have_same_roles(&dash_inputs[input_idx], &dash_inputs[i]))
-			continue;
-
-		memset(&probe, 0, sizeof(GF_MediaImporter));
-		probe.flags = GF_IMPORT_PROBE_ONLY;
-		probe.in_name = (char *)dash_inputs[i].file_name;
-		e = gf_media_import(&probe);
-		if (e) return e;
-
-		if (in.nb_progs != probe.nb_progs) valid_in_adaptation_set = GF_FALSE;
-		if (in.nb_tracks != probe.nb_tracks) valid_in_adaptation_set = GF_FALSE;
-
-		for (j=0; j<in.nb_tracks; j++) {
-			struct __track_import_info *src_tk, *probe_tk;
-			Bool found = GF_FALSE;
-			/*make sure we have the same track*/
-			for (k=0; k<probe.nb_tracks; k++) {
-				if (in.tk_info[j].track_num==probe.tk_info[k].track_num) {
-					found = GF_TRUE;
-					break;
-				}
-			}
-			if (!found) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-			src_tk = &in.tk_info[j];
-			probe_tk = &probe.tk_info[k];
-
-			/*make sure we use the same media type*/
-			if (src_tk->type != probe_tk->type) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-			/*make sure we use the same codec type*/
-			if (src_tk->media_type != probe_tk->media_type) {
-				valid_in_adaptation_set = GF_FALSE;
-				break;
-			}
-			/*make sure we use the same aspect ratio*/
-			if (gf_isom_is_video_subtype(src_tk->type) ) {
-				if (src_tk->video_info.width * probe_tk->video_info.height != src_tk->video_info.height * probe_tk->video_info.width) {
-					valid_in_adaptation_set = GF_FALSE;
-					break;
-				}
-			} else if (src_tk->lang != probe_tk->lang) {
-				valid_in_adaptation_set = GF_FALSE;
-				break;
-			}
-
-			if (!valid_in_adaptation_set) break;
-		}
-		if (valid_in_adaptation_set) {
-			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
-			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
-		} else if (assign_to_group) {
-			if (!dash_inputs[input_idx].group_id) {
-				(*current_group_id) ++;
-				dash_inputs[input_idx].group_id = (*current_group_id);
-			}
-			dash_inputs[i].group_id = (*current_group_id);
-		}
-	}
-#endif
-	return GF_OK;
-}
-
-#endif
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenter *opts)
-{
-#ifdef GPAC_DISABLE_MEDIA_IMPORT
-	return GF_NOT_SUPPORTED;
-#else
-	u32 i;
-	GF_Err e;
-	GF_MediaImporter in;
-	memset(&in, 0, sizeof(GF_MediaImporter));
-	in.flags = GF_IMPORT_PROBE_ONLY;
-	in.in_name = (char *)input->file_name;
-	e = gf_media_import(&in);
-	if (e) return e;
-
-	input->nb_components = in.nb_tracks;
-
-	for (i=0; i<in.nb_tracks; i++) {
-		input->components[i].width = in.tk_info[i].video_info.width;
-		input->components[i].height = in.tk_info[i].video_info.height;
-		input->components[i].media_type = in.tk_info[i].type;
-		input->components[i].channels = in.tk_info[i].audio_info.nb_channels;
-		input->components[i].sample_rate = in.tk_info[i].audio_info.sample_rate;
-		input->components[i].ID = in.tk_info[i].track_num;
-		if (in.tk_info[i].lang) {
-			input->components[i].lang = gf_strdup( gf_4cc_to_str(in.tk_info[i].lang) );
-		}
-		strcpy(input->components[i].szCodec, in.tk_info[i].szCodecProfile);
-		input->components[i].fps_denum = 1000;
-		input->components[i].fps_num = (u32) (in.tk_info[i].video_info.FPS*1000);
-	}
-#endif
-	return GF_OK;
-}
-#endif
-
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-typedef struct
-{
-	FILE *src;
-	GF_M2TS_Demuxer *ts;
-	u64 file_size;
-	u32 bandwidth;
-	Bool has_seen_pat;
-
-	u64 suspend_indexing;
-
-	/* For indexing the TS*/
-	Double segment_duration;
-	Bool segment_at_rap;
-
-	FILE *index_file;
-	GF_BitStream *index_bs;
-
-	u32 subduration;
-	u32 skip_nb_segments;
-	u64 duration_at_last_pass;
-
-	GF_SegmentIndexBox *sidx;
-	GF_PcrInfoBox *pcrb;
-
-	u32 reference_pid;
-	GF_M2TS_PES *reference_stream;
-
-	u32 nb_pes_in_segment;
-	/* earliest presentation time for the whole segment */
-	u64 first_PTS;
-	/* DTS-PCR diff for the first PES packet */
-	u64 PCR_DTS_initial_diff;
-
-	/* earliest presentation time for the subsegment being processed */
-	u64 base_PTS;
-	/* byte offset for the start of subsegment being processed */
-	u64 base_offset;
-	/* last presentation time for the subsegment being processed (before the next subsegment is started) */
-	u64 last_PTS;
-	/* last decoding time for the subsegment being processed */
-	u64 last_DTS;
-	/* byte offset for the last PES packet for the subsegment being processed */
-	u32 last_offset;
-	u32 last_frame_duration;
-
-	/* earliest presentation time for the previous subsegment */
-	u64 prev_base_PTS;
-	/* byte offset for the start of the previous subsegment */
-	u64 prev_base_offset;
-	/* last presentation time for the previous subsegment */
-	u64 prev_last_PTS;
-	/* byte offset for the last PES packet for the previous subsegment */
-	u32 prev_last_offset;
-
-	/* indicates if the current subsegment contains a SAP and its SAP type*/
-	u32 SAP_type;
-	/* indicates if the first PES in the current subsegment is a SAP*/
-	Bool first_pes_sap;
-	/* Presentation time for the first RAP encountered in the subsegment */
-	u64 first_SAP_PTS;
-	/* byte offset for the first RAP encountered in the subsegment */
-	u32 first_SAP_offset;
-	u64 prev_last_SAP_PTS;
-	u32 prev_last_SAP_offset;
-	u64 last_SAP_PTS;
-	u32 last_SAP_offset;
-
-	Bool pes_after_last_pat_is_sap;
-
-	/*Interpolated PCR value for the pcrb*/
-	u64 interpolated_pcr_value;
-	u64 last_pcr_value;
-
-	/* information about the first PAT found in the subsegment */
-	u32 last_pat_position;
-	u32 first_pat_position;
-	u32 prev_last_pat_position;
-	Bool first_pat_position_valid, first_pes_after_last_pat;
-	u32 pat_version;
-
-	/* information about the first CAT found in the subsegment */
-	u32 last_cat_position;
-	u32 first_cat_position;
-	u32 prev_last_cat_position;
-	Bool first_cat_position_valid;
-	u32 cat_version;
-
-	/* information about the first PMT found in the subsegment */
-	u32 last_pmt_position;
-	u32 first_pmt_position;
-	u32 prev_last_pmt_position;
-	Bool first_pmt_position_valid;
-	u32 pmt_version;
-
-	/* information about the first PCR found in the subsegment */
-	u32 last_pcr_position;
-	u32 first_pcr_position;
-	Bool first_pcr_position_valid;
-	u32 prev_last_pcr_position;
-
-} GF_TSSegmenter;
-
-static void m2ts_sidx_add_entry(GF_SegmentIndexBox *sidx, Bool ref_type,
-                                u32 size, u32 duration, Bool first_is_SAP, u32 sap_type, u32 RAP_delta_time)
-{
-	GF_SIDXReference *ref;
-	sidx->nb_refs++;
-	sidx->refs = (GF_SIDXReference *)gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
-	ref = &(sidx->refs[sidx->nb_refs-1]);
-	ref->reference_type = ref_type;
-	ref->reference_size = size;
-	ref->subsegment_duration = duration;
-	ref->starts_with_SAP = first_is_SAP;
-	ref->SAP_type = sap_type;
-	ref->SAP_delta_time = (sap_type ? RAP_delta_time: 0);
-}
-
-static void m2ts_sidx_finalize_size(GF_TSSegmenter *index_info, u64 file_size)
-{
-	GF_SIDXReference *ref;
-	if (index_info->suspend_indexing) return;
-	if (index_info->sidx->nb_refs == 0) return;
-	ref = &(index_info->sidx->refs[index_info->sidx->nb_refs-1]);
-	ref->reference_size = (u32)(file_size - index_info->prev_base_offset);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment: position-range ajdustment:%d-%d (%d bytes)\n", index_info->prev_base_offset, (u32)file_size, ref->reference_size));
-}
-
-static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info)
-{
-	u32 end_offset, size, duration;
-	Bool store_segment = GF_TRUE;
-
-	if (index_info->suspend_indexing)
-		return;
-
-	if (index_info->skip_nb_segments) {
-		index_info->skip_nb_segments --;
-		store_segment = GF_FALSE;
-	}
-
-	/* determine the end of the current index */
-	if (index_info->segment_at_rap) {
-		/*split at PAT*/
-		end_offset = index_info->last_pat_position;
-	} else {
-		/* split at PES header */
-		end_offset = index_info->last_offset;
-	}
-	size = (u32)(end_offset - index_info->base_offset);
-	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
-
-	if (store_segment) {
-		u32 prev_duration, SAP_delta_time, SAP_offset;
-		if (!index_info->sidx) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Segment: Reference PID: %d, EPTime: "LLU", Start Offset: %d bytes\n", index_info->reference_pid, index_info->base_PTS, index_info->base_offset));
-			index_info->sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
-			index_info->sidx->reference_ID = index_info->reference_pid;
-			/* timestamps in MPEG-2 are expressed in 90 kHz timescale */
-			index_info->sidx->timescale = 90000;
-			/* first encountered PTS on the PID for this subsegment */
-			index_info->sidx->earliest_presentation_time = index_info->base_PTS;
-			index_info->sidx->first_offset = index_info->base_offset;
-
-		}
-
-		if (!index_info->pcrb) {
-			index_info->pcrb = (GF_PcrInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PCRB);
-		}
-
-		/* close the current index */
-		SAP_delta_time = (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
-		SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
-		m2ts_sidx_add_entry(index_info->sidx, GF_FALSE, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
-
-		/*add pcrb entry*/
-		index_info->pcrb->subsegment_count++;
-		index_info->pcrb->pcr_values = (u64*)gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
-		index_info->pcrb->pcr_values[index_info->pcrb->subsegment_count-1] = index_info->interpolated_pcr_value;
-
-		/* adjust the previous index duration */
-		if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
-			prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.3f-%.3f / %.3f sec.\n",
-			                                        (index_info->prev_base_PTS - index_info->first_PTS)/90000.0,
-			                                        (index_info->base_PTS - index_info->first_PTS)/90000.0, prev_duration/90000.0));
-
-			/*update previous duration*/
-			if (index_info->sidx->nb_refs) {
-				index_info->sidx->refs[index_info->sidx->nb_refs-1].subsegment_duration = prev_duration;
-			}
-
-		}
-
-		/* Printing result */
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
-		//time-range:position-range:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (" %.3f-%.3f / %.3f sec., %d-%d / %d bytes, ",
-		                                        (index_info->base_PTS - index_info->first_PTS)/90000.0,
-		                                        (index_info->last_PTS - index_info->first_PTS)/90000.0, duration/90000.0,
-		                                        index_info->base_offset, end_offset, size));
-		if (index_info->SAP_type) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("RAP @ %.3f sec. / %d bytes", (index_info->first_SAP_PTS - index_info->first_PTS)/90000.0,
-			                                        SAP_offset));
-		}
-		if (index_info->first_pat_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PAT @ %d bytes", (u32)(index_info->first_pat_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PAT"));
-		}
-		if (index_info->first_cat_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", CAT @ %d bytes", (u32)(index_info->first_cat_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No CAT"));
-		}
-		if (index_info->first_pmt_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PMT @ %d bytes", (u32)(index_info->first_pmt_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PMT"));
-		}
-		if (index_info->first_pcr_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PCR @ %d bytes", (u32)(index_info->first_pcr_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PCR"));
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
-
-	}
-
-	/* save the current values for later adjustments */
-	index_info->prev_last_SAP_PTS = index_info->last_SAP_PTS;
-	index_info->prev_last_SAP_offset = index_info->last_SAP_offset;
-	index_info->prev_last_PTS = index_info->last_PTS;
-	index_info->prev_last_offset = index_info->last_offset;
-	index_info->prev_base_PTS = index_info->base_PTS;
-	index_info->base_PTS = index_info->last_PTS;
-	index_info->prev_base_offset = index_info->base_offset;
-	index_info->prev_last_pat_position = index_info->last_pat_position;
-	index_info->prev_last_cat_position = index_info->last_cat_position;
-	index_info->prev_last_pmt_position = index_info->last_pmt_position;
-	index_info->prev_last_pcr_position = index_info->last_pcr_position;
-
-	/* update the values for the new index*/
-	index_info->base_offset = end_offset;
-
-	if (index_info->pes_after_last_pat_is_sap) {
-		index_info->SAP_type = 1;
-		index_info->first_SAP_PTS = index_info->last_SAP_PTS;
-		index_info->first_SAP_offset = index_info->last_SAP_offset;
-		index_info->first_pes_sap = GF_TRUE;
-		index_info->nb_pes_in_segment = 1;
-		index_info->base_PTS = index_info->first_SAP_PTS;
-
-		index_info->pes_after_last_pat_is_sap = GF_FALSE;
-	} else {
-		index_info->SAP_type = 0;
-		index_info->first_SAP_PTS = 0;
-		index_info->first_SAP_offset = 0;
-		index_info->first_pes_sap = GF_FALSE;
-		index_info->nb_pes_in_segment = 0;
-	}
-	index_info->last_DTS = 0;
-
-	if (index_info->last_pat_position >= index_info->base_offset) {
-		index_info->first_pat_position_valid = GF_TRUE;
-		index_info->first_pat_position = index_info->last_pat_position;
-	} else {
-		index_info->first_pat_position_valid = GF_FALSE;
-		index_info->first_pat_position = 0;
-	}
-	if (index_info->last_cat_position >= index_info->base_offset) {
-		index_info->first_cat_position_valid = GF_TRUE;
-		index_info->first_cat_position = index_info->last_cat_position;
-	} else {
-		index_info->first_cat_position_valid = GF_FALSE;
-		index_info->first_cat_position = 0;
-	}
-	if (index_info->last_pmt_position >= index_info->base_offset) {
-		index_info->first_pmt_position_valid = GF_TRUE;
-		index_info->first_pmt_position = index_info->last_pmt_position;
-	} else {
-		index_info->first_pmt_position_valid = GF_FALSE;
-		index_info->first_pmt_position = 0;
-	}
-	if (index_info->last_pcr_position >= index_info->base_offset) {
-		index_info->first_pcr_position_valid = GF_TRUE;
-		index_info->first_pcr_position = index_info->last_pcr_position;
-	} else {
-		index_info->first_pcr_position_valid = GF_FALSE;
-		index_info->first_pcr_position = 0;
-	}
-
-	if (index_info->subduration && (index_info->last_PTS - index_info->first_PTS >= index_info->duration_at_last_pass + index_info->subduration)) {
-		index_info->suspend_indexing = end_offset;
-		index_info->duration_at_last_pass = (u32) (index_info->last_PTS - index_info->first_PTS);
-	}
-}
-
-static void m2ts_check_indexing(GF_TSSegmenter *index_info)
-{
-	u32 segment_duration = (u32)(index_info->segment_duration*90000);
-	u64 current_duration = (index_info->last_PTS - index_info->base_PTS);
-	u64 target_duration = segment_duration;
-
-	//using drift control to ensure that nb_seg*segment_duration is roughly aligned with segment(nb_seg).first_PTS
-	if (index_info->sidx) {
-		current_duration = (index_info->last_PTS - index_info->first_PTS) - index_info->duration_at_last_pass;
-		target_duration += index_info->sidx->nb_refs * segment_duration;
-	}
-
-	if (index_info->segment_at_rap) {
-		s32 diff = (s32) ((s64) current_duration - (s64) segment_duration);
-		if (diff<0)diff=-diff;
-		//check if below 10% limit
-		if (diff/900 < 5) {
-			//below 10% limit of segment duration, if we have a RAP flush now
-			if (index_info->pes_after_last_pat_is_sap)
-				m2ts_sidx_flush_entry(index_info);
-			//no rap and below 10% limit, wait for rap
-			return;
-		}
-	}
-
-	/* we exceed the segment duration flush sidx entry*/
-	if (current_duration >= target_duration) {
-		m2ts_sidx_flush_entry(index_info);
-	}
-}
-static void dash_m2ts_event_check_pat(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
-{
-	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
-	GF_M2TS_PES_PCK *pck;
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_REPEAT:
-		ts_seg->has_seen_pat = GF_TRUE;
-		break;
-	case GF_M2TS_EVT_PMT_FOUND:
-	{
-		u32 i, count;
-		GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
-		count = gf_list_count(prog->streams);
-		for (i=0; i<count; i++) {
-			GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
-		}
-	}
-	break;
-	case GF_M2TS_EVT_PMT_REPEAT:
-		if (ts_seg->has_seen_pat) {
-			u32 i, count;
-			Bool done = GF_TRUE;
-			GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
-			count = gf_list_count(prog->streams);
-			for (i=0; i<count; i++) {
-				GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-				if (es->flags&GF_M2TS_ES_IS_PES) {
-					GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
-					if (!pes->aud_sr && !pes->vid_w) {
-						done = GF_FALSE;
-						break;
-					} else {
-						/*stream is configured, we only need PES header now*/
-						gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_RAW);
-					}
-				}
-			}
-			if (done) ts_seg->has_seen_pat = 2;
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-		pck = (GF_M2TS_PES_PCK*)par;
-		/* we process packets only for the given PID */
-		if (pck->stream->pid == pck->stream->program->pcr_pid) {
-			if (!ts_seg->nb_pes_in_segment || (ts_seg->first_PTS > pck->PTS)) {
-				ts_seg->first_PTS = pck->PTS;
-				ts_seg->nb_pes_in_segment++;
-			}
-			if (pck->PTS > ts_seg->last_PTS) {
-				ts_seg->last_PTS = pck->PTS;
-			}
-			if (ts_seg->last_DTS != pck->DTS) {
-				ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
-				ts_seg->last_DTS = pck->DTS;
-			}
-		}
-		break;
-	}
-}
-
-static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
-{
-	GF_M2TS_Program *prog;
-	GF_M2TS_PES_PCK *pck;
-	GF_M2TS_PES *pes;
-	u64 interpolated_pcr_value;
-	u32 count, i;
-	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
-
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_FOUND:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = GF_TRUE;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = GF_FALSE;
-		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
-		break;
-	case GF_M2TS_EVT_PAT_UPDATE:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = GF_TRUE;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = GF_FALSE;
-		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
-		break;
-	case GF_M2TS_EVT_PAT_REPEAT:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = GF_TRUE;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = GF_FALSE;
-		ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
-		break;
-	case GF_M2TS_EVT_CAT_FOUND:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = GF_TRUE;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_cat_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_CAT_UPDATE:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = GF_TRUE;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		break;
-	case GF_M2TS_EVT_CAT_REPEAT:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = GF_TRUE;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_cat_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PMT_FOUND:
-		ts_seg->has_seen_pat = GF_TRUE;
-		prog = (GF_M2TS_Program*)par;
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = GF_TRUE;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		/* we create indexing information on the stream used for carrying the PCR */
-		ts_seg->reference_pid = prog->pcr_pid;
-		ts_seg->reference_stream = (GF_M2TS_PES *) ts_seg->ts->ess[prog->pcr_pid];
-		count = gf_list_count(prog->streams);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
-		for (i=0; i<count; i++) {
-			GF_M2TS_ES *es = (GF_M2TS_ES*)gf_list_get(prog->streams, i);
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
-		}
-		break;
-	case GF_M2TS_EVT_PMT_UPDATE:
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = GF_TRUE;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PMT_REPEAT:
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = GF_TRUE;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-		pck = (GF_M2TS_PES_PCK*)par;
-		/*We need the interpolated PCR for the pcrb, hence moved this calculus out, and saving the calculated value in ts_seg to put it in the pcrb*/
-		pes = pck->stream;
-		if (pes->last_pcr_value && pes->before_last_pcr_value_pck_number && pes->last_pcr_value > pes->before_last_pcr_value) {
-			u32 delta_pcr_pck_num = pes->last_pcr_value_pck_number - pes->before_last_pcr_value_pck_number;
-			u32 delta_pts_pcr_pck_num = pes->pes_start_packet_number - pes->last_pcr_value_pck_number;
-			u64 delta_pcr_value = pes->last_pcr_value - pes->before_last_pcr_value;
-			if ((pes->pes_start_packet_number > pes->last_pcr_value_pck_number)
-			        && (pes->last_pcr_value > pes->before_last_pcr_value)) {
-
-				pes->last_pcr_value = pes->before_last_pcr_value;
-			}
-			/* we can compute the interpolated pcr value for the packet containing the PES header */
-			interpolated_pcr_value = pes->last_pcr_value + (u64)((delta_pcr_value*delta_pts_pcr_pck_num*1.0)/delta_pcr_pck_num);
-			ts_seg->interpolated_pcr_value = interpolated_pcr_value;
-			ts_seg->last_pcr_value = pes->last_pcr_value;
-		}
-		/* we process packets only for the given PID */
-		if (pck->stream->pid != ts_seg->reference_pid) {
-			break;
-		} else {
-			if (ts_seg->last_DTS != pck->DTS) {
-				if (ts_seg->last_DTS)
-					ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
-				ts_seg->last_DTS = pck->DTS;
-				ts_seg->nb_pes_in_segment++;
-
-				if (!ts_seg->first_pes_after_last_pat) {
-					ts_seg->first_pes_after_last_pat = ts_seg->nb_pes_in_segment;
-					ts_seg->pes_after_last_pat_is_sap = GF_FALSE;
-				}
-			}
-
-			/* we store the fact that there is at least a RAP for the index
-			and we store the PTS of the first encountered RAP in the index*/
-			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
-				ts_seg->SAP_type = 1;
-				if (!ts_seg->first_SAP_PTS || (ts_seg->first_SAP_PTS > pck->PTS)) {
-					ts_seg->first_SAP_PTS = pck->PTS;
-					ts_seg->first_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-				}
-				ts_seg->last_SAP_PTS = pck->PTS;
-				ts_seg->last_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-
-				if (ts_seg->nb_pes_in_segment==1) {
-					ts_seg->first_pes_sap = GF_TRUE;
-				}
-				if ((ts_seg->nb_pes_in_segment>1) && (ts_seg->first_pes_after_last_pat==ts_seg->nb_pes_in_segment)) {
-					ts_seg->pes_after_last_pat_is_sap=GF_TRUE;
-				}
-			}
-			/* we need to know the earliest PTS value (RAP or not) in the index*/
-			if (!ts_seg->base_PTS || (ts_seg->base_PTS > pck->PTS)) {
-				ts_seg->base_PTS = pck->PTS;
-			}
-			/* we need to know the earliest PTS value for the whole file (segment) */
-			if (!ts_seg->first_PTS || (ts_seg->first_PTS > pck->PTS)) {
-				ts_seg->first_PTS = pck->PTS;
-			}
-			if (pck->PTS > ts_seg->last_PTS) {
-				/* we use the last PTS for first approximation of the duration */
-				ts_seg->last_PTS = pck->PTS;
-				ts_seg->last_offset = (ts_seg->reference_stream->pes_start_packet_number-1)*188;
-			}
-
-			if (ts_seg->PCR_DTS_initial_diff == (u64) -1) {
-				ts_seg->PCR_DTS_initial_diff = ts_seg->last_DTS - pes->last_pcr_value / 300;
-			}
-
-			m2ts_check_indexing(ts_seg);
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCR:
-		//pck = (GF_M2TS_PES_PCK*)par;
-		if (!ts_seg->first_pcr_position_valid) {
-			ts_seg->first_pcr_position_valid = GF_TRUE;
-			ts_seg->first_pcr_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pcr_position = (ts->pck_number-1)*188;
-		break;
-	}
-}
-
-static GF_Err dasher_get_ts_demux(GF_TSSegmenter *ts_seg, const char *file, u32 probe_mode)
-{
-	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
-	ts_seg->src = gf_fopen(file, "rb");
-	if (!ts_seg->src) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot open input %s: no such file\n", file));
-		return GF_URL_ERROR;
-	}
-	ts_seg->ts = gf_m2ts_demux_new();
-	ts_seg->ts->on_event = dash_m2ts_event_check_pat;
-	ts_seg->ts->notify_pes_timing = GF_TRUE;
-	ts_seg->ts->user = ts_seg;
-
-	gf_fseek(ts_seg->src, 0, SEEK_END);
-	ts_seg->file_size = gf_ftell(ts_seg->src);
-	gf_fseek(ts_seg->src, 0, SEEK_SET);
-
-	if (probe_mode) {
-		/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
-		while (!feof(ts_seg->src)) {
-			char data[188];
-			s32 size = (s32) fread(data, 1, 188, ts_seg->src);
-			if (size<0) {
-				return GF_IO_ERR;
-			}
-			if (size<188) break;
-
-			gf_m2ts_process_data(ts_seg->ts, data, size);
-			if (ts_seg->has_seen_pat==probe_mode)
-				break;
-		}
-		gf_m2ts_reset_parsers(ts_seg->ts);
-		gf_fseek(ts_seg->src, 0, SEEK_SET);
-	}
-	ts_seg->ts->on_event = dash_m2ts_event;
-	return GF_OK;
-}
-
-static void dasher_del_ts_demux(GF_TSSegmenter *ts_seg)
-{
-	if (ts_seg->ts) gf_m2ts_demux_del(ts_seg->ts);
-	if (ts_seg->src) gf_fclose(ts_seg->src);
-	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
-}
-
-static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenter *dash_opts)
-{
-	char sOpt[40];
-	GF_TSSegmenter ts_seg;
-	GF_Err e = dasher_generic_get_components_info(dash_input, dash_opts);
-	if (e) return e;
-
-	dash_input->duration = 0;
-	if (dash_opts->dash_ctx) {
-		const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileName");
-		if (opt && !strcmp(opt, dash_input->file_name)) {
-			const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileDuration");
-			if (opt) dash_input->duration = atof(opt);
-		}
-	}
-
-	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, dash_input->duration ? 2 : 3);
-	if (e) return e;
-
-	if (!dash_input->duration)
-		dash_input->duration = (ts_seg.last_PTS + ts_seg.last_frame_duration - ts_seg.first_PTS)/90000.0;
-
-	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileName", dash_input->file_name);
-	sprintf(sOpt, "%g", dash_input->duration);
-	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileDuration", sOpt);
-
-	dasher_del_ts_demux(&ts_seg);
-
-	return GF_OK;
-}
-
-#define NB_TSPCK_IO_BYTES 18800
-
-static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenter *dasher, Bool first_in_set)
-{
-	GF_TSSegmenter ts_seg;
-	Bool rewrite_input = GF_FALSE;
-	u8 is_pes[GF_M2TS_MAX_STREAMS];
-	char szOpt[100];
-	char SegName[GF_MAX_PATH], IdxName[GF_MAX_PATH];
-	char szSectionName[100], szRepURLsSecName[100];
-	char szCodecs[100];
-	const char *opt;
-	u32 i;
-	GF_Err e;
-	u64 start, pcr_shift, next_pcr_shift, presentationTimeOffset;
-	Double cumulated_duration = 0;
-	u32 bandwidth = 0;
-	u32 segment_index;
-	/*compute name for indexed segments*/
-	const char *basename = gf_dasher_strip_output_dir(dasher->mpd_name, szOutName);
-
-	if (dash_input->media_duration) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] media duration cannot be forced with MPEG2-TS segmenter. Ignoring.\n"));
-	}
-
-	/*perform indexation of the file, this info will be destroyed at the end of the segment file routine*/
-	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 0);
-	if (e) return e;
-
-	ts_seg.segment_duration = dasher->segment_duration;
-	ts_seg.segment_at_rap = dasher->segments_start_with_rap;
-
-	ts_seg.bandwidth = (u32) (ts_seg.file_size * 8 / dash_input->duration);
-
-	/*create bitstreams*/
-
-	segment_index = 1;
-	ts_seg.index_file = NULL;
-	ts_seg.index_bs = NULL;
-	presentationTimeOffset=0;
-	if (!dasher->dash_ctx && (dasher->use_url_template != 2)) {
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-		GF_SegmentTypeBox *styp;
-
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
-
-		ts_seg.index_file = gf_fopen(IdxName, "wb");
-		if (!ts_seg.index_file) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create index file %s\n", IdxName));
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		ts_seg.index_bs = gf_bs_from_file(ts_seg.index_file, GF_BITSTREAM_WRITE);
-
-		styp = (GF_SegmentTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_STYP);
-		styp->majorBrand = GF_ISOM_BRAND_RISX;
-		styp->minorVersion = 0;
-		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
-		styp->altBrand[0] = styp->majorBrand;
-		styp->altCount = 1;
-		gf_isom_box_size((GF_Box *)styp);
-		gf_isom_box_write((GF_Box *)styp, ts_seg.index_bs);
-		gf_isom_box_del((GF_Box *)styp);
-#endif
-	}
-
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
-
-	ts_seg.PCR_DTS_initial_diff = (u64) -1;
-	ts_seg.subduration = (u32) (dasher->subduration * 90000);
-
-	szSectionName[0] = 0;
-	if (dasher->dash_ctx) {
-		sprintf(szSectionName, "Representation_%s", dash_input->representationID);
-		sprintf(szRepURLsSecName, "URLs_%s", dash_input->representationID);
-
-		/*restart where we left last time*/
-		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "ByteOffset");
-		if (opt) {
-			u64 offset;
-			sscanf(opt, LLU, &offset);
-
-			while (!feof(ts_seg.src) && !ts_seg.has_seen_pat) {
-				char data[NB_TSPCK_IO_BYTES];
-				s32 size = (s32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
-				if (size<0) {
-					e = GF_IO_ERR;
-					goto exit;
-				}
-				gf_m2ts_process_data(ts_seg.ts, data, size);
-
-				if (size<NB_TSPCK_IO_BYTES) break;
-			}
-			gf_m2ts_reset_parsers(ts_seg.ts);
-			ts_seg.base_PTS = 0;
-			gf_fseek(ts_seg.src, offset, SEEK_SET);
-			ts_seg.base_offset = offset;
-			ts_seg.ts->pck_number = (u32) (offset/188);
-		}
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "InitialDTSOffset");
-		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "PresentationTimeOffset");
-		if (opt) {
-			sscanf(opt, LLU, &presentationTimeOffset);
-			presentationTimeOffset++;
-		}
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "DurationAtLastPass");
-		if (opt) sscanf(opt, LLD, &ts_seg.duration_at_last_pass);
-	}
-
-	/*index the file*/
-	while (!feof(ts_seg.src) && !ts_seg.suspend_indexing) {
-		char data[NB_TSPCK_IO_BYTES];
-		s32 size = (s32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
-		if (size<0) {
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		gf_m2ts_process_data(ts_seg.ts, data, size);
-		if (size<NB_TSPCK_IO_BYTES) break;
-	}
-	if (feof(ts_seg.src)) ts_seg.suspend_indexing = 0;
-
-	if (!presentationTimeOffset) {
-		presentationTimeOffset = 1 + ts_seg.first_PTS;
-		if (dasher->dash_ctx) {
-			sprintf(szOpt, LLU, ts_seg.first_PTS);
-			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "PresentationTimeOffset", szOpt);
-		}
-	}
-
-	next_pcr_shift = 0;
-	if (!ts_seg.suspend_indexing) {
-		next_pcr_shift = ts_seg.last_DTS + ts_seg.last_frame_duration - ts_seg.PCR_DTS_initial_diff;
-	}
-
-	/* flush SIDX entry for the last packets */
-	m2ts_sidx_flush_entry(&ts_seg);
-	m2ts_sidx_finalize_size(&ts_seg, ts_seg.file_size);
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
-
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, basename, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name ? dasher->seg_rad_name : szOutName, "six", 0, 0, 0, dasher->use_segment_timeline);
-
-
-	memset(is_pes, 0, sizeof(u8)*GF_M2TS_MAX_STREAMS);
-	for (i=0; i<dash_input->nb_components; i++) {
-		is_pes[ dash_input->components[i].ID ] = 1;
-	}
-	pcr_shift = 0;
-
-	bandwidth = dash_input->bandwidth;
-	if (!bandwidth) bandwidth = ts_seg.bandwidth;
-
-	if (dasher->dash_ctx) {
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "Setup");
-		if (!opt || strcmp(opt, "yes")) {
-			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "Setup", "yes");
-			gf_cfg_set_key(dasher->dash_ctx, szSectionName, "ID", dash_input->representationID);
-		} else {
-			if (!bandwidth) {
-				opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "Bandwidth");
-				if (opt) sscanf(opt, "%u", &bandwidth);
-			}
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "StartIndex");
-			if (opt) sscanf(opt, "%u", &segment_index);
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "PCR90kOffset");
-			if (opt) sscanf(opt, LLU, &pcr_shift);
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, szSectionName, "CumulatedDuration");
-			if (opt) {
-				u64 val;
-				sscanf(opt, LLU, &val);
-				cumulated_duration = ((Double) val) / dasher->dash_scale;
-			}
-		}
-	}
-
-	/*write segment template for all representations*/
-	if (first_in_set && dasher->seg_rad_name && dasher->use_url_template && !dasher->variable_seg_rad_name) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-		fprintf(dasher->mpd, "   <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dasher->segment_duration), segment_index, SegName);
-		//the SIDX we have is not compatible with the spec - until fixed, disable this
-#if 0
-		if (!dasher->dash_ctx) {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "six", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-			fprintf(dasher->mpd, " index=\"%s\"", IdxName);
-		}
-#endif
-
-		if (dasher->ast_offset_ms<0) {
-			fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-		}
-		fprintf(dasher->mpd, "/>\n");
-	}
-
-
-	fprintf(dasher->mpd, "   <Representation id=\"%s\" mimeType=\"video/mp2t\"", dash_input->representationID);
-	szCodecs[0] = 0;
-	for (i=0; i<dash_input->nb_components; i++) {
-		if (strlen(dash_input->components[i].szCodec))
-			if (strlen(szCodecs))
-				strcat(szCodecs, ",");
-		strcat(szCodecs, dash_input->components[i].szCodec);
-
-		if (dash_input->components[i].width && dash_input->components[i].height)
-			fprintf(dasher->mpd, " width=\"%u\" height=\"%u\"", dash_input->components[i].width, dash_input->components[i].height);
-
-		if (dash_input->components[i].sample_rate)
-			fprintf(dasher->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
-	}
-	if (strlen(szCodecs))
-		fprintf(dasher->mpd, " codecs=\"%s\"", szCodecs);
-
-	fprintf(dasher->mpd, " startWithSAP=\"%d\"", dasher->segments_start_with_rap ? 1 : 0);
-	fprintf(dasher->mpd, " bandwidth=\"%d\"", bandwidth);
-	fprintf(dasher->mpd, ">\n");
-
-	/* writing Representation level descriptors */
-	if (dash_input->nb_rep_descs) {
-		for (i=0; i<dash_input->nb_rep_descs; i++) {
-			if (strchr(dash_input->rep_descs[i], '<') != NULL) {
-				fprintf(dasher->mpd, "    %s\n", dash_input->rep_descs[i]);
-			}
-		}
-	}
-
-
-	for (i=0; i<ts_seg.sidx->nb_refs; i++) {
-		GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-		if (dasher->max_segment_duration * ts_seg.sidx->timescale < ref->subsegment_duration) {
-			dasher->max_segment_duration = (Double) ref->subsegment_duration;
-			dasher->max_segment_duration /= ts_seg.sidx->timescale;
-		}
-	}
-
-
-	if (dasher->single_file_mode==1) {
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-		fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n", SegName);
-
-		fprintf(dasher->mpd, "    <SegmentBase>\n");
-		fprintf(dasher->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
-		fprintf(dasher->mpd, "    </SegmentBase>\n");
-
-		/*we rewrite the file*/
-		rewrite_input = GF_TRUE;
-	} else {
-		if (dasher->seg_rad_name && dasher->use_url_template) {
-			if (dasher->variable_seg_rad_name) {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_TEMPLATE, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-				fprintf(dasher->mpd, "    <SegmentTemplate timescale=\"90000\" duration=\"%d\" startNumber=\"%d\" media=\"%s\"", (u32) (90000*dasher->segment_duration), segment_index, SegName);
-
-				//the SIDX we have is not compatible with the spec - until fixed, disable this
-#if 0
-				if (!dasher->dash_ctx) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, 1, IdxName, basename, dash_input->representationID, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name), "six", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-					fprintf(dasher->mpd, " index=\"%s\"", IdxName);
-				}
-#endif
-
-				if (presentationTimeOffset > 1)
-					fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
-
-				if (dasher->ast_offset_ms<0) {
-					fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-				}
-				fprintf(dasher->mpd, "/>\n");
-			} else if (presentationTimeOffset > 1) {
-				fprintf(dasher->mpd, "    <SegmentTemplate presentationTimeOffset=\""LLD"\"/>\n", presentationTimeOffset - 1);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] PTSOffset "LLD" - startNumber %d - time %g\n", presentationTimeOffset - 1, segment_index, (Double) (s64) (ts_seg.sidx->earliest_presentation_time + pcr_shift) / 90000.0));
-			}
-		} else {
-			gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT_NO_OUTPUT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, gf_dasher_strip_output_dir(dasher->mpd_name, dasher->seg_rad_name ? dasher->seg_rad_name : szOutName), "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-			if (dasher->single_file_mode)
-				fprintf(dasher->mpd, "    <BaseURL>%s</BaseURL>\n",SegName);
-			fprintf(dasher->mpd, "    <SegmentList timescale=\"90000\" duration=\"%d\"", (u32) (90000*dasher->segment_duration));
-
-			if (presentationTimeOffset > 1)
-				fprintf(dasher->mpd, " presentationTimeOffset=\""LLD"\"", presentationTimeOffset - 1);
-
-			if (dasher->ast_offset_ms<0) {
-				fprintf(dasher->mpd, " availabilityTimeOffset=\"%g\"", - (Double) dasher->ast_offset_ms / 1000.0);
-			}
-			fprintf(dasher->mpd, ">\n");
-
-			if (!dasher->dash_ctx) {
-				fprintf(dasher->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
-			}
-		}
-
-		/*rewrite previous SegmentList entries*/
-		if ( dasher->dash_ctx && ((dasher->single_file_mode==2) || (!dasher->single_file_mode && !dasher->use_url_template))) {
-			/*rewrite previous URLs*/
-			const char *opt;
-			u32 count, i;
-			count = gf_cfg_get_key_count(dasher->dash_ctx, szRepURLsSecName);
-			for (i=0; i<count; i++) {
-				const char *key_name = gf_cfg_get_key_name(dasher->dash_ctx, szRepURLsSecName, i);
-				opt = gf_cfg_get_key(dasher->dash_ctx, szRepURLsSecName, key_name);
-				fprintf(dasher->mpd, "     %s\n", opt);
-			}
-		}
-
-		if (dasher->single_file_mode==2) {
-
-			start = ts_seg.sidx->first_offset;
-			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
-				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-				fprintf(dasher->mpd, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
-				start += ref->reference_size;
-			}
-			rewrite_input = GF_TRUE;
-
-		} else {
-			FILE *src, *dst;
-			u64 pos, end;
-			Double current_time = cumulated_duration, dur;
-			src = gf_fopen(dash_input->file_name, "rb");
-			start = ts_seg.sidx->first_offset;
-			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
-				char buf[NB_TSPCK_IO_BYTES];
-				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-
-				/*warning - we may introduce repeated sequence number when concatenating files. We should use switching
-				segments to force reset of the continuity counter for all our pids - we don't because most players don't car ...*/
-				if (dasher->use_url_template != 2) {
-					dst = gf_fopen(SegName, "wb");
-					if (!dst) {
-						gf_fclose(src);
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create segment file %s\n", SegName));
-						e = GF_IO_ERR;
-						goto exit;
-					}
-
-					dur = ref->subsegment_duration;
-					dur /= 90000;
-
-					gf_dasher_store_segment_info(dasher, dash_input->representationID, SegName, (u64) (current_time*dasher->dash_scale), (u64) ((current_time+dur)*dasher->dash_scale), dasher->dash_scale);
-
-					current_time += dur;
-
-					gf_fseek(src, start, SEEK_SET);
-					pos = start;
-					end = start+ref->reference_size;
-					while (pos<end) {
-						s32 res;
-						u32 to_read = NB_TSPCK_IO_BYTES;
-						if (pos+NB_TSPCK_IO_BYTES >= end) {
-							to_read = (u32) (end-pos);
-						}
-						res = (s32) fread(buf, 1, to_read, src);
-						if (res == (s32) to_read) {
-							gf_m2ts_restamp(buf, res, pcr_shift, is_pes);
-							res = (u32) fwrite(buf, 1, to_read, dst);
-						}
-						if (res!=to_read) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
-							break;
-						}
-						pos += res;
-					}
-					gf_fclose(dst);
-				}
-				start += ref->reference_size;
-
-				if (!dasher->use_url_template) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, basename, dash_input->representationID, NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-					fprintf(dasher->mpd, "     <SegmentURL media=\"%s\"/>\n", SegName);
-
-					if (dasher->dash_ctx) {
-						char szKey[100], szVal[4046];
-						sprintf(szKey, "UrlInfo%d", segment_index);
-						sprintf(szVal, "<SegmentURL media=\"%s\"/>", SegName);
-						gf_cfg_set_key(dasher->dash_ctx, szRepURLsSecName, szKey, szVal);
-					}
-				}
-
-				segment_index++;
-				gf_set_progress("Extracting segment ", i+1, ts_seg.sidx->nb_refs);
-			}
-			gf_fclose(src);
-		}
-		if (!dasher->seg_rad_name || !dasher->use_url_template) {
-			fprintf(dasher->mpd, "    </SegmentList>\n");
-		}
-	}
-
-	if (rewrite_input) {
-		FILE *in, *out;
-		u64 fsize, done;
-		char buf[NB_TSPCK_IO_BYTES];
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "ts", 0, bandwidth, segment_index, dasher->use_segment_timeline);
-		out = gf_fopen(SegName, "wb");
-		if (!out) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot create segment file %s\n", SegName));
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		in = gf_fopen(dash_input->file_name, "rb");
-		gf_fseek(in, 0, SEEK_END);
-		fsize = gf_ftell(in);
-		gf_fseek(in, 0, SEEK_SET);
-		done = 0;
-		while (1) {
-			s32 read = (s32) fread(buf, 1, NB_TSPCK_IO_BYTES, in);
-			if (read<0) {
-				e = GF_IO_ERR;
-				goto exit;
-			}
-			gf_m2ts_restamp(buf, read, pcr_shift, is_pes);
-			fwrite(buf, 1, read, out);
-			done+=read;
-			gf_set_progress("Extracting segment ", done/188, fsize/188);
-			if (read<NB_TSPCK_IO_BYTES) break;
-		}
-		gf_fclose(in);
-		gf_fclose(out);
-	}
-
-	fprintf(dasher->mpd, "   </Representation>\n");
-
-	if (dasher->dash_ctx) {
-		sprintf(szOpt, "%u", bandwidth);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "Bandwidth", szOpt);
-
-		sprintf(szOpt, "%u", segment_index);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "StartIndex", szOpt);
-
-		sprintf(szOpt, LLU, (u64) (dasher->dash_scale*ts_seg.segment_duration) );
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
-
-		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "PCR90kOffset", szOpt);
-
-		sprintf(szOpt, LLU, ts_seg.suspend_indexing);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "ByteOffset", ts_seg.suspend_indexing ? szOpt : NULL);
-
-		sprintf(szOpt, LLD, ts_seg.duration_at_last_pass);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "DurationAtLastPass", ts_seg.suspend_indexing ? szOpt : NULL);
-
-		sprintf(szOpt, LLU, ts_seg.PCR_DTS_initial_diff);
-		gf_cfg_set_key(dasher->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
-	}
-
-	if (ts_seg.sidx && ts_seg.index_bs) {
-		gf_isom_box_size((GF_Box *)ts_seg.sidx);
-		gf_isom_box_write((GF_Box *)ts_seg.sidx, ts_seg.index_bs);
-	}
-	if (ts_seg.pcrb && ts_seg.index_bs) {
-		gf_isom_box_size((GF_Box *)ts_seg.pcrb);
-		gf_isom_box_write((GF_Box *)ts_seg.pcrb, ts_seg.index_bs);
-	}
-
-exit:
-	if (ts_seg.sidx) gf_isom_box_del((GF_Box *)ts_seg.sidx);
-	if (ts_seg.pcrb) gf_isom_box_del((GF_Box *)ts_seg.pcrb);
-	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
-	if (ts_seg.index_file) {
-		gf_fclose(ts_seg.index_file);
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, GF_TRUE, IdxName, szOutName, dash_input->representationID, dash_input->baseURL ? dash_input->baseURL[0] : NULL, dasher->seg_rad_name, "six", 0, 0, 0, dasher->use_segment_timeline);
-		gf_delete_file(IdxName);
-	}
-	dasher_del_ts_demux(&ts_seg);
-	return e;
-}
-
-#endif //GPAC_DISABLE_MPEG2TS
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-static char * gf_dash_get_representationID(GF_DashSegInput *inputs, u32 nb_dash_inputs, const char *file_name, u32 trackNum) {
-	u32 i;
-
-	for (i = 0; i < nb_dash_inputs; i++) {
-		if (!strcmp(inputs[i].file_name, file_name) && (inputs[i].trackNum == trackNum))
-			return inputs[i].representationID;
-	}
-
-	return 0; //we should never be here !!!!
-}
-#endif
-
-static GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput **io_dash_inputs, u32 *nb_dash_inputs, u32 idx)
-{
-	GF_DashSegInput *dash_inputs = *io_dash_inputs;
-	GF_DashSegInput *dash_input = & dash_inputs[idx];
-	char *uri_frag = strchr(dash_input->file_name, '#');
-	FILE *t;
-
-	if (uri_frag) uri_frag[0] = 0;
-
-	t = gf_fopen(dash_input->file_name, "rb");
-	if (!t) return GF_URL_ERROR;
-	gf_fclose(t);
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	if (gf_isom_probe_file(dash_input->file_name)) {
-		GF_ISOFile *file;
-		Bool has_tiling = GF_FALSE;
-		u32 nb_track, j, k, max_nb_deps, cur_idx, rep_idx;
-		const char *dep_representation_id;
-		const char *dep_representation_file=NULL;
-
-		strcpy(dash_input->szMime, "video/mp4");
-		dash_input->dasher_create_init_segment = dasher_isom_create_init_segment;
-		dash_input->dasher_input_classify = dasher_isom_classify_input;
-		dash_input->dasher_get_components_info = dasher_isom_get_components_info;
-		dash_input->dasher_segment_file = dasher_isom_segment_file;
-
-		file = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
-		if (!file) return gf_isom_last_error(NULL);
-
-		nb_track = gf_isom_get_track_count(file);
-
-		/*if this dash input file has only one track, or this has not the scalable track: handle as one representation*/
-		if ((nb_track == 1) || !gf_isom_needs_layer_reconstruction(file)) {
-			u32 track_num = nb_track;
-			if (uri_frag) {
-				u32 id = 0;
-				if (!strnicmp(uri_frag+1, "trackID=", 8))
-					id = atoi(uri_frag+9);
-				else if (!strnicmp(uri_frag+1, "ID=", 3))
-					id = atoi(uri_frag+4);
-				else if (!stricmp(uri_frag+1, "audio") || !stricmp(uri_frag+1, "video")) {
-					Bool check_video = !stricmp(uri_frag+1, "video") ? GF_TRUE : GF_FALSE;
-                    Bool check_auxv = !stricmp(uri_frag+1, "auxv") ? GF_TRUE : GF_FALSE;
-                    Bool check_pict = !stricmp(uri_frag+1, "pict") ? GF_TRUE : GF_FALSE;
-					u32 i;
-					for (i=0; i<nb_track; i++) {
-						switch (gf_isom_get_media_type(file, i+1)) {
-                        case GF_ISOM_MEDIA_AUXV:
-                            if (check_auxv) id = gf_isom_get_track_id(file, i+1);
-                            break;
-                        case GF_ISOM_MEDIA_PICT:
-                            if (check_pict) id = gf_isom_get_track_id(file, i+1);
-                            break;
-						case GF_ISOM_MEDIA_VISUAL:
-							if (check_video) id = gf_isom_get_track_id(file, i+1);
-							break;
-						case GF_ISOM_MEDIA_AUDIO:
-							if (!check_video) id = gf_isom_get_track_id(file, i+1);
-							break;
-						}
-						if (id) break;
-					}
-				}
-				dash_input->single_track_num = gf_isom_get_track_by_id(file, id);
-				track_num = dash_input->single_track_num;
-				if (nb_track==1) dash_input->single_track_num = 0;
-			}
-			dash_input->protection_scheme_type = gf_isom_is_media_encrypted(file, track_num, 1);
-
-			dash_input->moof_seqnum_increase = 0;
-
-			gf_isom_close(file);
-			return GF_OK;
-		}
-
-		max_nb_deps = 0;
-		for (j = 0; j < nb_track; j++) {
-			//check scalability
-            u32 mtype = gf_isom_get_media_type(file, j+1);
-			if (gf_isom_is_video_subtype(mtype) ) {
-				u32 c1 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
-				u32 c2 = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
-				if (c2) has_tiling = GF_TRUE;
-				if (c1 + c2) {
-					max_nb_deps ++;
-				}
-			}
-		}
-#ifdef GENERATE_VIRTUAL_REP_SRD
-		if (has_tiling) max_nb_deps++;
-#endif
-		//scalable input file, realloc
-		j = *nb_dash_inputs + max_nb_deps;
-		dash_inputs = (GF_DashSegInput*)gf_realloc(dash_inputs, sizeof(GF_DashSegInput) * j);
-		memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegInput) * max_nb_deps);
-		(*io_dash_inputs) = dash_inputs;
-
-		dash_input = & dash_inputs[idx];
-		dash_input->nb_representations = 1 + max_nb_deps;
-		dash_input->idx_representations=0;
-		rep_idx = 1;
-		cur_idx = idx+1;
-		dep_representation_id = dash_input->representationID;
-
-		//create dash inputs
-		for (j = 0; j < nb_track; j++) {
-			u32 default_sample_group_index, id, independent;
-			Bool full_frame;
-			GF_DashSegInput *di;
-			u32 count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
-			count += gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_TBAS);
-			if (!count) {
-				u32 x, y, w, h;
-				Bool found_same_base = GF_FALSE;
-
-				//special case for HEVC tile, do not dublicate base representation if same res
-				count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SABT);
-				count += gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_SCAL);
-				if (!count) {
-					switch (gf_isom_get_media_subtype(file, j+1, 1)) {
-					case GF_ISOM_SUBTYPE_LHE1:
-					case GF_ISOM_SUBTYPE_LHV1:
-					case GF_ISOM_SUBTYPE_HEV2:
-					case GF_ISOM_SUBTYPE_HVC2:
-						count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
-						break;
-					}
-				}
-
-				if (!has_tiling || !count) {
-					dash_input->trackNum = j+1;
-					continue;
-				}
-
-				w = h = 0;
-				gf_isom_get_tile_info(file, j+1, 1, &default_sample_group_index, &id, &independent, &full_frame, &x, &y, &w, &h);
-				if (!w && !h) {
-					gf_isom_get_visual_info(file, j+1, 1, &w, &h);
-					x = y = 0;
-				}
-				//look in all previous dash inputs
-				for (k=0; k<idx; k++) {
-					GF_DashSegInput *prev_dash_input = & dash_inputs[k];
-					if ( (prev_dash_input->x==x) && (prev_dash_input->y==y) && (prev_dash_input->w==w) && (prev_dash_input->h==h) ) {
-						GF_ISOFile *temp = gf_isom_open(prev_dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
-
-						//same rep ?
-						if (gf_isom_is_same_sample_description(file, j+1, 1, temp, prev_dash_input->trackNum, 1)) {
-							found_same_base = GF_TRUE;
-							dep_representation_id = prev_dash_input->representationID;
-							dep_representation_file=prev_dash_input->file_name;
-						}
-						gf_isom_delete(temp);
-						if (found_same_base) break;
-					}
-				}
-				if (found_same_base) {
-					cur_idx --;
-					(*nb_dash_inputs) --;
-					continue;
-				}
-				dash_input->trackNum = j+1;
-				continue;
-			}
-
-			di = &dash_inputs [cur_idx];
-			*nb_dash_inputs += 1;
-			cur_idx++;
-			//copy over values from base rep
-			memcpy(di, dash_input, sizeof(GF_DashSegInput));
-
-			/*representationID*/
-			snprintf(di->representationID, sizeof(di->representationID), "%s_%d", dep_representation_id, cur_idx);
-			di->trackNum = j+1;
-
-			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
-
-			di->idx_representations = rep_idx;
-			rep_idx ++;
-
-			if (gf_isom_get_reference_count(file, di->trackNum, GF_ISOM_REF_TBAS)) {
-				gf_isom_get_tile_info(file, di->trackNum, 1, &default_sample_group_index, &id, &independent, &full_frame, &di->x, &di->y, &di->w, &di->h);
-
-				if (!dash_input->w) {
-					gf_isom_get_visual_info(file, dash_input->trackNum, 1, &dash_input->w, &dash_input->h);
-				}
-			}
-		}
-#ifdef GENERATE_VIRTUAL_REP_SRD
-		if (has_tiling) {
-			GF_DashSegInput *di = &dash_inputs [cur_idx];
-			*nb_dash_inputs += 1;
-			cur_idx++;
-			//copy over values from base rep
-			memcpy(di, dash_input, sizeof(GF_DashSegInput));
-			/*representationID*/
-			sprintf(di->representationID, "%s_%d", dep_representation_id, cur_idx);
-
-			di->trackNum = 0;
-			for (k = 0; k < nb_track; k++) {
-				//check scalability
-                u32 mtype = gf_isom_get_media_type(file, k+1);
-				if (gf_isom_is_video_subtype(mtype) ) {
-					if (gf_isom_get_reference_count(file, k+1, GF_ISOM_REF_SABT)) {
-						di->trackNum = k+1;
-						break;
-					}
-				}
-			}
-
-			di->protection_scheme_type = gf_isom_is_media_encrypted(file, di->trackNum, 1);
-
-			di->idx_representations = rep_idx;
-			rep_idx ++;
-
-			di->virtual_representation = GF_TRUE;
-		}
-#endif
-
-		/*dependencyID - FIXME - the declaration of dependency and new dash_input entries should be in DEDENDENCY ORDER*/
-		for (k=0; k<2; k++) {
-			for (j = idx; j < *nb_dash_inputs; j++) {
-				GF_DashSegInput *di;
-				u32 count, t, ref_track;
-				char *depID = NULL;
-				u32 dep_type;
-
-				di = &dash_inputs[j];
-				if (di->dependencyID) continue;
-
-#ifdef GENERATE_VIRTUAL_REP_SRD
-				if (k==1) dep_type = (di->virtual_representation) ? GF_ISOM_REF_SABT : GF_ISOM_REF_TBAS;
-#else
-				if (k==1) dep_type = GF_ISOM_REF_TBAS;
-#endif
-				else dep_type = GF_ISOM_REF_SCAL;
-
-				count = gf_isom_get_reference_count(file, di->trackNum, dep_type);
-				if (!count) {
-					if (k==1) {
-						switch (gf_isom_get_media_subtype(file, j+1, 1)) {
-						case GF_ISOM_SUBTYPE_LHE1:
-						case GF_ISOM_SUBTYPE_LHV1:
-						case GF_ISOM_SUBTYPE_HEV2:
-						case GF_ISOM_SUBTYPE_HVC2:
-							dep_type = GF_ISOM_REF_BASE;
-							count = gf_isom_get_reference_count(file, j+1, GF_ISOM_REF_BASE);
-							break;
-						}
-					}
-					if (!count)
-						continue;
-				}
-
-				di->lower_layer_track = dash_input->trackNum;
-				depID = (char*)gf_malloc(2);
-				strcpy(depID, "");
-				for (t=0; t < count; t++) {
-					u32 al_len = 0;
-					char *rid;
-					if (t) al_len++;
-					gf_isom_get_reference(file, di->trackNum, dep_type, t+1, &ref_track);
-					rid = gf_dash_get_representationID(dash_inputs, *nb_dash_inputs, dep_representation_file ? dep_representation_file : di->file_name, ref_track);
-
-					if (!rid) continue;
-					al_len += (u32) strlen(rid);
-					al_len += (u32) strlen(depID)+1;
-
-					depID = (char*)gf_realloc(depID, sizeof(char)*al_len);
-					if (t)
-						strcat(depID, " ");
-					strcat(depID, rid);
-
-					di->lower_layer_track = ref_track;
-				}
-				if (di->dependencyID) gf_free(di->dependencyID);
-				di->dependencyID = depID;
-			}
-		}
-
-		gf_isom_close(file);
-		return GF_OK;
-	}
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-	dash_input->moof_seqnum_increase = 0;
-
-#ifndef GPAC_DISABLE_MPEG2TS
-	if (gf_m2ts_probe_file(dash_input->file_name)) {
-		GF_TSSegmenter ts_seg;
-		u32 count = 0;
-		GF_Err e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 1);
-		if (e) return e;
-		count = gf_list_count(ts_seg.ts->programs);
-		dasher_del_ts_demux(&ts_seg);
-		if (count>1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
-			return GF_NOT_SUPPORTED;
-		}
-
-		strcpy(dash_input->szMime, "video/mp2t");
-		/*we don't use init segments with MPEG-2 TS*/
-		dash_input->dasher_create_init_segment = NULL;
-		dash_input->dasher_input_classify = dasher_generic_classify_input;
-		dash_input->dasher_get_components_info = dasher_mp2t_get_components_info;
-		dash_input->dasher_segment_file = dasher_mp2t_segment_file;
-		return GF_OK;
-	}
-#endif
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] File %s not supported for dashing - skipping\n", dash_input->file_name));
-	return GF_NOT_SUPPORTED;
-}
-
-static void format_duration(FILE *mpd, Double dur, const char *name)
-{
-	Double s;
-	u32 h, m;
-
-	h = (u32) (dur/3600);
-	m = (u32) (dur/60 - h*60);
-	s = (dur - h*3600 - m*60);
-	fprintf(mpd, " %s=\"PT%dH%dM%.3fS\"", name, h, m, s);
-
-}
-
-static GF_Err write_mpd_header(GF_DASHSegmenter *dasher, FILE *mpd, Bool is_mpeg2, Double mpd_duration, Bool use_cenc, Bool use_xlink)
-{
-	u32 sec, frac;
-	u64 time_ms;
-	Double msec;
-#ifdef _WIN32_WCE
-	SYSTEMTIME syst;
-	FILETIME filet;
-#else
-	time_t gtime;
-	struct tm *t;
-#endif
-	u32 i;
-
-	gf_net_get_ntp(&sec, &frac);
-	time_ms = sec;
-	time_ms *= 1000;
-	msec = frac*1000.0;
-	msec /= 0xFFFFFFFF;
-
-	time_ms += (u32) msec;
-	if (dasher->ast_offset_ms > 0) {
-		time_ms += (u32) dasher->ast_offset_ms;
-	}
-	sec = (u32) (time_ms/1000);
-	time_ms -= ((u64)sec)*1000;
-	assert(time_ms<1000);
-
-	fprintf(mpd, "<?xml version=\"1.0\"?>\n");
-	if(!dasher->force_test_mode)
-		fprintf(mpd, "\n");
-
-	/*TODO what should we put for minBufferTime */
-	fprintf(mpd, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" minBufferTime=\"PT%.3fS\" type=\"%s\"", dasher->min_buffer, dasher->dash_mode ? "dynamic" : "static");
-
-
-	if (dasher->dash_mode != GF_DASH_STATIC) {
-		//set publish time
-#ifndef _WIN32_WCE
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		t = gmtime(&gtime);
-		fprintf(mpd, " publishTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-#else
-		GetSystemTime(&syst);
-		fprintf(mpd, " publishTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond);
-#endif
-
-		if (dasher->dash_ctx) {
-			//we only support profiles for which AST has to be the same
-			const char *opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
-			sscanf(opt, "%u:%u", &sec, &frac);
-
-			msec = frac*1000.0;
-			msec /= 0xFFFFFFFF;
-			time_ms = (u32) msec;
-		}
-
-#ifdef _WIN32_WCE
-		*(LONGLONG *) &filet = (sec - GF_NTP_SEC_1900_TO_1970) * 10000000 + TIMESPEC_TO_FILETIME_OFFSET;
-		FileTimeToSystemTime(&filet, &syst);
-		fprintf(mpd, " " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond, (u32) time_ms);
-#else
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		t = gmtime(&gtime);
-		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, (u32) time_ms);
-#endif
-
-		if (dasher->time_shift_depth>=0) {
-			format_duration(mpd, dasher->time_shift_depth, "timeShiftBufferDepth");
-		}
-		if (dasher->mpd_update_time) {
-			format_duration(mpd, dasher->mpd_update_time, "minimumUpdatePeriod");
-		} else {
-			format_duration(mpd, mpd_duration, "mediaPresentationDuration");
-		}
-
-	} else {
-		format_duration(mpd, mpd_duration, "mediaPresentationDuration");
-	}
-
-	if (dasher->max_segment_duration) {
-		if (dasher->single_segment) {
-			format_duration(mpd, dasher->max_segment_duration, "maxSubsegmentDuration");
-		} else {
-			format_duration(mpd, dasher->max_segment_duration, "maxSegmentDuration");
-		}
-	}
-
-	if (dasher->profile==GF_DASH_PROFILE_LIVE) {
-		if (use_xlink && !is_mpeg2) {
-			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-ext-live:2014");
-		} else {
-			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011", is_mpeg2 ? "mp2t-simple" : "isoff-live");
-		}
-	} else if (dasher->profile==GF_DASH_PROFILE_ONDEMAND) {
-		if (use_xlink) {
-			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-ext-on-demand:2014");
-		} else {
-			fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011");
-		}
-	} else if (dasher->profile==GF_DASH_PROFILE_MAIN) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011", is_mpeg2 ? "mp2t-main" : "isoff-main");
-	} else if (dasher->profile==GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-		fprintf(mpd, " profiles=\"urn:hbbtv:dash:profile:isoff-live:2012");
-	} else if (dasher->profile==GF_DASH_PROFILE_AVC264_LIVE) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-live:2011,http://dashif.org/guidelines/dash264");
-	} else if (dasher->profile==GF_DASH_PROFILE_AVC264_ONDEMAND) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011,http://dashif.org/guidelines/dash264");
-	} else {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011");
-	}
-
-	if (dasher->dash_profile_extension) {
-		fprintf(mpd, ",%s", dasher->dash_profile_extension);
-	}
-	fprintf(mpd, "\"");
-
-	if (use_cenc) {
-		fprintf(mpd, " xmlns:cenc=\"urn:mpeg:cenc:2013\"");
-	}
-	if (use_xlink) {
-		fprintf(mpd, " xmlns:xlink=\"http://www.w3.org/1999/xlink\"");
-	}
-
-	fprintf(mpd, ">\n");
-
-	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", dasher->moreInfoURL ? dasher->moreInfoURL : "http://gpac.io");
-	if (dasher->title)
-		fprintf(mpd, "  <Title>%s</Title>\n", dasher->title);
-	else {
-		const char *title = strrchr(dasher->mpd_name, '/');
-		if (!title) title = strrchr(dasher->mpd_name, '/');
-		if (!title) title = dasher->mpd_name;
-		else title += 1;
-		fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", title);
-	}
-
-	if (dasher->source)
-		fprintf(mpd, "  <Source>%s</Source>\n", dasher->source);
-	if (dasher->location)
-		fprintf(mpd, "  <Location>%s</Location>\n", dasher->location);
-	if (dasher->copyright)
-		fprintf(mpd, "  <Copyright>%s</Copyright>\n", dasher->copyright);
-	fprintf(mpd, " </ProgramInformation>\n");
-
-	for (i=0; i<dasher->nb_base_urls; i++) {
-		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", dasher->base_urls[i]);
-	}
-	fprintf(mpd, "\n");
-	return GF_OK;
-}
-
-static GF_Err write_period_header(GF_DASHSegmenter *dasher, FILE *mpd, const char *szID, Double period_start, Double period_duration,
-                                  const char *xlink, u32 period_num, Bool insert_xmlns)
-{
-	u32 i,j;
-	fprintf(mpd, " <Period");
-
-	if (insert_xmlns) {
-		fprintf(mpd, " xmlns=\"urn:mpeg:dash:schema:mpd:2011\" ");
-	}
-	if (szID && strlen(szID))
-		fprintf(mpd, " id=\"%s\"", szID);
-
-	if (period_start || dasher->dash_mode) {
-		format_duration(mpd, period_start, "start");
-	}
-	if (!dasher->dash_mode && period_duration) {
-		format_duration(mpd, period_duration, "duration");
-	}
-	if (xlink) {
-		fprintf(mpd, " xlink:href=\"%s\"", xlink);
-	}
-
-	fprintf(mpd, ">\n");
-
-	/* writing Period level descriptors */
-	for (i=0; i< dasher->nb_inputs; i++) {
-		if (dasher->inputs[i].adaptation_set && (dasher->inputs[i].period==period_num)) {
-			for (j = 0; j < dasher->inputs[i].nb_p_descs; j++) {
-				if (strchr(dasher->inputs[i].p_descs[j], '<') != NULL) {
-					fprintf(mpd, "  %s\n", dasher->inputs[i].p_descs[j]);
-				}
-			}
-		}
-	}
-
-	if (xlink) {
-		fprintf(mpd, " </Period>\n");
-	}
-
-	return GF_OK;
-}
-
-static GF_Err write_adaptation_header(FILE *mpd, GF_DashProfile profile, Bool use_url_template, u32 single_file_mode,
-                                      GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 period_num, u32 adaptation_set_num, u32 first_rep_in_set,
-                                      u32 bitstream_switching_mode, u32 max_width, u32 max_height, u32 dar_num, u32 dar_den, char *szMaxFPS, char *szLang, const char *szInitSegment, Bool segment_alignment_disabled, const char *mpd_name, Bool start_with_sap)
-{
-	u32 i, j;
-	Bool is_on_demand = ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND));
-	GF_DashSegInput *first_rep = &dash_inputs[first_rep_in_set];
-
-	//force segmentAlignment in onDemand
-	fprintf(mpd, "  <AdaptationSet segmentAlignment=\"%s\"", (!is_on_demand  && segment_alignment_disabled) ? "false" : "true");
-	if (bitstream_switching_mode==1) {
-		fprintf(mpd, " bitstreamSwitching=\"true\"");
-	}
-	if (first_rep->group_id) {
-		fprintf(mpd, " group=\"%d\"", first_rep->group_id);
-	}
-	if (max_width && max_height) {
-		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\"", max_width, max_height);
-		if (strlen(szMaxFPS))
-			fprintf(mpd, " maxFrameRate=\"%s\"", szMaxFPS);
-
-		gf_media_reduce_aspect_ratio(&dar_num, &dar_den);
-		fprintf(mpd, " par=\"%d:%d\"", dar_num, dar_den);
-	}
-
-
-	//add lang even if "und" to comply with dash-if
-	if (szLang) {
-		fprintf(mpd, " lang=\"%s\"", szLang);
-	}
-
-	if (single_file_mode == 1) {
-		fprintf(mpd, " startWithSAP=\"1\"");
-	}
-	//regular segmenting
-	else if (start_with_sap) {
-		fprintf(mpd, " startWithSAP=\"1\"");
-
-	}
-
-	if ((profile==GF_DASH_PROFILE_ONDEMAND) || (profile==GF_DASH_PROFILE_AVC264_ONDEMAND)) {
-		fprintf(mpd, " subsegmentAlignment=\"%s\"", segment_alignment_disabled ? "false" : "true");
-		//FIXME - we need inspection of the segments to figure out the SAP type !
-		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
-	}
-	fprintf(mpd, ">\n");
-
-	/* writing AdaptationSet level descriptors specified only on one input (non discriminating during classification)*/
-	for (i=0; i< nb_dash_inputs; i++) {
-		if ((dash_inputs[i].adaptation_set == adaptation_set_num) && (dash_inputs[i].period == period_num)) {
-			for (j = 0; j < dash_inputs[i].nb_as_c_descs; j++) {
-				if (strchr(dash_inputs[i].as_c_descs[j], '<') != NULL) {
-					fprintf(mpd, "   %s\n", dash_inputs[i].as_c_descs[j]);
-				}
-			}
-		}
-	}
-
-	//check SRD
-	for (i=0; i< nb_dash_inputs; i++) {
-		if ((dash_inputs[i].adaptation_set == adaptation_set_num) && (dash_inputs[i].period == period_num)) {
-			if (dash_inputs[i].w && dash_inputs[i].h
-#ifdef GENERATE_VIRTUAL_REP_SRD
-			        && !dash_inputs[i].virtual_representation
-#endif
-			   ) {
-				if (dash_inputs[i].dependencyID) {
-					fprintf(mpd, "   <SupplementalProperty schemeIdUri=\"urn:mpeg:dash:srd:2014\" value=\"1,%d,%d,%d,%d\"/>\n", dash_inputs[i].x, dash_inputs[i].y, dash_inputs[i].w, dash_inputs[i].h);
-					break;
-				}
-				//this is the base layer
-				else {
-					fprintf(mpd, "   <EssentialProperty schemeIdUri=\"urn:mpeg:dash:srd:2014\" value=\"1,0,0,0,0\"/>\n");
-					break;
-				}
-			}
-		}
-	}
-
-
-	if (first_rep) {
-
-		/* writing AdaptationSet level descriptors specified only all inputs for that AdaptationSet*/
-		for (i=0; i<first_rep->nb_as_descs; i++) {
-			if (strchr(first_rep->as_descs[i], '<') != NULL) {
-				fprintf(mpd, "   %s\n", first_rep->as_descs[i]);
-			}
-		}
-
-		if (bitstream_switching_mode) {
-			for (i=0; i<first_rep->nb_components; i++) {
-				struct _dash_component *comp = &first_rep->components[i];
-				if (comp->media_type == GF_ISOM_MEDIA_AUDIO) {
-					fprintf(mpd, "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", comp->channels);
-				}
-			}
-		}
-
-		/*set role*/
-		if (first_rep->roles) {
-			u32 r;
-			for (r=0; r<first_rep->nb_roles; r++) {
-				char *role = first_rep->roles[r];
-				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")
-				) {
-					fprintf(mpd, "   <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" value=\"%s\"/>\n", role);
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Unrecognized role %s - using GPAC urn for schemaID\n", role));
-					fprintf(mpd, "   <Role schemeIdUri=\"urn:gpac:dash:role:2013\" value=\"%s\"/>\n", role);
-				}
-			}
-		}
-
-		if (first_rep->nb_components>1) {
-			for (i=0; i<first_rep->nb_components; i++) {
-				struct _dash_component *comp = &first_rep->components[i];
-
-				fprintf(mpd, "   <ContentComponent id=\"%d\" ", comp->ID);
-				switch (comp->media_type ) {
-				case GF_ISOM_MEDIA_TEXT:
-					fprintf(mpd, "contentType=\"text\" ");
-					break;
-				case GF_ISOM_MEDIA_VISUAL:
-                case GF_ISOM_MEDIA_AUXV:
-                case GF_ISOM_MEDIA_PICT:
-					fprintf(mpd, "contentType=\"video\" ");
-					break;
-				case GF_ISOM_MEDIA_AUDIO:
-					fprintf(mpd, "contentType=\"audio\" ");
-					break;
-				case GF_ISOM_MEDIA_SCENE:
-				case GF_ISOM_MEDIA_DIMS:
-				default:
-					fprintf(mpd, "contentType=\"application\" ");
-					break;
-				}
-				/*if lang not specified at adaptationSet level, put it here*/
-				if ((!szLang) && (comp->lang && strcmp(comp->lang, "und"))) {
-					fprintf(mpd, " lang=\"%s\"", comp->lang);
-				}
-				fprintf(mpd, "/>\n");
-			}
-		}
-
-		if (bitstream_switching_mode && !use_url_template && (single_file_mode!=1) && strlen(szInitSegment) ) {
-			fprintf(mpd, "   <SegmentList>\n");
-			fprintf(mpd, "    <Initialization sourceURL=\"%s\"/>\n", gf_dasher_strip_output_dir(mpd_name,  szInitSegment ));
-			fprintf(mpd, "   </SegmentList>\n");
-		}
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_dasher_init_context(GF_DASHSegmenter *dasher, GF_DashDynamicMode *dash_mode, s32 *timeShiftBufferDepth, const char *periodID, s32 ast_shift_ms)
-{
-	const char *opt;
-	char szVal[100];
-	Bool first_run = GF_FALSE;
-	GF_Config *dash_ctx = dasher->dash_ctx;
-
-	if (!dash_ctx) return GF_BAD_PARAM;
-
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
-	/*first run, init all options*/
-	if (!opt) {
-		first_run = GF_TRUE;
-		sprintf(szVal, "%d", *timeShiftBufferDepth);
-		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*dash_mode == GF_DASH_DYNAMIC_DEBUG) ? "dynamic-debug" : ( *dash_mode ? "dynamic" : "static" ) );
-		gf_cfg_set_key(dash_ctx, "DASH", "TimeShiftBufferDepth", szVal);
-		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "yes");
-	}
-	//switching from live to static
-	else if (! (*dash_mode) && !strncmp(opt, "dynamic", 7)) {
-		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", "static");
-	} else {
-		*dash_mode = GF_DASH_STATIC;
-		if (!strcmp(opt, "dynamic")) *dash_mode = GF_DASH_DYNAMIC;
-		else if (!strcmp(opt, "dynamic-debug")) *dash_mode = GF_DASH_DYNAMIC_DEBUG;
-
-		opt = gf_cfg_get_key(dash_ctx, "DASH", "TimeShiftBufferDepth");
-		*timeShiftBufferDepth = atoi(opt);
-		gf_cfg_set_key(dash_ctx, "DASH", "StoreParams", "no");
-	}
-
-	if (first_run) {
-		u32 sec, frac;
-#ifndef _WIN32_WCE
-		time_t gtime;
-#endif
-		gf_net_get_ntp(&sec, &frac);
-
-		if (dasher->start_date_sec_ntp) {
-			dasher->nb_secs_to_discard = sec;
-			dasher->nb_secs_to_discard -= dasher->start_date_sec_ntp;
-			dasher->nb_secs_to_discard -= dasher->time_shift_depth;
-
-			sec = dasher->start_date_sec_ntp;
-			frac = dasher->start_date_sec_ntp_ms_frac;
-		}
-
-
-#ifndef _WIN32_WCE
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		gf_cfg_set_key(dash_ctx, "DASH", "GenerationTime", asctime(gmtime(&gtime)));
-#endif
-		sprintf(szVal, "%u:%u", sec, frac);
-		gf_cfg_set_key(dash_ctx, "DASH", "GenerationNTP", szVal);
-
-		if (periodID)
-			gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
-	} else {
-
-		/*check if we change period*/
-		if (periodID) {
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "PeriodID");
-			if (!opt || strcmp(opt, periodID)) {
-				gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
-			}
-		}
-	}
-
-	/*perform cleanup of previous representations*/
-
-	return GF_OK;
-}
-
 GF_EXPORT
 u32 gf_dasher_next_update_time(GF_DASHSegmenter *dasher, u64 *ms_in_session)
 {
-	Double past_period_dur = 0, max_dur = 0;
-	Double ms_elapsed;
-	u32 i, ntp_sec, frac, prev_sec, prev_frac, dash_scale, nb_reps=0;
-	const char *opt, *section;
-
-	if (!dasher || !dasher->dash_ctx) return -1;
-
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
-	sscanf(opt, "%u:%u", &prev_sec, &prev_frac);
-
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "TimeScale");
-	sscanf(opt, "%u", &dash_scale);
-
-
-	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dasher->dash_ctx); i++) {
-		Double dur = 0;
-		section = gf_cfg_get_section_name(dasher->dash_ctx, i);
-		if (section && !strncmp(section, "Representation_", 15)) {
-			nb_reps ++;
-			opt = gf_cfg_get_key(dasher->dash_ctx, section, "CumulatedDuration");
-			if (opt) {
-				u64 val;
-				sscanf(opt, LLU, &val);
-				dur = ((Double) val) / dash_scale;
-			}
-			if (dur>max_dur) max_dur = dur;
-		}
-	}
-	//last period has been flushed but its duration not yet included in cumulated dur
-	if (!nb_reps) {
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
-		if (opt) {
-			sscanf(opt, "%lf", &past_period_dur);
-			max_dur = past_period_dur;
-		}
-	}
-
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
-	if (opt) {
-		sscanf(opt, "%lf", &past_period_dur);
-		max_dur += past_period_dur;
-	}
-
-	if (!max_dur) return 0;
-	gf_net_get_ntp(&ntp_sec, &frac);
-
-	ms_elapsed = frac;
-	ms_elapsed -= prev_frac;
-	ms_elapsed /= 0xFFFFFFFF;
-	ms_elapsed *= 1000;
-	ms_elapsed += ((u64)(ntp_sec - prev_sec))*1000;
-
-	if (ms_in_session) *ms_in_session = (u64) ( 1000*max_dur );
-
-	/*check if we need to generate */
-	if (ms_elapsed < (max_dur /* - safety_dur*/)*1000 ) {
-		return (u32) (1000*max_dur - ms_elapsed);
+	s64 diff = 0;
+	if (dasher->next_gen_ntp_ms) {
+		diff = (s64) dasher->next_gen_ntp_ms;
+		diff -= (s64) gf_net_get_ntp_ms();
 	}
-	return 0;
+	if (ms_in_session) *ms_in_session = dasher->mpd_time_ms;
+	return diff>0 ? (u32) diff : 1;
 }
 
-/*peform all file cleanup*/
-static Bool gf_dasher_cleanup(GF_DASHSegmenter *dasher)
-{
-	Double max_dur = 0;
-	Double elapsed = 0;
-	Double dash_duration = 1000*dasher->segment_duration / dasher->dash_scale;
-	Double safety_dur = MAX(dasher->mpd_update_time, dash_duration);
-	u32 i, ntp_sec, frac, prev_sec, prev_frac;
-	const char *opt, *section;
-	GF_Err e;
-
-	if (!dasher->dash_mode) return GF_TRUE;
-
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "StoreParams");
-	if (opt && !strcmp(opt, "yes")) return GF_TRUE;
-
-	opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "GenerationNTP");
-	if (!opt) return GF_TRUE;
-	sscanf(opt, "%u:%u", &prev_sec, &prev_frac);
-
-	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dasher->dash_ctx); i++) {
-		Double dur = 0;
-		section = gf_cfg_get_section_name(dasher->dash_ctx, i);
-		if (section && !strncmp(section, "Representation_", 15)) {
-			opt = gf_cfg_get_key(dasher->dash_ctx, section, "CumulatedDuration");
-			if (opt) {
-				u64 val;
-				sscanf(opt, LLU, &val);
-				dur = ((Double) val) / dasher->dash_scale;
-			}
-			if (dur>max_dur) max_dur = dur;
-		}
-	}
-	if (!max_dur) return GF_TRUE;
-	gf_net_get_ntp(&ntp_sec, &frac);
-
-	if (dasher->dash_mode == GF_DASH_DYNAMIC_DEBUG) {
-		elapsed = (u32)-1;
-	} else {
-		elapsed = ntp_sec;
-		elapsed += (frac*1.0)/0xFFFFFFFF;
-		elapsed -= prev_sec;
-		elapsed -= (prev_frac*1.0)/0xFFFFFFFF;
-		/*check if we need to generate */
-		if (!dasher->dash_mode && elapsed < max_dur - safety_dur ) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Asked to regenerate segments before expiration of the current segment list, please wait %g seconds - ignoring\n", max_dur + prev_sec - ntp_sec ));
-			return GF_FALSE;
-		}
-		if (elapsed > max_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", elapsed - (u32) max_dur));
-		} else {
-			/*generate as if max_dur has been reached*/
-			elapsed = max_dur;
-		}
-	}
-
-	/*cleanup old segments*/
-	if (dasher->time_shift_depth >= 0) {
-		for (i=0; i<gf_cfg_get_key_count(dasher->dash_ctx, "SegmentsStartTimes"); i++) {
-			Double seg_time;
-			u64 start, dur, scale;
-			char szRepID[100];
-			char szSecName[200];
-			u32 j;
-			const char *fileName = gf_cfg_get_key_name(dasher->dash_ctx, "SegmentsStartTimes", i);
-			const char *opt = gf_cfg_get_key(dasher->dash_ctx, "SegmentsStartTimes", fileName);
-			if (!fileName)
-				break;
-
-			sscanf(opt, ""LLU"-"LLU"-"LLU"@%s", &start, &dur, &scale, szRepID);
-			seg_time = (Double) start;
-			seg_time /= scale;
-
-			if (dasher->ast_offset_ms > 0)
-				seg_time += ((Double) dasher->ast_offset_ms) / 1000;
-
-
-			seg_time += 2 * dash_duration + dasher->time_shift_depth;
-			seg_time -= elapsed;
-			if (seg_time >= 0)
-				continue;
-
-			if (! (dasher->dash_mode == GF_DASH_DYNAMIC_DEBUG) ) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time - dash_duration));
-			}
-
-			e = gf_delete_file(fileName);
-			if (e) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not remove file %s: %s\n", fileName, gf_error_to_string(e) ));
-				break;
-			}
-
-			sprintf(szSecName, "URLs_%s", szRepID);
-
-			/*remove URLs*/
-			for (j=0; j<gf_cfg_get_key_count(dasher->dash_ctx, szSecName); j++) {
-				const char *entry = gf_cfg_get_key_name(dasher->dash_ctx, szSecName, j);
-				const char *name = gf_cfg_get_key(dasher->dash_ctx, szSecName, entry);
-				if (strstr(name, fileName)) {
-					gf_cfg_set_key(dasher->dash_ctx, szSecName, entry, NULL);
-					break;
-				}
-			}
-
-			/*adjust seg removed count - this is needed to adjust startNumber for SegmentTimeline case*/
-			sprintf(szSecName, "Representation_%s", szRepID);
-			j = 1;
-			opt = gf_cfg_get_key(dasher->dash_ctx, szSecName, "NbSegmentsRemoved");
-			if (opt) j += atoi(opt);
-			sprintf(szRepID, "%d", j);
-			gf_cfg_set_key(dasher->dash_ctx, szSecName, "NbSegmentsRemoved", szRepID);
-
-			gf_cfg_set_key(dasher->dash_ctx, "SegmentsStartTimes", fileName, NULL);
-			i--;
-		}
-	}
-	return GF_TRUE;
-}
-
-static u32 gf_dash_get_dependency_bandwidth(GF_DashSegInput *inputs, u32 nb_dash_inputs, const char *file_name, u32 trackNum) {
-	u32 i;
-
-	for (i = 0; i < nb_dash_inputs; i++) {
-		if (!strcmp(inputs[i].file_name, file_name) && (inputs[i].trackNum == trackNum))
-			return inputs[i].bandwidth;
-	}
-
-	return 0; //we should never be here !!!!
-}
-
-static GF_Err dash_insert_period_xml(FILE *mpd, char *szPeriodXML)
-{
-	FILE *period_mpd;
-	u32 xml_size;
-
-	period_mpd = gf_fopen(szPeriodXML, "rb");
-	if (!period_mpd) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Error opening period MPD file %s\n", szPeriodXML));
-		return GF_IO_ERR;
-	}
-	gf_fseek(period_mpd, 0, SEEK_END);
-	xml_size = (u32) gf_ftell(period_mpd);
-	gf_fseek(period_mpd, 0, SEEK_SET);
-
-	while (xml_size) {
-		char buf[4096];
-		u32 read;
-		u32 size = 4096;
-		if (xml_size<4096) size = xml_size;
-		read = (s32) fread(buf, 1, size, period_mpd);
-		if (read != (s32) size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Error reading from period MPD file: got %d but requested %d bytes\n", read, size ));
-			gf_fclose(period_mpd);
-			return GF_IO_ERR;
-		}
-
-		fwrite(buf, 1, size, mpd);
-		xml_size -= size;
-	}
-	gf_fclose(period_mpd);
-	//we cannot delet the file because we don't know if we will be called again with a new period, in which case we need to reinsert this XML ...
-	return GF_OK;
-}
-
-static void purge_dash_context(GF_Config *dash_ctx)
-{
-	u32 i, count;
-	//purge dash context
-	count = gf_cfg_get_section_count(dash_ctx);
-	for (i=0; i<count; i++) {
-		const char *opt = gf_cfg_get_section_name(dash_ctx, i);
-		if (!opt) continue;
-		if ( !strnicmp(opt, "Representation_", 15) || !strcmp(opt, "SegmentsStartTimes")) {
-			const char *max_sap = gf_cfg_get_key(dash_ctx, opt, "MaxSAPType");
-			if (max_sap) {
-				gf_cfg_set_key(dash_ctx, "DASH", "PrevPeriodMaxSAPType", max_sap);
-			}
-			gf_cfg_del_section(dash_ctx, opt);
-			count--;
-			i--;
-		}
-	}
-}
-
-typedef struct
-{
-	char szPeriodXML[GF_MAX_PATH];
-	const char *xlink;
-	Double period_duration;
-	Bool is_xlink;
-	u32 period_idx;
-	const char *id;
-} PeriodEntry;
-
 
 GF_EXPORT
-GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile dash_profile, const char *tmp_dir, u32 dash_timescale, GF_Config *dasher_context_file)
+GF_DASHSegmenter *gf_dasher_new(const char *mpdName, GF_DashProfile dash_profile, const char *tmp_dir, u32 dash_timescale, const char *dasher_context_file)
 {
 	GF_DASHSegmenter *dasher;
 	GF_SAFEALLOC(dasher, GF_DASHSegmenter);
 	if (!dasher) return NULL;
 
 	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_ctx = dasher_context_file;
-
+	dasher->dash_state = dasher_context_file;
+	dasher->inputs = gf_list_new();
 	return dasher;
 }
 
 GF_EXPORT
-void gf_dasher_set_start_date(GF_DASHSegmenter *dasher, u64 dash_utc_start_date)
+void gf_dasher_set_start_date(GF_DASHSegmenter *dasher, const char *dash_utc_start_date)
 {
-	if (dash_utc_start_date) {
-		Double ms;
-		u64 secs = dash_utc_start_date/1000;
-		dasher->start_date_sec_ntp = (u32) secs;
-		dasher->start_date_sec_ntp += GF_NTP_SEC_1900_TO_1970;
-
-		ms = (Double) (dash_utc_start_date - secs*1000);
-		ms /= 1000.0;
-		ms *= 0xFFFFFFFF;
-		dasher->start_date_sec_ntp_ms_frac = (u32) ms;
-	} else {
-		dasher->start_date_sec_ntp = 0;
-		dasher->start_date_sec_ntp_ms_frac = 0;
-	}
+	if (!dasher) return;
+	if (dasher->utc_start_date) gf_free(dasher->utc_start_date);
+	dasher->utc_start_date = dash_utc_start_date ? gf_strdup(dash_utc_start_date) : NULL;
 }
 
 GF_EXPORT
 void gf_dasher_clean_inputs(GF_DASHSegmenter *dasher)
 {
-	u32 i, j;
-	for (i=0; i < dasher->nb_inputs; i++) {
-		for (j = 0; j < dasher->inputs[i].nb_components; j++) {
-			if (dasher->inputs[i].components[j].lang) {
-				gf_free(dasher->inputs[i].components[j].lang);
-			}
-		}
-		if (dasher->inputs[i].dependencyID) gf_free(dasher->inputs[i].dependencyID);
-		if (dasher->inputs[i].init_seg_url) gf_free(dasher->inputs[i].init_seg_url);
-		if (dasher->inputs[i].period_id_not_specified && dasher->inputs[i].periodID) gf_free(dasher->inputs[i].periodID);
-
-		if (dasher->inputs[i].isobmf_input) {
-			//we don't want to save any modif due to duration adjustments
-			gf_isom_delete(dasher->inputs[i].isobmf_input);
-		}
+	gf_list_reset(dasher->inputs);
+	if (dasher->fsess) {
+		gf_fs_del(dasher->fsess);
+		dasher->fsess = NULL;
 	}
-	gf_free(dasher->inputs);
-	dasher->inputs = NULL;
-	dasher->nb_inputs = 0;
 }
 
 GF_EXPORT
@@ -6233,31 +170,34 @@
 {
 	if (dasher->seg_rad_name) gf_free(dasher->seg_rad_name);
 	gf_dasher_clean_inputs(dasher);
-	gf_free(dasher->base_urls);
 	gf_free(dasher->tmpdir);
 	gf_free(dasher->mpd_name);
-	gf_free(dasher->title);
-	gf_free(dasher->copyright);
-	gf_free(dasher->moreInfoURL);
-	gf_free(dasher->source);
-	gf_free(dasher->location);
+	if (dasher->title) gf_free(dasher->title);
+	if (dasher->moreInfoURL) gf_free(dasher->moreInfoURL);
+	if (dasher->sourceInfo) gf_free(dasher->sourceInfo);
+	if (dasher->copyright) gf_free(dasher->copyright);
+	if (dasher->lang) gf_free(dasher->lang);
+	if (dasher->locations) gf_free(dasher->locations);
+	if (dasher->base_urls) gf_free(dasher->base_urls);
+	if (dasher->utc_start_date) gf_free(dasher->utc_start_date);
+	gf_list_del(dasher->inputs);
 	gf_free(dasher);
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo)
+GF_Err gf_dasher_set_info(GF_DASHSegmenter *dasher, const char *title, const char *copyright, const char *moreInfoURL, const char *sourceInfo, const char *lang)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	if (title) dasher->title = gf_strdup(title);
-	if (copyright) dasher->copyright = gf_strdup(copyright);
-	if (moreInfoURL) dasher->moreInfoURL = gf_strdup(moreInfoURL);
-	if (sourceInfo) dasher->source = gf_strdup(sourceInfo);
-	return GF_OK;
-}
 
-GF_EXPORT
-GF_Err gf_dasher_set_test_mode(GF_DASHSegmenter *dasher, Bool forceTestMode){
-	dasher->force_test_mode=forceTestMode;
+#define DOSET(_field) \
+	if (dasher->_field) gf_free(dasher->_field);\
+	dasher->_field = _field ? gf_strdup(_field) : NULL;\
+
+	DOSET(title)
+	DOSET(copyright)
+	DOSET(moreInfoURL)
+	DOSET(sourceInfo);
+	DOSET(lang);
 	return GF_OK;
 }
 
@@ -6265,32 +205,25 @@
 GF_Err gf_dasher_set_location(GF_DASHSegmenter *dasher, const char *location)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	if (location) dasher->location = gf_strdup(location);
-	return GF_OK;
+
+	if (!location) return GF_OK;
+	return gf_dynstrcat(&dasher->locations, location, ",");
 }
 
 GF_EXPORT
 GF_Err gf_dasher_add_base_url(GF_DASHSegmenter *dasher, const char *base_url)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	dasher->base_urls = gf_realloc(dasher->base_urls, sizeof(const char **) * (1+dasher->nb_base_urls));
-	dasher->base_urls[dasher->nb_base_urls] = (char *)base_url;
-	dasher->nb_base_urls++;
-	return GF_OK;
+
+	if (!base_url) return GF_OK;
+	return gf_dynstrcat(&dasher->base_urls, base_url, ",");
 }
 
 static void dasher_format_seg_name(GF_DASHSegmenter *dasher, const char *inName)
 {
-	char szName[GF_MAX_PATH];
-	/*if output is not in the current working dir, concatenate output path to segment name*/
-	szName[0] = 0;
-
-	if (inName && gf_url_get_resource_path(dasher->mpd_name, szName)) {
-		strcat(szName, inName);
-		dasher->seg_rad_name = gf_strdup(szName);
-	} else {
-		if (inName) dasher->seg_rad_name = gf_strdup(inName);
-	}
+	if (dasher->seg_rad_name) gf_free(dasher->seg_rad_name);
+	dasher->seg_rad_name = NULL;
+	if (inName) dasher->seg_rad_name = gf_strdup(inName);
 }
 
 GF_EXPORT
@@ -6299,7 +232,7 @@
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->use_url_template = enable;
 	dasher->seg_ext = default_extension;
-	dasher->init_seg_ext = default_init_extension;
+	dasher->seg_init_ext = default_init_extension;
 	dasher_format_seg_name(dasher, default_template);
 	return GF_OK;
 }
@@ -6319,6 +252,7 @@
 	dasher->single_segment = enable;
 	return GF_OK;
 }
+
 GF_EXPORT
 GF_Err gf_dasher_enable_single_file(GF_DASHSegmenter *dasher, Bool enable)
 {
@@ -6336,7 +270,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_durations(GF_DASHSegmenter *dasher, Double default_segment_duration, Double default_fragment_duration)
+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;
@@ -6344,6 +278,7 @@
 		dasher->fragment_duration = default_fragment_duration * 1000 / dasher->dash_scale;
 	else
 		dasher->fragment_duration = dasher->segment_duration;
+	dasher->sub_duration = sub_duration;
 	return GF_OK;
 }
 
@@ -6365,6 +300,16 @@
 }
 
 GF_EXPORT
+GF_Err gf_dasher_print_session_info(GF_DASHSegmenter *dasher, u32 fs_print_flags)
+{
+	if (!dasher) return GF_BAD_PARAM;
+	dasher->print_stats_graph = fs_print_flags;
+	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)
 {
 	if (!dasher) return GF_BAD_PARAM;
@@ -6379,9 +324,12 @@
 GF_Err gf_dasher_set_dynamic_mode(GF_DASHSegmenter *dasher, GF_DashDynamicMode dash_mode, Double mpd_update_time, s32 time_shift_depth, Double mpd_live_duration)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	dasher->dash_mode = dash_mode;
-	dasher->mpd_update_time = mpd_update_time;
+	if (dasher->dash_mode != dash_mode) {
+		dasher->dash_mode = dash_mode;
+		dasher->dash_mode_changed = GF_TRUE;
+	}
 	dasher->time_shift_depth = time_shift_depth;
+	dasher->mpd_update_time = mpd_update_time;
 	dasher->mpd_live_duration = mpd_live_duration;
 	return GF_OK;
 }
@@ -6390,7 +338,7 @@
 GF_Err gf_dasher_set_min_buffer(GF_DASHSegmenter *dasher, Double min_buffer)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	dasher->min_buffer = min_buffer;
+	dasher->min_buffer_time = (u32)(min_buffer*1000);
 	return GF_OK;
 }
 
@@ -6420,7 +368,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf)
+GF_Err gf_dasher_configure_isobmf_default(GF_DASHSegmenter *dasher, Bool no_fragments_defaults, GF_DASHPSSHMode pssh_mode, Bool samplegroups_in_traf, Bool single_traf_per_moof, Bool tfdt_per_traf, Bool mvex_after_traks, u32 sdtp_in_traf)
 {
 	if (!dasher) return GF_BAD_PARAM;
 	dasher->no_fragments_defaults = no_fragments_defaults;
@@ -6428,6 +376,8 @@
 	dasher->samplegroups_in_traf = samplegroups_in_traf;
 	dasher->single_traf_per_moof = single_traf_per_moof;
     dasher->tfdt_per_traf = tfdt_per_traf;
+    dasher->mvex_after_traks = mvex_after_traks;
+    dasher->sdtp_in_traf = sdtp_in_traf;
 	return GF_OK;
 }
 
@@ -6448,7 +398,6 @@
 }
 
 GF_EXPORT
-
 GF_Err gf_dasher_set_content_protection_location_mode(GF_DASHSegmenter *dasher, GF_DASH_ContentLocationMode mode)
 {
 	if (!dasher) return GF_BAD_PARAM;
@@ -6481,18 +430,18 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_split_on_bound(GF_DASHSegmenter *dasher, Bool split_on_bound)
+GF_Err gf_dasher_set_hls_clock(GF_DASHSegmenter *dasher, Bool insert_clock)
 {
-	if (!dasher) return GF_BAD_PARAM;
-	dasher->split_on_bound = split_on_bound;
-	return GF_OK;
+       if (!dasher) return GF_BAD_PARAM;
+       dasher->hls_clock = insert_clock;
+       return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_split_on_closest(GF_DASHSegmenter *dasher, Bool split_on_closest)
+GF_Err gf_dasher_set_split_mode(GF_DASHSegmenter *dasher, GF_DASH_SplitMode split_mode)
 {
 	if (!dasher) return GF_BAD_PARAM;
-	dasher->split_on_closest = split_on_closest;
+	dasher->split_mode = split_mode;
 	return GF_OK;
 }
 
@@ -6505,1235 +454,701 @@
 }
 
 GF_EXPORT
-GF_Err gf_dasher_set_isobmff_options(GF_DASHSegmenter *dasher, Bool mvex_after_traks)
+GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, const GF_DashSegmenterInput *input)
 {
-	dasher->mvex_after_traks = mvex_after_traks;
-	return GF_OK;
-}
+	if (!dasher) return GF_BAD_PARAM;
 
-static void dash_input_check_period_id(GF_DASHSegmenter *dasher, GF_DashSegInput *dash_input)
-{
-	if (dash_input->period_id_not_specified) {
-		if (dash_input->periodID) gf_free(dash_input->periodID);
-		dash_input->periodID = NULL;
-		dash_input->period_id_not_specified = 0;
-	}
-
-	if (! dash_input->periodID) {
-		dash_input->period_id_not_specified = 1;
-		//assign ID if dynamic - if dash_ctx also assign ID since we could have moved from dynamic to static
-		if ((dasher->dash_mode!=GF_DASH_STATIC) || dasher->dash_ctx) {
-			char szPName[50];
-			sprintf(szPName, "DID1");
-			if (dasher->dash_ctx) {
-				if (dasher->force_session_end) {
-					const char *p = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriod");
-					if (p) {
-						strcpy(szPName, p);
-						sscanf(p, "DID%d", &dash_input->period_id_not_specified);
-					}
-				} else {
-					while (1) {
-						const char *p = gf_cfg_get_key(dasher->dash_ctx, "PastPeriods", szPName);
-						if (!p) break;
-						dash_input->period_id_not_specified++;
-						sprintf(szPName, "DID%d", dash_input->period_id_not_specified);
-					}
-				}
-			}
-			dash_input->periodID = gf_strdup(szPName);
+	if (!stricmp(input->file_name, "NULL") || !strcmp(input->file_name, "") || !input->file_name) {
+		if (!input->xlink || !strcmp(input->xlink, "")) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No input file specified and no xlink set - cannot dash\n"));
+			return GF_BAD_PARAM;
 		}
 	}
+
+	gf_list_add(dasher->inputs, (void *) input);
+	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_dasher_add_input(GF_DASHSegmenter *dasher, GF_DashSegmenterInput *input)
+static Bool on_dasher_event(void *_udta, GF_Event *evt)
 {
-	GF_Err e;
-	GF_DashSegInput *dash_input;
-	if (!dasher) return GF_BAD_PARAM;
-
-	dasher->inputs = gf_realloc(dasher->inputs, sizeof(GF_DashSegInput) * (dasher->nb_inputs+1));
-	dash_input = &dasher->inputs[dasher->nb_inputs];
-	dasher->nb_inputs++;
-	memset(dash_input, 0, sizeof(GF_DashSegInput));
-
-	dash_input->file_name = input->file_name;
-	if (input->representationID)
-		strcpy(dash_input->representationID, input->representationID);
-
-	dash_input->periodID = input->periodID;
-	dash_input->media_duration = input->media_duration;
-	dash_input->nb_baseURL = input->nb_baseURL;
-	dash_input->baseURL = input->baseURL;
-	dash_input->xlink = input->xlink;
-	dash_input->nb_roles = input->nb_roles;
-	dash_input->roles = input->roles;
-
-	dash_input->nb_rep_descs = input->nb_rep_descs;
-	dash_input->rep_descs = input->rep_descs;
-	dash_input->nb_as_descs = input->nb_as_descs;
-	dash_input->as_descs = input->as_descs;
-	dash_input->nb_as_c_descs = input->nb_as_c_descs;
-	dash_input->as_c_descs = input->as_c_descs;
-	dash_input->nb_p_descs = input->nb_p_descs;
-	dash_input->p_descs = input->p_descs;
-	dash_input->no_cache = dasher->no_cache;
-	dash_input->sscale = input->sscale;
-
-	dash_input->bandwidth = input->bandwidth;
-
-	if (!strcmp(dash_input->file_name, "NULL") || !strcmp(dash_input->file_name, "") || !dash_input->file_name) {
-		if (!strcmp(dash_input->xlink, "")) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No input file specified and no xlink set - cannot dash\n"));
-			dasher->nb_inputs --;
-			return GF_BAD_PARAM;
+	u32 i, count;
+	GF_FilterStats stats;
+	GF_DASHSegmenter *dasher = (GF_DASHSegmenter *)_udta;
+	if (evt && (evt->type != GF_EVENT_PROGRESS)) return GF_FALSE;
+
+	stats.report_updated = GF_FALSE;
+	if (!dasher->dash_filter_idx_plus_one) {
+		count = gf_fs_get_filters_count(dasher->fsess);
+		for (i=0; i<count; i++) {
+			if (gf_fs_get_filter_stats(dasher->fsess, i, &stats) != GF_OK) continue;
+			if (strcmp(stats.reg_name, "dasher")) continue;
+			dasher->dash_filter_idx_plus_one = i+1;
+			break;
 		}
-		dash_input->duration = input->period_duration;
+		if (!dasher->dash_filter_idx_plus_one) return GF_FALSE;
 	} else {
-		dash_input->segment_duration = input->period_duration;
-
-		e = gf_dash_segmenter_probe_input(&dasher->inputs, &dasher->nb_inputs, dasher->nb_inputs-1);
-		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot open file %s for dashing: %s\n", dash_input->file_name, gf_error_to_string(e) ));
-			dasher->nb_inputs --;
-			return e;
-		}
+		if (gf_fs_get_filter_stats(dasher->fsess, dasher->dash_filter_idx_plus_one-1, &stats) != GF_OK)
+			return GF_FALSE;
 	}
-	return GF_OK;
+	if (! stats.report_updated) return GF_FALSE;
+	if (stats.percent/100 == dasher->last_prog) return GF_FALSE;
+	dasher->last_prog = stats.percent / 100;
+
+	if ( stats.status) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing %s\r", stats.status));
+	} else if (stats.percent>0) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Dashing: % 2.2f %%\r", ((Double)stats.percent) / 100));
+	}
+	return GF_FALSE;
 }
 
-static const char *role_default = "main";
-
-GF_EXPORT
-GF_Err gf_dasher_process(GF_DASHSegmenter *dasher, Double sub_duration)
+/*create filter session, setup destination options and setup sources options*/
+static GF_Err gf_dasher_setup(GF_DASHSegmenter *dasher)
 {
-	u32 i, j, max_period, cur_period;
-	Bool has_role = GF_FALSE;
-	char *sep, szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH], szOpt[GF_MAX_PATH];
-	const char *opt;
 	GF_Err e;
-	Bool uses_xlink = GF_FALSE;
-	Bool has_mpeg2 = GF_FALSE;
-	Bool none_supported = GF_TRUE;
-	u32 valid_inputs = 0;
-	u32 cur_adaptation_set;
-	u32 max_adaptation_set = 0;
-	u32 cur_group_id = 0;
-	u32 max_sap_type = 0;
-	u32 nb_sap_type_greater_than_3 = 0;
-	u32 nb_sap_type_greater_than_4 = 0;
-	u32 max_comp_per_input;
-	Bool use_cenc = GF_FALSE;
-	Bool segment_alignment = GF_TRUE;
-	GF_List *period_links = NULL;
-	Double presentation_duration = 0;
-	Double active_period_start = 0;
-	u32 last_period_rep_idx_plus_one = 0;
-	u32 nb_vids=0;
-	FILE *mpd = NULL;
-	PeriodEntry *p;
-	if (!dasher) return GF_BAD_PARAM;
+	u32 i, count;
+	char *sep_ext;
+	char *args=NULL, szArg[1024];
+	Bool multi_period = GF_FALSE;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Dashing starting\n"));
+	if (!dasher->mpd_name) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Missing MPD name\n"));
+		return GF_OUT_OF_MEM;
+	}
 
-	dasher->force_period_end = GF_FALSE;
-	dasher->force_session_end = GF_FALSE;
+	dasher->fsess = gf_fs_new_defaults(0);
 
-	if (dasher->dash_mode && !dasher->mpd_update_time && !dasher->mpd_live_duration) {
-		if (dasher->dash_mode == GF_DASH_DYNAMIC_LAST) {
-			//dasher->force_period_end = GF_TRUE;
-			dasher->force_session_end = GF_TRUE;
-			dasher->dash_mode = GF_DASH_STATIC;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Either MPD refresh (update) period or MPD duration shall be set in dynamic mode.\n"));
-			return GF_BAD_PARAM;
-		}
-	}
-	if (dasher->real_time && (dasher->nb_inputs>1)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] real-time simulation is only supported with a single representation.\n"));
-		return GF_BAD_PARAM;
+#ifndef GPAC_DISABLE_LOG
+	if (!gf_sys_is_test_mode() && (gf_log_get_tool_level(GF_LOG_APP)!=GF_LOG_QUIET) && !gf_sys_is_quiet() ) {
+		gf_fs_enable_reporting(dasher->fsess, GF_TRUE);
+		gf_fs_set_ui_callback(dasher->fsess, on_dasher_event, dasher);
 	}
+#endif
 
+	if (!dasher->fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to create filter session\n"));
+		return GF_OUT_OF_MEM;
+	}
 
-	/*update dash context*/
-	if (dasher->dash_ctx) {
-		Bool regenerate;
-		e = gf_dasher_init_context(dasher, &dasher->dash_mode, &dasher->time_shift_depth, NULL, dasher->ast_offset_ms);
-		if (e) return e;
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
-		if (opt) {
-			Double seg_dur = atof(opt);
-			dasher->max_segment_duration = seg_dur;
+	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]=='/') {
+			sep_ext = strchr(sep_ext+1, '/');
+			if (sep_ext) sep_ext = strchr(sep_ext, ':');
 		}
-		sprintf(szOpt, "%u", dasher->dash_scale);
-		gf_cfg_set_key(dasher->dash_ctx, "DASH", "TimeScale", szOpt);
-
-		/*peform all file cleanup*/
-		regenerate = gf_dasher_cleanup(dasher);
-		if (!regenerate) return GF_OK;
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "HasXLINK");
-		if (opt && !strcmp(opt, "yes")) uses_xlink = GF_TRUE;
+	}
+	if (sep_ext) {
+		sep_ext[0] = 0;
 	}
 
-	max_period = 0;
+	sprintf(szArg, "segdur=%g", dasher->segment_duration);
+	e = gf_dynstrcat(&args, szArg, ":");
 
-	for (i=0; i<dasher->nb_inputs; i++) {
-		u32 r;
-		GF_DashSegInput *dash_input = &dasher->inputs[i];
-		dash_input->period = 0;
-		dash_input_check_period_id(dasher, dash_input);
+	if (sep_ext)
+		e |= gf_dynstrcat(&args, sep_ext+1, ":");
 
-		dash_input->moof_seqnum_increase = dash_input->nb_representations;
-		if (!dash_input->moof_seqnum_increase) dash_input->moof_seqnum_increase=1;
+	if (dasher->single_segment) e |= gf_dynstrcat(&args, "sseg", ":");
+	if (dasher->single_file) e |= gf_dynstrcat(&args, "sfile", ":");
+	if (dasher->use_url_template) e |= gf_dynstrcat(&args, "tpl", ":");
+	if (dasher->use_segment_timeline) e |= gf_dynstrcat(&args, "stl", ":");
+	if (dasher->dash_mode) {
+		e |= gf_dynstrcat(&args, (dasher->dash_mode == GF_DASH_DYNAMIC_LAST) ? "dynlast" : "dynamic", ":");
+		//make dasher reschedule by default for MP4Box
+		e |= gf_dynstrcat(&args, "reschedule", ":");
+	}
+	if (dasher->disable_segment_alignment) e |= gf_dynstrcat(&args, "!align", ":");
+	if (dasher->enable_mix_codecs) e |= gf_dynstrcat(&args, "mix_codecs", ":");
+	if (dasher->insert_utc) e |= gf_dynstrcat(&args, "ntp=yes", ":");
+	if (dasher->enable_sar_mix) e |= gf_dynstrcat(&args, "no_sar", ":");
+	//forcep not mapped
+	switch (dasher->bitstream_switching_mode) {
+	case GF_DASH_BSMODE_DEFAULT:
+		break;
+	case GF_DASH_BSMODE_NONE:
+		e |= gf_dynstrcat(&args, "bs_switch=off", ":");
+		break;
+	case GF_DASH_BSMODE_INBAND:
+		e |= gf_dynstrcat(&args, "bs_switch=inband", ":");
+		break;
+	case GF_DASH_BSMODE_MERGED:
+		e |= gf_dynstrcat(&args, "bs_switch=on", ":");
+		break;
+	case GF_DASH_BSMODE_MULTIPLE_ENTRIES:
+		e |= gf_dynstrcat(&args, "bs_switch=multi", ":");
+		break;
+	case GF_DASH_BSMODE_SINGLE:
+		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, ":");
+	}
+	if (dasher->seg_ext) {
+		sprintf(szArg, "segext=%s", dasher->seg_ext);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (dasher->seg_init_ext) {
+		sprintf(szArg, "initext=%s", dasher->seg_init_ext);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (dasher->ast_offset_ms) {
+		sprintf(szArg, "asto=%d", -dasher->ast_offset_ms);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	switch (dasher->profile) {
+	case GF_DASH_PROFILE_AUTO:
+		break;
+	case GF_DASH_PROFILE_LIVE:
+		e |= gf_dynstrcat(&args, "profile=live", ":");
+		break;
+ 	case GF_DASH_PROFILE_ONDEMAND:
+		e |= gf_dynstrcat(&args, "profile=onDemand", ":");
+		break;
+	case GF_DASH_PROFILE_MAIN:
+		e |= gf_dynstrcat(&args, "profile=main", ":");
+		break;
+	case GF_DASH_PROFILE_FULL:
+		e |= gf_dynstrcat(&args, "profile=full", ":");
+		if (!dasher->segments_start_with_rap) e |= gf_dynstrcat(&args, "!sap", ":");
+		break;
+	case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE:
+		e |= gf_dynstrcat(&args, "profile=hbbtv1.5.live", ":");
+		break;
+	case GF_DASH_PROFILE_AVC264_LIVE:
+		e |= gf_dynstrcat(&args, "profile=dashavc264.live", ":");
+		break;
+	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		e |= gf_dynstrcat(&args, "profile=dashavc264.onDemand", ":");
+		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", ":");
 
-		/*layered coded representation*/
-		if (dash_input->idx_representations) {
-			continue;
-		}
+	if (dasher->min_buffer_time) {
+		sprintf(szArg, "buf=%d", dasher->min_buffer_time);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (dasher->dash_scale != 1000) {
+		sprintf(szArg, "timescale=%d", dasher->dash_scale);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (!dasher->check_duration) e |= gf_dynstrcat(&args, "!check_dur", ":");
+	//skip_seg not exposed
 
-		if (dash_input->xlink) uses_xlink = GF_TRUE;
 
-		for (r=0; r<dash_input->nb_roles; r++) {
-			if (dash_input->roles[r] && strcmp(dash_input->roles[r], "main")) {
-				has_role = GF_TRUE;
-				break;
-			}
-		}
 
-		if (dash_input->period_id_not_specified) {
-			max_period = 1;
+	if (dasher->dash_mode >= GF_DASH_DYNAMIC) {
+		if (dasher->time_shift_depth<0) e |= gf_dynstrcat(&args, "tsb=-1", ":");
+		else {
+			sprintf(szArg, "tsb=%g", ((Double)dasher->time_shift_depth)/1000);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
 
-		if (!strcmp(dash_input->szMime, "video/mp2t")) has_mpeg2 = GF_TRUE;
-		valid_inputs++;
-	}
-	if (!valid_inputs) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: no suitable file found for dashing.\n"));
-		return GF_BAD_PARAM;
-	}
-
-	//assign periods
-	for (i=0; i<dasher->nb_inputs; i++) {
-		GF_DashSegInput *dash_input = &dasher->inputs[i];
-
-		/*set all default roles to main if needed*/
-		if (has_role && !dash_input->roles) {
-			dash_input->roles = (char**) &role_default;
-			dash_input->nb_roles = 1;
+		if (dasher->utc_start_date) {
+			sprintf(szArg, "ast=%s", dasher->utc_start_date);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		//reset adaptation classifier
-		dash_input->adaptation_set = 0;
-
-		if (dash_input->period)
-			continue;
-
-		if (dash_input->period_id_not_specified) {
-			dash_input->period = 1;
+		if (dasher->mpd_update_time) {
+			sprintf(szArg, "refresh=%g", dasher->mpd_update_time);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		else if (dash_input->periodID) {
-			max_period++;
-			dash_input->period = max_period;
-
-			for (j=i+1; j<dasher->nb_inputs; j++) {
-				if (!strcmp(dasher->inputs[j].periodID, dasher->inputs[i].periodID))
-					dasher->inputs[j].period = dasher->inputs[i].period;
-			}
+		else {
+			sprintf(szArg, "refresh=-%g", dasher->mpd_live_duration);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
 	}
-
-	if (dasher->dash_mode && (max_period > 1) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Multiple periods in live mode not supported\n"));
-		return GF_NOT_SUPPORTED;
-	}
-
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		Double seg_duration_in_period = 0;
-		/*classify all input in possible adaptation sets*/
-		for (i=0; i<dasher->nb_inputs; i++) {
-			GF_DashSegInput *dash_input = &dasher->inputs[i];
-			/*this file does not belong to our current period*/
-			if (dash_input->period != cur_period+1) continue;
-
-			if (!seg_duration_in_period) {
-				seg_duration_in_period = dash_input->segment_duration ? dash_input->segment_duration : dasher->segment_duration;
-			} else if (dash_input->segment_duration && (dash_input->segment_duration != seg_duration_in_period)) {
-				segment_alignment = GF_FALSE;
-			}
-
-			/*this file already belongs to an adaptation set*/
-			if (dash_input->adaptation_set) continue;
-
-			/*we cannot fragment the input file*/
-			if (!dash_input->dasher_input_classify || !dash_input->dasher_segment_file) {
-				//this is a remote period insertion
-				if (dash_input->xlink) {
-					//assign a AS for this fake source (otherwise first active period detection will fail)
-					dash_input->adaptation_set = 1;
-					none_supported = GF_FALSE;
-				}
-				continue;
-			}
-
-			max_adaptation_set++;
-			dash_input->adaptation_set = max_adaptation_set;
-			dash_input->nb_rep_in_adaptation_set = 1;
-
-			e = dash_input->dasher_input_classify(dasher->inputs, dasher->nb_inputs, i, &cur_group_id, &max_sap_type);
-			if (e) return e;
-			none_supported = GF_FALSE;
-			if (max_sap_type>=3) nb_sap_type_greater_than_3++;
-			if (max_sap_type>3) nb_sap_type_greater_than_4++;
-		}
-		if (none_supported) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] None of the input types are supported for DASHing - nothing to do ...\n"));
-			return GF_OK;
-		}
+	if (dasher->sub_duration) {
+		sprintf(szArg, "subdur=%g", dasher->sub_duration);
+		e |= gf_dynstrcat(&args, szArg, ":");
 	}
+	if (dasher->dash_state) {
+		sprintf(szArg, "state=%s", dasher->dash_state);
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (! dasher->disable_loop && dasher->dash_state) e |= gf_dynstrcat(&args, "loop", ":");
+	if (dasher->hls_clock) e |= gf_dynstrcat(&args, "hlsc", ":");
 
+	//the rest is not yet exposed through the old api, but can be set through output file name
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH classification done\n"));
-
-	/*check requested profiles can be generated, or adjust them*/
-	if (nb_sap_type_greater_than_4 || (nb_sap_type_greater_than_3 > 1)) {
-		if (dasher->profile) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
-		}
-		dasher->profile = GF_DASH_PROFILE_FULL;
+	if (dasher->dash_mode>=GF_DASH_DYNAMIC) {
+	 	sprintf(szArg, "_p_gentime=%p", &dasher->next_gen_ntp_ms);
+	 	e |= gf_dynstrcat(&args, szArg, ":");
+	 	sprintf(szArg, "_p_mpdtime=%p", &dasher->mpd_time_ms);
+	 	e |= gf_dynstrcat(&args, szArg, ":");
 	}
 
-	switch (dasher->profile) {
-	case GF_DASH_PROFILE_AVC264_LIVE:
-	case GF_DASH_PROFILE_AVC264_ONDEMAND:
-		if (dasher->cp_location_mode == GF_DASH_CPMODE_REPRESENTATION) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] ERROR! The selected DASH profile (DASH-IF IOP) requires the ContentProtection element to be present in the AdaptationSet element.\n"));
-			e = GF_BAD_PARAM;
-			goto exit;
+	//append ISOBMFF options
+	if (dasher->fragment_duration) {
+		Double diff = dasher->fragment_duration;
+		diff -= dasher->segment_duration;
+		if (diff<0) diff = -diff;
+		if (diff > 0.01) {
+			sprintf(szArg, "cdur=%g", dasher->fragment_duration);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-	default:
-		break;
 	}
-
-	/*adjust params based on profiles*/
-	switch (dasher->profile) {
-	case GF_DASH_PROFILE_LIVE:
-		dasher->segments_start_with_rap = GF_TRUE;
-		dasher->use_url_template = 1;
-		dasher->single_segment = dasher->single_file = GF_FALSE;
-		break;
-	case GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE: {
-		Bool role_main_found=GF_FALSE;
-		dasher->bitstream_switching_mode = GF_DASH_BSMODE_MULTIPLE_ENTRIES;
-		for (i=0; i<dasher->nb_inputs; i++) {
-			u32 r;
-			for (r=0; r<dasher->inputs[i].nb_roles; r++) {
-				if (!strcmp(dasher->inputs[i].roles[r], "main")) {
-					role_main_found=GF_TRUE;
-					break;
-				}
-			}
-		}
-		if (! role_main_found) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] HbbTV 1.5 ISO live profile requires to have at least one Adaptation Set\nlabelled with a Role@value of \"main\". Consider adding \":role=main\" to your inputs.\n"));
-			e = GF_BAD_PARAM;
-			goto exit;
-		}
+	if (dasher->segment_marker_4cc) {
+		sprintf(szArg, "m4cc=%s", gf_4cc_to_str(dasher->segment_marker_4cc) );
+		e |= gf_dynstrcat(&args, szArg, ":");
 	}
-	case GF_DASH_PROFILE_AVC264_LIVE:
-		dasher->segments_start_with_rap = GF_TRUE;
-		dasher->no_fragments_defaults = GF_TRUE;
-		dasher->use_url_template = 1;
-		dasher->single_segment = dasher->single_file = GF_FALSE;
-		for (i=0; i<dasher->nb_inputs; i++) {
-			if (strcmp(dasher->inputs[i].szMime, "video/mp4")) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment container %s forbidden in DASH-AVC/264 live profile.\n", dasher->inputs[i].szMime));
-				e = GF_BAD_PARAM;
-				goto exit;
-			}
-		}
+	if (dasher->daisy_chain_sidx) e |= gf_dynstrcat(&args, "chain_sidx", ":");
+	if (dasher->use_ssix) e |= gf_dynstrcat(&args, "ssix", ":");
+	if (dasher->initial_moof_sn) {
+		sprintf(szArg, "msn=%d", dasher->initial_moof_sn );
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (dasher->initial_tfdt) {
+		sprintf(szArg, "tfdt="LLU"", dasher->initial_tfdt );
+		e |= gf_dynstrcat(&args, szArg, ":");
+	}
+	if (dasher->no_fragments_defaults) e |= gf_dynstrcat(&args, "nofragdef", ":");
+	if (dasher->single_traf_per_moof) e |= gf_dynstrcat(&args, "straf", ":");
+	if (dasher->single_trun_per_traf) e |= gf_dynstrcat(&args, "strun", ":");
+	switch (dasher->pssh_mode) {
+	case GF_DASH_PSSH_MOOV:
+		e |= gf_dynstrcat(&args, "pssh=v", ":");
 		break;
-	case GF_DASH_PROFILE_AVC264_ONDEMAND:
-		dasher->segments_start_with_rap = GF_TRUE;
-		dasher->no_fragments_defaults = GF_TRUE;
-		if (dasher->seg_rad_name) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment-name not allowed in DASH-AVC/264 onDemand profile.\n"));
-			return GF_BAD_PARAM;
-		}
-		for (i=0; i<dasher->nb_inputs; i++) {
-			if (strcmp(dasher->inputs[i].szMime, "video/mp4")) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment container %s forbidden in DASH-AVC/264 onDemand profile.\n", dasher->inputs[i].szMime));
-				e = GF_BAD_PARAM;
-				goto exit;
-			}
-		}
-	case GF_DASH_PROFILE_ONDEMAND:
-		dasher->segments_start_with_rap = GF_TRUE;
-		dasher->single_segment = GF_TRUE;
-		if ((dasher->bitstream_switching_mode != GF_DASH_BSMODE_DEFAULT) && (dasher->bitstream_switching_mode != GF_DASH_BSMODE_NONE)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] onDemand profile, bitstream switching mode cannot be used.\n"));
-			e = GF_BAD_PARAM;
-			goto exit;
-		}
-		/*BS switching is meaningless in onDemand profile*/
-		dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
-		dasher->use_url_template = dasher->single_file = GF_FALSE;
+	case GF_DASH_PSSH_MOOV_MPD:
+		e |= gf_dynstrcat(&args, "pssh=mv", ":");
 		break;
-	case GF_DASH_PROFILE_MAIN:
-		dasher->segments_start_with_rap = GF_TRUE;
-		dasher->single_segment = GF_FALSE;
+	case GF_DASH_PSSH_MOOF:
+		e |= gf_dynstrcat(&args, "pssh=f", ":");
+		break;
+	case GF_DASH_PSSH_MOOF_MPD:
+		e |= gf_dynstrcat(&args, "pssh=mf", ":");
 		break;
-	default:
+	case GF_DASH_PSSH_MPD:
+		e |= gf_dynstrcat(&args, "pssh=m", ":");
 		break;
 	}
 
-	if (!segment_alignment) {
-		if (dasher->profile) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segments are not time-aligned in each representation of each period\n\tswitching to FULL profile\n"));
-			dasher->profile = GF_DASH_PROFILE_FULL;
-		}
-		if (dasher->bitstream_switching_mode != GF_DASH_BSMODE_NONE) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Segments are not time-aligned in each representation of each period\n\tdisabling bitstream switching\n"));
-			dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
-		}
-	}
 
-	//check we have a segment template
-	if (dasher->use_url_template && !dasher->seg_rad_name) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] DASH Live profile requested but no -segment-name - using \"%%s_dash\" by default\n"));
-		dasher_format_seg_name(dasher, "%s_dash");
+	if (dasher->samplegroups_in_traf) e |= gf_dynstrcat(&args, "sgpd_traf", ":");
+	if (dasher->enable_sidx) {
+		sprintf(szArg, "subs_sidx=%d", dasher->subsegs_per_sidx );
+		e |= gf_dynstrcat(&args, szArg, ":");
 	}
 
-	if (dasher->single_segment) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (dasher->nb_inputs>1) ? "s" : "", dasher->segment_duration, dasher->fragment_duration));
-		dasher->subsegs_per_sidx = 0;
-	} else {
-		if (!dasher->seg_ext) dasher->seg_ext = "m4s";
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (dasher->nb_inputs>1) ? "s" : "", dasher->segment_duration, dasher->fragment_duration));
-		if (!dasher->enable_sidx) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("no sidx used"));
-		} else if (dasher->subsegs_per_sidx) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", dasher->subsegs_per_sidx));
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("single sidx per segment"));
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
+	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->fragments_start_with_rap) dasher->segments_start_with_rap = GF_TRUE;
-
-	if (dasher->segments_start_with_rap) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", dasher->fragments_start_with_rap ? "and fragments " : ""));
+	if (dasher->cues_file) {
+		sprintf(szArg, "cues=%s", dasher->cues_file );
+		e |= gf_dynstrcat(&args, szArg, ":");
 	}
+	if (dasher->strict_cues) e |= gf_dynstrcat(&args, "strict_cues", ":");
 
-	dasher->single_file_mode = (dasher->single_segment) ? 1 : (dasher->single_file ? 2 : 0);
-
-	dasher->subduration = sub_duration * 1000 / dasher->dash_scale;
+	if (dasher->mvex_after_traks) e |= gf_dynstrcat(&args, "mvex", ":");
+	if (dasher->sdtp_in_traf==1) e |= gf_dynstrcat(&args, "sdtp_traf=sdtp", ":");
+	else if (dasher->sdtp_in_traf==2) e |= gf_dynstrcat(&args, "sdtp_traf=both", ":");
 
-	max_comp_per_input = 0;
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		u32 first_in_period = 0;
-		u32 k;
-		Double period_duration=0;
-		Double min_media_duration = -1;
-		Double max_media_duration = -1;
-		Double max_audio_duration = -1;
-		Double min_audio_duration = -1;
+	if (dasher->split_mode==GF_DASH_SPLIT_CLOSEST)
+		e |= gf_dynstrcat(&args, "sbound=closest", ":");
+	else if (dasher->split_mode==GF_DASH_SPLIT_IN)
+		e |= gf_dynstrcat(&args, "sbound=in", ":");
 
-		for (i=0; i<dasher->nb_inputs; i++) {
-			Double dur = 0;
-			GF_DashSegInput *dash_input = &dasher->inputs[i];
-			/*this file does not belongs to any adaptation set*/
-			if (dash_input->period != cur_period+1) continue;
+	//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);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->title) {
+		sprintf(szArg, "title=%s", dasher->title);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->sourceInfo) {
+		sprintf(szArg, "source=%s", dasher->sourceInfo);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->moreInfoURL) {
+		sprintf(szArg, "info=%s", dasher->moreInfoURL);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->copyright) {
+		sprintf(szArg, "cprt=%s", dasher->copyright);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->lang) {
+		sprintf(szArg, "lang=%s", dasher->lang);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->locations) {
+		sprintf(szArg, "location=%s", dasher->locations);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
+	if (dasher->base_urls) {
+		sprintf(szArg, "base=%s", dasher->base_urls);
+		e |= gf_dynstrcat(&args, szArg, "::");
+	}
 
-			/*this file does not belongs to any adaptation set*/
-			if (!dash_input->adaptation_set) continue;
+	dasher->dash_mode_changed = GF_FALSE;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Instantiating dasher filter for dst %s with args %s\n", dasher->mpd_name, args));
 
-			if (!first_in_period) {
-				first_in_period = i+1;
-				last_period_rep_idx_plus_one = first_in_period;
-			}
+	if (e) {
+		if (args) gf_free(args);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to setup DASH filter arguments\n"));
+		return e;
+	}
+	dasher->output = gf_fs_load_destination(dasher->fsess, dasher->mpd_name, args, NULL, &e);
 
-			//only get component info once
-			if (!dash_input->get_component_info_done) {
-				dash_input->get_component_info_done = GF_TRUE;
-				if (dash_input->dasher_get_components_info) {
-					e = dash_input->dasher_get_components_info(dash_input, dasher);
-					if (e) return e;
-				}
-			}
+	if (args) gf_free(args);
 
-			/*force media duration if requested by the author*/
-			if (dash_input->media_duration) {
-				dash_input->duration = dash_input->media_duration;
-			}
+	if (sep_ext) {
+		sep_ext[0] = ':';
+	}
 
-			dur = dash_input->duration;
+	if (!dasher->output) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load DASH filter\n"));
+		return e;
+	}
 
-			for (k=0; k<dash_input->nb_components;k++) {
-				Double cdur = dash_input->components[k].duration;
-				if (dash_input->media_duration)
-					cdur = dash_input->media_duration;
-				if (!cdur)
-					cdur = dur;
-
-				if (dash_input->components[k].media_type == GF_ISOM_MEDIA_AUDIO) {
-					if (min_audio_duration == -1 || min_audio_duration > cdur) {
-						min_audio_duration = cdur;
-					}
-					if (max_audio_duration == -1 || max_audio_duration < cdur) {
-						max_audio_duration = cdur;
-					}
-				}
-				else if (dash_input->components[k].media_type == GF_ISOM_MEDIA_VISUAL) {
-					if (dash_input->components[k].hevc_tile_type<2)
-						nb_vids++;
-				}
-			}
+	//and setup sources
+	count = gf_list_count(dasher->inputs);
 
-			if (sub_duration && (!dasher->disable_loop || (sub_duration < dur)) ) {
-				dur = dasher->subduration;
+	for (i=0; i<count; i++) {
+		GF_DashSegmenterInput *di = gf_list_get(dasher->inputs, i);
+		if (di->periodID || di->period_duration || di->xlink) {
+			multi_period = GF_TRUE;
+		}
+		di->period_order=0;
+	}
+	if (multi_period) {
+		u32 cur_period_order = 1;
+		for (i=0; i<count; i++) {
+			u32 j;
+			GF_DashSegmenterInput *a_di = NULL;
+			GF_DashSegmenterInput *di = gf_list_get(dasher->inputs, i);
+			if (!di->periodID) {
+				di->period_order = 0;
+				continue;
 			}
-
-			if (dur > period_duration)
-				period_duration = dur;
-
-			if (min_media_duration == -1 || min_media_duration > dur) {
-				min_media_duration = dur;
+			for (j=0; j<count; j++) {
+				a_di = gf_list_get(dasher->inputs, j);
+				if ((a_di != di) && a_di->periodID && !strcmp(a_di->periodID, di->periodID))
+					break;
+				a_di = NULL;
 			}
-			if (max_media_duration == -1 || max_media_duration < dur) {
-				max_media_duration = dur;
+			if (a_di) {
+				di->period_order = a_di->period_order;
+				continue;
 			}
+			di->period_order = cur_period_order;
+			cur_period_order++;
+		}
+	}
 
-			switch (dash_input->protection_scheme_type) {
-			case GF_ISOM_CENC_SCHEME:
-			case GF_ISOM_CBC_SCHEME:
-			case GF_ISOM_CENS_SCHEME:
-			case GF_ISOM_CBCS_SCHEME:
-				use_cenc = GF_TRUE;
-				break;
+	for (i=0; i<count; i++) {
+		u32 j;
+		GF_Filter *src = NULL;
+		GF_Filter *rt = 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 (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", ":");
+
+		if (frag) {
+			if (!strncmp(frag+1, "trackID=", 8)) {
+				sprintf(szArg, "tkid=%s", frag+9 );
+			} else {
+				sprintf(szArg, "tkid=%s", frag+1);
 			}
-			if (max_comp_per_input < dash_input->nb_components)
-				max_comp_per_input = dash_input->nb_components;
+			e |= gf_dynstrcat(&args, szArg, ":");
+		} else if (di->track_id) {
+			sprintf(szArg, "tkid=%d", di->track_id );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		if (first_in_period) {
-			dasher->inputs[first_in_period-1].period_duration = period_duration;
-		}
-		if (!dasher->force_session_end)
-			presentation_duration += period_duration;
 
-		if (max_media_duration - min_media_duration > dasher->segment_duration) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] The difference between the durations of the longest and shortest representations (%f) is higher than the segment duration (%f)\n", max_media_duration - min_media_duration, dasher->segment_duration));
+		if (di->source_opts) {
+			e |= gf_dynstrcat(&args, di->source_opts, ":");
 		}
 
-		if (! dasher->subduration)
-			dasher->disable_loop = GF_TRUE;
-
-		if (!dasher->disable_loop && dasher->subduration && (max_audio_duration>0)) {
-			if (max_audio_duration != min_audio_duration) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Audio streams in the period have different durations (min %lf, max %lf), may result in bad synchronization\n", min_audio_duration, max_audio_duration));
-			}
-			for (i=0; i<dasher->nb_inputs; i++) {
-				GF_DashSegInput *dash_input = &dasher->inputs[i];
-				if (dash_input->period != cur_period+1) continue;
-				if (!dash_input->adaptation_set) continue;
-				dash_input->clamp_duration = max_audio_duration;
-
-				if (dash_input->duration > max_audio_duration) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Input %s: max audio duration (%lf) in the period is less than duration (%lf), clamping will happen\n", dash_input->file_name, max_audio_duration, dash_input->media_duration ? dash_input->media_duration : dash_input->duration));
-				}
-			}
+		//set all args
+		if (di->representationID && strcmp(di->representationID, "NULL")) {
+			sprintf(szArg, "#Representation=%s", di->representationID );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-	}
-
-	if (dasher->bitstream_switching_mode == GF_DASH_BSMODE_DEFAULT) {
-		if (nb_vids > 1) {
-			dasher->bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-		} else {
-			dasher->bitstream_switching_mode = GF_DASH_BSMODE_NONE;
+		if (di->periodID) {
+			sprintf(szArg, "#Period=%s", di->periodID );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-	}
-	//we allow using inband param set when not time aligned. set the option now before overriding flags for non time aligned
-	dasher->inband_param_set = ((dasher->bitstream_switching_mode == GF_DASH_BSMODE_INBAND) || (dasher->bitstream_switching_mode == GF_DASH_BSMODE_SINGLE) ) ? GF_TRUE : GF_FALSE;
-
-	if (max_comp_per_input > 1) {
-		if (dasher->profile == GF_DASH_PROFILE_AVC264_LIVE) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in DASH-IF AVC264 live profile\n\tswitching to regular live profile\n"));
-			dasher->profile = GF_DASH_PROFILE_LIVE;
-		} else if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in HbbTV 1.5 ISOBMF live profile\n\tswitching to regular live profile\n"));
-			dasher->profile = GF_DASH_PROFILE_LIVE;
-		} else if (dasher->profile == GF_DASH_PROFILE_AVC264_ONDEMAND) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Muxed representations not allowed in DASH-IF AVC264 onDemand profile\n\tswitching to regular onDemand profile\n"));
-			dasher->profile = GF_DASH_PROFILE_ONDEMAND;
+		if (di->asID)  {
+			sprintf(szArg, "#ASID=%d", di->asID );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-	}
-
-	/*HbbTV 1.5 ISO live specific checks*/
-	if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-		if (max_adaptation_set > 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"));
-			dasher->profile = GF_DASH_PROFILE_AVC264_LIVE;
+		//period start as negative to keep declaration order
+		if (multi_period && di->period_order) {
+			sprintf(szArg, "#PStart=-%d", di->period_order);
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		if (max_period > 32) {
-			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"));
-			dasher->profile = GF_DASH_PROFILE_AVC264_LIVE;
+		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 (dasher->segment_duration < 1.0) {
-			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"));
-			dasher->segment_duration = 1.0;
+
+		if (di->dash_duration) {
+			sprintf(szArg, "#DashDur=%g", di->period_duration );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		if (dasher->segment_duration > 15.0) {
-			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"));
-			dasher->segment_duration = 15.0;
+		if (url && di->media_duration) {
+			sprintf(szArg, "#CDur=%g", di->media_duration );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH fetched component infos\n"));
+		if (di->xlink) {
+			sprintf(szArg, "#xlink=%s", di->xlink );
+			e |= gf_dynstrcat(&args, szArg, ":");
+		}
+		if (di->bandwidth)  {
+			sprintf(szArg, "#Bitrate=%d", di->bandwidth );
+			e |= gf_dynstrcat(&args, szArg, ":");
+			sprintf(szArg, "#Maxrate=%d", di->bandwidth );
+			e |= gf_dynstrcat(&args, szArg, ":");
+		}
 
-	active_period_start = 0;
-	if (dasher->dash_ctx) {
-		Double duration;
-		char *id = "";
-		if (last_period_rep_idx_plus_one) id = dasher->inputs[last_period_rep_idx_plus_one-1].periodID;
-		if (!id) id = "";
-
-		//restore max segment duration
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "MaxSegmentDuration");
-		if (opt) dasher->max_segment_duration = atof(opt);
-
-		opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriod");
-		//period has changed
-		if (opt && strcmp(opt, id) && !dasher->force_session_end) {
-			Bool prev_period_not_done = GF_FALSE;
-			const char *prev_id = opt;
-			Double last_period_dur = 0;
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
-			duration = opt ? atof(opt) : 0.0;
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
-			if (opt) last_period_dur = atof(opt);
-
-			if (!last_period_dur) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] last period has no known duration, cannot insert new period. Try re-dashing previous period and specifying its duration\n"));
-				return GF_BAD_PARAM;
+		for (j=0;j<di->nb_baseURL; j++) {
+			if (!j) {
+				sprintf(szArg, "#BUrl=%s", di->baseURL[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
+			} else {
+				e |= gf_dynstrcat(&args, di->baseURL[j], ",");
 			}
-
-			//we may have called the segmenter with the end of the previous active period and the start of the new one - locate the
-			//previous period and update cumulated duration
-			for (i=0; i<dasher->nb_inputs; i++) {
-				char *p_id = dasher->inputs[i].periodID;
-				if (!p_id) p_id = "";
-				if (!strcmp(p_id, prev_id)) {
-					last_period_dur += dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;
-					presentation_duration -= dasher->inputs[last_period_rep_idx_plus_one-1].period_duration;
-					prev_period_not_done = GF_TRUE;
-					break;
-				}
+		}
+		for (j=0;j<di->nb_roles; j++) {
+			if (!j) {
+				sprintf(szArg, "#Role=%s", di->roles[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
+			} else {
+				e |= gf_dynstrcat(&args, di->roles[j], ",");
 			}
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", NULL);
-
-			duration += last_period_dur;
-			presentation_duration += duration;
-
-			sprintf(szOpt, "%g", duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration", szOpt);
-
-			//get active period start
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart");
-			if (opt) active_period_start = atof(opt);
-			active_period_start += last_period_dur;
-
-			//and add period to past periods, storing their duration and xlink
-			if (! prev_period_not_done) {
-				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK");
-				sprintf(szOpt, "%g-%g,%s", last_period_dur, active_period_start-last_period_dur,  opt ? opt : "INLINE");
-				gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", prev_id, szOpt);
-				if (opt) {
-					gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK", NULL);
-				}
-
-				//update active period start
-				sprintf(szOpt, "%g", active_period_start);
-				gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+		}
 
-				purge_dash_context(dasher->dash_ctx);
+		for (j=0;j<di->nb_rep_descs; j++) {
+			if (!j) {
+				sprintf(szArg, "#RDesc=%s", di->rep_descs[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
+			} else {
+				e |= gf_dynstrcat(&args, di->rep_descs[j], ",");
 			}
+		}
 
-			//and finally switch active period
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriod", id);
-
-			sprintf(szOpt, "%g", dasher->inputs[last_period_rep_idx_plus_one-1].period_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
-		} else {
-			GF_DashSegInput *dash_input = &dasher->inputs[last_period_rep_idx_plus_one-1];
-			if (dasher->force_session_end || dasher->force_period_end) {
-				//get largest duration
-				u32 k, scount = gf_cfg_get_section_count(dasher->dash_ctx);
-				Double mdur=0;
-				for (k=0; k<scount; k++) {
-					const char *sec = gf_cfg_get_section_name(dasher->dash_ctx, k);
-					if (!sec) continue;
-					if( !strnicmp(sec, "Representation_", 15) ) {
-						const char *key = gf_cfg_get_key(dasher->dash_ctx, sec, "CumulatedDuration");
-						if (key) {
-							Double v = ((Double) atoi(key)) / dasher->dash_scale;
-							if (v > mdur) mdur = v;
-						}
-					}
-				}
-				if (!mdur) {
-					opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
-					if (opt) mdur = atof(opt);
-				}
-				dash_input->period_duration = mdur;
-				presentation_duration += mdur;
+		for (j=0;j<di->nb_p_descs; j++) {
+			if (!j) {
+				sprintf(szArg, "#PDesc=%s", di->p_descs[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
 			} else {
-				opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
-				if (opt) {
-					Double d = dash_input->duration;
-					if (dash_input->clamp_duration) d = dash_input->clamp_duration;
-					else if (dash_input->media_duration) d = dash_input->media_duration;
-
-					duration = atof(opt);
-					if (dasher->force_session_end) {
-						dash_input->period_duration = duration;
-					} else {
-						if (dasher->disable_loop && dash_input->period_duration + duration > d) {
-							dash_input->period_duration = d - duration;
-						}
-						dash_input->period_duration += duration;
-					}
-					presentation_duration += duration;
-				}
+				e |= gf_dynstrcat(&args, di->p_descs[j], ",");
 			}
-			sprintf(szOpt, "%g", dash_input->period_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriod", id);
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
-			presentation_duration += opt ? atof(opt) : 0.0;
-
-			opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart");
-			if (opt) active_period_start = atof(opt);
 		}
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH context restored\n"));
-	}
-
-	strcpy(szTempMPD, dasher->mpd_name);
-	if (dasher->dash_mode) strcat(szTempMPD, ".tmp");
-
-	mpd = gf_fopen(szTempMPD, "wt");
-	if (!mpd) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[MPD] Cannot open MPD file %s for writing\n", szTempMPD));
-		return GF_IO_ERR;
-	}
-
-
-	period_links = gf_list_new();
-
-	if (dasher->dash_ctx) {
-		u32 count = gf_cfg_get_key_count(dasher->dash_ctx, "PastPeriods");
-		for (i=0; i<count; i++) {
-			const char *id = gf_cfg_get_key_name(dasher->dash_ctx, "PastPeriods", i);
-			const char *xlink = gf_cfg_get_key(dasher->dash_ctx, "PastPeriods", id);
-			char *sep = (char *)strchr(xlink, ',');
-			if (!sep) continue;
-
-			GF_SAFEALLOC(p, PeriodEntry);
-			gf_list_add(period_links, p);
-			p->id = id;
-
-			sep[0] = 0;
-			p->period_duration = (Double) atof(xlink);
-			sep[0]=',';
-			xlink = &sep[1];
-			if (!strcmp(xlink, "INLINE")) {
-				strcpy(p->szPeriodXML, dasher->mpd_name);
-				sep = strrchr(p->szPeriodXML, '.');
-				if (sep) sep[0] = 0;
-				strcat(p->szPeriodXML, "-Period_");
-				strcat(p->szPeriodXML, id);
-				strcat(p->szPeriodXML, ".mpd");
+		for (j=0;j<di->nb_as_descs; j++) {
+			if (!j) {
+				sprintf(szArg, "#ASDesc=%s", di->as_descs[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
 			} else {
-				char *url = gf_url_concatenate(dasher->mpd_name, xlink);
-				strcpy(p->szPeriodXML, url ? url : xlink);
-				if (url) gf_free(url);
-				p->xlink = xlink;
-				p->is_xlink = GF_TRUE;
+				e |= gf_dynstrcat(&args, di->as_descs[j], ",");
 			}
 		}
-	}
 
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		Bool flush_period = GF_FALSE;
-		FILE *period_mpd;
-		Double period_duration = 0;
-		const char *id=NULL;
-		const char *xlink = NULL;
-
-		/* Find period information for this period */
-		for (i=0; i< dasher->nb_inputs; i++) {
-			if (dasher->inputs[i].adaptation_set && (dasher->inputs[i].period==cur_period+1)) {
-				period_duration = dasher->inputs[i].period_duration;
-				id = dasher->inputs[i].periodID;
-				if (dasher->inputs[i].xlink)
-					xlink = dasher->inputs[i].xlink;
-				break;
+		for (j=0;j<di->nb_as_c_descs; j++) {
+			if (!j) {
+				sprintf(szArg, "#ASCDesc=%s", di->as_c_descs[j] );
+				e |= gf_dynstrcat(&args, szArg, ":");
+			} else {
+				e |= gf_dynstrcat(&args, di->as_c_descs[j], ",");
 			}
 		}
 
-		GF_SAFEALLOC(p, PeriodEntry);
-		gf_list_add(period_links, p);
-		p->period_duration = period_duration;
-		p->period_idx = cur_period+1;
-		p->id = id;
-
-		if (xlink) {
-			char *url = gf_url_concatenate(dasher->mpd_name, xlink);
-			strcpy(p->szPeriodXML, url ? url : xlink);
-			if (url) gf_free(url);
-			p->xlink = xlink;
-			p->is_xlink = GF_TRUE;
-		} else {
-			strcpy(p->szPeriodXML, dasher->mpd_name);
-			sep = strrchr(p->szPeriodXML, '.');
-			if (sep) sep[0] = 0;
-			strcat(p->szPeriodXML, "-Period_");
-			strcat(p->szPeriodXML, id ? id : "");
-			strcat(p->szPeriodXML, ".mpd");
+		if (di->startNumber) {
+			sprintf(szArg, "#StartNumber=%d", di->startNumber );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-
-		period_mpd = NULL;
-
-		//only open file if we are to dash something (max_adaptation_set=0: no source file, only period xlink insertion)
-		if (max_adaptation_set) {
-			period_mpd = gf_fopen(p->szPeriodXML, "wb");
-
-			if (!period_mpd) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot open period MPD %s for writing, aborting\n", p->szPeriodXML));
-				e = GF_IO_ERR;
-				goto exit;
-			}
-
-			dasher->mpd = period_mpd;
-
-			e = write_period_header(dasher, period_mpd, id, active_period_start, period_duration, NULL, cur_period+1, (xlink!=NULL) ? GF_TRUE : GF_FALSE);
-			if (e) goto exit;
+		if (di->seg_template) {
+			sprintf(szArg, "#Template=%s", di->seg_template );
+			e |= gf_dynstrcat(&args, szArg, ":");
+		}
+		if (di->hls_pl) {
+			sprintf(szArg, "#HLSPL=%s", di->hls_pl );
+			e |= gf_dynstrcat(&args, szArg, ":");
 		}
-		//keep track of the last period xlink
-		if (dasher->dash_ctx)
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodXLINK", xlink);
-
-		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
-		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
-			char szInit[GF_MAX_PATH], tmp[GF_MAX_PATH];
-			u32 first_rep_in_set=0;
-			u32 nb_rep_in_set=0;
-			u32 max_width = 0;
-			u32 max_height = 0;
-			u32 dar_num = 1;
-			u32 dar_den = 1;
-			u32 fps_num = 0;
-			u32 fps_denum = 0;
-			Double seg_duration_in_as = 0;
-			Bool has_scalability = GF_FALSE;
-			u32 use_bs_switching = (dasher->bitstream_switching_mode==GF_DASH_BSMODE_NONE) ? 0 : 1;
-			char *lang;
-			char szFPS[100];
-			Bool is_first_rep = GF_FALSE;
-			Bool skip_init_segment_creation = GF_FALSE;
-
-			dasher->segment_alignment_disabled = GF_FALSE;
-
-			while (dasher->inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
-				first_rep_in_set++;
 
-			/*not in our period*/
-			if (dasher->inputs[first_rep_in_set].period != cur_period+1)
-				continue;
+		if (di->sscale) e |= gf_dynstrcat(&args, "#SingleScale=true", ":");
 
-			if (dasher->inputs[first_rep_in_set].idx_representations)
-				skip_init_segment_creation = GF_TRUE;
 
-			if (!dasher->inputs[first_rep_in_set].init_segment_generated) {
+		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] = '#';
+			if (args) gf_free(args);
+			return e;
+		}
 
-				strcpy(tmp, dasher->mpd_name);
-				sep = strrchr(tmp, '.');
-				if (sep) sep[0] = 0;
-
-				if (max_adaptation_set==1) {
-					strcpy(szInit, tmp);
-					strcat(szInit, "_init.mp4");
-				} else {
-					sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
-				}
-				/*unless asked to do BS switching on single rep, don't do it ...*/
-				if ((dasher->bitstream_switching_mode < GF_DASH_BSMODE_SINGLE)
-				        && (dasher->inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
-				        /*unless the representation is a scalable one split across several adaptation sets ...*/
-				        && (dasher->inputs[first_rep_in_set].nb_representations<=1)
-				   ) {
-					use_bs_switching = 0;
-				}
-
-				if (dasher->inputs[first_rep_in_set].components[0].hevc_tile_type)
-					use_bs_switching = 2;
-
-				if (! use_bs_switching) {
-					skip_init_segment_creation = GF_TRUE;
-				}
-				else if (! dasher->inputs[first_rep_in_set].dasher_create_init_segment) {
-					skip_init_segment_creation = GF_TRUE;
-					strcpy(szInit, "");
-				}
-				/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
-				else if (dasher->dash_ctx) {
-					char RepSecName[GF_MAX_PATH];
-					const char *init_seg_name;
-					sprintf(RepSecName, "Representation_%s", dasher->inputs[first_rep_in_set].representationID);
-					if ((init_seg_name = gf_cfg_get_key(dasher->dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
-						skip_init_segment_creation = GF_TRUE;
-					}
-				}
-
-				if (!skip_init_segment_creation) {
-					Bool disable_bs_switching = GF_FALSE;
-					e = dasher->inputs[first_rep_in_set].dasher_create_init_segment(dasher->inputs, dasher->nb_inputs, cur_adaptation_set+1, szInit, dasher->tmpdir, dasher, dasher->bitstream_switching_mode, &disable_bs_switching);
-					if (e) goto exit;
-					if (disable_bs_switching)
-						use_bs_switching = 0;
-				}
-
-				dasher->inputs[first_rep_in_set].init_seg_url = use_bs_switching ? gf_strdup(szInit) : NULL;
-				dasher->inputs[first_rep_in_set].use_bs_switching = use_bs_switching;
-				dasher->inputs[first_rep_in_set].init_segment_generated = GF_TRUE;
-			} else {
-				use_bs_switching = dasher->inputs[first_rep_in_set].use_bs_switching;
-			}
+		if (!url) url = "null";
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Instantiating dasher source %s with args %s\n", url, args));
+		src = gf_fs_load_source(dasher->fsess, url, args, NULL, &e);
+		if (args) gf_free(args);
+		if (frag) frag[0] = '#';
 
-			dasher->bs_switch_segment_file = use_bs_switching ? dasher->inputs[first_rep_in_set].init_seg_url : NULL;
+		if (!src) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load source filter for %s\n", di->file_name));
+			return e;
+		}
 
+		if (rt) {
+			gf_filter_set_source(rt, src, NULL);
+			src = rt;
+		}
 
-			dasher->segment_alignment_disabled = GF_FALSE;
-			szFPS[0] = 0;
-			lang = NULL;
-			/*compute some max defaults*/
-			for (i=0; i<dasher->nb_inputs && !e; i++) {
-				GF_DashSegInput *dash_input = &dasher->inputs[i];
-
-				if (dash_input->adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				if (dash_input->idx_representations)
-					has_scalability = GF_TRUE;
-
-				for (j=0; j<dash_input->nb_components; j++) {
-					struct _dash_component *comp = & dash_input->components[j];
-					if (comp->width > max_width)
-						max_width = comp->width;
-					if (comp->height > max_height)
-						max_height = comp->height;
-
-					if (!fps_num || !fps_denum) {
-						fps_num = comp->fps_num;
-						fps_denum = comp->fps_denum;
-					}
-					else if (fps_num * comp->fps_denum < comp->fps_num * fps_denum) {
-						fps_num = comp->fps_num;
-						fps_denum = comp->fps_denum;
-					}
-
-					if (dar_num * comp->sar_denum * comp->height != dar_den * comp->sar_num * comp->width) {
-						dar_num = comp->sar_num * comp->width;
-						dar_den = comp->sar_denum * comp->height;
-					}
-
-					if (comp->lang) {
-						if (lang && strcmp(lang, comp->lang) ) {
-							if (!strcmp(lang, "und") || !strcmp(comp->lang, "lang")) {
-								GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] two languages in adaptation set: %s will be kept %s will be ignored\n", lang, comp->lang));
-							}
-						} else if (!lang) {
-							lang = gf_strdup(comp->lang);
-						}
-					}
-
-					if (dash_input->segment_duration) {
-						if (!seg_duration_in_as)
-							seg_duration_in_as = dash_input->segment_duration;
-						else if (dash_input->segment_duration != seg_duration_in_as)
-							dasher->segment_alignment_disabled = GF_TRUE;
-					}
-				}
-			}
+		if (!di->filter_chain) continue;
 
-			if (max_width && max_height) {
-				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-				if (fps_denum>1)
-					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
-				else if (fps_num)
-					sprintf(szFPS, "%d", fps_num);
-			}
+		//create the filter chain between source (or rt if it was set) and dasher
 
-			e = write_adaptation_header(period_mpd, dasher->profile, dasher->use_url_template, dasher->single_file_mode, dasher->inputs, dasher->nb_inputs, cur_period+1, cur_adaptation_set+1, first_rep_in_set,
-			                            use_bs_switching, max_width, max_height, dar_num, dar_den, szFPS, lang, szInit, dasher->segment_alignment_disabled, dasher->mpd_name, dasher->segments_start_with_rap);
-			gf_free(lang);
-
-			if (e) goto exit;
-
-			nb_rep_in_set = 0;
-			for (i=0; i<dasher->nb_inputs && !e; i++) {
-				GF_DashSegInput *dash_input = &dasher->inputs[i];
-				if (dash_input->adaptation_set==cur_adaptation_set+1)
-					nb_rep_in_set++;
+		//filter chain
+		GF_Filter *prev_filter=src;
+		char *fargs = (char *) di->filter_chain;
+		while (fargs) {
+			GF_Filter *f;
+			char *sep = strstr(fargs, "@@");
+			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) ));
+				return e;
 			}
-
-			is_first_rep = GF_TRUE;
-			for (i=0; i<dasher->nb_inputs && !e; i++) {
-				char szOutName[GF_MAX_PATH], *segment_name, *orig_seg_name;
-				GF_DashSegInput *dash_input = &dasher->inputs[i];
-				Double segdur, fragdur;
-				if (dash_input->adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				orig_seg_name = segment_name = dasher->seg_rad_name;
-
-				strcpy(szOutName, gf_url_get_resource_name(dash_input->file_name));
-				sep = strrchr(szOutName, '.');
-				if (sep) sep[0] = 0;
-
-				/*in scalable case: seg_name is variable*/
-				dasher->variable_seg_rad_name = has_scalability ? GF_TRUE : GF_FALSE;
-
-				if (segment_name) {
-					if (strstr(segment_name, "%s")) {
-						sprintf(szSolvedSegName, segment_name, szOutName);
-						dasher->variable_seg_rad_name = GF_TRUE;
-						if (dash_input->single_track_num) {
-							char szTkNum[50];
-							sprintf(szTkNum, "_track%d_", dash_input->single_track_num);
-							strcat(szSolvedSegName, szTkNum);
-						}
-					} else {
-						strcpy(szSolvedSegName, segment_name);
-					}
-
-					segment_name = szSolvedSegName;
-				}
-
-				if (nb_rep_in_set==1)
-					dasher->variable_seg_rad_name = GF_FALSE;
-
-				/* user added a relative-path baseURL */
-				if (dash_input->nb_baseURL) {
-					if (gf_url_is_local(dash_input->baseURL[0])) {
-						const char *name;
-						char tmp_segment_name[GF_MAX_PATH];
-						if (dash_input->nb_baseURL > 1)
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Several relative path baseURL for input %s: selecting \"%s\"\n", dash_input->file_name, dash_input->baseURL[0]));
-						name = gf_url_get_resource_name(szOutName);
-						strcpy(tmp_segment_name, name);
-						gf_url_get_resource_path(dash_input->baseURL[0], szOutName);
-						if (szOutName[strlen(szOutName)] != GF_PATH_SEPARATOR) {
-							char ext[2];
-							ext[0] = GF_PATH_SEPARATOR;
-							ext[1] = 0;
-							strcat(szOutName, ext);
-						}
-						strcat(szOutName, tmp_segment_name);
-					} else {
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found baseURL for input %s but not a relative path (%s)\n", dash_input->file_name, dash_input->baseURL[0]));
-					}
-				}
-
-				strcat(szOutName, "_dash");
-				if ((dash_input->trackNum || dash_input->single_track_num) && (!dasher->seg_rad_name || !strstr(dasher->seg_rad_name, "$RepresentationID$") ) ) {
-					char tmp[20];
-					sprintf(tmp, "_track%d_", dash_input->trackNum ? dash_input->trackNum : dash_input->single_track_num);
-					strcat(szOutName, tmp);
-				}
-
-				if (gf_url_get_resource_path(dasher->mpd_name, tmp)) {
-					strcat(tmp, szOutName);
-					strcpy(szOutName, tmp);
-				}
-				if (segment_name && dash_input->trackNum && !strstr(dasher->seg_rad_name, "$RepresentationID$") ) {
-					char tmp[20];
-					sprintf(tmp, "_track%d_", dash_input->trackNum);
-					strcat(segment_name, tmp);
-				}
-				//dynamic loop of input creates same segment ID in new periods, force pid identification
-				//to have different names in periods
-				if (dash_input->period_id_not_specified>1) {
-					char tmp[20];
-					sprintf(tmp, "p%d_", dash_input->period_id_not_specified);
-					strcat(segment_name, tmp);
-				}
-				dasher->seg_rad_name = segment_name;
-
-				/*in scalable case, we need also the bandwidth of dependent representation*/
-				if (dash_input->dependencyID) {
-					dash_input->dependency_bandwidth = gf_dash_get_dependency_bandwidth(dasher->inputs, dasher->nb_inputs, dash_input->file_name, dash_input->lower_layer_track);
-				}
-
-				segdur = dasher->segment_duration;
-				fragdur = dasher->fragment_duration;
-
-				if (dash_input->segment_duration)
-					dasher->segment_duration = dash_input->segment_duration;
-
-				if (dash_input->segment_duration && (dasher->fragment_duration * dasher->dash_scale > dash_input->segment_duration)) {
-					dasher->fragment_duration = dasher->segment_duration;
-				}
-
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_input->file_name));
-				e = dash_input->dasher_segment_file(dash_input, szOutName, dasher, is_first_rep);
-
-				dasher->seg_rad_name = orig_seg_name;
-				dasher->segment_duration = segdur;
-				dasher->fragment_duration = fragdur;
-
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while DASH-ing file: %s\n", gf_error_to_string(e)));
-					goto exit;
-				}
-				is_first_rep = GF_FALSE;
+			if (prev_filter) {
+				gf_filter_set_source(f, prev_filter, NULL);
 			}
-			/*close adaptation set*/
-			fprintf(period_mpd, "  </AdaptationSet>\n");
+			prev_filter = f;
+			if (!sep) break;
+			sep[0] = '@';
+			fargs = sep+2;
 		}
-
-		if (period_mpd) {
-			fprintf(period_mpd, " </Period>\n");
-			gf_fclose(period_mpd);
-		}
-
-		dasher->mpd = period_mpd;
-
-		//and add periods done to past periods, storing their start time
-		if (!id) id="";
-		if (last_period_rep_idx_plus_one && dasher->inputs[last_period_rep_idx_plus_one-1].periodID && strcmp(id, dasher->inputs[last_period_rep_idx_plus_one-1].periodID) ) {
-			flush_period = GF_TRUE;
-		}
-		else if (dasher->force_period_end || dasher->force_session_end) {
-			flush_period = GF_TRUE;
-		}
-		if (flush_period && dasher->dash_ctx) {
-			//get largest duration
-			u32 k, scount = gf_cfg_get_section_count(dasher->dash_ctx);
-			for (k=0; k<scount; k++) {
-				const char *sec = gf_cfg_get_section_name(dasher->dash_ctx, k);
-				if (!sec) continue;
-				if( !strnicmp(sec, "Representation_", 15) ) {
-					const char *key = gf_cfg_get_key(dasher->dash_ctx, sec, "CumulatedDuration");
-					if (key) {
-						Double v = atof(key) / dasher->dash_scale;
-						if (v>period_duration) period_duration = v;
-					}
-				}
-			}
-
-			sprintf(szOpt, "%g-%g", active_period_start, period_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "PastPeriods", id, szOpt);
-
-			sprintf(szOpt, "%g", active_period_start);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
-			//also update last period duration with computed val
-			sprintf(szOpt, "%g", period_duration);
-			gf_cfg_set_key(dasher->dash_ctx, "DASH", "LastPeriodDuration", szOpt);
-
-			if (dasher->dash_ctx) purge_dash_context(dasher->dash_ctx);
+		if (prev_filter) {
+			gf_filter_set_source(dasher->output, prev_filter, NULL);
 		}
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH Segment generation done\n"));
+	return GF_OK;
+}
 
+GF_Err dash_state_check_timing(const char *dash_state, u64 *next_gen_ntp_ms, u32 *next_time_ms)
+{
+	u64 next_gen_ntp = 0;
+	GF_Err e = GF_OK;
+	GF_DOMParser *mpd_parser;
 
-	/*ready to write the MPD*/
-	dasher->mpd = mpd;
+	*next_gen_ntp_ms = 0;
+	*next_time_ms = 0;
+	if (!gf_file_exists(dash_state))
+		return GF_OK;
 
-	if (dasher->dash_mode && !dasher->mpd_update_time) {
-		presentation_duration = dasher->mpd_live_duration;
+	/* parse the MPD XML */
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, dash_state, NULL, NULL);
+	if (!e) {
+		GF_XMLNode *root = gf_xml_dom_get_root(mpd_parser);
+		GF_XMLAttribute *att;
+		u32 i=0;
+		e = GF_NON_COMPLIANT_BITSTREAM;
+		//extract "gpac:next_gen_time" but don't load a full MPD, not needed
+		while (root && (att = gf_list_enum(root->attributes, &i))) {
+			if (!strcmp(att->name, "gpac:next_gen_time")) {
+				sscanf(att->value, LLU, &next_gen_ntp);
+				e = GF_OK;
+				break;
+			}
+		}
+		gf_xml_dom_del(mpd_parser);
 	}
+	if (e) return e;
 
-	if ((dasher->force_period_end || dasher->force_session_end) && !dasher->mpd_update_time && !presentation_duration) {
-		presentation_duration = 0;
-		i=0;
-		while ((p = (PeriodEntry *) gf_list_enum(period_links, &i))) {
-			presentation_duration = p->period_duration;
+	if (next_gen_ntp) {
+		u64 ntp_ms = gf_net_get_ntp_ms();
+		if (ntp_ms < next_gen_ntp) {
+			*next_time_ms = (u32) (next_gen_ntp - ntp_ms);
+			return GF_EOS;
 		}
 	}
+	return GF_OK;
+}
 
-	e = write_mpd_header(dasher, mpd, has_mpeg2, presentation_duration, use_cenc, uses_xlink);
-	if (e) goto exit;
-
+GF_EXPORT
+GF_Err gf_dasher_process(GF_DASHSegmenter *dasher)
+{
+	GF_Err e;
+	Bool need_seek = GF_TRUE;
 
-	i=0;
-	while ((p = (PeriodEntry *) gf_list_enum(period_links, &i))) {
-		if (!p->period_idx) {
-			if (p->is_xlink) {
-				write_period_header(dasher, mpd, p->id, 0.0, p->period_duration, p->xlink, 0, GF_FALSE);
-			} else {
-				dash_insert_period_xml(mpd, p->szPeriodXML);
-			}
-		} else {
-			if (p->is_xlink) {
-				write_period_header(dasher, mpd, p->id, 0.0, p->period_duration, p->xlink, p->period_idx, GF_FALSE);
-			} else {
-				dash_insert_period_xml(mpd, p->szPeriodXML);
-			}
+	/*first run, we need to extract the next gen time from context*/
+	if (dasher->dash_state && gf_file_exists(dasher->dash_state) && (dasher->dash_mode>=GF_DASH_DYNAMIC) && !dasher->next_gen_ntp_ms) {
+		u32 diff;
+		e = dash_state_check_timing(dasher->dash_state, &dasher->next_gen_ntp_ms, &diff);
+		if (e<0) return e;
+		if (e==GF_EOS) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] generation called too early by %d ms\n", (s32) diff));
+			return e;
+		}
+	}
 
-			if (!dasher->dash_ctx && !p->is_xlink) {
-				gf_delete_file(p->szPeriodXML);
-			}
+	if (!dasher->fsess) {
+		e = gf_dasher_setup(dasher);
+		if (e) return e;
+		need_seek = GF_FALSE;
+	}
+	gf_fs_get_last_connect_error(dasher->fsess);
+	gf_fs_get_last_process_error(dasher->fsess);
 
-		}
+	//send change mode before sending the resume request, as the seek checks for last mode
+	if (dasher->dash_mode_changed) {
+		gf_filter_send_update(dasher->output, NULL, "dmode", (dasher->dash_mode == GF_DASH_DYNAMIC_LAST)  ? "dynlast" : "dynamic", GF_FILTER_UPDATE_DOWNSTREAM);
 	}
 
-	fprintf(mpd, "</MPD>");
+	if (need_seek) {
+		GF_FilterEvent evt;
+		GF_FEVT_INIT(evt, GF_FEVT_RESUME, NULL);
+		evt.base.on_pid = gf_filter_get_ipid(dasher->output, 0);
+		gf_filter_send_event(dasher->output, &evt, GF_FALSE);
+	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH MPD done\n"));
+	e = gf_fs_run(dasher->fsess);
+	if (e>0) e = GF_OK;
 
+	if (dasher->print_stats_graph & 1) gf_fs_print_stats(dasher->fsess);
+	if (dasher->print_stats_graph & 2) gf_fs_print_connections(dasher->fsess);
 
-	if (dasher->dash_ctx && dasher->dash_mode) {
-		const char *opt = gf_cfg_get_key(dasher->dash_ctx, "DASH", "LastPeriodDuration");
-		if (opt) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Current Period Duration: %s\n", opt) );
-		}
-	}
+	if (!e) e = gf_fs_get_last_connect_error(dasher->fsess);
+	if (!e) e = gf_fs_get_last_process_error(dasher->fsess);
+	if (e<0) return e;
 
-	if (dasher->profile == GF_DASH_PROFILE_HBBTV_1_5_ISOBMF_LIVE) {
-		if (gf_ftell(mpd) > 100*1024)
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[DASH] Manifest MPD is too big for HbbTV 1.5. Limit is 100kB, current size is "LLU"kB\n", gf_ftell(mpd)/1024));
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Done dashing\n"));
-	dasher->nb_secs_to_discard = 0;
-
-exit:
-	if (mpd) {
-		gf_fclose(mpd);
-		if (!e && dasher->dash_mode) {
-			gf_delete_file(dasher->mpd_name);
-			e = gf_move_file(szTempMPD, dasher->mpd_name);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[DASH] Error moving file %s to %s: %s\n", szTempMPD, dasher->mpd_name, gf_error_to_string(e) ));
-			}
-		}
-	}
+	on_dasher_event(dasher, NULL);
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("\n"));
 
-	if (period_links) {
-		while (gf_list_count(period_links)) {
-			PeriodEntry *p = (PeriodEntry *) gf_list_pop_back(period_links);
-			if (p) gf_free(p);
-		}
-		gf_list_del(period_links);
+	if (dasher->no_cache) {
+		gf_fs_del(dasher->fsess);
+		dasher->fsess = NULL;
 	}
-
-	return e;
+	return GF_OK;
 }
 
-#endif /* GPAC_DISABLE_ISOM_WRITE */

gpac-0.8.0.tar.gz/src/media_tools/dsmcc.c -> gpac-1.0.0.tar.gz/src/media_tools/dsmcc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jonathan Sillan
- *			Copyright (c) Telecom ParisTech 2011-2012
+ *			Copyright (c) Telecom ParisTech 2011-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / media tools sub-project
@@ -175,8 +175,7 @@
 	}
 	*first_section_received = 1;*/
 	dsmcc->last_section_number = gf_bs_read_int(bs,8);
-	//fprintf(stderr, "\nsection_number %d last_section_number %d\n",dsmcc->section_number,dsmcc->last_section_number);
-	//fprintf(stderr, "dsmcc->table_id %d \n",dsmcc->table_id);
+
 	switch (dsmcc->table_id) {
 	case GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA:
 	{
@@ -230,8 +229,6 @@
 	gf_m2ts_dsmcc_process_message_header(&DataMessage->DownloadDataHeader,data,bs,data_shift,1);
 	dsmcc->DSMCC_Extension = DataMessage;
 
-	//fprintf(stderr, "DataMessage->DownloadDataHeader.messageId %d \n",DataMessage->DownloadDataHeader.messageId);
-
 	switch (DataMessage->DownloadDataHeader.messageId)
 	{
 	case DOWNLOAD_INFO_REQUEST:
@@ -307,7 +304,6 @@
 		GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK* DownloadDataBlock;
 		GF_SAFEALLOC(DownloadDataBlock,GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK);
 		DataMessage->dataMessagePayload = DownloadDataBlock;
-		modules_count = 0;
 		modules_count = gf_list_count(dsmcc_overlord->dsmcc_modules);
 
 		if(!modules_count) {
@@ -317,7 +313,7 @@
 
 
 		DownloadDataBlock->moduleId = gf_bs_read_int(bs,16);
-		//fprintf(stderr, "DownloadDataBlock->moduleId %d \n",DownloadDataBlock->moduleId);
+
 		DownloadDataBlock->moduleVersion = gf_bs_read_int(bs,8);
 		DownloadDataBlock->reserved = gf_bs_read_int(bs,8);
 		if(DownloadDataBlock->reserved != 0xFF) {
@@ -330,7 +326,7 @@
 			GF_M2TS_DSMCC_MODULE* dsmcc_module = gf_list_get(dsmcc_overlord->dsmcc_modules,i);
 			/* Test if the data are compatible with the module configuration */
 			if(!dsmcc_download_data_validation(dsmcc_overlord,DownloadDataBlock,dsmcc_module,DataMessage->DownloadDataHeader.downloadId)) {
-				//fprintf(stderr, "DownloadDataBlock->blockNumber %d \n\n",DownloadDataBlock->blockNumber);
+
 				DownloadDataBlock->dataBlocksize = (DataMessage->DownloadDataHeader.messageLength - 6);
 				if(dsmcc_module->block_size < DownloadDataBlock->dataBlocksize) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Error block_size should be >= to DownloadDataBlock->dataBlocksize , abording the processing \n"));
@@ -472,7 +468,6 @@
 	} else if (mode == 1) {
 		MessageHeader->downloadId = gf_bs_read_int(bs,32);
 	}
-	//fprintf(stderr, "MessageHeader->downloadId %d \n",MessageHeader->downloadId);
 	MessageHeader->reserved = gf_bs_read_int(bs,8);
 	if (MessageHeader->reserved != 0xFF) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader reserved slot does not have the correct value, abording the processing \n"));
@@ -550,7 +545,7 @@
 			if (InfoModules->moduleVersion <= dsmcc_process.version_number) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Module already intialized \n"));
 				return GF_CORRUPTED_DATA;
-			} else if (InfoModules->moduleVersion > dsmcc_process.version_number) {
+			} else {
 				GF_M2TS_DSMCC_MODULE* dsmcc_module = (GF_M2TS_DSMCC_MODULE*)gf_list_get(dsmcc_overlord->dsmcc_modules,i);
 				dsmcc_module_delete(dsmcc_module);
 				gf_list_rem(dsmcc_overlord->dsmcc_modules,i);
@@ -758,7 +753,6 @@
 	gf_m2ts_dsmcc_delete_message_header(&DataMessage->DownloadDataHeader);
 	gf_free(DataMessage);
 	gf_free(dsmcc);
-	dsmcc = NULL;
 	return GF_OK;
 }
 
@@ -767,7 +761,6 @@
 
 	gf_free(dsmcc_module->buffer);
 	gf_free(dsmcc_module);
-	dsmcc_module = NULL;
 	return  GF_OK;
 }
 
@@ -817,13 +810,13 @@
 	if(BIOP_ModuleInfo->userInfoLength) {
 
 		u32 nb_desc,j;
-		u8* descr_tag;
 
 		dsmcc_biop_descriptor(bs,BIOP_ModuleInfo->descriptor,(u32)(BIOP_ModuleInfo->userInfoLength));
 
 		nb_desc = gf_list_count(BIOP_ModuleInfo->descriptor);
 		j = 0;
 		while(j<nb_desc) {
+			u8* descr_tag;
 
 			/* get the descriptor tag */
 			descr_tag = (u8*)gf_list_get(BIOP_ModuleInfo->descriptor,j);
@@ -877,7 +870,6 @@
 	GF_Err e;
 	Bool Error;
 	u32 byte_shift;
-	GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header;
 	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway = dsmcc_overlord->ServiceGateway;
 
 	e = GF_OK;
@@ -888,7 +880,7 @@
 	byte_shift = (u32)(gf_bs_get_position(bs));
 
 	while(byte_shift < data_size) {
-
+		GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header;
 		BIOP_Header = dsmcc_process_biop_header(bs);
 
 		if(BIOP_Header) {
@@ -963,8 +955,6 @@
 	GF_M2TS_DSMCC_BIOP_FILE* BIOP_File;
 	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
 	GF_M2TS_DSMCC_FILE* File;
-	FILE* pFile;
-	u8* descr_tag;
 
 	GF_SAFEALLOC(BIOP_File,GF_M2TS_DSMCC_BIOP_FILE);
 
@@ -984,6 +974,7 @@
 	nb_desc = gf_list_count(BIOP_File->descriptor);
 
 	while(nb_desc) {
+		u8* descr_tag;
 
 		/* get the descriptor tag */
 		descr_tag = (u8*)gf_list_get(BIOP_File->descriptor,0);
@@ -1017,18 +1008,19 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("module_Id %d \n",moduleId));
 	File = dsmcc_get_file(ServiceGateway->File,moduleId,downloadId,BIOP_File->Header->objectKey_data);
 	if(File) {
+		FILE* pFile;
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier: %s module_Id %d place :%d \n",File->Path,moduleId,File->objectKey_data));
 		pFile = gf_fopen(File->Path,"wb");
 		if (pFile!=NULL) {
-			gf_fwrite(BIOP_File->content_byte,1,BIOP_File->content_length ,pFile);
+			gf_fwrite(BIOP_File->content_byte, BIOP_File->content_length ,pFile);
 			gf_fclose(pFile);
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier créé \n\n"));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[DSMCC] File created\n"));
 			if(!strcmp(File->name,"index.html")) {
 				dsmcc_overlord->get_index = 1;
 			}
 		}
 	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[DSMCC] File vould not be created\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[DSMCC] File could not be created\n"));
 	}
 
 	dsmcc_free_biop_file(BIOP_File);
@@ -1078,7 +1070,6 @@
 	/* Get the linked files */
 	for(i = 0; i<BIOP_Directory->bindings_count; i++) {
 		u32 descr_length,nb_desc,j;
-		u8* descr_tag;
 		GF_Err e;
 
 		BIOP_Directory->Name[i].nameComponents_count = gf_bs_read_int(bs,8);
@@ -1123,6 +1114,7 @@
 		nb_desc = gf_list_count(BIOP_Directory->Name[i].descriptor);
 		j = 0;
 		while(j<nb_desc) {
+			u8* descr_tag;
 			/* get the descriptor tag */
 			descr_tag = (u8*)gf_list_get(BIOP_Directory->Name[i].descriptor ,0);
 
@@ -1142,7 +1134,6 @@
 
 		if(!strcmp(BIOP_Directory->Name[i].kind_data,"dir")) {
 			if(!dsmcc_check_element_validation(ServiceGateway->Dir,ServiceGateway->name,BIOP_Directory->Name[i])) {
-				GF_Err e;
 				GF_M2TS_DSMCC_DIR* Directory;
 				GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(BIOP_Directory->Name[i].IOR.taggedProfile,0);
 				GF_SAFEALLOC(Directory,GF_M2TS_DSMCC_DIR);
@@ -1184,12 +1175,9 @@
 	u32 i;
 	GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent;
 	//GF_M2TS_DSMCC_FILE* File;
-	u32 eventdata;
 
 	GF_SAFEALLOC(BIOP_StreamEvent,GF_M2TS_DSMCC_BIOP_STREAM_EVENT);
 
-	eventdata = 0;
-
 	BIOP_StreamEvent->Header = BIOP_Header;
 	/* Get Info */
 	BIOP_StreamEvent->Info.aDescription_length = gf_bs_read_int(bs,8);
@@ -1209,7 +1197,7 @@
 		BIOP_StreamEvent->EventList = (GF_M2TS_DSMCC_BIOP_EVENT_LIST*)gf_calloc(BIOP_StreamEvent->eventNames_count,sizeof(GF_M2TS_DSMCC_BIOP_EVENT_LIST));
 		for(i=0; i<BIOP_StreamEvent->eventNames_count; i++) {
 			BIOP_StreamEvent->EventList[i].eventName_length = gf_bs_read_int(bs,8);
-			eventdata += BIOP_StreamEvent->EventList[i].eventName_length;
+			BIOP_StreamEvent->EventList[i].eventName_length;
 			if(BIOP_StreamEvent->EventList[i].eventName_length) {
 				BIOP_StreamEvent->EventList[i].eventName_data_byte = (char*)gf_calloc(BIOP_StreamEvent->EventList[i].eventName_length,sizeof(char));
 				gf_bs_read_data(bs,BIOP_StreamEvent->EventList[i].eventName_data_byte,(u8)(BIOP_StreamEvent->EventList[i].eventName_length));
@@ -1368,11 +1356,11 @@
 		}
 		default:
 		{
-			u32 size;
+			u32 dsize;
 			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unsupported Descriptor Type \n"));
 			/* byte shift - in descriptors length is on thr second byte*/
-			size = gf_bs_read_int(bs,8);
-			gf_bs_read_int(bs,8*size);
+			dsize = gf_bs_read_int(bs,8);
+			gf_bs_read_int(bs,8*dsize);
 			break;
 		}
 		}
@@ -1398,7 +1386,6 @@
 {
 	u32 i,j,left_lite_component;
 	/* IOR */
-	left_lite_component = 0;
 	IOR->type_id_length = gf_bs_read_int(bs,32);
 	if(IOR->type_id_length > 0xA) {
 		//return GF_CORRUPTED_DATA;
@@ -1424,7 +1411,6 @@
 		case TAG_BIOP:
 		{
 			/* Object Location */
-			u32 j;
 			GF_SAFEALLOC(taggedProfile->BIOPProfileBody,GF_M2TS_DSMCC_BIOP_PROFILE_BODY);
 			taggedProfile->BIOPProfileBody->ObjectLocation.componentId_tag = gf_bs_read_int(bs,32);
 			if(taggedProfile->BIOPProfileBody->ObjectLocation.componentId_tag != 0x49534F50) {
@@ -1493,7 +1479,6 @@
 		case TAG_LITE_OPTIONS:
 		{
 			/* Service Location */
-			u32 j;
 			GF_SAFEALLOC(taggedProfile->ServiceLocation,GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION);
 			taggedProfile->ServiceLocation->componentId_tag = gf_bs_read_int(bs,32);
 			if(taggedProfile->ServiceLocation->componentId_tag != 0x49534F46) {
@@ -1586,12 +1571,12 @@
 	nb_elt = gf_list_count(List);
 
 	for(i = 0; i<nb_elt; i++) {
-		GF_M2TS_DSMCC_DIR* TmpDir;
 		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(List,i);
 		if(Dir->objectKey_data == objectKey_data) {
 			return Dir;
 		}
 		if(gf_list_count(Dir->Dir)) {
+			GF_M2TS_DSMCC_DIR* TmpDir;
 			TmpDir = dsmcc_get_directory(Dir->Dir,objectKey_data);
 			if(TmpDir) {
 				return TmpDir;
@@ -1866,10 +1851,8 @@
 
 static void dsmcc_free_biop_descriptor(GF_List* list)
 {
-	u8* descr_tag;
-
 	while(gf_list_count(list)) {
-
+		u8* descr_tag;
 		descr_tag = (u8*)gf_list_get(list,0);
 
 		switch(*descr_tag) {

gpac-0.8.0.tar.gz/src/media_tools/dvb_mpe.c -> gpac-1.0.0.tar.gz/src/media_tools/dvb_mpe.c Changed

@@ -10,9 +10,8 @@
 
 static void empty_list(GF_List * list)
 {
-	void *obj;
 	while(gf_list_count(list)) {
-		obj = gf_list_get(list,0);
+		void *obj = gf_list_get(list,0);
 		gf_list_rem(list,0);
 		gf_free(obj);
 		obj = NULL;
@@ -43,9 +42,6 @@
 				GF_M2TS_SECTION_MPE* mpe = (GF_M2TS_SECTION_MPE*)pck->stream;
 				gf_m2ts_process_mpe(ts, mpe, data, u32_data_size, u32_table_id);
 			}
-			else {
-				//fprintf(stderr, "Time Slice Parameters for MPE-FEC have not been found yet \n");
-			}
 			break;
 		default:
 			return;
@@ -73,8 +69,6 @@
 GF_EXPORT
 void gf_dvb_mpe_shutdown(GF_M2TS_Demuxer *ts)
 {
-	GF_M2TS_IP_Stream *ip_stream_buff;
-
 	GF_M2TS_IP_PLATFORM * ip_platform;
 	if (!ts)
 		return;
@@ -84,7 +78,7 @@
 
 	if (ip_platform->ip_streams) {
 		while(gf_list_count(ip_platform->ip_streams)) {
-			ip_stream_buff=gf_list_get(ip_platform->ip_streams, 0);
+			GF_M2TS_IP_Stream *ip_stream_buff = gf_list_get(ip_platform->ip_streams, 0);
 
 			while (gf_list_count(ip_stream_buff->targets)) {
 				GF_M2TS_IP_Target *ip_targets = gf_list_get(ip_stream_buff->targets, 0);
@@ -140,23 +134,7 @@
 }
 
 
-/*void print_bytes(u8* data, u32 line_length, u32 length, Bool last_line)
-{
-	u32 i;
-	for (i = 0; i < length; i ++) {
-		if (i%line_length == 0) {
-			fprintf(stderr, "%2d: ", i/line_length);
-		} else if (i%8 == 0) {
-			fprintf(stderr, " ");
-		}
-		fprintf(stderr, "%02x", data[i]);
-		if ((i+1)%line_length == 0) {
-			fprintf(stderr, "\n");
-		}
-	}
-	if (last_line) fprintf(stderr, "\n");
-}
-*/
+Bool gf_m2ts_crc32_check(u8 *data, u32 len);
 
 void gf_m2ts_process_mpe(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_MPE *mpe, unsigned char *data, u32 data_size, u8 table_id)
 {
@@ -173,8 +151,6 @@
 
 	i_streams = 0;
 
-//	fprintf(stderr, "Processing MPE/MPE-FEC data PID %d (%d/%d)\n",mpe->pid, data[6],data[7]);
-
 	if (!gf_m2ts_crc32_check(data, data_size - 4)) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("CRC error in the MPE/MPE-FEC data \n"));
 	}
@@ -182,12 +158,11 @@
 	/*get number of rows of mpe_fec_frame from descriptor*/
 	section_number = data[6];
 	last_section_number = data[7];
-	//fprintf(stderr,  "table_id: %x section_length: %d section_number: %d last : %d \n", data[0], (data[1] & 0xF)<<8|data[2], section_number, last_section_number);
 
 	if (ts->direct_mpe) {
 		if (table_id != GF_M2TS_TABLE_ID_DSM_CC_PRIVATE) return;
 		if (section_number != last_section_number) {
-			fprintf(stderr, "MPE IP datagram on several section not supported\n");
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("MPE IP datagram on several section not supported\n"));
 			return;
 		}
 		/* send the IP data :
@@ -254,7 +229,6 @@
 		}
 	}
 
-	//fprintf(stderr, "PID: %4d, sec: %2d/%2d, t_id: %2d, d: %3d, tb: %d, fb: %d, add.: %8d\n", mpe->pid, section_number, last_section_number, id, delta_t, table_boundry_flag, frame_boundry_flag, offset);
 	mpe->mff->PID = mpe->pid;
 
 	while (len_left>0) {
@@ -274,7 +248,6 @@
 			//data += (mff->rows +12+4 );
 			break;
 		default:
-			//	fprintf(stderr, "Unknown table id %x \n", table_id );
 			len_left = 0;
 		}
 
@@ -352,14 +325,10 @@
 			ip_address_bootstrap[3]=14;
 			socket_simu(ip_packet,ts, 1);
 
-			if(ip_packet->u8_rx_adr[3] == 8) {
-				fprintf(stderr, "\n");
-			}
-
 			/* 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) {
-				fprintf(stderr, "ESG Bootstrap found !\n");
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("ESG Bootstrap found !\n"));
 			}
 		} else {
 			offset += (ip_packet->u32_total_length);
@@ -473,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));*/
 
-	fprintf(stderr, "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_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));
 
 	return 1;
 
@@ -499,7 +468,6 @@
 		gf_free(ip_packet->data);
 	}
 	gf_free(ip_packet);
-	ip_packet = NULL;
 }
 
 
@@ -509,20 +477,14 @@
 
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform ;
 	assert( ts );
-//	fprintf(stderr, "Processing IP/MAC Notification table (PID %d) %s\n", ip_table->pid, (status==GF_M2TS_TABLE_REPEAT)?"repeated":"");
-	//if ( status == GF_M2TS_TABLE_REPEAT ) return ;
+
 	if ( ip_platform == NULL )
 	{
 		GF_SAFEALLOC(ip_platform,GF_M2TS_IP_PLATFORM );
 		ip_platform->ip_streams= gf_list_new();
-		//fprintf(stderr,  " \n initialize the Iip_platform \n");
 		section_DSMCC_INT (ip_platform, data, data_size);
 		ts->ip_platform = ip_platform;
 	}
-	//fprintf(stderr, "processing the INT table \n");
-
-
-
 }
 
 
@@ -599,13 +561,11 @@
 
 	case GF_M2TS_DVB_IP_MAC_PLATFORM_NAME_DESCRIPTOR:
 	{
-		//fprintf(stderr, " Information on the ip platform found \n");
 		gf_ip_platform_descriptor(ip_platform, data);
 	}
 	break;
 	case GF_M2TS_DVB_IP_MAC_PLATFORM_PROVIDER_NAME_DESCRIPTOR:
 	{
-		//fprintf(stderr, " Information on the ip platform found \n");
 		gf_ip_platform_provider_descriptor(ip_platform, data);
 	}
 	break;
@@ -725,9 +685,8 @@
 
 void gf_m2ts_target_ip(GF_M2TS_IP_Stream* ip_str, u8 * data)
 {
-	u32 i,j;
+	u32 i;
 	u8 length;
-	i=j=0;
 	ip_str->targets = gf_list_new();
 	length = data[1];
 	for(i=0; i<length; i= i+5)
@@ -763,8 +722,8 @@
 		/* ************** */
 		/* Encode data into codeword, adding NPAR parity bytes */
 		encode_data(adt_rs_en_buffer, cols, adt_rs_en_buffer);
-		fprintf(stderr, "Encoded data is   : \"%s\"\n", adt_rs_en_buffer);
-		fprintf(stderr, "data with error is: \"%s\"\n", 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));
 		/*set a row of RS into RS table*/
 		setRowRS ( mff, i , (unsigned char *)(adt_rs_en_buffer + cols) );
 	}
@@ -775,30 +734,19 @@
 void decode_fec(MPE_FEC_FRAME * mff)
 {
 	u32 i,ML,offset;
+	size_t size;
 	u8 *data;
 	u8 linebuffer[255];
 
-	//fprintf(stderr, "Starting FEC decoding ...\n");
-
-	data = gf_malloc((mff->rows*191)*sizeof(char));
-	memset(data,0,sizeof(data));
+	size = (mff->rows*191)*sizeof(char);
+	data = gf_malloc(size);
+	memset(data,0, size);
 
 	initialize_ecc ();
 	ML = 255;
 	memset(linebuffer, 0, 255);
 	offset = 0;
 
-	/*fprintf(stderr, "ADT data\n");
-	print_bytes(mff->p_adt, 32, 1, 0);
-	print_bytes(mff->p_adt+512, 32, 1, 0);
-	print_bytes(mff->p_adt+512+512, 32, 1, 0);
-	print_bytes(mff->p_adt+512+512+512, 32, 1, 1);
-	fprintf(stderr, "RS data\n");
-	print_bytes(mff->p_rs, 32, 1, 0);
-	print_bytes(mff->p_rs+512, 32, 1, 0);
-	print_bytes(mff->p_rs+512+512, 32, 1, 0);
-	print_bytes(mff->p_rs+512+512+512, 32, 1, 1);*/
-
 	for ( i = 0; i < mff->rows; i ++ )	{
 		u8 tmp[255];
 
@@ -815,20 +763,16 @@
 			/* TODO: set the erasures and errors based on the MFF */
 			if(correct_errors_erasures (linebuffer, ML, nerasures,  erasures) == 0)
 			{
-				//fprintf(stderr, "Correction Error line %d \n", i);
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("Correction Error line %d \n", i));
 			}
 
 			/* TODO: replace the current line in MFF */
 		}
 
-		memcpy(data+offset,linebuffer,sizeof(data));
+		memcpy(data+offset, linebuffer, 191);
 		offset += 191;
 	}
-	//fprintf(stderr, "FEC decoding done.\n");
-	memcpy(mff->p_adt,data,sizeof(data));
-	//gf_m2ts_ipdatagram_reader(mff->p_adt,ip_datagram);
-
-
+	memcpy(mff->p_adt, data, size);
 }
 
 
@@ -836,7 +780,7 @@
 {
 	GF_M2TS_IP_Packet *ip_packet;
 	u8* ip_datagram;
-	u32 i, i_holes,i_streams, i_targets,k,j,l;
+	u32 i, i_holes,i_streams,k,j,l;
 	MPE_Error_Holes *mff_holes;
 	u32 offset; /* offset to get through the datagram */
 	//GF_TSImport *tsimp = (GF_TSImport *) ts->user;
@@ -878,11 +822,6 @@
 
 			if(ip_platform->all_info_gathered != 1)
 			{
-
-				i_streams = 0;
-				i_targets = 0;
-
-
 				assert( ip_platform->ip_streams );
 				i_streams = gf_list_count(ip_platform->ip_streams);
 				for(k=0; k<i_streams; k++)
@@ -895,8 +834,7 @@
 					}
 					else
 					{
-						i_targets = gf_list_count(ip_stream_buff->targets);
-						l=0;
+						u32 i_targets = gf_list_count(ip_stream_buff->targets);
 						for(j=0; j<i_targets; j++)
 						{
 							ip_targets = gf_list_get(ip_stream_buff->targets, j);
@@ -938,8 +876,7 @@
 GF_EXPORT
 void gf_m2ts_print_mpe_info(GF_M2TS_Demuxer *ts)
 {
-	u32 i_streams, i_targets,i,j,l;
-	GF_M2TS_IP_Stream *ip_stream_buff;
+	u32 i_streams,i,j,l;
 	GF_M2TS_IP_Target *ip_targets;
 	u8 *ip_address;
 	GF_M2TS_IP_PLATFORM * ip_platform = ts->ip_platform;
@@ -947,21 +884,15 @@
 	if (!ts->ip_platform) return;
 
 	/* provider and ip platform name */
-	fprintf(stderr, " IP Platform : %s provided by %s \n",ip_platform->name,ip_platform->provider_name);
-
-	i_streams = 0;
-	i_targets = 0;
-
+	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" 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++)
-	{
-		ip_stream_buff=gf_list_get(ip_platform->ip_streams, i);
-		fprintf(stderr, "PID:%d \n",ip_stream_buff->PID);
-		fprintf(stderr, "Target IP Adress : \n");
+	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));
 		/*Print the target IP address  */
-		i_targets = gf_list_count(ip_stream_buff->targets);
+		u32 i_targets = gf_list_count(ip_stream_buff->targets);
 		for(j=0; j<i_targets; j++)
 		{
 			ip_targets = gf_list_get(ip_stream_buff->targets, j);
@@ -969,90 +900,81 @@
 			l=0;
 
 			ip_address = ip_targets->address;
-			fprintf(stderr, "%d.%d.%d.%d/%d ",ip_address[0],ip_address[1],ip_address[2],ip_address[3],ip_targets->slash_mask);
-			fprintf(stderr, "RX port :");
+			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 :"));
 			while(ip_targets->rx_port[l] != 0)
 			{
-				fprintf(stderr, " %d ",ip_targets->rx_port[l]);
+				GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" %d ",ip_targets->rx_port[l]));
 				l++;
 			}
-			fprintf(stderr, "\n");
-
-
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("\n"));
 		}
 
 		/*Print the time slice fec descriptor */
-		fprintf(stderr, "Time Slice Fec Descriptor : \n");
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("Time Slice Fec Descriptor : \n"));
 
 		if(ip_stream_buff->time_slice_fec.time_slicing==0)
 		{
-			fprintf(stderr, " No Time Slicing \n");
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" No Time Slicing \n"));
 		} else
 		{
-			fprintf(stderr, " Time Slicing\n");
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Time Slicing\n"));
 		}
 
 		if(ip_stream_buff->time_slice_fec.mpe_fec==0)
 		{
-			fprintf(stderr, " No MPE FEC used \n");
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" No MPE FEC used \n"));
 		} else
 		{
-			fprintf(stderr, " MPE FEC used \n");
+			GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" MPE FEC used \n"));
 		}
 
 		switch(ip_stream_buff->time_slice_fec.frame_size)
 		{
 		case 0:
 		{
-			fprintf(stderr, " Frame size : 256 rows \n");
-			fprintf(stderr, " Max Burst Duration 512 kbits\n");
+			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"));
 		}
 		break;
 		case 1:
 		{
-			fprintf(stderr, " Frame size : 512 rows \n");
-			fprintf(stderr, " Max Burst Duration 1024 kbits\n");
+			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"));
 		}
 		break;
 		case 2:
 		{
-			fprintf(stderr, " Frame size : 768 rows \n");
-			fprintf(stderr, " Max Burst Duration 1536 kbits\n");
+			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"));
 		}
 		break;
 		case 3:
 		{
-			fprintf(stderr, " Frame size : 1024 rows \n");
-			fprintf(stderr, " Max Burst Duration 2048 kbits\n");
+			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"));
 		}
 		break;
 		default:
 			break;
 		}
 
-		fprintf(stderr, " Time Slice Fec ID : %x\n",ip_stream_buff->time_slice_fec.time_slice_fec_id);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, (" Time Slice Fec ID : %x\n",ip_stream_buff->time_slice_fec.time_slice_fec_id));
 
 		/* Locayion descriptor */
 
-		fprintf(stderr, "Location Descriptor \n");
-		fprintf(stderr, "Network ID:%d \n",ip_stream_buff->location.network_id);
-		fprintf(stderr, "Original Network ID:%d \n",ip_stream_buff->location.original_network_id);
-		fprintf(stderr, "Transport Stream ID:%d \n",ip_stream_buff->location.transport_stream_id);
-		fprintf(stderr, "Service ID:%d \n",ip_stream_buff->location.service_id);
-		fprintf(stderr, "Component Tag:%d \n",ip_stream_buff->location.component_tag);
-
-
-		getchar(); // attendre l'appuie d'une touche
+		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));
 	}
-
-
-
 }
 
 
 void socket_simu(GF_M2TS_IP_Packet *ip_packet, GF_M2TS_Demuxer *ts, Bool yield)
 {
-	char name[100];
 	u32 ipv4_addr;
 	GF_Err e;
 	u8 nb_socket_struct, i;
@@ -1074,6 +996,7 @@
 		Sock_Struct = NULL;
 	}
 	if (Sock_Struct == NULL) {
+		char name[100];
 		GF_SAFEALLOC(Sock_Struct, GF_SOCK_ENTRY);
 
 		Sock_Struct->ipv4_addr = ipv4_addr;
@@ -1100,7 +1023,7 @@
 		}
 
 		if (e != GF_OK) {
-			fprintf(stderr, "Server Bind Error: %s\n", gf_error_to_string(e));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("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);
@@ -1112,7 +1035,7 @@
 
 	e = gf_sk_send(Sock_Struct->sock, ip_packet->data, ip_packet->u32_udp_data_size - 8);
 	if (e != GF_OK) {
-		fprintf(stderr, "Error sending to \n");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Error sending to \n"));
 	}
 	if (yield) gf_sleep(10);
 
@@ -1135,7 +1058,7 @@
 	mff->p_rs = (u8 *)gf_calloc(MPE_RS_COLS*rows,sizeof(u8));
 
 
-	fprintf(stderr, "MPE_RS_COLS*rows :%d \n",MPE_RS_COLS*rows);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("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));
@@ -1144,7 +1067,6 @@
 	mff->current_offset_rs = 0;
 	mff->ADT_done = 0;
 	mff->PID = 0;
-//	fprintf(stderr, "MFF: rows: %d, adt_col: %d, rs_col : %d, capacity : %d\n", mff->rows, mff->col_adt, mff->col_rs, mff->capacity_total );
 	mff->mpe_holes = gf_list_new();
 	mff->initialized = 1;
 	return 1;
@@ -1207,7 +1129,7 @@
 void addPadding(MPE_FEC_FRAME *mff , u32 offset)
 {
 	u32 i = 0;
-	fprintf(stderr, "add paddings from %d to the end %d\n", offset, mff->capacity_total );
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("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 ;
 }
@@ -1219,13 +1141,13 @@
 	u32 k = 0;
 	for ( i = 0; i < length ; i ++ ) {
 		if (k == 0) {
-			fprintf(stderr, "%x0  : ", row_num);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%x0  : ", row_num));
 			k = 0;
 		}
-		fprintf(stderr, "%#x ", data[i]);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("%#x ", data[i]));
 		k++;
 		if (k == 16) {
-			fprintf(stderr, "\n");
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("\n"));
 			k = 0;
 			row_num ++;
 		}
@@ -1242,17 +1164,17 @@
 
 
 	if (offset >= mff->capacity_total) {
-		fprintf(stderr, "Offset %d bigger than capacity %d \n", offset, mff->capacity_total );
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("Offset %d bigger than capacity %d \n", offset, mff->capacity_total ));
 	}
 	if (offset+length >= mff->capacity_total) {
-		fprintf(stderr, "Offset+length %d+%d bigger than capacity %d \n", 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 ));
 	}
 	if (mff->current_offset_adt != offset) {
 		if (mff->current_offset_adt > offset) {
-			fprintf(stderr, "We missed an offset reset (%d to %d)\n", 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));
 			mff->current_offset_adt = offset;
 		} else {
-			fprintf(stderr, "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_MEDIA, ("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;
@@ -1269,7 +1191,7 @@
 void setColRS( MPE_FEC_FRAME * mff, u32 offset, u8 * pds, u32 length )
 {
 	if ( mff->current_offset_rs != offset)	{
-		fprintf(stderr, "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_MEDIA, ("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;
 	}
@@ -1313,23 +1235,15 @@
 		}
 		base += mff->rows ;
 	}
-	fprintf(stderr, " the erasure locations is:\n");
+	GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, (" the erasure locations is:\n"));
 	for ( i = 0; i < nb ; i ++ )
-		fprintf(stderr, "%d ", errasures[i]);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("%d ", errasures[i]));
 	return nb;
 }
 
 void setErrorIndicator(u32 * data , u32 offset, u32 length)
 {
-//	fprintf(stderr, "setting the error indication \n");
 	memset(data+offset, 1, length);
 }
 
-
-/*void descriptor_PRIVATE (u8 *b, DTAG_SCOPE tag_scope){
-	fprintf(stderr, "private descriptor \n");
-	return ;
-}*/
-
-
 #endif //GPAC_ENABLE_MPE

gpac-0.8.0.tar.gz/src/media_tools/gpac_ogg.c -> gpac-1.0.0.tar.gz/src/media_tools/gpac_ogg.c Changed

@@ -38,6 +38,8 @@
 	0x3fffffff,0x7fffffff,0xffffffff
 };
 
+
+#ifdef GPAC_CONFIG_WIN32
 static u32 mask8B[]=
 {0x00,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff};
 
@@ -47,10 +49,17 @@
 	b->buffer[0]='\0';
 	b->storage=BUFFER_INCREMENT;
 }
+#endif
+
+
+#if 0 //unused
 
 void oggpackB_writeinit(oggpack_buffer *b) {
 	oggpack_writeinit(b);
 }
+#endif
+
+#ifdef GPAC_CONFIG_WIN32
 
 void oggpack_writetrunc(oggpack_buffer *b,s32 bits) {
 	s32 bytes=bits>>3;
@@ -60,6 +69,9 @@
 	b->endbyte=bytes;
 	*b->ptr&=mask[bits];
 }
+#endif
+
+#if 0//unused
 
 void oggpackB_writetrunc(oggpack_buffer *b,s32 bits) {
 	s32 bytes=bits>>3;
@@ -69,6 +81,9 @@
 	b->endbyte=bytes;
 	*b->ptr&=mask8B[bits];
 }
+#endif
+
+#ifdef GPAC_CONFIG_WIN32
 
 /* Takes only up to 32 bits. */
 void oggpack_write(oggpack_buffer *b,u32 value,s32 bits) {
@@ -104,6 +119,9 @@
 	b->endbit=bits&7;
 }
 
+#endif
+
+#if 0 //unused
 /* Takes only up to 32 bits. */
 void oggpackB_write(oggpack_buffer *b,u32 value,s32 bits) {
 	if(b->endbyte+4>=b->storage) {
@@ -197,34 +215,34 @@
 	oggpack_writecopy_helper(b,source,bits,oggpackB_write,1);
 }
 
+
+void oggpackB_reset(oggpack_buffer *b) {
+	oggpack_reset(b);
+}
+#endif
+
+#ifdef GPAC_CONFIG_WIN32
 void oggpack_reset(oggpack_buffer *b) {
 	b->ptr=b->buffer;
 	b->buffer[0]=0;
 	b->endbit=b->endbyte=0;
 }
+#endif
 
-void oggpackB_reset(oggpack_buffer *b) {
-	oggpack_reset(b);
-}
-
+#ifdef GPAC_CONFIG_WIN32
 void oggpack_writeclear(oggpack_buffer *b) {
 	gf_free(b->buffer);
 	memset(b,0,sizeof(*b));
 }
+#endif
 
+#if 0 //unused
 void oggpackB_writeclear(oggpack_buffer *b) {
 	oggpack_writeclear(b);
 }
+#endif
 
-void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes) {
-	memset(b,0,sizeof(*b));
-	b->buffer=b->ptr=buf;
-	b->storage=bytes;
-}
-
-void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes) {
-	oggpack_readinit(b,buf,bytes);
-}
+#ifdef GPAC_CONFIG_WIN32
 
 /* Read in bits without advancing the bitptr; bits <= 32 */
 s32 oggpack_look(oggpack_buffer *b,s32 bits) {
@@ -252,7 +270,9 @@
 	}
 	return(m&ret);
 }
+#endif
 
+#if 0 //unused
 /* Read in bits without advancing the bitptr; bits <= 32 */
 s32 oggpackB_look(oggpack_buffer *b,s32 bits) {
 	u32 ret;
@@ -290,6 +310,19 @@
 	return((b->ptr[0]>>(7-b->endbit))&1);
 }
 
+#endif //unused
+
+void oggpack_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes) {
+	memset(b,0,sizeof(*b));
+	b->buffer=b->ptr=buf;
+	b->storage=bytes;
+}
+
+void oggpackB_readinit(oggpack_buffer *b,unsigned char *buf,s32 bytes) {
+	oggpack_readinit(b,buf,bytes);
+}
+
+
 void oggpack_adv(oggpack_buffer *b,s32 bits) {
 	bits+=b->endbit;
 	b->ptr+=bits/8;
@@ -297,6 +330,7 @@
 	b->endbit=bits&7;
 }
 
+#if 0 //unused
 void oggpackB_adv(oggpack_buffer *b,s32 bits) {
 	oggpack_adv(b,bits);
 }
@@ -312,6 +346,7 @@
 void oggpackB_adv1(oggpack_buffer *b) {
 	oggpack_adv1(b);
 }
+#endif
 
 /* bits <= 32 */
 s32 oggpack_read(oggpack_buffer *b,s32 bits) {
@@ -332,9 +367,9 @@
 		if(bits>16) {
 			ret|=b->ptr[2]<<(16-b->endbit);
 			if(bits>24) {
-				ret|=b->ptr[3]<<(24-b->endbit);
+				ret |= ((u32)b->ptr[3]) << (24-b->endbit);
 				if(bits>32 && b->endbit) {
-					ret|=b->ptr[4]<<(32-b->endbit);
+					ret |= ((u32)b->ptr[4]) << (32-b->endbit);
 				}
 			}
 		}
@@ -362,7 +397,7 @@
 		if(b->endbyte*8+bits>b->storage*8)goto overflow;
 	}
 
-	ret=b->ptr[0]<<(24+b->endbit);
+	ret = ((u32)b->ptr[0]) << (24+b->endbit);
 	if(bits>8) {
 		ret|=b->ptr[1]<<(16+b->endbit);
 		if(bits>16) {
@@ -384,6 +419,7 @@
 	return(ret);
 }
 
+#if 0 //unused
 s32 oggpack_read1(oggpack_buffer *b) {
 	u32 ret;
 
@@ -427,11 +463,16 @@
 	}
 	return(ret);
 }
+#endif
+
+#ifdef GPAC_CONFIG_WIN32
 
 s32 oggpack_bytes(oggpack_buffer *b) {
 	return(b->endbyte+(b->endbit+7)/8);
 }
+#endif
 
+#if 0 //unused
 s32 oggpack_bits(oggpack_buffer *b) {
 	return(b->endbyte*8+b->endbit);
 }
@@ -443,15 +484,22 @@
 s32 oggpackB_bits(oggpack_buffer *b) {
 	return oggpack_bits(b);
 }
+#endif
+
+#ifdef GPAC_CONFIG_WIN32
 
 unsigned char *oggpack_get_buffer(oggpack_buffer *b) {
 	return(b->buffer);
 }
+#endif
 
+#if 0 //unused
 unsigned char *oggpackB_get_buffer(oggpack_buffer *b) {
 	return oggpack_get_buffer(b);
 }
 
+#endif //unused
+
 
 #undef BUFFER_INCREMENT
 
@@ -475,7 +523,7 @@
 
 s64 ogg_page_granulepos(ogg_page *og) {
 	unsigned char *page=og->header;
-	s64 granulepos=page[13]&(0xff);
+	u64 granulepos=page[13]&(0xff);
 	granulepos= (granulepos<<8)|(page[12]&0xff);
 	granulepos= (granulepos<<8)|(page[11]&0xff);
 	granulepos= (granulepos<<8)|(page[10]&0xff);
@@ -483,7 +531,7 @@
 	granulepos= (granulepos<<8)|(page[8]&0xff);
 	granulepos= (granulepos<<8)|(page[7]&0xff);
 	granulepos= (granulepos<<8)|(page[6]&0xff);
-	return(granulepos);
+	return((s64) granulepos);
 }
 
 s32 ogg_page_serialno(ogg_page *og) {
@@ -501,6 +549,7 @@
 }
 
 
+#if 0 //unused
 
 /* returns the number of packets that are completed on this page (if
    the leading packet is begun on a previous page, but ends on this
@@ -526,6 +575,7 @@
 	return(count);
 }
 
+#endif //unused
 
 #if 0
 /* helper to initialize lookup for direct-table CRC (illustrative; we
@@ -646,6 +696,8 @@
 	return(0);
 }
 
+#if 0 //unused
+
 s32 ogg_stream_destroy(ogg_stream_state *os) {
 	if(os) {
 		ogg_stream_clear(os);
@@ -654,6 +706,8 @@
 	return(0);
 }
 
+#endif //unused
+
 /* Helpers for ogg_stream_encode; this keeps the structure and
    what's happening fairly clear */
 
@@ -889,9 +943,11 @@
 	return(0);
 }
 
+#if 0 //unused
 s32 ogg_stream_eos(ogg_stream_state *os) {
 	return os->e_o_s;
 }
+#endif
 
 /* DECODING PRIMITIVES: packet streaming layer **********************/
 
@@ -926,6 +982,7 @@
 	return(0);
 }
 
+#if 0 //unused
 s32 ogg_sync_destroy(ogg_sync_state *oy) {
 	if(oy) {
 		ogg_sync_clear(oy);
@@ -933,8 +990,10 @@
 	}
 	return(0);
 }
+#endif
+
 
-char *ogg_sync_buffer(ogg_sync_state *oy, s32 size) {
+u8 *ogg_sync_buffer(ogg_sync_state *oy, s32 size) {
 
 	/* first, clear out any space that has been previously returned */
 	if(oy->returned) {
@@ -1030,9 +1089,6 @@
 
 	/* yes, have a whole page all ready to go */
 	{
-		unsigned char *page=oy->data+oy->returned;
-		s32 bytes;
-
 		if(og) {
 			og->header=page;
 			og->header_len=oy->headerbytes;
@@ -1226,6 +1282,7 @@
 	return(0);
 }
 
+#if 0 //unused
 /* clear things to an initial state.  Good to call, eg, before seeking */
 s32 ogg_sync_reset(ogg_sync_state *oy) {
 	oy->fill=0;
@@ -1260,6 +1317,7 @@
 	os->serialno=serialno;
 	return(0);
 }
+#endif //unused
 
 static s32 _packetout(ogg_stream_state *os,ogg_packet *op,s32 adv) {
 
@@ -1323,124 +1381,13 @@
 	return _packetout(os,op,0);
 }
 
+#if 0 //unused
 void ogg_packet_clear(ogg_packet *op) {
 	gf_free(op->packet);
 	memset(op, 0, sizeof(*op));
 }
+#endif
 
-#endif /*GPAC_DISABLE_OGG*/
-
-
-#include <gpac/internal/isomedia_dev.h>
-
-#ifndef GPAC_DISABLE_ISOM
-
-GF_Box *dOps_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_OpusSpecificBox, GF_ISOM_BOX_TYPE_DOPS);
-	return (GF_Box *)tmp;
-}
-
-void dOps_del(GF_Box *s)
-{
-	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
-	if (ptr) gf_free(ptr);
-}
-
-GF_Err dOps_Read(GF_Box *s, GF_BitStream *bs)
-{
-	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
-	ptr->version = gf_bs_read_u8(bs);
-	ptr->OutputChannelCount = gf_bs_read_u8(bs);
-	ptr->PreSkip = gf_bs_read_u16(bs);
-	ptr->InputSampleRate = gf_bs_read_u32(bs);
-	ptr->OutputGain = gf_bs_read_u16(bs);
-	ptr->ChannelMappingFamily = gf_bs_read_u8(bs);
-	ISOM_DECREASE_SIZE(ptr, 11)
-	if (ptr->size) {
-		ISOM_DECREASE_SIZE(ptr, 2+ptr->OutputChannelCount);
-		ptr->StreamCount = gf_bs_read_u8(bs);
-		ptr->CoupledCount = gf_bs_read_u8(bs);
-		gf_bs_read_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
-	}
-	return GF_OK;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err dOps_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
-	if (!s) return GF_BAD_PARAM;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	gf_bs_write_u8(bs, ptr->version);
-	gf_bs_write_u8(bs, ptr->OutputChannelCount);
-	gf_bs_write_u16(bs, ptr->PreSkip);
-	gf_bs_write_u32(bs, ptr->InputSampleRate);
-	gf_bs_write_u16(bs, ptr->OutputGain);
-	gf_bs_write_u8(bs, ptr->ChannelMappingFamily);
-	if (ptr->ChannelMappingFamily) {
-		gf_bs_write_u8(bs, ptr->StreamCount);
-		gf_bs_write_u8(bs, ptr->CoupledCount);
-		gf_bs_write_data(bs, (char *) ptr->ChannelMapping, ptr->OutputChannelCount);
-	}
-	return GF_OK;
-}
-
-GF_Err dOps_Size(GF_Box *s)
-{
-	GF_OpusSpecificBox *ptr = (GF_OpusSpecificBox *)s;
-	ptr->size += 11;
-	if (ptr->ChannelMappingFamily)
-		ptr->size += 2 + ptr->OutputChannelCount;
-
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-
-
-GF_EXPORT
-GF_Err gf_isom_opus_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_OpusSpecificBox *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex)
-{
-	GF_TrackBox *trak;
-	GF_Err e;
-	u32 dataRefIndex;
-	GF_MPEGAudioSampleEntryBox *entry;
-	ptrdiff_t offset;
-
-	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;
+#endif /*GPAC_DISABLE_OGG*/
 
-	//get or create the data ref
-	e = Media_FindDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-	if (e) return e;
-	if (!dataRefIndex) {
-		e = Media_CreateDataRef(the_file, trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
-		if (e) return e;
-	}
-	if (!the_file->keep_utc)
-		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	//create a new entry
-	entry = (GF_MPEGAudioSampleEntryBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_OPUS);
-	if (!entry) return GF_OUT_OF_MEM;
-	entry->cfg_opus = (GF_OpusSpecificBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_DOPS);
-	if (!entry->cfg_opus) return GF_OUT_OF_MEM;
-	//skip box header
-	offset = (ptrdiff_t)&cfg->version - (ptrdiff_t)cfg;
-	memcpy((char*)entry->cfg_opus + offset, (char*)cfg + offset, sizeof(GF_OpusSpecificBox) - (size_t)offset);
-	
-	entry->dataReferenceIndex = dataRefIndex;
-	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
-	*outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-	return e;
-}
-
-#endif /*GPAC_DISABLE_ISOM*/

gpac-0.8.0.tar.gz/src/media_tools/html5_media.c -> gpac-1.0.0.tar.gz/src/media_tools/html5_media.c Changed

@@ -81,16 +81,13 @@
 
 void gf_html_timeranges_merge(GF_HTML_MediaTimeRanges *ranges) {
 	u32 i, count;
-	u64 *start;
-	u64 *end;
-	u64 *prev_end;
+	u64 *prev_end = NULL;
 	GF_List *merged = gf_list_new();
 
-	prev_end = NULL;
 	count = gf_list_count(ranges->times);
 	for (i = 0; i < count; i+=2) {
-		start = (u64 *)gf_list_get(ranges->times, i);
-		end = (u64 *)gf_list_get(ranges->times, i+1);
+		u64 *start = (u64 *)gf_list_get(ranges->times, i);
+		u64 *end = (u64 *)gf_list_get(ranges->times, i+1);
 		if (prev_end == NULL || *start > *prev_end) {
 			if (prev_end) {
 				gf_list_add(merged, prev_end);
@@ -208,13 +205,12 @@
 {
 	GF_HTML_MediaTimeRanges *intersection_ranges;
 	u32 i, j, count_a, count_b;
+	if (!a || !b) return NULL;
 	intersection_ranges = gf_html_timeranges_new(a->timescale);
 	intersection_ranges->c = a->c;
 	intersection_ranges->_this = a->_this;
-	count_a = 0;
-	count_b = 0;
-	if (a) count_a = gf_list_count(a->times);
-	if (b) count_b = gf_list_count(b->times);
+	count_a = gf_list_count(a->times);
+	count_b = gf_list_count(b->times);
 	if (count_a != 0 && count_b != 0) {
 		i = 0;
 		j = 0;
@@ -283,12 +279,10 @@
 
 Bool html_media_tracklist_has_track(GF_HTML_TrackList *tracklist, const char *id)
 {
-	GF_HTML_Track *track;
 	u32 i, count;
 	count = gf_list_count(tracklist->tracks);
-	for (i = 0; i < count; i++)
-	{
-		track = (GF_HTML_Track *)gf_list_get(tracklist->tracks, i);
+	for (i = 0; i < count; i++) {
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tracklist->tracks, i);
 		if (!strcmp(id, track->id))
 		{
 			return 1;

gpac-0.8.0.tar.gz/src/media_tools/html5_mse.c -> gpac-1.0.0.tar.gz/src/media_tools/html5_mse.c Changed

@@ -64,8 +64,10 @@
 			for (i = 0; i < gf_list_count(ms->sourceBuffers.list); i++) {
 				GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
 
+#ifdef FILTER_FIXME
 				if (sb->parser && sb->parser_connected)
 					sb->parser->CloseService(sb->parser);
+#endif
 
 				gf_mse_source_buffer_del(sb);
 			}
@@ -304,10 +306,11 @@
 /*locates and loads an input service (demuxer, parser) for this source buffer based on mime type or segment name*/
 GF_Err gf_mse_source_buffer_load_parser(GF_HTML_SourceBuffer *sourcebuffer, const char *mime)
 {
+#ifdef FILTER_FIXME
 	GF_InputService *parser = NULL;
 
-	const char *sPlug;
 	if (mime) {
+		const char *sPlug;
 		/* strip the 'codecs' and 'profile' parameters from the MIME type */
 		char *param = (char *)strchr(mime, ';');
 		if (param) {
@@ -315,11 +318,11 @@
 		}
 
 		/* Check MIME type to start the right InputService */
-		sPlug = gf_cfg_get_key(sourcebuffer->mediasource->service->term->user->config, "MimeTypes", mime);
+		sPlug = gf_opts_get_key("MimeTypes", mime);
 		if (sPlug) sPlug = strrchr(sPlug, '"');
 		if (sPlug) {
 			sPlug += 2;
-			parser = (GF_InputService *) gf_modules_load_interface_by_name(sourcebuffer->mediasource->service->term->user->modules, sPlug, GF_NET_CLIENT_INTERFACE);
+			parser = (GF_InputService *) gf_modules_load_by_name(sPlug, GF_NET_CLIENT_INTERFACE);
 		}
 
 		if (param) {
@@ -336,8 +339,13 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MSE] Error locating plugin for source - mime type %s\n", mime));
 		return GF_BAD_PARAM;
 	}
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
+#ifdef FILTER_FIXME
+
 /* create a track based on the ESD and adds it to the source buffer */
 static GF_HTML_Track *gf_mse_source_buffer_add_track(GF_HTML_SourceBuffer *sb, GF_ESD *esd)
 {
@@ -387,6 +395,7 @@
 	} else {
 		return GF_BAD_PARAM;
 	}
+	return GF_BAD_PARAM;
 }
 
 /* Adds the ObjectDescriptor to the associated track (creating a new track if needed)
@@ -421,6 +430,8 @@
 	return GF_OK;
 }
 
+#endif
+
 #define SECONDS_TO_TIMESCALE(s) ((s)*track->timescale)
 #define TIMESCALE_TO_SECONDS(u) ((u)*1.0/track->timescale)
 
@@ -519,6 +530,7 @@
 	gf_free(packet);
 }
 
+#ifdef FILTER_FIXME
 static GF_MSE_Packet *gf_mse_find_overlapped_packet(GF_HTML_Track           *track,
         GF_MSE_Packet           *packet)
 {
@@ -543,6 +555,7 @@
 	gf_mx_v(track->buffer_mutex);
 	return NULL;
 }
+#endif
 
 static void gf_mse_remove_frames_from_to(GF_HTML_Track *track,
         u64           from,
@@ -566,6 +579,7 @@
 	gf_mx_v(track->buffer_mutex);
 }
 
+#ifdef FILTER_FIXME
 static void gf_mse_track_buffer_add_packet(GF_HTML_Track *track, GF_MSE_Packet *frame)
 {
 	u32 i, count;
@@ -745,6 +759,8 @@
 
 	return GF_OK;
 }
+#endif
+
 
 /* Thread run function: called as a result of an append buffer
  * Parses/Demultiplexes media segments and places the parsed AU in the track buffers
@@ -753,6 +769,7 @@
  */
 u32 gf_mse_parse_segment(void *par)
 {
+#ifdef FILTER_FIXME
 	GF_MSE_Packet           *packet;
 	GF_HTML_Track           *track;
 	GF_HTML_SourceBuffer    *sb = (GF_HTML_SourceBuffer *)par;
@@ -822,6 +839,9 @@
 exit:
 	gf_mse_source_buffer_set_update(sb, GF_FALSE);
 	return 0;
+#else
+	return 0;
+#endif
 }
 
 
@@ -831,7 +851,9 @@
 	gf_mse_source_buffer_set_update(sb, GF_TRUE);
 
 	buffer->url = (char *)gf_malloc(256);
-	sprintf(buffer->url, "gmem://%d@%p", buffer->length, buffer->data);
+	buffer->blob.data = buffer->data;
+	buffer->blob.size = buffer->length;
+	sprintf(buffer->url, "gmem://%p", &buffer->blob);
 	buffer->reference_count++;
 #ifndef GPAC_DISABLE_ISOM
 	buffer->is_init = (gf_isom_probe_file(buffer->url) == 2 ? GF_TRUE : GF_FALSE);
@@ -900,8 +922,9 @@
 }
 
 /* Callback functions used by a media parser when parsing events happens */
-GF_Err gf_mse_proxy(GF_InputService *parser, GF_NetworkCommand *command)
+GF_Err gf_mse_proxy(void *parser, void *command)
 {
+#if FILTER_FIXME
 	if (!parser || !command || !parser->proxy_udta) {
 		return GF_BAD_PARAM;
 	} else {
@@ -1000,6 +1023,9 @@
 		}
 		return GF_OK;
 	}
+#else
+	return GF_NOT_SUPPORTED;
+#endif
 }
 
 /* Track Buffer Managment:

gpac-0.8.0.tar.gz/src/media_tools/img.c -> gpac-1.0.0.tar.gz/src/media_tools/img.c Changed

@@ -51,7 +51,7 @@
 #endif	/*GPAC_HAS_JPEG*/
 
 GF_EXPORT
-void gf_img_parse(GF_BitStream *bs, u8 *OTI, u32 *mtype, u32 *width, u32 *height, char **dsi, u32 *dsi_len)
+void gf_img_parse(GF_BitStream *bs, u32 *codecid, u32 *width, u32 *height, u8 **dsi, u32 *dsi_len)
 {
 	u8 b1, b2, b3;
 	u32 size, type;
@@ -59,8 +59,8 @@
 	pos = gf_bs_get_position(bs);
 	gf_bs_seek(bs, 0);
 
-	*mtype = *width = *height = 0;
-	*OTI = 0;
+	*width = *height = 0;
+	*codecid = 0;
 	if (dsi) {
 		*dsi = NULL;
 		*dsi_len = 0;
@@ -81,7 +81,7 @@
 
 		/*get frame header FFC0*/
 		while (gf_bs_available(bs)) {
-			u32 type, w, h;
+			u32 w, h;
 			if (gf_bs_read_u8(bs) != 0xFF) continue;
 			if (!offset) offset = (u32)gf_bs_get_position(bs) - 1;
 
@@ -112,8 +112,7 @@
 				break;
 			}
 		}
-		*OTI = GPAC_OTI_IMAGE_JPEG;
-		*mtype = GF_ISOM_MEDIA_JPEG;
+		*codecid = GF_CODECID_JPEG;
 		if (dsi) {
 			GF_BitStream *bs_dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			gf_bs_write_u16(bs_dsi, offset);
@@ -136,27 +135,25 @@
 
 		*width = gf_bs_read_u32(bs);
 		*height = gf_bs_read_u32(bs);
-		*OTI = GPAC_OTI_IMAGE_PNG;
-		*mtype = GF_ISOM_MEDIA_PNG;
+		*codecid = GF_CODECID_PNG;
 	}
 	/*try j2k*/
 	else {
+		u32 jp2h_size=0, jp2h_start=0;
 		size = gf_bs_read_u8(bs);
 		type = gf_bs_read_u32(bs);
 		if ( ((size==12) && (type==GF_ISOM_BOX_TYPE_JP ))
 	        || (type==GF_ISOM_BOX_TYPE_JP2H ) ) {
 
 			if (type==GF_ISOM_BOX_TYPE_JP2H) {
-				*OTI = GPAC_OTI_IMAGE_JPEG_2000;
-				*mtype = GF_ISOM_MEDIA_JP2;
+				*codecid = GF_CODECID_J2K;
 				goto j2k_restart;
 			}
 
 			type = gf_bs_read_u32(bs);
 			if (type!=0x0D0A870A) goto exit;
 
-			*OTI = GPAC_OTI_IMAGE_JPEG_2000;
-			*mtype = GF_ISOM_MEDIA_JP2;
+			*codecid = GF_CODECID_J2K;
 
 			while (gf_bs_available(bs)) {
 j2k_restart:
@@ -164,30 +161,24 @@
 				type = gf_bs_read_u32(bs);
 				switch (type) {
 				case GF_ISOM_BOX_TYPE_JP2H:
+					jp2h_size=size-8;
+					jp2h_start = (u32) gf_bs_get_position(bs);
 					goto j2k_restart;
 				case GF_ISOM_BOX_TYPE_IHDR:
 				{
-					u16 nb_comp;
-					u8 BPC, C, UnkC, IPR;
 					*height = gf_bs_read_u32(bs);
 					*width = gf_bs_read_u32(bs);
-					nb_comp = gf_bs_read_u16(bs);
+					/*nb_comp = gf_bs_read_u16(bs);
 					BPC = gf_bs_read_u8(bs);
 					C = gf_bs_read_u8(bs);
 					UnkC = gf_bs_read_u8(bs);
 					IPR = gf_bs_read_u8(bs);
-
-					if (dsi) {
-						GF_BitStream *bs_dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-						gf_bs_write_u32(bs_dsi, *height);
-						gf_bs_write_u32(bs_dsi, *width);
-						gf_bs_write_u16(bs_dsi, nb_comp);
-						gf_bs_write_u8(bs_dsi, BPC);
-						gf_bs_write_u8(bs_dsi, C);
-						gf_bs_write_u8(bs_dsi, UnkC);
-						gf_bs_write_u8(bs_dsi, IPR);
-						gf_bs_get_content(bs_dsi, dsi, dsi_len);
-						gf_bs_del(bs_dsi);
+					*/
+					if (dsi && jp2h_size) {
+						*dsi = gf_malloc(sizeof(char)*jp2h_size);
+						gf_bs_seek(bs, jp2h_start);
+						gf_bs_read_data(bs, *dsi, jp2h_size);
+						*dsi_len = jp2h_size;
 					}
 					goto exit;
 				}
@@ -206,7 +197,10 @@
 
 #ifdef GPAC_HAS_JPEG
 
-void gf_jpeg_nonfatal_error2(j_common_ptr cinfo, int lev) {}
+void gf_jpeg_nonfatal_error2(j_common_ptr cinfo, int lev)
+{
+
+}
 
 /*JPG context while decoding*/
 typedef struct
@@ -224,46 +218,53 @@
 	struct jpeg_decompress_struct cinfo;
 } JPGCtx;
 
-static void gf_jpeg_output_message (j_common_ptr cinfo) {
-	char buffer[JMSG_LENGTH_MAX];
-	/* Create the message */
-	(*cinfo->err->format_message) (cinfo, buffer);
-	GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPEG OUTPUT MESSAGE]: %s\n", buffer));
+static void gf_jpeg_output_message (j_common_ptr cinfo)
+{
+	if (cinfo) {
+		char buffer[JMSG_LENGTH_MAX];
+		/* Create the message */
+		(*cinfo->err->format_message) (cinfo, buffer);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[JPEG OUTPUT MESSAGE]: %s\n", buffer));
+	}
 }
 
 static void gf_jpeg_fatal_error(j_common_ptr cinfo)
 {
-	JPGErr *err = (JPGErr *) cinfo->err;
-	gf_jpeg_output_message(cinfo);
-	longjmp(err->jmpbuf, 1);
+	if (cinfo) {
+		JPGErr *err = (JPGErr *) cinfo->err;
+		gf_jpeg_output_message(cinfo);
+		longjmp(err->jmpbuf, 1);
+	}
 }
 
 void gf_jpeg_stub(j_decompress_ptr cinfo) {}
 
 /*a JPEG is always carried in a complete, single MPEG4 AU so no refill*/
-static boolean gf_jpeg_fill_input_buffer(j_decompress_ptr cinfo) {
+static boolean gf_jpeg_fill_input_buffer(j_decompress_ptr cinfo)
+{
 	return 0;
 }
 
 static void gf_jpeg_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
 {
-	JPGCtx *jpx = (JPGCtx *) cinfo->src;
-	if (num_bytes > (long) jpx->src.bytes_in_buffer) {
-		jpx->skip = (s32) (num_bytes - jpx->src.bytes_in_buffer);
-		jpx->src.next_input_byte += jpx->src.bytes_in_buffer;
-		jpx->src.bytes_in_buffer = 0;
-	} else {
-		jpx->src.bytes_in_buffer -= num_bytes;
-		jpx->src.next_input_byte += num_bytes;
-		jpx->skip = 0;
+	if (cinfo) {
+		JPGCtx *jpx = (JPGCtx *) cinfo->src;
+		if (num_bytes > (long) jpx->src.bytes_in_buffer) {
+			jpx->skip = (s32) (num_bytes - jpx->src.bytes_in_buffer);
+			jpx->src.next_input_byte += jpx->src.bytes_in_buffer;
+			jpx->src.bytes_in_buffer = 0;
+		} else {
+			jpx->src.bytes_in_buffer -= num_bytes;
+			jpx->src.next_input_byte += num_bytes;
+			jpx->skip = 0;
+		}
 	}
 }
 
-
 #define JPEG_MAX_SCAN_BLOCK_HEIGHT		16
 
 GF_EXPORT
-GF_Err gf_img_jpeg_dec(char *jpg, u32 jpg_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size, u32 dst_nb_comp)
+GF_Err gf_img_jpeg_dec(u8 *jpg, u32 jpg_size, u32 *width, u32 *height, u32 *pixel_format, u8 *dst, u32 *dst_size, u32 dst_nb_comp)
 {
 	s32 i, j, scans, k;
 	u32 stride;
@@ -272,6 +273,17 @@
 	JPGErr jper;
 	JPGCtx jpx;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_jpeg_fatal_error(NULL);
+		gf_jpeg_output_message(NULL);
+		gf_jpeg_nonfatal_error2(NULL, 0);
+		gf_jpeg_fill_input_buffer(NULL);
+		gf_jpeg_skip_input_data(NULL, 0);
+	}
+#endif
+	if (!dst) *dst_size = 0;
+	
 	jpx.cinfo.err = jpeg_std_error(&(jper.pub));
 	jper.pub.error_exit = gf_jpeg_fatal_error;
 	jper.pub.output_message = gf_jpeg_output_message;
@@ -315,14 +327,14 @@
 		*pixel_format = GF_PIXEL_GREYSCALE;
 		break;
 	case 3:
-		*pixel_format = GF_PIXEL_RGB_24;
+		*pixel_format = GF_PIXEL_RGB;
 		break;
 	default:
 		jpeg_destroy_decompress(&jpx.cinfo);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
-	if (*dst_size < *height **width * jpx.cinfo.num_components) {
-		*dst_size = *height **width * jpx.cinfo.num_components;
+	if (!dst || (*dst_size < *height * *width * jpx.cinfo.num_components)) {
+		*dst_size = *height * *width * jpx.cinfo.num_components;
 		jpeg_destroy_decompress(&jpx.cinfo);
 		return GF_BUFFER_TOO_SMALL;
 	}
@@ -333,12 +345,10 @@
 	jpx.cinfo.do_fancy_upsampling = FALSE;
 	jpx.cinfo.do_block_smoothing = FALSE;
 	if (!jpeg_start_decompress(&jpx.cinfo)) {
-		if (scan_line) gf_free(scan_line);
 		jpeg_destroy_decompress(&jpx.cinfo);
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	if (jpx.cinfo.rec_outbuf_height>JPEG_MAX_SCAN_BLOCK_HEIGHT) {
-		if (scan_line) gf_free(scan_line);
 		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"));
 		return GF_IO_ERR;
@@ -386,7 +396,7 @@
 #else
 
 GF_EXPORT
-GF_Err gf_img_jpeg_dec(char *jpg, u32 jpg_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size, u32 dst_nb_comp)
+GF_Err gf_img_jpeg_dec(u8 *jpg, u32 jpg_size, u32 *width, u32 *height, u32 *pixel_format, u8 *dst, u32 *dst_size, u32 dst_nb_comp)
 {
 	return GF_NOT_SUPPORTED;
 }
@@ -417,12 +427,14 @@
 }
 static void gf_png_user_error_fn(png_structp png_ptr,png_const_charp error_msg)
 {
-	longjmp(png_jmpbuf(png_ptr), 1);
+	if (png_ptr) {
+		longjmp(png_jmpbuf(png_ptr), 1);
+	}
 }
 
 
 GF_EXPORT
-GF_Err gf_img_png_dec(char *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size)
+GF_Err gf_img_png_dec(u8 *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, u8 *dst, u32 *dst_size)
 {
 	GFpng udta;
 	png_struct *png_ptr;
@@ -441,6 +453,12 @@
 	udta.pos = 0;
 	udta.rows=NULL;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_png_user_error_fn(NULL, NULL);
+	}
+#endif
+
 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp) &udta, NULL, NULL);
 	if (!png_ptr) return GF_IO_ERR;
 	info_ptr = png_create_info_struct(png_ptr);
@@ -478,10 +496,10 @@
 		*pixel_format = GF_PIXEL_GREYSCALE;
 		break;
 	case PNG_COLOR_TYPE_GRAY_ALPHA:
-		*pixel_format = GF_PIXEL_ALPHAGREY;
+		*pixel_format = GF_PIXEL_GREYALPHA;
 		break;
 	case PNG_COLOR_TYPE_RGB:
-		*pixel_format = GF_PIXEL_RGB_24;
+		*pixel_format = GF_PIXEL_RGB;
 		break;
 	case PNG_COLOR_TYPE_RGB_ALPHA:
 		*pixel_format = GF_PIXEL_RGBA;
@@ -532,7 +550,7 @@
 
 /* write a png file */
 GF_EXPORT
-GF_Err gf_img_png_enc(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst, u32 *dst_size)
+GF_Err gf_img_png_enc(u8 *data, u32 width, u32 height, s32 stride, u32 pixel_format, u8 *dst, u32 *dst_size)
 {
 	GFpng udta;
 	png_color_8 sig_bit;
@@ -547,14 +565,14 @@
 		nb_comp = 1;
 		type = PNG_COLOR_TYPE_GRAY;
 		break;
-	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
 		nb_comp = 1;
 		type = PNG_COLOR_TYPE_GRAY_ALPHA;
 		break;
-	case GF_PIXEL_RGB_24:
-	case GF_PIXEL_BGR_24:
-	case GF_PIXEL_RGB_32:
-	case GF_PIXEL_BGR_32:
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
 		nb_comp = 3;
 		type = PNG_COLOR_TYPE_RGB;
 		break;
@@ -574,6 +592,12 @@
 
 	if (png_ptr == NULL) return GF_IO_ERR;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_png_flush(NULL);
+	}
+#endif
+
 	/* Allocate/initialize the image information data.  REQUIRED */
 	info_ptr = png_create_info_struct(png_ptr);
 	if (info_ptr == NULL) {
@@ -637,14 +661,14 @@
 		png_set_bgr(png_ptr);
 	}
 	switch (pixel_format) {
-	case GF_PIXEL_RGB_32:
+	case GF_PIXEL_RGBX:
 		png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
 		png_set_bgr(png_ptr);
 		break;
-	case GF_PIXEL_BGR_32:
+	case GF_PIXEL_BGRX:
 		png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
 		break;
-	case GF_PIXEL_BGR_24:
+	case GF_PIXEL_BGR:
 		png_set_bgr(png_ptr);
 		break;
 	}
@@ -662,100 +686,18 @@
 	return GF_OK;
 }
 
-/* write a png file */
-GF_EXPORT
-GF_Err gf_img_png_enc_file(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst_file)
-{
-	GF_Err e;
-	FILE *png;
-	u32 dst_size = width*height*4;
-	char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
-	if (!dst) return GF_OUT_OF_MEM;
-
-	e = gf_img_png_enc(data, width, height, stride, pixel_format, dst, &dst_size);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[PNG]: Error encoding image %s\n", gf_error_to_string(e) ));
-		goto exit;
-	}
-
-	png = gf_fopen(dst_file, "wb");
-	if (!png) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[PNG]: Error opening destination file %s\n", dst_file ));
-		goto exit;
-	}
-
-	gf_fwrite(dst, dst_size, 1, png);
-	gf_fclose(png);
-
-exit:
-	gf_free(dst);
-	return e;
-}
 #else
 GF_EXPORT
-GF_Err gf_img_png_dec(char *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size)
+GF_Err gf_img_png_dec(u8 *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, u8 *dst, u32 *dst_size)
 {
 	return GF_NOT_SUPPORTED;
 }
 GF_EXPORT
-GF_Err gf_img_png_enc(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst, u32 *dst_size)
+GF_Err gf_img_png_enc(u8 *data, u32 width, u32 height, s32 stride, u32 pixel_format, u8 *dst, u32 *dst_size)
 {
 	return GF_NOT_SUPPORTED;
 }
 
-GF_EXPORT
-GF_Err gf_img_png_enc_file(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst_file)
-{
-	return GF_NOT_SUPPORTED;
-}
 #endif	/*GPAC_HAS_PNG*/
 
-GF_EXPORT
-GF_Err gf_img_file_dec(char *png_filename, u32 *hint_oti, u32 *width, u32 *height, u32 *pixel_format, char **dst, u32 *dst_size)
-{
-	u32 fsize, read, oti;
-	FILE *f;
-	char *data;
-	GF_Err e;
-	f = gf_fopen(png_filename, "rb");
-	if (!f) return GF_URL_ERROR;
-
-	oti = 0;
-	if (!hint_oti || ! *hint_oti) {
-		char *ext = strrchr(png_filename, '.');
-		if (!ext) return GF_NOT_SUPPORTED;
-		if (!stricmp(ext, ".png")) oti = GPAC_OTI_IMAGE_PNG;
-		else if (!stricmp(ext, ".jpg") || !stricmp(ext, ".jpeg")) oti = GPAC_OTI_IMAGE_JPEG;
-	} else if (hint_oti) {
-		oti = *hint_oti;
-	}
-	gf_fseek(f, 0, SEEK_END);
-	fsize = (u32)gf_ftell(f);
-	gf_fseek(f, 0, SEEK_SET);
-	data = gf_malloc(fsize);
-	read = (s32) fread(data, sizeof(char), fsize, f);
-	gf_fclose( f );
-	if (read != fsize) return GF_IO_ERR;
-
-	e = GF_NOT_SUPPORTED;
-	*dst_size = 0;
-	if (oti == GPAC_OTI_IMAGE_JPEG) {
-#ifdef GPAC_HAS_JPEG
-		e = gf_img_jpeg_dec(data, fsize, width, height, pixel_format, NULL, dst_size, 0);
-		if (*dst_size) {
-			*dst = gf_malloc(*dst_size);
-			return gf_img_jpeg_dec(data, fsize, width, height, pixel_format, *dst, dst_size, 0);
-		}
-#endif
-	} else if (oti == GPAC_OTI_IMAGE_PNG) {
-#ifdef GPAC_HAS_PNG
-		e = gf_img_png_dec(data, fsize, width, height, pixel_format, NULL, dst_size);
-		if (*dst_size) {
-			*dst = gf_malloc(*dst_size);
-			return gf_img_png_dec(data, fsize, width, height, pixel_format, *dst, dst_size);
-		}
-#endif
-	}
-	return e;
-}

gpac-0.8.0.tar.gz/src/media_tools/isom_hinter.c -> gpac-1.0.0.tar.gz/src/media_tools/isom_hinter.c Changed

@@ -28,7 +28,7 @@
 #include <gpac/mpeg4_odf.h>
 #include <gpac/constants.h>
 #include <gpac/maths.h>
-#include <gpac/ietf.h>
+#include <gpac/internal/ietf_dev.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
@@ -52,6 +52,8 @@
 
 	for (i=0; i<count; i++) {
 		samp = gf_isom_get_sample_info(file, Track, i+1, NULL, NULL);
+		if (!samp) break;
+		
 		//get the size
 		*avgSize += samp->dataLength;
 		if (*MaxSize < samp->dataLength) *MaxSize = samp->dataLength;
@@ -125,28 +127,6 @@
 */
 #define OFFSET_HINT_GROUP_ID	0x8000
 
-void MP4T_DumpSDP(GF_ISOFile *file, const char *name)
-{
-	const char *sdp;
-	u32 size, i;
-	FILE *f;
-
-	f = gf_fopen(name, "wt");
-	//get the movie SDP
-	gf_isom_sdp_get(file, &sdp, &size);
-	gf_fwrite(sdp, size, 1, f);
-	fprintf(f, "\r\n");
-
-	//then tracks
-	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);
-		gf_fwrite(sdp, size, 1, f);
-	}
-	gf_fclose(f);
-}
-
-
 void InitSL_RTP(GF_SLConfig *slc)
 {
 	memset(slc, 0, sizeof(GF_SLConfig));
@@ -195,7 +175,7 @@
 	                         NULL, 0);
 }
 
-void MP4T_OnData(void *cbk, char *data, u32 data_size, Bool is_header)
+void MP4T_OnData(void *cbk, u8 *data, u32 data_size, Bool is_header)
 {
 	u8 at_begin;
 	GF_RTPHinter *tkHint = (GF_RTPHinter *)cbk;
@@ -245,7 +225,7 @@
 {
 
 	GF_SLConfig my_sl;
-	u32 descIndex, MinSize, MaxSize, avgTS, streamType, oti, const_dur, nb_ch, maxDTSDelta;
+	u32 descIndex, MinSize, MaxSize, avgTS, streamType, codecid, const_dur, nb_ch, maxDTSDelta;
 	u8 OfficialPayloadID;
 	u32 TrackMediaSubType, TrackMediaType, hintType, nbEdts, required_rate, force_dts_delta, avc_nalu_size, PL_ID, bandwidth, IV_length, KI_length;
 	const char *url, *urn;
@@ -262,17 +242,17 @@
 		return NULL;
 	}
 	*e = GF_NOT_SUPPORTED;
-	nbEdts = gf_isom_get_edit_segment_count(file, TrackNum);
+	nbEdts = gf_isom_get_edits_count(file, TrackNum);
 	if (nbEdts>1) {
 		u64 et, sd, mt;
-		u8 em;
-		gf_isom_get_edit_segment(file, TrackNum, 1, &et, &sd, &mt, &em);
+		GF_ISOEditType em;
+		gf_isom_get_edit(file, TrackNum, 1, &et, &sd, &mt, &em);
 		if ((nbEdts>2) || (em!=GF_ISOM_EDIT_EMPTY)) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp hinter] Cannot hint track whith EditList\n"));
 			return NULL;
 		}
 	}
-	if (nbEdts) gf_isom_remove_edit_segments(file, TrackNum);
+	if (nbEdts) gf_isom_remove_edits(file, TrackNum);
 
 	if (!gf_isom_is_track_enabled(file, TrackNum)) return NULL;
 
@@ -280,15 +260,17 @@
 	PL_ID = 0;
 	OfficialPayloadID = 0;
 	force_dts_delta = 0;
-	streamType = oti = 0;
+	streamType = 0;
 	mpeg4mode = NULL;
 	required_rate = 0;
 	is_crypted = 0;
 	IV_length = KI_length = 0;
-	oti = 0;
+	codecid = 0;
 	nb_ch = 0;
 	avc_nalu_size = 0;
 	has_mpeg4_mapping = 1;
+	const_dur = 0;
+	bandwidth=0;
 	TrackMediaType = gf_isom_get_media_type(file, TrackNum);
 
 	/*for max compatibility with QT*/
@@ -297,7 +279,7 @@
 	/*timed-text is a bit special, we support multiple stream descriptions & co*/
 	if ( (TrackMediaType==GF_ISOM_MEDIA_TEXT) || (TrackMediaType==GF_ISOM_MEDIA_SUBT)) {
 		hintType = GF_RTP_PAYT_3GPP_TEXT;
-		oti = GPAC_OTI_TEXT_MPEG4;
+		codecid = GF_CODECID_TEXT_MPEG4;
 		streamType = GF_STREAM_TEXT;
 		/*fixme - this works cos there's only one PL for text in mpeg4 at the current time*/
 		PL_ID = 0x10;
@@ -311,14 +293,15 @@
 		case GF_ISOM_SUBTYPE_MPEG4:
 			esd = gf_isom_get_esd(file, TrackNum, 1);
 			hintType = GF_RTP_PAYT_MPEG4;
-			if (esd) {
+			if (esd && esd->decoderConfig) {
 				streamType = esd->decoderConfig->streamType;
-				oti = esd->decoderConfig->objectTypeIndication;
+				codecid = esd->decoderConfig->objectTypeIndication;
 				if (esd->URLString) hintType = 0;
 				/*AAC*/
-				if ((streamType==GF_STREAM_AUDIO) && esd->decoderConfig->decoderSpecificInfo
+				if ((streamType==GF_STREAM_AUDIO)
+					&& esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data
 				        /*(nb: we use mpeg4 for MPEG-2 AAC)*/
-				        && ((oti==GPAC_OTI_AUDIO_AAC_MPEG4) || (oti==GPAC_OTI_AUDIO_AAC_MPEG4) || (oti==GPAC_OTI_AUDIO_AAC_MPEG2_MP) || (oti==GPAC_OTI_AUDIO_AAC_MPEG2_LCP) || (oti==GPAC_OTI_AUDIO_AAC_MPEG2_SSRP)) ) {
+				        && ((codecid==GF_CODECID_AAC_MPEG4) || (codecid==GF_CODECID_AAC_MPEG2_MP) || (codecid==GF_CODECID_AAC_MPEG2_LCP) || (codecid==GF_CODECID_AAC_MPEG2_SSRP)) ) {
 
 					u32 sample_rate;
 					GF_M4ADecSpecInfo a_cfg;
@@ -350,14 +333,14 @@
 					required_rate = sample_rate;
 				}
 				/*MPEG1/2 audio*/
-				else if ((streamType==GF_STREAM_AUDIO) && ((oti==GPAC_OTI_AUDIO_MPEG2_PART3) || (oti==GPAC_OTI_AUDIO_MPEG1))) {
-					u32 sample_rate;
-					if (!is_crypted) {
-						GF_ISOSample *samp = gf_isom_get_sample(file, TrackNum, 1, NULL);
-						u32 hdr = GF_4CC((u8)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
+				else if ((streamType==GF_STREAM_AUDIO) && ((codecid==GF_CODECID_MPEG2_PART3) || (codecid==GF_CODECID_MPEG_AUDIO))) {
+					GF_ISOSample *samp = NULL;
+					if (!is_crypted)
+						 samp = gf_isom_get_sample(file, TrackNum, 1, NULL);
+
+					if (samp && (samp->dataLength>3)) {
+						u32 hdr = GF_4CC((u32)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
 						nb_ch = gf_mp3_num_channels(hdr);
-						sample_rate = gf_mp3_sampling_rate(hdr);
-						gf_isom_sample_del(&samp);
 						hintType = GF_RTP_PAYT_MPEG12_AUDIO;
 						/*use official RTP/AVP payload type*/
 						OfficialPayloadID = 14;
@@ -365,13 +348,16 @@
 					}
 					/*encrypted MP3 must be sent through MPEG-4 generic to signal all ISMACryp stuff*/
 					else {
-						u8 bps;
-						gf_isom_get_audio_info(file, TrackNum, 1, &sample_rate, &nb_ch, &bps);
+						u32 sample_rate;
+						gf_isom_get_audio_info(file, TrackNum, 1, &sample_rate, &nb_ch, NULL);
 						required_rate = sample_rate;
 					}
+					if (samp)
+						gf_isom_sample_del(&samp);
+
 				}
 				/*QCELP audio*/
-				else if ((streamType==GF_STREAM_AUDIO) && (oti==GPAC_OTI_AUDIO_13K_VOICE)) {
+				else if ((streamType==GF_STREAM_AUDIO) && (codecid==GF_CODECID_QCELP)) {
 					hintType = GF_RTP_PAYT_QCELP;
 					OfficialPayloadID = 12;
 					required_rate = 8000;
@@ -379,7 +365,7 @@
 					nb_ch = 1;
 				}
 				/*EVRC/SVM audio*/
-				else if ((streamType==GF_STREAM_AUDIO) && ((oti==GPAC_OTI_AUDIO_EVRC_VOICE) || (oti==GPAC_OTI_AUDIO_SMV_VOICE)) ) {
+				else if ((streamType==GF_STREAM_AUDIO) && ((codecid==GF_CODECID_EVRC) || (codecid==GF_CODECID_SMV)) ) {
 					hintType = GF_RTP_PAYT_EVRC_SMV;
 					required_rate = 8000;
 					streamType = GF_STREAM_AUDIO;
@@ -387,13 +373,13 @@
 				}
 				/*visual streams*/
 				else if (streamType==GF_STREAM_VISUAL) {
-					if (oti==GPAC_OTI_VIDEO_MPEG4_PART2) {
+					if ((codecid==GF_CODECID_MPEG4_PART2) && esd->decoderConfig->decoderSpecificInfo) {
 						GF_M4VDecSpecInfo dsi;
 						gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 						PL_ID = dsi.VideoPL;
 					}
 					/*MPEG1/2 video*/
-					if ( ((oti>=GPAC_OTI_VIDEO_MPEG2_SIMPLE) && (oti<=GPAC_OTI_VIDEO_MPEG2_422)) || (oti==GPAC_OTI_VIDEO_MPEG1)) {
+					if ( ((codecid>=GF_CODECID_MPEG2_SIMPLE) && (codecid<=GF_CODECID_MPEG2_422)) || (codecid==GF_CODECID_MPEG1)) {
 						if (!is_crypted) {
 							hintType = GF_RTP_PAYT_MPEG12_VIDEO;
 							OfficialPayloadID = 32;
@@ -402,8 +388,8 @@
 					/*for ISMA*/
 					if (is_crypted) {
 						/*that's another pain with ISMACryp, even if no B-frames the DTS is signaled...*/
-						if (oti==GPAC_OTI_VIDEO_MPEG4_PART2) force_dts_delta = 22;
-						else if ((oti==GPAC_OTI_VIDEO_AVC) || (oti==GPAC_OTI_VIDEO_SVC)) {
+						if (codecid==GF_CODECID_MPEG4_PART2) force_dts_delta = 22;
+						else if ((codecid==GF_CODECID_AVC) || (codecid==GF_CODECID_SVC)) {
 							flags &= ~GP_RTP_PCK_USE_MULTI;
 							force_dts_delta = 22;
 						}
@@ -425,7 +411,7 @@
 			streamType = GF_STREAM_VISUAL;
 			OfficialPayloadID = 34;
 			/*not 100% compliant (short header is missing) but should still work*/
-			oti = GPAC_OTI_VIDEO_MPEG4_PART2;
+			codecid = GF_CODECID_MPEG4_PART2;
 			PL_ID = 0x01;
 			break;
 		case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -452,6 +438,12 @@
 			GF_AVCConfig *avcc = gf_isom_avc_config_get(file, TrackNum, 1);
 			GF_AVCConfig *svcc = gf_isom_svc_config_get(file, TrackNum, 1);
 			GF_AVCConfig *mvcc = gf_isom_mvc_config_get(file, TrackNum, 1);
+
+			if (!avcc && !svcc && !mvcc) {
+				*e = GF_NON_COMPLIANT_BITSTREAM;
+				return NULL;
+			}
+
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
 			hintType = GF_RTP_PAYT_H264_AVC;
 			if (TrackMediaSubType==GF_ISOM_SUBTYPE_SVC_H264)
@@ -460,7 +452,7 @@
 				hintType = GF_RTP_PAYT_H264_SVC;
 			streamType = GF_STREAM_VISUAL;
 			avc_nalu_size = avcc ? avcc->nal_unit_size : svcc ? svcc->nal_unit_size : mvcc->nal_unit_size;
-			oti = GPAC_OTI_VIDEO_AVC;
+			codecid = GF_CODECID_AVC;
 			PL_ID = 0x0F;
 			gf_odf_avc_cfg_del(avcc);
 			gf_odf_avc_cfg_del(svcc);
@@ -471,13 +463,16 @@
 		case GF_ISOM_SUBTYPE_HVC2:
 		case GF_ISOM_SUBTYPE_HEV2:
 		{
-			GF_HEVCConfig *hevcc = NULL;
-			hevcc = gf_isom_hevc_config_get(file, TrackNum, 1);
+			GF_HEVCConfig *hevcc = gf_isom_hevc_config_get(file, TrackNum, 1);
+			if (!hevcc) {
+				*e = GF_NON_COMPLIANT_BITSTREAM;
+				return NULL;
+			}
 			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
 			hintType = GF_RTP_PAYT_HEVC;
 			streamType = GF_STREAM_VISUAL;
 			avc_nalu_size = hevcc->nal_unit_size;
-			oti = GPAC_OTI_VIDEO_HEVC;
+			codecid = GF_CODECID_HEVC;
 			PL_ID = 0x0F;
 			flags |= GP_RTP_PCK_USE_MULTI;
 			gf_odf_hevc_cfg_del(hevcc);
@@ -488,7 +483,7 @@
 			required_rate = 8000;
 			hintType = GF_RTP_PAYT_QCELP;
 			streamType = GF_STREAM_AUDIO;
-			oti = GPAC_OTI_AUDIO_13K_VOICE;
+			codecid = GF_CODECID_QCELP;
 			OfficialPayloadID = 12;
 			nb_ch = 1;
 			break;
@@ -497,12 +492,17 @@
 			required_rate = 8000;
 			hintType = GF_RTP_PAYT_EVRC_SMV;
 			streamType = GF_STREAM_AUDIO;
-			oti = (TrackMediaSubType==GF_ISOM_SUBTYPE_3GP_EVRC) ? GPAC_OTI_AUDIO_EVRC_VOICE : GPAC_OTI_AUDIO_SMV_VOICE;
+			codecid = (TrackMediaSubType==GF_ISOM_SUBTYPE_3GP_EVRC) ? GF_CODECID_EVRC : GF_CODECID_SMV;
 			nb_ch = 1;
 			break;
 		case GF_ISOM_SUBTYPE_3GP_DIMS:
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 			hintType = GF_RTP_PAYT_3GPP_DIMS;
 			streamType = GF_STREAM_SCENE;
+#else
+			hintType = 0;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTP Packetizer] 3GPP DIMS over RTP disabled in build\n", streamType));
+#endif
 			break;
 		case GF_ISOM_SUBTYPE_AC3:
 			hintType = GF_RTP_PAYT_AC3;
@@ -512,13 +512,20 @@
 		case GF_ISOM_SUBTYPE_MP3:
 		{
 			GF_ISOSample *samp = gf_isom_get_sample(file, TrackNum, 1, NULL);
-			u32 hdr = GF_4CC((u8)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
-			nb_ch = gf_mp3_num_channels(hdr);
-			gf_isom_sample_del(&samp);
+			if (samp && (samp->dataLength>3)) {
+				u32 hdr = GF_4CC((u32)samp->data[0], (u8)samp->data[1], (u8)samp->data[2], (u8)samp->data[3]);
+				nb_ch = gf_mp3_num_channels(hdr);
+			} else {
+				u32 bps;
+				gf_isom_get_audio_info(file, TrackNum, 1, &required_rate, &nb_ch, &bps);
+			}
 			hintType = GF_RTP_PAYT_MPEG12_AUDIO;
 			/*use official RTP/AVP payload type*/
 			OfficialPayloadID = 14;
 			required_rate = 90000;
+
+			if (samp)
+				gf_isom_sample_del(&samp);
 		}
 		break;
 		default:
@@ -613,7 +620,7 @@
 
 	//init the builder
 	gf_rtp_builder_init(tmp->rtp_p, PayloadID, Path_MTU, max_ptime,
-	                    streamType, oti, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
+	                    streamType, codecid, PL_ID, MinSize, MaxSize, avgTS, maxDTSDelta, IV_length, KI_length, mpeg4mode);
 
 	/*ISMA compliance is a pain...*/
 	if (force_dts_delta) tmp->rtp_p->slMap.DTSDeltaLength = force_dts_delta;
@@ -631,7 +638,7 @@
 	gf_isom_rtp_set_timescale(file, tmp->HintTrack, descIndex, my_sl.timestampResolution);
 
 	if (hintType==GF_RTP_PAYT_MPEG4) {
-		tmp->rtp_p->slMap.ObjectTypeIndication = oti;
+		tmp->rtp_p->slMap.CodecID = codecid;
 		/*set this SL for extraction.*/
 		gf_isom_set_extraction_slc(file, TrackNum, 1, &my_sl);
 	}
@@ -706,7 +713,7 @@
 	e = GF_OK;
 	for (i=0; i<tkHint->TotalSample; i++) {
 		samp = gf_isom_get_sample(tkHint->file, tkHint->TrackNum, i+1, &descIndex);
-		if (!samp) return GF_IO_ERR;
+		if (!samp) return gf_isom_last_error(tkHint->file);
 
 		//setup SL
 		tkHint->CurrentSample = i + 1;
@@ -735,7 +742,7 @@
 			gf_free(samp->data);
 			samp->data = s->data;
 			samp->dataLength = s->dataLength;
-			gp_rtp_builder_set_cryp_info(tkHint->rtp_p, s->IV, (char*)s->key_indicator, (s->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? 1 : 0);
+			gf_rtp_builder_set_cryp_info(tkHint->rtp_p, s->IV, (char*)s->key_indicator, (s->flags & GF_ISOM_ISMA_IS_ENCRYPTED) ? 1 : 0);
 			s->data = NULL;
 			s->dataLength = 0;
 			gf_isom_ismacryp_delete_sample(s);
@@ -762,6 +769,10 @@
 			while (remain) {
 				size = 0;
 				v = tkHint->avc_nalu_size;
+				if (v>remain) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp hinter] Broken AVC nalu encapsulation: NALU size length is %d but only %d bytes left in sample %d\n", v, remain, tkHint->CurrentSample));
+					break;
+				}
 				while (v) {
 					size |= (u8) *ptr;
 					ptr++;
@@ -855,11 +866,11 @@
 	char sdpLine[20000];
 	char mediaName[30], payloadName[30];
     u32 mtype;
-    
+
 	Width = Height = 0;
 	gf_isom_sdp_clean_track(tkHint->file, tkHint->TrackNum);
     mtype = gf_isom_get_media_type(tkHint->file, tkHint->TrackNum);
-    if (gf_isom_is_video_subtype(mtype))
+    if (gf_isom_is_video_handler_type(mtype))
 		gf_isom_get_visual_info(tkHint->file, tkHint->TrackNum, 1, &Width, &Height);
 
 	gf_rtp_builder_get_payload_name(tkHint->rtp_p, payloadName, mediaName);
@@ -898,7 +909,42 @@
 	}
 	/*Text*/
 	else if (tkHint->rtp_p->rtp_payt == GF_RTP_PAYT_3GPP_TEXT) {
-		gf_media_format_ttxt_sdp(tkHint->rtp_p, payloadName, sdpLine, tkHint->file, tkHint->TrackNum);
+		u32 w, h, i, m_w, m_h;
+		s32 tx, ty;
+		s16 l;
+
+		gf_isom_get_track_layout_info(tkHint->file, tkHint->TrackNum, &w, &h, &tx, &ty, &l);
+		m_w = w;
+		m_h = h;
+		for (i=0; i<gf_isom_get_track_count(tkHint->file); i++) {
+			switch (gf_isom_get_media_type(tkHint->file, i+1)) {
+			case GF_ISOM_MEDIA_SCENE:
+			case GF_ISOM_MEDIA_VISUAL:
+			case GF_ISOM_MEDIA_AUXV:
+			case GF_ISOM_MEDIA_PICT:
+				gf_isom_get_track_layout_info(tkHint->file, i+1, &w, &h, &tx, &ty, &l);
+				if (w>m_w) m_w = w;
+				if (h>m_h) m_h = h;
+				break;
+			default:
+				break;
+			}
+		}
+
+		gf_media_format_ttxt_sdp(tkHint->rtp_p, payloadName, sdpLine, w, h, tx, ty, l, m_w, m_h, NULL);
+
+		strcat(sdpLine, "; tx3g=");
+		for (i=0; i<gf_isom_get_sample_description_count(tkHint->file, tkHint->TrackNum); i++) {
+			u8 *tx3g;
+			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);
+			len = gf_base64_encode(tx3g, tx3g_len, buffer, 2000);
+			gf_free(tx3g);
+			buffer[len] = 0;
+			if (i) strcat(sdpLine, ", ");
+			strcat(sdpLine, buffer);
+		}
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 	}
 	/*EVRC/SMV in non header-free mode*/
@@ -951,7 +997,7 @@
 	/*MPEG-4 Audio LATM*/
 	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_LATM) {
 		GF_BitStream *bs;
-		char *config_bytes;
+		u8 *config_bytes;
 		u32 config_size;
 
 		/* form config string */
@@ -982,15 +1028,16 @@
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 		gf_free(config_bytes);
 	}
+#if GPAC_ENABLE_3GPP_DIMS_RTP
 	/*3GPP DIMS*/
 	else if (tkHint->rtp_p->rtp_payt==GF_RTP_PAYT_3GPP_DIMS) {
 		GF_DIMSDescription dims;
-		char fmt[200];
 		gf_isom_get_visual_info(tkHint->file, tkHint->TrackNum, 1, &Width, &Height);
 
 		gf_isom_get_dims_description(tkHint->file, tkHint->TrackNum, 1, &dims);
 		sprintf(sdpLine, "a=fmtp:%d Version-profile=%d", tkHint->rtp_p->PayloadType, dims.profile);
 		if (! dims.fullRequestHost) {
+			char fmt[200];
 			strcat(sdpLine, ";useFullRequestHost=0");
 			sprintf(fmt, ";pathComponents=%d", dims.pathComponents);
 			strcat(sdpLine, fmt);
@@ -1013,6 +1060,7 @@
 		}
 		gf_isom_sdp_add_track_line(tkHint->file, tkHint->HintTrack, sdpLine);
 	}
+#endif
 	/*extensions for some mobile phones*/
 	if (Width && Height) {
 		sprintf(sdpLine, "a=framesize:%d %d-%d", tkHint->rtp_p->PayloadType, Width, Height);
@@ -1025,7 +1073,7 @@
 			sprintf(sdpLine, "a=rvc-config-predef:%d", esd->decoderConfig->predefined_rvc_config);
 		} else {
 			/*temporary ...*/
-			if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
+			if ((esd->decoderConfig->objectTypeIndication==GF_CODECID_AVC) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_SVC)) {
 				sprintf(sdpLine, "a=rvc-config:%s", "http://download.tsi.telecom-paristech.fr/gpac/RVC/rvc_config_avc.xml");
 			} else {
 				sprintf(sdpLine, "a=rvc-config:%s", "http://download.tsi.telecom-paristech.fr/gpac/RVC/rvc_config_sp.xml");
@@ -1035,12 +1083,12 @@
 	}
 	if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
 
-	gf_isom_set_track_enabled(tkHint->file, tkHint->HintTrack, 1);
+	gf_isom_set_track_enabled(tkHint->file, tkHint->HintTrack, GF_TRUE);
 	return GF_OK;
 }
 
 GF_EXPORT
-Bool gf_hinter_can_embbed_data(char *data, u32 data_size, u32 streamType)
+Bool gf_hinter_can_embbed_data(u8 *data, u32 data_size, u32 streamType)
 {
 	char data64[5000];
 	u32 size64;
@@ -1070,11 +1118,10 @@
 	u32 i, sceneT, odT, descIndex, size, size64;
 	GF_InitialObjectDescriptor *iod;
 	GF_SLConfig slc;
-	GF_ESD *esd;
 	GF_ISOSample *samp;
 	Bool remove_ocr;
-	char *buffer;
-	char buf64[5000], sdpLine[2300];
+	u8 *buffer;
+	char buf64[5000], sdpLine[5100];
 
 
 	gf_isom_sdp_clean(file);
@@ -1084,10 +1131,10 @@
 		gf_isom_sdp_add_line(file, buf64);
 	}
     //xtended attribute for copyright
-    if (gf_isom_drop_date_version_info_enabled(file)) {
+    if (gf_sys_is_test_mode()) {
         sprintf(buf64, "a=x-copyright: %s", "MP4/3GP File hinted with GPAC - (c) Telecom ParisTech (http://gpac.io)");
     } else {
-        sprintf(buf64, "a=x-copyright: %s", "MP4/3GP File hinted with GPAC " GPAC_FULL_VERSION " (C)2000-2016 - http://gpac.io");
+        sprintf(buf64, "a=x-copyright: MP4/3GP File hinted with GPAC %s - %s", gf_gpac_version(), gf_gpac_copyright() );
     }
 	gf_isom_sdp_add_line(file, buf64);
 
@@ -1120,6 +1167,7 @@
 
 	/*rewrite an IOD with good SL config - embbed data if possible*/
 	if (IOD_Profile == GF_SDP_IOD_ISMA) {
+		GF_ESD *esd;
 		Bool is_ok = 1;
 		while (gf_list_count(iod->ESDescriptors)) {
 			esd = (GF_ESD*)gf_list_get(iod->ESDescriptors, 0);
@@ -1206,10 +1254,10 @@
 				esd = gf_isom_get_esd(file, i+1, 1);
 				if (!esd) continue;
 				if (esd->decoderConfig->streamType==GF_STREAM_VISUAL) {
-					if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) has_i_v ++;
+					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==GPAC_OTI_AUDIO_AAC_MPEG4) has_i_a ++;
+					if (esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4) has_i_a ++;
 					else has_a++;
 				}
 				gf_odf_desc_del((GF_Descriptor *)esd);

gpac-0.8.0.tar.gz/src/media_tools/isom_tools.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -32,85 +32,128 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_EXPORT
-GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den, Bool force_par)
+GF_Err gf_media_change_par(GF_ISOFile *file, u32 track, s32 ar_num, s32 ar_den, Bool force_par, Bool rewrite_bs)
 {
-	u32 tk_w, tk_h, stype;
+	u32 tk_w, tk_h;
 	GF_Err e;
+	Bool get_par_info = GF_FALSE;
 
 	e = gf_isom_get_visual_info(file, track, 1, &tk_w, &tk_h);
 	if (e) return e;
 
-	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)
-	   ) {
+	if ((ar_num < 0) || (ar_den < 0)) {
+		get_par_info = GF_TRUE;
+		rewrite_bs = GF_FALSE;
+	}
+	else if (!ar_num || !ar_den) {
+		rewrite_bs = GF_FALSE;
+	}
+
+	if (get_par_info || rewrite_bs) {
+		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)
+		   ) {
 #ifndef GPAC_DISABLE_AV_PARSERS
-		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
-		gf_media_avc_change_par(avcc, ar_num, ar_den);
-		e = gf_isom_avc_config_update(file, track, 1, avcc);
-		gf_odf_avc_cfg_del(avcc);
-		if (e) return e;
+			GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
+			if (rewrite_bs) {
+				gf_media_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);
+				if (sl) {
+					gf_avc_get_sps_info(sl->data, sl->size, NULL, NULL, NULL, &ar_num, &ar_den);
+				} else {
+					ar_num = ar_den = 0;
+				}
+			}
+			gf_odf_avc_cfg_del(avcc);
+			if (e) return e;
 #endif
-	}
+		}
 #if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
-	else if (stype==GF_ISOM_SUBTYPE_HVC1) {
-		GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
-		gf_media_hevc_change_par(hvcc, ar_num, ar_den);
-		e = gf_isom_hevc_config_update(file, track, 1, hvcc);
-		gf_odf_hevc_cfg_del(hvcc);
-		if (e) return e;
-	}
+		else if (stype==GF_ISOM_SUBTYPE_HVC1) {
+			GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
+			if (rewrite_bs) {
+				gf_media_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;
+				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);
+						if (sl)
+							gf_hevc_get_sps_info(sl->data, sl->size, NULL, NULL, NULL, &ar_num, &ar_den);
+						break;
+					}
+				}
+			}
+			gf_odf_hevc_cfg_del(hvcc);
+			if (e) return e;
+		}
 #endif
 #if !defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)
-	else if (stype == GF_ISOM_SUBTYPE_AV01) {
-		assert(0);
-		//GF_AV1Config *av1c = gf_isom_av1_config_get(file, track, 1);
-		//gf_media_hevc_change_par(av1c, ar_num, ar_den);
-		//TODO: e = gf_isom_av1_config_update(file, track, 1, av1c);
-		//gf_odf_av1_cfg_del(av1c);
-		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) ) {
-			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
+		else if (stype == GF_ISOM_SUBTYPE_AV01) {
+			//GF_AV1Config *av1c = gf_isom_av1_config_get(file, track, 1);
+			//TODO: e = gf_isom_av1_config_update(file, track, 1, av1c);
+			//gf_odf_av1_cfg_del(av1c);
+			//if (e) return e;
 			return GF_NOT_SUPPORTED;
 		}
+#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) ) {
+				if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
+				return GF_NOT_SUPPORTED;
+			}
 #ifndef GPAC_DISABLE_AV_PARSERS
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-			e = gf_m4v_rewrite_par(&esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength, ar_num, ar_den);
-			if (!e) e = gf_isom_change_mpeg4_description(file, track, 1, esd);
-			gf_odf_desc_del((GF_Descriptor *) esd);
-			if (e) return e;
-		}
+			if (esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) {
+				if (rewrite_bs) {
+					e = gf_m4v_rewrite_par(&esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength, ar_num, ar_den);
+					if (!e) e = gf_isom_change_mpeg4_description(file, track, 1, esd);
+				} else {
+					GF_M4VDecSpecInfo dsi;
+					e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+					ar_num = dsi.par_num;
+					ar_den = dsi.par_den;
+				}
+				gf_odf_desc_del((GF_Descriptor *) esd);
+				if (e) return e;
+			}
 #endif
-	} else {
-        u32 mtype = gf_isom_get_media_type(file, track);
-		if (gf_isom_is_video_subtype(mtype)) {
-			u32 stype = gf_isom_get_media_subtype(file, track, 1);
-			char *cstype = (char*)&stype;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER,
-				("[ISOBMF] Error: changing pixel ratio of media subtype \"%c%c%c%c\" is not unsupported\n",
-					cstype[3], cstype[2], cstype[1], cstype[0]));
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("                - note that inband doesn't allow PAR change.\n"));
-			return GF_NOT_SUPPORTED;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Error: changing pixel ratio on non-video track.\n"));
-			return GF_BAD_PARAM;
+			u32 mtype = gf_isom_get_media_type(file, track);
+			if (gf_isom_is_video_handler_type(mtype)) {
+				if (rewrite_bs) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER,
+						("[ISOBMF] Warning: changing pixel ratio of media subtype \"%s\" is not supported, changing only \"pasp\" signaling\n",
+							gf_4cc_to_str(gf_isom_get_media_subtype(file, track, 1)) ));
+				}
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISOBMF] Error: changing pixel ratio on non-video track.\n"));
+				return GF_BAD_PARAM;
+			}
+		}
+		//auto mode
+		if (get_par_info && ((ar_num<=0) || (ar_den<=0))) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[ISOBMF] No sample AR info present in sample description, ignoring SAR update\n"));
+			if (force_par)
+				return gf_isom_set_pixel_aspect_ratio(file, track, 1, 1, 1, force_par);
+			return GF_OK;
 		}
 	}
-
 	e = gf_isom_set_pixel_aspect_ratio(file, track, 1, ar_num, ar_den, force_par);
 	if (e) return e;
 
-	if ((ar_den>=0) && (ar_num>=0)) {
-		if (ar_den) tk_w = tk_w * ar_num / ar_den;
-		else if (ar_num) tk_h = tk_h * ar_den / ar_num;
+	if ((ar_den>0) && (ar_num>0)) {
+		tk_w = tk_w * ar_num / ar_den;
 	}
-	/*revert to full frame for track layout*/
+	/*PASP has been removed or forced to 1:1, revert to full frame for track layout*/
 	else {
 		e = gf_isom_get_visual_info(file, track, 1, &tk_w, &tk_h);
 		if (e) return e;
@@ -171,7 +214,7 @@
 #ifdef GPAC_DISABLE_CORE_TOOLS
 	return GF_NOT_SUPPORTED;
 #else
-	u8 block[1024];
+	u8 block[4096];
 	u32 read;
 	u64 size, tot;
 	FILE *in;
@@ -184,9 +227,7 @@
 
 	in = gf_fopen(file, "rb");
     if (!in) return GF_URL_ERROR;
-	gf_fseek(in, 0, SEEK_END);
-	size = gf_ftell(in);
-	gf_fseek(in, 0, SEEK_SET);
+	size = gf_fsize(in);
 
 	ctx = gf_sha1_starts();
 	tot = 0;
@@ -200,20 +241,24 @@
 			u64 box_size = gf_bs_peek_bits(bs, 32, 0);
 			u32 box_type = gf_bs_peek_bits(bs, 32, 4);
 
-			/*till end of file*/
-			if (!box_size) box_size = size-tot;
 			/*64-bit size*/
-			else if (box_size==1) box_size = gf_bs_peek_bits(bs, 64, 8);
+			if (box_size==1) box_size = gf_bs_peek_bits(bs, 64, 8);
+			/*till end of file*/
+			if (!box_size) box_size = size - tot;
 
 			/*skip all MutableDRMInformation*/
 			if (box_type==GF_ISOM_BOX_TYPE_MDRI) {
 				gf_bs_skip_bytes(bs, box_size);
 				tot += box_size;
 			} else {
-				u32 bsize = 0;
+				u64 bsize = 0;
 				while (bsize<box_size) {
-					u32 to_read = (u32) ((box_size-bsize<1024) ? (box_size-bsize) : 1024);
-					gf_bs_read_data(bs, (char *) block, to_read);
+					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));
+						break;
+					}
 					gf_sha1_update(ctx, block, to_read);
 					bsize += to_read;
 				}
@@ -222,9 +267,10 @@
 		} else
 #endif
 		{
-			read = (u32) fread(block, 1, 1024, in);
-			if ((s32) read < 0) {
-				e = GF_IO_ERR;
+			read = (u32) gf_fread(block, 4096, in);
+			if ((s32) read <= 0) {
+				if (ferror(in))
+					e = GF_IO_ERR;
 				break;
 			}
 			gf_sha1_update(ctx, block, read);
@@ -323,7 +369,7 @@
         case GF_ISOM_MEDIA_AUXV:
         case GF_ISOM_MEDIA_PICT:
 			image_track = 0;
-			if (esd && ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_JPEG) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_IMAGE_PNG)) )
+			if (esd && ((esd->decoderConfig->objectTypeIndication==GF_CODECID_JPEG) || (esd->decoderConfig->objectTypeIndication==GF_CODECID_PNG)) )
 				image_track = 1;
 
 			/*remove image tracks if wanted*/
@@ -422,7 +468,7 @@
 			if (!w || !h) {
 				gf_isom_get_visual_info(mp4file, VideoTrack, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
-				if ((v_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) && (v_esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
+				if ((v_esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2) && (v_esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
 					GF_M4VDecSpecInfo dsi;
 					gf_m4v_get_config(v_esd->decoderConfig->decoderSpecificInfo->data, v_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 					if (!is_image && (!w || !h)) {
@@ -464,7 +510,7 @@
 			}
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-			if (a_esd->decoderConfig->objectTypeIndication == GPAC_OTI_AUDIO_AAC_MPEG4) {
+			if (a_esd->decoderConfig->objectTypeIndication == GF_CODECID_AAC_MPEG4) {
 				GF_M4ADecSpecInfo cfg;
 				gf_m4a_get_config(a_esd->decoderConfig->decoderSpecificInfo->data, a_esd->decoderConfig->decoderSpecificInfo->dataLength, &cfg);
 				audioPL = cfg.audioPL;
@@ -497,7 +543,7 @@
 
 	_esd = gf_odf_desc_esd_new(SLPredef_MP4);
 	_esd->decoderConfig->bufferSizeDB = samp->dataLength;
-	_esd->decoderConfig->objectTypeIndication = GPAC_OTI_OD_V1;
+	_esd->decoderConfig->objectTypeIndication = GF_CODECID_OD_V1;
 	_esd->decoderConfig->streamType = GF_STREAM_OD;
 	_esd->ESID = odID;
 	_esd->OCRESID = no_ocr ? 0 : bifsID;
@@ -514,7 +560,7 @@
 
 	_esd = gf_odf_desc_esd_new(SLPredef_MP4);
 	_esd->decoderConfig->bufferSizeDB = 20;
-	_esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS_V2;
+	_esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS_V2;
 	_esd->decoderConfig->streamType = GF_STREAM_SCENE;
 	_esd->ESID = bifsID;
 	_esd->OCRESID = 0;
@@ -573,8 +619,8 @@
 	gf_isom_sample_del(&samp);
 	gf_isom_set_track_interleaving_group(mp4file, bifsT, 1);
 
-	gf_isom_set_track_enabled(mp4file, bifsT, 1);
-	gf_isom_set_track_enabled(mp4file, odT, 1);
+	gf_isom_set_track_enabled(mp4file, bifsT, GF_TRUE);
+	gf_isom_set_track_enabled(mp4file, odT, GF_TRUE);
 	gf_isom_add_track_to_root_od(mp4file, bifsT);
 	gf_isom_add_track_to_root_od(mp4file, odT);
 
@@ -585,8 +631,8 @@
 	gf_isom_set_pl_indication(mp4file, GF_ISOM_PL_VISUAL, (u8) (is_image ? 0xFE : visualPL));
 
 	gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_MP42, 1);
-	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_ISOM, 1);
-	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, 1);
+	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_ISOM, GF_TRUE);
+	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, GF_TRUE);
 	return GF_OK;
 }
 
@@ -644,7 +690,7 @@
 			{
 				GF_ESD *esd = gf_isom_get_esd(mp4file, i+1, 1);
 				/*both MPEG4-Video and H264/AVC/SVC are supported*/
-				if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MVC)) {
+				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)) {
 					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) ));
@@ -676,11 +722,11 @@
 			{
 				GF_ESD *esd = gf_isom_get_esd(mp4file, i+1, 1);
 				switch (esd->decoderConfig->objectTypeIndication) {
-				case GPAC_OTI_AUDIO_13K_VOICE:
-				case GPAC_OTI_AUDIO_EVRC_VOICE:
-				case GPAC_OTI_AUDIO_SMV_VOICE:
+				case GF_CODECID_QCELP:
+				case GF_CODECID_EVRC:
+				case GF_CODECID_SMV:
 					is_3g2 = 1;
-				case GPAC_OTI_AUDIO_AAC_MPEG4:
+				case GF_CODECID_AAC_MPEG4:
 					nb_aud++;
 					break;
 				default:
@@ -728,45 +774,43 @@
 
 	if (is_3g2) {
 		gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_3G2A, 65536);
-		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP6, 0);
-		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, 0);
-		gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, 0);
+		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"));
 	} else {
 		/*update FType*/
 		if ((nb_vid>1) || (nb_aud>1) || (nb_txt>1)) {
 			/*3GPP general purpose*/
 			gf_isom_set_brand_info(mp4file, GF_ISOM_BRAND_3GG6, 1024);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP6, 0);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, 0);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, 0);
+			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"));
-		}
-		/*commented for QT compatibility, although this is correct (qt doesn't understand 3GP6 brand)*/
-		else if (nb_txt && 0) {
+		} 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, 1);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, 1);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, 0);
+			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"));
 		} 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, 1);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP5, 0);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, 0);
+			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"));
 		} else {
-			gf_isom_set_brand_info(mp4file, nb_avc ? GF_ISOM_BRAND_3GP6 : GF_ISOM_BRAND_3GP5, 0/*1024*/);
-			gf_isom_modify_alternate_brand(mp4file, nb_avc ? GF_ISOM_BRAND_3GP5 : GF_ISOM_BRAND_3GP6, 0);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GP4, 1);
-			gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_3GG6, 0);
+			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"));
 		}
 	}
 	/*add/remove MP4 brands and add isom*/
-	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_MP41, (u8) ((nb_avc||is_3g2||nb_non_mp4) ? 0 : 1));
-	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_MP42, (u8) (nb_non_mp4 ? 0 : 1));
-	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_ISOM, 1);
+	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_MP41, (u8) ((nb_avc||is_3g2||nb_non_mp4) ? GF_FALSE : GF_TRUE));
+	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_MP42, (u8) (nb_non_mp4 ? GF_FALSE : GF_TRUE));
+	gf_isom_modify_alternate_brand(mp4file, GF_ISOM_BRAND_ISOM, GF_TRUE);
 	return GF_OK;
 }
 
@@ -802,9 +846,9 @@
 		case GF_ISOM_MEDIA_VISUAL:
 		case GF_ISOM_MEDIA_AUDIO:
 			/*if no edit list, add one*/
-			if (!gf_isom_get_edit_segment_count(mp4, i+1)) {
-				gf_isom_remove_edit_segments(mp4, i+1);
-				gf_isom_append_edit_segment(mp4, i+1, gf_isom_get_track_duration(mp4, i+1), 0, GF_ISOM_EDIT_NORMAL);
+			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);
 			}
 			/*add PSP UUID*/
 			gf_isom_remove_uuid(mp4, i+1, psp_track_uuid);
@@ -819,7 +863,7 @@
 		}
 	}
 	gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_MSNV, 0);
-	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_MSNV, 1);
+	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_MSNV, GF_TRUE);
 	return GF_OK;
 }
 
@@ -827,7 +871,7 @@
 GF_Err gf_media_check_qt_prores(GF_ISOFile *mp4)
 {
 	u32 i, count, timescale, def_dur=0, video_tk=0;
-	Bool is_prores=GF_FALSE;
+	u32 prores_type = 0;
 	GF_Err e;
 	u32 colour_type=0;
 	u16 colour_primaries=0, transfer_characteristics=0, matrix_coefficients=0;
@@ -836,7 +880,6 @@
 	u32 nb_video_tracks;
 	u32 target_ts = 0, w=0, h=0, chunk_size=0;
 
-	timescale = 0;
 	nb_video_tracks = 0;
 
 	count = gf_isom_get_track_count(mp4);
@@ -851,19 +894,18 @@
 	if ((nb_video_tracks==1) && video_tk) {
 		u32 video_subtype = gf_isom_get_media_subtype(mp4, video_tk, 1);
 		switch (video_subtype) {
-		case GF_QT_BOX_TYPE_APCH:
-		case GF_QT_BOX_TYPE_APCO:
-		case GF_QT_BOX_TYPE_APCN:
-		case GF_QT_BOX_TYPE_APCS:
-		case GF_QT_BOX_TYPE_APCF:
-		case GF_QT_BOX_TYPE_AP4X:
-		case GF_QT_BOX_TYPE_AP4H:
-			is_prores=GF_TRUE;
+		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:
+			prores_type=video_subtype;
 			break;
 		}
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[QTFF/ProRes] Adjusting %s compliancy\n", is_prores ? "ProRes" : "QTFF"));
+	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[QTFF/ProRes] Adjusting %s compliancy\n", prores_type ? "ProRes" : "QTFF"));
 
 	//adjust audio tracks
 	for (i=0; i<count; i++) {
@@ -871,10 +913,9 @@
 
 		//remove bitrate info (isobmff)
 		gf_isom_update_bitrate(mp4, i+1, 1, 0, 0, 0);
-		
+
 		if (mtype==GF_ISOM_MEDIA_AUDIO) {
-			u32 sr, nb_ch;
-			u8 bps;
+			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);
 			continue;
@@ -892,8 +933,8 @@
 		return GF_OK;
 	}
 
-	if (video_tk && (nb_video_tracks>1)) {
-		if (is_prores) {
+	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));
 			return GF_BAD_PARAM;
 		}
@@ -901,16 +942,25 @@
 		return GF_OK;
 	}
 
-	if (is_prores) {
-		gf_isom_update_video_sample_entry_fields(mp4, video_tk, 1, 0, GF_4CC('a','p','p','l'), 0, 0x3FF, 72<<16, 72<<16, 1, NULL, -1);
+	if (prores_type) {
+		char *comp_name = NULL;
+		switch (prores_type) {
+		case GF_QT_SUBTYPE_APCH: comp_name = "\x0013""Apple ProRes 422 HQ"; break;
+		case GF_QT_SUBTYPE_APCO: comp_name = "\x0016""Apple ProRes 422 Proxy"; break;
+		case GF_QT_SUBTYPE_APCN: comp_name = "\x0010""Apple ProRes 422"; break;
+		case GF_QT_SUBTYPE_APCS: comp_name = "\x0013""Apple ProRes 422 LT"; break;
+		case GF_QT_SUBTYPE_AP4X: comp_name = "\x0014""Apple ProRes 4444 XQ"; break;
+		case GF_QT_SUBTYPE_AP4H: comp_name = "\x0011""Apple ProRes 4444"; break;
+		}
+		gf_isom_update_video_sample_entry_fields(mp4, video_tk, 1, 0, GF_4CC('a','p','p','l'), 0, 0x3FF, 72<<16, 72<<16, 1, comp_name, -1);
 	}
 
 	timescale = gf_isom_get_media_timescale(mp4, video_tk);
 	def_dur = gf_isom_get_constant_sample_duration(mp4, video_tk);
 	if (!def_dur) {
-		gf_isom_get_sample_duration(mp4, video_tk, 2);
+		def_dur = gf_isom_get_sample_duration(mp4, video_tk, 2);
 		if (!def_dur) {
-			gf_isom_get_sample_duration(mp4, video_tk, 1);
+			def_dur = gf_isom_get_sample_duration(mp4, video_tk, 1);
 		}
 	}
 	if (!def_dur) {
@@ -919,14 +969,48 @@
 	}
 
 	gf_isom_get_pixel_aspect_ratio(mp4, video_tk, 1, &hspacing, &vspacing);
-	if ((hspacing<=1) || (vspacing<=1))
-		gf_isom_set_pixel_aspect_ratio(mp4, video_tk, 1, -1, -1, GF_FALSE);
+	//force 1:1
+	if ((hspacing<=1) || (vspacing<=1)) {
+		hspacing = vspacing = 1;
+		gf_isom_set_pixel_aspect_ratio(mp4, video_tk, 1, 1, 1, GF_TRUE);
+	}
+
+	//patch enof/prof/clef
+	if (prores_type) {
+		gf_isom_update_aperture_info(mp4, video_tk, GF_FALSE);
+	}
 
 	//todo: patch colr
 	e = gf_isom_get_color_info(mp4, video_tk, 1, &colour_type, &colour_primaries, &transfer_characteristics, &matrix_coefficients, &full_range_flag);
 	if (e==GF_NOT_FOUND) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] No color info present in visual track, defaulting to BT709\n"));
-		gf_isom_set_visual_color_info(mp4, video_tk, 1, GF_4CC('n','c','l','c'), 1, 1, 1, GF_FALSE, NULL, 0);
+		colour_primaries = transfer_characteristics = matrix_coefficients = 0;
+		if (prores_type) {
+			u32 di;
+			GF_ISOSample *s = gf_isom_get_sample(mp4, video_tk, 1, &di);
+			if (s && s->dataLength>24) {
+				GF_BitStream *bs = gf_bs_new(s->data, s->dataLength, GF_BITSTREAM_READ);
+				gf_bs_read_u32(bs); //frame size
+				gf_bs_read_u32(bs); //frame ID
+				gf_bs_read_u32(bs); //frame header size + reserved + bs version
+				gf_bs_read_u32(bs); //encoder id
+				gf_bs_read_u32(bs); //w and h
+				gf_bs_read_u16(bs); //bunch of flags
+				colour_primaries = gf_bs_read_u8(bs);
+				transfer_characteristics = gf_bs_read_u8(bs);
+				matrix_coefficients = gf_bs_read_u8(bs);
+				gf_bs_del(bs);
+			}
+			gf_isom_sample_del(&s);
+		}
+		if (!colour_primaries) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[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_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) {
 		return e;
 	}
@@ -947,7 +1031,7 @@
 	else if (ifps>= 5996 && ifps<=6004) target_ts = 6000; //60
 
 	if (!target_ts) {
-		if (is_prores) {
+		if (prores_type) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ProRes] Unrecognized frame rate %g\n", ((Double)timescale)/def_dur ));
 			return GF_NON_COMPLIANT_BITSTREAM;
 		} else {
@@ -957,7 +1041,7 @@
 
 	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, GF_FALSE);
+		gf_isom_set_media_timescale(mp4, video_tk, target_ts, 0, GF_FALSE);
 	}
 	gf_isom_set_timescale(mp4, target_ts);
 	if ((w<=720) && (h<=576)) chunk_size = 2000000;
@@ -972,14 +1056,13 @@
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
-GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track)
+GF_ESD *gf_media_map_esd(GF_ISOFile *mp4, u32 track, u32 stsd_idx)
 {
-	u32 type;
-	GF_GenericSampleDescription *udesc;
-	GF_BitStream *bs;
 	GF_ESD *esd;
+	u32 subtype;
 
-	u32 subtype = gf_isom_get_media_subtype(mp4, track, 1);
+	if (!stsd_idx) stsd_idx = 1;
+	subtype = gf_isom_get_media_subtype(mp4, track, stsd_idx);
 	/*all types with an official MPEG-4 mapping*/
 	switch (subtype) {
 	case GF_ISOM_SUBTYPE_MPEG4:
@@ -1000,108 +1083,21 @@
 	case GF_ISOM_SUBTYPE_LHV1:
 	case GF_ISOM_SUBTYPE_LHE1:
 	case GF_ISOM_SUBTYPE_AV01:
-	case GF_ISOM_SUBTYPE_VP08:
 	case GF_ISOM_SUBTYPE_VP09:
-		return gf_isom_get_esd(mp4, track, 1);
-	}
-
-	switch (gf_isom_get_media_type(mp4, track)) {
-	case GF_ISOM_MEDIA_TEXT:
-	case GF_ISOM_MEDIA_SUBT:
-		return gf_isom_get_esd(mp4, track, 1);
-	}
-
-	if ((subtype == GF_ISOM_SUBTYPE_3GP_AMR) || (subtype == GF_ISOM_SUBTYPE_3GP_AMR_WB)) {
-		GF_3GPConfig *gpc = gf_isom_3gp_config_get(mp4, track, 1);
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-		esd->ESID = gf_isom_get_track_id(mp4, track);
-		esd->OCRESID = esd->ESID;
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		/*use private DSI*/
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		/*format ext*/
-		gf_bs_write_u32(bs, subtype);
-		gf_bs_write_u32(bs, (subtype == GF_ISOM_SUBTYPE_3GP_AMR) ? 8000 : 16000);
-		gf_bs_write_u16(bs, 1);
-		gf_bs_write_u16(bs, (subtype == GF_ISOM_SUBTYPE_3GP_AMR) ? 160 : 320);
-		gf_bs_write_u8(bs, 16);
-		gf_bs_write_u8(bs, gpc ? gpc->frames_per_sample : 0);
-		if (gpc) gf_free(gpc);
-		gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_bs_del(bs);
-		return esd;
-	}
-
-	if (subtype == GF_ISOM_SUBTYPE_3GP_H263) {
-		u32 w, h;
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-		esd->ESID = gf_isom_get_track_id(mp4, track);
-		esd->OCRESID = esd->ESID;
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		/*use private DSI*/
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		/*format ext*/
-		gf_bs_write_u32(bs, GF_ISOM_SUBTYPE_H263);
-		gf_isom_get_visual_info(mp4, track, 1, &w, &h);
-		gf_bs_write_u16(bs, w);
-		gf_bs_write_u16(bs, h);
-		gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_bs_del(bs);
-		return esd;
-	}
-
-	if (subtype == GF_ISOM_SUBTYPE_AC3) {
-		GF_AC3Config *ac3 = gf_isom_ac3_config_get(mp4, track, 1);
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-		esd->ESID = gf_isom_get_track_id(mp4, track);
-		esd->OCRESID = esd->ESID;
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = (ac3 && ac3->is_ec3) ? GPAC_OTI_AUDIO_EAC3 : GPAC_OTI_AUDIO_AC3;
-		gf_odf_desc_del((GF_Descriptor*)esd->decoderConfig->decoderSpecificInfo);
-		esd->decoderConfig->decoderSpecificInfo = NULL;
-		if (ac3) gf_free(ac3);
-		return esd;
-	}
-
-	if (subtype == GF_ISOM_SUBTYPE_MP3) {
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-		esd->ESID = gf_isom_get_track_id(mp4, track);
-		esd->OCRESID = esd->ESID;
-		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-		gf_odf_desc_del((GF_Descriptor*)esd->decoderConfig->decoderSpecificInfo);
-		esd->decoderConfig->decoderSpecificInfo = NULL;
-		return esd;
+	case GF_ISOM_SUBTYPE_VP08:
+		return gf_isom_get_esd(mp4, track, stsd_idx);
 	}
 
 	if (subtype == GF_ISOM_SUBTYPE_OPUS) {
 		esd = gf_isom_get_esd(mp4, track, 1);
 		if (!esd) return NULL;
 
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OPUS;
-		return esd;
-	}
-
-
-	if ( (subtype == GF_ISOM_SUBTYPE_JPEG) || (subtype == GF_ISOM_SUBTYPE_PNG) ) {
-		esd = gf_odf_desc_esd_new(0);
-		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-		esd->ESID = gf_isom_get_track_id(mp4, track);
-		esd->OCRESID = esd->ESID;
-		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = (subtype == GF_ISOM_SUBTYPE_JPEG) ? GPAC_OTI_IMAGE_JPEG : GPAC_OTI_IMAGE_PNG;
-		gf_odf_desc_del((GF_Descriptor*)esd->decoderConfig->decoderSpecificInfo);
-		esd->decoderConfig->decoderSpecificInfo = NULL;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_OPUS;
 		return esd;
 	}
 
 	if (subtype == GF_ISOM_SUBTYPE_3GP_DIMS) {
+		GF_BitStream *bs;
 		GF_DIMSDescription dims;
 		esd = gf_odf_desc_esd_new(0);
 		esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
@@ -1109,7 +1105,7 @@
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_SCENE;
 		/*use private DSI*/
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_DIMS;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_DIMS;
 		gf_isom_get_dims_description(mp4, track, 1, &dims);
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		/*format ext*/
@@ -1125,42 +1121,11 @@
 		gf_bs_del(bs);
 		return esd;
 	}
-
-	type = gf_isom_get_media_type(mp4, track);
-	if ((type != GF_ISOM_MEDIA_AUDIO) && !gf_isom_is_video_subtype(type)) return NULL;
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->OCRESID = esd->ESID = gf_isom_get_track_id(mp4, track);
-	esd->slConfig->useTimestampsFlag = 1;
-	esd->slConfig->timestampResolution = gf_isom_get_media_timescale(mp4, track);
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_GENERIC;
-	esd->decoderConfig->streamType = (type == GF_ISOM_MEDIA_AUDIO) ? GF_STREAM_AUDIO : GF_STREAM_VISUAL;
-	/*format ext*/
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_bs_write_u32(bs, subtype);
-	udesc = gf_isom_get_generic_sample_description(mp4, track, 1);
-	if (udesc) {
-		if (type==GF_ISOM_MEDIA_AUDIO) {
-			esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-			gf_bs_write_u32(bs, udesc->samplerate);
-			gf_bs_write_u16(bs, udesc->nb_channels);
-			gf_bs_write_u16(bs, 0);
-			gf_bs_write_u8(bs, udesc->bits_per_sample);
-			gf_bs_write_u8(bs, 0);
-		} else {
-			esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-			gf_bs_write_u16(bs, udesc->width);
-			gf_bs_write_u16(bs, udesc->height);
-		}
-		if (udesc->extension_buf_size) {
-			gf_bs_write_data(bs, udesc->extension_buf, udesc->extension_buf_size);
-			gf_free(udesc->extension_buf);
-		}
-		gf_free(udesc);
+	if (mp4->convert_streaming_text && ((subtype == GF_ISOM_SUBTYPE_TEXT) || (subtype == GF_ISOM_SUBTYPE_TX3G))
+	) {
+		return gf_isom_get_esd(mp4, track, stsd_idx);
 	}
-	gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(bs);
-	return esd;
+	return NULL;
 }
 
 GF_EXPORT
@@ -1192,7 +1157,7 @@
 		esd->ESID = (u16)item_id;
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_HEVC;
 		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
 		if (e == GF_OK && props.config) {
 			gf_odf_hevc_cfg_write(((GF_HEVCConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
@@ -1210,7 +1175,7 @@
 		esd->ESID = (u16)item_id;
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_AVC;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_AVC;
 		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
 		if (e == GF_OK && props.config) {
 			gf_odf_avc_cfg_write(((GF_AVCConfigurationBox *)props.config)->config, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
@@ -1228,7 +1193,7 @@
 		esd->ESID = (u16)item_id;
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_IMAGE_JPEG;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_JPEG;
 		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
 		if (e == GF_OK && props.config) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("JPEG image item decoder config not supported, patch welcome\n"));
@@ -1246,8 +1211,11 @@
 		esd->ESID = (u16)item_id;
 		esd->OCRESID = esd->ESID;
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_IMAGE_PNG;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_PNG;
 		e = gf_isom_get_meta_image_props(mp4, GF_TRUE, 0, item_id, &props);
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Error fetching item properties %s\n", gf_error_to_string(e) ));
+		}
 		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
 		esd->slConfig->useTimestampsFlag = 1;
 		esd->slConfig->timestampResolution = 1000;
@@ -1316,6 +1284,7 @@
 	return DQId;
 }
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 static Bool gf_isom_has_svc_explicit(GF_ISOFile *file, u32 track)
 {
 	GF_AVCConfig *svccfg;
@@ -1339,7 +1308,7 @@
 		}
 	}
 
-	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	gf_odf_avc_cfg_del(svccfg);
 	return ret;
 }
 
@@ -1359,11 +1328,13 @@
 
 	return max_id;
 }
+#endif
 
 /* Split SVC layers */
 GF_EXPORT
 GF_Err gf_media_split_svc(GF_ISOFile *file, u32 track, Bool splitAll)
 {
+#ifndef GPAC_DISABLE_AV_PARSERS
 	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;
@@ -1373,7 +1344,7 @@
 	GF_ISOSample *samp, *dst_samp;
 	GF_BitStream *bs, *dst_bs;
 	GF_BitStream ** sample_bs;
-	u8 nal_type, nal_hdr, track_ref_index;
+	u8 nal_type, track_ref_index;
 	char *buffer;
 	s32 *sps_track, *sps, *pps;
 	u64 offset;
@@ -1501,14 +1472,16 @@
 		is_subseq_pps[i] = 0;
 	while (gf_bs_available(bs))
 	{
+		gf_bs_enable_emulation_byte_removal(bs, GF_FALSE);
 		size = gf_bs_read_int(bs, nalu_size_length);
 		if (size>max_size) {
 			buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
 			max_size = size;
 		}
-		nal_hdr = gf_bs_read_u8(bs);
-		nal_type = nal_hdr & 0x1F;
-		gf_media_avc_parse_nalu(bs, nal_hdr, &avc);
+
+		gf_media_avc_parse_nalu(bs, &avc);
+		nal_type = avc.last_nal_type_parsed;
+
 		e = gf_bs_seek(bs, offset+nalu_size_length/8);
 		if (e)
 			goto exit;
@@ -1558,7 +1531,7 @@
 			e = gf_isom_last_error(file);
 			goto exit;
 		}
-		gf_isom_set_track_enabled(file, svc_track, 1);
+		gf_isom_set_track_enabled(file, svc_track, GF_TRUE);
 		gf_isom_set_track_reference(file, svc_track, GF_ISOM_REF_BASE, ref_trackID);
 		cfg = gf_odf_avc_cfg_new();
 		cfg->complete_representation = 1; //SVC
@@ -1724,14 +1697,15 @@
 		offset = 0;
 		while (gf_bs_available(bs))
 		{
+			gf_bs_enable_emulation_byte_removal(bs, GF_FALSE);
 			size = gf_bs_read_int(bs, nalu_size_length);
 			if (size>max_size) {
 				buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
 				max_size = size;
 			}
-			nal_hdr = gf_bs_read_u8(bs);
-			nal_type = nal_hdr & 0x1F;
-			gf_media_avc_parse_nalu(bs, nal_hdr, &avc);
+
+			gf_media_avc_parse_nalu(bs, &avc);
+			nal_type = avc.last_nal_type_parsed;
 			e = gf_bs_seek(bs, offset+nalu_size_length/8);
 			if (e)
 				goto exit;
@@ -1740,7 +1714,7 @@
 
 			switch (nal_type) {
 			case GF_AVC_NALU_PIC_PARAM:
-				pps_id = gf_media_avc_read_pps(buffer, size, &avc);
+				pps_id = avc.last_ps_idx;
 				j = 0;
 				dst_track = 0;
 				while (j < num_pps)
@@ -1768,7 +1742,7 @@
 				dst_bs = sample_bs[dst_track];
 				break;
 			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-				sps_id = gf_media_avc_read_sps(buffer, size, &avc, 0, NULL);
+				sps_id = avc.last_ps_idx;
 				dst_track = 0;
 				if (splitAll)
 				{
@@ -1849,14 +1823,14 @@
 	{
 		if (first_DTS_track[t])
 		{
-			u32 media_ts, moov_ts, offset;
+			u32 media_ts, moov_ts, ts_offset;
 			u64 dur;
 			media_ts = gf_isom_get_media_timescale(file, t);
 			moov_ts = gf_isom_get_timescale(file);
-			offset = (u32)(first_DTS_track[t]) * moov_ts / media_ts;
+			ts_offset = (u32)(first_DTS_track[t]) * moov_ts / media_ts;
 			dur = gf_isom_get_media_duration(file, t) * moov_ts / media_ts;
-			gf_isom_set_edit_segment(file, t, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
-			gf_isom_set_edit_segment(file, t, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
+			gf_isom_set_edit(file, t, 0, ts_offset, 0, GF_ISOM_EDIT_EMPTY);
+			gf_isom_set_edit(file, t, ts_offset, dur, 0, GF_ISOM_EDIT_NORMAL);
 		}
 	}
 
@@ -1938,6 +1912,10 @@
 	if (is_subseq_pps) gf_free(is_subseq_pps);
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+
 }
 
 /* Merge SVC layers*/
@@ -1954,7 +1932,8 @@
 	u32 *list_track_sorted, *cur_sample, *max_sample;
 	u64 *DTS_offset;
 	u64 EditTime, SegmentDuration, MediaTime;
-	u8 EditMode, nal_type;
+	GF_ISOEditType EditMode;
+	u8 nal_type;
 	Bool first_sample;
 	u64 first_DTS, offset, dur;
 	GF_AVCConfigSlot *slc, *sl;
@@ -1986,7 +1965,9 @@
 	}
 
 	list_track_sorted = (u32 *) gf_malloc(num_track * sizeof(u32));
+	memset(list_track_sorted, 0, num_track * sizeof(u32));
 	DQId = (s32 *) gf_malloc(num_track * sizeof(s32));
+	memset(DQId, 0, num_track * sizeof(s32));
 	count = 0;
 	for (t = 1; t <= num_track; t++) {
 		u32 pos = 0;
@@ -2015,7 +1996,7 @@
 	}
 
 	merge_track = list_track_sorted[0];
-	gf_isom_set_track_enabled(file, merge_track, 1);
+	gf_isom_set_track_enabled(file, merge_track, GF_TRUE);
 	/*rewrite svccfg*/
 	svccfg = gf_odf_avc_cfg_new();
 	svccfg->complete_representation = 1;
@@ -2079,22 +2060,17 @@
 	}
 
 	DTS_offset = (u64 *) gf_malloc(count * sizeof(u64));
-	for (t = 0; t < count; t++)
-	{
-		nb_EditList = gf_isom_get_edit_segment_count(file, list_track_sorted[t]);
-		if (!nb_EditList)
-			DTS_offset[t] = 0;
-		else
-		{
+	for (t = 0; t < count; t++) {
+		DTS_offset[t] = 0;
+		nb_EditList = gf_isom_get_edits_count(file, list_track_sorted[t]);
+		if (nb_EditList) {
 			media_ts = gf_isom_get_media_timescale(file, list_track_sorted[t]);
 			moov_ts = gf_isom_get_timescale(file);
-			for (i = 1; i <= nb_EditList; i++)
-			{
-				e = gf_isom_get_edit_segment(file, list_track_sorted[t], i, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
+			for (i = 1; i <= nb_EditList; i++) {
+				e = gf_isom_get_edit(file, list_track_sorted[t], i, &EditTime, &SegmentDuration, &MediaTime, &EditMode);
 				if (e) goto exit;
 
-				if (!EditMode)
-				{
+				if (!EditMode) {
 					DTS_offset[t] = SegmentDuration * media_ts / moov_ts;
 				}
 			}
@@ -2217,8 +2193,8 @@
 		moov_ts = gf_isom_get_timescale(file);
 		offset = (u32)(first_DTS) * moov_ts / media_ts;
 		dur = gf_isom_get_media_duration(file, merge_track) * moov_ts / media_ts;
-		gf_isom_set_edit_segment(file, merge_track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
-		gf_isom_set_edit_segment(file, merge_track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
+		gf_isom_set_edit(file, merge_track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
+		gf_isom_set_edit(file, merge_track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
 	}
 
 	/*Delete SVC track(s) that references to ref_track*/
@@ -2251,14 +2227,14 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_HEVC
+#ifndef GPAC_DISABLE_AV_PARSERS
 /* Split LHVC layers */
 static GF_HEVCParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type)
 {
 	GF_HEVCParamArray *ar;
 	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
 	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = gf_list_get(hevc_cfg->param_array, i);
+		ar = gf_list_get(hevc_cfg->param_array, i);
 		if (ar->type==type) return ar;
 	}
 	GF_SAFEALLOC(ar, GF_HEVCParamArray);
@@ -2334,6 +2310,8 @@
 					gf_list_rem(ar->nalus, j);
 					j--;
 					count2--;
+					gf_free(sl->data);
+					gf_free(sl);
 				}
 			}
 		}
@@ -2355,6 +2333,8 @@
 					gf_list_rem(ar->nalus, j);
 					j--;
 					count2--;
+					gf_free(sl->data);
+					gf_free(sl);
 				}
 			}
 		}
@@ -2379,7 +2359,9 @@
 			u8 temporal_id_plus_one = gf_bs_read_int(bs, 3);
 			size -= 2;
 
-			if ((max_temporal_id_plus_one && (temporal_id_plus_one > max_temporal_id_plus_one)) || (max_layer_id_plus_one && (layer_id+1 > max_layer_id_plus_one))) {
+			if ((max_temporal_id_plus_one && (temporal_id_plus_one > max_temporal_id_plus_one))
+				|| (max_layer_id_plus_one && (layer_id+1 > max_layer_id_plus_one))
+			) {
 				gf_bs_skip_bytes(bs, size);
 				continue;
 			}
@@ -2405,6 +2387,9 @@
 
 		gf_bs_get_content(dst_bs, &sample->data, &sample->dataLength);
 		e = gf_isom_update_sample(file, track, i+1, sample, GF_TRUE);
+		gf_bs_del(dst_bs);
+		gf_isom_sample_del(&sample);
+
 		if (e)
 			goto exit;
 	}
@@ -2420,6 +2405,7 @@
 GF_EXPORT
 GF_Err gf_media_split_lhvc(GF_ISOFile *file, u32 track, Bool for_temporal_sublayers, Bool splitAll, GF_LHVCExtractoreMode extractor_mode)
 {
+#ifndef GPAC_DISABLE_AV_PARSERS
 	LHVCTrackInfo sti[64];
 	GF_HEVCConfig *hevccfg, *lhvccfg;
 	u32 sample_num, count, cur_extract_mode, j, k, max_layer_id;
@@ -2447,7 +2433,7 @@
 		if (!hevccfg) return GF_NOT_SUPPORTED;
 
 		if (hevccfg->numTemporalLayers<=1) {
-			if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+			gf_odf_hevc_cfg_del(hevccfg);
 			return GF_OK;
 		}
 	}
@@ -2543,7 +2529,7 @@
 		u32 i;
 		count = gf_list_count(hevccfg->param_array);
 		for (i=0; i<count; i++) {
-			u32 k, count2;
+			u32 count2;
 			GF_HEVCParamArray *s_ar;
 			GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
 			if (ar->type != GF_HEVC_NALU_VID_PARAM) continue;
@@ -2561,7 +2547,12 @@
 					s_ar->array_completeness = ar->array_completeness;
 
 					GF_SAFEALLOC(sl2, GF_AVCConfigSlot);
+					if (!sl2) break;
 					sl2->data = gf_malloc(sl->size);
+					if (!sl2->data) {
+						gf_free(sl2);
+						break;
+					}
 					memcpy(sl2->data, sl->data, sl->size);
 					sl2->id = sl->id;
 					sl2->size = sl->size;
@@ -2750,8 +2741,8 @@
 				if (extractor_mode == GF_LHVC_EXTRACTORS_ON) {
 					for (k=j; k>0; k--) {
 						if (sti[k-1].track_num) {
-							u32 track_id = gf_isom_get_track_id(file, sti[k-1].track_num);
-							gf_isom_set_track_reference(file, sti[j].track_num, GF_ISOM_REF_SCAL, track_id);
+							u32 track_id_r = gf_isom_get_track_id(file, sti[k-1].track_num);
+							gf_isom_set_track_reference(file, sti[j].track_num, GF_ISOM_REF_SCAL, track_id_r);
 						}
 					}
 				}
@@ -2838,7 +2829,7 @@
 
 				//add sample
 				if (j) {
-					SAPType rap = sample->IsRAP;
+					GF_ISOSAPType rap = sample->IsRAP;
 					if (for_temporal_sublayers && !sti[j].non_tsa_vcl)
 						sample->IsRAP = RAP;
 
@@ -2869,10 +2860,10 @@
 			if (sample->IsRAP>SAP_TYPE_1) {
 				u32 sample_idx = gf_isom_get_sample_count(file, sti[j].track_num);
 				if (is_irap) {
-					gf_isom_set_sample_rap_group(file, sti[j].track_num, sample_idx, 0);
+					gf_isom_set_sample_rap_group(file, sti[j].track_num, sample_idx, GF_TRUE, 0);
 				}
 				else if (has_roll) {
-					gf_isom_set_sample_roll_group(file, sti[j].track_num, sample_idx, (s16) roll_distance);
+					gf_isom_set_sample_roll_group(file, sti[j].track_num, sample_idx, GF_TRUE, (s16) roll_distance);
 				}
 			}
 
@@ -2897,8 +2888,8 @@
 	//reset all scalable info
 	for (j=0; j<=max_layer_id; j++) {
 		GF_BitStream *bs;
-		u32 count, data_size;
-		char *data=NULL;
+		u32 data_size;
+		u8 *data=NULL;
 		if (sti[j].lhvccfg) gf_odf_hevc_cfg_del(sti[j].lhvccfg);
 		//set linf group
 		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -2935,18 +2926,22 @@
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 
 	if (extractor_mode == GF_LHVC_EXTRACTORS_ON) {
-		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, 1);
-		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, 0);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, GF_TRUE);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, GF_FALSE);
 	}
 	//add hvci brand only if single layer per track
 	else if (single_layer_per_track) {
-		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, 1);
-		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, 0);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCI, GF_TRUE);
+		gf_isom_modify_alternate_brand(file, GF_ISOM_BRAND_HVCE, GF_FALSE);
 	}
 	if (lhvccfg) gf_odf_hevc_cfg_del(lhvccfg);
 	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
 	if (nal_data) gf_free(nal_data);
 	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+
 }
 #endif /*GPAC_DISABLE_HEVC*/
 
@@ -2983,7 +2978,7 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_HEVC
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
 u32 hevc_get_tile_id(HEVCState *hevc, u32 *tile_x, u32 *tile_y, u32 *tile_width, u32 *tile_height)
 {
 	HEVCSliceInfo *si = &hevc->s_info;
@@ -3022,8 +3017,10 @@
 		} else {
 			if (i<si->pps->num_tile_rows-1) {
 				val = si->pps->row_height[i];
-			} else {
+			} else if (i) {
 				val = (PicHeightInCtbsY - si->pps->row_height[i-1]);
+			} else {
+				val = PicHeightInCtbsY;
 			}
 		}
 		*tile_y = oY;
@@ -3359,9 +3356,9 @@
 				if (e) goto err_exit;
 			}
 		} else {
-			char *data=NULL;
-			u32 size=0;
 			u32 sdesc;
+			data=NULL;
+			size=0;
 			gf_bs_get_content(bs, &data, &size);
 			gf_bs_del(bs);
 			data[1] = nb_nal_entries;
@@ -3422,226 +3419,418 @@
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 
+#include <gpac/filters.h>
+
 typedef struct
 {
-	u32 TrackID;
-	u32 SampleNum, SampleCount;
-	u32 FragmentLength;
-	u32 OriginalTrack;
-	u32 TimeScale, MediaType, DefaultDuration;
-} GF_TrackFragmenter;
+	u32 filter_idx_plus_one;
+	u32 last_prog;
+	GF_FilterSession *fsess;
+} FragCallback;
 
-GF_EXPORT
-GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, Bool use_mfra)
+static Bool on_frag_event(void *_udta, GF_Event *evt)
 {
-#ifndef GPAC_DISABLE_ISOM_WRITE
-	u8 NbBits;
-	u32 i, TrackNum, descIndex, j, count;
-	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
-	u8 defaultPadding;
-	u16 defaultDegradationPriority;
-	GF_Err e;
-	const char *tag;
-	u32 tag_len, mbrand, bcount, mversion;
-	GF_ISOFile *output;
-	GF_ISOSample *sample;
-	GF_List *fragmenters;
-	u32 MaxFragmentDuration;
-	GF_TrackFragmenter *tf;
-	Bool drop_version = gf_isom_drop_date_version_info_enabled(input);
-
-	//create output file
-	output = gf_isom_open(output_file, GF_ISOM_OPEN_WRITE, NULL);
-	if (!output) return gf_isom_last_error(NULL);
-
-	gf_isom_no_version_date_info(output, drop_version);
-
-
-	nb_samp = 0;
-	fragmenters = gf_list_new();
-
-	gf_isom_get_brand_info(input, &mbrand, &mversion, &bcount);
-	gf_isom_set_brand_info(output, mbrand, mversion);
-	for (i=0; i<bcount; i++) {
-		gf_isom_get_alternate_brand(input, i+1, &mbrand);
-		gf_isom_modify_alternate_brand(output, mbrand, GF_TRUE);
-	}
-
-	//copy movie desc
-	gf_isom_clone_root_od(input, output);
-	//clone copyright
-	count = gf_isom_get_copyright_count(input);
-	if (count) {
-		const char *lang, *note;
-		for (i=0; i<count; i++) {
-			gf_isom_get_copyright(input, i+1, &lang, &note);
-			gf_isom_set_copyright(output, (char *)lang, (char *)note);
-		}
-	}
-	count = gf_isom_get_chapter_count(input, 0);
-	if (count) {
-		const char *name;
-		u64 time;
+	u32 i, count;
+	GF_FilterStats stats;
+	FragCallback *fc = (FragCallback *)_udta;
+	if (!_udta)
+		return GF_FALSE;
+	if (evt && (evt->type != GF_EVENT_PROGRESS))
+		return GF_FALSE;
+
+	stats.report_updated = GF_FALSE;
+	if (!fc->filter_idx_plus_one) {
+		count = gf_fs_get_filters_count(fc->fsess);
 		for (i=0; i<count; i++) {
-			gf_isom_get_chapter(input, 0, i+1, &time, &name);
-			gf_isom_add_chapter(output, 0, time, (char *)name);
+			if (gf_fs_get_filter_stats(fc->fsess, i, &stats) != GF_OK) continue;
+			if (strcmp(stats.reg_name, "mp4mx")) continue;
+			fc->filter_idx_plus_one = i+1;
+			break;
 		}
+		if (!fc->filter_idx_plus_one) return GF_FALSE;
+	} else {
+		if (gf_fs_get_filter_stats(fc->fsess, fc->filter_idx_plus_one-1, &stats) != GF_OK)
+			return GF_FALSE;
 	}
+	if (! stats.report_updated) return GF_FALSE;
+	if (stats.percent/100 == fc->last_prog) return GF_FALSE;
+	fc->last_prog = stats.percent / 100;
 
-	if (gf_isom_apple_get_tag(input, 0, &tag, &tag_len) == GF_OK) {
-		for (i=GF_ISOM_ITUNE_ALBUM; i<(u32) GF_ISOM_ITUNE_WRITER; i++) {
-			if (gf_isom_apple_get_tag(input, GF_ISOM_ITUNE_NAME, &tag, &tag_len)==GF_OK)
-				gf_isom_apple_set_tag(output, GF_ISOM_ITUNE_NAME, tag, tag_len);
-		}
-	}
+#ifndef GPAC_DISABLE_LOG
+	GF_LOG(GF_LOG_INFO, GF_LOG_APP, ("Fragmenting: % 2.2f %%\r", ((Double)stats.percent) / 100));
+#else
+	fprintf(stderr, "Fragmenting: % 2.2f %%\r", ((Double)stats.percent) / 100);
+#endif
+	return GF_FALSE;
+}
 
-	if (use_mfra)
-		gf_isom_enable_mfra(output);
+GF_EXPORT
+GF_Err gf_media_fragment_file(GF_ISOFile *input, const char *output_file, Double max_duration_sec, Bool use_mfra)
+{
+	char szArgs[1024];
+	FragCallback fc;
+	GF_Err e = GF_OK;
+	GF_Filter *f;
+	GF_FilterSession *fsess = gf_fs_new_defaults(0);
 
-	MaxFragmentDuration = (u32) (max_duration_sec * 1000);
-	//duplicates all tracks
-	for (i=0; i<gf_isom_get_track_count(input); i++) {
-		e = gf_isom_clone_track(input, i+1, output, 0, &TrackNum);
-		if (e) goto err_exit;
+	if (!fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Failed to create filter session\n"));
+		return GF_OUT_OF_MEM;
+	}
 
-		for (j = 0; j < gf_isom_get_track_kind_count(input, i+1); j++) {
-			char *scheme, *value;
-			gf_isom_get_track_kind(input, i+1, j, &scheme, &value);
-			gf_isom_add_track_kind(output, TrackNum, scheme, value);
-		}
 
-		count = gf_isom_get_sample_count(input, i+1);
-		//we always fragment each track regardless of the sample count
+	sprintf(szArgs, "mp4dmx:mov=%p", input);
+	f = gf_fs_load_filter(fsess, szArgs, &e);
+	if (!f) return e;
 
-		gf_isom_get_fragment_defaults(input, i+1,
-									  &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-		//otherwise setup fragmentation
-		e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-										 defaultDescriptionIndex, defaultDuration,
-										 defaultSize, (u8) defaultRandomAccess,
-										 defaultPadding, defaultDegradationPriority, 0);
-		if (e) goto err_exit;
+	strcpy(szArgs, "reframer:FID=1");
+	f = gf_fs_load_filter(fsess, szArgs, &e);
+	if (!f) return e;
 
-		GF_SAFEALLOC(tf, GF_TrackFragmenter);
-		if (!tf) {
-			e = GF_OUT_OF_MEM;
-			goto err_exit;
-		}
-		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
-		tf->SampleCount = count;
-		tf->OriginalTrack = i+1;
-		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
-		tf->MediaType = gf_isom_get_media_type(input, i+1);
-		tf->DefaultDuration = defaultDuration;
-		gf_list_add(fragmenters, tf);
-		nb_samp += count;
+	sprintf(szArgs, "%s:SID=1:frag:cdur=%g:abs_offset:fragdur", output_file, max_duration_sec);
+	if (use_mfra)
+		strcat(szArgs, ":mfra");
 
-		if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
+	f = gf_fs_load_destination(fsess, szArgs, NULL, NULL, &e);
+	if (!f) return e;
 
+	if (!gf_sys_is_test_mode()
+#ifndef GPAC_DISABLE_LOG
+		&& (gf_log_get_tool_level(GF_LOG_APP)!=GF_LOG_QUIET)
+#endif
+		&& !gf_sys_is_quiet()
+	) {
+		fc.last_prog=0;
+		fc.fsess=fsess;
+		fc.filter_idx_plus_one=0;
+		gf_fs_enable_reporting(fsess, GF_TRUE);
+		gf_fs_set_ui_callback(fsess, on_frag_event, &fc);
 	}
-	gf_isom_set_movie_duration(output, gf_isom_get_duration(input));
-
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode())
+		on_frag_event(NULL, NULL);
+#endif
 
-	//flush movie
-	e = gf_isom_finalize_for_fragment(output, 0);
-	if (e) goto err_exit;
+	e = gf_fs_run(fsess);
+	gf_fs_del(fsess);
+	return (e<GF_OK) ? e : GF_OK;
+}
 
-	if (!nb_samp) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOBMFF Fragmenting] No samples in movie, rewriting moof and exit\n"));
-		goto err_exit;
-	}
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
-	nb_done = 0;
+#ifndef GPAC_DISABLE_ISOM
 
-	while ( (count = gf_list_count(fragmenters)) ) {
+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_AVCConfig *avcc;
+#ifndef GPAC_DISABLE_HEVC
+	GF_HEVCConfig *hvcc;
+#endif
+	u32 subtype = gf_isom_get_media_subtype(movie, track, 1);
 
-		e = gf_isom_start_fragment(output, 1);
-		if (e) goto err_exit;
-		//setup some default
-		for (i=0; i<count; i++) {
-			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
-			if (gf_isom_is_video_subtype(tf->MediaType) ) {
-				e = gf_isom_set_fragment_option(output, tf->TrackID, GF_ISOM_TRAF_RANDOM_ACCESS, 1);
-				if (e) goto err_exit;
-			}
+	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);
+		} 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)) ));
+			e = gf_isom_get_original_format_type(movie, track, 1, &originalFormat);
 		}
-		sample = NULL;
-
-		/*copy PSSHs from moov to the first moof*/
-		if (!nb_done) {
-			e = gf_isom_clone_pssh(output, input, GF_TRUE);
-			if (e) goto err_exit;
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOM Tools] Error fetching protection information\n"));
+			return e;
 		}
 
-		//process track by track
-		for (i=0; i<count; i++) {
-			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
+		if (originalFormat) subtype = originalFormat;
+	}
 
-			gf_isom_set_nalu_extract_mode(input, tf->OriginalTrack, GF_ISOM_NALU_EXTRACT_INSPECT);
+	switch (subtype) {
+	case GF_ISOM_SUBTYPE_MPEG4:
+		esd = gf_isom_get_esd(movie, track, 1);
+		if (esd && esd->decoderConfig) {
+			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);
+				} else {
+					snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4a.%02X", esd->decoderConfig->objectTypeIndication);
+				}
+				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);
+				}
+				break;
+			default:
+				snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "mp4s.%02X", esd->decoderConfig->objectTypeIndication);
+				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;
+		}
+	case GF_ISOM_SUBTYPE_AVC_H264:
+	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
+		//FIXME: in avc1 with multiple descriptor, we should take the right description index
+		avcc = gf_isom_avc_config_get(movie, track, 1);
+		if (force_inband) {
+			if (subtype==GF_ISOM_SUBTYPE_AVC_H264)
+				subtype = GF_ISOM_SUBTYPE_AVC3_H264;
+			else if (subtype==GF_ISOM_SUBTYPE_AVC2_H264)
+				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);
+			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;
+		}
+	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);
+			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;
+		}
+#ifndef GPAC_DISABLE_HEVC
+	case GF_ISOM_SUBTYPE_HVC1:
+	case GF_ISOM_SUBTYPE_HEV1:
+	case GF_ISOM_SUBTYPE_HVC2:
+	case GF_ISOM_SUBTYPE_HEV2:
+	case GF_ISOM_SUBTYPE_HVT1:
+	case GF_ISOM_SUBTYPE_LHV1:
+	case GF_ISOM_SUBTYPE_LHE1:
 
-			//ok write samples
-			while (1) {
-				if (!sample) {
-					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
+		if (force_inband) {
+			if (subtype==GF_ISOM_SUBTYPE_HVC1) subtype = GF_ISOM_SUBTYPE_HEV1;
+			else if (subtype==GF_ISOM_SUBTYPE_HVC2) subtype = GF_ISOM_SUBTYPE_HEV2;
+		}
+		hvcc = gf_isom_hevc_config_get(movie, track, 1);
+		if (!hvcc) {
+			hvcc = gf_isom_lhvc_config_get(movie, track, 1);
+		}
+		if (subtype==GF_ISOM_SUBTYPE_HVT1) {
+			u32 refTrack;
+			gf_isom_get_reference(movie, track, GF_ISOM_REF_TBAS, 1, &refTrack);
+			if (hvcc) gf_odf_hevc_cfg_del(hvcc);
+			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);
+						}
+					}
 				}
-				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
+			}
+			gf_odf_hevc_cfg_del(hvcc);
+		} else {
+			snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s", gf_4cc_to_str(subtype));
+		}
+		return GF_OK;
+#endif
 
-				defaultDuration = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
+#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;
 
-				e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex, defaultDuration, NbBits, 0, 0);
-				if (e) goto err_exit;
+		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 = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
-				if (e) goto err_exit;
+			e = aom_av1_parse_temporal_unit_from_section5(bs, &av1_state);
+			gf_bs_del(bs);
 
-				/*copy subsample information*/
-				e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, GF_FALSE);
-				if (e) goto err_exit;
+			if (e) {
+				gf_odf_av1_cfg_del(av1c);
+				gf_av1_reset_state(&av1_state, GF_TRUE);
+				return e;
+			}
+		}
 
-				gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
-				nb_done++;
+		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) {
 
-				gf_isom_sample_del(&sample);
-				sample = NULL;
-				tf->FragmentLength += defaultDuration;
-				tf->SampleNum += 1;
-
-				//end of track fragment or track
-				if ((tf->SampleNum==tf->SampleCount) ||
-				        /* TODO: should probably test the time position (not only duration) to avoid drift */
-				        (tf->FragmentLength*1000 >= MaxFragmentDuration*tf->TimeScale)) {
-					sample = NULL;
-					tf->FragmentLength = 0;
-					break;
-				}
-			}
-			if (tf->SampleNum==tf->SampleCount) {
-				gf_free(tf);
-				gf_list_rem(fragmenters, i);
-				i--;
-				count --;
+			} 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));
 			}
 		}
+
+		gf_odf_av1_cfg_del(av1c);
+		gf_av1_reset_state(&av1_state, GF_TRUE);
+		return GF_OK;
 	}
+#endif /*!defined(GPAC_DISABLE_AV1) && !defined(GPAC_DISABLE_AV_PARSERS)*/
 
-err_exit:
-	while (gf_list_count(fragmenters)) {
-		tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, 0);
-		gf_free(tf);
-		gf_list_rem(fragmenters, 0);
-	}
-	gf_list_del(fragmenters);
-	if (e) gf_isom_delete(output);
-  else gf_isom_close(output);
-	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
-	return e;
-#else
-	return GF_NOT_SUPPORTED;
-#endif /* GPAC_DISABLE_ISOM_WRITE */
-}
+	case GF_ISOM_SUBTYPE_VP08:
+	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;
+		}
 
+		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;
+	}
 
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+	case GF_ISOM_SUBTYPE_DVHE:
+	{
+		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;
+		}
+
+		snprintf(szCodec, RFC6381_CODEC_NAME_SIZE_MAX, "%s.%02u.%02u", gf_4cc_to_str(subtype),
+			dovi->dv_profile, dovi->dv_level);
+
+		gf_odf_dovi_cfg_del(dovi);
+		return GF_OK;
+	}
+
+	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 GF_OK;
+}
 
+#endif //GPAC_DISABLE_ISOM

gpac-0.8.0.tar.gz/src/media_tools/m2ts_mux.c -> gpac-1.0.0.tar.gz/src/media_tools/m2ts_mux.c Changed

@@ -2,10 +2,10 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre , Cyril Concolato, Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2018
  *					All rights reserved
  *
- *  This file is part of GPAC / MPEG2-TS sub-project
+ *  This file is part of GPAC / MPEG2-TS multiplexer 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
@@ -42,6 +42,21 @@
 /* length of encoded pcr */
 #define PCR_LENGTH 6
 
+#define GF_LANG_UNKNOWN		GF_4CC('u','n','d',' ')
+
+/*! DASH segment boundary information - these are internal to the muxer*/
+enum
+{
+	/*! not a segment boundary*/
+	GF_SEG_BOUNDARY_NONE=0,
+	/*! segment start*/
+	GF_SEG_BOUNDARY_START,
+	/*! segment start with forced PMT - triggered by setting \ref struct __m2ts_mux.force_pat, triggers a forced PCR*/
+	GF_SEG_BOUNDARY_FORCE_PMT,
+	/*! segment start with forced PCR*/
+	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;
@@ -108,7 +123,6 @@
 	GF_M2TS_Mux_Table *table, *prev_table;
 	u32 maxSectionLength;
 	GF_M2TS_Mux_Section *section, *prev_sec;
-	GF_BitStream *bs;
 
 	/* check if there is already a table with that id */
 	prev_table = NULL;
@@ -183,6 +197,7 @@
 	prev_sec = NULL;
 	offset = 0;
 	while (offset < table_payload_length) {
+		GF_BitStream *bs;
 		u32 remain;
 		GF_SAFEALLOC(section, GF_M2TS_Mux_Section);
 		if (!section) {
@@ -224,7 +239,7 @@
 			gf_bs_write_u32(bs, 0);
 		}
 
-		gf_bs_get_content(bs, (char**) &section->data, &section->length);
+		gf_bs_get_content(bs, &section->data, &section->length);
 		gf_bs_del(bs);
 
 		if (use_syntax_indicator) {
@@ -292,7 +307,6 @@
 	/*max section length for MPEG-4 BIFS and OD*/
 	u32 maxSectionLength = 4096;
 	GF_M2TS_Mux_Section *section, *prev_sec;
-	GF_BitStream *bs;
 
 	/* check if there is already a table with that id */
 	prev_table = NULL;
@@ -354,8 +368,9 @@
 	offset = 0;
 	hdr = stream->sl_header;
 	while (offset < table_payload_length) {
+		GF_BitStream *bs;
 		u32 remain;
-		char *slhdr;
+		u8 *slhdr;
 		u32 slhdr_size;
 		GF_SAFEALLOC(section, GF_M2TS_Mux_Section);
 		if (!section) {
@@ -407,7 +422,7 @@
 			gf_bs_write_u32(bs, 0);
 		}
 
-		gf_bs_get_content(bs, (char**) &section->data, &section->length);
+		gf_bs_get_content(bs, &section->data, &section->length);
 		gf_bs_del(bs);
 
 		if (use_syntax_indicator) {
@@ -496,7 +511,7 @@
 
 //#define USE_AF_STUFFING
 
-void gf_m2ts_mux_table_get_next_packet(GF_M2TS_Mux_Stream *stream, char *packet)
+void gf_m2ts_mux_table_get_next_packet(GF_M2TS_Mux *mux, GF_M2TS_Mux_Stream *stream, char *packet)
 {
 	GF_BitStream *bs;
 	GF_M2TS_Mux_Table *table;
@@ -519,7 +534,8 @@
 	section = stream->current_section;
 	assert(section);
 
-	bs = gf_bs_new(packet, 188, GF_BITSTREAM_WRITE);
+	bs = mux->pck_bs;
+	gf_bs_reassign_buffer(bs, packet, 188);
 
 	gf_bs_write_int(bs,	0x47, 8); // sync
 	gf_bs_write_int(bs,	0, 1);    // error indicator
@@ -584,7 +600,6 @@
 		/* no concatenations of sections in ts packets, so start address is 0 */
 		gf_bs_write_u8(bs, 0);
 	}
-	gf_bs_del(bs);
 
 	memcpy(packet+188-payload_start, section->data + stream->current_section_offset, payload_length);
 	stream->current_section_offset += payload_length;
@@ -658,7 +673,7 @@
 			}
 			prog = prog->next;
 		}
-		gf_bs_get_content(bs, (char**)&payload, &size);
+		gf_bs_get_content(bs, &payload, &size);
 		gf_bs_del(bs);
 		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_SDT_ACTUAL, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
 		stream->table_needs_update = GF_FALSE;
@@ -688,7 +703,7 @@
 			gf_bs_write_int(bs, prog->pmt->pid, 13);	/*reserved*/
 			prog = prog->next;
 		}
-		gf_bs_get_content(bs, (char**)&payload, &size);
+		gf_bs_get_content(bs, &payload, &size);
 		gf_bs_del(bs);
 		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PAT, muxer->ts_id, payload, size, GF_TRUE, GF_FALSE, GF_FALSE);
 		stream->table_needs_update = GF_FALSE;
@@ -709,9 +724,11 @@
 		u8 *payload;
 		u32 i;
 		u32 length, nb_streams=0;
-		u32 info_length = 0, es_info_length = 0;
+		u32 info_length = 0;
 		GF_BitStream *bs;
 
+		if (!stream->program->pcr)
+			abort();
 
 		bs = gf_bs_new(NULL,0,GF_BITSTREAM_WRITE);
 		gf_bs_write_int(bs,	0x7, 3); // reserved
@@ -729,10 +746,10 @@
 		if (!stream->program->iod) {
 			gf_bs_write_int(bs,	info_length, 12); // program info length =0
 		} else {
-			u32 len, i;
+			u32 len;
 			GF_ESD *esd;
 			GF_BitStream *bs_iod;
-			char *iod_data;
+			u8 *iod_data;
 			u32 iod_data_len;
 
 			/*rewrite SL config in IOD streams*/
@@ -785,10 +802,9 @@
 		es = stream->program->streams;
 		while (es) {
 			Bool has_lang = GF_FALSE;
+			u32 es_info_length = 0;
 			u8 type = es->mpeg2_stream_type;
 			nb_streams++;
-			es_info_length = 0;
-
 
 			switch (es->mpeg2_stream_type) {
 			case GF_M2TS_AUDIO_AC3:
@@ -800,6 +816,12 @@
 				es_info_length += 2;
 				type = GF_M2TS_PRIVATE_DATA;
 				break;
+			default:
+				if (es->force_reg_desc) {
+					es_info_length += 2 + 4 + 4;
+					type = GF_M2TS_PRIVATE_DATA;
+				}
+				break;
 			}
 
 			gf_bs_write_int(bs,	type, 8);
@@ -808,7 +830,7 @@
 			gf_bs_write_int(bs,	0xF, 4); // reserved
 
 			/*calculate es_info_length*/
-			if (stream->program->iod && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS))
+			if (stream->program->iod && es->ifce && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS))
 				es_info_length += 4;
 
 			/*another loop descriptors*/
@@ -821,14 +843,14 @@
 				}
 			}
 
-			if (es->ifce && es->ifce->lang && (es->ifce->lang  != GF_MEDIA_LANG_UND) ) {
+			if (es->ifce && es->ifce->lang && (es->ifce->lang != GF_LANG_UNKNOWN) ) {
 				es_info_length += 2 + 3;
 				has_lang = GF_TRUE;
 			}
 
 			gf_bs_write_int(bs,	es_info_length, 12);
 
-			if (stream->program->iod && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
+			if (stream->program->iod && es->ifce && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
 				gf_bs_write_int(bs,	GF_M2TS_MPEG4_SL_DESCRIPTOR, 8);
 				gf_bs_write_int(bs,	2, 8);
 				gf_bs_write_int(bs,	es->ifce->stream_id, 16);  // mpeg4_esid
@@ -863,6 +885,14 @@
 				gf_bs_write_int(bs,	GF_M2TS_DVB_EAC3_DESCRIPTOR, 8);
 				gf_bs_write_int(bs,	0, 8); //check what is in this desc
 				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);
+				}
+				break;
 			}
 
 			if (es->loop_descriptors)
@@ -879,7 +909,7 @@
 			es = es->next;
 		}
 
-		gf_bs_get_content(bs, (char**)&payload, &length);
+		gf_bs_get_content(bs, &payload, &length);
 		gf_bs_del(bs);
 
 		gf_m2ts_mux_table_update(stream, GF_M2TS_TABLE_ID_PMT, stream->program->number, payload, length, GF_TRUE, GF_FALSE, GF_FALSE);
@@ -913,7 +943,7 @@
 	}
 	if (!stream->program->initial_ts_set) {
 		u32 nb_bits = (u32) (stream->program->mux->tot_pck_sent - stream->program->num_pck_at_pcr_init) * 1504;
-		u32 nb_ticks = 90000*nb_bits / stream->program->mux->bit_rate;
+		u64 nb_ticks = 90000*nb_bits / stream->program->mux->bit_rate;
 		stream->program->initial_ts = *dts;
 
 		if (stream->program->initial_ts > nb_ticks)
@@ -944,20 +974,41 @@
 	*dts = *dts - stream->program->initial_ts + pcr_offset;
 }
 
-static void id3_tag_create(char **input, u32 *len)
+void id3_write_size(GF_BitStream *bs, u32 len)
+{
+	u32 size;
+
+	size = (len>>21) & 0x7F;
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, size, 7);
+
+	size = (len>>14) & 0x7F;
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, size, 7);
+
+	size = (len>>7) & 0x7F;
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, size, 7);
+
+	size = (len) & 0x7F;
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, size, 7);
+}
+
+static void id3_tag_create(u8 **input, u32 *len)
 {
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u8(bs, 'I');
 	gf_bs_write_u8(bs, 'D');
 	gf_bs_write_u8(bs, '3');
-	gf_bs_write_u8(bs, 4);
-	gf_bs_write_u8(bs, 0);
-	gf_bs_write_int(bs, 0, 1);
-	gf_bs_write_int(bs, 0, 1);
-	gf_bs_write_int(bs, 0, 1);
-	gf_bs_write_int(bs, 0x1F, 5);
+	gf_bs_write_u8(bs, 4); //major
+	gf_bs_write_u8(bs, 0); //minor
+	gf_bs_write_u8(bs, 0); //flags
+
+	id3_write_size(bs, *len + 10);
+
 	gf_bs_write_u32(bs, ID3V2_FRAME_TXXX);
-	gf_bs_write_u32(bs, *len); /* size of the text */
+	id3_write_size(bs, *len); /* size of the text */
 	gf_bs_write_u8(bs, 0);
 	gf_bs_write_u8(bs, 0);
 	gf_bs_write_data(bs, *input, *len);
@@ -1032,6 +1083,7 @@
 		if (stream->curr_pck.data_len) {
 			/*discard packet data if we use SL over PES*/
 			if (stream->discard_data) gf_free(stream->curr_pck.data);
+			if (stream->curr_pck.mpeg2_af_descriptors) gf_free(stream->curr_pck.mpeg2_af_descriptors);
 			/*release data*/
 			stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_RELEASE, NULL);
 		}
@@ -1052,15 +1104,18 @@
 		/*flush input pipe*/
 		if (stream->ifce->input_ctrl) stream->ifce->input_ctrl(stream->ifce, GF_ESI_INPUT_DATA_FLUSH, NULL);
 
-		gf_mx_p(stream->mx);
+		if (stream->mx) gf_mx_p(stream->mx);
 
 		stream->pck_offset = 0;
 		stream->curr_pck.data_len = 0;
 
 		/*fill curr_pck*/
 		curr_pck = stream->pck_first;
+		if (!stream->program->pcr_init_time_set && (stream != stream->program->pcr)) {
+			curr_pck = NULL;
+		}
 		if (!curr_pck) {
-			gf_mx_v(stream->mx);
+			if (stream->mx) gf_mx_v(stream->mx);
 			return ret;
 		}
 		stream->curr_pck.cts = curr_pck->cts;
@@ -1069,6 +1124,7 @@
 		stream->curr_pck.dts = curr_pck->dts;
 		stream->curr_pck.duration = curr_pck->duration;
 		stream->curr_pck.flags = curr_pck->flags;
+		stream->curr_pck.sap_type = curr_pck->sap_type;
 		stream->curr_pck.mpeg2_af_descriptors = curr_pck->mpeg2_af_descriptors;
 		stream->curr_pck.mpeg2_af_descriptors_size = curr_pck->mpeg2_af_descriptors_size;
 
@@ -1077,7 +1133,7 @@
 		gf_free(curr_pck);
 		stream->discard_data = GF_TRUE;
 
-		gf_mx_v(stream->mx);
+		if (stream->mx) gf_mx_v(stream->mx);
 	}
 
 	if (!(stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS))
@@ -1100,8 +1156,11 @@
 		} else {
 			/*PES has been sent, discard internal buffer*/
 			if (stream->discard_data) gf_free(stream->curr_pck.data);
+			if (stream->curr_pck.mpeg2_af_descriptors) gf_free(stream->curr_pck.mpeg2_af_descriptors);
 			stream->curr_pck.data = NULL;
 			stream->curr_pck.data_len = 0;
+			stream->curr_pck.mpeg2_af_descriptors = NULL;
+			stream->curr_pck.mpeg2_af_descriptors_size = 0;
 			stream->pck_offset = 0;
 			/*don't send until PCR is initialized*/
 			return 0;
@@ -1118,7 +1177,7 @@
 		assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
 		stream->sl_header.accessUnitLength += stream->curr_pck.data_len;
 #endif
-		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ? 1: 0;
+		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.sap_type) ? 1: 0;
 		stream->sl_header.compositionTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_CTS) ? 1 : 0;
 		stream->sl_header.compositionTimeStamp = stream->curr_pck.cts;
 		stream->sl_header.decodingTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? 1: 0;
@@ -1131,6 +1190,9 @@
 			gf_free(stream->curr_pck.data);
 			stream->curr_pck.data = NULL;
 			stream->curr_pck.data_len = 0;
+			gf_free(stream->curr_pck.mpeg2_af_descriptors);
+			stream->curr_pck.mpeg2_af_descriptors = NULL;
+			stream->curr_pck.mpeg2_af_descriptors_size = 0;
 		}
 		break;
 	case GF_M2TS_SYSTEMS_MPEG4_PES:
@@ -1145,7 +1207,7 @@
 		assert(stream->sl_header.accessUnitLength + stream->curr_pck.data_len < 65536); /*stream->sl_header.accessUnitLength type is u16*/
 		stream->sl_header.accessUnitLength += stream->curr_pck.data_len;
 #endif
-		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ? 1: 0;
+		stream->sl_header.randomAccessPointFlag = (stream->curr_pck.sap_type) ? 1: 0;
 		stream->sl_header.compositionTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_CTS) ? 1 : 0;
 		stream->sl_header.compositionTimeStamp = stream->curr_pck.cts;
 		stream->sl_header.decodingTimeStampFlag = (stream->curr_pck.flags & GF_ESI_DATA_HAS_DTS) ? 1: 0;
@@ -1178,9 +1240,11 @@
 
 		/*same mux config = 0 (refresh aac config)*/
 		next_time = gf_sys_clock();
-		if (stream->ifce->decoder_config && (stream->last_aac_time + stream->ifce->repeat_rate < next_time)) {
+		if (stream->ifce->decoder_config && (stream->latm_last_aac_time + stream->ifce->repeat_rate < next_time)) {
+#ifndef GPAC_DISABLE_AV_PARSERS
 			GF_M4ADecSpecInfo cfg;
-			stream->last_aac_time = next_time;
+#endif
+			stream->latm_last_aac_time = next_time;
 
 			gf_bs_write_int(bs, 0, 1);
 			/*mux config */
@@ -1190,8 +1254,12 @@
 			gf_bs_write_int(bs, 0, 4);/*numProgram*/
 			gf_bs_write_int(bs, 0, 3);/*numLayer prog 1*/
 
+#ifndef GPAC_DISABLE_AV_PARSERS
 			gf_m4a_get_config(stream->ifce->decoder_config, stream->ifce->decoder_config_size, &cfg);
 			gf_m4a_write_config_bs(bs, &cfg);
+#else
+			gf_bs_write_data(bs, stream->ifce->decoder_config, stream->ifce->decoder_config_size);
+#endif
 
 			gf_bs_write_int(bs, 0, 3);/*frameLengthType*/
 			gf_bs_write_int(bs, 0, 8);/*latmBufferFullness*/
@@ -1230,20 +1298,31 @@
 	/*perform ADTS encapsulation*/
 	case GF_M2TS_AUDIO_AAC:
 		if (stream->ifce->decoder_config) {
+			GF_BitStream *bs;
+#ifndef GPAC_DISABLE_AV_PARSERS
 			GF_M4ADecSpecInfo cfg;
-			GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			gf_m4a_get_config(stream->ifce->decoder_config, stream->ifce->decoder_config_size, &cfg);
-
 			if (cfg.base_object_type>=5) cfg.base_object_type = GF_M4A_AAC_LC;
+#endif
+			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
 
 			gf_bs_write_int(bs, 0xFFF, 12);/*sync*/
 			gf_bs_write_int(bs, 0, 1);/*mpeg2 aac*/
 			gf_bs_write_int(bs, 0, 2); /*layer*/
 			gf_bs_write_int(bs, 1, 1); /* protection_absent*/
+#ifndef GPAC_DISABLE_AV_PARSERS
 			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);
+#else
+			gf_bs_write_int(bs, GF_M4A_AAC_LC-1, 2);
+			gf_bs_write_int(bs, 1, 4); //FIXME
+			gf_bs_write_int(bs, 0, 1);
+			gf_bs_write_int(bs, 2, 3);//FIXME
+#endif
+
 			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);
@@ -1266,12 +1345,13 @@
 		id3_tag_create(&stream->curr_pck.data, &stream->curr_pck.data_len);
 		stream->discard_data = GF_TRUE;
 	}
-	break;
+		break;
+	default:
+		break;
 	}
 
-	if (stream->start_pes_at_rap && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)
+	if (stream->start_pes_at_rap && (stream->curr_pck.sap_type)
 	   ) {
-		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
 		stream->program->mux->force_pat = GF_TRUE;
 	}
 
@@ -1342,6 +1422,7 @@
 	stream->next_next_payload_size = 0;
 
 	stream->next_pck_flags = 0;
+	stream->next_pck_sap = 0;
 	stream->copy_from_next_packets = 0;
 
 	//AU packing in single PES is disabled
@@ -1355,6 +1436,7 @@
 		if (test_pck.data_len) {
 			stream->next_payload_size = test_pck.data_len;
 			stream->next_pck_flags = test_pck.flags;
+			stream->next_pck_sap = test_pck.sap_type;
 			stream->next_pck_cts = test_pck.cts;
 			stream->next_pck_dts = test_pck.dts;
 		}
@@ -1366,6 +1448,7 @@
 			stream->next_pck_cts = stream->pck_first->cts;
 			stream->next_pck_dts = stream->pck_first->dts;
 			stream->next_pck_flags = stream->pck_first->flags;
+			stream->next_pck_sap = stream->pck_first->sap_type;
 
 			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) {
@@ -1376,7 +1459,7 @@
 	}
 	/*consider we don't have the next AU if:
 	1- we are asked to start new PES at RAP, just consider we don't have the next AU*/
-	if (stream->start_pes_at_rap && (stream->next_pck_flags & GF_ESI_DATA_AU_RAP) ) {
+	if (stream->start_pes_at_rap && stream->next_pck_sap) {
 		ignore_next = GF_TRUE;
 //		stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_START;
 	}
@@ -1390,6 +1473,7 @@
 		stream->next_pck_cts = 0;
 		stream->next_pck_dts = 0;
 		stream->next_pck_flags = 0;
+		stream->next_pck_sap = 0;
 	}
 
 	if (stream->next_payload_size) {
@@ -1465,6 +1549,7 @@
 				stream->copy_from_next_packets = 0;
 				stream->next_payload_size = 0;
 				stream->next_pck_flags = 0;
+				stream->next_pck_sap = 0;
 				return GF_FALSE;
 			}
 			/*if what will remain after copying next AU is less than the minimum safety copy only copy next AU and
@@ -1480,6 +1565,7 @@
 			stream->copy_from_next_packets = 0;
 			stream->next_payload_size = 0;
 			stream->next_pck_flags = 0;
+			stream->next_pck_sap = 0;
 			return GF_FALSE;
 		}
 
@@ -1604,7 +1690,8 @@
 	u32 adaptation_field_control, payload_length, payload_to_copy, padding_length, hdr_len, pos, copy_next;
 
 	assert(stream->pid);
-	bs = gf_bs_new(packet, 188, GF_BITSTREAM_WRITE);
+	bs = stream->program->mux->pck_bs;
+	gf_bs_reassign_buffer(bs, packet, 188);
 
 	if (stream->pcr_only_mode) {
 		payload_length = 184 - 8;
@@ -1792,7 +1879,7 @@
 			stream->program->last_dts = stream->curr_pck.dts;
 			stream->program->nb_pck_last_pcr = stream->program->mux->tot_pck_sent;
 		}
-		is_rap = (hdr_len && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP) ) ? GF_TRUE : GF_FALSE;
+		is_rap = (hdr_len && (stream->curr_pck.sap_type) ) ? GF_TRUE : GF_FALSE;
 		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, needs_pcr, pcr, is_rap, padding_length, hdr_len ? stream->curr_pck.mpeg2_af_descriptors : NULL, hdr_len ? stream->curr_pck.mpeg2_af_descriptors_size : 0, stream->set_initial_disc);
 		stream->set_initial_disc = GF_FALSE;
 
@@ -1805,11 +1892,17 @@
 		if (padding_length)
 			stream->program->mux->tot_pes_pad_bytes += padding_length;
 	}
-	if (hdr_len) gf_m2ts_stream_add_pes_header(bs, stream);
+	stream->pck_sap_type = 0;
+	stream->pck_sap_time = 0;
+	if (hdr_len) {
+		gf_m2ts_stream_add_pes_header(bs, stream);
+		if (stream->curr_pck.sap_type) {
+			stream->pck_sap_type = 1;
+			stream->pck_sap_time = stream->curr_pck.cts;
+		}
+	}
 
 	pos = (u32) gf_bs_get_position(bs);
-	gf_bs_del(bs);
-
 
 	if (adaptation_field_control == GF_M2TS_ADAPTATION_ONLY) {
 		return;
@@ -1854,6 +1947,9 @@
 		if (stream->discard_data) gf_free(stream->curr_pck.data);
 		stream->curr_pck.data = NULL;
 		stream->curr_pck.data_len = 0;
+		if (stream->curr_pck.mpeg2_af_descriptors) gf_free(stream->curr_pck.mpeg2_af_descriptors);
+		stream->curr_pck.mpeg2_af_descriptors = NULL;
+		stream->curr_pck.mpeg2_af_descriptors_size = 0;
 		stream->pck_offset = 0;
 
 //#ifndef GPAC_DISABLE_LOG
@@ -1866,7 +1962,6 @@
 
 		/*copy over from next PES to fill this TS packet*/
 		if (stream->copy_from_next_packets) {
-			u32 copy_next;
 			pos += payload_to_copy;
 			copy_next = payload_length - payload_to_copy;
 			/*we might need a more than one*/
@@ -1906,6 +2001,9 @@
 					if (stream->discard_data) gf_free(stream->curr_pck.data);
 					stream->curr_pck.data = NULL;
 					stream->curr_pck.data_len = 0;
+					if (stream->curr_pck.mpeg2_af_descriptors) gf_free(stream->curr_pck.mpeg2_af_descriptors);
+					stream->curr_pck.mpeg2_af_descriptors = NULL;
+					stream->curr_pck.mpeg2_af_descriptors_size = 0;
 					stream->pck_offset = 0;
 				}
 				if (!remain) break;
@@ -1914,7 +2012,6 @@
 			}
 		}
 		else if (stream->program->mux->force_pat_pmt_state==GF_SEG_BOUNDARY_START) {
-			stream->program->mux->force_pat_pmt_state = GF_SEG_BOUNDARY_FORCE_PAT;
 			stream->program->mux->force_pat = GF_TRUE;
 		}
 	}
@@ -1947,14 +2044,14 @@
 
 		if (stream->force_new || (esi_pck->flags & GF_ESI_DATA_AU_START)) {
 			if (stream->pck_reassembler) {
-				gf_mx_p(stream->mx);
+				if (stream->mx) gf_mx_p(stream->mx);
 				if (!stream->pck_first) {
 					stream->pck_first = stream->pck_last = stream->pck_reassembler;
 				} else {
 					stream->pck_last->next = stream->pck_reassembler;
 					stream->pck_last = stream->pck_reassembler;
 				}
-				gf_mx_v(stream->mx);
+				if (stream->mx) gf_mx_v(stream->mx);
 				stream->pck_reassembler = NULL;
 			}
 		}
@@ -1975,22 +2072,23 @@
 			}
 		}
 
-		stream->force_new = esi_pck->flags & GF_ESI_DATA_AU_END ? GF_TRUE : GF_FALSE;
+		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);
 		stream->pck_reassembler->data_len += esi_pck->data_len;
 
 		stream->pck_reassembler->flags |= esi_pck->flags;
+		if (esi_pck->sap_type) stream->pck_reassembler->sap_type = esi_pck->sap_type;
 		if (stream->force_new) {
-			gf_mx_p(stream->mx);
+			if (stream->mx) gf_mx_p(stream->mx);
 			if (!stream->pck_first) {
 				stream->pck_first = stream->pck_last = stream->pck_reassembler;
 			} else {
 				stream->pck_last->next = stream->pck_reassembler;
 				stream->pck_last = stream->pck_reassembler;
 			}
-			gf_mx_v(stream->mx);
+			if (stream->mx) gf_mx_v(stream->mx);
 			stream->pck_reassembler = NULL;
 		}
 		break;
@@ -2009,6 +2107,19 @@
 	}
 }
 
+static GF_M2TS_Mux_Stream *gf_m2ts_find_stream(GF_M2TS_Mux_Program *program, u32 pid, u32 stream_id)
+{
+	GF_M2TS_Mux_Stream *st = program->streams;
+	while (st) {
+		if (pid && (st->pid == pid))
+			return st;
+		if (stream_id && (st->ifce->stream_id == stream_id))
+			return st;
+		st = st->next;
+	}
+	return NULL;
+}
+
 static s32 gf_m2ts_stream_index(GF_M2TS_Mux_Program *program, u32 pid, u32 stream_id)
 {
 	s32 i=0;
@@ -2075,9 +2186,9 @@
 	u32 data_len;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u16(bs, 0xFFFF);
-	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
+	gf_bs_write_u32(bs, GF_M2TS_META_ID3);
 	gf_bs_write_u8(bs, 0xFF);
-	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
+	gf_bs_write_u32(bs, GF_M2TS_META_ID3);
 	gf_bs_write_u8(bs, 0); /* service id */
 	gf_bs_write_int(bs, 0, 1); /* locator */
 	gf_bs_write_int(bs, 0, 2); /* carriage flags */
@@ -2100,9 +2211,9 @@
 	u32 data_len;
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_bs_write_u16(bs, 0xFFFF);
-	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
+	gf_bs_write_u32(bs, GF_M2TS_META_ID3);
 	gf_bs_write_u8(bs, 0xFF);
-	gf_bs_write_u32(bs, GF_MEDIA_TYPE_ID3);
+	gf_bs_write_u32(bs, GF_M2TS_META_ID3);
 	gf_bs_write_u8(bs, 0); /* service id */
 	gf_bs_write_int(bs, 0, 3); /* decoder config flags */
 	gf_bs_write_int(bs, 0, 1); /* dsmcc flag */
@@ -2118,7 +2229,31 @@
 }
 
 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)
+u32 gf_m2ts_mux_program_get_pmt_pid(GF_M2TS_Mux_Program *prog)
+{
+	return prog->pmt ? prog->pmt->pid : 0;
+}
+
+GF_EXPORT
+u32 gf_m2ts_mux_program_get_pcr_pid(GF_M2TS_Mux_Program *prog)
+{
+	return prog->pcr ? prog->pcr->pid : 0;
+}
+
+GF_EXPORT
+u32 gf_m2ts_mux_program_get_stream_count(GF_M2TS_Mux_Program *prog)
+{
+	GF_M2TS_Mux_Stream *stream = prog->streams;
+	u32 count=0;
+	while (stream) {
+		count++;
+		stream = stream->next;
+	}
+	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)
 {
 	GF_M2TS_Mux_Stream *stream, *st;
 
@@ -2157,30 +2292,40 @@
 		introduce more overhead at very low bitrates where such cases happen, but will ensure proper timing
 		of each frame*/
 		stream->prevent_two_au_start_in_pes = GF_TRUE;
-		switch (ifce->object_type_indication) {
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
+		switch (ifce->codecid) {
+		case GF_CODECID_MPEG4_PART2:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG4;
 			break;
-		case GPAC_OTI_VIDEO_AVC:
+		case GF_CODECID_AVC:
 			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;
 			break;
-		case GPAC_OTI_VIDEO_SVC:
+		case GF_CODECID_SVC:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_SVC;
 			/*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;
 			gf_m2ts_stream_add_hierarchy_descriptor(stream);
 			break;
-		case GPAC_OTI_VIDEO_HEVC:
+		case GF_CODECID_HEVC:
 			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);
+				stream->force_single_au = GF_TRUE;
+				base_st = gf_m2ts_find_stream(program, 0, ifce->depends_on_stream);
+				if (base_st) base_st->force_single_au = GF_TRUE;
+			}
+
 			/*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 GPAC_OTI_VIDEO_LHVC:
+		case GF_CODECID_LHVC:
 			//FIXME - we need to check scalability type to see if we have MHVC, for now only use SHVC
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_SHVC;
 			/*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)
@@ -2190,53 +2335,70 @@
 			//force by default with SHVC since we don't have any delimiter / layer yet
 			stream->force_single_au = GF_TRUE;
 			break;
-		case GPAC_OTI_VIDEO_MPEG1:
+		case GF_CODECID_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG1;
 			break;
-		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-		case GPAC_OTI_VIDEO_MPEG2_MAIN:
-		case GPAC_OTI_VIDEO_MPEG2_SNR:
-		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-		case GPAC_OTI_VIDEO_MPEG2_HIGH:
-		case GPAC_OTI_VIDEO_MPEG2_422:
+		case GF_CODECID_MPEG2_SIMPLE:
+		case GF_CODECID_MPEG2_MAIN:
+		case GF_CODECID_MPEG2_SNR:
+		case GF_CODECID_MPEG2_SPATIAL:
+		case GF_CODECID_MPEG2_HIGH:
+		case GF_CODECID_MPEG2_422:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG2;
 			break;
 		/*JPEG/PNG carried in MPEG-4 PES*/
-		case GPAC_OTI_IMAGE_JPEG:
-		case GPAC_OTI_IMAGE_PNG:
+		case GF_CODECID_JPEG:
+		case GF_CODECID_PNG:
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_PES;
 			stream->force_single_au = GF_TRUE;
 			stream->mpeg2_stream_id = 0xFA;
 			gf_m2ts_stream_set_default_slconfig(stream);
 			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) ));
+
+			stream->mpeg2_stream_type = GF_M2TS_PRIVATE_DATA;
+			stream->force_single_au = GF_TRUE;
+			stream->force_reg_desc = GF_TRUE;
 			break;
 		}
 		break;
 	case GF_STREAM_AUDIO:
+		/*just pick first valid stream_id in audio range*/
+		stream->mpeg2_stream_id = 0xC0;
 		//override default packing for audio
 		stream->force_single_au = (stream->program->mux->au_pes_mode == GF_M2TS_PACK_NONE) ? GF_TRUE : GF_FALSE;
-		switch (ifce->object_type_indication) {
-		case GPAC_OTI_AUDIO_MPEG1:
+		switch (ifce->codecid) {
+		case GF_CODECID_MPEG_AUDIO:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_MPEG1;
 			break;
-		case GPAC_OTI_AUDIO_MPEG2_PART3:
+		case GF_CODECID_MPEG2_PART3:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_MPEG2;
 			break;
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-			stream->mpeg2_stream_type = GF_M2TS_AUDIO_LATM_AAC;
-			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AAC;
+		case GF_CODECID_AAC_MPEG4:
+		case GF_CODECID_AAC_MPEG2_MP:
+		case GF_CODECID_AAC_MPEG2_LCP:
+		case GF_CODECID_AAC_MPEG2_SSRP:
+			if (ifce->caps & GF_ESI_AAC_USE_LATM)
+				stream->mpeg2_stream_type = GF_M2TS_AUDIO_LATM_AAC;
+			else
+				stream->mpeg2_stream_type = GF_M2TS_AUDIO_AAC;
+
 			if (!ifce->repeat_rate) ifce->repeat_rate = 500;
 			break;
-		case GPAC_OTI_AUDIO_AC3:
+		case GF_CODECID_AC3:
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AC3;
 			break;
+		case GF_CODECID_EAC3:
+			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) ));
+			stream->mpeg2_stream_type = GF_M2TS_PRIVATE_DATA;
+			stream->force_single_au = GF_TRUE;
+			stream->force_reg_desc = GF_TRUE;
+			break;
 		}
-		/*just pick first valid stream_id in audio range*/
-		stream->mpeg2_stream_id = 0xC0;
 		break;
 	case GF_STREAM_OD:
 		/*highest priority for OD streams as they are needed to process other streams*/
@@ -2268,6 +2430,12 @@
 		stream->mpeg2_stream_type = GF_M2TS_METADATA_PES;
 		gf_m2ts_stream_add_metadata_pointer_descriptor(stream->program);
 		gf_m2ts_stream_add_metadata_descriptor(stream);
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Unsupported codec %s, signaling as raw data\n", gf_codecid_name(ifce->codecid) ));
+		stream->mpeg2_stream_id = 0xBD;
+		stream->mpeg2_stream_type = GF_M2TS_METADATA_PES;
+		break;
 	}
 
 	if (! (ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
@@ -2284,7 +2452,9 @@
 
 	stream->ifce->output_ctrl = gf_m2ts_output_ctrl;
 	stream->ifce->output_udta = stream;
-	stream->mx = gf_mx_new("M2TS PID");
+	if (needs_mutex)
+		stream->mx = gf_mx_new("M2TS PID");
+
 	if (ifce->timescale != 90000) {
 		stream->ts_scale.num = 90000;
 		stream->ts_scale.den = ifce->timescale;
@@ -2292,7 +2462,7 @@
 	return stream;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_m2ts_program_stream_update_ts_scale(GF_ESInterface *_self, u32 time_scale)
 {
 	GF_M2TS_Mux_Stream *stream = (GF_M2TS_Mux_Stream *)_self->output_udta;
@@ -2303,6 +2473,7 @@
 	stream->ts_scale.den = time_scale;
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_M2TS_Mux_Program *gf_m2ts_mux_program_find(GF_M2TS_Mux *muxer, u32 program_number)
@@ -2315,8 +2486,21 @@
 	return NULL;
 }
 
+
+GF_EXPORT
+u32 gf_m2ts_mux_program_count(GF_M2TS_Mux *muxer)
+{
+	u32 num=0;
+	GF_M2TS_Mux_Program *program = muxer->programs;
+	while (program) {
+		num++;
+		program = program->next;
+	}
+	return num;
+}
+
 GF_EXPORT
-GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, Bool mpeg4_signaling, u32 pmt_version, Bool initial_disc)
+GF_M2TS_Mux_Program *gf_m2ts_mux_program_add(GF_M2TS_Mux *muxer, u32 program_number, u32 pmt_pid, u32 pmt_refresh_rate, u32 pcr_offset, u32 mpeg4_signaling, u32 pmt_version, Bool initial_disc)
 {
 	GF_M2TS_Mux_Program *program;
 
@@ -2363,7 +2547,6 @@
 GF_EXPORT
 GF_M2TS_Mux *gf_m2ts_mux_new(u32 mux_rate, u32 pat_refresh_rate, Bool real_time)
 {
-	GF_BitStream *bs;
 	GF_M2TS_Mux *muxer;
 	GF_SAFEALLOC(muxer, GF_M2TS_Mux);
 	if (!muxer) return NULL;
@@ -2381,16 +2564,16 @@
 	if (mux_rate) muxer->fixed_rate = GF_TRUE;
 
 	/*format NULL packet*/
-	bs = gf_bs_new(muxer->null_pck, 188, GF_BITSTREAM_WRITE);
-	gf_bs_write_int(bs,	0x47, 8);
-	gf_bs_write_int(bs,	0, 1);
-	gf_bs_write_int(bs,	0, 1);
-	gf_bs_write_int(bs,	0, 1);
-	gf_bs_write_int(bs,	0x1FFF, 13);
-	gf_bs_write_int(bs,	0, 2);
-	gf_bs_write_int(bs,	1, 2);
-	gf_bs_write_int(bs,	0, 4);
-	gf_bs_del(bs);
+	muxer->pck_bs = gf_bs_new(muxer->null_pck, 188, GF_BITSTREAM_WRITE);
+	gf_bs_write_int(muxer->pck_bs,	0x47, 8);
+	gf_bs_write_int(muxer->pck_bs,	0, 1);
+	gf_bs_write_int(muxer->pck_bs,	0, 1);
+	gf_bs_write_int(muxer->pck_bs,	0, 1);
+	gf_bs_write_int(muxer->pck_bs,	0x1FFF, 13);
+	gf_bs_write_int(muxer->pck_bs,	0, 2);
+	gf_bs_write_int(muxer->pck_bs,	1, 2);
+	gf_bs_write_int(muxer->pck_bs,	0, 4);
+
 	gf_rand_init(GF_FALSE);
 	muxer->pcr_update_ms = 100;
 	return muxer;
@@ -2435,6 +2618,7 @@
 		gf_free(curr_pck);
 	}
 	if (st->curr_pck.data) gf_free(st->curr_pck.data);
+	if (st->curr_pck.mpeg2_af_descriptors) gf_free(st->curr_pck.mpeg2_af_descriptors);
 	if (st->mx) gf_mx_del(st->mx);
 	if (st->loop_descriptors) {
 		while (gf_list_count(st->loop_descriptors) ) {
@@ -2450,6 +2634,9 @@
 
 void gf_m2ts_mux_program_del(GF_M2TS_Mux_Program *prog)
 {
+	if (prog->iod) {
+		gf_odf_desc_del(prog->iod);
+	}
 	while (prog->streams) {
 		GF_M2TS_Mux_Stream *st = prog->streams->next;
 		gf_m2ts_mux_stream_del(prog->streams);
@@ -2471,6 +2658,27 @@
 }
 
 GF_EXPORT
+void gf_m2ts_program_stream_remove(GF_M2TS_Mux_Stream *stream)
+{
+	GF_M2TS_Mux_Program *program = stream->program;
+	GF_M2TS_Mux_Stream *a_stream = program->streams;
+	if (a_stream==stream) {
+		program->streams = stream->next;
+	} else {
+		while (a_stream) {
+			if (a_stream->next == stream) {
+				a_stream->next = stream->next;
+				break;
+			}
+			a_stream = a_stream->next;
+		}
+	}
+	stream->next = NULL;
+	gf_m2ts_mux_stream_del(stream);
+	program->pmt->table_needs_update = GF_TRUE;
+}
+
+GF_EXPORT
 void gf_m2ts_mux_del(GF_M2TS_Mux *mux)
 {
 	while (mux->programs) {
@@ -2480,6 +2688,8 @@
 	}
 	gf_m2ts_mux_stream_del(mux->pat);
 	if (mux->sdt) gf_m2ts_mux_stream_del(mux->sdt);
+	if (mux->pck_bs) gf_bs_del(mux->pck_bs);
+
 	gf_free(mux);
 }
 
@@ -2529,6 +2739,11 @@
 		mux->time.sec = mux->time.nanosec = 0;
 		mux->init_sys_time = 0;
 	}
+
+	if (!mux->bit_rate) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG2-TS Muxer] No bitrates set in VBR mux mode, using 100kbps\n"));
+		mux->bit_rate=100000;
+	}
 }
 
 GF_EXPORT
@@ -2547,6 +2762,17 @@
 }
 
 GF_EXPORT
+u64 gf_m2ts_get_ts_clock_90k(GF_M2TS_Mux *muxer)
+{
+	u64 now, init;
+	init = ((u64)muxer->init_ts_time.sec) * 90000;
+	init += ((u64) muxer->init_ts_time.nanosec/1000) * 9 / 100;
+	now = ((u64) muxer->time.sec)*90000;
+	now += ((u64) muxer->time.nanosec/1000) * 9 / 100;
+	return now - init;
+}
+
+GF_EXPORT
 GF_Err gf_m2ts_mux_use_single_au_pes_mode(GF_M2TS_Mux *muxer, GF_M2TS_PackMode au_pes_mode)
 {
 	if (!muxer) return GF_BAD_PARAM;
@@ -2572,7 +2798,7 @@
 
 
 GF_EXPORT
-const char *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, u32 *status, u32 *usec_till_next)
+const u8 *gf_m2ts_mux_process(GF_M2TS_Mux *muxer, GF_M2TSMuxState *status, u32 *usec_till_next)
 {
 	GF_M2TS_Mux_Program *program;
 	GF_M2TS_Mux_Stream *stream, *stream_to_process;
@@ -2587,6 +2813,9 @@
 	nb_streams = nb_streams_done = 0;
 	*status = GF_M2TS_STATE_IDLE;
 
+	muxer->sap_inserted = GF_FALSE;
+	muxer->last_pid = 0;
+
 	now_us = gf_sys_clock_high_res();
 	if (muxer->real_time) {
 		if (!muxer->init_sys_time) {
@@ -2789,9 +3018,16 @@
 	} else {
 
 		if (stream_to_process->tables) {
-			gf_m2ts_mux_table_get_next_packet(stream_to_process, muxer->dst_pck);
+			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;
+			}
+			muxer->last_pts = stream_to_process->curr_pck.cts;
+			muxer->last_pid = stream_to_process->pid;
 		}
 
 		ret = muxer->dst_pck;
@@ -2815,7 +3051,8 @@
 		}
 		/*if a stream was found, use it*/
 		else if (stream_to_process) {
-			muxer->time = time;
+			if (gf_m2ts_time_less_or_equal(&muxer->time, &time))
+				muxer->time = time;
 		}
 
 		muxer->pck_sent_over_br_window++;
@@ -2835,4 +3072,3 @@
 }
 
 #endif /*GPAC_DISABLE_MPEG2TS_MUX*/
-

gpac-0.8.0.tar.gz/src/media_tools/m3u8.c -> gpac-1.0.0.tar.gz/src/media_tools/m3u8.c Changed

@@ -62,7 +62,7 @@
 	char *init_url;
 	char *key_url;
 	bin128 key_iv;
-	Bool independant_segments;
+	Bool independent_segments;
 } s_accumulated_attributes;
 
 
@@ -109,6 +109,9 @@
 	if (e->key_uri) {
 		gf_free(e->key_uri);
 	}
+	if (e->init_segment_url) {
+		gf_free(e->init_segment_url);
+	}
 	memset(e->key_iv, 0, sizeof(bin128) );
 	if (e->url) 
 		gf_free(e->url);
@@ -130,7 +133,7 @@
 /**
  * Creates an Playlist element.
  * This element can be either a playlist of a stream according to first parameter.
- * \return NULL if element could not be created. Elements will be deleted recursively.
+\param NULL if element could not be created. Elements will be deleted recursively.
  */
 static PlaylistElement* playlist_element_new(PlaylistElementType element_type, const char *url, s_accumulated_attributes *attribs)
 {
@@ -305,7 +308,7 @@
 			while (line[start+spaces] == ' ')
 				spaces++;
 			if ((sz-spaces<=1) && (line[start+spaces]==',')) {
-				start = i+1;
+				//start = i+1;
 			} else {
 				if (!strncmp(&line[start+spaces], "\t", sz-spaces) || !strncmp(&line[start+spaces], "\n", sz-spaces)) {
 				} else {
@@ -344,10 +347,8 @@
  */
 static char** parse_attributes(const char *line, s_accumulated_attributes *attributes) {
 	int int_value, i;
-	double double_value;
 	char **ret;
 	char *end_ptr;
-	char *utility;
 	if (line == NULL)
 		return NULL;
 	if (!safe_start_equals("#EXT", line))
@@ -404,7 +405,7 @@
 		/* #EXTINF:<duration>,<title> */
 		attributes->is_media_segment = GF_TRUE;
 		if (ret[0]) {
-			double_value = strtod(ret[0], &end_ptr);
+			double double_value = strtod(ret[0], &end_ptr);
 			if (end_ptr != ret[0]) {
 				attributes->duration_in_seconds = double_value;
 			}
@@ -413,6 +414,7 @@
 			}
 		}
 		if (ret[1]) {
+			if (attributes->title) gf_free(attributes->title);
 			attributes->title = gf_strdup(ret[1]);
 		}
 		return ret;
@@ -430,6 +432,7 @@
 			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]));
 				}
 			}
@@ -468,6 +471,7 @@
 				char *uri = val + 5;
 				int_value = (u32) strlen(uri);
 				if (uri[int_value-1] == '"') {
+					if (attributes->init_url) gf_free(attributes->init_url);
 					attributes->init_url = gf_strdup(uri);
 					attributes->init_url[int_value-1]=0;
 				}
@@ -496,6 +500,7 @@
 		attributes->is_master_playlist = GF_TRUE;
 		M3U8_COMPATIBILITY_VERSION(1);
 		while (ret[i] != NULL) {
+			char *utility;
 			if (safe_start_equals("BANDWIDTH=", ret[i])) {
 				utility = &(ret[i][10]);
 				int_value = (s32) strtol(utility, &end_ptr, 10);
@@ -509,6 +514,7 @@
 			} else if (safe_start_equals("CODECS=\"", ret[i])) {
 				int_value = (u32) strlen(ret[i]);
 				if (ret[i][int_value-1] == '"') {
+					if (attributes->codecs) gf_free(attributes->codecs);
 					attributes->codecs = gf_strdup(&(ret[i][7]));
 				}
 			} else if (safe_start_equals("RESOLUTION=", ret[i])) {
@@ -522,11 +528,13 @@
 			} else if (safe_start_equals("AUDIO=", ret[i])) {
 				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
 				attributes->type = MEDIA_TYPE_AUDIO;
+				if (attributes->group.audio) gf_free(attributes->group.audio);
 				attributes->group.audio = gf_strdup(ret[i] + 6);
 				M3U8_COMPATIBILITY_VERSION(4);
 			} else if (safe_start_equals("VIDEO=", ret[i])) {
 				assert(attributes->type == MEDIA_TYPE_UNKNOWN);
 				attributes->type = MEDIA_TYPE_VIDEO;
+				if (attributes->group.video) gf_free(attributes->group.video);
 				attributes->group.video = gf_strdup(ret[i] + 6);
 				M3U8_COMPATIBILITY_VERSION(4);
 			}
@@ -583,6 +591,7 @@
 				}
 			} else if (safe_start_equals("URI=\"", ret[i])) {
 				size_t len;
+				if (attributes->mediaURL) gf_free(attributes->mediaURL);
 				attributes->mediaURL = gf_strdup(ret[i]+5);
 				len = strlen(attributes->mediaURL);
 				if (len && (attributes->mediaURL[len-1] == '"')) {
@@ -592,23 +601,28 @@
 				}
 			} else if (safe_start_equals("GROUP-ID=", ret[i])) {
 				if (attributes->type == MEDIA_TYPE_AUDIO) {
+					if (attributes->group.audio) gf_free(attributes->group.audio);
 					attributes->group.audio = gf_strdup(ret[i]+9);
 					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(AUDIO, attributes->group.audio);
 				} else if (attributes->type == MEDIA_TYPE_VIDEO) {
+					if (attributes->group.video) gf_free(attributes->group.video);
 					attributes->group.video = gf_strdup(ret[i]+9);
 					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(VIDEO, attributes->group.video);
 				} else if (attributes->type == MEDIA_TYPE_SUBTITLES) {
+					if (attributes->group.subtitle) gf_free(attributes->group.subtitle);
 					attributes->group.subtitle = gf_strdup(ret[i]+9);
 					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(SUBTITLES, attributes->group.subtitle);
 				} else if (attributes->type == MEDIA_TYPE_CLOSED_CAPTIONS) {
-					attributes->group.subtitle = gf_strdup(ret[i]+9);
-					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(CLOSED_CAPTIONS, attributes->group.subtitle);
+					if (attributes->group.closed_captions) gf_free(attributes->group.closed_captions);
+					attributes->group.closed_captions = gf_strdup(ret[i]+9);
+					attributes->stream_id = GROUP_ID_TO_PROGRAM_ID(CLOSED_CAPTIONS, attributes->group.closed_captions);
 				} else if (attributes->type == MEDIA_TYPE_UNKNOWN) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Invalid #EXT-X-MEDIA:GROUP-ID=%s. Ignoring the line.\n", ret[i]+9));
 					return NULL;
 				}
 			} else if (safe_start_equals("LANGUAGE=\"", ret[i])) {
 				size_t len;
+				if (attributes->language) gf_free(attributes->language);
 				attributes->language = gf_strdup(ret[i]+9);
 				len = strlen(attributes->language);
 				if (len && (attributes->language[len-1] == '"')) {
@@ -664,7 +678,7 @@
 		return ret;
 	}
 	if (!strncmp(line, "#EXT-X-INDEPENDENT-SEGMENTS", strlen("#EXT-X-INDEPENDENT-SEGMENTS") )) {
-		attributes->independant_segments = GF_TRUE;
+		attributes->independent_segments = GF_TRUE;
 		M3U8_COMPATIBILITY_VERSION(1);
 		return NULL;
 	}
@@ -678,7 +692,7 @@
 
 /**
  * Creates a new MasterPlaylist
- * \return NULL if MasterPlaylist element could not be allocated
+\param NULL if MasterPlaylist element could not be allocated
  */
 MasterPlaylist* master_playlist_new()
 {
@@ -749,6 +763,11 @@
 GF_EXPORT
 GF_Err gf_m3u8_parse_master_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL)
 {
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		string2num("coverage");
+	}
+#endif
 	return gf_m3u8_parse_sub_playlist(file, playlist, baseURL, NULL, NULL);
 }
 
@@ -949,18 +968,19 @@
 
 GF_Err gf_m3u8_parse_sub_playlist(const char *file, MasterPlaylist **playlist, const char *baseURL, Stream *in_stream, PlaylistElement *sub_playlist)
 {
-	int len, i, currentLineNumber;
+	int i, currentLineNumber;
 	FILE *f = NULL;
-	char *m3u8_payload;
+	u8 *m3u8_payload;
 	u32 m3u8_size, m3u8pos;
 	char currentLine[M3U8_BUF_SIZE];
 	char **attributes = NULL;
 	s_accumulated_attributes attribs;
 
 	if (!strncmp(file, "gmem://", 7)) {
-		if (sscanf(file, "gmem://%d@%p", &m3u8_size, &m3u8_payload) != 2) {
+		GF_Err e = gf_blob_get_data(file, &m3u8_payload,  &m3u8_size);
+		if (e) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH,("[M3U8] Cannot Open m3u8 source %s for reading\n", file));
-			return GF_SERVICE_ERROR;
+			return e;
 		}
 	} else {
 		f = gf_fopen(file, "rt");
@@ -981,8 +1001,9 @@
 	m3u8pos = 0;
 	while (1) {
 		char *eof;
+		int len;
 		if (f) {
-			if (!fgets(currentLine, sizeof(currentLine), f))
+			if (!gf_fgets(currentLine, sizeof(currentLine), f))
 				break;
 		} else {
 			u32 __idx = 0;
@@ -1042,7 +1063,7 @@
 				if (attribs.is_playlist_ended) {
 					(*playlist)->playlist_needs_refresh = GF_FALSE;
 				}
-				if (attribs.independant_segments) {
+				if (attribs.independent_segments) {
 					(*playlist)->independent_segments = GF_TRUE;
 				}
 				if (attribs.mediaURL) {
@@ -1066,9 +1087,36 @@
 
 			//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
-			//reset_attributes(&attribs);
+
 			attribs.width = attribs.height = 0;
-			attribs.codecs = NULL;
+			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;
+			}
 		}
 	}
 	if (f) gf_fclose(f);
@@ -1090,6 +1138,16 @@
 		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-0.8.0.tar.gz/src/media_tools/media_export.c -> gpac-1.0.0.tar.gz/src/media_tools/media_export.c Changed

gpac-0.8.0.tar.gz/src/media_tools/media_import.c -> gpac-1.0.0.tar.gz/src/media_tools/media_import.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre, Romain Bouqueau, Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -23,26 +23,17 @@
  *
  */
 
+#include <gpac/filters.h>
+#include <gpac/constants.h>
+
+
 #include <gpac/internal/media_dev.h>
-#ifndef GPAC_DISABLE_AVILIB
-#include <gpac/internal/avilib.h>
-#endif
-#ifndef GPAC_DISABLE_OGG
-#include <gpac/internal/ogg.h>
-#endif
-#ifndef GPAC_DISABLE_VOBSUB
-#include <gpac/internal/vobsub.h>
-#endif
+
 #include <gpac/xml.h>
-#include <gpac/mpegts.h>
-#include <gpac/constants.h>
-#include <gpac/base_coding.h>
-#include <gpac/internal/isomedia_dev.h>
 
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 
-
 GF_Err gf_import_message(GF_MediaImporter *import, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
@@ -59,77 +50,16 @@
 }
 
 
-static GF_Err gf_media_update_par(GF_ISOFile *file, u32 track)
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	u32 tk_w, tk_h, stype;
-	GF_Err e;
-
-	e = gf_isom_get_visual_info(file, track, 1, &tk_w, &tk_h);
-	if (e) return e;
-
-	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)
-	   ) {
-		s32 par_n, par_d;
-		GF_AVCConfig *avcc = gf_isom_avc_config_get(file, track, 1);
-		GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avcc->sequenceParameterSets, 0);
-		par_n = par_d = 1;
-		if (slc) gf_avc_get_sps_info(slc->data, slc->size, NULL, NULL, NULL, &par_n, &par_d);
-		gf_odf_avc_cfg_del(avcc);
-
-		if ((par_n>1) && (par_d>1))
-			tk_w = tk_w * par_n / par_d;
-	}
-	else if ((stype==GF_ISOM_SUBTYPE_MPEG4) || (stype==GF_ISOM_SUBTYPE_MPEG4_CRYP) ) {
-		GF_M4VDecSpecInfo dsi;
-		GF_ESD *esd = gf_isom_get_esd(file, track, 1);
-		if (!esd || !esd->decoderConfig || (esd->decoderConfig->streamType!=4) || (esd->decoderConfig->objectTypeIndication!=GPAC_OTI_VIDEO_MPEG4_PART2)) {
-			if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
-			return GF_NOT_SUPPORTED;
-		}
-		gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-		if (esd) gf_odf_desc_del((GF_Descriptor *) esd);
-
-		if ((dsi.par_num>1) && (dsi.par_den>1))
-			tk_w = dsi.width * dsi.par_num / dsi.par_den;
-	} else {
-		return GF_OK;
-	}
-	return gf_isom_set_track_layout_info(file, track, tk_w<<16, tk_h<<16, 0, 0, 0);
-#else
-	return GF_OK;
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-}
-
-
-GF_EXPORT
-void gf_media_update_bitrate(GF_ISOFile *file, u32 track)
+static void gf_media_update_bitrate_ex(GF_ISOFile *file, u32 track, Bool use_esd)
 {
 #ifndef GPAC_DISABLE_ISOM_WRITE
-	u32 i, count, timescale, db_size, ofmt, cdur, csize;
-	u64 time_wnd, rate, max_rate, avg_rate, bitrate;
+	u32 i, count, timescale, db_size, cdur, csize;
+	u64 time_wnd, max_rate, avg_rate, bitrate;
 	Double br;
-	GF_ESD *esd = NULL;
-
-	switch (gf_isom_get_media_subtype(file, track, 1)) {
-	case GF_ISOM_SUBTYPE_MPEG4:
-		esd = gf_isom_get_esd(file, track, 1);
-		break;
-	case GF_ISOM_SUBTYPE_MPEG4_CRYP:
-		gf_isom_get_original_format_type(file, track, 1, &ofmt);
-		switch (ofmt) {
-		case GF_ISOM_BOX_TYPE_MP4S:
-		case GF_ISOM_BOX_TYPE_MP4A:
-		case GF_ISOM_BOX_TYPE_MP4V:
-			esd = gf_isom_get_esd(file, track, 1);
-			break;
-		}
-	}
+	GF_ISOSample sample;
 
 	db_size = 0;
-	rate = max_rate = avg_rate = time_wnd = 0;
+	max_rate = avg_rate = time_wnd = bitrate = 0;
 
 	csize = 0;
 	cdur = 0;
@@ -139,15 +69,20 @@
 		if (cdur > 1) cdur = 0;
 	}
 
+	memset(&sample, 0, sizeof(GF_ISOSample));
 	timescale = gf_isom_get_media_timescale(file, track);
 	count = gf_isom_get_sample_count(file, track);
+
 	if (csize && cdur) {
 		db_size = 0;
 		avg_rate = 8 * csize * timescale / cdur;
-		bitrate = rate = avg_rate;
+		bitrate = avg_rate;
 	} else {
+		u32 rate = 0;
 		for (i=0; i<count; i++) {
-			GF_ISOSample *samp = gf_isom_get_sample_info(file, track, i+1, NULL, NULL);
+			u32 di;
+			GF_ISOSample *samp = gf_isom_get_sample_info_ex(file, track, i+1, &di, NULL, &sample);
+			if (!samp) break;
 
 			if (samp->dataLength > db_size) db_size = samp->dataLength;
 
@@ -158,31 +93,42 @@
 				time_wnd = samp->DTS;
 				rate = 0;
 			}
-			gf_isom_sample_del(&samp);
 		}
-		br = (Double) (s64) gf_isom_get_media_duration(file, track);
-		br /= timescale;
-		bitrate = (u32) ((Double) (s64)avg_rate / br);
-		bitrate *= 8;
-		max_rate *= 8;
-	}
-	if (!max_rate) max_rate = bitrate;
-
-	/*move to bps*/
-	if (esd) {
-		esd->decoderConfig->avgBitrate = (u32) bitrate;
-		esd->decoderConfig->maxBitrate = (u32) max_rate;
-		esd->decoderConfig->bufferSizeDB = db_size;
-		gf_isom_change_mpeg4_description(file, track, 1, esd);
-		gf_odf_desc_del((GF_Descriptor *)esd);
-	} else {
-		gf_isom_update_bitrate(file, track, 1, (u32) bitrate, (u32) max_rate, db_size);
 	}
 
+	br = (Double) (s64) gf_isom_get_media_duration(file, track);
+	br /= timescale;
+	if (br) {
+		GF_ESD *esd = NULL;
+		if (!csize || !cdur) {
+			bitrate = (u32) ((Double) (s64)avg_rate / br);
+			bitrate *= 8;
+			max_rate *= 8;
+		}
+		if (!max_rate) max_rate = bitrate;
+
+		if (use_esd) esd = gf_isom_get_esd(file, track, 1);
+		if (esd && esd->decoderConfig) {
+			esd->decoderConfig->avgBitrate = (u32) bitrate;
+			esd->decoderConfig->maxBitrate = (u32) max_rate;
+			esd->decoderConfig->bufferSizeDB = db_size;
+			gf_isom_change_mpeg4_description(file, track, 1, esd);
+		} else {
+			/*move to bps*/
+			gf_isom_update_bitrate(file, track, 1, (u32) bitrate, (u32) max_rate, db_size);
+		}
+		if (esd) gf_odf_desc_del((GF_Descriptor *)esd);
+	}
 #endif
 }
 
-static void get_video_timing(Double fps, u32 *timescale, u32 *dts_inc)
+GF_EXPORT
+void gf_media_update_bitrate(GF_ISOFile *file, u32 track)
+{
+	gf_media_update_bitrate_ex(file, track, GF_FALSE);
+
+}
+void gf_media_get_video_timing(Double fps, u32 *timescale, u32 *dts_inc)
 {
 	u32 fps_1000 = (u32) (fps*1000 + 0.5);
 	/*handle all drop-frame formats*/
@@ -203,184 +149,6 @@
 	}
 }
 
-static GF_Err gf_import_still_image(GF_MediaImporter *import, Bool mult_desc_allowed)
-{
-	GF_BitStream *bs;
-	GF_Err e;
-	Bool destroy_esd;
-	u32 size, track, di, w, h, dsi_len, mtype, id;
-	GF_ISOSample *samp;
-	u8 OTI;
-	char *dsi, *data;
-	FILE *src;
-	Bool import_mpeg4 = GF_FALSE;
-
-	if (import->flags & GF_IMPORT_FORCE_MPEG4)
-		import_mpeg4 = GF_TRUE;
-	else if (import->esd)
-		import_mpeg4 = GF_TRUE;
-
-	src = gf_fopen(import->in_name, "rb");
-	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	gf_fseek(src, 0, SEEK_END);
-	size = (u32) gf_ftell(src);
-	gf_fseek(src, 0, SEEK_SET);
-	data = (char*)gf_malloc(sizeof(char)*size);
-	size = (u32) fread(data, sizeof(char), size, src);
-	gf_fclose(src);
-	if ((s32) size <= 0) {
-		gf_free(data);
-		return gf_import_message(import, GF_URL_ERROR, "Reading file %s failed", import->in_name);
-	}
-	/*get image size*/
-	bs = gf_bs_new(data, size, GF_BITSTREAM_READ);
-	dsi = NULL;
-	gf_img_parse(bs, &OTI, &mtype, &w, &h, import_mpeg4 ? &dsi : NULL, import_mpeg4 ? &dsi_len : NULL);
-	gf_bs_del(bs);
-
-	if (!OTI) {
-		gf_free(data);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unrecognized file %s", import->in_name);
-	}
-
-	if (!w || !h) {
-		gf_free(data);
-		if (dsi) gf_free(dsi);
-		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Invalid %s file", (OTI==GPAC_OTI_IMAGE_JPEG) ? "JPEG" : (OTI==GPAC_OTI_IMAGE_PNG) ? "PNG" : "JPEG2000");
-	}
-
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].media_type = mtype;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_NO_DURATION;
-		import->tk_info[0].video_info.width = w;
-		import->tk_info[0].video_info.height = h;
-		import->nb_tracks = 1;
-		gf_free(data);
-		if (dsi) gf_free(dsi);
-		return GF_OK;
-	}
-
-	destroy_esd = GF_FALSE;
-
-	id = 0;
-	if (import_mpeg4) {
-
-		if (!import->esd) {
-			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = GF_TRUE;
-		}
-		/*update stream type/oti*/
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		import->esd->decoderConfig->objectTypeIndication = OTI;
-		import->esd->decoderConfig->bufferSizeDB = size;
-		import->esd->decoderConfig->avgBitrate = 8*size;
-		import->esd->decoderConfig->maxBitrate = 8*size;
-		import->esd->slConfig->timestampResolution = 1000;
-
-		if (dsi) {
-			if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-			if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-			import->esd->decoderConfig->decoderSpecificInfo->data = dsi;
-			import->esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_len;
-		}
-		id = import->esd->ESID;
-	}
-
-
-	track = 0;
-	if (mult_desc_allowed)
-		track = gf_isom_get_track_by_id(import->dest, id);
-	if (!track)
-		track = gf_isom_new_track(import->dest, id, GF_ISOM_MEDIA_VISUAL, 1000);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-
-	if (import_mpeg4) {
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-		import->final_trackID = import->esd->ESID;
-
-		e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-		if (e) goto exit;
-	} else {
-		GF_GenericSampleDescription udesc;
-		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
-		switch (OTI) {
-		case GPAC_OTI_IMAGE_JPEG:
-			udesc.codec_tag = GF_ISOM_BOX_TYPE_JPEG;
-			memcpy(udesc.compressor_name, " JPEG", 5);
-			udesc.compressor_name[0] = 4;
-			break;
-		case GPAC_OTI_IMAGE_PNG:
-			udesc.codec_tag = GF_ISOM_BOX_TYPE_PNG;
-			memcpy(udesc.compressor_name, " PNG", 4);
-			udesc.compressor_name[0] = 3;
-			break;
-		case GPAC_OTI_IMAGE_JPEG_2000:
-			udesc.codec_tag = GF_ISOM_BOX_TYPE_JP2K;
-			memcpy(udesc.compressor_name, " JPEG2000", 9);
-			udesc.compressor_name[0] = 8;
-			break;
-		default:
-			memcpy(udesc.compressor_name, " UNKNOWN", 8);
-			udesc.compressor_name[0] = 7;
-			break;
-		}
-		udesc.width = w;
-		udesc.height = h;
-		udesc.v_res = 72;
-		udesc.h_res = 72;
-		udesc.depth = 24;
-
-		gf_isom_new_generic_sample_description(import->dest, track, NULL, NULL, &udesc, &di);
-		import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	}
-
-	gf_isom_set_visual_info(import->dest, track, di, w, h);
-	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
-	samp->dataLength = size;
-	if (import->initial_time_offset) samp->DTS = (u64) (import->initial_time_offset*1000);
-
-	gf_import_message(import, GF_OK, "%s import %s - size %d x %d", (OTI==GPAC_OTI_IMAGE_JPEG) ? "JPEG" : (OTI==GPAC_OTI_IMAGE_PNG) ? "PNG" : "JPEG2000", import->in_name, w, h);
-
-	/*we must start a track from DTS = 0*/
-	if (!gf_isom_get_sample_count(import->dest, track) && samp->DTS) {
-		/*todo - we could add an edit list*/
-		samp->DTS=0;
-	}
-
-	gf_set_progress("Importing Image", 0, 1);
-	if (import->flags & GF_IMPORT_USE_DATAREF) {
-		e = gf_isom_add_sample_reference(import->dest, track, di, samp, (u64) 0);
-	} else {
-		samp->data = data;
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		samp->data = NULL;
-	}
-	gf_set_progress("Importing Image", 1, 1);
-
-	gf_isom_sample_del(&samp);
-	if (import->duration) {
-		gf_isom_set_last_sample_duration(import->dest, track, import->duration);
-	}
-
-exit:
-	gf_free(data);
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	return e;
-}
 
 static GF_Err gf_import_afx_sc3dmc(GF_MediaImporter *import, Bool mult_desc_allowed)
 {
@@ -388,31 +156,23 @@
 	Bool destroy_esd;
 	u32 size, track, di, dsi_len;
 	GF_ISOSample *samp;
-	u8 OTI;
+	u32 codecid;
 	char *dsi, *data;
-	FILE *src;
 
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_SCENE;
-		import->tk_info[0].media_type = GPAC_OTI_SCENE_AFX;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_NO_DURATION;
+		import->tk_info[0].stream_type = GF_STREAM_SCENE;
+		import->tk_info[0].codecid = GF_CODECID_AFX;
 		import->nb_tracks = 1;
 		return GF_OK;
 	}
 
-	src = gf_fopen(import->in_name, "rb");
-	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
+	e = gf_file_load_data(import->in_name, (u8 **) &data, &size);
+	if (e) return gf_import_message(import, e, "Opening file %s failed", import->in_name);
 
-	gf_fseek(src, 0, SEEK_END);
-	size = (u32) gf_ftell(src);
-	gf_fseek(src, 0, SEEK_SET);
-	data = (char*)gf_malloc(sizeof(char)*size);
-	size = (u32) fread(data, sizeof(char), size, src);
-	gf_fclose(src);
 	if ((s32) size < 0) return GF_IO_ERR;
 
-	OTI = GPAC_OTI_SCENE_AFX;
+	codecid = GF_CODECID_AFX;
 
 	dsi = (char *)gf_malloc(1);
 	dsi_len = 1;
@@ -427,18 +187,16 @@
 	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	import->esd->decoderConfig->streamType = GF_STREAM_SCENE;
-	import->esd->decoderConfig->objectTypeIndication = OTI;
+	import->esd->decoderConfig->objectTypeIndication = codecid;
 	import->esd->decoderConfig->bufferSizeDB = size;
 	import->esd->decoderConfig->avgBitrate = 8*size;
 	import->esd->decoderConfig->maxBitrate = 8*size;
 	import->esd->slConfig->timestampResolution = 1000;
 
-	if (dsi) {
-		if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-		import->esd->decoderConfig->decoderSpecificInfo->data = dsi;
-		import->esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_len;
-	}
+	if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+	if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
+	import->esd->decoderConfig->decoderSpecificInfo->data = dsi;
+	import->esd->decoderConfig->decoderSpecificInfo->dataLength = dsi_len;
 
 
 	track = 0;
@@ -450,10 +208,13 @@
 		e = gf_isom_last_error(import->dest);
 		goto exit;
 	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
+	gf_isom_set_track_enabled(import->dest, track, GF_TRUE);
 	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
 	import->final_trackID = import->esd->ESID;
 
+	if (import->source_magic)
+		gf_isom_set_track_magic(import->dest, track, import->source_magic);
+
 	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
 	if (e) goto exit;
 	//gf_isom_set_visual_info(import->dest, track, di, w, h);
@@ -491,1619 +252,47 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-GF_Err gf_import_mp3(GF_MediaImporter *import)
-{
-	u8 oti;
-	Bool destroy_esd;
-	GF_Err e;
-	u16 sr;
-	u32 nb_chan;
-	Bool force_mpeg4 = GF_FALSE;
-	FILE *in;
-	u32 hdr, size, max_size, track, di, id3_end = 0;
-	u64 done, tot_size, offset, duration;
-	GF_ISOSample *samp;
-
-	in = gf_fopen(import->in_name, "rb");
-	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-
-	{
-		unsigned char id3v2[10];
-		u32 pos = (u32) fread(id3v2, sizeof(unsigned char), 10, in);
-		if ((s32) pos < 0) return gf_import_message(import, GF_IO_ERR, "IO error reading file %s", import->in_name);
-
-		if (pos == 10) {
-			/* Did we read an ID3v2 ? */
-			if (id3v2[0] == 'I' && id3v2[1] == 'D' && id3v2[2] == '3') {
-				u32 sz = ((id3v2[9] & 0x7f) + ((id3v2[8] & 0x7f) << 7) + ((id3v2[7] & 0x7f) << 14) + ((id3v2[6] & 0x7f) << 21));
-
-				while (sz) {
-					u32 r = (u32) fread(id3v2, sizeof(unsigned char), 1, in);
-					if (r != 1) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[MP3 import] failed to read ID3\n"));
-					}
-					sz--;
-				}
-				id3_end = (u32) gf_ftell(in);
-			}
-		}
-		fseek(in, id3_end, SEEK_SET);
-	}
-
-	hdr = gf_mp3_get_next_header(in);
-	if (!hdr) {
-		gf_fclose(in);
-		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-1/2 audio");
-	}
-	sr = gf_mp3_sampling_rate(hdr);
-	oti = gf_mp3_object_type_indication(hdr);
-	if (!oti) {
-		gf_fclose(in);
-		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-1/2 audio");
-	}
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		gf_fclose(in);
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
-		import->tk_info[0].audio_info.sample_rate = sr;
-		import->tk_info[0].audio_info.nb_channels = gf_mp3_num_channels(hdr);
-		import->nb_tracks = 1;
-		return GF_OK;
-	}
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	} else {
-		force_mpeg4 = GF_TRUE;
-	}
-	if (import->flags & GF_IMPORT_FORCE_MPEG4)
-		force_mpeg4 = GF_TRUE;
-
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	/*update stream type/oti*/
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = oti;
-	import->esd->decoderConfig->bufferSizeDB = 20;
-	import->esd->slConfig->timestampResolution = sr;
-
-	samp = NULL;
-	nb_chan = gf_mp3_num_channels(hdr);
-	gf_import_message(import, GF_OK, "MP3 import - sample rate %d - %s audio - %d channel%s", sr, (oti==GPAC_OTI_AUDIO_MPEG1) ? "MPEG-1" : "MPEG-2", nb_chan, (nb_chan>1) ? "s" : "");
-
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sr);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = NULL;
-
-	if (force_mpeg4) {
-		gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	} else {
-		GF_GenericSampleDescription udesc;
-		memset(&udesc, 0, sizeof(GF_GenericSampleDescription));
-		udesc.codec_tag = GF_ISOM_BOX_TYPE_MP3;
-		memcpy(udesc.compressor_name, "\3MP3", 4);
-		udesc.samplerate = sr;
-		udesc.nb_channels = nb_chan;
-		gf_isom_new_generic_sample_description(import->dest, track, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &udesc, &di);
-	}
-
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16, import->asemode);
-
-	gf_fseek(in, 0, SEEK_END);
-	tot_size = gf_ftell(in);
-	gf_fseek(in, id3_end, SEEK_SET);
-
-	e = GF_OK;
-	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
-
-	duration = import->duration;
-	duration *= sr;
-	duration /= 1000;
-
-	max_size = 0;
-	done = 0;
-	while (tot_size > done) {
-		/* get the next MP3 frame header */
-		hdr = gf_mp3_get_next_header(in);
-		/*MP3 stream truncated*/
-		if (!hdr) break;
-
-		offset = gf_ftell(in) - 4;
-		size = gf_mp3_frame_size(hdr);
-		assert(size);
-		if (size>max_size) {
-			samp->data = (char*)gf_realloc(samp->data, sizeof(char) * size);
-			max_size = size;
-		}
-		samp->data[0] = (hdr >> 24) & 0xFF;
-		samp->data[1] = (hdr >> 16) & 0xFF;
-		samp->data[2] = (hdr >> 8) & 0xFF;
-		samp->data[3] = hdr & 0xFF;
-		samp->dataLength = size;
-
-		/* read the frame data into the buffer */
-		if (fread(&samp->data[4], 1, size - 4, in) != size - 4) break;
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		if (e) goto exit;
-
-		gf_set_progress("Importing MP3", done, tot_size);
-
-		samp->DTS += gf_mp3_window_size(hdr);
-		done += samp->dataLength;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	gf_media_update_bitrate(import->dest, track);
-	gf_set_progress("Importing MP3", tot_size, tot_size);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (samp) gf_isom_sample_del(&samp);
-	gf_fclose(in);
-	return e;
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-	Bool is_mp2, no_crc;
-	u32 profile, sr_idx, nb_ch, frame_size;
-} ADTSHeader;
-
-static SAPType xHEAAC_isRAP(u32 profile, char *data, u32 dataLength)
-{
-	if (profile == 42) { /*xHE-AAC*/
-		if (dataLength > 0 && (data[0] & 0x80))
-			return RAP;
-		else
-			return RAP_NO;
-	}
-
-	return RAP;
-}
-
-static Bool ADTS_SyncFrame(GF_BitStream *bs, ADTSHeader *hdr, u32 *frame_skipped)
-{
-	u32 val, hdr_size;
-	u64 pos;
-	*frame_skipped = 0;
-	while (gf_bs_available(bs)) {
-		val = gf_bs_read_u8(bs);
-		if (val!=0xFF) continue;
-		val = gf_bs_read_int(bs, 4);
-		if (val != 0x0F) {
-			gf_bs_read_int(bs, 4);
-			continue;
-		}
-		hdr->is_mp2 = (Bool)gf_bs_read_int(bs, 1);
-		/*layer*/ gf_bs_read_int(bs, 2);
-		hdr->no_crc = (Bool)gf_bs_read_int(bs, 1);
-		pos = gf_bs_get_position(bs) - 2;
-
-		hdr->profile = 1 + gf_bs_read_int(bs, 2);
-		hdr->sr_idx = gf_bs_read_int(bs, 4);
-		/*private_bit*/ gf_bs_read_int(bs, 1);
-		hdr->nb_ch = gf_bs_read_int(bs, 3);
-		/*original_copy*/ gf_bs_read_int(bs, 1);
-		/*home*/ gf_bs_read_int(bs, 1);
-		/*copyright_identification_bit*/gf_bs_read_int(bs, 1);
-		/*copyright_identification_start*/gf_bs_read_int(bs, 1);
-		hdr->frame_size = gf_bs_read_int(bs, 13);
-		/*adts_buffer_fullness*/gf_bs_read_int(bs, 11);
-		/*number_of_raw_data_blocks_in_frame*/gf_bs_read_int(bs, 2);
-		hdr_size = hdr->no_crc ? 7 : 9;
-		if (!hdr->no_crc) gf_bs_read_int(bs, 16);
-		if (hdr->frame_size < hdr_size) {
-			gf_bs_seek(bs, pos+1);
-			*frame_skipped += 1;
-			continue;
-		}
-		hdr->frame_size -= hdr_size;
-		if (gf_bs_available(bs) == hdr->frame_size) return GF_TRUE;
-
-		gf_bs_skip_bytes(bs, hdr->frame_size);
-		val = gf_bs_read_u8(bs);
-		if (val!=0xFF) {
-			gf_bs_seek(bs, pos+1);
-			*frame_skipped += 1;
-			continue;
-		}
-		val = gf_bs_read_int(bs, 4);
-		if (val!=0x0F) {
-			gf_bs_read_int(bs, 4);
-			gf_bs_seek(bs, pos+2);
-			*frame_skipped += 1;
-			continue;
-		}
-		gf_bs_seek(bs, pos+hdr_size);
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-static Bool LOAS_LoadFrame(GF_BitStream *bs, GF_M4ADecSpecInfo *acfg, u32 *nb_bytes, u8 *buffer)
-{
-	u32 val, size;
-	u64 pos, mux_size;
-	if (!acfg) return 0;
-	memset(acfg, 0, sizeof(GF_M4ADecSpecInfo));
-	while (gf_bs_available(bs)) {
-		val = gf_bs_read_u8(bs);
-		if (val!=0x56) continue;
-		val = gf_bs_read_int(bs, 3);
-		if (val != 0x07) {
-			gf_bs_read_int(bs, 5);
-			continue;
-		}
-		mux_size = gf_bs_read_int(bs, 13);
-		pos = gf_bs_get_position(bs);
-
-		/*use same stream mux*/
-		if (!gf_bs_read_int(bs, 1)) {
-			Bool amux_version, amux_versionA;
-
-			amux_version = (Bool)gf_bs_read_int(bs, 1);
-			amux_versionA = GF_FALSE;
-			if (amux_version) amux_versionA = (Bool)gf_bs_read_int(bs, 1);
-			if (!amux_versionA) {
-				u32 i, allStreamsSameTimeFraming, numProgram;
-				if (amux_version) gf_latm_get_value(bs);
-
-				allStreamsSameTimeFraming = gf_bs_read_int(bs, 1);
-				/*numSubFrames = */gf_bs_read_int(bs, 6);
-				numProgram = gf_bs_read_int(bs, 4);
-				for (i=0; i<=numProgram; i++) {
-					u32 j, num_lay;
-					num_lay = gf_bs_read_int(bs, 3);
-					for (j=0; j<=num_lay; j++) {
-						u32 frameLengthType;
-						Bool same_cfg = GF_FALSE;
-						if (i || j) same_cfg = (Bool)gf_bs_read_int(bs, 1);
-
-						if (!same_cfg) {
-							if (amux_version==1) gf_latm_get_value(bs);
-							gf_m4a_parse_config(bs, acfg, GF_FALSE);
-						}
-						frameLengthType = gf_bs_read_int(bs, 3);
-						if (!frameLengthType) {
-							/*latmBufferFullness = */gf_bs_read_int(bs, 8);
-							if (!allStreamsSameTimeFraming) {
-							}
-						} else {
-							/*not supported*/
-						}
-					}
-
-				}
-				/*other data present*/
-				if (gf_bs_read_int(bs, 1)) {
-//					u32 k = 0;
-				}
-				/*CRCcheck present*/
-				if (gf_bs_read_int(bs, 1)) {
-				}
-			}
-		}
-
-		size = 0;
-		while (1) {
-			u32 tmp = gf_bs_read_int(bs, 8);
-			size += tmp;
-			if (tmp!=255) break;
-		}
-		if (nb_bytes && buffer) {
-			*nb_bytes = (u32) size;
-			gf_bs_read_data(bs, (char *) buffer, size);
-		} else {
-			gf_bs_skip_bytes(bs, size);
-		}
-
-		/*parse amux*/
-		gf_bs_seek(bs, pos + mux_size);
-
-		if (gf_bs_peek_bits(bs, 11, 0) != 0x2B7) {
-			gf_bs_seek(bs, pos + 1);
-			continue;
-		}
-
-		return GF_TRUE;
-	}
-	return GF_FALSE;
-}
-
-GF_Err gf_import_aac_loas(GF_MediaImporter *import)
-{
-	u8 oti;
-	Bool destroy_esd;
-	GF_Err e;
-	Bool sync_frame;
-	u16 sr, dts_inc;
-	u32 timescale;
-	GF_BitStream *bs, *dsi;
-	GF_M4ADecSpecInfo acfg;
-	u32 base_object_type = 0;
-	FILE *in;
-	u32 nbbytes=0;
-	u8 aac_buf[4096];
-	u64 tot_size, done, duration;
-	u32 track, di;
-	GF_ISOSample *samp;
-
-	in = gf_fopen(import->in_name, "rb");
-	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
-
-	/*sync_frame = */LOAS_LoadFrame(bs, &acfg, &nbbytes, (u8 *)aac_buf);
-
-	/*keep MPEG-2 AAC OTI even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
-	oti = GPAC_OTI_AUDIO_AAC_MPEG4;
-	timescale = sr = acfg.base_sr;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].flags = GF_IMPORT_SBR_IMPLICIT | GF_IMPORT_SBR_EXPLICIT | GF_IMPORT_PS_IMPLICIT | GF_IMPORT_PS_EXPLICIT | GF_IMPORT_FORCE_MPEG4;
-		import->nb_tracks = 1;
-		import->tk_info[0].audio_info.sample_rate = sr;
-		import->tk_info[0].audio_info.nb_channels = acfg.nb_chan;
-		gf_bs_del(bs);
-		gf_fclose(in);
-		return GF_OK;
-	}
-
-	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_m4a_write_config_bs(dsi, &acfg);
-	base_object_type = acfg.base_object_type;
-
-	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-		import->flags &= ~GF_IMPORT_PS_IMPLICIT;
-		import->flags |= GF_IMPORT_SBR_EXPLICIT;
-		import->flags &= ~GF_IMPORT_SBR_IMPLICIT;
-	}
-
-	dts_inc = 1024;
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	}
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = oti;
-	import->esd->decoderConfig->bufferSizeDB = 20;
-	import->esd->slConfig->timestampResolution = timescale;
-	if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-	if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-	gf_bs_get_content(dsi, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(dsi);
-
-	samp = NULL;
-	gf_import_message(import, GF_OK, "MPEG-4 AAC in LOAS import - sample rate %d - %d channel%s", sr, acfg.nb_chan, (acfg.nb_chan > 1) ? "s" : "");
-
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, timescale, acfg.nb_chan, 16, import->asemode);
-
-	/*add first sample*/
-	samp = gf_isom_sample_new();
-	samp->dataLength = nbbytes;
-	samp->data = (char *) aac_buf;
-	samp->IsRAP = xHEAAC_isRAP(acfg.base_object_type, samp->data, samp->dataLength);
-
-	e = gf_isom_add_sample(import->dest, track, di, samp);
-	if (e) goto exit;
-	samp->DTS+=dts_inc;
-
-	duration = import->duration;
-	duration *= sr;
-	duration /= 1000;
-
-	tot_size = gf_bs_get_size(bs);
-	done = 0;
-	while (gf_bs_available(bs) ) {
-		sync_frame = LOAS_LoadFrame(bs, &acfg, &nbbytes, (u8 *)aac_buf);
-		if (!sync_frame) break;
-
-		samp->data = (char*)aac_buf;
-		samp->dataLength = nbbytes;
-		samp->IsRAP = xHEAAC_isRAP(base_object_type, samp->data, samp->dataLength);
-
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		if (e) break;
-
-		gf_set_progress("Importing AAC", done, tot_size);
-		samp->DTS += dts_inc;
-		done += samp->dataLength;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	gf_media_update_bitrate(import->dest, track);
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, acfg.audioPL);
-	gf_set_progress("Importing AAC", tot_size, tot_size);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (samp) {
-		samp->data = NULL;
-		gf_isom_sample_del(&samp);
-	}
-	gf_bs_del(bs);
-	gf_fclose(in);
-	return e;
-}
-
-GF_Err gf_import_aac_adts(GF_MediaImporter *import)
-{
-	u8 oti;
-	Bool destroy_esd;
-	GF_Err e;
-	Bool sync_frame;
-	u16 sr, sbr_sr, sbr_sr_idx, dts_inc;
-	u32 timescale;
-	u32 frames_skipped = 0;
-	GF_BitStream *bs, *dsi;
-	ADTSHeader hdr;
-	GF_M4ADecSpecInfo acfg;
-	FILE *in;
-	u64 offset, tot_size, done, duration;
-	u32 max_size, track, di, i;
-	GF_ISOSample *samp;
-	u32 cur_samp = 0;
-
-	in = gf_fopen(import->in_name, "rb");
-	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
-
-	sync_frame = ADTS_SyncFrame(bs, &hdr, &frames_skipped);
-	if (!sync_frame) {
-		gf_bs_del(bs);
-		gf_fclose(in);
-		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-2/4 AAC with ADTS");
-	}
-
-	if (frames_skipped) {
-		gf_bs_seek(bs, 0);
-		sync_frame = LOAS_LoadFrame(bs, &acfg, NULL, NULL);
-		if (sync_frame) {
-			gf_bs_del(bs);
-			gf_fclose(in);
-			return gf_import_aac_loas(import);
-		}
-	}
-
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) hdr.is_mp2 = GF_FALSE;
-
-	/*keep MPEG-2 AAC OTI even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
-	oti = hdr.is_mp2 ? hdr.profile+GPAC_OTI_AUDIO_AAC_MPEG2_MP-1 : GPAC_OTI_AUDIO_AAC_MPEG4;
-	sr = GF_M4ASampleRates[hdr.sr_idx];
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_SBR_IMPLICIT | GF_IMPORT_SBR_EXPLICIT | GF_IMPORT_PS_IMPLICIT | GF_IMPORT_PS_EXPLICIT | GF_IMPORT_FORCE_MPEG4;
-		import->nb_tracks = 1;
-		import->tk_info[0].audio_info.sample_rate = sr;
-		import->tk_info[0].audio_info.nb_channels = hdr.nb_ch;
-		gf_bs_del(bs);
-		gf_fclose(in);
-		return GF_OK;
-	}
-
-	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	sbr_sr = sr;
-	sbr_sr_idx = hdr.sr_idx;
-	if ((import->flags & GF_IMPORT_OVSBR) == 0) {
-		for (i=0; i<16; i++) {
-			if (GF_M4ASampleRates[i] == (u32) 2*sr) {
-				sbr_sr_idx = i;
-				sbr_sr = 2*sr;
-				break;
-			}
-		}
-	}
-
-	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-		import->flags &= ~GF_IMPORT_PS_IMPLICIT;
-		import->flags |= GF_IMPORT_SBR_EXPLICIT;
-		import->flags &= ~GF_IMPORT_SBR_IMPLICIT;
-	}
-
-	/*no provision for explicit indication of MPEG-2 AAC through MPEG-4 PLs, so force implicit*/
-	if (hdr.is_mp2) {
-		if (import->flags & GF_IMPORT_SBR_EXPLICIT) {
-			import->flags &= ~GF_IMPORT_SBR_EXPLICIT;
-			import->flags |= GF_IMPORT_SBR_IMPLICIT;
-		}
-		if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-			import->flags &= ~GF_IMPORT_PS_EXPLICIT;
-			import->flags |= GF_IMPORT_PS_IMPLICIT;
-		}
-	}
-
-	dts_inc = 1024;
-
-	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
-	acfg.base_object_type = hdr.profile;
-	acfg.base_sr = sr;
-	acfg.nb_chan = gf_m4a_get_channel_cfg(hdr.nb_ch);
-	acfg.sbr_object_type = 0;
-	if (import->flags & GF_IMPORT_SBR_EXPLICIT) {
-		acfg.has_sbr = GF_TRUE;
-		acfg.base_object_type = 5;
-		acfg.sbr_object_type = hdr.profile;
-
-		/*for better interop, always store using full SR when using explict signaling*/
-		dts_inc = 2048;
-		sr = sbr_sr;
-	} else if (import->flags & GF_IMPORT_SBR_IMPLICIT) {
-		acfg.has_sbr = GF_TRUE;
-	}
-	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-		acfg.has_ps = GF_TRUE;
-		acfg.base_object_type = 29;
-	} else if (import->flags & GF_IMPORT_PS_IMPLICIT) {
-		acfg.has_ps = GF_TRUE;
-	}
-
-	acfg.audioPL = gf_m4a_get_profile(&acfg);
-	/*explicit SBR or PS signal (non backward-compatible)*/
-	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
-		gf_bs_write_int(dsi, 29, 5);
-		gf_bs_write_int(dsi, hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, hdr.nb_ch, 4);
-		gf_bs_write_int(dsi, sbr_sr ? sbr_sr_idx : hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, hdr.profile, 5);
-	}
-	/*explicit SBR signal (non backward-compatible)*/
-	else if (import->flags & GF_IMPORT_SBR_EXPLICIT) {
-		gf_bs_write_int(dsi, 5, 5);
-		gf_bs_write_int(dsi, hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, hdr.nb_ch, 4);
-		gf_bs_write_int(dsi, sbr_sr ? sbr_sr_idx : hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, hdr.profile, 5);
-	} else {
-		/*regular AAC*/
-		gf_bs_write_int(dsi, hdr.profile, 5);
-		gf_bs_write_int(dsi, hdr.sr_idx, 4);
-		gf_bs_write_int(dsi, hdr.nb_ch, 4);
-		gf_bs_align(dsi);
-		/*implicit AAC SBR signal*/
-		if (import->flags & GF_IMPORT_SBR_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);
-		}
-		if (import->flags & GF_IMPORT_PS_IMPLICIT) {
-			gf_bs_write_int(dsi, 0x548, 11); /*sync extension type*/
-			gf_bs_write_int(dsi, 1, 1);	/* PS present flag */
-		}
-	}
-	/*not MPEG4 tool*/
-	if (0 && hdr.is_mp2) acfg.audioPL = 0xFE;
-	gf_bs_align(dsi);
-
-	timescale = sr;
-	if (import->flags & GF_IMPORT_OVSBR)
-		timescale = 2*sr;
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	}
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = oti;
-	import->esd->decoderConfig->bufferSizeDB = 20;
-	import->esd->slConfig->timestampResolution = timescale;
-	if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-	if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-	gf_bs_get_content(dsi, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(dsi);
-
-	samp = NULL;
-	gf_import_message(import, GF_OK, "AAC ADTS import %s%s%s- sample rate %d - %s audio - %d channel%s",
-	                  (import->flags & (GF_IMPORT_SBR_IMPLICIT|GF_IMPORT_SBR_EXPLICIT)) ? "SBR" : "",
-	                  (import->flags & (GF_IMPORT_PS_IMPLICIT|GF_IMPORT_PS_EXPLICIT)) ? "+PS" : "",
-	                  ((import->flags & (GF_IMPORT_SBR_EXPLICIT|GF_IMPORT_PS_EXPLICIT)) ? " (explicit) " : " "),
-	                  sr,
-	                  (oti==GPAC_OTI_AUDIO_AAC_MPEG4) ? "MPEG-4" : "MPEG-2",
-	                  hdr.nb_ch,
-	                  (hdr.nb_ch>1) ? "s" : "");
-
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, timescale, hdr.nb_ch, 16, import->asemode);
-
-	/*add first sample*/
-	samp = gf_isom_sample_new();
-	max_size = samp->dataLength = hdr.frame_size;
-	samp->data = (char*)gf_malloc(sizeof(char)*hdr.frame_size);
-	offset = gf_bs_get_position(bs);
-	gf_bs_read_data(bs, samp->data, hdr.frame_size);
-	samp->IsRAP = RAP;
-
-	if (import->flags & GF_IMPORT_USE_DATAREF) {
-		e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-	} else {
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-	}
-	if (e) goto exit;
-	samp->DTS+=dts_inc;
-
-	cur_samp++;
-	if (import->audio_roll_change) {
-		e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, import->audio_roll);
-	}
-
-	duration = import->duration;
-	duration *= sr;
-	duration /= 1000;
-
-	tot_size = gf_bs_get_size(bs);
-	done = 0;
-	while (gf_bs_available(bs) ) {
-		sync_frame = ADTS_SyncFrame(bs, &hdr, &frames_skipped);
-		if (!sync_frame) break;
-		if (hdr.frame_size>max_size) {
-			samp->data = (char*)gf_realloc(samp->data, sizeof(char) * hdr.frame_size);
-			max_size = hdr.frame_size;
-		}
-		samp->dataLength = hdr.frame_size;
-
-		offset = gf_bs_get_position(bs);
-		gf_bs_read_data(bs, samp->data, hdr.frame_size);
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		if (e) break;
-
-		cur_samp++;
-		if (import->audio_roll_change) {
-			e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, import->audio_roll);
-		}
-		cur_samp++;
-
-		gf_set_progress("Importing AAC", done, tot_size);
-		samp->DTS += dts_inc;
-		done += samp->dataLength;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	gf_media_update_bitrate(import->dest, track);
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, acfg.audioPL);
-	gf_set_progress("Importing AAC", tot_size, tot_size);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (samp) gf_isom_sample_del(&samp);
-	gf_bs_del(bs);
-	gf_fclose(in);
-	return e;
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-
-
-static void update_edit_list_for_bframes(GF_ISOFile *file, u32 track)
-{
-	u32 i, count, di;
-	u64 max_cts, min_cts, doff;
-
-	count = gf_isom_get_sample_count(file, track);
-	max_cts = 0;
-	min_cts = (u64) -1;
-	for (i=0; i<count; i++) {
-		GF_ISOSample *s = gf_isom_get_sample_info(file, track, i+1, &di, &doff);
-		if (s->DTS + s->CTS_Offset > max_cts)
-			max_cts = s->DTS + s->CTS_Offset;
-
-		if (min_cts > s->DTS + s->CTS_Offset)
-			min_cts = s->DTS + s->CTS_Offset;
-
-		gf_isom_sample_del(&s);
-	}
-
-	if (min_cts) {
-		max_cts -= min_cts;
-		max_cts += gf_isom_get_sample_duration(file, track, count);
-
-		max_cts *= gf_isom_get_timescale(file);
-		max_cts /= gf_isom_get_media_timescale(file, track);
-		gf_isom_set_edit_segment(file, track, 0, max_cts, min_cts, GF_ISOM_EDIT_NORMAL);
-	}
-}
-
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-static GF_Err gf_import_cmp(GF_MediaImporter *import, Bool mpeg12)
-{
-	GF_Err e;
-	Double FPS;
-	FILE *mdia;
-	GF_ISOSample *samp;
-	Bool is_vfr, erase_pl, has_cts_offset, is_packed, destroy_esd, do_vfr, forced_packed;
-	u32 nb_samp, i, timescale, max_size, track, di, PL, max_b, nbI, nbP, nbB, nbNotCoded, dts_inc, ref_frame, b_frames;
-	u64 pos, tot_size, done_size, samp_offset, duration;
-	GF_M4VDecSpecInfo dsi;
-	GF_M4VParser *vparse;
-	GF_BitStream *bs;
-
-	destroy_esd = forced_packed = GF_FALSE;
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Opening %s failed", import->in_name);
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-
-	samp = NULL;
-	vparse = gf_m4v_parser_bs_new(bs, mpeg12);
-	e = gf_m4v_parse_config(vparse, &dsi);
-	if (e) {
-		gf_import_message(import, e, "Cannot load MPEG-4 decoder config");
-		goto exit;
-	}
-
-	tot_size = gf_bs_get_size(bs);
-	done_size = 0;
-	destroy_esd = GF_FALSE;
-	FPS = mpeg12 ? dsi.fps : GF_IMPORT_DEFAULT_FPS;
-	if (import->video_fps) FPS = (Double) import->video_fps;
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	duration = (u64) (import->duration*FPS);
-
-	is_packed = GF_FALSE;
-	nbNotCoded = nbI = nbP = nbB = max_b = 0;
-	is_vfr = erase_pl = GF_FALSE;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].media_type = mpeg12 ? ((dsi.VideoPL==GPAC_OTI_VIDEO_MPEG1) ? GF_MEDIA_TYPE_MPG1 : GF_MEDIA_TYPE_MPG2 ) : GF_MEDIA_TYPE_MP4V ;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_OVERRIDE_FPS;
-		if (!mpeg12) import->tk_info[0].flags |= GF_IMPORT_NO_FRAME_DROP | GF_IMPORT_FORCE_PACKED;
-		import->tk_info[0].video_info.width = dsi.width;
-		import->tk_info[0].video_info.height = dsi.height;
-		import->tk_info[0].video_info.par = (dsi.par_num<<16) | dsi.par_den;
-		import->nb_tracks = 1;
-		goto exit;
-	}
-
-	samp = gf_isom_sample_new();
-	max_size = 4096;
-	samp->data = (char*)gf_malloc(sizeof(char)*max_size);
-	/*no auto frame-rate detection*/
-	if (import->video_fps == GF_IMPORT_AUTO_FPS)
-		import->video_fps = GF_IMPORT_DEFAULT_FPS;
-
-	PL = dsi.VideoPL;
-	if (!PL) {
-		PL = 0x01;
-		erase_pl = GF_TRUE;
-	}
-	samp_offset = 0;
-	/*MPEG-4 visual*/
-	if (!mpeg12) samp_offset = gf_m4v_get_object_start(vparse);
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(0);
-		destroy_esd = GF_TRUE;
-	}
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->slConfig->timestampResolution = timescale;
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-	import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-	if (mpeg12) {
-		import->esd->decoderConfig->objectTypeIndication = dsi.VideoPL;
-	} else {
-		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
-	}
-	if (samp_offset) {
-		import->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char) * (size_t)samp_offset);
-		assert(samp_offset < 1<<31);
-		import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) samp_offset;
-		pos = gf_bs_get_position(bs);
-		gf_bs_seek(bs, 0);
-		assert(samp_offset < 1<<31);
-		gf_bs_read_data(bs, import->esd->decoderConfig->decoderSpecificInfo->data, (u32)samp_offset);
-		gf_bs_seek(bs, pos);
-
-		/*remove packed flag if any (VOSH user data)*/
-		forced_packed = GF_FALSE;
-		i=0;
-		while (1) {
-			char *frame = import->esd->decoderConfig->decoderSpecificInfo->data;
-			while ((i+3<samp_offset)  && ((frame[i]!=0) || (frame[i+1]!=0) || (frame[i+2]!=1))) i++;
-			if (i+4>=samp_offset) break;
-			if (strncmp(frame+i+4, "DivX", 4)) {
-				i += 4;
-				continue;
-			}
-			frame = import->esd->decoderConfig->decoderSpecificInfo->data + i + 4;
-			frame = strchr(frame, 'p');
-			if (frame) {
-				forced_packed = GF_TRUE;
-				frame[0] = 'n';
-			}
-			break;
-		}
-	}
-
-	if (import->flags & GF_IMPORT_FORCE_PACKED) forced_packed = GF_TRUE;
-
-	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
-
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name: NULL, NULL, &di);
-	if (e) goto exit;
-	gf_isom_set_visual_info(import->dest, track, di, dsi.width, dsi.height);
-	if (mpeg12) {
-		gf_import_message(import, GF_OK, "MPEG-%d Video import - %d x %d @ %02.4f FPS", (dsi.VideoPL==GPAC_OTI_VIDEO_MPEG1) ? 1 : 2, dsi.width, dsi.height, FPS);
-	} else {
-		gf_import_message(import, GF_OK, "MPEG-4 Video import - %d x %d @ %02.4f FPS\nIndicated Profile: %s", dsi.width, dsi.height, FPS, gf_m4v_get_profile_name((u8) PL));
-	}
-
-	gf_media_update_par(import->dest, track);
-
-	has_cts_offset = GF_FALSE;
-	nb_samp = b_frames = ref_frame = 0;
-	do_vfr = !(import->flags & GF_IMPORT_NO_FRAME_DROP);
-
-	while (gf_bs_available(bs)) {
-		u8 ftype;
-		u32 tinc;
-		u64 frame_start, sample_size;
-		Bool is_coded;
-		/*pos = */gf_m4v_get_object_start(vparse);
-		e = gf_m4v_parse_frame(vparse, dsi, &ftype, &tinc, &sample_size, &frame_start, &is_coded);
-		assert(sample_size < 1<<31);
-		samp->dataLength = (u32) sample_size;
-		if (e==GF_EOS) e = GF_OK;
-		if (e) goto exit;
-
-		if (!is_coded) {
-			nbNotCoded ++;
-			/*if prev is B and we're parsing a packed bitstream discard n-vop*/
-			if (forced_packed && b_frames) {
-				is_packed = GF_TRUE;
-				continue;
-			}
-			/*policy is to import at variable frame rate, skip*/
-			if (do_vfr) {
-				is_vfr = GF_TRUE;
-				samp->DTS += dts_inc;
-				continue;
-			}
-			/*policy is to keep non coded frame (constant frame rate), add*/
-		}
-		samp->IsRAP = RAP_NO;
-
-		if (ftype==2) {
-			b_frames++;
-			nbB++;
-			/*adjust CTS*/
-			if (!has_cts_offset) {
-				u32 i;
-				for (i=0; i<gf_isom_get_sample_count(import->dest, track); i++) {
-					gf_isom_modify_cts_offset(import->dest, track, i+1, dts_inc);
-				}
-				has_cts_offset = GF_TRUE;
-			}
-		} else {
-			if (ftype==0) {
-				samp->IsRAP = RAP;
-				nbI++;
-			} else {
-				nbP++;
-			}
-			/*even if no out-of-order frames we MUST adjust CTS if cts_offset is present is */
-			if (ref_frame && has_cts_offset)
-				gf_isom_modify_cts_offset(import->dest, track, ref_frame, (1+b_frames)*dts_inc);
-
-			ref_frame = nb_samp+1;
-			if (max_b<b_frames) max_b = b_frames;
-			b_frames = 0;
-		}
-		if (!nb_samp) samp->DTS = 0;
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			samp->data = NULL;
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, frame_start);
-		} else {
-			if (samp->dataLength>max_size) {
-				max_size = samp->dataLength;
-				samp->data = (char*)gf_realloc(samp->data, sizeof(char)*max_size);
-			}
-			gf_bs_seek(bs, frame_start);
-			gf_bs_read_data(bs, samp->data, samp->dataLength);
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		samp->DTS += dts_inc;
-		nb_samp++;
-		gf_set_progress("Importing M4V", done_size/1024, tot_size/1024);
-		done_size += samp->dataLength;
-		if (e) break;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-
-	}
-	/*final flush*/
-	if (ref_frame && has_cts_offset)
-		gf_isom_modify_cts_offset(import->dest, track, ref_frame, (1+b_frames)*dts_inc);
-
-	gf_set_progress("Importing M4V", nb_samp, nb_samp);
-	if (has_cts_offset) {
-		gf_import_message(import, GF_OK, "Has B-Frames (%d max consecutive B-VOPs)", max_b);
-		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
-
-
-		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
-			update_edit_list_for_bframes(import->dest, track);
-
-		/*this is plain ugly but since some encoders (divx) don't use the video PL correctly
-		we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
-		if (PL<=3) {
-			PL = 0xF5;
-			erase_pl = GF_TRUE;
-			gf_import_message(import, GF_OK, "WARNING: indicated profile doesn't include B-VOPs - forcing %s", gf_m4v_get_profile_name((u8) PL));
-		}
-		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps - %d Bs)", nb_samp, nbI, nbP, nbB);
-	} else {
-		/*no B-frames, remove CTS offsets*/
-		gf_isom_remove_cts_info(import->dest, track);
-		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps)", nb_samp, nbI, nbP);
-	}
-	if (erase_pl) {
-		gf_m4v_rewrite_pl(&import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
-		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
-	}
-	gf_media_update_bitrate(import->dest, track);
-
-	if (is_vfr) {
-		if (!nbB) {
-			if (do_vfr) {
-				gf_import_message(import, GF_OK, "import using Variable Frame Rate - Removed %d N-VOPs", nbNotCoded);
-			} else {
-				if (nbNotCoded) gf_import_message(import, GF_OK, "Stream has %d N-VOPs", nbNotCoded);
-			}
-			nbNotCoded = 0;
-		}
-	}
-
-	if (nbNotCoded) gf_import_message(import, GF_OK, "Removed %d N-VOPs%s", nbNotCoded,is_packed ? " (Packed Bitstream)" : "");
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, (u8) PL);
-
-	if (dsi.par_den && dsi.par_num) gf_media_change_par(import->dest, track, dsi.par_num, dsi.par_den, GF_FALSE);
-
-exit:
-	if (samp) gf_isom_sample_del(&samp);
-	if (destroy_esd) gf_odf_desc_del((GF_Descriptor *) import->esd);
-
-	/*this destroys the bitstream as well*/
-	gf_m4v_parser_del(vparse);
-	gf_fclose(mdia);
-	return e;
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-
-#ifndef GPAC_DISABLE_AVILIB
-
-static GF_Err gf_import_avi_video(GF_MediaImporter *import)
-{
-	GF_Err e;
-	Double FPS;
-	FILE *test;
-	GF_ISOSample *samp;
-	u32 i, num_samples, timescale, track, di, PL, max_b, nb_f, ref_frame, b_frames;
-	u64 samp_offset, size, max_size;
-	u32 nbI, nbP, nbB, nbDummy, nbNotCoded, dts_inc, cur_samp;
-	Bool is_vfr, erase_pl;
-	GF_M4VDecSpecInfo dsi;
-	GF_M4VParser *vparse;
-	s32 key;
-	u64 duration;
-	Bool destroy_esd, is_packed, is_init, has_cts_offset;
-	char *comp, *frame;
-	avi_t *in;
-
-	test = gf_fopen(import->in_name, "rb");
-	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening %s failed", import->in_name);
-	gf_fclose(test);
-	in = AVI_open_input_file(import->in_name, 1);
-	if (!in) return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Unsupported avi file");
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		char *comp;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_NO_FRAME_DROP | GF_IMPORT_OVERRIDE_FPS;
-		import->tk_info[0].video_info.FPS = AVI_frame_rate(in);
-		import->tk_info[0].video_info.width = AVI_video_width(in);
-		import->tk_info[0].video_info.height = AVI_video_height(in);
-		comp = AVI_video_compressor(in);
-		import->tk_info[0].media_type = GF_4CC((u8)comp[0], (u8)comp[1], (u8)comp[2], (u8)comp[3]);
-
-		import->nb_tracks = 1;
-		for (i=0; i<(u32) AVI_audio_tracks(in); i++) {
-			import->tk_info[i+1].track_num = i+2;
-			import->tk_info[i+1].type = GF_ISOM_MEDIA_AUDIO;
-			import->tk_info[i+1].flags = GF_IMPORT_USE_DATAREF;
-			import->tk_info[i+1].audio_info.sample_rate = (u32) AVI_audio_rate(in);
-			import->tk_info[i+1].audio_info.nb_channels = (u32) AVI_audio_channels(in);
-			import->nb_tracks ++;
-		}
-		AVI_close(in);
-		return GF_OK;
-	}
-	if (import->trackID>1) {
-		AVI_close(in);
-		return GF_OK;
-	}
-	destroy_esd = GF_FALSE;
-	frame = NULL;
-	AVI_seek_start(in);
-
-	erase_pl = GF_FALSE;
-	comp = AVI_video_compressor(in);
-	if (!comp) {
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	}
-
-	/*these are/should be OK*/
-	if (!stricmp(comp, "DIVX") || !stricmp(comp, "DX50")	/*DivX*/
-	        || !stricmp(comp, "XVID") /*XviD*/
-	        || !stricmp(comp, "3iv2") /*3ivX*/
-	        || !stricmp(comp, "fvfw") /*ffmpeg*/
-	        || !stricmp(comp, "NDIG") /*nero*/
-	        || !stricmp(comp, "MP4V") /*!! not tested*/
-	        || !stricmp(comp, "M4CC") /*Divio - not tested*/
-	        || !stricmp(comp, "PVMM") /*PacketVideo - not tested*/
-	        || !stricmp(comp, "SEDG") /*Samsung - not tested*/
-	        || !stricmp(comp, "RMP4") /*Sigma - not tested*/
-	        || !stricmp(comp, "MP43") /*not tested*/
-	        || !stricmp(comp, "FMP4") /*not tested*/
-	   ) {
-
-	}
-	else if (!stricmp(comp, "DIV3") || !stricmp(comp, "DIV4")) {
-		gf_import_message(import, GF_NOT_SUPPORTED, "Video format %s not compliant with MPEG-4 Visual - please recompress the file first", comp);
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	} else if (!stricmp(comp, "H264") || !stricmp(comp, "X264")) {
-		gf_import_message(import, GF_NOT_SUPPORTED, "H264/AVC Video format not supported in AVI - please extract to raw format first", comp);
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	} else {
-		gf_import_message(import, GF_NOT_SUPPORTED, "Video format %s not supported - recompress the file first", comp);
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	}
-	/*no auto frame-rate detection*/
-	if (import->video_fps == GF_IMPORT_AUTO_FPS)
-		import->video_fps = GF_IMPORT_DEFAULT_FPS;
-
-	FPS = AVI_frame_rate(in);
-	if (import->video_fps) FPS = (Double) import->video_fps;
-	get_video_timing(FPS, &timescale, &dts_inc);
-	duration = (u64) (import->duration*FPS);
-
-	e = GF_OK;
-	max_size = 0;
-	samp_offset = 0;
-	frame = NULL;
-	num_samples = (u32) AVI_video_frames(in);
-	samp = gf_isom_sample_new();
-	PL = 0;
-	track = 0;
-	is_vfr = GF_FALSE;
-
-	is_packed = GF_FALSE;
-	nbDummy = nbNotCoded = nbI = nbP = nbB = max_b = 0;
-	has_cts_offset = GF_FALSE;
-	cur_samp = b_frames = ref_frame = 0;
-
-	is_init = GF_FALSE;
-
-	for (i=0; i<num_samples; i++) {
-		size = AVI_frame_size(in, i);
-		if (!size) {
-			AVI_read_frame(in, NULL, &key);
-			continue;
-		}
-
-		if (size > max_size) {
-			frame = (char*)gf_realloc(frame, sizeof(char) * (size_t)size);
-			max_size = size;
-		}
-		AVI_read_frame(in, frame, &key);
-
-		/*get DSI*/
-		if (!is_init) {
-			is_init = GF_TRUE;
-			vparse = gf_m4v_parser_new(frame, size, GF_FALSE);
-			e = gf_m4v_parse_config(vparse, &dsi);
-			PL = dsi.VideoPL;
-			if (!PL) {
-				PL = 0x01;
-				erase_pl = GF_TRUE;
-			}
-			samp_offset = gf_m4v_get_object_start(vparse);
-			assert(samp_offset < 1<<31);
-			gf_m4v_parser_del(vparse);
-			if (e) {
-				gf_import_message(import, e, "Cannot import decoder config in first frame");
-				goto exit;
-			}
-
-			if (!import->esd) {
-				import->esd = gf_odf_desc_esd_new(0);
-				destroy_esd = GF_TRUE;
-			}
-			track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
-			if (!track) {
-				e = gf_isom_last_error(import->dest);
-				goto exit;
-			}
-			gf_isom_set_track_enabled(import->dest, track, 1);
-			if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-			import->final_trackID = gf_isom_get_track_id(import->dest, track);
-
-			if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->timestampResolution = timescale;
-
-			if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-			if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-			import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-			import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
-			import->esd->decoderConfig->decoderSpecificInfo->data = (char *) gf_malloc(sizeof(char) * (size_t)samp_offset);
-			memcpy(import->esd->decoderConfig->decoderSpecificInfo->data, frame, sizeof(char) * (size_t)samp_offset);
-			import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) samp_offset;
-
-			gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
-
-			/*remove packed flag if any (VOSH user data)*/
-			while (1) {
-				char *divx_mark;
-				while ((i+3<samp_offset)  && ((frame[i]!=0) || (frame[i+1]!=0) || (frame[i+2]!=1))) i++;
-				if (i+4>=samp_offset) break;
-
-				if (strncmp(frame+i+4, "DivX", 4)) {
-					i += 4;
-					continue;
-				}
-				divx_mark = import->esd->decoderConfig->decoderSpecificInfo->data + i + 4;
-				divx_mark = strchr(divx_mark, 'p');
-				if (divx_mark) divx_mark[0] = 'n';
-				break;
-			}
-			i = 0;
-
-			e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name: NULL, NULL, &di);
-			if (e) goto exit;
-			gf_isom_set_visual_info(import->dest, track, di, dsi.width, dsi.height);
-			gf_import_message(import, GF_OK, "AVI %s video import - %d x %d @ %02.4f FPS - %d Frames\nIndicated Profile: %s", comp, dsi.width, dsi.height, FPS, num_samples, gf_m4v_get_profile_name((u8) PL));
-
-			gf_media_update_par(import->dest, track);
-		}
-
-
-		if (size > samp_offset) {
-			u8 ftype;
-			u32 tinc;
-			u64 framesize, frame_start;
-			u64 file_offset;
-			Bool is_coded;
-
-			size -= samp_offset;
-			file_offset = (u64) AVI_get_video_position(in, i);
-
-			vparse = gf_m4v_parser_new(frame + samp_offset, size, GF_FALSE);
-
-			samp->dataLength = 0;
-			/*removing padding frames*/
-			if (size<4) {
-				nbDummy ++;
-				size = 0;
-			}
-
-			nb_f=0;
-			while (size) {
-				GF_Err e = gf_m4v_parse_frame(vparse, dsi, &ftype, &tinc, &framesize, &frame_start, &is_coded);
-				if (e<0) goto exit;
-
-				if (!is_coded) {
-					if (!gf_m4v_is_valid_object_type(vparse)) gf_import_message(import, GF_OK, "WARNING: AVI frame %d doesn't look like MPEG-4 Visual", i+1);
-					nbNotCoded ++;
-					if (!is_packed) {
-						is_vfr = GF_TRUE;
-						/*policy is to import at constant frame rate from AVI*/
-						if (import->flags & GF_IMPORT_NO_FRAME_DROP) goto proceed;
-						/*policy is to import at variable frame rate from AVI*/
-						samp->DTS += dts_inc;
-					}
-					/*assume this is packed bitstream n-vop and discard it.*/
-				} else {
-proceed:
-					if (e==GF_EOS) size = 0;
-					else is_packed = GF_TRUE;
-					nb_f++;
-
-					samp->IsRAP = RAP_NO;
-
-					if (ftype==2) {
-						b_frames ++;
-						nbB++;
-						/*adjust CTS*/
-						if (!has_cts_offset) {
-							u32 i;
-							for (i=0; i<gf_isom_get_sample_count(import->dest, track); i++) {
-								gf_isom_modify_cts_offset(import->dest, track, i+1, dts_inc);
-							}
-							has_cts_offset = GF_TRUE;
-						}
-					} else {
-						if (!ftype) {
-							samp->IsRAP = RAP;
-							nbI++;
-						} else {
-							nbP++;
-						}
-						/*even if no out-of-order frames we MUST adjust CTS if cts_offset is present is */
-						if (ref_frame && has_cts_offset)
-							gf_isom_modify_cts_offset(import->dest, track, ref_frame, (1+b_frames)*dts_inc);
-
-						ref_frame = cur_samp+1;
-						if (max_b<b_frames) max_b = b_frames;
-						b_frames = 0;
-					}
-					/*frame_start indicates start of VOP (eg we always remove VOL from each I)*/
-					samp->data = frame + samp_offset + frame_start;
-					assert(framesize < 1<<31);
-					samp->dataLength = (u32) framesize;
-
-					if (import->flags & GF_IMPORT_USE_DATAREF) {
-						samp->data = NULL;
-						e = gf_isom_add_sample_reference(import->dest, track, di, samp, file_offset + samp_offset + frame_start);
-					} else {
-						e = gf_isom_add_sample(import->dest, track, di, samp);
-					}
-					cur_samp++;
-					samp->DTS += dts_inc;
-					if (e) {
-						gf_import_message(import, GF_OK, "Error importing AVI frame %d", i+1);
-						goto exit;
-					}
-				}
-				if (!size || (size == framesize + frame_start)) break;
-			}
-			gf_m4v_parser_del(vparse);
-			if (nb_f>2) gf_import_message(import, GF_OK, "Warning: more than 2 frames packed together");
-		}
-		samp_offset = 0;
-		gf_set_progress("Importing AVI Video", i, num_samples);
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT)
-			break;
-	}
-
-	/*final flush*/
-	if (ref_frame && has_cts_offset)
-		gf_isom_modify_cts_offset(import->dest, track, ref_frame, (1+b_frames)*dts_inc);
-
-	gf_set_progress("Importing AVI Video", num_samples, num_samples);
-
-
-	num_samples = gf_isom_get_sample_count(import->dest, track);
-	if (has_cts_offset) {
-		gf_import_message(import, GF_OK, "Has B-Frames (%d max consecutive B-VOPs%s)", max_b, is_packed ? " - packed bitstream" : "");
-		/*repack CTS tables and adjust offsets for B-frames*/
-		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
-
-		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
-			update_edit_list_for_bframes(import->dest, track);
-
-		/*this is plain ugly but since some encoders (divx) don't use the video PL correctly
-		we force the system video_pl to ASP@L5 since we have I, P, B in base layer*/
-		if (PL<=3) {
-			PL = 0xF5;
-			erase_pl = GF_TRUE;
-			gf_import_message(import, GF_OK, "WARNING: indicated profile doesn't include B-VOPs - forcing %s", gf_m4v_get_profile_name((u8) PL));
-		}
-		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps - %d Bs)", num_samples, nbI, nbP, nbB);
-	} else {
-		/*no B-frames, remove CTS offsets*/
-		gf_isom_remove_cts_info(import->dest, track);
-		gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps)", num_samples, nbI, nbP);
-	}
-
-	samp->data = NULL;
-	gf_isom_sample_del(&samp);
-
-	if (erase_pl) {
-		gf_m4v_rewrite_pl(&import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength, (u8) PL);
-		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
-	}
-	gf_media_update_bitrate(import->dest, track);
-
-	if (is_vfr) {
-		if (nbB) {
-			if (is_packed) gf_import_message(import, GF_OK, "Warning: Mix of non-coded frames: packed bitstream and encoder skiped - unpredictable timing");
-		} else {
-			if (import->flags & GF_IMPORT_NO_FRAME_DROP) {
-				if (nbNotCoded) gf_import_message(import, GF_OK, "Stream has %d N-VOPs", nbNotCoded);
-			} else {
-				gf_import_message(import, GF_OK, "import using Variable Frame Rate - Removed %d N-VOPs", nbNotCoded);
-			}
-			nbNotCoded = 0;
-		}
-	}
-
-	if (nbDummy || nbNotCoded) gf_import_message(import, GF_OK, "Removed Frames: %d VFW delay frames - %d N-VOPs", nbDummy, nbNotCoded);
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, (u8) PL);
-
-exit:
-	if (destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (frame) gf_free(frame);
-	AVI_close(in);
-	return e;
-}
-
-GF_Err gf_import_avi_audio(GF_MediaImporter *import)
-{
-	GF_Err e;
-	FILE *test;
-	u64 duration;
-	u32 hdr, di, track, i, tot_size;
-	s64 offset;
-	s32 size, max_size, done;
-	u16 sampleRate;
-	Double dur;
-	Bool is_cbr;
-	u8 oti;
-	GF_ISOSample *samp;
-	char *frame;
-	Bool destroy_esd;
-	s32 continuous;
-	unsigned char temp[4];
-	avi_t *in;
-
-	/*video only, ignore*/
-	if (import->trackID==1) return GF_OK;
-
-
-	test = gf_fopen(import->in_name, "rb");
-	if (!test) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-	gf_fclose(test);
-	in = AVI_open_input_file(import->in_name, 1);
-	if (!in) return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported avi file");
-
-	AVI_seek_start(in);
-
-	e = GF_OK;
-	if (import->trackID)  AVI_set_audio_track(in, import->trackID-2);
-
-	if (AVI_read_audio(in, (char *) temp, 4, &continuous) != 4) {
-		AVI_close(in);
-		return gf_import_message(import, GF_OK, "No audio track found");
-	}
-
-	hdr = GF_4CC(temp[0], temp[1], temp[2], temp[3]);
-	if ((hdr &0xFFE00000) != 0xFFE00000) {
-		AVI_close(in);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported AVI audio format");
-	}
-
-	sampleRate = gf_mp3_sampling_rate(hdr);
-	oti = gf_mp3_object_type_indication(hdr);
-	if (!oti || !sampleRate) {
-		AVI_close(in);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Error: invalid MPEG Audio track");
-	}
-
-	frame = NULL;
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		destroy_esd = GF_TRUE;
-		import->esd = gf_odf_desc_esd_new(0);
-	}
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sampleRate);
-	if (!track) goto exit;
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->slConfig->timestampResolution = sampleRate;
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = NULL;
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = oti;
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_import_message(import, GF_OK, "AVI Audio import - sample rate %d - %s audio - %d channel%s", sampleRate, (oti==GPAC_OTI_AUDIO_MPEG1) ? "MPEG-1" : "MPEG-2", gf_mp3_num_channels(hdr), (gf_mp3_num_channels(hdr)>1) ? "s" : "");
-
-	AVI_seek_start(in);
-	AVI_set_audio_position(in, 0);
-
-	i = 0;
-	tot_size = max_size = 0;
-	while ((size = (s32) AVI_audio_size(in, i) )>0) {
-		if (max_size<size) max_size=size;
-		tot_size += size;
-		i++;
-	}
-
-	frame = (char*)gf_malloc(sizeof(char) * max_size);
-	AVI_seek_start(in);
-	AVI_set_audio_position(in, 0);
-
-	dur = import->duration;
-	dur *= sampleRate;
-	dur /= 1000;
-	duration = (u32) dur;
-
-	samp = gf_isom_sample_new();
-	done=max_size=0;
-	is_cbr = GF_TRUE;
-	while (1) {
-		if (AVI_read_audio(in, frame, 4, (int*)&continuous) != 4) break;
-		offset = gf_ftell(in->fdes) - 4;
-		hdr = GF_4CC((u8) frame[0], (u8) frame[1], (u8) frame[2], (u8) frame[3]);
-
-		size = gf_mp3_frame_size(hdr);
-		if (size>max_size) {
-			frame = (char*)gf_realloc(frame, sizeof(char) * size);
-			if (max_size) is_cbr = GF_FALSE;
-			max_size = size;
-		}
-		size = 4 + (s32) AVI_read_audio(in, &frame[4], size - 4, &continuous);
-
-		if ((import->flags & GF_IMPORT_USE_DATAREF) && !continuous) {
-			gf_import_message(import, GF_IO_ERR, "Cannot use media references, splitted input audio frame found");
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		samp->IsRAP = RAP;
-		samp->data = frame;
-		samp->dataLength = size;
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		if (e) goto exit;
-
-		samp->DTS += gf_mp3_window_size(hdr);
-		gf_set_progress("Importing AVI Audio", done, tot_size);
-
-		done += size;
-		if (duration && (samp->DTS > duration) ) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-
-	gf_set_progress("Importing AVI Audio", tot_size, tot_size);
-
-	gf_import_message(import, GF_OK, "Import done - %s bit rate MP3 detected", is_cbr ? "constant" : "variable");
-	samp->data = NULL;
-	gf_isom_sample_del(&samp);
-
-	gf_media_update_bitrate(import->dest, track);
-
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, 0xFE);
-
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (frame) gf_free(frame);
-	AVI_close(in);
-	return e;
-}
-#endif /*GPAC_DISABLE_AVILIB*/
-
-
-GF_Err gf_import_isomedia(GF_MediaImporter *import)
+static GF_Err gf_import_isomedia_track(GF_MediaImporter *import)
 {
 	GF_Err e;
 	u64 offset, sampDTS, duration, dts_offset;
-	Bool is_nalu_video = GF_FALSE;
-	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode, cdur;
+	Bool is_nalu_video=GF_FALSE, has_seig;
+	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode, cdur, bps;
 	s32 trans_x, trans_y;
 	s16 layer;
-	u8 bps;
 	char *lang;
 	const char *orig_name = gf_url_get_resource_name(gf_isom_get_filename(import->orig));
-	Bool sbr, ps, has_seig;
+	Bool sbr, ps;
 	GF_ISOSample *samp;
 	GF_ESD *origin_esd;
 	GF_InitialObjectDescriptor *iod;
 	Bool is_cenc;
-	u32 clone_flags=0;
+	GF_ISOTrackCloneFlags clone_flags;
 	sampDTS = 0;
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		for (i=0; i<gf_isom_get_track_count(import->orig); i++) {
 			import->tk_info[i].track_num = gf_isom_get_track_id(import->orig, i+1);
-			import->tk_info[i].type = gf_isom_get_media_type(import->orig, i+1);
-			import->tk_info[i].flags = GF_IMPORT_USE_DATAREF;
-			if (gf_isom_is_video_subtype(import->tk_info[i].type) ) {
+			mtype = gf_isom_get_media_type(import->orig, i+1);
+			switch (mtype) {
+			case GF_ISOM_MEDIA_VISUAL:
+				import->tk_info[i].stream_type = GF_STREAM_VISUAL;
+				break;
+			case GF_ISOM_MEDIA_AUDIO:
+				import->tk_info[i].stream_type = GF_STREAM_AUDIO;
+				break;
+			case GF_ISOM_MEDIA_TEXT:
+				import->tk_info[i].stream_type = GF_STREAM_TEXT;
+				break;
+			case GF_ISOM_MEDIA_SCENE:
+				import->tk_info[i].stream_type = GF_STREAM_SCENE;
+				break;
+			default:
+				import->tk_info[i].stream_type = mtype;
+				break;
+			}
+			if (import->tk_info[i].stream_type == GF_STREAM_VISUAL) {
 				gf_isom_get_visual_info(import->orig, i+1, 1, &import->tk_info[i].video_info.width, &import->tk_info[i].video_info.height);
-			} else if (import->tk_info[i].type == GF_ISOM_MEDIA_AUDIO) {
+			} else if (import->tk_info[i].stream_type == GF_STREAM_AUDIO) {
 				gf_isom_get_audio_info(import->orig, i+1, 1, &import->tk_info[i].audio_info.sample_rate, &import->tk_info[i].audio_info.nb_channels, NULL);
 			}
 			lang = NULL;
@@ -2137,6 +326,7 @@
 	ps = GF_FALSE;
 	sbr = GF_FALSE;
 	sbr_sr = 0;
+	w = h = 0;
 	cur_extract_mode = gf_isom_get_nalu_extract_mode(import->orig, track_in);
 	iod = (GF_InitialObjectDescriptor *) gf_isom_get_root_od(import->orig);
 	if (iod && (iod->tag != GF_ODF_IOD_TAG)) {
@@ -2144,24 +334,17 @@
 		iod = NULL;
 	}
 	mtype = gf_isom_get_media_type(import->orig, track_in);
-	if (gf_isom_is_video_subtype(mtype)) {
+	if (mtype==GF_ISOM_MEDIA_VISUAL) {
 		u8 PL = iod ? iod->visual_profileAndLevel : 0xFE;
-		w = h = 0;
 		gf_isom_get_visual_info(import->orig, track_in, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
 		/*for MPEG-4 visual, always check size (don't trust input file)*/
-		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) ) {
-			if (!origin_esd->decoderConfig->decoderSpecificInfo) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] File %s has invalid track #%d: decoderSpecificInfo is missing.\n", orig_name, trackID));
-				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] extracting track (with -raw %d) and reimporting might fix it.\n", trackID));
-			}
-			else {
-				GF_M4VDecSpecInfo dsi;
-				gf_m4v_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-				w = dsi.width;
-				h = dsi.height;
-				PL = dsi.VideoPL;
-			}
+		if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GF_CODECID_MPEG4_PART2)) {
+			GF_M4VDecSpecInfo dsi;
+			gf_m4v_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+			w = dsi.width;
+			h = dsi.height;
+			PL = dsi.VideoPL;
 		}
 #endif
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, PL);
@@ -2174,19 +357,19 @@
 		ps = GF_FALSE;
 		gf_isom_get_audio_info(import->orig, track_in, 1, &sr, &ch, &bps);
 #ifndef GPAC_DISABLE_AV_PARSERS
-        if (origin_esd && (origin_esd->decoderConfig->objectTypeIndication==GPAC_OTI_AUDIO_AAC_MPEG4)) {
-            if (origin_esd->decoderConfig->decoderSpecificInfo) {
-                GF_M4ADecSpecInfo dsi;
-                gf_m4a_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-                sr = dsi.base_sr;
-                if (dsi.has_sbr) sbr_sr = dsi.sbr_sr;
-                ch = dsi.nb_chan;
-                PL = dsi.audioPL;
-                sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : GF_FALSE;
-                ps = dsi.has_ps;
-            } else {
-                GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Missing DecoderSpecificInfo in MPEG-4 AAC stream\n"));
-            }
+		if (origin_esd && origin_esd->decoderConfig && (origin_esd->decoderConfig->objectTypeIndication==GF_CODECID_AAC_MPEG4)) {
+			if (origin_esd->decoderConfig->decoderSpecificInfo) {
+				GF_M4ADecSpecInfo dsi;
+				gf_m4a_get_config(origin_esd->decoderConfig->decoderSpecificInfo->data, origin_esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+				sr = dsi.base_sr;
+				if (dsi.has_sbr) sbr_sr = dsi.sbr_sr;
+				ch = dsi.nb_chan;
+				PL = dsi.audioPL;
+				sbr = dsi.has_sbr ? ((dsi.base_object_type==GF_M4A_AAC_SBR || dsi.base_object_type==GF_M4A_AAC_PS) ? 2 : 1) : GF_FALSE;
+				ps = dsi.has_ps;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Missing DecoderSpecificInfo in MPEG-4 AAC stream\n"));
+			}
 		}
 #endif
 		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, PL);
@@ -2195,7 +378,7 @@
 		w = h = 0;
 		trans_x = trans_y = 0;
 		layer = 0;
-		if (origin_esd && origin_esd->decoderConfig->objectTypeIndication == GPAC_OTI_MEDIA_SUBPIC) {
+		if (origin_esd && origin_esd->decoderConfig->objectTypeIndication == GF_CODECID_SUBPIC) {
 			gf_isom_get_track_layout_info(import->orig, track_in, &w, &h, &trans_x, &trans_y, &layer);
 		}
 	}
@@ -2205,10 +388,13 @@
 		u32 timescale = gf_isom_get_timescale(import->orig);
 		gf_isom_set_timescale(import->dest, timescale);
 	}
-
 	clone_flags = GF_ISOM_CLONE_TRACK_NO_QT;
 	if (import->asemode == GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF) {
 		clone_flags = 0;
+	} else {
+		const char *dst = gf_isom_get_filename(import->dest);
+		if (dst && strstr(dst, ".mov"))
+			clone_flags = 0;
 	}
 
 	if (import->flags & GF_IMPORT_USE_DATAREF) clone_flags |= GF_ISOM_CLONE_TRACK_KEEP_DREF;
@@ -2226,12 +412,15 @@
 	if (import->esd && import->esd->dependsOnESID) {
 		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
 	}
+
 	if (import->trackID && !(import->flags & GF_IMPORT_KEEP_REFS)) {
 		gf_isom_remove_track_references(import->dest, track);
 	}
 
-	mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
+	if (import->source_magic)
+		gf_isom_set_track_magic(import->dest, track, import->source_magic);
 
+	mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
 	switch (mtype) {
 	case GF_ISOM_MEDIA_VISUAL:
 		gf_import_message(import, GF_OK, "IsoMedia import %s - track ID %d - Video (size %d x %d)", orig_name, trackID, w, h);
@@ -2262,7 +451,7 @@
 		break;
 	default:
 	{
-		char szT[5];
+		char szT[GF_4CC_MSIZE];
 		mstype = gf_isom_get_mpeg4_subtype(import->orig, track_in, di);
 		if (!mstype) mstype = gf_isom_get_media_subtype(import->orig, track_in, di);
 		strcpy(szT, gf_4cc_to_str(mtype));
@@ -2279,22 +468,25 @@
 		gf_isom_sample_del(&samp);
 	}
 
-	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 1);
-	if (gf_isom_is_media_encrypted(import->orig, track_in, 1)) {
-		gf_isom_get_original_format_type(import->orig, track_in, 1, &mstype);
+	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 0);
+	if (gf_isom_is_media_encrypted(import->orig, track_in, 0)) {
+		gf_isom_get_original_format_type(import->orig, track_in, 0, &mstype);
 	}
 	has_seig = GF_FALSE;
-	if (is_cenc && gf_isom_has_cenc_sample_group(import->dest, track) ) {
+	if (is_cenc && gf_isom_has_cenc_sample_group(import->orig, track_in)) {
 		has_seig = GF_TRUE;
 	}
 
-	duration = (u64) (((Double)import->duration * gf_isom_get_media_timescale(import->orig, track_in)) / 1000);
-	gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT);
-
 	cdur = gf_isom_get_constant_sample_duration(import->orig, track_in);
 	gf_isom_enable_raw_pack(import->orig, track_in, 2048);
 
-	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
+	duration = 0;
+	if ((import->duration.num>0) && import->duration.den) {
+		duration = (u64) (((Double)import->duration.num * gf_isom_get_media_timescale(import->orig, track_in)) / import->duration.den);
+	}
+	gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT);
+
+	if (import->xps_inband) {
 		if (is_cenc ) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ISOM import] CENC media detected - cannot switch parameter set storage mode\n"));
 		} else if (import->flags & GF_IMPORT_USE_DATAREF) {
@@ -2303,11 +495,11 @@
 			switch (mstype) {
 			case GF_ISOM_SUBTYPE_AVC_H264:
 				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
-				gf_isom_avc_set_inband_config(import->dest, track, 1);
+				gf_isom_avc_set_inband_config(import->dest, track, 1, (import->xps_inband==2) ? GF_TRUE : GF_FALSE);
 				break;
 			case GF_ISOM_SUBTYPE_HVC1:
 				gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
-				gf_isom_hevc_set_inband_config(import->dest, track, 1);
+				gf_isom_hevc_set_inband_config(import->dest, track, 1, (import->xps_inband==2) ? GF_TRUE : GF_FALSE);
 				break;
 			}
 		}
@@ -2327,12 +519,11 @@
 		is_nalu_video = GF_TRUE;
 		break;
 	}
-
 	num_samples = gf_isom_get_sample_count(import->orig, track_in);
 
 	if (is_cenc) {
 		u32 container_type;
-		e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, 0, NULL, &container_type);
+		e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, 0, 1, NULL, &container_type);
 		if (e)
 			goto exit;
 		e = gf_isom_cenc_allocate_storage(import->dest, track, container_type, 0, 0, NULL);
@@ -2357,6 +548,7 @@
 			}
 			samp->DTS -= dts_offset;
 
+			/*if packed samples (raw) and import duration is set, adjust the number of samples to add*/
 			if (samp->nb_pack && duration && (samp->DTS + samp->nb_pack*cdur > duration) ) {
 				u32 nb_samp = (u32) ( (duration - samp->DTS) / cdur);
 				u32 csize = samp->dataLength / samp->nb_pack;
@@ -2368,6 +560,7 @@
 				samp->nb_pack = nb_samp;
 				duration = samp->DTS-1;
 			}
+
 			/*if not first sample and same DTS as previous sample, force DTS++*/
 			if (i && (samp->DTS<=sampDTS)) {
 				if (i+1 < num_samples) {
@@ -2380,33 +573,26 @@
 		sampDTS = samp->DTS;
 		if (samp->nb_pack)
 			i+= samp->nb_pack-1;
-
 		gf_isom_sample_del(&samp);
 
 		gf_isom_copy_sample_info(import->dest, track, import->orig, track_in, i+1);
 
-		if (import->audio_roll_change) {
-			gf_isom_set_sample_roll_group(import->dest, track, i+1, import->audio_roll);
-		}
-
-		gf_set_progress("Importing ISO File", i+1, num_samples);
-
-
 		if (e)
 			goto exit;
 		if (is_cenc) {
 			GF_CENCSampleAuxInfo *sai;
-			u32 container_type, len, j, Is_Encrypted;
+			u32 container_type, len, j;
+			Bool Is_Encrypted;
 			u8 IV_size;
 			bin128 KID;
 			u8 crypt_byte_block, skip_byte_block;
 			u8 constant_IV_size;
 			bin128 constant_IV;
 			GF_BitStream *bs;
-			char *buffer;
+			u8 *buffer;
 
 			sai = NULL;
-			e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, i+1, &sai, &container_type);
+			e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, i+1, di, &sai, &container_type);
 			if (e)
 				goto exit;
 
@@ -2426,10 +612,10 @@
 				gf_isom_cenc_samp_aux_info_del(sai);
 				gf_bs_get_content(bs, &buffer, &len);
 				gf_bs_del(bs);
-				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, buffer, len, is_nalu_video, NULL);
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, buffer, len, is_nalu_video, NULL, GF_FALSE);
 				gf_free(buffer);
 			} else {
-				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, NULL, samp->dataLength, is_nalu_video, NULL);
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, NULL, 0, is_nalu_video, NULL, GF_FALSE);
 			}
 			if (e) goto exit;
 
@@ -2438,8 +624,9 @@
 				if (e) goto exit;
 			}
 		}
+
+		gf_set_progress("Importing ISO File", i+1, num_samples);
 		if (duration && (sampDTS > duration) ) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
 
 	//adjust last sample duration
@@ -2472,13 +659,8 @@
 			if (origin_esd) origin_esd->decoderConfig = NULL;
 		}
 	}
-
-	gf_media_update_bitrate(import->dest, track);
+	gf_media_update_bitrate_ex(import->dest, track, GF_TRUE);
 	if (mtype == GF_ISOM_MEDIA_VISUAL) {
-		if (import->flags & GF_IMPORT_USE_CCST) {
-			e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
-			if (e) goto exit;
-		}
 		if (import->is_alpha) {
 			e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
 			if (e) goto exit;
@@ -2491,2299 +673,28 @@
 	return e;
 }
 
-#ifndef GPAC_DISABLE_MPEG2PS
-
-#include "mpeg2_ps.h"
-
-GF_Err gf_import_mpeg_ps_video(GF_MediaImporter *import)
-{
-	GF_Err e;
-	mpeg2ps_t *ps;
-	Double FPS;
-	char *buf;
-	u8 ftype;
-	u32 track, di, streamID, mtype, w, h, ar, nb_streams, buf_len, frames, ref_frame, timescale, dts_inc, last_pos;
-	u64 file_size, duration;
-	Bool destroy_esd;
-
-	if (import->flags & GF_IMPORT_USE_DATAREF)
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with MPEG-1/2 files");
-
-	/*no auto frame-rate detection*/
-	if (import->video_fps == GF_IMPORT_AUTO_FPS)
-		import->video_fps = GF_IMPORT_DEFAULT_FPS;
-
-	ps = mpeg2ps_init(import->in_name);
-	if (!ps) return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Failed to open MPEG file %s", import->in_name);
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		u32 i, nb_v_str;
-		import->nb_tracks = 0;
-		nb_v_str = nb_streams = mpeg2ps_get_video_stream_count(ps);
-		for (i=0; i<nb_streams; i++) {
-			import->tk_info[import->nb_tracks].track_num = i+1;
-			import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_VISUAL;
-			import->tk_info[import->nb_tracks].flags = GF_IMPORT_OVERRIDE_FPS;
-
-			import->tk_info[import->nb_tracks].video_info.FPS = mpeg2ps_get_video_stream_framerate(ps, i);
-			import->tk_info[import->nb_tracks].video_info.width = mpeg2ps_get_video_stream_width(ps, i);
-			import->tk_info[import->nb_tracks].video_info.height = mpeg2ps_get_video_stream_height(ps, i);
-			import->tk_info[import->nb_tracks].video_info.par = mpeg2ps_get_video_stream_aspect_ratio(ps, i);
-
-			import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_MPG1;
-			if (mpeg2ps_get_video_stream_type(ps, i) == MPEG_VIDEO_MPEG2) import->tk_info[import->nb_tracks].media_type ++;
-
-			import->nb_tracks++;
-		}
-		nb_streams = mpeg2ps_get_audio_stream_count(ps);
-		for (i=0; i<nb_streams; i++) {
-			import->tk_info[import->nb_tracks].track_num = nb_v_str + i+1;
-			import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_AUDIO;
-			switch (mpeg2ps_get_audio_stream_type(ps, i)) {
-			case MPEG_AUDIO_MPEG:
-				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_MPGA;
-				break;
-			case MPEG_AUDIO_AC3:
-				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_AC3;
-				break;
-			case MPEG_AUDIO_LPCM:
-				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_LPCM;
-				break;
-			default:
-				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_UNK;
-				break;
-			}
-			import->tk_info[import->nb_tracks].audio_info.sample_rate = mpeg2ps_get_audio_stream_sample_freq(ps, i);
-			import->tk_info[import->nb_tracks].audio_info.nb_channels = mpeg2ps_get_audio_stream_channels(ps, i);
-			import->nb_tracks ++;
-		}
-		mpeg2ps_close(ps);
-		return GF_OK;
-	}
-
-
-	streamID = 0;
-	nb_streams = mpeg2ps_get_video_stream_count(ps);
-	if ((nb_streams>1) && !import->trackID) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_BAD_PARAM, "%d video tracks in MPEG file - please indicate track to import", nb_streams);
-	}
-	/*audio*/
-	if (import->trackID>nb_streams) {
-		mpeg2ps_close(ps);
-		return GF_OK;
-	}
-	if (import->trackID) streamID = import->trackID - 1;
-
-	if (streamID>=nb_streams) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_BAD_PARAM, "Desired video track not found in MPEG file (%d visual streams)", nb_streams);
-	}
-	w = mpeg2ps_get_video_stream_width(ps, streamID);
-	h = mpeg2ps_get_video_stream_height(ps, streamID);
-	ar = mpeg2ps_get_video_stream_aspect_ratio(ps, streamID);
-	mtype = (mpeg2ps_get_video_stream_type(ps, streamID) == MPEG_VIDEO_MPEG2) ? GPAC_OTI_VIDEO_MPEG2_MAIN : GPAC_OTI_VIDEO_MPEG1;
-	FPS = mpeg2ps_get_video_stream_framerate(ps, streamID);
-	if (import->video_fps) FPS = (Double) import->video_fps;
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	duration = import->duration;
-	duration *= timescale;
-	duration /= 1000;
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		destroy_esd = GF_TRUE;
-		import->esd = gf_odf_desc_esd_new(0);
-	}
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
-	e = gf_isom_last_error(import->dest);
-	if (!track) goto exit;
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->slConfig->timestampResolution = timescale;
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = NULL;
-	import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-	import->esd->decoderConfig->objectTypeIndication = mtype;
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_import_message(import, GF_OK, "%s Video import - Resolution %d x %d @ %02.4f FPS", (mtype==GPAC_OTI_VIDEO_MPEG1) ? "MPEG-1" : "MPEG-2", w, h, FPS);
-	gf_isom_set_visual_info(import->dest, track, di, w, h);
-
-	if (!gf_isom_get_media_timescale(import->dest, track)) {
-		e = gf_import_message(import, GF_BAD_PARAM, "No timescale for imported track - ignoring");
-		if (e) goto exit;
-	}
-
-	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
-
-	file_size = mpeg2ps_get_ps_size(ps);
-	last_pos = 0;
-	frames = 1;
-	ref_frame = 1;
-	while (mpeg2ps_get_video_frame(ps, streamID, (u8 **) &buf, &buf_len, &ftype, TS_90000, NULL)) {
-		GF_ISOSample *samp;
-		if ((buf[buf_len - 4] == 0) && (buf[buf_len - 3] == 0) && (buf[buf_len - 2] == 1)) buf_len -= 4;
-		samp = gf_isom_sample_new();
-		samp->data = buf;
-		samp->dataLength = buf_len;
-		samp->DTS = (u64)dts_inc*(frames-1);
-		samp->IsRAP = (ftype==1) ? RAP : RAP_NO;
-		samp->CTS_Offset = 0;
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		samp->data = NULL;
-		gf_isom_sample_del(&samp);
-		if (e) goto exit;
-
-		last_pos = (u32) mpeg2ps_get_video_pos(ps, streamID);
-		gf_set_progress("Importing MPEG-PS Video", last_pos/1024, file_size/1024);
-
-		if (ftype != 3) {
-			gf_isom_modify_cts_offset(import->dest, track, ref_frame, (frames-ref_frame)*dts_inc);
-			ref_frame = frames;
-		}
-		frames++;
-
-		if (duration && (dts_inc*(frames-1) >= duration) ) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
-	if (!(import->flags & GF_IMPORT_NO_EDIT_LIST))
-		update_edit_list_for_bframes(import->dest, track);
-
-	if (last_pos!=file_size) gf_set_progress("Importing MPEG-PS Video", frames, frames);
-
-	gf_media_update_bitrate(import->dest, track);
-	if (ar) gf_media_change_par(import->dest, track, ar>>16, ar&0xffff, GF_FALSE);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	mpeg2ps_close(ps);
-	return e;
-}
-
-GF_Err gf_import_mpeg_ps_audio(GF_MediaImporter *import)
-{
-	GF_Err e;
-	mpeg2ps_t *ps;
-	char *buf;
-	u32 track, di, streamID, mtype, sr, nb_ch, nb_streams, buf_len, frames, hdr, last_pos;
-	u64 file_size, duration;
-	Bool destroy_esd;
-	GF_ISOSample *samp;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
-
-	if (import->flags & GF_IMPORT_USE_DATAREF)
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with MPEG-1/2 files");
-
-	ps = mpeg2ps_init(import->in_name);
-	if (!ps) return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Failed to open MPEG file %s", import->in_name);
-
-
-	streamID = 0;
-	nb_streams = mpeg2ps_get_audio_stream_count(ps);
-	if ((nb_streams>1) && !import->trackID) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_BAD_PARAM, "%d audio tracks in MPEG file - please indicate track to import", nb_streams);
-	}
-
-	if (import->trackID) {
-		u32 nb_v = mpeg2ps_get_video_stream_count(ps);
-		/*video*/
-		if (import->trackID<=nb_v) {
-			mpeg2ps_close(ps);
-			return GF_OK;
-		}
-		streamID = import->trackID - 1 - nb_v;
-	}
-
-	if (streamID>=nb_streams) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_BAD_PARAM, "Desired audio track not found in MPEG file (%d audio streams)", nb_streams);
-	}
-
-	mtype = mpeg2ps_get_audio_stream_type(ps, streamID);
-	if (mtype != MPEG_AUDIO_MPEG) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Audio format not supported in MP4");
-	}
-
-	if (mpeg2ps_get_audio_frame(ps, streamID, (u8**) &buf, &buf_len, TS_90000, NULL, NULL) == 0) {
-		mpeg2ps_close(ps);
-		return gf_import_message(import, GF_IO_ERR, "Cannot fetch audio frame from MPEG file");
-	}
-
-	hdr = GF_4CC((u8)buf[0],(u8)buf[1],(u8)buf[2],(u8)buf[3]);
-	mtype = gf_mp3_object_type_indication(hdr);
-	sr = gf_mp3_sampling_rate(hdr);
-	nb_ch = gf_mp3_num_channels(hdr);
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		destroy_esd = GF_TRUE;
-		import->esd = gf_odf_desc_esd_new(0);
-	}
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sr);
-	e = gf_isom_last_error(import->dest);
-	if (!track) goto exit;
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	import->esd->slConfig->timestampResolution = sr;
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = NULL;
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = mtype;
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_ch, 16, import->asemode);
-	gf_import_message(import, GF_OK, "%s Audio import - sample rate %d - %d channel%s", (mtype==GPAC_OTI_AUDIO_MPEG1) ? "MPEG-1" : "MPEG-2", sr, nb_ch, (nb_ch>1) ? "s" : "");
-
-
-	duration = (u64) ((Double)import->duration/1000.0 * sr);
-
-	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
-	samp->DTS = 0;
-
-	file_size = mpeg2ps_get_ps_size(ps);
-	frames = 0;
-	do {
-		samp->data = buf;
-		samp->dataLength = buf_len;
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		if (e) goto exit;
-		samp->DTS += gf_mp3_window_size(hdr);
-		last_pos = (u32) mpeg2ps_get_audio_pos(ps, streamID);
-		gf_set_progress("Importing MPEG-PS Audio", last_pos/1024, file_size/1024);
-		frames++;
-		if (duration && (samp->DTS>=duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}  while (mpeg2ps_get_audio_frame(ps, streamID, (u8**)&buf, &buf_len, TS_90000, NULL, NULL));
-
-	samp->data = NULL;
-	gf_isom_sample_del(&samp);
-	if (last_pos!=file_size) gf_set_progress("Importing MPEG-PS Audio", frames, frames);
-	gf_media_update_bitrate(import->dest, track);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	mpeg2ps_close(ps);
-	return e;
-}
-#endif /*GPAC_DISABLE_MPEG2PS*/
-
-
-GF_Err gf_import_nhnt(GF_MediaImporter *import)
-{
-	GF_Err e;
-	Bool destroy_esd, next_is_start;
-	u32 track, di, mtype, max_size, count, w, h, sig;
-	GF_ISOSample *samp;
-	s64 media_size, media_done;
-	u64 offset, duration;
-	GF_BitStream *bs;
-	FILE *nhnt, *mdia, *info;
-	char *ext, szName[1000], szMedia[1000], szNhnt[1000];
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = 0;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
-		return GF_OK;
-	}
-
-	strcpy(szName, import->in_name);
-	ext = strrchr(szName, '.');
-	if (ext) ext[0] = 0;
-
-	strcpy(szMedia, szName);
-	strcat(szMedia, ".nhnt");
-	nhnt = gf_fopen(szMedia, "rb");
-	if (!nhnt) return gf_import_message(import, GF_URL_ERROR, "Cannot find NHNT file %s", szMedia);
-
-	strcpy(szMedia, szName);
-	strcat(szMedia, ".media");
-	mdia = gf_fopen(szMedia, "rb");
-	if (!mdia) {
-		gf_fclose(nhnt);
-		return gf_import_message(import, GF_URL_ERROR, "Cannot find MEDIA file %s", szMedia);
-	}
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	}
-	/*update stream type/oti*/
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-
-
-	strcpy(szNhnt, szName);
-	strcat(szNhnt, ".info");
-	info = gf_fopen(szNhnt, "rb");
-	if (info) {
-		if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-		import->esd->decoderConfig->decoderSpecificInfo = NULL;
-		import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		gf_fseek(info, 0, SEEK_END);
-		import->esd->decoderConfig->decoderSpecificInfo->dataLength = (u32) gf_ftell(info);
-		import->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char) * import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-		gf_fseek(info, 0, SEEK_SET);
-		if (0==fread(import->esd->decoderConfig->decoderSpecificInfo->data, 1, import->esd->decoderConfig->decoderSpecificInfo->dataLength, info)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER,
-			       ("[NHML import] Failed to read dataLength\n"));
-		}
-		gf_fclose(info);
-	}
-	/*keep parsed dsi (if any) if no .info file exists*/
-
-	bs = gf_bs_from_file(nhnt, GF_BITSTREAM_READ);
-	sig = GF_4CC(gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs), gf_bs_read_u8(bs));
-	if (sig == GF_MEDIA_TYPE_NHNT) sig = 0;
-	else if (sig == GF_MEDIA_TYPE_NHNL) sig = 1;
-	else {
-		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Invalid NHNT signature");
-		e = GF_NON_COMPLIANT_BITSTREAM;
-		goto exit;
-	}
-	/*version*/
-	gf_bs_read_u8(bs);
-	import->esd->decoderConfig->streamType = gf_bs_read_u8(bs);
-	import->esd->decoderConfig->objectTypeIndication = gf_bs_read_u8(bs);
-	gf_bs_read_u16(bs);
-	import->esd->decoderConfig->bufferSizeDB = gf_bs_read_u24(bs);
-	import->esd->decoderConfig->avgBitrate = gf_bs_read_u32(bs);
-	import->esd->decoderConfig->maxBitrate = gf_bs_read_u32(bs);
-	import->esd->slConfig->timestampResolution = gf_bs_read_u32(bs);
-
-	w = h = 0;
-	switch (import->esd->decoderConfig->streamType) {
-	case GF_STREAM_SCENE:
-		mtype = GF_ISOM_MEDIA_SCENE;
-		/*we don't know PLs from NHNT...*/
-		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_SCENE, 0xFE);
-		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_GRAPHICS, 0xFE);
-		break;
-	case GF_STREAM_VISUAL:
-		mtype = GF_ISOM_MEDIA_VISUAL;
-#ifndef GPAC_DISABLE_AV_PARSERS
-		if (import->esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-			GF_M4VDecSpecInfo dsi;
-			if (!import->esd->decoderConfig->decoderSpecificInfo) {
-				e = GF_NON_COMPLIANT_BITSTREAM;
-				goto exit;
-			}
-			e = gf_m4v_get_config(import->esd->decoderConfig->decoderSpecificInfo->data, import->esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-			if (e) goto exit;
-			w = dsi.width;
-			h = dsi.height;
-		}
-#endif
-		break;
-	case GF_STREAM_AUDIO:
-		mtype = GF_ISOM_MEDIA_AUDIO;
-		break;
-	case GF_STREAM_MPEG7:
-		mtype = GF_ISOM_MEDIA_MPEG7;
-		break;
-	case GF_STREAM_IPMP:
-		mtype = GF_ISOM_MEDIA_IPMP;
-		break;
-	case GF_STREAM_OCI:
-		mtype = GF_ISOM_MEDIA_OCI;
-		break;
-	case GF_STREAM_MPEGJ:
-		mtype = GF_ISOM_MEDIA_MPEGJ;
-		break;
-	/*note we cannot import OD from NHNT*/
-	case GF_STREAM_OD:
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	case GF_STREAM_INTERACT:
-		mtype = GF_ISOM_MEDIA_SCENE;
-		break;
-	default:
-		mtype = GF_ISOM_MEDIA_ESM;
-		break;
-	}
-	track = gf_isom_new_track(import->dest, import->esd->ESID, mtype, import->esd->slConfig->timestampResolution);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? szMedia : NULL, NULL, &di);
-	if (e) goto exit;
-
-	if (w && h) {
-		gf_isom_set_visual_info(import->dest, track, di, w, h);
-		gf_media_update_par(import->dest, track);
-	}
-
-	gf_import_message(import, GF_OK, "NHNT import - Stream Type %s - ObjectTypeIndication 0x%02x", gf_odf_stream_type_name(import->esd->decoderConfig->streamType), import->esd->decoderConfig->objectTypeIndication);
-
-	duration = (u64) ( ((Double) import->duration)/ 1000 * import->esd->slConfig->timestampResolution);
-
-	samp = gf_isom_sample_new();
-	samp->data = (char*)gf_malloc(sizeof(char) * 1024);
-	max_size = 1024;
-	count = 0;
-	gf_fseek(mdia, 0, SEEK_END);
-	media_size = gf_ftell(mdia);
-	gf_fseek(mdia, 0, SEEK_SET);
-	media_done = 0;
-	next_is_start = GF_TRUE;
-
-	while (!feof(nhnt)) {
-		Bool is_start, is_end;
-		samp->dataLength = gf_bs_read_u24(bs);
-		samp->IsRAP = gf_bs_read_int(bs, 1);
-		is_start = (Bool)gf_bs_read_int(bs, 1);
-		if (next_is_start) {
-			is_start = GF_TRUE;
-			next_is_start = GF_FALSE;
-		}
-		is_end = (Bool)gf_bs_read_int(bs, 1);
-		if (is_end) next_is_start = GF_TRUE;
-		/*3 reserved + AU type (2)*/
-		gf_bs_read_int(bs, 5);
-		if (sig) {
-			u64 CTS;
-			offset = gf_bs_read_u64(bs);
-			CTS = gf_bs_read_u64(bs);
-			samp->DTS = gf_bs_read_u64(bs);
-			samp->CTS_Offset = (u32) (CTS - samp->DTS);
-		} else {
-			offset = gf_bs_read_u32(bs);
-			samp->CTS_Offset = gf_bs_read_u32(bs);
-			samp->DTS = gf_bs_read_u32(bs);
-			samp->CTS_Offset -= (u32) samp->DTS;
-		}
-		if (!count && samp->DTS) samp->DTS = 0;
-		count++;
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			if (!is_start) {
-				e = gf_import_message(import, GF_NOT_SUPPORTED, "Fragmented NHNT file detected - cannot use data referencing");
-				goto exit;
-			}
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else {
-			if (samp->dataLength>max_size) {
-				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
-				max_size = samp->dataLength;
-			}
-			gf_fseek(mdia, offset, SEEK_SET);
-			if (0==fread( samp->data, 1, samp->dataLength, mdia)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Failed to read samp->dataLength\n"));
-			}
-			if (is_start) {
-				e = gf_isom_add_sample(import->dest, track, di, samp);
-			} else {
-				e = gf_isom_append_sample_data(import->dest, track, samp->data, samp->dataLength);
-			}
-		}
-		media_done += samp->dataLength;
-		gf_set_progress("Importing NHNT", (u32) (media_done/1024), (u32) (media_size/1024));
-		if (e) goto exit;
-		if (!gf_bs_available(bs)) break;
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	if (media_done!=media_size) gf_set_progress("Importing NHNT", (u32) (media_size/1024), (u32) (media_size/1024));
-	gf_isom_sample_del(&samp);
-	gf_media_update_bitrate(import->dest, track);
-
-exit:
-	gf_bs_del(bs);
-	gf_fclose(nhnt);
-	gf_fclose(mdia);
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	return e;
-}
-
-
-typedef struct
-{
-	Bool from_is_start, from_is_end, to_is_start, to_is_end;
-	u64 from_pos, to_pos;
-	char *from_id, *to_id;
-	GF_List *id_stack;
-	GF_SAXParser *sax;
-} XMLBreaker;
-
-
-static void nhml_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
-{
-	XMLBreaker *breaker = (XMLBreaker *)sax_cbck;
-	char *node_id;
-	u32 i;
-	GF_XMLAttribute *att;
-	node_id = NULL;
-	for (i=0; i<nb_attributes; i++) {
-		att = (GF_XMLAttribute *) &attributes[i];
-		if (stricmp(att->name, "DEF") && stricmp(att->name, "id")) continue;
-		node_id = gf_strdup(att->value);
-		break;
-	}
-	if (!node_id) {
-		node_id = gf_strdup("__nhml__none");
-		gf_list_add(breaker->id_stack, node_id);
-		return;
-	}
-	gf_list_add(breaker->id_stack, node_id);
-
-	if (breaker->from_is_start && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
-		breaker->from_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
-		breaker->from_is_start = GF_FALSE;
-	}
-	if (breaker->to_is_start && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
-		breaker->to_pos = gf_xml_sax_get_node_start_pos(breaker->sax);
-		breaker->to_is_start = GF_FALSE;
-	}
-	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
-		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
-	}
-
-}
-
-static void nhml_node_end(void *sax_cbck, const char *node_name, const char *name_space)
-{
-	XMLBreaker *breaker = (XMLBreaker *)sax_cbck;
-	char *node_id = (char *)gf_list_last(breaker->id_stack);
-	gf_list_rem_last(breaker->id_stack);
-	if (breaker->from_is_end && breaker->from_id && !strcmp(breaker->from_id, node_id)) {
-		breaker->from_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
-		breaker->from_is_end = GF_FALSE;
-	}
-	if (breaker->to_is_end && breaker->to_id && !strcmp(breaker->to_id, node_id)) {
-		breaker->to_pos = gf_xml_sax_get_node_end_pos(breaker->sax);
-		breaker->to_is_end = GF_FALSE;
-	}
-	gf_free(node_id);
-	if (!breaker->to_is_start && !breaker->from_is_start && !breaker->to_is_end && !breaker->from_is_end) {
-		gf_xml_sax_suspend(breaker->sax, GF_TRUE);
-	}
-}
-
-
-GF_Err gf_import_sample_from_xml(GF_MediaImporter *import, GF_ISOSample *samp, char *xml_file, char *xmlFrom, char *xmlTo, u32 *max_size)
+static GF_Err gf_import_isomedia(GF_MediaImporter *import)
 {
-	GF_Err e;
-	u32 read;
-	XMLBreaker breaker;
-	char *tmp;
-	FILE *xml;
-	u8 szBOM[3];
-	if (!xml_file || !xmlFrom || !xmlTo) return GF_BAD_PARAM;
-
-	memset(&breaker, 0, sizeof(XMLBreaker));
-
-	xml = gf_fopen(xml_file, "rb");
-	if (!xml) {
-		e = gf_import_message(import, GF_BAD_PARAM, "NHML import failure: file %s not found", xml_file);
-		goto exit;
-	}
-	//we cannot use files with BOM since the XML position we get from the parser are offsets in the UTF-8 version of the XML.
-	//TODO: to support files with BOM we would need to serialize on the fly the callback from the sax parser
-	read = (u32) fread(szBOM, 1, 3, xml);
-	if (read==3) {
-		fseek(xml, 0, SEEK_SET);
-		if ((szBOM[0]==0xFF) || (szBOM[0]==0xFE) || (szBOM[0]==0xEF)) {
-			e = gf_import_message(import, GF_NOT_SUPPORTED, "NHML import failure: XML file %s uses BOM, please convert to plin UTF-8 or ANSI first", xml_file);
-			goto exit;
+	u32 nb_tracks, i;
+	if (import->trackID)
+		return gf_import_isomedia_track(import);
+
+	if (!import->orig) return GF_BAD_PARAM;
+
+	nb_tracks = gf_isom_get_track_count(import->orig);
+	for (i=0; i<nb_tracks; i++) {
+		import->trackID = gf_isom_get_track_id(import->orig, i+1);
+		if (import->trackID) {
+			GF_Err e = gf_import_isomedia_track(import);
+			import->trackID = 0;
+			if (e) return e;
 		}
 	}
-
-
-	memset(&breaker, 0, sizeof(XMLBreaker));
-	breaker.id_stack = gf_list_new();
-
-	if (strstr(xmlFrom, ".start")) breaker.from_is_start = GF_TRUE;
-	else breaker.from_is_end = GF_TRUE;
-	tmp = strchr(xmlFrom, '.');
-	*tmp = 0;
-	if (stricmp(xmlFrom, "doc")) breaker.from_id = gf_strdup(xmlFrom);
-	/*doc start pos is 0, no need to look for it*/
-	else if (breaker.from_is_start) breaker.from_is_start = GF_FALSE;
-	*tmp = '.';
-
-	if (strstr(xmlTo, ".start")) breaker.to_is_start = GF_TRUE;
-	else breaker.to_is_end = GF_TRUE;
-	tmp = strchr(xmlTo, '.');
-	*tmp = 0;
-	if (stricmp(xmlTo, "doc")) breaker.to_id = gf_strdup(xmlTo);
-	/*doc end pos is file size, no need to look for it*/
-	else if (breaker.to_is_end) breaker.to_is_end = GF_FALSE;
-	*tmp = '.';
-
-	breaker.sax = gf_xml_sax_new(nhml_node_start, nhml_node_end, NULL, &breaker);
-	e = gf_xml_sax_parse_file(breaker.sax, xml_file, NULL);
-	gf_xml_sax_del(breaker.sax);
-	if (e<0) goto exit;
-	e = GF_OK;
-
-	if (!breaker.to_id) {
-		gf_fseek(xml, 0, SEEK_END);
-		breaker.to_pos = gf_ftell(xml);
-		gf_fseek(xml, 0, SEEK_SET);
-	}
-	if(breaker.to_pos < breaker.from_pos) {
-		e = gf_import_message(import, GF_BAD_PARAM, "NHML import failure: xmlFrom %s is located after xmlTo %s", xmlFrom, xmlTo);
-		goto exit;
-	}
-
-	assert(breaker.to_pos > breaker.from_pos);
-
-	samp->dataLength = (u32) (breaker.to_pos - breaker.from_pos);
-	if (*max_size < samp->dataLength) {
-		*max_size = samp->dataLength;
-		samp->data = (char*)gf_realloc(samp->data, sizeof(char)*samp->dataLength);
-	}
-	gf_fseek(xml, breaker.from_pos, SEEK_SET);
-	if (0==fread(samp->data, 1, samp->dataLength, xml)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Failed to read samp->dataLength\n"));
-	}
-
-exit:
-	if (xml) gf_fclose(xml);
-	while (gf_list_count(breaker.id_stack)) {
-		char *id = (char *)gf_list_last(breaker.id_stack);
-		gf_list_rem_last(breaker.id_stack);
-		gf_free(id);
-	}
-	gf_list_del(breaker.id_stack);
-	if (breaker.from_id) gf_free(breaker.from_id);
-	if (breaker.to_id) gf_free(breaker.to_id);
-	return e;
-}
-
-
-#ifndef GPAC_DISABLE_ZLIB
-
-/*since 0.2.2, we use zlib for xmt/x3d reading to handle gz files*/
-#include <zlib.h>
-
-#define ZLIB_COMPRESS_SAFE	4
-
-static GF_Err compress_sample_data(GF_ISOSample *samp, u32 *max_size, char **dict, u32 offset)
-{
-	z_stream stream;
-	int err;
-	char *dest = (char *)gf_malloc(sizeof(char)*samp->dataLength*ZLIB_COMPRESS_SAFE);
-	stream.next_in = (Bytef*)samp->data + offset;
-	stream.avail_in = (uInt)samp->dataLength - offset;
-	stream.next_out = ( Bytef*)dest;
-	stream.avail_out = (uInt)samp->dataLength*ZLIB_COMPRESS_SAFE;
-	stream.zalloc = (alloc_func)NULL;
-	stream.zfree = (free_func)NULL;
-	stream.opaque = (voidpf)NULL;
-
-	err = deflateInit(&stream, 9);
-	if (err != Z_OK) {
-		gf_free(dest);
-		return GF_IO_ERR;
-	}
-	if (dict && *dict) {
-		err = deflateSetDictionary(&stream, (Bytef *)*dict, (u32) strlen(*dict));
-		if (err != Z_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHML import] Error assigning dictionary\n"));
-			deflateEnd(&stream);
-			gf_free(dest);
-			return GF_IO_ERR;
-		}
-	}
-	err = deflate(&stream, Z_FINISH);
-	if (err != Z_STREAM_END) {
-		deflateEnd(&stream);
-		gf_free(dest);
-		return GF_IO_ERR;
-	}
-	if (samp->dataLength - offset<stream.total_out) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import] compressed data (%d) bigger than input data (%d)\n", (u32) stream.total_out, (u32) samp->dataLength - offset));
-	}
-	if (dict) {
-		if (*dict) gf_free(*dict);
-		*dict = (char*)gf_malloc(sizeof(char)*samp->dataLength);
-		memcpy(*dict, samp->data, samp->dataLength);
-	}
-	if (*max_size < stream.total_out) {
-		*max_size = samp->dataLength*ZLIB_COMPRESS_SAFE;
-		samp->data = (char*)gf_realloc(samp->data, *max_size * sizeof(char));
-	}
-
-	memcpy(samp->data + offset, dest, sizeof(char)*stream.total_out);
-	samp->dataLength = (u32) (offset + stream.total_out);
-	gf_free(dest);
-
-	deflateEnd(&stream);
 	return GF_OK;
 }
 
-#endif /*GPAC_DISABLE_ZLIB*/
-
-static void nhml_on_progress(void *cbk, u64 done, u64 tot)
-{
-	gf_set_progress("NHML Loading", done, tot);
-}
-
-#define NHML_SCAN_INT(_fmt, _value)	\
-	{\
-	if (strstr(att->value, "0x")) { u32 __i; sscanf(att->value+2, "%x", &__i); _value = __i; }\
-	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
-	else sscanf(att->value, _fmt, &_value); \
-	}\
-
-
-/*FIXME - need LARGE FILE support in NHNT - add a new version*/
-GF_Err gf_import_nhml_dims(GF_MediaImporter *import, Bool dims_doc)
-{
-	GF_Err e;
-	GF_DIMSDescription dims;
-	Bool destroy_esd, inRootOD, do_compress, is_dims;
-	u32 i, track, tkID, di, mtype, max_size, count, streamType, oti, timescale, specInfoSize, header_end, dts_inc, par_den, par_num;
-	GF_ISOSample *samp;
-	GF_XMLAttribute *att;
-	s64 media_size, media_done, offset;
-	u64 duration, sample_duration;
-	FILE *nhml, *mdia, *info;
-	char *dictionary = NULL, *auxiliary_mime_types = NULL;
-	char *ext, szName[1000], szMedia[GF_MAX_PATH], szMediaTemp[GF_MAX_PATH], szInfo[GF_MAX_PATH], szXmlFrom[1000], szXmlTo[1000], szXmlHeaderEnd[1000];
-	char *specInfo;
-	GF_GenericSampleDescription sdesc;
-	GF_DOMParser *parser;
-	GF_XMLNode *root, *node, *childnode;
-	char *szRootName, *szSampleName, *szSubSampleName, *szImpName;
-#ifndef GPAC_DISABLE_ZLIB
-	Bool use_dict = GF_FALSE;
-#endif
-
-	szRootName = dims_doc ? "DIMSStream" : "NHNTStream";
-	szSampleName = dims_doc ? "DIMSUnit" : "NHNTSample";
-	szSubSampleName = dims_doc ? "DIMSSubUnit" : "NHNTSubSample";
-	szImpName = dims_doc ? "DIMS" : "NHML";
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = 0;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
-		return GF_OK;
-	}
-	nhml = gf_fopen(import->in_name, "rt");
-	if (!nhml) return gf_import_message(import, GF_URL_ERROR, "Cannot find %s file %s", szImpName, import->in_name);
-
-	strcpy(szName, import->in_name);
-	ext = strrchr(szName, '.');
-	if (ext) ext[0] = 0;
-
-	strcpy(szMedia, szName);
-	strcat(szMedia, ".media");
-	strcpy(szInfo, szName);
-	strcat(szInfo, ".info");
-
-	parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(parser, import->in_name, nhml_on_progress, import);
-	if (e) {
-		gf_fclose(nhml);
-		gf_import_message(import, e, "Error parsing %s file: Line %d - %s", szImpName, 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) {
-		e = gf_import_message(import, GF_BAD_PARAM, "Error parsing %s file - no root node found", szImpName);
-		gf_xml_dom_del(parser);
-		return e;
-	}
-
-	mdia = NULL;
-	destroy_esd = GF_FALSE;
-	dts_inc = 0;
-	inRootOD = GF_FALSE;
-	do_compress = GF_FALSE;
-	is_dims = GF_FALSE;
-	specInfo = NULL;
-	samp = NULL;
-	memset(&dims, 0, sizeof(GF_DIMSDescription));
-	dims.profile = dims.level = 255;
-	dims.streamType = GF_TRUE;
-	dims.containsRedundant = 1;
-
-	if (stricmp(root->name, szRootName)) {
-		e = gf_import_message(import, GF_BAD_PARAM, "Error parsing %s file - \"%s\" root expected, got \"%s\"", szImpName, szRootName, root->name);
-		goto exit;
-	}
-
-	memset(&sdesc, 0, sizeof(GF_GenericSampleDescription));
-	tkID = mtype = streamType = oti = par_den = par_num = 0;
-	timescale = 1000;
-	i=0;
-	strcpy(szXmlHeaderEnd, "");
-	header_end = 0;
-
-	while ((att = (GF_XMLAttribute *)gf_list_enum(root->attributes, &i))) {
-		if (!stricmp(att->name, "streamType")) {
-			NHML_SCAN_INT("%u", streamType)
-		} 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)) {
-			sdesc.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", oti)
-		} else if (!stricmp(att->name, "timeScale")) {
-			NHML_SCAN_INT("%u", timescale)
-		} else if (!stricmp(att->name, "width")) {
-			NHML_SCAN_INT("%hu", sdesc.width)
-		} else if (!stricmp(att->name, "height")) {
-			NHML_SCAN_INT("%hu", sdesc.height)
-		} else if (!stricmp(att->name, "parNum")) {
-			NHML_SCAN_INT("%u", par_num)
-		} else if (!stricmp(att->name, "parDen")) {
-			NHML_SCAN_INT("%u", par_den)
-		} else if (!stricmp(att->name, "sampleRate")) {
-			NHML_SCAN_INT("%u", sdesc.samplerate)
-		} else if (!stricmp(att->name, "numChannels")) {
-			NHML_SCAN_INT("%hu", sdesc.nb_channels)
-		} else if (!stricmp(att->name, "baseMediaFile")) {
-			char *url = gf_url_concatenate(import->in_name, att->value);
-			strcpy(szMedia, url ? url : att->value);
-			if (url) gf_free(url);
-		} else if (!stricmp(att->name, "specificInfoFile")) {
-			char *url = gf_url_concatenate(import->in_name, att->value);
-			strcpy(szInfo, url ? url : att->value);
-			if (url) gf_free(url);
-		} else if (!stricmp(att->name, "headerEnd")) {
-			NHML_SCAN_INT("%u", header_end)
-		} else if (!stricmp(att->name, "trackID")) {
-			NHML_SCAN_INT("%u", tkID)
-		} else if (!stricmp(att->name, "inRootOD")) {
-			inRootOD = (!stricmp(att->value, "yes") );
-		} else if (!stricmp(att->name, "DTS_increment")) {
-			NHML_SCAN_INT("%u", dts_inc)
-		} else if (!stricmp(att->name, "gzipSamples")) {
-			do_compress = (!stricmp(att->value, "yes")) ? GF_TRUE : GF_FALSE;
-		} else if (!stricmp(att->name, "auxiliaryMimeTypes")) {
-			auxiliary_mime_types = gf_strdup(att->name);
-		}
-#ifndef GPAC_DISABLE_ZLIB
-		else if (!stricmp(att->name, "gzipDictionary")) {
-			u64 d_size;
-			if (stricmp(att->value, "self")) {
-				char *url = gf_url_concatenate(import->in_name, att->value);
-				FILE *d = gf_fopen(url ? url : att->value, "rb");
-				if (url) gf_free(url);
-				if (!d) {
-					gf_import_message(import, GF_IO_ERR, "Cannot open dictionary file %s", att->value);
-					continue;
-				}
-				gf_fseek(d, 0, SEEK_END);
-				d_size = gf_ftell(d);
-				dictionary = (char*)gf_malloc(sizeof(char)*(size_t)(d_size+1));
-				gf_fseek(d, 0, SEEK_SET);
-				d_size = fread(dictionary, sizeof(char), (size_t)d_size, d);
-				dictionary[d_size]=0;
-			}
-			use_dict = GF_TRUE;
-		}
-#endif
-		/*unknown desc related*/
-		else if (!stricmp(att->name, "compressorName")) {
-			strcpy(sdesc.compressor_name, att->value);
-		} else if (!stricmp(att->name, "codecVersion")) {
-			NHML_SCAN_INT("%hu", sdesc.version)
-		} else if (!stricmp(att->name, "codecRevision")) {
-			NHML_SCAN_INT("%hu", sdesc.revision)
-		} else if (!stricmp(att->name, "codecVendor") && (strlen(att->value)==4)) {
-			sdesc.vendor_code = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
-		} else if (!stricmp(att->name, "temporalQuality")) {
-			NHML_SCAN_INT("%u", sdesc.temporal_quality)
-		} else if (!stricmp(att->name, "spatialQuality")) {
-			NHML_SCAN_INT("%u", sdesc.spatial_quality)
-		} else if (!stricmp(att->name, "horizontalResolution")) {
-			NHML_SCAN_INT("%u", sdesc.h_res)
-		} else if (!stricmp(att->name, "verticalResolution")) {
-			NHML_SCAN_INT("%u", sdesc.v_res)
-		} else if (!stricmp(att->name, "bitDepth")) {
-			NHML_SCAN_INT("%hu", sdesc.depth)
-		} else if (!stricmp(att->name, "bitsPerSample")) {
-			NHML_SCAN_INT("%hu", sdesc.bits_per_sample)
-		}
-		/*DIMS stuff*/
-		else if (!stricmp(att->name, "profile")) {
-			NHML_SCAN_INT("%c", dims.profile)
-		} else if (!stricmp(att->name, "level")) {
-			NHML_SCAN_INT("%c", dims.level)
-		} else if (!stricmp(att->name, "pathComponents")) {
-			NHML_SCAN_INT("%c", dims.pathComponents)
-		} else if (!stricmp(att->name, "useFullRequestHost") && !stricmp(att->value, "yes")) {
-			dims.fullRequestHost = GF_TRUE;
-		} else if (!stricmp(att->name, "stream_type") && !stricmp(att->value, "secondary")) {
-			dims.streamType = GF_FALSE;
-		} else if (!stricmp(att->name, "contains_redundant")) {
-			if (!stricmp(att->value, "main")) {
-				dims.containsRedundant = 1;
-			} else if (!stricmp(att->value, "redundant")) {
-				dims.containsRedundant = 2;
-			} else if (!stricmp(att->value, "main+redundant")) {
-				dims.containsRedundant = 3;
-			}
-		} else if (!stricmp(att->name, "text_encoding") || !stricmp(att->name, "encoding")) {
-			dims.textEncoding = att->value;
-		} else if (!stricmp(att->name, "content_encoding")) {
-			if (!strcmp(att->value, "deflate")) {
-				dims.contentEncoding = att->value;
-				do_compress = GF_TRUE;
-			}
-		} else if (!stricmp(att->name, "content_script_types")) {
-			dims.content_script_types = att->value;
-		} else if (!stricmp(att->name, "mime_type")) {
-			dims.mime_type = att->value;
-		} else if (!stricmp(att->name, "media_namespace")) {
-			dims.mime_type = att->value;
-		} else if (!stricmp(att->name, "media_schema_location")) {
-			dims.xml_schema_loc = att->value;
-		} else if (!stricmp(att->name, "xml_namespace")) {
-			dims.mime_type = att->value;
-		} else if (!stricmp(att->name, "xml_schema_location")) {
-			dims.xml_schema_loc = att->value;
-		} else if (!stricmp(att->name, "xmlHeaderEnd")) {
-			strcpy(szXmlHeaderEnd, att->value);
-		}
-	}
-	if (sdesc.samplerate && !timescale) {
-		timescale = sdesc.samplerate;
-	}
-	if (!sdesc.bits_per_sample) {
-		sdesc.bits_per_sample = 16;
-	}
-
-	if (dims_doc || (sdesc.codec_tag==GF_ISOM_SUBTYPE_3GP_DIMS)) {
-		mtype = GF_ISOM_MEDIA_DIMS;
-		sdesc.codec_tag=GF_ISOM_SUBTYPE_3GP_DIMS;
-		is_dims = GF_TRUE;
-		streamType = 0;
-		import->flags &= ~GF_IMPORT_USE_DATAREF;
-	}
-
-	mdia = gf_fopen(szMedia, "rb");
-
-	specInfoSize = 0;
-	if (!streamType && !mtype && !sdesc.codec_tag) {
-		e = gf_import_message(import, GF_NOT_SUPPORTED, "Error parsing %s file - StreamType or MediaType not specified", szImpName);
-		goto exit;
-	}
-
-	info = gf_fopen(szInfo, "rb");
-	if (info) {
-		gf_fseek(info, 0, SEEK_END);
-		specInfoSize = (u32) gf_ftell(info);
-		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
-		gf_fseek(info, 0, SEEK_SET);
-		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, info);
-		specInfo[specInfoSize] = 0;
-		gf_fclose(info);
-	} else if (header_end) {
-		/* for text based streams, the decoder specific info can be at the beginning of the file */
-		specInfoSize = header_end;
-		specInfo = (char*)gf_malloc(sizeof(char) * (specInfoSize+1));
-		specInfoSize = (u32) fread(specInfo, sizeof(char), specInfoSize, mdia);
-		specInfo[specInfoSize] = 0;
-		header_end = specInfoSize;
-	} else if (strlen(szXmlHeaderEnd)) {
-		/* for XML based streams, the decoder specific info can be up to some element in the file */
-		samp = gf_isom_sample_new();
-		max_size = 0;
-		strcpy(szXmlFrom, "doc.start");
-		e = gf_import_sample_from_xml(import, samp, szMedia, szXmlFrom, szXmlHeaderEnd, &max_size);
-		if (e) {
-			gf_isom_sample_del(&samp);
-			goto exit;
-		}
-		specInfo = (char*)gf_malloc(sizeof(char) * (samp->dataLength+1));
-		memcpy(specInfo, samp->data, samp->dataLength);
-		specInfoSize = samp->dataLength;
-		specInfo[specInfoSize] = 0;
-		gf_isom_sample_del(&samp);
-	}
-
-	i=0;
-	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
-		if (node->type) continue;
-		if (stricmp(node->name, "DecoderSpecificInfo") ) continue;
-
-		e = gf_xml_parse_bit_sequence(node, &specInfo, &specInfoSize);
-		if (e) goto exit;
-		break;
-	}
-
-
-	/*compressing samples, remove data ref*/
-	if (do_compress) import->flags &= ~GF_IMPORT_USE_DATAREF;
-
-	if (streamType) {
-		if (!import->esd) {
-			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = GF_TRUE;
-			import->esd->ESID = tkID;
-		}
-		/*update stream type/oti*/
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->decoderConfig->streamType = streamType;
-		import->esd->decoderConfig->objectTypeIndication = oti;
-
-		if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-		import->esd->decoderConfig->decoderSpecificInfo = NULL;
-
-		import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-		import->esd->decoderConfig->decoderSpecificInfo->dataLength = specInfoSize;
-		import->esd->decoderConfig->decoderSpecificInfo->data = specInfo;
-		specInfo = NULL;
-		specInfoSize = 0;
-		import->esd->slConfig->timestampResolution = timescale;
-
-
-		switch (import->esd->decoderConfig->streamType) {
-		case GF_STREAM_SCENE:
-			mtype = GF_ISOM_MEDIA_SCENE;
-			break;
-		case GF_STREAM_VISUAL:
-			mtype = GF_ISOM_MEDIA_VISUAL;
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (import->esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-				GF_M4VDecSpecInfo dsi;
-				if (!import->esd->decoderConfig->decoderSpecificInfo) {
-					e = GF_NON_COMPLIANT_BITSTREAM;
-					goto exit;
-				}
-				e = gf_m4v_get_config(import->esd->decoderConfig->decoderSpecificInfo->data, import->esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-				sdesc.width = dsi.width;
-				sdesc.height = dsi.height;
-				if (e) goto exit;
-			}
-#endif
-			break;
-		case GF_STREAM_AUDIO:
-			mtype = GF_ISOM_MEDIA_AUDIO;
-			if (!sdesc.samplerate) sdesc.samplerate = 44100;
-			if (!sdesc.nb_channels) sdesc.nb_channels = 2;
-			break;
-		case GF_STREAM_MPEG7:
-			mtype = GF_ISOM_MEDIA_MPEG7;
-			break;
-		case GF_STREAM_IPMP:
-			mtype = GF_ISOM_MEDIA_IPMP;
-			break;
-		case GF_STREAM_OCI:
-			mtype = GF_ISOM_MEDIA_OCI;
-			break;
-		case GF_STREAM_MPEGJ:
-			mtype = GF_ISOM_MEDIA_MPEGJ;
-			break;
-		/*note we cannot import OD from NHNT*/
-		case GF_STREAM_OD:
-			e = GF_NOT_SUPPORTED;
-			goto exit;
-		case GF_STREAM_INTERACT:
-			mtype = GF_ISOM_MEDIA_SCENE;
-			break;
-		default:
-			if (!mtype) mtype = GF_ISOM_MEDIA_ESM;
-			break;
-		}
-
-		track = gf_isom_new_track(import->dest, import->esd->ESID, mtype, timescale);
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? szMedia : NULL, NULL, &di);
-		if (e) goto exit;
-
-		gf_import_message(import, GF_OK, "NHML import - Stream Type %s - ObjectTypeIndication 0x%02x", gf_odf_stream_type_name(import->esd->decoderConfig->streamType), import->esd->decoderConfig->objectTypeIndication);
-
-	} else if (is_dims) {
-		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		e = gf_isom_new_dims_description(import->dest, track, &dims, NULL, NULL, &di);
-		if (e) goto exit;
-
-		gf_import_message(import, GF_OK, "3GPP DIMS import");
-	} else if (mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT || mtype == GF_ISOM_MEDIA_TEXT) {
-		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		if (sdesc.codec_tag == GF_ISOM_SUBTYPE_STPP) {
-			e = gf_isom_new_xml_subtitle_description(import->dest, track,
-			        dims.mime_type, dims.xml_schema_loc, auxiliary_mime_types,
-			        &di);
-		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_SBTT) {
-			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_SBTT,
-			                                 dims.mime_type, dims.contentEncoding, specInfo,
-			                                 &di);
-		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_STXT) {
-			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_STXT,
-			                                 dims.mime_type, dims.contentEncoding, specInfo,
-			                                 &di);
-		} else {
-			e = GF_NOT_SUPPORTED;
-		}
-		if (e) goto exit;
-	} else if (mtype == GF_ISOM_MEDIA_META) {
-		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		if(sdesc.codec_tag == GF_ISOM_SUBTYPE_METX) {
-			e = gf_isom_new_xml_metadata_description(import->dest, track,
-			        dims.mime_type, dims.xml_schema_loc, dims.textEncoding,
-			        &di);
-		} else if (sdesc.codec_tag == GF_ISOM_SUBTYPE_METT) {
-			e = gf_isom_new_stxt_description(import->dest, track, GF_ISOM_SUBTYPE_METT,
-			                                 dims.mime_type, dims.textEncoding, specInfo,
-			                                 &di);
-		} else {
-			e = GF_NOT_SUPPORTED;
-		}
-		if (e) goto exit;
-	} else {
-		char szT[5];
-		sdesc.extension_buf = specInfo;
-		sdesc.extension_buf_size = specInfoSize;
-		if (!sdesc.vendor_code) sdesc.vendor_code = GF_VENDOR_GPAC;
-
-		track = gf_isom_new_track(import->dest, tkID, mtype, timescale);
-		if (!track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-
-		e = gf_isom_new_generic_sample_description(import->dest, track, (import->flags & GF_IMPORT_USE_DATAREF) ? szMedia : NULL, NULL, &sdesc, &di);
-		if (e) goto exit;
-
-		strcpy(szT, gf_4cc_to_str(mtype));
-		gf_import_message(import, GF_OK, "NHML import - MediaType \"%s\" - SubType \"%s\"", szT, gf_4cc_to_str(sdesc.codec_tag));
-	}
-
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
-
-	if (sdesc.width && sdesc.height) {
-		u32 w = sdesc.width;
-		gf_isom_set_visual_info(import->dest, track, di, sdesc.width, sdesc.height);
-		if (par_den && par_num) {
-			gf_media_change_par(import->dest, track, par_num, par_den, GF_FALSE);
-			w *= par_num;
-			w /= par_den;
-		} else {
-			gf_media_update_par(import->dest, track);
-		}
-		gf_isom_set_track_layout_info(import->dest, track, w << 16, sdesc.height << 16, 0, 0, 0);
-	}
-	else if (sdesc.samplerate && sdesc.nb_channels) {
-		gf_isom_set_audio_info(import->dest, track, di, sdesc.samplerate, sdesc.nb_channels, (u8) sdesc.bits_per_sample, import->asemode);
-	}
-
-	duration = (u64) ( ((Double) import->duration)/ 1000 * timescale);
-
-	samp = gf_isom_sample_new();
-	samp->data = (char*)gf_malloc(sizeof(char) * 1024);
-	max_size = 1024;
-	count = 0;
-	media_size = 0;
-	if (mdia) {
-		gf_fseek(mdia, 0, SEEK_END);
-		media_size = gf_ftell(mdia);
-		gf_fseek(mdia, 0, SEEK_SET);
-	}
-	/* if we've read the header from the same file, mark the header data as used */
-	media_done = header_end;
-
-	sample_duration = 0;
-	samp->IsRAP = RAP;
-	i=0;
-	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
-		u32 j, dims_flags, sap_type;
-		Bool append, compress, has_subbs;
-		char *base_data = NULL;
-		if (node->type) continue;
-		if (stricmp(node->name, szSampleName) ) continue;
-
-		strcpy(szMediaTemp, "");
-		strcpy(szXmlFrom, "");
-		strcpy(szXmlTo, "");
-
-		/*by default handle all samples as contiguous*/
-		offset = 0;
-		samp->dataLength = 0;
-		dims_flags = 0;
-		append = GF_FALSE;
-		compress = do_compress;
-		sample_duration = 0;
-		sap_type = 0;
-
-		j=0;
-		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
-			if (!stricmp(att->name, "DTS") || !stricmp(att->name, "time")) {
-				u32 h, m, s, ms;
-				u64 dst_val;
-				if (strchr(att->value, ':') && sscanf(att->value, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
-					samp->DTS = (u64) ( (Double) ( ((h*3600.0 + m*60.0 + s)*1000 + ms) / 1000.0) * timescale );
-				} else if (sscanf(att->value, ""LLU, &dst_val)==1) {
-					samp->DTS = dst_val;
-				}
-			}
-			else if (!stricmp(att->name, "CTSOffset")) samp->CTS_Offset = atoi(att->value);
-			else if (!stricmp(att->name, "isRAP") && !samp->IsRAP) {
-				samp->IsRAP = (!stricmp(att->value, "yes")) ? RAP : RAP_NO;
-			}
-			else if (!stricmp(att->name, "isSyncShadow")) samp->IsRAP = !stricmp(att->value, "yes") ? RAP_REDUNDANT : RAP_NO;
-			else if (!stricmp(att->name, "SAPType") && !samp->IsRAP) sap_type = atoi(att->value);
-			else if (!stricmp(att->name, "mediaOffset")) offset = (s64) atof(att->value) ;
-			else if (!stricmp(att->name, "dataLength")) samp->dataLength = atoi(att->value);
-			else if (!stricmp(att->name, "mediaFile")) {
-				if (!strncmp(att->value, "data:", 5)) {
-					char *base = strstr(att->value, "base64,");
-					if (!base) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[NHML import] Data encoding scheme not recognized - skipping\n"));
-					} else {
-						base_data = att->value;
-					}
-				} else {
-					char *url = gf_url_concatenate(import->in_name, att->value);
-					strcpy(szMediaTemp, url ? url : att->value);
-					if (url) gf_free(url);
-				}
-			}
-			else if (!stricmp(att->name, "xmlFrom")) strcpy(szXmlFrom, att->value);
-			else if (!stricmp(att->name, "xmlTo")) strcpy(szXmlTo, att->value);
-			/*DIMS flags*/
-			else if (!stricmp(att->name, "is-Scene") && !stricmp(att->value, "yes"))
-				dims_flags |= GF_DIMS_UNIT_S;
-			else if (!stricmp(att->name, "is-RAP") && !stricmp(att->value, "yes")) {
-				dims_flags |= GF_DIMS_UNIT_M;
-				samp->IsRAP = RAP;
-			}
-			else if (!stricmp(att->name, "is-redundant") && !stricmp(att->value, "yes"))
-				dims_flags |= GF_DIMS_UNIT_I;
-			else if (!stricmp(att->name, "redundant-exit") && !stricmp(att->value, "yes"))
-				dims_flags |= GF_DIMS_UNIT_D;
-			else if (!stricmp(att->name, "priority") && !stricmp(att->value, "high"))
-				dims_flags |= GF_DIMS_UNIT_P;
-			else if (!stricmp(att->name, "compress") && !stricmp(att->value, "yes"))
-				dims_flags |= GF_DIMS_UNIT_C;
-			else if (!stricmp(att->name, "duration") )
-				sscanf(att->value, ""LLU, &sample_duration);
-		}
-		if (samp->IsRAP==RAP)
-			dims_flags |= GF_DIMS_UNIT_M;
-		if (!count && samp->DTS) samp->DTS = 0;
-
-		if (!(dims_flags & GF_DIMS_UNIT_C)) compress = GF_FALSE;
-		count++;
-
-		has_subbs = GF_FALSE;
-		j=0;
-		while ((childnode = (GF_XMLNode *) gf_list_enum(node->content, &j))) {
-			if (childnode->type) continue;
-			if (!stricmp(childnode->name, "BS")) {
-				has_subbs = GF_TRUE;
-				break;
-			}
-		}
-
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			if (offset) offset = media_done;
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else if (strlen(szXmlFrom) && strlen(szXmlTo)) {
-			char *xml_file;
-			if (strlen(szMediaTemp)) xml_file = szMediaTemp;
-			else xml_file = szMedia;
-			samp->dataLength = max_size;
-			e = gf_import_sample_from_xml(import, samp, xml_file, szXmlFrom, szXmlTo, &max_size);
-		} else if (is_dims && !strlen(szMediaTemp)) {
-			GF_BitStream *bs;
-			char *content = gf_xml_dom_serialize(node, GF_TRUE);
-
-			samp->dataLength = 3 + (u32) strlen(content);
-
-			if (samp->dataLength>max_size) {
-				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
-				max_size = samp->dataLength;
-			}
-
-			bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_WRITE);
-			gf_bs_write_u16(bs, samp->dataLength-2);
-			gf_bs_write_u8(bs, (u8) dims_flags);
-			gf_bs_write_data(bs, content, (samp->dataLength-3));
-			gf_free(content);
-			gf_bs_del(bs);
-			/*same DIMS unit*/
-			if (gf_isom_get_sample_from_dts(import->dest, track, samp->DTS))
-				append = GF_TRUE;
-
-		} else if (has_subbs) {
-			if (samp->data) gf_free(samp->data );
-			samp->data = 0;
-			samp->dataLength = 0;
-			e = gf_xml_parse_bit_sequence(node, &samp->data, &samp->dataLength);
-			max_size = samp->dataLength;
-		} else if (base_data) {
-			char *start = strchr(base_data, ',');
-			if (start) {
-				u32 len = (u32)strlen(start+1);
-				if (len>max_size) {
-					max_size=len;
-					samp->data = gf_realloc(samp->data, sizeof(char)*max_size);
-				}
-				samp->dataLength = gf_base64_decode(start, len, samp->data, len);
-			}
-		} else {
-			Bool close = GF_FALSE, has_subsamples = GF_FALSE;
-			FILE *f = mdia;
-
-			j = 0;
-			while ((childnode = (GF_XMLNode *)gf_list_enum(node->content, &j))) {
-				if (childnode->type) continue;
-				if (!stricmp(childnode->name, szSubSampleName)) {
-					has_subsamples = GF_TRUE;
-					break;
-				}
-			}
-			//JLF: not sure why this test is here, it could be usefull to describe subsamples but using data source
-			//from sample or baseMediaFile ...
-			if (has_subsamples && (mdia != NULL) ) {
-				e = gf_import_message(import, GF_BAD_PARAM, "%s import failure: you shall have either mediaFile (sample) or subsamples. Aborting.", szImpName);
-				goto exit;
-			}
-
-			if (strlen(szMediaTemp)) {
-				f = gf_fopen(szMediaTemp, "rb");
-				if (!f) {
-					e = gf_import_message(import, GF_BAD_PARAM, "%s import failure: file %s not found", szImpName, szMediaTemp);
-					goto exit;
-				}
-				close = GF_TRUE;
-				if (offset) gf_fseek(f, offset, SEEK_SET);
-			} else {
-				if (!offset) offset = media_done;
-			}
-
-			if (f) {
-				if (!samp->dataLength) {
-					//u64 cur_pos = gf_ftell(f);
-					gf_fseek(f, 0, SEEK_END);
-					assert(gf_ftell(f) < 1<<31);
-					samp->dataLength = (u32) gf_ftell(f);
-					//not needed, seek override below : gf_fseek(f, cur_pos, SEEK_SET);
-				}
-				gf_fseek(f, offset, SEEK_SET);
-
-				if (is_dims) {
-					u32 read;
-					GF_BitStream *bs;
-					if (samp->dataLength+3>max_size) {
-						samp->data = (char*)gf_realloc(samp->data, sizeof(char) * (samp->dataLength+3));
-						max_size = samp->dataLength+3;
-					}
-					bs = gf_bs_new(samp->data, samp->dataLength+3, GF_BITSTREAM_WRITE);
-					gf_bs_write_u16(bs, samp->dataLength+1);
-					gf_bs_write_u8(bs, (u8) dims_flags);
-					read = (u32) fread( samp->data+3, sizeof(char), samp->dataLength, f);
-					if (samp->dataLength != read) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHML import dims] Failed to fully read sample: dataLength %d read %d\n", samp->dataLength, read));
-					}
-					gf_bs_del(bs);
-					samp->dataLength+=3;
-
-					/*same DIMS unit*/
-					if (gf_isom_get_sample_from_dts(import->dest, track, samp->DTS))
-						append = GF_TRUE;
-				} else {
-					u32 read;
-					if (samp->dataLength>max_size) {
-						samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
-						max_size = samp->dataLength;
-					}
-					read = (u32) fread(samp->data, sizeof(char), samp->dataLength, f);
-					if (samp->dataLength != read) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[NHML import] Failed to fully read sample: dataLength %d read %d\n", samp->dataLength, read));
-					}
-				}
-				if (close) gf_fclose(f);
-			}
-		}
-		if (e) goto exit;
-
-		if (is_dims) {
-			if (strstr(samp->data+3, "svg ")) dims_flags |= GF_DIMS_UNIT_S;
-			if (dims_flags & GF_DIMS_UNIT_S) dims_flags |= GF_DIMS_UNIT_P;
-			samp->data[2] = dims_flags;
-		}
-
-		if (compress) {
-#ifndef GPAC_DISABLE_ZLIB
-			e = compress_sample_data(samp, &max_size, use_dict ? &dictionary : NULL, is_dims ? 3 : 0);
-			if (e) goto exit;
-			if (is_dims) {
-				GF_BitStream *bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_WRITE);
-				gf_bs_write_u16(bs, samp->dataLength-2);
-				gf_bs_del(bs);
-			}
-#else
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: your version of GPAC was compile with no libz support. Abort."));
-			e = GF_NOT_SUPPORTED;
-			goto exit;
-#endif
-		}
-		if (is_dims && (samp->dataLength > 0xFFFF)) {
-			e = gf_import_message(import, GF_BAD_PARAM, "DIMS import failure: sample data is too long - maximum size allowed: 65532 bytes");
-			goto exit;
-		}
-
-
-		if ((samp->IsRAP==RAP_REDUNDANT) && !is_dims) {
-			e = gf_isom_add_sample_shadow(import->dest, track, samp);
-		} else if (append) {
-			e = gf_isom_append_sample_data(import->dest, track, samp->data, samp->dataLength);
-		} else {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-			if (e) goto exit;
-
-			j = 0;
-			while ((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")) {
-							u32 subsMediaFileSize = 0;
-							char *subsMediaFileData = NULL;
-							char *sub_file_url = gf_url_concatenate(import->in_name, att->value);
-							FILE *f = sub_file_url ? gf_fopen(sub_file_url, "rb") : NULL;
-							if (sub_file_url) gf_free(sub_file_url);
-
-							if (!f) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: mediaFile \"%s\" not found for subsample. Abort.\n", att->value));
-								e = GF_BAD_PARAM;
-								goto exit;
-							}
-							gf_fseek(f, 0, SEEK_END);
-							assert(gf_ftell(f) < (1 << 31));
-							subsMediaFileSize = (u32)gf_ftell(f);
-							subsMediaFileData = gf_malloc(subsMediaFileSize);
-							gf_fseek(f, 0, SEEK_SET);
-							gf_fread(subsMediaFileData, 1, subsMediaFileSize, f);
-							gf_fclose(f);
-							e = gf_isom_add_subsample(import->dest, track, gf_isom_get_sample_count(import->dest, track), 0, subsMediaFileSize, 0, 0, GF_FALSE);
-							if (e) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: couldn't add subsample (mediaFile=\"%s\", size=%u. Abort.\n", att->value, subsMediaFileSize));
-								gf_free(subsMediaFileData);
-								goto exit;
-							}
-							e = gf_isom_append_sample_data(import->dest, track, subsMediaFileData, subsMediaFileSize);
-							if (e) {
-								GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: couldn't append subsample data (mediaFile=\"%s\", size=%u. Abort.\n", att->value, subsMediaFileSize));
-								gf_free(subsMediaFileData);
-								goto exit;
-							}
-							gf_free(subsMediaFileData);
-						}
-					}
-				}
-			}
-		}
-		if (sap_type==SAP_TYPE_3) {
-			gf_isom_set_sample_rap_group(import->dest, track, gf_isom_get_sample_count(import->dest, track), 0);
-		}
-		samp->IsRAP = RAP_NO;
-		samp->CTS_Offset = 0;
-		if (sample_duration)
-			samp->DTS += sample_duration;
-		else
-			samp->DTS += dts_inc;
-		media_done += samp->dataLength;
-		gf_set_progress(is_dims ? "Importing DIMS" : "Importing NHML", (u32) media_done, (u32) (media_size ? media_size : media_done+1) );
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-
-	if (sample_duration) {
-		gf_isom_set_last_sample_duration(import->dest, track, (u32) sample_duration);
-	}
-
-	if (media_done!=media_size) gf_set_progress(is_dims ? "Importing DIMS" : "Importing NHML", (u32) media_size, (u32) media_size);
-	gf_media_update_bitrate(import->dest, track);
-
-	if (inRootOD) gf_isom_add_track_to_root_od(import->dest, track);
-
-exit:
-	gf_fclose(nhml);
-	if (samp) {
-		samp->dataLength = 1;
-		gf_isom_sample_del(&samp);
-	}
-	if (mdia) gf_fclose(mdia);
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	gf_xml_dom_del(parser);
-	if (specInfo) gf_free(specInfo);
-	if (dictionary) gf_free(dictionary);
-	if (auxiliary_mime_types) gf_free(auxiliary_mime_types);
-	return e;
-}
-
-
-GF_Err gf_import_amr_evrc_smv(GF_MediaImporter *import)
-{
-	GF_Err e;
-	u32 track, trackID, di, sample_rate, block_size, i, read;
-	GF_ISOSample *samp;
-	char magic[20], *msg;
-	Bool delete_esd, update_gpp_cfg;
-	u32 media_done, mtype, oti, nb_frames;
-	u64 offset, media_size, duration;
-	GF_3GPConfig gpp_cfg;
-	FILE *mdia;
-	msg = NULL;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_FORCE_MPEG4 | GF_IMPORT_3GPP_AGGREGATION;
-		return GF_OK;
-	}
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-
-	update_gpp_cfg = GF_FALSE;
-	oti = mtype = 0;
-	sample_rate = 8000;
-	block_size = 160;
-	if (6 > fread(magic, sizeof(char), 20, mdia)) {
-		gf_fclose(mdia);
-		return gf_import_message(import, GF_URL_ERROR, "Cannot guess type for file %s, size lower than 6", import->in_name);
-
-	}
-	if (!strnicmp(magic, "#!AMR\n", 6)) {
-		gf_import_message(import, GF_OK, "Importing AMR Audio");
-		gf_fseek(mdia, 6, SEEK_SET);
-		mtype = GF_ISOM_SUBTYPE_3GP_AMR;
-		update_gpp_cfg = GF_TRUE;
-		msg = "Importing AMR";
-	}
-	else if (!strnicmp(magic, "#!EVRC\n", 7)) {
-		gf_import_message(import, GF_OK, "Importing EVRC Audio");
-		gf_fseek(mdia, 7, SEEK_SET);
-		mtype = GF_ISOM_SUBTYPE_3GP_EVRC;
-		oti = GPAC_OTI_AUDIO_EVRC_VOICE;
-		msg = "Importing EVRC";
-	}
-	else if (!strnicmp(magic, "#!SMV\n", 6)) {
-		gf_import_message(import, GF_OK, "Importing SMV Audio");
-		gf_fseek(mdia, 6, SEEK_SET);
-		mtype = GF_ISOM_SUBTYPE_3GP_SMV;
-		oti = GPAC_OTI_AUDIO_SMV_VOICE;
-		msg = "Importing SMV";
-	}
-	else if (!strnicmp(magic, "#!AMR_MC1.0\n", 12)) {
-		gf_fclose(mdia);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Multichannel AMR Audio Not Supported");
-	}
-	else if (!strnicmp(magic, "#!AMR-WB\n", 9)) {
-		gf_import_message(import, GF_OK, "Importing AMR WideBand Audio");
-		gf_fseek(mdia, 9, SEEK_SET);
-		mtype = GF_ISOM_SUBTYPE_3GP_AMR_WB;
-		sample_rate = 16000;
-		block_size = 320;
-		update_gpp_cfg = GF_TRUE;
-		msg = "Importing AMR-WB";
-	}
-	else if (!strnicmp(magic, "#!AMR-WB_MC1.0\n", 15)) {
-		gf_fclose(mdia);
-		return gf_import_message(import, GF_NOT_SUPPORTED, "Multichannel AMR WideBand Audio Not Supported");
-	}
-	else {
-		char *ext = strrchr(import->in_name, '.');
-		if (ext && !stricmp(ext, ".amr")) {
-			mtype = GF_ISOM_SUBTYPE_3GP_AMR;
-			update_gpp_cfg = GF_TRUE;
-			ext = "AMR";
-			msg = "Importing AMR";
-		}
-		else if (ext && !stricmp(ext, ".evc")) {
-			mtype = GF_ISOM_SUBTYPE_3GP_EVRC;
-			oti = GPAC_OTI_AUDIO_EVRC_VOICE;
-			ext = "EVRC";
-			msg = "Importing EVRC";
-		}
-		else if (ext && !stricmp(ext, ".smv")) {
-			mtype = GF_ISOM_SUBTYPE_3GP_SMV;
-			oti = GPAC_OTI_AUDIO_SMV_VOICE;
-			ext = "SMV";
-			msg = "Importing SMV";
-		}
-		else {
-			gf_fclose(mdia);
-			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted AMR/SMV/EVRC file header");
-		}
-
-		gf_fseek(mdia, 0, SEEK_SET);
-		gf_import_message(import, GF_OK, "Importing %s Audio (File header corrupted, missing \"#!%s\\n\")", ext, ext);
-	}
-
-	delete_esd = GF_FALSE;
-	trackID = 0;
-
-	if (import->esd) trackID = import->esd->ESID;
-
-	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_AUDIO, sample_rate);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-
-	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
-	gpp_cfg.type = mtype;
-	gpp_cfg.vendor = GF_VENDOR_GPAC;
-	gpp_cfg.frames_per_sample = import->frames_per_sample;
-	if (!gpp_cfg.frames_per_sample) gpp_cfg.frames_per_sample  = 1;
-	else if (gpp_cfg.frames_per_sample >15) gpp_cfg.frames_per_sample = 15;
-
-	if (import->flags & GF_IMPORT_USE_DATAREF) gpp_cfg.frames_per_sample  = 1;
-
-
-	if (oti && (import->flags & GF_IMPORT_FORCE_MPEG4)) {
-		if (!import->esd) {
-			delete_esd = GF_TRUE;
-			import->esd = gf_odf_desc_esd_new(2);
-			import->esd->ESID = trackID;
-		}
-		import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		import->esd->decoderConfig->objectTypeIndication = oti;
-		e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-		if (e) goto exit;
-	} else {
-		import->flags &= ~GF_IMPORT_FORCE_MPEG4;
-		e = gf_isom_3gp_config_new(import->dest, track, &gpp_cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-		if (e) goto exit;
-	}
-	gf_isom_set_audio_info(import->dest, track, di, sample_rate, 1, 16, import->asemode);
-	duration = import->duration;
-	duration *= sample_rate;
-	duration /= 1000;
-
-	samp = gf_isom_sample_new();
-	samp->data = (char*)gf_malloc(sizeof(char) * 200);
-	samp->IsRAP = RAP;
-	offset = gf_ftell(mdia);
-	gf_fseek(mdia, 0, SEEK_END);
-	media_size = gf_ftell(mdia) - offset;
-	gf_fseek(mdia, offset, SEEK_SET);
-
-	media_done = 0;
-	nb_frames = 0;
-
-	while (!feof(mdia)) {
-		u8 ft, toc;
-
-		offset = gf_ftell(mdia);
-		toc = fgetc(mdia);
-		switch (gpp_cfg.type) {
-		case GF_ISOM_SUBTYPE_3GP_AMR:
-		case GF_ISOM_SUBTYPE_3GP_AMR_WB:
-			ft = (toc >> 3) & 0x0F;
-			if (gpp_cfg.type==GF_ISOM_SUBTYPE_3GP_AMR_WB) {
-				samp->dataLength = (u32)GF_AMR_WB_FRAME_SIZE[ft];
-			} else {
-				samp->dataLength = (u32)GF_AMR_FRAME_SIZE[ft];
-			}
-			samp->data[0] = toc;
-			if (samp->dataLength) {
-				/*update mode set (same mechanism for both AMR and AMR-WB*/
-				gpp_cfg.AMR_mode_set |= (1<<ft);
-			}
-			break;
-		case GF_ISOM_SUBTYPE_3GP_EVRC:
-		case GF_ISOM_SUBTYPE_3GP_SMV:
-			for (i=0; i<GF_SMV_EVRC_RATE_TO_SIZE_NB; i++) {
-				if (GF_SMV_EVRC_RATE_TO_SIZE[2*i]==toc) {
-					/*remove rate_type byte*/
-					samp->dataLength = (u32)GF_SMV_EVRC_RATE_TO_SIZE[2*i+1] - 1;
-					break;
-				}
-			}
-			if (!samp->dataLength) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Corrupted TOC (%d)", toc);
-				goto exit;
-			}
-			samp->data[0] = toc;
-			break;
-		}
-
-		if (samp->dataLength) {
-			read = (u32) fread( samp->data + 1, sizeof(char), samp->dataLength, mdia);
-			if (read != samp->dataLength) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Failed to read logs");
-				goto exit;
-			}
-		}
-		samp->dataLength += 1;
-		/*if last frame is "no data", abort - this happens in many files with constant mode (ie constant files), where
-		adding this last frame will result in a non-compact version of the stsz table, hence a bigger file*/
-		if ((samp->dataLength==1) && feof(mdia))
-			break;
-
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else if (!nb_frames) {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		} else {
-			e = gf_isom_append_sample_data(import->dest, track, samp->data, samp->dataLength);
-		}
-		if (e) goto exit;
-		nb_frames++;
-		if (nb_frames==gpp_cfg.frames_per_sample) nb_frames=0;
-
-		samp->DTS += block_size;
-		media_done += samp->dataLength;
-		gf_set_progress(msg, (u32) media_done, (u32) media_size);
-		if (duration && (samp->DTS > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-	}
-	gf_isom_sample_del(&samp);
-	gf_isom_refresh_size_info(import->dest, track);
-
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) gf_media_update_bitrate(import->dest, track);
-
-	if (update_gpp_cfg) gf_isom_3gp_config_update(import->dest, track, &gpp_cfg, 1);
-
-exit:
-	if (delete_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	gf_fclose(mdia);
-	return e;
-}
-
-/*QCP codec GUIDs*/
-static const char *QCP_QCELP_GUID_1 = "\x41\x6D\x7F\x5E\x15\xB1\xD0\x11\xBA\x91\x00\x80\x5F\xB4\xB9\x7E";
-static const char *QCP_QCELP_GUID_2 = "\x42\x6D\x7F\x5E\x15\xB1\xD0\x11\xBA\x91\x00\x80\x5F\xB4\xB9\x7E";
-static const char *QCP_EVRC_GUID = "\x8D\xD4\x89\xE6\x76\x90\xB5\x46\x91\xEF\x73\x6A\x51\x00\xCE\xB4";
-static const char *QCP_SMV_GUID = "\x75\x2B\x7C\x8D\x97\xA7\x46\xED\x98\x5E\xD5\x3C\x8C\xC7\x5F\x84";
-
-GF_Err gf_import_qcp(GF_MediaImporter *import)
-{
-	GF_Err e;
-	u32 track, trackID, di, i, nb_pck, riff_size, chunk_size, pck_size, block_size, bps, samplerate, vrat_rate_flag, size_in_packets, nb_frames;
-	u64 max_size, duration;
-	GF_BitStream *bs;
-	GF_ISOSample *samp;
-	char magic[12], GUID[16], name[81], fmt[162];
-	u32 rtable_cnt;
-	u64 offset, media_size, media_done;
-	Bool has_pad;
-	QCPRateTable rtable[8];
-	Bool delete_esd;
-	GF_3GPConfig gpp_cfg;
-	FILE *mdia;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_FORCE_MPEG4 | GF_IMPORT_3GPP_AGGREGATION;
-		return GF_OK;
-	}
-
-	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
-	gpp_cfg.vendor = GF_VENDOR_GPAC;
-	delete_esd = GF_FALSE;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	gf_bs_read_data(bs, magic, 4);
-	if (strnicmp(magic, "RIFF", 4)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Broken QCP file: RIFF header not found");
-		goto exit;
-	}
-	riff_size = gf_bs_read_u32_le(bs);
-	gf_bs_read_data(bs, fmt, 162);
-	gf_bs_seek(bs, 8);
-	gf_bs_read_data(bs, magic, 4);
-	if (strnicmp(magic, "QLCM", 4)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Broken QCP file: QLCM header not found");
-		goto exit;
-	}
-	max_size = gf_bs_get_size(bs);
-	if (max_size != riff_size+8) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Broken QCP file: Expecting RIFF-Size %d got %d", max_size-8, riff_size);
-		goto exit;
-	}
-	/*fmt*/
-	gf_bs_read_data(bs, magic, 4);
-	if (strnicmp(magic, "fmt ", 4)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Broken QCP file: FMT not found");
-		goto exit;
-	}
-	chunk_size = gf_bs_read_u32_le(bs);
-	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
-	/*major = */gf_bs_read_u8(bs);
-	/*minor = */gf_bs_read_u8(bs);
-	chunk_size -= 2;
-	/*codec info*/
-	gf_bs_read_data(bs, GUID, 16);
-	/*version = */gf_bs_read_u16_le(bs);
-	chunk_size -= 18;
-	gf_bs_read_data(bs, name, 80);
-	name[80]=0;
-	chunk_size -= 80;
-	/*avg_bps = */gf_bs_read_u16_le(bs);
-	pck_size = gf_bs_read_u16_le(bs);
-	block_size = gf_bs_read_u16_le(bs);
-	samplerate = gf_bs_read_u16_le(bs);
-	bps = gf_bs_read_u16_le(bs);
-	rtable_cnt = gf_bs_read_u32_le(bs);
-	chunk_size -= 14;
-	/*skip var rate*/
-	for (i=0; i<8; i++) {
-		rtable[i].pck_size = gf_bs_read_u8(bs);
-		rtable[i].rate_idx = gf_bs_read_u8(bs);
-	}
-	chunk_size -= 16;
-	gf_bs_skip_bytes(bs, 5*4);/*reserved*/
-	chunk_size -= 20;
-	gf_bs_skip_bytes(bs, chunk_size);
-	if (has_pad) gf_bs_read_u8(bs);
-
-	if (!strncmp(GUID, QCP_QCELP_GUID_1, 16) || !strncmp(GUID, QCP_QCELP_GUID_2, 16)) {
-		gpp_cfg.type = GF_ISOM_SUBTYPE_3GP_QCELP;
-		strcpy(name, "QCELP-13K");
-	} else if (!strncmp(GUID, QCP_EVRC_GUID, 16)) {
-		gpp_cfg.type = GF_ISOM_SUBTYPE_3GP_EVRC;
-		strcpy(name, "EVRC");
-	} else if (!strncmp(GUID, QCP_SMV_GUID, 16)) {
-		gpp_cfg.type = GF_ISOM_SUBTYPE_3GP_SMV;
-		strcpy(name, "SMV");
-	} else {
-		gpp_cfg.type = 0;
-	}
-	/*vrat*/
-	gf_bs_read_data(bs, magic, 4);
-	if (strnicmp(magic, "vrat", 4)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Broken QCP file: VRAT not found");
-		goto exit;
-	}
-	chunk_size = gf_bs_read_u32_le(bs);
-	has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
-	vrat_rate_flag = gf_bs_read_u32_le(bs);
-	size_in_packets = gf_bs_read_u32_le(bs);
-	chunk_size -= 8;
-	gf_bs_skip_bytes(bs, chunk_size);
-	if (has_pad) gf_bs_read_u8(bs);
-
-	if (!gpp_cfg.type) {
-		e = gf_import_message(import, GF_NOT_SUPPORTED, "Unknown QCP file codec %s", name);
-		goto exit;
-	}
-
-	gf_import_message(import, GF_OK, "Importing %s Audio - SampleRate %d", name, samplerate);
-
-	trackID = 0;
-
-	if (import->esd) trackID = import->esd->ESID;
-
-	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_AUDIO, samplerate);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) {
-		if (!import->esd) {
-			import->esd = gf_odf_desc_esd_new(2);
-			delete_esd = GF_TRUE;
-		}
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig*)gf_odf_desc_new(GF_ODF_DCD_TAG);
-		import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		switch (gpp_cfg.type) {
-		case GF_ISOM_SUBTYPE_3GP_QCELP:
-			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_13K_VOICE;
-			/*DSI is fmt*/
-			if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-			if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-			import->esd->decoderConfig->decoderSpecificInfo->dataLength = 162;
-			import->esd->decoderConfig->decoderSpecificInfo->data = (char*)gf_malloc(sizeof(char)*162);
-			memcpy(import->esd->decoderConfig->decoderSpecificInfo->data, fmt, 162);
-			break;
-		case GF_ISOM_SUBTYPE_3GP_EVRC:
-			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_EVRC_VOICE;
-			break;
-		case GF_ISOM_SUBTYPE_3GP_SMV:
-			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_SMV_VOICE;
-			break;
-		}
-		e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-		if (e) goto exit;
-	} else {
-		if (import->frames_per_sample<=1) import->frames_per_sample=1;
-		else if (import->frames_per_sample>15) import->frames_per_sample=15;
-		gpp_cfg.frames_per_sample = import->frames_per_sample;
-		e = gf_isom_3gp_config_new(import->dest, track, &gpp_cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-		if (e) goto exit;
-	}
-	gf_isom_set_audio_info(import->dest, track, di, samplerate, 1, (u8) bps, import->asemode);
-
-	duration = import->duration;
-	duration *= samplerate;
-	duration /= 1000;
-
-	samp = gf_isom_sample_new();
-	samp->data = (char*)gf_malloc(sizeof(char) * 200);
-	samp->IsRAP = RAP;
-	max_size = 200;
-	offset = gf_ftell(mdia);
-	gf_fseek(mdia, 0, SEEK_END);
-	media_size = gf_ftell(mdia) - offset;
-	gf_fseek(mdia, offset, SEEK_SET);
-
-	nb_pck = 0;
-	media_done = 0;
-	nb_frames = 0;
-	while (gf_bs_available(bs)) {
-		gf_bs_read_data(bs, magic, 4);
-		chunk_size = gf_bs_read_u32_le(bs);
-		has_pad = (chunk_size%2) ? GF_TRUE : GF_FALSE;
-		/*process chunk by chunk*/
-		if (!strnicmp(magic, "data", 4)) {
-
-			while (chunk_size) {
-				u32 idx = 0;
-				u32 size = 0;
-
-				offset = gf_bs_get_position(bs);
-				/*get frame rate idx*/
-				if (vrat_rate_flag) {
-					idx = gf_bs_read_u8(bs);
-					chunk_size-=1;
-					for (i=0; i<rtable_cnt; i++) {
-						if (rtable[i].rate_idx==idx) {
-							size = rtable[i].pck_size;
-							break;
-						}
-					}
-					samp->dataLength = size+1;
-				} else {
-					size = pck_size;
-					samp->dataLength = size;
-				}
-				if (max_size<samp->dataLength) {
-					samp->data = (char*)gf_realloc(samp->data, sizeof(char)*samp->dataLength);
-					max_size=samp->dataLength;
-				}
-				if (import->flags & GF_IMPORT_USE_DATAREF) {
-					e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-					gf_bs_skip_bytes(bs, size);
-				} else {
-					if (vrat_rate_flag) {
-						samp->data[0] = idx;
-						gf_bs_read_data(bs, &samp->data[1], size);
-					} else {
-						gf_bs_read_data(bs, samp->data, size);
-					}
-					if (!nb_frames) {
-						e = gf_isom_add_sample(import->dest, track, di, samp);
-					} else {
-						e = gf_isom_append_sample_data(import->dest, track, samp->data, samp->dataLength);
-					}
-					nb_frames++;
-					if (nb_frames==import->frames_per_sample) nb_frames=0;
-				}
-				if (e) goto exit;
-				chunk_size -= size;
-				samp->DTS += block_size;
-				if (size_in_packets) {
-					gf_set_progress("Importing QCP", (u32) nb_pck, (u32) size_in_packets);
-				} else {
-					gf_set_progress("Importing QCP", (u32) media_done, (u32) media_size);
-				}
-				nb_pck++;
-				media_done += samp->dataLength;
-				if (duration && (samp->DTS > duration)) break;
-				if (import->flags & GF_IMPORT_DO_ABORT) break;
-			}
-		} else if (!strnicmp(magic, "labl", 4)) {
-		} else if (!strnicmp(magic, "offs", 4)) {
-		} else if (!strnicmp(magic, "cnfg", 4)) {
-		} else if (!strnicmp(magic, "text", 4)) {
-		}
-		gf_bs_skip_bytes(bs, chunk_size);
-		if (has_pad) gf_bs_read_u8(bs);
-	}
-	gf_isom_sample_del(&samp);
-	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_3G2A, 65536);
-	if (import->flags & GF_IMPORT_FORCE_MPEG4) gf_media_update_bitrate(import->dest, track);
-	gf_set_progress("Importing QCP", size_in_packets, size_in_packets);
-
-exit:
-	if (delete_esd && import->esd) {
-		gf_odf_desc_del((GF_Descriptor *)import->esd);
-		import->esd = NULL;
-	}
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-}
-
-/*read that amount of data at each IO access rather than fetching byte by byte...*/
-Bool H263_IsStartCode(GF_BitStream *bs)
-{
-	u32 c;
-	c = gf_bs_peek_bits(bs, 22, 0);
-	if (c==0x20) return GF_TRUE;
-	return GF_FALSE;
-}
-
-#define H263_CACHE_SIZE	4096
-u32 H263_NextStartCode(GF_BitStream *bs)
-{
-	u32 v, bpos;
-	unsigned char h263_cache[H263_CACHE_SIZE];
-	u64 end, cache_start, load_size;
-	u64 start = gf_bs_get_position(bs);
-
-	/*skip 16b header*/
-	gf_bs_read_u16(bs);
-	bpos = 0;
-	load_size = 0;
-	cache_start = 0;
-	end = 0;
-	v = 0xffffffff;
-	while (!end) {
-		/*refill cache*/
-		if (bpos == (u32) load_size) {
-			if (!gf_bs_available(bs)) break;
-			load_size = gf_bs_available(bs);
-			if (load_size>H263_CACHE_SIZE) load_size=H263_CACHE_SIZE;
-			bpos = 0;
-			cache_start = gf_bs_get_position(bs);
-			gf_bs_read_data(bs, (char *) h263_cache, (u32) load_size);
-		}
-		v = (v<<8) | h263_cache[bpos];
-		bpos++;
-		if ((v >> (32-22)) == 0x20) end = cache_start+bpos-4;
-	}
-	gf_bs_seek(bs, start);
-	if (!end) end = gf_bs_get_size(bs);
-	return (u32) (end-start);
-}
-static void h263_get_pic_size(GF_BitStream *bs, u32 fmt, u32 *w, u32 *h)
-{
-	switch (fmt) {
-	case 1:
-		*w = 128;
-		*h = 96;
-		break;
-	case 2:
-		*w = 176;
-		*h = 144;
-		break;
-	case 3:
-		*w = 352;
-		*h = 288;
-		break;
-	case 4:
-		*w = 704;
-		*h = 576;
-		break;
-	case 5:
-		*w = 1409;
-		*h = 1152 ;
-		break;
-	default:
-		*w = *h = 0;
-		break;
-	}
-}
-
-GF_Err gf_import_h263(GF_MediaImporter *import)
-{
-	GF_Err e;
-	u32 track, trackID, di, max_size, timescale, w, h, fmt, nb_samp, dts_inc;
-	u64 offset, media_size, media_done, duration;
-	GF_ISOSample *samp;
-	char *samp_data;
-	GF_3GPConfig gpp_cfg;
-	Double FPS;
-	FILE *mdia;
-	GF_BitStream *bs;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-
-	e = GF_OK;
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	if (!H263_IsStartCode(bs)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find H263 Picture Start Code");
-		goto exit;
-	}
-	/*no auto frame-rate detection*/
-	if (import->video_fps == GF_IMPORT_AUTO_FPS)
-		import->video_fps = GF_IMPORT_DEFAULT_FPS;
-
-	FPS = (Double) import->video_fps;
-	/*for H263 we use 15 fps by default!!*/
-	if (!FPS) FPS = 15;
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	/*parse header*/
-	gf_bs_read_int(bs, 22);
-	gf_bs_read_int(bs, 8);
-	/*spare+0+split_screen_indicator+document_camera_indicator+freeze_picture_release*/
-	gf_bs_read_int(bs, 5);
-
-	fmt = gf_bs_read_int(bs, 3);
-	h263_get_pic_size(bs, fmt, &w, &h);
-	if (!w || !h) {
-		e = gf_import_message(import, GF_NOT_SUPPORTED, "Unsupported H263 frame header");
-		goto exit;
-	}
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF | GF_IMPORT_OVERRIDE_FPS;
-		import->tk_info[0].video_info.width = w;
-		import->tk_info[0].video_info.height = h;
-		goto exit;
-	}
-
-	trackID = 0;
-
-	if (import->esd) {
-		trackID = import->esd->ESID;
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	}
-	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-
-	memset(&gpp_cfg, 0, sizeof(GF_3GPConfig));
-	gpp_cfg.type = GF_ISOM_SUBTYPE_3GP_H263;
-	gpp_cfg.vendor = GF_VENDOR_GPAC;
-	/*FIXME - we need more in-depth parsing of the bitstream to detect P3@L10 (streaming wireless)*/
-	gpp_cfg.H263_profile = 0;
-	gpp_cfg.H263_level = 10;
-	e = gf_isom_3gp_config_new(import->dest, track, &gpp_cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	if (e) goto exit;
-	gf_isom_set_visual_info(import->dest, track, di, w, h);
-	gf_import_message(import, GF_OK, "Importing H263 video - %d x %d @ %02.4f", w, h, FPS);
-
-	samp = gf_isom_sample_new();
-
-	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
-	media_size = gf_bs_get_size(bs);
-	nb_samp = 0;
-	media_done = 0;
-
-	max_size = 4096;
-	samp_data = (char*)gf_malloc(sizeof(char)*max_size);
-	gf_bs_seek(bs, 0);
-	offset = 0;
-	while (gf_bs_available(bs)) {
-		samp->dataLength = H263_NextStartCode(bs);
-		if (samp->dataLength>max_size) {
-			max_size = samp->dataLength;
-			samp_data = (char*)gf_realloc(samp_data, sizeof(char)*max_size);
-		}
-		gf_bs_read_data(bs, samp_data, samp->dataLength);
-		/*we ignore pict number and import at const FPS*/
-		samp->IsRAP = (samp_data[4]&0x02) ? RAP_NO : RAP;
-		samp->data = samp_data;
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
-		} else {
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		if (e) goto exit;
-		samp->data = NULL;
-		samp->DTS += dts_inc;
-		nb_samp ++;
-		offset += samp->dataLength;
-		gf_set_progress("Importing H263", media_done, media_size);
-		media_done += samp->dataLength;
-
-		if ((duration && (samp->DTS > duration) ) || (import->flags & GF_IMPORT_DO_ABORT)) {
-			break;
-		}
-	}
-	gf_free(samp_data);
-	gf_isom_sample_del(&samp);
-	gf_set_progress("Importing H263", nb_samp, nb_samp);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_3GG6, 1);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_3GG5, 1);
-
-exit:
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-}
-
 GF_EXPORT
-GF_Err gf_media_avc_rewrite_samples(GF_ISOFile *file, u32 track, u32 prev_size, u32 new_size)
+GF_Err gf_media_nal_rewrite_samples(GF_ISOFile *file, u32 track, u32 new_size)
 {
 	u32 i, count, di, remain, msize;
 	char *buffer;
@@ -4795,6 +706,9 @@
 		GF_ISOSample *samp = gf_isom_get_sample(file, track, i+1, &di);
 		GF_BitStream *oldbs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
 		GF_BitStream *newbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		u32 prev_size = 8*gf_isom_get_nalu_length_field(file, track, di);
+		if (!prev_size) return GF_NON_COMPLIANT_BITSTREAM;
+		
 		remain = samp->dataLength;
 		while (remain) {
 			u32 size = gf_bs_read_int(oldbs, prev_size);
@@ -4821,5723 +735,6 @@
 	return GF_OK;
 }
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-static GF_Err gf_import_avc_h264(GF_MediaImporter *import)
-{
-	u64 nal_start, nal_end, total_size;
-	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay, nb_nalus;
-	s32 idx, sei_recovery_frame_count;
-	u64 duration;
-	u8 nal_type;
-	GF_Err e;
-	FILE *mdia;
-	AVCState avc;
-	GF_AVCConfigSlot *slc;
-	GF_AVCConfig *avccfg, *svccfg, *dstcfg;
-	GF_BitStream *bs;
-	GF_BitStream *sample_data;
-	Bool flush_sample, sample_is_rap, sample_has_islice, sample_has_slice, is_islice, first_nal, slice_is_ref, has_cts_offset, detect_fps, is_paff, set_subsamples, slice_force_ref;
-	u32 ref_frame, timescale, copy_size, size_length, dts_inc;
-	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
-	Bool first_avc;
-	u32 use_opengop_gdr = 0;
-	u32 last_svc_sps;
-	u32 prev_nalu_prefix_size, res_prev_nalu_prefix;
-	u8 priority_prev_nalu_prefix;
-	Double FPS;
-	char *buffer;
-	Bool sample_is_ref, has_redundant;
-	u32 max_size = 4096;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
-		return GF_OK;
-	}
-
-	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? GF_TRUE : GF_FALSE;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-
-	detect_fps = GF_TRUE;
-	FPS = (Double) import->video_fps;
-	if (!FPS) {
-		FPS = GF_IMPORT_DEFAULT_FPS;
-	} else {
-		if (import->video_fps == GF_IMPORT_AUTO_FPS)
-			import->video_fps = GF_IMPORT_DEFAULT_FPS; /*fps=auto is handled as auto-detection in h264*/
-		else
-			detect_fps = GF_FALSE;                     /*fps is forced by the caller*/
-	}
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	poc_diff = 0;
-
-
-restart_import:
-
-	memset(&avc, 0, sizeof(AVCState));
-	avc.sps_active_idx = -1;
-	avccfg = gf_odf_avc_cfg_new();
-	svccfg = gf_odf_avc_cfg_new();
-	/*we don't handle split import (one track / layer)*/
-	svccfg->complete_representation = 1;
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-	sample_data = NULL;
-	first_avc = GF_TRUE;
-	last_svc_sps = 0;
-	sei_recovery_frame_count = -1;
-	sample_is_ref = GF_FALSE;
-	has_redundant = GF_FALSE;
-
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	if (!gf_media_nalu_is_start_code(bs)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find H264 start code");
-		goto exit;
-	}
-
-	/*NALU size packing disabled*/
-	if (!(import->flags & GF_IMPORT_FORCE_PACKED)) size_length = 32;
-	/*if import in edit mode, use smallest NAL size and adjust on the fly*/
-	else if (gf_isom_get_mode(import->dest)!=GF_ISOM_OPEN_WRITE) size_length = 8;
-	else size_length = 32;
-
-	trackID = 0;
-
-	if (import->esd) trackID = import->esd->ESID;
-
-	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	if (import->esd && import->esd->dependsOnESID) {
-		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
-	}
-
-	e = gf_isom_avc_config_new(import->dest, track, avccfg, NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_isom_set_nalu_extract_mode(import->dest, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-
-	sample_data = NULL;
-	sample_is_rap = GF_FALSE;
-	sample_has_islice = GF_FALSE;
-	sample_has_slice = GF_FALSE;
-	cur_samp = 0;
-	is_paff = GF_FALSE;
-	total_size = gf_bs_get_size(bs);
-	nal_start = gf_bs_get_position(bs);
-	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
-
-	nb_i = nb_idr = nb_p = nb_b = nb_sp = nb_si = nb_sei = 0;
-	max_w = max_h = 0;
-	first_nal = GF_TRUE;
-	ref_frame = 0;
-	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
-	max_total_delay = 0;
-
-	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
-	has_cts_offset = GF_FALSE;
-	min_poc = 0;
-	poc_shift = 0;
-	prev_nalu_prefix_size = 0;
-	res_prev_nalu_prefix = 0;
-	priority_prev_nalu_prefix = 0;
-	nb_nalus = 0;
-
-	while (gf_bs_available(bs)) {
-		u8 nal_hdr, skip_nal, is_subseq, add_sps, nal_ref_idc;
-		u32 nal_and_trailing_size;
-
-		nal_and_trailing_size = nal_size = gf_media_nalu_next_start_code_bs(bs);
-		if (!(import->flags & GF_IMPORT_KEEP_TRAILING)) {
-			nal_size = gf_media_nalu_payload_end_bs(bs);
-		}
-
-		if (nal_size>max_size) {
-			buffer = (char*)gf_realloc(buffer, sizeof(char)*nal_size);
-			max_size = nal_size;
-		}
-
-		/*read the file, and work on a memory buffer*/
-		gf_bs_read_data(bs, buffer, nal_size);
-
-		gf_bs_seek(bs, nal_start);
-		nal_hdr = gf_bs_read_u8(bs);
-		nal_type = nal_hdr & 0x1F;
-
-		is_subseq = 0;
-		skip_nal = 0;
-		copy_size = flush_sample = GF_FALSE;
-		is_islice = GF_FALSE;
-
-		if (nal_type == GF_AVC_NALU_SVC_SUBSEQ_PARAM || nal_type == GF_AVC_NALU_SVC_PREFIX_NALU || nal_type == GF_AVC_NALU_SVC_SLICE) {
-			avc.is_svc = GF_TRUE;
-		}
-		nb_nalus ++;
-
-		switch (gf_media_avc_parse_nalu(bs, nal_hdr, &avc)) {
-		case 1:
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				if (sample_has_slice) flush_sample = GF_TRUE;
-			} else {
-				flush_sample = GF_TRUE;
-			}
-			break;
-		case -1:
-			gf_import_message(import, GF_OK, "Warning: Error parsing NAL unit");
-			skip_nal = 1;
-			break;
-		case -2:
-			skip_nal = 1;
-			break;
-		default:
-			break;
-		}
-		switch (nal_type) {
-		case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-			is_subseq = 1;
-		case GF_AVC_NALU_SEQ_PARAM:
-			idx = gf_media_avc_read_sps(buffer, nal_size, &avc, is_subseq, NULL);
-			if (idx<0) {
-				if (avc.sps[0].profile_idc) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Error parsing SeqInfo"));
-				} else {
-					e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing SeqInfo");
-					goto exit;
-				}
-			}
-			add_sps = 0;
-			dstcfg = (import->flags & GF_IMPORT_SVC_EXPLICIT) ? svccfg : avccfg;
-			if (is_subseq) {
-				if ((avc.sps[idx].state & AVC_SUBSPS_PARSED) && !(avc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
-					avc.sps[idx].state |= AVC_SUBSPS_DECLARED;
-					add_sps = 1;
-					avc.sps[idx].sbusps_crc = gf_crc_32(buffer, nal_size);
-				}
-				dstcfg = svccfg;
-				if (import->flags & GF_IMPORT_SVC_NONE) {
-					add_sps = 0;
-				}
-			} else {
-				if ((avc.sps[idx].state & AVC_SPS_PARSED) && !(avc.sps[idx].state & AVC_SPS_DECLARED)) {
-					avc.sps[idx].state |= AVC_SPS_DECLARED;
-					add_sps = 1;
-				}
-			}
-			if (avc.sps[idx].state & AVC_SUBSPS_DECLARED) {
-				if (import->flags & GF_IMPORT_SVC_NONE) {
-					copy_size = 0;
-				} else {
-					/*some streams are not really nice and reuse sps idx with differnet parameters (typically
-					when concatenated bitstreams). Since we cannot put two SPS with the same idx in the decoder config, we keep them in the
-					video bitstream*/
-					if (avc.sps[idx].sbusps_crc != gf_crc_32(buffer, nal_size) ) {
-						copy_size = nal_size;
-					}
-				}
-			}
-
-			//always keep NAL
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				copy_size = nal_size;
-				if (sample_has_slice) flush_sample = GF_TRUE;
-			}
-
-			//first declaration of SPS,
-			if (add_sps) {
-				dstcfg->configurationVersion = 1;
-				dstcfg->profile_compatibility = avc.sps[idx].prof_compat;
-				dstcfg->AVCProfileIndication = avc.sps[idx].profile_idc;
-				dstcfg->AVCLevelIndication = avc.sps[idx].level_idc;
-
-				dstcfg->chroma_format = avc.sps[idx].chroma_format;
-				dstcfg->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
-				dstcfg->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
-				/*try to patch ?*/
-				if (!gf_avc_is_rext_profile(dstcfg->AVCProfileIndication)
-					&& ((dstcfg->chroma_format>1) || (dstcfg->luma_bit_depth>8) || (dstcfg->chroma_bit_depth>8))
-				) {
-					if ((dstcfg->luma_bit_depth>8) || (dstcfg->chroma_bit_depth>8)) {
-						dstcfg->AVCProfileIndication=110;
-					} else {
-						dstcfg->AVCProfileIndication = (dstcfg->chroma_format==3) ? 244 : 122;
-					}
-				}
-
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					copy_size = nal_size;
-				} else {
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-					gf_list_add(dstcfg->sequenceParameterSets, slc);
-				}
-
-				/*disable frame rate scan, most bitstreams have wrong values there*/
-				if (detect_fps && avc.sps[idx].vui.timing_info_present_flag
-				        /*if detected FPS is greater than 1000, assume wrong timing info*/
-				        && (avc.sps[idx].vui.time_scale <= 1000*avc.sps[idx].vui.num_units_in_tick)
-				   ) {
-					/*ISO/IEC 14496-10 n11084 Table E-6*/
-					/* not used :				u8 DeltaTfiDivisorTable[] = {1,1,1,2,2,2,2,3,3,4,6}; */
-					u8 DeltaTfiDivisorIdx;
-					if (!avc.sps[idx].vui.pic_struct_present_flag) {
-						DeltaTfiDivisorIdx = 1 + (1-avc.s_info.field_pic_flag);
-					} else {
-						if (!avc.sei.pic_timing.pic_struct)
-							DeltaTfiDivisorIdx = 2;
-						else if (avc.sei.pic_timing.pic_struct == 8)
-							DeltaTfiDivisorIdx = 6;
-						else
-							DeltaTfiDivisorIdx = (avc.sei.pic_timing.pic_struct+1) / 2;
-					}
-					timescale = 2 * avc.sps[idx].vui.time_scale;
-					dts_inc =   2 * avc.sps[idx].vui.num_units_in_tick * DeltaTfiDivisorIdx;
-					FPS = (Double)timescale / dts_inc;
-					detect_fps = GF_FALSE;
-
-					if (!avc.sps[idx].vui.fixed_frame_rate_flag)
-						GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[avc-h264] Possible Variable Frame Rate: VUI \"fixed_frame_rate_flag\" absent.\n"));
-
-					gf_isom_remove_track(import->dest, track);
-					if (sample_data) gf_bs_del(sample_data);
-					gf_odf_avc_cfg_del(avccfg);
-					avccfg = NULL;
-					gf_odf_avc_cfg_del(svccfg);
-					svccfg = NULL;
-					gf_free(buffer);
-					buffer = NULL;
-					gf_bs_del(bs);
-					bs = NULL;
-					gf_fseek(mdia, 0, SEEK_SET);
-					goto restart_import;
-				}
-
-				if (is_subseq) {
-					if (last_svc_sps<(u32) idx) {
-						if (import->flags & GF_IMPORT_SVC_EXPLICIT) {
-							gf_import_message(import, GF_OK, "SVC-H264 import - frame size %d x %d at %02.3f FPS", avc.sps[idx].width, avc.sps[idx].height, FPS);
-						} else {
-							gf_import_message(import, GF_OK, "SVC Detected - SSPS ID %d - frame size %d x %d", idx-GF_SVC_SSPS_ID_SHIFT, avc.sps[idx].width, avc.sps[idx].height);
-						}
-						last_svc_sps = idx;
-					}
-					/* prevent from adding the subseq PS to the samples */
-					copy_size = 0;
-				} else {
-					if (first_avc) {
-						first_avc = GF_FALSE;
-						if (!(import->flags & GF_IMPORT_SVC_EXPLICIT)) {
-							gf_import_message(import, GF_OK, "AVC-H264 import - frame size %d x %d at %02.3f FPS", avc.sps[idx].width, avc.sps[idx].height, FPS);
-						}
-					}
-				}
-				if (!is_subseq || (import->flags & GF_IMPORT_SVC_EXPLICIT)) {
-					if ((max_w <= avc.sps[idx].width) && (max_h <= avc.sps[idx].height)) {
-						max_w = avc.sps[idx].width;
-						max_h = avc.sps[idx].height;
-					}
-				}
-			}
-			break;
-		case GF_AVC_NALU_PIC_PARAM:
-			idx = gf_media_avc_read_pps(buffer, nal_size, &avc);
-			if (idx<0) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
-				goto exit;
-			}
-			/*some streams are not really nice and reuse sps idx with differnet parameters (typically
-			when concatenated bitstreams). Since we cannot put two SPS with the same idx in the decoder config, we keep them in the
-			video bitstream - if same CRC for the PPS, this is the same PPS, don't copy over*/
-			if (avc.pps[idx].status > 1) {
-				u32 pps_crc = gf_crc_32(buffer, nal_size);
-				if (pps_crc != avc.pps[idx].status) {
-					copy_size = nal_size;
-				}
-			}
-
-			//always keep NAL
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				copy_size = nal_size;
-				if (sample_has_slice) flush_sample = GF_TRUE;
-			} else {
-				if (avc.pps[idx].status==1) {
-					avc.pps[idx].status = gf_crc_32(buffer, nal_size);
-					slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-					slc->size = nal_size;
-					slc->id = idx;
-					slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-					memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-					/* by default, we put all PPS in the base AVC layer,
-					  they will be moved to the SVC layer upon analysis of SVC slice. */
-					//dstcfg = (import->flags & GF_IMPORT_SVC_EXPLICIT) ? svccfg : avccfg;
-					dstcfg = avccfg;
-
-					if (import->flags & GF_IMPORT_SVC_EXPLICIT)
-						dstcfg = svccfg;
-
-					gf_list_add(dstcfg->pictureParameterSets, slc);
-				}
-			}
-			break;
-		case GF_AVC_NALU_SEI:
-			if (import->flags & GF_IMPORT_NO_SEI) {
-				copy_size = 0;
-			} else {
-				if (avc.sps_active_idx != -1) {
-					copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &avc);
-				} else {
-					//if no state yet, import SEI
-					copy_size = nal_size;
-				}
-				if (copy_size)
-					nb_sei++;
-			}
-			break;
-
-		case GF_AVC_NALU_NON_IDR_SLICE:
-		case GF_AVC_NALU_DP_A_SLICE:
-		case GF_AVC_NALU_DP_B_SLICE:
-		case GF_AVC_NALU_DP_C_SLICE:
-		case GF_AVC_NALU_IDR_SLICE:
-			if (!skip_nal) {
-				copy_size = nal_size;
-				switch (avc.s_info.slice_type) {
-				case GF_AVC_TYPE_P:
-				case GF_AVC_TYPE2_P:
-					nb_p++;
-					break;
-				case GF_AVC_TYPE_I:
-				case GF_AVC_TYPE2_I:
-					nb_i++;
-					is_islice = GF_TRUE;
-					break;
-				case GF_AVC_TYPE_B:
-				case GF_AVC_TYPE2_B:
-					nb_b++;
-					break;
-				case GF_AVC_TYPE_SP:
-				case GF_AVC_TYPE2_SP:
-					nb_sp++;
-					break;
-				case GF_AVC_TYPE_SI:
-				case GF_AVC_TYPE2_SI:
-					nb_si++;
-					break;
-				}
-			}
-			break;
-
-		/*remove*/
-		case GF_AVC_NALU_ACCESS_UNIT:
-			if (import->keep_audelim) {
-				copy_size = nal_size;
-			} else {
-				copy_size = 0;
-			}
-			break;
-		case GF_AVC_NALU_FILLER_DATA:
-		case GF_AVC_NALU_END_OF_SEQ:
-		case GF_AVC_NALU_END_OF_STREAM:
-			break;
-
-		case GF_AVC_NALU_SVC_PREFIX_NALU:
-			if (import->flags & GF_IMPORT_SVC_NONE) {
-				copy_size = 0;
-				break;
-			}
-			copy_size = nal_size;
-			break;
-		case GF_AVC_NALU_SVC_SLICE:
-		{
-			u32 i;
-			for (i = 0; i < gf_list_count(avccfg->pictureParameterSets); i ++) {
-				slc = (GF_AVCConfigSlot*)gf_list_get(avccfg->pictureParameterSets, i);
-				if (avc.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(avccfg->pictureParameterSets, i);
-					i--;
-					gf_list_add(svccfg->pictureParameterSets, slc);
-				}
-			}
-		}
-		if (import->flags & GF_IMPORT_SVC_NONE) {
-			copy_size = 0;
-			break;
-		}
-		if (! skip_nal) {
-			copy_size = nal_size;
-			switch (avc.s_info.slice_type) {
-			case GF_AVC_TYPE_P:
-			case GF_AVC_TYPE2_P:
-				avc.s_info.sps->nb_ep++;
-				break;
-			case GF_AVC_TYPE_I:
-			case GF_AVC_TYPE2_I:
-				avc.s_info.sps->nb_ei++;
-				break;
-			case GF_AVC_TYPE_B:
-			case GF_AVC_TYPE2_B:
-				avc.s_info.sps->nb_eb++;
-				break;
-			}
-		}
-		break;
-
-		case GF_AVC_NALU_SEQ_PARAM_EXT:
-			idx = gf_media_avc_read_sps_ext(buffer, nal_size);
-			if (idx<0 || idx>31) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Sequence Param Extension");
-				goto exit;
-			}
-
-			if (! (avc.sps[idx].state & AVC_SPS_EXT_DECLARED)) {
-				avc.sps[idx].state |= AVC_SPS_EXT_DECLARED;
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-				if (!avccfg->sequenceParameterSetExtensions)
-					avccfg->sequenceParameterSetExtensions = gf_list_new();
-
-				gf_list_add(avccfg->sequenceParameterSetExtensions, slc);
-			}
-			break;
-
-		case GF_AVC_NALU_SLICE_AUX:
-
-		default:
-			gf_import_message(import, GF_OK, "WARNING: NAL Unit type %d not handled - adding", nal_type);
-			copy_size = nal_size;
-			break;
-		}
-
-		if (!nal_size) break;
-
-		if (flush_sample && sample_data) {
-			Bool is_rap=GF_FALSE;;
-			GF_ISOSample *samp = gf_isom_sample_new();
-			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
-			if (!sample_is_rap) {
-				if (sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) {
-					samp->IsRAP = RAP;
-					if (!use_opengop_gdr) {
-						use_opengop_gdr = 1;
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISO conformant\n"));
-					}
-				}
-			}
-			gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
-			gf_bs_del(sample_data);
-			sample_data = NULL;
-
-			if (prev_nalu_prefix_size) {
-				u32 size, reserved, nb_subs;
-				u8 priority;
-				Bool discardable;
-
-				samp->dataLength -= size_length/8 + prev_nalu_prefix_size;
-
-				if (set_subsamples) {
-					/* determine the number of subsamples */
-					nb_subs = gf_isom_sample_has_subsamples(import->dest, track, cur_samp+1, 0);
-					if (nb_subs) {
-						/* fetch size, priority, reserved and discardable info for last subsample */
-						gf_isom_sample_get_subsample(import->dest, track, cur_samp+1, 0, nb_subs, &size, &priority, &reserved, &discardable);
-
-						/*remove last subsample entry!*/
-						gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, 0, 0, 0, GF_FALSE);
-					}
-				}
-
-				/*rewrite last NALU prefix at the beginning of next sample*/
-				sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-				gf_bs_write_data(sample_data, samp->data + samp->dataLength, size_length/8 + prev_nalu_prefix_size);
-
-				if (set_subsamples) {
-					/*add subsample entry to next sample*/
-					gf_isom_add_subsample(import->dest, track, cur_samp+2, 0, size_length/8 + prev_nalu_prefix_size, priority, reserved, discardable);
-				}
-
-				prev_nalu_prefix_size = 0;
-			}
-			/*CTS recomuting is much trickier than with MPEG-4 ASP due to b-slice used as references - we therefore
-			store the POC as the CTS offset and update the whole table at the end*/
-			samp->CTS_Offset = last_poc - poc_shift;
-			assert(last_poc >= poc_shift);
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-			if (e) goto exit;
-
-			sample_has_slice = GF_FALSE;
-			cur_samp++;
-
-			if (samp->IsRAP) is_rap = GF_TRUE;
-
-			/*write sampleGroups info*/
-			if (!samp->IsRAP && ( (sei_recovery_frame_count>=0) || sample_has_islice) ) {
-				/*generic GDR*/
-				if (sei_recovery_frame_count > 0) {
-					if (!use_opengop_gdr) use_opengop_gdr = 1;
-					e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, (s16) sei_recovery_frame_count);
-				}
-				/*open-GOP*/
-				else if ((sei_recovery_frame_count == 0) && sample_has_islice) {
-					if (!use_opengop_gdr) use_opengop_gdr = 2;
-					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
-					is_rap = GF_TRUE;
-				}
-				if (e) goto exit;
-			}
-			//write sample deps
-			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
-				u32 isLeading, dependsOn, dependedOn, hasRedundant;
-				isLeading = 0; //for avc we would need to parse sub-seq info SEI
-				dependsOn = is_rap ? 2 : 1;
-				dependedOn = sample_is_ref ? 1 : 2;
-				hasRedundant = has_redundant ? 1 : 2;
-
-				e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, hasRedundant);
-				if (e) goto exit;
-			}
-			sample_is_ref = GF_FALSE;
-			has_redundant = GF_FALSE;
-
-			gf_isom_sample_del(&samp);
-			gf_set_progress("Importing AVC-H264", (u32) (nal_start/1024), (u32) (total_size/1024) );
-			first_nal = GF_TRUE;
-
-			if (min_poc > last_poc)
-				min_poc = last_poc;
-
-			sample_has_islice = GF_FALSE;
-			sei_recovery_frame_count = -1;
-		}
-
-
-		if (copy_size) {
-			//nal in current sample is a ref
-			nal_ref_idc = (nal_hdr & 0x60) >> 5;
-			if (nal_ref_idc) {
-				sample_is_ref = GF_TRUE;
-			}
-			
-			if (is_islice)
-				sample_has_islice = GF_TRUE;
-
-			if ((size_length<32) && ( (u32) (1<<size_length)-1 < copy_size)) {
-				u32 diff_size = 8;
-				while ((size_length<32) && ( (u32) (1<<(size_length+diff_size))-1 < copy_size)) diff_size+=8;
-				/*only 8bits, 16bits and 32 bits*/
-				if (size_length+diff_size == 24) diff_size+=8;
-
-				gf_import_message(import, GF_OK, "Adjusting AVC SizeLength to %d bits", size_length+diff_size);
-				gf_media_avc_rewrite_samples(import->dest, track, size_length, size_length+diff_size);
-
-				/*rewrite current sample*/
-				if (sample_data) {
-					char *sd;
-					u32 sd_l;
-					GF_BitStream *prev_sd;
-					gf_bs_get_content(sample_data, &sd, &sd_l);
-					gf_bs_del(sample_data);
-					sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-					prev_sd = gf_bs_new(sd, sd_l, GF_BITSTREAM_READ);
-					while (gf_bs_available(prev_sd)) {
-						char *buf;
-						u32 s = gf_bs_read_int(prev_sd, size_length);
-						gf_bs_write_int(sample_data, s, size_length+diff_size);
-						buf = (char*)gf_malloc(sizeof(char)*s);
-						gf_bs_read_data(prev_sd, buf, s);
-						gf_bs_write_data(sample_data, buf, s);
-						gf_free(buf);
-					}
-					gf_bs_del(prev_sd);
-					gf_free(sd);
-				}
-				size_length+=diff_size;
-
-			}
-			if (!sample_data) sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_int(sample_data, copy_size, size_length);
-			gf_bs_write_data(sample_data, buffer, copy_size);
-
-			/*fixme - we need finer grain for priority*/
-			if ((nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE)) {
-				u32 res = 0;
-				u8 prio;
-				unsigned char *p = (unsigned char *) buffer;
-				res |= (p[0] & 0x60) ? 0x80000000 : 0; // RefPicFlag
-				res |= 0 ? 0x40000000 : 0;             // RedPicFlag TODO: not supported, would require to parse NAL unit payload
-				res |= (1<=nal_type && nal_type<=5) || (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) || (nal_type==GF_AVC_NALU_SVC_SLICE) ? 0x20000000 : 0;  // VclNALUnitFlag
-				res |= p[1] << 16;                     // use values of IdrFlag and PriorityId directly from SVC extension header
-				res |= p[2] << 8;                      // use values of DependencyId and QualityId directly from SVC extension header
-				res |= p[3] & 0xFC;                    // use values of TemporalId and UseRefBasePicFlag directly from SVC extension header
-				res |= 0 ? 0x00000002 : 0;             // StoreBaseRepFlag TODO: SVC FF mentions a store_base_rep_flag which cannot be found in SVC spec
-
-				// priority_id (6 bits) in SVC has inverse meaning -> lower value means higher priority - invert it and scale it to 8 bits
-				prio = (63 - (p[1] & 0x3F)) << 2;
-
-				if (set_subsamples) {
-					gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, copy_size+size_length/8, prio, res, GF_TRUE);
-				}
-
-				if (nal_type==GF_AVC_NALU_SVC_PREFIX_NALU) {
-					/* remember reserved and priority value */
-					res_prev_nalu_prefix = res;
-					priority_prev_nalu_prefix = prio;
-				}
-			} else if (set_subsamples) {
-				/* use the res and priority value of last prefix NALU */
-				gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, copy_size+size_length/8, priority_prev_nalu_prefix, res_prev_nalu_prefix, GF_FALSE);
-			}
-			if (nal_type!=GF_AVC_NALU_SVC_PREFIX_NALU) {
-				res_prev_nalu_prefix = 0;
-				priority_prev_nalu_prefix = 0;
-			}
-
-			if (nal_type != GF_AVC_NALU_SVC_PREFIX_NALU) {
-				prev_nalu_prefix_size = 0;
-			} else {
-				prev_nalu_prefix_size += nal_size;
-			}
-
-			switch (nal_type) {
-			case GF_AVC_NALU_SVC_SLICE:
-			case GF_AVC_NALU_NON_IDR_SLICE:
-			case GF_AVC_NALU_DP_A_SLICE:
-			case GF_AVC_NALU_DP_B_SLICE:
-			case GF_AVC_NALU_DP_C_SLICE:
-			case GF_AVC_NALU_IDR_SLICE:
-			case GF_AVC_NALU_SLICE_AUX:
-				sample_has_slice = GF_TRUE;
-				if (!is_paff && avc.s_info.bottom_field_flag)
-					is_paff = GF_TRUE;
-
-				slice_is_ref = (avc.s_info.nal_unit_type==GF_AVC_NALU_IDR_SLICE) ? GF_TRUE : GF_FALSE;
-				if (slice_is_ref)
-					nb_idr++;
-				slice_force_ref = GF_FALSE;
-
-				if (avc.s_info.redundant_pic_cnt>0) {
-					has_redundant = GF_TRUE;
-				}
-
-				/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
-				SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
-				if (first_nal) {
-					first_nal = GF_FALSE;
-					if (avc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
-						Bool bIntraSlice = gf_media_avc_slice_is_intra(&avc);
-						assert(avc.s_info.nal_unit_type!=GF_AVC_NALU_IDR_SLICE || bIntraSlice);
-
-						sei_recovery_frame_count = avc.sei.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*/
-						if (!avc.sei.recovery_point.valid && bIntraSlice) {
-							sei_recovery_frame_count = 0;
-							if (use_opengop_gdr == 1) {
-								use_opengop_gdr = 2; /*avoid message flooding*/
-								GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[AVC Import] No valid SEI Recovery Point found although needed - forcing\n"));
-							}
-						}
-						avc.sei.recovery_point.valid = 0;
-						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
-							slice_force_ref = GF_TRUE;
-					}
-					sample_is_rap = gf_media_avc_slice_is_IDR(&avc);
-				}
-
-				if (avc.s_info.poc<poc_shift) {
-					u32 j;
-					if (ref_frame) {
-						for (j=ref_frame; j<=cur_samp; j++) {
-							GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, j, NULL, NULL);
-							if (!samp) break;
-							samp->CTS_Offset += poc_shift;
-							samp->CTS_Offset -= avc.s_info.poc;
-							gf_isom_modify_cts_offset(import->dest, track, j, samp->CTS_Offset);
-							gf_isom_sample_del(&samp);
-						}
-					}
-					poc_shift = avc.s_info.poc;
-				}
-
-				/*if #pics, compute smallest POC increase*/
-				if (avc.s_info.poc != last_poc) {
-					if (!poc_diff || (poc_diff > abs(avc.s_info.poc-last_poc))) {
-						poc_diff = abs(avc.s_info.poc-last_poc);/*ideally we would need to start the parsing again as poc_diff helps computing max_total_delay*/
-					}
-					last_poc = avc.s_info.poc;
-				}
-
-				/*ref slice, reset poc*/
-				if (slice_is_ref) {
-					ref_frame = cur_samp+1;
-					max_last_poc = last_poc = max_last_b_poc = 0;
-					poc_shift = 0;
-				}
-				/*forced ref slice*/
-				else if (slice_force_ref) {
-					ref_frame = cur_samp+1;
-					/*adjust POC shift as sample will now be marked as sync, so wo must store poc as if IDR (eg POC=0) for our CTS offset computing to be correct*/
-					poc_shift = avc.s_info.poc;
-				}
-				/*strictly less - this is a new P slice*/
-				else if (max_last_poc<last_poc) {
-					max_last_b_poc = 0;
-					//prev_last_poc = max_last_poc;
-					max_last_poc = last_poc;
-				}
-				/*stricly greater*/
-				else if (max_last_poc>last_poc) {
-					/*need to store TS offsets*/
-					has_cts_offset = GF_TRUE;
-					switch (avc.s_info.slice_type) {
-					case GF_AVC_TYPE_B:
-					case GF_AVC_TYPE2_B:
-						if (!max_last_b_poc) {
-							max_last_b_poc = last_poc;
-						}
-						/*if same poc than last max, this is a B-slice*/
-						else if (last_poc>max_last_b_poc) {
-							max_last_b_poc = last_poc;
-						}
-						/*otherwise we had a B-slice reference: do nothing*/
-
-						break;
-					}
-				}
-
-				/*compute max delay (applicable when B slice are present)*/
-				if (ref_frame && poc_diff && (s32)(cur_samp-(ref_frame-1)-last_poc/poc_diff)>(s32)max_total_delay) {
-					max_total_delay = cur_samp - (ref_frame-1) - last_poc/poc_diff;
-				}
-			}
-		}
-
-		gf_bs_align(bs);
-		nal_end = gf_bs_get_position(bs);
-		assert(nal_start <= nal_end);
-		assert(nal_end <= nal_start + nal_and_trailing_size);
-		if (nal_end != nal_start + nal_and_trailing_size)
-			gf_bs_seek(bs, nal_start + nal_and_trailing_size);
-
-		if (!gf_bs_available(bs)) break;
-		if (duration && (dts_inc*cur_samp > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-
-		/*consume next start code*/
-		nal_start = gf_media_nalu_next_start_code_bs(bs);
-		if (nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
-			gf_bs_skip_bytes(bs, nal_start);
-		}
-		nal_start = gf_media_nalu_is_start_code(bs);
-		if (!nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[avc-h264] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
-			break;
-		}
-		nal_start = gf_bs_get_position(bs);
-	}
-
-	/*final flush*/
-	if (sample_data) {
-		GF_ISOSample *samp = gf_isom_sample_new();
-		samp->DTS = (u64)dts_inc*cur_samp;
-		samp->IsRAP = sample_is_rap ? RAP : RAP_NO;
-		if (!sample_is_rap && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
-			samp->IsRAP = RAP;
-		}
-		/*we store the frame order (based on the POC) as the CTS offset and update the whole table at the end*/
-		samp->CTS_Offset = last_poc - poc_shift;
-		gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
-		gf_bs_del(sample_data);
-		sample_data = NULL;
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		if (e) goto exit;
-		gf_isom_sample_del(&samp);
-		gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp+1);
-		cur_samp++;
-
-		//write sample deps
-		if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
-			u32 isLeading, dependsOn, dependedOn;
-			isLeading = 0;
-			dependsOn = (sample_is_rap || sample_has_islice) ? 2 : 1;
-			dependedOn = sample_is_ref ? 1 : 2;
-
-			e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
-			if (e) goto exit;
-		}
-		sample_is_ref = GF_FALSE;
-
-	}
-
-
-	/*recompute all CTS offsets*/
-	if (has_cts_offset) {
-		u32 i, last_cts_samp;
-		u64 last_dts, max_cts, min_cts, min_cts_offset;
-		if (!poc_diff) poc_diff = 1;
-		/*no b-frame references, no need to cope with negative poc*/
-		if (!max_total_delay) {
-			min_poc=0;
-			max_total_delay = 1;
-		}
-		cur_samp = gf_isom_get_sample_count(import->dest, track);
-		min_poc *= -1;
-		last_dts = 0;
-		max_cts = 0;
-		min_cts = (u64) -1;
-		min_cts_offset = (u64) -1;
-		last_cts_samp = 0;
-
-		for (i=0; i<cur_samp; i++) {
-			u64 cts;
-			/*not using descIdx and data_offset will only fetch DTS, CTS and RAP which is all we need*/
-			GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, i+1, NULL, NULL);
-			/*poc re-init (RAP and POC to 0, otherwise that's SEI recovery), update base DTS*/
-			if (samp->IsRAP /*&& !samp->CTS_Offset*/)
-				last_dts = samp->DTS * (1+is_paff);
-
-			/*CTS offset is frame POC (refers to last IDR)*/
-			cts = ( (min_poc + (s32) samp->CTS_Offset) * dts_inc ) / poc_diff + (u32) last_dts;
-
-			/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
-			if (is_paff) {
-				cts /= 2;
-				/*in some cases the poc is not on the top field - if that is the case, round up*/
-				if (cts%dts_inc) {
-					cts = ((cts/dts_inc)+1)*dts_inc;
-				}
-			}
-
-			/*B-frames offset*/
-			cts += (u32) (max_total_delay*dts_inc);
-
-			samp->CTS_Offset = (u32) (cts - samp->DTS);
-
-			if (samp->CTS_Offset < min_cts_offset)
-				min_cts_offset = samp->CTS_Offset;
-
-			if (max_cts < samp->DTS + samp->CTS_Offset) {
-				max_cts = samp->DTS + samp->CTS_Offset;
-				last_cts_samp = i;
-			}
-			if (min_cts >= samp->DTS + samp->CTS_Offset)
-				min_cts = samp->DTS + samp->CTS_Offset;
-
-
-			/*this should never happen, however some streams seem to do weird POC increases (cf sorenson streams, last 2 frames),
-			this should hopefully take care of some bugs and ensure proper CTS...*/
-			if ((s32)samp->CTS_Offset<0) {
-				u32 j, k;
-				samp->CTS_Offset = 0;
-				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
-				for (j=last_cts_samp; j<i; j++) {
-					GF_ISOSample *asamp = gf_isom_get_sample_info(import->dest, track, j+1, NULL, NULL);
-					for (k=j+1; k<=i; k++) {
-						GF_ISOSample *bsamp = gf_isom_get_sample_info(import->dest, track, k+1, NULL, NULL);
-						if (asamp->CTS_Offset+asamp->DTS==bsamp->CTS_Offset+bsamp->DTS) {
-							max_cts += dts_inc;
-							bsamp->CTS_Offset = (u32) (max_cts - bsamp->DTS);
-							gf_isom_modify_cts_offset(import->dest, track, k+1, bsamp->CTS_Offset);
-						}
-						gf_isom_sample_del(&bsamp);
-					}
-					gf_isom_sample_del(&asamp);
-				}
-				max_cts = samp->DTS + samp->CTS_Offset;
-			} else {
-				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
-			}
-			gf_isom_sample_del(&samp);
-		}
-
-		if (min_cts_offset > 0) {
-			gf_isom_shift_cts_offset(import->dest, track, (s32)min_cts_offset);
-			max_cts -= min_cts_offset;
-			min_cts -= min_cts_offset;
-		}
-		/*and repack table*/
-		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
-
-		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST) && min_cts) {
-			last_dts = max_cts - min_cts + gf_isom_get_sample_duration(import->dest, track, gf_isom_get_sample_count(import->dest, track) );
-
-			last_dts *= gf_isom_get_timescale(import->dest);
-			last_dts /= gf_isom_get_media_timescale(import->dest, track);
-			gf_isom_set_edit_segment(import->dest, track, 0, last_dts, min_cts, GF_ISOM_EDIT_NORMAL);
-		}
-	} else {
-		gf_isom_remove_cts_info(import->dest, track);
-	}
-
-	if (gf_isom_get_sample_count(import->dest,track) == 1) {
-	    gf_isom_set_last_sample_duration(import->dest, track, dts_inc );
-	}
-
-	gf_set_progress("Importing AVC-H264", (u32) cur_samp, cur_samp);
-
-	gf_isom_set_visual_info(import->dest, track, di, max_w, max_h);
-	avccfg->nal_unit_size = size_length/8;
-	svccfg->nal_unit_size = size_length/8;
-
-
-	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-		gf_isom_avc_config_update(import->dest, track, 1, avccfg);
-		gf_isom_avc_set_inband_config(import->dest, track, 1);
-	} else if (gf_list_count(avccfg->sequenceParameterSets) || !gf_list_count(svccfg->sequenceParameterSets) ) {
-		gf_isom_avc_config_update(import->dest, track, 1, avccfg);
-		if (gf_list_count(svccfg->sequenceParameterSets)) {
-			gf_isom_svc_config_update(import->dest, track, 1, svccfg, GF_TRUE);
-		}
-	} else {
-		gf_isom_svc_config_update(import->dest, track, 1, svccfg, GF_FALSE);
-	}
-
-	if (import->flags & GF_IMPORT_USE_CCST) {
-		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
-		if (e) goto exit;
-	}
-	if (import->is_alpha) {
-		e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
-		if (e) goto exit;
-	}
-
-	e = gf_media_update_par(import->dest, track);
-	if (e) goto exit;
-	/*arbitrary: use the last active SPS*/
-	if (avc.sps[avc.sps_active_idx].vui_parameters_present_flag && avc.sps[avc.sps_active_idx].vui.colour_description_present_flag) {
-		e = gf_isom_set_visual_color_info(import->dest, track, di, GF_ISOM_SUBTYPE_NCLX, avc.sps[avc.sps_active_idx].vui.colour_primaries, avc.sps[avc.sps_active_idx].vui.transfer_characteristics, avc.sps[avc.sps_active_idx].vui.matrix_coefficients, avc.sps[avc.sps_active_idx].vui.video_full_range_flag, NULL, 0);
-		if (e) goto exit;
-	}
-	gf_media_update_bitrate(import->dest, track);
-
-	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0x7F);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_AVC1, 1);
-
-	if (!gf_list_count(avccfg->sequenceParameterSets) && !gf_list_count(svccfg->sequenceParameterSets) && !(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
-	} else {
-		u32 i;
-		if (nb_sp || nb_si) {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-			                  cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
-		} else {
-			gf_import_message(import, GF_OK, "AVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR",
-			                  cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sei, nb_idr);
-		}
-
-		for (i=0; i<gf_list_count(svccfg->sequenceParameterSets); i++) {
-			AVC_SPS *sps;
-			GF_AVCConfigSlot *svcc = (GF_AVCConfigSlot*)gf_list_get(svccfg->sequenceParameterSets, i);
-			sps = & avc.sps[svcc->id];
-			if (sps && (sps->state & AVC_SUBSPS_PARSED)) {
-				gf_import_message(import, GF_OK, "SVC (SSPS ID %d) Import results: Slices: %d I %d P %d B", svcc->id - GF_SVC_SSPS_ID_SHIFT, sps->nb_ei, sps->nb_ep, sps->nb_eb);
-			}
-		}
-
-		if (max_total_delay>1) {
-			gf_import_message(import, GF_OK, "Stream uses forward prediction - stream CTS offset: %d frames", max_total_delay);
-		}
-	}
-
-	if (use_opengop_gdr==2) {
-		gf_import_message(import, GF_OK, "OpenGOP detected - adjusting file brand");
-		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISO6, 1);
-	}
-
-	/*rewrite ESD*/
-	if (import->esd) {
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->predefined = 2;
-		import->esd->slConfig->timestampResolution = timescale;
-		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
-		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track, 1);
-		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
-	}
-
-exit:
-	if (sample_data) gf_bs_del(sample_data);
-	gf_odf_avc_cfg_del(avccfg);
-	gf_odf_avc_cfg_del(svccfg);
-	gf_free(buffer);
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-}
-
-#ifndef GPAC_DISABLE_HEVC
-static GF_HEVCParamArray *get_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type)
-{
-	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
-	for (i=0; i<count; i++) {
-		GF_HEVCParamArray *ar = (GF_HEVCParamArray*)gf_list_get(hevc_cfg->param_array, i);
-		if (ar->type==type) return ar;
-	}
-	return NULL;
-}
-
-
-static void hevc_set_parall_type(GF_HEVCConfig *hevc_cfg)
-{
-	u32 use_tiles, use_wpp, nb_pps, i, count;
-	HEVCState hevc;
-	GF_HEVCParamArray *ar = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_PIC_PARAM);
-	if (!ar)
-		return;
-
-	count = gf_list_count(ar->nalus);
-
-	memset(&hevc, 0, sizeof(HEVCState));
-	hevc.sps_active_idx = -1;
-
-	use_tiles = 0;
-	use_wpp = 0;
-	nb_pps = 0;
-
-	for (i=0; i<count; i++) {
-		HEVC_PPS *pps;
-		GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_list_get(ar->nalus, i);
-		s32 idx = gf_media_hevc_read_pps(slc->data, slc->size, &hevc);
-
-		if (idx>=0) {
-			nb_pps++;
-			pps = &hevc.pps[idx];
-			if (!pps->entropy_coding_sync_enabled_flag && pps->tiles_enabled_flag)
-				use_tiles++;
-			else if (pps->entropy_coding_sync_enabled_flag && !pps->tiles_enabled_flag)
-				use_wpp++;
-		}
-	}
-	if (!use_tiles && !use_wpp) hevc_cfg->parallelismType = 1;
-	else if (!use_wpp && (use_tiles==nb_pps) ) hevc_cfg->parallelismType = 2;
-	else if (!use_tiles && (use_wpp==nb_pps) ) hevc_cfg->parallelismType = 3;
-	else hevc_cfg->parallelismType = 0;
-}
-
-#endif
-
-static GF_Err gf_lhevc_set_operating_points_information(GF_ISOFile *file, u32 hevc_track, u32 track, HEVC_VPS *vps, u8 *max_temporal_id)
-{
-	GF_OperatingPointsInformation *oinf;
-	u32 di = 0;
-	GF_BitStream *bs;
-	char *data;
-	u32 data_size;
-	u32 i;
-
-	if (!vps->vps_extension_found) return GF_OK;
-
-	oinf = gf_isom_oinf_new_entry();
-	if (!oinf) return GF_OUT_OF_MEM;
-
-	oinf->scalability_mask = 0;
-	for (i = 0; i < 16; i++) {
-		if (vps->scalability_mask[i])
-			oinf->scalability_mask |= 1 << i;
-	}
-
-	for (i = 0; i < vps->num_profile_tier_level; i++) {
-		HEVC_ProfileTierLevel ptl = (i == 0) ? vps->ptl : vps->ext_ptl[i-1];
-		LHEVC_ProfileTierLevel *lhevc_ptl;
-		GF_SAFEALLOC(lhevc_ptl, LHEVC_ProfileTierLevel);
-		lhevc_ptl->general_profile_space = ptl.profile_space;
-		lhevc_ptl->general_tier_flag = ptl.tier_flag;
-		lhevc_ptl->general_profile_idc = ptl.profile_idc;
-		lhevc_ptl->general_profile_compatibility_flags = ptl.profile_compatibility_flag;
-		lhevc_ptl->general_constraint_indicator_flags = 0;
-		if (ptl.general_progressive_source_flag)
-			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 47;
-		if (ptl.general_interlaced_source_flag)
-			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 46;
-		if (ptl.general_non_packed_constraint_flag)
-			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 45;
-		if (ptl.general_frame_only_constraint_flag)
-			lhevc_ptl->general_constraint_indicator_flags |= ((u64)1) << 44;
-		lhevc_ptl->general_constraint_indicator_flags |= ptl.general_reserved_44bits;
-		lhevc_ptl->general_level_idc = ptl.level_idc;
-		gf_list_add(oinf->profile_tier_levels, lhevc_ptl);
-	}
-
-	for (i = 0; i < vps->num_output_layer_sets; i++) {
-		LHEVC_OperatingPoint *op;
-		u32 j;
-		u16 minPicWidth, minPicHeight, maxPicWidth, maxPicHeight;
-		u8 maxChromaFormat, maxBitDepth;
-		u8 maxTemporalId;
-		GF_SAFEALLOC(op, LHEVC_OperatingPoint);
-		op->output_layer_set_idx = i;
-		op->layer_count = vps->num_necessary_layers[i];
-		minPicWidth = minPicHeight = maxPicWidth = maxPicHeight = maxTemporalId = 0;
-		maxChromaFormat = maxBitDepth = 0;
-		for (j = 0; j < op->layer_count; j++) {
-			u32 format_idx;
-			u32 bitDepth;
-			op->layers_info[j].ptl_idx = vps->profile_tier_level_idx[i][j];
-			op->layers_info[j].layer_id = j;
-			op->layers_info[j].is_outputlayer = vps->output_layer_flag[i][j];
-			//FIXME: we consider that this flag is never set
-			op->layers_info[j].is_alternate_outputlayer = GF_FALSE;
-			if (!maxTemporalId || (maxTemporalId < max_temporal_id[op->layers_info[j].layer_id]))
-				maxTemporalId = max_temporal_id[op->layers_info[j].layer_id];
-			format_idx = vps->rep_format_idx[op->layers_info[j].layer_id];
-			if (!minPicWidth || (minPicWidth > vps->rep_formats[format_idx].pic_width_luma_samples))
-				minPicWidth = vps->rep_formats[format_idx].pic_width_luma_samples;
-			if (!minPicHeight || (minPicHeight > vps->rep_formats[format_idx].pic_height_luma_samples))
-				minPicHeight = vps->rep_formats[format_idx].pic_height_luma_samples;
-			if (!maxPicWidth || (maxPicWidth < vps->rep_formats[format_idx].pic_width_luma_samples))
-				maxPicWidth = vps->rep_formats[format_idx].pic_width_luma_samples;
-			if (!maxPicHeight || (maxPicHeight < vps->rep_formats[format_idx].pic_height_luma_samples))
-				maxPicHeight = vps->rep_formats[format_idx].pic_height_luma_samples;
-			if (!maxChromaFormat || (maxChromaFormat < vps->rep_formats[format_idx].chroma_format_idc))
-				maxChromaFormat = vps->rep_formats[format_idx].chroma_format_idc;
-			bitDepth = vps->rep_formats[format_idx].bit_depth_chroma > vps->rep_formats[format_idx].bit_depth_luma ? vps->rep_formats[format_idx].bit_depth_chroma : vps->rep_formats[format_idx].bit_depth_luma;
-			if (!maxChromaFormat || (maxChromaFormat < bitDepth))
-				maxChromaFormat = bitDepth;
-		}
-		op->max_temporal_id = maxTemporalId;
-		op->minPicWidth = minPicWidth;
-		op->minPicHeight = minPicHeight;
-		op->maxPicWidth = maxPicWidth;
-		op->maxPicHeight = maxPicHeight;
-		op->maxChromaFormat = maxChromaFormat;
-		op->maxBitDepth = maxBitDepth;
-		op->frame_rate_info_flag = GF_FALSE; //FIXME: should fetch this info from VUI
-		op->bit_rate_info_flag = GF_FALSE; //we don't use it
-		gf_list_add(oinf->operating_points, op);
-	}
-
-	for (i = 0; i < vps->max_layers; i++) {
-		LHEVC_DependentLayer *dep;
-		u32 j, k;
-		GF_SAFEALLOC(dep, LHEVC_DependentLayer);
-		dep->dependent_layerID = vps->layer_id_in_nuh[i];
-		for (j = 0; j < vps->max_layers; j++) {
-			if (vps->direct_dependency_flag[dep->dependent_layerID][j]) {
-				dep->dependent_on_layerID[dep->num_layers_dependent_on] = j;
-				dep->num_layers_dependent_on ++;
-			}
-		}
-		k = 0;
-		for (j = 0; j < 16; j++) {
-			if (oinf->scalability_mask & (1 << j)) {
-				dep->dimension_identifier[j] = vps->dimension_id[i][k];
-				k++;
-			}
-		}
-		gf_list_add(oinf->dependency_layers, dep);
-	}
-
-	//write Operating Points Information Sample Group
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	gf_isom_oinf_write_entry(oinf, bs);
-	gf_bs_get_content(bs, &data, &data_size);
-	gf_bs_del(bs);
-	gf_isom_oinf_del_entry(oinf);
-	gf_isom_add_sample_group_info(file, hevc_track ? hevc_track : track, GF_ISOM_SAMPLE_GROUP_OINF, data, data_size, GF_TRUE, &di);
-
-	if (hevc_track) {
-		gf_isom_set_track_reference(file, track, GF_ISOM_REF_OREF, gf_isom_get_track_id(file, hevc_track) );
-	}
-	gf_free(data);
-	return GF_OK;
-}
-
-
-typedef struct
-{
-	u32 layer_id_plus_one;
-	u32 min_temporal_id, max_temporal_id;
-} LHVCLayerInfo;
-
-static void gf_lhevc_set_layer_information(GF_ISOFile *file, u32 track, LHVCLayerInfo *linf)
-{
-	u32 i, nb_layers=0, di=0;
-	char *data;
-	u32 data_size;
-
-	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-
-	for (i=0; i<64; i++) {
-		if (linf[i].layer_id_plus_one) nb_layers++;
-	}
-	gf_bs_write_int(bs, 0, 2);
-	gf_bs_write_int(bs, nb_layers, 6);
-	for (i=0; i<nb_layers; i++) {
-		if (! linf[i].layer_id_plus_one) continue;
-		gf_bs_write_int(bs, 0, 4);
-		gf_bs_write_int(bs, linf[i].layer_id_plus_one - 1, 6);
-		gf_bs_write_int(bs, linf[i].min_temporal_id, 3);
-		gf_bs_write_int(bs, linf[i].max_temporal_id, 3);
-		gf_bs_write_int(bs, 0, 1);
-		gf_bs_write_int(bs, 0xFF, 7);
-
-	}
-	gf_bs_get_content(bs, &data, &data_size);
-	gf_bs_del(bs);
-	gf_isom_add_sample_group_info(file, track, GF_ISOM_SAMPLE_GROUP_LINF, data, data_size, GF_TRUE, &di);
-	gf_free(data);
-}
-
-static GF_Err gf_import_hevc(GF_MediaImporter *import)
-{
-#ifdef GPAC_DISABLE_HEVC
-	return GF_NOT_SUPPORTED;
-#else
-	Bool detect_fps;
-	u64 nal_start, nal_end, total_size;
-	u32 i, nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_w_b, max_h_b, max_total_delay, nb_nalus, hevc_base_track;
-	s32 idx, sei_recovery_frame_count;
-	u64 duration;
-	GF_Err e;
-	FILE *mdia;
-	HEVCState hevc;
-	GF_AVCConfigSlot *slc;
-	GF_HEVCConfig *hevc_cfg, *lhvc_cfg, *dst_cfg;
-	GF_HEVCParamArray *spss, *ppss, *vpss;
-	GF_BitStream *bs;
-	GF_BitStream *sample_data;
-	Bool flush_sample, flush_next_sample, is_empty_sample, sample_has_islice, sample_has_vps, sample_has_sps, is_islice, first_nal, slice_is_ref, has_cts_offset, is_paff, set_subsamples, slice_force_ref;
-	u32 ref_frame, timescale, copy_size, size_length, dts_inc;
-	s32 last_poc, max_last_poc, max_last_b_poc, poc_diff, prev_last_poc, min_poc, poc_shift;
-	Bool first_hevc, /*has_hevc, */ has_lhvc;
-	u32 use_opengop_gdr = 0;
-	u8 layer_ids[64];
-	SAPType sample_rap_type;
-	s32 cur_vps_id = -1;
-	u8 max_temporal_id[64];
-	u32 min_layer_id = (u32) -1;
-	LHVCLayerInfo linf[64];
-	Bool sample_is_ref;
-
-
-	Double FPS;
-	char *buffer;
-	u32 max_size = 4096;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
-		return GF_OK;
-	}
-
-	memset(linf, 0, sizeof(linf));
-
-	set_subsamples = (import->flags & GF_IMPORT_SET_SUBSAMPLES) ? GF_TRUE : GF_FALSE;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-
-	detect_fps = GF_TRUE;
-	FPS = (Double) import->video_fps;
-	if (!FPS) {
-		FPS = GF_IMPORT_DEFAULT_FPS;
-	} else {
-		if (import->video_fps == GF_IMPORT_AUTO_FPS) {
-			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection in h264*/
-		} else {
-			/*fps is forced by the caller*/
-			detect_fps = GF_FALSE;
-		}
-	}
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	poc_diff = 0;
-
-restart_import:
-
-	memset(&hevc, 0, sizeof(HEVCState));
-	hevc.sps_active_idx = -1;
-	dst_cfg = hevc_cfg = gf_odf_hevc_cfg_new();
-	lhvc_cfg = gf_odf_hevc_cfg_new();
-	lhvc_cfg->complete_representation = GF_TRUE;
-	lhvc_cfg->is_lhvc = GF_TRUE;
-	buffer = (char*)gf_malloc(sizeof(char) * max_size);
-	sample_data = NULL;
-	first_hevc = GF_TRUE;
-	sei_recovery_frame_count = -1;
-	spss = ppss = vpss = NULL;
-	nb_nalus = 0;
-	hevc_base_track = 0;
-	/*has_hevc = */has_lhvc = GF_FALSE;
-	sample_is_ref = 0;
-
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	if (!gf_media_nalu_is_start_code(bs)) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Cannot find HEVC start code");
-		goto exit;
-	}
-
-	/*NALU size packing disabled*/
-	if (!(import->flags & GF_IMPORT_FORCE_PACKED)) size_length = 32;
-	/*if import in edit mode, use smallest NAL size and adjust on the fly*/
-	else if (gf_isom_get_mode(import->dest)!=GF_ISOM_OPEN_WRITE) size_length = 8;
-	else size_length = 32;
-
-	trackID = 0;
-
-	if (import->esd) trackID = import->esd->ESID;
-
-	track = gf_isom_new_track(import->dest, trackID, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track);
-	if (import->esd && import->esd->dependsOnESID) {
-		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
-	}
-
-	e = gf_isom_hevc_config_new(import->dest, track, hevc_cfg, NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_isom_set_nalu_extract_mode(import->dest, track, GF_ISOM_NALU_EXTRACT_INSPECT);
-	memset(layer_ids, 0, sizeof(u8)*64);
-
-	sample_data = NULL;
-	sample_rap_type = RAP_NO;
-	sample_has_islice = GF_FALSE;
-	sample_has_sps = GF_FALSE;
-	sample_has_vps = GF_FALSE;
-	cur_samp = 0;
-	is_paff = GF_FALSE;
-	total_size = gf_bs_get_size(bs);
-	nal_start = gf_bs_get_position(bs);
-	duration = (u64) ( ((Double)import->duration) * timescale / 1000.0);
-
-	nb_i = nb_idr = nb_p = nb_b = nb_sp = nb_si = nb_sei = 0;
-	max_w = max_h = max_w_b = max_h_b = 0;
-	first_nal = GF_TRUE;
-	ref_frame = 0;
-	last_poc = max_last_poc = max_last_b_poc = prev_last_poc = 0;
-	max_total_delay = 0;
-
-	gf_isom_set_cts_packing(import->dest, track, GF_TRUE);
-	has_cts_offset = GF_FALSE;
-	min_poc = 0;
-	poc_shift = 0;
-	flush_next_sample = GF_FALSE;
-	is_empty_sample = GF_TRUE;
-	memset(max_temporal_id, 0, 64*sizeof(u8));
-
-	while (gf_bs_available(bs)) {
-		s32 res;
-		GF_HEVCConfig *prev_cfg;
-		u8 nal_unit_type, temporal_id, layer_id;
-		Bool skip_nal, add_sps, is_slice, has_vcl_nal;
-		u32 nal_and_trailing_size;
-
-		has_vcl_nal = GF_FALSE;
-		nal_and_trailing_size = nal_size = gf_media_nalu_next_start_code_bs(bs);
-		if (!(import->flags & GF_IMPORT_KEEP_TRAILING)) {
-			nal_size = gf_media_nalu_payload_end_bs(bs);
-		}
-
-
-		if (nal_size>max_size) {
-			buffer = (char*)gf_realloc(buffer, sizeof(char)*nal_size);
-			max_size = nal_size;
-		}
-
-		/*read the file, and work on a memory buffer*/
-		gf_bs_read_data(bs, buffer, nal_size);
-
-//		gf_bs_seek(bs, nal_start);
-
-		res = gf_media_hevc_parse_nalu(buffer, nal_size, &hevc, &nal_unit_type, &temporal_id, &layer_id);
-
-		if (max_temporal_id[layer_id] < temporal_id)
-			max_temporal_id[layer_id] = temporal_id;
-
-		if (layer_id && (import->flags & GF_IMPORT_SVC_NONE)) {
-			goto next_nal;
-		}
-
-		nb_nalus++;
-
-		is_islice = GF_FALSE;
-
-		prev_cfg = dst_cfg;
-
-		if (layer_id) {
-			dst_cfg = lhvc_cfg;
-			has_lhvc = GF_TRUE;
-		} else {
-			dst_cfg = hevc_cfg;
-			//has_hevc = GF_TRUE;
-		}
-
-		if (prev_cfg != dst_cfg) {
-			vpss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_VID_PARAM);
-			spss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_SEQ_PARAM);
-			ppss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_PIC_PARAM);
-		}
-
-		skip_nal = GF_FALSE;
-		copy_size = flush_sample = GF_FALSE;
-		is_slice = GF_FALSE;
-
-		switch (res) {
-		case 1:
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				if (!is_empty_sample)
-					flush_sample = GF_TRUE;
-			} else {
-				flush_sample = GF_TRUE;
-			}
-			break;
-		case -1:
-			gf_import_message(import, GF_OK, "Warning: Error parsing NAL unit");
-			skip_nal = GF_TRUE;
-			break;
-		case -2:
-			skip_nal = GF_TRUE;
-			break;
-		default:
-			break;
-		}
-
-		if ( (layer_id == min_layer_id) && flush_next_sample && (nal_unit_type!=GF_HEVC_NALU_SEI_SUFFIX)) {
-			flush_next_sample = GF_FALSE;
-			flush_sample = GF_TRUE;
-		}
-
-		switch (nal_unit_type) {
-		case GF_HEVC_NALU_VID_PARAM:
-			if (import->flags & GF_IMPORT_NO_VPS_EXTENSIONS) {
-				//this may modify nal_size, but we don't use it for bitstream reading
-				idx = gf_media_hevc_read_vps_ex(buffer, &nal_size, &hevc, GF_TRUE);
-			} else {
-				idx = hevc.last_parsed_vps_id;
-			}
-			if (idx<0) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Video Param");
-				goto exit;
-			}
-			/*if we get twice the same VPS put in the the bitstream and set array_completeness to 0 ...*/
-			if (hevc.vps[idx].state == 2) {
-				if (hevc.vps[idx].crc != gf_crc_32(buffer, nal_size)) {
-					copy_size = nal_size;
-					assert(vpss);
-					vpss->array_completeness = 0;
-				}
-			}
-
-			if (hevc.vps[idx].state==1) {
-				hevc.vps[idx].state = 2;
-				hevc.vps[idx].crc = gf_crc_32(buffer, nal_size);
-
-				dst_cfg->avgFrameRate = hevc.vps[idx].rates[0].avg_pic_rate;
-				dst_cfg->constantFrameRate = hevc.vps[idx].rates[0].constand_pic_rate_idc;
-				dst_cfg->numTemporalLayers = hevc.vps[idx].max_sub_layers;
-				dst_cfg->temporalIdNested = hevc.vps[idx].temporal_id_nesting;
-				//TODO set scalability mask
-
-				if (!vpss) {
-					GF_SAFEALLOC(vpss, GF_HEVCParamArray);
-					vpss->nalus = gf_list_new();
-					gf_list_add(dst_cfg->param_array, vpss);
-					vpss->array_completeness = 1;
-					vpss->type = GF_HEVC_NALU_VID_PARAM;
-				}
-
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					vpss->array_completeness = 0;
-					copy_size = nal_size;
-					sample_has_vps = GF_TRUE;
-				}
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-				gf_list_add(vpss->nalus, slc);
-
-			}
-
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				copy_size = nal_size;
-				sample_has_vps = GF_TRUE;
-				if (!is_empty_sample)
-					flush_sample = GF_TRUE;
-			}
-
-			cur_vps_id = idx;
-			break;
-		case GF_HEVC_NALU_SEQ_PARAM:
-			idx = hevc.last_parsed_sps_id;
-			if (idx<0) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing SeqInfo");
-				break;
-			}
-			add_sps = GF_FALSE;
-			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
-				hevc.sps[idx].state |= AVC_SPS_DECLARED;
-				add_sps = GF_TRUE;
-				hevc.sps[idx].crc = gf_crc_32(buffer, nal_size);
-			}
-
-			/*if we get twice the same SPS put it in the bitstream and set array_completeness to 0 ...*/
-			else if (hevc.sps[idx].state & AVC_SPS_DECLARED) {
-				if (hevc.sps[idx].crc != gf_crc_32(buffer, nal_size)) {
-					copy_size = nal_size;
-					assert(spss);
-					spss->array_completeness = 0;
-				}
-			}
-
-			if (add_sps) {
-				dst_cfg->configurationVersion = 1;
-				dst_cfg->profile_space = hevc.sps[idx].ptl.profile_space;
-				dst_cfg->tier_flag = hevc.sps[idx].ptl.tier_flag;
-				dst_cfg->profile_idc = hevc.sps[idx].ptl.profile_idc;
-				dst_cfg->general_profile_compatibility_flags = hevc.sps[idx].ptl.profile_compatibility_flag;
-				dst_cfg->progressive_source_flag = hevc.sps[idx].ptl.general_progressive_source_flag;
-				dst_cfg->interlaced_source_flag = hevc.sps[idx].ptl.general_interlaced_source_flag;
-				dst_cfg->non_packed_constraint_flag = hevc.sps[idx].ptl.general_non_packed_constraint_flag;
-				dst_cfg->frame_only_constraint_flag = hevc.sps[idx].ptl.general_frame_only_constraint_flag;
-
-				dst_cfg->constraint_indicator_flags = hevc.sps[idx].ptl.general_reserved_44bits;
-				dst_cfg->level_idc = hevc.sps[idx].ptl.level_idc;
-
-				dst_cfg->chromaFormat = hevc.sps[idx].chroma_format_idc;
-				dst_cfg->luma_bit_depth = hevc.sps[idx].bit_depth_luma;
-				dst_cfg->chroma_bit_depth = hevc.sps[idx].bit_depth_chroma;
-
-				if (!spss) {
-					GF_SAFEALLOC(spss, GF_HEVCParamArray);
-					spss->nalus = gf_list_new();
-					gf_list_add(dst_cfg->param_array, spss);
-					spss->array_completeness = 1;
-					spss->type = GF_HEVC_NALU_SEQ_PARAM;
-				}
-
-				/*disable frame rate scan, most bitstreams have wrong values there*/
-				if (detect_fps && hevc.sps[idx].has_timing_info
-				        /*if detected FPS is greater than 1000, assume wrong timing info*/
-				        && (hevc.sps[idx].time_scale <= 1000*hevc.sps[idx].num_units_in_tick)
-				   ) {
-					timescale = hevc.sps[idx].time_scale;
-					dts_inc =   hevc.sps[idx].num_units_in_tick;
-					FPS = (Double)timescale / dts_inc;
-					detect_fps = GF_FALSE;
-					gf_isom_remove_track(import->dest, track);
-					if (sample_data) gf_bs_del(sample_data);
-					gf_odf_hevc_cfg_del(hevc_cfg);
-					hevc_cfg = NULL;
-					gf_odf_hevc_cfg_del(lhvc_cfg);
-					lhvc_cfg = NULL;
-					gf_free(buffer);
-					buffer = NULL;
-					gf_bs_del(bs);
-					bs = NULL;
-					gf_fseek(mdia, 0, SEEK_SET);
-					goto restart_import;
-				}
-
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					spss->array_completeness = 0;
-					copy_size = nal_size;
-				}
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-				gf_list_add(spss->nalus, slc);
-
-				if (first_hevc) {
-					first_hevc = GF_FALSE;
-					gf_import_message(import, GF_OK, "HEVC import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
-				} else {
-					gf_import_message(import, GF_OK, "LHVC detected - %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
-				}
-
-				if ((max_w <= hevc.sps[idx].width) && (max_h <= hevc.sps[idx].height)) {
-					max_w = hevc.sps[idx].width;
-					max_h = hevc.sps[idx].height;
-				}
-				if (!layer_id && (max_w_b <= hevc.sps[idx].width) && (max_h_b <= hevc.sps[idx].height)) {
-					max_w_b = hevc.sps[idx].width;
-					max_h_b = hevc.sps[idx].height;
-				}
-			}
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				copy_size = nal_size;
-				sample_has_sps = GF_TRUE;
-				if (!is_empty_sample)
-					flush_sample = GF_TRUE;
-			}
-			break;
-
-		case GF_HEVC_NALU_PIC_PARAM:
-			idx = hevc.last_parsed_pps_id;
-			if (idx<0) {
-				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing Picture Param");
-				goto exit;
-			}
-			/*if we get twice the same PPS put it in the bitstream and set array_completeness to 0 ...*/
-			if (hevc.pps[idx].state == 2) {
-				if (hevc.pps[idx].crc != gf_crc_32(buffer, nal_size)) {
-					copy_size = nal_size;
-					if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					} else if (!ppss) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] Redefinition of PPS with id %d on a different layer but using out-of-band parameter set storage, resulting file might be broken\n", idx));
-					} else {
-						ppss->array_completeness = 0;
-					}
-				}
-			}
-
-			if (hevc.pps[idx].state==1) {
-				hevc.pps[idx].state = 2;
-				hevc.pps[idx].crc = gf_crc_32(buffer, nal_size);
-
-				if (!ppss) {
-					GF_SAFEALLOC(ppss, GF_HEVCParamArray);
-					ppss->nalus = gf_list_new();
-					gf_list_add(dst_cfg->param_array, ppss);
-					ppss->array_completeness = 1;
-					ppss->type = GF_HEVC_NALU_PIC_PARAM;
-				}
-
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					ppss->array_completeness = 0;
-					copy_size = nal_size;
-				}
-
-				slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-				slc->size = nal_size;
-				slc->id = idx;
-				slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-				memcpy(slc->data, buffer, sizeof(char)*slc->size);
-
-				gf_list_add(ppss->nalus, slc);
-			}
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				copy_size = nal_size;
-				if (!is_empty_sample && !layer_id)
-					flush_sample = GF_TRUE;
-			}
-
-			break;
-		case GF_HEVC_NALU_SEI_SUFFIX:
-			if (import->flags & GF_IMPORT_NO_SEI) {
-					copy_size = 0;
-			} else {
-				if (hevc.sps_active_idx != -1) {
-					copy_size = nal_size;
-					if (!layer_id) {
-						if (!is_empty_sample) flush_next_sample = GF_TRUE;
-						else copy_size = 0;
-					}
-					if (copy_size)
-						nb_sei++;
-				}
-			}
-			break;
-		case GF_HEVC_NALU_SEI_PREFIX:
-			if (import->flags & GF_IMPORT_NO_SEI) {
-				copy_size = 0;
-			} else {
-				if (hevc.sps_active_idx != -1) {
-					//todo: inspect SEI and decide what we import
-					copy_size = nal_size;
-				} else {
-					//if no state yet, import SEI
-					copy_size = nal_size;
-				}
-			}
-			if (copy_size) {
-				nb_sei++;
-			}
-			if (nal_size) {
-				//FIXME should not be minus 1 in layer_ids[layer_id - 1] but the previous layer in the tree
-				if (!layer_id || !layer_ids[layer_id - 1])
-					flush_sample = GF_TRUE;
-			}
-			break;
-
-		/*slice_segment_layer_rbsp*/
-		case GF_HEVC_NALU_SLICE_STSA_N:
-		case GF_HEVC_NALU_SLICE_STSA_R:
-		case GF_HEVC_NALU_SLICE_RADL_R:
-		case GF_HEVC_NALU_SLICE_RASL_R:
-		case GF_HEVC_NALU_SLICE_RADL_N:
-		case GF_HEVC_NALU_SLICE_RASL_N:
-		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_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:
-			is_slice = GF_TRUE;
-			if (min_layer_id > layer_id)
-				min_layer_id = layer_id;
-			/*			if ((hevc.s_info.slice_segment_address<=100) || (hevc.s_info.slice_segment_address>=200))
-							skip_nal = 1;
-						if (!hevc.s_info.slice_segment_address)
-							skip_nal = 0;
-			*/
-			if (! skip_nal) {
-				copy_size = nal_size;
-				has_vcl_nal = GF_TRUE;
-				switch (hevc.s_info.slice_type) {
-				case GF_HEVC_SLICE_TYPE_P:
-					nb_p++;
-					break;
-				case GF_HEVC_SLICE_TYPE_I:
-					nb_i++;
-					is_islice = GF_TRUE;
-					break;
-				case GF_HEVC_SLICE_TYPE_B:
-					nb_b++;
-					break;
-				}
-			}
-			break;
-
-		case GF_HEVC_NALU_ACCESS_UNIT:
-			if (import->keep_audelim) {
-				copy_size = nal_size;
-			} else {
-				copy_size = 0;
-			}
-			break;
-		/*remove*/
-		case GF_HEVC_NALU_FILLER_DATA:
-		case GF_HEVC_NALU_END_OF_SEQ:
-		case GF_HEVC_NALU_END_OF_STREAM:
-			break;
-
-		default:
-			gf_import_message(import, GF_OK, "WARNING: NAL Unit type %d not handled - adding", nal_unit_type);
-			copy_size = nal_size;
-			break;
-		}
-
-		if (!nal_size) break;
-		if (copy_size) {
-			linf[layer_id].layer_id_plus_one = layer_id + 1;
-			if (! linf[layer_id].max_temporal_id ) linf[layer_id].max_temporal_id = temporal_id;
-			else if (linf[layer_id].max_temporal_id < temporal_id) linf[layer_id].max_temporal_id = temporal_id;
-
-			if (! linf[layer_id].min_temporal_id ) linf[layer_id].min_temporal_id = temporal_id;
-			else if (linf[layer_id].min_temporal_id > temporal_id) linf[layer_id].min_temporal_id = temporal_id;
-		}
-
-		if (flush_sample && is_empty_sample)
-			flush_sample = GF_FALSE;
-
-		if (flush_sample && sample_data) {
-			Bool is_rap=GF_FALSE;
-			GF_ISOSample *samp = gf_isom_sample_new();
-			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = ((sample_rap_type==SAP_TYPE_1) || (sample_rap_type==SAP_TYPE_2)) ? RAP : RAP_NO;
-			if (! samp->IsRAP) {
-				if (sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0)) {
-					samp->IsRAP = RAP;
-					if (!use_opengop_gdr) {
-						use_opengop_gdr = 1;
-						GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] Forcing non-IDR samples with I slices to be marked as sync points - resulting file will not be ISO conformant\n"));
-					}
-				}
-			}
-			gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
-			gf_bs_del(sample_data);
-			sample_data = NULL;
-
-			if (samp->IsRAP) is_rap = GF_TRUE;
-
-			//fixme, we should check sps and vps IDs when missing
-			if ((import->flags & GF_IMPORT_FORCE_XPS_INBAND) && sample_rap_type && (!sample_has_vps || !sample_has_sps) ) {
-				u32 k;
-				GF_BitStream *fbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-				if (!sample_has_vps) {
-					if (!vpss)
-						vpss = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_VID_PARAM);
-					assert(vpss);
-					for (k=0;k<gf_list_count(vpss->nalus); k++) {
-						GF_AVCConfigSlot *slc = gf_list_get(vpss->nalus, k);
-						gf_bs_write_int(fbs, slc->size, size_length);
-						gf_bs_write_data(fbs, slc->data, slc->size);
-					}
-				}
-				if (!sample_has_sps) {
-					if (!spss)
-						spss = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_SEQ_PARAM);
-					assert(spss);
-					for (k=0;k<gf_list_count(spss->nalus); k++) {
-						GF_AVCConfigSlot *slc = gf_list_get(spss->nalus, k);
-						gf_bs_write_int(fbs, slc->size, size_length);
-						gf_bs_write_data(fbs, slc->data, slc->size);
-					}
-				}
-				gf_bs_write_data(fbs, samp->data, samp->dataLength);
-				gf_free(samp->data);
-				gf_bs_get_content(fbs, &samp->data, &samp->dataLength);
-				gf_bs_del(fbs);
-			}
-
-			/*CTS recomuting is much trickier than with MPEG-4 ASP due to b-slice used as references - we therefore
-			store the POC as the CTS offset and update the whole table at the end*/
-			samp->CTS_Offset = last_poc - poc_shift;
-			assert(last_poc >= poc_shift);
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-			if (e) goto exit;
-
-			cur_samp++;
-
-			/*write sampleGroups info*/
-			if (!samp->IsRAP && ((sei_recovery_frame_count>=0) || sample_has_islice || (sample_rap_type && (sample_rap_type<=SAP_TYPE_3)) ) ) {
-				/*generic GDR*/
-				if (sei_recovery_frame_count > 0) {
-					if (!use_opengop_gdr) use_opengop_gdr = 1;
-					e = gf_isom_set_sample_roll_group(import->dest, track, cur_samp, (s16) sei_recovery_frame_count);
-				}
-				/*open-GOP*/
-				else if (sample_rap_type==SAP_TYPE_3) {
-					if (!min_layer_id && !use_opengop_gdr) use_opengop_gdr = 2;
-					e = gf_isom_set_sample_rap_group(import->dest, track, cur_samp, 0);
-
-					is_rap = GF_TRUE;
-				}
-				if (e) goto exit;
-			}
-
-			//write sample deps
-			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
-				u32 isLeading, dependsOn, dependedOn;
-				isLeading = 0;
-				dependsOn = is_rap ? 2 : 1;
-				dependedOn = sample_is_ref ? 1 : 2;
-
-				e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
-				if (e) goto exit;
-			}
-			sample_is_ref = GF_FALSE;
-
-
-			gf_isom_sample_del(&samp);
-			gf_set_progress("Importing HEVC", (u32) (nal_start/1024), (u32) (total_size/1024) );
-			first_nal = GF_TRUE;
-
-			if (min_poc > last_poc)
-				min_poc = last_poc;
-
-			sample_has_islice = GF_FALSE;
-			sample_has_vps = GF_FALSE;
-			sample_has_sps = GF_FALSE;
-			sei_recovery_frame_count = -1;
-			is_empty_sample = GF_TRUE;
-		}
-
-		if (copy_size) {
-			if (!sample_is_ref) {
-				HEVC_VPS *vps;
-				switch (nal_unit_type) {
-				case GF_HEVC_NALU_SLICE_TRAIL_N:
-				case GF_HEVC_NALU_SLICE_TSA_N:
-				case GF_HEVC_NALU_SLICE_STSA_N:
-				case GF_HEVC_NALU_SLICE_RADL_N:
-				case GF_HEVC_NALU_SLICE_RASL_N:
-				case GF_HEVC_NALU_SLICE_RSV_VCL_N10:
-				case GF_HEVC_NALU_SLICE_RSV_VCL_N12:
-				case GF_HEVC_NALU_SLICE_RSV_VCL_N14:
-					vps = &hevc.vps[hevc.s_info.sps->vps_id];
-					if ((u32) temporal_id + 1 < vps->max_sub_layers) {
-						sample_is_ref = GF_TRUE;
-					}
-					break;
-				default:
-					if (nal_unit_type<GF_HEVC_NALU_VID_PARAM)
-						sample_is_ref = GF_TRUE;
-				}
-			}
-
-			if (is_islice)
-				sample_has_islice = GF_TRUE;
-
-			if ((size_length<32) && ( (u32) (1<<size_length)-1 < copy_size)) {
-				u32 diff_size = 8;
-				while ((size_length<32) && ( (u32) (1<<(size_length+diff_size))-1 < copy_size)) diff_size+=8;
-				/*only 8bits, 16bits and 32 bits*/
-				if (size_length+diff_size == 24) diff_size+=8;
-
-				gf_import_message(import, GF_OK, "Adjusting HEVC SizeLength to %d bits", size_length+diff_size);
-				gf_media_avc_rewrite_samples(import->dest, track, size_length, size_length+diff_size);
-
-				/*rewrite current sample*/
-				if (sample_data) {
-					char *sd;
-					u32 sd_l;
-					GF_BitStream *prev_sd;
-					gf_bs_get_content(sample_data, &sd, &sd_l);
-					gf_bs_del(sample_data);
-					sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-					prev_sd = gf_bs_new(sd, sd_l, GF_BITSTREAM_READ);
-					while (gf_bs_available(prev_sd)) {
-						char *buf;
-						u32 s = gf_bs_read_int(prev_sd, size_length);
-						gf_bs_write_int(sample_data, s, size_length+diff_size);
-						buf = (char*)gf_malloc(sizeof(char)*s);
-						gf_bs_read_data(prev_sd, buf, s);
-						gf_bs_write_data(sample_data, buf, s);
-						gf_free(buf);
-					}
-					gf_bs_del(prev_sd);
-					gf_free(sd);
-				}
-				size_length+=diff_size;
-
-			}
-			if (!sample_data) sample_data = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			gf_bs_write_int(sample_data, copy_size, size_length);
-			gf_bs_write_data(sample_data, buffer, copy_size);
-
-			if (set_subsamples) {
-				/* use the res and priority value of last prefix NALU */
-				gf_isom_add_subsample(import->dest, track, cur_samp+1, 0, copy_size+size_length/8, 0, 0, GF_FALSE);
-			}
-
-			if (has_vcl_nal) {
-				is_empty_sample = GF_FALSE;
-			}
-			layer_ids[layer_id] = 1;
-
-			if ((layer_id == min_layer_id) && is_slice) {
-				slice_is_ref = gf_media_hevc_slice_is_IDR(&hevc);
-				if (slice_is_ref)
-					nb_idr++;
-				slice_force_ref = GF_FALSE;
-
-				/*we only indicate TRUE IDRs for sync samples (cf AVC file format spec).
-				SEI recovery should be used to build sampleToGroup & RollRecovery tables*/
-				if (first_nal) {
-					first_nal = GF_FALSE;
-					if (hevc.sei.recovery_point.valid || (import->flags & GF_IMPORT_FORCE_SYNC)) {
-						Bool bIntraSlice = gf_media_hevc_slice_is_intra(&hevc);
-						sei_recovery_frame_count = hevc.sei.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*/
-						if (!hevc.sei.recovery_point.valid && bIntraSlice) {
-							sei_recovery_frame_count = 0;
-							if (use_opengop_gdr == 1) {
-								use_opengop_gdr = 2; /*avoid message flooding*/
-								GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("[HEVC Import] No valid SEI Recovery Point found although needed - forcing\n"));
-							}
-						}
-						hevc.sei.recovery_point.valid = 0;
-						if (bIntraSlice && (import->flags & GF_IMPORT_FORCE_SYNC) && (sei_recovery_frame_count==0))
-							slice_force_ref = GF_TRUE;
-					}
-					sample_rap_type = RAP_NO;
-					if (gf_media_hevc_slice_is_IDR(&hevc)) {
-						sample_rap_type = SAP_TYPE_1;
-					}
-					else {
-						switch (hevc.s_info.nal_unit_type) {
-						case GF_HEVC_NALU_SLICE_BLA_W_LP:
-						case GF_HEVC_NALU_SLICE_BLA_W_DLP:
-							sample_rap_type = SAP_TYPE_3;
-							break;
-						case GF_HEVC_NALU_SLICE_BLA_N_LP:
-							sample_rap_type = SAP_TYPE_1;
-							break;
-						case GF_HEVC_NALU_SLICE_CRA:
-							sample_rap_type = SAP_TYPE_3;
-							break;
-						}
-					}
-				}
-
-				if (hevc.s_info.poc<poc_shift) {
-					u32 j;
-					if (ref_frame) {
-						for (j=ref_frame; j<=cur_samp; j++) {
-							GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, j, NULL, NULL);
-							if (!samp) break;
-							samp->CTS_Offset += poc_shift;
-							samp->CTS_Offset -= hevc.s_info.poc;
-							gf_isom_modify_cts_offset(import->dest, track, j, samp->CTS_Offset);
-							gf_isom_sample_del(&samp);
-						}
-					}
-					poc_shift = hevc.s_info.poc;
-				}
-
-				/*if #pics, compute smallest POC increase*/
-				if (hevc.s_info.poc != last_poc) {
-					if (!poc_diff || (poc_diff > abs(hevc.s_info.poc-last_poc))) {
-						poc_diff = abs(hevc.s_info.poc - last_poc);/*ideally we would need to start the parsing again as poc_diff helps computing max_total_delay*/
-					}
-					last_poc = hevc.s_info.poc;
-					assert(is_slice);
-				}
-
-				/*ref slice, reset poc*/
-				if (slice_is_ref) {
-					ref_frame = cur_samp+1;
-					max_last_poc = last_poc = max_last_b_poc = 0;
-					poc_shift = 0;
-				}
-				/*forced ref slice*/
-				else if (slice_force_ref) {
-					ref_frame = cur_samp+1;
-					/*adjust POC shift as sample will now be marked as sync, so wo must store poc as if IDR (eg POC=0) for our CTS offset computing to be correct*/
-					poc_shift = hevc.s_info.poc;
-				}
-				/*strictly less - this is a new P slice*/
-				else if (max_last_poc<last_poc) {
-					max_last_b_poc = 0;
-					//prev_last_poc = max_last_poc;
-					max_last_poc = last_poc;
-				}
-				/*stricly greater*/
-				else if (max_last_poc>last_poc) {
-					/*need to store TS offsets*/
-					has_cts_offset = GF_TRUE;
-					switch (hevc.s_info.slice_type) {
-					case GF_AVC_TYPE_B:
-					case GF_AVC_TYPE2_B:
-						if (!max_last_b_poc) {
-							max_last_b_poc = last_poc;
-						}
-						/*if same poc than last max, this is a B-slice*/
-						else if (last_poc>max_last_b_poc) {
-							max_last_b_poc = last_poc;
-						}
-						/*otherwise we had a B-slice reference: do nothing*/
-
-						break;
-					}
-				}
-
-				/*compute max delay (applicable when B slice are present)*/
-				if (ref_frame && poc_diff && (s32)(cur_samp-(ref_frame-1)-last_poc/poc_diff)>(s32)max_total_delay) {
-					max_total_delay = cur_samp - (ref_frame-1) - last_poc/poc_diff;
-				}
-			}
-		}
-
-next_nal:
-		gf_bs_align(bs);
-		nal_end = gf_bs_get_position(bs);
-		assert(nal_start <= nal_end);
-		assert(nal_end <= nal_start + nal_and_trailing_size);
-		if (nal_end != nal_start + nal_and_trailing_size)
-			gf_bs_seek(bs, nal_start + nal_and_trailing_size);
-
-		if (!gf_bs_available(bs)) break;
-		if (duration && (dts_inc*cur_samp > duration)) break;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-
-		/*consume next start code*/
-		nal_start = gf_media_nalu_next_start_code_bs(bs);
-		if (nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[hevc] invalid nal_size (%u)? Skipping "LLU" bytes to reach next start code\n", nal_size, nal_start));
-			gf_bs_skip_bytes(bs, nal_start);
-		}
-		nal_start = gf_media_nalu_is_start_code(bs);
-		if (!nal_start) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[hevc] error: no start code found ("LLU" bytes read out of "LLU") - leaving\n", gf_bs_get_position(bs), gf_bs_get_size(bs)));
-			break;
-		}
-		nal_start = gf_bs_get_position(bs);
-	}
-
-	/*final flush*/
-	if (sample_data) {
-		GF_ISOSample *samp = gf_isom_sample_new();
-		samp->DTS = (u64)dts_inc*cur_samp;
-		samp->IsRAP = (sample_rap_type == SAP_TYPE_1) ? RAP : RAP_NO;
-		if (!sample_rap_type && sample_has_islice && (import->flags & GF_IMPORT_FORCE_SYNC)) {
-			samp->IsRAP = RAP;
-		}
-		/*we store the frame order (based on the POC) as the CTS offset and update the whole table at the end*/
-		samp->CTS_Offset = last_poc - poc_shift;
-		gf_bs_get_content(sample_data, &samp->data, &samp->dataLength);
-		gf_bs_del(sample_data);
-		sample_data = NULL;
-		e = gf_isom_add_sample(import->dest, track, di, samp);
-		if (e) goto exit;
-
-		gf_isom_sample_del(&samp);
-		gf_set_progress("Importing HEVC", (u32) cur_samp, cur_samp+1);
-		cur_samp++;
-
-		//write sample deps
-		if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
-			u32 isLeading, dependsOn, dependedOn;
-			isLeading = 0;
-			dependsOn = (sample_rap_type && (sample_rap_type <= SAP_TYPE_3)) ? 2 : 1;
-			dependedOn = sample_is_ref ? 1 : 2;
-
-			e = gf_isom_sample_set_dep_info(import->dest, track, cur_samp, isLeading, dependsOn, dependedOn, 2);
-			if (e) goto exit;
-		}
-		sample_is_ref = GF_FALSE;
-	}
-
-
-	/*recompute all CTS offsets*/
-	if (has_cts_offset) {
-		u32 last_cts_samp;
-		u64 last_dts, max_cts, min_cts, min_cts_offset;
-		if (!poc_diff) poc_diff = 1;
-		/*no b-frame references, no need to cope with negative poc*/
-		if (!max_total_delay) {
-			min_poc=0;
-			max_total_delay = 1;
-		}
-		cur_samp = gf_isom_get_sample_count(import->dest, track);
-		min_poc *= -1;
-		last_dts = 0;
-		max_cts = 0;
-		min_cts = (u64) -1;
-		min_cts_offset = (u64) -1;
-		last_cts_samp = 0;
-
-		for (i=0; i<cur_samp; i++) {
-			u64 cts;
-			/*not using descIdx and data_offset will only fetch DTS, CTS and RAP which is all we need*/
-			GF_ISOSample *samp = gf_isom_get_sample_info(import->dest, track, i+1, NULL, NULL);
-			/*poc re-init (RAP and POC to 0, otherwise that's SEI recovery), update base DTS*/
-			if (samp->IsRAP /*&& !samp->CTS_Offset*/)
-				last_dts = samp->DTS * (1+is_paff);
-
-			/*CTS offset is frame POC (refers to last IDR)*/
-			cts = (min_poc + (s32) samp->CTS_Offset) * dts_inc/poc_diff + (u32) last_dts;
-
-			/*if PAFF, 2 pictures (eg poc) <=> 1 aggregated frame (eg sample), divide by 2*/
-			if (is_paff) {
-				cts /= 2;
-				/*in some cases the poc is not on the top field - if that is the case, round up*/
-				if (cts%dts_inc) {
-					cts = ((cts/dts_inc)+1)*dts_inc;
-				}
-			}
-
-			/*B-frames offset*/
-			cts += (u32) (max_total_delay*dts_inc);
-
-			samp->CTS_Offset = (u32) (cts - samp->DTS);
-
-			if (samp->CTS_Offset < min_cts_offset)
-				min_cts_offset = samp->CTS_Offset;
-
-			if (max_cts < samp->DTS + samp->CTS_Offset) {
-				max_cts = samp->DTS + samp->CTS_Offset;
-				last_cts_samp = i;
-			}
-			if (min_cts > samp->DTS + samp->CTS_Offset) {
-				min_cts = samp->DTS + samp->CTS_Offset;
-			}
-
-			/*this should never happen, however some streams seem to do weird POC increases (cf sorenson streams, last 2 frames),
-			this should hopefully take care of some bugs and ensure proper CTS...*/
-			if ((s32)samp->CTS_Offset<0) {
-				u32 j, k;
-				samp->CTS_Offset = 0;
-				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
-				for (j=last_cts_samp; j<i; j++) {
-					GF_ISOSample *asamp = gf_isom_get_sample_info(import->dest, track, j+1, NULL, NULL);
-					for (k=j+1; k<=i; k++) {
-						GF_ISOSample *bsamp = gf_isom_get_sample_info(import->dest, track, k+1, NULL, NULL);
-						if (asamp->CTS_Offset+asamp->DTS==bsamp->CTS_Offset+bsamp->DTS) {
-							max_cts += dts_inc;
-							bsamp->CTS_Offset = (u32) (max_cts - bsamp->DTS);
-							gf_isom_modify_cts_offset(import->dest, track, k+1, bsamp->CTS_Offset);
-						}
-						gf_isom_sample_del(&bsamp);
-					}
-					gf_isom_sample_del(&asamp);
-				}
-				max_cts = samp->DTS + samp->CTS_Offset;
-			} else {
-				gf_isom_modify_cts_offset(import->dest, track, i+1, samp->CTS_Offset);
-			}
-			gf_isom_sample_del(&samp);
-		}
-		if (min_cts_offset > 0) {
-			gf_isom_shift_cts_offset(import->dest, track, (s32)min_cts_offset);
-			max_cts -= min_cts_offset;
-			min_cts -= min_cts_offset;
-		}
-		/*and repack table*/
-		gf_isom_set_cts_packing(import->dest, track, GF_FALSE);
-
-		if (!(import->flags & GF_IMPORT_NO_EDIT_LIST) && min_cts) {
-			last_dts = max_cts - min_cts + gf_isom_get_sample_duration(import->dest, track, gf_isom_get_sample_count(import->dest, track) );
-			last_dts *= gf_isom_get_timescale(import->dest);
-			last_dts /= gf_isom_get_media_timescale(import->dest, track);
-			gf_isom_set_edit_segment(import->dest, track, 0, last_dts, min_cts, GF_ISOM_EDIT_NORMAL);
-		}
-	} else {
-		gf_isom_remove_cts_info(import->dest, track);
-	}
-
-	gf_set_progress("Importing HEVC", (u32) cur_samp, cur_samp);
-
-	hevc_cfg->nal_unit_size = lhvc_cfg->nal_unit_size = size_length/8;
-
-
-	//LHVC bitstream with external base layer
-	if (min_layer_id != 0) {
-		gf_isom_set_visual_info(import->dest, track, di, max_w, max_h);
-		//Because layer_id of vps is 0, we need to clone vps from hevc_cfg to lhvc_cfg first
-		for (i = 0; i < gf_list_count(hevc_cfg->param_array); i++) {
-			u32 j, k, count2;
-			GF_HEVCParamArray *s_ar = NULL;
-			GF_HEVCParamArray *ar = gf_list_get(hevc_cfg->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_AVCConfigSlot *sl2;
-				u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
-				if (layer_id) continue;
-
-				for (k=0; k < gf_list_count(lhvc_cfg->param_array); k++) {
-					s_ar = gf_list_get(lhvc_cfg->param_array, k);
-					if (s_ar->type==GF_HEVC_NALU_VID_PARAM)
-						break;
-					s_ar = NULL;
-				}
-				if (!s_ar) {
-					GF_SAFEALLOC(s_ar, GF_HEVCParamArray);
-					s_ar->nalus = gf_list_new();
-					s_ar->type = GF_HEVC_NALU_VID_PARAM;
-					gf_list_insert(lhvc_cfg->param_array, s_ar, 0);
-				}
-				s_ar->array_completeness = ar->array_completeness;
-
-				GF_SAFEALLOC(sl2, GF_AVCConfigSlot);
-				sl2->data = gf_malloc(sl->size);
-				memcpy(sl2->data, sl->data, sl->size);
-				sl2->id = sl->id;
-				sl2->size = sl->size;
-				gf_list_add(s_ar->nalus, sl2);
-			}
-		}
-		hevc_set_parall_type(lhvc_cfg);
-		//must use LHV1/LHC1 since no base HEVC in the track
-		gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_ONLY);
-	}
-	//HEVC with optional lhvc
-	else {
-		gf_isom_set_visual_info(import->dest, track, di, max_w_b, max_h_b);
-		hevc_set_parall_type(hevc_cfg);
-		gf_isom_hevc_config_update(import->dest, track, 1, hevc_cfg);
-
-		if (has_lhvc) {
-			hevc_set_parall_type(lhvc_cfg);
-
-			lhvc_cfg->avgFrameRate = hevc_cfg->avgFrameRate;
-			lhvc_cfg->constantFrameRate = hevc_cfg->constantFrameRate;
-			lhvc_cfg->numTemporalLayers = hevc_cfg->numTemporalLayers;
-			lhvc_cfg->temporalIdNested = hevc_cfg->temporalIdNested;
-
-			if (import->flags&GF_IMPORT_SVC_EXPLICIT) {
-				gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_WITH_BASE);
-				gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_HVCE, 1);
-			} else {
-				gf_isom_lhvc_config_update(import->dest, track, 1, lhvc_cfg, GF_ISOM_LEHVC_WITH_BASE_BACKWARD);
-			}
-		}
-	}
-
-	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-		gf_isom_hevc_set_inband_config(import->dest, track, 1);
-	}
-
-	if (import->flags & GF_IMPORT_USE_CCST) {
-		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
-		if (e) goto exit;
-	}
-	if (import->is_alpha) {
-		e = gf_isom_set_image_sequence_alpha(import->dest, track, di, GF_FALSE);
-		if (e) goto exit;
-	}
-
-	e = gf_media_update_par(import->dest, track);
-	if (e) goto exit;
-	{
-		/*arbitrary: use the last active SPS*/
-		if (hevc.sps[hevc.sps_active_idx].colour_description_present_flag) {
-			e = gf_isom_set_visual_color_info(import->dest, track, di, GF_ISOM_SUBTYPE_NCLX, hevc.sps[hevc.sps_active_idx].colour_primaries, hevc.sps[hevc.sps_active_idx].transfer_characteristic, hevc.sps[hevc.sps_active_idx].matrix_coeffs, hevc.sps[hevc.sps_active_idx].video_full_range_flag, NULL, 0);
-			if (e) goto exit;
-		}
-	}
-	gf_media_update_bitrate(import->dest, track);
-
-	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_ISO4, 1);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISOM, 0);
-
-	if (!vpss && !ppss && !spss) {
-		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
-	} else {
-		if (nb_sp || nb_si) {
-			gf_import_message(import, GF_OK, "HEVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B %d SP %d SI - %d SEI - %d IDR",
-			                  cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sp, nb_si, nb_sei, nb_idr);
-		} else {
-			gf_import_message(import, GF_OK, "HEVC Import results: %d samples (%d NALUs) - Slices: %d I %d P %d B - %d SEI - %d IDR",
-			                  cur_samp, nb_nalus, nb_i, nb_p, nb_b, nb_sei, nb_idr);
-		}
-
-		if (max_total_delay>1) {
-			gf_import_message(import, GF_OK, "Stream uses forward prediction - stream CTS offset: %d frames", max_total_delay);
-		}
-	}
-
-	if (use_opengop_gdr==2) {
-		gf_import_message(import, GF_OK, "OpenGOP detected - adjusting file brand");
-		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISO6, 1);
-	}
-
-	/*rewrite ESD*/
-	if (import->esd) {
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->predefined = 2;
-		import->esd->slConfig->timestampResolution = timescale;
-		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
-		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track, 1);
-		gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
-	}
-
-	//base layer (i.e layer with layer_id = 0) not found in bitstream
-	//we are importing an LHVC bitstream with external base layer
-	//find this base layer with the imported tracks.
-	//if we find more than one HEVC/AVC track, return an warning
-	if (min_layer_id != 0) {
-		u32 avc_base_track, ref_track_id;
-		avc_base_track = hevc_base_track = 0;
-		for (i = 1; i <= gf_isom_get_track_count(import->dest); i++) {
-			u32 subtype = gf_isom_get_media_subtype(import->dest, i, 1);
-			switch (subtype) {
-			case GF_ISOM_SUBTYPE_AVC_H264:
-			case GF_ISOM_SUBTYPE_AVC2_H264:
-			case GF_ISOM_SUBTYPE_AVC3_H264:
-			case GF_ISOM_SUBTYPE_AVC4_H264:
-				if (!avc_base_track) {
-					avc_base_track = i;
-				} else {
-					gf_import_message(import, GF_BAD_PARAM, "Warning: More than one AVC bitstream found, use track %d as base layer", avc_base_track);
-				}
-				break;
-			case GF_ISOM_SUBTYPE_HVC1:
-			case GF_ISOM_SUBTYPE_HEV1:
-			case GF_ISOM_SUBTYPE_HVC2:
-			case GF_ISOM_SUBTYPE_HEV2:
-				if (!hevc_base_track) {
-					hevc_base_track = i;
-					if (avc_base_track) {
-						gf_import_message(import, GF_BAD_PARAM, "Warning: Found both AVC and HEVC tracks, using HEVC track %d as base layer", hevc_base_track);
-					}
-				} else {
-					gf_import_message(import, GF_BAD_PARAM, "Warning: More than one HEVC bitstream found, use track %d as base layer", avc_base_track);
-				}
-				break;
-			}
-		}
-		if (!hevc_base_track && !avc_base_track) {
-			gf_import_message(import, GF_BAD_PARAM, "Using LHVC external base layer, but no base layer not found - NOT SETTING SBAS TRACK REFERENCE!");
-		} else {
-			ref_track_id = gf_isom_get_track_id(import->dest, hevc_base_track ? hevc_base_track : avc_base_track);
-			gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_BASE, ref_track_id);
-		}
-	}
-
-	// This is a L-HEVC bitstream, add linf/cstg. If we have a base HEVC with several temporal sublayers, we don't set linf until we split
-	//the sublayers in different tracks
-	if (has_lhvc && (cur_vps_id >= 0) && (cur_vps_id < 16) && (hevc.vps[cur_vps_id].max_layers > 1) ) {
-		gf_lhevc_set_operating_points_information(import->dest, hevc_base_track, track, &hevc.vps[cur_vps_id], max_temporal_id);
-		gf_lhevc_set_layer_information(import->dest, track, &linf[0]);
-
-		//sets track in group of type group_type and id track_group_id. If do_add is GF_FALSE, track is removed from that group
-		e = gf_isom_set_track_group(import->dest, track, 1000+gf_isom_get_track_id(import->dest, track), GF_ISOM_BOX_TYPE_CSTG, GF_TRUE);
-
-	}
-
-exit:
-	if (sample_data) gf_bs_del(sample_data);
-	gf_odf_hevc_cfg_del(hevc_cfg);
-	gf_odf_hevc_cfg_del(lhvc_cfg);
-	gf_free(buffer);
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-#endif //GPAC_DISABLE_HEVC
-}
-
-void av1_reset_frame_state(AV1StateFrame *frame_state) {
-	if (frame_state->header_obus) {
-		while (gf_list_count(frame_state->header_obus)) {
-			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(frame_state->header_obus, 0);
-			if (a->obu) gf_free(a->obu);
-			gf_list_rem(frame_state->header_obus, 0);
-			gf_free(a);
-		}
-		gf_list_del(frame_state->header_obus);
-	}
-
-	if (frame_state->frame_obus) {
-		while (gf_list_count(frame_state->frame_obus)) {
-			GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(frame_state->frame_obus, 0);
-			if (a->obu) gf_free(a->obu);
-			gf_list_rem(frame_state->frame_obus, 0);
-			gf_free(a);
-		}
-		gf_list_del(frame_state->frame_obus);
-	}
-
-	memset(frame_state, 0, sizeof(AV1StateFrame));
-	frame_state->is_first_frame = GF_TRUE;
-}
-
-static Bool probe_webm_matrovska(GF_BitStream *bs)
-{
-	char probe[64], *found = NULL;
-	u64 pos = gf_bs_get_position(bs);
-	u32 read = gf_bs_read_data(bs, probe, sizeof(probe) - 1);
-	gf_bs_seek(bs, pos);
-	probe[read] = 0;
-	found = strstr(probe, "webm");
-	if (found) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("AV1: guessed unsupported WebM container. Aborting.\n"));
-		return GF_TRUE;
-	}
-	found = strstr(probe, "matroska");
-	if (found) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("AV1: guessed unsupported Matrovska container. Aborting.\n"));
-		return GF_TRUE;
-	}
-
-	return GF_FALSE;
-}
-
-static const char* av1_get_bs_syntax_name(GF_Err(*av1_bs_syntax)(GF_BitStream*, AV1State*))
-{
-	if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_section5) {
-		return "OBU section 5";
-	} else if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_annexb) {
-		return "AnnexB";
-	} else if (av1_bs_syntax == aom_av1_parse_temporal_unit_from_ivf) {
-		return "IVF";
-	} else {
-		assert(0);
-		return "Unknown";
-	}
-}
-
-static GF_Err gf_import_aom_av1(GF_MediaImporter *import)
-{
-#ifdef GPAC_DISABLE_AV1
-	return GF_NOT_SUPPORTED;
-#else
-	GF_Err e = GF_OK;
-	GF_AV1Config *av1_cfg = NULL;
-	AV1State state;
-	FILE *mdia = NULL;
-	GF_BitStream *bs = NULL;
-	u32 timescale = 0, dts_inc = 0, track_num = 0, track_id = 0, di = 0, cur_samp = 0;
-	Bool detect_fps;
-	Double FPS = 0.0;
-	u64 fsize, pos = 0;
-	GF_Err (*parse_temporal_unit)(GF_BitStream*, AV1State*) = NULL;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
-		return GF_OK;
-	}
-
-	memset(&state, 0, sizeof(AV1State));
-	av1_cfg = gf_odf_av1_cfg_new();
-	state.config = av1_cfg;
-	if (import->flags & GF_IMPORT_KEEP_AV1_TEMPORAL_OBU)
-		state.keep_temporal_delim = GF_TRUE;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "AV1: cannot find file %s", import->in_name);
-
-	detect_fps = GF_TRUE;
-	FPS = (Double)import->video_fps;
-	if (!FPS) {
-		FPS = GF_IMPORT_DEFAULT_FPS;
-	} else {
-		if (import->video_fps == GF_IMPORT_AUTO_FPS) {
-			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection in h264*/
-		} else {
-			/*fps is forced by the caller*/
-			detect_fps = GF_FALSE;
-		}
-	}
-	get_video_timing(FPS, &timescale, &dts_inc);
-
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	fsize = gf_bs_get_size(bs);
-	if (!fsize) {
-		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[AV1] Error: bitstream size is 0 byte", import->in_name);
-		goto exit;
-	}
-
-	if (probe_webm_matrovska(bs))
-		goto exit;
-
-	if (import->streamFormat) {
-		gf_import_message(import, GF_OK, "AV1: forcing format \"%s\".", import->streamFormat);
-		if (!stricmp(import->streamFormat, "obu")) {
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_section5;
-		} else if (!stricmp(import->streamFormat, "annexB")) {
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_annexb;
-		} else if (!stricmp(import->streamFormat, "ivf")) {
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_ivf;
-		} else {
-			gf_import_message(import, GF_NOT_SUPPORTED, "AV1: unknown bitstream format \"%s\" found. Only \"obu\", \"annexB\" and \"ivf\" found.", import->streamFormat);
-			goto exit;
-		}
-	} else {
-		if (gf_media_probe_ivf(bs)) {
-			e = gf_media_aom_parse_ivf_file_header(bs, &state);
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_ivf;
-
-			if (detect_fps && (state.FPS != FPS)) {
-				import->video_fps = FPS = state.FPS;
-				get_video_timing(FPS, &timescale, &dts_inc);
-			}
-			pos = gf_bs_get_position(bs);
-		} else if (gf_media_aom_probe_annexb(bs)) {
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_annexb;
-		} else {
-			gf_bs_seek(bs, pos);
-			e = aom_av1_parse_temporal_unit_from_section5(bs, &state);
-			if (e) {
-				gf_import_message(import, GF_NOT_SUPPORTED, "AV1: couldn't guess bitstream format (IVF then Annex B then Section 5 tested).");
-				goto exit;
-			}
-			parse_temporal_unit = aom_av1_parse_temporal_unit_from_section5;
-		}
-	}
-	gf_bs_seek(bs, pos);
-
-	track_id = 0;
-	if (import->esd) track_id = import->esd->ESID;
-	track_num = gf_isom_new_track(import->dest, track_id, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track_num) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track_num, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track_num);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track_num);
-	if (import->esd && import->esd->dependsOnESID) {
-		gf_isom_set_track_reference(import->dest, track_num, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
-	}
-
-	while (gf_bs_available(bs)) {
-		av1_reset_frame_state(&state.frame_state);
-		pos = gf_bs_get_position(bs);
-
-		/*we process each TU and extract only the necessary OBUs*/
-		if (parse_temporal_unit(bs, &state) != GF_OK) {
-			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing %s", av1_get_bs_syntax_name(parse_temporal_unit));
-			goto exit;
-		}
-
-		/*add sample*/
-		{
-			u32 frame_obus_idx = 0;
-			GF_ISOSample *samp = gf_isom_sample_new();
-			samp->DTS = (u64)dts_inc*cur_samp;
-			samp->IsRAP = state.frame_state.key_frame ? SAP_TYPE_1 : 0;
-			samp->CTS_Offset = 0;
-
-			for (frame_obus_idx = 0; frame_obus_idx < gf_list_count(state.frame_state.frame_obus); ++frame_obus_idx)
-				samp->dataLength += (u32)((GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.frame_obus, frame_obus_idx))->obu_length;
-			samp->data = gf_malloc(samp->dataLength);
-
-			samp->dataLength = 0;
-			while (gf_list_count(state.frame_state.frame_obus)) {
-				GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.frame_obus, 0);
-				if (a->obu) {
-					memcpy(samp->data + samp->dataLength, a->obu, (size_t)a->obu_length);
-					samp->dataLength += (u32)a->obu_length;
-					gf_free(a->obu);
-				}
-				gf_list_rem(state.frame_state.frame_obus, 0);
-				gf_free(a);
-			}
-
-			if (cur_samp == 0) {
-				while (gf_list_count(state.frame_state.header_obus)) {
-					GF_AV1_OBUArrayEntry *a = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.header_obus, 0);
-					gf_list_add(av1_cfg->obu_array, a);
-					gf_list_rem(state.frame_state.header_obus, 0);
-				}
-
-				e = gf_isom_av1_config_new(import->dest, track_num, av1_cfg, NULL, NULL, &di);
-				if (e) goto exit;
-
-				gf_import_message(import, GF_OK, "Importing AV1 from %s file - size %dx%d bit-depth %d FPS %d/%d", av1_get_bs_syntax_name(parse_temporal_unit), state.width, state.height, state.bit_depth, timescale, dts_inc);
-
-			} else {
-				/*safety check: we only support static metadata*/
-				if (gf_list_count(state.frame_state.header_obus) > gf_list_count(av1_cfg->obu_array)) {
-					gf_import_message(import, GF_NOT_SUPPORTED, "More header OBUs in frame state than in config");
-					goto exit;
-				}
-
-				while (gf_list_count(state.frame_state.header_obus)) {
-					u32 obu_array_index = 0;
-					GF_AV1_OBUArrayEntry *a_hdr = (GF_AV1_OBUArrayEntry*)gf_list_get(state.frame_state.header_obus, 0);
-					for (obu_array_index = 0; obu_array_index < gf_list_count(av1_cfg->obu_array); ++obu_array_index) {
-						GF_AV1_OBUArrayEntry *a_cfg = (GF_AV1_OBUArrayEntry*)gf_list_get(av1_cfg->obu_array, obu_array_index);
-						if (a_cfg->obu_type == a_hdr->obu_type) {
-							if (a_cfg->obu_length != a_hdr->obu_length || memcmp(a_cfg->obu, a_hdr->obu, (size_t)a_hdr->obu_length)) {
-								gf_import_message(import, GF_NOT_SUPPORTED, "Changing AV1 header OBUs detected for file %s", import->in_name);
-								goto exit;
-							}
-						}
-					}
-					gf_list_rem(state.frame_state.header_obus, 0);
-					if (a_hdr->obu) gf_free(a_hdr->obu);
-					gf_free(a_hdr);
-				}
-
-			}
-
-			e = gf_isom_add_sample(import->dest, track_num, di, samp);
-			if (e) goto exit;
-			cur_samp++;
-
-			//write sample deps
-			if (import->flags & GF_IMPORT_SAMPLE_DEPS) {
-				u32 isLeading, dependsOn, dependedOn, hasRedundant;
-				isLeading = 0;
-				dependsOn = samp->IsRAP ? 2 : 1;
-				dependedOn = state.frame_state.refresh_frame_flags ? 1 : 2;
-				hasRedundant = 0;
-
-				e = gf_isom_sample_set_dep_info(import->dest, track_num, cur_samp, isLeading, dependsOn, dependedOn, hasRedundant);
-				if (e) goto exit;
-			}
-
-			gf_isom_sample_del(&samp);
-
-			gf_set_progress("Importing AV1", gf_bs_get_position(bs), fsize);
-		}
-	}
-
-	gf_set_progress("Importing AV1", (u32)cur_samp, cur_samp);
-	e = gf_isom_set_visual_info(import->dest, track_num, di, state.width, state.height);
-	if (e) goto exit;
-	e = gf_media_update_par(import->dest, track_num);
-	if (e) goto exit;
-
-	e = gf_isom_set_visual_color_info(import->dest, track_num, di, GF_ISOM_SUBTYPE_NCLX, state.color_primaries, state.transfer_characteristics, state.matrix_coefficients, state.color_range, NULL, 0);
-	if (e) goto exit;
-
-	gf_media_update_bitrate(import->dest, track_num);
-	if (import->flags & GF_IMPORT_USE_CCST) {
-		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track_num, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
-		if (e) goto exit;
-	}
-	if (import->is_alpha) {
-		e = gf_isom_set_image_sequence_alpha(import->dest, track_num, di, GF_FALSE);
-		if (e) goto exit;
-	}
-
-	/*rewrite ESD*/
-	if (import->esd) {
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*)gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->predefined = 2;
-		import->esd->slConfig->timestampResolution = timescale;
-		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
-		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track_num, 1);
-		gf_isom_change_mpeg4_description(import->dest, track_num, 1, import->esd);
-	}
-
-	gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_ISO4, 1);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISOM, 0);
-	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_AV01, 1);
-
-exit:
-	av1_reset_frame_state(&state.frame_state);
-	gf_odf_av1_cfg_del(av1_cfg);
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-#endif /*GPAC_DISABLE_AV1*/
-}
-
-
-static GF_Err gf_import_vp9(GF_MediaImporter *import)
-{
-#ifdef GPAC_DISABLE_VP9
-	return GF_NOT_SUPPORTED;
-#else
-	GF_Err e = GF_OK;
-	GF_VPConfig *vp9_cfg = NULL;
-	FILE *mdia = NULL;
-	GF_BitStream *bs = NULL;
-	u32 timescale = 0, dts_inc = 0, track_num = 0, track_id = 0, di = 0, cur_samp = 0, codec_fourcc = 0, num_frames = 0;
-	int width = 0, height = 0, renderWidth, renderHeight;
-	Double FPS = 0.0;
-	u64 pos = 0, fsize = 0;
-	Bool forced_fps = GF_FALSE;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 1;
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_VISUAL;
-		import->tk_info[0].flags = GF_IMPORT_OVERRIDE_FPS | GF_IMPORT_FORCE_PACKED;
-		return GF_OK;
-	}
-
-	vp9_cfg = gf_odf_vp_cfg_new();
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "[VP9] cannot find file %s", import->in_name);
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-	fsize = gf_bs_get_size(bs);
-	if (!fsize) {
-		gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error: bitstream size is 0 byte", import->in_name);
-		goto exit;
-	}
-
-	if (probe_webm_matrovska(bs))
-		goto exit;
-
-	e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &timescale, &dts_inc, &num_frames);
-	if (e)
-		goto exit;
-
-	FPS = (Double)import->video_fps;
-	if (!FPS || import->video_fps == GF_IMPORT_AUTO_FPS) {
-		FPS = (double)timescale / dts_inc;
-	} else {
-		/*fps is forced by the caller*/
-		get_video_timing(FPS, &timescale, &dts_inc);
-		forced_fps = GF_TRUE;
-	}
-
-	track_id = 0;
-	if (import->esd) track_id = import->esd->ESID;
-	track_num = gf_isom_new_track(import->dest, track_id, GF_ISOM_MEDIA_VISUAL, timescale);
-	if (!track_num) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track_num, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track_num);
-	import->final_trackID = gf_isom_get_track_id(import->dest, track_num);
-	if (import->esd && import->esd->dependsOnESID) {
-		gf_isom_set_track_reference(import->dest, track_num, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
-	}
-
-	while (gf_bs_available(bs)) {
-		Bool key_frame = GF_FALSE;
-		u64 frame_size = 0, pts = 0;
-		int num_frames_in_superframe = 0, superframe_index_size = 0, i = 0;
-		u32 frame_sizes[VP9_MAX_FRAMES_IN_SUPERFRAME];
-
-		GF_Err e = gf_media_parse_ivf_frame_header(bs, &frame_size, &pts);
-		if (e) goto exit;
-
-		pos = gf_bs_get_position(bs);
-		if (gf_bs_available(bs) < frame_size) {
-			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] IVF frame size is %u but there is only "LLU" bytes left.", frame_size, gf_bs_available(bs));
-			goto exit;
-		}
-
-		/*check if it is a superframe*/
-		if (vp9_parse_superframe(bs, frame_size, &num_frames_in_superframe, frame_sizes, &superframe_index_size) != GF_OK) {
-			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error parsing sample %u superframe structure", cur_samp);
-			goto exit;
-		}
-
-		for (i = 0; i < num_frames_in_superframe; ++i) {
-			u64 pos2 = gf_bs_get_position(bs);
-			if (vp9_parse_sample(bs, vp9_cfg, &key_frame, &width, &height, &renderWidth, &renderHeight) != GF_OK) {
-				gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Error parsing sample %u", cur_samp);
-				goto exit;
-			}
-			e = gf_bs_seek(bs, pos2 + frame_sizes[i]);
-			if (e) {
-				gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Seek bad param (offset "LLU") at sample %u (1)", pos2 + frame_sizes[i], cur_samp);
-				goto exit;
-			}
-		}
-		if (gf_bs_get_position(bs) + superframe_index_size != pos + frame_size) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[VP9] Inconsistent IVF frame size of "LLU" bytes at sample %u.\n", frame_size, cur_samp));
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("      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_CONTAINER, ("         superframe %d, size is %u bytes\n", i, frame_sizes[i]));
-			}
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("\n"));
-		}
-		e = gf_bs_seek(bs, pos + frame_size);
-		if (e) {
-			gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "[VP9] Seek bad param (offset "LLU") at sample %u (2)", pos + frame_size, cur_samp);
-			goto exit;
-		}
-
-		/*add sample*/
-		{
-			GF_ISOSample *samp = gf_isom_sample_new();
-			samp->DTS = forced_fps ? (u64)dts_inc*cur_samp : pts;
-			samp->IsRAP = key_frame ? SAP_TYPE_1 : 0;
-			samp->CTS_Offset = 0;
-			samp->dataLength = (u32)(gf_bs_get_position(bs) - pos);
-			assert(samp->dataLength == frame_size);
-			samp->data = gf_malloc(samp->dataLength);
-			gf_bs_seek(bs, pos);
-			gf_bs_read_data(bs, samp->data, samp->dataLength);
-
-			if (cur_samp == 0) {
-				e = gf_isom_vp_config_new(import->dest, track_num, vp9_cfg, NULL, NULL, &di, GF_TRUE);
-				if (e) goto exit;
-			}
-
-			e = gf_isom_add_sample(import->dest, track_num, di, samp);
-			if (e) goto exit;
-
-			gf_isom_sample_del(&samp);
-
-			gf_set_progress("Importing VP9", gf_bs_get_position(bs), fsize);
-			cur_samp++;
-		}
-	}
-
-	gf_set_progress("Importing VP9", cur_samp, cur_samp);
-	e = gf_isom_set_visual_info(import->dest, track_num, di, width, height);
-#if 0 //TODO: find streams when this happens in render_size()
-	if (width != renderWidth) {
-		e = gf_isom_set_pixel_aspect_ratio(import->dest, track_num, di, , );
-		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[VP9] Error setting aspect ratio (%d:%d) with resolution %dx%d\n", xxx, yyy, width, height));
-		}
-	}
-#endif
-
-	e = gf_isom_set_track_layout_info(import->dest, track_num, renderWidth << 16, renderHeight << 16, 0, 0, 0);
-	if (e) goto exit;
-
-	gf_media_update_bitrate(import->dest, track_num);
-
-	if (import->flags & GF_IMPORT_USE_CCST) {
-		e = gf_isom_set_image_sequence_coding_constraints(import->dest, track_num, di, GF_FALSE, GF_FALSE, GF_TRUE, 15);
-		if (e) goto exit;
-	}
-	if (import->is_alpha) {
-		e = gf_isom_set_image_sequence_alpha(import->dest, track_num, di, GF_FALSE);
-		if (e) goto exit;
-	}
-
-	/*rewrite ESD*/
-	if (import->esd) {
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig*)gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->predefined = 2;
-		import->esd->slConfig->timestampResolution = timescale;
-		if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
-		import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track_num, 1);
-		gf_isom_change_mpeg4_description(import->dest, track_num, 1, import->esd);
-	}
-
-exit:
-	gf_odf_vp_cfg_del(vp9_cfg);
-	gf_bs_del(bs);
-	gf_fclose(mdia);
-	return e;
-#endif /*GPAC_DISABLE_VP9*/
-}
-
-static GF_Err gf_import_ivf(GF_MediaImporter *import)
-{
-	GF_Err e = GF_OK;
-	int width = 0, height = 0;
-	u32 codec_fourcc = 0, frame_rate = 0, time_scale = 0, num_frames = 0;
-	FILE *mdia = NULL;
-	GF_BitStream *bs = NULL;
-
-	mdia = gf_fopen(import->in_name, "rb");
-	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
-	bs = gf_bs_from_file(mdia, GF_BITSTREAM_READ);
-
-	e = gf_media_parse_ivf_file_header(bs, &width, &height, &codec_fourcc, &frame_rate, &time_scale, &num_frames);
-	gf_fclose(mdia);
-	gf_bs_del(bs);
-	if (e)
-		return e;
-
-	switch (codec_fourcc) {
-	case GF_4CC('A', 'V', '0', '1'):
-		return gf_import_aom_av1(import);
-	case GF_4CC('V', 'P', '9', '0'):
-		return gf_import_vp9(import);
-	default: {
-		char *FourCC = (char*)&codec_fourcc;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[IVF] Wrong codec FourCC. Only 'AV01' supported, got '%c%c%c%c'\n", FourCC[3], FourCC[2], FourCC[1], FourCC[0]));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	}
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-#ifndef GPAC_DISABLE_OGG
-
-#define OGG_BUFFER_SIZE 4096
-
-Bool OGG_ReadPage(FILE *f_in, ogg_sync_state *oy, ogg_page *oggpage)
-{
-	if (feof(f_in)) return GF_FALSE;
-	while (ogg_sync_pageout(oy, oggpage ) != 1 ) {
-		char *buffer;
-		if (feof(f_in)) return GF_TRUE;
-		buffer = ogg_sync_buffer(oy, OGG_BUFFER_SIZE);
-		u32 bytes = (u32) fread(buffer, sizeof(char), OGG_BUFFER_SIZE, f_in);
-		if (ogg_sync_wrote(oy, bytes)) return GF_FALSE;
-	}
-	return GF_TRUE;
-}
-
-static u32 get_ogg_serial_no_for_stream(char *fileName, u32 stream_num, Bool is_video)
-{
-	ogg_sync_state oy;
-	u32 track, serial_no;
-	ogg_page oggpage;
-	ogg_packet oggpacket;
-	ogg_stream_state os;
-	FILE *f_in;
-
-	/*means first one*/
-	if (!stream_num) return 0;
-
-	f_in = gf_fopen(fileName, "rb");
-	if (!f_in) return 0;
-
-	track = 0;
-	serial_no = 0;
-	ogg_sync_init(&oy);
-	while (1) {
-		if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
-		if (!ogg_page_bos(&oggpage)) break;
-		track ++;
-		if (track != stream_num) continue;
-
-		serial_no = ogg_page_serialno(&oggpage);
-		ogg_stream_init(&os, serial_no);
-		ogg_stream_pagein(&os, &oggpage);
-		ogg_stream_packetpeek(&os, &oggpacket);
-
-		if (is_video && (oggpacket.bytes >= 7) && !strncmp((char *)&oggpacket.packet[1], "theora", 6)) {
-			ogg_stream_clear(&os);
-			break;
-		}
-		if (!is_video && (oggpacket.bytes >= 7) && !strncmp((char *)&oggpacket.packet[1], "vorbis", 6)) {
-			ogg_stream_clear(&os);
-			break;
-		}
-		if (!is_video && (oggpage.body_len >= 8) && !strncmp((char *)oggpage.body, "OpusHead", 6)) {
-			ogg_stream_clear(&os);
-			break;
-		}
-		ogg_stream_clear(&os);
-		serial_no = 0;
-	}
-	ogg_sync_clear(&oy);
-	gf_fclose(f_in);
-	return serial_no;
-}
-
-GF_Err gf_import_ogg_video(GF_MediaImporter *import)
-{
-	GF_Err e;
-	ogg_sync_state oy;
-	u32 di, track;
-	u64 tot_size, done, duration;
-	u32 w, h, fps_num, fps_den, keyframe_freq_force, theora_kgs, flag, dts_inc, timescale;
-	Double FPS;
-	Bool destroy_esd, go;
-	u32 serial_no, sno, num_headers;
-	ogg_packet oggpacket;
-	ogg_page oggpage;
-	ogg_stream_state os;
-	oggpack_buffer opb;
-	GF_BitStream *bs;
-	FILE *f_in;
-	GF_ISOSample *samp;
-
-
-	dts_inc = 0;
-	/*assume audio or simple AV file*/
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		f_in = gf_fopen(import->in_name, "rb");
-		if (!f_in) return GF_URL_ERROR;
-
-		import->nb_tracks = 0;
-		go = GF_TRUE;
-		ogg_sync_init(&oy);
-		while (go) {
-			if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
-
-			if (!ogg_page_bos(&oggpage)) {
-				go = GF_FALSE;
-				continue;
-			}
-			serial_no = ogg_page_serialno(&oggpage);
-			ogg_stream_init(&os, serial_no);
-			ogg_stream_pagein(&os, &oggpage);
-			ogg_stream_packetpeek(&os, &oggpacket);
-
-			import->tk_info[import->nb_tracks].track_num = import->nb_tracks+1;
-			if ((oggpacket.bytes >= 7) && !strncmp((char *)&oggpacket.packet[1], "theora", 6)) {
-				import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_VISUAL;
-				import->tk_info[import->nb_tracks].flags = GF_IMPORT_OVERRIDE_FPS;
-
-				bs = gf_bs_new((char*)oggpacket.packet, oggpacket.bytes, GF_BITSTREAM_READ);
-				gf_bs_read_int(bs, 80);
-				import->tk_info[import->nb_tracks].video_info.width = gf_bs_read_u16(bs) << 4;
-				import->tk_info[import->nb_tracks].video_info.height = gf_bs_read_u16(bs) << 4;
-				gf_bs_read_int(bs, 64);
-				fps_num = gf_bs_read_u32(bs);
-				fps_den = gf_bs_read_u32(bs);
-				gf_bs_del(bs);
-				import->tk_info[import->nb_tracks].video_info.FPS = fps_num;
-				import->tk_info[import->nb_tracks].video_info.FPS /= fps_den;
-				import->tk_info[import->nb_tracks].media_type = GF_MEDIA_TYPE_THEO;
-			} else if ((oggpacket.bytes >= 7)
-				&& (!strncmp((char *)&oggpacket.packet[1], "vorbis", 6) || !strncmp((char *)&oggpacket.packet[1], "Opus", 4))
-				) {
-				import->tk_info[import->nb_tracks].type = GF_ISOM_MEDIA_AUDIO;
-				import->tk_info[import->nb_tracks].flags = 0;
-			}
-			ogg_stream_clear(&os);
-			import->nb_tracks++;
-		}
-		ogg_sync_clear(&oy);
-		gf_fclose(f_in);
-		return GF_OK;
-	}
-
-	if (import->flags & GF_IMPORT_USE_DATAREF) return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with OGG files");
-
-	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, GF_TRUE);
-	/*not our stream*/
-	if (!sno && import->trackID) return GF_OK;
-
-	f_in = gf_fopen(import->in_name, "rb");
-	if (!f_in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	e = GF_OK;
-	done = 0;
-	gf_fseek(f_in, 0, SEEK_END);
-	tot_size = gf_ftell(f_in);
-	gf_fseek(f_in, 0, SEEK_SET);
-
-
-	destroy_esd = GF_FALSE;
-	samp = gf_isom_sample_new();
-
-	/*avoids gcc warnings*/
-	duration = 0;
-	FPS = 0;
-	num_headers = w = h = track = 0;
-
-	ogg_sync_init(&oy);
-
-	bs = NULL;
-	serial_no = 0;
-	go = GF_TRUE;
-	while (go) {
-		if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
-
-		if (ogg_page_bos(&oggpage)) {
-			if (serial_no) continue;
-			serial_no = ogg_page_serialno(&oggpage);
-			ogg_stream_init(&os, serial_no);
-			ogg_stream_pagein(&os, &oggpage);
-			ogg_stream_packetpeek(&os, &oggpacket);
-
-			/*not our stream*/
-			if (sno && (sno!=serial_no)) {
-				ogg_stream_clear(&os);
-				serial_no = 0;
-				continue;
-			}
-			if ((oggpacket.bytes < 7) || strncmp((char *)&oggpacket.packet[1], "theora", 6)) {
-				ogg_stream_clear(&os);
-				serial_no = 0;
-				continue;
-			}
-			/*that's ogg-theora*/
-			bs = gf_bs_new((char *)oggpacket.packet, oggpacket.bytes, GF_BITSTREAM_READ);
-			gf_bs_read_int(bs, 80);
-			w = gf_bs_read_u16(bs) << 4;
-			h = gf_bs_read_u16(bs) << 4;
-			gf_bs_read_int(bs, 64);
-			fps_num = gf_bs_read_u32(bs);
-			fps_den = gf_bs_read_u32(bs);
-			gf_bs_read_int(bs, 80);
-			gf_bs_read_int(bs, 6);
-			keyframe_freq_force = 1 << gf_bs_read_int(bs, 5);
-			theora_kgs = 0;
-			keyframe_freq_force--;
-			while (keyframe_freq_force) {
-				theora_kgs ++;
-				keyframe_freq_force >>= 1;
-			}
-			gf_bs_del(bs);
-
-			FPS = ((Double)fps_num) / fps_den;
-
-			/*note that we don't rewrite theora headers (just like in MPEG-4 video, systems timing overrides stream one)*/
-			if (import->video_fps) FPS = import->video_fps;
-			num_headers = 0;
-
-			gf_import_message(import, GF_OK, "OGG Theora import - %2.4f FPS - Resolution %d x %d", FPS, w, h);
-			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			continue;
-		}
-		/*FIXME - check end of stream for concatenated files?*/
-
-		/*not our stream*/
-		if (ogg_stream_pagein(&os, &oggpage) != 0) continue;
-
-
-
-		while (ogg_stream_packetout(&os, &oggpacket ) > 0 ) {
-			if (num_headers<3) {
-				if(!w || !h) {
-					e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Couldn't find Theora main header");
-					goto exit;
-				}
-				/*copy headers*/
-				gf_bs_write_u16(bs, oggpacket.bytes);
-				gf_bs_write_data(bs, (char *)oggpacket.packet, oggpacket.bytes);
-				num_headers++;
-
-				/*let's go, create the track*/
-				if (num_headers==3) {
-					if (!import->esd) {
-						destroy_esd = GF_TRUE;
-						import->esd = gf_odf_desc_esd_new(0);
-					}
-					get_video_timing(FPS, &timescale, &dts_inc);
-					track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_VISUAL, timescale);
-					if (!track) goto exit;
-					gf_isom_set_track_enabled(import->dest, track, 1);
-					if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-					import->final_trackID = import->esd->ESID;
-					if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-					if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-					import->esd->slConfig->timestampResolution = timescale;
-					if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-					gf_bs_get_content(bs, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-					gf_bs_del(bs);
-					bs = NULL;
-					import->esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-					import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_THEORA;
-
-					e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
-					if (e) goto exit;
-					gf_isom_set_visual_info(import->dest, track, di, w, h);
-
-					{
-						Double d = import->duration;
-						d *= import->esd->slConfig->timestampResolution;
-						d /= 1000;
-						duration = (u64) d;
-					}
-				}
-
-				continue;
-			}
-
-			/*we don't need adedicated parser for theora, just check it's a theora frame and get its key type
-			WATCHOUT theora bitsteram is in BE*/
-			oggpackB_readinit(&opb, oggpacket.packet, oggpacket.bytes);
-			flag = oggpackB_read(&opb, 1);
-			if (flag==0) {
-				/*add packet*/
-				samp->IsRAP = oggpackB_read(&opb, 1) ? RAP_NO : RAP;
-				samp->data = (char *)oggpacket.packet;
-				samp->dataLength = oggpacket.bytes;
-				e = gf_isom_add_sample(import->dest, track, di, samp);
-				if (e) goto exit;
-				samp->DTS += dts_inc;
-			}
-
-			gf_set_progress("Importing OGG Video", (u32) (done/1024), (u32) (tot_size/1024));
-			done += oggpacket.bytes;
-			if ((duration && (samp->DTS > duration) ) || (import->flags & GF_IMPORT_DO_ABORT)) {
-				go = GF_FALSE;
-				break;
-			}
-		}
-	}
-	gf_set_progress("Importing OGG Video", (u32) (tot_size/1024), (u32) (tot_size/1024));
-
-	if (!serial_no) {
-		gf_import_message(import, GF_OK, "OGG: No supported video found");
-	} else {
-		gf_media_update_bitrate(import->dest, track);
-
-		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_VISUAL, 0xFE);
-	}
-
-exit:
-	if (bs) gf_bs_del(bs);
-	samp->data = NULL;
-	gf_isom_sample_del(&samp);
-	ogg_sync_clear(&oy);
-	if (serial_no) ogg_stream_clear(&os);
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	gf_fclose(f_in);
-	return e;
-}
-
-static void vorbis_release(ogg_audio_codec_desc *codec)
-{
-	if (codec->parserPrivateState) {
-		GF_VorbisParser *vp = (GF_VorbisParser*)codec->parserPrivateState;
-		if (vp->vbs) gf_bs_del(vp->vbs);
-		gf_free(vp);
-	}
-}
-
-static GF_Err vorbis_process(ogg_audio_codec_desc *codec, char *data, u32 data_length,
-	void *importer, Bool *destroy_esd, u32 *track, u32 *di, u64 *duration, int *block_size)
-{
-	GF_VorbisParser *vp = NULL;
-	GF_Err e = GF_OK;
-	GF_MediaImporter *import = (GF_MediaImporter*)importer;
-
-	if (!codec || !import || !track || !di || !destroy_esd || !duration || !block_size)
-		return GF_BAD_PARAM;
-
-	vp = (GF_VorbisParser*)codec->parserPrivateState;
-
-	if (!vp || vp->num_headers<3) {
-		if (!gf_vorbis_parse_header(codec, (char*)data, data_length)) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Corrupted OGG Vorbis header"));
-			goto exit;
-		}
-		vp = (GF_VorbisParser*)codec->parserPrivateState;
-
-		/*copy headers*/
-		gf_bs_write_u16(vp->vbs, data_length);
-		gf_bs_write_data(vp->vbs, (char *)data, data_length);
-		vp->num_headers++;
-
-		/*let's go, create the track*/
-		if (vp->num_headers == 3) {
-			if (!codec->parserPrivateState) {
-				e = GF_NON_COMPLIANT_BITSTREAM;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("Corrupted OGG Vorbis headers found"));
-				goto exit;
-			}
-
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("OGG Vorbis import - sample rate %d - %d channel%s", codec->sample_rate, codec->channels, (codec->channels>1) ? "s" : ""));
-
-			if (!import->esd) {
-				*destroy_esd = GF_TRUE;
-				import->esd = gf_odf_desc_esd_new(0);
-			}
-			*track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, codec->sample_rate);
-			if (!*track) {
-				e = gf_isom_last_error(import->dest);
-				goto exit;
-			}
-			gf_isom_set_track_enabled(import->dest, *track, 1);
-			if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, *track);
-			import->final_trackID = import->esd->ESID;
-			if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *)gf_odf_desc_new(GF_ODF_DCD_TAG);
-			if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-			import->esd->slConfig->timestampResolution = codec->sample_rate;
-			if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *)gf_odf_desc_new(GF_ODF_DSI_TAG);
-			gf_bs_get_content(vp->vbs, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
-			gf_bs_del(vp->vbs);
-			vp->vbs = NULL;
-			import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-			import->esd->decoderConfig->avgBitrate = vp->avg_r;
-			import->esd->decoderConfig->maxBitrate = (vp->max_r>0) ? vp->max_r : vp->avg_r;
-			import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OGG;
-
-			e = gf_isom_new_mpeg4_description(import->dest, *track, import->esd, NULL, NULL, di);
-			if (e) goto exit;
-			gf_isom_set_audio_info(import->dest, *track, *di, codec->sample_rate, (codec->channels>1) ? 2 : 1, 16, import->asemode);
-
-			{
-				Double d = import->duration;
-				d *= codec->sample_rate;
-				d /= 1000;
-				*duration = (u64)d;
-			}
-		}
-		
-		*block_size = 0;
-		return GF_OK;
-	}
-
-	*block_size = gf_vorbis_check_frame(vp, (char *)data, data_length);
-
-exit:
-	return e;
-}
-
-static void opus_release(ogg_audio_codec_desc *codec)
-{
-	if (codec->parserPrivateState) {
-		GF_OpusSpecificBox *opus = (GF_OpusSpecificBox*)codec->parserPrivateState;
-		gf_free(opus);
-	}
-}
-
-static GF_Err opus_process(ogg_audio_codec_desc *codec, char *data, u32 data_length,
-	void *importer, Bool *destroy_esd, u32 *track, u32 *di, u64 *duration, int *block_size)
-{
-	GF_OpusSpecificBox *opus = NULL;
-	GF_Err e = GF_OK;
-	GF_MediaImporter *import = (GF_MediaImporter*)importer;
-	GF_BitStream *bs = NULL;
-	char tag[8];
-
-	if (!codec || !import || !track || !di || !destroy_esd || !duration || !block_size)
-		return GF_BAD_PARAM;
-
-	*block_size = 0;
-	opus = (GF_OpusSpecificBox*)codec->parserPrivateState;
-	bs = gf_bs_new(data, data_length, GF_BITSTREAM_READ);
-	gf_bs_read_data(bs, tag, 8);
-
-	if (!opus) {
-		/*Identification Header*/
-		u8 val;
-		val = gf_bs_read_u8(bs); /*version*/
-		if (val != 1) {
-			e = GF_NON_COMPLIANT_BITSTREAM;
-			goto exit;
-		}
-
-		GF_SAFEALLOC(opus, GF_OpusSpecificBox);
-		codec->parserPrivateState = (void*)opus;
-		codec->channels = opus->OutputChannelCount = gf_bs_read_u8(bs);
-		opus->PreSkip = gf_bs_read_u16_le(bs);
-		opus->InputSampleRate = gf_bs_read_u32_le(bs);
-		codec->sample_rate = 48000; /*Opus always outputs 48000 but stores the original opus->InputSampleRate rate*/
-		opus->OutputGain = gf_bs_read_u16_le(bs);
-
-		//TODO: parse and link to MP4 channel layouts - for now we just copy it binary as it is the same from Ogg to MP4
-		opus->ChannelMappingFamily = gf_bs_read_u8(bs);
-		if (opus->ChannelMappingFamily != 0) {
-			opus->StreamCount = gf_bs_read_u8(bs);
-			opus->CoupledCount = gf_bs_read_u8(bs);
-			gf_bs_read_data(bs, (char *) opus->ChannelMapping, opus->OutputChannelCount);
-		}
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("OGG Opus import - sample rate %d - %d channel%s", codec->sample_rate, codec->channels, (codec->channels>1) ? "s" : ""));
-
-		if (!import->esd) {
-			*destroy_esd = GF_TRUE;
-			import->esd = gf_odf_desc_esd_new(0);
-		}
-		*track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, 48000/*block sizes are alway in always in 48kHz*/);
-		if (!*track) {
-			e = gf_isom_last_error(import->dest);
-			goto exit;
-		}
-		gf_isom_set_track_enabled(import->dest, *track, 1);
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, *track);
-		import->final_trackID = import->esd->ESID;
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *)gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *)gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->slConfig->timestampResolution = 48000; /*block sizes are alway in always in 48kHz*/
-
-		import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-		import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_OPUS;
-
-		if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *)gf_odf_desc_new(GF_ODF_DSI_TAG);
-		e = gf_isom_opus_config_new(import->dest, *track, opus, NULL, NULL, di);
-		if (e) goto exit;
-
-		gf_isom_set_audio_info(import->dest, *track, *di, codec->sample_rate, codec->channels, 16, import->asemode);
-		gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_OPUS, 0);
-
-		{
-			Double d = import->duration;
-			d *= codec->sample_rate;
-			d /= 1000;
-			*duration = (u64)d;
-		}
-	} else if (!memcmp(tag, "OpusTags", sizeof(tag))) {
-		/*skip*/
-		goto exit;
-	} else {
-		/*consider the whole packet as Ogg packets and ISOBMFF samples for Opus are framed similarly*/
-		static const int OpusFrameDurIn48k[] = { 480, 960, 1920, 2880, 480, 960, 1920, 2880, 480, 960, 1920, 2880,
-			480, 960, 480, 960,
-			120, 240, 480, 960, 120, 240, 480, 960, 120, 240, 480, 960, 120, 240, 480, 960,
-		};
-		int TOC_config = (data[0] & 0xf8) >> 3;
-		//int s = (data[0] & 0x04) >> 2;
-		*block_size = OpusFrameDurIn48k[TOC_config];
-
-		int c = data[0] & 0x03;
-		if (c == 1 || c == 2) {
-			*block_size *= 2;
-		} else if (c == 3) {
-			/*unknown number of frames*/
-			int num_frames = data[1] & 0x3f;
-			*block_size *= num_frames;
-		}
-	}
-
-exit:
-	gf_bs_del(bs);
-	return GF_OK;
-}
-
-static ogg_audio_codec_desc ogg_audio_codec_descs[] = {
-	{ "\1vorbis", NULL/*GF_VorbisParser*/, 0, 0, vorbis_process, vorbis_release },
-	{ "OpusHead", NULL/*GF_OpusParser*/, 0, 0, opus_process, opus_release },
-};
-
-GF_Err gf_import_ogg_audio(GF_MediaImporter *import)
-{
-#if defined(GPAC_DISABLE_AV_PARSERS)
-	return GF_NOT_SUPPORTED;
-#else
-
-	GF_Err e;
-	ogg_sync_state oy;
-	u32 di, track;
-	u64 done, tot_size, duration;
-	s32 block_size;
-	GF_ISOSample *samp;
-	Bool destroy_esd, go;
-	u32 serial_no, sno;
-	ogg_packet oggpacket;
-	ogg_page oggpage;
-	ogg_stream_state os;
-	ogg_audio_codec_desc *codec = NULL;
-	FILE *f_in;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
-
-	if (import->flags & GF_IMPORT_USE_DATAREF) return gf_import_message(import, GF_NOT_SUPPORTED, "Cannot use data referencing with OGG files");
-
-	sno = get_ogg_serial_no_for_stream(import->in_name, import->trackID, GF_FALSE);
-	/*not our stream*/
-	if (!sno && import->trackID) return GF_OK;
-
-	f_in = gf_fopen(import->in_name, "rb");
-	if (!f_in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	e = GF_OK;
-
-	done = 0;
-	gf_fseek(f_in, 0, SEEK_END);
-	tot_size = gf_ftell(f_in);
-	gf_fseek(f_in, 0, SEEK_SET);
-
-	destroy_esd = import->esd ? GF_FALSE : GF_TRUE;
-	samp = gf_isom_sample_new();
-	/*avoids gcc warnings*/
-	track = 0;
-	duration = 0;
-
-	ogg_sync_init(&oy);
-
-	serial_no = 0;
-	go = GF_TRUE;
-	while (go) {
-		if (!OGG_ReadPage(f_in, &oy, &oggpage)) break;
-
-		if (ogg_page_bos(&oggpage)) {
-			if (serial_no) continue;
-			serial_no = ogg_page_serialno(&oggpage);
-			ogg_stream_init(&os, serial_no);
-			ogg_stream_pagein(&os, &oggpage);
-			ogg_stream_packetpeek(&os, &oggpacket);
-			/*not our stream*/
-			if (sno && (sno!=serial_no)) {
-				ogg_stream_clear(&os);
-				serial_no = 0;
-				continue;
-			}
-			if (oggpacket.bytes < 7) {
-				ogg_stream_clear(&os);
-				serial_no = 0;
-				continue;
-			}
-
-			/*find codec*/
-			{
-				size_t size = sizeof(ogg_audio_codec_descs) / sizeof(ogg_audio_codec_desc);
-				size_t i;
-				for (i = 0; i < size; ++i) {
-					if (!strncmp((char *)oggpacket.packet, ogg_audio_codec_descs[i].codec_name, strlen(ogg_audio_codec_descs[i].codec_name))) {
-						codec = &ogg_audio_codec_descs[i];
-						break;
-					}
-				}
-				if (i == size) {
-					ogg_stream_clear(&os);
-					serial_no = 0;
-					continue;
-				}
-			}
-
-			continue;
-		}
-		/*FIXME - check end of stream for concatenated files?*/
-
-		/*not our stream*/
-		if (ogg_stream_pagein(&os, &oggpage) != 0) continue;
-
-		while (ogg_stream_packetout(&os, &oggpacket ) > 0 ) {
-			if (!codec) {
-				e = gf_import_message(import, GF_NOT_SUPPORTED, "OGG: unrecognized codec");
-				goto exit;
-			}
-
-			e = codec->process(codec, oggpacket.packet, oggpacket.bytes, import, &destroy_esd, &track, &di, &duration, &block_size);
-			if (e) goto exit;
-			if (!block_size) continue;
-
-			/*add packet*/
-			samp->IsRAP = RAP;
-			samp->data = (char *)oggpacket.packet;
-			samp->dataLength = oggpacket.bytes;
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-			if (e) goto exit;
-			samp->DTS += block_size;
-
-			gf_set_progress("Importing OGG Audio", (u32) done, (u32) tot_size);
-			done += oggpacket.bytes;
-			if ((duration && (samp->DTS > duration) ) || (import->flags & GF_IMPORT_DO_ABORT)) {
-				go = GF_FALSE;
-				break;
-			}
-		}
-	}
-	gf_set_progress("Importing OGG Audio", (u32) tot_size, (u32) tot_size);
-
-	if (!serial_no) {
-		gf_import_message(import, GF_OK, "OGG: No supported audio found");
-	} else {
-		samp->data = NULL;
-		gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, 0xFE);
-		gf_set_progress("Importing OGG Audio", (u32) tot_size, (u32) tot_size);
-
-		gf_media_update_bitrate(import->dest, track);
-
-		/*rewrite ESD*/
-		if (import->esd) {
-			if (import->esd->decoderConfig) gf_odf_desc_del((GF_Descriptor *)import->esd->decoderConfig);
-			import->esd->decoderConfig = gf_isom_get_decoder_config(import->dest, track, 1);
-			gf_isom_change_mpeg4_description(import->dest, track, 1, import->esd);
-		}
-	}
-
-exit:
-	gf_isom_sample_del(&samp);
-	if (serial_no) ogg_stream_clear(&os);
-	ogg_sync_clear(&oy);
-	if (codec && codec->release) codec->release(codec);
-
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	gf_fclose(f_in);
-	return e;
-#endif /*defined(GPAC_DISABLE_AV_PARSERS) */
-}
-
-#endif /*GPAC_DISABLE_OGG*/
-
-GF_Err gf_import_raw_unit(GF_MediaImporter *import)
-{
-	GF_Err e;
-	GF_ISOSample *samp;
-	u32 mtype, track, di, timescale, read;
-	FILE *src;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->flags |= GF_IMPORT_USE_DATAREF;
-		return GF_OK;
-	}
-
-	if (!import->esd || !import->esd->decoderConfig) {
-		return gf_import_message(import, GF_BAD_PARAM, "Raw stream needs ESD and DecoderConfig for import");
-	}
-
-	src = gf_fopen(import->in_name, "rb");
-	if (!src) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	switch (import->esd->decoderConfig->streamType) {
-	case GF_STREAM_SCENE:
-		mtype = GF_ISOM_MEDIA_SCENE;
-		break;
-	case GF_STREAM_VISUAL:
-		mtype = GF_ISOM_MEDIA_VISUAL;
-		break;
-	case GF_STREAM_AUDIO:
-		mtype = GF_ISOM_MEDIA_AUDIO;
-		break;
-	case GF_STREAM_TEXT:
-		mtype = GF_ISOM_MEDIA_TEXT;
-		break;
-	case GF_STREAM_MPEG7:
-		mtype = GF_ISOM_MEDIA_MPEG7;
-		break;
-	case GF_STREAM_IPMP:
-		mtype = GF_ISOM_MEDIA_IPMP;
-		break;
-	case GF_STREAM_OCI:
-		mtype = GF_ISOM_MEDIA_OCI;
-		break;
-	case GF_STREAM_MPEGJ:
-		mtype = GF_ISOM_MEDIA_MPEGJ;
-		break;
-	case GF_STREAM_INTERACT:
-		mtype = GF_STREAM_SCENE;
-		break;
-	/*not sure about this one...*/
-	case GF_STREAM_IPMP_TOOL:
-		mtype = GF_ISOM_MEDIA_IPMP;
-		break;
-	/*not sure about this one...*/
-	case GF_STREAM_FONT:
-		mtype = GF_ISOM_MEDIA_MPEGJ;
-		break;
-	default:
-		mtype = GF_ISOM_MEDIA_ESM;
-	}
-	timescale = import->esd->slConfig ? import->esd->slConfig->timestampResolution : 1000;
-	track = gf_isom_new_track(import->dest, import->esd->ESID, mtype, timescale);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	e = gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	if (e) goto exit;
-
-	gf_import_message(import, GF_OK, "Raw Access Unit import (StreamType %s)", gf_odf_stream_type_name(import->esd->decoderConfig->streamType));
-
-	samp = gf_isom_sample_new();
-	gf_fseek(src, 0, SEEK_END);
-	assert(gf_ftell(src) < 1<<31);
-	samp->dataLength = (u32) gf_ftell(src);
-	gf_fseek(src, 0, SEEK_SET);
-	samp->IsRAP = RAP;
-	samp->data = (char *)gf_malloc(sizeof(char)*samp->dataLength);
-	read = (u32) fread(samp->data, sizeof(char), samp->dataLength, src);
-	if ( read != samp->dataLength ) {
-		e = gf_import_message(import, GF_IO_ERR, "Failed to read raw unit %d bytes", samp->dataLength);
-		goto exit;
-
-	}
-	e = gf_isom_add_sample(import->dest, track, di, samp);
-	gf_isom_sample_del(&samp);
-	gf_media_update_bitrate(import->dest, track);
-exit:
-	gf_fclose(src);
-	return e;
-}
-
-
-GF_Err gf_import_saf(GF_MediaImporter *import)
-{
-#ifndef GPAC_DISABLE_SAF
-	GF_Err e;
-	u32 track;
-	u64 tot;
-	FILE *saf;
-	GF_BitStream *bs;
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->flags |= GF_IMPORT_USE_DATAREF;
-	}
-
-	saf = gf_fopen(import->in_name, "rb");
-	if (!saf) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	track = 0;
-
-	bs = gf_bs_from_file(saf, GF_BITSTREAM_READ);
-	tot = gf_bs_get_size(bs);
-
-	while (gf_bs_available(bs)) {
-		Bool is_rap;
-		u32 cts, au_size, type, stream_id;
-		is_rap = (Bool)gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 15);
-		gf_bs_read_int(bs, 2);
-		cts = gf_bs_read_int(bs, 30);
-		au_size = gf_bs_read_u16(bs);
-		if (au_size<2) {
-			gf_bs_del(bs);
-			gf_fclose(saf);
-			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Invalid SAF Packet Header");
-		}
-		type = gf_bs_read_int(bs, 4);
-		stream_id = gf_bs_read_int(bs, 12);
-		au_size-=2;
-		if (!stream_id) stream_id = 1000;
-
-		if ((type==1) || (type==2) || (type==7)) {
-			Bool in_root_od = GF_FALSE;
-			u32 mtype, stype;
-			char *name = "Unknown";
-
-			u8 oti = gf_bs_read_u8(bs);
-			u8 st = gf_bs_read_u8(bs);
-			u32 ts_res = gf_bs_read_u24(bs);
-			u32 buffersize_db = gf_bs_read_u16(bs);
-
-			if (!ts_res) ts_res = 1000;
-
-			au_size -= 7;
-
-
-			mtype = GF_ISOM_MEDIA_ESM;
-			stype = 0;
-			if (st==GF_STREAM_SCENE) {
-				mtype = GF_ISOM_MEDIA_SCENE;
-				name = (char *) ( (oti==GPAC_OTI_SCENE_LASER) ? "LASeR Scene" : "BIFS Scene" );
-				stype = (oti==GPAC_OTI_SCENE_LASER) ? GF_MEDIA_TYPE_LASR : GF_MEDIA_TYPE_BIFS;
-				in_root_od = GF_TRUE;
-			}
-			else if (st==GF_STREAM_VISUAL) {
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				switch (oti) {
-				case GPAC_OTI_VIDEO_AVC:
-				case GPAC_OTI_VIDEO_SVC:
-				case GPAC_OTI_VIDEO_MVC:
-					name = "AVC/H264 Video";
-					stype = GF_MEDIA_TYPE_H264;
-					break;
-				case GPAC_OTI_VIDEO_HEVC:
-				case GPAC_OTI_VIDEO_LHVC:
-					name = "HEVC Video";
-					stype = GF_MEDIA_TYPE_HEVC;
-					break;
-				case GPAC_OTI_VIDEO_MPEG4_PART2:
-					name = "MPEG-4 Video";
-					stype = GF_MEDIA_TYPE_MP4V;
-					break;
-				case GPAC_OTI_VIDEO_MPEG1:
-					name = "MPEG-1 Video";
-					stype = GF_MEDIA_TYPE_MP1V;
-					break;
-				case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-				case GPAC_OTI_VIDEO_MPEG2_MAIN:
-				case GPAC_OTI_VIDEO_MPEG2_SNR:
-				case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-				case GPAC_OTI_VIDEO_MPEG2_HIGH:
-				case GPAC_OTI_VIDEO_MPEG2_422:
-					name = "MPEG-2 Video";
-					stype = GF_MEDIA_TYPE_MP2V;
-					break;
-				case GPAC_OTI_IMAGE_JPEG:
-					name = "JPEG Image";
-					stype = GF_MEDIA_TYPE_JPEG;
-					break;
-				case GPAC_OTI_IMAGE_PNG:
-					name = "PNG Image";
-					stype = GF_MEDIA_TYPE_PNG;
-					break;
-				}
-			}
-			else if (st==GF_STREAM_AUDIO) {
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				switch (oti) {
-				case GPAC_OTI_AUDIO_MPEG2_PART3:
-					name = "MPEG-2 Audio";
-					stype = GF_MEDIA_TYPE_MP2A;
-					break;
-				case GPAC_OTI_AUDIO_MPEG1:
-					name = "MPEG-1 Audio";
-					stype = GF_MEDIA_TYPE_MP1A;
-					break;
-				case GPAC_OTI_AUDIO_AAC_MPEG4:
-					name = "MPEG-4 Audio";
-					stype = GF_MEDIA_TYPE_MP4A;
-					break;
-				}
-			}
-
-
-			if (import->flags & GF_IMPORT_PROBE_ONLY) {
-				u32 i, found;
-				found = 0;
-				for (i=0; i<import->nb_tracks; i++) {
-					if (import->tk_info[i].track_num==stream_id) {
-						found = 1;
-						break;
-					}
-				}
-				if (!found) {
-					import->tk_info[import->nb_tracks].media_type = stype;
-					import->tk_info[import->nb_tracks].type = mtype;
-					import->tk_info[import->nb_tracks].flags = GF_IMPORT_USE_DATAREF;
-					import->tk_info[import->nb_tracks].track_num = stream_id;
-					import->nb_tracks++;
-				}
-			} else if ((stream_id==import->trackID) && !track) {
-				Bool delete_esd = GF_FALSE;
-				if (!import->esd) {
-					import->esd = gf_odf_desc_esd_new(0);
-					delete_esd = GF_TRUE;
-					if (import->esd->URLString) gf_free(import->esd->URLString);
-					import->esd->URLString = NULL;
-				}
-				import->esd->decoderConfig->streamType = st;
-				import->esd->decoderConfig->objectTypeIndication = oti;
-				import->esd->decoderConfig->bufferSizeDB = buffersize_db;
-				if ((st==0xFF) && (oti==0xFF)) {
-					assert(0);
-				}
-				if (type==7) {
-					u32 url_len = gf_bs_read_u16(bs);
-					import->esd->URLString = (char *)gf_malloc(sizeof(char)*(url_len+1));
-					gf_bs_read_data(bs, import->esd->URLString, url_len);
-					import->esd->URLString[url_len] = 0;
-					au_size-=2+url_len;
-				}
-				if (au_size) {
-					if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-					if (import->esd->decoderConfig->decoderSpecificInfo->data ) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
-					import->esd->decoderConfig->decoderSpecificInfo->dataLength = au_size;
-					import->esd->decoderConfig->decoderSpecificInfo->data = (char *)gf_malloc(sizeof(char)*au_size);
-					gf_bs_read_data(bs, import->esd->decoderConfig->decoderSpecificInfo->data, au_size);
-					au_size = 0;
-				}
-				if (gf_isom_get_track_by_id(import->dest, stream_id)) stream_id = 0;
-				track = gf_isom_new_track(import->dest, stream_id, mtype, ts_res);
-				gf_isom_set_track_enabled(import->dest, track, 1);
-				stream_id = import->final_trackID = import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-				gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &mtype);
-				if (delete_esd) {
-					gf_odf_desc_del((GF_Descriptor *) import->esd);
-					import->esd = NULL;
-				}
-				if (in_root_od) gf_isom_add_track_to_root_od(import->dest, track);
-				gf_import_message(import, GF_OK, "Importing SAF stream %d: %s", stream_id, name);
-			}
-		}
-		else if ((type==4) && (stream_id==import->trackID) && track) {
-			GF_ISOSample *samp = gf_isom_sample_new();
-			samp->dataLength = au_size;
-			samp->DTS = cts;
-			samp->IsRAP = is_rap ? RAP : RAP_NO;
-			if (import->flags & GF_IMPORT_USE_DATAREF) {
-				e = gf_isom_add_sample_reference(import->dest, track, 1, samp, gf_bs_get_position(bs) );
-			} else {
-				samp->data = (char *)gf_malloc(sizeof(char)*samp->dataLength);
-				gf_bs_read_data(bs, samp->data, samp->dataLength);
-				au_size = 0;
-				e = gf_isom_add_sample(import->dest, track, 1, samp);
-			}
-			gf_isom_sample_del(&samp);
-			if (e) {
-				gf_bs_del(bs);
-				gf_fclose(saf);
-				return e;
-			}
-			gf_set_progress("Importing SAF", gf_bs_get_position(bs), tot);
-		}
-		gf_bs_skip_bytes(bs, au_size);
-	}
-	gf_bs_del(bs);
-	gf_fclose(saf);
-	if (import->flags & GF_IMPORT_PROBE_ONLY) return GF_OK;
-
-	gf_set_progress("Importing SAF", tot, tot);
-	gf_media_update_bitrate(import->dest, track);
-	return GF_OK;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
-typedef struct
-{
-	GF_MediaImporter *import;
-	u32 track;
-	u32 nb_i, nb_p, nb_b;
-	u64 last_dts;
-#ifndef GPAC_DISABLE_AV_PARSERS
-	GF_AVCConfig *avccfg;
-	AVCState avc;
-
-#ifndef GPAC_DISABLE_HEVC
-	GF_HEVCConfig *hevccfg;
-	HEVCState hevc;
-#endif //GPAC_DISABLE_HEVC
-
-#endif
-	Bool force_next_au_start;
-	Bool stream_setup;
-	u32 nb_video, nb_video_configured;
-	u32 nb_audio, nb_audio_configured;
-
-	Bool is_substream;
-} GF_TSImport;
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-/* Determine the ESD corresponding to the current track info based on the PID and sets the additional info
-   in the track info as described in this esd */
-static void m2ts_set_track_mpeg4_probe_info(GF_M2TS_ES *es, GF_ESD *esd,
-        struct __track_import_info* tk_info)
-{
-	if (esd && tk_info) {
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_SCENE:
-			tk_info->type = GF_ISOM_MEDIA_SCENE;
-			break;
-		case GF_STREAM_VISUAL:
-			tk_info->type = GF_ISOM_MEDIA_VISUAL;
-			break;
-		case GF_STREAM_AUDIO:
-			tk_info->type = GF_ISOM_MEDIA_AUDIO;
-			break;
-		case GF_STREAM_MPEG7:
-			tk_info->type = GF_ISOM_MEDIA_MPEG7;
-			break;
-		case GF_STREAM_IPMP:
-			tk_info->type = GF_ISOM_MEDIA_IPMP;
-			break;
-		case GF_STREAM_OCI:
-			tk_info->type = GF_ISOM_MEDIA_OCI;
-			break;
-		case GF_STREAM_MPEGJ:
-			tk_info->type = GF_ISOM_MEDIA_MPEGJ;
-			break;
-		case GF_STREAM_OD:
-			tk_info->type = GF_ISOM_MEDIA_OD;
-			break;
-		case GF_STREAM_INTERACT:
-			tk_info->type = GF_ISOM_MEDIA_SCENE;
-			break;
-		default:
-			tk_info->type = GF_ISOM_MEDIA_ESM;
-			break;
-		}
-	}
-}
-
-static void m2ts_set_tracks_mpeg4_probe_info(GF_MediaImporter *import, GF_M2TS_Program *prog, GF_List *ESDescriptors)
-{
-	u32 i, k, esd_count, stream_count;
-	s32 tk_idx;
-
-	esd_count = gf_list_count(ESDescriptors);
-	stream_count = gf_list_count(prog->streams);
-	for (k = 0; k < esd_count; k++) {
-		GF_M2TS_ES *es = NULL;
-		GF_ESD *esd = (GF_ESD *)gf_list_get(ESDescriptors, k);
-
-		for (i = 0; i < stream_count; i++) {
-			GF_M2TS_ES *es_tmp = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-			if (es_tmp->mpeg4_es_id == esd->ESID) {
-				es = es_tmp;
-				break;
-			}
-		}
-		if (es == NULL) continue;
-
-		if (esd->decoderConfig->streamType==GF_STREAM_OD)
-			es->flags |= GF_M2TS_ES_IS_MPEG4_OD;
-
-
-		tk_idx = -1;
-		for (i = 0; i < import->nb_tracks; i++) {
-			if (import->tk_info[i].track_num == es->pid) {
-				tk_idx = i;
-				break;
-			}
-		}
-
-		if (tk_idx == -1) continue;
-		if (import->tk_info[tk_idx].type != 0 && import->tk_info[tk_idx].type != GF_ISOM_MEDIA_ESM) continue;
-
-		m2ts_set_track_mpeg4_probe_info(es, esd, &import->tk_info[tk_idx]);
-	}
-
-}
-
-static void m2ts_set_track_mpeg4_creation_info(GF_MediaImporter *import, u32 *mtype, u32 *stype, u32 *oti)
-{
-	if (import->esd) {
-		*stype = import->esd->decoderConfig->streamType;
-		*oti = import->esd->decoderConfig->objectTypeIndication;
-		switch (*stype) {
-		case GF_STREAM_SCENE:
-			*mtype = GF_ISOM_MEDIA_SCENE;
-			break;
-		case GF_STREAM_OD:
-			*mtype = GF_ISOM_MEDIA_OD;
-			break;
-		case GF_STREAM_INTERACT:
-			*mtype = GF_ISOM_MEDIA_SCENE;
-			break;
-		case GF_STREAM_VISUAL:
-			*mtype = GF_ISOM_MEDIA_VISUAL;
-			break;
-		case GF_STREAM_AUDIO:
-			*mtype = GF_ISOM_MEDIA_AUDIO;
-			break;
-		default:
-			*mtype = GF_ISOM_MEDIA_ESM;
-			break;
-		}
-	}
-	if (*mtype == 0) {
-		*mtype = GF_ISOM_MEDIA_ESM;
-		*oti = 0;
-		*stype = 0;
-	}
-
-}
-
-static void m2ts_create_track(GF_TSImport *tsimp, u32 mtype, u32 stype, u32 oti, u32 mpeg4_es_id, Bool is_in_iod)
-{
-	GF_MediaImporter *import = (GF_MediaImporter *)tsimp->import;
-	if (mtype != GF_ISOM_MEDIA_ESM) {
-		u32 di;
-		Bool destroy_esd = GF_FALSE;
-		if (import->esd) mpeg4_es_id = import->esd->ESID;
-		else if (!mpeg4_es_id) mpeg4_es_id = import->trackID;
-
-		tsimp->track = gf_isom_new_track(import->dest, mpeg4_es_id, mtype, 90000);
-		if (!tsimp->track) {
-			tsimp->track = gf_isom_new_track(import->dest, 0, mtype, 90000);
-			if (!tsimp->track) {
-				//error
-			}
-		}
-		if (!import->esd) {
-			import->esd = gf_odf_desc_esd_new(2);
-			destroy_esd = GF_TRUE;
-		}
-		/*update stream type/oti*/
-		if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-		if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-		import->esd->decoderConfig->streamType = stype;
-		import->esd->decoderConfig->objectTypeIndication = oti;
-		import->esd->slConfig->timestampResolution = 90000;
-
-		gf_isom_set_track_enabled(import->dest, tsimp->track, 1);
-		//we store annexB format until we rewrite the sample, so don't inspect NALUs
-		gf_isom_set_nalu_extract_mode(import->dest, tsimp->track, GF_ISOM_NALU_EXTRACT_INSPECT);
-
-		if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, tsimp->track);
-		gf_isom_new_mpeg4_description(import->dest, tsimp->track, import->esd, NULL, NULL, &di);
-		if (destroy_esd) {
-			gf_odf_desc_del((GF_Descriptor *)import->esd);
-			import->esd = NULL;
-		}
-
-		if (is_in_iod) gf_isom_add_track_to_root_od(import->dest, tsimp->track);
-
-		import->final_trackID = gf_isom_get_track_id(import->dest, tsimp->track);
-	}
-}
-
-/*rewrite last AVC sample currently stored in Annex-B format to ISO format (rewrite start code)*/
-void m2ts_rewrite_nalu_sample(GF_MediaImporter *import, GF_TSImport *tsimp)
-{
-	GF_Err e;
-	u32 sc_pos, start;
-	GF_BitStream *bs;
-	GF_ISOSample *samp;
-	u32 count = gf_isom_get_sample_count(import->dest, tsimp->track);
-	if (!count) return;
-
-	samp = gf_isom_get_sample(import->dest, tsimp->track, count, NULL);
-	sc_pos = 1;
-	start = 0;
-	bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_WRITE);
-	while (1) {
-		if (!samp->data[sc_pos] && !samp->data[sc_pos+1] && !samp->data[sc_pos+2] && (samp->data[sc_pos+3]==1)) {
-			gf_bs_seek(bs, start);
-			gf_bs_write_u32(bs, (u32) sc_pos-start-4);
-			start = sc_pos;
-		}
-		sc_pos++;
-		if (start+sc_pos>=samp->dataLength) break;
-	}
-	gf_bs_seek(bs, start);
-	gf_bs_write_u32(bs, samp->dataLength-start-4);
-
-	gf_bs_del(bs);
-
-	e = gf_isom_update_sample(import->dest, tsimp->track, count, samp, GF_TRUE);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error rewriting AVC NALUs: %s\n", gf_error_to_string(e) ));
-	}
-	gf_isom_sample_del(&samp);
-}
-
-#ifndef GPAC_DISABLE_HEVC
-static void hevc_cfg_add_nalu(GF_MediaImporter *import, GF_HEVCConfig *hevccfg, u8 nal_type, char *data, u32 data_len)
-{
-	u32 i, count;
-	GF_AVCConfigSlot *sl;
-	GF_HEVCParamArray *ar = NULL;
-
-	count = gf_list_count(hevccfg->param_array);
-	for (i=0; i<count; i++) {
-		ar = (GF_HEVCParamArray*)gf_list_get(hevccfg->param_array, i);
-		if (ar->type == nal_type) break;
-		ar = NULL;
-	}
-	if (!ar) {
-		GF_SAFEALLOC(ar, GF_HEVCParamArray);
-		if (!ar) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[HEVCParse] Failed to allocate parameter set array\n"));
-			return;
-		}
-		ar->array_completeness = 1;
-		ar->type = nal_type;
-		ar->nalus = gf_list_new();
-		gf_list_add(hevccfg->param_array, ar);
-	}
-
-	if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-		ar->array_completeness = 0;
-		return;
-	}
-
-	if (data) {
-		GF_SAFEALLOC(sl, GF_AVCConfigSlot);
-		if (!sl) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[HEVCParse] Failed to allocate parameter set container\n"));
-			return;
-		}
-		sl->data = (char*)gf_malloc(sizeof(char)*data_len);
-		if (!sl) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[HEVCParse] Failed to allocate parameter set data\n"));
-			gf_free(sl);
-			return;
-		}
-		sl->size = data_len;
-		memcpy(sl->data, data, data_len);
-		gf_list_add(ar->nalus, sl);
-	} else {
-		ar->array_completeness = 0;
-	}
-}
-#endif //GPAC_DISABLE_HEVC
-
-void on_m2ts_import_data(GF_M2TS_Demuxer *ts, u32 evt_type, void *par)
-{
-	GF_Err e;
-	GF_ISOSample *samp;
-	Bool is_au_start;
-	u32 i, count, idx;
-	GF_M2TS_Program *prog;
-	GF_TSImport *tsimp = (GF_TSImport *) ts->user;
-	GF_MediaImporter *import= (GF_MediaImporter *)tsimp->import;
-	GF_M2TS_ES *es = NULL;
-	GF_M2TS_PES *pes = NULL;
-
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_FOUND:
-		break;
-//	case GF_M2TS_EVT_PAT_REPEAT:
-//	case GF_M2TS_EVT_SDT_REPEAT:
-	case GF_M2TS_EVT_PMT_REPEAT:
-		/*abort upon first PMT repeat if not using 4on2. Otherwise we must parse the entire
-		bitstream to locate ODs sent in OD updates in order to get their stream types...*/
-		/*		if (!ts->has_4on2 && (import->flags & GF_IMPORT_PROBE_ONLY) && !import->track_id)
-					import->flags |= GF_IMPORT_DO_ABORT;
-		*/
-		break;
-	case GF_M2TS_EVT_PMT_UPDATE:
-		gf_import_message(import, GF_OK, "[MPEG-2 TS] PMT Update found - cannot import any further");
-		import->flags |= GF_IMPORT_DO_ABORT;
-		break;
-	case GF_M2TS_EVT_DURATION_ESTIMATED:
-		if (import->flags & GF_IMPORT_PROBE_ONLY) {
-			import->probe_duration = ((GF_M2TS_PES_PCK *) par)->PTS;
-		}
-		break;
-
-	/*case GF_M2TS_EVT_SDT_FOUND:
-		import->nb_progs = gf_list_count(ts->SDTs);
-		for (i=0; i<import->nb_progs; i++) {
-			GF_M2TS_SDT *sdt = (GF_M2TS_SDT *)gf_list_get(ts->SDTs, i);
-			strcpy(import->pg_info[i].name, sdt->service);
-			import->pg_info[i].number = sdt->service_id;
-		}
-		if (!ts->has_4on2 && import->flags & GF_IMPORT_PROBE_ONLY)
-			//import->flags |= GF_IMPORT_DO_ABORT;
-		break;*/
-	case GF_M2TS_EVT_PMT_FOUND:
-		prog = (GF_M2TS_Program*)par;
-
-		if (import->flags & GF_IMPORT_PROBE_ONLY) {
-			/*
-				we scan all the streams declared in this PMT to fill the tk_info structures
-				NOTE: in the T-DMB case, we also need to decode ObjectDescriptor Updates see "case GF_M2TS_EVT_SL_PCK"
-			*/
-			count = gf_list_count(prog->streams);
-			for (i=0; i<count; i++) {
-				es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-				if (es->pid == prog->pmt_pid) continue;
-				if (es->flags & GF_M2TS_ES_IS_SECTION) {
-					//ses = (GF_M2TS_SECTION_ES *)es;
-				} else {
-					pes = (GF_M2TS_PES *)es;
-					gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_DEFAULT);
-				}
-				idx = import->nb_tracks;
-				import->tk_info[idx].track_num = es->pid;
-				import->tk_info[idx].prog_num = prog->number;
-				import->tk_info[idx].mpeg4_es_id = es->mpeg4_es_id;
-
-				switch (es->stream_type) {
-				case GF_M2TS_VIDEO_MPEG1:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG1;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_video++;
-					break;
-				case GF_M2TS_VIDEO_MPEG2:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG2;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_video++;
-					break;
-				case GF_M2TS_VIDEO_MPEG4:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MP4V;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_video++;
-					break;
-				case GF_M2TS_VIDEO_H264:
-				case GF_M2TS_VIDEO_SVC:
-					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_SVC) ? GF_MEDIA_TYPE_SVC : GF_MEDIA_TYPE_H264;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_video++;
-					break;
-				case GF_M2TS_VIDEO_HEVC:
-				case GF_M2TS_VIDEO_HEVC_TEMPORAL:
-				case GF_M2TS_VIDEO_HEVC_MCTS:
-				case GF_M2TS_VIDEO_SHVC:
-				case GF_M2TS_VIDEO_SHVC_TEMPORAL:
-				case GF_M2TS_VIDEO_MHVC:
-				case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_HEVC) ? GF_MEDIA_TYPE_HEVC : GF_MEDIA_TYPE_LHVC;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_video++;
-
-					switch (es->stream_type) {
-					case GF_M2TS_VIDEO_HEVC_MCTS:
-						import->tk_info[idx].media_type = GF_MEDIA_TYPE_HEVC;
-						break;
-					case GF_M2TS_VIDEO_HEVC_TEMPORAL:
-						import->tk_info[idx].media_type = GF_MEDIA_TYPE_HEVC;
-					case GF_M2TS_VIDEO_SHVC_TEMPORAL:
-					case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-						import->tk_info[idx].video_info.temporal_enhancement = GF_TRUE;
-					}
-					break;
-				case GF_M2TS_AUDIO_MPEG1:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG1;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_AUDIO_MPEG2:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MPG2;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_AUDIO_AAC:
-				case GF_M2TS_AUDIO_LATM_AAC:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_MP4A;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_AUDIO_AC3:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DAC3;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_AUDIO_EC3:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DEC3;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_AUDIO_DTS:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_DTS;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					tsimp->nb_audio++;
-					break;
-				case GF_M2TS_SYSTEMS_MPEG4_PES:
-				case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
-					if (es->stream_type == GF_M2TS_SYSTEMS_MPEG4_PES) {
-						import->tk_info[idx].media_type = GF_MEDIA_TYPE_M4SP;
-					} else {
-						import->tk_info[idx].media_type = GF_MEDIA_TYPE_M4SS;
-					}
-					if (prog->pmt_iod) {
-						GF_ESD *esd = gf_m2ts_get_esd(es);
-						m2ts_set_track_mpeg4_probe_info(es, esd, &import->tk_info[idx]);
-						if (esd && esd->decoderConfig->streamType == GF_STREAM_OD) {
-							es->flags |= GF_M2TS_ES_IS_MPEG4_OD;
-						}
-					} else {
-						import->tk_info[idx].type = GF_ISOM_MEDIA_ESM;
-					}
-					import->nb_tracks++;
-					break;
-				case GF_M2TS_METADATA_ID3_HLS:
-					import->tk_info[idx].media_type = GF_MEDIA_TYPE_ID3;
-					import->tk_info[idx].type = GF_ISOM_MEDIA_META;
-					import->tk_info[idx].lang = pes->lang;
-					import->nb_tracks++;
-					break;
-				default:
-					gf_import_message(import, GF_OK, "[MPEG-2 TS] Ignoring stream of type %d", es->stream_type);
-				}
-			}
-		} else {
-			/* We are not in PROBE mode, we are importing only one stream and don't care about the other streams */
-			u32 mtype, stype, oti;
-			Bool is_in_iod, found;
-
-			/* Since the GF_M2TS_ES_IS_MPEG4_OD flag is stored at the ES level and ES are reset after probe,
-			   we need to set it again as in probe mode */
-			found = GF_FALSE;
-			count = gf_list_count(prog->streams);
-			for (i=0; i<count; i++) {
-				GF_ESD *esd;
-				es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-				if (es->pid == prog->pmt_pid) continue;
-				if (es->pid == import->trackID) found = GF_TRUE;
-				esd = gf_m2ts_get_esd(es);
-				if (esd && esd->decoderConfig->streamType == GF_STREAM_OD) {
-					es->flags |= GF_M2TS_ES_IS_MPEG4_OD;
-				}
-			}
-			/*this PMT is not the one of our stream*/
-			if (!found || !ts->ess[import->trackID]) return;
-
-			/*make sure all the streams in this programe are in RAW pes framing mode, so that we get notified of the
-			DTS/PTS*/
-			for (i=0; i<count; i++) {
-				es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-				if (!(es->flags & GF_M2TS_ES_IS_SECTION)) {
-					gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_RAW);
-				}
-			}
-
-			es = ts->ess[import->trackID]; /* import->track_id == pid */
-
-			if (es->flags & GF_M2TS_ES_IS_SECTION) {
-				//ses = (GF_M2TS_SECTION_ES *)es;
-			} else {
-				pes = (GF_M2TS_PES *)es;
-				gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_DEFAULT_NAL);
-			}
-
-			mtype = stype = oti = 0;
-			is_in_iod = GF_FALSE;
-
-			switch (es->stream_type) {
-			case GF_M2TS_VIDEO_MPEG1:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_MPEG1;
-				break;
-			case GF_M2TS_VIDEO_MPEG2:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_MPEG2_422;
-				break;
-			case GF_M2TS_VIDEO_MPEG4:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_MPEG4_PART2;
-				break;
-			case GF_M2TS_VIDEO_H264:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_AVC;
-				tsimp->avccfg = gf_odf_avc_cfg_new();
-				break;
-			case GF_M2TS_VIDEO_HEVC:
-			case GF_M2TS_VIDEO_HEVC_TEMPORAL:
-			case GF_M2TS_VIDEO_HEVC_MCTS:
-			case GF_M2TS_VIDEO_SHVC:
-			case GF_M2TS_VIDEO_SHVC_TEMPORAL:
-			case GF_M2TS_VIDEO_MHVC:
-			case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_HEVC;
-#ifndef GPAC_DISABLE_HEVC
-				tsimp->hevccfg = gf_odf_hevc_cfg_new();
-				if (es->stream_type != GF_M2TS_VIDEO_HEVC) tsimp->is_substream = GF_TRUE;
-#endif //GPAC_DISABLE_HEVC
-				break;
-			case GF_M2TS_VIDEO_SVC:
-				mtype = GF_ISOM_MEDIA_VISUAL;
-				stype = GF_STREAM_VISUAL;
-				oti = GPAC_OTI_VIDEO_SVC;
-				tsimp->avccfg = gf_odf_avc_cfg_new();
-				break;
-			case GF_M2TS_AUDIO_MPEG1:
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_AUDIO;
-				oti = GPAC_OTI_AUDIO_MPEG1;
-				break;
-			case GF_M2TS_AUDIO_MPEG2:
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_AUDIO;
-				oti = GPAC_OTI_AUDIO_MPEG2_PART3;
-				break;
-			case GF_M2TS_AUDIO_LATM_AAC:
-			case GF_M2TS_AUDIO_AAC:
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_AUDIO;
-				oti = GPAC_OTI_AUDIO_AAC_MPEG4;
-				break;
-			case GF_M2TS_AUDIO_AC3:
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_AUDIO;
-				oti = GPAC_OTI_AUDIO_AC3;
-				break;
-			case GF_M2TS_AUDIO_EC3:
-				mtype = GF_ISOM_MEDIA_AUDIO;
-				stype = GF_STREAM_AUDIO;
-				oti = GPAC_OTI_AUDIO_EAC3;
-				break;
-			case GF_M2TS_SYSTEMS_MPEG4_PES:
-			case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
-				if (prog->pmt_iod && !import->esd) {
-					import->esd = gf_m2ts_get_esd(es);
-					m2ts_set_track_mpeg4_creation_info(import, &mtype, &stype, &oti);
-					is_in_iod = GF_TRUE;
-				}
-				break;
-			}
-			m2ts_create_track(tsimp, mtype, stype, oti, es->mpeg4_es_id, is_in_iod);
-		}
-		break;
-	case GF_M2TS_EVT_AAC_CFG:
-		if (!(import->flags & GF_IMPORT_PROBE_ONLY) && !tsimp->stream_setup) {
-			GF_ESD *esd = gf_isom_get_esd(import->dest, tsimp->track, 1);
-			if (esd) {
-				if (!esd->decoderConfig->decoderSpecificInfo) esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-				if (esd->decoderConfig->decoderSpecificInfo->data) gf_free(esd->decoderConfig->decoderSpecificInfo->data);
-				esd->decoderConfig->decoderSpecificInfo->data = ((GF_M2TS_PES_PCK*)par)->data;
-				esd->decoderConfig->decoderSpecificInfo->dataLength = ((GF_M2TS_PES_PCK*)par)->data_len;
-				gf_isom_change_mpeg4_description(import->dest, tsimp->track, 1, esd);
-				esd->decoderConfig->decoderSpecificInfo->data = NULL;
-				gf_odf_desc_del((GF_Descriptor *)esd);
-				tsimp->stream_setup = GF_TRUE;
-				gf_isom_set_audio_info(import->dest, tsimp->track, 1, ((GF_M2TS_PES_PCK*)par)->stream->aud_sr, ((GF_M2TS_PES_PCK*)par)->stream->aud_nb_ch, 8, import->asemode);
-			}
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-	{
-		GF_M2TS_PES_PCK *pck = (GF_M2TS_PES_PCK *)par;
-		is_au_start = (pck->flags & GF_M2TS_PES_PCK_AU_START);
-
-		if (import->flags & GF_IMPORT_PROBE_ONLY) {
-			for (i=0; i<import->nb_tracks; i++) {
-				if (import->tk_info[i].track_num == pck->stream->pid) {
-					if (pck->stream->aud_sr && ! import->tk_info[i].audio_info.sample_rate) {
-						import->tk_info[i].audio_info.sample_rate = pck->stream->aud_sr;
-						import->tk_info[i].audio_info.nb_channels = pck->stream->aud_nb_ch;
-						if ((pck->stream->stream_type==GF_M2TS_AUDIO_AAC) || (pck->stream->stream_type==GF_M2TS_AUDIO_LATM_AAC)) {
-							sprintf(import->tk_info[i].szCodecProfile, "mp4a.40.%02x", (u8) pck->stream->aud_aac_obj_type);
-						}
-						import->tk_info[i].audio_info.sample_rate = pck->stream->aud_sr;
-						import->tk_info[i].audio_info.nb_channels = pck->stream->aud_nb_ch;
-						tsimp->nb_audio_configured++;
-					}
-					/*unpack AVC config*/
-					else if (((pck->stream->stream_type==GF_M2TS_VIDEO_H264) || (pck->stream->stream_type==GF_M2TS_VIDEO_SVC)) && !pck->data[0] && !pck->data[1]) {
-						u32 nal_type = pck->data[4] & 0x1F;
-						if (nal_type == GF_AVC_NALU_SEQ_PARAM) {
-							sprintf(import->tk_info[i].szCodecProfile, "avc1.%02x%02x%02x", (u8) pck->data[5], (u8) pck->data[6], (u8) pck->data[7]);
-						}
-					}
-					else if (pck->stream->stream_type==GF_M2TS_VIDEO_HEVC) {
-						u32 nal_type = (pck->data[4] & 0x7E) >> 1;
-						if (nal_type == GF_HEVC_NALU_SEQ_PARAM) {
-							//todo ..;
-							sprintf(import->tk_info[i].szCodecProfile, "hvc1");
-						}
-					}
-					else if ((pck->stream->stream_type==GF_M2TS_AUDIO_EC3) || (pck->stream->stream_type==GF_M2TS_AUDIO_AC3) || (pck->stream->stream_type==GF_M2TS_AUDIO_DTS)) {
-						if (!import->tk_info[i].audio_info.sample_rate) {
-							//todo ...
-							import->tk_info[i].audio_info.sample_rate = 44100;
-							import->tk_info[i].audio_info.nb_channels = 2;
-							tsimp->nb_audio_configured++;
-						}
-					}
-
-					if (pck->stream->vid_w && ! import->tk_info[i].video_info.width ) {
-						import->tk_info[i].video_info.width = pck->stream->vid_w;
-						import->tk_info[i].video_info.height = pck->stream->vid_h;
-						tsimp->nb_video_configured++;
-					}
-
-					/*consider we are done if not using 4 on 2*/
-					if (!ts->has_4on2
-					        && (tsimp->nb_video_configured == tsimp->nb_video)
-					        && (tsimp->nb_audio_configured == tsimp->nb_audio)
-					        && import->probe_duration
-					   ) {
-						import->flags |= GF_IMPORT_DO_ABORT;
-					}
-					break;
-				}
-			}
-			if (!ts->has_4on2 && (import->trackID==pck->stream->pid) && (pck->stream->vid_h || pck->stream->aud_sr) )
-				import->flags |= GF_IMPORT_DO_ABORT;
-			return;
-		}
-
-		/* Even if we don't import this stream we need to check the first dts of the program */
-		if (!(pck->stream->flags & GF_M2TS_ES_FIRST_DTS) && is_au_start) {
-			pck->stream->flags |= GF_M2TS_ES_FIRST_DTS;
-			pck->stream->first_dts = (pck->PTS!=pck->DTS) ? pck->DTS : pck->PTS;
-			if (!pck->stream->program->first_dts || pck->stream->program->first_dts > pck->stream->first_dts) {
-				pck->stream->program->first_dts = 1 + pck->stream->first_dts;
-
-				if (pck->stream->pid != import->trackID) {
-					gf_m2ts_set_pes_framing((GF_M2TS_PES *)pck->stream, GF_M2TS_PES_FRAMING_SKIP);
-				}
-			}
-		}
-		if (pck->stream->pid != import->trackID) return;
-
-		/*avc data for the current sample is stored in annex-B, as we don't know the size of each nal
-		when called back (depending on PES packetization, the end of the nal could be in following pes)*/
-		if (tsimp->avccfg && !pck->data[0] && !pck->data[1]) {
-			GF_AVCConfigSlot *slc;
-			s32 idx;
-			Bool add_sps, is_subseq = GF_FALSE;
-			u32 nal_type = pck->data[4] & 0x1F;
-
-			switch (nal_type) {
-			case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
-				is_subseq = GF_TRUE;
-			case GF_AVC_NALU_SEQ_PARAM:
-				idx = gf_media_avc_read_sps(pck->data+4, pck->data_len-4, &tsimp->avc, is_subseq, NULL);
-
-				add_sps = GF_FALSE;
-				if (idx>=0) {
-					if (is_subseq) {
-						if ((tsimp->avc.sps[idx].state & AVC_SUBSPS_PARSED) && !(tsimp->avc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
-							tsimp->avc.sps[idx].state |= AVC_SUBSPS_DECLARED;
-							add_sps = GF_TRUE;
-						}
-					} else {
-						if ((tsimp->avc.sps[idx].state & AVC_SPS_PARSED) && !(tsimp->avc.sps[idx].state & AVC_SPS_DECLARED)) {
-							tsimp->avc.sps[idx].state |= AVC_SPS_DECLARED;
-							add_sps = GF_TRUE;
-						}
-					}
-					if (add_sps) {
-						/*always store nalu size on 4 bytes*/
-						tsimp->avccfg->nal_unit_size = 4;
-						tsimp->avccfg->configurationVersion = 1;
-						tsimp->avccfg->profile_compatibility = tsimp->avc.sps[idx].prof_compat;
-						tsimp->avccfg->AVCProfileIndication = tsimp->avc.sps[idx].profile_idc;
-						tsimp->avccfg->AVCLevelIndication = tsimp->avc.sps[idx].level_idc;
-
-						if (pck->stream->vid_w < tsimp->avc.sps[idx].width)
-							pck->stream->vid_w = tsimp->avc.sps[idx].width;
-						if (pck->stream->vid_h < tsimp->avc.sps[idx].height)
-							pck->stream->vid_h = tsimp->avc.sps[idx].height;
-
-						if (!(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
-							slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-							slc->size = pck->data_len-4;
-							slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-							memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
-							gf_list_add(tsimp->avccfg->sequenceParameterSets, slc);
-						}
-					}
-				}
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					break;
-				}
-				return;
-			case GF_AVC_NALU_PIC_PARAM:
-				idx = gf_media_avc_read_pps(pck->data+4, pck->data_len-4, &tsimp->avc);
-				if ((idx>=0) && (tsimp->avc.pps[idx].status==1)) {
-					tsimp->avc.pps[idx].status = 2;
-					if (!(import->flags & GF_IMPORT_FORCE_XPS_INBAND)) {
-						slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
-						slc->size = pck->data_len-4;
-						slc->data = (char*)gf_malloc(sizeof(char)*slc->size);
-						memcpy(slc->data, pck->data+4, sizeof(char)*slc->size);
-						gf_list_add(tsimp->avccfg->pictureParameterSets, slc);
-					}
-				}
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					break;
-				}
-				/*else discard because of invalid PPS*/
-				return;
-			/*remove*/
-			case GF_AVC_NALU_ACCESS_UNIT:
-				tsimp->force_next_au_start = GF_TRUE;
-				return;
-			case GF_AVC_NALU_FILLER_DATA:
-			case GF_AVC_NALU_END_OF_SEQ:
-			case GF_AVC_NALU_END_OF_STREAM:
-				return;
-			case GF_AVC_NALU_SEI:
-				break;
-
-			}
-
-			if (tsimp->force_next_au_start) {
-				is_au_start = GF_TRUE;
-				tsimp->force_next_au_start = GF_FALSE;
-			}
-		}
-
-		/*avc data for the current sample is stored in annex-B, as we don't know the size of each nal
-		when called back (depending on PES packetization, the end of the nal could be in following pes)*/
-#ifndef GPAC_DISABLE_HEVC
-		else if (tsimp->hevccfg && !pck->data[0] && !pck->data[1]) {
-			s32 idx;
-			Bool add_sps, is_subseq = GF_FALSE;
-			u32 nal_type = (pck->data[4] & 0x7E) >> 1;
-
-			switch (nal_type) {
-			case GF_HEVC_NALU_SEQ_PARAM:
-				idx = gf_media_hevc_read_sps(pck->data+4, pck->data_len-4, &tsimp->hevc);
-				add_sps = GF_FALSE;
-				if (idx>=0) {
-					if (is_subseq) {
-						if ((tsimp->hevc.sps[idx].state & AVC_SUBSPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SUBSPS_DECLARED)) {
-							tsimp->hevc.sps[idx].state |= AVC_SUBSPS_DECLARED;
-							add_sps = GF_TRUE;
-						}
-					} else {
-						if ((tsimp->hevc.sps[idx].state & AVC_SPS_PARSED) && !(tsimp->hevc.sps[idx].state & AVC_SPS_DECLARED)) {
-							tsimp->hevc.sps[idx].state |= AVC_SPS_DECLARED;
-							add_sps = GF_TRUE;
-						}
-					}
-					if (add_sps) {
-						/*always store nalu size on 4 bytes*/
-						tsimp->hevccfg->nal_unit_size = 4;
-						tsimp->hevccfg->configurationVersion = 1;
-
-						tsimp->hevccfg->configurationVersion = 1;
-						tsimp->hevccfg->profile_space = tsimp->hevc.sps[idx].ptl.profile_space;
-						tsimp->hevccfg->profile_idc = tsimp->hevc.sps[idx].ptl.profile_idc;
-						tsimp->hevccfg->constraint_indicator_flags = 0;
-						tsimp->hevccfg->level_idc = tsimp->hevc.sps[idx].ptl.level_idc;
-						tsimp->hevccfg->general_profile_compatibility_flags = tsimp->hevc.sps[idx].ptl.profile_compatibility_flag;
-						tsimp->hevccfg->chromaFormat = tsimp->hevc.sps[idx].chroma_format_idc;
-						tsimp->hevccfg->luma_bit_depth = tsimp->hevc.sps[idx].bit_depth_luma;
-						tsimp->hevccfg->chroma_bit_depth = tsimp->hevc.sps[idx].bit_depth_chroma;
-
-						hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
-
-						if (pck->stream->vid_w < tsimp->avc.sps[idx].width)
-							pck->stream->vid_w = tsimp->avc.sps[idx].width;
-						if (pck->stream->vid_h < tsimp->avc.sps[idx].height)
-							pck->stream->vid_h = tsimp->avc.sps[idx].height;
-					}
-				}
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					is_au_start = GF_TRUE;
-					break;
-				}
-				return;
-			case GF_HEVC_NALU_PIC_PARAM:
-				idx = gf_media_hevc_read_pps(pck->data+4, pck->data_len-4, &tsimp->hevc);
-				if ((idx>=0) && (tsimp->hevc.pps[idx].state==1)) {
-					tsimp->hevc.pps[idx].state = 2;
-					hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
-				}
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					is_au_start = GF_TRUE;
-					break;
-				}
-				return;
-			case GF_HEVC_NALU_VID_PARAM:
-				idx = gf_media_hevc_read_vps(pck->data+4, pck->data_len-4, &tsimp->hevc);
-				if ((idx>=0) && (tsimp->hevc.vps[idx].state==1)) {
-					tsimp->hevc.vps[idx].state = 2;
-					tsimp->hevccfg->avgFrameRate = tsimp->hevc.vps[idx].rates[0].avg_pic_rate;
-					tsimp->hevccfg->constantFrameRate = tsimp->hevc.vps[idx].rates[0].constand_pic_rate_idc;
-					tsimp->hevccfg->numTemporalLayers = tsimp->hevc.vps[idx].max_sub_layers;
-					hevc_cfg_add_nalu(import, tsimp->hevccfg, nal_type, pck->data+4, pck->data_len-4);
-				}
-				if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-					is_au_start = GF_TRUE;
-					break;
-				}
-				return;
-			/*remove*/
-			case GF_HEVC_NALU_ACCESS_UNIT:
-				tsimp->force_next_au_start = GF_TRUE;
-				return;
-			case GF_HEVC_NALU_FILLER_DATA:
-			case GF_HEVC_NALU_END_OF_SEQ:
-			case GF_HEVC_NALU_END_OF_STREAM:
-				return;
-			case GF_HEVC_NALU_SEI_PREFIX:
-				is_au_start = GF_TRUE;
-				break;
-			}
-
-			if (tsimp->force_next_au_start) {
-				is_au_start = GF_TRUE;
-				tsimp->force_next_au_start = GF_FALSE;
-			}
-		}
-#endif //GPAC_DISABLE_HEVC
-
-		if (!is_au_start) {
-			e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
-			if (e) {
-				if (!gf_isom_get_sample_count(import->dest, tsimp->track)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] missed beginning of sample data\n"));
-				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error appending sample data\n"));
-				}
-			}
-			if (pck->flags & GF_M2TS_PES_PCK_I_FRAME) tsimp->nb_i++;
-			if (pck->flags & GF_M2TS_PES_PCK_P_FRAME) tsimp->nb_p++;
-			if (pck->flags & GF_M2TS_PES_PCK_B_FRAME) tsimp->nb_b++;
-
-			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
-				e = gf_isom_set_sample_rap(import->dest, tsimp->track);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error setting RAP flag\n"));
-				}
-			}
-			return;
-		}
-
-		samp = gf_isom_sample_new();
-		samp->DTS = pck->DTS;
-		samp->CTS_Offset = (u32) (pck->PTS - samp->DTS);
-
-		if (pck->stream->first_dts==samp->DTS) {
-			switch (pck->stream->stream_type) {
-			case GF_M2TS_VIDEO_MPEG1:
-				gf_import_message(import, GF_OK, "MPEG-1 Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_VIDEO_MPEG2:
-				gf_import_message(import, GF_OK, "MPEG-2 Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_VIDEO_MPEG4:
-				gf_import_message(import, GF_OK, "MPEG-4 Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_VIDEO_H264:
-				gf_import_message(import, GF_OK, "MPEG-4 AVC/H264 Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_VIDEO_HEVC:
-				gf_import_message(import, GF_OK, "MPEG-H HEVC Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_VIDEO_SVC:
-				gf_import_message(import, GF_OK, "H264-SVC Video import (TS PID %d)", pck->stream->pid);
-				break;
-			case GF_M2TS_AUDIO_MPEG1:
-				gf_import_message(import, GF_OK, "MPEG-1 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
-				break;
-			case GF_M2TS_AUDIO_MPEG2:
-				gf_import_message(import, GF_OK, "MPEG-2 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
-				break;
-			case GF_M2TS_AUDIO_AAC:
-				gf_import_message(import, GF_OK, "MPEG-4 AAC Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
-				break;
-			case GF_M2TS_AUDIO_AC3:
-				gf_import_message(import, GF_OK, "Dolby AC3 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
-				break;
-			case GF_M2TS_AUDIO_EC3:
-				gf_import_message(import, GF_OK, "Dolby E-AC3 Audio import - SampleRate %d Channels %d Language %s (TS PID %d)", pck->stream->aud_sr, pck->stream->aud_nb_ch, gf_4cc_to_str(pck->stream->lang), pck->stream->pid);
-				break;
-			}
-			if (pck->stream->lang)
-				gf_isom_set_media_language(import->dest, tsimp->track, (char *) gf_4cc_to_str(pck->stream->lang)+1);
-		}
-		if (!tsimp->stream_setup) {
-			if (pck->stream->aud_sr) {
-				gf_isom_set_audio_info(import->dest, tsimp->track, 1, pck->stream->aud_sr, pck->stream->aud_nb_ch, 16, import->asemode);
-				tsimp->stream_setup = GF_TRUE;
-			}
-			else if (pck->stream->vid_w) {
-				u32 w = pck->stream->vid_w;
-				if (pck->stream->vid_par) w = w * (pck->stream->vid_par>>16) / (pck->stream->vid_par&0xffff);
-				gf_isom_set_visual_info(import->dest, tsimp->track, 1, pck->stream->vid_w, pck->stream->vid_h);
-				gf_isom_set_track_layout_info(import->dest, tsimp->track, w<<16, pck->stream->vid_h<<16, 0, 0, 0);
-				if (w != pck->stream->vid_w) {
-					e = gf_isom_set_pixel_aspect_ratio(import->dest, tsimp->track, 1, pck->stream->vid_par>>16, pck->stream->vid_par&0xff, GF_FALSE);
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error setting aspect ratio\n"));
-					}
-				}
-				tsimp->stream_setup = GF_TRUE;
-			}
-		}
-
-		if (samp->DTS < pck->stream->first_dts) {
-			u32 sample_num = gf_isom_get_sample_count(import->dest, tsimp->track);
-			u32 dur = gf_isom_get_sample_duration(import->dest, tsimp->track, sample_num);
-
-			pck->stream->first_dts = samp->DTS - (tsimp->last_dts + 1 + dur);
-			pck->stream->program->first_dts = pck->stream->first_dts;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - PCR loop/discontinuity, adjusting\n"));
-		}
-		if (samp->DTS >= pck->stream->first_dts) {
-			samp->DTS -= pck->stream->first_dts;
-			samp->IsRAP = (pck->flags & GF_M2TS_PES_PCK_RAP) ? RAP : RAP_NO;
-			samp->data = pck->data;
-			samp->dataLength = pck->data_len;
-
-			if ((pck->stream->flags & GF_M2TS_ES_FIRST_DTS) && (samp->DTS + 1 == tsimp->last_dts)) {
-				e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
-			} else {
-
-				if (tsimp->avccfg || tsimp->hevccfg) m2ts_rewrite_nalu_sample(import, tsimp);
-
-				e = gf_isom_add_sample(import->dest, tsimp->track, 1, samp);
-			}
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d: Error adding sample: %s\n", pck->stream->pid, gf_error_to_string(e)));
-				//import->flags |= GF_IMPORT_DO_ABORT;
-				import->last_error = e;
-			}
-			if (import->duration && (import->duration<=(samp->DTS+samp->CTS_Offset)/90)) {
-				//import->flags |= GF_IMPORT_DO_ABORT;
-			}
-
-			if (pck->flags & GF_M2TS_PES_PCK_I_FRAME) tsimp->nb_i++;
-			if (pck->flags & GF_M2TS_PES_PCK_P_FRAME) tsimp->nb_p++;
-			if (pck->flags & GF_M2TS_PES_PCK_B_FRAME) tsimp->nb_b++;
-			tsimp->last_dts = samp->DTS + 1;
-		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
-		}
-		samp->data = NULL;
-		gf_isom_sample_del(&samp);
-	}
-	break;
-	case GF_M2TS_EVT_SL_PCK:
-	{
-		GF_M2TS_SL_PCK *sl_pck = (GF_M2TS_SL_PCK *)par;
-
-		/* if there is no IOD for this program we cannot handle SL packets */
-		if (!sl_pck->stream->program->pmt_iod) return;
-
-		if (sl_pck->stream->flags & GF_M2TS_ES_IS_SECTION) {
-			//ses = (GF_M2TS_SECTION_ES *)sl_pck->stream;
-		} else {
-			pes = (GF_M2TS_PES *)sl_pck->stream;
-		}
-
-		if (sl_pck->stream->flags & GF_M2TS_ES_IS_MPEG4_OD) {
-			/* We need to handle OD streams even if this is not the stream we are importing */
-			GF_ESD *esd = gf_m2ts_get_esd(sl_pck->stream);
-			if (esd) {
-				GF_SLHeader hdr;
-				u32 hdr_len;
-				GF_ODCodec *od_codec = gf_odf_codec_new();
-				GF_ODCom *com;
-				GF_ODUpdate* odU;
-				u32 com_count, com_index, od_count, od_index;
-
-				gf_sl_depacketize(esd->slConfig, &hdr, sl_pck->data, sl_pck->data_len, &hdr_len);
-				gf_odf_codec_set_au(od_codec, sl_pck->data+hdr_len, sl_pck->data_len - hdr_len);
-				gf_odf_codec_decode(od_codec);
-				com_count = gf_list_count(od_codec->CommandList);
-				for (com_index = 0; com_index < com_count; com_index++) {
-					com = (GF_ODCom *)gf_list_get(od_codec->CommandList, com_index);
-					switch (com->tag) {
-					case GF_ODF_OD_UPDATE_TAG:
-						odU = (GF_ODUpdate*)com;
-						od_count = gf_list_count(odU->objectDescriptors);
-						for (od_index=0; od_index<od_count; od_index++) {
-							GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, od_index);
-							gf_list_add(sl_pck->stream->program->additional_ods, od);
-
-							/* We need to set the remaining unset track info for the streams declared in this OD */
-							m2ts_set_tracks_mpeg4_probe_info(import, sl_pck->stream->program, od->ESDescriptors);
-						}
-						gf_list_reset(odU->objectDescriptors);
-					}
-				}
-				gf_odf_codec_del(od_codec);
-			}
-
-		}
-
-		if (import->flags & GF_IMPORT_PROBE_ONLY) {
-			if (pes) {
-				for (i=0; i<import->nb_tracks; i++) {
-					if (import->tk_info[i].track_num == sl_pck->stream->pid) {
-						if (pes->aud_sr) {
-							import->tk_info[i].audio_info.sample_rate = pes->aud_sr;
-							import->tk_info[i].audio_info.nb_channels = pes->aud_nb_ch;
-						} else {
-							import->tk_info[i].video_info.width = pes->vid_w;
-							import->tk_info[i].video_info.height = pes->vid_h;
-						}
-						break;
-					}
-				}
-//					if (pes->vid_h || pes->aud_sr) import->flags |= GF_IMPORT_DO_ABORT;
-			}
-			return;
-		}
-
-		if (sl_pck->stream->pid != import->trackID) return;
-
-		/* we create a track for the stream to import only if it was not created */
-		if (!gf_isom_get_track_by_id(import->dest, (import->esd?import->esd->ESID:import->trackID))) {
-			u32 mtype, stype, oti;
-			mtype = stype = oti = 0;
-			import->esd = gf_m2ts_get_esd(sl_pck->stream);
-			m2ts_set_track_mpeg4_creation_info(import, &mtype, &stype, &oti);
-			m2ts_create_track(tsimp, mtype, stype, oti, sl_pck->stream->mpeg4_es_id, GF_FALSE);
-		}
-
-		if (import->esd) {
-			GF_SLHeader hdr;
-			u32 hdr_len;
-			gf_sl_depacketize(import->esd->slConfig, &hdr, sl_pck->data, sl_pck->data_len, &hdr_len);
-
-			if (!hdr.accessUnitStartFlag) {
-				e = gf_isom_append_sample_data(import->dest, tsimp->track, sl_pck->data + hdr_len, sl_pck->data_len - hdr_len);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] Error appending sample data\n"));
-				}
-			} else {
-				if (!(sl_pck->stream->flags & GF_M2TS_ES_FIRST_DTS)) {
-					sl_pck->stream->flags |= GF_M2TS_ES_FIRST_DTS;
-
-					if (!hdr.compositionTimeStampFlag) {
-						hdr.compositionTimeStamp = sl_pck->stream->program->first_dts - 1;
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d First SL Access unit start flag set without any composition time stamp - defaulting to last CTS seen on program\n", sl_pck->stream->pid));
-					}
-					sl_pck->stream->first_dts = (hdr.decodingTimeStamp?hdr.decodingTimeStamp:hdr.compositionTimeStamp);
-					if (!sl_pck->stream->program->first_dts || (sl_pck->stream->program->first_dts > sl_pck->stream->first_dts)) {
-						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts + 1;
-					}
-				} else {
-					if (!hdr.compositionTimeStampFlag) {
-						hdr.compositionTimeStamp = sl_pck->stream->first_dts + tsimp->last_dts - 1;
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d SL Access unit start flag set without any composition time stamp - defaulting to last CTS seen on stream + 1\n", sl_pck->stream->pid));
-					}
-				}
-
-				samp = gf_isom_sample_new();
-				samp->DTS = (hdr.decodingTimeStamp?hdr.decodingTimeStamp:hdr.compositionTimeStamp);
-				samp->CTS_Offset = (u32) (hdr.compositionTimeStamp - samp->DTS);
-				if (samp->DTS >= sl_pck->stream->first_dts) {
-					samp->DTS -= sl_pck->stream->first_dts;
-					samp->IsRAP = import->esd->slConfig->useRandomAccessPointFlag ? hdr.randomAccessPointFlag : RAP;
-
-					/*fix for some DMB streams where TSs are not coded*/
-					if ((tsimp->last_dts == 1 + samp->DTS) && gf_isom_get_sample_count(import->dest, tsimp->track))
-						samp->DTS += gf_isom_get_media_timescale(import->dest, tsimp->track);
-
-					samp->data = sl_pck->data + hdr_len;
-					samp->dataLength = sl_pck->data_len - hdr_len;
-
-					e = gf_isom_add_sample(import->dest, tsimp->track, 1, samp);
-					/*if CTS was not specified, samples will simply be skipped*/
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] PID %d Error adding sample\n", sl_pck->stream->pid));
-					}
-					if (import->duration && (import->duration<=(samp->DTS+samp->CTS_Offset)/90)) {
-						//import->flags |= GF_IMPORT_DO_ABORT;
-					}
-					tsimp->last_dts = samp->DTS + 1;
-
-				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS Import] negative time sample - skipping\n"));
-					sl_pck->stream->first_dts = samp->DTS;
-					if (!sl_pck->stream->program->first_dts || (sl_pck->stream->program->first_dts > sl_pck->stream->first_dts)) {
-						sl_pck->stream->program->first_dts = sl_pck->stream->first_dts + 1;
-					}
-				}
-				samp->data = NULL;
-				gf_isom_sample_del(&samp);
-			}
-		}
-	}
-	break;
-	}
-}
-
-extern void gf_m2ts_flush_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes);
-
-/* Warning: we start importing only after finding the PMT */
-GF_Err gf_import_mpeg_ts(GF_MediaImporter *import)
-{
-	GF_M2TS_Demuxer *ts;
-	GF_M2TS_ES *es;
-	char data[188];
-	GF_TSImport tsimp;
-	u64 fsize, done;
-	u32 size, i;
-	Bool do_import = GF_TRUE;
-	FILE *mts;
-	char progress[1000];
-
-	if (import->trackID > GF_M2TS_MAX_STREAMS)
-		return gf_import_message(import, GF_BAD_PARAM, "Invalid PID %d", import->trackID );
-
-	mts = gf_fopen(import->in_name, "rb");
-	if (!mts) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-
-	gf_fseek(mts, 0, SEEK_END);
-	fsize = gf_ftell(mts);
-	gf_fseek(mts, 0, SEEK_SET);
-	done = 0;
-
-	memset(&tsimp, 0, sizeof(GF_TSImport));
-	tsimp.avc.sps_active_idx = -1;
-	tsimp.import = import;
-	ts = gf_m2ts_demux_new();
-	ts->on_event = on_m2ts_import_data;
-	ts->user = &tsimp;
-	ts->file_size = fsize;
-
-	ts->dvb_h_demux = (import->flags & GF_IMPORT_MPE_DEMUX) ? GF_TRUE : GF_FALSE;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) do_import = GF_FALSE;
-
-	sprintf(progress, "Importing MPEG-2 TS (PID %d)", import->trackID);
-	if (do_import) gf_import_message(import, GF_OK, progress);
-
-	while (!feof(mts)) {
-		size = (u32) fread(data, sizeof(char), 188, mts);
-		if (size<188)
-			break;
-
-		gf_m2ts_process_data(ts, data, size);
-		ts->nb_pck++;
-		if (import->flags & GF_IMPORT_DO_ABORT) break;
-		done += size;
-		if (do_import) gf_set_progress(progress, (u32) (done/1024), (u32) (fsize/1024));
-	}
-	import->flags &= ~GF_IMPORT_DO_ABORT;
-
-	if (import->last_error) {
-		GF_Err e = import->last_error;
-		import->last_error = GF_OK;
-		if (tsimp.avccfg) gf_odf_avc_cfg_del(tsimp.avccfg);
-		if (tsimp.hevccfg) gf_odf_hevc_cfg_del(tsimp.hevccfg);
-		gf_m2ts_demux_del(ts);
-		gf_fclose(mts);
-		return e;
-	}
-
-	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-		if (ts->ess[i]) {
-			if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
-				gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
-				ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
-			}
-		}
-	}
-
-	import->esd = NULL;
-	if (do_import) gf_set_progress(progress, (u32) (fsize/1024), (u32) (fsize/1024));
-
-	if (! (import->flags & GF_IMPORT_MPE_DEMUX)) {
-		gf_m2ts_print_info(ts);
-	}
-
-	if (!(import->flags & GF_IMPORT_PROBE_ONLY)) {
-		es = (GF_M2TS_ES *)ts->ess[import->trackID];
-		if (!es) {
-			gf_m2ts_demux_del(ts);
-			gf_fclose(mts);
-			return gf_import_message(import, GF_BAD_PARAM, "Unknown PID %d", import->trackID);
-		}
-
-		if (tsimp.avccfg) {
-			u32 w = ((GF_M2TS_PES*)es)->vid_w;
-			u32 h = ((GF_M2TS_PES*)es)->vid_h;
-			gf_isom_avc_config_update(import->dest, tsimp.track, 1, tsimp.avccfg);
-
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				gf_isom_avc_set_inband_config(import->dest, tsimp.track, 1);
-			}
-
-			gf_isom_set_visual_info(import->dest, tsimp.track, 1, w, h);
-			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
-
-
-			m2ts_rewrite_nalu_sample(import, &tsimp);
-
-			gf_odf_avc_cfg_del(tsimp.avccfg);
-		}
-
-		if (tsimp.hevccfg) {
-			GF_M2TS_PES *pes = (GF_M2TS_PES*) es;
- 			u32 w = pes->vid_w;
-			u32 h = pes->vid_h;
-			hevc_set_parall_type(tsimp.hevccfg);
-			gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
-
-			if (tsimp.is_substream) {
-				u32 tk = gf_isom_get_track_by_id(import->dest, pes->depends_on_pid);
-				if (tk) {
-					GF_HEVCConfig *hcfg = gf_isom_hevc_config_get(import->dest, tk, 1);
-					gf_isom_set_track_reference(import->dest, tsimp.track, GF_ISOM_REF_BASE, pes->depends_on_pid);
-					gf_isom_get_visual_info(import->dest, tk, 1, &w, &h);
-					if (hcfg && tsimp.hevccfg) {
-						GF_List *ar = tsimp.hevccfg->param_array;
-						memcpy(tsimp.hevccfg, hcfg, sizeof(GF_HEVCConfig));
-						tsimp.hevccfg->param_array = ar;
-						gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
-					}
-					if (hcfg) gf_odf_hevc_cfg_del(hcfg);
-
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Importing HEVC substream but base track not found\n"));
-				}
-				if ((es->stream_type==GF_M2TS_VIDEO_HEVC_TEMPORAL) || (es->stream_type==GF_M2TS_VIDEO_HEVC_MCTS)) {
-					//NULL config: we keep hvcC but change to hvc2 the sample entry
-					gf_isom_lhvc_config_update(import->dest, tsimp.track, 1, NULL, GF_ISOM_LEHVC_WITH_BASE);
-				} else {
-					gf_isom_lhvc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg, GF_ISOM_LEHVC_ONLY);
-				}
-			}
-			if (import->flags & GF_IMPORT_FORCE_XPS_INBAND) {
-				gf_isom_hevc_set_inband_config(import->dest, tsimp.track, 1);
-			}
-
-			gf_isom_set_visual_info(import->dest, tsimp.track, 1, w, h);
-			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
-
-			m2ts_rewrite_nalu_sample(import, &tsimp);
-
-			gf_odf_hevc_cfg_del(tsimp.hevccfg);
-		}
-
-
-		if (tsimp.track) {
-			gf_media_update_bitrate(import->dest, tsimp.track);
-			/* creation of the edit lists */
-			if ((es->first_dts != es->program->first_dts) && gf_isom_get_sample_count(import->dest, tsimp.track) ) {
-				u32 media_ts, moov_ts, offset;
-				u64 dur;
-				Double pdur, poffset;
-				media_ts = gf_isom_get_media_timescale(import->dest, tsimp.track);
-				moov_ts = gf_isom_get_timescale(import->dest);
-				assert(es->program->first_dts - 1 <= es->first_dts);
-				poffset = (es->first_dts - (es->program->first_dts - 1) ) * 1.0 * moov_ts / media_ts;
-				offset = (u32)poffset;
-				pdur = gf_isom_get_media_duration(import->dest, tsimp.track) * 1.0 * moov_ts / media_ts;
-				dur = (u64)pdur;
-				if (poffset != offset || pdur != dur) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Movie timescale (%u) not precise enough to store edit (media timescale: %u)\n", moov_ts, media_ts));
-				}
-				gf_isom_set_edit_segment(import->dest, tsimp.track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
-				gf_isom_set_edit_segment(import->dest, tsimp.track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
-				gf_import_message(import, GF_OK, "Timeline offset: %u ms", (offset * 1000) / moov_ts);
-			}
-
-			if (tsimp.nb_p) {
-				gf_import_message(import, GF_OK, "Import results: %d VOPs (%d Is - %d Ps - %d Bs)", gf_isom_get_sample_count(import->dest, tsimp.track), tsimp.nb_i, tsimp.nb_p, tsimp.nb_b);
-			}
-
-			if (es->program->pmt_iod)
-				gf_isom_set_brand_info(import->dest, GF_ISOM_BRAND_MP42, 1);
-		}
-	}
-
-	gf_m2ts_demux_del(ts);
-	gf_fclose(mts);
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_MPEG2TS*/
-
-GF_Err gf_import_vobsub(GF_MediaImporter *import)
-{
-#ifndef GPAC_DISABLE_VOBSUB
-	static const u8 null_subpic[] = { 0x00, 0x09, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0xFF };
-	char		  filename[GF_MAX_PATH];
-	FILE		 *file = NULL;
-	int		  version;
-	vobsub_file	  *vobsub = NULL;
-	u32		  c, trackID, track, di;
-	Bool		  destroy_esd = GF_FALSE;
-	GF_Err		  err = GF_OK;
-	GF_ISOSample	 *samp = NULL;
-	GF_List		 *subpic;
-	u64 last_dts = 0;
-	u32 total, last_samp_dur = 0;
-	unsigned char buf[0x800];
-
-	strcpy(filename, import->in_name);
-	vobsub_trim_ext(filename);
-	strcat(filename, ".idx");
-
-	file = gf_fopen(filename, "r");
-	if (!file) {
-		err = gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", filename);
-		goto error;
-	}
-
-	GF_SAFEALLOC(vobsub, vobsub_file);
-	if (!vobsub) {
-		err = gf_import_message(import, GF_OUT_OF_MEM, "Memory allocation failed");
-		goto error;
-	}
-
-	err = vobsub_read_idx(file, vobsub, &version);
-	gf_fclose(file);
-
-	if (err != GF_OK) {
-		err = gf_import_message(import, err, "Reading VobSub file %s failed", filename);
-		goto error;
-	} else if (version < 6) {
-		err = gf_import_message(import, err, "Unsupported VobSub version", filename);
-		goto error;
-	}
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		import->nb_tracks = 0;
-		for (c = 0; c < 32; c++) {
-			if (vobsub->langs[c].id != 0) {
-				import->tk_info[import->nb_tracks].track_num = c + 1;
-				import->tk_info[import->nb_tracks].type		 = GF_ISOM_MEDIA_SUBPIC;
-				import->tk_info[import->nb_tracks].flags	 = 0;
-				import->nb_tracks++;
-			}
-		}
-		vobsub_free(vobsub);
-		return GF_OK;
-	}
-
-	strcpy(filename, import->in_name);
-	vobsub_trim_ext(filename);
-	strcat(filename, ".sub");
-
-	file = gf_fopen(filename, "rb");
-	if (!file) {
-		err = gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", filename);
-		goto error;
-	}
-
-	trackID = import->trackID;
-	if (!trackID) {
-		trackID = 0-1U;
-		if (vobsub->num_langs != 1) {
-			err = gf_import_message(import, GF_BAD_PARAM, "Several tracks in VobSub - please indicate track to import");
-			goto error;
-		}
-		for (c = 0; c < 32; c++) {
-			if (vobsub->langs[c].id != 0) {
-				trackID = c;
-				break;
-			}
-		}
-		if (trackID == 0-1U) {
-			err = gf_import_message(import, GF_URL_ERROR, "Cannot find track ID %d in file", trackID);
-			goto error;
-		}
-	}
-	trackID--;
-
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	}
-	if (!import->esd->decoderConfig) {
-		import->esd->decoderConfig = (GF_DecoderConfig*)gf_odf_desc_new(GF_ODF_DCD_TAG);
-	}
-	if (!import->esd->slConfig) {
-		import->esd->slConfig = (GF_SLConfig*)gf_odf_desc_new(GF_ODF_SLC_TAG);
-	}
-	if (!import->esd->decoderConfig->decoderSpecificInfo) {
-		import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor*)gf_odf_desc_new(GF_ODF_DSI_TAG);
-	}
-
-	import->esd->decoderConfig->streamType		 = GF_STREAM_ND_SUBPIC;
-	import->esd->decoderConfig->objectTypeIndication = GPAC_OTI_MEDIA_SUBPIC;
-
-	import->esd->decoderConfig->decoderSpecificInfo->dataLength = sizeof(vobsub->palette);
-	import->esd->decoderConfig->decoderSpecificInfo->data		= (char*)&vobsub->palette[0][0];
-
-	gf_import_message(import, GF_OK, "VobSub import - subpicture stream '%s'", vobsub->langs[trackID].name);
-
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_SUBPIC, 90000);
-	if (!track) {
-		err = gf_isom_last_error(import->dest);
-		err = gf_import_message(import, err, "Could not create new track");
-		goto error;
-	}
-
-	gf_isom_set_track_enabled(import->dest, track, 1);
-
-	if (!import->esd->ESID) {
-		import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	}
-	import->final_trackID = import->esd->ESID;
-
-	gf_isom_new_mpeg4_description(import->dest, track, import->esd, NULL, NULL, &di);
-	gf_isom_set_track_layout_info(import->dest, track, vobsub->width << 16, vobsub->height << 16, 0, 0, 0);
-	gf_isom_set_media_language(import->dest, track, vobsub->langs[trackID].name);
-
-	samp = gf_isom_sample_new();
-	samp->IsRAP = SAP_TYPE_1;
-	samp->dataLength = sizeof(null_subpic);
-	samp->data	= (char*)null_subpic;
-
-	subpic = vobsub->langs[trackID].subpos;
-	total  = gf_list_count(subpic);
-
-	last_dts = 0;
-	for (c = 0; c < total; c++)
-	{
-		u32		i, left, size, psize, dsize, hsize, duration;
-		char *packet;
-		vobsub_pos *pos = (vobsub_pos*)gf_list_get(subpic, c);
-
-		if (import->duration && pos->start > import->duration) {
-			break;
-		}
-
-		gf_fseek(file, pos->filepos, SEEK_SET);
-		if (gf_ftell(file) != pos->filepos) {
-			err = gf_import_message(import, GF_IO_ERR, "Could not seek in file");
-			goto error;
-		}
-
-		if (!fread(buf, sizeof(buf), 1, file)) {
-			err = gf_import_message(import, GF_IO_ERR, "Could not read from file");
-			goto error;
-		}
-
-		if (*(u32*)&buf[0x00] != 0xba010000		   ||
-		        *(u32*)&buf[0x0e] != 0xbd010000		   ||
-		        !(buf[0x15] & 0x80)				   ||
-		        (buf[0x17] & 0xf0) != 0x20			   ||
-		        (buf[buf[0x16] + 0x17] & 0xe0) != 0x20)
-		{
-			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (1)", filename);
-			continue;
-		}
-
-		psize = (buf[buf[0x16] + 0x18] << 8) + buf[buf[0x16] + 0x19];
-		dsize = (buf[buf[0x16] + 0x1a] << 8) + buf[buf[0x16] + 0x1b];
-		packet = (char *) gf_malloc(sizeof(char)*psize);
-		if (!packet) {
-			err = gf_import_message(import, GF_OUT_OF_MEM, "Memory allocation failed");
-			goto error;
-		}
-
-		for (i = 0, left = psize; i < psize; i += size, left -= size) {
-			hsize = 0x18 + buf[0x16];
-			size  = MIN(left, 0x800 - hsize);
-			memcpy(packet + i, buf + hsize, size);
-
-			if (size != left) {
-				while (fread(buf, 1, sizeof(buf), file)) {
-					if (buf[buf[0x16] + 0x17] == (trackID | 0x20)) {
-						break;
-					}
-				}
-			}
-		}
-
-		if (i != psize || left > 0) {
-			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (2)", filename);
-			continue;
-		}
-
-		if (vobsub_get_subpic_duration(packet, psize, dsize, &duration) != GF_OK) {
-			gf_import_message(import, GF_CORRUPTED_DATA, "[VobSub] Corrupted data found in file %s (3)", filename);
-			continue;
-		}
-
-		last_samp_dur = duration;
-
-		/*first sample has non-0 DTS, add an empty one*/
-		if (!c && (pos->start != 0)) {
-			err = gf_isom_add_sample(import->dest, track, di, samp);
-			if (err) goto error;
-		}
-
-		samp->data	 = packet;
-		samp->dataLength = psize;
-		samp->DTS	 = pos->start * 90;
-
-		if (last_dts && (last_dts >= samp->DTS)) {
-			err = gf_import_message(import, GF_CORRUPTED_DATA, "Out of order timestamps in vobsub file");
-			goto error;
-		}
-
-		err = gf_isom_add_sample(import->dest, track, di, samp);
-		if (err) goto error;
-		gf_free(packet);
-
-		gf_set_progress("Importing VobSub", c, total);
-		last_dts = samp->DTS;
-
-		if (import->flags & GF_IMPORT_DO_ABORT) {
-			break;
-		}
-	}
-
-	gf_isom_set_last_sample_duration(import->dest, track, last_samp_dur);
-
-	gf_media_update_bitrate(import->dest, track);
-	gf_set_progress("Importing VobSub", total, total);
-
-	err = GF_OK;
-
-error:
-	if (import->esd && destroy_esd) {
-		import->esd->decoderConfig->decoderSpecificInfo->data = NULL;
-		gf_odf_desc_del((GF_Descriptor *)import->esd);
-		import->esd = NULL;
-	}
-	if (samp) {
-		samp->data = NULL;
-		gf_isom_sample_del(&samp);
-	}
-	if (vobsub) {
-		vobsub_free(vobsub);
-	}
-	if (file) {
-		gf_fclose(file);
-	}
-
-	return err;
-#else
-	return GF_NOT_SUPPORTED;
-#endif
-}
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-GF_Err gf_import_ac3(GF_MediaImporter *import, Bool is_EAC3)
-{
-	GF_AC3Header hdr;
-	GF_AC3Config cfg;
-	Bool destroy_esd;
-	GF_Err e;
-	u16 sr;
-	u32 nb_chan;
-	FILE *in;
-	GF_BitStream *bs;
-	u32 max_size, track, di;
-	u64 tot_size, done, duration;
-	GF_ISOSample *samp;
-	Bool (*ac3_parser_bs)(GF_BitStream*, GF_AC3Header*, Bool) = gf_ac3_parser_bs;
-
-	in = gf_fopen(import->in_name, "rb");
-	if (!in) return gf_import_message(import, GF_URL_ERROR, "Opening file %s failed", import->in_name);
-	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
-
-	memset(&hdr, 0, sizeof(GF_AC3Header));
-	memset(&cfg, 0, sizeof(GF_AC3Config));
-	if (is_EAC3 || !gf_ac3_parser_bs(bs, &hdr, GF_TRUE)) {
-		if (!gf_eac3_parser_bs(bs, &hdr, GF_TRUE)) {
-			gf_bs_del(bs);
-			gf_fclose(in);
-			return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio is neither AC3 or E-AC3 audio");
-		}
-		is_EAC3 = GF_TRUE;
-		ac3_parser_bs = gf_eac3_parser_bs;
-	}
-	sr = hdr.sample_rate;
-
-	if (import->flags & GF_IMPORT_PROBE_ONLY) {
-		gf_bs_del(bs);
-		gf_fclose(in);
-		import->tk_info[0].track_num = 1;
-		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
-		import->tk_info[0].media_type = GF_MEDIA_TYPE_AC3;
-		import->tk_info[0].flags = GF_IMPORT_USE_DATAREF;
-		import->tk_info[0].audio_info.sample_rate = sr;
-		import->tk_info[0].audio_info.nb_channels = hdr.channels;
-		import->nb_tracks = 1;
-		return GF_OK;
-	}
-
-	destroy_esd = GF_FALSE;
-	if (!import->esd) {
-		import->esd = gf_odf_desc_esd_new(2);
-		destroy_esd = GF_TRUE;
-	}
-	if (!import->esd->decoderConfig) import->esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	if (!import->esd->slConfig) import->esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	/*update stream type/oti*/
-	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	import->esd->decoderConfig->objectTypeIndication = is_EAC3 ? GPAC_OTI_AUDIO_EAC3 : GPAC_OTI_AUDIO_AC3;
-	import->esd->decoderConfig->bufferSizeDB = 20;
-	import->esd->slConfig->timestampResolution = sr;
-
-	samp = NULL;
-	nb_chan = hdr.channels;
-	gf_import_message(import, GF_OK, "%sAC3 import - sample rate %d - %d%s channel%s", is_EAC3 ? "Enhanced " : "", sr, hdr.lfon ? (nb_chan-1) : nb_chan, hdr.lfon?".1":"", (nb_chan>1) ? "s" : "");
-
-	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, sr);
-	if (!track) {
-		e = gf_isom_last_error(import->dest);
-		goto exit;
-	}
-	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
-	import->final_trackID = import->esd->ESID;
-	if (import->esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) import->esd->decoderConfig->decoderSpecificInfo);
-	import->esd->decoderConfig->decoderSpecificInfo = NULL;
-
-	cfg.is_ec3 = is_EAC3;
-	cfg.nb_streams = 1;
-	cfg.brcode = hdr.brcode;
-	cfg.streams[0].acmod = hdr.acmod;
-	cfg.streams[0].bsid = hdr.bsid;
-	cfg.streams[0].bsmod = hdr.bsmod;
-	cfg.streams[0].fscod = hdr.fscod;
-	cfg.streams[0].lfon = hdr.lfon;
-
-	gf_isom_ac3_config_new(import->dest, track, &cfg, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
-	gf_isom_set_audio_info(import->dest, track, di, sr, nb_chan, 16, import->asemode);
-
-	gf_bs_seek(bs, 0);
-	tot_size = gf_bs_get_size(bs);
-
-	e = GF_OK;
-	samp = gf_isom_sample_new();
-	samp->IsRAP = RAP;
-
-	duration = import->duration;
-	duration *= sr;
-	duration /= 1000;
-
-	max_size = 0;
-	done = 0;
-	while (ac3_parser_bs(bs, &hdr, GF_FALSE)) {
-		if (is_EAC3)
-			samp->dataLength = 2*(1+hdr.framesize);
-		else
-			samp->dataLength = hdr.framesize;
-
-		if (import->flags & GF_IMPORT_USE_DATAREF) {
-			e = gf_isom_add_sample_reference(import->dest, track, di, samp, gf_bs_get_position(bs) );
-			gf_bs_skip_bytes(bs, samp->dataLength);
-		} else {
-			if (samp->dataLength > max_size) {
-				samp->data = (char*)gf_realloc(samp->data, sizeof(char) * samp->dataLength);
-				max_size = samp->dataLength;
-			}
-			if (!gf_bs_read_data(bs, samp->data, samp->dataLength)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[AC3 import] Truncated file - want to read %d bytes but remain only %d bytes\n", samp->dataLength, gf_bs_get_size(bs) - gf_bs_get_position(bs)));
-				break;
-			}
-			e = gf_isom_add_sample(import->dest, track, di, samp);
-		}
-		if (e)
-			goto exit;
-
-		gf_set_progress("Importing AC3", done, tot_size);
-
-		samp->DTS += 1536;
-		done = gf_bs_get_position(bs);
-		if (duration && (samp->DTS > duration))
-			break;
-		if (import->flags & GF_IMPORT_DO_ABORT)
-			break;
-	}
-	gf_media_update_bitrate(import->dest, track);
-	gf_set_progress("Importing AC3", tot_size, tot_size);
-
-exit:
-	if (import->esd && destroy_esd) {
-		gf_odf_desc_del((GF_Descriptor *) import->esd);
-		import->esd = NULL;
-	}
-	if (samp) gf_isom_sample_del(&samp);
-	gf_bs_del(bs);
-	gf_fclose(in);
-	return e;
-}
-#endif
-
 GF_EXPORT
 GF_Err gf_media_import_chapters_file(GF_MediaImporter *import)
 {
@@ -10552,7 +749,7 @@
 	FILE *f = gf_fopen(import->in_name, "rt");
 	if (!f) return GF_URL_ERROR;
 
-	read = (s32) fread(line, 1, 4, f);
+	read = (s32) gf_fread(line, 4, f);
 	if (read < 0) {
 		e = GF_IO_ERR;
 		goto err_exit;
@@ -10585,7 +782,7 @@
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		Bool is_chap_or_sub = GF_FALSE;
 		import->nb_tracks = 0;
-		while (!is_chap_or_sub && (fgets(line, 1024, f) != NULL)) {
+		while (!is_chap_or_sub && (gf_fgets(line, 1024, f) != NULL)) {
 			char *sep;
 			strlwr(line);
 
@@ -10602,8 +799,8 @@
 		gf_fclose(f);
 		if (is_chap_or_sub) {
 			import->nb_tracks = 1;
-			import->tk_info[0].media_type = GF_MEDIA_TYPE_CHAP;
-			import->tk_info[0].type = GF_ISOM_MEDIA_TEXT;
+			import->tk_info[0].stream_type = GF_STREAM_TEXT;
+			import->tk_info[0].is_chapter = GF_TRUE;
 			return GF_OK;
 		}
 		return GF_NOT_SUPPORTED;
@@ -10612,32 +809,34 @@
 	e = gf_isom_remove_chapter(import->dest, 0, 0);
 	if (e) goto err_exit;
 
-	if (!import->video_fps) {
+	if (!import->video_fps.num || !import->video_fps.den ) {
 		/*try to figure out the frame rate*/
 		for (i=0; i<gf_isom_get_track_count(import->dest); i++) {
 			GF_ISOSample *samp;
-			u32 ts, inc;
+			u32 timescale, inc;
             u32 mtype = gf_isom_get_media_type(import->dest, i+1);
-			if (!gf_isom_is_video_subtype(mtype)) continue;
+			if (!gf_isom_is_video_handler_type(mtype)) continue;
 			if (gf_isom_get_sample_count(import->dest, i+1) < 20) continue;
 			samp = gf_isom_get_sample_info(import->dest, 1, 2, NULL, NULL);
 			inc = (u32) samp->DTS;
 			if (!inc) inc=1;
-			ts = gf_isom_get_media_timescale(import->dest, i+1);
-			import->video_fps = ts;
-			import->video_fps /= inc;
+			timescale = gf_isom_get_media_timescale(import->dest, i+1);
+			import->video_fps.num = timescale;
+			import->video_fps.den = inc;
 			gf_isom_sample_del(&samp);
-			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[Chapter import] Guessed video frame rate %g (%u:%u)\n", import->video_fps, ts, inc));
+			GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[Chapter import] Guessed video frame rate %u/%u\n", timescale, inc));
 			break;
 		}
-		if (!import->video_fps)
-			import->video_fps = 25;
+		if (!import->video_fps.num || !import->video_fps.den) {
+			import->video_fps.num = 25;
+			import->video_fps.den = 1;
+		}
 	}
 
 	cur_chap = 0;
 	ts = 0;
 	state = 0;
-	while (fgets(line, 1024, f) != NULL) {
+	while (gf_fgets(line, 1024, f) != NULL) {
 		char *title = NULL;
 		u32 off = 0;
 		char *sL;
@@ -10663,17 +862,17 @@
 		/*ZoomPlayer chapters*/
 		if (!strnicmp(sL, "AddChapter(", 11)) {
 			u32 nb_fr;
-			sscanf(sL, "AddChapter(%u,%s)", &nb_fr, szTitle);
+			sscanf(sL, "AddChapter(%u,%1023s)", &nb_fr, szTitle);
 			ts = nb_fr;
 			ts *= 1000;
-			ts = (u64) (((s64) ts ) / import->video_fps);
+			ts = (u64) (((s64) ts )  *import->video_fps.den / import->video_fps.num);
 			sL = strchr(sL, ',');
 			strcpy(szTitle, sL+1);
 			sL = strrchr(szTitle, ')');
 			if (sL) sL[0] = 0;
 		} else if (!strnicmp(sL, "AddChapterBySecond(", 19)) {
 			u32 nb_s;
-			sscanf(sL, "AddChapterBySecond(%u,%s)", &nb_s, szTitle);
+			sscanf(sL, "AddChapterBySecond(%u,%1023s)", &nb_s, szTitle);
 			ts = nb_s;
 			ts *= 1000;
 			sL = strchr(sL, ',');
@@ -10681,8 +880,7 @@
 			sL = strrchr(szTitle, ')');
 			if (sL) sL[0] = 0;
 		} else if (!strnicmp(sL, "AddChapterByTime(", 17)) {
-			u32 h, m, s;
-			sscanf(sL, "AddChapterByTime(%u,%u,%u,%s)", &h, &m, &s, szTitle);
+			sscanf(sL, "AddChapterByTime(%u,%u,%u,%1023s)", &h, &m, &s, szTitle);
 			ts = 3600*h + 60*m + s;
 			ts *= 1000;
 			sL = strchr(sL, ',');
@@ -10701,7 +899,8 @@
 			}
 			else {
 				char szTS[20], *tok;
-				strncpy(szTS, sL, 18);
+				strncpy(szTS, sL, 19);
+				szTS[19]=0;
 				tok = strrchr(szTS, ' ');
 				if (tok) {
 					title = strchr(sL, ' ') + 1;
@@ -10716,12 +915,18 @@
 					ts = (h*3600 + m*60+s)*1000 + 1000*fr/fps;
 				} else if (sscanf(szTS, "%u:%u:%u;%u", &h, &m, &s, &fr)==4) {
 					ts = (h*3600 + m*60+s);
-					ts = (s64) (((import->video_fps*((s64)ts) + fr) * 1000 ) / import->video_fps);
+					ts = (s64) (((import->video_fps.num*((s64)ts) + import->video_fps.den*fr) * 1000 ) / import->video_fps.num ) ;
 				} else if (sscanf(szTS, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					//microseconds used
+					if (ms>=1000) ms /= 1000;
 					ts = (h*3600 + m*60+s)*1000+ms;
 				} else if (sscanf(szTS, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					//microseconds used
+					if (ms>=1000) ms /= 1000;
 					ts = (h*3600 + m*60+s)*1000+ms;
 				} else if (sscanf(szTS, "%u:%u:%u:%u", &h, &m, &s, &ms) == 4) {
+					//microseconds used
+					if (ms>=1000) ms /= 1000;
 					ts = (h*3600 + m*60+s)*1000+ms;
 				} else if (sscanf(szTS, "%u:%u:%u", &h, &m, &s) == 3) {
 					ts = (h*3600 + m*60+s) * 1000;
@@ -10733,6 +938,7 @@
 			u32 idx;
 			char szTemp[20], *str;
 			strncpy(szTemp, sL, 19);
+			szTemp[19] = 0;
 			str = strrchr(szTemp, '=');
 			if (!str) continue;
 			str[0] = 0;
@@ -10759,8 +965,12 @@
 				ts = 0;
 				h = m = s = ms = 0;
 				if (sscanf(str, "%u:%u:%u.%u", &h, &m, &s, &ms) == 4) {
+					//microseconds used
+					if (ms>=1000) ms/=1000;
 					ts = (h*3600 + m*60+s)*1000+ms;
 				} else if (sscanf(str, "%u:%u:%u:%u", &h, &m, &s, &ms) == 4) {
+					//microseconds used
+					if (ms>=1000) ms/=1000;
 					ts = (h*3600 + m*60+s)*1000+ms;
 				} else if (sscanf(str, "%u:%u:%u", &h, &m, &s) == 3) {
 					ts = (h*3600 + m*60+s) * 1000;
@@ -10789,26 +999,80 @@
 }
 
 GF_EXPORT
-GF_Err gf_media_import_chapters(GF_ISOFile *file, char *chap_file, Double import_fps)
+GF_Err gf_media_import_chapters(GF_ISOFile *file, char *chap_file, GF_Fraction import_fps, Bool use_qt)
 {
+	GF_Err e;
+	u32 i;
 	GF_MediaImporter import;
+	//remove all chapter info
+	gf_isom_remove_chapter(file, 0, 0);
+
+restart_check:
+	//remove all chapter tracks
+	for (i=0; i<gf_isom_get_track_count(file); i++) {
+		if (gf_isom_get_reference_count(file, i+1, GF_ISOM_REF_CHAP)) {
+			u32 chap_track=0;
+			gf_isom_get_reference(file, i+1, GF_ISOM_REF_CHAP, 1, &chap_track);
+			if (chap_track) {
+				gf_isom_remove_track(file, chap_track);
+				goto restart_check;
+			}
+		}
+	}
+
 	memset(&import, 0, sizeof(GF_MediaImporter));
 	import.dest = file;
 	import.in_name = chap_file;
 	import.video_fps = import_fps;
 	import.streamFormat = "CHAP";
-	return gf_media_import(&import);
+	e = gf_media_import(&import);
+	if (e) return e;
+
+	if (!import.final_trackID) return GF_OK;
+	if (use_qt) {
+		u32 chap_track = gf_isom_get_track_by_id(file, import.final_trackID);
+		u32 nb_sdesc = gf_isom_get_sample_description_count(file, chap_track);
+		for (i=0; i<nb_sdesc; i++) {
+			gf_isom_set_media_subtype(file, chap_track, i+1, GF_ISOM_SUBTYPE_TEXT);
+		}
+	}
+	//imported chapter is a track, set reference
+	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:
+		case GF_ISOM_MEDIA_AUDIO:
+			gf_isom_set_track_reference(file, i+1, GF_ISOM_REF_CHAP, import.final_trackID);
+			break;
+		}
+	}
+	return GF_OK;
+}
+
+static void on_import_setup_failure(GF_Filter *f, void *on_setup_error_udta, GF_Err e)
+{
+	GF_MediaImporter *importer = (GF_MediaImporter *)on_setup_error_udta;
+	if (importer)
+		importer->last_error = e;
 }
 
 GF_EXPORT
 GF_Err gf_media_import(GF_MediaImporter *importer)
 {
-#ifndef GPAC_DISABLE_TTXT
-	GF_Err gf_import_timed_text(GF_MediaImporter *import);
-#endif
 	GF_Err e;
-	char *ext, *xml_type;
+	u32 i, count;
+	GF_FilterSession *fsess=NULL;
+	char *args = NULL;
+	char szSubArg[1024];
+	char szFilterID[20];
+	Bool source_id_set = GF_FALSE;
+	GF_Filter *isobmff_mux, *source;
+	GF_Filter *filter_orig;
+	char *ext;
 	char *fmt = "";
+
 	if (!importer || (!importer->dest && (importer->flags!=GF_IMPORT_PROBE_ONLY)) || (!importer->in_name && !importer->orig) ) return GF_BAD_PARAM;
 
 	if (importer->orig) return gf_import_isomedia(importer);
@@ -10816,191 +1080,367 @@
 	if (importer->force_ext) {
 		ext = importer->force_ext;
 	} else {
-		ext = strrchr(importer->in_name, '.');
+		ext = gf_file_ext_start(importer->in_name);
 		if (!ext) ext = "";
 	}
 
 	if (importer->streamFormat) fmt = importer->streamFormat;
 
-
-	/*always try with MP4 - this allows using .m4v extension for both raw CMP and iPod's files*/
+	/*if isobmf and probing or no filter, direct copy*/
 	if (gf_isom_probe_file(importer->in_name)) {
-		importer->orig = gf_isom_open(importer->in_name, GF_ISOM_OPEN_READ, NULL);
-		if (importer->orig) {
-			e = gf_import_isomedia(importer);
-			gf_isom_delete(importer->orig);
-			importer->orig = NULL;
-			return e;
+		u64 magic = 1;
+		magic <<= 32;
+		magic |= (importer->source_magic & 0xFFFFFFFFUL);
+		importer->source_magic = magic;
+		if ((!importer->filter_chain && !importer->filter_dst_opts && !importer->run_in_session)
+			|| (importer->flags & GF_IMPORT_PROBE_ONLY)
+		) {
+			importer->orig = gf_isom_open(importer->in_name, GF_ISOM_OPEN_READ, NULL);
+			if (importer->orig) {
+				e = gf_import_isomedia(importer);
+				gf_isom_delete(importer->orig);
+				importer->orig = NULL;
+				return e;
+			}
 		}
 	}
 
-#ifndef GPAC_DISABLE_AVILIB
-	/*AVI audio/video*/
-	if (!strnicmp(ext, ".avi", 4) || !stricmp(fmt, "AVI") ) {
-		e = gf_import_avi_video(importer);
-		if (e) return e;
-		return gf_import_avi_audio(importer);
-	}
+	/*SC3DMC*/
+	if (!strnicmp(ext, ".s3d", 4) || !stricmp(fmt, "SC3DMC") )
+		return gf_import_afx_sc3dmc(importer, GF_TRUE);
+	/* chapter */
+	else if (!strnicmp(ext, ".txt", 4) || !strnicmp(ext, ".chap", 5) || !stricmp(fmt, "CHAP") )
+		return gf_media_import_chapters_file(importer);
+
+#ifdef FILTER_FIXME
+	#error "importer TO CHECK: SAF, TS"
 #endif
 
-#ifndef GPAC_DISABLE_OGG
-	/*OGG audio/video*/
-	if (!strnicmp(ext, ".ogg", 4) || !stricmp(fmt, "OGG")) {
-		e = gf_import_ogg_video(importer);
-		if (e) return e;
-		return gf_import_ogg_audio(importer);
-	}
-	/*Opus audio*/
-	if (!strnicmp(ext, ".opus", 5)) {
-		if (importer->flags & GF_IMPORT_PROBE_ONLY)
-			return gf_import_ogg_video(importer);
-		return gf_import_ogg_audio(importer);
-	}
+	e = GF_OK;
+	importer->last_error = GF_OK;
+
+	if (importer->flags & GF_IMPORT_PROBE_ONLY) {
+		GF_Filter *prober, *src_filter;
+
+		fsess = gf_fs_new_defaults(0);
+		if (!fsess) {
+			return gf_import_message(importer, GF_BAD_PARAM, "[Importer] Cannot load filter session for import");
+		}
+		prober = gf_fs_load_filter(fsess, "probe", &e);
+		src_filter = gf_fs_load_source(fsess, importer->in_name, "index=0", NULL, &e);
+		if (e) {
+			gf_fs_run(fsess);
+			gf_fs_del(fsess);
+			return gf_import_message(importer, e, "[Importer] Cannot load filter for input file \"%s\"", importer->in_name);
+		}
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			on_import_setup_failure(NULL, NULL, GF_OK);
+		}
 #endif
 
-#ifndef GPAC_DISABLE_MPEG2PS
-	/*MPEG PS*/
-	if (!strnicmp(ext, ".mpg", 4) || !strnicmp(ext, ".mpeg", 5)
-	        || !strnicmp(ext, ".vob", 4) || !strnicmp(ext, ".vcd", 4) || !strnicmp(ext, ".svcd", 5)
-	        || !stricmp(fmt, "MPEG1") || !stricmp(fmt, "MPEG-PS")  || !stricmp(fmt, "MPEG2-PS")
-	   ) {
-		e = gf_import_mpeg_ps_video(importer);
-		if (e) return e;
-		return gf_import_mpeg_ps_audio(importer);
+		gf_filter_set_setup_failure_callback(prober, src_filter, on_import_setup_failure, importer);
+		gf_fs_run(fsess);
+
+		if (importer->last_error) {
+			gf_fs_del(fsess);
+			return gf_import_message(importer, importer->last_error, "[Importer] Error probing %s", importer->in_name);
+		}
+
+		importer->nb_tracks = 0;
+		count = gf_filter_get_ipid_count(prober);
+		for (i=0; i<count; i++) {
+			const GF_PropertyValue *p;
+			struct __track_import_info *tki = &importer->tk_info[importer->nb_tracks];
+			GF_FilterPid *pid = gf_filter_get_ipid(prober, i);
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+			tki->stream_type = p ? p->value.uint : GF_STREAM_UNKNOWN;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+			tki->codecid = p ? p->value.uint : GF_CODECID_NONE;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_LANGUAGE);
+			if (p && p->value.string) tki->lang = GF_4CC(p->value.string[0], p->value.string[1], p->value.string[2], ' ');
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+			tki->track_num = p ? p->value.uint : 1;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+			if (p) tki->mpeg4_es_id = p->value.uint;
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SERVICE_ID);
+			if (p) tki->prog_num = p->value.uint;
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_DURATION);
+			if (p) {
+				Double d = (Double) p->value.lfrac.num;
+				d*=1000;
+				if (p->value.lfrac.den) d /= p->value.lfrac.den;
+				if (d > importer->probe_duration) importer->probe_duration = (u64) d;
+			}
+
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_WIDTH);
+			if (p) {
+				tki->video_info.width = p->value.uint;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_HEIGHT);
+				if (p) tki->video_info.height = p->value.uint;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_FPS);
+				if (p) {
+					tki->video_info.FPS = p->value.frac.num;
+					if (p->value.frac.den) tki->video_info.FPS /= p->value.frac.den;
+				}
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAR);
+				if (p) tki->video_info.par = (p->value.frac.num << 16) | p->value.frac.den;
+			}
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLE_RATE);
+			if (p) {
+				tki->audio_info.sample_rate = p->value.uint;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_NUM_CHANNELS);
+				if (p) tki->audio_info.nb_channels = p->value.uint;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_SAMPLES_PER_FRAME);
+				if (p) tki->audio_info.samples_per_frame = p->value.uint;
+			}
+/*			p = gf_filter_pid_get_property(pid, GF_PROP_PID_CAN_DATAREF);
+			if (p) importer->flags |= GF_IMPORT_USE_DATAREF;
+*/
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_SUBTYPE);
+			if (p) tki->media_subtype = p->value.uint;
+
+			importer->nb_tracks++;
+		}
+		gf_fs_del(fsess);
+		return GF_OK;
+	}
+
+	if (importer->run_in_session) {
+		fsess = importer->run_in_session;
+	} else {
+		fsess = gf_fs_new_defaults(0);
+		if (!fsess) {
+			return gf_import_message(importer, GF_BAD_PARAM, "[Importer] Cannot load filter session for import");
+		}
+	}
+
+	filter_orig=NULL;
+
+	if (importer->run_in_session) {
+		sprintf(szFilterID, "%d", (u32) ( (importer->source_magic & 0xFFFFFFFFUL) ) );
+	} else {
+		strcpy(szFilterID, "1");
+	}
+
+	if (!importer->run_in_session) {
+		//mux args
+		e = gf_dynstrcat(&args, "mp4mx:importer", ":");
+		sprintf(szSubArg, "file=%p", importer->dest);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+
+	if (importer->trackID) {
+		sprintf(szSubArg, "SID=%s#PID=%d", szFilterID, importer->trackID);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->filter_dst_opts)
+		e |= gf_dynstrcat(&args, importer->filter_dst_opts, ":");
+
+	if (importer->flags & GF_IMPORT_FORCE_MPEG4)
+		e |= gf_dynstrcat(&args, "m4sys", ":");
+	if (importer->flags & GF_IMPORT_USE_DATAREF)
+		e |= gf_dynstrcat(&args, "dref", ":");
+	if (importer->flags & GF_IMPORT_NO_EDIT_LIST)
+		e |= gf_dynstrcat(&args, "noedit", ":");
+	if (importer->flags & GF_IMPORT_FORCE_PACKED)
+		e |= gf_dynstrcat(&args, "pack_nal", ":");
+	if (importer->xps_inband==1)
+		e |= gf_dynstrcat(&args, "xps_inband=all", ":");
+	else if (importer->xps_inband==2)
+		e |= gf_dynstrcat(&args, "xps_inband=both", ":");
+	if (importer->esd && importer->esd->ESID) {
+		sprintf(szSubArg, "trackid=%d", importer->esd->ESID);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+
+	if (importer->duration.den) {
+		sprintf(szSubArg, "idur=%d/%d", importer->duration.num, importer->duration.den);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->frames_per_sample) {
+		sprintf(szSubArg, "pack3gp=%d", importer->frames_per_sample);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->asemode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v0_2) { e |= gf_dynstrcat(&args, "ase=v0s", ":"); }
+	else if (importer->asemode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_MPEG) { e |= gf_dynstrcat(&args, "ase=v1", ":"); }
+	else if (importer->asemode==GF_IMPORT_AUDIO_SAMPLE_ENTRY_v1_QTFF) { e |= gf_dynstrcat(&args, "ase=v1qt", ":"); }
+
+	if (e) {
+		gf_fs_del(fsess);
+		gf_free(args);
+		return gf_import_message(importer, e, "[Importer] Cannot load ISOBMFF muxer arguments");
+	}
+
+	if (!importer->run_in_session) {
+		isobmff_mux = gf_fs_load_filter(fsess, args, &e);
+		gf_free(args);
+		args = NULL;
+
+		if (!isobmff_mux) {
+			gf_fs_del(fsess);
+			gf_free(args);
+			return gf_import_message(importer, e, "[Importer] Cannot load ISOBMFF muxer");
+		}
+	} else {
+		importer->update_mux_args = args;
+		args = NULL;
+		isobmff_mux = NULL;
+	}
+
+	//filter chain
+	if (importer->filter_chain) {
+		GF_Filter *prev_filter=NULL;
+		char *fargs = (char *) importer->filter_chain;
+		while (fargs) {
+			GF_Filter *f;
+			char *sep = strstr(fargs, "@@");
+			if (sep) sep[0] = 0;
+			f = gf_fs_load_filter(fsess, fargs, &e);
+			if (!f) {
+				if (!importer->run_in_session)
+					gf_fs_del(fsess);
+				return gf_import_message(importer, e, "[Importer] Cannot load filter %s", fargs);
+			}
+			if (prev_filter) {
+				gf_filter_set_source(f, prev_filter, NULL);
+			}
+			prev_filter = f;
+			if (!filter_orig) filter_orig = f;
+			if (!sep) break;
+			sep[0] = '@';
+			fargs = sep+2;
+		}
+		if (prev_filter) {
+			const char *prev_id;
+			if (importer->trackID) {
+				if (gf_filter_get_id(prev_filter)) {
+					if (!importer->run_in_session)
+						gf_fs_del(fsess);
+					return gf_import_message(importer, GF_FILTER_NOT_FOUND, "[Importer] last filter in chain cannot use filter ID (%s)", fargs);
+				}
+				gf_filter_assign_id(prev_filter, szFilterID);
+				source_id_set=GF_TRUE;
+			}
+			prev_id = gf_filter_get_id(prev_filter);
+			if (!prev_id) {
+				gf_filter_assign_id(prev_filter, NULL);
+				prev_id = gf_filter_get_id(prev_filter);
+			}
+			if (importer->run_in_session) {
+				gf_dynstrcat(&importer->update_mux_args, ":SID=", NULL);
+				gf_dynstrcat(&importer->update_mux_args, prev_id, NULL);
+			} else {
+				assert(isobmff_mux);
+				gf_filter_set_source(isobmff_mux, prev_filter, NULL);
+			}
+		}
+	}
+
+	//source args
+	e = gf_dynstrcat(&args, "importer:index=0", ":");
+	if (importer->trackID && !source_id_set) {
+		sprintf(szSubArg, "FID=%s", szFilterID);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->filter_src_opts) e |= gf_dynstrcat(&args, importer->filter_src_opts, ":");
+
+	if (importer->flags & GF_IMPORT_SBR_IMPLICIT) e |= gf_dynstrcat(&args, "sbr=imp", ":");
+	else if (importer->flags & GF_IMPORT_SBR_EXPLICIT) e |= gf_dynstrcat(&args, "sbr=exp", ":");
+	if (importer->flags & GF_IMPORT_PS_IMPLICIT) e |= gf_dynstrcat(&args, "ps=imp", ":");
+	else if (importer->flags & GF_IMPORT_PS_EXPLICIT) e |= gf_dynstrcat(&args, "ps=exp", ":");
+	if (importer->flags & GF_IMPORT_OVSBR) e |= gf_dynstrcat(&args, "ovsbr", ":");
+	//avoids message at end of import
+	if (importer->flags & GF_IMPORT_FORCE_PACKED) e |= gf_dynstrcat(&args, "nal_length=0", ":");
+	if (importer->flags & GF_IMPORT_SET_SUBSAMPLES) e |= gf_dynstrcat(&args, "subsamples", ":");
+	if (importer->flags & GF_IMPORT_NO_SEI) e |= gf_dynstrcat(&args, "nosei", ":");
+	if (importer->flags & GF_IMPORT_SVC_NONE) e |= gf_dynstrcat(&args, "nosvc", ":");
+	if (importer->flags & GF_IMPORT_SAMPLE_DEPS) e |= gf_dynstrcat(&args, "deps", ":");
+	if (importer->flags & GF_IMPORT_FORCE_MPEG4) e |= gf_dynstrcat(&args, "mpeg4", ":");
+	if (importer->keep_audelim) e |= gf_dynstrcat(&args, "audelim", ":");
+	if (importer->video_fps.num && importer->video_fps.den) {
+		sprintf(szSubArg, "fps=%d/%d", importer->video_fps.num, importer->video_fps.den);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->is_alpha) e |= gf_dynstrcat(&args, "#Alpha", ":");
+
+	if (importer->streamFormat && !strcmp(importer->streamFormat, "VTT")) e |= gf_dynstrcat(&args, "webvtt", ":");
+
+	if (importer->source_magic) {
+		sprintf(szSubArg, "#SrcMagic="LLU, importer->source_magic);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
+	}
+	if (importer->track_index) {
+		sprintf(szSubArg, "#TrackIndex=%d", importer->track_index);
+		e |= gf_dynstrcat(&args, szSubArg, ":");
 	}
-#endif
 
-#ifndef GPAC_DISABLE_MPEG2TS
-	/*MPEG-2 TS*/
-	if (!strnicmp(ext, ".ts", 3) || !strnicmp(ext, ".m2t", 4) || !strnicmp(ext, ".trp", 4) || !strnicmp(ext, ".mts", 4)
-	        || !stricmp(fmt, "MPEGTS") || !stricmp(fmt, "MPEG-TS")
-	        || !stricmp(fmt, "MPGTS") || !stricmp(fmt, "MPG-TS")
-	        || !stricmp(fmt, "MPEG2TS")  || !stricmp(fmt, "MPEG2-TS")
-	        || !stricmp(fmt, "MPG2TS")  || !stricmp(fmt, "MPG2-TS")
-	   ) {
-		return gf_import_mpeg_ts(importer);
+	if (e) {
+		if (!importer->run_in_session)
+			gf_fs_del(fsess);
+		gf_free(args);
+		return gf_import_message(importer, e, "[Importer] Cannot load arguments for input %s", importer->in_name);
 	}
-#endif
 
-#ifndef GPAC_DISABLE_AV_PARSERS
-	/*MPEG1/2 Audio*/
-	if (!strnicmp(ext, ".mp2", 4) || !strnicmp(ext, ".mp3", 4) || !strnicmp(ext, ".m1a", 4) || !strnicmp(ext, ".m2a", 4) || !stricmp(fmt, "MP3") || !stricmp(fmt, "MPEG-AUDIO") )
-		return gf_import_mp3(importer);
-	/*MPEG-2/4 AAC*/
-	if (!strnicmp(ext, ".aac", 4) || !strnicmp(ext, ".xhe", 4) || !stricmp(fmt, "AAC") || !stricmp(fmt, "MPEG4-AUDIO") )
-		return gf_import_aac_adts(importer);
-	/*MPEG-4 video*/
-	if (!strnicmp(ext, ".cmp", 4) || !strnicmp(ext, ".m4v", 4) || !stricmp(fmt, "CMP") || !stricmp(fmt, "MPEG4-Video") )
-		return gf_import_cmp(importer, GF_FALSE);
-	/*MPEG-1/2 video*/
-	if (!strnicmp(ext, ".m2v", 4) || !strnicmp(ext, ".m1v", 4) || !stricmp(fmt, "MPEG2-Video") || !stricmp(fmt, "MPEG1-Video") )
-		return gf_import_cmp(importer, 2);
-	/*H2632 video*/
-	if (!strnicmp(ext, ".263", 4) || !strnicmp(ext, ".h263", 5) || !stricmp(fmt, "H263") )
-		return gf_import_h263(importer);
-	/*H264/AVC video*/
-	if (!strnicmp(ext, ".h264", 5) || !strnicmp(ext, ".264", 4) || !strnicmp(ext, ".x264", 5)
-	        || !strnicmp(ext, ".h26L", 5) || !strnicmp(ext, ".26l", 4) || !strnicmp(ext, ".avc", 4)
-	        || !stricmp(fmt, "AVC") || !stricmp(fmt, "H264") )
-		return gf_import_avc_h264(importer);
-	/*HEVC video*/
-	if (!strnicmp(ext, ".hevc", 5) || !strnicmp(ext, ".hvc", 4) || !strnicmp(ext, ".265", 4) || !strnicmp(ext, ".h265", 5)
-		|| !strnicmp(ext, ".shvc", 5) || !strnicmp(ext, ".lhvc", 5) || !strnicmp(ext, ".mhvc", 5)
-	        || !stricmp(fmt, "HEVC") || !stricmp(fmt, "SHVC") || !stricmp(fmt, "MHVC") || !stricmp(fmt, "LHVC") || !stricmp(fmt, "H265") )
-		return gf_import_hevc(importer);
-	/*IVF container (may contain VP9, AV1, ...)*/
-	if (!strnicmp(ext, ".ivf", 4))
-		return gf_import_ivf(importer);
-	/*AOM AV1 video*/
-	if (!strnicmp(ext, ".av1", 4) || !strnicmp(ext, ".obu", 4))
-		return gf_import_aom_av1(importer);
-	/*AC3 and E-AC3*/
-	if (!strnicmp(ext, ".ac3", 4) || !stricmp(fmt, "AC3") )
-		return gf_import_ac3(importer, GF_FALSE);
-	if (!strnicmp(ext, ".ec3", 4) || !stricmp(fmt, "EC3") || !stricmp(fmt, "E-AC3") || !stricmp(fmt, "EAC3") )
-		return gf_import_ac3(importer, GF_TRUE);
-#endif
+	source = gf_fs_load_source(fsess, importer->in_name, args, NULL, &e);
+	gf_free(args);
+	args = NULL;
 
-	/*NHNT*/
-	if (!strnicmp(ext, ".media", 5) || !strnicmp(ext, ".info", 5) || !strnicmp(ext, ".nhnt", 5) || !stricmp(fmt, "NHNT") )
-		return gf_import_nhnt(importer);
-	/*NHML*/
-	if (!strnicmp(ext, ".nhml", 5) || !stricmp(fmt, "NHML") )
-		return gf_import_nhml_dims(importer, GF_FALSE);
-	/*jpg & png & jp2*/
-	if (!strnicmp(ext, ".jpg", 4) || !strnicmp(ext, ".jpeg", 5) || !strnicmp(ext, ".jp2", 4) || !strnicmp(ext, ".png", 4) || !stricmp(fmt, "JPEG") || !stricmp(fmt, "PNG") || !stricmp(fmt, "JP2") )
-		return gf_import_still_image(importer, GF_TRUE);
-	/*AMR & 3GPP2 speec codecs*/
-	if (!strnicmp(ext, ".amr", 4) || !strnicmp(ext, ".awb", 4) || !strnicmp(ext, ".smv", 4) || !strnicmp(ext, ".evc", 4)
-	        || !stricmp(fmt, "AMR") || !stricmp(fmt, "EVRC") || !stricmp(fmt, "SMV") )
-		return gf_import_amr_evrc_smv(importer);
-	/*QCelp & other in QCP file format*/
-	if (!strnicmp(ext, ".qcp", 4) || !stricmp(fmt, "QCELP") )
-		return gf_import_qcp(importer);
-	/*MPEG-4 SAF multiplex*/
-	if (!strnicmp(ext, ".saf", 4) || !strnicmp(ext, ".lsr", 4) || !stricmp(fmt, "SAF") )
-		return gf_import_saf(importer);
-	/*text subtitles*/
-	if (!strnicmp(ext, ".srt", 4) || !strnicmp(ext, ".sub", 4) || !strnicmp(ext, ".ttxt", 5) || !strnicmp(ext, ".vtt", 4) || !strnicmp(ext, ".ttml", 5)
-	        || !stricmp(fmt, "SRT") || !stricmp(fmt, "SUB") || !stricmp(fmt, "TEXT") || !stricmp(fmt, "VTT") || !stricmp(fmt, "TTML")) {
-#ifndef GPAC_DISABLE_TTXT
-		return gf_import_timed_text(importer);
-#else
-		return GF_NOT_SUPPORTED;
-#endif
+	if (e) {
+		if (!importer->run_in_session)
+			gf_fs_del(fsess);
+		return gf_import_message(importer, e, "[Importer] Cannot load filter for input file \"%s\"", importer->in_name);
 	}
-	/*VobSub*/
-	if (!strnicmp(ext, ".idx", 4) || !stricmp(fmt, "VOBSUB"))
-		return gf_import_vobsub(importer);
-	/*raw importer*/
-	if (!stricmp(fmt, "RAW")) {
-		return gf_import_raw_unit(importer);
-	}
-	/*DIMS*/
-	if (!strnicmp(ext, ".dml", 4) || !stricmp(fmt, "DIMS") )
-		return gf_import_nhml_dims(importer, GF_TRUE);
-	/*SC3DMC*/
-	if (!strnicmp(ext, ".s3d", 4) || !stricmp(fmt, "SC3DMC") )
-		return gf_import_afx_sc3dmc(importer, GF_TRUE);
 
-	if (!strnicmp(ext, ".txt", 4) || !strnicmp(ext, ".chap", 5) || !stricmp(fmt, "CHAP") )
-		return gf_media_import_chapters_file(importer);
+	if (filter_orig)
+		gf_filter_set_source(filter_orig, source, NULL);
 
-	if (!strnicmp(ext, ".swf", 4) || !strnicmp(ext, ".SWF", 4)) {
-#ifndef GPAC_DISABLE_TTXT
-		return gf_import_timed_text(importer);
-#else
-		return GF_NOT_SUPPORTED;
-#endif
+	//source is setup, we run in an external session, nothing left to do
+	if (importer->run_in_session)
+		return GF_OK;
+
+	gf_fs_run(fsess);
+
+	if (!importer->last_error) importer->last_error = gf_fs_get_last_connect_error(fsess);
+	if (!importer->last_error) importer->last_error = gf_fs_get_last_process_error(fsess);
+
+	if (importer->last_error) {
+		if (!importer->run_in_session)
+			gf_fs_del(fsess);
+		return gf_import_message(importer, importer->last_error, "[Importer] Error probing %s", importer->in_name);
 	}
-	/*try XML things*/
-	xml_type = gf_xml_get_root_type(importer->in_name, &e);
-	if (xml_type) {
-		if (!stricmp(xml_type, "TextStream") || !stricmp(xml_type, "text3GTrack") ) {
-			gf_free(xml_type);
-#ifndef GPAC_DISABLE_TTXT
-			return gf_import_timed_text(importer);
-#else
-			return GF_NOT_SUPPORTED;
-#endif
+
+	importer->final_trackID = gf_isom_get_last_created_track_id(importer->dest);
+
+	if (importer->esd && importer->final_trackID) {
+		u32 tk_num = gf_isom_get_track_by_id(importer->dest, importer->final_trackID);
+		GF_ESD *esd = gf_isom_get_esd(importer->dest, tk_num, 1);
+		if (esd && !importer->esd->decoderConfig) {
+			importer->esd->decoderConfig = esd->decoderConfig;
+			esd->decoderConfig = NULL;
 		}
-		else if (!stricmp(xml_type, "NHNTStream")) {
-			gf_free(xml_type);
-			return gf_import_nhml_dims(importer, GF_FALSE);
+		if (esd && !importer->esd->slConfig) {
+			importer->esd->slConfig = esd->slConfig;
+			esd->slConfig = NULL;
 		}
-		else if (!stricmp(xml_type, "DIMSStream") ) {
-			gf_free(xml_type);
-			return gf_import_nhml_dims(importer, GF_TRUE);
+		if (esd) {
+			gf_odf_desc_del((GF_Descriptor *) esd);
 		}
-		gf_free(xml_type);
-	}
 
-	if (gf_m2ts_probe_file(importer->in_name))
-		return gf_import_mpeg_ts(importer);
+		if (!importer->esd->ESID) {
+			importer->esd->ESID = importer->final_trackID;
+		}
+	}
 
-	return gf_import_message(importer, e, "[Importer] Unknown input file type for \"%s\"", importer->in_name);
+	if (importer->print_stats_graph & 1) gf_fs_print_stats(fsess);
+	if (importer->print_stats_graph & 2) gf_fs_print_connections(fsess);
+	gf_fs_del(fsess);
+	if (!importer->final_trackID) {
+		return gf_import_message(importer, GF_NOT_SUPPORTED, "[Importer] No valid track to import in input file \"%s\"", importer->in_name);
+	}
+	return GF_OK;
 }
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
-
-

gpac-0.8.0.tar.gz/src/media_tools/mpd.c -> gpac-1.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-2012
+ *			Authors: Jean Le Feuvre, Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / 3GPP/MPEG Media Presentation Description input module
@@ -23,19 +23,12 @@
  *
  */
 
-#include <gpac/internal/mpd.h>
+#include <gpac/mpd.h>
 #include <gpac/download.h>
 #include <gpac/internal/m3u8.h>
 #include <gpac/network.h>
 #include <gpac/maths.h>
 
-#ifdef _WIN32_WCE
-#include <winbase.h>
-#else
-/*for mktime*/
-#include <time.h>
-#endif
-
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
 static Bool gf_mpd_parse_bool(const char * const attr)
@@ -56,9 +49,37 @@
 	if (child->type != GF_XML_NODE_TYPE) return 0;
 	if (!mpd->xml_namespace && !child->ns) return 1;
 	if (mpd->xml_namespace && child->ns && !strcmp(mpd->xml_namespace, child->ns)) return 1;
+	if (child->ns && !strcmp(child->ns, "gpac")) return 1;
 	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")){
+		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;
@@ -91,14 +112,21 @@
 	return atof(attr);
 }
 
-static GF_MPD_Fractional *gf_mpd_parse_frac(const char * const attr, const char sep)
+static GF_MPD_Fractional *gf_mpd_parse_frac(const char * const attr, const char sep, GF_MPD_Fractional *res)
 {
 	char str[6];
-	GF_MPD_Fractional *res;
-	GF_SAFEALLOC(res, GF_MPD_Fractional);
+	int ok;
+	if (res==NULL) {
+		GF_SAFEALLOC(res, GF_MPD_Fractional);
+		if (!res) return NULL;
+		res->den = 1;
+	}
 	snprintf(str, sizeof(str), "%%d%c%%d", sep);
-	res->den = 1;
-	sscanf(attr, str, &res->num, &res->den);
+	ok = sscanf(attr, str, &res->num, &res->den);
+	if (ok!=2) {
+		res->den = 1;
+		res->num = atoi(attr);
+	}
 	return res;
 }
 
@@ -111,8 +139,10 @@
 {
 	u32 i;
 	char *sep1, *sep2;
-	u32 h, m;
-	double s;
+	u32 h, m, s, ms;
+	u32 year, month, day;
+	Bool has_year, has_month, has_day;
+	u64 y_dur;
 	const char *startT;
 	if (!duration) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no value indicated\n"));
@@ -136,13 +166,25 @@
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no value indicated\n"));
 		return 0;
 	}
-	if (! startT) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error parsing duration: no Time section found\n"));
-		return 0;
-	}
 
-	h = m = 0;
-	s = 0;
+	year = month = day = 0;
+	has_year = strchr(duration+1, 'Y') ? GF_TRUE : GF_FALSE;
+	has_month = strchr(duration+1, 'M') ? GF_TRUE : GF_FALSE;
+	has_day = strchr(duration+1, 'D') ? GF_TRUE : GF_FALSE;
+	if (has_year && has_month && has_day) sscanf(duration+1, "%dY%dM%dD", &year, &month, &day);
+	else if (has_month && has_day) sscanf(duration+1, "%dM%dD", &month, &day);
+	else if (has_year && has_month) sscanf(duration+1, "%dY%dM", &year, &month);
+	else if (has_year && has_day) sscanf(duration+1, "%dY%dD", &year, &day);
+	else if (has_year) sscanf(duration+1, "%dY", &year);
+	else if (has_month) sscanf(duration+1, "%dM", &month);
+	else if (has_day) sscanf(duration+1, "%dD", &day);
+	y_dur = (year*365 + month*30 + day ) * 24;
+	y_dur *= 3600;
+	y_dur *= 1000;
+
+	if (! startT) return y_dur;
+
+	h = m = s = ms = 0;
 	if (NULL != (sep1 = strchr(startT+1, 'H'))) {
 		*sep1 = 0;
 		h = atoi(duration+i+2);
@@ -160,11 +202,19 @@
 		sep2 = sep1;
 	}
 	if (NULL != (sep1 = strchr(sep2, 'S'))) {
+		char *sep_dec = strchr(sep2, '.');
 		*sep1 = 0;
-		s = atof(sep2);
+		if (sep_dec) {
+			sep_dec[0] = 0;
+			s = atoi(sep2);
+			ms = atoi(sep_dec+1);
+			sep_dec[0] = '.';
+		} else {
+			s = atoi(sep2);
+		}
 		*sep1 = 'S';
 	}
-	return (u64)((h*3600+m*60+s)*(u64)1000);
+	return y_dur + (u64) ( ((h*3600+m*60+s)*(u64)1000) + ms );
 }
 
 static u32 gf_mpd_parse_duration_u32(const char * const duration)
@@ -173,7 +223,7 @@
 	if (dur <= GF_UINT_MAX) {
 		return (u32)dur;
 	} else {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Parsed duration "LLU" doesn't fit on 32 bits! Setting to the 32 bits max.\n", dur));
+		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));
 		return GF_UINT_MAX;
 	}
 }
@@ -182,23 +232,11 @@
 {
 	GF_MPD_ByteRange *br;
 	GF_SAFEALLOC(br, GF_MPD_ByteRange);
+	if (!br) return NULL;
 	sscanf(attr, LLD"-"LLD, &br->start_range, &br->end_range);
 	return br;
 }
 
-static GF_Err gf_mpd_parse_location(GF_MPD *mpd, GF_XMLNode *child)
-{
-	char *str = gf_mpd_parse_text_content(child);
-	if (str) return gf_list_add(mpd->locations, str);
-	return GF_OK;
-}
-
-static GF_Err gf_mpd_parse_metrics(GF_MPD *mpd, GF_XMLNode *child)
-{
-	GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Metrics not implemented yet\n"));
-	return GF_OK;
-}
-
 GF_Err gf_mpd_parse_base_url(GF_List *container, GF_XMLNode *node)
 {
 	u32 i;
@@ -223,15 +261,13 @@
 {
 	GF_MPD_ProgramInfo *info;
 	u32 att_index, child_index;
-	GF_XMLAttribute *att;
-	GF_XMLNode *child;
 
 	GF_SAFEALLOC(info, GF_MPD_ProgramInfo);
 	if (!info) return GF_OUT_OF_MEM;
 
 	att_index = 0;
 	while (1) {
-		att = gf_list_get(root->attributes, att_index);
+		GF_XMLAttribute *att = gf_list_get(root->attributes, att_index);
 		if (!att) {
 			break;
 		} else if (!strcmp(att->name, "moreInformationURL")) {
@@ -244,7 +280,7 @@
 
 	child_index = 0;
 	while (1) {
-		child = gf_list_get(root->content, child_index);
+		GF_XMLNode *child = gf_list_get(root->content, child_index);
 		if (!child) {
 			break;
 		} else if (child->type == GF_XML_NODE_TYPE) {
@@ -293,8 +329,8 @@
 	GF_XMLNode *child;
 	u32 i = 0;
 
-	/*infinite by default*/
-	seg->time_shift_buffer_depth = (u32) -1;
+	/*0 by default*/
+	seg->time_shift_buffer_depth = 0;
 
 	while ( (att = gf_list_enum(root->attributes, &i)) ) {
 		if (!strcmp(att->name, "timescale")) seg->timescale = gf_mpd_parse_int(att->value);
@@ -305,9 +341,6 @@
 		else if (!strcmp(att->name, "timeShiftBufferDepth")) seg->time_shift_buffer_depth = gf_mpd_parse_duration_u32(att->value);
 	}
 
-	if (mpd->type == GF_MPD_TYPE_STATIC)
-		seg->time_shift_buffer_depth = 0;
-
 	i = 0;
 	while ( (child = gf_list_enum(root->content, &i))) {
 		if (!gf_mpd_valid_child(mpd, child)) continue;
@@ -384,7 +417,26 @@
 	}
 }
 
-static void gf_mpd_parse_segment_url(GF_List *container, GF_XMLNode *root)
+#if 0 //unused
+GF_MPD_SegmentURL *gf_mpd_segmenturl_new(const char*media, u64 start_range, u64 end_range, const char *index, u64 idx_start_range, u64 idx_end_range)
+{
+	GF_MPD_SegmentURL *seg_url;
+	GF_SAFEALLOC(seg_url, GF_MPD_SegmentURL);
+	GF_SAFEALLOC(seg_url->media_range, GF_MPD_ByteRange);
+	seg_url->media_range->start_range = start_range;
+	seg_url->media_range->end_range = end_range;
+	if (idx_start_range || idx_end_range) {
+		GF_SAFEALLOC(seg_url->index_range, GF_MPD_ByteRange);
+		seg_url->index_range->start_range = idx_start_range;
+		seg_url->index_range->end_range = idx_end_range;
+	}
+	if(media)
+		seg_url->media=gf_strdup(media);
+	return seg_url;
+}
+#endif
+
+void gf_mpd_parse_segment_url(GF_List *container, GF_XMLNode *root)
 {
 	u32 i;
 	GF_MPD_SegmentURL *seg;
@@ -402,13 +454,14 @@
 		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_byte_range(att->value);
 		//else if (!strcmp(att->name, "hls:keyMethod")) seg->key_url = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "hls:keyURL")) seg->key_url = gf_mpd_parse_string(att->value);
-        else if (!strcmp(att->name, "hls:keyIV")) {
-            GF_Err e = gf_bin128_parse(att->value, seg->key_iv);
+		else if (!strcmp(att->name, "hls:keyIV")) {
+			GF_Err e = gf_bin128_parse(att->value, seg->key_iv);
             if (e != GF_OK) {
                 GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Cannot parse hls:keyIV\n"));
                 return;
             }
         }
+		else if (!strcmp(att->name, "duration")) seg->duration=gf_mpd_parse_int(att->value);
 	}
 }
 
@@ -466,8 +519,20 @@
 	return seg;
 }
 
-static GF_Err gf_mpd_parse_content_component(GF_List *container, GF_XMLNode *root)
+static GF_Err gf_mpd_parse_content_component(GF_List *comps, GF_XMLNode *root)
 {
+	u32 i;
+	GF_XMLAttribute *att;
+	GF_MPD_ContentComponent *comp;
+	GF_SAFEALLOC(comp, GF_MPD_ContentComponent);
+	if (!comp) return GF_OUT_OF_MEM;
+	i = 0;
+	while ((att = gf_list_enum(root->attributes, &i))) {
+		if (!strcmp(att->name, "id")) comp->id = atoi(att->value);
+		else if (!strcmp(att->name, "contentType")) comp->type = gf_strdup(att->value);
+		else if (!strcmp(att->name, "lang")) comp->lang = gf_strdup(att->value);
+	}
+	gf_list_add(comps, comp);
 	return GF_OK;
 }
 
@@ -520,15 +585,20 @@
 	GF_XMLNode *child;
 	u32 i = 0;
 
-	/*setup some default*/
 	com->max_playout_rate = 1.0;
 
 	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")) com->sar = gf_mpd_parse_frac(att->value, ':');
-		else if (!strcmp(att->name, "frameRate")) com->framerate = gf_mpd_parse_frac(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);
@@ -574,7 +644,103 @@
 	com->essential_properties = gf_list_new();
 	com->supplemental_properties = gf_list_new();
 	com->frame_packing = gf_list_new();
+	com->max_playout_rate = 1.0;
 }
+
+GF_MPD_Representation *gf_mpd_representation_new()
+{
+	GF_MPD_Representation *rep;
+	GF_SAFEALLOC(rep, GF_MPD_Representation);
+	if (!rep) return NULL;
+	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;
+}
+
+static GF_DASH_SegmenterContext *gf_mpd_parse_dasher_context(GF_MPD *mpd, GF_XMLNode *root)
+{
+	u32 i;
+	GF_DASH_SegmenterContext *dasher;
+	GF_XMLAttribute *att;
+	GF_SAFEALLOC(dasher, GF_DASH_SegmenterContext);
+	if (!dasher) return NULL;
+
+	i = 0;
+	while ( (att = gf_list_enum(root->attributes, &i)) ) {
+		if (!strcmp(att->name, "done")) dasher->done = gf_mpd_parse_bool(att->value);
+		else if (!strcmp(att->name, "init")) dasher->init_seg = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "template")) dasher->template_seg = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "index")) dasher->template_idx = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "url")) dasher->src_url = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "periodID")) dasher->period_id = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "segNumber")) dasher->seg_number = gf_mpd_parse_int(att->value);
+		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, "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, "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);
+		else if (!strcmp(att->name, "estimatedNextDTS")) dasher->est_next_dts = gf_mpd_parse_long_int(att->value);
+		else if (!strcmp(att->name, "nbRepeat")) dasher->nb_repeat = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "tsOffset")) dasher->ts_offset = gf_mpd_parse_long_int(att->value);
+		else if (!strcmp(att->name, "mpdTimescale")) dasher->mpd_timescale = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "sourcePID")) dasher->source_pid = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "cumulatedDur")) dasher->cumulated_dur = gf_mpd_parse_double(att->value);
+		else if (!strcmp(att->name, "cumulatedSubdur")) dasher->cumulated_subdur = gf_mpd_parse_double(att->value);
+		else if (!strcmp(att->name, "muxPIDs")) dasher->mux_pids = gf_mpd_parse_string(att->value);
+		else if (!strcmp(att->name, "segsPurged")) dasher->segs_purged = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "durPurged")) dasher->dur_purged = gf_mpd_parse_double(att->value);
+		else if (!strcmp(att->name, "moofSN")) dasher->moof_sn = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "moofInc")) dasher->moof_sn_inc = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "lastDynPeriodID")) dasher->last_dyn_period_id = gf_mpd_parse_int(att->value);
+
+	}
+	return dasher;
+}
+
+static GF_List *gf_mpd_parse_segments_context(GF_MPD *mpd, GF_XMLNode *root)
+{
+	GF_List *res = NULL;
+	u32 i, j;
+	GF_XMLAttribute *att;
+	GF_XMLNode *child;
+	i=0;
+	while ((child = gf_list_enum(root->content, &i))) {
+		GF_DASH_SegmentContext *sctx;
+		if (!gf_mpd_valid_child(mpd, child)) continue;
+
+		if (strcmp(child->name, "segmentInfo")) continue;
+		if (!res) res = gf_list_new();
+
+		GF_SAFEALLOC(sctx, GF_DASH_SegmentContext);
+		if (!sctx) break;
+
+		gf_list_add(res, sctx);
+
+		j = 0;
+		while ( (att = gf_list_enum(child->attributes, &j)) ) {
+			if (!strcmp(att->name, "file")) sctx->filename = gf_mpd_parse_string(att->value);
+			if (!strcmp(att->name, "path")) sctx->filepath = gf_mpd_parse_string(att->value);
+			else if (!strcmp(att->name, "time")) sctx->time = gf_mpd_parse_long_int(att->value);
+			else if (!strcmp(att->name, "dur")) sctx->dur = gf_mpd_parse_long_int(att->value);
+			else if (!strcmp(att->name, "size")) sctx->file_size = gf_mpd_parse_int(att->value);
+			else if (!strcmp(att->name, "offset")) sctx->file_offset = gf_mpd_parse_long_int(att->value);
+			else if (!strcmp(att->name, "idx_size")) sctx->index_size = gf_mpd_parse_int(att->value);
+			else if (!strcmp(att->name, "idx_offset")) sctx->index_offset = gf_mpd_parse_long_int(att->value);
+			else if (!strcmp(att->name, "seg_num")) sctx->seg_num = gf_mpd_parse_int(att->value);
+
+		}
+	}
+	return res;
+}
+
 static GF_Err gf_mpd_parse_representation(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
 {
 	u32 i;
@@ -583,11 +749,7 @@
 	GF_XMLNode *child;
 	GF_Err e;
 
-	GF_SAFEALLOC(rep, GF_MPD_Representation);
-	if (!rep) return GF_OUT_OF_MEM;
-	gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)rep);
-	rep->base_URLs = gf_list_new();
-	rep->sub_representations = gf_list_new();
+	rep = gf_mpd_representation_new();
 	e = gf_list_add(container, rep);
 	if (e) return e;
 
@@ -623,20 +785,28 @@
 						if (e) return e;
 			*/
 		}
+		else if (!strcmp(child->name, "dasher")) {
+			assert(!rep->dasher_ctx);
+			rep->dasher_ctx = gf_mpd_parse_dasher_context(mpd, child);
+		}
+		else if (!strcmp(child->name, "segments")) {
+			assert(!rep->state_seg_list);
+			rep->state_seg_list = gf_mpd_parse_segments_context(mpd, child);
+		}
+		else{
+			/*We'll be assuming here that any unrecognized element is a representation level
+			  *descriptor*/
+			gf_mpd_parse_other_descriptors(child,rep->other_descriptors);
+
+		}
 	}
 	return GF_OK;
 }
 
-static GF_Err gf_mpd_parse_adaptation_set(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
-{
-	u32 i;
+GF_MPD_AdaptationSet *gf_mpd_adaptation_set_new() {
 	GF_MPD_AdaptationSet *set;
-	GF_XMLAttribute *att;
-	GF_XMLNode *child;
-	GF_Err e;
-
 	GF_SAFEALLOC(set, GF_MPD_AdaptationSet);
-	if (!set) return GF_OUT_OF_MEM;
+	if (!set) return NULL;
 	gf_mpd_init_common_attributes((GF_MPD_CommonAttributes *)set);
 	set->accessibility = gf_list_new();
 	set->role = gf_list_new();
@@ -645,8 +815,23 @@
 	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;
+	return set;
+}
+
+static GF_Err gf_mpd_parse_adaptation_set(GF_MPD *mpd, GF_List *container, GF_XMLNode *root)
+{
+	u32 i;
+	GF_MPD_AdaptationSet *set;
+	GF_XMLAttribute *att;
+	GF_XMLNode *child;
+	GF_Err e;
+
+	set = gf_mpd_adaptation_set_new();
+	if (!set) return GF_OUT_OF_MEM;
 
 	e = gf_list_add(container, set);
 	if (e) return e;
@@ -659,15 +844,18 @@
 		else if (!strcmp(att->name, "group")) set->group = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "lang")) set->lang = gf_mpd_parse_string(att->value);
 		else if (!strcmp(att->name, "contentType")) set->content_type = gf_mpd_parse_string(att->value);
-		else if (!strcmp(att->name, "par")) set->par = gf_mpd_parse_frac(att->value, ':');
+		else if (!strcmp(att->name, "par")) {
+			if (set->par) gf_free(set->par);
+			set->par = gf_mpd_parse_frac(att->value, ':', NULL);
+		}
 		else if (!strcmp(att->name, "minBandwidth")) set->min_bandwidth = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "maxBandwidth")) set->max_bandwidth = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "minWidth")) set->min_width = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "maxWidth")) set->max_width = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "minHeight")) set->min_height = gf_mpd_parse_int(att->value);
 		else if (!strcmp(att->name, "maxHeight")) set->max_height = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "minFrameRate")) set->min_framerate = gf_mpd_parse_int(att->value);
-		else if (!strcmp(att->name, "maxFrameRate")) set->max_framerate = gf_mpd_parse_int(att->value);
+		else if (!strcmp(att->name, "minFrameRate")) gf_mpd_parse_frac(att->value, '/', &set->min_framerate);
+		else if (!strcmp(att->name, "maxFrameRate")) gf_mpd_parse_frac(att->value, '/', &set->max_framerate);
 		else if (!strcmp(att->name, "segmentAlignment")) set->segment_alignment = gf_mpd_parse_bool(att->value);
 		else if (!strcmp(att->name, "bitstreamSwitching")) set->bitstream_switching = gf_mpd_parse_bool(att->value);
 		else if (!strcmp(att->name, "subsegmentAlignment")) set->subsegment_alignment = gf_mpd_parse_bool(att->value);
@@ -718,11 +906,27 @@
 			e = gf_mpd_parse_representation(mpd, set->representations, child);
 			if (e) return e;
 		}
+		else{
+			/*We'll be assuming here that any unrecognized element is a adaptation level
+			  *descriptor*/
+			gf_mpd_parse_other_descriptors(child,set->other_descriptors);
+		}
 	}
 	return GF_OK;
 }
 
-static GF_Err gf_mpd_parse_period(GF_MPD *mpd, GF_XMLNode *root)
+GF_MPD_Period *gf_mpd_period_new() {
+	GF_MPD_Period *period;
+	GF_SAFEALLOC(period, GF_MPD_Period);
+	if (!period) return NULL;
+	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;
 	GF_MPD_Period *period;
@@ -730,11 +934,8 @@
 	GF_XMLNode *child;
 	GF_Err e;
 
-	GF_SAFEALLOC(period, GF_MPD_Period);
+	period = gf_mpd_period_new();
 	if (!period) return GF_OUT_OF_MEM;
-	period->adaptation_sets = gf_list_new();
-	period->base_URLs = gf_list_new();
-	period->subsets = gf_list_new();
 	e = gf_list_add(mpd->periods, period);
 	if (e) return e;
 
@@ -770,6 +971,12 @@
 		}
 		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);
+		}
+
 	}
 	return GF_OK;
 }
@@ -782,7 +989,7 @@
 	return mpd;
 }
 
-static void gf_mpd_del_list(GF_List *list, void (*__destructor)(void *), Bool reset_only)
+void gf_mpd_del_list(GF_List *list, void (*__destructor)(void *), Bool reset_only)
 {
 	if (!list) return;
 	while (gf_list_count(list)) {
@@ -809,8 +1016,9 @@
 	if (ptr->byte_range) gf_free(ptr->byte_range);
 	gf_free(ptr);
 }
-void gf_mpd_string_free(void *_item) {
-	gf_free(_item);
+void gf_mpd_string_free(void *_item)
+{
+	if (_item) gf_free(_item);
 }
 
 void gf_mpd_prog_info_free(void *_item)
@@ -853,6 +1061,13 @@
 	gf_free(ptr);
 }
 
+#if 0 //unused
+void gf_mpd_segment_url_list_free(GF_List *list)
+{
+	gf_mpd_del_list(list, gf_mpd_segment_url_free, 0);
+}
+#endif
+
 void gf_mpd_segment_list_free(void *_item)
 {
 	GF_MPD_SegmentList *ptr = (GF_MPD_SegmentList *)_item;
@@ -862,6 +1077,7 @@
 	if (ptr->representation_index) gf_mpd_url_free(ptr->representation_index);
 	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);
 	gf_free(ptr);
 }
 
@@ -901,6 +1117,16 @@
 	}
 }
 
+GF_MPD_Descriptor *gf_mpd_descriptor_new(const char *id, const char *schemeIdUri, const char *value) {
+	GF_MPD_Descriptor *mpd_desc;
+	GF_SAFEALLOC(mpd_desc, GF_MPD_Descriptor);
+	if (!mpd_desc) return NULL;
+	if (id) mpd_desc->id = gf_strdup(id);
+	if (schemeIdUri) mpd_desc->scheme_id_uri = gf_strdup(schemeIdUri);
+	if (value) mpd_desc->value = gf_strdup(value);
+	return mpd_desc;
+}
+
 void gf_mpd_descriptor_free(void *item)
 {
 	GF_MPD_Descriptor *mpd_desc = (GF_MPD_Descriptor*) item;
@@ -912,9 +1138,18 @@
 	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_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] content component not implemented\n"));
+	GF_MPD_ContentComponent *component_descriptor=(GF_MPD_ContentComponent*) item;
+	if (component_descriptor->type) gf_free(component_descriptor->type);
+	if (component_descriptor->lang) gf_free(component_descriptor->lang);
 	gf_free(item);
 }
 
@@ -952,7 +1187,7 @@
 		}
 		gf_free(ptr->playback.cached_init_segment_url);
 	}
-	if (ptr->playback.init_segment_data) gf_free(ptr->playback.init_segment_data);
+	if (ptr->playback.init_segment.data) gf_free(ptr->playback.init_segment.data);
 	if (ptr->playback.key_url) gf_free(ptr->playback.key_url);
 
 	gf_mpd_del_list(ptr->base_URLs, gf_mpd_base_url_free, 0);
@@ -960,6 +1195,30 @@
 	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);
+
+	if (ptr->dasher_ctx) {
+		gf_free(ptr->dasher_ctx->init_seg);
+		if (ptr->dasher_ctx->period_id)
+			gf_free(ptr->dasher_ctx->period_id);
+		gf_free(ptr->dasher_ctx->src_url);
+		gf_free(ptr->dasher_ctx->template_seg);
+		if (ptr->dasher_ctx->template_idx) gf_free(ptr->dasher_ctx->template_idx);
+		if (ptr->dasher_ctx->mux_pids) gf_free(ptr->dasher_ctx->mux_pids);
+		gf_free(ptr->dasher_ctx);
+	}
+	if (ptr->state_seg_list) {
+		while (gf_list_count(ptr->state_seg_list)) {
+			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);
+			gf_free(s);
+		}
+		gf_list_del(ptr->state_seg_list);
+	}
+	if (ptr->m3u8_var_name) gf_free(ptr->m3u8_var_name);
+	if (ptr->m3u8_var_file) gf_fclose(ptr->m3u8_var_file);
+
 	gf_free(ptr);
 }
 
@@ -981,6 +1240,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);
 	gf_free(ptr);
 }
 
@@ -996,6 +1256,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);
 	gf_mpd_del_list(ptr->subsets, NULL/*TODO*/, 0);
 	gf_free(ptr);
 }
@@ -1004,6 +1265,12 @@
 void gf_mpd_del(GF_MPD *mpd)
 {
 	if (!mpd) return;
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_mpd_string_free(NULL);
+	}
+#endif
+
 	gf_mpd_del_list(mpd->program_infos, gf_mpd_prog_info_free, 0);
 	gf_mpd_del_list(mpd->base_URLs, gf_mpd_base_url_free, 0);
 	gf_mpd_del_list(mpd->locations, gf_mpd_string_free, 0);
@@ -1054,8 +1321,10 @@
 	i = 0;
 	while ((att = gf_list_enum(root->attributes, &i))) {
 		if (!strcmp(att->name, "id")) {
+			if (mpd->ID) gf_free(mpd->ID);
 			mpd->ID = gf_mpd_parse_string(att->value);
 		} else if (!strcmp(att->name, "profiles")) {
+			if (mpd->profiles) gf_free(mpd->profiles);
 			mpd->profiles = gf_mpd_parse_string(att->value);
 		} else if (!strcmp(att->name, "type")) {
 			if (!strcmp(att->value, "static")) mpd->type = GF_MPD_TYPE_STATIC;
@@ -1080,6 +1349,12 @@
 			mpd->max_segment_duration = gf_mpd_parse_duration_u32(att->value);
 		} else if (!strcmp(att->name, "maxSubsegmentDuration")) {
 			mpd->max_subsegment_duration = gf_mpd_parse_duration_u32(att->value);
+		} else if (!strcmp(att->name, "gpac:init_gen_time")) {
+			mpd->gpac_init_ntp_ms = gf_mpd_parse_long_int(att->value);
+		} else if (!strcmp(att->name, "gpac:next_gen_time")) {
+			mpd->gpac_next_ntp_ms = gf_mpd_parse_long_int(att->value);
+		} else if (!strcmp(att->name, "gpac:mpd_time")) {
+			mpd->gpac_mpd_time = gf_mpd_parse_long_int(att->value);
 		} else {
 			MPD_STORE_EXTENSION_ATTR(mpd)
 		}
@@ -1096,14 +1371,13 @@
 			e = gf_mpd_parse_program_info(mpd, child);
 			if (e) return e;
 		} else if (!strcmp(child->name, "Location")) {
-			e = gf_mpd_parse_location(mpd, child);
-			if (e) return e;
+			char *str = gf_mpd_parse_text_content(child);
+			if (str) gf_list_add(mpd->locations, str);
 		} else if (!strcmp(child->name, "Period")) {
 			e = gf_mpd_parse_period(mpd, child);
 			if (e) return e;
 		} else if (!strcmp(child->name, "Metrics")) {
-			e = gf_mpd_parse_metrics(mpd, child);
-			if (e) return e;
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Metrics not implemented yet\n"));
 		} else if (!strcmp(child->name, "BaseURL")) {
 			e = gf_mpd_parse_base_url(mpd->base_URLs, child);
 			if (e) return e;
@@ -1136,15 +1410,8 @@
 	return gf_mpd_complete_from_dom(root, mpd, default_base_url);
 }
 
-GF_EXPORT
-void gf_mpd_getter_del_session(GF_FileDownload *getter) {
-	if (!getter || !getter->del_session)
-		return;
-	getter->del_session(getter);
-}
-
 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 is_end, u32 max_dur, GF_MPD *mpd, Bool parse_sub_playlist, Bool test_mode)
+                                      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;
@@ -1191,10 +1458,10 @@
 	if (!info) return GF_OUT_OF_MEM;
 	info->more_info_url = gf_strdup("http://gpac.io");
 	info->title = gf_strdup(title);
-	sprintf(str, "Generated from URL %s", src_base_url);
+	sprintf(str, "Generated from URL %s", gf_file_basename(src_base_url));
 	info->source = gf_strdup(str);
-	if (!test_mode)
-		sprintf(str, "Generated by GPAC %s", GPAC_FULL_VERSION);
+	if (!gf_sys_is_test_mode())
+		sprintf(str, "Generated by GPAC %s", gf_gpac_version());
 	else
 		sprintf(str, "Generated by GPAC");
 	info->copyright = gf_strdup(str);
@@ -1211,7 +1478,6 @@
 		period->duration = max_dur*1000;
 	}
 
-	nb_streams = gf_list_count(pl->streams);
 	/*check if we use templates*/
 	template_base = NULL;
 	template_ext = NULL;
@@ -1325,7 +1591,8 @@
 		if (use_template) {
 			GF_SAFEALLOC(set->segment_template, GF_MPD_SegmentTemplate);
 			if (!set->segment_template)  return GF_OUT_OF_MEM;
-			set->segment_template->duration = (u32)pe->duration_info;
+			if (pe)
+				set->segment_template->duration = (u32)pe->duration_info;
 			if (template_width > 1) {
 				sprintf(str, "%s$%%0%ddNumber$%s", template_base, template_width, template_ext);
 			} else {
@@ -1348,11 +1615,11 @@
 			pe = gf_list_get(stream->variants, j);
 
 			if (pe->element_type == TYPE_MEDIA) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 Media\n"));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] NOT SUPPORTED: M3U8 Media\n"));
 			} else if (pe->load_error) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Error loading playlist element %s\n", pe->url));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Error loading playlist element %s\n", pe->url));
 			} else if (pe->element_type != TYPE_PLAYLIST) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] NOT SUPPORTED: M3U8 unknown type for %s\n", pe->url));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] NOT SUPPORTED: M3U8 unknown type for %s\n", pe->url));
 			}
 
 			count_elements = gf_list_count(pe->element.playlist.elements);
@@ -1361,7 +1628,6 @@
 
 			if (pe->codecs && (pe->codecs[0] == '\"')) {
 				u32 len = (u32) strlen(pe->codecs);
-//				strncpy(pe->codecs, pe->codecs+1, len-1);
 				memmove(pe->codecs, pe->codecs+1, len-1);
 				pe->codecs[len-2] = 0;
 			}
@@ -1408,13 +1674,14 @@
 				base_url = gf_strdup("./");
 			}
 
-
 			width = pe->width;
 			height = pe->height;
 			samplerate = num_channels = 0;
+
+retry_import:
+
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 			if (elt && import_file) {
-				GF_Err e;
 				GF_MediaImporter import;
 				char *elt_url = elt->init_segment_url ? elt->init_segment_url : elt->url;
 				u64 br_start, br_end;
@@ -1442,11 +1709,17 @@
 				} else {
 					import.in_name = elt_url;
 				}
+
+				if (!strstr(elt_url, "://") && !gf_file_exists(elt_url)) {
+					import_file = GF_FALSE;
+					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;
 				}
 
@@ -1456,8 +1729,7 @@
 					Double bw;
 					FILE *t = gf_fopen(import.in_name, "rb");
 					if (t) {
-						gf_fseek(t, 0, SEEK_END);
-						pos = gf_ftell(t);
+						pos = gf_fsize(t);
 						gf_fclose(t);
 					}
 					bw = (Double) pos;
@@ -1470,7 +1742,7 @@
 				}
 
 				if (tmp_file)
-					gf_delete_file(tmp_file);
+					gf_file_delete(tmp_file);
 
 				if (!pe->codecs) {
 					char szCodecs[1024];
@@ -1484,7 +1756,7 @@
 					pe->codecs = gf_strdup(szCodecs);
 				}
 				for (k=0; k<import.nb_tracks; k++) {
-					switch (import.tk_info[k].type) {
+					switch (import.tk_info[k].stream_type) {
 					case GF_ISOM_MEDIA_VISUAL:
                     case GF_ISOM_MEDIA_AUXV:
                     case GF_ISOM_MEDIA_PICT:
@@ -1517,7 +1789,7 @@
 			rep->bandwidth = pe->bandwidth;
 			/* TODO : if mime-type is still unknown, don't try to add codec information since it would be wrong */
 			if (!strcmp(M3U8_UNKNOWN_MIME_TYPE, mimeTypeForM3U8Segments)) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Unknown mime-type when converting from M3U8 HLS playlist, setting %s\n", mimeTypeForM3U8Segments));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Unknown mime-type when converting from M3U8 HLS playlist, setting %s\n", mimeTypeForM3U8Segments));
 			}
 			if (elt && elt->init_segment_url && (strstr(elt->init_segment_url, ".mp4") || strstr(elt->init_segment_url, ".MP4")) ) {
 				rep->mime_type = gf_strdup(samplerate ? "audio/mp4" : "video/mp4");
@@ -1538,14 +1810,16 @@
 				rep->samplerate = samplerate;
 			}
 			if (num_channels) {
-				char szChan[10];
 				GF_MPD_Descriptor *desc;
 				GF_SAFEALLOC(desc, GF_MPD_Descriptor);
-				desc->scheme_id_uri = gf_strdup("urn:mpeg:dash:23003:3:audio_channel_configuration:2011");
-				sprintf(szChan, "%d", num_channels);
-				desc->value = gf_strdup(szChan);
-				if (!rep->audio_channels) rep->audio_channels = gf_list_new();
-				gf_list_add(rep->audio_channels, desc);
+				if (desc) {
+					char szChan[10];
+					desc->scheme_id_uri = gf_strdup("urn:mpeg:dash:23003:3:audio_channel_configuration:2011");
+					sprintf(szChan, "%d", num_channels);
+					desc->value = gf_strdup(szChan);
+					if (!rep->audio_channels) rep->audio_channels = gf_list_new();
+					gf_list_add(rep->audio_channels, desc);
+				}
 			}
 
 
@@ -1585,13 +1859,15 @@
 				url->URL = gf_strdup(byte_range_media_file);
 			} else {
 				u32 url_len = (u32) strlen(base_url);
-				if (strncmp(base_url, mpd_file, url_len)) {
+				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_strdup(base_url);
+					url->URL = gf_url_concatenate_parent(mpd_file, base_url);
 				}
 			}
 
@@ -1599,7 +1875,7 @@
 			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) {
+			if (/*(mpd->type == GF_MPD_TYPE_DYNAMIC) && */ !parse_sub_playlist) {
 				rep->segment_list->xlink_href = pe->url;
 				pe->url=NULL;
 				gf_free(base_url);
@@ -1612,9 +1888,11 @@
 			}
 			rep->segment_list->segment_URLs = gf_list_new();
 			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);
@@ -1623,21 +1901,48 @@
 				}
 				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;
+
 					rep->segment_list->initialization_segment->byte_range->start_range = elt->init_byte_range_start;
 					rep->segment_list->initialization_segment->byte_range->end_range = elt->init_byte_range_end;
 				}
 			}
 
-//			update_interval = (count_elements - 1) * pe->duration_info * 1000;
+
+			Double avg_dur = 0;
+			Double cur_start=0;
+			Bool do_seg_timeline = use_segment_timeline;
+
 			for (k=0; k<count_elements; k++) {
+				Double diff, seg_start;
 				GF_MPD_SegmentURL *segment_url;
 				elt = gf_list_get(pe->element.playlist.elements, k);
 
+				if (!avg_dur) avg_dur = elt->duration_info;
+				else if (elt->duration_info) {
+					diff = elt->duration_info - avg_dur;
+					if (diff<0) diff = -diff;
+					if (diff > avg_dur/2) {
+						do_seg_timeline = GF_TRUE;
+					}
+				}
+				seg_start = ((Double)k*rep->segment_list->duration) / rep->segment_list->timescale;
+				if (k) {
+					diff = cur_start - seg_start;
+					if (diff<0) diff = -diff;
+					if (diff > avg_dur/2) {
+						do_seg_timeline = GF_TRUE;
+					}
+				}
+
+				cur_start += elt->duration_info;
+
 				GF_SAFEALLOC(segment_url, GF_MPD_SegmentURL);
 				if (!segment_url) return GF_OUT_OF_MEM;
 				gf_list_add(rep->segment_list->segment_URLs, segment_url);
 				if (byte_range_media_file) {
 					GF_SAFEALLOC(segment_url->media_range, GF_MPD_ByteRange);
+					if (!segment_url->media_range) return GF_OUT_OF_MEM;
 					segment_url->media_range->start_range = elt->byte_range_start;
 					segment_url->media_range->end_range = elt->byte_range_end;
 					if (strcmp(elt->url, byte_range_media_file)) {
@@ -1653,6 +1958,7 @@
 						elt->url=NULL;
 					}
 				}
+
 				if (elt->drm_method != DRM_NONE) {
 					//segment_url->key_url = "aes-128";
 					if (elt->key_uri) {
@@ -1662,6 +1968,26 @@
 					}
 				}
 			}
+			if (do_seg_timeline) {
+				u64 start_time = 0;
+				GF_SAFEALLOC(rep->segment_list->segment_timeline, GF_MPD_SegmentTimeline);
+				if (!rep->segment_list->segment_timeline) return GF_OUT_OF_MEM;
+
+				rep->segment_list->segment_timeline->entries = gf_list_new();
+				for (k=0; k<count_elements; k++) {
+					u64 dur;
+					GF_MPD_SegmentTimelineEntry *se;
+					elt = gf_list_get(pe->element.playlist.elements, k);
+					GF_SAFEALLOC(se, GF_MPD_SegmentTimelineEntry);
+					if (!se) return GF_OUT_OF_MEM;
+
+					dur = (u64) ( elt->duration_info * rep->segment_list->timescale);
+					se->duration = (u32) dur;
+					se->start_time = start_time;
+					start_time += dur;
+					gf_list_add(rep->segment_list->segment_timeline->entries, se);
+				}
+			}
 			gf_free(base_url);
 		}
 
@@ -1683,8 +2009,8 @@
 GF_EXPORT
 GF_Err gf_m3u8_to_mpd(const char *m3u8_file, const char *base_url,
                       const char *mpd_file,
-                      u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, GF_FileDownload *getter,
-                      GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files, Bool test_mode)
+                      u32 reload_count, char *mimeTypeForM3U8Segments, Bool do_import, Bool use_mpd_templates, Bool use_segment_timeline, GF_FileDownload *getter,
+                      GF_MPD *mpd, Bool parse_sub_playlist, Bool keep_files)
 {
 	GF_Err e;
 	char *title;
@@ -1704,7 +2030,7 @@
 		return e;
 	}
 	if (mpd_file == NULL) {
-		if (!keep_files) gf_delete_file(m3u8_file);
+		if (!keep_files) gf_file_delete(m3u8_file);
 		mpd_file = m3u8_file;
 	}
 
@@ -1744,7 +2070,7 @@
 			if (!suburl || !strcmp(base_url, suburl)) {
 				if (suburl)
 					gf_free(suburl);
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Not downloading, programs are identical for %s...\n", pe->url));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Not downloading, programs are identical for %s...\n", pe->url));
 				continue;
 			}
 
@@ -1761,20 +2087,20 @@
 				//getter->del_session(getter);
 			} else { /* for use in MP4Box */
 				if (strstr(suburl, "://")) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Downloading %s...\n", suburl));
+					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);
 					} else {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] Download failed for %s\n", suburl));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Download failed for %s\n", suburl));
 						e = GF_OK;
 					}
-					gf_delete_file("tmp.m3u8");
+					gf_file_delete("tmp.m3u8");
 				} else {
 					e = gf_m3u8_parse_sub_playlist(suburl, &pl, suburl, stream, pe);
 				}
 				if (e) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8toMPD] Failed to parse subplaylist %s\n", suburl));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] Failed to parse subplaylist %s\n", suburl));
 				}
 
 			}
@@ -1787,7 +2113,7 @@
 
 	is_end = !pl->playlist_needs_refresh;
 	if (!the_pe) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD Generator] The M3U8 playlist is not correct.\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] The M3U8 playlist is not correct.\n"));
 		return GF_BAD_PARAM;
 	}
 
@@ -1808,9 +2134,9 @@
 	}
 	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, ("[MPD Generator] No need to refresh playlist!\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] No need to refresh playlist!\n"));
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD Generator] Playlist will be refreshed every %g seconds, len=%d\n", update_interval, the_pe->duration_info));
+		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));
 	}
 
 	title = the_pe->title;
@@ -1820,7 +2146,7 @@
 	assert(mpd_file);
 	assert(mpd);
 
-	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, is_end,  max_dur, mpd, parse_sub_playlist, test_mode);
+	e = gf_m3u8_fill_mpd_struct(pl, m3u8_file, base_url, mpd_file, title, update_interval, mimeTypeForM3U8Segments, do_import, use_mpd_templates, use_segment_timeline, is_end,  max_dur, mpd, parse_sub_playlist);
 
 	gf_m3u8_master_playlist_del(&pl);
 
@@ -1840,11 +2166,13 @@
 	PlaylistElement *pe;
 	u32 k, count_elements;
 	u64 start_time=0;
+	u32 base_url_len = 0;
+	char *base_url = NULL;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Solving m3u8 variant playlist %s\n", rep->segment_list->xlink_href));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M3U8] Solving m3u8 variant playlist %s\n", rep->segment_list->xlink_href));
 
 	if (!getter || !getter->new_session || !getter->del_session || !getter->get_cache_name) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] FileDownloader not found\n"));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[M3U8] FileDownloader not found\n"));
 		return GF_BAD_PARAM;
 	}
 
@@ -1853,7 +2181,7 @@
 	} else {
 		e = getter->new_session(getter, rep->segment_list->xlink_href);
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Download failed for %s\n", rep->segment_list->xlink_href));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] Download failed for %s\n", rep->segment_list->xlink_href));
 			return e;
 		}
 		e = gf_m3u8_parse_master_playlist(getter->get_cache_name(getter), &pl, rep->segment_list->xlink_href);
@@ -1879,9 +2207,26 @@
 		*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);
+		}
+	}
+
 	if (pe->init_segment_url) {
 		if (!rep->segment_list->initialization_segment) {
 			GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
+			if (!rep->segment_list->initialization_segment) return GF_OUT_OF_MEM;
 
 			if (strstr(pe->init_segment_url, "mp4") || strstr(pe->init_segment_url, "MP4")) {
 				if (rep->mime_type) gf_free(rep->mime_type);
@@ -1892,6 +2237,8 @@
 
 			if (pe->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;
+
 				 rep->segment_list->initialization_segment->byte_range->start_range = pe->init_byte_range_start;
 				 rep->segment_list->initialization_segment->byte_range->end_range = pe->init_byte_range_end;
 			}
@@ -1908,12 +2255,13 @@
 	count_elements = gf_list_count(pe->element.playlist.elements);
 	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;
 
 		//NOTE: for GPAC now, we disable stream AAC to avoid the problem when switching quality. It should be improved later !
-		if (elt && strstr(elt->url, ".aac")) {
+		if (strstr(elt->url, ".aac")) {
 			rep->playback.disabled = GF_TRUE;
 			return GF_OK;
 		}
@@ -1923,7 +2271,19 @@
 			return GF_OUT_OF_MEM;
 		}
 		gf_list_add(rep->segment_list->segment_URLs, segment_url);
-		segment_url->media = gf_url_concatenate(pe->url, elt->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);
+		} 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;
+			}
+		}
 
 		if (! elt->utc_start_time) elt->utc_start_time = start_time;
 		segment_url->hls_utc_start_time = elt->utc_start_time;
@@ -1938,6 +2298,7 @@
 		}
 		if (elt->byte_range_end) {
 			GF_SAFEALLOC(segment_url->media_range, GF_MPD_ByteRange);
+			if (!segment_url->media_range) return GF_OUT_OF_MEM;
 			segment_url->media_range->start_range = elt->byte_range_start;
 			segment_url->media_range->end_range = elt->byte_range_end;
 		}
@@ -1969,6 +2330,22 @@
 }
 
 
+static GFINLINE void gf_mpd_lf(FILE *out, s32 indent)
+{
+	if (indent>=0) gf_fprintf(out, "\n");
+}
+static GFINLINE void gf_mpd_nl(FILE *out, s32 indent)
+{
+	if (indent>=0) {
+		u32 i=(u32)indent;
+		while (i) {
+			gf_fprintf(out, " ");
+			i--;
+		}
+	}
+}
+
+/*time is given in ms*/
 void gf_mpd_print_date(FILE *out, char *name, u64 time)
 {
 	time_t gtime;
@@ -1979,154 +2356,218 @@
 	sec = (u32)(time / 1000);
 	ms = (u32)(time - ((u64)sec) * 1000);
 
-	t = gmtime(&gtime);
-	fprintf(out, " %s=\"%d-%02d-%02dT%02d:%02d:%02d.%03dZ\"", name, 1900 + t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, ms);
+	if (name) {
+		gf_fprintf(out, " %s=\"", name);
+	}
+	t = gf_gmtime(&gtime);
+	sec = t->tm_sec;
+	//see issue #859, no clue how this happened...
+	if (sec > 60)
+		sec = 60;
+	gf_fprintf(out, "%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900 + t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, sec, ms);
+
+	if (name) {
+		gf_fprintf(out, "\"");
+	}
 }
 
-void gf_mpd_print_duration(FILE *out, char *name, u64 duration_in_ms)
+void gf_mpd_print_duration(FILE *out, char *name, u64 duration_in_ms, Bool UseHoursAndMinutes)
 {
-	u32 h, m;
-	Double s;
+	u32 h, m, s, ms;
+
 	h = (u32) (duration_in_ms / 3600000);
 	m = (u32) (duration_in_ms/ 60000) - h*60;
-	s = ((Double) duration_in_ms/1000.0) - h*3600 - m*60;
+	s = (u32) (duration_in_ms/1000) - h*3600 - m*60;
+	ms = (u32) (duration_in_ms) - h*3600*1000 - m*60*1000 - s*1000;
+
+	gf_fprintf(out, " %s=\"PT", name);
+	if(UseHoursAndMinutes)
+		gf_fprintf(out, "%dH%dM", h, m);
+	gf_fprintf(out, "%d", s);
+	gf_fprintf(out, ".");
+	gf_fprintf(out, "%03dS\"", ms);
+}
+
+static void gf_mpd_print_base_url(FILE *out, GF_MPD_BaseURL *base_URL, s32 indent)
+{
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<BaseURL");
+	if (base_URL->service_location)
+		gf_xml_dump_string(out, " serviceLocation=\"", base_URL->service_location, "\"");
+	if (base_URL->byte_range)
+		gf_fprintf(out, " byteRange=\""LLD"-"LLD"\"", base_URL->byte_range->start_range, base_URL->byte_range->end_range);
 
-	fprintf(out, " %s=\"PT%02dH%02dM%02.2fS\"", name, h, m, s);
+	gf_xml_dump_string(out, ">", base_URL->URL, "</BaseURL>");
+	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_base_url(FILE *out, GF_List *base_URLs, char *indent)
+static void gf_mpd_print_base_urls(FILE *out, GF_List *base_URLs, s32 indent)
 {
 	GF_MPD_BaseURL *url;
 	u32 i;
 	i=0;
+
 	while ((url = (GF_MPD_BaseURL *)gf_list_enum(base_URLs, &i))) {
-		fprintf(out, "%s<BaseURL", indent);
-		if (url->service_location)
-			fprintf(out, " serviceLocation=\"%s\"", url->service_location);
-		if (url->byte_range)
-			fprintf(out, " byteRange=\""LLD"-"LLD"\"", url->byte_range->start_range, url->byte_range->end_range);
-		fprintf(out, ">%s</BaseURL>\n", url->URL);
+		gf_mpd_print_base_url(out, url, indent);
 	}
 }
 
-static void gf_mpd_print_url(FILE *out, GF_MPD_URL *url, char *name, char *indent)
+static void gf_mpd_print_url(FILE *out, GF_MPD_URL *url, char *name, s32 indent)
 {
-	fprintf(out, "%s<%s", indent, name);
-	if (url->byte_range) fprintf(out, " range=\""LLD"-"LLD"\"", url->byte_range->start_range, url->byte_range->end_range);
-	if (url->sourceURL) fprintf(out, " sourceURL=\"%s\"", url->sourceURL);
-	fprintf(out, "/>\n");
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<%s", name);
+	if (url->byte_range) gf_fprintf(out, " range=\""LLD"-"LLD"\"", url->byte_range->start_range, url->byte_range->end_range);
+	if (url->sourceURL) gf_fprintf(out, " sourceURL=\"%s\"", url->sourceURL);
+	gf_fprintf(out, "/>");
+	gf_mpd_lf(out, indent);
 }
 
 static void gf_mpd_print_segment_base_attr(FILE *out, GF_MPD_SegmentBase *s)
 {
-	if (s->timescale) fprintf(out, " timescale=\"%d\"", s->timescale);
-	if (s->presentation_time_offset) fprintf(out, " timescale=\""LLU"\"", s->presentation_time_offset);
-	if (s->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", s->index_range->start_range, s->index_range->end_range);
-	if (s->index_range_exact) fprintf(out, " indexRangeExact=\"true\"");
-	if (s->availability_time_offset) fprintf(out, " availabilityTimeOffset=\"%g\"", s->availability_time_offset);
+	if (s->timescale) gf_fprintf(out, " timescale=\"%d\"", s->timescale);
+	if (s->presentation_time_offset) gf_fprintf(out, " presentationTimeOffset=\""LLU"\"", s->presentation_time_offset);
+	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)
-		gf_mpd_print_duration(out, "timeShiftBufferDepth", s->time_shift_buffer_depth);
+		gf_mpd_print_duration(out, "timeShiftBufferDepth", s->time_shift_buffer_depth, GF_TRUE);
 }
 
-static void gf_mpd_print_segment_base(FILE *out, GF_MPD_SegmentBase *s, char *indent)
+static void gf_mpd_print_segment_base(FILE *out, GF_MPD_SegmentBase *s, s32 indent)
 {
-	fprintf(out, "%s<SegmentBase", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<SegmentBase");
 	gf_mpd_print_segment_base_attr(out, s);
-	fprintf(out, ">\n");
+	gf_fprintf(out, ">");
+	gf_mpd_lf(out, indent);
 
-	if (s->initialization_segment) gf_mpd_print_url(out, s->initialization_segment, "Initialization", indent);
-	if (s->representation_index) gf_mpd_print_url(out, s->representation_index, "RepresentationIndex", indent);
+	if (s->initialization_segment) gf_mpd_print_url(out, s->initialization_segment, "Initialization", indent+1);
+	if (s->representation_index) gf_mpd_print_url(out, s->representation_index, "RepresentationIndex", indent+1);
 
-	fprintf(out, "%s</SegmentBase>\n", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</SegmentBase>");
+	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_segment_timeline(FILE *out, GF_MPD_SegmentTimeline *tl, char *indent)
+static void gf_mpd_print_segment_timeline(FILE *out, GF_MPD_SegmentTimeline *tl, s32 indent)
 {
 	u32 i;
+	u64 start_time=0;
 	GF_MPD_SegmentTimelineEntry *se;
-	fprintf(out, "%s <SegmentTimeline>\n", indent);
+
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<SegmentTimeline>");
+	gf_mpd_lf(out, indent);
 
 	i = 0;
 	while ( (se = gf_list_enum(tl->entries, &i))) {
-		fprintf(out, "%s <S", indent);
-		if (se->start_time) fprintf(out, " t=\""LLD"\"", se->start_time);
-		if (se->duration) fprintf(out, " d=\"%d\"", se->duration);
-		if (se->repeat_count) fprintf(out, " r=\"%d\"", se->repeat_count);
-		fprintf(out, "/>\n");
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "<S");
+		if (!start_time || (se->start_time != start_time)) {
+			gf_fprintf(out, " t=\""LLD"\"", se->start_time);
+			start_time = se->start_time;
+		}
+		start_time += (se->repeat_count+1) * se->duration;
+
+		if (se->duration) gf_fprintf(out, " d=\"%d\"", se->duration);
+		if (se->repeat_count) gf_fprintf(out, " r=\"%d\"", se->repeat_count);
+		gf_fprintf(out, "/>");
+		gf_mpd_lf(out, indent);
 	}
-	fprintf(out, "%s </SegmentTimeline>\n", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</SegmentTimeline>");
+	gf_mpd_lf(out, indent);
 }
 
-static u32 gf_mpd_print_multiple_segment_base(FILE *out, GF_MPD_MultipleSegmentBase *ms, char *indent, Bool close_if_no_child)
+GF_MPD_SegmentTimeline *gf_mpd_segmentimeline_new(void)
+{
+	GF_MPD_SegmentTimeline *seg_tl;
+	GF_SAFEALLOC(seg_tl, GF_MPD_SegmentTimeline);
+	if (seg_tl && !seg_tl->entries) seg_tl->entries=gf_list_new();
+	return seg_tl;
+}
+
+static u32 gf_mpd_print_multiple_segment_base(FILE *out, GF_MPD_MultipleSegmentBase *ms, s32 indent, Bool close_if_no_child)
 {
 	gf_mpd_print_segment_base_attr(out, (GF_MPD_SegmentBase *)ms);
 
-	if (ms->duration) fprintf(out, " duration=\""LLD"\"", ms->duration);
-	if (ms->start_number != (u32) -1) fprintf(out, " startNumber=\"%d\"", ms->start_number);
+	if (ms->start_number != (u32) -1) gf_fprintf(out, " startNumber=\"%d\"", ms->start_number);
+	if (ms->duration) gf_fprintf(out, " duration=\""LLD"\"", ms->duration);
 
 
 	if (!ms->bitstream_switching_url && !ms->segment_timeline && !ms->initialization_segment && !ms->representation_index) {
-		if (close_if_no_child) fprintf(out, "/");
-		fprintf(out, ">\n");
+		if (close_if_no_child) gf_fprintf(out, "/");
+		gf_fprintf(out, ">");
+		gf_mpd_lf(out, indent);
 		return 1;
 	}
-	fprintf(out, ">\n");
+	gf_fprintf(out, ">");
+	gf_mpd_lf(out, indent);
 
-	if (ms->initialization_segment) gf_mpd_print_url(out, ms->initialization_segment, "Initialization", indent);
-	if (ms->representation_index) gf_mpd_print_url(out, ms->representation_index, "RepresentationIndex", indent);
+	if (ms->initialization_segment) gf_mpd_print_url(out, ms->initialization_segment, "Initialization", indent+1);
+	if (ms->representation_index) gf_mpd_print_url(out, ms->representation_index, "RepresentationIndex", indent+1);
 
-	if (ms->segment_timeline) gf_mpd_print_segment_timeline(out, ms->segment_timeline, indent);
-	if (ms->bitstream_switching_url) gf_mpd_print_url(out, ms->bitstream_switching_url, "BitstreamSwitching", indent);
+	if (ms->segment_timeline) gf_mpd_print_segment_timeline(out, ms->segment_timeline, indent+1);
+	if (ms->bitstream_switching_url) gf_mpd_print_url(out, ms->bitstream_switching_url, "BitstreamSwitching", indent+1);
 	return 0;
 }
 
-static void gf_mpd_print_segment_list(FILE *out, GF_MPD_SegmentList *s, char *indent)
+static void gf_mpd_print_segment_list(FILE *out, GF_MPD_SegmentList *s, s32 indent)
 {
-	fprintf(out, "%s<SegmentList", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<SegmentList");
 	if (s->xlink_href) {
-		fprintf(out, " xlink:href=\"%s\"", s->xlink_href);
+		gf_fprintf(out, " xlink:href=\"%s\"", s->xlink_href);
 		if (s->xlink_actuate_on_load)
-			fprintf(out, " actuate=\"onLoad\"");
-	}
+			gf_fprintf(out, " actuate=\"onLoad\"");
+	}	
 	gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent, GF_FALSE);
-
+	
 	if (s->segment_URLs) {
 		u32 i;
 		GF_MPD_SegmentURL *url;
 		i = 0;
 		while ( (url = gf_list_enum(s->segment_URLs, &i))) {
-			fprintf(out, "%s<SegmentURL", indent);
-			if (url->media) fprintf(out, " media=\"%s\"", url->media);
-			if (url->index) fprintf(out, " index=\"%s\"", url->index);
-			if (url->media_range) fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
-			if (url->index_range) fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
+			gf_mpd_nl(out, indent+1);
+			gf_fprintf(out, "<SegmentURL");
+                       if (url->media) gf_fprintf(out, " media=\"%s\"", url->media);
+                       if (url->duration)gf_fprintf(out, " duration=\""LLU"\"", url->duration);
+			if (url->index) gf_fprintf(out, " index=\"%s\"", url->index);
+			if (url->media_range && url->media_range->end_range!=0) gf_fprintf(out, " mediaRange=\""LLD"-"LLD"\"", url->media_range->start_range, url->media_range->end_range);
+			if (url->index_range && url->index_range->end_range!=0) gf_fprintf(out, " indexRange=\""LLD"-"LLD"\"", url->index_range->start_range, url->index_range->end_range);
 			if (url->key_url) {
 				u32 idx;
-				fprintf(out, " hls:keyMethod=\"aes-128\" hls:KeyURL=%s hls:KeyIV=\"", url->key_url);
+				gf_fprintf(out, " hls:keyMethod=\"aes-128\" hls:KeyURL=%s hls:KeyIV=\"", url->key_url);
 				for (idx=0; idx<16; idx++) {
-					fprintf(out, "%02x", url->key_iv[idx]);
+					gf_fprintf(out, "%02x", url->key_iv[idx]);
 				}
-				fprintf(out, "\"");
+				gf_fprintf(out, "\"");
 			}
-			fprintf(out, "/>\n");
+			gf_fprintf(out, "/>");
+			gf_mpd_lf(out, indent);
 		}
 	}
-	fprintf(out, "%s</SegmentList>\n", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</SegmentList>");
+	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_segment_template(FILE *out, GF_MPD_SegmentTemplate *s, char *indent)
+static void gf_mpd_print_segment_template(FILE *out, GF_MPD_SegmentTemplate *s, s32 indent)
 {
-	fprintf(out, "%s<SegmentTemplate", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<SegmentTemplate");
 
-	if (s->media) fprintf(out, " media=\"%s\"", s->media);
-	if (s->index) fprintf(out, " index=\"%s\"", s->index);
-	if (s->initialization) fprintf(out, " initialization=\"%s\"", s->initialization);
-	if (s->bitstream_switching) fprintf(out, " bitstreamSwitching=\"%s\"", s->bitstream_switching);
+	if (s->media) gf_fprintf(out, " media=\"%s\"", s->media);
+	if (s->index) gf_fprintf(out, " index=\"%s\"", s->index);
+	if (s->initialization) gf_fprintf(out, " initialization=\"%s\"", s->initialization);
+	if (s->bitstream_switching) gf_fprintf(out, " bitstreamSwitching=\"%s\"", s->bitstream_switching);
 
 	if (gf_mpd_print_multiple_segment_base(out, (GF_MPD_MultipleSegmentBase *)s, indent, GF_TRUE))
 		return;
 
-	fprintf(out, "%s</SegmentTemplate>\n", indent);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</SegmentTemplate>");
+	gf_mpd_lf(out, indent);
 }
 
 static void gf_mpd_extensible_print_attr(FILE *out, GF_MPD_ExtensibleVirtual *item)
@@ -2135,303 +2576,986 @@
 		u32 j=0;
 		GF_XMLAttribute *att;
 		while ((att = (GF_XMLAttribute *)gf_list_enum(item->attributes, &j))) {
-			fprintf(out, " %s=\"%s\"", att->name, att->value);
+			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)
+static void gf_mpd_extensible_print_nodes(FILE *out, GF_MPD_ExtensibleVirtual *item, s32 indent)
 {
 	if (item->children) {
 		u32 j=0;
 		GF_XMLNode *child;
-		fprintf(out, ">\n");
+		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);
-			fprintf(out, "%s", txt);
+			gf_mpd_nl(out, indent+1);
+			gf_fprintf(out, "%s", txt);
 			gf_free(txt);
+			gf_mpd_lf(out, indent);
 		}
 	}
 }
 
-static void gf_mpd_print_descriptors(FILE *out, GF_List *desc_list, char *desc_name, char *indent)
+static void gf_mpd_print_descriptors(FILE *out, GF_List *desc_list, char *desc_name, s32 indent)
 {
 	u32 i=0;
 	GF_MPD_Descriptor *desc;
 	while ((desc = (GF_MPD_Descriptor *)gf_list_enum(desc_list, &i))) {
-		fprintf(out, "%s<%s", indent, desc_name);
-		if (desc->id) fprintf(out, " id=\"%s\"", desc->id);
-		if (desc->scheme_id_uri) fprintf(out, " schemeIdUri=\"%s\"", desc->scheme_id_uri);
-		if (desc->value) fprintf(out, " value=\"%s\"", desc->value);
+		gf_mpd_nl(out, indent);
+		gf_fprintf(out, "<%s", desc_name);
+		if (desc->id) gf_fprintf(out, " id=\"%s\"", desc->id);
+		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);
 
 		if (desc->children) {
-			gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)desc);
-			fprintf(out, "%s</%s>\n", indent, desc_name);
+			gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)desc, indent);
+			gf_mpd_nl(out, indent);
+			gf_fprintf(out, "</%s>", desc_name);
+			gf_mpd_lf(out, indent);
 		} else {
-			fprintf(out, "/>\n");
+			gf_fprintf(out, "/>");
+			gf_mpd_lf(out, indent);
 		}
 	}
 }
 
-static u32 gf_mpd_print_common_representation(FILE *out, GF_MPD_CommonAttributes *ca, char *indent, Bool can_close)
+static void gf_mpd_print_content_component(FILE *out, GF_List *content_component , s32 indent)
 {
-	if (ca->profiles) fprintf(out, " profiles=\"%s\"", ca->profiles);
-	if (ca->width) fprintf(out, " width=\"%d\"", ca->width);
-	if (ca->height) fprintf(out, " height=\"%d\"", ca->height);
-	if (ca->sar) fprintf(out, " sar=\"%d:%d\"", ca->sar->num, ca->sar->den);
-	if (ca->framerate) fprintf(out, " frameRate=\"%d/%d\"", ca->framerate->num, ca->framerate->den);
-	if (ca->samplerate) fprintf(out, " audioSamplingRate=\"%d\"", ca->samplerate);
-	if (ca->mime_type) fprintf(out, " mimeType=\"%s\"", ca->mime_type);
-	if (ca->segmentProfiles) fprintf(out, " segmentProfiles=\"%s\"", ca->segmentProfiles);
-	if (ca->codecs) fprintf(out, " codecs=\"%s\"", ca->codecs);
-	if (ca->maximum_sap_period) fprintf(out, " maximumSAPPeriod=\"%d\"", ca->maximum_sap_period);
-	if (ca->starts_with_sap) fprintf(out, " startWithSAP=\"%d\"", ca->starts_with_sap);
-	if (ca->max_playout_rate) fprintf(out, " maxPlayoutRate=\"%g\"", ca->max_playout_rate);
-	if (ca->coding_dependency) fprintf(out, " codingDependency=\"true\"");
-	if (ca->scan_type!=GF_MPD_SCANTYPE_UNKNWON) fprintf(out, " scanType=\"%s\"", ca->scan_type==GF_MPD_SCANTYPE_PROGRESSIVE ? "progressive" : "interlaced");
-
-	if (can_close && !gf_list_count(ca->frame_packing) && !gf_list_count(ca->audio_channels) && !gf_list_count(ca->content_protection) && !gf_list_count(ca->essential_properties) && !gf_list_count(ca->supplemental_properties) && !ca->isobmf_tracks) {
-		fprintf(out, "/>\n");
-		return 1;
+	u32 i=0;
+	GF_MPD_ContentComponent *cc;
+	while ((cc = gf_list_enum(content_component, &i))) {
+		gf_mpd_nl(out, indent);
+		gf_fprintf(out, "<ContentComponent id=\"%d\" contentType=\"%s\"", cc->id, cc->type);
+		if (cc->lang)
+			gf_fprintf(out, " lang=\"%s\"", cc->lang);
+		gf_fprintf(out, "/>");
+		gf_mpd_lf(out, indent);
 	}
+}
 
-	fprintf(out, ">\n");
-
-	if (ca->isobmf_tracks) {
-		u32 k=0;
-		GF_MPD_ISOBMFInfo *info;
-		fprintf(out, "%s<ISOBMFInfo>\n", indent);
-		while ((info = (GF_MPD_ISOBMFInfo *) gf_list_enum(ca->isobmf_tracks, &k))) {
-			fprintf(out, "%s  <ISOBMFTrack", indent);
-			if (info->trackID) fprintf(out, " ID=\"%d\"", info->trackID);
-			if (info->stsd) fprintf(out, " stsd=\"%s\"", info->stsd);
-			if (info->mediaOffset) fprintf(out, " offset=\""LLD"\"", info->mediaOffset);
-			fprintf(out, "/>\n");
-		}
-		fprintf(out, "%s</ISOBMFInfo>\n", indent);
-	}
+static void gf_mpd_print_common_attributes(FILE *out, GF_MPD_CommonAttributes *ca)
+{
+	if (ca->profiles) {
+		gf_xml_dump_string(out, " profiles=\"", ca->profiles, "\"");
+	}
+	if (ca->mime_type) gf_fprintf(out, " mimeType=\"%s\"", ca->mime_type);
+	if (ca->codecs) gf_fprintf(out, " codecs=\"%s\"", ca->codecs);
+	if (ca->width) gf_fprintf(out, " width=\"%d\"", ca->width);
+	if (ca->height) gf_fprintf(out, " height=\"%d\"", ca->height);
+	if (ca->framerate){
+		gf_fprintf(out, " frameRate=\"%d",ca->framerate->num);
+		if(ca->framerate->den>1)gf_fprintf(out, "/%d",ca->framerate->den);
+		gf_fprintf(out, "\"");
+	}
+	if (ca->sar) gf_fprintf(out, " sar=\"%d:%d\"", ca->sar->num, ca->sar->den);
+	if (ca->samplerate) gf_fprintf(out, " audioSamplingRate=\"%d\"", ca->samplerate);
+	if (ca->segmentProfiles) {
+		gf_xml_dump_string(out, " segmentProfiles=\"", ca->segmentProfiles, "\"");
+	}
+	if (ca->maximum_sap_period) gf_fprintf(out, " maximumSAPPeriod=\"%d\"", ca->maximum_sap_period);
+	if (ca->starts_with_sap) gf_fprintf(out, " startWithSAP=\"%d\"", ca->starts_with_sap);
+	if ((ca->max_playout_rate!=1.0)) gf_fprintf(out, " maxPlayoutRate=\"%g\"", ca->max_playout_rate);
+	if (ca->coding_dependency) gf_fprintf(out, " codingDependency=\"true\"");
+	if (ca->scan_type != GF_MPD_SCANTYPE_UNKNOWN) gf_fprintf(out, " scanType=\"%s\"", ca->scan_type == GF_MPD_SCANTYPE_PROGRESSIVE ? "progressive" : "interlaced");
+}
 
+static u32 gf_mpd_print_common_children(FILE *out, GF_MPD_CommonAttributes *ca, s32 indent)
+{
 	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);
+
+	if (ca->isobmf_tracks) {
+		u32 k=0;
+		GF_MPD_ISOBMFInfo *info;
+		gf_mpd_nl(out, indent);
+		gf_fprintf(out, "<ISOBMFInfo>");
+		gf_mpd_lf(out, indent);
+		while ((info = (GF_MPD_ISOBMFInfo *) gf_list_enum(ca->isobmf_tracks, &k))) {
+			gf_mpd_nl(out, indent+1);
+			gf_fprintf(out, "<ISOBMFTrack");
+			if (info->trackID) gf_fprintf(out, " ID=\"%d\"", info->trackID);
+			if (info->stsd) gf_fprintf(out, " stsd=\"%s\"", info->stsd);
+			if (info->mediaOffset) gf_fprintf(out, " offset=\""LLD"\"", info->mediaOffset);
+			gf_fprintf(out, "/>");
+			gf_mpd_lf(out, indent);
+		}
+		gf_mpd_nl(out, indent);
+		gf_fprintf(out, "</ISOBMFInfo>");
+		gf_mpd_lf(out, indent);
+	}
 	return 0;
 }
 
-static void gf_mpd_print_representation(GF_MPD_Representation const * const rep, FILE *out)
+static void gf_mpd_print_dasher_context(FILE *out, GF_DASH_SegmenterContext *dasher, s32 indent)
 {
-	Bool can_close = GF_FALSE;
-	fprintf(out, "   <Representation");
-	if (rep->id) fprintf(out, " id=\"%s\"", rep->id);
-	if (rep->bandwidth) fprintf(out, " bandwidth=\"%d\"", rep->bandwidth);
-	if (rep->quality_ranking) fprintf(out, " qualityRanking=\"%d\"", rep->quality_ranking);
-	if (rep->dependency_id) fprintf(out, " dependencyId=\"%s\"", rep->dependency_id);
-	if (rep->media_stream_structure_id) fprintf(out, " mediaStreamStructureId=\"%s\"", rep->media_stream_structure_id);
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<gpac:dasher ");
+	gf_fprintf(out, "done=\"%s\" ", dasher->done ? "true" : "false");
+	gf_fprintf(out, "init=\"%s\" ", dasher->init_seg);
+	gf_fprintf(out, "template=\"%s\" ", dasher->template_seg);
+	if (dasher->template_idx)
+		gf_fprintf(out, "index=\"%s\" ", dasher->template_idx);
+	gf_fprintf(out, "segNumber=\"%d\" ", dasher->seg_number);
+	gf_fprintf(out, "url=\"%s\" ", dasher->src_url);
+	gf_fprintf(out, "lastPacketIdx=\""LLU"\" ", dasher->last_pck_idx);
+	gf_fprintf(out, "pidID=\"%d\" ", dasher->pid_id);
+
+	if (dasher->dep_pid_id)
+		gf_fprintf(out, "depID=\"%d\" ", dasher->dep_pid_id);
+
+	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);
+
+	gf_fprintf(out, "multiPIDInit=\"%s\" ", dasher->multi_pids ? "true" : "false");
+	gf_fprintf(out, "dashDuration=\"%g\" ", dasher->dash_dur);
+	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);
+	gf_fprintf(out, "mpdTimescale=\"%d\" ", dasher->mpd_timescale);
+	gf_fprintf(out, "sourcePID=\"%d\" ", dasher->source_pid);
+	gf_fprintf(out, "estimatedNextDTS=\""LLU"\" ", dasher->est_next_dts);
+	gf_fprintf(out, "cumulatedDur=\"%g\" ", dasher->cumulated_dur);
+	gf_fprintf(out, "cumulatedSubdur=\"%g\" ", dasher->cumulated_subdur);
+
+	gf_fprintf(out, "moofSN=\"%d\" ", dasher->moof_sn);
+	gf_fprintf(out, "moofInc=\"%d\" ", dasher->moof_sn_inc);
+
+	if (dasher->segs_purged)
+		gf_fprintf(out, "segsPurged=\"%d\" ", dasher->segs_purged);
+	if (dasher->dur_purged)
+		gf_fprintf(out, "durPurged=\"%g\" ", dasher->dur_purged);
+
+	if (dasher->nb_repeat)
+		gf_fprintf(out, "nbRepeat=\"%d\" ", dasher->nb_repeat);
+	if (dasher->ts_offset)
+		gf_fprintf(out, "tsOffset=\""LLU"\" ", dasher->ts_offset);
+	if (dasher->mux_pids)
+		gf_fprintf(out, "muxPIDs=\"%s\" ", dasher->mux_pids);
+
+	if (dasher->last_dyn_period_id) {
+		gf_fprintf(out, "lastDynPeriodID=\"%d\" ", dasher->last_dyn_period_id);
+	}
+
+	gf_fprintf(out, "ownsSet=\"%s\"/>", dasher->owns_set ? "true" : "false");
+	gf_mpd_lf(out, indent);
+}
+
+static void gf_mpd_print_dasher_segments(FILE *out, GF_List *segments, s32 indent)
+{
+	u32 i, count = gf_list_count(segments);
+	if (!count) return;
+
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<gpac:segments>\n");
+	for (i=0; i<count; i++) {
+		GF_DASH_SegmentContext *sctx = gf_list_get(segments, i);
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "<segmentInfo ");
+		gf_fprintf(out, "time=\""LLU"\" ", sctx->time);
+		gf_fprintf(out, "dur=\""LLU"\" ", sctx->dur);
+		gf_fprintf(out, "seg_num=\"%d\" ", sctx->seg_num);
+		if (sctx->filename) gf_fprintf(out, "file=\"%s\" ", sctx->filename);
+		if (sctx->filepath) gf_fprintf(out, "path=\"%s\" ", sctx->filepath);
+		if (sctx->file_size) {
+			gf_fprintf(out, "size=\"%d\" ", sctx->file_size);
+			if (sctx->file_offset) gf_fprintf(out, "offset=\""LLU"\" ", sctx->file_offset);
+		}
+		if (sctx->index_size) {
+			gf_fprintf(out, "idx_size=\"%d\" ", sctx->index_size);
+			if (sctx->index_offset) gf_fprintf(out, "idx_offset=\""LLU"\" ", sctx->index_offset);
+		}
+		gf_fprintf(out, "/>");
+		gf_mpd_lf(out, indent);
+	}
+
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</gpac:segments>");
+	gf_mpd_lf(out, indent);
+}
 
+static void gf_mpd_print_representation(GF_MPD_Representation const * const rep, FILE *out, Bool write_context, s32 indent)
+{
+	u32 i;
 
-	if (!gf_list_count(rep->base_URLs) && !rep->segment_base && !rep->segment_template && !rep->segment_list && !gf_list_count(rep->sub_representations)) {
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<Representation");
+	if (rep->id) gf_fprintf(out, " id=\"%s\"", rep->id);
+
+/*	if (!gf_list_count(rep->base_URLs) && !rep->segment_base && !rep->segment_template && !rep->segment_list && !gf_list_count(rep->sub_representations)) {
 		can_close = 1;
 	}
+*/
 
-	if (gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)rep, "    ", can_close))
-		return;
+	gf_mpd_print_common_attributes(out, (GF_MPD_CommonAttributes*)rep);
+
+	if (rep->bandwidth) gf_fprintf(out, " bandwidth=\"%d\"", rep->bandwidth);
+	if (rep->quality_ranking) gf_fprintf(out, " qualityRanking=\"%d\"", rep->quality_ranking);
+	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);
+
+
+	gf_fprintf(out, ">");
+	gf_mpd_lf(out, indent);
 
-	gf_mpd_print_base_url(out, rep->base_URLs, " ");
+	if (write_context) {
+		if (rep->dasher_ctx) {
+			gf_mpd_print_dasher_context(out, rep->dasher_ctx, indent+1);
+		}
+		if (rep->state_seg_list) {
+			gf_mpd_print_dasher_segments(out, rep->state_seg_list, indent+1);
+		}
+	}
+
+	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_base_urls(out, rep->base_URLs, indent+1);
 	if (rep->segment_base) {
-		gf_mpd_print_segment_base(out, rep->segment_base, "   ");
+		gf_mpd_print_segment_base(out, rep->segment_base, indent+1);
 	}
 	if (rep->segment_list) {
-		gf_mpd_print_segment_list(out, rep->segment_list, "   ");
+		gf_mpd_print_segment_list(out, rep->segment_list, indent+1);
 	}
 	if (rep->segment_template) {
-		gf_mpd_print_segment_template(out, rep->segment_template, "   ");
+		gf_mpd_print_segment_template(out, rep->segment_template, indent+1);
 	}
 	/*TODO
 				e = gf_mpd_parse_subrepresentation(rep->sub_representations, child);
 				if (e) return e;
 	*/
 
-	fprintf(out, "   </Representation>\n");
+
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</Representation>");
+	gf_mpd_lf(out, indent);
 }
 
-static void gf_mpd_print_adaptation_set(GF_MPD_AdaptationSet const * const as, FILE *out)
+static void gf_mpd_print_adaptation_set(GF_MPD_AdaptationSet *as, FILE *out, Bool write_context, s32 indent)
 {
 	u32 i;
 	GF_MPD_Representation *rep;
-	fprintf(out, "  <AdaptationSet");
+	GF_MPD_other_descriptors *o_desc;
 
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<AdaptationSet");
+
+	if (as->id) gf_fprintf(out, " id=\"%d\"", as->id);
 	if (as->xlink_href) {
-		fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
+		gf_fprintf(out, " xlink:href=\"%s\"", as->xlink_href);
 		if (as->xlink_actuate_on_load)
-			fprintf(out, " actuate=\"onLoad\"");
+			gf_fprintf(out, " actuate=\"onLoad\"");
 	}
-	if (as->id) fprintf(out, " id=\"%d\"", as->id);
-	if (as->group !=  (u32) -1) fprintf(out, " group=\"%d\"", as->group);
-	if (as->lang) fprintf(out, " lang=\"%s\"", as->lang);
-	if (as->par) fprintf(out, " par=\"%d:%d\"", as->par->num, as->par->den);
-	if (as->min_bandwidth) fprintf(out, " minBandwidth=\"%d\"", as->min_bandwidth);
-	if (as->max_bandwidth) fprintf(out, " maxBandwidth=\"%d\"", as->max_bandwidth);
-	if (as->min_width) fprintf(out, " minWidth=\"%d\"", as->min_width);
-	if (as->max_width) fprintf(out, " maxWidth=\"%d\"", as->max_width);
-	if (as->min_height) fprintf(out, " minHeight=\"%d\"", as->min_height);
-	if (as->max_height) fprintf(out, " maxHeight=\"%d\"", as->max_height);
-	if (as->min_framerate) fprintf(out, " minFrameRate=\"%d\"", as->min_framerate);
-	if (as->max_framerate) fprintf(out, " maxFrameRate=\"%d\"", as->max_framerate);
-	if (as->segment_alignment) fprintf(out, " segmentAlignment=\"true\"");
-	if (as->bitstream_switching) fprintf(out, " bitstreamSwitching=\"true\"");
-	if (as->subsegment_alignment) fprintf(out, " subsegmentAlignment=\"true\"");
-	if (as->subsegment_starts_with_sap) fprintf(out, " subsegmentStartsWithSAP=\"%d\"", as->subsegment_starts_with_sap);
-
-
-	gf_mpd_print_common_representation(out, (GF_MPD_CommonAttributes*)as, "   ", 0);
-
-	gf_mpd_print_base_url(out, as->base_URLs, " ");
-
-	gf_mpd_print_descriptors(out, as->accessibility, "Accessibility", "   ");
-	gf_mpd_print_descriptors(out, as->role, "Role", "   ");
-	gf_mpd_print_descriptors(out, as->rating, "Rating", "   ");
-	gf_mpd_print_descriptors(out, as->viewpoint, "Viewpoint", "   ");
+	if (as->segment_alignment) gf_fprintf(out, " segmentAlignment=\"true\"");
+	if (as->group !=  (u32) -1) gf_fprintf(out, " group=\"%d\"", as->group);
+	if (as->min_bandwidth) gf_fprintf(out, " minBandwidth=\"%d\"", as->min_bandwidth);
+	if (as->max_bandwidth) gf_fprintf(out, " maxBandwidth=\"%d\"", as->max_bandwidth);
+	if (as->min_width) gf_fprintf(out, " minWidth=\"%d\"", as->min_width);
+	if (as->max_width) gf_fprintf(out, " maxWidth=\"%d\"", as->max_width);
+	if (as->min_height) gf_fprintf(out, " minHeight=\"%d\"", as->min_height);
+	if (as->max_height) gf_fprintf(out, " maxHeight=\"%d\"", as->max_height);
+	if ((as->min_framerate.num != 0) && (as->min_framerate.den != 0)) {
+		if (as->min_framerate.den==1)
+			gf_fprintf(out, " minFrameRate=\"%d\"", as->min_framerate.num);
+		else
+			gf_fprintf(out, " minFrameRate=\"%d/%d\"", as->min_framerate.num, as->min_framerate.den);
+	}
+	if ((as->max_framerate.num != 0) && (as->max_framerate.den != 0)) {
+		if (as->max_framerate.den==1)
+			gf_fprintf(out, " maxFrameRate=\"%d\"", as->max_framerate.num);
+		else
+			gf_fprintf(out, " maxFrameRate=\"%d/%d\"", as->max_framerate.num, as->max_framerate.den);
+	}
+	if (as->par && (as->par->num != 0) && (as->par->den != 0))
+		gf_fprintf(out, " par=\"%d:%d\"", as->par->num, as->par->den);
+	if (as->lang) gf_fprintf(out, " lang=\"%s\"", as->lang);
+	if (as->bitstream_switching) gf_fprintf(out, " bitstreamSwitching=\"true\"");
+
+	gf_mpd_print_common_attributes(out, (GF_MPD_CommonAttributes*)as);
+	//backward compatibilty with old arch
+	if (as->subsegment_alignment) gf_fprintf(out, " subsegmentAlignment=\"true\"");
+	if (as->subsegment_starts_with_sap) gf_fprintf(out, " subsegmentStartsWithSAP=\"%d\"", as->subsegment_starts_with_sap);
 
-//			e = gf_mpd_parse_content_component(set->content_component, child);
+	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_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_content_component(out, as->content_component, indent+1);
 
 	if (as->segment_base) {
-		gf_mpd_print_segment_base(out, as->segment_base, "   ");
+		gf_mpd_print_segment_base(out, as->segment_base, indent+1);
 	}
 	if (as->segment_list) {
-		gf_mpd_print_segment_list(out, as->segment_list, "   ");
+		gf_mpd_print_segment_list(out, as->segment_list, indent+1);
 	}
 	if (as->segment_template) {
-		gf_mpd_print_segment_template(out, as->segment_template, "   ");
+		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);
+		gf_mpd_print_representation(rep, out, write_context, indent+1);
 	}
-	fprintf(out, "  </AdaptationSet>\n");
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</AdaptationSet>");
+	gf_mpd_lf(out, indent);
 
 
 }
 
-static void gf_mpd_print_period(GF_MPD_Period const * const period, Bool is_dynamic, FILE *out)
+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;
-	fprintf(out, " <Period");
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "<Period");
 	if (period->xlink_href) {
-		fprintf(out, " xlink:href=\"%s\"", period->xlink_href);
+		gf_fprintf(out, " xlink:href=\"%s\"", period->xlink_href);
 		if (period->xlink_actuate_on_load)
-			fprintf(out, " actuate=\"onLoad\"");
+			gf_fprintf(out, " actuate=\"onLoad\"");
 	}
 	if (period->ID)
-		fprintf(out, " id=\"%s\"", period->ID);
+		gf_fprintf(out, " id=\"%s\"", period->ID);
 	if (is_dynamic || period->start)
-		gf_mpd_print_duration(out, "start", period->start);
+		gf_mpd_print_duration(out, "start", period->start, GF_TRUE);
 	if (period->duration)
-		gf_mpd_print_duration(out, "duration", period->duration);
+		gf_mpd_print_duration(out, "duration", period->duration, GF_TRUE);
 	if (period->bitstream_switching)
-		fprintf(out, " bitstreamSwitching=\"true\"");
+		gf_fprintf(out, " bitstreamSwitching=\"true\"");
+
+	gf_fprintf(out, ">");
+	gf_mpd_lf(out, indent);
 
-	fprintf(out, ">\n");
+	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_url(out, period->base_URLs, " ");
+	gf_mpd_print_base_urls(out, period->base_URLs, indent+1);
 
 	if (period->segment_base) {
-		gf_mpd_print_segment_base(out, period->segment_base, " ");
+		gf_mpd_print_segment_base(out, period->segment_base, indent+1);
 	}
 	if (period->segment_list) {
-		gf_mpd_print_segment_list(out, period->segment_list, " ");
+		gf_mpd_print_segment_list(out, period->segment_list, indent+1);
 	}
 	if (period->segment_template) {
-		gf_mpd_print_segment_template(out, period->segment_template, " ");
+		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);
+		gf_mpd_print_adaptation_set(as, out, write_context, indent+1);
 	}
-	fprintf(out, " </Period>\n");
+	gf_mpd_nl(out, indent);
+	gf_fprintf(out, "</Period>");
+	gf_mpd_lf(out, indent);
+}
+
+static GF_Err mpd_write_generation_comment(GF_MPD const * const mpd, FILE *out)
+{
+	u64 time_ms;
+	time_t gtime;
+	struct tm *t;
+	u32 sec;
 
+	time_ms = mpd->publishTime;
+	sec = (u32)(time_ms / 1000);
+	time_ms -= ((u64)sec) * 1000;
+	assert(time_ms<1000);
+
+	gtime = sec;
+	t = gf_gmtime(&gtime);
+	if (! gf_sys_is_test_mode() ){
+		gf_fprintf(out, "\n", gf_gpac_version(), 1900 + t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, (u32)time_ms);
+	}
+	if (!mpd->write_context) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[MPD] Generating MPD at time %d-%02d-%02dT%02d:%02d:%02d.%03dZ\n", 1900 + t->tm_year, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, (u32)time_ms));
+	}
+	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out)
+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)
 {
-	u32 i;
+	gf_fprintf(out, "#EXT-X-STREAM-INF: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 (rep->fps)
+		gf_fprintf(out,",FRAME-RATE=\"%.03g\"", rep->fps);
+
+	if (g_type && g_id_pref)
+		gf_fprintf(out,",%s=\"%s%d\"", g_type, g_id_pref, g_as_idx);
+	if (g2_type && g2_id_pref)
+		gf_fprintf(out,",%s=\"%s%d\"", g2_type, g2_id_pref, g2_as_idx);
+	gf_fprintf(out,"\n");
+
+	gf_fprintf(out, "%s\n",m3u8_name);
+
+}
+
+static void gf_mpd_write_m3u8_playlist_tags(const GF_MPD_AdaptationSet *as, u32 as_idx, const GF_MPD_Representation *rep, FILE *out, char *m3u8_name, GF_MPD_Period *period, u32 nb_audio, u32 nb_subs, u32 nb_cc)
+{
+	u32 i, j;
+	GF_MPD_AdaptationSet *r_as;
+	GF_MPD_Representation *r_rep;
+
+	if (!rep->mime_type) return;
+
+	//no period, this is a component description
+	if (!period) {
+		const char *g_type = NULL;
+		const char *g_id = NULL;
+
+		if (rep->streamtype==GF_STREAM_AUDIO) {
+			g_type = "AUDIO";
+			g_id = "audio";
+		}
+		else if (rep->streamtype==GF_STREAM_TEXT) {
+			g_type = "SUBTITLE";
+			g_id = "subs";
+		}
+		if (!g_type || !g_id)
+			return;
+
+		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);
+		if (rep->nb_chan)
+			gf_fprintf(out,",CHANNELS=\"%d\"", rep->nb_chan);
+		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);
+		return;
+	}
+	//otherwise browse all adaptation sets
+	i=0;
+	while ( (r_as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
+		u32 g_as_idx;
+		Bool is_audio = GF_FALSE;
+		GF_MPD_AdaptationSet *r2_as;
+		GF_MPD_Representation *r2_rep;
+		const char *g_type = NULL;
+		const char *g_id = NULL;
+		const char *g_codec = NULL;
+		if (as==r_as) continue;
+
+		g_as_idx = (r_as->group>0) ? r_as->group : i;
+		r_rep = (GF_MPD_Representation *) gf_list_get(r_as->representations, 0);
+
+		//if audio streams are present, the first pass gather audio and we will need a second loop to get subs
+		if (nb_audio) {
+			if (r_rep->streamtype==GF_STREAM_AUDIO) {
+				g_type = "AUDIO";
+				g_id = "audio";
+				g_codec = r_rep->codecs;
+			}
+			is_audio = GF_TRUE;
+		} else {
+			if (r_rep->streamtype==GF_STREAM_TEXT) {
+				g_type = "SUBTITLE";
+				g_id = "subs";
+			}
+		}
+		//not our type
+		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);
+			continue;
+		}
+		//audio and subs, we need a second loop on audio to get all subs
+		j=0;
+		while ( (r2_as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &j))) {
+			u32 g2_as_idx;
+			const char *g2_type = NULL;
+			const char *g2_id = NULL;
+			if (r_as==r2_as) continue;
+			g2_as_idx = (r2_as->group>0) ? r2_as->group : j;
+
+			r2_rep = (GF_MPD_Representation *) gf_list_get(r2_as->representations, 0);
+			if (r2_rep->streamtype==GF_STREAM_TEXT) {
+				g2_type = "SUBTITLE";
+				g2_id = "subs";
+			}
+			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);
+		}
+	}
+}
+
+static const char *gf_mpd_m3u8_get_init_seg(const GF_MPD_Period *period, const GF_MPD_AdaptationSet *as, const GF_MPD_Representation *rep)
+{
+	const char *url = NULL;
+	if (rep->segment_list) url = rep->segment_list->initialization_segment->sourceURL;
+	else if (rep->segment_template && rep->segment_template->initialization) url = rep->segment_template->initialization;
+	else if (rep->segment_template && rep->segment_template->initialization_segment) url = rep->segment_template->initialization_segment->sourceURL;
+
+	if (as->segment_list && as->segment_list->initialization_segment) url = as->segment_list->initialization_segment->sourceURL;
+	else if (as->segment_template && as->segment_template->initialization) url = as->segment_template->initialization;
+	else if (as->segment_template && as->segment_template->initialization_segment) url = as->segment_template->initialization_segment->sourceURL;
+
+	if (period->segment_list && period->segment_list->initialization_segment) url = period->segment_list->initialization_segment->sourceURL;
+	else if (period->segment_template && period->segment_template->initialization) url = period->segment_template->initialization;
+	else if (period->segment_template && period->segment_template->initialization_segment) url = period->segment_template->initialization_segment->sourceURL;
+	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)
+{
+	u32 i, count;
+	GF_DASH_SegmentContext *sctx;
+	FILE *out;
+	Bool close_file = GF_FALSE;
+
+	if (!strcmp(m3u8_name, "std")) out = stdout;
+	else if (mpd->create_m3u8_files) {
+		out = gf_fopen(m3u8_name, "wb");
+		if (!out) return GF_IO_ERR;
+		close_file = GF_TRUE;
+	} else {
+		out = gf_file_temp(NULL);
+		if (rep->m3u8_var_file) gf_fclose(rep->m3u8_var_file);
+		rep->m3u8_var_file = out;
+	}
+
+	count = gf_list_count(rep->state_seg_list);
+	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-VERSION:%d\n", hls_version);
+	gf_fprintf(out,"#EXT-X-MEDIA-SEQUENCE:%d\n", sctx->seg_num);
+
+	if (as->starts_with_sap<SAP_TYPE_3)
+		gf_fprintf(out,"#EXT-X-INDEPENDENT-SEGMENTS\n");
+
+	if (mpd->m3u8_time && rep->timescale_mpd && (mpd->type == GF_MPD_TYPE_DYNAMIC)) {
+		u64 seg_ast = mpd->availabilityStartTime;
+		seg_ast += (sctx->time * 1000) / rep->timescale_mpd;
+		gf_fprintf(out, "#EXT-X-PROGRAM-DATE-TIME:");
+		gf_mpd_print_date(out, NULL, seg_ast);
+		gf_fprintf(out, "\n");
+	}
+
+	if (sctx->filename) {
+		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);
+			
+			dur = (Double) sctx->dur;
+			dur /= rep->timescale;
+			gf_fprintf(out,"#EXTINF:%g,\n", dur);
+			gf_fprintf(out,"%s\n", sctx->filename);
+		}
+	} else {
+		GF_MPD_BaseURL *base_url=NULL;
+		GF_MPD_URL *init=NULL;
+		
+		if (rep->segment_base && rep->segment_base->initialization_segment) init = rep->segment_base->initialization_segment;
+		if (as->segment_base && as->segment_base->initialization_segment) init = as->segment_base->initialization_segment;
+		if (period->segment_base && period->segment_base->initialization_segment) init = period->segment_base->initialization_segment;
+
+		if (rep->segment_list && rep->segment_list->initialization_segment) init = rep->segment_list->initialization_segment;
+		if (as->segment_list && as->segment_list->initialization_segment) init = as->segment_list->initialization_segment;
+		if (period->segment_list && period->segment_list->initialization_segment) init = period->segment_list->initialization_segment;
+
+		base_url = gf_list_get(rep->base_URLs, 0);
+		assert(base_url);
+
+		if (init) {
+			gf_fprintf(out,"#EXT-X-MAP:URI=\"%s\",BYTERANGE=\"%d@"LLU"\"\n", base_url->URL, (u32) (1+init->byte_range->end_range - init->byte_range->start_range), init->byte_range->start_range);
+		}
+
+		for (i=0; i<count; i++) {
+			Double dur;
+			sctx = gf_list_get(rep->state_seg_list, i);
+			assert(!sctx->filename);
+			assert(sctx->file_size);
+
+			dur = (Double) sctx->dur;
+			dur /= rep->timescale;
+			gf_fprintf(out,"#EXTINF:%g\n", dur);
+			gf_fprintf(out,"#EXT-X-BYTERANGE:%d@"LLU"\n", sctx->file_size, sctx->file_offset);
+			gf_fprintf(out,"%s\n", base_url->URL);
+		}
+	}
+
+	if (mpd->type != GF_MPD_TYPE_DYNAMIC)
+		gf_fprintf(out,"\n#EXT-X-ENDLIST\n");
+
+	if (close_file)
+		gf_fclose(out);
+	
+	return GF_OK;
+}
+
+
+GF_Err gf_mpd_write_m3u8_master_playlist(GF_MPD const * const mpd, FILE *out, const char* m3u8_name, GF_MPD_Period *period)
+{
+	u32 i, j, hls_version;
+	u32 var_idx;
+	GF_Err e;
+	GF_MPD_AdaptationSet *as;
+	GF_MPD_Representation *rep;
+	Bool use_range = GF_FALSE;
+	Bool use_init = GF_FALSE;
+	Bool use_ind_segments = GF_TRUE;
+	Bool is_fmp4 = GF_FALSE;
+	char *szVariantName;
+	char *m3u8_name_rad, *sep;
+	u32 nb_audio=0;
+	u32 nb_cc=0;
+	u32 nb_subs=0;
+	Bool has_muxed_comp = GF_FALSE;
+	Bool has_video = GF_FALSE;
+	Bool has_audio = GF_FALSE;
+
+	if (!m3u8_name || !period) return GF_BAD_PARAM;
+
+	i=0;
+	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;
+
+		j=0;
+		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
+			GF_DASH_SegmentContext *sctx;
+			const char *init_seg;
+			if (!rep->state_seg_list || !gf_list_count(rep->state_seg_list) ) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] No segment state in representation, MPD cannot be translated to M3U8\n"));
+				return GF_BAD_PARAM;
+			}
+
+			sctx = gf_list_get(rep->state_seg_list, 0);
+			if (!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);
+			if (init_seg) use_init = GF_TRUE;
+			if (rep->mime_type) {
+				if (strstr(rep->mime_type, "mp4")) is_fmp4 = GF_TRUE;
+			}
+
+			if (rep->streamtype==GF_STREAM_AUDIO) nb_audio++;
+			else if (rep->streamtype==GF_STREAM_TEXT) nb_subs++;
+		}
+	}
+	//we by default use floating point durations
+	hls_version = 3;
+	if (use_range) hls_version = 4;
+	if (is_fmp4 || use_init) hls_version = 6;
+
+
+	gf_fprintf(out, "#EXTM3U\n");
+	gf_fprintf(out, "#EXT-X-VERSION: %d\n", hls_version);
+	if (use_ind_segments)
+		gf_fprintf(out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
+	gf_fprintf(out, "\n");
+
+	if (!strncmp(m3u8_name, "gfio://", 7)) {
+		const char *fpath = gf_fileio_translate_url(m3u8_name);
+		if (!fpath) return GF_BAD_PARAM;
+		//use basename since this file will be created throught GF_FileIO factory (relative to the original gfio://)
+		m3u8_name_rad = gf_strdup(gf_file_basename(fpath));
+	} else {
+		m3u8_name_rad = gf_strdup(m3u8_name);
+	}
+	sep = strrchr(m3u8_name_rad, '.');
+	if (sep) sep[0] = 0;
+	szVariantName = gf_malloc(sizeof(char) * (100 + strlen(m3u8_name_rad)) );
+
+
+	//first pass, generate all subplaylists, and check if we have muxed components, or video or audio
+	var_idx = 1;
+	i=0;
+	while ( (as = (GF_MPD_AdaptationSet *) gf_list_enum(period->adaptation_sets, &i))) {
+		if (as->content_component && gf_list_count(as->content_component)>1) {
+			has_muxed_comp = GF_TRUE;
+		}
+		if (as->max_width && as->max_height) {
+			has_video = GF_TRUE;
+		}
+		if (as->samplerate)
+			has_audio = GF_TRUE;
+
+		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) {
+				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++;
+
+
+			e = gf_mpd_write_m3u8_playlist(mpd, period, as, rep, name, hls_version);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[M3U8] IO error while opening m3u8 files\n"));
+				return GF_IO_ERR;
+			}
+		}
+	}
+
+	//no muxed comp, no video, the audio is the main media we will list, force nb_audio=0 for gf_mpd_write_m3u8_playlist_tags
+	if (!has_video && !has_muxed_comp)
+		nb_audio = 0;
+
+	//second 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;
+		Bool is_audio = GF_FALSE;
+		Bool is_muxed_comp = GF_FALSE;
+		Bool is_primary = GF_TRUE;
+		if (as->content_component && gf_list_count(as->content_component)>1) {
+			is_muxed_comp = GF_TRUE;
+		}
+		if (as->max_width && as->max_height) {
+			is_video = GF_TRUE;
+		}
+		if (as->samplerate) {
+			is_audio = GF_TRUE;
+		}
+
+		//check if we have audio or video
+		j=0;
+		while ( (rep = (GF_MPD_Representation *) gf_list_enum(as->representations, &j))) {
+			if (rep->mime_type) {
+				if (!strncmp(rep->mime_type, "video/", 6)) is_video = GF_TRUE;
+				else if (!strncmp(rep->mime_type, "audio/", 6)) is_audio = GF_TRUE;
+				break;
+			}
+		}
+		//figure out if this is the primary media or an associated media with the content
+		if (has_muxed_comp) {
+			if (!is_muxed_comp) is_primary = GF_FALSE;
+		} else if (has_video) {
+			if (!is_video) is_primary = GF_FALSE;
+		} else if (has_audio) {
+			if (!is_audio) is_primary = GF_FALSE;
+		}
+
+		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) ) {
+				continue;
+			}
+			if (rep->m3u8_var_name) {
+				name = gf_file_basename(rep->m3u8_var_name);
+			}
+
+			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");
+		}
+	}
+
+	if (mpd->type != GF_MPD_TYPE_DYNAMIC)
+		gf_fprintf(out,"#EXT-X-ENDLIST\n");
+
+	gf_free(m3u8_name_rad);
+	gf_free(szVariantName);
+	return GF_OK;
+}
+
+
+#if 0 //unused
+GF_Err gf_mpd_write_m3u8_file(GF_MPD *mpd, const char *file_name, GF_MPD_Period *period)
+{
+	GF_Err e;
+	FILE *out;
+	if (!strcmp(file_name, "std")) out = stdout;
+	else {
+		out = gf_fopen(file_name, "wb");
+		if (!out) return GF_IO_ERR;
+
+		mpd->create_m3u8_files = GF_TRUE;
+	}
+
+	e = gf_mpd_write_m3u8_master_playlist(mpd, out, file_name, period);
+	gf_fclose(out);
+	mpd->create_m3u8_files = GF_FALSE;
+	return e;
+}
+#endif
+
+GF_Err gf_mpd_write(GF_MPD const * const mpd, FILE *out, Bool compact)
+{
+	u32 i, count;
+	s32 indent = compact ? GF_INT_MIN : 0;
 	GF_MPD_ProgramInfo *info;
 	char *text;
-	GF_MPD_Period *period;
 
 	if (!mpd->xml_namespace) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] No namespace found while writing. Setting to default.\n"));
 	}
 
-	fprintf(out, "<?xml version=\"1.0\"?>\n<MPD xmlns=\"%s\" type=\"%s\"", (mpd->xml_namespace ? mpd->xml_namespace : "urn:mpeg:dash:schema:mpd:2011"), (mpd->type == GF_MPD_TYPE_STATIC) ? "static" : "dynamic");
+	gf_fprintf(out, "<?xml version=\"1.0\"?>");
+	gf_mpd_lf(out, indent);
+	mpd_write_generation_comment(mpd, out);
+	gf_fprintf(out, "<MPD xmlns=\"%s\"", (mpd->xml_namespace ? mpd->xml_namespace : "urn:mpeg:dash:schema:mpd:2011"));
+
+	if (mpd->write_context) {
+	 	gf_fprintf(out, " xmlns:gpac=\"urn:gpac:filters:dasher:2018\"" );
+	}
 
 	if (mpd->ID)
-		fprintf(out, " id=\"%s\"", mpd->ID);
+		gf_fprintf(out, " id=\"%s\"", mpd->ID);
+
+	if (mpd->min_buffer_time)
+		gf_mpd_print_duration(out, "minBufferTime", mpd->min_buffer_time, GF_FALSE);
+
+	gf_fprintf(out," type=\"%s\"",(mpd->type == GF_MPD_TYPE_STATIC ? "static" : "dynamic"));
+
 
-	if (mpd->profiles)
-		fprintf(out, " profiles=\"%s\"", mpd->profiles);
 	if (mpd->type == GF_MPD_TYPE_DYNAMIC)
 		gf_mpd_print_date(out, "availabilityStartTime", mpd->availabilityStartTime);
 	if (mpd->availabilityEndTime)
 		gf_mpd_print_date(out, "availabilityEndTime", mpd->availabilityEndTime);
-	if (mpd->publishTime)
+	if (mpd->publishTime && mpd->type != GF_MPD_TYPE_STATIC)
 		gf_mpd_print_date(out, "publishTime", mpd->publishTime);
 	if (mpd->media_presentation_duration)
-		gf_mpd_print_duration(out, "mediaPresentationDuration", mpd->media_presentation_duration);
+		gf_mpd_print_duration(out, "mediaPresentationDuration", mpd->media_presentation_duration, GF_TRUE);
 	if (mpd->minimum_update_period)
-		gf_mpd_print_duration(out, "minimumUpdatePeriod", mpd->minimum_update_period);
-	if (mpd->min_buffer_time)
-		gf_mpd_print_duration(out, "minBufferTime", mpd->min_buffer_time);
-	if (mpd->time_shift_buffer_depth)
-		gf_mpd_print_duration(out, "timeShiftBufferDepth", mpd->time_shift_buffer_depth);
+		gf_mpd_print_duration(out, "minimumUpdatePeriod", mpd->minimum_update_period, GF_TRUE);
+	if ((s32) mpd->time_shift_buffer_depth > 0)
+		gf_mpd_print_duration(out, "timeShiftBufferDepth", mpd->time_shift_buffer_depth, GF_TRUE);
 	if (mpd->suggested_presentation_delay)
-		gf_mpd_print_duration(out, "suggestedPresentationDelay", mpd->suggested_presentation_delay);
-	if (mpd->max_segment_duration)
-		gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration);
+		gf_mpd_print_duration(out, "suggestedPresentationDelay", mpd->suggested_presentation_delay, GF_TRUE);
+	if (mpd->max_segment_duration) 
+		gf_mpd_print_duration(out, "maxSegmentDuration", mpd->max_segment_duration, GF_TRUE);
 	if (mpd->max_subsegment_duration)
-		gf_mpd_print_duration(out, "maxSubsegmentDuration", mpd->max_subsegment_duration);
+		gf_mpd_print_duration(out, "maxSubsegmentDuration", mpd->max_subsegment_duration, GF_TRUE);
+
+	if (mpd->profiles) {
+		gf_xml_dump_string(out, " profiles=\"", mpd->profiles, "\"");
+	}
 
 	if (mpd->attributes) gf_mpd_extensible_print_attr(out, (GF_MPD_ExtensibleVirtual*)mpd);
 
-	fprintf(out, ">\n");
+	if (mpd->write_context) {
+		if (mpd->gpac_init_ntp_ms)
+			gf_fprintf(out," gpac:init_gen_time=\""LLU"\"", mpd->gpac_init_ntp_ms);
+		if (mpd->gpac_next_ntp_ms)
+			gf_fprintf(out," gpac:next_gen_time=\""LLU"\"", mpd->gpac_next_ntp_ms);
+		if (mpd->gpac_mpd_time)
+			gf_fprintf(out," gpac:mpd_time=\""LLU"\"", mpd->gpac_mpd_time);
+	}
+
+	gf_fprintf(out, ">");
+	gf_mpd_lf(out, indent);
 
 	if (mpd->children) {
-		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)mpd);
+		gf_mpd_extensible_print_nodes(out, (GF_MPD_ExtensibleVirtual*)mpd, indent+1);
 	}
 
 	i=0;
 	while ((info = (GF_MPD_ProgramInfo *)gf_list_enum(mpd->program_infos, &i))) {
-		fprintf(out, " <ProgramInformation");
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "<ProgramInformation");
 		if (info->lang) {
-			fprintf(out, " lang=\"%s\"", info->lang);
+			gf_fprintf(out, " lang=\"%s\"", info->lang);
 		}
 		if (info->more_info_url) {
-			fprintf(out, " moreInformationURL=\"%s\"", info->more_info_url);
+			gf_xml_dump_string(out, " moreInformationURL=\"", info->more_info_url, "\"");
 		}
-		fprintf(out, ">\n");
+		gf_fprintf(out, ">");
+		gf_mpd_lf(out, indent);
 		if (info->title) {
-			fprintf(out, "  <Title>%s</Title>\n", info->title);
+			gf_mpd_nl(out, indent+2);
+			gf_xml_dump_string(out, "<Title>", info->title, "</Title>");
+			gf_mpd_lf(out, indent);
 		}
 		if (info->source) {
-			fprintf(out, "  <Source>%s</Source>\n", info->source);
+			gf_mpd_nl(out, indent+2);
+			gf_xml_dump_string(out, "<Source>", info->source, "</Source>");
+			gf_mpd_lf(out, indent);
 		}
 		if (info->copyright) {
-			fprintf(out, "  <Copyright>%s</Copyright>\n", info->copyright);
+			gf_mpd_nl(out, indent+2);
+			gf_xml_dump_string(out, "<Copyright>", info->copyright, "</Copyright>");
+			gf_mpd_lf(out, indent);
 		}
-		fprintf(out, " </ProgramInformation>\n");
+		gf_mpd_nl(out, indent+1);
+		gf_fprintf(out, "</ProgramInformation>");
+		gf_mpd_lf(out, indent);
 	}
 
-	gf_mpd_print_base_url(out, mpd->base_URLs, " ");
+	gf_mpd_print_base_urls(out, mpd->base_URLs, indent+1);
+
+	gf_mpd_lf(out, indent);
 
 	i=0;
 	while ((text = (char *)gf_list_enum(mpd->locations, &i))) {
-		fprintf(out, " <Location>%s</Location>\n", text);
+		gf_mpd_nl(out, indent+1);
+		gf_xml_dump_string(out, "<Location>", text, "</Location>");
+		gf_mpd_lf(out, indent);
 	}
 
 	/*
@@ -2441,12 +3565,17 @@
 		}
 	*/
 
-	i=0;
-	while ((period = (GF_MPD_Period *)gf_list_enum(mpd->periods, &i))) {
-		gf_mpd_print_period(period, mpd->type==GF_MPD_TYPE_DYNAMIC, out);
+	count = gf_list_count(mpd->periods);
+	for (i=0; i<count; i++) {
+		Bool is_dynamic;
+		GF_MPD_Period *period = (GF_MPD_Period *)gf_list_get(mpd->periods, i);
+		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_print_period(period, is_dynamic, out, mpd->write_context, indent+1);
 	}
 
-	fprintf(out, "</MPD>\n");
+	gf_fprintf(out, "</MPD>");
 
 	return GF_OK;
 }
@@ -2462,11 +3591,12 @@
 		if (!out) return GF_IO_ERR;
 	}
 
-	e = gf_mpd_write(mpd, out);
+	e = gf_mpd_write(mpd, out, GF_FALSE);
 	gf_fclose(out);
 	return e;
 }
 
+
 GF_EXPORT
 u32 gf_mpd_get_base_url_count(GF_MPD *mpd, GF_MPD_Period *period, GF_MPD_AdaptationSet *set, GF_MPD_Representation *rep)
 {
@@ -2649,7 +3779,7 @@
 		case GF_MPD_RESOLVE_URL_MEDIA_TEMPLATE:
 		case GF_MPD_RESOLVE_URL_MEDIA_NOSTART:
 			if (!url) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Media URL is not set in segment list\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Media URL is not set in segment list\n"));
 				return GF_SERVICE_ERROR;
 			}
 			if ((item_index >= segment_count) || ((s32) item_index < 0)) {
@@ -2806,7 +3936,7 @@
 			if (rep->id) {
 				strcat(solved_template, rep->id);
 			} else {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Missing ID on representation - cannot solve template\n\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Missing ID on representation - cannot solve template\n\n"));
 				gf_free(url);
 				gf_free(solved_template);
 				second_sep[0] = '$';
@@ -2834,7 +3964,7 @@
 			}
 		}
 		else if (!strcmp(first_sep+1, "Index")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong template identifier Index detected - using Number instead\n\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Wrong template identifier Index detected - using Number instead\n\n"));
 			sprintf(szFormat, szPrintFormat, start_number + item_index);
 			strcat(solved_template, szFormat);
 		}
@@ -2889,7 +4019,7 @@
 			}
 		}
 		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
 			*out_url = NULL;
 			gf_free(url);
 			gf_free(solved_template);
@@ -2934,12 +4064,14 @@
 	GF_MPD_SegmentTimeline *segment_timeline;
 	GF_MPD_MultipleSegmentBase *mbase_rep, *mbase_set, *mbase_period;
 
+	if (!period) return;
+
 	if (out_segment_timeline) *out_segment_timeline = NULL;
 	if (out_pts_offset) *out_pts_offset = 0;
 
 	/*single media segment - duration is not known unless indicated in period*/
 	if (rep->segment_base || set->segment_base || period->segment_base) {
-		if (period && period->duration) {
+		if (period->duration) {
 			*out_duration = period->duration;
 			timescale = 1000;
 		} else {
@@ -2950,10 +4082,10 @@
 		if (rep->segment_base && rep->segment_base->timescale) timescale = rep->segment_base->timescale;
 		if (!pts_offset && set->segment_base && set->segment_base->presentation_time_offset) pts_offset = set->segment_base->presentation_time_offset;
 		if (!timescale && set->segment_base && set->segment_base->timescale) timescale = set->segment_base->timescale;
-		if (period) {
-			if (!pts_offset && period->segment_base && period->segment_base->presentation_time_offset) pts_offset = period->segment_base->presentation_time_offset;
-			if (!timescale && period->segment_base && period->segment_base->timescale) timescale = period->segment_base->timescale;
-		}
+
+		if (!pts_offset && period->segment_base && period->segment_base->presentation_time_offset) pts_offset = period->segment_base->presentation_time_offset;
+		if (!timescale && period->segment_base && period->segment_base->timescale) timescale = period->segment_base->timescale;
+
 		if (out_pts_offset) *out_pts_offset = pts_offset;
 		*out_timescale = timescale ? timescale : 1;
 		return;
@@ -3082,6 +4214,12 @@
 		return GF_OK;
 	}
 
+	if (!rep->segment_template && !set->segment_template && !period->segment_template) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD] Representation without any SegmentBase, SegmentList or SegmentTemplate (non compliant). Assuming default SegmentBase\n"));
+		*out_segment_start_time = start_time;
+		return GF_OK;
+	}
+
 	if (period->segment_template) {
 		if (period->segment_template->duration) duration = period->segment_template->duration;
 		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
@@ -3114,6 +4252,7 @@
 	return GF_OK;
 }
 
+#if 0 //unused
 static GF_Err mpd_seek_periods(Double seek_time, GF_MPD const * const in_mpd, GF_MPD_Period **out_period)
 {
 	Double start_time;
@@ -3145,21 +4284,26 @@
 
 	return GF_OK;
 }
+#endif
+
 
 GF_EXPORT
 GF_Err gf_mpd_seek_in_period(Double seek_time, MPDSeekMode seek_mode,
 	GF_MPD_Period const * const in_period, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
 	u32 *out_segment_index, Double *out_opt_seek_time)
 {
-	Double seg_start = 0.0, segment_duration = 0.0;
-	u64 segment_duration_in_scale = 0, seg_start_in_scale = 0;
-	u32 timescale = 0, segment_idx = 0;
+	Double seg_start = 0.0;
+	u32 segment_idx = 0;
 
 	if (!out_segment_index) {
 		return GF_BAD_PARAM;
 	}
 
 	while (1) {
+		Double segment_duration;
+		u32 timescale=1000;
+		u64 segment_duration_in_scale=0, seg_start_in_scale;
+
 		//TODO this could be further optimized by directly querying the index for this start time ...
 		GF_Err e = gf_mpd_get_segment_start_time_with_timescale(segment_idx, in_period, in_set, in_rep, &seg_start_in_scale, &segment_duration_in_scale, &timescale);
 		if (e<0)
@@ -3196,7 +4340,7 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_mpd_seek_to_time(Double seek_time, MPDSeekMode seek_mode,
 	GF_MPD const * const in_mpd, GF_MPD_AdaptationSet const * const in_set, GF_MPD_Representation const * const in_rep,
 	GF_MPD_Period **out_period, u32 *out_segment_index, Double *out_opt_seek_time)
@@ -3217,7 +4361,7 @@
 
 	return GF_OK;
 }
-
+#endif
 
 /*
 	smooth streaming 2.1 support
@@ -3285,7 +4429,7 @@
     GF_MPD_Representation *rep;
     GF_XMLAttribute *att;
     GF_Err e;
-    char szISOBMFFInit[2048];
+    char *szISOBMFFInit = NULL;
 
     GF_SAFEALLOC(rep, GF_MPD_Representation);
     if (!rep) return GF_OUT_OF_MEM;
@@ -3295,16 +4439,22 @@
     e = gf_list_add(container, rep);
     if (e) return e;
 
-    strcpy(szISOBMFFInit, "isobmff://");
+	gf_dynstrcat(&szISOBMFFInit, "isobmff://", NULL);
 
 
 #define ISBMFFI_ADD_KEYWORD(_name, _value) \
-if (_value) {\
-strcat(szISOBMFFInit, _name);\
-strcat(szISOBMFFInit, "=");\
-strcat(szISOBMFFInit, _value);\
-strcat(szISOBMFFInit, " ");\
-}
+	if (_value != NULL) {\
+		gf_dynstrcat(&szISOBMFFInit, _name, NULL);\
+		gf_dynstrcat(&szISOBMFFInit, "=", NULL);\
+		gf_dynstrcat(&szISOBMFFInit, _value, NULL);\
+		gf_dynstrcat(&szISOBMFFInit, " ", NULL);\
+	}
+
+#define ISBMFFI_ADD_KEYWORD_CONST(_name, _value) \
+	gf_dynstrcat(&szISOBMFFInit, _name, NULL);\
+	gf_dynstrcat(&szISOBMFFInit, "=", NULL);\
+	gf_dynstrcat(&szISOBMFFInit, _value, NULL);\
+	gf_dynstrcat(&szISOBMFFInit, " ", NULL);\
 
 
     i = 0;
@@ -3348,15 +4498,16 @@
     if (timescale != 10000000) {
         char szTS[20], *v;
         sprintf(szTS, "%d", timescale);
-	//prevent gcc warning
-	v = (char *)szTS;
+		//prevent gcc warning
+		v = (char *)szTS;
         ISBMFFI_ADD_KEYWORD("scale", v)
     }
-    ISBMFFI_ADD_KEYWORD("tfdt", "0000000000000000000")
+    ISBMFFI_ADD_KEYWORD_CONST("tfdt", "0000000000000000000")
     //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);
-    rep->segment_template->initialization = gf_strdup(szISOBMFFInit);
+    if (!rep->segment_template) return GF_OUT_OF_MEM;
+    rep->segment_template->initialization = szISOBMFFInit;
     return GF_OK;
 }
 
@@ -3404,6 +4555,8 @@
             set->segment_template->media = template_url;
             set->segment_template->timescale = timescale;
             GF_SAFEALLOC(set->segment_template->segment_timeline, GF_MPD_SegmentTimeline);
+            if (!set->segment_template->segment_timeline) return GF_OUT_OF_MEM;
+            
             set->segment_template->segment_timeline->entries = gf_list_new();
         }
     }
@@ -3480,6 +4633,227 @@
     return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_mpd_smooth_to_mpd(char * smooth_file, GF_MPD *mpd, const char *default_base_url)
+{
+	GF_DOMParser *dom = gf_xml_dom_new();
+	GF_Err e = gf_xml_dom_parse(dom, smooth_file, NULL, 0);
+	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"));
+		}
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUDIO, ("[MPD] Failed to load smooth manifest\n"));
+	}
+	gf_xml_dom_del(dom);
+	return e;
+}
+#define EXTRACT_FORMAT(_nb_chars)	\
+			strcpy(szFmt, "%d");	\
+			char_template+=_nb_chars;	\
+			if (seg_rad_name[char_template]=='%') {	\
+				char *sep = strchr(seg_rad_name+char_template, '$');	\
+				if (sep) {	\
+					sep[0] = 0;	\
+					strcpy(szFmt, seg_rad_name+char_template);	\
+					char_template += (u32) strlen(seg_rad_name+char_template);	\
+					sep[0] = '$';	\
+				}	\
+			}	\
+			char_template+=1;	\
+
+GF_EXPORT
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *rep_id, const char *base_url, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
+{
+	Bool has_number= GF_FALSE;
+	Bool force_path = GF_FALSE;
+	if (seg_type==GF_DASH_TEMPLATE_TEMPLATE_WITH_PATH) {
+		seg_type = GF_DASH_TEMPLATE_TEMPLATE;
+		force_path = GF_TRUE;
+	}
+	if (seg_type==GF_DASH_TEMPLATE_REPINDEX_TEMPLATE_WITH_PATH) {
+		seg_type = GF_DASH_TEMPLATE_REPINDEX_TEMPLATE;
+		force_path = GF_TRUE;
+	}
+
+	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? GF_TRUE : GF_FALSE;
+	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? GF_TRUE : GF_FALSE;
+	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	Bool is_index_template = (seg_type==GF_DASH_TEMPLATE_REPINDEX_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
+	Bool has_init_keyword = GF_FALSE;
+	Bool needs_index = GF_FALSE;
+	u32 char_template = 0;
+	size_t seg_rad_name_len;
+
+	char tmp[100];
+	strcpy(segment_name, "");
+
+	if (is_index_template) is_template = GF_TRUE;
+	
+	if (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_SKIPINIT) {
+		seg_type = GF_DASH_TEMPLATE_INITIALIZATION;
+		needs_init = GF_FALSE;
+		is_init = GF_TRUE;
+	}
+	if (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE_SKIPINIT) {
+		seg_type = GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE;
+		is_init_template = GF_TRUE;
+		needs_init = GF_FALSE;
+	}
+
+	if (!seg_rad_name) return GF_BAD_PARAM;
+
+	seg_rad_name_len = strlen(seg_rad_name);
+
+	if ( (is_index || is_index_template) && !strstr(seg_rad_name, "$Index")) {
+		needs_index = GF_TRUE;
+	}
+	if (strstr(seg_rad_name, "$RepresentationID$") || strstr(seg_rad_name, "$Bandwidth$"))
+		needs_init = GF_FALSE;
+
+	if (strstr(seg_rad_name, "$Init="))
+		has_init_keyword = GF_TRUE;
+
+	while (char_template <= seg_rad_name_len) {
+		char szFmt[20];
+		char char_val = seg_rad_name[char_template];
+
+		if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$RepresentationID$", 18) ) {
+			char_template += 18;
+			strcat(segment_name, rep_id);
+			needs_init = GF_FALSE;
+		}
+		else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
+			EXTRACT_FORMAT(10);
+
+			sprintf(tmp, szFmt, bandwidth);
+			strcat(segment_name, tmp);
+			needs_init = GF_FALSE;
+		}
+		else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
+			EXTRACT_FORMAT(5);
+			if (is_init || is_init_template) {
+				if (!has_init_keyword && needs_init) {
+					strcat(segment_name, "init");
+					needs_init = GF_FALSE;
+				}
+				continue;
+			}
+			/*replace %d to LLD*/
+			szFmt[strlen(szFmt)-1]=0;
+			strcat(szFmt, &LLD[1]);
+			sprintf(tmp, szFmt, start_time);
+			strcat(segment_name, tmp);
+			has_number = GF_TRUE;
+		}
+		else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
+			EXTRACT_FORMAT(7);
+
+			if (is_init || is_init_template) {
+				if (!has_init_keyword && needs_init) {
+					strcat(segment_name, "init");
+					needs_init = GF_FALSE;
+				}
+				continue;
+			}
+			sprintf(tmp, szFmt, segment_number);
+			strcat(segment_name, tmp);
+			has_number = GF_TRUE;
+		}
+		else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
+			char *sep = strchr(seg_rad_name + char_template+6, '$');
+			if (sep) sep[0] = 0;
+			if (is_init || is_init_template) {
+				strcat(segment_name, seg_rad_name + char_template+6);
+				needs_init = GF_FALSE;
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep[0] = '$';
+		}
+		else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
+			char *sep = strchr(seg_rad_name + char_template+7, '$');
+			if (sep) sep[0] = 0;
+			if (is_index) {
+				strcat(segment_name, seg_rad_name + char_template+6);
+				needs_index = GF_FALSE;
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep[0] = '$';
+		}
+		else if (!strnicmp(& seg_rad_name[char_template], "$Path=", 6)) {
+			char *sep = strchr(seg_rad_name + char_template+6, '$');
+			if (sep) sep[0] = 0;
+			if (force_path || (!is_template && !is_init_template)) {
+				strcat(segment_name, seg_rad_name + char_template+6);
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep[0] = '$';
+		}
+		else if (!strnicmp(& seg_rad_name[char_template], "$Segment=", 9)) {
+			char *sep = strchr(seg_rad_name + char_template+9, '$');
+			if (sep) sep[0] = 0;
+			if (!is_init && !is_init_template) {
+				strcat(segment_name, seg_rad_name + char_template+9);
+			}
+			char_template += (u32) strlen(seg_rad_name + char_template)+1;
+			if (sep) sep[0] = '$';
+		}
+
+		else {
+			char_template+=1;
+			if (char_val=='\\') char_val = '/';
+
+			sprintf(tmp, "%c", char_val);
+			strcat(segment_name, tmp);
+		}
+	}
+
+	if (is_template && !strstr(seg_rad_name, "$Number") && !strstr(seg_rad_name, "$Time")) {
+		if (use_segment_timeline) {
+			strcat(segment_name, "$Time$");
+		} else {
+			strcat(segment_name, "$Number$");
+		}
+	}
+
+	if (needs_init)
+		strcat(segment_name, "init");
+	if (needs_index)
+		strcat(segment_name, "idx");
+
+	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
+		if (use_segment_timeline) {
+			sprintf(tmp, LLU, start_time);
+			strcat(segment_name, tmp);
+		}
+		else {
+			sprintf(tmp, "%d", segment_number);
+			strcat(segment_name, tmp);
+		}
+	}
+	if (seg_ext) {
+		strcat(segment_name, ".");
+		strcat(segment_name, seg_ext);
+	}
+
+	if ((seg_type != GF_DASH_TEMPLATE_TEMPLATE) && (seg_type != GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE)) {
+		char *sep = strrchr(segment_name, '/');
+		if (sep) {
+			char cv = sep[0];
+			sep[0] = 0;
+			if (!gf_dir_exists(segment_name)) {
+				gf_mkdir(segment_name);
+			}
+			sep[0] = cv;
+		}
+	}
+
+	return GF_OK;
+}
+
 
 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)
 {
@@ -3490,7 +4864,7 @@
 	GF_Err e = gf_xml_dom_parse(parser, cues_file, NULL, NULL);
 	if (e != GF_OK) {
 		gf_xml_dom_del(parser);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error loading cue file %s\n", gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error loading cue file %s: %s\n", cues_file, gf_error_to_string(e)));
 		return GF_NON_COMPLIANT_BITSTREAM;
 	}
 	root = gf_xml_dom_get_root(parser);
@@ -3553,13 +4927,7 @@
 				else if (!strcmp(att->name, "dts")) sscanf(att->value, LLD, &cues[cur_cue].dts);
 				else if (!strcmp(att->name, "cts")) sscanf(att->value, LLD, &cues[cur_cue].cts);
 			}
-			//first cue
-			if (!cues[cur_cue].cts && !cues[cur_cue].dts && (cues[cur_cue].sample_num<=1) ) {
-				(*nb_cues)--;
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] cue for first sample found in stream %d, ignoring\n", stream_id));
-			} else {
-				cur_cue++;
-			}
+			cur_cue++;
 		}
 
 
@@ -3574,6 +4942,87 @@
 	return GF_OK;
 }
 
+GF_Err gf_mpd_split_adaptation_sets(GF_MPD *mpd)
+{
+	u32 i, nb_periods, next_as_id=0;;
+	if (!mpd) return GF_BAD_PARAM;
+
+	nb_periods = gf_list_count(mpd->periods);
+	for (i=0; i<nb_periods; i++) {
+		u32 j, nb_as;
+		GF_MPD_Period *period = gf_list_get(mpd->periods, i);
+		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;
+		}
+	}
+	next_as_id++;
+
+	for (i=0; i<nb_periods; i++) {
+		u32 j, nb_as;
+		GF_MPD_Period *period = gf_list_get(mpd->periods, i);
+		GF_List *new_as = gf_list_new();
+
+		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);
+			GF_List *reps = set->representations;
+			u32 nb_reps = gf_list_count(set->representations);
+
+			gf_list_add(new_as, set);
+			if (nb_reps<=1) {
+				continue;
+			}
+			while (gf_list_count(set->representations)>1) {
+				FILE *f = gf_file_temp(NULL);
+				u32 size;
+				char *data, szAdd[100];
+				GF_Blob blob;
+				GF_DOMParser *dom;
+				GF_XMLNode *root;
+				GF_MPD_Representation *rep = gf_list_get(reps, 1);
+				gf_list_rem(reps, 1);
+				set->representations = gf_list_new();
+				gf_list_add(set->representations, rep);
+
+				if (set->id) {
+					set->id = next_as_id;
+					next_as_id++;
+				}
+
+				//serialize
+				gf_mpd_print_adaptation_set(set, f, GF_FALSE, 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;
+				blob.data = data;
+				blob.size = size;
+				sprintf(szAdd, "gmem://%p", &blob);
+
+				//parse
+				dom = gf_xml_dom_new();
+				gf_xml_dom_parse(dom, szAdd, NULL, NULL);
+				root = gf_xml_dom_get_root(dom);
+				gf_mpd_parse_adaptation_set(mpd, new_as, root);
+				gf_xml_dom_del(dom);
+				gf_free(data);
+				gf_fclose(f);
+
+				
+				gf_mpd_representation_free(rep);
+				gf_list_del(set->representations);
+				set->representations = reps;
+			}
+		}
+		gf_list_del(period->adaptation_sets);
+		period->adaptation_sets = new_as;
+	}
+	return GF_OK;
+}
 
 
 #endif /*GPAC_DISABLE_CORE_TOOLS*/

gpac-0.8.0.tar.gz/src/media_tools/mpeg2_ps.c -> gpac-1.0.0.tar.gz/src/media_tools/mpeg2_ps.c Changed

@@ -160,7 +160,7 @@
                             u8 *buffer,
                             u32 len)
 {
-	u32 readval = (u32) fread(buffer, 1, len, fd);
+	u32 readval = (u32) gf_fread(buffer, len, fd);
 	return readval == len;
 }
 
@@ -175,11 +175,7 @@
 
 static u64 file_size(FILE *fd)
 {
-	u64 ret;
-	gf_fseek(fd, 0, SEEK_END);
-	ret = gf_ftell(fd);
-	gf_fseek(fd, 0, SEEK_SET);
-	return ret;
+	return gf_fsize(fd);
 }
 
 static mpeg2ps_record_pes_t *create_record (s64 loc, u64 ts)
@@ -273,7 +269,7 @@
 	buflen -= 6;
 	bitrate_int = 0;
 	for (ix = 0; ix < buflen; ix++, pbuffer++) {
-		scode = (pbuffer[0] << 24) | (pbuffer[1] << 16) | (pbuffer[2] << 8) |
+		scode = ((u32)pbuffer[0] << 24) | (pbuffer[1] << 16) | (pbuffer[2] << 8) |
 		        pbuffer[3];
 
 		if (scode == MPEG12_SEQUENCE_START_CODE) {
@@ -359,11 +355,13 @@
 	return ((pbuffer[1] >> 3) & 0x7);
 }
 
+#if 0 //unused
 u16 MPEG12_PictHdrTempRef(unsigned char *pbuffer)
 {
 	pbuffer += sizeof(u32);
 	return ((pbuffer[0] << 2) | ((pbuffer[1] >> 6) & 0x3));
 }
+#endif
 
 
 static u64 read_pts (u8 *pak)
@@ -517,7 +515,6 @@
 		        to_move);
 		sptr->pes_buffer_size = to_move;
 		sptr->pes_buffer_on = 0;
-		//fprintf(stderr, "moving %d bytes\n", to_move);
 		if (to_move + pes_len > sptr->pes_buffer_size_max) {
 			sptr->pes_buffer = (u8 *)gf_realloc(sptr->pes_buffer,
 			                                    to_move + pes_len + 2048);
@@ -526,10 +523,6 @@
 	}
 	file_read_bytes(sptr->m_fd, sptr->pes_buffer + sptr->pes_buffer_size, pes_len);
 	sptr->pes_buffer_size += pes_len;
-#if 0
-	fprintf(stderr, "copying %u bytes - on %u size %u\n",
-	        pes_len, sptr->pes_buffer_on, sptr->pes_buffer_size);
-#endif
 }
 
 /*
@@ -575,11 +568,6 @@
 		// we should have a valid stream and pes_len here...
 		*stream_id = hdr & 0xff;
 		*pes_len = convert16(local + 4);
-#if 0
-		fprintf(stderr, "loc: "X64" %x len %u\n", file_location(fd) - 6,
-		        local[3],
-		        *pes_len);
-#endif
 		return 1;
 	}
 	return 0;
@@ -602,7 +590,7 @@
 
 	ts->have_pts = 0;
 	ts->have_dts = 0;
-	*have_ts = 0;
+	if (have_ts) *have_ts = 0;
 	if (file_read_bytes(fd, local, 1) == 0) {
 		return 0;
 	}
@@ -633,7 +621,6 @@
 		}
 		ts->have_pts = 1;
 		ts->pts = ts->dts = read_pts(local);
-		//fprintf(stderr, "mpeg1 pts "U64"\n", ts->pts);
 		*have_ts = 1;
 		pes_len -= 4;
 	} else if ((*local & 0xf0) == 0x30) {
@@ -817,9 +804,6 @@
 		// clear timestamp indication
 		sptr->next_pes_ts.have_pts = sptr->next_pes_ts.have_dts = 0;
 	}
-#if 0
-	fprintf(stderr, "header %x at %d\n", scode, sptr->pes_buffer_on);
-#endif
 
 	if (scode == MPEG12_PICTURE_START_CODE) {
 		sptr->pict_header_offset = sptr->pes_buffer_on;
@@ -842,10 +826,6 @@
 			start += sptr->pes_buffer_on;
 			sptr->pict_header_offset += sptr->pes_buffer_on;
 		} else {
-#if 0
-			fprintf(stderr, "2header %x at %d\n", scode, start);
-#endif
-
 			start += offset;
 			if (have_pict == 0) {
 				if (scode == MPEG12_PICTURE_START_CODE) {
@@ -904,12 +884,6 @@
 		sptr->next_pes_ts.have_dts = sptr->next_pes_ts.have_pts = 0;
 	}
 	while (sptr->pes_buffer_size - sptr->pes_buffer_on < sptr->frame_len) {
-#if 0
-		fprintf(stderr, "don't have enough - on %u size %u %u %u\n", sptr->pes_buffer_on,
-		        sptr->pes_buffer_size,
-		        sptr->pes_buffer_size - sptr->pes_buffer_on,
-		        sptr->frame_len);
-#endif
 		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
 			return 0;
 		}
@@ -931,7 +905,7 @@
 			return 0;
 		}
 	}
-	while ((hdr=gf_mp3_get_next_header_mem((char*)sptr->pes_buffer + sptr->pes_buffer_on,
+	while ((hdr=gf_mp3_get_next_header_mem(sptr->pes_buffer + sptr->pes_buffer_on,
 	                                       sptr->pes_buffer_size - sptr->pes_buffer_on,
 	                                       &diff) ) == 0) {
 		// don't have frame
@@ -957,12 +931,6 @@
 		sptr->next_pes_ts.have_dts = sptr->next_pes_ts.have_pts = 0;
 	}
 	while (sptr->pes_buffer_size - sptr->pes_buffer_on < sptr->frame_len) {
-#if 0
-		fprintf(stderr, "don't have enough - on %u size %u %u %u\n", sptr->pes_buffer_on,
-		        sptr->pes_buffer_size,
-		        sptr->pes_buffer_size - sptr->pes_buffer_on,
-		        sptr->frame_len);
-#endif
 		if (mpeg2ps_stream_read_next_pes_buffer(sptr) == 0) {
 			return 0;
 		}
@@ -1035,7 +1003,7 @@
 
 	if (sptr->m_stream_id >= 0xc0) {
 		// mpeg audio
-		u32 hdr = GF_4CC(buffer[0],buffer[1],buffer[2],buffer[3]);
+		u32 hdr = GF_4CC((u32)buffer[0],buffer[1],buffer[2],buffer[3]);
 
 		sptr->channels = gf_mp3_num_channels(hdr);
 		sptr->freq = gf_mp3_sampling_rate(hdr);
@@ -1090,7 +1058,7 @@
 	if (sptr->is_video) {
 		// video
 		ret += frames_since_ts * sptr->ticks_per_frame;
-	} else {
+	} else if (sptr->freq) {
 		// audio
 		calc = (frames_since_ts * 90000 * sptr->samples_per_frame) / sptr->freq;
 		ret += calc;
@@ -1220,7 +1188,7 @@
 			if (av == 0) sptr = ps->video_streams[stream_ix];
 			else sptr = ps->audio_streams[stream_ix];
 
-			// we don't open a seperate file descriptor yet (only when they
+			// we don't open a separate file descriptor yet (only when they
 			// start reading or seeking).  Use the one from the ps.
 			sptr->m_fd = ps->fd; // for now
 			clear_stream_buffer(sptr);
@@ -1317,8 +1285,7 @@
 				        (substream >= 0xa0 && substream < 0xb0)) {
 					valid_stream = 1;
 				}
-			} else if (stream_id >= 0xc0 &&
-			           stream_id <= 0xef) {
+			} else if (stream_id >= 0xc0) {
 				// audio and video
 				valid_stream = 1;
 			}
@@ -1356,7 +1323,6 @@
 	 * Now, we go to close to the end, and try to find the last
 	 * dts that we can
 	 */
-	//  fprintf(stderr, "to end "X64"\n", end - orig_check);
 	file_seek_to(ps->fd, ps->end_loc - orig_check);
 
 	while (read_to_next_pes_header(ps->fd, &stream_id, &pes_len)) {
@@ -1391,12 +1357,6 @@
 				sptr->end_dts = ts.have_dts ? ts.dts : ts.pts;
 				sptr->end_dts_loc = loc;
 			}
-#if 0
-			fprintf(stderr, "loc "X64" stream %x %x", loc, stream_id, substream);
-			if (ts.have_pts) fprintf(stderr, " pts "U64, ts.pts);
-			if (ts.have_dts) fprintf(stderr, " dts "U64, ts.dts);
-			fprintf(stderr, "\n");
-#endif
 			file_skip_bytes(ps->fd, pes_left);
 		}
 	}
@@ -1439,7 +1399,7 @@
 			       ps->audio_streams[stream_ix];
 
 			// pick up here - find the final time...
-			if (sptr->end_dts_loc != 0) {
+			if (sptr && (sptr->end_dts_loc != 0)) {
 				file_seek_to(ps->fd, sptr->end_dts_loc);
 				sptr->m_fd = ps->fd;
 				frame_cnt_since_last = 0;
@@ -1489,6 +1449,7 @@
 	return 0;
 }
 
+#if 0 //unused
 const char *mpeg2ps_get_video_stream_name (mpeg2ps_t *ps, u32 streamno)
 {
 	if (invalid_video_streamno(ps, streamno)) {
@@ -1499,6 +1460,7 @@
 	}
 	return "Mpeg-1";
 }
+#endif
 
 mpeg2ps_video_type_t mpeg2ps_get_video_stream_type (mpeg2ps_t *ps,
         u32 streamno)
@@ -1549,6 +1511,14 @@
 	return ps->video_streams[streamno]->frame_rate;
 }
 
+u32 mpeg2ps_get_video_stream_id(mpeg2ps_t *ps, u32 streamno)
+{
+	if (invalid_video_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->video_streams[streamno]->m_stream_id;
+}
+
 static Bool invalid_audio_streamno (mpeg2ps_t *ps, u32 streamno)
 {
 	if (streamno >= NUM_ELEMENTS_IN_ARRAY(ps->audio_streams)) return 1;
@@ -1561,6 +1531,7 @@
 	return ps->audio_cnt;
 }
 
+#if 0 //unused
 const char *mpeg2ps_get_audio_stream_name (mpeg2ps_t *ps,
         u32 streamno)
 {
@@ -1584,6 +1555,7 @@
 
 	return "LPCM";
 }
+#endif
 
 mpeg2ps_audio_type_t mpeg2ps_get_audio_stream_type (mpeg2ps_t *ps,
         u32 streamno)
@@ -1625,6 +1597,15 @@
 	return ps->audio_streams[streamno]->bitrate;
 }
 
+u32 mpeg2ps_get_audio_stream_id (mpeg2ps_t *ps, u32 streamno)
+{
+	if (invalid_audio_streamno(ps, streamno)) {
+		return 0;
+	}
+	return ps->audio_streams[streamno]->m_stream_id;
+}
+
+
 mpeg2ps_t *mpeg2ps_init (const char *filename)
 {
 	mpeg2ps_t *ps;
@@ -1710,8 +1691,9 @@
                              u32 *buflen,
                              u8 *frame_type,
                              mpeg2ps_ts_type_t ts_type,
-                             u64 *timestamp)
+                             u64 *decode_timestamp, u64 *compose_timestamp)
 {
+	u64 dts, cts;
 	mpeg2ps_stream_t *sptr;
 	if (invalid_video_streamno(ps, streamno)) return 0;
 
@@ -1733,15 +1715,23 @@
 		                                 sptr->pict_header_offset);
 	}
 
-	// and the timestamp
-	if (timestamp != NULL) {
-		*timestamp = stream_convert_frame_ts_to_msec(sptr, ts_type,
-		             ps->first_dts, NULL);
-	}
+	// set the timestamps
+	if (sptr->frame_ts.have_pts)
+		cts = sptr->frame_ts.pts;
+	else
+		cts = sptr->last_ts + (1+sptr->frames_since_last_ts) * sptr->ticks_per_frame;
+	if (sptr->frame_ts.have_dts)
+		dts = sptr->frame_ts.dts;
+	else
+		dts = cts;
 
-	// finally, indicate that we read this frame - get ready for the next one.
+	if (decode_timestamp) *decode_timestamp = dts;
+	if (compose_timestamp) *compose_timestamp = cts;
+
+	//indicate that we read this frame - get ready for the next one.
 	advance_frame(sptr);
 
+
 	return 1;
 }
 
@@ -1755,7 +1745,6 @@
                              u64 *timestamp)
 {
 	mpeg2ps_stream_t *sptr;
-	u64 ts;
 	if (invalid_audio_streamno(ps, streamno)) return 0;
 
 	sptr = ps->audio_streams[streamno];
@@ -1766,20 +1755,20 @@
 			return 0;
 	}
 
-	if (timestamp != NULL || freq_timestamp != NULL) {
-		ts = stream_convert_frame_ts_to_msec(sptr,
+	if (freq_timestamp) {
+		/*ts = */stream_convert_frame_ts_to_msec(sptr,
 		                                     ts_type,
 		                                     ps->first_dts,
 		                                     freq_timestamp);
-		if (timestamp != NULL) {
-			*timestamp = ts;
-		}
 	}
-
+	if (timestamp != NULL) {
+		*timestamp = sptr->frame_ts.have_pts ? sptr->frame_ts.pts : sptr->frame_ts.dts;
+	}
 	advance_frame(sptr);
 	return 1;
 }
 
+#if 0 //unused
 u64 mpeg2ps_get_ps_size(mpeg2ps_t *ps)
 {
 	return file_size(ps->fd);
@@ -1794,5 +1783,257 @@
 	if (invalid_audio_streamno(ps, streamno)) return 0;
 	return gf_ftell(ps->audio_streams[streamno]->m_fd);
 }
+#endif
+
+
+/***************************************************************************
+ * seek routines
+ ***************************************************************************/
+/*
+ * mpeg2ps_binary_seek - look for a pts that's close to the one that
+ * we're looking for.  We have a start ts and location, an end ts and
+ * location, and what we're looking for
+ */
+static void mpeg2ps_binary_seek (mpeg2ps_t *ps,
+				 mpeg2ps_stream_t *sptr,
+				 u64 search_dts,
+				 u64 start_dts,
+				 u64 start_loc,
+				 u64 end_dts,
+				u64 end_loc)
+{
+  u64 dts_perc;
+  u64 loc;
+  u16 pes_len;
+  Bool have_ts = GF_FALSE;
+  u64 found_loc;
+  u64 found_dts;
+
+  while (1) {
+    /*
+     * It's not a binary search as much as using a percentage between
+     * the start and end dts to start.  We subtract off a bit, so we
+     * approach from the beginning of the file - we're more likely to
+     * hit a pts that way
+     */
+    dts_perc = (search_dts - start_dts) * 1000 / (end_dts - start_dts);
+    dts_perc -= dts_perc % 10;
+
+    loc = ((end_loc - start_loc) * dts_perc) / 1000;
+
+    if (loc == start_loc || loc == end_loc) return;
+
+    clear_stream_buffer(sptr);
+    file_seek_to(sptr->m_fd, start_loc + loc);
+
+    // we'll look for the next pes header for this stream that has a ts.
+    do {
+      if (search_for_next_pes_header(sptr,
+				     &pes_len,
+				     &have_ts,
+				     &found_loc) == GF_FALSE) {
+	return;
+      }
+      if (have_ts == GF_FALSE) {
+	file_skip_bytes(sptr->m_fd, pes_len);
+      }
+    } while (have_ts == GF_FALSE);
+
+    // record that spot...
+    mpeg2ps_record_pts(sptr, found_loc, &sptr->next_pes_ts);
+
+    found_dts = sptr->next_pes_ts.have_dts ?
+      sptr->next_pes_ts.dts : sptr->next_pes_ts.pts;
+    /*
+     * Now, if we're before the search ts, and within 5 seconds,
+     * we'll say we're close enough
+     */
+    if (found_dts + (5 * 90000) > search_dts &&
+	found_dts < search_dts) {
+      file_seek_to(sptr->m_fd, found_loc);
+      return; // found it - we can seek from here
+    }
+    /*
+     * otherwise, move the head or the tail (most likely the head).
+     */
+    if (found_dts > search_dts) {
+      if (found_dts >= end_dts) {
+	file_seek_to(sptr->m_fd, found_loc);
+	return;
+      }
+      end_loc = found_loc;
+      end_dts = found_dts;
+    } else {
+      if (found_dts <= start_dts) {
+	file_seek_to(sptr->m_fd, found_loc);
+	return;
+      }
+      start_loc = found_loc;
+      start_dts = found_dts;
+    }
+  }
+}
+
+
+
+static mpeg2ps_record_pes_t *search_for_ts (mpeg2ps_stream_t *sptr,
+				     u64 dts)
+{
+  mpeg2ps_record_pes_t *p, *q;
+  u64 p_diff, q_diff;
+  if (sptr->record_last == NULL) return NULL;
+
+  if (dts > sptr->record_last->dts) return sptr->record_last;
+
+  if (dts < sptr->record_first->dts) return NULL;
+  if (dts == sptr->record_first->dts) return sptr->record_first;
+
+  p = sptr->record_first;
+  q = p->next_rec;
+
+  while (q != NULL && q->dts > dts) {
+    p = q;
+    q = q->next_rec;
+  }
+  if (q == NULL) {
+    return sptr->record_last;
+  }
+
+  p_diff = dts - p->dts;
+  q_diff = q->dts - dts;
+
+  if (p_diff < q_diff) return p;
+  if (q_diff > 90000) return p;
+
+  return q;
+}
+
+
+/*
+ * mpeg2ps_seek_frame - seek to the next timestamp after the search timestamp
+ * First, find a close DTS (usually minus 5 seconds or closer), then
+ * read frames until we get the frame after the timestamp.
+ */
+static Bool mpeg2ps_seek_frame (mpeg2ps_t *ps,
+				mpeg2ps_stream_t *sptr,
+				u64 search_msec_timestamp)
+{
+  u64 dts;
+  mpeg2ps_record_pes_t *rec;
+  u64 msec_ts;
+  u8 *buffer;
+  u32 buflen;
+
+  check_fd_for_stream(ps, sptr);
+  clear_stream_buffer(sptr);
+
+  if (search_msec_timestamp <= 1000) { // first second, start from begin...
+    file_seek_to(sptr->m_fd, sptr->first_pes_loc);
+    return GF_TRUE;
+  }
+  dts = search_msec_timestamp * 90; // 1000 timescale to 90000 timescale
+  dts += ps->first_dts;
+
+  /*
+   * see if the recorded data has anything close
+   */
+  rec = search_for_ts(sptr, dts);
+  if (rec != NULL) {
+    // see if it is close
+    // if we're plus or minus a second, seek to that.
+    if (rec->dts + 90000 >= dts && rec->dts <= dts + 90000) {
+      file_seek_to(sptr->m_fd, rec->location);
+      return GF_TRUE;
+    }
+    // at this point, rec is > a distance.  If within 5 or so seconds,
+
+    if (rec->dts + (5 * 90000) < dts) {
+      // more than 5 seconds away - skip and search
+      if (rec->next_rec == NULL) {
+		  mpeg2ps_binary_seek(ps, sptr, dts,
+			    rec->dts, rec->location,
+			    sptr->end_dts, sptr->end_dts_loc);
+      } else {
+		  mpeg2ps_binary_seek(ps, sptr, dts,
+			    rec->dts, rec->location,
+			    rec->next_rec->dts, rec->next_rec->location);
+      }
+    }
+    // otherwise, frame by frame search...
+  } else {
+    // we weren't able to find anything from the recording
+    mpeg2ps_binary_seek(ps, sptr, dts,
+			sptr->start_dts, sptr->first_pes_loc,
+			sptr->end_dts, sptr->end_dts_loc);
+  }
+  /*
+   * Now, the fun part - read frames until we're just past the time
+   */
+  clear_stream_buffer(sptr); // clear out any data, so we can read it
+  do {
+    if (mpeg2ps_stream_read_frame(sptr, &buffer, &buflen, GF_FALSE) == GF_FALSE)
+      return GF_FALSE;
+
+    msec_ts = stream_convert_frame_ts_to_msec(sptr, TS_MSEC,
+					      ps->first_dts, NULL);
+
+    if (msec_ts < search_msec_timestamp) {
+      // only advance the frame if we're not greater than the timestamp
+      advance_frame(sptr);
+    }
+  } while (msec_ts < search_msec_timestamp);
+
+  return GF_TRUE;
+}
+
+
+/*
+ * mpeg2ps_seek_video_frame - seek to the location that we're interested
+ * in, then scroll up to the next I frame
+ */
+Bool mpeg2ps_seek_video_frame (mpeg2ps_t *ps, u32 streamno,
+			       u64 msec_timestamp)
+{
+  mpeg2ps_stream_t *sptr;
+
+  if (invalid_video_streamno(ps, streamno)) return GF_FALSE;
+
+  sptr = ps->video_streams[streamno];
+  if (mpeg2ps_seek_frame(ps,
+			 sptr,
+			 msec_timestamp)
+			  == GF_FALSE) return GF_FALSE;
+
+  if (sptr->have_frame_loaded == GF_FALSE) {
+    return GF_FALSE;
+  }
+  return GF_TRUE;
+}
+/*
+ * mpeg2ps_seek_audio_frame - go to the closest audio frame after the
+ * timestamp
+ */
+Bool mpeg2ps_seek_audio_frame (mpeg2ps_t *ps,
+			       u32 streamno,
+			       u64 msec_timestamp)
+{
+  //  off_t closest_pes;
+  mpeg2ps_stream_t *sptr;
+
+  if (invalid_audio_streamno(ps, streamno)) return GF_FALSE;
+
+  sptr = ps->audio_streams[streamno];
+  if (mpeg2ps_seek_frame(ps,
+			 sptr,
+			 msec_timestamp) == GF_FALSE) return GF_FALSE;
+
+  return GF_TRUE;
+}
+
+u64 mpeg2ps_get_first_cts(mpeg2ps_t *ps)
+{
+	return ps->first_dts;
+}
+
 
 #endif /*GPAC_DISABLE_MPEG2PS*/

gpac-0.8.0.tar.gz/src/media_tools/mpeg2_ps.h -> gpac-1.0.0.tar.gz/src/media_tools/mpeg2_ps.h Changed

@@ -96,11 +96,7 @@
  * mpeg2ps_get_video_stream_count - returns count of video streams in file
  */
 u32 mpeg2ps_get_video_stream_count(mpeg2ps_t *ps);
-/*
- * mpeg2ps_get_video_stream_name - returns display name for stream
- */
-const char *mpeg2ps_get_video_stream_name(mpeg2ps_t *ps,
-        u32 streamno);
+
 /*
  * mpeg2ps_get_video_stream_type - returns enum type for stream
  */
@@ -114,6 +110,7 @@
 u32 mpeg2ps_get_video_stream_aspect_ratio(mpeg2ps_t *ps, u32 streamno);
 double   mpeg2ps_get_video_stream_bitrate(mpeg2ps_t *ps, u32 streamno);
 double   mpeg2ps_get_video_stream_framerate(mpeg2ps_t *ps, u32 streamno);
+u32 mpeg2ps_get_video_stream_id(mpeg2ps_t *ps, u32 streamno);
 
 /*
  * mpeg2ps_get_video_frame - get the next video frame
@@ -132,7 +129,7 @@
                              u32 *buflen,
                              u8 *frame_type,
                              mpeg2ps_ts_type_t ts_type,
-                             u64 *timestamp);
+                             u64 *decode_timestamp, u64 *compose_timestamp);
 Bool mpeg2ps_seek_video_frame(mpeg2ps_t *ps, u32 streamno,
                               u64 msec_timestamp);
 
@@ -144,10 +141,6 @@
  */
 u32 mpeg2ps_get_audio_stream_count(mpeg2ps_t *ps);
 /*
- * mpeg2ps_get_audio_stream_name - returns display name for stream
- */
-const char *mpeg2ps_get_audio_stream_name(mpeg2ps_t *ps, u32 streamno);
-/*
  * mpeg2ps_get_audio_stream_type - returns enum type for stream
  */
 mpeg2ps_audio_type_t mpeg2ps_get_audio_stream_type(mpeg2ps_t *ps, u32 streamno);
@@ -157,6 +150,7 @@
 u32 mpeg2ps_get_audio_stream_sample_freq(mpeg2ps_t *ps, u32 streamno);
 u32 mpeg2ps_get_audio_stream_channels(mpeg2ps_t *ps, u32 streamno);
 u32 mpeg2ps_get_audio_stream_bitrate(mpeg2ps_t *ps, u32 streamno);
+u32 mpeg2ps_get_audio_stream_id(mpeg2ps_t *ps, u32 streamno);
 
 /*
  * mpeg2ps_get_audio_frame - get the next audio frame
@@ -181,18 +175,6 @@
                               u64 msec_timestamp);
 
 
-/*
- * returns file size
- */
-u64 mpeg2ps_get_ps_size(mpeg2ps_t *ps);
-/*
- * returns position in file
- *  ps - handle from above
- *  streamno - stream to read
- */
-s64 mpeg2ps_get_video_pos(mpeg2ps_t *ps, u32 streamno);
-s64 mpeg2ps_get_audio_pos(mpeg2ps_t *ps, u32 streamno);
-
 typedef void (*error_msg_func_t)(int loglevel,
                                  const char *lib,
                                  const char *fmt,
@@ -201,6 +183,7 @@
 void mpeg2ps_set_loglevel(int loglevel);
 void mpeg2ps_set_error_func(error_msg_func_t func);
 
+u64 mpeg2ps_get_first_cts(mpeg2ps_t *ps);
 
 #endif /*GPAC_DISABLE_MPEG2PS*/

gpac-0.8.0.tar.gz/src/media_tools/mpegts.c -> gpac-1.0.0.tar.gz/src/media_tools/mpegts.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2005-2012
+ *			Copyright (c) Telecom ParisTech 2005-2020
  *
  *  This file is part of GPAC / MPEG2-TS sub-project
  *
@@ -42,8 +42,6 @@
 #include <unistd.h>
 #endif
 
-//#define FORCE_DISABLE_MPEG4SL_OVER_MPEG2TS
-
 #ifdef GPAC_ENABLE_MPE
 #include <gpac/dvb_mpe.h>
 #endif
@@ -112,58 +110,6 @@
 	}
 }
 
-static void gf_m2ts_estimate_duration(GF_M2TS_Demuxer *ts, u64 PCR, u16 pcr_pid)
-{
-	u64 file_size = 0;
-//	if (ts->duration>0) return;
-
-	if (ts->file || ts->file_size) {
-		file_size = ts->file_size;
-	} else if (ts->dnload) {
-		u32 size;
-		gf_dm_sess_get_stats(ts->dnload, NULL, NULL, &size, NULL, NULL, NULL);
-		file_size = size;
-	} else {
-		return;
-	}
-
-	if (!ts->first_pcr_found) {
-		ts->first_pcr_found = PCR;
-		ts->pcr_pid = pcr_pid;
-		ts->nb_pck_at_pcr = ts->nb_pck;
-	} else if (ts->pcr_pid == pcr_pid) {
-		if (PCR < ts->first_pcr_found) {
-			ts->first_pcr_found = PCR;
-			ts->pcr_pid = pcr_pid;
-			ts->nb_pck_at_pcr = ts->nb_pck;
-		} else if (PCR - ts->first_pcr_found > 2*27000000) {
-			Bool changed = GF_FALSE;
-			Double pck_dur = (Double) (PCR-ts->first_pcr_found);
-			pck_dur /= (ts->nb_pck - ts->nb_pck_at_pcr);
-			pck_dur /= 27000000;
-
-			pck_dur *= file_size;
-			pck_dur /= 188.0;
-			if ((u32) ts->duration != (u32) pck_dur) {
-				ts->duration = pck_dur;
-				changed = GF_TRUE;
-			}
-
-			ts->first_pcr_found = PCR;
-			ts->pcr_pid = pcr_pid;
-			ts->nb_pck_at_pcr = ts->nb_pck;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Estimated duration based on instant bitrate: %g sec\n", ts->duration));
-
-			if (ts->on_event && changed) {
-				GF_M2TS_PES_PCK pck;
-				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
-				pck.PTS = (u64) (ts->duration*1000);
-				ts->on_event(ts, GF_M2TS_EVT_DURATION_ESTIMATED, &pck);
-			}
-		}
-	}
-}
 
 static u32 gf_m2ts_reframe_default(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
@@ -194,7 +140,6 @@
 	}
 	pes->prev_data_len = 0;
 	pes->pes_len = 0;
-	pes->prev_PTS = 0;
 	pes->reframe = NULL;
 	pes->cc = -1;
 	pes->temi_tc_desc_len = 0;
@@ -202,1022 +147,60 @@
 }
 
 
-static u32 gf_m2ts_reframe_nalu_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr, Bool is_hevc)
-{
-	Bool au_start_in_pes=0;
-	Bool prev_is_au_delim=0;
-	Bool force_new_au=0;
-	u32 start_code_found = 0;
-	Bool short_start_code = 0;
-	Bool esc_code_found = 0;
-	u32 nal_type, sc_pos = 0;
-	u32 first_nal_offset_in_pck = 0;
-	Bool full_au_pes_mode = 0;
-	u8 *au_start = NULL;
-	GF_M2TS_PES_PCK pck;
-
-	if (!same_pts)
-		force_new_au = 1;
-
-	/*dispatch frame*/
-	pck.stream = pes;
-	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;
-	pck.flags = 0;
-
-	while (sc_pos<data_len) {
-		/* u32 sctype=0;*/
-		unsigned char *start = (unsigned char *)memchr(data+sc_pos, 0, data_len-sc_pos);
-		if (!start) break;
-		sc_pos = (u32) (start - data);
-		/*not enough space to test for start code, don't check it*/
-		if (data_len - sc_pos < 5)
-			break;
-
-		/*0x00000001 start code*/
-		if (!start[1] && !start[2] && (start[3]==1)) {
-			short_start_code = 0;
-		}
-		/*0xXX000001 start code*/
-		else if (!start[1] && (start[2]==1) && sc_pos && (data[sc_pos-1]!=0) ) {
-			short_start_code = 1;
-		}
-		/*0x000000 escape code*/
-		else if (!start[1] && !start[2]) {
-			esc_code_found=1;
-			if (!start_code_found) {
-				sc_pos ++;
-				continue;
-			}
-		} else {
-			esc_code_found=0;
-			sc_pos ++;
-			continue;
-		}
-
-		if (!start_code_found) {
-			if (sc_pos) {
-				if (!esc_code_found) {
-					pck.data = (char *)data;
-					pck.data_len = sc_pos;
-					pck.flags = 0;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-				}
-
-				data += sc_pos;
-				first_nal_offset_in_pck += sc_pos;
-				data_len -= sc_pos;
-			}
-			start_code_found = short_start_code ? 2 : 1;
-			sc_pos=1;
-		} else {
-			Bool is_short_start_code = (start_code_found==2) ? GF_TRUE : GF_FALSE;
-
-			if (!full_au_pes_mode && (start_code_found==2)) {
-				pck.data = (char *)data-1;
-				pck.data[0]=0;
-				pck.data_len = sc_pos+1;
-			} else {
-				pck.data = (char *)data;
-				pck.data_len = sc_pos;
-			}
-			//copy start code type for next nal
-			start_code_found = short_start_code ? 2 : 1;
-
-			if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
-				nal_type = (pck.data[ is_short_start_code ? 3 : 4 ] & 0x7E) >> 1;
-
-				/*check for SPS and update stream info*/
-#ifndef GPAC_DISABLE_AV_PARSERS
-				if (!pes->vid_w && (nal_type==GF_HEVC_NALU_SEQ_PARAM)) {
-					HEVCState hevc;
-					s32 idx;
-					memset(&hevc, 0, sizeof(HEVCState));
-					hevc.sps_active_idx = -1;
-					idx = gf_media_hevc_read_sps((char *)data+4, sc_pos-4, &hevc);
-
-					if (idx>=0) {
-						pes->vid_w = hevc.sps[idx].width;
-						pes->vid_h = hevc.sps[idx].height;
-					}
-				}
-#endif
-				/*check AU start type - if this is an LHVC PID and the first nal is the first byte of the PES payload, consider this is an AU start*/
-				if ((nal_type==GF_HEVC_NALU_ACCESS_UNIT) || (pes->depends_on_pid && !first_nal_offset_in_pck)) {
-					if (!prev_is_au_delim) {
-						//this was not a one AU per PES config, dispatch
-						if (au_start) {
-							pck.data = (char *)au_start;
-							pck.data_len = (u32) (data - au_start);
-							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-							au_start = NULL;
-							full_au_pes_mode = 0;
-							if (is_short_start_code) {
-								pck.data = (char *)data-1;
-								pck.data[0]=0;
-								pck.data_len = sc_pos+1;
-							} else {
-								pck.data = (char *)data;
-								pck.data_len = sc_pos;
-							}
-						}
-
-						if (au_start_in_pes) {
-							/*FIXME - we should check the AVC framerate to update the timing ...*/
-							pck.DTS += 3000;
-							pck.PTS += 3000;
-							//						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
-						}
-
-						pck.flags = GF_M2TS_PES_PCK_AU_START;
-						force_new_au = 0;
-						au_start_in_pes = 1;
-						if (pes_hdr->data_alignment && !first_nal_offset_in_pck && !pes->single_nal_mode) {
-							full_au_pes_mode = GF_TRUE;
-							au_start = (u8 *) pck.data;
-						} else {
-							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-						}
-						prev_is_au_delim=1;
-					}
-				} else if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
-					if (!full_au_pes_mode) {
-						pck.flags = GF_M2TS_PES_PCK_RAP;
-						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-					} else {
-						pck.flags |= GF_M2TS_PES_PCK_RAP;
-					}
-					prev_is_au_delim=0;
-				}
-				else
-#endif //GPAC_DISABLE_HEVC
-				{
-					if (!full_au_pes_mode) {
-						pck.flags = 0;
-						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-					}
-					prev_is_au_delim=0;
-				}
-			} else {
-				nal_type = pck.data[is_short_start_code ? 3 : 4] & 0x1F;
-
-				/*check for SPS and update stream info*/
-#ifndef GPAC_DISABLE_AV_PARSERS
-				if ((nal_type==GF_AVC_NALU_SEQ_PARAM) || (nal_type==GF_AVC_NALU_SVC_SUBSEQ_PARAM)) {
-					AVCState avc;
-					s32 idx;
-					memset(&avc, 0, sizeof(AVCState));
-					avc.sps_active_idx = -1;
-					idx = gf_media_avc_read_sps((char *)data+4, sc_pos-4, &avc, 0, NULL);
-
-					if ((idx>=0) && (pes->vid_w < avc.sps[idx].width) && (pes->vid_h < avc.sps[idx].height)) {
-						pes->vid_w = avc.sps[idx].width;
-						pes->vid_h = avc.sps[idx].height;
-					}
-				}
-#endif
-				/*check AU start type*/
-				if ((nal_type==GF_AVC_NALU_ACCESS_UNIT) || (nal_type==GF_AVC_NALU_VDRD) ) {
-					if (!prev_is_au_delim) {
-
-						//this was not a one AU per PES config, dispatch
-						if (au_start) {
-							pck.data = (char *)au_start;
-							pck.data_len = (u32) (data - au_start);
-							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-							au_start = NULL;
-							full_au_pes_mode = 0;
-							if (is_short_start_code) {
-								pck.data = (char *)data-1;
-								pck.data[0]=0;
-								pck.data_len = sc_pos+1;
-							} else {
-								pck.data = (char *)data;
-								pck.data_len = sc_pos;
-							}
-						}
-
-						if (au_start_in_pes) {
-							/*FIXME - we should check the AVC framerate to update the timing ...*/
-							pck.DTS += 3000;
-							pck.PTS += 3000;
-							//						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
-						}
-						pck.flags = GF_M2TS_PES_PCK_AU_START;
-						force_new_au = 0;
-						au_start_in_pes = 1;
-						if (pes_hdr->data_alignment && !first_nal_offset_in_pck && !pes->single_nal_mode) {
-							full_au_pes_mode = GF_TRUE;
-							au_start = (u8 *) pck.data;
-						} else {
-							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-						}
-						prev_is_au_delim=1;
-					}
-				} else {
-					if (!full_au_pes_mode) {
-						pck.flags = (nal_type==GF_AVC_NALU_IDR_SLICE) ? GF_M2TS_PES_PCK_RAP : 0;
-						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-					} else {
-						if (nal_type==GF_AVC_NALU_IDR_SLICE) pck.flags |= GF_M2TS_PES_PCK_RAP;
-					}
-					prev_is_au_delim=0;
-				}
-			}
-
-			data += sc_pos;
-			data_len -= sc_pos;
-			first_nal_offset_in_pck += sc_pos;
-			sc_pos = 0;
-
-			if (esc_code_found) {
-				esc_code_found=0;
-				start_code_found=0;
-			} else {
-				sc_pos = 1;
-			}
-		}
-	}
-	/*we did not consume all data*/
-	if (!start_code_found) {
-		u32 min_size = is_hevc ? 6 : 5;
-
-		if (au_start) {
-			pck.data = (char *)au_start;
-			pck.data_len = (u32) (data - au_start);
-			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-			au_start = NULL;
-		}
-
-		/*if not enough data to locate start code, store it*/
-		if (data_len < min_size )
-			return data_len;
-		/*otherwise this is the middle of a frame, let's dispatch it*/
-	}
-
-	if (au_start) {
-		u8 sc_end = ((data[0]==0) && (data[1]==0) && (data[2]==1)) ? 3 : 4;
-		if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
-			nal_type = (data[sc_end] & 0x7E) >> 1;
-			if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
-				pck.flags |= GF_M2TS_PES_PCK_RAP;
-			}
-#endif
-		} else {
-			nal_type = data[sc_end] & 0x1F;
-			if (nal_type==GF_AVC_NALU_IDR_SLICE) pck.flags |= GF_M2TS_PES_PCK_RAP;
-		}
-
-		pck.data = (char *)au_start;
-		pck.data_len = (u32) (data - au_start) + data_len;
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		return 0;
-	}
-
-	if (data_len) {
-		pck.flags = 0;
-		pck.data = (char *)data;
-		pck.data_len = data_len;
-		if (start_code_found) {
-			if (start_code_found==2) {
-				pck.data = (char *)data-1;
-				pck.data[0]=0;
-				pck.data_len = data_len+1;
-			}
-			if (is_hevc) {
-#ifndef GPAC_DISABLE_HEVC
-				nal_type = (pck.data[4] & 0x7E) >> 1;
-				if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
-					pck.flags = GF_M2TS_PES_PCK_AU_START;
-				} else if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
-					pck.flags = GF_M2TS_PES_PCK_RAP;
-				} else if (nal_type==GF_HEVC_NALU_FILLER_DATA) {
-					return 0;
-				}
-#endif
-			} else {
-				nal_type = pck.data[4] & 0x1F;
-				if (nal_type==GF_AVC_NALU_ACCESS_UNIT) {
-					pck.flags = GF_M2TS_PES_PCK_AU_START;
-				} else if (nal_type==GF_AVC_NALU_IDR_SLICE) {
-					pck.flags = GF_M2TS_PES_PCK_RAP;
-				}
-			}
-		}
-		if (force_new_au) {
-			pck.flags |= GF_M2TS_PES_PCK_AU_START;
-			//force_new_au = 0;
-		}
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-	}
-	/*we consumed all data*/
-	return 0;
-}
-
-static u32 gf_m2ts_reframe_avc_h264(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, pes_hdr, 0);
-}
-
-static u32 gf_m2ts_reframe_hevc(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, pes_hdr, 1);
-}
-
-static u32 gf_m2ts_reframe_mpeg_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	u32 sc_pos = 0;
-	u32 to_send = data_len;
-	GF_M2TS_PES_PCK pck;
-
-	/*dispatch frame*/
-	pck.stream = pes;
-	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;
-	pck.flags = 0;
-
-	while (sc_pos+4<data_len) {
-		unsigned char *start = (unsigned char*)memchr(data+sc_pos, 0, data_len-sc_pos);
-		if (!start) break;
-		sc_pos = (u32) (start - (unsigned char*)data);
-
-		/*found picture or sequence start_code*/
-		if (!start[1] && (start[2]==0x01)) {
-			if (!start[3] || (start[3]==0xb3) || (start[3]==0xb8)) {
-				Bool new_au;
-				if (sc_pos) {
-					pck.data = (char *)data;
-					pck.data_len = sc_pos;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-					pck.flags = 0;
-					data += sc_pos;
-					data_len -= sc_pos;
-					to_send -= sc_pos;
-					sc_pos = 0;
-				}
-				new_au = 1;
-				/*if prev was GOP/SEQ start, this is not a new AU*/
-				if (pes->frame_state)
-					new_au = 0;
-				pes->frame_state = data[3];
-				if (new_au) {
-					pck.flags = GF_M2TS_PES_PCK_AU_START;
-					if (pes->rap)
-						pck.flags |= GF_M2TS_PES_PCK_RAP;
-				}
-
-				if (!pes->vid_h && (pes->frame_state==0xb3)) {
-					u32 den, num;
-					unsigned char *p = data+4;
-					pes->vid_w = (p[0] << 4) | ((p[1] >> 4) & 0xf);
-					pes->vid_h = ((p[1] & 0xf) << 8) | p[2];
-					pes->vid_par = (p[3] >> 4) & 0xf;
-
-					switch (pes->vid_par) {
-					case 2:
-						num = 4;
-						den = 3;
-						break;
-					case 3:
-						num = 16;
-						den = 9;
-						break;
-					case 4:
-						num = 221;
-						den = 100;
-						break;
-					default:
-						pes->vid_par = 0;
-						den = num = 0;
-						break;
-					}
-					if (den)
-						pes->vid_par = ((pes->vid_h/den)<<16) | (pes->vid_w/num);
-					break;
-				}
-				if (pes->frame_state==0x00) {
-					switch ((data[5] >> 3) & 0x7) {
-					case 1:
-						pck.flags |= GF_M2TS_PES_PCK_I_FRAME;
-						break;
-					case 2:
-						pck.flags |= GF_M2TS_PES_PCK_P_FRAME;
-						break;
-					case 3:
-						pck.flags |= GF_M2TS_PES_PCK_B_FRAME;
-						break;
-					}
-				}
-			}
-			sc_pos+=3;
-		}
-		sc_pos++;
-	}
-	pck.data = (char *)data;
-	pck.data_len = data_len;
-	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-	/*we consumed all data*/
-	return 0;
-}
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-
-typedef struct
-{
-	Bool is_mp2, no_crc;
-	u32 profile, sr_idx, nb_ch, frame_size;
-} ADTSHeader;
-
-static u32 gf_m2ts_reframe_aac_adts(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	ADTSHeader hdr;
-	u32 sc_pos = 0;
-	u32 start = 0;
-	u32 hdr_size = 0;
-	u64 PTS;
-	Bool first = 1;
-	Bool garbage_bytes = 0;
-	GF_M2TS_PES_PCK pck;
-
-	/*dispatch frame*/
-	PTS = pes->PTS;
-	pck.stream = pes;
-	pck.DTS = pes->DTS;
-	pck.PTS = PTS;
-	pck.flags = 0;
-
-	if (pes->frame_state && ((pes->frame_state==data_len) || (((pes->frame_state+1<data_len)) && (data[pes->frame_state]==0xFF) && ((data[pes->frame_state+1] & 0xF0) == 0xF0)))) {
-		assert(pes->frame_state<=data_len);
-		/*dispatch frame*/
-		pck.stream = pes;
-		pck.DTS = PTS;
-		pck.PTS = PTS;
-		pck.flags = 0;
-		pck.data = (char *)data;
-		pck.data_len = pes->frame_state;
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		first = 0;
-		start = sc_pos = pes->frame_state;
-	}
-	pes->frame_state = 0;
-
-	/*fixme - we need to test this with more ADTS sources were PES framing is on any boundaries*/
-	while (sc_pos+2<data_len) {
-		u32 size;
-		GF_BitStream *bs;
-		/*look for sync marker 0xFFF0 on 12 bits*/
-		if ((data[sc_pos]!=0xFF) || ((data[sc_pos+1] & 0xF0) != 0xF0)) {
-			sc_pos++;
-			continue;
-		}
-
-		if (garbage_bytes) {
-			garbage_bytes = 0;
-		}
-		/*flush any pending data*/
-		else if (start < sc_pos) {
-			/*dispatch frame*/
-			pck.stream = pes;
-			pck.DTS = PTS;
-			pck.PTS = PTS;
-			pck.flags = 0;
-			pck.data = (char *)data+start;
-			pck.data_len = sc_pos-start;
-			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-			if (pes->frame_state == pck.data_len) {
-				/*consider we are sync*/
-				first = 0;
-			} else {
-				first = 1;
-			}
-			pes->frame_state = 0;
-		}
-		/*not enough data to parse the frame header*/
-		if (sc_pos + 7 >= data_len) {
-			pes->frame_state = 0;
-			pes->prev_PTS = PTS;
-			return data_len-sc_pos;
-		}
-
-		bs = gf_bs_new((char *)data + sc_pos + 1, 9, GF_BITSTREAM_READ);
-		gf_bs_read_int(bs, 4);
-		hdr.is_mp2 = gf_bs_read_int(bs, 1);
-		gf_bs_read_int(bs, 2);
-		hdr.no_crc = gf_bs_read_int(bs, 1);
-
-		hdr.profile = 1 + gf_bs_read_int(bs, 2);
-		hdr.sr_idx = gf_bs_read_int(bs, 4);
-		gf_bs_read_int(bs, 1);
-		hdr.nb_ch = gf_bs_read_int(bs, 3);
-		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);
-		if (!hdr.no_crc) gf_bs_read_int(bs, 16);
-		hdr_size = hdr.no_crc ? 7 : 9;
-
-		gf_bs_del(bs);
-
-		/*make sure we are sync if we have more data following*/
-		if (sc_pos + hdr.frame_size < data_len) {
-			if ((hdr.frame_size < hdr_size) || (data[sc_pos + hdr.frame_size]!=0xFF) || ((data[sc_pos+hdr.frame_size+1] & 0xF0) != 0xF0)) {
-				sc_pos++;
-				continue;
-			}
-		} else if (first && (hdr.frame_size + sc_pos > data_len)) {
-			sc_pos++;
-			continue;
-		}
-
-		if (pes->aud_sr != GF_M4ASampleRates[hdr.sr_idx]) {
-			GF_M4ADecSpecInfo cfg;
-			pck.stream = pes;
-			memset(&cfg, 0, sizeof(GF_M4ADecSpecInfo));
-			cfg.base_object_type = hdr.profile;
-			cfg.base_sr = GF_M4ASampleRates[hdr.sr_idx];
-
-
-			if (!cfg.base_sr) {
-				sc_pos++;
-				garbage_bytes = 1;
-				continue;
-			}
-
-			pes->aud_sr = cfg.base_sr;
-			pes->aud_nb_ch = cfg.nb_chan = hdr.nb_ch;
-			cfg.sbr_object_type = 0;
-			gf_m4a_write_config(&cfg, &pck.data, &pck.data_len);
-			ts->on_event(ts, GF_M2TS_EVT_AAC_CFG, &pck);
-			gf_free(pck.data);
-			pes->aud_aac_sr_idx = cfg.base_sr_index;
-			pes->aud_sr = cfg.base_sr;
-			pes->aud_nb_ch = cfg.nb_chan;
-			pes->aud_aac_obj_type = hdr.profile;
-		}
-
-		/*dispatch frame*/
-		pck.stream = pes;
-		if (first && pes->prev_PTS) {
-			pck.DTS = pck.PTS = pes->prev_PTS;
-		} else {
-			pck.DTS = pck.PTS = PTS;
-		}
-		pck.flags = GF_M2TS_PES_PCK_AU_START | GF_M2TS_PES_PCK_RAP;
-		pck.data = (char *)data + sc_pos + hdr_size;
-		pck.data_len = hdr.frame_size - hdr_size;
-
-		if (pck.data_len > data_len - sc_pos - hdr_size) {
-			assert(pck.data_len - (data_len - sc_pos - hdr_size) > 0);
-			/*remember how much we have to send*/
-			pes->frame_state = pck.data_len - (data_len - sc_pos - hdr_size);
-			assert((s32) pes->frame_state > 0);
-			pck.data_len = data_len - sc_pos - hdr_size;
-		}
-
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		sc_pos += pck.data_len + hdr_size;
-		start = sc_pos;
-
-		if (first && pes->prev_PTS) {
-			pes->prev_PTS = 0;
-		}
-		/*update PTS in case we don't get any update*/
-		else if (pes->aud_sr) {
-			size = 1024*90000/pes->aud_sr;
-			PTS += size;
-		}
-		first = 0;
-	}
-	/*did we consumed all data ?*/
-	if (data_len==sc_pos) return 0;
-	pes->prev_PTS = PTS;
-	return data_len - sc_pos;
-}
-
-static u32 gf_m2ts_reframe_aac_latm(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	u32 sc_pos = 0;
-	u32 start = 0;
-	GF_M2TS_PES_PCK pck;
-
-	/*dispatch frame*/
-	pck.stream = pes;
-	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;
-	pck.flags = 0;
-
-
-	if (data_len + pes->reassemble_len > pes->reassemble_alloc) {
-		pes->reassemble_alloc = data_len + pes->reassemble_len;
-		pes->reassemble_buf = gf_realloc(pes->reassemble_buf, sizeof(char)*pes->reassemble_alloc);
-	}
-	memcpy(pes->reassemble_buf + pes->reassemble_len, data, data_len);
-	pes->reassemble_len += data_len;
-	data_len = pes->reassemble_len;
-	data = pes->reassemble_buf;
-
-
-	/*fixme - we need to test this with more LATM sources were PES framing is on any boundaries*/
-	while (sc_pos+2<data_len) {
-		u32 size;
-		u32 amux_len;
-		GF_BitStream *bs;
-		/*look for sync marker 0x2B7 on 11 bits*/
-		if ((data[sc_pos]!=0x56) || ((data[sc_pos+1] & 0xE0) != 0xE0)) {
-			sc_pos++;
-			continue;
-		}
-
-		/*flush any pending data*/
-		if (start < sc_pos) {
-			assert(data_len >= sc_pos);
-			memmove(pes->reassemble_buf, pes->reassemble_buf + sc_pos, data_len - sc_pos);
-			pes->reassemble_len -= sc_pos;
-			sc_pos = 0;
-			data_len = pes->reassemble_len;
-			data = pes->reassemble_buf;
-		}
-
-		/*found a start code*/
-		amux_len = data[sc_pos+1] & 0x1F;
-		amux_len <<= 8;
-		amux_len |= data[sc_pos+2];
-		if (!amux_len) {
-			sc_pos+=3;
-			assert(data_len >= sc_pos);
-			memmove(pes->reassemble_buf, pes->reassemble_buf + sc_pos, data_len - sc_pos);
-			pes->reassemble_len -= sc_pos;
-			sc_pos = 0;
-			data_len = pes->reassemble_len;
-			data = pes->reassemble_buf;
-			continue;
-		}
-
-
-		//we cannot check sync wait for next frame
-		if (data_len < sc_pos+4+amux_len) {
-			if (pes->aud_sr) {
-				u32 tsinc = 1024*90000/pes->aud_sr;
-				pes->PTS += tsinc;
-			}
-			return 0;
-		}
-
-		//we are not sync, trash what is before the start code and continue
-		if ((data[sc_pos+3+amux_len] != 0x56) || ((data[sc_pos+3+amux_len + 1] & 0xE0) != 0xE0)) {
-			sc_pos+=2;
-			assert(data_len >= sc_pos);
-			memmove(pes->reassemble_buf , pes->reassemble_buf+ sc_pos, data_len - sc_pos);
-			pes->reassemble_len -= sc_pos;
-			sc_pos = 0;
-			data_len = pes->reassemble_len;
-			data = pes->reassemble_buf;
-			continue;
-		}
-
-
-		bs = gf_bs_new((char *)data+sc_pos+3, amux_len, GF_BITSTREAM_READ);
-
-		/*use same stream mux*/
-		if (!gf_bs_read_int(bs, 1)) {
-			Bool amux_version, amux_versionA;
-
-			amux_version = gf_bs_read_int(bs, 1);
-			amux_versionA = 0;
-			if (amux_version) amux_versionA = gf_bs_read_int(bs, 1);
-			if (!amux_versionA) {
-				u32 i, allStreamsSameTimeFraming, numProgram;
-				if (amux_version) gf_latm_get_value(bs);
-
-				allStreamsSameTimeFraming = gf_bs_read_int(bs, 1);
-				/*numSubFrames = */gf_bs_read_int(bs, 6);
-				numProgram = gf_bs_read_int(bs, 4);
-				for (i=0; i<=numProgram; i++) {
-					u32 j, num_lay;
-					num_lay = gf_bs_read_int(bs, 3);
-					for (j=0; j<=num_lay; j++) {
-						GF_M4ADecSpecInfo cfg;
-						u32 frameLengthType;
-						Bool same_cfg = 0;
-						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
-
-						if (!same_cfg) {
-							if (amux_version==1) gf_latm_get_value(bs);
-							gf_m4a_parse_config(bs, &cfg, 0);
-
-							if (!pes->aud_sr) {
-								pck.stream = pes;
-								pes->aud_aac_sr_idx = cfg.base_sr_index;
-								pes->aud_sr = cfg.base_sr;
-								pes->aud_nb_ch = cfg.nb_chan;
-								pes->aud_aac_obj_type = cfg.base_object_type;
-
-								gf_m4a_write_config(&cfg, &pck.data, &pck.data_len);
-								ts->on_event(ts, GF_M2TS_EVT_AAC_CFG, &pck);
-								gf_free(pck.data);
-							}
-						}
-						frameLengthType = gf_bs_read_int(bs, 3);
-						if (!frameLengthType) {
-							/*latmBufferFullness = */gf_bs_read_int(bs, 8);
-							if (!allStreamsSameTimeFraming) {
-							}
-						} else {
-							/*not supported*/
-						}
-					}
-
-				}
-				/*other data present*/
-				if (gf_bs_read_int(bs, 1)) {
-//					u32 k = 0;
-				}
-				/*CRCcheck present*/
-				if (gf_bs_read_int(bs, 1)) {
-				}
-			}
-
-
-		}
-
-		/*we have a cfg, read data - we only handle single stream multiplex in LATM/LOAS*/
-		if (pes->aud_sr) {
-			size = 0;
-			while (1) {
-				u32 tmp = gf_bs_read_int(bs, 8);
-				size += tmp;
-				if (tmp!=255) break;
-			}
-			if (size>pes->buf_len) {
-				pes->buf_len = size;
-				pes->buf = gf_realloc(pes->buf, sizeof(char)*pes->buf_len);
-			}
-			gf_bs_read_data(bs, (char *)pes->buf, size);
-
-			/*dispatch frame*/
-			pck.stream = pes;
-			pck.DTS = pes->PTS;
-			pck.PTS = pes->PTS;
-			pck.flags = GF_M2TS_PES_PCK_AU_START | GF_M2TS_PES_PCK_RAP;
-			pck.data = (char *)pes->buf;
-			pck.data_len = size;
-
-			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		}
-		gf_bs_del(bs);
-
-		//trash dispatched AU, including 3 bytes header
-		sc_pos += amux_len+3;
-		assert(data_len >= sc_pos);
-		memmove(pes->reassemble_buf, pes->reassemble_buf + sc_pos, data_len - sc_pos);
-		pes->reassemble_len -= sc_pos;
-		sc_pos = 0;
-		data_len = pes->reassemble_len;
-		data = pes->reassemble_buf;
-
-		if ((data_len>3) && pes->aud_sr) {
-			/*update PTS in case we don't get any update*/
-			size = 1024*90000/pes->aud_sr;
-			pes->PTS += size;
-		}
-	}
-	/*we consumed all data*/
-	return 0;
-}
-#endif
-
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-static u32 gf_m2ts_reframe_mpeg_audio(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	GF_M2TS_PES_PCK pck;
-	u32 pos, frame_size, remain;
-	u64 PTS;
-	u32 next_hdr = 0;
-
-	pck.flags = GF_M2TS_PES_PCK_RAP;
-	pck.stream = pes;
-	remain = pes->frame_state;
-	PTS = pes->PTS;
-
-	/*check we don't find a sync point within what we should flush - this happens with looping TS streams and other nasty scenarii*/
-	next_hdr = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
-	if (next_hdr && remain && (pos<remain) ) {
-		//only resync if the frame header matches our current config, otherwise this is likely an emulated header
-		if ((pes->aud_sr == gf_mp3_sampling_rate(pes->frame_state) )
-		        && (pes->aud_nb_ch == gf_mp3_num_channels(pes->frame_state))
-		   ) {
-			remain = pos;
-		}
-	}
-
-	if (remain) {
-		/*dispatch end of prev frame*/
-		pck.DTS = pck.PTS = PTS;
-		pck.data = (char *)data;
-		pck.data_len = (remain>data_len) ? data_len : remain;
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		if (remain>data_len) {
-			pes->frame_state = remain - data_len;
-			/*we consumed all data*/
-			return 0;
-		}
-		data += remain;
-		data_len -= remain;
-	}
-
-	pes->frame_state = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
-	if (!pes->frame_state) {
-		/*we did not consumed all data*/
-		return data_len;
-	}
-	assert((pes->frame_state & 0xffe00000) == 0xffe00000);
-
-	if (!pes->aud_sr || !pes->aud_nb_ch) {
-		pes->aud_sr = gf_mp3_sampling_rate(pes->frame_state);
-		pes->aud_nb_ch = gf_mp3_num_channels(pes->frame_state);
-	}
-	pck.flags = GF_M2TS_PES_PCK_RAP | GF_M2TS_PES_PCK_AU_START;
-
-	frame_size = gf_mp3_frame_size(pes->frame_state);
-	while (frame_size <= data_len) {
-		/*dispatch frame*/
-		pck.DTS = pck.PTS = PTS;
-		pck.data = (char *)data;
-		pck.data_len = frame_size;
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-
-		PTS += gf_mp3_window_size(pes->frame_state)*90000/gf_mp3_sampling_rate(pes->frame_state);
-		/*move frame*/
-		data += frame_size;
-		data_len -= frame_size;
-		if (!data_len) break;
-		pes->frame_state = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
-		/*resync (ID3 or error)*/
-		if (!pes->frame_state) {
-			/*we did not consumed all data*/
-			return data_len;
-		}
-		/*resync (ID3 or error)*/
-		if (pos) {
-			data_len -= pos;
-			data += pos;
-		}
-		frame_size = gf_mp3_frame_size(pes->frame_state);
-	}
-	if (data_len) {
-		pck.DTS = pck.PTS = PTS;
-		pck.data = (char *)data;
-		pck.data_len = data_len;
-		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-		/*update PTS in case we don't get any update*/
-		pes->PTS += gf_mp3_window_size(pes->frame_state)*90000/gf_mp3_sampling_rate(pes->frame_state);
-		pes->frame_state = frame_size - data_len;
-	} else  {
-		pes->frame_state = 0;
-	}
-	/*we consumed all data*/
-	return 0;
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
-
-#ifndef GPAC_DISABLE_AV_PARSERS
-static u32 gf_m2ts_reframe_ac3(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	GF_M2TS_PES_PCK pck;
-	pck.flags = 0;
-	if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
-	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
-	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;
-
-	if (!pes->aud_sr) {
-		GF_AC3Header hdr;
-		u32 pos;
-		if (gf_ac3_parser(data, data_len, &pos, &hdr, GF_TRUE)) {
-			pes->aud_sr = hdr.sample_rate;
-			pes->aud_nb_ch = hdr.channels;
-		}
-	}
-
-	pck.data = (char *)data;
-	pck.data_len = data_len;
-	pck.stream = pes;
-	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-	/*we consumed all data*/
-	return 0;
-}
-
-static u32 gf_m2ts_reframe_ec3(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
-{
-	GF_M2TS_PES_PCK pck;
-	pck.flags = 0;
-	if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
-	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
-	pck.DTS = pes->DTS;
-	pck.PTS = pes->PTS;
-
-	if (!pes->aud_sr) {
-		GF_AC3Header hdr;
-		GF_BitStream *bs = gf_bs_new((const char *) data, data_len, GF_BITSTREAM_READ);
-		if (gf_eac3_parser_bs(bs, &hdr, GF_TRUE)) {
-			pes->aud_sr = hdr.sample_rate;
-			pes->aud_nb_ch = hdr.channels;
-		}
-		gf_bs_del(bs);
-	}
-
-	pck.data = (char *)data;
-	pck.data_len = data_len;
-	pck.stream = pes;
-	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
-	/*we consumed all data*/
-	return 0;
-}
-
-#endif /*GPAC_DISABLE_AV_PARSERS*/
-
 static void add_text(char **buffer, u32 *size, u32 *pos, char *msg, u32 msg_len)
 {
-	if (!msg || !buffer || ! *buffer) return;
+	if (!msg || !buffer) return;
 
 	if (*pos+msg_len>*size) {
 		*size = *pos+msg_len-*size+256;
 		*buffer = (char *)gf_realloc(*buffer, *size);
 	}
+	if (! *buffer)
+		return;
+
 	strncpy((*buffer)+(*pos), msg, msg_len);
 	*pos += msg_len;
 }
 
 static GF_Err id3_parse_tag(char *data, u32 length, char **output, u32 *output_size, u32 *output_pos)
 {
-	u32 size;
-	u32 pos = 0;
-	/* ID3VVFFFFSIZE = 13bytes
-	     * ID3 string
-	 * VV = Version
-	     * F = Flags
-	     * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
-	 * Size starts AFTER this header, meaning we have to add 10 bytes
-	 */
-	if (data[pos] == 'I' && data[pos+1] == 'D' && data[pos+2] == '3') {
-		//u16 version = (data[pos+3]<<8)+data[pos+4];
-		//Bool unsync_flag = ((data[pos+5]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
-		Bool extended_header_flag = ((data[pos+5]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
-		//Bool experimental_flag = ((data[pos+5]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
-		if (data[pos+5] & 0x1F) {
-			return GF_NOT_SUPPORTED;
-		} else {
-			size = 10 + ((data[pos+9] & 0x7f) + ((data[pos+8] & 0x7f) << 7) + ((data[pos+7] & 0x7f) << 14) + ((data[pos+6] & 0x7f) << 21));
-		}
-		pos += 10;
-
-		if (extended_header_flag) {
-			u32 extended_size = 4 + ((data[pos]) + ((data[pos+1]) << 8) + ((data[pos+2]) << 16) + ((data[pos+3]) << 24));
-			pos += extended_size;
-		}
-
-		while (pos < size) {
-			GF_ID3v2FrameType type;
-			u32 frame_size, frame_pos;
-			Bool compression_flag, encryption_flag/*, tag_alter_preservation_flag, file_alter_preservation_flag, readonly_flag, grouping_flag*/;
-			frame_pos = pos;
-			/* parsing a frame */
-			type = (GF_ID3v2FrameType)(((data[pos+3]) + ((data[pos+2]) << 8) + ((data[pos+1]) << 16) + ((data[pos]) << 24)));
-			pos+=4;
-			frame_size = 10 + ((data[pos+3] & 0x7f) + ((data[pos+2] & 0x7f) << 7) + ((data[pos+1] & 0x7f) << 14) + ((data[pos] & 0x7f) << 21));
-			pos+=4;
-			//tag_alter_preservation_flag = ((data[pos]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
-			//file_alter_preservation_flag = ((data[pos]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
-			//readonly_flag = ((data[pos]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
-			pos++;
-			compression_flag = ((data[pos]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
-			encryption_flag = ((data[pos]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
-			//grouping_flag = ((data[pos]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
-			if (compression_flag || encryption_flag) {
-				/* unsupported, skip */
-				pos = frame_pos + frame_size;
-			} else {
-				switch (type) {
-				case ID3V2_FRAME_TXXX:
-					add_text(output, output_size, output_pos, data+pos+3, frame_size-10-3);
-					pos = frame_pos + frame_size;
-					break;
-				default:
-					/* unsupported, skip */
-					pos = frame_pos + frame_size;
-				}
-			}
-		}
+	GF_BitStream *bs;
+	u32 pos, size;
 
-		return GF_OK;
-	} else {
+	if ((data[0] != 'I') || (data[1] != 'D') || (data[2] != '3'))
 		return GF_NOT_SUPPORTED;
+
+	bs = gf_bs_new(data, length, GF_BITSTREAM_READ);
+
+	gf_bs_skip_bytes(bs, 3);
+	/*u8 major = */gf_bs_read_u8(bs);
+	/*u8 minor = */gf_bs_read_u8(bs);
+	/*u8 unsync = */gf_bs_read_int(bs, 1);
+	/*u8 ext_hdr = */ gf_bs_read_int(bs, 1);
+	gf_bs_read_int(bs, 6);
+	/*size = */gf_id3_read_size(bs);
+
+	pos = (u32) gf_bs_get_position(bs);
+	size = length-pos;
+
+	while (size && (gf_bs_available(bs)>=10) ) {
+		u32 ftag = gf_bs_read_u32(bs);
+		u32 fsize = gf_id3_read_size(bs);
+		/*u16 fflags = */gf_bs_read_u16(bs);
+		size -= 10;
+
+		//TODO, handle more ID3 tags ?
+		if (ftag==ID3V2_FRAME_TXXX) {
+			u32 tpos = (u32) gf_bs_get_position(bs);
+			char *text = data+tpos;
+			add_text(output, output_size, output_pos, text, fsize);
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] ID3 tag not handled, patch welcome\n", gf_4cc_to_str(ftag) ) );
+		}
+		gf_bs_skip_bytes(bs, fsize);
 	}
+	gf_bs_del(bs);
+	return GF_OK;
 }
 
 static u32 gf_m2ts_reframe_id3_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
@@ -1245,18 +228,17 @@
 	return 0;
 }
 
-static u32 gf_m2ts_sync(GF_M2TS_Demuxer *ts, Bool simple_check)
+static u32 gf_m2ts_sync(GF_M2TS_Demuxer *ts, char *data, u32 size, Bool simple_check)
 {
 	u32 i=0;
 	/*if first byte is sync assume we're sync*/
-	if (simple_check && (ts->buffer[i]==0x47)) return 0;
+	if (simple_check && (data[i]==0x47)) return 0;
 
-	while (i<ts->buffer_size) {
-		if (i+188>=ts->buffer_size) return ts->buffer_size;
-		if ((ts->buffer[i]==0x47) && (ts->buffer[i+188]==0x47))
+	while (i < size) {
+		if (i+192 >= size) return size;
+		if ((data[i]==0x47) && (data[i+188]==0x47))
 			break;
-		if (i+192>=ts->buffer_size) return ts->buffer_size;
-		if ((ts->buffer[i]==0x47) && (ts->buffer[i+192]==0x47)) {
+		if ((data[i]==0x47) && (data[i+192]==0x47)) {
 			ts->prefix_present = 1;
 			break;
 		}
@@ -1268,11 +250,10 @@
 	return i;
 }
 
-GF_EXPORT
-Bool gf_m2ts_crc32_check(char *data, u32 len)
+Bool gf_m2ts_crc32_check(u8 *data, u32 len)
 {
 	u32 crc = gf_crc_32(data, len);
-	u32 crc_val = GF_4CC((u8) data[len], (u8) data[len+1], (u8) data[len+2], (u8) data[len+3]);
+	u32 crc_val = GF_4CC((u32) data[len], (u8) data[len+1], (u8) data[len+2], (u8) data[len+3]);
 	return (crc==crc_val) ? GF_TRUE : GF_FALSE;
 }
 
@@ -1294,12 +275,11 @@
 static void gf_m2ts_reset_sections(GF_List *sections)
 {
 	u32 count;
-	GF_M2TS_Section *section;
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Deleting sections\n"));
 
 	count = gf_list_count(sections);
 	while (count) {
-		section = gf_list_get(sections, 0);
+		GF_M2TS_Section *section = gf_list_get(sections, 0);
 		gf_list_rem(sections, 0);
 		if (section->data) gf_free(section->data);
 		gf_free(section);
@@ -1331,8 +311,18 @@
 	gf_free(sf);
 }
 
-GF_EXPORT
-void gf_m2ts_es_del(GF_M2TS_ES *es, GF_M2TS_Demuxer *ts)
+
+static void gf_m2ts_metadata_descriptor_del(GF_M2TS_MetadataDescriptor *metad)
+{
+	if (metad) {
+		if (metad->service_id_record) gf_free(metad->service_id_record);
+		if (metad->decoder_config) gf_free(metad->decoder_config);
+		if (metad->decoder_config_id) gf_free(metad->decoder_config_id);
+		gf_free(metad);
+	}
+}
+
+static void gf_m2ts_es_del(GF_M2TS_ES *es, GF_M2TS_Demuxer *ts)
 {
 	gf_list_del_item(es->program->streams, es);
 
@@ -1353,9 +343,10 @@
 
 		if (pes->pck_data) gf_free(pes->pck_data);
 		if (pes->prev_data) gf_free(pes->prev_data);
-		if (pes->buf) gf_free(pes->buf);
-		if (pes->reassemble_buf) gf_free(pes->reassemble_buf);
 		if (pes->temi_tc_desc) gf_free(pes->temi_tc_desc);
+
+		if (pes->metadata_descriptor) gf_m2ts_metadata_descriptor_del(pes->metadata_descriptor);
+
 	}
 	if (es->slcfg) gf_free(es->slcfg);
 	gf_free(es);
@@ -1386,7 +377,7 @@
 static void gf_m2ts_section_complete(GF_M2TS_Demuxer *ts, GF_M2TS_SectionFilter *sec, GF_M2TS_SECTION_ES *ses)
 {
 	//seek mode, only process PAT and PMT
-	if (ts->start_range && (sec->section[0] != GF_M2TS_TABLE_ID_PAT) && (sec->section[0] != GF_M2TS_TABLE_ID_PMT)) {
+	if (ts->seek_mode && (sec->section[0] != GF_M2TS_TABLE_ID_PAT) && (sec->section[0] != GF_M2TS_TABLE_ID_PMT)) {
 		/*clean-up (including broken sections)*/
 		if (sec->section) gf_free(sec->section);
 		sec->section = NULL;
@@ -1445,6 +436,11 @@
 		/*parse header*/
 		data = (u8 *)sec->section;
 
+		if (sec->length < 2) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] M2TS Table parsing error, length %d is too small\n", sec->length) );
+			return;
+		}
+
 		/*look for proper table*/
 		table_id = data[0];
 
@@ -1468,6 +464,10 @@
 
 		has_syntax_indicator = (data[1] & 0x80) ? 1 : 0;
 		if (has_syntax_indicator) {
+			if (sec->length < 5) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] M2TS Table parsing error, length %d is too small\n", sec->length) );
+				return;
+			}
 			extended_table_id = (data[3]<<8) | data[4];
 		} else {
 			extended_table_id = 0;
@@ -1579,8 +579,8 @@
 
 				table_size = 0;
 				for (i=0; i<gf_list_count(t->sections); i++) {
-					GF_M2TS_Section *section = gf_list_get(t->sections, i);
-					table_size += section->data_size;
+					GF_M2TS_Section *a_sec = gf_list_get(t->sections, i);
+					table_size += a_sec->data_size;
 				}
 				if (t->is_repeat) {
 					if (t->table_size != table_size) {
@@ -1603,11 +603,15 @@
 
 			if (sec->process_individual) {
 				/*send each section of the table and not the aggregated table*/
-				sec->process_section(ts, ses, t->sections, t->table_id, t->ex_table_id, t->version_number, (u8) (t->last_section_number - 1), status);
+				if (sec->process_section)
+					sec->process_section(ts, ses, t->sections, t->table_id, t->ex_table_id, t->version_number, (u8) (t->last_section_number - 1), status);
+
 				gf_m2ts_reset_sections(t->sections);
 			} else {
 				if (status&GF_M2TS_TABLE_END) {
-					sec->process_section(ts, ses, t->sections, t->table_id, t->ex_table_id, t->version_number, (u8) (t->last_section_number - 1), status);
+					if (sec->process_section)
+						sec->process_section(ts, ses, t->sections, t->table_id, t->ex_table_id, t->version_number, (u8) (t->last_section_number - 1), status);
+
 					gf_m2ts_reset_sections(t->sections);
 				}
 			}
@@ -1650,9 +654,9 @@
 {
 	u32 length;
 	if (gf_m2ts_is_long_section(byte0)) {
-		length = 3 + ( ((byte1<<8) | (byte2&0xff)) & 0xfff );
+		length = 3 + ( (((u8)byte1<<8) | (byte2&0xff)) & 0xfff );
 	} else {
-		length = 3 + ( ((byte1<<8) | (byte2&0xff)) & 0x3ff );
+		length = 3 + ( (((u8)byte1<<8) | (byte2&0xff)) & 0x3ff );
 	}
 	return length;
 }
@@ -1874,25 +878,14 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] NIT table processing (not yet implemented)"));
 }
 
-/* decodes an Modified Julian Date (MJD) into a Co-ordinated Universal Time (UTC)
-See annex C of DVB-SI ETSI EN 300468 */
-static void dvb_decode_mjd_date(u32 date, u16 *year, u8 *month, u8 *day)
-{
-	u32 yp, mp, k;
-	yp = (u32)((date - 15078.2)/365.25);
-	mp = (u32)((date - 14956.1 - (u32)(yp * 365.25))/30.6001);
-	if (day) *day = (u32)(date - 14956 - (u32)(yp * 365.25) - (u32)(mp * 30.6001));
-	if (mp == 14 || mp == 15) k = 1;
-	else k = 0;
-	if (year) *year = yp + k + 1900;
-	if (month) *month = mp - 1 - k*12;
-}
+
 
 
 static void gf_m2ts_process_tdt_tot(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *tdt_tot_es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
 {
 	unsigned char *data;
 	u32 data_size, nb_sections;
+	u32 date, yp, mp, k;
 	GF_M2TS_Section *section;
 	GF_M2TS_TDT_TOT *time_table;
 	const char *table_name;
@@ -1933,7 +926,17 @@
 	}
 
 	/*UTC_time - see annex C of DVB-SI ETSI EN 300468*/
-	dvb_decode_mjd_date(data[0]*256 + data[1], &(time_table->year), &(time_table->month), &(time_table->day));
+/* decodes an Modified Julian Date (MJD) into a Co-ordinated Universal Time (UTC)
+See annex C of DVB-SI ETSI EN 300468 */
+	date = data[0]*256 + data[1];
+	yp = (u32)((date - 15078.2)/365.25);
+	mp = (u32)((date - 14956.1 - (u32)(yp * 365.25))/30.6001);
+	time_table->day = (u32)(date - 14956 - (u32)(yp * 365.25) - (u32)(mp * 30.6001));
+	if (mp == 14 || mp == 15) k = 1;
+	else k = 0;
+	time_table->year = yp + k + 1900;
+	time_table->month = mp - 1 - k*12;
+
 	time_table->hour   = 10*((data[2]&0xf0)>>4) + (data[2]&0x0f);
 	time_table->minute = 10*((data[3]&0xf0)>>4) + (data[3]&0x0f);
 	time_table->second = 10*((data[4]&0xf0)>>4) + (data[4]&0x0f);
@@ -2057,7 +1060,7 @@
 	return d;
 }
 
-void gf_m2ts_metadata_pointer_descriptor_del(GF_M2TS_MetadataPointerDescriptor *metapd)
+static void gf_m2ts_metadata_pointer_descriptor_del(GF_M2TS_MetadataPointerDescriptor *metapd)
 {
 	if (metapd) {
 		if (metapd->locator_data) gf_free(metapd->locator_data);
@@ -2068,61 +1071,52 @@
 
 static GF_M2TS_MetadataDescriptor *gf_m2ts_read_metadata_descriptor(GF_BitStream *bs, u32 length)
 {
-	u32 size;
+	//u32 size;
 	GF_M2TS_MetadataDescriptor *d;
 	GF_SAFEALLOC(d, GF_M2TS_MetadataDescriptor);
 	if (!d) return NULL;
 	d->application_format = gf_bs_read_u16(bs);
-	size = 2;
+	//size = 2;
 	if (d->application_format == 0xFFFF) {
 		d->application_format_identifier = gf_bs_read_u32(bs);
-		size += 4;
+		//size += 4;
 	}
 	d->format = gf_bs_read_u8(bs);
-	size += 1;
+	//size += 1;
 	if (d->format == 0xFF) {
 		d->format_identifier = gf_bs_read_u32(bs);
-		size += 4;
+		//size += 4;
 	}
 	d->service_id = gf_bs_read_u8(bs);
 	d->decoder_config_flags = gf_bs_read_int(bs, 3);
 	d->dsmcc_flag = (gf_bs_read_int(bs, 1) ? GF_TRUE : GF_FALSE);
 	gf_bs_read_int(bs, 4); /* reserved */
-	size += 2;
+	//size += 2;
 	if (d->dsmcc_flag) {
 		d->service_id_record_length = gf_bs_read_u8(bs);
 		d->service_id_record = (char *)gf_malloc(d->service_id_record_length);
-		size += 1 + d->service_id_record_length;
+		//size += 1 + d->service_id_record_length;
 		gf_bs_read_data(bs, d->service_id_record, d->service_id_record_length);
 	}
 	if (d->decoder_config_flags == 1) {
 		d->decoder_config_length = gf_bs_read_u8(bs);
 		d->decoder_config = (char *)gf_malloc(d->decoder_config_length);
-		size += 1 + d->decoder_config_length;
+		//size += 1 + d->decoder_config_length;
 		gf_bs_read_data(bs, d->decoder_config, d->decoder_config_length);
 	}
 	if (d->decoder_config_flags == 3) {
 		d->decoder_config_id_length = gf_bs_read_u8(bs);
 		d->decoder_config_id = (char *)gf_malloc(d->decoder_config_id_length);
-		size += 1 + d->decoder_config_id_length;
+		//size += 1 + d->decoder_config_id_length;
 		gf_bs_read_data(bs, d->decoder_config_id, d->decoder_config_id_length);
 	}
 	if (d->decoder_config_flags == 4) {
 		d->decoder_config_service_id = gf_bs_read_u8(bs);
-		size++;
+		//size++;
 	}
 	return d;
 }
 
-void gf_m2ts_metadata_descriptor_del(GF_M2TS_MetadataDescriptor *metad)
-{
-	if (metad) {
-		if (metad->service_id_record) gf_free(metad->service_id_record);
-		if (metad->decoder_config) gf_free(metad->decoder_config);
-		if (metad->decoder_config_id) gf_free(metad->decoder_config_id);
-		gf_free(metad);
-	}
-}
 
 static void gf_m2ts_process_pmt(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *pmt, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
 {
@@ -2160,41 +1154,64 @@
 	data = section->data;
 	data_size = section->data_size;
 
+	if (data_size < 6) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PMT header data size %d\n", data_size ) );
+		return;
+	}
+
 	pmt->program->pcr_pid = ((data[0] & 0x1f) << 8) | data[1];
 
 	info_length = ((data[2]&0xf)<<8) | data[3];
-	if (info_length != 0) {
+	if (info_length + 4 > data_size) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PMT first loop, %d bytes avail but first loop size %d\n", data_size, info_length));
+		return;
+	} else if (info_length != 0) {
 		/* ...Read Descriptors ... */
-		u8 tag, len;
+		u32 tag, len;
 		u32 first_loop_len = 0;
-		tag = data[4];
-		len = data[5];
+		tag = (u32) data[4];
+		len = (u32) data[5];
 		while (info_length > first_loop_len) {
-#ifndef FORCE_DISABLE_MPEG4SL_OVER_MPEG2TS
 			if (tag == GF_M2TS_MPEG4_IOD_DESCRIPTOR) {
-				u32 size;
-				GF_BitStream *iod_bs;
-				iod_bs = gf_bs_new((char *)data+8, len-2, GF_BITSTREAM_READ);
-				if (pmt->program->pmt_iod) gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
-				e = gf_odf_parse_descriptor(iod_bs , (GF_Descriptor **) &pmt->program->pmt_iod, &size);
-				gf_bs_del(iod_bs );
-				if (e==GF_OK) {
-					/*remember program number for service/program selection*/
-					if (pmt->program->pmt_iod) pmt->program->pmt_iod->ServiceID = pmt->program->number;
-					/*if empty IOD (freebox case), discard it and use dynamic declaration of object*/
-					if (!gf_list_count(pmt->program->pmt_iod->ESDescriptors)) {
+				if ((len>2) && (len - 2 <= info_length)) {
+					u32 size;
+					GF_BitStream *iod_bs;
+					iod_bs = gf_bs_new((char *)data+8, len-2, GF_BITSTREAM_READ);
+					if (pmt->program->pmt_iod) gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
+					pmt->program->pmt_iod = NULL;
+					e = gf_odf_parse_descriptor(iod_bs , (GF_Descriptor **) &pmt->program->pmt_iod, &size);
+					gf_bs_del(iod_bs );
+					if (pmt->program->pmt_iod && pmt->program->pmt_iod->tag != GF_ODF_IOD_TAG) {
+						GF_LOG( GF_LOG_ERROR, GF_LOG_CONTAINER, ("pmt iod has wrong tag %d\n", pmt->program->pmt_iod->tag) );
 						gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
 						pmt->program->pmt_iod = NULL;
 					}
+					if (e==GF_OK) {
+						/*remember program number for service/program selection*/
+						if (pmt->program->pmt_iod) {
+							pmt->program->pmt_iod->ServiceID = pmt->program->number;
+							/*if empty IOD (freebox case), discard it and use dynamic declaration of object*/
+							if (!gf_list_count(pmt->program->pmt_iod->ESDescriptors)) {
+								gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
+								pmt->program->pmt_iod = NULL;
+							}
+						}
+					}
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken IOD! len %d less than 2 bytes to declare IOD\n", len));
 				}
 			} else if (tag == GF_M2TS_METADATA_POINTER_DESCRIPTOR) {
 				GF_BitStream *metadatapd_bs;
 				GF_M2TS_MetadataPointerDescriptor *metapd;
+
+				if (data_size <= 8 || data_size-6 < (u32)len)
+					break;
+
 				metadatapd_bs = gf_bs_new((char *)data+6, len, GF_BITSTREAM_READ);
 				metapd = gf_m2ts_read_metadata_pointer_descriptor(metadatapd_bs, len);
 				gf_bs_del(metadatapd_bs);
-				if (metapd->application_format_identifier == GF_MEDIA_TYPE_ID3 &&
-				        metapd->format_identifier == GF_MEDIA_TYPE_ID3 &&
+				if (metapd->application_format_identifier == GF_M2TS_META_ID3 &&
+				        metapd->format_identifier == GF_M2TS_META_ID3 &&
 				        metapd->carriage_flag == METADATA_CARRIAGE_SAME_TS) {
 					/*HLS ID3 Metadata */
 					pmt->program->metadata_pointer_descriptor = metapd;
@@ -2203,9 +1220,6 @@
 					gf_m2ts_metadata_pointer_descriptor_del(metapd);
 				}
 			} else {
-#else
-			{
-#endif
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Skipping descriptor (0x%x) and others not supported\n", tag));
 			}
 			first_loop_len += 2 + len;
@@ -2230,12 +1244,76 @@
 		GF_M2TS_SECTION_ES *ses = NULL;
 		GF_M2TS_ES *es = NULL;
 		Bool inherit_pcr = 0;
+		Bool pmt_pid_reused = GF_FALSE;
 		u32 pid, stream_type, reg_desc_format;
 
+		if (pos + 5 > data_size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PMT! size %d but position %d and need at least 5 bytes to declare es\n", data_size, pos));
+			break;
+		}
+
 		stream_type = data[0];
 		pid = ((data[1] & 0x1f) << 8) | data[2];
 		desc_len = ((data[3] & 0xf) << 8) | data[4];
 
+		if (!pid) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID 0 for es descriptor in PMT of program %d, reserved for PAT\n", pmt->pid) );
+			break;
+		}
+		if (pid==1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID 1 for es descriptor in PMT of program %d, reserved for CAT\n", pmt->pid) );
+			break;
+		}
+
+		if (pid==pmt->pid) {
+			pmt_pid_reused = GF_TRUE;
+		} else {
+			u32 pcount = gf_list_count(ts->programs);
+			for(i=0; i<pcount; i++) {
+				GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
+				if(prog->pmt_pid == pid) {
+					pmt_pid_reused = GF_TRUE;
+					break;
+				}
+			}
+		}
+		if (pmt_pid_reused) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID %d for es descriptor in PMT of program %d, this PID is already assigned to a PMT\n", pid, pmt->pid) );
+			break;
+		}
+
+		if (desc_len > data_size-5) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PMT es descriptor size for PID %d\n", pid ) );
+			break;
+		}
+
+		if (!pid) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID 0 for es descriptor in PMT of program %d, reserved for PAT\n", pmt->pid) );
+			break;
+		}
+		if (pid==1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID 1 for es descriptor in PMT of program %d, reserved for CAT\n", pmt->pid) );
+			break;
+		}
+
+		if (pid==pmt->pid) {
+			pmt_pid_reused = GF_TRUE;
+		} else {
+			u32 pcount = gf_list_count(ts->programs);
+			for(i=0; i<pcount; i++) {
+				GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs,i);
+				if(prog->pmt_pid == pid) {
+					pmt_pid_reused = GF_TRUE;
+					break;
+				}
+			}
+		}
+
+		if (pmt_pid_reused) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Invalid PID %d for es descriptor in PMT of program %d, this PID is already assigned to a PMT\n", pid, pmt->pid) );
+			break;
+		}
+
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("stream_type :%d \n",stream_type));
 		switch (stream_type) {
 
@@ -2266,6 +1344,7 @@
 		case GF_M2TS_MHAS_AUX:
 		case GF_M2TS_SUBTITLE_DVB:
 		case GF_M2TS_METADATA_PES:
+		case 0xA1:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			if (!pes) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG2TS] Failed to allocate ES for pid %d\n", pid));
@@ -2369,63 +1448,81 @@
 		data += 5;
 
 		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));
+				break;
+			}
 			u8 tag = data[0];
 			u32 len = data[1];
+
+			if (pos + 2 + len > data_size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PMT descriptor! size %d, desc size %d but position %d\n", data_size, len, pos));
+				break;
+			}
+
 			if (es) {
 				switch (tag) {
 				case GF_M2TS_ISO_639_LANGUAGE_DESCRIPTOR:
-					pes->lang = GF_4CC(' ', data[2], data[3], data[4]);
+					if (pes && (len>=3) )
+						pes->lang = GF_4CC(' ', data[2], data[3], data[4]);
 					break;
 				case GF_M2TS_MPEG4_SL_DESCRIPTOR:
-#ifdef FORCE_DISABLE_MPEG4SL_OVER_MPEG2TS
-					es->mpeg4_es_id = es->pid;
-#else
-					es->mpeg4_es_id = ((data[2] & 0x1f) << 8) | data[3];
-#endif
-					es->flags |= GF_M2TS_ES_IS_SL;
+					if (len>=2) {
+						es->mpeg4_es_id = ( (u32) data[2] & 0x1f) << 8  | data[3];
+						es->flags |= GF_M2TS_ES_IS_SL;
+					}
 					break;
 				case GF_M2TS_REGISTRATION_DESCRIPTOR:
-					reg_desc_format = GF_4CC(data[2], data[3], data[4], data[5]);
-					/*cf http://www.smpte-ra.org/mpegreg/mpegreg.html*/
-					switch (reg_desc_format) {
-					case GF_MEDIA_STREAM_AC3:
-						es->stream_type = GF_M2TS_AUDIO_AC3;
-						break;
-					case GF_MEDIA_STREAM_VC1:
-						es->stream_type = GF_M2TS_VIDEO_VC1;
-						break;
-					default:
-						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Unknown registration descriptor %s\n", gf_4cc_to_str(reg_desc_format) ));
-						break;
+					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 */
+						switch (reg_desc_format) {
+						case GF_M2TS_RA_STREAM_AC3:
+							es->stream_type = GF_M2TS_AUDIO_AC3;
+							break;
+						case GF_M2TS_RA_STREAM_VC1:
+							es->stream_type = GF_M2TS_VIDEO_VC1;
+							break;
+						case GF_M2TS_RA_STREAM_GPAC:
+							if (len==8) {
+								es->stream_type = GF_4CC(data[6], data[7], data[8], data[9]);
+								es->flags |= GF_M2TS_GPAC_CODEC_ID;
+								break;
+							}
+						default:
+							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Unknown registration descriptor %s\n", gf_4cc_to_str(reg_desc_format) ));
+							break;
+						}
 					}
 					break;
 				case GF_M2TS_DVB_EAC3_DESCRIPTOR:
 					es->stream_type = GF_M2TS_AUDIO_EC3;
 					break;
 				case GF_M2TS_DVB_DATA_BROADCAST_ID_DESCRIPTOR:
-				{
-					u32 id = data[2]<<8 | data[3];
-					if ((id == 0xB) && ses && !ses->sec) {
-						ses->sec = gf_m2ts_section_filter_new(NULL, 1);
+					if (len>=2) {
+						u32 id = data[2]<<8 | data[3];
+						if ((id == 0xB) && ses && !ses->sec) {
+							ses->sec = gf_m2ts_section_filter_new(NULL, 1);
+						}
 					}
-				}
-				break;
+					break;
 				case GF_M2TS_DVB_SUBTITLING_DESCRIPTOR:
-					pes->sub.language[0] = data[2];
-					pes->sub.language[1] = data[3];
-					pes->sub.language[2] = data[4];
-					pes->sub.type = data[5];
-					pes->sub.composition_page_id = (data[6]<<8) | data[7];
-					pes->sub.ancillary_page_id = (data[8]<<8) | data[9];
-
+					if (pes && (len>=8)) {
+						pes->sub.language[0] = data[2];
+						pes->sub.language[1] = data[3];
+						pes->sub.language[2] = data[4];
+						pes->sub.type = data[5];
+						pes->sub.composition_page_id = (data[6]<<8) | data[7];
+						pes->sub.ancillary_page_id = (data[8]<<8) | data[9];
+					}
 					es->stream_type = GF_M2TS_DVB_SUBTITLE;
 					break;
 				case GF_M2TS_DVB_STREAM_IDENTIFIER_DESCRIPTOR:
-				{
-					es->component_tag = data[2];
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Component Tag: %d on Program %d\n", es->component_tag, es->program->number));
-				}
-				break;
+					if (len>=1) {
+						es->component_tag = data[2];
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Component Tag: %d on Program %d\n", es->component_tag, es->program->number));
+					}
+					break;
 				case GF_M2TS_DVB_TELETEXT_DESCRIPTOR:
 					es->stream_type = GF_M2TS_DVB_TELETEXT;
 					break;
@@ -2433,7 +1530,7 @@
 					es->stream_type = GF_M2TS_DVB_VBI;
 					break;
 				case GF_M2TS_HIERARCHY_DESCRIPTOR:
-					if (pes) {
+					if (pes && (len>=4)) {
 						u8 hierarchy_embedded_layer_index;
 						GF_BitStream *hbs = gf_bs_new((const char *)data, data_size, GF_BITSTREAM_READ);
 						/*u32 skip = */gf_bs_read_int(hbs, 16);
@@ -2461,8 +1558,8 @@
 					metadatad_bs = gf_bs_new((char *)data+2, len, GF_BITSTREAM_READ);
 					metad = gf_m2ts_read_metadata_descriptor(metadatad_bs, len);
 					gf_bs_del(metadatad_bs);
-					if (metad->application_format_identifier == GF_MEDIA_TYPE_ID3 &&
-					        metad->format_identifier == GF_MEDIA_TYPE_ID3) {
+					if (metad->application_format_identifier == GF_M2TS_META_ID3 &&
+					        metad->format_identifier == GF_M2TS_META_ID3) {
 						/*HLS ID3 Metadata */
 						if (pes) {
 							pes->metadata_descriptor = metad;
@@ -2489,7 +1586,6 @@
 			}
 			desc_len-=len+2;
 		}
-
 		if (es && !es->stream_type) {
 			gf_free(es);
 			es = NULL;
@@ -2536,14 +1632,14 @@
 			if (!(es->flags & GF_M2TS_ES_IS_SECTION) ) gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
 
 			nb_es++;
-		}
 
-		if (es->stream_type == GF_M2TS_VIDEO_HEVC) nb_hevc++;
-		else if (es->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL) nb_hevc_temp++;
-		else if (es->stream_type == GF_M2TS_VIDEO_SHVC) nb_shvc++;
-		else if (es->stream_type == GF_M2TS_VIDEO_SHVC_TEMPORAL) nb_shvc_temp++;
-		else if (es->stream_type == GF_M2TS_VIDEO_MHVC) nb_mhvc++;
-		else if (es->stream_type == GF_M2TS_VIDEO_MHVC_TEMPORAL) nb_mhvc_temp++;
+			if (es->stream_type == GF_M2TS_VIDEO_HEVC) nb_hevc++;
+			else if (es->stream_type == GF_M2TS_VIDEO_HEVC_TEMPORAL) nb_hevc_temp++;
+			else if (es->stream_type == GF_M2TS_VIDEO_SHVC) nb_shvc++;
+			else if (es->stream_type == GF_M2TS_VIDEO_SHVC_TEMPORAL) nb_shvc_temp++;
+			else if (es->stream_type == GF_M2TS_VIDEO_MHVC) nb_mhvc++;
+			else if (es->stream_type == GF_M2TS_VIDEO_MHVC_TEMPORAL) nb_mhvc_temp++;
+		}
 	}
 
 	//Table 2-139, implied hierarchy indexes
@@ -2577,8 +1673,6 @@
 	}
 
 	if (nb_es) {
-		u32 i;
-
 		//translate hierarchy descriptors indexes into PIDs - check whether the PMT-index rules are the same for HEVC
 		for (i=0; i<gf_list_count(pmt->program->streams); i++) {
 			GF_M2TS_PES *an_es = NULL;
@@ -2589,8 +1683,12 @@
 			//fixeme we are not always assured that hierarchy_layer_index matches the stream index...
 			//+1 is because our first stream is the PMT
 			an_es =  (GF_M2TS_PES *)gf_list_get(pmt->program->streams, es->depends_on_pid);
-			if (an_es)
+			if (an_es) {
 				es->depends_on_pid = an_es->pid;
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS] Wrong dependency index in hierarchy descriptor, assuming non-scalable stream\n"));
+				es->depends_on_pid = 0;
+			}
 		}
 
 		evt_type = (status&GF_M2TS_TABLE_FOUND) ? GF_M2TS_EVT_PMT_FOUND : GF_M2TS_EVT_PMT_UPDATE;
@@ -2648,7 +1746,9 @@
 			if (!ts->nit) {
 				ts->nit = gf_m2ts_section_filter_new(gf_m2ts_process_nit, 0);
 			}
-		} else {
+		} else if (!pid) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Broken PAT found reserved PID 0, ignoring\n", pid));
+		} else if (! ts->ess[pid]) {
 			GF_SAFEALLOC(prog, GF_M2TS_Program);
 			if (!prog) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Fail to allocate program for pid %d\n", pid));
@@ -2664,17 +1764,28 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Fail to allocate pmt filter for pid %d\n", pid));
 				return;
 			}
-			pmt->flags = GF_M2TS_ES_IS_SECTION;
+			pmt->flags = GF_M2TS_ES_IS_SECTION | GF_M2TS_ES_IS_PMT;
 			gf_list_add(prog->streams, pmt);
 			pmt->pid = prog->pmt_pid;
 			pmt->program = prog;
+/*			if (ts->ess[pmt->pid]) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("Redefinition of pmt for pid %d\n", pid));
+				gf_m2ts_es_del(ts->ess[pmt->pid], ts);
+			}
+*/
 			ts->ess[pmt->pid] = (GF_M2TS_ES *)pmt;
 			pmt->sec = gf_m2ts_section_filter_new(gf_m2ts_process_pmt, 0);
 		}
 	}
 
 	evt_type = (status&GF_M2TS_TABLE_UPDATE) ? GF_M2TS_EVT_PAT_UPDATE : GF_M2TS_EVT_PAT_FOUND;
-	if (ts->on_event) ts->on_event(ts, evt_type, NULL);
+	if (ts->on_event) {
+		GF_M2TS_SectionInfo sinfo;
+		sinfo.ex_table_id = ex_table_id;
+		sinfo.table_id = table_id;
+		sinfo.version_number = version_number;
+		ts->on_event(ts, evt_type, &sinfo);
+	}
 }
 
 static void gf_m2ts_process_cat(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *ses, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
@@ -2756,8 +1867,14 @@
 {
 	u32 has_pts, has_dts;
 	u32 len_check;
+
 	memset(pesh, 0, sizeof(GF_M2TS_PESHeader));
 
+	if (data_size < 6) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("PES Header is too small (%d < 6)\n", data_size));
+		return;
+	}
+
 	len_check = 0;
 
 	pesh->id = data[0];
@@ -2844,75 +1961,84 @@
 	GF_M2TS_PESHeader pesh;
 	if (!ts) return;
 
-	/*we need at least a full, valid start code !!*/
+	/*we need at least a full, valid start code and PES header !!*/
 	if ((pes->pck_data_len >= 4) && !pes->pck_data[0] && !pes->pck_data[1] && (pes->pck_data[2] == 0x1)) {
 		u32 len;
-		u32 stream_id = pes->pck_data[3] | 0x100;
+		Bool has_pes_header = GF_TRUE;
+		u32 stream_id = pes->pck_data[3];
 		Bool same_pts = GF_FALSE;
 
-		if ((stream_id >= 0x1c0 && stream_id <= 0x1df) ||
-			(stream_id >= 0x1e0 && stream_id <= 0x1ef) ||
-			(stream_id == 0x1bd) ||
-			(stream_id == 0x10d) ||
-			/*SL-packetized*/
-			((u8)pes->pck_data[3] == 0xfa)
-			) {
-		}
-		else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: unknown stream ID %08X\n", pes->pid, stream_id));
+		switch (stream_id) {
+		case GF_M2_STREAMID_PROGRAM_STREAM_MAP:
+		case GF_M2_STREAMID_PADDING:
+		case GF_M2_STREAMID_PRIVATE_2:
+		case GF_M2_STREAMID_ECM:
+		case GF_M2_STREAMID_EMM:
+		case GF_M2_STREAMID_PROGRAM_STREAM_DIRECTORY:
+		case GF_M2_STREAMID_DSMCC:
+		case GF_M2_STREAMID_H222_TYPE_E:
+			has_pes_header = GF_FALSE;
+			break;
 		}
 
+		if (has_pes_header) {
 
-		/*OK read header*/
-		gf_m2ts_pes_header(pes, pes->pck_data + 3, pes->pck_data_len - 3, &pesh);
+			/*OK read header*/
+			gf_m2ts_pes_header(pes, pes->pck_data + 3, pes->pck_data_len - 3, &pesh);
 
-		/*send PES timing*/
-		if (ts->notify_pes_timing) {
-			GF_M2TS_PES_PCK pck;
-			memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
-			pck.PTS = pesh.PTS;
-			pck.DTS = pesh.DTS;
-			pck.stream = pes;
-			if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
-			pes->pes_end_packet_number = ts->pck_number;
-			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PES_TIMING, &pck);
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d Got PES header DTS %d PTS %d\n", pes->pid, pesh.DTS, pesh.PTS));
+			/*send PES timing*/
+			if (ts->notify_pes_timing) {
+				GF_M2TS_PES_PCK pck;
+				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
+				pck.PTS = pesh.PTS;
+				pck.DTS = pesh.DTS;
+				pck.stream = pes;
+				if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
+				pes->pes_end_packet_number = ts->pck_number;
+				if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PES_TIMING, &pck);
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d Got PES header DTS %d PTS %d\n", pes->pid, pesh.DTS, pesh.PTS));
+
+			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));
+				}
+	#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
 
-		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));
+				pes->PTS = pesh.PTS;
+	#ifndef GPAC_DISABLE_LOG
+				{
+					if (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
+				pes->DTS = pesh.DTS;
 			}
-#ifndef GPAC_DISABLE_LOG
-			/*FIXME - this test should only be done for non bi-directionnally 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) );
+			/*no PTSs were coded, same time*/
+			else if (!pesh.hdr_data_len) {
+				same_pts = GF_TRUE;
 			}
-			*/
-#endif
 
-			pes->PTS = pesh.PTS;
-#ifndef GPAC_DISABLE_LOG
-			{
-				if (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
-			pes->DTS = pesh.DTS;
-		}
-		/*no PTSs were coded, same time*/
-		else if (!pesh.hdr_data_len) {
-			same_pts = GF_TRUE;
-		}
 
+			/*3-byte start-code + 6 bytes header + hdr extensions*/
+			len = 9 + pesh.hdr_data_len;
 
-		/*3-byte start-code + 6 bytes header + hdr extensions*/
-		len = 9 + pesh.hdr_data_len;
+		} else {
+			/*3-byte start-code + 1 byte streamid*/
+			len = 4;
+			memset(&pesh, 0, sizeof(pesh));
+		}
 
 		if ((u8) pes->pck_data[3]==0xfa) {
 			GF_M2TS_SL_PCK sl_pck;
@@ -2955,7 +2081,7 @@
 					ts->on_event(ts, GF_M2TS_EVT_TEMI_TIMECODE, &pes->temi_tc);
 			}
 
-			if (! ts->start_range)
+			if (! ts->seek_mode)
 				remain = pes->reframe(ts, pes, same_pts, pes->pck_data+offset, pes->pck_data_len-offset, &pesh);
 
 			//CLEANUP alloc stuff
@@ -3071,8 +2197,19 @@
 	}
 }
 
+void gf_m2ts_flush_all(GF_M2TS_Demuxer *ts)
+{
+	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);
+		}
+	}
+}
+
 
-static void gf_m2ts_get_adaptation_field(GF_M2TS_Demuxer *ts, GF_M2TS_AdaptationField *paf, unsigned char *data, u32 size, u32 pid)
+static void gf_m2ts_get_adaptation_field(GF_M2TS_Demuxer *ts, GF_M2TS_AdaptationField *paf, u8 *data, u32 size, u32 pid)
 {
 	unsigned char *af_extension;
 	paf->discontinuity_indicator = (data[0] & 0x80) ? 1 : 0;
@@ -3085,6 +2222,7 @@
 	paf->adaptation_field_extension_flag = (data[0] & 0x1) ? 1 : 0;
 
 	af_extension = data + 1;
+
 	if (paf->PCR_flag == 1) {
 		u32 base = (data[1] << 24) | (data[2] << 16) | (data[3] << 8) | data[4];
 		u64 PCR = (u64) base;
@@ -3107,11 +2245,15 @@
 			af_extension += 1 + priv_bytes;
 		}
 
+		if ((u32)(af_extension-data) >= size) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
+			return;
+		}
 		afext_bytes = af_extension[0];
-		ltw_flag = af_extension[1] & 0x80 ? 1 : 0;
-		pwr_flag = af_extension[1] & 0x40 ? 1 : 0;
-		seamless_flag = af_extension[1] & 0x20 ? 1 : 0;
-		af_desc_not_present = af_extension[1] & 0x10 ? 1 : 0;
+		ltw_flag = (af_extension[1] & 0x80) ? 1 : 0;
+		pwr_flag = (af_extension[1] & 0x40) ? 1 : 0;
+		seamless_flag = (af_extension[1] & 0x20) ? 1 : 0;
+		af_desc_not_present = (af_extension[1] & 0x10) ? 1 : 0;
 		af_extension += 2;
 		if (!afext_bytes) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Extension found\n", pid));
@@ -3309,12 +2451,30 @@
 	if (hdr.pid == GF_M2TS_PID_PAT) {
 		gf_m2ts_gather_section(ts, ts->pat, NULL, &hdr, data, payload_size);
 		return GF_OK;
-	} else if (hdr.pid == GF_M2TS_PID_CAT) {
+	}
+
+	es = ts->ess[hdr.pid];
+	//we work in split mode
+	if (ts->split_mode) {
+		GF_M2TS_TSPCK tspck;
+		//process PMT table
+		if (es && (es->flags & GF_M2TS_ES_IS_PMT)) {
+			GF_M2TS_SECTION_ES *ses = (GF_M2TS_SECTION_ES *)es;
+			if (ses->sec) gf_m2ts_gather_section(ts, ses->sec, ses, &hdr, data, payload_size);
+		}
+		//and forward every packet other than PAT
+		tspck.stream = es;
+		tspck.pid = hdr.pid;
+		tspck.data = data - pos;
+		ts->on_event(ts, GF_M2TS_EVT_PCK, &tspck);
+		return GF_OK;
+	}
+
+	if (hdr.pid == GF_M2TS_PID_CAT) {
 		gf_m2ts_gather_section(ts, ts->cat, NULL, &hdr, data, payload_size);
 		return GF_OK;
 	}
 
-	es = ts->ess[hdr.pid];
 	if (paf && paf->PCR_flag) {
 		if (!es) {
 			u32 i, j;
@@ -3393,9 +2553,12 @@
 				//ignore PCR discontinuity indicator if PCR found is larger than previously received PCR and diffence between PCR before and after discontinuity indicator is smaller than 50ms
 				else if ((diff_in_us > 0) && (diff < 200000)) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled but diff is small (diff %d us - PCR diff %d vs prev PCR diff %d) - ignore it\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
-				} else {
+				} else if (paf->discontinuity_indicator) {
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity signaled (diff %d us - PCR diff %d vs prev PCR diff %d)\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
 					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PCR discontinuity not signaled (diff %d us - PCR diff %d vs prev PCR diff %d)\n", hdr.pid, diff, diff_in_us, prev_diff_in_us));
+					pck.flags = GF_M2TS_PES_PCK_DISCONTINUITY;
 				}
 			}
 			else if ( (es->program->last_pcr_value < es->program->before_last_pcr_value) ) {
@@ -3417,7 +2580,6 @@
 			}
 
 			if (ts->on_event) {
-				gf_m2ts_estimate_duration(ts, es->program->last_pcr_value, hdr.pid);
 				ts->on_event(ts, GF_M2TS_EVT_PES_PCR, &pck);
 			}
 		}
@@ -3454,69 +2616,87 @@
 }
 
 GF_EXPORT
-GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, char *data, u32 data_size)
+GF_Err gf_m2ts_process_data(GF_M2TS_Demuxer *ts, u8 *data, u32 data_size)
 {
-	GF_Err e;
+	GF_Err e=GF_OK;
 	u32 pos, pck_size;
 	Bool is_align = 1;
-	if (ts->buffer) {
-		if (ts->alloc_size < ts->buffer_size+data_size) {
-			ts->alloc_size = ts->buffer_size+data_size;
-			ts->buffer = (char*)gf_realloc(ts->buffer, sizeof(char)*ts->alloc_size);
-		}
-		memcpy(ts->buffer + ts->buffer_size, data, sizeof(char)*data_size);
-		ts->buffer_size += data_size;
-		is_align = 0;
-	} else {
-		ts->buffer = data;
-		ts->buffer_size = data_size;
+
+	if (ts->buffer_size) {
+		//we are sync, copy remaining bytes
+		if ( (ts->buffer[0]==0x47) && (ts->buffer_size<200)) {
+			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);
+			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);
+		}
+		//not sync, copy over the complete buffer
+		else {
+			if (ts->alloc_size < ts->buffer_size+data_size) {
+				ts->alloc_size = ts->buffer_size+data_size;
+				ts->buffer = (char*)gf_realloc(ts->buffer, sizeof(char)*ts->alloc_size);
+			}
+			memcpy(ts->buffer + ts->buffer_size, data, sizeof(char)*data_size);
+			ts->buffer_size += data_size;
+			is_align = 0;
+			data = ts->buffer;
+			data_size = ts->buffer_size;
+		}
 	}
 
 	/*sync input data*/
-	pos = gf_m2ts_sync(ts, is_align);
-	if (pos==ts->buffer_size) {
+	pos = gf_m2ts_sync(ts, data, data_size, is_align);
+	if (pos==data_size) {
 		if (is_align) {
-			ts->buffer = (char*)gf_malloc(sizeof(char)*data_size);
+			if (ts->alloc_size<data_size) {
+				ts->buffer = (char*)gf_realloc(ts->buffer, sizeof(char)*data_size);
+				ts->alloc_size = data_size;
+			}
 			memcpy(ts->buffer, data, sizeof(char)*data_size);
-			ts->alloc_size = ts->buffer_size = data_size;
+			ts->buffer_size = data_size;
 		}
 		return GF_OK;
 	}
 	pck_size = ts->prefix_present ? 192 : 188;
-	e=GF_OK;
 	for (;;) {
 		/*wait for a complete packet*/
-		if (ts->buffer_size < pos  + pck_size) {
-			ts->buffer_size -= pos;
+		if (data_size < pos  + pck_size) {
+			ts->buffer_size = data_size - pos;
+			data += pos;
 			if (!ts->buffer_size) {
-				if (!is_align) gf_free(ts->buffer);
-				ts->buffer = NULL;
 				return e;
 			}
+			assert(ts->buffer_size<pck_size);
+
 			if (is_align) {
-				data = ts->buffer+pos;
-				ts->buffer = (char*)gf_malloc(sizeof(char)*ts->buffer_size);
+				u32 s = ts->buffer_size;
+				if (s<200) s = 200;
+
+				if (ts->alloc_size < s) {
+					ts->alloc_size = s;
+					ts->buffer = (char*)gf_realloc(ts->buffer, sizeof(char)*ts->alloc_size);
+				}
 				memcpy(ts->buffer, data, sizeof(char)*ts->buffer_size);
-				ts->alloc_size = ts->buffer_size;
 			} else {
-				memmove(ts->buffer, ts->buffer + pos, sizeof(char)*ts->buffer_size);
+				memmove(ts->buffer, data, sizeof(char)*ts->buffer_size);
 			}
 			return e;
 		}
 		/*process*/
-		e |= gf_m2ts_process_packet(ts, (unsigned char *)ts->buffer+pos);
+		e |= gf_m2ts_process_packet(ts, (unsigned char *)data + pos);
 		pos += pck_size;
-
-		if (ts->abort_parsing) {
-			if (!is_align) gf_free(ts->buffer);
-			ts->buffer = NULL;
-			return e;
-		}
 	}
 	return e;
 }
 
-GF_EXPORT
+//unused
+#if 0
 GF_ESD *gf_m2ts_get_esd(GF_M2TS_ES *es)
 {
 	GF_ESD *esd;
@@ -3550,7 +2730,6 @@
 
 	return esd;
 }
-
 void gf_m2ts_set_segment_switch(GF_M2TS_Demuxer *ts)
 {
 	u32 i;
@@ -3561,6 +2740,10 @@
 	}
 }
 
+
+#endif
+
+
 GF_EXPORT
 void gf_m2ts_reset_parsers_for_program(GF_M2TS_Demuxer *ts, GF_M2TS_Program *prog)
 {
@@ -3576,9 +2759,8 @@
 			gf_m2ts_section_filter_reset(ses->sec);
 		} else {
 			GF_M2TS_PES *pes = (GF_M2TS_PES *)es;
-			if (!pes || (pes->pid==pes->program->pmt_pid)) continue;
+			if (pes->pid==pes->program->pmt_pid) continue;
 			pes->cc = -1;
-			pes->frame_state = 0;
 			pes->pck_data_len = 0;
 			if (pes->prev_data) gf_free(pes->prev_data);
 			pes->prev_data = NULL;
@@ -3587,8 +2769,6 @@
 //			pes->prev_PTS = 0;
 //			pes->first_dts = 0;
 			pes->pes_len = pes->pes_end_packet_number = pes->pes_start_packet_number = 0;
-			if (pes->buf) gf_free(pes->buf);
-			pes->buf = NULL;
 			if (pes->temi_tc_desc) gf_free(pes->temi_tc_desc);
 			pes->temi_tc_desc = NULL;
 			pes->temi_tc_desc_len = pes->temi_tc_desc_alloc_size = 0;
@@ -3619,16 +2799,13 @@
 
 }
 
-static void gf_m2ts_process_section_discard(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *es, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
-{
-}
 
-GF_EXPORT
+#if 0 //unused
 u32 gf_m2ts_pes_get_framing_mode(GF_M2TS_PES *pes)
 {
 	if (pes->flags & GF_M2TS_ES_IS_SECTION) {
 		if (pes->flags & GF_M2TS_ES_IS_SL) {
-			if ( ((GF_M2TS_SECTION_ES *)pes)->sec->process_section == gf_m2ts_process_section_discard)
+			if ( ((GF_M2TS_SECTION_ES *)pes)->sec->process_section == NULL)
 				return GF_M2TS_PES_FRAMING_DEFAULT;
 
 		}
@@ -3638,12 +2815,13 @@
 	if (!pes->reframe ) return GF_M2TS_PES_FRAMING_SKIP_NO_RESET;
 	if (pes->reframe == gf_m2ts_reframe_default) return GF_M2TS_PES_FRAMING_RAW;
 	if (pes->reframe == gf_m2ts_reframe_reset) return GF_M2TS_PES_FRAMING_SKIP;
-	if (pes->single_nal_mode) return GF_M2TS_PES_FRAMING_DEFAULT_NAL;
 	return GF_M2TS_PES_FRAMING_DEFAULT;
 }
+#endif
+
 
 GF_EXPORT
-GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, u32 mode)
+GF_Err gf_m2ts_set_pes_framing(GF_M2TS_PES *pes, GF_M2TSPesFraming mode)
 {
 	if (!pes) return GF_BAD_PARAM;
 
@@ -3654,7 +2832,7 @@
 			if (mode==GF_M2TS_PES_FRAMING_DEFAULT) {
 				((GF_M2TS_SECTION_ES *)pes)->sec->process_section = gf_m2ts_process_mpeg4section;
 			} else {
-				((GF_M2TS_SECTION_ES *)pes)->sec->process_section = gf_m2ts_process_section_discard;
+				((GF_M2TS_SECTION_ES *)pes)->sec->process_section = NULL;
 			}
 		}
 		return GF_OK;
@@ -3669,6 +2847,8 @@
 			gf_m2ts_set_pes_framing(o_pes, GF_M2TS_PES_FRAMING_SKIP);
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] Reassinging PID %d from program %d to program %d\n", pes->pid, o_pes->program->number, pes->program->number) );
+		gf_m2ts_es_del((GF_M2TS_ES*)o_pes, pes->program->ts);
+
 		pes->program->ts->ess[pes->pid] = (GF_M2TS_ES *) pes;
 	}
 
@@ -3682,19 +2862,13 @@
 	case GF_M2TS_PES_FRAMING_SKIP_NO_RESET:
 		pes->reframe = NULL;
 		break;
-	case GF_M2TS_PES_FRAMING_DEFAULT_NAL:
 	case GF_M2TS_PES_FRAMING_DEFAULT:
 	default:
 		switch (pes->stream_type) {
 		case GF_M2TS_VIDEO_MPEG1:
 		case GF_M2TS_VIDEO_MPEG2:
-			pes->reframe = gf_m2ts_reframe_mpeg_video;
-			break;
 		case GF_M2TS_VIDEO_H264:
 		case GF_M2TS_VIDEO_SVC:
-			pes->reframe = gf_m2ts_reframe_avc_h264;
-			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
-			break;
 		case GF_M2TS_VIDEO_HEVC:
 		case GF_M2TS_VIDEO_HEVC_TEMPORAL:
 		case GF_M2TS_VIDEO_HEVC_MCTS:
@@ -3702,32 +2876,22 @@
 		case GF_M2TS_VIDEO_SHVC_TEMPORAL:
 		case GF_M2TS_VIDEO_MHVC:
 		case GF_M2TS_VIDEO_MHVC_TEMPORAL:
-			pes->reframe = gf_m2ts_reframe_hevc;
-			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
-			break;
-#ifndef GPAC_DISABLE_AV_PARSERS
 		case GF_M2TS_AUDIO_MPEG1:
 		case GF_M2TS_AUDIO_MPEG2:
-			pes->reframe = gf_m2ts_reframe_mpeg_audio;
-			break;
 		case GF_M2TS_AUDIO_AAC:
-			pes->reframe = gf_m2ts_reframe_aac_adts;
-			break;
 		case GF_M2TS_AUDIO_LATM_AAC:
-			pes->reframe = gf_m2ts_reframe_aac_latm;
-			break;
 		case GF_M2TS_AUDIO_AC3:
-			pes->reframe = gf_m2ts_reframe_ac3;
-			break;
 		case GF_M2TS_AUDIO_EC3:
-			pes->reframe = gf_m2ts_reframe_ec3;
+		case 0xA1:
+			//for all our supported codec types, use a reframer filter
+			pes->reframe = gf_m2ts_reframe_default;
 			break;
-#endif
 
 		case GF_M2TS_PRIVATE_DATA:
 			/* TODO: handle DVB subtitle streams */
 			break;
 		case GF_M2TS_METADATA_ID3_HLS:
+			//TODO
 			pes->reframe = gf_m2ts_reframe_id3_pes;
 			break;
 		default:
@@ -3760,47 +2924,22 @@
 	gf_dvb_mpe_init(ts);
 #endif
 
-	ts->requested_progs = gf_list_new();
-	ts->requested_pids = gf_list_new();
-	ts->demux_and_play = 0;
 	ts->nb_prog_pmt_received = 0;
 	ts->ChannelAppList = gf_list_new();
-	ts->udp_buffer_size = GF_M2TS_UDP_BUFFER_SIZE;
-
 	return ts;
 }
 
 GF_EXPORT
-void gf_m2ts_abort_parsing(GF_M2TS_Demuxer *ts, Bool force_reset_pes)
-{
-	u32 i, j, count, count2;
-
-	if (force_reset_pes) {
-		count = gf_list_count(ts->programs);
-		for (i=0; i<count; i++) {
-			GF_M2TS_Program *prog = (GF_M2TS_Program *)gf_list_get(ts->programs, i);
-			count2 = gf_list_count(prog->streams);
-			for (j=0; j<count2; j++) {
-				GF_M2TS_PES *pes = (GF_M2TS_PES *)gf_list_get(prog->streams, j);
-				if (pes)
-					pes->pck_data_len = 0;
-			}
-		}
-	}
-	ts->abort_parsing = GF_TRUE;
-}
-
-GF_EXPORT
 void gf_m2ts_demux_dmscc_init(GF_M2TS_Demuxer *ts) {
 
-	char* temp_dir;
+	char temp_dir[GF_MAX_PATH];
 	u32 length;
 	GF_Err e;
 
 	ts->dsmcc_controler = gf_list_new();
 	ts->process_dmscc = 1;
 
-	temp_dir = gf_get_default_cache_directory();
+	strcpy(temp_dir, gf_get_default_cache_directory() );
 	length = (u32) strlen(temp_dir);
 	if(temp_dir[length-1] == GF_PATH_SEPARATOR) {
 		temp_dir[length-1] = 0;
@@ -3828,12 +2967,20 @@
 
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
 		//bacause of pure PCR streams, en ES might be reassigned on 2 PIDs, one for the ES and one for the PCR
-		if (ts->ess[i] && (ts->ess[i]->pid==i)) gf_m2ts_es_del(ts->ess[i], ts);
+		if (ts->ess[i] && (ts->ess[i]->pid==i)) {
+			gf_m2ts_es_del(ts->ess[i], ts);
+		}
 	}
 	if (ts->buffer) gf_free(ts->buffer);
 	while (gf_list_count(ts->programs)) {
 		GF_M2TS_Program *p = (GF_M2TS_Program *)gf_list_last(ts->programs);
 		gf_list_rem_last(ts->programs);
+
+		while (gf_list_count(p->streams)) {
+			GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_last(p->streams);
+			gf_list_rem_last(p->streams);
+			gf_m2ts_es_del(es, ts);
+		}
 		gf_list_del(p->streams);
 		/*reset OD list*/
 		if (p->additional_ods) {
@@ -3841,6 +2988,7 @@
 			gf_list_del(p->additional_ods);
 		}
 		if (p->pmt_iod) gf_odf_desc_del((GF_Descriptor *)p->pmt_iod);
+		if (p->metadata_pointer_descriptor)	gf_m2ts_metadata_pointer_descriptor_del(p->metadata_pointer_descriptor);
 		gf_free(p);
 	}
 	gf_list_del(ts->programs);
@@ -3854,16 +3002,19 @@
 	gf_dvb_mpe_shutdown(ts);
 #endif
 
-	if(gf_list_count(ts->dsmcc_controler)) {
+	if (ts->dsmcc_controler) {
+		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_rmdir(dsmcc_overlord->root_dir);
-		gf_m2ts_delete_dsmcc_overlord(dsmcc_overlord);
-		if(ts->dsmcc_root_dir) {
-			gf_free(ts->dsmcc_root_dir);
-		}
+			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_rmdir(dsmcc_overlord->root_dir);
+			gf_m2ts_delete_dsmcc_overlord(dsmcc_overlord);
+			if(ts->dsmcc_root_dir) {
+				gf_free(ts->dsmcc_root_dir);
+			}
 #endif
+		}
+		gf_list_del(ts->dsmcc_controler);
 	}
 
 	while(gf_list_count(ts->ChannelAppList)) {
@@ -3875,776 +3026,73 @@
 	}
 	gf_list_del(ts->ChannelAppList);
 
-	if (ts->requested_progs) {
-		assert(!gf_list_count(ts->requested_progs));
-		gf_list_del(ts->requested_progs);
-	}
-
-	if (ts->requested_pids) {
-		assert(!gf_list_count(ts->requested_pids));
-		gf_list_del(ts->requested_pids);
-	}
-
-	if (ts->th)
-		gf_th_del(ts->th);
-
-	if (ts->socket_url) gf_free(ts->socket_url);
+	if (ts->dsmcc_root_dir) gf_free(ts->dsmcc_root_dir);
 	gf_free(ts);
 }
 
+#if 0//unused
 void gf_m2ts_print_info(GF_M2TS_Demuxer *ts)
 {
 #ifdef GPAC_ENABLE_MPE
 	gf_m2ts_print_mpe_info(ts);
 #endif
 }
-
-GF_EXPORT
-void gf_m2ts_pause_demux(GF_M2TS_Demuxer *ts, Bool do_pause)
-{
-	if (ts) ts->paused = do_pause;
-}
-
-GF_EXPORT
-GF_Err gf_m2ts_demux_file(GF_M2TS_Demuxer *ts, const char *fileName, u64 start_byterange, u64 end_byterange, u32 refresh_type, Bool signal_end_of_stream)
-{
-	u32 i;
-	GF_Err e;
-	u32 size;
-	u64 read;
-	GF_BitStream *bs = NULL;
-	FILE *f = NULL;
-
-	//force EOS signaing
-	if (!fileName) {
-		if (!signal_end_of_stream) return GF_BAD_PARAM;
-		ts->pos_in_stream = 0;
-	}
-	else if (fileName && !strnicmp(fileName, "gmem://", 7)) {
-		void *mem_address;
-		u32 remain;
-		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", fileName));
-			return GF_URL_ERROR;
-		}
-		if (refresh_type==0)
-			ts->pos_in_stream = 0;
-
-		//resume where we left
-		mem_address = (u8 *) mem_address + ts->pos_in_stream;
-		size -= (u32) ts->pos_in_stream;
-
-		remain = (size % 188);
-		size -= remain;
-
-		/*process chunk*/
-		ts->abort_parsing = GF_FALSE;
-		/*e = */gf_m2ts_process_data(ts, mem_address, size);
-
-		if (refresh_type==2)
-			ts->pos_in_stream = 0;
-		else
-			ts->pos_in_stream += size;
-
-	} else if (fileName) {
-		char data[188000];
-
-		f = gf_fopen(fileName, "rb");
-
-		if (!f) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", fileName));
-			return GF_URL_ERROR;
-		}
-		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
-
-		if (refresh_type) {
-			if (ts->pos_in_stream) {
-				gf_bs_seek(bs, ts->pos_in_stream);
-			}
-		} else {
-			if (start_byterange) {
-				gf_bs_seek(bs, start_byterange);
-			}
-		}
-		read = 0;
-		ts->abort_parsing = GF_FALSE;
-		while (1) {
-			u32 to_read = 188000;
-			Bool done = 0;
-			u64 avail = gf_bs_available(bs);
-
-			if (avail < 188)
-				break;
-
-			if (end_byterange && (read + to_read > end_byterange)) {
-				to_read = (u32) (end_byterange - read);
-				done = 1;
-			}
-			if (to_read > avail) {
-				u32 skip = avail % 188;
-				to_read = (u32) (avail - skip);
-				done = 1;
-			}
-			size = gf_bs_read_data(bs, data, to_read);
-			if (size) {
-				e = gf_m2ts_process_data(ts, data, size);
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Error %s while demuxing %s\n", gf_error_to_string(e), fileName));
-				}
-			}
-			read += size;
-			if (done) break;
-			if (ts->abort_parsing)
-				break;
-		}
-
-		if ((refresh_type==2) || !gf_bs_available(bs)) {
-			ts->pos_in_stream = 0;
-		} else {
-			ts->pos_in_stream = gf_bs_get_position(bs);
-		}
-
-		gf_bs_del(bs);
-		gf_fclose(f);
-		ts->abort_parsing = GF_FALSE;
-	}
-
-	if (signal_end_of_stream && !ts->pos_in_stream) {
-		for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-			if (ts->ess[i]) {
-				if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
-					gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
-					ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
-				}
-			}
-		}
-	}
-	return GF_OK;
-}
-
-
-static u32 gf_m2ts_demuxer_run(void *_p)
-{
-	u32 i;
-	GF_Err e;
-	u32 size;
-	GF_M2TS_Demuxer *ts = _p;
-	char *data = gf_malloc(ts->udp_buffer_size);
-
-	gf_m2ts_reset_parsers(ts);
-	ts->abort_parsing = GF_FALSE;
-
-	//recreate the socket if needed
-	if (ts->socket_url && !ts->sock) {
-		gf_m2ts_get_socket(ts->socket_url, ts->network_type, ts->udp_buffer_size, &ts->sock);
-	}
-
-#ifdef GPAC_HAS_LINUX_DVB
-	if (ts->tuner) {
-		s32 ts_size;
-		// in case of DVB
-		while (ts->run_state) {
-			if (ts->paused) {
-				gf_sleep(1);
-				continue;
-			}
-
-			ts_size = read(ts->tuner->ts_fd, data, ts->udp_buffer_size);
-			if (ts_size>0) gf_m2ts_process_data(ts, data, (u32) ts_size);
-		}
-	} else
-#endif
-		if (ts->sock) {
-#ifndef GPAC_DISABLE_STREAMING
-			u16 seq_num;
-			GF_RTPReorder *ch = NULL;
-#endif
-			u32 nb_empty=0;
-			Bool first_run, is_rtp;
-			FILE *record_to = NULL;
-			if (ts->record_to)
-				record_to = gf_fopen(ts->record_to, "wb");
-
-			first_run = 1;
-			is_rtp = 0;
-			while (ts->run_state) {
-				if (ts->paused) {
-					gf_sleep(1);
-					continue;
-				}
-				size = 0;
-				/*m2ts chunks by chunks*/
-				e = gf_sk_receive(ts->sock, data, ts->udp_buffer_size, 0, &size);
-				if (!size || e) {
-					nb_empty++;
-					if (nb_empty==1000) {
-						gf_sleep(1);
-						nb_empty=0;
-					}
-					continue;
-				}
-				if (first_run) {
-					first_run = 0;
-					/*FIXME: we assume only simple RTP packaging (no CSRC nor extensions)*/
-					if ((data[0] != 0x47) && ((data[1] & 0x7F) == 33) ) {
-						is_rtp = 1;
-#ifndef GPAC_DISABLE_STREAMING
-						ch = gf_rtp_reorderer_new(100, 500);
-#endif
-					}
-				}
-				/*process chunk*/
-				if (is_rtp) {
-#ifndef GPAC_DISABLE_STREAMING
-					char *pck;
-					seq_num = ((data[2] << 8) & 0xFF00) | (data[3] & 0xFF);
-					gf_rtp_reorderer_add(ch, (void *) data, size, seq_num);
-
-					pck = (char *) gf_rtp_reorderer_get(ch, &size);
-					if (pck) {
-						gf_m2ts_process_data(ts, pck+12, size-12);
-						if (record_to)
-							fwrite(data+12, size-12, 1, record_to);
-						gf_free(pck);
-					}
-#else
-					gf_m2ts_process_data(ts, data+12, size-12);
-					if (record_to)
-						fwrite(data+12, size-12, 1, record_to);
-#endif
-
-				} else {
-					gf_m2ts_process_data(ts, data, size);
-					if (record_to)
-						fwrite(data, size, 1, record_to);
-				}
-			}
-			if (record_to)
-				gf_fclose(record_to);
-
-#ifndef GPAC_DISABLE_STREAMING
-			if (ch)
-				gf_rtp_reorderer_del(ch);
 #endif
 
-			if (ts->sock && !ts->sock_is_delegate) gf_sk_del(ts->sock);
-			ts->sock = NULL;
-		} else if (ts->dnload) {
-			while (ts->run_state) {
-				gf_dm_sess_process(ts->dnload);
-				gf_sleep(1);
-			}
-		} else {
-			u32 pos = 0;
-			GF_BitStream *ts_bs = NULL;
-
-			if (ts->file)
-				ts_bs = gf_bs_from_file(ts->file, GF_BITSTREAM_READ);
-			else
-				ts_bs = gf_bs_new(ts->ts_data_chunk, ts->ts_data_chunk_size, GF_BITSTREAM_READ);
-
-			gf_bs_seek(ts_bs, 0);
-
-			while (ts->run_state && gf_bs_available(ts_bs) && !ts->force_file_refresh) {
-
-				if (ts->paused) {
-					gf_sleep(1);
-					continue;
-				}
-
-				if (ts->start_range && ts->duration) {
-					Double perc = ts->start_range / (1000 * ts->duration);
-					pos = (u32) (s64) (perc * ts->file_size);
-					/*align to TS packet size*/
-					pos/=188;
-					pos*=188;
-
-					if (pos>=ts->file_size) {
-						pos = 0;
-					}
-					ts->start_range = 0;
-					gf_bs_seek(ts_bs, pos);
-				}
-
-				/*m2ts chunks by chunks*/
-				size = gf_bs_read_data(ts_bs, data, 188);
-				if (!size && (ts->loop_demux == 1)) {
-					gf_bs_seek(ts_bs, pos);
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] Loop \n"));
-					size = gf_bs_read_data(ts_bs, data, 188);
-				}
-				if (!size) break;
-				if (size != 188) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[M2TS In] %u bytes read from file instead of 188.\n", size));
-				}
-				/*process chunk*/
-				gf_m2ts_process_data(ts, data, size);
-
-				ts->nb_pck++;
-
-				if (!gf_bs_available(ts_bs) && ts->loop_demux == 1) {
-					gf_bs_seek(ts_bs, pos);
-					GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] Loop \n"));
-					gf_sleep(3000);
-				}
-			}
-			ts->force_file_refresh = 0;
-
-			if (ts_bs) {
-				/*pos = (u32) gf_bs_get_position(ts_bs);*/
-				gf_bs_del(ts_bs);
-				ts_bs = NULL;
-			}
-		}
-
-	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
-		if (ts->ess[i]) {
-			if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
-				gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
-				ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
-			}
-		}
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TSDemux] EOS reached\n"));
-
-	ts->run_state = 2;
-	gf_free(data);
-	return 0;
-}
-
-
-GF_EXPORT
-GF_Err gf_m2ts_get_socket(const char *url, const char *mcast_ifce_or_mobileip, u32 buf_size, GF_Socket **out_socket)
+#define M2TS_PROBE_SIZE	188000
+static Bool gf_m2ts_probe_buffer(char *buf, u32 size)
 {
-	char *str;
-	u16 port;
 	GF_Err e;
-	u32 sock_type = 0;
-
-	*out_socket=NULL;
-
-	if (!strnicmp(url, "udp://", 6) || !strnicmp(url, "mpegts-udp://", 13)) {
-		sock_type = GF_SOCK_TYPE_UDP;
-	} else if (!strnicmp(url, "mpegts-tcp://", 13) ) {
-		sock_type = GF_SOCK_TYPE_TCP;
-	} else {
-		return GF_NOT_SUPPORTED;
-	}
-
-	url = strchr(url, ':');
-	url += 3;
-
-	*out_socket = gf_sk_new(sock_type);
-	if (! (*out_socket) ) {
-		return GF_IO_ERR;
-	}
-
-	/*setup port and src*/
-	port = 1234;
-	str = strrchr(url, ':');
-	/*take care of IPv6 address*/
-	if (str && strchr(str, ']')) str = strchr(url, ':');
-	if (str) {
-		port = atoi(str+1);
-		str[0] = 0;
-	}
-
-	/*do we have a source ?*/
-	if (strlen(url) && strcmp(url, "localhost") ) {
-		if (gf_sk_is_multicast_address(url)) {
-			e = gf_sk_setup_multicast(*out_socket, url, port, 0, 0, (char*)mcast_ifce_or_mobileip);
-		} else {
-			e = gf_sk_bind(*out_socket, (char*)mcast_ifce_or_mobileip, port, url, 0, GF_SOCK_REUSE_PORT);
-		}
-		if (e) {
-			gf_sk_del(*out_socket);
-			*out_socket = NULL;
-			return e;
-		}
-	}
-	if (str) str[0] = ':';
-
-	gf_sk_set_buffer_size(*out_socket, 0, buf_size);
-	gf_sk_set_block_mode(*out_socket, 0);
-	return GF_OK;
-}
-
-static GF_Err gf_m2ts_demuxer_setup_live(GF_M2TS_Demuxer *ts, char *url)
-{
-	if (!strnicmp(url, "mpegts-sk://", 12)) {
-		sscanf(url, "mpegts-sk://%p", &ts->sock);
-		ts->sock_is_delegate = GF_TRUE;
-	} else {
-		GF_Err e;
-		e = gf_m2ts_get_socket(url, ts->network_type, ts->udp_buffer_size, &ts->sock);
-		if (e) return e;
-	}
-
-	if (ts->socket_url) gf_free(ts->socket_url);
-	ts->socket_url = gf_strdup(url);
-
-	//gf_th_set_priority(ts->th, GF_THREAD_PRIORITY_HIGHEST);
-	return gf_m2ts_demuxer_play(ts);
-
-}
-
-#ifdef GPAC_HAS_LINUX_DVB
-
-static GF_Err gf_dvb_tune(GF_Tuner *tuner, const char *url, const char *chan_path) {
-	struct dmx_pes_filter_params pesFilterParams;
-	struct dvb_frontend_parameters frp;
-	int demux1, front1;
-	FILE *chanfile;
-	char line[255], chan_name_t[255];
-	char freq_str[255], inv[255], bw[255], lcr[255], hier[255], cr[255],
-	     mod[255], transm[255], gi[255], apid_str[255], vpid_str[255];
-	const char *chan_conf = ":%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:%255[^:]:";
-	char *chan_name;
-	char *tmp;
-	char frontend_name[100], demux_name[100], dvr_name[100];
-	u32 adapter_num;
-
-	chanfile = gf_fopen(chan_path, "r");
-	if (!chanfile) return GF_BAD_PARAM;
-
-	chan_name = (char *) url+6; // 6 = strlen("dvb://")
-
-	// support for multiple frontends
-	tmp = strchr(chan_name, '@');
-	if (tmp) {
-		adapter_num = atoi(tmp+1);
-		tmp[0] = 0;
-	} else {
-		adapter_num = 0;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Channel name %s\n", chan_name));
-
-	while(!feof(chanfile)) {
-		if ( fgets(line, 255, chanfile) != NULL) {
-			if (line[0]=='#') continue;
-			if (line[0]=='\r') continue;
-			if (line[0]=='\n') continue;
-
-			strncpy(chan_name_t, line, index(line, ':')-line);
-			if (strncmp(chan_name,chan_name_t,strlen(chan_name))==0) {
-				sscanf(strstr(line,":"), chan_conf, freq_str, inv, bw, lcr, cr, mod, transm, gi, hier, apid_str, vpid_str);
-				tuner->freq = (uint32_t) atoi(freq_str);
-				tuner->apid = (uint16_t) atoi(apid_str);
-				tuner->vpid = (uint16_t) atoi(vpid_str);
-				//Inversion
-				if(! strcmp(inv, "INVERSION_ON")) tuner->specInv = INVERSION_ON;
-				else if(! strcmp(inv, "INVERSION_OFF")) tuner->specInv = INVERSION_OFF;
-				else tuner->specInv = INVERSION_AUTO;
-				//LP Code Rate
-				if(! strcmp(lcr, "FEC_1_2")) tuner->LP_CodeRate =FEC_1_2;
-				else if(! strcmp(lcr, "FEC_2_3")) tuner->LP_CodeRate =FEC_2_3;
-				else if(! strcmp(lcr, "FEC_3_4")) tuner->LP_CodeRate =FEC_3_4;
-				else if(! strcmp(lcr, "FEC_4_5")) tuner->LP_CodeRate =FEC_4_5;
-				else if(! strcmp(lcr, "FEC_6_7")) tuner->LP_CodeRate =FEC_6_7;
-				else if(! strcmp(lcr, "FEC_8_9")) tuner->LP_CodeRate =FEC_8_9;
-				else if(! strcmp(lcr, "FEC_5_6")) tuner->LP_CodeRate =FEC_5_6;
-				else if(! strcmp(lcr, "FEC_7_8")) tuner->LP_CodeRate =FEC_7_8;
-				else if(! strcmp(lcr, "FEC_NONE")) tuner->LP_CodeRate =FEC_NONE;
-				else tuner->LP_CodeRate =FEC_AUTO;
-				//HP Code Rate
-				if(! strcmp(cr, "FEC_1_2")) tuner->HP_CodeRate =FEC_1_2;
-				else if(! strcmp(cr, "FEC_2_3")) tuner->HP_CodeRate =FEC_2_3;
-				else if(! strcmp(cr, "FEC_3_4")) tuner->HP_CodeRate =FEC_3_4;
-				else if(! strcmp(cr, "FEC_4_5")) tuner->HP_CodeRate =FEC_4_5;
-				else if(! strcmp(cr, "FEC_6_7")) tuner->HP_CodeRate =FEC_6_7;
-				else if(! strcmp(cr, "FEC_8_9")) tuner->HP_CodeRate =FEC_8_9;
-				else if(! strcmp(cr, "FEC_5_6")) tuner->HP_CodeRate =FEC_5_6;
-				else if(! strcmp(cr, "FEC_7_8")) tuner->HP_CodeRate =FEC_7_8;
-				else if(! strcmp(cr, "FEC_NONE")) tuner->HP_CodeRate =FEC_NONE;
-				else tuner->HP_CodeRate =FEC_AUTO;
-				//Modulation
-				if(! strcmp(mod, "QAM_128")) tuner->modulation = QAM_128;
-				else if(! strcmp(mod, "QAM_256")) tuner->modulation = QAM_256;
-				else if(! strcmp(mod, "QAM_64")) tuner->modulation = QAM_64;
-				else if(! strcmp(mod, "QAM_32")) tuner->modulation = QAM_32;
-				else if(! strcmp(mod, "QAM_16")) tuner->modulation = QAM_16;
-				//Bandwidth
-				if(! strcmp(bw, "BANDWIDTH_6_MHZ")) tuner->bandwidth = BANDWIDTH_6_MHZ;
-				else if(! strcmp(bw, "BANDWIDTH_7_MHZ")) tuner->bandwidth = BANDWIDTH_7_MHZ;
-				else if(! strcmp(bw, "BANDWIDTH_8_MHZ")) tuner->bandwidth = BANDWIDTH_8_MHZ;
-				//Transmission Mode
-				if(! strcmp(transm, "TRANSMISSION_MODE_2K")) tuner->TransmissionMode = TRANSMISSION_MODE_2K;
-				else if(! strcmp(transm, "TRANSMISSION_MODE_8K")) tuner->TransmissionMode = TRANSMISSION_MODE_8K;
-				//Guard Interval
-				if(! strcmp(gi, "GUARD_INTERVAL_1_32")) tuner->guardInterval = GUARD_INTERVAL_1_32;
-				else if(! strcmp(gi, "GUARD_INTERVAL_1_16")) tuner->guardInterval = GUARD_INTERVAL_1_16;
-				else if(! strcmp(gi, "GUARD_INTERVAL_1_8")) tuner->guardInterval = GUARD_INTERVAL_1_8;
-				else tuner->guardInterval = GUARD_INTERVAL_1_4;
-				//Hierarchy
-				if(! strcmp(hier, "HIERARCHY_1")) tuner->hierarchy = HIERARCHY_1;
-				else if(! strcmp(hier, "HIERARCHY_2")) tuner->hierarchy = HIERARCHY_2;
-				else if(! strcmp(hier, "HIERARCHY_4")) tuner->hierarchy = HIERARCHY_4;
-				else if(! strcmp(hier, "HIERARCHY_AUTO")) tuner->hierarchy = HIERARCHY_AUTO;
-				else tuner->hierarchy = HIERARCHY_NONE;
-
-				break;
-			}
-		}
-	}
-	gf_fclose(chanfile);
-
-	sprintf(frontend_name, "/dev/dvb/adapter%d/frontend0", adapter_num);
-	sprintf(demux_name, "/dev/dvb/adapter%d/demux0", adapter_num);
-	sprintf(dvr_name, "/dev/dvb/adapter%d/dvr0", adapter_num);
-
-	// 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));
-		return GF_IO_ERR;
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("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));
-		return GF_IO_ERR;
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Demux %s opened.\n", demux_name));
-	}
-	// Set FrontendParameters - DVB-T
-	frp.frequency = tuner->freq;
-	frp.inversion = tuner->specInv;
-	frp.u.ofdm.bandwidth = tuner->bandwidth;
-	frp.u.ofdm.code_rate_HP = tuner->HP_CodeRate;
-	frp.u.ofdm.code_rate_LP = tuner->LP_CodeRate;
-	frp.u.ofdm.constellation = tuner->modulation;
-	frp.u.ofdm.transmission_mode = tuner->TransmissionMode;
-	frp.u.ofdm.guard_interval = tuner->guardInterval;
-	frp.u.ofdm.hierarchy_information = tuner->hierarchy;
-	// Set frontend
-	if (ioctl(front1, FE_SET_FRONTEND, &frp) < 0) {
-		return GF_IO_ERR;
-	}
-	// Set dumex
-	pesFilterParams.pid      = 0x2000;				// Linux-DVB API take PID=2000 for FULL/RAW TS flag
-	pesFilterParams.input    = DMX_IN_FRONTEND;
-	pesFilterParams.output   = DMX_OUT_TS_TAP;
-	pesFilterParams.pes_type = DMX_PES_OTHER;
-	pesFilterParams.flags    = DMX_IMMEDIATE_START;
-	if (ioctl(demux1, DMX_SET_PES_FILTER, &pesFilterParams) < 0) {
-		return GF_IO_ERR;
-	}
-	/* The following code differs from mplayer and alike because the device is opened in blocking mode */
-	if ((tuner->ts_fd = open(dvr_name, O_RDONLY/*|O_NONBLOCK*/)) < 0) {
-		return GF_IO_ERR;
-	}
-	return GF_OK;
-}
-
-GF_EXPORT
-u32 gf_dvb_get_freq_from_url(const char *channels_config_path, const char *url)
-{
-	FILE *channels_config_file;
-	char line[255], *tmp, *channel_name;
-
-	u32 freq;
-
-	/* get rid of trailing @ */
-	tmp = strchr(url, '@');
-	if (tmp) tmp[0] = 0;
-
-	channel_name = (char *)url+6;
-
-	channels_config_file = gf_fopen(channels_config_path, "r");
-	if (!channels_config_file) return GF_BAD_PARAM;
-
-	freq = 0;
-	while(!feof(channels_config_file)) {
-		if ( fgets(line, 255, channels_config_file) != NULL) {
-			if (line[0]=='#') continue;
-			if (line[0]=='\r') continue;
-			if (line[0]=='\n') continue;
-
-			tmp = strchr(line, ':');
-			tmp[0] = 0;
-			if (!strcmp(line, channel_name)) {
-				char *tmp2;
-				tmp++;
-				tmp2 = strchr(tmp, ':');
-				if (tmp2) tmp2[0] = 0;
-				freq = (u32)atoi(tmp);
-				break;
-			}
-		}
-	}
-	return freq;
-}
-
-GF_Err gf_m2ts_demuxer_setup_dvb(GF_M2TS_Demuxer *ts, const char *url)
-{
-	GF_Err e = GF_OK;
-
-	if (! ts->dvb_channels_conf_path) return GF_BAD_PARAM;
-
-	if (strnicmp(url, "dvb://", 6)) return GF_NOT_SUPPORTED;
-
-	if (!ts->tuner) GF_SAFEALLOC(ts->tuner, GF_Tuner);
-
-	if (ts->tuner->freq != 0 && ts->tuner->freq == gf_dvb_get_freq_from_url(ts->dvb_channels_conf_path, url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Tuner already tuned to that frequency\n"));
-		return GF_OK;
-	}
-
-	e = gf_dvb_tune(ts->tuner, url, ts->dvb_channels_conf_path);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Unable to tune to frequency\n"));
-		return GF_SERVICE_ERROR;
-	}
-
-	return  gf_m2ts_demuxer_play(ts);
-}
-
-#endif
-
-static GF_Err gf_m2ts_demuxer_setup_file(GF_M2TS_Demuxer *ts, char *url)
-{
-	if (url) {
-		if (ts->file && !strcmp(ts->filename, url)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] TS file already being processed: %s\n", url));
-			return GF_IO_ERR;
-		}
-		strcpy(ts->filename, url);
-
-		if (!strncmp(url, "gmem://", 7)) {
-			u32 size;
-			void *mem_address;
-			if (sscanf(url, "gmem://%d@%p", &size, &mem_address) != 2)
-				return GF_IO_ERR;
-			ts->ts_data_chunk_size = size;
-			ts->ts_data_chunk = mem_address;
-		} else {
-
-			ts->file = gf_fopen(url, "rb");
-			if (!ts->file) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[TSDemux] Could not open TS file: %s\n", url));
-				return GF_IO_ERR;
-			}
-			strcpy(ts->filename, url);
-
-			gf_fseek(ts->file, 0, SEEK_END);
-			ts->file_size = gf_ftell(ts->file);
-			gf_fseek(ts->file, 0, SEEK_SET);
-		}
-	}
-
-	/* reinitialization for seek */
-	ts->end_range = ts->start_range = 0;
-	return  gf_m2ts_demuxer_play(ts);
-
-}
-
-GF_EXPORT
-GF_Err gf_m2ts_demuxer_setup(GF_M2TS_Demuxer *ts, const char *url, Bool loop)
-{
-	char szURL[2048];
-	char *frag;
-	ts->duration = 0;
-
-	if(loop == 1) {
-		ts->loop_demux = 1;
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Loop Mode activated \n"));
-	}
-
-	if (!url) {
-		return gf_m2ts_demuxer_setup_file(ts, NULL);
-	}
-
-	strcpy(szURL, url);
-	frag = strrchr(szURL, '#');
-	if (frag) frag[0] = 0;
-
-	if (!strnicmp(url, "udp://", 6)
-	        || !strnicmp(url, "mpegts-udp://", 13)
-	        || !strnicmp(url, "mpegts-tcp://", 13)
-	        || !strnicmp(url, "mpegts-sk://", 12)
-	   ) {
-		return gf_m2ts_demuxer_setup_live(ts, (char *) szURL);
-	}
-#ifdef GPAC_HAS_LINUX_DVB
-	else if (!strnicmp(url, "dvb://", 6)) {
-		return gf_m2ts_demuxer_setup_dvb(ts, (char *) szURL);
-	}
-#endif
-	else {
-		return gf_m2ts_demuxer_setup_file(ts, (char *) szURL);
-	}
-
-	return GF_NOT_SUPPORTED;
-}
-
-GF_EXPORT
-GF_Err gf_m2ts_demuxer_close(GF_M2TS_Demuxer *ts)
-{
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[TSDemux] Destroying demuxer\n"));
-	if (ts->th) {
-		if (ts->run_state == 1) {
-			ts->run_state = 0;
-			while (ts->run_state!=2) gf_sleep(0);
-		}
-		gf_th_del(ts->th);
-		ts->th = NULL;
-	}
+	GF_M2TS_Demuxer *ts;
+	u32 lt;
 
-	if (ts->file) gf_fclose(ts->file);
-	ts->file = NULL;
-	ts->ts_data_chunk = NULL;
+	lt = gf_log_get_tool_level(GF_LOG_CONTAINER);
+	gf_log_set_tool_level(GF_LOG_CONTAINER, GF_LOG_QUIET);
 
-	return GF_OK;
-}
+	ts = gf_m2ts_demux_new();
+	e = gf_m2ts_process_data(ts, buf, size);
+	if (!ts->pck_number) e = GF_BAD_PARAM;
+	gf_m2ts_demux_del(ts);
 
-GF_EXPORT
-GF_Err gf_m2ts_demuxer_play(GF_M2TS_Demuxer *ts)
-{
+	gf_log_set_tool_level(GF_LOG_CONTAINER, lt);
 
-	/*set the state variable outside the TS thread. If inside, we may get called for shutdown before the TS thread has started
-	and we would overwrite the run_state when entering the TS thread, which would make the thread run forever and the stop() wait forever*/
-	ts->run_state = 1;
-	if(ts->th) {
-		/*start playing for tune-in*/
-		return gf_th_run(ts->th, gf_m2ts_demuxer_run, ts);
-	} else {
-		return gf_m2ts_demuxer_run(ts);
-	}
+	if (e) return GF_FALSE;
+	return GF_TRUE;
 
 }
-
-#define M2TS_PROBE_SIZE	188000
 GF_EXPORT
 Bool gf_m2ts_probe_file(const char *fileName)
 {
 	char buf[M2TS_PROBE_SIZE];
-	GF_Err e;
 	u32 size;
-	FILE *t;
-	GF_M2TS_Demuxer *ts;
 
 	if (!strncmp(fileName, "gmem://", 7)) {
 		u8 *mem_address;
-		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
+		if (gf_blob_get_data(fileName, &mem_address, &size) != GF_OK) {
 			return GF_FALSE;
 		}
 		if (size>M2TS_PROBE_SIZE) size = M2TS_PROBE_SIZE;
 		memcpy(buf, mem_address, size);
 	} else {
-		t = gf_fopen(fileName, "rb");
+		FILE *t = gf_fopen(fileName, "rb");
 		if (!t) return 0;
-		size = (u32) fread(buf, 1, M2TS_PROBE_SIZE, t);
+		size = (u32) gf_fread(buf, M2TS_PROBE_SIZE, t);
 		gf_fclose(t);
 		if ((s32) size <= 0) return 0;
 	}
-	ts = gf_m2ts_demux_new();
-	e = gf_m2ts_process_data(ts, buf, size);
-	if (!ts->pck_number) e = GF_BAD_PARAM;
-	gf_m2ts_demux_del(ts);
-	if (e) return 0;
-	return 1;
+	return gf_m2ts_probe_buffer(buf, size);
 }
 
+GF_EXPORT
+Bool gf_m2ts_probe_data(const u8 *data, u32 size)
+{
+	size /= 188;
+	size *= 188;
+	if (!size) return GF_FALSE;
+	return gf_m2ts_probe_buffer((char *) data, size);
+}
+
+
 static void rewrite_pts_dts(unsigned char *ptr, u64 TS)
 {
 	ptr[0] &= 0xf1;
@@ -4665,7 +3113,7 @@
 	while (_TS > pcr_mod) _TS -= pcr_mod; \
 
 GF_EXPORT
-GF_Err gf_m2ts_restamp(char *buffer, u32 size, s64 ts_shift, u8 *is_pes)
+GF_Err gf_m2ts_restamp(u8 *buffer, u32 size, s64 ts_shift, u8 is_pes[GF_M2TS_MAX_STREAMS])
 {
 	u32 done = 0;
 	u64 pcr_mod;

gpac-0.8.0.tar.gz/src/media_tools/reedsolomon.c -> gpac-1.0.0.tar.gz/src/media_tools/reedsolomon.c Changed

@@ -45,9 +45,9 @@
 init_exp_table (void)
 {
 	int i, z;
-	int pinit,p1,p2,p3,p4,p5,p6,p7,p8;
+	int p1,p2,p3,p4,p5,p6,p7,p8;
 
-	pinit = p2 = p3 = p4 = p5 = p6 = p7 = p8 = 0;
+	p2 = p3 = p4 = p5 = p6 = p7 = p8 = 0;
 	p1 = 1;
 
 	gexp[0] = 1;
@@ -55,7 +55,7 @@
 	glog[0] = 0;			/* shouldn't log[0] be an error? */
 
 	for (i = 1; i < 256; i++) {
-		pinit = p8;
+		int pinit = p8;
 		p8 = p7;
 		p7 = p6;
 		p6 = p5;
@@ -136,7 +136,7 @@
 void
 Modified_Berlekamp_Massey (void)
 {
-	int n, L, L2, k, d, i;
+	int n, L, L2, k, i;
 	int psi[MAXDEG], psi2[MAXDEG], D[MAXDEG];
 	int gamma[MAXDEG];
 
@@ -153,7 +153,7 @@
 
 	for (n = NErasures; n < NPAR; n++) {
 
-		d = compute_discrepancy(psi, synBytes, L, n);
+		int d = compute_discrepancy(psi, synBytes, L, n);
 
 		if (d != 0) {
 
@@ -311,11 +311,11 @@
 void
 Find_Roots (void)
 {
-	int sum, r, k;
+	int r, k;
 	NErrors = 0;
 
 	for (r = 1; r < 256; r++) {
-		sum = 0;
+		int sum = 0;
 		/* evaluate lambda at r */
 		for (k = 0; k < NPAR+1; k++) {
 			sum ^= gmult(gexp[(k*r)%255], Lambda[k]);
@@ -348,7 +348,7 @@
                          int nerasures,
                          int erasures[])
 {
-	int r, i, j, err;
+	int i;
 
 	/* If you want to take advantage of erasure correction, be sure to
 	   set NErasures and ErasureLocs[] with the locations of erasures.
@@ -361,6 +361,7 @@
 
 
 	if ((NErrors <= NPAR) && NErrors > 0) {
+		int r;
 
 		/* first check for illegal error locs */
 		for (r = 0; r < NErrors; r++) {
@@ -371,7 +372,7 @@
 		}
 
 		for (r = 0; r < NErrors; r++) {
-			int num, denom;
+			int num, denom, err, j;
 			i = ErrorLocs[r];
 			/* evaluate Omega at alpha^(-i) */
 
@@ -483,9 +484,9 @@
 void
 decode_data(unsigned char data[], int nbytes)
 {
-	int i, j, sum;
+	int i, j;
 	for (j = 0; j < NPAR;  j++) {
-		sum = 0;
+		int sum = 0;
 		for (i = 0; i < nbytes; i++) {
 			sum = data[i] ^ gmult(gexp[j+1], sum);
 		}
@@ -555,12 +556,12 @@
 void
 encode_data (unsigned char msg[], int nbytes, unsigned char dst[])
 {
-	int i, LFSR[NPAR+1],dbyte, j;
+	int i, LFSR[NPAR+1],j;
 
 	for(i=0; i < NPAR+1; i++) LFSR[i]=0;
 
 	for (i = 0; i < nbytes; i++) {
-		dbyte = msg[i] ^ LFSR[NPAR-1];
+		int dbyte = msg[i] ^ LFSR[NPAR-1];
 		for (j = NPAR-1; j > 0; j--) {
 			LFSR[j] = LFSR[j-1] ^ gmult(genPoly[j], dbyte);
 		}

gpac-0.8.0.tar.gz/src/media_tools/saf.c -> gpac-1.0.0.tar.gz/src/media_tools/saf.c Changed

gpac-0.8.0.tar.gz/src/media_tools/vobsub.c -> gpac-1.0.0.tar.gz/src/media_tools/vobsub.c Changed

@@ -2,6 +2,7 @@
  *          GPAC - Multimedia Framework C SDK
  *
  *          Copyright (c) by  Falco (Ivan Vecera) 2006
+ *          Copyright (c) Jean Le Feuvre - Telecom ParisTech 2018_2020
  *                  All rights reserved
  *
  *  This file is part of GPAC / Media Tools sub-project
@@ -257,7 +258,7 @@
 	s32   line, id =-1, delay = 0;
 	Bool  error = 0;
 
-	for (line = 0; !error && fgets(strbuf, sizeof(strbuf), file); line++)
+	for (line = 0; !error && gf_fgets(strbuf, sizeof(strbuf), file); line++)
 	{
 		str = strtrim(strbuf);
 
@@ -357,6 +358,7 @@
 
 			vobsub->langs[id].id   = lang_id;
 			vobsub->langs[id].name = lang_table[vobsub_lang_name((u16)lang_id)].lang;
+			vobsub->langs[id].idx = id;
 
 			vobsub->langs[id].subpos = gf_list_new();
 			if (vobsub->langs[id].subpos == NULL)
@@ -428,13 +430,13 @@
 
 			if (delay < 0 && gf_list_count(vobsub->langs[id].subpos) > 0)
 			{
-				vobsub_pos *pos;
+				vobsub_pos *vspos_next;
 
-				pos = (vobsub_pos*)gf_list_get(vobsub->langs[id].subpos, gf_list_count(vobsub->langs[id].subpos) - 1);
-				if (vspos->start < pos->start)
+				vspos_next = (vobsub_pos*)gf_list_get(vobsub->langs[id].subpos, gf_list_count(vobsub->langs[id].subpos) - 1);
+				if (vspos->start < vspos_next->start)
 				{
-					delay += (s32)(pos->start - vspos->start);
-					vspos->start = pos->start;
+					delay += (s32)(vspos_next->start - vspos->start);
+					vspos->start = vspos_next->start;
 				}
 			}
 
@@ -452,35 +454,33 @@
 
 void vobsub_free(vobsub_file *vobsub)
 {
-	s32 c;
+	s32 i;
 
 	if (vobsub == NULL)
-	{
 		return;
-	}
 
-	for (c = 0; c < 32; c++)
-	{
-		if (vobsub->langs[c].subpos)
-		{
-			GF_List    *list = vobsub->langs[c].subpos;
+	for (i = 0; i < 32; i++) {
+		if (vobsub->langs[i].subpos) {
+			GF_List *list = vobsub->langs[i].subpos;
 			vobsub_pos *vspos;
-			u32         pos = 0;
+			u32 pos = 0;
 
-			do
-			{
+			do {
 				vspos = (vobsub_pos*)gf_list_enum(list, &pos);
 				gf_free(vspos);
 			}
 			while (vspos != NULL);
+
+			gf_list_del(list);
 		}
 	}
+	gf_free(vobsub);
 }
 
-GF_Err vobsub_get_subpic_duration(char *_data, u32 psize, u32 dsize, u32 *duration)
+GF_Err vobsub_get_subpic_duration(u8 *_data, u32 psize, u32 dsize, u32 *duration)
 {
 	u32 i, dcsq_stm, nxt_dcsq, start_stm, stop_stm;
-	unsigned char *data = (unsigned char *)_data;
+	u8 *data = (u8 *)_data;
 	start_stm = 0;
 	stop_stm  = 0;
 	nxt_dcsq  = dsize;
@@ -552,10 +552,9 @@
 	return GF_OK;
 }
 
-GF_Err vobsub_packetize_subpicture(FILE *fsub, u64 pts, char *data, u32 dataSize)
+GF_Err vobsub_packetize_subpicture(FILE *fsub, u64 pts, u8 *data, u32 dataSize)
 {
 	u8	buf[0x800], ptsbuf[5];
-	u8	*p;
 	int	put_pts = 1;
 
 	/* Build PTS buffer */
@@ -565,8 +564,8 @@
 	ptsbuf[3] = (u8)(((pts >>  7) & 0xff));
 	ptsbuf[4] = (u8)(((pts <<  1) & 0xfe) | 0x01);
 
-	while (dataSize > 0)
-	{
+	while (dataSize > 0) {
+		u8	*p;
 		u32 padLen = 0;
 		u32 dataLen = sizeof(buf);
 		u32 packLen;
@@ -649,7 +648,7 @@
 		}
 
 		/* Write packet into file */
-		if (gf_fwrite(buf, sizeof(buf), 1, fsub) != 1) {
+		if (gf_fwrite(buf, sizeof(buf), fsub) != sizeof(buf)) {
 			return GF_IO_ERR;
 		}

gpac-0.8.0.tar.gz/src/media_tools/webvtt.c -> gpac-1.0.0.tar.gz/src/media_tools/webvtt.c Changed

@@ -50,15 +50,15 @@
 	GF_StringBox *payload;
 } GF_VTTCueBox;
 
-GF_Box *boxstring_New() {
+GF_Box *boxstring_box_new() {
 	//type is assigned by caller
 	ISOM_DECL_BOX_ALLOC(GF_StringBox, 0);
 	return (GF_Box *)tmp;
 }
 
-GF_Box *boxstring_new_with_data(u32 type, const char *string)
+GF_Box *boxstring_new_with_data(u32 type, const char *string, GF_List **parent)
 {
-	GF_Box *a=NULL;
+	GF_Box *a = NULL;
 
 	switch (type) {
 	case GF_ISOM_BOX_TYPE_VTTC_CONFIG:
@@ -74,9 +74,13 @@
 			while (len && isspace(*last--))
 				--len;
 
-			if (len && (a = gf_isom_box_new(type)))
-			{
-				// strndup
+			if (!len) break;
+			if (parent) {
+				a = gf_isom_box_new_parent(parent, type);
+			} else {
+				a = gf_isom_box_new(type);
+			}
+			if (a) {
 				char* str = ((GF_StringBox *)a)->string = gf_malloc(len + 1);
 				memcpy(str, string, len);
 				str[len] = '\0';
@@ -91,53 +95,46 @@
 	return a;
 }
 
-GF_Box *vtcu_New()
+GF_Box *vtcu_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_VTTCueBox, GF_ISOM_BOX_TYPE_VTCC_CUE);
 	return (GF_Box *)tmp;
 }
 
-GF_Box *vtte_New() {
+GF_Box *vtte_box_new() {
 	ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_VTTE);
 	return (GF_Box *)tmp;
 }
 
-GF_Box *wvtt_New()
+GF_Box *wvtt_box_new()
 {
 	ISOM_DECL_BOX_ALLOC(GF_WebVTTSampleEntryBox, GF_ISOM_BOX_TYPE_WVTT);
 	return (GF_Box *)tmp;
 }
 
-void boxstring_del(GF_Box *s)
+void boxstring_box_del(GF_Box *s)
 {
 	GF_StringBox *box = (GF_StringBox *)s;
 	if (box->string) gf_free(box->string);
 	gf_free(box);
 }
 
-void vtcu_del(GF_Box *s)
+void vtcu_box_del(GF_Box *s)
 {
-	GF_VTTCueBox *box = (GF_VTTCueBox *)s;
-	if (box->id) gf_isom_box_del((GF_Box *)box->id);
-	if (box->settings) gf_isom_box_del((GF_Box *)box->settings);
-	if (box->payload) gf_isom_box_del((GF_Box *)box->payload);
-	if (box->time) gf_isom_box_del((GF_Box *)box->time);
 	gf_free(s);
 }
 
-void vtte_del(GF_Box *s)
+void vtte_box_del(GF_Box *s)
 {
 	gf_free(s);
 }
 
-void wvtt_del(GF_Box *s)
+void wvtt_box_del(GF_Box *s)
 {
-	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-	if (wvtt->config) gf_isom_box_del((GF_Box *)wvtt->config);
 	gf_free(s);
 }
 
-GF_Err boxstring_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err boxstring_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_StringBox *box = (GF_StringBox *)s;
 	box->string = (char *)gf_malloc((u32)(s->size+1));
@@ -162,20 +159,18 @@
 	case GF_ISOM_BOX_TYPE_PAYL:
 		cuebox->payload = (GF_StringBox *)box;
 		break;
-	default:
-		return gf_isom_box_add_default(s, box);
 	}
 	return GF_OK;
 }
 
-GF_Err vtcu_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err vtcu_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	return gf_isom_box_array_read(s, bs, vtcu_Add);
 }
 
-GF_Err vtte_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err vtte_box_read(GF_Box *s, GF_BitStream *bs)
 {
-	return gf_isom_box_array_read(s, bs, gf_isom_box_add_default);
+	return gf_isom_box_array_read(s, bs, NULL);
 }
 
 static GF_Err wvtt_Add(GF_Box *s, GF_Box *box)
@@ -185,13 +180,11 @@
 	case GF_ISOM_BOX_TYPE_VTTC_CONFIG:
 		wvtt->config = (GF_StringBox *)box;
 		break;
-	default:
-		return gf_isom_box_add_default(s, box);
 	}
 	return GF_OK;
 }
 
-GF_Err wvtt_Read(GF_Box *s, GF_BitStream *bs)
+GF_Err wvtt_box_read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
@@ -203,7 +196,7 @@
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-GF_Err boxstring_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err boxstring_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_StringBox *box = (GF_StringBox *)s;
@@ -212,102 +205,61 @@
 	if (box->string) {
 		gf_bs_write_data(bs, box->string, (u32)(box->size-8));
 	}
-	return e;
+	return GF_OK;
 }
 
-GF_Err vtcu_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err vtcu_box_write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
-	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
-	e = gf_isom_box_write_header(s, bs);
-	if (e) return e;
-	if (cuebox->id) {
-		e = gf_isom_box_write((GF_Box *)cuebox->id, bs);
-		if (e) return e;
-	}
-	if (cuebox->time) {
-		e = gf_isom_box_write((GF_Box *)cuebox->time, bs);
-		if (e) return e;
-	}
-	if (cuebox->settings) {
-		e = gf_isom_box_write((GF_Box *)cuebox->settings, bs);
-		if (e) return e;
-	}
-	if (cuebox->payload) {
-		e = gf_isom_box_write((GF_Box *)cuebox->payload, bs);
-	}
-	return e;
+	return gf_isom_box_write_header(s, bs);
 }
 
-GF_Err vtte_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err vtte_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	e = gf_isom_box_write_header(s, bs);
 	return e;
 }
 
-GF_Err wvtt_Write(GF_Box *s, GF_BitStream *bs)
+GF_Err wvtt_box_write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
 	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
 	e = gf_isom_box_write_header(s, bs);
 	gf_bs_write_data(bs, wvtt->reserved, 6);
 	gf_bs_write_u16(bs, wvtt->dataReferenceIndex);
-
-	if (wvtt->config) gf_isom_box_write((GF_Box *)wvtt->config, bs);
 	return e;
 }
 
-GF_Err boxstring_Size(GF_Box *s)
+GF_Err boxstring_box_size(GF_Box *s)
 {
 	GF_StringBox *box = (GF_StringBox *)s;
-	box->size += strlen(box->string);
+	if (box->string)
+		box->size += strlen(box->string);
 	return GF_OK;
 }
 
-GF_Err vtcu_Size(GF_Box *s)
+GF_Err vtcu_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)s;
-	if (cuebox->id) {
-		e = gf_isom_box_size((GF_Box *)cuebox->id);
-		if (e) return e;
-		cuebox->size += cuebox->id->size;
-	}
-	if (cuebox->time) {
-		e = gf_isom_box_size((GF_Box *)cuebox->time);
-		if (e) return e;
-		cuebox->size += cuebox->time->size;
-	}
-	if (cuebox->settings) {
-		e = gf_isom_box_size((GF_Box *)cuebox->settings);
-		if (e) return e;
-		cuebox->size += cuebox->settings->size;
-	}
-	if (cuebox->payload) {
-		e = gf_isom_box_size((GF_Box *)cuebox->payload);
-		if (e) return e;
-		cuebox->size += cuebox->payload->size;
-	}
+	gf_isom_check_position(s, (GF_Box*)cuebox->id, &pos);
+	gf_isom_check_position(s, (GF_Box*)cuebox->time, &pos);
+	gf_isom_check_position(s, (GF_Box*)cuebox->settings, &pos);
+	gf_isom_check_position(s, (GF_Box*)cuebox->payload, &pos);
 	return GF_OK;
 }
 
-GF_Err vtte_Size(GF_Box *s)
+GF_Err vtte_box_size(GF_Box *s)
 {
 	return GF_OK;
 }
 
-GF_Err wvtt_Size(GF_Box *s)
+GF_Err wvtt_box_size(GF_Box *s)
 {
-	GF_Err e;
+	u32 pos=0;
 	GF_WebVTTSampleEntryBox *wvtt = (GF_WebVTTSampleEntryBox *)s;
-
 	s->size += 8; // reserved and dataReferenceIndex
-	if (wvtt->config) {
-		e = gf_isom_box_size((GF_Box *)wvtt->config);
-		if (e) return e;
-		wvtt->size += wvtt->config->size;
-	}
+	gf_isom_check_position(s, (GF_Box *)wvtt->config, &pos);
 	return GF_OK;
 }
 
@@ -318,14 +270,15 @@
 	if (!cue) return GF_OK;
 
 	cuebox = (GF_VTTCueBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_VTCC_CUE);
+
 	if (cue->id) {
-		cuebox->id = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_IDEN, cue->id);
+		cuebox->id = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_IDEN, cue->id, &cuebox->child_boxes);
 	}
 	if (cue->settings) {
-		cuebox->settings = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTG, cue->settings);
+		cuebox->settings = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_STTG, cue->settings, &cuebox->child_boxes);
 	}
 	if (cue->text) {
-		cuebox->payload = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_PAYL, cue->text);
+		cuebox->payload = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_PAYL, cue->text, &cuebox->child_boxes);
 	}
 	/* TODO: check if a time box should be written */
 	e = gf_isom_box_size((GF_Box *)cuebox);
@@ -341,13 +294,13 @@
 	GF_ISOSample *res;
 	GF_BitStream *bs;
 	u32 i;
-	GF_WebVTTCue *cue;
 	GF_WebVTTSample *samp = (GF_WebVTTSample *)s;
 	if (!samp) return NULL;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 
 	if (gf_list_count(samp->cues)) {
+		GF_WebVTTCue *cue;
 		i=0;
 		while ((cue = (GF_WebVTTCue *)gf_list_enum(samp->cues, &i))) {
 			e = webvtt_write_cue(bs, cue);
@@ -381,7 +334,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
-GF_Err boxstring_dump(GF_Box *a, FILE * trace)
+GF_Err boxstring_box_dump(GF_Box *a, FILE * trace)
 {
 	char *szName;
 	GF_StringBox *sbox = (GF_StringBox *)a;
@@ -409,39 +362,34 @@
 		break;
 	}
 	gf_isom_box_dump_start(a, szName, trace);
-	fprintf(trace, "><![CDATA[\n");
+	gf_fprintf(trace, "><![CDATA[\n");
 	if (sbox->string)
-		fprintf(trace, "%s", sbox->string);
-	fprintf(trace, "\n]]>");
+		gf_fprintf(trace, "%s", sbox->string);
+	gf_fprintf(trace, "\n]]>");
 	gf_isom_box_dump_done(szName, a, trace);
 	return GF_OK;
 }
 
-GF_Err vtcu_dump(GF_Box *a, FILE * trace)
+GF_Err vtcu_box_dump(GF_Box *a, FILE * trace)
 {
-	GF_VTTCueBox *cuebox = (GF_VTTCueBox *)a;
 	gf_isom_box_dump_start(a, "WebVTTCueBox", trace);
-	fprintf(trace, ">\n");
-	if (cuebox->id) boxstring_dump((GF_Box *)cuebox->id, trace);
-	if (cuebox->settings) boxstring_dump((GF_Box *)cuebox->settings, trace);
-	if (cuebox->payload) boxstring_dump((GF_Box *)cuebox->payload, trace);
-	if (cuebox->time) boxstring_dump((GF_Box *)cuebox->time, trace);
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("WebVTTCueBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err vtte_dump(GF_Box *a, FILE * trace)
+GF_Err vtte_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "WebVTTEmptyCueBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("WebVTTEmptyCueBox", a, trace);
 	return GF_OK;
 }
 
-GF_Err wvtt_dump(GF_Box *a, FILE * trace)
+GF_Err wvtt_box_dump(GF_Box *a, FILE * trace)
 {
 	gf_isom_box_dump_start(a, "WebVTTSampleEntryBox", trace);
-	fprintf(trace, ">\n");
+	gf_fprintf(trace, ">\n");
 	gf_isom_box_dump_done("WebVTTSampleEntryBox", a, trace);
 	return GF_OK;
 }
@@ -459,16 +407,15 @@
 
 struct _webvtt_parser {
 	GF_WebVTTParserState state;
-	Bool is_srt;
+	Bool is_srt, suspend, is_eof;
 
 	/* List of non-overlapping GF_WebVTTSample */
-	GF_List              *samples;
+	GF_List *samples;
 
-	FILE                 *vtt_in;
-	u64                  file_size;
-	s32                  unicode_type;
+	FILE *vtt_in;
+	s32 unicode_type;
 
-	u64                  last_duration;
+	u64  last_duration;
 	void *user;
 	GF_Err (*report_message)(void *, GF_Err, char *, const char *);
 	void (*on_header_parsed)(void *, const char *);
@@ -476,12 +423,14 @@
 	void (*on_cue_read)(void *, GF_WebVTTCue *);
 };
 
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
 
 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;
 }
+
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+
 static Bool gf_webvtt_timestamp_greater(GF_WebVTTTimestamp *ts1, GF_WebVTTTimestamp *ts2)
 {
 	u64 t_ts1 = (60 * 60 * ts1->hour + 60 * ts1->min + ts1->sec) * 1000 + ts1->ms;
@@ -497,20 +446,20 @@
 {
 	GF_WebVTTCue *dup_cue;
 
-	cue->split         = GF_TRUE;
-	cue->orig_start    = cue->start;
-	cue->orig_end      = cue->end;
+	cue->split = GF_TRUE;
+	cue->orig_start = cue->start;
+	cue->orig_end = cue->end;
 
 	GF_SAFEALLOC(dup_cue, GF_WebVTTCue);
 	if (!dup_cue) return NULL;
-	dup_cue->split          = GF_TRUE;
-	if (time) dup_cue->start          = *time;
-	dup_cue->end            = cue->end;
-	dup_cue->orig_start     = cue->orig_start;
-	dup_cue->orig_end       = cue->orig_end;
-	dup_cue->id             = gf_strdup((cue->id ? cue->id : ""));
-	dup_cue->settings       = gf_strdup((cue->settings ? cue->settings : ""));
-	dup_cue->text           = gf_strdup((cue->text ? cue->text : ""));
+	dup_cue->split = GF_TRUE;
+	if (time) dup_cue->start = *time;
+	dup_cue->end = cue->end;
+	dup_cue->orig_start = cue->orig_start;
+	dup_cue->orig_end = cue->orig_end;
+	dup_cue->id = gf_strdup((cue->id ? cue->id : ""));
+	dup_cue->settings = gf_strdup((cue->settings ? cue->settings : ""));
+	dup_cue->text = gf_strdup((cue->text ? cue->text : ""));
 
 	if (time) cue->end = *time;
 	return dup_cue;
@@ -560,14 +509,13 @@
 GF_EXPORT
 void gf_webvtt_cue_del(GF_WebVTTCue * cue)
 {
-	if (cue) {
-		if (cue->id)        gf_free(cue->id);
-		if (cue->settings)  gf_free(cue->settings);
-		if (cue->text)      gf_free(cue->text);
-		if (cue->pre_text)  gf_free(cue->pre_text);
-		if (cue->post_text) gf_free(cue->post_text);
-		gf_free(cue);
-	}
+	if (!cue) return;
+	if (cue->id) gf_free(cue->id);
+	if (cue->settings) gf_free(cue->settings);
+	if (cue->text) gf_free(cue->text);
+	if (cue->pre_text) gf_free(cue->pre_text);
+	if (cue->post_text) gf_free(cue->post_text);
+	gf_free(cue);
 }
 
 static GF_WebVTTSample *gf_webvtt_sample_new()
@@ -583,6 +531,10 @@
 {
 	return samp->start;
 }
+u64 gf_webvtt_sample_get_end(GF_WebVTTSample * samp)
+{
+	return samp->end;
+}
 
 void gf_webvtt_sample_del(GF_WebVTTSample * samp)
 {
@@ -606,61 +558,67 @@
 
 extern s32 gf_text_get_utf_type(FILE *in_src);
 
-GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, const char *input_file,
+GF_Err gf_webvtt_parser_init(GF_WebVTTParser *parser, FILE *vtt_file, s32 unicode_type, Bool is_srt,
                              void *user, GF_Err (*report_message)(void *, GF_Err, char *, const char *),
                              void (*on_sample_parsed)(void *, GF_WebVTTSample *),
                              void (*on_header_parsed)(void *, const char *))
 {
-	const char *ext;
-	if (parser) {
-		parser->state       = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
-
-		ext = strrchr(input_file, '.');
-		if (ext) {
-			ext++;
-			if (!strcmp(ext, "srt")) {
-				parser->is_srt = GF_TRUE;
-				parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
-			}
-		}
-		parser->vtt_in = gf_fopen(input_file, "rt");
-		gf_fseek(parser->vtt_in, 0, SEEK_END);
-		parser->file_size = gf_ftell(parser->vtt_in);
-		gf_fseek(parser->vtt_in, 0, SEEK_SET);
-
-		parser->unicode_type = gf_text_get_utf_type(parser->vtt_in);
-		if (parser->unicode_type<0) {
-			gf_fclose(parser->vtt_in);
-			return GF_NOT_SUPPORTED;
-		}
+	if (!parser) return GF_BAD_PARAM;
+	parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
 
-		parser->user = user;
-		parser->report_message = report_message;
-		parser->on_sample_parsed = on_sample_parsed;
-		parser->on_header_parsed = on_header_parsed;
-		return GF_OK;
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_webvtt_parser_restart(parser);
 	}
-	return GF_BAD_PARAM;
+#endif
+
+	parser->is_srt = is_srt;
+	if (is_srt)
+		parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
+
+	parser->vtt_in = vtt_file;
+	parser->unicode_type = unicode_type;
+
+	parser->user = user;
+	parser->report_message = report_message;
+	parser->on_sample_parsed = on_sample_parsed;
+	parser->on_header_parsed = on_header_parsed;
+	return GF_OK;
+}
+
+void gf_webvtt_parser_suspend(GF_WebVTTParser *vttparser)
+{
+	vttparser->suspend = GF_TRUE;
+}
+
+void gf_webvtt_parser_restart(GF_WebVTTParser *parser)
+{
+	if (!parser->vtt_in) return;
+
+	gf_fseek(parser->vtt_in, 0, SEEK_SET);
+	parser->last_duration = 0;
+	while (gf_list_count(parser->samples)) {
+		gf_webvtt_sample_del((GF_WebVTTSample *)gf_list_get(parser->samples, 0));
+		gf_list_rem(parser->samples, 0);
+	}
+	parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
 }
 
 void gf_webvtt_parser_reset(GF_WebVTTParser *parser)
 {
-	if (parser) {
-		while (gf_list_count(parser->samples)) {
-			gf_webvtt_sample_del((GF_WebVTTSample *)gf_list_get(parser->samples, 0));
-			gf_list_rem(parser->samples, 0);
-		}
-		if (parser->vtt_in) gf_fclose(parser->vtt_in);
-		parser->file_size = 0;
-		parser->last_duration = 0;
-		parser->on_header_parsed = NULL;
-		parser->on_sample_parsed = NULL;
-		parser->report_message = NULL;
-		parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
-		parser->unicode_type = 0;
-		parser->user = NULL;
-		parser->vtt_in = NULL;
+	if (!parser) return;
+	while (gf_list_count(parser->samples)) {
+		gf_webvtt_sample_del((GF_WebVTTSample *)gf_list_get(parser->samples, 0));
+		gf_list_rem(parser->samples, 0);
 	}
+	parser->last_duration = 0;
+	parser->on_header_parsed = NULL;
+	parser->on_sample_parsed = NULL;
+	parser->report_message = NULL;
+	parser->state = WEBVTT_PARSER_STATE_WAITING_SIGNATURE;
+	parser->unicode_type = 0;
+	parser->user = NULL;
+	parser->vtt_in = NULL;
 }
 
 void gf_webvtt_parser_del(GF_WebVTTParser *parser)
@@ -672,14 +630,12 @@
 	}
 }
 
+#if 0
 u64 gf_webvtt_parser_last_duration(GF_WebVTTParser *parser)
 {
-	if (parser) {
-		return parser->last_duration;
-	} else {
-		return 0;
-	}
+	return parser ? parser->last_duration : 0;
 }
+#endif
 
 
 static GF_Err gf_webvtt_add_cue_to_samples(GF_WebVTTParser *parser, GF_List *samples, GF_WebVTTCue *cue)
@@ -698,21 +654,16 @@
 		sample = (GF_WebVTTSample *)gf_list_get(samples, i);
 		/* save the sample end in case there are no more samples to test */
 		sample_end = sample->end;
-		if (cue_start < sample->start)
-		{
+		if (cue_start < sample->start) {
 			/* cues must be ordered according to their start time, so drop the cue */
 			/* TODO delete the cue */
 			return GF_BAD_PARAM;
-		}
-		else if (cue_start == sample->start && cue_end == sample->end)
-		{
+		} else if (cue_start == sample->start && cue_end == sample->end) {
 			/* if the timing of the new cue matches the sample, no need to split, add the cue to the sample */
 			gf_list_add(sample->cues, cue);
 			/* the cue does not need to processed further */
 			return GF_OK;
-		}
-		else if (cue_start >= sample->end)
-		{
+		} else if (cue_start >= sample->end) {
 			/* flush the current sample */
 			gf_list_del_item(samples, sample);
 			parser->on_sample_parsed(parser->user, sample);
@@ -720,9 +671,7 @@
 			i--;
 			/* process the cue with next sample (if any) or create a new sample */
 			continue;
-		}
-		else if (cue_start >= sample->start)
-		{
+		} else {
 			u32 j;
 			if (cue_start > sample->start) {
 				/* create a new sample, insert it after the current one */
@@ -808,14 +757,14 @@
 
 GF_Err gf_webvtt_parse_timestamp(GF_WebVTTParser *parser, GF_WebVTTTimestamp *ts, const char *line)
 {
-	u32     len;
-	u32     pos;
-	u32     pos2;
-	u32     value1;
-	u32     value2;
-	u32     value3;
-	u32     value4;
-	Bool    is_hour = GF_FALSE;
+	u32 len;
+	u32 pos;
+	u32 pos2;
+	u32 value1;
+	u32 value2;
+	u32 value3;
+	u32 value4;
+	Bool is_hour = GF_FALSE;
 	if (!ts || !line) return GF_BAD_PARAM;
 	len = (u32) strlen(line);
 	if (!len) return GF_BAD_PARAM;
@@ -889,7 +838,7 @@
 
 GF_Err gf_webvtt_parser_parse_timings_settings(GF_WebVTTParser *parser, GF_WebVTTCue *cue, char *line, u32 len)
 {
-	GF_Err  e;
+	GF_Err e;
 	char *timestamp_string;
 	u32 pos;
 
@@ -958,26 +907,28 @@
 	return e;
 }
 
-GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser, u32 duration)
+GF_Err gf_webvtt_parser_parse(GF_WebVTTParser *parser)
 {
-	char            szLine[2048];
-	char            *sOK;
-	u32             len;
-	GF_Err          e;
-	Bool            do_parse = GF_TRUE;
-	GF_WebVTTCue    *cue = NULL;
-	u32             start = 0;
-	u32             end = 0;
-	char            *prevLine = NULL;
-	char            *header = NULL;
-	u32             header_len = 0;
-	Bool            had_marks = GF_FALSE;
+	char szLine[2048];
+	char *sOK;
+	u32 len;
+	GF_Err e;
+	GF_WebVTTCue *cue = NULL;
+	char *prevLine = NULL;
+	char *header = NULL;
+	u32 header_len = 0;
+	Bool had_marks = GF_FALSE;
 
 	if (!parser) return GF_BAD_PARAM;
+	parser->suspend = GF_FALSE;
+
 	if (parser->is_srt) {
 		parser->on_header_parsed(parser->user, "WEBVTT\n");
 	}
-	while (do_parse) {
+
+	while (!parser->is_eof) {
+		if (!cue && parser->suspend)
+			break;
 		sOK = gf_text_get_utf8_line(szLine, 2048, parser->vtt_in, parser->unicode_type);
 		REM_TRAIL_MARKS(szLine, "\r\n")
 		len = (u32) strlen(szLine);
@@ -1022,9 +973,11 @@
 				}
 			} else {
 				parser->on_header_parsed(parser->user, header);
+				if (header) gf_free(header);
+				header = NULL;
 				if (!sOK) {
 					/* end of file, parsing is done */
-					do_parse = GF_FALSE;
+					parser->is_eof = GF_TRUE;
 					break;
 				} else {
 					/* empty line means end of header */
@@ -1061,7 +1014,7 @@
 					prevLine = NULL;
 				}
 				if (!sOK) {
-					do_parse = GF_FALSE;
+					parser->is_eof = GF_TRUE;
 					break;
 				} else {
 					/* remove empty lines and stay in the same state */
@@ -1084,8 +1037,8 @@
 					cue = NULL;
 					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE;
 				} else {
-					start = (u32)gf_webvtt_timestamp_get(&cue->start);
-					end   = (u32)gf_webvtt_timestamp_get(&cue->end);
+//					start = (u32)gf_webvtt_timestamp_get(&cue->start);
+//					end   = (u32)gf_webvtt_timestamp_get(&cue->end);
 					parser->state = WEBVTT_PARSER_STATE_WAITING_CUE_PAYLOAD;
 				}
 			} else {
@@ -1107,9 +1060,8 @@
 				gf_webvtt_add_cue_to_samples(parser, parser->samples, cue);
 				cue = NULL;
 
-				gf_set_progress("Importing WebVTT", gf_ftell(parser->vtt_in), parser->file_size);
-				if ((duration && (end >= duration)) || !sOK) {
-					do_parse = GF_FALSE;
+				if (!sOK) {
+					parser->is_eof = GF_TRUE;
 					break;
 				} else {
 					/* empty line, move to next cue */
@@ -1118,11 +1070,12 @@
 				}
 			}
 		}
-		if (duration && (start >= duration)) {
-			break;
-		}
 	}
+	if (header) gf_free(header);
+	header = NULL;
 
+	if (parser->suspend)
+		return GF_OK;
 
 	/* no more cues to come, flush everything */
 	if (cue) {
@@ -1135,8 +1088,7 @@
 		gf_list_rem(parser->samples, 0);
 		parser->on_sample_parsed(parser->user, sample);
 	}
-	gf_set_progress("Importing WebVTT", parser->file_size, parser->file_size);
-	e = GF_OK;
+	e = GF_EOS;
 exit:
 	if (cue) gf_webvtt_cue_del(cue);
 	if (prevLine) gf_free(prevLine);
@@ -1151,17 +1103,17 @@
 }
 
 GF_EXPORT
-GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start)
+GF_List *gf_webvtt_parse_cues_from_data(const u8 *data, u32 dataLength, u64 start)
 {
-	GF_List         *cues;
-	GF_WebVTTCue    *cue;
-	GF_VTTCueBox    *cuebox;
-	GF_BitStream    *bs;
-	char			*pre_text;
+	GF_List *cues;
+	GF_WebVTTCue *cue;
+	GF_VTTCueBox *cuebox;
+	GF_BitStream *bs;
+	char *pre_text;
 	cue = NULL;
 	pre_text = NULL;
 	cues = gf_list_new();
-	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
+	bs = gf_bs_new((u8 *)data, dataLength, GF_BITSTREAM_READ);
 	while(gf_bs_available(bs))
 	{
 		GF_Err  e;
@@ -1220,6 +1172,7 @@
 		gf_list_add(wsample->cues, cue);
 		/* update with the previous sample */
 		if (prev_wsample) {
+			Bool do_del = GF_TRUE;
 			Bool  found = GF_FALSE;
 			while (!found && gf_list_count(prev_wsample->cues)) {
 				GF_WebVTTCue *old_cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
@@ -1253,16 +1206,19 @@
 					} else {
 						/* keep the cue in the current sample to respect cue start ordering */
 						gf_list_add(wsample->cues, old_cue);
+						do_del = GF_FALSE;
 					}
 				}
 				/* delete the old cue */
-				gf_webvtt_cue_del(old_cue);
+				if (do_del)
+					gf_webvtt_cue_del(old_cue);
 			}
 		}
 	}
 	/* No cue in the current sample */
 	if (prev_wsample) {
 		while (gf_list_count(prev_wsample->cues)) {
+			Bool do_del = GF_TRUE;
 			GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(prev_wsample->cues, 0);
 			gf_list_rem(prev_wsample->cues, 0);
 			/* finalize the end cue time */
@@ -1276,8 +1232,10 @@
 			} else {
 				/* keep the cue in the current sample to respect cue start ordering */
 				gf_list_add(wsample->cues, cue);
+				do_del = GF_FALSE;
 			}
-			gf_webvtt_cue_del(cue);
+			if (do_del)
+				gf_webvtt_cue_del(cue);
 		}
 		gf_webvtt_sample_del(prev_wsample);
 		gf_list_rem_last(parser->samples);
@@ -1336,12 +1294,12 @@
 void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour)
 {
 	if (dump_hour || ts->hour != 0) {
-		fprintf(dump, "%02u:", ts->hour);
+		gf_fprintf(dump, "%02u:", ts->hour);
 	}
 
-	fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
+	gf_fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
 }
-GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *dumpedLength)
+GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const u8 *data, u32 dataLength, u32 *dumpedLength)
 {
 #ifdef GPAC_DISABLE_ISOM
 	return GF_NOT_SUPPORTED;
@@ -1351,12 +1309,16 @@
 	GF_StringBox *config;
 	GF_BitStream *bs;
 	*dumpedLength = 0;
-	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
+	bs = gf_bs_new((u8 *)data, dataLength, GF_BITSTREAM_READ);
 	e = gf_isom_box_parse(&box, bs);
-	if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC_CONFIG)) return GF_BAD_PARAM;
+	if (!box || (box->type != GF_ISOM_BOX_TYPE_VTTC_CONFIG)) {
+		gf_bs_del(bs);
+		if (box) gf_isom_box_del(box);
+		return GF_BAD_PARAM;
+	}
 	config = (GF_StringBox *)box;
 	if (config->string) {
-		fprintf(dump, "%s", config->string);
+		gf_fprintf(dump, "%s", config->string);
 		*dumpedLength = (u32)strlen(config->string)+1;
 	}
 	gf_bs_del(bs);
@@ -1374,7 +1336,7 @@
 	if (box_mode) {
 		gf_isom_box_dump(wvtt, dump);
 	} else {
-		fprintf(dump, "%s\n\n", wvtt->config->string);
+		gf_fprintf(dump, "%s\n\n", wvtt->config->string);
 	}
 	return GF_OK;
 }
@@ -1385,7 +1347,7 @@
 	GF_BitStream *bs;
 
 	if (box_mode) {
-		fprintf(dump, "<WebVTTSample decodingTimeStamp=\""LLU"\" compositionTimeStamp=\""LLD"\" RAP=\"%d\" dataLength=\"%d\" >\n", iso_sample->DTS, (s64)iso_sample->DTS + iso_sample->CTS_Offset, iso_sample->IsRAP, iso_sample->dataLength);
+		gf_fprintf(dump, "<WebVTTSample decodingTimeStamp=\""LLU"\" compositionTimeStamp=\""LLD"\" RAP=\"%d\" dataLength=\"%d\" >\n", iso_sample->DTS, (s64)iso_sample->DTS + iso_sample->CTS_Offset, iso_sample->IsRAP, iso_sample->dataLength);
 	}
 	bs = gf_bs_new(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
 	while(gf_bs_available(bs))
@@ -1399,33 +1361,33 @@
 			gf_isom_box_dump(box, dump);
 		} else if (box->type == GF_ISOM_BOX_TYPE_VTCC_CUE) {
 			GF_VTTCueBox *cuebox = (GF_VTTCueBox *)box;
-			if (cuebox->id) fprintf(dump, "%s", cuebox->id->string);
+			if (cuebox->id) gf_fprintf(dump, "%s", cuebox->id->string);
 			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
 			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
-			fprintf(dump, " --> NEXT");
-			if (cuebox->settings) fprintf(dump, " %s", cuebox->settings->string);
-			fprintf(dump, "\n");
-			if (cuebox->payload) fprintf(dump, "%s", cuebox->payload->string);
-			fprintf(dump, "\n");
+			gf_fprintf(dump, " --> NEXT");
+			if (cuebox->settings) gf_fprintf(dump, " %s", cuebox->settings->string);
+			gf_fprintf(dump, "\n");
+			if (cuebox->payload) gf_fprintf(dump, "%s", cuebox->payload->string);
+			gf_fprintf(dump, "\n");
 		} else if (box->type == GF_ISOM_BOX_TYPE_VTTE) {
 			gf_webvtt_timestamp_set(&ts, (iso_sample->DTS * 1000) / timescale);
 			gf_webvtt_timestamp_dump(&ts, dump, GF_FALSE);
-			fprintf(dump, " --> NEXT\n\n");
+			gf_fprintf(dump, " --> NEXT\n\n");
 		} else if (box->type == GF_ISOM_BOX_TYPE_VTTA) {
-			fprintf(dump, "%s\n\n", ((GF_StringBox *)box)->string);
+			gf_fprintf(dump, "%s\n\n", ((GF_StringBox *)box)->string);
 		}
 		gf_isom_box_del(box);
 	}
 	gf_bs_del(bs);
 	if (box_mode) {
-		fprintf(dump, "</WebVTTSample>\n");
+		gf_fprintf(dump, "</WebVTTSample>\n");
 	}
 	return GF_OK;
 }
 #endif
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
-static GF_Err gf_webvtt_parser_dump_finalize(GF_WebVTTParser *parser, u64 duration)
+GF_Err gf_webvtt_parser_finalize(GF_WebVTTParser *parser, u64 duration)
 {
 	GF_WebVTTSample *sample;
 	assert(gf_list_count(parser->samples) <= 1);
@@ -1446,39 +1408,43 @@
 	return GF_OK;
 }
 
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
 static void gf_webvtt_dump_cue(void *user, GF_WebVTTCue *cue)
 {
 	FILE *dump = (FILE *)user;
 	if (!cue || !dump) return;
 	if (cue->pre_text) {
-		fprintf(dump, "%s", cue->pre_text);
-		fprintf(dump, "\n");
-		fprintf(dump, "\n");
+		gf_fprintf(dump, "%s", cue->pre_text);
+		gf_fprintf(dump, "\n");
+		gf_fprintf(dump, "\n");
 	}
-	if (cue->id) fprintf(dump, "%s\n", cue->id);
+	if (cue->id) gf_fprintf(dump, "%s\n", cue->id);
 	if (cue->start.hour || cue->end.hour) {
 		gf_webvtt_timestamp_dump(&cue->start, dump, GF_TRUE);
-		fprintf(dump, " --> ");
+		gf_fprintf(dump, " --> ");
 		gf_webvtt_timestamp_dump(&cue->end, dump, GF_TRUE);
 	} else {
 		gf_webvtt_timestamp_dump(&cue->start, dump, GF_FALSE);
-		fprintf(dump, " --> ");
+		gf_fprintf(dump, " --> ");
 		gf_webvtt_timestamp_dump(&cue->end, dump, GF_FALSE);
 	}
 	if (cue->settings) {
-		fprintf(dump, " %s", cue->settings);
+		gf_fprintf(dump, " %s", cue->settings);
 	}
-	fprintf(dump, "\n");
-	if (cue->text) fprintf(dump, "%s", cue->text);
-	fprintf(dump, "\n");
-	fprintf(dump, "\n");
+	gf_fprintf(dump, "\n");
+	if (cue->text) gf_fprintf(dump, "%s", cue->text);
+	gf_fprintf(dump, "\n");
+	gf_fprintf(dump, "\n");
 	if (cue->post_text) {
-		fprintf(dump, "%s", cue->post_text);
-		fprintf(dump, "\n");
-		fprintf(dump, "\n");
+		gf_fprintf(dump, "%s", cue->post_text);
+		gf_fprintf(dump, "\n");
+		gf_fprintf(dump, "\n");
 	}
 }
+#endif
 
+//unused
+#if 0
 static GF_Err gf_webvtt_dump_cues(FILE *dump, GF_List *cues)
 {
 	u32 i;
@@ -1491,14 +1457,22 @@
 
 GF_Err gf_webvtt_dump_sample(FILE *dump, GF_WebVTTSample *samp)
 {
-	fprintf(stdout, "NOTE New WebVTT Sample ("LLD"-"LLD")\n\n", samp->start, samp->end);
+	gf_fprintf(stdout, "NOTE New WebVTT Sample ("LLD"-"LLD")\n\n", samp->start, samp->end);
 	return gf_webvtt_dump_cues(dump, samp->cues);
 }
+#endif
+
+
+void gf_webvtt_parser_cue_callback(GF_WebVTTParser *parser, void (*on_cue_read)(void *, GF_WebVTTCue *), void *udta)
+{
+	parser->on_cue_read = on_cue_read;
+	parser->user = udta;
+}
 
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 
 GF_EXPORT
-GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, char *szName, u32 track, Bool merge, Bool box_dump)
+GF_Err gf_webvtt_dump_iso_track(GF_MediaExporter *dumper, u32 track, Bool merge, Bool box_dump)
 {
 #ifdef GPAC_DISABLE_MEDIA_IMPORT
 	return GF_NOT_SUPPORTED;
@@ -1512,7 +1486,7 @@
 	u64     duration;
 	GF_WebVTTParser *parser;
 
-	out = szName ? gf_fopen(szName, "wt") : (dumper->dump_file ? dumper->dump_file : stdout);
+	out = (dumper->dump_file ? dumper->dump_file : stdout);
 	if (!out) return GF_IO_ERR;// gf_export_message(dumper, GF_IO_ERR, "Error opening %s for writing - check disk access & permissions", szName);
 
 	parser = gf_webvtt_parser_new();
@@ -1520,7 +1494,7 @@
 	parser->on_cue_read = gf_webvtt_dump_cue;
 
 	if (box_dump)
-		fprintf(out, "<WebVTTTrack trackID=\"%d\">\n", gf_isom_get_track_id(dumper->file, track) );
+		gf_fprintf(out, "<WebVTTTrack trackID=\"%d\">\n", gf_isom_get_track_id(dumper->file, track) );
 
 	e = gf_webvtt_dump_header(out, dumper->file, track, box_dump, 1);
 	if (e) goto exit;
@@ -1541,14 +1515,13 @@
 		gf_isom_sample_del(&samp);
 	}
 	duration = gf_isom_get_media_duration(dumper->file, track);
-	gf_webvtt_parser_dump_finalize(parser, duration);
+	gf_webvtt_parser_finalize(parser, duration);
 
 	if (box_dump)
-		fprintf(out, "</WebVTTTrack>\n");
+		gf_fprintf(out, "</WebVTTTrack>\n");
 
 exit:
 	gf_webvtt_parser_del(parser);
-	if (szName) gf_fclose(out);
 	return e;
 #endif
 }

gpac-0.8.0.tar.gz/src/odf/desc_private.c -> gpac-1.0.0.tar.gz/src/odf/desc_private.c Changed

@@ -71,8 +71,6 @@
 
 	case GF_ODF_SEGMENT_TAG:
 		return gf_odf_new_segment();
-	case GF_ODF_MEDIATIME_TAG:
-		return gf_odf_new_mediatime();
 
 	//File Format Specific
 	case GF_ODF_ISOM_IOD_TAG:
@@ -85,9 +83,14 @@
 		return gf_odf_new_esd_ref();
 	case GF_ODF_LANG_TAG:
 		return gf_odf_new_lang();
+	case GF_ODF_GPAC_LANG:
+		desc = gf_odf_new_lang();
+		if (desc) desc->tag = GF_ODF_GPAC_LANG;
+		return desc;
 
 #ifndef GPAC_MINIMAL_ODF
-
+	case GF_ODF_MEDIATIME_TAG:
+		return gf_odf_new_mediatime();
 	case GF_ODF_CI_TAG:
 		return gf_odf_new_ci();
 	case GF_ODF_SCI_TAG:
@@ -180,8 +183,6 @@
 
 	case GF_ODF_SEGMENT_TAG:
 		return gf_odf_del_segment((GF_Segment *) desc);
-	case GF_ODF_MEDIATIME_TAG:
-		return gf_odf_del_mediatime((GF_MediaTime *) desc);
 
 	case GF_ODF_MUXINFO_TAG:
 		return gf_odf_del_muxinfo((GF_MuxInfo *)desc);
@@ -193,6 +194,8 @@
 		return gf_odf_del_text_cfg((GF_TextConfig *)desc);
 	case GF_ODF_TX3G_TAG:
 		return gf_odf_del_tx3g((GF_TextSampleDescriptor*)desc);
+	case GF_ODF_ELEM_MASK_TAG:
+		return gf_odf_del_ElemMask((GF_ElementaryMask*)desc);
 	case GF_ODF_LASER_CFG_TAG:
 		return gf_odf_del_laser_cfg((GF_LASERConfig *)desc);
 
@@ -200,6 +203,7 @@
 		return gf_odf_del_auxvid((GF_AuxVideoDescriptor *)desc);
 
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 		return gf_odf_del_lang((GF_Language *)desc);
 
 	case GF_ODF_ESD_INC_TAG:
@@ -208,7 +212,8 @@
 		return gf_odf_del_esd_ref((GF_ES_ID_Ref *)desc);
 
 #ifndef GPAC_MINIMAL_ODF
-
+	case GF_ODF_MEDIATIME_TAG:
+		return gf_odf_del_mediatime((GF_MediaTime *) desc);
 	case GF_ODF_CC_TAG:
 		return gf_odf_del_cc((GF_CCDescriptor *)desc);
 	case GF_ODF_CC_DATE_TAG:
@@ -294,18 +299,20 @@
 
 	case GF_ODF_SEGMENT_TAG:
 		return gf_odf_read_segment(bs, (GF_Segment *) desc, DescSize);
-	case GF_ODF_MEDIATIME_TAG:
-		return gf_odf_read_mediatime(bs, (GF_MediaTime *) desc, DescSize);
 	case GF_ODF_MUXINFO_TAG:
-		return gf_odf_read_muxinfo(bs, (GF_MuxInfo *) desc, DescSize);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[ODF] MuxInfo descriptor cannot be read, wrong serialization or conflict with other user-space OD tags\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
 
 	case GF_ODF_AUX_VIDEO_DATA:
 		return gf_odf_read_auxvid(bs, (GF_AuxVideoDescriptor *)desc, DescSize);
 
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 		return gf_odf_read_lang(bs, (GF_Language *)desc, DescSize);
 
 #ifndef GPAC_MINIMAL_ODF
+	case GF_ODF_MEDIATIME_TAG:
+		return gf_odf_read_mediatime(bs, (GF_MediaTime *) desc, DescSize);
 	case GF_ODF_IPMP_TAG:
 		return gf_odf_read_ipmp(bs, (GF_IPMP_Descriptor *)desc, DescSize);
 	case GF_ODF_IPMP_PTR_TAG:
@@ -393,8 +400,6 @@
 
 	case GF_ODF_SEGMENT_TAG:
 		return gf_odf_size_segment((GF_Segment *) desc, outSize);
-	case GF_ODF_MEDIATIME_TAG:
-		return gf_odf_size_mediatime((GF_MediaTime *) desc, outSize);
 	case GF_ODF_MUXINFO_TAG:
 		return gf_odf_size_muxinfo((GF_MuxInfo *) desc, outSize);
 
@@ -402,9 +407,12 @@
 		return gf_odf_size_auxvid((GF_AuxVideoDescriptor *)desc, outSize);
 
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 		return gf_odf_size_lang((GF_Language *)desc, outSize);
 
 #ifndef GPAC_MINIMAL_ODF
+	case GF_ODF_MEDIATIME_TAG:
+		return gf_odf_size_mediatime((GF_MediaTime *) desc, outSize);
 	case GF_ODF_CC_TAG:
 		return gf_odf_size_cc((GF_CCDescriptor *)desc, outSize);
 	case GF_ODF_CC_DATE_TAG:
@@ -493,8 +501,6 @@
 		return gf_odf_write_od(bs, (GF_ObjectDescriptor *)desc);
 	case GF_ODF_SEGMENT_TAG:
 		return gf_odf_write_segment(bs, (GF_Segment *) desc);
-	case GF_ODF_MEDIATIME_TAG:
-		return gf_odf_write_mediatime(bs, (GF_MediaTime *) desc);
 	case GF_ODF_MUXINFO_TAG:
 		return gf_odf_write_muxinfo(bs, (GF_MuxInfo *) desc);
 
@@ -502,9 +508,12 @@
 		return gf_odf_write_auxvid(bs, (GF_AuxVideoDescriptor *)desc);
 
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 		return gf_odf_write_lang(bs, (GF_Language *)desc);
 
 #ifndef GPAC_MINIMAL_ODF
+	case GF_ODF_MEDIATIME_TAG:
+		return gf_odf_write_mediatime(bs, (GF_MediaTime *) desc);
 	case GF_ODF_CC_TAG:
 		return gf_odf_write_cc(bs, (GF_CCDescriptor *)desc);
 	case GF_ODF_CC_DATE_TAG:
@@ -582,6 +591,7 @@
 		com->tag = GF_ODF_ESD_REMOVE_REF_TAG;
 		return com;
 
+#ifndef GPAC_MINIMAL_ODF
 	case GF_ODF_IPMP_UPDATE_TAG:
 		return gf_odf_new_ipmp_update();
 	case GF_ODF_IPMP_REMOVE_TAG:
@@ -596,6 +606,10 @@
 		if (!com) return com;
 		com->tag = tag;
 		return com;
+#else
+	default:
+		return NULL;
+#endif
 	}
 }
 
@@ -616,6 +630,7 @@
 	case GF_ODF_ESD_REMOVE_TAG:
 	case GF_ODF_ESD_REMOVE_REF_TAG:
 		return gf_odf_del_esd_remove((GF_ESDRemove *)com);
+#ifndef GPAC_MINIMAL_ODF
 	case GF_ODF_IPMP_UPDATE_TAG:
 		return gf_odf_del_ipmp_update((GF_IPMPUpdate *)com);
 	case GF_ODF_IPMP_REMOVE_TAG:
@@ -623,6 +638,11 @@
 
 	default:
 		return gf_odf_del_base_command((GF_BaseODCom *)com);
+#else
+	default:
+		return GF_NOT_SUPPORTED;
+#endif
+
 	}
 }
 
@@ -642,44 +662,23 @@
 	case GF_ODF_ESD_REMOVE_TAG:
 	case GF_ODF_ESD_REMOVE_REF_TAG:
 		return gf_odf_read_esd_remove(bs, (GF_ESDRemove *)com, gf_odf_size_command);
+#ifndef GPAC_MINIMAL_ODF
 	case GF_ODF_IPMP_UPDATE_TAG:
 		return gf_odf_read_ipmp_update(bs, (GF_IPMPUpdate *)com, gf_odf_size_command);
 	case GF_ODF_IPMP_REMOVE_TAG:
 		return gf_odf_read_ipmp_remove(bs, (GF_IPMPRemove *)com, gf_odf_size_command);
 	default:
 		return gf_odf_read_base_command(bs, (GF_BaseODCom *)com, gf_odf_size_command);
-	}
-}
-
-
-
-//
-//		SIZE FUNCTION
-//
-GF_Err gf_odf_size_command(GF_ODCom *com, u32 *outSize)
-{
-	switch (com->tag) {
-	case GF_ODF_OD_UPDATE_TAG:
-		return gf_odf_size_od_update((GF_ODUpdate *)com, outSize);
-	case GF_ODF_OD_REMOVE_TAG:
-		return gf_odf_size_od_remove((GF_ODRemove *)com, outSize);
-
-	case GF_ODF_ESD_UPDATE_TAG:
-		return gf_odf_size_esd_update((GF_ESDUpdate *)com, outSize);
-	case GF_ODF_ESD_REMOVE_TAG:
-	case GF_ODF_ESD_REMOVE_REF_TAG:
-		return gf_odf_size_esd_remove((GF_ESDRemove *)com, outSize);
-	case GF_ODF_IPMP_UPDATE_TAG:
-		return gf_odf_size_ipmp_update((GF_IPMPUpdate *)com, outSize);
-	case GF_ODF_IPMP_REMOVE_TAG:
-		return gf_odf_size_ipmp_remove((GF_IPMPRemove *)com, outSize);
-
+#else
 	default:
-		return gf_odf_size_base_command((GF_BaseODCom *)com, outSize);
+		return GF_NOT_SUPPORTED;
+#endif
+
 	}
 }
 
 
+
 //
 //		WRITERS
 //
@@ -696,6 +695,7 @@
 	case GF_ODF_ESD_REMOVE_TAG:
 	case GF_ODF_ESD_REMOVE_REF_TAG:
 		return gf_odf_write_esd_remove(bs, (GF_ESDRemove *)com);
+#ifndef GPAC_MINIMAL_ODF
 	case GF_ODF_IPMP_UPDATE_TAG:
 		return gf_odf_write_ipmp_update(bs, (GF_IPMPUpdate *)com);
 	case GF_ODF_IPMP_REMOVE_TAG:
@@ -703,5 +703,9 @@
 
 	default:
 		return gf_odf_write_base_command(bs, (GF_BaseODCom *)com);
+#else
+	default:
+		return GF_NOT_SUPPORTED;
+#endif
 	}
 }

gpac-0.8.0.tar.gz/src/odf/descriptors.c -> gpac-1.0.0.tar.gz/src/odf/descriptors.c Changed

@@ -28,59 +28,9 @@
 
 #include <gpac/avparse.h>
 
-GF_EXPORT
-const char *gf_odf_stream_type_name(u32 streamType)
-{
-	switch (streamType) {
-	case GF_STREAM_OD:
-		return "ObjectDescriptor";
-	case GF_STREAM_OCR:
-		return "ClockReference";
-	case GF_STREAM_SCENE:
-		return "SceneDescription";
-	case GF_STREAM_VISUAL:
-		return "Visual";
-	case GF_STREAM_AUDIO:
-		return "Audio";
-	case GF_STREAM_MPEG7:
-		return "MPEG7";
-	case GF_STREAM_IPMP:
-		return "IPMP";
-	case GF_STREAM_OCI:
-		return "OCI";
-	case GF_STREAM_MPEGJ:
-		return "MPEGJ";
-	case GF_STREAM_INTERACT:
-		return "Interaction";
-	case GF_STREAM_FONT:
-		return "Font";
-	case GF_STREAM_TEXT:
-		return "Text";
-	case GF_STREAM_ND_SUBPIC:
-		return "NeroDigital Subpicture";
-	default:
-		return "Unknown";
-	}
-}
-
-GF_EXPORT
-u32 gf_odf_stream_type_by_name(const char *streamType)
-{
-	if (!streamType) return 0;
-	if (!stricmp(streamType, "ObjectDescriptor")) return GF_STREAM_OD;
-	if (!stricmp(streamType, "ClockReference")) return GF_STREAM_OCR;
-	if (!stricmp(streamType, "SceneDescription")) return GF_STREAM_SCENE;
-	if (!stricmp(streamType, "Visual")) return GF_STREAM_VISUAL;
-	if (!stricmp(streamType, "Audio")) return GF_STREAM_AUDIO;
-	if (!stricmp(streamType, "MPEG7")) return GF_STREAM_MPEG7;
-	if (!stricmp(streamType, "IPMP")) return GF_STREAM_IPMP;
-	if (!stricmp(streamType, "OCI")) return GF_STREAM_OCI;
-	if (!stricmp(streamType, "MPEGJ")) return GF_STREAM_MPEGJ;
-	if (!stricmp(streamType, "Interaction")) return GF_STREAM_INTERACT;
-	if (!stricmp(streamType, "Text")) return GF_STREAM_TEXT;
-	return 0;
-}
-
+#ifndef GPAC_DISABLE_AV_PARSERS
+#include <gpac/internal/media_dev.h>
+#endif
 
 s32 gf_odf_size_field_size(u32 size_desc)
 {
@@ -238,13 +188,12 @@
 GF_Err gf_odf_size_descriptor_list(GF_List *descList, u32 *outSize)
 {
 	GF_Err e;
-	GF_Descriptor *tmp;
 	u32 tmpSize, count, i;
 	if (! descList) return GF_OK;
 
 	count = gf_list_count(descList);
 	for ( i = 0; i < count; i++ ) {
-		tmp = (GF_Descriptor*)gf_list_get(descList, i);
+		GF_Descriptor *tmp = (GF_Descriptor*)gf_list_get(descList, i);
 		if (tmp) {
 			e = gf_odf_size_descriptor(tmp, &tmpSize);
 			if (e) return e;
@@ -258,12 +207,11 @@
 {
 	GF_Err e;
 	u32 count, i;
-	GF_Descriptor *tmp;
 
 	if (! descList) return GF_OK;
 	count = gf_list_count(descList);
 	for ( i = 0; i < count; i++ ) {
-		tmp = (GF_Descriptor*)gf_list_get(descList, i);
+		GF_Descriptor *tmp = (GF_Descriptor*)gf_list_get(descList, i);
 		if (tmp) {
 			e = gf_odf_write_descriptor(bs, tmp);
 			if (e) return e;
@@ -276,12 +224,11 @@
 {
 	GF_Err e;
 	u32 count, i;
-	GF_Descriptor *tmp;
 
 	if (! descList) return GF_OK;
 	count = gf_list_count(descList);
 	for ( i = 0; i < count; i++ ) {
-		tmp = (GF_Descriptor*)gf_list_get(descList, i);
+		GF_Descriptor *tmp = (GF_Descriptor*)gf_list_get(descList, i);
 		if (tmp && (tmp->tag==only_tag) ) {
 			e = gf_odf_write_descriptor(bs, tmp);
 			if (e) return e;
@@ -289,8 +236,8 @@
 	}
 	return GF_OK;
 }
-#ifndef GPAC_DISABLE_ODF
 
+#ifndef GPAC_MINIMAL_ODF
 
 u32 gf_ipmpx_array_size(GF_BitStream *bs, u32 *array_size)
 {
@@ -307,7 +254,7 @@
 	return io_size;
 }
 
-void gf_ipmpx_write_array(GF_BitStream *bs, char *data, u32 data_len)
+void gf_ipmpx_write_array(GF_BitStream *bs, u8 *data, u32 data_len)
 {
 	u32 length;
 	unsigned char vals[4];
@@ -348,13 +295,13 @@
 
 /*special authoring functions*/
 GF_EXPORT
-GF_BIFSConfig *gf_odf_get_bifs_config(GF_DefaultDescriptor *dsi, u8 oti)
+GF_BIFSConfig *gf_odf_get_bifs_config(GF_DefaultDescriptor *dsi, u32 oti)
 {
 	Bool hasSize, cmd_stream;
 	GF_BitStream *bs;
 	GF_BIFSConfig *cfg;
 
-	if (oti>=GPAC_OTI_SCENE_BIFS_EXTENDED) return NULL;
+	if (oti>=GF_CODECID_BIFS_EXTENDED) return NULL;
 
 	if (!dsi || !dsi->data || !dsi->dataLength ) {
 		/* Hack for T-DMB non compliant streams (OnTimeTek ?) */
@@ -415,7 +362,7 @@
 	if (!cfg) return GF_BAD_PARAM;
 	memset(cfg, 0, sizeof(GF_LASERConfig));
 
-	if (!dsi || !dsi->data || !dsi->dataLength || !cfg) return GF_BAD_PARAM;
+	if (!dsi || !dsi->data || !dsi->dataLength) return GF_BAD_PARAM;
 	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
 	memset(cfg, 0, sizeof(GF_LASERConfig));
 	cfg->tag = GF_ODF_LASER_CFG_TAG;
@@ -454,8 +401,8 @@
 	gf_bs_del(bs);
 	return GF_OK;
 }
-
-GF_EXPORT
+//unused
+#if 0
 GF_Err gf_odf_get_ui_config(GF_DefaultDescriptor *dsi, GF_UIConfig *cfg)
 {
 	u32 len, i;
@@ -476,6 +423,7 @@
 	gf_bs_del(bs);
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_odf_encode_ui_config(GF_UIConfig *cfg, GF_DefaultDescriptor **out_dsi)
@@ -564,6 +512,8 @@
 {
 	u32 i, count;
 
+	if (!cfg) return GF_BAD_PARAM;
+
 	count = gf_list_count(cfg->sequenceParameterSets);
 
 	if (!cfg->write_annex_b) {
@@ -625,7 +575,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, char **outData, u32 *outSize)
+GF_Err gf_odf_avc_cfg_write(GF_AVCConfig *cfg, u8 **outData, u32 *outSize)
 {
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	gf_odf_avc_cfg_write_bs(cfg, bs);
@@ -637,7 +587,7 @@
 }
 
 GF_EXPORT
-GF_AVCConfig *gf_odf_avc_cfg_read(char *dsi, u32 dsi_size)
+GF_AVCConfig *gf_odf_avc_cfg_read(u8 *dsi, u32 dsi_size)
 {
 	u32 i, count;
 	GF_AVCConfig *avcc = gf_odf_avc_cfg_new();
@@ -710,6 +660,66 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_TextSampleDescriptor *gf_odf_tx3g_read(u8 *dsi, u32 dsi_size)
+{
+	u32 i;
+	u32 gpp_read_rgba(GF_BitStream *bs);
+	void gpp_read_style(GF_BitStream *bs, GF_StyleRecord *rec);
+	void gpp_read_box(GF_BitStream *bs, GF_BoxRecord *rec);
+
+	GF_TextSampleDescriptor *txtc = (GF_TextSampleDescriptor *) gf_odf_new_tx3g();
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+
+	txtc->horiz_justif = gf_bs_read_int(bs, 8);
+	txtc->vert_justif  = gf_bs_read_int(bs, 8);
+	txtc->back_color = gpp_read_rgba(bs);
+	gpp_read_box(bs, &txtc->default_pos);
+	gpp_read_style(bs, &txtc->default_style);
+	txtc->font_count = gf_bs_read_u16(bs);
+	txtc->fonts = gf_malloc(sizeof(GF_FontRecord)*txtc->font_count);
+	for (i=0; i<txtc->font_count; i++) {
+		u8 len;
+		txtc->fonts[i].fontID = gf_bs_read_u16(bs);
+		len = gf_bs_read_u8(bs);
+		txtc->fonts[i].fontName = gf_malloc(sizeof(char)*(len+1));
+		gf_bs_read_data(bs, txtc->fonts[i].fontName, len);
+		txtc->fonts[i].fontName[len] = 0;
+	}
+	gf_bs_del(bs);
+	return txtc;
+}
+
+GF_Err gf_odf_tx3g_write(GF_TextSampleDescriptor *a, u8 **outData, u32 *outSize)
+{
+	u32 j;
+	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_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+	gf_bs_write_u8(bs, a->horiz_justif);
+	gf_bs_write_u8(bs, a->vert_justif);
+	gpp_write_rgba(bs, a->back_color);
+	gpp_write_box(bs, &a->default_pos);
+	gpp_write_style(bs, &a->default_style);
+
+	gf_bs_write_u16(bs, a->font_count);
+	for (j=0; j<a->font_count; j++) {
+		gf_bs_write_u16(bs, a->fonts[j].fontID);
+		if (a->fonts[j].fontName) {
+			u32 len = (u32) strlen(a->fonts[j].fontName);
+			gf_bs_write_u8(bs, len);
+			gf_bs_write_data(bs, a->fonts[j].fontName, len);
+		} else {
+			gf_bs_write_u8(bs, 0);
+		}
+	}
+	gf_bs_get_content(bs, outData, outSize);
+	gf_bs_del(bs);
+	return GF_OK;
+}
+
 /*TextConfig*/
 GF_Descriptor *gf_odf_new_text_cfg()
 {
@@ -750,7 +760,7 @@
 /*we need box parsing*/
 #include <gpac/internal/isomedia_dev.h>
 GF_EXPORT
-GF_Err gf_odf_get_text_config(GF_DefaultDescriptor *dsi, u8 oti, GF_TextConfig *cfg)
+GF_Err gf_odf_get_text_config(u8 *data, u32 data_len, u32 codecid, GF_TextConfig *cfg)
 {
 	u32 i;
 	Bool has_alt_format;
@@ -760,12 +770,12 @@
 #endif
 	GF_Err e;
 	GF_BitStream *bs;
-	if (!dsi || !dsi->data || !dsi->dataLength || !cfg) return GF_BAD_PARAM;
-	if (oti != 0x08) return GF_NOT_SUPPORTED;
+	if (data || data_len || !cfg) return GF_BAD_PARAM;
+	if (codecid != GF_CODECID_TEXT_MPEG4) return GF_NOT_SUPPORTED;
 
 	/*reset*/
 	ResetTextConfig(cfg);
-	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
+	bs = gf_bs_new(data, data_len, GF_BITSTREAM_READ);
 
 	e = GF_OK;
 	cfg->Base3GPPFormat = gf_bs_read_int(bs, 8);
@@ -918,12 +928,11 @@
 			gf_bs_write_int(bs, 0xFF, 5);
 			gf_bs_write_int(bs, cfg->chroma_bit_depth-8, 3);
 			gf_bs_write_int(bs, cfg->avgFrameRate, 16);
-		}
 
-		if (!cfg->is_lhvc)
 			gf_bs_write_int(bs, cfg->constantFrameRate, 2);
-		else
+		} else {
 			gf_bs_write_int(bs, 0xFF, 2);
+		}
 
 		gf_bs_write_int(bs, cfg->numTemporalLayers, 3);
 		gf_bs_write_int(bs, cfg->temporalIdNested, 1);
@@ -958,7 +967,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *cfg, char **outData, u32 *outSize)
+GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *cfg, u8 **outData, u32 *outSize)
 {
 	GF_Err e;
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -1011,12 +1020,11 @@
 		gf_bs_read_int(bs, 5);
 		cfg->chroma_bit_depth = gf_bs_read_int(bs, 3) + 8;
 		cfg->avgFrameRate = gf_bs_read_int(bs, 16);
-	}
 
-	if (!is_lhvc)
 		cfg->constantFrameRate = gf_bs_read_int(bs, 2);
-	else
+	} else {
 		gf_bs_read_int(bs, 2); //reserved
+	}
 
 	cfg->numTemporalLayers = gf_bs_read_int(bs, 3);
 	cfg->temporalIdNested = gf_bs_read_int(bs, 1);
@@ -1063,7 +1071,7 @@
 }
 
 GF_EXPORT
-GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size, Bool is_lhvc)
+GF_HEVCConfig *gf_odf_hevc_cfg_read(u8 *dsi, u32 dsi_size, Bool is_lhvc)
 {
 	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
 	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read_bs(bs, is_lhvc);
@@ -1125,7 +1133,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_odf_av1_cfg_write(GF_AV1Config *cfg, char **outData, u32 *outSize) {
+GF_Err gf_odf_av1_cfg_write(GF_AV1Config *cfg, u8 **outData, u32 *outSize) {
 	GF_Err e;
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 	*outSize = 0;
@@ -1138,8 +1146,6 @@
 	return e;
 }
 
-
-
 GF_EXPORT
 GF_VPConfig *gf_odf_vp_cfg_new()
 {
@@ -1188,7 +1194,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_odf_vp_cfg_write(GF_VPConfig *cfg, char **outData, u32 *outSize, Bool is_v0)
+GF_Err gf_odf_vp_cfg_write(GF_VPConfig *cfg, u8 **outData, u32 *outSize, Bool is_v0)
 {
 	GF_Err e;
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -1234,7 +1240,7 @@
 }
 
 GF_EXPORT
-GF_VPConfig *gf_odf_vp_cfg_read(char *dsi, u32 dsi_size)
+GF_VPConfig *gf_odf_vp_cfg_read(u8 *dsi, u32 dsi_size)
 {
 	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
 	GF_VPConfig *cfg = gf_odf_vp_cfg_read_bs(bs, GF_FALSE);
@@ -1242,254 +1248,150 @@
 	return cfg;
 }
 
-
-
-
 GF_EXPORT
-const char *gf_afx_get_type_description(u8 afx_code)
+GF_AV1Config *gf_odf_av1_cfg_read_bs_size(GF_BitStream *bs, u32 size)
 {
-	switch (afx_code) {
-	case GPAC_AFX_3DMC:
-		return "AFX 3D Mesh Compression";
-	case GPAC_AFX_WAVELET_SUBDIVISION:
-		return "AFX Wavelet Subdivision Surface";
-	case GPAC_AFX_MESHGRID:
-		return "AFX Mesh Grid";
-	case GPAC_AFX_COORDINATE_INTERPOLATOR:
-		return "AFX Coordinate Interpolator";
-	case GPAC_AFX_ORIENTATION_INTERPOLATOR:
-		return "AFX Orientation Interpolator";
-	case GPAC_AFX_POSITION_INTERPOLATOR:
-		return "AFX Position Interpolator";
-	case GPAC_AFX_OCTREE_IMAGE:
-		return "AFX Octree Image";
-	case GPAC_AFX_BBA:
-		return "AFX BBA";
-	case GPAC_AFX_POINT_TEXTURE:
-		return "AFX Point Texture";
-	case GPAC_AFX_3DMC_EXT:
-		return "AFX 3D Mesh Compression Extension";
-	case GPAC_AFX_FOOTPRINT:
-		return "AFX FootPrint Representation";
-	case GPAC_AFX_ANIMATED_MESH:
-		return "AFX Animated Mesh Compression";
-	case GPAC_AFX_SCALABLE_COMPLEXITY:
-		return "AFX Scalable Complexity Representation";
-	default:
-		break;
-	}
-	return "AFX Unknown";
-}
+#ifndef GPAC_DISABLE_AV_PARSERS
+	AV1State state;
+	u8 reserved;
+	GF_AV1Config *cfg;
 
+	if (!size) size = (u32) gf_bs_available(bs);
+	if (!size) return NULL;
+
+	cfg = gf_odf_av1_cfg_new();
+	gf_av1_init_state(&state);
+	state.config = cfg;
+
+	cfg->marker = gf_bs_read_int(bs, 1);
+	cfg->version = gf_bs_read_int(bs, 7);
+	cfg->seq_profile = gf_bs_read_int(bs, 3);
+	cfg->seq_level_idx_0 = gf_bs_read_int(bs, 5);
+	cfg->seq_tier_0 = gf_bs_read_int(bs, 1);
+	cfg->high_bitdepth = gf_bs_read_int(bs, 1);
+	cfg->twelve_bit = gf_bs_read_int(bs, 1);
+	cfg->monochrome = gf_bs_read_int(bs, 1);
+	cfg->chroma_subsampling_x = gf_bs_read_int(bs, 1);
+	cfg->chroma_subsampling_y = gf_bs_read_int(bs, 1);
+	cfg->chroma_sample_position = gf_bs_read_int(bs, 2);
+
+	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_odf_av1_cfg_del(cfg);
+		return NULL;
+	}
+	cfg->initial_presentation_delay_present = gf_bs_read_int(bs, 1);
+	if (cfg->initial_presentation_delay_present) {
+		cfg->initial_presentation_delay_minus_one = gf_bs_read_int(bs, 4);
+	} else {
+		/*reserved = */gf_bs_read_int(bs, 4);
+		cfg->initial_presentation_delay_minus_one = 0;
+	}
+	size -= 4;
+
+	while (size) {
+		u64 pos, obu_size;
+		ObuType obu_type;
+		GF_AV1_OBUArrayEntry *a;
+
+		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));
+			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_EXPORT
-const char *gf_esd_get_textual_description(GF_ESD *esd)
-{
-	if (!esd || !esd->decoderConfig) return "Bad parameter";
-
-	switch (esd->decoderConfig->streamType) {
-	case GF_STREAM_OD:
-		return "MPEG-4 Object Descriptor";
-	case GF_STREAM_OCR:
-		return "MPEG-4 Object Clock Reference";
-	case GF_STREAM_SCENE:
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case 0x0:
-		case 0x1:
-		case 0x2:
-		case 0x3:
-		case 0xFF:
-			return "MPEG-4 BIFS Scene Description";
-		case GPAC_OTI_SCENE_BIFS_EXTENDED:
-			return "MPEG-4 Extended BIFS Scene Description";
-		case GPAC_OTI_SCENE_AFX:
-			if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data)
-				return "AFX Unknown";
-			return gf_afx_get_type_description(esd->decoderConfig->decoderSpecificInfo->data[0]);
-		case GPAC_OTI_SCENE_LASER:
-		{
-			GF_LASERConfig l_cfg;
-			gf_odf_get_laser_config(esd->decoderConfig->decoderSpecificInfo, &l_cfg);
-			if (! l_cfg.newSceneIndicator ) return "LASeR Scene Segment Description";
+		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));
 		}
-		return "LASeR Scene Description";
-		case GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE:
-			return "MPEG-4 Synthesized Texture";
-		case GPAC_OTI_SCENE_SAF:
-			return "MPEG-4 SAF";
-		case GPAC_OTI_3GPP2_CMF:
-			return "3GPP2 CMF";
-		default:
-			return "Unknown Scene Type";
+		GF_SAFEALLOC(a, GF_AV1_OBUArrayEntry);
+		if (!a) break;
+		a->obu = gf_malloc((size_t)obu_size);
+		if (!a->obu) {
+			gf_free(a);
+			break;
 		}
-		break;
-	case GF_STREAM_VISUAL:
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
-			return "MPEG-2 Visual Simple Profile";
-		case GPAC_OTI_VIDEO_MPEG2_MAIN:
-			return "MPEG-2 Visual Main Profile";
-		case GPAC_OTI_VIDEO_MPEG2_SNR:
-			return "MPEG-2 Visual SNR Profile";
-		case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
-			return "MPEG-2 Visual SNR Profile";
-		case GPAC_OTI_VIDEO_MPEG2_HIGH:
-			return "MPEG-2 Visual SNR Profile";
-		case GPAC_OTI_VIDEO_MPEG2_422:
-			return "MPEG-2 Visual SNR Profile";
-		case GPAC_OTI_VIDEO_MPEG1:
-			return "MPEG-1 Video";
-		case GPAC_OTI_IMAGE_JPEG:
-			return "JPEG Image";
-		case GPAC_OTI_IMAGE_PNG:
-			return "PNG Image";
-		case GPAC_OTI_IMAGE_JPEG_2000:
-			return "JPEG2000 Image";
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			return "MPEG-4 Part 2 Video";
-		case GPAC_OTI_VIDEO_AVC:
-			return "MPEG-4 AVC|H264 Video";
-		case GPAC_OTI_VIDEO_SVC:
-			return "MPEG-4 SVC Video";
-		case GPAC_OTI_VIDEO_AVC_PS:
-			return "MPEG-4 AVC|H264 Parameter Set";
-		case GPAC_OTI_VIDEO_HEVC:
-			return "MPEG-H HEVC Video";
-		case GPAC_OTI_VIDEO_LHVC:
-			return "MPEG-H L-HEVC Video";
-		case GPAC_OTI_MEDIA_FFMPEG:
-			return "GPAC FFMPEG Private Video";
-		case GPAC_OTI_VIDEO_SMPTE_VC1:
-			return "SMPTE VC-1 Video";
-		case GPAC_OTI_VIDEO_DIRAC:
-			return "Dirac Video";
-		case GPAC_OTI_VIDEO_AV1:
-			return "AOM AV1 Video";
-		case GPAC_OTI_VIDEO_VP9:
-			return "VP9 Video";
-		default:
-			return "Unknown Video type";
+		gf_bs_seek(bs, pos);
+		gf_bs_read_data(bs, (char *) a->obu, (u32)obu_size);
+		a->obu_length = obu_size;
+		a->obu_type = obu_type;
+		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));
+			break;
 		}
-		break;
-	case GF_STREAM_AUDIO:
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-			return "MPEG-2 AAC Main Profile";
-		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-			return "MPEG-2 AAC Low Complexity Profile";
-		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-			return "MPEG-2 AAC Scaleable Sampling Rate Profile";
-		case GPAC_OTI_AUDIO_MPEG2_PART3:
-			return "MPEG-2 Audio Part 3";
-		case GPAC_OTI_AUDIO_MPEG1:
-			return "MPEG-1 Audio";
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-		{
-#ifdef GPAC_DISABLE_AV_PARSERS
-			return "MPEG-4 AAC";
+		size -= (u32) obu_size;
+	}
+	gf_av1_reset_state(& state, GF_TRUE);
+	return cfg;
 #else
-			GF_M4ADecSpecInfo a_cfg;
-			if (!esd->decoderConfig->decoderSpecificInfo) return "MPEG-4 AAC";
-			gf_m4a_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &a_cfg);
-			return gf_m4a_object_type_name(a_cfg.base_object_type);
+	return NULL;
 #endif
+}
+
+GF_EXPORT
+GF_AV1Config *gf_odf_av1_cfg_read_bs(GF_BitStream *bs)
+{
+	return gf_odf_av1_cfg_read_bs_size(bs, 0);
+
+}
+GF_EXPORT
+GF_AV1Config *gf_odf_av1_cfg_read(u8 *dsi, u32 dsi_size)
+{
+	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
+	GF_AV1Config *cfg = gf_odf_av1_cfg_read_bs(bs);
+	gf_bs_del(bs);
+	return cfg;
+}
+
+GF_DOVIDecoderConfigurationRecord *gf_odf_dovi_cfg_read_bs(GF_BitStream *bs)
+{
+	GF_DOVIDecoderConfigurationRecord *cfg;
+	GF_SAFEALLOC(cfg, GF_DOVIDecoderConfigurationRecord);
+
+	cfg->dv_version_major = gf_bs_read_u8(bs);
+	cfg->dv_version_minor = gf_bs_read_u8(bs);
+	cfg->dv_profile = gf_bs_read_int(bs, 7);
+	cfg->dv_level = gf_bs_read_int(bs, 6);
+	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"));
+			}
 		}
-		break;
-		case GPAC_OTI_MEDIA_FFMPEG:
-			return "GPAC FFMPEG Private Audio";
-		case GPAC_OTI_AUDIO_EVRC_VOICE:
-			return "EVRC Voice";
-		case GPAC_OTI_AUDIO_SMV_VOICE:
-			return "SMV Voice";
-		case GPAC_OTI_AUDIO_AC3:
-			return "AC-3 audio";
-		case GPAC_OTI_AUDIO_EAC3:
-			return "Enhanced AC-3 Audio";
-		case GPAC_OTI_AUDIO_DRA:
-			return "DRA Audio";
-		case GPAC_OTI_AUDIO_ITU_G719:
-			return "ITU G719 Audio";
-		case GPAC_OTI_AUDIO_DTS_CA:
-			return "DTS Coherent Acoustics audio";
-		case GPAC_OTI_AUDIO_DTS_HD_HR:
-			return "DTS-HD High Resolution audio";
-		case GPAC_OTI_AUDIO_DTS_HD_MASTER:
-			return "DTS-HD Master audios";
-		default:
-			return "Unknown Audio Type";
-		}
-		break;
-	case GF_STREAM_MPEG7:
-		return "MPEG-7 Description";
-	case GF_STREAM_IPMP:
-		return "MPEG-4 IPMP";
-	case GF_STREAM_OCI:
-		return "MPEG-4 OCI";
-	case GF_STREAM_MPEGJ:
-		return "MPEG-4 MPEG-J";
-	case GF_STREAM_INTERACT:
-		return "MPEG-4 User Interaction";
-	case GF_STREAM_IPMP_TOOL:
-		return "MPEG-4 IPMP Tool";
-	case GF_STREAM_FONT:
-		return "MPEG-4 Font Data";
-	case GF_STREAM_TEXT:
-		return "MPEG-4 Streaming Text";
-	case GF_STREAM_ND_SUBPIC:
-		return "Nero Digital Subpicture";
-
-	case GF_STREAM_PRIVATE_SCENE:
-		switch (esd->decoderConfig->objectTypeIndication) {
-		case GPAC_OTI_PRIVATE_SCENE_GENERIC:
-		{
-			char *ext = strchr(esd->decoderConfig->decoderSpecificInfo->data + 4, '.');
-			if (!ext) return "GPAC Internal Scene Description";
-			ext += 1;
-			if (!strnicmp(ext, "bt", 2))
-				return "BT Scene Description";
-			if (!strnicmp(ext, "xmt", 2))
-				return "XMT Scene Description";
-			if (!strnicmp(ext, "wrl", 3))
-				return "VRML Scene Description";
-			if (!strnicmp(ext, "x3d", 3))
-				return "W3D Scene Description";
-			if (!strnicmp(ext, "x3dv", 4))
-				return "X3D Scene Description";
-			if (!strnicmp(ext, "swf", 3))
-				return "Flash (SWF) Scene Description";
-			if (!strnicmp(ext, "xsr", 3))
-				return "LASeR-ML Scene Description";
-			if (!strnicmp(ext, "wgt", 3))
-				return "W3C Widget Package";
-			if (!strnicmp(ext, "mgt", 3))
-				return "MPEG-U Widget Package";
-		}
-		return "GPAC Internal Scene Description";
-		case GPAC_OTI_PRIVATE_SCENE_SVG:
-			return "SVG";
-		case GPAC_OTI_PRIVATE_SCENE_LASER:
-			return "LASeR (XML)";
-		case GPAC_OTI_PRIVATE_SCENE_XBL:
-			return "XBL";
-		case GPAC_OTI_PRIVATE_SCENE_EPG:
-			return "DVB Event Information";
-		case GPAC_OTI_PRIVATE_SCENE_WGT:
-			return "W3C/MPEG-U Widget";
-		case GPAC_OTI_SCENE_SVG:
-			return "SVG over RTP";
-		case GPAC_OTI_SCENE_SVG_GZ:
-			return "SVG+gz over RTP";
-		case GPAC_OTI_SCENE_DIMS:
-			return "3GPP DIMS";
-		default:
-			return "Unknown Scene Description";
-		}
-		break;
-	case GF_STREAM_PRIVATE_MEDIA:
-		return "Opaque Decoder";
-	case GF_STREAM_4CC:
-		return gf_4cc_to_str(esd->decoderConfig->objectTypeIndication);
-	default:
-		return "Unknown Media Type";
 	}
+	return cfg;
+}
+
+void gf_odf_dovi_cfg_del(GF_DOVIDecoderConfigurationRecord *cfg)
+{
+	gf_free(cfg);
+}
+
+GF_Err gf_odf_dovi_cfg_write_bs(GF_DOVIDecoderConfigurationRecord *cfg, GF_BitStream *bs)
+{
+	gf_bs_write_u8(bs,  cfg->dv_version_major);
+	gf_bs_write_u8(bs,  cfg->dv_version_minor);
+	gf_bs_write_int(bs, cfg->dv_profile, 7);
+	gf_bs_write_int(bs, cfg->dv_level, 6);
+	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_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;
 }

gpac-0.8.0.tar.gz/src/odf/ipmpx_code.c -> gpac-1.0.0.tar.gz/src/odf/ipmpx_code.c Changed

@@ -399,7 +399,7 @@
 	if (requestNegotiation) {
 		count = gf_bs_read_int(bs, 8);
 		for (i=0; i<count; i++) {
-			GF_IPMPX_Authentication *auth;
+			GF_IPMPX_Authentication *auth = NULL;
 			e = GF_IPMPX_AUTH_Parse(bs, &auth);
 			if (e) return e;
 			gf_list_add(p->candidateAlgorithms, auth);
@@ -408,7 +408,7 @@
 	if (successNegotiation) {
 		count = gf_bs_read_int(bs, 8);
 		for (i=0; i<count; i++) {
-			GF_IPMPX_Authentication *auth;
+			GF_IPMPX_Authentication *auth = NULL;
 			e = GF_IPMPX_AUTH_Parse(bs, &auth);
 			if (e) return e;
 			gf_list_add(p->agreedAlgorithms, auth);
@@ -1065,6 +1065,8 @@
 	p->scope = gf_bs_read_int(bs, 3);
 	gf_bs_read_int(bs, 5);
 	p->eventTypeCount = gf_bs_read_int(bs, 8);
+	if (p->eventTypeCount > GF_ARRAY_LENGTH(p->eventType))
+		return GF_ISOM_INVALID_FILE;
 	for (i=0; i<p->eventTypeCount; i++) p->eventType[i] = gf_bs_read_int(bs, 8);
 	return GF_OK;
 }
@@ -1100,7 +1102,7 @@
 	GF_IPMPX_RemoveToolNotificationListener*p = (GF_IPMPX_RemoveToolNotificationListener*)_p;
 	p->eventTypeCount = 0;
 	count = gf_bs_read_int(bs, 8);
-	if (count > ARRAY_LENGTH(p->eventType))
+	if (count > GF_ARRAY_LENGTH(p->eventType))
 		return GF_CORRUPTED_DATA;
 
 	p->eventTypeCount = count;
@@ -1513,7 +1515,7 @@
 	}
 	if (has_opaque_data) {
 		p->opaqueDataSize = gf_bs_read_int(bs, 16);
-		p->opaqueData = (char*)gf_malloc(sizeof(u8) * p->wmPayloadLen);
+		p->opaqueData = (char*)gf_malloc(sizeof(u8) * p->opaqueDataSize);
 		gf_bs_read_data(bs, p->opaqueData, p->opaqueDataSize);
 	}
 	return GF_OK;

gpac-0.8.0.tar.gz/src/odf/ipmpx_dump.c -> gpac-1.0.0.tar.gz/src/odf/ipmpx_dump.c Changed

@@ -43,9 +43,9 @@
 	char ind_buf[GF_IPMPX_MAX_TREE];
 	GF_IPMPX_FORMAT_INDENT(ind_buf, indent);
 	if (XMTDump) {
-		fprintf(trace, "%s<%s>\n", ind_buf, name);
+		gf_fprintf(trace, "%s<%s>\n", ind_buf, name);
 	} else {
-		fprintf(trace, "%s%s [\n", ind_buf, name);
+		gf_fprintf(trace, "%s%s [\n", ind_buf, name);
 	}
 }
 static void EndList(FILE *trace, const char *name, u32 indent, Bool XMTDump)
@@ -53,9 +53,9 @@
 	char ind_buf[GF_IPMPX_MAX_TREE];
 	GF_IPMPX_FORMAT_INDENT(ind_buf, indent);
 	if (XMTDump) {
-		fprintf(trace, "%s</%s>\n", ind_buf, name);
+		gf_fprintf(trace, "%s</%s>\n", ind_buf, name);
 	} else {
-		fprintf(trace, "%s]\n", ind_buf);
+		gf_fprintf(trace, "%s]\n", ind_buf);
 	}
 }
 
@@ -64,11 +64,11 @@
 	char ind_buf[GF_IPMPX_MAX_TREE];
 	GF_IPMPX_FORMAT_INDENT(ind_buf, indent);
 
-	fprintf(trace, "%s", ind_buf);
+	gf_fprintf(trace, "%s", ind_buf);
 	if (!XMTDump) {
-		fprintf(trace, "%s {\n", descName);
+		gf_fprintf(trace, "%s {\n", descName);
 	} else {
-		fprintf(trace, "<%s ", descName);
+		gf_fprintf(trace, "<%s ", descName);
 	}
 }
 
@@ -76,9 +76,9 @@
 {
 	if (XMTDump) {
 		if (has_children) {
-			fprintf(trace, ">\n");
+			gf_fprintf(trace, ">\n");
 		} else {
-			fprintf(trace, "/>\n");
+			gf_fprintf(trace, "/>\n");
 		}
 	}
 }
@@ -88,11 +88,11 @@
 	char ind_buf[GF_IPMPX_MAX_TREE];
 	GF_IPMPX_FORMAT_INDENT(ind_buf, indent);
 
-	fprintf(trace, "%s", ind_buf);
+	gf_fprintf(trace, "%s", ind_buf);
 	if (!XMTDump) {
-		fprintf(trace, "}\n");
+		gf_fprintf(trace, "}\n");
 	} else {
-		fprintf(trace, "</%s>\n", descName);
+		gf_fprintf(trace, "</%s>\n", descName);
 	}
 }
 
@@ -101,17 +101,17 @@
 	char ind_buf[GF_IPMPX_MAX_TREE];
 	GF_IPMPX_FORMAT_INDENT(ind_buf, indent);
 	if (!XMTDump) {
-		fprintf(trace, "%s%s ", ind_buf, attName);
+		gf_fprintf(trace, "%s%s ", ind_buf, attName);
 	} else {
-		fprintf(trace, "%s=\"", attName);
+		gf_fprintf(trace, "%s=\"", attName);
 	}
 }
 static void EndAttribute(FILE *trace, u32 indent, Bool XMTDump)
 {
 	if (!XMTDump) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	} else {
-		fprintf(trace, "\" ");
+		gf_fprintf(trace, "\" ");
 	}
 }
 
@@ -119,7 +119,7 @@
 {
 	if (!val) return;
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%d", val);
+	gf_fprintf(trace, "%d", val);
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -127,7 +127,7 @@
 {
 	if (!val) return;
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, LLU, val);
+	gf_fprintf(trace, LLU, val);
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -136,7 +136,7 @@
 	if (!val) return;
 
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%s", val ? "true" : "false");
+	gf_fprintf(trace, "%s", "true");
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -147,7 +147,7 @@
 	if (!name && !data) return;
 
 	if (name) StartAttribute(trace, name, indent, XMTDump);
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 
 	ASCII_Dump = GF_TRUE;
 	for (i=0; i<dataLength; i++) {
@@ -156,16 +156,16 @@
 			break;
 		}
 	}
-	if (!ASCII_Dump && XMTDump) fprintf(trace, "data:application/octet-string,");
+	if (!ASCII_Dump && XMTDump) gf_fprintf(trace, "data:application/octet-string,");
 	for (i=0; i<dataLength; i++) {
 		if (ASCII_Dump) {
-			fprintf(trace, "%c", (unsigned char) data[i]);
+			gf_fprintf(trace, "%c", (unsigned char) data[i]);
 		} else {
-			fprintf(trace, "%%");
-			fprintf(trace, "%02X", (unsigned char) data[i]);
+			gf_fprintf(trace, "%%");
+			gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 		}
 	}
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	if (name) EndAttribute(trace, indent, XMTDump);
 }
 static void DumpData_16(FILE *trace, char *name, u16 *data, u16 dataLength, u32 indent, Bool XMTDump)
@@ -173,17 +173,17 @@
 	u32 i;
 	if (!name && !data) return;
 	if (name) StartAttribute(trace, name, indent, XMTDump);
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	for (i=0; i<dataLength; i++) {
 		if (XMTDump) {
-			fprintf(trace, "\'%d\'", data[i]);
-			if (i+1<dataLength) fprintf(trace, " ");
+			gf_fprintf(trace, "\'%d\'", data[i]);
+			if (i+1<dataLength) gf_fprintf(trace, " ");
 		} else {
-			fprintf(trace, "%d", data[i]);
-			if (i+1<dataLength) fprintf(trace, ", ");
+			gf_fprintf(trace, "%d", data[i]);
+			if (i+1<dataLength) gf_fprintf(trace, ", ");
 		}
 	}
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	if (name) EndAttribute(trace, indent, XMTDump);
 }
 static void DumpBin128(FILE *trace, char *name, char *data, u32 indent, Bool XMTDump)
@@ -191,13 +191,13 @@
 	u32 i;
 	if (!name ||!data) return;
 	StartAttribute(trace, name, indent, XMTDump);
-	fprintf(trace, "0x");
+	gf_fprintf(trace, "0x");
 	i=0;
 	while (!data[i] && (i<16)) i++;
 	if (i==16) {
-		fprintf(trace, "00");
+		gf_fprintf(trace, "00");
 	} else {
-		for (; i<16; i++) fprintf(trace, "%02X", (unsigned char) data[i]);
+		for (; i<16; i++) gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 	EndAttribute(trace, indent, XMTDump);
 }
@@ -208,8 +208,8 @@
 	u32 i;
 	if (!name ||!data) return;
 	StartAttribute(trace, name, indent, XMTDump);
-	fprintf(trace, "0x");
-	for (i=0; i<5; i++) fprintf(trace, "%02X", (unsigned char) data[i]);
+	gf_fprintf(trace, "0x");
+	for (i=0; i<5; i++) gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -220,7 +220,7 @@
 			StartElement(trace, attName ? attName : (char*)"ByteArray", indent, XMTDump);
 			indent++;
 			DumpData(trace, "array", _p->data, _p->length, indent, XMTDump);
-			indent--;
+			//indent--;
 			EndAttributes(trace, GF_TRUE, GF_FALSE);
 		} else {
 			DumpData(trace, attName ? attName : "ByteArray", _p->data, _p->length, indent, GF_FALSE);
@@ -435,8 +435,8 @@
 				} else {
 					StartAttribute(trace, "", indent, GF_FALSE);
 					DumpData(trace, NULL, ipd->data, ipd->length, indent, GF_FALSE);
-					if (i+1<count) fprintf(trace, ",");
-					fprintf(trace, "\n");
+					if (i+1<count) gf_fprintf(trace, ",");
+					gf_fprintf(trace, "\n");
 				}
 			}
 			EndList(trace, "certificates", indent, XMTDump);
@@ -608,17 +608,17 @@
 	indent++;
 	DumpInt(trace, "scope", p->scope, indent, XMTDump);
 	StartAttribute(trace, "eventType", indent, XMTDump);
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	for (i=0; i<p->eventTypeCount; i++) {
 		if (XMTDump) {
-			fprintf(trace, "\'%d\'", p->eventType[i]);
-			if (i+1<p->eventTypeCount) fprintf(trace, " ");
+			gf_fprintf(trace, "\'%d\'", p->eventType[i]);
+			if (i+1<p->eventTypeCount) gf_fprintf(trace, " ");
 		} else {
-			fprintf(trace, "%d", p->eventType[i]);
-			if (i+1<p->eventTypeCount) fprintf(trace, ",");
+			gf_fprintf(trace, "%d", p->eventType[i]);
+			if (i+1<p->eventTypeCount) gf_fprintf(trace, ",");
 		}
 	}
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	EndAttribute(trace, indent, XMTDump);
 	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);
@@ -633,17 +633,17 @@
 	StartElement(trace, "IPMP_RemoveToolNotificationListener", indent, XMTDump);
 	indent++;
 	StartAttribute(trace, "eventType", indent, XMTDump);
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	for (i=0; i<p->eventTypeCount; i++) {
 		if (XMTDump) {
-			fprintf(trace, "\'%d\'", p->eventType[i]);
-			if (i+1<p->eventTypeCount) fprintf(trace, " ");
+			gf_fprintf(trace, "\'%d\'", p->eventType[i]);
+			if (i+1<p->eventTypeCount) gf_fprintf(trace, " ");
 		} else {
-			fprintf(trace, "%d", p->eventType[i]);
-			if (i+1<p->eventTypeCount) fprintf(trace, ",");
+			gf_fprintf(trace, "%d", p->eventType[i]);
+			if (i+1<p->eventTypeCount) gf_fprintf(trace, ",");
 		}
 	}
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	EndAttribute(trace, indent, XMTDump);
 	EndAttributes(trace, XMTDump, GF_TRUE);
 	gf_ipmpx_dump_BaseData(_p, trace, indent, XMTDump);

gpac-0.8.0.tar.gz/src/odf/ipmpx_parse.c -> gpac-1.0.0.tar.gz/src/odf/ipmpx_parse.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 / MPEG-4 ObjectDescriptor sub-project
@@ -144,7 +144,7 @@
 
 #include <gpac/internal/odf_parse_common.h>
 
-void GF_IPMPX_ParseBinData(char *val, char **out_data, u32 *out_data_size)
+void GF_IPMPX_ParseBinData(char *val, u8 **out_data, u32 *out_data_size)
 {
 	u32 i, c, len;
 	char s[3];
@@ -169,28 +169,6 @@
 	}
 }
 
-void GF_IPMPX_ParseFileData(char *fileName, char **out_data, u32 *out_data_size)
-{
-	FILE *f;
-	u32 size;
-	if (*out_data) gf_free(*out_data);
-	*out_data = NULL;
-	*out_data_size = 0;
-	f = gf_fopen(fileName, "rb");
-	if (!f) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[IPMPX Parse] cannot open data file %s - skipping\n", fileName));
-		return;
-	}
-	gf_fseek(f, 0, SEEK_END);
-	assert(gf_ftell(f) < 1<<31);
-	size = (u32) gf_ftell(f);
-	gf_fseek(f, 0, SEEK_SET);
-	*out_data = (char*)gf_malloc(sizeof(char) * size);
-	size = (s32) fread(*out_data, sizeof(char), size, f);
-	if ((s32) size >= 0)
-		*out_data_size = size;
-	gf_fclose(f);
-}
 
 void GF_IPMPX_ParseBin128(char *val, bin128 *data)
 {
@@ -347,25 +325,34 @@
 			else p->flags |= 8;
 			ret = 1;
 		}
-		else if (!stricmp(fieldName, "startDTS")) GET_U64(p->startDTS)
-			else if (!stricmp(fieldName, "startPacketID")) GET_U32(p->startPacketID)
-				else if (!stricmp(fieldName, "expireDTS")) GET_U32(p->expireDTS)
-					else if (!stricmp(fieldName, "expirePacketID")) GET_U32(p->expirePacketID)
-					}
-	break;
+		else if (!stricmp(fieldName, "startPacketID")) {
+			GET_U32(p->startPacketID)
+		}
+		else if (!stricmp(fieldName, "expirePacketID")) {
+			GET_U32(p->expirePacketID)
+		}
+		else if (!stricmp(fieldName, "startDTS")) {
+			GET_U64(p->startDTS)
+		}
+		else if (!stricmp(fieldName, "expireDTS")) {
+			GET_U64(p->expireDTS)
+		}
+
+	}
+		break;
 	case GF_IPMPX_SECURE_CONTAINER_TAG:
 	{
 		GF_IPMPX_SecureContainer*p = (GF_IPMPX_SecureContainer*)_p;
 		if (!stricmp(fieldName, "isMACEncrypted")) GET_BOOL(p->isMACEncrypted)
-		}
-	break;
+	}
+		break;
 	case GF_IPMPX_INIT_AUTHENTICATION_TAG:
 	{
 		GF_IPMPX_InitAuthentication *p = (GF_IPMPX_InitAuthentication*)_p;
 		if (!stricmp(fieldName, "Context")) GET_U32(p->Context)
-			else if (!stricmp(fieldName, "AuthType")) GET_U8(p->AuthType)
-			}
-	break;
+		else if (!stricmp(fieldName, "AuthType")) GET_U8(p->AuthType)
+	}
+		break;
 	case GF_IPMPX_TRUSTED_TOOL_TAG:
 	{
 		GF_IPMPX_TrustedTool *p = (GF_IPMPX_TrustedTool*)_p;

gpac-0.8.0.tar.gz/src/odf/oci_codec.c -> gpac-1.0.0.tar.gz/src/odf/oci_codec.c Changed

@@ -76,11 +76,10 @@
 GF_EXPORT
 void gf_oci_event_del(OCIEvent *event)
 {
-	GF_Descriptor *desc;
 	if (!event) return;
 
 	while (gf_list_count(event->OCIDescriptors)) {
-		desc = (GF_Descriptor *)gf_list_get(event->OCIDescriptors, 0);
+		GF_Descriptor *desc = (GF_Descriptor *)gf_list_get(event->OCIDescriptors, 0);
 		gf_list_rem(event->OCIDescriptors, 0);
 		gf_odf_delete_descriptor(desc);
 	}
@@ -206,11 +205,10 @@
 GF_EXPORT
 void gf_oci_codec_del(OCICodec *codec)
 {
-	OCIEvent *ev;
 	if (!codec) return;
 
 	while (gf_list_count(codec->OCIEvents)) {
-		ev = (OCIEvent *)gf_list_get(codec->OCIEvents, 0);
+		OCIEvent *ev = (OCIEvent *)gf_list_get(codec->OCIEvents, 0);
 		gf_oci_event_del(ev);
 		gf_list_rem(codec->OCIEvents, 0);
 	}
@@ -263,7 +261,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_oci_codec_encode(OCICodec *codec, char **outAU, u32 *au_length)
+GF_Err gf_oci_codec_encode(OCICodec *codec, u8 **outAU, u32 *au_length)
 {
 	GF_BitStream *bs;
 	u32 i, size, desc_size;
@@ -325,7 +323,7 @@
 
 
 GF_EXPORT
-GF_Err gf_oci_codec_decode(OCICodec *codec, char *au, u32 au_length)
+GF_Err gf_oci_codec_decode(OCICodec *codec, u8 *au, u32 au_length)
 {
 	OCIEvent *ev;
 	GF_BitStream *bs;

gpac-0.8.0.tar.gz/src/odf/odf_code.c -> gpac-1.0.0.tar.gz/src/odf/odf_code.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / MPEG-4 ObjectDescriptor sub-project
@@ -87,7 +87,7 @@
 	}
 	/*we want to use strlen to get rid of "stringLength" => we need an extra 0*/
 	(*string) = (char *) gf_malloc(length + 1);
-	if (! string) return GF_OUT_OF_MEM;
+	if (! *string) return GF_OUT_OF_MEM;
 	gf_bs_read_data(bs, (*string), length);
 	*readBytes += length;
 	(*string)[length] = 0;
@@ -269,8 +269,6 @@
 		esd->OCRESID = gf_bs_read_int(bs, 16);
 		nbBytes += 2;
 	}
-	/*fix broken sync*/
-//	if (esd->OCRESID == esd->ESID) esd->OCRESID = 0;
 
 	while (nbBytes < DescSize) {
 		GF_Descriptor *tmp = NULL;
@@ -285,7 +283,10 @@
 		if (e) return e;
 		if (!tmp) return GF_ODF_INVALID_DESCRIPTOR;
 		e = AddDescriptorToESD(esd, tmp);
-		if (e) return e;
+		if (e) {
+			gf_odf_desc_del(tmp);
+			return e;
+		}
 		nbBytes += tmp_size + gf_odf_size_field_size(tmp_size);
 
 		//apple fix
@@ -306,10 +307,6 @@
 	*outSize = 0;
 	*outSize += 3;
 
-	/*this helps keeping proper sync: some people argue that OCR_ES_ID == ES_ID is a circular reference
-	of streams. Since this is equivalent to no OCR_ES_ID, keep it that way*/
-//	if (esd->OCRESID == esd->ESID) esd->OCRESID = 0;
-
 	if (esd->dependsOnESID) *outSize += 2;
 	if (esd->URLString) *outSize += gf_odf_size_url_string(esd->URLString);
 	if (esd->OCRESID) *outSize += 2;
@@ -506,7 +503,10 @@
 		if (e) return e;
 		if (!tmp) return GF_ODF_INVALID_DESCRIPTOR;
 		e = AddDescriptorToIOD(iod, tmp);
-		if (e) return e;
+		if (e) {
+			gf_odf_delete_descriptor(tmp);
+			return e;
+		}
 		nbBytes += tmp_size + gf_odf_size_field_size(tmp_size);
 	}
 	if (DescSize != nbBytes) return GF_ODF_INVALID_DESCRIPTOR;
@@ -675,7 +675,10 @@
 		if (e) return e;
 		if (!tmp) return GF_ODF_INVALID_DESCRIPTOR;
 		e = AddDescriptorToOD(od, tmp);
-		if (e) return e;
+		if (e) {
+			gf_odf_desc_del(tmp);
+			return e;
+		}
 		nbBytes += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
@@ -842,10 +845,16 @@
 	while (nbBytes < DescSize) {
 		GF_Descriptor *tmp = NULL;
 		e = gf_odf_parse_descriptor(bs, &tmp, &tmpSize);
-		if (e) return e;
+		if (e) {
+			if (tmp) gf_odf_desc_del((GF_Descriptor *) tmp);
+			return e;
+		}
 		if (!tmp) return GF_ODF_INVALID_DESCRIPTOR;
 		e = AddDescriptorToIsomIOD(iod, tmp);
-		if (e) return e;
+		if (e) {
+			gf_odf_desc_del(tmp);
+			return e;
+		}
 		nbBytes += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (DescSize != nbBytes) return GF_ODF_INVALID_DESCRIPTOR;
@@ -1025,7 +1034,10 @@
 		if (e) return e;
 		if (!tmp) return GF_ODF_INVALID_DESCRIPTOR;
 		e = AddDescriptorToIsomOD(od, tmp);
-		if (e) return e;
+		if (e) {
+			gf_odf_delete_descriptor(tmp);
+			return e;
+		}
 		nbBytes += tmpSize + gf_odf_size_field_size(tmpSize);
 	}
 	if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
@@ -1172,12 +1184,24 @@
 	return GF_OK;
 }
 
+#include <gpac/constants.h>
+
 GF_Err gf_odf_size_dcd(GF_DecoderConfig *dcd, u32 *outSize)
 {
 	GF_Err e;
 	u32 tmpSize;
+	u32 oti;
 	if (! dcd) return GF_BAD_PARAM;
 
+	oti = dcd->objectTypeIndication;
+	if (oti > 0xFF) {
+		oti = gf_codecid_oti(oti);
+	}
+	if (oti > 0xFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[ODF] Attempt to write an internal ESD with codec ID %s (%s) , not mappable to 8 bits MPEG-4 Systems OTI", gf_4cc_to_str(dcd->objectTypeIndication), gf_codecid_name(dcd->objectTypeIndication) ));
+		return GF_BAD_PARAM;
+	}
+
 	*outSize = 0;
 	*outSize += 13;
 	if (dcd->decoderSpecificInfo) {
@@ -1196,15 +1220,24 @@
 GF_Err gf_odf_write_dcd(GF_BitStream *bs, GF_DecoderConfig *dcd)
 {
 	GF_Err e;
-	u32 size;
+	u32 size, oti;
 	if (! dcd) return GF_BAD_PARAM;
+	
+	oti = dcd->objectTypeIndication;
+	if (oti > 0xFF) {
+		oti = gf_codecid_oti(oti);
+	}
+	if (oti > 0xFF) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[ODF] Attempt to write an internal ESD with codec ID %s (%s) , not mappable to 8 bits MPEG-4 Systems OTI", gf_4cc_to_str(dcd->objectTypeIndication), gf_codecid_name(dcd->objectTypeIndication) ));
+		return GF_BAD_PARAM;
+	}
 
 	e = gf_odf_size_descriptor((GF_Descriptor *)dcd, &size);
 	if (e) return e;
 	e = gf_odf_write_base_descriptor(bs, dcd->tag, size);
 	if (e) return e;
 
-	gf_bs_write_int(bs, dcd->objectTypeIndication, 8);
+	gf_bs_write_int(bs, oti, 8);
 	gf_bs_write_int(bs, dcd->streamType, 6);
 	gf_bs_write_int(bs, dcd->upstream, 1);
 	gf_bs_write_int(bs, 1, 1);	//reserved field...
@@ -1450,45 +1483,7 @@
 	}
 	return GF_OK;
 }
-GF_Descriptor *gf_odf_new_mediatime()
-{
-	GF_MediaTime *newDesc = (GF_MediaTime *) gf_malloc(sizeof(GF_MediaTime));
-	if (!newDesc) return NULL;
 
-	memset(newDesc, 0, sizeof(GF_MediaTime));
-	newDesc->tag = GF_ODF_MEDIATIME_TAG;
-	return (GF_Descriptor *) newDesc;
-}
-GF_Err gf_odf_del_mediatime(GF_MediaTime *mt)
-{
-	if (!mt) return GF_BAD_PARAM;
-	gf_free(mt);
-	return GF_OK;
-}
-GF_Err gf_odf_read_mediatime(GF_BitStream *bs, GF_MediaTime *mt, u32 DescSize)
-{
-	if (!mt) return GF_BAD_PARAM;
-	mt->mediaTimeStamp = gf_bs_read_double(bs);
-	return GF_OK;
-}
-GF_Err gf_odf_size_mediatime(GF_MediaTime *mt, u32 *outSize)
-{
-	if (!mt) return GF_BAD_PARAM;
-	*outSize = 8;
-	return GF_OK;
-}
-GF_Err gf_odf_write_mediatime(GF_BitStream *bs, GF_MediaTime *mt)
-{
-	GF_Err e;
-	u32 size;
-	if (!mt) return GF_BAD_PARAM;
-	e = gf_odf_size_descriptor((GF_Descriptor *)mt, &size);
-	if (e) return e;
-	e = gf_odf_write_base_descriptor(bs, mt->tag, size);
-	if (e) return e;
-	gf_bs_write_double(bs, mt->mediaTimeStamp);
-	return GF_OK;
-}
 
 
 GF_Descriptor *gf_odf_new_lang()
@@ -1656,10 +1651,6 @@
 	return GF_OK;
 }
 
-GF_Err gf_odf_read_muxinfo(GF_BitStream *bs, GF_MuxInfo *mi, u32 DescSize)
-{
-	return GF_OK;
-}
 GF_Err gf_odf_size_muxinfo(GF_MuxInfo *mi, u32 *outSize)
 {
 	*outSize = 0;
@@ -1744,7 +1735,45 @@
 
 #ifndef GPAC_MINIMAL_ODF
 
+GF_Descriptor *gf_odf_new_mediatime()
+{
+	GF_MediaTime *newDesc = (GF_MediaTime *) gf_malloc(sizeof(GF_MediaTime));
+	if (!newDesc) return NULL;
 
+	memset(newDesc, 0, sizeof(GF_MediaTime));
+	newDesc->tag = GF_ODF_MEDIATIME_TAG;
+	return (GF_Descriptor *) newDesc;
+}
+GF_Err gf_odf_del_mediatime(GF_MediaTime *mt)
+{
+	if (!mt) return GF_BAD_PARAM;
+	gf_free(mt);
+	return GF_OK;
+}
+GF_Err gf_odf_read_mediatime(GF_BitStream *bs, GF_MediaTime *mt, u32 DescSize)
+{
+	if (!mt) return GF_BAD_PARAM;
+	mt->mediaTimeStamp = gf_bs_read_double(bs);
+	return GF_OK;
+}
+GF_Err gf_odf_size_mediatime(GF_MediaTime *mt, u32 *outSize)
+{
+	if (!mt) return GF_BAD_PARAM;
+	*outSize = 8;
+	return GF_OK;
+}
+GF_Err gf_odf_write_mediatime(GF_BitStream *bs, GF_MediaTime *mt)
+{
+	GF_Err e;
+	u32 size;
+	if (!mt) return GF_BAD_PARAM;
+	e = gf_odf_size_descriptor((GF_Descriptor *)mt, &size);
+	if (e) return e;
+	e = gf_odf_write_base_descriptor(bs, mt->tag, size);
+	if (e) return e;
+	gf_bs_write_double(bs, mt->mediaTimeStamp);
+	return GF_OK;
+}
 
 GF_Descriptor *gf_odf_new_cc()
 {
@@ -1908,7 +1937,10 @@
 		nbBytes += 4;
 
 		e = OD_ReadUTF8String(bs, & tmp->contentCreatorName, tmp->isUTF8, &len);
-		if (e) return e;
+		if (e) {
+			gf_free(tmp);
+			return e;
+		}
 		nbBytes += len;
 		e = gf_list_add(cnd->ContentCreators, tmp);
 		if (e) return e;
@@ -2125,7 +2157,10 @@
 		if (! description) return GF_OUT_OF_MEM;
 		description->text = NULL;
 		e = OD_ReadUTF8String(bs, & description->text, etd->isUTF8, &len);
-		if (e) return e;
+		if (e) {
+			gf_free(description);
+			return e;
+		}
 		e = gf_list_add(etd->itemDescriptionList, description);
 		if (e) return e;
 		nbBytes += len;
@@ -2165,7 +2200,6 @@
 GF_Err gf_odf_size_exp_text(GF_ExpandedTextual *etd, u32 *outSize)
 {
 	u32 i, len, nonLen, lentmp, count;
-	GF_ETD_ItemText *tmp;
 	if (!etd) return GF_BAD_PARAM;
 
 	*outSize = 5;
@@ -2173,7 +2207,7 @@
 
 	count = gf_list_count(etd->itemDescriptionList);
 	for (i=0; i<count; i++) {
-		tmp = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
+		GF_ETD_ItemText *tmp = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
 		*outSize += OD_SizeUTF8String(tmp->text, etd->isUTF8);
 		tmp = (GF_ETD_ItemText*)gf_list_get(etd->itemTextList, i);
 		*outSize += OD_SizeUTF8String(tmp->text, etd->isUTF8);
@@ -2208,7 +2242,6 @@
 {
 	GF_Err e;
 	u32 size, i, len, nonLen, lentmp, count;
-	GF_ETD_ItemText *tmp;
 	if (!etd) return GF_BAD_PARAM;
 
 	if (gf_list_count(etd->itemDescriptionList) != gf_list_count(etd->itemTextList)) return GF_ODF_INVALID_DESCRIPTOR;
@@ -2225,7 +2258,7 @@
 
 	count = gf_list_count(etd->itemDescriptionList);
 	for (i=0; i<count; i++) {
-		tmp = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
+		GF_ETD_ItemText *tmp = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
 		OD_WriteUTF8String(bs, tmp->text, etd->isUTF8);
 		tmp = (GF_ETD_ItemText*)gf_list_get(etd->itemTextList, i);
 		OD_WriteUTF8String(bs, tmp->text, etd->isUTF8);
@@ -2411,6 +2444,7 @@
 	/*IPMPX escape*/
 	if ((ipmp->IPMP_DescriptorID==0xFF) && (ipmp->IPMPS_Type==0xFFFF)) {
 		ipmp->IPMP_DescriptorIDEx = gf_bs_read_int(bs, 16);
+		if (gf_bs_available(bs) < 16) return GF_ODF_INVALID_DESCRIPTOR;
 		gf_bs_read_data(bs, (char*)ipmp->IPMP_ToolID, 16);
 		ipmp->control_point = gf_bs_read_int(bs, 8);
 		nbBytes += 19;
@@ -2616,7 +2650,11 @@
 		GF_KeyWordItem *tmp = (GF_KeyWordItem*)gf_malloc(sizeof(GF_KeyWordItem));
 		if (! tmp) return GF_OUT_OF_MEM;
 		e = OD_ReadUTF8String(bs, & tmp->keyWord, kwd->isUTF8, &len);
-		if (e) return e;
+		if (e) {
+			if (tmp->keyWord) gf_free(tmp->keyWord);
+			gf_free(tmp);
+			return e;
+		}
 		nbBytes += len;
 		if (nbBytes > DescSize) {
 			gf_free(tmp->keyWord);
@@ -2624,7 +2662,10 @@
 			return GF_ODF_INVALID_DESCRIPTOR;
 		}
 		e = gf_list_add(kwd->keyWordsList, tmp);
-		if (e) return e;
+		if (e) {
+			if (tmp) gf_free(tmp);
+			return e;
+		}
 	}
 	if (nbBytes != DescSize) return GF_ODF_INVALID_DESCRIPTOR;
 	return GF_OK;
@@ -2762,7 +2803,10 @@
 		/*aligned = */gf_bs_read_int(bs, 7);
 		nbBytes += 4;
 		e = OD_ReadUTF8String(bs, & tmp->OCICreatorName, tmp->isUTF8, &len);
-		if (e) return e;
+		if (e) {
+			gf_free(tmp);
+			return e;
+		}
 		nbBytes += len;
 		e = gf_list_add(ocn->OCICreators, tmp);
 		if (e) return e;
@@ -3293,9 +3337,9 @@
 		ipmpt->num_alternate = gf_bs_read_int(bs, 8);
 		nbBytes += 1;
 		for (i=0; i<ipmpt->num_alternate; i++) {
+			if (nbBytes + 16 > DescSize) return GF_ODF_INVALID_DESCRIPTOR;
 			gf_bs_read_data(bs, (char*)ipmpt->specificToolID[i], 16);
 			nbBytes += 16;
-			if (nbBytes>DescSize) break;
 		}
 	}
 	if (nbBytes>DescSize) return GF_ODF_INVALID_DESCRIPTOR;

gpac-0.8.0.tar.gz/src/odf/odf_codec.c -> gpac-1.0.0.tar.gz/src/odf/odf_codec.c Changed

@@ -120,7 +120,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_odf_codec_get_au(GF_ODCodec *codec, char **outAU, u32 *au_length)
+GF_Err gf_odf_codec_get_au(GF_ODCodec *codec, u8 **outAU, u32 *au_length)
 {
 	if (!codec || !codec->bs || !outAU || *outAU) return GF_BAD_PARAM;
 	gf_bs_get_content(codec->bs, outAU, au_length);
@@ -136,7 +136,7 @@
 ************************************************************/
 
 GF_EXPORT
-GF_Err gf_odf_codec_set_au(GF_ODCodec *codec, const char *au, u32 au_length)
+GF_Err gf_odf_codec_set_au(GF_ODCodec *codec, const u8 *au, u32 au_length)
 {
 	if (!codec ) return GF_BAD_PARAM;
 	if (!au || !au_length) return GF_OK;
@@ -258,12 +258,11 @@
 GF_Err gf_odf_desc_list_del(GF_List *descList)
 {
 	GF_Err e;
-	GF_Descriptor *tmp;
 
 	if (! descList) return GF_BAD_PARAM;
 
 	while (gf_list_count(descList)) {
-		tmp = (GF_Descriptor*)gf_list_get(descList, 0);
+		GF_Descriptor *tmp = (GF_Descriptor*)gf_list_get(descList, 0);
 		gf_list_rem(descList, 0);
 		e = gf_odf_delete_descriptor(tmp);
 		if (e) return e;
@@ -288,7 +287,7 @@
 //use this function to decode a standalone descriptor
 //the desc MUST be formatted with tag and size field!!!
 GF_EXPORT
-GF_Err gf_odf_desc_read(char *raw_desc, u32 descSize, GF_Descriptor **outDesc)
+GF_Err gf_odf_desc_read(u8 *raw_desc, u32 descSize, GF_Descriptor **outDesc)
 {
 	GF_Err e;
 	u32 size;
@@ -324,15 +323,13 @@
 
 	//then encode our desc...
 	e = gf_odf_write_descriptor(bs, desc);
-	if (e) {
-		gf_bs_del(bs);
-		return e;
-	}
+	if (e) return e;
+	
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_odf_desc_write(GF_Descriptor *desc, char **outEncDesc, u32 *outSize)
+GF_Err gf_odf_desc_write(GF_Descriptor *desc, u8 **outEncDesc, u32 *outSize)
 {
 	GF_Err e;
 	GF_BitStream *bs;
@@ -374,14 +371,29 @@
 GF_Err gf_odf_desc_copy(GF_Descriptor *inDesc, GF_Descriptor **outDesc)
 {
 	GF_Err e;
-	char *desc;
-	u32 size;
+	u8 *desc;
+	u32 size, oti=0;
+
+	//patch for esd copy, we now signal codecid (32 bit) in OTI (8 bits)
+	if (inDesc->tag == GF_ODF_ESD_TAG) {
+		GF_ESD *esd = (GF_ESD *)inDesc;
+		if (esd->decoderConfig) {
+			oti = esd->decoderConfig->objectTypeIndication;
+			esd->decoderConfig->objectTypeIndication = 0;
+		}
+	}
 
 	//warning: here we get some data allocated
 	e = gf_odf_desc_write(inDesc, &desc, &size);
 	if (e) return e;
 	e = gf_odf_desc_read(desc, size, outDesc);
 	gf_free(desc);
+	if (oti && !e) {
+		GF_ESD *esd = (GF_ESD *)inDesc;
+		GF_ESD *out_esd = (GF_ESD *)*outDesc;
+		if (esd->decoderConfig) esd->decoderConfig->objectTypeIndication = oti;
+		if (out_esd->decoderConfig) out_esd->decoderConfig->objectTypeIndication = oti;
+	}
 	return e;
 }
 
@@ -467,10 +479,12 @@
 	IPMP_Declarators.
 		As it could be used for other purposes we keep it generic
 	You must create the list yourself, the functions just encode/decode from/to the list
+
+	These functions are also used in mp4 for extension descriptor in LASeR and AVC sample descriptions
 *****************************************************************************************/
 
 GF_EXPORT
-GF_Err gf_odf_desc_list_read(char *raw_list, u32 raw_size, GF_List *descList)
+GF_Err gf_odf_desc_list_read(u8 *raw_list, u32 raw_size, GF_List *descList)
 {
 	GF_BitStream *bs;
 	u32 size, desc_size;
@@ -499,7 +513,7 @@
 
 
 GF_EXPORT
-GF_Err gf_odf_desc_list_write(GF_List *descList, char **outEncList, u32 *outSize)
+GF_Err gf_odf_desc_list_write(GF_List *descList, u8 **outEncList, u32 *outSize)
 {
 	GF_BitStream *bs;
 	GF_Err e;
@@ -543,18 +557,18 @@
 			com = (GF_ODCom *)gf_list_get(codec->CommandList, i);
 			/*process OD updates*/
 			if (com->tag==GF_ODF_OD_UPDATE_TAG) {
-				u32 count, j, k;
+				u32 count2, j, k;
 				GF_ODRemove *odR = (GF_ODRemove *) command;
 				odU = (GF_ODUpdate *)com;
-				count = gf_list_count(odU->objectDescriptors);
+				count2 = gf_list_count(odU->objectDescriptors);
 				/*remove all descs*/
-				for (k=0; k<count; k++) {
+				for (k=0; k<count2; k++) {
 					GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, k);
 					for (j=0; j<odR->NbODs; j++) {
 						if (od->objectDescriptorID==odR->OD_ID[j]) {
 							gf_list_rem(odU->objectDescriptors, k);
 							k--;
-							count--;
+							count2--;
 							gf_odf_desc_del((GF_Descriptor *)od);
 							break;
 						}
@@ -581,6 +595,21 @@
 					}
 				}
 			}
+			/*process ESD remove*/
+			else if (com->tag==GF_ODF_ESD_REMOVE_TAG) {
+				u32 j;
+				GF_ODRemove *odR = (GF_ODRemove *) command;
+				GF_ESDRemove *esdR = (GF_ESDRemove*)com;
+				for (j=0; j<odR->NbODs; j++) {
+					if (esdR->ODID==odR->OD_ID[j]) {
+						gf_list_rem(codec->CommandList, i);
+						i--;
+						count--;
+						gf_odf_com_del((GF_ODCom**)&esdR);
+						break;
+					}
+				}
+			}
 		}
 		return GF_OK;
 	case GF_ODF_OD_UPDATE_TAG:
@@ -617,6 +646,91 @@
 
 		}
 		return GF_OK;
+	case GF_ODF_ESD_REMOVE_TAG:
+		for (i=0; i<count; i++) {
+			com = (GF_ODCom *)gf_list_get(codec->CommandList, i);
+			/*process OD updates*/
+			if (com->tag==GF_ODF_OD_UPDATE_TAG) {
+				u32 count2, j, k, l;
+				GF_ESDRemove *esdR = (GF_ESDRemove *) command;
+				odU = (GF_ODUpdate *)com;
+				count2 = gf_list_count(odU->objectDescriptors);
+				/*remove all descs*/
+				for (k=0; k<count2; k++) {
+					GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, k);
+					for (j=0; j<gf_list_count(od->ESDescriptors); j++) {
+						GF_ESD *esd = gf_list_get(od->ESDescriptors, j);
+						for (l=0; l<esdR->NbESDs; l++) {
+							if (esdR->ES_ID[l] == esd->ESID) {
+								gf_list_rem(od->ESDescriptors, j);
+								j--;
+								gf_odf_desc_del((GF_Descriptor *)esd);
+								break;
+							}
+						}
+					}
+				}
+			}
+			/*process ESD updates*/
+			else if (com->tag==GF_ODF_ESD_UPDATE_TAG) {
+				u32 j, k;
+				GF_ESDRemove *esdR = (GF_ESDRemove *) command;
+				GF_ESDUpdate *esdU = (GF_ESDUpdate*)com;
+				for (j=0; j<gf_list_count(esdU->ESDescriptors); j++) {
+					GF_ESD *esd = gf_list_get(esdU->ESDescriptors, j);
+					for (k=0; k<esdR->NbESDs; k++) {
+						if (esd->ESID == esdR->ES_ID[k]) {
+							gf_list_rem(codec->CommandList, j);
+							j--;
+							gf_odf_desc_del((GF_Descriptor *)esd);
+						}
+					}
+				}
+				if (!gf_list_count(esdU->ESDescriptors)) {
+					gf_list_rem(codec->CommandList, i);
+					i--;
+					count--;
+					gf_odf_com_del((GF_ODCom**)&esdU);
+				}
+			}
+		}
+		return GF_OK;
+	case GF_ODF_ESD_UPDATE_TAG:
+		for (i=0; i<count; i++) {
+			com = (GF_ODCom *)gf_list_get(codec->CommandList, i);
+			/*process OD updates*/
+			if (com->tag==GF_ODF_OD_UPDATE_TAG) {
+				u32 count2, k, l;
+				GF_ESDUpdate *esdU = (GF_ESDUpdate *) command;
+				odU = (GF_ODUpdate *)com;
+				count2 = gf_list_count(odU->objectDescriptors);
+				/*remove all descs*/
+				for (k=0; k<count2; k++) {
+					GF_ObjectDescriptor *od = (GF_ObjectDescriptor *)gf_list_get(odU->objectDescriptors, k);
+					if (od->objectDescriptorID==esdU->ODID) {
+						GF_ESD *esd;
+						while (gf_list_count(od->ESDescriptors)) {
+							esd = gf_list_pop_back(od->ESDescriptors);
+							gf_odf_desc_del((GF_Descriptor *)esd);
+						}
+						gf_list_transfer(od->ESDescriptors, esdU->ESDescriptors);
+						l = 0;
+						while ((esd = gf_list_enum(esdU->ESDescriptors, &l))) {
+							GF_ESD *new_esd;
+							GF_Err e = gf_odf_desc_copy((GF_Descriptor*)esd, (GF_Descriptor**)&new_esd);
+							if (e==GF_OK)
+								gf_list_add(od->ESDescriptors, new_esd);
+						}
+						break;
+					}
+				}
+			}
+			/*process ESD updates*/
+			else if (com->tag==GF_ODF_ESD_UPDATE_TAG) {
+				return GF_NOT_SUPPORTED;
+			}
+		}
+		return GF_OK;
 	}
 	return GF_NOT_SUPPORTED;
 }

gpac-0.8.0.tar.gz/src/odf/odf_command.c -> gpac-1.0.0.tar.gz/src/odf/odf_command.c Changed

gpac-0.8.0.tar.gz/src/odf/odf_dump.c -> gpac-1.0.0.tar.gz/src/odf/odf_dump.c Changed

@@ -58,14 +58,17 @@
 		return gf_odf_dump_ipmp_update((GF_IPMPUpdate *)com, trace, indent, XMTDump);
 	case GF_ODF_IPMP_REMOVE_TAG:
 		return gf_odf_dump_ipmp_remove((GF_IPMPRemove *)com, trace, indent, XMTDump);
-#endif
 	default:
 		return gf_odf_dump_base_command((GF_BaseODCom *) com, trace, indent, XMTDump);
+#else
+	default:
+		return GF_NOT_SUPPORTED;
+#endif
 	}
 }
 
-
-GF_EXPORT
+//unused
+#if 0
 GF_Err gf_odf_dump_au(char *data, u32 dataLength, FILE *trace, u32 indent, Bool XMTDump)
 {
 	GF_ODCom *com;
@@ -83,6 +86,7 @@
 	gf_odf_codec_del(odread);
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_odf_dump_com_list(GF_List *commandList, FILE *trace, u32 indent, Bool XMTDump)
@@ -109,16 +113,16 @@
 		return gf_odf_dump_dcd((GF_DecoderConfig *)desc, trace, indent, XMTDump);
 	case GF_ODF_SLC_TAG:
 		return gf_odf_dump_slc((GF_SLConfig *)desc, trace, indent, XMTDump);
-	case GF_ODF_ESD_INC_TAG:
-		return gf_odf_dump_esd_inc((GF_ES_ID_Inc *)desc, trace, indent, XMTDump);
-	case GF_ODF_ESD_REF_TAG:
-		return gf_odf_dump_esd_ref((GF_ES_ID_Ref *)desc, trace, indent, XMTDump);
 	case GF_ODF_ISOM_IOD_TAG:
 		return gf_odf_dump_isom_iod((GF_IsomInitialObjectDescriptor *)desc, trace, indent, XMTDump);
 	case GF_ODF_ISOM_OD_TAG:
 		return gf_odf_dump_isom_od((GF_IsomObjectDescriptor *)desc, trace, indent, XMTDump);
 	case GF_ODF_OD_TAG:
 		return gf_odf_dump_od((GF_ObjectDescriptor *)desc, trace, indent, XMTDump);
+	case GF_ODF_ESD_INC_TAG:
+		return gf_odf_dump_esd_inc((GF_ES_ID_Inc *)desc, trace, indent, XMTDump);
+	case GF_ODF_ESD_REF_TAG:
+		return gf_odf_dump_esd_ref((GF_ES_ID_Ref *)desc, trace, indent, XMTDump);
 #ifndef GPAC_MINIMAL_ODF
 	case GF_ODF_CC_TAG:
 		return gf_odf_dump_cc((GF_CCDescriptor *)desc, trace, indent, XMTDump);
@@ -142,6 +146,7 @@
 	case GF_ODF_KW_TAG:
 		return gf_odf_dump_kw((GF_KeyWord *)desc, trace, indent, XMTDump);
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 		return gf_odf_dump_lang((GF_Language *)desc, trace, indent, XMTDump);
 	case GF_ODF_OCI_DATE_TAG:
 		return gf_odf_dump_oci_date((GF_OCI_Data *)desc, trace, indent, XMTDump);
@@ -196,9 +201,9 @@
 	OD_FORMAT_INDENT(ind_buf, indent);
 
 	if (!XMTDump) {
-		fprintf(trace, "%s {\n", descName);
+		gf_fprintf(trace, "%s {\n", descName);
 	} else {
-		fprintf(trace, "%s<%s ", ind_buf, descName);
+		gf_fprintf(trace, "%s<%s ", ind_buf, descName);
 	}
 }
 
@@ -208,9 +213,9 @@
 	OD_FORMAT_INDENT(ind_buf, indent);
 
 	if (!XMTDump) {
-		fprintf(trace, "%s}\n", ind_buf);
+		gf_fprintf(trace, "%s}\n", ind_buf);
 	} else {
-		fprintf(trace, "%s</%s>\n", ind_buf, descName);
+		gf_fprintf(trace, "%s</%s>\n", ind_buf, descName);
 	}
 }
 
@@ -221,19 +226,19 @@
 	if (XMTDump) {
 		char ind_buf[OD_MAX_TREE];
 		OD_FORMAT_INDENT(ind_buf, indent);
-		fprintf(trace, "%s<%s ", ind_buf, eltName);
+		gf_fprintf(trace, "%s<%s ", ind_buf, eltName);
 	}
 }
 /*special close for XML only, appends "/>" - used because XMT-A OD representations use lots of
 subdescs not present in BT*/
 static void EndSubElement(FILE *trace, u32 indent, Bool XMTDump)
 {
-	if (XMTDump) fprintf(trace, "/>\n");
+	if (XMTDump) gf_fprintf(trace, "/>\n");
 }
 
 static void EndAttributes(FILE *trace, u32 indent, Bool XMTDump)
 {
-	if (XMTDump) fprintf(trace, ">\n");
+	if (XMTDump) gf_fprintf(trace, ">\n");
 }
 
 static void StartElement(FILE *trace, const char *attName, u32 indent, Bool XMTDump, Bool IsList)
@@ -242,11 +247,11 @@
 	OD_FORMAT_INDENT(ind_buf, indent);
 	if (!XMTDump) {
 		if (IsList)
-			fprintf(trace, "%s%s [\n", ind_buf, attName);
+			gf_fprintf(trace, "%s%s [\n", ind_buf, attName);
 		else
-			fprintf(trace, "%s%s ", ind_buf, attName);
+			gf_fprintf(trace, "%s%s ", ind_buf, attName);
 	} else {
-		fprintf(trace, "%s<%s>\n", ind_buf, attName);
+		gf_fprintf(trace, "%s<%s>\n", ind_buf, attName);
 	}
 }
 
@@ -255,9 +260,9 @@
 	char ind_buf[OD_MAX_TREE];
 	OD_FORMAT_INDENT(ind_buf, indent);
 	if (!XMTDump) {
-		if (IsList) fprintf(trace, "%s]\n", ind_buf);
+		if (IsList) gf_fprintf(trace, "%s]\n", ind_buf);
 	} else {
-		fprintf(trace, "%s</%s>\n", ind_buf, attName);
+		gf_fprintf(trace, "%s</%s>\n", ind_buf, attName);
 	}
 }
 
@@ -266,17 +271,17 @@
 	char ind_buf[OD_MAX_TREE];
 	OD_FORMAT_INDENT(ind_buf, indent);
 	if (!XMTDump) {
-		fprintf(trace, "%s%s ", ind_buf, attName);
+		gf_fprintf(trace, "%s%s ", ind_buf, attName);
 	} else {
-		fprintf(trace, "%s=\"", attName);
+		gf_fprintf(trace, "%s=\"", attName);
 	}
 }
 static void EndAttribute(FILE *trace, u32 indent, Bool XMTDump)
 {
 	if (!XMTDump) {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	} else {
-		fprintf(trace, "\" ");
+		gf_fprintf(trace, "\" ");
 	}
 }
 
@@ -284,14 +289,14 @@
 {
 	if (!val) return;
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%d", val);
+	gf_fprintf(trace, "%d", val);
 	EndAttribute(trace, indent, XMTDump);
 }
 
 static void DumpIntForce(FILE *trace, const char *attName, u32  val, u32 indent, Bool XMTDump)
 {
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%d", val);
+	gf_fprintf(trace, "%d", val);
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -299,9 +304,9 @@
 {
 	StartAttribute(trace, attName, indent, XMTDump);
 	if (single_byte) {
-		fprintf(trace, "0x%02X", val);
+		gf_fprintf(trace, "0x%02X", val);
 	} else {
-		fprintf(trace, "0x%08X", val);
+		gf_fprintf(trace, "0x%08X", val);
 	}
 	EndAttribute(trace, indent, XMTDump);
 }
@@ -310,14 +315,14 @@
 static void DumpFloat(FILE *trace, const char *attName, Float val, u32 indent, Bool XMTDump)
 {
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%g", val);
+	gf_fprintf(trace, "%g", val);
 	EndAttribute(trace, indent, XMTDump);
 }
 
 static void DumpDouble(FILE *trace, const char *attName, Double val, u32 indent, Bool XMTDump)
 {
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%g", val);
+	gf_fprintf(trace, "%g", val);
 	EndAttribute(trace, indent, XMTDump);
 }
 static void DumpBin128(FILE *trace, const char *name, char *data, u32 indent, Bool XMTDump)
@@ -325,13 +330,13 @@
 	u32 i;
 	if (!name ||!data) return;
 	StartAttribute(trace, name, indent, XMTDump);
-	fprintf(trace, "0x");
+	gf_fprintf(trace, "0x");
 	i=0;
 	while (!data[i] && (i<16)) i++;
 	if (i==16) {
-		fprintf(trace, "00");
+		gf_fprintf(trace, "00");
 	} else {
-		for (; i<16; i++) fprintf(trace, "%02X", (unsigned char) data[i]);
+		for (; i<16; i++) gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 	EndAttribute(trace, indent, XMTDump);
 }
@@ -343,7 +348,7 @@
 	if (!val) return;
 
 	StartAttribute(trace, attName, indent, XMTDump);
-	fprintf(trace, "%s", val ? "true" : "false");
+	gf_fprintf(trace, "%s", "true");
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -351,9 +356,9 @@
 {
 	if (!val) return;
 	StartAttribute(trace, attName, indent, XMTDump);
-	if (!XMTDump) fprintf(trace, "\"");
-	fprintf(trace, "%s", val);
-	if (!XMTDump) fprintf(trace, "\"");
+	if (!XMTDump) gf_fprintf(trace, "\"");
+	gf_fprintf(trace, "%s", val);
+	if (!XMTDump) gf_fprintf(trace, "\"");
 	EndAttribute(trace, indent, XMTDump);
 }
 
@@ -362,10 +367,10 @@
 	u64 i;
 	if (!name ||!data) return;
 	StartAttribute(trace, name, indent, XMTDump);
-	if (XMTDump) fprintf(trace, "data:application/octet-string,");
+	if (XMTDump) gf_fprintf(trace, "data:application/octet-string,");
 	for (i=0; i<dataLength; i++) {
-		fprintf(trace, "%%");
-		fprintf(trace, "%02X", (unsigned char) data[i]);
+		gf_fprintf(trace, "%%");
+		gf_fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 	EndAttribute(trace, indent, XMTDump);
 }
@@ -373,7 +378,6 @@
 GF_Err DumpDescList(GF_List *list, FILE *trace, u32 indent, const char *ListName, Bool XMTDump, Bool no_skip_empty)
 {
 	u32 i, count;
-	GF_Descriptor *desc;
 	char ind_buf[OD_MAX_TREE];
 	if (!list) return GF_OK;
 	count = gf_list_count(list);
@@ -382,9 +386,9 @@
 	indent++;
 	OD_FORMAT_INDENT(ind_buf, indent);
 	for (i=0; i<count; i++) {
-		desc = (GF_Descriptor *)gf_list_get(list, i);
+		GF_Descriptor *desc = (GF_Descriptor *)gf_list_get(list, i);
 		//add offset if not XMT
-		if (!XMTDump) fprintf(trace, "%s", ind_buf);
+		if (!XMTDump) gf_fprintf(trace, "%s", ind_buf);
 		gf_odf_dump_desc(desc, trace, indent, XMTDump);
 	}
 	indent--;
@@ -415,7 +419,7 @@
 		desc = (GF_Descriptor *)gf_list_get(list, i);
 		if (desc->tag == tag_only) {
 			//add offset if not XMT
-			if (!XMTDump) fprintf(trace, "%s", ind_buf);
+			if (!XMTDump) gf_fprintf(trace, "%s", ind_buf);
 			gf_odf_dump_desc(desc, trace, indent, XMTDump);
 		}
 	}
@@ -431,11 +435,11 @@
 
 	StartAttribute(trace, "objectDescriptorID", indent, XMTDump);
 	if (XMTDump) {
-		fprintf(trace, "od%d", iod->objectDescriptorID);
+		gf_fprintf(trace, "od%d", iod->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 		DumpInt(trace, "binaryID", iod->objectDescriptorID, indent, XMTDump);
 	} else {
-		fprintf(trace, "%d", iod->objectDescriptorID);
+		gf_fprintf(trace, "%d", iod->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 	}
 
@@ -494,11 +498,11 @@
 
 	StartAttribute(trace, "ES_ID", indent, XMTDump);
 	if (XMTDump) {
-		fprintf(trace, "es%d", esd->ESID);
+		gf_fprintf(trace, "es%d", esd->ESID);
 		EndAttribute(trace, indent, XMTDump);
 		DumpInt(trace, "binaryID", esd->ESID, indent, XMTDump);
 	} else {
-		fprintf(trace, "%d", esd->ESID);
+		gf_fprintf(trace, "%d", esd->ESID);
 		EndAttribute(trace, indent, XMTDump);
 	}
 	DumpInt(trace, "streamPriority", esd->streamPriority, indent, XMTDump);
@@ -506,13 +510,13 @@
 	if (XMTDump) {
 		if (esd->dependsOnESID) {
 			StartAttribute(trace, "dependsOn_ES_ID", indent, XMTDump);
-			fprintf(trace, "es%d", esd->dependsOnESID);
+			gf_fprintf(trace, "es%d", esd->dependsOnESID);
 			EndAttribute(trace, indent, XMTDump);
 		}
 
 		if (esd->OCRESID) {
 			StartAttribute(trace, "OCR_ES_ID", indent, XMTDump);
-			fprintf(trace, "es%d", esd->OCRESID);
+			gf_fprintf(trace, "es%d", esd->OCRESID);
 			EndAttribute(trace, indent, XMTDump);
 		}
 	} else {
@@ -697,7 +701,7 @@
 		indent++;
 		StartDescDump(trace, "commandStream" , indent, XMTDump);
 		DumpBool(trace, "pixelMetric", gf_bs_read_int(bs, 1), indent, XMTDump);
-		if (XMTDump) EndAttributes(trace, indent, XMTDump);
+		EndAttributes(trace, indent, XMTDump);
 	} else {
 		DumpBool(trace, "isCommandStream", 1, indent, XMTDump);
 		DumpBool(trace, "pixelMetric", gf_bs_read_int(bs, 1), indent, XMTDump);
@@ -732,28 +736,29 @@
 
 GF_Err gf_odf_dump_laser_cfg(GF_LASERConfig *dsi, FILE *trace, u32 indent, Bool XMTDump)
 {
-	fprintf(trace, "<lsr:LASeRHeader profile=\"%s\" pointsCodec=\"%s\"",
+	gf_fprintf(trace, "<lsr:LASeRHeader profile=\"%s\" pointsCodec=\"%s\"",
 	        dsi->profile ? "mini" : "full",
 	        dsi->pointsCodec ? "Unknown" : "ExpGolombPointsCodec");
 
-	if (dsi->colorComponentBits) fprintf(trace, " colorComponentBits=\"%d\"", dsi->colorComponentBits);
-	if (dsi->newSceneIndicator) fprintf(trace, " newSceneIndicator=\"true\"");
-	if (dsi->coord_bits) fprintf(trace, " coordBits=\"%d\"", dsi->coord_bits);
-	if (dsi->fullRequestHost) fprintf(trace, " useFullRequestHost=\"true\"");
-	if (dsi->pathComponents) fprintf(trace, " pathComponents=\"%d\"", dsi->pathComponents);
-	if (dsi->time_resolution && (dsi->time_resolution!=1000) ) fprintf(trace, " timeResolution=\"%d\"", dsi->time_resolution);
-	if (dsi->resolution) fprintf(trace, " resolution=\"%d\"", dsi->resolution);
-	if (dsi->scale_bits_minus_coord_bits) fprintf(trace, " scaleBits_minus_coordBits=\"%d\"", dsi->scale_bits_minus_coord_bits);
-	fprintf(trace, "/>\n");
+	if (dsi->colorComponentBits) gf_fprintf(trace, " colorComponentBits=\"%d\"", dsi->colorComponentBits);
+	if (dsi->newSceneIndicator) gf_fprintf(trace, " newSceneIndicator=\"true\"");
+	if (dsi->coord_bits) gf_fprintf(trace, " coordBits=\"%d\"", dsi->coord_bits);
+	if (dsi->fullRequestHost) gf_fprintf(trace, " useFullRequestHost=\"true\"");
+	if (dsi->pathComponents) gf_fprintf(trace, " pathComponents=\"%d\"", dsi->pathComponents);
+	if (dsi->time_resolution && (dsi->time_resolution!=1000) ) gf_fprintf(trace, " timeResolution=\"%d\"", dsi->time_resolution);
+	if (dsi->resolution) gf_fprintf(trace, " resolution=\"%d\"", dsi->resolution);
+	if (dsi->scale_bits_minus_coord_bits) gf_fprintf(trace, " scaleBits_minus_coordBits=\"%d\"", dsi->scale_bits_minus_coord_bits);
+	gf_fprintf(trace, "/>\n");
 	return GF_OK;
 }
 
 
-
+GF_EXPORT
 GF_Err gf_odf_dump_txtcfg(GF_TextConfig *desc, FILE *trace, u32 indent, Bool XMTDump)
 {
 	u32 i, count;
 	char ind_buf[OD_MAX_TREE];
+	if (!trace || !desc) return GF_BAD_PARAM;
 	StartDescDump(trace, "TextConfig", indent, XMTDump);
 	indent++;
 	DumpIntHex(trace, "3GPPBaseFormat", desc->Base3GPPFormat, indent, XMTDump, GF_TRUE);
@@ -777,7 +782,7 @@
 		char szStyles[1024];
 		u32 j;
 		GF_TextSampleDescriptor *sd = (GF_TextSampleDescriptor *)gf_list_get(desc->sample_descriptions, i);
-		if (!XMTDump) fprintf(trace, "%s", ind_buf);
+		if (!XMTDump) gf_fprintf(trace, "%s", ind_buf);
 		StartDescDump(trace, "TextSampleDescriptor", indent, XMTDump);
 		indent++;
 		DumpIntHex(trace, "displayFlags", sd->displayFlags, indent, XMTDump, GF_FALSE);
@@ -814,17 +819,6 @@
 	return GF_OK;
 }
 
-GF_Err DumpRawTextConfig(GF_DefaultDescriptor *dsi, FILE *trace, u32 indent, Bool XMTDump, u32 oti)
-{
-	GF_TextConfig *cfg = (GF_TextConfig *) gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
-	GF_Err e = gf_odf_get_text_config(dsi, (u8) oti, cfg);
-	if (!e) gf_odf_dump_desc((GF_Descriptor*)cfg, trace, indent, XMTDump);
-	gf_odf_desc_del((GF_Descriptor *) cfg);
-	return e;
-}
-
-
-
 GF_Err gf_odf_dump_ui_cfg(GF_UIConfig *uid, FILE *trace, u32 indent, Bool XMTDump)
 {
 	char devName[255];
@@ -847,23 +841,23 @@
 			GF_BitStream *bs = gf_bs_new(uid->ui_data, uid->ui_data_length, GF_BITSTREAM_READ);
 			char szPh[3];
 			StartAttribute(trace, "uiData", indent, XMTDump);
-			if (!XMTDump) fprintf(trace, "\"");
-			fprintf(trace, "HTK:");
+			if (!XMTDump) gf_fprintf(trace, "\"");
+			gf_fprintf(trace, "HTK:");
 			szPh[2] = 0;
 			nb_word = gf_bs_read_int(bs, 8);
 			for (i=0; i<nb_word; i++) {
 				nbPhone = gf_bs_read_int(bs, 8);
-				if (i) fprintf(trace, ";");
-				while ((c=gf_bs_read_int(bs, 8))) fprintf(trace, "%c", c);
-				fprintf(trace, " ");
+				if (i) gf_fprintf(trace, ";");
+				while ((c=gf_bs_read_int(bs, 8))) gf_fprintf(trace, "%c", c);
+				gf_fprintf(trace, " ");
 				for (j=0; j<nbPhone; j++) {
 					gf_bs_read_data(bs, szPh, 2);
-					if (j) fprintf(trace, " ");
-					if (!stricmp(szPh, "vc")) fprintf(trace, "vcl");
-					else fprintf(trace, "%s", szPh);
+					if (j) gf_fprintf(trace, " ");
+					if (!stricmp(szPh, "vc")) gf_fprintf(trace, "vcl");
+					else gf_fprintf(trace, "%s", szPh);
 				}
 			}
-			if (!XMTDump) fprintf(trace, "\"");
+			if (!XMTDump) gf_fprintf(trace, "\"");
 			EndAttribute(trace, indent, XMTDump);
 			gf_bs_del(bs);
 		} else {
@@ -906,23 +900,23 @@
 			u32 nb_word, nbPhone, c, j;
 			char szPh[3];
 			StartAttribute(trace, "uiData", indent, XMTDump);
-			if (!XMTDump) fprintf(trace, "\"");
-			fprintf(trace, "HTK:");
+			if (!XMTDump) gf_fprintf(trace, "\"");
+			gf_fprintf(trace, "HTK:");
 			szPh[2] = 0;
 			nb_word = gf_bs_read_int(bs, 8);
 			for (i=0; i<nb_word; i++) {
 				nbPhone = gf_bs_read_int(bs, 8);
-				if (i) fprintf(trace, ";");
-				while ((c=gf_bs_read_int(bs, 8))) fprintf(trace, "%c", c);
-				fprintf(trace, " ");
+				if (i) gf_fprintf(trace, ";");
+				while ((c=gf_bs_read_int(bs, 8))) gf_fprintf(trace, "%c", c);
+				gf_fprintf(trace, " ");
 				for (j=0; j<nbPhone; j++) {
 					gf_bs_read_data(bs, szPh, 2);
-					if (j) fprintf(trace, " ");
-					if (!stricmp(szPh, "vc")) fprintf(trace, "vcl");
-					else fprintf(trace, "%s", szPh);
+					if (j) gf_fprintf(trace, " ");
+					if (!stricmp(szPh, "vc")) gf_fprintf(trace, "vcl");
+					else gf_fprintf(trace, "%s", szPh);
 				}
 			}
-			if (!XMTDump) fprintf(trace, "\"");
+			if (!XMTDump) gf_fprintf(trace, "\"");
 			EndAttribute(trace, indent, XMTDump);
 		} else {
 			char *data = dsi->data;
@@ -947,7 +941,12 @@
 	case GF_STREAM_INTERACT:
 		return DumpRawUIConfig(dsi, trace, indent, XMTDump, oti);
 	case GF_STREAM_TEXT:
-		if (oti==0x08) return DumpRawTextConfig(dsi, trace, indent, XMTDump, oti);
+		if (oti==0x08) {
+			GF_TextConfig *cfg = (GF_TextConfig *) gf_odf_desc_new(GF_ODF_TEXT_CFG_TAG);
+			GF_Err e = gf_odf_get_text_config(dsi->data, dsi->dataLength, (u8) oti, cfg);
+			if (!e) gf_odf_dump_desc((GF_Descriptor*)cfg, trace, indent, XMTDump);
+			gf_odf_desc_del((GF_Descriptor *) cfg);
+		}
 		break;
 	default:
 		break;
@@ -1071,6 +1070,7 @@
 	return GF_OK;
 }
 
+
 GF_Err gf_odf_dump_esd_inc(GF_ES_ID_Inc *esd_inc, FILE *trace, u32 indent, Bool XMTDump)
 {
 	StartDescDump(trace, "ES_ID_Inc", indent, XMTDump);
@@ -1093,7 +1093,6 @@
 	return GF_OK;
 }
 
-
 #ifndef GPAC_MINIMAL_ODF
 
 GF_Err gf_odf_dump_cc(GF_CCDescriptor *ccd, FILE *trace, u32 indent, Bool XMTDump)
@@ -1163,7 +1162,6 @@
 
 GF_Err gf_odf_dump_exp_text(GF_ExpandedTextual *etd, FILE *trace, u32 indent, Bool XMTDump)
 {
-	GF_ETD_ItemText *it1, *it2;
 	u32 i, count;
 
 	StartDescDump(trace, "ExpandedTextualDescriptor", indent, XMTDump);
@@ -1175,8 +1173,9 @@
 
 	count = gf_list_count(etd->itemDescriptionList);
 	for (i=0; i<count; i++) {
-		it1 = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
-		it2 = (GF_ETD_ItemText *)gf_list_get(etd->itemTextList, i);
+		GF_ETD_ItemText *it1 = (GF_ETD_ItemText *)gf_list_get(etd->itemDescriptionList, i);
+		GF_ETD_ItemText *it2 = (GF_ETD_ItemText *)gf_list_get(etd->itemTextList, i);
+		if (!it1 || !it2) break;
 		StartSubElement(trace, "item", indent, XMTDump);
 		DumpString(trace, "description", it1->text, indent, XMTDump);
 		DumpString(trace, "text", it2->text, indent, XMTDump);
@@ -1327,7 +1326,7 @@
 	DumpInt(trace, "wref", ld->wref, indent, XMTDump);
 	indent--;
 	EndSubElement(trace, indent, XMTDump);
-	if (!XMTDump) EndDescDump(trace, "LanguageDescriptor", indent, XMTDump);
+	if (!XMTDump) EndDescDump(trace, "AuxiliaryVideoData", indent, XMTDump);
 	return GF_OK;
 }
 
@@ -1342,11 +1341,11 @@
 
 
 	if (XMTDump) {
-		fprintf(trace, "od%d", iod->objectDescriptorID);
+		gf_fprintf(trace, "od%d", iod->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 		DumpInt(trace, "binaryID", iod->objectDescriptorID, indent, XMTDump);
 	} else {
-		fprintf(trace, "%d", iod->objectDescriptorID);
+		gf_fprintf(trace, "%d", iod->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 	}
 
@@ -1407,11 +1406,11 @@
 	indent++;
 	StartAttribute(trace, "objectDescriptorID", indent, XMTDump);
 	if (XMTDump) {
-		fprintf(trace, "od%d", od->objectDescriptorID);
+		gf_fprintf(trace, "od%d", od->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 		DumpInt(trace, "binaryID", od->objectDescriptorID, indent, XMTDump);
 	} else {
-		fprintf(trace, "%d", od->objectDescriptorID);
+		gf_fprintf(trace, "%d", od->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 	}
 	EndAttributes(trace, indent, XMTDump);
@@ -1448,11 +1447,11 @@
 	indent++;
 	StartAttribute(trace, "objectDescriptorID", indent, XMTDump);
 	if (XMTDump) {
-		fprintf(trace, "od%d", od->objectDescriptorID);
+		gf_fprintf(trace, "od%d", od->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 		DumpInt(trace, "binaryID", od->objectDescriptorID, indent, XMTDump);
 	} else {
-		fprintf(trace, "%d", od->objectDescriptorID);
+		gf_fprintf(trace, "%d", od->objectDescriptorID);
 		EndAttribute(trace, indent, XMTDump);
 	}
 	EndAttributes(trace, indent, XMTDump);
@@ -1529,9 +1528,6 @@
 
 GF_Err gf_odf_dump_qos(GF_QoS_Descriptor *qos, FILE *trace, u32 indent, Bool XMTDump)
 {
-	GF_QoS_Default *p;
-	u32 i;
-
 	StartDescDump(trace, "QoS_Descriptor", indent, XMTDump);
 	indent++;
 
@@ -1540,7 +1536,8 @@
 		DumpInt(trace, "value", qos->predefined, indent, XMTDump);
 		EndSubElement(trace, indent, XMTDump);
 	} else {
-		i=0;
+		u32 i=0;
+		GF_QoS_Default *p;
 		while ((p = (GF_QoS_Default *)gf_list_enum(qos->QoS_Qualifiers, &i))) {
 			switch (p->tag) {
 			case QoSMaxDelayTag:
@@ -1695,9 +1692,7 @@
 
 GF_Err gf_odf_dump_muxinfo(GF_MuxInfo *mi, FILE *trace, u32 indent, Bool XMTDump)
 {
-	char *full_path = NULL;
-
-	full_path = gf_url_get_absolute_path( mi->file_name, mi->src_url );
+	char *full_path = gf_url_get_absolute_path( mi->file_name, mi->src_url );
 
 	if (!XMTDump) {
 		StartDescDump(trace, "MuxInfo", indent, GF_FALSE);
@@ -1816,18 +1811,18 @@
 	} else {
 		char ind_buf[OD_MAX_TREE];
 		OD_FORMAT_INDENT(ind_buf, indent);
-		fprintf(trace, "%sREMOVE OD [", ind_buf);
+		gf_fprintf(trace, "%sREMOVE OD [", ind_buf);
 	}
 	for (i=0; i<com->NbODs; i++) {
-		if (i) fprintf(trace, " ");
-		fprintf(trace, "%s%d", XMTDump ? "od" : "", com->OD_ID[i]);
+		if (i) gf_fprintf(trace, " ");
+		gf_fprintf(trace, "%s%d", XMTDump ? "od" : "", com->OD_ID[i]);
 	}
 	if (XMTDump) {
 		EndAttribute(trace, indent, XMTDump);
 		indent--;
 		EndSubElement(trace, indent, XMTDump);
 	} else {
-		fprintf(trace, "]\n");
+		gf_fprintf(trace, "]\n");
 	}
 	return GF_OK;
 }
@@ -1837,13 +1832,13 @@
 	if (XMTDump) {
 		StartDescDump(trace, "ES_DescriptorUpdate", indent, XMTDump);
 		StartAttribute(trace, "objectDescriptorId", indent, XMTDump);
-		fprintf(trace, "od%d", com->ODID);
+		gf_fprintf(trace, "od%d", com->ODID);
 		EndAttribute(trace, indent, XMTDump);
 		EndAttributes(trace, indent, XMTDump);
 	} else {
 		char ind_buf[OD_MAX_TREE];
 		OD_FORMAT_INDENT(ind_buf, indent);
-		fprintf(trace, "%sUPDATE ESD in %d\n", ind_buf, com->ODID);
+		gf_fprintf(trace, "%sUPDATE ESD in %d\n", ind_buf, com->ODID);
 	}
 	indent++;
 	DumpDescList(com->ESDescriptors, trace, indent+1, "esDescr", XMTDump, GF_TRUE);
@@ -1851,7 +1846,7 @@
 	if (XMTDump) {
 		EndDescDump(trace, "ES_DescriptorUpdate", indent, XMTDump);
 	} else {
-		fprintf(trace, "\n");
+		gf_fprintf(trace, "\n");
 	}
 	return GF_OK;
 }
@@ -1863,25 +1858,25 @@
 	if (XMTDump) {
 		StartDescDump(trace, "ES_DescriptorRemove", indent, XMTDump);
 		StartAttribute(trace, "objectDescriptorId", indent, XMTDump);
-		fprintf(trace, "od%d", com->ODID);
+		gf_fprintf(trace, "od%d", com->ODID);
 		EndAttribute(trace, indent, XMTDump);
 		StartAttribute(trace, "ES_ID", indent, XMTDump);
 	} else {
 		char ind_buf[OD_MAX_TREE];
 		OD_FORMAT_INDENT(ind_buf, indent);
-		fprintf(trace, "%sREMOVE ESD FROM %d [", ind_buf, com->ODID);
+		gf_fprintf(trace, "%sREMOVE ESD FROM %d [", ind_buf, com->ODID);
 	}
 	for (i=0; i<com->NbESDs; i++) {
-		if (i) fprintf(trace, " ");
-		if (XMTDump) fprintf(trace, "es");
-		fprintf(trace, "%d", com->ES_ID[i]);
+		if (i) gf_fprintf(trace, " ");
+		if (XMTDump) gf_fprintf(trace, "es");
+		gf_fprintf(trace, "%d", com->ES_ID[i]);
 	}
 	if (XMTDump) {
 		EndAttribute(trace, indent, XMTDump);
 		indent--;
 		EndSubElement(trace, indent, XMTDump);
 	} else {
-		fprintf(trace, "]\n");
+		gf_fprintf(trace, "]\n");
 	}
 	return GF_OK;
 }
@@ -1911,15 +1906,14 @@
 
 	StartAttribute(trace, "IPMP_DescriptorID", indent, XMTDump);
 	for (i=0; i<com->NbIPMPDs; i++) {
-		if (i) fprintf(trace, " ");
-		fprintf(trace, "%d", com->IPMPDescID[i]);
+		if (i) gf_fprintf(trace, " ");
+		gf_fprintf(trace, "%d", com->IPMPDescID[i]);
 	}
 	EndAttribute(trace, indent, XMTDump);
 	indent--;
 	EndSubElement(trace, indent, XMTDump);
 	return GF_OK;
 }
-#endif //GPAC_MINIMAL_ODF
 
 GF_Err gf_odf_dump_base_command(GF_BaseODCom *com, FILE *trace, u32 indent, Bool XMTDump)
 {
@@ -1933,15 +1927,12 @@
 }
 
 
-#ifndef GPAC_MINIMAL_ODF
-
 GF_EXPORT
 GF_Err gf_oci_dump_event(OCIEvent *ev, FILE *trace, u32 indent, Bool XMTDump)
 {
 	u8 H, M, S, hS, rien;
 	u16 evID;
 	u32 i;
-	GF_Descriptor *desc;
 
 	StartDescDump(trace, "OCI_Event", indent, XMTDump);
 	indent++;
@@ -1951,17 +1942,17 @@
 	gf_oci_event_get_start_time(ev, &H, &M, &S, &hS, &rien);
 	DumpBool(trace, "absoluteTimeFlag", rien, indent, XMTDump);
 	StartAttribute(trace, "startingTime", indent, XMTDump);
-	fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
+	gf_fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
 	EndAttribute(trace, indent, XMTDump);
 
 	gf_oci_event_get_duration(ev, &H, &M, &S, &hS);
 	StartAttribute(trace, "duration", indent, XMTDump);
-	fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
+	gf_fprintf(trace, "%d:%d:%d:%d", H, M, S, hS);
 	EndAttribute(trace, indent, XMTDump);
 
 	StartElement(trace, "OCIDescr", indent, XMTDump, GF_TRUE);
 	for (i=0; i<gf_oci_event_get_desc_count(ev); i++) {
-		desc = gf_oci_event_get_desc(ev, i);
+		GF_Descriptor *desc = gf_oci_event_get_desc(ev, i);
 		gf_odf_dump_desc(desc, trace, indent+1, XMTDump);
 	}
 	EndElement(trace, "OCIDescr", indent, XMTDump, GF_TRUE);
@@ -1973,7 +1964,7 @@
 
 
 GF_EXPORT
-GF_Err gf_oci_dump_au(u8 version, char *au, u32 au_length, FILE *trace, u32 indent, Bool XMTDump)
+GF_Err gf_oci_dump_au(u8 version, u8 *au, u32 au_length, FILE *trace, u32 indent, Bool XMTDump)
 {
 	GF_Err e;
 	OCICodec *codec = gf_oci_codec_new(0, version);

gpac-0.8.0.tar.gz/src/odf/odf_parse.c -> gpac-1.0.0.tar.gz/src/odf/odf_parse.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 / MPEG-4 ObjectDescriptor sub-project
@@ -91,7 +91,6 @@
 	if (!stricmp(descName, "DecoderSpecificInfoString")) return GF_ODF_DSI_TAG;
 	if (!stricmp(descName, "SLConfigDescriptor")) return GF_ODF_SLC_TAG;
 	if (!stricmp(descName, "SegmentDescriptor")) return GF_ODF_SEGMENT_TAG;
-	if (!stricmp(descName, "MediaTimeDescriptor")) return GF_ODF_MEDIATIME_TAG;
 	if (!stricmp(descName, "MuxInfo")) return GF_ODF_MUXINFO_TAG;
 	if (!stricmp(descName, "StreamSource")) return GF_ODF_MUXINFO_TAG;
 	if (!stricmp(descName, "BIFSConfig") || !stricmp(descName, "BIFSv2Config")) return GF_ODF_BIFS_CFG_TAG;
@@ -103,8 +102,11 @@
 	if (!stricmp(descName, "ES_ID_Inc")) return GF_ODF_ESD_INC_TAG;
 	if (!stricmp(descName, "AuxiliaryVideoData")) return GF_ODF_AUX_VIDEO_DATA;
 	if (!stricmp(descName, "DefaultDescriptor")) return GF_ODF_DSI_TAG;
+	if (!stricmp(descName, "LanguageDescriptor")) return GF_ODF_LANG_TAG;
+	if (!stricmp(descName, "GPACLanguage")) return GF_ODF_GPAC_LANG;
 
 #ifndef GPAC_MINIMAL_ODF
+	if (!stricmp(descName, "MediaTimeDescriptor")) return GF_ODF_MEDIATIME_TAG;
 	if (!stricmp(descName, "ContentIdentification")) return GF_ODF_CI_TAG;
 	if (!stricmp(descName, "SuppContentIdentification")) return GF_ODF_SCI_TAG;
 	if (!stricmp(descName, "IPIPtr")) return GF_ODF_IPI_PTR_TAG;
@@ -119,7 +121,6 @@
 	if (!stricmp(descName, "ContentClassification")) return GF_ODF_CC_TAG;
 	if (!stricmp(descName, "KeyWordDescriptor")) return GF_ODF_KW_TAG;
 	if (!stricmp(descName, "RatingDescriptor")) return GF_ODF_RATING_TAG;
-	if (!stricmp(descName, "LanguageDescriptor")) return GF_ODF_LANG_TAG;
 	if (!stricmp(descName, "ShortTextualDescriptor")) return GF_ODF_SHORT_TEXT_TAG;
 	if (!stricmp(descName, "ExpandedTextualDescriptor")) return GF_ODF_TEXT_TAG;
 	if (!stricmp(descName, "ContentCreatorName")) return GF_ODF_CC_NAME_TAG;
@@ -133,14 +134,14 @@
 
 #include <gpac/internal/odf_parse_common.h>
 
-void OD_ParseBinData(char *val, char **out_data, u32 *out_data_size)
+void OD_ParseBinData(u8 *val, u8 **out_data, u32 *out_data_size)
 {
 	u32 i, c;
 	char s[3];
 	u32 len = (u32) strlen(val) / 3;
 	if (*out_data) gf_free(*out_data);
 	*out_data_size = len;
-	*out_data = (char*)gf_malloc(sizeof(char) * len);
+	*out_data = gf_malloc(sizeof(char) * len);
 	s[2] = 0;
 	for (i=0; i<len; i++) {
 		s[0] = val[3*i+1];
@@ -150,64 +151,13 @@
 	}
 }
 
-void OD_ParseFileData(char *fileName, char **out_data, u32 *out_data_size)
-{
-	FILE *f;
-	u32 size;
-	size_t readen;
-	if (*out_data) gf_free(*out_data);
-	*out_data = NULL;
-	*out_data_size = 0;
-	f = gf_fopen(fileName, "rb");
-	if (!f) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ODF Parse] cannot open data file %s - skipping\n", fileName));
-		return;
-	}
-	gf_fseek(f, 0, SEEK_END);
-	assert(gf_ftell(f) < 1<<31);
-	size = (u32) gf_ftell(f);
-	gf_fseek(f, 0, SEEK_SET);
-	*out_data_size = size;
-	*out_data = (char*)gf_malloc(sizeof(char) * (size_t)size);
-	readen = fread(*out_data, sizeof(char), (size_t)size, f);
-	if (readen != size) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[ODF Parse] readen size=%d does not match size=%d in %s\n", readen, size, fileName));
-	}
-	gf_fclose(f);
-}
-
-void OD_ParseBin128(char *val, bin128 *data)
-{
-	if (!strnicmp(val, "0x", 2)) val+=2;
-
-	if (strlen(val)<16) {
-		GF_BitStream *bs;
-		u32 int_val = atoi(val);
-		bs = gf_bs_new((char*) (*data), 16, GF_BITSTREAM_WRITE);
-		gf_bs_write_int(bs, 0, 32);
-		gf_bs_write_int(bs, 0, 32);
-		gf_bs_write_int(bs, 0, 32);
-		gf_bs_write_int(bs, int_val, 32);
-		gf_bs_del(bs);
-	} else {
-		u32 i, b;
-		char szB[3];
-		szB[2] = 0;
-		for (i=0; i<16; i++) {
-			szB[0] = val[2*i];
-			szB[1] = val[2*i+1];
-			sscanf(szB, "%x", &b);
-			((char *)data)[i] = (u8) b;
-		}
-	}
-}
-
-
 GF_Err gf_odf_set_field(GF_Descriptor *desc, char *fieldName, char *val)
 {
-	Bool OD_ParseUIConfig(char *val, char **out_data, u32 *out_data_size);
+#ifndef GPAC_MINIMAL_ODF
+	Bool OD_ParseUIConfig(u8 *val, u8 **out_data, u32 *out_data_size);
+#endif
 	u32 ret = 0;
-
+	if (!fieldName || !val) return GF_BAD_PARAM;
 	if (!stricmp(val, "auto")) return GF_OK;
 	else if (!stricmp(val, "unspecified")) return GF_OK;
 
@@ -282,75 +232,75 @@
 			/*XMT may use string*/
 			if (!ret) {
 				if (!stricmp(val, "MPEG4Systems1")) {
-					dcd->objectTypeIndication = GPAC_OTI_OD_V1;
+					dcd->objectTypeIndication = GF_CODECID_OD_V1;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG4Systems2")) {
-					dcd->objectTypeIndication = GPAC_OTI_SCENE_BIFS_V2;
+					dcd->objectTypeIndication = GF_CODECID_BIFS_V2;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG4Visual")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG4_PART2;
+					dcd->objectTypeIndication = GF_CODECID_MPEG4_PART2;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG4Audio")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
+					dcd->objectTypeIndication = GF_CODECID_AAC_MPEG4;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2VisualSimple")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SIMPLE;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_SIMPLE;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2VisualMain")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_MAIN;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_MAIN;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2VisualSNR")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SNR;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_SNR;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2VisualSpatial")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_SPATIAL;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_SPATIAL;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2VisualHigh")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_HIGH;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_HIGH;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2Visual422")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_422;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2AudioMain")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_MP;
+					dcd->objectTypeIndication = GF_CODECID_AAC_MPEG2_MP;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2AudioLowComplexity")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_LCP;
+					dcd->objectTypeIndication = GF_CODECID_AAC_MPEG2_LCP;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2AudioScaleableSamplingRate")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG2_SSRP;
+					dcd->objectTypeIndication = GF_CODECID_AAC_MPEG2_SSRP;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG2AudioPart3")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG2_PART3;
+					dcd->objectTypeIndication = GF_CODECID_MPEG2_PART3;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG1Visual")) {
-					dcd->objectTypeIndication = GPAC_OTI_VIDEO_MPEG1;
+					dcd->objectTypeIndication = GF_CODECID_MPEG1;
 					ret = 1;
 				}
 				else if (!stricmp(val, "MPEG1Audio")) {
-					dcd->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
+					dcd->objectTypeIndication = GF_CODECID_MPEG_AUDIO;
 					ret = 1;
 				}
 				else if (!stricmp(val, "JPEG")) {
-					dcd->objectTypeIndication = GPAC_OTI_IMAGE_JPEG;
+					dcd->objectTypeIndication = GF_CODECID_JPEG;
 					ret = 1;
 				}
 				else if (!stricmp(val, "PNG")) {
-					dcd->objectTypeIndication = GPAC_OTI_IMAGE_PNG;
+					dcd->objectTypeIndication = GF_CODECID_PNG;
 					ret = 1;
 				}
 			}
@@ -359,48 +309,17 @@
 			GET_U8(dcd->streamType)
 			/*XMT may use string*/
 			if (!ret) {
-				if (!stricmp(val, "ObjectDescriptor")) {
-					dcd->streamType = GF_STREAM_OD;
-					ret = 1;
-				}
-				else if (!stricmp(val, "ClockReference")) {
-					dcd->streamType = GF_STREAM_OCR;
-					ret = 1;
-				}
-				else if (!stricmp(val, "SceneDescription")) {
-					dcd->streamType = GF_STREAM_SCENE;
-					ret = 1;
-				}
-				else if (!stricmp(val, "Visual")) {
-					dcd->streamType = GF_STREAM_VISUAL;
-					ret = 1;
-				}
-				else if (!stricmp(val, "Audio")) {
-					dcd->streamType = GF_STREAM_AUDIO;
-					ret = 1;
-				}
-				else if (!stricmp(val, "MPEG7")) {
-					dcd->streamType = GF_STREAM_MPEG7;
-					ret = 1;
-				}
-				else if (!stricmp(val, "IPMP")) {
-					dcd->streamType = GF_STREAM_IPMP;
-					ret = 1;
-				}
-				else if (!stricmp(val, "OCI")) {
-					dcd->streamType = GF_STREAM_OCI;
-					ret = 1;
-				}
-				else if (!stricmp(val, "MPEGJ")) {
-					dcd->streamType = GF_STREAM_MPEGJ;
+				dcd->streamType = gf_stream_type_by_name(val);
+				if (dcd->streamType != GF_STREAM_UNKNOWN)
 					ret = 1;
-				}
 			}
 		}
-		else if (!stricmp(fieldName, "upStream")) GET_BOOL(dcd->upstream)
-			else if (!stricmp(fieldName, "bufferSizeDB")) ret += sscanf(val, "%u", &dcd->bufferSizeDB);
-			else if (!stricmp(fieldName, "maxBitRate")) ret += sscanf(val, "%u", &dcd->maxBitrate);
-			else if (!stricmp(fieldName, "avgBitRate")) ret += sscanf(val, "%u", &dcd->avgBitrate);
+		else if (!stricmp(fieldName, "upStream")) {
+			GET_BOOL(dcd->upstream)
+		}
+		else if (!stricmp(fieldName, "bufferSizeDB")) ret += sscanf(val, "%u", &dcd->bufferSizeDB);
+		else if (!stricmp(fieldName, "maxBitRate")) ret += sscanf(val, "%u", &dcd->maxBitrate);
+		else if (!stricmp(fieldName, "avgBitRate")) ret += sscanf(val, "%u", &dcd->avgBitrate);
 	}
 	break;
 	case GF_ODF_ESD_TAG:
@@ -410,53 +329,46 @@
 			ret += sscanf(val, "%hu", &esd->ESID);
 		}
 		else if (!stricmp(fieldName, "streamPriority")) GET_U8(esd->streamPriority)
-			else if (!stricmp(fieldName, "dependsOn_ES_ID") || !stricmp(fieldName, "dependsOnESID")) ret += sscanf(val, "%hu", &esd->dependsOnESID);
-			else if (!stricmp(fieldName, "OCR_ES_ID")) ret += sscanf(val, "%hu", &esd->OCRESID);
-			else if (!stricmp(fieldName, "URLstring")) {
-				esd->URLString = gf_strdup(val);
-				ret = 1;
-			}
+		else if (!stricmp(fieldName, "dependsOn_ES_ID") || !stricmp(fieldName, "dependsOnESID")) ret += sscanf(val, "%hu", &esd->dependsOnESID);
+		else if (!stricmp(fieldName, "OCR_ES_ID")) ret += sscanf(val, "%hu", &esd->OCRESID);
+		else if (!stricmp(fieldName, "URLstring")) {
+			esd->URLString = gf_strdup(val);
+			ret = 1;
+		}
 		/*ignore*/
-			else if (!stricmp(fieldName, "streamDependenceFlag")
-			         || !stricmp(fieldName, "URL_Flag")
-			         || !stricmp(fieldName, "OCRstreamFlag")
-			        )
-				ret = 1;
+		else if (!stricmp(fieldName, "streamDependenceFlag")
+			 || !stricmp(fieldName, "URL_Flag")
+			 || !stricmp(fieldName, "OCRstreamFlag")
+		)
+			ret = 1;
 	}
 	break;
 	case GF_ODF_SLC_TAG:
 	{
-		u32 ts;
 		GF_SLConfig *slc = (GF_SLConfig*)desc;
 		if (!stricmp(fieldName, "predefined")) GET_U8(slc->predefined)
-			else if (!stricmp(fieldName, "useAccessUnitStartFlag")) GET_BOOL(slc->useAccessUnitStartFlag)
-				else if (!stricmp(fieldName, "useAccessUnitEndFlag")) GET_BOOL(slc->useAccessUnitEndFlag)
-					else if (!stricmp(fieldName, "useRandomAccessPointFlag")) GET_BOOL(slc->useRandomAccessPointFlag)
-						else if (!stricmp(fieldName, "hasRandomAccessUnitsOnlyFlag") || !stricmp(fieldName, "useRandomAccessUnitsOnlyFlag")) GET_BOOL(slc->hasRandomAccessUnitsOnlyFlag)
-							else if (!stricmp(fieldName, "usePaddingFlag")) GET_BOOL(slc->usePaddingFlag)
-								else if (!stricmp(fieldName, "useTimeStampsFlag")) GET_BOOL(slc->useTimestampsFlag)
-									else if (!stricmp(fieldName, "useIdleFlag")) GET_BOOL(slc->useIdleFlag)
-										else if (!stricmp(fieldName, "timeStampResolution")) ret += sscanf(val, "%u", &slc->timestampResolution);
-										else if (!stricmp(fieldName, "OCRResolution")) ret += sscanf(val, "%u", &slc->OCRResolution);
-										else if (!stricmp(fieldName, "timeStampLength")) GET_U8(slc->timestampLength)
-											else if (!stricmp(fieldName, "OCRLength")) GET_U8(slc->OCRLength)
-												else if (!stricmp(fieldName, "AU_Length")) GET_U8(slc->AULength)
-													else if (!stricmp(fieldName, "instantBitrateLength")) GET_U8(slc->instantBitrateLength)
-														else if (!stricmp(fieldName, "degradationPriorityLength")) GET_U8(slc->degradationPriorityLength)
-															else if (!stricmp(fieldName, "AU_seqNumLength")) GET_U8(slc->AUSeqNumLength)
-																else if (!stricmp(fieldName, "packetSeqNumLength")) GET_U8(slc->packetSeqNumLength)
-																	else if (!stricmp(fieldName, "timeScale")) ret += sscanf(val, "%u", &slc->timeScale);
-																	else if (!stricmp(fieldName, "accessUnitDuration")) ret += sscanf(val, "%hu", &slc->AUDuration);
-																	else if (!stricmp(fieldName, "compositionUnitDuration")) ret += sscanf(val, "%hu", &slc->CUDuration);
-																	else if (!stricmp(fieldName, "startDecodingTimeStamp")) {
-																		ret += sscanf(val, "%u", &ts);
-																		slc->startDTS = ts;
-																	}
-																	else if (!stricmp(fieldName, "startCompositionTimeStamp")) {
-																		ret += sscanf(val, "%u", &ts);
-																		slc->startCTS = ts;
-																	}
-																	else if (!stricmp(fieldName, "durationFlag")) ret = 1;
+		else if (!stricmp(fieldName, "useAccessUnitStartFlag")) GET_BOOL(slc->useAccessUnitStartFlag)
+		else if (!stricmp(fieldName, "useAccessUnitEndFlag")) GET_BOOL(slc->useAccessUnitEndFlag)
+		else if (!stricmp(fieldName, "useRandomAccessPointFlag")) GET_BOOL(slc->useRandomAccessPointFlag)
+		else if (!stricmp(fieldName, "hasRandomAccessUnitsOnlyFlag") || !stricmp(fieldName, "useRandomAccessUnitsOnlyFlag")) GET_BOOL(slc->hasRandomAccessUnitsOnlyFlag)
+		else if (!stricmp(fieldName, "usePaddingFlag")) GET_BOOL(slc->usePaddingFlag)
+		else if (!stricmp(fieldName, "useTimeStampsFlag")) GET_BOOL(slc->useTimestampsFlag)
+		else if (!stricmp(fieldName, "useIdleFlag")) GET_BOOL(slc->useIdleFlag)
+		else if (!stricmp(fieldName, "timeStampResolution")) ret += sscanf(val, "%u", &slc->timestampResolution);
+		else if (!stricmp(fieldName, "OCRResolution")) ret += sscanf(val, "%u", &slc->OCRResolution);
+		else if (!stricmp(fieldName, "timeStampLength")) GET_U8(slc->timestampLength)
+		else if (!stricmp(fieldName, "OCRLength")) GET_U8(slc->OCRLength)
+		else if (!stricmp(fieldName, "AU_Length")) GET_U8(slc->AULength)
+		else if (!stricmp(fieldName, "instantBitrateLength")) GET_U8(slc->instantBitrateLength)
+		else if (!stricmp(fieldName, "degradationPriorityLength")) GET_U8(slc->degradationPriorityLength)
+		else if (!stricmp(fieldName, "AU_seqNumLength")) GET_U8(slc->AUSeqNumLength)
+		else if (!stricmp(fieldName, "packetSeqNumLength")) GET_U8(slc->packetSeqNumLength)
+		else if (!stricmp(fieldName, "timeScale")) ret += sscanf(val, "%u", &slc->timeScale);
+		else if (!stricmp(fieldName, "accessUnitDuration")) ret += sscanf(val, "%hu", &slc->AUDuration);
+		else if (!stricmp(fieldName, "compositionUnitDuration")) ret += sscanf(val, "%hu", &slc->CUDuration);
+		else if (!stricmp(fieldName, "startDecodingTimeStamp")) GET_U64(slc->startDTS)
+		else if (!stricmp(fieldName, "startCompositionTimeStamp"))  GET_U64(slc->startCTS)
+		else if (!stricmp(fieldName, "durationFlag")) ret = 1;
 	}
 	break;
 	case GF_ODF_ELEM_MASK_TAG:
@@ -481,57 +393,54 @@
 			/*GET_BOOL(bcd->isCommandStream)*/ ret = 1;
 		}
 		else if (!stricmp(fieldName, "pixelMetric") || !stricmp(fieldName, "pixelMetrics")) GET_BOOL(bcd->pixelMetrics)
-			else if (!stricmp(fieldName, "pixelWidth")) ret += sscanf(val, "%hu", &bcd->pixelWidth);
-			else if (!stricmp(fieldName, "pixelHeight")) ret += sscanf(val, "%hu", &bcd->pixelHeight);
-			else if (!stricmp(fieldName, "use3DMeshCoding")) ret = 1;
-			else if (!stricmp(fieldName, "usePredictiveMFField")) ret = 1;
-			else if (!stricmp(fieldName, "randomAccess")) GET_BOOL(bcd->randomAccess)
-				else if (!stricmp(fieldName, "useNames")) GET_BOOL(bcd->useNames)
-				}
+		else if (!stricmp(fieldName, "pixelWidth")) ret += sscanf(val, "%hu", &bcd->pixelWidth);
+		else if (!stricmp(fieldName, "pixelHeight")) ret += sscanf(val, "%hu", &bcd->pixelHeight);
+		else if (!stricmp(fieldName, "use3DMeshCoding")) ret = 1;
+		else if (!stricmp(fieldName, "usePredictiveMFField")) ret = 1;
+		else if (!stricmp(fieldName, "randomAccess")) GET_BOOL(bcd->randomAccess)
+		else if (!stricmp(fieldName, "useNames")) GET_BOOL(bcd->useNames)
+	}
 	break;
 	case GF_ODF_MUXINFO_TAG:
 	{
 		GF_MuxInfo *mi = (GF_MuxInfo *)desc;
 		if (!stricmp(fieldName, "fileName") || !stricmp(fieldName, "url")) GET_STRING(mi->file_name)
-			else if (!stricmp(fieldName, "streamFormat")) GET_STRING(mi->streamFormat)
-				else if (!stricmp(fieldName, "GroupID")) ret += sscanf(val, "%u", &mi->GroupID);
-				else if (!stricmp(fieldName, "startTime")) ret += sscanf(val, "%d", &mi->startTime);
-				else if (!stricmp(fieldName, "duration")) ret += sscanf(val, "%u", &mi->duration);
-				else if (!stricmp(fieldName, "carouselPeriod")) {
-					ret += sscanf(val, "%u", &mi->carousel_period_plus_one);
-					mi->carousel_period_plus_one += 1;
-				}
-				else if (!stricmp(fieldName, "aggregateOnESID")) ret += sscanf(val, "%hu", &mi->aggregate_on_esid);
+		else if (!stricmp(fieldName, "streamFormat")) GET_STRING(mi->streamFormat)
+		else if (!stricmp(fieldName, "GroupID")) ret += sscanf(val, "%u", &mi->GroupID);
+		else if (!stricmp(fieldName, "startTime")) ret += sscanf(val, "%d", &mi->startTime);
+		else if (!stricmp(fieldName, "duration")) ret += sscanf(val, "%u", &mi->duration);
+		else if (!stricmp(fieldName, "carouselPeriod")) {
+			ret += sscanf(val, "%u", &mi->carousel_period_plus_one);
+			mi->carousel_period_plus_one += 1;
+		}
+		else if (!stricmp(fieldName, "aggregateOnESID")) ret += sscanf(val, "%hu", &mi->aggregate_on_esid);
 
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
-				else if (!stricmp(fieldName, "compactSize"))
-				{
-					ret = 1;
-					if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_USE_COMPACT_SIZE;
-				}
-				else if (!stricmp(fieldName, "useDataReference"))
-				{
-					ret = 1;
-					if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_USE_DATAREF;
-				}
-				else if (!stricmp(fieldName, "noFrameDrop"))
-				{
-					ret = 1;
-					if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_NO_FRAME_DROP;
-				}
-				else if (!stricmp(fieldName, "SBR_Type")) {
-					ret = 1;
-					if (!stricmp(val, "implicit") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_SBR_IMPLICIT;
-					else if (!stricmp(val, "explicit") || !stricmp(val, "2")) mi->import_flags |= GF_IMPORT_SBR_EXPLICIT;
-				}
+		else if (!stricmp(fieldName, "compactSize"))
+		{
+			ret = 1;
+			if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_USE_COMPACT_SIZE;
+		}
+		else if (!stricmp(fieldName, "useDataReference")) {
+			ret = 1;
+			if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_USE_DATAREF;
+		}
+		else if (!stricmp(fieldName, "noFrameDrop")) {
+			ret = 1;
+			if (!stricmp(val, "true") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_NO_FRAME_DROP;
+		}
+		else if (!stricmp(fieldName, "SBR_Type")) {
+			ret = 1;
+			if (!stricmp(val, "implicit") || !stricmp(val, "1")) mi->import_flags |= GF_IMPORT_SBR_IMPLICIT;
+			else if (!stricmp(val, "explicit") || !stricmp(val, "2")) mi->import_flags |= GF_IMPORT_SBR_EXPLICIT;
+		}
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
-
-				else if (!stricmp(fieldName, "textNode")) GET_STRING(mi->textNode)
-					else if (!stricmp(fieldName, "fontNode")) GET_STRING(mi->fontNode)
-						else if (!stricmp(fieldName, "frameRate")) {
-							ret = 1;
-							mi->frame_rate = atof(val);
-						}
+		else if (!stricmp(fieldName, "textNode")) GET_STRING(mi->textNode)
+		else if (!stricmp(fieldName, "fontNode")) GET_STRING(mi->fontNode)
+		else if (!stricmp(fieldName, "frameRate")) {
+			ret = 1;
+			mi->frame_rate = atof(val);
+		}
 	}
 	break;
 	case GF_ODF_DSI_TAG:
@@ -543,7 +452,7 @@
 				OD_ParseBinData(val, &dsi->data, &dsi->dataLength);
 				ret = 1;
 			} else if (!strnicmp(val, "file:", 5)) {
-				OD_ParseFileData(val+5, &dsi->data, &dsi->dataLength);
+				gf_file_load_data(val+5, (u8 **) &dsi->data, &dsi->dataLength);
 				ret = 1;
 			} else if (!strlen(val)) ret = 1;
 		}
@@ -556,7 +465,7 @@
 				OD_ParseBinData(val, &dsi->data, &dsi->dataLength);
 				ret = 1;
 			} else if (!strnicmp(val, "file:", 5)) {
-				OD_ParseFileData(val+5, &dsi->data, &dsi->dataLength);
+				gf_file_load_data(val+5, (u8 **) &dsi->data, &dsi->dataLength);
 				ret = 1;
 			}
 		}
@@ -566,28 +475,32 @@
 	{
 		GF_Segment *sd = (GF_Segment*)desc;
 		if (!stricmp(fieldName, "start") || !stricmp(fieldName, "startTime")) GET_DOUBLE(sd->startTime)
-			else if (!stricmp(fieldName, "duration")) GET_DOUBLE(sd->Duration)
-				else if (!stricmp(fieldName, "name") || !stricmp(fieldName, "segmentName")) GET_STRING(sd->SegmentName)
-				}
+		else if (!stricmp(fieldName, "duration")) GET_DOUBLE(sd->Duration)
+		else if (!stricmp(fieldName, "name") || !stricmp(fieldName, "segmentName")) GET_STRING(sd->SegmentName)
+	}
 	break;
 	case GF_ODF_UI_CFG_TAG:
 	{
 		GF_UIConfig *uic = (GF_UIConfig*)desc;
 		if (!stricmp(fieldName, "deviceName")) GET_STRING(uic->deviceName)
-			else if (!stricmp(fieldName, "termChar")) GET_U8(uic->termChar)
-				else if (!stricmp(fieldName, "delChar")) GET_U8(uic->delChar)
-					else if (!stricmp(fieldName, "uiData")) {
-						/*only parse true hexa strings*/
-						if (val[0] == '%') {
-							OD_ParseBinData(val, &uic->ui_data, &uic->ui_data_length);
-							ret = 1;
-						} else if (!strnicmp(val, "file:", 5)) {
-							OD_ParseFileData(val+5, &uic->ui_data, &uic->ui_data_length);
-							ret = 1;
-						} else {
-							ret = OD_ParseUIConfig(val, &uic->ui_data, &uic->ui_data_length);
-						}
-					}
+		else if (!stricmp(fieldName, "termChar")) GET_U8(uic->termChar)
+		else if (!stricmp(fieldName, "delChar")) GET_U8(uic->delChar)
+		else if (!stricmp(fieldName, "uiData")) {
+			/*only parse true hexa strings*/
+			if (val[0] == '%') {
+				OD_ParseBinData(val, &uic->ui_data, &uic->ui_data_length);
+				ret = 1;
+			} else if (!strnicmp(val, "file:", 5)) {
+				gf_file_load_data(val+5, (u8 **) &uic->ui_data, &uic->ui_data_length);
+				ret = 1;
+			} else {
+#ifndef GPAC_MINIMAL_ODF
+				ret = OD_ParseUIConfig(val, &uic->ui_data, &uic->ui_data_length);
+#else
+				ret= GF_FALSE;
+#endif
+			}
+		}
 	}
 	break;
 	case GF_ODF_ESD_INC_TAG:
@@ -606,100 +519,100 @@
 	{
 		GF_TextConfig *txt = (GF_TextConfig*)desc;
 		if (!stricmp(fieldName, "3GPPBaseFormat")) GET_U8(txt->Base3GPPFormat)
-			else if (!stricmp(fieldName, "MPEGExtendedFormat")) GET_U8(txt->MPEGExtendedFormat)
-				else if (!stricmp(fieldName, "profileLevel")) GET_U8(txt->profileLevel)
-					else if (!stricmp(fieldName, "durationClock") || !stricmp(fieldName, "timescale") ) GET_U32(txt->timescale)
-						else if (!stricmp(fieldName, "layer")) GET_U32(txt->layer)
-							else if (!stricmp(fieldName, "text_width")) GET_U32(txt->text_width)
-								else if (!stricmp(fieldName, "text_height")) GET_U32(txt->text_height)
-									else if (!stricmp(fieldName, "video_width")) {
-										GET_U32(txt->video_width)
-										txt->has_vid_info = GF_TRUE;
-									}
-									else if (!stricmp(fieldName, "video_height")) {
-										GET_U32(txt->video_height)
-										txt->has_vid_info = GF_TRUE;
-									}
-									else if (!stricmp(fieldName, "horizontal_offset")) {
-										GET_S16(txt->horiz_offset)
-										txt->has_vid_info = GF_TRUE;
-									}
-									else if (!stricmp(fieldName, "vertical_offset")) {
-										GET_S32(txt->vert_offset)
-										txt->has_vid_info = GF_TRUE;
-									}
+		else if (!stricmp(fieldName, "MPEGExtendedFormat")) GET_U8(txt->MPEGExtendedFormat)
+		else if (!stricmp(fieldName, "profileLevel")) GET_U8(txt->profileLevel)
+		else if (!stricmp(fieldName, "durationClock") || !stricmp(fieldName, "timescale") ) GET_U32(txt->timescale)
+		else if (!stricmp(fieldName, "layer")) GET_U32(txt->layer)
+		else if (!stricmp(fieldName, "text_width")) GET_U32(txt->text_width)
+		else if (!stricmp(fieldName, "text_height")) GET_U32(txt->text_height)
+		else if (!stricmp(fieldName, "video_width")) {
+			GET_U32(txt->video_width)
+			txt->has_vid_info = GF_TRUE;
+		}
+		else if (!stricmp(fieldName, "video_height")) {
+			GET_U32(txt->video_height)
+			txt->has_vid_info = GF_TRUE;
+		}
+		else if (!stricmp(fieldName, "horizontal_offset")) {
+			GET_S16(txt->horiz_offset)
+			txt->has_vid_info = GF_TRUE;
+		}
+		else if (!stricmp(fieldName, "vertical_offset")) {
+			GET_S32(txt->vert_offset)
+			txt->has_vid_info = GF_TRUE;
+		}
 	}
 	break;
 	case GF_ODF_TX3G_TAG:
 	{
 		GF_TextSampleDescriptor *sd = (GF_TextSampleDescriptor*)desc;
 		if (!stricmp(fieldName, "displayFlags")) GET_U32(sd->displayFlags)
-			else if (!stricmp(fieldName, "horiz_justif")) GET_S32(sd->horiz_justif)
-				else if (!stricmp(fieldName, "vert_justif")) GET_S32(sd->vert_justif)
-					else if (!stricmp(fieldName, "back_color")) GET_S32(sd->back_color)
-						else if (!stricmp(fieldName, "top")) GET_S32(sd->default_pos.top)
-							else if (!stricmp(fieldName, "bottom")) GET_S32(sd->default_pos.bottom)
-								else if (!stricmp(fieldName, "left")) GET_S32(sd->default_pos.left)
-									else if (!stricmp(fieldName, "right")) GET_S32(sd->default_pos.right)
-										else if (!stricmp(fieldName, "style_font_ID")) GET_S32(sd->default_style.fontID)
-											else if (!stricmp(fieldName, "style_font_size")) GET_S32(sd->default_style.font_size)
-												else if (!stricmp(fieldName, "style_text_color")) GET_U32(sd->default_style.text_color)
-													else if (!stricmp(fieldName, "style_flags")) {
-														char szStyles[1024];
-														strcpy(szStyles, val);
-														strlwr(szStyles);
-														if (strstr(szStyles, "bold")) sd->default_style.style_flags |= GF_TXT_STYLE_BOLD;
-														if (strstr(szStyles, "italic")) sd->default_style.style_flags |= GF_TXT_STYLE_ITALIC;
-														if (strstr(szStyles, "underlined")) sd->default_style.style_flags |= GF_TXT_STYLE_UNDERLINED;
-														ret = 1;
-													}
-													else if (!stricmp(fieldName, "fontID") || !stricmp(fieldName, "fontName")) {
-														/*check if we need a new entry*/
-														if (!sd->font_count) {
-															sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
-															sd->font_count = 1;
-															sd->fonts[0].fontID = 0;
-															sd->fonts[0].fontName = NULL;
-														} else {
-															Bool realloc_fonts = GF_FALSE;
-															if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = GF_TRUE;
-															else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = GF_TRUE;
-															if (realloc_fonts) {
-																sd->font_count += 1;
-																sd->fonts = (GF_FontRecord*)gf_realloc(sd->fonts, sizeof(GF_FontRecord)*sd->font_count);
-																sd->fonts[sd->font_count-1].fontID = 0;
-																sd->fonts[sd->font_count-1].fontName = NULL;
-															}
-														}
-														if (!stricmp(fieldName, "fontID")) GET_U32(sd->fonts[sd->font_count-1].fontID)
-															if (!stricmp(fieldName, "fontName")) GET_STRING(sd->fonts[sd->font_count-1].fontName)
-																ret = 1;
-													}
+		else if (!stricmp(fieldName, "horiz_justif")) GET_S32(sd->horiz_justif)
+		else if (!stricmp(fieldName, "vert_justif")) GET_S32(sd->vert_justif)
+		else if (!stricmp(fieldName, "back_color")) GET_S32(sd->back_color)
+		else if (!stricmp(fieldName, "top")) GET_S32(sd->default_pos.top)
+		else if (!stricmp(fieldName, "bottom")) GET_S32(sd->default_pos.bottom)
+		else if (!stricmp(fieldName, "left")) GET_S32(sd->default_pos.left)
+		else if (!stricmp(fieldName, "right")) GET_S32(sd->default_pos.right)
+		else if (!stricmp(fieldName, "style_font_ID")) GET_S32(sd->default_style.fontID)
+		else if (!stricmp(fieldName, "style_font_size")) GET_S32(sd->default_style.font_size)
+		else if (!stricmp(fieldName, "style_text_color")) GET_U32(sd->default_style.text_color)
+		else if (!stricmp(fieldName, "style_flags")) {
+			char szStyles[1024];
+			strcpy(szStyles, val);
+			strlwr(szStyles);
+			if (strstr(szStyles, "bold")) sd->default_style.style_flags |= GF_TXT_STYLE_BOLD;
+			if (strstr(szStyles, "italic")) sd->default_style.style_flags |= GF_TXT_STYLE_ITALIC;
+			if (strstr(szStyles, "underlined")) sd->default_style.style_flags |= GF_TXT_STYLE_UNDERLINED;
+			ret = 1;
+		}
+		else if (!stricmp(fieldName, "fontID") || !stricmp(fieldName, "fontName")) {
+			/*check if we need a new entry*/
+			if (!sd->font_count) {
+				sd->fonts = (GF_FontRecord*)gf_malloc(sizeof(GF_FontRecord));
+				sd->font_count = 1;
+				sd->fonts[0].fontID = 0;
+				sd->fonts[0].fontName = NULL;
+			} else {
+				Bool realloc_fonts = GF_FALSE;
+				if (!stricmp(fieldName, "fontID") && sd->fonts[sd->font_count-1].fontID) realloc_fonts = GF_TRUE;
+				else if (!stricmp(fieldName, "fontName") && sd->fonts[sd->font_count-1].fontName) realloc_fonts = GF_TRUE;
+				if (realloc_fonts) {
+					sd->font_count += 1;
+					sd->fonts = (GF_FontRecord*)gf_realloc(sd->fonts, sizeof(GF_FontRecord)*sd->font_count);
+					sd->fonts[sd->font_count-1].fontID = 0;
+					sd->fonts[sd->font_count-1].fontName = NULL;
+				}
+			}
+			if (!stricmp(fieldName, "fontID")) GET_U32(sd->fonts[sd->font_count-1].fontID)
+			if (!stricmp(fieldName, "fontName")) GET_STRING(sd->fonts[sd->font_count-1].fontName)
+		}
 	}
 	break;
 	case GF_ODF_IPMP_TAG:
 	{
 		GF_IPMP_Descriptor *ipmp = (GF_IPMP_Descriptor*)desc;
 		if (!stricmp(fieldName, "IPMP_DescriptorID")) GET_U8(ipmp->IPMP_DescriptorID)
-			else if (!stricmp(fieldName, "IPMPS_Type")) GET_U16(ipmp->IPMPS_Type)
-				else if (!stricmp(fieldName, "IPMP_DescriptorIDEx")) GET_U16(ipmp->IPMP_DescriptorIDEx)
-					else if (!stricmp(fieldName, "IPMP_ToolID")) {
-						ret = 1;
-						OD_ParseBin128(val, &ipmp->IPMP_ToolID);
-					}
-					else if (!stricmp(fieldName, "controlPointCode")) GET_U8(ipmp->control_point)
-						else if (!stricmp(fieldName, "sequenceCode")) GET_U8(ipmp->cp_sequence_code)
-						}
+		else if (!stricmp(fieldName, "IPMPS_Type")) GET_U16(ipmp->IPMPS_Type)
+		else if (!stricmp(fieldName, "IPMP_DescriptorIDEx")) GET_U16(ipmp->IPMP_DescriptorIDEx)
+		else if (!stricmp(fieldName, "IPMP_ToolID")) {
+			ret = 1;
+			gf_bin128_parse(val, ipmp->IPMP_ToolID);
+		}
+		else if (!stricmp(fieldName, "controlPointCode")) GET_U8(ipmp->control_point)
+		else if (!stricmp(fieldName, "sequenceCode")) GET_U8(ipmp->cp_sequence_code)
+	}
 	break;
 	case GF_ODF_IPMP_PTR_TAG:
 	{
 		GF_IPMPPtr *ipmpd = (GF_IPMPPtr*)desc;
 		if (!stricmp(fieldName, "IPMP_DescriptorID")) GET_U8(ipmpd->IPMP_DescriptorID)
-			else if (!stricmp(fieldName, "IPMP_DescriptorIDEx"))  ret += sscanf(val, "%hu", &ipmpd->IPMP_DescriptorIDEx);
-			else if (!stricmp(fieldName, "IPMP_ES_ID"))  ret += sscanf(val, "%hu", &ipmpd->IPMP_ES_ID);
+		else if (!stricmp(fieldName, "IPMP_DescriptorIDEx"))  ret += sscanf(val, "%hu", &ipmpd->IPMP_DescriptorIDEx);
+		else if (!stricmp(fieldName, "IPMP_ES_ID"))  ret += sscanf(val, "%hu", &ipmpd->IPMP_ES_ID);
 	}
 	break;
 	case GF_ODF_LANG_TAG:
+	case GF_ODF_GPAC_LANG:
 	{
 		GF_Language *ld = (GF_Language *)desc;
 		if (!stricmp(fieldName, "languageCode")) {
@@ -717,22 +630,22 @@
 	{
 		GF_AuxVideoDescriptor *avd = (GF_AuxVideoDescriptor *)desc;
 		if (!stricmp(fieldName, "aux_video_type"))  GET_U8(avd->aux_video_type)
-			if (!stricmp(fieldName, "position_offset_h"))  GET_U8(avd->aux_video_type)
-				if (!stricmp(fieldName, "position_offset_v"))  GET_U8(avd->aux_video_type)
-					if (!stricmp(fieldName, "knear"))  GET_U8(avd->aux_video_type)
-						if (!stricmp(fieldName, "kfar"))  GET_U8(avd->aux_video_type)
-							if (!stricmp(fieldName, "parallax_zero"))  GET_U16(avd->aux_video_type)
-								if (!stricmp(fieldName, "parallax_scale"))  GET_U16(avd->aux_video_type)
-									if (!stricmp(fieldName, "dref"))  GET_U16(avd->aux_video_type)
-										if (!stricmp(fieldName, "wref"))  GET_U16(avd->aux_video_type)
-										}
+		else if (!stricmp(fieldName, "position_offset_h"))  GET_U8(avd->position_offset_h)
+		else if (!stricmp(fieldName, "position_offset_v"))  GET_U8(avd->position_offset_v)
+		else if (!stricmp(fieldName, "knear"))  GET_U8(avd->knear)
+		else if (!stricmp(fieldName, "kfar"))  GET_U8(avd->kfar)
+		else if (!stricmp(fieldName, "parallax_zero"))  GET_U16(avd->parallax_zero)
+		else if (!stricmp(fieldName, "parallax_scale"))  GET_U16(avd->parallax_scale)
+		else if (!stricmp(fieldName, "dref"))  GET_U16(avd->dref)
+		else if (!stricmp(fieldName, "wref"))  GET_U16(avd->wref)
+	}
 	break;
 	case GF_ODF_IPMP_TOOL_TAG:
 	{
 		GF_IPMP_Tool *it = (GF_IPMP_Tool*)desc;
 		if (!stricmp(fieldName, "IPMP_ToolID")) {
 			ret = 1;
-			OD_ParseBin128(val, &it->IPMP_ToolID);
+			gf_bin128_parse(val, it->IPMP_ToolID);
 		}
 		else if (!stricmp(fieldName, "ToolURL"))  GET_STRING(it->tool_url)
 		}
@@ -742,9 +655,9 @@
 	return ret ? GF_OK : GF_BAD_PARAM;
 }
 
-Bool OD_ParseUIConfig(char *val, char **out_data, u32 *out_data_size)
-{
 #ifndef GPAC_MINIMAL_ODF
+Bool OD_ParseUIConfig(u8 *val, u8 **out_data, u32 *out_data_size)
+{
 	GF_BitStream *bs;
 	if (!strnicmp(val, "HTK:", 4)) {
 		char szItem[100];
@@ -809,6 +722,6 @@
 		gf_bs_del(bs);
 		return GF_TRUE;
 	}
-#endif
 	return GF_FALSE;
 }
+#endif

gpac-0.8.0.tar.gz/src/odf/qos.c -> gpac-1.0.0.tar.gz/src/odf/qos.c Changed

@@ -30,16 +30,12 @@
 /************************************************************
 		QoSQualifiers Functions
 ************************************************************/
+GF_QoS_Default *NewQoS(u8 tag);
 
 GF_EXPORT
 GF_QoS_Default *gf_odf_qos_new(u8 tag)
 {
-
-	GF_QoS_Default *NewQoS(u8 tag);
-
-	GF_QoS_Default *qos;
-
-	qos = NewQoS(tag);
+	GF_QoS_Default *qos = NewQoS(tag);
 	return qos;
 }
 
@@ -84,7 +80,7 @@
 		return;
 
 	default:
-		if ( ((GF_QoS_Private *)qos)->DataLength)
+		if ( ((GF_QoS_Private *)qos)->Data)
 			gf_free(((GF_QoS_Private *)qos)->Data);
 		gf_free( (GF_QoS_Private *) qos);
 		return;
@@ -250,10 +246,13 @@
 	default:
 		//we defined the private qos...
 		newQoS = (GF_QoS_Default *) gf_malloc(sizeof(GF_QoS_Private));
+		((GF_QoS_Private *)newQoS)->Data = NULL;
 		((GF_QoS_Private *)newQoS)->DataLength = qos_size;
-		((GF_QoS_Private *)newQoS)->Data = (char *) gf_malloc( qos_size );
-		gf_bs_read_data(bs, ((GF_QoS_Private *)newQoS)->Data, ((GF_QoS_Private *)newQoS)->DataLength);
-		bytesParsed += ((GF_QoS_Private *)newQoS)->DataLength;
+		if (qos_size > 0) {
+			((GF_QoS_Private *)newQoS)->Data = (char *) gf_malloc( qos_size );
+			gf_bs_read_data(bs, ((GF_QoS_Private *)newQoS)->Data, ((GF_QoS_Private *)newQoS)->DataLength);
+			bytesParsed += ((GF_QoS_Private *)newQoS)->DataLength;
+		}
 		break;
 	}
 	newQoS->size = qos_size;
@@ -424,7 +423,6 @@
 {
 	GF_Err e;
 	u32 size, i;
-	GF_QoS_Default *tmp;
 	if (!qos) return GF_BAD_PARAM;
 
 	e = gf_odf_size_descriptor((GF_Descriptor *)qos, &size);
@@ -435,6 +433,7 @@
 	gf_bs_write_int(bs, qos->predefined, 8);
 
 	if (! qos->predefined) {
+		GF_QoS_Default *tmp;
 		i=0;
 		while ((tmp = (GF_QoS_Default *)gf_list_enum(qos->QoS_Qualifiers, &i))) {
 			e = gf_odf_write_qos_qual(bs, tmp);
@@ -446,4 +445,3 @@
 
 
 #endif /*GPAC_MINIMAL_ODF*/
-

gpac-0.8.0.tar.gz/src/odf/slc.c -> gpac-1.0.0.tar.gz/src/odf/slc.c Changed

@@ -99,9 +99,6 @@
 		sl->timestampResolution = 1000;
 		sl->timestampLength = 32;
 		break;
-	case SLPredef_SkipSL:
-		sl->predefined = SLPredef_SkipSL;
-		break;
 	/*handle all unknown predefined as predef-null*/
 	default:
 		sl->useAccessUnitStartFlag = 0;
@@ -124,28 +121,6 @@
 	return GF_OK;
 }
 
-u32 SLIsPredefined(GF_SLConfig *sl)
-{
-	if (!sl) return 0;
-	if (sl->predefined) return sl->predefined;
-
-	if (!sl->useAccessUnitStartFlag
-	        &&  !sl->useAccessUnitEndFlag
-	        && !sl->usePaddingFlag
-	        && sl->useTimestampsFlag
-	        && !sl->useIdleFlag
-	        && !sl->durationFlag
-	        && !sl->timestampLength
-	        && !sl->OCRLength
-	        && !sl->AULength
-	        && !sl->instantBitrateLength
-	        && !sl->degradationPriorityLength
-	        && !sl->AUSeqNumLength
-	        && !sl->packetSeqNumLength)
-		return SLPredef_MP4;
-
-	return 0;
-}
 
 //this function gets the real amount of bytes needed to store the timeStamp
 static u32 GetTSbytesLen(GF_SLConfig *sl)
@@ -307,9 +282,9 @@
 GF_EXPORT
 void gf_sl_packetize(GF_SLConfig* slConfig,
                      GF_SLHeader *Header,
-                     char *PDU,
+                     u8 *PDU,
                      u32 size,
-                     char **outPacket,
+                     u8 **outPacket,
                      u32 *OutSize)
 {
 	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -399,7 +374,7 @@
 
 
 GF_EXPORT
-void gf_sl_depacketize (GF_SLConfig *slConfig, GF_SLHeader *Header, const char *PDU, u32 PDULength, u32 *HeaderLen)
+void gf_sl_depacketize (GF_SLConfig *slConfig, GF_SLHeader *Header, const u8 *PDU, u32 PDULength, u32 *HeaderLen)
 {
 	GF_BitStream *bs;
 	*HeaderLen = 0;

gpac-1.0.0.tar.gz/src/quickjs Added

gpac-1.0.0.tar.gz/src/quickjs/GPAC_README.md Added

gpac-1.0.0.tar.gz/src/quickjs/cutils.c Added

@@ -0,0 +1,640 @@
+/*
+ * C utilities
+ * 
+ * Copyright (c) 2017 Fabrice Bellard
+ * Copyright (c) 2018 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 <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "cutils.h"
+
+void pstrcpy(char *buf, int buf_size, const char *str)
+{
+    int c;
+    char *q = buf;
+
+    if (buf_size <= 0)
+        return;
+
+    for(;;) {
+        c = *str++;
+        if (c == 0 || q >= buf + buf_size - 1)
+            break;
+        *q++ = c;
+    }
+    *q = '\0';
+}
+
+/* strcat and truncate. */
+char *pstrcat(char *buf, int buf_size, const char *s)
+{
+    int len;
+    len = (int) strlen(buf);
+    if (len < buf_size)
+        pstrcpy(buf + len, buf_size - len, s);
+    return buf;
+}
+
+int strstart(const char *str, const char *val, const char **ptr)
+{
+    const char *p, *q;
+    p = str;
+    q = val;
+    while (*q != '\0') {
+        if (*p != *q)
+            return 0;
+        p++;
+        q++;
+    }
+    if (ptr)
+        *ptr = p;
+    return 1;
+}
+
+int has_suffix(const char *str, const char *suffix)
+{
+    size_t len = strlen(str);
+    size_t slen = strlen(suffix);
+    return (len >= slen && !memcmp(str + len - slen, suffix, slen));
+}
+
+/* Dynamic buffer package */
+
+static void *dbuf_default_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func)
+{
+    memset(s, 0, sizeof(*s));
+    if (!realloc_func)
+        realloc_func = dbuf_default_realloc;
+    s->opaque = opaque;
+    s->realloc_func = realloc_func;
+}
+
+void dbuf_init(DynBuf *s)
+{
+    dbuf_init2(s, NULL, NULL);
+}
+
+/* return < 0 if error */
+int dbuf_realloc(DynBuf *s, size_t new_size)
+{
+    size_t size;
+    uint8_t *new_buf;
+    if (new_size > s->allocated_size) {
+        if (s->error)
+            return -1;
+        size = s->allocated_size * 3 / 2;
+        if (size > new_size)
+            new_size = size;
+        new_buf = s->realloc_func(s->opaque, s->buf, new_size);
+        if (!new_buf) {
+            s->error = TRUE;
+            return -1;
+        }
+        s->buf = new_buf;
+        s->allocated_size = new_size;
+    }
+    return 0;
+}
+
+int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len)
+{
+    size_t end;
+    end = offset + len;
+    if (dbuf_realloc(s, end))
+        return -1;
+    memcpy(s->buf + offset, data, len);
+    if (end > s->size)
+        s->size = end;
+    return 0;
+}
+
+int dbuf_put(DynBuf *s, const uint8_t *data, size_t len)
+{
+    if (unlikely((s->size + len) > s->allocated_size)) {
+        if (dbuf_realloc(s, s->size + len))
+            return -1;
+    }
+    memcpy(s->buf + s->size, data, len);
+    s->size += len;
+    return 0;
+}
+
+int dbuf_put_self(DynBuf *s, size_t offset, size_t len)
+{
+    if (unlikely((s->size + len) > s->allocated_size)) {
+        if (dbuf_realloc(s, s->size + len))
+            return -1;
+    }
+    memcpy(s->buf + s->size, s->buf + offset, len);
+    s->size += len;
+    return 0;
+}
+
+int dbuf_putc(DynBuf *s, uint8_t c)
+{
+    return dbuf_put(s, &c, 1);
+}
+
+int dbuf_putstr(DynBuf *s, const char *str)
+{
+    return dbuf_put(s, (const uint8_t *)str, strlen(str));
+}
+
+#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, ...)
+#endif
+{
+    va_list ap;
+    char buf[128];
+    int len;
+    
+    va_start(ap, fmt);
+    len = vsnprintf(buf, sizeof(buf), fmt, ap);
+    va_end(ap);
+    if (len < sizeof(buf)) {
+        /* fast case */
+        return dbuf_put(s, (uint8_t *)buf, len);
+    } else {
+        if (dbuf_realloc(s, s->size + len + 1))
+            return -1;
+        va_start(ap, fmt);
+        vsnprintf((char *)(s->buf + s->size), s->allocated_size - s->size,
+                  fmt, ap);
+        va_end(ap);
+        s->size += len;
+    }
+    return 0;
+}
+
+void dbuf_free(DynBuf *s)
+{
+    /* we test s->buf as a fail safe to avoid crashing if dbuf_free()
+       is called twice */
+    if (s->buf) {
+        s->realloc_func(s->opaque, s->buf, 0);
+    }
+    memset(s, 0, sizeof(*s));
+}
+
+/* Note: at most 31 bits are encoded. At most UTF8_CHAR_LEN_MAX bytes
+   are output. */
+int unicode_to_utf8(uint8_t *buf, unsigned int c)
+{
+    uint8_t *q = buf;
+
+    if (c < 0x80) {
+        *q++ = c;
+    } else {
+        if (c < 0x800) {
+            *q++ = (c >> 6) | 0xc0;
+        } else {
+            if (c < 0x10000) {
+                *q++ = (c >> 12) | 0xe0;
+            } else {
+                if (c < 0x00200000) {
+                    *q++ = (c >> 18) | 0xf0;
+                } else {
+                    if (c < 0x04000000) {
+                        *q++ = (c >> 24) | 0xf8;
+                    } else if (c < 0x80000000) {
+                        *q++ = (c >> 30) | 0xfc;
+                        *q++ = ((c >> 24) & 0x3f) | 0x80;
+                    } else {
+                        return 0;
+                    }
+                    *q++ = ((c >> 18) & 0x3f) | 0x80;
+                }
+                *q++ = ((c >> 12) & 0x3f) | 0x80;
+            }
+            *q++ = ((c >> 6) & 0x3f) | 0x80;
+        }
+        *q++ = (c & 0x3f) | 0x80;
+    }
+    return (int) ( q - buf );
+}
+
+static const unsigned int utf8_min_code[5] = {
+    0x80, 0x800, 0x10000, 0x00200000, 0x04000000,
+};
+
+static const unsigned char utf8_first_code_mask[5] = {
+    0x1f, 0xf, 0x7, 0x3, 0x1,
+};
+
+/* return -1 if error. *pp is not updated in this case. max_len must
+   be >= 1. The maximum length for a UTF8 byte sequence is 6 bytes. */
+int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp)
+{
+    int l, c, b, i;
+
+    c = *p++;
+    if (c < 0x80) {
+        *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:
+        l = 1;
+        break;
+    case 0xe0 ... 0xef:
+        l = 2;
+        break;
+    case 0xf0 ... 0xf7:
+        l = 3;
+        break;
+    case 0xf8 ... 0xfb:
+        l = 4;
+        break;
+    case 0xfc ... 0xfd:
+        l = 5;
+        break;
+    default:
+        return -1;
+    }
+#endif
+	/* check that we have enough characters */
+    if (l > (max_len - 1))
+        return -1;
+    c &= utf8_first_code_mask[l - 1];
+    for(i = 0; i < l; i++) {
+        b = *p++;
+        if (b < 0x80 || b >= 0xc0)
+            return -1;
+        c = (c << 6) | (b & 0x3f);
+    }
+    if (c < (int) utf8_min_code[l - 1])
+        return -1;
+    *pp = p;
+    return c;
+}
+
+#if 0
+
+#if defined(EMSCRIPTEN) || defined(__ANDROID__)
+
+static void *rqsort_arg;
+static int (*rqsort_cmp)(const void *, const void *, void *);
+
+static int rqsort_cmp2(const void *p1, const void *p2)
+{
+    return rqsort_cmp(p1, p2, rqsort_arg);
+}
+
+/* not reentrant, but not needed with emscripten */
+void rqsort(void *base, size_t nmemb, size_t size,
+            int (*cmp)(const void *, const void *, void *),
+            void *arg)
+{
+    rqsort_arg = arg;
+    rqsort_cmp = cmp;
+    qsort(base, nmemb, size, rqsort_cmp2);
+}
+
+#endif
+
+#else
+
+typedef void (*exchange_f)(void *a, void *b, size_t size);
+typedef int (*cmp_f)(const void *, const void *, void *opaque);
+
+static void exchange_bytes(void *a, void *b, size_t size) {
+    uint8_t *ap = (uint8_t *)a;
+    uint8_t *bp = (uint8_t *)b;
+
+    while (size-- != 0) {
+        uint8_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_byte(void *a, void *b, size_t size) {
+    uint8_t *ap = (uint8_t *)a;
+    uint8_t *bp = (uint8_t *)b;
+    uint8_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int16s(void *a, void *b, size_t size) {
+    uint16_t *ap = (uint16_t *)a;
+    uint16_t *bp = (uint16_t *)b;
+
+    for (size /= sizeof(uint16_t); size-- != 0;) {
+        uint16_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int16(void *a, void *b, size_t size) {
+    uint16_t *ap = (uint16_t *)a;
+    uint16_t *bp = (uint16_t *)b;
+    uint16_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int32s(void *a, void *b, size_t size) {
+    uint32_t *ap = (uint32_t *)a;
+    uint32_t *bp = (uint32_t *)b;
+
+    for (size /= sizeof(uint32_t); size-- != 0;) {
+        uint32_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int32(void *a, void *b, size_t size) {
+    uint32_t *ap = (uint32_t *)a;
+    uint32_t *bp = (uint32_t *)b;
+    uint32_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int64s(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+
+    for (size /= sizeof(uint64_t); size-- != 0;) {
+        uint64_t t = *ap;
+        *ap++ = *bp;
+        *bp++ = t;
+    }
+}
+
+static void exchange_one_int64(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+    uint64_t t = *ap;
+    *ap = *bp;
+    *bp = t;
+}
+
+static void exchange_int128s(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+
+    for (size /= sizeof(uint64_t) * 2; size-- != 0; ap += 2, bp += 2) {
+        uint64_t t = ap[0];
+        uint64_t u = ap[1];
+        ap[0] = bp[0];
+        ap[1] = bp[1];
+        bp[0] = t;
+        bp[1] = u;
+    }
+}
+
+static void exchange_one_int128(void *a, void *b, size_t size) {
+    uint64_t *ap = (uint64_t *)a;
+    uint64_t *bp = (uint64_t *)b;
+    uint64_t t = ap[0];
+    uint64_t u = ap[1];
+    ap[0] = bp[0];
+    ap[1] = bp[1];
+    bp[0] = t;
+    bp[1] = u;
+}
+
+static inline exchange_f exchange_func(const void *base, size_t size) {
+    switch (((uintptr_t)base | (uintptr_t)size) & 15) {
+    case 0:
+        if (size == sizeof(uint64_t) * 2)
+            return exchange_one_int128;
+        else
+            return exchange_int128s;
+    case 8:
+        if (size == sizeof(uint64_t))
+            return exchange_one_int64;
+        else
+            return exchange_int64s;
+    case 4:
+    case 12:
+        if (size == sizeof(uint32_t))
+            return exchange_one_int32;
+        else
+            return exchange_int32s;
+    case 2:
+    case 6:
+    case 10:
+    case 14:
+        if (size == sizeof(uint16_t))
+            return exchange_one_int16;
+        else
+            return exchange_int16s;
+    default:
+        if (size == 1)
+            return exchange_one_byte;
+        else
+            return exchange_bytes;
+    }
+}
+
+static void heapsortx(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
+{
+    uint8_t *basep = (uint8_t *)base;
+    size_t i, n, c, r;
+    exchange_f swap = exchange_func(base, size);
+
+    if (nmemb > 1) {
+        i = (nmemb / 2) * size;
+        n = nmemb * size;
+
+        while (i > 0) {
+            i -= size;
+            for (r = i; (c = r * 2 + size) < n; r = c) {
+                if (c < n - size && cmp(basep + c, basep + c + size, opaque) <= 0)
+                    c += size;
+                if (cmp(basep + r, basep + c, opaque) > 0)
+                    break;
+                swap(basep + r, basep + c, size);
+            }
+        }
+        for (i = n - size; i > 0; i -= size) {
+            swap(basep, basep + i, size);
+
+            for (r = 0; (c = r * 2 + size) < i; r = c) {
+                if (c < i - size && cmp(basep + c, basep + c + size, opaque) <= 0)
+                    c += size;
+                if (cmp(basep + r, basep + c, opaque) > 0)
+                    break;
+                swap(basep + r, basep + c, size);
+            }
+        }
+    }
+}
+
+static inline void *med3(void *a, void *b, void *c, cmp_f cmp, void *opaque)
+{
+    return cmp(a, b, opaque) < 0 ?
+        (cmp(b, c, opaque) < 0 ? b : (cmp(a, c, opaque) < 0 ? c : a )) :
+        (cmp(b, c, opaque) > 0 ? b : (cmp(a, c, opaque) < 0 ? a : c ));
+}
+
+/* pointer based version with local stack and insertion sort threshhold */
+void rqsort(void *base, size_t nmemb, size_t size, cmp_f cmp, void *opaque)
+{
+    struct { uint8_t *base; size_t count; int depth; } stack[50], *sp = stack;
+    uint8_t *ptr, *pi, *pj, *plt, *pgt, *top, *m;
+    size_t m4, i, lt, gt, span, span2;
+    int c, depth;
+    exchange_f swap = exchange_func(base, size);
+    exchange_f swap_block = exchange_func(base, size | 128);
+
+    if (nmemb < 2 || size <= 0)
+        return;
+
+    sp->base = (uint8_t *)base;
+    sp->count = nmemb;
+    sp->depth = 0;
+    sp++;
+
+    while (sp > stack) {
+        sp--;
+        ptr = sp->base;
+        nmemb = sp->count;
+        depth = sp->depth;
+
+        while (nmemb > 6) {
+            if (++depth > 50) {
+                /* depth check to ensure worst case logarithmic time */
+                heapsortx(ptr, nmemb, size, cmp, opaque);
+                nmemb = 0;
+                break;
+            }
+            /* select median of 3 from 1/4, 1/2, 3/4 positions */
+            /* should use median of 5 or 9? */
+            m4 = (nmemb >> 2) * size;
+            m = med3(ptr + m4, ptr + 2 * m4, ptr + 3 * m4, cmp, opaque);
+            swap(ptr, m, size);  /* move the pivot to the start or the array */
+            i = lt = 1;
+            pi = plt = ptr + size;
+            gt = nmemb;
+            pj = pgt = top = ptr + nmemb * size;
+            for (;;) {
+                while (pi < pj && (c = cmp(ptr, pi, opaque)) >= 0) {
+                    if (c == 0) {
+                        swap(plt, pi, size);
+                        lt++;
+                        plt += size;
+                    }
+                    i++;
+                    pi += size;
+                }
+                while (pi < (pj -= size) && (c = cmp(ptr, pj, opaque)) <= 0) {
+                    if (c == 0) {
+                        gt--;
+                        pgt -= size;
+                        swap(pgt, pj, size);
+                    }
+                }
+                if (pi >= pj)
+                    break;
+                swap(pi, pj, size);
+                i++;
+                pi += size;
+            }
+            /* array has 4 parts:
+             * from 0 to lt excluded: elements identical to pivot
+             * from lt to pi excluded: elements smaller than pivot
+             * from pi to gt excluded: elements greater than pivot
+             * from gt to n excluded: elements identical to pivot
+             */
+            /* move elements identical to pivot in the middle of the array: */
+            /* swap values in ranges [0..lt[ and [i-lt..i[
+               swapping the smallest span between lt and i-lt is sufficient
+             */
+            span = plt - ptr;
+            span2 = pi - plt;
+            lt = i - lt;
+            if (span > span2)
+                span = span2;
+            swap_block(ptr, pi - span, span);
+            /* swap values in ranges [gt..top[ and [i..top-(top-gt)[
+               swapping the smallest span between top-gt and gt-i is sufficient
+             */
+            span = top - pgt;
+            span2 = pgt - pi;
+            pgt = top - span2;
+            gt = nmemb - (gt - i);
+            if (span > span2)
+                span = span2;
+            swap_block(pi, top - span, span);
+
+            /* now array has 3 parts:
+             * from 0 to lt excluded: elements smaller than pivot
+             * from lt to gt excluded: elements identical to pivot
+             * from gt to n excluded: elements greater than pivot
+             */
+            /* stack the larger segment and keep processing the smaller one
+               to minimize stack use for pathological distributions */
+            if (lt > nmemb - gt) {
+                sp->base = ptr;
+                sp->count = lt;
+                sp->depth = depth;
+                sp++;
+                ptr = pgt;
+                nmemb -= gt;
+            } else {
+                sp->base = pgt;
+                sp->count = nmemb - gt;
+                sp->depth = depth;
+                sp++;
+                nmemb = lt;
+            }
+        }
+        /* Use insertion sort for small fragments */
+        for (pi = ptr + size, top = ptr + nmemb * size; pi < top; pi += size) {
+            for (pj = pi; pj > ptr && cmp(pj - size, pj, opaque) > 0; pj -= size)
+                swap(pj, pj - size, size);
+        }
+    }
+}
+
+#endif

gpac-1.0.0.tar.gz/src/quickjs/cutils.h Added

@@ -0,0 +1,356 @@
+/*
+ * C utilities
+ * 
+ * Copyright (c) 2017 Fabrice Bellard
+ * Copyright (c) 2018 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.
+ */
+#ifndef CUTILS_H
+#define CUTILS_H
+
+#include <stdlib.h>
+#include <inttypes.h>
+#if defined(_MSC_VER)
+#include <intrin.h>
+#pragma intrinsic(_BitScanReverse)
+#endif
+
+/* set if CPU is big endian */
+#undef WORDS_BIGENDIAN
+
+#if defined(_MSC_VER)
+#define likely(x)       (x)
+#define unlikely(x)     (x)
+#define force_inline inline
+#define no_inline
+#define __maybe_unused
+#else
+#define likely(x)       __builtin_expect(!!(x), 1)
+#define unlikely(x)     __builtin_expect(!!(x), 0)
+#define force_inline inline __attribute__((always_inline))
+#define no_inline __attribute__((noinline))
+#define __maybe_unused __attribute__((unused))
+#endif
+
+#define xglue(x, y) x ## y
+#define glue(x, y) xglue(x, y)
+#define stringify(s)    tostring(s)
+#define tostring(s)     #s
+
+#ifndef offsetof
+#define offsetof(type, field) ((size_t) &((type *)0)->field)
+#endif
+#ifndef countof
+#define countof(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
+typedef int BOOL;
+
+#ifndef FALSE
+enum {
+    FALSE = 0,
+    TRUE = 1,
+};
+#endif
+
+void pstrcpy(char *buf, int buf_size, const char *str);
+char *pstrcat(char *buf, int buf_size, const char *s);
+int strstart(const char *str, const char *val, const char **ptr);
+int has_suffix(const char *str, const char *suffix);
+
+static inline int max_int(int a, int b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline int min_int(int a, int b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+static inline uint32_t max_uint32(uint32_t a, uint32_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline uint32_t min_uint32(uint32_t a, uint32_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+static inline int64_t max_int64(int64_t a, int64_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline int64_t min_int64(int64_t a, int64_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int clz32(unsigned int a)
+{
+#if defined(_MSC_VER)
+    unsigned long ret = 0;
+    _BitScanReverse(&ret, a);
+    return (int)ret;
+#else
+    return __builtin_clz(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int clz64(uint64_t a)
+{
+#if defined(_MSC_VER)
+    unsigned long ret = 0;
+# ifdef _WIN64
+	_BitScanReverse64(&ret, a);
+# else
+	if (_BitScanReverse(&ret, (uint32_t) (a >> 32)))
+		return 63 - (ret + 32);
+	_BitScanReverse(&ret, (uint32_t) (a));
+# endif
+	return (int)ret;
+#else
+    return __builtin_clzll(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int ctz32(unsigned int a)
+{
+#if defined(_MSC_VER)
+    unsigned long ret = 0;
+    _BitScanForward(&ret, a);
+    return (int)ret;
+#else
+    return __builtin_ctz(a);
+#endif
+}
+
+/* WARNING: undefined if a = 0 */
+static inline int ctz64(uint64_t a)
+{
+#if defined(_MSC_VER)
+    unsigned long ret = 0;
+# ifdef _WIN64
+	_BitScanReverse64(&ret, a);
+# else
+	if (_BitScanReverse(&ret, (uint32_t)(a >> 32)))
+		return 63 - (ret + 32);
+	_BitScanReverse(&ret, (uint32_t)(a));
+# endif
+    return (int)ret;
+#else
+    return __builtin_ctzll(a);
+#endif
+}
+
+#if defined(_MSC_VER)
+#pragma pack(push)
+#pragma pack(1)
+#define __attribute__(x) /* */
+#endif
+
+struct __attribute__((packed)) packed_u64 {
+    uint64_t v;
+};
+
+struct __attribute__((packed)) packed_u32 {
+    uint32_t v;
+};
+
+struct __attribute__((packed)) packed_u16 {
+    uint16_t v;
+};
+
+#if defined(_MSC_VER)
+#pragma pack(pop)
+#undef __attribute__
+#endif
+
+static inline uint64_t get_u64(const uint8_t *tab)
+{
+    return ((const struct packed_u64 *)tab)->v;
+}
+
+static inline int64_t get_i64(const uint8_t *tab)
+{
+    return (int64_t)((const struct packed_u64 *)tab)->v;
+}
+
+static inline void put_u64(uint8_t *tab, uint64_t val)
+{
+    ((struct packed_u64 *)tab)->v = val;
+}
+
+static inline uint32_t get_u32(const uint8_t *tab)
+{
+    return ((const struct packed_u32 *)tab)->v;
+}
+
+static inline int32_t get_i32(const uint8_t *tab)
+{
+    return (int32_t)((const struct packed_u32 *)tab)->v;
+}
+
+static inline void put_u32(uint8_t *tab, uint32_t val)
+{
+    ((struct packed_u32 *)tab)->v = val;
+}
+
+static inline uint32_t get_u16(const uint8_t *tab)
+{
+    return ((const struct packed_u16 *)tab)->v;
+}
+
+static inline int32_t get_i16(const uint8_t *tab)
+{
+    return (int16_t)((const struct packed_u16 *)tab)->v;
+}
+
+static inline void put_u16(uint8_t *tab, uint16_t val)
+{
+    ((struct packed_u16 *)tab)->v = val;
+}
+
+static inline uint32_t get_u8(const uint8_t *tab)
+{
+    return *tab;
+}
+
+static inline int32_t get_i8(const uint8_t *tab)
+{
+    return (int8_t)*tab;
+}
+
+static inline void put_u8(uint8_t *tab, uint8_t val)
+{
+    *tab = val;
+}
+
+static inline uint16_t bswap16(uint16_t x)
+{
+    return (x >> 8) | (x << 8);
+}
+
+static inline uint32_t bswap32(uint32_t v)
+{
+    return ((v & 0xff000000) >> 24) | ((v & 0x00ff0000) >>  8) |
+        ((v & 0x0000ff00) <<  8) | ((v & 0x000000ff) << 24);
+}
+
+static inline uint64_t bswap64(uint64_t v)
+{
+    return ((v & ((uint64_t)0xff << (7 * 8))) >> (7 * 8)) | 
+        ((v & ((uint64_t)0xff << (6 * 8))) >> (5 * 8)) | 
+        ((v & ((uint64_t)0xff << (5 * 8))) >> (3 * 8)) | 
+        ((v & ((uint64_t)0xff << (4 * 8))) >> (1 * 8)) | 
+        ((v & ((uint64_t)0xff << (3 * 8))) << (1 * 8)) | 
+        ((v & ((uint64_t)0xff << (2 * 8))) << (3 * 8)) | 
+        ((v & ((uint64_t)0xff << (1 * 8))) << (5 * 8)) | 
+        ((v & ((uint64_t)0xff << (0 * 8))) << (7 * 8));
+}
+
+/* XXX: should take an extra argument to pass slack information to the caller */
+typedef void *DynBufReallocFunc(void *opaque, void *ptr, size_t size);
+
+typedef struct DynBuf {
+    uint8_t *buf;
+    size_t size;
+    size_t allocated_size;
+    BOOL error; /* true if a memory allocation error occurred */
+    DynBufReallocFunc *realloc_func;
+    void *opaque; /* for realloc_func */
+} DynBuf;
+
+void dbuf_init(DynBuf *s);
+void dbuf_init2(DynBuf *s, void *opaque, DynBufReallocFunc *realloc_func);
+int dbuf_realloc(DynBuf *s, size_t new_size);
+int dbuf_write(DynBuf *s, size_t offset, const uint8_t *data, size_t len);
+int dbuf_put(DynBuf *s, const uint8_t *data, size_t len);
+int dbuf_put_self(DynBuf *s, size_t offset, size_t len);
+int dbuf_putc(DynBuf *s, uint8_t c);
+int dbuf_putstr(DynBuf *s, const char *str);
+static inline int dbuf_put_u16(DynBuf *s, uint16_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 2);
+}
+static inline int dbuf_put_u32(DynBuf *s, uint32_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 4);
+}
+static inline int dbuf_put_u64(DynBuf *s, uint64_t val)
+{
+    return dbuf_put(s, (uint8_t *)&val, 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, ...);
+#endif
+void dbuf_free(DynBuf *s);
+static inline BOOL dbuf_error(DynBuf *s) {
+    return s->error;
+}
+
+#define UTF8_CHAR_LEN_MAX 6
+
+int unicode_to_utf8(uint8_t *buf, unsigned int c);
+int unicode_from_utf8(const uint8_t *p, int max_len, const uint8_t **pp);
+
+static inline int from_hex(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'F')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'f')
+        return c - 'a' + 10;
+    else
+        return -1;
+}
+
+void rqsort(void *base, size_t nmemb, size_t size,
+            int (*cmp)(const void *, const void *, void *),
+            void *arg);
+
+#endif  /* CUTILS_H */

gpac-1.0.0.tar.gz/src/quickjs/libbf.c Added

@@ -0,0 +1,8172 @@
+/*
+ * Tiny arbitrary precision floating point library
+ * 
+ * Copyright (c) 2017-2020 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.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <inttypes.h>
+#include <math.h>
+#include <string.h>
+#include <assert.h>
+
+#ifdef __AVX2__
+#include <immintrin.h>
+#endif
+
+#include "cutils.h"
+#include "libbf.h"
+
+/* enable it to check the multiplication result */
+//#define USE_MUL_CHECK
+/* enable it to use FFT/NTT multiplication */
+#define USE_FFT_MUL
+/* enable decimal floating point support */
+#define USE_BF_DEC
+
+//#define inline __attribute__((always_inline))
+
+#ifdef __AVX2__
+#define FFT_MUL_THRESHOLD 100 /* in limbs of the smallest factor */
+#else
+#define FFT_MUL_THRESHOLD 100 /* in limbs of the smallest factor */
+#endif
+
+/* XXX: adjust */
+#define DIVNORM_LARGE_THRESHOLD 50
+#define UDIV1NORM_THRESHOLD 3
+
+#if LIMB_BITS == 64
+#define FMT_LIMB1 "%" PRIx64 
+#define FMT_LIMB "%016" PRIx64 
+#define PRId_LIMB PRId64
+#define PRIu_LIMB PRIu64
+
+#else
+
+#define FMT_LIMB1 "%x"
+#define FMT_LIMB "%08x"
+#define PRId_LIMB "d"
+#define PRIu_LIMB "u"
+
+#endif
+
+typedef intptr_t mp_size_t;
+
+typedef int bf_op2_func_t(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                          bf_flags_t flags);
+
+#ifdef USE_FFT_MUL
+
+#define FFT_MUL_R_OVERLAP_A (1 << 0)
+#define FFT_MUL_R_OVERLAP_B (1 << 1)
+#define FFT_MUL_R_NORESIZE  (1 << 2)
+
+static no_inline int fft_mul(bf_context_t *s,
+                             bf_t *res, limb_t *a_tab, limb_t a_len,
+                             limb_t *b_tab, limb_t b_len, int mul_flags);
+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
+
+
+/* could leading zeros */
+static inline int clz(limb_t a)
+{
+    if (a == 0) {
+        return LIMB_BITS;
+    } else {
+#if LIMB_BITS == 64
+        return clz64(a);
+#else
+        return clz32(a);
+#endif
+    }
+}
+
+static inline int ctz(limb_t a)
+{
+    if (a == 0) {
+        return LIMB_BITS;
+    } else {
+#if LIMB_BITS == 64
+        return ctz64(a);
+#else
+        return ctz32(a);
+#endif
+    }
+}
+
+static inline int ceil_log2(limb_t a)
+{
+    if (a <= 1)
+        return 0;
+    else
+        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)
+{
+    if (a >= 0)
+        return (a + b - 1) / b;
+    else
+        return a / b;
+}
+#endif
+
+/* b must be >= 1 */
+static inline slimb_t floor_div(slimb_t a, slimb_t b)
+{
+    if (a >= 0) {
+        return a / b;
+    } else {
+        return (a - b + 1) / b;
+    }
+}
+
+/* return r = a modulo b (0 <= r <= b - 1. b must be >= 1 */
+static inline limb_t smod(slimb_t a, slimb_t b)
+{
+    a = a % (slimb_t)b;
+    if (a < 0)
+        a += b;
+    return a;
+}
+
+#define malloc(s) malloc_is_forbidden(s)
+#define free(p) free_is_forbidden(p)
+#define realloc(p, s) realloc_is_forbidden(p, s)
+
+void bf_context_init(bf_context_t *s, bf_realloc_func_t *realloc_func,
+                     void *realloc_opaque)
+{
+    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)
+{
+    bf_clear_cache(s);
+}
+
+void bf_init(bf_context_t *s, bf_t *r)
+{
+    r->ctx = s;
+    r->sign = 0;
+    r->expn = BF_EXP_ZERO;
+    r->len = 0;
+    r->tab = NULL;
+}
+
+/* return 0 if OK, -1 if alloc error */
+int bf_resize(bf_t *r, limb_t len)
+{
+    limb_t *tab;
+    
+    if (len != r->len) {
+        tab = bf_realloc(r->ctx, r->tab, len * sizeof(limb_t));
+        if (!tab && len != 0)
+            return -1;
+        r->tab = tab;
+        r->len = len;
+    }
+    return 0;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set_ui(bf_t *r, uint64_t a)
+{
+    r->sign = 0;
+    if (a == 0) {
+        r->expn = BF_EXP_ZERO;
+        bf_resize(r, 0); /* cannot fail */
+    } 
+#if LIMB_BITS == 32
+    else if (a <= 0xffffffff)
+#else
+    else
+#endif
+    {
+        int shift;
+        if (bf_resize(r, 1))
+            goto fail;
+        shift = clz(a);
+        r->tab[0] = a << shift;
+        r->expn = LIMB_BITS - shift;
+    }
+#if LIMB_BITS == 32
+    else {
+        uint32_t a1, a0;
+        int shift;
+        if (bf_resize(r, 2))
+            goto fail;
+        a0 = a;
+        a1 = a >> 32;
+        shift = clz(a1);
+        r->tab[0] = a0 << shift;
+        r->tab[1] = (a1 << shift) | (a0 >> (LIMB_BITS - shift));
+        r->expn = 2 * LIMB_BITS - shift;
+    }
+#endif
+    return 0;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set_si(bf_t *r, int64_t a)
+{
+    int ret;
+
+    if (a < 0) {
+        ret = bf_set_ui(r, -a);
+        r->sign = 1;
+    } else {
+        ret = bf_set_ui(r, a);
+    }
+    return ret;
+}
+
+void bf_set_nan(bf_t *r)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_NAN;
+    r->sign = 0;
+}
+
+void bf_set_zero(bf_t *r, int is_neg)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_ZERO;
+    r->sign = is_neg;
+}
+
+void bf_set_inf(bf_t *r, int is_neg)
+{
+    bf_resize(r, 0); /* cannot fail */
+    r->expn = BF_EXP_INF;
+    r->sign = is_neg;
+}
+
+/* return 0 or BF_ST_MEM_ERROR */
+int bf_set(bf_t *r, const bf_t *a)
+{
+    if (r == a)
+        return 0;
+    if (bf_resize(r, a->len)) {
+        bf_set_nan(r);
+        return BF_ST_MEM_ERROR;
+    }
+    r->sign = a->sign;
+    r->expn = a->expn;
+    memcpy(r->tab, a->tab, a->len * sizeof(limb_t));
+    return 0;
+}
+
+/* equivalent to bf_set(r, a); bf_delete(a) */
+void bf_move(bf_t *r, bf_t *a)
+{
+    bf_context_t *s = r->ctx;
+    if (r == a)
+        return;
+    bf_free(s, r->tab);
+    *r = *a;
+}
+
+static limb_t get_limbz(const bf_t *a, limb_t idx)
+{
+    if (idx >= a->len)
+        return 0;
+    else
+        return a->tab[idx];
+}
+
+/* get LIMB_BITS at bit position 'pos' in tab */
+static inline limb_t get_bits(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    limb_t i, a0, a1;
+    int p;
+
+    i = pos >> LIMB_LOG2_BITS;
+    p = pos & (LIMB_BITS - 1);
+    if (i < len)
+        a0 = tab[i];
+    else
+        a0 = 0;
+    if (p == 0) {
+        return a0;
+    } else {
+        i++;
+        if (i < len)
+            a1 = tab[i];
+        else
+            a1 = 0;
+        return (a0 >> p) | (a1 << (LIMB_BITS - p));
+    }
+}
+
+static inline limb_t get_bit(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    slimb_t i;
+    i = pos >> LIMB_LOG2_BITS;
+    if (i < 0 || i >= len)
+        return 0;
+    return (tab[i] >> (pos & (LIMB_BITS - 1))) & 1;
+}
+
+static inline limb_t limb_mask(int start, int last)
+{
+    limb_t v;
+    int n;
+    n = last - start + 1;
+    if (n == LIMB_BITS)
+        v = -1;
+    else
+        v = (((limb_t)1 << n) - 1) << start;
+    return v;
+}
+
+static limb_t mp_scan_nz(const limb_t *tab, mp_size_t n)
+{
+    mp_size_t i;
+    for(i = 0; i < n; i++) {
+        if (tab[i] != 0)
+            return 1;
+    }
+    return 0;
+}
+
+/* return != 0 if one bit between 0 and bit_pos inclusive is not zero. */
+static inline limb_t scan_bit_nz(const bf_t *r, slimb_t bit_pos)
+{
+    slimb_t pos;
+    limb_t v;
+    
+    pos = bit_pos >> LIMB_LOG2_BITS;
+    if (pos < 0)
+        return 0;
+    v = r->tab[pos] & limb_mask(0, bit_pos & (LIMB_BITS - 1));
+    if (v != 0)
+        return 1;
+    pos--;
+    while (pos >= 0) {
+        if (r->tab[pos] != 0)
+            return 1;
+        pos--;
+    }
+    return 0;
+}
+
+/* return the addend for rounding. Note that prec can be <= 0 (for
+   BF_FLAG_RADPNT_PREC) */
+static int bf_get_rnd_add(int *pret, const bf_t *r, limb_t l,
+                          slimb_t prec, int rnd_mode)
+{
+    int add_one, inexact;
+    limb_t bit1, bit0;
+    
+    if (rnd_mode == BF_RNDF) {
+        bit0 = 1; /* faithful rounding does not honor the INEXACT flag */
+    } else {
+        /* starting limb for bit 'prec + 1' */
+        bit0 = scan_bit_nz(r, l * LIMB_BITS - 1 - bf_max(0, prec + 1));
+    }
+
+    /* get the bit at 'prec' */
+    bit1 = get_bit(r->tab, l, l * LIMB_BITS - 1 - prec);
+    inexact = (bit1 | bit0) != 0;
+    
+    add_one = 0;
+    switch(rnd_mode) {
+    case BF_RNDZ:
+        break;
+    case BF_RNDN:
+        if (bit1) {
+            if (bit0) {
+                add_one = 1;
+            } else {
+                /* round to even */
+                add_one =
+                    get_bit(r->tab, l, l * LIMB_BITS - 1 - (prec - 1));
+            }
+        }
+        break;
+    case BF_RNDD:
+    case BF_RNDU:
+        if (r->sign == (rnd_mode == BF_RNDD))
+            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();
+    }
+    
+    if (inexact)
+        *pret |= BF_ST_INEXACT;
+    return add_one;
+}
+
+static int bf_set_overflow(bf_t *r, int sign, limb_t prec, bf_flags_t flags)
+{
+    slimb_t i, l, e_max;
+    int rnd_mode;
+    
+    rnd_mode = flags & BF_RND_MASK;
+    if (prec == BF_PREC_INF ||
+        rnd_mode == BF_RNDN ||
+        rnd_mode == BF_RNDNA ||
+        rnd_mode == BF_RNDNU ||
+        (rnd_mode == BF_RNDD && sign == 1) ||
+        (rnd_mode == BF_RNDU && sign == 0)) {
+        bf_set_inf(r, sign);
+    } else {
+        /* set to maximum finite number */
+        l = (prec + LIMB_BITS - 1) / LIMB_BITS;
+        if (bf_resize(r, l)) {
+            bf_set_nan(r);
+            return BF_ST_MEM_ERROR;
+        }
+        r->tab[0] = limb_mask((-prec) & (LIMB_BITS - 1),
+                              LIMB_BITS - 1);
+        for(i = 1; i < l; i++)
+            r->tab[i] = (limb_t)-1;
+        e_max = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+        r->expn = e_max;
+        r->sign = sign;
+    }
+    return BF_ST_OVERFLOW | BF_ST_INEXACT;
+}
+
+/* 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
+   overflow not returning infinity. */
+static int __bf_round(bf_t *r, limb_t prec1, bf_flags_t flags, limb_t l)
+{
+    limb_t v, a;
+    int shift, add_one, ret, 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 */
+    e_range = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+    e_min = -e_range + 3;
+    e_max = e_range;
+    
+    if (flags & BF_FLAG_RADPNT_PREC) {
+        /* 'prec' is the precision after the radix point */
+        if (prec1 != BF_PREC_INF)
+            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;
+    }
+
+    /* 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) {
+        if (add_one) {
+            bf_resize(r, 1); /* cannot fail */
+            r->tab[0] = (limb_t)1 << (LIMB_BITS - 1);
+            r->expn += 1 - prec;
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            return ret;
+        } else {
+            goto underflow;
+        }
+    } else if (add_one) {
+        limb_t carry;
+        
+        /* add one starting at digit 'prec - 1' */
+        bit_pos = l * LIMB_BITS - 1 - (prec - 1);
+        pos = bit_pos >> LIMB_LOG2_BITS;
+        carry = (limb_t)1 << (bit_pos & (LIMB_BITS - 1));
+        
+        for(i = pos; i < l; i++) {
+            v = r->tab[i] + carry;
+            carry = (v < carry);
+            r->tab[i] = v;
+            if (carry == 0)
+                break;
+        }
+        if (carry) {
+            /* shift right by one digit */
+            v = 1;
+            for(i = l - 1; i >= pos; i--) {
+                a = r->tab[i];
+                r->tab[i] = (a >> 1) | (v << (LIMB_BITS - 1));
+                v = a;
+            }
+            r->expn++;
+        }
+    }
+    
+    /* check underflow */
+    if (unlikely(r->expn < e_min)) {
+        if (flags & BF_FLAG_SUBNORMAL) {
+            /* if inexact, also set the underflow flag */
+            if (ret & BF_ST_INEXACT)
+                ret |= BF_ST_UNDERFLOW;
+        } else {
+        underflow:
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            bf_set_zero(r, r->sign);
+            return ret;
+        }
+    }
+    
+    /* check overflow */
+    if (unlikely(r->expn > e_max))
+        return bf_set_overflow(r, r->sign, prec1, flags);
+    
+    /* keep the bits starting at 'prec - 1' */
+    bit_pos = l * LIMB_BITS - 1 - (prec - 1);
+    i = bit_pos >> LIMB_LOG2_BITS;
+    if (i >= 0) {
+        shift = bit_pos & (LIMB_BITS - 1);
+        if (shift != 0)
+            r->tab[i] &= limb_mask(shift, LIMB_BITS - 1);
+    } else {
+        i = 0;
+    }
+    /* remove trailing zeros */
+    while (r->tab[i] == 0)
+        i++;
+    if (i > 0) {
+        l -= i;
+        memmove(r->tab, r->tab + i, l * sizeof(limb_t));
+    }
+    bf_resize(r, l); /* cannot fail */
+    return ret;
+}
+
+/* 'r' must be a finite number. */
+int bf_normalize_and_round(bf_t *r, limb_t prec1, bf_flags_t flags)
+{
+    limb_t l, v, a;
+    int shift, ret;
+    slimb_t i;
+    
+    //    bf_print_str("bf_renorm", r);
+    l = r->len;
+    while (l > 0 && r->tab[l - 1] == 0)
+        l--;
+    if (l == 0) {
+        /* zero */
+        r->expn = BF_EXP_ZERO;
+        bf_resize(r, 0); /* cannot fail */
+        ret = 0;
+    } else {
+        r->expn -= (r->len - l) * LIMB_BITS;
+        /* shift to have the MSB set to '1' */
+        v = r->tab[l - 1];
+        shift = clz(v);
+        if (shift != 0) {
+            v = 0;
+            for(i = 0; i < l; i++) {
+                a = r->tab[i];
+                r->tab[i] = (a << shift) | (v >> (LIMB_BITS - shift));
+                v = a;
+            }
+            r->expn -= shift;
+        }
+        ret = __bf_round(r, prec1, flags, l);
+    }
+    //    bf_print_str("r_final", r);
+    return ret;
+}
+
+/* return true if rounding can be done at precision 'prec' assuming
+   the exact result r is such that |r-a| <= 2^(EXP(a)-k). */
+/* XXX: check the case where the exponent would be incremented by the
+   rounding */
+int bf_can_round(const bf_t *a, slimb_t prec, bf_rnd_t rnd_mode, slimb_t k)
+{
+    BOOL is_rndn;
+    slimb_t bit_pos, n;
+    limb_t bit;
+    
+    if (a->expn == BF_EXP_INF || a->expn == BF_EXP_NAN)
+        return FALSE;
+    if (rnd_mode == BF_RNDF) {
+        return (k >= (prec + 1));
+    }
+    if (a->expn == BF_EXP_ZERO)
+        return FALSE;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
+               rnd_mode == BF_RNDNU);
+    if (k < (prec + 2))
+        return FALSE;
+    bit_pos = a->len * LIMB_BITS - 1 - prec;
+    n = k - prec;
+    /* bit pattern for RNDN or RNDNA: 0111.. or 1000...
+       for other rounding modes: 000... or 111... 
+    */
+    bit = get_bit(a->tab, a->len, bit_pos);
+    bit_pos--;
+    n--;
+    bit ^= is_rndn;
+    /* XXX: slow, but a few iterations on average */
+    while (n != 0) {
+        if (get_bit(a->tab, a->len, bit_pos) != bit)
+            return TRUE;
+        bit_pos--;
+        n--;
+    }
+    return FALSE;
+}
+
+/* Cannot fail with BF_ST_MEM_ERROR. */
+int bf_round(bf_t *r, limb_t prec, bf_flags_t flags)
+{
+    if (r->len == 0)
+        return 0;
+    return __bf_round(r, prec, flags, r->len);
+}
+
+/* for debugging */
+static __maybe_unused void dump_limbs(const char *str, const limb_t *tab, limb_t n)
+{
+    limb_t i;
+    printf("%s: len=%" PRId_LIMB "\n", str, n);
+    for(i = 0; i < n; i++) {
+        printf("%" PRId_LIMB ": " FMT_LIMB "\n",
+               i, tab[i]);
+    }
+}
+
+void mp_print_str(const char *str, const limb_t *tab, limb_t n)
+{
+    slimb_t i;
+    printf("%s= 0x", str);
+    for(i = n - 1; i >= 0; i--) {
+        if (i != (n - 1))
+            printf("_");
+        printf(FMT_LIMB, tab[i]);
+    }
+    printf("\n");
+}
+
+static __maybe_unused void mp_print_str_h(const char *str,
+                                          const limb_t *tab, limb_t n,
+                                          limb_t high)
+{
+    slimb_t i;
+    printf("%s= 0x", str);
+    printf(FMT_LIMB, high);
+    for(i = n - 1; i >= 0; i--) {
+        printf("_");
+        printf(FMT_LIMB, tab[i]);
+    }
+    printf("\n");
+}
+
+/* for debugging */
+void bf_print_str(const char *str, const bf_t *a)
+{
+    slimb_t i;
+    printf("%s=", str);
+
+    if (a->expn == BF_EXP_NAN) {
+        printf("NaN");
+    } else {
+        if (a->sign)
+            putchar('-');
+        if (a->expn == BF_EXP_ZERO) {
+            putchar('0');
+        } else if (a->expn == BF_EXP_INF) {
+            printf("Inf");
+        } else {
+            printf("0x0.");
+            for(i = a->len - 1; i >= 0; i--)
+                printf(FMT_LIMB, a->tab[i]);
+            printf("p%" PRId_LIMB, a->expn);
+        }
+    }
+    printf("\n");
+}
+
+/* compare the absolute value of 'a' and 'b'. Return < 0 if a < b, 0
+   if a = b and > 0 otherwise. */
+int bf_cmpu(const bf_t *a, const bf_t *b)
+{
+    slimb_t i;
+    limb_t len, v1, v2;
+    
+    if (a->expn != b->expn) {
+        if (a->expn < b->expn)
+            return -1;
+        else
+            return 1;
+    }
+    len = bf_max(a->len, b->len);
+    for(i = len - 1; i >= 0; i--) {
+        v1 = get_limbz(a, a->len - len + i);
+        v2 = get_limbz(b, b->len - len + i);
+        if (v1 != v2) {
+            if (v1 < v2)
+                return -1;
+            else
+                return 1;
+        }
+    }
+    return 0;
+}
+
+/* Full order: -0 < 0, NaN == NaN and NaN is larger than all other numbers */
+int bf_cmp_full(const bf_t *a, const bf_t *b)
+{
+    int res;
+    
+    if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+        if (a->expn == b->expn)
+            res = 0;
+        else if (a->expn == BF_EXP_NAN)
+            res = 1;
+        else
+            res = -1;
+    } else if (a->sign != b->sign) {
+        res = 1 - 2 * a->sign;
+    } else {
+        res = bf_cmpu(a, b);
+        if (a->sign)
+            res = -res;
+    }
+    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)
+{
+    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;
+        }
+    } 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;
+        }
+    }
+}
+
+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);
+}
+
+/* Compute the number of bits 'n' matching the pattern:
+   a= X1000..0
+   b= X0111..1
+              
+   When computing a-b, the result will have at least n leading zero
+   bits.
+
+   Precondition: a > b and a.expn - b.expn = 0 or 1
+*/
+static limb_t count_cancelled_bits(const bf_t *a, const bf_t *b)
+{
+    slimb_t bit_offset, b_offset, n;
+    int p, p1;
+    limb_t v1, v2, mask;
+
+    bit_offset = a->len * LIMB_BITS - 1;
+    b_offset = (b->len - a->len) * LIMB_BITS - (LIMB_BITS - 1) +
+        a->expn - b->expn;
+    n = 0;
+
+    /* first search the equals bits */
+    for(;;) {
+        v1 = get_limbz(a, bit_offset >> LIMB_LOG2_BITS);
+        v2 = get_bits(b->tab, b->len, bit_offset + b_offset);
+        //        printf("v1=" FMT_LIMB " v2=" FMT_LIMB "\n", v1, v2);
+        if (v1 != v2)
+            break;
+        n += LIMB_BITS;
+        bit_offset -= LIMB_BITS;
+    }
+    /* find the position of the first different bit */
+    p = clz(v1 ^ v2) + 1;
+    n += p;
+    /* then search for '0' in a and '1' in b */
+    p = LIMB_BITS - p;
+    if (p > 0) {
+        /* search in the trailing p bits of v1 and v2 */
+        mask = limb_mask(0, p - 1);
+        p1 = bf_min(clz(v1 & mask), clz((~v2) & mask)) - (LIMB_BITS - p);
+        n += p1;
+        if (p1 != p)
+            goto done;
+    }
+    bit_offset -= LIMB_BITS;
+    for(;;) {
+        v1 = get_limbz(a, bit_offset >> LIMB_LOG2_BITS);
+        v2 = get_bits(b->tab, b->len, bit_offset + b_offset);
+        //        printf("v1=" FMT_LIMB " v2=" FMT_LIMB "\n", v1, v2);
+        if (v1 != 0 || v2 != -1) {
+            /* different: count the matching bits */
+            p1 = bf_min(clz(v1), clz(~v2));
+            n += p1;
+            break;
+        }
+        n += LIMB_BITS;
+        bit_offset -= LIMB_BITS;
+    }
+ done:
+    return n;
+}
+
+static int bf_add_internal(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                           bf_flags_t flags, int b_neg)
+{
+    const bf_t *tmp;
+    int is_sub, ret, cmp_res, a_sign, b_sign;
+
+    a_sign = a->sign;
+    b_sign = b->sign ^ b_neg;
+    is_sub = a_sign ^ b_sign;
+    cmp_res = bf_cmpu(a, b);
+    if (cmp_res < 0) {
+        tmp = a;
+        a = b;
+        b = tmp;
+        a_sign = b_sign; /* b_sign is never used later */
+    }
+    /* abs(a) >= abs(b) */
+    if (cmp_res == 0 && is_sub && a->expn < BF_EXP_INF) {
+        /* zero result */
+        bf_set_zero(r, (flags & BF_RND_MASK) == BF_RNDD);
+        ret = 0;
+    } else if (a->len == 0 || b->len == 0) {
+        ret = 0;
+        if (a->expn >= BF_EXP_INF) {
+            if (a->expn == BF_EXP_NAN) {
+                /* at least one operand is NaN */
+                bf_set_nan(r);
+            } else if (b->expn == BF_EXP_INF && is_sub) {
+                /* infinities with different signs */
+                bf_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, a_sign);
+            }
+        } else {
+            /* at least one zero and not subtract */
+            bf_set(r, a);
+            r->sign = a_sign;
+            goto renorm;
+        }
+    } else {
+        slimb_t d, a_offset, b_bit_offset, i, cancelled_bits;
+        limb_t carry, v1, v2, u, r_len, carry1, precl, tot_len, z, sub_mask;
+
+        r->sign = a_sign;
+        r->expn = a->expn;
+        d = a->expn - b->expn;
+        /* must add more precision for the leading cancelled bits in
+           subtraction */
+        if (is_sub) {
+            if (d <= 1)
+                cancelled_bits = count_cancelled_bits(a, b);
+            else
+                cancelled_bits = 1;
+        } else {
+            cancelled_bits = 0;
+        }
+        
+        /* add two extra bits for rounding */
+        precl = (cancelled_bits + prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+        tot_len = bf_max(a->len, b->len + (d + LIMB_BITS - 1) / LIMB_BITS);
+        r_len = bf_min(precl, tot_len);
+        if (bf_resize(r, r_len))
+            goto fail;
+        a_offset = a->len - r_len;
+        b_bit_offset = (b->len - r_len) * LIMB_BITS + d;
+
+        /* compute the bits before for the rounding */
+        carry = is_sub;
+        z = 0;
+        sub_mask = -is_sub;
+        i = r_len - tot_len;
+        while (i < 0) {
+            slimb_t ap, bp;
+            BOOL inflag;
+            
+            ap = a_offset + i;
+            bp = b_bit_offset + i * LIMB_BITS;
+            inflag = FALSE;
+            if (ap >= 0 && ap < a->len) {
+                v1 = a->tab[ap];
+                inflag = TRUE;
+            } else {
+                v1 = 0;
+            }
+            if (bp + LIMB_BITS > 0 && bp < (slimb_t)(b->len * LIMB_BITS)) {
+                v2 = get_bits(b->tab, b->len, bp);
+                inflag = TRUE;
+            } else {
+                v2 = 0;
+            }
+            if (!inflag) {
+                /* outside 'a' and 'b': go directly to the next value
+                   inside a or b so that the running time does not
+                   depend on the exponent difference */
+                i = 0;
+                if (ap < 0)
+                    i = bf_min(i, -a_offset);
+                /* b_bit_offset + i * LIMB_BITS + LIMB_BITS >= 1
+                   equivalent to 
+                   i >= ceil(-b_bit_offset + 1 - LIMB_BITS) / LIMB_BITS)
+                */
+                if (bp + LIMB_BITS <= 0)
+                    i = bf_min(i, (-b_bit_offset) >> LIMB_LOG2_BITS);
+            } else {
+                i++;
+            }
+            v2 ^= sub_mask;
+            u = v1 + v2;
+            carry1 = u < v1;
+            u += carry;
+            carry = (u < carry) | carry1;
+            z |= u;
+        }
+        /* and the result */
+        for(i = 0; i < r_len; i++) {
+            v1 = get_limbz(a, a_offset + i);
+            v2 = get_bits(b->tab, b->len, b_bit_offset + i * LIMB_BITS);
+            v2 ^= sub_mask;
+            u = v1 + v2;
+            carry1 = u < v1;
+            u += carry;
+            carry = (u < carry) | carry1;
+            r->tab[i] = u;
+        }
+        /* set the extra bits for the rounding */
+        r->tab[0] |= (z != 0);
+
+        /* carry is only possible in add case */
+        if (!is_sub && carry) {
+            if (bf_resize(r, r_len + 1))
+                goto fail;
+            r->tab[r_len] = 1;
+            r->expn += LIMB_BITS;
+        }
+    renorm:
+        ret = bf_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static int __bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bf_add_internal(r, a, b, prec, flags, 0);
+}
+
+static int __bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bf_add_internal(r, a, b, prec, flags, 1);
+}
+
+limb_t mp_add(limb_t *res, const limb_t *op1, const limb_t *op2, 
+              limb_t n, limb_t carry)
+{
+    slimb_t i;
+    limb_t k, a, v, k1;
+    
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v + op2[i];
+        k1 = a < v;
+        a = a + k;
+        k = (a < k) | k1;
+        res[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_add_ui(limb_t *tab, limb_t b, size_t n)
+{
+    size_t i;
+    limb_t k, a;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        if (k == 0)
+            break;
+        a = tab[i] + k;
+        k = (a < k);
+        tab[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_sub(limb_t *res, const limb_t *op1, const limb_t *op2, 
+              mp_size_t n, limb_t carry)
+{
+    int i;
+    limb_t k, a, v, k1;
+    
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v - op2[i];
+        k1 = a > v;
+        v = a - k;
+        k = (v > a) | k1;
+        res[i] = v;
+    }
+    return k;
+}
+
+/* compute 0 - op2 */
+static limb_t mp_neg(limb_t *res, const limb_t *op2, mp_size_t n, limb_t carry)
+{
+    int i;
+    limb_t k, a, v, k1;
+    
+    k = carry;
+    for(i=0;i<n;i++) {
+        v = 0;
+        a = v - op2[i];
+        k1 = a > v;
+        v = a - k;
+        k = (v > a) | k1;
+        res[i] = v;
+    }
+    return k;
+}
+
+limb_t mp_sub_ui(limb_t *tab, limb_t b, mp_size_t n)
+{
+    mp_size_t i;
+    limb_t k, a, v;
+    
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v - k;
+        k = a > v;
+        tab[i] = a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+/* r = (a + high*B^n) >> shift. Return the remainder r (0 <= r < 2^shift). 
+   1 <= shift <= LIMB_BITS - 1 */
+static limb_t mp_shr(limb_t *tab_r, const limb_t *tab, mp_size_t n, 
+                     int shift, limb_t high)
+{
+    mp_size_t i;
+    limb_t l, a;
+
+    assert(shift >= 1 && shift < LIMB_BITS);
+    l = high;
+    for(i = n - 1; i >= 0; i--) {
+        a = tab[i];
+        tab_r[i] = (a >> shift) | (l << (LIMB_BITS - shift));
+        l = a;
+    }
+    return l & (((limb_t)1 << shift) - 1);
+}
+
+/* tabr[] = taba[] * b + l. Return the high carry */
+static limb_t mp_mul1(limb_t *tabr, const limb_t *taba, limb_t n, 
+                      limb_t b, limb_t l)
+{
+    limb_t i;
+    dlimb_t t;
+
+    for(i = 0; i < n; i++) {
+        t = (dlimb_t)taba[i] * (dlimb_t)b + l;
+        tabr[i] = t;
+        l = t >> LIMB_BITS;
+    }
+    return l;
+}
+
+/* tabr[] += taba[] * b, return the high word. */
+static limb_t mp_add_mul1(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b)
+{
+    limb_t i, l;
+    dlimb_t t;
+    
+    l = 0;
+    for(i = 0; i < n; i++) {
+        t = (dlimb_t)taba[i] * (dlimb_t)b + l + tabr[i];
+        tabr[i] = t;
+        l = t >> LIMB_BITS;
+    }
+    return l;
+}
+
+/* size of the result : op1_size + op2_size. */
+static void mp_mul_basecase(limb_t *result, 
+                            const limb_t *op1, limb_t op1_size, 
+                            const limb_t *op2, limb_t op2_size) 
+{
+    limb_t i, r;
+    
+    result[op1_size] = mp_mul1(result, op1, op1_size, op2[0], 0);
+    for(i=1;i<op2_size;i++) {
+        r = mp_add_mul1(result + i, op1, op1_size, op2[i]);
+        result[i + op1_size] = r;
+    }
+}
+
+/* return 0 if OK, -1 if memory error */
+/* XXX: change API so that result can be allocated */
+int mp_mul(bf_context_t *s, limb_t *result, 
+           const limb_t *op1, limb_t op1_size, 
+           const limb_t *op2, limb_t op2_size) 
+{
+#ifdef USE_FFT_MUL
+    if (unlikely(bf_min(op1_size, op2_size) >= FFT_MUL_THRESHOLD)) {
+        bf_t r_s, *r = &r_s;
+        r->tab = result;
+        /* XXX: optimize memory usage in API */
+        if (fft_mul(s, r, (limb_t *)op1, op1_size,
+                    (limb_t *)op2, op2_size, FFT_MUL_R_NORESIZE))
+            return -1;
+    } else
+#endif
+    {
+        mp_mul_basecase(result, op1, op1_size, op2, op2_size);
+    }
+    return 0;
+}
+
+/* tabr[] -= taba[] * b. Return the value to substract to the high
+   word. */
+static limb_t mp_sub_mul1(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b)
+{
+    limb_t i, l;
+    dlimb_t t;
+    
+    l = 0;
+    for(i = 0; i < n; i++) {
+        t = tabr[i] - (dlimb_t)taba[i] * (dlimb_t)b - l;
+        tabr[i] = t;
+        l = -(t >> LIMB_BITS);
+    }
+    return l;
+}
+
+/* WARNING: d must be >= 2^(LIMB_BITS-1) */
+static inline limb_t udiv1norm_init(limb_t d)
+{
+    limb_t a0, a1;
+    a1 = -d - 1;
+    a0 = -1;
+    return (((dlimb_t)a1 << LIMB_BITS) | a0) / d;
+}
+
+/* return the quotient and the remainder in '*pr'of 'a1*2^LIMB_BITS+a0
+   / d' with 0 <= a1 < d. */
+static inline limb_t udiv1norm(limb_t *pr, limb_t a1, limb_t a0,
+                                limb_t d, limb_t d_inv)
+{
+    limb_t n1m, n_adj, q, r, ah;
+    dlimb_t a;
+    n1m = ((slimb_t)a0 >> (LIMB_BITS - 1));
+    n_adj = a0 + (n1m & d);
+    a = (dlimb_t)d_inv * (a1 - n1m) + n_adj;
+    q = (a >> LIMB_BITS) + a1;
+    /* compute a - q * r and update q so that the remainder is\
+       between 0 and d - 1 */
+    a = ((dlimb_t)a1 << LIMB_BITS) | a0;
+    a = a - (dlimb_t)q * d - d;
+    ah = a >> LIMB_BITS;
+    q += 1 + ah;
+    r = (limb_t)a + (ah & d);
+    *pr = r;
+    return q;
+}
+
+/* b must be >= 1 << (LIMB_BITS - 1) */
+static limb_t mp_div1norm(limb_t *tabr, const limb_t *taba, limb_t n,
+                          limb_t b, limb_t r)
+{
+    slimb_t i;
+
+    if (n >= UDIV1NORM_THRESHOLD) {
+        limb_t b_inv;
+        b_inv = udiv1norm_init(b);
+        for(i = n - 1; i >= 0; i--) {
+            tabr[i] = udiv1norm(&r, r, taba[i], b, b_inv);
+        }
+    } else {
+        dlimb_t a1;
+        for(i = n - 1; i >= 0; i--) {
+            a1 = ((dlimb_t)r << LIMB_BITS) | taba[i];
+            tabr[i] = a1 / b;
+            r = a1 % b;
+        }
+    }
+    return r;
+}
+
+static int mp_divnorm_large(bf_context_t *s, 
+                            limb_t *tabq, limb_t *taba, limb_t na, 
+                            const limb_t *tabb, limb_t nb);
+
+/* base case division: divides taba[0..na-1] by tabb[0..nb-1]. tabb[nb
+   - 1] must be >= 1 << (LIMB_BITS - 1). na - nb must be >= 0. 'taba'
+   is modified and contains the remainder (nb limbs). tabq[0..na-nb]
+   contains the quotient with tabq[na - nb] <= 1. */
+static int mp_divnorm(bf_context_t *s, limb_t *tabq, limb_t *taba, limb_t na, 
+                      const limb_t *tabb, limb_t nb)
+{
+    limb_t r, a, c, q, v, b1, b1_inv, n, dummy_r;
+    slimb_t i, j;
+
+    b1 = tabb[nb - 1];
+    if (nb == 1) {
+        taba[0] = mp_div1norm(tabq, taba, na, b1, 0);
+        return 0;
+    }
+    n = na - nb;
+    if (bf_min(n, nb) >= DIVNORM_LARGE_THRESHOLD) {
+        return mp_divnorm_large(s, tabq, taba, na, tabb, nb);
+    }
+    
+    if (n >= UDIV1NORM_THRESHOLD)
+        b1_inv = udiv1norm_init(b1);
+    else
+        b1_inv = 0;
+
+    /* first iteration: the quotient is only 0 or 1 */
+    q = 1;
+    for(j = nb - 1; j >= 0; j--) {
+        if (taba[n + j] != tabb[j]) {
+            if (taba[n + j] < tabb[j])
+                q = 0;
+            break;
+        }
+    }
+    tabq[n] = q;
+    if (q) {
+        mp_sub(taba + n, taba + n, tabb, nb, 0);
+    }
+    
+    for(i = n - 1; i >= 0; i--) {
+        if (unlikely(taba[i + nb] >= b1)) {
+            q = -1;
+        } else if (b1_inv) {
+            q = udiv1norm(&dummy_r, taba[i + nb], taba[i + nb - 1], b1, b1_inv);
+        } else {
+            dlimb_t al;
+            al = ((dlimb_t)taba[i + nb] << LIMB_BITS) | taba[i + nb - 1];
+            q = al / b1;
+            r = al % b1;
+        }
+        r = mp_sub_mul1(taba + i, tabb, nb, q);
+
+        v = taba[i + nb];
+        a = v - r;
+        c = (a > v);
+        taba[i + nb] = a;
+
+        if (c != 0) {
+            /* negative result */
+            for(;;) {
+                q--;
+                c = mp_add(taba + i, taba + i, tabb, nb, 0);
+                /* propagate carry and test if positive result */
+                if (c != 0) {
+                    if (++taba[i + nb] == 0) {
+                        break;
+                    }
+                }
+            }
+        }
+        tabq[i] = q;
+    }
+    return 0;
+}
+
+/* compute r=B^(2*n)/a such as a*r < B^(2*n) < a*r + 2 with n >= 1. 'a'
+   has n limbs with a[n-1] >= B/2 and 'r' has n+1 limbs with r[n] = 1.
+   
+   See Modern Computer Arithmetic by Richard P. Brent and Paul
+   Zimmermann, algorithm 3.5 */
+int mp_recip(bf_context_t *s, limb_t *tabr, const limb_t *taba, limb_t n)
+{
+    mp_size_t l, h, k, i;
+    limb_t *tabxh, *tabt, c, *tabu;
+    
+    if (n <= 2) {
+        /* return ceil(B^(2*n)/a) - 1 */
+        /* XXX: could avoid allocation */
+        tabu = bf_malloc(s, sizeof(limb_t) * (2 * n + 1));
+        tabt = bf_malloc(s, sizeof(limb_t) * (n + 2));
+        if (!tabt || !tabu)
+            goto fail;
+        for(i = 0; i < 2 * n; i++)
+            tabu[i] = 0;
+        tabu[2 * n] = 1;
+        if (mp_divnorm(s, tabt, tabu, 2 * n + 1, taba, n))
+            goto fail;
+        for(i = 0; i < n + 1; i++)
+            tabr[i] = tabt[i];
+        if (mp_scan_nz(tabu, n) == 0) {
+            /* only happens for a=B^n/2 */
+            mp_sub_ui(tabr, 1, n + 1);
+        }
+    } else {
+        l = (n - 1) / 2;
+        h = n - l;
+        /* n=2p  -> l=p-1, h = p + 1, k = p + 3
+           n=2p+1-> l=p,  h = p + 1; k = p + 2
+        */
+        tabt = bf_malloc(s, sizeof(limb_t) * (n + h + 1));
+        tabu = bf_malloc(s, sizeof(limb_t) * (n + 2 * h - l + 2));
+        if (!tabt || !tabu)
+            goto fail;
+        tabxh = tabr + l;
+        if (mp_recip(s, tabxh, taba + l, h))
+            goto fail;
+        if (mp_mul(s, tabt, taba, n, tabxh, h + 1)) /* n + h + 1 limbs */
+            goto fail;
+        while (tabt[n + h] != 0) {
+            mp_sub_ui(tabxh, 1, h + 1);
+            c = mp_sub(tabt, tabt, taba, n, 0);
+            mp_sub_ui(tabt + n, c, h + 1);
+        }
+        /* T = B^(n+h) - T */
+        mp_neg(tabt, tabt, n + h + 1, 0);
+        tabt[n + h]++;
+        if (mp_mul(s, tabu, tabt + l, n + h + 1 - l, tabxh, h + 1))
+            goto fail;
+        /* n + 2*h - l + 2 limbs */
+        k = 2 * h - l;
+        for(i = 0; i < l; i++)
+            tabr[i] = tabu[i + k];
+        mp_add(tabr + l, tabr + l, tabu + 2 * h, h, 0);
+    }
+    bf_free(s, tabt);
+    bf_free(s, tabu);
+    return 0;
+ fail:
+    bf_free(s, tabt);
+    bf_free(s, tabu);
+    return -1;
+}
+
+/* return -1, 0 or 1 */
+static int mp_cmp(const limb_t *taba, const limb_t *tabb, mp_size_t n)
+{
+    mp_size_t i;
+    for(i = n - 1; i >= 0; i--) {
+        if (taba[i] != tabb[i]) {
+            if (taba[i] < tabb[i])
+                return -1;
+            else
+                return 1;
+        }
+    }
+    return 0;
+}
+
+//#define DEBUG_DIVNORM_LARGE
+//#define DEBUG_DIVNORM_LARGE2
+
+/* subquadratic divnorm */
+static int mp_divnorm_large(bf_context_t *s, 
+                            limb_t *tabq, limb_t *taba, limb_t na, 
+                            const limb_t *tabb, limb_t nb)
+{
+    limb_t *tabb_inv, nq, *tabt, i, n;
+    nq = na - nb;
+#ifdef DEBUG_DIVNORM_LARGE
+    printf("na=%d nb=%d nq=%d\n", (int)na, (int)nb, (int)nq);
+    mp_print_str("a", taba, na);
+    mp_print_str("b", tabb, nb);
+#endif
+    assert(nq >= 1);
+    n = nq;
+    if (nq < nb)
+        n++; 
+    tabb_inv = bf_malloc(s, sizeof(limb_t) * (n + 1));
+    tabt = bf_malloc(s, sizeof(limb_t) * 2 * (n + 1));
+    if (!tabb_inv || !tabt)
+        goto fail;
+
+    if (n >= nb) {
+        for(i = 0; i < n - nb; i++)
+            tabt[i] = 0;
+        for(i = 0; i < nb; i++)
+            tabt[i + n - nb] = tabb[i];
+    } else {
+        /* truncate B: need to increment it so that the approximate
+           inverse is smaller that the exact inverse */
+        for(i = 0; i < n; i++)
+            tabt[i] = tabb[i + nb - n];
+        if (mp_add_ui(tabt, 1, n)) {
+            /* tabt = B^n : tabb_inv = B^n */
+            memset(tabb_inv, 0, n * sizeof(limb_t));
+            tabb_inv[n] = 1;
+            goto recip_done;
+        }
+    }
+    if (mp_recip(s, tabb_inv, tabt, n))
+        goto fail;
+ recip_done:
+    /* Q=A*B^-1 */
+    if (mp_mul(s, tabt, tabb_inv, n + 1, taba + na - (n + 1), n + 1))
+        goto fail;
+    
+    for(i = 0; i < nq + 1; i++)
+        tabq[i] = tabt[i + 2 * (n + 1) - (nq + 1)];
+#ifdef DEBUG_DIVNORM_LARGE
+    mp_print_str("q", tabq, nq + 1);
+#endif
+
+    bf_free(s, tabt);
+    bf_free(s, tabb_inv);
+    tabb_inv = NULL;
+    
+    /* R=A-B*Q */
+    tabt = bf_malloc(s, sizeof(limb_t) * (na + 1));
+    if (!tabt)
+        goto fail;
+    if (mp_mul(s, tabt, tabq, nq + 1, tabb, nb))
+        goto fail;
+    /* we add one more limb for the result */
+    mp_sub(taba, taba, tabt, nb + 1, 0);
+    bf_free(s, tabt);
+    /* the approximated quotient is smaller than than the exact one,
+       hence we may have to increment it */
+#ifdef DEBUG_DIVNORM_LARGE2
+    int cnt = 0;
+    static int cnt_max;
+#endif
+    for(;;) {
+        if (taba[nb] == 0 && mp_cmp(taba, tabb, nb) < 0)
+            break;
+        taba[nb] -= mp_sub(taba, taba, tabb, nb, 0);
+        mp_add_ui(tabq, 1, nq + 1);
+#ifdef DEBUG_DIVNORM_LARGE2
+        cnt++;
+#endif
+    }
+#ifdef DEBUG_DIVNORM_LARGE2
+    if (cnt > cnt_max) {
+        cnt_max = cnt;
+        printf("\ncnt=%d nq=%d nb=%d\n", cnt_max, (int)nq, (int)nb);
+    }
+#endif
+    return 0;
+ fail:
+    bf_free(s, tabb_inv);
+    bf_free(s, tabt);
+    return -1;
+}
+
+int bf_mul(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags)
+{
+    int ret, r_sign;
+
+    if (a->len < b->len) {
+        const bf_t *tmp = a;
+        a = b;
+        b = tmp;
+    }
+    r_sign = a->sign ^ b->sign;
+    /* here b->len <= a->len */
+    if (b->len == 0) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            ret = 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_INF) {
+            if ((a->expn == BF_EXP_INF && b->expn == BF_EXP_ZERO) ||
+                (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_INF)) {
+                bf_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, r_sign);
+                ret = 0;
+            }
+        } else {
+            bf_set_zero(r, r_sign);
+            ret = 0;
+        }
+    } else {
+        bf_t tmp, *r1 = NULL;
+        limb_t a_len, b_len, precl;
+        limb_t *a_tab, *b_tab;
+            
+        a_len = a->len;
+        b_len = b->len;
+        
+        if ((flags & BF_RND_MASK) == BF_RNDF) {
+            /* faithful rounding does not require using the full inputs */
+            precl = (prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+            a_len = bf_min(a_len, precl);
+            b_len = bf_min(b_len, precl);
+        }
+        a_tab = a->tab + a->len - a_len;
+        b_tab = b->tab + b->len - b_len;
+        
+#ifdef USE_FFT_MUL
+        if (b_len >= FFT_MUL_THRESHOLD) {
+            int mul_flags = 0;
+            if (r == a)
+                mul_flags |= FFT_MUL_R_OVERLAP_A;
+            if (r == b)
+                mul_flags |= FFT_MUL_R_OVERLAP_B;
+            if (fft_mul(r->ctx, r, a_tab, a_len, b_tab, b_len, mul_flags))
+                goto fail;
+        } else
+#endif
+        {
+            if (r == a || r == b) {
+                bf_init(r->ctx, &tmp);
+                r1 = r;
+                r = &tmp;
+            }
+            if (bf_resize(r, a_len + b_len)) {
+            fail:
+                bf_set_nan(r);
+                ret = BF_ST_MEM_ERROR;
+                goto done;
+            }
+            mp_mul_basecase(r->tab, a_tab, a_len, b_tab, b_len);
+        }
+        r->sign = r_sign;
+        r->expn = a->expn + b->expn;
+        ret = bf_normalize_and_round(r, prec, flags);
+    done:
+        if (r == &tmp)
+            bf_move(r1, &tmp);
+    }
+    return ret;
+}
+
+/* multiply 'r' by 2^e */
+int bf_mul_2exp(bf_t *r, slimb_t e, limb_t prec, bf_flags_t flags)
+{
+    slimb_t e_max;
+    if (r->len == 0)
+        return 0;
+    e_max = ((limb_t)1 << BF_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 e such as a=m*2^e with m odd integer. return 0 if a is zero,
+   Infinite or Nan. */
+slimb_t bf_get_exp_min(const bf_t *a)
+{
+    slimb_t i;
+    limb_t v;
+    int k;
+    
+    for(i = 0; i < a->len; i++) {
+        v = a->tab[i];
+        if (v != 0) {
+            k = ctz(v);
+            return a->expn - (a->len - i) * LIMB_BITS + k;
+        }
+    }
+    return 0;
+}
+
+/* a and b must be finite numbers with a >= 0 and b > 0. 'q' is the
+   integer defined as floor(a/b) and r = a - q * b. */
+static void bf_tdivremu(bf_t *q, bf_t *r,
+                        const bf_t *a, const bf_t *b)
+{
+    if (bf_cmpu(a, b) < 0) {
+        bf_set_ui(q, 0);
+        bf_set(r, a);
+    } else {
+        bf_div(q, a, b, bf_max(a->expn - b->expn + 1, 2), BF_RNDZ);
+        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);
+    }
+}
+
+static int __bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                    bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    int ret, r_sign;
+    limb_t n, nb, precl;
+    
+    r_sign = a->sign ^ b->sign;
+    if (a->expn >= BF_EXP_INF || b->expn >= BF_EXP_INF) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF && b->expn == BF_EXP_INF) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else if (a->expn == BF_EXP_INF) {
+            bf_set_inf(r, r_sign);
+            return 0;
+        } else {
+            bf_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (a->expn == BF_EXP_ZERO) {
+        if (b->expn == BF_EXP_ZERO) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (b->expn == BF_EXP_ZERO) {
+        bf_set_inf(r, r_sign);
+        return BF_ST_DIVIDE_ZERO;
+    }
+
+    /* number of limbs of the quotient (2 extra bits for rounding) */
+    precl = (prec + 2 + LIMB_BITS - 1) / LIMB_BITS;
+    nb = b->len;
+    n = bf_max(a->len, precl);
+    
+    {
+        limb_t *taba, na;
+        slimb_t d;
+        
+        na = n + nb;
+        taba = bf_malloc(s, (na + 1) * sizeof(limb_t));
+        if (!taba)
+            goto fail;
+        d = na - a->len;
+        memset(taba, 0, d * sizeof(limb_t));
+        memcpy(taba + d, a->tab, a->len * sizeof(limb_t));
+        if (bf_resize(r, n + 1))
+            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;
+        bf_free(r->ctx, taba);
+        r->expn = a->expn - b->expn + LIMB_BITS;
+        r->sign = r_sign;
+        ret = bf_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* division and remainder. 
+   
+   rnd_mode is the rounding mode for the quotient. The additional
+   rounding mode BF_RND_EUCLIDIAN is supported.
+
+   'q' is an integer. 'r' is rounded with prec and flags (prec can be
+   BF_PREC_INF).
+*/
+int bf_divrem(bf_t *q, bf_t *r, const bf_t *a, const bf_t *b,
+              limb_t prec, bf_flags_t flags, int rnd_mode)
+{
+    bf_t a1_s, *a1 = &a1_s;
+    bf_t b1_s, *b1 = &b1_s;
+    int q_sign, ret;
+    BOOL is_ceil, is_rndn;
+    
+    assert(q != a && q != b);
+    assert(r != a && r != b);
+    assert(q != r);
+    
+    if (a->len == 0 || b->len == 0) {
+        bf_set_zero(q, 0);
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_ZERO) {
+            bf_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bf_set(r, a);
+            return bf_round(r, prec, flags);
+        }
+    }
+
+    q_sign = a->sign ^ b->sign;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
+               rnd_mode == BF_RNDNU);
+    switch(rnd_mode) {
+    default:
+    case BF_RNDZ:
+    case BF_RNDN:
+    case BF_RNDNA:
+        is_ceil = FALSE;
+        break;
+    case BF_RNDD:
+        is_ceil = q_sign;
+        break;
+    case BF_RNDU:
+        is_ceil = q_sign ^ 1;
+        break;
+    case BF_DIVREM_EUCLIDIAN:
+        is_ceil = a->sign;
+        break;
+    case BF_RNDNU:
+        /* XXX: unsupported yet */
+        abort();
+    }
+
+    a1->expn = a->expn;
+    a1->tab = a->tab;
+    a1->len = a->len;
+    a1->sign = 0;
+    
+    b1->expn = b->expn;
+    b1->tab = b->tab;
+    b1->len = b->len;
+    b1->sign = 0;
+
+    /* XXX: could improve to avoid having a large 'q' */
+    bf_tdivremu(q, r, a1, b1);
+    if (bf_is_nan(q) || bf_is_nan(r))
+        goto fail;
+
+    if (r->len != 0) {
+        if (is_rndn) {
+            int res;
+            b1->expn--;
+            res = bf_cmpu(r, b1);
+            b1->expn++;
+            if (res > 0 ||
+                (res == 0 &&
+                 (rnd_mode == BF_RNDNA ||
+                  get_bit(q->tab, q->len, q->len * LIMB_BITS - q->expn)))) {
+                goto do_sub_r;
+            }
+        } else if (is_ceil) {
+        do_sub_r:
+            ret = bf_add_si(q, q, 1, BF_PREC_INF, BF_RNDZ);
+            ret |= bf_sub(r, r, b1, BF_PREC_INF, BF_RNDZ);
+            if (ret & BF_ST_MEM_ERROR)
+                goto fail;
+        }
+    }
+
+    r->sign ^= a->sign;
+    q->sign = q_sign;
+    return bf_round(r, prec, flags);
+ fail:
+    bf_set_nan(q);
+    bf_set_nan(r);
+    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)
+{
+    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);
+    bf_delete(q);
+    return ret;
+}
+
+static inline int bf_get_limb(slimb_t *pres, const bf_t *a, int flags)
+{
+#if LIMB_BITS == 32
+    return bf_get_int32(pres, a, flags);
+#else
+    return bf_get_int64(pres, a, flags);
+#endif
+}
+
+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_t q_s, *q = &q_s;
+    int ret;
+    
+    bf_init(r->ctx, q);
+    ret = bf_divrem(q, r, a, b, prec, flags, BF_RNDN);
+    bf_get_limb(pq, q, BF_GET_INT_MOD);
+    bf_delete(q);
+    return ret;
+}
+
+static __maybe_unused inline limb_t mul_mod(limb_t a, limb_t b, limb_t m)
+{
+    dlimb_t t;
+    t = (dlimb_t)a * (dlimb_t)b;
+    return t % m;
+}
+
+#if defined(USE_MUL_CHECK)
+static limb_t mp_mod1(const limb_t *tab, limb_t n, limb_t m, limb_t r)
+{
+    slimb_t i;
+    dlimb_t t;
+
+    for(i = n - 1; i >= 0; i--) {
+        t = ((dlimb_t)r << LIMB_BITS) | tab[i];
+        r = t % m;
+    }
+    return r;
+}
+#endif
+
+static const uint16_t sqrt_table[192] = {
+128,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,150,151,152,153,154,155,155,156,157,158,159,160,160,161,162,163,163,164,165,166,167,167,168,169,170,170,171,172,173,173,174,175,176,176,177,178,178,179,180,181,181,182,183,183,184,185,185,186,187,187,188,189,189,190,191,192,192,193,193,194,195,195,196,197,197,198,199,199,200,201,201,202,203,203,204,204,205,206,206,207,208,208,209,209,210,211,211,212,212,213,214,214,215,215,216,217,217,218,218,219,219,220,221,221,222,222,223,224,224,225,225,226,226,227,227,228,229,229,230,230,231,231,232,232,233,234,234,235,235,236,236,237,237,238,238,239,240,240,241,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,
+};
+
+/* a >= 2^(LIMB_BITS - 2).  Return (s, r) with s=floor(sqrt(a)) and
+   r=a-s^2. 0 <= r <= 2 * s */
+static limb_t mp_sqrtrem1(limb_t *pr, limb_t a)
+{
+    limb_t s1, r1, s, r, q, u, num;
+    
+    /* use a table for the 16 -> 8 bit sqrt */
+    s1 = sqrt_table[(a >> (LIMB_BITS - 8)) - 64];
+    r1 = (a >> (LIMB_BITS - 16)) - s1 * s1;
+    if (r1 > 2 * s1) {
+        r1 -= 2 * s1 + 1;
+        s1++;
+    }
+    
+    /* one iteration to get a 32 -> 16 bit sqrt */
+    num = (r1 << 8) | ((a >> (LIMB_BITS - 32 + 8)) & 0xff);
+    q = num / (2 * s1); /* q <= 2^8 */
+    u = num % (2 * s1);
+    s = (s1 << 8) + q;
+    r = (u << 8) | ((a >> (LIMB_BITS - 32)) & 0xff);
+    r -= q * q;
+    if ((slimb_t)r < 0) {
+        s--;
+        r += 2 * s + 1;
+    }
+
+#if LIMB_BITS == 64
+    s1 = s;
+    r1 = r;
+    /* one more iteration for 64 -> 32 bit sqrt */
+    num = (r1 << 16) | ((a >> (LIMB_BITS - 64 + 16)) & 0xffff);
+    q = num / (2 * s1); /* q <= 2^16 */
+    u = num % (2 * s1);
+    s = (s1 << 16) + q;
+    r = (u << 16) | ((a >> (LIMB_BITS - 64)) & 0xffff);
+    r -= q * q;
+    if ((slimb_t)r < 0) {
+        s--;
+        r += 2 * s + 1;
+    }
+#endif
+    *pr = r;
+    return s;
+}
+
+/* return floor(sqrt(a)) */
+limb_t bf_isqrt(limb_t a)
+{
+    limb_t s, r;
+    int k;
+
+    if (a == 0)
+        return 0;
+    k = clz(a) & ~1;
+    s = mp_sqrtrem1(&r, a << k);
+    s >>= (k >> 1);
+    return s;
+}
+
+static limb_t mp_sqrtrem2(limb_t *tabs, limb_t *taba)
+{
+    limb_t s1, r1, s, q, u, a0, a1;
+    dlimb_t r, num;
+    int l;
+
+    a0 = taba[0];
+    a1 = taba[1];
+    s1 = mp_sqrtrem1(&r1, a1);
+    l = LIMB_BITS / 2;
+    num = ((dlimb_t)r1 << l) | (a0 >> l);
+    q = num / (2 * s1);
+    u = num % (2 * s1);
+    s = (s1 << l) + q;
+    r = ((dlimb_t)u << l) | (a0 & (((limb_t)1 << l) - 1));
+    if (unlikely((q >> l) != 0))
+        r -= (dlimb_t)1 << LIMB_BITS; /* special case when q=2^l */
+    else
+        r -= q * q;
+    if ((slimb_t)(r >> LIMB_BITS) < 0) {
+        s--;
+        r += 2 * (dlimb_t)s + 1;
+    }
+    tabs[0] = s;
+    taba[0] = r;
+    return r >> LIMB_BITS;
+}
+
+//#define DEBUG_SQRTREM
+
+/* tmp_buf must contain (n / 2 + 1 limbs). *prh contains the highest
+   limb of the remainder. */
+static int mp_sqrtrem_rec(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n,
+                          limb_t *tmp_buf, limb_t *prh)
+{
+    limb_t l, h, rh, ql, qh, c, i;
+    
+    if (n == 1) {
+        *prh = mp_sqrtrem2(tabs, taba);
+        return 0;
+    }
+#ifdef DEBUG_SQRTREM
+    mp_print_str("a", taba, 2 * n);
+#endif
+    l = n / 2;
+    h = n - l;
+    if (mp_sqrtrem_rec(s, tabs + l, taba + 2 * l, h, tmp_buf, &qh))
+        return -1;
+#ifdef DEBUG_SQRTREM
+    mp_print_str("s1", tabs + l, h);
+    mp_print_str_h("r1", taba + 2 * l, h, qh);
+    mp_print_str_h("r2", taba + l, n, qh);
+#endif
+    
+    /* the remainder is in taba + 2 * l. Its high bit is in qh */
+    if (qh) {
+        mp_sub(taba + 2 * l, taba + 2 * l, tabs + l, h, 0);
+    }
+    /* instead of dividing by 2*s, divide by s (which is normalized)
+       and update q and r */
+    if (mp_divnorm(s, tmp_buf, taba + l, n, tabs + l, h))
+        return -1;
+    qh += tmp_buf[l];
+    for(i = 0; i < l; i++)
+        tabs[i] = tmp_buf[i];
+    ql = mp_shr(tabs, tabs, l, 1, qh & 1);
+    qh = qh >> 1; /* 0 or 1 */
+    if (ql)
+        rh = mp_add(taba + l, taba + l, tabs + l, h, 0);
+    else
+        rh = 0;
+#ifdef DEBUG_SQRTREM
+    mp_print_str_h("q", tabs, l, qh);
+    mp_print_str_h("u", taba + l, h, rh);
+#endif
+    
+    mp_add_ui(tabs + l, qh, h);
+#ifdef DEBUG_SQRTREM
+    mp_print_str_h("s2", tabs, n, sh);
+#endif
+    
+    /* q = qh, tabs[l - 1 ... 0], r = taba[n - 1 ... l] */
+    /* subtract q^2. if qh = 1 then q = B^l, so we can take shortcuts */
+    if (qh) {
+        c = qh;
+    } else {
+        if (mp_mul(s, taba + n, tabs, l, tabs, l))
+            return -1;
+        c = mp_sub(taba, taba, taba + n, 2 * l, 0);
+    }
+    rh -= mp_sub_ui(taba + 2 * l, c, n - 2 * l);
+    if ((slimb_t)rh < 0) {
+        mp_sub_ui(tabs, 1, n);
+        rh += mp_add_mul1(taba, tabs, n, 2);
+        rh += mp_add_ui(taba, 1, n);
+    }
+    *prh = rh;
+    return 0;
+}
+
+/* 'taba' has 2*n limbs with n >= 1 and taba[2*n-1] >= 2 ^ (LIMB_BITS
+   - 2). Return (s, r) with s=floor(sqrt(a)) and r=a-s^2. 0 <= r <= 2
+   * s. tabs has n limbs. r is returned in the lower n limbs of
+   taba. Its r[n] is the returned value of the function. */
+/* Algorithm from the article "Karatsuba Square Root" by Paul Zimmermann and
+   inspirated from its GMP implementation */
+int mp_sqrtrem(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n)
+{
+    limb_t tmp_buf1[8];
+    limb_t *tmp_buf;
+    mp_size_t n2;
+    int ret;
+    n2 = n / 2 + 1;
+    if (n2 <= countof(tmp_buf1)) {
+        tmp_buf = tmp_buf1;
+    } else {
+        tmp_buf = bf_malloc(s, sizeof(limb_t) * n2);
+        if (!tmp_buf)
+            return -1;
+    }
+    ret = mp_sqrtrem_rec(s, tabs, taba, n, tmp_buf, taba + n);
+    if (tmp_buf != tmp_buf1)
+        bf_free(s, tmp_buf);
+    return ret;
+}
+
+/* Integer square root with remainder. 'a' must be an integer. r =
+   floor(sqrt(a)) and rem = a - r^2.  BF_ST_INEXACT is set if the result
+   is inexact. 'rem' can be NULL if the remainder is not needed. */
+int bf_sqrtrem(bf_t *r, bf_t *rem1, const bf_t *a)
+{
+    int ret;
+    
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bf_set(r, a);
+        }
+        if (rem1)
+            bf_set_ui(rem1, 0);
+        ret = 0;
+    } else if (a->sign) {
+ invalid_op:
+        bf_set_nan(r);
+        if (rem1)
+            bf_set_ui(rem1, 0);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        bf_t rem_s, *rem;
+        
+        bf_sqrt(r, a, (a->expn + 1) / 2, BF_RNDZ);
+        bf_rint(r, BF_RNDZ);
+        /* see if the result is exact by computing the remainder */
+        if (rem1) {
+            rem = rem1;
+        } else {
+            rem = &rem_s;
+            bf_init(r->ctx, rem);
+        }
+        /* XXX: could avoid recomputing the remainder */
+        bf_mul(rem, r, r, BF_PREC_INF, BF_RNDZ);
+        bf_neg(rem);
+        bf_add(rem, rem, a, BF_PREC_INF, BF_RNDZ);
+        if (bf_is_nan(rem)) {
+            ret = BF_ST_MEM_ERROR;
+            goto done;
+        }
+        if (rem->len != 0) {
+            ret = BF_ST_INEXACT;
+        } else {
+            ret = 0;
+        }
+    done:
+        if (!rem1)
+            bf_delete(rem);
+    }
+    return ret;
+}
+
+int bf_sqrt(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = a->ctx;
+    int ret;
+
+    assert(r != a);
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bf_set(r, a);
+        }
+        ret = 0;
+    } else if (a->sign) {
+ invalid_op:
+        bf_set_nan(r);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        limb_t *a1;
+        slimb_t n, n1;
+        limb_t res;
+        
+        /* convert the mantissa to an integer with at least 2 *
+           prec + 4 bits */
+        n = (2 * (prec + 2) + 2 * LIMB_BITS - 1) / (2 * LIMB_BITS);
+        if (bf_resize(r, n))
+            goto fail;
+        a1 = bf_malloc(s, sizeof(limb_t) * 2 * n);
+        if (!a1)
+            goto fail;
+        n1 = bf_min(2 * n, a->len);
+        memset(a1, 0, (2 * n - n1) * sizeof(limb_t));
+        memcpy(a1 + 2 * n - n1, a->tab + a->len - n1, n1 * sizeof(limb_t));
+        if (a->expn & 1) {
+            res = mp_shr(a1, a1, 2 * n, 1, 0);
+        } else {
+            res = 0;
+        }
+        if (mp_sqrtrem(s, r->tab, a1, n)) {
+            bf_free(s, a1);
+            goto fail;
+        }
+        if (!res) {
+            res = mp_scan_nz(a1, n + 1);
+        }
+        bf_free(s, a1);
+        if (!res) {
+            res = mp_scan_nz(a->tab, a->len - n1);
+        }
+        if (res != 0)
+            r->tab[0] |= 1;
+        r->sign = 0;
+        r->expn = (a->expn + 1) >> 1;
+        ret = bf_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bf_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static no_inline int bf_op2(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                            bf_flags_t flags, bf_op2_func_t *func)
+{
+    bf_t tmp;
+    int ret;
+    
+    if (r == a || r == b) {
+        bf_init(r->ctx, &tmp);
+        ret = func(&tmp, a, b, prec, flags);
+        bf_move(r, &tmp);
+    } else {
+        ret = func(r, a, b, prec, flags);
+    }
+    return ret;
+}
+
+int bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+            bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_add);
+}
+
+int bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+            bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_sub);
+}
+
+int bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+           bf_flags_t flags)
+{
+    return bf_op2(r, a, b, prec, flags, __bf_div);
+}
+
+int bf_mul_ui(bf_t *r, const bf_t *a, uint64_t b1, limb_t prec,
+               bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+    bf_init(r->ctx, &b);
+    ret = bf_set_ui(&b, b1);
+    ret |= bf_mul(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+int bf_mul_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec,
+               bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+    bf_init(r->ctx, &b);
+    ret = bf_set_si(&b, b1);
+    ret |= bf_mul(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+int bf_add_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec,
+              bf_flags_t flags)
+{
+    bf_t b;
+    int ret;
+    
+    bf_init(r->ctx, &b);
+    ret = bf_set_si(&b, b1);
+    ret |= bf_add(r, a, &b, prec, flags);
+    bf_delete(&b);
+    return ret;
+}
+
+static int bf_pow_ui(bf_t *r, const bf_t *a, limb_t b, limb_t prec,
+                     bf_flags_t flags)
+{
+    int ret, n_bits, i;
+    
+    assert(r != a);
+    if (b == 0)
+        return bf_set_ui(r, 1);
+    ret = bf_set(r, a);
+    n_bits = LIMB_BITS - clz(b);
+    for(i = n_bits - 2; i >= 0; i--) {
+        ret |= bf_mul(r, r, r, prec, flags);
+        if ((b >> i) & 1)
+            ret |= bf_mul(r, r, a, prec, flags);
+    }
+    return ret;
+}
+
+static int bf_pow_ui_ui(bf_t *r, limb_t a1, limb_t b,
+                        limb_t prec, bf_flags_t flags)
+{
+    bf_t a;
+    int ret;
+    
+    if (a1 == 10 && b <= LIMB_DIGITS) {
+        /* use precomputed powers. We do not round at this point
+           because we expect the caller to do it */
+        ret = bf_set_ui(r, mp_pow_dec[b]);
+    } else {
+        bf_init(r->ctx, &a);
+        ret = bf_set_ui(&a, a1);
+        ret |= bf_pow_ui(r, &a, b, prec, flags);
+        bf_delete(&a);
+    }
+    return ret;
+}
+
+/* convert to integer (infinite precision) */
+int bf_rint(bf_t *r, int rnd_mode)
+{
+    return bf_round(r, 0, rnd_mode | BF_FLAG_RADPNT_PREC);
+}
+
+/* logical operations */
+#define BF_LOGIC_OR  0
+#define BF_LOGIC_XOR 1
+#define BF_LOGIC_AND 2
+
+static inline limb_t bf_logic_op1(limb_t a, limb_t b, int op)
+{
+    switch(op) {
+    case BF_LOGIC_OR:
+        return a | b;
+    case BF_LOGIC_XOR:
+        return a ^ b;
+    default:
+    case BF_LOGIC_AND:
+        return a & b;
+    }
+}
+
+static int bf_logic_op(bf_t *r, const bf_t *a1, const bf_t *b1, int op)
+{
+    bf_t b1_s, a1_s, *a, *b;
+    limb_t a_sign, b_sign, r_sign;
+    slimb_t l, i, a_bit_offset, b_bit_offset;
+    limb_t v1, v2, v1_mask, v2_mask, r_mask;
+    int ret;
+    
+    assert(r != a1 && r != b1);
+
+    if (a1->expn <= 0)
+        a_sign = 0; /* minus zero is considered as positive */
+    else
+        a_sign = a1->sign;
+
+    if (b1->expn <= 0)
+        b_sign = 0; /* minus zero is considered as positive */
+    else
+        b_sign = b1->sign;
+    
+    if (a_sign) {
+        a = &a1_s;
+        bf_init(r->ctx, a);
+        if (bf_add_si(a, a1, 1, BF_PREC_INF, BF_RNDZ)) {
+            b = NULL;
+            goto fail;
+        }
+    } else {
+        a = (bf_t *)a1;
+    }
+
+    if (b_sign) {
+        b = &b1_s;
+        bf_init(r->ctx, b);
+        if (bf_add_si(b, b1, 1, BF_PREC_INF, BF_RNDZ))
+            goto fail;
+    } else {
+        b = (bf_t *)b1;
+    }
+    
+    r_sign = bf_logic_op1(a_sign, b_sign, op);
+    if (op == BF_LOGIC_AND && r_sign == 0) {
+        /* no need to compute extra zeros for and */
+        if (a_sign == 0 && b_sign == 0)
+            l = bf_min(a->expn, b->expn);
+        else if (a_sign == 0)
+            l = a->expn;
+        else
+            l = b->expn;
+    } else {
+        l = bf_max(a->expn, b->expn);
+    }
+    /* Note: a or b can be zero */
+    l = (bf_max(l, 1) + LIMB_BITS - 1) / LIMB_BITS;
+    if (bf_resize(r, l))
+        goto fail;
+    a_bit_offset = a->len * LIMB_BITS - a->expn;
+    b_bit_offset = b->len * LIMB_BITS - b->expn;
+    v1_mask = -a_sign;
+    v2_mask = -b_sign;
+    r_mask = -r_sign;
+    for(i = 0; i < l; i++) {
+        v1 = get_bits(a->tab, a->len, a_bit_offset + i * LIMB_BITS) ^ v1_mask;
+        v2 = get_bits(b->tab, b->len, b_bit_offset + i * LIMB_BITS) ^ v2_mask;
+        r->tab[i] = bf_logic_op1(v1, v2, op) ^ r_mask;
+    }
+    r->expn = l * LIMB_BITS;
+    r->sign = r_sign;
+    bf_normalize_and_round(r, BF_PREC_INF, BF_RNDZ); /* cannot fail */
+    if (r_sign) {
+        if (bf_add_si(r, r, -1, BF_PREC_INF, BF_RNDZ))
+            goto fail;
+    }
+    ret = 0;
+ done:
+    if (a == &a1_s)
+        bf_delete(a);
+    if (b == &b1_s)
+        bf_delete(b);
+    return ret;
+ fail:
+    bf_set_nan(r);
+    ret = BF_ST_MEM_ERROR;
+    goto done;
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_or(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_OR);
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_xor(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_XOR);
+}
+
+/* 'a' and 'b' must be integers. Return 0 or BF_ST_MEM_ERROR. */
+int bf_logic_and(bf_t *r, const bf_t *a, const bf_t *b)
+{
+    return bf_logic_op(r, a, b, BF_LOGIC_AND);
+}
+
+/* conversion between fixed size types */
+
+typedef union {
+    double d;
+    uint64_t u;
+} Float64Union;
+
+int bf_get_float64(const bf_t *a, double *pres, bf_rnd_t rnd_mode)
+{
+    Float64Union u;
+    int e, ret;
+    uint64_t m;
+    
+    ret = 0;
+    if (a->expn == BF_EXP_NAN) {
+        u.u = 0x7ff8000000000000; /* quiet nan */
+    } else {
+        bf_t b_s, *b = &b_s;
+        
+        bf_init(a->ctx, b);
+        bf_set(b, a);
+        if (bf_is_finite(b)) {
+            ret = bf_round(b, 53, rnd_mode | BF_FLAG_SUBNORMAL | bf_set_exp_bits(11));
+        }
+        if (b->expn == BF_EXP_INF) {
+            e = (1 << 11) - 1;
+            m = 0;
+        } else if (b->expn == BF_EXP_ZERO) {
+            e = 0;
+            m = 0;
+        } else {
+            e = b->expn + 1023 - 1;
+#if LIMB_BITS == 32
+            if (b->len == 2) {
+                m = ((uint64_t)b->tab[1] << 32) | b->tab[0];
+            } else {
+                m = ((uint64_t)b->tab[0] << 32);
+            }
+#else
+            m = b->tab[0];
+#endif
+            if (e <= 0) {
+                /* subnormal */
+                m = m >> (12 - e);
+                e = 0;
+            } else {
+                m = (m << 1) >> 12;
+            }
+        }
+        u.u = m | ((uint64_t)e << 52) | ((uint64_t)b->sign << 63);
+        bf_delete(b);
+    }
+    *pres = u.d;
+    return ret;
+}
+
+int bf_set_float64(bf_t *a, double d)
+{
+    Float64Union u;
+    uint64_t m;
+    int shift, e, sgn;
+    
+    u.d = d;
+    sgn = u.u >> 63;
+    e = (u.u >> 52) & ((1 << 11) - 1);
+    m = u.u & (((uint64_t)1 << 52) - 1);
+    if (e == ((1 << 11) - 1)) {
+        if (m != 0) {
+            bf_set_nan(a);
+        } else {
+            bf_set_inf(a, sgn);
+        }
+    } else if (e == 0) {
+        if (m == 0) {
+            bf_set_zero(a, sgn);
+        } else {
+            /* subnormal number */
+            m <<= 12;
+            shift = clz64(m);
+            m <<= shift;
+            e = -shift;
+            goto norm;
+        }
+    } else {
+        m = (m << 11) | ((uint64_t)1 << 63);
+    norm:
+        a->expn = e - 1023 + 1;
+#if LIMB_BITS == 32
+        if (bf_resize(a, 2))
+            goto fail;
+        a->tab[0] = m;
+        a->tab[1] = m >> 32;
+#else
+        if (bf_resize(a, 1))
+            goto fail;
+        a->tab[0] = m;
+#endif
+        a->sign = sgn;
+    }
+    return 0;
+fail:
+    bf_set_nan(a);
+    return BF_ST_MEM_ERROR;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW 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;
+        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;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 31) {
+        v = a->tab[a->len - 1] >> (LIMB_BITS - a->expn);
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (!(flags & BF_GET_INT_MOD)) {
+        ret = BF_ST_OVERFLOW;
+        if (a->sign) {
+            v = (uint32_t)INT32_MAX + 1;
+            if (a->expn == 32 && 
+                (a->tab[a->len - 1] >> (LIMB_BITS - 32)) == v) {
+                ret = 0;
+            }
+        } else {
+            v = INT32_MAX;
+        }
+    } else {
+        v = get_bits(a->tab, a->len, a->len * LIMB_BITS - a->expn); 
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW 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;
+        if (flags & BF_GET_INT_MOD) {
+            v = 0;
+        } else if (a->expn == BF_EXP_INF) {
+            v = (uint64_t)INT64_MAX + a->sign;
+        } else {
+            v = INT64_MAX;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 63) {
+#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
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (!(flags & BF_GET_INT_MOD)) {
+        ret = BF_ST_OVERFLOW;
+        if (a->sign) {
+            uint64_t v1;
+            v = (uint64_t)INT64_MAX + 1;
+            if (a->expn == 64) {
+                v1 = a->tab[a->len - 1];
+#if LIMB_BITS == 32
+                v1 = (v1 << 32) | get_limbz(a, a->len - 2);
+#endif
+                if (v1 == v)
+                    ret = 0;
+            }
+        } else {
+            v = INT64_MAX;
+        }
+    } else {
+        slimb_t bit_pos = a->len * LIMB_BITS - a->expn;
+        v = get_bits(a->tab, a->len, bit_pos); 
+#if LIMB_BITS == 32
+        v |= (uint64_t)get_bits(a->tab, a->len, bit_pos + 32) << 32;
+#endif
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* base conversion from radix */
+
+static const uint8_t digits_per_limb_table[BF_RADIX_MAX - 1] = {
+#if LIMB_BITS == 32
+32,20,16,13,12,11,10,10, 9, 9, 8, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+#else
+64,40,32,27,24,22,21,20,19,18,17,17,16,16,16,15,15,15,14,14,14,14,13,13,13,13,13,13,13,12,12,12,12,12,12,
+#endif
+};
+
+static limb_t get_limb_radix(int radix)
+{
+    int i, k;
+    limb_t radixl;
+    
+    k = digits_per_limb_table[radix - 2];
+    radixl = radix;
+    for(i = 1; i < k; i++)
+        radixl *= radix;
+    return radixl;
+}
+
+/* return != 0 if error */
+static int bf_integer_from_radix_rec(bf_t *r, const limb_t *tab,
+                                     limb_t n, int level, limb_t n0,
+                                     limb_t radix, bf_t *pow_tab)
+{
+    int ret;
+    if (n == 1) {
+        ret = bf_set_ui(r, tab[0]);
+    } else {
+        bf_t T_s, *T = &T_s, *B;
+        limb_t n1, n2;
+        
+        n2 = (((n0 * 2) >> (level + 1)) + 1) / 2;
+        n1 = n - n2;
+        //        printf("level=%d n0=%ld n1=%ld n2=%ld\n", level, n0, n1, n2);
+        B = &pow_tab[level];
+        if (B->len == 0) {
+            ret = bf_pow_ui_ui(B, radix, n2, BF_PREC_INF, BF_RNDZ);
+            if (ret)
+                return ret;
+        }
+        ret = bf_integer_from_radix_rec(r, tab + n2, n1, level + 1, n0,
+                                        radix, pow_tab);
+        if (ret)
+            return ret;
+        ret = bf_mul(r, r, B, BF_PREC_INF, BF_RNDZ);
+        if (ret)
+            return ret;
+        bf_init(r->ctx, T);
+        ret = bf_integer_from_radix_rec(T, tab, n2, level + 1, n0,
+                                        radix, pow_tab);
+        if (!ret)
+            ret = bf_add(r, r, T, BF_PREC_INF, BF_RNDZ);
+        bf_delete(T);
+    }
+    return ret;
+    //    bf_print_str("  r=", r);
+}
+
+/* return 0 if OK != 0 if memory error */
+static int bf_integer_from_radix(bf_t *r, const limb_t *tab,
+                                 limb_t n, limb_t radix)
+{
+    bf_context_t *s = r->ctx;
+    int pow_tab_len, i, ret;
+    limb_t radixl;
+    bf_t *pow_tab;
+    
+    radixl = get_limb_radix(radix);
+    pow_tab_len = ceil_log2(n) + 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]);
+    ret = bf_integer_from_radix_rec(r, tab, n, 0, n, radixl, pow_tab);
+    for(i = 0; i < pow_tab_len; i++) {
+        bf_delete(&pow_tab[i]);
+    }
+    bf_free(s, pow_tab);
+    return ret;
+}
+
+/* compute and round T * radix^expn. */
+int bf_mul_pow_radix(bf_t *r, const bf_t *T, limb_t radix,
+                     slimb_t expn, limb_t prec, bf_flags_t flags)
+{
+    int ret, expn_sign, overflow;
+    slimb_t e, extra_bits, prec1, ziv_extra_bits;
+    bf_t B_s, *B = &B_s;
+
+    if (T->len == 0) {
+        return bf_set(r, T);
+    } else if (expn == 0) {
+        ret = bf_set(r, T);
+        ret |= bf_round(r, prec, flags);
+        return ret;
+    }
+
+    e = expn;
+    expn_sign = 0;
+    if (e < 0) {
+        e = -e;
+        expn_sign = 1;
+    }
+    bf_init(r->ctx, B);
+    if (prec == BF_PREC_INF) {
+        /* infinite precision: only used if the result is known to be exact */
+        ret = bf_pow_ui_ui(B, radix, e, BF_PREC_INF, BF_RNDN);
+        if (expn_sign) {
+            ret |= bf_div(r, T, B, T->len * LIMB_BITS, BF_RNDN);
+        } else {
+            ret |= bf_mul(r, T, B, BF_PREC_INF, BF_RNDN);
+        }
+    } else {
+        ziv_extra_bits = 16;
+        for(;;) {
+            prec1 = prec + ziv_extra_bits;
+            /* 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);
+            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);
+            else
+                ret |= bf_mul(r, T, B, prec1 + extra_bits, BF_RNDN);
+            if (ret & BF_ST_MEM_ERROR)
+                break;
+            if ((ret & BF_ST_INEXACT) &&
+                !bf_can_round(r, prec, flags & BF_RND_MASK, prec1) &&
+                !overflow) {
+                /* and more precision and retry */
+                ziv_extra_bits = ziv_extra_bits  + (ziv_extra_bits / 2);
+            } else {
+                ret = bf_round(r, prec, flags) | (ret & BF_ST_INEXACT);
+                break;
+            }
+        }
+    }
+    bf_delete(B);
+    return ret;
+}
+
+static inline int to_digit(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'Z')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'z')
+        return c - 'a' + 10;
+    else
+        return 36;
+}
+
+/* add a limb at 'pos' and decrement pos. new space is created if
+   needed. Return 0 if OK, -1 if memory error */
+static int bf_add_limb(bf_t *a, slimb_t *ppos, limb_t v)
+{
+    slimb_t pos;
+    pos = *ppos;
+    if (unlikely(pos < 0)) {
+        limb_t new_size, d, *new_tab;
+        new_size = bf_max(a->len + 1, a->len * 3 / 2);
+        new_tab = bf_realloc(a->ctx, a->tab, sizeof(limb_t) * new_size);
+        if (!new_tab)
+            return -1;
+        a->tab = new_tab;
+        d = new_size - a->len;
+        memmove(a->tab + d, a->tab, a->len * sizeof(limb_t));
+        a->len = new_size;
+        pos += d;
+    }
+    a->tab[pos--] = v;
+    *ppos = pos;
+    return 0;
+}
+
+static int bf_tolower(int c)
+{
+    if (c >= 'A' && c <= 'Z')
+        c = c - 'A' + 'a';
+    return c;
+}
+
+static int strcasestart(const char *str, const char *val, const char **ptr)
+{
+    const char *p, *q;
+    p = str;
+    q = val;
+    while (*q != '\0') {
+        if (bf_tolower(*p) != *q)
+            return 0;
+        p++;
+        q++;
+    }
+    if (ptr)
+        *ptr = p;
+    return 1;
+}
+
+static int bf_atof_internal(bf_t *r, slimb_t *pexponent,
+                            const char *str, const char **pnext, int radix,
+                            limb_t prec, bf_flags_t flags, BOOL is_dec)
+{
+    const char *p, *p_start;
+    int is_neg, radix_bits, exp_is_neg, ret, digits_per_limb, shift;
+    limb_t cur_limb;
+    slimb_t pos, expn, int_len, digit_count;
+    BOOL has_decpt, is_bin_exp;
+    bf_t a_s, *a;
+    
+    *pexponent = 0;
+    p = str;
+    if (!(flags & BF_ATOF_NO_NAN_INF) && radix <= 16 &&
+        strcasestart(p, "nan", &p)) {
+        bf_set_nan(r);
+        ret = 0;
+        goto done;
+    }
+    is_neg = 0;
+    
+    if (p[0] == '+') {
+        p++;
+        p_start = p;
+    } else if (p[0] == '-') {
+        is_neg = 1;
+        p++;
+        p_start = p;
+    } else {
+        p_start = p;
+    }
+    if (p[0] == '0') {
+        if ((p[1] == 'x' || p[1] == 'X') &&
+            (radix == 0 || radix == 16) &&
+            !(flags & BF_ATOF_NO_HEX)) {
+            radix = 16;
+            p += 2;
+        } else if ((p[1] == 'o' || p[1] == 'O') &&
+                   radix == 0 && (flags & BF_ATOF_BIN_OCT)) {
+            p += 2;
+            radix = 8;
+        } else if ((p[1] == 'b' || p[1] == 'B') &&
+                   radix == 0 && (flags & BF_ATOF_BIN_OCT)) {
+            p += 2;
+            radix = 2;
+        } else {
+            goto no_prefix;
+        }
+        /* there must be a digit after the prefix */
+        if (to_digit((uint8_t)*p) >= radix) {
+            bf_set_nan(r);
+            ret = 0;
+            goto done;
+        }
+    no_prefix: ;
+    } else {
+        if (!(flags & BF_ATOF_NO_NAN_INF) && radix <= 16 &&
+            strcasestart(p, "inf", &p)) {
+            bf_set_inf(r, is_neg);
+            ret = 0;
+            goto done;
+        }
+    }
+    
+    if (radix == 0)
+        radix = 10;
+    if (is_dec) {
+        assert(radix == 10);
+        radix_bits = 0;
+        a = r;
+    } else if ((radix & (radix - 1)) != 0) {
+        radix_bits = 0; /* base is not a power of two */
+        a = &a_s;
+        bf_init(r->ctx, a);
+    } else {
+        radix_bits = ceil_log2(radix);
+        a = r;
+    }
+
+    /* skip leading zeros */
+    /* XXX: could also skip zeros after the decimal point */
+    while (*p == '0')
+        p++;
+
+    if (radix_bits) {
+        shift = digits_per_limb = LIMB_BITS;
+    } else {
+        radix_bits = 0;
+        shift = digits_per_limb = digits_per_limb_table[radix - 2];
+    }
+    cur_limb = 0;
+    bf_resize(a, 1);
+    pos = 0;
+    has_decpt = FALSE;
+    int_len = digit_count = 0;
+    for(;;) {
+        limb_t c;
+        if (*p == '.' && (p > p_start || to_digit(p[1]) < radix)) {
+            if (has_decpt)
+                break;
+            has_decpt = TRUE;
+            int_len = digit_count;
+            p++;
+        }
+        c = to_digit(*p);
+        if (c >= radix)
+            break;
+        digit_count++;
+        p++;
+        if (radix_bits) {
+            shift -= radix_bits;
+            if (shift <= 0) {
+                cur_limb |= c >> (-shift);
+                if (bf_add_limb(a, &pos, cur_limb))
+                    goto mem_error;
+                if (shift < 0)
+                    cur_limb = c << (LIMB_BITS + shift);
+                else
+                    cur_limb = 0;
+                shift += LIMB_BITS;
+            } else {
+                cur_limb |= c << shift;
+            }
+        } else {
+            cur_limb = cur_limb * radix + c;
+            shift--;
+            if (shift == 0) {
+                if (bf_add_limb(a, &pos, cur_limb))
+                    goto mem_error;
+                shift = digits_per_limb;
+                cur_limb = 0;
+            }
+        }
+    }
+    if (!has_decpt)
+        int_len = digit_count;
+
+    /* add the last limb and pad with zeros */
+    if (shift != digits_per_limb) {
+        if (radix_bits == 0) {
+            while (shift != 0) {
+                cur_limb *= radix;
+                shift--;
+            }
+        }
+        if (bf_add_limb(a, &pos, cur_limb)) {
+        mem_error:
+            ret = BF_ST_MEM_ERROR;
+            if (!radix_bits)
+                bf_delete(a);
+            bf_set_nan(r);
+            goto done;
+        }
+    }
+            
+    /* reset the next limbs to zero (we prefer to reallocate in the
+       renormalization) */
+    memset(a->tab, 0, (pos + 1) * sizeof(limb_t));
+
+    if (p == p_start) {
+        ret = 0;
+        if (!radix_bits)
+            bf_delete(a);
+        bf_set_nan(r);
+        goto done;
+    }
+
+    /* parse the exponent, if any */
+    expn = 0;
+    is_bin_exp = FALSE;
+    if (((radix == 10 && (*p == 'e' || *p == 'E')) ||
+         (radix != 10 && (*p == '@' ||
+                          (radix_bits && (*p == 'p' || *p == 'P'))))) &&
+        p > p_start) {
+        is_bin_exp = (*p == 'p' || *p == 'P');
+        p++;
+        exp_is_neg = 0;
+        if (*p == '+') {
+            p++;
+        } else if (*p == '-') {
+            exp_is_neg = 1;
+            p++;
+        }
+        for(;;) {
+            int c;
+            c = to_digit(*p);
+            if (c >= 10)
+                break;
+            if (unlikely(expn > ((EXP_MAX - 2 - 9) / 10))) {
+                /* exponent overflow */
+                if (exp_is_neg) {
+                    bf_set_zero(r, is_neg);
+                    ret = BF_ST_UNDERFLOW | BF_ST_INEXACT;
+                } else {
+                    bf_set_inf(r, is_neg);
+                    ret = BF_ST_OVERFLOW | BF_ST_INEXACT;
+                }
+                goto done;
+            }
+            p++;
+            expn = expn * 10 + c;
+        }
+        if (exp_is_neg)
+            expn = -expn;
+    }
+    if (is_dec) {
+        a->expn = expn + int_len;
+        a->sign = is_neg;
+        ret = bfdec_normalize_and_round((bfdec_t *)a, prec, flags);
+    } else if (radix_bits) {
+        /* XXX: may overflow */
+        if (!is_bin_exp)
+            expn *= radix_bits; 
+        a->expn = expn + (int_len * radix_bits);
+        a->sign = is_neg;
+        ret = bf_normalize_and_round(a, prec, flags);
+    } else {
+        limb_t l;
+        pos++;
+        l = a->len - pos; /* number of limbs */
+        if (l == 0) {
+            bf_set_zero(r, is_neg);
+            ret = 0;
+        } else {
+            bf_t T_s, *T = &T_s;
+
+            expn -= l * digits_per_limb - int_len;
+            bf_init(r->ctx, T);
+            if (bf_integer_from_radix(T, a->tab + pos, l, radix)) {
+                bf_set_nan(r);
+                ret = BF_ST_MEM_ERROR;
+            } else {
+                T->sign = is_neg;
+                if (flags & BF_ATOF_EXPONENT) {
+                    /* return the exponent */
+                    *pexponent = expn;
+                    ret = bf_set(r, T);
+                } else {
+                    ret = bf_mul_pow_radix(r, T, radix, expn, prec, flags);
+                }
+            }
+            bf_delete(T);
+        }
+        bf_delete(a);
+    }
+ done:
+    if (pnext)
+        *pnext = p;
+    return ret;
+}
+
+/* 
+   Return (status, n, exp). 'status' is the floating point status. 'n'
+   is the parsed number. 
+
+   If (flags & BF_ATOF_EXPONENT) and if the radix is not a power of
+   two, the parsed number is equal to r *
+   (*pexponent)^radix. Otherwise *pexponent = 0.
+*/
+int bf_atof2(bf_t *r, slimb_t *pexponent,
+             const char *str, const char **pnext, int radix,
+             limb_t prec, bf_flags_t flags)
+{
+    return bf_atof_internal(r, pexponent, str, pnext, radix, prec, flags,
+                            FALSE);
+}
+
+int bf_atof(bf_t *r, const char *str, const char **pnext, int radix,
+            limb_t prec, bf_flags_t flags)
+{
+    slimb_t dummy_exp;
+    return bf_atof_internal(r, &dummy_exp, str, pnext, radix, prec, flags, FALSE);
+}
+
+/* base conversion to radix */
+
+#if LIMB_BITS == 64
+#define RADIXL_10 UINT64_C(10000000000000000000)
+#else
+#define RADIXL_10 UINT64_C(1000000000)
+#endif
+
+static const uint32_t inv_log2_radix[BF_RADIX_MAX - 1][LIMB_BITS / 32 + 1] = {
+#if LIMB_BITS == 32
+{ 0x80000000, 0x00000000,},
+{ 0x50c24e60, 0xd4d4f4a7,},
+{ 0x40000000, 0x00000000,},
+{ 0x372068d2, 0x0a1ee5ca,},
+{ 0x3184648d, 0xb8153e7a,},
+{ 0x2d983275, 0x9d5369c4,},
+{ 0x2aaaaaaa, 0xaaaaaaab,},
+{ 0x28612730, 0x6a6a7a54,},
+{ 0x268826a1, 0x3ef3fde6,},
+{ 0x25001383, 0xbac8a744,},
+{ 0x23b46706, 0x82c0c709,},
+{ 0x229729f1, 0xb2c83ded,},
+{ 0x219e7ffd, 0xa5ad572b,},
+{ 0x20c33b88, 0xda7c29ab,},
+{ 0x20000000, 0x00000000,},
+{ 0x1f50b57e, 0xac5884b3,},
+{ 0x1eb22cc6, 0x8aa6e26f,},
+{ 0x1e21e118, 0x0c5daab2,},
+{ 0x1d9dcd21, 0x439834e4,},
+{ 0x1d244c78, 0x367a0d65,},
+{ 0x1cb40589, 0xac173e0c,},
+{ 0x1c4bd95b, 0xa8d72b0d,},
+{ 0x1bead768, 0x98f8ce4c,},
+{ 0x1b903469, 0x050f72e5,},
+{ 0x1b3b433f, 0x2eb06f15,},
+{ 0x1aeb6f75, 0x9c46fc38,},
+{ 0x1aa038eb, 0x0e3bfd17,},
+{ 0x1a593062, 0xb38d8c56,},
+{ 0x1a15f4c3, 0x2b95a2e6,},
+{ 0x19d630dc, 0xcc7ddef9,},
+{ 0x19999999, 0x9999999a,},
+{ 0x195fec80, 0x8a609431,},
+{ 0x1928ee7b, 0x0b4f22f9,},
+{ 0x18f46acf, 0x8c06e318,},
+{ 0x18c23246, 0xdc0a9f3d,},
+#else
+{ 0x80000000, 0x00000000, 0x00000000,},
+{ 0x50c24e60, 0xd4d4f4a7, 0x021f57bc,},
+{ 0x40000000, 0x00000000, 0x00000000,},
+{ 0x372068d2, 0x0a1ee5ca, 0x19ea911b,},
+{ 0x3184648d, 0xb8153e7a, 0x7fc2d2e1,},
+{ 0x2d983275, 0x9d5369c4, 0x4dec1661,},
+{ 0x2aaaaaaa, 0xaaaaaaaa, 0xaaaaaaab,},
+{ 0x28612730, 0x6a6a7a53, 0x810fabde,},
+{ 0x268826a1, 0x3ef3fde6, 0x23e2566b,},
+{ 0x25001383, 0xbac8a744, 0x385a3349,},
+{ 0x23b46706, 0x82c0c709, 0x3f891718,},
+{ 0x229729f1, 0xb2c83ded, 0x15fba800,},
+{ 0x219e7ffd, 0xa5ad572a, 0xe169744b,},
+{ 0x20c33b88, 0xda7c29aa, 0x9bddee52,},
+{ 0x20000000, 0x00000000, 0x00000000,},
+{ 0x1f50b57e, 0xac5884b3, 0x70e28eee,},
+{ 0x1eb22cc6, 0x8aa6e26f, 0x06d1a2a2,},
+{ 0x1e21e118, 0x0c5daab1, 0x81b4f4bf,},
+{ 0x1d9dcd21, 0x439834e3, 0x81667575,},
+{ 0x1d244c78, 0x367a0d64, 0xc8204d6d,},
+{ 0x1cb40589, 0xac173e0c, 0x3b7b16ba,},
+{ 0x1c4bd95b, 0xa8d72b0d, 0x5879f25a,},
+{ 0x1bead768, 0x98f8ce4c, 0x66cc2858,},
+{ 0x1b903469, 0x050f72e5, 0x0cf5488e,},
+{ 0x1b3b433f, 0x2eb06f14, 0x8c89719c,},
+{ 0x1aeb6f75, 0x9c46fc37, 0xab5fc7e9,},
+{ 0x1aa038eb, 0x0e3bfd17, 0x1bd62080,},
+{ 0x1a593062, 0xb38d8c56, 0x7998ab45,},
+{ 0x1a15f4c3, 0x2b95a2e6, 0x46aed6a0,},
+{ 0x19d630dc, 0xcc7ddef9, 0x5aadd61b,},
+{ 0x19999999, 0x99999999, 0x9999999a,},
+{ 0x195fec80, 0x8a609430, 0xe1106014,},
+{ 0x1928ee7b, 0x0b4f22f9, 0x5f69791d,},
+{ 0x18f46acf, 0x8c06e318, 0x4d2aeb2c,},
+{ 0x18c23246, 0xdc0a9f3d, 0x3fe16970,},
+#endif
+};
+
+static const limb_t log2_radix[BF_RADIX_MAX - 1] = {
+#if LIMB_BITS == 32
+0x20000000,
+0x32b80347,
+0x40000000,
+0x4a4d3c26,
+0x52b80347,
+0x59d5d9fd,
+0x60000000,
+0x6570068e,
+0x6a4d3c26,
+0x6eb3a9f0,
+0x72b80347,
+0x766a008e,
+0x79d5d9fd,
+0x7d053f6d,
+0x80000000,
+0x82cc7edf,
+0x8570068e,
+0x87ef05ae,
+0x8a4d3c26,
+0x8c8ddd45,
+0x8eb3a9f0,
+0x90c10501,
+0x92b80347,
+0x949a784c,
+0x966a008e,
+0x982809d6,
+0x99d5d9fd,
+0x9b74948f,
+0x9d053f6d,
+0x9e88c6b3,
+0xa0000000,
+0xa16bad37,
+0xa2cc7edf,
+0xa4231623,
+0xa570068e,
+#else
+0x2000000000000000,
+0x32b803473f7ad0f4,
+0x4000000000000000,
+0x4a4d3c25e68dc57f,
+0x52b803473f7ad0f4,
+0x59d5d9fd5010b366,
+0x6000000000000000,
+0x6570068e7ef5a1e8,
+0x6a4d3c25e68dc57f,
+0x6eb3a9f01975077f,
+0x72b803473f7ad0f4,
+0x766a008e4788cbcd,
+0x79d5d9fd5010b366,
+0x7d053f6d26089673,
+0x8000000000000000,
+0x82cc7edf592262d0,
+0x8570068e7ef5a1e8,
+0x87ef05ae409a0289,
+0x8a4d3c25e68dc57f,
+0x8c8ddd448f8b845a,
+0x8eb3a9f01975077f,
+0x90c10500d63aa659,
+0x92b803473f7ad0f4,
+0x949a784bcd1b8afe,
+0x966a008e4788cbcd,
+0x982809d5be7072dc,
+0x99d5d9fd5010b366,
+0x9b74948f5532da4b,
+0x9d053f6d26089673,
+0x9e88c6b3626a72aa,
+0xa000000000000000,
+0xa16bad3758efd873,
+0xa2cc7edf592262d0,
+0xa4231623369e78e6,
+0xa570068e7ef5a1e8,
+#endif
+};
+
+/* compute floor(a*b) or ceil(a*b) with b = log2(radix) or
+   b=1/log2(radix). For is_inv = 0, strict accuracy is not guaranteed
+   when radix is not a power of two. */
+slimb_t bf_mul_log2_radix(slimb_t a1, unsigned int radix, int is_inv,
+                          int is_ceil1)
+{
+    int is_neg;
+    limb_t a;
+    BOOL is_ceil;
+
+    is_ceil = is_ceil1;
+    a = a1;
+    if (a1 < 0) {
+        a = -a;
+        is_neg = 1;
+    } else {
+        is_neg = 0;
+    }
+    is_ceil ^= is_neg;
+    if ((radix & (radix - 1)) == 0) {
+        int radix_bits;
+        /* radix is a power of two */
+        radix_bits = ceil_log2(radix);
+        if (is_inv) {
+            if (is_ceil)
+                a += radix_bits - 1;
+            a = a / radix_bits;
+        } else {
+            a = a * radix_bits;
+        }
+    } else {
+        const uint32_t *tab;
+        limb_t b0, b1;
+        dlimb_t t;
+        
+        if (is_inv) {
+            tab = inv_log2_radix[radix - 2];
+#if LIMB_BITS == 32
+            b1 = tab[0];
+            b0 = tab[1];
+#else
+            b1 = ((limb_t)tab[0] << 32) | tab[1];
+            b0 = (limb_t)tab[2] << 32;
+#endif
+            t = (dlimb_t)b0 * (dlimb_t)a;
+            t = (dlimb_t)b1 * (dlimb_t)a + (t >> LIMB_BITS);
+            a = t >> (LIMB_BITS - 1);
+        } else {
+            b0 = log2_radix[radix - 2];
+            t = (dlimb_t)b0 * (dlimb_t)a;
+            a = t >> (LIMB_BITS - 3);
+        }
+        /* a = floor(result) and 'result' cannot be an integer */
+        a += is_ceil;
+    }
+    if (is_neg)
+        a = -a;
+    return a;
+}
+
+/* '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)
+{
+    limb_t n1, n2, q_prec;
+    assert(n >= 1);
+    if (n == 1) {
+        out[0] = get_bits(a->tab, a->len, a->len * LIMB_BITS - a->expn);
+    } else if (n == 2) {
+        dlimb_t t;
+        slimb_t pos;
+        pos = a->len * LIMB_BITS - a->expn;
+        t = ((dlimb_t)get_bits(a->tab, a->len, pos + LIMB_BITS) << LIMB_BITS) |
+            get_bits(a->tab, a->len, pos);
+        if (likely(radixl == RADIXL_10)) {
+            /* use division by a constant when possible */
+            out[0] = t % RADIXL_10;
+            out[1] = t / RADIXL_10;
+        } else {
+            out[0] = t % radixl;
+            out[1] = t / radixl;
+        }
+    } else {
+        bf_t Q, R, *B, *B_inv;
+        int q_add;
+        bf_init(a->ctx, &Q);
+        bf_init(a->ctx, &R);
+        n2 = (((n0 * 2) >> (level + 1)) + 1) / 2;
+        n1 = n - n2;
+        B = &pow_tab[2 * level];
+        B_inv = &pow_tab[2 * level + 1];
+        if (B->len == 0) {
+            /* compute BASE^n2 */
+            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);
+        }
+        //        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);
+        
+        bf_mul(&R, &Q, B, BF_PREC_INF, BF_RNDZ);
+        bf_sub(&R, a, &R, BF_PREC_INF, BF_RNDZ);
+        /* adjust if necessary */
+        q_add = 0;
+        while (R.sign && R.len != 0) {
+            bf_add(&R, &R, B, BF_PREC_INF, BF_RNDZ);
+            q_add--;
+        }
+        while (bf_cmpu(&R, B) >= 0) {
+            bf_sub(&R, &R, B, BF_PREC_INF, BF_RNDZ);
+            q_add++;
+        }
+        if (q_add != 0) {
+            bf_add_si(&Q, &Q, q_add, BF_PREC_INF, BF_RNDZ);
+        }
+        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);
+    }
+}
+
+static void 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;
+    
+    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);
+    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));
+
+    for(i = 0; i < pow_tab_len; i++) {
+        bf_delete(&pow_tab[i]);
+    }
+    bf_free(s, pow_tab);
+}
+
+/* a must be >= 0. 'P' is the wanted number of digits in radix
+   'radix'. 'r' is the mantissa represented as an integer. *pE
+   contains the exponent. Return != 0 if memory error. */
+static int bf_convert_to_radix(bf_t *r, slimb_t *pE,
+                               const bf_t *a, int radix,
+                               limb_t P, bf_rnd_t rnd_mode,
+                               BOOL is_fixed_exponent)
+{
+    slimb_t E, e, prec, extra_bits, ziv_extra_bits, prec0;
+    bf_t B_s, *B = &B_s;
+    int e_sign, ret, res;
+    
+    if (a->len == 0) {
+        /* zero case */
+        *pE = 0;
+        return bf_set(r, a);
+    }
+
+    if (is_fixed_exponent) {
+        E = *pE;
+    } else {
+        /* compute the new exponent */
+        E = 1 + bf_mul_log2_radix(a->expn - 1, radix, TRUE, FALSE);
+    }
+    //    bf_print_str("a", a);
+    //    printf("E=%ld P=%ld radix=%d\n", E, P, radix);
+    
+    for(;;) {
+        e = P - E;
+        e_sign = 0;
+        if (e < 0) {
+            e = -e;
+            e_sign = 1;
+        }
+        /* Note: precision for log2(radix) is not critical here */
+        prec0 = bf_mul_log2_radix(P, radix, FALSE, TRUE);
+        ziv_extra_bits = 16;
+        for(;;) {
+            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);
+            if (!e_sign)
+                ret |= bf_mul(r, r, a, prec + extra_bits, BF_RNDN);
+            else
+                ret |= bf_div(r, a, r, prec + extra_bits, BF_RNDN);
+            if (ret & BF_ST_MEM_ERROR)
+                return BF_ST_MEM_ERROR;
+            /* if the result is not exact, check that it can be safely
+               rounded to an integer */
+            if ((ret & BF_ST_INEXACT) &&
+                !bf_can_round(r, r->expn, rnd_mode, prec)) {
+                /* and more precision and retry */
+                ziv_extra_bits = ziv_extra_bits  + (ziv_extra_bits / 2);
+                continue;
+            } else {
+                ret = bf_rint(r, rnd_mode);
+                if (ret & BF_ST_MEM_ERROR)
+                    return BF_ST_MEM_ERROR;
+                break;
+            }
+        }
+        if (is_fixed_exponent)
+            break;
+        /* check that the result is < B^P */
+        /* XXX: do a fast approximate test first ? */
+        bf_init(r->ctx, B);
+        ret = bf_pow_ui_ui(B, radix, P, BF_PREC_INF, BF_RNDZ);
+        if (ret) {
+            bf_delete(B);
+            return ret;
+        }
+        res = bf_cmpu(r, B);
+        bf_delete(B);
+        if (res < 0)
+            break;
+        /* try a larger exponent */
+        E++;
+    }
+    *pE = E;
+    return 0;
+}
+
+static void limb_to_a(char *buf, limb_t n, unsigned int radix, int len)
+{
+    int digit, i;
+
+    if (radix == 10) {
+        /* specific case with constant divisor */
+        for(i = len - 1; i >= 0; i--) {
+            digit = (limb_t)n % 10;
+            n = (limb_t)n / 10;
+            buf[i] = digit + '0';
+        }
+    } else {
+        for(i = len - 1; i >= 0; i--) {
+            digit = (limb_t)n % radix;
+            n = (limb_t)n / radix;
+            if (digit < 10)
+                digit += '0';
+            else
+                digit += 'a' - 10;
+            buf[i] = digit;
+        }
+    }
+}
+
+/* for power of 2 radixes */
+static void limb_to_a2(char *buf, limb_t n, unsigned int radix_bits, int len)
+{
+    int digit, i;
+    unsigned int mask;
+
+    mask = (1 << radix_bits) - 1;
+    for(i = len - 1; i >= 0; i--) {
+        digit = n & mask;
+        n >>= radix_bits;
+        if (digit < 10)
+            digit += '0';
+        else
+            digit += 'a' - 10;
+        buf[i] = digit;
+    }
+}
+
+/* 'a' must be an integer if the is_dec = FALSE or if the radix is not
+   a power of two. A dot is added before the 'dot_pos' digit. dot_pos
+   = n_digits does not display the dot. 0 <= dot_pos <=
+   n_digits. n_digits >= 1. */
+static void output_digits(DynBuf *s, const bf_t *a1, int radix, limb_t n_digits,
+                          limb_t dot_pos, BOOL is_dec)
+{
+    limb_t i, v, l;
+    slimb_t pos, pos_incr;
+    int digits_per_limb, buf_pos, radix_bits, first_buf_pos;
+    char buf[65];
+    bf_t a_s, *a;
+
+    if (is_dec) {
+        digits_per_limb = LIMB_DIGITS;
+        a = (bf_t *)a1;
+        radix_bits = 0;
+        pos = a->len;
+        pos_incr = 1;
+        first_buf_pos = 0;
+    } else if ((radix & (radix - 1)) != 0) {
+        limb_t n, radixl;
+
+        digits_per_limb = digits_per_limb_table[radix - 2];
+        radixl = get_limb_radix(radix);
+        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);
+        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;
+    while (i < n_digits) {
+        if (buf_pos == digits_per_limb) {
+            pos -= pos_incr;
+            if (radix_bits == 0) {
+                v = get_limbz(a, pos);
+                limb_to_a(buf, v, radix, digits_per_limb);
+            } else {
+                v = get_bits(a->tab, a->len, pos);
+                limb_to_a2(buf, v, radix_bits, digits_per_limb);
+            }
+            buf_pos = first_buf_pos;
+            first_buf_pos = 0;
+        }
+        if (i < dot_pos) {
+            l = dot_pos;
+        } else {
+            if (i == dot_pos)
+                dbuf_putc(s, '.');
+            l = n_digits;
+        }
+        l = bf_min(digits_per_limb - buf_pos, l - i);
+        dbuf_put(s, (uint8_t *)(buf + buf_pos), l);
+        buf_pos += l;
+        i += l;
+    }
+    if (a != a1)
+        bf_delete(a);
+}
+
+static void *bf_dbuf_realloc(void *opaque, void *ptr, size_t size)
+{
+    bf_context_t *s = opaque;
+    return bf_realloc(s, ptr, size);
+}
+
+/* return the length in bytes. A trailing '\0' is added */
+static char *bf_ftoa_internal(size_t *plen, const bf_t *a2, int radix,
+                              limb_t prec, bf_flags_t flags, BOOL is_dec)
+{
+    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);
+    if (a2->expn == BF_EXP_NAN) {
+        dbuf_putstr(s, "NaN");
+    } else {
+        if (a2->sign)
+            dbuf_putc(s, '-');
+        if (a2->expn == BF_EXP_INF) {
+            if (flags & BF_FTOA_JS_QUIRKS)
+                dbuf_putstr(s, "Infinity");
+            else
+                dbuf_putstr(s, "Inf");
+        } 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;
+
+            /* 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);
+            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);
+                }
+            } else {
+#ifdef USE_BF_DEC
+                if (is_dec) {
+                    if (fmt == BF_FTOA_FORMAT_FIXED) {
+                        n_digits = prec;
+                        n_max = n_digits;
+                    } else {
+                        /* prec is ignored */
+                        prec = n_digits = a->len * LIMB_DIGITS;
+                        /* remove trailing zero digits */
+                        while (n_digits > 1 &&
+                               get_digit(a->tab, a->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 (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;
+                        }
+                        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
+                           as JS i.e. n_max = 21 for 64 bit float in base 10. */
+                        n_max = n_digits + 4;
+                        if (fmt == BF_FTOA_FORMAT_FREE_MIN) {
+                            bf_t b_s, *b = &b_s;
+                            
+                            /* find the minimum number of digits by
+                               dichotomy. */
+                            /* XXX: inefficient */
+                            n_digits_max = n_digits;
+                            n_digits_min = 1;
+                            bf_init(a2->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,
+                                                        flags & BF_RND_MASK, FALSE)) {
+                                    bf_delete(b);
+                                    goto fail1;
+                                }
+                                /* convert back to a number and compare */
+                                ret = bf_mul_pow_radix(b, a1, radix, n - n_digits,
+                                                       prec,
+                                                       (flags & ~BF_RND_MASK) |
+                                                       BF_RNDN);
+                                if (ret & BF_ST_MEM_ERROR) {
+                                    bf_delete(b);
+                                    goto fail1;
+                                }
+                                if (bf_cmpu(b, a) == 0) {
+                                    n_digits_max = n_digits;
+                                } else {
+                                    n_digits_min = n_digits + 1;
+                                }
+                            }
+                            bf_delete(b);
+                            n_digits = n_digits_max;
+                        }
+                    }
+                    if (bf_convert_to_radix(a1, &n, a, radix, n_digits,
+                                            flags & BF_RND_MASK, FALSE)) {
+                    fail1:
+                        bf_delete(a1);
+                        goto fail;
+                    }
+                }
+                if (a1->expn == BF_EXP_ZERO &&
+                    fmt != BF_FTOA_FORMAT_FIXED &&
+                    !(flags & BF_FTOA_FORCE_EXP)) {
+                    /* just output zero */
+                    dbuf_putstr(s, "0");
+                } else {
+                    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)
+                        n = 1;
+                    if ((flags & BF_FTOA_FORCE_EXP) ||
+                        n <= -6 || n > n_max) {
+                        const char *fmt;
+                        /* exponential notation */
+                        output_digits(s, a1, radix, n_digits, 1, is_dec);
+                        if (radix_bits != 0 && radix <= 16) {
+                            if (flags & BF_FTOA_JS_QUIRKS)
+                                fmt = "p%+" PRId_LIMB;
+                            else
+                                fmt = "p%" PRId_LIMB;
+                            dbuf_printf(s, fmt, (n - 1) * radix_bits);
+                        } else {
+                            if (flags & BF_FTOA_JS_QUIRKS)
+                                fmt = "%c%+" PRId_LIMB;
+                            else
+                                fmt = "%c%" PRId_LIMB;
+                            dbuf_printf(s, fmt,
+                                        radix <= 10 ? 'e' : '@', n - 1);
+                        }
+                    } else if (n <= 0) {
+                        /* 0.x */
+                        dbuf_putstr(s, "0.");
+                        for(i = 0; i < -n; i++) {
+                            dbuf_putc(s, '0');
+                        }
+                        output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+                    } else {
+                        if (n_digits <= n) {
+                            /* no dot */
+                            output_digits(s, a1, radix, n_digits, n_digits, is_dec);
+                            for(i = 0; i < (n - n_digits); i++)
+                                dbuf_putc(s, '0');
+                        } else {
+                            output_digits(s, a1, radix, n_digits, n, is_dec);
+                        }
+                    }
+                }
+            }
+            bf_delete(a1);
+        }
+    }
+    dbuf_putc(s, '\0');
+    if (dbuf_error(s))
+        goto fail;
+    if (plen)
+        *plen = s->size - 1;
+    return (char *)s->buf;
+ fail:
+    bf_free(a2->ctx, s->buf);
+    if (plen)
+        *plen = 0;
+    return NULL;
+}
+
+char *bf_ftoa(size_t *plen, const bf_t *a, int radix, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_ftoa_internal(plen, a, radix, prec, flags, FALSE);
+}
+
+/***************************************************************/
+/* transcendental functions */
+
+/* Note: the algorithm is from MPFR */
+static void bf_const_log2_rec(bf_t *T, bf_t *P, bf_t *Q, limb_t n1,
+                              limb_t n2, BOOL need_P)
+{
+    bf_context_t *s = T->ctx;
+    if ((n2 - n1) == 1) {
+        if (n1 == 0) {
+            bf_set_ui(P, 3);
+        } else {
+            bf_set_ui(P, n1);
+            P->sign = 1;
+        }
+        bf_set_ui(Q, 2 * n1 + 1);
+        Q->expn += 2;
+        bf_set(T, P);
+    } else {
+        limb_t m;
+        bf_t T1_s, *T1 = &T1_s;
+        bf_t P1_s, *P1 = &P1_s;
+        bf_t Q1_s, *Q1 = &Q1_s;
+        
+        m = n1 + ((n2 - n1) >> 1);
+        bf_const_log2_rec(T, P, Q, n1, m, TRUE);
+        bf_init(s, T1);
+        bf_init(s, P1);
+        bf_init(s, Q1);
+        bf_const_log2_rec(T1, P1, Q1, m, n2, need_P);
+        bf_mul(T, T, Q1, BF_PREC_INF, BF_RNDZ);
+        bf_mul(T1, T1, P, BF_PREC_INF, BF_RNDZ);
+        bf_add(T, T, T1, BF_PREC_INF, BF_RNDZ);
+        if (need_P)
+            bf_mul(P, P, P1, BF_PREC_INF, BF_RNDZ);
+        bf_mul(Q, Q, Q1, BF_PREC_INF, BF_RNDZ);
+        bf_delete(T1);
+        bf_delete(P1);
+        bf_delete(Q1);
+    }
+}
+
+/* compute log(2) with faithful rounding at precision 'prec' */
+static void bf_const_log2_internal(bf_t *T, limb_t prec)
+{
+    limb_t w, N;
+    bf_t P_s, *P = &P_s;
+    bf_t Q_s, *Q = &Q_s;
+
+    w = prec + 15;
+    N = w / 3 + 1;
+    bf_init(T->ctx, P);
+    bf_init(T->ctx, Q);
+    bf_const_log2_rec(T, P, Q, 0, N, FALSE);
+    bf_div(T, T, Q, prec, BF_RNDN);
+    bf_delete(P);
+    bf_delete(Q);
+}
+
+/* PI constant */
+
+#define CHUD_A 13591409
+#define CHUD_B 545140134
+#define CHUD_C 640320
+#define CHUD_BITS_PER_TERM 47
+
+static void chud_bs(bf_t *P, bf_t *Q, bf_t *G, int64_t a, int64_t b, int need_g,
+                    limb_t prec)
+{
+    bf_context_t *s = P->ctx;
+    int64_t c;
+
+    if (a == (b - 1)) {
+        bf_t T0, T1;
+        
+        bf_init(s, &T0);
+        bf_init(s, &T1);
+        bf_set_ui(G, 2 * b - 1);
+        bf_mul_ui(G, G, 6 * b - 1, prec, BF_RNDN);
+        bf_mul_ui(G, G, 6 * b - 5, prec, BF_RNDN);
+        bf_set_ui(&T0, CHUD_B);
+        bf_mul_ui(&T0, &T0, b, prec, BF_RNDN);
+        bf_set_ui(&T1, CHUD_A);
+        bf_add(&T0, &T0, &T1, prec, BF_RNDN);
+        bf_mul(P, G, &T0, prec, BF_RNDN);
+        P->sign = b & 1;
+
+        bf_set_ui(Q, b);
+        bf_mul_ui(Q, Q, b, prec, BF_RNDN);
+        bf_mul_ui(Q, Q, b, prec, BF_RNDN);
+        bf_mul_ui(Q, Q, (uint64_t)CHUD_C * CHUD_C * CHUD_C / 24, prec, BF_RNDN);
+        bf_delete(&T0);
+        bf_delete(&T1);
+    } else {
+        bf_t P2, Q2, G2;
+        
+        bf_init(s, &P2);
+        bf_init(s, &Q2);
+        bf_init(s, &G2);
+
+        c = (a + b) / 2;
+        chud_bs(P, Q, G, a, c, 1, prec);
+        chud_bs(&P2, &Q2, &G2, c, b, need_g, prec);
+        
+        /* Q = Q1 * Q2 */
+        /* G = G1 * G2 */
+        /* P = P1 * Q2 + P2 * G1 */
+        bf_mul(&P2, &P2, G, prec, BF_RNDN);
+        if (!need_g)
+            bf_set_ui(G, 0);
+        bf_mul(P, P, &Q2, prec, BF_RNDN);
+        bf_add(P, P, &P2, prec, BF_RNDN);
+        bf_delete(&P2);
+
+        bf_mul(Q, Q, &Q2, prec, BF_RNDN);
+        bf_delete(&Q2);
+        if (need_g)
+            bf_mul(G, G, &G2, prec, BF_RNDN);
+        bf_delete(&G2);
+    }
+}
+
+/* compute Pi with faithful rounding at precision 'prec' using the
+   Chudnovsky formula */
+static void bf_const_pi_internal(bf_t *Q, limb_t prec)
+{
+    bf_context_t *s = Q->ctx;
+    int64_t n, prec1;
+    bf_t P, G;
+
+    /* number of serie terms */
+    n = prec / CHUD_BITS_PER_TERM + 1;
+    /* XXX: precision analysis */
+    prec1 = prec + 32;
+
+    bf_init(s, &P);
+    bf_init(s, &G);
+
+    chud_bs(&P, Q, &G, 0, n, 0, BF_PREC_INF);
+    
+    bf_mul_ui(&G, Q, CHUD_A, prec1, BF_RNDN);
+    bf_add(&P, &G, &P, prec1, BF_RNDN);
+    bf_div(Q, Q, &P, prec1, BF_RNDF);
+ 
+    bf_set_ui(&P, CHUD_C);
+    bf_sqrt(&G, &P, prec1, BF_RNDF);
+    bf_mul_ui(&G, &G, (uint64_t)CHUD_C / 12, prec1, BF_RNDF);
+    bf_mul(Q, Q, &G, prec, BF_RNDN);
+    bf_delete(&P);
+    bf_delete(&G);
+}
+
+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))
+{
+    limb_t ziv_extra_bits, prec1;
+
+    ziv_extra_bits = 32;
+    for(;;) {
+        prec1 = prec + ziv_extra_bits;
+        if (c->prec < prec1) {
+            if (c->val.len == 0)
+                bf_init(T->ctx, &c->val);
+            func(&c->val, prec1);
+            c->prec = prec1;
+        } else {
+            prec1 = c->prec;
+        }
+        bf_set(T, &c->val);
+        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);
+        } else {
+            break;
+        }
+    }
+    return bf_round(T, prec, flags);
+}
+
+static void bf_const_free(BFConstCache *c)
+{
+    bf_delete(&c->val);
+    memset(c, 0, sizeof(*c));
+}
+
+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);
+}
+
+int bf_const_pi(bf_t *T, 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);
+}
+
+void bf_clear_cache(bf_context_t *s)
+{
+#ifdef USE_FFT_MUL
+    fft_clear_cache(s);
+#endif
+    bf_const_free(&s->log2_cache);
+    bf_const_free(&s->pi_cache);
+}
+
+/* ZivFunc should compute the result 'r' with faithful rounding at
+   precision 'prec'. For efficiency purposes, the final bf_round()
+   does not need to be done in the function. */
+typedef int ZivFunc(bf_t *r, const bf_t *a, limb_t prec, void *opaque);
+
+static int bf_ziv_rounding(bf_t *r, const bf_t *a,
+                           limb_t prec, bf_flags_t flags,
+                           ZivFunc *f, void *opaque)
+{
+    int rnd_mode, ret;
+    slimb_t prec1, ziv_extra_bits;
+    
+    rnd_mode = flags & BF_RND_MASK;
+    if (rnd_mode == BF_RNDF) {
+        /* no need to iterate */
+        f(r, a, prec, opaque);
+        ret = 0;
+    } else {
+        ziv_extra_bits = 32;
+        for(;;) {
+            prec1 = prec + ziv_extra_bits;
+            ret = f(r, a, prec1, opaque);
+            if (ret & (BF_ST_OVERFLOW | BF_ST_UNDERFLOW | BF_ST_MEM_ERROR)) {
+                /* overflow or underflow should never happen because
+                   it indicates the rounding cannot be done correctly,
+                   but we do not catch all the cases */
+                return ret;
+            }
+            /* if the result is exact, we can stop */
+            if (!(ret & BF_ST_INEXACT)) {
+                ret = 0;
+                break;
+            }
+            if (bf_can_round(r, prec, rnd_mode, prec1)) {
+                ret = BF_ST_INEXACT;
+                break;
+            }
+            ziv_extra_bits = ziv_extra_bits * 2;
+        }
+    }
+    return bf_round(r, prec, flags) | ret;
+}
+
+/* Compute the exponential using faithful rounding at precision 'prec'.
+   Note: the algorithm is from MPFR */
+static int bf_exp_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;
+    slimb_t n, K, l, i, prec1;
+    
+    assert(r != a);
+
+    /* argument reduction:
+       T = a - n*log(2) with 0 <= T < log(2) and n integer.
+    */
+    bf_init(s, T);
+    if (a->expn <= -1) {
+        /* 0 <= abs(a) <= 0.5 */
+        if (a->sign)
+            n = -1;
+        else
+            n = 0;
+    } else {
+        bf_const_log2(T, LIMB_BITS, BF_RNDZ);
+        bf_div(T, a, T, LIMB_BITS, BF_RNDD);
+        bf_get_limb(&n, T, 0);
+    }
+
+    K = bf_isqrt((prec + 1) / 2);
+    l = (prec - 1) / K + 1;
+    /* XXX: precision analysis ? */
+    prec1 = prec + (K + 2 * l + 18) + K + 8;
+    if (a->expn > 0)
+        prec1 += a->expn;
+    //    printf("n=%ld K=%ld prec1=%ld\n", n, K, prec1);
+
+    bf_const_log2(T, prec1, BF_RNDF);
+    bf_mul_si(T, T, n, prec1, BF_RNDN);
+    bf_sub(T, a, T, prec1, BF_RNDN);
+
+    /* reduce the range of T */
+    bf_mul_2exp(T, -K, BF_PREC_INF, BF_RNDZ);
+    
+    /* Taylor expansion around zero :
+     1 + x + x^2/2 + ... + x^n/n! 
+     = (1 + x * (1 + x/2 * (1 + ... (x/n))))
+    */
+    {
+        bf_t U_s, *U = &U_s;
+        
+        bf_init(s, U);
+        bf_set_ui(r, 1);
+        for(i = l ; i >= 1; i--) {
+            bf_set_ui(U, i);
+            bf_div(U, T, U, prec1, BF_RNDN);
+            bf_mul(r, r, U, prec1, BF_RNDN);
+            bf_add_si(r, r, 1, prec1, BF_RNDN);
+        }
+        bf_delete(U);
+    }
+    bf_delete(T);
+    
+    /* undo the range reduction */
+    for(i = 0; i < K; i++) {
+        bf_mul(r, r, r, prec1, BF_RNDN);
+    }
+
+    /* undo the argument reduction */
+    bf_mul_2exp(r, n, BF_PREC_INF, BF_RNDZ);
+
+    return BF_ST_INEXACT;
+}
+
+int bf_exp(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    assert(r != a);
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else if (a->expn == BF_EXP_INF) {
+            if (a->sign)
+                bf_set_zero(r, 0);
+            else
+                bf_set_inf(r, 0);
+        } else {
+            bf_set_ui(r, 1);
+        }
+        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);
+    }
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_exp_internal, NULL);
+}
+
+static int bf_log_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;
+    bf_t U_s, *U = &U_s;
+    bf_t V_s, *V = &V_s;
+    slimb_t n, prec1, l, i, K;
+    
+    assert(r != a);
+
+    bf_init(s, T);
+    /* argument reduction 1 */
+    /* T=a*2^n with 2/3 <= T <= 4/3 */
+    {
+        bf_t U_s, *U = &U_s;
+        bf_set(T, a);
+        n = T->expn;
+        T->expn = 0;
+        /* U= ~ 2/3 */
+        bf_init(s, U);
+        bf_set_ui(U, 0xaaaaaaaa); 
+        U->expn = 0;
+        if (bf_cmp_lt(T, U)) {
+            T->expn++;
+            n--;
+        }
+        bf_delete(U);
+    }
+    //    printf("n=%ld\n", n);
+    //    bf_print_str("T", T);
+
+    /* XXX: precision analysis */
+    /* number of iterations for argument reduction 2 */
+    K = bf_isqrt((prec + 1) / 2); 
+    /* order of Taylor expansion */
+    l = prec / (2 * K) + 1; 
+    /* precision of the intermediate computations */
+    prec1 = prec + K + 2 * l + 32;
+
+    bf_init(s, U);
+    bf_init(s, V);
+    
+    /* Note: cancellation occurs here, so we use more precision (XXX:
+       reduce the precision by computing the exact cancellation) */
+    bf_add_si(T, T, -1, BF_PREC_INF, BF_RNDN); 
+
+    /* argument reduction 2 */
+    for(i = 0; i < K; i++) {
+        /* T = T / (1 + sqrt(1 + T)) */
+        bf_add_si(U, T, 1, prec1, BF_RNDN);
+        bf_sqrt(V, U, prec1, BF_RNDF);
+        bf_add_si(U, V, 1, prec1, BF_RNDN);
+        bf_div(T, T, U, prec1, BF_RNDN);
+    }
+
+    {
+        bf_t Y_s, *Y = &Y_s;
+        bf_t Y2_s, *Y2 = &Y2_s;
+        bf_init(s, Y);
+        bf_init(s, Y2);
+
+        /* compute ln(1+x) = ln((1+y)/(1-y)) with y=x/(2+x)
+           = y + y^3/3 + ... + y^(2*l + 1) / (2*l+1) 
+           with Y=Y^2
+           = y*(1+Y/3+Y^2/5+...) = y*(1+Y*(1/3+Y*(1/5 + ...)))
+        */
+        bf_add_si(Y, T, 2, prec1, BF_RNDN);
+        bf_div(Y, T, Y, prec1, BF_RNDN);
+
+        bf_mul(Y2, Y, Y, prec1, BF_RNDN);
+        bf_set_ui(r, 0);
+        for(i = l; i >= 1; i--) {
+            bf_set_ui(U, 1);
+            bf_set_ui(V, 2 * i + 1);
+            bf_div(U, U, V, prec1, BF_RNDN);
+            bf_add(r, r, U, prec1, BF_RNDN);
+            bf_mul(r, r, Y2, prec1, BF_RNDN);
+        }
+        bf_add_si(r, r, 1, prec1, BF_RNDN);
+        bf_mul(r, r, Y, prec1, BF_RNDN);
+        bf_delete(Y);
+        bf_delete(Y2);
+    }
+    bf_delete(V);
+    bf_delete(U);
+
+    /* multiplication by 2 for the Taylor expansion and undo the
+       argument reduction 2*/
+    bf_mul_2exp(r, K + 1, BF_PREC_INF, BF_RNDZ);
+    
+    /* undo the argument reduction 1 */
+    bf_const_log2(T, prec1, BF_RNDF);
+    bf_mul_si(T, T, n, prec1, BF_RNDN);
+    bf_add(r, r, T, prec1, BF_RNDN);
+    
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_log(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;
+    
+    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) {
+            if (a->sign) {
+                bf_set_nan(r);
+                return BF_ST_INVALID_OP;
+            } else {
+                bf_set_inf(r, 0);
+                return 0;
+            }
+        } else {
+            bf_set_inf(r, 1);
+            return 0;
+        }
+    }
+    if (a->sign) {
+        bf_set_nan(r);
+        return BF_ST_INVALID_OP;
+    }
+    bf_init(s, T);
+    bf_set_ui(T, 1);
+    if (bf_cmp_eq(a, T)) {
+        bf_set_zero(r, 0);
+        bf_delete(T);
+        return 0;
+    }
+    bf_delete(T);
+
+    return bf_ziv_rounding(r, a, prec, flags, bf_log_internal, NULL);
+}
+
+/* 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;
+    const bf_t *y = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+
+    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_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;
+    const bf_t *y = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+    int ret;
+    slimb_t y1;
+    
+    bf_get_limb(&y1, y, 0);
+    if (y1 < 0)
+        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);
+    if (y->sign) {
+        bf_init(s, T);
+        bf_set_ui(T, 1);
+        ret |= bf_div(r, T, r, prec1, BF_RNDN);
+        bf_delete(T);
+    }
+    return ret;
+}
+
+/* x must be a finite non zero float. Return TRUE if there is a
+   floating point number r such as x=r^(2^n) and return this floating
+   point number 'r'. Otherwise return FALSE and r is undefined. */
+static BOOL check_exact_power2n(bf_t *r, const bf_t *x, slimb_t n)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    slimb_t e, i, er;
+    limb_t v;
+    
+    /* x = m*2^e with m odd integer */
+    e = bf_get_exp_min(x);
+    /* fast check on the exponent */
+    if (n > (LIMB_BITS - 1)) {
+        if (e != 0)
+            return FALSE;
+        er = 0;
+    } else {
+        if ((e & (((limb_t)1 << n) - 1)) != 0)
+            return FALSE;
+        er = e >> n;
+    }
+    /* every perfect odd square = 1 modulo 8 */
+    v = get_bits(x->tab, x->len, x->len * LIMB_BITS - x->expn + e);
+    if ((v & 7) != 1)
+        return FALSE;
+
+    bf_init(s, T);
+    bf_set(T, x);
+    T->expn -= e;
+    for(i = 0; i < n; i++) {
+        if (i != 0)
+            bf_set(T, r);
+        if (bf_sqrtrem(r, NULL, T) != 0)
+            return FALSE;
+    }
+    r->expn += er;
+    return TRUE;
+}
+
+/* prec = BF_PREC_INF is accepted for x and y integers and y >= 0 */
+int bf_pow(bf_t *r, const bf_t *x, const bf_t *y, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_t ytmp_s;
+    BOOL y_is_int, y_is_odd;
+    int r_sign, ret, rnd_mode;
+    slimb_t y_emin;
+    
+    if (x->len == 0 || y->len == 0) {
+        if (y->expn == BF_EXP_ZERO) {
+            /* pow(x, 0) = 1 */
+            bf_set_ui(r, 1);
+        } else if (x->expn == BF_EXP_NAN) {
+            bf_set_nan(r);
+        } else {
+            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) &&
+                (y->expn >= BF_EXP_INF)) {
+                bf_set_nan(r);
+            } else if (cmp_x_abs_1 == 0 &&
+                       (!x->sign || y->expn != BF_EXP_NAN)) {
+                /* pow(1, y) = 1 even if y = NaN */
+                /* pow(-1, +/-inf) = 1 */
+            } else if (y->expn == BF_EXP_NAN) {
+                bf_set_nan(r);
+            } else if (y->expn == BF_EXP_INF) {
+                if (y->sign == (cmp_x_abs_1 > 0)) {
+                    bf_set_zero(r, 0);
+                } else {
+                    bf_set_inf(r, 0);
+                }
+            } else {
+                y_emin = bf_get_exp_min(y);
+                y_is_odd = (y_emin == 0);
+                if (y->sign == (x->expn == BF_EXP_ZERO)) {
+                    bf_set_inf(r, y_is_odd & x->sign);
+                    if (y->sign) {
+                        /* pow(0, y) with y < 0 */
+                        return BF_ST_DIVIDE_ZERO;
+                    }
+                } else {
+                    bf_set_zero(r, y_is_odd & x->sign);
+                }
+            }
+        }
+        return 0;
+    }
+    bf_init(s, T);
+    bf_set(T, x);
+    y_emin = bf_get_exp_min(y);
+    y_is_int = (y_emin >= 0);
+    rnd_mode = flags & BF_RND_MASK;
+    if (x->sign) {
+        if (!y_is_int) {
+            bf_set_nan(r);
+            bf_delete(T);
+            return BF_ST_INVALID_OP;
+        }
+        y_is_odd = (y_emin == 0);
+        r_sign = y_is_odd;
+        /* change the directed rounding mode if the sign of the result
+           is changed */
+        if (r_sign && (rnd_mode == BF_RNDD || rnd_mode == BF_RNDU))
+            flags ^= 1;
+        bf_neg(T);
+    } else {
+        r_sign = 0;
+    }
+
+    bf_set_ui(r, 1);
+    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 {
+                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);
+        }
+    } 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;
+            }
+        }
+    general_case:
+        ret = bf_ziv_rounding(r, T, prec, flags, bf_pow_generic, (void *)y);
+    }
+    bf_delete(T);
+    r->sign = r_sign;
+    return ret;
+}
+
+/* compute sqrt(-2*x-x^2) to get |sin(x)| from cos(x) - 1. */
+static void bf_sqrt_sin(bf_t *r, const bf_t *x, limb_t prec1)
+{
+    bf_context_t *s = r->ctx;
+    bf_t T_s, *T = &T_s;
+    bf_init(s, T);
+    bf_set(T, x);
+    bf_mul(r, T, T, prec1, BF_RNDN);
+    bf_mul_2exp(T, 1, BF_PREC_INF, BF_RNDZ);
+    bf_add(T, T, r, prec1, BF_RNDN);
+    bf_neg(T);
+    bf_sqrt(r, T, prec1, BF_RNDF);
+    bf_delete(T);
+}
+
+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;
+    bf_t U_s, *U = &U_s;
+    bf_t r_s, *r = &r_s;
+    slimb_t K, prec1, i, l, mod, prec2;
+    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);
+    bf_init(s1, r);
+    
+    /* XXX: precision analysis */
+    K = bf_isqrt(prec / 2);
+    l = prec / (2 * K) + 1;
+    prec1 = prec + 2 * K + l + 8;
+    
+    /* after the modulo reduction, -pi/4 <= T <= pi/4 */
+    if (a->expn <= -1) {
+        /* abs(a) <= 0.25: no modulo reduction needed */
+        bf_set(T, a);
+        mod = 0;
+    } else {
+        slimb_t cancel;
+        cancel = 0;
+        for(;;) {
+            prec2 = prec1 + 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);
+            //            printf("T.expn=%ld prec2=%ld\n", T->expn, prec2);
+            if (mod == 0 || (T->expn != BF_EXP_ZERO &&
+                             (T->expn + prec2) >= (prec1 - 1)))
+                break;
+            /* increase the number of bits until the precision is good enough */
+            cancel = bf_max(-T->expn, (cancel + 1) * 3 / 2);
+        }
+        mod &= 3;
+    }
+    
+    is_neg = T->sign;
+        
+    /* compute cosm1(x) = cos(x) - 1 */
+    bf_mul(T, T, T, prec1, BF_RNDN);
+    bf_mul_2exp(T, -2 * K, BF_PREC_INF, BF_RNDZ);
+    
+    /* Taylor expansion:
+       -x^2/2 + x^4/4! - x^6/6! + ...
+    */
+    bf_set_ui(r, 1);
+    for(i = l ; i >= 1; i--) {
+        bf_set_ui(U, 2 * i - 1);
+        bf_mul_ui(U, U, 2 * i, BF_PREC_INF, BF_RNDZ);
+        bf_div(U, T, U, prec1, BF_RNDN);
+        bf_mul(r, r, U, prec1, BF_RNDN);
+        bf_neg(r);
+        if (i != 1)
+            bf_add_si(r, r, 1, prec1, BF_RNDN);
+    }
+    bf_delete(U);
+
+    /* undo argument reduction:
+       cosm1(2*x)= 2*(2*cosm1(x)+cosm1(x)^2)
+    */
+    for(i = 0; i < K; i++) {
+        bf_mul(T, r, r, prec1, BF_RNDN);
+        bf_mul_2exp(r, 1, BF_PREC_INF, BF_RNDZ);
+        bf_add(r, r, T, prec1, BF_RNDN);
+        bf_mul_2exp(r, 1, BF_PREC_INF, BF_RNDZ);
+    }
+    bf_delete(T);
+
+    if (c) {
+        if ((mod & 1) == 0) {
+            bf_add_si(c, r, 1, prec1, BF_RNDN);
+        } else {
+            bf_sqrt_sin(c, r, prec1);
+            c->sign = is_neg ^ 1;
+        }
+        c->sign ^= mod >> 1;
+    }
+    if (s) {
+        if ((mod & 1) == 0) {
+            bf_sqrt_sin(s, r, prec1);
+            s->sign = is_neg;
+        } else {
+            bf_add_si(s, r, 1, prec1, BF_RNDN);
+        }
+        s->sign ^= mod >> 1;
+    }
+    bf_delete(r);
+    return BF_ST_INEXACT;
+}
+
+static int bf_cos_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    return bf_sincos(NULL, r, a, prec);
+}
+
+int bf_cos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    return bf_ziv_rounding(r, a, prec, flags, bf_cos_internal, NULL);
+}
+
+static int bf_sin_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    return bf_sincos(r, NULL, a, prec);
+}
+
+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);
+            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;
+        }
+    }
+
+    /* XXX: precision analysis */
+    prec1 = prec + 8;
+    bf_init(s, T);
+    bf_sincos(r, T, a, prec1);
+    bf_div(r, r, T, prec1, BF_RNDF);
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_tan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    return bf_ziv_rounding(r, a, prec, flags, bf_tan_internal, NULL);
+}
+
+/* if add_pi2 is true, add pi/2 to the result (used for acos(x) to
+   avoid cancellation) */
+static int bf_atan_internal(bf_t *r, const bf_t *a, limb_t prec,
+                            void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    BOOL add_pi2 = (BOOL)(intptr_t)opaque;
+    bf_t T_s, *T = &T_s;
+    bf_t U_s, *U = &U_s;
+    bf_t V_s, *V = &V_s;
+    bf_t X2_s, *X2 = &X2_s;
+    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);
+    
+    if (cmp_1 > 0) {
+        bf_set_ui(T, 1);
+        bf_div(T, T, a, prec1, BF_RNDN);
+    } else {
+        bf_set(T, a);
+    }
+
+    /* abs(T) <= 1 */
+
+    /* argument reduction */
+
+    bf_init(s, U);
+    bf_init(s, V);
+    bf_init(s, X2);
+    for(i = 0; i < K; i++) {
+        /* T = T / (1 + sqrt(1 + T^2)) */
+        bf_mul(U, T, T, prec1, BF_RNDN);
+        bf_add_si(U, U, 1, prec1, BF_RNDN);
+        bf_sqrt(V, U, prec1, BF_RNDN);
+        bf_add_si(V, V, 1, prec1, BF_RNDN);
+        bf_div(T, T, V, prec1, BF_RNDN);
+    }
+
+    /* Taylor series: 
+       x - x^3/3 + ... + (-1)^ l * y^(2*l + 1) / (2*l+1) 
+    */
+    bf_mul(X2, T, T, prec1, BF_RNDN);
+    bf_set_ui(r, 0);
+    for(i = l; i >= 1; i--) {
+        bf_set_si(U, 1);
+        bf_set_ui(V, 2 * i + 1);
+        bf_div(U, U, V, prec1, BF_RNDN);
+        bf_neg(r);
+        bf_add(r, r, U, prec1, BF_RNDN);
+        bf_mul(r, r, X2, prec1, BF_RNDN);
+    }
+    bf_neg(r);
+    bf_add_si(r, r, 1, prec1, BF_RNDN);
+    bf_mul(r, r, T, prec1, BF_RNDN);
+
+    /* undo the argument reduction */
+    bf_mul_2exp(r, K, BF_PREC_INF, BF_RNDZ);
+    
+    bf_delete(U);
+    bf_delete(V);
+    bf_delete(X2);
+
+    i = add_pi2;
+    if (cmp_1 > 0) {
+        /* undo the inversion : r = sign(a)*PI/2 - r */
+        bf_neg(r);
+        i += 1 - 2 * a->sign;
+    }
+    /* add i*(pi/2) with -1 <= i <= 2 */
+    if (i != 0) {
+        bf_const_pi(T, prec1, BF_RNDF);
+        if (i != 2)
+            bf_mul_2exp(T, -1, BF_PREC_INF, BF_RNDZ);
+        T->sign = (i < 0);
+        bf_add(r, T, r, prec1, BF_RNDN);
+    }
+    
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_atan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags)
+{
+    return bf_ziv_rounding(r, a, prec, flags, bf_atan_internal, (void *)FALSE);
+}
+
+static int bf_atan2_internal(bf_t *r, const bf_t *y, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    const bf_t *x = opaque;
+    bf_t T_s, *T = &T_s;
+    limb_t prec1;
+    int ret;
+    
+    if (y->expn == BF_EXP_NAN || x->expn == BF_EXP_NAN) {
+        bf_set_nan(r);
+        return 0;
+    }
+
+    /* compute atan(y/x) assumming inf/inf = 1 and 0/0 = 0 */
+    bf_init(s, T);
+    prec1 = prec + 32;
+    if (y->expn == BF_EXP_INF && x->expn == BF_EXP_INF) {
+        bf_set_ui(T, 1);
+        T->sign = y->sign ^ x->sign;
+    } else if (y->expn == BF_EXP_ZERO && x->expn == BF_EXP_ZERO) {
+        bf_set_zero(T, y->sign ^ x->sign);
+    } else {
+        bf_div(T, y, x, prec1, BF_RNDF);
+    }
+    ret = bf_atan(r, T, prec1, BF_RNDF);
+
+    if (x->sign) {
+        /* if x < 0 (it includes -0), return sign(y)*pi + atan(y/x) */
+        bf_const_pi(T, prec1, BF_RNDF);
+        T->sign = y->sign;
+        bf_add(r, r, T, prec1, BF_RNDN);
+        ret |= BF_ST_INEXACT;
+    }
+
+    bf_delete(T);
+    return ret;
+}
+
+int bf_atan2(bf_t *r, const bf_t *y, const bf_t *x,
+             limb_t prec, bf_flags_t flags)
+{
+    return bf_ziv_rounding(r, y, prec, flags, bf_atan2_internal, (void *)x);
+}
+
+static int bf_asin_internal(bf_t *r, const bf_t *a, limb_t prec, void *opaque)
+{
+    bf_context_t *s = r->ctx;
+    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) */
+    prec1 = prec + 8;
+    /* increase the precision in x^2 to compensate the cancellation in
+       (1-x^2) if x is close to 1 */
+    /* XXX: use less precision when possible */
+    if (a->expn >= 0)
+        prec2 = BF_PREC_INF;
+    else
+        prec2 = prec1;
+    bf_mul(T, a, a, prec2, BF_RNDN);
+    bf_neg(T);
+    bf_add_si(T, T, 1, prec2, BF_RNDN);
+
+    bf_sqrt(r, T, prec1, BF_RNDN);
+    bf_div(T, a, r, prec1, BF_RNDN);
+    if (is_acos)
+        bf_neg(T);
+    bf_atan_internal(r, T, prec1, (void *)(intptr_t)is_acos);
+    bf_delete(T);
+    return BF_ST_INEXACT;
+}
+
+int bf_asin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t 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)
+{
+    return bf_ziv_rounding(r, a, prec, flags, bf_asin_internal, (void *)TRUE);
+}
+
+/***************************************************************/
+/* decimal floating point numbers */
+
+#ifdef USE_BF_DEC
+
+#define adddq(r1, r0, a1, a0)                   \
+    do {                                        \
+        limb_t __t = r0;                        \
+        r0 += (a0);                             \
+        r1 += (a1) + (r0 < __t);                \
+    } while (0)
+
+#define subdq(r1, r0, a1, a0)                   \
+    do {                                        \
+        limb_t __t = r0;                        \
+        r0 -= (a0);                             \
+        r1 -= (a1) + (r0 > __t);                \
+    } while (0)
+
+#if LIMB_BITS == 64
+
+/* Note: we assume __int128 is available */
+#define muldq(r1, r0, a, b)                     \
+    do {                                        \
+        unsigned __int128 __t;                          \
+        __t = (unsigned __int128)(a) * (unsigned __int128)(b);  \
+        r0 = __t;                               \
+        r1 = __t >> 64;                         \
+    } while (0)
+
+#define divdq(q, r, a1, a0, b)                  \
+    do {                                        \
+        unsigned __int128 __t;                  \
+        limb_t __b = (b);                       \
+        __t = ((unsigned __int128)(a1) << 64) | (a0);   \
+        q = __t / __b;                                  \
+        r = __t % __b;                                  \
+    } while (0)
+
+#else
+
+#define muldq(r1, r0, a, b)                     \
+    do {                                        \
+        uint64_t __t;                          \
+        __t = (uint64_t)(a) * (uint64_t)(b);  \
+        r0 = __t;                               \
+        r1 = __t >> 32;                         \
+    } while (0)
+
+#define divdq(q, r, a1, a0, b)                  \
+    do {                                        \
+        uint64_t __t;                  \
+        limb_t __b = (b);                       \
+        __t = ((uint64_t)(a1) << 32) | (a0);   \
+        q = __t / __b;                                  \
+        r = __t % __b;                                  \
+    } while (0)
+
+#endif /* LIMB_BITS != 64 */
+
+#if 0 //unused
+static inline 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)
+{
+    if (shift != 0)
+        return (a1 << shift) | (a0 >> (LIMB_BITS - shift));
+    else
+        return a1;
+}
+
+#if LIMB_DIGITS == 19
+
+/* WARNING: hardcoded for b = 1e19. It is assumed that:
+   0 <= a1 < 2^63 */
+#define divdq_base(q, r, a1, a0)\
+do {\
+    uint64_t __a0, __a1, __t0, __t1, __b = BF_DEC_BASE; \
+    __a0 = a0;\
+    __a1 = a1;\
+    __t0 = __a1;\
+    __t0 = shld(__t0, __a0, 1);\
+    muldq(q, __t1, __t0, UINT64_C(17014118346046923173)); \
+    muldq(__t1, __t0, q, __b);\
+    subdq(__a1, __a0, __t1, __t0);\
+    subdq(__a1, __a0, 1, __b * 2);    \
+    __t0 = (slimb_t)__a1 >> 1; \
+    q += 2 + __t0;\
+    adddq(__a1, __a0, 0, __b & __t0);\
+    q += __a1;                  \
+    __a0 += __b & __a1;           \
+    r = __a0;\
+} while(0)
+
+#elif LIMB_DIGITS == 9
+
+/* WARNING: hardcoded for b = 1e9. It is assumed that:
+   0 <= a1 < 2^29 */
+#define divdq_base(q, r, a1, a0)\
+do {\
+    uint32_t __t0, __t1, __b = BF_DEC_BASE; \
+    __t0 = a1;\
+    __t1 = a0;\
+    __t0 = (__t0 << 3) | (__t1 >> (32 - 3));    \
+    muldq(q, __t1, __t0, 2305843009U);\
+    r = a0 - q * __b;\
+    __t1 = (r >= __b);\
+    q += __t1;\
+    if (__t1)\
+        r -= __b;\
+} while(0)
+
+#endif
+
+/* 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;
+} 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)
+{
+    int l;
+    limb_t q, r, m1;
+    s->d = d;
+    if (d == 1)
+        l = 0;
+    else
+        l = 64 - clz64(d - 1);
+    divdq(q, r, ((limb_t)1 << l) - d, 0, d);
+    (void)r;
+    m1 = q + 1;
+    //    printf("d=%lu l=%d m1=0x%016lx\n", d, l, m1);
+    s->m1 = m1;
+    s->shift1 = l;
+    if (s->shift1 > 1)
+        s->shift1 = 1;
+    s->shift2 = l - 1;
+    if (s->shift2 < 0)
+        s->shift2 = 0;
+}
+
+static inline limb_t fast_udiv(limb_t a, const FastDivData *s)
+{
+    limb_t t0, t1;
+    muldq(t1, t0, s->m1, a);
+    t0 = (a - t1) >> s->shift1;
+    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;
+}
+#endif
+
+#define fast_udivrem(q, r, a, s) q = fast_udiv(a, s), r = a - q * (s)->d
+    
+#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
+
+#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)
+{
+    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;
+    }
+}
+
+limb_t mp_add_dec(limb_t *res, const limb_t *op1, const limb_t *op2, 
+                  mp_size_t n, limb_t carry)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, a, v;
+
+    k=carry;
+    for(i=0;i<n;i++) {
+        /* XXX: reuse the trick in add_mod */
+        v = op1[i];
+        a = v + op2[i] + k - base;
+        k = a <= v;
+        if (!k) 
+            a += base;
+        res[i]=a;
+    }
+    return k;
+}
+
+limb_t mp_add_ui_dec(limb_t *tab, limb_t b, mp_size_t n)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, a, v;
+
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v + k - base;
+        k = a <= v;
+        if (!k) 
+            a += base;
+        tab[i] = a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+limb_t mp_sub_dec(limb_t *res, const limb_t *op1, const limb_t *op2, 
+                  mp_size_t n, limb_t carry)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, v, a;
+
+    k=carry;
+    for(i=0;i<n;i++) {
+        v = op1[i];
+        a = v - op2[i] - k;
+        k = a > v;
+        if (k)
+            a += base;
+        res[i] = a;
+    }
+    return k;
+}
+
+limb_t mp_sub_ui_dec(limb_t *tab, limb_t b, mp_size_t n)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t k, v, a;
+    
+    k=b;
+    for(i=0;i<n;i++) {
+        v = tab[i];
+        a = v - k;
+        k = a > v;
+        if (k)
+            a += base;
+        tab[i]=a;
+        if (k == 0)
+            break;
+    }
+    return k;
+}
+
+/* taba[] = taba[] * b + l. 0 <= b, l <= base - 1. Return the high carry */
+limb_t mp_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n, 
+                   limb_t b, limb_t l)
+{
+    mp_size_t i;
+    limb_t t0, t1, r;
+
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        divdq_base(l, r, t1, t0);
+        tabr[i] = r;
+    }
+    return l;
+}
+
+/* tabr[] += taba[] * b. 0 <= b <= base - 1. Return the value to add
+   to the high word */
+limb_t mp_add_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n,
+                       limb_t b)
+{
+    mp_size_t i;
+    limb_t l, t0, t1, r;
+
+    l = 0;
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        adddq(t1, t0, 0, tabr[i]);
+        divdq_base(l, r, t1, t0);
+        tabr[i] = r;
+    }
+    return l;
+}
+
+/* tabr[] -= taba[] * b. 0 <= b <= base - 1. Return the value to
+   substract to the high word. */
+limb_t mp_sub_mul1_dec(limb_t *tabr, const limb_t *taba, mp_size_t n,
+                       limb_t b)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t l, t0, t1, r, a, v, c;
+
+    /* XXX: optimize */
+    l = 0;
+    for(i = 0; i < n; i++) {
+        muldq(t1, t0, taba[i], b);
+        adddq(t1, t0, 0, l);
+        divdq_base(l, r, t1, t0);
+        v = tabr[i];
+        a = v - r;
+        c = a > v;
+        if (c)
+            a += base;
+        /* never bigger than base because r = 0 when l = base - 1 */
+        l += c;
+        tabr[i] = a;
+    }
+    return l;
+}
+
+/* size of the result : op1_size + op2_size. */
+void mp_mul_basecase_dec(limb_t *result, 
+                         const limb_t *op1, mp_size_t op1_size, 
+                         const limb_t *op2, mp_size_t op2_size) 
+{
+    mp_size_t i;
+    limb_t r;
+    
+    result[op1_size] = mp_mul1_dec(result, op1, op1_size, op2[0], 0);
+
+    for(i=1;i<op2_size;i++) {
+        r = mp_add_mul1_dec(result + i, op1, op1_size, op2[i]);
+        result[i + op1_size] = r;
+    }
+}
+
+/* taba[] = (taba[] + r*base^na) / b. 0 <= b < base. 0 <= r <
+   b. Return the remainder. */
+limb_t mp_div1_dec(limb_t *tabr, const limb_t *taba, mp_size_t na, 
+                   limb_t b, limb_t r)
+{
+    limb_t base = BF_DEC_BASE;
+    mp_size_t i;
+    limb_t t0, t1, q;
+    int shift;
+
+#if (BF_DEC_BASE % 2) == 0
+    if (b == 2) {
+        limb_t base_div2;
+        /* Note: only works if base is even */
+        base_div2 = base >> 1;
+        if (r)
+            r = base_div2;
+        for(i = na - 1; i >= 0; i--) {
+            t0 = taba[i];
+            tabr[i] = (t0 >> 1) + r;
+            r = 0;
+            if (t0 & 1)
+                r = base_div2;
+        }
+        if (r)
+            r = 1;
+    } else 
+#endif
+    if (na >= UDIV1NORM_THRESHOLD) {
+        shift = clz(b);
+        if (shift == 0) {
+            /* normalized case: b >= 2^(LIMB_BITS-1) */
+            limb_t b_inv;
+            b_inv = udiv1norm_init(b);
+            for(i = na - 1; i >= 0; i--) {
+                muldq(t1, t0, r, base);
+                adddq(t1, t0, 0, taba[i]);
+                q = udiv1norm(&r, t1, t0, b, b_inv);
+                tabr[i] = q;
+            }
+        } else {
+            limb_t b_inv;
+            b <<= shift;
+            b_inv = udiv1norm_init(b);
+            for(i = na - 1; i >= 0; i--) {
+                muldq(t1, t0, r, base);
+                adddq(t1, t0, 0, taba[i]);
+                t1 = (t1 << shift) | (t0 >> (LIMB_BITS - shift));
+                t0 <<= shift;
+                q = udiv1norm(&r, t1, t0, b, b_inv);
+                r >>= shift;
+                tabr[i] = q;
+            }
+        }
+    } else {
+        for(i = na - 1; i >= 0; i--) {
+            muldq(t1, t0, r, base);
+            adddq(t1, t0, 0, taba[i]);
+            divdq(q, r, t1, t0, b);
+            tabr[i] = q;
+        }
+    }
+    return r;
+}
+
+static __maybe_unused void mp_print_str_dec(const char *str,
+                                       const limb_t *tab, slimb_t n)
+{
+    slimb_t i;
+    printf("%s=", str);
+    for(i = n - 1; i >= 0; i--) {
+        if (i != n - 1)
+            printf("_");
+        printf("%0*" PRIu_LIMB, LIMB_DIGITS, tab[i]);
+    }
+    printf("\n");
+}
+
+static __maybe_unused void mp_print_str_h_dec(const char *str,
+                                              const limb_t *tab, slimb_t n,
+                                              limb_t high)
+{
+    slimb_t i;
+    printf("%s=", str);
+    printf("%0*" PRIu_LIMB, LIMB_DIGITS, high);
+    for(i = n - 1; i >= 0; i--) {
+        printf("_");
+        printf("%0*" PRIu_LIMB, LIMB_DIGITS, tab[i]);
+    }
+    printf("\n");
+}
+
+//#define DEBUG_DIV_SLOW
+
+#define DIV_STATIC_ALLOC_LEN 16
+
+/* return q = a / b and r = a % b. 
+
+   taba[na] must be allocated if tabb1[nb - 1] < B / 2.  tabb1[nb - 1]
+   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
+   contains na - nb + 1 limbs. No overlap is permitted.
+
+   Running time of the standard method: (na - nb + 1) * nb
+   Return 0 if OK, -1 if memory alloc error
+*/
+/* XXX: optimize */
+static int mp_div_dec(bf_context_t *s, limb_t *tabq,
+                      limb_t *taba, mp_size_t na, 
+                      const limb_t *tabb1, mp_size_t nb)
+{
+    limb_t base = BF_DEC_BASE;
+    limb_t r, mult, t0, t1, a, c, q, v, *tabb;
+    mp_size_t i, j;
+    limb_t static_tabb[DIV_STATIC_ALLOC_LEN];
+    
+#ifdef DEBUG_DIV_SLOW
+    mp_print_str_dec("a", taba, na);
+    mp_print_str_dec("b", tabb1, nb);
+#endif
+
+    /* normalize tabb */
+    r = tabb1[nb - 1];
+    assert(r != 0);
+    i = na - nb;
+    if (r >= BF_DEC_BASE / 2) {
+        mult = 1;
+        tabb = (limb_t *)tabb1;
+        q = 1;
+        for(j = nb - 1; j >= 0; j--) {
+            if (taba[i + j] != tabb[j]) {
+                if (taba[i + j] < tabb[j])
+                    q = 0;
+                break;
+            }
+        }
+        tabq[i] = q;
+        if (q) {
+            mp_sub_dec(taba + i, taba + i, tabb, nb, 0);
+        }
+        i--;
+    } else {
+        mult = base / (r + 1);
+        if (likely(nb <= DIV_STATIC_ALLOC_LEN)) {
+            tabb = static_tabb;
+        } else {
+            tabb = bf_malloc(s, sizeof(limb_t) * nb);
+            if (!tabb)
+                return -1;
+        }
+        mp_mul1_dec(tabb, tabb1, nb, mult, 0);
+        taba[na] = mp_mul1_dec(taba, taba, na, mult, 0);
+    }
+
+#ifdef DEBUG_DIV_SLOW
+    printf("mult=" FMT_LIMB "\n", mult);
+    mp_print_str_dec("a_norm", taba, na + 1);
+    mp_print_str_dec("b_norm", tabb, nb);
+#endif
+
+    for(; i >= 0; i--) {
+        if (unlikely(taba[i + nb] >= tabb[nb - 1])) {
+            /* XXX: check if it is really possible */
+            q = base - 1;
+        } else {
+            muldq(t1, t0, taba[i + nb], base);
+            adddq(t1, t0, 0, taba[i + nb - 1]);
+            divdq(q, r, t1, t0, tabb[nb - 1]);
+        }
+        //        printf("i=%d q1=%ld\n", i, q);
+
+        r = mp_sub_mul1_dec(taba + i, tabb, nb, q);
+        //        mp_dump("r1", taba + i, nb, bd);
+        //        printf("r2=%ld\n", r);
+
+        v = taba[i + nb];
+        a = v - r;
+        c = a > v;
+        if (c)
+            a += base;
+        taba[i + nb] = a;
+
+        if (c != 0) {
+            /* negative result */
+            for(;;) {
+                q--;
+                c = mp_add_dec(taba + i, taba + i, tabb, nb, 0);
+                /* propagate carry and test if positive result */
+                if (c != 0) {
+                    if (++taba[i + nb] == base) {
+                        break;
+                    }
+                }
+            }
+        }
+        tabq[i] = q;
+    }
+
+#ifdef DEBUG_DIV_SLOW
+    mp_print_str_dec("q", tabq, na - nb + 1);
+    mp_print_str_dec("r", taba, nb);
+#endif
+
+    /* remove the normalization */
+    if (mult != 1) {
+        mp_div1_dec(taba, taba, nb, mult, 0);
+        if (unlikely(tabb != static_tabb))
+            bf_free(s, tabb);
+    }
+    return 0;
+}
+
+/* divide by 10^shift */
+static limb_t mp_shr_dec(limb_t *tab_r, const limb_t *tab, mp_size_t n, 
+                         limb_t shift, limb_t high)
+{
+    mp_size_t i;
+    limb_t l, a, q, r;
+
+    assert(shift >= 1 && shift < LIMB_DIGITS);
+    l = high;
+    for(i = n - 1; i >= 0; i--) {
+        a = tab[i];
+        fast_udivrem(q, r, a, &mp_pow_div[shift]);
+        tab_r[i] = q + l * mp_pow_dec[LIMB_DIGITS - shift];
+        l = r;
+    }
+    return l;
+}
+
+/* multiply by 10^shift */
+static limb_t mp_shl_dec(limb_t *tab_r, const limb_t *tab, mp_size_t n, 
+                         limb_t shift, limb_t low)
+{
+    mp_size_t i;
+    limb_t l, a, q, r;
+
+    assert(shift >= 1 && shift < LIMB_DIGITS);
+    l = low;
+    for(i = 0; i < n; i++) {
+        a = tab[i];
+        fast_udivrem(q, r, a, &mp_pow_div[LIMB_DIGITS - shift]);
+        tab_r[i] = r * mp_pow_dec[shift] + l;
+        l = q;
+    }
+    return l;
+}
+
+static limb_t mp_sqrtrem2_dec(limb_t *tabs, limb_t *taba)
+{
+    int k;
+    dlimb_t a, b, r;
+    limb_t taba1[2], s, r0, r1;
+
+    /* convert to binary and normalize */
+    a = (dlimb_t)taba[1] * BF_DEC_BASE + taba[0];
+    k = clz(a >> LIMB_BITS) & ~1;
+    b = a << k;
+    taba1[0] = b;
+    taba1[1] = b >> LIMB_BITS;
+    mp_sqrtrem2(&s, taba1);
+    s >>= (k >> 1);
+    /* convert the remainder back to decimal */
+    r = a - (dlimb_t)s * (dlimb_t)s;
+    divdq_base(r1, r0, r >> LIMB_BITS, r);
+    taba[0] = r0;
+    tabs[0] = s;
+    return r1;
+}
+
+//#define DEBUG_SQRTREM_DEC
+
+/* tmp_buf must contain (n / 2 + 1 limbs) */
+static limb_t mp_sqrtrem_rec_dec(limb_t *tabs, limb_t *taba, limb_t n,
+                                 limb_t *tmp_buf)
+{
+    limb_t l, h, rh, ql, qh, c, i;
+    
+    if (n == 1)
+        return mp_sqrtrem2_dec(tabs, taba);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("a", taba, 2 * n);
+#endif
+    l = n / 2;
+    h = n - l;
+    qh = mp_sqrtrem_rec_dec(tabs + l, taba + 2 * l, h, tmp_buf);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("s1", tabs + l, h);
+    mp_print_str_h_dec("r1", taba + 2 * l, h, qh);
+    mp_print_str_h_dec("r2", taba + l, n, qh);
+#endif
+    
+    /* the remainder is in taba + 2 * l. Its high bit is in qh */
+    if (qh) {
+        mp_sub_dec(taba + 2 * l, taba + 2 * l, tabs + l, h, 0);
+    }
+    /* instead of dividing by 2*s, divide by s (which is normalized)
+       and update q and r */
+    mp_div_dec(NULL, tmp_buf, taba + l, n, tabs + l, h);
+    qh += tmp_buf[l];
+    for(i = 0; i < l; i++)
+        tabs[i] = tmp_buf[i];
+    ql = mp_div1_dec(tabs, tabs, l, 2, qh & 1);
+    qh = qh >> 1; /* 0 or 1 */
+    if (ql)
+        rh = mp_add_dec(taba + l, taba + l, tabs + l, h, 0);
+    else
+        rh = 0;
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_h_dec("q", tabs, l, qh);
+    mp_print_str_h_dec("u", taba + l, h, rh);
+#endif
+    
+    mp_add_ui_dec(tabs + l, qh, h);
+#ifdef DEBUG_SQRTREM_DEC
+    mp_print_str_dec("s2", tabs, n);
+#endif
+    
+    /* q = qh, tabs[l - 1 ... 0], r = taba[n - 1 ... l] */
+    /* subtract q^2. if qh = 1 then q = B^l, so we can take shortcuts */
+    if (qh) {
+        c = qh;
+    } else {
+        mp_mul_basecase_dec(taba + n, tabs, l, tabs, l);
+        c = mp_sub_dec(taba, taba, taba + n, 2 * l, 0);
+    }
+    rh -= mp_sub_ui_dec(taba + 2 * l, c, n - 2 * l);
+    if ((slimb_t)rh < 0) {
+        mp_sub_ui_dec(tabs, 1, n);
+        rh += mp_add_mul1_dec(taba, tabs, n, 2);
+        rh += mp_add_ui_dec(taba, 1, n);
+    }
+    return rh;
+}
+
+/* 'taba' has 2*n limbs with n >= 1 and taba[2*n-1] >= B/4. Return (s,
+   r) with s=floor(sqrt(a)) and r=a-s^2. 0 <= r <= 2 * s. tabs has n
+   limbs. r is returned in the lower n limbs of taba. Its r[n] is the
+   returned value of the function. */
+int mp_sqrtrem_dec(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n)
+{
+    limb_t tmp_buf1[8];
+    limb_t *tmp_buf;
+    mp_size_t n2;
+    n2 = n / 2 + 1;
+    if (n2 <= countof(tmp_buf1)) {
+        tmp_buf = tmp_buf1;
+    } else {
+        tmp_buf = bf_malloc(s, sizeof(limb_t) * n2);
+        if (!tmp_buf)
+            return -1;
+    }
+    taba[n] = mp_sqrtrem_rec_dec(tabs, taba, n, tmp_buf);
+    if (tmp_buf != tmp_buf1)
+        bf_free(s, tmp_buf);
+    return 0;
+}
+
+/* return the number of leading zero digits, from 0 to LIMB_DIGITS */
+static int clz_dec(limb_t a)
+{
+    if (a == 0)
+        return LIMB_DIGITS;
+    switch(LIMB_BITS - 1 - clz(a)) {
+    case 0: /* 1-1 */
+        return LIMB_DIGITS - 1;
+    case 1: /* 2-3 */
+        return LIMB_DIGITS - 1;
+    case 2: /* 4-7 */
+        return LIMB_DIGITS - 1;
+    case 3: /* 8-15 */
+        if (a < 10)
+            return LIMB_DIGITS - 1;
+        else
+            return LIMB_DIGITS - 2;
+    case 4: /* 16-31 */
+        return LIMB_DIGITS - 2;
+    case 5: /* 32-63 */
+        return LIMB_DIGITS - 2;
+    case 6: /* 64-127 */
+        if (a < 100)
+            return LIMB_DIGITS - 2;
+        else
+            return LIMB_DIGITS - 3;
+    case 7: /* 128-255 */
+        return LIMB_DIGITS - 3;
+    case 8: /* 256-511 */
+        return LIMB_DIGITS - 3;
+    case 9: /* 512-1023 */
+        if (a < 1000)
+            return LIMB_DIGITS - 3;
+        else
+            return LIMB_DIGITS - 4;
+    case 10: /* 1024-2047 */
+        return LIMB_DIGITS - 4;
+    case 11: /* 2048-4095 */
+        return LIMB_DIGITS - 4;
+    case 12: /* 4096-8191 */
+        return LIMB_DIGITS - 4;
+    case 13: /* 8192-16383 */
+        if (a < 10000)
+            return LIMB_DIGITS - 4;
+        else
+            return LIMB_DIGITS - 5;
+    case 14: /* 16384-32767 */
+        return LIMB_DIGITS - 5;
+    case 15: /* 32768-65535 */
+        return LIMB_DIGITS - 5;
+    case 16: /* 65536-131071 */
+        if (a < 100000)
+            return LIMB_DIGITS - 5;
+        else
+            return LIMB_DIGITS - 6;
+    case 17: /* 131072-262143 */
+        return LIMB_DIGITS - 6;
+    case 18: /* 262144-524287 */
+        return LIMB_DIGITS - 6;
+    case 19: /* 524288-1048575 */
+        if (a < 1000000)
+            return LIMB_DIGITS - 6;
+        else
+            return LIMB_DIGITS - 7;
+    case 20: /* 1048576-2097151 */
+        return LIMB_DIGITS - 7;
+    case 21: /* 2097152-4194303 */
+        return LIMB_DIGITS - 7;
+    case 22: /* 4194304-8388607 */
+        return LIMB_DIGITS - 7;
+    case 23: /* 8388608-16777215 */
+        if (a < 10000000)
+            return LIMB_DIGITS - 7;
+        else
+            return LIMB_DIGITS - 8;
+    case 24: /* 16777216-33554431 */
+        return LIMB_DIGITS - 8;
+    case 25: /* 33554432-67108863 */
+        return LIMB_DIGITS - 8;
+    case 26: /* 67108864-134217727 */
+        if (a < 100000000)
+            return LIMB_DIGITS - 8;
+        else
+            return LIMB_DIGITS - 9;
+#if LIMB_BITS == 64
+    case 27: /* 134217728-268435455 */
+        return LIMB_DIGITS - 9;
+    case 28: /* 268435456-536870911 */
+        return LIMB_DIGITS - 9;
+    case 29: /* 536870912-1073741823 */
+        if (a < 1000000000)
+            return LIMB_DIGITS - 9;
+        else
+            return LIMB_DIGITS - 10;
+    case 30: /* 1073741824-2147483647 */
+        return LIMB_DIGITS - 10;
+    case 31: /* 2147483648-4294967295 */
+        return LIMB_DIGITS - 10;
+    case 32: /* 4294967296-8589934591 */
+        return LIMB_DIGITS - 10;
+    case 33: /* 8589934592-17179869183 */
+        if (a < 10000000000)
+            return LIMB_DIGITS - 10;
+        else
+            return LIMB_DIGITS - 11;
+    case 34: /* 17179869184-34359738367 */
+        return LIMB_DIGITS - 11;
+    case 35: /* 34359738368-68719476735 */
+        return LIMB_DIGITS - 11;
+    case 36: /* 68719476736-137438953471 */
+        if (a < 100000000000)
+            return LIMB_DIGITS - 11;
+        else
+            return LIMB_DIGITS - 12;
+    case 37: /* 137438953472-274877906943 */
+        return LIMB_DIGITS - 12;
+    case 38: /* 274877906944-549755813887 */
+        return LIMB_DIGITS - 12;
+    case 39: /* 549755813888-1099511627775 */
+        if (a < 1000000000000)
+            return LIMB_DIGITS - 12;
+        else
+            return LIMB_DIGITS - 13;
+    case 40: /* 1099511627776-2199023255551 */
+        return LIMB_DIGITS - 13;
+    case 41: /* 2199023255552-4398046511103 */
+        return LIMB_DIGITS - 13;
+    case 42: /* 4398046511104-8796093022207 */
+        return LIMB_DIGITS - 13;
+    case 43: /* 8796093022208-17592186044415 */
+        if (a < 10000000000000)
+            return LIMB_DIGITS - 13;
+        else
+            return LIMB_DIGITS - 14;
+    case 44: /* 17592186044416-35184372088831 */
+        return LIMB_DIGITS - 14;
+    case 45: /* 35184372088832-70368744177663 */
+        return LIMB_DIGITS - 14;
+    case 46: /* 70368744177664-140737488355327 */
+        if (a < 100000000000000)
+            return LIMB_DIGITS - 14;
+        else
+            return LIMB_DIGITS - 15;
+    case 47: /* 140737488355328-281474976710655 */
+        return LIMB_DIGITS - 15;
+    case 48: /* 281474976710656-562949953421311 */
+        return LIMB_DIGITS - 15;
+    case 49: /* 562949953421312-1125899906842623 */
+        if (a < 1000000000000000)
+            return LIMB_DIGITS - 15;
+        else
+            return LIMB_DIGITS - 16;
+    case 50: /* 1125899906842624-2251799813685247 */
+        return LIMB_DIGITS - 16;
+    case 51: /* 2251799813685248-4503599627370495 */
+        return LIMB_DIGITS - 16;
+    case 52: /* 4503599627370496-9007199254740991 */
+        return LIMB_DIGITS - 16;
+    case 53: /* 9007199254740992-18014398509481983 */
+        if (a < 10000000000000000)
+            return LIMB_DIGITS - 16;
+        else
+            return LIMB_DIGITS - 17;
+    case 54: /* 18014398509481984-36028797018963967 */
+        return LIMB_DIGITS - 17;
+    case 55: /* 36028797018963968-72057594037927935 */
+        return LIMB_DIGITS - 17;
+    case 56: /* 72057594037927936-144115188075855871 */
+        if (a < 100000000000000000)
+            return LIMB_DIGITS - 17;
+        else
+            return LIMB_DIGITS - 18;
+    case 57: /* 144115188075855872-288230376151711743 */
+        return LIMB_DIGITS - 18;
+    case 58: /* 288230376151711744-576460752303423487 */
+        return LIMB_DIGITS - 18;
+    case 59: /* 576460752303423488-1152921504606846975 */
+        if (a < 1000000000000000000)
+            return LIMB_DIGITS - 18;
+        else
+            return LIMB_DIGITS - 19;
+#endif
+    default:
+        return 0;
+    }
+}
+
+/* for debugging */
+void bfdec_print_str(const char *str, const bfdec_t *a)
+{
+    slimb_t i;
+    printf("%s=", str);
+
+    if (a->expn == BF_EXP_NAN) {
+        printf("NaN");
+    } else {
+        if (a->sign)
+            putchar('-');
+        if (a->expn == BF_EXP_ZERO) {
+            putchar('0');
+        } else if (a->expn == BF_EXP_INF) {
+            printf("Inf");
+        } else {
+            printf("0.");
+            for(i = a->len - 1; i >= 0; i--)
+                printf("%0*" PRIu_LIMB, LIMB_DIGITS, a->tab[i]);
+            printf("e%" PRId_LIMB, a->expn);
+        }
+    }
+    printf("\n");
+}
+
+/* return != 0 if one digit between 0 and bit_pos inclusive is not zero. */
+static inline limb_t scan_digit_nz(const bfdec_t *r, slimb_t bit_pos)
+{
+    slimb_t pos;
+    limb_t v, q;
+    int shift;
+
+    if (bit_pos < 0)
+        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]);
+    (void)q;
+    if (v != 0)
+        return 1;
+    pos--;
+    while (pos >= 0) {
+        if (r->tab[pos] != 0)
+            return 1;
+        pos--;
+    }
+    return 0;
+}
+
+static limb_t get_digit(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    slimb_t i;
+    int shift;
+    i = floor_div(pos, LIMB_DIGITS);
+    if (i < 0 || i >= len)
+        return 0;
+    shift = pos - i * LIMB_DIGITS;
+    return fast_udiv(tab[i], &mp_pow_div[shift]) % 10;
+}
+
+#if 0
+static limb_t get_digits(const limb_t *tab, limb_t len, slimb_t pos)
+{
+    limb_t a0, a1;
+    int shift;
+    slimb_t i;
+    
+    i = floor_div(pos, LIMB_DIGITS);
+    shift = pos - i * LIMB_DIGITS;
+    if (i >= 0 && i < len)
+        a0 = tab[i];
+    else
+        a0 = 0;
+    if (shift == 0) {
+        return a0;
+    } else {
+        i++;
+        if (i >= 0 && i < len)
+            a1 = tab[i];
+        else
+            a1 = 0;
+        return fast_udiv(a0, &mp_pow_div[shift]) +
+            fast_urem(a1, &mp_pow_div[LIMB_DIGITS - shift]) *
+            mp_pow_dec[shift];
+    }
+}
+#endif
+
+/* return the addend for rounding. Note that prec can be <= 0 for bf_rint() */
+static int bfdec_get_rnd_add(int *pret, const bfdec_t *r, limb_t l,
+                             slimb_t prec, int rnd_mode)
+{
+    int add_one, inexact;
+    limb_t digit1, digit0;
+    
+    //    bfdec_print_str("get_rnd_add", r);
+    if (rnd_mode == BF_RNDF) {
+        digit0 = 1; /* faithful rounding does not honor the INEXACT flag */
+    } else {
+        /* starting limb for bit 'prec + 1' */
+        digit0 = scan_digit_nz(r, l * LIMB_DIGITS - 1 - bf_max(0, prec + 1));
+    }
+
+    /* get the digit at 'prec' */
+    digit1 = get_digit(r->tab, l, l * LIMB_DIGITS - 1 - prec);
+    inexact = (digit1 | digit0) != 0;
+    
+    add_one = 0;
+    switch(rnd_mode) {
+    case BF_RNDZ:
+        break;
+    case BF_RNDN:
+        if (digit1 == 5) {
+            if (digit0) {
+                add_one = 1;
+            } else {
+                /* round to even */
+                add_one =
+                    get_digit(r->tab, l, l * LIMB_DIGITS - 1 - (prec - 1)) & 1;
+            }
+        } else if (digit1 > 5) {
+            add_one = 1;
+        }
+        break;
+    case BF_RNDD:
+    case BF_RNDU:
+        if (r->sign == (rnd_mode == BF_RNDD))
+            add_one = inexact;
+        break;
+    case BF_RNDNA:
+    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;
+        }
+        break;
+    default:
+        abort();
+    }
+    
+    if (inexact)
+        *pret |= BF_ST_INEXACT;
+    return add_one;
+}
+
+/* round to prec1 bits assuming 'r' is non zero and finite. 'r' is
+   assumed to have length 'l' (1 <= l <= r->len). prec1 can be
+   BF_PREC_INF. BF_FLAG_SUBNORMAL is not supported. Cannot fail with
+   BF_ST_MEM_ERROR.
+ */
+static int __bfdec_round(bfdec_t *r, limb_t prec1, bf_flags_t flags, limb_t l)
+{
+    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 */
+    e_range = (limb_t)1 << (bf_get_exp_bits(flags) - 1);
+    e_min = -e_range + 3;
+    e_max = e_range;
+    
+    if (flags & BF_FLAG_RADPNT_PREC) {
+        /* 'prec' is the precision after the decimal point */
+        if (prec1 != BF_PREC_INF)
+            prec = r->expn + prec1;
+        else
+            prec = prec1;
+    } else {
+        prec = prec1;
+    }
+    
+    /* round to prec bits */
+    rnd_mode = flags & BF_RND_MASK;
+    ret = 0;
+    add_one = bfdec_get_rnd_add(&ret, r, l, prec, rnd_mode);
+    
+    if (prec <= 0) {
+        if (add_one) {
+            bfdec_resize(r, 1); /* cannot fail because r is non zero */
+            r->tab[0] = BF_DEC_BASE / 10;
+            r->expn += 1 - prec;
+            ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+            return ret;
+        } else {
+            goto underflow;
+        }
+    } else if (add_one) {
+        limb_t carry;
+        
+        /* add one starting at digit 'prec - 1' */
+        bit_pos = l * LIMB_DIGITS - 1 - (prec - 1);
+        pos = bit_pos / LIMB_DIGITS;
+        carry = mp_pow_dec[bit_pos % LIMB_DIGITS];
+        carry = mp_add_ui_dec(r->tab + pos, carry, l - pos);
+        if (carry) {
+            /* shift right by one digit */
+            mp_shr_dec(r->tab + pos, r->tab + pos, l - pos, 1, 1);
+            r->expn++;
+        }
+    }
+    
+    /* check underflow */
+    if (unlikely(r->expn < e_min)) {
+    underflow:
+        bfdec_set_zero(r, r->sign);
+        ret |= BF_ST_UNDERFLOW | BF_ST_INEXACT;
+        return ret;
+    }
+    
+    /* check overflow */
+    if (unlikely(r->expn > e_max)) {
+        bfdec_set_inf(r, r->sign);
+        ret |= BF_ST_OVERFLOW | BF_ST_INEXACT;
+        return ret;
+    }
+    
+    /* keep the bits starting at 'prec - 1' */
+    bit_pos = l * LIMB_DIGITS - 1 - (prec - 1);
+    i = floor_div(bit_pos, LIMB_DIGITS);
+    if (i >= 0) {
+        shift = smod(bit_pos, LIMB_DIGITS);
+        if (shift != 0) {
+            r->tab[i] = fast_udiv(r->tab[i], &mp_pow_div[shift]) *
+                mp_pow_dec[shift];
+        }
+    } else {
+        i = 0;
+    }
+    /* remove trailing zeros */
+    while (r->tab[i] == 0)
+        i++;
+    if (i > 0) {
+        l -= i;
+        memmove(r->tab, r->tab + i, l * sizeof(limb_t));
+    }
+    bfdec_resize(r, l); /* cannot fail */
+    return ret;
+}
+
+/* Cannot fail with BF_ST_MEM_ERROR. */
+int bfdec_round(bfdec_t *r, limb_t prec, bf_flags_t flags)
+{
+    if (r->len == 0)
+        return 0;
+    return __bfdec_round(r, prec, flags, r->len);
+}
+
+/* 'r' must be a finite number. Cannot fail with BF_ST_MEM_ERROR.  */
+int bfdec_normalize_and_round(bfdec_t *r, limb_t prec1, bf_flags_t flags)
+{
+    limb_t l, v;
+    int shift, ret;
+    
+    //    bfdec_print_str("bf_renorm", r);
+    l = r->len;
+    while (l > 0 && r->tab[l - 1] == 0)
+        l--;
+    if (l == 0) {
+        /* zero */
+        r->expn = BF_EXP_ZERO;
+        bfdec_resize(r, 0); /* cannot fail */
+        ret = 0;
+    } else {
+        r->expn -= (r->len - l) * LIMB_DIGITS;
+        /* shift to have the MSB set to '1' */
+        v = r->tab[l - 1];
+        shift = clz_dec(v);
+        if (shift != 0) {
+            mp_shl_dec(r->tab, r->tab, l, shift, 0);
+            r->expn -= shift;
+        }
+        ret = __bfdec_round(r, prec1, flags, l);
+    }
+    //    bf_print_str("r_final", r);
+    return ret;
+}
+
+int bfdec_set_ui(bfdec_t *r, uint64_t v)
+{
+#if LIMB_BITS == 32
+    if (v >= BF_DEC_BASE * BF_DEC_BASE) {
+        if (bfdec_resize(r, 3))
+            goto fail;
+        r->tab[0] = v % BF_DEC_BASE;
+        v /= BF_DEC_BASE;
+        r->tab[1] = v % BF_DEC_BASE;
+        r->tab[2] = v / BF_DEC_BASE;
+        r->expn = 3 * LIMB_DIGITS;
+    } else
+#endif
+    if (v >= BF_DEC_BASE) {
+        if (bfdec_resize(r, 2))
+            goto fail;
+        r->tab[0] = v % BF_DEC_BASE;
+        r->tab[1] = v / BF_DEC_BASE;
+        r->expn = 2 * LIMB_DIGITS;
+    } else {
+        if (bfdec_resize(r, 1))
+            goto fail;
+        r->tab[0] = v;
+        r->expn = LIMB_DIGITS;
+    }
+    r->sign = 0;
+    return bfdec_normalize_and_round(r, BF_PREC_INF, 0);
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bfdec_set_si(bfdec_t *r, int64_t v)
+{
+    int ret;
+    if (v < 0) {
+        ret = bfdec_set_ui(r, -v);
+        r->sign = 1;
+    } else {
+        ret = bfdec_set_ui(r, v);
+    }
+    return ret;
+}
+
+static int bfdec_add_internal(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec, bf_flags_t flags, int b_neg)
+{
+    bf_context_t *s = r->ctx;
+    int is_sub, cmp_res, a_sign, b_sign, ret;
+
+    a_sign = a->sign;
+    b_sign = b->sign ^ b_neg;
+    is_sub = a_sign ^ b_sign;
+    cmp_res = bfdec_cmpu(a, b);
+    if (cmp_res < 0) {
+        const bfdec_t *tmp;
+        tmp = a;
+        a = b;
+        b = tmp;
+        a_sign = b_sign; /* b_sign is never used later */
+    }
+    /* abs(a) >= abs(b) */
+    if (cmp_res == 0 && is_sub && a->expn < BF_EXP_INF) {
+        /* zero result */
+        bfdec_set_zero(r, (flags & BF_RND_MASK) == BF_RNDD);
+        ret = 0;
+    } else if (a->len == 0 || b->len == 0) {
+        ret = 0;
+        if (a->expn >= BF_EXP_INF) {
+            if (a->expn == BF_EXP_NAN) {
+                /* at least one operand is NaN */
+                bfdec_set_nan(r);
+                ret = 0;
+            } else if (b->expn == BF_EXP_INF && is_sub) {
+                /* infinities with different signs */
+                bfdec_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bfdec_set_inf(r, a_sign);
+            }
+        } else {
+            /* at least one zero and not subtract */
+            if (bfdec_set(r, a))
+                return BF_ST_MEM_ERROR;
+            r->sign = a_sign;
+            goto renorm;
+        }
+    } else {
+        slimb_t d, a_offset, b_offset, i, r_len;
+        limb_t carry;
+        limb_t *b1_tab;
+        int b_shift;
+        mp_size_t b1_len;
+        
+        d = a->expn - b->expn;
+
+        /* XXX: not efficient in time and memory if the precision is
+           not infinite */
+        r_len = bf_max(a->len, b->len + (d + LIMB_DIGITS - 1) / LIMB_DIGITS);
+        if (bfdec_resize(r, r_len))
+            goto fail;
+        r->sign = a_sign;
+        r->expn = a->expn;
+
+        a_offset = r_len - a->len;
+        for(i = 0; i < a_offset; i++)
+            r->tab[i] = 0;
+        for(i = 0; i < a->len; i++)
+            r->tab[a_offset + i] = a->tab[i];
+        
+        b_shift = d % LIMB_DIGITS;
+        if (b_shift == 0) {
+            b1_len = b->len;
+            b1_tab = (limb_t *)b->tab;
+        } else {
+            b1_len = b->len + 1;
+            b1_tab = bf_malloc(s, sizeof(limb_t) * b1_len);
+            if (!b1_tab)
+                goto fail;
+            b1_tab[0] = mp_shr_dec(b1_tab + 1, b->tab, b->len, b_shift, 0) *
+                mp_pow_dec[LIMB_DIGITS - b_shift];
+        }
+        b_offset = r_len - (b->len + (d + LIMB_DIGITS - 1) / LIMB_DIGITS);
+        
+        if (is_sub) {
+            carry = mp_sub_dec(r->tab + b_offset, r->tab + b_offset,
+                               b1_tab, b1_len, 0);
+            if (carry != 0) {
+                carry = mp_sub_ui_dec(r->tab + b_offset + b1_len, carry,
+                                      r_len - (b_offset + b1_len));
+                assert(carry == 0);
+            }
+        } else {
+            carry = mp_add_dec(r->tab + b_offset, r->tab + b_offset,
+                               b1_tab, b1_len, 0);
+            if (carry != 0) {
+                carry = mp_add_ui_dec(r->tab + b_offset + b1_len, carry,
+                                      r_len - (b_offset + b1_len));
+            }
+            if (carry != 0) {
+                if (bfdec_resize(r, r_len + 1)) {
+                    if (b_shift != 0)
+                        bf_free(s, b1_tab);
+                    goto fail;
+                }
+                r->tab[r_len] = 1;
+                r->expn += LIMB_DIGITS;
+            }
+        }
+        if (b_shift != 0)
+            bf_free(s, b1_tab);
+    renorm:
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+static int __bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bfdec_add_internal(r, a, b, prec, flags, 0);
+}
+
+static int __bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+                     bf_flags_t flags)
+{
+    return bfdec_add_internal(r, a, b, prec, flags, 1);
+}
+
+int bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_add);
+}
+
+int bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_sub);
+}
+
+int bfdec_mul(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    int ret, r_sign;
+
+    if (a->len < b->len) {
+        const bfdec_t *tmp = a;
+        a = b;
+        b = tmp;
+    }
+    r_sign = a->sign ^ b->sign;
+    /* here b->len <= a->len */
+    if (b->len == 0) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            ret = 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_INF) {
+            if ((a->expn == BF_EXP_INF && b->expn == BF_EXP_ZERO) ||
+                (a->expn == BF_EXP_ZERO && b->expn == BF_EXP_INF)) {
+                bfdec_set_nan(r);
+                ret = BF_ST_INVALID_OP;
+            } else {
+                bfdec_set_inf(r, r_sign);
+                ret = 0;
+            }
+        } else {
+            bfdec_set_zero(r, r_sign);
+            ret = 0;
+        }
+    } else {
+        bfdec_t tmp, *r1 = NULL;
+        limb_t a_len, b_len;
+        limb_t *a_tab, *b_tab;
+            
+        a_len = a->len;
+        b_len = b->len;
+        a_tab = a->tab;
+        b_tab = b->tab;
+        
+        if (r == a || r == b) {
+            bfdec_init(r->ctx, &tmp);
+            r1 = r;
+            r = &tmp;
+        }
+        if (bfdec_resize(r, a_len + b_len)) {
+            bfdec_set_nan(r);
+            ret = BF_ST_MEM_ERROR;
+            goto done;
+        }
+        mp_mul_basecase_dec(r->tab, a_tab, a_len, b_tab, b_len);
+        r->sign = r_sign;
+        r->expn = a->expn + b->expn;
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    done:
+        if (r == &tmp)
+            bfdec_move(r1, &tmp);
+    }
+    return ret;
+}
+
+int bfdec_mul_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags)
+{
+    bfdec_t b;
+    int ret;
+    bfdec_init(r->ctx, &b);
+    ret = bfdec_set_si(&b, b1);
+    ret |= bfdec_mul(r, a, &b, prec, flags);
+    bfdec_delete(&b);
+    return ret;
+}
+
+int bfdec_add_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags)
+{
+    bfdec_t b;
+    int ret;
+    
+    bfdec_init(r->ctx, &b);
+    ret = bfdec_set_si(&b, b1);
+    ret |= bfdec_add(r, a, &b, prec, flags);
+    bfdec_delete(&b);
+    return ret;
+}
+
+static int __bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                       limb_t prec, bf_flags_t flags)
+{
+    int ret, r_sign;
+    limb_t n, nb, precl;
+    
+    r_sign = a->sign ^ b->sign;
+    if (a->expn >= BF_EXP_INF || b->expn >= BF_EXP_INF) {
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF && b->expn == BF_EXP_INF) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else if (a->expn == BF_EXP_INF) {
+            bfdec_set_inf(r, r_sign);
+            return 0;
+        } else {
+            bfdec_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (a->expn == BF_EXP_ZERO) {
+        if (b->expn == BF_EXP_ZERO) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bfdec_set_zero(r, r_sign);
+            return 0;
+        }
+    } else if (b->expn == BF_EXP_ZERO) {
+        bfdec_set_inf(r, r_sign);
+        return BF_ST_DIVIDE_ZERO;
+    }
+
+    nb = b->len;
+    if (prec == BF_PREC_INF) {
+        /* infinite precision: return BF_ST_INVALID_OP if not an exact
+           result */
+        /* XXX: check */
+        precl = nb + 1;
+    } else if (flags & BF_FLAG_RADPNT_PREC) {
+        /* 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;
+    } else {
+        /* number of limbs of the quotient (2 extra digits for rounding) */
+         precl = (prec + 2 + LIMB_DIGITS - 1) / LIMB_DIGITS;
+    }
+    n = bf_max(a->len, precl);
+    
+    {
+        limb_t *taba, na, i;
+        slimb_t d;
+        
+        na = n + nb;
+        taba = bf_malloc(r->ctx, (na + 1) * sizeof(limb_t));
+        if (!taba)
+            goto fail;
+        d = na - a->len;
+        memset(taba, 0, d * sizeof(limb_t));
+        memcpy(taba + d, a->tab, a->len * sizeof(limb_t));
+        if (bfdec_resize(r, n + 1))
+            goto fail1;
+        if (mp_div_dec(r->ctx, r->tab, taba, na, b->tab, nb)) {
+        fail1:
+            bf_free(r->ctx, taba);
+            goto fail;
+        }
+        /* see if non zero remainder */
+        for(i = 0; i < nb; i++) {
+            if (taba[i] != 0)
+                break;
+        }
+        bf_free(r->ctx, taba);
+        if (i != nb) {
+            if (prec == BF_PREC_INF) {
+                bfdec_set_nan(r);
+                return BF_ST_INVALID_OP;
+            } else {
+                r->tab[0] |= 1;
+            }
+        }
+        r->expn = a->expn - b->expn + LIMB_DIGITS;
+        r->sign = r_sign;
+        ret = bfdec_normalize_and_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+int bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags)
+{
+    return bf_op2((bf_t *)r, (bf_t *)a, (bf_t *)b, prec, flags,
+                  (bf_op2_func_t *)__bfdec_div);
+}
+
+/* a and b must be finite numbers with a >= 0 and b > 0. 'q' is the
+   integer defined as floor(a/b) and r = a - q * b. */
+static void bfdec_tdivremu(bf_context_t *s, bfdec_t *q, bfdec_t *r,
+                           const bfdec_t *a, const bfdec_t *b)
+{
+    if (bfdec_cmpu(a, b) < 0) {
+        bfdec_set_ui(q, 0);
+        bfdec_set(r, a);
+    } else {
+        bfdec_div(q, a, b, 0, BF_RNDZ | BF_FLAG_RADPNT_PREC);
+        bfdec_mul(r, q, b, BF_PREC_INF, BF_RNDZ);
+        bfdec_sub(r, a, r, BF_PREC_INF, BF_RNDZ);
+    }
+}
+
+/* division and remainder. 
+   
+   rnd_mode is the rounding mode for the quotient. The additional
+   rounding mode BF_RND_EUCLIDIAN is supported.
+
+   'q' is an integer. 'r' is rounded with prec and flags (prec can be
+   BF_PREC_INF).
+*/
+int bfdec_divrem(bfdec_t *q, bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                 limb_t prec, bf_flags_t flags, int rnd_mode)
+{
+    bf_context_t *s = q->ctx;
+    bfdec_t a1_s, *a1 = &a1_s;
+    bfdec_t b1_s, *b1 = &b1_s;
+    bfdec_t r1_s, *r1 = &r1_s;
+    int q_sign, res;
+    BOOL is_ceil, is_rndn;
+    
+    assert(q != a && q != b);
+    assert(r != a && r != b);
+    assert(q != r);
+    
+    if (a->len == 0 || b->len == 0) {
+        bfdec_set_zero(q, 0);
+        if (a->expn == BF_EXP_NAN || b->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+            return 0;
+        } else if (a->expn == BF_EXP_INF || b->expn == BF_EXP_ZERO) {
+            bfdec_set_nan(r);
+            return BF_ST_INVALID_OP;
+        } else {
+            bfdec_set(r, a);
+            return bfdec_round(r, prec, flags);
+        }
+    }
+
+    q_sign = a->sign ^ b->sign;
+    is_rndn = (rnd_mode == BF_RNDN || rnd_mode == BF_RNDNA ||
+               rnd_mode == BF_RNDNU);
+    switch(rnd_mode) {
+    default:
+    case BF_RNDZ:
+    case BF_RNDN:
+    case BF_RNDNA:
+        is_ceil = FALSE;
+        break;
+    case BF_RNDD:
+        is_ceil = q_sign;
+        break;
+    case BF_RNDU:
+        is_ceil = q_sign ^ 1;
+        break;
+    case BF_DIVREM_EUCLIDIAN:
+        is_ceil = a->sign;
+        break;
+    case BF_RNDNU:
+        /* XXX: unsupported yet */
+        abort();
+    }
+
+    a1->expn = a->expn;
+    a1->tab = a->tab;
+    a1->len = a->len;
+    a1->sign = 0;
+    
+    b1->expn = b->expn;
+    b1->tab = b->tab;
+    b1->len = b->len;
+    b1->sign = 0;
+
+    //    bfdec_print_str("a1", a1);
+    //    bfdec_print_str("b1", b1);
+    /* XXX: could improve to avoid having a large 'q' */
+    bfdec_tdivremu(s, q, r, a1, b1);
+    if (bfdec_is_nan(q) || bfdec_is_nan(r))
+        goto fail;
+    //    bfdec_print_str("q", q);
+    //    bfdec_print_str("r", r);
+    
+    if (r->len != 0) {
+        if (is_rndn) {
+            bfdec_init(s, r1);
+            if (bfdec_set(r1, r))
+                goto fail;
+            if (bfdec_mul_si(r1, r1, 2, BF_PREC_INF, BF_RNDZ)) {
+                bfdec_delete(r1);
+                goto fail;
+            }
+            res = bfdec_cmpu(r1, b);
+            bfdec_delete(r1);
+            if (res > 0 ||
+                (res == 0 &&
+                 (rnd_mode == BF_RNDNA ||
+                  (get_digit(q->tab, q->len, q->len * LIMB_DIGITS - q->expn) & 1) != 0))) {
+                goto do_sub_r;
+            }
+        } else if (is_ceil) {
+        do_sub_r:
+            res = bfdec_add_si(q, q, 1, BF_PREC_INF, BF_RNDZ);
+            res |= bfdec_sub(r, r, b1, BF_PREC_INF, BF_RNDZ);
+            if (res & BF_ST_MEM_ERROR)
+                goto fail;
+        }
+    }
+
+    r->sign ^= a->sign;
+    q->sign = q_sign;
+    return bfdec_round(r, prec, flags);
+ fail:
+    bfdec_set_nan(q);
+    bfdec_set_nan(r);
+    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)
+{
+    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);
+    bfdec_delete(q);
+    return ret;
+}
+
+/* convert to integer (infinite precision) */
+int bfdec_rint(bfdec_t *r, int rnd_mode)
+{
+    return bfdec_round(r, 0, rnd_mode | BF_FLAG_RADPNT_PREC);
+}
+
+int bfdec_sqrt(bfdec_t *r, const bfdec_t *a, limb_t prec, bf_flags_t flags)
+{
+    bf_context_t *s = a->ctx;
+    int ret, k;
+    limb_t *a1, v;
+    slimb_t n, n1;
+    limb_t res;
+
+    assert(r != a);
+
+    if (a->len == 0) {
+        if (a->expn == BF_EXP_NAN) {
+            bfdec_set_nan(r);
+        } else if (a->expn == BF_EXP_INF && a->sign) {
+            goto invalid_op;
+        } else {
+            bfdec_set(r, a);
+        }
+        ret = 0;
+    } else if (a->sign || prec == BF_PREC_INF) {
+ invalid_op:
+        bfdec_set_nan(r);
+        ret = BF_ST_INVALID_OP;
+    } else {
+        /* convert the mantissa to an integer with at least 2 *
+           prec + 4 digits */
+        n = (2 * (prec + 2) + 2 * LIMB_DIGITS - 1) / (2 * LIMB_DIGITS);
+        if (bfdec_resize(r, n))
+            goto fail;
+        a1 = bf_malloc(s, sizeof(limb_t) * 2 * n);
+        if (!a1)
+            goto fail;
+        n1 = bf_min(2 * n, a->len);
+        memset(a1, 0, (2 * n - n1) * sizeof(limb_t));
+        memcpy(a1 + 2 * n - n1, a->tab + a->len - n1, n1 * sizeof(limb_t));
+        if (a->expn & 1) {
+            res = mp_shr_dec(a1, a1, 2 * n, 1, 0);
+        } else {
+            res = 0;
+        }
+        /* normalize so that a1 >= B^(2*n)/4. Not need for n = 1
+           because mp_sqrtrem2_dec already does it */
+        k = 0;
+        if (n > 1) {
+            v = a1[2 * n - 1];
+            while (v < BF_DEC_BASE / 4) {
+                k++;
+                v *= 4;
+            }
+            if (k != 0)
+                mp_mul1_dec(a1, a1, 2 * n, 1 << (2 * k), 0);
+        }
+        if (mp_sqrtrem_dec(s, r->tab, a1, n)) {
+            bf_free(s, a1);
+            goto fail;
+        }
+        if (k != 0)
+            mp_div1_dec(r->tab, r->tab, n, 1 << k, 0);
+        if (!res) {
+            res = mp_scan_nz(a1, n + 1);
+        }
+        bf_free(s, a1);
+        if (!res) {
+            res = mp_scan_nz(a->tab, a->len - n1);
+        }
+        if (res != 0)
+            r->tab[0] |= 1;
+        r->sign = 0;
+        r->expn = (a->expn + 1) >> 1;
+        ret = bfdec_round(r, prec, flags);
+    }
+    return ret;
+ fail:
+    bfdec_set_nan(r);
+    return BF_ST_MEM_ERROR;
+}
+
+/* The rounding mode is always BF_RNDZ. Return BF_ST_OVERFLOW if there
+   is an overflow and 0 otherwise. No memory error is possible. */
+int bfdec_get_int32(int *pres, const bfdec_t *a)
+{
+    uint32_t v;
+    int ret;
+    if (a->expn >= BF_EXP_INF) {
+        ret = 0;
+        if (a->expn == BF_EXP_INF) {
+            v = (uint32_t)INT32_MAX + a->sign;
+             /* XXX: return overflow ? */
+        } else {
+            v = INT32_MAX;
+        }
+    } else if (a->expn <= 0) {
+        v = 0;
+        ret = 0;
+    } else if (a->expn <= 9) {
+        v = fast_udiv(a->tab[a->len - 1], &mp_pow_div[LIMB_DIGITS - a->expn]);
+        if (a->sign)
+            v = -v;
+        ret = 0;
+    } else if (a->expn == 10) {
+        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]);
+#else
+        v1 = (uint64_t)a->tab[a->len - 1] * 10 +
+            get_digit(a->tab, a->len, (a->len - 1) * LIMB_DIGITS - 1);
+#endif
+        v_max = (uint32_t)INT32_MAX + a->sign;
+        if (v1 > v_max) {
+            v = v_max;
+            ret = BF_ST_OVERFLOW;
+        } else {
+            v = v1;
+            if (a->sign)
+                v = -v;
+            ret = 0;
+        }
+    } else {
+        v = (uint32_t)INT32_MAX + a->sign;
+        ret = BF_ST_OVERFLOW;
+    }
+    *pres = v;
+    return ret;
+}
+
+/* power to an integer with infinite precision */
+int bfdec_pow_ui(bfdec_t *r, const bfdec_t *a, limb_t b)
+{
+    int ret, n_bits, i;
+    
+    assert(r != a);
+    if (b == 0)
+        return bfdec_set_ui(r, 1);
+    ret = bfdec_set(r, a);
+    n_bits = LIMB_BITS - clz(b);
+    for(i = n_bits - 2; i >= 0; i--) {
+        ret |= bfdec_mul(r, r, r, BF_PREC_INF, BF_RNDZ);
+        if ((b >> i) & 1)
+            ret |= bfdec_mul(r, r, a, BF_PREC_INF, BF_RNDZ);
+    }
+    return ret;
+}
+
+char *bfdec_ftoa(size_t *plen, const bfdec_t *a, limb_t prec, bf_flags_t flags)
+{
+    return bf_ftoa_internal(plen, (const bf_t *)a, 10, prec, flags, TRUE);
+}
+
+int bfdec_atof(bfdec_t *r, const char *str, const char **pnext,
+               limb_t prec, bf_flags_t flags)
+{
+    slimb_t dummy_exp;
+    return bf_atof_internal((bf_t *)r, &dummy_exp, str, pnext, 10, prec,
+                            flags, TRUE);
+}
+
+#endif /* USE_BF_DEC */
+
+#ifdef USE_FFT_MUL
+/***************************************************************/
+/* Integer multiplication with FFT */
+
+/* or LIMB_BITS at bit position 'pos' in tab */
+static inline void put_bits(limb_t *tab, limb_t len, slimb_t pos, limb_t val)
+{
+    limb_t i;
+    int p;
+
+    i = pos >> LIMB_LOG2_BITS;
+    p = pos & (LIMB_BITS - 1);
+    if (i < len)
+        tab[i] |= val << p;
+    if (p != 0) {
+        i++;
+        if (i < len) {
+            tab[i] |= val >> (LIMB_BITS - p);
+        }
+    }
+}
+
+#if defined(__AVX2__)
+
+typedef double NTTLimb;
+
+/* we must have: modulo >= 1 << NTT_MOD_LOG2_MIN */
+#define NTT_MOD_LOG2_MIN 50
+#define NTT_MOD_LOG2_MAX 51
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 39
+static const int ntt_int_bits[NB_MODS] = { 254, 203, 152, 101, 50, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x00073a8000000001, 0x0007858000000001, 0x0007a38000000001, 0x0007a68000000001, 0x0007fd8000000001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x00056198d44332c8, 0x0002eb5d640aad39, 0x00047e31eaa35fd0, 0x0005271ac118a150, 0x00075e0ce8442bd5, },
+    { 0x000461169761bcc5, 0x0002dac3cb2da688, 0x0004abc97751e3bf, 0x000656778fc8c485, 0x0000dc6469c269fa, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x00020e4da740da8e, 0x0004c3dc09c09c1d, 0x000063bd097b4271, 0x000799d8f18f18fd,
+ 0x0005384222222264, 0x000572b07c1f07fe, 0x00035cd08888889a,
+ 0x00066015555557e3, 0x000725960b60b623,
+ 0x0002fc1fa1d6ce12,
+};
+
+#else
+
+typedef limb_t NTTLimb;
+
+#if LIMB_BITS == 64
+
+#define NTT_MOD_LOG2_MIN 61
+#define NTT_MOD_LOG2_MAX 62
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 51
+static const int ntt_int_bits[NB_MODS] = { 307, 246, 185, 123, 61, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x28d8000000000001, 0x2a88000000000001, 0x2ed8000000000001, 0x3508000000000001, 0x3aa8000000000001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x1b8ea61034a2bea7, 0x21a9762de58206fb, 0x02ca782f0756a8ea, 0x278384537a3e50a1, 0x106e13fee74ce0ab, },
+    { 0x233513af133e13b8, 0x1d13140d1c6f75f1, 0x12cde57f97e3eeda, 0x0d6149e23cbe654f, 0x36cd204f522a1379, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x08a9ed097b425eea, 0x18a44aaaaaaaaab3, 0x2493f57f57f57f5d, 0x126b8d0649a7f8d4,
+ 0x09d80ed7303b5ccc, 0x25b8bcf3cf3cf3d5, 0x2ce6ce63398ce638,
+ 0x0e31fad40a57eb59, 0x02a3529fd4a7f52f,
+ 0x3a5493e93e93e94a,
+};
+
+#elif LIMB_BITS == 32
+
+/* we must have: modulo >= 1 << NTT_MOD_LOG2_MIN */
+#define NTT_MOD_LOG2_MIN 29
+#define NTT_MOD_LOG2_MAX 30
+#define NB_MODS 5
+#define NTT_PROOT_2EXP 20
+static const int ntt_int_bits[NB_MODS] = { 148, 119, 89, 59, 29, };
+
+static const limb_t ntt_mods[NB_MODS] = { 0x0000000032b00001, 0x0000000033700001, 0x0000000036d00001, 0x0000000037300001, 0x000000003e500001,
+};
+
+static const limb_t ntt_proot[2][NB_MODS] = {
+    { 0x0000000032525f31, 0x0000000005eb3b37, 0x00000000246eda9f, 0x0000000035f25901, 0x00000000022f5768, },
+    { 0x00000000051eba1a, 0x00000000107be10e, 0x000000001cd574e0, 0x00000000053806e6, 0x000000002cd6bf98, },
+};
+
+static const limb_t ntt_mods_cr[NB_MODS * (NB_MODS - 1) / 2] = {
+ 0x000000000449559a, 0x000000001eba6ca9, 0x000000002ec18e46, 0x000000000860160b,
+ 0x000000000d321307, 0x000000000bf51120, 0x000000000f662938,
+ 0x000000000932ab3e, 0x000000002f40eef8,
+ 0x000000002e760905,
+};
+
+#endif /* LIMB_BITS */
+
+#endif /* !AVX2 */
+
+#if defined(__AVX2__)
+#define NTT_TRIG_K_MAX 18
+#else
+#define NTT_TRIG_K_MAX 19
+#endif
+
+typedef struct BFNTTState {
+    bf_context_t *ctx;
+    
+    /* used for mul_mod_fast() */
+    limb_t ntt_mods_div[NB_MODS];
+
+    limb_t ntt_proot_pow[NB_MODS][2][NTT_PROOT_2EXP + 1];
+    limb_t ntt_proot_pow_inv[NB_MODS][2][NTT_PROOT_2EXP + 1];
+    NTTLimb *ntt_trig[NB_MODS][2][NTT_TRIG_K_MAX + 1];
+    /* 1/2^n mod m */
+    limb_t ntt_len_inv[NB_MODS][NTT_PROOT_2EXP + 1][2];
+#if defined(__AVX2__)
+    __m256d ntt_mods_cr_vec[NB_MODS * (NB_MODS - 1) / 2];
+    __m256d ntt_mods_vec[NB_MODS];
+    __m256d ntt_mods_inv_vec[NB_MODS];
+#else
+    limb_t ntt_mods_cr_inv[NB_MODS * (NB_MODS - 1) / 2];
+#endif
+} BFNTTState;
+
+static NTTLimb *get_trig(BFNTTState *s, int k, int inverse, int m_idx);
+
+/* add modulo with up to (LIMB_BITS-1) bit modulo */
+static inline limb_t add_mod(limb_t a, limb_t b, limb_t m)
+{
+    limb_t r;
+    r = a + b;
+    if (r >= m)
+        r -= m;
+    return r;
+}
+
+/* sub modulo with up to LIMB_BITS bit modulo */
+static inline limb_t sub_mod(limb_t a, limb_t b, limb_t m)
+{
+    limb_t r;
+    r = a - b;
+    if (r > a)
+        r += m;
+    return r;
+}
+
+/* return (r0+r1*B) mod m 
+   precondition: 0 <= r0+r1*B < 2^(64+NTT_MOD_LOG2_MIN) 
+*/
+static inline limb_t mod_fast(dlimb_t r, 
+                                limb_t m, limb_t m_inv)
+{
+    limb_t a1, q, t0, r1, r0;
+    
+    a1 = r >> NTT_MOD_LOG2_MIN;
+    
+    q = ((dlimb_t)a1 * m_inv) >> LIMB_BITS;
+    r = r - (dlimb_t)q * m - m * 2;
+    r1 = r >> LIMB_BITS;
+    t0 = (slimb_t)r1 >> 1;
+    r += m & t0;
+    r0 = r;
+    r1 = r >> LIMB_BITS;
+    r0 += m & r1;
+    return r0;
+}
+
+/* faster version using precomputed modulo inverse. 
+   precondition: 0 <= a * b < 2^(64+NTT_MOD_LOG2_MIN) */
+static inline limb_t mul_mod_fast(limb_t a, limb_t b, 
+                                    limb_t m, limb_t m_inv)
+{
+    dlimb_t r;
+    r = (dlimb_t)a * (dlimb_t)b;
+    return mod_fast(r, m, m_inv);
+}
+
+static inline limb_t init_mul_mod_fast(limb_t m)
+{
+    dlimb_t t;
+    assert(m < (limb_t)1 << NTT_MOD_LOG2_MAX);
+    assert(m >= (limb_t)1 << NTT_MOD_LOG2_MIN);
+    t = (dlimb_t)1 << (LIMB_BITS + NTT_MOD_LOG2_MIN);
+    return t / m;
+}
+
+/* Faster version used when the multiplier is constant. 0 <= a < 2^64,
+   0 <= b < m. */
+static inline limb_t mul_mod_fast2(limb_t a, limb_t b, 
+                                     limb_t m, limb_t b_inv)
+{
+    limb_t r, q;
+
+    q = ((dlimb_t)a * (dlimb_t)b_inv) >> LIMB_BITS;
+    r = a * b - q * m;
+    if (r >= m)
+        r -= m;
+    return r;
+}
+
+/* Faster version used when the multiplier is constant. 0 <= a < 2^64,
+   0 <= b < m. Let r = a * b mod m. The return value is 'r' or 'r +
+   m'. */
+static inline limb_t mul_mod_fast3(limb_t a, limb_t b, 
+                                     limb_t m, limb_t b_inv)
+{
+    limb_t r, q;
+
+    q = ((dlimb_t)a * (dlimb_t)b_inv) >> LIMB_BITS;
+    r = a * b - q * m;
+    return r;
+}
+
+static inline limb_t init_mul_mod_fast2(limb_t b, limb_t m)
+{
+    return ((dlimb_t)b << LIMB_BITS) / m;
+}
+
+#ifdef __AVX2__
+
+static inline limb_t ntt_limb_to_int(NTTLimb a, limb_t m)
+{
+    slimb_t v;
+    v = a;
+    if (v < 0)
+        v += m;
+    if (v >= m)
+        v -= m;
+    return v;
+}
+
+static inline NTTLimb int_to_ntt_limb(limb_t a, limb_t m)
+{
+    return (slimb_t)a;
+}
+
+static inline NTTLimb int_to_ntt_limb2(limb_t a, limb_t m)
+{
+    if (a >= (m / 2))
+        a -= m;
+    return (slimb_t)a;
+}
+
+/* return r + m if r < 0 otherwise r. */
+static inline __m256d ntt_mod1(__m256d r, __m256d m)
+{
+    return _mm256_blendv_pd(r, r + m, r);
+}
+
+/* input: abs(r) < 2 * m. Output: abs(r) < m */
+static inline __m256d ntt_mod(__m256d r, __m256d mf, __m256d m2f)
+{
+    return _mm256_blendv_pd(r, r + m2f, r) - mf;
+}
+
+/* input: abs(a*b) < 2 * m^2, output: abs(r) < m */
+static inline __m256d ntt_mul_mod(__m256d a, __m256d b, __m256d mf,
+                                  __m256d m_inv)
+{
+    __m256d r, q, ab1, ab0, qm0, qm1;
+    ab1 = a * b;
+    q = _mm256_round_pd(ab1 * m_inv, 0); /* round to nearest */
+    qm1 = q * mf;
+    qm0 = _mm256_fmsub_pd(q, mf, qm1); /* low part */
+    ab0 = _mm256_fmsub_pd(a, b, ab1); /* low part */
+    r = (ab1 - qm1) + (ab0 - qm0);
+    return r;
+}
+
+static void *bf_aligned_malloc(bf_context_t *s, size_t size, size_t align)
+{
+    void *ptr;
+    void **ptr1;
+    ptr = bf_malloc(s, size + sizeof(void *) + align - 1);
+    if (!ptr)
+        return NULL;
+    ptr1 = (void **)(((uintptr_t)ptr + sizeof(void *) + align - 1) &
+                     ~(align - 1));
+    ptr1[-1] = ptr;
+    return ptr1;
+}
+
+static void bf_aligned_free(bf_context_t *s, void *ptr)
+{
+    if (!ptr)
+        return;
+    bf_free(s, ((void **)ptr)[-1]);
+}
+
+static void *ntt_malloc(BFNTTState *s, size_t size)
+{
+    return bf_aligned_malloc(s->ctx, size, 64);
+}
+
+static void ntt_free(BFNTTState *s, void *ptr)
+{
+    bf_aligned_free(s->ctx, ptr);
+}
+
+static no_inline int ntt_fft(BFNTTState *s,
+                             NTTLimb *out_buf, NTTLimb *in_buf,
+                             NTTLimb *tmp_buf, int fft_len_log2,
+                             int inverse, int m_idx)
+{
+    limb_t nb_blocks, fft_per_block, p, k, n, stride_in, i, j;
+    NTTLimb *tab_in, *tab_out, *tmp, *trig;
+    __m256d m_inv, mf, m2f, c, a0, a1, b0, b1;
+    limb_t m;
+    int l;
+    
+    m = ntt_mods[m_idx];
+    
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+    mf = _mm256_set1_pd(m);
+    m2f = _mm256_set1_pd(m * 2);
+
+    n = (limb_t)1 << fft_len_log2;
+    assert(n >= 8);
+    stride_in = n / 2;
+
+    tab_in = in_buf;
+    tab_out = tmp_buf;
+    trig = get_trig(s, fft_len_log2, inverse, m_idx);
+    if (!trig)
+        return -1;
+    p = 0;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        c = _mm256_load_pd(trig);
+        trig += 4;
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+        a0 = _mm256_permute2f128_pd(b0, b1, 0x20);
+        a1 = _mm256_permute2f128_pd(b0, b1, 0x31);
+        a0 = _mm256_permute4x64_pd(a0, 0xd8);
+        a1 = _mm256_permute4x64_pd(a1, 0xd8);
+        _mm256_store_pd(&tab_out[p], a0);
+        _mm256_store_pd(&tab_out[p + 4], a1);
+        p += 2 * 4;
+    }
+    tmp = tab_in;
+    tab_in = tab_out;
+    tab_out = tmp;
+
+    trig = get_trig(s, fft_len_log2 - 1, inverse, m_idx);
+    if (!trig)
+        return -1;
+    p = 0;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        c = _mm256_setr_pd(trig[0], trig[0], trig[1], trig[1]);
+        trig += 2;
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+        a0 = _mm256_permute2f128_pd(b0, b1, 0x20);
+        a1 = _mm256_permute2f128_pd(b0, b1, 0x31);
+        _mm256_store_pd(&tab_out[p], a0);
+        _mm256_store_pd(&tab_out[p + 4], a1);
+        p += 2 * 4;
+    }
+    tmp = tab_in;
+    tab_in = tab_out;
+    tab_out = tmp;
+    
+    nb_blocks = n / 4;
+    fft_per_block = 4;
+
+    l = fft_len_log2 - 2;
+    while (nb_blocks != 2) {
+        nb_blocks >>= 1;
+        p = 0;
+        k = 0;
+        trig = get_trig(s, l, inverse, m_idx);
+        if (!trig)
+            return -1;
+        for(i = 0; i < nb_blocks; i++) {
+            c = _mm256_set1_pd(trig[0]);
+            trig++;
+            for(j = 0; j < fft_per_block; j += 4) {
+                a0 = _mm256_load_pd(&tab_in[k + j]);
+                a1 = _mm256_load_pd(&tab_in[k + j + stride_in]);
+                b0 = ntt_mod(a0 + a1, mf, m2f);
+                b1 = ntt_mul_mod(a0 - a1, c, mf, m_inv);
+                _mm256_store_pd(&tab_out[p + j], b0);
+                _mm256_store_pd(&tab_out[p + j + fft_per_block], b1);
+            }
+            k += fft_per_block;
+            p += 2 * fft_per_block;
+        }
+        fft_per_block <<= 1;
+        l--;
+        tmp = tab_in;
+        tab_in = tab_out;
+        tab_out = tmp;
+    }
+
+    tab_out = out_buf;
+    for(k = 0; k < stride_in; k += 4) {
+        a0 = _mm256_load_pd(&tab_in[k]);
+        a1 = _mm256_load_pd(&tab_in[k + stride_in]);
+        b0 = ntt_mod(a0 + a1, mf, m2f);
+        b1 = ntt_mod(a0 - a1, mf, m2f);
+        _mm256_store_pd(&tab_out[k], b0);
+        _mm256_store_pd(&tab_out[k + stride_in], b1);
+    }
+    return 0;
+}
+
+static void ntt_vec_mul(BFNTTState *s,
+                        NTTLimb *tab1, NTTLimb *tab2, limb_t fft_len_log2,
+                        int k_tot, int m_idx)
+{
+    limb_t i, c_inv, n, m;
+    __m256d m_inv, mf, a, b, c;
+    
+    m = ntt_mods[m_idx];
+    c_inv = s->ntt_len_inv[m_idx][k_tot][0];
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+    mf = _mm256_set1_pd(m);
+    c = _mm256_set1_pd(int_to_ntt_limb(c_inv, m));
+    n = (limb_t)1 << fft_len_log2;
+    for(i = 0; i < n; i += 4) {
+        a = _mm256_load_pd(&tab1[i]);
+        b = _mm256_load_pd(&tab2[i]);
+        a = ntt_mul_mod(a, b, mf, m_inv);
+        a = ntt_mul_mod(a, c, mf, m_inv);
+        _mm256_store_pd(&tab1[i], a);
+    }
+}
+
+static no_inline void mul_trig(NTTLimb *buf,
+                               limb_t n, limb_t c1, limb_t m, limb_t m_inv1)
+{
+    limb_t i, c2, c3, c4;
+    __m256d c, c_mul, a0, mf, m_inv;
+    assert(n >= 2);
+    
+    mf = _mm256_set1_pd(m);
+    m_inv = _mm256_set1_pd(1.0 / (double)m);
+
+    c2 = mul_mod_fast(c1, c1, m, m_inv1);
+    c3 = mul_mod_fast(c2, c1, m, m_inv1);
+    c4 = mul_mod_fast(c2, c2, m, m_inv1);
+    c = _mm256_setr_pd(1, int_to_ntt_limb(c1, m),
+                       int_to_ntt_limb(c2, m), int_to_ntt_limb(c3, m));
+    c_mul = _mm256_set1_pd(int_to_ntt_limb(c4, m));
+    for(i = 0; i < n; i += 4) {
+        a0 = _mm256_load_pd(&buf[i]);
+        a0 = ntt_mul_mod(a0, c, mf, m_inv);
+        _mm256_store_pd(&buf[i], a0);
+        c = ntt_mul_mod(c, c_mul, mf, m_inv);
+    }
+}
+
+#else
+
+static void *ntt_malloc(BFNTTState *s, size_t size)
+{
+    return bf_malloc(s->ctx, size);
+}
+
+static void ntt_free(BFNTTState *s, void *ptr)
+{
+    bf_free(s->ctx, ptr);
+}
+
+static inline limb_t ntt_limb_to_int(NTTLimb a, limb_t m)
+{
+    if (a >= m)
+        a -= m;
+    return a;
+}
+
+static inline NTTLimb int_to_ntt_limb(slimb_t a, limb_t m)
+{
+    return a;
+}
+
+static no_inline int ntt_fft(BFNTTState *s, NTTLimb *out_buf, NTTLimb *in_buf,
+                             NTTLimb *tmp_buf, int fft_len_log2,
+                             int inverse, int m_idx)
+{
+    limb_t nb_blocks, fft_per_block, p, k, n, stride_in, i, j, m, m2;
+    NTTLimb *tab_in, *tab_out, *tmp, a0, a1, b0, b1, c, *trig, c_inv;
+    int l;
+    
+    m = ntt_mods[m_idx];
+    m2 = 2 * m;
+    n = (limb_t)1 << fft_len_log2;
+    nb_blocks = n;
+    fft_per_block = 1;
+    stride_in = n / 2;
+    tab_in = in_buf;
+    tab_out = tmp_buf;
+    l = fft_len_log2;
+    while (nb_blocks != 2) {
+        nb_blocks >>= 1;
+        p = 0;
+        k = 0;
+        trig = get_trig(s, l, inverse, m_idx);
+        if (!trig)
+            return -1;
+        for(i = 0; i < nb_blocks; i++) {
+            c = trig[0];
+            c_inv = trig[1];
+            trig += 2;
+            for(j = 0; j < fft_per_block; j++) {
+                a0 = tab_in[k + j];
+                a1 = tab_in[k + j + stride_in];
+                b0 = add_mod(a0, a1, m2);
+                b1 = a0 - a1 + m2;
+                b1 = mul_mod_fast3(b1, c, m, c_inv);
+                tab_out[p + j] = b0;
+                tab_out[p + j + fft_per_block] = b1;
+            }
+            k += fft_per_block;
+            p += 2 * fft_per_block;
+        }
+        fft_per_block <<= 1;
+        l--;
+        tmp = tab_in;
+        tab_in = tab_out;
+        tab_out = tmp;
+    }
+    /* no twiddle in last step */
+    tab_out = out_buf; 
+    for(k = 0; k < stride_in; k++) {
+        a0 = tab_in[k];
+        a1 = tab_in[k + stride_in];
+        b0 = add_mod(a0, a1, m2);
+        b1 = sub_mod(a0, a1, m2);
+        tab_out[k] = b0;
+        tab_out[k + stride_in] = b1;
+    }
+    return 0;
+}
+
+static void ntt_vec_mul(BFNTTState *s,
+                        NTTLimb *tab1, NTTLimb *tab2, int fft_len_log2,
+                        int k_tot, int m_idx)
+{
+    limb_t i, norm, norm_inv, a, n, m, m_inv;
+    
+    m = ntt_mods[m_idx];
+    m_inv = s->ntt_mods_div[m_idx];
+    norm = s->ntt_len_inv[m_idx][k_tot][0];
+    norm_inv = s->ntt_len_inv[m_idx][k_tot][1];
+    n = (limb_t)1 << fft_len_log2;
+    for(i = 0; i < n; i++) {
+        a = tab1[i];
+        /* need to reduce the range so that the product is <
+           2^(LIMB_BITS+NTT_MOD_LOG2_MIN) */
+        if (a >= m)
+            a -= m;
+        a = mul_mod_fast(a, tab2[i], m, m_inv);
+        a = mul_mod_fast3(a, norm, m, norm_inv);
+        tab1[i] = a;
+    }
+}
+
+static no_inline void mul_trig(NTTLimb *buf,
+                               limb_t n, limb_t c_mul, limb_t m, limb_t m_inv)
+{
+    limb_t i, c0, c_mul_inv;
+    
+    c0 = 1;
+    c_mul_inv = init_mul_mod_fast2(c_mul, m);
+    for(i = 0; i < n; i++) {
+        buf[i] = mul_mod_fast(buf[i], c0, m, m_inv);
+        c0 = mul_mod_fast2(c0, c_mul, m, c_mul_inv);
+    }
+}
+
+#endif /* !AVX2 */
+
+static no_inline NTTLimb *get_trig(BFNTTState *s,
+                                   int k, int inverse, int m_idx)
+{
+    NTTLimb *tab;
+    limb_t i, n2, c, c_mul, m, c_mul_inv;
+    
+    if (k > NTT_TRIG_K_MAX)
+        return NULL;
+
+    tab = s->ntt_trig[m_idx][inverse][k];
+    if (tab)
+        return tab;
+    n2 = (limb_t)1 << (k - 1);
+    m = ntt_mods[m_idx];
+#ifdef __AVX2__
+    tab = ntt_malloc(s, sizeof(NTTLimb) * n2);
+#else
+    tab = ntt_malloc(s, sizeof(NTTLimb) * n2 * 2);
+#endif
+    if (!tab)
+        return NULL;
+    c = 1;
+    c_mul = s->ntt_proot_pow[m_idx][inverse][k];
+    c_mul_inv = s->ntt_proot_pow_inv[m_idx][inverse][k];
+    for(i = 0; i < n2; i++) {
+#ifdef __AVX2__
+        tab[i] = int_to_ntt_limb2(c, m);
+#else
+        tab[2 * i] = int_to_ntt_limb(c, m);
+        tab[2 * i + 1] = init_mul_mod_fast2(c, m);
+#endif
+        c = mul_mod_fast2(c, c_mul, m, c_mul_inv);
+    }
+    s->ntt_trig[m_idx][inverse][k] = tab;
+    return tab;
+}
+
+void fft_clear_cache(bf_context_t *s1)
+{
+    int m_idx, inverse, k;
+    BFNTTState *s = s1->ntt_state;
+    if (s) {
+        for(m_idx = 0; m_idx < NB_MODS; m_idx++) {
+            for(inverse = 0; inverse < 2; inverse++) {
+                for(k = 0; k < NTT_TRIG_K_MAX + 1; k++) {
+                    if (s->ntt_trig[m_idx][inverse][k]) {
+                        ntt_free(s, s->ntt_trig[m_idx][inverse][k]);
+                        s->ntt_trig[m_idx][inverse][k] = NULL;
+                    }
+                }
+            }
+        }
+#if defined(__AVX2__)
+        bf_aligned_free(s1, s);
+#else
+        bf_free(s1, s);
+#endif
+        s1->ntt_state = NULL;
+    }
+}
+
+#define STRIP_LEN 16
+
+/* dst = buf1, src = buf2 */
+static int ntt_fft_partial(BFNTTState *s, NTTLimb *buf1,
+                           int k1, int k2, limb_t n1, limb_t n2, int inverse,
+                           limb_t m_idx)
+{
+    limb_t i, j, c_mul, c0, m, m_inv, strip_len, l;
+    NTTLimb *buf2, *buf3;
+    
+    buf2 = NULL;
+    buf3 = ntt_malloc(s, sizeof(NTTLimb) * n1);
+    if (!buf3)
+        goto fail;
+    if (k2 == 0) {
+        if (ntt_fft(s, buf1, buf1, buf3, k1, inverse, m_idx))
+            goto fail;
+    } else {
+        strip_len = STRIP_LEN;
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * n1 * strip_len);
+        if (!buf2)
+            goto fail;
+        m = ntt_mods[m_idx];
+        m_inv = s->ntt_mods_div[m_idx];
+        c0 = s->ntt_proot_pow[m_idx][inverse][k1 + k2];
+        c_mul = 1;
+        assert((n2 % strip_len) == 0);
+        for(j = 0; j < n2; j += strip_len) {
+            for(i = 0; i < n1; i++) {
+                for(l = 0; l < strip_len; l++) {
+                    buf2[i + l * n1] = buf1[i * n2 + (j + l)];
+                }
+            }
+            for(l = 0; l < strip_len; l++) {
+                if (inverse)
+                    mul_trig(buf2 + l * n1, n1, c_mul, m, m_inv);
+                if (ntt_fft(s, buf2 + l * n1, buf2 + l * n1, buf3, k1, inverse, m_idx))
+                    goto fail;
+                if (!inverse)
+                    mul_trig(buf2 + l * n1, n1, c_mul, m, m_inv);
+                c_mul = mul_mod_fast(c_mul, c0, m, m_inv);
+            }
+            
+            for(i = 0; i < n1; i++) {
+                for(l = 0; l < strip_len; l++) {
+                    buf1[i * n2 + (j + l)] = buf2[i + l *n1];
+                }
+            }
+        }
+        ntt_free(s, buf2);
+    }
+    ntt_free(s, buf3);
+    return 0;
+ fail:
+    ntt_free(s, buf2);
+    ntt_free(s, buf3);
+    return -1;
+}
+
+
+/* dst = buf1, src = buf2, tmp = buf3 */
+static int ntt_conv(BFNTTState *s, NTTLimb *buf1, NTTLimb *buf2,
+                    int k, int k_tot, limb_t m_idx)
+{
+    limb_t n1, n2, i;
+    int k1, k2;
+    
+    if (k <= NTT_TRIG_K_MAX) {
+        k1 = k;
+    } else {
+        /* recursive split of the FFT */
+        k1 = bf_min(k / 2, NTT_TRIG_K_MAX);
+    }
+    k2 = k - k1;
+    n1 = (limb_t)1 << k1;
+    n2 = (limb_t)1 << k2;
+    
+    if (ntt_fft_partial(s, buf1, k1, k2, n1, n2, 0, m_idx))
+        return -1;
+    if (ntt_fft_partial(s, buf2, k1, k2, n1, n2, 0, m_idx))
+        return -1;
+    if (k2 == 0) {
+        ntt_vec_mul(s, buf1, buf2, k, k_tot, m_idx);
+    } else {
+        for(i = 0; i < n1; i++) {
+            ntt_conv(s, buf1 + i * n2, buf2 + i * n2, k2, k_tot, m_idx);
+        }
+    }
+    if (ntt_fft_partial(s, buf1, k1, k2, n1, n2, 1, m_idx))
+        return -1;
+    return 0;
+}
+
+
+static no_inline void limb_to_ntt(BFNTTState *s,
+                                  NTTLimb *tabr, limb_t fft_len,
+                                  const limb_t *taba, limb_t a_len, int dpl,
+                                  int first_m_idx, int nb_mods)
+{
+    slimb_t i, n;
+    dlimb_t a, b;
+    int j, shift;
+    limb_t base_mask1, a0, a1, a2, r, m, m_inv;
+    
+#if 0
+    for(i = 0; i < a_len; i++) {
+        printf("%" PRId64 ": " FMT_LIMB "\n",
+               (int64_t)i, taba[i]);
+    }
+#endif   
+    memset(tabr, 0, sizeof(NTTLimb) * fft_len * nb_mods);
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n = bf_min(fft_len, (a_len * LIMB_BITS + dpl - 1) / dpl);
+    for(i = 0; i < n; i++) {
+        a0 = get_bits(taba, a_len, i * dpl);
+        if (dpl <= LIMB_BITS) {
+            a0 &= base_mask1;
+            a = a0;
+        } else {
+            a1 = get_bits(taba, a_len, i * dpl + LIMB_BITS);
+            if (dpl <= (LIMB_BITS + NTT_MOD_LOG2_MIN)) {
+                a = a0 | ((dlimb_t)(a1 & base_mask1) << LIMB_BITS);
+            } else {
+                if (dpl > 2 * LIMB_BITS) {
+                    a2 = get_bits(taba, a_len, i * dpl + LIMB_BITS * 2) &
+                        base_mask1;
+                } else {
+                    a1 &= base_mask1;
+                    a2 = 0;
+                }
+                //            printf("a=0x%016lx%016lx%016lx\n", a2, a1, a0);
+                a = (a0 >> (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) |
+                    ((dlimb_t)a1 << (NTT_MOD_LOG2_MAX - NTT_MOD_LOG2_MIN)) |
+                    ((dlimb_t)a2 << (LIMB_BITS + NTT_MOD_LOG2_MAX - NTT_MOD_LOG2_MIN));
+                a0 &= ((limb_t)1 << (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) - 1;
+            }
+        }
+        for(j = 0; j < nb_mods; j++) {
+            m = ntt_mods[first_m_idx + j];
+            m_inv = s->ntt_mods_div[first_m_idx + j];
+            r = mod_fast(a, m, m_inv);
+            if (dpl > (LIMB_BITS + NTT_MOD_LOG2_MIN)) {
+                b = ((dlimb_t)r << (LIMB_BITS - NTT_MOD_LOG2_MAX + NTT_MOD_LOG2_MIN)) | a0;
+                r = mod_fast(b, m, m_inv);
+            }
+            tabr[i + j * fft_len] = int_to_ntt_limb(r, m);
+        }
+    }
+}
+
+#if defined(__AVX2__)
+
+#define VEC_LEN 4
+
+typedef union {
+    __m256d v;
+    double d[4];
+} VecUnion;
+
+static no_inline void ntt_to_limb(BFNTTState *s, limb_t *tabr, limb_t r_len,
+                                  const NTTLimb *buf, int fft_len_log2, int dpl,
+                                  int nb_mods)
+{
+    const limb_t *mods = ntt_mods + NB_MODS - nb_mods;
+    const __m256d *mods_cr_vec, *mf, *m_inv;
+    VecUnion y[NB_MODS];
+    limb_t u[NB_MODS], carry[NB_MODS], fft_len, base_mask1, r;
+    slimb_t i, len, pos;
+    int j, k, l, shift, n_limb1, p;
+    dlimb_t t;
+        
+    j = NB_MODS * (NB_MODS - 1) / 2 - nb_mods * (nb_mods - 1) / 2;
+    mods_cr_vec = s->ntt_mods_cr_vec + j;
+    mf = s->ntt_mods_vec + NB_MODS - nb_mods;
+    m_inv = s->ntt_mods_inv_vec + NB_MODS - nb_mods;
+        
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n_limb1 = ((unsigned)dpl - 1) / LIMB_BITS;
+    for(j = 0; j < NB_MODS; j++) 
+        carry[j] = 0;
+    for(j = 0; j < NB_MODS; j++) 
+        u[j] = 0; /* avoid warnings */
+    memset(tabr, 0, sizeof(limb_t) * r_len);
+    fft_len = (limb_t)1 << fft_len_log2;
+    len = bf_min(fft_len, (r_len * LIMB_BITS + dpl - 1) / dpl);
+    len = (len + VEC_LEN - 1) & ~(VEC_LEN - 1);
+    i = 0;
+    while (i < len) {
+        for(j = 0; j < nb_mods; j++)
+            y[j].v = *(__m256d *)&buf[i + fft_len * j];
+
+        /* Chinese remainder to get mixed radix representation */
+        l = 0;
+        for(j = 0; j < nb_mods - 1; j++) {
+            y[j].v = ntt_mod1(y[j].v, mf[j]);
+            for(k = j + 1; k < nb_mods; k++) {
+                y[k].v = ntt_mul_mod(y[k].v - y[j].v,
+                                     mods_cr_vec[l], mf[k], m_inv[k]);
+                l++;
+            }
+        }
+        y[j].v = ntt_mod1(y[j].v, mf[j]);
+        
+        for(p = 0; p < VEC_LEN; p++) {
+            /* back to normal representation */
+            u[0] = (int64_t)y[nb_mods - 1].d[p];
+            l = 1;
+            for(j = nb_mods - 2; j >= 1; j--) {
+                r = (int64_t)y[j].d[p];
+                for(k = 0; k < l; k++) {
+                    t = (dlimb_t)u[k] * mods[j] + r;
+                    r = t >> LIMB_BITS;
+                    u[k] = t;
+                }
+                u[l] = r;
+                l++;
+            }
+            /* XXX: for nb_mods = 5, l should be 4 */
+            
+            /* last step adds the carry */
+            r = (int64_t)y[0].d[p];
+            for(k = 0; k < l; k++) {
+                t = (dlimb_t)u[k] * mods[j] + r + carry[k];
+                r = t >> LIMB_BITS;
+                u[k] = t;
+            }
+            u[l] = r + carry[l];
+
+#if 0
+            printf("%" PRId64 ": ", i);
+            for(j = nb_mods - 1; j >= 0; j--) {
+                printf(" %019" PRIu64, u[j]);
+            }
+            printf("\n");
+#endif
+            
+            /* write the digits */
+            pos = i * dpl;
+            for(j = 0; j < n_limb1; j++) {
+                put_bits(tabr, r_len, pos, u[j]);
+                pos += LIMB_BITS;
+            }
+            put_bits(tabr, r_len, pos, u[n_limb1] & base_mask1);
+            /* shift by dpl digits and set the carry */
+            if (shift == 0) {
+                for(j = n_limb1 + 1; j < nb_mods; j++)
+                    carry[j - (n_limb1 + 1)] = u[j];
+            } else {
+                for(j = n_limb1; j < nb_mods - 1; j++) {
+                    carry[j - n_limb1] = (u[j] >> shift) |
+                        (u[j + 1] << (LIMB_BITS - shift));
+                }
+                carry[nb_mods - 1 - n_limb1] = u[nb_mods - 1] >> shift;
+            }
+            i++;
+        }
+    }
+}
+#else
+static no_inline void ntt_to_limb(BFNTTState *s, limb_t *tabr, limb_t r_len,
+                                  const NTTLimb *buf, int fft_len_log2, int dpl,
+                                  int nb_mods)
+{
+    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;
+    slimb_t i, len, pos;
+    int j, k, l, shift, n_limb1;
+    dlimb_t t;
+        
+    j = NB_MODS * (NB_MODS - 1) / 2 - nb_mods * (nb_mods - 1) / 2;
+    mods_cr = ntt_mods_cr + j;
+    mods_cr_inv = s->ntt_mods_cr_inv + j;
+
+    shift = dpl & (LIMB_BITS - 1);
+    if (shift == 0)
+        base_mask1 = -1;
+    else
+        base_mask1 = ((limb_t)1 << shift) - 1;
+    n_limb1 = ((unsigned)dpl - 1) / LIMB_BITS;
+    for(j = 0; j < NB_MODS; j++) 
+        carry[j] = 0;
+    for(j = 0; j < NB_MODS; j++) 
+        u[j] = 0; /* avoid warnings */
+    memset(tabr, 0, sizeof(limb_t) * r_len);
+    fft_len = (limb_t)1 << fft_len_log2;
+    len = bf_min(fft_len, (r_len * LIMB_BITS + dpl - 1) / dpl);
+    for(i = 0; i < len; i++) {
+        for(j = 0; j < nb_mods; j++)  {
+            y[j] = ntt_limb_to_int(buf[i + fft_len * j], mods[j]);
+        }
+
+        /* Chinese remainder to get mixed radix representation */
+        l = 0;
+        for(j = 0; j < nb_mods - 1; j++) {
+            for(k = j + 1; k < nb_mods; k++) {
+                limb_t m;
+                m = mods[k];
+                /* Note: there is no overflow in the sub_mod() because
+                   the modulos are sorted by increasing order */
+                y[k] = mul_mod_fast2(y[k] - y[j] + m, 
+                                     mods_cr[l], m, mods_cr_inv[l]);
+                l++;
+            }
+        }
+        
+        /* back to normal representation */
+        u[0] = y[nb_mods - 1];
+        l = 1;
+        for(j = nb_mods - 2; j >= 1; j--) {
+            r = y[j];
+            for(k = 0; k < l; k++) {
+                t = (dlimb_t)u[k] * mods[j] + r;
+                r = t >> LIMB_BITS;
+                u[k] = t;
+            }
+            u[l] = r;
+            l++;
+        }
+        
+        /* last step adds the carry */
+        r = y[0];
+        for(k = 0; k < l; k++) {
+            t = (dlimb_t)u[k] * mods[j] + r + carry[k];
+            r = t >> LIMB_BITS;
+            u[k] = t;
+        }
+        u[l] = r + carry[l];
+
+#if 0
+        printf("%" PRId64 ": ", (int64_t)i);
+        for(j = nb_mods - 1; j >= 0; j--) {
+            printf(" " FMT_LIMB, u[j]);
+        }
+        printf("\n");
+#endif
+        
+        /* write the digits */
+        pos = i * dpl;
+        for(j = 0; j < n_limb1; j++) {
+            put_bits(tabr, r_len, pos, u[j]);
+            pos += LIMB_BITS;
+        }
+        put_bits(tabr, r_len, pos, u[n_limb1] & base_mask1);
+        /* shift by dpl digits and set the carry */
+        if (shift == 0) {
+            for(j = n_limb1 + 1; j < nb_mods; j++)
+                carry[j - (n_limb1 + 1)] = u[j];
+        } else {
+            for(j = n_limb1; j < nb_mods - 1; j++) {
+                carry[j - n_limb1] = (u[j] >> shift) |
+                    (u[j + 1] << (LIMB_BITS - shift));
+            }
+            carry[nb_mods - 1 - n_limb1] = u[nb_mods - 1] >> shift;
+        }
+    }
+}
+#endif
+
+static int ntt_static_init(bf_context_t *s1)
+{
+    BFNTTState *s;
+    int inverse, i, j, k, l;
+    limb_t c, c_inv, c_inv2, m, m_inv;
+
+    if (s1->ntt_state)
+        return 0;
+#if defined(__AVX2__)
+    s = bf_aligned_malloc(s1, sizeof(*s), 64);
+#else
+    s = bf_malloc(s1, sizeof(*s));
+#endif
+    if (!s)
+        return -1;
+    memset(s, 0, sizeof(*s));
+    s1->ntt_state = s;
+    s->ctx = s1;
+    
+    for(j = 0; j < NB_MODS; j++) {
+        m = ntt_mods[j];
+        m_inv = init_mul_mod_fast(m);
+        s->ntt_mods_div[j] = m_inv;
+#if defined(__AVX2__)
+        s->ntt_mods_vec[j] = _mm256_set1_pd(m);
+        s->ntt_mods_inv_vec[j] = _mm256_set1_pd(1.0 / (double)m);
+#endif
+        c_inv2 = (m + 1) / 2; /* 1/2 */
+        c_inv = 1;
+        for(i = 0; i <= NTT_PROOT_2EXP; i++) {
+            s->ntt_len_inv[j][i][0] = c_inv;
+            s->ntt_len_inv[j][i][1] = init_mul_mod_fast2(c_inv, m);
+            c_inv = mul_mod_fast(c_inv, c_inv2, m, m_inv);
+        }
+
+        for(inverse = 0; inverse < 2; inverse++) {
+            c = ntt_proot[inverse][j];
+            for(i = 0; i < NTT_PROOT_2EXP; i++) {
+                s->ntt_proot_pow[j][inverse][NTT_PROOT_2EXP - i] = c;
+                s->ntt_proot_pow_inv[j][inverse][NTT_PROOT_2EXP - i] =
+                    init_mul_mod_fast2(c, m);
+                c = mul_mod_fast(c, c, m, m_inv);
+            }
+        }
+    }
+
+    l = 0;
+    for(j = 0; j < NB_MODS - 1; j++) {
+        for(k = j + 1; k < NB_MODS; k++) {
+#if defined(__AVX2__)
+            s->ntt_mods_cr_vec[l] = _mm256_set1_pd(int_to_ntt_limb2(ntt_mods_cr[l],
+                                                                    ntt_mods[k]));
+#else
+            s->ntt_mods_cr_inv[l] = init_mul_mod_fast2(ntt_mods_cr[l],
+                                                       ntt_mods[k]);
+#endif
+            l++;
+        }
+    }
+    return 0;
+}
+
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len)
+{
+    int dpl, fft_len_log2, n_bits, nb_mods, dpl_found, fft_len_log2_found;
+    int int_bits, nb_mods_found;
+    limb_t cost, min_cost;
+    
+    min_cost = -1;
+    dpl_found = 0;
+    nb_mods_found = 4;
+    fft_len_log2_found = 0;
+    for(nb_mods = 3; nb_mods <= NB_MODS; nb_mods++) {
+        int_bits = ntt_int_bits[NB_MODS - nb_mods];
+        dpl = bf_min((int_bits - 4) / 2,
+                     2 * LIMB_BITS + 2 * NTT_MOD_LOG2_MIN - NTT_MOD_LOG2_MAX);
+        for(;;) {
+            fft_len_log2 = ceil_log2((len * LIMB_BITS + dpl - 1) / dpl);
+            if (fft_len_log2 > NTT_PROOT_2EXP)
+                goto next;
+            n_bits = fft_len_log2 + 2 * dpl;
+            if (n_bits <= int_bits) {
+                cost = ((limb_t)(fft_len_log2 + 1) << fft_len_log2) * nb_mods;
+                //                printf("n=%d dpl=%d: cost=%" PRId64 "\n", nb_mods, dpl, (int64_t)cost);
+                if (cost < min_cost) {
+                    min_cost = cost;
+                    dpl_found = dpl;
+                    nb_mods_found = nb_mods;
+                    fft_len_log2_found = fft_len_log2;
+                }
+                break;
+            }
+            dpl--;
+            if (dpl == 0)
+                break;
+        }
+    next: ;
+    }
+    if (!dpl_found)
+        abort();
+    /* limit dpl if possible to reduce fixed cost of limb/NTT conversion */
+    if (dpl_found > (LIMB_BITS + NTT_MOD_LOG2_MIN) &&
+        ((limb_t)(LIMB_BITS + NTT_MOD_LOG2_MIN) << fft_len_log2_found) >=
+        len * LIMB_BITS) {
+        dpl_found = LIMB_BITS + NTT_MOD_LOG2_MIN;
+    }
+    *pnb_mods = nb_mods_found;
+    *pdpl = dpl_found;
+    return fft_len_log2_found;
+}
+
+/* return 0 if OK, -1 if memory error */
+static no_inline int fft_mul(bf_context_t *s1,
+                             bf_t *res, limb_t *a_tab, limb_t a_len,
+                             limb_t *b_tab, limb_t b_len, int mul_flags)
+{
+    BFNTTState *s;
+    int dpl, fft_len_log2, j, nb_mods, reduced_mem;
+    slimb_t len, fft_len;
+    NTTLimb *buf1, *buf2, *ptr;
+#if defined(USE_MUL_CHECK)
+    limb_t ha, hb, hr, h_ref;
+#endif
+    
+    if (ntt_static_init(s1))
+        return -1;
+    s = s1->ntt_state;
+    
+    /* find the optimal number of digits per limb (dpl) */
+    len = a_len + b_len;
+    fft_len_log2 = bf_get_fft_size(&dpl, &nb_mods, len);
+    fft_len = (uint64_t)1 << fft_len_log2;
+    //    printf("len=%" PRId64 " fft_len_log2=%d dpl=%d\n", len, fft_len_log2, dpl);
+#if defined(USE_MUL_CHECK)
+    ha = mp_mod1(a_tab, a_len, BF_CHKSUM_MOD, 0);
+    hb = mp_mod1(b_tab, b_len, BF_CHKSUM_MOD, 0);
+#endif
+    if ((mul_flags & (FFT_MUL_R_OVERLAP_A | FFT_MUL_R_OVERLAP_B)) == 0) {
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0);
+    } else if (mul_flags & FFT_MUL_R_OVERLAP_B) {
+        limb_t *tmp_tab, tmp_len;
+        /* it is better to free 'b' first */
+        tmp_tab = a_tab;
+        a_tab = b_tab;
+        b_tab = tmp_tab;
+        tmp_len = a_len;
+        a_len = b_len;
+        b_len = tmp_len;
+    }
+    buf1 = ntt_malloc(s, sizeof(NTTLimb) * fft_len * nb_mods);
+    if (!buf1)
+        return -1;
+    limb_to_ntt(s, buf1, fft_len, a_tab, a_len, dpl,
+                NB_MODS - nb_mods, nb_mods);
+    if ((mul_flags & (FFT_MUL_R_OVERLAP_A | FFT_MUL_R_OVERLAP_B)) == 
+        FFT_MUL_R_OVERLAP_A) {
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0);
+    }
+    reduced_mem = (fft_len_log2 >= 14);
+    if (!reduced_mem) {
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * fft_len * nb_mods);
+        if (!buf2)
+            goto fail;
+        limb_to_ntt(s, buf2, fft_len, b_tab, b_len, dpl,
+                    NB_MODS - nb_mods, nb_mods);
+        if (!(mul_flags & FFT_MUL_R_NORESIZE))
+            bf_resize(res, 0); /* in case res == b */
+    } else {
+        buf2 = ntt_malloc(s, sizeof(NTTLimb) * fft_len);
+        if (!buf2)
+            goto fail;
+    }
+    for(j = 0; j < nb_mods; j++) {
+        if (reduced_mem) {
+            limb_to_ntt(s, buf2, fft_len, b_tab, b_len, dpl,
+                        NB_MODS - nb_mods + j, 1);
+            ptr = buf2;
+        } else {
+            ptr = buf2 + fft_len * j;
+        }
+        if (ntt_conv(s, buf1 + fft_len * j, ptr,
+                     fft_len_log2, fft_len_log2, j + NB_MODS - nb_mods))
+            goto fail;
+    }
+    if (!(mul_flags & FFT_MUL_R_NORESIZE))
+        bf_resize(res, 0); /* in case res == b and reduced mem */
+    ntt_free(s, buf2);
+    buf2 = NULL;
+    if (!(mul_flags & FFT_MUL_R_NORESIZE)) {
+        if (bf_resize(res, len))
+            goto fail;
+    }
+    ntt_to_limb(s, res->tab, len, buf1, fft_len_log2, dpl, nb_mods);
+    ntt_free(s, buf1);
+#if defined(USE_MUL_CHECK)
+    hr = mp_mod1(res->tab, len, BF_CHKSUM_MOD, 0);
+    h_ref = mul_mod(ha, hb, BF_CHKSUM_MOD);
+    if (hr != h_ref) {
+        printf("ntt_mul_error: len=%" PRId_LIMB " fft_len_log2=%d dpl=%d nb_mods=%d\n",
+               len, fft_len_log2, dpl, nb_mods);
+        //        printf("ha=0x" FMT_LIMB" hb=0x" FMT_LIMB " hr=0x" FMT_LIMB " expected=0x" FMT_LIMB "\n", ha, hb, hr, h_ref);
+        exit(1);
+    }
+#endif    
+    return 0;
+ fail:
+    ntt_free(s, buf1);
+    ntt_free(s, buf2);
+    return -1;
+}
+
+#else /* USE_FFT_MUL */
+
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len)
+{
+    return 0;
+}
+
+#endif /* !USE_FFT_MUL */

gpac-1.0.0.tar.gz/src/quickjs/libbf.h Added

@@ -0,0 +1,499 @@
+/*
+ * Tiny arbitrary precision floating point library
+ * 
+ * Copyright (c) 2017-2020 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 LIBBF_H
+#define LIBBF_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+#if defined(__x86_64__)
+#define LIMB_LOG2_BITS 6
+#else
+#define LIMB_LOG2_BITS 5
+#endif
+
+#define LIMB_BITS (1 << LIMB_LOG2_BITS)
+
+#if LIMB_BITS == 64
+typedef __int128 int128_t;
+typedef unsigned __int128 uint128_t;
+typedef int64_t slimb_t;
+typedef uint64_t limb_t;
+typedef uint128_t dlimb_t;
+#define EXP_MIN INT64_MIN
+#define EXP_MAX INT64_MAX
+
+#define LIMB_DIGITS 19
+#define BF_DEC_BASE UINT64_C(10000000000000000000)
+
+#else
+
+typedef int32_t slimb_t;
+typedef uint32_t limb_t;
+typedef uint64_t dlimb_t;
+#define EXP_MIN INT32_MIN
+#define EXP_MAX INT32_MAX
+
+#define LIMB_DIGITS 9
+#define BF_DEC_BASE 1000000000U
+
+#endif
+
+/* in bits */
+#define BF_EXP_BITS_MIN 3
+#define BF_EXP_BITS_MAX (LIMB_BITS - 2)
+#define BF_PREC_MIN 2
+#define BF_PREC_MAX (((limb_t)1 << BF_EXP_BITS_MAX) - 2)
+#define BF_PREC_INF (BF_PREC_MAX + 1) /* infinite precision */
+
+#if LIMB_BITS == 64
+#define BF_CHKSUM_MOD (UINT64_C(975620677) * UINT64_C(9795002197))
+#else
+#define BF_CHKSUM_MOD 975620677U
+#endif
+
+#define BF_EXP_ZERO EXP_MIN
+#define BF_EXP_INF (EXP_MAX - 1)
+#define BF_EXP_NAN EXP_MAX
+
+/* +/-zero is represented with expn = BF_EXP_ZERO and len = 0,
+   +/-infinity is represented with expn = BF_EXP_INF and len = 0,
+   NaN is represented with expn = BF_EXP_NAN and len = 0 (sign is ignored)
+ */
+typedef struct {
+    struct bf_context_t *ctx;
+    int sign;
+    slimb_t expn;
+    limb_t len;
+    limb_t *tab;
+} bf_t;
+
+typedef struct {
+    /* must be kept identical to bf_t */
+    struct bf_context_t *ctx;
+    int sign;
+    slimb_t expn;
+    limb_t len;
+    limb_t *tab;
+} bfdec_t;
+
+typedef enum {
+    BF_RNDN, /* round to nearest, ties to even */
+    BF_RNDZ, /* round to zero */
+    BF_RNDD, /* round to -inf */
+    BF_RNDU, /* round to +inf */
+    BF_RNDNA, /* round to nearest, ties away from zero */
+    BF_RNDNU, /* round to nearest, ties to +inf */
+    BF_RNDF, /* faithful rounding (nondeterministic, either RNDD or RNDU,
+                inexact flag is always set)  */
+} bf_rnd_t;
+
+/* allow subnormal numbers. Only available if the number of exponent
+   bits is < BF_EXP_BITS_MAX and prec != BF_PREC_INF. Not supported
+   for decimal floating point numbers. */
+#define BF_FLAG_SUBNORMAL (1 << 3)
+/* 'prec' is the precision after the radix point instead of the whole
+   mantissa. Can only be used with bf_round(), bfdec_round() and
+   bfdev_div(). */
+#define BF_FLAG_RADPNT_PREC (1 << 4)
+
+#define BF_RND_MASK 0x7
+#define BF_EXP_BITS_SHIFT 5
+#define BF_EXP_BITS_MASK 0x3f
+
+/* contains the rounding mode and number of exponents bits */
+typedef uint32_t bf_flags_t;
+
+typedef void *bf_realloc_func_t(void *opaque, void *ptr, size_t size);
+
+typedef struct {
+    bf_t val;
+    limb_t prec;
+} BFConstCache;
+
+typedef struct bf_context_t {
+    void *realloc_opaque;
+    bf_realloc_func_t *realloc_func;
+    BFConstCache log2_cache;
+    BFConstCache pi_cache;
+    struct BFNTTState *ntt_state;
+} bf_context_t;
+
+static inline int bf_get_exp_bits(bf_flags_t flags)
+{
+    return BF_EXP_BITS_MAX - ((flags >> BF_EXP_BITS_SHIFT) & BF_EXP_BITS_MASK);
+}
+
+static inline bf_flags_t bf_set_exp_bits(int n)
+{
+    return (BF_EXP_BITS_MAX - n) << BF_EXP_BITS_SHIFT;
+}
+
+/* returned status */
+#define BF_ST_INVALID_OP  (1 << 0)
+#define BF_ST_DIVIDE_ZERO (1 << 1)
+#define BF_ST_OVERFLOW    (1 << 2)
+#define BF_ST_UNDERFLOW   (1 << 3)
+#define BF_ST_INEXACT     (1 << 4)
+/* indicate that a memory allocation error occured. NaN is returned */
+#define BF_ST_MEM_ERROR   (1 << 5) 
+
+#define BF_RADIX_MAX 36 /* maximum radix for bf_atof() and bf_ftoa() */
+
+static inline slimb_t bf_max(slimb_t a, slimb_t b)
+{
+    if (a > b)
+        return a;
+    else
+        return b;
+}
+
+static inline slimb_t bf_min(slimb_t a, slimb_t b)
+{
+    if (a < b)
+        return a;
+    else
+        return b;
+}
+
+void bf_context_init(bf_context_t *s, bf_realloc_func_t *realloc_func,
+                     void *realloc_opaque);
+void bf_context_end(bf_context_t *s);
+/* free memory allocated for the bf cache data */
+void bf_clear_cache(bf_context_t *s);
+
+static inline void *bf_realloc(bf_context_t *s, void *ptr, size_t size)
+{
+    return s->realloc_func(s->realloc_opaque, ptr, size);
+}
+
+/* 'size' must be != 0 */
+static inline void *bf_malloc(bf_context_t *s, size_t size)
+{
+    return bf_realloc(s, NULL, size);
+}
+
+static inline void bf_free(bf_context_t *s, void *ptr)
+{
+    /* must test ptr otherwise equivalent to malloc(0) */
+    if (ptr)
+        bf_realloc(s, ptr, 0);
+}
+
+void bf_init(bf_context_t *s, bf_t *r);
+
+static inline void bf_delete(bf_t *r)
+{
+    bf_context_t *s = r->ctx;
+    /* we accept to delete a zeroed bf_t structure */
+    if (s && r->tab) {
+        bf_realloc(s, r->tab, 0);
+    }
+}
+
+static inline void bf_neg(bf_t *r)
+{
+    r->sign ^= 1;
+}
+
+static inline int bf_is_finite(const bf_t *a)
+{
+    return (a->expn < BF_EXP_INF);
+}
+
+static inline int bf_is_nan(const bf_t *a)
+{
+    return (a->expn == BF_EXP_NAN);
+}
+
+static inline int bf_is_zero(const bf_t *a)
+{
+    return (a->expn == BF_EXP_ZERO);
+}
+
+static inline void bf_memcpy(bf_t *r, const bf_t *a)
+{
+    *r = *a;
+}
+
+int bf_set_ui(bf_t *r, uint64_t a);
+int bf_set_si(bf_t *r, int64_t a);
+void bf_set_nan(bf_t *r);
+void bf_set_zero(bf_t *r, int is_neg);
+void bf_set_inf(bf_t *r, int is_neg);
+int bf_set(bf_t *r, const bf_t *a);
+void bf_move(bf_t *r, bf_t *a);
+int bf_get_float64(const bf_t *a, double *pres, bf_rnd_t rnd_mode);
+int bf_set_float64(bf_t *a, double d);
+
+int bf_cmpu(const bf_t *a, const bf_t *b);
+int bf_cmp_full(const bf_t *a, const bf_t *b);
+int bf_cmp_eq(const bf_t *a, const bf_t *b);
+int bf_cmp_le(const bf_t *a, const bf_t *b);
+int bf_cmp_lt(const bf_t *a, const bf_t *b);
+int bf_add(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_sub(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_add_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec, bf_flags_t flags);
+int bf_mul(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+int bf_mul_ui(bf_t *r, const bf_t *a, uint64_t b1, limb_t prec, bf_flags_t flags);
+int bf_mul_si(bf_t *r, const bf_t *a, int64_t b1, limb_t prec, 
+              bf_flags_t flags);
+int bf_mul_2exp(bf_t *r, slimb_t e, limb_t prec, bf_flags_t flags);
+int bf_div(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec, bf_flags_t flags);
+#define BF_DIVREM_EUCLIDIAN BF_RNDF
+int bf_divrem(bf_t *q, bf_t *r, const bf_t *a, const bf_t *b,
+              limb_t prec, bf_flags_t flags, int rnd_mode);
+int bf_fmod(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+            bf_flags_t flags);
+int bf_remainder(bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+                 bf_flags_t flags);
+int bf_remquo(slimb_t *pq, bf_t *r, const bf_t *a, const bf_t *b, limb_t prec,
+              bf_flags_t flags);
+/* round to integer with infinite precision */
+int bf_rint(bf_t *r, int rnd_mode);
+int bf_round(bf_t *r, limb_t prec, bf_flags_t flags);
+int bf_sqrtrem(bf_t *r, bf_t *rem1, const bf_t *a);
+int bf_sqrt(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+slimb_t bf_get_exp_min(const bf_t *a);
+int bf_logic_or(bf_t *r, const bf_t *a, const bf_t *b);
+int bf_logic_xor(bf_t *r, const bf_t *a, const bf_t *b);
+int bf_logic_and(bf_t *r, const bf_t *a, const bf_t *b);
+
+/* additional flags for bf_atof */
+/* do not accept hex radix prefix (0x or 0X) if radix = 0 or radix = 16 */
+#define BF_ATOF_NO_HEX       (1 << 16)
+/* accept binary (0b or 0B) or octal (0o or 0O) radix prefix if radix = 0 */
+#define BF_ATOF_BIN_OCT      (1 << 17)
+/* Do not parse NaN or Inf */
+#define BF_ATOF_NO_NAN_INF   (1 << 18)
+/* return the exponent separately */
+#define BF_ATOF_EXPONENT       (1 << 19)
+
+int bf_atof(bf_t *a, const char *str, const char **pnext, int radix,
+            limb_t prec, bf_flags_t flags);
+/* this version accepts prec = BF_PREC_INF and returns the radix
+   exponent */
+int bf_atof2(bf_t *r, slimb_t *pexponent,
+             const char *str, const char **pnext, int radix,
+             limb_t prec, bf_flags_t flags);
+int bf_mul_pow_radix(bf_t *r, const bf_t *T, limb_t radix,
+                     slimb_t expn, limb_t prec, bf_flags_t flags);
+
+
+/* Conversion of floating point number to string. Return a null
+   terminated string or NULL if memory error. *plen contains its
+   length if plen != NULL.  The exponent letter is "e" for base 10,
+   "p" for bases 2, 8, 16 with the binary exponent and "@" for the
+   other bases. */
+
+#define BF_FTOA_FORMAT_MASK (3 << 16)
+
+/* fixed format: prec significant digits rounded with (flags &
+   BF_RND_MASK). Exponential notation is used if too many zeros are
+   needed.*/
+#define BF_FTOA_FORMAT_FIXED (0 << 16)
+/* fractional format: prec digits after the decimal point rounded with
+   (flags & BF_RND_MASK) */
+#define BF_FTOA_FORMAT_FRAC  (1 << 16)
+/* free format: use as many digits as necessary so that bf_atof()
+   return the same number when using precision 'prec', rounding to
+   nearest and the subnormal+exponent configuration of 'flags'. The
+   result is meaningful only if 'a' is already rounded to the wanted
+   precision.
+   
+   Infinite precision (BF_PREC_INF) is supported when the radix is a
+   power of two. */
+#define BF_FTOA_FORMAT_FREE  (2 << 16)
+/* same as BF_FTOA_FORMAT_FREE but uses the minimum number of digits
+   (takes more computation time). */
+#define BF_FTOA_FORMAT_FREE_MIN (3 << 16)
+
+/* force exponential notation for fixed or free format */
+#define BF_FTOA_FORCE_EXP    (1 << 20)
+/* add 0x prefix for base 16, 0o prefix for base 8 or 0b prefix for
+   base 2 if non zero value */
+#define BF_FTOA_ADD_PREFIX   (1 << 21)
+/* return "Infinity" instead of "Inf" and add a "+" for positive
+   exponents */
+#define BF_FTOA_JS_QUIRKS    (1 << 22)
+
+char *bf_ftoa(size_t *plen, const bf_t *a, int radix, limb_t prec,
+              bf_flags_t flags);
+
+/* modulo 2^n instead of saturation. NaN and infinity return 0 */
+#define BF_GET_INT_MOD (1 << 0) 
+int bf_get_int32(int *pres, const bf_t *a, int flags);
+int bf_get_int64(int64_t *pres, const bf_t *a, int flags);
+
+/* the following functions are exported for testing only. */
+void mp_print_str(const char *str, const limb_t *tab, limb_t n);
+void bf_print_str(const char *str, const bf_t *a);
+int bf_resize(bf_t *r, limb_t len);
+int bf_get_fft_size(int *pdpl, int *pnb_mods, limb_t len);
+int bf_normalize_and_round(bf_t *r, limb_t prec1, bf_flags_t flags);
+int bf_can_round(const bf_t *a, slimb_t prec, bf_rnd_t rnd_mode, slimb_t k);
+slimb_t bf_mul_log2_radix(slimb_t a1, unsigned int radix, int is_inv,
+                          int is_ceil1);
+int mp_mul(bf_context_t *s, limb_t *result, 
+           const limb_t *op1, limb_t op1_size, 
+           const limb_t *op2, limb_t op2_size);
+limb_t mp_add(limb_t *res, const limb_t *op1, const limb_t *op2, 
+              limb_t n, limb_t carry);
+limb_t mp_add_ui(limb_t *tab, limb_t b, size_t n);
+int mp_sqrtrem(bf_context_t *s, limb_t *tabs, limb_t *taba, limb_t n);
+int mp_recip(bf_context_t *s, limb_t *tabr, const limb_t *taba, limb_t n);
+limb_t bf_isqrt(limb_t a);
+
+/* transcendental functions */
+int bf_const_log2(bf_t *T, limb_t prec, bf_flags_t flags);
+int bf_const_pi(bf_t *T, limb_t prec, bf_flags_t flags);
+int bf_exp(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_log(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+#define BF_POW_JS_QUICKS (1 << 16)
+int bf_pow(bf_t *r, const bf_t *x, const bf_t *y, limb_t prec, bf_flags_t flags);
+int bf_cos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_sin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_tan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_atan(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_atan2(bf_t *r, const bf_t *y, const bf_t *x,
+             limb_t prec, bf_flags_t flags);
+int bf_asin(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+int bf_acos(bf_t *r, const bf_t *a, limb_t prec, bf_flags_t flags);
+
+/* decimal floating point */
+
+static inline void bfdec_init(bf_context_t *s, bfdec_t *r)
+{
+    bf_init(s, (bf_t *)r);
+}
+static inline void bfdec_delete(bfdec_t *r)
+{
+    bf_delete((bf_t *)r);
+}
+
+static inline void bfdec_neg(bfdec_t *r)
+{
+    r->sign ^= 1;
+}
+
+static inline int bfdec_is_finite(const bfdec_t *a)
+{
+    return (a->expn < BF_EXP_INF);
+}
+
+static inline int bfdec_is_nan(const bfdec_t *a)
+{
+    return (a->expn == BF_EXP_NAN);
+}
+
+static inline int bfdec_is_zero(const bfdec_t *a)
+{
+    return (a->expn == BF_EXP_ZERO);
+}
+
+static inline void bfdec_memcpy(bfdec_t *r, const bfdec_t *a)
+{
+    bf_memcpy((bf_t *)r, (const bf_t *)a);
+}
+
+int bfdec_set_ui(bfdec_t *r, uint64_t a);
+int bfdec_set_si(bfdec_t *r, int64_t a);
+
+static inline void bfdec_set_nan(bfdec_t *r)
+{
+    bf_set_nan((bf_t *)r);
+}
+static inline void bfdec_set_zero(bfdec_t *r, int is_neg)
+{
+    bf_set_zero((bf_t *)r, is_neg);
+}
+static inline void bfdec_set_inf(bfdec_t *r, int is_neg)
+{
+    bf_set_inf((bf_t *)r, is_neg);
+}
+static inline int bfdec_set(bfdec_t *r, const bfdec_t *a)
+{
+    return bf_set((bf_t *)r, (bf_t *)a);
+}
+static inline void bfdec_move(bfdec_t *r, bfdec_t *a)
+{
+    bf_move((bf_t *)r, (bf_t *)a);
+}
+static inline int bfdec_cmpu(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmpu((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_full(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp_full((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_eq(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp_eq((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_le(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp_le((const bf_t *)a, (const bf_t *)b);
+}
+static inline int bfdec_cmp_lt(const bfdec_t *a, const bfdec_t *b)
+{
+    return bf_cmp_lt((const bf_t *)a, (const bf_t *)b);
+}
+
+int bfdec_add(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_sub(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_add_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags);
+int bfdec_mul(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_mul_si(bfdec_t *r, const bfdec_t *a, int64_t b1, limb_t prec,
+                 bf_flags_t flags);
+int bfdec_div(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+              bf_flags_t flags);
+int bfdec_divrem(bfdec_t *q, bfdec_t *r, const bfdec_t *a, const bfdec_t *b,
+                 limb_t prec, bf_flags_t flags, int rnd_mode);
+int bfdec_fmod(bfdec_t *r, const bfdec_t *a, const bfdec_t *b, limb_t prec,
+               bf_flags_t flags);
+int bfdec_rint(bfdec_t *r, int rnd_mode);
+int bfdec_sqrt(bfdec_t *r, const bfdec_t *a, limb_t prec, bf_flags_t flags);
+int bfdec_round(bfdec_t *r, limb_t prec, bf_flags_t flags);
+int bfdec_get_int32(int *pres, const bfdec_t *a);
+int bfdec_pow_ui(bfdec_t *r, const bfdec_t *a, limb_t b);
+
+char *bfdec_ftoa(size_t *plen, const bfdec_t *a, limb_t prec, bf_flags_t flags);
+int bfdec_atof(bfdec_t *r, const char *str, const char **pnext,
+               limb_t prec, bf_flags_t flags);
+
+/* the following functions are exported for testing only. */
+extern limb_t mp_pow_dec[LIMB_DIGITS + 1];
+void bfdec_print_str(const char *str, const bfdec_t *a);
+static inline int bfdec_resize(bfdec_t *r, limb_t len)
+{
+    return bf_resize((bf_t *)r, len);
+}
+int bfdec_normalize_and_round(bfdec_t *r, limb_t prec1, bf_flags_t flags);
+
+#endif /* LIBBF_H */

gpac-1.0.0.tar.gz/src/quickjs/libregexp-opcode.h Added

@@ -0,0 +1,58 @@
+/*
+ * Regular Expression Engine
+ * 
+ * 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.
+ */
+
+#ifdef DEF
+
+DEF(invalid, 1) /* never used */
+DEF(char, 3)
+DEF(char32, 5)
+DEF(dot, 1)
+DEF(any, 1) /* same as dot but match any character including line terminator */
+DEF(line_start, 1)
+DEF(line_end, 1)
+DEF(goto, 5)
+DEF(split_goto_first, 5)
+DEF(split_next_first, 5)
+DEF(match, 1)
+DEF(save_start, 2) /* save start position */
+DEF(save_end, 2) /* save end position, must come after saved_start */
+DEF(save_reset, 3) /* reset save positions */
+DEF(loop, 5) /* decrement the top the stack and goto if != 0 */
+DEF(push_i32, 5) /* push integer on the stack */
+DEF(drop, 1)
+DEF(word_boundary, 1)
+DEF(not_word_boundary, 1)
+DEF(back_reference, 2)
+DEF(backward_back_reference, 2) /* must come after back_reference */
+DEF(range, 3) /* variable length */
+DEF(range32, 3) /* variable length */
+DEF(lookahead, 5)
+DEF(negative_lookahead, 5)
+DEF(push_char_pos, 1) /* push the character position on the stack */
+DEF(bne_char_pos, 5) /* pop one stack element and jump if equal to the character
+ position */
+DEF(prev, 1) /* go to the previous char */
+DEF(simple_greedy_quant, 17)
+
+#endif /* DEF */

gpac-1.0.0.tar.gz/src/quickjs/libregexp.c Added

@@ -0,0 +1,2553 @@
+/*
+ * Regular Expression Engine
+ * 
+ * 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.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+
+#include "cutils.h"
+#include "libregexp.h"
+
+/*
+  TODO:
+
+  - Add full unicode canonicalize rules for character ranges (not
+    really useful but needed for exact "ignorecase" compatibility).
+
+  - Add a lock step execution mode (=linear time execution guaranteed)
+    when the regular expression is "simple" i.e. no backreference nor
+    complicated lookahead. The opcodes are designed for this execution
+    model.
+*/
+
+#if defined(TEST)
+#define DUMP_REOP
+#endif
+
+typedef enum {
+#define DEF(id, size) REOP_ ## id,
+#include "libregexp-opcode.h"
+#undef DEF
+    REOP_COUNT,
+} REOPCodeEnum;
+
+#define CAPTURE_COUNT_MAX 255
+#define STACK_SIZE_MAX 255
+
+/* unicode code points */
+#define CP_LS   0x2028
+#define CP_PS   0x2029
+
+#define TMP_BUF_SIZE 128
+
+typedef struct {
+    DynBuf byte_code;
+    const uint8_t *buf_ptr;
+    const uint8_t *buf_end;
+    const uint8_t *buf_start;
+    int re_flags;
+    BOOL is_utf16;
+    BOOL ignore_case;
+    BOOL dotall;
+    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;
+    DynBuf group_names;
+    union {
+        char error_msg[TMP_BUF_SIZE];
+        char tmp_buf[TMP_BUF_SIZE];
+    } u;
+} REParseState;
+
+typedef struct {
+#ifdef DUMP_REOP
+    const char *name;
+#endif
+    uint8_t size;
+} REOpCode;
+
+static const REOpCode reopcode_info[REOP_COUNT] = {
+#ifdef DUMP_REOP
+#define DEF(id, size) { #id, size },
+#else
+#define DEF(id, size) { size },
+#endif
+#include "libregexp-opcode.h"
+#undef DEF
+};
+
+#define RE_HEADER_FLAGS         0
+#define RE_HEADER_CAPTURE_COUNT 1
+#define RE_HEADER_STACK_SIZE    2
+
+#define RE_HEADER_LEN 7
+
+static inline int is_digit(int c) {
+    return c >= '0' && c <= '9';
+}
+
+/* insert 'len' bytes at position 'pos' */
+static void dbuf_insert(DynBuf *s, int pos, int len)
+{
+    dbuf_realloc(s, s->size + len);
+    memmove(s->buf + pos + len, s->buf + pos, s->size - pos);
+    s->size += len;
+}
+
+/* canonicalize with the specific JS regexp rules */
+static uint32_t lre_canonicalize(uint32_t c, BOOL is_utf16)
+{
+    uint32_t res[LRE_CC_RES_LEN_MAX];
+    int len;
+    if (is_utf16) {
+        if (likely(c < 128)) {
+            if (c >= 'A' && c <= 'Z')
+                c = c - 'A' + 'a';
+        } else {
+            lre_case_conv(res, c, 2);
+            c = res[0];
+        }
+    } else {
+        if (likely(c < 128)) {
+            if (c >= 'a' && c <= 'z')
+                c = c - 'a' + 'A';
+        } else {
+            /* legacy regexp: to upper case if single char >= 128 */
+            len = lre_case_conv(res, c, FALSE);
+            if (len == 1 && res[0] >= 128)
+                c = res[0];
+        }
+    }
+    return c;
+}
+
+static const uint16_t char_range_d[] = {
+    1,
+    0x0030, 0x0039 + 1,
+};
+
+/* code point ranges for Zs,Zl or Zp property */
+static const uint16_t char_range_s[] = {
+    10,
+    0x0009, 0x000D + 1,
+    0x0020, 0x0020 + 1,
+    0x00A0, 0x00A0 + 1,
+    0x1680, 0x1680 + 1,
+    0x2000, 0x200A + 1,
+    /* 2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;; */
+    /* 2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;; */
+    0x2028, 0x2029 + 1,
+    0x202F, 0x202F + 1,
+    0x205F, 0x205F + 1,
+    0x3000, 0x3000 + 1,
+    /* FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;; */
+    0xFEFF, 0xFEFF + 1,
+};
+
+BOOL lre_is_space(int c)
+{
+    int i, n, low, high;
+    n = (countof(char_range_s) - 1) / 2;
+    for(i = 0; i < n; i++) {
+        low = char_range_s[2 * i + 1];
+        if (c < low)
+            return FALSE;
+        high = char_range_s[2 * i + 2];
+        if (c < high)
+            return TRUE;
+    }
+    return FALSE;
+}
+
+uint32_t const lre_id_start_table_ascii[4] = {
+    /* $ A-Z _ a-z */
+    0x00000000, 0x00000010, 0x87FFFFFE, 0x07FFFFFE
+};
+
+uint32_t const lre_id_continue_table_ascii[4] = {
+    /* $ 0-9 A-Z _ a-z */
+    0x00000000, 0x03FF0010, 0x87FFFFFE, 0x07FFFFFE
+};
+
+
+static const uint16_t char_range_w[] = {
+    4,
+    0x0030, 0x0039 + 1,
+    0x0041, 0x005A + 1,
+    0x005F, 0x005F + 1,
+    0x0061, 0x007A + 1,
+};
+
+#define CLASS_RANGE_BASE 0x40000000
+
+typedef enum {
+    CHAR_RANGE_d,
+    CHAR_RANGE_D,
+    CHAR_RANGE_s,
+    CHAR_RANGE_S,
+    CHAR_RANGE_w,
+    CHAR_RANGE_W,
+} CharRangeEnum;
+
+static const uint16_t *char_range_table[] = {
+    char_range_d,
+    char_range_s,
+    char_range_w,
+};
+
+static int cr_init_char_range(REParseState *s, CharRange *cr, uint32_t c)
+{
+    BOOL invert;
+    const uint16_t *c_pt;
+    int len, i;
+    
+    invert = c & 1;
+    c_pt = char_range_table[c >> 1];
+    len = *c_pt++;
+    cr_init(cr, s->mem_opaque, lre_realloc);
+    for(i = 0; i < len * 2; i++) {
+        if (cr_add_point(cr, c_pt[i]))
+            goto fail;
+    }
+    if (invert) {
+        if (cr_invert(cr))
+            goto fail;
+    }
+    return 0;
+ fail:
+    cr_free(cr);
+    return -1;
+}
+
+static int cr_canonicalize(CharRange *cr)
+{
+    CharRange a;
+    uint32_t pt[2];
+    int i, ret;
+
+    cr_init(&a, cr->mem_opaque, lre_realloc);
+    pt[0] = 'a';
+    pt[1] = 'z' + 1;
+    ret = cr_op(&a, cr->points, cr->len, pt, 2, CR_OP_INTER);
+    if (ret)
+        goto fail;
+    /* convert to upper case */
+    /* XXX: the generic unicode case would be much more complicated
+       and not really useful */
+    for(i = 0; i < a.len; i++) {
+        a.points[i] += 'A' - 'a';
+    }
+    /* Note: for simplicity we keep the lower case ranges */
+    ret = cr_union1(cr, a.points, a.len);
+ fail:
+    cr_free(&a);
+    return ret;
+}
+
+#ifdef DUMP_REOP
+static __maybe_unused void lre_dump_bytecode(const uint8_t *buf,
+                                                     int buf_len)
+{
+    int pos, len, opcode, bc_len, re_flags, i;
+    uint32_t val;
+    
+    assert(buf_len >= RE_HEADER_LEN);
+
+    re_flags=  buf[0];
+    bc_len = get_u32(buf + 3);
+    assert(bc_len + RE_HEADER_LEN <= buf_len);
+    printf("flags: 0x%x capture_count=%d stack_size=%d\n",
+           re_flags, buf[1], buf[2]);
+    if (re_flags & LRE_FLAG_NAMED_GROUPS) {
+        const char *p;
+        p = (char *)buf + RE_HEADER_LEN + bc_len;
+        printf("named groups: ");
+        for(i = 1; i < buf[1]; i++) {
+            if (i != 1)
+                printf(",");
+            printf("<%s>", p);
+            p += strlen(p) + 1;
+        }
+        printf("\n");
+        assert(p == (char *)(buf + buf_len));
+    }
+    printf("bytecode_len=%d\n", bc_len);
+
+    buf += RE_HEADER_LEN;
+    pos = 0;
+    while (pos < bc_len) {
+        printf("%5u: ", pos);
+        opcode = buf[pos];
+        len = reopcode_info[opcode].size;
+        if (opcode >= REOP_COUNT) {
+            printf(" invalid opcode=0x%02x\n", opcode);
+            break;
+        }
+        if ((pos + len) > bc_len) {
+            printf(" buffer overflow (opcode=0x%02x)\n", opcode);
+            break;
+        }
+        printf("%s", reopcode_info[opcode].name);
+        switch(opcode) {
+        case REOP_char:
+            val = get_u16(buf + pos + 1);
+            if (val >= ' ' && val <= 126)
+                printf(" '%c'", val);
+            else
+                printf(" 0x%04x", val);
+            break;
+        case REOP_char32:
+            val = get_u32(buf + pos + 1);
+            if (val >= ' ' && val <= 126)
+                printf(" '%c'", val);
+            else
+                printf(" 0x%08x", val);
+            break;
+        case REOP_goto:
+        case REOP_split_goto_first:
+        case REOP_split_next_first:
+        case REOP_loop:
+        case REOP_lookahead:
+        case REOP_negative_lookahead:
+        case REOP_bne_char_pos:
+            val = get_u32(buf + pos + 1);
+            val += (pos + 5);
+            printf(" %u", val);
+            break;
+        case REOP_simple_greedy_quant:
+            printf(" %u %u %u %u",
+                   get_u32(buf + pos + 1) + (pos + 17),
+                   get_u32(buf + pos + 1 + 4),
+                   get_u32(buf + pos + 1 + 8),
+                   get_u32(buf + pos + 1 + 12));
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            printf(" %u", buf[pos + 1]);
+            break;
+        case REOP_save_reset:
+            printf(" %u %u", buf[pos + 1], buf[pos + 2]);
+            break;
+        case REOP_push_i32:
+            val = get_u32(buf + pos + 1);
+            printf(" %d", val);
+            break;
+        case REOP_range:
+            {
+                int n, i;
+                n = get_u16(buf + pos + 1);
+                len += n * 4;
+                for(i = 0; i < n * 2; i++) {
+                    val = get_u16(buf + pos + 3 + i * 2);
+                    printf(" 0x%04x", val);
+                }
+            }
+            break;
+        case REOP_range32:
+            {
+                int n, i;
+                n = get_u16(buf + pos + 1);
+                len += n * 8;
+                for(i = 0; i < n * 2; i++) {
+                    val = get_u32(buf + pos + 3 + i * 4);
+                    printf(" 0x%08x", val);
+                }
+            }
+            break;
+        default:
+            break;
+        }
+        printf("\n");
+        pos += len;
+    }
+}
+#endif
+
+static void re_emit_op(REParseState *s, int op)
+{
+    dbuf_putc(&s->byte_code, op);
+}
+
+/* return the offset of the u32 value */
+static int re_emit_op_u32(REParseState *s, int op, uint32_t val)
+{
+    int pos;
+    dbuf_putc(&s->byte_code, op);
+    pos = s->byte_code.size;
+    dbuf_put_u32(&s->byte_code, val);
+    return pos;
+}
+
+static int re_emit_goto(REParseState *s, int op, uint32_t val)
+{
+    int pos;
+    dbuf_putc(&s->byte_code, op);
+    pos = s->byte_code.size;
+    dbuf_put_u32(&s->byte_code, val - (pos + 4));
+    return pos;
+}
+
+static void re_emit_op_u8(REParseState *s, int op, uint32_t val)
+{
+    dbuf_putc(&s->byte_code, op);
+    dbuf_putc(&s->byte_code, val);
+}
+
+static void re_emit_op_u16(REParseState *s, int op, uint32_t val)
+{
+    dbuf_putc(&s->byte_code, op);
+    dbuf_put_u16(&s->byte_code, val);
+}
+
+#if defined(_MSC_VER)
+static int re_parse_error(REParseState *s, const char *fmt, ...)
+#else
+static int __attribute__((format(printf, 2, 3))) re_parse_error(REParseState *s, const char *fmt, ...)
+#endif
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vsnprintf(s->u.error_msg, sizeof(s->u.error_msg), fmt, ap);
+    va_end(ap);
+    return -1;
+}
+
+/* Return -1 in case of overflow */
+static int parse_digits(const uint8_t **pp)
+{
+    const uint8_t *p;
+    uint64_t v;
+    int c;
+    
+    p = *pp;
+    v = 0;
+    for(;;) {
+        c = *p;
+        if (c < '0' || c > '9')
+            break;
+        v = v * 10 + c - '0';
+        if (v >= INT32_MAX)
+            return -1;
+        p++;
+    }
+    *pp = p;
+    return v;
+}
+
+static int re_parse_expect(REParseState *s, const uint8_t **pp, int c)
+{
+    const uint8_t *p;
+    p = *pp;
+    if (*p != c)
+        return re_parse_error(s, "expecting '%c'", c);
+    p++;
+    *pp = p;
+    return 0;
+}
+
+/* Parse an escape sequence, *pp points after the '\':
+   allow_utf16 value:
+   0 : no UTF-16 escapes allowed
+   1 : UTF-16 escapes allowed
+   2 : UTF-16 escapes allowed and escapes of surrogate pairs are
+   converted to a unicode character (unicode regexp case).
+
+   Return the unicode char and update *pp if recognized,
+   return -1 if malformed escape,
+   return -2 otherwise. */
+int lre_parse_escape(const uint8_t **pp, int allow_utf16)
+{
+    const uint8_t *p;
+    uint32_t c;
+
+    p = *pp;
+    c = *p++;
+    switch(c) {
+    case 'b':
+        c = '\b';
+        break;
+    case 'f':
+        c = '\f';
+        break;
+    case 'n':
+        c = '\n';
+        break;
+    case 'r':
+        c = '\r';
+        break;
+    case 't':
+        c = '\t';
+        break;
+    case 'v':
+        c = '\v';
+        break;
+    case 'x':
+    case 'u':
+        {
+            int h, n, i;
+            uint32_t c1;
+            
+            if (*p == '{' && allow_utf16) {
+                p++;
+                c = 0;
+                for(;;) {
+                    h = from_hex(*p++);
+                    if (h < 0)
+                        return -1;
+                    c = (c << 4) | h;
+                    if (c > 0x10FFFF)
+                        return -1;
+                    if (*p == '}')
+                        break;
+                }
+                p++;
+            } else {
+                if (c == 'x') {
+                    n = 2;
+                } else {
+                    n = 4;
+                }
+
+                c = 0;
+                for(i = 0; i < n; i++) {
+                    h = from_hex(*p++);
+                    if (h < 0) {
+                        return -1;
+                    }
+                    c = (c << 4) | h;
+                }
+                if (c >= 0xd800 && c < 0xdc00 &&
+                    allow_utf16 == 2 && p[0] == '\\' && p[1] == 'u') {
+                    /* convert an escaped surrogate pair into a
+                       unicode char */
+                    c1 = 0;
+                    for(i = 0; i < 4; i++) {
+                        h = from_hex(p[2 + i]);
+                        if (h < 0)
+                            break;
+                        c1 = (c1 << 4) | h;
+                    }
+                    if (i == 4 && c1 >= 0xdc00 && c1 < 0xe000) {
+                        p += 6;
+                        c = (((c & 0x3ff) << 10) | (c1 & 0x3ff)) + 0x10000;
+                    }
+                }
+            }
+        }
+        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
+        c -= '0';
+        if (allow_utf16 == 2) {
+            /* only accept \0 not followed by digit */
+            if (c != 0 || is_digit(*p))
+                return -1;
+        } else {
+            /* parse a legacy octal sequence */
+            uint32_t v;
+            v = *p - '0';
+            if (v > 7)
+                break;
+            c = (c << 3) | v;
+            p++;
+            if (c >= 32)
+                break;
+            v = *p - '0';
+            if (v > 7)
+                break;
+            c = (c << 3) | v;
+            p++;
+        }
+        break;
+    default:
+        return -2;
+    }
+    *pp = p;
+    return c;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+/* XXX: we use the same chars for name and value */
+static BOOL is_unicode_char(int c)
+{
+    return ((c >= '0' && c <= '9') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c >= 'a' && c <= 'z') ||
+            (c == '_'));
+}
+
+static int parse_unicode_property(REParseState *s, CharRange *cr,
+                                  const uint8_t **pp, BOOL is_inv)
+{
+    const uint8_t *p;
+    char name[64], value[64];
+    char *q;
+    BOOL script_ext;
+    int ret;
+
+    p = *pp;
+    if (*p != '{')
+        return re_parse_error(s, "expecting '{' after \\p");
+    p++;
+    q = name;
+    while (is_unicode_char(*p)) {
+        if ((q - name) > sizeof(name) - 1)
+            goto unknown_property_name;
+        *q++ = *p++;
+    }
+    *q = '\0';
+    q = value;
+    if (*p == '=') {
+        p++;
+        while (is_unicode_char(*p)) {
+            if ((q - value) > sizeof(value) - 1)
+                return re_parse_error(s, "unknown unicode property value");
+            *q++ = *p++;
+        }
+    }
+    *q = '\0';
+    if (*p != '}')
+        return re_parse_error(s, "expecting '}'");
+    p++;
+    //    printf("name=%s value=%s\n", name, value);
+
+    if (!strcmp(name, "Script") || !strcmp(name, "sc")) {
+        script_ext = FALSE;
+        goto do_script;
+    } else if (!strcmp(name, "Script_Extensions") || !strcmp(name, "scx")) {
+        script_ext = TRUE;
+    do_script:
+        cr_init(cr, s->mem_opaque, lre_realloc);
+        ret = unicode_script(cr, value, script_ext);
+        if (ret) {
+            cr_free(cr);
+            if (ret == -2)
+                return re_parse_error(s, "unknown unicode script");
+            else
+                goto out_of_memory;
+        }
+    } else if (!strcmp(name, "General_Category") || !strcmp(name, "gc")) {
+        cr_init(cr, s->mem_opaque, lre_realloc);
+        ret = unicode_general_category(cr, value);
+        if (ret) {
+            cr_free(cr);
+            if (ret == -2)
+                return re_parse_error(s, "unknown unicode general category");
+            else
+                goto out_of_memory;
+        }
+    } else if (value[0] == '\0') {
+        cr_init(cr, s->mem_opaque, lre_realloc);
+        ret = unicode_general_category(cr, name);
+        if (ret == -1) {
+            cr_free(cr);
+            goto out_of_memory;
+        }
+        if (ret < 0) {
+            ret = unicode_prop(cr, name);
+            if (ret) {
+                cr_free(cr);
+                if (ret == -2)
+                    goto unknown_property_name;
+                else
+                    goto out_of_memory;
+            }
+        }
+    } else {
+    unknown_property_name:
+        return re_parse_error(s, "unknown unicode property name");
+    }
+
+    if (is_inv) {
+        if (cr_invert(cr)) {
+            cr_free(cr);
+            return -1;
+        }
+    }
+    *pp = p;
+    return 0;
+ out_of_memory:
+    return re_parse_error(s, "out of memory");
+}
+#endif /* CONFIG_ALL_UNICODE */
+
+/* return -1 if error otherwise the character or a class range
+   (CLASS_RANGE_BASE). In case of class range, 'cr' is
+   initialized. Otherwise, it is ignored. */
+static int get_class_atom(REParseState *s, CharRange *cr,
+                          const uint8_t **pp, BOOL inclass)
+{
+    const uint8_t *p;
+    uint32_t c;
+    int ret;
+    
+    p = *pp;
+
+    c = *p;
+    switch(c) {
+    case '\\':
+        p++;
+        if (p >= s->buf_end)
+            goto unexpected_end;
+        c = *p++;
+        switch(c) {
+        case 'd':
+            c = CHAR_RANGE_d;
+            goto class_range;
+        case 'D':
+            c = CHAR_RANGE_D;
+            goto class_range;
+        case 's':
+            c = CHAR_RANGE_s;
+            goto class_range;
+        case 'S':
+            c = CHAR_RANGE_S;
+            goto class_range;
+        case 'w':
+            c = CHAR_RANGE_w;
+            goto class_range;
+        case 'W':
+            c = CHAR_RANGE_W;
+        class_range:
+            if (cr_init_char_range(s, cr, c))
+                return -1;
+            c = CLASS_RANGE_BASE;
+            break;
+        case 'c':
+            c = *p;
+            if ((c >= 'a' && c <= 'z') ||
+                (c >= 'A' && c <= 'Z') ||
+                (((c >= '0' && c <= '9') || c == '_') &&
+                 inclass && !s->is_utf16)) {   /* Annex B.1.4 */
+                c &= 0x1f;
+                p++;
+            } else if (s->is_utf16) {
+                goto invalid_escape;
+            } else {
+                /* otherwise return '\' and 'c' */
+                p--;
+                c = '\\';
+            }
+            break;
+#ifdef CONFIG_ALL_UNICODE
+        case 'p':
+        case 'P':
+            if (s->is_utf16) {
+                if (parse_unicode_property(s, cr, &p, (c == 'P')))
+                    return -1;
+                c = CLASS_RANGE_BASE;
+                break;
+            }
+            /* fall thru */
+#endif
+        default:
+            p--;
+            ret = lre_parse_escape(&p, s->is_utf16 * 2);
+            if (ret >= 0) {
+                c = ret;
+            } else {
+                if (ret == -2 && *p != '\0' && strchr("^$\\.*+?()[]{}|/", *p)) {
+                    /* always valid to escape these characters */
+                    goto normal_char;
+                } else if (s->is_utf16) {
+                invalid_escape:
+                    return re_parse_error(s, "invalid escape sequence in regular expression");
+                } else {
+                    /* just ignore the '\' */
+                    goto normal_char;
+                }
+            }
+            break;
+        }
+        break;
+    case '\0':
+        if (p >= s->buf_end) {
+        unexpected_end:
+            return re_parse_error(s, "unexpected end");
+        }
+        /* fall thru */
+    default:
+    normal_char:
+        /* normal char */
+        if (c >= 128) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+            if ((unsigned)c > 0xffff && !s->is_utf16) {
+                /* XXX: should handle non BMP-1 code points */
+                return re_parse_error(s, "malformed unicode char");
+            }
+        } else {
+            p++;
+        }
+        break;
+    }
+    *pp = p;
+    return c;
+}
+
+static int re_emit_range(REParseState *s, const CharRange *cr)
+{
+    int len, i;
+    uint32_t high;
+    
+    len = (unsigned)cr->len / 2;
+    if (len >= 65535)
+        return re_parse_error(s, "too many ranges");
+    if (len == 0) {
+        /* not sure it can really happen. Emit a match that is always
+           false */
+        re_emit_op_u32(s, REOP_char32, -1);
+    } else {
+        high = cr->points[cr->len - 1];
+        if (high == UINT32_MAX)
+            high = cr->points[cr->len - 2];
+        if (high <= 0xffff) {
+            /* can use 16 bit ranges with the conversion that 0xffff =
+               infinity */
+            re_emit_op_u16(s, REOP_range, len);
+            for(i = 0; i < cr->len; i += 2) {
+                dbuf_put_u16(&s->byte_code, cr->points[i]);
+                high = cr->points[i + 1] - 1;
+                if (high == UINT32_MAX - 1)
+                    high = 0xffff;
+                dbuf_put_u16(&s->byte_code, high);
+            }
+        } else {
+            re_emit_op_u16(s, REOP_range32, len);
+            for(i = 0; i < cr->len; i += 2) {
+                dbuf_put_u32(&s->byte_code, cr->points[i]);
+                dbuf_put_u32(&s->byte_code, cr->points[i + 1] - 1);
+            }
+        }
+    }
+    return 0;
+}
+
+static int re_parse_char_class(REParseState *s, const uint8_t **pp)
+{
+    const uint8_t *p;
+    uint32_t c1, c2;
+    CharRange cr_s, *cr = &cr_s;
+    CharRange cr1_s, *cr1 = &cr1_s;
+    BOOL invert;
+    
+    cr_init(cr, s->mem_opaque, lre_realloc);
+    p = *pp;
+    p++;    /* skip '[' */
+    invert = FALSE;
+    if (*p == '^') {
+        p++;
+        invert = TRUE;
+    }
+    for(;;) {
+        if (*p == ']')
+            break;
+        c1 = get_class_atom(s, cr1, &p, TRUE);
+        if ((int)c1 < 0)
+            goto fail;
+        if (*p == '-' && p[1] != ']') {
+            const uint8_t *p0 = p + 1;
+            if (c1 >= CLASS_RANGE_BASE) {
+                if (s->is_utf16) {
+                    cr_free(cr1);
+                    goto invalid_class_range;
+                }
+                /* Annex B: match '-' character */
+                goto class_atom;
+            }
+            c2 = get_class_atom(s, cr1, &p0, TRUE);
+            if ((int)c2 < 0)
+                goto fail;
+            if (c2 >= CLASS_RANGE_BASE) {
+                cr_free(cr1);
+                if (s->is_utf16) {
+                    goto invalid_class_range;
+                }
+                /* Annex B: match '-' character */
+                goto class_atom;
+            }
+            p = p0;
+            if (c2 < c1) {
+            invalid_class_range:
+                re_parse_error(s, "invalid class range");
+                goto fail;
+            }
+            if (cr_union_interval(cr, c1, c2))
+                goto memory_error;
+        } else {
+        class_atom:
+            if (c1 >= CLASS_RANGE_BASE) {
+                int ret;
+                ret = cr_union1(cr, cr1->points, cr1->len);
+                cr_free(cr1);
+                if (ret)
+                    goto memory_error;
+            } else {
+                if (cr_union_interval(cr, c1, c1))
+                    goto memory_error;
+            }
+        }
+    }
+    if (s->ignore_case) {
+        if (cr_canonicalize(cr))
+            goto memory_error;
+    }
+    if (invert) {
+        if (cr_invert(cr))
+            goto memory_error;
+    }
+    if (re_emit_range(s, cr))
+        goto fail;
+    cr_free(cr);
+    p++;    /* skip ']' */
+    *pp = p;
+    return 0;
+ memory_error:
+    re_parse_error(s, "out of memory");
+ fail:
+    cr_free(cr);
+    return -1;
+}
+
+/* Return:
+   1 if the opcodes in bc_buf[] always advance the character pointer.
+   0 if the character pointer may not be advanced.
+   -1 if the code may depend on side effects of its previous execution (backreference)
+*/
+static int re_check_advance(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int pos, opcode, ret, len, i;
+    uint32_t val, last;
+    BOOL has_back_reference;
+    uint8_t capture_bitmap[CAPTURE_COUNT_MAX];
+    
+    ret = -2; /* not known yet */
+    pos = 0;
+    has_back_reference = FALSE;
+    memset(capture_bitmap, 0, sizeof(capture_bitmap));
+    
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        switch(opcode) {
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            goto simple_char;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            goto simple_char;
+        case REOP_char:
+        case REOP_char32:
+        case REOP_dot:
+        case REOP_any:
+        simple_char:
+            if (ret == -2)
+                ret = 1;
+            break;
+        case REOP_line_start:
+        case REOP_line_end:
+        case REOP_push_i32:
+        case REOP_push_char_pos:
+        case REOP_drop:
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+        case REOP_prev:
+            /* no effect */
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+            val = bc_buf[pos + 1];
+            capture_bitmap[val] |= 1;
+            break;
+        case REOP_save_reset:
+            {
+                val = bc_buf[pos + 1];
+                last = bc_buf[pos + 2];
+                while (val < last)
+                    capture_bitmap[val++] |= 1;
+            }
+            break;
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            val = bc_buf[pos + 1];
+            capture_bitmap[val] |= 2;
+            has_back_reference = TRUE;
+            break;
+        default:
+            /* safe behvior: we cannot predict the outcome */
+            if (ret == -2)
+                ret = 0;
+            break;
+        }
+        pos += len;
+    }
+    if (has_back_reference) {
+        /* check if there is back reference which references a capture
+           made in the some code */
+        for(i = 0; i < CAPTURE_COUNT_MAX; i++) {
+            if (capture_bitmap[i] == 3)
+                return -1;
+        }
+    }
+    if (ret == -2)
+        ret = 0;
+    return ret;
+}
+
+/* return -1 if a simple quantifier cannot be used. Otherwise return
+   the number of characters in the atom. */
+static int re_is_simple_quantifier(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int pos, opcode, len, count;
+    uint32_t val;
+    
+    count = 0;
+    pos = 0;
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        switch(opcode) {
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            goto simple_char;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            goto simple_char;
+        case REOP_char:
+        case REOP_char32:
+        case REOP_dot:
+        case REOP_any:
+        simple_char:
+            count++;
+            break;
+        case REOP_line_start:
+        case REOP_line_end:
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+            break;
+        default:
+            return -1;
+        }
+        pos += len;
+    }
+    return count;
+}
+
+/* '*pp' is the first char after '<' */
+static int re_parse_group_name(char *buf, int buf_size,
+                               const uint8_t **pp, BOOL is_utf16)
+{
+    const uint8_t *p;
+    uint32_t c;
+    char *q;
+
+    p = *pp;
+    q = buf;
+    for(;;) {
+        c = *p;
+        if (c == '\\') {
+            p++;
+            if (*p != 'u')
+                return -1;
+            c = lre_parse_escape(&p, is_utf16 * 2);
+        } else if (c == '>') {
+            break;
+        } else if (c >= 128) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p);
+        } else {
+            p++;
+        }
+        if (c > 0x10FFFF)
+            return -1;
+        if (q == buf) {
+            if (!lre_js_is_ident_first(c))
+                return -1;
+        } else {
+            if (!lre_js_is_ident_next(c))
+                return -1;
+        }
+        if ((q - buf + UTF8_CHAR_LEN_MAX + 1) > buf_size)
+            return -1;
+        if (c < 128) {
+            *q++ = c;
+        } else {
+            q += unicode_to_utf8((uint8_t*)q, c);
+        }
+    }
+    if (q == buf)
+        return -1;
+    *q = '\0';
+    p++;
+    *pp = p;
+    return 0;
+}
+
+/* if capture_name = NULL: return the number of captures + 1.
+   Otherwise, return the capture index corresponding to capture_name
+   or -1 if none */
+static int re_parse_captures(REParseState *s, int *phas_named_captures,
+                             const char *capture_name)
+{
+    const uint8_t *p;
+    int capture_index;
+    char name[TMP_BUF_SIZE];
+
+    capture_index = 1;
+    *phas_named_captures = 0;
+    for (p = s->buf_start; p < s->buf_end; p++) {
+        switch (*p) {
+        case '(':
+            if (p[1] == '?') {
+                if (p[2] == '<' && p[3] != '=' && p[3] != '!') {
+                    *phas_named_captures = 1;
+                    /* potential named capture */
+                    if (capture_name) {
+                        p += 3;
+                        if (re_parse_group_name(name, sizeof(name), &p,
+                                                s->is_utf16) == 0) {
+                            if (!strcmp(name, capture_name))
+                                return capture_index;
+                        }
+                    }
+                    capture_index++;
+                }
+            } else {
+                capture_index++;
+            }
+            break;
+        case '\\':
+            p++;
+            break;
+        case '[':
+            for (p += 1 + (*p == ']'); p < s->buf_end && *p != ']'; p++) {
+                if (*p == '\\')
+                    p++;
+            }
+            break;
+        }
+    }
+    if (capture_name)
+        return -1;
+    else
+        return capture_index;
+}
+
+static int re_count_captures(REParseState *s)
+{
+    if (s->total_capture_count < 0) {
+        s->total_capture_count = re_parse_captures(s, &s->has_named_captures,
+                                                   NULL);
+    }
+    return s->total_capture_count;
+}
+
+static BOOL re_has_named_captures(REParseState *s)
+{
+    if (s->has_named_captures < 0)
+        re_count_captures(s);
+    return s->has_named_captures;
+}
+
+static int find_group_name(REParseState *s, const char *name)
+{
+    const char *p, *buf_end;
+    size_t len, name_len;
+    int capture_index;
+    
+    name_len = strlen(name);
+    p = (char *)s->group_names.buf;
+    buf_end = (char *)s->group_names.buf + s->group_names.size;
+    capture_index = 1;
+    while (p < buf_end) {
+        len = strlen(p);
+        if (len == name_len && memcmp(name, p, name_len) == 0)
+            return capture_index;
+        p += len + 1;
+        capture_index++;
+    }
+    return -1;
+}
+
+static int re_parse_disjunction(REParseState *s, BOOL is_backward_dir);
+
+static int re_parse_term(REParseState *s, BOOL is_backward_dir)
+{
+    const uint8_t *p;
+    int c, last_atom_start, quant_min, quant_max, last_capture_count;
+    BOOL greedy, add_zero_advance_check, is_neg, is_backward_lookahead;
+    CharRange cr_s, *cr = &cr_s;
+    
+    last_atom_start = -1;
+    last_capture_count = 0;
+    p = s->buf_ptr;
+    c = *p;
+    switch(c) {
+    case '^':
+        p++;
+        re_emit_op(s, REOP_line_start);
+        break;
+    case '$':
+        p++;
+        re_emit_op(s, REOP_line_end);
+        break;
+    case '.':
+        p++;
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        re_emit_op(s, s->dotall ? REOP_any : REOP_dot);
+        if (is_backward_dir)
+            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;
+            goto parse_class_atom;
+        }
+        /* fall tru */
+    case '*':
+    case '+':
+    case '?':
+        return re_parse_error(s, "nothing to repeat");
+    case '(':
+        if (p[1] == '?') {
+            if (p[2] == ':') {
+                p += 3;
+                last_atom_start = s->byte_code.size;
+                last_capture_count = s->capture_count;
+                s->buf_ptr = p;
+                if (re_parse_disjunction(s, is_backward_dir))
+                    return -1;
+                p = s->buf_ptr;
+                if (re_parse_expect(s, &p, ')'))
+                    return -1;
+            } else if ((p[2] == '=' || p[2] == '!')) {
+                is_neg = (p[2] == '!');
+                is_backward_lookahead = FALSE;
+                p += 3;
+                goto lookahead;
+            } else if (p[2] == '<' &&
+                       (p[3] == '=' || p[3] == '!')) {
+                int pos;
+                is_neg = (p[3] == '!');
+                is_backward_lookahead = TRUE;
+                p += 4;
+                /* lookahead */
+            lookahead:
+                /* Annex B allows lookahead to be used as an atom for
+                   the quantifiers */
+                if (!s->is_utf16 && !is_backward_lookahead)  {
+                    last_atom_start = s->byte_code.size;
+                    last_capture_count = s->capture_count;
+                }
+                pos = re_emit_op_u32(s, REOP_lookahead + is_neg, 0);
+                s->buf_ptr = p;
+                if (re_parse_disjunction(s, is_backward_lookahead))
+                    return -1;
+                p = s->buf_ptr;
+                if (re_parse_expect(s, &p, ')'))
+                    return -1;
+                re_emit_op(s, REOP_match);
+                /* jump after the 'match' after the lookahead is successful */
+                put_u32(s->byte_code.buf + pos, s->byte_code.size - (pos + 4));
+            } else if (p[2] == '<') {
+                p += 3;
+                if (re_parse_group_name(s->u.tmp_buf, sizeof(s->u.tmp_buf),
+                                        &p, s->is_utf16)) {
+                    return re_parse_error(s, "invalid group name");
+                }
+                if (find_group_name(s, s->u.tmp_buf) > 0) {
+                    return re_parse_error(s, "duplicate group name");
+                }
+                /* group name with a trailing zero */
+                dbuf_put(&s->group_names, (uint8_t *)s->u.tmp_buf,
+                         strlen(s->u.tmp_buf) + 1);
+                s->has_named_captures = 1;
+                goto parse_capture;
+            } else {
+                return re_parse_error(s, "invalid group");
+            }
+        } else {
+            int capture_index;
+            p++;
+            /* capture without group name */
+            dbuf_putc(&s->group_names, 0);
+        parse_capture:
+            if (s->capture_count >= CAPTURE_COUNT_MAX)
+                return re_parse_error(s, "too many captures");
+            last_atom_start = s->byte_code.size;
+            last_capture_count = s->capture_count;
+            capture_index = s->capture_count++;
+            re_emit_op_u8(s, REOP_save_start + is_backward_dir,
+                          capture_index);
+            
+            s->buf_ptr = p;
+            if (re_parse_disjunction(s, is_backward_dir))
+                return -1;
+            p = s->buf_ptr;
+            
+            re_emit_op_u8(s, REOP_save_start + 1 - is_backward_dir,
+                          capture_index);
+            
+            if (re_parse_expect(s, &p, ')'))
+                return -1;
+        }
+        break;
+    case '\\':
+        switch(p[1]) {
+        case 'b':
+        case 'B':
+            re_emit_op(s, REOP_word_boundary + (p[1] != 'b'));
+            p += 2;
+            break;
+        case 'k':
+            {
+                const uint8_t *p1;
+                int dummy_res;
+                
+                p1 = p;
+                if (p1[2] != '<') {
+                    /* annex B: we tolerate invalid group names in non
+                       unicode mode if there is no named capture
+                       definition */
+                    if (s->is_utf16 || re_has_named_captures(s))
+                        return re_parse_error(s, "expecting group name");
+                    else
+                        goto parse_class_atom;
+                }
+                p1 += 3;
+                if (re_parse_group_name(s->u.tmp_buf, sizeof(s->u.tmp_buf),
+                                        &p1, s->is_utf16)) {
+                    if (s->is_utf16 || re_has_named_captures(s))
+                        return re_parse_error(s, "invalid group name");
+                    else
+                        goto parse_class_atom;
+                }
+                c = find_group_name(s, s->u.tmp_buf);
+                if (c < 0) {
+                    /* no capture name parsed before, try to look
+                       after (inefficient, but hopefully not common */
+                    c = re_parse_captures(s, &dummy_res, s->u.tmp_buf);
+                    if (c < 0) {
+                        if (s->is_utf16 || re_has_named_captures(s))
+                            return re_parse_error(s, "group name not defined");
+                        else
+                            goto parse_class_atom;
+                    }
+                }
+                p = p1;
+            }
+            goto emit_back_reference;
+        case '0':
+            p += 2;
+            c = 0;
+            if (s->is_utf16) {
+                if (is_digit(*p)) {
+                    return re_parse_error(s, "invalid decimal escape in regular expression");
+                }
+            } else {
+                /* Annex B.1.4: accept legacy octal */
+                if (*p >= '0' && *p <= '7') {
+                    c = *p++ - '0';
+                    if (*p >= '0' && *p <= '7') {
+                        c = (c << 3) + *p++ - '0';
+                    }
+                }
+            }
+            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
+            {
+                const uint8_t *q = ++p;
+                
+                c = parse_digits(&p);
+                if (c < 0 || (c >= s->capture_count && c >= re_count_captures(s))) {
+                    if (!s->is_utf16) {
+                        /* Annex B.1.4: accept legacy octal */
+                        p = q;
+                        if (*p <= '7') {
+                            c = 0;
+                            if (*p <= '3')
+                                c = *p++ - '0';
+                            if (*p >= '0' && *p <= '7') {
+                                c = (c << 3) + *p++ - '0';
+                                if (*p >= '0' && *p <= '7') {
+                                    c = (c << 3) + *p++ - '0';
+                                }
+                            }
+                        } else {
+                            c = *p++;
+                        }
+                        goto normal_char;
+                    }
+                    return re_parse_error(s, "back reference out of range in reguar expression");
+                }
+            emit_back_reference:
+                last_atom_start = s->byte_code.size;
+                last_capture_count = s->capture_count;
+                re_emit_op_u8(s, REOP_back_reference + is_backward_dir, c);
+            }
+            break;
+        default:
+            goto parse_class_atom;
+        }
+        break;
+    case '[':
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        if (re_parse_char_class(s, &p))
+            return -1;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        break;
+    case ']':
+    case '}':
+        if (s->is_utf16)
+            return re_parse_error(s, "syntax error");
+        goto parse_class_atom;
+    default:
+    parse_class_atom:
+        c = get_class_atom(s, cr, &p, FALSE);
+        if ((int)c < 0)
+            return -1;
+    normal_char:
+        last_atom_start = s->byte_code.size;
+        last_capture_count = s->capture_count;
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        if (c >= CLASS_RANGE_BASE) {
+            int ret;
+            /* Note: canonicalization is not needed */
+            ret = re_emit_range(s, cr);
+            cr_free(cr);
+            if (ret)
+                return -1;
+        } else {
+            if (s->ignore_case)
+                c = lre_canonicalize(c, s->is_utf16);
+            if (c <= 0xffff)
+                re_emit_op_u16(s, REOP_char, c);
+            else
+                re_emit_op_u32(s, REOP_char32, c);
+        }
+        if (is_backward_dir)
+            re_emit_op(s, REOP_prev);
+        break;
+    }
+
+    /* quantifier */
+    if (last_atom_start >= 0) {
+        c = *p;
+        switch(c) {
+        case '*':
+            p++;
+            quant_min = 0;
+            quant_max = INT32_MAX;
+            goto quantifier;
+        case '+':
+            p++;
+            quant_min = 1;
+            quant_max = INT32_MAX;
+            goto quantifier;
+        case '?':
+            p++;
+            quant_min = 0;
+            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)
+                        goto invalid_quant_count;
+                } else {
+                    quant_max = INT32_MAX; /* infinity */
+                }
+            }
+            if (re_parse_expect(s, &p, '}'))
+                return -1;
+        quantifier:
+            greedy = TRUE;
+            if (*p == '?') {
+                p++;
+                greedy = FALSE;
+            }
+            if (last_atom_start < 0) {
+                return re_parse_error(s, "nothing to repeat");
+            }
+            if (greedy) {
+                int len, pos;
+                
+                if (quant_max > 0) {
+                    /* specific optimization for simple quantifiers */
+                    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);
+                        pos = last_atom_start;
+                        s->byte_code.buf[pos++] = REOP_simple_greedy_quant;
+                        put_u32(&s->byte_code.buf[pos],
+                                s->byte_code.size - last_atom_start - 17);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], quant_min);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], quant_max);
+                        pos += 4;
+                        put_u32(&s->byte_code.buf[pos], len);
+                        pos += 4;
+                        goto done;
+                    }
+                }
+                
+                add_zero_advance_check = (re_check_advance(s->byte_code.buf + last_atom_start,
+                                                           s->byte_code.size - last_atom_start) == 0);
+            } else {
+                add_zero_advance_check = FALSE;
+            }
+            
+            {
+                int len, pos;
+                len = s->byte_code.size - last_atom_start;
+                if (quant_min == 0) {
+                    /* 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);
+                        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;
+                    }
+                    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);
+                        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);
+                        s->byte_code.buf[last_atom_start] = REOP_split_goto_first +
+                            greedy;
+                        put_u32(s->byte_code.buf + last_atom_start + 1,
+                                len + 5 + add_zero_advance_check);
+                        if (add_zero_advance_check) {
+                            /* avoid infinite loop by stoping the
+                               recursion if no advance was made in the
+                               atom (only works if the atom has no
+                               side effect) */
+                            s->byte_code.buf[last_atom_start + 1 + 4] = REOP_push_char_pos;
+                            re_emit_goto(s, REOP_bne_char_pos, last_atom_start); 
+                        } else {
+                            re_emit_goto(s, REOP_goto, last_atom_start);
+                        }
+                    } else {
+                        dbuf_insert(&s->byte_code, last_atom_start, 10);
+                        pos = last_atom_start;
+                        s->byte_code.buf[pos++] = REOP_push_i32;
+                        put_u32(s->byte_code.buf + pos, quant_max);
+                        pos += 4;
+                        s->byte_code.buf[pos++] = REOP_split_goto_first + greedy;
+                        put_u32(s->byte_code.buf + pos, len + 5);
+                        re_emit_goto(s, REOP_loop, last_atom_start + 5);
+                        re_emit_op(s, REOP_drop);
+                    }
+                } else if (quant_min == 1 && quant_max == INT32_MAX &&
+                           !add_zero_advance_check) {
+                    re_emit_goto(s, REOP_split_next_first - greedy,
+                                 last_atom_start);
+                } else {
+                    if (quant_min == 1) {
+                        /* nothing to add */
+                    } else {
+                        dbuf_insert(&s->byte_code, last_atom_start, 5);
+                        s->byte_code.buf[last_atom_start] = REOP_push_i32;
+                        put_u32(s->byte_code.buf + last_atom_start + 1,
+                                quant_min);
+                        last_atom_start += 5;
+                        re_emit_goto(s, REOP_loop, last_atom_start);
+                        re_emit_op(s, REOP_drop);
+                    }
+                    if (quant_max == INT32_MAX) {
+                        pos = s->byte_code.size;
+                        re_emit_op_u32(s, REOP_split_goto_first + greedy,
+                                       len + 5 + add_zero_advance_check);
+                        if (add_zero_advance_check)
+                            re_emit_op(s, REOP_push_char_pos);
+                        /* copy the atom */
+                        dbuf_put_self(&s->byte_code, last_atom_start, len);
+                        if (add_zero_advance_check)
+                            re_emit_goto(s, REOP_bne_char_pos, pos);
+                        else
+                            re_emit_goto(s, REOP_goto, pos);
+                    } else if (quant_max > quant_min) {
+                        re_emit_op_u32(s, REOP_push_i32, quant_max - quant_min);
+                        pos = s->byte_code.size;
+                        re_emit_op_u32(s, REOP_split_goto_first + greedy, len + 5);
+                        /* copy the atom */
+                        dbuf_put_self(&s->byte_code, last_atom_start, len);
+                        
+                        re_emit_goto(s, REOP_loop, pos);
+                        re_emit_op(s, REOP_drop);
+                    }
+                }
+                last_atom_start = -1;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+ done:
+    s->buf_ptr = p;
+    return 0;
+}
+
+static int re_parse_alternative(REParseState *s, BOOL is_backward_dir)
+{
+    const uint8_t *p;
+    int ret;
+    size_t start, term_start, end, term_size;
+
+    start = s->byte_code.size;
+    for(;;) {
+        p = s->buf_ptr;
+        if (p >= s->buf_end)
+            break;
+        if (*p == '|' || *p == ')')
+            break;
+        term_start = s->byte_code.size;
+        ret = re_parse_term(s, is_backward_dir);
+        if (ret)
+            return ret;
+        if (is_backward_dir) {
+            /* reverse the order of the terms (XXX: inefficient, but
+               speed is not really critical here) */
+            end = s->byte_code.size;
+            term_size = end - term_start;
+            if (dbuf_realloc(&s->byte_code, end + term_size))
+                return -1;
+            memmove(s->byte_code.buf + start + term_size,
+                    s->byte_code.buf + start,
+                    end - start);
+            memcpy(s->byte_code.buf + start, s->byte_code.buf + end,
+                   term_size);
+        }
+    }
+    return 0;
+}
+    
+static int re_parse_disjunction(REParseState *s, BOOL is_backward_dir)
+{
+    int start, len, pos;
+
+    start = s->byte_code.size;
+    if (re_parse_alternative(s, is_backward_dir))
+        return -1;
+    while (*s->buf_ptr == '|') {
+        s->buf_ptr++;
+
+        len = s->byte_code.size - start;
+
+        /* insert a split before the first alternative */
+        dbuf_insert(&s->byte_code, start, 5);
+        s->byte_code.buf[start] = REOP_split_next_first;
+        put_u32(s->byte_code.buf + start + 1, len + 5);
+
+        pos = re_emit_op_u32(s, REOP_goto, 0);
+
+        if (re_parse_alternative(s, is_backward_dir))
+            return -1;
+        
+        /* patch the goto */
+        len = s->byte_code.size - (pos + 4);
+        put_u32(s->byte_code.buf + pos, len);
+    }
+    return 0;
+}
+
+/* the control flow is recursive so the analysis can be linear */
+static int compute_stack_size(const uint8_t *bc_buf, int bc_buf_len)
+{
+    int stack_size, stack_size_max, pos, opcode, len;
+    uint32_t val;
+    
+    stack_size = 0;
+    stack_size_max = 0;
+    bc_buf += RE_HEADER_LEN;
+    bc_buf_len -= RE_HEADER_LEN;
+    pos = 0;
+    while (pos < bc_buf_len) {
+        opcode = bc_buf[pos];
+        len = reopcode_info[opcode].size;
+        assert(opcode < REOP_COUNT);
+        assert((pos + len) <= bc_buf_len);
+        switch(opcode) {
+        case REOP_push_i32:
+        case REOP_push_char_pos:
+            stack_size++;
+            if (stack_size > stack_size_max) {
+                if (stack_size > STACK_SIZE_MAX)
+                    return -1;
+                stack_size_max = stack_size;
+            }
+            break;
+        case REOP_drop:
+        case REOP_bne_char_pos:
+            assert(stack_size > 0);
+            stack_size--;
+            break;
+        case REOP_range:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 4;
+            break;
+        case REOP_range32:
+            val = get_u16(bc_buf + pos + 1);
+            len += val * 8;
+            break;
+        }
+        pos += len;
+    }
+    return stack_size_max;
+}
+
+/* 'buf' must be a zero terminated UTF-8 string of length buf_len.
+   Return NULL if error and allocate an error message in *perror_msg,
+   otherwise the compiled bytecode and its length in plen.
+*/
+uint8_t *lre_compile(int *plen, char *error_msg, int error_msg_size,
+                     const char *buf, size_t buf_len, int re_flags,
+                     void *opaque)
+{
+    REParseState s_s, *s = &s_s;
+    int stack_size;
+    BOOL is_sticky;
+    
+    memset(s, 0, sizeof(*s));
+    s->mem_opaque = opaque;
+    s->buf_ptr = (const uint8_t *)buf;
+    s->buf_end = s->buf_ptr + buf_len;
+    s->buf_start = s->buf_ptr;
+    s->re_flags = re_flags;
+    s->is_utf16 = ((re_flags & LRE_FLAG_UTF16) != 0);
+    is_sticky = ((re_flags & LRE_FLAG_STICKY) != 0);
+    s->ignore_case = ((re_flags & LRE_FLAG_IGNORECASE) != 0);
+    s->dotall = ((re_flags & LRE_FLAG_DOTALL) != 0);
+    s->capture_count = 1;
+    s->total_capture_count = -1;
+    s->has_named_captures = -1;
+    
+    dbuf_init2(&s->byte_code, opaque, lre_realloc);
+    dbuf_init2(&s->group_names, opaque, lre_realloc);
+
+    dbuf_putc(&s->byte_code, re_flags); /* first element is the flags */
+    dbuf_putc(&s->byte_code, 0); /* second element is the number of captures */
+    dbuf_putc(&s->byte_code, 0); /* stack size */
+    dbuf_put_u32(&s->byte_code, 0); /* bytecode length */
+    
+    if (!is_sticky) {
+        /* iterate thru all positions (about the same as .*?( ... ) )
+           .  We do it without an explicit loop so that lock step
+           thread execution will be possible in an optimized
+           implementation */
+        re_emit_op_u32(s, REOP_split_goto_first, 1 + 5);
+        re_emit_op(s, REOP_any);
+        re_emit_op_u32(s, REOP_goto, -(5 + 1 + 5));
+    }
+    re_emit_op_u8(s, REOP_save_start, 0);
+
+    if (re_parse_disjunction(s, FALSE)) {
+    error:
+        dbuf_free(&s->byte_code);
+        dbuf_free(&s->group_names);
+        pstrcpy(error_msg, error_msg_size, s->u.error_msg);
+        *plen = 0;
+        return NULL;
+    }
+
+    re_emit_op_u8(s, REOP_save_end, 0);
+    
+    re_emit_op(s, REOP_match);
+
+    if (*s->buf_ptr != '\0') {
+        re_parse_error(s, "extraneous characters at the end");
+        goto error;
+    }
+
+    if (dbuf_error(&s->byte_code)) {
+        re_parse_error(s, "out of memory");
+        goto error;
+    }
+    
+    stack_size = compute_stack_size(s->byte_code.buf, s->byte_code.size);
+    if (stack_size < 0) {
+        re_parse_error(s, "too many imbricated quantifiers");
+        goto error;
+    }
+    
+    s->byte_code.buf[RE_HEADER_CAPTURE_COUNT] = s->capture_count;
+    s->byte_code.buf[RE_HEADER_STACK_SIZE] = stack_size;
+    put_u32(s->byte_code.buf + 3, s->byte_code.size - RE_HEADER_LEN);
+
+    /* add the named groups if needed */
+    if (s->group_names.size > (s->capture_count - 1)) {
+        dbuf_put(&s->byte_code, s->group_names.buf, s->group_names.size);
+        s->byte_code.buf[RE_HEADER_FLAGS] |= LRE_FLAG_NAMED_GROUPS;
+    }
+    dbuf_free(&s->group_names);
+    
+#ifdef DUMP_REOP
+    lre_dump_bytecode(s->byte_code.buf, s->byte_code.size);
+#endif
+    
+    error_msg[0] = '\0';
+    *plen = s->byte_code.size;
+    return s->byte_code.buf;
+}
+
+static BOOL is_line_terminator(uint32_t c)
+{
+    return (c == '\n' || c == '\r' || c == CP_LS || c == CP_PS);
+}
+
+static BOOL is_word_char(uint32_t c)
+{
+    return ((c >= '0' && c <= '9') ||
+            (c >= 'a' && c <= 'z') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c == '_'));
+}
+
+#define GET_CHAR(c, cptr, cbuf_end)                                     \
+    do {                                                                \
+        if (cbuf_type == 0) {                                           \
+            c = *cptr++;                                                \
+        } else {                                                        \
+            uint32_t __c1;                                              \
+            c = *(uint16_t *)cptr;                                      \
+            cptr += 2;                                                  \
+            if (c >= 0xd800 && c < 0xdc00 &&                            \
+                cbuf_type == 2 && cptr < cbuf_end) {                    \
+                __c1 = *(uint16_t *)cptr;                               \
+                if (__c1 >= 0xdc00 && __c1 < 0xe000) {                  \
+                    c = (((c & 0x3ff) << 10) | (__c1 & 0x3ff)) + 0x10000; \
+                    cptr += 2;                                          \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+#define PEEK_CHAR(c, cptr, cbuf_end)             \
+    do {                                         \
+        if (cbuf_type == 0) {                    \
+            c = cptr[0];                         \
+        } else {                                 \
+            uint32_t __c1;                                              \
+            c = ((uint16_t *)cptr)[0];                                  \
+            if (c >= 0xd800 && c < 0xdc00 &&                            \
+                cbuf_type == 2 && (cptr + 2) < cbuf_end) {              \
+                __c1 = ((uint16_t *)cptr)[1];                           \
+                if (__c1 >= 0xdc00 && __c1 < 0xe000) {                  \
+                    c = (((c & 0x3ff) << 10) | (__c1 & 0x3ff)) + 0x10000; \
+                }                                                       \
+            }                                                           \
+        }                                        \
+    } while (0)
+
+#define PEEK_PREV_CHAR(c, cptr, cbuf_start)                 \
+    do {                                         \
+        if (cbuf_type == 0) {                    \
+            c = cptr[-1];                        \
+        } else {                                 \
+            uint32_t __c1;                                              \
+            c = ((uint16_t *)cptr)[-1];                                 \
+            if (c >= 0xdc00 && c < 0xe000 &&                            \
+                cbuf_type == 2 && (cptr - 4) >= cbuf_start) {              \
+                __c1 = ((uint16_t *)cptr)[-2];                          \
+                if (__c1 >= 0xd800 && __c1 < 0xdc00 ) {                 \
+                    c = (((__c1 & 0x3ff) << 10) | (c & 0x3ff)) + 0x10000; \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+#define GET_PREV_CHAR(c, cptr, cbuf_start)       \
+    do {                                         \
+        if (cbuf_type == 0) {                    \
+            cptr--;                              \
+            c = cptr[0];                         \
+        } else {                                 \
+            uint32_t __c1;                                              \
+            cptr -= 2;                                                  \
+            c = ((uint16_t *)cptr)[0];                                 \
+            if (c >= 0xdc00 && c < 0xe000 &&                            \
+                cbuf_type == 2 && cptr > cbuf_start) {                  \
+                __c1 = ((uint16_t *)cptr)[-1];                          \
+                if (__c1 >= 0xd800 && __c1 < 0xdc00 ) {                 \
+                    cptr -= 2;                                          \
+                    c = (((__c1 & 0x3ff) << 10) | (c & 0x3ff)) + 0x10000; \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+#define PREV_CHAR(cptr, cbuf_start)       \
+    do {                                  \
+        if (cbuf_type == 0) {             \
+            cptr--;                       \
+        } else {                          \
+            cptr -= 2;                          \
+            if (cbuf_type == 2) {                                       \
+                c = ((uint16_t *)cptr)[0];                              \
+                if (c >= 0xdc00 && c < 0xe000 && cptr > cbuf_start) {   \
+                    c = ((uint16_t *)cptr)[-1];                         \
+                    if (c >= 0xd800 && c < 0xdc00)                      \
+                        cptr -= 2;                                      \
+                }                                                       \
+            }                                                           \
+        }                                                               \
+    } while (0)
+
+typedef uintptr_t StackInt;
+
+typedef enum {
+    RE_EXEC_STATE_SPLIT,
+    RE_EXEC_STATE_LOOKAHEAD,
+    RE_EXEC_STATE_NEGATIVE_LOOKAHEAD,
+    RE_EXEC_STATE_GREEDY_QUANT,
+} REExecStateEnum;
+
+typedef struct REExecState {
+    REExecStateEnum type : 8;
+    uint8_t stack_len;
+    size_t count; /* only used for RE_EXEC_STATE_GREEDY_QUANT */
+    const uint8_t *cptr;
+    const uint8_t *pc;
+    void *buf[0];
+} REExecState;
+
+typedef struct {
+    const uint8_t *cbuf;
+    const uint8_t *cbuf_end;
+    /* 0 = 8 bit chars, 1 = 16 bit chars, 2 = 16 bit chars, UTF-16 */
+    int cbuf_type; 
+    int capture_count;
+    int stack_size_max;
+    BOOL multi_line;
+    BOOL ignore_case;
+    BOOL is_utf16;
+    void *opaque; /* used for stack overflow check */
+
+    size_t state_size;
+    uint8_t *state_stack;
+    size_t state_stack_size;
+    size_t state_stack_len;
+} REExecContext;
+
+static int push_state(REExecContext *s,
+                      uint8_t **capture,
+                      StackInt *stack, size_t stack_len,
+                      const uint8_t *pc, const uint8_t *cptr,
+                      REExecStateEnum type, size_t count)
+{
+    REExecState *rs;
+    uint8_t *new_stack;
+    size_t new_size, i, n;
+    StackInt *stack_buf;
+
+    if (unlikely((s->state_stack_len + 1) > s->state_stack_size)) {
+        /* reallocate the stack */
+        new_size = s->state_stack_size * 3 / 2;
+        if (new_size < 8)
+            new_size = 8;
+        new_stack = lre_realloc(s->opaque, s->state_stack, new_size * s->state_size);
+        if (!new_stack)
+            return -1;
+        s->state_stack_size = new_size;
+        s->state_stack = new_stack;
+    }
+    rs = (REExecState *)(s->state_stack + s->state_stack_len * s->state_size);
+    s->state_stack_len++;
+    rs->type = type;
+    rs->count = count;
+    rs->stack_len = stack_len;
+    rs->cptr = cptr;
+    rs->pc = pc;
+    n = 2 * s->capture_count;
+    for(i = 0; i < n; i++)
+        rs->buf[i] = capture[i];
+    stack_buf = (StackInt *)(rs->buf + n);
+    for(i = 0; i < stack_len; i++)
+        stack_buf[i] = stack[i];
+    return 0;
+}
+
+/* return 1 if match, 0 if not match or -1 if error. */
+static intptr_t lre_exec_backtrack(REExecContext *s, uint8_t **capture,
+                                   StackInt *stack, int stack_len,
+                                   const uint8_t *pc, const uint8_t *cptr,
+                                   BOOL no_recurse)
+{
+    int opcode, ret;
+    int cbuf_type;
+    uint32_t val, c;
+    const uint8_t *cbuf_end;
+    
+    cbuf_type = s->cbuf_type;
+    cbuf_end = s->cbuf_end;
+
+    for(;;) {
+        //        printf("top=%p: pc=%d\n", th_list.top, (int)(pc - (bc_buf + RE_HEADER_LEN)));
+        opcode = *pc++;
+        switch(opcode) {
+        case REOP_match:
+            {
+                REExecState *rs;
+                if (no_recurse)
+                    return (intptr_t)cptr;
+                ret = 1;
+                goto recurse;
+            no_match:
+                if (no_recurse)
+                    return 0;
+                ret = 0;
+            recurse:
+                for(;;) {
+                    if (s->state_stack_len == 0)
+                        return ret;
+                    rs = (REExecState *)(s->state_stack +
+                                         (s->state_stack_len - 1) * s->state_size);
+                    if (rs->type == RE_EXEC_STATE_SPLIT) {
+                        if (!ret) {
+                        pop_state:
+                            memcpy(capture, rs->buf,
+                                   sizeof(capture[0]) * 2 * s->capture_count);
+                        pop_state1:
+                            pc = rs->pc;
+                            cptr = rs->cptr;
+                            stack_len = rs->stack_len;
+                            memcpy(stack, rs->buf + 2 * s->capture_count,
+                                   stack_len * sizeof(stack[0]));
+                            s->state_stack_len--;
+                            break;
+                        }
+                    } else if (rs->type == RE_EXEC_STATE_GREEDY_QUANT) {
+                        if (!ret) {
+                            uint32_t char_count, i;
+                            memcpy(capture, rs->buf,
+                                   sizeof(capture[0]) * 2 * s->capture_count);
+                            stack_len = rs->stack_len;
+                            memcpy(stack, rs->buf + 2 * s->capture_count,
+                                   stack_len * sizeof(stack[0]));
+                            pc = rs->pc;
+                            cptr = rs->cptr;
+                            /* go backward */
+                            char_count = get_u32(pc + 12);
+                            for(i = 0; i < char_count; i++) {
+                                PREV_CHAR(cptr, s->cbuf);
+                            }
+                            pc = (pc + 16) + (int)get_u32(pc);
+                            rs->cptr = cptr;
+                            rs->count--;
+                            if (rs->count == 0) {
+                                s->state_stack_len--;
+                            }
+                            break;
+                        }
+                    } else {
+                        ret = ((rs->type == RE_EXEC_STATE_LOOKAHEAD && ret) ||
+                               (rs->type == RE_EXEC_STATE_NEGATIVE_LOOKAHEAD && !ret));
+                        if (ret) {
+                            /* keep the capture in case of positive lookahead */
+                            if (rs->type == RE_EXEC_STATE_LOOKAHEAD)
+                                goto pop_state1;
+                            else
+                                goto pop_state;
+                        }
+                    }
+                    s->state_stack_len--;
+                }
+            }
+            break;
+        case REOP_char32:
+            val = get_u32(pc);
+            pc += 4;
+            goto test_char;
+        case REOP_char:
+            val = get_u16(pc);
+            pc += 2;
+        test_char:
+            if (cptr >= cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end);
+            if (s->ignore_case) {
+                c = lre_canonicalize(c, s->is_utf16);
+            }
+            if (val != c)
+                goto no_match;
+            break;
+        case REOP_split_goto_first:
+        case REOP_split_next_first:
+            {
+                const uint8_t *pc1;
+                
+                val = get_u32(pc);
+                pc += 4;
+                if (opcode == REOP_split_next_first) {
+                    pc1 = pc + (int)val;
+                } else {
+                    pc1 = pc;
+                    pc = pc + (int)val;
+                }
+                ret = push_state(s, capture, stack, stack_len,
+                                 pc1, cptr, RE_EXEC_STATE_SPLIT, 0);
+                if (ret < 0)
+                    return -1;
+                break;
+            }
+        case REOP_lookahead:
+        case REOP_negative_lookahead:
+            val = get_u32(pc);
+            pc += 4;
+            ret = push_state(s, capture, stack, stack_len,
+                             pc + (int)val, cptr,
+                             RE_EXEC_STATE_LOOKAHEAD + opcode - REOP_lookahead,
+                             0);
+            if (ret < 0)
+                return -1;
+            break;
+            
+        case REOP_goto:
+            val = get_u32(pc);
+            pc += 4 + (int)val;
+            break;
+        case REOP_line_start:
+            if (cptr == s->cbuf)
+                break;
+            if (!s->multi_line)
+                goto no_match;
+            PEEK_PREV_CHAR(c, cptr, s->cbuf);
+            if (!is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_line_end:
+            if (cptr == cbuf_end)
+                break;
+            if (!s->multi_line)
+                goto no_match;
+            PEEK_CHAR(c, cptr, cbuf_end);
+            if (!is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_dot:
+            if (cptr == cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end);
+            if (is_line_terminator(c))
+                goto no_match;
+            break;
+        case REOP_any:
+            if (cptr == cbuf_end)
+                goto no_match;
+            GET_CHAR(c, cptr, cbuf_end);
+            break;
+        case REOP_save_start:
+        case REOP_save_end:
+            val = *pc++;
+            assert(val < s->capture_count);
+            capture[2 * val + opcode - REOP_save_start] = (uint8_t *)cptr;
+            break;
+        case REOP_save_reset:
+            {
+                uint32_t val2;
+                val = pc[0];
+                val2 = pc[1];
+                pc += 2;
+                assert(val2 < s->capture_count);
+                while (val <= val2) {
+                    capture[2 * val] = NULL;
+                    capture[2 * val + 1] = NULL;
+                    val++;
+                }
+            }
+            break;
+        case REOP_push_i32:
+            val = get_u32(pc);
+            pc += 4;
+            stack[stack_len++] = val;
+            break;
+        case REOP_drop:
+            stack_len--;
+            break;
+        case REOP_loop:
+            val = get_u32(pc);
+            pc += 4;
+            if (--stack[stack_len - 1] != 0) {
+                pc += (int)val;
+            }
+            break;
+        case REOP_push_char_pos:
+            stack[stack_len++] = (uintptr_t)cptr;
+            break;
+        case REOP_bne_char_pos:
+            val = get_u32(pc);
+            pc += 4;
+            if (stack[--stack_len] != (uintptr_t)cptr)
+                pc += (int)val;
+            break;
+        case REOP_word_boundary:
+        case REOP_not_word_boundary:
+            {
+                BOOL v1, v2;
+                /* char before */
+                if (cptr == s->cbuf) {
+                    v1 = FALSE;
+                } else {
+                    PEEK_PREV_CHAR(c, cptr, s->cbuf);
+                    v1 = is_word_char(c);
+                }
+                /* current char */
+                if (cptr >= cbuf_end) {
+                    v2 = FALSE;
+                } else {
+                    PEEK_CHAR(c, cptr, cbuf_end);
+                    v2 = is_word_char(c);
+                }
+                if (v1 ^ v2 ^ (REOP_not_word_boundary - opcode))
+                    goto no_match;
+            }
+            break;
+        case REOP_back_reference:
+        case REOP_backward_back_reference:
+            {
+                const uint8_t *cptr1, *cptr1_end, *cptr1_start;
+                uint32_t c1, c2;
+                
+                val = *pc++;
+                if (val >= s->capture_count)
+                    goto no_match;
+                cptr1_start = capture[2 * val];
+                cptr1_end = capture[2 * val + 1];
+                if (!cptr1_start || !cptr1_end)
+                    break;
+                if (opcode == REOP_back_reference) {
+                    cptr1 = cptr1_start;
+                    while (cptr1 < cptr1_end) {
+                        if (cptr >= cbuf_end)
+                            goto no_match;
+                        GET_CHAR(c1, cptr1, cptr1_end);
+                        GET_CHAR(c2, cptr, cbuf_end);
+                        if (s->ignore_case) {
+                            c1 = lre_canonicalize(c1, s->is_utf16);
+                            c2 = lre_canonicalize(c2, s->is_utf16);
+                        }
+                        if (c1 != c2)
+                            goto no_match;
+                    }
+                } else {
+                    cptr1 = cptr1_end;
+                    while (cptr1 > cptr1_start) {
+                        if (cptr == s->cbuf)
+                            goto no_match;
+                        GET_PREV_CHAR(c1, cptr1, cptr1_start);
+                        GET_PREV_CHAR(c2, cptr, s->cbuf);
+                        if (s->ignore_case) {
+                            c1 = lre_canonicalize(c1, s->is_utf16);
+                            c2 = lre_canonicalize(c2, s->is_utf16);
+                        }
+                        if (c1 != c2)
+                            goto no_match;
+                    }
+                }
+            }
+            break;
+        case REOP_range:
+            {
+                int n;
+                uint32_t low, high, idx_min, idx_max, idx;
+                
+                n = get_u16(pc); /* n must be >= 1 */
+                pc += 2;
+                if (cptr >= cbuf_end)
+                    goto no_match;
+                GET_CHAR(c, cptr, cbuf_end);
+                if (s->ignore_case) {
+                    c = lre_canonicalize(c, s->is_utf16);
+                }
+                idx_min = 0;
+                low = get_u16(pc + 0 * 4);
+                if (c < low)
+                    goto no_match;
+                idx_max = n - 1;
+                high = get_u16(pc + idx_max * 4 + 2);
+                /* 0xffff in for last value means +infinity */
+                if (unlikely(c >= 0xffff) && high == 0xffff)
+                    goto range_match;
+                if (c > high)
+                    goto no_match;
+                while (idx_min <= idx_max) {
+                    idx = (idx_min + idx_max) / 2;
+                    low = get_u16(pc + idx * 4);
+                    high = get_u16(pc + idx * 4 + 2);
+                    if (c < low)
+                        idx_max = idx - 1;
+                    else if (c > high)
+                        idx_min = idx + 1;
+                    else
+                        goto range_match;
+                }
+                goto no_match;
+            range_match:
+                pc += 4 * n;
+            }
+            break;
+        case REOP_range32:
+            {
+                int n;
+                uint32_t low, high, idx_min, idx_max, idx;
+                
+                n = get_u16(pc); /* n must be >= 1 */
+                pc += 2;
+                if (cptr >= cbuf_end)
+                    goto no_match;
+                GET_CHAR(c, cptr, cbuf_end);
+                if (s->ignore_case) {
+                    c = lre_canonicalize(c, s->is_utf16);
+                }
+                idx_min = 0;
+                low = get_u32(pc + 0 * 8);
+                if (c < low)
+                    goto no_match;
+                idx_max = n - 1;
+                high = get_u32(pc + idx_max * 8 + 4);
+                if (c > high)
+                    goto no_match;
+                while (idx_min <= idx_max) {
+                    idx = (idx_min + idx_max) / 2;
+                    low = get_u32(pc + idx * 8);
+                    high = get_u32(pc + idx * 8 + 4);
+                    if (c < low)
+                        idx_max = idx - 1;
+                    else if (c > high)
+                        idx_min = idx + 1;
+                    else
+                        goto range32_match;
+                }
+                goto no_match;
+            range32_match:
+                pc += 8 * n;
+            }
+            break;
+        case REOP_prev:
+            /* go to the previous char */
+            if (cptr == s->cbuf)
+                goto no_match;
+            PREV_CHAR(cptr, s->cbuf);
+            break;
+        case REOP_simple_greedy_quant:
+            {
+                uint32_t next_pos, quant_min, quant_max;
+                size_t q;
+                intptr_t res;
+                const uint8_t *pc1;
+                
+                next_pos = get_u32(pc);
+                quant_min = get_u32(pc + 4);
+                quant_max = get_u32(pc + 8);
+                pc += 16;
+                pc1 = pc;
+                pc += (int)next_pos;
+                
+                q = 0;
+                for(;;) {
+                    res = lre_exec_backtrack(s, capture, stack, stack_len,
+                                             pc1, cptr, TRUE);
+                    if (res == -1)
+                        return res;
+                    if (!res)
+                        break;
+                    cptr = (uint8_t *)res;
+                    q++;
+                    if (q >= quant_max && quant_max != INT32_MAX)
+                        break;
+                }
+                if (q < quant_min)
+                    goto no_match;
+                if (q > quant_min) {
+                    /* will examine all matches down to quant_min */
+                    ret = push_state(s, capture, stack, stack_len,
+                                     pc1 - 16, cptr,
+                                     RE_EXEC_STATE_GREEDY_QUANT,
+                                     q - quant_min);
+                    if (ret < 0)
+                        return -1;
+                }
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+}
+
+/* Return 1 if match, 0 if not match or -1 if error. cindex is the
+   starting position of the match and must be such as 0 <= cindex <=
+   clen. */
+int lre_exec(uint8_t **capture,
+             const uint8_t *bc_buf, const uint8_t *cbuf, int cindex, int clen,
+             int cbuf_type, void *opaque)
+{
+    REExecContext s_s, *s = &s_s;
+    int re_flags, i, alloca_size, ret;
+    StackInt *stack_buf;
+    
+    re_flags = bc_buf[RE_HEADER_FLAGS];
+    s->multi_line = (re_flags & LRE_FLAG_MULTILINE) != 0;
+    s->ignore_case = (re_flags & LRE_FLAG_IGNORECASE) != 0;
+    s->is_utf16 = (re_flags & LRE_FLAG_UTF16) != 0;
+    s->capture_count = bc_buf[RE_HEADER_CAPTURE_COUNT];
+    s->stack_size_max = bc_buf[RE_HEADER_STACK_SIZE];
+    s->cbuf = cbuf;
+    s->cbuf_end = cbuf + (clen << cbuf_type);
+    s->cbuf_type = cbuf_type;
+    if (s->cbuf_type == 1 && s->is_utf16)
+        s->cbuf_type = 2;
+    s->opaque = opaque;
+
+    s->state_size = sizeof(REExecState) +
+        s->capture_count * sizeof(capture[0]) * 2 +
+        s->stack_size_max * sizeof(stack_buf[0]);
+    s->state_stack = NULL;
+    s->state_stack_len = 0;
+    s->state_stack_size = 0;
+    
+    for(i = 0; i < s->capture_count * 2; i++)
+        capture[i] = NULL;
+    alloca_size = s->stack_size_max * sizeof(stack_buf[0]);
+    stack_buf = alloca(alloca_size);
+    ret = lre_exec_backtrack(s, capture, stack_buf, 0, bc_buf + RE_HEADER_LEN,
+                             cbuf + (cindex << cbuf_type), FALSE);
+    lre_realloc(s->opaque, s->state_stack, 0);
+    return ret;
+}
+
+int lre_get_capture_count(const uint8_t *bc_buf)
+{
+    return bc_buf[RE_HEADER_CAPTURE_COUNT];
+}
+
+int lre_get_flags(const uint8_t *bc_buf)
+{
+    return bc_buf[RE_HEADER_FLAGS];
+}
+
+#ifdef TEST
+
+BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
+{
+    return FALSE;
+}
+
+void *lre_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+int main(int argc, char **argv)
+{
+    int len, ret, i;
+    uint8_t *bc;
+    char error_msg[64];
+    uint8_t *capture[CAPTURE_COUNT_MAX * 2];
+    const char *input;
+    int input_len, capture_count;
+    
+    if (argc < 3) {
+        printf("usage: %s regexp input\n", argv[0]);
+        exit(1);
+    }
+    bc = lre_compile(&len, error_msg, sizeof(error_msg), argv[1],
+                     strlen(argv[1]), 0, NULL);
+    if (!bc) {
+        fprintf(stderr, "error: %s\n", error_msg);
+        exit(1);
+    }
+
+    input = argv[2];
+    input_len = strlen(input);
+    
+    ret = lre_exec(capture, bc, (uint8_t *)input, 0, input_len, 0, NULL);
+    printf("ret=%d\n", ret);
+    if (ret == 1) {
+        capture_count = lre_get_capture_count(bc);
+        for(i = 0; i < 2 * capture_count; i++) {
+            uint8_t *ptr;
+            ptr = capture[i];
+            printf("%d: ", i);
+            if (!ptr)
+                printf("<nil>");
+            else
+                printf("%u", (int)(ptr - (uint8_t *)input));
+            printf("\n");
+        }
+    }
+    return 0;
+}
+#endif

gpac-1.0.0.tar.gz/src/quickjs/libregexp.h Added

@@ -0,0 +1,91 @@
+/*
+ * Regular Expression Engine
+ * 
+ * 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 LIBREGEXP_H
+#define LIBREGEXP_H
+
+#include <stddef.h>
+
+#include "libunicode.h"
+
+#define LRE_BOOL  int       /* for documentation purposes */
+
+#define LRE_FLAG_GLOBAL     (1 << 0)
+#define LRE_FLAG_IGNORECASE (1 << 1)
+#define LRE_FLAG_MULTILINE  (1 << 2)
+#define LRE_FLAG_DOTALL     (1 << 3)
+#define LRE_FLAG_UTF16      (1 << 4)
+#define LRE_FLAG_STICKY     (1 << 5)
+
+#define LRE_FLAG_NAMED_GROUPS (1 << 7) /* named groups are present in the regexp */
+
+uint8_t *lre_compile(int *plen, char *error_msg, int error_msg_size,
+                     const char *buf, size_t buf_len, int re_flags,
+                     void *opaque);
+int lre_get_capture_count(const uint8_t *bc_buf);
+int lre_get_flags(const uint8_t *bc_buf);
+int lre_exec(uint8_t **capture,
+             const uint8_t *bc_buf, const uint8_t *cbuf, int cindex, int clen,
+             int cbuf_type, void *opaque);
+
+int lre_parse_escape(const uint8_t **pp, int allow_utf16);
+LRE_BOOL lre_is_space(int c);
+
+/* must be provided by the user */
+LRE_BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size); 
+void *lre_realloc(void *opaque, void *ptr, size_t size);
+
+/* JS identifier test */
+extern uint32_t const lre_id_start_table_ascii[4];
+extern uint32_t const lre_id_continue_table_ascii[4];
+
+static inline int lre_js_is_ident_first(int c)
+{
+    if ((uint32_t)c < 128) {
+        return (lre_id_start_table_ascii[c >> 5] >> (c & 31)) & 1;
+    } else {
+#ifdef CONFIG_ALL_UNICODE
+        return lre_is_id_start(c);
+#else
+        return !lre_is_space(c);
+#endif
+    }
+}
+
+static inline int lre_js_is_ident_next(int c)
+{
+    if ((uint32_t)c < 128) {
+        return (lre_id_continue_table_ascii[c >> 5] >> (c & 31)) & 1;
+    } else {
+        /* ZWNJ and ZWJ are accepted in identifiers */
+#ifdef CONFIG_ALL_UNICODE
+        return lre_is_id_continue(c) || c == 0x200C || c == 0x200D;
+#else
+        return !lre_is_space(c) || c == 0x200C || c == 0x200D;
+#endif
+    }
+}
+
+#undef LRE_BOOL
+
+#endif /* LIBREGEXP_H */

gpac-1.0.0.tar.gz/src/quickjs/libunicode-table.h Added

@@ -0,0 +1,4313 @@
+/* Compressed unicode tables */
+/* Automatically generated file - do not edit */
+
+#include <stdint.h>
+
+static const uint32_t case_conv_table1[359] = {
+    0x00209a30, 0x00309a00, 0x005a8173, 0x00601730,
+    0x006c0730, 0x006f81b3, 0x00701700, 0x007c0700,
+    0x007f8100, 0x00803040, 0x009801c3, 0x00988190,
+    0x00990640, 0x009c9040, 0x00a481b4, 0x00a52e40,
+    0x00bc0130, 0x00bc8640, 0x00bf8170, 0x00c00100,
+    0x00c08130, 0x00c10440, 0x00c30130, 0x00c38240,
+    0x00c48230, 0x00c58240, 0x00c70130, 0x00c78130,
+    0x00c80130, 0x00c88240, 0x00c98130, 0x00ca0130,
+    0x00ca8100, 0x00cb0130, 0x00cb8130, 0x00cc0240,
+    0x00cd0100, 0x00ce0130, 0x00ce8130, 0x00cf0100,
+    0x00cf8130, 0x00d00640, 0x00d30130, 0x00d38240,
+    0x00d48130, 0x00d60240, 0x00d70130, 0x00d78240,
+    0x00d88230, 0x00d98440, 0x00db8130, 0x00dc0240,
+    0x00de0240, 0x00df8100, 0x00e20350, 0x00e38350,
+    0x00e50350, 0x00e69040, 0x00ee8100, 0x00ef1240,
+    0x00f801b4, 0x00f88350, 0x00fa0240, 0x00fb0130,
+    0x00fb8130, 0x00fc2840, 0x01100130, 0x01111240,
+    0x011d0131, 0x011d8240, 0x011e8130, 0x011f0131,
+    0x011f8201, 0x01208240, 0x01218130, 0x01220130,
+    0x01228130, 0x01230a40, 0x01280101, 0x01288101,
+    0x01290101, 0x01298100, 0x012a0100, 0x012b0200,
+    0x012c8100, 0x012d8100, 0x012e0101, 0x01300100,
+    0x01308101, 0x01318100, 0x01328101, 0x01330101,
+    0x01340100, 0x01348100, 0x01350101, 0x01358101,
+    0x01360101, 0x01378100, 0x01388101, 0x01390100,
+    0x013a8100, 0x013e8101, 0x01400100, 0x01410101,
+    0x01418100, 0x01438101, 0x01440100, 0x01448100,
+    0x01450200, 0x01460100, 0x01490100, 0x014e8101,
+    0x014f0101, 0x01a28173, 0x01b80440, 0x01bb0240,
+    0x01bd8300, 0x01bf8130, 0x01c30130, 0x01c40330,
+    0x01c60130, 0x01c70230, 0x01c801d0, 0x01c89130,
+    0x01d18930, 0x01d60100, 0x01d68300, 0x01d801d3,
+    0x01d89100, 0x01e10173, 0x01e18900, 0x01e60100,
+    0x01e68200, 0x01e78130, 0x01e80173, 0x01e88173,
+    0x01ea8173, 0x01eb0173, 0x01eb8100, 0x01ec1840,
+    0x01f80173, 0x01f88173, 0x01f90100, 0x01f98100,
+    0x01fa01a0, 0x01fa8173, 0x01fb8240, 0x01fc8130,
+    0x01fd0240, 0x01fe8330, 0x02001030, 0x02082030,
+    0x02182000, 0x02281000, 0x02302240, 0x02453640,
+    0x02600130, 0x02608e40, 0x02678100, 0x02686040,
+    0x0298a630, 0x02b0a600, 0x02c381b5, 0x08502631,
+    0x08638131, 0x08668131, 0x08682b00, 0x087e8300,
+    0x09d05011, 0x09f80610, 0x09fc0620, 0x0e400174,
+    0x0e408174, 0x0e410174, 0x0e418174, 0x0e420174,
+    0x0e428174, 0x0e430174, 0x0e438180, 0x0e440180,
+    0x0e482b30, 0x0e5e8330, 0x0ebc8101, 0x0ebe8101,
+    0x0ec70101, 0x0f007e40, 0x0f3f1840, 0x0f4b01b5,
+    0x0f4b81b6, 0x0f4c01b6, 0x0f4c81b6, 0x0f4d01b7,
+    0x0f4d8180, 0x0f4f0130, 0x0f506040, 0x0f800800,
+    0x0f840830, 0x0f880600, 0x0f8c0630, 0x0f900800,
+    0x0f940830, 0x0f980800, 0x0f9c0830, 0x0fa00600,
+    0x0fa40630, 0x0fa801b0, 0x0fa88100, 0x0fa901d3,
+    0x0fa98100, 0x0faa01d3, 0x0faa8100, 0x0fab01d3,
+    0x0fab8100, 0x0fac8130, 0x0fad8130, 0x0fae8130,
+    0x0faf8130, 0x0fb00800, 0x0fb40830, 0x0fb80200,
+    0x0fb90400, 0x0fbb0200, 0x0fbc0201, 0x0fbd0201,
+    0x0fbe0201, 0x0fc008b7, 0x0fc40867, 0x0fc808b8,
+    0x0fcc0868, 0x0fd008b8, 0x0fd40868, 0x0fd80200,
+    0x0fd901b9, 0x0fd981b1, 0x0fda01b9, 0x0fdb01b1,
+    0x0fdb81d7, 0x0fdc0230, 0x0fdd0230, 0x0fde0161,
+    0x0fdf0173, 0x0fe101b9, 0x0fe181b2, 0x0fe201ba,
+    0x0fe301b2, 0x0fe381d8, 0x0fe40430, 0x0fe60162,
+    0x0fe80200, 0x0fe901d0, 0x0fe981d0, 0x0feb01b0,
+    0x0feb81d0, 0x0fec0230, 0x0fed0230, 0x0ff00201,
+    0x0ff101d3, 0x0ff181d3, 0x0ff201ba, 0x0ff28101,
+    0x0ff301b0, 0x0ff381d3, 0x0ff40230, 0x0ff50230,
+    0x0ff60131, 0x0ff901ba, 0x0ff981b2, 0x0ffa01bb,
+    0x0ffb01b2, 0x0ffb81d9, 0x0ffc0230, 0x0ffd0230,
+    0x0ffe0162, 0x109301a0, 0x109501a0, 0x109581a0,
+    0x10990131, 0x10a70101, 0x10b01031, 0x10b81001,
+    0x10c18240, 0x125b1a31, 0x12681a01, 0x16002f31,
+    0x16182f01, 0x16300240, 0x16310130, 0x16318130,
+    0x16320130, 0x16328100, 0x16330100, 0x16338640,
+    0x16368130, 0x16370130, 0x16378130, 0x16380130,
+    0x16390240, 0x163a8240, 0x163f0230, 0x16406440,
+    0x16758440, 0x16790240, 0x16802600, 0x16938100,
+    0x16968100, 0x53202e40, 0x53401c40, 0x53910e40,
+    0x53993e40, 0x53bc8440, 0x53be8130, 0x53bf0a40,
+    0x53c58240, 0x53c68130, 0x53c80440, 0x53ca0101,
+    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,
+};
+
+static const uint8_t case_conv_table2[359] = {
+    0x01, 0x00, 0x9c, 0x06, 0x07, 0x4d, 0x03, 0x04,
+    0x10, 0x00, 0x8f, 0x0b, 0x00, 0x00, 0x11, 0x00,
+    0x08, 0x00, 0x53, 0x4a, 0x51, 0x00, 0x52, 0x00,
+    0x53, 0x00, 0x3a, 0x54, 0x55, 0x00, 0x57, 0x59,
+    0x3f, 0x5d, 0x5c, 0x00, 0x46, 0x61, 0x63, 0x42,
+    0x64, 0x00, 0x66, 0x00, 0x68, 0x00, 0x6a, 0x00,
+    0x6c, 0x00, 0x6e, 0x00, 0x00, 0x40, 0x00, 0x00,
+    0x00, 0x00, 0x1a, 0x00, 0x93, 0x00, 0x00, 0x20,
+    0x35, 0x00, 0x27, 0x00, 0x21, 0x00, 0x24, 0x22,
+    0x2a, 0x00, 0x13, 0x6b, 0x6d, 0x00, 0x26, 0x24,
+    0x27, 0x14, 0x16, 0x18, 0x1b, 0x1c, 0x3e, 0x1e,
+    0x3f, 0x1f, 0x39, 0x3d, 0x22, 0x21, 0x41, 0x1e,
+    0x40, 0x25, 0x25, 0x26, 0x28, 0x20, 0x2a, 0x49,
+    0x2c, 0x43, 0x2e, 0x4b, 0x30, 0x4c, 0x32, 0x44,
+    0x42, 0x99, 0x00, 0x00, 0x95, 0x8f, 0x7d, 0x7e,
+    0x83, 0x84, 0x12, 0x80, 0x82, 0x76, 0x77, 0x12,
+    0x7b, 0xa3, 0x7c, 0x78, 0x79, 0x8a, 0x92, 0x98,
+    0xa6, 0xa0, 0x85, 0x00, 0x9a, 0xa1, 0x93, 0x75,
+    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,
+    0x22, 0x2a, 0x34, 0x35, 0xa6, 0xa7, 0x36, 0x1f,
+    0x4a, 0x00, 0x00, 0x97, 0x01, 0x5a, 0xda, 0x1d,
+    0x36, 0x05, 0x00, 0xc4, 0xc3, 0xc6, 0xc5, 0xc8,
+    0xc7, 0xca, 0xc9, 0xcc, 0xcb, 0xc4, 0xd5, 0x45,
+    0xd6, 0x42, 0xd7, 0x46, 0xd8, 0xce, 0xd0, 0xd2,
+    0xd4, 0xda, 0xd9, 0xee, 0xf6, 0xfe, 0x0e, 0x07,
+    0x0f, 0x80, 0x9f, 0x00, 0x21, 0x80, 0xa3, 0xed,
+    0x00, 0xc0, 0x40, 0xc6, 0x60, 0xe7, 0xdb, 0xe6,
+    0x99, 0xc0, 0x00, 0x00, 0x06, 0x60, 0xdc, 0x29,
+    0xfd, 0x15, 0x12, 0x06, 0x16, 0xf8, 0xdd, 0x06,
+    0x15, 0x12, 0x84, 0x08, 0xc6, 0x16, 0xff, 0xdf,
+    0x03, 0xc0, 0x40, 0x00, 0x46, 0x60, 0xde, 0xe0,
+    0x6d, 0x37, 0x38, 0x39, 0x15, 0x14, 0x17, 0x16,
+    0x00, 0x1a, 0x19, 0x1c, 0x1b, 0x00, 0x5f, 0xb7,
+    0x65, 0x44, 0x47, 0x00, 0x4f, 0x62, 0x4e, 0x50,
+    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,
+};
+
+static const uint16_t case_conv_ext[58] = {
+    0x0399, 0x0308, 0x0301, 0x03a5, 0x0313, 0x0300, 0x0342, 0x0391,
+    0x0397, 0x03a9, 0x0046, 0x0049, 0x004c, 0x0053, 0x0069, 0x0307,
+    0x02bc, 0x004e, 0x004a, 0x030c, 0x0535, 0x0552, 0x0048, 0x0331,
+    0x0054, 0x0057, 0x030a, 0x0059, 0x0041, 0x02be, 0x1f08, 0x1f80,
+    0x1f28, 0x1f90, 0x1f68, 0x1fa0, 0x1fba, 0x0386, 0x1fb3, 0x1fca,
+    0x0389, 0x1fc3, 0x03a1, 0x1ffa, 0x038f, 0x1ff3, 0x0544, 0x0546,
+    0x053b, 0x054e, 0x053d, 0x03b8, 0x0462, 0xa64a, 0x1e60, 0x03c9,
+    0x006b, 0x00e5,
+};
+
+static const uint8_t unicode_prop_Cased1_table[172] = {
+    0x40, 0xa9, 0x80, 0x8e, 0x80, 0xfc, 0x80, 0xd3,
+    0x80, 0x8c, 0x80, 0x8d, 0x81, 0x8d, 0x02, 0x80,
+    0xe1, 0x80, 0x91, 0x85, 0x9a, 0x01, 0x00, 0x01,
+    0x11, 0x00, 0x01, 0x04, 0x08, 0x01, 0x08, 0x30,
+    0x08, 0x01, 0x15, 0x20, 0x00, 0x39, 0x99, 0x31,
+    0x9d, 0x84, 0x40, 0x94, 0x80, 0xd6, 0x82, 0xa6,
+    0x80, 0x41, 0x62, 0x80, 0xa6, 0x80, 0x57, 0x76,
+    0xf8, 0x02, 0x80, 0x8f, 0x80, 0xb0, 0x40, 0xdb,
+    0x08, 0x80, 0x41, 0xd0, 0x80, 0x8c, 0x80, 0x8f,
+    0x8c, 0xe4, 0x03, 0x01, 0x89, 0x00, 0x14, 0x28,
+    0x10, 0x11, 0x02, 0x01, 0x18, 0x0b, 0x24, 0x4b,
+    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,
+    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, 0x59, 0x63, 0x99,
+    0x85, 0x99, 0x85, 0x99,
+};
+
+static const uint8_t unicode_prop_Cased1_index[18] = {
+    0xb9, 0x02, 0xe0, 0xa0, 0x1e, 0x40, 0x9e, 0xa6,
+    0x40, 0xba, 0xd4, 0x01, 0x89, 0xd7, 0x01, 0x8a,
+    0xf1, 0x01,
+};
+
+static const uint8_t unicode_prop_Case_Ignorable_table[678] = {
+    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,
+    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,
+};
+
+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,
+    0x01, 0x0e,
+};
+
+static const uint8_t unicode_prop_ID_Start_table[1024] = {
+    0xc0, 0x99, 0x85, 0x99, 0xae, 0x80, 0x89, 0x03,
+    0x04, 0x96, 0x80, 0x9e, 0x80, 0x41, 0xc9, 0x83,
+    0x8b, 0x8d, 0x26, 0x00, 0x80, 0x40, 0x80, 0x20,
+    0x09, 0x18, 0x05, 0x00, 0x10, 0x00, 0x93, 0x80,
+    0xd2, 0x80, 0x40, 0x8a, 0x87, 0x40, 0xa5, 0x80,
+    0xa5, 0x08, 0x85, 0xa8, 0xc6, 0x9a, 0x1b, 0xac,
+    0xaa, 0xa2, 0x08, 0xe2, 0x00, 0x8e, 0x0e, 0x81,
+    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,
+};
+
+static const uint8_t unicode_prop_ID_Continue1_table[607] = {
+    0xaf, 0x89, 0xa4, 0x80, 0xd6, 0x80, 0x42, 0x47,
+    0xef, 0x96, 0x80, 0x40, 0xfa, 0x84, 0x41, 0x08,
+    0xac, 0x00, 0x01, 0x01, 0x00, 0xc7, 0x8a, 0xaf,
+    0x9e, 0x28, 0xe4, 0x31, 0x29, 0x08, 0x19, 0x89,
+    0x96, 0x80, 0x9d, 0x9a, 0xda, 0x8a, 0x8e, 0x89,
+    0xa0, 0x88, 0x88, 0x80, 0x97, 0x18, 0x88, 0x02,
+    0x04, 0xaa, 0x82, 0xf6, 0x8e, 0x80, 0xa0, 0xb5,
+    0x10, 0x91, 0x06, 0x89, 0x09, 0x89, 0x90, 0x82,
+    0xb7, 0x00, 0x31, 0x09, 0x82, 0x88, 0x80, 0x89,
+    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,
+    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,
+    0xbc, 0x01, 0x86, 0x8b, 0x38, 0x89, 0xd6, 0x01,
+    0x88, 0x8a, 0x29, 0x89, 0xbd, 0x0d, 0x89, 0x8a,
+    0x00, 0x00, 0x03, 0x81, 0xb0, 0x93, 0x01, 0x84,
+    0x8a, 0x80, 0xa3, 0x88, 0x80, 0xe3, 0x93, 0x80,
+    0x89, 0x8b, 0x1b, 0x10, 0x11, 0x32, 0x83, 0x8c,
+    0x8b, 0x80, 0x8e, 0x42, 0xbe, 0x82, 0x88, 0x88,
+    0x43, 0x9f, 0x82, 0x9c, 0x82, 0x9c, 0x81, 0x9d,
+    0x81, 0xbf, 0x9f, 0x88, 0x01, 0x89, 0xa0, 0x11,
+    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,
+    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,
+};
+
+static const uint8_t unicode_prop_ID_Continue1_index[57] = {
+    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,
+};
+
+#ifdef CONFIG_ALL_UNICODE
+
+static const uint8_t unicode_cc_table[831] = {
+    0xb2, 0xcf, 0xd4, 0x00, 0xe8, 0x03, 0xdc, 0x00,
+    0xe8, 0x00, 0xd8, 0x04, 0xdc, 0x01, 0xca, 0x03,
+    0xdc, 0x01, 0xca, 0x0a, 0xdc, 0x04, 0x01, 0x03,
+    0xdc, 0xc7, 0x00, 0xf0, 0xc0, 0x02, 0xdc, 0xc2,
+    0x01, 0xdc, 0x80, 0xc2, 0x03, 0xdc, 0xc0, 0x00,
+    0xe8, 0x01, 0xdc, 0xc0, 0x41, 0xe9, 0x00, 0xea,
+    0x41, 0xe9, 0x00, 0xea, 0x00, 0xe9, 0xcc, 0xb0,
+    0xe2, 0xc4, 0xb0, 0xd8, 0x00, 0xdc, 0xc3, 0x00,
+    0xdc, 0xc2, 0x00, 0xde, 0x00, 0xdc, 0xc5, 0x05,
+    0xdc, 0xc1, 0x00, 0xdc, 0xc1, 0x00, 0xde, 0x00,
+    0xe4, 0xc0, 0x49, 0x0a, 0x43, 0x13, 0x80, 0x00,
+    0x17, 0x80, 0x41, 0x18, 0x80, 0xc0, 0x00, 0xdc,
+    0x80, 0x00, 0x12, 0xb0, 0x17, 0xc7, 0x42, 0x1e,
+    0xaf, 0x47, 0x1b, 0xc1, 0x01, 0xdc, 0xc4, 0x00,
+    0xdc, 0xc1, 0x00, 0xdc, 0x8f, 0x00, 0x23, 0xb0,
+    0x34, 0xc6, 0x81, 0xc3, 0x00, 0xdc, 0xc0, 0x81,
+    0xc1, 0x80, 0x00, 0xdc, 0xc1, 0x00, 0xdc, 0xa2,
+    0x00, 0x24, 0x9d, 0xc0, 0x00, 0xdc, 0xc1, 0x00,
+    0xdc, 0xc1, 0x02, 0xdc, 0xc0, 0x01, 0xdc, 0xc0,
+    0x00, 0xdc, 0xc2, 0x00, 0xdc, 0xc0, 0x00, 0xdc,
+    0xc0, 0x00, 0xdc, 0xc0, 0x00, 0xdc, 0xc1, 0xb0,
+    0x6f, 0xc6, 0x00, 0xdc, 0xc0, 0x88, 0x00, 0xdc,
+    0x97, 0xc3, 0x80, 0xc8, 0x80, 0xc2, 0x80, 0xc4,
+    0xaa, 0x02, 0xdc, 0xb0, 0x46, 0x00, 0xdc, 0xcd,
+    0x80, 0x00, 0xdc, 0xc1, 0x00, 0xdc, 0xc1, 0x00,
+    0xdc, 0xc2, 0x02, 0xdc, 0x42, 0x1b, 0xc2, 0x00,
+    0xdc, 0xc1, 0x01, 0xdc, 0xc4, 0xb0, 0x0b, 0x00,
+    0x07, 0x8f, 0x00, 0x09, 0x82, 0xc0, 0x00, 0xdc,
+    0xc1, 0xb0, 0x36, 0x00, 0x07, 0x8f, 0x00, 0x09,
+    0xaf, 0xc0, 0xb0, 0x0c, 0x00, 0x07, 0x8f, 0x00,
+    0x09, 0xb0, 0x3d, 0x00, 0x07, 0x8f, 0x00, 0x09,
+    0xb0, 0x3d, 0x00, 0x07, 0x8f, 0x00, 0x09, 0xb0,
+    0x4e, 0x00, 0x09, 0xb0, 0x4e, 0x00, 0x09, 0x86,
+    0x00, 0x54, 0x00, 0x5b, 0xb0, 0x34, 0x00, 0x07,
+    0x8f, 0x00, 0x09, 0xb0, 0x3c, 0x01, 0x09, 0x8f,
+    0x00, 0x09, 0xb0, 0x4b, 0x00, 0x09, 0xb0, 0x3c,
+    0x01, 0x67, 0x00, 0x09, 0x8c, 0x03, 0x6b, 0xb0,
+    0x3b, 0x01, 0x76, 0x00, 0x09, 0x8c, 0x03, 0x7a,
+    0xb0, 0x1b, 0x01, 0xdc, 0x9a, 0x00, 0xdc, 0x80,
+    0x00, 0xdc, 0x80, 0x00, 0xd8, 0xb0, 0x06, 0x41,
+    0x81, 0x80, 0x00, 0x84, 0x84, 0x03, 0x82, 0x81,
+    0x00, 0x82, 0x80, 0xc1, 0x00, 0x09, 0x80, 0xc1,
+    0xb0, 0x0d, 0x00, 0xdc, 0xb0, 0x3f, 0x00, 0x07,
+    0x80, 0x01, 0x09, 0xb0, 0x21, 0x00, 0xdc, 0xb2,
+    0x9e, 0xc2, 0xb3, 0x83, 0x00, 0x09, 0x9e, 0x00,
+    0x09, 0xb0, 0x6c, 0x00, 0x09, 0x89, 0xc0, 0xb0,
+    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,
+    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,
+};
+
+static const uint8_t unicode_cc_index[78] = {
+    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,
+};
+
+static const uint32_t unicode_decomp_table1[687] = {
+    0x00280081, 0x002a0097, 0x002a8081, 0x002bc097,
+    0x002c8115, 0x002d0097, 0x002d4081, 0x002e0097,
+    0x002e4115, 0x002f0199, 0x00302016, 0x00400842,
+    0x00448a42, 0x004a0442, 0x004c0096, 0x004c8117,
+    0x004d0242, 0x004e4342, 0x004fc12f, 0x0050c342,
+    0x005240bf, 0x00530342, 0x00550942, 0x005a0842,
+    0x005e0096, 0x005e4342, 0x005fc081, 0x00680142,
+    0x006bc142, 0x00710185, 0x0071c317, 0x00734844,
+    0x00778344, 0x00798342, 0x007b02be, 0x007c4197,
+    0x007d0142, 0x007e0444, 0x00800e42, 0x00878142,
+    0x00898744, 0x00ac0483, 0x00b60317, 0x00b80283,
+    0x00d00214, 0x00d10096, 0x00dd0080, 0x00de8097,
+    0x00df8080, 0x00e10097, 0x00e1413e, 0x00e1c080,
+    0x00e204be, 0x00ea83ae, 0x00f282ae, 0x00f401ad,
+    0x00f4c12e, 0x00f54103, 0x00fc0303, 0x00fe4081,
+    0x0100023e, 0x0101c0be, 0x010301be, 0x010640be,
+    0x010e40be, 0x0114023e, 0x0115c0be, 0x011701be,
+    0x011d8144, 0x01304144, 0x01340244, 0x01358144,
+    0x01368344, 0x01388344, 0x013a8644, 0x013e0144,
+    0x0161c085, 0x018882ae, 0x019d422f, 0x01b00184,
+    0x01b4c084, 0x024a4084, 0x024c4084, 0x024d0084,
+    0x0256042e, 0x0272c12e, 0x02770120, 0x0277c084,
+    0x028cc084, 0x028d8084, 0x029641ae, 0x02978084,
+    0x02d20084, 0x02d2c12e, 0x02d70120, 0x02e50084,
+    0x02f281ae, 0x03120084, 0x03300084, 0x0331c122,
+    0x0332812e, 0x035281ae, 0x03768084, 0x037701ae,
+    0x038cc085, 0x03acc085, 0x03b7012f, 0x03c30081,
+    0x03d0c084, 0x03d34084, 0x03d48084, 0x03d5c084,
+    0x03d70084, 0x03da4084, 0x03dcc084, 0x03dd412e,
+    0x03ddc085, 0x03de0084, 0x03de4085, 0x03e04084,
+    0x03e4c084, 0x03e74084, 0x03e88084, 0x03e9c084,
+    0x03eb0084, 0x03ee4084, 0x04098084, 0x043f0081,
+    0x06c18484, 0x06c48084, 0x06cec184, 0x06d00120,
+    0x06d0c084, 0x074b0383, 0x074cc41f, 0x074f1783,
+    0x075e0081, 0x0766d283, 0x07801d44, 0x078e8942,
+    0x07931844, 0x079f0d42, 0x07a58216, 0x07a68085,
+    0x07a6c0be, 0x07a80d44, 0x07aea044, 0x07c00122,
+    0x07c08344, 0x07c20122, 0x07c28344, 0x07c40122,
+    0x07c48244, 0x07c60122, 0x07c68244, 0x07c8113e,
+    0x07d08244, 0x07d20122, 0x07d28244, 0x07d40122,
+    0x07d48344, 0x07d64c3e, 0x07dc4080, 0x07dc80be,
+    0x07dcc080, 0x07dd00be, 0x07dd4080, 0x07dd80be,
+    0x07ddc080, 0x07de00be, 0x07de4080, 0x07de80be,
+    0x07dec080, 0x07df00be, 0x07df4080, 0x07e00820,
+    0x07e40820, 0x07e80820, 0x07ec05be, 0x07eec080,
+    0x07ef00be, 0x07ef4097, 0x07ef8080, 0x07efc117,
+    0x07f0443e, 0x07f24080, 0x07f280be, 0x07f2c080,
+    0x07f303be, 0x07f4c080, 0x07f582ae, 0x07f6c080,
+    0x07f7433e, 0x07f8c080, 0x07f903ae, 0x07fac080,
+    0x07fb013e, 0x07fb8102, 0x07fc83be, 0x07fe4080,
+    0x07fe80be, 0x07fec080, 0x07ff00be, 0x07ff4080,
+    0x07ff8097, 0x0800011e, 0x08008495, 0x08044081,
+    0x0805c097, 0x08090081, 0x08094097, 0x08098099,
+    0x080bc081, 0x080cc085, 0x080d00b1, 0x080d8085,
+    0x080dc0b1, 0x080f0197, 0x0811c197, 0x0815c0b3,
+    0x0817c081, 0x081c0595, 0x081ec081, 0x081f0215,
+    0x0820051f, 0x08228583, 0x08254415, 0x082a0097,
+    0x08400119, 0x08408081, 0x0840c0bf, 0x08414119,
+    0x0841c081, 0x084240bf, 0x0842852d, 0x08454081,
+    0x08458097, 0x08464295, 0x08480097, 0x08484099,
+    0x08488097, 0x08490081, 0x08498080, 0x084a0081,
+    0x084a8102, 0x084b0495, 0x084d421f, 0x084e4081,
+    0x084ec099, 0x084f0283, 0x08514295, 0x08540119,
+    0x0854809b, 0x0854c619, 0x0857c097, 0x08580081,
+    0x08584097, 0x08588099, 0x0858c097, 0x08590081,
+    0x08594097, 0x08598099, 0x0859c09b, 0x085a0097,
+    0x085a4081, 0x085a8097, 0x085ac099, 0x085b0295,
+    0x085c4097, 0x085c8099, 0x085cc097, 0x085d0081,
+    0x085d4097, 0x085d8099, 0x085dc09b, 0x085e0097,
+    0x085e4081, 0x085e8097, 0x085ec099, 0x085f0215,
+    0x08624099, 0x0866813e, 0x086b80be, 0x087341be,
+    0x088100be, 0x088240be, 0x088300be, 0x088901be,
+    0x088b0085, 0x088b40b1, 0x088bc085, 0x088c00b1,
+    0x089040be, 0x089100be, 0x0891c1be, 0x089801be,
+    0x089b42be, 0x089d0144, 0x089e0144, 0x08a00144,
+    0x08a10144, 0x08a20144, 0x08ab023e, 0x08b80244,
+    0x08ba8220, 0x08ca411e, 0x0918049f, 0x091a4523,
+    0x091cc097, 0x091d04a5, 0x091f452b, 0x0921c09b,
+    0x092204a1, 0x09244525, 0x0926c099, 0x09270d25,
+    0x092d8d1f, 0x09340d1f, 0x093a8081, 0x0a8300b3,
+    0x0a9d0099, 0x0a9d4097, 0x0a9d8099, 0x0ab700be,
+    0x0b1f0115, 0x0b5bc081, 0x0ba7c081, 0x0bbcc081,
+    0x0bc004ad, 0x0bc244ad, 0x0bc484ad, 0x0bc6f383,
+    0x0be0852d, 0x0be31d03, 0x0bf1882d, 0x0c000081,
+    0x0c0d8283, 0x0c130b84, 0x0c194284, 0x0c1c0122,
+    0x0c1cc122, 0x0c1d8122, 0x0c1e4122, 0x0c1f0122,
+    0x0c250084, 0x0c26c123, 0x0c278084, 0x0c27c085,
+    0x0c2b0b84, 0x0c314284, 0x0c340122, 0x0c34c122,
+    0x0c358122, 0x0c364122, 0x0c370122, 0x0c3d0084,
+    0x0c3dc220, 0x0c3f8084, 0x0c3fc085, 0x0c4c4a2d,
+    0x0c51451f, 0x0c53ca9f, 0x0c5915ad, 0x0c648703,
+    0x0c800741, 0x0c838089, 0x0c83c129, 0x0c8441a9,
+    0x0c850089, 0x0c854129, 0x0c85c2a9, 0x0c870089,
+    0x0c87408f, 0x0c87808d, 0x0c881241, 0x0c910203,
+    0x0c940099, 0x0c9444a3, 0x0c968323, 0x0c98072d,
+    0x0c9b84af, 0x0c9dc2a1, 0x0c9f00b5, 0x0c9f40b3,
+    0x0c9f8085, 0x0ca01883, 0x0cac4223, 0x0cad4523,
+    0x0cafc097, 0x0cb004a1, 0x0cb241a5, 0x0cb30097,
+    0x0cb34099, 0x0cb38097, 0x0cb3c099, 0x0cb417ad,
+    0x0cbfc085, 0x0cc001b3, 0x0cc0c0b1, 0x0cc100b3,
+    0x0cc14131, 0x0cc1c0b5, 0x0cc200b3, 0x0cc241b1,
+    0x0cc30133, 0x0cc38131, 0x0cc40085, 0x0cc440b1,
+    0x0cc48133, 0x0cc50085, 0x0cc540b5, 0x0cc580b7,
+    0x0cc5c0b5, 0x0cc600b1, 0x0cc64135, 0x0cc6c0b3,
+    0x0cc701b1, 0x0cc7c0b3, 0x0cc800b5, 0x0cc840b3,
+    0x0cc881b1, 0x0cc9422f, 0x0cca4131, 0x0ccac0b5,
+    0x0ccb00b1, 0x0ccb40b3, 0x0ccb80b5, 0x0ccbc0b1,
+    0x0ccc012f, 0x0ccc80b5, 0x0cccc0b3, 0x0ccd00b5,
+    0x0ccd40b1, 0x0ccd80b5, 0x0ccdc085, 0x0cce02b1,
+    0x0ccf40b3, 0x0ccf80b1, 0x0ccfc085, 0x0cd001b1,
+    0x0cd0c0b3, 0x0cd101b1, 0x0cd1c0b5, 0x0cd200b3,
+    0x0cd24085, 0x0cd280b5, 0x0cd2c085, 0x0cd30133,
+    0x0cd381b1, 0x0cd440b3, 0x0cd48085, 0x0cd4c0b1,
+    0x0cd500b3, 0x0cd54085, 0x0cd580b5, 0x0cd5c0b1,
+    0x0cd60521, 0x0cd88525, 0x0cdb02a5, 0x0cdc4099,
+    0x0cdc8117, 0x0cdd0099, 0x0cdd4197, 0x0cde0127,
+    0x0cde8285, 0x0cdfc089, 0x0ce0043f, 0x0ce20099,
+    0x0ce2409b, 0x0ce283bf, 0x0ce44219, 0x0ce54205,
+    0x0ce6433f, 0x0ce7c131, 0x0ce84085, 0x0ce881b1,
+    0x0ce94085, 0x0ce98107, 0x0cea0089, 0x0cea4097,
+    0x0cea8219, 0x0ceb809d, 0x0cebc08d, 0x0cec083f,
+    0x0cf00105, 0x0cf0809b, 0x0cf0c197, 0x0cf1809b,
+    0x0cf1c099, 0x0cf20517, 0x0cf48099, 0x0cf4c117,
+    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,
+};
+
+static const uint16_t unicode_decomp_table2[687] = {
+    0x0020, 0x0000, 0x0061, 0x0002, 0x0004, 0x0006, 0x03bc, 0x0008,
+    0x000a, 0x000c, 0x0015, 0x0095, 0x00a5, 0x00b9, 0x00c1, 0x00c3,
+    0x00c7, 0x00cb, 0x00d1, 0x00d7, 0x00dd, 0x00e0, 0x00e6, 0x00f8,
+    0x0108, 0x010a, 0x0073, 0x0110, 0x0112, 0x0114, 0x0120, 0x012c,
+    0x0144, 0x014d, 0x0153, 0x0162, 0x0168, 0x016a, 0x0176, 0x0192,
+    0x0194, 0x01a9, 0x01bb, 0x01c7, 0x01d1, 0x01d5, 0x02b9, 0x01d7,
+    0x003b, 0x01d9, 0x01db, 0x00b7, 0x01e1, 0x01fc, 0x020c, 0x0218,
+    0x021d, 0x0223, 0x0227, 0x03a3, 0x0233, 0x023f, 0x0242, 0x024b,
+    0x024e, 0x0251, 0x025d, 0x0260, 0x0269, 0x026c, 0x026f, 0x0275,
+    0x0278, 0x0281, 0x028a, 0x029c, 0x029f, 0x02a3, 0x02af, 0x02b9,
+    0x02c5, 0x02c9, 0x02cd, 0x02d1, 0x02d5, 0x02e7, 0x02ed, 0x02f1,
+    0x02f5, 0x02f9, 0x02fd, 0x0305, 0x0309, 0x030d, 0x0313, 0x0317,
+    0x031b, 0x0323, 0x0327, 0x032b, 0x032f, 0x0335, 0x033d, 0x0341,
+    0x0349, 0x034d, 0x0351, 0x0f0b, 0x0357, 0x035b, 0x035f, 0x0363,
+    0x0367, 0x036b, 0x036f, 0x0373, 0x0379, 0x037d, 0x0381, 0x0385,
+    0x0389, 0x038d, 0x0391, 0x0395, 0x0399, 0x039d, 0x03a1, 0x10dc,
+    0x03a5, 0x03c9, 0x03cd, 0x03d9, 0x03dd, 0x03e1, 0x03ef, 0x03f1,
+    0x043d, 0x044f, 0x0499, 0x04f0, 0x0502, 0x054a, 0x0564, 0x056c,
+    0x0570, 0x0573, 0x059a, 0x05fa, 0x05fe, 0x0607, 0x060b, 0x0614,
+    0x0618, 0x061e, 0x0622, 0x0628, 0x068e, 0x0694, 0x0698, 0x069e,
+    0x06a2, 0x06ab, 0x03ac, 0x06f3, 0x03ad, 0x06f6, 0x03ae, 0x06f9,
+    0x03af, 0x06fc, 0x03cc, 0x06ff, 0x03cd, 0x0702, 0x03ce, 0x0705,
+    0x0709, 0x070d, 0x0711, 0x0386, 0x0732, 0x0735, 0x03b9, 0x0737,
+    0x073b, 0x0388, 0x0753, 0x0389, 0x0756, 0x0390, 0x076b, 0x038a,
+    0x0777, 0x03b0, 0x0789, 0x038e, 0x0799, 0x079f, 0x07a3, 0x038c,
+    0x07b8, 0x038f, 0x07bb, 0x00b4, 0x07be, 0x07c0, 0x07c2, 0x2010,
+    0x07cb, 0x002e, 0x07cd, 0x07cf, 0x0020, 0x07d2, 0x07d6, 0x07db,
+    0x07df, 0x07e4, 0x07ea, 0x07f0, 0x0020, 0x07f6, 0x2212, 0x0801,
+    0x0805, 0x0807, 0x081d, 0x0825, 0x0827, 0x0043, 0x082d, 0x0830,
+    0x0190, 0x0836, 0x0839, 0x004e, 0x0845, 0x0847, 0x084c, 0x084e,
+    0x0851, 0x005a, 0x03a9, 0x005a, 0x0853, 0x0857, 0x0860, 0x0069,
+    0x0862, 0x0865, 0x086f, 0x0874, 0x087a, 0x087e, 0x08a2, 0x0049,
+    0x08a4, 0x08a6, 0x08a9, 0x0056, 0x08ab, 0x08ad, 0x08b0, 0x08b4,
+    0x0058, 0x08b6, 0x08b8, 0x08bb, 0x08c0, 0x08c2, 0x08c5, 0x0076,
+    0x08c7, 0x08c9, 0x08cc, 0x08d0, 0x0078, 0x08d2, 0x08d4, 0x08d7,
+    0x08db, 0x08de, 0x08e4, 0x08e7, 0x08f0, 0x08f3, 0x08f6, 0x08f9,
+    0x0902, 0x0906, 0x090b, 0x090f, 0x0914, 0x0917, 0x091a, 0x0923,
+    0x092c, 0x093b, 0x093e, 0x0941, 0x0944, 0x0947, 0x094a, 0x0956,
+    0x095c, 0x0960, 0x0962, 0x0964, 0x0968, 0x096a, 0x0970, 0x0978,
+    0x097c, 0x0980, 0x0986, 0x0989, 0x098f, 0x0991, 0x0030, 0x0993,
+    0x0999, 0x099c, 0x099e, 0x09a1, 0x09a4, 0x2d61, 0x6bcd, 0x9f9f,
+    0x09a6, 0x09b1, 0x09bc, 0x09c7, 0x0a95, 0x0aa1, 0x0b15, 0x0020,
+    0x0b27, 0x0b31, 0x0b8d, 0x0ba1, 0x0ba5, 0x0ba9, 0x0bad, 0x0bb1,
+    0x0bb5, 0x0bb9, 0x0bbd, 0x0bc1, 0x0bc5, 0x0c21, 0x0c35, 0x0c39,
+    0x0c3d, 0x0c41, 0x0c45, 0x0c49, 0x0c4d, 0x0c51, 0x0c55, 0x0c59,
+    0x0c6f, 0x0c71, 0x0c73, 0x0ca0, 0x0cbc, 0x0cdc, 0x0ce4, 0x0cec,
+    0x0cf4, 0x0cfc, 0x0d04, 0x0d0c, 0x0d14, 0x0d22, 0x0d2e, 0x0d7a,
+    0x0d82, 0x0d85, 0x0d89, 0x0d8d, 0x0d9d, 0x0db1, 0x0db5, 0x0dbc,
+    0x0dc2, 0x0dc6, 0x0e28, 0x0e2c, 0x0e30, 0x0e32, 0x0e36, 0x0e3c,
+    0x0e3e, 0x0e41, 0x0e43, 0x0e46, 0x0e77, 0x0e7b, 0x0e89, 0x0e8e,
+    0x0e94, 0x0e9c, 0x0ea3, 0x0ea9, 0x0eb4, 0x0ebe, 0x0ec6, 0x0eca,
+    0x0ecf, 0x0ed9, 0x0edd, 0x0ee4, 0x0eec, 0x0ef3, 0x0ef8, 0x0f04,
+    0x0f0a, 0x0f15, 0x0f1b, 0x0f22, 0x0f28, 0x0f33, 0x0f3d, 0x0f45,
+    0x0f4c, 0x0f51, 0x0f57, 0x0f5e, 0x0f63, 0x0f69, 0x0f70, 0x0f76,
+    0x0f7d, 0x0f82, 0x0f89, 0x0f8d, 0x0f9e, 0x0fa4, 0x0fa9, 0x0fad,
+    0x0fb8, 0x0fbe, 0x0fc9, 0x0fd0, 0x0fd6, 0x0fda, 0x0fe1, 0x0fe5,
+    0x0fef, 0x0ffa, 0x1000, 0x1004, 0x1009, 0x100f, 0x1013, 0x101a,
+    0x101f, 0x1023, 0x1029, 0x102f, 0x1032, 0x1036, 0x1039, 0x103f,
+    0x1045, 0x1059, 0x1061, 0x1079, 0x107c, 0x1080, 0x1095, 0x10a1,
+    0x10b1, 0x10c3, 0x10cb, 0x10cf, 0x10da, 0x10de, 0x10ea, 0x10f2,
+    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,
+};
+
+static const uint8_t unicode_decomp_data[9158] = {
+    0x20, 0x88, 0x20, 0x84, 0x32, 0x33, 0x20, 0x81,
+    0x20, 0xa7, 0x31, 0x6f, 0x31, 0xd0, 0x34, 0x31,
+    0xd0, 0x32, 0x33, 0xd0, 0x34, 0x41, 0x80, 0x41,
+    0x81, 0x41, 0x82, 0x41, 0x83, 0x41, 0x88, 0x41,
+    0x8a, 0x00, 0x00, 0x43, 0xa7, 0x45, 0x80, 0x45,
+    0x81, 0x45, 0x82, 0x45, 0x88, 0x49, 0x80, 0x49,
+    0x81, 0x49, 0x82, 0x49, 0x88, 0x00, 0x00, 0x4e,
+    0x83, 0x4f, 0x80, 0x4f, 0x81, 0x4f, 0x82, 0x4f,
+    0x83, 0x4f, 0x88, 0x00, 0x00, 0x00, 0x00, 0x55,
+    0x80, 0x55, 0x81, 0x55, 0x82, 0x55, 0x88, 0x59,
+    0x81, 0x00, 0x00, 0x00, 0x00, 0x61, 0x80, 0x61,
+    0x81, 0x61, 0x82, 0x61, 0x83, 0x61, 0x88, 0x61,
+    0x8a, 0x00, 0x00, 0x63, 0xa7, 0x65, 0x80, 0x65,
+    0x81, 0x65, 0x82, 0x65, 0x88, 0x69, 0x80, 0x69,
+    0x81, 0x69, 0x82, 0x69, 0x88, 0x00, 0x00, 0x6e,
+    0x83, 0x6f, 0x80, 0x6f, 0x81, 0x6f, 0x82, 0x6f,
+    0x83, 0x6f, 0x88, 0x00, 0x00, 0x00, 0x00, 0x75,
+    0x80, 0x75, 0x81, 0x75, 0x82, 0x75, 0x88, 0x79,
+    0x81, 0x00, 0x00, 0x79, 0x88, 0x41, 0x84, 0x41,
+    0x86, 0x41, 0xa8, 0x43, 0x81, 0x43, 0x82, 0x43,
+    0x87, 0x43, 0x8c, 0x44, 0x8c, 0x45, 0x84, 0x45,
+    0x86, 0x45, 0x87, 0x45, 0xa8, 0x45, 0x8c, 0x47,
+    0x82, 0x47, 0x86, 0x47, 0x87, 0x47, 0xa7, 0x48,
+    0x82, 0x49, 0x83, 0x49, 0x84, 0x49, 0x86, 0x49,
+    0xa8, 0x49, 0x87, 0x49, 0x4a, 0x69, 0x6a, 0x4a,
+    0x82, 0x4b, 0xa7, 0x4c, 0x81, 0x4c, 0xa7, 0x4c,
+    0x8c, 0x4c, 0x00, 0x00, 0x6b, 0x20, 0x6b, 0x4e,
+    0x81, 0x4e, 0xa7, 0x4e, 0x8c, 0xbc, 0x02, 0x6e,
+    0x4f, 0x84, 0x4f, 0x86, 0x4f, 0x8b, 0x52, 0x81,
+    0x52, 0xa7, 0x52, 0x8c, 0x53, 0x81, 0x53, 0x82,
+    0x53, 0xa7, 0x53, 0x8c, 0x54, 0xa7, 0x54, 0x8c,
+    0x55, 0x83, 0x55, 0x84, 0x55, 0x86, 0x55, 0x8a,
+    0x55, 0x8b, 0x55, 0xa8, 0x57, 0x82, 0x59, 0x82,
+    0x59, 0x88, 0x5a, 0x81, 0x5a, 0x87, 0x5a, 0x8c,
+    0x4f, 0x9b, 0x55, 0x9b, 0x44, 0x00, 0x7d, 0x01,
+    0x44, 0x00, 0x7e, 0x01, 0x64, 0x00, 0x7e, 0x01,
+    0x4c, 0x4a, 0x4c, 0x6a, 0x6c, 0x6a, 0x4e, 0x4a,
+    0x4e, 0x6a, 0x6e, 0x6a, 0x41, 0x00, 0x8c, 0x49,
+    0x00, 0x8c, 0x4f, 0x00, 0x8c, 0x55, 0x00, 0x8c,
+    0xdc, 0x00, 0x84, 0xdc, 0x00, 0x81, 0xdc, 0x00,
+    0x8c, 0xdc, 0x00, 0x80, 0xc4, 0x00, 0x84, 0x26,
+    0x02, 0x84, 0xc6, 0x00, 0x84, 0x47, 0x8c, 0x4b,
+    0x8c, 0x4f, 0xa8, 0xea, 0x01, 0x84, 0xeb, 0x01,
+    0x84, 0xb7, 0x01, 0x8c, 0x92, 0x02, 0x8c, 0x6a,
+    0x00, 0x8c, 0x44, 0x5a, 0x44, 0x7a, 0x64, 0x7a,
+    0x47, 0x81, 0x4e, 0x00, 0x80, 0xc5, 0x00, 0x81,
+    0xc6, 0x00, 0x81, 0xd8, 0x00, 0x81, 0x41, 0x8f,
+    0x41, 0x91, 0x45, 0x8f, 0x45, 0x91, 0x49, 0x8f,
+    0x49, 0x91, 0x4f, 0x8f, 0x4f, 0x91, 0x52, 0x8f,
+    0x52, 0x91, 0x55, 0x8f, 0x55, 0x91, 0x53, 0xa6,
+    0x54, 0xa6, 0x48, 0x8c, 0x41, 0x00, 0x87, 0x45,
+    0x00, 0xa7, 0xd6, 0x00, 0x84, 0xd5, 0x00, 0x84,
+    0x4f, 0x00, 0x87, 0x2e, 0x02, 0x84, 0x59, 0x00,
+    0x84, 0x68, 0x00, 0x66, 0x02, 0x6a, 0x00, 0x72,
+    0x00, 0x79, 0x02, 0x7b, 0x02, 0x81, 0x02, 0x77,
+    0x00, 0x79, 0x00, 0x20, 0x86, 0x20, 0x87, 0x20,
+    0x8a, 0x20, 0xa8, 0x20, 0x83, 0x20, 0x8b, 0x63,
+    0x02, 0x6c, 0x00, 0x73, 0x00, 0x78, 0x00, 0x95,
+    0x02, 0x80, 0x81, 0x00, 0x93, 0x88, 0x81, 0x20,
+    0xc5, 0x20, 0x81, 0xa8, 0x00, 0x81, 0x91, 0x03,
+    0x81, 0x95, 0x03, 0x81, 0x97, 0x03, 0x81, 0x99,
+    0x03, 0x81, 0x00, 0x00, 0x00, 0x9f, 0x03, 0x81,
+    0x00, 0x00, 0x00, 0xa5, 0x03, 0x81, 0xa9, 0x03,
+    0x81, 0xca, 0x03, 0x81, 0x01, 0x03, 0x98, 0x07,
+    0xa4, 0x07, 0xb0, 0x00, 0xb4, 0x00, 0xb6, 0x00,
+    0xb8, 0x00, 0xca, 0x00, 0x01, 0x03, 0xb8, 0x07,
+    0xc4, 0x07, 0xbe, 0x00, 0xc4, 0x00, 0xc8, 0x00,
+    0xa5, 0x03, 0x0d, 0x13, 0x00, 0x01, 0x03, 0xd1,
+    0x00, 0xd1, 0x07, 0xc6, 0x03, 0xc0, 0x03, 0xba,
+    0x03, 0xc1, 0x03, 0xc2, 0x03, 0x00, 0x00, 0x98,
+    0x03, 0xb5, 0x03, 0x15, 0x04, 0x80, 0x15, 0x04,
+    0x88, 0x00, 0x00, 0x00, 0x13, 0x04, 0x81, 0x06,
+    0x04, 0x88, 0x1a, 0x04, 0x81, 0x18, 0x04, 0x80,
+    0x23, 0x04, 0x86, 0x18, 0x04, 0x86, 0x38, 0x04,
+    0x86, 0x35, 0x04, 0x80, 0x35, 0x04, 0x88, 0x00,
+    0x00, 0x00, 0x33, 0x04, 0x81, 0x56, 0x04, 0x88,
+    0x3a, 0x04, 0x81, 0x38, 0x04, 0x80, 0x43, 0x04,
+    0x86, 0x74, 0x04, 0x8f, 0x16, 0x04, 0x86, 0x10,
+    0x04, 0x86, 0x10, 0x04, 0x88, 0x15, 0x04, 0x86,
+    0xd8, 0x04, 0x88, 0x16, 0x04, 0x88, 0x17, 0x04,
+    0x88, 0x18, 0x04, 0x84, 0x18, 0x04, 0x88, 0x1e,
+    0x04, 0x88, 0xe8, 0x04, 0x88, 0x2d, 0x04, 0x88,
+    0x23, 0x04, 0x84, 0x23, 0x04, 0x88, 0x23, 0x04,
+    0x8b, 0x27, 0x04, 0x88, 0x2b, 0x04, 0x88, 0x65,
+    0x05, 0x82, 0x05, 0x27, 0x06, 0x00, 0x2c, 0x00,
+    0x2d, 0x21, 0x2d, 0x00, 0x2e, 0x23, 0x2d, 0x27,
+    0x06, 0x00, 0x4d, 0x21, 0x4d, 0xa0, 0x4d, 0x23,
+    0x4d, 0xd5, 0x06, 0x54, 0x06, 0x00, 0x00, 0x00,
+    0x00, 0xc1, 0x06, 0x54, 0x06, 0xd2, 0x06, 0x54,
+    0x06, 0x28, 0x09, 0x3c, 0x09, 0x30, 0x09, 0x3c,
+    0x09, 0x33, 0x09, 0x3c, 0x09, 0x15, 0x09, 0x00,
+    0x27, 0x01, 0x27, 0x02, 0x27, 0x07, 0x27, 0x0c,
+    0x27, 0x0d, 0x27, 0x16, 0x27, 0x1a, 0x27, 0xbe,
+    0x09, 0x09, 0x00, 0x09, 0x19, 0xa1, 0x09, 0xbc,
+    0x09, 0xaf, 0x09, 0xbc, 0x09, 0x32, 0x0a, 0x3c,
+    0x0a, 0x38, 0x0a, 0x3c, 0x0a, 0x16, 0x0a, 0x00,
+    0x26, 0x01, 0x26, 0x06, 0x26, 0x2b, 0x0a, 0x3c,
+    0x0a, 0x47, 0x0b, 0x56, 0x0b, 0x3e, 0x0b, 0x09,
+    0x00, 0x09, 0x19, 0x21, 0x0b, 0x3c, 0x0b, 0x92,
+    0x0b, 0xd7, 0x0b, 0xbe, 0x0b, 0x08, 0x00, 0x09,
+    0x00, 0x08, 0x19, 0x46, 0x0c, 0x56, 0x0c, 0xbf,
+    0x0c, 0xd5, 0x0c, 0xc6, 0x0c, 0xd5, 0x0c, 0xc2,
+    0x0c, 0x04, 0x00, 0x08, 0x13, 0x3e, 0x0d, 0x08,
+    0x00, 0x09, 0x00, 0x08, 0x19, 0xd9, 0x0d, 0xca,
+    0x0d, 0xca, 0x0d, 0x0f, 0x05, 0x12, 0x00, 0x0f,
+    0x15, 0x4d, 0x0e, 0x32, 0x0e, 0xcd, 0x0e, 0xb2,
+    0x0e, 0x99, 0x0e, 0x12, 0x00, 0x12, 0x08, 0x42,
+    0x0f, 0xb7, 0x0f, 0x4c, 0x0f, 0xb7, 0x0f, 0x51,
+    0x0f, 0xb7, 0x0f, 0x56, 0x0f, 0xb7, 0x0f, 0x5b,
+    0x0f, 0xb7, 0x0f, 0x40, 0x0f, 0xb5, 0x0f, 0x71,
+    0x0f, 0x72, 0x0f, 0x71, 0x0f, 0x00, 0x03, 0x41,
+    0x0f, 0xb2, 0x0f, 0x81, 0x0f, 0xb3, 0x0f, 0x80,
+    0x0f, 0xb3, 0x0f, 0x81, 0x0f, 0x71, 0x0f, 0x80,
+    0x0f, 0x92, 0x0f, 0xb7, 0x0f, 0x9c, 0x0f, 0xb7,
+    0x0f, 0xa1, 0x0f, 0xb7, 0x0f, 0xa6, 0x0f, 0xb7,
+    0x0f, 0xab, 0x0f, 0xb7, 0x0f, 0x90, 0x0f, 0xb5,
+    0x0f, 0x25, 0x10, 0x2e, 0x10, 0x05, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x09, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x1b, 0x35,
+    0x1b, 0x11, 0x1b, 0x35, 0x1b, 0x3a, 0x1b, 0x35,
+    0x1b, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x1b, 0x35,
+    0x1b, 0x3e, 0x1b, 0x35, 0x1b, 0x42, 0x1b, 0x35,
+    0x1b, 0x41, 0x00, 0xc6, 0x00, 0x42, 0x00, 0x00,
+    0x00, 0x44, 0x00, 0x45, 0x00, 0x8e, 0x01, 0x47,
+    0x00, 0x4f, 0x00, 0x22, 0x02, 0x50, 0x00, 0x52,
+    0x00, 0x54, 0x00, 0x55, 0x00, 0x57, 0x00, 0x61,
+    0x00, 0x50, 0x02, 0x51, 0x02, 0x02, 0x1d, 0x62,
+    0x00, 0x64, 0x00, 0x65, 0x00, 0x59, 0x02, 0x5b,
+    0x02, 0x5c, 0x02, 0x67, 0x00, 0x00, 0x00, 0x6b,
+    0x00, 0x6d, 0x00, 0x4b, 0x01, 0x6f, 0x00, 0x54,
+    0x02, 0x16, 0x1d, 0x17, 0x1d, 0x70, 0x00, 0x74,
+    0x00, 0x75, 0x00, 0x1d, 0x1d, 0x6f, 0x02, 0x76,
+    0x00, 0x25, 0x1d, 0xb2, 0x03, 0xb3, 0x03, 0xb4,
+    0x03, 0xc6, 0x03, 0xc7, 0x03, 0x69, 0x00, 0x72,
+    0x00, 0x75, 0x00, 0x76, 0x00, 0xb2, 0x03, 0xb3,
+    0x03, 0xc1, 0x03, 0xc6, 0x03, 0xc7, 0x03, 0x52,
+    0x02, 0x63, 0x00, 0x55, 0x02, 0xf0, 0x00, 0x5c,
+    0x02, 0x66, 0x00, 0x5f, 0x02, 0x61, 0x02, 0x65,
+    0x02, 0x68, 0x02, 0x69, 0x02, 0x6a, 0x02, 0x7b,
+    0x1d, 0x9d, 0x02, 0x6d, 0x02, 0x85, 0x1d, 0x9f,
+    0x02, 0x71, 0x02, 0x70, 0x02, 0x72, 0x02, 0x73,
+    0x02, 0x74, 0x02, 0x75, 0x02, 0x78, 0x02, 0x82,
+    0x02, 0x83, 0x02, 0xab, 0x01, 0x89, 0x02, 0x8a,
+    0x02, 0x1c, 0x1d, 0x8b, 0x02, 0x8c, 0x02, 0x7a,
+    0x00, 0x90, 0x02, 0x91, 0x02, 0x92, 0x02, 0xb8,
+    0x03, 0x41, 0x00, 0xa5, 0x42, 0x00, 0x87, 0x42,
+    0x00, 0xa3, 0x42, 0x00, 0xb1, 0xc7, 0x00, 0x81,
+    0x44, 0x00, 0x87, 0x44, 0x00, 0xa3, 0x44, 0x00,
+    0xb1, 0x44, 0x00, 0xa7, 0x44, 0x00, 0xad, 0x12,
+    0x01, 0x80, 0x12, 0x01, 0x81, 0x45, 0x00, 0xad,
+    0x45, 0x00, 0xb0, 0x28, 0x02, 0x86, 0x46, 0x00,
+    0x87, 0x47, 0x00, 0x84, 0x48, 0x00, 0x87, 0x48,
+    0x00, 0xa3, 0x48, 0x00, 0x88, 0x48, 0x00, 0xa7,
+    0x48, 0x00, 0xae, 0x49, 0x00, 0xb0, 0xcf, 0x00,
+    0x81, 0x4b, 0x00, 0x81, 0x4b, 0x00, 0xa3, 0x4b,
+    0x00, 0xb1, 0x4c, 0x00, 0xa3, 0x36, 0x1e, 0x84,
+    0x4c, 0xb1, 0x4c, 0xad, 0x4d, 0x81, 0x4d, 0x87,
+    0x4d, 0xa3, 0x4e, 0x87, 0x4e, 0xa3, 0x4e, 0xb1,
+    0x4e, 0xad, 0xd5, 0x00, 0x81, 0xd5, 0x00, 0x88,
+    0x4c, 0x01, 0x80, 0x4c, 0x01, 0x81, 0x50, 0x00,
+    0x81, 0x50, 0x00, 0x87, 0x52, 0x00, 0x87, 0x52,
+    0x00, 0xa3, 0x5a, 0x1e, 0x84, 0x52, 0x00, 0xb1,
+    0x53, 0x00, 0x87, 0x53, 0x00, 0xa3, 0x5a, 0x01,
+    0x87, 0x60, 0x01, 0x87, 0x62, 0x1e, 0x87, 0x54,
+    0x00, 0x87, 0x54, 0x00, 0xa3, 0x54, 0x00, 0xb1,
+    0x54, 0x00, 0xad, 0x55, 0x00, 0xa4, 0x55, 0x00,
+    0xb0, 0x55, 0x00, 0xad, 0x68, 0x01, 0x81, 0x6a,
+    0x01, 0x88, 0x56, 0x83, 0x56, 0xa3, 0x57, 0x80,
+    0x57, 0x81, 0x57, 0x88, 0x57, 0x87, 0x57, 0xa3,
+    0x58, 0x87, 0x58, 0x88, 0x59, 0x87, 0x5a, 0x82,
+    0x5a, 0xa3, 0x5a, 0xb1, 0x68, 0xb1, 0x74, 0x88,
+    0x77, 0x8a, 0x79, 0x8a, 0x61, 0x00, 0xbe, 0x02,
+    0x7f, 0x01, 0x87, 0x41, 0x00, 0xa3, 0x41, 0x00,
+    0x89, 0xc2, 0x00, 0x81, 0xc2, 0x00, 0x80, 0xc2,
+    0x00, 0x89, 0xc2, 0x00, 0x83, 0xa0, 0x1e, 0x82,
+    0x02, 0x01, 0x81, 0x02, 0x01, 0x80, 0x02, 0x01,
+    0x89, 0x02, 0x01, 0x83, 0xa0, 0x1e, 0x86, 0x45,
+    0x00, 0xa3, 0x45, 0x00, 0x89, 0x45, 0x00, 0x83,
+    0xca, 0x00, 0x81, 0xca, 0x00, 0x80, 0xca, 0x00,
+    0x89, 0xca, 0x00, 0x83, 0xb8, 0x1e, 0x82, 0x49,
+    0x00, 0x89, 0x49, 0x00, 0xa3, 0x4f, 0x00, 0xa3,
+    0x4f, 0x00, 0x89, 0xd4, 0x00, 0x81, 0xd4, 0x00,
+    0x80, 0xd4, 0x00, 0x89, 0xd4, 0x00, 0x83, 0xcc,
+    0x1e, 0x82, 0xa0, 0x01, 0x81, 0xa0, 0x01, 0x80,
+    0xa0, 0x01, 0x89, 0xa0, 0x01, 0x83, 0xa0, 0x01,
+    0xa3, 0x55, 0x00, 0xa3, 0x55, 0x00, 0x89, 0xaf,
+    0x01, 0x81, 0xaf, 0x01, 0x80, 0xaf, 0x01, 0x89,
+    0xaf, 0x01, 0x83, 0xaf, 0x01, 0xa3, 0x59, 0x00,
+    0x80, 0x59, 0x00, 0xa3, 0x59, 0x00, 0x89, 0x59,
+    0x00, 0x83, 0xb1, 0x03, 0x13, 0x03, 0x00, 0x1f,
+    0x80, 0x00, 0x1f, 0x81, 0x00, 0x1f, 0xc2, 0x91,
+    0x03, 0x13, 0x03, 0x08, 0x1f, 0x80, 0x08, 0x1f,
+    0x81, 0x08, 0x1f, 0xc2, 0xb5, 0x03, 0x13, 0x03,
+    0x10, 0x1f, 0x80, 0x10, 0x1f, 0x81, 0x95, 0x03,
+    0x13, 0x03, 0x18, 0x1f, 0x80, 0x18, 0x1f, 0x81,
+    0xb7, 0x03, 0x93, 0xb7, 0x03, 0x94, 0x20, 0x1f,
+    0x80, 0x21, 0x1f, 0x80, 0x20, 0x1f, 0x81, 0x21,
+    0x1f, 0x81, 0x20, 0x1f, 0xc2, 0x21, 0x1f, 0xc2,
+    0x97, 0x03, 0x93, 0x97, 0x03, 0x94, 0x28, 0x1f,
+    0x80, 0x29, 0x1f, 0x80, 0x28, 0x1f, 0x81, 0x29,
+    0x1f, 0x81, 0x28, 0x1f, 0xc2, 0x29, 0x1f, 0xc2,
+    0xb9, 0x03, 0x93, 0xb9, 0x03, 0x94, 0x30, 0x1f,
+    0x80, 0x31, 0x1f, 0x80, 0x30, 0x1f, 0x81, 0x31,
+    0x1f, 0x81, 0x30, 0x1f, 0xc2, 0x31, 0x1f, 0xc2,
+    0x99, 0x03, 0x93, 0x99, 0x03, 0x94, 0x38, 0x1f,
+    0x80, 0x39, 0x1f, 0x80, 0x38, 0x1f, 0x81, 0x39,
+    0x1f, 0x81, 0x38, 0x1f, 0xc2, 0x39, 0x1f, 0xc2,
+    0xbf, 0x03, 0x93, 0xbf, 0x03, 0x94, 0x40, 0x1f,
+    0x80, 0x40, 0x1f, 0x81, 0x9f, 0x03, 0x13, 0x03,
+    0x48, 0x1f, 0x80, 0x48, 0x1f, 0x81, 0xc5, 0x03,
+    0x13, 0x03, 0x50, 0x1f, 0x80, 0x50, 0x1f, 0x81,
+    0x50, 0x1f, 0xc2, 0xa5, 0x03, 0x94, 0x00, 0x00,
+    0x00, 0x59, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x59,
+    0x1f, 0x81, 0x00, 0x00, 0x00, 0x59, 0x1f, 0xc2,
+    0xc9, 0x03, 0x93, 0xc9, 0x03, 0x94, 0x60, 0x1f,
+    0x80, 0x61, 0x1f, 0x80, 0x60, 0x1f, 0x81, 0x61,
+    0x1f, 0x81, 0x60, 0x1f, 0xc2, 0x61, 0x1f, 0xc2,
+    0xa9, 0x03, 0x93, 0xa9, 0x03, 0x94, 0x68, 0x1f,
+    0x80, 0x69, 0x1f, 0x80, 0x68, 0x1f, 0x81, 0x69,
+    0x1f, 0x81, 0x68, 0x1f, 0xc2, 0x69, 0x1f, 0xc2,
+    0xb1, 0x03, 0x80, 0xb5, 0x03, 0x80, 0xb7, 0x03,
+    0x80, 0xb9, 0x03, 0x80, 0xbf, 0x03, 0x80, 0xc5,
+    0x03, 0x80, 0xc9, 0x03, 0x80, 0x00, 0x1f, 0x45,
+    0x03, 0x20, 0x1f, 0x45, 0x03, 0x60, 0x1f, 0x45,
+    0x03, 0xb1, 0x03, 0x86, 0xb1, 0x03, 0x84, 0x70,
+    0x1f, 0xc5, 0xb1, 0x03, 0xc5, 0xac, 0x03, 0xc5,
+    0x00, 0x00, 0x00, 0xb1, 0x03, 0xc2, 0xb6, 0x1f,
+    0xc5, 0x91, 0x03, 0x86, 0x91, 0x03, 0x84, 0x91,
+    0x03, 0x80, 0x91, 0x03, 0xc5, 0x20, 0x93, 0x20,
+    0x93, 0x20, 0xc2, 0xa8, 0x00, 0xc2, 0x74, 0x1f,
+    0xc5, 0xb7, 0x03, 0xc5, 0xae, 0x03, 0xc5, 0x00,
+    0x00, 0x00, 0xb7, 0x03, 0xc2, 0xc6, 0x1f, 0xc5,
+    0x95, 0x03, 0x80, 0x97, 0x03, 0x80, 0x97, 0x03,
+    0xc5, 0xbf, 0x1f, 0x80, 0xbf, 0x1f, 0x81, 0xbf,
+    0x1f, 0xc2, 0xb9, 0x03, 0x86, 0xb9, 0x03, 0x84,
+    0xca, 0x03, 0x80, 0x00, 0x03, 0xb9, 0x42, 0xca,
+    0x42, 0x99, 0x06, 0x99, 0x04, 0x99, 0x00, 0xfe,
+    0x1f, 0x80, 0xfe, 0x1f, 0x81, 0xfe, 0x1f, 0xc2,
+    0xc5, 0x03, 0x86, 0xc5, 0x03, 0x84, 0xcb, 0x03,
+    0x80, 0x00, 0x03, 0xc1, 0x13, 0xc1, 0x14, 0xc5,
+    0x42, 0xcb, 0x42, 0xa5, 0x06, 0xa5, 0x04, 0xa5,
+    0x00, 0xa1, 0x03, 0x94, 0xa8, 0x00, 0x80, 0x85,
+    0x03, 0x60, 0x00, 0x7c, 0x1f, 0xc5, 0xc9, 0x03,
+    0xc5, 0xce, 0x03, 0xc5, 0x00, 0x00, 0x00, 0xc9,
+    0x03, 0xc2, 0xf6, 0x1f, 0xc5, 0x9f, 0x03, 0x80,
+    0xa9, 0x03, 0x80, 0xa9, 0x03, 0xc5, 0x20, 0x94,
+    0x02, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+    0x20, 0x20, 0x20, 0x20, 0xb3, 0x2e, 0x2e, 0x2e,
+    0x2e, 0x2e, 0x32, 0x20, 0x32, 0x20, 0x32, 0x20,
+    0x00, 0x00, 0x00, 0x35, 0x20, 0x35, 0x20, 0x35,
+    0x20, 0x00, 0x00, 0x00, 0x21, 0x21, 0x00, 0x00,
+    0x20, 0x85, 0x3f, 0x3f, 0x3f, 0x21, 0x21, 0x3f,
+    0x32, 0x20, 0x00, 0x00, 0x00, 0x00, 0x30, 0x69,
+    0x00, 0x00, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x2b, 0x3d, 0x28, 0x29, 0x6e, 0x30, 0x00, 0x2b,
+    0x00, 0x12, 0x22, 0x3d, 0x00, 0x28, 0x00, 0x29,
+    0x00, 0x00, 0x00, 0x61, 0x00, 0x65, 0x00, 0x6f,
+    0x00, 0x78, 0x00, 0x59, 0x02, 0x68, 0x6b, 0x6c,
+    0x6d, 0x6e, 0x70, 0x73, 0x74, 0x52, 0x73, 0x61,
+    0x2f, 0x63, 0x61, 0x2f, 0x73, 0xb0, 0x00, 0x43,
+    0x63, 0x2f, 0x6f, 0x63, 0x2f, 0x75, 0xb0, 0x00,
+    0x46, 0x48, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x20,
+    0xdf, 0x01, 0x01, 0x04, 0x24, 0x4e, 0x6f, 0x50,
+    0x51, 0x52, 0x52, 0x52, 0x53, 0x4d, 0x54, 0x45,
+    0x4c, 0x54, 0x4d, 0x4b, 0x00, 0xc5, 0x00, 0x42,
+    0x43, 0x00, 0x65, 0x45, 0x46, 0x00, 0x4d, 0x6f,
+    0xd0, 0x05, 0x46, 0x41, 0x58, 0xc0, 0x03, 0xb3,
+    0x03, 0x93, 0x03, 0xa0, 0x03, 0x11, 0x22, 0x44,
+    0x64, 0x65, 0x69, 0x6a, 0x31, 0xd0, 0x37, 0x31,
+    0xd0, 0x39, 0x31, 0xd0, 0x31, 0x30, 0x31, 0xd0,
+    0x33, 0x32, 0xd0, 0x33, 0x31, 0xd0, 0x35, 0x32,
+    0xd0, 0x35, 0x33, 0xd0, 0x35, 0x34, 0xd0, 0x35,
+    0x31, 0xd0, 0x36, 0x35, 0xd0, 0x36, 0x31, 0xd0,
+    0x38, 0x33, 0xd0, 0x38, 0x35, 0xd0, 0x38, 0x37,
+    0xd0, 0x38, 0x31, 0xd0, 0x49, 0x49, 0x49, 0x49,
+    0x49, 0x49, 0x56, 0x56, 0x49, 0x56, 0x49, 0x49,
+    0x56, 0x49, 0x49, 0x49, 0x49, 0x58, 0x58, 0x49,
+    0x58, 0x49, 0x49, 0x4c, 0x43, 0x44, 0x4d, 0x69,
+    0x69, 0x69, 0x69, 0x69, 0x69, 0x69, 0x76, 0x76,
+    0x69, 0x76, 0x69, 0x69, 0x76, 0x69, 0x69, 0x69,
+    0x69, 0x78, 0x78, 0x69, 0x78, 0x69, 0x69, 0x6c,
+    0x63, 0x64, 0x6d, 0x30, 0xd0, 0x33, 0x90, 0x21,
+    0xb8, 0x92, 0x21, 0xb8, 0x94, 0x21, 0xb8, 0xd0,
+    0x21, 0xb8, 0xd4, 0x21, 0xb8, 0xd2, 0x21, 0xb8,
+    0x03, 0x22, 0xb8, 0x08, 0x22, 0xb8, 0x0b, 0x22,
+    0xb8, 0x23, 0x22, 0xb8, 0x00, 0x00, 0x00, 0x25,
+    0x22, 0xb8, 0x2b, 0x22, 0x2b, 0x22, 0x2b, 0x22,
+    0x00, 0x00, 0x00, 0x2e, 0x22, 0x2e, 0x22, 0x2e,
+    0x22, 0x00, 0x00, 0x00, 0x3c, 0x22, 0xb8, 0x43,
+    0x22, 0xb8, 0x45, 0x22, 0xb8, 0x00, 0x00, 0x00,
+    0x48, 0x22, 0xb8, 0x3d, 0x00, 0xb8, 0x00, 0x00,
+    0x00, 0x61, 0x22, 0xb8, 0x4d, 0x22, 0xb8, 0x3c,
+    0x00, 0xb8, 0x3e, 0x00, 0xb8, 0x64, 0x22, 0xb8,
+    0x65, 0x22, 0xb8, 0x72, 0x22, 0xb8, 0x76, 0x22,
+    0xb8, 0x7a, 0x22, 0xb8, 0x82, 0x22, 0xb8, 0x86,
+    0x22, 0xb8, 0xa2, 0x22, 0xb8, 0xa8, 0x22, 0xb8,
+    0xa9, 0x22, 0xb8, 0xab, 0x22, 0xb8, 0x7c, 0x22,
+    0xb8, 0x91, 0x22, 0xb8, 0xb2, 0x22, 0x38, 0x03,
+    0x08, 0x30, 0x31, 0x00, 0x31, 0x00, 0x30, 0x00,
+    0x32, 0x30, 0x28, 0x00, 0x31, 0x00, 0x29, 0x00,
+    0x28, 0x00, 0x31, 0x00, 0x30, 0x00, 0x29, 0x00,
+    0x28, 0x32, 0x30, 0x29, 0x31, 0x00, 0x2e, 0x00,
+    0x31, 0x00, 0x30, 0x00, 0x2e, 0x00, 0x32, 0x30,
+    0x2e, 0x28, 0x00, 0x61, 0x00, 0x29, 0x00, 0x41,
+    0x00, 0x61, 0x00, 0x2b, 0x22, 0x00, 0x00, 0x00,
+    0x00, 0x3a, 0x3a, 0x3d, 0x3d, 0x3d, 0x3d, 0x3d,
+    0x3d, 0xdd, 0x2a, 0xb8, 0x6a, 0x56, 0x00, 0x4e,
+    0x00, 0x28, 0x36, 0x3f, 0x59, 0x85, 0x8c, 0xa0,
+    0xba, 0x3f, 0x51, 0x00, 0x26, 0x2c, 0x43, 0x57,
+    0x6c, 0xa1, 0xb6, 0xc1, 0x9b, 0x52, 0x00, 0x5e,
+    0x7a, 0x7f, 0x9d, 0xa6, 0xc1, 0xce, 0xe7, 0xb6,
+    0x53, 0xc8, 0x53, 0xe3, 0x53, 0xd7, 0x56, 0x1f,
+    0x57, 0xeb, 0x58, 0x02, 0x59, 0x0a, 0x59, 0x15,
+    0x59, 0x27, 0x59, 0x73, 0x59, 0x50, 0x5b, 0x80,
+    0x5b, 0xf8, 0x5b, 0x0f, 0x5c, 0x22, 0x5c, 0x38,
+    0x5c, 0x6e, 0x5c, 0x71, 0x5c, 0xdb, 0x5d, 0xe5,
+    0x5d, 0xf1, 0x5d, 0xfe, 0x5d, 0x72, 0x5e, 0x7a,
+    0x5e, 0x7f, 0x5e, 0xf4, 0x5e, 0xfe, 0x5e, 0x0b,
+    0x5f, 0x13, 0x5f, 0x50, 0x5f, 0x61, 0x5f, 0x73,
+    0x5f, 0xc3, 0x5f, 0x08, 0x62, 0x36, 0x62, 0x4b,
+    0x62, 0x2f, 0x65, 0x34, 0x65, 0x87, 0x65, 0x97,
+    0x65, 0xa4, 0x65, 0xb9, 0x65, 0xe0, 0x65, 0xe5,
+    0x65, 0xf0, 0x66, 0x08, 0x67, 0x28, 0x67, 0x20,
+    0x6b, 0x62, 0x6b, 0x79, 0x6b, 0xb3, 0x6b, 0xcb,
+    0x6b, 0xd4, 0x6b, 0xdb, 0x6b, 0x0f, 0x6c, 0x14,
+    0x6c, 0x34, 0x6c, 0x6b, 0x70, 0x2a, 0x72, 0x36,
+    0x72, 0x3b, 0x72, 0x3f, 0x72, 0x47, 0x72, 0x59,
+    0x72, 0x5b, 0x72, 0xac, 0x72, 0x84, 0x73, 0x89,
+    0x73, 0xdc, 0x74, 0xe6, 0x74, 0x18, 0x75, 0x1f,
+    0x75, 0x28, 0x75, 0x30, 0x75, 0x8b, 0x75, 0x92,
+    0x75, 0x76, 0x76, 0x7d, 0x76, 0xae, 0x76, 0xbf,
+    0x76, 0xee, 0x76, 0xdb, 0x77, 0xe2, 0x77, 0xf3,
+    0x77, 0x3a, 0x79, 0xb8, 0x79, 0xbe, 0x79, 0x74,
+    0x7a, 0xcb, 0x7a, 0xf9, 0x7a, 0x73, 0x7c, 0xf8,
+    0x7c, 0x36, 0x7f, 0x51, 0x7f, 0x8a, 0x7f, 0xbd,
+    0x7f, 0x01, 0x80, 0x0c, 0x80, 0x12, 0x80, 0x33,
+    0x80, 0x7f, 0x80, 0x89, 0x80, 0xe3, 0x81, 0x00,
+    0x07, 0x10, 0x19, 0x29, 0x38, 0x3c, 0x8b, 0x8f,
+    0x95, 0x4d, 0x86, 0x6b, 0x86, 0x40, 0x88, 0x4c,
+    0x88, 0x63, 0x88, 0x7e, 0x89, 0x8b, 0x89, 0xd2,
+    0x89, 0x00, 0x8a, 0x37, 0x8c, 0x46, 0x8c, 0x55,
+    0x8c, 0x78, 0x8c, 0x9d, 0x8c, 0x64, 0x8d, 0x70,
+    0x8d, 0xb3, 0x8d, 0xab, 0x8e, 0xca, 0x8e, 0x9b,
+    0x8f, 0xb0, 0x8f, 0xb5, 0x8f, 0x91, 0x90, 0x49,
+    0x91, 0xc6, 0x91, 0xcc, 0x91, 0xd1, 0x91, 0x77,
+    0x95, 0x80, 0x95, 0x1c, 0x96, 0xb6, 0x96, 0xb9,
+    0x96, 0xe8, 0x96, 0x51, 0x97, 0x5e, 0x97, 0x62,
+    0x97, 0x69, 0x97, 0xcb, 0x97, 0xed, 0x97, 0xf3,
+    0x97, 0x01, 0x98, 0xa8, 0x98, 0xdb, 0x98, 0xdf,
+    0x98, 0x96, 0x99, 0x99, 0x99, 0xac, 0x99, 0xa8,
+    0x9a, 0xd8, 0x9a, 0xdf, 0x9a, 0x25, 0x9b, 0x2f,
+    0x9b, 0x32, 0x9b, 0x3c, 0x9b, 0x5a, 0x9b, 0xe5,
+    0x9c, 0x75, 0x9e, 0x7f, 0x9e, 0xa5, 0x9e, 0x00,
+    0x16, 0x1e, 0x28, 0x2c, 0x54, 0x58, 0x69, 0x6e,
+    0x7b, 0x96, 0xa5, 0xad, 0xe8, 0xf7, 0xfb, 0x12,
+    0x30, 0x00, 0x00, 0x41, 0x53, 0x44, 0x53, 0x45,
+    0x53, 0x4b, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x4d, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x4f, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x51, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x53, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x55, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x57, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x59, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5b, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5d, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x5f, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0x61, 0x30, 0x99, 0x30, 0x64, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0x66, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0x68, 0x30, 0x99,
+    0x30, 0x6f, 0x30, 0x99, 0x30, 0x72, 0x30, 0x99,
+    0x30, 0x75, 0x30, 0x99, 0x30, 0x78, 0x30, 0x99,
+    0x30, 0x7b, 0x30, 0x99, 0x30, 0x46, 0x30, 0x99,
+    0x30, 0x20, 0x00, 0x99, 0x30, 0x9d, 0x30, 0x99,
+    0x30, 0x88, 0x30, 0x8a, 0x30, 0xab, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xad, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xaf, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb1, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb3, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb7, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbb, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x30, 0x99,
+    0x30, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x30, 0x99,
+    0x30, 0xc4, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0xc6, 0x30, 0x99, 0x30, 0x00, 0x00, 0x00,
+    0x00, 0xc8, 0x30, 0x99, 0x30, 0xcf, 0x30, 0x99,
+    0x30, 0xd2, 0x30, 0x99, 0x30, 0xd5, 0x30, 0x99,
+    0x30, 0xd8, 0x30, 0x99, 0x30, 0xdb, 0x30, 0x99,
+    0x30, 0xa6, 0x30, 0x99, 0x30, 0xef, 0x30, 0x99,
+    0x30, 0xfd, 0x30, 0x99, 0x30, 0xb3, 0x30, 0xc8,
+    0x30, 0x00, 0x11, 0x00, 0x01, 0xaa, 0x02, 0xac,
+    0xad, 0x03, 0x04, 0x05, 0xb0, 0xb1, 0xb2, 0xb3,
+    0xb4, 0xb5, 0x1a, 0x06, 0x07, 0x08, 0x21, 0x09,
+    0x11, 0x61, 0x11, 0x14, 0x11, 0x4c, 0x00, 0x01,
+    0xb3, 0xb4, 0xb8, 0xba, 0xbf, 0xc3, 0xc5, 0x08,
+    0xc9, 0xcb, 0x09, 0x0a, 0x0c, 0x0e, 0x0f, 0x13,
+    0x15, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1e, 0x22,
+    0x2c, 0x33, 0x38, 0xdd, 0xde, 0x43, 0x44, 0x45,
+    0x70, 0x71, 0x74, 0x7d, 0x7e, 0x80, 0x8a, 0x8d,
+    0x00, 0x4e, 0x8c, 0x4e, 0x09, 0x4e, 0xdb, 0x56,
+    0x0a, 0x4e, 0x2d, 0x4e, 0x0b, 0x4e, 0x32, 0x75,
+    0x59, 0x4e, 0x19, 0x4e, 0x01, 0x4e, 0x29, 0x59,
+    0x30, 0x57, 0xba, 0x4e, 0x28, 0x00, 0x29, 0x00,
+    0x00, 0x11, 0x02, 0x11, 0x03, 0x11, 0x05, 0x11,
+    0x06, 0x11, 0x07, 0x11, 0x09, 0x11, 0x0b, 0x11,
+    0x0c, 0x11, 0x0e, 0x11, 0x0f, 0x11, 0x10, 0x11,
+    0x11, 0x11, 0x12, 0x11, 0x28, 0x00, 0x00, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x02, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x05, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x09, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0b, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0e, 0x11,
+    0x61, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0c, 0x11,
+    0x6e, 0x11, 0x29, 0x00, 0x28, 0x00, 0x0b, 0x11,
+    0x69, 0x11, 0x0c, 0x11, 0x65, 0x11, 0xab, 0x11,
+    0x29, 0x00, 0x28, 0x00, 0x0b, 0x11, 0x69, 0x11,
+    0x12, 0x11, 0x6e, 0x11, 0x29, 0x00, 0x28, 0x00,
+    0x29, 0x00, 0x00, 0x4e, 0x8c, 0x4e, 0x09, 0x4e,
+    0xdb, 0x56, 0x94, 0x4e, 0x6d, 0x51, 0x03, 0x4e,
+    0x6b, 0x51, 0x5d, 0x4e, 0x41, 0x53, 0x08, 0x67,
+    0x6b, 0x70, 0x34, 0x6c, 0x28, 0x67, 0xd1, 0x91,
+    0x1f, 0x57, 0xe5, 0x65, 0x2a, 0x68, 0x09, 0x67,
+    0x3e, 0x79, 0x0d, 0x54, 0x79, 0x72, 0xa1, 0x8c,
+    0x5d, 0x79, 0xb4, 0x52, 0xe3, 0x4e, 0x7c, 0x54,
+    0x66, 0x5b, 0xe3, 0x76, 0x01, 0x4f, 0xc7, 0x8c,
+    0x54, 0x53, 0x6d, 0x79, 0x11, 0x4f, 0xea, 0x81,
+    0xf3, 0x81, 0x4f, 0x55, 0x7c, 0x5e, 0x87, 0x65,
+    0x8f, 0x7b, 0x50, 0x54, 0x45, 0x32, 0x00, 0x31,
+    0x00, 0x33, 0x00, 0x30, 0x00, 0x00, 0x11, 0x00,
+    0x02, 0x03, 0x05, 0x06, 0x07, 0x09, 0x0b, 0x0c,
+    0x0e, 0x0f, 0x10, 0x11, 0x12, 0x00, 0x11, 0x00,
+    0x61, 0x02, 0x61, 0x03, 0x61, 0x05, 0x61, 0x06,
+    0x61, 0x07, 0x61, 0x09, 0x61, 0x0b, 0x61, 0x0c,
+    0x61, 0x0e, 0x11, 0x61, 0x11, 0x00, 0x11, 0x0e,
+    0x61, 0xb7, 0x00, 0x69, 0x0b, 0x11, 0x01, 0x63,
+    0x00, 0x69, 0x0b, 0x11, 0x6e, 0x11, 0x00, 0x4e,
+    0x8c, 0x4e, 0x09, 0x4e, 0xdb, 0x56, 0x94, 0x4e,
+    0x6d, 0x51, 0x03, 0x4e, 0x6b, 0x51, 0x5d, 0x4e,
+    0x41, 0x53, 0x08, 0x67, 0x6b, 0x70, 0x34, 0x6c,
+    0x28, 0x67, 0xd1, 0x91, 0x1f, 0x57, 0xe5, 0x65,
+    0x2a, 0x68, 0x09, 0x67, 0x3e, 0x79, 0x0d, 0x54,
+    0x79, 0x72, 0xa1, 0x8c, 0x5d, 0x79, 0xb4, 0x52,
+    0xd8, 0x79, 0x37, 0x75, 0x73, 0x59, 0x69, 0x90,
+    0x2a, 0x51, 0x70, 0x53, 0xe8, 0x6c, 0x05, 0x98,
+    0x11, 0x4f, 0x99, 0x51, 0x63, 0x6b, 0x0a, 0x4e,
+    0x2d, 0x4e, 0x0b, 0x4e, 0xe6, 0x5d, 0xf3, 0x53,
+    0x3b, 0x53, 0x97, 0x5b, 0x66, 0x5b, 0xe3, 0x76,
+    0x01, 0x4f, 0xc7, 0x8c, 0x54, 0x53, 0x1c, 0x59,
+    0x33, 0x00, 0x36, 0x00, 0x34, 0x00, 0x30, 0x00,
+    0x35, 0x30, 0x31, 0x00, 0x08, 0x67, 0x31, 0x00,
+    0x30, 0x00, 0x08, 0x67, 0x48, 0x67, 0x65, 0x72,
+    0x67, 0x65, 0x56, 0x4c, 0x54, 0x44, 0xa2, 0x30,
+    0x00, 0x02, 0x04, 0x06, 0x08, 0x09, 0x0b, 0x0d,
+    0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d,
+    0x1f, 0x22, 0x24, 0x26, 0x28, 0x29, 0x2a, 0x2b,
+    0x2c, 0x2d, 0x30, 0x33, 0x36, 0x39, 0x3c, 0x3d,
+    0x3e, 0x3f, 0x40, 0x42, 0x44, 0x46, 0x47, 0x48,
+    0x49, 0x4a, 0x4b, 0x4d, 0x4e, 0x4f, 0x50, 0xe4,
+    0x4e, 0x8c, 0x54, 0xa1, 0x30, 0x01, 0x30, 0x5b,
+    0x27, 0x01, 0x4a, 0x34, 0x00, 0x01, 0x52, 0x39,
+    0x01, 0xa2, 0x30, 0x00, 0x5a, 0x49, 0xa4, 0x30,
+    0x00, 0x27, 0x4f, 0x0c, 0xa4, 0x30, 0x00, 0x4f,
+    0x1d, 0x02, 0x05, 0x4f, 0xa8, 0x30, 0x00, 0x11,
+    0x07, 0x54, 0x21, 0xa8, 0x30, 0x00, 0x54, 0x03,
+    0x54, 0xa4, 0x30, 0x06, 0x4f, 0x15, 0x06, 0x58,
+    0x3c, 0x07, 0x00, 0x46, 0xab, 0x30, 0x00, 0x3e,
+    0x18, 0x1d, 0x00, 0x42, 0x3f, 0x51, 0xac, 0x30,
+    0x00, 0x41, 0x47, 0x00, 0x47, 0x32, 0xae, 0x30,
+    0xac, 0x30, 0xae, 0x30, 0x00, 0x1d, 0x4e, 0xad,
+    0x30, 0x00, 0x38, 0x3d, 0x4f, 0x01, 0x3e, 0x13,
+    0x4f, 0xad, 0x30, 0xed, 0x30, 0xad, 0x30, 0x00,
+    0x40, 0x03, 0x3c, 0x33, 0xad, 0x30, 0x00, 0x40,
+    0x34, 0x4f, 0x1b, 0x3e, 0xad, 0x30, 0x00, 0x40,
+    0x42, 0x16, 0x1b, 0xb0, 0x30, 0x00, 0x39, 0x30,
+    0xa4, 0x30, 0x0c, 0x45, 0x3c, 0x24, 0x4f, 0x0b,
+    0x47, 0x18, 0x00, 0x49, 0xaf, 0x30, 0x00, 0x3e,
+    0x4d, 0x1e, 0xb1, 0x30, 0x00, 0x4b, 0x08, 0x02,
+    0x3a, 0x19, 0x02, 0x4b, 0x2c, 0xa4, 0x30, 0x11,
+    0x00, 0x0b, 0x47, 0xb5, 0x30, 0x00, 0x3e, 0x0c,
+    0x47, 0x2b, 0xb0, 0x30, 0x07, 0x3a, 0x43, 0x00,
+    0xb9, 0x30, 0x02, 0x3a, 0x08, 0x02, 0x3a, 0x0f,
+    0x07, 0x43, 0x00, 0xb7, 0x30, 0x10, 0x00, 0x12,
+    0x34, 0x11, 0x3c, 0x13, 0x17, 0xa4, 0x30, 0x2a,
+    0x1f, 0x24, 0x2b, 0x00, 0x20, 0xbb, 0x30, 0x16,
+    0x41, 0x00, 0x38, 0x0d, 0xc4, 0x30, 0x0d, 0x38,
+    0x00, 0xd0, 0x30, 0x00, 0x2c, 0x1c, 0x1b, 0xa2,
+    0x30, 0x32, 0x00, 0x17, 0x26, 0x49, 0xaf, 0x30,
+    0x25, 0x00, 0x3c, 0xb3, 0x30, 0x21, 0x00, 0x20,
+    0x38, 0xa1, 0x30, 0x34, 0x00, 0x48, 0x22, 0x28,
+    0xa3, 0x30, 0x32, 0x00, 0x59, 0x25, 0xa7, 0x30,
+    0x2f, 0x1c, 0x10, 0x00, 0x44, 0xd5, 0x30, 0x00,
+    0x14, 0x1e, 0xaf, 0x30, 0x29, 0x00, 0x10, 0x4d,
+    0x3c, 0xda, 0x30, 0xbd, 0x30, 0xb8, 0x30, 0x22,
+    0x13, 0x1a, 0x20, 0x33, 0x0c, 0x22, 0x3b, 0x01,
+    0x22, 0x44, 0x00, 0x21, 0x44, 0x07, 0xa4, 0x30,
+    0x39, 0x00, 0x4f, 0x24, 0xc8, 0x30, 0x14, 0x23,
+    0x00, 0xdb, 0x30, 0xf3, 0x30, 0xc9, 0x30, 0x14,
+    0x2a, 0x00, 0x12, 0x33, 0x22, 0x12, 0x33, 0x2a,
+    0xa4, 0x30, 0x3a, 0x00, 0x0b, 0x49, 0xa4, 0x30,
+    0x3a, 0x00, 0x47, 0x3a, 0x1f, 0x2b, 0x3a, 0x47,
+    0x0b, 0xb7, 0x30, 0x27, 0x3c, 0x00, 0x30, 0x3c,
+    0xaf, 0x30, 0x30, 0x00, 0x3e, 0x44, 0xdf, 0x30,
+    0xea, 0x30, 0xd0, 0x30, 0x0f, 0x1a, 0x00, 0x2c,
+    0x1b, 0xe1, 0x30, 0xac, 0x30, 0xac, 0x30, 0x35,
+    0x00, 0x1c, 0x47, 0x35, 0x50, 0x1c, 0x3f, 0xa2,
+    0x30, 0x42, 0x5a, 0x27, 0x42, 0x5a, 0x49, 0x44,
+    0x00, 0x51, 0xc3, 0x30, 0x27, 0x00, 0x05, 0x28,
+    0xea, 0x30, 0xe9, 0x30, 0xd4, 0x30, 0x17, 0x00,
+    0x28, 0xd6, 0x30, 0x15, 0x26, 0x00, 0x15, 0xec,
+    0x30, 0xe0, 0x30, 0xb2, 0x30, 0x3a, 0x41, 0x16,
+    0x00, 0x41, 0xc3, 0x30, 0x2c, 0x00, 0x05, 0x30,
+    0x00, 0xb9, 0x70, 0x31, 0x00, 0x30, 0x00, 0xb9,
+    0x70, 0x32, 0x00, 0x30, 0x00, 0xb9, 0x70, 0x68,
+    0x50, 0x61, 0x64, 0x61, 0x41, 0x55, 0x62, 0x61,
+    0x72, 0x6f, 0x56, 0x70, 0x63, 0x64, 0x6d, 0x64,
+    0x00, 0x6d, 0x00, 0xb2, 0x00, 0x49, 0x00, 0x55,
+    0x00, 0x73, 0x5e, 0x10, 0x62, 0x2d, 0x66, 0x8c,
+    0x54, 0x27, 0x59, 0x63, 0x6b, 0x0e, 0x66, 0xbb,
+    0x6c, 0x2a, 0x68, 0x0f, 0x5f, 0x1a, 0x4f, 0x3e,
+    0x79, 0x70, 0x00, 0x41, 0x6e, 0x00, 0x41, 0xbc,
+    0x03, 0x41, 0x6d, 0x00, 0x41, 0x6b, 0x00, 0x41,
+    0x4b, 0x00, 0x42, 0x4d, 0x00, 0x42, 0x47, 0x00,
+    0x42, 0x63, 0x61, 0x6c, 0x6b, 0x63, 0x61, 0x6c,
+    0x70, 0x00, 0x46, 0x6e, 0x00, 0x46, 0xbc, 0x03,
+    0x46, 0xbc, 0x03, 0x67, 0x6d, 0x00, 0x67, 0x6b,
+    0x00, 0x67, 0x48, 0x00, 0x7a, 0x6b, 0x48, 0x7a,
+    0x4d, 0x48, 0x7a, 0x47, 0x48, 0x7a, 0x54, 0x48,
+    0x7a, 0xbc, 0x03, 0x13, 0x21, 0x6d, 0x00, 0x13,
+    0x21, 0x64, 0x00, 0x13, 0x21, 0x6b, 0x00, 0x13,
+    0x21, 0x66, 0x00, 0x6d, 0x6e, 0x00, 0x6d, 0xbc,
+    0x03, 0x6d, 0x6d, 0x00, 0x6d, 0x63, 0x00, 0x6d,
+    0x6b, 0x00, 0x6d, 0x63, 0x00, 0x0a, 0x0a, 0x4f,
+    0x00, 0x0a, 0x4f, 0x6d, 0x00, 0xb2, 0x00, 0x63,
+    0x00, 0x08, 0x0a, 0x4f, 0x0a, 0x0a, 0x50, 0x00,
+    0x0a, 0x50, 0x6d, 0x00, 0xb3, 0x00, 0x6b, 0x00,
+    0x6d, 0x00, 0xb3, 0x00, 0x6d, 0x00, 0x15, 0x22,
+    0x73, 0x00, 0x6d, 0x00, 0x15, 0x22, 0x73, 0x00,
+    0xb2, 0x00, 0x50, 0x61, 0x6b, 0x50, 0x61, 0x4d,
+    0x50, 0x61, 0x47, 0x50, 0x61, 0x72, 0x61, 0x64,
+    0x72, 0x61, 0x64, 0xd1, 0x73, 0x72, 0x00, 0x61,
+    0x00, 0x64, 0x00, 0x15, 0x22, 0x73, 0x00, 0xb2,
+    0x00, 0x70, 0x00, 0x73, 0x6e, 0x00, 0x73, 0xbc,
+    0x03, 0x73, 0x6d, 0x00, 0x73, 0x70, 0x00, 0x56,
+    0x6e, 0x00, 0x56, 0xbc, 0x03, 0x56, 0x6d, 0x00,
+    0x56, 0x6b, 0x00, 0x56, 0x4d, 0x00, 0x56, 0x70,
+    0x00, 0x57, 0x6e, 0x00, 0x57, 0xbc, 0x03, 0x57,
+    0x6d, 0x00, 0x57, 0x6b, 0x00, 0x57, 0x4d, 0x00,
+    0x57, 0x6b, 0x00, 0xa9, 0x03, 0x4d, 0x00, 0xa9,
+    0x03, 0x61, 0x2e, 0x6d, 0x2e, 0x42, 0x71, 0x63,
+    0x63, 0x63, 0x64, 0x43, 0xd1, 0x6b, 0x67, 0x43,
+    0x6f, 0x2e, 0x64, 0x42, 0x47, 0x79, 0x68, 0x61,
+    0x48, 0x50, 0x69, 0x6e, 0x4b, 0x4b, 0x4b, 0x4d,
+    0x6b, 0x74, 0x6c, 0x6d, 0x6c, 0x6e, 0x6c, 0x6f,
+    0x67, 0x6c, 0x78, 0x6d, 0x62, 0x6d, 0x69, 0x6c,
+    0x6d, 0x6f, 0x6c, 0x50, 0x48, 0x70, 0x2e, 0x6d,
+    0x2e, 0x50, 0x50, 0x4d, 0x50, 0x52, 0x73, 0x72,
+    0x53, 0x76, 0x57, 0x62, 0x56, 0xd1, 0x6d, 0x41,
+    0xd1, 0x6d, 0x31, 0x00, 0xe5, 0x65, 0x31, 0x00,
+    0x30, 0x00, 0xe5, 0x65, 0x32, 0x00, 0x30, 0x00,
+    0xe5, 0x65, 0x33, 0x00, 0x30, 0x00, 0xe5, 0x65,
+    0x67, 0x61, 0x6c, 0x4a, 0x04, 0x4c, 0x04, 0x26,
+    0x01, 0x53, 0x01, 0x27, 0xa7, 0x37, 0xab, 0x6b,
+    0x02, 0x52, 0xab, 0x48, 0x8c, 0xf4, 0x66, 0xca,
+    0x8e, 0xc8, 0x8c, 0xd1, 0x6e, 0x32, 0x4e, 0xe5,
+    0x53, 0x9c, 0x9f, 0x9c, 0x9f, 0x51, 0x59, 0xd1,
+    0x91, 0x87, 0x55, 0x48, 0x59, 0xf6, 0x61, 0x69,
+    0x76, 0x85, 0x7f, 0x3f, 0x86, 0xba, 0x87, 0xf8,
+    0x88, 0x8f, 0x90, 0x02, 0x6a, 0x1b, 0x6d, 0xd9,
+    0x70, 0xde, 0x73, 0x3d, 0x84, 0x6a, 0x91, 0xf1,
+    0x99, 0x82, 0x4e, 0x75, 0x53, 0x04, 0x6b, 0x1b,
+    0x72, 0x2d, 0x86, 0x1e, 0x9e, 0x50, 0x5d, 0xeb,
+    0x6f, 0xcd, 0x85, 0x64, 0x89, 0xc9, 0x62, 0xd8,
+    0x81, 0x1f, 0x88, 0xca, 0x5e, 0x17, 0x67, 0x6a,
+    0x6d, 0xfc, 0x72, 0xce, 0x90, 0x86, 0x4f, 0xb7,
+    0x51, 0xde, 0x52, 0xc4, 0x64, 0xd3, 0x6a, 0x10,
+    0x72, 0xe7, 0x76, 0x01, 0x80, 0x06, 0x86, 0x5c,
+    0x86, 0xef, 0x8d, 0x32, 0x97, 0x6f, 0x9b, 0xfa,
+    0x9d, 0x8c, 0x78, 0x7f, 0x79, 0xa0, 0x7d, 0xc9,
+    0x83, 0x04, 0x93, 0x7f, 0x9e, 0xd6, 0x8a, 0xdf,
+    0x58, 0x04, 0x5f, 0x60, 0x7c, 0x7e, 0x80, 0x62,
+    0x72, 0xca, 0x78, 0xc2, 0x8c, 0xf7, 0x96, 0xd8,
+    0x58, 0x62, 0x5c, 0x13, 0x6a, 0xda, 0x6d, 0x0f,
+    0x6f, 0x2f, 0x7d, 0x37, 0x7e, 0x4b, 0x96, 0xd2,
+    0x52, 0x8b, 0x80, 0xdc, 0x51, 0xcc, 0x51, 0x1c,
+    0x7a, 0xbe, 0x7d, 0xf1, 0x83, 0x75, 0x96, 0x80,
+    0x8b, 0xcf, 0x62, 0x02, 0x6a, 0xfe, 0x8a, 0x39,
+    0x4e, 0xe7, 0x5b, 0x12, 0x60, 0x87, 0x73, 0x70,
+    0x75, 0x17, 0x53, 0xfb, 0x78, 0xbf, 0x4f, 0xa9,
+    0x5f, 0x0d, 0x4e, 0xcc, 0x6c, 0x78, 0x65, 0x22,
+    0x7d, 0xc3, 0x53, 0x5e, 0x58, 0x01, 0x77, 0x49,
+    0x84, 0xaa, 0x8a, 0xba, 0x6b, 0xb0, 0x8f, 0x88,
+    0x6c, 0xfe, 0x62, 0xe5, 0x82, 0xa0, 0x63, 0x65,
+    0x75, 0xae, 0x4e, 0x69, 0x51, 0xc9, 0x51, 0x81,
+    0x68, 0xe7, 0x7c, 0x6f, 0x82, 0xd2, 0x8a, 0xcf,
+    0x91, 0xf5, 0x52, 0x42, 0x54, 0x73, 0x59, 0xec,
+    0x5e, 0xc5, 0x65, 0xfe, 0x6f, 0x2a, 0x79, 0xad,
+    0x95, 0x6a, 0x9a, 0x97, 0x9e, 0xce, 0x9e, 0x9b,
+    0x52, 0xc6, 0x66, 0x77, 0x6b, 0x62, 0x8f, 0x74,
+    0x5e, 0x90, 0x61, 0x00, 0x62, 0x9a, 0x64, 0x23,
+    0x6f, 0x49, 0x71, 0x89, 0x74, 0xca, 0x79, 0xf4,
+    0x7d, 0x6f, 0x80, 0x26, 0x8f, 0xee, 0x84, 0x23,
+    0x90, 0x4a, 0x93, 0x17, 0x52, 0xa3, 0x52, 0xbd,
+    0x54, 0xc8, 0x70, 0xc2, 0x88, 0xaa, 0x8a, 0xc9,
+    0x5e, 0xf5, 0x5f, 0x7b, 0x63, 0xae, 0x6b, 0x3e,
+    0x7c, 0x75, 0x73, 0xe4, 0x4e, 0xf9, 0x56, 0xe7,
+    0x5b, 0xba, 0x5d, 0x1c, 0x60, 0xb2, 0x73, 0x69,
+    0x74, 0x9a, 0x7f, 0x46, 0x80, 0x34, 0x92, 0xf6,
+    0x96, 0x48, 0x97, 0x18, 0x98, 0x8b, 0x4f, 0xae,
+    0x79, 0xb4, 0x91, 0xb8, 0x96, 0xe1, 0x60, 0x86,
+    0x4e, 0xda, 0x50, 0xee, 0x5b, 0x3f, 0x5c, 0x99,
+    0x65, 0x02, 0x6a, 0xce, 0x71, 0x42, 0x76, 0xfc,
+    0x84, 0x7c, 0x90, 0x8d, 0x9f, 0x88, 0x66, 0x2e,
+    0x96, 0x89, 0x52, 0x7b, 0x67, 0xf3, 0x67, 0x41,
+    0x6d, 0x9c, 0x6e, 0x09, 0x74, 0x59, 0x75, 0x6b,
+    0x78, 0x10, 0x7d, 0x5e, 0x98, 0x6d, 0x51, 0x2e,
+    0x62, 0x78, 0x96, 0x2b, 0x50, 0x19, 0x5d, 0xea,
+    0x6d, 0x2a, 0x8f, 0x8b, 0x5f, 0x44, 0x61, 0x17,
+    0x68, 0x87, 0x73, 0x86, 0x96, 0x29, 0x52, 0x0f,
+    0x54, 0x65, 0x5c, 0x13, 0x66, 0x4e, 0x67, 0xa8,
+    0x68, 0xe5, 0x6c, 0x06, 0x74, 0xe2, 0x75, 0x79,
+    0x7f, 0xcf, 0x88, 0xe1, 0x88, 0xcc, 0x91, 0xe2,
+    0x96, 0x3f, 0x53, 0xba, 0x6e, 0x1d, 0x54, 0xd0,
+    0x71, 0x98, 0x74, 0xfa, 0x85, 0xa3, 0x96, 0x57,
+    0x9c, 0x9f, 0x9e, 0x97, 0x67, 0xcb, 0x6d, 0xe8,
+    0x81, 0xcb, 0x7a, 0x20, 0x7b, 0x92, 0x7c, 0xc0,
+    0x72, 0x99, 0x70, 0x58, 0x8b, 0xc0, 0x4e, 0x36,
+    0x83, 0x3a, 0x52, 0x07, 0x52, 0xa6, 0x5e, 0xd3,
+    0x62, 0xd6, 0x7c, 0x85, 0x5b, 0x1e, 0x6d, 0xb4,
+    0x66, 0x3b, 0x8f, 0x4c, 0x88, 0x4d, 0x96, 0x8b,
+    0x89, 0xd3, 0x5e, 0x40, 0x51, 0xc0, 0x55, 0x00,
+    0x00, 0x00, 0x00, 0x5a, 0x58, 0x00, 0x00, 0x74,
+    0x66, 0x00, 0x00, 0x00, 0x00, 0xde, 0x51, 0x2a,
+    0x73, 0xca, 0x76, 0x3c, 0x79, 0x5e, 0x79, 0x65,
+    0x79, 0x8f, 0x79, 0x56, 0x97, 0xbe, 0x7c, 0xbd,
+    0x7f, 0x00, 0x00, 0x12, 0x86, 0x00, 0x00, 0xf8,
+    0x8a, 0x00, 0x00, 0x00, 0x00, 0x38, 0x90, 0xfd,
+    0x90, 0xef, 0x98, 0xfc, 0x98, 0x28, 0x99, 0xb4,
+    0x9d, 0xde, 0x90, 0xb7, 0x96, 0xae, 0x4f, 0xe7,
+    0x50, 0x4d, 0x51, 0xc9, 0x52, 0xe4, 0x52, 0x51,
+    0x53, 0x9d, 0x55, 0x06, 0x56, 0x68, 0x56, 0x40,
+    0x58, 0xa8, 0x58, 0x64, 0x5c, 0x6e, 0x5c, 0x94,
+    0x60, 0x68, 0x61, 0x8e, 0x61, 0xf2, 0x61, 0x4f,
+    0x65, 0xe2, 0x65, 0x91, 0x66, 0x85, 0x68, 0x77,
+    0x6d, 0x1a, 0x6e, 0x22, 0x6f, 0x6e, 0x71, 0x2b,
+    0x72, 0x22, 0x74, 0x91, 0x78, 0x3e, 0x79, 0x49,
+    0x79, 0x48, 0x79, 0x50, 0x79, 0x56, 0x79, 0x5d,
+    0x79, 0x8d, 0x79, 0x8e, 0x79, 0x40, 0x7a, 0x81,
+    0x7a, 0xc0, 0x7b, 0xf4, 0x7d, 0x09, 0x7e, 0x41,
+    0x7e, 0x72, 0x7f, 0x05, 0x80, 0xed, 0x81, 0x79,
+    0x82, 0x79, 0x82, 0x57, 0x84, 0x10, 0x89, 0x96,
+    0x89, 0x01, 0x8b, 0x39, 0x8b, 0xd3, 0x8c, 0x08,
+    0x8d, 0xb6, 0x8f, 0x38, 0x90, 0xe3, 0x96, 0xff,
+    0x97, 0x3b, 0x98, 0x75, 0x60, 0xee, 0x42, 0x18,
+    0x82, 0x02, 0x26, 0x4e, 0xb5, 0x51, 0x68, 0x51,
+    0x80, 0x4f, 0x45, 0x51, 0x80, 0x51, 0xc7, 0x52,
+    0xfa, 0x52, 0x9d, 0x55, 0x55, 0x55, 0x99, 0x55,
+    0xe2, 0x55, 0x5a, 0x58, 0xb3, 0x58, 0x44, 0x59,
+    0x54, 0x59, 0x62, 0x5a, 0x28, 0x5b, 0xd2, 0x5e,
+    0xd9, 0x5e, 0x69, 0x5f, 0xad, 0x5f, 0xd8, 0x60,
+    0x4e, 0x61, 0x08, 0x61, 0x8e, 0x61, 0x60, 0x61,
+    0xf2, 0x61, 0x34, 0x62, 0xc4, 0x63, 0x1c, 0x64,
+    0x52, 0x64, 0x56, 0x65, 0x74, 0x66, 0x17, 0x67,
+    0x1b, 0x67, 0x56, 0x67, 0x79, 0x6b, 0xba, 0x6b,
+    0x41, 0x6d, 0xdb, 0x6e, 0xcb, 0x6e, 0x22, 0x6f,
+    0x1e, 0x70, 0x6e, 0x71, 0xa7, 0x77, 0x35, 0x72,
+    0xaf, 0x72, 0x2a, 0x73, 0x71, 0x74, 0x06, 0x75,
+    0x3b, 0x75, 0x1d, 0x76, 0x1f, 0x76, 0xca, 0x76,
+    0xdb, 0x76, 0xf4, 0x76, 0x4a, 0x77, 0x40, 0x77,
+    0xcc, 0x78, 0xb1, 0x7a, 0xc0, 0x7b, 0x7b, 0x7c,
+    0x5b, 0x7d, 0xf4, 0x7d, 0x3e, 0x7f, 0x05, 0x80,
+    0x52, 0x83, 0xef, 0x83, 0x79, 0x87, 0x41, 0x89,
+    0x86, 0x89, 0x96, 0x89, 0xbf, 0x8a, 0xf8, 0x8a,
+    0xcb, 0x8a, 0x01, 0x8b, 0xfe, 0x8a, 0xed, 0x8a,
+    0x39, 0x8b, 0x8a, 0x8b, 0x08, 0x8d, 0x38, 0x8f,
+    0x72, 0x90, 0x99, 0x91, 0x76, 0x92, 0x7c, 0x96,
+    0xe3, 0x96, 0x56, 0x97, 0xdb, 0x97, 0xff, 0x97,
+    0x0b, 0x98, 0x3b, 0x98, 0x12, 0x9b, 0x9c, 0x9f,
+    0x4a, 0x28, 0x44, 0x28, 0xd5, 0x33, 0x9d, 0x3b,
+    0x18, 0x40, 0x39, 0x40, 0x49, 0x52, 0xd0, 0x5c,
+    0xd3, 0x7e, 0x43, 0x9f, 0x8e, 0x9f, 0x2a, 0xa0,
+    0x02, 0x66, 0x66, 0x66, 0x69, 0x66, 0x6c, 0x66,
+    0x66, 0x69, 0x66, 0x66, 0x6c, 0x7f, 0x01, 0x74,
+    0x73, 0x00, 0x74, 0x65, 0x05, 0x0f, 0x11, 0x0f,
+    0x00, 0x0f, 0x06, 0x19, 0x11, 0x0f, 0x08, 0xd9,
+    0x05, 0xb4, 0x05, 0x00, 0x00, 0x00, 0x00, 0xf2,
+    0x05, 0xb7, 0x05, 0xd0, 0x05, 0x12, 0x00, 0x03,
+    0x04, 0x0b, 0x0c, 0x0d, 0x18, 0x1a, 0xe9, 0x05,
+    0xc1, 0x05, 0xe9, 0x05, 0xc2, 0x05, 0x49, 0xfb,
+    0xc1, 0x05, 0x49, 0xfb, 0xc2, 0x05, 0xd0, 0x05,
+    0xb7, 0x05, 0xd0, 0x05, 0xb8, 0x05, 0xd0, 0x05,
+    0xbc, 0x05, 0xd8, 0x05, 0xbc, 0x05, 0xde, 0x05,
+    0xbc, 0x05, 0xe0, 0x05, 0xbc, 0x05, 0xe3, 0x05,
+    0xbc, 0x05, 0xb9, 0x05, 0x2d, 0x03, 0x2e, 0x03,
+    0x2f, 0x03, 0x30, 0x03, 0x31, 0x03, 0x1c, 0x00,
+    0x18, 0x06, 0x22, 0x06, 0x2b, 0x06, 0xd0, 0x05,
+    0xdc, 0x05, 0x71, 0x06, 0x00, 0x00, 0x0a, 0x0a,
+    0x0a, 0x0a, 0x0d, 0x0d, 0x0d, 0x0d, 0x0f, 0x0f,
+    0x0f, 0x0f, 0x09, 0x09, 0x09, 0x09, 0x0e, 0x0e,
+    0x0e, 0x0e, 0x08, 0x08, 0x08, 0x08, 0x33, 0x33,
+    0x33, 0x33, 0x35, 0x35, 0x35, 0x35, 0x13, 0x13,
+    0x13, 0x13, 0x12, 0x12, 0x12, 0x12, 0x15, 0x15,
+    0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x1c, 0x1c,
+    0x1b, 0x1b, 0x1d, 0x1d, 0x17, 0x17, 0x27, 0x27,
+    0x20, 0x20, 0x38, 0x38, 0x38, 0x38, 0x3e, 0x3e,
+    0x3e, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x40, 0x40,
+    0x40, 0x40, 0x49, 0x49, 0x4a, 0x4a, 0x4a, 0x4a,
+    0x4f, 0x4f, 0x50, 0x50, 0x50, 0x50, 0x4d, 0x4d,
+    0x4d, 0x4d, 0x61, 0x61, 0x62, 0x62, 0x49, 0x06,
+    0x64, 0x64, 0x64, 0x64, 0x7e, 0x7e, 0x7d, 0x7d,
+    0x7f, 0x7f, 0x2e, 0x82, 0x82, 0x7c, 0x7c, 0x80,
+    0x80, 0x87, 0x87, 0x87, 0x87, 0x00, 0x00, 0x26,
+    0x06, 0x00, 0x01, 0x00, 0x01, 0x00, 0xaf, 0x00,
+    0xaf, 0x00, 0x22, 0x00, 0x22, 0x00, 0xa1, 0x00,
+    0xa1, 0x00, 0xa0, 0x00, 0xa0, 0x00, 0xa2, 0x00,
+    0xa2, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00,
+    0x23, 0x00, 0x23, 0x00, 0x23, 0xcc, 0x06, 0x00,
+    0x00, 0x00, 0x00, 0x26, 0x06, 0x00, 0x06, 0x00,
+    0x07, 0x00, 0x1f, 0x00, 0x23, 0x00, 0x24, 0x02,
+    0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x1f, 0x02,
+    0x23, 0x02, 0x24, 0x04, 0x06, 0x04, 0x07, 0x04,
+    0x08, 0x04, 0x1f, 0x04, 0x23, 0x04, 0x24, 0x05,
+    0x06, 0x05, 0x1f, 0x05, 0x23, 0x05, 0x24, 0x06,
+    0x07, 0x06, 0x1f, 0x07, 0x06, 0x07, 0x1f, 0x08,
+    0x06, 0x08, 0x07, 0x08, 0x1f, 0x0d, 0x06, 0x0d,
+    0x07, 0x0d, 0x08, 0x0d, 0x1f, 0x0f, 0x07, 0x0f,
+    0x1f, 0x10, 0x06, 0x10, 0x07, 0x10, 0x08, 0x10,
+    0x1f, 0x11, 0x07, 0x11, 0x1f, 0x12, 0x1f, 0x13,
+    0x06, 0x13, 0x1f, 0x14, 0x06, 0x14, 0x1f, 0x1b,
+    0x06, 0x1b, 0x07, 0x1b, 0x08, 0x1b, 0x1f, 0x1b,
+    0x23, 0x1b, 0x24, 0x1c, 0x07, 0x1c, 0x1f, 0x1c,
+    0x23, 0x1c, 0x24, 0x1d, 0x01, 0x1d, 0x06, 0x1d,
+    0x07, 0x1d, 0x08, 0x1d, 0x1e, 0x1d, 0x1f, 0x1d,
+    0x23, 0x1d, 0x24, 0x1e, 0x06, 0x1e, 0x07, 0x1e,
+    0x08, 0x1e, 0x1f, 0x1e, 0x23, 0x1e, 0x24, 0x1f,
+    0x06, 0x1f, 0x07, 0x1f, 0x08, 0x1f, 0x1f, 0x1f,
+    0x23, 0x1f, 0x24, 0x20, 0x06, 0x20, 0x07, 0x20,
+    0x08, 0x20, 0x1f, 0x20, 0x23, 0x20, 0x24, 0x21,
+    0x06, 0x21, 0x1f, 0x21, 0x23, 0x21, 0x24, 0x24,
+    0x06, 0x24, 0x07, 0x24, 0x08, 0x24, 0x1f, 0x24,
+    0x23, 0x24, 0x24, 0x0a, 0x4a, 0x0b, 0x4a, 0x23,
+    0x4a, 0x20, 0x00, 0x4c, 0x06, 0x51, 0x06, 0x51,
+    0x06, 0xff, 0x00, 0x1f, 0x26, 0x06, 0x00, 0x0b,
+    0x00, 0x0c, 0x00, 0x1f, 0x00, 0x20, 0x00, 0x23,
+    0x00, 0x24, 0x02, 0x0b, 0x02, 0x0c, 0x02, 0x1f,
+    0x02, 0x20, 0x02, 0x23, 0x02, 0x24, 0x04, 0x0b,
+    0x04, 0x0c, 0x04, 0x1f, 0x26, 0x06, 0x04, 0x20,
+    0x04, 0x23, 0x04, 0x24, 0x05, 0x0b, 0x05, 0x0c,
+    0x05, 0x1f, 0x05, 0x20, 0x05, 0x23, 0x05, 0x24,
+    0x1b, 0x23, 0x1b, 0x24, 0x1c, 0x23, 0x1c, 0x24,
+    0x1d, 0x01, 0x1d, 0x1e, 0x1d, 0x1f, 0x1d, 0x23,
+    0x1d, 0x24, 0x1e, 0x1f, 0x1e, 0x23, 0x1e, 0x24,
+    0x1f, 0x01, 0x1f, 0x1f, 0x20, 0x0b, 0x20, 0x0c,
+    0x20, 0x1f, 0x20, 0x20, 0x20, 0x23, 0x20, 0x24,
+    0x23, 0x4a, 0x24, 0x0b, 0x24, 0x0c, 0x24, 0x1f,
+    0x24, 0x20, 0x24, 0x23, 0x24, 0x24, 0x00, 0x06,
+    0x00, 0x07, 0x00, 0x08, 0x00, 0x1f, 0x00, 0x21,
+    0x02, 0x06, 0x02, 0x07, 0x02, 0x08, 0x02, 0x1f,
+    0x02, 0x21, 0x04, 0x06, 0x04, 0x07, 0x04, 0x08,
+    0x04, 0x1f, 0x04, 0x21, 0x05, 0x1f, 0x06, 0x07,
+    0x06, 0x1f, 0x07, 0x06, 0x07, 0x1f, 0x08, 0x06,
+    0x08, 0x1f, 0x0d, 0x06, 0x0d, 0x07, 0x0d, 0x08,
+    0x0d, 0x1f, 0x0f, 0x07, 0x0f, 0x08, 0x0f, 0x1f,
+    0x10, 0x06, 0x10, 0x07, 0x10, 0x08, 0x10, 0x1f,
+    0x11, 0x07, 0x12, 0x1f, 0x13, 0x06, 0x13, 0x1f,
+    0x14, 0x06, 0x14, 0x1f, 0x1b, 0x06, 0x1b, 0x07,
+    0x1b, 0x08, 0x1b, 0x1f, 0x1c, 0x07, 0x1c, 0x1f,
+    0x1d, 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x1e,
+    0x1d, 0x1f, 0x1e, 0x06, 0x1e, 0x07, 0x1e, 0x08,
+    0x1e, 0x1f, 0x1e, 0x21, 0x1f, 0x06, 0x1f, 0x07,
+    0x1f, 0x08, 0x1f, 0x1f, 0x20, 0x06, 0x20, 0x07,
+    0x20, 0x08, 0x20, 0x1f, 0x20, 0x21, 0x21, 0x06,
+    0x21, 0x1f, 0x21, 0x4a, 0x24, 0x06, 0x24, 0x07,
+    0x24, 0x08, 0x24, 0x1f, 0x24, 0x21, 0x00, 0x1f,
+    0x00, 0x21, 0x02, 0x1f, 0x02, 0x21, 0x04, 0x1f,
+    0x04, 0x21, 0x05, 0x1f, 0x05, 0x21, 0x0d, 0x1f,
+    0x0d, 0x21, 0x0e, 0x1f, 0x0e, 0x21, 0x1d, 0x1e,
+    0x1d, 0x1f, 0x1e, 0x1f, 0x20, 0x1f, 0x20, 0x21,
+    0x24, 0x1f, 0x24, 0x21, 0x40, 0x06, 0x4e, 0x06,
+    0x51, 0x06, 0x27, 0x06, 0x10, 0x22, 0x10, 0x23,
+    0x12, 0x22, 0x12, 0x23, 0x13, 0x22, 0x13, 0x23,
+    0x0c, 0x22, 0x0c, 0x23, 0x0d, 0x22, 0x0d, 0x23,
+    0x06, 0x22, 0x06, 0x23, 0x05, 0x22, 0x05, 0x23,
+    0x07, 0x22, 0x07, 0x23, 0x0e, 0x22, 0x0e, 0x23,
+    0x0f, 0x22, 0x0f, 0x23, 0x0d, 0x05, 0x0d, 0x06,
+    0x0d, 0x07, 0x0d, 0x1e, 0x0d, 0x0a, 0x0c, 0x0a,
+    0x0e, 0x0a, 0x0f, 0x0a, 0x10, 0x22, 0x10, 0x23,
+    0x12, 0x22, 0x12, 0x23, 0x13, 0x22, 0x13, 0x23,
+    0x0c, 0x22, 0x0c, 0x23, 0x0d, 0x22, 0x0d, 0x23,
+    0x06, 0x22, 0x06, 0x23, 0x05, 0x22, 0x05, 0x23,
+    0x07, 0x22, 0x07, 0x23, 0x0e, 0x22, 0x0e, 0x23,
+    0x0f, 0x22, 0x0f, 0x23, 0x0d, 0x05, 0x0d, 0x06,
+    0x0d, 0x07, 0x0d, 0x1e, 0x0d, 0x0a, 0x0c, 0x0a,
+    0x0e, 0x0a, 0x0f, 0x0a, 0x0d, 0x05, 0x0d, 0x06,
+    0x0d, 0x07, 0x0d, 0x1e, 0x0c, 0x20, 0x0d, 0x20,
+    0x10, 0x1e, 0x0c, 0x05, 0x0c, 0x06, 0x0c, 0x07,
+    0x0d, 0x05, 0x0d, 0x06, 0x0d, 0x07, 0x10, 0x1e,
+    0x11, 0x1e, 0x00, 0x24, 0x00, 0x24, 0x2a, 0x06,
+    0x00, 0x02, 0x1b, 0x00, 0x03, 0x02, 0x00, 0x03,
+    0x02, 0x00, 0x03, 0x1b, 0x00, 0x04, 0x1b, 0x00,
+    0x1b, 0x02, 0x00, 0x1b, 0x03, 0x00, 0x1b, 0x04,
+    0x02, 0x1b, 0x03, 0x02, 0x1b, 0x03, 0x03, 0x1b,
+    0x20, 0x03, 0x1b, 0x1f, 0x09, 0x03, 0x02, 0x09,
+    0x02, 0x03, 0x09, 0x02, 0x1f, 0x09, 0x1b, 0x03,
+    0x09, 0x1b, 0x03, 0x09, 0x1b, 0x02, 0x09, 0x1b,
+    0x1b, 0x09, 0x1b, 0x1b, 0x0b, 0x03, 0x03, 0x0b,
+    0x03, 0x03, 0x0b, 0x1b, 0x1b, 0x0a, 0x03, 0x1b,
+    0x0a, 0x03, 0x1b, 0x0a, 0x02, 0x20, 0x0a, 0x1b,
+    0x04, 0x0a, 0x1b, 0x04, 0x0a, 0x1b, 0x1b, 0x0a,
+    0x1b, 0x1b, 0x0c, 0x03, 0x1f, 0x0c, 0x04, 0x1b,
+    0x0c, 0x04, 0x1b, 0x0d, 0x1b, 0x03, 0x0d, 0x1b,
+    0x03, 0x0d, 0x1b, 0x1b, 0x0d, 0x1b, 0x20, 0x0f,
+    0x02, 0x1b, 0x0f, 0x1b, 0x1b, 0x0f, 0x1b, 0x1b,
+    0x0f, 0x1b, 0x1f, 0x10, 0x1b, 0x1b, 0x10, 0x1b,
+    0x20, 0x10, 0x1b, 0x1f, 0x17, 0x04, 0x1b, 0x17,
+    0x04, 0x1b, 0x18, 0x1b, 0x03, 0x18, 0x1b, 0x1b,
+    0x1a, 0x03, 0x1b, 0x1a, 0x03, 0x20, 0x1a, 0x03,
+    0x1f, 0x1a, 0x02, 0x02, 0x1a, 0x02, 0x02, 0x1a,
+    0x04, 0x1b, 0x1a, 0x04, 0x1b, 0x1a, 0x1b, 0x03,
+    0x1a, 0x1b, 0x03, 0x1b, 0x03, 0x02, 0x1b, 0x03,
+    0x1b, 0x1b, 0x03, 0x20, 0x1b, 0x02, 0x03, 0x1b,
+    0x02, 0x1b, 0x1b, 0x04, 0x02, 0x1b, 0x04, 0x1b,
+    0x28, 0x06, 0x1d, 0x04, 0x06, 0x1f, 0x1d, 0x04,
+    0x1f, 0x1d, 0x1d, 0x1e, 0x05, 0x1d, 0x1e, 0x05,
+    0x21, 0x1e, 0x04, 0x1d, 0x1e, 0x04, 0x1d, 0x1e,
+    0x04, 0x21, 0x1e, 0x1d, 0x22, 0x1e, 0x1d, 0x21,
+    0x22, 0x1d, 0x1d, 0x22, 0x1d, 0x1d, 0x00, 0x06,
+    0x22, 0x02, 0x04, 0x22, 0x02, 0x04, 0x21, 0x02,
+    0x06, 0x22, 0x02, 0x06, 0x21, 0x02, 0x1d, 0x22,
+    0x02, 0x1d, 0x21, 0x04, 0x1d, 0x22, 0x04, 0x05,
+    0x21, 0x04, 0x1d, 0x21, 0x0b, 0x06, 0x21, 0x0d,
+    0x05, 0x22, 0x0c, 0x05, 0x22, 0x0e, 0x05, 0x22,
+    0x1c, 0x04, 0x22, 0x1c, 0x1d, 0x22, 0x22, 0x05,
+    0x22, 0x22, 0x04, 0x22, 0x22, 0x1d, 0x22, 0x1d,
+    0x1d, 0x22, 0x1a, 0x1d, 0x22, 0x1e, 0x05, 0x22,
+    0x1a, 0x1d, 0x05, 0x1c, 0x05, 0x1d, 0x11, 0x1d,
+    0x22, 0x1b, 0x1d, 0x22, 0x1e, 0x04, 0x05, 0x1d,
+    0x06, 0x22, 0x1c, 0x04, 0x1d, 0x1b, 0x1d, 0x1d,
+    0x1c, 0x04, 0x1d, 0x1e, 0x04, 0x05, 0x04, 0x05,
+    0x22, 0x05, 0x04, 0x22, 0x1d, 0x04, 0x22, 0x19,
+    0x1d, 0x22, 0x00, 0x05, 0x22, 0x1b, 0x1d, 0x1d,
+    0x11, 0x04, 0x1d, 0x0d, 0x1d, 0x1d, 0x0b, 0x06,
+    0x22, 0x1e, 0x04, 0x22, 0x35, 0x06, 0x00, 0x0f,
+    0x9d, 0x0d, 0x0f, 0x9d, 0x27, 0x06, 0x00, 0x1d,
+    0x1d, 0x20, 0x00, 0x1c, 0x01, 0x0a, 0x1e, 0x06,
+    0x1e, 0x08, 0x0e, 0x1d, 0x12, 0x1e, 0x0a, 0x0c,
+    0x21, 0x1d, 0x12, 0x1d, 0x23, 0x20, 0x21, 0x0c,
+    0x1d, 0x1e, 0x35, 0x06, 0x00, 0x0f, 0x14, 0x27,
+    0x06, 0x0e, 0x1d, 0x22, 0xff, 0x00, 0x1d, 0x1d,
+    0x20, 0xff, 0x12, 0x1d, 0x23, 0x20, 0xff, 0x21,
+    0x0c, 0x1d, 0x1e, 0x27, 0x06, 0x05, 0x1d, 0xff,
+    0x05, 0x1d, 0x00, 0x1d, 0x20, 0x27, 0x06, 0x0a,
+    0xa5, 0x00, 0x1d, 0x2c, 0x00, 0x01, 0x30, 0x02,
+    0x30, 0x3a, 0x00, 0x3b, 0x00, 0x21, 0x00, 0x3f,
+    0x00, 0x16, 0x30, 0x17, 0x30, 0x26, 0x20, 0x13,
+    0x20, 0x12, 0x01, 0x00, 0x5f, 0x5f, 0x28, 0x29,
+    0x7b, 0x7d, 0x08, 0x30, 0x0c, 0x0d, 0x08, 0x09,
+    0x02, 0x03, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07,
+    0x5b, 0x00, 0x5d, 0x00, 0x3e, 0x20, 0x3e, 0x20,
+    0x3e, 0x20, 0x3e, 0x20, 0x5f, 0x00, 0x5f, 0x00,
+    0x5f, 0x00, 0x2c, 0x00, 0x01, 0x30, 0x2e, 0x00,
+    0x00, 0x00, 0x3b, 0x00, 0x3a, 0x00, 0x3f, 0x00,
+    0x21, 0x00, 0x14, 0x20, 0x28, 0x00, 0x29, 0x00,
+    0x7b, 0x00, 0x7d, 0x00, 0x14, 0x30, 0x15, 0x30,
+    0x23, 0x26, 0x2a, 0x2b, 0x2d, 0x3c, 0x3e, 0x3d,
+    0x00, 0x5c, 0x24, 0x25, 0x40, 0x40, 0x06, 0xff,
+    0x0b, 0x00, 0x0b, 0xff, 0x0c, 0x20, 0x00, 0x4d,
+    0x06, 0x40, 0x06, 0xff, 0x0e, 0x00, 0x0e, 0xff,
+    0x0f, 0x00, 0x0f, 0xff, 0x10, 0x00, 0x10, 0xff,
+    0x11, 0x00, 0x11, 0xff, 0x12, 0x00, 0x12, 0x21,
+    0x06, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03,
+    0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06,
+    0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09,
+    0x09, 0x09, 0x0a, 0x0a, 0x0a, 0x0a, 0x0b, 0x0b,
+    0x0b, 0x0b, 0x0c, 0x0c, 0x0c, 0x0c, 0x0d, 0x0d,
+    0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f, 0x10, 0x10,
+    0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13,
+    0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15,
+    0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17,
+    0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19,
+    0x19, 0x19, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21,
+    0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x23, 0x23,
+    0x23, 0x23, 0x24, 0x24, 0x24, 0x24, 0x25, 0x25,
+    0x25, 0x25, 0x26, 0x26, 0x26, 0x26, 0x27, 0x27,
+    0x28, 0x28, 0x29, 0x29, 0x29, 0x29, 0x22, 0x06,
+    0x22, 0x00, 0x22, 0x00, 0x22, 0x01, 0x22, 0x01,
+    0x22, 0x03, 0x22, 0x03, 0x22, 0x05, 0x22, 0x05,
+    0x21, 0x00, 0x85, 0x29, 0x01, 0x30, 0x01, 0x0b,
+    0x0c, 0x00, 0xfa, 0xf1, 0xa0, 0xa2, 0xa4, 0xa6,
+    0xa8, 0xe2, 0xe4, 0xe6, 0xc2, 0xfb, 0xa1, 0xa3,
+    0xa5, 0xa7, 0xa9, 0xaa, 0xac, 0xae, 0xb0, 0xb2,
+    0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, 0xc0, 0xc3,
+    0xc5, 0xc7, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce,
+    0xd1, 0xd4, 0xd7, 0xda, 0xdd, 0xde, 0xdf, 0xe0,
+    0xe1, 0xe3, 0xe5, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
+    0xec, 0xee, 0xf2, 0x98, 0x99, 0x31, 0x31, 0x4f,
+    0x31, 0x55, 0x31, 0x5b, 0x31, 0x61, 0x31, 0xa2,
+    0x00, 0xa3, 0x00, 0xac, 0x00, 0xaf, 0x00, 0xa6,
+    0x00, 0xa5, 0x00, 0xa9, 0x20, 0x00, 0x00, 0x02,
+    0x25, 0x90, 0x21, 0x91, 0x21, 0x92, 0x21, 0x93,
+    0x21, 0xa0, 0x25, 0xcb, 0x25, 0x99, 0x10, 0xba,
+    0x10, 0x00, 0x00, 0x00, 0x00, 0x9b, 0x10, 0xba,
+    0x10, 0x05, 0x05, 0xa5, 0x10, 0xba, 0x10, 0x05,
+    0x31, 0x11, 0x27, 0x11, 0x32, 0x11, 0x27, 0x11,
+    0x55, 0x47, 0x13, 0x3e, 0x13, 0x47, 0x13, 0x57,
+    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,
+    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,
+    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,
+};
+
+static const uint16_t unicode_comp_table[944] = {
+    0x4a01, 0x49c0, 0x4a02, 0x0280, 0x0281, 0x0282, 0x0283, 0x02c0,
+    0x02c2, 0x0a00, 0x0284, 0x2442, 0x0285, 0x07c0, 0x0980, 0x0982,
+    0x2440, 0x2280, 0x02c4, 0x2282, 0x2284, 0x2286, 0x02c6, 0x02c8,
+    0x02ca, 0x02cc, 0x0287, 0x228a, 0x02ce, 0x228c, 0x2290, 0x2292,
+    0x228e, 0x0288, 0x0289, 0x028a, 0x2482, 0x0300, 0x0302, 0x0304,
+    0x028b, 0x2480, 0x0308, 0x0984, 0x0986, 0x2458, 0x0a02, 0x0306,
+    0x2298, 0x229a, 0x229e, 0x0900, 0x030a, 0x22a0, 0x030c, 0x030e,
+    0x0840, 0x0310, 0x0312, 0x22a2, 0x22a6, 0x09c0, 0x22a4, 0x22a8,
+    0x22aa, 0x028c, 0x028d, 0x028e, 0x0340, 0x0342, 0x0344, 0x0380,
+    0x028f, 0x248e, 0x07c2, 0x0988, 0x098a, 0x2490, 0x0346, 0x22ac,
+    0x0400, 0x22b0, 0x0842, 0x22b2, 0x0402, 0x22b4, 0x0440, 0x0444,
+    0x22b6, 0x0442, 0x22c2, 0x22c0, 0x22c4, 0x22c6, 0x22c8, 0x0940,
+    0x04c0, 0x0291, 0x22ca, 0x04c4, 0x22cc, 0x04c2, 0x22d0, 0x22ce,
+    0x0292, 0x0293, 0x0294, 0x0295, 0x0540, 0x0542, 0x0a08, 0x0296,
+    0x2494, 0x0544, 0x07c4, 0x098c, 0x098e, 0x06c0, 0x2492, 0x0844,
+    0x2308, 0x230a, 0x0580, 0x230c, 0x0584, 0x0990, 0x0992, 0x230e,
+    0x0582, 0x2312, 0x0586, 0x0588, 0x2314, 0x058c, 0x2316, 0x0998,
+    0x058a, 0x231e, 0x0590, 0x2320, 0x099a, 0x058e, 0x2324, 0x2322,
+    0x0299, 0x029a, 0x029b, 0x05c0, 0x05c2, 0x05c4, 0x029c, 0x24ac,
+    0x05c6, 0x05c8, 0x07c6, 0x0994, 0x0996, 0x0700, 0x24aa, 0x2326,
+    0x05ca, 0x232a, 0x2328, 0x2340, 0x2342, 0x2344, 0x2346, 0x05cc,
+    0x234a, 0x2348, 0x234c, 0x234e, 0x2350, 0x24b8, 0x029d, 0x05ce,
+    0x24be, 0x0a0c, 0x2352, 0x0600, 0x24bc, 0x24ba, 0x0640, 0x2354,
+    0x0642, 0x0644, 0x2356, 0x2358, 0x02a0, 0x02a1, 0x02a2, 0x02a3,
+    0x02c1, 0x02c3, 0x0a01, 0x02a4, 0x2443, 0x02a5, 0x07c1, 0x0981,
+    0x0983, 0x2441, 0x2281, 0x02c5, 0x2283, 0x2285, 0x2287, 0x02c7,
+    0x02c9, 0x02cb, 0x02cd, 0x02a7, 0x228b, 0x02cf, 0x228d, 0x2291,
+    0x2293, 0x228f, 0x02a8, 0x02a9, 0x02aa, 0x2483, 0x0301, 0x0303,
+    0x0305, 0x02ab, 0x2481, 0x0309, 0x0985, 0x0987, 0x2459, 0x0a03,
+    0x0307, 0x2299, 0x229b, 0x229f, 0x0901, 0x030b, 0x22a1, 0x030d,
+    0x030f, 0x0841, 0x0311, 0x0313, 0x22a3, 0x22a7, 0x09c1, 0x22a5,
+    0x22a9, 0x22ab, 0x2380, 0x02ac, 0x02ad, 0x02ae, 0x0341, 0x0343,
+    0x0345, 0x02af, 0x248f, 0x07c3, 0x0989, 0x098b, 0x2491, 0x0347,
+    0x22ad, 0x0401, 0x0884, 0x22b1, 0x0843, 0x22b3, 0x0403, 0x22b5,
+    0x0441, 0x0445, 0x22b7, 0x0443, 0x22c3, 0x22c1, 0x22c5, 0x22c7,
+    0x22c9, 0x0941, 0x04c1, 0x02b1, 0x22cb, 0x04c5, 0x22cd, 0x04c3,
+    0x22d1, 0x22cf, 0x02b2, 0x02b3, 0x02b4, 0x02b5, 0x0541, 0x0543,
+    0x0a09, 0x02b6, 0x2495, 0x0545, 0x07c5, 0x098d, 0x098f, 0x06c1,
+    0x2493, 0x0845, 0x2309, 0x230b, 0x0581, 0x230d, 0x0585, 0x0991,
+    0x0993, 0x230f, 0x0583, 0x2313, 0x0587, 0x0589, 0x2315, 0x058d,
+    0x2317, 0x0999, 0x058b, 0x231f, 0x2381, 0x0591, 0x2321, 0x099b,
+    0x058f, 0x2325, 0x2323, 0x02b9, 0x02ba, 0x02bb, 0x05c1, 0x05c3,
+    0x05c5, 0x02bc, 0x24ad, 0x05c7, 0x05c9, 0x07c7, 0x0995, 0x0997,
+    0x0701, 0x24ab, 0x2327, 0x05cb, 0x232b, 0x2329, 0x2341, 0x2343,
+    0x2345, 0x2347, 0x05cd, 0x234b, 0x2349, 0x2382, 0x234d, 0x234f,
+    0x2351, 0x24b9, 0x02bd, 0x05cf, 0x24bf, 0x0a0d, 0x2353, 0x02bf,
+    0x24bd, 0x2383, 0x24bb, 0x0641, 0x2355, 0x0643, 0x0645, 0x2357,
+    0x2359, 0x3101, 0x0c80, 0x2e00, 0x2446, 0x2444, 0x244a, 0x2448,
+    0x0800, 0x0942, 0x0944, 0x0804, 0x2288, 0x2486, 0x2484, 0x248a,
+    0x2488, 0x22ae, 0x2498, 0x2496, 0x249c, 0x249a, 0x2300, 0x0a06,
+    0x2302, 0x0a04, 0x0946, 0x07ce, 0x07ca, 0x07c8, 0x07cc, 0x2447,
+    0x2445, 0x244b, 0x2449, 0x0801, 0x0943, 0x0945, 0x0805, 0x2289,
+    0x2487, 0x2485, 0x248b, 0x2489, 0x22af, 0x2499, 0x2497, 0x249d,
+    0x249b, 0x2301, 0x0a07, 0x2303, 0x0a05, 0x0947, 0x07cf, 0x07cb,
+    0x07c9, 0x07cd, 0x2450, 0x244e, 0x2454, 0x2452, 0x2451, 0x244f,
+    0x2455, 0x2453, 0x2294, 0x2296, 0x2295, 0x2297, 0x2304, 0x2306,
+    0x2305, 0x2307, 0x2318, 0x2319, 0x231a, 0x231b, 0x232c, 0x232d,
+    0x232e, 0x232f, 0x2400, 0x24a2, 0x24a0, 0x24a6, 0x24a4, 0x24a8,
+    0x24a3, 0x24a1, 0x24a7, 0x24a5, 0x24a9, 0x24b0, 0x24ae, 0x24b4,
+    0x24b2, 0x24b6, 0x24b1, 0x24af, 0x24b5, 0x24b3, 0x24b7, 0x0882,
+    0x0880, 0x0881, 0x0802, 0x0803, 0x229c, 0x229d, 0x0a0a, 0x0a0b,
+    0x0883, 0x0b40, 0x2c8a, 0x0c81, 0x2c89, 0x2c88, 0x2540, 0x2541,
+    0x2d00, 0x2e07, 0x0d00, 0x2640, 0x2641, 0x2e80, 0x0d01, 0x26c8,
+    0x26c9, 0x2f00, 0x2f84, 0x0d02, 0x2f83, 0x2f82, 0x0d40, 0x26d8,
+    0x26d9, 0x3186, 0x0d04, 0x2740, 0x2741, 0x3100, 0x3086, 0x0d06,
+    0x3085, 0x3084, 0x0d41, 0x2840, 0x3200, 0x0d07, 0x284f, 0x2850,
+    0x3280, 0x2c84, 0x2e03, 0x2857, 0x0d42, 0x2c81, 0x2c80, 0x24c0,
+    0x24c1, 0x2c86, 0x2c83, 0x28c0, 0x0d43, 0x25c0, 0x25c1, 0x2940,
+    0x0d44, 0x26c0, 0x26c1, 0x2e05, 0x2e02, 0x29c0, 0x0d45, 0x2f05,
+    0x2f04, 0x0d80, 0x26d0, 0x26d1, 0x2f80, 0x2a40, 0x0d82, 0x26e0,
+    0x26e1, 0x3080, 0x3081, 0x2ac0, 0x0d83, 0x3004, 0x3003, 0x0d81,
+    0x27c0, 0x27c1, 0x3082, 0x2b40, 0x0d84, 0x2847, 0x2848, 0x3184,
+    0x3181, 0x2f06, 0x0d08, 0x2f81, 0x3005, 0x0d46, 0x3083, 0x3182,
+    0x0e00, 0x0e01, 0x0f40, 0x1180, 0x1182, 0x0f03, 0x0f00, 0x11c0,
+    0x0f01, 0x1140, 0x1202, 0x1204, 0x0f81, 0x1240, 0x0fc0, 0x1242,
+    0x0f80, 0x1244, 0x1284, 0x0f82, 0x1286, 0x1288, 0x128a, 0x12c0,
+    0x1282, 0x1181, 0x1183, 0x1043, 0x1040, 0x11c1, 0x1041, 0x1141,
+    0x1203, 0x1205, 0x10c1, 0x1241, 0x1000, 0x1243, 0x10c0, 0x1245,
+    0x1285, 0x10c2, 0x1287, 0x1289, 0x128b, 0x12c1, 0x1283, 0x1080,
+    0x1100, 0x1101, 0x1200, 0x1201, 0x1280, 0x1281, 0x1340, 0x1341,
+    0x1343, 0x1342, 0x1344, 0x13c2, 0x1400, 0x13c0, 0x1440, 0x1480,
+    0x14c0, 0x1540, 0x1541, 0x1740, 0x1700, 0x1741, 0x17c0, 0x1800,
+    0x1802, 0x1801, 0x1840, 0x1880, 0x1900, 0x18c0, 0x18c1, 0x1901,
+    0x1940, 0x1942, 0x1941, 0x1980, 0x19c0, 0x19c2, 0x19c1, 0x1c80,
+    0x1cc0, 0x1dc0, 0x1f80, 0x2000, 0x2002, 0x2004, 0x2006, 0x2008,
+    0x2040, 0x2080, 0x2082, 0x20c0, 0x20c1, 0x2100, 0x22b8, 0x22b9,
+    0x2310, 0x2311, 0x231c, 0x231d, 0x244c, 0x2456, 0x244d, 0x2457,
+    0x248c, 0x248d, 0x249e, 0x249f, 0x2500, 0x2502, 0x2504, 0x2bc0,
+    0x2501, 0x2503, 0x2505, 0x2bc1, 0x2bc2, 0x2bc3, 0x2bc4, 0x2bc5,
+    0x2bc6, 0x2bc7, 0x2580, 0x2582, 0x2584, 0x2bc8, 0x2581, 0x2583,
+    0x2585, 0x2bc9, 0x2bca, 0x2bcb, 0x2bcc, 0x2bcd, 0x2bce, 0x2bcf,
+    0x2600, 0x2602, 0x2601, 0x2603, 0x2680, 0x2682, 0x2681, 0x2683,
+    0x26c2, 0x26c4, 0x26c6, 0x2c00, 0x26c3, 0x26c5, 0x26c7, 0x2c01,
+    0x2c02, 0x2c03, 0x2c04, 0x2c05, 0x2c06, 0x2c07, 0x26ca, 0x26cc,
+    0x26ce, 0x2c08, 0x26cb, 0x26cd, 0x26cf, 0x2c09, 0x2c0a, 0x2c0b,
+    0x2c0c, 0x2c0d, 0x2c0e, 0x2c0f, 0x26d2, 0x26d4, 0x26d6, 0x26d3,
+    0x26d5, 0x26d7, 0x26da, 0x26dc, 0x26de, 0x26db, 0x26dd, 0x26df,
+    0x2700, 0x2702, 0x2701, 0x2703, 0x2780, 0x2782, 0x2781, 0x2783,
+    0x2800, 0x2802, 0x2804, 0x2801, 0x2803, 0x2805, 0x2842, 0x2844,
+    0x2846, 0x2849, 0x284b, 0x284d, 0x2c40, 0x284a, 0x284c, 0x284e,
+    0x2c41, 0x2c42, 0x2c43, 0x2c44, 0x2c45, 0x2c46, 0x2c47, 0x2851,
+    0x2853, 0x2855, 0x2c48, 0x2852, 0x2854, 0x2856, 0x2c49, 0x2c4a,
+    0x2c4b, 0x2c4c, 0x2c4d, 0x2c4e, 0x2c4f, 0x2c82, 0x2e01, 0x3180,
+    0x2c87, 0x2f01, 0x2f02, 0x2f03, 0x2e06, 0x3185, 0x3000, 0x3001,
+    0x3002, 0x4640, 0x4641, 0x4680, 0x46c0, 0x46c2, 0x46c1, 0x4700,
+    0x4740, 0x4780, 0x47c0, 0x47c2, 0x4900, 0x4940, 0x4980, 0x4982,
+    0x4a00, 0x49c2, 0x4a03, 0x4a04, 0x4a40, 0x4a41, 0x4a80, 0x4a81,
+    0x4ac0, 0x4ac1, 0x4bc0, 0x4bc1, 0x4b00, 0x4b01, 0x4b40, 0x4b41,
+    0x4bc2, 0x4bc3, 0x4b80, 0x4b81, 0x4b82, 0x4b83, 0x4c00, 0x4c01,
+    0x4c02, 0x4c03, 0x5600, 0x5440, 0x5442, 0x5444, 0x5446, 0x5448,
+    0x544a, 0x544c, 0x544e, 0x5450, 0x5452, 0x5454, 0x5456, 0x5480,
+    0x5482, 0x5484, 0x54c0, 0x54c1, 0x5500, 0x5501, 0x5540, 0x5541,
+    0x5580, 0x5581, 0x55c0, 0x55c1, 0x5680, 0x58c0, 0x5700, 0x5702,
+    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,
+};
+
+typedef enum {
+    UNICODE_GC_Cn,
+    UNICODE_GC_Lu,
+    UNICODE_GC_Ll,
+    UNICODE_GC_Lt,
+    UNICODE_GC_Lm,
+    UNICODE_GC_Lo,
+    UNICODE_GC_Mn,
+    UNICODE_GC_Mc,
+    UNICODE_GC_Me,
+    UNICODE_GC_Nd,
+    UNICODE_GC_Nl,
+    UNICODE_GC_No,
+    UNICODE_GC_Sm,
+    UNICODE_GC_Sc,
+    UNICODE_GC_Sk,
+    UNICODE_GC_So,
+    UNICODE_GC_Pc,
+    UNICODE_GC_Pd,
+    UNICODE_GC_Ps,
+    UNICODE_GC_Pe,
+    UNICODE_GC_Pi,
+    UNICODE_GC_Pf,
+    UNICODE_GC_Po,
+    UNICODE_GC_Zs,
+    UNICODE_GC_Zl,
+    UNICODE_GC_Zp,
+    UNICODE_GC_Cc,
+    UNICODE_GC_Cf,
+    UNICODE_GC_Cs,
+    UNICODE_GC_Co,
+    UNICODE_GC_LC,
+    UNICODE_GC_L,
+    UNICODE_GC_M,
+    UNICODE_GC_N,
+    UNICODE_GC_S,
+    UNICODE_GC_P,
+    UNICODE_GC_Z,
+    UNICODE_GC_C,
+    UNICODE_GC_COUNT,
+} UnicodeGCEnum;
+
+static const char unicode_gc_name_table[] =
+    "Cn,Unassigned"            "\0"
+    "Lu,Uppercase_Letter"      "\0"
+    "Ll,Lowercase_Letter"      "\0"
+    "Lt,Titlecase_Letter"      "\0"
+    "Lm,Modifier_Letter"       "\0"
+    "Lo,Other_Letter"          "\0"
+    "Mn,Nonspacing_Mark"       "\0"
+    "Mc,Spacing_Mark"          "\0"
+    "Me,Enclosing_Mark"        "\0"
+    "Nd,Decimal_Number,digit"  "\0"
+    "Nl,Letter_Number"         "\0"
+    "No,Other_Number"          "\0"
+    "Sm,Math_Symbol"           "\0"
+    "Sc,Currency_Symbol"       "\0"
+    "Sk,Modifier_Symbol"       "\0"
+    "So,Other_Symbol"          "\0"
+    "Pc,Connector_Punctuation" "\0"
+    "Pd,Dash_Punctuation"      "\0"
+    "Ps,Open_Punctuation"      "\0"
+    "Pe,Close_Punctuation"     "\0"
+    "Pi,Initial_Punctuation"   "\0"
+    "Pf,Final_Punctuation"     "\0"
+    "Po,Other_Punctuation"     "\0"
+    "Zs,Space_Separator"       "\0"
+    "Zl,Line_Separator"        "\0"
+    "Zp,Paragraph_Separator"   "\0"
+    "Cc,Control,cntrl"         "\0"
+    "Cf,Format"                "\0"
+    "Cs,Surrogate"             "\0"
+    "Co,Private_Use"           "\0"
+    "LC,Cased_Letter"          "\0"
+    "L,Letter"                 "\0"
+    "M,Mark,Combining_Mark"    "\0"
+    "N,Number"                 "\0"
+    "S,Symbol"                 "\0"
+    "P,Punctuation,punct"      "\0"
+    "Z,Separator"              "\0"
+    "C,Other"                  "\0"
+;
+
+static const uint8_t unicode_gc_table[3719] = {
+    0xfa, 0x18, 0x17, 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,
+    0xfa, 0x19, 0x17, 0x16, 0x6d, 0x0f, 0x16, 0x0e,
+    0x0f, 0x05, 0x14, 0x0c, 0x1b, 0x0f, 0x0e, 0x0f,
+    0x0c, 0x2b, 0x0e, 0x02, 0x36, 0x0e, 0x0b, 0x05,
+    0x15, 0x4b, 0x16, 0xe1, 0x0f, 0x0c, 0xc1, 0xe2,
+    0x10, 0x0c, 0xe2, 0x00, 0xff, 0x30, 0x02, 0xff,
+    0x08, 0x02, 0xff, 0x27, 0xbf, 0x22, 0x21, 0x02,
+    0x5f, 0x5f, 0x21, 0x22, 0x61, 0x02, 0x21, 0x02,
+    0x41, 0x42, 0x21, 0x02, 0x21, 0x02, 0x9f, 0x7f,
+    0x02, 0x5f, 0x5f, 0x21, 0x02, 0x5f, 0x3f, 0x02,
+    0x05, 0x3f, 0x22, 0x65, 0x01, 0x03, 0x02, 0x01,
+    0x03, 0x02, 0x01, 0x03, 0x02, 0xff, 0x08, 0x02,
+    0xff, 0x0a, 0x02, 0x01, 0x03, 0x02, 0x5f, 0x21,
+    0x02, 0xff, 0x32, 0xa2, 0x21, 0x02, 0x21, 0x22,
+    0x5f, 0x41, 0x02, 0xff, 0x00, 0xe2, 0x3c, 0x05,
+    0xe2, 0x13, 0xe4, 0x0a, 0x6e, 0xe4, 0x04, 0xee,
+    0x06, 0x84, 0xce, 0x04, 0x0e, 0x04, 0xee, 0x09,
+    0xe6, 0x68, 0x7f, 0x04, 0x0e, 0x3f, 0x20, 0x04,
+    0x42, 0x16, 0x01, 0x60, 0x2e, 0x01, 0x16, 0x41,
+    0x00, 0x01, 0x00, 0x21, 0x02, 0xe1, 0x09, 0x00,
+    0xe1, 0x01, 0xe2, 0x1b, 0x3f, 0x02, 0x41, 0x42,
+    0xff, 0x10, 0x62, 0x3f, 0x0c, 0x5f, 0x3f, 0x02,
+    0xe1, 0x2b, 0xe2, 0x28, 0xff, 0x1a, 0x0f, 0x86,
+    0x28, 0xff, 0x2f, 0xff, 0x06, 0x02, 0xff, 0x58,
+    0x00, 0xe1, 0x1e, 0x20, 0x04, 0xb6, 0xe2, 0x21,
+    0x16, 0x11, 0x20, 0x2f, 0x0d, 0x00, 0xe6, 0x25,
+    0x11, 0x06, 0x16, 0x26, 0x16, 0x26, 0x16, 0x06,
+    0xe0, 0x00, 0xe5, 0x13, 0x60, 0x65, 0x36, 0xe0,
+    0x03, 0xbb, 0x4c, 0x36, 0x0d, 0x36, 0x2f, 0xe6,
+    0x03, 0x16, 0x1b, 0x00, 0x36, 0xe5, 0x18, 0x04,
+    0xe5, 0x02, 0xe6, 0x0d, 0xe9, 0x02, 0x76, 0x25,
+    0x06, 0xe5, 0x5b, 0x16, 0x05, 0xc6, 0x1b, 0x0f,
+    0xa6, 0x24, 0x26, 0x0f, 0x66, 0x25, 0xe9, 0x02,
+    0x45, 0x2f, 0x05, 0xf6, 0x06, 0x00, 0x1b, 0x05,
+    0x06, 0xe5, 0x16, 0xe6, 0x13, 0x20, 0xe5, 0x51,
+    0xe6, 0x03, 0x05, 0xe0, 0x06, 0xe9, 0x02, 0xe5,
+    0x19, 0xe6, 0x01, 0x24, 0x0f, 0x56, 0x04, 0x20,
+    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,
+    0x2e, 0x06, 0x07, 0x06, 0x05, 0x47, 0xe6, 0x00,
+    0x67, 0x06, 0x27, 0x05, 0xc6, 0xe5, 0x02, 0x26,
+    0x36, 0xe9, 0x02, 0x16, 0x04, 0xe5, 0x07, 0x06,
+    0x27, 0x00, 0xe5, 0x00, 0x20, 0x25, 0x20, 0xe5,
+    0x0e, 0x00, 0xc5, 0x00, 0x05, 0x40, 0x65, 0x20,
+    0x06, 0x05, 0x47, 0x66, 0x20, 0x27, 0x20, 0x27,
+    0x06, 0x05, 0xe0, 0x00, 0x07, 0x60, 0x25, 0x00,
+    0x45, 0x26, 0x20, 0xe9, 0x02, 0x25, 0x2d, 0xab,
+    0x0f, 0x0d, 0x05, 0x16, 0x06, 0x20, 0x26, 0x07,
+    0x00, 0xa5, 0x60, 0x25, 0x20, 0xe5, 0x0e, 0x00,
+    0xc5, 0x00, 0x25, 0x00, 0x25, 0x00, 0x25, 0x20,
+    0x06, 0x00, 0x47, 0x26, 0x60, 0x26, 0x20, 0x46,
+    0x40, 0x06, 0xc0, 0x65, 0x00, 0x05, 0xc0, 0xe9,
+    0x02, 0x26, 0x45, 0x06, 0x16, 0xe0, 0x02, 0x26,
+    0x07, 0x00, 0xe5, 0x01, 0x00, 0x45, 0x00, 0xe5,
+    0x0e, 0x00, 0xc5, 0x00, 0x25, 0x00, 0x85, 0x20,
+    0x06, 0x05, 0x47, 0x86, 0x00, 0x26, 0x07, 0x00,
+    0x27, 0x06, 0x20, 0x05, 0xe0, 0x07, 0x25, 0x26,
+    0x20, 0xe9, 0x02, 0x16, 0x0d, 0xc0, 0x05, 0xa6,
+    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,
+    0xe5, 0x27, 0x06, 0x07, 0x86, 0x07, 0x06, 0x87,
+    0x06, 0x27, 0xc5, 0x60, 0xe9, 0x02, 0xd6, 0xef,
+    0x02, 0xe6, 0x01, 0xef, 0x01, 0x40, 0x26, 0x07,
+    0xe5, 0x16, 0x07, 0x66, 0x27, 0x26, 0x07, 0x46,
+    0x25, 0xe9, 0x02, 0xe5, 0x24, 0x06, 0x07, 0x26,
+    0x47, 0x06, 0x07, 0x46, 0x27, 0xe0, 0x00, 0x76,
+    0xe5, 0x1c, 0xe7, 0x00, 0xe6, 0x00, 0x27, 0x26,
+    0x40, 0x96, 0xe9, 0x02, 0x40, 0x45, 0xe9, 0x02,
+    0xe5, 0x16, 0xa4, 0x36, 0xe2, 0x01, 0xc0, 0xe1,
+    0x23, 0x20, 0x41, 0xf6, 0x00, 0xe0, 0x00, 0x46,
+    0x16, 0xe6, 0x05, 0x07, 0xc6, 0x65, 0x06, 0xa5,
+    0x06, 0x25, 0x07, 0x26, 0x05, 0x80, 0xe2, 0x24,
+    0xe4, 0x37, 0xe2, 0x05, 0x04, 0xe2, 0x1a, 0xe4,
+    0x1d, 0xe6, 0x32, 0x00, 0x86, 0xff, 0x80, 0x0e,
+    0xe2, 0x00, 0xff, 0x5a, 0xe2, 0x00, 0xe1, 0x00,
+    0xa2, 0x20, 0xa1, 0x20, 0xe2, 0x00, 0xe1, 0x00,
+    0xe2, 0x00, 0xe1, 0x00, 0xa2, 0x20, 0xa1, 0x20,
+    0xe2, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+    0x00, 0x3f, 0xc2, 0xe1, 0x00, 0xe2, 0x06, 0x20,
+    0xe2, 0x00, 0xe3, 0x00, 0xe2, 0x00, 0xe3, 0x00,
+    0xe2, 0x00, 0xe3, 0x00, 0x82, 0x00, 0x22, 0x61,
+    0x03, 0x0e, 0x02, 0x4e, 0x42, 0x00, 0x22, 0x61,
+    0x03, 0x4e, 0x62, 0x20, 0x22, 0x61, 0x00, 0x4e,
+    0xe2, 0x00, 0x81, 0x4e, 0x20, 0x42, 0x00, 0x22,
+    0x61, 0x03, 0x2e, 0x00, 0xf7, 0x03, 0x9b, 0xb1,
+    0x36, 0x14, 0x15, 0x12, 0x34, 0x15, 0x12, 0x14,
+    0xf6, 0x00, 0x18, 0x19, 0x9b, 0x17, 0xf6, 0x01,
+    0x14, 0x15, 0x76, 0x30, 0x56, 0x0c, 0x12, 0x13,
+    0xf6, 0x03, 0x0c, 0x16, 0x10, 0xf6, 0x02, 0x17,
+    0x9b, 0x00, 0xfb, 0x02, 0x0b, 0x04, 0x20, 0xab,
+    0x4c, 0x12, 0x13, 0x04, 0xeb, 0x02, 0x4c, 0x12,
+    0x13, 0x00, 0xe4, 0x05, 0x40, 0xed, 0x18, 0xe0,
+    0x08, 0xe6, 0x05, 0x68, 0x06, 0x48, 0xe6, 0x04,
+    0xe0, 0x07, 0x2f, 0x01, 0x6f, 0x01, 0x2f, 0x02,
+    0x41, 0x22, 0x41, 0x02, 0x0f, 0x01, 0x2f, 0x0c,
+    0x81, 0xaf, 0x01, 0x0f, 0x01, 0x0f, 0x01, 0x0f,
+    0x61, 0x0f, 0x02, 0x61, 0x02, 0x65, 0x02, 0x2f,
+    0x22, 0x21, 0x8c, 0x3f, 0x42, 0x0f, 0x0c, 0x2f,
+    0x02, 0x0f, 0xeb, 0x08, 0xea, 0x1b, 0x3f, 0x6a,
+    0x0b, 0x2f, 0x60, 0x8c, 0x8f, 0x2c, 0x6f, 0x0c,
+    0x2f, 0x0c, 0x2f, 0x0c, 0xcf, 0x0c, 0xef, 0x17,
+    0x2c, 0x2f, 0x0c, 0x0f, 0x0c, 0xef, 0x17, 0xec,
+    0x80, 0x84, 0xef, 0x00, 0x12, 0x13, 0x12, 0x13,
+    0xef, 0x0c, 0x2c, 0xcf, 0x12, 0x13, 0xef, 0x49,
+    0x0c, 0xef, 0x16, 0xec, 0x11, 0xef, 0x20, 0xac,
+    0xef, 0x3d, 0xe0, 0x11, 0xef, 0x03, 0xe0, 0x0d,
+    0xeb, 0x34, 0xef, 0x46, 0xeb, 0x0e, 0xef, 0x80,
+    0x2f, 0x0c, 0xef, 0x01, 0x0c, 0xef, 0x2e, 0xec,
+    0x00, 0xef, 0x67, 0x0c, 0xef, 0x80, 0x70, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0xeb, 0x16, 0xef,
+    0x24, 0x8c, 0x12, 0x13, 0xec, 0x17, 0x12, 0x13,
+    0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13,
+    0xec, 0x08, 0xef, 0x80, 0x78, 0xec, 0x7b, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    0x13, 0x12, 0x13, 0x12, 0x13, 0x12, 0x13, 0x12,
+    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,
+    0xe1, 0x27, 0x00, 0xe2, 0x27, 0x00, 0x5f, 0x21,
+    0x22, 0xdf, 0x41, 0x02, 0x3f, 0x02, 0x3f, 0x82,
+    0x24, 0x41, 0x02, 0xff, 0x5a, 0x02, 0xaf, 0x7f,
+    0x46, 0x3f, 0x80, 0x76, 0x0b, 0x36, 0xe2, 0x1e,
+    0x00, 0x02, 0x80, 0x02, 0x20, 0xe5, 0x30, 0xc0,
+    0x04, 0x16, 0xe0, 0x06, 0x06, 0xe5, 0x0f, 0xe0,
+    0x01, 0xc5, 0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5,
+    0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5, 0x00, 0xc5,
+    0x00, 0xe6, 0x18, 0x36, 0x14, 0x15, 0x14, 0x15,
+    0x56, 0x14, 0x15, 0x16, 0x14, 0x15, 0xf6, 0x01,
+    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,
+    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,
+    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,
+};
+
+typedef enum {
+    UNICODE_SCRIPT_Unknown,
+    UNICODE_SCRIPT_Adlam,
+    UNICODE_SCRIPT_Ahom,
+    UNICODE_SCRIPT_Anatolian_Hieroglyphs,
+    UNICODE_SCRIPT_Arabic,
+    UNICODE_SCRIPT_Armenian,
+    UNICODE_SCRIPT_Avestan,
+    UNICODE_SCRIPT_Balinese,
+    UNICODE_SCRIPT_Bamum,
+    UNICODE_SCRIPT_Bassa_Vah,
+    UNICODE_SCRIPT_Batak,
+    UNICODE_SCRIPT_Bengali,
+    UNICODE_SCRIPT_Bhaiksuki,
+    UNICODE_SCRIPT_Bopomofo,
+    UNICODE_SCRIPT_Brahmi,
+    UNICODE_SCRIPT_Braille,
+    UNICODE_SCRIPT_Buginese,
+    UNICODE_SCRIPT_Buhid,
+    UNICODE_SCRIPT_Canadian_Aboriginal,
+    UNICODE_SCRIPT_Carian,
+    UNICODE_SCRIPT_Caucasian_Albanian,
+    UNICODE_SCRIPT_Chakma,
+    UNICODE_SCRIPT_Cham,
+    UNICODE_SCRIPT_Cherokee,
+    UNICODE_SCRIPT_Common,
+    UNICODE_SCRIPT_Coptic,
+    UNICODE_SCRIPT_Cuneiform,
+    UNICODE_SCRIPT_Cypriot,
+    UNICODE_SCRIPT_Cyrillic,
+    UNICODE_SCRIPT_Deseret,
+    UNICODE_SCRIPT_Devanagari,
+    UNICODE_SCRIPT_Dogra,
+    UNICODE_SCRIPT_Duployan,
+    UNICODE_SCRIPT_Egyptian_Hieroglyphs,
+    UNICODE_SCRIPT_Elbasan,
+    UNICODE_SCRIPT_Elymaic,
+    UNICODE_SCRIPT_Ethiopic,
+    UNICODE_SCRIPT_Georgian,
+    UNICODE_SCRIPT_Glagolitic,
+    UNICODE_SCRIPT_Gothic,
+    UNICODE_SCRIPT_Grantha,
+    UNICODE_SCRIPT_Greek,
+    UNICODE_SCRIPT_Gujarati,
+    UNICODE_SCRIPT_Gunjala_Gondi,
+    UNICODE_SCRIPT_Gurmukhi,
+    UNICODE_SCRIPT_Han,
+    UNICODE_SCRIPT_Hangul,
+    UNICODE_SCRIPT_Hanifi_Rohingya,
+    UNICODE_SCRIPT_Hanunoo,
+    UNICODE_SCRIPT_Hatran,
+    UNICODE_SCRIPT_Hebrew,
+    UNICODE_SCRIPT_Hiragana,
+    UNICODE_SCRIPT_Imperial_Aramaic,
+    UNICODE_SCRIPT_Inherited,
+    UNICODE_SCRIPT_Inscriptional_Pahlavi,
+    UNICODE_SCRIPT_Inscriptional_Parthian,
+    UNICODE_SCRIPT_Javanese,
+    UNICODE_SCRIPT_Kaithi,
+    UNICODE_SCRIPT_Kannada,
+    UNICODE_SCRIPT_Katakana,
+    UNICODE_SCRIPT_Kayah_Li,
+    UNICODE_SCRIPT_Kharoshthi,
+    UNICODE_SCRIPT_Khmer,
+    UNICODE_SCRIPT_Khojki,
+    UNICODE_SCRIPT_Khudawadi,
+    UNICODE_SCRIPT_Lao,
+    UNICODE_SCRIPT_Latin,
+    UNICODE_SCRIPT_Lepcha,
+    UNICODE_SCRIPT_Limbu,
+    UNICODE_SCRIPT_Linear_A,
+    UNICODE_SCRIPT_Linear_B,
+    UNICODE_SCRIPT_Lisu,
+    UNICODE_SCRIPT_Lycian,
+    UNICODE_SCRIPT_Lydian,
+    UNICODE_SCRIPT_Makasar,
+    UNICODE_SCRIPT_Mahajani,
+    UNICODE_SCRIPT_Malayalam,
+    UNICODE_SCRIPT_Mandaic,
+    UNICODE_SCRIPT_Manichaean,
+    UNICODE_SCRIPT_Marchen,
+    UNICODE_SCRIPT_Masaram_Gondi,
+    UNICODE_SCRIPT_Medefaidrin,
+    UNICODE_SCRIPT_Meetei_Mayek,
+    UNICODE_SCRIPT_Mende_Kikakui,
+    UNICODE_SCRIPT_Meroitic_Cursive,
+    UNICODE_SCRIPT_Meroitic_Hieroglyphs,
+    UNICODE_SCRIPT_Miao,
+    UNICODE_SCRIPT_Modi,
+    UNICODE_SCRIPT_Mongolian,
+    UNICODE_SCRIPT_Mro,
+    UNICODE_SCRIPT_Multani,
+    UNICODE_SCRIPT_Myanmar,
+    UNICODE_SCRIPT_Nabataean,
+    UNICODE_SCRIPT_Nandinagari,
+    UNICODE_SCRIPT_New_Tai_Lue,
+    UNICODE_SCRIPT_Newa,
+    UNICODE_SCRIPT_Nko,
+    UNICODE_SCRIPT_Nushu,
+    UNICODE_SCRIPT_Nyiakeng_Puachue_Hmong,
+    UNICODE_SCRIPT_Ogham,
+    UNICODE_SCRIPT_Ol_Chiki,
+    UNICODE_SCRIPT_Old_Hungarian,
+    UNICODE_SCRIPT_Old_Italic,
+    UNICODE_SCRIPT_Old_North_Arabian,
+    UNICODE_SCRIPT_Old_Permic,
+    UNICODE_SCRIPT_Old_Persian,
+    UNICODE_SCRIPT_Old_Sogdian,
+    UNICODE_SCRIPT_Old_South_Arabian,
+    UNICODE_SCRIPT_Old_Turkic,
+    UNICODE_SCRIPT_Oriya,
+    UNICODE_SCRIPT_Osage,
+    UNICODE_SCRIPT_Osmanya,
+    UNICODE_SCRIPT_Pahawh_Hmong,
+    UNICODE_SCRIPT_Palmyrene,
+    UNICODE_SCRIPT_Pau_Cin_Hau,
+    UNICODE_SCRIPT_Phags_Pa,
+    UNICODE_SCRIPT_Phoenician,
+    UNICODE_SCRIPT_Psalter_Pahlavi,
+    UNICODE_SCRIPT_Rejang,
+    UNICODE_SCRIPT_Runic,
+    UNICODE_SCRIPT_Samaritan,
+    UNICODE_SCRIPT_Saurashtra,
+    UNICODE_SCRIPT_Sharada,
+    UNICODE_SCRIPT_Shavian,
+    UNICODE_SCRIPT_Siddham,
+    UNICODE_SCRIPT_SignWriting,
+    UNICODE_SCRIPT_Sinhala,
+    UNICODE_SCRIPT_Sogdian,
+    UNICODE_SCRIPT_Sora_Sompeng,
+    UNICODE_SCRIPT_Soyombo,
+    UNICODE_SCRIPT_Sundanese,
+    UNICODE_SCRIPT_Syloti_Nagri,
+    UNICODE_SCRIPT_Syriac,
+    UNICODE_SCRIPT_Tagalog,
+    UNICODE_SCRIPT_Tagbanwa,
+    UNICODE_SCRIPT_Tai_Le,
+    UNICODE_SCRIPT_Tai_Tham,
+    UNICODE_SCRIPT_Tai_Viet,
+    UNICODE_SCRIPT_Takri,
+    UNICODE_SCRIPT_Tamil,
+    UNICODE_SCRIPT_Tangut,
+    UNICODE_SCRIPT_Telugu,
+    UNICODE_SCRIPT_Thaana,
+    UNICODE_SCRIPT_Thai,
+    UNICODE_SCRIPT_Tibetan,
+    UNICODE_SCRIPT_Tifinagh,
+    UNICODE_SCRIPT_Tirhuta,
+    UNICODE_SCRIPT_Ugaritic,
+    UNICODE_SCRIPT_Vai,
+    UNICODE_SCRIPT_Wancho,
+    UNICODE_SCRIPT_Warang_Citi,
+    UNICODE_SCRIPT_Yi,
+    UNICODE_SCRIPT_Zanabazar_Square,
+    UNICODE_SCRIPT_COUNT,
+} UnicodeScriptEnum;
+
+static const char unicode_script_name_table[] =
+    "Adlam,Adlm"                  "\0"
+    "Ahom,Ahom"                   "\0"
+    "Anatolian_Hieroglyphs,Hluw"  "\0"
+    "Arabic,Arab"                 "\0"
+    "Armenian,Armn"               "\0"
+    "Avestan,Avst"                "\0"
+    "Balinese,Bali"               "\0"
+    "Bamum,Bamu"                  "\0"
+    "Bassa_Vah,Bass"              "\0"
+    "Batak,Batk"                  "\0"
+    "Bengali,Beng"                "\0"
+    "Bhaiksuki,Bhks"              "\0"
+    "Bopomofo,Bopo"               "\0"
+    "Brahmi,Brah"                 "\0"
+    "Braille,Brai"                "\0"
+    "Buginese,Bugi"               "\0"
+    "Buhid,Buhd"                  "\0"
+    "Canadian_Aboriginal,Cans"    "\0"
+    "Carian,Cari"                 "\0"
+    "Caucasian_Albanian,Aghb"     "\0"
+    "Chakma,Cakm"                 "\0"
+    "Cham,Cham"                   "\0"
+    "Cherokee,Cher"               "\0"
+    "Common,Zyyy"                 "\0"
+    "Coptic,Copt,Qaac"            "\0"
+    "Cuneiform,Xsux"              "\0"
+    "Cypriot,Cprt"                "\0"
+    "Cyrillic,Cyrl"               "\0"
+    "Deseret,Dsrt"                "\0"
+    "Devanagari,Deva"             "\0"
+    "Dogra,Dogr"                  "\0"
+    "Duployan,Dupl"               "\0"
+    "Egyptian_Hieroglyphs,Egyp"   "\0"
+    "Elbasan,Elba"                "\0"
+    "Elymaic,Elym"                "\0"
+    "Ethiopic,Ethi"               "\0"
+    "Georgian,Geor"               "\0"
+    "Glagolitic,Glag"             "\0"
+    "Gothic,Goth"                 "\0"
+    "Grantha,Gran"                "\0"
+    "Greek,Grek"                  "\0"
+    "Gujarati,Gujr"               "\0"
+    "Gunjala_Gondi,Gong"          "\0"
+    "Gurmukhi,Guru"               "\0"
+    "Han,Hani"                    "\0"
+    "Hangul,Hang"                 "\0"
+    "Hanifi_Rohingya,Rohg"        "\0"
+    "Hanunoo,Hano"                "\0"
+    "Hatran,Hatr"                 "\0"
+    "Hebrew,Hebr"                 "\0"
+    "Hiragana,Hira"               "\0"
+    "Imperial_Aramaic,Armi"       "\0"
+    "Inherited,Zinh,Qaai"         "\0"
+    "Inscriptional_Pahlavi,Phli"  "\0"
+    "Inscriptional_Parthian,Prti" "\0"
+    "Javanese,Java"               "\0"
+    "Kaithi,Kthi"                 "\0"
+    "Kannada,Knda"                "\0"
+    "Katakana,Kana"               "\0"
+    "Kayah_Li,Kali"               "\0"
+    "Kharoshthi,Khar"             "\0"
+    "Khmer,Khmr"                  "\0"
+    "Khojki,Khoj"                 "\0"
+    "Khudawadi,Sind"              "\0"
+    "Lao,Laoo"                    "\0"
+    "Latin,Latn"                  "\0"
+    "Lepcha,Lepc"                 "\0"
+    "Limbu,Limb"                  "\0"
+    "Linear_A,Lina"               "\0"
+    "Linear_B,Linb"               "\0"
+    "Lisu,Lisu"                   "\0"
+    "Lycian,Lyci"                 "\0"
+    "Lydian,Lydi"                 "\0"
+    "Makasar,Maka"                "\0"
+    "Mahajani,Mahj"               "\0"
+    "Malayalam,Mlym"              "\0"
+    "Mandaic,Mand"                "\0"
+    "Manichaean,Mani"             "\0"
+    "Marchen,Marc"                "\0"
+    "Masaram_Gondi,Gonm"          "\0"
+    "Medefaidrin,Medf"            "\0"
+    "Meetei_Mayek,Mtei"           "\0"
+    "Mende_Kikakui,Mend"          "\0"
+    "Meroitic_Cursive,Merc"       "\0"
+    "Meroitic_Hieroglyphs,Mero"   "\0"
+    "Miao,Plrd"                   "\0"
+    "Modi,Modi"                   "\0"
+    "Mongolian,Mong"              "\0"
+    "Mro,Mroo"                    "\0"
+    "Multani,Mult"                "\0"
+    "Myanmar,Mymr"                "\0"
+    "Nabataean,Nbat"              "\0"
+    "Nandinagari,Nand"            "\0"
+    "New_Tai_Lue,Talu"            "\0"
+    "Newa,Newa"                   "\0"
+    "Nko,Nkoo"                    "\0"
+    "Nushu,Nshu"                  "\0"
+    "Nyiakeng_Puachue_Hmong,Hmnp" "\0"
+    "Ogham,Ogam"                  "\0"
+    "Ol_Chiki,Olck"               "\0"
+    "Old_Hungarian,Hung"          "\0"
+    "Old_Italic,Ital"             "\0"
+    "Old_North_Arabian,Narb"      "\0"
+    "Old_Permic,Perm"             "\0"
+    "Old_Persian,Xpeo"            "\0"
+    "Old_Sogdian,Sogo"            "\0"
+    "Old_South_Arabian,Sarb"      "\0"
+    "Old_Turkic,Orkh"             "\0"
+    "Oriya,Orya"                  "\0"
+    "Osage,Osge"                  "\0"
+    "Osmanya,Osma"                "\0"
+    "Pahawh_Hmong,Hmng"           "\0"
+    "Palmyrene,Palm"              "\0"
+    "Pau_Cin_Hau,Pauc"            "\0"
+    "Phags_Pa,Phag"               "\0"
+    "Phoenician,Phnx"             "\0"
+    "Psalter_Pahlavi,Phlp"        "\0"
+    "Rejang,Rjng"                 "\0"
+    "Runic,Runr"                  "\0"
+    "Samaritan,Samr"              "\0"
+    "Saurashtra,Saur"             "\0"
+    "Sharada,Shrd"                "\0"
+    "Shavian,Shaw"                "\0"
+    "Siddham,Sidd"                "\0"
+    "SignWriting,Sgnw"            "\0"
+    "Sinhala,Sinh"                "\0"
+    "Sogdian,Sogd"                "\0"
+    "Sora_Sompeng,Sora"           "\0"
+    "Soyombo,Soyo"                "\0"
+    "Sundanese,Sund"              "\0"
+    "Syloti_Nagri,Sylo"           "\0"
+    "Syriac,Syrc"                 "\0"
+    "Tagalog,Tglg"                "\0"
+    "Tagbanwa,Tagb"               "\0"
+    "Tai_Le,Tale"                 "\0"
+    "Tai_Tham,Lana"               "\0"
+    "Tai_Viet,Tavt"               "\0"
+    "Takri,Takr"                  "\0"
+    "Tamil,Taml"                  "\0"
+    "Tangut,Tang"                 "\0"
+    "Telugu,Telu"                 "\0"
+    "Thaana,Thaa"                 "\0"
+    "Thai,Thai"                   "\0"
+    "Tibetan,Tibt"                "\0"
+    "Tifinagh,Tfng"               "\0"
+    "Tirhuta,Tirh"                "\0"
+    "Ugaritic,Ugar"               "\0"
+    "Vai,Vaii"                    "\0"
+    "Wancho,Wcho"                 "\0"
+    "Warang_Citi,Wara"            "\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_prop_Hyphen_table[28] = {
+    0xac, 0x80, 0xfe, 0x80, 0x44, 0xdb, 0x80, 0x52,
+    0x7a, 0x80, 0x48, 0x08, 0x81, 0x4e, 0x04, 0x80,
+    0x42, 0xe2, 0x80, 0x60, 0xcd, 0x66, 0x80, 0x40,
+    0xa8, 0x80, 0xd6, 0x80,
+};
+
+static const uint8_t unicode_prop_Other_Math_table[200] = {
+    0xdd, 0x80, 0x43, 0x70, 0x11, 0x80, 0x99, 0x09,
+    0x81, 0x5c, 0x1f, 0x80, 0x9a, 0x82, 0x8a, 0x80,
+    0x9f, 0x83, 0x97, 0x81, 0x8d, 0x81, 0xc0, 0x8c,
+    0x18, 0x11, 0x1c, 0x91, 0x03, 0x01, 0x89, 0x00,
+    0x14, 0x28, 0x11, 0x09, 0x02, 0x05, 0x13, 0x24,
+    0xca, 0x21, 0x18, 0x08, 0x08, 0x00, 0x21, 0x0b,
+    0x0b, 0x91, 0x09, 0x00, 0x06, 0x00, 0x29, 0x41,
+    0x21, 0x83, 0x40, 0xa7, 0x08, 0x80, 0x97, 0x80,
+    0x90, 0x80, 0x41, 0xbc, 0x81, 0x8b, 0x88, 0x24,
+    0x21, 0x09, 0x14, 0x8d, 0x00, 0x01, 0x85, 0x97,
+    0x81, 0xb8, 0x00, 0x80, 0x9c, 0x83, 0x88, 0x81,
+    0x41, 0x55, 0x81, 0x9e, 0x89, 0x41, 0x92, 0x95,
+    0xbe, 0x83, 0x9f, 0x81, 0x60, 0xd4, 0x62, 0x00,
+    0x03, 0x80, 0x40, 0xd2, 0x00, 0x80, 0x60, 0xd4,
+    0xc0, 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, 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,
+};
+
+static const uint8_t unicode_prop_Other_Alphabetic_table[396] = {
+    0x43, 0x44, 0x80, 0x42, 0x69, 0x8d, 0x00, 0x01,
+    0x01, 0x00, 0xc7, 0x8a, 0xaf, 0x8c, 0x06, 0x8f,
+    0x80, 0xe4, 0x33, 0x19, 0x0b, 0x80, 0xa2, 0x80,
+    0x9d, 0x8f, 0xe5, 0x8a, 0xe4, 0x0a, 0x88, 0x02,
+    0x03, 0x40, 0xa6, 0x8b, 0x16, 0x85, 0x93, 0xb5,
+    0x09, 0x8e, 0x01, 0x22, 0x89, 0x81, 0x9c, 0x82,
+    0xb9, 0x31, 0x09, 0x81, 0x89, 0x80, 0x89, 0x81,
+    0x9c, 0x82, 0xb9, 0x23, 0x09, 0x0b, 0x80, 0x9d,
+    0x0a, 0x80, 0x8a, 0x82, 0xb9, 0x38, 0x10, 0x81,
+    0x94, 0x81, 0x95, 0x13, 0x82, 0xb9, 0x31, 0x09,
+    0x81, 0x88, 0x81, 0x89, 0x81, 0x9d, 0x80, 0xba,
+    0x22, 0x10, 0x82, 0x89, 0x80, 0xa7, 0x83, 0xb9,
+    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, 0xbc, 0x01, 0x86, 0x91, 0x80, 0xe2, 0x01,
+    0x28, 0x81, 0x8f, 0x80, 0x40, 0xa2, 0x90, 0x8a,
+    0x8a, 0x80, 0xa3, 0xed, 0x8b, 0x00, 0x0b, 0x96,
+    0x1b, 0x10, 0x11, 0x32, 0x83, 0x8c, 0x8b, 0x00,
+    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,
+};
+
+static const uint8_t unicode_prop_Other_Lowercase_table[51] = {
+    0x40, 0xa9, 0x80, 0x8e, 0x80, 0x41, 0xf4, 0x88,
+    0x31, 0x9d, 0x84, 0xdf, 0x80, 0xb3, 0x80, 0x59,
+    0xb0, 0xbe, 0x8c, 0x80, 0xa1, 0xa4, 0x42, 0xb0,
+    0x80, 0x8c, 0x80, 0x8f, 0x8c, 0x40, 0xd2, 0x8f,
+    0x43, 0x4f, 0x99, 0x47, 0x91, 0x81, 0x60, 0x7a,
+    0x1d, 0x81, 0x40, 0xd1, 0x80, 0x40, 0x86, 0x81,
+    0x43, 0x61, 0x83,
+};
+
+static const uint8_t unicode_prop_Other_Uppercase_table[15] = {
+    0x60, 0x21, 0x5f, 0x8f, 0x43, 0x45, 0x99, 0x61,
+    0xcc, 0x5f, 0x99, 0x85, 0x99, 0x85, 0x99,
+};
+
+static const uint8_t unicode_prop_Other_Grapheme_Extend_table[62] = {
+    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,
+};
+
+static const uint8_t unicode_prop_Other_Default_Ignorable_Code_Point_table[32] = {
+    0x43, 0x4e, 0x80, 0x4e, 0x0e, 0x81, 0x46, 0x52,
+    0x81, 0x48, 0xae, 0x80, 0x50, 0xfd, 0x80, 0x60,
+    0xce, 0x3a, 0x80, 0xce, 0x88, 0x6d, 0x00, 0x06,
+    0x00, 0x9d, 0xdf, 0xff, 0x40, 0xef, 0x4e, 0x0f,
+};
+
+static const uint8_t unicode_prop_Other_ID_Start_table[11] = {
+    0x58, 0x84, 0x81, 0x48, 0x90, 0x80, 0x94, 0x80,
+    0x4f, 0x6b, 0x81,
+};
+
+static const uint8_t unicode_prop_Other_ID_Continue_table[12] = {
+    0x40, 0xb6, 0x80, 0x42, 0xce, 0x80, 0x4f, 0xe0,
+    0x88, 0x46, 0x67, 0x80,
+};
+
+static const uint8_t unicode_prop_Prepended_Concatenation_Mark_table[17] = {
+    0x45, 0xff, 0x85, 0x40, 0xd6, 0x80, 0xb0, 0x80,
+    0x41, 0xd1, 0x80, 0x61, 0x07, 0xd9, 0x80, 0x8e,
+    0x80,
+};
+
+static const uint8_t unicode_prop_XID_Start1_table[31] = {
+    0x43, 0x79, 0x80, 0x4a, 0xb7, 0x80, 0xfe, 0x80,
+    0x60, 0x21, 0xe6, 0x81, 0x60, 0xcb, 0xc0, 0x85,
+    0x41, 0x95, 0x81, 0xf3, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x80, 0x41, 0x1e, 0x81,
+};
+
+static const uint8_t unicode_prop_XID_Continue1_table[23] = {
+    0x43, 0x79, 0x80, 0x60, 0x2d, 0x1f, 0x81, 0x60,
+    0xcb, 0xc0, 0x85, 0x41, 0x95, 0x81, 0xf3, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+};
+
+static const uint8_t unicode_prop_Changes_When_Titlecased1_table[22] = {
+    0x41, 0xc3, 0x08, 0x08, 0x81, 0xa4, 0x81, 0x4e,
+    0xdc, 0xaa, 0x0a, 0x4e, 0x87, 0x3f, 0x3f, 0x87,
+    0x8b, 0x80, 0x8e, 0x80, 0xae, 0x80,
+};
+
+static const uint8_t unicode_prop_Changes_When_Casefolded1_table[33] = {
+    0x40, 0xde, 0x80, 0xcf, 0x80, 0x97, 0x80, 0x44,
+    0x3c, 0x80, 0x59, 0x11, 0x80, 0x40, 0xe4, 0x3f,
+    0x3f, 0x87, 0x89, 0x11, 0x05, 0x02, 0x11, 0x80,
+    0xa9, 0x11, 0x80, 0x60, 0xdb, 0x07, 0x86, 0x8b,
+    0x84,
+};
+
+static const uint8_t unicode_prop_Changes_When_NFKC_Casefolded1_table[436] = {
+    0x40, 0x9f, 0x06, 0x00, 0x01, 0x00, 0x01, 0x12,
+    0x10, 0x82, 0x9f, 0x80, 0xcf, 0x01, 0x80, 0x8b,
+    0x07, 0x80, 0xfb, 0x01, 0x01, 0x80, 0xa5, 0x80,
+    0x40, 0xbb, 0x88, 0x9e, 0x29, 0x84, 0xda, 0x08,
+    0x81, 0x89, 0x80, 0xa3, 0x04, 0x02, 0x04, 0x08,
+    0x80, 0xc9, 0x82, 0x9c, 0x80, 0x41, 0x93, 0x80,
+    0x40, 0x93, 0x80, 0xd7, 0x83, 0x42, 0xde, 0x87,
+    0xfb, 0x08, 0x80, 0xd2, 0x01, 0x80, 0xa1, 0x11,
+    0x80, 0x40, 0xfc, 0x81, 0x42, 0xd4, 0x80, 0xfe,
+    0x80, 0xa7, 0x81, 0xad, 0x80, 0xb5, 0x80, 0x88,
+    0x03, 0x03, 0x03, 0x80, 0x8b, 0x80, 0x88, 0x00,
+    0x26, 0x80, 0x90, 0x80, 0x88, 0x03, 0x03, 0x03,
+    0x80, 0x8b, 0x80, 0x41, 0x41, 0x80, 0xe1, 0x81,
+    0x46, 0x52, 0x81, 0xd4, 0x83, 0x45, 0x1c, 0x10,
+    0x8a, 0x80, 0x91, 0x80, 0x9b, 0x8c, 0x80, 0xa1,
+    0xa4, 0x40, 0xd9, 0x80, 0x40, 0xd5, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x3f, 0x3f, 0x87,
+    0x89, 0x11, 0x04, 0x00, 0x29, 0x04, 0x12, 0x80,
+    0x88, 0x12, 0x80, 0x88, 0x11, 0x11, 0x04, 0x08,
+    0x8f, 0x00, 0x20, 0x8b, 0x12, 0x2a, 0x08, 0x0b,
+    0x00, 0x07, 0x82, 0x8c, 0x06, 0x92, 0x81, 0x9a,
+    0x80, 0x8c, 0x8a, 0x80, 0xd6, 0x18, 0x10, 0x8a,
+    0x01, 0x0c, 0x0a, 0x00, 0x10, 0x11, 0x02, 0x06,
+    0x05, 0x1c, 0x85, 0x8f, 0x8f, 0x8f, 0x88, 0x80,
+    0x40, 0xa1, 0x08, 0x81, 0x40, 0xf7, 0x81, 0x41,
+    0x34, 0xd5, 0x99, 0x9a, 0x45, 0x20, 0x80, 0xe6,
+    0x82, 0xe4, 0x80, 0x41, 0x9e, 0x81, 0x40, 0xf0,
+    0x80, 0x41, 0x2e, 0x80, 0xd2, 0x80, 0x8b, 0x40,
+    0xd5, 0xa9, 0x80, 0xb4, 0x00, 0x82, 0xdf, 0x09,
+    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,
+};
+
+static const uint8_t unicode_prop_ASCII_Hex_Digit_table[5] = {
+    0xaf, 0x89, 0x35, 0x99, 0x85,
+};
+
+static const uint8_t unicode_prop_Bidi_Control_table[10] = {
+    0x46, 0x1b, 0x80, 0x59, 0xf0, 0x81, 0x99, 0x84,
+    0xb6, 0x83,
+};
+
+static const uint8_t unicode_prop_Dash_table[50] = {
+    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,
+};
+
+static const uint8_t unicode_prop_Deprecated_table[23] = {
+    0x41, 0x48, 0x80, 0x45, 0x28, 0x80, 0x49, 0x02,
+    0x00, 0x80, 0x48, 0x28, 0x81, 0x48, 0xc4, 0x85,
+    0x42, 0xb8, 0x81, 0x6d, 0xdc, 0xd5, 0x80,
+};
+
+static const uint8_t unicode_prop_Diacritic_table[350] = {
+    0xdd, 0x00, 0x80, 0xc6, 0x05, 0x03, 0x01, 0x81,
+    0x41, 0xf6, 0x40, 0x9e, 0x07, 0x25, 0x90, 0x0b,
+    0x80, 0x88, 0x81, 0x40, 0xfc, 0x84, 0x40, 0xd0,
+    0x80, 0xb6, 0x90, 0x80, 0x9a, 0x00, 0x01, 0x00,
+    0x40, 0x85, 0x3b, 0x81, 0x40, 0x85, 0x0b, 0x0a,
+    0x82, 0xc2, 0x9a, 0xda, 0x8a, 0xb9, 0x8a, 0xa1,
+    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,
+    0x9d, 0x83, 0x4f, 0x81, 0x86, 0x41, 0xb4, 0x83,
+    0x45, 0xdf, 0x86, 0xec, 0x10, 0x82,
+};
+
+static const uint8_t unicode_prop_Extender_table[86] = {
+    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,
+};
+
+static const uint8_t unicode_prop_Hex_Digit_table[12] = {
+    0xaf, 0x89, 0x35, 0x99, 0x85, 0x60, 0xfe, 0xa8,
+    0x89, 0x35, 0x99, 0x85,
+};
+
+static const uint8_t unicode_prop_IDS_Binary_Operator_table[5] = {
+    0x60, 0x2f, 0xef, 0x09, 0x87,
+};
+
+static const uint8_t unicode_prop_IDS_Trinary_Operator_table[4] = {
+    0x60, 0x2f, 0xf1, 0x81,
+};
+
+static const uint8_t unicode_prop_Ideographic_table[58] = {
+    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,
+};
+
+static const uint8_t unicode_prop_Join_Control_table[4] = {
+    0x60, 0x20, 0x0b, 0x81,
+};
+
+static const uint8_t unicode_prop_Logical_Order_Exception_table[15] = {
+    0x4e, 0x3f, 0x84, 0xfa, 0x84, 0x4a, 0xef, 0x11,
+    0x80, 0x60, 0x90, 0xf9, 0x09, 0x00, 0x81,
+};
+
+static const uint8_t unicode_prop_Noncharacter_Code_Point_table[71] = {
+    0x60, 0xfd, 0xcf, 0x9f, 0x42, 0x0d, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81, 0x60,
+    0xff, 0xfd, 0x81, 0x60, 0xff, 0xfd, 0x81,
+};
+
+static const uint8_t unicode_prop_Pattern_Syntax_table[58] = {
+    0xa0, 0x8e, 0x89, 0x86, 0x99, 0x18, 0x80, 0x99,
+    0x83, 0xa1, 0x30, 0x00, 0x08, 0x00, 0x0b, 0x03,
+    0x02, 0x80, 0x96, 0x80, 0x9e, 0x80, 0x5f, 0x17,
+    0x97, 0x87, 0x8e, 0x81, 0x92, 0x80, 0x89, 0x41,
+    0x30, 0x42, 0xcf, 0x40, 0x9f, 0x42, 0x75, 0x9d,
+    0x44, 0x6b, 0x41, 0xff, 0xff, 0x41, 0x80, 0x13,
+    0x98, 0x8e, 0x80, 0x60, 0xcd, 0x0c, 0x81, 0x41,
+    0x04, 0x81,
+};
+
+static const uint8_t unicode_prop_Pattern_White_Space_table[11] = {
+    0x88, 0x84, 0x91, 0x80, 0xe3, 0x80, 0x5f, 0x87,
+    0x81, 0x97, 0x81,
+};
+
+static const uint8_t unicode_prop_Quotation_Mark_table[31] = {
+    0xa1, 0x03, 0x80, 0x40, 0x82, 0x80, 0x8e, 0x80,
+    0x5f, 0x5b, 0x87, 0x98, 0x81, 0x4e, 0x06, 0x80,
+    0x41, 0xc8, 0x83, 0x8c, 0x82, 0x60, 0xce, 0x20,
+    0x83, 0x40, 0xbc, 0x03, 0x80, 0xd9, 0x81,
+};
+
+static const uint8_t unicode_prop_Radical_table[9] = {
+    0x60, 0x2e, 0x7f, 0x99, 0x80, 0xd8, 0x8b, 0x40,
+    0xd5,
+};
+
+static const uint8_t unicode_prop_Regional_Indicator_table[4] = {
+    0x61, 0xf1, 0xe5, 0x99,
+};
+
+static const uint8_t unicode_prop_Sentence_Terminal_table[184] = {
+    0xa0, 0x80, 0x8b, 0x80, 0x8f, 0x80, 0x45, 0x48,
+    0x80, 0x40, 0x93, 0x81, 0x40, 0xb3, 0x80, 0xaa,
+    0x82, 0x40, 0xf5, 0x80, 0xbc, 0x00, 0x02, 0x81,
+    0x41, 0x24, 0x81, 0x46, 0xe3, 0x81, 0x43, 0x15,
+    0x03, 0x81, 0x43, 0x04, 0x80, 0x40, 0xc5, 0x81,
+    0x40, 0xcb, 0x04, 0x80, 0x41, 0x39, 0x81, 0x41,
+    0x61, 0x83, 0x40, 0xad, 0x09, 0x81, 0x40, 0xda,
+    0x81, 0xc0, 0x81, 0x43, 0xbb, 0x81, 0x88, 0x82,
+    0x4d, 0xe3, 0x80, 0x8c, 0x80, 0x41, 0xc4, 0x80,
+    0x60, 0x74, 0xfb, 0x80, 0x41, 0x0d, 0x81, 0x40,
+    0xe2, 0x02, 0x80, 0x41, 0x7d, 0x81, 0xd5, 0x81,
+    0xde, 0x80, 0x40, 0x97, 0x81, 0x40, 0x92, 0x82,
+    0x40, 0x8f, 0x81, 0x40, 0xf8, 0x80, 0x60, 0x52,
+    0x65, 0x02, 0x81, 0x40, 0xa8, 0x80, 0x8b, 0x80,
+    0x8f, 0x80, 0xc0, 0x80, 0x4a, 0xf3, 0x81, 0x44,
+    0xfc, 0x84, 0x40, 0xec, 0x81, 0xf4, 0x83, 0xfe,
+    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,
+};
+
+static const uint8_t unicode_prop_Soft_Dotted_table[71] = {
+    0xe8, 0x81, 0x40, 0xc3, 0x80, 0x41, 0x18, 0x80,
+    0x9d, 0x80, 0xb3, 0x80, 0x93, 0x80, 0x41, 0x3f,
+    0x80, 0xe1, 0x00, 0x80, 0x59, 0x08, 0x80, 0xb2,
+    0x80, 0x8c, 0x02, 0x80, 0x40, 0x83, 0x80, 0x40,
+    0x9c, 0x80, 0x41, 0xa4, 0x80, 0x40, 0xd5, 0x81,
+    0x4b, 0x31, 0x80, 0x61, 0xa7, 0xa4, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1,
+    0x81, 0xb1, 0x81, 0xb1, 0x81, 0xb1, 0x81,
+};
+
+static const uint8_t unicode_prop_Terminal_Punctuation_table[237] = {
+    0xa0, 0x80, 0x89, 0x00, 0x80, 0x8a, 0x0a, 0x80,
+    0x43, 0x3d, 0x07, 0x80, 0x42, 0x00, 0x80, 0xb8,
+    0x80, 0xc7, 0x80, 0x8d, 0x01, 0x81, 0x40, 0xb3,
+    0x80, 0xaa, 0x8a, 0x00, 0x40, 0xea, 0x81, 0xb5,
+    0x8e, 0x9e, 0x80, 0x41, 0x04, 0x81, 0x44, 0xf3,
+    0x81, 0x40, 0xab, 0x03, 0x85, 0x41, 0x36, 0x81,
+    0x43, 0x14, 0x87, 0x43, 0x04, 0x80, 0xfb, 0x82,
+    0xc6, 0x81, 0x40, 0x9c, 0x12, 0x80, 0xa6, 0x19,
+    0x81, 0x41, 0x39, 0x81, 0x41, 0x61, 0x83, 0x40,
+    0xad, 0x08, 0x82, 0x40, 0xda, 0x84, 0xbd, 0x81,
+    0x43, 0xbb, 0x81, 0x88, 0x82, 0x4d, 0xe3, 0x80,
+    0x8c, 0x03, 0x80, 0x89, 0x00, 0x81, 0x41, 0xb0,
+    0x81, 0x60, 0x74, 0xfa, 0x81, 0x41, 0x0c, 0x82,
+    0x40, 0xe2, 0x84, 0x41, 0x7d, 0x81, 0xd5, 0x81,
+    0xde, 0x80, 0x40, 0x96, 0x82, 0x40, 0x92, 0x82,
+    0xfe, 0x80, 0x8f, 0x81, 0x40, 0xf8, 0x80, 0x60,
+    0x52, 0x63, 0x10, 0x83, 0x40, 0xa8, 0x80, 0x89,
+    0x00, 0x80, 0x8a, 0x0a, 0x80, 0xc0, 0x01, 0x80,
+    0x44, 0x39, 0x80, 0xaf, 0x80, 0x44, 0x85, 0x80,
+    0x40, 0xc6, 0x80, 0x41, 0x35, 0x81, 0x40, 0x97,
+    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,
+};
+
+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,
+    0x00, 0x00, 0x09, 0x82, 0x61, 0x05, 0xd5, 0x60,
+    0xa6, 0xd6, 0xa8, 0x50, 0x34, 0x8a, 0x40, 0xdd,
+    0x81, 0x56, 0x81, 0x8d, 0x5d, 0x30,
+};
+
+static const uint8_t unicode_prop_Variation_Selector_table[12] = {
+    0x58, 0x0a, 0x82, 0x60, 0xe5, 0xf1, 0x8f, 0x6d,
+    0x02, 0xef, 0x40, 0xef,
+};
+
+static const uint8_t unicode_prop_White_Space_table[22] = {
+    0x88, 0x84, 0x91, 0x80, 0xe3, 0x80, 0x99, 0x80,
+    0x55, 0xde, 0x80, 0x49, 0x7e, 0x8a, 0x9c, 0x0c,
+    0x80, 0xae, 0x80, 0x4f, 0x9f, 0x80,
+};
+
+static const uint8_t unicode_prop_Bidi_Mirrored_table[171] = {
+    0xa7, 0x81, 0x91, 0x00, 0x80, 0x9b, 0x00, 0x80,
+    0x9c, 0x00, 0x80, 0xac, 0x80, 0x8e, 0x80, 0x4e,
+    0x7d, 0x83, 0x47, 0x5c, 0x81, 0x49, 0x9b, 0x81,
+    0x89, 0x81, 0xb5, 0x81, 0x8d, 0x81, 0x40, 0xb0,
+    0x80, 0x40, 0xbf, 0x1a, 0x2a, 0x02, 0x0a, 0x18,
+    0x18, 0x00, 0x03, 0x88, 0x20, 0x80, 0x91, 0x23,
+    0x88, 0x08, 0x00, 0x39, 0x9e, 0x0b, 0x20, 0x88,
+    0x09, 0x92, 0x21, 0x88, 0x21, 0x0b, 0x97, 0x81,
+    0x8f, 0x3b, 0x93, 0x0e, 0x81, 0x44, 0x3c, 0x8d,
+    0xc9, 0x01, 0x18, 0x08, 0x14, 0x1c, 0x12, 0x8d,
+    0x41, 0x92, 0x95, 0x0d, 0x80, 0x8d, 0x38, 0x35,
+    0x10, 0x1c, 0x01, 0x0c, 0x18, 0x02, 0x09, 0x89,
+    0x29, 0x81, 0x8b, 0x92, 0x03, 0x08, 0x00, 0x08,
+    0x03, 0x21, 0x2a, 0x97, 0x81, 0x8a, 0x0b, 0x18,
+    0x09, 0x0b, 0xaa, 0x0f, 0x80, 0xa7, 0x20, 0x00,
+    0x14, 0x22, 0x18, 0x14, 0x00, 0x40, 0xff, 0x80,
+    0x42, 0x02, 0x1a, 0x08, 0x81, 0x8d, 0x09, 0x89,
+    0x41, 0xdd, 0x89, 0x0f, 0x60, 0xce, 0x3c, 0x2c,
+    0x81, 0x40, 0xa1, 0x81, 0x91, 0x00, 0x80, 0x9b,
+    0x00, 0x80, 0x9c, 0x00, 0x00, 0x08, 0x81, 0x60,
+    0xd7, 0x76, 0x80, 0xb8, 0x80, 0xb8, 0x80, 0xb8,
+    0x80, 0xb8, 0x80,
+};
+
+static const uint8_t unicode_prop_Emoji_table[236] = {
+    0xa2, 0x05, 0x04, 0x89, 0xee, 0x03, 0x80, 0x5f,
+    0x8c, 0x80, 0x8b, 0x80, 0x40, 0xd7, 0x80, 0x95,
+    0x80, 0xd9, 0x85, 0x8e, 0x81, 0x41, 0x6e, 0x81,
+    0x8b, 0x80, 0x40, 0xa5, 0x80, 0x98, 0x8a, 0x1a,
+    0x40, 0xc6, 0x80, 0x40, 0xe6, 0x81, 0x89, 0x80,
+    0x88, 0x80, 0xb9, 0x18, 0x84, 0x88, 0x01, 0x01,
+    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,
+};
+
+static const uint8_t unicode_prop_Emoji_Component_table[28] = {
+    0xa2, 0x05, 0x04, 0x89, 0x5f, 0xd2, 0x80, 0x40,
+    0xd4, 0x80, 0x60, 0xdd, 0x2a, 0x80, 0x60, 0xf3,
+    0xd5, 0x99, 0x41, 0xfa, 0x84, 0x45, 0xaf, 0x83,
+    0x6c, 0x06, 0x6b, 0xdf,
+};
+
+static const uint8_t unicode_prop_Emoji_Modifier_table[4] = {
+    0x61, 0xf3, 0xfa, 0x84,
+};
+
+static const uint8_t unicode_prop_Emoji_Modifier_Base_table[63] = {
+    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,
+};
+
+static const uint8_t unicode_prop_Emoji_Presentation_table[143] = {
+    0x60, 0x23, 0x19, 0x81, 0x40, 0xcc, 0x1a, 0x01,
+    0x80, 0x42, 0x08, 0x81, 0x94, 0x81, 0xb1, 0x8b,
+    0xaa, 0x80, 0x92, 0x80, 0x8c, 0x07, 0x81, 0x90,
+    0x0c, 0x0f, 0x04, 0x80, 0x94, 0x06, 0x08, 0x03,
+    0x01, 0x06, 0x03, 0x81, 0x9b, 0x80, 0xa2, 0x00,
+    0x03, 0x10, 0x80, 0xbc, 0x82, 0x97, 0x80, 0x8d,
+    0x80, 0x43, 0x5a, 0x81, 0xb2, 0x03, 0x80, 0x61,
+    0xc4, 0xad, 0x80, 0x40, 0xc9, 0x80, 0x40, 0xbd,
+    0x01, 0x89, 0xca, 0x99, 0x00, 0x97, 0x80, 0x93,
+    0x01, 0x20, 0x82, 0x94, 0x81, 0x40, 0xad, 0xa0,
+    0x8b, 0x88, 0x80, 0xc5, 0x80, 0x95, 0x8b, 0xaa,
+    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,
+};
+
+static const uint8_t unicode_prop_Extended_Pictographic_table[152] = {
+    0x40, 0xa8, 0x03, 0x80, 0x5f, 0x8c, 0x80, 0x8b,
+    0x80, 0x40, 0xd7, 0x80, 0x95, 0x80, 0xd9, 0x85,
+    0x8e, 0x81, 0x41, 0x6e, 0x81, 0x8b, 0x80, 0xde,
+    0x80, 0xc5, 0x80, 0x98, 0x8a, 0x1a, 0x40, 0xc6,
+    0x80, 0x40, 0xe6, 0x81, 0x89, 0x80, 0x88, 0x80,
+    0xb9, 0x18, 0x28, 0x8b, 0x80, 0xf1, 0x89, 0xf5,
+    0x81, 0x8a, 0x00, 0x00, 0x28, 0x10, 0x28, 0x89,
+    0x81, 0x8e, 0x01, 0x03, 0x00, 0x03, 0x10, 0x80,
+    0x8a, 0x84, 0xac, 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,
+    0x65, 0x40, 0xff, 0x8c, 0x82, 0x9e, 0x80, 0xbb,
+    0x85, 0x8b, 0x81, 0x8d, 0x01, 0x89, 0x91, 0xb8,
+    0x9a, 0x8e, 0x89, 0x80, 0x93, 0x01, 0x88, 0x03,
+    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,
+};
+
+static const uint8_t unicode_prop_Default_Ignorable_Code_Point_table[51] = {
+    0x40, 0xac, 0x80, 0x42, 0xa0, 0x80, 0x42, 0xcb,
+    0x80, 0x4b, 0x41, 0x81, 0x46, 0x52, 0x81, 0xd4,
+    0x83, 0x47, 0xfb, 0x84, 0x99, 0x84, 0xb0, 0x8f,
+    0x50, 0xf3, 0x80, 0x60, 0xcc, 0x9a, 0x8f, 0x40,
+    0xee, 0x80, 0x40, 0x9f, 0x80, 0xce, 0x88, 0x60,
+    0xbc, 0xa6, 0x83, 0x54, 0xce, 0x87, 0x6c, 0x2e,
+    0x84, 0x4f, 0xff,
+};
+
+typedef enum {
+    UNICODE_PROP_Hyphen,
+    UNICODE_PROP_Other_Math,
+    UNICODE_PROP_Other_Alphabetic,
+    UNICODE_PROP_Other_Lowercase,
+    UNICODE_PROP_Other_Uppercase,
+    UNICODE_PROP_Other_Grapheme_Extend,
+    UNICODE_PROP_Other_Default_Ignorable_Code_Point,
+    UNICODE_PROP_Other_ID_Start,
+    UNICODE_PROP_Other_ID_Continue,
+    UNICODE_PROP_Prepended_Concatenation_Mark,
+    UNICODE_PROP_ID_Continue1,
+    UNICODE_PROP_XID_Start1,
+    UNICODE_PROP_XID_Continue1,
+    UNICODE_PROP_Changes_When_Titlecased1,
+    UNICODE_PROP_Changes_When_Casefolded1,
+    UNICODE_PROP_Changes_When_NFKC_Casefolded1,
+    UNICODE_PROP_ASCII_Hex_Digit,
+    UNICODE_PROP_Bidi_Control,
+    UNICODE_PROP_Dash,
+    UNICODE_PROP_Deprecated,
+    UNICODE_PROP_Diacritic,
+    UNICODE_PROP_Extender,
+    UNICODE_PROP_Hex_Digit,
+    UNICODE_PROP_IDS_Binary_Operator,
+    UNICODE_PROP_IDS_Trinary_Operator,
+    UNICODE_PROP_Ideographic,
+    UNICODE_PROP_Join_Control,
+    UNICODE_PROP_Logical_Order_Exception,
+    UNICODE_PROP_Noncharacter_Code_Point,
+    UNICODE_PROP_Pattern_Syntax,
+    UNICODE_PROP_Pattern_White_Space,
+    UNICODE_PROP_Quotation_Mark,
+    UNICODE_PROP_Radical,
+    UNICODE_PROP_Regional_Indicator,
+    UNICODE_PROP_Sentence_Terminal,
+    UNICODE_PROP_Soft_Dotted,
+    UNICODE_PROP_Terminal_Punctuation,
+    UNICODE_PROP_Unified_Ideograph,
+    UNICODE_PROP_Variation_Selector,
+    UNICODE_PROP_White_Space,
+    UNICODE_PROP_Bidi_Mirrored,
+    UNICODE_PROP_Emoji,
+    UNICODE_PROP_Emoji_Component,
+    UNICODE_PROP_Emoji_Modifier,
+    UNICODE_PROP_Emoji_Modifier_Base,
+    UNICODE_PROP_Emoji_Presentation,
+    UNICODE_PROP_Extended_Pictographic,
+    UNICODE_PROP_Default_Ignorable_Code_Point,
+    UNICODE_PROP_ID_Start,
+    UNICODE_PROP_Case_Ignorable,
+    UNICODE_PROP_ASCII,
+    UNICODE_PROP_Alphabetic,
+    UNICODE_PROP_Any,
+    UNICODE_PROP_Assigned,
+    UNICODE_PROP_Cased,
+    UNICODE_PROP_Changes_When_Casefolded,
+    UNICODE_PROP_Changes_When_Casemapped,
+    UNICODE_PROP_Changes_When_Lowercased,
+    UNICODE_PROP_Changes_When_NFKC_Casefolded,
+    UNICODE_PROP_Changes_When_Titlecased,
+    UNICODE_PROP_Changes_When_Uppercased,
+    UNICODE_PROP_Grapheme_Base,
+    UNICODE_PROP_Grapheme_Extend,
+    UNICODE_PROP_ID_Continue,
+    UNICODE_PROP_Lowercase,
+    UNICODE_PROP_Math,
+    UNICODE_PROP_Uppercase,
+    UNICODE_PROP_XID_Continue,
+    UNICODE_PROP_XID_Start,
+    UNICODE_PROP_Cased1,
+    UNICODE_PROP_COUNT,
+} UnicodePropertyEnum;
+
+static const char unicode_prop_name_table[] =
+    "ASCII_Hex_Digit,AHex"               "\0"
+    "Bidi_Control,Bidi_C"                "\0"
+    "Dash"                               "\0"
+    "Deprecated,Dep"                     "\0"
+    "Diacritic,Dia"                      "\0"
+    "Extender,Ext"                       "\0"
+    "Hex_Digit,Hex"                      "\0"
+    "IDS_Binary_Operator,IDSB"           "\0"
+    "IDS_Trinary_Operator,IDST"          "\0"
+    "Ideographic,Ideo"                   "\0"
+    "Join_Control,Join_C"                "\0"
+    "Logical_Order_Exception,LOE"        "\0"
+    "Noncharacter_Code_Point,NChar"      "\0"
+    "Pattern_Syntax,Pat_Syn"             "\0"
+    "Pattern_White_Space,Pat_WS"         "\0"
+    "Quotation_Mark,QMark"               "\0"
+    "Radical"                            "\0"
+    "Regional_Indicator,RI"              "\0"
+    "Sentence_Terminal,STerm"            "\0"
+    "Soft_Dotted,SD"                     "\0"
+    "Terminal_Punctuation,Term"          "\0"
+    "Unified_Ideograph,UIdeo"            "\0"
+    "Variation_Selector,VS"              "\0"
+    "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"
+    "Default_Ignorable_Code_Point,DI"    "\0"
+    "ID_Start,IDS"                       "\0"
+    "Case_Ignorable,CI"                  "\0"
+    "ASCII"                              "\0"
+    "Alphabetic,Alpha"                   "\0"
+    "Any"                                "\0"
+    "Assigned"                           "\0"
+    "Cased"                              "\0"
+    "Changes_When_Casefolded,CWCF"       "\0"
+    "Changes_When_Casemapped,CWCM"       "\0"
+    "Changes_When_Lowercased,CWL"        "\0"
+    "Changes_When_NFKC_Casefolded,CWKCF" "\0"
+    "Changes_When_Titlecased,CWT"        "\0"
+    "Changes_When_Uppercased,CWU"        "\0"
+    "Grapheme_Base,Gr_Base"              "\0"
+    "Grapheme_Extend,Gr_Ext"             "\0"
+    "ID_Continue,IDC"                    "\0"
+    "Lowercase,Lower"                    "\0"
+    "Math"                               "\0"
+    "Uppercase,Upper"                    "\0"
+    "XID_Continue,XIDC"                  "\0"
+    "XID_Start,XIDS"                     "\0"
+;
+
+static const uint8_t * const unicode_prop_table[] = {
+    unicode_prop_Hyphen_table,
+    unicode_prop_Other_Math_table,
+    unicode_prop_Other_Alphabetic_table,
+    unicode_prop_Other_Lowercase_table,
+    unicode_prop_Other_Uppercase_table,
+    unicode_prop_Other_Grapheme_Extend_table,
+    unicode_prop_Other_Default_Ignorable_Code_Point_table,
+    unicode_prop_Other_ID_Start_table,
+    unicode_prop_Other_ID_Continue_table,
+    unicode_prop_Prepended_Concatenation_Mark_table,
+    unicode_prop_ID_Continue1_table,
+    unicode_prop_XID_Start1_table,
+    unicode_prop_XID_Continue1_table,
+    unicode_prop_Changes_When_Titlecased1_table,
+    unicode_prop_Changes_When_Casefolded1_table,
+    unicode_prop_Changes_When_NFKC_Casefolded1_table,
+    unicode_prop_ASCII_Hex_Digit_table,
+    unicode_prop_Bidi_Control_table,
+    unicode_prop_Dash_table,
+    unicode_prop_Deprecated_table,
+    unicode_prop_Diacritic_table,
+    unicode_prop_Extender_table,
+    unicode_prop_Hex_Digit_table,
+    unicode_prop_IDS_Binary_Operator_table,
+    unicode_prop_IDS_Trinary_Operator_table,
+    unicode_prop_Ideographic_table,
+    unicode_prop_Join_Control_table,
+    unicode_prop_Logical_Order_Exception_table,
+    unicode_prop_Noncharacter_Code_Point_table,
+    unicode_prop_Pattern_Syntax_table,
+    unicode_prop_Pattern_White_Space_table,
+    unicode_prop_Quotation_Mark_table,
+    unicode_prop_Radical_table,
+    unicode_prop_Regional_Indicator_table,
+    unicode_prop_Sentence_Terminal_table,
+    unicode_prop_Soft_Dotted_table,
+    unicode_prop_Terminal_Punctuation_table,
+    unicode_prop_Unified_Ideograph_table,
+    unicode_prop_Variation_Selector_table,
+    unicode_prop_White_Space_table,
+    unicode_prop_Bidi_Mirrored_table,
+    unicode_prop_Emoji_table,
+    unicode_prop_Emoji_Component_table,
+    unicode_prop_Emoji_Modifier_table,
+    unicode_prop_Emoji_Modifier_Base_table,
+    unicode_prop_Emoji_Presentation_table,
+    unicode_prop_Extended_Pictographic_table,
+    unicode_prop_Default_Ignorable_Code_Point_table,
+    unicode_prop_ID_Start_table,
+    unicode_prop_Case_Ignorable_table,
+};
+
+static const uint16_t unicode_prop_len_table[] = {
+    countof(unicode_prop_Hyphen_table),
+    countof(unicode_prop_Other_Math_table),
+    countof(unicode_prop_Other_Alphabetic_table),
+    countof(unicode_prop_Other_Lowercase_table),
+    countof(unicode_prop_Other_Uppercase_table),
+    countof(unicode_prop_Other_Grapheme_Extend_table),
+    countof(unicode_prop_Other_Default_Ignorable_Code_Point_table),
+    countof(unicode_prop_Other_ID_Start_table),
+    countof(unicode_prop_Other_ID_Continue_table),
+    countof(unicode_prop_Prepended_Concatenation_Mark_table),
+    countof(unicode_prop_ID_Continue1_table),
+    countof(unicode_prop_XID_Start1_table),
+    countof(unicode_prop_XID_Continue1_table),
+    countof(unicode_prop_Changes_When_Titlecased1_table),
+    countof(unicode_prop_Changes_When_Casefolded1_table),
+    countof(unicode_prop_Changes_When_NFKC_Casefolded1_table),
+    countof(unicode_prop_ASCII_Hex_Digit_table),
+    countof(unicode_prop_Bidi_Control_table),
+    countof(unicode_prop_Dash_table),
+    countof(unicode_prop_Deprecated_table),
+    countof(unicode_prop_Diacritic_table),
+    countof(unicode_prop_Extender_table),
+    countof(unicode_prop_Hex_Digit_table),
+    countof(unicode_prop_IDS_Binary_Operator_table),
+    countof(unicode_prop_IDS_Trinary_Operator_table),
+    countof(unicode_prop_Ideographic_table),
+    countof(unicode_prop_Join_Control_table),
+    countof(unicode_prop_Logical_Order_Exception_table),
+    countof(unicode_prop_Noncharacter_Code_Point_table),
+    countof(unicode_prop_Pattern_Syntax_table),
+    countof(unicode_prop_Pattern_White_Space_table),
+    countof(unicode_prop_Quotation_Mark_table),
+    countof(unicode_prop_Radical_table),
+    countof(unicode_prop_Regional_Indicator_table),
+    countof(unicode_prop_Sentence_Terminal_table),
+    countof(unicode_prop_Soft_Dotted_table),
+    countof(unicode_prop_Terminal_Punctuation_table),
+    countof(unicode_prop_Unified_Ideograph_table),
+    countof(unicode_prop_Variation_Selector_table),
+    countof(unicode_prop_White_Space_table),
+    countof(unicode_prop_Bidi_Mirrored_table),
+    countof(unicode_prop_Emoji_table),
+    countof(unicode_prop_Emoji_Component_table),
+    countof(unicode_prop_Emoji_Modifier_table),
+    countof(unicode_prop_Emoji_Modifier_Base_table),
+    countof(unicode_prop_Emoji_Presentation_table),
+    countof(unicode_prop_Extended_Pictographic_table),
+    countof(unicode_prop_Default_Ignorable_Code_Point_table),
+    countof(unicode_prop_ID_Start_table),
+    countof(unicode_prop_Case_Ignorable_table),
+};
+
+#endif /* CONFIG_ALL_UNICODE */

gpac-1.0.0.tar.gz/src/quickjs/libunicode.c Added

@@ -0,0 +1,1572 @@
+/*
+ * Unicode utilities
+ * 
+ * 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.
+ */
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <assert.h>
+
+#include "cutils.h"
+#include "libunicode.h"
+#include "libunicode-table.h"
+
+enum {
+    RUN_TYPE_U,
+    RUN_TYPE_L,
+    RUN_TYPE_UF,
+    RUN_TYPE_LF,
+    RUN_TYPE_UL,
+    RUN_TYPE_LSU,
+    RUN_TYPE_U2L_399_EXT2,
+    RUN_TYPE_UF_D20,
+    RUN_TYPE_UF_D1_EXT,
+    RUN_TYPE_U_EXT,
+    RUN_TYPE_LF_EXT,
+    RUN_TYPE_U_EXT2,
+    RUN_TYPE_L_EXT2,
+    RUN_TYPE_U_EXT3,
+};
+
+/* conv_type:
+   0 = to upper 
+   1 = to lower
+   2 = case folding (= to lower with modifications) 
+*/
+int lre_case_conv(uint32_t *res, uint32_t c, int conv_type)
+{
+    if (c < 128) {
+        if (conv_type) {
+            if (c >= 'A' && c <= 'Z') {
+                c = c - 'A' + 'a';
+            }
+        } else {
+            if (c >= 'a' && c <= 'z') {
+                c = c - 'a' + 'A';
+            }
+        }
+    } else {
+        uint32_t v, code, data, type, len, a, is_lower;
+        int idx, idx_min, idx_max;
+        
+        is_lower = (conv_type != 0);
+        idx_min = 0;
+        idx_max = countof(case_conv_table1) - 1;
+        while (idx_min <= idx_max) {
+            idx = (unsigned)(idx_max + idx_min) / 2;
+            v = case_conv_table1[idx];
+            code = v >> (32 - 17);
+            len = (v >> (32 - 17 - 7)) & 0x7f;
+            if (c < code) {
+                idx_max = idx - 1;
+            } else if (c >= code + len) {
+                idx_min = idx + 1;
+            } else {
+                type = (v >> (32 - 17 - 7 - 4)) & 0xf;
+                data = ((v & 0xf) << 8) | case_conv_table2[idx];
+                switch(type) {
+                case RUN_TYPE_U:
+                case RUN_TYPE_L:
+                case RUN_TYPE_UF:
+                case RUN_TYPE_LF:
+                    if (conv_type == (type & 1) ||
+                        (type >= RUN_TYPE_UF && conv_type == 2)) {
+                        c = c - code + (case_conv_table1[data] >> (32 - 17));
+                    }
+                    break;
+                case RUN_TYPE_UL:
+                    a = c - code;
+                    if ((a & 1) != (1 - is_lower))
+                        break;
+                    c = (a ^ 1) + code;
+                    break;
+                case RUN_TYPE_LSU:
+                    a = c - code;
+                    if (a == 1) {
+                        c += 2 * is_lower - 1;
+                    } else if (a == (1 - is_lower) * 2) {
+                        c += (2 * is_lower - 1) * 2;
+                    }
+                    break;
+                case RUN_TYPE_U2L_399_EXT2:
+                    if (!is_lower) {
+                        res[0] = c - code + case_conv_ext[data >> 6];
+                        res[1] = 0x399;
+                        return 2;
+                    } else {
+                        c = c - code + case_conv_ext[data & 0x3f];
+                    }
+                    break;
+                case RUN_TYPE_UF_D20:
+                    if (conv_type == 1)
+                        break;
+                    c = data + (conv_type == 2) * 0x20;
+                    break;
+                case RUN_TYPE_UF_D1_EXT:
+                    if (conv_type == 1)
+                        break;
+                    c = case_conv_ext[data] + (conv_type == 2);
+                    break;
+                case RUN_TYPE_U_EXT:
+                case RUN_TYPE_LF_EXT:
+                    if (is_lower != (type - RUN_TYPE_U_EXT))
+                        break;
+                    c = case_conv_ext[data];
+                    break;
+                case RUN_TYPE_U_EXT2:
+                case RUN_TYPE_L_EXT2:
+                    if (conv_type != (type - RUN_TYPE_U_EXT2))
+                        break;
+                    res[0] = c - code + case_conv_ext[data >> 6];
+                    res[1] = case_conv_ext[data & 0x3f];
+                    return 2;
+                default:
+                case RUN_TYPE_U_EXT3:
+                    if (conv_type != 0)
+                        break;
+                    res[0] = case_conv_ext[data >> 8];
+                    res[1] = case_conv_ext[(data >> 4) & 0xf];
+                    res[2] = case_conv_ext[data & 0xf];
+                    return 3;
+                }
+                break;
+            }
+        }
+    }
+    res[0] = c;
+    return 1;
+}
+
+static uint32_t get_le24(const uint8_t *ptr)
+{
+#if defined(__x86__) || defined(__x86_64__)
+    return *(uint16_t *)ptr | (ptr[2] << 16);
+#else
+    return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16);
+#endif
+}
+
+#define UNICODE_INDEX_BLOCK_LEN 32
+
+/* return -1 if not in table, otherwise the offset in the block */
+static int get_index_pos(uint32_t *pcode, uint32_t c,
+                         const uint8_t *index_table, int index_table_len)
+{
+    uint32_t code, v;
+    int idx_min, idx_max, idx;
+
+    idx_min = 0;
+    v = get_le24(index_table);
+    code = v & ((1 << 21) - 1);
+    if (c < code) {
+        *pcode = 0;
+        return 0;
+    }
+    idx_max = index_table_len - 1;
+    code = get_le24(index_table + idx_max * 3);
+    if (c >= code)
+        return -1;
+    /* invariant: tab[idx_min] <= c < tab2[idx_max] */
+    while ((idx_max - idx_min) > 1) {
+        idx = (idx_max + idx_min) / 2;
+        v = get_le24(index_table + idx * 3);
+        code = v & ((1 << 21) - 1);
+        if (c < code) {
+            idx_max = idx;
+        } else {
+            idx_min = idx;
+        }
+    }
+    v = get_le24(index_table + idx_min * 3);
+    *pcode = v & ((1 << 21) - 1);
+    return (idx_min + 1) * UNICODE_INDEX_BLOCK_LEN + (v >> 21);
+}
+
+static BOOL lre_is_in_table(uint32_t c, const uint8_t *table,
+                            const uint8_t *index_table, int index_table_len)
+{
+    uint32_t code, b, bit;
+    int pos;
+    const uint8_t *p;
+    
+    pos = get_index_pos(&code, c, index_table, index_table_len);
+    if (pos < 0)
+        return FALSE; /* outside the table */
+    p = table + pos;
+    bit = 0;
+    for(;;) {
+        b = *p++;
+        if (b < 64) {
+            code += (b >> 3) + 1;
+            if (c < code)
+                return bit;
+            bit ^= 1;
+            code += (b & 7) + 1;
+        } else if (b >= 0x80) {
+            code += b - 0x80 + 1;
+        } else if (b < 0x60) {
+            code += (((b - 0x40) << 8) | p[0]) + 1;
+            p++;
+        } else {
+            code += (((b - 0x60) << 16) | (p[0] << 8) | p[1]) + 1;
+            p += 2;
+        }
+        if (c < code)
+            return bit;
+        bit ^= 1;
+    }
+}
+
+BOOL lre_is_cased(uint32_t c)
+{
+    uint32_t v, code, len;
+    int idx, idx_min, idx_max;
+        
+    idx_min = 0;
+    idx_max = countof(case_conv_table1) - 1;
+    while (idx_min <= idx_max) {
+        idx = (unsigned)(idx_max + idx_min) / 2;
+        v = case_conv_table1[idx];
+        code = v >> (32 - 17);
+        len = (v >> (32 - 17 - 7)) & 0x7f;
+        if (c < code) {
+            idx_max = idx - 1;
+        } else if (c >= code + len) {
+            idx_min = idx + 1;
+        } else {
+            return TRUE;
+        }
+    }
+    return lre_is_in_table(c, unicode_prop_Cased1_table,
+                           unicode_prop_Cased1_index,
+                           sizeof(unicode_prop_Cased1_index) / 3);
+}
+
+BOOL lre_is_case_ignorable(uint32_t c)
+{
+    return lre_is_in_table(c, unicode_prop_Case_Ignorable_table,
+                           unicode_prop_Case_Ignorable_index,
+                           sizeof(unicode_prop_Case_Ignorable_index) / 3);
+}
+
+/* character range */
+
+static __maybe_unused void cr_dump(CharRange *cr)
+{
+    int i;
+    for(i = 0; i < cr->len; i++)
+        printf("%d: 0x%04x\n", i, cr->points[i]);
+}
+
+static void *cr_default_realloc(void *opaque, void *ptr, size_t size)
+{
+    return realloc(ptr, size);
+}
+
+void cr_init(CharRange *cr, void *mem_opaque, DynBufReallocFunc *realloc_func)
+{
+    cr->len = cr->size = 0;
+    cr->points = NULL;
+    cr->mem_opaque = mem_opaque;
+    cr->realloc_func = realloc_func ? realloc_func : cr_default_realloc;
+}
+
+void cr_free(CharRange *cr)
+{
+    cr->realloc_func(cr->mem_opaque, cr->points, 0);
+}
+
+int cr_realloc(CharRange *cr, int size)
+{
+    int new_size;
+    uint32_t *new_buf;
+    
+    if (size > cr->size) {
+        new_size = max_int(size, cr->size * 3 / 2);
+        new_buf = cr->realloc_func(cr->mem_opaque, cr->points,
+                                   new_size * sizeof(cr->points[0]));
+        if (!new_buf)
+            return -1;
+        cr->points = new_buf;
+        cr->size = new_size;
+    }
+    return 0;
+}
+
+int cr_copy(CharRange *cr, const CharRange *cr1)
+{
+    if (cr_realloc(cr, cr1->len))
+        return -1;
+    memcpy(cr->points, cr1->points, sizeof(cr->points[0]) * cr1->len);
+    cr->len = cr1->len;
+    return 0;
+}
+
+/* merge consecutive intervals and remove empty intervals */
+static void cr_compress(CharRange *cr)
+{
+    int i, j, k, len;
+    uint32_t *pt;
+    
+    pt = cr->points;
+    len = cr->len;
+    i = 0;
+    j = 0;
+    k = 0;
+    while ((i + 1) < len) {
+        if (pt[i] == pt[i + 1]) {
+            /* empty interval */
+            i += 2;
+        } else {
+            j = i;
+            while ((j + 3) < len && pt[j + 1] == pt[j + 2])
+                j += 2;
+            /* just copy */
+            pt[k] = pt[i];
+            pt[k + 1] = pt[j + 1];
+            k += 2;
+            i = j + 2;
+        }
+    }
+    cr->len = k;
+}
+
+/* union or intersection */
+int cr_op(CharRange *cr, const uint32_t *a_pt, int a_len,
+          const uint32_t *b_pt, int b_len, int op)
+{
+    int a_idx, b_idx, is_in;
+    uint32_t v;
+    
+    a_idx = 0;
+    b_idx = 0;
+    for(;;) {
+        /* get one more point from a or b in increasing order */
+        if (a_idx < a_len && b_idx < b_len) {
+            if (a_pt[a_idx] < b_pt[b_idx]) {
+                goto a_add;
+            } else if (a_pt[a_idx] == b_pt[b_idx]) {
+                v = a_pt[a_idx];
+                a_idx++;
+                b_idx++;
+            } else {
+                goto b_add;
+            }
+        } else if (a_idx < a_len) {
+        a_add:
+            v = a_pt[a_idx++];
+        } else if (b_idx < b_len) {
+        b_add:
+            v = b_pt[b_idx++];
+        } else {
+            break;
+        }
+        /* add the point if the in/out status changes */
+        switch(op) {
+        case CR_OP_UNION:
+            is_in = (a_idx & 1) | (b_idx & 1);
+            break;
+        case CR_OP_INTER:
+            is_in = (a_idx & 1) & (b_idx & 1);
+            break;
+        case CR_OP_XOR:
+            is_in = (a_idx & 1) ^ (b_idx & 1);
+            break;
+        default:
+            abort();
+        }
+        if (is_in != (cr->len & 1)) {
+            if (cr_add_point(cr, v))
+                return -1;
+        }
+    }
+    cr_compress(cr);
+    return 0;
+}
+
+int cr_union1(CharRange *cr, const uint32_t *b_pt, int b_len)
+{
+    CharRange a = *cr;
+    int ret;
+    cr->len = 0;
+    cr->size = 0;
+    cr->points = NULL;
+    ret = cr_op(cr, a.points, a.len, b_pt, b_len, CR_OP_UNION);
+    cr_free(&a);
+    return ret;
+}
+
+int cr_invert(CharRange *cr)
+{
+    int len;
+    len = cr->len;
+    if (cr_realloc(cr, len + 2))
+        return -1;
+    memmove(cr->points + 1, cr->points, len * sizeof(cr->points[0]));
+    cr->points[0] = 0;
+    cr->points[len + 1] = UINT32_MAX;
+    cr->len = len + 2;
+    cr_compress(cr);
+    return 0;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+
+BOOL lre_is_id_start(uint32_t c)
+{
+    return lre_is_in_table(c, unicode_prop_ID_Start_table,
+                           unicode_prop_ID_Start_index,
+                           sizeof(unicode_prop_ID_Start_index) / 3);
+}
+
+BOOL lre_is_id_continue(uint32_t c)
+{
+    return lre_is_id_start(c) ||
+        lre_is_in_table(c, unicode_prop_ID_Continue1_table,
+                        unicode_prop_ID_Continue1_index,
+                        sizeof(unicode_prop_ID_Continue1_index) / 3);
+}
+
+#define UNICODE_DECOMP_LEN_MAX 18
+
+typedef enum {
+    DECOMP_TYPE_C1, /* 16 bit char */
+    DECOMP_TYPE_L1, /* 16 bit char table */
+    DECOMP_TYPE_L2,
+    DECOMP_TYPE_L3,
+    DECOMP_TYPE_L4,
+    DECOMP_TYPE_L5, /* XXX: not used */
+    DECOMP_TYPE_L6, /* XXX: could remove */
+    DECOMP_TYPE_L7, /* XXX: could remove */
+    DECOMP_TYPE_LL1, /* 18 bit char table */
+    DECOMP_TYPE_LL2,
+    DECOMP_TYPE_S1, /* 8 bit char table */
+    DECOMP_TYPE_S2,
+    DECOMP_TYPE_S3,
+    DECOMP_TYPE_S4,
+    DECOMP_TYPE_S5,
+    DECOMP_TYPE_I1, /* increment 16 bit char value */
+    DECOMP_TYPE_I2_0,
+    DECOMP_TYPE_I2_1,
+    DECOMP_TYPE_I3_1,
+    DECOMP_TYPE_I3_2,
+    DECOMP_TYPE_I4_1,
+    DECOMP_TYPE_I4_2,
+    DECOMP_TYPE_B1, /* 16 bit base + 8 bit offset */
+    DECOMP_TYPE_B2,
+    DECOMP_TYPE_B3,
+    DECOMP_TYPE_B4,
+    DECOMP_TYPE_B5,
+    DECOMP_TYPE_B6,
+    DECOMP_TYPE_B7,
+    DECOMP_TYPE_B8,
+    DECOMP_TYPE_B18,
+    DECOMP_TYPE_LS2,
+    DECOMP_TYPE_PAT3,
+    DECOMP_TYPE_S2_UL,
+    DECOMP_TYPE_LS2_UL,
+} DecompTypeEnum;
+
+static uint32_t unicode_get_short_code(uint32_t c)
+{
+    static const uint16_t unicode_short_table[2] = { 0x2044, 0x2215 };
+
+    if (c < 0x80)
+        return c;
+    else if (c < 0x80 + 0x50)
+        return c - 0x80 + 0x300;
+    else
+        return unicode_short_table[c - 0x80 - 0x50];
+}
+
+static uint32_t unicode_get_lower_simple(uint32_t c)
+{
+    if (c < 0x100 || (c >= 0x410 && c <= 0x42f))
+        c += 0x20;
+    else
+        c++;
+    return c;
+}
+
+static uint16_t unicode_get16(const uint8_t *p)
+{
+    return p[0] | (p[1] << 8);
+}
+
+static int unicode_decomp_entry(uint32_t *res, uint32_t c,
+                                int idx, uint32_t code, uint32_t len,
+                                uint32_t type)
+{
+    uint32_t c1;
+    int l, i, p;
+    const uint8_t *d;
+
+    if (type == DECOMP_TYPE_C1) {
+        res[0] = unicode_decomp_table2[idx];
+        return 1;
+    } 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:
+        case DECOMP_TYPE_L4:
+        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++) {
+                if ((res[i] = unicode_get16(d + 2 * i)) == 0)
+                    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;
+                k = (c - code) * l;
+                p = len * l * 2;
+                for(i = 0; i < l; i++) {
+                    c1 = unicode_get16(d + 2 * k) |
+                        (((d[p + (k / 4)] >> ((k % 4) * 2)) & 3) << 16);
+                    if (!c1)
+                        return 0;
+                    res[i] = c1;
+                    k++;
+                }
+            }
+            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++) {
+                if ((res[i] = unicode_get_short_code(d[i])) == 0)
+                    return 0;
+            }
+            return l;
+        case DECOMP_TYPE_I1:
+            l = 1;
+            p = 0;
+            goto decomp_type_i;
+        case DECOMP_TYPE_I2_0:
+        case DECOMP_TYPE_I2_1:
+        case DECOMP_TYPE_I3_1:
+        case DECOMP_TYPE_I3_2:
+        case DECOMP_TYPE_I4_1:
+        case DECOMP_TYPE_I4_2:
+            l = 2 + ((type - DECOMP_TYPE_I2_0) >> 1);
+            p = ((type - DECOMP_TYPE_I2_0) & 1) + (l > 2);
+        decomp_type_i:
+            for(i = 0; i < l; i++) {
+                c1 = unicode_get16(d + 2 * i);
+                if (i == p)
+                    c1 += c - code;
+                res[i] = c1;
+            }
+            return l;
+        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:
+        case DECOMP_TYPE_B4:
+        case DECOMP_TYPE_B5:
+        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:
+            {
+                uint32_t c_min;
+                c_min = unicode_get16(d);
+                d += 2 + (c - code) * l;
+                for(i = 0; i < l; i++) {
+                    c1 = d[i];
+                    if (c1 == 0xff)
+                        c1 = 0x20;
+                    else
+                        c1 += c_min;
+                    res[i] = c1;
+                }
+            }
+            return l;
+        case DECOMP_TYPE_LS2:
+            d += (c - code) * 3;
+            if (!(res[0] = unicode_get16(d)))
+                return 0;
+            res[1] = unicode_get_short_code(d[2]);
+            return 2;
+        case DECOMP_TYPE_PAT3:
+            res[0] = unicode_get16(d);
+            res[2] = unicode_get16(d + 2);
+            d += 4 + (c - code) * 2;
+            res[1] = unicode_get16(d);
+            return 3;
+        case DECOMP_TYPE_S2_UL:
+        case DECOMP_TYPE_LS2_UL:
+            c1 = c - code;
+            if (type == DECOMP_TYPE_S2_UL) {
+                d += c1 & ~1;
+                c = unicode_get_short_code(*d);
+                d++;
+            } else {
+                d += (c1 >> 1) * 3;
+                c = unicode_get16(d);
+                d += 2;
+            }
+            if (c1 & 1)
+                c = unicode_get_lower_simple(c);
+            res[0] = c;
+            res[1] = unicode_get_short_code(*d);
+            return 2;
+        }
+    }
+    return 0;
+}
+
+
+/* return the length of the decomposition (length <=
+   UNICODE_DECOMP_LEN_MAX) or 0 if no decomposition */
+static int unicode_decomp_char(uint32_t *res, uint32_t c, BOOL is_compat1)
+{
+    uint32_t v, type, is_compat, code, len;
+    int idx_min, idx_max, idx;
+    
+    idx_min = 0;
+    idx_max = countof(unicode_decomp_table1) - 1;
+    while (idx_min <= idx_max) {
+        idx = (idx_max + idx_min) / 2;
+        v = unicode_decomp_table1[idx];
+        code = v >> (32 - 18);
+        len = (v >> (32 - 18 - 7)) & 0x7f;
+        //        printf("idx=%d code=%05x len=%d\n", idx, code, len);
+        if (c < code) {
+            idx_max = idx - 1;
+        } else if (c >= code + len) {
+            idx_min = idx + 1;
+        } else {
+            is_compat = v & 1;
+            if ((uint32_t) is_compat1 < is_compat)
+                break;
+            type = (v >> (32 - 18 - 7 - 6)) & 0x3f;
+            return unicode_decomp_entry(res, c, idx, code, len, type);
+        }
+    }
+    return 0;
+}
+
+/* return 0 if no pair found */
+static int unicode_compose_pair(uint32_t c0, uint32_t c1)
+{
+    uint32_t code, len, type, v, idx1, d_idx, d_offset, ch;
+    int idx_min, idx_max, idx, d;
+    uint32_t pair[2];
+    
+    idx_min = 0;
+    idx_max = countof(unicode_comp_table) - 1;
+    while (idx_min <= idx_max) {
+        idx = (idx_max + idx_min) / 2;
+        idx1 = unicode_comp_table[idx];
+
+        /* idx1 represent an entry of the decomposition table */
+        d_idx = idx1 >> 6;
+        d_offset = idx1 & 0x3f;
+        v = unicode_decomp_table1[d_idx];
+        code = v >> (32 - 18);
+        len = (v >> (32 - 18 - 7)) & 0x7f;
+        type = (v >> (32 - 18 - 7 - 6)) & 0x3f;
+        ch = code + d_offset;
+        unicode_decomp_entry(pair, ch, d_idx, code, len, type);
+        d = c0 - pair[0];
+        if (d == 0)
+            d = c1 - pair[1];
+        if (d < 0) {
+            idx_max = idx - 1;
+        } else if (d > 0) {
+            idx_min = idx + 1;
+        } else {
+            return ch;
+        }
+    }
+    return 0;
+}
+
+/* return the combining class of character c (between 0 and 255) */
+static int unicode_get_cc(uint32_t c)
+{
+    uint32_t code, n, type, cc, c1, b;
+    int pos;
+    const uint8_t *p;
+    
+    pos = get_index_pos(&code, c,
+                        unicode_cc_index, sizeof(unicode_cc_index) / 3);
+    if (pos < 0)
+        return 0;
+    p = unicode_cc_table + pos;
+    for(;;) {
+        b = *p++;
+        type = b >> 6;
+        n = b & 0x3f;
+        if (n < 48) {
+        } else if (n < 56) {
+            n = (n - 48) << 8;
+            n |= *p++;
+            n += 48;
+        } else {
+            n = (n - 56) << 8;
+            n |= *p++ << 8;
+            n |= *p++;
+            n += 48 + (1 << 11);
+        }
+        if (type <= 1)
+            p++;
+        c1 = code + n + 1;
+        if (c < c1) {
+            switch(type) {
+            case 0:
+                cc = p[-1];
+                break;
+            case 1:
+                cc = p[-1] + c - code;
+                break;
+            case 2:
+                cc = 0;
+                break;
+            default:
+            case 3:
+                cc = 230;
+                break;
+            }
+            return cc;
+        }
+        code = c1;
+    }
+}
+
+static void sort_cc(int *buf, int len)
+{
+    int i, j, k, cc, cc1, start, ch1;
+    
+    for(i = 0; i < len; i++) {
+        cc = unicode_get_cc(buf[i]);
+        if (cc != 0) {
+            start = i;
+            j = i + 1;
+            while (j < len) {
+                ch1 = buf[j];
+                cc1 = unicode_get_cc(ch1);
+                if (cc1 == 0)
+                    break;
+                k = j - 1;
+                while (k >= start) {
+                    if (unicode_get_cc(buf[k]) <= cc1)
+                        break;
+                    buf[k + 1] = buf[k];
+                    k--;
+                }
+                buf[k + 1] = ch1;
+                j++;
+            }
+#if 0
+            printf("cc:");
+            for(k = start; k < j; k++) {
+                printf(" %3d", unicode_get_cc(buf[k]));
+            }
+            printf("\n");
+#endif
+            i = j;
+        }
+    }
+}
+
+static void to_nfd_rec(DynBuf *dbuf,
+                       const int *src, int src_len, int is_compat)
+{
+    uint32_t c, v;
+    int i, l;
+    uint32_t res[UNICODE_DECOMP_LEN_MAX];
+    
+    for(i = 0; i < src_len; i++) {
+        c = src[i];
+        if (c >= 0xac00 && c < 0xd7a4) {
+            /* Hangul decomposition */
+            c -= 0xac00;
+            dbuf_put_u32(dbuf, 0x1100 + c / 588);
+            dbuf_put_u32(dbuf, 0x1161 + (c % 588) / 28);
+            v = c % 28;
+            if (v != 0)
+                dbuf_put_u32(dbuf, 0x11a7 + v);
+        } else {
+            l = unicode_decomp_char(res, c, is_compat);
+            if (l) {
+                to_nfd_rec(dbuf, (int *)res, l, is_compat);
+            } else {
+                dbuf_put_u32(dbuf, c);
+            }
+        }
+    }
+}
+
+/* return 0 if not found */
+static int compose_pair(uint32_t c0, uint32_t c1)
+{
+    /* Hangul composition */
+    if (c0 >= 0x1100 && c0 < 0x1100 + 19 &&
+        c1 >= 0x1161 && c1 < 0x1161 + 21) {
+        return 0xac00 + (c0 - 0x1100) * 588 + (c1 - 0x1161) * 28;
+    } else if (c0 >= 0xac00 && c0 < 0xac00 + 11172 &&
+               (c0 - 0xac00) % 28 == 0 &&
+               c1 >= 0x11a7 && c1 < 0x11a7 + 28) {
+        return c0 + c1 - 0x11a7;
+    } else {
+        return unicode_compose_pair(c0, c1);
+    }
+}
+
+int unicode_normalize(uint32_t **pdst, const uint32_t *src, int src_len,
+                      UnicodeNormalizationEnum n_type,
+                      void *opaque, DynBufReallocFunc *realloc_func)
+{
+    int *buf, buf_len, i, p, starter_pos, cc, last_cc, out_len;
+    BOOL is_compat;
+    DynBuf dbuf_s, *dbuf = &dbuf_s;
+    
+    is_compat = n_type >> 1;
+
+    dbuf_init2(dbuf, opaque, realloc_func);
+    if (dbuf_realloc(dbuf, sizeof(int) * src_len))
+        goto fail;
+
+    /* common case: latin1 is unaffected by NFC */
+    if (n_type == UNICODE_NFC) {
+        for(i = 0; i < src_len; i++) {
+            if (src[i] >= 0x100)
+                goto not_latin1;
+        }
+        buf = (int *)dbuf->buf;
+        memcpy(buf, src, src_len * sizeof(int));
+        *pdst = (uint32_t *)buf;
+        return src_len;
+    not_latin1: ;
+    }
+
+    to_nfd_rec(dbuf, (const int *)src, src_len, is_compat);
+    if (dbuf_error(dbuf)) {
+    fail:
+        *pdst = NULL;
+        return -1;
+    }
+    buf = (int *)dbuf->buf;
+    buf_len = (int) ( dbuf->size / sizeof(int) );
+        
+    sort_cc(buf, buf_len);
+    
+    if (buf_len <= 1 || (n_type & 1) != 0) {
+        /* NFD / NFKD */
+        *pdst = (uint32_t *)buf;
+        return buf_len;
+    }
+    
+    i = 1;
+    out_len = 1;
+    while (i < buf_len) {
+        /* find the starter character and test if it is blocked from
+           the character at 'i' */
+        last_cc = unicode_get_cc(buf[i]);
+        starter_pos = out_len - 1;
+        while (starter_pos >= 0) {
+            cc = unicode_get_cc(buf[starter_pos]);
+            if (cc == 0)
+                break;
+            if (cc >= last_cc)
+                goto next;
+            last_cc = 256;
+            starter_pos--;
+        }
+        if (starter_pos >= 0 &&
+            (p = compose_pair(buf[starter_pos], buf[i])) != 0) {
+            buf[starter_pos] = p;
+            i++;
+        } else {
+        next:
+            buf[out_len++] = buf[i++];
+        }
+    }
+    *pdst = (uint32_t *)buf;
+    return out_len;
+}
+
+/* char ranges for various unicode properties */
+
+static int unicode_find_name(const char *name_table, const char *name)
+{
+    const char *p, *r;
+    int pos;
+    size_t name_len, len;
+    
+    p = name_table;
+    pos = 0;
+    name_len = strlen(name);
+    while (*p) {
+        for(;;) {
+            r = strchr(p, ',');
+            if (!r)
+                len = strlen(p);
+            else
+                len = r - p;
+            if (len == name_len && !memcmp(p, name, name_len))
+                return pos;
+            p += len + 1;
+            if (!r)
+                break;
+        }
+        pos++;
+    }
+    return -1;
+}
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_script(CharRange *cr,
+                   const char *script_name, BOOL is_ext)
+{
+    int script_idx;
+    const uint8_t *p, *p_end;
+    uint32_t c, c1, b, n, v, v_len, i, type;
+    CharRange cr1_s, *cr1;
+    CharRange cr2_s={0}, *cr2 = &cr2_s;
+    BOOL is_common;
+    
+    script_idx = unicode_find_name(unicode_script_name_table, script_name);
+    if (script_idx < 0)
+        return -2;
+    /* Note: we remove the "Unknown" Script */
+    script_idx += UNICODE_SCRIPT_Unknown + 1;
+        
+    is_common = (script_idx == UNICODE_SCRIPT_Common ||
+                 script_idx == UNICODE_SCRIPT_Inherited);
+    if (is_ext) {
+        cr1 = &cr1_s;
+        cr_init(cr1, cr->mem_opaque, cr->realloc_func);
+        cr_init(cr2, cr->mem_opaque, cr->realloc_func);
+    } else {
+        cr1 = cr;
+    }
+
+    p = unicode_script_table;
+    p_end = unicode_script_table + countof(unicode_script_table);
+    c = 0;
+    while (p < p_end) {
+        b = *p++;
+        type = b >> 7;
+        n = b & 0x7f;
+        if (n < 96) {
+        } else if (n < 112) {
+            n = (n - 96) << 8;
+            n |= *p++;
+            n += 96;
+        } else {
+            n = (n - 112) << 16;
+            n |= *p++ << 8;
+            n |= *p++;
+            n += 96 + (1 << 12);
+        }
+        if (type == 0)
+            v = 0;
+        else
+            v = *p++;
+        c1 = c + n + 1;
+        if (v == script_idx) {
+            if (cr_add_interval(cr1, c, c1))
+                goto fail;
+        }
+        c = c1;
+    }
+
+    if (is_ext) {
+        /* add the script extensions */
+        p = unicode_script_ext_table;
+        p_end = unicode_script_ext_table + countof(unicode_script_ext_table);
+        c = 0;
+        while (p < p_end) {
+            b = *p++;
+            if (b < 128) {
+                n = b;
+            } else if (b < 128 + 64) {
+                n = (b - 128) << 8;
+                n |= *p++;
+                n += 128;
+            } else {
+                n = (b - 128 - 64) << 16;
+                n |= *p++ << 8;
+                n |= *p++;
+                n += 128 + (1 << 14);
+            }
+            c1 = c + n + 1;
+            v_len = *p++;
+            if (is_common) {
+                if (v_len != 0) {
+                    if (cr_add_interval(cr2, c, c1))
+                        goto fail;
+                }
+            } else {
+                for(i = 0; i < v_len; i++) {
+                    if (p[i] == script_idx) {
+                        if (cr_add_interval(cr2, c, c1))
+                            goto fail;
+                        break;
+                    }
+                }
+            }
+            p += v_len;
+            c = c1;
+        }
+        if (is_common) {
+            /* remove all the characters with script extensions */
+            if (cr_invert(cr2))
+                goto fail;
+            if (cr_op(cr, cr1->points, cr1->len, cr2->points, cr2->len,
+                      CR_OP_INTER))
+                goto fail;
+        } else {
+            if (cr_op(cr, cr1->points, cr1->len, cr2->points, cr2->len,
+                      CR_OP_UNION))
+                goto fail;
+        }
+        cr_free(cr1);
+        cr_free(cr2);
+    }
+    return 0;
+ fail:
+    if (is_ext) {
+        cr_free(cr1);
+        cr_free(cr2);
+    }
+    goto fail;
+}
+
+#define M(id) (1U << UNICODE_GC_ ## id)
+
+static int unicode_general_category1(CharRange *cr, uint32_t gc_mask)
+{
+    const uint8_t *p, *p_end;
+    uint32_t c, c0, b, n, v;
+
+    p = unicode_gc_table;
+    p_end = unicode_gc_table + countof(unicode_gc_table);
+    c = 0;
+    while (p < p_end) {
+        b = *p++;
+        n = b >> 5;
+        v = b & 0x1f;
+        if (n == 7) {
+            n = *p++;
+            if (n < 128) {
+                n += 7;
+            } else if (n < 128 + 64) {
+                n = (n - 128) << 8;
+                n |= *p++;
+                n += 7 + 128;
+            } else {
+                n = (n - 128 - 64) << 16;
+                n |= *p++ << 8;
+                n |= *p++;
+                n += 7 + 128 + (1 << 14);
+            }
+        }
+        c0 = c;
+        c += n + 1;
+        if (v == 31) {
+            /* run of Lu / Ll */
+            b = gc_mask & (M(Lu) | M(Ll));
+            if (b != 0) {
+                if (b == (M(Lu) | M(Ll))) {
+                    goto add_range;
+                } else {
+                    c0 += ((gc_mask & M(Ll)) != 0);
+                    for(; c0 < c; c0 += 2) {
+                        if (cr_add_interval(cr, c0, c0 + 1))
+                            return -1;
+                    }
+                }
+            }
+        } else if ((gc_mask >> v) & 1) {
+        add_range:
+            if (cr_add_interval(cr, c0, c))
+                return -1;
+        }
+    }
+    return 0;
+}
+
+static int unicode_prop1(CharRange *cr, int prop_idx)
+{
+    const uint8_t *p, *p_end;
+    uint32_t c, c0, b, bit;
+
+    p = unicode_prop_table[prop_idx];
+    p_end = p + unicode_prop_len_table[prop_idx];
+    c = 0;
+    bit = 0;
+    while (p < p_end) {
+        c0 = c;
+        b = *p++;
+        if (b < 64) {
+            c += (b >> 3) + 1;
+            if (bit)  {
+                if (cr_add_interval(cr, c0, c))
+                    return -1;
+            }
+            bit ^= 1;
+            c0 = c;
+            c += (b & 7) + 1;
+        } else if (b >= 0x80) {
+            c += b - 0x80 + 1;
+        } else if (b < 0x60) {
+            c += (((b - 0x40) << 8) | p[0]) + 1;
+            p++;
+        } else {
+            c += (((b - 0x60) << 16) | (p[0] << 8) | p[1]) + 1;
+            p += 2;
+        }
+        if (bit)  {
+            if (cr_add_interval(cr, c0, c))
+                return -1;
+        }
+        bit ^= 1;
+    }
+    return 0;
+}
+
+#define CASE_U (1 << 0)
+#define CASE_L (1 << 1)
+#define CASE_F (1 << 2)
+
+/* use the case conversion table to generate range of characters.
+   CASE_U: set char if modified by uppercasing,
+   CASE_L: set char if modified by lowercasing,
+   CASE_F: set char if modified by case folding,
+ */
+static int unicode_case1(CharRange *cr, int case_mask)
+{
+#define MR(x) (1 << RUN_TYPE_ ## x)
+    const uint32_t tab_run_mask[3] = {
+        MR(U) | MR(UF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(UF_D20) |
+        MR(UF_D1_EXT) | MR(U_EXT) | MR(U_EXT2) | MR(U_EXT3),
+
+        MR(L) | MR(LF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(LF_EXT) | MR(L_EXT2),
+
+        MR(UF) | MR(LF) | MR(UL) | MR(LSU) | MR(U2L_399_EXT2) | MR(LF_EXT) | MR(UF_D20) | MR(UF_D1_EXT) | MR(LF_EXT),
+    };
+#undef MR
+    uint32_t mask, v, code, type, len, i, idx;
+
+    if (case_mask == 0)
+        return 0;
+    mask = 0;
+    for(i = 0; i < 3; i++) {
+        if ((case_mask >> i) & 1)
+            mask |= tab_run_mask[i];
+    }
+    for(idx = 0; idx < countof(case_conv_table1); idx++) {
+        v = case_conv_table1[idx];
+        type = (v >> (32 - 17 - 7 - 4)) & 0xf;
+        code = v >> (32 - 17);
+        len = (v >> (32 - 17 - 7)) & 0x7f;
+        if ((mask >> type) & 1) {
+            //            printf("%d: type=%d %04x %04x\n", idx, type, code, code + len - 1);
+            switch(type) {
+            case RUN_TYPE_UL:
+                if ((case_mask & CASE_U) && (case_mask & (CASE_L | CASE_F)))
+                    goto def_case;
+                code += ((case_mask & CASE_U) != 0);
+                for(i = 0; i < len; i += 2) {
+                    if (cr_add_interval(cr, code + i, code + i + 1))
+                        return -1;
+                }
+                break;
+            case RUN_TYPE_LSU:
+                if ((case_mask & CASE_U) && (case_mask & (CASE_L | CASE_F)))
+                    goto def_case;
+                if (!(case_mask & CASE_U)) {
+                    if (cr_add_interval(cr, code, code + 1))
+                        return -1;
+                }
+                if (cr_add_interval(cr, code + 1, code + 2))
+                    return -1;
+                if (case_mask & CASE_U) {
+                    if (cr_add_interval(cr, code + 2, code + 3))
+                        return -1;
+                }
+                break;
+            default:
+            def_case:
+                if (cr_add_interval(cr, code, code + len))
+                    return -1;
+                break;
+            }
+        }
+    }
+    return 0;
+}
+        
+typedef enum {
+    POP_GC,
+    POP_PROP,
+    POP_CASE,
+    POP_UNION,
+    POP_INTER,
+    POP_XOR,
+    POP_INVERT,
+    POP_END,
+} PropOPEnum;
+
+#define POP_STACK_LEN_MAX 4
+
+static int unicode_prop_ops(CharRange *cr, ...)
+{
+    va_list ap;
+    CharRange stack[POP_STACK_LEN_MAX];
+    int stack_len, op, ret, i;
+    uint32_t a;
+    
+    va_start(ap, cr);
+    stack_len = 0;
+    for(;;) {
+        op = va_arg(ap, int);
+        switch(op) {
+        case POP_GC:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_general_category1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_PROP:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_prop1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_CASE:
+            assert(stack_len < POP_STACK_LEN_MAX);
+            a = va_arg(ap, int);
+            cr_init(&stack[stack_len++], cr->mem_opaque, cr->realloc_func);
+            if (unicode_case1(&stack[stack_len - 1], a))
+                goto fail;
+            break;
+        case POP_UNION:
+        case POP_INTER:
+        case POP_XOR:
+            {
+                CharRange *cr1, *cr2, *cr3;
+                assert(stack_len >= 2);
+                assert(stack_len < POP_STACK_LEN_MAX);
+                cr1 = &stack[stack_len - 2];
+                cr2 = &stack[stack_len - 1];
+                cr3 = &stack[stack_len++];
+                cr_init(cr3, cr->mem_opaque, cr->realloc_func);
+                if (cr_op(cr3, cr1->points, cr1->len,
+                          cr2->points, cr2->len, op - POP_UNION + CR_OP_UNION))
+                    goto fail;
+                cr_free(cr1);
+                cr_free(cr2);
+                *cr1 = *cr3;
+                stack_len -= 2;
+            }
+            break;
+        case POP_INVERT:
+            assert(stack_len >= 1);
+            if (cr_invert(&stack[stack_len - 1]))
+                goto fail;
+            break;
+        case POP_END:
+            goto done;
+        default:
+            abort();
+        }
+    }
+ done:
+    assert(stack_len == 1);
+    ret = cr_copy(cr, &stack[0]);
+    cr_free(&stack[0]);
+    return ret;
+ fail:
+    for(i = 0; i < stack_len; i++)
+        cr_free(&stack[i]);
+    return -1;
+}
+
+static const uint32_t unicode_gc_mask_table[] = {
+    M(Lu) | M(Ll) | M(Lt), /* LC */
+    M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo), /* L */
+    M(Mn) | M(Mc) | M(Me), /* M */
+    M(Nd) | M(Nl) | M(No), /* N */
+    M(Sm) | M(Sc) | M(Sk) | M(So), /* S */
+    M(Pc) | M(Pd) | M(Ps) | M(Pe) | M(Pi) | M(Pf) | M(Po), /* P */
+    M(Zs) | M(Zl) | M(Zp), /* Z */
+    M(Cc) | M(Cf) | M(Cs) | M(Co) | M(Cn), /* C */
+};
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_general_category(CharRange *cr, const char *gc_name)
+{
+    int gc_idx;
+    uint32_t gc_mask;
+    
+    gc_idx = unicode_find_name(unicode_gc_name_table, gc_name);
+    if (gc_idx < 0)
+        return -2;
+    if (gc_idx <= UNICODE_GC_Co) {
+        gc_mask = (uint64_t)1 << gc_idx;
+    } else {
+        gc_mask = unicode_gc_mask_table[gc_idx - UNICODE_GC_LC];
+    }
+    return unicode_general_category1(cr, gc_mask);
+}
+
+
+/* 'cr' must be initialized and empty. Return 0 if OK, -1 if error, -2
+   if not found */
+int unicode_prop(CharRange *cr, const char *prop_name)
+{
+    int prop_idx, ret;
+    
+    prop_idx = unicode_find_name(unicode_prop_name_table, prop_name);
+    if (prop_idx < 0)
+        return -2;
+    prop_idx += UNICODE_PROP_ASCII_Hex_Digit;
+
+    ret = 0;
+    switch(prop_idx) {
+    case UNICODE_PROP_ASCII:
+        if (cr_add_interval(cr, 0x00, 0x7f + 1))
+            return -1;
+        break;
+    case UNICODE_PROP_Any:
+        if (cr_add_interval(cr, 0x00000, 0x10ffff + 1))
+            return -1;
+        break;
+    case UNICODE_PROP_Assigned:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Cn),
+                               POP_INVERT,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Math:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Sm),
+                               POP_PROP, UNICODE_PROP_Other_Math,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Lowercase:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Ll),
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Uppercase:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Cased:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Alphabetic:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_Uppercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Lowercase,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_Alphabetic,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Grapheme_Base:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Cc) | M(Cf) | M(Cs) | M(Co) | M(Cn) | M(Zl) | M(Zp) | M(Me) | M(Mn),
+                               POP_PROP, UNICODE_PROP_Other_Grapheme_Extend,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Grapheme_Extend:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Me) | M(Mn),
+                               POP_PROP, UNICODE_PROP_Other_Grapheme_Extend,
+                               POP_UNION,
+                               POP_END);
+        break;
+    case UNICODE_PROP_XID_Start:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_XID_Start1,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_XID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl) |
+                               M(Mn) | M(Mc) | M(Nd) | M(Pc),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_ID_Continue,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_XID_Continue1,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_Uppercased:
+        ret = unicode_case1(cr, CASE_U);
+        break;
+    case UNICODE_PROP_Changes_When_Lowercased:
+        ret = unicode_case1(cr, CASE_L);
+        break;
+    case UNICODE_PROP_Changes_When_Casemapped:
+        ret = unicode_case1(cr, CASE_U | CASE_L | CASE_F);
+        break;
+    case UNICODE_PROP_Changes_When_Titlecased:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_U,
+                               POP_PROP, UNICODE_PROP_Changes_When_Titlecased1,
+                               POP_XOR,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_Casefolded:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_F,
+                               POP_PROP, UNICODE_PROP_Changes_When_Casefolded1,
+                               POP_XOR,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Changes_When_NFKC_Casefolded:
+        ret = unicode_prop_ops(cr,
+                               POP_CASE, CASE_F,
+                               POP_PROP, UNICODE_PROP_Changes_When_NFKC_Casefolded1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#if 0
+    case UNICODE_PROP_ID_Start:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_ID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Lu) | M(Ll) | M(Lt) | M(Lm) | M(Lo) | M(Nl) |
+                               M(Mn) | M(Mc) | M(Nd) | M(Pc),
+                               POP_PROP, UNICODE_PROP_Other_ID_Start,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Other_ID_Continue,
+                               POP_UNION,
+                               POP_PROP, UNICODE_PROP_Pattern_Syntax,
+                               POP_PROP, UNICODE_PROP_Pattern_White_Space,
+                               POP_UNION,
+                               POP_INVERT,
+                               POP_INTER,
+                               POP_END);
+        break;
+    case UNICODE_PROP_Case_Ignorable:
+        ret = unicode_prop_ops(cr,
+                               POP_GC, M(Mn) | M(Cf) | M(Lm) | M(Sk),
+                               POP_PROP, UNICODE_PROP_Case_Ignorable1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#else
+        /* we use the existing tables */
+    case UNICODE_PROP_ID_Continue:
+        ret = unicode_prop_ops(cr,
+                               POP_PROP, UNICODE_PROP_ID_Start,
+                               POP_PROP, UNICODE_PROP_ID_Continue1,
+                               POP_XOR,
+                               POP_END);
+        break;
+#endif
+    default:
+        if (prop_idx >= countof(unicode_prop_table))
+            return -2;
+        ret = unicode_prop1(cr, prop_idx);
+        break;
+    }
+    return ret;
+}
+
+#endif /* CONFIG_ALL_UNICODE */

gpac-1.0.0.tar.gz/src/quickjs/libunicode.h Added

@@ -0,0 +1,124 @@
+/*
+ * Unicode utilities
+ * 
+ * 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 LIBUNICODE_H
+#define LIBUNICODE_H
+
+#include <inttypes.h>
+
+#define LRE_BOOL  int       /* for documentation purposes */
+
+/* define it to include all the unicode tables (40KB larger) */
+#define CONFIG_ALL_UNICODE
+
+#define LRE_CC_RES_LEN_MAX 3
+
+typedef enum {
+    UNICODE_NFC,
+    UNICODE_NFD,
+    UNICODE_NFKC,
+    UNICODE_NFKD,
+} UnicodeNormalizationEnum;
+
+int lre_case_conv(uint32_t *res, uint32_t c, int conv_type);
+LRE_BOOL lre_is_cased(uint32_t c);
+LRE_BOOL lre_is_case_ignorable(uint32_t c);
+
+/* char ranges */
+
+typedef struct {
+    int len; /* in points, always even */
+    int size;
+    uint32_t *points; /* points sorted by increasing value */
+    void *mem_opaque;
+    void *(*realloc_func)(void *opaque, void *ptr, size_t size);
+} CharRange;
+
+typedef enum {
+    CR_OP_UNION,
+    CR_OP_INTER,
+    CR_OP_XOR,
+} CharRangeOpEnum;
+
+void cr_init(CharRange *cr, void *mem_opaque, void *(*realloc_func)(void *opaque, void *ptr, size_t size));
+void cr_free(CharRange *cr);
+int cr_realloc(CharRange *cr, int size);
+int cr_copy(CharRange *cr, const CharRange *cr1);
+
+static inline int cr_add_point(CharRange *cr, uint32_t v)
+{
+    if (cr->len >= cr->size) {
+        if (cr_realloc(cr, cr->len + 1))
+            return -1;
+    }
+    cr->points[cr->len++] = v;
+    return 0;
+}
+
+static inline int cr_add_interval(CharRange *cr, uint32_t c1, uint32_t c2)
+{
+    if ((cr->len + 2) > cr->size) {
+        if (cr_realloc(cr, cr->len + 2))
+            return -1;
+    }
+    cr->points[cr->len++] = c1;
+    cr->points[cr->len++] = c2;
+    return 0;
+}
+
+int cr_union1(CharRange *cr, const uint32_t *b_pt, int b_len);
+
+static inline int cr_union_interval(CharRange *cr, uint32_t c1, uint32_t c2)
+{
+    uint32_t b_pt[2];
+    b_pt[0] = c1;
+    b_pt[1] = c2 + 1;
+    return cr_union1(cr, b_pt, 2);
+}
+
+int cr_op(CharRange *cr, const uint32_t *a_pt, int a_len,
+          const uint32_t *b_pt, int b_len, int op);
+
+int cr_invert(CharRange *cr);
+
+#ifdef CONFIG_ALL_UNICODE
+
+LRE_BOOL lre_is_id_start(uint32_t c);
+LRE_BOOL lre_is_id_continue(uint32_t c);
+
+int unicode_normalize(uint32_t **pdst, const uint32_t *src, int src_len,
+                      UnicodeNormalizationEnum n_type,
+                      void *opaque, void *(*realloc_func)(void *opaque, void *ptr, size_t size));
+
+/* Unicode character range functions */
+
+int unicode_script(CharRange *cr,
+                   const char *script_name, LRE_BOOL is_ext);
+int unicode_general_category(CharRange *cr, const char *gc_name);
+int unicode_prop(CharRange *cr, const char *prop_name);
+
+#endif /* CONFIG_ALL_UNICODE */
+
+#undef LRE_BOOL
+
+#endif /* LIBUNICODE_H */

gpac-1.0.0.tar.gz/src/quickjs/list.h Added

@@ -0,0 +1,100 @@
+/*
+ * Linux klist like system
+ * 
+ * Copyright (c) 2016-2017 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 LIST_H
+#define LIST_H
+
+#ifndef NULL
+#include <stddef.h>
+#endif
+
+struct list_head {
+    struct list_head *prev;
+    struct list_head *next;
+};
+
+#define LIST_HEAD_INIT(el) { &(el), &(el) }
+
+/* return the pointer of type 'type *' containing 'el' as field 'member' */
+#define list_entry(el, type, member) \
+    ((type *)((uint8_t *)(el) - offsetof(type, member)))
+
+static inline void init_list_head(struct list_head *head)
+{
+    head->prev = head;
+    head->next = head;
+}
+
+/* insert 'el' between 'prev' and 'next' */
+static inline void __list_add(struct list_head *el, 
+                              struct list_head *prev, struct list_head *next)
+{
+    prev->next = el;
+    el->prev = prev;
+    el->next = next;
+    next->prev = el;
+}
+
+/* add 'el' at the head of the list 'head' (= after element head) */
+static inline void list_add(struct list_head *el, struct list_head *head)
+{
+    __list_add(el, head, head->next);
+}
+
+/* add 'el' at the end of the list 'head' (= before element head) */
+static inline void list_add_tail(struct list_head *el, struct list_head *head)
+{
+    __list_add(el, head->prev, head);
+}
+
+static inline void list_del(struct list_head *el)
+{
+    struct list_head *prev, *next;
+    prev = el->prev;
+    next = el->next;
+    prev->next = next;
+    next->prev = prev;
+    el->prev = NULL; /* fail safe */
+    el->next = NULL; /* fail safe */
+}
+
+static inline int list_empty(struct list_head *el)
+{
+    return el->next == el;
+}
+
+#define list_for_each(el, head) \
+  for(el = (head)->next; el != (head); el = el->next)
+
+#define list_for_each_safe(el, el1, head)                \
+    for(el = (head)->next, el1 = el->next; el != (head); \
+        el = el1, el1 = el->next)
+
+#define list_for_each_prev(el, head) \
+  for(el = (head)->prev; el != (head); el = el->prev)
+
+#define list_for_each_prev_safe(el, el1, head)           \
+    for(el = (head)->prev, el1 = el->prev; el != (head); \
+        el = el1, el1 = el->prev)
+
+#endif /* LIST_H */

gpac-1.0.0.tar.gz/src/quickjs/quickjs-atom.h Added

@@ -0,0 +1,289 @@
+/*
+ * QuickJS atom definitions
+ * 
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ * Copyright (c) 2017-2018 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.
+ */
+
+#ifdef DEF
+
+/* Note: first atoms are considered as keywords in the parser */
+DEF(null, "null") /* must be first */
+DEF(false, "false")
+DEF(true, "true")
+DEF(if, "if")
+DEF(else, "else")
+DEF(return, "return")
+DEF(var, "var")
+DEF(this, "this")
+DEF(delete, "delete")
+DEF(void, "void")
+DEF(typeof, "typeof")
+DEF(new, "new")
+DEF(in, "in")
+DEF(instanceof, "instanceof")
+DEF(do, "do")
+DEF(while, "while")
+DEF(for, "for")
+DEF(break, "break")
+DEF(continue, "continue")
+DEF(switch, "switch")
+DEF(case, "case")
+DEF(default, "default")
+DEF(throw, "throw")
+DEF(try, "try")
+DEF(catch, "catch")
+DEF(finally, "finally")
+DEF(function, "function")
+DEF(debugger, "debugger")
+DEF(with, "with")
+/* FutureReservedWord */
+DEF(class, "class")
+DEF(const, "const")
+DEF(enum, "enum")
+DEF(export, "export")
+DEF(extends, "extends")
+DEF(import, "import")
+DEF(super, "super")
+/* FutureReservedWords when parsing strict mode code */
+DEF(implements, "implements")
+DEF(interface, "interface")
+DEF(let, "let")
+DEF(package, "package")
+DEF(private, "private")
+DEF(protected, "protected")
+DEF(public, "public")
+DEF(static, "static")
+DEF(yield, "yield")
+DEF(await, "await")
+
+/* empty string */
+DEF(empty_string, "")
+/* identifiers */
+DEF(length, "length")
+DEF(fileName, "fileName")
+DEF(lineNumber, "lineNumber")
+DEF(message, "message")
+DEF(stack, "stack")
+DEF(name, "name")
+DEF(toString, "toString")
+DEF(toLocaleString, "toLocaleString")
+DEF(valueOf, "valueOf")
+DEF(eval, "eval")
+DEF(prototype, "prototype")
+DEF(constructor, "constructor")
+DEF(configurable, "configurable")
+DEF(writable, "writable")
+DEF(enumerable, "enumerable")
+DEF(value, "value")
+DEF(get, "get")
+DEF(set, "set")
+DEF(of, "of")
+DEF(__proto__, "__proto__")
+DEF(undefined, "undefined")
+DEF(number, "number")
+DEF(boolean, "boolean")
+DEF(string, "string")
+DEF(object, "object")
+DEF(symbol, "symbol")
+DEF(integer, "integer")
+DEF(unknown, "unknown")
+DEF(arguments, "arguments")
+DEF(callee, "callee")
+DEF(caller, "caller")
+DEF(_eval_, "<eval>")
+DEF(_ret_, "<ret>")
+DEF(_var_, "<var>")
+DEF(_with_, "<with>")
+DEF(lastIndex, "lastIndex")
+DEF(target, "target")
+DEF(index, "index")
+DEF(input, "input")
+DEF(defineProperties, "defineProperties")
+DEF(apply, "apply")
+DEF(join, "join")
+DEF(concat, "concat")
+DEF(split, "split")
+DEF(construct, "construct")
+DEF(getPrototypeOf, "getPrototypeOf")
+DEF(setPrototypeOf, "setPrototypeOf")
+DEF(isExtensible, "isExtensible")
+DEF(preventExtensions, "preventExtensions")
+DEF(has, "has")
+DEF(deleteProperty, "deleteProperty")
+DEF(defineProperty, "defineProperty")
+DEF(getOwnPropertyDescriptor, "getOwnPropertyDescriptor")
+DEF(ownKeys, "ownKeys")
+DEF(add, "add")
+DEF(done, "done")
+DEF(next, "next")
+DEF(values, "values")
+DEF(source, "source")
+DEF(flags, "flags")
+DEF(global, "global")
+DEF(unicode, "unicode")
+DEF(raw, "raw")
+DEF(new_target, "new.target")
+DEF(this_active_func, "this.active_func")
+DEF(home_object, "<home_object>")
+DEF(computed_field, "<computed_field>")
+DEF(static_computed_field, "<static_computed_field>") /* must come after computed_fields */
+DEF(class_fields_init, "<class_fields_init>")
+DEF(brand, "<brand>")
+DEF(hash_constructor, "#constructor")
+DEF(as, "as")
+DEF(from, "from")
+DEF(meta, "meta")
+DEF(_default_, "*default*")
+DEF(_star_, "*")
+DEF(Module, "Module")
+DEF(then, "then")
+DEF(resolve, "resolve")
+DEF(reject, "reject")
+DEF(promise, "promise")
+DEF(proxy, "proxy")
+DEF(revoke, "revoke")
+DEF(async, "async")
+DEF(exec, "exec")
+DEF(groups, "groups")
+DEF(status, "status")
+DEF(reason, "reason")
+DEF(globalThis, "globalThis")
+#ifdef CONFIG_BIGNUM
+DEF(bigint, "bigint")
+DEF(bigfloat, "bigfloat")
+DEF(bigdecimal, "bigdecimal")
+DEF(roundingMode, "roundingMode")
+DEF(maximumSignificantDigits, "maximumSignificantDigits")
+DEF(maximumFractionDigits, "maximumFractionDigits")
+#endif
+#ifdef CONFIG_ATOMICS
+DEF(not_equal, "not-equal")
+DEF(timed_out, "timed-out")
+DEF(ok, "ok")
+#endif
+DEF(toJSON, "toJSON")
+/* class names */
+DEF(Object, "Object")
+DEF(Array, "Array")
+DEF(Error, "Error")
+DEF(Number, "Number")
+DEF(String, "String")
+DEF(Boolean, "Boolean")
+DEF(Symbol, "Symbol")
+DEF(Arguments, "Arguments")
+DEF(Math, "Math")
+DEF(JSON, "JSON")
+DEF(Date, "Date")
+DEF(Function, "Function")
+DEF(GeneratorFunction, "GeneratorFunction")
+DEF(ForInIterator, "ForInIterator")
+DEF(RegExp, "RegExp")
+DEF(ArrayBuffer, "ArrayBuffer")
+DEF(SharedArrayBuffer, "SharedArrayBuffer")
+/* must keep same order as class IDs for typed arrays */
+DEF(Uint8ClampedArray, "Uint8ClampedArray") 
+DEF(Int8Array, "Int8Array")
+DEF(Uint8Array, "Uint8Array")
+DEF(Int16Array, "Int16Array")
+DEF(Uint16Array, "Uint16Array")
+DEF(Int32Array, "Int32Array")
+DEF(Uint32Array, "Uint32Array")
+#ifdef CONFIG_BIGNUM
+DEF(BigInt64Array, "BigInt64Array")
+DEF(BigUint64Array, "BigUint64Array")
+#endif
+DEF(Float32Array, "Float32Array")
+DEF(Float64Array, "Float64Array")
+DEF(DataView, "DataView")
+#ifdef CONFIG_BIGNUM
+DEF(BigInt, "BigInt")
+DEF(BigFloat, "BigFloat")
+DEF(BigFloatEnv, "BigFloatEnv")
+DEF(BigDecimal, "BigDecimal")
+#endif
+DEF(Map, "Map")
+DEF(Set, "Set") /* Map + 1 */
+DEF(WeakMap, "WeakMap") /* Map + 2 */
+DEF(WeakSet, "WeakSet") /* Map + 3 */
+DEF(Map_Iterator, "Map Iterator")
+DEF(Set_Iterator, "Set Iterator")
+DEF(Array_Iterator, "Array Iterator")
+DEF(String_Iterator, "String Iterator")
+DEF(RegExp_String_Iterator, "RegExp String Iterator")
+DEF(Generator, "Generator")
+DEF(Proxy, "Proxy")
+DEF(Promise, "Promise")
+DEF(PromiseResolveFunction, "PromiseResolveFunction")
+DEF(PromiseRejectFunction, "PromiseRejectFunction")
+DEF(AsyncFunction, "AsyncFunction")
+DEF(AsyncFunctionResolve, "AsyncFunctionResolve")
+DEF(AsyncFunctionReject, "AsyncFunctionReject")
+DEF(AsyncGeneratorFunction, "AsyncGeneratorFunction")
+DEF(AsyncGenerator, "AsyncGenerator")
+DEF(EvalError, "EvalError")
+DEF(RangeError, "RangeError")
+DEF(ReferenceError, "ReferenceError")
+DEF(SyntaxError, "SyntaxError")
+DEF(TypeError, "TypeError")
+DEF(URIError, "URIError")
+DEF(InternalError, "InternalError")
+/* private symbols */
+DEF(Private_brand, "<brand>")
+/* symbols */
+DEF(Symbol_toPrimitive, "Symbol.toPrimitive")
+DEF(Symbol_iterator, "Symbol.iterator")
+DEF(Symbol_match, "Symbol.match")
+DEF(Symbol_matchAll, "Symbol.matchAll")
+DEF(Symbol_replace, "Symbol.replace")
+DEF(Symbol_search, "Symbol.search")
+DEF(Symbol_split, "Symbol.split")
+DEF(Symbol_toStringTag, "Symbol.toStringTag")
+DEF(Symbol_isConcatSpreadable, "Symbol.isConcatSpreadable")
+DEF(Symbol_hasInstance, "Symbol.hasInstance")
+DEF(Symbol_species, "Symbol.species")
+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")
+#endif
+
+#endif /* DEF */

gpac-1.0.0.tar.gz/src/quickjs/quickjs-opcode.h Added

@@ -0,0 +1,371 @@
+/*
+ * QuickJS opcode definitions
+ * 
+ * Copyright (c) 2017-2018 Fabrice Bellard
+ * Copyright (c) 2017-2018 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.
+ */
+
+#ifdef FMT
+FMT(none)
+FMT(none_int)
+FMT(none_loc)
+FMT(none_arg)
+FMT(none_var_ref)
+FMT(u8)
+FMT(i8)
+FMT(loc8)
+FMT(const8)
+FMT(label8)
+FMT(u16)
+FMT(i16)
+FMT(label16)
+FMT(npop)
+FMT(npopx)
+FMT(npop_u16)
+FMT(loc)
+FMT(arg)
+FMT(var_ref)
+FMT(u32)
+FMT(i32)
+FMT(const)
+FMT(label)
+FMT(atom)
+FMT(atom_u8)
+FMT(atom_u16)
+FMT(atom_label_u8)
+FMT(atom_label_u16)
+FMT(label_u16)
+#undef FMT
+#endif /* FMT */
+
+#ifdef DEF
+
+#ifndef def
+#define def(id, size, n_pop, n_push, f) DEF(id, size, n_pop, n_push, f)
+#endif
+
+DEF(invalid, 1, 0, 0, none) /* never emitted */
+
+/* push values */
+DEF(       push_i32, 5, 0, 1, i32)
+DEF(     push_const, 5, 0, 1, const)
+DEF(       fclosure, 5, 0, 1, const) /* must follow push_const */
+DEF(push_atom_value, 5, 0, 1, atom)
+DEF( private_symbol, 5, 0, 1, atom)
+DEF(      undefined, 1, 0, 1, none)
+DEF(           null, 1, 0, 1, none)
+DEF(      push_this, 1, 0, 1, none) /* only used at the start of a function */
+DEF(     push_false, 1, 0, 1, none)
+DEF(      push_true, 1, 0, 1, none)
+DEF(         object, 1, 0, 1, none)
+DEF( special_object, 2, 0, 1, u8) /* only used at the start of a function */
+DEF(           rest, 3, 0, 1, u16) /* only used at the start of a function */
+
+DEF(           drop, 1, 1, 0, none) /* a -> */
+DEF(            nip, 1, 2, 1, none) /* a b -> b */
+DEF(           nip1, 1, 3, 2, none) /* a b c -> b c */
+DEF(            dup, 1, 1, 2, none) /* a -> a a */
+DEF(           dup1, 1, 2, 3, none) /* a b -> a a b */
+DEF(           dup2, 1, 2, 4, none) /* a b -> a b a b */
+DEF(           dup3, 1, 3, 6, none) /* a b c -> a b c a b c */
+DEF(        insert2, 1, 2, 3, none) /* obj a -> a obj a (dup_x1) */
+DEF(        insert3, 1, 3, 4, none) /* obj prop a -> a obj prop a (dup_x2) */
+DEF(        insert4, 1, 4, 5, none) /* this obj prop a -> a this obj prop a */
+DEF(          perm3, 1, 3, 3, none) /* obj a b -> a obj b */
+DEF(          perm4, 1, 4, 4, none) /* obj prop a b -> a obj prop b */
+DEF(          perm5, 1, 5, 5, none) /* this obj prop a b -> a this obj prop b */
+DEF(           swap, 1, 2, 2, none) /* a b -> b a */
+DEF(          swap2, 1, 4, 4, none) /* a b c d -> c d a b */
+DEF(          rot3l, 1, 3, 3, none) /* x a b -> a b x */
+DEF(          rot3r, 1, 3, 3, none) /* a b x -> x a b */
+DEF(          rot4l, 1, 4, 4, none) /* x a b c -> a b c x */
+DEF(          rot5l, 1, 5, 5, none) /* x a b c d -> a b c d x */
+
+DEF(call_constructor, 3, 2, 1, npop) /* func new.target args -> ret. arguments are not counted in n_pop */
+DEF(           call, 3, 1, 1, npop) /* arguments are not counted in n_pop */
+DEF(      tail_call, 3, 1, 0, npop) /* arguments are not counted in n_pop */
+DEF(    call_method, 3, 2, 1, npop) /* arguments are not counted in n_pop */
+DEF(tail_call_method, 3, 2, 0, npop) /* arguments are not counted in n_pop */
+DEF(     array_from, 3, 0, 1, npop) /* arguments are not counted in n_pop */
+DEF(          apply, 3, 3, 1, u16)
+DEF(         return, 1, 1, 0, none)
+DEF(   return_undef, 1, 0, 0, none)
+DEF(check_ctor_return, 1, 1, 2, none)
+DEF(     check_ctor, 1, 0, 0, none)
+DEF(    check_brand, 1, 2, 2, none) /* this_obj func -> this_obj func */
+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(           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 */
+
+DEF(      check_var, 5, 0, 1, atom) /* check if a variable exists */
+DEF(  get_var_undef, 5, 0, 1, atom) /* push undefined if the variable does not exist */
+DEF(        get_var, 5, 0, 1, atom) /* throw an exception if the variable does not exist */
+DEF(        put_var, 5, 1, 0, atom) /* must come after get_var */
+DEF(   put_var_init, 5, 1, 0, atom) /* must come after put_var. Used to initialize a global lexical variable */
+DEF( put_var_strict, 5, 2, 0, atom) /* for strict mode variable write */
+
+DEF(  get_ref_value, 1, 2, 3, none)
+DEF(  put_ref_value, 1, 3, 0, none)
+
+DEF(     define_var, 6, 0, 0, atom_u8)
+DEF(check_define_var, 6, 0, 0, atom_u8)
+DEF(    define_func, 6, 1, 0, atom_u8)
+DEF(      get_field, 5, 1, 1, atom)
+DEF(     get_field2, 5, 1, 2, atom)
+DEF(      put_field, 5, 2, 0, atom)
+DEF( get_private_field, 1, 2, 1, none) /* obj prop -> value */
+DEF( put_private_field, 1, 3, 0, none) /* obj value prop -> */
+DEF(define_private_field, 1, 3, 1, none) /* obj prop value -> obj */
+DEF(   get_array_el, 1, 2, 1, none)
+DEF(  get_array_el2, 1, 2, 2, none) /* obj prop -> obj value */
+DEF(   put_array_el, 1, 3, 0, none)
+DEF(get_super_value, 1, 3, 1, none) /* this obj prop -> value */
+DEF(put_super_value, 1, 4, 0, none) /* this obj prop value -> */
+DEF(   define_field, 5, 2, 1, atom)
+DEF(       set_name, 5, 1, 1, atom)
+DEF(set_name_computed, 1, 2, 2, none)
+DEF(      set_proto, 1, 2, 1, none)
+DEF(set_home_object, 1, 2, 2, none)
+DEF(define_array_el, 1, 3, 2, none)
+DEF(         append, 1, 3, 2, none) /* append enumerated object, update length */
+DEF(copy_data_properties, 2, 3, 3, u8)
+DEF(  define_method, 6, 2, 1, atom_u8)
+DEF(define_method_computed, 2, 3, 1, u8) /* must come after define_method */
+DEF(   define_class, 6, 2, 2, atom_u8) /* parent ctor -> ctor proto */
+DEF(   define_class_computed, 6, 3, 3, atom_u8) /* field_name parent ctor -> field_name ctor proto (class with computed name) */
+
+DEF(        get_loc, 3, 0, 1, loc)
+DEF(        put_loc, 3, 1, 0, loc) /* must come after get_loc */
+DEF(        set_loc, 3, 1, 1, loc) /* must come after put_loc */
+DEF(        get_arg, 3, 0, 1, arg)
+DEF(        put_arg, 3, 1, 0, arg) /* must come after get_arg */
+DEF(        set_arg, 3, 1, 1, arg) /* must come after put_arg */
+DEF(    get_var_ref, 3, 0, 1, var_ref) 
+DEF(    put_var_ref, 3, 1, 0, var_ref) /* must come after get_var_ref */
+DEF(    set_var_ref, 3, 1, 1, var_ref) /* must come after put_var_ref */
+DEF(set_loc_uninitialized, 3, 0, 0, loc)
+DEF(  get_loc_check, 3, 0, 1, loc)
+DEF(  put_loc_check, 3, 1, 0, loc) /* must come after get_loc_check */
+DEF(  put_loc_check_init, 3, 1, 0, loc)
+DEF(get_var_ref_check, 3, 0, 1, var_ref) 
+DEF(put_var_ref_check, 3, 1, 0, var_ref) /* must come after get_var_ref_check */
+DEF(put_var_ref_check_init, 3, 1, 0, var_ref)
+DEF(      close_loc, 3, 0, 0, loc)
+DEF(       if_false, 5, 1, 0, label)
+DEF(        if_true, 5, 1, 0, label) /* must come after if_false */
+DEF(           goto, 5, 0, 0, label) /* must come after if_true */
+DEF(          catch, 5, 0, 1, label)
+DEF(          gosub, 5, 0, 0, label) /* used to execute the finally block */
+DEF(            ret, 1, 1, 0, none) /* used to return from the finally block */
+
+DEF(      to_object, 1, 1, 1, none)
+//DEF(      to_string, 1, 1, 1, none)
+DEF(     to_propkey, 1, 1, 1, none)
+DEF(    to_propkey2, 1, 2, 2, none)
+
+DEF(   with_get_var, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(   with_put_var, 10, 2, 1, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(with_delete_var, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(  with_make_ref, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(   with_get_ref, 10, 1, 0, atom_label_u8)     /* must be in the same order as scope_xxx */
+DEF(with_get_ref_undef, 10, 1, 0, atom_label_u8)
+
+DEF(   make_loc_ref, 7, 0, 2, atom_u16)
+DEF(   make_arg_ref, 7, 0, 2, atom_u16)
+DEF(make_var_ref_ref, 7, 0, 2, atom_u16)
+DEF(   make_var_ref, 5, 0, 2, atom)
+
+DEF(   for_in_start, 1, 1, 1, none)
+DEF(   for_of_start, 1, 1, 3, none)
+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_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(  initial_yield, 1, 0, 0, none)
+DEF(          yield, 1, 1, 2, none)
+DEF(     yield_star, 1, 2, 2, none)
+DEF(async_yield_star, 1, 1, 2, none)
+DEF(          await, 1, 1, 1, none)
+
+/* arithmetic/logic operations */
+DEF(            neg, 1, 1, 1, none)
+DEF(           plus, 1, 1, 1, none)
+DEF(            dec, 1, 1, 1, none)
+DEF(            inc, 1, 1, 1, none)
+DEF(       post_dec, 1, 1, 2, none)
+DEF(       post_inc, 1, 1, 2, none)
+DEF(        dec_loc, 2, 0, 0, loc8)
+DEF(        inc_loc, 2, 0, 0, loc8)
+DEF(        add_loc, 2, 1, 0, loc8)
+DEF(            not, 1, 1, 1, none)
+DEF(           lnot, 1, 1, 1, none)
+DEF(         typeof, 1, 1, 1, none)
+DEF(         delete, 1, 2, 1, none)
+DEF(     delete_var, 5, 0, 1, atom)
+
+DEF(            mul, 1, 2, 1, none)
+DEF(            div, 1, 2, 1, none)
+DEF(            mod, 1, 2, 1, none)
+DEF(            add, 1, 2, 1, none)
+DEF(            sub, 1, 2, 1, none)
+DEF(            pow, 1, 2, 1, none)
+DEF(            shl, 1, 2, 1, none)
+DEF(            sar, 1, 2, 1, none)
+DEF(            shr, 1, 2, 1, none)
+DEF(             lt, 1, 2, 1, none)
+DEF(            lte, 1, 2, 1, none)
+DEF(             gt, 1, 2, 1, none)
+DEF(            gte, 1, 2, 1, none)
+DEF(     instanceof, 1, 2, 1, none)
+DEF(             in, 1, 2, 1, none)
+DEF(             eq, 1, 2, 1, none)
+DEF(            neq, 1, 2, 1, none)
+DEF(      strict_eq, 1, 2, 1, none)
+DEF(     strict_neq, 1, 2, 1, none)
+DEF(            and, 1, 2, 1, none)
+DEF(            xor, 1, 2, 1, none)
+DEF(             or, 1, 2, 1, none)
+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 */
+
+def(          label, 5, 0, 0, label) /* emitted in phase 1, removed in phase 3 */
+
+def(scope_get_var_undef, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_put_var, 7, 1, 0, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_delete_var, 7, 0, 1, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def( scope_make_ref, 11, 0, 2, atom_label_u16) /* emitted in phase 1, removed in phase 2 */
+def(  scope_get_ref, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_put_var_init, 7, 0, 2, atom_u16) /* emitted in phase 1, removed in phase 2 */
+def(scope_get_private_field, 7, 1, 1, atom_u16) /* obj -> value, emitted in phase 1, removed in phase 2 */
+def(scope_get_private_field2, 7, 1, 2, atom_u16) /* obj -> obj value, emitted in phase 1, removed in phase 2 */
+def(scope_put_private_field, 7, 1, 1, atom_u16) /* obj value ->, emitted in phase 1, removed in phase 2 */
+
+def( set_class_name, 5, 1, 1, u32) /* emitted in phase 1, removed in phase 2 */
+    
+def(       line_num, 5, 0, 0, u32) /* emitted in phase 1, removed in phase 3 */
+
+#if SHORT_OPCODES
+DEF(    push_minus1, 1, 0, 1, none_int)
+DEF(         push_0, 1, 0, 1, none_int)
+DEF(         push_1, 1, 0, 1, none_int)
+DEF(         push_2, 1, 0, 1, none_int)
+DEF(         push_3, 1, 0, 1, none_int)
+DEF(         push_4, 1, 0, 1, none_int)
+DEF(         push_5, 1, 0, 1, none_int)
+DEF(         push_6, 1, 0, 1, none_int)
+DEF(         push_7, 1, 0, 1, none_int)
+DEF(        push_i8, 2, 0, 1, i8)
+DEF(       push_i16, 3, 0, 1, i16)
+DEF(    push_const8, 2, 0, 1, const8)
+DEF(      fclosure8, 2, 0, 1, const8) /* must follow push_const8 */
+DEF(push_empty_string, 1, 0, 1, none)
+
+DEF(       get_loc8, 2, 0, 1, loc8)
+DEF(       put_loc8, 2, 1, 0, loc8)
+DEF(       set_loc8, 2, 1, 1, loc8)
+
+DEF(       get_loc0, 1, 0, 1, none_loc)
+DEF(       get_loc1, 1, 0, 1, none_loc)
+DEF(       get_loc2, 1, 0, 1, none_loc)
+DEF(       get_loc3, 1, 0, 1, none_loc)
+DEF(       put_loc0, 1, 1, 0, none_loc)
+DEF(       put_loc1, 1, 1, 0, none_loc)
+DEF(       put_loc2, 1, 1, 0, none_loc)
+DEF(       put_loc3, 1, 1, 0, none_loc)
+DEF(       set_loc0, 1, 1, 1, none_loc)
+DEF(       set_loc1, 1, 1, 1, none_loc)
+DEF(       set_loc2, 1, 1, 1, none_loc)
+DEF(       set_loc3, 1, 1, 1, none_loc)
+DEF(       get_arg0, 1, 0, 1, none_arg)
+DEF(       get_arg1, 1, 0, 1, none_arg)
+DEF(       get_arg2, 1, 0, 1, none_arg)
+DEF(       get_arg3, 1, 0, 1, none_arg)
+DEF(       put_arg0, 1, 1, 0, none_arg)
+DEF(       put_arg1, 1, 1, 0, none_arg)
+DEF(       put_arg2, 1, 1, 0, none_arg)
+DEF(       put_arg3, 1, 1, 0, none_arg)
+DEF(       set_arg0, 1, 1, 1, none_arg)
+DEF(       set_arg1, 1, 1, 1, none_arg)
+DEF(       set_arg2, 1, 1, 1, none_arg)
+DEF(       set_arg3, 1, 1, 1, none_arg)
+DEF(   get_var_ref0, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref1, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref2, 1, 0, 1, none_var_ref)
+DEF(   get_var_ref3, 1, 0, 1, none_var_ref)
+DEF(   put_var_ref0, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref1, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref2, 1, 1, 0, none_var_ref)
+DEF(   put_var_ref3, 1, 1, 0, none_var_ref)
+DEF(   set_var_ref0, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref1, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref2, 1, 1, 1, none_var_ref)
+DEF(   set_var_ref3, 1, 1, 1, none_var_ref)
+
+DEF(     get_length, 1, 1, 1, none)
+
+DEF(      if_false8, 2, 1, 0, label8)
+DEF(       if_true8, 2, 1, 0, label8) /* must come after if_false8 */
+DEF(          goto8, 2, 0, 0, label8) /* must come after if_true8 */
+DEF(         goto16, 3, 0, 0, label16)
+
+DEF(          call0, 1, 1, 1, npopx)
+DEF(          call1, 1, 1, 1, npopx)
+DEF(          call2, 1, 1, 1, npopx)
+DEF(          call3, 1, 1, 1, npopx)
+
+DEF(   is_undefined, 1, 1, 1, none)
+DEF(        is_null, 1, 1, 1, none)
+DEF(    is_function, 1, 1, 1, none)
+#endif
+
+#undef DEF
+#undef def
+#endif  /* DEF */

gpac-1.0.0.tar.gz/src/quickjs/quickjs.c Added

@@ -0,0 +1,51836 @@
+/*
+ * QuickJS Javascript Engine
+ *
+ * Copyright (c) 2017-2020 Fabrice Bellard
+ * Copyright (c) 2017-2020 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 <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <inttypes.h>
+#include <string.h>
+#include <assert.h>
+#if !defined(_WIN32)
+#include <sys/time.h>
+#endif
+#include <time.h>
+#include <fenv.h>
+#include <math.h>
+#if defined(__APPLE__)
+#include <malloc/malloc.h>
+#elif defined(__linux__) || defined(__NX__)
+#include <malloc.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
+
+#define OPTIMIZE         1
+#define SHORT_OPCODES    1
+#if defined(EMSCRIPTEN)
+#define DIRECT_DISPATCH  0
+#elif defined(_MSC_VER)
+#define DIRECT_DISPATCH  0
+#else
+#define DIRECT_DISPATCH  1
+#endif
+
+#if defined(__APPLE__)
+#define MALLOC_OVERHEAD  0
+#else
+#define MALLOC_OVERHEAD  8
+#endif
+
+#if !defined(_WIN32)
+/* define it if printf uses the RNDN rounding mode instead of RNDNA */
+#define CONFIG_PRINTF_RNDN
+#endif
+
+/* 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)
+#define CONFIG_ATOMICS
+#endif
+
+/* dump object free */
+//#define DUMP_FREE
+//#define DUMP_CLOSURE
+/* dump the bytecode of the compiled functions: combination of bits
+   1: dump pass 3 final byte code
+   2: dump pass 2 code
+   4: dump pass 1 code
+   8: dump stdlib functions
+  16: dump bytecode in hex
+  32: dump line number table
+ */
+//#define DUMP_BYTECODE  (1)
+/* dump the occurence of the automatic GC */
+//#define DUMP_GC
+/* dump objects freed by the garbage collector */
+//#define DUMP_GC_FREE
+/* dump objects leaking when freeing the runtime */
+#define DUMP_LEAKS  1
+/* dump memory usage before running the garbage collector */
+//#define DUMP_MEM
+//#define DUMP_OBJECTS    /* dump objects in JS_FreeContext */
+//#define DUMP_ATOMS      /* dump atoms in JS_FreeContext */
+//#define DUMP_SHAPES     /* dump shapes in JS_FreeContext */
+//#define DUMP_MODULE_RESOLVE
+//#define DUMP_PROMISE
+//#define DUMP_READ_OBJECT
+
+/* test the GC by forcing it before each object allocation */
+//#define FORCE_GC_AT_MALLOC
+
+#ifdef CONFIG_ATOMICS
+#if !defined(_WIN32)
+#include <pthread.h>
+#include <stdatomic.h>
+#endif
+#include <errno.h>
+#endif
+
+#define CONFIG_VERSION "2019-09-18"
+
+enum {
+    /* classid tag        */    /* union usage   | properties */
+    JS_CLASS_OBJECT = 1,        /* must be first */
+    JS_CLASS_ARRAY,             /* u.array       | length */
+    JS_CLASS_ERROR,
+    JS_CLASS_NUMBER,            /* u.object_data */
+    JS_CLASS_STRING,            /* u.object_data */
+    JS_CLASS_BOOLEAN,           /* u.object_data */
+    JS_CLASS_SYMBOL,            /* u.object_data */
+    JS_CLASS_ARGUMENTS,         /* u.array       | length */
+    JS_CLASS_MAPPED_ARGUMENTS,  /*               | length */
+    JS_CLASS_DATE,              /* u.object_data */
+    JS_CLASS_MODULE_NS,
+    JS_CLASS_C_FUNCTION,        /* u.cfunc */
+    JS_CLASS_BYTECODE_FUNCTION, /* u.func */
+    JS_CLASS_BOUND_FUNCTION,    /* u.bound_function */
+    JS_CLASS_C_FUNCTION_DATA,   /* u.c_function_data_record */
+    JS_CLASS_GENERATOR_FUNCTION, /* u.func */
+    JS_CLASS_FOR_IN_ITERATOR,   /* u.for_in_iterator */
+    JS_CLASS_REGEXP,            /* u.regexp */
+    JS_CLASS_ARRAY_BUFFER,      /* u.array_buffer */
+    JS_CLASS_SHARED_ARRAY_BUFFER, /* u.array_buffer */
+    JS_CLASS_UINT8C_ARRAY,      /* u.array (typed_array) */
+    JS_CLASS_INT8_ARRAY,        /* u.array (typed_array) */
+    JS_CLASS_UINT8_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_INT16_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_UINT16_ARRAY,      /* u.array (typed_array) */
+    JS_CLASS_INT32_ARRAY,       /* u.array (typed_array) */
+    JS_CLASS_UINT32_ARRAY,      /* u.array (typed_array) */
+#ifdef CONFIG_BIGNUM
+    JS_CLASS_BIG_INT64_ARRAY,   /* u.array (typed_array) */
+    JS_CLASS_BIG_UINT64_ARRAY,  /* u.array (typed_array) */
+#endif
+    JS_CLASS_FLOAT32_ARRAY,     /* u.array (typed_array) */
+    JS_CLASS_FLOAT64_ARRAY,     /* u.array (typed_array) */
+    JS_CLASS_DATAVIEW,          /* u.typed_array */
+#ifdef CONFIG_BIGNUM
+    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 */
+#endif
+    JS_CLASS_MAP,               /* u.map_state */
+    JS_CLASS_SET,               /* u.map_state */
+    JS_CLASS_WEAKMAP,           /* u.map_state */
+    JS_CLASS_WEAKSET,           /* u.map_state */
+    JS_CLASS_MAP_ITERATOR,      /* u.map_iterator_data */
+    JS_CLASS_SET_ITERATOR,      /* u.map_iterator_data */
+    JS_CLASS_ARRAY_ITERATOR,    /* u.array_iterator_data */
+    JS_CLASS_STRING_ITERATOR,   /* u.array_iterator_data */
+    JS_CLASS_REGEXP_STRING_ITERATOR,   /* u.regexp_string_iterator_data */
+    JS_CLASS_GENERATOR,         /* u.generator_data */
+    JS_CLASS_PROXY,             /* u.proxy_data */
+    JS_CLASS_PROMISE,           /* u.promise_data */
+    JS_CLASS_PROMISE_RESOLVE_FUNCTION,  /* u.promise_function_data */
+    JS_CLASS_PROMISE_REJECT_FUNCTION,   /* u.promise_function_data */
+    JS_CLASS_ASYNC_FUNCTION,            /* u.func */
+    JS_CLASS_ASYNC_FUNCTION_RESOLVE,    /* u.async_function_data */
+    JS_CLASS_ASYNC_FUNCTION_REJECT,     /* u.async_function_data */
+    JS_CLASS_ASYNC_FROM_SYNC_ITERATOR,  /* u.async_from_sync_iterator_data */
+    JS_CLASS_ASYNC_GENERATOR_FUNCTION,  /* u.func */
+    JS_CLASS_ASYNC_GENERATOR,   /* u.async_generator_data */
+
+    JS_CLASS_INIT_COUNT, /* last entry for predefined classes */
+};
+
+/* number of typed array types */
+#define JS_TYPED_ARRAY_COUNT  (JS_CLASS_FLOAT64_ARRAY - JS_CLASS_UINT8C_ARRAY + 1)
+static uint8_t const typed_array_size_log2[JS_TYPED_ARRAY_COUNT];
+#define typed_array_size_log2(classid)  (typed_array_size_log2[(classid)- JS_CLASS_UINT8C_ARRAY])
+
+typedef enum JSErrorEnum {
+    JS_EVAL_ERROR,
+    JS_RANGE_ERROR,
+    JS_REFERENCE_ERROR,
+    JS_SYNTAX_ERROR,
+    JS_TYPE_ERROR,
+    JS_URI_ERROR,
+    JS_INTERNAL_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_STRING_LEN_MAX ((1 << 30) - 1)
+
+#if defined(_WIN32)
+#define __exception /* */
+typedef int64_t ssize_t;
+#else
+#define __exception __attribute__((warn_unused_result))
+#endif
+
+typedef struct JSShape JSShape;
+typedef struct JSString JSString;
+typedef struct JSString JSAtomStruct;
+
+typedef enum {
+    JS_GC_PHASE_NONE,
+    JS_GC_PHASE_DECREF,
+    JS_GC_PHASE_REMOVE_CYCLES,
+} JSGCPhaseEnum;
+
+typedef enum OPCodeEnum OPCodeEnum;
+
+#ifdef CONFIG_BIGNUM
+/* function pointers are used for numeric operations so that it is
+   possible to remove some numeric types */
+typedef struct {
+    JSValue (*to_string)(JSContext *ctx, JSValueConst val);
+    JSValue (*from_string)(JSContext *ctx, const char *buf,
+                           int radix, int flags, slimb_t *pexponent);
+    int (*unary_arith)(JSContext *ctx,
+                       JSValue *pres, OPCodeEnum op, JSValue op1);
+    int (*binary_arith)(JSContext *ctx, OPCodeEnum op,
+                        JSValue *pres, JSValue op1, JSValue op2);
+    int (*compare)(JSContext *ctx, OPCodeEnum op,
+                   JSValue op1, JSValue op2);
+    /* only for bigfloat: */
+    JSValue (*mul_pow10_to_float64)(JSContext *ctx, const bf_t *a,
+                                    int64_t exponent);
+    int (*mul_pow10)(JSContext *ctx, JSValue *sp);
+} JSNumericOperations;
+#endif
+
+struct JSRuntime {
+    JSMallocFunctions mf;
+    JSMallocState malloc_state;
+    const char *rt_info;
+
+    int atom_hash_size; /* power of two */
+    int atom_count;
+    int atom_size;
+    int atom_count_resize; /* resize hash table at this count */
+    uint32_t *atom_hash;
+    JSAtomStruct **atom_array;
+    int atom_free_index; /* 0 = none */
+
+    int class_count;    /* size of class_array */
+    JSClass *class_array;
+
+    struct list_head context_list; /* list of JSContext.link */
+    /* list of JSGCObjectHeader.link. List of allocated GC objects (used
+       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 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
+
+    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;
+    JSModuleLoaderFunc *module_loader_func;
+    void *module_loader_opaque;
+
+    BOOL can_block : 8; /* TRUE if Atomics.wait can block */
+
+    /* Shape hash table */
+    int shape_hash_bits;
+    int shape_hash_size;
+    int shape_hash_count; /* number of hashed shapes */
+    JSShape **shape_hash;
+#ifdef CONFIG_BIGNUM
+    bf_context_t bf_ctx;
+    JSNumericOperations bigint_ops;
+    JSNumericOperations bigfloat_ops;
+    JSNumericOperations bigdecimal_ops;
+#endif
+};
+
+struct JSClass {
+    uint32_t class_id; /* 0 means free entry */
+    JSAtom class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+    JSClassCall *call;
+    /* pointers for exotic behavior, can be NULL if none are present */
+    const JSClassExoticMethods *exotic;
+};
+
+#define JS_MODE_STRICT (1 << 0)
+#define JS_MODE_STRIP  (1 << 1)
+#define JS_MODE_BIGINT (1 << 2)
+#define JS_MODE_MATH   (1 << 3)
+
+typedef struct JSStackFrame {
+    struct JSStackFrame *prev_frame; /* NULL if first stack frame */
+    JSValue cur_func; /* current function, JS_UNDEFINED if the frame is detached */
+    JSValue *arg_buf; /* arguments */
+    JSValue *var_buf; /* variables */
+    struct list_head var_ref_list; /* list of JSVarRef.link */
+    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 */
+    /* only used in generators. Current stack pointer value. NULL if
+       the function is running. */
+    JSValue *cur_sp;
+} JSStackFrame;
+
+typedef enum {
+    JS_GC_OBJ_TYPE_JS_OBJECT,
+    JS_GC_OBJ_TYPE_FUNCTION_BYTECODE,
+    JS_GC_OBJ_TYPE_SHAPE,
+    JS_GC_OBJ_TYPE_VAR_REF,
+    JS_GC_OBJ_TYPE_ASYNC_FUNCTION,
+} JSGCObjectTypeEnum;
+
+/* header for GC objects. GC objects are C data structures with a
+   reference count that can reference other GC objects. JS Objects are
+   a particular type of GC object. */
+struct JSGCObjectHeader {
+    int ref_count; /* must come first, 32-bit */
+    JSGCObjectTypeEnum gc_obj_type : 4;
+    uint8_t mark : 4; /* used by the GC */
+    uint8_t dummy1; /* not used by the GC */
+    uint16_t dummy2; /* not used by the GC */
+    struct list_head link;
+};
+
+typedef struct JSVarRef {
+    union {
+        JSGCObjectHeader header; /* must come first */
+        struct {
+            int __gc_ref_count; /* corresponds to header.ref_count */
+            uint8_t __gc_mark; /* corresponds to header.mark/gc_obj_type */
+
+            /* 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
+            */
+            uint8_t is_detached : 1;
+            uint8_t is_arg : 1;
+            uint16_t var_idx; /* index of the corresponding function variable on
+                                 the stack */
+        };
+    };
+    JSValue *pvalue; /* pointer to the value, either on the stack or
+                        to 'value' */
+    JSValue value; /* used when the variable is no longer on the stack */
+} JSVarRef;
+
+#ifdef CONFIG_BIGNUM
+typedef struct JSFloatEnv {
+    limb_t prec;
+    bf_flags_t flags;
+    unsigned int status;
+} JSFloatEnv;
+
+/* the same structure is used for big integers and big floats. Big
+   integers are never infinite or NaNs */
+typedef struct JSBigFloat {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    bf_t num;
+} JSBigFloat;
+
+typedef struct JSBigDecimal {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    bfdec_t num;
+} JSBigDecimal;
+#endif
+
+/* 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 {
+    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 regexp_ctor;
+    JSValue promise_ctor;
+    JSValue native_error_proto[JS_NATIVE_ERROR_COUNT];
+    JSValue iterator_proto;
+    JSValue async_iterator_proto;
+    JSValue array_proto_values;
+    JSValue throw_type_error;
+    JSValue eval_obj;
+
+    JSValue global_obj; /* global object */
+    JSValue global_var_obj; /* contains the global let/const definitions */
+
+    uint64_t random_state;
+#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 */
+#endif
+    /* when the counter reaches zero, JSRutime.interrupt_handler is called */
+    int interrupt_counter;
+    BOOL is_error_property_enabled;
+
+    struct list_head loaded_modules; /* list of JSModuleDef.link */
+
+    /* if NULL, RegExp compilation is not supported */
+    JSValue (*compile_regexp)(JSContext *ctx, JSValueConst pattern,
+                              JSValueConst flags);
+    /* if NULL, eval is not supported */
+    JSValue (*eval_internal)(JSContext *ctx, JSValueConst this_obj,
+                             const char *input, size_t input_len,
+                             const char *filename, int flags, int scope_idx);
+    void *user_opaque;
+};
+
+typedef union JSFloat64Union {
+    double d;
+    uint64_t u64;
+    uint32_t u32[2];
+} JSFloat64Union;
+
+enum {
+    JS_ATOM_TYPE_STRING = 1,
+    JS_ATOM_TYPE_GLOBAL_SYMBOL,
+    JS_ATOM_TYPE_SYMBOL,
+    JS_ATOM_TYPE_PRIVATE,
+};
+
+enum {
+    JS_ATOM_HASH_SYMBOL,
+    JS_ATOM_HASH_PRIVATE,
+};
+
+typedef enum {
+    JS_ATOM_KIND_STRING,
+    JS_ATOM_KIND_SYMBOL,
+    JS_ATOM_KIND_PRIVATE,
+} JSAtomKindEnum;
+
+#define JS_ATOM_HASH_MASK  ((1 << 30) - 1)
+
+struct JSString {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    uint32_t len : 31;
+    uint8_t is_wide_char : 1; /* 0 = 8 bits, 1 = 16 bits characters */
+    /* for JS_ATOM_TYPE_SYMBOL: hash = 0, atom_type = 3,
+       for JS_ATOM_TYPE_PRIVATE: hash = 1, atom_type = 3
+       XXX: could change encoding to have one more bit in hash */
+    uint32_t hash : 30;
+    uint8_t atom_type : 2; /* != 0 if atom, JS_ATOM_TYPE_x */
+    uint32_t hash_next; /* atom_index for JS_ATOM_TYPE_SYMBOL */
+#ifdef DUMP_LEAKS
+    struct list_head link; /* string list */
+#endif
+    union {
+        uint8_t str8[0]; /* 8 bit strings will get an extra null terminator */
+        uint16_t str16[0];
+    } u;
+};
+
+typedef struct JSClosureVar {
+    uint8_t is_local : 1;
+    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 */
+    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;
+
+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 */
+} JSVarScope;
+
+typedef enum {
+    /* XXX: add more variable kinds here instead of using bit fields */
+    JS_VAR_NORMAL,
+    JS_VAR_FUNCTION_DECL, /* lexical var with function declaration */
+    JS_VAR_NEW_FUNCTION_DECL, /* lexical var with async/generator
+                                 function declaration */
+    JS_VAR_CATCH,
+    JS_VAR_PRIVATE_FIELD,
+    JS_VAR_PRIVATE_METHOD,
+    JS_VAR_PRIVATE_GETTER,
+    JS_VAR_PRIVATE_SETTER, /* must come after JS_VAR_PRIVATE_GETTER */
+    JS_VAR_PRIVATE_GETTER_SETTER, /* must come after JS_VAR_PRIVATE_SETTER */
+} JSVarKindEnum;
+
+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 */
+    uint8_t is_const : 1;
+    uint8_t is_lexical : 1;
+    uint8_t is_captured : 1;
+    uint8_t var_kind : 4; /* see JSVarKindEnum */
+    /* only used during compilation: function pool index for lexical
+       variables with var_kind =
+       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 */
+} JSVarDef;
+
+/* for the encoding of the pc2line table */
+#define PC2LINE_BASE     (-1)
+#define PC2LINE_RANGE    5
+#define PC2LINE_OP_FIRST 1
+#define PC2LINE_DIFF_PC_MAX ((255 - PC2LINE_OP_FIRST) / PC2LINE_RANGE)
+
+typedef enum JSFunctionKindEnum {
+    JS_FUNC_NORMAL = 0,
+    JS_FUNC_GENERATOR = (1 << 0),
+    JS_FUNC_ASYNC = (1 << 1),
+    JS_FUNC_ASYNC_GENERATOR = (JS_FUNC_GENERATOR | JS_FUNC_ASYNC),
+} JSFunctionKindEnum;
+
+typedef struct JSFunctionBytecode {
+    JSGCObjectHeader header; /* must come first */
+    uint8_t js_mode;
+    uint8_t has_prototype : 1; /* true if a prototype field is necessary */
+    uint8_t has_simple_parameter_list : 1;
+    uint8_t is_derived_class_constructor : 1;
+    /* true if home_object needs to be initialized */
+    uint8_t need_home_object : 1;
+    uint8_t func_kind : 2;
+    uint8_t new_target_allowed : 1;
+    uint8_t super_call_allowed : 1;
+    uint8_t super_allowed : 1;
+    uint8_t arguments_allowed : 1;
+    uint8_t has_debug : 1;
+    uint8_t backtrace_barrier : 1; /* stop backtrace on this function */
+    uint8_t read_only_bytecode : 1;
+    /* XXX: 4 bits available */
+    uint8_t *byte_code_buf; /* (self pointer) */
+    int byte_code_len;
+    JSAtom func_name;
+    JSVarDef *vardefs; /* arguments + local variables (arg_count + var_count) (self pointer) */
+    JSClosureVar *closure_var; /* list of variables in the closure (self pointer) */
+    uint16_t arg_count;
+    uint16_t var_count;
+    uint16_t defined_arg_count; /* for length function property */
+    uint16_t stack_size; /* maximum stack size */
+    JSValue *cpool; /* constant pool (self pointer) */
+    int cpool_count;
+    int closure_var_count;
+    struct {
+        /* debug info, move to separate structure to save memory? */
+        JSAtom filename;
+        int line_num;
+        int source_len;
+        int pc2line_len;
+        uint8_t *pc2line_buf;
+        char *source;
+    } debug;
+} JSFunctionBytecode;
+
+typedef struct JSBoundFunction {
+    JSValue func_obj;
+    JSValue this_val;
+    int argc;
+    JSValue argv[0];
+} JSBoundFunction;
+
+typedef enum JSIteratorKindEnum {
+    JS_ITERATOR_KIND_KEY,
+    JS_ITERATOR_KIND_VALUE,
+    JS_ITERATOR_KIND_KEY_AND_VALUE,
+} JSIteratorKindEnum;
+
+typedef struct JSForInIterator {
+    JSValue obj;
+    BOOL is_array;
+    uint32_t array_length;
+    uint32_t idx;
+} JSForInIterator;
+
+typedef struct JSRegExp {
+    JSString *pattern;
+    JSString *bytecode; /* also contains the flags */
+} JSRegExp;
+
+typedef struct JSProxyData {
+    JSValue target;
+    JSValue handler;
+    JSValue proto;
+    uint8_t is_func;
+    uint8_t is_revoked;
+} JSProxyData;
+
+typedef struct JSArrayBuffer {
+    int byte_length; /* 0 if detached */
+    uint8_t detached;
+    uint8_t shared; /* if shared, the array buffer cannot be detached */
+    uint8_t *data; /* NULL if detached */
+    struct list_head array_list;
+    void *opaque;
+    JSFreeArrayBufferDataFunc *free_func;
+} JSArrayBuffer;
+
+typedef struct JSTypedArray {
+    struct list_head link; /* link to arraybuffer */
+    JSObject *obj; /* back pointer to the TypedArray/DataView object */
+    JSObject *buffer; /* based array buffer */
+    uint32_t offset; /* offset in the array buffer */
+    uint32_t length; /* length in the array buffer */
+} JSTypedArray;
+
+typedef struct JSAsyncFunctionState {
+    JSValue this_val; /* 'this' generator argument */
+    int argc; /* number of function arguments */
+    BOOL throw_flag; /* used to throw an exception in JS_CallInternal() */
+    JSStackFrame frame;
+} JSAsyncFunctionState;
+
+/* XXX: could use an object instead to avoid the
+   JS_TAG_ASYNC_FUNCTION tag for the GC */
+typedef struct JSAsyncFunctionData {
+    JSGCObjectHeader header; /* must come first */
+    JSValue resolving_funcs[2];
+    BOOL is_active; /* true if the async function state is valid */
+    JSAsyncFunctionState func_state;
+} JSAsyncFunctionData;
+
+typedef struct JSReqModuleEntry {
+    JSAtom module_name;
+    JSModuleDef *module; /* used using resolution */
+} JSReqModuleEntry;
+
+typedef enum JSExportTypeEnum {
+    JS_EXPORT_TYPE_LOCAL,
+    JS_EXPORT_TYPE_INDIRECT,
+} JSExportTypeEnum;
+
+typedef struct JSExportEntry {
+    union {
+        struct {
+            int var_idx; /* closure variable index */
+            JSVarRef *var_ref; /* if != NULL, reference to the variable */
+        } local; /* for local export */
+        int req_module_idx; /* module for indirect export */
+    } u;
+    JSExportTypeEnum export_type;
+    JSAtom local_name; /* '*' if export ns from. not used for local
+                          export after compilation */
+    JSAtom export_name; /* exported variable name */
+} JSExportEntry;
+
+typedef struct JSStarExportEntry {
+    int req_module_idx; /* in req_module_entries */
+} JSStarExportEntry;
+
+typedef struct JSImportEntry {
+    int var_idx; /* closure variable index */
+    JSAtom import_name;
+    int req_module_idx; /* in req_module_entries */
+} JSImportEntry;
+
+struct JSModuleDef {
+    JSRefCountHeader header; /* must come first, 32-bit */
+    JSAtom module_name;
+    struct list_head link;
+
+    JSReqModuleEntry *req_module_entries;
+    int req_module_entries_count;
+    int req_module_entries_size;
+
+    JSExportEntry *export_entries;
+    int export_entries_count;
+    int export_entries_size;
+
+    JSStarExportEntry *star_export_entries;
+    int star_export_entries_count;
+    int star_export_entries_size;
+
+    JSImportEntry *import_entries;
+    int import_entries_count;
+    int import_entries_size;
+
+    JSValue module_ns;
+    JSValue func_obj; /* only used for JS modules */
+    JSModuleInitFunc *init_func; /* only used for C modules */
+    BOOL resolved : 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;
+    JSValue eval_exception;
+    JSValue meta_obj; /* for import.meta */
+};
+
+typedef struct JSJobEntry {
+    struct list_head link;
+    JSContext *ctx;
+    JSJobFunc *job_func;
+    int argc;
+    JSValue argv[0];
+} JSJobEntry;
+
+typedef struct JSProperty {
+    union {
+        JSValue value;      /* JS_PROP_NORMAL */
+        struct {            /* JS_PROP_GETSET */
+            JSObject *getter; /* NULL if undefined */
+            JSObject *setter; /* NULL if undefined */
+        } getset;
+        JSVarRef *var_ref;  /* JS_PROP_VARREF */
+        struct {            /* JS_PROP_AUTOINIT */
+            int (*init_func)(JSContext *ctx, JSObject *obj,
+                             JSAtom prop, void *opaque);
+            void *opaque;
+        } init;
+    } u;
+} JSProperty;
+
+#define JS_PROP_INITIAL_SIZE 2
+#define JS_PROP_INITIAL_HASH_SIZE 4 /* must be a power of two */
+#define JS_ARRAY_INITIAL_SIZE 2
+
+typedef struct JSShapeProperty {
+    uint32_t hash_next : 26; /* 0 if last in list */
+    uint32_t flags : 6;   /* JS_PROP_XXX */
+    JSAtom atom; /* JS_ATOM_NULL = free property entry */
+} 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
+    /* true if the shape is inserted in the shape hash table. If not,
+       JSShape.hash is not valid */
+    uint8_t is_hashed;
+    /* If true, the shape may have small array index properties 'n' with 0
+       <= n <= 2^31-1. If false, the shape is guaranteed not to have
+       small array index properties */
+    uint8_t has_small_array_index;
+    uint32_t hash; /* current hash value */
+    uint32_t prop_hash_mask;
+    int prop_size; /* allocated properties */
+    int 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 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() */
+            uint16_t class_id; /* see JS_CLASS_x */
+        };
+    };
+    /* byte offsets: 16/24 */
+    JSShape *shape; /* prototype and property names + flag */
+    JSProperty *prop; /* array of properties */
+    /* byte offsets: 24/40 */
+    struct JSMapRecord *first_weak_ref; /* XXX: use a bit and an external hash table? */
+    /* byte offsets: 28/48 */
+    union {
+        void *opaque;
+        struct JSBoundFunction *bound_function; /* JS_CLASS_BOUND_FUNCTION */
+        struct JSCFunctionDataRecord *c_function_data_record; /* JS_CLASS_C_FUNCTION_DATA */
+        struct JSForInIterator *for_in_iterator; /* JS_CLASS_FOR_IN_ITERATOR */
+        struct JSArrayBuffer *array_buffer; /* JS_CLASS_ARRAY_BUFFER, JS_CLASS_SHARED_ARRAY_BUFFER */
+        struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_DATAVIEW */
+#ifdef CONFIG_BIGNUM
+        struct JSFloatEnv *float_env; /* JS_CLASS_FLOAT_ENV */
+#endif
+        struct JSMapState *map_state;   /* JS_CLASS_MAP..JS_CLASS_WEAKSET */
+        struct JSMapIteratorData *map_iterator_data; /* JS_CLASS_MAP_ITERATOR, JS_CLASS_SET_ITERATOR */
+        struct JSArrayIteratorData *array_iterator_data; /* JS_CLASS_ARRAY_ITERATOR, JS_CLASS_STRING_ITERATOR */
+        struct JSRegExpStringIteratorData *regexp_string_iterator_data; /* JS_CLASS_REGEXP_STRING_ITERATOR */
+        struct JSGeneratorData *generator_data; /* JS_CLASS_GENERATOR */
+        struct JSProxyData *proxy_data; /* JS_CLASS_PROXY */
+        struct JSPromiseData *promise_data; /* JS_CLASS_PROMISE */
+        struct JSPromiseFunctionData *promise_function_data; /* JS_CLASS_PROMISE_RESOLVE_FUNCTION, JS_CLASS_PROMISE_REJECT_FUNCTION */
+        struct JSAsyncFunctionData *async_function_data; /* JS_CLASS_ASYNC_FUNCTION_RESOLVE, JS_CLASS_ASYNC_FUNCTION_REJECT */
+        struct JSAsyncFromSyncIteratorData *async_from_sync_iterator_data; /* JS_CLASS_ASYNC_FROM_SYNC_ITERATOR */
+        struct JSAsyncGeneratorData *async_generator_data; /* JS_CLASS_ASYNC_GENERATOR */
+        struct { /* JS_CLASS_BYTECODE_FUNCTION: 12/24 bytes */
+            /* also used by JS_CLASS_GENERATOR_FUNCTION, JS_CLASS_ASYNC_FUNCTION and JS_CLASS_ASYNC_GENERATOR_FUNCTION */
+            struct JSFunctionBytecode *function_bytecode;
+            JSVarRef **var_refs;
+            JSObject *home_object; /* for 'super' access */
+        } func;
+        struct { /* JS_CLASS_C_FUNCTION: 8/12 bytes */
+            JSCFunctionType c_function;
+            uint8_t length;
+            uint8_t cproto;
+            int16_t magic;
+        } cfunc;
+        /* array part for fast arrays and typed arrays */
+        struct { /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS, JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
+            union {
+                uint32_t size;          /* JS_CLASS_ARRAY, JS_CLASS_ARGUMENTS */
+                struct JSTypedArray *typed_array; /* JS_CLASS_UINT8C_ARRAY..JS_CLASS_FLOAT64_ARRAY */
+            } u1;
+            union {
+                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 */
+                int16_t *int16_ptr;     /* JS_CLASS_INT16_ARRAY */
+                uint16_t *uint16_ptr;   /* JS_CLASS_UINT16_ARRAY */
+                int32_t *int32_ptr;     /* JS_CLASS_INT32_ARRAY */
+                uint32_t *uint32_ptr;   /* JS_CLASS_UINT32_ARRAY */
+                int64_t *int64_ptr;     /* JS_CLASS_INT64_ARRAY */
+                uint64_t *uint64_ptr;   /* JS_CLASS_UINT64_ARRAY */
+                float *float_ptr;       /* JS_CLASS_FLOAT32_ARRAY */
+                double *double_ptr;     /* JS_CLASS_FLOAT64_ARRAY */
+            } u;
+            uint32_t count; /* <= 2^31-1. 0 for a detached typed array */
+        } array;    /* 12/20 bytes */
+        JSRegExp regexp;    /* JS_CLASS_REGEXP: 8/16 bytes */
+        JSValue object_data;    /* for JS_SetObjectData(): 8/16/16 bytes */
+    } u;
+    /* byte sizes: 40/48/72 */
+};
+enum {
+    JS_ATOM_NULL,
+#define DEF(name, str) JS_ATOM_ ## name,
+#include "quickjs-atom.h"
+#undef DEF
+    JS_ATOM_END,
+};
+#define JS_ATOM_LAST_KEYWORD JS_ATOM_super
+#define JS_ATOM_LAST_STRICT_KEYWORD JS_ATOM_yield
+
+static const char js_atom_init[] =
+#define DEF(name, str) str "\0"
+#include "quickjs-atom.h"
+#undef DEF
+;
+
+typedef enum OPCodeFormat {
+#define FMT(f) OP_FMT_ ## f,
+#define DEF(id, size, n_pop, n_push, f)
+#include "quickjs-opcode.h"
+#undef DEF
+#undef FMT
+} OPCodeFormat;
+
+enum OPCodeEnum {
+#define FMT(f)
+#define DEF(id, size, n_pop, n_push, f) OP_ ## id,
+#define def(id, size, n_pop, n_push, f)
+#include "quickjs-opcode.h"
+#undef def
+#undef DEF
+#undef FMT
+    OP_COUNT, /* excluding temporary opcodes */
+    /* temporary opcodes : overlap with the short opcodes */
+    OP_TEMP_START = OP_nop + 1,
+    OP___dummy = OP_TEMP_START - 1,
+#define FMT(f)
+#define DEF(id, size, n_pop, n_push, f)
+#define def(id, size, n_pop, n_push, f) OP_ ## id,
+#include "quickjs-opcode.h"
+#undef def
+#undef DEF
+#undef FMT
+    OP_TEMP_END,
+};
+
+static int JS_InitAtoms(JSRuntime *rt);
+static JSAtom __JS_NewAtomInit(JSRuntime *rt, const char *str, int len,
+                               int atom_type);
+static void JS_FreeAtomStruct(JSRuntime *rt, JSAtomStruct *p);
+static void free_function_bytecode(JSRuntime *rt, JSFunctionBytecode *b);
+static JSValue js_call_c_function(JSContext *ctx, JSValueConst func_obj,
+                                  JSValueConst this_obj,
+                                  int argc, JSValueConst *argv, int flags);
+static JSValue js_call_bound_function(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags);
+static JSValue JS_CallInternal(JSContext *ctx, JSValueConst func_obj,
+                               JSValueConst this_obj, JSValueConst new_target,
+                               int argc, JSValue *argv, int flags);
+static JSValue JS_CallConstructorInternal(JSContext *ctx,
+                                          JSValueConst func_obj,
+                                          JSValueConst new_target,
+                                          int argc, JSValue *argv, int flags);
+static JSValue JS_CallFree(JSContext *ctx, JSValue func_obj, JSValueConst this_obj,
+                           int argc, JSValueConst *argv);
+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);
+static JSValue JS_EvalObject(JSContext *ctx, JSValueConst this_obj,
+                             JSValueConst val, int flags, int scope_idx);
+#if defined(_MSC_VER)
+JSValue JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...);
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...);
+#endif
+static __maybe_unused void JS_DumpAtoms(JSRuntime *rt);
+static __maybe_unused void JS_DumpString(JSRuntime *rt,
+                                                  const JSString *p);
+static __maybe_unused void JS_DumpObjectHeader(JSRuntime *rt);
+static __maybe_unused void JS_DumpObject(JSRuntime *rt, JSObject *p);
+static __maybe_unused void JS_DumpGCObject(JSRuntime *rt, JSGCObjectHeader *p);
+static __maybe_unused void JS_DumpValueShort(JSRuntime *rt,
+                                                      JSValueConst val);
+static __maybe_unused void JS_DumpValue(JSContext *ctx, JSValueConst val);
+static __maybe_unused void JS_PrintValue(JSContext *ctx,
+                                                  const char *str,
+                                                  JSValueConst val);
+static __maybe_unused void JS_DumpShapes(JSRuntime *rt);
+static JSValue js_function_apply(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic);
+static void js_array_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_mark(JSRuntime *rt, JSValueConst val,
+                          JS_MarkFunc *mark_func);
+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_bytecode_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_bytecode_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_bound_function_finalizer(JSRuntime *rt, JSValue val);
+static void js_bound_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_for_in_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_for_in_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_regexp_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_buffer_finalizer(JSRuntime *rt, JSValue val);
+static void js_typed_array_finalizer(JSRuntime *rt, JSValue val);
+static void js_typed_array_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_proxy_finalizer(JSRuntime *rt, JSValue val);
+static void js_proxy_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_map_finalizer(JSRuntime *rt, JSValue val);
+static void js_map_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_map_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_map_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_array_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_array_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_regexp_string_iterator_finalizer(JSRuntime *rt, JSValue val);
+static void js_regexp_string_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_generator_finalizer(JSRuntime *rt, JSValue obj);
+static void js_generator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+static void js_promise_finalizer(JSRuntime *rt, JSValue val);
+static void js_promise_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func);
+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);
+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);
+static int JS_ToFloat64Free(JSContext *ctx, double *pres, JSValue val);
+static int JS_ToUint8ClampFree(JSContext *ctx, int32_t *pres, JSValue val);
+static JSValue js_compile_regexp(JSContext *ctx, JSValueConst pattern,
+                                 JSValueConst flags);
+static JSValue js_regexp_constructor_internal(JSContext *ctx, JSValueConst ctor,
+                                              JSValue pattern, JSValue bc);
+static void gc_decref(JSRuntime *rt);
+static int JS_NewClass1(JSRuntime *rt, JSClassID class_id,
+                        const JSClassDef *class_def, JSAtom name);
+
+typedef enum JSStrictEqModeEnum {
+    JS_EQ_STRICT,
+    JS_EQ_SAME_VALUE,
+    JS_EQ_SAME_VALUE_ZERO,
+} JSStrictEqModeEnum;
+
+static BOOL js_strict_eq2(JSContext *ctx, JSValue op1, JSValue op2,
+                          JSStrictEqModeEnum eq_mode);
+static BOOL js_strict_eq(JSContext *ctx, JSValue op1, JSValue op2);
+static BOOL js_same_value(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+static BOOL js_same_value_zero(JSContext *ctx, JSValueConst op1, JSValueConst op2);
+static JSValue JS_ToObject(JSContext *ctx, JSValueConst val);
+static JSValue JS_ToObjectFree(JSContext *ctx, JSValue val);
+static JSProperty *add_property(JSContext *ctx,
+                                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 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);
+static bf_t *JS_ToBigFloat(JSContext *ctx, bf_t *buf, JSValueConst val);
+static JSValue JS_ToBigDecimalFree(JSContext *ctx, JSValue val,
+                                   BOOL allow_null_or_undefined);
+static bfdec_t *JS_ToBigDecimal(JSContext *ctx, JSValueConst val);
+#endif
+JSValue JS_ThrowOutOfMemory(JSContext *ctx);
+static JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx);
+static JSValueConst 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);
+static int js_proxy_preventExtensions(JSContext *ctx, JSValueConst obj);
+static int js_proxy_isArray(JSContext *ctx, JSValueConst obj);
+static int JS_CreateProperty(JSContext *ctx, JSObject *p,
+                             JSAtom prop, JSValueConst val,
+                             JSValueConst getter, JSValueConst setter,
+                             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 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);
+static JSVarRef *get_var_ref(JSContext *ctx, JSStackFrame *sf, int var_idx,
+                             BOOL is_arg);
+static JSValue js_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int flags);
+static void js_async_function_resolve_finalizer(JSRuntime *rt, JSValue val);
+static void js_async_function_resolve_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func);
+static JSValue JS_EvalInternal(JSContext *ctx, JSValueConst this_obj,
+                               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 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);
+static JSValue js_new_promise_capability(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst ctor);
+static __exception int perform_promise_then(JSContext *ctx,
+                                            JSValueConst promise,
+                                            JSValueConst *resolve_reject,
+                                            JSValueConst *cap_resolving_funcs);
+static JSValue js_promise_resolve(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic);
+static int js_string_compare(JSContext *ctx,
+                             const JSString *p1, const JSString *p2);
+static JSValue JS_ToNumber(JSContext *ctx, JSValueConst val);
+static int JS_SetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                               JSValue prop, JSValue val, int flags);
+static int JS_NumberIsInteger(JSContext *ctx, JSValueConst val);
+static BOOL JS_NumberIsNegativeOrMinusZero(JSContext *ctx, JSValueConst val);
+static JSValue JS_ToNumberFree(JSContext *ctx, JSValue val);
+static int JS_GetOwnPropertyInternal(JSContext *ctx, JSPropertyDescriptor *desc,
+                                     JSObject *p, JSAtom prop);
+static void js_free_desc(JSContext *ctx, JSPropertyDescriptor *desc);
+static void async_func_mark(JSRuntime *rt, JSAsyncFunctionState *s,
+                            JS_MarkFunc *mark_func);
+static void JS_AddIntrinsicBasicObjects(JSContext *ctx);
+static void js_free_shape(JSRuntime *rt, JSShape *sh);
+static void js_free_shape_null(JSRuntime *rt, JSShape *sh);
+static int js_shape_prepare_update(JSContext *ctx, JSObject *p,
+                                   JSShapeProperty **pprs);
+static int init_shape_hash(JSRuntime *rt);
+static __exception int js_get_length32(JSContext *ctx, uint32_t *pres,
+                                       JSValueConst obj);
+static __exception int js_get_length64(JSContext *ctx, int64_t *pres,
+                                       JSValueConst obj);
+static void free_arg_list(JSContext *ctx, JSValue *tab, uint32_t len);
+static JSValue *build_arg_list(JSContext *ctx, uint32_t *plen,
+                               JSValueConst array_arg);
+static BOOL js_get_fast_array(JSContext *ctx, JSValueConst obj,
+                              JSValue **arrpp, uint32_t *countp);
+static JSValue JS_CreateAsyncFromSyncIterator(JSContext *ctx,
+                                              JSValueConst sync_iter);
+static void js_c_function_data_finalizer(JSRuntime *rt, JSValue val);
+static void js_c_function_data_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func);
+static JSValue js_c_function_data_call(JSContext *ctx, JSValueConst func_obj,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv, int flags);
+static JSAtom js_symbol_to_atom(JSContext *ctx, JSValue val);
+static void add_gc_object(JSRuntime *rt, JSGCObjectHeader *h,
+                          JSGCObjectTypeEnum type);
+static void remove_gc_object(JSGCObjectHeader *h);
+static void js_async_function_free0(JSRuntime *rt, JSAsyncFunctionData *s);
+
+static const JSClassExoticMethods js_arguments_exotic_methods;
+static const JSClassExoticMethods js_string_exotic_methods;
+static const JSClassExoticMethods js_proxy_exotic_methods;
+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;
+#ifdef FORCE_GC_AT_MALLOC
+    force_gc = TRUE;
+#else
+    force_gc = ((rt->malloc_state.malloc_size + size) >
+                rt->malloc_gc_threshold);
+#endif
+    if (force_gc) {
+#ifdef DUMP_GC
+        printf("GC: size=%" PRIu64 "\n",
+               (uint64_t)rt->malloc_state.malloc_size);
+#endif
+        JS_RunGC(rt);
+        rt->malloc_gc_threshold = rt->malloc_state.malloc_size +
+            (rt->malloc_state.malloc_size >> 1);
+    }
+}
+
+static size_t js_malloc_usable_size_unknown(const void *ptr)
+{
+    return 0;
+}
+
+void *js_malloc_rt(JSRuntime *rt, size_t size)
+{
+    return rt->mf.js_malloc(&rt->malloc_state, size);
+}
+
+void js_free_rt(JSRuntime *rt, void *ptr)
+{
+    rt->mf.js_free(&rt->malloc_state, ptr);
+}
+
+void *js_realloc_rt(JSRuntime *rt, void *ptr, size_t size)
+{
+    return rt->mf.js_realloc(&rt->malloc_state, ptr, size);
+}
+
+size_t js_malloc_usable_size_rt(JSRuntime *rt, const void *ptr)
+{
+    return rt->mf.js_malloc_usable_size(ptr);
+}
+
+void *js_mallocz_rt(JSRuntime *rt, size_t size)
+{
+    void *ptr;
+    ptr = js_malloc_rt(rt, size);
+    if (!ptr)
+        return NULL;
+    return memset(ptr, 0, size);
+}
+
+#ifdef CONFIG_BIGNUM
+/* called by libbf */
+static void *js_bf_realloc(void *opaque, void *ptr, size_t size)
+{
+    JSRuntime *rt = opaque;
+    return js_realloc_rt(rt, ptr, size);
+}
+#endif /* CONFIG_BIGNUM */
+
+/* Throw out of memory in case of error */
+void *js_malloc(JSContext *ctx, size_t size)
+{
+    void *ptr;
+    ptr = js_malloc_rt(ctx->rt, size);
+    if (unlikely(!ptr)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ptr;
+}
+
+/* Throw out of memory in case of error */
+void *js_mallocz(JSContext *ctx, size_t size)
+{
+    void *ptr;
+    ptr = js_mallocz_rt(ctx->rt, size);
+    if (unlikely(!ptr)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ptr;
+}
+
+void js_free(JSContext *ctx, void *ptr)
+{
+    js_free_rt(ctx->rt, ptr);
+}
+
+/* Throw out of memory in case of error */
+void *js_realloc(JSContext *ctx, void *ptr, size_t size)
+{
+    void *ret;
+    ret = js_realloc_rt(ctx->rt, ptr, size);
+    if (unlikely(!ret && size != 0)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return ret;
+}
+
+/* store extra allocated size in *pslack if successful */
+void *js_realloc2(JSContext *ctx, void *ptr, size_t size, size_t *pslack)
+{
+    void *ret;
+    ret = js_realloc_rt(ctx->rt, ptr, size);
+    if (unlikely(!ret && size != 0)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    if (pslack) {
+        size_t new_size = js_malloc_usable_size_rt(ctx->rt, ret);
+        *pslack = (new_size > size) ? new_size - size : 0;
+    }
+    return ret;
+}
+
+size_t js_malloc_usable_size(JSContext *ctx, const void *ptr)
+{
+    return js_malloc_usable_size_rt(ctx->rt, ptr);
+}
+
+/* Throw out of memory exception in case of error */
+char *js_strndup(JSContext *ctx, const char *s, size_t n)
+{
+    char *ptr;
+    ptr = js_malloc(ctx, n + 1);
+    if (ptr) {
+        memcpy(ptr, s, n);
+        ptr[n] = '\0';
+    }
+    return ptr;
+}
+
+char *js_strdup(JSContext *ctx, const char *str)
+{
+    return js_strndup(ctx, str, strlen(str));
+}
+
+static inline void js_dbuf_init(JSContext *ctx, DynBuf *s)
+{
+    dbuf_init2(s, ctx->rt, (DynBufReallocFunc *)js_realloc_rt);
+}
+
+static inline int is_digit(int c) {
+    return c >= '0' && c <= '9';
+}
+
+typedef struct JSClassShortDef {
+    JSAtom class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+} JSClassShortDef;
+
+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_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 */
+    { JS_ATOM_Symbol, js_object_data_finalizer, js_object_data_mark }, /* JS_CLASS_SYMBOL */
+    { JS_ATOM_Arguments, js_array_finalizer, js_array_mark },   /* JS_CLASS_ARGUMENTS */
+    { 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_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 */
+    { JS_ATOM_GeneratorFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_GENERATOR_FUNCTION */
+    { JS_ATOM_ForInIterator, js_for_in_iterator_finalizer, js_for_in_iterator_mark },      /* JS_CLASS_FOR_IN_ITERATOR */
+    { JS_ATOM_RegExp, js_regexp_finalizer, NULL },                              /* JS_CLASS_REGEXP */
+    { JS_ATOM_ArrayBuffer, js_array_buffer_finalizer, NULL },                   /* JS_CLASS_ARRAY_BUFFER */
+    { JS_ATOM_SharedArrayBuffer, js_array_buffer_finalizer, NULL },             /* JS_CLASS_SHARED_ARRAY_BUFFER */
+    { JS_ATOM_Uint8ClampedArray, js_typed_array_finalizer, js_typed_array_mark }, /* JS_CLASS_UINT8C_ARRAY */
+    { JS_ATOM_Int8Array, js_typed_array_finalizer, js_typed_array_mark },       /* JS_CLASS_INT8_ARRAY */
+    { JS_ATOM_Uint8Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_UINT8_ARRAY */
+    { JS_ATOM_Int16Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_INT16_ARRAY */
+    { JS_ATOM_Uint16Array, js_typed_array_finalizer, js_typed_array_mark },     /* JS_CLASS_UINT16_ARRAY */
+    { JS_ATOM_Int32Array, js_typed_array_finalizer, js_typed_array_mark },      /* JS_CLASS_INT32_ARRAY */
+    { JS_ATOM_Uint32Array, js_typed_array_finalizer, js_typed_array_mark },     /* JS_CLASS_UINT32_ARRAY */
+#ifdef CONFIG_BIGNUM
+    { JS_ATOM_BigInt64Array, js_typed_array_finalizer, js_typed_array_mark },   /* JS_CLASS_BIG_INT64_ARRAY */
+    { JS_ATOM_BigUint64Array, js_typed_array_finalizer, js_typed_array_mark },  /* JS_CLASS_BIG_UINT64_ARRAY */
+#endif
+    { JS_ATOM_Float32Array, js_typed_array_finalizer, js_typed_array_mark },    /* JS_CLASS_FLOAT32_ARRAY */
+    { JS_ATOM_Float64Array, js_typed_array_finalizer, js_typed_array_mark },    /* JS_CLASS_FLOAT64_ARRAY */
+    { JS_ATOM_DataView, js_typed_array_finalizer, js_typed_array_mark },        /* JS_CLASS_DATAVIEW */
+#ifdef CONFIG_BIGNUM
+    { JS_ATOM_BigInt, js_object_data_finalizer, js_object_data_mark },      /* JS_CLASS_BIG_INT */
+    { 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 */
+#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 */
+    { JS_ATOM_WeakMap, js_map_finalizer, js_map_mark },         /* JS_CLASS_WEAKMAP */
+    { JS_ATOM_WeakSet, js_map_finalizer, js_map_mark },         /* JS_CLASS_WEAKSET */
+    { JS_ATOM_Map_Iterator, js_map_iterator_finalizer, js_map_iterator_mark }, /* JS_CLASS_MAP_ITERATOR */
+    { 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_Generator, js_generator_finalizer, js_generator_mark }, /* JS_CLASS_GENERATOR */
+};
+
+static int init_class_range(JSRuntime *rt, JSClassShortDef const *tab,
+                            int start, int count)
+{
+    JSClassDef cm_s, *cm = &cm_s;
+    int i, class_id;
+
+    for(i = 0; i < count; i++) {
+        class_id = i + start;
+        memset(cm, 0, sizeof(*cm));
+        cm->finalizer = tab[i].finalizer;
+        cm->gc_mark = tab[i].gc_mark;
+        if (JS_NewClass1(rt, class_id, cm, tab[i].class_name) < 0)
+            return -1;
+    }
+    return 0;
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue JS_ThrowUnsupportedOperation(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "unsupported operation");
+}
+
+static JSValue invalid_to_string(JSContext *ctx, JSValueConst val)
+{
+    return JS_ThrowUnsupportedOperation(ctx);
+}
+
+static JSValue invalid_from_string(JSContext *ctx, const char *buf,
+                                   int radix, int flags, slimb_t *pexponent)
+{
+    return JS_NAN;
+}
+
+static int invalid_unary_arith(JSContext *ctx,
+                               JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    JS_FreeValue(ctx, op1);
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static int invalid_binary_arith(JSContext *ctx, OPCodeEnum op,
+                                JSValue *pres, JSValue op1, JSValue op2)
+{
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static JSValue invalid_mul_pow10_to_float64(JSContext *ctx, const bf_t *a,
+                                            int64_t exponent)
+{
+    return JS_ThrowUnsupportedOperation(ctx);
+}
+
+static int invalid_mul_pow10(JSContext *ctx, JSValue *sp)
+{
+    JS_ThrowUnsupportedOperation(ctx);
+    return -1;
+}
+
+static void set_dummy_numeric_ops(JSNumericOperations *ops)
+{
+    ops->to_string = invalid_to_string;
+    ops->from_string = invalid_from_string;
+    ops->unary_arith = invalid_unary_arith;
+    ops->binary_arith = invalid_binary_arith;
+    ops->mul_pow10_to_float64 = invalid_mul_pow10_to_float64;
+    ops->mul_pow10 = invalid_mul_pow10;
+}
+
+#endif /* CONFIG_BIGNUM */
+
+JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque)
+{
+    JSRuntime *rt;
+    JSMallocState ms;
+
+    memset(&ms, 0, sizeof(ms));
+    ms.opaque = opaque;
+    ms.malloc_limit = -1;
+
+    rt = mf->js_malloc(&ms, sizeof(JSRuntime));
+    if (!rt)
+        return NULL;
+    memset(rt, 0, sizeof(*rt));
+    rt->mf = *mf;
+    if (!rt->mf.js_malloc_usable_size) {
+        /* use dummy function if none provided */
+        rt->mf.js_malloc_usable_size = js_malloc_usable_size_unknown;
+    }
+    rt->malloc_state = ms;
+    rt->malloc_gc_threshold = 256 * 1024;
+
+#ifdef CONFIG_BIGNUM
+    bf_context_init(&rt->bf_ctx, js_bf_realloc, rt);
+    set_dummy_numeric_ops(&rt->bigint_ops);
+    set_dummy_numeric_ops(&rt->bigfloat_ops);
+    set_dummy_numeric_ops(&rt->bigdecimal_ops);
+#endif
+
+    init_list_head(&rt->context_list);
+    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
+    init_list_head(&rt->job_list);
+
+    if (JS_InitAtoms(rt))
+        goto fail;
+
+    /* create the object, array and function classes */
+    if (init_class_range(rt, js_std_class_def, JS_CLASS_OBJECT,
+                         countof(js_std_class_def)) < 0)
+        goto fail;
+    rt->class_array[JS_CLASS_ARGUMENTS].exotic = &js_arguments_exotic_methods;
+    rt->class_array[JS_CLASS_STRING].exotic = &js_string_exotic_methods;
+    rt->class_array[JS_CLASS_MODULE_NS].exotic = &js_module_ns_exotic_methods;
+
+    rt->class_array[JS_CLASS_C_FUNCTION].call = js_call_c_function;
+    rt->class_array[JS_CLASS_C_FUNCTION_DATA].call = js_c_function_data_call;
+    rt->class_array[JS_CLASS_BOUND_FUNCTION].call = js_call_bound_function;
+    rt->class_array[JS_CLASS_GENERATOR_FUNCTION].call = js_generator_function_call;
+    if (init_shape_hash(rt))
+        goto fail;
+    return rt;
+ fail:
+    JS_FreeRuntime(rt);
+    return NULL;
+}
+
+/* default memory allocation functions with memory limitation */
+static inline size_t js_def_malloc_usable_size(void *ptr)
+{
+#if defined(__APPLE__)
+    return malloc_size(ptr);
+#elif defined(_WIN32)
+    return _msize(ptr);
+#elif defined(EMSCRIPTEN)
+    return 0;
+#elif defined(__linux__) || defined(__NX__)
+    return malloc_usable_size(ptr);
+#else
+    /* change this to `return 0;` if compilation fails */
+    return malloc_usable_size(ptr);
+#endif
+}
+
+static void *js_def_malloc(JSMallocState *s, size_t size)
+{
+    void *ptr;
+
+    /* Do not allocate zero bytes: behavior is platform dependent */
+    assert(size != 0);
+
+    if (unlikely(s->malloc_size + size > s->malloc_limit))
+        return NULL;
+
+    ptr = malloc(size);
+    if (!ptr)
+        return NULL;
+
+    s->malloc_count++;
+    s->malloc_size += js_def_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
+    return ptr;
+}
+
+static void js_def_free(JSMallocState *s, void *ptr)
+{
+    if (!ptr)
+        return;
+
+    s->malloc_count--;
+    s->malloc_size -= js_def_malloc_usable_size(ptr) + MALLOC_OVERHEAD;
+    free(ptr);
+}
+
+static void *js_def_realloc(JSMallocState *s, void *ptr, size_t size)
+{
+    size_t old_size;
+
+    if (!ptr) {
+        if (size == 0)
+            return NULL;
+        return js_def_malloc(s, size);
+    }
+    old_size = js_def_malloc_usable_size(ptr);
+    if (size == 0) {
+        s->malloc_count--;
+        s->malloc_size -= old_size + MALLOC_OVERHEAD;
+        free(ptr);
+        return NULL;
+    }
+    if (s->malloc_size + size - old_size > s->malloc_limit)
+        return NULL;
+
+    ptr = realloc(ptr, size);
+    if (!ptr)
+        return NULL;
+
+    s->malloc_size += js_def_malloc_usable_size(ptr) - old_size;
+    return ptr;
+}
+
+static const JSMallocFunctions def_malloc_funcs = {
+    js_def_malloc,
+    js_def_free,
+    js_def_realloc,
+#if defined(__APPLE__)
+    malloc_size,
+#elif defined(_WIN32)
+    (size_t (*)(const void *))_msize,
+#elif defined(EMSCRIPTEN)
+    NULL,
+#elif defined(__linux__) || defined(__NX__)
+    (size_t (*)(const void *))malloc_usable_size,
+#else
+    /* change this to `NULL,` if compilation fails */
+    malloc_usable_size,
+#endif
+};
+
+JSRuntime *JS_NewRuntime(void)
+{
+    return JS_NewRuntime2(&def_malloc_funcs, NULL);
+}
+
+void JS_SetMemoryLimit(JSRuntime *rt, size_t limit)
+{
+    rt->malloc_state.malloc_limit = limit;
+}
+
+/* use -1 to disable automatic GC */
+void JS_SetGCThreshold(JSRuntime *rt, size_t gc_threshold)
+{
+    rt->malloc_gc_threshold = gc_threshold;
+}
+
+#define malloc(s) malloc_is_forbidden(s)
+#define free(p) free_is_forbidden(p)
+#define realloc(p,s) realloc_is_forbidden(p,s)
+
+void JS_SetInterruptHandler(JSRuntime *rt, JSInterruptHandler *cb, void *opaque)
+{
+    rt->interrupt_handler = cb;
+    rt->interrupt_opaque = opaque;
+}
+
+void JS_SetCanBlock(JSRuntime *rt, BOOL can_block)
+{
+    rt->can_block = can_block;
+}
+
+/* return 0 if OK, < 0 if exception */
+int JS_EnqueueJob(JSContext *ctx, JSJobFunc *job_func,
+                  int argc, JSValueConst *argv)
+{
+    JSRuntime *rt = ctx->rt;
+    JSJobEntry *e;
+    int i;
+
+    e = js_malloc(ctx, sizeof(*e) + argc * sizeof(JSValue));
+    if (!e)
+        return -1;
+    e->ctx = ctx;
+    e->job_func = job_func;
+    e->argc = argc;
+    for(i = 0; i < argc; i++) {
+        e->argv[i] = JS_DupValue(ctx, argv[i]);
+    }
+    list_add_tail(&e->link, &rt->job_list);
+    return 0;
+}
+
+BOOL JS_IsJobPending(JSRuntime *rt)
+{
+    return !list_empty(&rt->job_list);
+}
+
+/* return < 0 if exception, 0 if no job pending, 1 if a job was
+   executed successfully. the context of the job is stored in '*pctx' */
+int JS_ExecutePendingJob(JSRuntime *rt, JSContext **pctx)
+{
+    JSContext *ctx;
+    JSJobEntry *e;
+    JSValue res;
+    int i, ret;
+
+    if (list_empty(&rt->job_list)) {
+        *pctx = NULL;
+        return 0;
+    }
+
+    /* get the first pending job and execute it */
+    e = list_entry(rt->job_list.next, JSJobEntry, link);
+    list_del(&e->link);
+    ctx = e->ctx;
+    res = e->job_func(e->ctx, e->argc, (JSValueConst *)e->argv);
+    for(i = 0; i < e->argc; i++)
+        JS_FreeValue(ctx, e->argv[i]);
+    if (JS_IsException(res))
+        ret = -1;
+    else
+        ret = 1;
+    JS_FreeValue(ctx, res);
+    js_free(ctx, e);
+    *pctx = ctx;
+    return ret;
+}
+
+static inline uint32_t atom_get_free(const JSAtomStruct *p)
+{
+    return (uintptr_t)p >> 1;
+}
+
+static inline BOOL atom_is_free(const JSAtomStruct *p)
+{
+    return (uintptr_t)p & 1;
+}
+
+static inline JSAtomStruct *atom_set_free(uint32_t v)
+{
+    return (JSAtomStruct *)(((uintptr_t)v << 1) | 1);
+}
+
+/* Note: the string contents are uninitialized */
+static JSString *js_alloc_string_rt(JSRuntime *rt, int max_len, int is_wide_char)
+{
+    JSString *str;
+    str = js_malloc_rt(rt, sizeof(JSString) + (max_len << is_wide_char) + 1 - is_wide_char);
+    if (unlikely(!str))
+        return NULL;
+    str->header.ref_count = 1;
+    str->is_wide_char = is_wide_char;
+    str->len = max_len;
+    str->atom_type = 0;
+    str->hash = 0;          /* optional but costless */
+    str->hash_next = 0;     /* optional */
+#ifdef DUMP_LEAKS
+    list_add_tail(&str->link, &rt->string_list);
+#endif
+    return str;
+}
+
+static JSString *js_alloc_string(JSContext *ctx, int max_len, int is_wide_char)
+{
+    JSString *p;
+    p = js_alloc_string_rt(ctx->rt, max_len, is_wide_char);
+    if (unlikely(!p)) {
+        JS_ThrowOutOfMemory(ctx);
+        return NULL;
+    }
+    return p;
+}
+
+/* same as JS_FreeValueRT() but faster */
+static inline void js_free_string(JSRuntime *rt, JSString *str)
+{
+    if (--str->header.ref_count <= 0) {
+        if (str->atom_type) {
+            JS_FreeAtomStruct(rt, str);
+        } else {
+#ifdef DUMP_LEAKS
+            list_del(&str->link);
+#endif
+            js_free_rt(rt, str);
+        }
+    }
+}
+
+void JS_SetRuntimeInfo(JSRuntime *rt, const char *s)
+{
+    if (rt)
+        rt->rt_info = s;
+}
+
+void JS_FreeRuntime(JSRuntime *rt)
+{
+    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);
+    }
+
+    list_for_each_safe(el, el1, &rt->job_list) {
+        JSJobEntry *e = list_entry(el, JSJobEntry, link);
+        for(i = 0; i < e->argc; i++)
+            JS_FreeValueRT(rt, e->argv[i]);
+        js_free_rt(rt, e);
+    }
+    init_list_head(&rt->job_list);
+
+    JS_RunGC(rt);
+
+#ifdef DUMP_LEAKS
+    /* leaking objects */
+    {
+        BOOL header_done;
+        JSGCObjectHeader *p;
+        int count;
+
+        /* remove the internal refcounts to display only the object
+           referenced externally */
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            p->mark = 0;
+        }
+        gc_decref(rt);
+
+        header_done = FALSE;
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            if (p->ref_count != 0) {
+                if (!header_done) {
+                    printf("Object leaks:\n");
+                    JS_DumpObjectHeader(rt);
+                    header_done = TRUE;
+                }
+                JS_DumpGCObject(rt, p);
+            }
+        }
+
+        count = 0;
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            if (p->ref_count == 0) {
+                count++;
+            }
+        }
+        if (count != 0)
+            printf("Secondary object leaks: %d\n", count);
+    }
+#endif
+    assert(list_empty(&rt->gc_obj_list));
+
+    /* free the classes */
+    for(i = 0; i < rt->class_count; i++) {
+        JSClass *cl = &rt->class_array[i];
+        if (cl->class_id != 0) {
+            JS_FreeAtomRT(rt, cl->class_name);
+        }
+    }
+    js_free_rt(rt, rt->class_array);
+
+#ifdef CONFIG_BIGNUM
+    bf_context_end(&rt->bf_ctx);
+#endif
+
+#ifdef DUMP_LEAKS
+    /* only the atoms defined in JS_InitAtoms() should be left */
+    {
+        BOOL header_done = FALSE;
+
+        for(i = 0; i < rt->atom_size; i++) {
+            JSAtomStruct *p = rt->atom_array[i];
+            if (!atom_is_free(p) /* && p->str*/) {
+                if (i >= JS_ATOM_END || p->header.ref_count != 1) {
+                    if (!header_done) {
+                        header_done = TRUE;
+                        if (rt->rt_info) {
+                            printf("%s:1: atom leakage:", rt->rt_info);
+                        } else {
+                            printf("Atom leaks:\n"
+                                   "    %6s %6s %s\n",
+                                   "ID", "REFCNT", "NAME");
+                        }
+                    }
+                    if (rt->rt_info) {
+                        printf(" ");
+                    } else {
+                        printf("    %6u %6u ", i, p->header.ref_count);
+                    }
+                    switch (p->atom_type) {
+                    case JS_ATOM_TYPE_STRING:
+                        JS_DumpString(rt, p);
+                        break;
+                    case JS_ATOM_TYPE_GLOBAL_SYMBOL:
+                        printf("Symbol.for(");
+                        JS_DumpString(rt, p);
+                        printf(")");
+                        break;
+                    case JS_ATOM_TYPE_SYMBOL:
+                        if (p->hash == JS_ATOM_HASH_SYMBOL) {
+                            printf("Symbol(");
+                            JS_DumpString(rt, p);
+                            printf(")");
+                        } else {
+                            printf("Private(");
+                            JS_DumpString(rt, p);
+                            printf(")");
+                        }
+                        break;
+                    }
+                    if (rt->rt_info) {
+                        printf(":%u", p->header.ref_count);
+                    } else {
+                        printf("\n");
+                    }
+                }
+            }
+        }
+        if (rt->rt_info && header_done)
+            printf("\n");
+    }
+#endif
+
+    /* free the atoms */
+    for(i = 0; i < rt->atom_size; i++) {
+        JSAtomStruct *p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+#ifdef DUMP_LEAKS
+            list_del(&p->link);
+#endif
+            js_free_rt(rt, p);
+        }
+    }
+    js_free_rt(rt, rt->atom_array);
+    js_free_rt(rt, rt->atom_hash);
+    js_free_rt(rt, rt->shape_hash);
+#ifdef DUMP_LEAKS
+    if (!list_empty(&rt->string_list)) {
+        if (rt->rt_info) {
+            printf("%s:1: string leakage:", rt->rt_info);
+        } else {
+            printf("String leaks:\n"
+                   "    %6s %s\n",
+                   "REFCNT", "VALUE");
+        }
+        list_for_each_safe(el, el1, &rt->string_list) {
+            JSString *str = list_entry(el, JSString, link);
+            if (rt->rt_info) {
+                printf(" ");
+            } else {
+                printf("    %6u ", str->header.ref_count);
+            }
+            JS_DumpString(rt, str);
+            if (rt->rt_info) {
+                printf(":%u", str->header.ref_count);
+            } else {
+                printf("\n");
+            }
+            list_del(&str->link);
+            js_free_rt(rt, str);
+        }
+        if (rt->rt_info)
+            printf("\n");
+    }
+    {
+        JSMallocState *s = &rt->malloc_state;
+        if (s->malloc_count > 1) {
+            if (rt->rt_info)
+                printf("%s:1: ", rt->rt_info);
+            printf("Memory leak: %"PRIu64" bytes lost in %"PRIu64" block%s\n",
+                   (uint64_t)(s->malloc_size - sizeof(JSRuntime)),
+                   (uint64_t)(s->malloc_count - 1), &"s"[s->malloc_count == 2]);
+        }
+    }
+#endif
+
+    {
+        JSMallocState ms = rt->malloc_state;
+        rt->mf.js_free(&ms, rt);
+    }
+}
+
+//#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;
+    int i;
+
+    ctx = js_mallocz_rt(rt, sizeof(JSContext));
+    if (!ctx)
+        return NULL;
+    ctx->class_proto = js_malloc_rt(rt, sizeof(ctx->class_proto[0]) *
+                                    rt->class_count);
+    if (!ctx->class_proto) {
+        js_free_rt(rt, ctx);
+        return NULL;
+    }
+    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;
+    ctx->fp_env.flags = bf_set_exp_bits(15) | BF_RNDN | BF_FLAG_SUBNORMAL;
+#endif
+    for(i = 0; i < rt->class_count; i++)
+        ctx->class_proto[i] = JS_NULL;
+    ctx->regexp_ctor = JS_NULL;
+    ctx->promise_ctor = JS_NULL;
+    init_list_head(&ctx->loaded_modules);
+
+    JS_AddIntrinsicBasicObjects(ctx);
+    return ctx;
+}
+
+JSContext *JS_NewContext(JSRuntime *rt)
+{
+    JSContext *ctx;
+
+    ctx = JS_NewContextRaw(rt);
+    if (!ctx)
+        return NULL;
+
+    JS_AddIntrinsicBaseObjects(ctx);
+    JS_AddIntrinsicDate(ctx);
+    JS_AddIntrinsicEval(ctx);
+    JS_AddIntrinsicStringNormalize(ctx);
+    JS_AddIntrinsicRegExp(ctx);
+    JS_AddIntrinsicJSON(ctx);
+    JS_AddIntrinsicProxy(ctx);
+    JS_AddIntrinsicMapSet(ctx);
+    JS_AddIntrinsicTypedArrays(ctx);
+    JS_AddIntrinsicPromise(ctx);
+#ifdef CONFIG_BIGNUM
+    JS_AddIntrinsicBigInt(ctx);
+#endif
+    return ctx;
+}
+
+void *JS_GetContextOpaque(JSContext *ctx)
+{
+    return ctx->user_opaque;
+}
+
+void JS_SetContextOpaque(JSContext *ctx, void *opaque)
+{
+    ctx->user_opaque = opaque;
+}
+
+/* set the new value and free the old value after (freeing the value
+   can reallocate the object data) */
+static inline void set_value(JSContext *ctx, JSValue *pval, JSValue new_val)
+{
+    JSValue old_val;
+    old_val = *pval;
+    *pval = new_val;
+    JS_FreeValue(ctx, old_val);
+}
+
+void JS_SetClassProto(JSContext *ctx, JSClassID class_id, JSValue obj)
+{
+#ifdef _DEBUG
+    JSRuntime *rt = ctx->rt;
+    assert(class_id < rt->class_count);
+#endif
+    set_value(ctx, &ctx->class_proto[class_id], obj);
+}
+
+JSValue JS_GetClassProto(JSContext *ctx, JSClassID class_id)
+{
+#ifdef _DEBUG
+    JSRuntime *rt = ctx->rt;
+    assert(class_id < rt->class_count);
+#endif
+    return JS_DupValue(ctx, ctx->class_proto[class_id]);
+}
+
+typedef enum JSFreeModuleEnum {
+    JS_FREE_MODULE_ALL,
+    JS_FREE_MODULE_NOT_RESOLVED,
+    JS_FREE_MODULE_NOT_EVALUATED,
+} JSFreeModuleEnum;
+
+/* XXX: would be more efficient with separate module lists */
+static void js_free_modules(JSContext *ctx, JSFreeModuleEnum flag)
+{
+    struct list_head *el, *el1;
+    list_for_each_safe(el, el1, &ctx->loaded_modules) {
+        JSModuleDef *m = list_entry(el, JSModuleDef, link);
+        if (flag == JS_FREE_MODULE_ALL ||
+            (flag == JS_FREE_MODULE_NOT_RESOLVED && !m->resolved) ||
+            (flag == JS_FREE_MODULE_NOT_EVALUATED && !m->evaluated)) {
+            js_free_module_def(ctx, m);
+        }
+    }
+}
+
+void JS_FreeContext(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    int i;
+
+#ifdef DUMP_ATOMS
+    JS_DumpAtoms(ctx->rt);
+#endif
+#ifdef DUMP_SHAPES
+    JS_DumpShapes(ctx->rt);
+#endif
+#ifdef DUMP_OBJECTS
+    {
+        struct list_head *el;
+        JSGCObjectHeader *p;
+        printf("JSObjects: {\n");
+        JS_DumpObjectHeader(ctx->rt);
+        list_for_each(el, &rt->gc_obj_list) {
+            p = list_entry(el, JSGCObjectHeader, link);
+            JS_DumpGCObject(rt, p);
+        }
+        printf("}\n");
+    }
+#endif
+#ifdef DUMP_MEM
+    {
+        JSMemoryUsage stats;
+        JS_ComputeMemoryUsage(rt, &stats);
+        JS_DumpMemoryUsage(stdout, &stats, rt);
+    }
+#endif
+
+    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);
+
+    JS_FreeValue(ctx, ctx->throw_type_error);
+    JS_FreeValue(ctx, ctx->eval_obj);
+
+    JS_FreeValue(ctx, ctx->array_proto_values);
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        JS_FreeValue(ctx, ctx->native_error_proto[i]);
+    }
+    for(i = 0; i < rt->class_count; i++) {
+        JS_FreeValue(ctx, ctx->class_proto[i]);
+    }
+    js_free_rt(rt, ctx->class_proto);
+    JS_FreeValue(ctx, ctx->iterator_proto);
+    JS_FreeValue(ctx, ctx->async_iterator_proto);
+    JS_FreeValue(ctx, ctx->promise_ctor);
+    JS_FreeValue(ctx, ctx->regexp_ctor);
+    JS_FreeValue(ctx, ctx->function_ctor);
+    JS_FreeValue(ctx, ctx->function_proto);
+
+    js_free_shape_null(ctx->rt, ctx->array_shape);
+
+    list_del(&ctx->link);
+    js_free_rt(ctx->rt, ctx);
+}
+
+JSRuntime *JS_GetRuntime(JSContext *ctx)
+{
+    return ctx->rt;
+}
+
+void JS_SetMaxStackSize(JSContext *ctx, size_t stack_size)
+{
+    ctx->stack_size = stack_size;
+}
+
+static inline BOOL is_strict_mode(JSContext *ctx)
+{
+    JSStackFrame *sf = ctx->current_stack_frame;
+    return (sf && (sf->js_mode & JS_MODE_STRICT));
+}
+
+#ifdef CONFIG_BIGNUM
+static inline BOOL is_bigint_mode(JSContext *ctx)
+{
+    JSStackFrame *sf = ctx->current_stack_frame;
+    return (sf && (sf->js_mode & JS_MODE_BIGINT));
+}
+#endif
+
+JSValue JS_NewInt64(JSContext *ctx, int64_t v)
+{
+    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);
+        }
+    }
+}
+
+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
+}
+
+/* JSAtom support */
+
+#define JS_ATOM_TAG_INT (1U << 31)
+#define JS_ATOM_MAX_INT (JS_ATOM_TAG_INT - 1)
+#define JS_ATOM_MAX     ((1U << 30) - 1)
+
+/* return the max count from the hash size */
+#define JS_ATOM_COUNT_RESIZE(n) ((n) * 2)
+
+static inline BOOL __JS_AtomIsConst(JSAtom v)
+{
+#if defined(DUMP_LEAKS) && DUMP_LEAKS > 1
+        return (int32_t)v <= 0;
+#else
+        return (int32_t)v < JS_ATOM_END;
+#endif
+}
+
+static inline BOOL __JS_AtomIsTaggedInt(JSAtom v)
+{
+    return (v & JS_ATOM_TAG_INT) != 0;
+}
+
+static inline JSAtom __JS_AtomFromUInt32(uint32_t v)
+{
+    return v | JS_ATOM_TAG_INT;
+}
+
+static inline uint32_t __JS_AtomToUInt32(JSAtom atom)
+{
+    return atom & ~JS_ATOM_TAG_INT;
+}
+
+static inline int is_num(int c)
+{
+    return c >= '0' && c <= '9';
+}
+
+/* return TRUE if the string is a number n with 0 <= n <= 2^32-1 */
+static inline BOOL is_num_string(uint32_t *pval, const JSString *p)
+{
+    uint32_t n;
+    uint64_t n64;
+    int c, i, len;
+
+    len = p->len;
+    if (len == 0 || len > 10)
+        return FALSE;
+    if (p->is_wide_char)
+        c = p->u.str16[0];
+    else
+        c = p->u.str8[0];
+    if (is_num(c)) {
+        if (c == '0') {
+            if (len != 1)
+                return FALSE;
+            n = 0;
+        } else {
+            n = c - '0';
+            for(i = 1; i < len; i++) {
+                if (p->is_wide_char)
+                    c = p->u.str16[i];
+                else
+                    c = p->u.str8[i];
+                if (!is_num(c))
+                    return FALSE;
+                n64 = (uint64_t)n * 10 + (c - '0');
+                if ((n64 >> 32) != 0)
+                    return FALSE;
+                n = n64;
+            }
+        }
+        *pval = n;
+        return TRUE;
+    } else {
+        return FALSE;
+    }
+}
+
+/* XXX: could use faster version ? */
+static inline uint32_t hash_string8(const uint8_t *str, size_t len, uint32_t h)
+{
+    size_t i;
+
+    for(i = 0; i < len; i++)
+        h = h * 263 + str[i];
+    return h;
+}
+
+static inline uint32_t hash_string16(const uint16_t *str,
+                                     size_t len, uint32_t h)
+{
+    size_t i;
+
+    for(i = 0; i < len; i++)
+        h = h * 263 + str[i];
+    return h;
+}
+
+static uint32_t hash_string(const JSString *str, uint32_t h)
+{
+    if (str->is_wide_char)
+        h = hash_string16(str->u.str16, str->len, h);
+    else
+        h = hash_string8(str->u.str8, str->len, h);
+    return h;
+}
+
+static __maybe_unused void JS_DumpString(JSRuntime *rt,
+                                                  const JSString *p)
+{
+    int i, c, sep;
+
+    if (p == NULL) {
+        printf("<null>");
+        return;
+    }
+    printf("%d", p->header.ref_count);
+    sep = (p->header.ref_count == 1) ? '\"' : '\'';
+    putchar(sep);
+    for(i = 0; i < p->len; i++) {
+        if (p->is_wide_char)
+            c = p->u.str16[i];
+        else
+            c = p->u.str8[i];
+        if (c == sep || c == '\\') {
+            putchar('\\');
+            putchar(c);
+        } else if (c >= ' ' && c <= 126) {
+            putchar(c);
+        } else if (c == '\n') {
+            putchar('\\');
+            putchar('n');
+        } else {
+            printf("\\u%04x", c);
+        }
+    }
+    putchar(sep);
+}
+
+static __maybe_unused void JS_DumpAtoms(JSRuntime *rt)
+{
+    JSAtomStruct *p;
+    int h, i;
+    /* This only dumps hashed atoms, not JS_ATOM_TYPE_SYMBOL atoms */
+    printf("JSAtom count=%d size=%d hash_size=%d:\n",
+           rt->atom_count, rt->atom_size, rt->atom_hash_size);
+    printf("JSAtom hash table: {\n");
+    for(i = 0; i < rt->atom_hash_size; i++) {
+        h = rt->atom_hash[i];
+        if (h) {
+            printf("  %d:", i);
+            while (h) {
+                p = rt->atom_array[h];
+                printf(" ");
+                JS_DumpString(rt, p);
+                h = p->hash_next;
+            }
+            printf("\n");
+        }
+    }
+    printf("}\n");
+    printf("JSAtom table: {\n");
+    for(i = 0; i < rt->atom_size; i++) {
+        p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+            printf("  %d: { %d %08x ", i, p->atom_type, p->hash);
+            if (!(p->len == 0 && p->is_wide_char != 0))
+                JS_DumpString(rt, p);
+            printf(" %d }\n", p->hash_next);
+        }
+    }
+    printf("}\n");
+}
+
+static int JS_ResizeAtomHash(JSRuntime *rt, int new_hash_size)
+{
+    JSAtomStruct *p;
+    uint32_t new_hash_mask, h, i, hash_next1, j, *new_hash;
+
+    assert((new_hash_size & (new_hash_size - 1)) == 0); /* power of two */
+    new_hash_mask = new_hash_size - 1;
+    new_hash = js_mallocz_rt(rt, sizeof(rt->atom_hash[0]) * new_hash_size);
+    if (!new_hash)
+        return -1;
+    for(i = 0; i < rt->atom_hash_size; i++) {
+        h = rt->atom_hash[i];
+        while (h != 0) {
+            p = rt->atom_array[h];
+            hash_next1 = p->hash_next;
+            /* add in new hash table */
+            j = p->hash & new_hash_mask;
+            p->hash_next = new_hash[j];
+            new_hash[j] = h;
+            h = hash_next1;
+        }
+    }
+    js_free_rt(rt, rt->atom_hash);
+    rt->atom_hash = new_hash;
+    rt->atom_hash_size = new_hash_size;
+    rt->atom_count_resize = JS_ATOM_COUNT_RESIZE(new_hash_size);
+    //    JS_DumpAtoms(rt);
+    return 0;
+}
+
+static int JS_InitAtoms(JSRuntime *rt)
+{
+    int i, len, atom_type;
+    const char *p;
+
+    rt->atom_hash_size = 0;
+    rt->atom_hash = NULL;
+    rt->atom_count = 0;
+    rt->atom_size = 0;
+    rt->atom_free_index = 0;
+    if (JS_ResizeAtomHash(rt, 256))     /* there are at least 195 predefined atoms */
+        return -1;
+
+    p = js_atom_init;
+    for(i = 1; i < JS_ATOM_END; i++) {
+        if (i == JS_ATOM_Private_brand)
+            atom_type = JS_ATOM_TYPE_PRIVATE;
+        else if (i >= JS_ATOM_Symbol_toPrimitive)
+            atom_type = JS_ATOM_TYPE_SYMBOL;
+        else
+            atom_type = JS_ATOM_TYPE_STRING;
+        len = strlen(p);
+        if (__JS_NewAtomInit(rt, p, len, atom_type) == JS_ATOM_NULL)
+            return -1;
+        p = p + len + 1;
+    }
+    return 0;
+}
+
+static JSAtom JS_DupAtomRT(JSRuntime *rt, JSAtom v)
+{
+    JSAtomStruct *p;
+
+    if (!__JS_AtomIsConst(v)) {
+        p = rt->atom_array[v];
+        p->header.ref_count++;
+    }
+    return v;
+}
+
+JSAtom JS_DupAtom(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    if (!__JS_AtomIsConst(v)) {
+        rt = ctx->rt;
+        p = rt->atom_array[v];
+        p->header.ref_count++;
+    }
+    return v;
+}
+
+static JSAtomKindEnum JS_AtomGetKind(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    rt = ctx->rt;
+    if (__JS_AtomIsTaggedInt(v))
+        return JS_ATOM_KIND_STRING;
+    p = rt->atom_array[v];
+    switch(p->atom_type) {
+    case JS_ATOM_TYPE_STRING:
+        return JS_ATOM_KIND_STRING;
+    case JS_ATOM_TYPE_GLOBAL_SYMBOL:
+        return JS_ATOM_KIND_SYMBOL;
+    case JS_ATOM_TYPE_SYMBOL:
+        switch(p->hash) {
+        case JS_ATOM_HASH_SYMBOL:
+            return JS_ATOM_KIND_SYMBOL;
+        case JS_ATOM_HASH_PRIVATE:
+            return JS_ATOM_KIND_PRIVATE;
+        default:
+            abort();
+        }
+    default:
+        abort();
+    }
+}
+
+static BOOL JS_AtomIsString(JSContext *ctx, JSAtom v)
+{
+    return JS_AtomGetKind(ctx, v) == JS_ATOM_KIND_STRING;
+}
+
+static JSAtom js_get_atom_index(JSRuntime *rt, JSAtomStruct *p)
+{
+    uint32_t i = p->hash_next;  /* atom_index */
+    if (p->atom_type != JS_ATOM_TYPE_SYMBOL) {
+        JSAtomStruct *p1;
+
+        i = rt->atom_hash[p->hash & (rt->atom_hash_size - 1)];
+        p1 = rt->atom_array[i];
+        while (p1 != p) {
+            assert(i != 0);
+            i = p1->hash_next;
+            p1 = rt->atom_array[i];
+        }
+    }
+    return i;
+}
+
+/* string case (internal). Return JS_ATOM_NULL if error. 'str' is
+   freed. */
+static JSAtom __JS_NewAtom(JSRuntime *rt, JSString *str, int atom_type)
+{
+    uint32_t h, h1, i;
+    JSAtomStruct *p;
+    int len;
+
+#if 0
+    printf("__JS_NewAtom: ");  JS_DumpString(rt, str); printf("\n");
+#endif
+    if (atom_type < JS_ATOM_TYPE_SYMBOL) {
+        /* str is not NULL */
+        if (str->atom_type == atom_type) {
+            /* str is the atom, return its index */
+            i = js_get_atom_index(rt, str);
+            /* reduce string refcount and increase atom's unless constant */
+            if (__JS_AtomIsConst(i))
+                str->header.ref_count--;
+            return i;
+        }
+        /* try and locate an already registered atom */
+        len = str->len;
+        h = hash_string(str, atom_type);
+        h &= JS_ATOM_HASH_MASK;
+        h1 = h & (rt->atom_hash_size - 1);
+        i = rt->atom_hash[h1];
+        while (i != 0) {
+            p = rt->atom_array[i];
+            if (p->hash == h &&
+                p->atom_type == atom_type &&
+                p->len == len &&
+                js_string_memcmp(p, str, len) == 0) {
+                if (!__JS_AtomIsConst(i))
+                    p->header.ref_count++;
+                goto done;
+            }
+            i = p->hash_next;
+        }
+    } else {
+        h1 = 0; /* avoid warning */
+        if (atom_type == JS_ATOM_TYPE_SYMBOL) {
+            h = JS_ATOM_HASH_SYMBOL;
+        } else {
+            h = JS_ATOM_HASH_PRIVATE;
+            atom_type = JS_ATOM_TYPE_SYMBOL;
+        }
+    }
+
+    if (rt->atom_free_index == 0) {
+        /* allow new atom entries */
+        uint32_t new_size, start;
+        JSAtomStruct **new_array;
+
+        /* alloc new with size progression 3/2:
+           4 6 9 13 19 28 42 63 94 141 211 316 474 711 1066 1599 2398 3597 5395 8092
+           preallocating space for predefined atoms (at least 195).
+         */
+        new_size = max_int(211, rt->atom_size * 3 / 2);
+        if (new_size > JS_ATOM_MAX)
+            goto fail;
+        /* XXX: should use realloc2 to use slack space */
+        new_array = js_realloc_rt(rt, rt->atom_array, sizeof(*new_array) * new_size);
+        if (!new_array)
+            goto fail;
+        /* Note: the atom 0 is not used */
+        start = rt->atom_size;
+        if (start == 0) {
+            /* JS_ATOM_NULL entry */
+            p = js_mallocz_rt(rt, sizeof(JSAtomStruct));
+            if (!p) {
+                js_free_rt(rt, new_array);
+                goto fail;
+            }
+            p->header.ref_count = 1;  /* not refcounted */
+            p->atom_type = JS_ATOM_TYPE_SYMBOL;
+#ifdef DUMP_LEAKS
+            list_add_tail(&p->link, &rt->string_list);
+#endif
+            new_array[0] = p;
+            rt->atom_count++;
+            start = 1;
+        }
+        rt->atom_size = new_size;
+        rt->atom_array = new_array;
+        rt->atom_free_index = start;
+        for(i = start; i < new_size; i++) {
+            uint32_t next;
+            if (i == (new_size - 1))
+                next = 0;
+            else
+                next = i + 1;
+            rt->atom_array[i] = atom_set_free(next);
+        }
+    }
+
+    if (str) {
+        if (str->atom_type == 0) {
+            p = str;
+            p->atom_type = atom_type;
+        } else {
+            p = js_malloc_rt(rt, sizeof(JSString) +
+                             (str->len << str->is_wide_char) +
+                             1 - str->is_wide_char);
+            if (unlikely(!p))
+                goto fail;
+            p->header.ref_count = 1;
+            p->is_wide_char = str->is_wide_char;
+            p->len = str->len;
+#ifdef DUMP_LEAKS
+            list_add_tail(&p->link, &rt->string_list);
+#endif
+            memcpy(p->u.str8, str->u.str8, (str->len << str->is_wide_char) +
+                   1 - str->is_wide_char);
+            js_free_string(rt, str);
+        }
+    } else {
+        p = js_malloc_rt(rt, sizeof(JSAtomStruct)); /* empty wide string */
+        if (!p)
+            return JS_ATOM_NULL;
+        p->header.ref_count = 1;
+        p->is_wide_char = 1;    /* Hack to represent NULL as a JSString */
+        p->len = 0;
+#ifdef DUMP_LEAKS
+        list_add_tail(&p->link, &rt->string_list);
+#endif
+    }
+
+    /* use an already free entry */
+    i = rt->atom_free_index;
+    rt->atom_free_index = atom_get_free(rt->atom_array[i]);
+    rt->atom_array[i] = p;
+
+    p->hash = h;
+    p->hash_next = i;   /* atom_index */
+    p->atom_type = atom_type;
+
+    rt->atom_count++;
+
+    if (atom_type != JS_ATOM_TYPE_SYMBOL) {
+        p->hash_next = rt->atom_hash[h1];
+        rt->atom_hash[h1] = i;
+        if (unlikely(rt->atom_count >= rt->atom_count_resize))
+            JS_ResizeAtomHash(rt, rt->atom_hash_size * 2);
+    }
+
+    //    JS_DumpAtoms(rt);
+    return i;
+
+ fail:
+    i = JS_ATOM_NULL;
+ done:
+    if (str)
+        js_free_string(rt, str);
+    return i;
+}
+
+/* only works with zero terminated 8 bit strings */
+static JSAtom __JS_NewAtomInit(JSRuntime *rt, const char *str, int len,
+                               int atom_type)
+{
+    JSString *p;
+    p = js_alloc_string_rt(rt, len, 0);
+    if (!p)
+        return JS_ATOM_NULL;
+    memcpy(p->u.str8, str, len);
+    p->u.str8[len] = '\0';
+    return __JS_NewAtom(rt, p, atom_type);
+}
+
+static JSAtom __JS_FindAtom(JSRuntime *rt, const char *str, size_t len,
+                            int atom_type)
+{
+    uint32_t h, h1, i;
+    JSAtomStruct *p;
+
+    h = hash_string8((const uint8_t *)str, len, JS_ATOM_TYPE_STRING);
+    h &= JS_ATOM_HASH_MASK;
+    h1 = h & (rt->atom_hash_size - 1);
+    i = rt->atom_hash[h1];
+    while (i != 0) {
+        p = rt->atom_array[i];
+        if (p->hash == h &&
+            p->atom_type == JS_ATOM_TYPE_STRING &&
+            p->len == len &&
+            p->is_wide_char == 0 &&
+            memcmp(p->u.str8, str, len) == 0) {
+            if (!__JS_AtomIsConst(i))
+                p->header.ref_count++;
+            return i;
+        }
+        i = p->hash_next;
+    }
+    return JS_ATOM_NULL;
+}
+
+static void JS_FreeAtomStruct(JSRuntime *rt, JSAtomStruct *p)
+{
+#if 0   /* JS_ATOM_NULL is not refcounted: __JS_AtomIsConst() includes 0 */
+    if (unlikely(i == JS_ATOM_NULL)) {
+        p->header.ref_count = INT32_MAX / 2;
+        return;
+    }
+#endif
+    uint32_t i = p->hash_next;  /* atom_index */
+    if (p->atom_type != JS_ATOM_TYPE_SYMBOL) {
+        JSAtomStruct *p0, *p1;
+        uint32_t h0;
+
+        h0 = p->hash & (rt->atom_hash_size - 1);
+        i = rt->atom_hash[h0];
+        p1 = rt->atom_array[i];
+        if (p1 == p) {
+            rt->atom_hash[h0] = p1->hash_next;
+        } else {
+            for(;;) {
+                assert(i != 0);
+                p0 = p1;
+                i = p1->hash_next;
+                p1 = rt->atom_array[i];
+                if (p1 == p) {
+                    p0->hash_next = p1->hash_next;
+                    break;
+                }
+            }
+        }
+    }
+    /* insert in free atom list */
+    rt->atom_array[i] = atom_set_free(rt->atom_free_index);
+    rt->atom_free_index = i;
+    /* free the string structure */
+#ifdef DUMP_LEAKS
+    list_del(&p->link);
+#endif
+    js_free_rt(rt, p);
+    rt->atom_count--;
+    assert(rt->atom_count >= 0);
+}
+
+static void __JS_FreeAtom(JSRuntime *rt, uint32_t i)
+{
+    JSAtomStruct *p;
+
+    p = rt->atom_array[i];
+    if (--p->header.ref_count > 0)
+        return;
+    JS_FreeAtomStruct(rt, p);
+}
+
+/* Warning: 'p' is freed */
+static JSAtom JS_NewAtomStr(JSContext *ctx, JSString *p)
+{
+    JSRuntime *rt = ctx->rt;
+    uint32_t n;
+    if (is_num_string(&n, p)) {
+        if (n <= JS_ATOM_MAX_INT) {
+            js_free_string(rt, p);
+            return __JS_AtomFromUInt32(n);
+        }
+    }
+    /* XXX: should generate an exception */
+    return __JS_NewAtom(rt, p, JS_ATOM_TYPE_STRING);
+}
+
+JSAtom JS_NewAtomLen(JSContext *ctx, const char *str, size_t len)
+{
+    JSValue val;
+
+    if (len == 0 || !is_digit(*str)) {
+        JSAtom atom = __JS_FindAtom(ctx->rt, str, len, JS_ATOM_TYPE_STRING);
+        if (atom)
+            return atom;
+    }
+    val = JS_NewStringLen(ctx, str, len);
+    if (JS_IsException(val))
+        return JS_ATOM_NULL;
+    return JS_NewAtomStr(ctx, JS_VALUE_GET_STRING(val));
+}
+
+JSAtom JS_NewAtom(JSContext *ctx, const char *str)
+{
+    return JS_NewAtomLen(ctx, str, strlen(str));
+}
+
+JSAtom JS_NewAtomUInt32(JSContext *ctx, uint32_t n)
+{
+    if (n <= JS_ATOM_MAX_INT) {
+        return __JS_AtomFromUInt32(n);
+    } else {
+        char buf[11];
+        JSValue val;
+        snprintf(buf, sizeof(buf), "%u", n);
+        val = JS_NewString(ctx, buf);
+        if (JS_IsException(val))
+            return JS_ATOM_NULL;
+        return __JS_NewAtom(ctx->rt, JS_VALUE_GET_STRING(val),
+                            JS_ATOM_TYPE_STRING);
+    }
+}
+
+static JSAtom JS_NewAtomInt64(JSContext *ctx, int64_t n)
+{
+    if ((uint64_t)n <= JS_ATOM_MAX_INT) {
+        return __JS_AtomFromUInt32((uint32_t)n);
+    } else {
+        char buf[24];
+        JSValue val;
+        snprintf(buf, sizeof(buf), "%" PRId64 , n);
+        val = JS_NewString(ctx, buf);
+        if (JS_IsException(val))
+            return JS_ATOM_NULL;
+        return __JS_NewAtom(ctx->rt, JS_VALUE_GET_STRING(val),
+                            JS_ATOM_TYPE_STRING);
+    }
+}
+
+/* 'p' is freed */
+static JSValue JS_NewSymbol(JSContext *ctx, JSString *p, int atom_type)
+{
+    JSRuntime *rt = ctx->rt;
+    JSAtom atom;
+    atom = __JS_NewAtom(rt, p, atom_type);
+    if (atom == JS_ATOM_NULL)
+        return JS_ThrowOutOfMemory(ctx);
+    return JS_MKPTR(JS_TAG_SYMBOL, rt->atom_array[atom]);
+}
+
+/* descr must be a non-numeric string atom */
+static JSValue JS_NewSymbolFromAtom(JSContext *ctx, JSAtom descr,
+                                    int atom_type)
+{
+    JSRuntime *rt = ctx->rt;
+    JSString *p;
+
+    assert(!__JS_AtomIsTaggedInt(descr));
+    assert(descr < rt->atom_size);
+    p = rt->atom_array[descr];
+    JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    return JS_NewSymbol(ctx, p, atom_type);
+}
+
+#define ATOM_GET_STR_BUF_SIZE 64
+
+/* Should only be used for debug. */
+static const char *JS_AtomGetStrRT(JSRuntime *rt, char *buf, int buf_size,
+                                   JSAtom atom)
+{
+    if (__JS_AtomIsTaggedInt(atom)) {
+        snprintf(buf, buf_size, "%u", __JS_AtomToUInt32(atom));
+    } else {
+        JSAtomStruct *p;
+        assert(atom < rt->atom_size);
+        if (atom == JS_ATOM_NULL) {
+            snprintf(buf, buf_size, "<null>");
+        } else {
+            int i, c;
+            char *q;
+            JSString *str;
+
+            q = buf;
+            p = rt->atom_array[atom];
+            assert(!atom_is_free(p));
+            str = p;
+            if (str) {
+                if (!str->is_wide_char) {
+                    /* special case ASCII strings */
+                    c = 0;
+                    for(i = 0; i < str->len; i++) {
+                        c |= str->u.str8[i];
+                    }
+                    if (c < 0x80)
+                        return (const char *)str->u.str8;
+                }
+                for(i = 0; i < str->len; i++) {
+                    if (str->is_wide_char)
+                        c = str->u.str16[i];
+                    else
+                        c = str->u.str8[i];
+                    if ((q - buf) >= buf_size - UTF8_CHAR_LEN_MAX)
+                        break;
+                    if (c < 128) {
+                        *q++ = c;
+                    } else {
+                        q += unicode_to_utf8((uint8_t *)q, c);
+                    }
+                }
+            }
+            *q = '\0';
+        }
+    }
+    return buf;
+}
+
+static const char *JS_AtomGetStr(JSContext *ctx, char *buf, int buf_size, JSAtom atom)
+{
+    return JS_AtomGetStrRT(ctx->rt, buf, buf_size, atom);
+}
+
+static JSValue __JS_AtomToValue(JSContext *ctx, JSAtom atom, BOOL force_string)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+
+    if (__JS_AtomIsTaggedInt(atom)) {
+        snprintf(buf, sizeof(buf), "%u", __JS_AtomToUInt32(atom));
+        return JS_NewString(ctx, buf);
+    } else {
+        JSRuntime *rt = ctx->rt;
+        JSAtomStruct *p;
+        assert(atom < rt->atom_size);
+        p = rt->atom_array[atom];
+        if (p->atom_type == JS_ATOM_TYPE_STRING) {
+            goto ret_string;
+        } else if (force_string) {
+            if (p->len == 0 && p->is_wide_char != 0) {
+                /* no description string */
+                p = rt->atom_array[JS_ATOM_empty_string];
+            }
+        ret_string:
+            return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+        } else {
+            return JS_DupValue(ctx, JS_MKPTR(JS_TAG_SYMBOL, p));
+        }
+    }
+}
+
+JSValue JS_AtomToValue(JSContext *ctx, JSAtom atom)
+{
+    return __JS_AtomToValue(ctx, atom, FALSE);
+}
+
+JSValue JS_AtomToString(JSContext *ctx, JSAtom atom)
+{
+    return __JS_AtomToValue(ctx, atom, TRUE);
+}
+
+/* return TRUE if the atom is an array index (i.e. 0 <= index <=
+   2^32-2 and return its value */
+BOOL JS_AtomIsArrayIndex(JSContext *ctx, uint32_t *pval, JSAtom atom)
+{
+    if (__JS_AtomIsTaggedInt(atom)) {
+        *pval = __JS_AtomToUInt32(atom);
+        return TRUE;
+    } else {
+        JSRuntime *rt = ctx->rt;
+        JSAtomStruct *p;
+        uint32_t val;
+
+        assert(atom < rt->atom_size);
+        p = rt->atom_array[atom];
+        if (p->atom_type == JS_ATOM_TYPE_STRING &&
+            is_num_string(&val, p) && val != -1) {
+            *pval = val;
+            return TRUE;
+        } else {
+            *pval = 0;
+            return FALSE;
+        }
+    }
+}
+
+/* This test must be fast if atom is not a numeric index (e.g. a
+   method name). Return JS_UNDEFINED if not a numeric
+   index. JS_EXCEPTION can also be returned. */
+static JSValue JS_AtomIsNumericIndex1(JSContext *ctx, JSAtom atom)
+{
+    JSRuntime *rt = ctx->rt;
+    JSAtomStruct *p1;
+    JSString *p;
+    int c, len, ret;
+    JSValue num, str;
+
+    if (__JS_AtomIsTaggedInt(atom))
+        return JS_NewInt32(ctx, __JS_AtomToUInt32(atom));
+    assert(atom < rt->atom_size);
+    p1 = rt->atom_array[atom];
+    if (p1->atom_type != JS_ATOM_TYPE_STRING)
+        return JS_UNDEFINED;
+    p = p1;
+    len = p->len;
+    if (p->is_wide_char) {
+        const uint16_t *r = p->u.str16, *r_end = p->u.str16 + len;
+        if (r >= r_end)
+            return JS_UNDEFINED;
+        c = *r;
+        if (c == '-') {
+            if (r >= r_end)
+                return JS_UNDEFINED;
+            r++;
+            c = *r;
+            /* -0 case is specific */
+            if (c == '0' && len == 2)
+                goto minus_zero;
+        }
+        /* XXX: should test NaN, but the tests do not check it */
+        if (!is_num(c)) {
+            /* XXX: String should be normalized, therefore 8-bit only */
+            const uint16_t nfinity16[7] = { 'n', 'f', 'i', 'n', 'i', 't', 'y' };
+            if (!(c =='I' && (r_end - r) == 8 &&
+                  !memcmp(r + 1, nfinity16, sizeof(nfinity16))))
+                return JS_UNDEFINED;
+        }
+    } else {
+        const uint8_t *r = p->u.str8, *r_end = p->u.str8 + len;
+        if (r >= r_end)
+            return JS_UNDEFINED;
+        c = *r;
+        if (c == '-') {
+            if (r >= r_end)
+                return JS_UNDEFINED;
+            r++;
+            c = *r;
+            /* -0 case is specific */
+            if (c == '0' && len == 2) {
+            minus_zero:
+                return __JS_NewFloat64(ctx, -0.0);
+            }
+        }
+        if (!is_num(c)) {
+            if (!(c =='I' && (r_end - r) == 8 &&
+                  !memcmp(r + 1, "nfinity", 7)))
+                return JS_UNDEFINED;
+        }
+    }
+    /* XXX: bignum: would be better to only accept integer to avoid
+       relying on current floating point precision */
+    /* this is ECMA CanonicalNumericIndexString primitive */
+    num = JS_ToNumber(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    if (JS_IsException(num))
+        return num;
+    str = JS_ToString(ctx, num);
+    if (JS_IsException(str)) {
+        JS_FreeValue(ctx, num);
+        return str;
+    }
+    ret = js_string_compare(ctx, p, JS_VALUE_GET_STRING(str));
+    JS_FreeValue(ctx, str);
+    if (ret == 0) {
+        return num;
+    } else {
+        JS_FreeValue(ctx, num);
+        return JS_UNDEFINED;
+    }
+}
+
+/* return -1 if exception or TRUE/FALSE */
+static int JS_AtomIsNumericIndex(JSContext *ctx, JSAtom atom)
+{
+    JSValue num;
+    num = JS_AtomIsNumericIndex1(ctx, atom);
+    if (likely(JS_IsUndefined(num)))
+        return FALSE;
+    if (JS_IsException(num))
+        return -1;
+    JS_FreeValue(ctx, num);
+    return TRUE;
+}
+
+void JS_FreeAtom(JSContext *ctx, JSAtom v)
+{
+    if (!__JS_AtomIsConst(v))
+        __JS_FreeAtom(ctx->rt, v);
+}
+
+void JS_FreeAtomRT(JSRuntime *rt, JSAtom v)
+{
+    if (!__JS_AtomIsConst(v))
+        __JS_FreeAtom(rt, v);
+}
+
+/* return TRUE if 'v' is a symbol with a string description */
+static BOOL JS_AtomSymbolHasDescription(JSContext *ctx, JSAtom v)
+{
+    JSRuntime *rt;
+    JSAtomStruct *p;
+
+    rt = ctx->rt;
+    if (__JS_AtomIsTaggedInt(v))
+        return FALSE;
+    p = rt->atom_array[v];
+    return (((p->atom_type == JS_ATOM_TYPE_SYMBOL &&
+              p->hash == JS_ATOM_HASH_SYMBOL) ||
+             p->atom_type == JS_ATOM_TYPE_GLOBAL_SYMBOL) &&
+            !(p->len == 0 && p->is_wide_char != 0));
+}
+
+static __maybe_unused void print_atom(JSContext *ctx, JSAtom atom)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    const char *p;
+    int i;
+
+    /* XXX: should handle embedded null characters */
+    /* XXX: should move encoding code to JS_AtomGetStr */
+    p = JS_AtomGetStr(ctx, buf, sizeof(buf), atom);
+    for (i = 0; p[i]; i++) {
+        int c = (unsigned char)p[i];
+        if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+              (c == '_' || c == '$') || (c >= '0' && c <= '9' && i > 0)))
+            break;
+    }
+    if (i > 0 && p[i] == '\0') {
+        printf("%s", p);
+    } else {
+        putchar('"');
+        printf("%.*s", i, p);
+        for (; p[i]; i++) {
+            int c = (unsigned char)p[i];
+            if (c == '\"' || c == '\\') {
+                putchar('\\');
+                putchar(c);
+            } else if (c >= ' ' && c <= 126) {
+                putchar(c);
+            } else if (c == '\n') {
+                putchar('\\');
+                putchar('n');
+            } else {
+                printf("\\u%04x", c);
+            }
+        }
+        putchar('\"');
+    }
+}
+
+/* free with JS_FreeCString() */
+const char *JS_AtomToCString(JSContext *ctx, JSAtom atom)
+{
+    JSValue str;
+    const char *cstr;
+
+    str = JS_AtomToString(ctx, atom);
+    if (JS_IsException(str))
+        return NULL;
+    cstr = JS_ToCString(ctx, str);
+    JS_FreeValue(ctx, str);
+    return cstr;
+}
+
+/* return a string atom containing name concatenated with str1 */
+static JSAtom js_atom_concat_str(JSContext *ctx, JSAtom name, const char *str1)
+{
+    JSValue str;
+    JSAtom atom;
+    const char *cstr;
+    char *cstr2;
+    size_t len, len1;
+
+    str = JS_AtomToString(ctx, name);
+    if (JS_IsException(str))
+        return JS_ATOM_NULL;
+    cstr = JS_ToCStringLen(ctx, &len, str);
+    if (!cstr)
+        goto fail;
+    len1 = strlen(str1);
+    cstr2 = js_malloc(ctx, len + len1 + 1);
+    if (!cstr2)
+        goto fail;
+    memcpy(cstr2, cstr, len);
+    memcpy(cstr2 + len, str1, len1);
+    cstr2[len + len1] = '\0';
+    atom = JS_NewAtomLen(ctx, cstr2, len + len1);
+    js_free(ctx, cstr2);
+    JS_FreeCString(ctx, cstr);
+    JS_FreeValue(ctx, str);
+    return atom;
+ fail:
+    JS_FreeCString(ctx, cstr);
+    JS_FreeValue(ctx, str);
+    return JS_ATOM_NULL;
+}
+
+static JSAtom js_atom_concat_num(JSContext *ctx, JSAtom name, uint32_t n)
+{
+    char buf[16];
+    snprintf(buf, sizeof(buf), "%u", n);
+    return js_atom_concat_str(ctx, name, buf);
+}
+
+static inline BOOL JS_IsEmptyString(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_STRING && JS_VALUE_GET_STRING(v)->len == 0;
+}
+
+/* JSClass support */
+
+/* a new class ID is allocated if *pclass_id != 0 */
+JSClassID JS_NewClassID(JSClassID *pclass_id)
+{
+    JSClassID class_id;
+    /* XXX: make it thread safe */
+    class_id = *pclass_id;
+    if (class_id == 0) {
+        class_id = js_class_id_alloc++;
+        *pclass_id = class_id;
+    }
+    return class_id;
+}
+
+BOOL JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id)
+{
+    return (class_id < rt->class_count &&
+            rt->class_array[class_id].class_id != 0);
+}
+
+/* create a new object internal class. Return -1 if error, 0 if
+   OK. The finalizer can be NULL if none is needed. */
+static int JS_NewClass1(JSRuntime *rt, JSClassID class_id,
+                        const JSClassDef *class_def, JSAtom name)
+{
+    int new_size, i;
+    JSClass *cl, *new_class_array;
+    struct list_head *el;
+
+    if (class_id < rt->class_count &&
+        rt->class_array[class_id].class_id != 0)
+        return -1;
+
+    if (class_id >= rt->class_count) {
+        new_size = max_int(JS_CLASS_INIT_COUNT,
+                           max_int(class_id + 1, rt->class_count * 3 / 2));
+
+        /* reallocate the context class prototype array, if any */
+        list_for_each(el, &rt->context_list) {
+            JSContext *ctx = list_entry(el, JSContext, link);
+            JSValue *new_tab;
+            new_tab = js_realloc_rt(rt, ctx->class_proto,
+                                    sizeof(ctx->class_proto[0]) * new_size);
+            if (!new_tab)
+                return -1;
+            for(i = rt->class_count; i < new_size; i++)
+                new_tab[i] = JS_NULL;
+            ctx->class_proto = new_tab;
+        }
+        /* reallocate the class array */
+        new_class_array = js_realloc_rt(rt, rt->class_array,
+                                        sizeof(JSClass) * new_size);
+        if (!new_class_array)
+            return -1;
+        memset(new_class_array + rt->class_count, 0,
+               (new_size - rt->class_count) * sizeof(JSClass));
+        rt->class_array = new_class_array;
+        rt->class_count = new_size;
+    }
+    cl = &rt->class_array[class_id];
+    cl->class_id = class_id;
+    cl->class_name = JS_DupAtomRT(rt, name);
+    cl->finalizer = class_def->finalizer;
+    cl->gc_mark = class_def->gc_mark;
+    cl->call = class_def->call;
+    cl->exotic = class_def->exotic;
+    return 0;
+}
+
+int JS_NewClass(JSRuntime *rt, JSClassID class_id, const JSClassDef *class_def)
+{
+    int ret, len;
+    JSAtom name;
+
+    len = strlen(class_def->class_name);
+    name = __JS_FindAtom(rt, class_def->class_name, len, JS_ATOM_TYPE_STRING);
+    if (name == JS_ATOM_NULL) {
+        name = __JS_NewAtomInit(rt, class_def->class_name, len, JS_ATOM_TYPE_STRING);
+        if (name == JS_ATOM_NULL)
+            return -1;
+    }
+    ret = JS_NewClass1(rt, class_id, class_def, name);
+    JS_FreeAtomRT(rt, name);
+    return ret;
+}
+
+static JSValue js_new_string8(JSContext *ctx, const uint8_t *buf, int len)
+{
+    JSString *str;
+
+    if (len <= 0) {
+        return JS_AtomToString(ctx, JS_ATOM_empty_string);
+    }
+    str = js_alloc_string(ctx, len, 0);
+    if (!str)
+        return JS_EXCEPTION;
+    memcpy(str->u.str8, buf, len);
+    str->u.str8[len] = '\0';
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+static JSValue js_new_string16(JSContext *ctx, const uint16_t *buf, int len)
+{
+    JSString *str;
+    str = js_alloc_string(ctx, len, 1);
+    if (!str)
+        return JS_EXCEPTION;
+    memcpy(str->u.str16, buf, len * 2);
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+static JSValue js_new_string_char(JSContext *ctx, uint16_t c)
+{
+    if (c < 0x100) {
+        uint8_t ch8 = c;
+        return js_new_string8(ctx, &ch8, 1);
+    } else {
+        uint16_t ch16 = c;
+        return js_new_string16(ctx, &ch16, 1);
+    }
+}
+
+static JSValue js_sub_string(JSContext *ctx, JSString *p, int start, int end)
+{
+    int len = end - start;
+    if (start == 0 && end == p->len) {
+        return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+    }
+    if (p->is_wide_char && len > 0) {
+        JSString *str;
+        int i;
+        uint16_t c = 0;
+        for (i = start; i < end; i++) {
+            c |= p->u.str16[i];
+        }
+        if (c > 0xFF)
+            return js_new_string16(ctx, p->u.str16 + start, len);
+
+        str = js_alloc_string(ctx, len, 0);
+        if (!str)
+            return JS_EXCEPTION;
+        for (i = 0; i < len; i++) {
+            str->u.str8[i] = p->u.str16[start + i];
+        }
+        str->u.str8[len] = '\0';
+        return JS_MKPTR(JS_TAG_STRING, str);
+    } else {
+        return js_new_string8(ctx, p->u.str8 + start, len);
+    }
+}
+
+typedef struct StringBuffer {
+    JSContext *ctx;
+    JSString *str;
+    int len;
+    int size;
+    int is_wide_char;
+    int error_status;
+} StringBuffer;
+
+/* It is valid to call string_buffer_end() and all string_buffer functions even
+   if string_buffer_init() or another string_buffer function returns an error.
+   If the error_status is set, string_buffer_end() returns JS_EXCEPTION.
+ */
+static int string_buffer_init2(JSContext *ctx, StringBuffer *s, int size,
+                               int is_wide)
+{
+    s->ctx = ctx;
+    s->size = size;
+    s->len = 0;
+    s->is_wide_char = is_wide;
+    s->error_status = 0;
+    s->str = js_alloc_string(ctx, size, is_wide);
+    if (unlikely(!s->str)) {
+        s->size = 0;
+        return s->error_status = -1;
+    }
+#ifdef DUMP_LEAKS
+    /* the StringBuffer may reallocate the JSString, only link it at the end */
+    list_del(&s->str->link);
+#endif
+    return 0;
+}
+
+static inline int string_buffer_init(JSContext *ctx, StringBuffer *s, int size)
+{
+    return string_buffer_init2(ctx, s, size, 0);
+}
+
+static void string_buffer_free(StringBuffer *s)
+{
+    js_free(s->ctx, s->str);
+    s->str = NULL;
+}
+
+static int string_buffer_set_error(StringBuffer *s)
+{
+    js_free(s->ctx, s->str);
+    s->str = NULL;
+    s->size = 0;
+    s->len = 0;
+    return s->error_status = -1;
+}
+
+static no_inline int string_buffer_widen(StringBuffer *s, int size)
+{
+    JSString *str;
+    size_t slack;
+    int i;
+
+    if (s->error_status)
+        return -1;
+
+    str = js_realloc2(s->ctx, s->str, sizeof(JSString) + (size << 1), &slack);
+    if (!str)
+        return string_buffer_set_error(s);
+    size += slack >> 1;
+    for(i = s->len; i-- > 0;) {
+        str->u.str16[i] = str->u.str8[i];
+    }
+    s->is_wide_char = 1;
+    s->size = size;
+    s->str = str;
+    return 0;
+}
+
+static no_inline int string_buffer_realloc(StringBuffer *s, int new_len, int c)
+{
+    JSString *new_str;
+    int new_size;
+    size_t new_size_bytes, slack;
+
+    if (s->error_status)
+        return -1;
+
+    if (new_len > JS_STRING_LEN_MAX) {
+        JS_ThrowInternalError(s->ctx, "string too long");
+        return string_buffer_set_error(s);
+    }
+    new_size = min_int(max_int(new_len, s->size * 3 / 2), JS_STRING_LEN_MAX);
+    if (!s->is_wide_char && c >= 0x100) {
+        return string_buffer_widen(s, new_size);
+    }
+    new_size_bytes = sizeof(JSString) + (new_size << s->is_wide_char) + 1 - s->is_wide_char;
+    new_str = js_realloc2(s->ctx, s->str, new_size_bytes, &slack);
+    if (!new_str)
+        return string_buffer_set_error(s);
+    new_size = min_int(new_size + (slack >> s->is_wide_char), JS_STRING_LEN_MAX);
+    s->size = new_size;
+    s->str = new_str;
+    return 0;
+}
+
+static no_inline int string_buffer_putc_slow(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(s->len >= s->size)) {
+        if (string_buffer_realloc(s, s->len + 1, c))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        s->str->u.str16[s->len++] = c;
+    } else if (c < 0x100) {
+        s->str->u.str8[s->len++] = c;
+    } else {
+        if (string_buffer_widen(s, s->size))
+            return -1;
+        s->str->u.str16[s->len++] = c;
+    }
+    return 0;
+}
+
+/* 0 <= c <= 0xff */
+static int string_buffer_putc8(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(s->len >= s->size)) {
+        if (string_buffer_realloc(s, s->len + 1, c))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        s->str->u.str16[s->len++] = c;
+    } else {
+        s->str->u.str8[s->len++] = c;
+    }
+    return 0;
+}
+
+/* 0 <= c <= 0xffff */
+static int string_buffer_putc16(StringBuffer *s, uint32_t c)
+{
+    if (likely(s->len < s->size)) {
+        if (s->is_wide_char) {
+            s->str->u.str16[s->len++] = c;
+            return 0;
+        } else if (c < 0x100) {
+            s->str->u.str8[s->len++] = c;
+            return 0;
+        }
+    }
+    return string_buffer_putc_slow(s, c);
+}
+
+/* 0 <= c <= 0x10ffff */
+static int string_buffer_putc(StringBuffer *s, uint32_t c)
+{
+    if (unlikely(c >= 0x10000)) {
+        /* surrogate pair */
+        c -= 0x10000;
+        if (string_buffer_putc16(s, (c >> 10) + 0xd800))
+            return -1;
+        c = (c & 0x3ff) + 0xdc00;
+    }
+    return string_buffer_putc16(s, c);
+}
+
+static int string_get(const JSString *p, int idx) {
+    return p->is_wide_char ? p->u.str16[idx] : p->u.str8[idx];
+}
+
+static int string_getc(const JSString *p, int *pidx)
+{
+    int idx, c, c1;
+    idx = *pidx;
+    if (p->is_wide_char) {
+        c = p->u.str16[idx++];
+        if (c >= 0xd800 && c < 0xdc00 && idx < p->len) {
+            c1 = p->u.str16[idx];
+            if (c1 >= 0xdc00 && c1 < 0xe000) {
+                c = (((c & 0x3ff) << 10) | (c1 & 0x3ff)) + 0x10000;
+                idx++;
+            }
+        }
+    } else {
+        c = p->u.str8[idx++];
+    }
+    *pidx = idx;
+    return c;
+}
+
+static int string_buffer_write8(StringBuffer *s, const uint8_t *p, int len)
+{
+    int i;
+
+    if (s->len + len > s->size) {
+        if (string_buffer_realloc(s, s->len + len, 0))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        for (i = 0; i < len; i++) {
+            s->str->u.str16[s->len + i] = p[i];
+        }
+        s->len += len;
+    } else {
+        memcpy(&s->str->u.str8[s->len], p, len);
+        s->len += len;
+    }
+    return 0;
+}
+
+static int string_buffer_write16(StringBuffer *s, const uint16_t *p, int len)
+{
+    int c = 0, i;
+
+    for (i = 0; i < len; i++) {
+        c |= p[i];
+    }
+    if (s->len + len > s->size) {
+        if (string_buffer_realloc(s, s->len + len, c))
+            return -1;
+    } else if (!s->is_wide_char && c >= 0x100) {
+        if (string_buffer_widen(s, s->size))
+            return -1;
+    }
+    if (s->is_wide_char) {
+        memcpy(&s->str->u.str16[s->len], p, len << 1);
+        s->len += len;
+    } else {
+        for (i = 0; i < len; i++) {
+            s->str->u.str8[s->len + i] = p[i];
+        }
+        s->len += len;
+    }
+    return 0;
+}
+
+/* appending an ASCII string */
+static int string_buffer_puts8(StringBuffer *s, const char *str)
+{
+    return string_buffer_write8(s, (const uint8_t *)str, strlen(str));
+}
+
+static int string_buffer_concat(StringBuffer *s, const JSString *p,
+                                uint32_t from, uint32_t to)
+{
+    if (to <= from)
+        return 0;
+    if (p->is_wide_char)
+        return string_buffer_write16(s, p->u.str16 + from, to - from);
+    else
+        return string_buffer_write8(s, p->u.str8 + from, to - from);
+}
+
+static int string_buffer_concat_value(StringBuffer *s, JSValueConst v)
+{
+    JSString *p;
+    JSValue v1;
+    int res;
+
+    if (s->error_status) {
+        /* prevent exception overload */
+        return -1;
+    }
+    if (unlikely(JS_VALUE_GET_TAG(v) != JS_TAG_STRING)) {
+        v1 = JS_ToString(s->ctx, v);
+        if (JS_IsException(v1))
+            return string_buffer_set_error(s);
+        p = JS_VALUE_GET_STRING(v1);
+        res = string_buffer_concat(s, p, 0, p->len);
+        JS_FreeValue(s->ctx, v1);
+        return res;
+    }
+    p = JS_VALUE_GET_STRING(v);
+    return string_buffer_concat(s, p, 0, p->len);
+}
+
+static int string_buffer_concat_value_free(StringBuffer *s, JSValue v)
+{
+    JSString *p;
+    int res;
+
+    if (s->error_status) {
+        /* prevent exception overload */
+        JS_FreeValue(s->ctx, v);
+        return -1;
+    }
+    if (unlikely(JS_VALUE_GET_TAG(v) != JS_TAG_STRING)) {
+        v = JS_ToStringFree(s->ctx, v);
+        if (JS_IsException(v))
+            return string_buffer_set_error(s);
+    }
+    p = JS_VALUE_GET_STRING(v);
+    res = string_buffer_concat(s, p, 0, p->len);
+    JS_FreeValue(s->ctx, v);
+    return res;
+}
+
+static int string_buffer_fill(StringBuffer *s, int c, int count)
+{
+    /* XXX: optimize */
+    if (s->len + count > s->size) {
+        if (string_buffer_realloc(s, s->len + count, c))
+            return -1;
+    }
+    while (count-- > 0) {
+        if (string_buffer_putc16(s, c))
+            return -1;
+    }
+    return 0;
+}
+
+static JSValue string_buffer_end(StringBuffer *s)
+{
+    JSString *str;
+    str = s->str;
+    if (s->error_status)
+        return JS_EXCEPTION;
+    if (s->len == 0) {
+        js_free(s->ctx, str);
+        s->str = NULL;
+        return JS_AtomToString(s->ctx, JS_ATOM_empty_string);
+    }
+    if (s->len < s->size) {
+        /* smaller size so js_realloc should not fail, but OK if it does */
+        /* XXX: should add some slack to avoid unnecessary calls */
+        /* XXX: might need to use malloc+free to ensure smaller size */
+        str = js_realloc_rt(s->ctx->rt, str, sizeof(JSString) +
+                            (s->len << s->is_wide_char) + 1 - s->is_wide_char);
+        if (str == NULL)
+            str = s->str;
+        s->str = str;
+    }
+    if (!s->is_wide_char)
+        str->u.str8[s->len] = 0;
+#ifdef DUMP_LEAKS
+    list_add_tail(&str->link, &s->ctx->rt->string_list);
+#endif
+    str->is_wide_char = s->is_wide_char;
+    str->len = s->len;
+    s->str = NULL;
+    return JS_MKPTR(JS_TAG_STRING, str);
+}
+
+/* create a string from a UTF-8 buffer */
+JSValue JS_NewStringLen(JSContext *ctx, const char *buf, size_t buf_len)
+{
+    const uint8_t *p, *p_end, *p_start, *p_next;
+    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;
+    while (p < p_end && *p < 128)
+        p++;
+    len1 = p - p_start;
+    if (len1 > JS_STRING_LEN_MAX)
+        return JS_ThrowInternalError(ctx, "string too long");
+    if (p == p_end) {
+        /* ASCII string */
+        return js_new_string8(ctx, (const uint8_t *)buf, buf_len);
+    } else {
+        if (string_buffer_init(ctx, b, buf_len))
+            goto fail;
+        string_buffer_write8(b, p_start, len1);
+        while (p < p_end) {
+            if (*p < 128) {
+                string_buffer_putc8(b, *p++);
+            } else {
+                /* parse utf-8 sequence, return 0xFFFFFFFF for error */
+                c = unicode_from_utf8(p, p_end - p, &p_next);
+                if (c < 0x10000) {
+                    p = p_next;
+                } else if (c <= 0x10FFFF) {
+                    p = p_next;
+                    /* surrogate pair */
+                    c -= 0x10000;
+                    string_buffer_putc16(b, (c >> 10) + 0xd800);
+                    c = (c & 0x3ff) + 0xdc00;
+                } else {
+                    /* invalid char */
+                    c = 0xfffd;
+                    /* skip the invalid chars */
+                    /* XXX: seems incorrect. Why not just use c = *p++; ? */
+                    while (p < p_end && (*p >= 0x80 && *p < 0xc0))
+                        p++;
+                    if (p < p_end) {
+                        p++;
+                        while (p < p_end && (*p >= 0x80 && *p < 0xc0))
+                            p++;
+                    }
+                }
+                string_buffer_putc16(b, c);
+            }
+        }
+    }
+    return string_buffer_end(b);
+
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ConcatString3(JSContext *ctx, const char *str1,
+                                JSValue str2, const char *str3)
+{
+    StringBuffer b_s, *b = &b_s;
+    int len1, len3;
+    JSString *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(str2) != JS_TAG_STRING)) {
+        str2 = JS_ToStringFree(ctx, str2);
+        if (JS_IsException(str2))
+            goto fail;
+    }
+    p = JS_VALUE_GET_STRING(str2);
+    len1 = strlen(str1);
+    len3 = strlen(str3);
+
+    if (string_buffer_init2(ctx, b, len1 + p->len + len3, p->is_wide_char))
+        goto fail;
+
+    string_buffer_write8(b, (const uint8_t *)str1, len1);
+    string_buffer_concat(b, p, 0, p->len);
+    string_buffer_write8(b, (const uint8_t *)str3, len3);
+
+    JS_FreeValue(ctx, str2);
+    return string_buffer_end(b);
+
+ fail:
+    JS_FreeValue(ctx, str2);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_NewString(JSContext *ctx, const char *str)
+{
+    return JS_NewStringLen(ctx, str, strlen(str));
+}
+
+JSValue JS_NewAtomString(JSContext *ctx, const char *str)
+{
+    JSAtom atom = JS_NewAtom(ctx, str);
+    if (atom == JS_ATOM_NULL)
+        return JS_EXCEPTION;
+    JSValue val = JS_AtomToString(ctx, atom);
+    JS_FreeAtom(ctx, atom);
+    return val;
+}
+
+/* return (NULL, 0) if exception. */
+/* return pointer into a JSString with a live ref_count */
+/* cesu8 determines if non-BMP1 codepoints are encoded as 1 or 2 utf-8 sequences */
+const char *JS_ToCStringLen2(JSContext *ctx, size_t *plen, JSValueConst val1, BOOL cesu8)
+{
+    JSValue val;
+    JSString *str, *str_new;
+    int pos, len, c, c1;
+    uint8_t *q;
+
+    if (JS_VALUE_GET_TAG(val1) != JS_TAG_STRING) {
+        val = JS_ToString(ctx, val1);
+        if (JS_IsException(val))
+            goto fail;
+    } else {
+        val = JS_DupValue(ctx, val1);
+    }
+
+    str = JS_VALUE_GET_STRING(val);
+    len = str->len;
+    if (!str->is_wide_char) {
+        const uint8_t *src = str->u.str8;
+        int count;
+
+        /* count the number of non-ASCII characters */
+        /* Scanning the whole string is required for ASCII strings,
+           and computing the number of non-ASCII bytes is less expensive
+           than testing each byte, hence this method is faster for ASCII
+           strings, which is the most common case.
+         */
+        count = 0;
+        for (pos = 0; pos < len; pos++) {
+            count += src[pos] >> 7;
+        }
+        if (count == 0) {
+            if (plen)
+                *plen = len;
+            return (const char *)src;
+        }
+        str_new = js_alloc_string(ctx, len + count, 0);
+        if (!str_new)
+            goto fail;
+        q = str_new->u.str8;
+        for (pos = 0; pos < len; pos++) {
+            c = src[pos];
+            if (c < 0x80) {
+                *q++ = c;
+            } else {
+                *q++ = (c >> 6) | 0xc0;
+                *q++ = (c & 0x3f) | 0x80;
+            }
+        }
+    } else {
+        const uint16_t *src = str->u.str16;
+        /* Allocate 3 bytes per 16 bit code point. Surrogate pairs may
+           produce 4 bytes but use 2 code points.
+         */
+        str_new = js_alloc_string(ctx, len * 3, 0);
+        if (!str_new)
+            goto fail;
+        q = str_new->u.str8;
+        pos = 0;
+        while (pos < len) {
+            c = src[pos++];
+            if (c < 0x80) {
+                *q++ = c;
+            } else {
+                if (c >= 0xd800 && c < 0xdc00) {
+                    if (pos < len && !cesu8) {
+                        c1 = src[pos];
+                        if (c1 >= 0xdc00 && c1 < 0xe000) {
+                            pos++;
+                            /* surrogate pair */
+                            c = (((c & 0x3ff) << 10) | (c1 & 0x3ff)) + 0x10000;
+                        } else {
+                            /* Keep unmatched surrogate code points */
+                            /* c = 0xfffd; */ /* error */
+                        }
+                    } else {
+                        /* Keep unmatched surrogate code points */
+                        /* c = 0xfffd; */ /* error */
+                    }
+                }
+                q += unicode_to_utf8(q, c);
+            }
+        }
+    }
+
+    *q = '\0';
+    str_new->len = q - str_new->u.str8;
+    JS_FreeValue(ctx, val);
+    if (plen)
+        *plen = str_new->len;
+    return (const char *)str_new->u.str8;
+ fail:
+    if (plen)
+        *plen = 0;
+    return NULL;
+}
+
+void JS_FreeCString(JSContext *ctx, const char *ptr)
+{
+    JSString *p;
+    if (!ptr)
+        return;
+    /* purposely removing constness */
+    p = (JSString *)(void *)(ptr - offsetof(JSString, u));
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+}
+
+static int memcmp16_8(const uint16_t *src1, const uint8_t *src2, int len)
+{
+    int c, i;
+    for(i = 0; i < len; i++) {
+        c = src1[i] - src2[i];
+        if (c != 0)
+            return c;
+    }
+    return 0;
+}
+
+static int memcmp16(const uint16_t *src1, const uint16_t *src2, int len)
+{
+    int c, i;
+    for(i = 0; i < len; i++) {
+        c = src1[i] - src2[i];
+        if (c != 0)
+            return c;
+    }
+    return 0;
+}
+
+static int js_string_memcmp(const JSString *p1, const JSString *p2, int len)
+{
+    int res;
+
+    if (likely(!p1->is_wide_char)) {
+        if (likely(!p2->is_wide_char))
+            res = memcmp(p1->u.str8, p2->u.str8, len);
+        else
+            res = -memcmp16_8(p2->u.str16, p1->u.str8, len);
+    } else {
+        if (!p2->is_wide_char)
+            res = memcmp16_8(p1->u.str16, p2->u.str8, len);
+        else
+            res = memcmp16(p1->u.str16, p2->u.str16, len);
+    }
+    return res;
+}
+
+/* return < 0, 0 or > 0 */
+static int js_string_compare(JSContext *ctx,
+                             const JSString *p1, const JSString *p2)
+{
+    int res, len;
+    len = min_int(p1->len, p2->len);
+    res = js_string_memcmp(p1, p2, len);
+    if (res == 0) {
+        if (p1->len == p2->len)
+            res = 0;
+        else if (p1->len < p2->len)
+            res = -1;
+        else
+            res = 1;
+    }
+    return res;
+}
+
+static void copy_str16(uint16_t *dst, const JSString *p, int offset, int len)
+{
+    if (p->is_wide_char) {
+        memcpy(dst, p->u.str16 + offset, len * 2);
+    } else {
+        const uint8_t *src1 = p->u.str8 + offset;
+        int i;
+
+        for(i = 0; i < len; i++)
+            dst[i] = src1[i];
+    }
+}
+
+static JSValue JS_ConcatString1(JSContext *ctx,
+                                const JSString *p1, const JSString *p2)
+{
+    JSString *p;
+    uint32_t len;
+    int is_wide_char;
+
+    len = p1->len + p2->len;
+    if (len > JS_STRING_LEN_MAX)
+        return JS_ThrowInternalError(ctx, "string too long");
+    is_wide_char = p1->is_wide_char | p2->is_wide_char;
+    p = js_alloc_string(ctx, len, is_wide_char);
+    if (!p)
+        return JS_EXCEPTION;
+    if (!is_wide_char) {
+        memcpy(p->u.str8, p1->u.str8, p1->len);
+        memcpy(p->u.str8 + p1->len, p2->u.str8, p2->len);
+        p->u.str8[len] = '\0';
+    } else {
+        copy_str16(p->u.str16, p1, 0, p1->len);
+        copy_str16(p->u.str16 + p1->len, p2, 0, p2->len);
+    }
+    return JS_MKPTR(JS_TAG_STRING, p);
+}
+
+/* op1 and op2 are converted to strings. For convience, op1 or op2 =
+   JS_EXCEPTION are accepted and return JS_EXCEPTION.  */
+static JSValue JS_ConcatString(JSContext *ctx, JSValue op1, JSValue op2)
+{
+    JSValue ret;
+    JSString *p1, *p2;
+
+    if (unlikely(JS_VALUE_GET_TAG(op1) != JS_TAG_STRING)) {
+        op1 = JS_ToStringFree(ctx, op1);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            return JS_EXCEPTION;
+        }
+    }
+    if (unlikely(JS_VALUE_GET_TAG(op2) != JS_TAG_STRING)) {
+        op2 = JS_ToStringFree(ctx, op2);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            return JS_EXCEPTION;
+        }
+    }
+    p1 = JS_VALUE_GET_STRING(op1);
+    p2 = JS_VALUE_GET_STRING(op2);
+
+    /* XXX: could also check if p1 is empty */
+    if (p2->len == 0) {
+        goto ret_op1;
+    }
+    if (p1->header.ref_count == 1 && p1->is_wide_char == p2->is_wide_char
+    &&  js_malloc_usable_size(ctx, p1) >= sizeof(*p1) + ((p1->len + p2->len) << p2->is_wide_char) + 1 - p1->is_wide_char) {
+        /* Concatenate in place in available space at the end of p1 */
+        if (p1->is_wide_char) {
+            memcpy(p1->u.str16 + p1->len, p2->u.str16, p2->len << 1);
+            p1->len += p2->len;
+        } else {
+            memcpy(p1->u.str8 + p1->len, p2->u.str8, p2->len);
+            p1->len += p2->len;
+            p1->u.str8[p1->len] = '\0';
+        }
+    ret_op1:
+        JS_FreeValue(ctx, op2);
+        return op1;
+    }
+    ret = JS_ConcatString1(ctx, p1, p2);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return ret;
+}
+
+/* Shape support */
+
+static inline size_t get_shape_size(size_t hash_size, size_t prop_size)
+{
+    return hash_size * sizeof(uint32_t) + sizeof(JSShape) +
+        prop_size * sizeof(JSShapeProperty);
+}
+
+static inline JSShape *get_shape_from_alloc(void *sh_alloc, size_t hash_size)
+{
+    return (JSShape *)(void *)((uint32_t *)sh_alloc + hash_size);
+}
+
+static inline void *get_alloc_from_shape(JSShape *sh)
+{
+    return sh->prop_hash_end - ((intptr_t)sh->prop_hash_mask + 1);
+}
+
+static inline JSShapeProperty *get_shape_prop(JSShape *sh)
+{
+    return sh->prop;
+}
+
+static int init_shape_hash(JSRuntime *rt)
+{
+    rt->shape_hash_bits = 4;   /* 16 shapes */
+    rt->shape_hash_size = 1 << rt->shape_hash_bits;
+    rt->shape_hash_count = 0;
+    rt->shape_hash = js_mallocz_rt(rt, sizeof(rt->shape_hash[0]) *
+                                   rt->shape_hash_size);
+    if (!rt->shape_hash)
+        return -1;
+    return 0;
+}
+
+/* same magic hash multiplier as the Linux kernel */
+static uint32_t shape_hash(uint32_t h, uint32_t val)
+{
+    return (h + val) * 0x9e370001;
+}
+
+/* truncate the shape hash to 'hash_bits' bits */
+static uint32_t get_shape_hash(uint32_t h, int hash_bits)
+{
+    return h >> (32 - hash_bits);
+}
+
+static uint32_t shape_initial_hash(JSObject *proto)
+{
+    uint32_t h;
+    h = shape_hash(1, (uintptr_t)proto);
+    if (sizeof(proto) > 4)
+        h = shape_hash(h, (uint64_t)(uintptr_t)proto >> 32);
+    return h;
+}
+
+static int resize_shape_hash(JSRuntime *rt, int new_shape_hash_bits)
+{
+    int new_shape_hash_size, i;
+    uint32_t h;
+    JSShape **new_shape_hash, *sh, *sh_next;
+
+    new_shape_hash_size = 1 << new_shape_hash_bits;
+    new_shape_hash = js_mallocz_rt(rt, sizeof(rt->shape_hash[0]) *
+                                   new_shape_hash_size);
+    if (!new_shape_hash)
+        return -1;
+    for(i = 0; i < rt->shape_hash_size; i++) {
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh_next) {
+            sh_next = sh->shape_hash_next;
+            h = get_shape_hash(sh->hash, new_shape_hash_bits);
+            sh->shape_hash_next = new_shape_hash[h];
+            new_shape_hash[h] = sh;
+        }
+    }
+    js_free_rt(rt, rt->shape_hash);
+    rt->shape_hash_bits = new_shape_hash_bits;
+    rt->shape_hash_size = new_shape_hash_size;
+    rt->shape_hash = new_shape_hash;
+    return 0;
+}
+
+static void js_shape_hash_link(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t h;
+    h = get_shape_hash(sh->hash, rt->shape_hash_bits);
+    sh->shape_hash_next = rt->shape_hash[h];
+    rt->shape_hash[h] = sh;
+    rt->shape_hash_count++;
+}
+
+static void js_shape_hash_unlink(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t h;
+    JSShape **psh;
+
+    h = get_shape_hash(sh->hash, rt->shape_hash_bits);
+    psh = &rt->shape_hash[h];
+    while (*psh != sh)
+        psh = &(*psh)->shape_hash_next;
+    *psh = sh->shape_hash_next;
+    rt->shape_hash_count--;
+}
+
+/* create a new empty shape with prototype 'proto' */
+static no_inline JSShape *js_new_shape2(JSContext *ctx, JSObject *proto,
+                                        int hash_size, int prop_size)
+{
+    JSRuntime *rt = ctx->rt;
+    void *sh_alloc;
+    JSShape *sh;
+
+    /* resize the shape hash table if necessary */
+    if (2 * (rt->shape_hash_count + 1) > rt->shape_hash_size) {
+        resize_shape_hash(rt, rt->shape_hash_bits + 1);
+    }
+
+    sh_alloc = js_malloc(ctx, get_shape_size(hash_size, prop_size));
+    if (!sh_alloc)
+        return NULL;
+    sh = get_shape_from_alloc(sh_alloc, hash_size);
+    sh->header.ref_count = 1;
+    add_gc_object(rt, &sh->header, JS_GC_OBJ_TYPE_SHAPE);
+    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]) *
+           hash_size);
+    sh->prop_hash_mask = hash_size - 1;
+    sh->prop_count = 0;
+    sh->prop_size = prop_size;
+
+    /* insert in the hash table */
+    sh->hash = shape_initial_hash(proto);
+    sh->is_hashed = TRUE;
+    sh->has_small_array_index = FALSE;
+    js_shape_hash_link(ctx->rt, sh);
+    return sh;
+}
+
+static JSShape *js_new_shape(JSContext *ctx, JSObject *proto)
+{
+    return js_new_shape2(ctx, proto, JS_PROP_INITIAL_HASH_SIZE,
+                         JS_PROP_INITIAL_SIZE);
+}
+
+/* The shape is cloned. The new shape is not inserted in the shape
+   hash table */
+static JSShape *js_clone_shape(JSContext *ctx, JSShape *sh1)
+{
+    JSShape *sh;
+    void *sh_alloc, *sh_alloc1;
+    size_t size;
+    JSShapeProperty *pr;
+    uint32_t i, hash_size;
+
+    hash_size = sh1->prop_hash_mask + 1;
+    size = get_shape_size(hash_size, sh1->prop_size);
+    sh_alloc = js_malloc(ctx, size);
+    if (!sh_alloc)
+        return NULL;
+    sh_alloc1 = get_alloc_from_shape(sh1);
+    memcpy(sh_alloc, sh_alloc1, size);
+    sh = get_shape_from_alloc(sh_alloc, hash_size);
+    sh->header.ref_count = 1;
+    add_gc_object(ctx->rt, &sh->header, JS_GC_OBJ_TYPE_SHAPE);
+    sh->is_hashed = FALSE;
+    if (sh->proto) {
+        JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    }
+    for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count; i++, pr++) {
+        JS_DupAtom(ctx, pr->atom);
+    }
+    return sh;
+}
+
+static JSShape *js_dup_shape(JSShape *sh)
+{
+    sh->header.ref_count++;
+    return sh;
+}
+
+static void js_free_shape0(JSRuntime *rt, JSShape *sh)
+{
+    uint32_t i;
+    JSShapeProperty *pr;
+
+    assert(sh->header.ref_count == 0);
+    if (sh->is_hashed)
+        js_shape_hash_unlink(rt, sh);
+    if (sh->proto != NULL) {
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    }
+    pr = get_shape_prop(sh);
+    for(i = 0; i < sh->prop_count; i++) {
+        JS_FreeAtomRT(rt, pr->atom);
+        pr++;
+    }
+    remove_gc_object(&sh->header);
+    js_free_rt(rt, get_alloc_from_shape(sh));
+}
+
+static void js_free_shape(JSRuntime *rt, JSShape *sh)
+{
+    if (unlikely(--sh->header.ref_count <= 0)) {
+        js_free_shape0(rt, sh);
+    }
+}
+
+static void js_free_shape_null(JSRuntime *rt, JSShape *sh)
+{
+    if (sh)
+        js_free_shape(rt, sh);
+}
+
+/* make space to hold at least 'count' properties */
+static no_inline int resize_properties(JSContext *ctx, JSShape **psh,
+                                       JSObject *p, uint32_t count)
+{
+    JSShape *sh;
+    uint32_t new_size, new_hash_size, new_hash_mask, i;
+    JSShapeProperty *pr;
+    void *sh_alloc;
+    intptr_t h;
+
+    sh = *psh;
+    new_size = max_int(count, sh->prop_size * 3 / 2);
+    /* Reallocate prop array first to avoid crash or size inconsistency
+       in case of memory allocation failure */
+    if (p) {
+        JSProperty *new_prop;
+        new_prop = js_realloc(ctx, p->prop, sizeof(new_prop[0]) * new_size);
+        if (unlikely(!new_prop))
+            return -1;
+        p->prop = new_prop;
+    }
+    new_hash_size = sh->prop_hash_mask + 1;
+    while (new_hash_size < new_size)
+        new_hash_size = 2 * new_hash_size;
+    if (new_hash_size != (sh->prop_hash_mask + 1)) {
+        JSShape *old_sh;
+        /* 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);
+        /* copy all the fields and the properties */
+        memcpy(sh, old_sh,
+               sizeof(JSShape) + sizeof(sh->prop[0]) * old_sh->prop_count);
+        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);
+        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;
+            }
+        }
+        js_free(ctx, get_alloc_from_shape(old_sh));
+    } else {
+        /* only resize the properties */
+        list_del(&sh->header.link);
+        sh_alloc = js_realloc(ctx, get_alloc_from_shape(sh),
+                              get_shape_size(new_hash_size, new_size));
+        if (unlikely(!sh_alloc)) {
+            /* insert again in the GC list */
+            list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
+            return -1;
+        }
+        sh = get_shape_from_alloc(sh_alloc, new_hash_size);
+        list_add_tail(&sh->header.link, &ctx->rt->gc_obj_list);
+    }
+    *psh = sh;
+    sh->prop_size = new_size;
+    return 0;
+}
+
+static int add_shape_property(JSContext *ctx, JSShape **psh,
+                              JSObject *p, JSAtom atom, int prop_flags)
+{
+    JSRuntime *rt = ctx->rt;
+    JSShape *sh = *psh;
+    JSShapeProperty *pr, *prop;
+    uint32_t hash_mask, new_shape_hash = 0;
+    intptr_t h;
+
+    /* update the shape hash */
+    if (sh->is_hashed) {
+        js_shape_hash_unlink(rt, sh);
+        new_shape_hash = shape_hash(shape_hash(sh->hash, atom), prop_flags);
+    }
+
+    if (unlikely(sh->prop_count >= sh->prop_size)) {
+        if (resize_properties(ctx, psh, p, sh->prop_count + 1)) {
+            /* in case of error, reinsert in the hash table.
+               sh is still valid if resize_properties() failed */
+            if (sh->is_hashed)
+                js_shape_hash_link(rt, sh);
+            return -1;
+        }
+        sh = *psh;
+    }
+    if (sh->is_hashed) {
+        sh->hash = new_shape_hash;
+        js_shape_hash_link(rt, sh);
+    }
+    /* Initialize the new shape property.
+       The object property at p->prop[sh->prop_count] is uninitialized */
+    prop = get_shape_prop(sh);
+    pr = &prop[sh->prop_count++];
+    pr->atom = JS_DupAtom(ctx, atom);
+    pr->flags = prop_flags;
+    sh->has_small_array_index |= __JS_AtomIsTaggedInt(atom);
+    /* 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;
+    return 0;
+}
+
+/* find a hashed empty shape matching the prototype. Return NULL if
+   not found */
+static JSShape *find_hashed_shape_proto(JSRuntime *rt, JSObject *proto)
+{
+    JSShape *sh1;
+    uint32_t h, h1;
+
+    h = shape_initial_hash(proto);
+    h1 = get_shape_hash(h, rt->shape_hash_bits);
+    for(sh1 = rt->shape_hash[h1]; sh1 != NULL; sh1 = sh1->shape_hash_next) {
+        if (sh1->hash == h &&
+            sh1->proto == proto &&
+            sh1->prop_count == 0) {
+            return sh1;
+        }
+    }
+    return NULL;
+}
+
+/* find a hashed shape matching sh + (prop, prop_flags). Return NULL if
+   not found */
+static JSShape *find_hashed_shape_prop(JSRuntime *rt, JSShape *sh,
+                                       JSAtom atom, int prop_flags)
+{
+    JSShape *sh1;
+    uint32_t h, h1, i, n;
+
+    h = sh->hash;
+    h = shape_hash(h, atom);
+    h = shape_hash(h, prop_flags);
+    h1 = get_shape_hash(h, rt->shape_hash_bits);
+    for(sh1 = rt->shape_hash[h1]; sh1 != NULL; sh1 = sh1->shape_hash_next) {
+        /* we test the hash first so that the rest is done only if the
+           shapes really match */
+        if (sh1->hash == h &&
+            sh1->proto == sh->proto &&
+            sh1->prop_count == ((n = sh->prop_count) + 1)) {
+            for(i = 0; i < n; i++) {
+                if (unlikely(sh1->prop[i].atom != sh->prop[i].atom) ||
+                    unlikely(sh1->prop[i].flags != sh->prop[i].flags))
+                    goto next;
+            }
+            if (unlikely(sh1->prop[n].atom != atom) ||
+                unlikely(sh1->prop[n].flags != prop_flags))
+                goto next;
+            return sh1;
+        }
+    next: ;
+    }
+    return NULL;
+}
+
+static __maybe_unused void JS_DumpShape(JSRuntime *rt, int i, JSShape *sh)
+{
+    char atom_buf[ATOM_GET_STR_BUF_SIZE];
+    int j;
+
+    /* XXX: should output readable class prototype */
+    printf("%5d %3d%c %14p %5d %5d", i,
+           sh->header.ref_count, " *"[sh->is_hashed],
+           (void *)sh->proto, sh->prop_size, sh->prop_count);
+    for(j = 0; j < sh->prop_count; j++) {
+        printf(" %s", JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf),
+                                      sh->prop[j].atom));
+    }
+    printf("\n");
+}
+
+static __maybe_unused void JS_DumpShapes(JSRuntime *rt)
+{
+    int i;
+    JSShape *sh;
+    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++) {
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh->shape_hash_next) {
+            JS_DumpShape(rt, i, sh);
+            assert(sh->is_hashed);
+        }
+    }
+    /* dump non-hashed shapes */
+    list_for_each(el, &rt->gc_obj_list) {
+        gp = list_entry(el, JSGCObjectHeader, link);
+        if (gp->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+            p = (JSObject *)gp;
+            if (!p->shape->is_hashed) {
+                JS_DumpShape(rt, -1, p->shape);
+            }
+        }
+    }
+    printf("}\n");
+}
+
+static JSValue JS_NewObjectFromShape(JSContext *ctx, JSShape *sh, JSClassID class_id)
+{
+    JSObject *p;
+
+    js_trigger_gc(ctx->rt, sizeof(JSObject));
+    p = js_malloc(ctx, sizeof(JSObject));
+    if (unlikely(!p))
+        goto fail;
+    p->class_id = class_id;
+    p->extensible = TRUE;
+    p->free_mark = 0;
+    p->is_exotic = 0;
+    p->fast_array = 0;
+    p->is_constructor = 0;
+    p->is_uncatchable_error = 0;
+    p->is_class = 0;
+    p->tmp_mark = 0;
+    p->first_weak_ref = NULL;
+    p->u.opaque = NULL;
+    p->shape = sh;
+    p->prop = js_malloc(ctx, sizeof(JSProperty) * sh->prop_size);
+    if (unlikely(!p->prop)) {
+        js_free(ctx, p);
+    fail:
+        js_free_shape(ctx->rt, sh);
+        return JS_EXCEPTION;
+    }
+
+    switch(class_id) {
+    case JS_CLASS_OBJECT:
+        break;
+    case JS_CLASS_ARRAY:
+        {
+            JSProperty *pr;
+            p->is_exotic = 1;
+            p->fast_array = 1;
+            p->u.array.u.values = NULL;
+            p->u.array.count = 0;
+            p->u.array.u1.size = 0;
+            /* the length property is always the first one */
+            if (likely(sh == ctx->array_shape)) {
+                pr = &p->prop[0];
+            } else {
+                /* only used for the first array */
+                /* cannot fail */
+                pr = add_property(ctx, p, JS_ATOM_length,
+                                  JS_PROP_WRITABLE | JS_PROP_LENGTH);
+            }
+            pr->u.value = JS_NewInt32(ctx, 0);
+        }
+        break;
+    case JS_CLASS_C_FUNCTION:
+        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:
+    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:
+#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;
+        p->u.array.count = 0;
+        break;
+    case JS_CLASS_DATAVIEW:
+        p->u.array.u.ptr = NULL;
+        p->u.array.count = 0;
+        break;
+    case JS_CLASS_NUMBER:
+    case JS_CLASS_STRING:
+    case JS_CLASS_BOOLEAN:
+    case JS_CLASS_SYMBOL:
+    case JS_CLASS_DATE:
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_INT:
+    case JS_CLASS_BIG_FLOAT:
+    case JS_CLASS_BIG_DECIMAL:
+#endif
+        p->u.object_data = JS_UNDEFINED;
+        goto set_exotic;
+    case JS_CLASS_REGEXP:
+        p->u.regexp.pattern = NULL;
+        p->u.regexp.bytecode = NULL;
+        goto set_exotic;
+    default:
+    set_exotic:
+        if (ctx->rt->class_array[class_id].exotic) {
+            p->is_exotic = 1;
+        }
+        break;
+    }
+    p->header.ref_count = 1;
+    add_gc_object(ctx->rt, &p->header, JS_GC_OBJ_TYPE_JS_OBJECT);
+    return JS_MKPTR(JS_TAG_OBJECT, p);
+}
+
+static JSObject *get_proto_obj(JSValueConst proto_val)
+{
+    if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_OBJECT)
+        return NULL;
+    else
+        return JS_VALUE_GET_OBJ(proto_val);
+}
+
+/* WARNING: proto must be an object or JS_NULL */
+JSValue JS_NewObjectProtoClass(JSContext *ctx, JSValueConst proto_val,
+                               JSClassID class_id)
+{
+    JSShape *sh;
+    JSObject *proto;
+
+    proto = get_proto_obj(proto_val);
+    sh = find_hashed_shape_proto(ctx->rt, proto);
+    if (likely(sh)) {
+        sh = js_dup_shape(sh);
+    } else {
+        sh = js_new_shape(ctx, proto);
+        if (!sh)
+            return JS_EXCEPTION;
+    }
+    return JS_NewObjectFromShape(ctx, sh, class_id);
+}
+
+#if 0
+static JSValue JS_GetObjectData(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        switch(p->class_id) {
+        case JS_CLASS_NUMBER:
+        case JS_CLASS_STRING:
+        case JS_CLASS_BOOLEAN:
+        case JS_CLASS_SYMBOL:
+        case JS_CLASS_DATE:
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT:
+        case JS_CLASS_BIG_FLOAT:
+        case JS_CLASS_BIG_DECIMAL:
+#endif
+            return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_UNDEFINED;
+}
+#endif
+
+static int JS_SetObjectData(JSContext *ctx, JSValueConst obj, JSValue val)
+{
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        switch(p->class_id) {
+        case JS_CLASS_NUMBER:
+        case JS_CLASS_STRING:
+        case JS_CLASS_BOOLEAN:
+        case JS_CLASS_SYMBOL:
+        case JS_CLASS_DATE:
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT:
+        case JS_CLASS_BIG_FLOAT:
+        case JS_CLASS_BIG_DECIMAL:
+#endif
+            JS_FreeValue(ctx, p->u.object_data);
+            p->u.object_data = val;
+            return 0;
+        }
+    }
+    JS_FreeValue(ctx, val);
+    if (!JS_IsException(obj))
+        JS_ThrowTypeError(ctx, "invalid object type");
+    return -1;
+}
+
+JSValue JS_NewObjectClass(JSContext *ctx, int class_id)
+{
+    return JS_NewObjectProtoClass(ctx, ctx->class_proto[class_id], class_id);
+}
+
+JSValue JS_NewObjectProto(JSContext *ctx, JSValueConst proto)
+{
+    return JS_NewObjectProtoClass(ctx, proto, JS_CLASS_OBJECT);
+}
+
+JSValue JS_NewArray(JSContext *ctx)
+{
+    return JS_NewObjectFromShape(ctx, js_dup_shape(ctx->array_shape),
+                                 JS_CLASS_ARRAY);
+}
+
+JSValue JS_NewObject(JSContext *ctx)
+{
+    /* inline JS_NewObjectClass(ctx, JS_CLASS_OBJECT); */
+    return JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT], JS_CLASS_OBJECT);
+}
+
+static void js_function_set_properties(JSContext *ctx, JSValueConst func_obj,
+                                       JSAtom name, int len)
+{
+    /* ES6 feature non compatible with ES5.1: length is configurable */
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_length, JS_NewInt32(ctx, len),
+                           JS_PROP_CONFIGURABLE);
+    JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name,
+                           JS_AtomToString(ctx, name), JS_PROP_CONFIGURABLE);
+}
+
+static BOOL js_class_has_bytecode(JSClassID class_id)
+{
+    return (class_id == JS_CLASS_BYTECODE_FUNCTION ||
+            class_id == JS_CLASS_GENERATOR_FUNCTION ||
+            class_id == JS_CLASS_ASYNC_FUNCTION ||
+            class_id == JS_CLASS_ASYNC_GENERATOR_FUNCTION);
+}
+
+/* return NULL without exception if not a function or no bytecode */
+static JSFunctionBytecode *JS_GetFunctionBytecode(JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(val);
+    if (!js_class_has_bytecode(p->class_id))
+        return NULL;
+    return p->u.func.function_bytecode;
+}
+
+static void js_method_set_home_object(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst home_obj)
+{
+    JSObject *p, *p1;
+    JSFunctionBytecode *b;
+
+    if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+        return;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    if (!js_class_has_bytecode(p->class_id))
+        return;
+    b = p->u.func.function_bytecode;
+    if (b->need_home_object) {
+        p1 = p->u.func.home_object;
+        if (p1) {
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+        }
+        if (JS_VALUE_GET_TAG(home_obj) == JS_TAG_OBJECT)
+            p1 = JS_VALUE_GET_OBJ(JS_DupValue(ctx, home_obj));
+        else
+            p1 = NULL;
+        p->u.func.home_object = p1;
+    }
+}
+
+static JSValue js_get_function_name(JSContext *ctx, JSAtom name)
+{
+    JSValue name_str;
+
+    name_str = JS_AtomToString(ctx, name);
+    if (JS_AtomSymbolHasDescription(ctx, name)) {
+        name_str = JS_ConcatString3(ctx, "[", name_str, "]");
+    }
+    return name_str;
+}
+
+/* Modify the name of a method according to the atom and
+   'flags'. 'flags' is a bitmask of JS_PROP_HAS_GET and
+   JS_PROP_HAS_SET. Also set the home object of the method.
+   Return < 0 if exception. */
+static int js_method_set_properties(JSContext *ctx, JSValueConst func_obj,
+                                    JSAtom name, int flags, JSValueConst home_obj)
+{
+    JSValue name_str;
+
+    name_str = js_get_function_name(ctx, name);
+    if (flags & JS_PROP_HAS_GET) {
+        name_str = JS_ConcatString3(ctx, "get ", name_str, "");
+    } else if (flags & JS_PROP_HAS_SET) {
+        name_str = JS_ConcatString3(ctx, "set ", name_str, "");
+    }
+    if (JS_IsException(name_str))
+        return -1;
+    if (JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_name, name_str,
+                               JS_PROP_CONFIGURABLE) < 0)
+        return -1;
+    js_method_set_home_object(ctx, func_obj, home_obj);
+    return 0;
+}
+
+/* Note: at least 'length' arguments will be readable in 'argv' */
+static JSValue JS_NewCFunction3(JSContext *ctx, JSCFunction *func,
+                                const char *name,
+                                int length, JSCFunctionEnum cproto, int magic,
+                                JSValueConst proto_val)
+{
+    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.c_function.generic = func;
+    p->u.cfunc.length = length;
+    p->u.cfunc.cproto = cproto;
+    p->u.cfunc.magic = magic;
+    p->is_constructor = (cproto == JS_CFUNC_constructor ||
+                         cproto == JS_CFUNC_constructor_magic ||
+                         cproto == JS_CFUNC_constructor_or_func ||
+                         cproto == JS_CFUNC_constructor_or_func_magic);
+    if (!name)
+        name = "";
+    name_atom = JS_NewAtom(ctx, name);
+    js_function_set_properties(ctx, func_obj, name_atom, length);
+    JS_FreeAtom(ctx, name_atom);
+    return func_obj;
+}
+
+/* Note: at least 'length' arguments will be readable in 'argv' */
+JSValue JS_NewCFunction2(JSContext *ctx, JSCFunction *func,
+                         const char *name,
+                         int length, JSCFunctionEnum cproto, int magic)
+{
+    return JS_NewCFunction3(ctx, func, name, length, cproto, magic,
+                            ctx->function_proto);
+}
+
+typedef struct JSCFunctionDataRecord {
+    JSCFunctionData *func;
+    uint8_t length;
+    uint8_t data_len;
+    uint16_t magic;
+    JSValue data[0];
+} JSCFunctionDataRecord;
+
+static void js_c_function_data_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(val, JS_CLASS_C_FUNCTION_DATA);
+    int i;
+
+    if (s) {
+        for(i = 0; i < s->data_len; i++) {
+            JS_FreeValueRT(rt, s->data[i]);
+        }
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_c_function_data_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(val, JS_CLASS_C_FUNCTION_DATA);
+    int i;
+
+    if (s) {
+        for(i = 0; i < s->data_len; i++) {
+            JS_MarkValue(rt, s->data[i], mark_func);
+        }
+    }
+}
+
+static JSValue js_c_function_data_call(JSContext *ctx, JSValueConst func_obj,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv, int flags)
+{
+    JSCFunctionDataRecord *s = JS_GetOpaque(func_obj, JS_CLASS_C_FUNCTION_DATA);
+    JSValueConst *arg_buf;
+    int i;
+
+    /* XXX: could add the function on the stack for debug */
+    if (unlikely(argc < s->length)) {
+        arg_buf = alloca(sizeof(arg_buf[0]) * s->length);
+        for(i = 0; i < argc; i++)
+            arg_buf[i] = argv[i];
+        for(i = argc; i < s->length; i++)
+            arg_buf[i] = JS_UNDEFINED;
+    } else {
+        arg_buf = argv;
+    }
+
+    return s->func(ctx, this_val, argc, arg_buf, s->magic, s->data);
+}
+
+JSValue JS_NewCFunctionData(JSContext *ctx, JSCFunctionData *func,
+                            int length, int magic, int data_len,
+                            JSValueConst *data)
+{
+    JSCFunctionDataRecord *s;
+    JSValue func_obj;
+    int i;
+
+    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                      JS_CLASS_C_FUNCTION_DATA);
+    if (JS_IsException(func_obj))
+        return func_obj;
+    s = js_malloc(ctx, sizeof(*s) + data_len * sizeof(JSValue));
+    if (!s) {
+        JS_FreeValue(ctx, func_obj);
+        return JS_EXCEPTION;
+    }
+    s->func = func;
+    s->length = length;
+    s->data_len = data_len;
+    s->magic = magic;
+    for(i = 0; i < data_len; i++)
+        s->data[i] = JS_DupValue(ctx, data[i]);
+    JS_SetOpaque(func_obj, s);
+    js_function_set_properties(ctx, func_obj,
+                               JS_ATOM_empty_string, length);
+    return func_obj;
+}
+
+static void free_property(JSRuntime *rt, JSProperty *pr, int prop_flags)
+{
+    if (unlikely(prop_flags & JS_PROP_TMASK)) {
+        if ((prop_flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+            if (pr->u.getset.getter)
+                JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+            if (pr->u.getset.setter)
+                JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+        } 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 */
+        }
+    } else {
+        JS_FreeValueRT(rt, pr->u.value);
+    }
+}
+
+static force_inline JSShapeProperty *find_own_property1(JSObject *p,
+                                                        JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *prop;
+    intptr_t h;
+    sh = p->shape;
+    h = (uintptr_t)atom & sh->prop_hash_mask;
+    h = sh->prop_hash_end[-h - 1];
+    prop = get_shape_prop(sh);
+    while (h) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            return pr;
+        }
+        h = pr->hash_next;
+    }
+    return NULL;
+}
+
+static force_inline JSShapeProperty *find_own_property(JSProperty **ppr,
+                                                       JSObject *p,
+                                                       JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *prop;
+    intptr_t h;
+    sh = p->shape;
+    h = (uintptr_t)atom & sh->prop_hash_mask;
+    h = sh->prop_hash_end[-h - 1];
+    prop = get_shape_prop(sh);
+    while (h) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            *ppr = &p->prop[h - 1];
+            /* the compiler should be able to assume that pr != NULL here */
+            return pr;
+        }
+        h = pr->hash_next;
+    }
+    *ppr = NULL;
+    return NULL;
+}
+
+/* indicate that the object may be part of a function prototype cycle */
+static void set_cycle_flag(JSContext *ctx, JSValueConst obj)
+{
+}
+
+static void free_var_ref(JSRuntime *rt, JSVarRef *var_ref)
+{
+    if (var_ref) {
+        assert(var_ref->header.ref_count > 0);
+        if (--var_ref->header.ref_count == 0) {
+            if (var_ref->is_detached) {
+                JS_FreeValueRT(rt, var_ref->value);
+                remove_gc_object(&var_ref->header);
+            } else {
+                list_del(&var_ref->header.link); /* still on the stack */
+            }
+            js_free_rt(rt, var_ref);
+        }
+    }
+}
+
+static void js_array_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    int i;
+
+    for(i = 0; i < p->u.array.count; i++) {
+        JS_FreeValueRT(rt, p->u.array.u.values[i]);
+    }
+    js_free_rt(rt, p->u.array.u.values);
+}
+
+static void js_array_mark(JSRuntime *rt, JSValueConst val,
+                          JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    int i;
+
+    for(i = 0; i < p->u.array.count; i++) {
+        JS_MarkValue(rt, p->u.array.u.values[i], mark_func);
+    }
+}
+
+static void js_object_data_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JS_FreeValueRT(rt, p->u.object_data);
+    p->u.object_data = JS_UNDEFINED;
+}
+
+static void js_object_data_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JS_MarkValue(rt, p->u.object_data, mark_func);
+}
+
+static void js_bytecode_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p1, *p = JS_VALUE_GET_OBJ(val);
+    JSFunctionBytecode *b;
+    JSVarRef **var_refs;
+    int i;
+
+    p1 = p->u.func.home_object;
+    if (p1) {
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, p1));
+    }
+    b = p->u.func.function_bytecode;
+    if (b) {
+        var_refs = p->u.func.var_refs;
+        if (var_refs) {
+            for(i = 0; i < b->closure_var_count; i++)
+                free_var_ref(rt, var_refs[i]);
+            js_free_rt(rt, var_refs);
+        }
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b));
+    }
+}
+
+static void js_bytecode_function_mark(JSRuntime *rt, JSValueConst val,
+                                      JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSVarRef **var_refs = p->u.func.var_refs;
+    JSFunctionBytecode *b = p->u.func.function_bytecode;
+    int i;
+
+    if (p->u.func.home_object) {
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, p->u.func.home_object),
+                     mark_func);
+    }
+    if (b) {
+        if (var_refs) {
+            for(i = 0; i < b->closure_var_count; i++) {
+                JSVarRef *var_ref = var_refs[i];
+                if (var_ref && var_ref->is_detached) {
+                    mark_func(rt, &var_ref->header);
+                }
+            }
+        }
+        /* must mark the function bytecode because template objects may be
+           part of a cycle */
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_FUNCTION_BYTECODE, b), mark_func);
+    }
+}
+
+static void js_bound_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSBoundFunction *bf = p->u.bound_function;
+    int i;
+
+    JS_FreeValueRT(rt, bf->func_obj);
+    JS_FreeValueRT(rt, bf->this_val);
+    for(i = 0; i < bf->argc; i++) {
+        JS_FreeValueRT(rt, bf->argv[i]);
+    }
+    js_free_rt(rt, bf);
+}
+
+static void js_bound_function_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSBoundFunction *bf = p->u.bound_function;
+    int i;
+
+    JS_MarkValue(rt, bf->func_obj, mark_func);
+    JS_MarkValue(rt, bf->this_val, mark_func);
+    for(i = 0; i < bf->argc; i++)
+        JS_MarkValue(rt, bf->argv[i], mark_func);
+}
+
+static void js_for_in_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSForInIterator *it = p->u.for_in_iterator;
+    JS_FreeValueRT(rt, it->obj);
+    js_free_rt(rt, it);
+}
+
+static void js_for_in_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSForInIterator *it = p->u.for_in_iterator;
+    JS_MarkValue(rt, it->obj, mark_func);
+}
+
+static void free_object(JSRuntime *rt, JSObject *p)
+{
+    int i;
+    JSClassFinalizer *finalizer;
+    JSShape *sh;
+    JSShapeProperty *pr;
+
+    p->free_mark = 1; /* used to tell the object is invalid when
+                         freeing cycles */
+    /* free all the fields */
+    sh = p->shape;
+    pr = get_shape_prop(sh);
+    for(i = 0; i < sh->prop_count; i++) {
+        free_property(rt, &p->prop[i], pr->flags);
+        pr++;
+    }
+    js_free_rt(rt, p->prop);
+    /* as an optimization we destroy the shape immediately without
+       putting it in gc_zero_ref_count_list */
+    js_free_shape(rt, sh);
+
+    /* fail safe */
+    p->shape = NULL;
+    p->prop = NULL;
+
+    if (unlikely(p->first_weak_ref)) {
+        reset_weak_ref(rt, p);
+    }
+
+    finalizer = rt->class_array[p->class_id].finalizer;
+    if (finalizer)
+        (*finalizer)(rt, JS_MKPTR(JS_TAG_OBJECT, p));
+
+    /* fail safe */
+    p->class_id = 0;
+    p->u.opaque = NULL;
+    p->u.func.var_refs = NULL;
+    p->u.func.home_object = NULL;
+
+    remove_gc_object(&p->header);
+    if (rt->gc_phase == JS_GC_PHASE_REMOVE_CYCLES && p->header.ref_count != 0) {
+        list_add_tail(&p->header.link, &rt->gc_zero_ref_count_list);
+    } else {
+        js_free_rt(rt, p);
+    }
+}
+
+static void free_gc_object(JSRuntime *rt, JSGCObjectHeader *gp)
+{
+    switch(gp->gc_obj_type) {
+    case JS_GC_OBJ_TYPE_JS_OBJECT:
+        free_object(rt, (JSObject *)gp);
+        break;
+    case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+        free_function_bytecode(rt, (JSFunctionBytecode *)gp);
+        break;
+    default:
+        abort();
+    }
+}
+
+static void free_zero_refcount(JSRuntime *rt)
+{
+    struct list_head *el;
+    JSGCObjectHeader *p;
+
+    rt->gc_phase = JS_GC_PHASE_DECREF;
+    for(;;) {
+        el = rt->gc_zero_ref_count_list.next;
+        if (el == &rt->gc_zero_ref_count_list)
+            break;
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->ref_count == 0);
+        free_gc_object(rt, p);
+    }
+    rt->gc_phase = JS_GC_PHASE_NONE;
+}
+
+/* called with the ref_count of 'v' reaches zero. */
+void __JS_FreeValueRT(JSRuntime *rt, JSValue v)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(v);
+
+#ifdef DUMP_FREE
+    {
+        printf("Freeing ");
+        if (tag == JS_TAG_OBJECT) {
+            JS_DumpObject(rt, JS_VALUE_GET_OBJ(v));
+        } else {
+            JS_DumpValueShort(rt, v);
+            printf("\n");
+        }
+    }
+#endif
+
+    switch(tag) {
+    case JS_TAG_STRING:
+        {
+            JSString *p = JS_VALUE_GET_STRING(v);
+            if (p->atom_type) {
+                JS_FreeAtomStruct(rt, p);
+            } else {
+#ifdef DUMP_LEAKS
+                list_del(&p->link);
+#endif
+                js_free_rt(rt, p);
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+    case JS_TAG_FUNCTION_BYTECODE:
+        {
+            JSGCObjectHeader *p = JS_VALUE_GET_PTR(v);
+            if (rt->gc_phase != JS_GC_PHASE_REMOVE_CYCLES) {
+                list_del(&p->link);
+                list_add(&p->link, &rt->gc_zero_ref_count_list);
+                if (rt->gc_phase == JS_GC_PHASE_NONE) {
+                    free_zero_refcount(rt);
+                }
+            }
+        }
+        break;
+    case JS_TAG_MODULE:
+        abort(); /* never freed here */
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *bf = JS_VALUE_GET_PTR(v);
+            bf_delete(&bf->num);
+            js_free_rt(rt, bf);
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *bf = JS_VALUE_GET_PTR(v);
+            bfdec_delete(&bf->num);
+            js_free_rt(rt, bf);
+        }
+        break;
+#endif
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(v);
+            JS_FreeAtomStruct(rt, p);
+        }
+        break;
+    default:
+        printf("__JS_FreeValue: unknown tag=%d\n", tag);
+        abort();
+    }
+}
+
+void __JS_FreeValue(JSContext *ctx, JSValue v)
+{
+    __JS_FreeValueRT(ctx->rt, v);
+}
+
+/* garbage collection */
+
+static void add_gc_object(JSRuntime *rt, JSGCObjectHeader *h,
+                          JSGCObjectTypeEnum type)
+{
+    h->mark = 0;
+    h->gc_obj_type = type;
+    list_add_tail(&h->link, &rt->gc_obj_list);
+}
+
+static void remove_gc_object(JSGCObjectHeader *h)
+{
+    list_del(&h->link);
+}
+
+void JS_MarkValue(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    if (JS_VALUE_HAS_REF_COUNT(val)) {
+        switch(JS_VALUE_GET_TAG(val)) {
+        case JS_TAG_OBJECT:
+        case JS_TAG_FUNCTION_BYTECODE:
+            mark_func(rt, JS_VALUE_GET_PTR(val));
+            break;
+        default:
+            break;
+        }
+    }
+}
+
+static void mark_children(JSRuntime *rt, JSGCObjectHeader *gp,
+                          JS_MarkFunc *mark_func)
+{
+    switch(gp->gc_obj_type) {
+    case JS_GC_OBJ_TYPE_JS_OBJECT:
+        {
+            JSObject *p = (JSObject *)gp;
+            JSShapeProperty *prs;
+            JSShape *sh;
+            int i;
+            sh = p->shape;
+            mark_func(rt, &sh->header);
+            /* mark all the fields */
+            prs = get_shape_prop(sh);
+            for(i = 0; i < sh->prop_count; i++) {
+                JSProperty *pr = &p->prop[i];
+                if (prs->atom != JS_ATOM_NULL) {
+                    if (prs->flags & JS_PROP_TMASK) {
+                        if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                            if (pr->u.getset.getter)
+                                mark_func(rt, &pr->u.getset.getter->header);
+                            if (pr->u.getset.setter)
+                                mark_func(rt, &pr->u.getset.setter->header);
+                        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                            if (pr->u.var_ref->is_detached) {
+                                /* Note: the tag does not matter
+                                   provided it is a GC object */
+                                mark_func(rt, &pr->u.var_ref->header);
+                            }
+                        } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                            /* nothing to do */
+                        }
+                    } else {
+                        JS_MarkValue(rt, pr->u.value, mark_func);
+                    }
+                }
+                prs++;
+            }
+
+            if (p->class_id != JS_CLASS_OBJECT) {
+                JSClassGCMark *gc_mark;
+                gc_mark = rt->class_array[p->class_id].gc_mark;
+                if (gc_mark)
+                    gc_mark(rt, JS_MKPTR(JS_TAG_OBJECT, p), mark_func);
+            }
+        }
+        break;
+    case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+        /* the template objects can be part of a cycle */
+        {
+            JSFunctionBytecode *b = (JSFunctionBytecode *)gp;
+            int i;
+            for(i = 0; i < b->cpool_count; i++) {
+                JS_MarkValue(rt, b->cpool[i], mark_func);
+            }
+        }
+        break;
+    case JS_GC_OBJ_TYPE_VAR_REF:
+        {
+            JSVarRef *var_ref = (JSVarRef *)gp;
+            /* only detached variable referenced are taken into account */
+            assert(var_ref->is_detached);
+            JS_MarkValue(rt, *var_ref->pvalue, mark_func);
+        }
+        break;
+    case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+        {
+            JSAsyncFunctionData *s = (JSAsyncFunctionData *)gp;
+            if (s->is_active)
+                async_func_mark(rt, &s->func_state, mark_func);
+            JS_MarkValue(rt, s->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, s->resolving_funcs[1], mark_func);
+        }
+        break;
+    case JS_GC_OBJ_TYPE_SHAPE:
+        {
+            JSShape *sh = (JSShape *)gp;
+            if (sh->proto != NULL) {
+                mark_func(rt, &sh->proto->header);
+            }
+        }
+        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);
+    p->ref_count--;
+    if (p->ref_count == 0 && p->mark == 1) {
+        list_del(&p->link);
+        list_add_tail(&p->link, &rt->tmp_obj_list);
+    }
+}
+
+static void gc_decref(JSRuntime *rt)
+{
+    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
+       objects and move the GC objects with zero refcount to
+       tmp_obj_list */
+    list_for_each_safe(el, el1, &rt->gc_obj_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->mark == 0);
+        mark_children(rt, p, gc_decref_child);
+        p->mark = 1;
+        if (p->ref_count == 0) {
+            list_del(&p->link);
+            list_add_tail(&p->link, &rt->tmp_obj_list);
+        }
+    }
+}
+
+static void gc_scan_incref_child(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    p->ref_count++;
+    if (p->ref_count == 1) {
+        /* ref_count was 0: remove from tmp_obj_list and add at the
+           end of gc_obj_list */
+        list_del(&p->link);
+        list_add_tail(&p->link, &rt->gc_obj_list);
+        p->mark = 0; /* reset the mark for the next GC call */
+    }
+}
+
+static void gc_scan_incref_child2(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    p->ref_count++;
+}
+
+static void gc_scan(JSRuntime *rt)
+{
+    struct list_head *el;
+    JSGCObjectHeader *p;
+
+    /* keep the objects with a refcount > 0 and their children. */
+    list_for_each(el, &rt->gc_obj_list) {
+        p = list_entry(el, JSGCObjectHeader, link);
+        assert(p->ref_count > 0);
+        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);
+        mark_children(rt, p, gc_scan_incref_child2);
+    }
+}
+
+static void gc_free_cycles(JSRuntime *rt)
+{
+    struct list_head *el, *el1;
+    JSGCObjectHeader *p;
+#ifdef DUMP_GC_FREE
+    BOOL header_done = FALSE;
+#endif
+
+    rt->gc_phase = JS_GC_PHASE_REMOVE_CYCLES;
+
+    for(;;) {
+        el = rt->tmp_obj_list.next;
+        if (el == &rt->tmp_obj_list)
+            break;
+        p = list_entry(el, JSGCObjectHeader, link);
+        /* Only need to free the GC object associated with JS
+           values. The rest will be automatically removed because they
+           must be referenced by them. */
+        switch(p->gc_obj_type) {
+        case JS_GC_OBJ_TYPE_JS_OBJECT:
+        case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+#ifdef DUMP_GC_FREE
+            if (!header_done) {
+                printf("Freeing cycles:\n");
+                JS_DumpObjectHeader(rt);
+                header_done = TRUE;
+            }
+            JS_DumpGCObject(rt, p);
+#endif
+            free_gc_object(rt, p);
+            break;
+        default:
+            list_del(&p->link);
+            list_add_tail(&p->link, &rt->gc_zero_ref_count_list);
+            break;
+        }
+    }
+    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 ||
+               p->gc_obj_type == JS_GC_OBJ_TYPE_FUNCTION_BYTECODE);
+        js_free_rt(rt, p);
+    }
+
+    init_list_head(&rt->gc_zero_ref_count_list);
+}
+
+void JS_RunGC(JSRuntime *rt)
+{
+    /* decrement the reference of the children of each object. mark =
+       1 after this pass. */
+    gc_decref(rt);
+
+    /* keep the GC objects with a non zero refcount and their childs */
+    gc_scan(rt);
+
+    /* free the GC objects in a cycle */
+    gc_free_cycles(rt);
+}
+
+/* Return false if not an object or if the object has already been
+   freed (zombie objects are visible in finalizers when freeing
+   cycles). */
+BOOL JS_IsLiveObject(JSRuntime *rt, JSValueConst obj)
+{
+    JSObject *p;
+    if (!JS_IsObject(obj))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    return !p->free_mark;
+}
+
+/* Compute memory used by various object types */
+/* XXX: poor man's approach to handling multiply referenced objects */
+typedef struct JSMemoryUsage_helper {
+    double memory_used_count;
+    double str_count;
+    double str_size;
+    int64_t js_func_count;
+    double js_func_size;
+    int64_t js_func_code_size;
+    int64_t js_func_pc2line_count;
+    int64_t js_func_pc2line_size;
+} JSMemoryUsage_helper;
+
+static void compute_value_size(JSValueConst val, JSMemoryUsage_helper *hp);
+
+static void compute_jsstring_size(JSString *str, JSMemoryUsage_helper *hp)
+{
+    if (!str->atom_type) {  /* atoms are handled separately */
+        double s_ref_count = str->header.ref_count;
+        hp->str_count += 1 / s_ref_count;
+        hp->str_size += ((sizeof(*str) + (str->len << str->is_wide_char) +
+                          1 - str->is_wide_char) / s_ref_count);
+    }
+}
+
+static void compute_bytecode_size(JSFunctionBytecode *b, JSMemoryUsage_helper *hp)
+{
+    int memory_used_count, js_func_size, i;
+
+    memory_used_count = 0;
+    js_func_size = offsetof(JSFunctionBytecode, debug);
+    if (b->vardefs) {
+        js_func_size += (b->arg_count + b->var_count) * sizeof(*b->vardefs);
+    }
+    if (b->cpool) {
+        js_func_size += b->cpool_count * sizeof(*b->cpool);
+        for (i = 0; i < b->cpool_count; i++) {
+            JSValueConst val = b->cpool[i];
+            compute_value_size(val, hp);
+        }
+    }
+    if (b->closure_var) {
+        js_func_size += b->closure_var_count * sizeof(*b->closure_var);
+    }
+    if (!b->read_only_bytecode && b->byte_code_buf) {
+        hp->js_func_code_size += b->byte_code_len;
+    }
+    if (b->has_debug) {
+        js_func_size += sizeof(*b) - offsetof(JSFunctionBytecode, debug);
+        if (b->debug.source) {
+            memory_used_count++;
+            js_func_size += b->debug.source_len + 1;
+        }
+        if (b->debug.pc2line_len) {
+            memory_used_count++;
+            hp->js_func_pc2line_count += 1;
+            hp->js_func_pc2line_size += b->debug.pc2line_len;
+        }
+    }
+    hp->js_func_size += js_func_size;
+    hp->js_func_count += 1;
+    hp->memory_used_count += memory_used_count;
+}
+
+static void compute_value_size(JSValueConst val, JSMemoryUsage_helper *hp)
+{
+    switch(JS_VALUE_GET_TAG(val)) {
+    case JS_TAG_STRING:
+        compute_jsstring_size(JS_VALUE_GET_STRING(val), hp);
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+    case JS_TAG_BIG_DECIMAL:
+        /* should track JSBigFloat usage */
+        break;
+#endif
+    }
+}
+
+void JS_ComputeMemoryUsage(JSRuntime *rt, JSMemoryUsage *s)
+{
+    struct list_head *el, *el1;
+    int i;
+    JSMemoryUsage_helper mem = { 0 }, *hp = &mem;
+
+    memset(s, 0, sizeof(*s));
+    s->malloc_count = rt->malloc_state.malloc_count;
+    s->malloc_size = rt->malloc_state.malloc_size;
+    s->malloc_limit = rt->malloc_state.malloc_limit;
+
+    s->memory_used_count = 2; /* rt + rt->class_array */
+    s->memory_used_size = sizeof(JSRuntime) + sizeof(JSValue) * rt->class_count;
+
+    list_for_each(el, &rt->context_list) {
+        JSContext *ctx = list_entry(el, JSContext, link);
+        JSShape *sh = ctx->array_shape;
+        s->memory_used_count += 2; /* ctx + ctx->class_proto */
+        s->memory_used_size += sizeof(JSContext) +
+            sizeof(JSValue) * rt->class_count;
+        s->binary_object_count += ctx->binary_object_count;
+        s->binary_object_size += ctx->binary_object_size;
+
+        /* the hashed shapes are counted separately */
+        if (sh && !sh->is_hashed) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+        list_for_each(el1, &ctx->loaded_modules) {
+            JSModuleDef *m = list_entry(el1, JSModuleDef, link);
+            s->memory_used_count += 1;
+            s->memory_used_size += sizeof(*m);
+            if (m->req_module_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->req_module_entries_count * sizeof(*m->req_module_entries);
+            }
+            if (m->export_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->export_entries_count * sizeof(*m->export_entries);
+                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) {
+                        /* potential multiple count */
+                        s->memory_used_count += 1;
+                        compute_value_size(me->u.local.var_ref->value, hp);
+                    }
+                }
+            }
+            if (m->star_export_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->star_export_entries_count * sizeof(*m->star_export_entries);
+            }
+            if (m->import_entries) {
+                s->memory_used_count += 1;
+                s->memory_used_size += m->import_entries_count * sizeof(*m->import_entries);
+            }
+            compute_value_size(m->module_ns, hp);
+            compute_value_size(m->func_obj, hp);
+        }
+    }
+
+    list_for_each(el, &rt->gc_obj_list) {
+        JSGCObjectHeader *gp = list_entry(el, JSGCObjectHeader, link);
+        JSObject *p;
+        JSShape *sh;
+        JSShapeProperty *prs;
+
+        /* XXX: could count the other GC object types too */
+        if (gp->gc_obj_type == JS_GC_OBJ_TYPE_FUNCTION_BYTECODE) {
+            compute_bytecode_size((JSFunctionBytecode *)gp, hp);
+            continue;
+        } else if (gp->gc_obj_type != JS_GC_OBJ_TYPE_JS_OBJECT) {
+            continue;
+        }
+        p = (JSObject *)gp;
+        sh = p->shape;
+        s->obj_count++;
+        if (p->prop) {
+            s->memory_used_count++;
+            s->prop_size += sh->prop_size * sizeof(*p->prop);
+            s->prop_count += sh->prop_count;
+            prs = get_shape_prop(sh);
+            for(i = 0; i < sh->prop_count; i++) {
+                JSProperty *pr = &p->prop[i];
+                if (prs->atom != JS_ATOM_NULL && !(prs->flags & JS_PROP_TMASK)) {
+                    compute_value_size(pr->u.value, hp);
+                }
+                prs++;
+            }
+        }
+        /* the hashed shapes are counted separately */
+        if (!sh->is_hashed) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:             /* u.array | length */
+        case JS_CLASS_ARGUMENTS:         /* u.array | length */
+            s->array_count++;
+            if (p->fast_array) {
+                s->fast_array_count++;
+                if (p->u.array.u.values) {
+                    s->memory_used_count++;
+                    s->memory_used_size += p->u.array.count *
+                        sizeof(*p->u.array.u.values);
+                    s->fast_array_elements += p->u.array.count;
+                    for (i = 0; i < p->u.array.count; i++) {
+                        compute_value_size(p->u.array.u.values[i], hp);
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_NUMBER:            /* u.object_data */
+        case JS_CLASS_STRING:            /* u.object_data */
+        case JS_CLASS_BOOLEAN:           /* u.object_data */
+        case JS_CLASS_SYMBOL:            /* u.object_data */
+        case JS_CLASS_DATE:              /* u.object_data */
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT:           /* u.object_data */
+        case JS_CLASS_BIG_FLOAT:         /* u.object_data */
+#endif
+            compute_value_size(p->u.object_data, hp);
+            break;
+        case JS_CLASS_C_FUNCTION:        /* u.cfunc */
+            s->c_func_count++;
+            break;
+        case JS_CLASS_BYTECODE_FUNCTION: /* u.func */
+            {
+                JSFunctionBytecode *b = p->u.func.function_bytecode;
+                JSVarRef **var_refs = p->u.func.var_refs;
+                /* home_object: object will be accounted for in list scan */
+                if (var_refs) {
+                    s->memory_used_count++;
+                    s->js_func_size += b->closure_var_count * sizeof(*var_refs);
+                    for (i = 0; i < b->closure_var_count; i++) {
+                        if (var_refs[i]) {
+                            double ref_count = var_refs[i]->header.ref_count;
+                            s->memory_used_count += 1 / ref_count;
+                            s->js_func_size += sizeof(*var_refs[i]) / ref_count;
+                            /* handle non object closed values */
+                            if (var_refs[i]->pvalue == &var_refs[i]->value) {
+                                /* potential multiple count */
+                                compute_value_size(var_refs[i]->value, hp);
+                            }
+                        }
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_BOUND_FUNCTION:    /* u.bound_function */
+            {
+                JSBoundFunction *bf = p->u.bound_function;
+                /* func_obj and this_val are objects */
+                for (i = 0; i < bf->argc; i++) {
+                    compute_value_size(bf->argv[i], hp);
+                }
+                s->memory_used_count += 1;
+                s->memory_used_size += sizeof(*bf) + bf->argc * sizeof(*bf->argv);
+            }
+            break;
+        case JS_CLASS_C_FUNCTION_DATA:   /* u.c_function_data_record */
+            {
+                JSCFunctionDataRecord *fd = p->u.c_function_data_record;
+                if (fd) {
+                    for (i = 0; i < fd->data_len; i++) {
+                        compute_value_size(fd->data[i], hp);
+                    }
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*fd) + fd->data_len * sizeof(*fd->data);
+                }
+            }
+            break;
+        case JS_CLASS_REGEXP:            /* u.regexp */
+            compute_jsstring_size(p->u.regexp.pattern, hp);
+            compute_jsstring_size(p->u.regexp.bytecode, hp);
+            break;
+
+        case JS_CLASS_FOR_IN_ITERATOR:   /* u.for_in_iterator */
+            {
+                JSForInIterator *it = p->u.for_in_iterator;
+                if (it) {
+                    compute_value_size(it->obj, hp);
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*it);
+                }
+            }
+            break;
+        case JS_CLASS_ARRAY_BUFFER:      /* u.array_buffer */
+        case JS_CLASS_SHARED_ARRAY_BUFFER: /* u.array_buffer */
+            {
+                JSArrayBuffer *abuf = p->u.array_buffer;
+                if (abuf) {
+                    s->memory_used_count += 1;
+                    s->memory_used_size += sizeof(*abuf);
+                    if (abuf->data) {
+                        s->memory_used_count += 1;
+                        s->memory_used_size += abuf->byte_length;
+                    }
+                }
+            }
+            break;
+        case JS_CLASS_GENERATOR:         /* u.generator_data */
+        case JS_CLASS_UINT8C_ARRAY:      /* u.typed_array / u.array */
+        case JS_CLASS_INT8_ARRAY:        /* u.typed_array / u.array */
+        case JS_CLASS_UINT8_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_INT16_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_UINT16_ARRAY:      /* u.typed_array / u.array */
+        case JS_CLASS_INT32_ARRAY:       /* u.typed_array / u.array */
+        case JS_CLASS_UINT32_ARRAY:      /* u.typed_array / u.array */
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT64_ARRAY:   /* u.typed_array / u.array */
+        case JS_CLASS_BIG_UINT64_ARRAY:  /* u.typed_array / u.array */
+#endif
+        case JS_CLASS_FLOAT32_ARRAY:     /* u.typed_array / u.array */
+        case JS_CLASS_FLOAT64_ARRAY:     /* u.typed_array / u.array */
+        case JS_CLASS_DATAVIEW:          /* u.typed_array */
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_FLOAT_ENV:         /* u.float_env */
+#endif
+        case JS_CLASS_MAP:               /* u.map_state */
+        case JS_CLASS_SET:               /* u.map_state */
+        case JS_CLASS_WEAKMAP:           /* u.map_state */
+        case JS_CLASS_WEAKSET:           /* u.map_state */
+        case JS_CLASS_MAP_ITERATOR:      /* u.map_iterator_data */
+        case JS_CLASS_SET_ITERATOR:      /* u.map_iterator_data */
+        case JS_CLASS_ARRAY_ITERATOR:    /* u.array_iterator_data */
+        case JS_CLASS_STRING_ITERATOR:   /* u.array_iterator_data */
+        case JS_CLASS_PROXY:             /* u.proxy_data */
+        case JS_CLASS_PROMISE:           /* u.promise_data */
+        case JS_CLASS_PROMISE_RESOLVE_FUNCTION:  /* u.promise_function_data */
+        case JS_CLASS_PROMISE_REJECT_FUNCTION:   /* u.promise_function_data */
+        case JS_CLASS_ASYNC_FUNCTION_RESOLVE:    /* u.async_function_data */
+        case JS_CLASS_ASYNC_FUNCTION_REJECT:     /* u.async_function_data */
+        case JS_CLASS_ASYNC_FROM_SYNC_ITERATOR:  /* u.async_from_sync_iterator_data */
+        case JS_CLASS_ASYNC_GENERATOR:   /* u.async_generator_data */
+            /* TODO */
+        default:
+            /* XXX: class definition should have an opaque block size */
+            if (p->u.opaque) {
+                s->memory_used_count += 1;
+            }
+            break;
+        }
+    }
+    s->obj_size += s->obj_count * sizeof(JSObject);
+
+    /* hashed shapes */
+    s->memory_used_count++; /* rt->shape_hash */
+    s->memory_used_size += sizeof(rt->shape_hash[0]) * rt->shape_hash_size;
+    for(i = 0; i < rt->shape_hash_size; i++) {
+        JSShape *sh;
+        for(sh = rt->shape_hash[i]; sh != NULL; sh = sh->shape_hash_next) {
+            int hash_size = sh->prop_hash_mask + 1;
+            s->shape_count++;
+            s->shape_size += get_shape_size(hash_size, sh->prop_size);
+        }
+    }
+
+    /* atoms */
+    s->memory_used_count += 2; /* rt->atom_array, rt->atom_hash */
+    s->atom_count = rt->atom_count;
+    s->atom_size = sizeof(rt->atom_array[0]) * rt->atom_size +
+        sizeof(rt->atom_hash[0]) * rt->atom_hash_size;
+    for(i = 0; i < rt->atom_size; i++) {
+        JSAtomStruct *p = rt->atom_array[i];
+        if (!atom_is_free(p)) {
+            s->atom_size += (sizeof(*p) + (p->len << p->is_wide_char) +
+                             1 - p->is_wide_char);
+        }
+    }
+    s->str_count = round(mem.str_count);
+    s->str_size = round(mem.str_size);
+    s->js_func_count = mem.js_func_count;
+    s->js_func_size = round(mem.js_func_size);
+    s->js_func_code_size = mem.js_func_code_size;
+    s->js_func_pc2line_count = mem.js_func_pc2line_count;
+    s->js_func_pc2line_size = mem.js_func_pc2line_size;
+    s->memory_used_count += round(mem.memory_used_count) +
+        s->atom_count + s->str_count +
+        s->obj_count + s->shape_count +
+        s->js_func_count + s->js_func_pc2line_count;
+    s->memory_used_size += s->atom_size + s->str_size +
+        s->obj_size + s->prop_size + s->shape_size +
+        s->js_func_size + s->js_func_code_size + s->js_func_pc2line_size;
+}
+
+void JS_DumpMemoryUsage(FILE *fp, const JSMemoryUsage *s, JSRuntime *rt)
+{
+    fprintf(fp, "QuickJS memory usage -- "
+#ifdef CONFIG_BIGNUM
+            "BigNum "
+#endif
+            CONFIG_VERSION " version, %d-bit, malloc limit: %"PRId64"\n\n",
+            (int)sizeof(void *) * 8, (int64_t)(ssize_t)s->malloc_limit);
+#if 1
+    if (rt) {
+        static const struct {
+            const char *name;
+            size_t size;
+        } object_types[] = {
+            { "JSRuntime", sizeof(JSRuntime) },
+            { "JSContext", sizeof(JSContext) },
+            { "JSObject", sizeof(JSObject) },
+            { "JSString", sizeof(JSString) },
+            { "JSFunctionBytecode", sizeof(JSFunctionBytecode) },
+        };
+        int i, usage_size_ok = 0;
+        for(i = 0; i < countof(object_types); i++) {
+            unsigned int size = object_types[i].size;
+            void *p = js_malloc_rt(rt, size);
+            if (p) {
+                unsigned int size1 = js_malloc_usable_size_rt(rt, p);
+                if (size1 >= size) {
+                    usage_size_ok = 1;
+                    fprintf(fp, "  %3u + %-2u  %s\n",
+                            size, size1 - size, object_types[i].name);
+                }
+                js_free_rt(rt, p);
+            }
+        }
+        if (!usage_size_ok) {
+            fprintf(fp, "  malloc_usable_size unavailable\n");
+        }
+        {
+            int obj_classes[JS_CLASS_INIT_COUNT + 1] = { 0 };
+            int class_id;
+            struct list_head *el;
+            list_for_each(el, &rt->gc_obj_list) {
+                JSGCObjectHeader *gp = list_entry(el, JSGCObjectHeader, link);
+                JSObject *p;
+                if (gp->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+                    p = (JSObject *)gp;
+                    obj_classes[min_uint32(p->class_id, JS_CLASS_INIT_COUNT)]++;
+                }
+            }
+            fprintf(fp, "\n" "JSObject classes\n");
+            if (obj_classes[0])
+                fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[0], 0, "none");
+            for (class_id = 1; class_id < JS_CLASS_INIT_COUNT; class_id++) {
+                if (obj_classes[class_id]) {
+                    char buf[ATOM_GET_STR_BUF_SIZE];
+                    fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[class_id], class_id,
+                            JS_AtomGetStrRT(rt, buf, sizeof(buf), js_std_class_def[class_id - 1].class_name));
+                }
+            }
+            if (obj_classes[JS_CLASS_INIT_COUNT])
+                fprintf(fp, "  %5d  %2.0d %s\n", obj_classes[JS_CLASS_INIT_COUNT], 0, "other");
+        }
+        fprintf(fp, "\n");
+    }
+#endif
+    fprintf(fp, "%-20s %8s %8s\n", "NAME", "COUNT", "SIZE");
+
+    if (s->malloc_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per block)\n",
+                "memory allocated", s->malloc_count, s->malloc_size,
+                (double)s->malloc_size / s->malloc_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%d overhead, %0.1f average slack)\n",
+                "memory used", s->memory_used_count, s->memory_used_size,
+                MALLOC_OVERHEAD, ((double)(s->malloc_size - s->memory_used_size) /
+                                  s->memory_used_count));
+    }
+    if (s->atom_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per atom)\n",
+                "atoms", s->atom_count, s->atom_size,
+                (double)s->atom_size / s->atom_count);
+    }
+    if (s->str_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per string)\n",
+                "strings", s->str_count, s->str_size,
+                (double)s->str_size / s->str_count);
+    }
+    if (s->obj_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per object)\n",
+                "objects", s->obj_count, s->obj_size,
+                (double)s->obj_size / s->obj_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per object)\n",
+                "  properties", s->prop_count, s->prop_size,
+                (double)s->prop_count / s->obj_count);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per shape)\n",
+                "  shapes", s->shape_count, s->shape_size,
+                (double)s->shape_size / s->shape_count);
+    }
+    if (s->js_func_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"\n",
+                "bytecode functions", s->js_func_count, s->js_func_size);
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per function)\n",
+                "  bytecode", s->js_func_count, s->js_func_code_size,
+                (double)s->js_func_code_size / s->js_func_count);
+        if (s->js_func_pc2line_count) {
+            fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per function)\n",
+                    "  pc2line", s->js_func_pc2line_count,
+                    s->js_func_pc2line_size,
+                    (double)s->js_func_pc2line_size / s->js_func_pc2line_count);
+        }
+    }
+    if (s->c_func_count) {
+        fprintf(fp, "%-20s %8"PRId64"\n", "C functions", s->c_func_count);
+    }
+    if (s->array_count) {
+        fprintf(fp, "%-20s %8"PRId64"\n", "arrays", s->array_count);
+        if (s->fast_array_count) {
+            fprintf(fp, "%-20s %8"PRId64"\n", "  fast arrays", s->fast_array_count);
+            fprintf(fp, "%-20s %8"PRId64" %8"PRId64"  (%0.1f per fast array)\n",
+                    "  elements", s->fast_array_elements,
+                    s->fast_array_elements * (int)sizeof(JSValue),
+                    (double)s->fast_array_elements / s->fast_array_count);
+        }
+    }
+    if (s->binary_object_count) {
+        fprintf(fp, "%-20s %8"PRId64" %8"PRId64"\n",
+                "binary objects", s->binary_object_count, s->binary_object_size);
+    }
+}
+
+JSValue JS_GetGlobalObject(JSContext *ctx)
+{
+    return JS_DupValue(ctx, ctx->global_obj);
+}
+
+/* WARNING: obj is freed */
+JSValue JS_Throw(JSContext *ctx, JSValue obj)
+{
+    JS_FreeValue(ctx, ctx->current_exception);
+    ctx->current_exception = obj;
+    return JS_EXCEPTION;
+}
+
+/* return the pending exception (cannot be called twice). */
+JSValue JS_GetException(JSContext *ctx)
+{
+    JSValue val;
+    val = ctx->current_exception;
+    ctx->current_exception = JS_NULL;
+    return val;
+}
+
+static void dbuf_put_leb128(DynBuf *s, uint32_t v)
+{
+    uint32_t a;
+    for(;;) {
+        a = v & 0x7f;
+        v >>= 7;
+        if (v != 0) {
+            dbuf_putc(s, a | 0x80);
+        } else {
+            dbuf_putc(s, a);
+            break;
+        }
+    }
+}
+
+static void dbuf_put_sleb128(DynBuf *s, int32_t v1)
+{
+    uint32_t v = v1;
+    dbuf_put_leb128(s, (2 * v) ^ -(v >> 31));
+}
+
+static int get_leb128(uint32_t *pval, const uint8_t *buf,
+                      const uint8_t *buf_end)
+{
+    const uint8_t *ptr = buf;
+    uint32_t v, a, i;
+    v = 0;
+    for(i = 0; i < 5; i++) {
+        if (unlikely(ptr >= buf_end))
+            break;
+        a = *ptr++;
+        v |= (a & 0x7f) << (i * 7);
+        if (!(a & 0x80)) {
+            *pval = v;
+            return ptr - buf;
+        }
+    }
+    *pval = 0;
+    return -1;
+}
+
+static int get_sleb128(int32_t *pval, const uint8_t *buf,
+                       const uint8_t *buf_end)
+{
+    int ret;
+    uint32_t val;
+    ret = get_leb128(&val, buf, buf_end);
+    if (ret < 0) {
+        *pval = 0;
+        return -1;
+    }
+    *pval = (val >> 1) ^ -(val & 1);
+    return ret;
+}
+
+static int find_line_num(JSContext *ctx, JSFunctionBytecode *b,
+                         uint32_t pc_value)
+{
+    const uint8_t *p_end, *p;
+    int new_line_num, line_num, pc, v, ret;
+    unsigned int op;
+
+    if (!b->has_debug || !b->debug.pc2line_buf) {
+        /* function was stripped */
+        return -1;
+    }
+
+    p = b->debug.pc2line_buf;
+    p_end = p + b->debug.pc2line_len;
+    pc = 0;
+    line_num = b->debug.line_num;
+    while (p < p_end) {
+        op = *p++;
+        if (op == 0) {
+            uint32_t val;
+            ret = get_leb128(&val, p, p_end);
+            if (ret < 0)
+                goto fail;
+            pc += val;
+            p += ret;
+            ret = get_sleb128(&v, p, p_end);
+            if (ret < 0) {
+            fail:
+                /* should never happen */
+                return b->debug.line_num;
+            }
+            p += ret;
+            new_line_num = line_num + v;
+        } else {
+            op -= PC2LINE_OP_FIRST;
+            pc += (op / PC2LINE_RANGE);
+            new_line_num = line_num + (op % PC2LINE_RANGE) + PC2LINE_BASE;
+        }
+        if (pc_value < pc)
+            return line_num;
+        line_num = new_line_num;
+    }
+    return line_num;
+}
+
+/* in order to avoid executing arbitrary code during the stack trace
+   generation, we only look at simple 'name' properties containing a
+   string. */
+static const char *get_func_name(JSContext *ctx, JSValueConst func)
+{
+    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);
+    if (!prs)
+        return NULL;
+    if ((prs->flags & JS_PROP_TMASK) != JS_PROP_NORMAL)
+        return NULL;
+    val = pr->u.value;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+        return NULL;
+    return JS_ToCString(ctx, val);
+}
+
+#define JS_BACKTRACE_FLAG_SKIP_FIRST_LEVEL (1 << 0)
+/* only taken into account if filename is provided */
+#define JS_BACKTRACE_FLAG_SINGLE_LEVEL     (1 << 1)
+
+/* if filename != NULL, an additional level is added with the filename
+   and line number information (used for parse error). */
+static void build_backtrace(JSContext *ctx, JSValueConst error_obj,
+                            const char *filename, int line_num,
+                            int backtrace_flags)
+{
+    JSStackFrame *sf;
+    JSValue str;
+    DynBuf dbuf;
+    const char *func_name_str;
+    const char *str1;
+    JSObject *p;
+    BOOL backtrace_barrier;
+
+    js_dbuf_init(ctx, &dbuf);
+    if (filename) {
+        dbuf_printf(&dbuf, "    at %s", filename);
+        if (line_num != -1)
+            dbuf_printf(&dbuf, ":%d", line_num);
+        dbuf_putc(&dbuf, '\n');
+        str = JS_NewString(ctx, filename);
+        JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_fileName, str,
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        JS_DefinePropertyValue(ctx, error_obj, JS_ATOM_lineNumber, JS_NewInt32(ctx, line_num),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        if (backtrace_flags & JS_BACKTRACE_FLAG_SINGLE_LEVEL)
+            goto done;
+    }
+    for(sf = ctx->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;
+        }
+        func_name_str = get_func_name(ctx, sf->cur_func);
+        if (!func_name_str || func_name_str[0] == '\0')
+            str1 = "<anonymous>";
+        else
+            str1 = func_name_str;
+        dbuf_printf(&dbuf, "    at %s", str1);
+        JS_FreeCString(ctx, func_name_str);
+
+        p = JS_VALUE_GET_OBJ(sf->cur_func);
+        backtrace_barrier = FALSE;
+        if (js_class_has_bytecode(p->class_id)) {
+            JSFunctionBytecode *b;
+            char atom_buf[ATOM_GET_STR_BUF_SIZE];
+            int line_num1;
+
+            b = p->u.func.function_bytecode;
+            backtrace_barrier = b->backtrace_barrier;
+            if (b->has_debug) {
+                line_num1 = find_line_num(ctx, b,
+                                          sf->cur_pc - b->byte_code_buf - 1);
+                dbuf_printf(&dbuf, " (%s",
+                            JS_AtomGetStr(ctx, atom_buf, sizeof(atom_buf),
+                                          b->debug.filename));
+                if (line_num1 != -1)
+                    dbuf_printf(&dbuf, ":%d", line_num1);
+                dbuf_putc(&dbuf, ')');
+            }
+        } else {
+            dbuf_printf(&dbuf, " (native)");
+        }
+        dbuf_putc(&dbuf, '\n');
+        /* stop backtrace if JS_EVAL_FLAG_BACKTRACE_BARRIER was used */
+        if (backtrace_barrier)
+            break;
+    }
+ done:
+    dbuf_putc(&dbuf, '\0');
+    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);
+}
+
+/* Note: it is important that no exception is returned by this function */
+static BOOL is_backtrace_needed(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != JS_CLASS_ERROR)
+        return FALSE;
+    if (find_own_property1(p, JS_ATOM_stack))
+        return FALSE;
+    return TRUE;
+}
+
+JSValue JS_NewError(JSContext *ctx)
+{
+    return JS_NewObjectClass(ctx, JS_CLASS_ERROR);
+}
+
+static JSValue JS_ThrowError2(JSContext *ctx, JSErrorEnum error_num,
+                              const char *fmt, va_list ap, BOOL add_backtrace)
+{
+    char buf[256];
+    JSValue obj, ret;
+
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+    obj = JS_NewObjectProtoClass(ctx, ctx->native_error_proto[error_num],
+                                 JS_CLASS_ERROR);
+    if (unlikely(JS_IsException(obj))) {
+        /* out of memory: throw JS_NULL to avoid recursing */
+        obj = JS_NULL;
+    } else {
+        JS_DefinePropertyValue(ctx, obj, JS_ATOM_message,
+                               JS_NewString(ctx, buf),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    }
+    if (add_backtrace) {
+        build_backtrace(ctx, obj, NULL, 0, 0);
+    }
+    ret = JS_Throw(ctx, obj);
+    return ret;
+}
+
+static JSValue JS_ThrowError(JSContext *ctx, JSErrorEnum error_num,
+                             const char *fmt, va_list ap)
+{
+    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 || (JS_GetFunctionBytecode(sf->cur_func) == NULL));
+    return JS_ThrowError2(ctx, error_num, fmt, ap, add_backtrace);
+}
+
+#if defined(_MSC_VER)
+JSValue JS_ThrowSyntaxError(JSContext *ctx, const char *fmt, ...)
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowSyntaxError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_SYNTAX_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+#if defined(_MSC_VER)
+JSValue JS_ThrowTypeError(JSContext *ctx, const char *fmt, ...)
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowTypeError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_TYPE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+#if defined(_MSC_VER)
+static int JS_ThrowTypeErrorOrFalse(JSContext *ctx, int flags, const char *fmt, ...)
+#else
+static int __attribute__((format(printf, 3, 4))) JS_ThrowTypeErrorOrFalse(JSContext *ctx, int flags, const char *fmt, ...)
+#endif
+{
+    va_list ap;
+
+    if ((flags & JS_PROP_THROW) ||
+        ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+        va_start(ap, fmt);
+        JS_ThrowError(ctx, JS_TYPE_ERROR, fmt, ap);
+        va_end(ap);
+        return -1;
+    } else {
+        return FALSE;
+    }
+}
+
+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));
+        return -1;
+    } else {
+        return FALSE;
+    }
+}
+
+#if defined(_MSC_VER)
+JSValue JS_ThrowReferenceError(JSContext *ctx, const char *fmt, ...)
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowReferenceError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_REFERENCE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+#if defined(_MSC_VER)
+JSValue JS_ThrowRangeError(JSContext *ctx, const char *fmt, ...)
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowRangeError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_RANGE_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+#if defined(_MSC_VER)
+JSValue JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...)
+#else
+JSValue __attribute__((format(printf, 2, 3))) JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    JSValue val;
+    va_list ap;
+
+    va_start(ap, fmt);
+    val = JS_ThrowError(ctx, JS_INTERNAL_ERROR, fmt, ap);
+    va_end(ap);
+    return val;
+}
+
+JSValue JS_ThrowOutOfMemory(JSContext *ctx)
+{
+    if (!ctx->in_out_of_memory) {
+        ctx->in_out_of_memory = TRUE;
+        JS_ThrowInternalError(ctx, "out of memory");
+        ctx->in_out_of_memory = FALSE;
+    }
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ThrowStackOverflow(JSContext *ctx)
+{
+    return JS_ThrowInternalError(ctx, "stack overflow");
+}
+
+static JSValue JS_ThrowTypeErrorNotAnObject(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "not an object");
+}
+
+static JSValue JS_ThrowTypeErrorNotASymbol(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "not a symbol");
+}
+
+static JSValue JS_ThrowReferenceErrorNotDefined(JSContext *ctx, JSAtom name)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowReferenceError(ctx, "%s is not defined",
+                                  JS_AtomGetStr(ctx, buf, sizeof(buf), name));
+}
+
+static JSValue JS_ThrowReferenceErrorUninitialized(JSContext *ctx, JSAtom name)
+{
+    char buf[ATOM_GET_STR_BUF_SIZE];
+    return JS_ThrowReferenceError(ctx, "%s is not initialized",
+                                  name == JS_ATOM_NULL ? "lexical variable" :
+                                  JS_AtomGetStr(ctx, buf, sizeof(buf), name));
+}
+
+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 -1 (exception) or TRUE/FALSE */
+static int JS_SetPrototypeInternal(JSContext *ctx, JSValueConst obj,
+                                   JSValueConst proto_val,
+                                   BOOL throw_flag)
+{
+    JSObject *proto, *p, *p1;
+    JSShape *sh;
+
+    if (throw_flag) {
+        if (JS_VALUE_GET_TAG(obj) == JS_TAG_NULL ||
+            JS_VALUE_GET_TAG(obj) == JS_TAG_UNDEFINED)
+            goto not_obj;
+    } else {
+        if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+            goto not_obj;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_OBJECT) {
+        if (JS_VALUE_GET_TAG(proto_val) != JS_TAG_NULL) {
+        not_obj:
+            JS_ThrowTypeErrorNotAnObject(ctx);
+            return -1;
+        }
+        proto = NULL;
+    } else {
+        proto = JS_VALUE_GET_OBJ(proto_val);
+    }
+
+    if (throw_flag && JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return TRUE;
+
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_setPrototypeOf(ctx, obj, proto_val, throw_flag);
+    sh = p->shape;
+    if (sh->proto == proto)
+        return TRUE;
+    if (!p->extensible) {
+        if (throw_flag) {
+            JS_ThrowTypeError(ctx, "object is not extensible");
+            return -1;
+        } else {
+            return FALSE;
+        }
+    }
+    if (proto) {
+        /* check if there is a cycle */
+        p1 = proto;
+        do {
+            if (p1 == p) {
+                if (throw_flag) {
+                    JS_ThrowTypeError(ctx, "circular prototype chain");
+                    return -1;
+                } else {
+                    return FALSE;
+                }
+            }
+            /* Note: for Proxy objects, proto is NULL */
+            p1 = p1->shape->proto;
+        } while (p1 != NULL);
+        JS_DupValue(ctx, proto_val);
+    }
+
+    if (js_shape_prepare_update(ctx, p, NULL))
+        return -1;
+    sh = p->shape;
+    if (sh->proto)
+        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, sh->proto));
+    sh->proto = proto;
+    return TRUE;
+}
+
+/* return -1 (exception) or TRUE/FALSE */
+int JS_SetPrototype(JSContext *ctx, JSValueConst obj, JSValueConst proto_val)
+{
+    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)
+{
+    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
+    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;
+    case JS_TAG_STRING:
+        val = ctx->class_proto[JS_CLASS_STRING];
+        break;
+    case JS_TAG_SYMBOL:
+        val = ctx->class_proto[JS_CLASS_SYMBOL];
+        break;
+    case JS_TAG_OBJECT:
+        p = JS_VALUE_GET_OBJ(val);
+        if (unlikely(p->class_id == JS_CLASS_PROXY)) {
+            val = js_proxy_getPrototypeOf(ctx, val);
+        } else {
+            p = p->shape->proto;
+            if (!p)
+                val = JS_NULL;
+            else
+                val = JS_MKPTR(JS_TAG_OBJECT, p);
+        }
+        break;
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+    default:
+        val = JS_NULL;
+        break;
+    }
+    return val;
+}
+
+/* return TRUE, FALSE or (-1) in case of exception */
+static int JS_OrdinaryIsInstanceOf(JSContext *ctx, JSValueConst val,
+                                   JSValueConst obj)
+{
+    JSValue obj_proto;
+    JSObject *proto;
+    const JSObject *p, *proto1;
+    BOOL ret;
+
+    if (!JS_IsFunction(ctx, obj))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id == JS_CLASS_BOUND_FUNCTION) {
+        JSBoundFunction *s = p->u.bound_function;
+        return JS_IsInstanceOf(ctx, val, s->func_obj);
+    }
+
+    /* 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))
+            JS_ThrowTypeError(ctx, "operand 'prototype' property is not an object");
+        ret = -1;
+        goto done;
+    }
+    proto = JS_VALUE_GET_OBJ(obj_proto);
+    p = JS_VALUE_GET_OBJ(val);
+    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;
+                }
+                proto1 = JS_VALUE_GET_OBJ(proto_val);
+                if (!proto1)
+                    break;
+            } else {
+                break;
+            }
+        }
+        p = proto1;
+        if (proto == p) {
+            ret = TRUE;
+            break;
+        }
+    }
+done:
+    JS_FreeValue(ctx, obj_proto);
+    return ret;
+}
+
+/* return TRUE, FALSE or (-1) in case of exception */
+int JS_IsInstanceOf(JSContext *ctx, JSValueConst val, JSValueConst obj)
+{
+    JSValue method;
+
+    if (!JS_IsObject(obj))
+        goto fail;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_hasInstance);
+    if (JS_IsException(method))
+        return -1;
+    if (!JS_IsNull(method) && !JS_IsUndefined(method)) {
+        JSValue ret;
+        ret = JS_CallFree(ctx, method, obj, 1, &val);
+        return JS_ToBoolFree(ctx, ret);
+    }
+
+    /* legacy case */
+    if (!JS_IsFunction(ctx, obj)) {
+    fail:
+        JS_ThrowTypeError(ctx, "invalid 'instanceof' right operand");
+        return -1;
+    }
+    return JS_OrdinaryIsInstanceOf(ctx, val, obj);
+}
+
+static int JS_AutoInitProperty(JSContext *ctx, JSObject *p, JSAtom prop, JSProperty *pr)
+{
+    return (*pr->u.init.init_func)(ctx, p, prop, pr->u.init.opaque);
+}
+
+JSValue JS_GetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                               JSAtom prop, JSValueConst this_obj,
+                               BOOL throw_ref_error)
+{
+    JSObject *p;
+    JSProperty *pr;
+    JSShapeProperty *prs;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_TAG(obj);
+    if (unlikely(tag != JS_TAG_OBJECT)) {
+        switch(tag) {
+        case JS_TAG_NULL:
+        case JS_TAG_UNDEFINED:
+            return JS_ThrowTypeError(ctx, "value has no property");
+        case JS_TAG_EXCEPTION:
+            return JS_EXCEPTION;
+        case JS_TAG_STRING:
+            {
+                JSString *p1 = JS_VALUE_GET_STRING(obj);
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx, ch;
+                    idx = __JS_AtomToUInt32(prop);
+                    if (idx < p1->len) {
+                        if (p1->is_wide_char)
+                            ch = p1->u.str16[idx];
+                        else
+                            ch = p1->u.str8[idx];
+                        return js_new_string_char(ctx, ch);
+                    }
+                } else if (prop == JS_ATOM_length) {
+                    return JS_NewInt32(ctx, p1->len);
+                }
+            }
+            break;
+        default:
+            break;
+        }
+        /* cannot raise an exception */
+        p = JS_VALUE_GET_OBJ(JS_GetPrototype(ctx, obj));
+        if (!p)
+            return JS_UNDEFINED;
+    } else {
+        p = JS_VALUE_GET_OBJ(obj);
+    }
+
+    for(;;) {
+        prs = find_own_property(&pr, p, prop);
+        if (prs) {
+            /* found */
+            if (unlikely(prs->flags & JS_PROP_TMASK)) {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    if (unlikely(!pr->u.getset.getter)) {
+                        return JS_UNDEFINED;
+                    } else {
+                        JSValue func = JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter);
+                        /* Note: the field could be removed in the getter */
+                        func = JS_DupValue(ctx, func);
+                        return JS_CallFree(ctx, func, this_obj, 0, NULL);
+                    }
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    JSValue val = *pr->u.var_ref->pvalue;
+                    if (unlikely(JS_IsUninitialized(val)))
+                        return JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                    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))
+                        return JS_EXCEPTION;
+                    continue;
+                }
+            } else {
+                return JS_DupValue(ctx, pr->u.value);
+            }
+        }
+        if (unlikely(p->is_exotic)) {
+            /* exotic behaviors */
+            if (p->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx = __JS_AtomToUInt32(prop);
+                    if (idx < p->u.array.count) {
+                        /* we avoid duplicating the code */
+                        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;
+                    }
+                } else 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 JS_EXCEPTION;
+                    typed_array_oob:
+                        if (typed_array_is_detached(ctx, p))
+                            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+                        return JS_UNDEFINED;
+                    }
+                }
+            } else {
+                const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+                if (em) {
+                    if (em->get_property) {
+                        /* XXX: should pass throw_ref_error */
+                        return em->get_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p),
+                                                prop, this_obj);
+                    }
+                    if (em->get_own_property) {
+                        JSPropertyDescriptor desc;
+                        int ret;
+
+                        ret = em->get_own_property(ctx, &desc, JS_MKPTR(JS_TAG_OBJECT, p), prop);
+                        if (ret < 0)
+                            return JS_EXCEPTION;
+                        if (ret) {
+                            if (desc.flags & JS_PROP_GETSET) {
+                                JS_FreeValue(ctx, desc.setter);
+                                return JS_CallFree(ctx, desc.getter, this_obj, 0, NULL);
+                            } else {
+                                return desc.value;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        p = p->shape->proto;
+        if (!p)
+            break;
+    }
+    if (unlikely(throw_ref_error)) {
+        return JS_ThrowReferenceErrorNotDefined(ctx, prop);
+    } else {
+        return JS_UNDEFINED;
+    }
+}
+
+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));
+}
+
+/* Private fields can be added even on non extensible objects or
+   Proxies */
+static int JS_DefinePrivateField(JSContext *ctx, JSValueConst obj,
+                                 JSValueConst name, JSValue val)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        goto fail;
+    }
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL)) {
+        JS_ThrowTypeErrorNotASymbol(ctx);
+        goto fail;
+    }
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    prop = js_symbol_to_atom(ctx, name);
+#else
+    prop = js_symbol_to_atom(ctx, (JSValue)name);
+#endif
+    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));
+        goto fail;
+    }
+    pr = add_property(ctx, p, prop, JS_PROP_C_W_E);
+    if (unlikely(!pr)) {
+    fail:
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    pr->u.value = val;
+    return 0;
+}
+
+static JSValue JS_GetPrivateField(JSContext *ctx, JSValueConst obj,
+                                  JSValueConst name)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL))
+        return JS_ThrowTypeErrorNotASymbol(ctx);
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    prop = js_symbol_to_atom(ctx, name);
+#else
+    prop = js_symbol_to_atom(ctx, (JSValue)name);
+#endif
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, prop);
+    if (!prs) {
+        JS_ThrowTypeErrorPrivateNotFound(ctx, prop);
+        return JS_EXCEPTION;
+    }
+    return JS_DupValue(ctx, pr->u.value);
+}
+
+static int JS_SetPrivateField(JSContext *ctx, JSValueConst obj,
+                              JSValueConst name, JSValue val)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSAtom prop;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        goto fail;
+    }
+    /* safety check */
+    if (unlikely(JS_VALUE_GET_TAG(name) != JS_TAG_SYMBOL)) {
+        JS_ThrowTypeErrorNotASymbol(ctx);
+        goto fail;
+    }
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    prop = js_symbol_to_atom(ctx, name);
+#else
+    prop = js_symbol_to_atom(ctx, (JSValue)name);
+#endif
+    p = JS_VALUE_GET_OBJ(obj);
+    prs = find_own_property(&pr, p, prop);
+    if (!prs) {
+        JS_ThrowTypeErrorPrivateNotFound(ctx, prop);
+    fail:
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    set_value(ctx, &pr->u.value, val);
+    return 0;
+}
+
+static int JS_AddBrand(JSContext *ctx, JSValueConst obj, JSValueConst home_obj)
+{
+    JSObject *p, *p1;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValue brand;
+    JSAtom brand_atom;
+
+    if (unlikely(JS_VALUE_GET_TAG(home_obj) != JS_TAG_OBJECT)) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p = JS_VALUE_GET_OBJ(home_obj);
+    prs = find_own_property(&pr, p, JS_ATOM_Private_brand);
+    if (!prs) {
+        brand = JS_NewSymbolFromAtom(ctx, JS_ATOM_brand, JS_ATOM_TYPE_PRIVATE);
+        if (JS_IsException(brand))
+            return -1;
+        /* if the brand is not present, add it */
+        pr = add_property(ctx, p, JS_ATOM_Private_brand, JS_PROP_C_W_E);
+        if (!pr) {
+            JS_FreeValue(ctx, brand);
+            return -1;
+        }
+        pr->u.value = JS_DupValue(ctx, brand);
+    } else {
+        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);
+        return -1;
+    }
+    p1 = JS_VALUE_GET_OBJ(obj);
+    pr = add_property(ctx, p1, brand_atom, JS_PROP_C_W_E);
+    JS_FreeAtom(ctx, brand_atom);
+    if (!pr)
+        return -1;
+    pr->u.value = JS_UNDEFINED;
+    return 0;
+}
+
+static int JS_CheckBrand(JSContext *ctx, JSValueConst obj, JSValueConst func)
+{
+    JSObject *p, *p1, *home_obj;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValueConst brand;
+
+    /* get the home object of 'func' */
+    if (unlikely(JS_VALUE_GET_TAG(func) != JS_TAG_OBJECT)) {
+    not_obj:
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p1 = JS_VALUE_GET_OBJ(func);
+    if (!js_class_has_bytecode(p1->class_id))
+        goto not_obj;
+    home_obj = p1->u.func.home_object;
+    if (!home_obj)
+        goto not_obj;
+    prs = find_own_property(&pr, home_obj, JS_ATOM_Private_brand);
+    if (!prs) {
+        JS_ThrowTypeError(ctx, "expecting <brand> private field");
+        return -1;
+    }
+    brand = pr->u.value;
+    /* 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));
+#else
+    prs = find_own_property(&pr, p, js_symbol_to_atom(ctx, (JSValue)brand));
+#endif
+    if (!prs) {
+        JS_ThrowTypeError(ctx, "invalid brand on object");
+        return -1;
+    }
+    return 0;
+}
+
+static int num_keys_cmp(const void *p1, const void *p2, void *opaque)
+{
+    JSContext *ctx = opaque;
+    JSAtom atom1 = ((const JSPropertyEnum *)p1)->atom;
+    JSAtom atom2 = ((const JSPropertyEnum *)p2)->atom;
+    uint32_t v1, v2;
+#ifdef	NDEBUG
+    JS_AtomIsArrayIndex(ctx, &v1, atom1);
+    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 );
+#endif
+
+    if (v1 < v2)
+        return -1;
+    else if (v1 == v2)
+        return 0;
+    else
+        return 1;
+}
+
+static void js_free_prop_enum(JSContext *ctx, JSPropertyEnum *tab, uint32_t len)
+{
+    uint32_t i;
+    if (tab) {
+        for(i = 0; i < len; i++)
+            JS_FreeAtom(ctx, tab[i].atom);
+        js_free(ctx, tab);
+    }
+}
+
+/* return < 0 in case if exception, 0 if OK. ptab and its atoms must
+   be freed by the user. */
+static int __exception JS_GetOwnPropertyNamesInternal(JSContext *ctx,
+                                                      JSPropertyEnum **ptab,
+                                                      uint32_t *plen,
+                                                      JSObject *p, int flags)
+{
+    int i, j;
+    JSShape *sh;
+    JSShapeProperty *prs;
+    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;
+    BOOL is_enumerable, num_sorted;
+    uint32_t num_key;
+    JSAtomKindEnum kind;
+
+    /* clear pointer for consistency in case of failure */
+    *ptab = NULL;
+    *plen = 0;
+
+    /* compute the number of returned properties */
+    num_keys_count = 0;
+    str_keys_count = 0;
+    sym_keys_count = 0;
+    exotic_count = 0;
+    tab_exotic = NULL;
+    sh = p->shape;
+    for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+        atom = prs->atom;
+        if (atom != JS_ATOM_NULL) {
+            is_enumerable = ((prs->flags & JS_PROP_ENUMERABLE) != 0);
+            kind = JS_AtomGetKind(ctx, atom);
+            if ((!(flags & JS_GPN_ENUM_ONLY) || is_enumerable) &&
+                ((flags >> kind) & 1) != 0) {
+                /* need to raise an exception in case of the module
+                   name space (implicit GetOwnProperty) */
+                if (unlikely((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) &&
+                    (flags & (JS_GPN_SET_ENUM | JS_GPN_ENUM_ONLY))) {
+                    JSVarRef *var_ref = p->prop[i].u.var_ref;
+                    if (unlikely(JS_IsUninitialized(*var_ref->pvalue))) {
+                        JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                        return -1;
+                    }
+                }
+                if (JS_AtomIsArrayIndex(ctx, &num_key, atom)) {
+                    num_keys_count++;
+                } else if (kind == JS_ATOM_KIND_STRING) {
+                    str_keys_count++;
+                } else {
+                    sym_keys_count++;
+                }
+            }
+        }
+    }
+
+    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;
+            }
+            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) {
+                if (em->get_own_property_names(ctx, &tab_exotic, &exotic_count,
+                                               JS_MKPTR(JS_TAG_OBJECT, p)))
+                    return -1;
+                for(i = 0; i < exotic_count; i++) {
+                    atom = tab_exotic[i].atom;
+                    kind = JS_AtomGetKind(ctx, atom);
+                    if (((flags >> kind) & 1) != 0) {
+                        is_enumerable = FALSE;
+                        if (flags & (JS_GPN_SET_ENUM | JS_GPN_ENUM_ONLY)) {
+                            JSPropertyDescriptor desc;
+                            int res;
+                            /* set the "is_enumerable" field if necessary */
+                            res = JS_GetOwnPropertyInternal(ctx, &desc, p, atom);
+                            if (res < 0) {
+                                js_free_prop_enum(ctx, tab_exotic, exotic_count);
+                                return -1;
+                            }
+                            if (res) {
+                                is_enumerable =
+                                    ((desc.flags & JS_PROP_ENUMERABLE) != 0);
+                                js_free_desc(ctx, &desc);
+                            }
+                            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++;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /* fill them */
+
+    atom_count = num_keys_count + str_keys_count + sym_keys_count;
+    /* avoid allocating 0 bytes */
+    tab_atom = js_malloc(ctx, sizeof(tab_atom[0]) * max_int(atom_count, 1));
+    if (!tab_atom) {
+        js_free_prop_enum(ctx, tab_exotic, exotic_count);
+        return -1;
+    }
+
+    num_index = 0;
+    str_index = num_keys_count;
+    sym_index = str_index + str_keys_count;
+
+    num_sorted = TRUE;
+    sh = p->shape;
+    for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+        atom = prs->atom;
+        if (atom != JS_ATOM_NULL) {
+            is_enumerable = ((prs->flags & JS_PROP_ENUMERABLE) != 0);
+            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 = JS_DupAtom(ctx, atom);
+                tab_atom[j].is_enumerable = is_enumerable;
+            }
+        }
+    }
+
+    if (p->is_exotic) {
+        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;
+                }
+                tab_atom[num_index].is_enumerable = TRUE;
+                num_index++;
+            }
+        }
+        if (exotic_count > 0) {
+            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;
+                } else {
+                    JS_FreeAtom(ctx, atom);
+                }
+            }
+        }
+        js_free(ctx, tab_exotic);
+    }
+
+    assert(num_index == num_keys_count);
+    assert(str_index == num_keys_count + str_keys_count);
+    assert(sym_index == atom_count);
+
+    if (num_keys_count != 0 && !num_sorted) {
+        rqsort(tab_atom, num_keys_count, sizeof(tab_atom[0]), num_keys_cmp,
+               ctx);
+    }
+    *ptab = tab_atom;
+    *plen = atom_count;
+    return 0;
+}
+
+int JS_GetOwnPropertyNames(JSContext *ctx, JSPropertyEnum **ptab,
+                           uint32_t *plen, JSValueConst obj, int flags)
+{
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    return JS_GetOwnPropertyNamesInternal(ctx, ptab, plen,
+                                          JS_VALUE_GET_OBJ(obj), flags);
+}
+
+/* Return -1 if exception,
+   FALSE if the property does not exist, TRUE if it exists. If TRUE is
+   returned, the property descriptor 'desc' is filled present. */
+static int JS_GetOwnPropertyInternal(JSContext *ctx, JSPropertyDescriptor *desc,
+                                     JSObject *p, JSAtom prop)
+{
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+retry:
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        if (desc) {
+            desc->flags = prs->flags & JS_PROP_C_W_E;
+            desc->getter = JS_UNDEFINED;
+            desc->setter = JS_UNDEFINED;
+            desc->value = JS_UNDEFINED;
+            if (unlikely(prs->flags & JS_PROP_TMASK)) {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    desc->flags |= JS_PROP_GETSET;
+                    if (pr->u.getset.getter)
+                        desc->getter = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (pr->u.getset.setter)
+                        desc->setter = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF) {
+                    JSValue val = *pr->u.var_ref->pvalue;
+                    if (unlikely(JS_IsUninitialized(val))) {
+                        JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                        return -1;
+                    }
+                    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))
+                        return -1;
+                    goto retry;
+                }
+            } else {
+                desc->value = JS_DupValue(ctx, pr->u.value);
+            }
+        } else {
+            /* for consistency, send the exception even if desc is NULL */
+            if (unlikely((prs->flags & JS_PROP_TMASK) == JS_PROP_VARREF)) {
+                if (unlikely(JS_IsUninitialized(*pr->u.var_ref->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                    return -1;
+                }
+            } else if ((prs->flags & JS_PROP_TMASK) == JS_PROP_AUTOINIT) {
+                /* nothing to do: delay instantiation until actual value and/or attributes are read */
+            }
+        }
+        return TRUE;
+    }
+    if (p->is_exotic) {
+        if (p->fast_array) {
+            /* specific case for fast arrays */
+            if (__JS_AtomIsTaggedInt(prop)) {
+                uint32_t idx;
+                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->getter = JS_UNDEFINED;
+                        desc->setter = JS_UNDEFINED;
+                        desc->value = JS_GetPropertyUint32(ctx, JS_MKPTR(JS_TAG_OBJECT, p), idx);
+                    }
+                    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) {
+                return em->get_own_property(ctx, desc,
+                                            JS_MKPTR(JS_TAG_OBJECT, p), prop);
+            }
+        }
+    }
+    return FALSE;
+}
+
+int JS_GetOwnProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                      JSValueConst obj, JSAtom prop)
+{
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    return JS_GetOwnPropertyInternal(ctx, desc, JS_VALUE_GET_OBJ(obj), prop);
+}
+
+/* return -1 if exception (Proxy object only) or TRUE/FALSE */
+int JS_IsExtensible(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_isExtensible(ctx, obj);
+    else
+        return p->extensible;
+}
+
+/* return -1 if exception (Proxy object only) or TRUE/FALSE */
+int JS_PreventExtensions(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (unlikely(p->class_id == JS_CLASS_PROXY))
+        return js_proxy_preventExtensions(ctx, obj);
+    p->extensible = FALSE;
+    return TRUE;
+}
+
+/* return -1 if exception otherwise TRUE or FALSE */
+int JS_HasProperty(JSContext *ctx, JSValueConst obj, JSAtom prop)
+{
+    JSObject *p;
+    int ret;
+
+    if (unlikely(JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT))
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(obj);
+    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);
+        }
+        ret = JS_GetOwnPropertyInternal(ctx, NULL, p, prop);
+        if (ret != 0)
+            return ret;
+        if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+            p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            ret = JS_AtomIsNumericIndex(ctx, prop);
+            if (ret != 0) {
+                if (ret < 0)
+                    return -1;
+                /* the detached array test was done in
+                   JS_GetOwnPropertyInternal() */
+                return FALSE;
+            }
+        }
+        p = p->shape->proto;
+        if (!p)
+            break;
+    }
+    return FALSE;
+}
+
+/* val must be a symbol */
+static JSAtom js_symbol_to_atom(JSContext *ctx, JSValue val)
+{
+    JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+    return js_get_atom_index(ctx->rt, p);
+}
+
+/* return JS_ATOM_NULL in case of exception */
+JSAtom JS_ValueToAtom(JSContext *ctx, JSValueConst val)
+{
+    JSAtom atom;
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(val);
+    if (tag == JS_TAG_INT &&
+        (uint32_t)JS_VALUE_GET_INT(val) <= JS_ATOM_MAX_INT) {
+        /* fast path for integer values */
+        atom = __JS_AtomFromUInt32(JS_VALUE_GET_INT(val));
+    } else if (tag == JS_TAG_SYMBOL) {
+        JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+        atom = JS_DupAtom(ctx, js_get_atom_index(ctx->rt, p));
+    } else {
+        JSValue str;
+        str = JS_ToPropertyKey(ctx, val);
+        if (JS_IsException(str))
+            return JS_ATOM_NULL;
+        if (JS_VALUE_GET_TAG(str) == JS_TAG_SYMBOL) {
+            atom = js_symbol_to_atom(ctx, str);
+        } else {
+            atom = JS_NewAtomStr(ctx, JS_VALUE_GET_STRING(str));
+        }
+    }
+    return atom;
+}
+
+static JSValue JS_GetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                                   JSValue prop)
+{
+    JSAtom atom;
+    JSValue ret;
+
+    if (likely(JS_VALUE_GET_TAG(this_obj) == JS_TAG_OBJECT &&
+               JS_VALUE_GET_TAG(prop) == JS_TAG_INT)) {
+        JSObject *p;
+        uint32_t idx, len;
+        /* fast path for array access */
+        p = JS_VALUE_GET_OBJ(this_obj);
+        idx = JS_VALUE_GET_INT(prop);
+        len = (uint32_t)p->u.array.count;
+        if (unlikely(idx >= len))
+            goto slow_path;
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:
+        case JS_CLASS_ARGUMENTS:
+            return JS_DupValue(ctx, p->u.array.u.values[idx]);
+        case JS_CLASS_INT8_ARRAY:
+            return JS_NewInt32(ctx, p->u.array.u.int8_ptr[idx]);
+        case JS_CLASS_UINT8C_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            return JS_NewInt32(ctx, p->u.array.u.uint8_ptr[idx]);
+        case JS_CLASS_INT16_ARRAY:
+            return JS_NewInt32(ctx, p->u.array.u.int16_ptr[idx]);
+        case JS_CLASS_UINT16_ARRAY:
+            return JS_NewInt32(ctx, p->u.array.u.uint16_ptr[idx]);
+        case JS_CLASS_INT32_ARRAY:
+            return JS_NewInt32(ctx, p->u.array.u.int32_ptr[idx]);
+        case JS_CLASS_UINT32_ARRAY:
+            return JS_NewUint32(ctx, p->u.array.u.uint32_ptr[idx]);
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT64_ARRAY:
+            return JS_NewBigInt64(ctx, p->u.array.u.int64_ptr[idx]);
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            return JS_NewBigUint64(ctx, p->u.array.u.uint64_ptr[idx]);
+#endif
+        case JS_CLASS_FLOAT32_ARRAY:
+            return __JS_NewFloat64(ctx, p->u.array.u.float_ptr[idx]);
+        case JS_CLASS_FLOAT64_ARRAY:
+            return __JS_NewFloat64(ctx, p->u.array.u.double_ptr[idx]);
+        default:
+            goto slow_path;
+        }
+    } else {
+    slow_path:
+        atom = JS_ValueToAtom(ctx, prop);
+        JS_FreeValue(ctx, prop);
+        if (unlikely(atom == JS_ATOM_NULL))
+            return JS_EXCEPTION;
+        ret = JS_GetProperty(ctx, this_obj, atom);
+        JS_FreeAtom(ctx, atom);
+        return ret;
+    }
+}
+
+JSValue JS_GetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                             uint32_t idx)
+{
+    return JS_GetPropertyValue(ctx, this_obj, JS_NewUint32(ctx, idx));
+}
+
+/* Check if an object has a generalized numeric property. Return value:
+   -1 for exception,
+   TRUE if property exists, stored into *pval,
+   FALSE if proprty does not exist.
+ */
+static int JS_TryGetPropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx, JSValue *pval)
+{
+    JSValue val = JS_UNDEFINED;
+    JSAtom prop;
+    int present;
+
+    if (likely((uint64_t)idx <= JS_ATOM_MAX_INT)) {
+        /* fast path */
+        present = JS_HasProperty(ctx, obj, __JS_AtomFromUInt32(idx));
+        if (present > 0) {
+            val = JS_GetPropertyValue(ctx, obj, JS_NewInt32(ctx, idx));
+            if (unlikely(JS_IsException(val)))
+                present = -1;
+        }
+    } else {
+        prop = JS_NewAtomInt64(ctx, idx);
+        present = -1;
+        if (likely(prop != JS_ATOM_NULL)) {
+            present = JS_HasProperty(ctx, obj, prop);
+            if (present > 0) {
+                val = JS_GetProperty(ctx, obj, prop);
+                if (unlikely(JS_IsException(val)))
+                    present = -1;
+            }
+            JS_FreeAtom(ctx, prop);
+        }
+    }
+    *pval = val;
+    return present;
+}
+
+static JSValue JS_GetPropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx)
+{
+    JSAtom prop;
+    JSValue val;
+
+    if ((uint64_t)idx <= INT32_MAX) {
+        /* fast path for fast arrays */
+        return JS_GetPropertyValue(ctx, obj, JS_NewInt32(ctx, idx));
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL)
+        return JS_EXCEPTION;
+
+    val = JS_GetProperty(ctx, obj, prop);
+    JS_FreeAtom(ctx, prop);
+    return val;
+}
+
+JSValue JS_GetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                          const char *prop)
+{
+    JSAtom atom;
+    JSValue ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_GetProperty(ctx, this_obj, atom);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* Note: the property value is not initialized. Return NULL if memory
+   error. */
+static JSProperty *add_property(JSContext *ctx,
+                                JSObject *p, JSAtom prop, int prop_flags)
+{
+    JSShape *sh, *new_sh;
+
+    sh = p->shape;
+    if (sh->is_hashed) {
+        /* try to find an existing shape */
+        new_sh = find_hashed_shape_prop(ctx->rt, sh, prop, prop_flags);
+        if (new_sh) {
+            /* matching shape found: use it */
+            /*  the property array may need to be resized */
+            if (new_sh->prop_size != sh->prop_size) {
+                JSProperty *new_prop;
+                new_prop = js_realloc(ctx, p->prop, sizeof(p->prop[0]) *
+                                      new_sh->prop_size);
+                if (!new_prop)
+                    return NULL;
+                p->prop = new_prop;
+            }
+            p->shape = js_dup_shape(new_sh);
+            js_free_shape(ctx->rt, sh);
+            return &p->prop[new_sh->prop_count - 1];
+        } else if (sh->header.ref_count != 1) {
+            /* if the shape is shared, clone it */
+            new_sh = js_clone_shape(ctx, sh);
+            if (!new_sh)
+                return NULL;
+            /* hash the cloned shape */
+            new_sh->is_hashed = TRUE;
+            js_shape_hash_link(ctx->rt, new_sh);
+            js_free_shape(ctx->rt, p->shape);
+            p->shape = new_sh;
+        }
+    }
+    assert(p->shape->header.ref_count == 1);
+    if (add_shape_property(ctx, &p->shape, p, prop, prop_flags))
+        return NULL;
+    return &p->prop[p->shape->prop_count - 1];
+}
+
+/* can be called on Array or Arguments objects. return < 0 if
+   memory alloc error. */
+static no_inline __exception int convert_fast_array_to_array(JSContext *ctx,
+                                                             JSObject *p)
+{
+    JSProperty *pr;
+    JSShape *sh;
+    JSValue *tab;
+    uint32_t i, len, new_count;
+
+    if (js_shape_prepare_update(ctx, p, NULL))
+        return -1;
+    len = p->u.array.count;
+    /* resize the properties once to simplify the error handling */
+    sh = p->shape;
+    new_count = sh->prop_count + len;
+    if (new_count > sh->prop_size) {
+        if (resize_properties(ctx, &p->shape, p, new_count))
+            return -1;
+    }
+
+    tab = p->u.array.u.values;
+    for(i = 0; i < len; i++) {
+        /* add_property cannot fail here but
+           __JS_AtomFromUInt32(i) fails for i > INT32_MAX */
+        pr = add_property(ctx, p, __JS_AtomFromUInt32(i), JS_PROP_C_W_E);
+        pr->u.value = *tab++;
+    }
+    js_free(ctx, p->u.array.u.values);
+    p->u.array.count = 0;
+    p->u.array.u.values = NULL; /* fail safe */
+    p->u.array.u1.size = 0;
+    p->fast_array = 0;
+    return 0;
+}
+
+static int delete_property(JSContext *ctx, JSObject *p, JSAtom atom)
+{
+    JSShape *sh;
+    JSShapeProperty *pr, *lpr, *prop;
+    JSProperty *pr1;
+    uint32_t lpr_idx;
+    intptr_t h, h1;
+
+ redo:
+    sh = p->shape;
+    h1 = atom & sh->prop_hash_mask;
+    h = sh->prop_hash_end[-h1 - 1];
+    prop = get_shape_prop(sh);
+    lpr = NULL;
+    lpr_idx = 0;   /* prevent warning */
+    while (h != 0) {
+        pr = &prop[h - 1];
+        if (likely(pr->atom == atom)) {
+            /* found ! */
+            if (!(pr->flags & JS_PROP_CONFIGURABLE))
+                return FALSE;
+            /* realloc the shape if needed */
+            if (lpr)
+                lpr_idx = lpr - get_shape_prop(sh);
+            if (js_shape_prepare_update(ctx, p, &pr))
+                return -1;
+            sh = p->shape;
+            /* remove property */
+            if (lpr) {
+                lpr = get_shape_prop(sh) + lpr_idx;
+                lpr->hash_next = pr->hash_next;
+            } else {
+                sh->prop_hash_end[-h1 - 1] = pr->hash_next;
+            }
+            /* free the entry */
+            pr1 = &p->prop[h - 1];
+            free_property(ctx->rt, pr1, pr->flags);
+            JS_FreeAtom(ctx, pr->atom);
+            /* put default values */
+            pr->flags = 0;
+            pr->atom = JS_ATOM_NULL;
+            pr1->u.value = JS_UNDEFINED;
+            return TRUE;
+        }
+        lpr = pr;
+        h = pr->hash_next;
+    }
+
+    if (p->is_exotic) {
+        if (p->fast_array) {
+            uint32_t idx;
+            if (JS_AtomIsArrayIndex(ctx, &idx, atom) &&
+                idx < p->u.array.count) {
+                if (p->class_id == JS_CLASS_ARRAY ||
+                    p->class_id == JS_CLASS_ARGUMENTS) {
+                    /* Special case deleting the last element of a fast Array */
+                    if (idx == p->u.array.count - 1) {
+                        JS_FreeValue(ctx, p->u.array.u.values[idx]);
+                        p->u.array.count = idx;
+                        return TRUE;
+                    }
+                    if (convert_fast_array_to_array(ctx, p))
+                        return -1;
+                    goto redo;
+                } else {
+                    return FALSE; /* not configurable */
+                }
+            }
+        } else {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em && em->delete_property) {
+                return em->delete_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p), atom);
+            }
+        }
+    }
+    /* not found */
+    return TRUE;
+}
+
+static int call_setter(JSContext *ctx, JSObject *setter,
+                       JSValueConst this_obj, JSValue val, int flags)
+{
+    JSValue ret, func;
+    if (likely(setter)) {
+        func = JS_MKPTR(JS_TAG_OBJECT, setter);
+        /* Note: the field could be removed in the setter */
+        func = JS_DupValue(ctx, func);
+        ret = JS_CallFree(ctx, func, this_obj, 1, (JSValueConst *)&val);
+        JS_FreeValue(ctx, val);
+        if (JS_IsException(ret))
+            return -1;
+        JS_FreeValue(ctx, ret);
+    } else {
+        JS_FreeValue(ctx, val);
+        if ((flags & JS_PROP_THROW) ||
+            ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+            JS_ThrowTypeError(ctx, "no setter for property");
+            return -1;
+        }
+        /* XXX: should 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)
+{
+    uint32_t len, idx, cur_len;
+    int i, ret;
+
+    ret = JS_ToArrayLengthFree(ctx, &len, val);
+    if (ret)
+        return -1;
+    if (likely(p->fast_array)) {
+        uint32_t old_len = p->u.array.count;
+        if (len < old_len) {
+            for(i = len; i < old_len; i++) {
+                JS_FreeValue(ctx, p->u.array.u.values[i]);
+            }
+            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
+    } else {
+        /* Note: length is always a uint32 because the object is an
+           array */
+        JS_ToUint32(ctx, &cur_len, prop->u.value);
+        if (len < cur_len) {
+            uint32_t d;
+            JSShape *sh;
+            JSShapeProperty *pr;
+
+            d = cur_len - len;
+            sh = p->shape;
+            if (d <= sh->prop_count) {
+                JSAtom atom;
+
+                /* faster to iterate */
+                while (cur_len > len) {
+                    atom = JS_NewAtomUInt32(ctx, cur_len - 1);
+                    ret = delete_property(ctx, p, atom);
+                    JS_FreeAtom(ctx, atom);
+                    if (unlikely(!ret)) {
+                        /* unlikely case: property is not
+                           configurable */
+                        break;
+                    }
+                    cur_len--;
+                }
+            } else {
+                /* faster to iterate thru all the properties. Need two
+                   passes in case one of the property is not
+                   configurable */
+                cur_len = len;
+                for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count;
+                    i++, pr++) {
+                    if (pr->atom != JS_ATOM_NULL &&
+                        JS_AtomIsArrayIndex(ctx, &idx, pr->atom)) {
+                        if (idx >= cur_len &&
+                            !(pr->flags & JS_PROP_CONFIGURABLE)) {
+                            cur_len = idx + 1;
+                        }
+                    }
+                }
+
+                for(i = 0, pr = get_shape_prop(sh); i < sh->prop_count;
+                    i++, pr++) {
+                    if (pr->atom != JS_ATOM_NULL &&
+                        JS_AtomIsArrayIndex(ctx, &idx, pr->atom)) {
+                        if (idx >= cur_len) {
+                            /* remove the property */
+                            delete_property(ctx, p, pr->atom);
+                            /* WARNING: the shape may have been modified */
+                            sh = p->shape;
+                            pr = get_shape_prop(sh) + i;
+                        }
+                    }
+                }
+            }
+        } else {
+            cur_len = len;
+        }
+        set_value(ctx, &p->prop[0].u.value, JS_NewUint32(ctx, cur_len));
+        if (unlikely(cur_len > len)) {
+            return JS_ThrowTypeErrorOrFalse(ctx, flags, "not configurable");
+        }
+    }
+    return TRUE;
+}
+
+/* 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,
+                                  JSValue val, int flags)
+{
+    uint32_t new_len, array_len;
+    /* extend the array by one */
+    /* XXX: convert to slow array if new_len > 2^31-1 elements */
+    new_len = p->u.array.count + 1;
+    /* update the length if necessary. We assume that if the length is
+       not an integer, then if it >= 2^31.  */
+    if (likely(JS_VALUE_GET_TAG(p->prop[0].u.value) == JS_TAG_INT)) {
+        array_len = JS_VALUE_GET_INT(p->prop[0].u.value);
+        if (new_len > array_len) {
+            if (unlikely(!(get_shape_prop(p->shape)->flags & JS_PROP_WRITABLE))) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+            }
+            p->prop[0].u.value = JS_NewInt32(ctx, new_len);
+        }
+    }
+    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) {
+            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;
+    return TRUE;
+}
+
+static void js_free_desc(JSContext *ctx, JSPropertyDescriptor *desc)
+{
+    JS_FreeValue(ctx, desc->getter);
+    JS_FreeValue(ctx, desc->setter);
+    JS_FreeValue(ctx, desc->value);
+}
+
+/* generic (and slower) version of JS_SetProperty() for Reflect.set() */
+static int JS_SetPropertyGeneric(JSContext *ctx,
+                                 JSObject *p, JSAtom prop,
+                                 JSValue val, JSValueConst this_obj,
+                                 int flags)
+{
+    int ret;
+    JSPropertyDescriptor desc;
+
+    while (p != NULL) {
+        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,
+                                       val, this_obj, flags);
+                JS_FreeValue(ctx, val);
+                return ret;
+            }
+        }
+
+        ret = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+        if (ret < 0)
+            return ret;
+        if (ret) {
+            if (desc.flags & JS_PROP_GETSET) {
+                JSObject *setter;
+                if (JS_IsUndefined(desc.setter))
+                    setter = NULL;
+                else
+                    setter = JS_VALUE_GET_OBJ(desc.setter);
+                ret = call_setter(ctx, setter, this_obj, val, flags);
+                JS_FreeValue(ctx, desc.getter);
+                JS_FreeValue(ctx, desc.setter);
+                return ret;
+            } else {
+                JS_FreeValue(ctx, desc.value);
+                if (!(desc.flags & JS_PROP_WRITABLE)) {
+                    goto read_only_error;
+                }
+            }
+            break;
+        }
+        p = p->shape->proto;
+    }
+
+    if (!JS_IsObject(this_obj))
+        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)
+        return ret;
+    if (ret) {
+        if (desc.flags & JS_PROP_GETSET) {
+            JS_FreeValue(ctx, desc.getter);
+            JS_FreeValue(ctx, desc.setter);
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeErrorOrFalse(ctx, flags, "setter is forbidden");
+        } else {
+            JS_FreeValue(ctx, desc.value);
+            if (!(desc.flags & JS_PROP_WRITABLE) ||
+                p->class_id == JS_CLASS_MODULE_NS) {
+            read_only_error:
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, flags, prop);
+            }
+        }
+        ret = JS_DefineProperty(ctx, this_obj, prop, val,
+                                JS_UNDEFINED, JS_UNDEFINED,
+                                JS_PROP_HAS_VALUE);
+        JS_FreeValue(ctx, val);
+        return ret;
+    }
+
+    ret = JS_CreateProperty(ctx, p, prop, val, JS_UNDEFINED, JS_UNDEFINED,
+                            flags |
+                            JS_PROP_HAS_VALUE |
+                            JS_PROP_HAS_ENUMERABLE |
+                            JS_PROP_HAS_WRITABLE |
+                            JS_PROP_HAS_CONFIGURABLE |
+                            JS_PROP_C_W_E);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+/* return -1 in case of exception or TRUE or FALSE. Warning: 'val' is
+   freed by the function. 'flags' is a bitmask of JS_PROP_NO_ADD,
+   JS_PROP_THROW or JS_PROP_THROW_STRICT. If JS_PROP_NO_ADD is set,
+   the new property is not added and an error is raised. */
+int JS_SetPropertyInternal(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val, int flags)
+{
+    JSObject *p, *p1;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    uint32_t tag;
+    JSPropertyDescriptor desc;
+    int ret;
+#if 0
+    printf("JS_SetPropertyInternal: "); print_atom(ctx, prop); printf("\n");
+#endif
+    tag = JS_VALUE_GET_TAG(this_obj);
+    if (unlikely(tag != JS_TAG_OBJECT)) {
+        switch(tag) {
+        case JS_TAG_NULL:
+        case JS_TAG_UNDEFINED:
+            JS_FreeValue(ctx, val);
+            JS_ThrowTypeError(ctx, "value has no property");
+            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));
+            goto prototype_lookup;
+        }
+    }
+    p = JS_VALUE_GET_OBJ(this_obj);
+retry:
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        if (likely((prs->flags & (JS_PROP_TMASK | JS_PROP_WRITABLE |
+                                  JS_PROP_LENGTH)) == JS_PROP_WRITABLE)) {
+            /* 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)) {
+            assert(p->class_id == JS_CLASS_ARRAY);
+            assert(prop == JS_ATOM_length);
+            return set_array_length(ctx, p, pr, 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) {
+            /* JS_PROP_WRITABLE is always true for variable
+               references, but they are write protected in module name
+               spaces. */
+            if (p->class_id == JS_CLASS_MODULE_NS)
+                goto read_only_prop;
+            set_value(ctx, pr->u.var_ref->pvalue, val);
+            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)) {
+                JS_FreeValue(ctx, val);
+                return -1;
+            }
+            goto retry;
+        } else {
+            goto read_only_prop;
+        }
+    }
+
+    p1 = p;
+    for(;;) {
+        if (p1->is_exotic) {
+            if (p1->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    uint32_t idx = __JS_AtomToUInt32(prop);
+                    if (idx < p1->u.array.count) {
+                        if (unlikely(p == p1))
+                            return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), val, flags);
+                        else
+                            break;
+                    } else if (p1->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                               p1->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                        goto typed_array_oob;
+                    }
+                } else if (p1->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                           p1->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                    ret = JS_AtomIsNumericIndex(ctx, prop);
+                    if (ret != 0) {
+                        if (ret < 0) {
+                            JS_FreeValue(ctx, val);
+                            return -1;
+                        }
+                    typed_array_oob:
+                        val = JS_ToNumberFree(ctx, val);
+                        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) {
+                    if (em->set_property) {
+                        ret = em->set_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p1), prop,
+                                               val, this_obj, flags);
+                        JS_FreeValue(ctx, val);
+                        return ret;
+                    }
+                    if (em->get_own_property) {
+                        ret = em->get_own_property(ctx, &desc,
+                                                   JS_MKPTR(JS_TAG_OBJECT, p1), prop);
+                        if (ret < 0) {
+                            JS_FreeValue(ctx, val);
+                            return ret;
+                        }
+                        if (ret) {
+                            if (desc.flags & JS_PROP_GETSET) {
+                                JSObject *setter;
+                                if (JS_IsUndefined(desc.setter))
+                                    setter = NULL;
+                                else
+                                    setter = JS_VALUE_GET_OBJ(desc.setter);
+                                ret = call_setter(ctx, setter, this_obj, val, flags);
+                                JS_FreeValue(ctx, desc.getter);
+                                JS_FreeValue(ctx, desc.setter);
+                                return ret;
+                            } else {
+                                JS_FreeValue(ctx, desc.value);
+                                if (!(desc.flags & JS_PROP_WRITABLE))
+                                    goto read_only_prop;
+                                if (likely(p == p1)) {
+                                    ret = JS_DefineProperty(ctx, this_obj, prop, val,
+                                                            JS_UNDEFINED, JS_UNDEFINED,
+                                                            JS_PROP_HAS_VALUE);
+                                    JS_FreeValue(ctx, val);
+                                    return ret;
+                                } else {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        p1 = p1->shape->proto;
+    prototype_lookup:
+        if (!p1)
+            break;
+
+    retry2:
+        prs = find_own_property(&pr, p1, prop);
+        if (prs) {
+            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_AUTOINIT) {
+                /* Instantiate property and retry (potentially useless) */
+                if (JS_AutoInitProperty(ctx, p1, prop, pr))
+                    return -1;
+                goto retry2;
+            } else if (!(prs->flags & JS_PROP_WRITABLE)) {
+            read_only_prop:
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, flags, prop);
+            }
+        }
+    }
+
+    if (unlikely(flags & JS_PROP_NO_ADD)) {
+        JS_FreeValue(ctx, val);
+        JS_ThrowReferenceErrorNotDefined(ctx, prop);
+        return -1;
+    }
+
+    if (unlikely(!p)) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "not an object");
+    }
+
+    if (unlikely(!p->extensible)) {
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "object is not extensible");
+    }
+
+    if (p->is_exotic) {
+        if (p->class_id == JS_CLASS_ARRAY && p->fast_array &&
+            __JS_AtomIsTaggedInt(prop)) {
+            uint32_t idx = __JS_AtomToUInt32(prop);
+            if (idx == p->u.array.count) {
+                /* fast case */
+                return add_fast_array_element(ctx, p, val, flags);
+            } else {
+                goto generic_create_prop;
+            }
+        } else {
+        generic_create_prop:
+            ret = JS_CreateProperty(ctx, p, prop, val, JS_UNDEFINED, JS_UNDEFINED,
+                                    flags |
+                                    JS_PROP_HAS_VALUE |
+                                    JS_PROP_HAS_ENUMERABLE |
+                                    JS_PROP_HAS_WRITABLE |
+                                    JS_PROP_HAS_CONFIGURABLE |
+                                    JS_PROP_C_W_E);
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+    }
+
+    pr = add_property(ctx, p, prop, JS_PROP_C_W_E);
+    if (unlikely(!pr)) {
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    pr->u.value = val;
+    return TRUE;
+}
+
+/* flags can be JS_PROP_THROW or JS_PROP_THROW_STRICT */
+static int JS_SetPropertyValue(JSContext *ctx, JSValueConst this_obj,
+                               JSValue prop, JSValue val, int flags)
+{
+    if (likely(JS_VALUE_GET_TAG(this_obj) == JS_TAG_OBJECT &&
+               JS_VALUE_GET_TAG(prop) == JS_TAG_INT)) {
+        JSObject *p;
+        uint32_t idx;
+        double d;
+        int32_t v;
+
+        /* fast path for array access */
+        p = JS_VALUE_GET_OBJ(this_obj);
+        idx = JS_VALUE_GET_INT(prop);
+        switch(p->class_id) {
+        case JS_CLASS_ARRAY:
+            if (unlikely(idx >= (uint32_t)p->u.array.count)) {
+                JSObject *p1;
+                JSShape *sh1;
+
+                /* fast path to add an element to the array */
+                if (idx != (uint32_t)p->u.array.count ||
+                    !p->fast_array || !p->extensible)
+                    goto slow_path;
+                /* check if prototype chain has a numeric property */
+                p1 = p->shape->proto;
+                while (p1 != NULL) {
+                    sh1 = p1->shape;
+                    if (p1->class_id == JS_CLASS_ARRAY) {
+                        if (unlikely(!p1->fast_array))
+                            goto slow_path;
+                    } else if (p1->class_id == JS_CLASS_OBJECT) {
+                        if (unlikely(sh1->has_small_array_index))
+                            goto slow_path;
+                    } else {
+                        goto slow_path;
+                    }
+                    p1 = sh1->proto;
+                }
+                /* add element */
+                return add_fast_array_element(ctx, p, val, flags);
+            }
+            set_value(ctx, &p->u.array.u.values[idx], val);
+            break;
+        case JS_CLASS_ARGUMENTS:
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto slow_path;
+            set_value(ctx, &p->u.array.u.values[idx], val);
+            break;
+        case JS_CLASS_UINT8C_ARRAY:
+            if (JS_ToUint8ClampFree(ctx, &v, val))
+                return -1;
+            /* Note: the conversion can detach the typed array, so the
+               array bound check must be done after */
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint8_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT8_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint8_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT16_ARRAY:
+        case JS_CLASS_UINT16_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint16_ptr[idx] = v;
+            break;
+        case JS_CLASS_INT32_ARRAY:
+        case JS_CLASS_UINT32_ARRAY:
+            if (JS_ToInt32Free(ctx, &v, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.uint32_ptr[idx] = v;
+            break;
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT64_ARRAY:
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            /* XXX: need specific conversion function */
+            {
+                int64_t v;
+                if (JS_ToBigInt64Free(ctx, &v, val))
+                    return -1;
+                if (unlikely(idx >= (uint32_t)p->u.array.count))
+                    goto ta_out_of_bound;
+                p->u.array.u.uint64_ptr[idx] = v;
+            }
+            break;
+#endif
+        case JS_CLASS_FLOAT32_ARRAY:
+            if (JS_ToFloat64Free(ctx, &d, val))
+                return -1;
+            if (unlikely(idx >= (uint32_t)p->u.array.count))
+                goto ta_out_of_bound;
+            p->u.array.u.float_ptr[idx] = d;
+            break;
+        case JS_CLASS_FLOAT64_ARRAY:
+            if (JS_ToFloat64Free(ctx, &d, val))
+                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");
+                }
+            }
+            p->u.array.u.double_ptr[idx] = d;
+            break;
+        default:
+            goto slow_path;
+        }
+        return TRUE;
+    } else {
+        JSAtom atom;
+        int ret;
+    slow_path:
+        atom = JS_ValueToAtom(ctx, prop);
+        JS_FreeValue(ctx, prop);
+        if (unlikely(atom == JS_ATOM_NULL)) {
+            JS_FreeValue(ctx, val);
+            return -1;
+        }
+        ret = JS_SetPropertyInternal(ctx, this_obj, atom, val, flags);
+        JS_FreeAtom(ctx, atom);
+        return ret;
+    }
+}
+
+int JS_SetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                         uint32_t idx, JSValue val)
+{
+    return JS_SetPropertyValue(ctx, this_obj, JS_NewUint32(ctx, idx), val,
+                               JS_PROP_THROW);
+}
+
+int JS_SetPropertyInt64(JSContext *ctx, JSValueConst this_obj,
+                        int64_t idx, JSValue val)
+{
+    JSAtom prop;
+    int res;
+
+    if ((uint64_t)idx <= INT32_MAX) {
+        /* fast path for fast arrays */
+        return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), val,
+                                   JS_PROP_THROW);
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL) {
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    res = JS_SetProperty(ctx, this_obj, prop, val);
+    JS_FreeAtom(ctx, prop);
+    return res;
+}
+
+int JS_SetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                      const char *prop, JSValue val)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_SetPropertyInternal(ctx, this_obj, atom, val, JS_PROP_THROW);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* compute the property flags. For each flag: (JS_PROP_HAS_x forces
+   it, otherwise def_flags is used)
+   Note: makes assumption about the bit pattern of the flags
+*/
+static int get_prop_flags(int flags, int def_flags)
+{
+    int mask;
+    mask = (flags >> JS_PROP_HAS_SHIFT) & JS_PROP_C_W_E;
+    return (flags & mask) | (def_flags & ~mask);
+}
+
+static int JS_CreateProperty(JSContext *ctx, JSObject *p,
+                             JSAtom prop, JSValueConst val,
+                             JSValueConst getter, JSValueConst setter,
+                             int flags)
+{
+    JSProperty *pr;
+    int ret, prop_flags;
+
+    /* add a new property or modify an existing exotic one */
+    if (p->is_exotic) {
+        if (p->class_id == JS_CLASS_ARRAY) {
+            uint32_t idx, len;
+
+            if (p->fast_array) {
+                if (__JS_AtomIsTaggedInt(prop)) {
+                    idx = __JS_AtomToUInt32(prop);
+                    if (idx == p->u.array.count) {
+                        if (!p->extensible)
+                            goto not_extensible;
+                        if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET))
+                            goto convert_to_array;
+                        prop_flags = get_prop_flags(flags, 0);
+                        if (prop_flags != JS_PROP_C_W_E)
+                            goto convert_to_array;
+                        return add_fast_array_element(ctx, p,
+                                                      JS_DupValue(ctx, val), flags);
+                    } else {
+                        goto convert_to_array;
+                    }
+                } else if (JS_AtomIsArrayIndex(ctx, &idx, prop)) {
+                    /* convert the fast array to normal array */
+                convert_to_array:
+                    if (convert_fast_array_to_array(ctx, p))
+                        return -1;
+                    goto generic_array;
+                }
+            } else if (JS_AtomIsArrayIndex(ctx, &idx, prop)) {
+                JSProperty *plen;
+                JSShapeProperty *pslen;
+            generic_array:
+                /* update the length field */
+                plen = &p->prop[0];
+                JS_ToUint32(ctx, &len, plen->u.value);
+                if ((idx + 1) > len) {
+                    pslen = get_shape_prop(p->shape);
+                    if (unlikely(!(pslen->flags & JS_PROP_WRITABLE)))
+                        return JS_ThrowTypeErrorReadOnly(ctx, flags, JS_ATOM_length);
+                    /* XXX: should update the length after defining
+                       the property */
+                    len = idx + 1;
+                    set_value(ctx, &plen->u.value, JS_NewUint32(ctx, len));
+                }
+            }
+        } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                   p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            ret = JS_AtomIsNumericIndex(ctx, prop);
+            if (ret != 0) {
+                if (ret < 0)
+                    return -1;
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "cannot create numeric index in typed array");
+            }
+        } else if (!(flags & JS_PROP_NO_EXOTIC)) {
+            const JSClassExoticMethods *em = ctx->rt->class_array[p->class_id].exotic;
+            if (em) {
+                if (em->define_own_property) {
+                    return em->define_own_property(ctx, JS_MKPTR(JS_TAG_OBJECT, p),
+                                                   prop, val, getter, setter, flags);
+                }
+                ret = JS_IsExtensible(ctx, JS_MKPTR(JS_TAG_OBJECT, p));
+                if (ret < 0)
+                    return -1;
+                if (!ret)
+                    goto not_extensible;
+            }
+        }
+    }
+
+    if (!p->extensible) {
+    not_extensible:
+        return JS_ThrowTypeErrorOrFalse(ctx, flags, "object is not extensible");
+    }
+
+    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        prop_flags = (flags & (JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE)) |
+            JS_PROP_GETSET;
+    } else {
+        prop_flags = flags & JS_PROP_C_W_E;
+    }
+    pr = add_property(ctx, p, prop, prop_flags);
+    if (unlikely(!pr))
+        return -1;
+    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        pr->u.getset.getter = NULL;
+        if ((flags & JS_PROP_HAS_GET) && JS_IsFunction(ctx, getter)) {
+            pr->u.getset.getter =
+                JS_VALUE_GET_OBJ(JS_DupValue(ctx, getter));
+        }
+        pr->u.getset.setter = NULL;
+        if ((flags & JS_PROP_HAS_SET) && JS_IsFunction(ctx, setter)) {
+            pr->u.getset.setter =
+                JS_VALUE_GET_OBJ(JS_DupValue(ctx, setter));
+        }
+    } else {
+        if (flags & JS_PROP_HAS_VALUE) {
+            pr->u.value = JS_DupValue(ctx, val);
+        } else {
+            pr->u.value = JS_UNDEFINED;
+        }
+    }
+    return TRUE;
+}
+
+/* return FALSE if not OK */
+static BOOL check_define_prop_flags(int prop_flags, int flags)
+{
+    BOOL has_accessor, is_getset;
+
+    if (!(prop_flags & JS_PROP_CONFIGURABLE)) {
+        if ((flags & (JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE)) ==
+            (JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE)) {
+            return FALSE;
+        }
+        if ((flags & JS_PROP_HAS_ENUMERABLE) &&
+            (flags & JS_PROP_ENUMERABLE) != (prop_flags & JS_PROP_ENUMERABLE))
+            return FALSE;
+    }
+    if (flags & (JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE |
+                 JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+        if (!(prop_flags & JS_PROP_CONFIGURABLE)) {
+            has_accessor = ((flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) != 0);
+            is_getset = ((prop_flags & JS_PROP_TMASK) == JS_PROP_GETSET);
+            if (has_accessor != is_getset)
+                return FALSE;
+            if (!has_accessor && !is_getset && !(prop_flags & JS_PROP_WRITABLE)) {
+                /* not writable: cannot set the writable bit */
+                if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) ==
+                    (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE))
+                    return FALSE;
+            }
+        }
+    }
+    return TRUE;
+}
+
+/* ensure that the shape can be safely modified */
+static int js_shape_prepare_update(JSContext *ctx, JSObject *p,
+                                   JSShapeProperty **pprs)
+{
+    JSShape *sh;
+    uint32_t idx = 0;    /* prevent warning */
+
+    sh = p->shape;
+    if (sh->is_hashed) {
+        if (sh->header.ref_count != 1) {
+            if (pprs)
+                idx = *pprs - get_shape_prop(sh);
+            /* clone the shape (the resulting one is no longer hashed) */
+            sh = js_clone_shape(ctx, sh);
+            if (!sh)
+                return -1;
+            js_free_shape(ctx->rt, p->shape);
+            p->shape = sh;
+            if (pprs)
+                *pprs = get_shape_prop(sh) + idx;
+        } else {
+            js_shape_hash_unlink(ctx->rt, sh);
+            sh->is_hashed = FALSE;
+        }
+    }
+    return 0;
+}
+
+static int js_update_property_flags(JSContext *ctx, JSObject *p,
+                                    JSShapeProperty **pprs, int flags)
+{
+    if (flags != (*pprs)->flags) {
+        if (js_shape_prepare_update(ctx, p, pprs))
+            return -1;
+        (*pprs)->flags = flags;
+    }
+    return 0;
+}
+
+/* allowed flags:
+   JS_PROP_CONFIGURABLE, JS_PROP_WRITABLE, JS_PROP_ENUMERABLE
+   JS_PROP_HAS_GET, JS_PROP_HAS_SET, JS_PROP_HAS_VALUE,
+   JS_PROP_HAS_CONFIGURABLE, JS_PROP_HAS_WRITABLE, JS_PROP_HAS_ENUMERABLE,
+   JS_PROP_THROW, JS_PROP_NO_EXOTIC.
+   If JS_PROP_THROW is set, return an exception instead of FALSE.
+   if JS_PROP_NO_EXOTIC is set, do not call the exotic
+   define_own_property callback.
+   return -1 (exception), FALSE or TRUE.
+*/
+int JS_DefineProperty(JSContext *ctx, JSValueConst this_obj,
+                      JSAtom prop, JSValueConst val,
+                      JSValueConst getter, JSValueConst setter, int flags)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    int mask, res;
+
+    if (JS_VALUE_GET_TAG(this_obj) != JS_TAG_OBJECT) {
+        JS_ThrowTypeErrorNotAnObject(ctx);
+        return -1;
+    }
+    p = JS_VALUE_GET_OBJ(this_obj);
+
+ redo_prop_update:
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* property already exists */
+        if (!check_define_prop_flags(prs->flags, flags)) {
+        not_configurable:
+            return JS_ThrowTypeErrorOrFalse(ctx, flags, "property is not configurable");
+        }
+
+    retry:
+        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)) {
+                JSObject *new_getter, *new_setter;
+
+                if (JS_IsFunction(ctx, getter)) {
+                    new_getter = JS_VALUE_GET_OBJ(getter);
+                } else {
+                    new_getter = NULL;
+                }
+                if (JS_IsFunction(ctx, setter)) {
+                    new_setter = JS_VALUE_GET_OBJ(setter);
+                } else {
+                    new_setter = NULL;
+                }
+
+                if ((prs->flags & JS_PROP_TMASK) != JS_PROP_GETSET) {
+                    if (js_shape_prepare_update(ctx, p, &prs))
+                        return -1;
+                    /* 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);
+                    }
+                    prs->flags = (prs->flags &
+                                  (JS_PROP_CONFIGURABLE | JS_PROP_ENUMERABLE)) |
+                        JS_PROP_GETSET;
+                    pr->u.getset.getter = NULL;
+                    pr->u.getset.setter = NULL;
+                } else {
+                    if (!(prs->flags & JS_PROP_CONFIGURABLE)) {
+                        if ((flags & JS_PROP_HAS_GET) &&
+                            new_getter != pr->u.getset.getter) {
+                            goto not_configurable;
+                        }
+                        if ((flags & JS_PROP_HAS_SET) &&
+                            new_setter != pr->u.getset.setter) {
+                            goto not_configurable;
+                        }
+                    }
+                }
+                if (flags & JS_PROP_HAS_GET) {
+                    if (pr->u.getset.getter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (new_getter)
+                        JS_DupValue(ctx, getter);
+                    pr->u.getset.getter = new_getter;
+                }
+                if (flags & JS_PROP_HAS_SET) {
+                    if (pr->u.getset.setter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                    if (new_setter)
+                        JS_DupValue(ctx, setter);
+                    pr->u.getset.setter = new_setter;
+                }
+            } else {
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    /* convert to data descriptor */
+                    if (js_shape_prepare_update(ctx, p, &prs))
+                        return -1;
+                    if (pr->u.getset.getter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.getter));
+                    if (pr->u.getset.setter)
+                        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_OBJECT, pr->u.getset.setter));
+                    prs->flags &= ~(JS_PROP_TMASK | JS_PROP_WRITABLE);
+                    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;
+                    }
+                }
+                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 (flags & JS_PROP_HAS_VALUE) {
+                        if (p->class_id == JS_CLASS_MODULE_NS) {
+                            /* JS_PROP_WRITABLE is always true for variable
+                               references, but they are write protected in module name
+                               spaces. */
+                            if (!js_same_value(ctx, val, *pr->u.var_ref->pvalue))
+                                goto not_configurable;
+                        }
+                        /* update the reference */
+                        set_value(ctx, pr->u.var_ref->pvalue,
+                                  JS_DupValue(ctx, val));
+                    }
+                    /* if writable is set to false, no longer a
+                       reference (for mapped arguments) */
+                    if ((flags & (JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE)) == JS_PROP_HAS_WRITABLE) {
+                        JSValue val1;
+                        if (js_shape_prepare_update(ctx, p, &prs))
+                            return -1;
+                        val1 = JS_DupValue(ctx, *pr->u.var_ref->pvalue);
+                        free_var_ref(ctx->rt, pr->u.var_ref);
+                        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 (flags & JS_PROP_HAS_VALUE) {
+                        JS_FreeValue(ctx, pr->u.value);
+                        pr->u.value = JS_DupValue(ctx, val);
+                    }
+                    if (flags & JS_PROP_HAS_WRITABLE) {
+                        if (js_update_property_flags(ctx, p, &prs,
+                                                     (prs->flags & ~JS_PROP_WRITABLE) |
+                                                     (flags & JS_PROP_WRITABLE)))
+                            return -1;
+                    }
+                }
+            }
+        }
+        mask = 0;
+        if (flags & JS_PROP_HAS_CONFIGURABLE)
+            mask |= JS_PROP_CONFIGURABLE;
+        if (flags & JS_PROP_HAS_ENUMERABLE)
+            mask |= JS_PROP_ENUMERABLE;
+        if (js_update_property_flags(ctx, p, &prs,
+                                     (prs->flags & ~mask) | (flags & mask)))
+            return -1;
+        return TRUE;
+    }
+
+    /* handle modification of fast array elements */
+    if (p->fast_array) {
+        uint32_t idx;
+        uint32_t prop_flags;
+        if (p->class_id == JS_CLASS_ARRAY) {
+            if (__JS_AtomIsTaggedInt(prop)) {
+                idx = __JS_AtomToUInt32(prop);
+                if (idx < p->u.array.count) {
+                    prop_flags = get_prop_flags(flags, JS_PROP_C_W_E);
+                    if (prop_flags != JS_PROP_C_W_E)
+                        goto convert_to_slow_array;
+                    if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+                    convert_to_slow_array:
+                        if (convert_fast_array_to_array(ctx, p))
+                            return -1;
+                        else
+                            goto redo_prop_update;
+                    }
+                    if (flags & JS_PROP_HAS_VALUE) {
+                        set_value(ctx, &p->u.array.u.values[idx], JS_DupValue(ctx, val));
+                    }
+                    return TRUE;
+                }
+            }
+        } else if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                   p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+            JSValue num;
+            int ret;
+
+            if (!__JS_AtomIsTaggedInt(prop)) {
+                /* slow path with to handle all numeric indexes */
+                num = JS_AtomIsNumericIndex1(ctx, prop);
+                if (JS_IsUndefined(num))
+                    goto typed_array_done;
+                if (JS_IsException(num))
+                    return -1;
+                ret = JS_NumberIsInteger(ctx, num);
+                if (ret < 0) {
+                    JS_FreeValue(ctx, num);
+                    return -1;
+                }
+                if (!ret) {
+                    JS_FreeValue(ctx, num);
+                    return JS_ThrowTypeErrorOrFalse(ctx, flags, "non integer index in typed array");
+                }
+                ret = JS_NumberIsNegativeOrMinusZero(ctx, num);
+                JS_FreeValue(ctx, num);
+                if (ret) {
+                    return JS_ThrowTypeErrorOrFalse(ctx, flags, "negative index in typed array");
+                }
+                if (!__JS_AtomIsTaggedInt(prop))
+                    goto typed_array_oob;
+            }
+            idx = __JS_AtomToUInt32(prop);
+            /* if the typed array is detached, p->u.array.count = 0 */
+            if (idx >= typed_array_get_length(ctx, p)) {
+            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);
+            if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET) ||
+                prop_flags != (JS_PROP_ENUMERABLE | JS_PROP_WRITABLE)) {
+                return JS_ThrowTypeErrorOrFalse(ctx, flags, "invalid descriptor flags");
+            }
+            if (flags & JS_PROP_HAS_VALUE) {
+                return JS_SetPropertyValue(ctx, this_obj, JS_NewInt32(ctx, idx), JS_DupValue(ctx, val), flags);
+            }
+            return TRUE;
+        typed_array_done: ;
+        }
+    }
+
+    return JS_CreateProperty(ctx, p, prop, val, getter, setter, flags);
+}
+
+static int JS_DefineAutoInitProperty(JSContext *ctx, JSValueConst this_obj,
+                                     JSAtom prop, int (*init_func)(JSContext *ctx, JSObject *obj,
+                                                                   JSAtom prop, void *opaque),
+                                     void *opaque, int flags)
+{
+    JSObject *p;
+    JSProperty *pr;
+
+    if (JS_VALUE_GET_TAG(this_obj) != JS_TAG_OBJECT)
+        return FALSE;
+
+    p = JS_VALUE_GET_OBJ(this_obj);
+
+    if (find_own_property(&pr, p, prop)) {
+        /* property already exists */
+        abort();
+        return FALSE;
+    }
+
+    /* Specialized CreateProperty */
+    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.opaque = opaque;
+    return TRUE;
+}
+
+/* shortcut to add or redefine a new property value */
+int JS_DefinePropertyValue(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val, int flags)
+{
+    int ret;
+    ret = JS_DefineProperty(ctx, this_obj, prop, val, JS_UNDEFINED, JS_UNDEFINED,
+                            flags | JS_PROP_HAS_VALUE | JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_WRITABLE | JS_PROP_HAS_ENUMERABLE);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+int JS_DefinePropertyValueValue(JSContext *ctx, JSValueConst this_obj,
+                                JSValue prop, JSValue val, int flags)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_ValueToAtom(ctx, prop);
+    JS_FreeValue(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL)) {
+        JS_FreeValue(ctx, val);
+        return -1;
+    }
+    ret = JS_DefinePropertyValue(ctx, this_obj, atom, val, flags);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+int JS_DefinePropertyValueUint32(JSContext *ctx, JSValueConst this_obj,
+                                 uint32_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewUint32(ctx, idx),
+                                       val, flags);
+}
+
+int JS_DefinePropertyValueInt64(JSContext *ctx, JSValueConst this_obj,
+                                int64_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewInt64(ctx, idx),
+                                       val, flags);
+}
+
+int JS_DefinePropertyValueStr(JSContext *ctx, JSValueConst this_obj,
+                              const char *prop, JSValue val, int flags)
+{
+    JSAtom atom;
+    int ret;
+    atom = JS_NewAtom(ctx, prop);
+    ret = JS_DefinePropertyValue(ctx, this_obj, atom, val, flags);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+/* shortcut to add getter & setter */
+int JS_DefinePropertyGetSet(JSContext *ctx, JSValueConst this_obj,
+                            JSAtom prop, JSValue getter, JSValue setter,
+                            int flags)
+{
+    int ret;
+    ret = JS_DefineProperty(ctx, this_obj, prop, JS_UNDEFINED, getter, setter,
+                            flags | JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                            JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_ENUMERABLE);
+    JS_FreeValue(ctx, getter);
+    JS_FreeValue(ctx, setter);
+    return ret;
+}
+
+static int JS_CreateDataPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                                       int64_t idx, JSValue val, int flags)
+{
+    return JS_DefinePropertyValueValue(ctx, this_obj, JS_NewInt64(ctx, idx),
+                                       val, flags | JS_PROP_CONFIGURABLE |
+                                       JS_PROP_ENUMERABLE | JS_PROP_WRITABLE);
+}
+
+
+/* return TRUE if 'obj' has a non empty 'name' string */
+static BOOL js_object_has_name(JSContext *ctx, JSValueConst obj)
+{
+    JSProperty *pr;
+    JSShapeProperty *prs;
+    JSValueConst val;
+    JSString *p;
+
+    prs = find_own_property(&pr, JS_VALUE_GET_OBJ(obj), JS_ATOM_name);
+    if (!prs)
+        return FALSE;
+    if ((prs->flags & JS_PROP_TMASK) != JS_PROP_NORMAL)
+        return TRUE;
+    val = pr->u.value;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_STRING)
+        return TRUE;
+    p = JS_VALUE_GET_STRING(val);
+    return (p->len != 0);
+}
+
+static int JS_DefineObjectName(JSContext *ctx, JSValueConst obj,
+                               JSAtom name, int flags)
+{
+    if (name != JS_ATOM_NULL
+    &&  JS_IsObject(obj)
+    &&  !js_object_has_name(ctx, obj)
+    &&  JS_DefinePropertyValue(ctx, obj, JS_ATOM_name, JS_AtomToString(ctx, name), flags) < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static int JS_DefineObjectNameComputed(JSContext *ctx, JSValueConst obj,
+                                       JSValueConst str, int flags)
+{
+    if (JS_IsObject(obj) &&
+        !js_object_has_name(ctx, obj)) {
+        JSAtom prop;
+        JSValue name_str;
+        prop = JS_ValueToAtom(ctx, str);
+        if (prop == JS_ATOM_NULL)
+            return -1;
+        name_str = js_get_function_name(ctx, prop);
+        JS_FreeAtom(ctx, prop);
+        if (JS_IsException(name_str))
+            return -1;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_name, name_str, flags) < 0)
+            return -1;
+    }
+    return 0;
+}
+
+#define DEFINE_GLOBAL_LEX_VAR (1 << 7)
+#define DEFINE_GLOBAL_FUNC_VAR (1 << 6)
+
+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));
+}
+
+/* flags is 0, DEFINE_GLOBAL_LEX_VAR or DEFINE_GLOBAL_FUNC_VAR */
+/* XXX: could support exotic global object. */
+static int JS_CheckDefineGlobalVar(JSContext *ctx, JSAtom prop, int flags)
+{
+    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);
+    /* XXX: should handle JS_PROP_AUTOINIT */
+    if (flags & DEFINE_GLOBAL_LEX_VAR) {
+        if (prs && !(prs->flags & JS_PROP_CONFIGURABLE))
+            goto fail_redeclaration;
+    } else {
+        if (!prs && !p->extensible)
+            goto define_error;
+        if (flags & DEFINE_GLOBAL_FUNC_VAR) {
+            if (prs) {
+                if (!(prs->flags & JS_PROP_CONFIGURABLE) &&
+                    ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET ||
+                     ((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));
+                    return -1;
+                }
+            }
+        }
+    }
+    /* check if there already is a lexical declaration */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property1(p, prop);
+    if (prs) {
+    fail_redeclaration:
+        JS_ThrowSyntaxErrorVarRedeclaration(ctx, prop);
+        return -1;
+    }
+    return 0;
+}
+
+/* def_flags is (0, DEFINE_GLOBAL_LEX_VAR) |
+   JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE */
+/* XXX: could support exotic global object. */
+static int JS_DefineGlobalVar(JSContext *ctx, JSAtom prop, int def_flags)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    JSValue val;
+    int flags;
+
+    if (def_flags & DEFINE_GLOBAL_LEX_VAR) {
+        p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+        flags = JS_PROP_ENUMERABLE | (def_flags & JS_PROP_WRITABLE) |
+            JS_PROP_CONFIGURABLE;
+        val = JS_UNINITIALIZED;
+    } else {
+        p = JS_VALUE_GET_OBJ(ctx->global_obj);
+        flags = JS_PROP_ENUMERABLE | JS_PROP_WRITABLE |
+            (def_flags & JS_PROP_CONFIGURABLE);
+        val = JS_UNDEFINED;
+    }
+    prs = find_own_property1(p, prop);
+    if (prs)
+        return 0;
+    if (!p->extensible)
+        return 0;
+    pr = add_property(ctx, p, prop, flags);
+    if (unlikely(!pr))
+        return -1;
+    pr->u.value = val;
+    return 0;
+}
+
+/* 'def_flags' is 0 or JS_PROP_CONFIGURABLE. */
+/* XXX: could support exotic global object. */
+static int JS_DefineGlobalFunction(JSContext *ctx, JSAtom prop,
+                                   JSValueConst func, int def_flags)
+{
+
+    JSObject *p;
+    JSShapeProperty *prs;
+    int flags;
+
+    p = JS_VALUE_GET_OBJ(ctx->global_obj);
+    prs = find_own_property1(p, prop);
+    flags = JS_PROP_HAS_VALUE | JS_PROP_THROW;
+    if (!prs || (prs->flags & JS_PROP_CONFIGURABLE)) {
+        flags |= JS_PROP_ENUMERABLE | JS_PROP_WRITABLE | def_flags |
+            JS_PROP_HAS_CONFIGURABLE | JS_PROP_HAS_WRITABLE | JS_PROP_HAS_ENUMERABLE;
+    }
+    if (JS_DefineProperty(ctx, ctx->global_obj, prop, func,
+                          JS_UNDEFINED, JS_UNDEFINED, flags) < 0)
+        return -1;
+    return 0;
+}
+
+static JSValue JS_GetGlobalVar(JSContext *ctx, JSAtom prop,
+                               BOOL throw_ref_error)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_TMASK properties */
+        if (unlikely(JS_IsUninitialized(pr->u.value)))
+            return JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+        return JS_DupValue(ctx, pr->u.value);
+    }
+    return JS_GetPropertyInternal(ctx, ctx->global_obj, prop,
+                                 ctx->global_obj, throw_ref_error);
+}
+
+/* construct a reference to a global variable */
+static int JS_GetGlobalVarRef(JSContext *ctx, JSAtom prop, JSValue *sp)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_AUTOINIT properties? */
+        /* XXX: conformance: do these tests in
+           OP_put_var_ref/OP_get_var_ref ? */
+        if (unlikely(JS_IsUninitialized(pr->u.value))) {
+            JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+            return -1;
+        }
+        if (unlikely(!(prs->flags & JS_PROP_WRITABLE))) {
+            return JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, prop);
+        }
+        sp[0] = JS_DupValue(ctx, ctx->global_var_obj);
+    } else {
+        int ret;
+        ret = JS_HasProperty(ctx, ctx->global_obj, prop);
+        if (ret < 0)
+            return -1;
+        if (ret) {
+            sp[0] = JS_DupValue(ctx, ctx->global_obj);
+        } else {
+            sp[0] = JS_UNDEFINED;
+        }
+    }
+    sp[1] = JS_AtomToValue(ctx, prop);
+    return 0;
+}
+
+/* use for strict variable access: test if the variable exists */
+static int JS_CheckGlobalVar(JSContext *ctx, JSAtom prop)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    int ret;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property1(p, prop);
+    if (prs) {
+        ret = TRUE;
+    } else {
+        ret = JS_HasProperty(ctx, ctx->global_obj, prop);
+        if (ret < 0)
+            return -1;
+    }
+    return ret;
+}
+
+/* flag = 0: normal variable write
+   flag = 1: initialize lexical variable
+   flag = 2: normal variable write, strict check was done before
+*/
+static int JS_SetGlobalVar(JSContext *ctx, JSAtom prop, JSValue val,
+                           int flag)
+{
+    JSObject *p;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    int flags;
+
+    /* no exotic behavior is possible in global_var_obj */
+    p = JS_VALUE_GET_OBJ(ctx->global_var_obj);
+    prs = find_own_property(&pr, p, prop);
+    if (prs) {
+        /* XXX: should handle JS_PROP_AUTOINIT properties? */
+        if (flag != 1) {
+            if (unlikely(JS_IsUninitialized(pr->u.value))) {
+                JS_FreeValue(ctx, val);
+                JS_ThrowReferenceErrorUninitialized(ctx, prs->atom);
+                return -1;
+            }
+            if (unlikely(!(prs->flags & JS_PROP_WRITABLE))) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, prop);
+            }
+        }
+        set_value(ctx, &pr->u.value, val);
+        return 0;
+    }
+
+    flags = JS_PROP_THROW_STRICT;
+    if (flag != 2 && is_strict_mode(ctx))
+        flags |= JS_PROP_NO_ADD;
+    return JS_SetPropertyInternal(ctx, ctx->global_obj, prop, val, flags);
+}
+
+/* return -1, FALSE or TRUE. return FALSE if not configurable or
+   invalid object. return -1 in case of exception.
+   flags can be 0, JS_PROP_THROW or JS_PROP_THROW_STRICT */
+int JS_DeleteProperty(JSContext *ctx, JSValueConst obj, JSAtom prop, int flags)
+{
+    JSValue obj1;
+    JSObject *p;
+    int res;
+
+    obj1 = JS_ToObject(ctx, obj);
+    if (JS_IsException(obj1))
+        return -1;
+    p = JS_VALUE_GET_OBJ(obj1);
+    res = delete_property(ctx, p, prop);
+    JS_FreeValue(ctx, obj1);
+    if (res != FALSE)
+        return res;
+    if ((flags & JS_PROP_THROW) ||
+        ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+        JS_ThrowTypeError(ctx, "could not delete property");
+        return -1;
+    }
+    return FALSE;
+}
+
+int JS_DeletePropertyInt64(JSContext *ctx, JSValueConst obj, int64_t idx, int flags)
+{
+    JSAtom prop;
+    int res;
+
+    if ((uint64_t)idx <= JS_ATOM_MAX_INT) {
+        /* fast path for fast arrays */
+        return JS_DeleteProperty(ctx, obj, __JS_AtomFromUInt32(idx), flags);
+    }
+    prop = JS_NewAtomInt64(ctx, idx);
+    if (prop == JS_ATOM_NULL)
+        return -1;
+    res = JS_DeleteProperty(ctx, obj, prop, flags);
+    JS_FreeAtom(ctx, prop);
+    return res;
+}
+
+BOOL JS_IsFunction(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    switch(p->class_id) {
+    case JS_CLASS_BYTECODE_FUNCTION:
+        return TRUE;
+    case JS_CLASS_PROXY:
+        return p->u.proxy_data->is_func;
+    default:
+        return (ctx->rt->class_array[p->class_id].call != NULL);
+    }
+}
+
+BOOL JS_IsCFunction(JSContext *ctx, JSValueConst val, JSCFunction *func, int magic)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    if (p->class_id == JS_CLASS_C_FUNCTION)
+        return (p->u.cfunc.c_function.generic == func && p->u.cfunc.magic == magic);
+    else
+        return FALSE;
+}
+
+BOOL JS_IsConstructor(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return p->is_constructor;
+}
+
+BOOL JS_SetConstructorBit(JSContext *ctx, JSValueConst func_obj, BOOL val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->is_constructor = val;
+    return TRUE;
+}
+
+BOOL JS_IsError(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return (p->class_id == JS_CLASS_ERROR);
+}
+
+/* used to avoid catching interrupt exceptions */
+BOOL JS_IsUncatchableError(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return FALSE;
+    p = JS_VALUE_GET_OBJ(val);
+    return p->class_id == JS_CLASS_ERROR && p->is_uncatchable_error;
+}
+
+void JS_SetUncatchableError(JSContext *ctx, JSValueConst val, BOOL flag)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return;
+    p = JS_VALUE_GET_OBJ(val);
+    if (p->class_id == JS_CLASS_ERROR)
+        p->is_uncatchable_error = flag;
+}
+
+void JS_ResetUncatchableError(JSContext *ctx)
+{
+    JS_SetUncatchableError(ctx, ctx->current_exception, FALSE);
+}
+
+void JS_SetOpaque(JSValue obj, void *opaque)
+{
+   JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(obj);
+        p->u.opaque = opaque;
+    }
+}
+
+/* return NULL if not an object of class class_id */
+void *JS_GetOpaque(JSValueConst obj, JSClassID class_id)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != class_id)
+        return NULL;
+    return p->u.opaque;
+}
+
+void *JS_GetOpaque2(JSContext *ctx, JSValueConst obj, JSClassID class_id)
+{
+    void *p = JS_GetOpaque(obj, class_id);
+    if (unlikely(!p)) {
+        JS_ThrowTypeErrorInvalidClass(ctx, class_id);
+    }
+    return p;
+}
+
+void *JS_GetOpaque_Nocheck(JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(obj);
+    return p->u.opaque;
+}
+
+#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)
+
+static JSValue JS_ToPrimitiveFree(JSContext *ctx, JSValue val, int hint)
+{
+    int i;
+    BOOL force_ordinary;
+
+    JSAtom method_name;
+    JSValue method, ret;
+    if (JS_VALUE_GET_TAG(val) != JS_TAG_OBJECT)
+        return val;
+    force_ordinary = hint & HINT_FORCE_ORDINARY;
+    hint &= ~HINT_FORCE_ORDINARY;
+    if (!force_ordinary) {
+        method = JS_GetProperty(ctx, val, JS_ATOM_Symbol_toPrimitive);
+        if (JS_IsException(method))
+            goto exception;
+        /* ECMA says *If exoticToPrim is not undefined* but tests in
+           test262 use null as a non callable converter */
+        if (!JS_IsUndefined(method) && !JS_IsNull(method)) {
+            JSAtom atom;
+            JSValue arg;
+            switch(hint) {
+            case HINT_STRING:
+                atom = JS_ATOM_string;
+                break;
+            case HINT_NUMBER:
+                atom = JS_ATOM_number;
+                break;
+            default:
+            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);
+            JS_FreeValue(ctx, arg);
+            if (JS_IsException(ret))
+                goto exception;
+            JS_FreeValue(ctx, val);
+            if (JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT)
+                return ret;
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "toPrimitive");
+        }
+    }
+    if (hint != HINT_STRING)
+        hint = HINT_NUMBER;
+    for(i = 0; i < 2; i++) {
+        if ((i ^ hint) == 0) {
+            method_name = JS_ATOM_toString;
+        } else {
+            method_name = JS_ATOM_valueOf;
+        }
+        method = JS_GetProperty(ctx, val, method_name);
+        if (JS_IsException(method))
+            goto exception;
+        if (JS_IsFunction(ctx, method)) {
+            ret = JS_CallFree(ctx, method, val, 0, NULL);
+            if (JS_IsException(ret))
+                goto exception;
+            if (JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+                JS_FreeValue(ctx, val);
+                return ret;
+            }
+            JS_FreeValue(ctx, ret);
+        } else {
+            JS_FreeValue(ctx, method);
+        }
+    }
+    JS_ThrowTypeError(ctx, "toPrimitive");
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_ToPrimitive(JSContext *ctx, JSValueConst val, int hint)
+{
+    return JS_ToPrimitiveFree(ctx, JS_DupValue(ctx, val), hint);
+}
+
+static int JS_ToBoolFree(JSContext *ctx, JSValue val)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        return JS_VALUE_GET_INT(val) != 0;
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        return JS_VALUE_GET_INT(val);
+    case JS_TAG_EXCEPTION:
+        return -1;
+    case JS_TAG_STRING:
+        {
+            BOOL ret = JS_VALUE_GET_STRING(val)->len != 0;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            BOOL ret;
+            ret = p->num.expn != BF_EXP_ZERO && p->num.expn != BF_EXP_NAN;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            BOOL ret;
+            ret = p->num.expn != BF_EXP_ZERO && p->num.expn != BF_EXP_NAN;
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+#endif
+    default:
+        if (JS_TAG_IS_FLOAT64(tag)) {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            return !isnan(d) && d != 0;
+        } else {
+            JS_FreeValue(ctx, val);
+            return TRUE;
+        }
+    }
+}
+
+int JS_ToBool(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToBoolFree(ctx, JS_DupValue(ctx, val));
+}
+
+static int skip_spaces(const char *pc)
+{
+    const uint8_t *p, *p_next, *p_start;
+    uint32_t c;
+
+    p = p_start = (const uint8_t *)pc;
+    for (;;) {
+        c = *p;
+        if (c < 128) {
+            if (!((c >= 0x09 && c <= 0x0d) || (c == 0x20)))
+                break;
+            p++;
+        } else {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+            if (!lre_is_space(c))
+                break;
+            p = p_next;
+        }
+    }
+    return p - p_start;
+}
+
+static inline int to_digit(int c)
+{
+    if (c >= '0' && c <= '9')
+        return c - '0';
+    else if (c >= 'A' && c <= 'Z')
+        return c - 'A' + 10;
+    else if (c >= 'a' && c <= 'z')
+        return c - 'a' + 10;
+    else
+        return 36;
+}
+
+/* XXX: remove */
+static double js_strtod(const char *p, int radix, BOOL is_float)
+{
+    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;
+            p++;
+        }
+
+        /* skip leading zeros */
+        while (*p == '0')
+            p++;
+        n = 0;
+        if (radix == 10)
+            n_max = ((uint64_t)-1 - 9) / 10; /* most common case */
+        else
+            n_max = ((uint64_t)-1 - (radix - 1)) / radix;
+        /* XXX: could be more precise */
+        int_exp = 0;
+        while (*p != '\0') {
+            c = to_digit((uint8_t)*p);
+            if (c >= radix)
+                break;
+            if (n <= n_max) {
+                n = n * radix + c;
+            } else {
+                int_exp++;
+            }
+            p++;
+        }
+        d = n;
+        if (int_exp != 0) {
+            d *= pow(radix, int_exp);
+        }
+        if (is_neg)
+            d = -d;
+    } else {
+        d = strtod(p, NULL);
+    }
+    return d;
+}
+
+#define ATOD_INT_ONLY        (1 << 0)
+/* accept Oo and Ob prefixes in addition to 0x prefix if radix = 0 */
+#define ATOD_ACCEPT_BIN_OCT  (1 << 2)
+/* accept O prefix as octal if radix == 0 and properly formed (Annex B) */
+#define ATOD_ACCEPT_LEGACY_OCTAL  (1 << 4)
+/* 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)
+/* default type */
+#define ATOD_TYPE_MASK        (3 << 7)
+#define ATOD_TYPE_FLOAT64     (0 << 7)
+#define ATOD_TYPE_BIG_INT     (1 << 7)
+#define ATOD_TYPE_BIG_FLOAT   (2 << 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)
+/* accept -0x1 */
+#define ATOD_ACCEPT_PREFIX_AFTER_SIGN (1 << 10)
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_string_to_bigint(JSContext *ctx, const char *buf,
+                                   int radix, int flags, slimb_t *pexponent)
+{
+    bf_t a_s, *a = &a_s;
+    int ret;
+    bf_init(ctx->bf_ctx, a);
+    ret = bf_atof(a, buf, NULL, radix, BF_PREC_INF, BF_RNDZ);
+    if (ret & BF_ST_MEM_ERROR) {
+        bf_delete(a);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return JS_NewBigInt2(ctx, a, !(flags & ATOD_MODE_BIGINT));
+}
+
+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;
+    int ret;
+
+    bf_init(ctx->bf_ctx, a);
+    if (flags & ATOD_ACCEPT_SUFFIX) {
+        /* return the exponent to get infinite precision */
+        ret = bf_atof2(a, pexponent, buf, NULL, radix, BF_PREC_INF,
+                       BF_RNDZ | BF_ATOF_EXPONENT);
+    } else {
+        ret = bf_atof(a, buf, NULL, radix, ctx->fp_env.prec,
+                      ctx->fp_env.flags);
+    }
+    if (ret & BF_ST_MEM_ERROR) {
+        bf_delete(a);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return JS_NewBigFloat(ctx, a);
+}
+
+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;
+    int ret;
+    bfdec_init(ctx->bf_ctx, a);
+    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);
+        return JS_ThrowOutOfMemory(ctx);
+    }
+    return JS_NewBigDecimal(ctx, a);
+}
+
+#endif
+
+/* return an exception in case of memory error. Return JS_NAN if
+   invalid syntax */
+#ifdef CONFIG_BIGNUM
+static JSValue js_atof2(JSContext *ctx, const char *str, const char **pp,
+                        int radix, int flags, slimb_t *pexponent)
+#else
+static JSValue js_atof(JSContext *ctx, const char *str, const char **pp,
+                       int radix, int flags)
+#endif
+{
+    const char *p, *p_start;
+    int sep, is_neg;
+    BOOL is_float, has_legacy_octal;
+    int atod_type = flags & ATOD_TYPE_MASK;
+    char buf1[64], *buf;
+    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;
+    if (p[0] == '+') {
+        p++;
+        p_start++;
+        if (!(flags & ATOD_ACCEPT_PREFIX_AFTER_SIGN))
+            goto no_radix_prefix;
+    } else if (p[0] == '-') {
+        p++;
+        p_start++;
+        is_neg = 1;
+        if (!(flags & ATOD_ACCEPT_PREFIX_AFTER_SIGN))
+            goto no_radix_prefix;
+    }
+    if (p[0] == '0') {
+        if ((p[1] == 'x' || p[1] == 'X') &&
+            (radix == 0 || radix == 16)) {
+            p += 2;
+            radix = 16;
+        } else if ((p[1] == 'o' || p[1] == 'O') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_BIN_OCT)) {
+            p += 2;
+            radix = 8;
+        } else if ((p[1] == 'b' || p[1] == 'B') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_BIN_OCT)) {
+            p += 2;
+            radix = 2;
+        } else if ((p[1] >= '0' && p[1] <= '9') &&
+                   radix == 0 && (flags & ATOD_ACCEPT_LEGACY_OCTAL)) {
+            int i;
+            has_legacy_octal = TRUE;
+            sep = 256;
+            for (i = 1; (p[i] >= '0' && p[i] <= '7'); i++)
+                continue;
+            if (p[i] == '8' || p[i] == '9')
+                goto no_prefix;
+            p += 1;
+            radix = 8;
+        } else {
+            goto no_prefix;
+        }
+        /* there must be a digit after the prefix */
+        if (to_digit((uint8_t)*p) >= radix)
+            goto fail;
+    no_prefix: ;
+    } else {
+ no_radix_prefix:
+        if (!(flags & ATOD_INT_ONLY) &&
+            (atod_type == ATOD_TYPE_FLOAT64 ||
+             atod_type == ATOD_TYPE_BIG_FLOAT) &&
+            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_set_inf(a, is_neg);
+                val = JS_NewBigFloat(ctx, a);
+            } else
+#endif
+            {
+#if defined(_MSC_VER)
+				double const zero = 0.0;
+				double d = 1.0 / zero;
+#else
+				double d = 1.0 / 0.0;
+#endif
+                if (is_neg)
+                    d = -d;
+                val = JS_NewFloat64(ctx, d);
+            }
+            goto done;
+        }
+    }
+    if (radix == 0)
+        radix = 10;
+    is_float = FALSE;
+    p_start = p;
+    while (to_digit((uint8_t)*p) < radix
+           ||  (*p == sep && (radix != 10 ||
+                              p != p_start + 1 || p[-1] != '0') &&
+                to_digit((uint8_t)p[1]) < radix)) {
+        p++;
+    }
+    if (!(flags & ATOD_INT_ONLY)) {
+        if (*p == '.' && (p > p_start || to_digit((uint8_t)p[1]) < radix)) {
+            is_float = TRUE;
+            p++;
+            while (to_digit((uint8_t)*p) < radix ||
+                   (*p == sep && to_digit((uint8_t)p[1]) < radix))
+                p++;
+        }
+        if (p > p_start &&
+            (((*p == 'e' || *p == 'E') && radix == 10) ||
+             ((*p == 'p' || *p == 'P') && (radix == 2 || radix == 8 || radix == 16)))) {
+            const char *p1 = p + 1;
+            is_float = TRUE;
+            if (*p1 == '+') {
+                p1++;
+            } else if (*p1 == '-') {
+                p1++;
+            }
+            if (is_digit((uint8_t)*p1)) {
+                p = p1 + 1;
+                while (is_digit((uint8_t)*p) || (*p == sep && is_digit((uint8_t)p[1])))
+                    p++;
+            }
+        }
+    }
+    if (p == p_start)
+        goto fail;
+
+    buf = buf1;
+    buf_allocated = FALSE;
+    len = p - p_start;
+    if (unlikely((len + 2) > sizeof(buf1))) {
+        buf = js_malloc_rt(ctx->rt, len + 2); /* no exception raised */
+        if (!buf)
+            goto mem_error;
+        buf_allocated = TRUE;
+    }
+    /* remove the separators and the radix prefixes */
+    j = 0;
+    if (is_neg)
+        buf[j++] = '-';
+    for (i = 0; i < len; i++) {
+        if (p_start[i] != '_')
+            buf[j++] = p_start[i];
+    }
+    buf[j] = '\0';
+
+#ifdef CONFIG_BIGNUM
+    if (flags & ATOD_ACCEPT_SUFFIX) {
+        if (*p == 'n') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_INT;
+        } else if (*p == 'l') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_FLOAT;
+        } else if (*p == 'd') {
+            p++;
+            atod_type = ATOD_TYPE_BIG_DECIMAL;
+        } else {
+            if (flags & ATOD_MODE_BIGINT) {
+                if (!is_float)
+                    atod_type = ATOD_TYPE_BIG_INT;
+                if (has_legacy_octal)
+                    goto fail;
+            } else {
+                if (is_float && radix != 10)
+                    goto fail;
+            }
+        }
+    } else {
+        if (atod_type == ATOD_TYPE_FLOAT64) {
+            if (flags & ATOD_MODE_BIGINT) {
+                if (!is_float)
+                    atod_type = ATOD_TYPE_BIG_INT;
+                if (has_legacy_octal)
+                    goto fail;
+            } else {
+                if (is_float && radix != 10)
+                    goto fail;
+            }
+        }
+    }
+
+    switch(atod_type) {
+    case ATOD_TYPE_FLOAT64:
+        {
+            double d;
+            d = js_strtod(buf, radix, is_float);
+            /* return int or float64 */
+            val = JS_NewFloat64(ctx, d);
+        }
+        break;
+    case ATOD_TYPE_BIG_INT:
+        if (has_legacy_octal || is_float)
+            goto fail;
+        val = ctx->rt->bigint_ops.from_string(ctx, buf, radix, flags, NULL);
+        break;
+    case ATOD_TYPE_BIG_FLOAT:
+        if (has_legacy_octal)
+            goto fail;
+        val = ctx->rt->bigfloat_ops.from_string(ctx, buf, radix, flags,
+                                                pexponent);
+        break;
+    case ATOD_TYPE_BIG_DECIMAL:
+        if (radix != 10)
+            goto fail;
+        val = ctx->rt->bigdecimal_ops.from_string(ctx, buf, radix, flags, NULL);
+        break;
+    default:
+        abort();
+    }
+#else
+    {
+        double d;
+        (void)has_legacy_octal;
+        if (is_float && radix != 10)
+            goto fail;
+        d = js_strtod(buf, radix, is_float);
+        val = JS_NewFloat64(ctx, d);
+    }
+#endif
+
+done:
+    if (buf_allocated)
+        js_free_rt(ctx->rt, buf);
+    if (pp)
+        *pp = p;
+    return val;
+ fail:
+    val = JS_NAN;
+    goto done;
+ mem_error:
+    val = JS_ThrowOutOfMemory(ctx);
+    goto done;
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_atof(JSContext *ctx, const char *str, const char **pp,
+                       int radix, int flags)
+{
+    return js_atof2(ctx, str, pp, radix, flags, NULL);
+}
+#endif
+
+typedef enum JSToNumberHintEnum {
+    TON_FLAG_NUMBER,
+    TON_FLAG_INTEGER,
+    TON_FLAG_NUMERIC,
+} JSToNumberHintEnum;
+
+static JSValue JS_ToNumberHintFree(JSContext *ctx, JSValue val,
+                                   JSToNumberHintEnum flag)
+{
+    uint32_t tag;
+    JSValue ret;
+    int hint;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_DECIMAL:
+        if (flag != TON_FLAG_NUMERIC) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert bigdecimal to number");
+        }
+        ret = val;
+        break;
+    case JS_TAG_BIG_INT:
+        if (flag == TON_FLAG_NUMBER && !is_bigint_mode(ctx)) {
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert bigint to number");
+        }
+        /* fall thru */
+    case JS_TAG_BIG_FLOAT:
+#endif
+    case JS_TAG_FLOAT64:
+    case JS_TAG_INT:
+    case JS_TAG_EXCEPTION:
+        ret = val;
+        break;
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        ret = JS_NewInt32(ctx, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_UNDEFINED:
+        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);
+        if (JS_IsException(val))
+            return JS_EXCEPTION;
+        goto redo;
+    case JS_TAG_STRING:
+        {
+            const char *str;
+            const char *p;
+            size_t len;
+
+            str = JS_ToCStringLen(ctx, &len, val);
+            JS_FreeValue(ctx, val);
+            if (!str)
+                return JS_EXCEPTION;
+            p = str;
+            p += skip_spaces(p);
+            if ((p - str) == len) {
+                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);
+                    if ((p - str) != len) {
+                        JS_FreeValue(ctx, ret);
+                        ret = JS_NAN;
+                    }
+                }
+            }
+            JS_FreeCString(ctx, str);
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert symbol to number");
+    default:
+        JS_FreeValue(ctx, val);
+        ret = JS_NAN;
+        break;
+    }
+    return ret;
+}
+
+static JSValue JS_ToNumberFree(JSContext *ctx, JSValue val)
+{
+    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);
+}
+
+static JSValue JS_ToNumeric(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToNumericFree(ctx, JS_DupValue(ctx, val));
+}
+#endif
+
+static __exception int __JS_ToFloat64Free(JSContext *ctx, double *pres,
+                                          JSValue val)
+{
+    double d;
+    uint32_t tag;
+
+    val = JS_ToNumberFree(ctx, val);
+    if (JS_IsException(val)) {
+        *pres = JS_FLOAT64_NAN;
+        return -1;
+    }
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        d = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        d = JS_VALUE_GET_FLOAT64(val);
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            /* XXX: there can be a double rounding issue with some
+               primitives (such as JS_ToUint8ClampFree()), but it is
+               not critical to fix it. */
+            bf_get_float64(&p->num, &d, BF_RNDN);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+        abort();
+    }
+    *pres = d;
+    return 0;
+}
+
+static inline int JS_ToFloat64Free(JSContext *ctx, double *pres, JSValue val)
+{
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_TAG(val);
+    if (tag <= JS_TAG_NULL) {
+        *pres = JS_VALUE_GET_INT(val);
+        return 0;
+    } else if (JS_TAG_IS_FLOAT64(tag)) {
+        *pres = JS_VALUE_GET_FLOAT64(val);
+        return 0;
+    } else {
+        return __JS_ToFloat64Free(ctx, pres, val);
+    }
+}
+
+int JS_ToFloat64(JSContext *ctx, double *pres, JSValueConst val)
+{
+    return JS_ToFloat64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static JSValue JS_ToNumber(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToNumberFree(ctx, JS_DupValue(ctx, val));
+}
+
+static __maybe_unused JSValue JS_ToIntegerFree(JSContext *ctx, JSValue val)
+{
+    uint32_t tag;
+    JSValue ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_NewInt32(ctx, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                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;
+            BOOL is_nan;
+
+            a = JS_ToBigFloat(ctx, &a_s, val);
+            if (!bf_is_finite(a)) {
+                is_nan = bf_is_nan(a);
+                if (is_nan)
+                    ret = JS_NewInt32(ctx, 0);
+                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);
+            }
+            if (a == &a_s)
+                bf_delete(a);
+            JS_FreeValue(ctx, val);
+        }
+        break;
+#endif
+    default:
+#ifdef CONFIG_BIGNUM
+    to_number:
+#endif
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val))
+            return val;
+        goto redo;
+    }
+    return ret;
+}
+
+/* Note: the integer value is satured to 32 bits */
+static int JS_ToInt32SatFree(JSContext *ctx, int *pres, JSValue val)
+{
+    uint32_t tag;
+    int ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_EXCEPTION:
+        *pres = 0;
+        return -1;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                ret = 0;
+            } else {
+                if (d < INT32_MIN)
+                    ret = INT32_MIN;
+                else if (d > INT32_MAX)
+                    ret = INT32_MAX;
+                else
+                    ret = (int)d;
+            }
+        }
+        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);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt32Sat(JSContext *ctx, int *pres, JSValueConst val)
+{
+    return JS_ToInt32SatFree(ctx, pres, JS_DupValue(ctx, val));
+}
+
+int JS_ToInt32Clamp(JSContext *ctx, int *pres, JSValueConst val,
+                    int min, int max, int min_offset)
+{
+    int res = JS_ToInt32SatFree(ctx, pres, JS_DupValue(ctx, val));
+    if (res == 0) {
+        if (*pres < min) {
+            *pres += min_offset;
+            if (*pres < min)
+                *pres = min;
+        } else {
+            if (*pres > max)
+                *pres = max;
+        }
+    }
+    return res;
+}
+
+static int JS_ToInt64SatFree(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    uint32_t tag;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        *pres = JS_VALUE_GET_INT(val);
+        return 0;
+    case JS_TAG_EXCEPTION:
+        *pres = 0;
+        return -1;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                *pres = 0;
+            } else {
+                if (d < INT64_MIN)
+                    *pres = INT64_MIN;
+                else if (d > INT64_MAX)
+                    *pres = INT64_MAX;
+                else
+                    *pres = (int64_t)d;
+            }
+        }
+        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);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+}
+
+int JS_ToInt64Sat(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToInt64SatFree(ctx, pres, JS_DupValue(ctx, val));
+}
+
+int JS_ToInt64Clamp(JSContext *ctx, int64_t *pres, JSValueConst val,
+                    int64_t min, int64_t max, int64_t neg_offset)
+{
+    int res = JS_ToInt64SatFree(ctx, pres, JS_DupValue(ctx, val));
+    if (res == 0) {
+        if (*pres < 0)
+            *pres += neg_offset;
+        if (*pres < min)
+            *pres = min;
+        else if (*pres > max)
+            *pres = max;
+    }
+    return res;
+}
+
+/* Same as JS_ToInt32Free() but with a 64 bit result. Return (<0, 0)
+   in case of exception */
+static int JS_ToInt64Free(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int64_t ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            double d;
+            int e;
+            d = JS_VALUE_GET_FLOAT64(val);
+            u.d = d;
+            /* we avoid doing fmod(x, 2^64) */
+            e = (u.u64 >> 52) & 0x7ff;
+            if (likely(e <= (1023 + 62))) {
+                /* fast case */
+                ret = (int64_t)d;
+            } else if (e <= (1023 + 62 + 53)) {
+                uint64_t v;
+                /* remainder modulo 2^64 */
+                v = (u.u64 & (((uint64_t)1 << 52) - 1)) | ((uint64_t)1 << 52);
+                ret = v << ((e - 1023) - 52);
+                /* take the sign into account */
+                if (u.u64 >> 63)
+                    ret = -ret;
+            } else {
+                ret = 0; /* also handles NaN and +inf */
+            }
+        }
+        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);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToInt64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+/* return (<0, 0) in case of exception */
+static int JS_ToInt32Free(JSContext *ctx, int32_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int32_t ret;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        ret = JS_VALUE_GET_INT(val);
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            double d;
+            int e;
+            d = JS_VALUE_GET_FLOAT64(val);
+            u.d = d;
+            /* we avoid doing fmod(x, 2^32) */
+            e = (u.u64 >> 52) & 0x7ff;
+            if (likely(e <= (1023 + 30))) {
+                /* fast case */
+                ret = (int32_t)d;
+            } else if (e <= (1023 + 30 + 53)) {
+                uint64_t v;
+                /* remainder modulo 2^32 */
+                v = (u.u64 & (((uint64_t)1 << 52) - 1)) | ((uint64_t)1 << 52);
+                v = v << ((e - 1023) - 52 + 32);
+                ret = v >> 32;
+                /* take the sign into account */
+                if (u.u64 >> 63)
+                    ret = -ret;
+            } else {
+                ret = 0; /* also handles NaN and +inf */
+            }
+        }
+        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);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = ret;
+    return 0;
+}
+
+int JS_ToInt32(JSContext *ctx, int32_t *pres, JSValueConst val)
+{
+    return JS_ToInt32Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static inline int JS_ToUint32Free(JSContext *ctx, uint32_t *pres, JSValue val)
+{
+    return JS_ToInt32Free(ctx, (int32_t *)pres, val);
+}
+
+static int JS_ToUint8ClampFree(JSContext *ctx, int32_t *pres, JSValue val)
+{
+    uint32_t tag;
+    int res;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        res = JS_VALUE_GET_INT(val);
+#ifdef CONFIG_BIGNUM
+    int_clamp:
+#endif
+        res = max_int(0, min_int(255, res));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (isnan(d)) {
+                res = 0;
+            } else {
+                if (d < 0)
+                    res = 0;
+                else if (d > 255)
+                    res = 255;
+                else
+                    res = lrint(d);
+            }
+        }
+        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);
+            bf_t r_s, *r = &r_s;
+            bf_init(ctx->bf_ctx, r);
+            bf_set(r, &p->num);
+            bf_rint(r, BF_RNDN);
+            bf_get_int32(&res, r, 0);
+            bf_delete(r);
+            JS_FreeValue(ctx, val);
+        }
+        goto int_clamp;
+#endif
+    default:
+#ifdef CONFIG_BIGNUM
+    to_number:
+#endif
+        val = JS_ToNumberFree(ctx, val);
+        if (JS_IsException(val)) {
+            *pres = 0;
+            return -1;
+        }
+        goto redo;
+    }
+    *pres = res;
+    return 0;
+}
+
+static __exception int JS_ToArrayLengthFree(JSContext *ctx, uint32_t *plen,
+                                            JSValue val)
+{
+    uint32_t tag, len;
+
+ redo:
+    tag = JS_VALUE_GET_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        {
+            int v;
+            v = JS_VALUE_GET_INT(val);
+            if (v < 0)
+                goto fail;
+            len = v;
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            bf_t a;
+            BOOL res;
+            bf_get_int32((int32_t *)&len, &p->num, BF_GET_INT_MOD);
+            bf_init(ctx->bf_ctx, &a);
+            bf_set_ui(&a, len);
+            res = bf_cmp_eq(&a, &p->num);
+            bf_delete(&a);
+            JS_FreeValue(ctx, val);
+            if (!res)
+                goto fail;
+        }
+        break;
+#endif
+    default:
+        if (JS_TAG_IS_FLOAT64(tag)) {
+            double d;
+            d = JS_VALUE_GET_FLOAT64(val);
+            len = (uint32_t)d;
+            if (len != d) {
+            fail:
+                JS_ThrowRangeError(ctx, "invalid array length");
+                return -1;
+            }
+        } else {
+            val = JS_ToNumberFree(ctx, val);
+            if (JS_IsException(val))
+                return -1;
+            goto redo;
+        }
+        break;
+    }
+    *plen = len;
+    return 0;
+}
+
+#define MAX_SAFE_INTEGER (((int64_t)1 << 53) - 1)
+
+int JS_ToIndex(JSContext *ctx, uint64_t *plen, JSValueConst val)
+{
+    int64_t v;
+    if (JS_ToInt64Sat(ctx, &v, val))
+        return -1;
+    if (v < 0 || v > MAX_SAFE_INTEGER) {
+        JS_ThrowRangeError(ctx, "invalid array index");
+        *plen = 0;
+        return -1;
+    }
+    *plen = v;
+    return 0;
+}
+
+/* convert a value to a length between 0 and MAX_SAFE_INTEGER.
+   return -1 for exception */
+static __exception int JS_ToLengthFree(JSContext *ctx, int64_t *plen,
+                                       JSValue val)
+{
+    int res = JS_ToInt64Clamp(ctx, plen, val, 0, MAX_SAFE_INTEGER, 0);
+    JS_FreeValue(ctx, val);
+    return res;
+}
+
+/* Note: can return an exception */
+/* XXX: bignum case */
+static int JS_NumberIsInteger(JSContext *ctx, JSValueConst val)
+{
+    double d;
+    if (!JS_IsNumber(val))
+        return FALSE;
+    if (unlikely(JS_ToFloat64(ctx, &d, val)))
+        return -1;
+    return isfinite(d) && floor(d) == d;
+}
+
+static BOOL JS_NumberIsNegativeOrMinusZero(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+        {
+            int v;
+            v = JS_VALUE_GET_INT(val);
+            return (v < 0);
+        }
+    case JS_TAG_FLOAT64:
+        {
+            JSFloat64Union u;
+            u.d = JS_VALUE_GET_FLOAT64(val);
+            return (u.u64 >> 63);
+        }
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            /* Note: integer zeros are not necessarily positive */
+            return p->num.sign && !bf_is_zero(&p->num);
+        }
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            return p->num.sign;
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            return p->num.sign;
+        }
+        break;
+#endif
+    default:
+        return FALSE;
+    }
+}
+
+#ifdef CONFIG_BIGNUM
+
+static JSValue js_bigint_to_string1(JSContext *ctx, JSValueConst val, int radix)
+{
+    JSValue ret;
+    bf_t a_s, *a;
+    char *str;
+    int saved_sign;
+
+    a = JS_ToBigInt(ctx, &a_s, val);
+    if (!a)
+        return JS_EXCEPTION;
+    saved_sign = a->sign;
+    if (a->expn == BF_EXP_ZERO)
+        a->sign = 0;
+    str = bf_ftoa(NULL, a, radix, 0, BF_RNDZ | BF_FTOA_FORMAT_FRAC |
+                  BF_FTOA_JS_QUIRKS);
+    a->sign = saved_sign;
+    JS_FreeBigInt(ctx, a, &a_s);
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+static JSValue js_bigint_to_string(JSContext *ctx, JSValueConst val)
+{
+    return js_bigint_to_string1(ctx, val, 10);
+}
+
+static JSValue js_ftoa(JSContext *ctx, JSValueConst val1, int radix,
+                       limb_t prec, bf_flags_t flags)
+{
+    JSValue val, ret;
+    bf_t a_s, *a;
+    char *str;
+    int saved_sign;
+
+    val = JS_ToNumeric(ctx, val1);
+    if (JS_IsException(val))
+        return val;
+    a = JS_ToBigFloat(ctx, &a_s, val);
+    saved_sign = a->sign;
+    if (a->expn == BF_EXP_ZERO)
+        a->sign = 0;
+    flags |= BF_FTOA_JS_QUIRKS;
+    if ((flags & BF_FTOA_FORMAT_MASK) == BF_FTOA_FORMAT_FREE_MIN) {
+        /* Note: for floating point numbers with a radix which is not
+           a power of two, the current precision is used to compute
+           the number of digits. */
+        if ((radix & (radix - 1)) != 0) {
+            bf_t r_s, *r = &r_s;
+            int prec, flags1;
+            /* must round first */
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_FLOAT) {
+                prec = ctx->fp_env.prec;
+                flags1 = ctx->fp_env.flags &
+                    (BF_FLAG_SUBNORMAL | (BF_EXP_BITS_MASK << BF_EXP_BITS_SHIFT));
+            } else {
+                prec = 53;
+                flags1 = bf_set_exp_bits(11) | BF_FLAG_SUBNORMAL;
+            }
+            bf_init(ctx->bf_ctx, r);
+            bf_set(r, a);
+            bf_round(r, prec, flags1 | BF_RNDN);
+            str = bf_ftoa(NULL, r, radix, prec, flags1 | flags);
+            bf_delete(r);
+        } else {
+            str = bf_ftoa(NULL, a, radix, BF_PREC_INF, flags);
+        }
+    } else {
+        str = bf_ftoa(NULL, a, radix, prec, flags);
+    }
+    a->sign = saved_sign;
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, val);
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+static JSValue js_bigfloat_to_string(JSContext *ctx, JSValueConst val)
+{
+    return js_ftoa(ctx, val, 10, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
+}
+
+static JSValue js_bigdecimal_to_string(JSContext *ctx, JSValueConst val)
+{
+    JSValue ret;
+    bfdec_t *a;
+    char *str;
+    int saved_sign;
+
+    a = JS_ToBigDecimal(ctx, val);
+    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);
+    a->sign = saved_sign;
+    if (!str)
+        return JS_ThrowOutOfMemory(ctx);
+    ret = JS_NewString(ctx, str);
+    bf_free(ctx->bf_ctx, str);
+    return ret;
+}
+
+#endif /* CONFIG_BIGNUM */
+
+/* 2 <= base <= 36 */
+static char *i64toa(char *buf_end, int64_t n, unsigned int base)
+{
+    char *q = buf_end;
+    int digit, is_neg;
+
+    is_neg = 0;
+    if (n < 0) {
+        is_neg = 1;
+        n = -n;
+    }
+    *--q = '\0';
+    do {
+        digit = (uint64_t)n % base;
+        n = (uint64_t)n / base;
+        if (digit < 10)
+            digit += '0';
+        else
+            digit += 'a' - 10;
+        *--q = digit;
+    } while (n != 0);
+    if (is_neg)
+        *--q = '-';
+    return q;
+}
+
+/* buf1 contains the printf result */
+static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
+                     int rounding_mode, char *buf1, int buf1_size)
+{
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(rounding_mode);
+    snprintf(buf1, buf1_size, "%+.*e", n_digits - 1, d);
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(FE_TONEAREST);
+    *sign = (buf1[0] == '-');
+    /* mantissa */
+    buf[0] = buf1[1];
+    if (n_digits > 1)
+        memcpy(buf + 1, buf1 + 3, n_digits - 1);
+    buf[n_digits] = '\0';
+    /* exponent */
+    *decpt = atoi(buf1 + n_digits + 2 + (n_digits > 1)) + 1;
+}
+
+/* maximum buffer size for js_dtoa */
+#define JS_DTOA_BUF_SIZE 128
+
+/* needed because ecvt usually limits the number of digits to
+   17. Return the number of digits. */
+static int js_ecvt(double d, int n_digits, int *decpt, int *sign, char *buf,
+                   BOOL is_fixed)
+{
+    int rounding_mode;
+    char buf_tmp[JS_DTOA_BUF_SIZE];
+
+    if (!is_fixed) {
+        unsigned int n_digits_min, n_digits_max;
+        /* find the minimum amount of digits (XXX: inefficient but simple) */
+        n_digits_min = 1;
+        n_digits_max = 17;
+        while (n_digits_min < n_digits_max) {
+            n_digits = (n_digits_min + n_digits_max) / 2;
+            js_ecvt1(d, n_digits, decpt, sign, buf, FE_TONEAREST,
+                     buf_tmp, sizeof(buf_tmp));
+            if (strtod(buf_tmp, NULL) == d) {
+                /* no need to keep the trailing zeros */
+                while (n_digits >= 2 && buf[n_digits - 1] == '0')
+                    n_digits--;
+                n_digits_max = n_digits;
+            } else {
+                n_digits_min = n_digits + 1;
+            }
+        }
+        n_digits = n_digits_max;
+        rounding_mode = FE_TONEAREST;
+    } else {
+        rounding_mode = FE_TONEAREST;
+#ifdef CONFIG_PRINTF_RNDN
+        {
+            char buf1[JS_DTOA_BUF_SIZE], buf2[JS_DTOA_BUF_SIZE];
+            int decpt1, sign1, decpt2, sign2;
+            /* The JS rounding is specified as round to nearest ties away
+               from zero (RNDNA), but in printf the "ties" case is not
+               specified (for example it is RNDN for glibc, RNDNA for
+               Windows), so we must round manually. */
+            js_ecvt1(d, n_digits + 1, &decpt1, &sign1, buf1, FE_TONEAREST,
+                     buf_tmp, sizeof(buf_tmp));
+            /* XXX: could use 2 digits to reduce the average running time */
+            if (buf1[n_digits] == '5') {
+                js_ecvt1(d, n_digits + 1, &decpt1, &sign1, buf1, FE_DOWNWARD,
+                         buf_tmp, sizeof(buf_tmp));
+                js_ecvt1(d, n_digits + 1, &decpt2, &sign2, buf2, FE_UPWARD,
+                         buf_tmp, sizeof(buf_tmp));
+                if (memcmp(buf1, buf2, n_digits + 1) == 0 && decpt1 == decpt2) {
+                    /* exact result: round away from zero */
+                    if (sign1)
+                        rounding_mode = FE_DOWNWARD;
+                    else
+                        rounding_mode = FE_UPWARD;
+                }
+            }
+        }
+#endif /* CONFIG_PRINTF_RNDN */
+    }
+    js_ecvt1(d, n_digits, decpt, sign, buf, rounding_mode,
+             buf_tmp, sizeof(buf_tmp));
+    return n_digits;
+}
+
+static int js_fcvt1(char *buf, int buf_size, double d, int n_digits,
+                    int rounding_mode)
+{
+    int n;
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(rounding_mode);
+    n = snprintf(buf, buf_size, "%.*f", n_digits, d);
+    if (rounding_mode != FE_TONEAREST)
+        fesetround(FE_TONEAREST);
+    assert(n < buf_size);
+    return n;
+}
+
+static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
+{
+    int rounding_mode;
+    rounding_mode = FE_TONEAREST;
+#ifdef CONFIG_PRINTF_RNDN
+    {
+        int n1, n2;
+        char buf1[JS_DTOA_BUF_SIZE];
+        char buf2[JS_DTOA_BUF_SIZE];
+
+        /* The JS rounding is specified as round to nearest ties away from
+           zero (RNDNA), but in printf the "ties" case is not specified
+           (for example it is RNDN for glibc, RNDNA for Windows), so we
+           must round manually. */
+        n1 = js_fcvt1(buf1, sizeof(buf1), d, n_digits + 1, FE_TONEAREST);
+        rounding_mode = FE_TONEAREST;
+        /* XXX: could use 2 digits to reduce the average running time */
+        if (buf1[n1 - 1] == '5') {
+            n1 = js_fcvt1(buf1, sizeof(buf1), d, n_digits + 1, FE_DOWNWARD);
+            n2 = js_fcvt1(buf2, sizeof(buf2), d, n_digits + 1, FE_UPWARD);
+            if (n1 == n2 && memcmp(buf1, buf2, n1) == 0) {
+                /* exact result: round away from zero */
+                if (buf1[0] == '-')
+                    rounding_mode = FE_DOWNWARD;
+                else
+                    rounding_mode = FE_UPWARD;
+            }
+        }
+    }
+#endif /* CONFIG_PRINTF_RNDN */
+    js_fcvt1(buf, buf_size, d, n_digits, rounding_mode);
+}
+
+/* radix != 10 is only supported with flags = JS_DTOA_VAR_FORMAT */
+/* use as many digits as necessary */
+#define JS_DTOA_VAR_FORMAT   (0 << 0)
+/* use n_digits significant digits (1 <= n_digits <= 101) */
+#define JS_DTOA_FIXED_FORMAT (1 << 0)
+/* force fractional format: [-]dd.dd with n_digits fractional digits */
+#define JS_DTOA_FRAC_FORMAT  (2 << 0)
+/* force exponential notation either in fixed or variable format */
+#define JS_DTOA_FORCE_EXP    (1 << 2)
+
+/* XXX: slow and maybe not fully correct. Use libbf when it is fast enough.
+   XXX: radix != 10 is only supported for small integers
+*/
+static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
+{
+    char *q;
+
+    if (!isfinite(d)) {
+        if (isnan(d)) {
+            strcpy(buf, "NaN");
+        } else {
+            q = buf;
+            if (d < 0)
+                *q++ = '-';
+            strcpy(q, "Infinity");
+        }
+    } else if (flags == JS_DTOA_VAR_FORMAT) {
+        int64_t i64;
+        char buf1[70], *ptr;
+        i64 = (int64_t)d;
+        if (d != i64 || i64 > MAX_SAFE_INTEGER || i64 < -MAX_SAFE_INTEGER)
+            goto generic_conv;
+        /* fast path for integers */
+        ptr = i64toa(buf1 + sizeof(buf1), i64, radix);
+        strcpy(buf, ptr);
+    } else {
+        if (d == 0.0)
+            d = 0.0; /* convert -0 to 0 */
+        if (flags == JS_DTOA_FRAC_FORMAT) {
+            js_fcvt(buf, JS_DTOA_BUF_SIZE, d, n_digits);
+        } else {
+            char buf1[JS_DTOA_BUF_SIZE];
+            int sign, decpt, k, n, i, p, n_max;
+            BOOL is_fixed;
+        generic_conv:
+            is_fixed = ((flags & 3) == JS_DTOA_FIXED_FORMAT);
+            if (is_fixed) {
+                n_max = n_digits;
+            } else {
+                n_max = 21;
+            }
+            /* the number has k digits (k >= 1) */
+            k = js_ecvt(d, n_digits, &decpt, &sign, buf1, is_fixed);
+            n = decpt; /* d=10^(n-k)*(buf1) i.e. d= < x.yyyy 10^(n-1) */
+            q = buf;
+            if (sign)
+                *q++ = '-';
+            if (flags & JS_DTOA_FORCE_EXP)
+                goto force_exp;
+            if (n >= 1 && n <= n_max) {
+                if (k <= n) {
+                    memcpy(q, buf1, k);
+                    q += k;
+                    for(i = 0; i < (n - k); i++)
+                        *q++ = '0';
+                    *q = '\0';
+                } else {
+                    /* k > n */
+                    memcpy(q, buf1, n);
+                    q += n;
+                    *q++ = '.';
+                    for(i = 0; i < (k - n); i++)
+                        *q++ = buf1[n + i];
+                    *q = '\0';
+                }
+            } else if (n >= -5 && n <= 0) {
+                *q++ = '0';
+                *q++ = '.';
+                for(i = 0; i < -n; i++)
+                    *q++ = '0';
+                memcpy(q, buf1, k);
+                q += k;
+                *q = '\0';
+            } else {
+            force_exp:
+                /* exponential notation */
+                *q++ = buf1[0];
+                if (k > 1) {
+                    *q++ = '.';
+                    for(i = 1; i < k; i++)
+                        *q++ = buf1[i];
+                }
+                *q++ = 'e';
+                p = n - 1;
+                if (p >= 0)
+                    *q++ = '+';
+                sprintf(q, "%d", p);
+            }
+        }
+    }
+}
+
+static JSValue js_dtoa(JSContext *ctx,
+                       double d, int radix, int n_digits, int flags)
+{
+    char buf[JS_DTOA_BUF_SIZE];
+    js_dtoa1(buf, d, radix, n_digits, flags);
+    return JS_NewString(ctx, buf);
+}
+
+JSValue JS_ToStringInternal(JSContext *ctx, JSValueConst val, BOOL is_ToPropertyKey)
+{
+    uint32_t tag;
+    const char *str;
+    char buf[32];
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_STRING:
+        return JS_DupValue(ctx, val);
+    case JS_TAG_INT:
+        snprintf(buf, sizeof(buf), "%d", JS_VALUE_GET_INT(val));
+        str = buf;
+        goto new_string;
+    case JS_TAG_BOOL:
+        return JS_AtomToString(ctx, JS_VALUE_GET_BOOL(val) ?
+                          JS_ATOM_true : JS_ATOM_false);
+    case JS_TAG_NULL:
+        return JS_AtomToString(ctx, JS_ATOM_null);
+    case JS_TAG_UNDEFINED:
+        return JS_AtomToString(ctx, JS_ATOM_undefined);
+    case JS_TAG_EXCEPTION:
+        return JS_EXCEPTION;
+    case JS_TAG_OBJECT:
+        {
+            JSValue val1, ret;
+            val1 = JS_ToPrimitive(ctx, val, HINT_STRING);
+            if (JS_IsException(val1))
+                return val1;
+            ret = JS_ToStringInternal(ctx, val1, is_ToPropertyKey);
+            JS_FreeValue(ctx, val1);
+            return ret;
+        }
+        break;
+    case JS_TAG_FUNCTION_BYTECODE:
+        str = "[function bytecode]";
+        goto new_string;
+    case JS_TAG_SYMBOL:
+        if (is_ToPropertyKey) {
+            return JS_DupValue(ctx, val);
+        } else {
+            return JS_ThrowTypeError(ctx, "cannot convert symbol to string");
+        }
+    case JS_TAG_FLOAT64:
+        return js_dtoa(ctx, JS_VALUE_GET_FLOAT64(val), 10, 0,
+                       JS_DTOA_VAR_FORMAT);
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+        return ctx->rt->bigint_ops.to_string(ctx, val);
+    case JS_TAG_BIG_FLOAT:
+        return ctx->rt->bigfloat_ops.to_string(ctx, val);
+    case JS_TAG_BIG_DECIMAL:
+        return ctx->rt->bigdecimal_ops.to_string(ctx, val);
+#endif
+    default:
+        str = "[unsupported type]";
+    new_string:
+        return JS_NewString(ctx, str);
+    }
+}
+
+JSValue JS_ToString(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToStringInternal(ctx, val, FALSE);
+}
+
+static JSValue JS_ToStringFree(JSContext *ctx, JSValue val)
+{
+    JSValue ret;
+    ret = JS_ToString(ctx, val);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue JS_ToLocaleStringFree(JSContext *ctx, JSValue val)
+{
+    if (JS_IsUndefined(val) || JS_IsNull(val))
+        return JS_ToStringFree(ctx, val);
+    return JS_InvokeFree(ctx, val, JS_ATOM_toLocaleString, 0, NULL);
+}
+
+JSValue JS_ToPropertyKey(JSContext *ctx, JSValueConst val)
+{
+    return JS_ToStringInternal(ctx, val, TRUE);
+}
+
+static JSValue JS_ToStringCheckObject(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(val);
+    if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED)
+        return JS_ThrowTypeError(ctx, "null or undefined are forbidden");
+    return JS_ToString(ctx, val);
+}
+
+static JSValue JS_ToQuotedString(JSContext *ctx, JSValueConst val1)
+{
+    JSValue val;
+    JSString *p;
+    int i;
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+    char buf[16];
+
+    val = JS_ToStringCheckObject(ctx, val1);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+
+    if (string_buffer_init(ctx, b, p->len + 2))
+        goto fail;
+
+    if (string_buffer_putc8(b, '\"'))
+        goto fail;
+    for(i = 0; i < p->len; ) {
+        c = string_getc(p, &i);
+        switch(c) {
+        case '\t':
+            c = 't';
+            goto quote;
+        case '\r':
+            c = 'r';
+            goto quote;
+        case '\n':
+            c = 'n';
+            goto quote;
+        case '\b':
+            c = 'b';
+            goto quote;
+        case '\f':
+            c = 'f';
+            goto quote;
+        case '\"':
+        case '\\':
+        quote:
+            if (string_buffer_putc8(b, '\\'))
+                goto fail;
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            break;
+        default:
+            if (c < 32 || (c >= 0xd800 && c < 0xe000)) {
+                snprintf(buf, sizeof(buf), "\\u%04x", c);
+                if (string_buffer_puts8(b, buf))
+                    goto fail;
+            } else {
+                if (string_buffer_putc(b, c))
+                    goto fail;
+            }
+            break;
+        }
+    }
+    if (string_buffer_putc8(b, '\"'))
+        goto fail;
+    JS_FreeValue(ctx, val);
+    return string_buffer_end(b);
+ fail:
+    JS_FreeValue(ctx, val);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static __maybe_unused void JS_DumpObjectHeader(JSRuntime *rt)
+{
+    printf("%14s %4s %4s %14s %10s %s\n",
+           "ADDRESS", "REFS", "SHRF", "PROTO", "CLASS", "PROPS");
+}
+
+/* for debug only: dump an object without side effect */
+static __maybe_unused void JS_DumpObject(JSRuntime *rt, JSObject *p)
+{
+    uint32_t i;
+    char atom_buf[ATOM_GET_STR_BUF_SIZE];
+    JSShape *sh;
+    JSShapeProperty *prs;
+    JSProperty *pr;
+    BOOL is_first = TRUE;
+
+    /* XXX: should encode atoms with special characters */
+    sh = p->shape; /* the shape can be NULL while freeing an object */
+    printf("%14p %4d ",
+           (void *)p,
+           p->header.ref_count);
+    if (sh) {
+        printf("%3d%c %14p ",
+               sh->header.ref_count,
+               " *"[sh->is_hashed],
+               (void *)sh->proto);
+    } else {
+        printf("%3s  %14s ", "-", "-");
+    }
+    printf("%10s ",
+           JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), rt->class_array[p->class_id].class_name));
+    if (p->is_exotic && p->fast_array) {
+        printf("[ ");
+        for(i = 0; i < p->u.array.count; i++) {
+            if (i != 0)
+                printf(", ");
+            switch (p->class_id) {
+            case JS_CLASS_ARRAY:
+            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:
+#endif
+                {
+                    int size = 1 << typed_array_size_log2(p->class_id);
+                    const uint8_t *b = p->u.array.u.uint8_ptr + i * size;
+                    while (size-- > 0)
+                        printf("%02X", *b++);
+                }
+                break;
+            }
+        }
+        printf(" ] ");
+    }
+
+    if (sh) {
+        printf("{ ");
+        for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+            if (prs->atom != JS_ATOM_NULL) {
+                pr = &p->prop[i];
+                if (!is_first)
+                    printf(", ");
+                printf("%s: ",
+                       JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), prs->atom));
+                if ((prs->flags & JS_PROP_TMASK) == JS_PROP_GETSET) {
+                    printf("[getset %p %p]", (void *)pr->u.getset.getter,
+                           (void *)pr->u.getset.setter);
+                } 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,
+                           (void *)pr->u.init.opaque);
+                } else {
+                    JS_DumpValueShort(rt, pr->u.value);
+                }
+                is_first = FALSE;
+            }
+        }
+        printf(" }");
+    }
+
+    if (js_class_has_bytecode(p->class_id)) {
+        JSFunctionBytecode *b = p->u.func.function_bytecode;
+        JSVarRef **var_refs;
+        if (b->closure_var_count) {
+            var_refs = p->u.func.var_refs;
+            printf(" Closure:");
+            for(i = 0; i < b->closure_var_count; i++) {
+                printf(" ");
+                JS_DumpValueShort(rt, var_refs[i]->value);
+            }
+            if (p->u.func.home_object) {
+                printf(" HomeObject: ");
+                JS_DumpValueShort(rt, JS_MKPTR(JS_TAG_OBJECT, p->u.func.home_object));
+            }
+        }
+    }
+    printf("\n");
+}
+
+static __maybe_unused void JS_DumpGCObject(JSRuntime *rt, JSGCObjectHeader *p)
+{
+    if (p->gc_obj_type == JS_GC_OBJ_TYPE_JS_OBJECT) {
+        JS_DumpObject(rt, (JSObject *)p);
+    } else {
+        printf("%14p %4d ",
+               (void *)p,
+               p->ref_count);
+        switch(p->gc_obj_type) {
+        case JS_GC_OBJ_TYPE_FUNCTION_BYTECODE:
+            printf("[function bytecode]");
+            break;
+        case JS_GC_OBJ_TYPE_SHAPE:
+            printf("[shape]");
+            break;
+        case JS_GC_OBJ_TYPE_VAR_REF:
+            printf("[var_ref]");
+            break;
+        case JS_GC_OBJ_TYPE_ASYNC_FUNCTION:
+            printf("[async_function]");
+            break;
+        default:
+            printf("[unknown %d]", p->gc_obj_type);
+            break;
+        }
+        printf("\n");
+    }
+}
+
+static __maybe_unused void JS_DumpValueShort(JSRuntime *rt,
+                                                      JSValueConst val)
+{
+    uint32_t tag = JS_VALUE_GET_NORM_TAG(val);
+    const char *str;
+
+    switch(tag) {
+    case JS_TAG_INT:
+        printf("%d", JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_BOOL:
+        if (JS_VALUE_GET_BOOL(val))
+            str = "true";
+        else
+            str = "false";
+        goto print_str;
+    case JS_TAG_NULL:
+        str = "null";
+        goto print_str;
+    case JS_TAG_EXCEPTION:
+        str = "exception";
+        goto print_str;
+    case JS_TAG_UNINITIALIZED:
+        str = "uninitialized";
+        goto print_str;
+    case JS_TAG_UNDEFINED:
+        str = "undefined";
+    print_str:
+        printf("%s", str);
+        break;
+    case JS_TAG_FLOAT64:
+        printf("%.14g", JS_VALUE_GET_FLOAT64(val));
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bf_ftoa(NULL, &p->num, 10, 0,
+                          BF_RNDZ | BF_FTOA_FORMAT_FRAC);
+            printf("%sn", str);
+            bf_realloc(&rt->bf_ctx, str, 0);
+        }
+        break;
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bf_ftoa(NULL, &p->num, 16, BF_PREC_INF,
+                          BF_RNDZ | BF_FTOA_FORMAT_FREE | BF_FTOA_ADD_PREFIX);
+            printf("%sl", str);
+            bf_free(&rt->bf_ctx, str);
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p = JS_VALUE_GET_PTR(val);
+            char *str;
+            str = bfdec_ftoa(NULL, &p->num, BF_PREC_INF,
+                             BF_RNDZ | BF_FTOA_FORMAT_FREE);
+            printf("%sm", str);
+            bf_free(&rt->bf_ctx, str);
+        }
+        break;
+#endif
+    case JS_TAG_STRING:
+        {
+            JSString *p;
+            p = JS_VALUE_GET_STRING(val);
+            JS_DumpString(rt, p);
+        }
+        break;
+    case JS_TAG_FUNCTION_BYTECODE:
+        {
+            JSFunctionBytecode *b = JS_VALUE_GET_PTR(val);
+            char buf[ATOM_GET_STR_BUF_SIZE];
+            printf("[bytecode %s]", JS_AtomGetStrRT(rt, buf, sizeof(buf), b->func_name));
+        }
+        break;
+    case JS_TAG_OBJECT:
+        {
+            JSObject *p = JS_VALUE_GET_OBJ(val);
+            JSAtom atom = rt->class_array[p->class_id].class_name;
+            char atom_buf[ATOM_GET_STR_BUF_SIZE];
+            printf("[%s %p]",
+                   JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), atom), (void *)p);
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(val);
+            char atom_buf[ATOM_GET_STR_BUF_SIZE];
+            printf("Symbol(%s)",
+                   JS_AtomGetStrRT(rt, atom_buf, sizeof(atom_buf), js_get_atom_index(rt, p)));
+        }
+        break;
+    case JS_TAG_MODULE:
+        printf("[module]");
+        break;
+    default:
+        printf("[unknown tag %d]", tag);
+        break;
+    }
+}
+
+static __maybe_unused void JS_DumpValue(JSContext *ctx,
+                                                 JSValueConst val)
+{
+    JS_DumpValueShort(ctx->rt, val);
+}
+
+static __maybe_unused void JS_PrintValue(JSContext *ctx,
+                                                  const char *str,
+                                                  JSValueConst val)
+{
+    printf("%s=", str);
+    JS_DumpValueShort(ctx->rt, val);
+    printf("\n");
+}
+
+/* return -1 if exception (proxy case) or TRUE/FALSE */
+int JS_IsArray(JSContext *ctx, JSValueConst val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(val);
+        if (unlikely(p->class_id == JS_CLASS_PROXY))
+            return js_proxy_isArray(ctx, val);
+        else
+            return p->class_id == JS_CLASS_ARRAY;
+    } else {
+        return FALSE;
+    }
+}
+
+static double js_pow(double a, double b)
+{
+    if (unlikely(!isfinite(b)) && fabs(a) == 1) {
+        /* not compatible with IEEE 754 */
+        return JS_FLOAT64_NAN;
+    } else {
+        return pow(a, b);
+    }
+}
+
+#ifdef CONFIG_BIGNUM
+
+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);
+    } 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);
+    }
+}
+
+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);
+    } 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);
+    }
+}
+
+/* if the returned bigfloat is allocated it is equal to
+   'buf'. Otherwise it is a pointer to the bigfloat in 'val'. Return
+   NULL in case of error. */
+static bf_t *JS_ToBigFloat(JSContext *ctx, bf_t *buf, JSValueConst val)
+{
+    uint32_t tag;
+    bf_t *r;
+    JSBigFloat *p;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        if (bf_set_si(r, JS_VALUE_GET_INT(val)))
+            goto fail;
+        break;
+    case JS_TAG_FLOAT64:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        if (bf_set_float64(r, JS_VALUE_GET_FLOAT64(val))) {
+        fail:
+            bf_delete(r);
+            return NULL;
+        }
+        break;
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+    case JS_TAG_UNDEFINED:
+    default:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set_nan(r);
+        break;
+    }
+    return r;
+}
+
+/* return NULL if invalid type */
+static bfdec_t *JS_ToBigDecimal(JSContext *ctx, JSValueConst val)
+{
+    uint32_t tag;
+    JSBigDecimal *p;
+    bfdec_t *r;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_BIG_DECIMAL:
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+    default:
+        JS_ThrowTypeError(ctx, "bigdecimal expected");
+        r = NULL;
+        break;
+    }
+    return r;
+}
+
+/* return NaN if bad bigint literal */
+static JSValue JS_StringToBigInt(JSContext *ctx, JSValue val)
+{
+    const char *str, *p;
+    size_t len;
+    int flags;
+
+    str = JS_ToCStringLen(ctx, &len, val);
+    JS_FreeValue(ctx, val);
+    if (!str)
+        return JS_EXCEPTION;
+    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);
+    } else {
+        flags = ATOD_INT_ONLY | ATOD_ACCEPT_BIN_OCT | ATOD_TYPE_BIG_INT;
+        if (is_bigint_mode(ctx))
+            flags |= ATOD_MODE_BIGINT;
+        val = js_atof(ctx, p, &p, 0, flags);
+        p += skip_spaces(p);
+        if (!JS_IsException(val)) {
+            if ((p - str) != len) {
+                JS_FreeValue(ctx, val);
+                val = JS_NAN;
+            }
+        }
+    }
+    JS_FreeCString(ctx, str);
+    return val;
+}
+
+static JSValue JS_StringToBigIntErr(JSContext *ctx, JSValue val)
+{
+    val = JS_StringToBigInt(ctx, val);
+    if (JS_VALUE_IS_NAN(val))
+        return JS_ThrowSyntaxError(ctx, "invalid bigint literal");
+    return val;
+}
+
+/* if the returned bigfloat is allocated it is equal to
+   'buf'. Otherwise it is a pointer to the bigfloat in 'val'. */
+static bf_t *JS_ToBigIntFree(JSContext *ctx, bf_t *buf, JSValue val)
+{
+    uint32_t tag;
+    bf_t *r;
+    JSBigFloat *p;
+
+ redo:
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_INT:
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        if (!is_bigint_mode(ctx))
+            goto fail;
+        /* fall tru */
+    case JS_TAG_BOOL:
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set_si(r, JS_VALUE_GET_INT(val));
+        break;
+    case JS_TAG_FLOAT64:
+        {
+            double d = JS_VALUE_GET_FLOAT64(val);
+            if (!is_bigint_mode(ctx))
+                goto fail;
+            if (!isfinite(d))
+                goto fail;
+            r = buf;
+            bf_init(ctx->bf_ctx, r);
+            d = trunc(d);
+            bf_set_float64(r, d);
+        }
+        break;
+    case JS_TAG_BIG_INT:
+        p = JS_VALUE_GET_PTR(val);
+        r = &p->num;
+        break;
+    case JS_TAG_BIG_FLOAT:
+        if (!is_bigint_mode(ctx))
+            goto fail;
+        p = JS_VALUE_GET_PTR(val);
+        if (!bf_is_finite(&p->num))
+            goto fail;
+        r = buf;
+        bf_init(ctx->bf_ctx, r);
+        bf_set(r, &p->num);
+        bf_rint(r, BF_RNDZ);
+        JS_FreeValue(ctx, val);
+        break;
+    case JS_TAG_STRING:
+        val = JS_StringToBigIntErr(ctx, val);
+        if (JS_IsException(val))
+            return NULL;
+        goto redo;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val,
+                                 is_bigint_mode(ctx) ? HINT_INTEGER : HINT_NUMBER);
+        if (JS_IsException(val))
+            return NULL;
+        goto redo;
+    default:
+    fail:
+        JS_FreeValue(ctx, val);
+        JS_ThrowTypeError(ctx, "cannot convert to bigint");
+        return NULL;
+    }
+    return r;
+}
+
+static bf_t *JS_ToBigInt(JSContext *ctx, bf_t *buf, JSValueConst val)
+{
+    return JS_ToBigIntFree(ctx, buf, JS_DupValue(ctx, val));
+}
+
+static __maybe_unused JSValue JS_ToBigIntValueFree(JSContext *ctx, JSValue val)
+{
+    if (JS_VALUE_GET_TAG(val) == JS_TAG_BIG_INT) {
+        return val;
+    } else {
+        bf_t a_s, *a, b_s, *b;
+        int ret;
+
+        a = JS_ToBigIntFree(ctx, &a_s, val);
+        if (!a)
+            return JS_EXCEPTION;
+        b = &b_s;
+        bf_init(ctx->bf_ctx, b);
+        ret = bf_set(b, a);
+        JS_FreeBigInt(ctx, a, &a_s);
+        if (ret) {
+            bf_delete(b);
+            return JS_ThrowOutOfMemory(ctx);
+        }
+        return JS_NewBigInt2(ctx, b, TRUE);
+    }
+}
+
+/* free the bf_t allocated by JS_ToBigInt */
+static void JS_FreeBigInt(JSContext *ctx, bf_t *a, bf_t *buf)
+{
+    if (a == buf) {
+        bf_delete(a);
+    } else {
+        JSBigFloat *p = (JSBigFloat *)((uint8_t *)a -
+                                       offsetof(JSBigFloat, num));
+        JS_FreeValue(ctx, JS_MKPTR(JS_TAG_BIG_FLOAT, p));
+    }
+}
+
+/* XXX: merge with JS_ToInt64Free with a specific flag */
+static int JS_ToBigInt64Free(JSContext *ctx, int64_t *pres, JSValue val)
+{
+    bf_t a_s, *a;
+
+    a = JS_ToBigIntFree(ctx, &a_s, val);
+    if (!a) {
+        *pres = 0;
+        return -1;
+    }
+    bf_get_int64(pres, a, BF_GET_INT_MOD);
+    JS_FreeBigInt(ctx, a, &a_s);
+    return 0;
+}
+
+int JS_ToBigInt64(JSContext *ctx, int64_t *pres, JSValueConst val)
+{
+    return JS_ToBigInt64Free(ctx, pres, JS_DupValue(ctx, val));
+}
+
+static JSBigFloat *js_new_bf(JSContext *ctx)
+{
+    JSBigFloat *p;
+    p = js_mallocz(ctx, sizeof(*p));
+    if (!p)
+        return NULL;
+    p->header.ref_count = 1;
+    bf_init(ctx->bf_ctx, &p->num);
+    return p;
+}
+
+/* WARNING: 'a' is freed */
+static JSValue JS_NewBigFloat(JSContext *ctx, bf_t *a)
+{
+    JSValue ret;
+    JSBigFloat *p;
+
+    p = js_new_bf(ctx);
+    bf_memcpy(&p->num, a);
+    ret = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
+    return ret;
+}
+
+/* WARNING: 'a' is freed */
+static JSValue JS_NewBigDecimal(JSContext *ctx, bfdec_t *a)
+{
+    JSValue ret;
+    JSBigDecimal *p;
+
+    p = js_mallocz(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;
+}
+
+/* WARNING: 'a' is freed */
+static JSValue JS_NewBigInt2(JSContext *ctx, bf_t *a, BOOL force_bigint)
+{
+    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;
+}
+
+static JSValue JS_NewBigInt(JSContext *ctx, bf_t *a)
+{
+    return JS_NewBigInt2(ctx, a, !is_bigint_mode(ctx));
+}
+
+/* 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];
+
+    bool_result = FALSE;
+    swap_op = FALSE;
+    c1 = JS_UNDEFINED;
+    c2 = JS_UNDEFINED;
+    switch(op) {
+    case OP_add:
+        op_name = JS_ATOM_Symbol_operatorAdd;
+        break;
+    case OP_sub:
+        op_name = JS_ATOM_Symbol_operatorSub;
+        break;
+    case OP_mul:
+        op_name = JS_ATOM_Symbol_operatorMul;
+        break;
+    case OP_div:
+    case OP_math_div:
+        op_name = JS_ATOM_Symbol_operatorDiv;
+        break;
+    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;
+    case OP_or:
+        op_name = JS_ATOM_Symbol_operatorOr;
+        break;
+    case OP_xor:
+        op_name = JS_ATOM_Symbol_operatorXor;
+        break;
+    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;
+    default:
+        goto fail;
+    }
+    c1 = JS_GetProperty(ctx, op1, JS_ATOM_constructor);
+    if (JS_IsException(c1))
+        goto exception;
+    c2 = JS_GetProperty(ctx, op2, JS_ATOM_constructor);
+    if (JS_IsException(c2))
+        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);
+    } else {
+        JSValue val;
+        int order1, order2;
+
+        /* 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 (JS_ToInt32Free(ctx, &order2, val))
+            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 {
+            val = c2;
+        }
+        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 (swap_op) {
+        args[0] = op2;
+        args[1] = op1;
+    } else {
+        args[0] = op1;
+        args[1] = op2;
+    }
+    ret = JS_CallFree(ctx, method, JS_UNDEFINED, 2, args);
+    if (JS_IsException(ret))
+        goto exception;
+    if (bool_result) {
+        BOOL res = JS_ToBoolFree(ctx, ret);
+        if (op == OP_neq)
+            res ^= 1;
+        ret = JS_NewBool(ctx, res);
+    }
+    *pret = ret;
+    return 1;
+ fail:
+    JS_ThrowTypeError(ctx, "invalid types for binary operator");
+ exception:
+    JS_FreeValue(ctx, c1);
+    JS_FreeValue(ctx, c2);
+    *pret = JS_UNDEFINED;
+    return -1;
+}
+
+static JSValue throw_bf_exception(JSContext *ctx, int status)
+{
+    const char *str;
+    if (status & BF_ST_MEM_ERROR)
+        return JS_ThrowOutOfMemory(ctx);
+    if (status & BF_ST_DIVIDE_ZERO) {
+        str = "division by zero";
+    } else if (status & BF_ST_INVALID_OP) {
+        str = "invalid operation";
+    } else {
+        str = "integer overflow";
+    }
+    return JS_ThrowRangeError(ctx, "%s", str);
+}
+
+static int js_unary_arith_bigint(JSContext *ctx,
+                                 JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    bf_t a_s, r_s, *r = &r_s, *a;
+    int ret, v;
+
+    if (op == OP_plus && !is_bigint_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigint argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    a = JS_ToBigInt(ctx, &a_s, op1);
+    bf_init(ctx->bf_ctx, r);
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bf_add_si(r, a, v, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_plus:
+        ret = bf_set(r, a);
+        break;
+    case OP_neg:
+        ret = bf_set(r, a);
+        bf_neg(r);
+        break;
+    case OP_not:
+        ret = bf_add_si(r, a, 1, BF_PREC_INF, BF_RNDZ);
+        bf_neg(r);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret)) {
+        bf_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigInt(ctx, r);
+    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;
+    int ret, v;
+
+    if (op == OP_plus && !is_bigint_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigfloat argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    bf_init(ctx->bf_ctx, r);
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bf_add_si(r, a, v, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_plus:
+        ret = bf_set(r, a);
+        break;
+    case OP_neg:
+        ret = bf_set(r, a);
+        bf_neg(r);
+        break;
+    default:
+        abort();
+    }
+    if (a == &a_s)
+        bf_delete(a);
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret & BF_ST_MEM_ERROR)) {
+        bf_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigFloat(ctx, r);
+    return 0;
+}
+
+static int js_unary_arith_bigdecimal(JSContext *ctx,
+                                     JSValue *pres, OPCodeEnum op, JSValue op1)
+{
+    bfdec_t r_s, *r = &r_s, *a;
+    int ret, v;
+
+    if (op == OP_plus && !is_bigint_mode(ctx)) {
+        JS_ThrowTypeError(ctx, "bigdecimal argument with unary +");
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+
+    a = JS_ToBigDecimal(ctx, op1);
+    bfdec_init(ctx->bf_ctx, r);
+    ret = 0;
+    switch(op) {
+    case OP_inc:
+    case OP_dec:
+        v = 2 * (op - OP_dec) - 1;
+        ret = bfdec_add_si(r, a, v, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_plus:
+        ret = bfdec_set(r, a);
+        break;
+    case OP_neg:
+        ret = bfdec_set(r, a);
+        bfdec_neg(r);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    if (unlikely(ret)) {
+        bfdec_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigDecimal(ctx, r);
+    return 0;
+}
+
+static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
+                                                     JSValue *sp,
+                                                     OPCodeEnum op)
+{
+    JSValue op1, val, method;
+    BOOL is_legacy;
+    JSAtom op_name;
+    int v;
+    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))
+            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();
+                }
+                sp[-1] = JS_NewInt64(ctx, v64);
+            }
+            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);
+            }
+            break;
+        }
+    }
+    return 0;
+ exception:
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static __exception int js_post_inc_slow(JSContext *ctx,
+                                        JSValue *sp, OPCodeEnum op)
+{
+    JSValue op1;
+
+    /* XXX: allow custom operators */
+    op1 = sp[-1];
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        sp[-1] = JS_UNDEFINED;
+        return -1;
+    }
+    sp[-1] = op1;
+    sp[0] = JS_DupValue(ctx, op1);
+    return js_unary_arith_slow(ctx, sp + 1, op - OP_post_dec + OP_dec);
+}
+
+static no_inline int js_not_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, method, val;
+
+    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))
+            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);
+        }
+    }
+    return 0;
+ exception:
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+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;
+
+    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:
+        ret = bf_add(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case OP_sub:
+        ret = bf_sub(r, a, b, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    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;
+    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);
+        }
+        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);
+        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);
+    if (unlikely(ret & BF_ST_MEM_ERROR)) {
+        bf_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigFloat(ctx, r);
+    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;
+    JSValue res;
+
+    a = JS_ToBigInt(ctx, &a_s, op1);
+    if (!a)
+        goto fail;
+    b = JS_ToBigInt(ctx, &b_s, op2);
+    if (!b) {
+        JS_FreeBigInt(ctx, a, &a_s);
+        goto fail;
+    }
+    r = &r_s;
+    bf_init(ctx->bf_ctx, r);
+    ret = 0;
+    switch(op) {
+    case OP_add:
+        ret = bf_add(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    case OP_sub:
+        ret = bf_sub(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    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)) {
+            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;
+        }
+        break;
+    case OP_math_mod:
+        /* Euclidian remainder */
+        rnd_mode = BF_DIVREM_EUCLIDIAN;
+        goto do_int_mod;
+    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);
+        }
+        break;
+    case OP_pow:
+    case OP_math_pow:
+        if (b->sign) {
+            if (!is_bigint_mode(ctx)) {
+                ret = BF_ST_INVALID_OP;
+            } else if (op == OP_math_pow) {
+            op_fallback:
+                bf_delete(r);
+                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");
+                    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);
+        }
+        break;
+
+        /* logical operations */
+    case OP_shl:
+    case OP_sar:
+        {
+            slimb_t v2;
+#if LIMB_BITS == 32
+            bf_get_int32(&v2, b, 0);
+            if (v2 == INT32_MIN)
+                v2 = INT32_MIN + 1;
+#else
+            bf_get_int64(&v2, b, 0);
+            if (v2 == INT64_MIN)
+                v2 = INT64_MIN + 1;
+#endif
+            if (op == OP_sar)
+                v2 = -v2;
+            ret = bf_set(r, a);
+            ret |= bf_mul_2exp(r, v2, BF_PREC_INF, BF_RNDZ);
+            if (v2 < 0) {
+                ret |= bf_rint(r, BF_RNDD) & (BF_ST_OVERFLOW | BF_ST_MEM_ERROR);
+            }
+        }
+        break;
+    case OP_and:
+        ret = bf_logic_and(r, a, b);
+        break;
+    case OP_or:
+        ret = bf_logic_or(r, a, b);
+        break;
+    case OP_xor:
+        ret = bf_logic_xor(r, a, b);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    JS_FreeBigInt(ctx, b, &b_s);
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    if (unlikely(ret)) {
+        bf_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigInt(ctx, r);
+    return 0;
+ fail:
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return -1;
+}
+
+/* b must be a positive integer */
+static int js_bfdec_pow(bfdec_t *r, const bfdec_t *a, const bfdec_t *b)
+{
+    bfdec_t b1;
+    int32_t b2;
+    int ret;
+
+    bfdec_init(b->ctx, &b1);
+    ret = bfdec_set(&b1, b);
+    if (ret) {
+        bfdec_delete(&b1);
+        return ret;
+    }
+    ret = bfdec_rint(&b1, BF_RNDZ);
+    if (ret) {
+        bfdec_delete(&b1);
+        return BF_ST_INVALID_OP; /* must be an integer */
+    }
+    ret = bfdec_get_int32(&b2, &b1);
+    bfdec_delete(&b1);
+    if (ret)
+        return ret; /* overflow */
+    if (b2 < 0)
+        return BF_ST_INVALID_OP; /* must be positive */
+    return bfdec_pow_ui(r, a, b2);
+}
+
+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;
+
+    /* big decimal result */
+    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);
+        break;
+    case OP_sub:
+        ret = bfdec_sub(r, a, b, BF_PREC_INF, BF_RNDZ);
+        break;
+    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;
+    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);
+        }
+        break;
+    case OP_pow:
+    case OP_math_pow:
+        ret = js_bfdec_pow(r, a, b);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    if (unlikely(ret)) {
+        bfdec_delete(r);
+        throw_bf_exception(ctx, ret);
+        return -1;
+    }
+    *pres = JS_NewBigDecimal(ctx, r);
+    return 0;
+ fail:
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return -1;
+}
+
+static no_inline __exception int js_binary_arith_slow(JSContext *ctx, JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2, res;
+    BOOL is_legacy;
+    uint32_t tag1, tag2;
+    int ret;
+    double d1, d2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    /* fast path for float operations */
+    if (tag1 == JS_TAG_FLOAT64 && tag2 == JS_TAG_FLOAT64) {
+        d1 = JS_VALUE_GET_FLOAT64(op1);
+        d2 = JS_VALUE_GET_FLOAT64(op2);
+        goto handle_float64;
+    }
+
+    /* 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 (ret != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (ret < 0) {
+                goto exception;
+            } else {
+                sp[-2] = res;
+                return 0;
+            }
+        }
+    }
+
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+        int32_t v1, v2;
+        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) {
+                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:
+            sp[-2] = __JS_NewFloat64(ctx, (double)v1 / (double)v2);
+            return 0;
+        case OP_math_mod:
+            if (unlikely(v2 == 0)) {
+                throw_bf_exception(ctx, BF_ST_DIVIDE_ZERO);
+                goto exception;
+            }
+            v = (int64_t)v1 % (int64_t)v2;
+            if (v < 0) {
+                if (v2 < 0)
+                    v -= v2;
+                else
+                    v += v2;
+            }
+            break;
+        case OP_mod:
+            if (is_legacy && (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) {
+                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;
+            }
+            break;
+        default:
+            abort();
+        }
+        sp[-2] = JS_NewInt64(ctx, v);
+    } else if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+        if (ctx->rt->bigdecimal_ops.binary_arith(ctx, op, sp - 2, op1, op2))
+            goto exception;
+    } 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) {
+        double dr;
+        /* float64 result */
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+    handle_float64:
+        switch(op) {
+        case OP_sub:
+            dr = d1 - d2;
+            break;
+        case OP_mul:
+            dr = d1 * d2;
+            break;
+        case OP_div:
+        case OP_math_div:
+            dr = d1 / d2;
+            break;
+        case OP_mod:
+            dr = fmod(d1, d2);
+            break;
+        case OP_math_mod:
+            d2 = fabs(d2);
+            dr = fmod(d1, d2);
+            /* XXX: loss of accuracy if dr < 0 */
+            if (dr < 0)
+                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:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_add_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2, res;
+    uint32_t tag1, tag2;
+    int ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    /* fast path for float64 */
+    if (tag1 == JS_TAG_FLOAT64 && tag2 == JS_TAG_FLOAT64) {
+        double d1, d2;
+        d1 = JS_VALUE_GET_FLOAT64(op1);
+        d2 = JS_VALUE_GET_FLOAT64(op2);
+        sp[-2] = __JS_NewFloat64(ctx, d1 + d2);
+        return 0;
+    }
+
+    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 (ret != 0) {
+                JS_FreeValue(ctx, op1);
+                JS_FreeValue(ctx, op2);
+                if (ret < 0) {
+                    goto exception;
+                } else {
+                    sp[-2] = res;
+                    return 0;
+                }
+            }
+        }
+
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        tag1 = JS_VALUE_GET_NORM_TAG(op1);
+        tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    }
+
+    if (tag1 == JS_TAG_STRING || tag2 == JS_TAG_STRING) {
+        sp[-2] = JS_ConcatString(ctx, op1, op2);
+        if (JS_IsException(sp[-2]))
+            goto exception;
+        return 0;
+    }
+
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+        int32_t v1, v2;
+        int64_t v;
+        v1 = JS_VALUE_GET_INT(op1);
+        v2 = JS_VALUE_GET_INT(op2);
+        v = (int64_t)v1 + (int64_t)v2;
+        sp[-2] = JS_NewInt64(ctx, v);
+    } else if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+        if (ctx->rt->bigdecimal_ops.binary_arith(ctx, OP_add, sp - 2, op1, op2))
+            goto exception;
+    } 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) {
+        double d1, d2;
+        /* float64 result */
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+        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:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_binary_logic_slow(JSContext *ctx,
+                                                      JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2, res;
+    int ret;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    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) {
+        ret = js_call_binary_op_fallback(ctx, &res, op1, op2, op);
+        if (ret != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (ret < 0) {
+                goto exception;
+            } else {
+                sp[-2] = res;
+                return 0;
+            }
+        }
+    }
+
+    op1 = JS_ToNumberHintFree(ctx, op1, TON_FLAG_INTEGER);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumberHintFree(ctx, op2, TON_FLAG_INTEGER);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+
+    if (!is_bigint_mode(ctx)) {
+        uint32_t v1, v2, r;
+
+        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;
+            }
+        } 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)))
+                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))
+            goto exception;
+    }
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+/* Note: also used for bigint */
+static int js_compare_bigfloat(JSContext *ctx, OPCodeEnum op,
+                               JSValue op1, JSValue op2)
+{
+    bf_t a_s, b_s, *a, *b;
+    int res;
+
+    a = JS_ToBigFloat(ctx, &a_s, op1);
+    if (!a) {
+        JS_FreeValue(ctx, op2);
+        return -1;
+    }
+    b = JS_ToBigFloat(ctx, &b_s, op2);
+    if (!b) {
+        if (a == &a_s)
+            bf_delete(a);
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    switch(op) {
+    case OP_lt:
+        res = bf_cmp_lt(a, b); /* if NaN return false */
+        break;
+    case OP_lte:
+        res = bf_cmp_le(a, b); /* if NaN return false */
+        break;
+    case OP_gt:
+        res = bf_cmp_lt(b, a); /* if NaN return false */
+        break;
+    case OP_gte:
+        res = bf_cmp_le(b, a); /* if NaN return false */
+        break;
+    case OP_eq:
+        res = bf_cmp_eq(a, b); /* if NaN return false */
+        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 int js_compare_bigdecimal(JSContext *ctx, OPCodeEnum op,
+                                 JSValue op1, JSValue op2)
+{
+    bfdec_t *a, *b;
+    int res;
+
+    /* Note: binary floats are converted to bigdecimal with
+       toString(). It is not mathematically correct but is consistent
+       with the BigDecimal() constructor behavior */
+    op1 = JS_ToBigDecimalFree(ctx, op1, TRUE);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        return -1;
+    }
+    op2 = JS_ToBigDecimalFree(ctx, op2, TRUE);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        return -1;
+    }
+    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 */
+        break;
+    case OP_lte:
+        res = bfdec_cmp_le(a, b); /* if NaN return false */
+        break;
+    case OP_gt:
+        res = bfdec_cmp_lt(b, a); /* if NaN return false */
+        break;
+    case OP_gte:
+        res = bfdec_cmp_le(b, a); /* if NaN return false */
+        break;
+    case OP_eq:
+        res = bfdec_cmp_eq(a, b); /* if NaN return false */
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    return res;
+}
+
+static no_inline int js_relational_slow(JSContext *ctx, JSValue *sp,
+                                        OPCodeEnum op)
+{
+    JSValue op1, op2, ret;
+    int res;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    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 (res != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (res < 0) {
+                goto exception;
+            } else {
+                sp[-2] = ret;
+                return 0;
+            }
+        }
+    }
+    op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NUMBER);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NUMBER);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+
+    if (tag1 == JS_TAG_STRING && tag2 == JS_TAG_STRING) {
+        JSString *p1, *p2;
+        p1 = JS_VALUE_GET_STRING(op1);
+        p2 = JS_VALUE_GET_STRING(op2);
+        res = js_string_compare(ctx, p1, p2);
+        switch(op) {
+        case OP_lt:
+            res = (res < 0);
+            break;
+        case OP_lte:
+            res = (res <= 0);
+            break;
+        case OP_gt:
+            res = (res > 0);
+            break;
+        default:
+        case OP_gte:
+            res = (res >= 0);
+            break;
+        }
+        JS_FreeValue(ctx, op1);
+        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;
+        }
+    } else {
+        if (((tag1 == JS_TAG_BIG_INT && tag2 == JS_TAG_STRING) ||
+             (tag2 == JS_TAG_BIG_INT && tag1 == JS_TAG_STRING)) &&
+            !is_bigint_mode(ctx)) {
+            if (tag1 == JS_TAG_STRING) {
+                op1 = JS_StringToBigInt(ctx, op1);
+                if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
+                    goto invalid_bigint_string;
+            }
+            if (tag2 == JS_TAG_STRING) {
+                op2 = JS_StringToBigInt(ctx, op2);
+                if (JS_VALUE_GET_TAG(op2) != JS_TAG_BIG_INT) {
+                invalid_bigint_string:
+                    JS_FreeValue(ctx, op1);
+                    JS_FreeValue(ctx, op2);
+                    res = FALSE;
+                    goto done;
+                }
+            }
+        } else {
+            op1 = JS_ToNumericFree(ctx, op1);
+            if (JS_IsException(op1)) {
+                JS_FreeValue(ctx, op2);
+                goto exception;
+            }
+            op2 = JS_ToNumericFree(ctx, op2);
+            if (JS_IsException(op2)) {
+                JS_FreeValue(ctx, op1);
+                goto exception;
+            }
+        }
+
+        if (JS_VALUE_GET_TAG(op1) == JS_TAG_BIG_DECIMAL ||
+            JS_VALUE_GET_TAG(op2) == 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) {
+            res = ctx->rt->bigfloat_ops.compare(ctx, op, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else {
+            res = ctx->rt->bigint_ops.compare(ctx, op, op1, op2);
+            if (res < 0)
+                goto exception;
+        }
+    }
+ done:
+    sp[-2] = JS_NewBool(ctx, res);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static BOOL tag_is_number(uint32_t tag)
+{
+    return (tag == JS_TAG_INT || tag == JS_TAG_BIG_INT ||
+            tag == JS_TAG_FLOAT64 || tag == JS_TAG_BIG_FLOAT ||
+            tag == JS_TAG_BIG_DECIMAL);
+}
+
+static no_inline __exception int js_eq_slow(JSContext *ctx, JSValue *sp,
+                                            BOOL is_neq)
+{
+    JSValue op1, op2, ret;
+    int res;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+ redo:
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    if (tag_is_number(tag1) && tag_is_number(tag2)) {
+        if (tag1 == JS_TAG_INT && tag2 == JS_TAG_INT) {
+            res = JS_VALUE_GET_INT(op1) == JS_VALUE_GET_INT(op2);
+        } else if ((tag1 == JS_TAG_FLOAT64 &&
+                    (tag2 == JS_TAG_INT || tag2 == JS_TAG_FLOAT64)) ||
+                   (tag2 == JS_TAG_FLOAT64 &&
+                    (tag1 == JS_TAG_INT || tag1 == JS_TAG_FLOAT64))) {
+            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);
+            }
+            res = (d1 == d2);
+        } else if (tag1 == JS_TAG_BIG_DECIMAL || tag2 == JS_TAG_BIG_DECIMAL) {
+            res = ctx->rt->bigdecimal_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else if (tag1 == JS_TAG_BIG_FLOAT || tag2 == JS_TAG_BIG_FLOAT) {
+            res = ctx->rt->bigfloat_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        } else {
+            res = ctx->rt->bigint_ops.compare(ctx, OP_eq, op1, op2);
+            if (res < 0)
+                goto exception;
+        }
+    } else if (tag1 == tag2) {
+        if (tag1 == JS_TAG_OBJECT && ctx->bignum_ext) {
+            /* try the fallback operator */
+            res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
+                                              is_neq ? OP_neq : OP_eq);
+            if (res != 0) {
+                JS_FreeValue(ctx, op1);
+                JS_FreeValue(ctx, op2);
+                if (res < 0) {
+                    goto exception;
+                } else {
+                    sp[-2] = ret;
+                    return 0;
+                }
+            }
+        }
+        res = js_strict_eq2(ctx, op1, op2, JS_EQ_STRICT);
+    } else if ((tag1 == JS_TAG_NULL && tag2 == JS_TAG_UNDEFINED) ||
+               (tag2 == JS_TAG_NULL && tag1 == JS_TAG_UNDEFINED)) {
+        res = TRUE;
+    } else if ((tag1 == JS_TAG_STRING && tag_is_number(tag2)) ||
+               (tag2 == JS_TAG_STRING && tag_is_number(tag1))) {
+
+        if ((tag1 == JS_TAG_BIG_INT || tag2 == JS_TAG_BIG_INT) &&
+            !is_bigint_mode(ctx)) {
+            if (tag1 == JS_TAG_STRING) {
+                op1 = JS_StringToBigInt(ctx, op1);
+                if (JS_VALUE_GET_TAG(op1) != JS_TAG_BIG_INT)
+                    goto invalid_bigint_string;
+            }
+            if (tag2 == JS_TAG_STRING) {
+                op2 = JS_StringToBigInt(ctx, op2);
+                if (JS_VALUE_GET_TAG(op2) != JS_TAG_BIG_INT) {
+                invalid_bigint_string:
+                    JS_FreeValue(ctx, op1);
+                    JS_FreeValue(ctx, op2);
+                    res = FALSE;
+                    goto done;
+                }
+            }
+        } else {
+            op1 = JS_ToNumericFree(ctx, op1);
+            if (JS_IsException(op1)) {
+                JS_FreeValue(ctx, op2);
+                goto exception;
+            }
+            op2 = JS_ToNumericFree(ctx, op2);
+            if (JS_IsException(op2)) {
+                JS_FreeValue(ctx, op1);
+                goto exception;
+            }
+        }
+        res = js_strict_eq(ctx, op1, op2);
+    } else if (tag1 == JS_TAG_BOOL) {
+        op1 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op1));
+        goto redo;
+    } else if (tag2 == JS_TAG_BOOL) {
+        op2 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op2));
+        goto redo;
+    } else if ((tag1 == JS_TAG_OBJECT &&
+                (tag_is_number(tag2) || tag2 == JS_TAG_STRING || tag2 == JS_TAG_SYMBOL)) ||
+               (tag2 == JS_TAG_OBJECT &&
+                (tag_is_number(tag1) || tag1 == JS_TAG_STRING || tag1 == JS_TAG_SYMBOL))) {
+
+        /* try the fallback operator */
+        res = js_call_binary_op_fallback(ctx, &ret, op1, op2,
+                                          is_neq ? OP_neq : OP_eq);
+        if (res != 0) {
+            JS_FreeValue(ctx, op1);
+            JS_FreeValue(ctx, op2);
+            if (res < 0) {
+                goto exception;
+            } else {
+                sp[-2] = ret;
+                return 0;
+            }
+        }
+
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        goto redo;
+    } else {
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        res = FALSE;
+    }
+ done:
+    sp[-2] = JS_NewBool(ctx, res ^ is_neq);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline int js_shr_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    uint32_t v1, v2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    op1 = JS_ToNumericFree(ctx, op1);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToNumericFree(ctx, op2);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    /* XXX: could forbid >>> in bignum mode */
+    if (!is_bigint_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 >>>");
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    /* cannot give an exception */
+    JS_ToUint32Free(ctx, &v1, op1);
+    JS_ToUint32Free(ctx, &v2, op2);
+    r = v1 >> (v2 & 0x1f);
+    sp[-2] = JS_NewUint32(ctx, r);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static JSValue js_mul_pow10_to_float64(JSContext *ctx, const bf_t *a,
+                                       int64_t exponent)
+{
+    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,
+                           53, bf_set_exp_bits(11) | BF_RNDN |
+                           BF_FLAG_SUBNORMAL);
+    bf_get_float64(r, &d, BF_RNDN);
+    bf_delete(r);
+    if (ret & BF_ST_MEM_ERROR)
+        return JS_ThrowOutOfMemory(ctx);
+    else
+        return __JS_NewFloat64(ctx, d);
+}
+
+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;
+    int ret;
+
+    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 (ret) {
+        if (a == &a_s)
+            bf_delete(a);
+        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);
+    return 0;
+}
+
+#else /* !CONFIG_BIGNUM */
+
+static no_inline __exception int js_unary_arith_slow(JSContext *ctx,
+                                                     JSValue *sp,
+                                                     OPCodeEnum op)
+{
+    JSValue op1;
+    double d;
+
+    op1 = sp[-1];
+    if (unlikely(JS_ToFloat64Free(ctx, &d, op1))) {
+        sp[-1] = JS_UNDEFINED;
+        return -1;
+    }
+    switch(op) {
+    case OP_inc:
+        d++;
+        break;
+    case OP_dec:
+        d--;
+        break;
+    case OP_plus:
+        break;
+    case OP_neg:
+        d = -d;
+        break;
+    default:
+        abort();
+    }
+    sp[-1] = JS_NewFloat64(ctx, d);
+    return 0;
+}
+
+/* specific case necessary for correct return value semantics */
+static __exception int js_post_inc_slow(JSContext *ctx,
+                                        JSValue *sp, OPCodeEnum op)
+{
+    JSValue op1;
+    double d, r;
+
+    op1 = sp[-1];
+    if (unlikely(JS_ToFloat64Free(ctx, &d, op1))) {
+        sp[-1] = JS_UNDEFINED;
+        return -1;
+    }
+    r = d + 2 * (op - OP_post_dec) - 1;
+    sp[0] = JS_NewFloat64(ctx, r);
+    sp[-1] = JS_NewFloat64(ctx, d);
+    return 0;
+}
+
+static no_inline __exception int js_binary_arith_slow(JSContext *ctx, JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2;
+    double d1, d2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    if (unlikely(JS_ToFloat64Free(ctx, &d1, op1))) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    if (unlikely(JS_ToFloat64Free(ctx, &d2, op2))) {
+        goto exception;
+    }
+    switch(op) {
+    case OP_sub:
+        r = d1 - d2;
+        break;
+    case OP_mul:
+        r = d1 * d2;
+        break;
+    case OP_div:
+        r = d1 / d2;
+        break;
+    case OP_mod:
+        r = fmod(d1, d2);
+        break;
+    case OP_pow:
+        r = js_pow(d1, d2);
+        break;
+    default:
+        abort();
+    }
+    sp[-2] = JS_NewFloat64(ctx, r);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_add_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    uint32_t tag1, tag2;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    tag1 = JS_VALUE_GET_TAG(op1);
+    tag2 = JS_VALUE_GET_TAG(op2);
+    if ((tag1 == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag1)) &&
+        (tag2 == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag2))) {
+        goto add_numbers;
+    } else {
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        tag1 = JS_VALUE_GET_TAG(op1);
+        tag2 = JS_VALUE_GET_TAG(op2);
+        if (tag1 == JS_TAG_STRING || tag2 == JS_TAG_STRING) {
+            sp[-2] = JS_ConcatString(ctx, op1, op2);
+            if (JS_IsException(sp[-2]))
+                goto exception;
+        } else {
+            double d1, d2;
+        add_numbers:
+            if (JS_ToFloat64Free(ctx, &d1, op1)) {
+                JS_FreeValue(ctx, op2);
+                goto exception;
+            }
+            if (JS_ToFloat64Free(ctx, &d2, op2))
+                goto exception;
+            sp[-2] = JS_NewFloat64(ctx, d1 + d2);
+        }
+    }
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_binary_logic_slow(JSContext *ctx,
+                                                      JSValue *sp,
+                                                      OPCodeEnum op)
+{
+    JSValue op1, op2;
+    uint32_t v1, v2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    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:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline int js_not_slow(JSContext *ctx, JSValue *sp)
+{
+    int32_t v1;
+
+    if (unlikely(JS_ToInt32Free(ctx, &v1, sp[-1]))) {
+        sp[-1] = JS_UNDEFINED;
+        return -1;
+    }
+    sp[-1] = JS_NewInt32(ctx, ~v1);
+    return 0;
+}
+
+static no_inline int js_relational_slow(JSContext *ctx, JSValue *sp,
+                                        OPCodeEnum op)
+{
+    JSValue op1, op2;
+    int res;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NUMBER);
+    if (JS_IsException(op1)) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NUMBER);
+    if (JS_IsException(op2)) {
+        JS_FreeValue(ctx, op1);
+        goto exception;
+    }
+    if (JS_VALUE_GET_TAG(op1) == JS_TAG_STRING &&
+        JS_VALUE_GET_TAG(op2) == JS_TAG_STRING) {
+        JSString *p1, *p2;
+        p1 = JS_VALUE_GET_STRING(op1);
+        p2 = JS_VALUE_GET_STRING(op2);
+        res = js_string_compare(ctx, p1, p2);
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        switch(op) {
+        case OP_lt:
+            res = (res < 0);
+            break;
+        case OP_lte:
+            res = (res <= 0);
+            break;
+        case OP_gt:
+            res = (res > 0);
+            break;
+        default:
+        case OP_gte:
+            res = (res >= 0);
+            break;
+        }
+    } else {
+        double d1, d2;
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+        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;
+        }
+    }
+    sp[-2] = JS_NewBool(ctx, res);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline __exception int js_eq_slow(JSContext *ctx, JSValue *sp,
+                                            BOOL is_neq)
+{
+    JSValue op1, op2;
+    int tag1, tag2;
+    BOOL res;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+ redo:
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    if (tag1 == tag2 ||
+        (tag1 == JS_TAG_INT && tag2 == JS_TAG_FLOAT64) ||
+        (tag2 == JS_TAG_INT && tag1 == JS_TAG_FLOAT64)) {
+        res = js_strict_eq(ctx, op1, op2);
+    } else if ((tag1 == JS_TAG_NULL && tag2 == JS_TAG_UNDEFINED) ||
+               (tag2 == JS_TAG_NULL && tag1 == JS_TAG_UNDEFINED)) {
+        res = TRUE;
+    } else if ((tag1 == JS_TAG_STRING && (tag2 == JS_TAG_INT ||
+                                   tag2 == JS_TAG_FLOAT64)) ||
+        (tag2 == JS_TAG_STRING && (tag1 == JS_TAG_INT ||
+                                   tag1 == JS_TAG_FLOAT64))) {
+        double d1;
+        double d2;
+        if (JS_ToFloat64Free(ctx, &d1, op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        if (JS_ToFloat64Free(ctx, &d2, op2))
+            goto exception;
+        res = (d1 == d2);
+    } else if (tag1 == JS_TAG_BOOL) {
+        op1 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op1));
+        goto redo;
+    } else if (tag2 == JS_TAG_BOOL) {
+        op2 = JS_NewInt32(ctx, JS_VALUE_GET_INT(op2));
+        goto redo;
+    } else if (tag1 == JS_TAG_OBJECT &&
+               (tag2 == JS_TAG_INT || tag2 == JS_TAG_FLOAT64 || tag2 == JS_TAG_STRING || tag2 == JS_TAG_SYMBOL)) {
+        op1 = JS_ToPrimitiveFree(ctx, op1, HINT_NONE);
+        if (JS_IsException(op1)) {
+            JS_FreeValue(ctx, op2);
+            goto exception;
+        }
+        goto redo;
+    } else if (tag2 == JS_TAG_OBJECT &&
+               (tag1 == JS_TAG_INT || tag1 == JS_TAG_FLOAT64 || tag1 == JS_TAG_STRING || tag1 == JS_TAG_SYMBOL)) {
+        op2 = JS_ToPrimitiveFree(ctx, op2, HINT_NONE);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            goto exception;
+        }
+        goto redo;
+    } else {
+        JS_FreeValue(ctx, op1);
+        JS_FreeValue(ctx, op2);
+        res = FALSE;
+    }
+    sp[-2] = JS_NewBool(ctx, res ^ is_neq);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static no_inline int js_shr_slow(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    uint32_t v1, v2, r;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    if (unlikely(JS_ToUint32Free(ctx, &v1, op1))) {
+        JS_FreeValue(ctx, op2);
+        goto exception;
+    }
+    if (unlikely(JS_ToUint32Free(ctx, &v2, op2)))
+        goto exception;
+    r = v1 >> (v2 & 0x1f);
+    sp[-2] = JS_NewUint32(ctx, r);
+    return 0;
+ exception:
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+#endif /* !CONFIG_BIGNUM */
+
+/* XXX: Should take JSValueConst arguments */
+static BOOL js_strict_eq2(JSContext *ctx, JSValue op1, JSValue op2,
+                          JSStrictEqModeEnum eq_mode)
+{
+    BOOL res;
+    int tag1, tag2;
+    double d1, d2;
+
+    tag1 = JS_VALUE_GET_NORM_TAG(op1);
+    tag2 = JS_VALUE_GET_NORM_TAG(op2);
+    switch(tag1) {
+    case JS_TAG_BOOL:
+        if (tag1 != tag2) {
+            res = FALSE;
+        } else {
+            res = JS_VALUE_GET_INT(op1) == JS_VALUE_GET_INT(op2);
+            goto done_no_free;
+        }
+        break;
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+        res = (tag1 == tag2);
+        break;
+    case JS_TAG_STRING:
+        {
+            JSString *p1, *p2;
+            if (tag1 != tag2) {
+                res = FALSE;
+            } else {
+                p1 = JS_VALUE_GET_STRING(op1);
+                p2 = JS_VALUE_GET_STRING(op2);
+                res = (js_string_compare(ctx, p1, p2) == 0);
+            }
+        }
+        break;
+    case JS_TAG_SYMBOL:
+        {
+            JSAtomStruct *p1, *p2;
+            if (tag1 != tag2) {
+                res = FALSE;
+            } else {
+                p1 = JS_VALUE_GET_PTR(op1);
+                p2 = JS_VALUE_GET_PTR(op2);
+                res = (p1 == p2);
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+        if (tag1 != tag2)
+            res = FALSE;
+        else
+            res = JS_VALUE_GET_OBJ(op1) == JS_VALUE_GET_OBJ(op2);
+        break;
+    case JS_TAG_INT:
+        d1 = JS_VALUE_GET_INT(op1);
+        if (tag2 == JS_TAG_INT) {
+            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
+        {
+            res = FALSE;
+        }
+        break;
+    case JS_TAG_FLOAT64:
+        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
+                   ) {
+            d2 = JS_VALUE_GET_INT(op2);
+        } else {
+            res = FALSE;
+            break;
+        }
+    number_test:
+        if (unlikely(eq_mode >= JS_EQ_SAME_VALUE)) {
+            JSFloat64Union u1, u2;
+            /* NaN is not always normalized, so this test is necessary */
+            if (isnan(d1) || isnan(d2)) {
+                res = isnan(d1) == isnan(d2);
+            } else if (eq_mode == JS_EQ_SAME_VALUE_ZERO) {
+                res = (d1 == d2); /* +0 == -0 */
+            } else {
+                u1.d = d1;
+                u2.d = d2;
+                res = (u1.u64 == u2.u64); /* +0 != -0 */
+            }
+        } else {
+            res = (d1 == d2); /* if NaN return false and +0 == -0 */
+        }
+        goto done_no_free;
+#ifdef CONFIG_BIGNUM
+    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 {
+                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);
+            if (a == &a_s)
+                bf_delete(a);
+            if (b == &b_s)
+                bf_delete(b);
+        }
+        break;
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p1, *p2;
+            const bf_t *a, *b;
+            if (tag1 != tag2) {
+                res = FALSE;
+                break;
+            }
+            p1 = JS_VALUE_GET_PTR(op1);
+            p2 = JS_VALUE_GET_PTR(op2);
+            a = &p1->num;
+            b = &p2->num;
+            if (unlikely(eq_mode >= JS_EQ_SAME_VALUE)) {
+                if (eq_mode == JS_EQ_SAME_VALUE_ZERO &&
+                           a->expn == BF_EXP_ZERO && b->expn == BF_EXP_ZERO) {
+                    res = TRUE;
+                } else {
+                    res = (bf_cmp_full(a, b) == 0);
+                }
+            } else {
+                res = bf_cmp_eq(a, b);
+            }
+        }
+        break;
+    case JS_TAG_BIG_DECIMAL:
+        {
+            JSBigDecimal *p1, *p2;
+            const bfdec_t *a, *b;
+            if (tag1 != tag2) {
+                res = FALSE;
+                break;
+            }
+            p1 = JS_VALUE_GET_PTR(op1);
+            p2 = JS_VALUE_GET_PTR(op2);
+            a = &p1->num;
+            b = &p2->num;
+            res = bfdec_cmp_eq(a, b);
+        }
+        break;
+#endif
+    default:
+        res = FALSE;
+        break;
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+ done_no_free:
+    return res;
+}
+
+static BOOL js_strict_eq(JSContext *ctx, JSValue op1, JSValue op2)
+{
+    return js_strict_eq2(ctx, op1, op2, JS_EQ_STRICT);
+}
+
+static BOOL js_same_value(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq2(ctx,
+                         JS_DupValue(ctx, op1), JS_DupValue(ctx, op2),
+                         JS_EQ_SAME_VALUE);
+}
+
+static BOOL js_same_value_zero(JSContext *ctx, JSValueConst op1, JSValueConst op2)
+{
+    return js_strict_eq2(ctx,
+                         JS_DupValue(ctx, op1), JS_DupValue(ctx, op2),
+                         JS_EQ_SAME_VALUE_ZERO);
+}
+
+static no_inline int js_strict_eq_slow(JSContext *ctx, JSValue *sp,
+                                       BOOL is_neq)
+{
+    BOOL res;
+    res = js_strict_eq(ctx, sp[-2], sp[-1]);
+    sp[-2] = JS_NewBool(ctx, res ^ is_neq);
+    return 0;
+}
+
+static __exception int js_operator_in(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    JSAtom atom;
+    int ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+
+    if (JS_VALUE_GET_TAG(op2) != JS_TAG_OBJECT) {
+        JS_ThrowTypeError(ctx, "invalid 'in' operand");
+        return -1;
+    }
+    atom = JS_ValueToAtom(ctx, op1);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return -1;
+    ret = JS_HasProperty(ctx, op2, atom);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return -1;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static __exception int js_has_unscopable(JSContext *ctx, JSValueConst obj,
+                                         JSAtom atom)
+{
+    JSValue arr, val;
+    int ret;
+
+    arr = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_unscopables);
+    if (JS_IsException(arr))
+        return -1;
+    ret = 0;
+    if (JS_IsObject(arr)) {
+        val = JS_GetProperty(ctx, arr, atom);
+        ret = JS_ToBoolFree(ctx, val);
+    }
+    JS_FreeValue(ctx, arr);
+    return ret;
+}
+
+static __exception int js_operator_instanceof(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    BOOL ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    ret = JS_IsInstanceOf(ctx, op1, op2);
+    if (ret < 0)
+        return ret;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static __exception int js_operator_typeof(JSContext *ctx, JSValue op1)
+{
+    JSAtom atom;
+    uint32_t tag;
+
+    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
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+        atom = JS_ATOM_number;
+        break;
+#endif
+    case JS_TAG_UNDEFINED:
+        atom = JS_ATOM_undefined;
+        break;
+    case JS_TAG_BOOL:
+        atom = JS_ATOM_boolean;
+        break;
+    case JS_TAG_STRING:
+        atom = JS_ATOM_string;
+        break;
+    case JS_TAG_OBJECT:
+        if (JS_IsFunction(ctx, op1))
+            atom = JS_ATOM_function;
+        else
+            goto obj_type;
+        break;
+    case JS_TAG_NULL:
+    obj_type:
+        atom = JS_ATOM_object;
+        break;
+    case JS_TAG_SYMBOL:
+        atom = JS_ATOM_symbol;
+        break;
+    default:
+        atom = JS_ATOM_unknown;
+        break;
+    }
+    return atom;
+}
+
+static __exception int js_operator_delete(JSContext *ctx, JSValue *sp)
+{
+    JSValue op1, op2;
+    JSAtom atom;
+    int ret;
+
+    op1 = sp[-2];
+    op2 = sp[-1];
+    atom = JS_ValueToAtom(ctx, op2);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return -1;
+    ret = JS_DeleteProperty(ctx, op1, atom, JS_PROP_THROW_STRICT);
+    JS_FreeAtom(ctx, atom);
+    if (unlikely(ret < 0))
+        return -1;
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    sp[-2] = JS_NewBool(ctx, ret);
+    return 0;
+}
+
+static JSValue js_throw_type_error(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    return JS_ThrowTypeError(ctx, "invalid property access");
+}
+
+/* XXX: not 100% compatible, but mozilla seems to use a similar
+   implementation to ensure that caller in non strict mode does not
+   throw (ES5 compatibility) */
+static JSValue js_function_proto_caller(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (!b || (b->js_mode & JS_MODE_STRICT) || !b->has_prototype) {
+        return js_throw_type_error(ctx, this_val, 0, NULL);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_function_proto_fileName(JSContext *ctx,
+                                          JSValueConst this_val)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (b && b->has_debug) {
+        return JS_AtomToString(ctx, b->debug.filename);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_function_proto_lineNumber(JSContext *ctx,
+                                            JSValueConst this_val)
+{
+    JSFunctionBytecode *b = JS_GetFunctionBytecode(this_val);
+    if (b && b->has_debug) {
+        return JS_NewInt32(ctx, b->debug.line_num);
+    }
+    return JS_UNDEFINED;
+}
+
+static int js_arguments_define_own_property(JSContext *ctx,
+                                            JSValueConst this_obj,
+                                            JSAtom prop, JSValueConst val,
+                                            JSValueConst getter, JSValueConst setter, int flags)
+{
+    JSObject *p;
+    uint32_t idx;
+    p = JS_VALUE_GET_OBJ(this_obj);
+    /* convert to normal array when redefining an existing numeric field */
+    if (p->fast_array && JS_AtomIsArrayIndex(ctx, &idx, prop) &&
+        idx < p->u.array.count) {
+        if (convert_fast_array_to_array(ctx, p))
+            return -1;
+    }
+    /* run the default define own property */
+    return JS_DefineProperty(ctx, this_obj, prop, val, getter, setter,
+                             flags | JS_PROP_NO_EXOTIC);
+}
+
+static const JSClassExoticMethods js_arguments_exotic_methods = {
+    .define_own_property = js_arguments_define_own_property,
+};
+
+static JSValue js_build_arguments(JSContext *ctx, int argc, JSValueConst *argv)
+{
+    JSValue val, *tab;
+    JSProperty *pr;
+    JSObject *p;
+    int i;
+
+    val = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                 JS_CLASS_ARGUMENTS);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_OBJ(val);
+
+    /* add the length field (cannot fail) */
+    pr = add_property(ctx, p, JS_ATOM_length,
+                      JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    pr->u.value = JS_NewInt32(ctx, argc);
+
+    /* initialize the fast array part */
+    tab = NULL;
+    if (argc > 0) {
+        tab = js_malloc(ctx, sizeof(tab[0]) * argc);
+        if (!tab) {
+            JS_FreeValue(ctx, val);
+            return JS_EXCEPTION;
+        }
+        for(i = 0; i < argc; i++) {
+            tab[i] = JS_DupValue(ctx, argv[i]);
+        }
+    }
+    p->u.array.u.values = tab;
+    p->u.array.count = argc;
+
+    JS_DefinePropertyValue(ctx, val, JS_ATOM_Symbol_iterator,
+                           JS_DupValue(ctx, ctx->array_proto_values),
+                           JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+    /* add callee property to throw a TypeError in strict mode */
+    JS_DefineProperty(ctx, val, JS_ATOM_callee, JS_UNDEFINED,
+                      ctx->throw_type_error, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET);
+    return val;
+}
+
+#define GLOBAL_VAR_OFFSET 0x40000000
+#define ARGUMENT_VAR_OFFSET 0x20000000
+
+/* legacy arguments object: add references to the function arguments */
+static JSValue js_build_mapped_arguments(JSContext *ctx, int argc,
+                                         JSValueConst *argv,
+                                         JSStackFrame *sf, int arg_count)
+{
+    JSValue val;
+    JSProperty *pr;
+    JSObject *p;
+    int i;
+
+    val = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                 JS_CLASS_MAPPED_ARGUMENTS);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_OBJ(val);
+
+    /* add the length field (cannot fail) */
+    pr = add_property(ctx, p, JS_ATOM_length,
+                      JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    pr->u.value = JS_NewInt32(ctx, argc);
+
+    for(i = 0; i < arg_count; i++) {
+        JSVarRef *var_ref;
+        var_ref = get_var_ref(ctx, sf, i, TRUE);
+        if (!var_ref)
+            goto fail;
+        pr = add_property(ctx, p, __JS_AtomFromUInt32(i), JS_PROP_C_W_E | JS_PROP_VARREF);
+        if (!pr) {
+            free_var_ref(ctx->rt, var_ref);
+            goto fail;
+        }
+        pr->u.var_ref = var_ref;
+    }
+
+    /* the arguments not mapped to the arguments of the function can
+       be normal properties */
+    for(i = arg_count; i < argc; i++) {
+        if (JS_DefinePropertyValueUint32(ctx, val, i,
+                                         JS_DupValue(ctx, argv[i]),
+                                         JS_PROP_C_W_E) < 0)
+            goto fail;
+    }
+
+    JS_DefinePropertyValue(ctx, val, JS_ATOM_Symbol_iterator,
+                           JS_DupValue(ctx, ctx->array_proto_values),
+                           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_PROP_CONFIGURABLE | JS_PROP_WRITABLE);
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_build_rest(JSContext *ctx, int first, int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int i, ret;
+
+    val = JS_NewArray(ctx);
+    if (JS_IsException(val))
+        return val;
+    for (i = first; i < argc; i++) {
+        ret = JS_DefinePropertyValueUint32(ctx, val, i - first,
+                                           JS_DupValue(ctx, argv[i]),
+                                           JS_PROP_C_W_E);
+        if (ret < 0) {
+            JS_FreeValue(ctx, val);
+            return JS_EXCEPTION;
+        }
+    }
+    return val;
+}
+
+static JSValue build_for_in_iterator(JSContext *ctx, JSValue obj)
+{
+    JSObject *p, *p1;
+    JSPropertyEnum *tab_atom;
+    int i;
+    JSValue enum_obj;
+    JSForInIterator *it;
+    uint32_t tag, tab_atom_count;
+
+    tag = JS_VALUE_GET_TAG(obj);
+    if (tag != JS_TAG_OBJECT && tag != JS_TAG_NULL && tag != JS_TAG_UNDEFINED) {
+        obj = JS_ToObjectFree(ctx, obj);
+    }
+
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    enum_obj = JS_NewObjectProtoClass(ctx, JS_NULL, JS_CLASS_FOR_IN_ITERATOR);
+    if (JS_IsException(enum_obj)) {
+        js_free(ctx, it);
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    it->is_array = FALSE;
+    it->obj = obj;
+    it->idx = 0;
+    p = JS_VALUE_GET_OBJ(enum_obj);
+    p->u.for_in_iterator = it;
+
+    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))
+            goto fail;
+        js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+        if (tab_atom_count != 0) {
+            goto slow_path;
+        }
+        p1 = p1->shape->proto;
+    }
+    if (p->fast_array) {
+        JSShape *sh;
+        JSShapeProperty *prs;
+        /* check that there are no enumerable normal fields */
+        sh = p->shape;
+        for(i = 0, prs = get_shape_prop(sh); i < sh->prop_count; i++, prs++) {
+            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;
+    } else {
+    normal_case:
+        if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
+                                   JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY))
+            goto fail;
+        for(i = 0; i < tab_atom_count; i++) {
+            JS_SetPropertyInternal(ctx, enum_obj, tab_atom[i].atom, JS_NULL, 0);
+        }
+        js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+    }
+    return enum_obj;
+
+ 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))
+            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;
+    }
+    return enum_obj;
+
+ fail:
+    JS_FreeValue(ctx, enum_obj);
+    return JS_EXCEPTION;
+}
+
+/* obj -> enum_obj */
+static __exception int js_for_in_start(JSContext *ctx, JSValue *sp)
+{
+    sp[-1] = build_for_in_iterator(ctx, sp[-1]);
+    if (JS_IsException(sp[-1]))
+        return -1;
+    return 0;
+}
+
+/* enum_obj -> enum_obj value done */
+static __exception int js_for_in_next(JSContext *ctx, JSValue *sp)
+{
+    JSValueConst enum_obj;
+    JSObject *p;
+    JSAtom prop;
+    JSForInIterator *it;
+    int ret;
+
+    enum_obj = sp[-1];
+    /* fail safe */
+    if (JS_VALUE_GET_TAG(enum_obj) != JS_TAG_OBJECT)
+        goto done;
+    p = JS_VALUE_GET_OBJ(enum_obj);
+    if (p->class_id != JS_CLASS_FOR_IN_ITERATOR)
+        goto done;
+    it = p->u.for_in_iterator;
+
+    for(;;) {
+        if (it->is_array) {
+            if (it->idx >= it->array_length)
+                goto done;
+            prop = __JS_AtomFromUInt32(it->idx);
+            it->idx++;
+        } else {
+            JSShape *sh = p->shape;
+            JSShapeProperty *prs;
+            if (it->idx >= sh->prop_count)
+                goto done;
+            prs = get_shape_prop(sh) + it->idx;
+            prop = prs->atom;
+            it->idx++;
+            if (prop == JS_ATOM_NULL || !(prs->flags & JS_PROP_ENUMERABLE))
+                continue;
+        }
+        /* check if the property was deleted */
+        ret = JS_HasProperty(ctx, it->obj, prop);
+        if (ret < 0)
+            return ret;
+        if (ret)
+            break;
+    }
+    /* return the property */
+    sp[0] = JS_AtomToValue(ctx, prop);
+    sp[1] = JS_FALSE;
+    return 0;
+ done:
+    /* return the end */
+    sp[0] = JS_UNDEFINED;
+    sp[1] = JS_TRUE;
+    return 0;
+}
+
+static JSValue JS_GetIterator2(JSContext *ctx, JSValueConst obj,
+                               JSValueConst method)
+{
+    JSValue enum_obj;
+
+    enum_obj = JS_Call(ctx, method, obj, 0, NULL);
+    if (JS_IsException(enum_obj))
+        return enum_obj;
+    if (!JS_IsObject(enum_obj)) {
+        JS_FreeValue(ctx, enum_obj);
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+    return enum_obj;
+}
+
+static JSValue JS_GetIterator(JSContext *ctx, JSValueConst obj, BOOL is_async)
+{
+    JSValue method, ret, sync_iter;
+
+    if (is_async) {
+        method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_asyncIterator);
+        if (JS_IsException(method))
+            return method;
+        if (JS_IsUndefined(method) || JS_IsNull(method)) {
+            method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+            if (JS_IsException(method))
+                return method;
+            sync_iter = JS_GetIterator2(ctx, obj, method);
+            JS_FreeValue(ctx, method);
+            if (JS_IsException(sync_iter))
+                return sync_iter;
+            ret = JS_CreateAsyncFromSyncIterator(ctx, sync_iter);
+            JS_FreeValue(ctx, sync_iter);
+            return ret;
+        }
+    } else {
+        method = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+        if (JS_IsException(method))
+            return method;
+    }
+    if (!JS_IsFunction(ctx, method)) {
+        JS_FreeValue(ctx, method);
+        return JS_ThrowTypeError(ctx, "value is not iterable");
+    }
+    ret = JS_GetIterator2(ctx, obj, method);
+    JS_FreeValue(ctx, method);
+    return ret;
+}
+
+/* return *pdone = 2 if the iterator object is not parsed */
+static JSValue JS_IteratorNext2(JSContext *ctx, JSValueConst enum_obj,
+                                JSValueConst method,
+                                int argc, JSValueConst *argv, int *pdone)
+{
+    JSValue obj;
+
+    /* fast path for the built-in iterators (avoid creating the
+       intermediate result object) */
+    if (JS_IsObject(method)) {
+        JSObject *p = JS_VALUE_GET_OBJ(method);
+        if (p->class_id == JS_CLASS_C_FUNCTION &&
+            p->u.cfunc.cproto == JS_CFUNC_iterator_next) {
+            JSCFunctionType func;
+            JSValueConst args[1];
+
+            /* in case the function expects one argument */
+            if (argc == 0) {
+                args[0] = JS_UNDEFINED;
+                argv = args;
+            }
+            func = p->u.cfunc.c_function;
+            return func.iterator_next(ctx, enum_obj, argc, argv,
+                                      pdone, p->u.cfunc.magic);
+        }
+    }
+    obj = JS_Call(ctx, method, enum_obj, argc, argv);
+    if (JS_IsException(obj))
+        goto fail;
+    if (!JS_IsObject(obj)) {
+        JS_FreeValue(ctx, obj);
+        JS_ThrowTypeError(ctx, "iterator must return an object");
+        goto fail;
+    }
+    *pdone = 2;
+    return obj;
+ fail:
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_IteratorNext(JSContext *ctx, JSValueConst enum_obj,
+                               JSValueConst method,
+                               int argc, JSValueConst *argv, BOOL *pdone)
+{
+    JSValue obj, value, done_val;
+    int done;
+
+    obj = JS_IteratorNext2(ctx, enum_obj, method, argc, argv, &done);
+    if (JS_IsException(obj))
+        goto fail;
+    if (done != 2) {
+        *pdone = done;
+        return obj;
+    } else {
+        done_val = JS_GetProperty(ctx, obj, JS_ATOM_done);
+        if (JS_IsException(done_val))
+            goto fail;
+        *pdone = JS_ToBoolFree(ctx, done_val);
+        value = JS_UNDEFINED;
+        if (!*pdone) {
+            value = JS_GetProperty(ctx, obj, JS_ATOM_value);
+        }
+        JS_FreeValue(ctx, obj);
+        return value;
+    }
+ fail:
+    JS_FreeValue(ctx, obj);
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+/* return < 0 in case of exception */
+static int JS_IteratorClose(JSContext *ctx, JSValueConst enum_obj,
+                            BOOL is_exception_pending)
+{
+    JSValue method, ret, ex_obj;
+    int res;
+
+    if (is_exception_pending) {
+        ex_obj = ctx->current_exception;
+        ctx->current_exception = JS_NULL;
+        res = -1;
+    } else {
+        ex_obj = JS_UNDEFINED;
+        res = 0;
+    }
+    method = JS_GetProperty(ctx, enum_obj, JS_ATOM_return);
+    if (JS_IsException(method)) {
+        res = -1;
+        goto done;
+    }
+    if (JS_IsUndefined(method) || JS_IsNull(method)) {
+        goto done;
+    }
+    ret = JS_CallFree(ctx, method, enum_obj, 0, NULL);
+    if (!is_exception_pending) {
+        if (JS_IsException(ret)) {
+            res = -1;
+        } else if (!JS_IsObject(ret)) {
+            JS_ThrowTypeErrorNotAnObject(ctx);
+            res = -1;
+        }
+    }
+    JS_FreeValue(ctx, ret);
+ done:
+    if (is_exception_pending) {
+        JS_Throw(ctx, ex_obj);
+    }
+    return res;
+}
+
+/* obj -> enum_rec (3 slots) */
+static __exception int js_for_of_start(JSContext *ctx, JSValue *sp,
+                                       BOOL is_async)
+{
+    JSValue op1, obj, method;
+    op1 = sp[-1];
+    obj = JS_GetIterator(ctx, op1, is_async);
+    if (JS_IsException(obj))
+        return -1;
+    JS_FreeValue(ctx, op1);
+    sp[-1] = obj;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_next);
+    if (JS_IsException(method))
+        return -1;
+    sp[0] = method;
+    return 0;
+}
+
+/* enum_rec -> enum_rec value done */
+static __exception int js_for_of_next(JSContext *ctx, JSValue *sp, int offset)
+{
+    JSValue value = JS_UNDEFINED;
+    int done = 1;
+
+    if (likely(!JS_IsUndefined(sp[offset]))) {
+        value = JS_IteratorNext(ctx, sp[offset], sp[offset + 1], 0, NULL, &done);
+        if (JS_IsException(value))
+            done = -1;
+        if (done) {
+            /* value is JS_UNDEFINED or JS_EXCEPTION */
+            /* replace the iteration object with undefined */
+            JS_FreeValue(ctx, sp[offset]);
+            sp[offset] = JS_UNDEFINED;
+            if (done < 0)
+                return -1;
+        }
+    }
+    sp[0] = value;
+    sp[1] = JS_NewBool(ctx, done);
+    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)
+{
+    JSValue done_val, value;
+    BOOL done;
+    done_val = JS_GetProperty(ctx, obj, JS_ATOM_done);
+    if (JS_IsException(done_val))
+        goto fail;
+    done = JS_ToBoolFree(ctx, done_val);
+    value = JS_GetProperty(ctx, obj, JS_ATOM_value);
+    if (JS_IsException(value))
+        goto fail;
+    *pdone = done;
+    return value;
+ fail:
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static __exception int js_iterator_get_value_done(JSContext *ctx, JSValue *sp)
+{
+    JSValue obj, value;
+    BOOL done;
+    obj = sp[-1];
+    if (!JS_IsObject(obj)) {
+        JS_ThrowTypeError(ctx, "iterator must return an object");
+        return -1;
+    }
+    value = JS_IteratorGetCompleteValue(ctx, obj, &done);
+    if (JS_IsException(value))
+        return -1;
+    JS_FreeValue(ctx, obj);
+    sp[-1] = value;
+    sp[0] = JS_NewBool(ctx, done);
+    return 0;
+}
+
+static JSValue js_create_iterator_result(JSContext *ctx,
+                                         JSValue val,
+                                         BOOL done)
+{
+    JSValue obj;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, val);
+        return obj;
+    }
+    if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_value,
+                               val, JS_PROP_C_W_E) < 0) {
+        goto fail;
+    }
+    if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_done,
+                               JS_NewBool(ctx, done), JS_PROP_C_W_E) < 0) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static JSValue js_array_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv,
+                                      BOOL *pdone, int magic);
+
+static JSValue js_create_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic);
+
+static BOOL js_is_fast_array(JSContext *ctx, JSValueConst obj)
+{
+    /* Try and handle fast arrays explicitly */
+    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) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+/* Access an Array's internal JSValue array if available */
+static BOOL js_get_fast_array(JSContext *ctx, JSValueConst obj,
+                              JSValue **arrpp, uint32_t *countp)
+{
+    /* Try and handle fast arrays explicitly */
+    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) {
+            *countp = p->u.array.count;
+            *arrpp = p->u.array.u.values;
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+static __exception int js_append_enumerate(JSContext *ctx, JSValue *sp)
+{
+    JSValue iterator, enumobj, method, value;
+    int pos, is_array_iterator;
+    JSValue *arrp;
+    uint32_t i, count32;
+
+    if (JS_VALUE_GET_TAG(sp[-2]) != JS_TAG_INT) {
+        JS_ThrowInternalError(ctx, "invalid index for append");
+        return -1;
+    }
+
+    pos = JS_VALUE_GET_INT(sp[-2]);
+
+    /* XXX: further optimisations:
+       - use ctx->array_proto_values?
+       - check if array_iterator_prototype next method is built-in and
+         avoid constructing actual iterator object?
+       - build this into js_for_of_start and use in all `for (x of o)` loops
+     */
+    iterator = JS_GetProperty(ctx, sp[-1], JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iterator))
+        return -1;
+    is_array_iterator = JS_IsCFunction(ctx, iterator,
+                                       (JSCFunction *)js_create_array_iterator,
+                                       JS_ITERATOR_KIND_VALUE);
+    JS_FreeValue(ctx, iterator);
+
+    enumobj = JS_GetIterator(ctx, sp[-1], FALSE);
+    if (JS_IsException(enumobj))
+        return -1;
+    method = JS_GetProperty(ctx, enumobj, JS_ATOM_next);
+    if (JS_IsException(method)) {
+        JS_FreeValue(ctx, enumobj);
+        return -1;
+    }
+    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]))
+            goto exception;
+        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 {
+        for (;;) {
+            BOOL done;
+            value = JS_IteratorNext(ctx, enumobj, method, 0, NULL, &done);
+            if (JS_IsException(value))
+                goto exception;
+            if (done) {
+                /* value is JS_UNDEFINED */
+                break;
+            }
+            if (JS_DefinePropertyValueUint32(ctx, sp[-3], pos++, value, JS_PROP_C_W_E) < 0)
+                goto exception;
+        }
+    }
+    sp[-2] = JS_NewInt32(ctx, pos);
+    JS_FreeValue(ctx, enumobj);
+    JS_FreeValue(ctx, method);
+    return 0;
+
+exception:
+    JS_IteratorClose(ctx, enumobj, TRUE);
+    JS_FreeValue(ctx, enumobj);
+    JS_FreeValue(ctx, method);
+    return -1;
+}
+
+static __exception int JS_CopyDataProperties(JSContext *ctx,
+                                             JSValueConst target,
+                                             JSValueConst source,
+                                             JSValueConst excluded,
+                                             BOOL setprop)
+{
+    JSPropertyEnum *tab_atom;
+    JSValue val;
+    uint32_t i, tab_atom_count;
+    JSObject *p;
+    JSObject *pexcl = NULL;
+    int ret = 0, flags;
+
+    if (JS_VALUE_GET_TAG(source) != JS_TAG_OBJECT)
+        return 0;
+
+    if (JS_VALUE_GET_TAG(excluded) == JS_TAG_OBJECT)
+        pexcl = JS_VALUE_GET_OBJ(excluded);
+
+    p = JS_VALUE_GET_OBJ(source);
+    if (JS_GetOwnPropertyNamesInternal(ctx, &tab_atom, &tab_atom_count, p,
+                               JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK |
+                               JS_GPN_ENUM_ONLY))
+        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;
+                continue;
+            }
+        }
+        ret = -1;
+        val = JS_GetProperty(ctx, source, tab_atom[i].atom);
+        if (JS_IsException(val))
+            break;
+        if (setprop)
+            ret = JS_SetProperty(ctx, target, tab_atom[i].atom, val);
+        else
+            ret = JS_DefinePropertyValue(ctx, target, tab_atom[i].atom, val, flags);
+        if (ret < 0)
+            break;
+        ret = 0;
+    }
+    js_free_prop_enum(ctx, tab_atom, tab_atom_count);
+    return ret;
+}
+
+/* only valid inside C functions */
+static JSValueConst JS_GetActiveFunction(JSContext *ctx)
+{
+    return ctx->current_stack_frame->cur_func;
+}
+
+static JSVarRef *get_var_ref(JSContext *ctx, JSStackFrame *sf,
+                             int var_idx, BOOL is_arg)
+{
+    JSVarRef *var_ref;
+    struct list_head *el;
+
+    list_for_each(el, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, header.link);
+        if (var_ref->var_idx == var_idx && var_ref->is_arg == is_arg) {
+            var_ref->header.ref_count++;
+            return var_ref;
+        }
+    }
+    /* create a new one */
+    var_ref = js_malloc(ctx, sizeof(JSVarRef));
+    if (!var_ref)
+        return NULL;
+    var_ref->header.ref_count = 1;
+    var_ref->is_detached = FALSE;
+    var_ref->is_arg = is_arg;
+    var_ref->var_idx = var_idx;
+    list_add_tail(&var_ref->header.link, &sf->var_ref_list);
+    if (is_arg)
+        var_ref->pvalue = &sf->arg_buf[var_idx];
+    else
+        var_ref->pvalue = &sf->var_buf[var_idx];
+    var_ref->value = JS_UNDEFINED;
+    return var_ref;
+}
+
+static JSValue js_closure2(JSContext *ctx, JSValue func_obj,
+                           JSFunctionBytecode *b,
+                           JSVarRef **cur_var_refs,
+                           JSStackFrame *sf)
+{
+    JSObject *p;
+    JSVarRef **var_refs;
+    int i;
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->u.func.function_bytecode = b;
+    p->u.func.home_object = NULL;
+    p->u.func.var_refs = NULL;
+    if (b->closure_var_count) {
+        var_refs = js_mallocz(ctx, sizeof(var_refs[0]) * b->closure_var_count);
+        if (!var_refs)
+            goto fail;
+        p->u.func.var_refs = var_refs;
+        for(i = 0; i < b->closure_var_count; i++) {
+            JSClosureVar *cv = &b->closure_var[i];
+            JSVarRef *var_ref;
+            if (cv->is_local) {
+                /* reuse the existing variable reference if it already exists */
+                var_ref = get_var_ref(ctx, sf, cv->var_idx, cv->is_arg);
+                if (!var_ref)
+                    goto fail;
+            } else {
+                var_ref = cur_var_refs[cv->var_idx];
+                var_ref->header.ref_count++;
+            }
+            var_refs[i] = var_ref;
+        }
+    }
+    return func_obj;
+ fail:
+    /* bfunc is freed when func_obj is freed */
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+static int js_instantiate_prototype(JSContext *ctx, JSObject *p, JSAtom atom, void *opaque)
+{
+    JSValue obj, this_val;
+    int ret;
+
+    this_val = JS_MKPTR(JS_TAG_OBJECT, p);
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj))
+        return -1;
+    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;
+}
+
+static JSValue js_closure(JSContext *ctx, JSValue bfunc,
+                          JSVarRef **cur_var_refs,
+                          JSStackFrame *sf)
+{
+    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]);
+    if (JS_IsException(func_obj)) {
+        JS_FreeValue(ctx, bfunc);
+        return JS_EXCEPTION;
+    }
+    func_obj = js_closure2(ctx, func_obj, b, cur_var_refs, sf);
+    if (JS_IsException(func_obj)) {
+        /* bfunc has been freed */
+        goto fail;
+    }
+    name_atom = b->func_name;
+    if (name_atom == JS_ATOM_NULL)
+        name_atom = JS_ATOM_empty_string;
+    js_function_set_properties(ctx, func_obj, name_atom,
+                               b->defined_arg_count);
+
+    if (b->func_kind & JS_FUNC_GENERATOR) {
+        JSValue proto;
+        int proto_class_id;
+        /* generators have a prototype field which is used as
+           prototype for the generator object */
+        if (b->func_kind == JS_FUNC_ASYNC_GENERATOR)
+            proto_class_id = JS_CLASS_ASYNC_GENERATOR;
+        else
+            proto_class_id = JS_CLASS_GENERATOR;
+        proto = JS_NewObjectProto(ctx, ctx->class_proto[proto_class_id]);
+        if (JS_IsException(proto))
+            goto fail;
+        JS_DefinePropertyValue(ctx, func_obj, JS_ATOM_prototype, proto,
+                               JS_PROP_WRITABLE);
+    } else if (b->has_prototype) {
+        /* add the 'prototype' property: delay instantiation to avoid
+           creating cycles for every javascript function. The prototype
+           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_PROP_WRITABLE);
+    }
+    return func_obj;
+ fail:
+    /* bfunc is freed when func_obj is freed */
+    JS_FreeValue(ctx, func_obj);
+    return JS_EXCEPTION;
+}
+
+#define JS_DEFINE_CLASS_HAS_HERITAGE     (1 << 0)
+
+static int js_op_define_class(JSContext *ctx, JSValue *sp,
+                              JSAtom class_name, int class_flags,
+                              JSVarRef **cur_var_refs,
+                              JSStackFrame *sf, BOOL is_computed_name)
+{
+    JSValue bfunc, parent_class, proto = JS_UNDEFINED;
+    JSValue ctor = JS_UNDEFINED, parent_proto = JS_UNDEFINED;
+    JSFunctionBytecode *b;
+
+    parent_class = sp[-2];
+    bfunc = sp[-1];
+
+    if (class_flags & JS_DEFINE_CLASS_HAS_HERITAGE) {
+        if (JS_IsNull(parent_class)) {
+            parent_proto = JS_NULL;
+            parent_class = JS_DupValue(ctx, ctx->function_proto);
+        } else {
+            if (!JS_IsConstructor(ctx, parent_class)) {
+                JS_ThrowTypeError(ctx, "parent class must be constructor");
+                goto fail;
+            }
+            parent_proto = JS_GetProperty(ctx, parent_class, JS_ATOM_prototype);
+            if (JS_IsException(parent_proto))
+                goto fail;
+            if (!JS_IsNull(parent_proto) && !JS_IsObject(parent_proto)) {
+                JS_ThrowTypeError(ctx, "parent prototype must be an object or null");
+                goto fail;
+            }
+        }
+    } else {
+        /* parent_class is JS_UNDEFINED in this case */
+        parent_proto = JS_DupValue(ctx, ctx->class_proto[JS_CLASS_OBJECT]);
+        parent_class = JS_DupValue(ctx, ctx->function_proto);
+    }
+    proto = JS_NewObjectProto(ctx, parent_proto);
+    if (JS_IsException(proto))
+        goto fail;
+
+    b = JS_VALUE_GET_PTR(bfunc);
+    assert(b->func_kind == JS_FUNC_NORMAL);
+    ctor = JS_NewObjectProtoClass(ctx, parent_class,
+                                  JS_CLASS_BYTECODE_FUNCTION);
+    if (JS_IsException(ctor))
+        goto fail;
+    ctor = js_closure2(ctx, ctor, b, cur_var_refs, sf);
+    bfunc = JS_UNDEFINED;
+    if (JS_IsException(ctor))
+        goto fail;
+    js_method_set_home_object(ctx, ctor, proto);
+    JS_SetConstructorBit(ctx, ctor, TRUE);
+
+    JS_DefinePropertyValue(ctx, ctor, JS_ATOM_length,
+                           JS_NewInt32(ctx, b->defined_arg_count),
+                           JS_PROP_CONFIGURABLE);
+
+    if (is_computed_name) {
+        if (JS_DefineObjectNameComputed(ctx, ctor, sp[-3],
+                                        JS_PROP_CONFIGURABLE) < 0)
+            goto fail;
+    } else {
+        if (JS_DefineObjectName(ctx, ctor, class_name, JS_PROP_CONFIGURABLE) < 0)
+            goto fail;
+    }
+
+    /* 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),
+                               JS_PROP_CONFIGURABLE |
+                               JS_PROP_WRITABLE | JS_PROP_THROW) < 0)
+        goto fail;
+    /* set the prototype property */
+    if (JS_DefinePropertyValue(ctx, ctor, JS_ATOM_prototype,
+                               JS_DupValue(ctx, proto), JS_PROP_THROW) < 0)
+        goto fail;
+    set_cycle_flag(ctx, ctor);
+    set_cycle_flag(ctx, proto);
+
+    JS_FreeValue(ctx, parent_proto);
+    JS_FreeValue(ctx, parent_class);
+
+    sp[-2] = ctor;
+    sp[-1] = proto;
+    return 0;
+ fail:
+    JS_FreeValue(ctx, parent_class);
+    JS_FreeValue(ctx, parent_proto);
+    JS_FreeValue(ctx, bfunc);
+    JS_FreeValue(ctx, proto);
+    JS_FreeValue(ctx, ctor);
+    sp[-2] = JS_UNDEFINED;
+    sp[-1] = JS_UNDEFINED;
+    return -1;
+}
+
+static void close_var_refs(JSRuntime *rt, JSStackFrame *sf)
+{
+    struct list_head *el, *el1;
+    JSVarRef *var_ref;
+    int var_idx;
+
+    list_for_each_safe(el, el1, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, header.link);
+        var_idx = var_ref->var_idx;
+        if (var_ref->is_arg)
+            var_ref->value = JS_DupValueRT(rt, sf->arg_buf[var_idx]);
+        else
+            var_ref->value = JS_DupValueRT(rt, sf->var_buf[var_idx]);
+        var_ref->pvalue = &var_ref->value;
+        /* the reference is no longer to a local variable */
+        var_ref->is_detached = TRUE;
+        add_gc_object(rt, &var_ref->header, JS_GC_OBJ_TYPE_VAR_REF);
+    }
+}
+
+static void close_lexical_var(JSContext *ctx, JSStackFrame *sf, int idx, int is_arg)
+{
+    struct list_head *el, *el1;
+    JSVarRef *var_ref;
+    int var_idx = idx;
+
+    list_for_each_safe(el, el1, &sf->var_ref_list) {
+        var_ref = list_entry(el, JSVarRef, header.link);
+        if (var_idx == var_ref->var_idx && var_ref->is_arg == is_arg) {
+            var_ref->value = JS_DupValue(ctx, sf->var_buf[var_idx]);
+            var_ref->pvalue = &var_ref->value;
+            list_del(&var_ref->header.link);
+            /* the reference is no longer to a local variable */
+            var_ref->is_detached = TRUE;
+            add_gc_object(ctx->rt, &var_ref->header, JS_GC_OBJ_TYPE_VAR_REF);
+        }
+    }
+}
+
+#define JS_CALL_FLAG_COPY_ARGV   (1 << 1)
+#define JS_CALL_FLAG_GENERATOR   (1 << 2)
+
+static JSValue js_call_c_function(JSContext *ctx, JSValueConst func_obj,
+                                  JSValueConst this_obj,
+                                  int argc, JSValueConst *argv, int flags)
+{
+    JSCFunctionType func;
+    JSObject *p;
+    JSStackFrame sf_s, *sf = &sf_s, *prev_sf;
+    JSValue ret_val;
+    JSValueConst *arg_buf;
+    int arg_count, i;
+    JSCFunctionEnum cproto;
+
+    p = JS_VALUE_GET_OBJ(func_obj);
+    cproto = p->u.cfunc.cproto;
+    arg_count = p->u.cfunc.length;
+
+    /* better to always check stack overflow */
+    if (js_check_stack_overflow(ctx, sizeof(arg_buf[0]) * arg_count))
+        return JS_ThrowStackOverflow(ctx);
+
+    prev_sf = ctx->current_stack_frame;
+    sf->prev_frame = prev_sf;
+    ctx->current_stack_frame = sf;
+#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;
+    else
+        sf->js_mode = 0;
+#else
+    sf->js_mode = 0;
+#endif
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    sf->cur_func = func_obj;
+#else
+    sf->cur_func = (JSValue)func_obj;
+#endif
+    sf->arg_count = argc;
+    arg_buf = argv;
+
+    if (unlikely(argc < arg_count)) {
+        /* ensure that at least argc_count arguments are readable */
+        arg_buf = alloca(sizeof(arg_buf[0]) * arg_count);
+        for(i = 0; i < argc; i++)
+            arg_buf[i] = argv[i];
+        for(i = argc; i < arg_count; i++)
+            arg_buf[i] = JS_UNDEFINED;
+        sf->arg_count = arg_count;
+    }
+    sf->arg_buf = (JSValue*)arg_buf;
+
+    func = p->u.cfunc.c_function;
+    switch(cproto) {
+    case JS_CFUNC_constructor:
+    case JS_CFUNC_constructor_or_func:
+        if (!(flags & JS_CALL_FLAG_CONSTRUCTOR)) {
+            if (cproto == JS_CFUNC_constructor) {
+            not_a_constructor:
+                ret_val = JS_ThrowTypeError(ctx, "must be called with new");
+                break;
+            } else {
+                this_obj = JS_UNDEFINED;
+            }
+        }
+        /* here this_obj is new_target */
+        /* fall thru */
+    case JS_CFUNC_generic:
+        ret_val = func.generic(ctx, this_obj, argc, arg_buf);
+        break;
+    case JS_CFUNC_constructor_magic:
+    case JS_CFUNC_constructor_or_func_magic:
+        if (!(flags & JS_CALL_FLAG_CONSTRUCTOR)) {
+            if (cproto == JS_CFUNC_constructor_magic) {
+                goto not_a_constructor;
+            } else {
+                this_obj = JS_UNDEFINED;
+            }
+        }
+        /* fall thru */
+    case JS_CFUNC_generic_magic:
+        ret_val = func.generic_magic(ctx, this_obj, argc, arg_buf,
+                                     p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_getter:
+        ret_val = func.getter(ctx, this_obj);
+        break;
+    case JS_CFUNC_setter:
+        ret_val = func.setter(ctx, this_obj, arg_buf[0]);
+        break;
+    case JS_CFUNC_getter_magic:
+        ret_val = func.getter_magic(ctx, this_obj, p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_setter_magic:
+        ret_val = func.setter_magic(ctx, this_obj, arg_buf[0], p->u.cfunc.magic);
+        break;
+    case JS_CFUNC_f_f:
+        {
+            double d1;
+
+            if (unlikely(JS_ToFloat64(ctx, &d1, arg_buf[0]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            ret_val = JS_NewFloat64(ctx, func.f_f(d1));
+        }
+        break;
+    case JS_CFUNC_f_f_f:
+        {
+            double d1, d2;
+
+            if (unlikely(JS_ToFloat64(ctx, &d1, arg_buf[0]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            if (unlikely(JS_ToFloat64(ctx, &d2, arg_buf[1]))) {
+                ret_val = JS_EXCEPTION;
+                break;
+            }
+            ret_val = JS_NewFloat64(ctx, func.f_f_f(d1, d2));
+        }
+        break;
+    case JS_CFUNC_iterator_next:
+        {
+            int done;
+            ret_val = func.iterator_next(ctx, this_obj, argc, arg_buf,
+                                         &done, p->u.cfunc.magic);
+            if (!JS_IsException(ret_val) && done != 2) {
+                ret_val = js_create_iterator_result(ctx, ret_val, done);
+            }
+        }
+        break;
+    default:
+        abort();
+    }
+
+    ctx->current_stack_frame = sf->prev_frame;
+    return ret_val;
+}
+
+static JSValue js_call_bound_function(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags)
+{
+    JSObject *p;
+    JSBoundFunction *bf;
+    JSValueConst *arg_buf, new_target;
+    int arg_count, i;
+
+    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))
+        return JS_ThrowStackOverflow(ctx);
+    arg_buf = alloca(sizeof(JSValue) * arg_count);
+    for(i = 0; i < bf->argc; i++) {
+        arg_buf[i] = bf->argv[i];
+    }
+    for(i = 0; i < argc; i++) {
+        arg_buf[bf->argc + i] = argv[i];
+    }
+    if (flags & JS_CALL_FLAG_CONSTRUCTOR) {
+        new_target = this_obj;
+        if (js_same_value(ctx, func_obj, new_target))
+            new_target = bf->func_obj;
+        return JS_CallConstructor2(ctx, bf->func_obj, new_target,
+                                   arg_count, arg_buf);
+    } else {
+        return JS_Call(ctx, bf->func_obj, bf->this_val,
+                       arg_count, arg_buf);
+    }
+}
+
+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,
+    OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS,
+    OP_SPECIAL_OBJECT_THIS_FUNC,
+    OP_SPECIAL_OBJECT_NEW_TARGET,
+    OP_SPECIAL_OBJECT_HOME_OBJECT,
+    OP_SPECIAL_OBJECT_VAR_OBJECT,
+    OP_SPECIAL_OBJECT_IMPORT_META,
+} OPSpecialObjectEnum;
+
+#define FUNC_RET_AWAIT      0
+#define FUNC_RET_YIELD      1
+#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,
+                               JSValueConst this_obj, JSValueConst new_target,
+                               int argc, JSValue *argv, int flags)
+{
+    JSObject *p;
+    JSFunctionBytecode *b;
+    JSStackFrame sf_s, *sf = &sf_s;
+    const uint8_t *pc;
+    int opcode, arg_allocated_size, i;
+    JSValue *local_buf, *stack_buf, *var_buf, *arg_buf, *sp, ret_val, *pval;
+    JSVarRef **var_refs;
+    size_t alloca_size;
+
+#if !DIRECT_DISPATCH
+#define SWITCH(pc)      switch (opcode = *pc++)
+#define CASE(op)        case op
+#define DEFAULT         default
+#define BREAK           break
+#else
+    static const void * const dispatch_table[256] = {
+#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
+#define def(id, size, n_pop, n_push, f) && case_default,
+#endif
+#include "quickjs-opcode.h"
+        [ OP_COUNT ... 255 ] = &&case_default
+    };
+#define SWITCH(pc)      goto *dispatch_table[opcode = *pc++];
+#define CASE(op)        case_ ## op
+#define DEFAULT         case_default
+#define BREAK           SWITCH(pc)
+#endif
+
+    if (js_poll_interrupts(ctx))
+        return JS_EXCEPTION;
+    if (unlikely(JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT)) {
+        if (flags & JS_CALL_FLAG_GENERATOR) {
+            JSAsyncFunctionState *s = JS_VALUE_GET_PTR(func_obj);
+            /* func_obj get contains a pointer to JSFuncAsyncState */
+            /* the stack frame is already allocated */
+            sf = &s->frame;
+            p = JS_VALUE_GET_OBJ(sf->cur_func);
+            b = p->u.func.function_bytecode;
+            var_refs = p->u.func.var_refs;
+            local_buf = arg_buf = sf->arg_buf;
+            var_buf = sf->var_buf;
+            stack_buf = sf->var_buf + b->var_count;
+            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;
+            if (s->throw_flag)
+                goto exception;
+            else
+                goto restart;
+        } else {
+            goto not_a_function;
+        }
+    }
+    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;
+        if (!call_func) {
+        not_a_function:
+            return JS_ThrowTypeError(ctx, "not a function");
+        }
+        return call_func(ctx, func_obj, this_obj, argc,
+                         (JSValueConst *)argv, flags);
+    }
+    b = p->u.func.function_bytecode;
+
+    if (unlikely(argc < b->arg_count || (flags & JS_CALL_FLAG_COPY_ARGV))) {
+        arg_allocated_size = b->arg_count;
+    } else {
+        arg_allocated_size = 0;
+    }
+
+    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);
+
+    sf->js_mode = b->js_mode;
+    arg_buf = argv;
+    sf->arg_count = argc;
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    sf->cur_func = func_obj;
+#else
+    sf->cur_func = (JSValue)func_obj;
+#endif
+    init_list_head(&sf->var_ref_list);
+    var_refs = p->u.func.var_refs;
+
+    local_buf = alloca(alloca_size);
+    if (unlikely(arg_allocated_size)) {
+        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]);
+        for(; i < b->arg_count; i++)
+            arg_buf[i] = JS_UNDEFINED;
+        sf->arg_count = b->arg_count;
+    }
+    var_buf = local_buf + arg_allocated_size;
+    sf->var_buf = var_buf;
+    sf->arg_buf = arg_buf;
+
+    for(i = 0; i < b->var_count; i++)
+        var_buf[i] = JS_UNDEFINED;
+
+    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;
+ restart:
+    for(;;) {
+        int call_argc;
+        JSValue *call_argv;
+
+        SWITCH(pc) {
+        CASE(OP_push_i32):
+            *sp++ = JS_NewInt32(ctx, get_u32(pc));
+            pc += 4;
+            BREAK;
+        CASE(OP_push_const):
+            *sp++ = JS_DupValue(ctx, b->cpool[get_u32(pc)]);
+            pc += 4;
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_push_minus1):
+        CASE(OP_push_0):
+        CASE(OP_push_1):
+        CASE(OP_push_2):
+        CASE(OP_push_3):
+        CASE(OP_push_4):
+        CASE(OP_push_5):
+        CASE(OP_push_6):
+        CASE(OP_push_7):
+            *sp++ = JS_NewInt32(ctx, opcode - OP_push_0);
+            BREAK;
+        CASE(OP_push_i8):
+            *sp++ = JS_NewInt32(ctx, get_i8(pc));
+            pc += 1;
+            BREAK;
+        CASE(OP_push_i16):
+            *sp++ = JS_NewInt32(ctx, get_i16(pc));
+            pc += 2;
+            BREAK;
+        CASE(OP_push_const8):
+            *sp++ = JS_DupValue(ctx, b->cpool[*pc++]);
+            BREAK;
+        CASE(OP_fclosure8):
+            *sp++ = js_closure(ctx, JS_DupValue(ctx, b->cpool[*pc++]), var_refs, sf);
+            if (unlikely(JS_IsException(sp[-1])))
+                goto exception;
+            BREAK;
+        CASE(OP_push_empty_string):
+            *sp++ = JS_AtomToString(ctx, JS_ATOM_empty_string);
+            BREAK;
+        CASE(OP_get_length):
+            {
+                JSValue val;
+
+                val = JS_GetProperty(ctx, sp[-1], JS_ATOM_length);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+#endif
+        CASE(OP_push_atom_value):
+            *sp++ = JS_AtomToValue(ctx, get_u32(pc));
+            pc += 4;
+            BREAK;
+        CASE(OP_undefined):
+            *sp++ = JS_UNDEFINED;
+            BREAK;
+        CASE(OP_null):
+            *sp++ = JS_NULL;
+            BREAK;
+        CASE(OP_push_this):
+            /* OP_push_this is only called at the start of a function */
+            {
+                JSValue val;
+                if (!(b->js_mode & JS_MODE_STRICT)) {
+                    uint32_t tag = JS_VALUE_GET_TAG(this_obj);
+                    if (likely(tag == JS_TAG_OBJECT))
+                        goto normal_this;
+                    if (tag == JS_TAG_NULL || tag == JS_TAG_UNDEFINED) {
+                        val = JS_DupValue(ctx, ctx->global_obj);
+                    } else {
+                        val = JS_ToObject(ctx, this_obj);
+                        if (JS_IsException(val))
+                            goto exception;
+                    }
+                } else {
+                normal_this:
+                    val = JS_DupValue(ctx, this_obj);
+                }
+                *sp++ = val;
+            }
+            BREAK;
+        CASE(OP_push_false):
+            *sp++ = JS_FALSE;
+            BREAK;
+        CASE(OP_push_true):
+            *sp++ = JS_TRUE;
+            BREAK;
+        CASE(OP_object):
+            *sp++ = JS_NewObject(ctx);
+            if (unlikely(JS_IsException(sp[-1])))
+                goto exception;
+            BREAK;
+        CASE(OP_special_object):
+            {
+                int arg = *pc++;
+                switch(arg) {
+                case OP_SPECIAL_OBJECT_ARGUMENTS:
+                    *sp++ = js_build_arguments(ctx, argc, (JSValueConst *)argv);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_MAPPED_ARGUMENTS:
+                    *sp++ = js_build_mapped_arguments(ctx, argc, (JSValueConst *)argv,
+                                                      sf, min_int(argc, b->arg_count));
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_THIS_FUNC:
+                    *sp++ = JS_DupValue(ctx, sf->cur_func);
+                    break;
+                case OP_SPECIAL_OBJECT_NEW_TARGET:
+                    *sp++ = JS_DupValue(ctx, new_target);
+                    break;
+                case OP_SPECIAL_OBJECT_HOME_OBJECT:
+                    {
+                        JSObject *p1;
+                        p1 = p->u.func.home_object;
+                        if (unlikely(!p1))
+                            *sp++ = JS_UNDEFINED;
+                        else
+                            *sp++ = JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, p1));
+                    }
+                    break;
+                case OP_SPECIAL_OBJECT_VAR_OBJECT:
+                    *sp++ = JS_NewObjectProto(ctx, JS_NULL);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                case OP_SPECIAL_OBJECT_IMPORT_META:
+                    *sp++ = js_import_meta(ctx);
+                    if (unlikely(JS_IsException(sp[-1])))
+                        goto exception;
+                    break;
+                default:
+                    abort();
+                }
+            }
+            BREAK;
+        CASE(OP_rest):
+            {
+                int first = get_u16(pc);
+                pc += 2;
+                *sp++ = js_build_rest(ctx, first, argc, (JSValueConst *)argv);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_drop):
+            JS_FreeValue(ctx, sp[-1]);
+            sp--;
+            BREAK;
+        CASE(OP_nip):
+            JS_FreeValue(ctx, sp[-2]);
+            sp[-2] = sp[-1];
+            sp--;
+            BREAK;
+        CASE(OP_nip1): /* a b c -> b c */
+            JS_FreeValue(ctx, sp[-3]);
+            sp[-3] = sp[-2];
+            sp[-2] = sp[-1];
+            sp--;
+            BREAK;
+        CASE(OP_dup):
+            sp[0] = JS_DupValue(ctx, sp[-1]);
+            sp++;
+            BREAK;
+        CASE(OP_dup2): /* a b -> a b a b */
+            sp[0] = JS_DupValue(ctx, sp[-2]);
+            sp[1] = JS_DupValue(ctx, sp[-1]);
+            sp += 2;
+            BREAK;
+        CASE(OP_dup3): /* a b c -> a b c a b c */
+            sp[0] = JS_DupValue(ctx, sp[-3]);
+            sp[1] = JS_DupValue(ctx, sp[-2]);
+            sp[2] = JS_DupValue(ctx, sp[-1]);
+            sp += 3;
+            BREAK;
+        CASE(OP_dup1): /* a b -> a a b */
+            sp[0] = sp[-1];
+            sp[-1] = JS_DupValue(ctx, sp[-2]);
+            sp++;
+            BREAK;
+        CASE(OP_insert2): /* obj a -> a obj a (dup_x1) */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_insert3): /* obj prop a -> a obj prop a (dup_x2) */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = sp[-3];
+            sp[-3] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_insert4): /* this obj prop a -> a this obj prop a */
+            sp[0] = sp[-1];
+            sp[-1] = sp[-2];
+            sp[-2] = sp[-3];
+            sp[-3] = sp[-4];
+            sp[-4] = JS_DupValue(ctx, sp[0]);
+            sp++;
+            BREAK;
+        CASE(OP_perm3): /* obj a b -> a obj b (213) */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot3l): /* x a b -> a b x (231) */
+            {
+                JSValue tmp;
+                tmp = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot4l): /* x a b c -> a b c x */
+            {
+                JSValue tmp;
+                tmp = sp[-4];
+                sp[-4] = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot5l): /* x a b c d -> a b c d x */
+            {
+                JSValue tmp;
+                tmp = sp[-5];
+                sp[-5] = sp[-4];
+                sp[-4] = sp[-3];
+                sp[-3] = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_rot3r): /* a b x -> x a b (312) */
+            {
+                JSValue tmp;
+                tmp = sp[-1];
+                sp[-1] = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = tmp;
+            }
+            BREAK;
+        CASE(OP_perm4): /* obj prop a b -> a obj prop b */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = sp[-4];
+                sp[-4] = tmp;
+            }
+            BREAK;
+        CASE(OP_perm5): /* this obj prop a b -> a this obj prop b */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = sp[-4];
+                sp[-4] = sp[-5];
+                sp[-5] = tmp;
+            }
+            BREAK;
+        CASE(OP_swap): /* a b -> b a */
+            {
+                JSValue tmp;
+                tmp = sp[-2];
+                sp[-2] = sp[-1];
+                sp[-1] = tmp;
+            }
+            BREAK;
+        CASE(OP_swap2): /* a b c d -> c d a b */
+            {
+                JSValue tmp1, tmp2;
+                tmp1 = sp[-4];
+                tmp2 = sp[-3];
+                sp[-4] = sp[-2];
+                sp[-3] = sp[-1];
+                sp[-2] = tmp1;
+                sp[-1] = tmp2;
+            }
+            BREAK;
+
+        CASE(OP_fclosure):
+            {
+                JSValue bfunc = JS_DupValue(ctx, b->cpool[get_u32(pc)]);
+                pc += 4;
+                *sp++ = js_closure(ctx, bfunc, var_refs, sf);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+            }
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_call0):
+        CASE(OP_call1):
+        CASE(OP_call2):
+        CASE(OP_call3):
+            call_argc = opcode - OP_call0;
+            goto has_call_argc;
+#endif
+        CASE(OP_call):
+        CASE(OP_tail_call):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                goto has_call_argc;
+            has_call_argc:
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallInternal(ctx, call_argv[-1], JS_UNDEFINED,
+                                          JS_UNDEFINED, call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                if (opcode == OP_tail_call)
+                    goto done;
+                for(i = -1; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 1;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_call_constructor):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallConstructorInternal(ctx, call_argv[-2],
+                                                     call_argv[-1],
+                                                     call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                for(i = -2; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_call_method):
+        CASE(OP_tail_call_method):
+            {
+                call_argc = get_u16(pc);
+                pc += 2;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                ret_val = JS_CallInternal(ctx, call_argv[-1], call_argv[-2],
+                                          JS_UNDEFINED, call_argc, call_argv, 0);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                if (opcode == OP_tail_call_method)
+                    goto done;
+                for(i = -2; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_array_from):
+            {
+                int i, ret;
+
+                call_argc = get_u16(pc);
+                pc += 2;
+                ret_val = JS_NewArray(ctx);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                call_argv = sp - call_argc;
+                for(i = 0; i < call_argc; i++) {
+                    ret = JS_DefinePropertyValue(ctx, ret_val, __JS_AtomFromUInt32(i), call_argv[i],
+                                                 JS_PROP_C_W_E | JS_PROP_THROW);
+                    call_argv[i] = JS_UNDEFINED;
+                    if (ret < 0) {
+                        JS_FreeValue(ctx, ret_val);
+                        goto exception;
+                    }
+                }
+                sp -= call_argc;
+                *sp++ = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_apply):
+            {
+                int magic;
+                magic = get_u16(pc);
+                pc += 2;
+
+                ret_val = js_function_apply(ctx, sp[-3], 2, (JSValueConst *)&sp[-2], magic);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 3;
+                *sp++ = ret_val;
+            }
+            BREAK;
+        CASE(OP_return):
+            ret_val = *--sp;
+            goto done;
+        CASE(OP_return_undef):
+            ret_val = JS_UNDEFINED;
+            goto done;
+
+        CASE(OP_check_ctor_return):
+            /* 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");
+                    goto exception;
+                }
+                sp[0] = JS_TRUE;
+            } else {
+                sp[0] = JS_FALSE;
+            }
+            sp++;
+            BREAK;
+        CASE(OP_check_ctor):
+            if (JS_IsUndefined(new_target)) {
+                JS_ThrowTypeError(ctx, "class constructors must be invoked with 'new'");
+                goto exception;
+            }
+            BREAK;
+        CASE(OP_check_brand):
+            if (JS_CheckBrand(ctx, sp[-2], sp[-1]) < 0)
+                goto exception;
+            BREAK;
+        CASE(OP_add_brand):
+            if (JS_AddBrand(ctx, sp[-2], sp[-1]) < 0)
+                goto exception;
+            JS_FreeValue(ctx, sp[-2]);
+            JS_FreeValue(ctx, sp[-1]);
+            sp -= 2;
+            BREAK;
+
+        CASE(OP_throw):
+            JS_Throw(ctx, *--sp);
+            goto exception;
+
+        CASE(OP_throw_var):
+#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
+            {
+                JSAtom atom;
+                int type;
+                atom = get_u32(pc);
+                type = pc[4];
+                pc += 5;
+                if (type == JS_THROW_VAR_RO)
+                    JS_ThrowTypeErrorReadOnly(ctx, JS_PROP_THROW, atom);
+                else
+                if (type == JS_THROW_VAR_REDECL)
+                    JS_ThrowSyntaxErrorVarRedeclaration(ctx, atom);
+                else
+                if (type == JS_THROW_VAR_UNINITIALIZED)
+                    JS_ThrowReferenceErrorUninitialized(ctx, atom);
+                else
+                if (type == JS_THROW_VAR_DELETE_SUPER)
+                    JS_ThrowReferenceError(ctx, "unsupported reference to 'super'");
+                else
+                    JS_ThrowInternalError(ctx, "invalid throw var type %d", type);
+            }
+            goto exception;
+
+        CASE(OP_eval):
+            {
+                JSValueConst obj;
+                int scope_idx;
+                call_argc = get_u16(pc);
+                scope_idx = get_u16(pc + 2) - 1;
+                pc += 4;
+                call_argv = sp - call_argc;
+                sf->cur_pc = pc;
+                if (js_same_value(ctx, call_argv[-1], ctx->eval_obj)) {
+                    if (call_argc >= 1)
+                        obj = call_argv[0];
+                    else
+                        obj = JS_UNDEFINED;
+                    ret_val = JS_EvalObject(ctx, JS_UNDEFINED, obj,
+                                            JS_EVAL_TYPE_DIRECT, scope_idx);
+                } else {
+                    ret_val = JS_CallInternal(ctx, call_argv[-1], JS_UNDEFINED,
+                                              JS_UNDEFINED, call_argc, call_argv, 0);
+                }
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                for(i = -1; i < call_argc; i++)
+                    JS_FreeValue(ctx, call_argv[i]);
+                sp -= call_argc + 1;
+                *sp++ = ret_val;
+            }
+            BREAK;
+            /* could merge with OP_apply */
+        CASE(OP_apply_eval):
+            {
+                int scope_idx;
+                uint32_t len;
+                JSValue *tab;
+                JSValueConst obj;
+
+                scope_idx = get_u16(pc) - 1;
+                pc += 2;
+                tab = build_arg_list(ctx, &len, sp[-1]);
+                if (!tab)
+                    goto exception;
+                if (js_same_value(ctx, sp[-2], ctx->eval_obj)) {
+                    if (len >= 1)
+                        obj = tab[0];
+                    else
+                        obj = JS_UNDEFINED;
+                    ret_val = JS_EvalObject(ctx, JS_UNDEFINED, obj,
+                                            JS_EVAL_TYPE_DIRECT, scope_idx);
+                } else {
+                    ret_val = JS_Call(ctx, sp[-2], JS_UNDEFINED, len,
+                                      (JSValueConst *)tab);
+                }
+                free_arg_list(ctx, tab, len);
+                if (unlikely(JS_IsException(ret_val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 2;
+                *sp++ = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_regexp):
+            {
+                sp[-2] = js_regexp_constructor_internal(ctx, JS_UNDEFINED,
+                                                        sp[-2], sp[-1]);
+                sp--;
+            }
+            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]));
+                if (JS_IsException(proto))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = proto;
+            }
+            BREAK;
+
+        CASE(OP_import):
+            {
+                JSValue val;
+                val = js_dynamic_import(ctx, sp[-1]);
+                if (JS_IsException(val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+
+        CASE(OP_check_var):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_CheckGlobalVar(ctx, atom);
+                if (ret < 0)
+                    goto exception;
+                *sp++ = JS_NewBool(ctx, ret);
+            }
+            BREAK;
+
+        CASE(OP_get_var_undef):
+        CASE(OP_get_var):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetGlobalVar(ctx, atom, opcode - OP_get_var_undef);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_put_var):
+        CASE(OP_put_var_init):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_SetGlobalVar(ctx, atom, sp[-1], opcode - OP_put_var);
+                sp--;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_var_strict):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                /* sp[-2] is JS_TRUE or JS_FALSE */
+                if (unlikely(!JS_VALUE_GET_INT(sp[-2]))) {
+                    JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                    goto exception;
+                }
+                ret = JS_SetGlobalVar(ctx, atom, sp[-1], 2);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_check_define_var):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_CheckDefineGlobalVar(ctx, atom, flags))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_define_var):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_DefineGlobalVar(ctx, atom, flags))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_define_func):
+            {
+                JSAtom atom;
+                int flags;
+                atom = get_u32(pc);
+                flags = pc[4];
+                pc += 5;
+                if (JS_DefineGlobalFunction(ctx, atom, sp[-1], flags))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp--;
+            }
+            BREAK;
+
+        CASE(OP_get_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                sp[0] = JS_DupValue(ctx, var_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+        CASE(OP_get_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                sp[0] = JS_DupValue(ctx, arg_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &arg_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_arg):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &arg_buf[idx], JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+
+#if SHORT_OPCODES
+        CASE(OP_get_loc8): *sp++ = JS_DupValue(ctx, var_buf[*pc++]); BREAK;
+        CASE(OP_put_loc8): set_value(ctx, &var_buf[*pc++], *--sp); BREAK;
+        CASE(OP_set_loc8): set_value(ctx, &var_buf[*pc++], JS_DupValue(ctx, sp[-1])); BREAK;
+
+        CASE(OP_get_loc0): *sp++ = JS_DupValue(ctx, var_buf[0]); BREAK;
+        CASE(OP_get_loc1): *sp++ = JS_DupValue(ctx, var_buf[1]); BREAK;
+        CASE(OP_get_loc2): *sp++ = JS_DupValue(ctx, var_buf[2]); BREAK;
+        CASE(OP_get_loc3): *sp++ = JS_DupValue(ctx, var_buf[3]); BREAK;
+        CASE(OP_put_loc0): set_value(ctx, &var_buf[0], *--sp); BREAK;
+        CASE(OP_put_loc1): set_value(ctx, &var_buf[1], *--sp); BREAK;
+        CASE(OP_put_loc2): set_value(ctx, &var_buf[2], *--sp); BREAK;
+        CASE(OP_put_loc3): set_value(ctx, &var_buf[3], *--sp); BREAK;
+        CASE(OP_set_loc0): set_value(ctx, &var_buf[0], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc1): set_value(ctx, &var_buf[1], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc2): set_value(ctx, &var_buf[2], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_loc3): set_value(ctx, &var_buf[3], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_get_arg0): *sp++ = JS_DupValue(ctx, arg_buf[0]); BREAK;
+        CASE(OP_get_arg1): *sp++ = JS_DupValue(ctx, arg_buf[1]); BREAK;
+        CASE(OP_get_arg2): *sp++ = JS_DupValue(ctx, arg_buf[2]); BREAK;
+        CASE(OP_get_arg3): *sp++ = JS_DupValue(ctx, arg_buf[3]); BREAK;
+        CASE(OP_put_arg0): set_value(ctx, &arg_buf[0], *--sp); BREAK;
+        CASE(OP_put_arg1): set_value(ctx, &arg_buf[1], *--sp); BREAK;
+        CASE(OP_put_arg2): set_value(ctx, &arg_buf[2], *--sp); BREAK;
+        CASE(OP_put_arg3): set_value(ctx, &arg_buf[3], *--sp); BREAK;
+        CASE(OP_set_arg0): set_value(ctx, &arg_buf[0], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg1): set_value(ctx, &arg_buf[1], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg2): set_value(ctx, &arg_buf[2], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_arg3): set_value(ctx, &arg_buf[3], JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_get_var_ref0): *sp++ = JS_DupValue(ctx, *var_refs[0]->pvalue); BREAK;
+        CASE(OP_get_var_ref1): *sp++ = JS_DupValue(ctx, *var_refs[1]->pvalue); BREAK;
+        CASE(OP_get_var_ref2): *sp++ = JS_DupValue(ctx, *var_refs[2]->pvalue); BREAK;
+        CASE(OP_get_var_ref3): *sp++ = JS_DupValue(ctx, *var_refs[3]->pvalue); BREAK;
+        CASE(OP_put_var_ref0): set_value(ctx, var_refs[0]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref1): set_value(ctx, var_refs[1]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref2): set_value(ctx, var_refs[2]->pvalue, *--sp); BREAK;
+        CASE(OP_put_var_ref3): set_value(ctx, var_refs[3]->pvalue, *--sp); BREAK;
+        CASE(OP_set_var_ref0): set_value(ctx, var_refs[0]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref1): set_value(ctx, var_refs[1]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref2): set_value(ctx, var_refs[2]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+        CASE(OP_set_var_ref3): set_value(ctx, var_refs[3]->pvalue, JS_DupValue(ctx, sp[-1])); BREAK;
+#endif
+
+        CASE(OP_get_var_ref):
+            {
+                int idx;
+                JSValue val;
+                idx = get_u16(pc);
+                pc += 2;
+                val = *var_refs[idx]->pvalue;
+                sp[0] = JS_DupValue(ctx, val);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_var_ref):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_var_ref):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, var_refs[idx]->pvalue, JS_DupValue(ctx, sp[-1]));
+            }
+            BREAK;
+        CASE(OP_get_var_ref_check):
+            {
+                int idx;
+                JSValue val;
+                idx = get_u16(pc);
+                pc += 2;
+                val = *var_refs[idx]->pvalue;
+                if (unlikely(JS_IsUninitialized(val))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+                    goto exception;
+                }
+                sp[0] = JS_DupValue(ctx, val);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_var_ref_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(*var_refs[idx]->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+                    goto exception;
+                }
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_put_var_ref_check_init):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(!JS_IsUninitialized(*var_refs[idx]->pvalue))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+                    goto exception;
+                }
+                set_value(ctx, var_refs[idx]->pvalue, sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_loc_uninitialized):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                set_value(ctx, &var_buf[idx], JS_UNINITIALIZED);
+            }
+            BREAK;
+        CASE(OP_get_loc_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+                    goto exception;
+                }
+                sp[0] = JS_DupValue(ctx, var_buf[idx]);
+                sp++;
+            }
+            BREAK;
+        CASE(OP_put_loc_check):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceErrorUninitialized(ctx, JS_ATOM_NULL);
+                    goto exception;
+                }
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_put_loc_check_init):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                if (unlikely(!JS_IsUninitialized(var_buf[idx]))) {
+                    JS_ThrowReferenceError(ctx, "'this' can be initialized only once");
+                    goto exception;
+                }
+                set_value(ctx, &var_buf[idx], sp[-1]);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_close_loc):
+            {
+                int idx;
+                idx = get_u16(pc);
+                pc += 2;
+                close_lexical_var(ctx, sf, idx, FALSE);
+            }
+            BREAK;
+
+        CASE(OP_make_loc_ref):
+        CASE(OP_make_arg_ref):
+        CASE(OP_make_var_ref_ref):
+            {
+                JSVarRef *var_ref;
+                JSProperty *pr;
+                JSAtom atom;
+                int idx;
+                atom = get_u32(pc);
+                idx = get_u16(pc + 4);
+                pc += 6;
+                *sp++ = JS_NewObjectProto(ctx, JS_NULL);
+                if (unlikely(JS_IsException(sp[-1])))
+                    goto exception;
+                if (opcode == OP_make_var_ref_ref) {
+                    var_ref = var_refs[idx];
+                    var_ref->header.ref_count++;
+                } else {
+                    var_ref = get_var_ref(ctx, sf, idx, opcode == OP_make_arg_ref);
+                    if (!var_ref)
+                        goto exception;
+                }
+                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);
+                    goto exception;
+                }
+                pr->u.var_ref = var_ref;
+                *sp++ = JS_AtomToValue(ctx, atom);
+            }
+            BREAK;
+        CASE(OP_make_var_ref):
+            {
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                if (JS_GetGlobalVarRef(ctx, atom, sp))
+                    goto exception;
+                sp += 2;
+            }
+            BREAK;
+
+        CASE(OP_goto):
+            pc += (int32_t)get_u32(pc);
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_goto16):
+            pc += (int16_t)get_u16(pc);
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+        CASE(OP_goto8):
+            pc += (int8_t)pc[0];
+            if (unlikely(js_poll_interrupts(ctx)))
+                goto exception;
+            BREAK;
+#endif
+        CASE(OP_if_true):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 4;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (res) {
+                    pc += (int32_t)get_u32(pc - 4) - 4;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_if_false):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 4;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (!res) {
+                    pc += (int32_t)get_u32(pc - 4) - 4;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+#if SHORT_OPCODES
+        CASE(OP_if_true8):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 1;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (res) {
+                    pc += (int8_t)pc[-1] - 1;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_if_false8):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                pc += 1;
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1);
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp--;
+                if (!res) {
+                    pc += (int8_t)pc[-1] - 1;
+                }
+                if (unlikely(js_poll_interrupts(ctx)))
+                    goto exception;
+            }
+            BREAK;
+#endif
+        CASE(OP_catch):
+            {
+                int32_t diff;
+                diff = get_u32(pc);
+                sp[0] = JS_NewCatchOffset(ctx, pc + diff - b->byte_code_buf);
+                sp++;
+                pc += 4;
+            }
+            BREAK;
+        CASE(OP_gosub):
+            {
+                int32_t diff;
+                diff = get_u32(pc);
+                /* XXX: should have a different tag to avoid security flaw */
+                sp[0] = JS_NewInt32(ctx, pc + 4 - b->byte_code_buf);
+                sp++;
+                pc += diff;
+            }
+            BREAK;
+        CASE(OP_ret):
+            {
+                JSValue op1;
+                uint32_t pos;
+                op1 = sp[-1];
+                if (unlikely(JS_VALUE_GET_TAG(op1) != JS_TAG_INT))
+                    goto ret_fail;
+                pos = JS_VALUE_GET_INT(op1);
+                if (unlikely(pos >= b->byte_code_len)) {
+                ret_fail:
+                    JS_ThrowInternalError(ctx, "invalid ret value");
+                    goto exception;
+                }
+                sp--;
+                pc = b->byte_code_buf + pos;
+            }
+            BREAK;
+
+        CASE(OP_for_in_start):
+            if (js_for_in_start(ctx, sp))
+                goto exception;
+            BREAK;
+        CASE(OP_for_in_next):
+            if (js_for_in_next(ctx, sp))
+                goto exception;
+            sp += 2;
+            BREAK;
+        CASE(OP_for_of_start):
+            if (js_for_of_start(ctx, sp, FALSE))
+                goto exception;
+            sp += 1;
+            *sp++ = JS_NewCatchOffset(ctx, 0);
+            BREAK;
+        CASE(OP_for_of_next):
+            {
+                int offset = -3 - pc[0];
+                pc += 1;
+                if (js_for_of_next(ctx, sp, offset))
+                    goto exception;
+                sp += 2;
+            }
+            BREAK;
+        CASE(OP_for_await_of_start):
+            if (js_for_of_start(ctx, sp, TRUE))
+                goto exception;
+            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_close):
+            sp--; /* drop the catch offset to avoid getting caught by exception */
+            JS_FreeValue(ctx, sp[-1]); /* drop the next method */
+            sp--;
+            if (!JS_IsUndefined(sp[-1])) {
+                if (JS_IteratorClose(ctx, sp[-1], FALSE))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+            }
+            sp--;
+            BREAK;
+        CASE(OP_iterator_close_return):
+            {
+                JSValue ret_val;
+                /* iter_obj next catch_offset ... ret_val ->
+                   ret_eval iter_obj next catch_offset */
+                ret_val = *--sp;
+                while (sp > stack_buf &&
+                       JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_CATCH_OFFSET) {
+                    JS_FreeValue(ctx, *--sp);
+                }
+                if (unlikely(sp < stack_buf + 3)) {
+                    JS_ThrowInternalError(ctx, "iterator_close_return");
+                    JS_FreeValue(ctx, ret_val);
+                    goto exception;
+                }
+                sp[0] = sp[-1];
+                sp[-1] = sp[-2];
+                sp[-2] = sp[-3];
+                sp[-3] = ret_val;
+                sp++;
+            }
+            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):
+            /* stack: iter_obj next catch_offset val */
+            {
+                JSValue ret;
+                ret = JS_Call(ctx, sp[-3], sp[-4],
+                              1, (JSValueConst *)(sp - 1));
+                if (JS_IsException(ret))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret;
+            }
+            BREAK;
+
+        CASE(OP_async_iterator_get):
+            /* 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);
+                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 (JS_IsException(ret))
+                        goto exception;
+                    JS_FreeValue(ctx, sp[-1]);
+                    sp[-1] = ret;
+                    ret_flag = FALSE;
+                }
+                sp[0] = JS_NewBool(ctx, ret_flag);
+                sp += 1;
+            }
+            BREAK;
+
+        CASE(OP_lnot):
+            {
+                int res;
+                JSValue op1;
+
+                op1 = sp[-1];
+                if ((uint32_t)JS_VALUE_GET_TAG(op1) <= JS_TAG_UNDEFINED) {
+                    res = JS_VALUE_GET_INT(op1) != 0;
+                } else {
+                    res = JS_ToBoolFree(ctx, op1);
+                }
+                sp[-1] = JS_NewBool(ctx, !res);
+            }
+            BREAK;
+
+        CASE(OP_get_field):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetProperty(ctx, sp[-1], atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = val;
+            }
+            BREAK;
+
+        CASE(OP_get_field2):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                val = JS_GetProperty(ctx, sp[-1], atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_put_field):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_SetPropertyInternal(ctx, sp[-2], atom, sp[-1],
+                                             JS_PROP_THROW_STRICT);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_private_symbol):
+            {
+                JSAtom atom;
+                JSValue val;
+
+                atom = get_u32(pc);
+                pc += 4;
+                val = JS_NewSymbolFromAtom(ctx, atom, JS_ATOM_TYPE_PRIVATE);
+                if (JS_IsException(val))
+                    goto exception;
+                *sp++ = val;
+            }
+            BREAK;
+
+        CASE(OP_get_private_field):
+            {
+                JSValue val;
+
+                val = JS_GetPrivateField(ctx, sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp[-2] = val;
+                sp--;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_private_field):
+            {
+                int ret;
+                ret = JS_SetPrivateField(ctx, sp[-3], sp[-1], sp[-2]);
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-1]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_private_field):
+            {
+                int ret;
+                ret = JS_DefinePrivateField(ctx, sp[-3], sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 2;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_field):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DefinePropertyValue(ctx, sp[-2], atom, sp[-1],
+                                             JS_PROP_C_W_E | JS_PROP_THROW);
+                sp--;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_set_name):
+            {
+                int ret;
+                JSAtom atom;
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DefineObjectName(ctx, sp[-1], atom, JS_PROP_CONFIGURABLE);
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_set_name_computed):
+            {
+                int ret;
+                ret = JS_DefineObjectNameComputed(ctx, sp[-1], sp[-2], JS_PROP_CONFIGURABLE);
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+        CASE(OP_set_proto):
+            {
+                JSValue proto;
+                proto = sp[-1];
+                if (JS_IsObject(proto) || JS_IsNull(proto)) {
+                    if (JS_SetPrototypeInternal(ctx, sp[-2], proto, TRUE) < 0)
+                        goto exception;
+                }
+                JS_FreeValue(ctx, proto);
+                sp--;
+            }
+            BREAK;
+        CASE(OP_set_home_object):
+            js_method_set_home_object(ctx, sp[-1], sp[-2]);
+            BREAK;
+        CASE(OP_define_method):
+        CASE(OP_define_method_computed):
+            {
+                JSValue getter, setter, value;
+                JSValueConst obj;
+                JSAtom atom;
+                int flags, ret, op_flags;
+                BOOL is_computed;
+#define OP_DEFINE_METHOD_METHOD 0
+#define OP_DEFINE_METHOD_GETTER 1
+#define OP_DEFINE_METHOD_SETTER 2
+#define OP_DEFINE_METHOD_ENUMERABLE 4
+
+                is_computed = (opcode == OP_define_method_computed);
+                if (is_computed) {
+                    atom = JS_ValueToAtom(ctx, sp[-2]);
+                    if (unlikely(atom == JS_ATOM_NULL))
+                        goto exception;
+                    opcode += OP_define_method - OP_define_method_computed;
+                } else {
+                    atom = get_u32(pc);
+                    pc += 4;
+                }
+                op_flags = *pc++;
+
+                obj = sp[-2 - is_computed];
+                flags = JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE |
+                    JS_PROP_HAS_ENUMERABLE | JS_PROP_THROW;
+                if (op_flags & OP_DEFINE_METHOD_ENUMERABLE)
+                    flags |= JS_PROP_ENUMERABLE;
+                op_flags &= 3;
+                value = JS_UNDEFINED;
+                getter = JS_UNDEFINED;
+                setter = JS_UNDEFINED;
+                if (op_flags == OP_DEFINE_METHOD_METHOD) {
+                    value = sp[-1];
+                    flags |= JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE | JS_PROP_WRITABLE;
+                } else if (op_flags == OP_DEFINE_METHOD_GETTER) {
+                    getter = sp[-1];
+                    flags |= JS_PROP_HAS_GET;
+                } else {
+                    setter = sp[-1];
+                    flags |= JS_PROP_HAS_SET;
+                }
+                ret = js_method_set_properties(ctx, sp[-1], atom, flags, obj);
+                if (ret >= 0) {
+                    ret = JS_DefineProperty(ctx, obj, atom, value,
+                                            getter, setter, flags);
+                }
+                JS_FreeValue(ctx, sp[-1]);
+                if (is_computed) {
+                    JS_FreeAtom(ctx, atom);
+                    JS_FreeValue(ctx, sp[-2]);
+                }
+                sp -= 1 + is_computed;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_class):
+        CASE(OP_define_class_computed):
+            {
+                int class_flags;
+                JSAtom atom;
+
+                atom = get_u32(pc);
+                class_flags = pc[4];
+                pc += 5;
+                if (js_op_define_class(ctx, sp, atom, class_flags,
+                                       var_refs, sf,
+                                       (opcode == OP_define_class_computed)) < 0)
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_array_el):
+            {
+                JSValue val;
+
+                val = JS_GetPropertyValue(ctx, sp[-2], sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp[-2] = val;
+                sp--;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_array_el2):
+            {
+                JSValue val;
+
+                val = JS_GetPropertyValue(ctx, sp[-2], sp[-1]);
+                sp[-1] = val;
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_get_ref_value):
+            {
+                JSValue val;
+                if (unlikely(JS_IsUndefined(sp[-2]))) {
+                    JSAtom atom = JS_ValueToAtom(ctx, sp[-1]);
+                    if (atom != JS_ATOM_NULL) {
+                        JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                        JS_FreeAtom(ctx, atom);
+                    }
+                    goto exception;
+                }
+                val = JS_GetPropertyValue(ctx, sp[-2],
+                                          JS_DupValue(ctx, sp[-1]));
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                sp[0] = val;
+                sp++;
+            }
+            BREAK;
+
+        CASE(OP_get_super_value):
+            {
+                JSValue val;
+                JSAtom atom;
+                atom = JS_ValueToAtom(ctx, sp[-1]);
+                if (unlikely(atom == JS_ATOM_NULL))
+                    goto exception;
+                val = JS_GetPropertyInternal(ctx, sp[-2], atom, sp[-3], FALSE);
+                JS_FreeAtom(ctx, atom);
+                if (unlikely(JS_IsException(val)))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                JS_FreeValue(ctx, sp[-2]);
+                JS_FreeValue(ctx, sp[-3]);
+                sp[-3] = val;
+                sp -= 2;
+            }
+            BREAK;
+
+        CASE(OP_put_array_el):
+            {
+                int ret;
+
+                ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], JS_PROP_THROW_STRICT);
+                JS_FreeValue(ctx, sp[-3]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_ref_value):
+            {
+                int ret;
+                if (unlikely(JS_IsUndefined(sp[-3]))) {
+                    if (is_strict_mode(ctx)) {
+                        JSAtom atom = JS_ValueToAtom(ctx, sp[-2]);
+                        if (atom != JS_ATOM_NULL) {
+                            JS_ThrowReferenceErrorNotDefined(ctx, atom);
+                            JS_FreeAtom(ctx, atom);
+                        }
+                        goto exception;
+                    } else {
+                        sp[-3] = JS_DupValue(ctx, ctx->global_obj);
+                    }
+                }
+                ret = JS_SetPropertyValue(ctx, sp[-3], sp[-2], sp[-1], JS_PROP_THROW_STRICT);
+                JS_FreeValue(ctx, sp[-3]);
+                sp -= 3;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_put_super_value):
+            {
+                int ret;
+                JSAtom atom;
+                if (JS_VALUE_GET_TAG(sp[-3]) != JS_TAG_OBJECT) {
+                    JS_ThrowTypeErrorNotAnObject(ctx);
+                    goto exception;
+                }
+                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],
+                                            JS_PROP_THROW_STRICT);
+                JS_FreeAtom(ctx, atom);
+                JS_FreeValue(ctx, sp[-4]);
+                JS_FreeValue(ctx, sp[-3]);
+                JS_FreeValue(ctx, sp[-2]);
+                sp -= 4;
+                if (ret < 0)
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_define_array_el):
+            {
+                int ret;
+                ret = JS_DefinePropertyValueValue(ctx, sp[-3], JS_DupValue(ctx, sp[-2]), sp[-1],
+                                                  JS_PROP_C_W_E | JS_PROP_THROW);
+                sp -= 1;
+                if (unlikely(ret < 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_append):    /* array pos enumobj -- array pos */
+            {
+                if (js_append_enumerate(ctx, sp))
+                    goto exception;
+                JS_FreeValue(ctx, *--sp);
+            }
+            BREAK;
+
+        CASE(OP_copy_data_properties):    /* target source excludeList */
+            {
+                /* stack offsets (-1 based):
+                   2 bits for target,
+                   3 bits for source,
+                   2 bits for exclusionList */
+                int mask;
+
+                mask = *pc++;
+                if (JS_CopyDataProperties(ctx, sp[-1 - (mask & 3)],
+                                          sp[-1 - ((mask >> 2) & 7)],
+                                          sp[-1 - ((mask >> 5) & 7)], 0))
+                    goto exception;
+            }
+            BREAK;
+
+        CASE(OP_add):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(op1) + JS_VALUE_GET_INT(op2);
+                    if (unlikely((int)r != r))
+                        goto add_slow;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+                    sp[-2] = __JS_NewFloat64(ctx, JS_VALUE_GET_FLOAT64(op1) +
+                                             JS_VALUE_GET_FLOAT64(op2));
+                    sp--;
+                } else {
+                add_slow:
+                    if (js_add_slow(ctx, sp))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_add_loc):
+            {
+                JSValue ops[2];
+                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]))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(ops[0]) + JS_VALUE_GET_INT(ops[1]);
+                    if (unlikely((int)r != r))
+                        goto add_loc_slow;
+                    var_buf[idx] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_GET_TAG(ops[0]) == JS_TAG_STRING) {
+                    sp--;
+                    ops[1] = JS_ToPrimitiveFree(ctx, ops[1], HINT_NONE);
+                    if (JS_IsException(ops[1])) {
+                        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;
+                        goto exception;
+                    }
+                    var_buf[idx] = ops[0];
+                } else {
+                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;
+                        goto exception;
+                    }
+                    var_buf[idx] = ops[0];
+                }
+            }
+            BREAK;
+        CASE(OP_sub):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int64_t r;
+                    r = (int64_t)JS_VALUE_GET_INT(op1) - JS_VALUE_GET_INT(op2);
+                    if (unlikely((int)r != r))
+                        goto binary_arith_slow;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+                    sp[-2] = __JS_NewFloat64(ctx, JS_VALUE_GET_FLOAT64(op1) -
+                                             JS_VALUE_GET_FLOAT64(op2));
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+        CASE(OP_mul):
+            {
+                JSValue op1, op2;
+                double d;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int32_t v1, v2;
+                    int64_t r;
+                    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)) {
+                        d = (double)r;
+                        goto mul_fp_res;
+                    }
+                    /* need to test zero case for -0 result */
+                    if (unlikely(r == 0 && (v1 | v2) < 0)) {
+                        d = -0.0;
+                        goto mul_fp_res;
+                    }
+#endif
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else if (JS_VALUE_IS_BOTH_FLOAT(op1, op2)) {
+                    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 {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+#ifdef CONFIG_BIGNUM
+        CASE(OP_math_div):
+        CASE(OP_div):
+            goto binary_arith_slow;
+#else
+        CASE(OP_div):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int v1, v2;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+                    sp[-2] = JS_NewFloat64(ctx, (double)v1 / (double)v2);
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            BREAK;
+#endif
+        CASE(OP_mod):
+#ifdef CONFIG_BIGNUM
+        CASE(OP_math_mod):
+#endif
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    int v1, v2, r;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+                    /* We must avoid v2 = 0, v1 = INT32_MIN and v2 =
+                       -1 and the cases where the result is -0. */
+                    if (unlikely(v1 < 0 || v2 <= 0))
+                        goto binary_arith_slow;
+                    r = v1 % v2;
+                    sp[-2] = JS_NewInt32(ctx, r);
+                    sp--;
+                } else {
+                    goto binary_arith_slow;
+                }
+            }
+            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;
+            sp--;
+            BREAK;
+
+        CASE(OP_plus):
+            {
+                JSValue op1;
+                uint32_t tag;
+                op1 = sp[-1];
+                tag = JS_VALUE_GET_TAG(op1);
+                if (tag == JS_TAG_INT || JS_TAG_IS_FLOAT64(tag)) {
+                } else {
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_neg):
+            {
+                JSValue op1;
+                uint32_t tag;
+                int val;
+                double d;
+                op1 = sp[-1];
+                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;
+                        goto neg_fp_res;
+                    }
+                    if (unlikely(val == INT32_MIN)) {
+                        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;
+                }
+            }
+            BREAK;
+        CASE(OP_inc):
+            {
+                JSValue op1;
+                int val;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MAX))
+                        goto inc_slow;
+                    sp[-1] = JS_NewInt32(ctx, val + 1);
+                } else {
+                inc_slow:
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_dec):
+            {
+                JSValue op1;
+                int val;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MIN))
+                        goto dec_slow;
+                    sp[-1] = JS_NewInt32(ctx, val - 1);
+                } else {
+                dec_slow:
+                    if (js_unary_arith_slow(ctx, sp, opcode))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_post_inc):
+        CASE(OP_post_dec):
+            if (js_post_inc_slow(ctx, sp, opcode))
+                goto exception;
+            sp++;
+            BREAK;
+        CASE(OP_inc_loc):
+            {
+                JSValue op1;
+                int val;
+                int idx;
+                idx = *pc;
+                pc += 1;
+
+                op1 = var_buf[idx];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MAX))
+                        goto inc_loc_slow;
+                    var_buf[idx] = JS_NewInt32(ctx, val + 1);
+                } else {
+                inc_loc_slow:
+                    if (js_unary_arith_slow(ctx, var_buf + idx + 1, OP_inc))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_dec_loc):
+            {
+                JSValue op1;
+                int val;
+                int idx;
+                idx = *pc;
+                pc += 1;
+
+                op1 = var_buf[idx];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    val = JS_VALUE_GET_INT(op1);
+                    if (unlikely(val == INT32_MIN))
+                        goto dec_loc_slow;
+                    var_buf[idx] = JS_NewInt32(ctx, val - 1);
+                } else {
+                dec_loc_slow:
+                    if (js_unary_arith_slow(ctx, var_buf + idx + 1, OP_dec))
+                        goto exception;
+                }
+            }
+            BREAK;
+        CASE(OP_not):
+            {
+                JSValue op1;
+                op1 = sp[-1];
+                if (JS_VALUE_GET_TAG(op1) == JS_TAG_INT) {
+                    sp[-1] = JS_NewInt32(ctx, ~JS_VALUE_GET_INT(op1));
+                } else {
+                    if (js_not_slow(ctx, sp))
+                        goto exception;
+                }
+            }
+            BREAK;
+
+        CASE(OP_shl):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v1, v2;
+                    v1 = JS_VALUE_GET_INT(op1);
+                    v2 = JS_VALUE_GET_INT(op2);
+#ifdef CONFIG_BIGNUM
+                    {
+                        int64_t r;
+                        if (is_bigint_mode(ctx)) {
+                            if (v2 > 0x1f)
+                                goto shl_slow;
+                            r = (int64_t)v1 << v2;
+                            if ((int)r != r)
+                                goto shl_slow;
+                        } else {
+                            v2 &= 0x1f;
+                        }
+                    }
+#else
+                    v2 &= 0x1f;
+#endif
+                    sp[-2] = JS_NewInt32(ctx, v1 << v2);
+                    sp--;
+                } else {
+#ifdef CONFIG_BIGNUM
+                shl_slow:
+#endif
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_shr):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v2;
+                    v2 = JS_VALUE_GET_INT(op2);
+                    /* v1 >>> v2 retains its JS semantics if CONFIG_BIGNUM */
+                    v2 &= 0x1f;
+                    sp[-2] = JS_NewUint32(ctx,
+                                          (uint32_t)JS_VALUE_GET_INT(op1) >>
+                                          v2);
+                    sp--;
+                } else {
+                    if (js_shr_slow(ctx, sp))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_sar):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    uint32_t v2;
+                    v2 = JS_VALUE_GET_INT(op2);
+#ifdef CONFIG_BIGNUM
+                    if (unlikely(v2 > 0x1f)) {
+                        if (is_bigint_mode(ctx))
+                            goto sar_slow;
+                        else
+                            v2 &= 0x1f;
+                    }
+#else
+                    v2 &= 0x1f;
+#endif
+                    sp[-2] = JS_NewInt32(ctx,
+                                          (int)JS_VALUE_GET_INT(op1) >> v2);
+                    sp--;
+                } else {
+#ifdef CONFIG_BIGNUM
+                sar_slow:
+#endif
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_and):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) &
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_or):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) |
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+        CASE(OP_xor):
+            {
+                JSValue op1, op2;
+                op1 = sp[-2];
+                op2 = sp[-1];
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {
+                    sp[-2] = JS_NewInt32(ctx,
+                                         JS_VALUE_GET_INT(op1) ^
+                                         JS_VALUE_GET_INT(op2));
+                    sp--;
+                } else {
+                    if (js_binary_logic_slow(ctx, sp, opcode))
+                        goto exception;
+                    sp--;
+                }
+            }
+            BREAK;
+
+
+#define OP_CMP(opcode, binary_op, slow_call)              \
+            CASE(opcode):                                 \
+                {                                         \
+                JSValue op1, op2;                         \
+                op1 = sp[-2];                             \
+                op2 = sp[-1];                                   \
+                if (likely(JS_VALUE_IS_BOTH_INT(op1, op2))) {           \
+                    sp[-2] = JS_NewBool(ctx, JS_VALUE_GET_INT(op1) binary_op JS_VALUE_GET_INT(op2)); \
+                    sp--;                                               \
+                } else {                                                \
+                    if (slow_call)                                      \
+                        goto exception;                                 \
+                    sp--;                                               \
+                }                                                       \
+                }                                                       \
+            BREAK
+
+            OP_CMP(OP_lt, <, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_lte, <=, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_gt, >, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_gte, >=, js_relational_slow(ctx, sp, opcode));
+            OP_CMP(OP_eq, ==, js_eq_slow(ctx, sp, 0));
+            OP_CMP(OP_neq, !=, js_eq_slow(ctx, sp, 1));
+            OP_CMP(OP_strict_eq, ==, js_strict_eq_slow(ctx, sp, 0));
+            OP_CMP(OP_strict_neq, !=, js_strict_eq_slow(ctx, sp, 1));
+
+#ifdef CONFIG_BIGNUM
+        CASE(OP_mul_pow10):
+            if (ctx->rt->bigfloat_ops.mul_pow10(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+#endif
+        CASE(OP_in):
+            if (js_operator_in(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_instanceof):
+            if (js_operator_instanceof(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_typeof):
+            {
+                JSValue op1;
+                JSAtom atom;
+
+                op1 = sp[-1];
+                atom = js_operator_typeof(ctx, op1);
+                JS_FreeValue(ctx, op1);
+                sp[-1] = JS_AtomToString(ctx, atom);
+            }
+            BREAK;
+        CASE(OP_delete):
+            if (js_operator_delete(ctx, sp))
+                goto exception;
+            sp--;
+            BREAK;
+        CASE(OP_delete_var):
+            {
+                JSAtom atom;
+                int ret;
+
+                atom = get_u32(pc);
+                pc += 4;
+
+                ret = JS_DeleteProperty(ctx, ctx->global_obj, atom, 0);
+                if (unlikely(ret < 0))
+                    goto exception;
+                *sp++ = JS_NewBool(ctx, ret);
+            }
+            BREAK;
+
+        CASE(OP_to_object):
+            if (JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_OBJECT) {
+                ret_val = JS_ToObject(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+            }
+            BREAK;
+
+        CASE(OP_to_propkey):
+            switch (JS_VALUE_GET_TAG(sp[-1])) {
+            case JS_TAG_INT:
+            case JS_TAG_STRING:
+            case JS_TAG_SYMBOL:
+                break;
+            default:
+                ret_val = JS_ToPropertyKey(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+                break;
+            }
+            BREAK;
+
+        CASE(OP_to_propkey2):
+            /* must be tested first */
+            if (unlikely(JS_IsUndefined(sp[-2]) || JS_IsNull(sp[-2]))) {
+                JS_ThrowTypeError(ctx, "value has no property");
+                goto exception;
+            }
+            switch (JS_VALUE_GET_TAG(sp[-1])) {
+            case JS_TAG_INT:
+            case JS_TAG_STRING:
+            case JS_TAG_SYMBOL:
+                break;
+            default:
+                ret_val = JS_ToPropertyKey(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+                break;
+            }
+            BREAK;
+#if 0
+        CASE(OP_to_string):
+            if (JS_VALUE_GET_TAG(sp[-1]) != JS_TAG_STRING) {
+                ret_val = JS_ToString(ctx, sp[-1]);
+                if (JS_IsException(ret_val))
+                    goto exception;
+                JS_FreeValue(ctx, sp[-1]);
+                sp[-1] = ret_val;
+            }
+            BREAK;
+#endif
+        CASE(OP_with_get_var):
+        CASE(OP_with_put_var):
+        CASE(OP_with_delete_var):
+        CASE(OP_with_make_ref):
+        CASE(OP_with_get_ref):
+        CASE(OP_with_get_ref_undef):
+            {
+                JSAtom atom;
+                int32_t diff;
+                JSValue obj, val;
+                int ret, is_with;
+                atom = get_u32(pc);
+                diff = get_u32(pc + 4);
+                is_with = pc[8];
+                pc += 9;
+
+                obj = sp[-1];
+                ret = JS_HasProperty(ctx, obj, atom);
+                if (unlikely(ret < 0))
+                    goto exception;
+                if (ret) {
+                    if (is_with) {
+                        ret = js_has_unscopable(ctx, obj, atom);
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        if (ret)
+                            goto no_with;
+                    }
+                    switch (opcode) {
+                    case OP_with_get_var:
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        set_value(ctx, &sp[-1], val);
+                        break;
+                    case OP_with_put_var:
+                        ret = JS_SetPropertyInternal(ctx, obj, atom, sp[-2],
+                                                     JS_PROP_THROW_STRICT);
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp -= 2;
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        break;
+                    case OP_with_delete_var:
+                        ret = JS_DeleteProperty(ctx, obj, atom, 0);
+                        if (unlikely(ret < 0))
+                            goto exception;
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp[-1] = JS_NewBool(ctx, ret);
+                        break;
+                    case OP_with_make_ref:
+                        /* produce a pair object/propname on the stack */
+                        *sp++ = JS_AtomToValue(ctx, atom);
+                        break;
+                    case OP_with_get_ref:
+                        /* produce a pair object/method on the stack */
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        *sp++ = val;
+                        break;
+                    case OP_with_get_ref_undef:
+                        /* produce a pair undefined/function on the stack */
+                        val = JS_GetProperty(ctx, obj, atom);
+                        if (unlikely(JS_IsException(val)))
+                            goto exception;
+                        JS_FreeValue(ctx, sp[-1]);
+                        sp[-1] = JS_UNDEFINED;
+                        *sp++ = val;
+                        break;
+                    }
+                    pc += diff - 5;
+                } else {
+                no_with:
+                    /* if not jumping, drop the object argument */
+                    JS_FreeValue(ctx, sp[-1]);
+                    sp--;
+                }
+            }
+            BREAK;
+
+        CASE(OP_await):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_AWAIT);
+            goto done_generator;
+        CASE(OP_yield):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_YIELD);
+            goto done_generator;
+        CASE(OP_yield_star):
+        CASE(OP_async_yield_star):
+            ret_val = JS_NewInt32(ctx, FUNC_RET_YIELD_STAR);
+            goto done_generator;
+        CASE(OP_return_async):
+        CASE(OP_initial_yield):
+            ret_val = JS_UNDEFINED;
+            goto done_generator;
+
+        CASE(OP_nop):
+            BREAK;
+        CASE(OP_is_undefined_or_null):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_UNDEFINED ||
+                JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_NULL) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+#if SHORT_OPCODES
+        CASE(OP_is_undefined):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_UNDEFINED) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        CASE(OP_is_null):
+            if (JS_VALUE_GET_TAG(sp[-1]) == JS_TAG_NULL) {
+                goto set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        CASE(OP_is_function):
+            if (js_operator_typeof(ctx, sp[-1]) == JS_ATOM_function) {
+                goto free_and_set_true;
+            } else {
+                goto free_and_set_false;
+            }
+        free_and_set_true:
+            JS_FreeValue(ctx, sp[-1]);
+#endif
+        set_true:
+            sp[-1] = JS_TRUE;
+            BREAK;
+        free_and_set_false:
+            JS_FreeValue(ctx, sp[-1]);
+            sp[-1] = JS_FALSE;
+            BREAK;
+        CASE(OP_invalid):
+        DEFAULT:
+            JS_ThrowInternalError(ctx, "invalid opcode: pc=%u opcode=0x%02x",
+                                  (int)(pc - b->byte_code_buf - 1), opcode);
+            goto exception;
+        }
+    }
+ exception:
+    if (is_backtrace_needed(ctx, ctx->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);
+    }
+    if (!JS_IsUncatchableError(ctx, ctx->current_exception)) {
+        while (sp > stack_buf) {
+            JSValue val = *--sp;
+            JS_FreeValue(ctx, val);
+            if (JS_VALUE_GET_TAG(val) == JS_TAG_CATCH_OFFSET) {
+                int pos = JS_VALUE_GET_INT(val);
+                if (pos == 0) {
+                    /* enumerator: close it with a throw */
+                    JS_FreeValue(ctx, sp[-1]); /* drop the next method */
+                    sp--;
+                    JS_IteratorClose(ctx, sp[-1], TRUE);
+                } else {
+                    *sp++ = ctx->current_exception;
+                    ctx->current_exception = JS_NULL;
+                    pc = b->byte_code_buf + pos;
+                    goto restart;
+                }
+            }
+        }
+    }
+    ret_val = JS_EXCEPTION;
+    /* the local variables are freed by the caller in the generator
+       case. Hence the label 'done' should never be reached in a
+       generator function. */
+    if (b->func_kind != JS_FUNC_NORMAL) {
+    done_generator:
+        sf->cur_pc = pc;
+        sf->cur_sp = sp;
+    } else {
+    done:
+        if (unlikely(!list_empty(&sf->var_ref_list))) {
+            /* variable references reference the stack: must close them */
+            close_var_refs(ctx->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;
+    return ret_val;
+}
+
+JSValue JS_Call(JSContext *ctx, JSValueConst func_obj, JSValueConst this_obj,
+                int argc, JSValueConst *argv)
+{
+    return JS_CallInternal(ctx, func_obj, this_obj, JS_UNDEFINED,
+                           argc, (JSValue *)argv, JS_CALL_FLAG_COPY_ARGV);
+}
+
+static JSValue JS_CallFree(JSContext *ctx, JSValue func_obj, JSValueConst this_obj,
+                           int argc, JSValueConst *argv)
+{
+    JSValue res = JS_CallInternal(ctx, func_obj, this_obj, JS_UNDEFINED,
+                                  argc, (JSValue *)argv, JS_CALL_FLAG_COPY_ARGV);
+    JS_FreeValue(ctx, func_obj);
+    return res;
+}
+
+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;
+}
+
+static JSValue js_create_from_ctor(JSContext *ctx, JSValueConst ctor,
+                                   int class_id)
+{
+    JSValue proto, obj;
+    if (JS_IsUndefined(ctor)) {
+        proto = JS_DupValue(ctx, ctx->class_proto[class_id]);
+    } else {
+        proto = JS_GetProperty(ctx, ctor, JS_ATOM_prototype);
+        if (JS_IsException(proto))
+            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]);
+        }
+    }
+    obj = JS_NewObjectProtoClass(ctx, proto, class_id);
+    JS_FreeValue(ctx, proto);
+    return obj;
+}
+
+/* argv[] is modified if (flags & JS_CALL_FLAG_COPY_ARGV) = 0. */
+static JSValue JS_CallConstructorInternal(JSContext *ctx,
+                                          JSValueConst func_obj,
+                                          JSValueConst new_target,
+                                          int argc, JSValue *argv, int flags)
+{
+    JSObject *p;
+    JSFunctionBytecode *b;
+
+    if (js_poll_interrupts(ctx))
+        return JS_EXCEPTION;
+    flags |= JS_CALL_FLAG_CONSTRUCTOR;
+    if (unlikely(JS_VALUE_GET_TAG(func_obj) != JS_TAG_OBJECT))
+        goto not_a_function;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    if (unlikely(!p->is_constructor))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (unlikely(p->class_id != JS_CLASS_BYTECODE_FUNCTION)) {
+        JSClassCall *call_func;
+        call_func = ctx->rt->class_array[p->class_id].call;
+        if (!call_func) {
+        not_a_function:
+            return JS_ThrowTypeError(ctx, "not a function");
+        }
+        return call_func(ctx, func_obj, new_target, argc,
+                         (JSValueConst *)argv, flags);
+    }
+
+    b = p->u.func.function_bytecode;
+    if (b->is_derived_class_constructor) {
+        return JS_CallInternal(ctx, func_obj, JS_UNDEFINED, new_target, argc, argv, flags);
+    } else {
+        JSValue obj, ret;
+        /* legacy constructor behavior */
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_OBJECT);
+        if (JS_IsException(obj))
+            return JS_EXCEPTION;
+        ret = JS_CallInternal(ctx, func_obj, obj, new_target, argc, argv, flags);
+        if (JS_VALUE_GET_TAG(ret) == JS_TAG_OBJECT ||
+            JS_IsException(ret)) {
+            JS_FreeValue(ctx, obj);
+            return ret;
+        } else {
+            JS_FreeValue(ctx, ret);
+            return obj;
+        }
+    }
+}
+
+JSValue JS_CallConstructor2(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst new_target,
+                            int argc, JSValueConst *argv)
+{
+    return JS_CallConstructorInternal(ctx, func_obj, new_target,
+                                      argc, (JSValue *)argv,
+                                      JS_CALL_FLAG_COPY_ARGV);
+}
+
+JSValue JS_CallConstructor(JSContext *ctx, JSValueConst func_obj,
+                           int argc, JSValueConst *argv)
+{
+    return JS_CallConstructorInternal(ctx, func_obj, func_obj,
+                                      argc, (JSValue *)argv,
+                                      JS_CALL_FLAG_COPY_ARGV);
+}
+
+JSValue JS_Invoke(JSContext *ctx, JSValueConst this_val, JSAtom atom,
+                  int argc, JSValueConst *argv)
+{
+    JSValue func_obj;
+    func_obj = JS_GetProperty(ctx, this_val, atom);
+    if (JS_IsException(func_obj))
+        return func_obj;
+    return JS_CallFree(ctx, func_obj, this_val, argc, argv);
+}
+
+static JSValue JS_InvokeFree(JSContext *ctx, JSValue this_val, JSAtom atom,
+                             int argc, JSValueConst *argv)
+{
+    JSValue res = JS_Invoke(ctx, this_val, atom, argc, argv);
+    JS_FreeValue(ctx, this_val);
+    return res;
+}
+
+/* JSAsyncFunctionState (used by generator and async functions) */
+static __exception int async_func_init(JSContext *ctx, JSAsyncFunctionState *s,
+                                       JSValueConst func_obj, JSValueConst this_obj,
+                                       int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    JSFunctionBytecode *b;
+    JSStackFrame *sf;
+    int local_count, i, arg_buf_len, n;
+
+    sf = &s->frame;
+    init_list_head(&sf->var_ref_list);
+    p = JS_VALUE_GET_OBJ(func_obj);
+    b = p->u.func.function_bytecode;
+    sf->js_mode = b->js_mode;
+    sf->cur_pc = b->byte_code_buf;
+    arg_buf_len = max_int(b->arg_count, argc);
+    local_count = arg_buf_len + b->var_count + b->stack_size;
+    sf->arg_buf = js_malloc(ctx, sizeof(JSValue) * max_int(local_count, 1));
+    if (!sf->arg_buf)
+        return -1;
+    sf->cur_func = JS_DupValue(ctx, func_obj);
+    s->this_val = JS_DupValue(ctx, this_obj);
+    s->argc = argc;
+    sf->arg_count = arg_buf_len;
+    sf->var_buf = sf->arg_buf + arg_buf_len;
+    sf->cur_sp = sf->var_buf + b->var_count;
+    for(i = 0; i < argc; i++)
+        sf->arg_buf[i] = JS_DupValue(ctx, argv[i]);
+    n = arg_buf_len + b->var_count;
+    for(i = argc; i < n; i++)
+        sf->arg_buf[i] = JS_UNDEFINED;
+    return 0;
+}
+
+static void async_func_mark(JSRuntime *rt, JSAsyncFunctionState *s,
+                            JS_MarkFunc *mark_func)
+{
+    JSStackFrame *sf;
+    JSValue *sp;
+
+    sf = &s->frame;
+    JS_MarkValue(rt, sf->cur_func, mark_func);
+    JS_MarkValue(rt, s->this_val, mark_func);
+    if (sf->cur_sp) {
+        /* if the function is running, cur_sp is not known so we
+           cannot mark the stack. Marking the variables is not needed
+           because a running function cannot be part of a removable
+           cycle */
+        for(sp = sf->arg_buf; sp < sf->cur_sp; sp++)
+            JS_MarkValue(rt, *sp, mark_func);
+    }
+}
+
+static void async_func_free(JSRuntime *rt, JSAsyncFunctionState *s)
+{
+    JSStackFrame *sf;
+    JSValue *sp;
+
+    sf = &s->frame;
+
+    /* 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);
+        for(sp = sf->arg_buf; sp < sf->cur_sp; sp++) {
+            JS_FreeValueRT(rt, *sp);
+        }
+        js_free_rt(rt, sf->arg_buf);
+    }
+    JS_FreeValueRT(rt, sf->cur_func);
+    JS_FreeValueRT(rt, s->this_val);
+}
+
+static JSValue async_func_resume(JSContext *ctx, JSAsyncFunctionState *s)
+{
+    JSValue func_obj;
+
+    /* 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,
+                           s->argc, s->frame.arg_buf, JS_CALL_FLAG_GENERATOR);
+}
+
+
+/* Generators */
+
+typedef enum JSGeneratorStateEnum {
+    JS_GENERATOR_STATE_SUSPENDED_START,
+    JS_GENERATOR_STATE_SUSPENDED_YIELD,
+    JS_GENERATOR_STATE_SUSPENDED_YIELD_STAR,
+    JS_GENERATOR_STATE_EXECUTING,
+    JS_GENERATOR_STATE_COMPLETED,
+} JSGeneratorStateEnum;
+
+typedef struct JSGeneratorData {
+    JSGeneratorStateEnum state;
+    JSAsyncFunctionState func_state;
+} JSGeneratorData;
+
+static void free_generator_stack_rt(JSRuntime *rt, JSGeneratorData *s)
+{
+    if (s->state == JS_GENERATOR_STATE_COMPLETED)
+        return;
+    async_func_free(rt, &s->func_state);
+    s->state = JS_GENERATOR_STATE_COMPLETED;
+}
+
+static void js_generator_finalizer(JSRuntime *rt, JSValue obj)
+{
+    JSGeneratorData *s = JS_GetOpaque(obj, JS_CLASS_GENERATOR);
+
+    if (s) {
+        free_generator_stack_rt(rt, s);
+        js_free_rt(rt, s);
+    }
+}
+
+static void free_generator_stack(JSContext *ctx, JSGeneratorData *s)
+{
+    free_generator_stack_rt(ctx->rt, s);
+}
+
+static void js_generator_mark(JSRuntime *rt, JSValueConst val,
+                              JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSGeneratorData *s = p->u.generator_data;
+
+    if (!s || s->state == JS_GENERATOR_STATE_COMPLETED)
+        return;
+    async_func_mark(rt, &s->func_state, mark_func);
+}
+
+/* XXX: use enum */
+#define GEN_MAGIC_NEXT   0
+#define GEN_MAGIC_RETURN 1
+#define GEN_MAGIC_THROW  2
+
+static JSValue js_generator_next(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv,
+                                 BOOL *pdone, int magic)
+{
+    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:
+        if (magic == GEN_MAGIC_NEXT) {
+            goto exec_no_arg;
+        } else {
+            free_generator_stack(ctx, s);
+            goto done;
+        }
+        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) {
+            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++;
+        exec_no_arg:
+            s->func_state.throw_flag = FALSE;
+        }
+        s->state = JS_GENERATOR_STATE_EXECUTING;
+        func_ret = async_func_resume(ctx, &s->func_state);
+        s->state = JS_GENERATOR_STATE_SUSPENDED_YIELD;
+        if (JS_IsException(func_ret)) {
+            /* finalize the execution in case of exception */
+            free_generator_stack(ctx, s);
+            return func_ret;
+        }
+        if (JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT) {
+            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;
+                *pdone = FALSE;
+            }
+        } else {
+            /* end of iterator */
+            ret = sf->cur_sp[-1];
+            sf->cur_sp[-1] = JS_UNDEFINED;
+            JS_FreeValue(ctx, func_ret);
+            free_generator_stack(ctx, s);
+        }
+        break;
+    case JS_GENERATOR_STATE_COMPLETED:
+    done:
+        /* execution is finished */
+        switch(magic) {
+        default:
+        case GEN_MAGIC_NEXT:
+            ret = JS_UNDEFINED;
+            break;
+        case GEN_MAGIC_RETURN:
+            ret = JS_DupValue(ctx, argv[0]);
+            break;
+        case GEN_MAGIC_THROW:
+            ret = JS_Throw(ctx, JS_DupValue(ctx, argv[0]));
+            break;
+        }
+        break;
+    case JS_GENERATOR_STATE_EXECUTING:
+        ret = JS_ThrowTypeError(ctx, "cannot invoke a running generator");
+        break;
+    }
+    return ret;
+}
+
+static JSValue js_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int flags)
+{
+    JSValue obj, func_ret;
+    JSGeneratorData *s;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return JS_EXCEPTION;
+    s->state = JS_GENERATOR_STATE_SUSPENDED_START;
+    if (async_func_init(ctx, &s->func_state, func_obj, this_obj, argc, argv)) {
+        s->state = JS_GENERATOR_STATE_COMPLETED;
+        goto fail;
+    }
+
+    /* execute the function up to 'OP_initial_yield' */
+    func_ret = async_func_resume(ctx, &s->func_state);
+    if (JS_IsException(func_ret))
+        goto fail;
+    JS_FreeValue(ctx, func_ret);
+
+    obj = js_create_from_ctor(ctx, func_obj, JS_CLASS_GENERATOR);
+    if (JS_IsException(obj))
+        goto fail;
+    JS_SetOpaque(obj, s);
+    return obj;
+ fail:
+    free_generator_stack_rt(ctx->rt, s);
+    js_free(ctx, s);
+    return JS_EXCEPTION;
+}
+
+/* AsyncFunction */
+
+static void js_async_function_terminate(JSRuntime *rt, JSAsyncFunctionData *s)
+{
+    if (s->is_active) {
+        async_func_free(rt, &s->func_state);
+        s->is_active = FALSE;
+    }
+}
+
+static void js_async_function_free0(JSRuntime *rt, JSAsyncFunctionData *s)
+{
+    js_async_function_terminate(rt, s);
+    JS_FreeValueRT(rt, s->resolving_funcs[0]);
+    JS_FreeValueRT(rt, s->resolving_funcs[1]);
+    remove_gc_object(&s->header);
+    js_free_rt(rt, s);
+}
+
+static void js_async_function_free(JSRuntime *rt, JSAsyncFunctionData *s)
+{
+    if (--s->header.ref_count == 0) {
+        js_async_function_free0(rt, s);
+    }
+}
+
+static void js_async_function_resolve_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSAsyncFunctionData *s = p->u.async_function_data;
+    if (s) {
+        js_async_function_free(rt, s);
+    }
+}
+
+static void js_async_function_resolve_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSAsyncFunctionData *s = p->u.async_function_data;
+    if (s) {
+        mark_func(rt, &s->header);
+    }
+}
+
+static int js_async_function_resolve_create(JSContext *ctx,
+                                            JSAsyncFunctionData *s,
+                                            JSValue *resolving_funcs)
+{
+    int i;
+    JSObject *p;
+
+    for(i = 0; i < 2; i++) {
+        resolving_funcs[i] =
+            JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                   JS_CLASS_ASYNC_FUNCTION_RESOLVE + i);
+        if (JS_IsException(resolving_funcs[i])) {
+            if (i == 1)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            return -1;
+        }
+        p = JS_VALUE_GET_OBJ(resolving_funcs[i]);
+        s->header.ref_count++;
+        p->u.async_function_data = s;
+    }
+    return 0;
+}
+
+static void js_async_function_resume(JSContext *ctx, JSAsyncFunctionData *s)
+{
+    JSValue func_ret, ret2;
+
+    func_ret = async_func_resume(ctx, &s->func_state);
+    if (JS_IsException(func_ret)) {
+        JSValue error;
+    fail:
+        error = JS_GetException(ctx);
+        ret2 = JS_Call(ctx, s->resolving_funcs[1], JS_UNDEFINED,
+                       1, (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        js_async_function_terminate(ctx->rt, s);
+        JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
+    } else {
+        JSValue value;
+        value = s->func_state.frame.cur_sp[-1];
+        s->func_state.frame.cur_sp[-1] = JS_UNDEFINED;
+        if (JS_IsUndefined(func_ret)) {
+            /* function returned */
+            ret2 = JS_Call(ctx, s->resolving_funcs[0], JS_UNDEFINED,
+                           1, (JSValueConst *)&value);
+            JS_FreeValue(ctx, ret2); /* XXX: what to do if exception ? */
+            JS_FreeValue(ctx, value);
+            js_async_function_terminate(ctx->rt, s);
+        } else {
+            JSValue promise, resolving_funcs[2], resolving_funcs1[2];
+            int i, res;
+
+            /* await */
+            JS_FreeValue(ctx, func_ret); /* not used */
+            promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                         1, (JSValueConst *)&value, 0);
+            JS_FreeValue(ctx, value);
+            if (JS_IsException(promise))
+                goto fail;
+            if (js_async_function_resolve_create(ctx, s, resolving_funcs)) {
+                JS_FreeValue(ctx, promise);
+                goto fail;
+            }
+
+            /* Note: no need to create 'thrownawayCapability' as in
+               the spec */
+            for(i = 0; i < 2; i++)
+                resolving_funcs1[i] = JS_UNDEFINED;
+            res = perform_promise_then(ctx, promise,
+                                       (JSValueConst *)resolving_funcs,
+                                       (JSValueConst *)resolving_funcs1);
+            JS_FreeValue(ctx, promise);
+            for(i = 0; i < 2; i++)
+                JS_FreeValue(ctx, resolving_funcs[i]);
+            if (res)
+                goto fail;
+        }
+    }
+}
+
+static JSValue js_async_function_resolve_call(JSContext *ctx,
+                                              JSValueConst func_obj,
+                                              JSValueConst this_obj,
+                                              int argc, JSValueConst *argv,
+                                              int flags)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(func_obj);
+    JSAsyncFunctionData *s = p->u.async_function_data;
+    BOOL is_reject = p->class_id - JS_CLASS_ASYNC_FUNCTION_RESOLVE;
+    JSValueConst arg;
+
+    if (argc > 0)
+        arg = argv[0];
+    else
+        arg = JS_UNDEFINED;
+    s->func_state.throw_flag = is_reject;
+    if (is_reject) {
+        JS_Throw(ctx, JS_DupValue(ctx, arg));
+    } else {
+        /* return value of await */
+        s->func_state.frame.cur_sp[-1] = JS_DupValue(ctx, arg);
+    }
+    js_async_function_resume(ctx, s);
+    return JS_UNDEFINED;
+}
+
+static JSValue js_async_function_call(JSContext *ctx, JSValueConst func_obj,
+                                      JSValueConst this_obj,
+                                      int argc, JSValueConst *argv, int flags)
+{
+    JSValue promise;
+    JSAsyncFunctionData *s;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return JS_EXCEPTION;
+    s->header.ref_count = 1;
+    add_gc_object(ctx->rt, &s->header, JS_GC_OBJ_TYPE_ASYNC_FUNCTION);
+    s->is_active = FALSE;
+    s->resolving_funcs[0] = JS_UNDEFINED;
+    s->resolving_funcs[1] = JS_UNDEFINED;
+
+    promise = JS_NewPromiseCapability(ctx, s->resolving_funcs);
+    if (JS_IsException(promise))
+        goto fail;
+
+    if (async_func_init(ctx, &s->func_state, func_obj, this_obj, argc, argv)) {
+    fail:
+        JS_FreeValue(ctx, promise);
+        js_async_function_free(ctx->rt, s);
+        return JS_EXCEPTION;
+    }
+    s->is_active = TRUE;
+
+    js_async_function_resume(ctx, s);
+
+    js_async_function_free(ctx->rt, s);
+
+    return promise;
+}
+
+/* AsyncGenerator */
+
+typedef enum JSAsyncGeneratorStateEnum {
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_START,
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD,
+    JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR,
+    JS_ASYNC_GENERATOR_STATE_EXECUTING,
+    JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN,
+    JS_ASYNC_GENERATOR_STATE_COMPLETED,
+} JSAsyncGeneratorStateEnum;
+
+typedef struct JSAsyncGeneratorRequest {
+    struct list_head link;
+    /* completion */
+    int completion_type; /* GEN_MAGIC_x */
+    JSValue result;
+    /* promise capability */
+    JSValue promise;
+    JSValue resolving_funcs[2];
+} JSAsyncGeneratorRequest;
+
+typedef struct JSAsyncGeneratorData {
+    JSObject *generator; /* back pointer to the object (const) */
+    JSAsyncGeneratorStateEnum state;
+    JSAsyncFunctionState func_state;
+    struct list_head queue; /* list of JSAsyncGeneratorRequest.link */
+} JSAsyncGeneratorData;
+
+static void js_async_generator_free(JSRuntime *rt,
+                                    JSAsyncGeneratorData *s)
+{
+    struct list_head *el, *el1;
+    JSAsyncGeneratorRequest *req;
+
+    list_for_each_safe(el, el1, &s->queue) {
+        req = list_entry(el, JSAsyncGeneratorRequest, link);
+        JS_FreeValueRT(rt, req->result);
+        JS_FreeValueRT(rt, req->promise);
+        JS_FreeValueRT(rt, req->resolving_funcs[0]);
+        JS_FreeValueRT(rt, req->resolving_funcs[1]);
+        js_free_rt(rt, req);
+    }
+    if (s->state != JS_ASYNC_GENERATOR_STATE_COMPLETED &&
+        s->state != JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN) {
+        async_func_free(rt, &s->func_state);
+    }
+    js_free_rt(rt, s);
+}
+
+static void js_async_generator_finalizer(JSRuntime *rt, JSValue obj)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(obj, JS_CLASS_ASYNC_GENERATOR);
+
+    if (s) {
+        js_async_generator_free(rt, s);
+    }
+}
+
+static void js_async_generator_mark(JSRuntime *rt, JSValueConst val,
+                                    JS_MarkFunc *mark_func)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(val, JS_CLASS_ASYNC_GENERATOR);
+    struct list_head *el;
+    JSAsyncGeneratorRequest *req;
+    if (s) {
+        list_for_each(el, &s->queue) {
+            req = list_entry(el, JSAsyncGeneratorRequest, link);
+            JS_MarkValue(rt, req->result, mark_func);
+            JS_MarkValue(rt, req->promise, mark_func);
+            JS_MarkValue(rt, req->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, req->resolving_funcs[1], mark_func);
+        }
+        if (s->state != JS_ASYNC_GENERATOR_STATE_COMPLETED &&
+            s->state != JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN) {
+            async_func_mark(rt, &s->func_state, mark_func);
+        }
+    }
+}
+
+static JSValue js_async_generator_resolve_function(JSContext *ctx,
+                                          JSValueConst this_obj,
+                                          int argc, JSValueConst *argv,
+                                          int magic, JSValue *func_data);
+
+static int js_async_generator_resolve_function_create(JSContext *ctx,
+                                                      JSValueConst generator,
+                                                      JSValue *resolving_funcs,
+                                                      BOOL is_resume_next)
+{
+    int i;
+    JSValue func;
+
+    for(i = 0; i < 2; i++) {
+        func = JS_NewCFunctionData(ctx, js_async_generator_resolve_function, 1,
+                                   i + is_resume_next * 2, 1, &generator);
+        if (JS_IsException(func)) {
+            if (i == 1)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            return -1;
+        }
+        resolving_funcs[i] = func;
+    }
+    return 0;
+}
+
+static int js_async_generator_await(JSContext *ctx,
+                                    JSAsyncGeneratorData *s,
+                                    JSValueConst value)
+{
+    JSValue promise, resolving_funcs[2], resolving_funcs1[2];
+    int i, res;
+
+    promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                 1, &value, 0);
+    if (JS_IsException(promise))
+        goto fail;
+
+    if (js_async_generator_resolve_function_create(ctx, JS_MKPTR(JS_TAG_OBJECT, s->generator),
+                                                   resolving_funcs, FALSE)) {
+        JS_FreeValue(ctx, promise);
+        goto fail;
+    }
+
+    /* Note: no need to create 'thrownawayCapability' as in
+       the spec */
+    for(i = 0; i < 2; i++)
+        resolving_funcs1[i] = JS_UNDEFINED;
+    res = perform_promise_then(ctx, promise,
+                               (JSValueConst *)resolving_funcs,
+                               (JSValueConst *)resolving_funcs1);
+    JS_FreeValue(ctx, promise);
+    for(i = 0; i < 2; i++)
+        JS_FreeValue(ctx, resolving_funcs[i]);
+    if (res)
+        goto fail;
+    return 0;
+ fail:
+    return -1;
+}
+
+static void js_async_generator_resolve_or_reject(JSContext *ctx,
+                                                 JSAsyncGeneratorData *s,
+                                                 JSValueConst result,
+                                                 int is_reject)
+{
+    JSAsyncGeneratorRequest *next;
+    JSValue ret;
+
+    next = list_entry(s->queue.next, JSAsyncGeneratorRequest, link);
+    list_del(&next->link);
+    ret = JS_Call(ctx, next->resolving_funcs[is_reject], JS_UNDEFINED, 1,
+                  &result);
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, next->result);
+    JS_FreeValue(ctx, next->promise);
+    JS_FreeValue(ctx, next->resolving_funcs[0]);
+    JS_FreeValue(ctx, next->resolving_funcs[1]);
+    js_free(ctx, next);
+}
+
+static void js_async_generator_resolve(JSContext *ctx,
+                                       JSAsyncGeneratorData *s,
+                                       JSValueConst value,
+                                       BOOL done)
+{
+    JSValue result;
+    result = js_create_iterator_result(ctx, JS_DupValue(ctx, value), done);
+    /* XXX: better exception handling ? */
+    js_async_generator_resolve_or_reject(ctx, s, result, 0);
+    JS_FreeValue(ctx, result);
+ }
+
+static void js_async_generator_reject(JSContext *ctx,
+                                       JSAsyncGeneratorData *s,
+                                       JSValueConst exception)
+{
+    js_async_generator_resolve_or_reject(ctx, s, exception, 1);
+}
+
+static void js_async_generator_complete(JSContext *ctx,
+                                        JSAsyncGeneratorData *s)
+{
+    if (s->state != JS_ASYNC_GENERATOR_STATE_COMPLETED) {
+        s->state = JS_ASYNC_GENERATOR_STATE_COMPLETED;
+        async_func_free(ctx->rt, &s->func_state);
+    }
+}
+
+static int js_async_generator_completed_return(JSContext *ctx,
+                                               JSAsyncGeneratorData *s,
+                                               JSValueConst value)
+{
+    JSValue promise, resolving_funcs[2], resolving_funcs1[2];
+    int res;
+
+    promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                 1, (JSValueConst *)&value, 0);
+    if (JS_IsException(promise))
+        return -1;
+    if (js_async_generator_resolve_function_create(ctx,
+                                                   JS_MKPTR(JS_TAG_OBJECT, s->generator),
+                                                   resolving_funcs1,
+                                                   TRUE)) {
+        JS_FreeValue(ctx, promise);
+        return -1;
+    }
+    resolving_funcs[0] = JS_UNDEFINED;
+    resolving_funcs[1] = JS_UNDEFINED;
+    res = perform_promise_then(ctx, promise,
+                               (JSValueConst *)resolving_funcs1,
+                               (JSValueConst *)resolving_funcs);
+    JS_FreeValue(ctx, resolving_funcs1[0]);
+    JS_FreeValue(ctx, resolving_funcs1[1]);
+    JS_FreeValue(ctx, promise);
+    return res;
+}
+
+static void js_async_generator_resume_next(JSContext *ctx,
+                                           JSAsyncGeneratorData *s)
+{
+    JSAsyncGeneratorRequest *next;
+    JSValue func_ret, value;
+
+    for(;;) {
+        if (list_empty(&s->queue))
+            break;
+        next = list_entry(s->queue.next, JSAsyncGeneratorRequest, link);
+        switch(s->state) {
+        case JS_ASYNC_GENERATOR_STATE_EXECUTING:
+            /* only happens when restarting execution after await() */
+            goto resume_exec;
+        case JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN:
+            goto done;
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_START:
+            if (next->completion_type == GEN_MAGIC_NEXT) {
+                goto exec_no_arg;
+            } else {
+                js_async_generator_complete(ctx, s);
+            }
+            break;
+        case JS_ASYNC_GENERATOR_STATE_COMPLETED:
+            if (next->completion_type == GEN_MAGIC_NEXT) {
+                js_async_generator_resolve(ctx, s, JS_UNDEFINED, TRUE);
+            } else if (next->completion_type == GEN_MAGIC_RETURN) {
+                s->state = JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN;
+                js_async_generator_completed_return(ctx, s, next->result);
+                goto done;
+            } else {
+                js_async_generator_reject(ctx, s, next->result);
+            }
+            goto done;
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD:
+        case JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR:
+            value = JS_DupValue(ctx, next->result);
+            if (next->completion_type == GEN_MAGIC_THROW &&
+                s->state == JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD) {
+                JS_Throw(ctx, value);
+                s->func_state.throw_flag = TRUE;
+            } else {
+                /* 'yield' returns a value. 'yield *' also returns a value
+                   in case the 'throw' method is called */
+                s->func_state.frame.cur_sp[-1] = value;
+                s->func_state.frame.cur_sp[0] =
+                    JS_NewInt32(ctx, next->completion_type);
+                s->func_state.frame.cur_sp++;
+            exec_no_arg:
+                s->func_state.throw_flag = FALSE;
+            }
+            s->state = JS_ASYNC_GENERATOR_STATE_EXECUTING;
+        resume_exec:
+            func_ret = async_func_resume(ctx, &s->func_state);
+            if (JS_IsException(func_ret)) {
+                value = JS_GetException(ctx);
+                js_async_generator_complete(ctx, s);
+                js_async_generator_reject(ctx, s, value);
+                JS_FreeValue(ctx, value);
+            } else if (JS_VALUE_GET_TAG(func_ret) == JS_TAG_INT) {
+                int func_ret_code;
+                value = s->func_state.frame.cur_sp[-1];
+                s->func_state.frame.cur_sp[-1] = JS_UNDEFINED;
+                func_ret_code = JS_VALUE_GET_INT(func_ret);
+                switch(func_ret_code) {
+                case FUNC_RET_YIELD:
+                case FUNC_RET_YIELD_STAR:
+                    if (func_ret_code == FUNC_RET_YIELD_STAR)
+                        s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD_STAR;
+                    else
+                        s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_YIELD;
+                    js_async_generator_resolve(ctx, s, value, FALSE);
+                    JS_FreeValue(ctx, value);
+                    break;
+                case FUNC_RET_AWAIT:
+                    js_async_generator_await(ctx, s, value);
+                    JS_FreeValue(ctx, value);
+                    goto done;
+                default:
+                    abort();
+                }
+            } else {
+                assert(JS_IsUndefined(func_ret));
+                /* end of function */
+                value = s->func_state.frame.cur_sp[-1];
+                s->func_state.frame.cur_sp[-1] = JS_UNDEFINED;
+                js_async_generator_complete(ctx, s);
+                js_async_generator_resolve(ctx, s, value, TRUE);
+                JS_FreeValue(ctx, value);
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+ done: ;
+}
+
+static JSValue js_async_generator_resolve_function(JSContext *ctx,
+                                                   JSValueConst this_obj,
+                                                   int argc, JSValueConst *argv,
+                                                   int magic, JSValue *func_data)
+{
+    BOOL is_reject = magic & 1;
+    JSAsyncGeneratorData *s = JS_GetOpaque(func_data[0], JS_CLASS_ASYNC_GENERATOR);
+    JSValueConst arg = argv[0];
+
+    /* XXX: what if s == NULL */
+
+    if (magic >= 2) {
+        /* resume next case in AWAITING_RETURN state */
+        assert(s->state == JS_ASYNC_GENERATOR_STATE_AWAITING_RETURN ||
+               s->state == JS_ASYNC_GENERATOR_STATE_COMPLETED);
+        s->state = JS_ASYNC_GENERATOR_STATE_COMPLETED;
+        if (is_reject) {
+            js_async_generator_reject(ctx, s, arg);
+        } else {
+            js_async_generator_resolve(ctx, s, arg, TRUE);
+        }
+    } else {
+        /* restart function execution after await() */
+        assert(s->state == JS_ASYNC_GENERATOR_STATE_EXECUTING);
+        s->func_state.throw_flag = is_reject;
+        if (is_reject) {
+            JS_Throw(ctx, JS_DupValue(ctx, arg));
+        } else {
+            /* return value of await */
+            s->func_state.frame.cur_sp[-1] = JS_DupValue(ctx, arg);
+        }
+        js_async_generator_resume_next(ctx, s);
+    }
+    return JS_UNDEFINED;
+}
+
+/* magic = GEN_MAGIC_x */
+static JSValue js_async_generator_next(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv,
+                                       int magic)
+{
+    JSAsyncGeneratorData *s = JS_GetOpaque(this_val, JS_CLASS_ASYNC_GENERATOR);
+    JSValue promise, resolving_funcs[2];
+    JSAsyncGeneratorRequest *req;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+        return JS_EXCEPTION;
+    if (!s) {
+        JSValue err, res2;
+        JS_ThrowTypeError(ctx, "not an AsyncGenerator object");
+        err = JS_GetException(ctx);
+        res2 = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED,
+                       1, (JSValueConst *)&err);
+        JS_FreeValue(ctx, err);
+        JS_FreeValue(ctx, res2);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        return promise;
+    }
+    req = js_mallocz(ctx, sizeof(*req));
+    if (!req)
+        goto fail;
+    req->completion_type = magic;
+    req->result = JS_DupValue(ctx, argv[0]);
+    req->promise = JS_DupValue(ctx, promise);
+    req->resolving_funcs[0] = resolving_funcs[0];
+    req->resolving_funcs[1] = resolving_funcs[1];
+    list_add_tail(&req->link, &s->queue);
+    if (s->state != JS_ASYNC_GENERATOR_STATE_EXECUTING) {
+        js_async_generator_resume_next(ctx, s);
+    }
+    return promise;
+ fail:
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    JS_FreeValue(ctx, promise);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_async_generator_function_call(JSContext *ctx, JSValueConst func_obj,
+                                                JSValueConst this_obj,
+                                                int argc, JSValueConst *argv,
+                                                int flags)
+{
+    JSValue obj, func_ret;
+    JSAsyncGeneratorData *s;
+
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        return JS_EXCEPTION;
+    s->state = JS_ASYNC_GENERATOR_STATE_SUSPENDED_START;
+    init_list_head(&s->queue);
+    if (async_func_init(ctx, &s->func_state, func_obj, this_obj, argc, argv)) {
+        s->state = JS_ASYNC_GENERATOR_STATE_COMPLETED;
+        goto fail;
+    }
+
+    /* execute the function up to 'OP_initial_yield' (no yield nor
+       await are possible) */
+    func_ret = async_func_resume(ctx, &s->func_state);
+    if (JS_IsException(func_ret))
+        goto fail;
+    JS_FreeValue(ctx, func_ret);
+
+    obj = js_create_from_ctor(ctx, func_obj, JS_CLASS_ASYNC_GENERATOR);
+    if (JS_IsException(obj))
+        goto fail;
+    s->generator = JS_VALUE_GET_OBJ(obj);
+    JS_SetOpaque(obj, s);
+    return obj;
+ fail:
+    js_async_generator_free(ctx->rt, s);
+    return JS_EXCEPTION;
+}
+
+/* JS parser */
+
+enum {
+    TOK_NUMBER = -128,
+    TOK_STRING,
+    TOK_TEMPLATE,
+    TOK_IDENT,
+    TOK_REGEXP,
+    /* warning: order matters (see js_parse_assign_expr) */
+    TOK_MUL_ASSIGN,
+    TOK_DIV_ASSIGN,
+    TOK_MOD_ASSIGN,
+    TOK_PLUS_ASSIGN,
+    TOK_MINUS_ASSIGN,
+    TOK_SHL_ASSIGN,
+    TOK_SAR_ASSIGN,
+    TOK_SHR_ASSIGN,
+    TOK_AND_ASSIGN,
+    TOK_XOR_ASSIGN,
+    TOK_OR_ASSIGN,
+#ifdef CONFIG_BIGNUM
+    TOK_MATH_POW_ASSIGN,
+#endif
+    TOK_POW_ASSIGN,
+    TOK_DEC,
+    TOK_INC,
+    TOK_SHL,
+    TOK_SAR,
+    TOK_SHR,
+    TOK_LT,
+    TOK_LTE,
+    TOK_GT,
+    TOK_GTE,
+    TOK_EQ,
+    TOK_STRICT_EQ,
+    TOK_NEQ,
+    TOK_STRICT_NEQ,
+    TOK_LAND,
+    TOK_LOR,
+#ifdef CONFIG_BIGNUM
+    TOK_MATH_POW,
+#endif
+    TOK_POW,
+    TOK_ARROW,
+    TOK_ELLIPSIS,
+    TOK_DOUBLE_QUESTION_MARK,
+    TOK_QUESTION_MARK_DOT,
+    TOK_ERROR,
+    TOK_PRIVATE_NAME,
+    TOK_EOF,
+    /* keywords: WARNING: same order as atoms */
+    TOK_NULL, /* must be first */
+    TOK_FALSE,
+    TOK_TRUE,
+    TOK_IF,
+    TOK_ELSE,
+    TOK_RETURN,
+    TOK_VAR,
+    TOK_THIS,
+    TOK_DELETE,
+    TOK_VOID,
+    TOK_TYPEOF,
+    TOK_NEW,
+    TOK_IN,
+    TOK_INSTANCEOF,
+    TOK_DO,
+    TOK_WHILE,
+    TOK_FOR,
+    TOK_BREAK,
+    TOK_CONTINUE,
+    TOK_SWITCH,
+    TOK_CASE,
+    TOK_DEFAULT,
+    TOK_THROW,
+    TOK_TRY,
+    TOK_CATCH,
+    TOK_FINALLY,
+    TOK_FUNCTION,
+    TOK_DEBUGGER,
+    TOK_WITH,
+    /* FutureReservedWord */
+    TOK_CLASS,
+    TOK_CONST,
+    TOK_ENUM,
+    TOK_EXPORT,
+    TOK_EXTENDS,
+    TOK_IMPORT,
+    TOK_SUPER,
+    /* FutureReservedWords when parsing strict mode code */
+    TOK_IMPLEMENTS,
+    TOK_INTERFACE,
+    TOK_LET,
+    TOK_PACKAGE,
+    TOK_PRIVATE,
+    TOK_PROTECTED,
+    TOK_PUBLIC,
+    TOK_STATIC,
+    TOK_YIELD,
+    TOK_AWAIT, /* must be last */
+    TOK_OF,     /* only used for js_parse_skip_parens_token() */
+};
+
+#define TOK_FIRST_KEYWORD   TOK_NULL
+#define TOK_LAST_KEYWORD    TOK_AWAIT
+
+/* unicode code points */
+#define CP_NBSP 0x00a0
+#define CP_BOM  0xfeff
+
+#define CP_LS   0x2028
+#define CP_PS   0x2029
+
+typedef struct BlockEnv {
+    struct BlockEnv *prev;
+    JSAtom label_name; /* JS_ATOM_NULL if none */
+    int label_break; /* -1 if none */
+    int label_cont; /* -1 if none */
+    int drop_count; /* number of stack elements to drop */
+    int label_finally; /* -1 if none */
+    int scope_level;
+    int has_iterator;
+} BlockEnv;
+
+typedef struct JSHoistedDef {
+    int cpool_idx; /* -1 means variable global definition */
+    uint8_t force_init : 1; /* initialize 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;
+
+typedef struct RelocEntry {
+    struct RelocEntry *next;
+    uint32_t addr; /* address to patch */
+    int size;   /* address size: 1, 2 or 4 bytes */
+} RelocEntry;
+
+typedef struct JumpSlot {
+    int op;
+    int size;
+    int pos;
+    int label;
+} JumpSlot;
+
+typedef struct LabelSlot {
+    int ref_count;
+    int pos;    /* phase 1 address, -1 means not resolved yet */
+    int pos2;   /* phase 2 address, -1 means not resolved yet */
+    int addr;   /* phase 3 address, -1 means not resolved yet */
+    RelocEntry *first_reloc;
+} LabelSlot;
+
+typedef struct LineNumberSlot {
+    uint32_t pc;
+    int line_num;
+} LineNumberSlot;
+
+typedef enum JSParseFunctionEnum {
+    JS_PARSE_FUNC_STATEMENT,
+    JS_PARSE_FUNC_VAR,
+    JS_PARSE_FUNC_EXPR,
+    JS_PARSE_FUNC_ARROW,
+    JS_PARSE_FUNC_GETTER,
+    JS_PARSE_FUNC_SETTER,
+    JS_PARSE_FUNC_METHOD,
+    JS_PARSE_FUNC_CLASS_CONSTRUCTOR,
+    JS_PARSE_FUNC_DERIVED_CLASS_CONSTRUCTOR,
+} JSParseFunctionEnum;
+
+typedef enum JSParseExportEnum {
+    JS_PARSE_EXPORT_NONE,
+    JS_PARSE_EXPORT_NAMED,
+    JS_PARSE_EXPORT_DEFAULT,
+} JSParseExportEnum;
+
+typedef struct JSFunctionDef {
+    JSContext *ctx;
+    struct JSFunctionDef *parent;
+    int parent_cpool_idx; /* index in the constant pool of the parent
+                             or -1 if none */
+    int parent_scope_level; /* scope level in parent at point of definition */
+    struct list_head child_list; /* list of JSFunctionDef.link */
+    struct list_head link;
+
+    BOOL is_eval; /* TRUE if eval code */
+    int eval_type; /* only valid if is_eval = TRUE */
+    BOOL is_global_var; /* TRUE if variables are not defined locally:
+                           eval global, eval module or non strict eval */
+    BOOL is_func_expr; /* TRUE if function expression */
+    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_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
+                                   available in the function */
+    BOOL has_this_binding; /* true if the 'this' and new.target binding are
+                              available in the function */
+    BOOL new_target_allowed; /* true if the 'new.target' does not
+                                throw a syntax error */
+    BOOL super_call_allowed; /* true if super() is allowed */
+    BOOL super_allowed; /* true if super. or super[] is allowed */
+    BOOL arguments_allowed; /* true if the 'arguments' identifier is allowed */
+    BOOL is_derived_class_constructor;
+    BOOL in_function_body;
+    BOOL backtrace_barrier;
+    JSFunctionKindEnum func_kind : 8;
+    JSParseFunctionEnum func_type : 8;
+    uint8_t js_mode; /* bitmap of JS_MODE_x */
+    JSAtom func_name; /* JS_ATOM_NULL if no name */
+
+    JSVarDef *vars;
+    int var_size; /* allocated size for vars[] */
+    int var_count;
+    JSVarDef *args;
+    int arg_size; /* allocated size for args[] */
+    int arg_count; /* number of arguments */
+    int defined_arg_count;
+    int var_object_idx; /* -1 if none */
+    int arguments_var_idx; /* -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 */
+    int this_var_idx; /* variable containg the 'this' value, -1 if none */
+    int new_target_var_idx; /* variable containg the 'new.target' value, -1 if none */
+    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 hoisted_def_count;
+    int hoisted_def_size;
+    JSHoistedDef *hoisted_def;
+
+    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;
+    BlockEnv *top_break; /* break/continue label stack */
+
+    /* constant pool (strings, functions, numbers) */
+    JSValue *cpool;
+    uint32_t cpool_count;
+    uint32_t cpool_size;
+
+    /* list of variables in the closure */
+    int closure_var_count;
+    int closure_var_size;
+    JSClosureVar *closure_var;
+
+    JumpSlot *jump_slots;
+    int jump_size;
+    int jump_count;
+
+    LineNumberSlot *line_number_slots;
+    int line_number_size;
+    int line_number_count;
+    int line_number_last;
+    int line_number_last_pc;
+
+    /* pc2line table */
+    JSAtom filename;
+    int line_num;
+    DynBuf pc2line;
+
+    char *source;  /* raw source, utf-8 encoded */
+    int source_len;
+
+    JSModuleDef *module; /* != NULL when parsing a module */
+} JSFunctionDef;
+
+typedef struct JSToken {
+    int val;
+    int line_num;   /* line number of token start */
+    const uint8_t *ptr;
+    union {
+        struct {
+            JSValue str;
+            int sep;
+        } str;
+        struct {
+            JSValue val;
+#ifdef CONFIG_BIGNUM
+            slimb_t exponent; /* may be != 0 only if val is a float */
+#endif
+        } num;
+        struct {
+            JSAtom atom;
+            BOOL has_escape;
+            BOOL is_reserved;
+        } ident;
+        struct {
+            JSValue body;
+            JSValue flags;
+        } regexp;
+    } u;
+} JSToken;
+
+typedef struct JSParseState {
+    JSContext *ctx;
+    int last_line_num;  /* line number of last token */
+    int line_num;       /* line number of current offset */
+    const char *filename;
+    JSToken token;
+    BOOL got_lf; /* true if got line feed before the current token */
+    const uint8_t *last_ptr;
+    const uint8_t *buf_ptr;
+    const uint8_t *buf_end;
+
+    /* current function code */
+    JSFunctionDef *cur_func;
+    BOOL is_module; /* parsing a module */
+    BOOL allow_html_comments;
+} JSParseState;
+
+typedef struct JSOpCode {
+#ifdef DUMP_BYTECODE
+    const char *name;
+#endif
+    uint8_t size; /* in bytes */
+    /* the opcodes remove n_pop items from the top of the stack, then
+       pushes n_push items */
+    uint8_t n_pop;
+    uint8_t n_push;
+    uint8_t fmt;
+} JSOpCode;
+
+static const JSOpCode opcode_info[OP_COUNT + (OP_TEMP_END - OP_TEMP_START)] = {
+#define FMT(f)
+#ifdef DUMP_BYTECODE
+#define DEF(id, size, n_pop, n_push, f) { #id, size, n_pop, n_push, OP_FMT_ ## f },
+#else
+#define DEF(id, size, n_pop, n_push, f) { size, n_pop, n_push, OP_FMT_ ## f },
+#endif
+#include "quickjs-opcode.h"
+#undef DEF
+#undef FMT
+};
+
+#if SHORT_OPCODES
+/* After the final compilation pass, short opcodes are used. Their
+   opcodes overlap with the temporary opcodes which cannot appear in
+   the final bytecode. Their description is after the temporary
+   opcodes in opcode_info[]. */
+#define short_opcode_info(op)           \
+    opcode_info[(op) >= OP_TEMP_START ? \
+                (op) + (OP_TEMP_END - OP_TEMP_START) : (op)]
+#else
+#define short_opcode_info(op) opcode_info[op]
+#endif
+
+static __exception int next_token(JSParseState *s);
+
+static void free_token(JSParseState *s, JSToken *token)
+{
+    switch(token->val) {
+#ifdef CONFIG_BIGNUM
+    case TOK_NUMBER:
+        JS_FreeValue(s->ctx, token->u.num.val);
+        break;
+#endif
+    case TOK_STRING:
+    case TOK_TEMPLATE:
+        JS_FreeValue(s->ctx, token->u.str.str);
+        break;
+    case TOK_REGEXP:
+        JS_FreeValue(s->ctx, token->u.regexp.body);
+        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)
+            JS_FreeAtom(s->ctx, token->u.ident.atom);
+#endif
+        break;
+    }
+}
+
+static void __maybe_unused dump_token(JSParseState *s, const JSToken *token)
+{
+    switch(token->val) {
+    case TOK_NUMBER:
+        {
+            double d;
+            JS_ToFloat64(s->ctx, &d, token->u.num.val);  /* no exception possible */
+            printf("number: %.14g\n", d);
+        }
+        break;
+    case TOK_IDENT:
+    dump_atom:
+        {
+            char buf[ATOM_GET_STR_BUF_SIZE];
+            printf("ident: '%s'\n",
+                   JS_AtomGetStr(s->ctx, buf, sizeof(buf), token->u.ident.atom));
+        }
+        break;
+    case TOK_STRING:
+        {
+            const char *str;
+            /* XXX: quote the string */
+            str = JS_ToCString(s->ctx, token->u.str.str);
+            printf("string: '%s'\n", str);
+            JS_FreeCString(s->ctx, str);
+        }
+        break;
+    case TOK_TEMPLATE:
+        {
+            const char *str;
+            str = JS_ToCString(s->ctx, token->u.str.str);
+            printf("template: `%s`\n", str);
+            JS_FreeCString(s->ctx, str);
+        }
+        break;
+    case TOK_REGEXP:
+        {
+            const char *str, *str2;
+            str = JS_ToCString(s->ctx, token->u.regexp.body);
+            str2 = JS_ToCString(s->ctx, token->u.regexp.flags);
+            printf("regexp: '%s' '%s'\n", str, str2);
+            JS_FreeCString(s->ctx, str);
+            JS_FreeCString(s->ctx, str2);
+        }
+        break;
+    case TOK_EOF:
+        printf("eof\n");
+        break;
+    default:
+        if (s->token.val >= TOK_NULL && s->token.val <= TOK_LAST_KEYWORD) {
+            goto dump_atom;
+        } else if (s->token.val >= 256) {
+            printf("token: %d\n", token->val);
+        } else {
+            printf("token: '%c'\n", token->val);
+        }
+        break;
+    }
+}
+
+#if defined(_WIN32)
+int js_parse_error(JSParseState *s, const char *fmt, ...)
+#else
+int __attribute__((format(printf, 2, 3))) js_parse_error(JSParseState *s, const char *fmt, ...)
+#endif
+{
+    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,
+                    backtrace_flags);
+    return -1;
+}
+
+static int js_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 next_token(s);
+}
+
+static int js_parse_expect_semi(JSParseState *s)
+{
+    if (s->token.val != ';') {
+        /* automatic insertion of ';' */
+        if (s->token.val == TOK_EOF || s->token.val == '}' || s->got_lf) {
+            return 0;
+        }
+        return js_parse_error(s, "expecting '%c'", ';');
+    }
+    return next_token(s);
+}
+
+static int js_parse_error_reserved_identifier(JSParseState *s)
+{
+    char buf1[ATOM_GET_STR_BUF_SIZE];
+    return js_parse_error(s, "'%s' is a reserved identifier",
+                          JS_AtomGetStr(s->ctx, buf1, sizeof(buf1),
+                                        s->token.u.ident.atom));
+}
+
+static __exception int js_parse_template_part(JSParseState *s, const uint8_t *p)
+{
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* p points to the first byte of the template part */
+    if (string_buffer_init(s->ctx, b, 32))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end)
+            goto unexpected_eof;
+        c = *p++;
+        if (c == '`') {
+            /* template end part */
+            break;
+        }
+        if (c == '$' && *p == '{') {
+            /* template start or middle part */
+            p++;
+            break;
+        }
+        if (c == '\\') {
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            if (p >= s->buf_end)
+                goto unexpected_eof;
+            c = *p++;
+        }
+        /* newline sequences are normalized as single '\n' bytes */
+        if (c == '\r') {
+            if (*p == '\n')
+                p++;
+            c = '\n';
+        }
+        if (c == '\n') {
+            s->line_num++;
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+                js_parse_error(s, "invalid UTF-8 sequence");
+                goto fail;
+            }
+            p = p_next;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    s->token.val = TOK_TEMPLATE;
+    s->token.u.str.sep = c;
+    s->token.u.str.str = string_buffer_end(b);
+    s->buf_ptr = p;
+    return 0;
+
+ unexpected_eof:
+    js_parse_error(s, "unexpected end of string");
+ fail:
+    string_buffer_free(b);
+    return -1;
+}
+
+static __exception int js_parse_string(JSParseState *s, int sep,
+                                       BOOL do_throw, const uint8_t *p,
+                                       JSToken *token, const uint8_t **pp)
+{
+    int ret;
+    uint32_t c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* string */
+    if (string_buffer_init(s->ctx, b, 32))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end)
+            goto invalid_char;
+        c = *p;
+        if (c < 0x20) {
+            if (!s->cur_func) {
+                if (do_throw)
+                    js_parse_error(s, "invalid character in a JSON string");
+                goto fail;
+            }
+            if (sep == '`') {
+                if (c == '\r') {
+                    if (p[1] == '\n')
+                        p++;
+                    c = '\n';
+                }
+                /* do not update s->line_num */
+            } else if (c == '\n' || c == '\r')
+                goto invalid_char;
+        }
+        p++;
+        if (c == sep)
+            break;
+        if (c == '$' && *p == '{' && sep == '`') {
+            /* template start or middle part */
+            p++;
+            break;
+        }
+        if (c == '\\') {
+            c = *p;
+            switch(c) {
+            case '\0':
+                if (p >= s->buf_end)
+                    goto invalid_char;
+                p++;
+                break;
+            case '\'':
+            case '\"':
+            case '\\':
+                p++;
+                break;
+            case '\r':  /* accept DOS and MAC newline sequences */
+                if (p[1] == '\n') {
+                    p++;
+                }
+                /* fall thru */
+            case '\n':
+                /* ignore escaped newline sequence */
+                p++;
+                if (sep != '`')
+                    s->line_num++;
+                continue;
+            default:
+                if (c >= '0' && c <= '7') {
+                    if (!s->cur_func)
+                        goto invalid_octal; /* 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");
+                        goto fail;
+                    }
+                } else if (c >= 0x80) {
+                    const uint8_t *p_next;
+                    c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+                    if (c > 0x10FFFF) {
+                        goto invalid_utf8;
+                    }
+                    p = p_next;
+                    /* LS or PS are skipped */
+                    if (c == CP_LS || c == CP_PS)
+                        continue;
+                } else {
+                parse_escape:
+                    ret = lre_parse_escape(&p, TRUE);
+                    if (ret == -1) {
+                        if (do_throw)
+                            js_parse_error(s, "malformed escape sequence in string literal");
+                        goto fail;
+                    } else if (ret < 0) {
+                        /* ignore the '\' (could output a warning) */
+                        p++;
+                    } else {
+                        c = ret;
+                    }
+                }
+                break;
+            }
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF)
+                goto invalid_utf8;
+            p = p_next;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    token->val = TOK_STRING;
+    token->u.str.sep = c;
+    token->u.str.str = string_buffer_end(b);
+    *pp = p;
+    return 0;
+
+ invalid_utf8:
+    if (do_throw)
+        js_parse_error(s, "invalid UTF-8 sequence");
+    goto fail;
+ invalid_char:
+    if (do_throw)
+        js_parse_error(s, "unexpected end of string");
+ fail:
+    string_buffer_free(b);
+    return -1;
+}
+
+static inline BOOL token_is_pseudo_keyword(JSParseState *s, JSAtom atom) {
+    return s->token.val == TOK_IDENT && s->token.u.ident.atom == atom &&
+        !s->token.u.ident.has_escape;
+}
+
+static __exception int js_parse_regexp(JSParseState *s)
+{
+    const uint8_t *p;
+    BOOL in_class;
+    StringBuffer b_s, *b = &b_s;
+    StringBuffer b2_s, *b2 = &b2_s;
+    uint32_t c;
+
+    p = s->buf_ptr;
+    p++;
+    in_class = FALSE;
+    if (string_buffer_init(s->ctx, b, 32))
+        return -1;
+    if (string_buffer_init(s->ctx, b2, 1))
+        goto fail;
+    for(;;) {
+        if (p >= s->buf_end) {
+        eof_error:
+            js_parse_error(s, "unexpected end of regexp");
+            goto fail;
+        }
+        c = *p++;
+        if (c == '\n' || c == '\r') {
+            goto eol_error;
+        } else if (c == '/') {
+            if (!in_class)
+                break;
+        } else if (c == '[') {
+            in_class = TRUE;
+        } else if (c == ']') {
+            /* XXX: incorrect as the first character in a class */
+            in_class = FALSE;
+        } else if (c == '\\') {
+            if (string_buffer_putc8(b, c))
+                goto fail;
+            c = *p++;
+            if (c == '\n' || c == '\r')
+                goto eol_error;
+            else if (c == '\0' && p >= s->buf_end)
+                goto eof_error;
+            else if (c >= 0x80) {
+                const uint8_t *p_next;
+                c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+                if (c > 0x10FFFF) {
+                    goto invalid_utf8;
+                }
+                p = p_next;
+                if (c == CP_LS || c == CP_PS)
+                    goto eol_error;
+            }
+        } else if (c >= 0x80) {
+            const uint8_t *p_next;
+            c = unicode_from_utf8(p - 1, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+            invalid_utf8:
+                js_parse_error(s, "invalid UTF-8 sequence");
+                goto fail;
+            }
+            p = p_next;
+            /* LS or PS are considered as line terminator */
+            if (c == CP_LS || c == CP_PS) {
+            eol_error:
+                js_parse_error(s, "unexpected line terminator in regexp");
+                goto fail;
+            }
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+
+    /* flags */
+    for(;;) {
+        const uint8_t *p_next = p;
+        c = *p_next++;
+        if (c >= 0x80) {
+            c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p_next);
+            if (c > 0x10FFFF) {
+                goto invalid_utf8;
+            }
+        }
+        if (!lre_js_is_ident_next(c))
+            break;
+        if (string_buffer_putc(b2, c))
+            goto fail;
+        p = p_next;
+    }
+
+    s->token.val = TOK_REGEXP;
+    s->token.u.regexp.body = string_buffer_end(b);
+    s->token.u.regexp.flags = string_buffer_end(b2);
+    s->buf_ptr = p;
+    return 0;
+ fail:
+    string_buffer_free(b);
+    string_buffer_free(b2);
+    return -1;
+}
+
+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)) {
+        return js_parse_error(s, "stack overflow");
+    }
+
+    free_token(s, &s->token);
+
+    p = s->last_ptr = s->buf_ptr;
+    s->got_lf = FALSE;
+    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:
+        s->token.val = TOK_EOF;
+        break;
+    case '`':
+        if (!s->cur_func) {
+            /* JSON does not accept templates */
+            goto def_token;
+        }
+        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;
+        break;
+    case '\r':  /* accept DOS and MAC newline sequences */
+        if (p[1] == '\n') {
+            p++;
+        }
+        /* fall thru */
+    case '\n':
+        p++;
+    line_terminator:
+        s->got_lf = TRUE;
+        s->line_num++;
+        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++;
+        goto redo;
+    case '/':
+        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++;
+                    s->got_lf = TRUE; /* considered as LF for ASI */
+                    p++;
+                } else if (*p == '\r') {
+                    s->got_lf = TRUE; /* considered as LF for ASI */
+                    p++;
+                } else if (*p >= 0x80) {
+                    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 {
+                    p++;
+                }
+            }
+            goto redo;
+        } else if (p[1] == '/') {
+            /* line comment */
+            p += 2;
+        skip_line_comment:
+            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 {
+                    p++;
+                }
+            }
+            goto redo;
+        } else if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_DIV_ASSIGN;
+        } else {
+            p++;
+            s->token.val = c;
+        }
+        break;
+    case '\\':
+        if (p[1] == 'u') {
+            const uint8_t *p1 = p + 1;
+            int c1 = lre_parse_escape(&p1, TRUE);
+            if (c1 >= 0 && lre_js_is_ident_first(c1)) {
+                c = c1;
+                p = p1;
+                ident_has_escape = TRUE;
+                goto has_ident;
+            } else {
+                /* XXX: syntax error? */
+            }
+        }
+        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 '_':
+    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);
+        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->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_type == JS_PARSE_FUNC_ARROW &&
+                 !s->cur_func->in_function_body && s->cur_func->parent &&
+                 (s->cur_func->parent->func_kind & JS_FUNC_ASYNC))))))) {
+                  if (ident_has_escape) {
+                      s->token.u.ident.is_reserved = TRUE;
+                      s->token.val = TOK_IDENT;
+                  } else {
+                      /* The keywords atoms are pre allocated */
+                      s->token.val = s->token.u.ident.atom - 1 + TOK_FIRST_KEYWORD;
+                  }
+        } else {
+            s->token.val = TOK_IDENT;
+        }
+        break;
+    case '#':
+        /* private name */
+        {
+            const uint8_t *p1;
+            p++;
+            q = buf;
+            *q++ = '#';
+            p1 = p;
+            c = *p1++;
+            if (c == '\\' && *p1 == 'u') {
+                c = lre_parse_escape(&p1, TRUE);
+            } else if (c >= 128) {
+                c = unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1);
+            }
+            if (!lre_js_is_ident_first(c)) {
+                js_parse_error(s, "invalid first character of private name");
+                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);
+            s->token.val = TOK_PRIVATE_NAME;
+        }
+        break;
+    case '.':
+        if (p[1] == '.' && p[2] == '.') {
+            p += 3;
+            s->token.val = TOK_ELLIPSIS;
+            break;
+        }
+        if (p[1] >= '0' && p[1] <= '9') {
+            goto parse_number;
+        } else {
+            goto def_token;
+        }
+        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))) {
+            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
+        /* 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;
+#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;
+            }
+#ifdef CONFIG_BIGNUM
+            s->token.u.num.exponent = 0;
+            ret = js_atof2(s->ctx, (const char *)p, (const char **)&p, radix,
+                           flags, &s->token.u.num.exponent);
+#else
+            ret = js_atof(s->ctx, (const char *)p, (const char **)&p, radix,
+                          flags);
+#endif
+            if (JS_IsException(ret))
+                goto fail;
+            /* reject `10instanceof Number` */
+            if (JS_VALUE_IS_NAN(ret) ||
+                lre_js_is_ident_next(unicode_from_utf8(p, UTF8_CHAR_LEN_MAX, &p1))) {
+                JS_FreeValue(s->ctx, ret);
+                js_parse_error(s, "invalid number literal");
+                goto fail;
+            }
+            s->token.val = TOK_NUMBER;
+            s->token.u.num.val = ret;
+        }
+        break;
+    case '*':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MUL_ASSIGN;
+        } else if (p[1] == '*') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_POW_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_POW;
+            }
+        } else {
+            goto def_token;
+        }
+        break;
+    case '%':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MOD_ASSIGN;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '+':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_PLUS_ASSIGN;
+        } else if (p[1] == '+') {
+            p += 2;
+            s->token.val = TOK_INC;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '-':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_MINUS_ASSIGN;
+        } else if (p[1] == '-') {
+            if (s->allow_html_comments &&
+                p[2] == '>' && s->last_line_num != s->line_num) {
+                /* Annex B: `-->` at beginning of line is an html comment end.
+                   It extends to the end of the line.
+                 */
+                goto skip_line_comment;
+            }
+            p += 2;
+            s->token.val = TOK_DEC;
+        } else {
+            goto def_token;
+        }
+        break;
+    case '<':
+        if (p[1] == '=') {
+            p += 2;
+            s->token.val = TOK_LTE;
+        } else if (p[1] == '<') {
+            if (p[2] == '=') {
+                p += 3;
+                s->token.val = TOK_SHL_ASSIGN;
+            } else {
+                p += 2;
+                s->token.val = TOK_SHL;
+            }
+        } else if (s->allow_html_comments &&
+                   p[1] == '!' && p[2] == '-' && p[3] == '-') {
+            /* Annex B: handle `" 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 */
+    if (n >= 0) {
+        if (string_buffer_concat_value(b, argv[n]))
+            goto fail;
+    }
+    string_buffer_puts8(b, "\n})");
+    s = string_buffer_end(b);
+    if (JS_IsException(s))
+        goto fail1;
+
+    obj = JS_EvalObject(ctx, ctx->global_obj, s, JS_EVAL_TYPE_INDIRECT, -1);
+    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);
+        if (JS_IsException(proto))
+            goto fail1;
+        if (!JS_IsUndefined(proto)) {
+            ret = JS_SetPrototypeInternal(ctx, obj, proto, TRUE);
+            JS_FreeValue(ctx, proto);
+            if (ret < 0)
+                goto fail1;
+        }
+    }
+    return obj;
+
+ fail:
+    string_buffer_free(b);
+ fail1:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static __exception int js_get_length32(JSContext *ctx, uint32_t *pres,
+                                       JSValueConst obj)
+{
+    JSValue len_val;
+    len_val = JS_GetProperty(ctx, obj, JS_ATOM_length);
+    if (JS_IsException(len_val)) {
+        *pres = 0;
+        return -1;
+    }
+    return JS_ToUint32Free(ctx, pres, len_val);
+}
+
+static __exception int js_get_length64(JSContext *ctx, int64_t *pres,
+                                       JSValueConst obj)
+{
+    JSValue len_val;
+    len_val = JS_GetProperty(ctx, obj, JS_ATOM_length);
+    if (JS_IsException(len_val)) {
+        *pres = 0;
+        return -1;
+    }
+    return JS_ToLengthFree(ctx, pres, len_val);
+}
+
+static void free_arg_list(JSContext *ctx, JSValue *tab, uint32_t len)
+{
+    uint32_t i;
+    for(i = 0; i < len; i++) {
+        JS_FreeValue(ctx, tab[i]);
+    }
+    js_free(ctx, tab);
+}
+
+/* XXX: should use ValueArray */
+static JSValue *build_arg_list(JSContext *ctx, uint32_t *plen,
+                               JSValueConst array_arg)
+{
+    uint32_t len, i;
+    JSValue *tab, ret;
+    JSObject *p;
+
+    if (JS_VALUE_GET_TAG(array_arg) != JS_TAG_OBJECT) {
+        JS_ThrowTypeError(ctx, "not a object");
+        return NULL;
+    }
+    if (js_get_length32(ctx, &len, array_arg))
+        return NULL;
+    /* avoid allocating 0 bytes */
+    tab = js_mallocz(ctx, sizeof(tab[0]) * max_uint32(1, len));
+    if (!tab)
+        return NULL;
+    p = JS_VALUE_GET_OBJ(array_arg);
+    if ((p->class_id == JS_CLASS_ARRAY || p->class_id == JS_CLASS_ARGUMENTS) &&
+        p->fast_array &&
+        len == p->u.array.count) {
+        for(i = 0; i < len; i++) {
+            tab[i] = JS_DupValue(ctx, p->u.array.u.values[i]);
+        }
+    } else {
+        for(i = 0; i < len; i++) {
+            ret = JS_GetPropertyUint32(ctx, array_arg, i);
+            if (JS_IsException(ret)) {
+                free_arg_list(ctx, tab, i);
+                return NULL;
+            }
+            tab[i] = ret;
+        }
+    }
+    *plen = len;
+    return tab;
+}
+
+static JSValue js_function_apply(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic)
+{
+    JSValueConst this_arg, array_arg;
+    uint32_t len;
+    JSValue *tab, ret;
+
+    if (check_function(ctx, this_val))
+        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) {
+        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) {
+        ret = JS_CallConstructor2(ctx, this_val, this_arg, len, (JSValueConst *)tab);
+    } else {
+        ret = JS_Call(ctx, this_val, this_arg, len, (JSValueConst *)tab);
+    }
+    free_arg_list(ctx, tab, len);
+    return ret;
+}
+
+static JSValue js_function_call(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    if (argc <= 0) {
+        return JS_Call(ctx, this_val, JS_UNDEFINED, 0, NULL);
+    } else {
+        return JS_Call(ctx, this_val, argv[0], argc - 1, argv + 1);
+    }
+}
+
+static JSValue js_function_bind(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSBoundFunction *bf;
+    JSValue func_obj, name1;
+    JSObject *p;
+    int arg_count, i;
+    uint32_t len1;
+
+    if (check_function(ctx, this_val))
+        return JS_EXCEPTION;
+
+    func_obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                 JS_CLASS_BOUND_FUNCTION);
+    if (JS_IsException(func_obj))
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_OBJ(func_obj);
+    p->is_constructor = JS_IsConstructor(ctx, this_val);
+    arg_count = max_int(0, argc - 1);
+    bf = js_malloc(ctx, sizeof(*bf) + arg_count * sizeof(JSValue));
+    if (!bf)
+        goto exception;
+    bf->func_obj = JS_DupValue(ctx, this_val);
+    bf->this_val = JS_DupValue(ctx, argv[0]);
+    bf->argc = arg_count;
+    for(i = 0; i < arg_count; i++) {
+        bf->argv[i] = JS_DupValue(ctx, argv[i + 1]);
+    }
+    p->u.bound_function = bf;
+
+    name1 = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+    if (JS_IsException(name1))
+        goto exception;
+    if (!JS_IsString(name1)) {
+        JS_FreeValue(ctx, name1);
+        name1 = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    }
+    name1 = JS_ConcatString3(ctx, "bound ", name1, "");
+    if (JS_IsException(name1))
+        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);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_function_toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    JSFunctionKindEnum func_kind = JS_FUNC_NORMAL;
+
+    if (check_function(ctx, this_val))
+        return JS_EXCEPTION;
+
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (js_class_has_bytecode(p->class_id)) {
+        JSFunctionBytecode *b = p->u.func.function_bytecode;
+        if (b->has_debug && b->debug.source) {
+            return JS_NewStringLen(ctx, b->debug.source, b->debug.source_len);
+        }
+        func_kind = b->func_kind;
+    }
+    {
+        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}";
+        }
+        name = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+        if (JS_IsUndefined(name))
+            name = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        return JS_ConcatString3(ctx, pref, name, suff);
+    }
+}
+
+static JSValue js_function_hasInstance(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_OrdinaryIsInstanceOf(ctx, argv[0], this_val);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static const JSCFunctionListEntry js_function_proto_funcs[] = {
+    JS_CFUNC_DEF("call", 1, js_function_call ),
+    JS_CFUNC_MAGIC_DEF("apply", 2, js_function_apply, 0 ),
+    JS_CFUNC_DEF("bind", 1, js_function_bind ),
+    JS_CFUNC_DEF("toString", 0, js_function_toString ),
+    JS_CFUNC_DEF("[Symbol.hasInstance]", 1, js_function_hasInstance ),
+    JS_CGETSET_DEF("fileName", js_function_proto_fileName, NULL ),
+    JS_CGETSET_DEF("lineNumber", js_function_proto_lineNumber, NULL ),
+};
+
+/* Error class */
+
+static JSValue js_error_constructor(JSContext *ctx, JSValueConst new_target,
+                                    int argc, JSValueConst *argv, int magic)
+{
+    JSValue obj, msg, proto;
+    JSValueConst proto1;
+
+    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);
+    if (JS_IsException(proto))
+        return proto;
+    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;
+        }
+        JS_DefinePropertyValue(ctx, obj, JS_ATOM_message, msg,
+                               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;
+}
+
+static JSValue js_error_toString(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue name, msg;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    name = JS_GetProperty(ctx, this_val, JS_ATOM_name);
+    if (JS_IsUndefined(name))
+        name = JS_AtomToString(ctx, JS_ATOM_Error);
+    else
+        name = JS_ToStringFree(ctx, name);
+    if (JS_IsException(name))
+        return JS_EXCEPTION;
+
+    msg = JS_GetProperty(ctx, this_val, JS_ATOM_message);
+    if (JS_IsUndefined(msg))
+        msg = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    else
+        msg = JS_ToStringFree(ctx, msg);
+    if (JS_IsException(msg)) {
+        JS_FreeValue(ctx, name);
+        return JS_EXCEPTION;
+    }
+    if (!JS_IsEmptyString(name) && !JS_IsEmptyString(msg))
+        name = JS_ConcatString3(ctx, "", name, ": ");
+    return JS_ConcatString(ctx, name, msg);
+}
+
+static const JSCFunctionListEntry js_error_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_error_toString ),
+    JS_PROP_STRING_DEF("name", "Error", JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+    JS_PROP_STRING_DEF("message", "", JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* Array */
+
+static int JS_CopySubArray(JSContext *ctx,
+                           JSValueConst obj, int64_t to_pos,
+                           int64_t from_pos, int64_t count, int dir)
+{
+    int64_t i, from, to;
+    JSValue val;
+    int fromPresent;
+
+    /* XXX: should special case fast arrays */
+    for (i = 0; i < count; i++) {
+        if (dir < 0) {
+            from = from_pos + count - i - 1;
+            to = to_pos + count - i - 1;
+        } else {
+            from = from_pos + i;
+            to = to_pos + i;
+        }
+        fromPresent = JS_TryGetPropertyInt64(ctx, obj, from, &val);
+        if (fromPresent < 0)
+            goto exception;
+
+        if (fromPresent) {
+            if (JS_SetPropertyInt64(ctx, obj, to, val) < 0)
+                goto exception;
+        } else {
+            if (JS_DeletePropertyInt64(ctx, obj, to, JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    return 0;
+
+ exception:
+    return -1;
+}
+
+static JSValue js_array_constructor(JSContext *ctx, JSValueConst new_target,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int i;
+
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_ARRAY);
+    if (JS_IsException(obj))
+        return obj;
+    if (argc == 1 && JS_IsNumber(argv[0])) {
+        uint32_t len;
+        if (JS_ToArrayLengthFree(ctx, &len, JS_DupValue(ctx, argv[0])))
+            goto fail;
+        if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewUint32(ctx, len)) < 0)
+            goto fail;
+    } else {
+        for(i = 0; i < argc; i++) {
+            if (JS_SetPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i])) < 0)
+                goto fail;
+        }
+    }
+    return obj;
+fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_from(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    // from(items, mapfn = void 0, this_arg = void 0)
+    JSValueConst items = argv[0], mapfn, this_arg;
+    JSValueConst args[2];
+    JSValue stack[2];
+    JSValue iter, r, v, v2, arrayLike;
+    int64_t k, len;
+    int done, mapping;
+
+    mapping = FALSE;
+    mapfn = JS_UNDEFINED;
+    this_arg = JS_UNDEFINED;
+    r = JS_UNDEFINED;
+    arrayLike = JS_UNDEFINED;
+    stack[0] = JS_UNDEFINED;
+    stack[1] = JS_UNDEFINED;
+
+    if (argc > 1) {
+        mapfn = argv[1];
+        if (!JS_IsUndefined(mapfn)) {
+            if (check_function(ctx, mapfn))
+                goto exception;
+            mapping = 1;
+            if (argc > 2)
+                this_arg = argv[2];
+        }
+    }
+    iter = JS_GetProperty(ctx, items, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto exception;
+    if (!JS_IsUndefined(iter)) {
+        JS_FreeValue(ctx, iter);
+        if (JS_IsConstructor(ctx, this_val))
+            r = JS_CallConstructor(ctx, this_val, 0, NULL);
+        else
+            r = JS_NewArray(ctx);
+        if (JS_IsException(r))
+            goto exception;
+        stack[0] = JS_DupValue(ctx, items);
+        if (js_for_of_start(ctx, &stack[1], FALSE))
+            goto exception;
+        for (k = 0;; k++) {
+            v = JS_IteratorNext(ctx, stack[0], stack[1], 0, NULL, &done);
+            if (JS_IsException(v))
+                goto exception_close;
+            if (done)
+                break;
+            if (mapping) {
+                args[0] = v;
+                args[1] = JS_NewInt32(ctx, k);
+                v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+                JS_FreeValue(ctx, v);
+                v = v2;
+                if (JS_IsException(v))
+                    goto exception_close;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception_close;
+        }
+    } else {
+        arrayLike = JS_ToObject(ctx, items);
+        if (JS_IsException(arrayLike))
+            goto exception;
+        if (js_get_length64(ctx, &len, arrayLike) < 0)
+            goto exception;
+        v = JS_NewInt64(ctx, len);
+        args[0] = v;
+        if (JS_IsConstructor(ctx, this_val)) {
+            r = JS_CallConstructor(ctx, this_val, 1, args);
+        } else {
+            r = js_array_constructor(ctx, JS_UNDEFINED, 1, args);
+        }
+        JS_FreeValue(ctx, v);
+        if (JS_IsException(r))
+            goto exception;
+        for(k = 0; k < len; k++) {
+            v = JS_GetPropertyInt64(ctx, arrayLike, k);
+            if (JS_IsException(v))
+                goto exception;
+            if (mapping) {
+                args[0] = v;
+                args[1] = JS_NewInt32(ctx, k);
+                v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+                JS_FreeValue(ctx, v);
+                v = v2;
+                if (JS_IsException(v))
+                    goto exception;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, r, k, v,
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, r, JS_ATOM_length, JS_NewUint32(ctx, k)) < 0)
+        goto exception;
+    goto done;
+
+ exception_close:
+    if (!JS_IsUndefined(stack[0]))
+        JS_IteratorClose(ctx, stack[0], TRUE);
+ exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+ done:
+    JS_FreeValue(ctx, arrayLike);
+    JS_FreeValue(ctx, stack[0]);
+    JS_FreeValue(ctx, stack[1]);
+    return r;
+}
+
+static JSValue js_array_of(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    JSValue obj, args[1];
+    int i;
+
+    if (JS_IsConstructor(ctx, this_val)) {
+        args[0] = JS_NewInt32(ctx, argc);
+        obj = JS_CallConstructor(ctx, this_val, 1, (JSValueConst *)args);
+    } else {
+        obj = JS_NewArray(ctx);
+    }
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    for(i = 0; i < argc; i++) {
+        if (JS_CreateDataPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i]),
+                                        JS_PROP_THROW) < 0) {
+            goto fail;
+        }
+    }
+    if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewUint32(ctx, argc)) < 0) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static JSValue js_array_isArray(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_IsArray(ctx, argv[0]);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_get_this(JSContext *ctx,
+                           JSValueConst this_val)
+{
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue JS_ArraySpeciesCreate(JSContext *ctx, JSValueConst obj,
+                                     JSValueConst len_val)
+{
+    JSValue ctor, ret;
+    int res;
+
+    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);
+    if (JS_IsException(ctor))
+        return JS_EXCEPTION;
+    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;
+}
+
+static const JSCFunctionListEntry js_array_funcs[] = {
+    JS_CFUNC_DEF("isArray", 1, js_array_isArray ),
+    JS_CFUNC_DEF("from", 1, js_array_from ),
+    JS_CFUNC_DEF("of", 0, js_array_of ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static int JS_isConcatSpreadable(JSContext *ctx, JSValueConst obj)
+{
+    JSValue val;
+
+    if (!JS_IsObject(obj))
+        return FALSE;
+    val = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_isConcatSpreadable);
+    if (JS_IsException(val))
+        return -1;
+    if (!JS_IsUndefined(val))
+        return JS_ToBoolFree(ctx, val);
+    return JS_IsArray(ctx, obj);
+}
+
+static JSValue js_array_concat(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue obj, arr, val;
+    JSValueConst e;
+    int64_t len, k, n;
+    int i, res;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        goto exception;
+
+    arr = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+    if (JS_IsException(arr))
+        goto exception;
+    n = 0;
+    for (i = -1; i < argc; i++) {
+        if (i < 0)
+            e = obj;
+        else
+            e = argv[i];
+
+        res = JS_isConcatSpreadable(ctx, e);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            if (js_get_length64(ctx, &len, e))
+                goto exception;
+            if (n + len >= MAX_SAFE_INTEGER) {
+                JS_ThrowTypeError(ctx, "Array loo long");
+                goto exception;
+            }
+            for (k = 0; k < len; k++, n++) {
+                res = JS_TryGetPropertyInt64(ctx, e, k, &val);
+                if (res < 0)
+                    goto exception;
+                if (res) {
+                    if (JS_DefinePropertyValueInt64(ctx, arr, n, val,
+                                                    JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                        goto exception;
+                }
+            }
+        } else {
+            if (n >= MAX_SAFE_INTEGER) {
+                JS_ThrowTypeError(ctx, "Array loo long");
+                goto exception;
+            }
+            if (JS_DefinePropertyValueInt64(ctx, arr, n, JS_DupValue(ctx, e),
+                                            JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception;
+            n++;
+        }
+    }
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, n)) < 0)
+        goto exception;
+
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+exception:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+#define special_every    0
+#define special_some     1
+#define special_forEach  2
+#define special_map      3
+#define special_filter   4
+#define special_TA       8
+
+static int js_typed_array_get_length_internal(JSContext *ctx, JSValueConst obj);
+
+static JSValue js_typed_array___speciesCreate(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv);
+
+static JSValue js_array_every(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int special)
+{
+    JSValue obj, val, index_val, res, ret;
+    JSValueConst args[3];
+    JSValueConst func, this_arg;
+    int64_t len, k, n;
+    int present;
+
+    ret = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    if (special & special_TA) {
+        obj = JS_DupValue(ctx, this_val);
+        len = js_typed_array_get_length_internal(ctx, obj);
+        if (len < 0)
+            goto exception;
+    } else {
+        obj = JS_ToObject(ctx, this_val);
+        if (js_get_length64(ctx, &len, obj))
+            goto exception;
+    }
+    func = argv[0];
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    if (check_function(ctx, func))
+        goto exception;
+
+    switch (special) {
+    case special_every:
+    case special_every | special_TA:
+        ret = JS_TRUE;
+        break;
+    case special_some:
+    case special_some | special_TA:
+        ret = JS_FALSE;
+        break;
+    case special_map:
+        /* XXX: JS_ArraySpeciesCreate should take int64_t */
+        ret = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt64(ctx, len));
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_filter:
+        ret = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_map | special_TA:
+        args[0] = obj;
+        args[1] = JS_NewInt32(ctx, len);
+        ret = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    case special_filter | special_TA:
+        ret = JS_NewArray(ctx);
+        if (JS_IsException(ret))
+            goto exception;
+        break;
+    }
+    n = 0;
+
+    for(k = 0; k < len; k++) {
+        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))
+                goto exception;
+            args[0] = val;
+            args[1] = index_val;
+            args[2] = obj;
+            res = JS_Call(ctx, func, this_arg, 3, args);
+            JS_FreeValue(ctx, index_val);
+            if (JS_IsException(res))
+                goto exception;
+            switch (special) {
+            case special_every:
+            case special_every | special_TA:
+                if (!JS_ToBoolFree(ctx, res)) {
+                    ret = JS_FALSE;
+                    goto done;
+                }
+                break;
+            case special_some:
+            case special_some | special_TA:
+                if (JS_ToBoolFree(ctx, res)) {
+                    ret = JS_TRUE;
+                    goto done;
+                }
+                break;
+            case special_map:
+                if (JS_DefinePropertyValueInt64(ctx, ret, k, res,
+                                                JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                    goto exception;
+                break;
+            case special_map | special_TA:
+                if (JS_SetPropertyValue(ctx, ret, JS_NewInt32(ctx, k), res, JS_PROP_THROW) < 0)
+                    goto exception;
+                break;
+            case special_filter:
+            case special_filter | special_TA:
+                if (JS_ToBoolFree(ctx, res)) {
+                    if (JS_DefinePropertyValueInt64(ctx, ret, n++, JS_DupValue(ctx, val),
+                                                    JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                        goto exception;
+                }
+                break;
+            default:
+                JS_FreeValue(ctx, res);
+                break;
+            }
+            JS_FreeValue(ctx, val);
+            val = JS_UNDEFINED;
+        }
+    }
+done:
+    if (special == (special_filter | special_TA)) {
+        JSValue arr;
+        args[0] = obj;
+        args[1] = JS_NewInt32(ctx, n);
+        arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+        if (JS_IsException(arr))
+            goto exception;
+        args[0] = ret;
+        res = JS_Invoke(ctx, arr, JS_ATOM_set, 1, args);
+        if (check_exception_free(ctx, res))
+            goto exception;
+        JS_FreeValue(ctx, ret);
+        ret = arr;
+    }
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return ret;
+
+exception:
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+#define special_reduce       0
+#define special_reduceRight  1
+
+static JSValue js_array_reduce(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int special)
+{
+    JSValue obj, val, index_val, acc, acc1;
+    JSValueConst args[4];
+    JSValueConst func;
+    int64_t len, k, k1;
+    int present;
+
+    acc = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    if (special & special_TA) {
+        obj = JS_DupValue(ctx, this_val);
+        len = js_typed_array_get_length_internal(ctx, obj);
+        if (len < 0)
+            goto exception;
+    } else {
+        obj = JS_ToObject(ctx, this_val);
+        if (js_get_length64(ctx, &len, obj))
+            goto exception;
+    }
+    func = argv[0];
+
+    if (check_function(ctx, func))
+        goto exception;
+
+    k = 0;
+    if (argc > 1) {
+        acc = JS_DupValue(ctx, argv[1]);
+    } else {
+        for(;;) {
+            if (k >= len) {
+                JS_ThrowTypeError(ctx, "empty array");
+                goto exception;
+            }
+            k1 = (special & special_reduceRight) ? len - k - 1 : k;
+            k++;
+            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 (present) {
+            index_val = JS_NewInt64(ctx, k1);
+            if (JS_IsException(index_val))
+                goto exception;
+            args[0] = acc;
+            args[1] = val;
+            args[2] = index_val;
+            args[3] = obj;
+            acc1 = JS_Call(ctx, func, JS_UNDEFINED, 4, args);
+            JS_FreeValue(ctx, index_val);
+            JS_FreeValue(ctx, val);
+            val = JS_UNDEFINED;
+            if (JS_IsException(acc1))
+                goto exception;
+            JS_FreeValue(ctx, acc);
+            acc = acc1;
+        }
+    }
+    JS_FreeValue(ctx, obj);
+    return acc;
+
+exception:
+    JS_FreeValue(ctx, acc);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_fill(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int64_t len, start, end;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    start = 0;
+    if (argc > 1 && !JS_IsUndefined(argv[1])) {
+        if (JS_ToInt64Clamp(ctx, &start, argv[1], 0, len, len))
+            goto exception;
+    }
+
+    end = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt64Clamp(ctx, &end, argv[2], 0, len, len))
+            goto exception;
+    }
+
+    /* XXX: should special case fast arrays */
+    while (start < end) {
+        if (JS_SetPropertyInt64(ctx, obj, start,
+                                JS_DupValue(ctx, argv[0])) < 0)
+            goto exception;
+        start++;
+    }
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_includes(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n, res;
+    JSValue *arrp;
+    uint32_t count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = FALSE;
+    if (len > 0) {
+        n = 0;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], 0, len, len))
+                goto exception;
+        }
+        if (js_get_fast_array(ctx, obj, &arrp, &count)) {
+            for (; n < count; n++) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]),
+                                  JS_DupValue(ctx, arrp[n]),
+                                  JS_EQ_SAME_VALUE_ZERO)) {
+                    res = TRUE;
+                    goto done;
+                }
+            }
+        }
+        for (; n < len; n++) {
+            val = JS_GetPropertyInt64(ctx, obj, n);
+            if (JS_IsException(val))
+                goto exception;
+            if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val,
+                              JS_EQ_SAME_VALUE_ZERO)) {
+                res = TRUE;
+                break;
+            }
+        }
+    }
+ done:
+    JS_FreeValue(ctx, obj);
+    return JS_NewBool(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_indexOf(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n, res;
+    JSValue *arrp;
+    uint32_t count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = -1;
+    if (len > 0) {
+        n = 0;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], 0, len, len))
+                goto exception;
+        }
+        if (js_get_fast_array(ctx, obj, &arrp, &count)) {
+            for (; n < count; n++) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]),
+                                  JS_DupValue(ctx, arrp[n]), JS_EQ_STRICT)) {
+                    res = n;
+                    goto done;
+                }
+            }
+        }
+        for (; n < len; n++) {
+            int present = JS_TryGetPropertyInt64(ctx, obj, n, &val);
+            if (present < 0)
+                goto exception;
+            if (present) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val, JS_EQ_STRICT)) {
+                    res = n;
+                    break;
+                }
+            }
+        }
+    }
+ done:
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_lastIndexOf(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue obj, val;
+    int64_t len, n, res;
+    int present;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    res = -1;
+    if (len > 0) {
+        n = len - 1;
+        if (argc > 1) {
+            if (JS_ToInt64Clamp(ctx, &n, argv[1], -1, len - 1, len))
+                goto exception;
+        }
+        /* XXX: should special case fast arrays */
+        for (; n >= 0; n--) {
+            present = JS_TryGetPropertyInt64(ctx, obj, n, &val);
+            if (present < 0)
+                goto exception;
+            if (present) {
+                if (js_strict_eq2(ctx, JS_DupValue(ctx, argv[0]), val, JS_EQ_STRICT)) {
+                    res = n;
+                    break;
+                }
+            }
+        }
+    }
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, res);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_find(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int findIndex)
+{
+    JSValueConst func, this_arg;
+    JSValueConst args[3];
+    JSValue obj, val, index_val, res;
+    int64_t len, k;
+
+    index_val = JS_UNDEFINED;
+    val = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    func = argv[0];
+    if (check_function(ctx, func))
+        goto exception;
+
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    for(k = 0; k < len; k++) {
+        index_val = JS_NewInt64(ctx, k);
+        if (JS_IsException(index_val))
+            goto exception;
+        val = JS_GetPropertyValue(ctx, obj, index_val);
+        if (JS_IsException(val))
+            goto exception;
+        args[0] = val;
+        args[1] = index_val;
+        args[2] = this_val;
+        res = JS_Call(ctx, func, this_arg, 3, args);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_ToBoolFree(ctx, res)) {
+            if (findIndex) {
+                JS_FreeValue(ctx, val);
+                JS_FreeValue(ctx, obj);
+                return index_val;
+            } else {
+                JS_FreeValue(ctx, index_val);
+                JS_FreeValue(ctx, obj);
+                return val;
+            }
+        }
+        JS_FreeValue(ctx, val);
+        JS_FreeValue(ctx, index_val);
+    }
+    JS_FreeValue(ctx, obj);
+    if (findIndex)
+        return JS_NewInt32(ctx, -1);
+    else
+        return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, index_val);
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_toString(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj, method, ret;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    method = JS_GetProperty(ctx, obj, JS_ATOM_join);
+    if (JS_IsException(method)) {
+        ret = JS_EXCEPTION;
+    } else
+    if (!JS_IsFunction(ctx, method)) {
+        /* Use intrinsic Object.prototype.toString */
+        JS_FreeValue(ctx, method);
+        ret = js_object_toString(ctx, obj, 0, NULL);
+    } else {
+        ret = JS_CallFree(ctx, method, obj, 0, NULL);
+    }
+    JS_FreeValue(ctx, obj);
+    return ret;
+}
+
+static JSValue js_array_join(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int toLocaleString)
+{
+    JSValue obj, sep = JS_UNDEFINED, el;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p = NULL;
+    int64_t i, n;
+    int c;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &n, obj))
+        goto exception;
+
+    c = ',';    /* default separator */
+    if (!toLocaleString && argc > 0 && !JS_IsUndefined(argv[0])) {
+        sep = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(sep))
+            goto exception;
+        p = JS_VALUE_GET_STRING(sep);
+        if (p->len == 1 && !p->is_wide_char)
+            c = p->u.str8[0];
+        else
+            c = -1;
+    }
+    string_buffer_init(ctx, b, 0);
+
+    for(i = 0; i < n; i++) {
+        if (i > 0) {
+            if (c >= 0) {
+                string_buffer_putc8(b, c);
+            } else {
+                string_buffer_concat(b, p, 0, p->len);
+            }
+        }
+        el = JS_GetPropertyUint32(ctx, obj, i);
+        if (JS_IsException(el))
+            goto fail;
+        if (!JS_IsNull(el) && !JS_IsUndefined(el)) {
+            if (toLocaleString) {
+                el = JS_ToLocaleStringFree(ctx, el);
+            }
+            if (string_buffer_concat_value_free(b, el))
+                goto fail;
+        }
+    }
+    JS_FreeValue(ctx, sep);
+    JS_FreeValue(ctx, obj);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, sep);
+exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_pop(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv, int shift)
+{
+    JSValue obj, res = JS_UNDEFINED;
+    int64_t len, newLen;
+    JSValue *arrp;
+    uint32_t count32;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+    newLen = 0;
+    if (len > 0) {
+        newLen = len - 1;
+        /* Special case fast arrays */
+        if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+            JSObject *p = JS_VALUE_GET_OBJ(obj);
+            if (shift) {
+                res = arrp[0];
+                memmove(arrp, arrp + 1, (count32 - 1) * sizeof(*arrp));
+                p->u.array.count--;
+            } else {
+                res = arrp[count32 - 1];
+                p->u.array.count--;
+            }
+        } else {
+            if (shift) {
+                res = JS_GetPropertyInt64(ctx, obj, 0);
+                if (JS_IsException(res))
+                    goto exception;
+                if (JS_CopySubArray(ctx, obj, 0, 1, len - 1, +1))
+                    goto exception;
+            } else {
+                res = JS_GetPropertyInt64(ctx, obj, newLen);
+                if (JS_IsException(res))
+                    goto exception;
+            }
+            if (JS_DeletePropertyInt64(ctx, obj, newLen, JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, newLen)) < 0)
+        goto exception;
+
+    JS_FreeValue(ctx, obj);
+    return res;
+
+ exception:
+    JS_FreeValue(ctx, res);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_push(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int unshift)
+{
+    JSValue obj;
+    int i;
+    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))
+            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;
+
+    JS_FreeValue(ctx, obj);
+    return JS_NewInt64(ctx, newLen);
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_reverse(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, lval, hval;
+    JSValue *arrp;
+    int64_t len, l, h;
+    int l_present, h_present;
+    uint32_t count32;
+
+    lval = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    /* Special case fast arrays */
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) && count32 == len) {
+        uint32_t ll, hh;
+
+        if (count32 > 1) {
+            for (ll = 0, hh = count32 - 1; ll < hh; ll++, hh--) {
+                lval = arrp[ll];
+                arrp[ll] = arrp[hh];
+                arrp[hh] = lval;
+            }
+        }
+        return obj;
+    }
+
+    for (l = 0, h = len - 1; l < h; l++, h--) {
+        l_present = JS_TryGetPropertyInt64(ctx, obj, l, &lval);
+        if (l_present < 0)
+            goto exception;
+        h_present = JS_TryGetPropertyInt64(ctx, obj, h, &hval);
+        if (h_present < 0)
+            goto exception;
+        if (h_present) {
+            if (JS_SetPropertyInt64(ctx, obj, l, hval) < 0)
+                goto exception;
+
+            if (l_present) {
+                if (JS_SetPropertyInt64(ctx, obj, h, lval) < 0) {
+                    lval = JS_UNDEFINED;
+                    goto exception;
+                }
+                lval = JS_UNDEFINED;
+            } else {
+                if (JS_DeletePropertyInt64(ctx, obj, h, JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        } else {
+            if (l_present) {
+                if (JS_DeletePropertyInt64(ctx, obj, l, JS_PROP_THROW) < 0)
+                    goto exception;
+                if (JS_SetPropertyInt64(ctx, obj, h, lval) < 0) {
+                    lval = JS_UNDEFINED;
+                    goto exception;
+                }
+                lval = JS_UNDEFINED;
+            }
+        }
+    }
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, lval);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_slice(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int splice)
+{
+    JSValue obj, arr, val, len_val;
+    int64_t len, start, k, final, n, count, del_count, new_len;
+    int kPresent;
+    JSValue *arrp;
+    uint32_t count32, i, item_count;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+
+    if (splice) {
+        if (argc == 0) {
+            item_count = 0;
+            del_count = 0;
+        } else
+        if (argc == 1) {
+            item_count = 0;
+            del_count = len - start;
+        } else {
+            item_count = argc - 2;
+            if (JS_ToInt64Clamp(ctx, &del_count, argv[1], 0, len - start, 0))
+                goto exception;
+        }
+        if (len + item_count - del_count > MAX_SAFE_INTEGER) {
+            JS_ThrowTypeError(ctx, "Array loo long");
+            goto exception;
+        }
+        count = del_count;
+    } else {
+        item_count = 0; /* avoid warning */
+        final = len;
+        if (!JS_IsUndefined(argv[1])) {
+            if (JS_ToInt64Clamp(ctx, &final, argv[1], 0, len, len))
+                goto exception;
+        }
+        count = max_int64(final - start, 0);
+    }
+    len_val = JS_NewInt64(ctx, count);
+    arr = JS_ArraySpeciesCreate(ctx, obj, len_val);
+    JS_FreeValue(ctx, len_val);
+    if (JS_IsException(arr))
+        goto exception;
+
+    k = start;
+    final = start + count;
+    n = 0;
+    /* The fast array test on arr ensures that
+       JS_CreateDataPropertyUint32() won't modify obj in case arr is
+       an exotic object */
+    /* Special case fast arrays */
+    if (js_get_fast_array(ctx, obj, &arrp, &count32) &&
+        js_is_fast_array(ctx, arr)) {
+        /* XXX: should share code with fast array constructor */
+        for (; k < final && k < count32; k++, n++) {
+            if (JS_CreateDataPropertyUint32(ctx, arr, n, JS_DupValue(ctx, arrp[k]), JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    /* Copy the remaining elements if any (handle case of inherited properties) */
+    for (; k < final; k++, n++) {
+        kPresent = JS_TryGetPropertyInt64(ctx, obj, k, &val);
+        if (kPresent < 0)
+            goto exception;
+        if (kPresent) {
+            if (JS_CreateDataPropertyUint32(ctx, arr, n, val, JS_PROP_THROW) < 0)
+                goto exception;
+        }
+    }
+    if (JS_SetProperty(ctx, arr, JS_ATOM_length, JS_NewInt64(ctx, n)) < 0)
+        goto exception;
+
+    if (splice) {
+        new_len = len + item_count - del_count;
+        if (item_count != del_count) {
+            if (JS_CopySubArray(ctx, obj, start + item_count,
+                                start + del_count, len - (start + del_count),
+                                item_count <= del_count ? +1 : -1) < 0)
+                goto exception;
+
+            for (k = len; k-- > new_len; ) {
+                if (JS_DeletePropertyInt64(ctx, obj, k, JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        }
+        for (i = 0; i < item_count; i++) {
+            if (JS_SetPropertyInt64(ctx, obj, start + i, JS_DupValue(ctx, argv[i + 2])) < 0)
+                goto exception;
+        }
+        if (JS_SetProperty(ctx, obj, JS_ATOM_length, JS_NewInt64(ctx, new_len)) < 0)
+            goto exception;
+    }
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_copyWithin(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    int64_t len, from, to, final, count;
+
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &to, argv[0], 0, len, len))
+        goto exception;
+
+    if (JS_ToInt64Clamp(ctx, &from, argv[1], 0, len, len))
+        goto exception;
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt64Clamp(ctx, &final, argv[2], 0, len, len))
+            goto exception;
+    }
+
+    count = min_int64(final - from, len - to);
+
+    if (JS_CopySubArray(ctx, obj, to, from, count,
+                        (from < to && to < from + count) ? -1 : +1))
+        goto exception;
+
+    return obj;
+
+ exception:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static int64_t JS_FlattenIntoArray(JSContext *ctx, JSValueConst target,
+                                   JSValueConst source, int64_t sourceLen,
+                                   int64_t targetIndex, int depth,
+                                   JSValueConst mapperFunction,
+                                   JSValueConst thisArg)
+{
+    JSValue element;
+    int64_t sourceIndex, elementLen;
+    int present, is_array;
+
+    for (sourceIndex = 0; sourceIndex < sourceLen; sourceIndex++) {
+        present = JS_TryGetPropertyInt64(ctx, source, sourceIndex, &element);
+        if (present < 0)
+            return -1;
+        if (!present)
+            continue;
+        if (!JS_IsUndefined(mapperFunction)) {
+            JSValueConst args[3] = { element, JS_NewInt64(ctx, sourceIndex), source };
+            element = JS_Call(ctx, mapperFunction, thisArg, 3, args);
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+            JS_FreeValue(ctx, args[0]);
+            JS_FreeValue(ctx, args[1]);
+#else
+            JS_FreeValue(ctx, (JSValue)args[0]);
+            JS_FreeValue(ctx, (JSValue)args[1]);
+#endif
+            if (JS_IsException(element))
+                return -1;
+        }
+        if (depth > 0) {
+            is_array = JS_IsArray(ctx, element);
+            if (is_array < 0)
+                goto fail;
+            if (is_array) {
+                if (js_get_length64(ctx, &elementLen, element) < 0)
+                    goto fail;
+                targetIndex = JS_FlattenIntoArray(ctx, target, element,
+                                                  elementLen, targetIndex,
+                                                  depth - 1,
+                                                  JS_UNDEFINED, JS_UNDEFINED);
+                if (targetIndex < 0)
+                    goto fail;
+                JS_FreeValue(ctx, element);
+                continue;
+            }
+        }
+        if (targetIndex >= MAX_SAFE_INTEGER) {
+            JS_ThrowTypeError(ctx, "Array too long");
+            goto fail;
+        }
+        if (JS_SetPropertyInt64(ctx, target, targetIndex, element) < 0)
+            return -1;
+        targetIndex++;
+    }
+    return targetIndex;
+
+fail:
+    JS_FreeValue(ctx, element);
+    return -1;
+}
+
+static JSValue js_array_flatten(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv, int map)
+{
+    JSValue obj, arr;
+    JSValueConst mapperFunction, thisArg;
+    int64_t sourceLen;
+    int depthNum;
+
+    arr = JS_UNDEFINED;
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &sourceLen, obj))
+        goto exception;
+
+    depthNum = 1;
+    mapperFunction = JS_UNDEFINED;
+    thisArg = JS_UNDEFINED;
+    if (map) {
+        mapperFunction = argv[0];
+        if (argc > 1) {
+            thisArg = argv[1];
+        }
+        if (check_function(ctx, mapperFunction))
+            goto exception;
+    } else {
+        if (argc > 0 && !JS_IsUndefined(argv[0])) {
+            if (JS_ToInt32Sat(ctx, &depthNum, argv[0]) < 0)
+                goto exception;
+        }
+    }
+    arr = JS_ArraySpeciesCreate(ctx, obj, JS_NewInt32(ctx, 0));
+    if (JS_IsException(arr))
+        goto exception;
+    if (JS_FlattenIntoArray(ctx, arr, obj, sourceLen, 0, depthNum,
+                            mapperFunction, thisArg) < 0)
+        goto exception;
+    JS_FreeValue(ctx, obj);
+    return arr;
+
+exception:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+/* Array sort */
+
+typedef struct ValueSlot {
+    JSValue val;
+    JSString *str;
+    int64_t pos;
+} ValueSlot;
+
+struct array_sort_context {
+    JSContext *ctx;
+    int exception;
+    int has_method;
+    JSValueConst method;
+};
+
+static int js_array_cmp_generic(const void *a, const void *b, void *opaque) {
+    struct array_sort_context *psc = opaque;
+    JSContext *ctx = psc->ctx;
+    JSValueConst argv[2];
+    JSValue res;
+    ValueSlot *ap = (ValueSlot *)(void *)a;
+    ValueSlot *bp = (ValueSlot *)(void *)b;
+    int cmp;
+
+    if (psc->exception)
+        return 0;
+
+    if (psc->has_method) {
+        /* custom sort function is specified as returning 0 for identical
+         * objects: avoid method call overhead.
+         */
+        if (!memcmp(&ap->val, &bp->val, sizeof(ap->val)))
+            goto cmp_same;
+        argv[0] = ap->val;
+        argv[1] = bp->val;
+        res = JS_Call(ctx, psc->method, JS_UNDEFINED, 2, argv);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_VALUE_GET_TAG(res) == JS_TAG_INT) {
+            int val = JS_VALUE_GET_INT(res);
+            cmp = (val > 0) - (val < 0);
+        } else {
+            double val;
+            if (JS_ToFloat64Free(ctx, &val, res) < 0)
+                goto exception;
+            cmp = (val > 0) - (val < 0);
+        }
+    } else {
+        /* Not supposed to bypass ToString even for identical objects as
+         * tested in test262/test/built-ins/Array/prototype/sort/bug_596_1.js
+         */
+        if (!ap->str) {
+            JSValue str = JS_ToString(ctx, ap->val);
+            if (JS_IsException(str))
+                goto exception;
+            ap->str = JS_VALUE_GET_STRING(str);
+        }
+        if (!bp->str) {
+            JSValue str = JS_ToString(ctx, bp->val);
+            if (JS_IsException(str))
+                goto exception;
+            bp->str = JS_VALUE_GET_STRING(str);
+        }
+        cmp = js_string_compare(ctx, ap->str, bp->str);
+    }
+    if (cmp != 0)
+        return cmp;
+cmp_same:
+    /* make sort stable: compare array offsets */
+    return (ap->pos > bp->pos) - (ap->pos < bp->pos);
+
+exception:
+    psc->exception = 1;
+    return 0;
+}
+
+static JSValue js_array_sort(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    struct array_sort_context asc = { ctx, 0, 0, argv[0] };
+    JSValue obj = JS_UNDEFINED;
+    ValueSlot *array = NULL;
+    size_t array_size = 0, pos = 0, n = 0;
+    int64_t i, len, undefined_count = 0;
+    int present;
+
+    if (!JS_IsUndefined(asc.method)) {
+        if (check_function(ctx, asc.method))
+            goto exception;
+        asc.has_method = 1;
+    }
+    obj = JS_ToObject(ctx, this_val);
+    if (js_get_length64(ctx, &len, obj))
+        goto exception;
+
+    /* XXX: should special case fast arrays */
+    for (i = 0; i < len; i++) {
+        if (pos >= array_size) {
+            size_t new_size, slack;
+            ValueSlot *new_array;
+            new_size = (array_size + (array_size >> 1) + 31) & ~15;
+            new_array = js_realloc2(ctx, array, new_size * sizeof(*array), &slack);
+            if (new_array == NULL)
+                goto exception;
+            new_size += slack / sizeof(*new_array);
+            array = new_array;
+            array_size = new_size;
+        }
+        present = JS_TryGetPropertyInt64(ctx, obj, i, &array[pos].val);
+        if (present < 0)
+            goto exception;
+        if (present == 0)
+            continue;
+        if (JS_IsUndefined(array[pos].val)) {
+            undefined_count++;
+            continue;
+        }
+        array[pos].str = NULL;
+        array[pos].pos = i;
+        pos++;
+    }
+    rqsort(array, pos, sizeof(*array), js_array_cmp_generic, &asc);
+    if (asc.exception)
+        goto exception;
+
+    /* XXX: should special case fast arrays */
+    while (n < pos) {
+        if (array[n].str)
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, array[n].str));
+        if (array[n].pos == n) {
+            JS_FreeValue(ctx, array[n].val);
+        } else {
+            if (JS_SetPropertyInt64(ctx, obj, n, array[n].val) < 0) {
+                n++;
+                goto exception;
+            }
+        }
+        n++;
+    }
+    js_free(ctx, array);
+    for (i = n; undefined_count-- > 0; i++) {
+        if (JS_SetPropertyInt64(ctx, obj, i, JS_UNDEFINED) < 0)
+            goto fail;
+    }
+    for (; i < len; i++) {
+        if (JS_DeletePropertyInt64(ctx, obj, i, JS_PROP_THROW) < 0)
+            goto fail;
+    }
+    return obj;
+
+exception:
+    for (; n < pos; n++) {
+        JS_FreeValue(ctx, array[n].val);
+        if (array[n].str)
+            JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, array[n].str));
+    }
+    js_free(ctx, array);
+fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+typedef struct JSArrayIteratorData {
+    JSValue obj;
+    JSIteratorKindEnum kind;
+    uint32_t idx;
+} JSArrayIteratorData;
+
+static void js_array_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayIteratorData *it = p->u.array_iterator_data;
+    if (it) {
+        JS_FreeValueRT(rt, it->obj);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_array_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                   JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayIteratorData *it = p->u.array_iterator_data;
+    if (it) {
+        JS_MarkValue(rt, it->obj, mark_func);
+    }
+}
+
+static JSValue js_create_array(JSContext *ctx, int len, JSValueConst *tab)
+{
+    JSValue obj;
+    int i;
+
+    obj = JS_NewArray(ctx);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    for(i = 0; i < len; i++) {
+        if (JS_CreateDataPropertyUint32(ctx, obj, i, JS_DupValue(ctx, tab[i]), 0) < 0) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    }
+    return obj;
+}
+
+static JSValue js_create_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv, int magic)
+{
+    JSValue enum_obj, arr;
+    JSArrayIteratorData *it;
+    JSIteratorKindEnum kind;
+    int class_id;
+
+    kind = magic & 3;
+    if (magic & 4) {
+        /* string iterator case */
+        arr = JS_ToStringCheckObject(ctx, this_val);
+        class_id = JS_CLASS_STRING_ITERATOR;
+    } else {
+        arr = JS_ToObject(ctx, this_val);
+        class_id = JS_CLASS_ARRAY_ITERATOR;
+    }
+    if (JS_IsException(arr))
+        goto fail;
+    enum_obj = JS_NewObjectClass(ctx, class_id);
+    if (JS_IsException(enum_obj))
+        goto fail;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it)
+        goto fail1;
+    it->obj = arr;
+    it->kind = kind;
+    it->idx = 0;
+    JS_SetOpaque(enum_obj, it);
+    return enum_obj;
+ fail1:
+    JS_FreeValue(ctx, enum_obj);
+ fail:
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_array_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv,
+                                      BOOL *pdone, int magic)
+{
+    JSArrayIteratorData *it;
+    uint32_t len, idx;
+    JSValue val, obj;
+    JSObject *p;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_ARRAY_ITERATOR);
+    if (!it)
+        goto fail1;
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    p = JS_VALUE_GET_OBJ(it->obj);
+    if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+        p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+        if (typed_array_is_detached(ctx, p)) {
+            JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+            goto fail1;
+        }
+        len = p->u.array.count;
+    } else {
+        if (js_get_length32(ctx, &len, it->obj)) {
+        fail1:
+            *pdone = FALSE;
+            return JS_EXCEPTION;
+        }
+    }
+    idx = it->idx;
+    if (idx >= len) {
+        JS_FreeValue(ctx, it->obj);
+        it->obj = JS_UNDEFINED;
+    done:
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+    it->idx = idx + 1;
+    *pdone = FALSE;
+    if (it->kind == JS_ITERATOR_KIND_KEY) {
+        return JS_NewUint32(ctx, idx);
+    } else {
+        val = JS_GetPropertyUint32(ctx, it->obj, idx);
+        if (JS_IsException(val))
+            return JS_EXCEPTION;
+        if (it->kind == JS_ITERATOR_KIND_VALUE) {
+            return val;
+        } else {
+            JSValueConst args[2];
+            JSValue num;
+            num = JS_NewUint32(ctx, idx);
+            args[0] = num;
+            args[1] = val;
+            obj = js_create_array(ctx, 2, args);
+            JS_FreeValue(ctx, val);
+            JS_FreeValue(ctx, num);
+            return obj;
+        }
+    }
+}
+
+static JSValue js_iterator_proto_iterator(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    return JS_DupValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry js_iterator_proto_funcs[] = {
+    JS_CFUNC_DEF("[Symbol.iterator]", 0, js_iterator_proto_iterator ),
+};
+
+static const JSCFunctionListEntry js_array_proto_funcs[] = {
+    JS_CFUNC_DEF("concat", 1, js_array_concat ),
+    JS_CFUNC_MAGIC_DEF("every", 1, js_array_every, special_every ),
+    JS_CFUNC_MAGIC_DEF("some", 1, js_array_every, special_some ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_array_every, special_forEach ),
+    JS_CFUNC_MAGIC_DEF("map", 1, js_array_every, special_map ),
+    JS_CFUNC_MAGIC_DEF("filter", 1, js_array_every, special_filter ),
+    JS_CFUNC_MAGIC_DEF("reduce", 1, js_array_reduce, special_reduce ),
+    JS_CFUNC_MAGIC_DEF("reduceRight", 1, js_array_reduce, special_reduceRight ),
+    JS_CFUNC_DEF("fill", 1, js_array_fill ),
+    JS_CFUNC_MAGIC_DEF("find", 1, js_array_find, 0 ),
+    JS_CFUNC_MAGIC_DEF("findIndex", 1, js_array_find, 1 ),
+    JS_CFUNC_DEF("indexOf", 1, js_array_indexOf ),
+    JS_CFUNC_DEF("lastIndexOf", 1, js_array_lastIndexOf ),
+    JS_CFUNC_DEF("includes", 1, js_array_includes ),
+    JS_CFUNC_MAGIC_DEF("join", 1, js_array_join, 0 ),
+    JS_CFUNC_DEF("toString", 0, js_array_toString ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_array_join, 1 ),
+    JS_CFUNC_MAGIC_DEF("pop", 0, js_array_pop, 0 ),
+    JS_CFUNC_MAGIC_DEF("push", 1, js_array_push, 0 ),
+    JS_CFUNC_MAGIC_DEF("shift", 0, js_array_pop, 1 ),
+    JS_CFUNC_MAGIC_DEF("unshift", 1, js_array_push, 1 ),
+    JS_CFUNC_DEF("reverse", 0, js_array_reverse ),
+    JS_CFUNC_DEF("sort", 1, js_array_sort ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_slice, 0 ),
+    JS_CFUNC_MAGIC_DEF("splice", 2, js_array_slice, 1 ),
+    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 ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_array_iterator, JS_ITERATOR_KIND_KEY_AND_VALUE ),
+};
+
+static const JSCFunctionListEntry js_array_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_array_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Array Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+/* Number */
+
+static JSValue js_number_constructor(JSContext *ctx, JSValueConst new_target,
+                                     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);
+    } else {
+        val = JS_ToNumeric(ctx, argv[0]);
+        if (JS_IsException(val))
+            return val;
+        switch(JS_VALUE_GET_TAG(val)) {
+        case JS_TAG_BIG_INT:
+        case JS_TAG_BIG_FLOAT:
+            {
+                JSBigFloat *p = JS_VALUE_GET_PTR(val);
+                double d;
+                bf_get_float64(&p->num, &d, BF_RNDN);
+                JS_FreeValue(ctx, val);
+                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));
+            }
+            break;
+        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))
+            JS_SetObjectData(ctx, obj, val);
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+#if 0
+static JSValue js_number___toInteger(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    return JS_ToIntegerFree(ctx, JS_DupValue(ctx, argv[0]));
+}
+
+static JSValue js_number___toLength(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    int64_t v;
+    if (JS_ToLengthFree(ctx, &v, JS_DupValue(ctx, argv[0])))
+        return JS_EXCEPTION;
+    return JS_NewInt64(ctx, v);
+}
+#endif
+
+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);
+}
+
+static JSValue js_number_isFinite(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    if (!JS_IsNumber(argv[0]))
+        return JS_FALSE;
+    return js_global_isFinite(ctx, this_val, argc, argv);
+}
+
+static JSValue js_number_isInteger(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_NumberIsInteger(ctx, argv[0]);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_number_isSafeInteger(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    double d;
+    if (!JS_IsNumber(argv[0]))
+        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);
+}
+
+static const JSCFunctionListEntry js_number_funcs[] = {
+    /* global ParseInt and parseFloat should be defined already or delayed */
+    JS_ALIAS_BASE_DEF("parseInt", "parseInt", 0 ),
+    JS_ALIAS_BASE_DEF("parseFloat", "parseFloat", 0 ),
+    JS_CFUNC_DEF("isNaN", 1, js_number_isNaN ),
+    JS_CFUNC_DEF("isFinite", 1, js_number_isFinite ),
+    JS_CFUNC_DEF("isInteger", 1, js_number_isInteger ),
+    JS_CFUNC_DEF("isSafeInteger", 1, js_number_isSafeInteger ),
+    JS_PROP_DOUBLE_DEF("MAX_VALUE", 1.7976931348623157e+308, 0 ),
+    JS_PROP_DOUBLE_DEF("MIN_VALUE", 5e-324, 0 ),
+    JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+    JS_PROP_DOUBLE_DEF("NEGATIVE_INFINITY", -INFINITY, 0 ),
+    JS_PROP_DOUBLE_DEF("POSITIVE_INFINITY", INFINITY, 0 ),
+    JS_PROP_DOUBLE_DEF("EPSILON", 2.220446049250313e-16, 0 ), /* ES6 */
+    JS_PROP_DOUBLE_DEF("MAX_SAFE_INTEGER", 9007199254740991.0, 0 ), /* ES6 */
+    JS_PROP_DOUBLE_DEF("MIN_SAFE_INTEGER", -9007199254740991.0, 0 ), /* ES6 */
+    //JS_CFUNC_DEF("__toInteger", 1, js_number___toInteger ),
+    //JS_CFUNC_DEF("__toLength", 1, js_number___toLength ),
+};
+
+static JSValue js_thisNumberValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsNumber(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_NUMBER) {
+            if (JS_IsNumber(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a number");
+}
+
+static JSValue js_number_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisNumberValue(ctx, this_val);
+}
+
+static JSValue js_number_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue val;
+    int base;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    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");
+            goto fail;
+        }
+    }
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    return js_dtoa(ctx, d, base, 0, JS_DTOA_VAR_FORMAT);
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_number_toFixed(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int f;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_ToInt32Sat(ctx, &f, argv[0]))
+        return JS_EXCEPTION;
+    if (f < 0 || f > 100)
+        return JS_ThrowRangeError(ctx, "invalid number of digits");
+    if (fabs(d) >= 1e21) {
+        return JS_ToStringFree(ctx, __JS_NewFloat64(ctx, d));
+    } else {
+        return js_dtoa(ctx, d, 10, f, JS_DTOA_FRAC_FORMAT);
+    }
+}
+
+static JSValue js_number_toExponential(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int f, flags;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_ToInt32Sat(ctx, &f, argv[0]))
+        return JS_EXCEPTION;
+    if (!isfinite(d)) {
+        return JS_ToStringFree(ctx,  __JS_NewFloat64(ctx, d));
+    }
+    if (JS_IsUndefined(argv[0])) {
+        flags = 0;
+        f = 0;
+    } else {
+        if (f < 0 || f > 100)
+            return JS_ThrowRangeError(ctx, "invalid number of digits");
+        f++;
+        flags = JS_DTOA_FIXED_FORMAT;
+    }
+    return js_dtoa(ctx, d, 10, f, flags | JS_DTOA_FORCE_EXP);
+}
+
+static JSValue js_number_toPrecision(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int p;
+    double d;
+
+    val = js_thisNumberValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToFloat64Free(ctx, &d, val))
+        return JS_EXCEPTION;
+    if (JS_IsUndefined(argv[0]))
+        goto to_string;
+    if (JS_ToInt32Sat(ctx, &p, argv[0]))
+        return JS_EXCEPTION;
+    if (!isfinite(d)) {
+    to_string:
+        return JS_ToStringFree(ctx,  __JS_NewFloat64(ctx, d));
+    }
+    if (p < 1 || p > 100)
+        return JS_ThrowRangeError(ctx, "invalid number of digits");
+    return js_dtoa(ctx, d, 10, p, JS_DTOA_FIXED_FORMAT);
+}
+
+static const JSCFunctionListEntry js_number_proto_funcs[] = {
+    JS_CFUNC_DEF("toExponential", 1, js_number_toExponential ),
+    JS_CFUNC_DEF("toFixed", 1, js_number_toFixed ),
+    JS_CFUNC_DEF("toPrecision", 1, js_number_toPrecision ),
+    JS_CFUNC_MAGIC_DEF("toString", 1, js_number_toString, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_number_toString, 1 ),
+    JS_CFUNC_DEF("valueOf", 0, js_number_valueOf ),
+};
+
+static JSValue js_parseInt(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    const char *str, *p;
+    int radix, flags;
+    JSValue ret;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &radix, argv[1])) {
+        JS_FreeCString(ctx, str);
+        return JS_EXCEPTION;
+    }
+    if (radix != 0 && (radix < 2 || radix > 36)) {
+        ret = JS_NAN;
+    } else {
+        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);
+    return ret;
+}
+
+static JSValue js_parseFloat(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    const char *str, *p;
+    JSValue ret;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    p = str;
+    p += skip_spaces(p);
+    ret = js_atof(ctx, p, NULL, 10, 0);
+    JS_FreeCString(ctx, str);
+    return ret;
+}
+
+/* Boolean */
+static JSValue js_boolean_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, obj;
+    val = JS_NewBool(ctx, JS_ToBool(ctx, argv[0]));
+    if (!JS_IsUndefined(new_target)) {
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_BOOLEAN);
+        if (!JS_IsException(obj))
+            JS_SetObjectData(ctx, obj, val);
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+static JSValue js_thisBooleanValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_BOOL)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_BOOLEAN) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_BOOL)
+                return p->u.object_data;
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a boolean");
+}
+
+static JSValue js_boolean_toString(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue val = js_thisBooleanValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    return JS_AtomToString(ctx, JS_VALUE_GET_BOOL(val) ?
+                       JS_ATOM_true : JS_ATOM_false);
+}
+
+static JSValue js_boolean_valueOf(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    return js_thisBooleanValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry js_boolean_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_boolean_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_boolean_valueOf ),
+};
+
+/* String */
+
+static int js_string_get_own_property(JSContext *ctx,
+                                      JSPropertyDescriptor *desc,
+                                      JSValueConst obj, JSAtom prop)
+{
+    JSObject *p;
+    JSString *p1;
+    uint32_t idx, ch;
+
+    /* This is a class exotic method: obj class_id is JS_CLASS_STRING */
+    if (__JS_AtomIsTaggedInt(prop)) {
+        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);
+            idx = __JS_AtomToUInt32(prop);
+            if (idx < p1->len) {
+                if (desc) {
+                    if (p1->is_wide_char)
+                        ch = p1->u.str16[idx];
+                    else
+                        ch = p1->u.str8[idx];
+                    desc->flags = JS_PROP_ENUMERABLE;
+                    desc->value = js_new_string_char(ctx, ch);
+                    desc->getter = JS_UNDEFINED;
+                    desc->setter = JS_UNDEFINED;
+                }
+                return TRUE;
+            }
+        }
+    }
+    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,
+                                         JSValueConst getter,
+                                         JSValueConst setter, int flags)
+{
+    uint32_t idx;
+
+    if (__JS_AtomIsTaggedInt(prop)) {
+        idx = __JS_AtomToUInt32(prop);
+        if (idx >= js_string_obj_get_length(ctx, this_obj))
+            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 */
+        return TRUE;
+    } else {
+    def:
+        return JS_DefineProperty(ctx, this_obj, prop, val, getter, setter,
+                                 flags | JS_PROP_NO_EXOTIC);
+    }
+}
+
+static int js_string_delete_property(JSContext *ctx,
+                                     JSValueConst obj, JSAtom prop)
+{
+    uint32_t idx;
+
+    if (__JS_AtomIsTaggedInt(prop)) {
+        idx = __JS_AtomToUInt32(prop);
+        if (idx < js_string_obj_get_length(ctx, obj)) {
+            return FALSE;
+        }
+    }
+    return TRUE;
+}
+
+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,
+};
+
+static JSValue js_string_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, obj;
+    if (argc == 0) {
+        val = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    } else {
+        if (JS_IsUndefined(new_target) && JS_IsSymbol(argv[0])) {
+            JSAtomStruct *p = JS_VALUE_GET_PTR(argv[0]);
+            val = JS_ConcatString3(ctx, "Symbol(", JS_AtomToString(ctx, js_get_atom_index(ctx->rt, p)), ")");
+        } else {
+            val = JS_ToString(ctx, argv[0]);
+        }
+        if (JS_IsException(val))
+            return val;
+    }
+    if (!JS_IsUndefined(new_target)) {
+        JSString *p1 = JS_VALUE_GET_STRING(val);
+
+        obj = js_create_from_ctor(ctx, new_target, JS_CLASS_STRING);
+        if (!JS_IsException(obj)) {
+            JS_SetObjectData(ctx, obj, val);
+            JS_DefinePropertyValue(ctx, obj, JS_ATOM_length, JS_NewInt32(ctx, p1->len), 0);
+        }
+        return obj;
+    } else {
+        return val;
+    }
+}
+
+static JSValue js_thisStringValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_STRING)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_STRING) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_STRING)
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a string");
+}
+
+static JSValue js_string_fromCharCode(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    int i;
+    StringBuffer b_s, *b = &b_s;
+
+    string_buffer_init(ctx, b, argc);
+
+    for(i = 0; i < argc; i++) {
+        int32_t c;
+        if (JS_ToInt32(ctx, &c, argv[i]) || string_buffer_putc16(b, c & 0xffff)) {
+            string_buffer_free(b);
+            return JS_EXCEPTION;
+        }
+    }
+    return string_buffer_end(b);
+}
+
+static JSValue js_string_fromCodePoint(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    double d;
+    int i, c;
+    StringBuffer b_s, *b = &b_s;
+
+    /* XXX: could pre-compute string length if all arguments are JS_TAG_INT */
+
+    if (string_buffer_init(ctx, b, argc))
+        goto fail;
+    for(i = 0; i < argc; i++) {
+        if (JS_VALUE_GET_TAG(argv[i]) == JS_TAG_INT) {
+            c = JS_VALUE_GET_INT(argv[i]);
+            if (c < 0 || c > 0x10ffff)
+                goto range_error;
+        } else {
+            if (JS_ToFloat64(ctx, &d, argv[i]))
+                goto fail;
+            if (d < 0 || d > 0x10ffff || (c = (int)d) != d)
+                goto range_error;
+        }
+        if (string_buffer_putc(b, c))
+            goto fail;
+    }
+    return string_buffer_end(b);
+
+ range_error:
+    JS_ThrowRangeError(ctx, "invalid code point");
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_raw(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    // raw(temp,...a)
+    JSValue cooked, val, raw;
+    StringBuffer b_s, *b = &b_s;
+    int64_t i, n;
+
+    string_buffer_init(ctx, b, 0);
+    raw = JS_UNDEFINED;
+    cooked = JS_ToObject(ctx, argv[0]);
+    if (JS_IsException(cooked))
+        goto exception;
+    raw = JS_ToObjectFree(ctx, JS_GetProperty(ctx, cooked, JS_ATOM_raw));
+    if (JS_IsException(raw))
+        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))
+            goto exception;
+        string_buffer_concat_value_free(b, val);
+        if (i < n - 1 && i + 1 < argc) {
+            if (string_buffer_concat_value(b, argv[i + 1]))
+                goto exception;
+        }
+    }
+    JS_FreeValue(ctx, cooked);
+    JS_FreeValue(ctx, raw);
+    return string_buffer_end(b);
+
+exception:
+    JS_FreeValue(ctx, cooked);
+    JS_FreeValue(ctx, raw);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+/* only used in test262 */
+JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    uint32_t start, end, i, n;
+    StringBuffer b_s, *b = &b_s;
+
+    if (JS_ToUint32(ctx, &start, argv[0]) ||
+        JS_ToUint32(ctx, &end, argv[1]))
+        return JS_EXCEPTION;
+    end = min_uint32(end, 0x10ffff + 1);
+
+    if (start > end) {
+        start = end;
+    }
+    n = end - start;
+    if (end > 0x10000) {
+        n += end - max_uint32(start, 0x10000);
+    }
+    if (string_buffer_init2(ctx, b, n, end >= 0x100))
+        return JS_EXCEPTION;
+    for(i = start; i < end; i++) {
+        string_buffer_putc(b, i);
+    }
+    return string_buffer_end(b);
+}
+
+#if 0
+static JSValue js_string___isSpace(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    int c;
+    if (JS_ToInt32(ctx, &c, argv[0]))
+        return JS_EXCEPTION;
+    return JS_NewBool(ctx, lre_is_space(c));
+}
+#endif
+
+static JSValue js_string_charCodeAt(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 || idx >= p->len) {
+        ret = JS_NAN;
+    } else {
+        if (p->is_wide_char)
+            c = p->u.str16[idx];
+        else
+            c = p->u.str8[idx];
+        ret = JS_NewInt32(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_charAt(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 || idx >= p->len) {
+        ret = js_new_string8(ctx, NULL, 0);
+    } else {
+        if (p->is_wide_char)
+            c = p->u.str16[idx];
+        else
+            c = p->u.str8[idx];
+        ret = js_new_string_char(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_codePointAt(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    JSString *p;
+    int idx, c;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (JS_ToInt32Sat(ctx, &idx, argv[0])) {
+        JS_FreeValue(ctx, val);
+        return JS_EXCEPTION;
+    }
+    if (idx < 0 || idx >= p->len) {
+        ret = JS_UNDEFINED;
+    } else {
+        c = string_getc(p, &idx);
+        ret = JS_NewInt32(ctx, c);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_string_concat(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue r;
+    int i;
+
+    /* XXX: Use more efficient method */
+    /* XXX: This method is OK if r has a single refcount */
+    /* XXX: should use string_buffer? */
+    r = JS_ToStringCheckObject(ctx, this_val);
+    for (i = 0; i < argc; i++) {
+        if (JS_IsException(r))
+            break;
+        r = JS_ConcatString(ctx, r, JS_DupValue(ctx, argv[i]));
+    }
+    return r;
+}
+
+static int string_cmp(JSString *p1, JSString *p2, int x1, int x2, int len)
+{
+    int i, c1, c2;
+    for (i = 0; i < len; i++) {
+        if ((c1 = string_get(p1, x1 + i)) != (c2 = string_get(p2, x2 + i)))
+            return c1 - c2;
+    }
+    return 0;
+}
+
+static int string_indexof_char(JSString *p, int c, int from)
+{
+    /* assuming 0 <= from <= p->len */
+    int i, len = p->len;
+    if (p->is_wide_char) {
+        for (i = from; i < len; i++) {
+            if (p->u.str16[i] == c)
+                return i;
+        }
+    } else {
+        if ((c & ~0xff) == 0) {
+            for (i = from; i < len; i++) {
+                if (p->u.str8[i] == (uint8_t)c)
+                    return i;
+            }
+        }
+    }
+    return -1;
+}
+
+static int string_indexof(JSString *p1, JSString *p2, int from)
+{
+    /* assuming 0 <= from <= p1->len */
+    int c, i, j, len1 = p1->len, len2 = p2->len;
+    if (len2 == 0)
+        return from;
+    for (i = from, c = string_get(p2, 0); i + len2 <= len1; i = j + 1) {
+        j = string_indexof_char(p1, c, i);
+        if (j < 0 || j + len2 > len1)
+            break;
+        if (!string_cmp(p1, p2, j + 1, 1, len2 - 1))
+            return j;
+    }
+    return -1;
+}
+
+static int string_advance_index(JSString *p, int index, BOOL unicode)
+{
+    if (!unicode || (unsigned)index >= p->len || !p->is_wide_char) {
+        index++;
+    } else {
+        string_getc(p, &index);
+    }
+    return index;
+}
+
+static JSValue js_string_indexOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int lastIndexOf)
+{
+    JSValue str, v;
+    int i, len, v_len, pos, start, stop, ret, inc;
+    JSString *p;
+    JSString *p1;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    v = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(v))
+        goto fail;
+    p = JS_VALUE_GET_STRING(str);
+    p1 = JS_VALUE_GET_STRING(v);
+    len = p->len;
+    v_len = p1->len;
+    if (lastIndexOf) {
+        pos = len - v_len;
+        if (argc > 1) {
+            double d;
+            if (JS_ToFloat64(ctx, &d, argv[1]))
+                goto fail;
+            if (!isnan(d)) {
+                if (d <= 0)
+                    pos = 0;
+                else if (d < pos)
+                    pos = d;
+            }
+        }
+        start = pos;
+        stop = 0;
+        inc = -1;
+    } else {
+        pos = 0;
+        if (argc > 1) {
+            if (JS_ToInt32Clamp(ctx, &pos, argv[1], 0, len, 0))
+                goto fail;
+        }
+        start = pos;
+        stop = len - v_len;
+        inc = 1;
+    }
+    ret = -1;
+    if (len >= v_len && inc * (stop - start) >= 0) {
+        for (i = start;; i += inc) {
+            if (!string_cmp(p, p1, i, 0, v_len)) {
+                ret = i;
+                break;
+            }
+            if (i == stop)
+                break;
+        }
+    }
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_NewInt32(ctx, ret);
+
+fail:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_EXCEPTION;
+}
+
+/* return < 0 if exception or TRUE/FALSE */
+static int js_is_regexp(JSContext *ctx, JSValueConst obj);
+
+static JSValue js_string_includes(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue str, v = JS_UNDEFINED;
+    int i, len, v_len, pos, start, stop, ret;
+    JSString *p;
+    JSString *p1;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    ret = js_is_regexp(ctx, argv[0]);
+    if (ret) {
+        if (ret > 0)
+            JS_ThrowTypeError(ctx, "regex not supported");
+        goto fail;
+    }
+    v = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(v))
+        goto fail;
+    p = JS_VALUE_GET_STRING(str);
+    p1 = JS_VALUE_GET_STRING(v);
+    len = p->len;
+    v_len = p1->len;
+    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;
+        start = stop = pos;
+    }
+    ret = 0;
+    if (start >= 0 && start <= stop) {
+        for (i = start;; i++) {
+            if (!string_cmp(p, p1, i, 0, v_len)) {
+                ret = 1;
+                break;
+            }
+            if (i == stop)
+                break;
+        }
+    }
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_NewBool(ctx, ret);
+
+fail:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, v);
+    return JS_EXCEPTION;
+}
+
+static int check_regexp_g_flag(JSContext *ctx, JSValueConst regexp)
+{
+    int ret;
+    JSValue flags;
+
+    ret = js_is_regexp(ctx, regexp);
+    if (ret < 0)
+        return -1;
+    if (ret) {
+        flags = JS_GetProperty(ctx, regexp, JS_ATOM_flags);
+        if (JS_IsException(flags))
+            return -1;
+        if (JS_IsUndefined(flags) || JS_IsNull(flags)) {
+            JS_ThrowTypeError(ctx, "cannot convert to object");
+            return -1;
+        }
+        flags = JS_ToStringFree(ctx, flags);
+        if (JS_IsException(flags))
+            return -1;
+        ret = string_indexof_char(JS_VALUE_GET_STRING(flags), 'g', 0);
+        JS_FreeValue(ctx, flags);
+        if (ret < 0) {
+            JS_ThrowTypeError(ctx, "regexp must have the 'g' flag");
+            return -1;
+        }
+    }
+    return 0;
+}
+
+static JSValue js_string_match(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int atom)
+{
+    // match(rx), search(rx), matchAll(rx)
+    // atom is JS_ATOM_Symbol_match, JS_ATOM_Symbol_search, or JS_ATOM_Symbol_matchAll
+    JSValueConst O = this_val, regexp = argv[0], args[2];
+    JSValue matcher, S, rx, result, str;
+    int args_len;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    if (!JS_IsUndefined(regexp) && !JS_IsNull(regexp)) {
+        matcher = JS_GetProperty(ctx, regexp, atom);
+        if (JS_IsException(matcher))
+            return JS_EXCEPTION;
+        if (atom == JS_ATOM_Symbol_matchAll) {
+            if (check_regexp_g_flag(ctx, regexp) < 0) {
+                JS_FreeValue(ctx, matcher);
+                return JS_EXCEPTION;
+            }
+        }
+        if (!JS_IsUndefined(matcher) && !JS_IsNull(matcher)) {
+            return JS_CallFree(ctx, matcher, regexp, 1, &O);
+        }
+    }
+    S = JS_ToString(ctx, O);
+    if (JS_IsException(S))
+        return JS_EXCEPTION;
+    args_len = 1;
+    args[0] = regexp;
+    str = JS_UNDEFINED;
+    if (atom == JS_ATOM_Symbol_matchAll) {
+        str = JS_NewString(ctx, "g");
+        if (JS_IsException(str))
+            goto fail;
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+        args[args_len++] = str;
+#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)) {
+    fail:
+        JS_FreeValue(ctx, S);
+        return JS_EXCEPTION;
+    }
+    result = JS_InvokeFree(ctx, rx, atom, 1, (JSValueConst *)&S);
+    JS_FreeValue(ctx, S);
+    return result;
+}
+
+static JSValue js_string___GetSubstitution(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv)
+{
+    // GetSubstitution(matched, str, position, captures, namedCaptures, rep)
+    JSValueConst matched, str, captures, namedCaptures, rep;
+    JSValue capture, name, s;
+    uint32_t position, len, matched_len, captures_len;
+    int i, j, j0, k, k1;
+    int c, c1;
+    StringBuffer b_s, *b = &b_s;
+    JSString *sp, *rp;
+
+    matched = argv[0];
+    str = argv[1];
+    captures = argv[3];
+    namedCaptures = argv[4];
+    rep = argv[5];
+
+    if (!JS_IsString(rep) || !JS_IsString(str))
+        return JS_ThrowTypeError(ctx, "not a string");
+
+    sp = JS_VALUE_GET_STRING(str);
+    rp = JS_VALUE_GET_STRING(rep);
+
+    string_buffer_init(ctx, b, 0);
+
+    captures_len = 0;
+    if (!JS_IsUndefined(captures)) {
+        if (js_get_length32(ctx, &captures_len, captures))
+            goto exception;
+    }
+    if (js_get_length32(ctx, &matched_len, matched))
+        goto exception;
+    if (JS_ToUint32(ctx, &position, argv[2]) < 0)
+        goto exception;
+
+    len = rp->len;
+    i = 0;
+    for(;;) {
+        j = string_indexof_char(rp, '$', i);
+        if (j < 0 || j + 1 >= len)
+            break;
+        string_buffer_concat(b, rp, i, j);
+        j0 = j++;
+        c = string_get(rp, j++);
+        if (c == '$') {
+            string_buffer_putc8(b, '$');
+        } else if (c == '&') {
+            if (string_buffer_concat_value(b, matched))
+                goto exception;
+        } else if (c == '`') {
+            string_buffer_concat(b, sp, 0, position);
+        } else if (c == '\'') {
+            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 (k >= 1 && k < captures_len) {
+                s = JS_GetPropertyInt64(ctx, captures, k);
+                if (JS_IsException(s))
+                    goto exception;
+                if (!JS_IsUndefined(s)) {
+                    if (string_buffer_concat_value_free(b, s))
+                        goto exception;
+                }
+            } else {
+                goto norep;
+            }
+        } else if (c == '<' && !JS_IsUndefined(namedCaptures)) {
+            k = string_indexof_char(rp, '>', j);
+            if (k < 0)
+                goto norep;
+            name = js_sub_string(ctx, rp, j, k);
+            if (JS_IsException(name))
+                goto exception;
+            capture = JS_GetPropertyValue(ctx, namedCaptures, name);
+            if (JS_IsException(capture))
+                goto exception;
+            if (!JS_IsUndefined(capture)) {
+                if (string_buffer_concat_value_free(b, capture))
+                    goto exception;
+            }
+            j = k + 1;
+        } else {
+        norep:
+            string_buffer_concat(b, rp, j0, j);
+        }
+        i = j;
+    }
+    string_buffer_concat(b, rp, i, rp->len);
+    return string_buffer_end(b);
+exception:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_replace(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv,
+                                 int is_replaceAll)
+{
+    // replace(rx, rep)
+    JSValueConst O = this_val, searchValue = argv[0], replaceValue = argv[1];
+    JSValueConst args[6];
+    JSValue str, search_str, replaceValue_str, repl_str;
+    JSString *sp, *searchp;
+    StringBuffer b_s, *b = &b_s;
+    int pos, functionalReplace, endOfLastMatch;
+    BOOL is_first;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    search_str = JS_UNDEFINED;
+    replaceValue_str = JS_UNDEFINED;
+    repl_str = JS_UNDEFINED;
+
+    if (!JS_IsUndefined(searchValue) && !JS_IsNull(searchValue)) {
+        JSValue replacer;
+        if (is_replaceAll) {
+            if (check_regexp_g_flag(ctx, searchValue) < 0)
+                return JS_EXCEPTION;
+        }
+        replacer = JS_GetProperty(ctx, searchValue, JS_ATOM_Symbol_replace);
+        if (JS_IsException(replacer))
+            return JS_EXCEPTION;
+        if (!JS_IsUndefined(replacer)) {
+            args[0] = O;
+            args[1] = replaceValue;
+            return JS_CallFree(ctx, replacer, searchValue, 2, args);
+        }
+    }
+    string_buffer_init(ctx, b, 0);
+
+    str = JS_ToString(ctx, O);
+    if (JS_IsException(str))
+        goto exception;
+    search_str = JS_ToString(ctx, searchValue);
+    if (JS_IsException(search_str))
+        goto exception;
+    functionalReplace = JS_IsFunction(ctx, replaceValue);
+    if (!functionalReplace) {
+        replaceValue_str = JS_ToString(ctx, replaceValue);
+        if (JS_IsException(replaceValue_str))
+            goto exception;
+    }
+
+    sp = JS_VALUE_GET_STRING(str);
+    searchp = JS_VALUE_GET_STRING(search_str);
+    endOfLastMatch = 0;
+    is_first = TRUE;
+    for(;;) {
+        if (unlikely(searchp->len == 0)) {
+            if (is_first)
+                pos = 0;
+            else if (endOfLastMatch >= sp->len)
+                pos = -1;
+            else
+                pos = endOfLastMatch + 1;
+        } else {
+            pos = string_indexof(sp, searchp, endOfLastMatch);
+        }
+        if (pos < 0) {
+            if (is_first) {
+                string_buffer_free(b);
+                JS_FreeValue(ctx, search_str);
+                JS_FreeValue(ctx, replaceValue_str);
+                return str;
+            } else {
+                break;
+            }
+        }
+        if (functionalReplace) {
+            args[0] = search_str;
+            args[1] = JS_NewInt32(ctx, pos);
+            args[2] = str;
+            repl_str = JS_ToStringFree(ctx, JS_Call(ctx, replaceValue, JS_UNDEFINED, 3, args));
+        } else {
+            args[0] = search_str;
+            args[1] = str;
+            args[2] = JS_NewInt32(ctx, pos);
+            args[3] = JS_UNDEFINED;
+            args[4] = JS_UNDEFINED;
+            args[5] = replaceValue_str;
+            repl_str = js_string___GetSubstitution(ctx, JS_UNDEFINED, 6, args);
+        }
+        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;
+        is_first = FALSE;
+        if (!is_replaceAll)
+            break;
+    }
+    string_buffer_concat(b, sp, endOfLastMatch, sp->len);
+    JS_FreeValue(ctx, search_str);
+    JS_FreeValue(ctx, replaceValue_str);
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+exception:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, search_str);
+    JS_FreeValue(ctx, replaceValue_str);
+    JS_FreeValue(ctx, str);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_split(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // split(sep, limit)
+    JSValueConst O = this_val, separator = argv[0], limit = argv[1];
+    JSValueConst args[2];
+    JSValue S, A, R, T;
+    uint32_t lim, lengthA;
+    int64_t p, q, s, r, e;
+    JSString *sp, *rp;
+
+    if (JS_IsUndefined(O) || JS_IsNull(O))
+        return JS_ThrowTypeError(ctx, "cannot convert to object");
+
+    S = JS_UNDEFINED;
+    A = JS_UNDEFINED;
+    R = JS_UNDEFINED;
+
+    if (!JS_IsUndefined(separator) && !JS_IsNull(separator)) {
+        JSValue splitter;
+        splitter = JS_GetProperty(ctx, separator, JS_ATOM_Symbol_split);
+        if (JS_IsException(splitter))
+            return JS_EXCEPTION;
+        if (!JS_IsUndefined(splitter) && !JS_IsNull(splitter)) {
+            args[0] = O;
+            args[1] = limit;
+            return JS_CallFree(ctx, splitter, separator, 2, args);
+        }
+    }
+    S = JS_ToString(ctx, O);
+    if (JS_IsException(S))
+        goto exception;
+    A = JS_NewArray(ctx);
+    if (JS_IsException(A))
+        goto exception;
+    lengthA = 0;
+    if (JS_IsUndefined(limit)) {
+        lim = 0xffffffff;
+    } else {
+        if (JS_ToUint32(ctx, &lim, limit) < 0)
+            goto exception;
+    }
+    sp = JS_VALUE_GET_STRING(S);
+    s = sp->len;
+    R = JS_ToString(ctx, separator);
+    if (JS_IsException(R))
+        goto exception;
+    rp = JS_VALUE_GET_STRING(R);
+    r = rp->len;
+    p = 0;
+    if (lim == 0)
+        goto done;
+    if (JS_IsUndefined(separator))
+        goto add_tail;
+    if (s == 0) {
+        if (r != 0)
+            goto add_tail;
+        goto done;
+    }
+    q = p;
+    for (q = p; (q += !r) <= s - r - !r; q = p = e + r) {
+        e = string_indexof(sp, rp, q);
+        if (e < 0)
+            break;
+        T = js_sub_string(ctx, sp, p, e);
+        if (JS_IsException(T))
+            goto exception;
+        if (JS_CreateDataPropertyUint32(ctx, A, lengthA++, T, 0) < 0)
+            goto exception;
+        if (lengthA == lim)
+            goto done;
+    }
+add_tail:
+    T = js_sub_string(ctx, sp, p, s);
+    if (JS_IsException(T))
+        goto exception;
+    if (JS_CreateDataPropertyUint32(ctx, A, lengthA++, T,0 ) < 0)
+        goto exception;
+done:
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, R);
+    return A;
+
+exception:
+    JS_FreeValue(ctx, A);
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, R);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_substring(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int a, b, start, end;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    if (JS_ToInt32Clamp(ctx, &a, argv[0], 0, p->len, 0)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    b = p->len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &b, argv[1], 0, p->len, 0)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    if (a < b) {
+        start = a;
+        end = b;
+    } else {
+        start = b;
+        end = a;
+    }
+    ret = js_sub_string(ctx, p, start, end);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_substr(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int a, len, n;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (JS_ToInt32Clamp(ctx, &a, argv[0], 0, len, len)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    n = len - a;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &n, argv[1], 0, len - a, 0)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    ret = js_sub_string(ctx, p, a, a + n);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_slice(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue str, ret;
+    int len, start, end;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len)) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    end = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &end, argv[1], 0, len, len)) {
+            JS_FreeValue(ctx, str);
+            return JS_EXCEPTION;
+        }
+    }
+    ret = js_sub_string(ctx, p, start, max_int(end, start));
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string_pad(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int padEnd)
+{
+    JSValue str, v = JS_UNDEFINED;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p, *p1 = NULL;
+    int n, len, c = ' ';
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        goto fail1;
+    if (JS_ToInt32Sat(ctx, &n, argv[0]))
+        goto fail2;
+    p = JS_VALUE_GET_STRING(str);
+    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))
+            goto fail2;
+        p1 = JS_VALUE_GET_STRING(v);
+        if (p1->len == 0) {
+            JS_FreeValue(ctx, v);
+            return str;
+        }
+        if (p1->len == 1) {
+            c = string_get(p1, 0);
+            p1 = NULL;
+        }
+    }
+    if (string_buffer_init(ctx, b, n))
+        goto fail3;
+    n -= len;
+    if (padEnd) {
+        if (string_buffer_concat(b, p, 0, len))
+            goto fail;
+    }
+    if (p1) {
+        while (n > 0) {
+            int chunk = min_int(n, p1->len);
+            if (string_buffer_concat(b, p1, 0, chunk))
+                goto fail;
+            n -= chunk;
+        }
+    } else {
+        if (string_buffer_fill(b, c, n))
+            goto fail;
+    }
+    if (!padEnd) {
+        if (string_buffer_concat(b, p, 0, len))
+            goto fail;
+    }
+    JS_FreeValue(ctx, v);
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+fail3:
+    JS_FreeValue(ctx, v);
+fail2:
+    JS_FreeValue(ctx, str);
+fail1:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_repeat(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int64_t val;
+    int n, len;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        goto fail;
+    if (JS_ToInt64Sat(ctx, &val, argv[0]))
+        goto fail;
+    if (val < 0 || val > 2147483647) {
+        JS_ThrowRangeError(ctx, "invalid repeat count");
+        goto fail;
+    }
+    n = val;
+    p = JS_VALUE_GET_STRING(str);
+    len = p->len;
+    if (len == 0 || n == 1)
+        return str;
+    if (val * len > JS_STRING_LEN_MAX) {
+        JS_ThrowInternalError(ctx, "string too long");
+        goto fail;
+    }
+    if (string_buffer_init2(ctx, b, n * len, p->is_wide_char))
+        goto fail;
+    if (len == 1) {
+        string_buffer_fill(b, string_get(p, 0), n);
+    } else {
+        while (n-- > 0) {
+            string_buffer_concat(b, p, 0, len);
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_trim(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    JSValue str, ret;
+    int a, b, len;
+    JSString *p;
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return str;
+    p = JS_VALUE_GET_STRING(str);
+    a = 0;
+    b = len = p->len;
+    if (magic & 1) {
+        while (a < len && lre_is_space(string_get(p, a)))
+            a++;
+    }
+    if (magic & 2) {
+        while (b > a && lre_is_space(string_get(p, b - 1)))
+            b--;
+    }
+    ret = js_sub_string(ctx, p, a, b);
+    JS_FreeValue(ctx, str);
+    return ret;
+}
+
+static JSValue js_string___quote(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return JS_ToQuotedString(ctx, this_val);
+}
+
+/* return 0 if before the first char */
+static int string_prevc(JSString *p, int *pidx)
+{
+    int idx, c, c1;
+
+    idx = *pidx;
+    if (idx <= 0)
+        return 0;
+    idx--;
+    if (p->is_wide_char) {
+        c = p->u.str16[idx];
+        if (c >= 0xdc00 && c < 0xe000 && idx > 0) {
+            c1 = p->u.str16[idx - 1];
+            if (c1 >= 0xd800 && c1 <= 0xdc00) {
+                c = (((c1 & 0x3ff) << 10) | (c & 0x3ff)) + 0x10000;
+                idx--;
+            }
+        }
+    } else {
+        c = p->u.str8[idx];
+    }
+    *pidx = idx;
+    return c;
+}
+
+static BOOL test_final_sigma(JSString *p, int sigma_pos)
+{
+    int k, c1;
+
+    /* before C: skip case ignorable chars and check there is
+       a cased letter */
+    k = sigma_pos;
+    for(;;) {
+        c1 = string_prevc(p, &k);
+        if (!lre_is_case_ignorable(c1))
+            break;
+    }
+    if (!lre_is_cased(c1))
+        return FALSE;
+
+    /* after C: skip case ignorable chars and check there is
+       no cased letter */
+    k = sigma_pos + 1;
+    for(;;) {
+        if (k >= p->len)
+            return TRUE;
+        c1 = string_getc(p, &k);
+        if (!lre_is_case_ignorable(c1))
+            break;
+    }
+    return !lre_is_cased(c1);
+}
+
+static JSValue js_string_localeCompare(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue a, b;
+    int cmp;
+
+    a = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(a))
+        return JS_EXCEPTION;
+    b = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(b)) {
+        JS_FreeValue(ctx, a);
+        return JS_EXCEPTION;
+    }
+    cmp = js_string_compare(ctx, JS_VALUE_GET_STRING(a), JS_VALUE_GET_STRING(b));
+    JS_FreeValue(ctx, a);
+    JS_FreeValue(ctx, b);
+    return JS_NewInt32(ctx, cmp);
+}
+
+static JSValue js_string_toLowerCase(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv, int to_lower)
+{
+    JSValue val;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, c, j, l;
+    uint32_t res[LRE_CC_RES_LEN_MAX];
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_STRING(val);
+    if (p->len == 0)
+        return val;
+    if (string_buffer_init(ctx, b, p->len))
+        goto fail;
+    for(i = 0; i < p->len;) {
+        c = string_getc(p, &i);
+        if (c == 0x3a3 && to_lower && test_final_sigma(p, i - 1)) {
+            res[0] = 0x3c2; /* final sigma */
+            l = 1;
+        } else {
+            l = lre_case_conv(res, c, to_lower);
+        }
+        for(j = 0; j < l; j++) {
+            if (string_buffer_putc(b, res[j]))
+                goto fail;
+        }
+    }
+    JS_FreeValue(ctx, val);
+    return string_buffer_end(b);
+ fail:
+    JS_FreeValue(ctx, val);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+#ifdef CONFIG_ALL_UNICODE
+
+/* return (-1, NULL) if exception, otherwise (len, buf) */
+static int JS_ToUTF32String(JSContext *ctx, uint32_t **pbuf, JSValueConst val1)
+{
+    JSValue val;
+    JSString *p;
+    uint32_t *buf;
+    int i, j, len;
+
+    val = JS_ToString(ctx, val1);
+    if (JS_IsException(val))
+        return -1;
+    p = JS_VALUE_GET_STRING(val);
+    len = p->len;
+    /* UTF32 buffer length is len minus the number of correct surrogates pairs */
+    buf = js_malloc(ctx, sizeof(buf[0]) * max_int(len, 1));
+    if (!buf) {
+        JS_FreeValue(ctx, val);
+        goto fail;
+    }
+    for(i = j = 0; i < len;)
+        buf[j++] = string_getc(p, &i);
+    JS_FreeValue(ctx, val);
+    *pbuf = buf;
+    return j;
+ fail:
+    *pbuf = NULL;
+    return -1;
+}
+
+static JSValue JS_NewUTF32String(JSContext *ctx, const uint32_t *buf, int len)
+{
+    int i;
+    StringBuffer b_s, *b = &b_s;
+    if (string_buffer_init(ctx, b, len))
+        return JS_EXCEPTION;
+    for(i = 0; i < len; i++) {
+        if (string_buffer_putc(b, buf[i]))
+            goto fail;
+    }
+    return string_buffer_end(b);
+ fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_string_normalize(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    const char *form, *p;
+    size_t form_len;
+    int is_compat, buf_len, out_len;
+    UnicodeNormalizationEnum n_type;
+    JSValue val;
+    uint32_t *buf, *out_buf;
+
+    val = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    buf_len = JS_ToUTF32String(ctx, &buf, val);
+    JS_FreeValue(ctx, val);
+    if (buf_len < 0)
+        return JS_EXCEPTION;
+
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        n_type = UNICODE_NFC;
+    } else {
+        form = JS_ToCStringLen(ctx, &form_len, argv[0]);
+        if (!form)
+            goto fail1;
+        p = form;
+        if (p[0] != 'N' || p[1] != 'F')
+            goto bad_form;
+        p += 2;
+        is_compat = FALSE;
+        if (*p == 'K') {
+            is_compat = TRUE;
+            p++;
+        }
+        if (*p == 'C' || *p == 'D') {
+            n_type = UNICODE_NFC + is_compat * 2 + (*p - 'C');
+            if ((p + 1 - form) != form_len)
+                goto bad_form;
+        } else {
+        bad_form:
+            JS_FreeCString(ctx, form);
+            JS_ThrowRangeError(ctx, "bad normalization form");
+        fail1:
+            js_free(ctx, buf);
+            return JS_EXCEPTION;
+        }
+        JS_FreeCString(ctx, form);
+    }
+
+    out_len = unicode_normalize(&out_buf, buf, buf_len, n_type,
+                                ctx->rt, (DynBufReallocFunc *)js_realloc_rt);
+    js_free(ctx, buf);
+    if (out_len < 0)
+        return JS_EXCEPTION;
+    val = JS_NewUTF32String(ctx, out_buf, out_len);
+    js_free(ctx, out_buf);
+    return val;
+}
+#endif /* CONFIG_ALL_UNICODE */
+
+/* also used for String.prototype.valueOf */
+static JSValue js_string_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    return js_thisStringValue(ctx, this_val);
+}
+
+#if 0
+static JSValue js_string___toStringCheckObject(JSContext *ctx, JSValueConst this_val,
+                                               int argc, JSValueConst *argv)
+{
+    return JS_ToStringCheckObject(ctx, argv[0]);
+}
+
+static JSValue js_string___toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    return JS_ToString(ctx, argv[0]);
+}
+
+static JSValue js_string___advanceStringIndex(JSContext *ctx, JSValueConst
+                                              this_val,
+                                              int argc, JSValueConst *argv)
+{
+    JSValue str;
+    int idx;
+    BOOL is_unicode;
+    JSString *p;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+    if (JS_ToInt32Sat(ctx, &idx, argv[1])) {
+        JS_FreeValue(ctx, str);
+        return JS_EXCEPTION;
+    }
+    is_unicode = JS_ToBool(ctx, argv[2]);
+    p = JS_VALUE_GET_STRING(str);
+    if (!is_unicode || (unsigned)idx >= p->len || !p->is_wide_char) {
+        idx++;
+    } else {
+        string_getc(p, &idx);
+    }
+    JS_FreeValue(ctx, str);
+    return JS_NewInt32(ctx, idx);
+}
+#endif
+
+/* String Iterator */
+
+static JSValue js_string_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv,
+                                       BOOL *pdone, int magic)
+{
+    JSArrayIteratorData *it;
+    uint32_t idx, c, start;
+    JSString *p;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_STRING_ITERATOR);
+    if (!it) {
+        *pdone = FALSE;
+        return JS_EXCEPTION;
+    }
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    p = JS_VALUE_GET_STRING(it->obj);
+    idx = it->idx;
+    if (idx >= p->len) {
+        JS_FreeValue(ctx, it->obj);
+        it->obj = JS_UNDEFINED;
+    done:
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+
+    start = idx;
+    c = string_getc(p, (int *)&idx);
+    it->idx = idx;
+    *pdone = FALSE;
+    if (c <= 0xffff) {
+        return js_new_string_char(ctx, c);
+    } else {
+        return js_new_string16(ctx, p->u.str16 + start, 2);
+    }
+}
+
+/* ES6 Annex B 2.3.2 etc. */
+enum {
+    magic_string_anchor,
+    magic_string_big,
+    magic_string_blink,
+    magic_string_bold,
+    magic_string_fixed,
+    magic_string_fontcolor,
+    magic_string_fontsize,
+    magic_string_italics,
+    magic_string_link,
+    magic_string_small,
+    magic_string_strike,
+    magic_string_sub,
+    magic_string_sup,
+};
+
+static JSValue js_string_CreateHTML(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv, int magic)
+{
+    JSValue str;
+    const JSString *p;
+    StringBuffer b_s, *b = &b_s;
+    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 },
+        { "sub", NULL }, { "sup", NULL },
+    };
+
+    str = JS_ToStringCheckObject(ctx, this_val);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+    string_buffer_init(ctx, b, 7);
+    string_buffer_putc8(b, '<');
+    string_buffer_puts8(b, defs[magic].tag);
+    if (defs[magic].attr) {
+        // r += " " + attr + "=\"" + value + "\"";
+        JSValue value;
+        int i;
+
+        string_buffer_putc8(b, ' ');
+        string_buffer_puts8(b, defs[magic].attr);
+        string_buffer_puts8(b, "=\"");
+        value = JS_ToStringCheckObject(ctx, argv[0]);
+        if (JS_IsException(value)) {
+            JS_FreeValue(ctx, str);
+            string_buffer_free(b);
+            return JS_EXCEPTION;
+        }
+        p = JS_VALUE_GET_STRING(value);
+        for (i = 0; i < p->len; i++) {
+            int c = string_get(p, i);
+            if (c == '"') {
+                string_buffer_puts8(b, "&quot;");
+            } else {
+                string_buffer_putc16(b, c);
+            }
+        }
+        JS_FreeValue(ctx, value);
+        string_buffer_putc8(b, '\"');
+    }
+    // return r + ">" + str + "</" + tag + ">";
+    string_buffer_putc8(b, '>');
+    string_buffer_concat_value_free(b, str);
+    string_buffer_puts8(b, "</");
+    string_buffer_puts8(b, defs[magic].tag);
+    string_buffer_putc8(b, '>');
+    return string_buffer_end(b);
+}
+
+static const JSCFunctionListEntry js_string_funcs[] = {
+    JS_CFUNC_DEF("fromCharCode", 1, js_string_fromCharCode ),
+    JS_CFUNC_DEF("fromCodePoint", 1, js_string_fromCodePoint ),
+    JS_CFUNC_DEF("raw", 1, js_string_raw ),
+    //JS_CFUNC_DEF("__toString", 1, js_string___toString ),
+    //JS_CFUNC_DEF("__isSpace", 1, js_string___isSpace ),
+    //JS_CFUNC_DEF("__toStringCheckObject", 1, js_string___toStringCheckObject ),
+    //JS_CFUNC_DEF("__advanceStringIndex", 3, js_string___advanceStringIndex ),
+    //JS_CFUNC_DEF("__GetSubstitution", 6, js_string___GetSubstitution ),
+};
+
+static const JSCFunctionListEntry js_string_proto_funcs[] = {
+    JS_PROP_INT32_DEF("length", 0, JS_PROP_CONFIGURABLE ),
+    JS_CFUNC_DEF("charCodeAt", 1, js_string_charCodeAt ),
+    JS_CFUNC_DEF("charAt", 1, js_string_charAt ),
+    JS_CFUNC_DEF("concat", 1, js_string_concat ),
+    JS_CFUNC_DEF("codePointAt", 1, js_string_codePointAt ),
+    JS_CFUNC_MAGIC_DEF("indexOf", 1, js_string_indexOf, 0 ),
+    JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_string_indexOf, 1 ),
+    JS_CFUNC_MAGIC_DEF("includes", 1, js_string_includes, 0 ),
+    JS_CFUNC_MAGIC_DEF("endsWith", 1, js_string_includes, 2 ),
+    JS_CFUNC_MAGIC_DEF("startsWith", 1, js_string_includes, 1 ),
+    JS_CFUNC_MAGIC_DEF("match", 1, js_string_match, JS_ATOM_Symbol_match ),
+    JS_CFUNC_MAGIC_DEF("matchAll", 1, js_string_match, JS_ATOM_Symbol_matchAll ),
+    JS_CFUNC_MAGIC_DEF("search", 1, js_string_match, JS_ATOM_Symbol_search ),
+    JS_CFUNC_DEF("split", 2, js_string_split ),
+    JS_CFUNC_DEF("substring", 2, js_string_substring ),
+    JS_CFUNC_DEF("substr", 2, js_string_substr ),
+    JS_CFUNC_DEF("slice", 2, js_string_slice ),
+    JS_CFUNC_DEF("repeat", 1, js_string_repeat ),
+    JS_CFUNC_MAGIC_DEF("replace", 2, js_string_replace, 0 ),
+    JS_CFUNC_MAGIC_DEF("replaceAll", 2, js_string_replace, 1 ),
+    JS_CFUNC_MAGIC_DEF("padEnd", 1, js_string_pad, 1 ),
+    JS_CFUNC_MAGIC_DEF("padStart", 1, js_string_pad, 0 ),
+    JS_CFUNC_MAGIC_DEF("trim", 0, js_string_trim, 3 ),
+    JS_CFUNC_MAGIC_DEF("trimEnd", 0, js_string_trim, 2 ),
+    JS_ALIAS_DEF("trimRight", "trimEnd" ),
+    JS_CFUNC_MAGIC_DEF("trimStart", 0, js_string_trim, 1 ),
+    JS_ALIAS_DEF("trimLeft", "trimStart" ),
+    JS_CFUNC_DEF("toString", 0, js_string_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_string_toString ),
+    JS_CFUNC_DEF("__quote", 1, js_string___quote ),
+    JS_CFUNC_DEF("localeCompare", 1, js_string_localeCompare ),
+    JS_CFUNC_MAGIC_DEF("toLowerCase", 0, js_string_toLowerCase, 1 ),
+    JS_CFUNC_MAGIC_DEF("toUpperCase", 0, js_string_toLowerCase, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleLowerCase", 0, js_string_toLowerCase, 1 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleUpperCase", 0, js_string_toLowerCase, 0 ),
+    JS_CFUNC_MAGIC_DEF("[Symbol.iterator]", 0, js_create_array_iterator, JS_ITERATOR_KIND_VALUE | 4 ),
+    /* ES6 Annex B 2.3.2 etc. */
+    JS_CFUNC_MAGIC_DEF("anchor", 1, js_string_CreateHTML, magic_string_anchor ),
+    JS_CFUNC_MAGIC_DEF("big", 0, js_string_CreateHTML, magic_string_big ),
+    JS_CFUNC_MAGIC_DEF("blink", 0, js_string_CreateHTML, magic_string_blink ),
+    JS_CFUNC_MAGIC_DEF("bold", 0, js_string_CreateHTML, magic_string_bold ),
+    JS_CFUNC_MAGIC_DEF("fixed", 0, js_string_CreateHTML, magic_string_fixed ),
+    JS_CFUNC_MAGIC_DEF("fontcolor", 1, js_string_CreateHTML, magic_string_fontcolor ),
+    JS_CFUNC_MAGIC_DEF("fontsize", 1, js_string_CreateHTML, magic_string_fontsize ),
+    JS_CFUNC_MAGIC_DEF("italics", 0, js_string_CreateHTML, magic_string_italics ),
+    JS_CFUNC_MAGIC_DEF("link", 1, js_string_CreateHTML, magic_string_link ),
+    JS_CFUNC_MAGIC_DEF("small", 0, js_string_CreateHTML, magic_string_small ),
+    JS_CFUNC_MAGIC_DEF("strike", 0, js_string_CreateHTML, magic_string_strike ),
+    JS_CFUNC_MAGIC_DEF("sub", 0, js_string_CreateHTML, magic_string_sub ),
+    JS_CFUNC_MAGIC_DEF("sup", 0, js_string_CreateHTML, magic_string_sup ),
+};
+
+static const JSCFunctionListEntry js_string_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_string_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "String Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+#ifdef CONFIG_ALL_UNICODE
+static const JSCFunctionListEntry js_string_proto_normalize[] = {
+    JS_CFUNC_DEF("normalize", 0, js_string_normalize ),
+};
+#endif
+
+void JS_AddIntrinsicStringNormalize(JSContext *ctx)
+{
+#ifdef CONFIG_ALL_UNICODE
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING], js_string_proto_normalize,
+                               countof(js_string_proto_normalize));
+#endif
+}
+
+/* Math */
+
+/* precondition: a and b are not NaN */
+static double js_fmin(double a, double b)
+{
+    if (a == 0 && b == 0) {
+        JSFloat64Union a1, b1;
+        a1.d = a;
+        b1.d = b;
+        a1.u64 |= b1.u64;
+        return a1.d;
+    } else {
+        return fmin(a, b);
+    }
+}
+
+/* precondition: a and b are not NaN */
+static double js_fmax(double a, double b)
+{
+    if (a == 0 && b == 0) {
+        JSFloat64Union a1, b1;
+        a1.d = a;
+        b1.d = b;
+        a1.u64 &= b1.u64;
+        return a1.d;
+    } else {
+        return fmax(a, b);
+    }
+}
+
+#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;
+    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) {
+        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) {
+        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) {
+                r = 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);
+
+        }
+        return JS_NewInt32(ctx, r1);
+    } else {
+        if (JS_ToFloat64(ctx, &r, argv[0]))
+            return JS_EXCEPTION;
+        i = 1;
+    generic_case:
+        while (i < argc) {
+            if (JS_ToFloat64(ctx, &a, argv[i]))
+                return JS_EXCEPTION;
+            if (!isnan(r)) {
+                if (isnan(a)) {
+                    r = a;
+                } else {
+                    if (is_max)
+                        r = js_fmax(r, a);
+                    else
+                        r = js_fmin(r, a);
+                }
+            }
+            i++;
+        }
+        return JS_NewFloat64(ctx, r);
+    }
+}
+
+#endif /* !CONFIG_BIGNUM */
+
+static double js_math_sign(double a)
+{
+    if (isnan(a) || a == 0.0)
+        return a;
+    if (a < 0)
+        return -1;
+    else
+        return 1;
+}
+
+static double js_math_round(double a)
+{
+    JSFloat64Union u;
+    uint64_t frac_mask, one;
+    unsigned int e, s;
+
+    u.d = a;
+    e = (u.u64 >> 52) & 0x7ff;
+    if (e < 1023) {
+        /* abs(a) < 1 */
+        if (e == (1023 - 1) && u.u64 != 0xbfe0000000000000) {
+            /* abs(a) > 0.5 or a = 0.5: return +/-1.0 */
+            u.u64 = (u.u64 & ((uint64_t)1 << 63)) | ((uint64_t)1023 << 52);
+        } else {
+            /* return +/-0.0 */
+            u.u64 &= (uint64_t)1 << 63;
+        }
+    } else if (e < (1023 + 52)) {
+        s = u.u64 >> 63;
+        one = (uint64_t)1 << (52 - (e - 1023));
+        frac_mask = one - 1;
+        u.u64 += (one >> 1) - s;
+        u.u64 &= ~frac_mask; /* truncate to an integer */
+    }
+    /* otherwise: abs(a) >= 2^52, or NaN, +/-Infinity: no change */
+    return u.d;
+}
+
+static JSValue js_math_hypot(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    double r, a, b;
+    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]))
+            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;
+        }
+        r = sqrt(r);
+    }
+    return JS_NewFloat64(ctx, r);
+}
+
+static double js_math_fround(double a)
+{
+    return (float)a;
+}
+
+static JSValue js_math_imul(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv)
+{
+    int a, b;
+
+    if (JS_ToInt32(ctx, &a, argv[0]))
+        return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &b, argv[1]))
+        return JS_EXCEPTION;
+    /* purposely ignoring overflow */
+    return JS_NewInt32(ctx, a * b);
+}
+
+static JSValue js_math_clz32(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    uint32_t a, r;
+
+    if (JS_ToUint32(ctx, &a, argv[0]))
+        return JS_EXCEPTION;
+    if (a == 0)
+        r = 32;
+    else
+        r = clz32(a);
+    return JS_NewInt32(ctx, r);
+}
+
+/* xorshift* random number generator by Marsaglia */
+static uint64_t xorshift64star(uint64_t *pstate)
+{
+    uint64_t x;
+    x = *pstate;
+    x ^= x >> 12;
+    x ^= x << 25;
+    x ^= x >> 27;
+    *pstate = x;
+    return x * 0x2545F4914F6CDD1D;
+}
+
+static void js_random_init(JSContext *ctx)
+{
+#if defined(_MSC_VER) // FIXME: implement this
+    ctx->random_state = 42;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    ctx->random_state = ((int64_t)tv.tv_sec * 1000000) + tv.tv_usec;
+#endif
+    /* 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,
+                              int argc, JSValueConst *argv)
+{
+    JSFloat64Union u;
+    uint64_t v;
+
+    v = xorshift64star(&ctx->random_state);
+    /* 1.0 <= u.d < 2 */
+    u.u64 = ((uint64_t)0x3ff << 52) | (v >> 12);
+    return __JS_NewFloat64(ctx, u.d - 1.0);
+}
+
+#if defined(_MSC_VER)
+static double const_floor(double x) { return floor(x); }
+static double const_ceil(double x) { return ceil(x); }
+#endif
+
+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 ),
+#else
+    JS_CFUNC_SPECIAL_DEF("floor", 1, f_f, floor ),
+    JS_CFUNC_SPECIAL_DEF("ceil", 1, f_f, ceil ),
+#endif
+    JS_CFUNC_SPECIAL_DEF("round", 1, f_f, js_math_round ),
+    JS_CFUNC_SPECIAL_DEF("sqrt", 1, f_f, sqrt ),
+
+    JS_CFUNC_SPECIAL_DEF("acos", 1, f_f, acos ),
+    JS_CFUNC_SPECIAL_DEF("asin", 1, f_f, asin ),
+    JS_CFUNC_SPECIAL_DEF("atan", 1, f_f, atan ),
+    JS_CFUNC_SPECIAL_DEF("atan2", 2, f_f_f, atan2 ),
+    JS_CFUNC_SPECIAL_DEF("cos", 1, f_f, cos ),
+    JS_CFUNC_SPECIAL_DEF("exp", 1, f_f, exp ),
+    JS_CFUNC_SPECIAL_DEF("log", 1, f_f, log ),
+    JS_CFUNC_SPECIAL_DEF("pow", 2, f_f_f, js_pow ),
+    JS_CFUNC_SPECIAL_DEF("sin", 1, f_f, sin ),
+    JS_CFUNC_SPECIAL_DEF("tan", 1, f_f, tan ),
+    /* ES6 */
+    JS_CFUNC_SPECIAL_DEF("trunc", 1, f_f, trunc ),
+    JS_CFUNC_SPECIAL_DEF("sign", 1, f_f, js_math_sign ),
+    JS_CFUNC_SPECIAL_DEF("cosh", 1, f_f, cosh ),
+    JS_CFUNC_SPECIAL_DEF("sinh", 1, f_f, sinh ),
+    JS_CFUNC_SPECIAL_DEF("tanh", 1, f_f, tanh ),
+    JS_CFUNC_SPECIAL_DEF("acosh", 1, f_f, acosh ),
+    JS_CFUNC_SPECIAL_DEF("asinh", 1, f_f, asinh ),
+    JS_CFUNC_SPECIAL_DEF("atanh", 1, f_f, atanh ),
+    JS_CFUNC_SPECIAL_DEF("expm1", 1, f_f, expm1 ),
+    JS_CFUNC_SPECIAL_DEF("log1p", 1, f_f, log1p ),
+    JS_CFUNC_SPECIAL_DEF("log2", 1, f_f, log2 ),
+    JS_CFUNC_SPECIAL_DEF("log10", 1, f_f, log10 ),
+    JS_CFUNC_SPECIAL_DEF("cbrt", 1, f_f, cbrt ),
+    JS_CFUNC_DEF("hypot", 2, js_math_hypot ),
+    JS_CFUNC_DEF("random", 0, js_math_random ),
+    JS_CFUNC_SPECIAL_DEF("fround", 1, f_f, js_math_fround ),
+    JS_CFUNC_DEF("imul", 2, js_math_imul ),
+    JS_CFUNC_DEF("clz32", 1, js_math_clz32 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Math", JS_PROP_CONFIGURABLE ),
+    JS_PROP_DOUBLE_DEF("E", 2.718281828459045, 0 ),
+    JS_PROP_DOUBLE_DEF("LN10", 2.302585092994046, 0 ),
+    JS_PROP_DOUBLE_DEF("LN2", 0.6931471805599453, 0 ),
+    JS_PROP_DOUBLE_DEF("LOG2E", 1.4426950408889634, 0 ),
+    JS_PROP_DOUBLE_DEF("LOG10E", 0.4342944819032518, 0 ),
+    JS_PROP_DOUBLE_DEF("PI", 3.141592653589793, 0 ),
+    JS_PROP_DOUBLE_DEF("SQRT1_2", 0.7071067811865476, 0 ),
+    JS_PROP_DOUBLE_DEF("SQRT2", 1.4142135623730951, 0 ),
+};
+
+static const JSCFunctionListEntry js_math_obj[] = {
+    JS_OBJECT_DEF("Math", js_math_funcs, countof(js_math_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* Date */
+
+#if 0
+/* OS dependent: return the UTC time in ms since 1970. */
+static JSValue js___date_now(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    int64_t d;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    d = (int64_t)tv.tv_sec * 1000 + (tv.tv_usec / 1000);
+    return JS_NewInt64(ctx, d);
+}
+#endif
+
+/* OS dependent: return the UTC time in microseconds since 1970. */
+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;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    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 */
+static int getTimezoneOffset(int64_t time) {
+#if defined(_WIN32)
+    /* XXX: TODO */
+    return 0;
+#else
+    time_t ti;
+    struct tm tm;
+
+    time /= 1000; /* convert to seconds */
+    if (sizeof(time_t) == 4) {
+        /* on 32-bit systems, we need to clamp the time value to the
+           range of `time_t`. This is better than truncating values to
+           32 bits and hopefully provides the same result as 64-bit
+           implementation of localtime_r.
+         */
+        if ((time_t)-1 < (0) ) {
+            if (time < INT32_MIN) {
+                time = INT32_MIN;
+            } else if (time > INT32_MAX) {
+                time = INT32_MAX;
+            }
+        } else {
+            if (time < 0) {
+                time = 0;
+            } else if (time > UINT32_MAX) {
+                time = UINT32_MAX;
+            }
+        }
+    }
+    ti = time;
+    localtime_r(&ti, &tm);
+    return -tm.tm_gmtoff / 60;
+#endif
+}
+
+#if 0
+static JSValue js___date_getTimezoneOffset(JSContext *ctx, JSValueConst this_val,
+                                           int argc, JSValueConst *argv)
+{
+    double dd;
+
+    if (JS_ToFloat64(ctx, &dd, argv[0]))
+        return JS_EXCEPTION;
+    if (isnan(dd))
+        return __JS_NewFloat64(ctx, dd);
+    else
+        return JS_NewInt32(ctx, getTimezoneOffset((int64_t)dd));
+}
+
+/* create a new date object */
+static JSValue js___date_create(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue obj, proto;
+    proto = js_get_prototype_from_ctor(ctx, argv[0], argv[1]);
+    if (JS_IsException(proto))
+        return proto;
+    obj = JS_NewObjectProtoClass(ctx, proto, JS_CLASS_DATE);
+    JS_FreeValue(ctx, proto);
+    if (!JS_IsException(obj))
+        JS_SetObjectData(ctx, obj, JS_DupValue(ctx, argv[2]));
+    return obj;
+}
+#endif
+
+/* RegExp */
+
+static void js_regexp_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExp *re = &p->u.regexp;
+    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+    JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_STRING, re->pattern));
+}
+
+/* create a string containing the RegExp bytecode */
+static JSValue js_compile_regexp(JSContext *ctx, JSValueConst pattern,
+                                 JSValueConst flags)
+{
+    const char *str;
+    int re_flags, mask;
+    uint8_t *re_bytecode_buf;
+    size_t i, len;
+    int re_bytecode_len;
+    JSValue ret;
+    char error_msg[64];
+
+    re_flags = 0;
+    if (!JS_IsUndefined(flags)) {
+        str = JS_ToCStringLen(ctx, &len, flags);
+        if (!str)
+            return JS_EXCEPTION;
+        /* XXX: re_flags = LRE_FLAG_OCTAL unless strict mode? */
+        for (i = 0; i < len; i++) {
+            switch(str[i]) {
+            case 'g':
+                mask = LRE_FLAG_GLOBAL;
+                break;
+            case 'i':
+                mask = LRE_FLAG_IGNORECASE;
+                break;
+            case 'm':
+                mask = LRE_FLAG_MULTILINE;
+                break;
+            case 's':
+                mask = LRE_FLAG_DOTALL;
+                break;
+            case 'u':
+                mask = LRE_FLAG_UTF16;
+                break;
+            case 'y':
+                mask = LRE_FLAG_STICKY;
+                break;
+            default:
+                goto bad_flags;
+            }
+            if ((re_flags & mask) != 0) {
+            bad_flags:
+                JS_FreeCString(ctx, str);
+                return JS_ThrowSyntaxError(ctx, "invalid regular expression flags");
+            }
+            re_flags |= mask;
+        }
+        JS_FreeCString(ctx, str);
+    }
+
+    str = JS_ToCStringLen2(ctx, &len, pattern, !(re_flags & LRE_FLAG_UTF16));
+    if (!str)
+        return JS_EXCEPTION;
+    re_bytecode_buf = lre_compile(&re_bytecode_len, error_msg,
+                                  sizeof(error_msg), str, len, re_flags, ctx);
+    JS_FreeCString(ctx, str);
+    if (!re_bytecode_buf) {
+        JS_ThrowSyntaxError(ctx, "%s", error_msg);
+        return JS_EXCEPTION;
+    }
+
+    ret = js_new_string8(ctx, re_bytecode_buf, re_bytecode_len);
+    js_free(ctx, re_bytecode_buf);
+    return ret;
+}
+
+/* create a RegExp object from a string containing the RegExp bytecode
+   and the source pattern */
+static JSValue js_regexp_constructor_internal(JSContext *ctx, JSValueConst ctor,
+                                              JSValue pattern, JSValue bc)
+{
+    JSValue obj;
+    JSObject *p;
+    JSRegExp *re;
+
+    /* sanity check */
+    if (JS_VALUE_GET_TAG(bc) != JS_TAG_STRING ||
+        JS_VALUE_GET_TAG(pattern) != JS_TAG_STRING) {
+        JS_ThrowTypeError(ctx, "string expected");
+    fail:
+        JS_FreeValue(ctx, bc);
+        JS_FreeValue(ctx, pattern);
+        return JS_EXCEPTION;
+    }
+
+    obj = js_create_from_ctor(ctx, ctor, JS_CLASS_REGEXP);
+    if (JS_IsException(obj))
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+    re = &p->u.regexp;
+    re->pattern = JS_VALUE_GET_STRING(pattern);
+    re->bytecode = JS_VALUE_GET_STRING(bc);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0),
+                           JS_PROP_WRITABLE);
+    return obj;
+}
+
+static JSRegExp *js_get_regexp(JSContext *ctx, JSValueConst obj, BOOL throw_error)
+{
+    if (JS_VALUE_GET_TAG(obj) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(obj);
+        if (p->class_id == JS_CLASS_REGEXP)
+            return &p->u.regexp;
+    }
+    if (throw_error) {
+        JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_REGEXP);
+    }
+    return NULL;
+}
+
+/* return < 0 if exception or TRUE/FALSE */
+static int js_is_regexp(JSContext *ctx, JSValueConst obj)
+{
+    JSValue m;
+
+    if (!JS_IsObject(obj))
+        return FALSE;
+    m = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_match);
+    if (JS_IsException(m))
+        return -1;
+    if (!JS_IsUndefined(m))
+        return JS_ToBoolFree(ctx, m);
+    return js_get_regexp(ctx, obj, FALSE) != NULL;
+}
+
+static JSValue js_regexp_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue pattern, flags, bc, val;
+    JSValueConst pat, flags1;
+    JSRegExp *re;
+    int pat_is_regexp;
+
+    pat = argv[0];
+    flags1 = argv[1];
+    pat_is_regexp = js_is_regexp(ctx, pat);
+    if (pat_is_regexp < 0)
+        return JS_EXCEPTION;
+    if (JS_IsUndefined(new_target)) {
+        /* called as a function */
+        new_target = JS_GetActiveFunction(ctx);
+        if (pat_is_regexp && JS_IsUndefined(flags1)) {
+            JSValue ctor;
+            BOOL res;
+            ctor = JS_GetProperty(ctx, pat, JS_ATOM_constructor);
+            if (JS_IsException(ctor))
+                return ctor;
+            res = js_same_value(ctx, ctor, new_target);
+            JS_FreeValue(ctx, ctor);
+            if (res)
+                return JS_DupValue(ctx, pat);
+        }
+    }
+    re = js_get_regexp(ctx, pat, FALSE);
+    if (re) {
+        pattern = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+        if (JS_IsUndefined(flags1)) {
+            bc = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+            goto no_compilation;
+        } else {
+            flags = JS_ToString(ctx, flags1);
+            if (JS_IsException(flags))
+                goto fail;
+        }
+    } else {
+        flags = JS_UNDEFINED;
+        if (pat_is_regexp) {
+            pattern = JS_GetProperty(ctx, pat, JS_ATOM_source);
+            if (JS_IsException(pattern))
+                goto fail;
+            if (JS_IsUndefined(flags1)) {
+                flags = JS_GetProperty(ctx, pat, JS_ATOM_flags);
+                if (JS_IsException(flags))
+                    goto fail;
+            } else {
+                flags = JS_DupValue(ctx, flags1);
+            }
+        } else {
+            pattern = JS_DupValue(ctx, pat);
+            flags = JS_DupValue(ctx, flags1);
+        }
+        if (JS_IsUndefined(pattern)) {
+            pattern = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        } else {
+            val = pattern;
+            pattern = JS_ToString(ctx, val);
+            JS_FreeValue(ctx, val);
+            if (JS_IsException(pattern))
+                goto fail;
+        }
+    }
+    bc = js_compile_regexp(ctx, pattern, flags);
+    if (JS_IsException(bc))
+        goto fail;
+    JS_FreeValue(ctx, flags);
+ no_compilation:
+    return js_regexp_constructor_internal(ctx, new_target, pattern, bc);
+ fail:
+    JS_FreeValue(ctx, pattern);
+    JS_FreeValue(ctx, flags);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_compile(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSRegExp *re1, *re;
+    JSValueConst pattern1, flags1;
+    JSValue bc, pattern;
+
+    re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+    pattern1 = argv[0];
+    flags1 = argv[1];
+    re1 = js_get_regexp(ctx, pattern1, FALSE);
+    if (re1) {
+        if (!JS_IsUndefined(flags1))
+            return JS_ThrowTypeError(ctx, "flags must be undefined");
+        pattern = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re1->pattern));
+        bc = JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re1->bytecode));
+    } else {
+        bc = JS_UNDEFINED;
+        if (JS_IsUndefined(pattern1))
+            pattern = JS_AtomToString(ctx, JS_ATOM_empty_string);
+        else
+            pattern = JS_ToString(ctx, pattern1);
+        if (JS_IsException(pattern))
+            goto fail;
+        bc = js_compile_regexp(ctx, pattern, flags1);
+        if (JS_IsException(bc))
+            goto fail;
+    }
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+    JS_FreeValue(ctx, JS_MKPTR(JS_TAG_STRING, re->bytecode));
+    re->pattern = JS_VALUE_GET_STRING(pattern);
+    re->bytecode = JS_VALUE_GET_STRING(bc);
+    if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                       JS_NewInt32(ctx, 0)) < 0)
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, this_val);
+ fail:
+    JS_FreeValue(ctx, pattern);
+    JS_FreeValue(ctx, bc);
+    return JS_EXCEPTION;
+}
+
+#if 0
+static JSValue js_regexp_get___source(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, re->pattern));
+}
+
+static JSValue js_regexp_get___flags(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    int flags;
+
+    if (!re)
+        return JS_EXCEPTION;
+    flags = lre_get_flags(re->bytecode->u.str8);
+    return JS_NewInt32(ctx, flags);
+}
+#endif
+
+static JSValue js_regexp_get_source(JSContext *ctx, JSValueConst this_val)
+{
+    JSRegExp *re;
+    JSString *p;
+    StringBuffer b_s, *b = &b_s;
+    int i, n, c, c2, bra;
+
+    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]))
+        goto empty_regex;
+
+    re = js_get_regexp(ctx, this_val, TRUE);
+    if (!re)
+        return JS_EXCEPTION;
+
+    p = re->pattern;
+
+    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 */
+    bra = 0;
+    for (i = 0, n = p->len; i < n;) {
+        c2 = -1;
+        switch (c = string_get(p, i++)) {
+        case '\\':
+            if (i < n)
+                c2 = string_get(p, i++);
+            break;
+        case ']':
+            bra = 0;
+            break;
+        case '[':
+            if (!bra) {
+                if (i < n && string_get(p, i) == ']')
+                    c2 = string_get(p, i++);
+                bra = 1;
+            }
+            break;
+        case '\n':
+            c = '\\';
+            c2 = 'n';
+            break;
+        case '\r':
+            c = '\\';
+            c2 = 'r';
+            break;
+        case '/':
+            if (!bra) {
+                c = '\\';
+                c2 = '/';
+            }
+            break;
+        }
+        string_buffer_putc16(b, c);
+        if (c2 >= 0)
+            string_buffer_putc16(b, c2);
+    }
+    return string_buffer_end(b);
+}
+
+static JSValue js_regexp_get_flag(JSContext *ctx, JSValueConst this_val, int mask)
+{
+    JSRegExp *re;
+    int flags;
+
+    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;
+
+    flags = lre_get_flags(re->bytecode->u.str8);
+    return JS_NewBool(ctx, (flags & mask) != 0);
+}
+
+static JSValue js_regexp_get_flags(JSContext *ctx, JSValueConst this_val)
+{
+    char str[8], *p = str;
+    int res;
+
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_global));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'g';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "ignoreCase"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'i';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "multiline"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'm';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "dotAll"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 's';
+    res = JS_ToBoolFree(ctx, JS_GetProperty(ctx, this_val, JS_ATOM_unicode));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'u';
+    res = JS_ToBoolFree(ctx, JS_GetPropertyStr(ctx, this_val, "sticky"));
+    if (res < 0)
+        goto exception;
+    if (res)
+        *p++ = 'y';
+    return JS_NewStringLen(ctx, str, p - str);
+
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue pattern, flags;
+    StringBuffer b_s, *b = &b_s;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    string_buffer_init(ctx, b, 0);
+    string_buffer_putc8(b, '/');
+    pattern = JS_GetProperty(ctx, this_val, JS_ATOM_source);
+    if (string_buffer_concat_value_free(b, pattern))
+        goto fail;
+    string_buffer_putc8(b, '/');
+    flags = JS_GetProperty(ctx, this_val, JS_ATOM_flags);
+    if (string_buffer_concat_value_free(b, flags))
+        goto fail;
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+BOOL lre_check_stack_overflow(void *opaque, size_t alloca_size)
+{
+    JSContext *ctx = opaque;
+    return js_check_stack_overflow(ctx, alloca_size);
+}
+
+void *lre_realloc(void *opaque, void *ptr, size_t size)
+{
+    JSContext *ctx = opaque;
+    /* No JS exception is raised here */
+    return js_realloc_rt(ctx->rt, ptr, size);
+}
+
+static JSValue js_regexp_exec(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSRegExp *re = js_get_regexp(ctx, this_val, TRUE);
+    JSString *str;
+    JSValue str_val, obj, val, groups = JS_UNDEFINED;
+    uint8_t *re_bytecode;
+    int ret;
+    uint8_t **capture, *str_buf;
+    int capture_count, shift, i, re_flags;
+    int64_t last_index;
+    const char *group_name_ptr;
+
+    if (!re)
+        return JS_EXCEPTION;
+    str_val = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str_val))
+        return str_val;
+    val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
+    if (JS_IsException(val) ||
+        JS_ToLengthFree(ctx, &last_index, val)) {
+        JS_FreeValue(ctx, str_val);
+        return JS_EXCEPTION;
+    }
+    re_bytecode = re->bytecode->u.str8;
+    re_flags = lre_get_flags(re_bytecode);
+    if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) {
+        last_index = 0;
+    }
+    str = JS_VALUE_GET_STRING(str_val);
+    capture_count = lre_get_capture_count(re_bytecode);
+    capture = NULL;
+    if (capture_count > 0) {
+        capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2);
+        if (!capture) {
+            JS_FreeValue(ctx, str_val);
+            return JS_EXCEPTION;
+        }
+    }
+    shift = str->is_wide_char;
+    str_buf = str->u.str8;
+    if (last_index > str->len) {
+        ret = 2;
+    } else {
+        ret = lre_exec(capture, re_bytecode,
+                       str_buf, last_index, str->len,
+                       shift, ctx);
+    }
+    obj = JS_NULL;
+    if (ret != 1) {
+        if (ret >= 0) {
+            if (ret == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
+                if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                                   JS_NewInt32(ctx, 0)) < 0)
+                    goto fail;
+            }
+        } else {
+            JS_ThrowInternalError(ctx, "out of memory in regexp execution");
+            goto fail;
+        }
+        JS_FreeValue(ctx, str_val);
+    } else {
+        int prop_flags;
+        if (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) {
+            if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                               JS_NewInt32(ctx, (capture[1] - str_buf) >> shift)) < 0)
+                goto fail;
+        }
+        obj = JS_NewArray(ctx);
+        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;
+            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++) {
+            int start, end;
+            JSValue val;
+            if (capture[2 * i] == NULL ||
+                capture[2 * i + 1] == NULL) {
+                val = JS_UNDEFINED;
+            } else {
+                start = (capture[2 * i] - str_buf) >> shift;
+                end = (capture[2 * i + 1] - str_buf) >> shift;
+                val = js_sub_string(ctx, str, start, end);
+                if (JS_IsException(val))
+                    goto fail;
+            }
+            if (group_name_ptr && i > 0) {
+                if (*group_name_ptr) {
+                    if (JS_DefinePropertyValueStr(ctx, groups, group_name_ptr,
+                                                  JS_DupValue(ctx, val),
+                                                  prop_flags) < 0) {
+                        JS_FreeValue(ctx, val);
+                        goto fail;
+                    }
+                }
+                group_name_ptr += strlen(group_name_ptr) + 1;
+            }
+            if (JS_DefinePropertyValueUint32(ctx, obj, i, val, prop_flags) < 0)
+                goto fail;
+        }
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_groups,
+                                   groups, prop_flags) < 0)
+            goto fail;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_index,
+                                   JS_NewInt32(ctx, (capture[0] - str_buf) >> shift), prop_flags) < 0)
+            goto fail;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_input, str_val, prop_flags) < 0)
+            goto fail1;
+    }
+    js_free(ctx, capture);
+    return obj;
+fail:
+    JS_FreeValue(ctx, groups);
+    JS_FreeValue(ctx, str_val);
+fail1:
+    JS_FreeValue(ctx, obj);
+    js_free(ctx, capture);
+    return JS_EXCEPTION;
+}
+
+/* delete partions 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);
+    JSString *str;
+    JSValue str_val, val;
+    uint8_t *re_bytecode;
+    int ret;
+    uint8_t **capture, *str_buf;
+    int capture_count, shift, re_flags;
+    int next_src_pos, start, end;
+    int64_t last_index;
+    StringBuffer b_s, *b = &b_s;
+
+    if (!re)
+        return JS_EXCEPTION;
+
+    string_buffer_init(ctx, b, 0);
+
+    capture = NULL;
+    str_val = JS_ToString(ctx, arg);
+    if (JS_IsException(str_val))
+        goto fail;
+    str = JS_VALUE_GET_STRING(str_val);
+    re_bytecode = re->bytecode->u.str8;
+    re_flags = lre_get_flags(re_bytecode);
+    if ((re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY)) == 0) {
+        last_index = 0;
+    } else {
+        val = JS_GetProperty(ctx, this_val, JS_ATOM_lastIndex);
+        if (JS_IsException(val) || JS_ToLengthFree(ctx, &last_index, val))
+            goto fail;
+    }
+    capture_count = lre_get_capture_count(re_bytecode);
+    if (capture_count > 0) {
+        capture = js_malloc(ctx, sizeof(capture[0]) * capture_count * 2);
+        if (!capture)
+            goto fail;
+    }
+    shift = str->is_wide_char;
+    str_buf = str->u.str8;
+    next_src_pos = 0;
+    for (;;) {
+        if (last_index > str->len)
+            break;
+
+        ret = lre_exec(capture, re_bytecode,
+                       str_buf, last_index, str->len, shift, ctx);
+        if (ret != 1) {
+            if (ret >= 0) {
+                if (ret == 2 || (re_flags & (LRE_FLAG_GLOBAL | LRE_FLAG_STICKY))) {
+                    if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                                       JS_NewInt32(ctx, 0)) < 0)
+                        goto fail;
+                }
+            } else {
+                JS_ThrowInternalError(ctx, "out of memory in regexp execution");
+                goto fail;
+            }
+            break;
+        }
+        start = (capture[0] - str_buf) >> shift;
+        end = (capture[1] - str_buf) >> shift;
+        last_index = end;
+        if (next_src_pos < start) {
+            if (string_buffer_concat(b, str, next_src_pos, start))
+                goto fail;
+        }
+        next_src_pos = end;
+        if (!(re_flags & LRE_FLAG_GLOBAL)) {
+            if (JS_SetProperty(ctx, this_val, JS_ATOM_lastIndex,
+                               JS_NewInt32(ctx, end)) < 0)
+                goto fail;
+            break;
+        }
+        if (end == start) {
+            if (!(re_flags & LRE_FLAG_UTF16) || (unsigned)end >= str->len || !str->is_wide_char) {
+                end++;
+            } else {
+                string_getc(str, &end);
+            }
+        }
+        last_index = end;
+    }
+    if (string_buffer_concat(b, str, next_src_pos, str->len))
+        goto fail;
+    JS_FreeValue(ctx, str_val);
+    js_free(ctx, capture);
+    return string_buffer_end(b);
+fail:
+    JS_FreeValue(ctx, str_val);
+    js_free(ctx, capture);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue JS_RegExpExec(JSContext *ctx, JSValueConst r, JSValueConst s)
+{
+    JSValue method, ret;
+
+    method = JS_GetProperty(ctx, r, JS_ATOM_exec);
+    if (JS_IsException(method))
+        return method;
+    if (JS_IsFunction(ctx, method)) {
+        ret = JS_CallFree(ctx, method, r, 1, &s);
+        if (JS_IsException(ret))
+            return ret;
+        if (!JS_IsObject(ret) && !JS_IsNull(ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "RegExp exec method must return an object or null");
+        }
+        return ret;
+    }
+    JS_FreeValue(ctx, method);
+    return js_regexp_exec(ctx, r, 1, &s);
+}
+
+#if 0
+static JSValue js_regexp___RegExpExec(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    return JS_RegExpExec(ctx, argv[0], argv[1]);
+}
+static JSValue js_regexp___RegExpDelete(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    return JS_RegExpDelete(ctx, argv[0], argv[1]);
+}
+#endif
+
+static JSValue js_regexp_test(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValue val;
+    BOOL ret;
+
+    val = JS_RegExpExec(ctx, this_val, argv[0]);
+    if (JS_IsException(val))
+        return JS_EXCEPTION;
+    ret = !JS_IsNull(val);
+    JS_FreeValue(ctx, val);
+    return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_regexp_Symbol_match(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    // [Symbol.match](str)
+    JSValueConst rx = this_val;
+    JSValue A, S, result, matchStr;
+    int global, n, fullUnicode, isEmpty;
+    JSString *p;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    A = JS_UNDEFINED;
+    result = JS_UNDEFINED;
+    matchStr = JS_UNDEFINED;
+    S = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(S))
+        goto exception;
+
+    global = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_global));
+    if (global < 0)
+        goto exception;
+
+    if (!global) {
+        A = JS_RegExpExec(ctx, rx, S);
+    } else {
+        fullUnicode = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_unicode));
+        if (fullUnicode < 0)
+            goto exception;
+
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0)
+            goto exception;
+        A = JS_NewArray(ctx);
+        if (JS_IsException(A))
+            goto exception;
+        n = 0;
+        for(;;) {
+            JS_FreeValue(ctx, result);
+            result = JS_RegExpExec(ctx, rx, S);
+            if (JS_IsException(result))
+                goto exception;
+            if (JS_IsNull(result))
+                break;
+            matchStr = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+            if (JS_IsException(matchStr))
+                goto exception;
+            isEmpty = JS_IsEmptyString(matchStr);
+            if (JS_SetPropertyInt64(ctx, A, n++, matchStr) < 0)
+                goto exception;
+            if (isEmpty) {
+                int64_t thisIndex, nextIndex;
+                if (JS_ToLengthFree(ctx, &thisIndex,
+                                    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);
+                if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt64(ctx, nextIndex)) < 0)
+                    goto exception;
+            }
+        }
+        if (n == 0) {
+            JS_FreeValue(ctx, A);
+            A = JS_NULL;
+        }
+    }
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, S);
+    return A;
+
+exception:
+    JS_FreeValue(ctx, A);
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, S);
+    return JS_EXCEPTION;
+}
+
+typedef struct JSRegExpStringIteratorData {
+    JSValue iterating_regexp;
+    JSValue iterated_string;
+    BOOL global;
+    BOOL unicode;
+    BOOL done;
+} JSRegExpStringIteratorData;
+
+static void js_regexp_string_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExpStringIteratorData *it = p->u.regexp_string_iterator_data;
+    if (it) {
+        JS_FreeValueRT(rt, it->iterating_regexp);
+        JS_FreeValueRT(rt, it->iterated_string);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_regexp_string_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                           JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSRegExpStringIteratorData *it = p->u.regexp_string_iterator_data;
+    if (it) {
+        JS_MarkValue(rt, it->iterating_regexp, mark_func);
+        JS_MarkValue(rt, it->iterated_string, mark_func);
+    }
+}
+
+static JSValue js_regexp_string_iterator_next(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv,
+                                              BOOL *pdone, int magic)
+{
+    JSRegExpStringIteratorData *it;
+    JSValueConst R, S;
+    JSValue matchStr = JS_UNDEFINED, match = JS_UNDEFINED;
+    JSString *sp;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_REGEXP_STRING_ITERATOR);
+    if (!it)
+        goto exception;
+    if (it->done) {
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    }
+    R = it->iterating_regexp;
+    S = it->iterated_string;
+    match = JS_RegExpExec(ctx, R, S);
+    if (JS_IsException(match))
+        goto exception;
+    if (JS_IsNull(match)) {
+        it->done = TRUE;
+        *pdone = TRUE;
+        return JS_UNDEFINED;
+    } else if (it->global) {
+        matchStr = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, match, 0));
+        if (JS_IsException(matchStr))
+            goto exception;
+        if (JS_IsEmptyString(matchStr)) {
+            int64_t thisIndex, nextIndex;
+            if (JS_ToLengthFree(ctx, &thisIndex,
+                                JS_GetProperty(ctx, R, JS_ATOM_lastIndex)) < 0)
+                goto exception;
+            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)
+                goto exception;
+        }
+        JS_FreeValue(ctx, matchStr);
+    } else {
+        it->done = TRUE;
+    }
+    *pdone = FALSE;
+    return match;
+ exception:
+    JS_FreeValue(ctx, match);
+    JS_FreeValue(ctx, matchStr);
+    *pdone = FALSE;
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_Symbol_matchAll(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    // [Symbol.matchAll](str)
+    JSValueConst R = this_val;
+    JSValue S, C, flags, matcher, iter;
+    JSValueConst args[2];
+    JSString *strp;
+    int64_t lastIndex;
+    JSRegExpStringIteratorData *it;
+
+    if (!JS_IsObject(R))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    C = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    matcher = JS_UNDEFINED;
+    iter = JS_UNDEFINED;
+
+    S = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(S))
+        goto exception;
+    C = JS_SpeciesConstructor(ctx, R, ctx->regexp_ctor);
+    if (JS_IsException(C))
+        goto exception;
+    flags = JS_ToStringFree(ctx, JS_GetProperty(ctx, R, JS_ATOM_flags));
+    if (JS_IsException(flags))
+        goto exception;
+    args[0] = R;
+    args[1] = flags;
+    matcher = JS_CallConstructor(ctx, C, 2, args);
+    if (JS_IsException(matcher))
+        goto exception;
+    if (JS_ToLengthFree(ctx, &lastIndex,
+                        JS_GetProperty(ctx, R, JS_ATOM_lastIndex)))
+        goto exception;
+    if (JS_SetProperty(ctx, matcher, JS_ATOM_lastIndex,
+                       JS_NewInt32(ctx, lastIndex)) < 0)
+        goto exception;
+
+    iter = JS_NewObjectClass(ctx, JS_CLASS_REGEXP_STRING_ITERATOR);
+    if (JS_IsException(iter))
+        goto exception;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it)
+        goto exception;
+    it->iterating_regexp = matcher;
+    it->iterated_string = S;
+    strp = JS_VALUE_GET_STRING(flags);
+    it->global = string_indexof_char(strp, 'g', 0) >= 0;
+    it->unicode = string_indexof_char(strp, 'u', 0) >= 0;
+    it->done = FALSE;
+    JS_SetOpaque(iter, it);
+
+    JS_FreeValue(ctx, C);
+    JS_FreeValue(ctx, flags);
+    return iter;
+ exception:
+    JS_FreeValue(ctx, S);
+    JS_FreeValue(ctx, C);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, matcher);
+    JS_FreeValue(ctx, iter);
+    return JS_EXCEPTION;
+}
+
+typedef struct ValueBuffer {
+    JSContext *ctx;
+    JSValue *arr;
+    JSValue def[4];
+    int len;
+    int size;
+    int error_status;
+} ValueBuffer;
+
+static int value_buffer_init(JSContext *ctx, ValueBuffer *b)
+{
+    b->ctx = ctx;
+    b->len = 0;
+    b->size = 4;
+    b->error_status = 0;
+    b->arr = b->def;
+    return 0;
+}
+
+static void value_buffer_free(ValueBuffer *b)
+{
+    while (b->len > 0)
+        JS_FreeValue(b->ctx, b->arr[--b->len]);
+    if (b->arr != b->def)
+        js_free(b->ctx, b->arr);
+    b->arr = b->def;
+    b->size = 4;
+}
+
+static int value_buffer_append(ValueBuffer *b, JSValue val)
+{
+    if (b->error_status)
+        return -1;
+
+    if (b->len >= b->size) {
+        int new_size = (b->len + (b->len >> 1) + 31) & ~16;
+        size_t slack;
+        JSValue *new_arr;
+
+        if (b->arr == b->def) {
+            new_arr = js_realloc2(b->ctx, NULL, sizeof(*b->arr) * new_size, &slack);
+            if (new_arr)
+                memcpy(new_arr, b->def, sizeof b->def);
+        } else {
+            new_arr = js_realloc2(b->ctx, b->arr, sizeof(*b->arr) * new_size, &slack);
+        }
+        if (!new_arr) {
+            value_buffer_free(b);
+            JS_FreeValue(b->ctx, val);
+            b->error_status = -1;
+            return -1;
+        }
+        new_size += slack / sizeof(*new_arr);
+        b->arr = new_arr;
+        b->size = new_size;
+    }
+    b->arr[b->len++] = val;
+    return 0;
+}
+
+static int js_is_standard_regexp(JSContext *ctx, JSValueConst rx)
+{
+    JSValue val;
+    int res;
+
+    val = JS_GetProperty(ctx, rx, JS_ATOM_constructor);
+    if (JS_IsException(val))
+        return -1;
+    // rx.constructor === RegExp
+    res = js_same_value(ctx, val, ctx->regexp_ctor);
+    JS_FreeValue(ctx, val);
+    if (res) {
+        val = JS_GetProperty(ctx, rx, JS_ATOM_exec);
+        if (JS_IsException(val))
+            return -1;
+        // rx.exec === RE_exec
+        res = JS_IsCFunction(ctx, val, js_regexp_exec, 0);
+        JS_FreeValue(ctx, val);
+    }
+    return res;
+}
+
+static JSValue js_regexp_Symbol_replace(JSContext *ctx, JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    // [Symbol.replace](str, rep)
+    JSValueConst rx = this_val, rep = argv[1];
+    JSValueConst args[6];
+    JSValue str, rep_val, matched, tab, rep_str, namedCaptures, res;
+    JSString *sp, *rp;
+    StringBuffer b_s, *b = &b_s;
+    ValueBuffer v_b, *results = &v_b;
+    int nextSourcePosition, n, j, functionalReplace, is_global, fullUnicode;
+    uint32_t nCaptures;
+    int64_t position;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    string_buffer_init(ctx, b, 0);
+    value_buffer_init(ctx, results);
+
+    rep_val = JS_UNDEFINED;
+    matched = JS_UNDEFINED;
+    tab = JS_UNDEFINED;
+    rep_str = JS_UNDEFINED;
+    namedCaptures = JS_UNDEFINED;
+
+    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);
+    if (!functionalReplace) {
+        rep_val = JS_ToString(ctx, rep);
+        if (JS_IsException(rep_val))
+            goto exception;
+        rp = JS_VALUE_GET_STRING(rep_val);
+    }
+    fullUnicode = 0;
+    is_global = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_global));
+    if (is_global < 0)
+        goto exception;
+    if (is_global) {
+        fullUnicode = JS_ToBoolFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_unicode));
+        if (fullUnicode < 0)
+            goto exception;
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0)
+            goto exception;
+    }
+
+    if (rp && rp->len == 0 && is_global && js_is_standard_regexp(ctx, rx)) {
+        /* use faster version for simple cases */
+        res = JS_RegExpDelete(ctx, rx, str);
+        goto done;
+    }
+    for(;;) {
+        JSValue result;
+        result = JS_RegExpExec(ctx, rx, str);
+        if (JS_IsException(result))
+            goto exception;
+        if (JS_IsNull(result))
+            break;
+        if (value_buffer_append(results, result) < 0)
+            goto exception;
+        if (!is_global)
+            break;
+        JS_FreeValue(ctx, matched);
+        matched = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+        if (JS_IsException(matched))
+            goto exception;
+        if (JS_IsEmptyString(matched)) {
+            /* always advance of at least one char */
+            int64_t thisIndex, nextIndex;
+            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)
+                goto exception;
+        }
+    }
+    nextSourcePosition = 0;
+    for(j = 0; j < results->len; j++) {
+        JSValueConst result;
+        result = results->arr[j];
+        if (js_get_length32(ctx, &nCaptures, result) < 0)
+            goto exception;
+        JS_FreeValue(ctx, matched);
+        matched = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, result, 0));
+        if (JS_IsException(matched))
+            goto exception;
+        if (JS_ToLengthFree(ctx, &position, JS_GetProperty(ctx, result, JS_ATOM_index)))
+            goto exception;
+        if (position > sp->len)
+            position = sp->len;
+        else if (position < 0)
+            position = 0;
+        /* ignore substition if going backward (can happen
+           with custom regexp object) */
+        JS_FreeValue(ctx, tab);
+        tab = JS_NewArray(ctx);
+        if (JS_IsException(tab))
+            goto exception;
+        if (JS_SetPropertyInt64(ctx, tab, 0, JS_DupValue(ctx, matched)) < 0)
+            goto exception;
+        for(n = 1; n < nCaptures; n++) {
+            JSValue capN;
+            capN = JS_GetPropertyInt64(ctx, result, n);
+            if (JS_IsException(capN))
+                goto exception;
+            if (!JS_IsUndefined(capN)) {
+                capN = JS_ToStringFree(ctx, capN);
+                if (JS_IsException(capN))
+                    goto exception;
+            }
+            if (JS_SetPropertyInt64(ctx, tab, n, capN) < 0)
+                goto exception;
+        }
+        JS_FreeValue(ctx, namedCaptures);
+        namedCaptures = JS_GetProperty(ctx, result, JS_ATOM_groups);
+        if (JS_IsException(namedCaptures))
+            goto exception;
+        if (functionalReplace) {
+            if (JS_SetPropertyInt64(ctx, tab, n++, JS_NewInt32(ctx, position)) < 0)
+                goto exception;
+            if (JS_SetPropertyInt64(ctx, tab, n++, JS_DupValue(ctx, str)) < 0)
+                goto exception;
+            if (!JS_IsUndefined(namedCaptures)) {
+                if (JS_SetPropertyInt64(ctx, tab, n++, JS_DupValue(ctx, namedCaptures)) < 0)
+                    goto exception;
+            }
+            args[0] = JS_UNDEFINED;
+            args[1] = tab;
+            JS_FreeValue(ctx, rep_str);
+            rep_str = JS_ToStringFree(ctx, js_function_apply(ctx, rep, 2, args, 0));
+        } else {
+            args[0] = matched;
+            args[1] = str;
+            args[2] = JS_NewInt32(ctx, position);
+            args[3] = tab;
+            args[4] = namedCaptures;
+            args[5] = rep_val;
+            JS_FreeValue(ctx, rep_str);
+            rep_str = js_string___GetSubstitution(ctx, JS_UNDEFINED, 6, args);
+        }
+        if (JS_IsException(rep_str))
+            goto exception;
+        if (position >= nextSourcePosition) {
+            string_buffer_concat(b, sp, nextSourcePosition, position);
+            string_buffer_concat_value(b, rep_str);
+            nextSourcePosition = position + JS_VALUE_GET_STRING(matched)->len;
+        }
+    }
+    string_buffer_concat(b, sp, nextSourcePosition, sp->len);
+    res = string_buffer_end(b);
+    goto done1;
+
+exception:
+    res = JS_EXCEPTION;
+done:
+    string_buffer_free(b);
+done1:
+    value_buffer_free(results);
+    JS_FreeValue(ctx, rep_val);
+    JS_FreeValue(ctx, matched);
+    JS_FreeValue(ctx, tab);
+    JS_FreeValue(ctx, rep_str);
+    JS_FreeValue(ctx, namedCaptures);
+    JS_FreeValue(ctx, str);
+    return res;
+}
+
+static JSValue js_regexp_Symbol_search(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValueConst rx = this_val;
+    JSValue str, previousLastIndex, currentLastIndex, result, index;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    result = JS_UNDEFINED;
+    currentLastIndex = JS_UNDEFINED;
+    previousLastIndex = JS_UNDEFINED;
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        goto exception;
+
+    previousLastIndex = JS_GetProperty(ctx, rx, JS_ATOM_lastIndex);
+    if (JS_IsException(previousLastIndex))
+        goto exception;
+
+    if (!js_same_value(ctx, previousLastIndex, JS_NewInt32(ctx, 0))) {
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, JS_NewInt32(ctx, 0)) < 0) {
+            goto exception;
+        }
+    }
+    result = JS_RegExpExec(ctx, rx, str);
+    if (JS_IsException(result))
+        goto exception;
+    currentLastIndex = JS_GetProperty(ctx, rx, JS_ATOM_lastIndex);
+    if (JS_IsException(currentLastIndex))
+        goto exception;
+    if (js_same_value(ctx, currentLastIndex, previousLastIndex)) {
+        JS_FreeValue(ctx, previousLastIndex);
+    } else {
+        if (JS_SetProperty(ctx, rx, JS_ATOM_lastIndex, previousLastIndex) < 0)
+            goto exception;
+    }
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, currentLastIndex);
+
+    if (JS_IsNull(result)) {
+        return JS_NewInt32(ctx, -1);
+    } else {
+        index = JS_GetProperty(ctx, result, JS_ATOM_index);
+        JS_FreeValue(ctx, result);
+        return index;
+    }
+
+exception:
+    JS_FreeValue(ctx, result);
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, currentLastIndex);
+    JS_FreeValue(ctx, previousLastIndex);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_regexp_Symbol_split(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    // [Symbol.split](str, limit)
+    JSValueConst rx = this_val;
+    JSValueConst args[2];
+    JSValue str, ctor, splitter, A, flags, z, sub;
+    JSString *strp;
+    uint32_t lim, size, p, q;
+    int unicodeMatching;
+    int64_t lengthA, e, numberOfCaptures, i;
+
+    if (!JS_IsObject(rx))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    ctor = JS_UNDEFINED;
+    splitter = JS_UNDEFINED;
+    A = JS_UNDEFINED;
+    flags = JS_UNDEFINED;
+    z = JS_UNDEFINED;
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        goto exception;
+    ctor = JS_SpeciesConstructor(ctx, rx, ctx->regexp_ctor);
+    if (JS_IsException(ctor))
+        goto exception;
+    flags = JS_ToStringFree(ctx, JS_GetProperty(ctx, rx, JS_ATOM_flags));
+    if (JS_IsException(flags))
+        goto exception;
+    strp = JS_VALUE_GET_STRING(flags);
+    unicodeMatching = string_indexof_char(strp, 'u', 0) >= 0;
+    if (string_indexof_char(strp, 'y', 0) < 0) {
+        flags = JS_ConcatString3(ctx, "", flags, "y");
+        if (JS_IsException(flags))
+            goto exception;
+    }
+    args[0] = rx;
+    args[1] = flags;
+    splitter = JS_CallConstructor(ctx, ctor, 2, args);
+    if (JS_IsException(splitter))
+        goto exception;
+    A = JS_NewArray(ctx);
+    if (JS_IsException(A))
+        goto exception;
+    lengthA = 0;
+    if (JS_IsUndefined(argv[1])) {
+        lim = 0xffffffff;
+    } else {
+        if (JS_ToUint32(ctx, &lim, argv[1]) < 0)
+            goto exception;
+        if (lim == 0)
+            goto done;
+    }
+    strp = JS_VALUE_GET_STRING(str);
+    p = q = 0;
+    size = strp->len;
+    if (size == 0) {
+        z = JS_RegExpExec(ctx, splitter, str);
+        if (JS_IsException(z))
+            goto exception;
+        if (JS_IsNull(z))
+            goto add_tail;
+        goto done;
+    }
+    while (q < size) {
+        if (JS_SetProperty(ctx, splitter, JS_ATOM_lastIndex, JS_NewInt32(ctx, q)) < 0)
+            goto exception;
+        JS_FreeValue(ctx, z);
+        z = JS_RegExpExec(ctx, splitter, str);
+        if (JS_IsException(z))
+            goto exception;
+        if (JS_IsNull(z)) {
+            q = string_advance_index(strp, q, unicodeMatching);
+        } else {
+            if (JS_ToLengthFree(ctx, &e, JS_GetProperty(ctx, splitter, JS_ATOM_lastIndex)))
+                goto exception;
+            if (e > size)
+                e = size;
+            if (e == p) {
+                q = string_advance_index(strp, q, unicodeMatching);
+            } else {
+                sub = js_sub_string(ctx, strp, p, q);
+                if (JS_IsException(sub))
+                    goto exception;
+                if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+                    goto exception;
+                if (lengthA == lim)
+                    goto done;
+                p = e;
+                if (js_get_length64(ctx, &numberOfCaptures, z))
+                    goto exception;
+                for(i = 1; i < numberOfCaptures; i++) {
+                    sub = JS_ToStringFree(ctx, JS_GetPropertyInt64(ctx, z, i));
+                    if (JS_IsException(sub))
+                        goto exception;
+                    if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+                        goto exception;
+                    if (lengthA == lim)
+                        goto done;
+                }
+                q = p;
+            }
+        }
+    }
+add_tail:
+    if (p > size)
+        p = size;
+    sub = js_sub_string(ctx, strp, p, size);
+    if (JS_IsException(sub))
+        goto exception;
+    if (JS_SetPropertyInt64(ctx, A, lengthA++, sub) < 0)
+        goto exception;
+    goto done;
+exception:
+    JS_FreeValue(ctx, A);
+    A = JS_EXCEPTION;
+done:
+    JS_FreeValue(ctx, str);
+    JS_FreeValue(ctx, ctor);
+    JS_FreeValue(ctx, splitter);
+    JS_FreeValue(ctx, flags);
+    JS_FreeValue(ctx, z);
+    return A;
+}
+
+static const JSCFunctionListEntry js_regexp_funcs[] = {
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+    //JS_CFUNC_DEF("__RegExpExec", 2, js_regexp___RegExpExec ),
+    //JS_CFUNC_DEF("__RegExpDelete", 2, js_regexp___RegExpDelete ),
+};
+
+static const JSCFunctionListEntry js_regexp_proto_funcs[] = {
+    JS_CGETSET_DEF("flags", js_regexp_get_flags, NULL ),
+    JS_CGETSET_DEF("source", js_regexp_get_source, NULL ),
+    JS_CGETSET_MAGIC_DEF("global", js_regexp_get_flag, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("ignoreCase", js_regexp_get_flag, NULL, 2 ),
+    JS_CGETSET_MAGIC_DEF("multiline", js_regexp_get_flag, NULL, 4 ),
+    JS_CGETSET_MAGIC_DEF("dotAll", js_regexp_get_flag, NULL, 8 ),
+    JS_CGETSET_MAGIC_DEF("unicode", js_regexp_get_flag, NULL, 16 ),
+    JS_CGETSET_MAGIC_DEF("sticky", js_regexp_get_flag, NULL, 32 ),
+    JS_CFUNC_DEF("exec", 1, js_regexp_exec ),
+    JS_CFUNC_DEF("compile", 2, js_regexp_compile ),
+    JS_CFUNC_DEF("test", 1, js_regexp_test ),
+    JS_CFUNC_DEF("toString", 0, js_regexp_toString ),
+    JS_CFUNC_DEF("[Symbol.replace]", 2, js_regexp_Symbol_replace ),
+    JS_CFUNC_DEF("[Symbol.match]", 1, js_regexp_Symbol_match ),
+    JS_CFUNC_DEF("[Symbol.matchAll]", 1, js_regexp_Symbol_matchAll ),
+    JS_CFUNC_DEF("[Symbol.search]", 1, js_regexp_Symbol_search ),
+    JS_CFUNC_DEF("[Symbol.split]", 2, js_regexp_Symbol_split ),
+    //JS_CGETSET_DEF("__source", js_regexp_get___source, NULL ),
+    //JS_CGETSET_DEF("__flags", js_regexp_get___flags, NULL ),
+};
+
+static const JSCFunctionListEntry js_regexp_string_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_regexp_string_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "RegExp String Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicRegExpCompiler(JSContext *ctx)
+{
+    ctx->compile_regexp = js_compile_regexp;
+}
+
+void JS_AddIntrinsicRegExp(JSContext *ctx)
+{
+    JSValueConst obj;
+
+    JS_AddIntrinsicRegExpCompiler(ctx);
+
+    ctx->class_proto[JS_CLASS_REGEXP] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_REGEXP], js_regexp_proto_funcs,
+                               countof(js_regexp_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "RegExp", js_regexp_constructor, 2,
+                                   ctx->class_proto[JS_CLASS_REGEXP]);
+    ctx->regexp_ctor = JS_DupValue(ctx, obj);
+    JS_SetPropertyFunctionList(ctx, obj, js_regexp_funcs, countof(js_regexp_funcs));
+
+    ctx->class_proto[JS_CLASS_REGEXP_STRING_ITERATOR] =
+        JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_REGEXP_STRING_ITERATOR],
+                               js_regexp_string_iterator_proto_funcs,
+                               countof(js_regexp_string_iterator_proto_funcs));
+}
+
+/* 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 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))
+                goto fail;
+            val = JS_NewObject(ctx);
+            if (JS_IsException(val))
+                goto fail;
+            if (s->token.val != '}') {
+                for(;;) {
+                    if (s->token.val != TOK_STRING) {
+                        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;
+                    }
+                    prop_val = json_parse_value(s);
+                    if (JS_IsException(prop_val)) {
+                        JS_FreeValue(ctx, prop_str);
+                        goto fail;
+                    }
+                    ret = JS_DefinePropertyValueValue(ctx, val, prop_str,
+                                                      prop_val, JS_PROP_C_W_E);
+                    if (ret < 0)
+                        goto fail;
+
+                    if (s->token.val != ',')
+                        break;
+                    if (next_token(s))
+                        goto fail;
+                }
+            }
+            if (js_parse_expect(s, '}'))
+                goto fail;
+        }
+        break;
+    case '[':
+        {
+            JSValue el;
+            uint32_t idx;
+
+            if (next_token(s))
+                goto fail;
+            val = JS_NewArray(ctx);
+            if (JS_IsException(val))
+                goto fail;
+            if (s->token.val != ']') {
+                idx = 0;
+                for(;;) {
+                    el = json_parse_value(s);
+                    if (JS_IsException(el))
+                        goto fail;
+                    ret = JS_DefinePropertyValueUint32(ctx, val, idx, el, JS_PROP_C_W_E);
+                    if (ret < 0)
+                        goto fail;
+                    if (s->token.val != ',')
+                        break;
+                    if (next_token(s))
+                        goto fail;
+                    idx++;
+                }
+            }
+            if (js_parse_expect(s, ']'))
+                goto fail;
+        }
+        break;
+    case TOK_STRING:
+        val = JS_DupValue(ctx, s->token.u.str.str);
+        if (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))
+            goto fail;
+        break;
+    case TOK_NULL:
+        if (next_token(s))
+            goto fail;
+        break;
+    default:
+        if (s->token.val == TOK_EOF) {
+            js_parse_error(s, "unexpected end of input");
+        } else {
+            js_parse_error(s, "unexpected token: '%.*s'",
+                           (int)(s->buf_ptr - s->token.ptr), s->token.ptr);
+        }
+        goto fail;
+    }
+    return val;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_ParseJSON(JSContext *ctx, const char *buf, size_t buf_len,
+                     const char *filename)
+{
+    JSParseState s1, *s = &s1;
+    JSValue val;
+
+    js_parse_init(ctx, s, buf, buf_len, filename);
+
+    if (next_token(s))
+        goto fail;
+    val = json_parse_value(s);
+    if (JS_IsException(val))
+        goto fail;
+    if (s->token.val != TOK_EOF) {
+        if (js_parse_error(s, "unexpected data at the end"))
+            goto fail;
+    }
+    return val;
+ fail:
+    free_token(s, &s->token);
+    return JS_EXCEPTION;
+}
+
+static JSValue internalize_json_property(JSContext *ctx, JSValueConst holder,
+                                         JSAtom name, JSValueConst reviver)
+{
+    JSValue val, new_el, name_val, res;
+    JSValueConst args[2];
+    int ret, is_array;
+    uint32_t i, len = 0;
+    JSAtom prop;
+    JSPropertyEnum *atoms = NULL;
+
+    if (js_check_stack_overflow(ctx, 0)) {
+        return JS_ThrowStackOverflow(ctx);
+    }
+
+    val = JS_GetProperty(ctx, holder, name);
+    if (JS_IsException(val))
+        return val;
+    if (JS_IsObject(val)) {
+        is_array = JS_IsArray(ctx, val);
+        if (is_array < 0)
+            goto fail;
+        if (is_array) {
+            if (js_get_length32(ctx, &len, val))
+                goto fail;
+        } else {
+            ret = JS_GetOwnPropertyNamesInternal(ctx, &atoms, &len, JS_VALUE_GET_OBJ(val), JS_GPN_ENUM_ONLY | JS_GPN_STRING_MASK);
+            if (ret < 0)
+                goto fail;
+        }
+        for(i = 0; i < len; i++) {
+            if (is_array) {
+                prop = JS_NewAtomUInt32(ctx, i);
+                if (prop == JS_ATOM_NULL)
+                    goto fail;
+            } else {
+                prop = JS_DupAtom(ctx, atoms[i].atom);
+            }
+            new_el = internalize_json_property(ctx, val, prop, reviver);
+            if (JS_IsException(new_el)) {
+                JS_FreeAtom(ctx, prop);
+                goto fail;
+            }
+            if (JS_IsUndefined(new_el)) {
+                ret = JS_DeleteProperty(ctx, val, prop, 0);
+            } else {
+                ret = JS_DefinePropertyValue(ctx, val, prop, new_el, JS_PROP_C_W_E);
+            }
+            JS_FreeAtom(ctx, prop);
+            if (ret < 0)
+                goto fail;
+        }
+    }
+    js_free_prop_enum(ctx, atoms, len);
+    atoms = NULL;
+    name_val = JS_AtomToValue(ctx, name);
+    if (JS_IsException(name_val))
+        goto fail;
+    args[0] = name_val;
+    args[1] = val;
+    res = JS_Call(ctx, reviver, holder, 2, args);
+    JS_FreeValue(ctx, name_val);
+    JS_FreeValue(ctx, val);
+    return res;
+ fail:
+    js_free_prop_enum(ctx, atoms, len);
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_json_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue obj, root;
+    JSValueConst reviver;
+    const char *str;
+    size_t len;
+
+    str = JS_ToCStringLen(ctx, &len, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    obj = JS_ParseJSON(ctx, str, len, "<input>");
+    JS_FreeCString(ctx, str);
+    if (JS_IsException(obj))
+        return obj;
+    if (argc > 1 && JS_IsFunction(ctx, argv[1])) {
+        reviver = argv[1];
+        root = JS_NewObject(ctx);
+        if (JS_IsException(root)) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+        if (JS_DefinePropertyValue(ctx, root, JS_ATOM_empty_string, obj,
+                                   JS_PROP_C_W_E) < 0) {
+            JS_FreeValue(ctx, root);
+            return JS_EXCEPTION;
+        }
+        obj = internalize_json_property(ctx, root, JS_ATOM_empty_string,
+                                        reviver);
+        JS_FreeValue(ctx, root);
+    }
+    return obj;
+}
+
+typedef struct JSONStringifyContext {
+    JSValueConst replacer_func;
+    JSValue stack;
+    JSValue property_list;
+    JSValue gap;
+    JSValue empty;
+    StringBuffer *b;
+} JSONStringifyContext;
+
+static JSValue JS_ToQuotedStringFree(JSContext *ctx, JSValue val) {
+    JSValue r = JS_ToQuotedString(ctx, val);
+    JS_FreeValue(ctx, val);
+    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)
+{
+    JSValue v;
+    JSValueConst args[2];
+
+    if (JS_IsObject(val)
+#ifdef CONFIG_BIGNUM
+    ||  JS_IsBigInt(ctx, val)   /* XXX: probably useless */
+#endif
+        ) {
+            JSValue f = JS_GetProperty(ctx, val, JS_ATOM_toJSON);
+            if (JS_IsException(f))
+                goto exception;
+            if (JS_IsFunction(ctx, f)) {
+                v = JS_CallFree(ctx, f, val, 1, &key);
+                JS_FreeValue(ctx, val);
+                val = v;
+                if (JS_IsException(val))
+                    goto exception;
+            } else {
+                JS_FreeValue(ctx, f);
+            }
+        }
+
+    if (!JS_IsUndefined(jsc->replacer_func)) {
+        args[0] = key;
+        args[1] = val;
+        v = JS_Call(ctx, jsc->replacer_func, holder, 2, args);
+        JS_FreeValue(ctx, val);
+        val = v;
+        if (JS_IsException(val))
+            goto exception;
+    }
+
+    switch (JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_OBJECT:
+        if (JS_IsFunction(ctx, val))
+            break;
+    case JS_TAG_STRING:
+    case JS_TAG_INT:
+    case JS_TAG_FLOAT64:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+#endif
+    case JS_TAG_EXCEPTION:
+        return val;
+    default:
+        break;
+    }
+    JS_FreeValue(ctx, val);
+    return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static int js_json_to_str(JSContext *ctx, JSONStringifyContext *jsc,
+                          JSValueConst holder, JSValue val,
+                          JSValueConst indent)
+{
+    JSValue indent1, sep, sep1, tab, v, prop;
+    JSObject *p;
+    int64_t i, len;
+    int cl, ret;
+    BOOL has_content;
+
+    indent1 = JS_UNDEFINED;
+    sep = JS_UNDEFINED;
+    sep1 = JS_UNDEFINED;
+    tab = JS_UNDEFINED;
+    prop = JS_UNDEFINED;
+
+    switch (JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_OBJECT:
+        p = JS_VALUE_GET_OBJ(val);
+        cl = p->class_id;
+        if (cl == JS_CLASS_STRING) {
+            val = JS_ToStringFree(ctx, val);
+            if (JS_IsException(val))
+                goto exception;
+            val = JS_ToQuotedStringFree(ctx, val);
+            if (JS_IsException(val))
+                goto exception;
+            return string_buffer_concat_value_free(jsc->b, val);
+        } else if (cl == JS_CLASS_NUMBER) {
+            val = JS_ToNumberFree(ctx, val);
+            if (JS_IsException(val))
+                goto exception;
+            return string_buffer_concat_value_free(jsc->b, val);
+        } else if (cl == JS_CLASS_BOOLEAN) {
+            ret = string_buffer_concat_value(jsc->b, p->u.object_data);
+            JS_FreeValue(ctx, val);
+            return ret;
+        }
+#ifdef CONFIG_BIGNUM
+        else if (cl == JS_CLASS_BIG_FLOAT) {
+            return string_buffer_concat_value_free(jsc->b, val);
+        } else if (cl == JS_CLASS_BIG_INT) {
+            JS_ThrowTypeError(ctx, "bigint are forbidden in JSON.stringify");
+            goto exception;
+        }
+#endif
+        v = js_array_includes(ctx, jsc->stack, 1, (JSValueConst *)&val);
+        if (JS_IsException(v))
+            goto exception;
+        if (JS_ToBoolFree(ctx, v)) {
+            JS_ThrowTypeError(ctx, "circular reference");
+            goto exception;
+        }
+        indent1 = JS_ConcatString(ctx, JS_DupValue(ctx, indent), JS_DupValue(ctx, jsc->gap));
+        if (JS_IsException(indent1))
+            goto exception;
+        if (!JS_IsEmptyString(jsc->gap)) {
+            sep = JS_ConcatString3(ctx, "\n", JS_DupValue(ctx, indent1), "");
+            if (JS_IsException(sep))
+                goto exception;
+            sep1 = JS_NewString(ctx, " ");
+            if (JS_IsException(sep1))
+                goto exception;
+        } else {
+            sep = JS_DupValue(ctx, jsc->empty);
+            sep1 = JS_DupValue(ctx, jsc->empty);
+        }
+        v = js_array_push(ctx, jsc->stack, 1, (JSValueConst *)&val, 0);
+        if (check_exception_free(ctx, v))
+            goto exception;
+        ret = JS_IsArray(ctx, val);
+        if (ret < 0)
+            goto exception;
+        if (ret) {
+            if (js_get_length64(ctx, &len, val))
+                goto exception;
+            string_buffer_putc8(jsc->b, '[');
+            for(i = 0; i < len; i++) {
+                if (i > 0)
+                    string_buffer_putc8(jsc->b, ',');
+                string_buffer_concat_value(jsc->b, sep);
+                v = JS_GetPropertyInt64(ctx, val, i);
+                if (JS_IsException(v))
+                    goto exception;
+                /* XXX: could do this string conversion only when needed */
+                prop = JS_ToStringFree(ctx, JS_NewInt64(ctx, i));
+                if (JS_IsException(prop))
+                    goto exception;
+                v = js_json_check(ctx, jsc, val, v, prop);
+                JS_FreeValue(ctx, prop);
+                prop = JS_UNDEFINED;
+                if (JS_IsException(v))
+                    goto exception;
+                if (JS_IsUndefined(v))
+                    v = JS_NULL;
+                if (js_json_to_str(ctx, jsc, val, v, indent1))
+                    goto exception;
+            }
+            if (len > 0 && !JS_IsEmptyString(jsc->gap)) {
+                string_buffer_putc8(jsc->b, '\n');
+                string_buffer_concat_value(jsc->b, indent);
+            }
+            string_buffer_putc8(jsc->b, ']');
+        } else {
+            if (!JS_IsUndefined(jsc->property_list))
+                tab = JS_DupValue(ctx, jsc->property_list);
+            else
+                tab = js_object_keys(ctx, JS_UNDEFINED, 1, (JSValueConst *)&val, JS_ITERATOR_KIND_KEY);
+            if (JS_IsException(tab))
+                goto exception;
+            if (js_get_length64(ctx, &len, tab))
+                goto exception;
+            string_buffer_putc8(jsc->b, '{');
+            has_content = FALSE;
+            for(i = 0; i < len; i++) {
+                JS_FreeValue(ctx, prop);
+                prop = JS_GetPropertyInt64(ctx, tab, i);
+                if (JS_IsException(prop))
+                    goto exception;
+                v = JS_GetPropertyValue(ctx, val, JS_DupValue(ctx, prop));
+                if (JS_IsException(v))
+                    goto exception;
+                v = js_json_check(ctx, jsc, val, v, prop);
+                if (JS_IsException(v))
+                    goto exception;
+                if (!JS_IsUndefined(v)) {
+                    if (has_content)
+                        string_buffer_putc8(jsc->b, ',');
+                    prop = JS_ToQuotedStringFree(ctx, prop);
+                    if (JS_IsException(prop)) {
+                        JS_FreeValue(ctx, v);
+                        goto exception;
+                    }
+                    string_buffer_concat_value(jsc->b, sep);
+                    string_buffer_concat_value(jsc->b, prop);
+                    string_buffer_putc8(jsc->b, ':');
+                    string_buffer_concat_value(jsc->b, sep1);
+                    if (js_json_to_str(ctx, jsc, val, v, indent1))
+                        goto exception;
+                    has_content = TRUE;
+                }
+            }
+            if (has_content && JS_VALUE_GET_STRING(jsc->gap)->len != 0) {
+                string_buffer_putc8(jsc->b, '\n');
+                string_buffer_concat_value(jsc->b, indent);
+            }
+            string_buffer_putc8(jsc->b, '}');
+        }
+        if (check_exception_free(ctx, js_array_pop(ctx, jsc->stack, 0, NULL, 0)))
+            goto exception;
+        JS_FreeValue(ctx, val);
+        JS_FreeValue(ctx, tab);
+        JS_FreeValue(ctx, sep);
+        JS_FreeValue(ctx, sep1);
+        JS_FreeValue(ctx, indent1);
+        JS_FreeValue(ctx, prop);
+        return 0;
+    case JS_TAG_STRING:
+        val = JS_ToQuotedStringFree(ctx, val);
+        if (JS_IsException(val))
+            goto exception;
+        goto concat_value;
+    case JS_TAG_FLOAT64:
+        if (!isfinite(JS_VALUE_GET_FLOAT64(val))) {
+            val = JS_NULL;
+        }
+        goto concat_value;
+    case JS_TAG_INT:
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_FLOAT:
+#endif
+    case JS_TAG_BOOL:
+    case JS_TAG_NULL:
+    concat_value:
+        return string_buffer_concat_value_free(jsc->b, val);
+#ifdef CONFIG_BIGNUM
+    case JS_TAG_BIG_INT:
+        JS_ThrowTypeError(ctx, "bigint are forbidden in JSON.stringify");
+        goto exception;
+#endif
+    default:
+        JS_FreeValue(ctx, val);
+        return 0;
+    }
+
+exception:
+    JS_FreeValue(ctx, val);
+    JS_FreeValue(ctx, tab);
+    JS_FreeValue(ctx, sep);
+    JS_FreeValue(ctx, sep1);
+    JS_FreeValue(ctx, indent1);
+    JS_FreeValue(ctx, prop);
+    return -1;
+}
+
+JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
+                         JSValueConst replacer, JSValueConst space0)
+{
+    StringBuffer b_s;
+    JSONStringifyContext jsc_s, *jsc = &jsc_s;
+    JSValue val, v, space, ret, wrapper;
+    int res;
+    int64_t i, j, n;
+
+    jsc->replacer_func = JS_UNDEFINED;
+    jsc->stack = JS_UNDEFINED;
+    jsc->property_list = JS_UNDEFINED;
+    jsc->gap = JS_UNDEFINED;
+    jsc->b = &b_s;
+    jsc->empty = JS_AtomToString(ctx, JS_ATOM_empty_string);
+    ret = JS_UNDEFINED;
+    wrapper = JS_UNDEFINED;
+
+    string_buffer_init(ctx, jsc->b, 0);
+    jsc->stack = JS_NewArray(ctx);
+    if (JS_IsException(jsc->stack))
+        goto exception;
+    if (JS_IsFunction(ctx, replacer)) {
+        jsc->replacer_func = replacer;
+    } else {
+        res = JS_IsArray(ctx, replacer);
+        if (res < 0)
+            goto exception;
+        if (res) {
+            /* XXX: enumeration is not fully correct */
+            jsc->property_list = JS_NewArray(ctx);
+            if (JS_IsException(jsc->property_list))
+                goto exception;
+            if (js_get_length64(ctx, &n, replacer))
+                goto exception;
+            for (i = j = 0; i < n; i++) {
+                JSValue present;
+                v = JS_GetPropertyInt64(ctx, replacer, i);
+                if (JS_IsException(v))
+                    goto exception;
+                if (JS_IsObject(v)) {
+                    JSObject *p = JS_VALUE_GET_OBJ(v);
+                    if (p->class_id == JS_CLASS_STRING ||
+                        p->class_id == JS_CLASS_NUMBER) {
+                        v = JS_ToStringFree(ctx, v);
+                        if (JS_IsException(v))
+                            goto exception;
+                    } else {
+                        JS_FreeValue(ctx, v);
+                        continue;
+                    }
+                } else if (JS_IsNumber(v)) {
+                    v = JS_ToStringFree(ctx, v);
+                    if (JS_IsException(v))
+                        goto exception;
+                } else if (!JS_IsString(v)) {
+                    JS_FreeValue(ctx, v);
+                    continue;
+                }
+                present = js_array_includes(ctx, jsc->property_list,
+                                            1, (JSValueConst *)&v);
+                if (JS_IsException(present)) {
+                    JS_FreeValue(ctx, v);
+                    goto exception;
+                }
+                if (!JS_ToBoolFree(ctx, present)) {
+                    JS_SetPropertyInt64(ctx, jsc->property_list, j++, v);
+                } else {
+                    JS_FreeValue(ctx, v);
+                }
+            }
+        }
+    }
+    space = JS_DupValue(ctx, space0);
+    if (JS_IsObject(space)) {
+        JSObject *p = JS_VALUE_GET_OBJ(space);
+        if (p->class_id == JS_CLASS_NUMBER) {
+            space = JS_ToNumberFree(ctx, space);
+        } else if (p->class_id == JS_CLASS_STRING) {
+            space = JS_ToStringFree(ctx, space);
+        }
+        if (JS_IsException(space)) {
+            JS_FreeValue(ctx, space);
+            goto exception;
+        }
+    }
+    if (JS_IsNumber(space)) {
+        int n;
+        if (JS_ToInt32Clamp(ctx, &n, space, 0, 10, 0))
+            goto exception;
+        jsc->gap = JS_NewStringLen(ctx, "          ", n);
+    } else if (JS_IsString(space)) {
+        JSString *p = JS_VALUE_GET_STRING(space);
+        jsc->gap = js_sub_string(ctx, p, 0, min_int(p->len, 10));
+    } else {
+        jsc->gap = JS_DupValue(ctx, jsc->empty);
+    }
+    JS_FreeValue(ctx, space);
+    if (JS_IsException(jsc->gap))
+        goto exception;
+    wrapper = JS_NewObject(ctx);
+    if (JS_IsException(wrapper))
+        goto exception;
+    if (JS_DefinePropertyValue(ctx, wrapper, JS_ATOM_empty_string,
+                               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;
+    if (JS_IsUndefined(val)) {
+        ret = JS_UNDEFINED;
+        goto done1;
+    }
+    if (js_json_to_str(ctx, jsc, wrapper, val, jsc->empty))
+        goto exception;
+
+    ret = string_buffer_end(jsc->b);
+    goto done;
+
+exception:
+    ret = JS_EXCEPTION;
+done1:
+    string_buffer_free(jsc->b);
+done:
+    JS_FreeValue(ctx, wrapper);
+    JS_FreeValue(ctx, jsc->empty);
+    JS_FreeValue(ctx, jsc->gap);
+    JS_FreeValue(ctx, jsc->property_list);
+    JS_FreeValue(ctx, jsc->stack);
+    return ret;
+}
+
+static JSValue js_json_stringify(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    // stringify(val, replacer, space)
+    return JS_JSONStringify(ctx, argv[0], argv[1], argv[2]);
+}
+
+static const JSCFunctionListEntry js_json_funcs[] = {
+    JS_CFUNC_DEF("parse", 2, js_json_parse ),
+    JS_CFUNC_DEF("stringify", 3, js_json_stringify ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "JSON", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_json_obj[] = {
+    JS_OBJECT_DEF("JSON", js_json_funcs, countof(js_json_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicJSON(JSContext *ctx)
+{
+    /* add JSON as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_json_obj, countof(js_json_obj));
+}
+
+/* Reflect */
+
+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);
+}
+
+static JSValue js_reflect_construct(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst func, array_arg, new_target;
+    JSValue *tab, ret;
+    uint32_t len;
+
+    func = argv[0];
+    array_arg = argv[1];
+    if (argc > 2) {
+        new_target = argv[2];
+        if (!JS_IsConstructor(ctx, new_target))
+            return JS_ThrowTypeError(ctx, "not a constructor");
+    } else {
+        new_target = func;
+    }
+    tab = build_arg_list(ctx, &len, array_arg);
+    if (!tab)
+        return JS_EXCEPTION;
+    ret = JS_CallConstructor2(ctx, func, new_target, len, (JSValueConst *)tab);
+    free_arg_list(ctx, tab, len);
+    return ret;
+}
+
+static JSValue js_reflect_deleteProperty(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSValueConst obj;
+    JSAtom atom;
+    int ret;
+
+    obj = argv[0];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, argv[1]);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_DeleteProperty(ctx, obj, atom, 0);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_get(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop, receiver;
+    JSAtom atom;
+    JSValue ret;
+
+    obj = argv[0];
+    prop = argv[1];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (argc > 2)
+        receiver = argv[2];
+    else
+        receiver = obj;
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_GetPropertyInternal(ctx, obj, atom, receiver, FALSE);
+    JS_FreeAtom(ctx, atom);
+    return ret;
+}
+
+static JSValue js_reflect_has(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop;
+    JSAtom atom;
+    int ret;
+
+    obj = argv[0];
+    prop = argv[1];
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_HasProperty(ctx, obj, atom);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_set(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj, prop, val, receiver;
+    int ret;
+    JSAtom atom;
+
+    obj = argv[0];
+    prop = argv[1];
+    val = argv[2];
+    if (argc > 3)
+        receiver = argv[3];
+    else
+        receiver = obj;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    atom = JS_ValueToAtom(ctx, prop);
+    if (unlikely(atom == JS_ATOM_NULL))
+        return JS_EXCEPTION;
+    ret = JS_SetPropertyGeneric(ctx, JS_VALUE_GET_OBJ(obj), atom,
+                                JS_DupValue(ctx, val), receiver, 0);
+    JS_FreeAtom(ctx, atom);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_setPrototypeOf(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    int ret;
+    ret = JS_SetPrototypeInternal(ctx, argv[0], argv[1], FALSE);
+    if (ret < 0)
+        return JS_EXCEPTION;
+    else
+        return JS_NewBool(ctx, ret);
+}
+
+static JSValue js_reflect_ownKeys(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    if (JS_VALUE_GET_TAG(argv[0]) != JS_TAG_OBJECT)
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    return JS_GetOwnPropertyNames2(ctx, argv[0],
+                                   JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK,
+                                   JS_ITERATOR_KIND_KEY);
+}
+
+static const JSCFunctionListEntry js_reflect_funcs[] = {
+    JS_CFUNC_DEF("apply", 3, js_reflect_apply ),
+    JS_CFUNC_DEF("construct", 2, js_reflect_construct ),
+    JS_CFUNC_MAGIC_DEF("defineProperty", 3, js_object_defineProperty, 1 ),
+    JS_CFUNC_DEF("deleteProperty", 2, js_reflect_deleteProperty ),
+    JS_CFUNC_DEF("get", 2, js_reflect_get ),
+    JS_CFUNC_MAGIC_DEF("getOwnPropertyDescriptor", 2, js_object_getOwnPropertyDescriptor, 1 ),
+    JS_CFUNC_MAGIC_DEF("getPrototypeOf", 1, js_object_getPrototypeOf, 1 ),
+    JS_CFUNC_DEF("has", 2, js_reflect_has ),
+    JS_CFUNC_MAGIC_DEF("isExtensible", 1, js_object_isExtensible, 1 ),
+    JS_CFUNC_DEF("ownKeys", 1, js_reflect_ownKeys ),
+    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 ),
+};
+
+static const JSCFunctionListEntry js_reflect_obj[] = {
+    JS_OBJECT_DEF("Reflect", js_reflect_funcs, countof(js_reflect_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+/* Proxy */
+
+static void js_proxy_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSProxyData *s = JS_GetOpaque(val, JS_CLASS_PROXY);
+    if (s) {
+        JS_FreeValueRT(rt, s->target);
+        JS_FreeValueRT(rt, s->handler);
+        JS_FreeValueRT(rt, s->proto);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_proxy_mark(JSRuntime *rt, JSValueConst val,
+                          JS_MarkFunc *mark_func)
+{
+    JSProxyData *s = JS_GetOpaque(val, JS_CLASS_PROXY);
+    if (s) {
+        JS_MarkValue(rt, s->target, mark_func);
+        JS_MarkValue(rt, s->handler, mark_func);
+        JS_MarkValue(rt, s->proto, mark_func);
+    }
+}
+
+static JSValue JS_ThrowTypeErrorRevokedProxy(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "revoked proxy");
+}
+
+static JSProxyData *get_proxy_method(JSContext *ctx, JSValue *pmethod,
+                                     JSValueConst obj, JSAtom name)
+{
+    JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+    JSValue method;
+
+    /* safer to test recursion in all proxy methods */
+    if (js_check_stack_overflow(ctx, 0)) {
+        JS_ThrowStackOverflow(ctx);
+        return NULL;
+    }
+
+    /* 's' should never be NULL */
+    if (s->is_revoked) {
+        JS_ThrowTypeErrorRevokedProxy(ctx);
+        return NULL;
+    }
+    method = JS_GetProperty(ctx, s->handler, name);
+    if (JS_IsException(method))
+        return NULL;
+    if (JS_IsNull(method))
+        method = JS_UNDEFINED;
+    *pmethod = method;
+    return s;
+}
+
+static JSValueConst js_proxy_getPrototypeOf(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret;
+    JSValueConst 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;
+    if (JS_IsUndefined(method))
+        return JS_GetPrototype(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return ret;
+    if (JS_VALUE_GET_TAG(ret) != JS_TAG_NULL &&
+        JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+        goto fail;
+    }
+    res = JS_IsExtensible(ctx, s->target);
+    if (res < 0) {
+        JS_FreeValue(ctx, ret);
+        return JS_EXCEPTION;
+    }
+    if (!res) {
+        /* check invariant */
+        proto1 = JS_GetPrototype(ctx, s->target);
+        if (JS_IsException(proto1)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        if (JS_VALUE_GET_OBJ(proto1) != JS_VALUE_GET_OBJ(ret)) {
+        fail:
+            JS_FreeValue(ctx, ret);
+            return JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
+        }
+    }
+    /* 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;
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_setPrototypeOf);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_SetPrototypeInternal(ctx, s->target, proto_val, throw_flag);
+    args[0] = s->target;
+    args[1] = proto_val;
+    ret = JS_CallFree(ctx, method, s->handler, 2, args);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (!res) {
+        if (throw_flag) {
+            JS_ThrowTypeError(ctx, "proxy: bad prototype");
+            return -1;
+        } else {
+            return FALSE;
+        }
+    }
+    res2 = JS_IsExtensible(ctx, s->target);
+    if (res2 < 0)
+        return -1;
+    if (!res2) {
+        proto1 = JS_GetPrototype(ctx, s->target);
+        if (JS_IsException(proto1))
+            return -1;
+        if (JS_VALUE_GET_OBJ(proto_val) != JS_VALUE_GET_OBJ(proto1)) {
+            JS_ThrowTypeError(ctx, "proxy: inconsistent prototype");
+            return -1;
+        }
+    }
+    return TRUE;
+}
+
+static int js_proxy_isExtensible(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret;
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_isExtensible);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_IsExtensible(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    res2 = JS_IsExtensible(ctx, s->target);
+    if (res2 < 0)
+        return res2;
+    if (res != res2) {
+        JS_ThrowTypeError(ctx, "proxy: inconsistent isExtensible");
+        return -1;
+    }
+    return res;
+}
+
+static int js_proxy_preventExtensions(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, ret;
+    BOOL res;
+    int res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_preventExtensions);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_PreventExtensions(ctx, s->target);
+    ret = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (res) {
+        res2 = JS_IsExtensible(ctx, s->target);
+        if (res2 < 0)
+            return res2;
+        if (res2) {
+            JS_ThrowTypeError(ctx, "proxy: inconsistent preventExtensions");
+            return -1;
+        }
+    }
+    return res;
+}
+
+static int js_proxy_has(JSContext *ctx, JSValueConst obj, JSAtom atom)
+{
+    JSProxyData *s;
+    JSValue method, ret1, atom_val;
+    int ret, res;
+    JSObject *p;
+    JSValueConst args[2];
+    BOOL res2;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_has);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method))
+        return JS_HasProperty(ctx, s->target, atom);
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    ret1 = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (!ret) {
+        JSPropertyDescriptor desc;
+        p = JS_VALUE_GET_OBJ(s->target);
+        res = JS_GetOwnPropertyInternal(ctx, &desc, p, atom);
+        if (res < 0)
+            return -1;
+        if (res) {
+            res2 = !(desc.flags & JS_PROP_CONFIGURABLE);
+            js_free_desc(ctx, &desc);
+            if (res2 || !p->extensible) {
+                JS_ThrowTypeError(ctx, "proxy: inconsistent has");
+                return -1;
+            }
+        }
+    }
+    return ret;
+}
+
+static JSValue js_proxy_get(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                            JSValueConst receiver)
+{
+    JSProxyData *s;
+    JSValue method, ret, atom_val;
+    int res;
+    JSValueConst args[3];
+    JSPropertyDescriptor desc;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_get);
+    if (!s)
+        return JS_EXCEPTION;
+    /* Note: recursion is possible thru the prototype of s->target */
+    if (JS_IsUndefined(method))
+        return JS_GetPropertyInternal(ctx, s->target, atom, receiver, FALSE);
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return JS_EXCEPTION;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    args[2] = receiver;
+    ret = JS_CallFree(ctx, method, s->handler, 3, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret))
+        return JS_EXCEPTION;
+    res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (res) {
+        if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0) {
+            if (!js_same_value(ctx, desc.value, ret)) {
+                goto fail;
+            }
+        } else if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) == JS_PROP_GETSET) {
+            if (JS_IsUndefined(desc.getter) && !JS_IsUndefined(ret)) {
+            fail:
+                js_free_desc(ctx, &desc);
+                JS_FreeValue(ctx, ret);
+                return JS_ThrowTypeError(ctx, "proxy: inconsistent get");
+            }
+        }
+        js_free_desc(ctx, &desc);
+    }
+    return ret;
+}
+
+static int js_proxy_set(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                        JSValueConst value, JSValueConst receiver, int flags)
+{
+    JSProxyData *s;
+    JSValue method, ret1, atom_val;
+    int ret, res;
+    JSValueConst args[4];
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_set);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_SetPropertyGeneric(ctx, JS_VALUE_GET_OBJ(s->target), atom,
+                                     JS_DupValue(ctx, value), receiver,
+                                     flags);
+    }
+    atom_val = JS_AtomToValue(ctx, atom);
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    args[2] = value;
+    args[3] = receiver;
+    ret1 = JS_CallFree(ctx, method, s->handler, 4, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (ret) {
+        JSPropertyDescriptor desc;
+        res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+        if (res < 0)
+            return -1;
+        if (res) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0) {
+                if (!js_same_value(ctx, desc.value, value)) {
+                    goto fail;
+                }
+            } else if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) == JS_PROP_GETSET && JS_IsUndefined(desc.setter)) {
+                fail:
+                    js_free_desc(ctx, &desc);
+                    JS_ThrowTypeError(ctx, "proxy: inconsistent set");
+                    return -1;
+            }
+            js_free_desc(ctx, &desc);
+        }
+    } else {
+        if ((flags & JS_PROP_THROW) ||
+            ((flags & JS_PROP_THROW_STRICT) && is_strict_mode(ctx))) {
+            JS_ThrowTypeError(ctx, "proxy: cannot set property");
+            return -1;
+        }
+    }
+    return ret;
+}
+
+static JSValue js_create_desc(JSContext *ctx, JSValueConst val,
+                              JSValueConst getter, JSValueConst setter,
+                              int flags)
+{
+    JSValue ret;
+    ret = JS_NewObject(ctx);
+    if (JS_IsException(ret))
+        return ret;
+    if (flags & JS_PROP_HAS_GET) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_get, JS_DupValue(ctx, getter),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_SET) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_set, JS_DupValue(ctx, setter),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_VALUE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_value, JS_DupValue(ctx, val),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_WRITABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_writable,
+                               JS_NewBool(ctx, (flags & JS_PROP_WRITABLE) != 0),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_ENUMERABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_enumerable,
+                               JS_NewBool(ctx, (flags & JS_PROP_ENUMERABLE) != 0),
+                               JS_PROP_C_W_E);
+    }
+    if (flags & JS_PROP_HAS_CONFIGURABLE) {
+        JS_DefinePropertyValue(ctx, ret, JS_ATOM_configurable,
+                               JS_NewBool(ctx, (flags & JS_PROP_CONFIGURABLE) != 0),
+                               JS_PROP_C_W_E);
+    }
+    return ret;
+}
+
+static int js_proxy_get_own_property(JSContext *ctx, JSPropertyDescriptor *pdesc,
+                                     JSValueConst obj, JSAtom prop)
+{
+    JSProxyData *s;
+    JSValue method, trap_result_obj, prop_val;
+    int res, target_desc_ret, ret;
+    JSObject *p;
+    JSValueConst args[2];
+    JSPropertyDescriptor result_desc, target_desc;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_getOwnPropertyDescriptor);
+    if (!s)
+        return -1;
+    p = JS_VALUE_GET_OBJ(s->target);
+    if (JS_IsUndefined(method)) {
+        return JS_GetOwnPropertyInternal(ctx, pdesc, p, prop);
+    }
+    prop_val = JS_AtomToValue(ctx, prop);
+    if (JS_IsException(prop_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = prop_val;
+    trap_result_obj = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, prop_val);
+    if (JS_IsException(trap_result_obj))
+        return -1;
+    if (!JS_IsObject(trap_result_obj) && !JS_IsUndefined(trap_result_obj)) {
+        JS_FreeValue(ctx, trap_result_obj);
+        goto fail;
+    }
+    target_desc_ret = JS_GetOwnPropertyInternal(ctx, &target_desc, p, prop);
+    if (target_desc_ret < 0) {
+        JS_FreeValue(ctx, trap_result_obj);
+        return -1;
+    }
+    if (target_desc_ret)
+        js_free_desc(ctx, &target_desc);
+    if (JS_IsUndefined(trap_result_obj)) {
+        if (target_desc_ret) {
+            if (!(target_desc.flags & JS_PROP_CONFIGURABLE) || !p->extensible)
+                goto fail;
+        }
+        ret = FALSE;
+    } else {
+        int flags1, extensible_target;
+        extensible_target = JS_IsExtensible(ctx, s->target);
+        if (extensible_target < 0) {
+            JS_FreeValue(ctx, trap_result_obj);
+            return -1;
+        }
+        res = js_obj_to_desc(ctx, &result_desc, trap_result_obj);
+        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;
+            if (result_desc.flags & JS_PROP_GETSET)
+                flags1 |= JS_PROP_HAS_GET | JS_PROP_HAS_SET;
+            else
+                flags1 |= JS_PROP_HAS_VALUE | JS_PROP_HAS_WRITABLE;
+            /* XXX: not complete check: need to compare value &
+               getter/setter as in defineproperty */
+            if (!check_define_prop_flags(target_desc.flags, flags1))
+                goto fail1;
+        } else {
+            if (!extensible_target)
+                goto fail1;
+        }
+        if (!(result_desc.flags & JS_PROP_CONFIGURABLE)) {
+            if (!target_desc_ret || (target_desc.flags & JS_PROP_CONFIGURABLE))
+                goto fail1;
+            if ((result_desc.flags &
+                 (JS_PROP_GETSET | JS_PROP_WRITABLE)) == 0 &&
+                target_desc_ret &&
+                (target_desc.flags & JS_PROP_WRITABLE) != 0) {
+                /* proxy-missing-checks */
+            fail1:
+                js_free_desc(ctx, &result_desc);
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent getOwnPropertyDescriptor");
+                return -1;
+            }
+        }
+        ret = TRUE;
+        if (pdesc) {
+            *pdesc = result_desc;
+        } else {
+            js_free_desc(ctx, &result_desc);
+        }
+    }
+    return ret;
+}
+
+static int js_proxy_define_own_property(JSContext *ctx, JSValueConst obj,
+                                        JSAtom prop, JSValueConst val,
+                                        JSValueConst getter, JSValueConst setter,
+                                        int flags)
+{
+    JSProxyData *s;
+    JSValue method, ret1, prop_val, desc_val;
+    int res, ret;
+    JSObject *p;
+    JSValueConst args[3];
+    JSPropertyDescriptor desc;
+    BOOL setting_not_configurable;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_defineProperty);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_DefineProperty(ctx, s->target, prop, val, getter, setter, flags);
+    }
+    prop_val = JS_AtomToValue(ctx, prop);
+    if (JS_IsException(prop_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    desc_val = js_create_desc(ctx, val, getter, setter, flags);
+    if (JS_IsException(desc_val)) {
+        JS_FreeValue(ctx, prop_val);
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = prop_val;
+    args[2] = desc_val;
+    ret1 = JS_CallFree(ctx, method, s->handler, 3, args);
+    JS_FreeValue(ctx, prop_val);
+    JS_FreeValue(ctx, desc_val);
+    if (JS_IsException(ret1))
+        return -1;
+    ret = JS_ToBoolFree(ctx, ret1);
+    if (!ret) {
+        if (flags & JS_PROP_THROW) {
+            JS_ThrowTypeError(ctx, "proxy: defineProperty exception");
+            return -1;
+        } else {
+            return 0;
+        }
+    }
+    p = JS_VALUE_GET_OBJ(s->target);
+    res = JS_GetOwnPropertyInternal(ctx, &desc, p, prop);
+    if (res < 0)
+        return -1;
+    setting_not_configurable = ((flags & (JS_PROP_HAS_CONFIGURABLE |
+                                          JS_PROP_CONFIGURABLE)) ==
+                                JS_PROP_HAS_CONFIGURABLE);
+    if (!res) {
+        if (!p->extensible || setting_not_configurable)
+            goto fail;
+    } else {
+        if (!check_define_prop_flags(desc.flags, flags) ||
+            ((desc.flags & JS_PROP_CONFIGURABLE) && setting_not_configurable)) {
+            goto fail1;
+        }
+        if (flags & (JS_PROP_HAS_GET | JS_PROP_HAS_SET)) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE)) ==
+                JS_PROP_GETSET) {
+                if ((flags & JS_PROP_HAS_GET) &&
+                    !js_same_value(ctx, getter, desc.getter)) {
+                    goto fail1;
+                }
+                if ((flags & JS_PROP_HAS_SET) &&
+                    !js_same_value(ctx, setter, desc.setter)) {
+                    goto fail1;
+                }
+            }
+        } else if (flags & JS_PROP_HAS_VALUE) {
+            if ((desc.flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) ==
+                JS_PROP_WRITABLE && !(flags & JS_PROP_WRITABLE)) {
+                /* missing-proxy-check feature */
+                goto fail1;
+            } else if ((desc.flags & (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE)) == 0 &&
+                !js_same_value(ctx, val, desc.value)) {
+                goto fail1;
+            }
+        }
+        if (flags & JS_PROP_HAS_WRITABLE) {
+            if ((desc.flags & (JS_PROP_GETSET | JS_PROP_CONFIGURABLE |
+                               JS_PROP_WRITABLE)) == JS_PROP_WRITABLE) {
+                /* proxy-missing-checks */
+            fail1:
+                js_free_desc(ctx, &desc);
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent defineProperty");
+                return -1;
+            }
+        }
+        js_free_desc(ctx, &desc);
+    }
+    return 1;
+}
+
+static int js_proxy_delete_property(JSContext *ctx, JSValueConst obj,
+                                    JSAtom atom)
+{
+    JSProxyData *s;
+    JSValue method, ret, atom_val;
+    int res, res2, is_extensible;
+    JSValueConst args[2];
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_deleteProperty);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_DeleteProperty(ctx, s->target, atom, 0);
+    }
+    atom_val = JS_AtomToValue(ctx, atom);;
+    if (JS_IsException(atom_val)) {
+        JS_FreeValue(ctx, method);
+        return -1;
+    }
+    args[0] = s->target;
+    args[1] = atom_val;
+    ret = JS_CallFree(ctx, method, s->handler, 2, args);
+    JS_FreeValue(ctx, atom_val);
+    if (JS_IsException(ret))
+        return -1;
+    res = JS_ToBoolFree(ctx, ret);
+    if (res) {
+        JSPropertyDescriptor desc;
+        res2 = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target), atom);
+        if (res2 < 0)
+            return -1;
+        if (res2) {
+            if (!(desc.flags & JS_PROP_CONFIGURABLE))
+                goto fail;
+            is_extensible = JS_IsExtensible(ctx, s->target);
+            if (is_extensible < 0)
+                goto fail1;
+            if (!is_extensible) {
+                /* proxy-missing-checks */
+            fail:
+                JS_ThrowTypeError(ctx, "proxy: inconsistent deleteProperty");
+            fail1:
+                js_free_desc(ctx, &desc);
+                return -1;
+            }
+            js_free_desc(ctx, &desc);
+        }
+    }
+    return res;
+}
+
+/* return the index of the property or -1 if not found */
+static int find_prop_key(const JSPropertyEnum *tab, int n, JSAtom atom)
+{
+    int i;
+    for(i = 0; i < n; i++) {
+        if (tab[i].atom == atom)
+            return i;
+    }
+    return -1;
+}
+
+static int js_proxy_get_own_property_names(JSContext *ctx,
+                                           JSPropertyEnum **ptab,
+                                           uint32_t *plen,
+                                           JSValueConst obj)
+{
+    JSProxyData *s;
+    JSValue method, prop_array, val;
+    uint32_t len, i, len2;
+    JSPropertyEnum *tab, *tab2;
+    JSAtom atom;
+    JSPropertyDescriptor desc;
+    int res, is_extensible, idx;
+
+    s = get_proxy_method(ctx, &method, obj, JS_ATOM_ownKeys);
+    if (!s)
+        return -1;
+    if (JS_IsUndefined(method)) {
+        return JS_GetOwnPropertyNamesInternal(ctx, ptab, plen,
+                                      JS_VALUE_GET_OBJ(s->target),
+                                      JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK);
+    }
+    prop_array = JS_CallFree(ctx, method, s->handler, 1, (JSValueConst *)&s->target);
+    if (JS_IsException(prop_array))
+        return -1;
+    tab = NULL;
+    len = 0;
+    tab2 = NULL;
+    len2 = 0;
+    if (js_get_length32(ctx, &len, prop_array))
+        goto fail;
+    if (len > 0) {
+        tab = js_mallocz(ctx, sizeof(tab[0]) * len);
+        if (!tab)
+            goto fail;
+    }
+    for(i = 0; i < len; i++) {
+        val = JS_GetPropertyUint32(ctx, prop_array, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (!JS_IsString(val) && !JS_IsSymbol(val)) {
+            JS_FreeValue(ctx, val);
+            JS_ThrowTypeError(ctx, "proxy: properties must be strings or symbols");
+            goto fail;
+        }
+        atom = JS_ValueToAtom(ctx, val);
+        JS_FreeValue(ctx, val);
+        if (atom == JS_ATOM_NULL)
+            goto fail;
+        tab[i].atom = atom;
+        tab[i].is_enumerable = FALSE; /* XXX: redundant? */
+    }
+
+    /* check duplicate properties (XXX: inefficient, could store the
+     * properties an a temporary object to use the hash) */
+    for(i = 1; i < len; i++) {
+        if (find_prop_key(tab, i, tab[i].atom) >= 0) {
+            JS_ThrowTypeError(ctx, "proxy: duplicate property");
+            goto fail;
+        }
+    }
+
+    is_extensible = JS_IsExtensible(ctx, s->target);
+    if (is_extensible < 0)
+        goto fail;
+
+    /* check if there are non configurable properties */
+    if (s->is_revoked) {
+        JS_ThrowTypeErrorRevokedProxy(ctx);
+        goto fail;
+    }
+    if (JS_GetOwnPropertyNamesInternal(ctx, &tab2, &len2, JS_VALUE_GET_OBJ(s->target),
+                               JS_GPN_STRING_MASK | JS_GPN_SYMBOL_MASK))
+        goto fail;
+    for(i = 0; i < len2; i++) {
+        if (s->is_revoked) {
+            JS_ThrowTypeErrorRevokedProxy(ctx);
+            goto fail;
+        }
+        res = JS_GetOwnPropertyInternal(ctx, &desc, JS_VALUE_GET_OBJ(s->target),
+                                tab2[i].atom);
+        if (res < 0)
+            goto fail;
+        if (res) {  /* safety, property should be found */
+            js_free_desc(ctx, &desc);
+            if (!(desc.flags & JS_PROP_CONFIGURABLE) || !is_extensible) {
+                idx = find_prop_key(tab, len, tab2[i].atom);
+                if (idx < 0) {
+                    JS_ThrowTypeError(ctx, "proxy: target property must be present in proxy ownKeys");
+                    goto fail;
+                }
+                /* mark the property as found */
+                if (!is_extensible)
+                    tab[idx].is_enumerable = TRUE;
+            }
+        }
+    }
+    if (!is_extensible) {
+        /* check that all property in 'tab' were checked */
+        for(i = 0; i < len; i++) {
+            if (!tab[i].is_enumerable) {
+                JS_ThrowTypeError(ctx, "proxy: property not present in target were returned by non extensible proxy");
+                goto fail;
+            }
+        }
+    }
+
+    js_free_prop_enum(ctx, tab2, len2);
+    JS_FreeValue(ctx, prop_array);
+    *ptab = tab;
+    *plen = len;
+    return 0;
+ fail:
+    js_free_prop_enum(ctx, tab2, len2);
+    js_free_prop_enum(ctx, tab, len);
+    JS_FreeValue(ctx, prop_array);
+    return -1;
+}
+
+static JSValue js_proxy_call_constructor(JSContext *ctx, JSValueConst func_obj,
+                                         JSValueConst new_target,
+                                         int argc, JSValueConst *argv)
+{
+    JSProxyData *s;
+    JSValue method, arg_array, ret;
+    JSValueConst args[3];
+
+    s = get_proxy_method(ctx, &method, func_obj, JS_ATOM_construct);
+    if (!s)
+        return JS_EXCEPTION;
+    if (!JS_IsConstructor(ctx, s->target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (JS_IsUndefined(method))
+        return JS_CallConstructor2(ctx, s->target, new_target, argc, argv);
+    arg_array = js_create_array(ctx, argc, argv);
+    if (JS_IsException(arg_array)) {
+        ret = JS_EXCEPTION;
+        goto fail;
+    }
+    args[0] = s->target;
+    args[1] = arg_array;
+    args[2] = new_target;
+    ret = JS_Call(ctx, method, s->handler, 3, args);
+    if (!JS_IsException(ret) && JS_VALUE_GET_TAG(ret) != JS_TAG_OBJECT) {
+        JS_FreeValue(ctx, ret);
+        ret = JS_ThrowTypeErrorNotAnObject(ctx);
+    }
+ fail:
+    JS_FreeValue(ctx, method);
+    JS_FreeValue(ctx, arg_array);
+    return ret;
+}
+
+static JSValue js_proxy_call(JSContext *ctx, JSValueConst func_obj,
+                             JSValueConst this_obj,
+                             int argc, JSValueConst *argv, int flags)
+{
+    JSProxyData *s;
+    JSValue method, arg_array, ret;
+    JSValueConst args[3];
+
+    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;
+    if (!s->is_func) {
+        JS_FreeValue(ctx, method);
+        return JS_ThrowTypeError(ctx, "not a function");
+    }
+    if (JS_IsUndefined(method))
+        return JS_Call(ctx, s->target, this_obj, argc, argv);
+    arg_array = js_create_array(ctx, argc, argv);
+    if (JS_IsException(arg_array)) {
+        ret = JS_EXCEPTION;
+        goto fail;
+    }
+    args[0] = s->target;
+    args[1] = this_obj;
+    args[2] = arg_array;
+    ret = JS_Call(ctx, method, s->handler, 3, args);
+ fail:
+    JS_FreeValue(ctx, method);
+    JS_FreeValue(ctx, arg_array);
+    return ret;
+}
+
+static int js_proxy_isArray(JSContext *ctx, JSValueConst obj)
+{
+    JSProxyData *s = JS_GetOpaque(obj, JS_CLASS_PROXY);
+    if (!s)
+        return FALSE;
+    if (s->is_revoked) {
+        JS_ThrowTypeErrorRevokedProxy(ctx);
+        return -1;
+    }
+    return JS_IsArray(ctx, s->target);
+}
+
+static const JSClassExoticMethods js_proxy_exotic_methods = {
+    .get_own_property = js_proxy_get_own_property,
+    .define_own_property = js_proxy_define_own_property,
+    .delete_property = js_proxy_delete_property,
+    .get_own_property_names = js_proxy_get_own_property_names,
+    .has_property = js_proxy_has,
+    .get_property = js_proxy_get,
+    .set_property = js_proxy_set,
+};
+
+static JSValue js_proxy_constructor(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst target, handler;
+    JSValue obj;
+    JSProxyData *s;
+
+    target = argv[0];
+    handler = argv[1];
+    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))
+        return obj;
+    s = js_malloc(ctx, sizeof(JSProxyData));
+    if (!s) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    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);
+    JS_SetConstructorBit(ctx, obj, JS_IsConstructor(ctx, target));
+    return obj;
+}
+
+static JSValue js_proxy_revoke(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic,
+                               JSValue *func_data)
+{
+    JSProxyData *s = JS_GetOpaque(func_data[0], JS_CLASS_PROXY);
+    if (s) {
+        /* We do not free the handler and target in case they are
+           referenced as constants in the C call stack */
+        s->is_revoked = TRUE;
+        JS_FreeValue(ctx, func_data[0]);
+        func_data[0] = JS_NULL;
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_proxy_revoke_constructor(JSContext *ctx,
+                                           JSValueConst proxy_obj)
+{
+    return JS_NewCFunctionData(ctx, js_proxy_revoke, 0, 0, 1, &proxy_obj);
+}
+
+static JSValue js_proxy_revocable(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue proxy_obj, revoke_obj = JS_UNDEFINED, obj;
+
+    proxy_obj = js_proxy_constructor(ctx, JS_UNDEFINED, argc, argv);
+    if (JS_IsException(proxy_obj))
+        goto fail;
+    revoke_obj = js_proxy_revoke_constructor(ctx, proxy_obj);
+    if (JS_IsException(revoke_obj))
+        goto fail;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj))
+        goto fail;
+    // XXX: exceptions?
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_proxy, proxy_obj, JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_revoke, revoke_obj, JS_PROP_C_W_E);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, proxy_obj);
+    JS_FreeValue(ctx, revoke_obj);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_proxy_funcs[] = {
+    JS_CFUNC_DEF("revocable", 2, js_proxy_revocable ),
+};
+
+static const JSClassShortDef js_proxy_class_def[] = {
+    { JS_ATOM_Object, js_proxy_finalizer, js_proxy_mark }, /* JS_CLASS_PROXY */
+};
+
+void JS_AddIntrinsicProxy(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+
+    if (!JS_IsRegisteredClass(rt, JS_CLASS_PROXY)) {
+        init_class_range(rt, js_proxy_class_def, JS_CLASS_PROXY,
+                         countof(js_proxy_class_def));
+        rt->class_array[JS_CLASS_PROXY].exotic = &js_proxy_exotic_methods;
+        rt->class_array[JS_CLASS_PROXY].call = js_proxy_call;
+    }
+
+    obj1 = JS_NewCFunction2(ctx, js_proxy_constructor, "Proxy", 2,
+                            JS_CFUNC_constructor, 0);
+    JS_SetConstructorBit(ctx, obj1, TRUE);
+    JS_SetPropertyFunctionList(ctx, obj1, js_proxy_funcs,
+                               countof(js_proxy_funcs));
+    JS_DefinePropertyValueStr(ctx, ctx->global_obj, "Proxy",
+                              obj1, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+}
+
+/* Symbol */
+
+static JSValue js_symbol_constructor(JSContext *ctx, JSValueConst new_target,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue str;
+    JSString *p;
+
+    if (!JS_IsUndefined(new_target))
+        return JS_ThrowTypeError(ctx, "not a constructor");
+    if (argc == 0 || JS_IsUndefined(argv[0])) {
+        p = NULL;
+    } else {
+        str = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(str))
+            return JS_EXCEPTION;
+        p = JS_VALUE_GET_STRING(str);
+    }
+    return JS_NewSymbol(ctx, p, JS_ATOM_TYPE_SYMBOL);
+}
+
+static JSValue js_thisSymbolValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_SYMBOL)
+        return JS_DupValue(ctx, this_val);
+
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_SYMBOL) {
+            if (JS_VALUE_GET_TAG(p->u.object_data) == JS_TAG_SYMBOL)
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a symbol");
+}
+
+static JSValue js_symbol_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    val = js_thisSymbolValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    /* XXX: use JS_ToStringInternal() with a flags */
+    ret = js_string_constructor(ctx, JS_UNDEFINED, 1, (JSValueConst *)&val);
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static JSValue js_symbol_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisSymbolValue(ctx, this_val);
+}
+
+static JSValue js_symbol_get_description(JSContext *ctx, JSValueConst this_val)
+{
+    JSValue val, ret;
+    JSAtomStruct *p;
+
+    val = js_thisSymbolValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    p = JS_VALUE_GET_PTR(val);
+    if (p->len == 0 && p->is_wide_char != 0) {
+        ret = JS_UNDEFINED;
+    } else {
+        ret = JS_AtomToString(ctx, js_get_atom_index(ctx->rt, p));
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+}
+
+static const JSCFunctionListEntry js_symbol_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_symbol_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_symbol_valueOf ),
+    // XXX: should have writable: false
+    JS_CFUNC_DEF("[Symbol.toPrimitive]", 1, js_symbol_valueOf ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Symbol", JS_PROP_CONFIGURABLE ),
+    JS_CGETSET_DEF("description", js_symbol_get_description, NULL ),
+};
+
+static JSValue js_symbol_for(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    JSValue str;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return JS_EXCEPTION;
+    return JS_NewSymbol(ctx, JS_VALUE_GET_STRING(str), JS_ATOM_TYPE_GLOBAL_SYMBOL);
+}
+
+static JSValue js_symbol_keyFor(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSAtomStruct *p;
+
+    if (!JS_IsSymbol(argv[0]))
+        return JS_ThrowTypeError(ctx, "not a symbol");
+    p = JS_VALUE_GET_PTR(argv[0]);
+    if (p->atom_type != JS_ATOM_TYPE_GLOBAL_SYMBOL)
+        return JS_UNDEFINED;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_STRING, p));
+}
+
+static const JSCFunctionListEntry js_symbol_funcs[] = {
+    JS_CFUNC_DEF("for", 1, js_symbol_for ),
+    JS_CFUNC_DEF("keyFor", 1, js_symbol_keyFor ),
+};
+
+/* Set/Map/WeakSet/WeakMap */
+
+typedef struct JSMapRecord {
+    int ref_count; /* used during enumeration to avoid freeing the record */
+    BOOL empty; /* TRUE if the record is deleted */
+    struct JSMapState *map;
+    struct JSMapRecord *next_weak_ref;
+    struct list_head link;
+    struct list_head hash_link;
+    JSValue key;
+    JSValue value;
+} JSMapRecord;
+
+typedef struct JSMapState {
+    BOOL is_weak; /* TRUE if WeakSet/WeakMap */
+    struct list_head records; /* list of JSMapRecord.link */
+    uint32_t record_count;
+    struct list_head *hash_table;
+    uint32_t hash_size; /* must be a power of two */
+    uint32_t record_count_threshold; /* count at which a hash table
+                                        resize is needed */
+} JSMapState;
+
+#define MAGIC_SET (1 << 0)
+#define MAGIC_WEAK (1 << 1)
+
+static JSValue js_map_constructor(JSContext *ctx, JSValueConst new_target,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s;
+    JSValue obj, adder = JS_UNDEFINED, iter = JS_UNDEFINED, next_method = JS_UNDEFINED;
+    JSValueConst arr;
+    BOOL is_set, is_weak;
+
+    is_set = magic & MAGIC_SET;
+    is_weak = ((magic & MAGIC_WEAK) != 0);
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_MAP + magic);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        goto fail;
+    init_list_head(&s->records);
+    s->is_weak = is_weak;
+    JS_SetOpaque(obj, s);
+    s->hash_size = 1;
+    s->hash_table = js_malloc(ctx, sizeof(s->hash_table[0]) * s->hash_size);
+    if (!s->hash_table)
+        goto fail;
+    init_list_head(&s->hash_table[0]);
+    s->record_count_threshold = 4;
+
+    arr = JS_UNDEFINED;
+    if (argc > 0)
+        arr = argv[0];
+    if (!JS_IsUndefined(arr) && !JS_IsNull(arr)) {
+        JSValue item, ret;
+        BOOL done;
+
+        adder = JS_GetProperty(ctx, obj, is_set ? JS_ATOM_add : JS_ATOM_set);
+        if (JS_IsException(adder))
+            goto fail;
+        if (!JS_IsFunction(ctx, adder)) {
+            JS_ThrowTypeError(ctx, "set/add is not a function");
+            goto fail;
+        }
+
+        iter = JS_GetIterator(ctx, arr, FALSE);
+        if (JS_IsException(iter))
+            goto fail;
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        if (JS_IsException(next_method))
+            goto fail;
+
+        for(;;) {
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail;
+            if (done) {
+                JS_FreeValue(ctx, item);
+                break;
+            }
+            if (is_set) {
+                ret = JS_Call(ctx, adder, obj, 1, (JSValueConst *)&item);
+                if (JS_IsException(ret)) {
+                    JS_FreeValue(ctx, item);
+                    goto fail;
+                }
+            } else {
+                JSValue key, value;
+                JSValueConst args[2];
+                key = JS_UNDEFINED;
+                value = JS_UNDEFINED;
+                if (!JS_IsObject(item)) {
+                    JS_ThrowTypeErrorNotAnObject(ctx);
+                    goto fail1;
+                }
+                key = JS_GetPropertyUint32(ctx, item, 0);
+                if (JS_IsException(key))
+                    goto fail1;
+                value = JS_GetPropertyUint32(ctx, item, 1);
+                if (JS_IsException(value))
+                    goto fail1;
+                args[0] = key;
+                args[1] = value;
+                ret = JS_Call(ctx, adder, obj, 2, args);
+                if (JS_IsException(ret)) {
+                fail1:
+                    JS_FreeValue(ctx, item);
+                    JS_FreeValue(ctx, key);
+                    JS_FreeValue(ctx, value);
+                    goto fail;
+                }
+                JS_FreeValue(ctx, key);
+                JS_FreeValue(ctx, value);
+            }
+            JS_FreeValue(ctx, ret);
+            JS_FreeValue(ctx, item);
+        }
+        JS_FreeValue(ctx, next_method);
+        JS_FreeValue(ctx, iter);
+        JS_FreeValue(ctx, adder);
+    }
+    return obj;
+ fail:
+    if (JS_IsObject(iter)) {
+        /* close the iterator object, preserving pending exception */
+        JS_IteratorClose(ctx, iter, TRUE);
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, adder);
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+/* XXX: could normalize strings to speed up comparison */
+static JSValueConst map_normalize_key(JSContext *ctx, JSValueConst key)
+{
+    uint32_t tag = JS_VALUE_GET_TAG(key);
+    /* convert -0.0 to +0.0 */
+    if (JS_TAG_IS_FLOAT64(tag) && JS_VALUE_GET_FLOAT64(key) == 0.0) {
+        key = JS_NewInt32(ctx, 0);
+    }
+    return key;
+}
+
+/* XXX: better hash ? */
+static uint32_t map_hash_key(JSContext *ctx, JSValueConst key)
+{
+    uint32_t tag = JS_VALUE_GET_NORM_TAG(key);
+    uint32_t h;
+    double d;
+    JSFloat64Union u;
+
+    switch(tag) {
+    case JS_TAG_BOOL:
+        h = JS_VALUE_GET_INT(key);
+        break;
+    case JS_TAG_STRING:
+        h = hash_string(JS_VALUE_GET_STRING(key), 0);
+        break;
+    case JS_TAG_OBJECT:
+    case JS_TAG_SYMBOL:
+        h = (uintptr_t)JS_VALUE_GET_PTR(key) * 3163;
+        break;
+    case JS_TAG_INT:
+        d = JS_VALUE_GET_INT(key) * 3163;
+        goto hash_float64;
+    case JS_TAG_FLOAT64:
+        d = JS_VALUE_GET_FLOAT64(key);
+        /* normalize the NaN */
+        if (isnan(d))
+            d = JS_FLOAT64_NAN;
+    hash_float64:
+        u.d = d;
+        h = (u.u32[0] ^ u.u32[1]) * 3163;
+        break;
+    default:
+        h = 0; /* XXX: bignum support */
+        break;
+    }
+    h ^= tag;
+    return h;
+}
+
+static JSMapRecord *map_find_record(JSContext *ctx, JSMapState *s,
+                                    JSValueConst key)
+{
+    struct list_head *el;
+    JSMapRecord *mr;
+    uint32_t h;
+    h = map_hash_key(ctx, key) & (s->hash_size - 1);
+    list_for_each(el, &s->hash_table[h]) {
+        mr = list_entry(el, JSMapRecord, hash_link);
+        if (js_same_value_zero(ctx, mr->key, key))
+            return mr;
+    }
+    return NULL;
+}
+
+static void map_hash_resize(JSContext *ctx, JSMapState *s)
+{
+    uint32_t new_hash_size, i, h;
+    size_t slack;
+    struct list_head *new_hash_table, *el;
+    JSMapRecord *mr;
+
+    /* XXX: no reporting of memory allocation failure */
+    if (s->hash_size == 1)
+        new_hash_size = 4;
+    else
+        new_hash_size = s->hash_size * 2;
+    new_hash_table = js_realloc2(ctx, s->hash_table,
+                                 sizeof(new_hash_table[0]) * new_hash_size, &slack);
+    if (!new_hash_table)
+        return;
+    new_hash_size += slack / sizeof(*new_hash_table);
+
+    for(i = 0; i < new_hash_size; i++)
+        init_list_head(&new_hash_table[i]);
+
+    list_for_each(el, &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty) {
+            h = map_hash_key(ctx, mr->key) & (new_hash_size - 1);
+            list_add_tail(&mr->hash_link, &new_hash_table[h]);
+        }
+    }
+    s->hash_table = new_hash_table;
+    s->hash_size = new_hash_size;
+    s->record_count_threshold = new_hash_size * 2;
+}
+
+static JSMapRecord *map_add_record(JSContext *ctx, JSMapState *s,
+                                   JSValueConst key)
+{
+    uint32_t h;
+    JSMapRecord *mr;
+
+    mr = js_malloc(ctx, sizeof(*mr));
+    if (!mr)
+        return NULL;
+    mr->ref_count = 1;
+    mr->map = s;
+    mr->empty = FALSE;
+    if (s->is_weak) {
+        JSObject *p = JS_VALUE_GET_OBJ(key);
+        /* Add the weak reference */
+        mr->next_weak_ref = p->first_weak_ref;
+        p->first_weak_ref = mr;
+    } else {
+        JS_DupValue(ctx, key);
+    }
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    mr->key = key;
+#else
+    mr->key = (JSValue)key;
+#endif
+    h = map_hash_key(ctx, key) & (s->hash_size - 1);
+    list_add_tail(&mr->hash_link, &s->hash_table[h]);
+    list_add_tail(&mr->link, &s->records);
+    s->record_count++;
+    if (s->record_count >= s->record_count_threshold) {
+        map_hash_resize(ctx, s);
+    }
+    return mr;
+}
+
+/* Remove the weak reference from the object weak
+   reference list. we don't use a doubly linked list to
+   save space, assuming a given object has few weak
+       references to it */
+static void delete_weak_ref(JSRuntime *rt, JSMapRecord *mr)
+{
+    JSMapRecord **pmr, *mr1;
+    JSObject *p;
+
+    p = JS_VALUE_GET_OBJ(mr->key);
+    pmr = &p->first_weak_ref;
+    for(;;) {
+        mr1 = *pmr;
+        assert(mr1 != NULL);
+        if (mr1 == mr)
+            break;
+        pmr = &mr1->next_weak_ref;
+    }
+    *pmr = mr1->next_weak_ref;
+}
+
+static void map_delete_record(JSRuntime *rt, JSMapState *s, JSMapRecord *mr)
+{
+    if (mr->empty)
+        return;
+    list_del(&mr->hash_link);
+    if (s->is_weak) {
+        delete_weak_ref(rt, mr);
+    } else {
+        JS_FreeValueRT(rt, mr->key);
+    }
+    JS_FreeValueRT(rt, mr->value);
+    if (--mr->ref_count == 0) {
+        list_del(&mr->link);
+        js_free_rt(rt, mr);
+    } else {
+        /* keep a zombie record for iterators */
+        mr->empty = TRUE;
+        mr->key = JS_UNDEFINED;
+        mr->value = JS_UNDEFINED;
+    }
+    s->record_count--;
+}
+
+static void map_decref_record(JSRuntime *rt, JSMapRecord *mr)
+{
+    if (--mr->ref_count == 0) {
+        /* the record can be safely removed */
+        assert(mr->empty);
+        list_del(&mr->link);
+        js_free_rt(rt, mr);
+    }
+}
+
+static void reset_weak_ref(JSRuntime *rt, JSObject *p)
+{
+    JSMapRecord *mr, *mr_next;
+
+    /* first pass to remove the records from the WeakMap/WeakSet
+       lists */
+    for(mr = p->first_weak_ref; mr != NULL; mr = mr->next_weak_ref) {
+        assert(mr->map->is_weak);
+        assert(!mr->empty); /* no iterator on WeakMap/WeakSet */
+        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) {
+        mr_next = mr->next_weak_ref;
+        JS_FreeValueRT(rt, mr->value);
+        js_free_rt(rt, mr);
+    }
+
+    p->first_weak_ref = NULL; /* fail safe */
+}
+
+static JSValue js_map_set(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key, value;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    if (s->is_weak && !JS_IsObject(key))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (magic & MAGIC_SET)
+        value = JS_UNDEFINED;
+    else
+        value = argv[1];
+    mr = map_find_record(ctx, s, key);
+    if (mr) {
+        JS_FreeValue(ctx, mr->value);
+    } else {
+        mr = map_add_record(ctx, s, key);
+        if (!mr)
+            return JS_EXCEPTION;
+    }
+    mr->value = JS_DupValue(ctx, value);
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_map_get(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    if (!mr)
+        return JS_UNDEFINED;
+    else
+        return JS_DupValue(ctx, mr->value);
+}
+
+static JSValue js_map_has(JSContext *ctx, JSValueConst this_val,
+                          int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    return JS_NewBool(ctx, (mr != NULL));
+}
+
+static JSValue js_map_delete(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSMapRecord *mr;
+    JSValueConst key;
+
+    if (!s)
+        return JS_EXCEPTION;
+    key = map_normalize_key(ctx, argv[0]);
+    mr = map_find_record(ctx, s, key);
+    if (!mr)
+        return JS_FALSE;
+    map_delete_record(ctx->rt, s, mr);
+    return JS_TRUE;
+}
+
+static JSValue js_map_clear(JSContext *ctx, JSValueConst this_val,
+                            int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    struct list_head *el, *el1;
+    JSMapRecord *mr;
+
+    if (!s)
+        return JS_EXCEPTION;
+    list_for_each_safe(el, el1, &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        map_delete_record(ctx->rt, s, mr);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_map_get_size(JSContext *ctx, JSValueConst this_val, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    if (!s)
+        return JS_EXCEPTION;
+    return JS_NewUint32(ctx, s->record_count);
+}
+
+static JSValue js_map_forEach(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    JSMapState *s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    JSValueConst func, this_arg;
+    JSValue ret, args[3];
+    struct list_head *el;
+    JSMapRecord *mr;
+
+    if (!s)
+        return JS_EXCEPTION;
+    func = argv[0];
+    if (argc > 1)
+        this_arg = argv[1];
+    else
+        this_arg = JS_UNDEFINED;
+    if (check_function(ctx, func))
+        return JS_EXCEPTION;
+    /* Note: the list can be modified while traversing it, but the
+       current element is locked */
+    el = s->records.next;
+    while (el != &s->records) {
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty) {
+            mr->ref_count++;
+            /* must duplicate in case the record is deleted */
+            args[1] = JS_DupValue(ctx, mr->key);
+            if (magic)
+                args[0] = args[1];
+            else
+                args[0] = JS_DupValue(ctx, mr->value);
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+            args[2] = this_val;
+#else
+            args[2] = (JSValue)this_val;
+#endif
+            ret = JS_Call(ctx, func, this_arg, 3, (JSValueConst *)args);
+            JS_FreeValue(ctx, args[0]);
+            if (!magic)
+                JS_FreeValue(ctx, args[1]);
+            el = el->next;
+            map_decref_record(ctx->rt, mr);
+            if (JS_IsException(ret))
+                return ret;
+            JS_FreeValue(ctx, ret);
+        } else {
+            el = el->next;
+        }
+    }
+    return JS_UNDEFINED;
+}
+
+static void js_map_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p;
+    JSMapState *s;
+    struct list_head *el, *el1;
+    JSMapRecord *mr;
+
+    p = JS_VALUE_GET_OBJ(val);
+    s = p->u.map_state;
+    if (s) {
+        /* if the object is deleted we are sure that no iterator is
+           using it */
+        list_for_each_safe(el, el1, &s->records) {
+            mr = list_entry(el, JSMapRecord, link);
+            if (!mr->empty) {
+                if (s->is_weak)
+                    delete_weak_ref(rt, mr);
+                else
+                    JS_FreeValueRT(rt, mr->key);
+                JS_FreeValueRT(rt, mr->value);
+            }
+            js_free_rt(rt, mr);
+        }
+        js_free_rt(rt, s->hash_table);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_map_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSMapState *s;
+    struct list_head *el;
+    JSMapRecord *mr;
+
+    s = p->u.map_state;
+    if (s) {
+        list_for_each(el, &s->records) {
+            mr = list_entry(el, JSMapRecord, link);
+            if (!s->is_weak)
+                JS_MarkValue(rt, mr->key, mark_func);
+            JS_MarkValue(rt, mr->value, mark_func);
+        }
+    }
+}
+
+/* Map Iterator */
+
+typedef struct JSMapIteratorData {
+    JSValue obj;
+    JSIteratorKindEnum kind;
+    JSMapRecord *cur_record;
+} JSMapIteratorData;
+
+static void js_map_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p;
+    JSMapIteratorData *it;
+
+    p = JS_VALUE_GET_OBJ(val);
+    it = p->u.map_iterator_data;
+    if (it) {
+        /* During the GC sweep phase the Map finalizer may be
+           called before the Map iterator finalizer */
+        if (JS_IsLiveObject(rt, it->obj) && it->cur_record) {
+            map_decref_record(rt, it->cur_record);
+        }
+        JS_FreeValueRT(rt, it->obj);
+        js_free_rt(rt, it);
+    }
+}
+
+static void js_map_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                 JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSMapIteratorData *it;
+    it = p->u.map_iterator_data;
+    if (it) {
+        /* the record is already marked by the object */
+        JS_MarkValue(rt, it->obj, mark_func);
+    }
+}
+
+static JSValue js_create_map_iterator(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv, int magic)
+{
+    JSIteratorKindEnum kind;
+    JSMapState *s;
+    JSMapIteratorData *it;
+    JSValue enum_obj;
+
+    kind = magic >> 2;
+    magic &= 3;
+    s = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP + magic);
+    if (!s)
+        return JS_EXCEPTION;
+    enum_obj = JS_NewObjectClass(ctx, JS_CLASS_MAP_ITERATOR + magic);
+    if (JS_IsException(enum_obj))
+        goto fail;
+    it = js_malloc(ctx, sizeof(*it));
+    if (!it) {
+        JS_FreeValue(ctx, enum_obj);
+        goto fail;
+    }
+    it->obj = JS_DupValue(ctx, this_val);
+    it->kind = kind;
+    it->cur_record = NULL;
+    JS_SetOpaque(enum_obj, it);
+    return enum_obj;
+ fail:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_map_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv,
+                                    BOOL *pdone, int magic)
+{
+    JSMapIteratorData *it;
+    JSMapState *s;
+    JSMapRecord *mr;
+    struct list_head *el;
+
+    it = JS_GetOpaque2(ctx, this_val, JS_CLASS_MAP_ITERATOR + magic);
+    if (!it) {
+        *pdone = FALSE;
+        return JS_EXCEPTION;
+    }
+    if (JS_IsUndefined(it->obj))
+        goto done;
+    s = JS_GetOpaque(it->obj, JS_CLASS_MAP + magic);
+    assert(s != NULL);
+    if (!it->cur_record) {
+        el = s->records.next;
+    } else {
+        mr = it->cur_record;
+        el = mr->link.next;
+        map_decref_record(ctx->rt, mr); /* the record can be freed here */
+    }
+    for(;;) {
+        if (el == &s->records) {
+            /* no more record  */
+            it->cur_record = NULL;
+            JS_FreeValue(ctx, it->obj);
+            it->obj = JS_UNDEFINED;
+        done:
+            /* end of enumeration */
+            *pdone = TRUE;
+            return JS_UNDEFINED;
+        }
+        mr = list_entry(el, JSMapRecord, link);
+        if (!mr->empty)
+            break;
+        /* get the next record */
+        el = mr->link.next;
+    }
+
+    /* lock the record so that it won't be freed */
+    mr->ref_count++;
+    it->cur_record = mr;
+    *pdone = FALSE;
+
+    if (it->kind == JS_ITERATOR_KIND_KEY) {
+        return JS_DupValue(ctx, mr->key);
+    } else {
+        JSValueConst args[2];
+        args[0] = mr->key;
+        if (magic)
+            args[1] = mr->key;
+        else
+            args[1] = mr->value;
+        if (it->kind == JS_ITERATOR_KIND_VALUE) {
+            return JS_DupValue(ctx, args[1]);
+        } else {
+            return js_create_array(ctx, 2, args);
+        }
+    }
+}
+
+static const JSCFunctionListEntry js_map_funcs[] = {
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static const JSCFunctionListEntry js_map_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("set", 2, js_map_set, 0 ),
+    JS_CFUNC_MAGIC_DEF("get", 1, js_map_get, 0 ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, 0 ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, 0 ),
+    JS_CFUNC_MAGIC_DEF("clear", 0, js_map_clear, 0 ),
+    JS_CGETSET_MAGIC_DEF("size", js_map_get_size, NULL, 0),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_map_forEach, 0 ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_map_iterator, (JS_ITERATOR_KIND_VALUE << 2) | 0 ),
+    JS_CFUNC_MAGIC_DEF("keys", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY << 2) | 0 ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY_AND_VALUE << 2) | 0 ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "entries" ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Map", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_map_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_map_iterator_next, 0 ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Map Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_set_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 1, js_map_set, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("clear", 0, js_map_clear, MAGIC_SET ),
+    JS_CGETSET_MAGIC_DEF("size", js_map_get_size, NULL, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_map_forEach, MAGIC_SET ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY << 2) | MAGIC_SET ),
+    JS_ALIAS_DEF("keys", "values" ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_map_iterator, (JS_ITERATOR_KIND_KEY_AND_VALUE << 2) | MAGIC_SET ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Set", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_set_iterator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 0, js_map_iterator_next, MAGIC_SET ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Set Iterator", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_weak_map_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("set", 2, js_map_set, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("get", 1, js_map_get, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_WEAK ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "WeakMap", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_weak_set_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 1, js_map_set, MAGIC_SET | MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("has", 1, js_map_has, MAGIC_SET | MAGIC_WEAK ),
+    JS_CFUNC_MAGIC_DEF("delete", 1, js_map_delete, MAGIC_SET | MAGIC_WEAK ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "WeakSet", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry * const js_map_proto_funcs_ptr[6] = {
+    js_map_proto_funcs,
+    js_set_proto_funcs,
+    js_weak_map_proto_funcs,
+    js_weak_set_proto_funcs,
+    js_map_iterator_proto_funcs,
+    js_set_iterator_proto_funcs,
+};
+
+static const uint8_t js_map_proto_funcs_count[6] = {
+    countof(js_map_proto_funcs),
+    countof(js_set_proto_funcs),
+    countof(js_weak_map_proto_funcs),
+    countof(js_weak_set_proto_funcs),
+    countof(js_map_iterator_proto_funcs),
+    countof(js_set_iterator_proto_funcs),
+};
+
+void JS_AddIntrinsicMapSet(JSContext *ctx)
+{
+    int i;
+    JSValue obj1;
+    char buf[ATOM_GET_STR_BUF_SIZE];
+
+    for(i = 0; i < 4; i++) {
+        const char *name = JS_AtomGetStr(ctx, buf, sizeof(buf),
+                                         JS_ATOM_Map + i);
+        ctx->class_proto[JS_CLASS_MAP + i] = JS_NewObject(ctx);
+        JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_MAP + i],
+                                   js_map_proto_funcs_ptr[i],
+                                   js_map_proto_funcs_count[i]);
+        obj1 = JS_NewCFunctionMagic(ctx, js_map_constructor, name, 0,
+                                    JS_CFUNC_constructor_magic, i);
+        if (i < 2) {
+            JS_SetPropertyFunctionList(ctx, obj1, js_map_funcs,
+                                       countof(js_map_funcs));
+        }
+        JS_NewGlobalCConstructor2(ctx, obj1, name, ctx->class_proto[JS_CLASS_MAP + i]);
+    }
+
+    for(i = 0; i < 2; i++) {
+        ctx->class_proto[JS_CLASS_MAP_ITERATOR + i] =
+            JS_NewObjectProto(ctx, ctx->iterator_proto);
+        JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_MAP_ITERATOR + i],
+                                   js_map_proto_funcs_ptr[i + 4],
+                                   js_map_proto_funcs_count[i + 4]);
+    }
+}
+
+/* Generator */
+static const JSCFunctionListEntry js_generator_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "GeneratorFunction", JS_PROP_CONFIGURABLE),
+};
+
+static const JSCFunctionListEntry js_generator_proto_funcs[] = {
+    JS_ITERATOR_NEXT_DEF("next", 1, js_generator_next, GEN_MAGIC_NEXT ),
+    JS_ITERATOR_NEXT_DEF("return", 1, js_generator_next, GEN_MAGIC_RETURN ),
+    JS_ITERATOR_NEXT_DEF("throw", 1, js_generator_next, GEN_MAGIC_THROW ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Generator", JS_PROP_CONFIGURABLE),
+};
+
+/* Promise */
+
+typedef enum JSPromiseStateEnum {
+    JS_PROMISE_PENDING,
+    JS_PROMISE_FULFILLED,
+    JS_PROMISE_REJECTED,
+} JSPromiseStateEnum;
+
+typedef struct JSPromiseData {
+    JSPromiseStateEnum promise_state;
+    /* 0=fulfill, 1=reject, list of JSPromiseReactionData.link */
+    struct list_head promise_reactions[2];
+    BOOL is_handled; /* Note: only useful to debug */
+    JSValue promise_result;
+} JSPromiseData;
+
+typedef struct JSPromiseFunctionDataResolved {
+    int ref_count;
+    BOOL already_resolved;
+} JSPromiseFunctionDataResolved;
+
+typedef struct JSPromiseFunctionData {
+    JSValue promise;
+    JSPromiseFunctionDataResolved *presolved;
+} JSPromiseFunctionData;
+
+typedef struct JSPromiseReactionData {
+    struct list_head link; /* not used in promise_reaction_job */
+    JSValue resolving_funcs[2];
+    JSValue handler;
+} JSPromiseReactionData;
+
+static int js_create_resolving_functions(JSContext *ctx, JSValue *args,
+                                         JSValueConst promise);
+
+static void promise_reaction_data_free(JSRuntime *rt,
+                                       JSPromiseReactionData *rd)
+{
+    JS_FreeValueRT(rt, rd->resolving_funcs[0]);
+    JS_FreeValueRT(rt, rd->resolving_funcs[1]);
+    JS_FreeValueRT(rt, rd->handler);
+    js_free_rt(rt, rd);
+}
+
+static JSValue promise_reaction_job(JSContext *ctx, int argc,
+                                    JSValueConst *argv)
+{
+    JSValueConst handler, arg, func;
+    JSValue res, res2;
+    BOOL is_reject;
+
+    assert(argc == 5);
+    handler = argv[2];
+    is_reject = JS_ToBool(ctx, argv[3]);
+    arg = argv[4];
+#ifdef DUMP_PROMISE
+    printf("promise_reaction_job: is_reject=%d\n", is_reject);
+#endif
+
+    if (JS_IsUndefined(handler)) {
+        if (is_reject) {
+            res = JS_Throw(ctx, JS_DupValue(ctx, arg));
+        } else {
+            res = JS_DupValue(ctx, arg);
+        }
+    } else {
+        res = JS_Call(ctx, handler, JS_UNDEFINED, 1, &arg);
+    }
+    is_reject = JS_IsException(res);
+    if (is_reject)
+        res = JS_GetException(ctx);
+    func = argv[is_reject];
+    /* as an extension, we support undefined as value to avoid
+       creating a dummy promise in the 'await' implementation of async
+       functions */
+    if (!JS_IsUndefined(func)) {
+        res2 = JS_Call(ctx, func, JS_UNDEFINED,
+                       1, (JSValueConst *)&res);
+    } else {
+        res2 = JS_UNDEFINED;
+    }
+    JS_FreeValue(ctx, res);
+
+    return res2;
+}
+
+void JS_SetHostPromiseRejectionTracker(JSRuntime *rt,
+                                       JSHostPromiseRejectionTracker *cb,
+                                       void *opaque)
+{
+    rt->host_promise_rejection_tracker = cb;
+    rt->host_promise_rejection_tracker_opaque = opaque;
+}
+
+static void fulfill_or_reject_promise(JSContext *ctx, JSValueConst promise,
+                                      JSValueConst value, BOOL is_reject)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    struct list_head *el, *el1;
+    JSPromiseReactionData *rd;
+    JSValueConst args[5];
+
+    if (!s || s->promise_state != JS_PROMISE_PENDING)
+        return; /* should never happen */
+    set_value(ctx, &s->promise_result, JS_DupValue(ctx, value));
+    s->promise_state = JS_PROMISE_FULFILLED + is_reject;
+#ifdef DUMP_PROMISE
+    printf("fulfill_or_reject_promise: is_reject=%d\n", is_reject);
+#endif
+    if (s->promise_state == JS_PROMISE_REJECTED && !s->is_handled) {
+        JSRuntime *rt = ctx->rt;
+        if (rt->host_promise_rejection_tracker) {
+            rt->host_promise_rejection_tracker(ctx, promise, value, FALSE,
+                                               rt->host_promise_rejection_tracker_opaque);
+        }
+    }
+
+    list_for_each_safe(el, el1, &s->promise_reactions[is_reject]) {
+        rd = list_entry(el, JSPromiseReactionData, link);
+        args[0] = rd->resolving_funcs[0];
+        args[1] = rd->resolving_funcs[1];
+        args[2] = rd->handler;
+        args[3] = JS_NewBool(ctx, is_reject);
+        args[4] = value;
+        JS_EnqueueJob(ctx, promise_reaction_job, 5, args);
+        list_del(&rd->link);
+        promise_reaction_data_free(ctx->rt, rd);
+    }
+
+    list_for_each_safe(el, el1, &s->promise_reactions[1 - is_reject]) {
+        rd = list_entry(el, JSPromiseReactionData, link);
+        list_del(&rd->link);
+        promise_reaction_data_free(ctx->rt, rd);
+    }
+}
+
+static void reject_promise(JSContext *ctx, JSValueConst promise,
+                           JSValueConst value)
+{
+    fulfill_or_reject_promise(ctx, promise, value, TRUE);
+}
+
+static JSValue js_promise_resolve_thenable_job(JSContext *ctx,
+                                               int argc, JSValueConst *argv)
+{
+    JSValueConst promise, thenable, then;
+    JSValue args[2], res;
+
+#ifdef DUMP_PROMISE
+    printf("js_promise_resolve_thenable_job\n");
+#endif
+    assert(argc == 3);
+    promise = argv[0];
+    thenable = argv[1];
+    then = argv[2];
+    if (js_create_resolving_functions(ctx, args, promise) < 0)
+        return JS_EXCEPTION;
+    res = JS_Call(ctx, then, thenable, 2, (JSValueConst *)args);
+    if (JS_IsException(res)) {
+        JSValue error = JS_GetException(ctx);
+        res = JS_Call(ctx, args[1], JS_UNDEFINED, 1, (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+    }
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+    return res;
+}
+
+static void js_promise_resolve_function_free_resolved(JSRuntime *rt,
+                                                      JSPromiseFunctionDataResolved *sr)
+{
+    if (--sr->ref_count == 0) {
+        js_free_rt(rt, sr);
+    }
+}
+
+static int js_create_resolving_functions(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst promise)
+
+{
+    JSValue obj;
+    JSPromiseFunctionData *s;
+    JSPromiseFunctionDataResolved *sr;
+    int i, ret;
+
+    sr = js_malloc(ctx, sizeof(*sr));
+    if (!sr)
+        return -1;
+    sr->ref_count = 1;
+    sr->already_resolved = FALSE; /* must be shared between the two functions */
+    ret = 0;
+    for(i = 0; i < 2; i++) {
+        obj = JS_NewObjectProtoClass(ctx, ctx->function_proto,
+                                     JS_CLASS_PROMISE_RESOLVE_FUNCTION + i);
+        if (JS_IsException(obj))
+            goto fail;
+        s = js_malloc(ctx, sizeof(*s));
+        if (!s) {
+            JS_FreeValue(ctx, obj);
+        fail:
+
+            if (i != 0)
+                JS_FreeValue(ctx, resolving_funcs[0]);
+            ret = -1;
+            break;
+        }
+        sr->ref_count++;
+        s->presolved = sr;
+        s->promise = JS_DupValue(ctx, promise);
+        JS_SetOpaque(obj, s);
+        js_function_set_properties(ctx, obj, JS_ATOM_empty_string, 1);
+        resolving_funcs[i] = obj;
+    }
+    js_promise_resolve_function_free_resolved(ctx->rt, sr);
+    return ret;
+}
+
+static void js_promise_resolve_function_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSPromiseFunctionData *s = JS_VALUE_GET_OBJ(val)->u.promise_function_data;
+    if (s) {
+        js_promise_resolve_function_free_resolved(rt, s->presolved);
+        JS_FreeValueRT(rt, s->promise);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_promise_resolve_function_mark(JSRuntime *rt, JSValueConst val,
+                                             JS_MarkFunc *mark_func)
+{
+    JSPromiseFunctionData *s = JS_VALUE_GET_OBJ(val)->u.promise_function_data;
+    if (s) {
+        JS_MarkValue(rt, s->promise, mark_func);
+    }
+}
+
+static JSValue js_promise_resolve_function_call(JSContext *ctx,
+                                                JSValueConst func_obj,
+                                                JSValueConst this_val,
+                                                int argc, JSValueConst *argv,
+                                                int flags)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(func_obj);
+    JSPromiseFunctionData *s;
+    JSValueConst resolution, args[3];
+    JSValue then;
+    BOOL is_reject;
+
+    s = p->u.promise_function_data;
+    if (!s || s->presolved->already_resolved)
+        return JS_UNDEFINED;
+    s->presolved->already_resolved = TRUE;
+    is_reject = p->class_id - JS_CLASS_PROMISE_RESOLVE_FUNCTION;
+    if (argc > 0)
+        resolution = argv[0];
+    else
+        resolution = JS_UNDEFINED;
+#ifdef DUMP_PROMISE
+    printf("js_promise_resolving_function_call: is_reject=%d resolution=", is_reject);
+    JS_DumpValue(ctx, resolution);
+    printf("\n");
+#endif
+    if (is_reject || !JS_IsObject(resolution)) {
+        goto done;
+    } else if (js_same_value(ctx, resolution, s->promise)) {
+        JS_ThrowTypeError(ctx, "promise self resolution");
+        goto fail_reject;
+    }
+    then = JS_GetProperty(ctx, resolution, JS_ATOM_then);
+    if (JS_IsException(then)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        reject_promise(ctx, s->promise, error);
+        JS_FreeValue(ctx, error);
+    } else if (!JS_IsFunction(ctx, then)) {
+        JS_FreeValue(ctx, then);
+    done:
+        fulfill_or_reject_promise(ctx, s->promise, resolution, is_reject);
+    } else {
+        args[0] = s->promise;
+        args[1] = resolution;
+        args[2] = then;
+        JS_EnqueueJob(ctx, js_promise_resolve_thenable_job, 3, args);
+        JS_FreeValue(ctx, then);
+    }
+    return JS_UNDEFINED;
+}
+
+static void js_promise_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSPromiseData *s = JS_GetOpaque(val, JS_CLASS_PROMISE);
+    struct list_head *el, *el1;
+    int i;
+
+    if (!s)
+        return;
+    for(i = 0; i < 2; i++) {
+        list_for_each_safe(el, el1, &s->promise_reactions[i]) {
+            JSPromiseReactionData *rd =
+                list_entry(el, JSPromiseReactionData, link);
+            promise_reaction_data_free(rt, rd);
+        }
+    }
+    JS_FreeValueRT(rt, s->promise_result);
+    js_free_rt(rt, s);
+}
+
+static void js_promise_mark(JSRuntime *rt, JSValueConst val,
+                            JS_MarkFunc *mark_func)
+{
+    JSPromiseData *s = JS_GetOpaque(val, JS_CLASS_PROMISE);
+    struct list_head *el;
+    int i;
+
+    if (!s)
+        return;
+    for(i = 0; i < 2; i++) {
+        list_for_each(el, &s->promise_reactions[i]) {
+            JSPromiseReactionData *rd =
+                list_entry(el, JSPromiseReactionData, link);
+            JS_MarkValue(rt, rd->resolving_funcs[0], mark_func);
+            JS_MarkValue(rt, rd->resolving_funcs[1], mark_func);
+            JS_MarkValue(rt, rd->handler, mark_func);
+        }
+    }
+    JS_MarkValue(rt, s->promise_result, mark_func);
+}
+
+static JSValue js_promise_constructor(JSContext *ctx, JSValueConst new_target,
+                                      int argc, JSValueConst *argv)
+{
+    JSValueConst executor;
+    JSValue obj;
+    JSPromiseData *s;
+    JSValue args[2], ret;
+    int i;
+
+    executor = argv[0];
+    if (check_function(ctx, executor))
+        return JS_EXCEPTION;
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_PROMISE);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s)
+        goto fail;
+    s->promise_state = JS_PROMISE_PENDING;
+    s->is_handled = FALSE;
+    for(i = 0; i < 2; i++)
+        init_list_head(&s->promise_reactions[i]);
+    s->promise_result = JS_UNDEFINED;
+    JS_SetOpaque(obj, s);
+    if (js_create_resolving_functions(ctx, args, obj))
+        goto fail;
+    ret = JS_Call(ctx, executor, JS_UNDEFINED, 2, (JSValueConst *)args);
+    if (JS_IsException(ret)) {
+        JSValue ret2, error;
+        error = JS_GetException(ctx);
+        ret2 = JS_Call(ctx, args[1], JS_UNDEFINED, 1, (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret2))
+            goto fail1;
+        JS_FreeValue(ctx, ret2);
+    }
+    JS_FreeValue(ctx, ret);
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+    return obj;
+ fail1:
+    JS_FreeValue(ctx, args[0]);
+    JS_FreeValue(ctx, args[1]);
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_promise_executor(JSContext *ctx,
+                                   JSValueConst this_val,
+                                   int argc, JSValueConst *argv,
+                                   int magic, JSValue *func_data)
+{
+    int i;
+
+    for(i = 0; i < 2; i++) {
+        if (!JS_IsUndefined(func_data[i]))
+            return JS_ThrowTypeError(ctx, "resolving function already set");
+        func_data[i] = JS_DupValue(ctx, argv[i]);
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_promise_executor_new(JSContext *ctx)
+{
+    JSValueConst func_data[2];
+
+    func_data[0] = JS_UNDEFINED;
+    func_data[1] = JS_UNDEFINED;
+    return JS_NewCFunctionData(ctx, js_promise_executor, 2,
+                               0, 2, func_data);
+}
+
+static JSValue js_new_promise_capability(JSContext *ctx,
+                                         JSValue *resolving_funcs,
+                                         JSValueConst ctor)
+{
+    JSValue executor, result_promise;
+    JSCFunctionDataRecord *s;
+    int i;
+
+    executor = js_promise_executor_new(ctx);
+    if (JS_IsException(executor))
+        return executor;
+
+    if (JS_IsUndefined(ctor)) {
+        result_promise = js_promise_constructor(ctx, ctor, 1,
+                                                (JSValueConst *)&executor);
+    } else {
+        result_promise = JS_CallConstructor(ctx, ctor, 1,
+                                            (JSValueConst *)&executor);
+    }
+    if (JS_IsException(result_promise))
+        goto fail;
+    s = JS_GetOpaque(executor, JS_CLASS_C_FUNCTION_DATA);
+    for(i = 0; i < 2; i++) {
+        if (check_function(ctx, s->data[i]))
+            goto fail;
+    }
+    for(i = 0; i < 2; i++)
+        resolving_funcs[i] = JS_DupValue(ctx, s->data[i]);
+    JS_FreeValue(ctx, executor);
+    return result_promise;
+ fail:
+    JS_FreeValue(ctx, executor);
+    JS_FreeValue(ctx, result_promise);
+    return JS_EXCEPTION;
+}
+
+JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs)
+{
+    return js_new_promise_capability(ctx, resolving_funcs, JS_UNDEFINED);
+}
+
+static JSValue js_promise_resolve(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv, int magic)
+{
+    JSValue result_promise, resolving_funcs[2], ret;
+    BOOL is_reject = magic;
+
+    if (!JS_IsObject(this_val))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    if (!is_reject && JS_GetOpaque(argv[0], JS_CLASS_PROMISE)) {
+        JSValue ctor;
+        BOOL is_same;
+        ctor = JS_GetProperty(ctx, argv[0], JS_ATOM_constructor);
+        if (JS_IsException(ctor))
+            return ctor;
+        is_same = js_same_value(ctx, ctor, this_val);
+        JS_FreeValue(ctx, ctor);
+        if (is_same)
+            return JS_DupValue(ctx, argv[0]);
+    }
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, this_val);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    ret = JS_Call(ctx, resolving_funcs[is_reject], JS_UNDEFINED, 1, argv);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    if (JS_IsException(ret)) {
+        JS_FreeValue(ctx, result_promise);
+        return ret;
+    }
+    JS_FreeValue(ctx, ret);
+    return result_promise;
+}
+
+#if 0
+static JSValue js_promise___newPromiseCapability(JSContext *ctx,
+                                                 JSValueConst this_val,
+                                                 int argc, JSValueConst *argv)
+{
+    JSValue result_promise, resolving_funcs[2], obj;
+    JSValueConst ctor;
+    ctor = argv[0];
+    if (!JS_IsObject(ctor))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, ctor);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    obj = JS_NewObject(ctx);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        JS_FreeValue(ctx, result_promise);
+        return JS_EXCEPTION;
+    }
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_promise, result_promise, JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_resolve, resolving_funcs[0], JS_PROP_C_W_E);
+    JS_DefinePropertyValue(ctx, obj, JS_ATOM_reject, resolving_funcs[1], JS_PROP_C_W_E);
+    return obj;
+}
+#endif
+
+static __exception int remainingElementsCount_add(JSContext *ctx,
+                                                  JSValueConst resolve_element_env,
+                                                  int addend)
+{
+    JSValue val;
+    int remainingElementsCount;
+
+    val = JS_GetPropertyUint32(ctx, resolve_element_env, 0);
+    if (JS_IsException(val))
+        return -1;
+    if (JS_ToInt32Free(ctx, &remainingElementsCount, val))
+        return -1;
+    remainingElementsCount += addend;
+    if (JS_SetPropertyUint32(ctx, resolve_element_env, 0,
+                             JS_NewInt32(ctx, remainingElementsCount)) < 0)
+        return -1;
+    return (remainingElementsCount == 0);
+}
+
+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;
+    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) {
+        JSValue str;
+
+        obj = JS_NewObject(ctx);
+        if (JS_IsException(obj))
+            return JS_EXCEPTION;
+        str = JS_NewString(ctx, is_reject ? "rejected" : "fulfilled");
+        if (JS_IsException(str))
+            goto fail1;
+        if (JS_DefinePropertyValue(ctx, obj, JS_ATOM_status,
+                                   str,
+                                   JS_PROP_C_W_E) < 0)
+            goto fail1;
+        if (JS_DefinePropertyValue(ctx, obj,
+                                   is_reject ? JS_ATOM_reason : JS_ATOM_value,
+                                   JS_DupValue(ctx, argv[0]),
+                                   JS_PROP_C_W_E) < 0) {
+        fail1:
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    } else {
+        obj = JS_DupValue(ctx, argv[0]);
+    }
+    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 (JS_IsException(ret))
+            return ret;
+        JS_FreeValue(ctx, ret);
+    }
+    return JS_UNDEFINED;
+}
+
+/* magic = 0: Promise.all 1: Promise.allSettled */
+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 next_method = JS_UNDEFINED, values = JS_UNDEFINED;
+    JSValue resolve_element_env = JS_UNDEFINED, resolve_element, reject_element;
+    JSValue promise_resolve = JS_UNDEFINED;
+    JSValueConst then_args[2], resolve_element_data[5];
+    BOOL done, is_allSettled = magic;
+    int index, is_zero;
+
+    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;
+    iter = JS_GetIterator(ctx, argv[0], FALSE);
+    if (JS_IsException(iter)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED, 1,
+                       (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_FreeValue(ctx, ret);
+    } else {
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        if (JS_IsException(next_method))
+            goto fail_reject;
+        values = JS_NewArray(ctx);
+        if (JS_IsException(values))
+            goto fail_reject;
+        resolve_element_env = JS_NewArray(ctx);
+        if (JS_IsException(resolve_element_env))
+            goto fail_reject;
+        /* remainingElementsCount field */
+        if (JS_DefinePropertyValueUint32(ctx, resolve_element_env, 0,
+                                         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'
+               access, but not on 'value' access */
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail_reject;
+            if (done)
+                break;
+            next_promise = JS_Call(ctx, promise_resolve,
+                                   this_val, 1, (JSValueConst *)&item);
+            JS_FreeValue(ctx, item);
+            if (JS_IsException(next_promise)) {
+            fail_reject1:
+                JS_IteratorClose(ctx, iter, TRUE);
+                goto fail_reject;
+            }
+            resolve_element_data[0] = JS_NewBool(ctx, FALSE);
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+            resolve_element_data[1] = JS_NewInt32(ctx, index);
+#else
+            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[4] = resolve_element_env;
+            resolve_element =
+                JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
+                                    is_allSettled, 5, resolve_element_data);
+            if (JS_IsException(resolve_element)) {
+                JS_FreeValue(ctx, next_promise);
+                goto fail_reject1;
+            }
+
+            if (is_allSettled) {
+                reject_element =
+                    JS_NewCFunctionData(ctx, js_promise_all_resolve_element, 1,
+                                        is_allSettled | 2, 5, resolve_element_data);
+                if (JS_IsException(reject_element)) {
+                    JS_FreeValue(ctx, next_promise);
+                    goto fail_reject1;
+                }
+            } else {
+                reject_element = JS_DupValue(ctx, resolving_funcs[1]);
+            }
+
+            if (remainingElementsCount_add(ctx, resolve_element_env, 1) < 0) {
+                JS_FreeValue(ctx, next_promise);
+                JS_FreeValue(ctx, resolve_element);
+                JS_FreeValue(ctx, reject_element);
+                goto fail_reject1;
+            }
+
+            then_args[0] = resolve_element;
+            then_args[1] = reject_element;
+            ret = JS_InvokeFree(ctx, next_promise, JS_ATOM_then, 2, then_args);
+            JS_FreeValue(ctx, resolve_element);
+            JS_FreeValue(ctx, reject_element);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject1;
+            index++;
+        }
+
+        is_zero = remainingElementsCount_add(ctx, resolve_element_env, -1);
+        if (is_zero < 0)
+            goto fail_reject;
+        if (is_zero) {
+            ret = JS_Call(ctx, resolving_funcs[0], JS_UNDEFINED,
+                          1, (JSValueConst *)&values);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject;
+        }
+    }
+ done:
+    JS_FreeValue(ctx, promise_resolve);
+    JS_FreeValue(ctx, resolve_element_env);
+    JS_FreeValue(ctx, values);
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return result_promise;
+ fail:
+    JS_FreeValue(ctx, result_promise);
+    result_promise = JS_EXCEPTION;
+    goto done;
+}
+
+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 promise_resolve = JS_UNDEFINED;
+    BOOL done;
+
+    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;
+    iter = JS_GetIterator(ctx, argv[0], FALSE);
+    if (JS_IsException(iter)) {
+        JSValue error;
+    fail_reject:
+        error = JS_GetException(ctx);
+        ret = JS_Call(ctx, resolving_funcs[1], JS_UNDEFINED, 1,
+                       (JSValueConst *)&error);
+        JS_FreeValue(ctx, error);
+        if (JS_IsException(ret))
+            goto fail;
+        JS_FreeValue(ctx, ret);
+    } else {
+        next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+        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 */
+            item = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+            if (JS_IsException(item))
+                goto fail_reject;
+            if (done)
+                break;
+            next_promise = JS_Call(ctx, promise_resolve,
+                                   this_val, 1, (JSValueConst *)&item);
+            JS_FreeValue(ctx, item);
+            if (JS_IsException(next_promise)) {
+            fail_reject1:
+                JS_IteratorClose(ctx, iter, TRUE);
+                goto fail_reject;
+            }
+            ret = JS_InvokeFree(ctx, next_promise, JS_ATOM_then, 2,
+                                (JSValueConst *)resolving_funcs);
+            if (check_exception_free(ctx, ret))
+                goto fail_reject1;
+        }
+    }
+ done:
+    JS_FreeValue(ctx, promise_resolve);
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    return result_promise;
+ fail:
+    //JS_FreeValue(ctx, next_method); // why not???
+    JS_FreeValue(ctx, result_promise);
+    result_promise = JS_EXCEPTION;
+    goto done;
+}
+
+static __exception int perform_promise_then(JSContext *ctx,
+                                            JSValueConst promise,
+                                            JSValueConst *resolve_reject,
+                                            JSValueConst *cap_resolving_funcs)
+{
+    JSPromiseData *s = JS_GetOpaque(promise, JS_CLASS_PROMISE);
+    JSPromiseReactionData *rd_array[2], *rd;
+    int i, j;
+
+    rd_array[0] = NULL;
+    rd_array[1] = NULL;
+    for(i = 0; i < 2; i++) {
+        JSValueConst handler;
+        rd = js_mallocz(ctx, sizeof(*rd));
+        if (!rd) {
+            if (i == 1)
+                promise_reaction_data_free(ctx->rt, rd_array[0]);
+            return -1;
+        }
+        for(j = 0; j < 2; j++)
+            rd->resolving_funcs[j] = JS_DupValue(ctx, cap_resolving_funcs[j]);
+        handler = resolve_reject[i];
+        if (!JS_IsFunction(ctx, handler))
+            handler = JS_UNDEFINED;
+        rd->handler = JS_DupValue(ctx, handler);
+        rd_array[i] = rd;
+    }
+
+    if (s->promise_state == JS_PROMISE_PENDING) {
+        for(i = 0; i < 2; i++)
+            list_add_tail(&rd_array[i]->link, &s->promise_reactions[i]);
+    } else {
+        JSValueConst args[5];
+        if (s->promise_state == JS_PROMISE_REJECTED && !s->is_handled) {
+            JSRuntime *rt = ctx->rt;
+            if (rt->host_promise_rejection_tracker) {
+                rt->host_promise_rejection_tracker(ctx, promise, s->promise_result,
+                                                   TRUE, rt->host_promise_rejection_tracker_opaque);
+            }
+        }
+        i = s->promise_state - JS_PROMISE_FULFILLED;
+        rd = rd_array[i];
+        args[0] = rd->resolving_funcs[0];
+        args[1] = rd->resolving_funcs[1];
+        args[2] = rd->handler;
+        args[3] = JS_NewBool(ctx, i);
+        args[4] = s->promise_result;
+        JS_EnqueueJob(ctx, promise_reaction_job, 5, args);
+        for(i = 0; i < 2; i++)
+            promise_reaction_data_free(ctx->rt, rd_array[i]);
+    }
+    s->is_handled = TRUE;
+    return 0;
+}
+
+static JSValue js_promise_then(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    JSValue ctor, result_promise, resolving_funcs[2];
+    JSPromiseData *s;
+    int i, ret;
+
+    s = JS_GetOpaque2(ctx, this_val, JS_CLASS_PROMISE);
+    if (!s)
+        return JS_EXCEPTION;
+
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    result_promise = js_new_promise_capability(ctx, resolving_funcs, ctor);
+    JS_FreeValue(ctx, ctor);
+    if (JS_IsException(result_promise))
+        return result_promise;
+    ret = perform_promise_then(ctx, this_val, argv,
+                               (JSValueConst *)resolving_funcs);
+    for(i = 0; i < 2; i++)
+        JS_FreeValue(ctx, resolving_funcs[i]);
+    if (ret) {
+        JS_FreeValue(ctx, result_promise);
+        return JS_EXCEPTION;
+    }
+    return result_promise;
+}
+
+static JSValue js_promise_catch(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValueConst args[2];
+    args[0] = JS_UNDEFINED;
+    args[1] = argv[0];
+    return JS_Invoke(ctx, this_val, JS_ATOM_then, 2, args);
+}
+
+static JSValue js_promise_finally_value_thunk(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv,
+                                              int magic, JSValue *func_data)
+{
+    return JS_DupValue(ctx, func_data[0]);
+}
+
+static JSValue js_promise_finally_thrower(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv,
+                                          int magic, JSValue *func_data)
+{
+    return JS_Throw(ctx, JS_DupValue(ctx, func_data[0]));
+}
+
+static JSValue js_promise_then_finally_func(JSContext *ctx, JSValueConst this_val,
+                                            int argc, JSValueConst *argv,
+                                            int magic, JSValue *func_data)
+{
+    JSValueConst ctor = func_data[0];
+    JSValueConst onFinally = func_data[1];
+    JSValue res, promise, resolving_funcs[2], 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);
+    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 (magic == 0) {
+        then_func = JS_NewCFunctionData(ctx, js_promise_finally_value_thunk, 1,
+                                        0, 1, argv);
+    } else {
+        then_func = JS_NewCFunctionData(ctx, js_promise_finally_thrower, 1,
+                                        0, 1, argv);
+    }
+    if (JS_IsException(then_func)) {
+        JS_FreeValue(ctx, promise);
+        return then_func;
+    }
+    ret = JS_InvokeFree(ctx, promise, JS_ATOM_then, 1, (JSValueConst *)&then_func);
+    JS_FreeValue(ctx, then_func);
+    return ret;
+}
+
+static JSValue js_promise_finally(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValueConst onFinally = argv[0];
+    JSValue ctor, ret;
+    JSValue then_funcs[2];
+    JSValueConst func_data[2];
+    int i;
+
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (!JS_IsFunction(ctx, onFinally)) {
+        then_funcs[0] = JS_DupValue(ctx, onFinally);
+        then_funcs[1] = JS_DupValue(ctx, onFinally);
+    } else {
+        func_data[0] = ctor;
+        func_data[1] = onFinally;
+        for(i = 0; i < 2; i++) {
+            then_funcs[i] = JS_NewCFunctionData(ctx, js_promise_then_finally_func, 1, i, 2, func_data);
+            if (JS_IsException(then_funcs[i])) {
+                if (i == 1)
+                    JS_FreeValue(ctx, then_funcs[0]);
+                JS_FreeValue(ctx, ctor);
+                return JS_EXCEPTION;
+            }
+        }
+    }
+    JS_FreeValue(ctx, ctor);
+    ret = JS_Invoke(ctx, this_val, JS_ATOM_then, 2, (JSValueConst *)then_funcs);
+    JS_FreeValue(ctx, then_funcs[0]);
+    JS_FreeValue(ctx, then_funcs[1]);
+    return ret;
+}
+
+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_DEF("race", 1, js_promise_race ),
+    //JS_CFUNC_DEF("__newPromiseCapability", 1, js_promise___newPromiseCapability ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL),
+};
+
+static const JSCFunctionListEntry js_promise_proto_funcs[] = {
+    JS_CFUNC_DEF("then", 2, js_promise_then ),
+    JS_CFUNC_DEF("catch", 1, js_promise_catch ),
+    JS_CFUNC_DEF("finally", 1, js_promise_finally ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Promise", JS_PROP_CONFIGURABLE ),
+};
+
+/* AsyncFunction */
+static const JSCFunctionListEntry js_async_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncFunction", JS_PROP_CONFIGURABLE ),
+};
+
+static JSValue js_async_from_sync_iterator_unwrap(JSContext *ctx,
+                                                  JSValueConst this_val,
+                                                  int argc, JSValueConst *argv,
+                                                  int magic, JSValue *func_data)
+{
+    return js_create_iterator_result(ctx, JS_DupValue(ctx, argv[0]),
+                                     JS_ToBool(ctx, func_data[0]));
+}
+
+static JSValue js_async_from_sync_iterator_unwrap_func_create(JSContext *ctx,
+                                                              BOOL done)
+{
+    JSValueConst func_data[1];
+
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    func_data[0] = JS_NewBool(ctx, done);
+#else
+    func_data[0] = (JSValueConst)JS_NewBool(ctx, done);
+#endif
+    return JS_NewCFunctionData(ctx, js_async_from_sync_iterator_unwrap,
+                               1, 0, 1, func_data);
+}
+
+/* AsyncIteratorPrototype */
+
+static const JSCFunctionListEntry js_async_iterator_proto_funcs[] = {
+    JS_CFUNC_DEF("[Symbol.asyncIterator]", 0, js_iterator_proto_iterator ),
+};
+
+/* AsyncFromSyncIteratorPrototype */
+
+typedef struct JSAsyncFromSyncIteratorData {
+    JSValue sync_iter;
+    JSValue next_method;
+} JSAsyncFromSyncIteratorData;
+
+static void js_async_from_sync_iterator_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSAsyncFromSyncIteratorData *s =
+        JS_GetOpaque(val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (s) {
+        JS_FreeValueRT(rt, s->sync_iter);
+        JS_FreeValueRT(rt, s->next_method);
+        js_free_rt(rt, s);
+    }
+}
+
+static void js_async_from_sync_iterator_mark(JSRuntime *rt, JSValueConst val,
+                                             JS_MarkFunc *mark_func)
+{
+    JSAsyncFromSyncIteratorData *s =
+        JS_GetOpaque(val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (s) {
+        JS_MarkValue(rt, s->sync_iter, mark_func);
+        JS_MarkValue(rt, s->next_method, mark_func);
+    }
+}
+
+static JSValue JS_CreateAsyncFromSyncIterator(JSContext *ctx,
+                                              JSValueConst sync_iter)
+{
+    JSValue async_iter, next_method;
+    JSAsyncFromSyncIteratorData *s;
+
+    next_method = JS_GetProperty(ctx, sync_iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        return JS_EXCEPTION;
+    async_iter = JS_NewObjectClass(ctx, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (JS_IsException(async_iter)) {
+        JS_FreeValue(ctx, next_method);
+        return async_iter;
+    }
+    s = js_mallocz(ctx, sizeof(*s));
+    if (!s) {
+        JS_FreeValue(ctx, async_iter);
+        JS_FreeValue(ctx, next_method);
+        return JS_EXCEPTION;
+    }
+    s->sync_iter = JS_DupValue(ctx, sync_iter);
+    s->next_method = next_method;
+    JS_SetOpaque(async_iter, s);
+    return async_iter;
+}
+
+static JSValue js_async_from_sync_iterator_next(JSContext *ctx, JSValueConst this_val,
+                                                int argc, JSValueConst *argv,
+                                                int magic)
+{
+    JSValue promise, resolving_funcs[2], value, err, method;
+    JSAsyncFromSyncIteratorData *s;
+    int done;
+    int is_reject;
+
+    promise = JS_NewPromiseCapability(ctx, resolving_funcs);
+    if (JS_IsException(promise))
+        return JS_EXCEPTION;
+    s = JS_GetOpaque(this_val, JS_CLASS_ASYNC_FROM_SYNC_ITERATOR);
+    if (!s) {
+        JS_ThrowTypeError(ctx, "not an Async-from-Sync Iterator");
+        goto reject;
+    }
+
+    if (magic == GEN_MAGIC_NEXT) {
+        method = JS_DupValue(ctx, s->next_method);
+    } else {
+        method = JS_GetProperty(ctx, s->sync_iter,
+                                magic == GEN_MAGIC_RETURN ? JS_ATOM_return :
+                                JS_ATOM_throw);
+        if (JS_IsException(method))
+            goto reject;
+        if (JS_IsUndefined(method) || JS_IsNull(method)) {
+            if (magic == GEN_MAGIC_RETURN) {
+                err = js_create_iterator_result(ctx, JS_DupValue(ctx, argv[0]), TRUE);
+                is_reject = 0;
+            } else {
+                err = JS_DupValue(ctx, argv[0]);
+                is_reject = 1;
+            }
+            goto done_resolve;
+        }
+    }
+    value = JS_IteratorNext2(ctx, s->sync_iter, method, 1, argv, &done);
+    JS_FreeValue(ctx, method);
+    if (JS_IsException(value))
+        goto reject;
+    if (done == 2) {
+        JSValue obj = value;
+        value = JS_IteratorGetCompleteValue(ctx, obj, &done);
+        JS_FreeValue(ctx, obj);
+        if (JS_IsException(value))
+            goto reject;
+    }
+
+    if (JS_IsException(value)) {
+        JSValue res2;
+    reject:
+        err = JS_GetException(ctx);
+        is_reject = 1;
+    done_resolve:
+        res2 = JS_Call(ctx, resolving_funcs[is_reject], JS_UNDEFINED,
+                       1, (JSValueConst *)&err);
+        JS_FreeValue(ctx, err);
+        JS_FreeValue(ctx, res2);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        return promise;
+    }
+    {
+        JSValue value_wrapper_promise, resolve_reject[2];
+        int res;
+
+        value_wrapper_promise = js_promise_resolve(ctx, ctx->promise_ctor,
+                                                   1, (JSValueConst *)&value, 0);
+        if (JS_IsException(value_wrapper_promise)) {
+            JS_FreeValue(ctx, value);
+            goto reject;
+        }
+
+        resolve_reject[0] =
+            js_async_from_sync_iterator_unwrap_func_create(ctx, done);
+        if (JS_IsException(resolve_reject[0])) {
+            JS_FreeValue(ctx, value_wrapper_promise);
+            goto fail;
+        }
+        JS_FreeValue(ctx, value);
+        resolve_reject[1] = JS_UNDEFINED;
+
+        res = perform_promise_then(ctx, value_wrapper_promise,
+                                   (JSValueConst *)resolve_reject,
+                                   (JSValueConst *)resolving_funcs);
+        JS_FreeValue(ctx, resolve_reject[0]);
+        JS_FreeValue(ctx, value_wrapper_promise);
+        JS_FreeValue(ctx, resolving_funcs[0]);
+        JS_FreeValue(ctx, resolving_funcs[1]);
+        if (res) {
+            JS_FreeValue(ctx, promise);
+            return JS_EXCEPTION;
+        }
+    }
+    return promise;
+ fail:
+    JS_FreeValue(ctx, value);
+    JS_FreeValue(ctx, resolving_funcs[0]);
+    JS_FreeValue(ctx, resolving_funcs[1]);
+    JS_FreeValue(ctx, promise);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_async_from_sync_iterator_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("next", 1, js_async_from_sync_iterator_next, GEN_MAGIC_NEXT ),
+    JS_CFUNC_MAGIC_DEF("return", 1, js_async_from_sync_iterator_next, GEN_MAGIC_RETURN ),
+    JS_CFUNC_MAGIC_DEF("throw", 1, js_async_from_sync_iterator_next, GEN_MAGIC_THROW ),
+};
+
+/* AsyncGeneratorFunction */
+
+static const JSCFunctionListEntry js_async_generator_function_proto_funcs[] = {
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncGeneratorFunction", JS_PROP_CONFIGURABLE ),
+};
+
+/* AsyncGenerator prototype */
+
+static const JSCFunctionListEntry js_async_generator_proto_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("next", 1, js_async_generator_next, GEN_MAGIC_NEXT ),
+    JS_CFUNC_MAGIC_DEF("return", 1, js_async_generator_next, GEN_MAGIC_RETURN ),
+    JS_CFUNC_MAGIC_DEF("throw", 1, js_async_generator_next, GEN_MAGIC_THROW ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "AsyncGenerator", JS_PROP_CONFIGURABLE ),
+};
+
+static JSClassShortDef const js_async_class_def[] = {
+    { JS_ATOM_Promise, js_promise_finalizer, js_promise_mark },                      /* JS_CLASS_PROMISE */
+    { JS_ATOM_PromiseResolveFunction, js_promise_resolve_function_finalizer, js_promise_resolve_function_mark }, /* JS_CLASS_PROMISE_RESOLVE_FUNCTION */
+    { JS_ATOM_PromiseRejectFunction, js_promise_resolve_function_finalizer, js_promise_resolve_function_mark }, /* JS_CLASS_PROMISE_REJECT_FUNCTION */
+    { JS_ATOM_AsyncFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_ASYNC_FUNCTION */
+    { JS_ATOM_AsyncFunctionResolve, js_async_function_resolve_finalizer, js_async_function_resolve_mark }, /* JS_CLASS_ASYNC_FUNCTION_RESOLVE */
+    { JS_ATOM_AsyncFunctionReject, js_async_function_resolve_finalizer, js_async_function_resolve_mark }, /* JS_CLASS_ASYNC_FUNCTION_REJECT */
+    { JS_ATOM_empty_string, js_async_from_sync_iterator_finalizer, js_async_from_sync_iterator_mark }, /* JS_CLASS_ASYNC_FROM_SYNC_ITERATOR */
+    { JS_ATOM_AsyncGeneratorFunction, js_bytecode_function_finalizer, js_bytecode_function_mark },  /* JS_CLASS_ASYNC_GENERATOR_FUNCTION */
+    { JS_ATOM_AsyncGenerator, js_async_generator_finalizer, js_async_generator_mark },  /* JS_CLASS_ASYNC_GENERATOR */
+};
+
+void JS_AddIntrinsicPromise(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+
+    if (!JS_IsRegisteredClass(rt, JS_CLASS_PROMISE)) {
+        init_class_range(rt, js_async_class_def, JS_CLASS_PROMISE,
+                         countof(js_async_class_def));
+        rt->class_array[JS_CLASS_PROMISE_RESOLVE_FUNCTION].call = js_promise_resolve_function_call;
+        rt->class_array[JS_CLASS_PROMISE_REJECT_FUNCTION].call = js_promise_resolve_function_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION].call = js_async_function_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION_RESOLVE].call = js_async_function_resolve_call;
+        rt->class_array[JS_CLASS_ASYNC_FUNCTION_REJECT].call = js_async_function_resolve_call;
+        rt->class_array[JS_CLASS_ASYNC_GENERATOR_FUNCTION].call = js_async_generator_function_call;
+    }
+
+    /* Promise */
+    ctx->class_proto[JS_CLASS_PROMISE] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_PROMISE],
+                               js_promise_proto_funcs,
+                               countof(js_promise_proto_funcs));
+    obj1 = JS_NewCFunction2(ctx, js_promise_constructor, "Promise", 1,
+                            JS_CFUNC_constructor, 0);
+    ctx->promise_ctor = JS_DupValue(ctx, obj1);
+    JS_SetPropertyFunctionList(ctx, obj1,
+                               js_promise_funcs,
+                               countof(js_promise_funcs));
+    JS_NewGlobalCConstructor2(ctx, obj1, "Promise",
+                              ctx->class_proto[JS_CLASS_PROMISE]);
+
+    /* AsyncFunction */
+    ctx->class_proto[JS_CLASS_ASYNC_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor,
+                            "AsyncFunction", 1,
+                            JS_CFUNC_constructor_or_func_magic, JS_FUNC_ASYNC,
+                            ctx->function_ctor);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_FUNCTION],
+                               js_async_function_proto_funcs,
+                               countof(js_async_function_proto_funcs));
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_ASYNC_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+
+    /* AsyncIteratorPrototype */
+    ctx->async_iterator_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->async_iterator_proto,
+                               js_async_iterator_proto_funcs,
+                               countof(js_async_iterator_proto_funcs));
+
+    /* AsyncFromSyncIteratorPrototype */
+    ctx->class_proto[JS_CLASS_ASYNC_FROM_SYNC_ITERATOR] =
+        JS_NewObjectProto(ctx, ctx->async_iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ASYNC_FROM_SYNC_ITERATOR],
+                               js_async_from_sync_iterator_proto_funcs,
+                               countof(js_async_from_sync_iterator_proto_funcs));
+
+    /* AsyncGeneratorPrototype */
+    ctx->class_proto[JS_CLASS_ASYNC_GENERATOR] =
+        JS_NewObjectProto(ctx, ctx->async_iterator_proto);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_GENERATOR],
+                               js_async_generator_proto_funcs,
+                               countof(js_async_generator_proto_funcs));
+
+    /* AsyncGeneratorFunction */
+    ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION] =
+        JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunction3(ctx, (JSCFunction *)js_function_constructor,
+                            "AsyncGeneratorFunction", 1,
+                            JS_CFUNC_constructor_or_func_magic,
+                            JS_FUNC_ASYNC_GENERATOR,
+                            ctx->function_ctor);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                               js_async_generator_function_proto_funcs,
+                               countof(js_async_generator_function_proto_funcs));
+    JS_SetConstructor2(ctx, ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                       ctx->class_proto[JS_CLASS_ASYNC_GENERATOR],
+                       JS_PROP_CONFIGURABLE, JS_PROP_CONFIGURABLE);
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_ASYNC_GENERATOR_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+}
+
+/* URI handling */
+
+static int string_get_hex(JSString *p, int k, int n) {
+    int c = 0, h;
+    while (n-- > 0) {
+        if ((h = from_hex(string_get(p, k++))) < 0)
+            return -1;
+        c = (c << 4) | h;
+    }
+    return c;
+}
+
+static int isURIReserved(int c) {
+    return c < 0x100 && memchr(";/?:@&=+$,#", c, sizeof(";/?:@&=+$,#") - 1) != NULL;
+}
+
+#if defined(_MSC_VER)
+static int js_throw_URIError(JSContext *ctx, const char *fmt, ...)
+#else
+static int __attribute__((format(printf, 2, 3))) js_throw_URIError(JSContext *ctx, const char *fmt, ...)
+#endif
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    JS_ThrowError(ctx, JS_URI_ERROR, fmt, ap);
+    va_end(ap);
+    return -1;
+}
+
+static int hex_decode(JSContext *ctx, JSString *p, int k) {
+    int c;
+
+    if (k >= p->len || string_get(p, k) != '%')
+        return js_throw_URIError(ctx, "expecting %%");
+    if (k + 2 >= p->len || (c = string_get_hex(p, k + 1, 2)) < 0)
+        return js_throw_URIError(ctx, "expecting hex digit");
+
+    return c;
+}
+
+static JSValue js_global_decodeURI(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int isComponent)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int k, c, c1, n, c_min;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    string_buffer_init(ctx, b, 0);
+
+    p = JS_VALUE_GET_STRING(str);
+    for (k = 0; k < p->len;) {
+        c = string_get(p, k);
+        if (c == '%') {
+            c = hex_decode(ctx, p, k);
+            if (c < 0)
+                goto fail;
+            k += 3;
+            if (c < 0x80) {
+                if (!isComponent && isURIReserved(c)) {
+                    c = '%';
+                    k -= 2;
+                }
+            } else {
+                /* Decode URI-encoded UTF-8 sequence */
+                if (c >= 0xc0 && c <= 0xdf) {
+                    n = 1;
+                    c_min = 0x80;
+                    c &= 0x1f;
+                } else if (c >= 0xe0 && c <= 0xef) {
+                    n = 2;
+                    c_min = 0x800;
+                    c &= 0xf;
+                } else if (c >= 0xf0 && c <= 0xf7) {
+                    n = 3;
+                    c_min = 0x10000;
+                    c &= 0x7;
+                } else {
+                    n = 0;
+                    c_min = 1;
+                    c = 0;
+                }
+                while (n-- > 0) {
+                    c1 = hex_decode(ctx, p, k);
+                    if (c1 < 0)
+                        goto fail;
+                    k += 3;
+                    if ((c1 & 0xc0) != 0x80) {
+                        c = 0;
+                        break;
+                    }
+                    c = (c << 6) | (c1 & 0x3f);
+                }
+                if (c < c_min || c > 0x10FFFF ||
+                    (c >= 0xd800 && c < 0xe000)) {
+                    js_throw_URIError(ctx, "malformed UTF-8");
+                    goto fail;
+                }
+            }
+        } else {
+            k++;
+        }
+        string_buffer_putc(b, c);
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static int isUnescaped(int c) {
+    static char const unescaped_chars[] =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz"
+        "0123456789"
+        "@*_+-./";
+    return c < 0x100 &&
+        memchr(unescaped_chars, c, sizeof(unescaped_chars) - 1);
+}
+
+static int isURIUnescaped(int c, int isComponent) {
+    return c < 0x100 &&
+        ((c >= 0x61 && c <= 0x7a) ||
+         (c >= 0x41 && c <= 0x5a) ||
+         (c >= 0x30 && c <= 0x39) ||
+         memchr("-_.!~*'()", c, sizeof("-_.!~*'()") - 1) != NULL ||
+         (!isComponent && isURIReserved(c)));
+}
+
+static int encodeURI_hex(StringBuffer *b, int c) {
+    uint8_t buf[6];
+    int n = 0;
+    const char *hex = "0123456789ABCDEF";
+
+    buf[n++] = '%';
+    if (c >= 256) {
+        buf[n++] = 'u';
+        buf[n++] = hex[(c >> 12) & 15];
+        buf[n++] = hex[(c >>  8) & 15];
+    }
+    buf[n++] = hex[(c >> 4) & 15];
+    buf[n++] = hex[(c >> 0) & 15];
+    return string_buffer_write8(b, buf, n);
+}
+
+static JSValue js_global_encodeURI(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv,
+                                   int isComponent)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int k, c, c1;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    p = JS_VALUE_GET_STRING(str);
+    string_buffer_init(ctx, b, p->len);
+    for (k = 0; k < p->len;) {
+        c = string_get(p, k);
+        k++;
+        if (isURIUnescaped(c, isComponent)) {
+            string_buffer_putc16(b, c);
+        } else {
+            if (c >= 0xdc00 && c <= 0xdfff) {
+                js_throw_URIError(ctx, "invalid character");
+                goto fail;
+            } else if (c >= 0xd800 && c <= 0xdbff) {
+                if (k >= p->len) {
+                    js_throw_URIError(ctx, "expecting surrogate pair");
+                    goto fail;
+                }
+                c1 = string_get(p, k);
+                k++;
+                if (c1 < 0xdc00 || c1 > 0xdfff) {
+                    js_throw_URIError(ctx, "expecting surrogate pair");
+                    goto fail;
+                }
+                c = (((c & 0x3ff) << 10) | (c1 & 0x3ff)) + 0x10000;
+            }
+            if (c < 0x80) {
+                encodeURI_hex(b, c);
+            } else {
+                /* XXX: use C UTF-8 conversion ? */
+                if (c < 0x800) {
+                    encodeURI_hex(b, (c >> 6) | 0xc0);
+                } else {
+                    if (c < 0x10000) {
+                        encodeURI_hex(b, (c >> 12) | 0xe0);
+                    } else {
+                        encodeURI_hex(b, (c >> 18) | 0xf0);
+                        encodeURI_hex(b, ((c >> 12) & 0x3f) | 0x80);
+                    }
+                    encodeURI_hex(b, ((c >> 6) & 0x3f) | 0x80);
+                }
+                encodeURI_hex(b, (c & 0x3f) | 0x80);
+            }
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+
+fail:
+    JS_FreeValue(ctx, str);
+    string_buffer_free(b);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_global_escape(JSContext *ctx, JSValueConst this_val,
+                                int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, len, c;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    p = JS_VALUE_GET_STRING(str);
+    string_buffer_init(ctx, b, p->len);
+    for (i = 0, len = p->len; i < len; i++) {
+        c = string_get(p, i);
+        if (isUnescaped(c)) {
+            string_buffer_putc16(b, c);
+        } else {
+            encodeURI_hex(b, c);
+        }
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+}
+
+static JSValue js_global_unescape(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue str;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p;
+    int i, len, c, n;
+
+    str = JS_ToString(ctx, argv[0]);
+    if (JS_IsException(str))
+        return str;
+
+    string_buffer_init(ctx, b, 0);
+    p = JS_VALUE_GET_STRING(str);
+    for (i = 0, len = p->len; i < len; i++) {
+        c = string_get(p, i);
+        if (c == '%') {
+            if (i + 6 <= len
+            &&  string_get(p, i + 1) == 'u'
+            &&  (n = string_get_hex(p, i + 2, 4)) >= 0) {
+                c = n;
+                i += 6 - 1;
+            } else
+            if (i + 3 <= len
+            &&  (n = string_get_hex(p, i + 1, 2)) >= 0) {
+                c = n;
+                i += 3 - 1;
+            }
+        }
+        string_buffer_putc16(b, c);
+    }
+    JS_FreeValue(ctx, str);
+    return string_buffer_end(b);
+}
+
+/* global object */
+
+static const JSCFunctionListEntry js_global_funcs[] = {
+    JS_CFUNC_DEF("parseInt", 2, js_parseInt ),
+    JS_CFUNC_DEF("parseFloat", 1, js_parseFloat ),
+    JS_CFUNC_DEF("isNaN", 1, js_global_isNaN ),
+    JS_CFUNC_DEF("isFinite", 1, js_global_isFinite ),
+
+    JS_CFUNC_MAGIC_DEF("decodeURI", 1, js_global_decodeURI, 0 ),
+    JS_CFUNC_MAGIC_DEF("decodeURIComponent", 1, js_global_decodeURI, 1 ),
+    JS_CFUNC_MAGIC_DEF("encodeURI", 1, js_global_encodeURI, 0 ),
+    JS_CFUNC_MAGIC_DEF("encodeURIComponent", 1, js_global_encodeURI, 1 ),
+    JS_CFUNC_DEF("escape", 1, js_global_escape ),
+    JS_CFUNC_DEF("unescape", 1, js_global_unescape ),
+    JS_PROP_DOUBLE_DEF("Infinity", 1.0 / 0.0, 0 ),
+    JS_PROP_DOUBLE_DEF("NaN", NAN, 0 ),
+    JS_PROP_UNDEFINED_DEF("undefined", 0 ),
+
+    /* for the 'Date' implementation */
+    JS_CFUNC_DEF("__date_clock", 0, js___date_clock ),
+    //JS_CFUNC_DEF("__date_now", 0, js___date_now ),
+    //JS_CFUNC_DEF("__date_getTimezoneOffset", 1, js___date_getTimezoneOffset ),
+    //JS_CFUNC_DEF("__date_create", 3, js___date_create ),
+};
+
+/* Date */
+
+static int64_t math_mod(int64_t a, int64_t b) {
+    /* return positive modulo */
+    int64_t m = a % b;
+    return m + (m < 0) * b;
+}
+
+static int64_t floor_div(int64_t a, int64_t b) {
+    /* integer division rounding toward -Infinity */
+    int64_t m = a % b;
+    return (a - (m + (m < 0) * b)) / b;
+}
+
+static JSValue js_Date_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv);
+
+static __exception int JS_ThisTimeValue(JSContext *ctx, double *valp, JSValueConst this_val)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        JSObject *p = JS_VALUE_GET_OBJ(this_val);
+        if (p->class_id == JS_CLASS_DATE && JS_IsNumber(p->u.object_data))
+            return JS_ToFloat64(ctx, valp, p->u.object_data);
+    }
+    JS_ThrowTypeError(ctx, "not a Date object");
+    return -1;
+}
+
+static JSValue JS_SetThisTimeValue(JSContext *ctx, JSValueConst this_val, double v)
+{
+    if (JS_VALUE_GET_TAG(this_val) == JS_TAG_OBJECT) {
+        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);
+            return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a Date object");
+}
+
+static int64_t days_from_year(int64_t y) {
+    return 365 * (y - 1970) + floor_div(y - 1969, 4) -
+        floor_div(y - 1901, 100) + floor_div(y - 1601, 400);
+}
+
+static int64_t days_in_year(int64_t y) {
+    return 365 + !(y % 4) - !(y % 100) + !(y % 400);
+}
+
+/* return the year, update days */
+static int64_t year_from_days(int64_t *days) {
+    int64_t y, d1, nd, d = *days;
+    y = floor_div(d * 10000, 3652425) + 1970;
+    /* the initial approximation is very good, so only a few
+       iterations are necessary */
+    for(;;) {
+        d1 = d - days_from_year(y);
+        if (d1 < 0) {
+            y--;
+            d1 += days_in_year(y);
+        } else {
+            nd = days_in_year(y);
+            if (d1 < nd)
+                break;
+            d1 -= nd;
+            y++;
+        }
+    }
+    *days = d1;
+    return y;
+}
+
+static int const month_days[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static char const month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
+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 dval;
+    int64_t d, days, wd, y, i, md, h, m, s, ms, tz = 0;
+
+    if (JS_ThisTimeValue(ctx, &dval, obj))
+        return -1;
+
+    if (isnan(dval)) {
+        if (!force)
+            return FALSE; /* NaN */
+        d = 0;        /* initialize all fields to 0 */
+    } else {
+        d = dval;
+        if (is_local) {
+            tz = -getTimezoneOffset(d);
+            d += tz * 60000;
+        }
+    }
+
+    /* result is >= 0, we can use % */
+    h = math_mod(d, 86400000);
+    days = (d - h) / 86400000;
+    ms = h % 1000;
+    h = (h - ms) / 1000;
+    s = h % 60;
+    h = (h - s) / 60;
+    m = h % 60;
+    h = (h - m) / 60;
+    wd = math_mod(days + 4, 7); /* week day */
+    y = year_from_days(&days);
+
+    for(i = 0; i < 11; i++) {
+        md = month_days[i];
+        if (i == 1)
+            md += days_in_year(y) - 365;
+        if (days < md)
+            break;
+        days -= md;
+    }
+    fields[0] = y;
+    fields[1] = i;
+    fields[2] = days + 1;
+    fields[3] = h;
+    fields[4] = m;
+    fields[5] = s;
+    fields[6] = ms;
+    fields[7] = wd;
+    fields[8] = tz;
+    return TRUE;
+}
+
+static double time_clip(double t) {
+    if (t >= -8.64e15 && t <= 8.64e15)
+        return trunc(t) + 0.0;  /* convert -0 to +0 */
+    else
+        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;
+    days = days_from_year(y);
+
+    for(i = 0; i < m; i++) {
+        md = month_days[i];
+        if (i == 1)
+            md += days_in_year(y) - 365;
+        days += md;
+    }
+    days += fields[2] - 1;
+    h = ((fields[3] * 60 + fields[4]) * 60 + fields[5]) * 1000 + fields[6];
+    d = days * 86400000 + h;
+    if (is_local)
+        d += getTimezoneOffset(d) * 60000;
+    return time_clip(d);
+}
+
+static JSValue get_date_field(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv, int magic)
+{
+    // get_date_field(obj, n, is_local)
+    int64_t fields[9];
+    int res, n, is_local;
+
+    is_local = magic & 0x0F;
+    n = (magic >> 4) & 0x0F;
+    res = get_date_fields(ctx, this_val, fields, is_local, 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res)
+        return JS_NAN;
+
+    if (magic & 0x100) {    // getYear
+        fields[0] -= 1900;
+    }
+    return JS_NewInt64(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];
+    int res, first_field, end_field, is_local, i, n;
+    double d, a;
+
+    d = NAN;
+    first_field = (magic >> 8) & 0x0F;
+    end_field = (magic >> 4) & 0x0F;
+    is_local = magic & 0x0F;
+
+    res = get_date_fields(ctx, this_val, fields, is_local, first_field == 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (res && argc > 0) {
+        n = end_field - first_field;
+        if (argc < n)
+            n = argc;
+        for(i = 0; i < n; i++) {
+            if (JS_ToFloat64(ctx, &a, argv[i]))
+                return JS_EXCEPTION;
+            if (!isfinite(a))
+                goto done;
+            fields[first_field + i] = trunc(a);
+        }
+        d = set_date_fields(fields, is_local);
+    }
+done:
+    return JS_SetThisTimeValue(ctx, this_val, d);
+}
+
+/* fmt:
+   0: toUTCString: "Tue, 02 Jan 2018 23:04:46 GMT"
+   1: toString: "Wed Jan 03 2018 00:05:22 GMT+0100 (CET)"
+   2: toISOString: "2018-01-02T23:02:56.927Z"
+   3: toLocaleString: "1/2/2018, 11:40:40 PM"
+   part: 1=date, 2=time 3=all
+   XXX: should use a variant of strftime().
+ */
+static JSValue get_date_string(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv, int magic)
+{
+    // _string(obj, fmt, part)
+    char buf[64];
+    int64_t fields[9];
+    int res, fmt, part, pos;
+    int y, mon, d, h, m, s, ms, wd, tz;
+
+    fmt = (magic >> 4) & 0x0F;
+    part = magic & 0x0F;
+
+    res = get_date_fields(ctx, this_val, fields, fmt & 1, 0);
+    if (res < 0)
+        return JS_EXCEPTION;
+    if (!res) {
+        if (fmt == 2)
+            return JS_ThrowRangeError(ctx, "Date value is NaN");
+        else
+            return JS_NewString(ctx, "Invalid Date");
+    }
+
+    y = fields[0];
+    mon = fields[1];
+    d = fields[2];
+    h = fields[3];
+    m = fields[4];
+    s = fields[5];
+    ms = fields[6];
+    wd = fields[7];
+    tz = fields[8];
+
+    pos = 0;
+
+    if (part & 1) { /* date part */
+        switch(fmt) {
+        case 0:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%.3s, %02d %.3s %0*d ",
+                            day_names + wd * 3, d,
+                            month_names + mon * 3, 4 + (y < 0), y);
+            break;
+        case 1:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%.3s %.3s %02d %0*d",
+                            day_names + wd * 3,
+                            month_names + mon * 3, d, 4 + (y < 0), y);
+            if (part == 3) {
+                buf[pos++] = ' ';
+            }
+            break;
+        case 2:
+            if (y >= 0 && y <= 9999) {
+                pos += snprintf(buf + pos, sizeof(buf) - pos,
+                                "%04d", y);
+            } else {
+                pos += snprintf(buf + pos, sizeof(buf) - pos,
+                                "%+07d", y);
+            }
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "-%02d-%02dT", mon + 1, d);
+            break;
+        case 3:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d/%02d/%0*d", mon + 1, d, 4 + (y < 0), y);
+            if (part == 3) {
+                buf[pos++] = ',';
+                buf[pos++] = ' ';
+            }
+            break;
+        }
+    }
+    if (part & 2) { /* time part */
+        switch(fmt) {
+        case 0:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d GMT", h, m, s);
+            break;
+        case 1:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d GMT", h, m, s);
+            if (tz < 0) {
+                buf[pos++] = '-';
+                tz = -tz;
+            } else {
+                buf[pos++] = '+';
+            }
+            /* tz is >= 0, can use % */
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d%02d", tz / 60, tz % 60);
+            /* XXX: tack the time zone code? */
+            break;
+        case 2:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d.%03dZ", h, m, s, ms);
+            break;
+        case 3:
+            pos += snprintf(buf + pos, sizeof(buf) - pos,
+                            "%02d:%02d:%02d %cM", (h + 1) % 12 - 1, m, s,
+                            (h < 12) ? 'A' : 'P');
+            break;
+        }
+    }
+    return JS_NewStringLen(ctx, buf, pos);
+}
+
+/* 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;
+	_ftime(&tb);
+	return (int64_t)tb.time *1000 + (tb.millitm);
+#else
+    struct timeval tv;
+    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,
+                                   int argc, JSValueConst *argv)
+{
+    // Date(y, mon, d, h, m, s, ms)
+    JSValue rv;
+    int i, n;
+    double a, val;
+
+    if (JS_IsUndefined(new_target)) {
+        /* invoked as function */
+        argc = 0;
+    }
+    n = argc;
+    if (n == 0) {
+        val = date_now();
+    } else if (n == 1) {
+        JSValue v, dv;
+        if (JS_VALUE_GET_TAG(argv[0]) == JS_TAG_OBJECT) {
+            JSObject *p = JS_VALUE_GET_OBJ(argv[0]);
+            if (p->class_id == JS_CLASS_DATE && JS_IsNumber(p->u.object_data)) {
+                if (JS_ToFloat64(ctx, &val, p->u.object_data))
+                    return JS_EXCEPTION;
+                val = time_clip(val);
+                goto has_val;
+            }
+        }
+        v = JS_ToPrimitive(ctx, argv[0], HINT_NONE);
+        if (JS_IsString(v)) {
+            dv = js_Date_parse(ctx, JS_UNDEFINED, 1, (JSValueConst *)&v);
+            JS_FreeValue(ctx, v);
+            if (JS_IsException(dv))
+                return JS_EXCEPTION;
+            if (JS_ToFloat64Free(ctx, &val, dv))
+                return JS_EXCEPTION;
+        } else {
+            if (JS_ToFloat64Free(ctx, &val, v))
+                return JS_EXCEPTION;
+        }
+        val = time_clip(val);
+    } else {
+        int64_t fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+        if (n > 7)
+            n = 7;
+        for(i = 0; i < n; i++) {
+            if (JS_ToFloat64(ctx, &a, argv[i]))
+                return JS_EXCEPTION;
+            if (!isfinite(a))
+                break;
+            fields[i] = trunc(a);
+            if (i == 0 && fields[0] >= 0 && fields[0] < 100)
+                fields[0] += 1900;
+        }
+        val = (i == n) ? set_date_fields(fields, 1) : NAN;
+    }
+has_val:
+#if 0
+    JSValueConst args[3];
+    args[0] = new_target;
+    args[1] = ctx->class_proto[JS_CLASS_DATE];
+    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));
+#endif
+    if (!JS_IsException(rv) && JS_IsUndefined(new_target)) {
+        /* invoked as a function, return (new Date()).toString(); */
+        JSValue s;
+        s = get_date_string(ctx, rv, 0, NULL, 0x13);
+        JS_FreeValue(ctx, rv);
+        rv = s;
+    }
+    return rv;
+}
+
+static JSValue js_Date_UTC(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    // UTC(y, mon, d, h, m, s, ms)
+    int64_t fields[] = { 0, 0, 1, 0, 0, 0, 0 };
+    int i, n;
+    double a;
+
+    n = argc;
+    if (n == 0)
+        return JS_NAN;
+    if (n > 7)
+        n = 7;
+    for(i = 0; i < n; i++) {
+        if (JS_ToFloat64(ctx, &a, argv[i]))
+            return JS_EXCEPTION;
+        if (!isfinite(a))
+            return JS_NAN;
+        fields[i] = trunc(a);
+        if (i == 0 && fields[0] >= 0 && fields[0] < 100)
+            fields[0] += 1900;
+    }
+    return __JS_NewFloat64(ctx, set_date_fields(fields, 0));
+}
+
+static void string_skip_spaces(JSString *sp, int *pp) {
+    while (*pp < sp->len && string_get(sp, *pp) == ' ')
+        *pp += 1;
+}
+
+static void string_skip_non_spaces(JSString *sp, int *pp) {
+    while (*pp < sp->len && string_get(sp, *pp) != ' ')
+        *pp += 1;
+}
+
+/* parse a numeric field */
+static int string_get_field(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++;
+    }
+    if (p >= sp->len)
+        return -1;
+    while (p < sp->len) {
+        c = string_get(sp, p);
+        if (!(c >= '0' && c <= '9'))
+            break;
+        v = v * 10 + c - '0';
+        p++;
+    }
+    *pval = v;
+    *pp = p;
+    return 0;
+}
+
+/* parse a fixed width numeric field */
+static int string_get_digits(JSString *sp, int *pp, int n, int64_t *pval) {
+    int64_t v = 0;
+    int i, c, p = *pp;
+
+    for(i = 0; i < n; i++) {
+        if (p >= sp->len)
+            return -1;
+        c = string_get(sp, p);
+        if (!(c >= '0' && c <= '9'))
+            return -1;
+        v = v * 10 + c - '0';
+        p++;
+    }
+    *pval = v;
+    *pp = p;
+    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)
+        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;
+}
+
+static int find_abbrev(JSString *sp, int p, const char *list, int count) {
+    int n, i;
+
+    if (p + 3 <= sp->len) {
+        for (n = 0; n < count; n++) {
+            for (i = 0; i < 3; i++) {
+                if (string_get(sp, p + i) != month_names[n * 3 + i])
+                    goto next;
+            }
+            return n;
+        next:;
+        }
+    }
+    return -1;
+}
+
+static int string_get_month(JSString *sp, int *pp, int64_t *pval) {
+    int n;
+
+    string_skip_spaces(sp, pp);
+    n = find_abbrev(sp, *pp, month_names, 12);
+    if (n < 0)
+        return -1;
+
+    *pval = n;
+    *pp += 3;
+    return 0;
+}
+
+static JSValue js_Date_parse(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv)
+{
+    // parse(s)
+    JSValue s, rv;
+    int64_t fields[] = { 0, 1, 1, 0, 0, 0, 0 };
+    int64_t tz, hh, mm;
+    double d;
+    int p, i, c, sgn;
+    JSString *sp;
+
+    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]))
+            goto done;
+
+        for (i = 1; i < 6; i++) {
+            if (string_get_field(sp, &p, &fields[i]))
+                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);
+            }
+            fields[6] = ms;
+        }
+        fields[1] -= 1;
+
+        /* parse the time zone offset if present: [+-]HH:mm */
+        tz = 0;
+        if (p < sp->len && ((sgn = string_get(sp, p)) == '+' || sgn == '-')) {
+            if (string_get_field(sp, &p, &hh))
+                goto done;
+            if (string_get_field(sp, &p, &mm))
+                goto done;
+            tz = hh * 60 + mm;
+            if (sgn == '-')
+                tz = -tz;
+        }
+    } else {
+        /* toString or toUTCString format */
+        /* skip the day of the week */
+        string_skip_non_spaces(sp, &p);
+        string_skip_spaces(sp, &p);
+        if (p >= sp->len)
+            goto done;
+        c = string_get(sp, p);
+        if (c >= '0' && c <= '9') {
+            /* day of month first */
+            if (string_get_field(sp, &p, &fields[2]))
+                goto done;
+            if (string_get_month(sp, &p, &fields[1]))
+                goto done;
+        } else {
+            /* month first */
+            if (string_get_month(sp, &p, &fields[1]))
+                goto done;
+            if (string_get_field(sp, &p, &fields[2]))
+                goto done;
+        }
+        string_skip_spaces(sp, &p);
+        if (string_get_signed_field(sp, &p, &fields[0]))
+            goto done;
+
+        /* hour, min, seconds */
+        for(i = 0; i < 3; i++) {
+            if (string_get_field(sp, &p, &fields[3 + i]))
+                goto done;
+        }
+        // XXX: parse optional milliseconds?
+
+        /* parse the time zone offset if present: [+-]HHmm */
+        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))
+                    goto done;
+                if (string_get_digits(sp, &p, 2, &mm))
+                    goto done;
+                tz = hh * 60 + mm;
+                if (sgn == '-')
+                    tz = -tz;
+                break;
+            }
+        }
+    }
+    d = set_date_fields(fields, 0) - tz * 60000;
+    rv = __JS_NewFloat64(ctx, d);
+
+done:
+    JS_FreeValue(ctx, s);
+    return rv;
+}
+
+static JSValue js_Date_now(JSContext *ctx, JSValueConst this_val,
+                           int argc, JSValueConst *argv)
+{
+    // now()
+    return JS_NewInt64(ctx, date_now());
+}
+
+static JSValue js_date_Symbol_toPrimitive(JSContext *ctx, JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    // Symbol_toPrimitive(hint)
+    JSValueConst obj = this_val;
+    JSAtom hint = JS_ATOM_NULL;
+    int hint_num;
+
+    if (!JS_IsObject(obj))
+        return JS_ThrowTypeErrorNotAnObject(ctx);
+
+    if (JS_IsString(argv[0])) {
+        hint = JS_ValueToAtom(ctx, argv[0]);
+        if (hint == JS_ATOM_NULL)
+            return JS_EXCEPTION;
+        JS_FreeAtom(ctx, hint);
+    }
+    switch (hint) {
+    case JS_ATOM_number:
+#ifdef CONFIG_BIGNUM
+    case JS_ATOM_integer:
+#endif
+        hint_num = HINT_NUMBER;
+        break;
+    case JS_ATOM_string:
+    case JS_ATOM_default:
+        hint_num = HINT_STRING;
+        break;
+    default:
+        return JS_ThrowTypeError(ctx, "invalid hint");
+    }
+    return JS_ToPrimitive(ctx, obj, hint_num | HINT_FORCE_ORDINARY);
+}
+
+static JSValue js_date_getTimezoneOffset(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    // getTimezoneOffset()
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val))
+        return JS_EXCEPTION;
+    if (isnan(v))
+        return JS_NAN;
+    else
+        return JS_NewInt64(ctx, getTimezoneOffset((int64_t)trunc(v)));
+}
+
+static JSValue js_date_getTime(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // getTime()
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val))
+        return JS_EXCEPTION;
+    return __JS_NewFloat64(ctx, v);
+}
+
+static JSValue js_date_setTime(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // setTime(v)
+    double v;
+
+    if (JS_ThisTimeValue(ctx, &v, this_val) || JS_ToFloat64(ctx, &v, argv[0]))
+        return JS_EXCEPTION;
+    return JS_SetThisTimeValue(ctx, this_val, time_clip(v));
+}
+
+static JSValue js_date_setYear(JSContext *ctx, JSValueConst this_val,
+                               int argc, JSValueConst *argv)
+{
+    // setYear(y)
+    double y;
+    JSValueConst args[1];
+
+    if (JS_ThisTimeValue(ctx, &y, this_val) || JS_ToFloat64(ctx, &y, argv[0]))
+        return JS_EXCEPTION;
+    y = +y;
+    if (isfinite(y)) {
+        y = trunc(y);
+        if (y >= 0 && y < 100)
+            y += 1900;
+    }
+    args[0] = __JS_NewFloat64(ctx, y);
+    return set_date_field(ctx, this_val, 1, args, 0x011);
+}
+
+static JSValue js_date_toJSON(JSContext *ctx, JSValueConst this_val,
+                              int argc, JSValueConst *argv)
+{
+    // toJSON(key)
+    JSValue obj, tv, method, rv;
+    double d;
+
+    rv = JS_EXCEPTION;
+    tv = JS_UNDEFINED;
+
+    obj = JS_ToObject(ctx, this_val);
+    tv = JS_ToPrimitive(ctx, obj, HINT_NUMBER);
+    if (JS_IsException(tv))
+        goto exception;
+    if (JS_IsNumber(tv)) {
+        if (JS_ToFloat64(ctx, &d, tv) < 0)
+            goto exception;
+        if (!isfinite(d)) {
+            rv = JS_NULL;
+            goto done;
+        }
+    }
+    method = JS_GetPropertyStr(ctx, obj, "toISOString");
+    if (JS_IsException(method))
+        goto exception;
+    if (!JS_IsFunction(ctx, method)) {
+        JS_ThrowTypeError(ctx, "object needs toISOString method");
+        JS_FreeValue(ctx, method);
+        goto exception;
+    }
+    rv = JS_CallFree(ctx, method, obj, 0, NULL);
+exception:
+done:
+    JS_FreeValue(ctx, obj);
+    JS_FreeValue(ctx, tv);
+    return rv;
+}
+
+static const JSCFunctionListEntry js_date_funcs[] = {
+    JS_CFUNC_DEF("now", 0, js_Date_now ),
+    JS_CFUNC_DEF("parse", 1, js_Date_parse ),
+    JS_CFUNC_DEF("UTC", 7, js_Date_UTC ),
+};
+
+static const JSCFunctionListEntry js_date_proto_funcs[] = {
+    JS_CFUNC_DEF("valueOf", 0, js_date_getTime ),
+    JS_CFUNC_MAGIC_DEF("toString", 0, get_date_string, 0x13 ),
+    JS_CFUNC_DEF("[Symbol.toPrimitive]", 1, js_date_Symbol_toPrimitive ),
+    JS_CFUNC_MAGIC_DEF("toUTCString", 0, get_date_string, 0x03 ),
+    JS_ALIAS_DEF("toGMTString", "toUTCString" ),
+    JS_CFUNC_MAGIC_DEF("toISOString", 0, get_date_string, 0x23 ),
+    JS_CFUNC_MAGIC_DEF("toDateString", 0, get_date_string, 0x11 ),
+    JS_CFUNC_MAGIC_DEF("toTimeString", 0, get_date_string, 0x12 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, get_date_string, 0x33 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleDateString", 0, get_date_string, 0x31 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleTimeString", 0, get_date_string, 0x32 ),
+    JS_CFUNC_DEF("getTimezoneOffset", 0, js_date_getTimezoneOffset ),
+    JS_CFUNC_DEF("getTime", 0, js_date_getTime ),
+    JS_CFUNC_MAGIC_DEF("getYear", 0, get_date_field, 0x101 ),
+    JS_CFUNC_MAGIC_DEF("getFullYear", 0, get_date_field, 0x01 ),
+    JS_CFUNC_MAGIC_DEF("getUTCFullYear", 0, get_date_field, 0x00 ),
+    JS_CFUNC_MAGIC_DEF("getMonth", 0, get_date_field, 0x11 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMonth", 0, get_date_field, 0x10 ),
+    JS_CFUNC_MAGIC_DEF("getDate", 0, get_date_field, 0x21 ),
+    JS_CFUNC_MAGIC_DEF("getUTCDate", 0, get_date_field, 0x20 ),
+    JS_CFUNC_MAGIC_DEF("getHours", 0, get_date_field, 0x31 ),
+    JS_CFUNC_MAGIC_DEF("getUTCHours", 0, get_date_field, 0x30 ),
+    JS_CFUNC_MAGIC_DEF("getMinutes", 0, get_date_field, 0x41 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMinutes", 0, get_date_field, 0x40 ),
+    JS_CFUNC_MAGIC_DEF("getSeconds", 0, get_date_field, 0x51 ),
+    JS_CFUNC_MAGIC_DEF("getUTCSeconds", 0, get_date_field, 0x50 ),
+    JS_CFUNC_MAGIC_DEF("getMilliseconds", 0, get_date_field, 0x61 ),
+    JS_CFUNC_MAGIC_DEF("getUTCMilliseconds", 0, get_date_field, 0x60 ),
+    JS_CFUNC_MAGIC_DEF("getDay", 0, get_date_field, 0x71 ),
+    JS_CFUNC_MAGIC_DEF("getUTCDay", 0, get_date_field, 0x70 ),
+    JS_CFUNC_DEF("setTime", 1, js_date_setTime ),
+    JS_CFUNC_MAGIC_DEF("setMilliseconds", 1, set_date_field, 0x671 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMilliseconds", 1, set_date_field, 0x670 ),
+    JS_CFUNC_MAGIC_DEF("setSeconds", 2, set_date_field, 0x571 ),
+    JS_CFUNC_MAGIC_DEF("setUTCSeconds", 2, set_date_field, 0x570 ),
+    JS_CFUNC_MAGIC_DEF("setMinutes", 3, set_date_field, 0x471 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMinutes", 3, set_date_field, 0x470 ),
+    JS_CFUNC_MAGIC_DEF("setHours", 4, set_date_field, 0x371 ),
+    JS_CFUNC_MAGIC_DEF("setUTCHours", 4, set_date_field, 0x370 ),
+    JS_CFUNC_MAGIC_DEF("setDate", 1, set_date_field, 0x231 ),
+    JS_CFUNC_MAGIC_DEF("setUTCDate", 1, set_date_field, 0x230 ),
+    JS_CFUNC_MAGIC_DEF("setMonth", 2, set_date_field, 0x131 ),
+    JS_CFUNC_MAGIC_DEF("setUTCMonth", 2, set_date_field, 0x130 ),
+    JS_CFUNC_DEF("setYear", 1, js_date_setYear ),
+    JS_CFUNC_MAGIC_DEF("setFullYear", 3, set_date_field, 0x031 ),
+    JS_CFUNC_MAGIC_DEF("setUTCFullYear", 3, set_date_field, 0x030 ),
+    JS_CFUNC_DEF("toJSON", 1, js_date_toJSON ),
+};
+
+void JS_AddIntrinsicDate(JSContext *ctx)
+{
+    JSValueConst obj;
+
+    /* Date */
+    ctx->class_proto[JS_CLASS_DATE] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_DATE], js_date_proto_funcs,
+                               countof(js_date_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "Date", js_date_constructor, 7,
+                                   ctx->class_proto[JS_CLASS_DATE]);
+    JS_SetPropertyFunctionList(ctx, obj, js_date_funcs, countof(js_date_funcs));
+}
+
+/* eval */
+
+void JS_AddIntrinsicEval(JSContext *ctx)
+{
+    ctx->eval_internal = __JS_EvalInternal;
+}
+
+#ifdef CONFIG_BIGNUM
+
+/* 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));
+        }
+        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;
+            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);
+                JS_FreeValue(ctx, val);
+                if (is_legacy && (ret & BF_ST_INEXACT)) {
+                    bf_delete(r);
+                    val = JS_ThrowRangeError(ctx, "cannot convert to bigint: not an integer");
+                } else {
+                    val = JS_NewBigInt2(ctx, r, is_legacy);
+                }
+            }
+            if (a == &a_s)
+                bf_delete(a);
+        }
+        break;
+    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);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_NULL:
+    case JS_TAG_UNDEFINED:
+    default:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert to bigint");
+    }
+    return val;
+}
+
+static JSValue js_bigint_constructor(JSContext *ctx,
+                                     JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    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))
+        return JS_DupValue(ctx, this_val);
+
+    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);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a bigint");
+}
+
+static JSValue js_bigint_toString(JSContext *ctx, JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int base;
+    JSValue ret;
+
+    val = js_thisBigIntValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    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");
+            goto fail;
+        }
+    }
+    ret = js_bigint_to_string1(ctx, val, base);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigint_valueOf(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    return js_thisBigIntValue(ctx, this_val);
+}
+
+static JSValue js_bigint_div(JSContext *ctx,
+                              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;
+    int status;
+
+    b = NULL;
+    a = JS_ToBigInt(ctx, &a_s, argv[0]);
+    if (!a)
+        return JS_EXCEPTION;
+    b = JS_ToBigInt(ctx, &b_s, argv[1]);
+    if (!b) {
+        JS_FreeBigInt(ctx, a, &a_s);
+        return JS_EXCEPTION;
+    }
+    bf_init(ctx->bf_ctx, q);
+    bf_init(ctx->bf_ctx, r);
+    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;
+    }
+    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));
+        return ret;
+    } else {
+        bf_delete(r);
+        return JS_NewBigInt(ctx, q);
+    }
+}
+
+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;
+    int status;
+
+    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);
+    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);
+    }
+    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));
+        return ret;
+    } else {
+        bf_delete(rem);
+        return JS_NewBigInt(ctx, r);
+    }
+}
+
+static JSValue js_bigint_op1(JSContext *ctx,
+                              JSValueConst this_val,
+                              int argc, JSValueConst *argv,
+                              int magic)
+{
+    bf_t a_s, *a;
+    int64_t res;
+
+    a = JS_ToBigInt(ctx, &a_s, argv[0]);
+    if (!a)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case 0: /* floorLog2 */
+        if (a->sign || a->expn <= 0) {
+            res = -1;
+        } else {
+            res = a->expn - 1;
+        }
+        break;
+    case 1: /* ctz */
+        if (bf_is_zero(a)) {
+            res = -1;
+        } else {
+            res = bf_get_exp_min(a);
+        }
+        break;
+    default:
+        abort();
+    }
+    JS_FreeBigInt(ctx, a, &a_s);
+    return JS_NewBigInt64(ctx, res);
+}
+
+static JSValue js_bigint_asUintN(JSContext *ctx,
+                                  JSValueConst this_val,
+                                  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;
+
+    if (JS_ToIndex(ctx, &bits, argv[0]))
+        return JS_EXCEPTION;
+    a = JS_ToBigInt(ctx, &a_s, argv[1]);
+    if (!a)
+        return JS_EXCEPTION;
+    /* XXX: optimize */
+    bf_init(ctx->bf_ctx, r);
+    bf_init(ctx->bf_ctx, mask);
+    bf_set_ui(mask, 1);
+    bf_mul_2exp(mask, bits, BF_PREC_INF, BF_RNDZ);
+    bf_add_si(mask, mask, -1, BF_PREC_INF, BF_RNDZ);
+    bf_logic_and(r, a, mask);
+    if (asIntN && bits != 0) {
+        bf_set_ui(mask, 1);
+        bf_mul_2exp(mask, bits - 1, BF_PREC_INF, BF_RNDZ);
+        if (bf_cmpu(r, mask) >= 0) {
+            bf_set_ui(mask, 1);
+            bf_mul_2exp(mask, bits, BF_PREC_INF, BF_RNDZ);
+            bf_sub(r, r, mask, BF_PREC_INF, BF_RNDZ);
+        }
+    }
+    bf_delete(mask);
+    JS_FreeBigInt(ctx, a, &a_s);
+    return JS_NewBigInt(ctx, r);
+}
+
+static const JSCFunctionListEntry js_bigint_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("asUintN", 2, js_bigint_asUintN, 0 ),
+    JS_CFUNC_MAGIC_DEF("asIntN", 2, js_bigint_asUintN, 1 ),
+    /* QuickJS extensions */
+    JS_CFUNC_MAGIC_DEF("tdiv", 2, js_bigint_div, BF_RNDZ ),
+    JS_CFUNC_MAGIC_DEF("fdiv", 2, js_bigint_div, BF_RNDD ),
+    JS_CFUNC_MAGIC_DEF("cdiv", 2, js_bigint_div, BF_RNDU ),
+    JS_CFUNC_MAGIC_DEF("ediv", 2, js_bigint_div, BF_DIVREM_EUCLIDIAN ),
+    JS_CFUNC_MAGIC_DEF("tdivrem", 2, js_bigint_div, BF_RNDZ | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("fdivrem", 2, js_bigint_div, BF_RNDD | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("cdivrem", 2, js_bigint_div, BF_RNDU | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("edivrem", 2, js_bigint_div, BF_DIVREM_EUCLIDIAN | 0x10 ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigint_sqrt, 0 ),
+    JS_CFUNC_MAGIC_DEF("sqrtrem", 1, js_bigint_sqrt, 1 ),
+    JS_CFUNC_MAGIC_DEF("floorLog2", 1, js_bigint_op1, 0 ),
+    JS_CFUNC_MAGIC_DEF("ctz", 1, js_bigint_op1, 1 ),
+};
+
+static const JSCFunctionListEntry js_bigint_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigint_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigint_valueOf ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "BigInt", JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicBigInt(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue 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]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigint_funcs,
+                               countof(js_bigint_funcs));
+}
+
+/* BigFloat */
+
+static JSValue js_thisBigFloatValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsBigFloat(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    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_FLOAT) {
+            if (JS_IsBigFloat(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a bigfloat");
+}
+
+static JSValue js_bigfloat_toString(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValue val;
+    int base;
+    JSValue ret;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    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");
+            goto fail;
+        }
+    }
+    ret = js_ftoa(ctx, val, base, 0, BF_RNDN | BF_FTOA_FORMAT_FREE_MIN);
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_bigfloat_valueOf(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    return js_thisBigFloatValue(ctx, this_val);
+}
+
+static int get_rnd_mode(JSContext *ctx, JSValueConst val)
+{
+    int rnd_mode;
+    if (JS_ToInt32Sat(ctx, &rnd_mode, val))
+        return -1;
+    if (rnd_mode < BF_RNDN || rnd_mode > BF_RNDF) {
+        JS_ThrowRangeError(ctx, "invalid rounding mode");
+        return -1;
+    }
+    return rnd_mode;
+}
+
+static JSValue js_bigfloat_toFixed(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int res, rnd_mode;
+    bf_t a_s, *a, b;
+
+    val = js_thisBigFloatValue(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 = 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);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static BOOL js_bigfloat_is_finite(JSContext *ctx, JSValueConst val)
+{
+    BOOL res;
+    uint32_t tag;
+
+    tag = JS_VALUE_GET_NORM_TAG(val);
+    switch(tag) {
+    case JS_TAG_BIG_FLOAT:
+        {
+            JSBigFloat *p = JS_VALUE_GET_PTR(val);
+            res = bf_is_finite(&p->num);
+        }
+        break;
+    default:
+        res = FALSE;
+        break;
+    }
+    return res;
+}
+
+static JSValue js_bigfloat_toExponential(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t f;
+    int rnd_mode;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_ToInt64Sat(ctx, &f, argv[0]))
+        goto fail;
+    if (!js_bigfloat_is_finite(ctx, val)) {
+        ret = JS_ToString(ctx, val);
+    } else if (JS_IsUndefined(argv[0])) {
+        ret = js_ftoa(ctx, val, 10, 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 = get_rnd_mode(ctx, argv[1]);
+            if (rnd_mode < 0)
+                goto fail;
+        }
+        ret = js_ftoa(ctx, val, 10, 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_bigfloat_toPrecision(JSContext *ctx, JSValueConst this_val,
+                                     int argc, JSValueConst *argv)
+{
+    JSValue val, ret;
+    int64_t p;
+    int rnd_mode;
+
+    val = js_thisBigFloatValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    if (JS_IsUndefined(argv[0]))
+        goto to_string;
+    if (JS_ToInt64Sat(ctx, &p, argv[0]))
+        goto fail;
+    if (!js_bigfloat_is_finite(ctx, val)) {
+    to_string:
+        ret = JS_ToString(ctx, this_val);
+    } else {
+        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 = 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);
+    }
+    JS_FreeValue(ctx, val);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_bigfloat_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigfloat_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigfloat_valueOf ),
+    JS_CFUNC_DEF("toPrecision", 1, js_bigfloat_toPrecision ),
+    JS_CFUNC_DEF("toFixed", 1, js_bigfloat_toFixed ),
+    JS_CFUNC_DEF("toExponential", 1, js_bigfloat_toExponential ),
+};
+
+static JSValue js_bigfloat_constructor(JSContext *ctx,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValue val;
+    if (argc == 0) {
+        bf_t r_s, *r = &r_s;
+        bf_init(ctx->bf_ctx, r);
+        bf_set_zero(r, 0);
+        val = JS_NewBigFloat(ctx, r);
+    } else {
+        val = JS_DupValue(ctx, argv[0]);
+    redo:
+        switch(JS_VALUE_GET_NORM_TAG(val)) {
+        case JS_TAG_BIG_FLOAT:
+            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);
+            }
+            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);
+            }
+            break;
+        case JS_TAG_BIG_INT:
+            /* We keep the full precision of the integer */
+            {
+                JSBigFloat *p = JS_VALUE_GET_PTR(val);
+                val = JS_MKPTR(JS_TAG_BIG_FLOAT, p);
+            }
+            break;
+        case JS_TAG_STRING:
+            {
+                const char *str, *p;
+                size_t len;
+                int err;
+
+                str = JS_ToCStringLen(ctx, &len, val);
+                JS_FreeValue(ctx, val);
+                if (!str)
+                    return JS_EXCEPTION;
+                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);
+                    err = 0;
+                } else {
+                    val = js_atof(ctx, p, &p, 0, ATOD_ACCEPT_BIN_OCT |
+                                  ATOD_TYPE_BIG_FLOAT |
+                                  ATOD_ACCEPT_PREFIX_AFTER_SIGN);
+                    if (JS_IsException(val)) {
+                        JS_FreeCString(ctx, str);
+                        return JS_EXCEPTION;
+                    }
+                    p += skip_spaces(p);
+                    err = ((p - str) != len);
+                }
+                JS_FreeCString(ctx, str);
+                if (err) {
+                    JS_FreeValue(ctx, val);
+                    return JS_ThrowSyntaxError(ctx, "invalid bigfloat literal");
+                }
+            }
+            break;
+        case JS_TAG_OBJECT:
+            val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+            if (JS_IsException(val))
+                break;
+            goto redo;
+        case JS_TAG_NULL:
+        case JS_TAG_UNDEFINED:
+        default:
+            JS_FreeValue(ctx, val);
+            return JS_ThrowTypeError(ctx, "cannot convert to bigfloat");
+        }
+    }
+    return val;
+}
+
+static JSValue js_bigfloat_get_const(JSContext *ctx,
+                                  JSValueConst this_val, int magic)
+{
+    bf_t r_s, *r = &r_s;
+    bf_init(ctx->bf_ctx, r);
+    switch(magic) {
+    case 0: /* PI */
+        bf_const_pi(r, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case 1: /* LN2 */
+        bf_const_log2(r, ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    case 2: /* MIN_VALUE */
+    case 3: /* MAX_VALUE */
+        {
+            slimb_t e_range, e;
+            e_range = (limb_t)1 << (bf_get_exp_bits(ctx->fp_env.flags) - 1);
+            bf_set_ui(r, 1);
+            if (magic == 2) {
+                e = -e_range + 2;
+                if (ctx->fp_env.flags & BF_FLAG_SUBNORMAL)
+                    e -= ctx->fp_env.prec - 1;
+                bf_mul_2exp(r, e, ctx->fp_env.prec, ctx->fp_env.flags);
+            } else {
+                bf_mul_2exp(r, ctx->fp_env.prec, ctx->fp_env.prec,
+                            ctx->fp_env.flags);
+                bf_add_si(r, r, -1, ctx->fp_env.prec, ctx->fp_env.flags);
+                bf_mul_2exp(r, e_range - ctx->fp_env.prec, ctx->fp_env.prec,
+                            ctx->fp_env.flags);
+            }
+        }
+        break;
+    case 4: /* EPSILON */
+        bf_set_ui(r, 1);
+        bf_mul_2exp(r, 1 - ctx->fp_env.prec,
+                    ctx->fp_env.prec, ctx->fp_env.flags);
+        break;
+    default:
+        abort();
+    }
+    return JS_NewBigFloat(ctx, r);
+}
+
+static JSValue js_bigfloat_parseFloat(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    bf_t a_s, *a = &a_s;
+    const char *str;
+    JSValue ret;
+    int radix;
+    JSFloatEnv *fe;
+
+    str = JS_ToCString(ctx, argv[0]);
+    if (!str)
+        return JS_EXCEPTION;
+    if (JS_ToInt32(ctx, &radix, argv[1])) {
+    fail:
+        JS_FreeCString(ctx, str);
+        return JS_EXCEPTION;
+    }
+    if (radix != 0 && (radix < 2 || radix > 36)) {
+        JS_ThrowRangeError(ctx, "radix must be between 2 and 36");
+        goto fail;
+    }
+    fe = &ctx->fp_env;
+    if (argc > 2) {
+        fe = JS_GetOpaque2(ctx, argv[2], JS_CLASS_FLOAT_ENV);
+        if (!fe)
+            goto fail;
+    }
+    bf_init(ctx->bf_ctx, a);
+    /* XXX: use js_atof() */
+    bf_atof(a, str, NULL, radix, fe->prec, fe->flags);
+    ret = JS_NewBigFloat(ctx, a);
+    JS_FreeCString(ctx, str);
+    return ret;
+}
+
+static JSValue js_bigfloat_isFinite(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    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));
+}
+
+static JSValue js_bigfloat_isNaN(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    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));
+}
+
+static const JSCFunctionListEntry js_bigfloat_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("PI", js_bigfloat_get_const, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("LN2", js_bigfloat_get_const, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("MIN_VALUE", js_bigfloat_get_const, NULL, 2 ),
+    JS_CGETSET_MAGIC_DEF("MAX_VALUE", js_bigfloat_get_const, NULL, 3 ),
+    JS_CGETSET_MAGIC_DEF("EPSILON", js_bigfloat_get_const, NULL, 4 ),
+    JS_CFUNC_DEF("parseFloat", 1, js_bigfloat_parseFloat ),
+    JS_CFUNC_DEF("isFinite", 1, js_bigfloat_isFinite ),
+    JS_CFUNC_DEF("isNaN", 1, js_bigfloat_isNaN ),
+    JS_CFUNC_MAGIC_DEF("abs", 1, js_bigfloat_fop, MATH_OP_ABS ),
+    JS_CFUNC_MAGIC_DEF("fpRound", 1, js_bigfloat_fop, MATH_OP_FPROUND ),
+    JS_CFUNC_MAGIC_DEF("floor", 1, js_bigfloat_fop, MATH_OP_FLOOR ),
+    JS_CFUNC_MAGIC_DEF("ceil", 1, js_bigfloat_fop, MATH_OP_CEIL ),
+    JS_CFUNC_MAGIC_DEF("round", 1, js_bigfloat_fop, MATH_OP_ROUND ),
+    JS_CFUNC_MAGIC_DEF("trunc", 1, js_bigfloat_fop, MATH_OP_TRUNC ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigfloat_fop, MATH_OP_SQRT ),
+    JS_CFUNC_MAGIC_DEF("acos", 1, js_bigfloat_fop, MATH_OP_ACOS ),
+    JS_CFUNC_MAGIC_DEF("asin", 1, js_bigfloat_fop, MATH_OP_ASIN ),
+    JS_CFUNC_MAGIC_DEF("atan", 1, js_bigfloat_fop, MATH_OP_ATAN ),
+    JS_CFUNC_MAGIC_DEF("atan2", 2, js_bigfloat_fop2, MATH_OP_ATAN2 ),
+    JS_CFUNC_MAGIC_DEF("cos", 1, js_bigfloat_fop, MATH_OP_COS ),
+    JS_CFUNC_MAGIC_DEF("exp", 1, js_bigfloat_fop, MATH_OP_EXP ),
+    JS_CFUNC_MAGIC_DEF("log", 1, js_bigfloat_fop, MATH_OP_LOG ),
+    JS_CFUNC_MAGIC_DEF("pow", 2, js_bigfloat_fop2, MATH_OP_POW ),
+    JS_CFUNC_MAGIC_DEF("sin", 1, js_bigfloat_fop, MATH_OP_SIN ),
+    JS_CFUNC_MAGIC_DEF("tan", 1, js_bigfloat_fop, MATH_OP_TAN ),
+    JS_CFUNC_MAGIC_DEF("sign", 1, js_bigfloat_fop, MATH_OP_SIGN ),
+    JS_CFUNC_MAGIC_DEF("add", 2, js_bigfloat_fop2, MATH_OP_ADD ),
+    JS_CFUNC_MAGIC_DEF("sub", 2, js_bigfloat_fop2, MATH_OP_SUB ),
+    JS_CFUNC_MAGIC_DEF("mul", 2, js_bigfloat_fop2, MATH_OP_MUL ),
+    JS_CFUNC_MAGIC_DEF("div", 2, js_bigfloat_fop2, MATH_OP_DIV ),
+    JS_CFUNC_MAGIC_DEF("fmod", 2, js_bigfloat_fop2, MATH_OP_FMOD ),
+    JS_CFUNC_MAGIC_DEF("remainder", 2, js_bigfloat_fop2, MATH_OP_REM ),
+};
+
+/* FloatEnv */
+
+static JSValue js_float_env_constructor(JSContext *ctx,
+                                        JSValueConst new_target,
+                                        int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSFloatEnv *fe;
+    int64_t prec;
+    int flags, rndmode;
+
+    prec = ctx->fp_env.prec;
+    flags = ctx->fp_env.flags;
+    if (!JS_IsUndefined(argv[0])) {
+        if (JS_ToInt64Sat(ctx, &prec, argv[0]))
+            return JS_EXCEPTION;
+        if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+            return JS_ThrowRangeError(ctx, "invalid precision");
+        flags = BF_RNDN; /* RNDN, max exponent size, no subnormal */
+        if (argc > 1 && !JS_IsUndefined(argv[1])) {
+            if (JS_ToInt32Sat(ctx, &rndmode, argv[1]))
+                return JS_EXCEPTION;
+            if (rndmode < BF_RNDN || rndmode > BF_RNDF)
+                return JS_ThrowRangeError(ctx, "invalid rounding mode");
+            flags = rndmode;
+        }
+    }
+
+    obj = JS_NewObjectClass(ctx, JS_CLASS_FLOAT_ENV);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    fe = js_malloc(ctx, sizeof(*fe));
+    if (!fe)
+        return JS_EXCEPTION;
+    fe->prec = prec;
+    fe->flags = flags;
+    fe->status = 0;
+    JS_SetOpaque(obj, fe);
+    return obj;
+}
+
+static void js_float_env_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSFloatEnv *fe = JS_GetOpaque(val, JS_CLASS_FLOAT_ENV);
+    js_free_rt(rt, fe);
+}
+
+static JSValue js_float_env_get_prec(JSContext *ctx, JSValueConst this_val)
+{
+    return JS_NewInt64(ctx, ctx->fp_env.prec);
+}
+
+static JSValue js_float_env_get_expBits(JSContext *ctx, JSValueConst this_val)
+{
+    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)
+{
+    JSValueConst func;
+    int exp_bits, flags, saved_flags;
+    JSValue ret;
+    limb_t saved_prec;
+    int64_t prec;
+
+    func = argv[0];
+    if (JS_ToInt64Sat(ctx, &prec, argv[1]))
+        return JS_EXCEPTION;
+    if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+        return JS_ThrowRangeError(ctx, "invalid precision");
+    exp_bits = BF_EXP_BITS_MAX1;
+
+    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)
+            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;
+
+    saved_prec = ctx->fp_env.prec;
+    saved_flags = ctx->fp_env.flags;
+
+    ctx->fp_env.prec = prec;
+    ctx->fp_env.flags = flags;
+
+    ret = JS_Call(ctx, func, JS_UNDEFINED, 0, NULL);
+    /* always restore the floating point precision */
+    ctx->fp_env.prec = saved_prec;
+    ctx->fp_env.flags = saved_flags;
+    return ret;
+}
+
+#define FE_PREC      (-1)
+#define FE_EXP       (-2)
+#define FE_RNDMODE   (-3)
+#define FE_SUBNORMAL (-4)
+
+static JSValue js_float_env_proto_get_status(JSContext *ctx, JSValueConst this_val, int magic)
+{
+    JSFloatEnv *fe;
+    fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case FE_PREC:
+        return JS_NewInt64(ctx, fe->prec);
+    case FE_EXP:
+        return JS_NewInt32(ctx, bf_get_exp_bits(fe->flags));
+    case FE_RNDMODE:
+        return JS_NewInt32(ctx, fe->flags & BF_RND_MASK);
+    case FE_SUBNORMAL:
+        return JS_NewBool(ctx, (fe->flags & BF_FLAG_SUBNORMAL) != 0);
+    default:
+        return JS_NewBool(ctx, (fe->status & magic) != 0);
+    }
+}
+
+static JSValue js_float_env_proto_set_status(JSContext *ctx, JSValueConst this_val, JSValueConst val, int magic)
+{
+    JSFloatEnv *fe;
+    int b;
+    int64_t prec;
+
+    fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    switch(magic) {
+    case FE_PREC:
+        if (JS_ToInt64Sat(ctx, &prec, val))
+            return JS_EXCEPTION;
+        if (prec < BF_PREC_MIN || prec > BF_PREC_MAX)
+            return JS_ThrowRangeError(ctx, "invalid precision");
+        fe->prec = prec;
+        break;
+    case FE_EXP:
+        if (JS_ToInt32Sat(ctx, &b, val))
+            return JS_EXCEPTION;
+        if (b < BF_EXP_BITS_MIN || b > BF_EXP_BITS_MAX1)
+            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);
+        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);
+        }
+        break;
+    default:
+        b = JS_ToBool(ctx, val);
+        fe->status = (fe->status & ~magic) & ((-b) & magic);
+        break;
+    }
+    return JS_UNDEFINED;
+}
+
+static JSValue js_float_env_clearStatus(JSContext *ctx,
+                                        JSValueConst this_val,
+                                        int argc, JSValueConst *argv)
+{
+    JSFloatEnv *fe = JS_GetOpaque2(ctx, this_val, JS_CLASS_FLOAT_ENV);
+    if (!fe)
+        return JS_EXCEPTION;
+    fe->status = 0;
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry js_float_env_funcs[] = {
+    JS_CGETSET_DEF("prec", js_float_env_get_prec, NULL ),
+    JS_CGETSET_DEF("expBits", js_float_env_get_expBits, NULL ),
+    JS_CFUNC_DEF("setPrec", 2, js_float_env_setPrec ),
+    JS_PROP_INT32_DEF("RNDN", BF_RNDN, 0 ),
+    JS_PROP_INT32_DEF("RNDZ", BF_RNDZ, 0 ),
+    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("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 ),
+};
+
+static const JSCFunctionListEntry js_float_env_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("prec", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_PREC ),
+    JS_CGETSET_MAGIC_DEF("expBits", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_EXP ),
+    JS_CGETSET_MAGIC_DEF("rndMode", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_RNDMODE ),
+    JS_CGETSET_MAGIC_DEF("subnormal", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, FE_SUBNORMAL ),
+    JS_CGETSET_MAGIC_DEF("invalidOperation", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_INVALID_OP ),
+    JS_CGETSET_MAGIC_DEF("divideByZero", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_DIVIDE_ZERO ),
+    JS_CGETSET_MAGIC_DEF("overflow", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_OVERFLOW ),
+    JS_CGETSET_MAGIC_DEF("underflow", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_UNDERFLOW ),
+    JS_CGETSET_MAGIC_DEF("inexact", js_float_env_proto_get_status,
+                         js_float_env_proto_set_status, BF_ST_INEXACT ),
+    JS_CFUNC_DEF("clearStatus", 0, js_float_env_clearStatus ),
+};
+
+void JS_AddIntrinsicBigFloat(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+    JSValueConst obj2;
+
+    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;
+    rt->bigfloat_ops.binary_arith = js_binary_arith_bigfloat;
+    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]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigfloat_funcs,
+                               countof(js_bigfloat_funcs));
+
+    ctx->class_proto[JS_CLASS_FLOAT_ENV] = JS_NewObject(ctx);
+    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",
+                                        js_float_env_constructor, 1,
+                                        ctx->class_proto[JS_CLASS_FLOAT_ENV]);
+    JS_SetPropertyFunctionList(ctx, obj2, js_float_env_funcs,
+                               countof(js_float_env_funcs));
+}
+
+/* BigDecimal */
+
+static JSValue JS_ToBigDecimalFree(JSContext *ctx, JSValue val,
+                                   BOOL allow_null_or_undefined)
+{
+ redo:
+    switch(JS_VALUE_GET_NORM_TAG(val)) {
+    case JS_TAG_BIG_DECIMAL:
+        break;
+    case JS_TAG_NULL:
+        if (!allow_null_or_undefined)
+            goto fail;
+        /* fall thru */
+    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);
+        }
+        break;
+    case JS_TAG_FLOAT64:
+    case JS_TAG_BIG_INT:
+    case JS_TAG_BIG_FLOAT:
+        val = JS_ToStringFree(ctx, val);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_STRING:
+        {
+            const char *str, *p;
+            size_t len;
+            int err;
+
+            str = JS_ToCStringLen(ctx, &len, val);
+            JS_FreeValue(ctx, val);
+            if (!str)
+                return JS_EXCEPTION;
+            p = str;
+            p += skip_spaces(p);
+            if ((p - str) == len) {
+                bfdec_t r_s, *r = &r_s;
+                bfdec_init(ctx->bf_ctx, r);
+                bfdec_set_zero(r, 0);
+                val = JS_NewBigDecimal(ctx, r);
+                err = 0;
+            } else {
+                val = js_atof(ctx, p, &p, 0, ATOD_TYPE_BIG_DECIMAL);
+                if (JS_IsException(val)) {
+                    JS_FreeCString(ctx, str);
+                    return JS_EXCEPTION;
+                }
+                p += skip_spaces(p);
+                err = ((p - str) != len);
+            }
+            JS_FreeCString(ctx, str);
+            if (err) {
+                JS_FreeValue(ctx, val);
+                return JS_ThrowSyntaxError(ctx, "invalid bigdecimal literal");
+            }
+        }
+        break;
+    case JS_TAG_OBJECT:
+        val = JS_ToPrimitiveFree(ctx, val, HINT_NUMBER);
+        if (JS_IsException(val))
+            break;
+        goto redo;
+    case JS_TAG_UNDEFINED:
+        {
+            bfdec_t r_s, *r = &r_s;
+            if (!allow_null_or_undefined)
+                goto fail;
+            bfdec_init(ctx->bf_ctx, r);
+            bfdec_set_nan(r);
+            val = JS_NewBigDecimal(ctx, r);
+        }
+        break;
+    default:
+    fail:
+        JS_FreeValue(ctx, val);
+        return JS_ThrowTypeError(ctx, "cannot convert to bigdecimal");
+    }
+    return val;
+}
+
+static JSValue js_bigdecimal_constructor(JSContext *ctx,
+                                         JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSValue val;
+    if (argc == 0) {
+        bfdec_t r_s, *r = &r_s;
+        bfdec_init(ctx->bf_ctx, r);
+        bfdec_set_zero(r, 0);
+        val = JS_NewBigDecimal(ctx, r);
+    } else {
+        val = JS_ToBigDecimalFree(ctx, JS_DupValue(ctx, argv[0]), FALSE);
+    }
+    return val;
+}
+
+static JSValue js_thisBigDecimalValue(JSContext *ctx, JSValueConst this_val)
+{
+    if (JS_IsBigDecimal(this_val))
+        return JS_DupValue(ctx, this_val);
+
+    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_DECIMAL) {
+            if (JS_IsBigDecimal(p->u.object_data))
+                return JS_DupValue(ctx, p->u.object_data);
+        }
+    }
+    return JS_ThrowTypeError(ctx, "not a bigdecimal");
+}
+
+static JSValue js_bigdecimal_toString(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSValue val;
+
+    val = js_thisBigDecimalValue(ctx, this_val);
+    if (JS_IsException(val))
+        return val;
+    return JS_ToStringFree(ctx, val);
+}
+
+static JSValue js_bigdecimal_valueOf(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    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)
+{
+    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);
+    if (!str)
+        return -1;
+    if (strlen(str) != size)
+        goto invalid_rounding_mode;
+    if (!strcmp(str, "floor")) {
+        fe->flags = BF_RNDD;
+    } else if (!strcmp(str, "ceiling")) {
+        fe->flags = BF_RNDU;
+    } else if (!strcmp(str, "down")) {
+        fe->flags = BF_RNDZ;
+    } else if (!strcmp(str, "half-even")) {
+        fe->flags = BF_RNDN;
+    } else if (!strcmp(str, "half-up")) {
+        fe->flags = BF_RNDNA;
+    } else {
+    invalid_rounding_mode:
+        JS_FreeCString(ctx, str);
+        JS_ThrowTypeError(ctx, "invalid rounding mode");
+        return -1;
+    }
+    JS_FreeCString(ctx, str);
+
+    prop = JS_GetProperty(ctx, obj, JS_ATOM_maximumSignificantDigits);
+    if (JS_IsException(prop))
+        return -1;
+    has_prec = FALSE;
+    if (!JS_IsUndefined(prop)) {
+        if (JS_ToInt64SatFree(ctx, &val, prop))
+            return -1;
+        if (val < 0 || val > BF_PREC_MAX)
+            goto invalid_precision;
+        fe->prec = val;
+        has_prec = TRUE;
+    }
+
+    prop = JS_GetProperty(ctx, obj, JS_ATOM_maximumFractionDigits);
+    if (JS_IsException(prop))
+        return -1;
+    if (!JS_IsUndefined(prop)) {
+        if (has_prec) {
+            JS_FreeValue(ctx, prop);
+            JS_ThrowTypeError(ctx, "cannot provide both maximumSignificantDigits and maximumFractionDigits");
+            return -1;
+        }
+        if (JS_ToInt64SatFree(ctx, &val, prop))
+            return -1;
+        if (val < 0 || val > BF_PREC_MAX) {
+        invalid_precision:
+            JS_ThrowTypeError(ctx, "invalid precision");
+            return -1;
+        }
+        fe->prec = val;
+        fe->flags |= BF_FLAG_RADPNT_PREC;
+        has_prec = TRUE;
+    }
+    if (!has_prec) {
+        JS_ThrowTypeError(ctx, "precision must be present");
+        return -1;
+    }
+    return 0;
+}
+
+
+static JSValue js_bigdecimal_fop(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv, int magic)
+{
+    bfdec_t *a, *b, r_s, *r = &r_s;
+    JSValue op1, op2;
+    BigDecimalEnv fe_s, *fe = &fe_s;
+    int op_count, ret;
+
+    if (magic == MATH_OP_SQRT ||
+        magic == MATH_OP_ROUND)
+        op_count = 1;
+    else
+        op_count = 2;
+
+    op1 = JS_ToNumeric(ctx, argv[0]);
+    if (JS_IsException(op1))
+        return op1;
+    a = JS_ToBigDecimal(ctx, op1);
+    if (!a) {
+        JS_FreeValue(ctx, op1);
+        return JS_EXCEPTION;
+    }
+    if (op_count >= 2) {
+        op2 = JS_ToNumeric(ctx, argv[1]);
+        if (JS_IsException(op2)) {
+            JS_FreeValue(ctx, op1);
+            return op2;
+        }
+        b = JS_ToBigDecimal(ctx, op2);
+        if (!b)
+            goto fail;
+    } else {
+        op2 = JS_UNDEFINED;
+        b = NULL;
+    }
+    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");
+            goto fail;
+        }
+    }
+
+    bfdec_init(ctx->bf_ctx, r);
+    switch (magic) {
+    case MATH_OP_ADD:
+        ret = bfdec_add(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SUB:
+        ret = bfdec_sub(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_MUL:
+        ret = bfdec_mul(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_DIV:
+        ret = bfdec_div(r, a, b, fe->prec, fe->flags);
+        break;
+    case MATH_OP_SQRT:
+        ret = bfdec_sqrt(r, a, fe->prec, fe->flags);
+        break;
+    case MATH_OP_ROUND:
+        ret = bfdec_set(r, a);
+        if (!(ret & BF_ST_MEM_ERROR))
+            ret = bfdec_round(r, fe->prec, fe->flags);
+        break;
+    default:
+        abort();
+    }
+    JS_FreeValue(ctx, op1);
+    JS_FreeValue(ctx, op2);
+    ret &= BF_ST_MEM_ERROR | BF_ST_DIVIDE_ZERO | BF_ST_INVALID_OP |
+        BF_ST_OVERFLOW;
+    if (ret != 0) {
+        bfdec_delete(r);
+        return throw_bf_exception(ctx, ret);
+    } else {
+        return JS_NewBigDecimal(ctx, r);
+    }
+}
+
+static const JSCFunctionListEntry js_bigdecimal_proto_funcs[] = {
+    JS_CFUNC_DEF("toString", 0, js_bigdecimal_toString ),
+    JS_CFUNC_DEF("valueOf", 0, js_bigdecimal_valueOf ),
+};
+
+static const JSCFunctionListEntry js_bigdecimal_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 2, js_bigdecimal_fop, MATH_OP_ADD ),
+    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("round", 1, js_bigdecimal_fop, MATH_OP_ROUND ),
+    JS_CFUNC_MAGIC_DEF("sqrt", 1, js_bigdecimal_fop, MATH_OP_SQRT ),
+};
+
+void JS_AddIntrinsicBigDecimal(JSContext *ctx)
+{
+    JSRuntime *rt = ctx->rt;
+    JSValue obj1;
+
+    rt->bigdecimal_ops.to_string = js_bigdecimal_to_string;
+    rt->bigdecimal_ops.from_string = js_string_to_bigdecimal;
+    rt->bigdecimal_ops.unary_arith = js_unary_arith_bigdecimal;
+    rt->bigdecimal_ops.binary_arith = js_binary_arith_bigdecimal;
+    rt->bigdecimal_ops.compare = js_compare_bigdecimal;
+
+    ctx->class_proto[JS_CLASS_BIG_DECIMAL] = JS_NewObject(ctx);
+    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]);
+    JS_SetPropertyFunctionList(ctx, obj1, js_bigdecimal_funcs,
+                               countof(js_bigdecimal_funcs));
+}
+
+void JS_EnableBignumExt(JSContext *ctx, BOOL enable)
+{
+    ctx->bignum_ext = enable;
+}
+
+#endif /* CONFIG_BIGNUM */
+
+static const char * const native_error_name[JS_NATIVE_ERROR_COUNT] = {
+    "EvalError", "RangeError", "ReferenceError",
+    "SyntaxError", "TypeError", "URIError",
+    "InternalError",
+};
+
+/* Minimum amount of objects to be able to compile code and display
+   error messages. No JSAtom should be allocated by this function. */
+static void JS_AddIntrinsicBasicObjects(JSContext *ctx)
+{
+    JSValue proto;
+    int i;
+
+    ctx->class_proto[JS_CLASS_OBJECT] = JS_NewObjectProto(ctx, JS_NULL);
+    ctx->function_proto = JS_NewCFunction3(ctx, js_function_proto, "", 0,
+                                           JS_CFUNC_generic, 0,
+                                           ctx->class_proto[JS_CLASS_OBJECT]);
+    ctx->class_proto[JS_CLASS_BYTECODE_FUNCTION] = JS_DupValue(ctx, ctx->function_proto);
+    ctx->class_proto[JS_CLASS_ERROR] = JS_NewObject(ctx);
+#if 0
+    /* these are auto-initialized from js_error_proto_funcs,
+       but delaying might be a problem */
+    JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ERROR], JS_ATOM_name,
+                           JS_AtomToString(ctx, JS_ATOM_Error),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ERROR], JS_ATOM_message,
+                           JS_AtomToString(ctx, JS_ATOM_empty_string),
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+#endif
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ERROR],
+                               js_error_proto_funcs,
+                               countof(js_error_proto_funcs));
+
+    for(i = 0; i < JS_NATIVE_ERROR_COUNT; i++) {
+        proto = JS_NewObjectProto(ctx, ctx->class_proto[JS_CLASS_ERROR]);
+        JS_DefinePropertyValue(ctx, proto, JS_ATOM_name,
+                               JS_NewAtomString(ctx, native_error_name[i]),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        JS_DefinePropertyValue(ctx, proto, JS_ATOM_message,
+                               JS_AtomToString(ctx, JS_ATOM_empty_string),
+                               JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+        ctx->native_error_proto[i] = proto;
+    }
+
+    /* the array prototype is an array */
+    ctx->class_proto[JS_CLASS_ARRAY] =
+        JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                               JS_CLASS_ARRAY);
+
+    ctx->array_shape = js_new_shape2(ctx, get_proto_obj(ctx->class_proto[JS_CLASS_ARRAY]),
+                                     JS_PROP_INITIAL_HASH_SIZE, 1);
+    add_shape_property(ctx, &ctx->array_shape, NULL,
+                       JS_ATOM_length, JS_PROP_WRITABLE | JS_PROP_LENGTH);
+
+    /* XXX: could test it on first context creation to ensure that no
+       new atoms are created in JS_AddIntrinsicBasicObjects(). It is
+       necessary to avoid useless renumbering of atoms after
+       JS_EvalBinary() if it is done just after
+       JS_AddIntrinsicBasicObjects(). */
+    //    assert(ctx->rt->atom_count == JS_ATOM_END);
+}
+
+void JS_AddIntrinsicBaseObjects(JSContext *ctx)
+{
+    int i;
+    JSValueConst obj, number_obj;
+    JSValue obj1;
+
+    ctx->throw_type_error = JS_NewCFunction(ctx, js_throw_type_error, NULL, 0);
+
+    /* add caller and arguments properties to throw a TypeError */
+    obj1 = JS_NewCFunction(ctx, js_function_proto_caller, NULL, 0);
+    JS_DefineProperty(ctx, ctx->function_proto, JS_ATOM_caller, JS_UNDEFINED,
+                      obj1, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                      JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE);
+    JS_DefineProperty(ctx, ctx->function_proto, JS_ATOM_arguments, JS_UNDEFINED,
+                      obj1, ctx->throw_type_error,
+                      JS_PROP_HAS_GET | JS_PROP_HAS_SET |
+                      JS_PROP_HAS_CONFIGURABLE | JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+    JS_FreeValue(ctx, js_object_seal(ctx, JS_UNDEFINED, 1, (JSValueConst *)&ctx->throw_type_error, 1));
+
+    ctx->global_obj = JS_NewObject(ctx);
+    ctx->global_var_obj = JS_NewObjectProto(ctx, JS_NULL);
+
+    /* Object */
+    obj = JS_NewGlobalCConstructor(ctx, "Object", js_object_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_OBJECT]);
+    JS_SetPropertyFunctionList(ctx, obj, js_object_funcs, countof(js_object_funcs));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                               js_object_proto_funcs, countof(js_object_proto_funcs));
+
+    /* Function */
+    JS_SetPropertyFunctionList(ctx, ctx->function_proto, js_function_proto_funcs, countof(js_function_proto_funcs));
+    ctx->function_ctor = JS_NewCFunctionMagic(ctx, js_function_constructor,
+                                              "Function", 1, JS_CFUNC_constructor_or_func_magic,
+                                              JS_FUNC_NORMAL);
+    JS_NewGlobalCConstructor2(ctx, JS_DupValue(ctx, ctx->function_ctor), "Function",
+                              ctx->function_proto);
+
+    /* Error */
+    obj1 = JS_NewCFunctionMagic(ctx, js_error_constructor,
+                                "Error", 1, JS_CFUNC_constructor_or_func_magic, -1);
+    JS_NewGlobalCConstructor2(ctx, obj1,
+                              "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);
+        JS_NewGlobalCConstructor2(ctx, func_obj, native_error_name[i],
+                                  ctx->native_error_proto[i]);
+    }
+
+    /* Iterator prototype */
+    ctx->iterator_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->iterator_proto,
+                               js_iterator_proto_funcs,
+                               countof(js_iterator_proto_funcs));
+
+    /* Array */
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY],
+                               js_array_proto_funcs,
+                               countof(js_array_proto_funcs));
+
+    obj = JS_NewGlobalCConstructor(ctx, "Array", js_array_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_ARRAY]);
+    JS_SetPropertyFunctionList(ctx, obj, js_array_funcs,
+                               countof(js_array_funcs));
+
+    /* XXX: create auto_initializer */
+    {
+        /* initialize Array.prototype[Symbol.unscopables] */
+        char const unscopables[] = "copyWithin" "\0" "entries" "\0" "fill" "\0" "find" "\0"
+            "findIndex" "\0" "flat" "\0" "flatMap" "\0" "includes" "\0" "keys" "\0" "values" "\0";
+        const char *p = unscopables;
+        obj1 = JS_NewObjectProto(ctx, JS_NULL);
+        for(p = unscopables; *p; p += strlen(p) + 1) {
+            JS_DefinePropertyValueStr(ctx, obj1, p, JS_TRUE, JS_PROP_C_W_E);
+        }
+        JS_DefinePropertyValue(ctx, ctx->class_proto[JS_CLASS_ARRAY],
+                               JS_ATOM_Symbol_unscopables, obj1,
+                               JS_PROP_CONFIGURABLE);
+    }
+
+    /* needed to initialize arguments[Symbol.iterator] */
+    ctx->array_proto_values =
+        JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_ARRAY], JS_ATOM_values);
+
+    ctx->class_proto[JS_CLASS_ARRAY_ITERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY_ITERATOR],
+                               js_array_iterator_proto_funcs,
+                               countof(js_array_iterator_proto_funcs));
+
+    /* Number */
+    ctx->class_proto[JS_CLASS_NUMBER] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                               JS_CLASS_NUMBER);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_NUMBER], JS_NewInt32(ctx, 0));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_NUMBER],
+                               js_number_proto_funcs,
+                               countof(js_number_proto_funcs));
+    number_obj = JS_NewGlobalCConstructor(ctx, "Number", js_number_constructor, 1,
+                                          ctx->class_proto[JS_CLASS_NUMBER]);
+    JS_SetPropertyFunctionList(ctx, number_obj, js_number_funcs, countof(js_number_funcs));
+
+    /* Boolean */
+    ctx->class_proto[JS_CLASS_BOOLEAN] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                                JS_CLASS_BOOLEAN);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_BOOLEAN], JS_NewBool(ctx, FALSE));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_BOOLEAN], js_boolean_proto_funcs,
+                               countof(js_boolean_proto_funcs));
+    JS_NewGlobalCConstructor(ctx, "Boolean", js_boolean_constructor, 1,
+                             ctx->class_proto[JS_CLASS_BOOLEAN]);
+
+    /* String */
+    ctx->class_proto[JS_CLASS_STRING] = JS_NewObjectProtoClass(ctx, ctx->class_proto[JS_CLASS_OBJECT],
+                                                               JS_CLASS_STRING);
+    JS_SetObjectData(ctx, ctx->class_proto[JS_CLASS_STRING], JS_AtomToString(ctx, JS_ATOM_empty_string));
+    obj = JS_NewGlobalCConstructor(ctx, "String", js_string_constructor, 1,
+                                   ctx->class_proto[JS_CLASS_STRING]);
+    JS_SetPropertyFunctionList(ctx, obj, js_string_funcs,
+                               countof(js_string_funcs));
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING], js_string_proto_funcs,
+                               countof(js_string_proto_funcs));
+
+    ctx->class_proto[JS_CLASS_STRING_ITERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_STRING_ITERATOR],
+                               js_string_iterator_proto_funcs,
+                               countof(js_string_iterator_proto_funcs));
+
+    /* Math: create as autoinit object */
+    js_random_init(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_math_obj, countof(js_math_obj));
+
+    /* ES6 Reflect: create as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_reflect_obj, countof(js_reflect_obj));
+
+    /* ES6 Symbol */
+    ctx->class_proto[JS_CLASS_SYMBOL] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_SYMBOL], js_symbol_proto_funcs,
+                               countof(js_symbol_proto_funcs));
+    obj = JS_NewGlobalCConstructor(ctx, "Symbol", js_symbol_constructor, 0,
+                                   ctx->class_proto[JS_CLASS_SYMBOL]);
+    JS_SetPropertyFunctionList(ctx, obj, js_symbol_funcs,
+                               countof(js_symbol_funcs));
+    for(i = JS_ATOM_Symbol_toPrimitive; i < JS_ATOM_END; i++) {
+        char buf[ATOM_GET_STR_BUF_SIZE];
+        const char *str, *p;
+        str = JS_AtomGetStr(ctx, buf, sizeof(buf), i);
+        /* skip "Symbol." */
+        p = strchr(str, '.');
+        if (p)
+            str = p + 1;
+        JS_DefinePropertyValueStr(ctx, obj, str, JS_AtomToValue(ctx, i), 0);
+    }
+
+    /* ES6 Generator */
+    ctx->class_proto[JS_CLASS_GENERATOR] = JS_NewObjectProto(ctx, ctx->iterator_proto);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_GENERATOR],
+                               js_generator_proto_funcs,
+                               countof(js_generator_proto_funcs));
+
+    ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION] = JS_NewObjectProto(ctx, ctx->function_proto);
+    obj1 = JS_NewCFunctionMagic(ctx, js_function_constructor,
+                                "GeneratorFunction", 1,
+                                JS_CFUNC_constructor_or_func_magic, JS_FUNC_GENERATOR);
+    JS_SetPropertyFunctionList(ctx,
+                               ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                               js_generator_function_proto_funcs,
+                               countof(js_generator_function_proto_funcs));
+    JS_SetConstructor2(ctx, ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                       ctx->class_proto[JS_CLASS_GENERATOR],
+                       JS_PROP_CONFIGURABLE, JS_PROP_CONFIGURABLE);
+    JS_SetConstructor2(ctx, obj1, ctx->class_proto[JS_CLASS_GENERATOR_FUNCTION],
+                       0, JS_PROP_CONFIGURABLE);
+    JS_FreeValue(ctx, obj1);
+
+    /* global properties */
+    ctx->eval_obj = JS_NewCFunction(ctx, js_global_eval, "eval", 1);
+    JS_DefinePropertyValue(ctx, ctx->global_obj, JS_ATOM_eval,
+                           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);
+}
+
+/* Typed Arrays */
+
+static uint8_t const typed_array_size_log2[JS_TYPED_ARRAY_COUNT] = {
+    0, 0, 0, 1, 1, 2, 2,
+#ifdef CONFIG_BIGNUM
+    3, 3, /* BigInt64Array, BigUint64Array */
+#endif
+    2, 3
+};
+
+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)
+{
+    JSValue obj;
+    JSArrayBuffer *abuf = NULL;
+
+    obj = js_create_from_ctor(ctx, new_target, class_id);
+    if (JS_IsException(obj))
+        return obj;
+    /* XXX: we are currently limited to 2 GB */
+    if (len > INT32_MAX) {
+        JS_ThrowRangeError(ctx, "invalid array buffer length");
+        goto fail;
+    }
+    abuf = js_malloc(ctx, sizeof(*abuf));
+    if (!abuf)
+        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;
+    } else {
+        abuf->data = buf;
+    }
+    init_list_head(&abuf->array_list);
+    abuf->detached = FALSE;
+    abuf->shared = (class_id == JS_CLASS_SHARED_ARRAY_BUFFER);
+    abuf->opaque = opaque;
+    abuf->free_func = free_func;
+    if (alloc_flag && buf)
+        memcpy(abuf->data, buf, len);
+    JS_SetOpaque(obj, abuf);
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    js_free(ctx, abuf);
+    return JS_EXCEPTION;
+}
+
+static void js_array_buffer_free(JSRuntime *rt, void *opaque, void *ptr)
+{
+    js_free_rt(rt, ptr);
+}
+
+static JSValue js_array_buffer_constructor2(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len, JSClassID class_id)
+{
+    return js_array_buffer_constructor3(ctx, new_target, len, class_id,
+                                        NULL, js_array_buffer_free, NULL,
+                                        TRUE);
+}
+
+static JSValue js_array_buffer_constructor1(JSContext *ctx,
+                                            JSValueConst new_target,
+                                            uint64_t len)
+{
+    return js_array_buffer_constructor2(ctx, new_target, len,
+                                        JS_CLASS_ARRAY_BUFFER);
+}
+
+JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
+                          JSFreeArrayBufferDataFunc *free_func, void *opaque,
+                          BOOL is_shared)
+{
+    return js_array_buffer_constructor3(ctx, JS_UNDEFINED, len,
+                                        is_shared ? JS_CLASS_SHARED_ARRAY_BUFFER : JS_CLASS_ARRAY_BUFFER,
+                                        buf, free_func, opaque, FALSE);
+}
+
+/* create a new ArrayBuffer of length 'len' and copy 'buf' to it */
+JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len)
+{
+    return js_array_buffer_constructor3(ctx, JS_UNDEFINED, len,
+                                        JS_CLASS_ARRAY_BUFFER,
+                                        (uint8_t *)buf,
+                                        js_array_buffer_free, NULL,
+                                        TRUE);
+}
+
+static JSValue js_array_buffer_constructor(JSContext *ctx,
+                                           JSValueConst new_target,
+                                           int argc, JSValueConst *argv)
+{
+    uint64_t len;
+    if (JS_ToIndex(ctx, &len, argv[0]))
+        return JS_EXCEPTION;
+    return js_array_buffer_constructor1(ctx, new_target, len);
+}
+
+static JSValue js_shared_array_buffer_constructor(JSContext *ctx,
+                                                  JSValueConst new_target,
+                                                  int argc, JSValueConst *argv)
+{
+    uint64_t len;
+    if (JS_ToIndex(ctx, &len, argv[0]))
+        return JS_EXCEPTION;
+    return js_array_buffer_constructor2(ctx, new_target, len,
+                                        JS_CLASS_SHARED_ARRAY_BUFFER);
+}
+
+/* also used for SharedArrayBuffer */
+static void js_array_buffer_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSArrayBuffer *abuf = p->u.array_buffer;
+    if (abuf) {
+        /* The ArrayBuffer finalizer may be called before the typed
+           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);
+        js_free_rt(rt, abuf);
+    }
+}
+
+static JSValue js_array_buffer_isView(JSContext *ctx,
+                                      JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    BOOL res;
+    res = FALSE;
+    if (JS_VALUE_GET_TAG(argv[0]) == JS_TAG_OBJECT) {
+        p = JS_VALUE_GET_OBJ(argv[0]);
+        if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+            p->class_id <= JS_CLASS_DATAVIEW) {
+            res = TRUE;
+        }
+    }
+    return JS_NewBool(ctx, res);
+}
+
+static const JSCFunctionListEntry js_array_buffer_funcs[] = {
+    JS_CFUNC_DEF("isView", 1, js_array_buffer_isView ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static JSValue JS_ThrowTypeErrorDetachedArrayBuffer(JSContext *ctx)
+{
+    return JS_ThrowTypeError(ctx, "ArrayBuffer is detached");
+}
+
+static JSValue js_array_buffer_get_byteLength(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int class_id)
+{
+    JSArrayBuffer *abuf = JS_GetOpaque2(ctx, this_val, class_id);
+    if (!abuf)
+        return JS_EXCEPTION;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    return JS_NewUint32(ctx, abuf->byte_length);
+}
+
+void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj)
+{
+    JSArrayBuffer *abuf = JS_GetOpaque(obj, JS_CLASS_ARRAY_BUFFER);
+    struct list_head *el;
+
+    if (!abuf || abuf->detached)
+        return;
+    if (abuf->free_func)
+        abuf->free_func(ctx->rt, abuf->opaque, abuf->data);
+    abuf->data = NULL;
+    abuf->byte_length = 0;
+    abuf->detached = TRUE;
+
+    list_for_each(el, &abuf->array_list) {
+        JSTypedArray *ta;
+        JSObject *p;
+
+        ta = list_entry(el, JSTypedArray, link);
+        p = ta->obj;
+        /* Note: the typed array length and offset fields are not modified */
+        if (p->class_id != JS_CLASS_DATAVIEW) {
+            p->u.array.count = 0;
+            p->u.array.u.ptr = NULL;
+        }
+    }
+}
+
+/* get an ArrayBuffer or SharedArrayBuffer */
+static JSArrayBuffer *js_get_array_buffer(JSContext *ctx, JSValueConst obj)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+    if (p->class_id != JS_CLASS_ARRAY_BUFFER &&
+        p->class_id != JS_CLASS_SHARED_ARRAY_BUFFER) {
+    fail:
+        JS_ThrowTypeErrorInvalidClass(ctx, JS_CLASS_ARRAY_BUFFER);
+        return NULL;
+    }
+    return p->u.array_buffer;
+}
+
+/* return NULL if exception. WARNING: any JS call can detach the
+   buffer and render the returned pointer invalid */
+uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj)
+{
+    JSArrayBuffer *abuf = js_get_array_buffer(ctx, obj);
+    if (!abuf)
+        goto fail;
+    if (abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    *psize = abuf->byte_length;
+    return abuf->data;
+ fail:
+    *psize = 0;
+    return NULL;
+}
+
+static JSValue js_array_buffer_slice(JSContext *ctx,
+                                     JSValueConst this_val,
+                                     int argc, JSValueConst *argv, int class_id)
+{
+    JSArrayBuffer *abuf, *new_abuf;
+    int64_t len, start, end, new_len;
+    JSValue ctor, new_obj;
+
+    abuf = JS_GetOpaque2(ctx, this_val, class_id);
+    if (!abuf)
+        return JS_EXCEPTION;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    len = abuf->byte_length;
+
+    if (JS_ToInt64Clamp(ctx, &start, argv[0], 0, len, len))
+        return JS_EXCEPTION;
+
+    end = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt64Clamp(ctx, &end, argv[1], 0, len, len))
+            return JS_EXCEPTION;
+    }
+    new_len = max_int64(end - start, 0);
+    ctor = JS_SpeciesConstructor(ctx, this_val, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    if (JS_IsUndefined(ctor)) {
+        new_obj = js_array_buffer_constructor2(ctx, JS_UNDEFINED, new_len,
+                                               class_id);
+    } else {
+        JSValue args[1];
+        args[0] = JS_NewInt64(ctx, new_len);
+        new_obj = JS_CallConstructor(ctx, ctor, 1, (JSValueConst *)args);
+        JS_FreeValue(ctx, ctor);
+        JS_FreeValue(ctx, args[0]);
+    }
+    if (JS_IsException(new_obj))
+        return new_obj;
+    new_abuf = JS_GetOpaque2(ctx, new_obj, class_id);
+    if (!new_abuf)
+        goto fail;
+    if (js_same_value(ctx, new_obj, this_val)) {
+        JS_ThrowTypeError(ctx, "cannot use identical ArrayBuffer");
+        goto fail;
+    }
+    if (new_abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    if (new_abuf->byte_length < new_len) {
+        JS_ThrowTypeError(ctx, "new ArrayBuffer is too small");
+        goto fail;
+    }
+    /* must test again because of side effects */
+    if (abuf->detached) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    memcpy(new_abuf->data, abuf->data + start, new_len);
+    return new_obj;
+ fail:
+    JS_FreeValue(ctx, new_obj);
+    return JS_EXCEPTION;
+}
+
+static const JSCFunctionListEntry js_array_buffer_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("byteLength", js_array_buffer_get_byteLength, NULL, JS_CLASS_ARRAY_BUFFER ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_buffer_slice, JS_CLASS_ARRAY_BUFFER ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "ArrayBuffer", JS_PROP_CONFIGURABLE ),
+};
+
+/* SharedArrayBuffer */
+
+static const JSCFunctionListEntry js_shared_array_buffer_funcs[] = {
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+};
+
+static const JSCFunctionListEntry js_shared_array_buffer_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("byteLength", js_array_buffer_get_byteLength, NULL, JS_CLASS_SHARED_ARRAY_BUFFER ),
+    JS_CFUNC_MAGIC_DEF("slice", 2, js_array_buffer_slice, JS_CLASS_SHARED_ARRAY_BUFFER ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "SharedArrayBuffer", JS_PROP_CONFIGURABLE ),
+};
+
+static JSObject *get_typed_array(JSContext *ctx,
+                                 JSValueConst this_val,
+                                 int is_dataview)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (is_dataview) {
+        if (p->class_id != JS_CLASS_DATAVIEW)
+            goto fail;
+    } else {
+        if (!(p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+              p->class_id <= JS_CLASS_FLOAT64_ARRAY)) {
+        fail:
+            JS_ThrowTypeError(ctx, "not a %s", is_dataview ? "DataView" : "TypedArray");
+            return NULL;
+        }
+    }
+    return p;
+}
+
+/* WARNING: 'p' must be a typed array */
+static BOOL typed_array_is_detached(JSContext *ctx, JSObject *p)
+{
+    JSTypedArray *ta = p->u.typed_array;
+    JSArrayBuffer *abuf = ta->buffer->u.array_buffer;
+    /* XXX: could simplify test by ensuring that
+       p->u.array.u.ptr is NULL iff it is detached */
+    return abuf->detached;
+}
+
+/* WARNING: 'p' must be a typed array. Works even if the array buffer
+   is detached */
+static uint32_t typed_array_get_length(JSContext *ctx, JSObject *p)
+{
+    JSTypedArray *ta = p->u.typed_array;
+    int size_log2 = typed_array_size_log2(p->class_id);
+    return ta->length >> size_log2;
+}
+
+static int validate_typed_array(JSContext *ctx, JSValueConst this_val)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        return -1;
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        return -1;
+    }
+    return 0;
+}
+
+static JSValue js_typed_array_get_length(JSContext *ctx,
+                                         JSValueConst this_val)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        return JS_EXCEPTION;
+    return JS_NewInt32(ctx, p->u.array.count);
+}
+
+static JSValue js_typed_array_get_buffer(JSContext *ctx,
+                                         JSValueConst this_val, int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    ta = p->u.typed_array;
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+}
+
+static JSValue js_typed_array_get_byteLength(JSContext *ctx,
+                                             JSValueConst this_val,
+                                             int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p)) {
+        if (is_dataview) {
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        } else {
+            return JS_NewInt32(ctx, 0);
+        }
+    }
+    ta = p->u.typed_array;
+    return JS_NewInt32(ctx, ta->length);
+}
+
+static JSValue js_typed_array_get_byteOffset(JSContext *ctx,
+                                             JSValueConst this_val,
+                                             int is_dataview)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, this_val, is_dataview);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p)) {
+        if (is_dataview) {
+            return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        } else {
+            return JS_NewInt32(ctx, 0);
+        }
+    }
+    ta = p->u.typed_array;
+    return JS_NewInt32(ctx, ta->offset);
+}
+
+/* Return the buffer associated to the typed array or an exception if
+   it is not a typed array or if the buffer is detached. pbyte_offset,
+   pbyte_length or pbytes_per_element can be NULL. */
+JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
+                               size_t *pbyte_offset,
+                               size_t *pbyte_length,
+                               size_t *pbytes_per_element)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    p = get_typed_array(ctx, obj, FALSE);
+    if (!p)
+        return JS_EXCEPTION;
+    if (typed_array_is_detached(ctx, p))
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    ta = p->u.typed_array;
+    if (pbyte_offset)
+        *pbyte_offset = ta->offset;
+    if (pbyte_length)
+        *pbyte_length = ta->length;
+    if (pbytes_per_element) {
+        *pbytes_per_element = 1 << typed_array_size_log2(p->class_id);
+    }
+    return JS_DupValue(ctx, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+}
+
+static JSValue js_typed_array_get_toStringTag(JSContext *ctx,
+                                              JSValueConst this_val)
+{
+    JSObject *p;
+    if (JS_VALUE_GET_TAG(this_val) != JS_TAG_OBJECT)
+        return JS_UNDEFINED;
+    p = JS_VALUE_GET_OBJ(this_val);
+    if (!(p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+          p->class_id <= JS_CLASS_FLOAT64_ARRAY))
+        return JS_UNDEFINED;
+    return JS_AtomToString(ctx, ctx->rt->class_array[p->class_id].class_name);
+}
+
+static JSValue js_typed_array_set_internal(JSContext *ctx,
+                                           JSValueConst dst,
+                                           JSValueConst src,
+                                           JSValueConst off)
+{
+    JSObject *p;
+    JSObject *src_p;
+    uint32_t i;
+    int64_t src_len, offset;
+    JSValue val, src_obj = JS_UNDEFINED;
+
+    p = get_typed_array(ctx, dst, 0);
+    if (!p)
+        goto fail;
+    if (JS_ToInt64Sat(ctx, &offset, off))
+        goto fail;
+    if (offset < 0)
+        goto range_error;
+    if (typed_array_is_detached(ctx, p)) {
+    detached:
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    src_obj = JS_ToObject(ctx, src);
+    if (JS_IsException(src_obj))
+        goto fail;
+    src_p = JS_VALUE_GET_OBJ(src_obj);
+    if (src_p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+        src_p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+        JSTypedArray *dest_ta = p->u.typed_array;
+        JSArrayBuffer *dest_abuf = dest_ta->buffer->u.array_buffer;
+        JSTypedArray *src_ta = src_p->u.typed_array;
+        JSArrayBuffer *src_abuf = src_ta->buffer->u.array_buffer;
+        int shift = typed_array_size_log2(p->class_id);
+
+        if (src_abuf->detached)
+            goto detached;
+
+        src_len = src_p->u.array.count;
+        if (offset > (int64_t)(p->u.array.count - src_len))
+            goto range_error;
+
+        /* copying between typed objects */
+        if (src_p->class_id == p->class_id) {
+            /* same type, use memmove */
+            memmove(dest_abuf->data + dest_ta->offset + (offset << shift),
+                    src_abuf->data + src_ta->offset, src_len << shift);
+            goto done;
+        }
+        if (dest_abuf->data == src_abuf->data) {
+            /* copying between the same buffer using different types of mappings
+               would require a temporary buffer */
+        }
+        /* otherwise, default behavior is slow but correct */
+    } else {
+        if (js_get_length64(ctx, &src_len, src_obj))
+            goto fail;
+        if (offset > (int64_t)(p->u.array.count - src_len)) {
+        range_error:
+            JS_ThrowRangeError(ctx, "invalid array length");
+            goto fail;
+        }
+    }
+    for(i = 0; i < src_len; i++) {
+        val = JS_GetPropertyUint32(ctx, src_obj, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (JS_SetPropertyUint32(ctx, dst, offset + i, val) < 0)
+            goto fail;
+    }
+done:
+    JS_FreeValue(ctx, src_obj);
+    return JS_UNDEFINED;
+fail:
+    JS_FreeValue(ctx, src_obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_set(JSContext *ctx,
+                                  JSValueConst this_val,
+                                  int argc, JSValueConst *argv)
+{
+    JSValueConst offset = JS_UNDEFINED;
+    if (argc > 1) {
+        offset = argv[1];
+    }
+    return js_typed_array_set_internal(ctx, this_val, argv[0], offset);
+}
+
+static JSValue js_create_typed_array_iterator(JSContext *ctx, JSValueConst this_val,
+                                              int argc, JSValueConst *argv, int magic)
+{
+    if (validate_typed_array(ctx, this_val))
+        return JS_EXCEPTION;
+    return js_create_array_iterator(ctx, this_val, argc, argv, magic);
+}
+
+/* return < 0 if exception */
+static int js_typed_array_get_length_internal(JSContext *ctx,
+                                              JSValueConst obj)
+{
+    JSObject *p;
+    p = get_typed_array(ctx, obj, 0);
+    if (!p)
+        return -1;
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        return -1;
+    }
+    return p->u.array.count;
+}
+
+#if 0
+/* validate a typed array and return its length */
+static JSValue js_typed_array___getLength(JSContext *ctx,
+                                          JSValueConst this_val,
+                                          int argc, JSValueConst *argv)
+{
+    BOOL ignore_detached = JS_ToBool(ctx, argv[1]);
+
+    if (ignore_detached) {
+        return js_typed_array_get_length(ctx, argv[0]);
+    } else {
+        int len;
+        len = js_typed_array_get_length_internal(ctx, argv[0]);
+        if (len < 0)
+            return JS_EXCEPTION;
+        return JS_NewInt32(ctx, len);
+    }
+}
+#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)
+{
+    JSValue ret;
+    int new_len;
+    int64_t len;
+
+    ret = JS_CallConstructor(ctx, ctor, argc, argv);
+    if (JS_IsException(ret))
+        return ret;
+    /* validate the typed array */
+    new_len = js_typed_array_get_length_internal(ctx, ret);
+    if (new_len < 0)
+        goto fail;
+    if (argc == 1) {
+        /* ensure that it is large enough */
+        if (JS_ToLengthFree(ctx, &len, JS_DupValue(ctx, argv[0])))
+            goto fail;
+        if (new_len < len) {
+            JS_ThrowTypeError(ctx, "TypedArray length is too small");
+        fail:
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+    }
+    return ret;
+}
+
+#if 0
+static JSValue js_typed_array___create(JSContext *ctx,
+                                       JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    return js_typed_array_create(ctx, argv[0], max_int(argc - 1, 0), argv + 1);
+}
+#endif
+
+static JSValue js_typed_array___speciesCreate(JSContext *ctx,
+                                              JSValueConst this_val,
+                                              int argc, JSValueConst *argv)
+{
+    JSValueConst obj;
+    JSObject *p;
+    JSValue ctor, ret;
+    int argc1;
+
+    obj = argv[0];
+    p = get_typed_array(ctx, obj, 0);
+    if (!p)
+        return JS_EXCEPTION;
+    ctor = JS_SpeciesConstructor(ctx, obj, JS_UNDEFINED);
+    if (JS_IsException(ctor))
+        return ctor;
+    argc1 = max_int(argc - 1, 0);
+    if (JS_IsUndefined(ctor)) {
+        ret = js_typed_array_constructor(ctx, JS_UNDEFINED, argc1, argv + 1,
+                                         p->class_id);
+    } else {
+        ret = js_typed_array_create(ctx, ctor, argc1, argv + 1);
+        JS_FreeValue(ctx, ctor);
+    }
+    return ret;
+}
+
+static JSValue js_typed_array_from(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    // from(items, mapfn = void 0, this_arg = void 0)
+    JSValueConst items = argv[0], mapfn, this_arg;
+    JSValueConst args[2];
+    JSValue stack[2];
+    JSValue iter, arr, r, v, v2;
+    int64_t k, len;
+    int done, mapping;
+
+    mapping = FALSE;
+    mapfn = JS_UNDEFINED;
+    this_arg = JS_UNDEFINED;
+    r = JS_UNDEFINED;
+    arr = JS_UNDEFINED;
+    stack[0] = JS_UNDEFINED;
+    stack[1] = JS_UNDEFINED;
+
+    if (argc > 1) {
+        mapfn = argv[1];
+        if (!JS_IsUndefined(mapfn)) {
+            if (check_function(ctx, mapfn))
+                goto exception;
+            mapping = 1;
+            if (argc > 2)
+                this_arg = argv[2];
+        }
+    }
+    iter = JS_GetProperty(ctx, items, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto exception;
+    if (!JS_IsUndefined(iter)) {
+        JS_FreeValue(ctx, iter);
+        arr = JS_NewArray(ctx);
+        if (JS_IsException(arr))
+            goto exception;
+        stack[0] = JS_DupValue(ctx, items);
+        if (js_for_of_start(ctx, &stack[1], FALSE))
+            goto exception;
+        for (k = 0;; k++) {
+            v = JS_IteratorNext(ctx, stack[0], stack[1], 0, NULL, &done);
+            if (JS_IsException(v))
+                goto exception_close;
+            if (done)
+                break;
+            if (JS_DefinePropertyValueInt64(ctx, arr, k, v, JS_PROP_C_W_E | JS_PROP_THROW) < 0)
+                goto exception_close;
+        }
+    } else {
+        arr = JS_ToObject(ctx, items);
+        if (JS_IsException(arr))
+            goto exception;
+    }
+    if (js_get_length64(ctx, &len, arr) < 0)
+        goto exception;
+    v = JS_NewInt64(ctx, len);
+    args[0] = v;
+    r = js_typed_array_create(ctx, this_val, 1, args);
+    JS_FreeValue(ctx, v);
+    if (JS_IsException(r))
+        goto exception;
+    for(k = 0; k < len; k++) {
+        v = JS_GetPropertyInt64(ctx, arr, k);
+        if (JS_IsException(v))
+            goto exception;
+        if (mapping) {
+            args[0] = v;
+            args[1] = JS_NewInt32(ctx, k);
+            v2 = JS_Call(ctx, mapfn, this_arg, 2, args);
+            JS_FreeValue(ctx, v);
+            v = v2;
+            if (JS_IsException(v))
+                goto exception;
+        }
+        if (JS_SetPropertyInt64(ctx, r, k, v) < 0)
+            goto exception;
+    }
+    goto done;
+
+ exception_close:
+    if (!JS_IsUndefined(stack[0]))
+        JS_IteratorClose(ctx, stack[0], TRUE);
+ exception:
+    JS_FreeValue(ctx, r);
+    r = JS_EXCEPTION;
+ done:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, stack[0]);
+    JS_FreeValue(ctx, stack[1]);
+    return r;
+}
+
+static JSValue js_typed_array_of(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv)
+{
+    JSValue obj;
+    JSValueConst args[1];
+    int i;
+
+    args[0] = JS_NewInt32(ctx, argc);
+    obj = js_typed_array_create(ctx, this_val, 1, args);
+    if (JS_IsException(obj))
+        return obj;
+
+    for(i = 0; i < argc; i++) {
+        if (JS_SetPropertyUint32(ctx, obj, i, JS_DupValue(ctx, argv[i])) < 0) {
+            JS_FreeValue(ctx, obj);
+            return JS_EXCEPTION;
+        }
+    }
+    return obj;
+}
+
+static JSValue js_typed_array_copyWithin(JSContext *ctx, JSValueConst this_val,
+                                         int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len, to, from, final, count, shift;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+
+    if (JS_ToInt32Clamp(ctx, &to, argv[0], 0, len, len))
+        return JS_EXCEPTION;
+
+    if (JS_ToInt32Clamp(ctx, &from, argv[1], 0, len, len))
+        return JS_EXCEPTION;
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[2], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    count = min_int(final - from, len - to);
+    if (count > 0) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        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),
+                count << shift);
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_fill(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len, k, final, shift;
+    uint64_t v64;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+    p = JS_VALUE_GET_OBJ(this_val);
+
+    if (p->class_id == JS_CLASS_UINT8C_ARRAY) {
+        int32_t v;
+        if (JS_ToUint8ClampFree(ctx, &v, JS_DupValue(ctx, argv[0])))
+            return JS_EXCEPTION;
+        v64 = v;
+    } else if (p->class_id <= JS_CLASS_UINT32_ARRAY) {
+        uint32_t v;
+        if (JS_ToUint32(ctx, &v, argv[0]))
+            return JS_EXCEPTION;
+        v64 = v;
+    } else
+#ifdef CONFIG_BIGNUM
+    if (p->class_id <= JS_CLASS_BIG_UINT64_ARRAY) {
+        if (JS_ToBigInt64(ctx, (int64_t *)&v64, argv[0]))
+            return JS_EXCEPTION;
+    } else
+#endif
+    {
+        double d;
+        if (JS_ToFloat64(ctx, &d, argv[0]))
+            return JS_EXCEPTION;
+        if (p->class_id == JS_CLASS_FLOAT32_ARRAY) {
+            union {
+                float f;
+                uint32_t u32;
+            } u;
+            u.f = d;
+            v64 = u.u32;
+        } else {
+            JSFloat64Union u;
+            u.d = d;
+            v64 = u.u64;
+        }
+    }
+
+    k = 0;
+    if (argc > 1) {
+        if (JS_ToInt32Clamp(ctx, &k, argv[1], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    final = len;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[2], 0, len, len))
+            return JS_EXCEPTION;
+    }
+
+    shift = typed_array_size_log2(p->class_id);
+    switch(shift) {
+    case 0:
+        if (k < final) {
+            memset(p->u.array.u.uint8_ptr + k, v64, final - k);
+        }
+        break;
+    case 1:
+        for(; k < final; k++) {
+            p->u.array.u.uint16_ptr[k] = v64;
+        }
+        break;
+    case 2:
+        for(; k < final; k++) {
+            p->u.array.u.uint32_ptr[k] = v64;
+        }
+        break;
+    case 3:
+        for(; k < final; k++) {
+            p->u.array.u.uint64_ptr[k] = v64;
+        }
+        break;
+    default:
+        abort();
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_find(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int findIndex)
+{
+    JSValueConst func, this_arg;
+    JSValueConst args[3];
+    JSValue val, index_val, res;
+    int len, k;
+
+    val = JS_UNDEFINED;
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+
+    func = argv[0];
+    if (check_function(ctx, func))
+        goto exception;
+
+    this_arg = JS_UNDEFINED;
+    if (argc > 1)
+        this_arg = argv[1];
+
+    for(k = 0; k < len; k++) {
+        index_val = JS_NewInt32(ctx, k);
+        val = JS_GetPropertyValue(ctx, this_val, index_val);
+        if (JS_IsException(val))
+            goto exception;
+        args[0] = val;
+        args[1] = index_val;
+        args[2] = this_val;
+        res = JS_Call(ctx, func, this_arg, 3, args);
+        if (JS_IsException(res))
+            goto exception;
+        if (JS_ToBoolFree(ctx, res)) {
+            if (findIndex) {
+                JS_FreeValue(ctx, val);
+                return index_val;
+            } else {
+                return val;
+            }
+        }
+        JS_FreeValue(ctx, val);
+    }
+    if (findIndex)
+        return JS_NewInt32(ctx, -1);
+    else
+        return JS_UNDEFINED;
+
+exception:
+    JS_FreeValue(ctx, val);
+    return JS_EXCEPTION;
+}
+
+#define special_indexOf 0
+#define special_lastIndexOf 1
+#define special_includes -1
+
+static JSValue js_typed_array_indexOf(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv, int special)
+{
+    JSObject *p;
+    int len, tag, is_int, is_big, k, stop, inc, res = -1;
+    int64_t v64;
+    double d;
+    float f;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+    if (len == 0)
+        goto done;
+
+    if (special == special_lastIndexOf) {
+        k = len - 1;
+        if (argc > 1) {
+            if (JS_ToFloat64(ctx, &d, argv[1]))
+                goto exception;
+            if (isnan(d)) {
+                k = 0;
+            } else {
+                if (d >= 0) {
+                    if (d < k) {
+                        k = d;
+                    }
+                } else {
+                    d += len;
+                    if (d < 0)
+                        goto done;
+                    k = d;
+                }
+            }
+        }
+        stop = -1;
+        inc = -1;
+    } else {
+        k = 0;
+        if (argc > 1) {
+            if (JS_ToInt32Clamp(ctx, &k, argv[1], 0, len, len))
+                goto exception;
+        }
+        stop = len;
+        inc = 1;
+    }
+
+    is_big = 0;
+    is_int = 0; /* avoid warning */
+    v64 = 0; /* avoid warning */
+    tag = JS_VALUE_GET_NORM_TAG(argv[0]);
+    if (tag == JS_TAG_INT) {
+        is_int = 1;
+        v64 = JS_VALUE_GET_INT(argv[0]);
+        d = v64;
+    } else
+    if (tag == JS_TAG_FLOAT64) {
+        d = JS_VALUE_GET_FLOAT64(argv[0]);
+        v64 = d;
+        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;
+    } 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)
+            goto scan8;
+        break;
+    case JS_CLASS_UINT8C_ARRAY:
+    case JS_CLASS_UINT8_ARRAY:
+        if (is_int && (uint8_t)v64 == v64) {
+            const uint8_t *pv, *pp;
+            uint16_t v;
+        scan8:
+            pv = p->u.array.u.uint8_ptr;
+            v = v64;
+            if (inc > 0) {
+                pp = memchr(pv + k, v, len - k);
+                if (pp)
+                    res = pp - pv;
+            } else {
+                for (; k != stop; k += inc) {
+                    if (pv[k] == v) {
+                        res = k;
+                        break;
+                    }
+                }
+            }
+        }
+        break;
+    case JS_CLASS_INT16_ARRAY:
+        if (is_int && (int16_t)v64 == v64)
+            goto scan16;
+        break;
+    case JS_CLASS_UINT16_ARRAY:
+        if (is_int && (uint16_t)v64 == v64) {
+            const uint16_t *pv;
+            uint16_t v;
+        scan16:
+            pv = p->u.array.u.uint16_ptr;
+            v = v64;
+            for (; k != stop; k += inc) {
+                if (pv[k] == v) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_INT32_ARRAY:
+        if (is_int && (int32_t)v64 == v64)
+            goto scan32;
+        break;
+    case JS_CLASS_UINT32_ARRAY:
+        if (is_int && (uint32_t)v64 == v64) {
+            const uint32_t *pv;
+            uint32_t v;
+        scan32:
+            pv = p->u.array.u.uint32_ptr;
+            v = v64;
+            for (; k != stop; k += inc) {
+                if (pv[k] == v) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_FLOAT32_ARRAY:
+        if (is_big)
+            break;
+        if (isnan(d)) {
+            const float *pv = p->u.array.u.float_ptr;
+            /* special case: indexOf returns -1, includes finds NaN */
+            if (special != special_includes)
+                goto done;
+            for (; k != stop; k += inc) {
+                if (isnan(pv[k])) {
+                    res = k;
+                    break;
+                }
+            }
+        } else if ((f = (float)d) == d) {
+            const float *pv = p->u.array.u.float_ptr;
+            for (; k != stop; k += inc) {
+                if (pv[k] == f) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+    case JS_CLASS_FLOAT64_ARRAY:
+        if (is_big)
+            break;
+        if (isnan(d)) {
+            const double *pv = p->u.array.u.double_ptr;
+            /* special case: indexOf returns -1, includes finds NaN */
+            if (special != special_includes)
+                goto done;
+            for (; k != stop; k += inc) {
+                if (isnan(pv[k])) {
+                    res = k;
+                    break;
+                }
+            }
+        } else {
+            const double *pv = p->u.array.u.double_ptr;
+            for (; k != stop; k += inc) {
+                if (pv[k] == d) {
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_INT64_ARRAY:
+    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 */
+            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;
+                    res = k;
+                    break;
+                }
+            }
+        }
+        break;
+#endif
+    }
+
+done:
+    if (special == special_includes)
+        return JS_NewBool(ctx, res >= 0);
+    else
+        return JS_NewInt32(ctx, res);
+
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_join(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv, int toLocaleString)
+{
+    JSValue sep = JS_UNDEFINED, el;
+    StringBuffer b_s, *b = &b_s;
+    JSString *p = NULL;
+    int i, n;
+    int c;
+
+    n = js_typed_array_get_length_internal(ctx, this_val);
+    if (n < 0)
+        goto exception;
+
+    c = ',';    /* default separator */
+    if (!toLocaleString && argc > 0 && !JS_IsUndefined(argv[0])) {
+        sep = JS_ToString(ctx, argv[0]);
+        if (JS_IsException(sep))
+            goto exception;
+        p = JS_VALUE_GET_STRING(sep);
+        if (p->len == 1 && !p->is_wide_char)
+            c = p->u.str8[0];
+        else
+            c = -1;
+    }
+    string_buffer_init(ctx, b, 0);
+
+    /* XXX: optimize with direct access */
+    for(i = 0; i < n; i++) {
+        if (i > 0) {
+            if (c >= 0) {
+                if (string_buffer_putc8(b, c))
+                    goto fail;
+            } else {
+                if (string_buffer_concat(b, p, 0, p->len))
+                    goto fail;
+            }
+        }
+        el = JS_GetPropertyUint32(ctx, this_val, i);
+        if (JS_IsException(el))
+            goto fail;
+        if (toLocaleString) {
+            el = JS_ToLocaleStringFree(ctx, el);
+        }
+        if (string_buffer_concat_value_free(b, el))
+            goto fail;
+    }
+    JS_FreeValue(ctx, sep);
+    return string_buffer_end(b);
+
+fail:
+    string_buffer_free(b);
+    JS_FreeValue(ctx, sep);
+exception:
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_reverse(JSContext *ctx, JSValueConst this_val,
+                                      int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len;
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+    if (len > 0) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        switch (typed_array_size_log2(p->class_id)) {
+        case 0:
+            {
+                uint8_t *p1 = p->u.array.u.uint8_ptr;
+                uint8_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint8_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 1:
+            {
+                uint16_t *p1 = p->u.array.u.uint16_ptr;
+                uint16_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint16_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 2:
+            {
+                uint32_t *p1 = p->u.array.u.uint32_ptr;
+                uint32_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint32_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        case 3:
+            {
+                uint64_t *p1 = p->u.array.u.uint64_ptr;
+                uint64_t *p2 = p1 + len - 1;
+                while (p1 < p2) {
+                    uint64_t v = *p1;
+                    *p1++ = *p2;
+                    *p2-- = v;
+                }
+            }
+            break;
+        default:
+            abort();
+        }
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static JSValue js_typed_array_slice(JSContext *ctx, JSValueConst this_val,
+                                    int argc, JSValueConst *argv)
+{
+    JSValueConst args[2];
+    JSValue arr, val;
+    JSObject *p, *p1;
+    int n, len, start, final, count, shift;
+
+    arr = JS_UNDEFINED;
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        goto exception;
+
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+    final = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[1], 0, len, len))
+            goto exception;
+    }
+    count = max_int(final - start, 0);
+
+    p = get_typed_array(ctx, this_val, 0);
+    if (p == NULL)
+        goto exception;
+    shift = typed_array_size_log2(p->class_id);
+
+    args[0] = this_val;
+    args[1] = JS_NewInt32(ctx, count);
+    arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 2, args);
+    if (JS_IsException(arr))
+        goto exception;
+
+    if (count > 0) {
+        if (validate_typed_array(ctx, this_val)
+        ||  validate_typed_array(ctx, arr))
+            goto exception;
+
+        p1 = get_typed_array(ctx, arr, 0);
+        if (p1 != NULL && p->class_id == p1->class_id &&
+            typed_array_get_length(ctx, p1) >= count &&
+            typed_array_get_length(ctx, p) >= start + count) {
+            memcpy(p1->u.array.u.uint8_ptr,
+                   p->u.array.u.uint8_ptr + (start << shift),
+                   count << shift);
+        } else {
+            for (n = 0; n < count; n++) {
+                val = JS_GetPropertyValue(ctx, this_val, JS_NewInt32(ctx, start + n));
+                if (JS_IsException(val))
+                    goto exception;
+                if (JS_SetPropertyValue(ctx, arr, JS_NewInt32(ctx, n), val,
+                                        JS_PROP_THROW) < 0)
+                    goto exception;
+            }
+        }
+    }
+    return arr;
+
+ exception:
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_subarray(JSContext *ctx, JSValueConst this_val,
+                                       int argc, JSValueConst *argv)
+{
+    JSValueConst args[4];
+    JSValue arr, byteOffset, ta_buffer;
+    JSObject *p;
+    int len, start, final, count, shift, offset;
+
+    p = get_typed_array(ctx, this_val, 0);
+    if (!p)
+        goto exception;
+    len = p->u.array.count;
+    if (JS_ToInt32Clamp(ctx, &start, argv[0], 0, len, len))
+        goto exception;
+
+    final = len;
+    if (!JS_IsUndefined(argv[1])) {
+        if (JS_ToInt32Clamp(ctx, &final, argv[1], 0, len, len))
+            goto exception;
+    }
+    count = max_int(final - start, 0);
+    byteOffset = js_typed_array_get_byteOffset(ctx, this_val, 0);
+    if (JS_IsException(byteOffset))
+        goto exception;
+    shift = typed_array_size_log2(p->class_id);
+    offset = JS_VALUE_GET_INT(byteOffset) + (start << shift);
+    JS_FreeValue(ctx, byteOffset);
+    ta_buffer = js_typed_array_get_buffer(ctx, this_val, 0);
+    if (JS_IsException(ta_buffer))
+        goto exception;
+    args[0] = this_val;
+    args[1] = ta_buffer;
+    args[2] = JS_NewInt32(ctx, offset);
+    args[3] = JS_NewInt32(ctx, count);
+    arr = js_typed_array___speciesCreate(ctx, JS_UNDEFINED, 4, args);
+    JS_FreeValue(ctx, ta_buffer);
+    return arr;
+
+ exception:
+    return JS_EXCEPTION;
+}
+
+/* TypedArray.prototype.sort */
+
+static int js_cmp_doubles(double x, double y)
+{
+    if (isnan(x))    return isnan(y) ? 0 : +1;
+    if (isnan(y))    return -1;
+    if (x < y)       return -1;
+    if (x > y)       return 1;
+    if (x != 0)      return 0;
+    if (signbit(x))  return signbit(y) ? 0 : -1;
+    else             return signbit(y) ? 1 : 0;
+}
+
+static int js_TA_cmp_int8(const void *a, const void *b, void *opaque) {
+    return *(const int8_t *)a - *(const int8_t *)b;
+}
+
+static int js_TA_cmp_uint8(const void *a, const void *b, void *opaque) {
+    return *(const uint8_t *)a - *(const uint8_t *)b;
+}
+
+static int js_TA_cmp_int16(const void *a, const void *b, void *opaque) {
+    return *(const int16_t *)a - *(const int16_t *)b;
+}
+
+static int js_TA_cmp_uint16(const void *a, const void *b, void *opaque) {
+    return *(const uint16_t *)a - *(const uint16_t *)b;
+}
+
+static int js_TA_cmp_int32(const void *a, const void *b, void *opaque) {
+    int32_t x = *(const int32_t *)a;
+    int32_t y = *(const int32_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_uint32(const void *a, const void *b, void *opaque) {
+    uint32_t x = *(const uint32_t *)a;
+    uint32_t y = *(const uint32_t *)b;
+    return (y < x) - (y > x);
+}
+
+#ifdef CONFIG_BIGNUM
+static int js_TA_cmp_int64(const void *a, const void *b, void *opaque) {
+    int64_t x = *(const int64_t *)a;
+    int64_t y = *(const int64_t *)b;
+    return (y < x) - (y > x);
+}
+
+static int js_TA_cmp_uint64(const void *a, const void *b, void *opaque) {
+    uint64_t x = *(const uint64_t *)a;
+    uint64_t y = *(const uint64_t *)b;
+    return (y < x) - (y > x);
+}
+#endif
+
+static int js_TA_cmp_float32(const void *a, const void *b, void *opaque) {
+    return js_cmp_doubles(*(const float *)a, *(const float *)b);
+}
+
+static int js_TA_cmp_float64(const void *a, const void *b, void *opaque) {
+    return js_cmp_doubles(*(const double *)a, *(const double *)b);
+}
+
+static JSValue js_TA_get_int8(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int8_t *)a);
+}
+
+static JSValue js_TA_get_uint8(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const uint8_t *)a);
+}
+
+static JSValue js_TA_get_int16(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int16_t *)a);
+}
+
+static JSValue js_TA_get_uint16(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const uint16_t *)a);
+}
+
+static JSValue js_TA_get_int32(JSContext *ctx, const void *a) {
+    return JS_NewInt32(ctx, *(const int32_t *)a);
+}
+
+static JSValue js_TA_get_uint32(JSContext *ctx, const void *a) {
+    return JS_NewUint32(ctx, *(const uint32_t *)a);
+}
+
+#ifdef CONFIG_BIGNUM
+static JSValue js_TA_get_int64(JSContext *ctx, const void *a) {
+    return JS_NewBigInt64(ctx, *(int64_t *)a);
+}
+
+static JSValue js_TA_get_uint64(JSContext *ctx, const void *a) {
+    return JS_NewBigUint64(ctx, *(uint64_t *)a);
+}
+#endif
+
+static JSValue js_TA_get_float32(JSContext *ctx, const void *a) {
+    return __JS_NewFloat64(ctx, *(const float *)a);
+}
+
+static JSValue js_TA_get_float64(JSContext *ctx, const void *a) {
+    return __JS_NewFloat64(ctx, *(const double *)a);
+}
+
+struct TA_sort_context {
+    JSContext *ctx;
+    int exception;
+    JSValueConst arr;
+    JSValueConst cmp;
+    JSValue (*getfun)(JSContext *ctx, const void *a);
+    uint8_t *array_ptr; /* cannot change unless the array is detached */
+    int elt_size;
+};
+
+static int js_TA_cmp_generic(const void *a, const void *b, void *opaque) {
+    struct TA_sort_context *psc = opaque;
+    JSContext *ctx = psc->ctx;
+    uint32_t a_idx, b_idx;
+    JSValueConst argv[2];
+    JSValue res;
+    int cmp;
+
+    cmp = 0;
+    if (!psc->exception) {
+        a_idx = *(uint32_t *)a;
+        b_idx = *(uint32_t *)b;
+        argv[0] = psc->getfun(ctx, psc->array_ptr +
+                              a_idx * (size_t)psc->elt_size);
+        argv[1] = psc->getfun(ctx, psc->array_ptr +
+                              b_idx * (size_t)(psc->elt_size));
+        res = JS_Call(ctx, psc->cmp, JS_UNDEFINED, 2, argv);
+        if (JS_IsException(res)) {
+            psc->exception = 1;
+            goto done;
+        }
+        if (JS_VALUE_GET_TAG(res) == JS_TAG_INT) {
+            int val = JS_VALUE_GET_INT(res);
+            cmp = (val > 0) - (val < 0);
+        } else {
+            double val;
+            if (JS_ToFloat64Free(ctx, &val, res) < 0) {
+                psc->exception = 1;
+                goto done;
+            } else {
+                cmp = (val > 0) - (val < 0);
+            }
+        }
+        if (cmp == 0) {
+            /* make sort stable: compare array offsets */
+            cmp = (a_idx > b_idx) - (a_idx < b_idx);
+        }
+        if (validate_typed_array(ctx, psc->arr) < 0) {
+            psc->exception = 1;
+        }
+    done:
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+        JS_FreeValue(ctx, argv[0]);
+        JS_FreeValue(ctx, argv[1]);
+#else
+        JS_FreeValue(ctx, (JSValue)argv[0]);
+        JS_FreeValue(ctx, (JSValue)argv[1]);
+#endif
+    }
+    return cmp;
+}
+
+static JSValue js_typed_array_sort(JSContext *ctx, JSValueConst this_val,
+                                   int argc, JSValueConst *argv)
+{
+    JSObject *p;
+    int len;
+    size_t elt_size;
+    struct TA_sort_context tsc;
+    void *array_ptr;
+    int (*cmpfun)(const void *a, const void *b, void *opaque);
+
+    tsc.ctx = ctx;
+    tsc.exception = 0;
+    tsc.arr = this_val;
+    tsc.cmp = argv[0];
+
+    len = js_typed_array_get_length_internal(ctx, this_val);
+    if (len < 0)
+        return JS_EXCEPTION;
+    if (!JS_IsUndefined(tsc.cmp) && check_function(ctx, tsc.cmp))
+        return JS_EXCEPTION;
+
+    if (len > 1) {
+        p = JS_VALUE_GET_OBJ(this_val);
+        switch (p->class_id) {
+        case JS_CLASS_INT8_ARRAY:
+            tsc.getfun = js_TA_get_int8;
+            cmpfun = js_TA_cmp_int8;
+            break;
+        case JS_CLASS_UINT8C_ARRAY:
+        case JS_CLASS_UINT8_ARRAY:
+            tsc.getfun = js_TA_get_uint8;
+            cmpfun = js_TA_cmp_uint8;
+            break;
+        case JS_CLASS_INT16_ARRAY:
+            tsc.getfun = js_TA_get_int16;
+            cmpfun = js_TA_cmp_int16;
+            break;
+        case JS_CLASS_UINT16_ARRAY:
+            tsc.getfun = js_TA_get_uint16;
+            cmpfun = js_TA_cmp_uint16;
+            break;
+        case JS_CLASS_INT32_ARRAY:
+            tsc.getfun = js_TA_get_int32;
+            cmpfun = js_TA_cmp_int32;
+            break;
+        case JS_CLASS_UINT32_ARRAY:
+            tsc.getfun = js_TA_get_uint32;
+            cmpfun = js_TA_cmp_uint32;
+            break;
+#ifdef CONFIG_BIGNUM
+        case JS_CLASS_BIG_INT64_ARRAY:
+            tsc.getfun = js_TA_get_int64;
+            cmpfun = js_TA_cmp_int64;
+            break;
+        case JS_CLASS_BIG_UINT64_ARRAY:
+            tsc.getfun = js_TA_get_uint64;
+            cmpfun = js_TA_cmp_uint64;
+            break;
+#endif
+        case JS_CLASS_FLOAT32_ARRAY:
+            tsc.getfun = js_TA_get_float32;
+            cmpfun = js_TA_cmp_float32;
+            break;
+        case JS_CLASS_FLOAT64_ARRAY:
+            tsc.getfun = js_TA_get_float64;
+            cmpfun = js_TA_cmp_float64;
+            break;
+        default:
+            abort();
+        }
+        array_ptr = p->u.array.u.ptr;
+        elt_size = 1 << typed_array_size_log2(p->class_id);
+        if (!JS_IsUndefined(tsc.cmp)) {
+            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)
+                return JS_EXCEPTION;
+            for(i = 0; i < len; i++)
+                array_idx[i] = i;
+            tsc.array_ptr = array_ptr;
+            tsc.elt_size = elt_size;
+            rqsort(array_idx, len, sizeof(array_idx[0]),
+                   js_TA_cmp_generic, &tsc);
+            if (tsc.exception)
+                goto fail;
+            array_tmp = js_malloc(ctx, len * elt_size);
+            if (!array_tmp) {
+            fail:
+                js_free(ctx, array_idx);
+                return JS_EXCEPTION;
+            }
+            memcpy(array_tmp, array_ptr, len * elt_size);
+            switch(elt_size) {
+            case 1:
+                for(i = 0; i < len; i++) {
+                    j = array_idx[i];
+                    ((uint8_t *)array_ptr)[i] = ((uint8_t *)array_tmp)[j];
+                }
+                break;
+            case 2:
+                for(i = 0; i < len; i++) {
+                    j = array_idx[i];
+                    ((uint16_t *)array_ptr)[i] = ((uint16_t *)array_tmp)[j];
+                }
+                break;
+            case 4:
+                for(i = 0; i < len; i++) {
+                    j = array_idx[i];
+                    ((uint32_t *)array_ptr)[i] = ((uint32_t *)array_tmp)[j];
+                }
+                break;
+            case 8:
+                for(i = 0; i < len; i++) {
+                    j = array_idx[i];
+                    ((uint64_t *)array_ptr)[i] = ((uint64_t *)array_tmp)[j];
+                }
+                break;
+            default:
+                abort();
+            }
+            js_free(ctx, array_tmp);
+            js_free(ctx, array_idx);
+        } else {
+            rqsort(array_ptr, len, elt_size, cmpfun, &tsc);
+            if (tsc.exception)
+                return JS_EXCEPTION;
+        }
+    }
+    return JS_DupValue(ctx, this_val);
+}
+
+static const JSCFunctionListEntry js_typed_array_base_funcs[] = {
+    JS_CFUNC_DEF("from", 1, js_typed_array_from ),
+    JS_CFUNC_DEF("of", 0, js_typed_array_of ),
+    JS_CGETSET_DEF("[Symbol.species]", js_get_this, NULL ),
+    //JS_CFUNC_DEF("__getLength", 2, js_typed_array___getLength ),
+    //JS_CFUNC_DEF("__create", 2, js_typed_array___create ),
+    //JS_CFUNC_DEF("__speciesCreate", 2, js_typed_array___speciesCreate ),
+};
+
+static const JSCFunctionListEntry js_typed_array_base_proto_funcs[] = {
+    JS_CGETSET_DEF("length", js_typed_array_get_length, NULL ),
+    JS_CGETSET_MAGIC_DEF("buffer", js_typed_array_get_buffer, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("byteLength", js_typed_array_get_byteLength, NULL, 0 ),
+    JS_CGETSET_MAGIC_DEF("byteOffset", js_typed_array_get_byteOffset, NULL, 0 ),
+    JS_CFUNC_DEF("set", 1, js_typed_array_set ),
+    JS_CFUNC_MAGIC_DEF("values", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_VALUE ),
+    JS_ALIAS_DEF("[Symbol.iterator]", "values" ),
+    JS_CFUNC_MAGIC_DEF("keys", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_KEY ),
+    JS_CFUNC_MAGIC_DEF("entries", 0, js_create_typed_array_iterator, JS_ITERATOR_KIND_KEY_AND_VALUE ),
+    JS_CGETSET_DEF("[Symbol.toStringTag]", js_typed_array_get_toStringTag, NULL ),
+    JS_CFUNC_DEF("copyWithin", 2, js_typed_array_copyWithin ),
+    JS_CFUNC_MAGIC_DEF("every", 1, js_array_every, special_every | special_TA ),
+    JS_CFUNC_MAGIC_DEF("some", 1, js_array_every, special_some | special_TA ),
+    JS_CFUNC_MAGIC_DEF("forEach", 1, js_array_every, special_forEach | special_TA ),
+    JS_CFUNC_MAGIC_DEF("map", 1, js_array_every, special_map | special_TA ),
+    JS_CFUNC_MAGIC_DEF("filter", 1, js_array_every, special_filter | special_TA ),
+    JS_CFUNC_MAGIC_DEF("reduce", 1, js_array_reduce, special_reduce | special_TA ),
+    JS_CFUNC_MAGIC_DEF("reduceRight", 1, js_array_reduce, special_reduceRight | special_TA ),
+    JS_CFUNC_DEF("fill", 1, js_typed_array_fill ),
+    JS_CFUNC_MAGIC_DEF("find", 1, js_typed_array_find, 0 ),
+    JS_CFUNC_MAGIC_DEF("findIndex", 1, js_typed_array_find, 1 ),
+    JS_CFUNC_DEF("reverse", 0, js_typed_array_reverse ),
+    JS_CFUNC_DEF("slice", 2, js_typed_array_slice ),
+    JS_CFUNC_DEF("subarray", 2, js_typed_array_subarray ),
+    JS_CFUNC_DEF("sort", 1, js_typed_array_sort ),
+    JS_CFUNC_MAGIC_DEF("join", 1, js_typed_array_join, 0 ),
+    JS_CFUNC_MAGIC_DEF("toLocaleString", 0, js_typed_array_join, 1 ),
+    JS_CFUNC_MAGIC_DEF("indexOf", 1, js_typed_array_indexOf, special_indexOf ),
+    JS_CFUNC_MAGIC_DEF("lastIndexOf", 1, js_typed_array_indexOf, special_lastIndexOf ),
+    JS_CFUNC_MAGIC_DEF("includes", 1, js_typed_array_indexOf, special_includes ),
+    //JS_ALIAS_BASE_DEF("toString", "toString", 2 /* Array.prototype. */), @@@
+};
+
+static JSValue js_typed_array_base_constructor(JSContext *ctx,
+                                               JSValueConst this_val,
+                                               int argc, JSValueConst *argv)
+{
+    return JS_ThrowTypeError(ctx, "cannot be called");
+}
+
+/* 'obj' must be an allocated typed array object */
+static int typed_array_init(JSContext *ctx, JSValueConst obj,
+                            JSValue buffer, uint64_t offset, uint64_t len)
+{
+    JSTypedArray *ta;
+    JSObject *p, *pbuffer;
+    JSArrayBuffer *abuf;
+    int size_log2;
+
+    p = JS_VALUE_GET_OBJ(obj);
+    size_log2 = typed_array_size_log2(p->class_id);
+    ta = js_malloc(ctx, sizeof(*ta));
+    if (!ta) {
+        JS_FreeValue(ctx, buffer);
+        return -1;
+    }
+    pbuffer = JS_VALUE_GET_OBJ(buffer);
+    abuf = pbuffer->u.array_buffer;
+    ta->obj = p;
+    ta->buffer = pbuffer;
+    ta->offset = offset;
+    ta->length = len << size_log2;
+    list_add_tail(&ta->link, &abuf->array_list);
+    p->u.typed_array = ta;
+    p->u.array.count = len;
+    p->u.array.u.ptr = abuf->data + offset;
+    return 0;
+}
+
+
+static JSValue js_array_from_iterator(JSContext *ctx, uint32_t *plen,
+                                      JSValueConst obj, JSValueConst method)
+{
+    JSValue arr, iter, next_method = JS_UNDEFINED, val;
+    BOOL done;
+    uint32_t k;
+
+    *plen = 0;
+    arr = JS_NewArray(ctx);
+    if (JS_IsException(arr))
+        return arr;
+    iter = JS_GetIterator2(ctx, obj, method);
+    if (JS_IsException(iter))
+        goto fail;
+    next_method = JS_GetProperty(ctx, iter, JS_ATOM_next);
+    if (JS_IsException(next_method))
+        goto fail;
+    k = 0;
+    for(;;) {
+        val = JS_IteratorNext(ctx, iter, next_method, 0, NULL, &done);
+        if (JS_IsException(val))
+            goto fail;
+        if (done) {
+            JS_FreeValue(ctx, val);
+            break;
+        }
+        if (JS_CreateDataPropertyUint32(ctx, arr, k, val, JS_PROP_THROW) < 0)
+            goto fail;
+        k++;
+    }
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    *plen = k;
+    return arr;
+ fail:
+    JS_FreeValue(ctx, next_method);
+    JS_FreeValue(ctx, iter);
+    JS_FreeValue(ctx, arr);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor_obj(JSContext *ctx,
+                                              JSValueConst new_target,
+                                              JSValueConst obj,
+                                              int classid)
+{
+    JSValue iter, ret, arr = JS_UNDEFINED, val, buffer;
+    uint32_t i;
+    int size_log2;
+    int64_t len;
+
+    size_log2 = typed_array_size_log2(classid);
+    ret = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(ret))
+        return JS_EXCEPTION;
+
+    iter = JS_GetProperty(ctx, obj, JS_ATOM_Symbol_iterator);
+    if (JS_IsException(iter))
+        goto fail;
+    if (!JS_IsUndefined(iter) && !JS_IsNull(iter)) {
+        uint32_t len1;
+        arr = js_array_from_iterator(ctx, &len1, obj, iter);
+        JS_FreeValue(ctx, iter);
+        if (JS_IsException(arr))
+            goto fail;
+        len = len1;
+    } else {
+        if (js_get_length64(ctx, &len, obj))
+            goto fail;
+        arr = JS_DupValue(ctx, obj);
+    }
+
+    buffer = js_array_buffer_constructor1(ctx, JS_UNDEFINED,
+                                          len << size_log2);
+    if (JS_IsException(buffer))
+        goto fail;
+    if (typed_array_init(ctx, ret, buffer, 0, len))
+        goto fail;
+
+    for(i = 0; i < len; i++) {
+        val = JS_GetPropertyUint32(ctx, arr, i);
+        if (JS_IsException(val))
+            goto fail;
+        if (JS_SetPropertyUint32(ctx, ret, i, val) < 0)
+            goto fail;
+    }
+    JS_FreeValue(ctx, arr);
+    return ret;
+ fail:
+    JS_FreeValue(ctx, arr);
+    JS_FreeValue(ctx, ret);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor_ta(JSContext *ctx,
+                                             JSValueConst new_target,
+                                             JSValueConst src_obj,
+                                             int classid)
+{
+    JSObject *p, *src_buffer;
+    JSTypedArray *ta;
+    JSValue ctor, obj, buffer;
+    uint32_t len, i;
+    int size_log2;
+    JSArrayBuffer *src_abuf, *abuf;
+
+    obj = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(obj))
+        return obj;
+    p = JS_VALUE_GET_OBJ(src_obj);
+    if (typed_array_is_detached(ctx, p)) {
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    ta = p->u.typed_array;
+    len = p->u.array.count;
+    src_buffer = ta->buffer;
+    src_abuf = src_buffer->u.array_buffer;
+    if (!src_abuf->shared) {
+        ctor = JS_SpeciesConstructor(ctx, JS_MKPTR(JS_TAG_OBJECT, src_buffer),
+                                     JS_UNDEFINED);
+        if (JS_IsException(ctor))
+            goto fail;
+    } else {
+        /* force ArrayBuffer default constructor */
+        ctor = JS_UNDEFINED;
+    }
+    size_log2 = typed_array_size_log2(classid);
+    buffer = js_array_buffer_constructor1(ctx, ctor,
+                                          (uint64_t)len << size_log2);
+    JS_FreeValue(ctx, ctor);
+    if (JS_IsException(buffer))
+        goto fail;
+    /* necessary because it could have been detached */
+    if (typed_array_is_detached(ctx, p)) {
+        JS_FreeValue(ctx, buffer);
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    abuf = JS_GetOpaque(buffer, JS_CLASS_ARRAY_BUFFER);
+    if (typed_array_init(ctx, obj, buffer, 0, len))
+        goto fail;
+    if (p->class_id == classid) {
+        /* same type: copy the content */
+        memcpy(abuf->data, src_abuf->data + ta->offset, abuf->byte_length);
+    } else {
+        for(i = 0; i < len; i++) {
+            JSValue val;
+            val = JS_GetPropertyUint32(ctx, src_obj, i);
+            if (JS_IsException(val))
+                goto fail;
+            if (JS_SetPropertyUint32(ctx, obj, i, val) < 0)
+                goto fail;
+        }
+    }
+    return obj;
+ fail:
+    JS_FreeValue(ctx, obj);
+    return JS_EXCEPTION;
+}
+
+static JSValue js_typed_array_constructor(JSContext *ctx,
+                                          JSValueConst new_target,
+                                          int argc, JSValueConst *argv,
+                                          int classid)
+{
+    JSValue buffer, obj;
+    JSArrayBuffer *abuf;
+    int size_log2;
+    uint64_t len, offset;
+
+    size_log2 = typed_array_size_log2(classid);
+    if (JS_VALUE_GET_TAG(argv[0]) != JS_TAG_OBJECT) {
+        if (JS_ToIndex(ctx, &len, argv[0]))
+            return JS_EXCEPTION;
+        buffer = js_array_buffer_constructor1(ctx, JS_UNDEFINED,
+                                              len << size_log2);
+        if (JS_IsException(buffer))
+            return JS_EXCEPTION;
+        offset = 0;
+    } else {
+        JSObject *p = JS_VALUE_GET_OBJ(argv[0]);
+        if (p->class_id == JS_CLASS_ARRAY_BUFFER ||
+            p->class_id == JS_CLASS_SHARED_ARRAY_BUFFER) {
+            abuf = p->u.array_buffer;
+            if (JS_ToIndex(ctx, &offset, argv[1]))
+                return JS_EXCEPTION;
+            if (abuf->detached)
+                return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+            if ((offset & ((1 << size_log2) - 1)) != 0 ||
+                offset > abuf->byte_length)
+                return JS_ThrowRangeError(ctx, "invalid offset");
+            if (JS_IsUndefined(argv[2])) {
+                if ((abuf->byte_length & ((1 << size_log2) - 1)) != 0)
+                    goto invalid_length;
+                len = (abuf->byte_length - offset) >> size_log2;
+            } else {
+                if (JS_ToIndex(ctx, &len, argv[2]))
+                    return JS_EXCEPTION;
+                if (abuf->detached)
+                    return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+                if ((offset + (len << size_log2)) > abuf->byte_length) {
+                invalid_length:
+                    return JS_ThrowRangeError(ctx, "invalid length");
+                }
+            }
+            buffer = JS_DupValue(ctx, argv[0]);
+        } else {
+            if (p->class_id >= JS_CLASS_UINT8C_ARRAY &&
+                p->class_id <= JS_CLASS_FLOAT64_ARRAY) {
+                return js_typed_array_constructor_ta(ctx, new_target, argv[0], classid);
+            } else {
+                return js_typed_array_constructor_obj(ctx, new_target, argv[0], classid);
+            }
+        }
+    }
+
+    obj = js_create_from_ctor(ctx, new_target, classid);
+    if (JS_IsException(obj)) {
+        JS_FreeValue(ctx, buffer);
+        return JS_EXCEPTION;
+    }
+    if (typed_array_init(ctx, obj, buffer, offset, len)) {
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    return obj;
+}
+
+static void js_typed_array_finalizer(JSRuntime *rt, JSValue val)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSTypedArray *ta = p->u.typed_array;
+    if (ta) {
+        /* during the GC the finalizers are called in an arbitrary
+           order so the ArrayBuffer finalizer may have been called */
+        if (JS_IsLiveObject(rt, JS_MKPTR(JS_TAG_OBJECT, ta->buffer))) {
+            list_del(&ta->link);
+        }
+        JS_FreeValueRT(rt, JS_MKPTR(JS_TAG_OBJECT, ta->buffer));
+        js_free_rt(rt, ta);
+    }
+}
+
+static void js_typed_array_mark(JSRuntime *rt, JSValueConst val,
+                                JS_MarkFunc *mark_func)
+{
+    JSObject *p = JS_VALUE_GET_OBJ(val);
+    JSTypedArray *ta = p->u.typed_array;
+    if (ta) {
+        JS_MarkValue(rt, JS_MKPTR(JS_TAG_OBJECT, ta->buffer), mark_func);
+    }
+}
+
+static JSValue js_dataview_constructor(JSContext *ctx,
+                                       JSValueConst new_target,
+                                       int argc, JSValueConst *argv)
+{
+    JSArrayBuffer *abuf;
+    uint64_t offset;
+    uint32_t len;
+    JSValueConst buffer;
+    JSValue obj;
+    JSTypedArray *ta;
+    JSObject *p;
+
+    buffer = argv[0];
+    abuf = js_get_array_buffer(ctx, buffer);
+    if (!abuf)
+        return JS_EXCEPTION;
+    offset = 0;
+    if (argc > 1) {
+        if (JS_ToIndex(ctx, &offset, argv[1]))
+            return JS_EXCEPTION;
+    }
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if (offset > abuf->byte_length)
+        return JS_ThrowRangeError(ctx, "invalid byteOffset");
+    len = abuf->byte_length - offset;
+    if (argc > 2 && !JS_IsUndefined(argv[2])) {
+        uint64_t l;
+        if (JS_ToIndex(ctx, &l, argv[2]))
+            return JS_EXCEPTION;
+        if (l > len)
+            return JS_ThrowRangeError(ctx, "invalid byteLength");
+        len = l;
+    }
+
+    obj = js_create_from_ctor(ctx, new_target, JS_CLASS_DATAVIEW);
+    if (JS_IsException(obj))
+        return JS_EXCEPTION;
+    if (abuf->detached) {
+        /* could have been detached in js_create_from_ctor() */
+        JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+        goto fail;
+    }
+    ta = js_malloc(ctx, sizeof(*ta));
+    if (!ta) {
+    fail:
+        JS_FreeValue(ctx, obj);
+        return JS_EXCEPTION;
+    }
+    p = JS_VALUE_GET_OBJ(obj);
+    ta->obj = p;
+    ta->buffer = JS_VALUE_GET_OBJ(JS_DupValue(ctx, buffer));
+    ta->offset = offset;
+    ta->length = len;
+    list_add_tail(&ta->link, &abuf->array_list);
+    p->u.typed_array = ta;
+    return obj;
+}
+
+static JSValue js_dataview_getValue(JSContext *ctx,
+                                    JSValueConst this_obj,
+                                    int argc, JSValueConst *argv, int class_id)
+{
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    int is_swap, size;
+    uint8_t *ptr;
+    uint32_t v;
+    uint64_t pos;
+
+    ta = JS_GetOpaque2(ctx, this_obj, JS_CLASS_DATAVIEW);
+    if (!ta)
+        return JS_EXCEPTION;
+    size = 1 << typed_array_size_log2(class_id);
+    if (JS_ToIndex(ctx, &pos, argv[0]))
+        return JS_EXCEPTION;
+    is_swap = FALSE;
+    if (argc > 1)
+        is_swap = JS_ToBool(ctx, argv[1]);
+#ifndef WORDS_BIGENDIAN
+    is_swap ^= 1;
+#endif
+    abuf = ta->buffer->u.array_buffer;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if ((pos + size) > ta->length)
+        return JS_ThrowRangeError(ctx, "out of bound");
+    ptr = abuf->data + ta->offset + pos;
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+        return JS_NewInt32(ctx, *(int8_t *)ptr);
+    case JS_CLASS_UINT8_ARRAY:
+        return JS_NewInt32(ctx, *(uint8_t *)ptr);
+    case JS_CLASS_INT16_ARRAY:
+        v = get_u16(ptr);
+        if (is_swap)
+            v = bswap16(v);
+        return JS_NewInt32(ctx, (int16_t)v);
+    case JS_CLASS_UINT16_ARRAY:
+        v = get_u16(ptr);
+        if (is_swap)
+            v = bswap16(v);
+        return JS_NewInt32(ctx, v);
+    case JS_CLASS_INT32_ARRAY:
+        v = get_u32(ptr);
+        if (is_swap)
+            v = bswap32(v);
+        return JS_NewInt32(ctx, v);
+    case JS_CLASS_UINT32_ARRAY:
+        v = get_u32(ptr);
+        if (is_swap)
+            v = bswap32(v);
+        return JS_NewUint32(ctx, v);
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_INT64_ARRAY:
+        {
+            uint64_t v;
+            v = get_u64(ptr);
+            if (is_swap)
+                v = bswap64(v);
+            return JS_NewBigInt64(ctx, v);
+        }
+        break;
+    case JS_CLASS_BIG_UINT64_ARRAY:
+        {
+            uint64_t v;
+            v = get_u64(ptr);
+            if (is_swap)
+                v = bswap64(v);
+            return JS_NewBigUint64(ctx, v);
+        }
+        break;
+#endif
+    case JS_CLASS_FLOAT32_ARRAY:
+        {
+            union {
+                float f;
+                uint32_t i;
+            } u;
+            v = get_u32(ptr);
+            if (is_swap)
+                v = bswap32(v);
+            u.i = v;
+            return __JS_NewFloat64(ctx, u.f);
+        }
+    case JS_CLASS_FLOAT64_ARRAY:
+        {
+            union {
+                double f;
+                uint64_t i;
+            } u;
+            u.i = get_u64(ptr);
+            if (is_swap)
+                u.i = bswap64(u.i);
+            return __JS_NewFloat64(ctx, u.f);
+        }
+    default:
+        abort();
+    }
+}
+
+static JSValue js_dataview_setValue(JSContext *ctx,
+                                    JSValueConst this_obj,
+                                    int argc, JSValueConst *argv, int class_id)
+{
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    int is_swap, size;
+    uint8_t *ptr;
+    uint64_t v64;
+    uint32_t v;
+    uint64_t pos;
+    JSValueConst val;
+
+    ta = JS_GetOpaque2(ctx, this_obj, JS_CLASS_DATAVIEW);
+    if (!ta)
+        return JS_EXCEPTION;
+    size = 1 << typed_array_size_log2(class_id);
+    if (JS_ToIndex(ctx, &pos, argv[0]))
+        return JS_EXCEPTION;
+    val = argv[1];
+    v = 0; /* avoid warning */
+    v64 = 0; /* avoid warning */
+    if (class_id <= JS_CLASS_UINT32_ARRAY) {
+        if (JS_ToUint32(ctx, &v, val))
+            return JS_EXCEPTION;
+    } else
+#ifdef CONFIG_BIGNUM
+    if (class_id <= JS_CLASS_BIG_UINT64_ARRAY) {
+        if (JS_ToBigInt64(ctx, (int64_t *)&v64, val))
+            return JS_EXCEPTION;
+    } else
+#endif
+    {
+        double d;
+        if (JS_ToFloat64(ctx, &d, val))
+            return JS_EXCEPTION;
+        if (class_id == JS_CLASS_FLOAT32_ARRAY) {
+            union {
+                float f;
+                uint32_t i;
+            } u;
+            u.f = d;
+            v = u.i;
+        } else {
+            JSFloat64Union u;
+            u.d = d;
+            v64 = u.u64;
+        }
+    }
+    is_swap = FALSE;
+    if (argc > 2)
+        is_swap = JS_ToBool(ctx, argv[2]);
+#ifndef WORDS_BIGENDIAN
+    is_swap ^= 1;
+#endif
+    abuf = ta->buffer->u.array_buffer;
+    if (abuf->detached)
+        return JS_ThrowTypeErrorDetachedArrayBuffer(ctx);
+    if ((pos + size) > ta->length)
+        return JS_ThrowRangeError(ctx, "out of bound");
+    ptr = abuf->data + ta->offset + pos;
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+    case JS_CLASS_UINT8_ARRAY:
+        *ptr = v;
+        break;
+    case JS_CLASS_INT16_ARRAY:
+    case JS_CLASS_UINT16_ARRAY:
+        if (is_swap)
+            v = bswap16(v);
+        put_u16(ptr, v);
+        break;
+    case JS_CLASS_INT32_ARRAY:
+    case JS_CLASS_UINT32_ARRAY:
+    case JS_CLASS_FLOAT32_ARRAY:
+        if (is_swap)
+            v = bswap32(v);
+        put_u32(ptr, v);
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_INT64_ARRAY:
+    case JS_CLASS_BIG_UINT64_ARRAY:
+#endif
+    case JS_CLASS_FLOAT64_ARRAY:
+        if (is_swap)
+            v64 = bswap64(v64);
+        put_u64(ptr, v64);
+        break;
+    default:
+        abort();
+    }
+    return JS_UNDEFINED;
+}
+
+static const JSCFunctionListEntry js_dataview_proto_funcs[] = {
+    JS_CGETSET_MAGIC_DEF("buffer", js_typed_array_get_buffer, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("byteLength", js_typed_array_get_byteLength, NULL, 1 ),
+    JS_CGETSET_MAGIC_DEF("byteOffset", js_typed_array_get_byteOffset, NULL, 1 ),
+    JS_CFUNC_MAGIC_DEF("getInt8", 1, js_dataview_getValue, JS_CLASS_INT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint8", 1, js_dataview_getValue, JS_CLASS_UINT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getInt16", 1, js_dataview_getValue, JS_CLASS_INT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint16", 1, js_dataview_getValue, JS_CLASS_UINT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getInt32", 1, js_dataview_getValue, JS_CLASS_INT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getUint32", 1, js_dataview_getValue, JS_CLASS_UINT32_ARRAY ),
+#ifdef CONFIG_BIGNUM
+    JS_CFUNC_MAGIC_DEF("getBigInt64", 1, js_dataview_getValue, JS_CLASS_BIG_INT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getBigUint64", 1, js_dataview_getValue, JS_CLASS_BIG_UINT64_ARRAY ),
+#endif
+    JS_CFUNC_MAGIC_DEF("getFloat32", 1, js_dataview_getValue, JS_CLASS_FLOAT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("getFloat64", 1, js_dataview_getValue, JS_CLASS_FLOAT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt8", 2, js_dataview_setValue, JS_CLASS_INT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint8", 2, js_dataview_setValue, JS_CLASS_UINT8_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt16", 2, js_dataview_setValue, JS_CLASS_INT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint16", 2, js_dataview_setValue, JS_CLASS_UINT16_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setInt32", 2, js_dataview_setValue, JS_CLASS_INT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setUint32", 2, js_dataview_setValue, JS_CLASS_UINT32_ARRAY ),
+#ifdef CONFIG_BIGNUM
+    JS_CFUNC_MAGIC_DEF("setBigInt64", 2, js_dataview_setValue, JS_CLASS_BIG_INT64_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setBigUint64", 2, js_dataview_setValue, JS_CLASS_BIG_UINT64_ARRAY ),
+#endif
+    JS_CFUNC_MAGIC_DEF("setFloat32", 2, js_dataview_setValue, JS_CLASS_FLOAT32_ARRAY ),
+    JS_CFUNC_MAGIC_DEF("setFloat64", 2, js_dataview_setValue, JS_CLASS_FLOAT64_ARRAY ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "DataView", JS_PROP_CONFIGURABLE ),
+};
+
+/* Atomics */
+#ifdef CONFIG_ATOMICS
+
+typedef enum AtomicsOpEnum {
+    ATOMICS_OP_ADD,
+    ATOMICS_OP_AND,
+    ATOMICS_OP_OR,
+    ATOMICS_OP_SUB,
+    ATOMICS_OP_XOR,
+    ATOMICS_OP_EXCHANGE,
+    ATOMICS_OP_COMPARE_EXCHANGE,
+    ATOMICS_OP_LOAD,
+} AtomicsOpEnum;
+
+static void *js_atomics_get_ptr(JSContext *ctx,
+                                int *psize_log2, JSClassID *pclass_id,
+                                JSValueConst obj, JSValueConst idx_val,
+                                BOOL is_waitable)
+{
+    JSObject *p;
+    JSTypedArray *ta;
+    JSArrayBuffer *abuf;
+    void *ptr;
+    uint64_t idx;
+    BOOL err;
+    int size_log2;
+
+    if (JS_VALUE_GET_TAG(obj) != JS_TAG_OBJECT)
+        goto fail;
+    p = JS_VALUE_GET_OBJ(obj);
+#ifdef CONFIG_BIGNUM
+    if (is_waitable)
+        err = (p->class_id != JS_CLASS_INT32_ARRAY &&
+               p->class_id != JS_CLASS_BIG_INT64_ARRAY);
+    else
+        err = !(p->class_id >= JS_CLASS_INT8_ARRAY &&
+                p->class_id <= JS_CLASS_BIG_UINT64_ARRAY);
+#else
+    if (is_waitable)
+        err = (p->class_id != JS_CLASS_INT32_ARRAY);
+    else
+        err = !(p->class_id >= JS_CLASS_INT8_ARRAY &&
+                p->class_id <= JS_CLASS_UINT32_ARRAY);
+#endif
+    if (err) {
+    fail:
+        JS_ThrowTypeError(ctx, "integer TypedArray expected");
+        return NULL;
+    }
+    ta = p->u.typed_array;
+    abuf = ta->buffer->u.array_buffer;
+    if (!abuf->shared) {
+        JS_ThrowTypeError(ctx, "not a SharedArrayBuffer TypedArray");
+        return NULL;
+    }
+    if (JS_ToIndex(ctx, &idx, idx_val)) {
+        return NULL;
+    }
+    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 (psize_log2)
+        *psize_log2 = size_log2;
+    if (pclass_id)
+        *pclass_id = p->class_id;
+    return ptr;
+}
+
+static JSValue js_atomics_op(JSContext *ctx,
+                             JSValueConst this_obj,
+                             int argc, JSValueConst *argv, int op)
+{
+    int size_log2;
+#ifdef CONFIG_BIGNUM
+    uint64_t v, a, rep_val;
+#else
+    uint32_t v, a, rep_val;
+#endif
+    void *ptr;
+    JSValue ret;
+    JSClassID class_id;
+
+    ptr = js_atomics_get_ptr(ctx, &size_log2, &class_id,
+                             argv[0], argv[1], FALSE);
+    if (!ptr)
+        return JS_EXCEPTION;
+    rep_val = 0;
+    if (op == ATOMICS_OP_LOAD) {
+        v = 0;
+    } else
+#ifdef CONFIG_BIGNUM
+   if (size_log2 == 3) {
+            int64_t v64;
+            if (JS_ToBigInt64(ctx, &v64, argv[2]))
+                return JS_EXCEPTION;
+            v = v64;
+            if (op == ATOMICS_OP_COMPARE_EXCHANGE) {
+                if (JS_ToBigInt64(ctx, &v64, argv[3]))
+                    return JS_EXCEPTION;
+                rep_val = v64;
+            }
+   } 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;
+       }
+   }
+   switch(op | (size_log2 << 3)) {
+
+#ifdef CONFIG_BIGNUM
+#define OP(op_name, func_name)                          \
+    case ATOMICS_OP_ ## op_name | (0 << 3):             \
+       a = func_name((_Atomic(uint8_t) *)ptr, v);       \
+       break;                                           \
+    case ATOMICS_OP_ ## op_name | (1 << 3):             \
+        a = func_name((_Atomic(uint16_t) *)ptr, v);     \
+        break;                                          \
+    case ATOMICS_OP_ ## op_name | (2 << 3):             \
+        a = func_name((_Atomic(uint32_t) *)ptr, v);     \
+        break;                                          \
+    case ATOMICS_OP_ ## op_name | (3 << 3):             \
+        a = func_name((_Atomic(uint64_t) *)ptr, v);     \
+        break;
+#else
+#define OP(op_name, func_name)                          \
+    case ATOMICS_OP_ ## op_name | (0 << 3):             \
+       a = func_name((_Atomic(uint8_t) *)ptr, v);       \
+       break;                                           \
+    case ATOMICS_OP_ ## op_name | (1 << 3):             \
+        a = func_name((_Atomic(uint16_t) *)ptr, v);     \
+        break;                                          \
+    case ATOMICS_OP_ ## op_name | (2 << 3):             \
+        a = func_name((_Atomic(uint32_t) *)ptr, v);     \
+        break;
+#endif
+        OP(ADD, atomic_fetch_add)
+        OP(AND, atomic_fetch_and)
+        OP(OR, atomic_fetch_or)
+        OP(SUB, atomic_fetch_sub)
+        OP(XOR, atomic_fetch_xor)
+        OP(EXCHANGE, atomic_exchange)
+#undef OP
+
+    case ATOMICS_OP_LOAD | (0 << 3):
+        a = atomic_load((_Atomic(uint8_t) *)ptr);
+        break;
+    case ATOMICS_OP_LOAD | (1 << 3):
+        a = atomic_load((_Atomic(uint16_t) *)ptr);
+        break;
+    case ATOMICS_OP_LOAD | (2 << 3):
+        a = atomic_load((_Atomic(uint32_t) *)ptr);
+        break;
+#ifdef CONFIG_BIGNUM
+    case ATOMICS_OP_LOAD | (3 << 3):
+        a = atomic_load((_Atomic(uint64_t) *)ptr);
+        break;
+#endif
+
+    case ATOMICS_OP_COMPARE_EXCHANGE | (0 << 3):
+        {
+            uint8_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint8_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    case ATOMICS_OP_COMPARE_EXCHANGE | (1 << 3):
+        {
+            uint16_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint16_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+    case ATOMICS_OP_COMPARE_EXCHANGE | (2 << 3):
+        {
+            uint32_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint32_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+#ifdef CONFIG_BIGNUM
+    case ATOMICS_OP_COMPARE_EXCHANGE | (3 << 3):
+        {
+            uint64_t v1 = v;
+            atomic_compare_exchange_strong((_Atomic(uint64_t) *)ptr, &v1, rep_val);
+            a = v1;
+        }
+        break;
+#endif
+    default:
+        abort();
+    }
+
+    switch(class_id) {
+    case JS_CLASS_INT8_ARRAY:
+        a = (int8_t)a;
+        goto done;
+    case JS_CLASS_UINT8_ARRAY:
+        a = (uint8_t)a;
+        goto done;
+    case JS_CLASS_INT16_ARRAY:
+        a = (int16_t)a;
+        goto done;
+    case JS_CLASS_UINT16_ARRAY:
+        a = (uint16_t)a;
+        goto done;
+    case JS_CLASS_INT32_ARRAY:
+    done:
+        ret = JS_NewInt32(ctx, a);
+        break;
+    case JS_CLASS_UINT32_ARRAY:
+        ret = JS_NewUint32(ctx, a);
+        break;
+#ifdef CONFIG_BIGNUM
+    case JS_CLASS_BIG_INT64_ARRAY:
+        ret = JS_NewBigInt64(ctx, a);
+        break;
+    case JS_CLASS_BIG_UINT64_ARRAY:
+        ret = JS_NewBigUint64(ctx, a);
+        break;
+#endif
+    default:
+        abort();
+    }
+    return ret;
+}
+
+static JSValue js_atomics_store(JSContext *ctx,
+                                JSValueConst this_obj,
+                                int argc, JSValueConst *argv)
+{
+    int size_log2;
+    void *ptr;
+    JSValue ret;
+
+    ptr = js_atomics_get_ptr(ctx, &size_log2, NULL, argv[0], argv[1], FALSE);
+    if (!ptr)
+        return JS_EXCEPTION;
+#ifdef CONFIG_BIGNUM
+    if (size_log2 == 3) {
+        int64_t v64;
+        ret = JS_ToBigIntValueFree(ctx, JS_DupValue(ctx, argv[2]));
+        if (JS_IsException(ret))
+            return ret;
+        if (JS_ToBigInt64(ctx, &v64, ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        atomic_store((_Atomic(uint64_t) *)ptr, v64);
+    } else
+#endif
+    {
+        uint32_t v;
+        /* XXX: spec, would be simpler to return the written value */
+        ret = JS_ToIntegerFree(ctx, JS_DupValue(ctx, argv[2]));
+        if (JS_IsException(ret))
+            return ret;
+        if (JS_ToUint32(ctx, &v, ret)) {
+            JS_FreeValue(ctx, ret);
+            return JS_EXCEPTION;
+        }
+        switch(size_log2) {
+        case 0:
+            atomic_store((_Atomic(uint8_t) *)ptr, v);
+            break;
+        case 1:
+            atomic_store((_Atomic(uint16_t) *)ptr, v);
+            break;
+        case 2:
+            atomic_store((_Atomic(uint32_t) *)ptr, v);
+            break;
+        default:
+            abort();
+        }
+    }
+    return ret;
+}
+
+static JSValue js_atomics_isLockFree(JSContext *ctx,
+                                     JSValueConst this_obj,
+                                     int argc, JSValueConst *argv)
+{
+    int v, ret;
+    if (JS_ToInt32Sat(ctx, &v, argv[0]))
+        return JS_EXCEPTION;
+    ret = (v == 1 || v == 2 || v == 4
+#ifdef CONFIG_BIGNUM
+           || v == 8
+#endif
+           );
+    return JS_NewBool(ctx, ret);
+}
+
+typedef struct JSAtomicsWaiter {
+    struct list_head link;
+    BOOL linked;
+    pthread_cond_t cond;
+    int32_t *ptr;
+} JSAtomicsWaiter;
+
+static pthread_mutex_t js_atomics_mutex = PTHREAD_MUTEX_INITIALIZER;
+static struct list_head js_atomics_waiter_list =
+    LIST_HEAD_INIT(js_atomics_waiter_list);
+
+#ifdef __MACH__
+#include <mach/clock.h>
+#include <mach/mach.h>
+#endif
+
+static JSValue js_atomics_wait(JSContext *ctx,
+                               JSValueConst this_obj,
+                               int argc, JSValueConst *argv)
+{
+    int64_t v;
+    int32_t v32;
+    void *ptr;
+    int64_t timeout;
+    struct timespec ts;
+    JSAtomicsWaiter waiter_s, *waiter;
+    int ret, size_log2, res;
+    double d;
+
+    ptr = js_atomics_get_ptr(ctx, &size_log2, NULL, argv[0], argv[1], TRUE);
+    if (!ptr)
+        return JS_EXCEPTION;
+#ifdef CONFIG_BIGNUM
+    if (size_log2 == 3) {
+        if (JS_ToBigInt64(ctx, &v, argv[2]))
+            return JS_EXCEPTION;
+    } else
+#endif
+    {
+        if (JS_ToInt32(ctx, &v32, argv[2]))
+            return JS_EXCEPTION;
+        v = v32;
+    }
+    if (JS_ToFloat64(ctx, &d, argv[3]))
+        return JS_EXCEPTION;
+    if (isnan(d) || d > INT64_MAX)
+        timeout = INT64_MAX;
+    else if (d < 0)
+        timeout = 0;
+    else
+        timeout = (int64_t)d;
+    if (!ctx->rt->can_block)
+        return JS_ThrowTypeError(ctx, "cannot block in this thread");
+
+    /* XXX: inefficient if large number of waiters, should hash on
+       'ptr' value */
+    /* XXX: use Linux futexes when available ? */
+    pthread_mutex_lock(&js_atomics_mutex);
+    if (size_log2 == 3) {
+        res = *(int64_t *)ptr != v;
+    } else {
+        res = *(int32_t *)ptr != v;
+    }
+    if (res) {
+        pthread_mutex_unlock(&js_atomics_mutex);
+        return JS_AtomToString(ctx, JS_ATOM_not_equal);
+    }
+
+    waiter = &waiter_s;
+    waiter->ptr = ptr;
+    pthread_cond_init(&waiter->cond, NULL);
+    waiter->linked = TRUE;
+    list_add_tail(&waiter->link, &js_atomics_waiter_list);
+
+    if (timeout == INT64_MAX) {
+        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;
+		mach_timespec_t mts;
+		host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+		clock_get_time(cclock, &mts);
+		mach_port_deallocate(mach_task_self(), cclock);
+		ts.tv_sec = mts.tv_sec;
+		ts.tv_nsec = mts.tv_nsec;
+
+#else
+        /* XXX: use clock monotonic */
+        clock_gettime(CLOCK_REALTIME, &ts);
+#endif
+        ts.tv_sec += timeout / 1000;
+        ts.tv_nsec += (timeout % 1000) * 1000000;
+        if (ts.tv_nsec >= 1000000000) {
+            ts.tv_nsec -= 1000000000;
+            ts.tv_sec++;
+        }
+        ret = pthread_cond_timedwait(&waiter->cond, &js_atomics_mutex,
+                                     &ts);
+    }
+    if (waiter->linked)
+        list_del(&waiter->link);
+    pthread_mutex_unlock(&js_atomics_mutex);
+    pthread_cond_destroy(&waiter->cond);
+    if (ret == ETIMEDOUT) {
+        return JS_AtomToString(ctx, JS_ATOM_timed_out);
+    } else {
+        return JS_AtomToString(ctx, JS_ATOM_ok);
+    }
+}
+
+static JSValue js_atomics_notify(JSContext *ctx,
+                                 JSValueConst this_obj,
+                                 int argc, JSValueConst *argv)
+{
+    struct list_head *el, *el1, waiter_list;
+    int32_t count, n;
+    void *ptr;
+    JSAtomicsWaiter *waiter;
+
+    ptr = js_atomics_get_ptr(ctx, NULL, NULL, argv[0], argv[1], TRUE);
+    if (!ptr)
+        return JS_EXCEPTION;
+
+    if (JS_IsUndefined(argv[2])) {
+        count = INT32_MAX;
+    } else {
+        if (JS_ToInt32Clamp(ctx, &count, argv[2], 0, INT32_MAX, 0))
+            return JS_EXCEPTION;
+    }
+
+    n = 0;
+    if (count > 0) {
+        pthread_mutex_lock(&js_atomics_mutex);
+        init_list_head(&waiter_list);
+        list_for_each_safe(el, el1, &js_atomics_waiter_list) {
+            waiter = list_entry(el, JSAtomicsWaiter, link);
+            if (waiter->ptr == ptr) {
+                list_del(&waiter->link);
+                waiter->linked = FALSE;
+                list_add_tail(&waiter->link, &waiter_list);
+                n++;
+                if (n >= count)
+                    break;
+            }
+        }
+        list_for_each(el, &waiter_list) {
+            waiter = list_entry(el, JSAtomicsWaiter, link);
+            pthread_cond_signal(&waiter->cond);
+        }
+        pthread_mutex_unlock(&js_atomics_mutex);
+    }
+    return JS_NewInt32(ctx, n);
+}
+
+static const JSCFunctionListEntry js_atomics_funcs[] = {
+    JS_CFUNC_MAGIC_DEF("add", 3, js_atomics_op, ATOMICS_OP_ADD ),
+    JS_CFUNC_MAGIC_DEF("and", 3, js_atomics_op, ATOMICS_OP_AND ),
+    JS_CFUNC_MAGIC_DEF("or", 3, js_atomics_op, ATOMICS_OP_OR ),
+    JS_CFUNC_MAGIC_DEF("sub", 3, js_atomics_op, ATOMICS_OP_SUB ),
+    JS_CFUNC_MAGIC_DEF("xor", 3, js_atomics_op, ATOMICS_OP_XOR ),
+    JS_CFUNC_MAGIC_DEF("exchange", 3, js_atomics_op, ATOMICS_OP_EXCHANGE ),
+    JS_CFUNC_MAGIC_DEF("compareExchange", 4, js_atomics_op, ATOMICS_OP_COMPARE_EXCHANGE ),
+    JS_CFUNC_MAGIC_DEF("load", 2, js_atomics_op, ATOMICS_OP_LOAD ),
+    JS_CFUNC_DEF("store", 3, js_atomics_store ),
+    JS_CFUNC_DEF("isLockFree", 1, js_atomics_isLockFree ),
+    JS_CFUNC_DEF("wait", 4, js_atomics_wait ),
+    JS_CFUNC_DEF("notify", 3, js_atomics_notify ),
+    JS_PROP_STRING_DEF("[Symbol.toStringTag]", "Atomics", JS_PROP_CONFIGURABLE ),
+};
+
+static const JSCFunctionListEntry js_atomics_obj[] = {
+    JS_OBJECT_DEF("Atomics", js_atomics_funcs, countof(js_atomics_funcs), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE ),
+};
+
+void JS_AddIntrinsicAtomics(JSContext *ctx)
+{
+    /* add Atomics as autoinit object */
+    JS_SetPropertyFunctionList(ctx, ctx->global_obj, js_atomics_obj, countof(js_atomics_obj));
+}
+
+#endif /* CONFIG_ATOMICS */
+
+void JS_AddIntrinsicTypedArrays(JSContext *ctx)
+{
+    JSValue typed_array_base_proto, typed_array_base_func;
+    JSValueConst array_buffer_func, shared_array_buffer_func;
+    int i;
+
+    ctx->class_proto[JS_CLASS_ARRAY_BUFFER] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_ARRAY_BUFFER],
+                               js_array_buffer_proto_funcs,
+                               countof(js_array_buffer_proto_funcs));
+
+    array_buffer_func = JS_NewGlobalCConstructorOnly(ctx, "ArrayBuffer",
+                                                 js_array_buffer_constructor, 1,
+                                                 ctx->class_proto[JS_CLASS_ARRAY_BUFFER]);
+    JS_SetPropertyFunctionList(ctx, array_buffer_func,
+                               js_array_buffer_funcs,
+                               countof(js_array_buffer_funcs));
+
+    ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER],
+                               js_shared_array_buffer_proto_funcs,
+                               countof(js_shared_array_buffer_proto_funcs));
+
+    shared_array_buffer_func = JS_NewGlobalCConstructorOnly(ctx, "SharedArrayBuffer",
+                                                 js_shared_array_buffer_constructor, 1,
+                                                 ctx->class_proto[JS_CLASS_SHARED_ARRAY_BUFFER]);
+    JS_SetPropertyFunctionList(ctx, shared_array_buffer_func,
+                               js_shared_array_buffer_funcs,
+                               countof(js_shared_array_buffer_funcs));
+
+    typed_array_base_proto = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, typed_array_base_proto,
+                               js_typed_array_base_proto_funcs,
+                               countof(js_typed_array_base_proto_funcs));
+
+    /* TypedArray.prototype.toString must be the same object as Array.prototype.toString */
+    JSValue obj = JS_GetProperty(ctx, ctx->class_proto[JS_CLASS_ARRAY], JS_ATOM_toString);
+    /* XXX: should use alias method in JSCFunctionListEntry */ //@@@
+    JS_DefinePropertyValue(ctx, typed_array_base_proto, JS_ATOM_toString, obj,
+                           JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+
+    typed_array_base_func = JS_NewCFunction(ctx, js_typed_array_base_constructor,
+                                            "TypedArray", 0);
+    JS_SetPropertyFunctionList(ctx, typed_array_base_func,
+                               js_typed_array_base_funcs,
+                               countof(js_typed_array_base_funcs));
+    JS_SetConstructor(ctx, typed_array_base_func, typed_array_base_proto);
+
+    for(i = JS_CLASS_UINT8C_ARRAY; i < JS_CLASS_UINT8C_ARRAY + JS_TYPED_ARRAY_COUNT; i++) {
+        JSValue func_obj;
+        char buf[ATOM_GET_STR_BUF_SIZE];
+        const char *name;
+
+        ctx->class_proto[i] = JS_NewObjectProto(ctx, typed_array_base_proto);
+        JS_DefinePropertyValueStr(ctx, ctx->class_proto[i],
+                                  "BYTES_PER_ELEMENT",
+                                  JS_NewInt32(ctx, 1 << typed_array_size_log2(i)),
+                                  0);
+        name = JS_AtomGetStr(ctx, buf, sizeof(buf),
+                             JS_ATOM_Uint8ClampedArray + i - JS_CLASS_UINT8C_ARRAY);
+        func_obj = JS_NewCFunction3(ctx, (JSCFunction *)js_typed_array_constructor,
+                                    name, 3, JS_CFUNC_constructor_magic, i,
+                                    typed_array_base_func);
+        JS_NewGlobalCConstructor2(ctx, func_obj, name, ctx->class_proto[i]);
+        JS_DefinePropertyValueStr(ctx, func_obj,
+                                  "BYTES_PER_ELEMENT",
+                                  JS_NewInt32(ctx, 1 << typed_array_size_log2(i)),
+                                  0);
+    }
+    JS_FreeValue(ctx, typed_array_base_proto);
+    JS_FreeValue(ctx, typed_array_base_func);
+
+    /* DataView */
+    ctx->class_proto[JS_CLASS_DATAVIEW] = JS_NewObject(ctx);
+    JS_SetPropertyFunctionList(ctx, ctx->class_proto[JS_CLASS_DATAVIEW],
+                               js_dataview_proto_funcs,
+                               countof(js_dataview_proto_funcs));
+    JS_NewGlobalCConstructorOnly(ctx, "DataView",
+                                 js_dataview_constructor, 1,
+                                 ctx->class_proto[JS_CLASS_DATAVIEW]);
+    /* Atomics */
+#ifdef CONFIG_ATOMICS
+    JS_AddIntrinsicAtomics(ctx);
+#endif
+}

gpac-1.0.0.tar.gz/src/quickjs/quickjs.h Added

@@ -0,0 +1,1003 @@
+/*
+ * QuickJS Javascript Engine
+ *
+ * Copyright (c) 2017-2020 Fabrice Bellard
+ * Copyright (c) 2017-2020 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.
+ */
+#ifndef QUICKJS_H
+#define QUICKJS_H
+
+#include <stdio.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
+#define js_likely(x)          __builtin_expect(!!(x), 1)
+#define js_unlikely(x)        __builtin_expect(!!(x), 0)
+#define js_force_inline       inline __attribute__((always_inline))
+#define __js_printf_like(f, a)   __attribute__((format(printf, f, a)))
+#else
+#define js_likely(x)     (x)
+#define js_unlikely(x)   (x)
+#define js_force_inline  inline
+#define __js_printf_like(a, b)
+#endif
+
+#define JS_BOOL int
+
+typedef struct JSRuntime JSRuntime;
+typedef struct JSContext JSContext;
+typedef struct JSObject JSObject;
+typedef struct JSClass JSClass;
+typedef uint32_t JSClassID;
+typedef uint32_t JSAtom;
+
+#if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64)
+#define JS_PTR64
+#define JS_PTR64_DEF(a) a
+#else
+#define JS_PTR64_DEF(a)
+#endif
+
+#ifndef JS_PTR64
+#define JS_NAN_BOXING
+#endif
+
+enum {
+    /* all tags with a reference count are negative */
+    JS_TAG_FIRST       = -11, /* first negative tag */
+    JS_TAG_BIG_DECIMAL = -11,
+    JS_TAG_BIG_INT     = -10,
+    JS_TAG_BIG_FLOAT   = -9,
+    JS_TAG_SYMBOL      = -8,
+    JS_TAG_STRING      = -7,
+    JS_TAG_MODULE      = -3, /* used internally */
+    JS_TAG_FUNCTION_BYTECODE = -2, /* used internally */
+    JS_TAG_OBJECT      = -1,
+
+    JS_TAG_INT         = 0,
+    JS_TAG_BOOL        = 1,
+    JS_TAG_NULL        = 2,
+    JS_TAG_UNDEFINED   = 3,
+    JS_TAG_UNINITIALIZED = 4,
+    JS_TAG_CATCH_OFFSET = 5,
+    JS_TAG_EXCEPTION   = 6,
+    JS_TAG_FLOAT64     = 7,
+    /* any larger tag is FLOAT64 if JS_NAN_BOXING */
+};
+
+typedef struct JSRefCountHeader {
+    int ref_count;
+} JSRefCountHeader;
+
+#define JS_FLOAT64_NAN NAN
+
+#ifdef CONFIG_CHECK_JSVALUE
+/* JSValue consistency : it is not possible to run the code in this
+   mode, but it is useful to detect simple reference counting
+   errors. It would be interesting to modify a static C analyzer to
+   handle specific annotations (clang has such annotations but only
+   for objective C) */
+typedef struct __JSValue *JSValue;
+typedef const struct __JSValue *JSValueConst;
+
+#define JS_VALUE_GET_TAG(v) (int)((uintptr_t)(v) & 0xf)
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+#define JS_VALUE_GET_NORM_TAG(v) JS_VALUE_GET_TAG(v)
+#define JS_VALUE_GET_INT(v) (int)((intptr_t)(v) >> 4)
+#define JS_VALUE_GET_BOOL(v) JS_VALUE_GET_INT(v)
+#define JS_VALUE_GET_FLOAT64(v) (double)JS_VALUE_GET_INT(v)
+#define JS_VALUE_GET_PTR(v) (void *)((intptr_t)(v) & ~0xf)
+
+#define JS_MKVAL(tag, val) (JSValue)(intptr_t)(((val) << 4) | (tag))
+#define JS_MKPTR(tag, p) (JSValue)((intptr_t)(p) | (tag))
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)(tag) == JS_TAG_FLOAT64)
+
+#define JS_NAN JS_MKVAL(JS_TAG_FLOAT64, 1)
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    return JS_MKVAL(JS_TAG_FLOAT64, (int)d);
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    return 0;
+}
+    
+#elif defined(JS_NAN_BOXING)
+
+typedef uint64_t JSValue;
+
+#define JSValueConst JSValue
+
+#define JS_VALUE_GET_TAG(v) (int)((v) >> 32)
+#define JS_VALUE_GET_INT(v) (int)(v)
+#define JS_VALUE_GET_BOOL(v) (int)(v)
+#define JS_VALUE_GET_PTR(v) (void *)(intptr_t)(v)
+
+#define JS_MKVAL(tag, val) (((uint64_t)(tag) << 32) | (uint32_t)(val))
+#define JS_MKPTR(tag, ptr) (((uint64_t)(tag) << 32) | (uintptr_t)(ptr))
+
+#define JS_FLOAT64_TAG_ADDEND (0x7ff80000 - JS_TAG_FIRST + 1) /* quiet NaN encoding */
+
+static inline double JS_VALUE_GET_FLOAT64(JSValue v)
+{
+    union {
+        JSValue v;
+        double d;
+    } u;
+    u.v = v;
+    u.v += (uint64_t)JS_FLOAT64_TAG_ADDEND << 32;
+    return u.d;
+}
+
+#define JS_NAN (0x7ff8000000000000 - ((uint64_t)JS_FLOAT64_TAG_ADDEND << 32))
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    union {
+        double d;
+        uint64_t u64;
+    } u;
+    JSValue v;
+    u.d = d;
+    /* normalize NaN */
+    if (js_unlikely((u.u64 & 0x7fffffffffffffff) > 0x7ff0000000000000))
+        v = JS_NAN;
+    else
+        v = u.u64 - ((uint64_t)JS_FLOAT64_TAG_ADDEND << 32);
+    return v;
+}
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)((tag) - JS_TAG_FIRST) >= (JS_TAG_FLOAT64 - JS_TAG_FIRST))
+
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+static inline int JS_VALUE_GET_NORM_TAG(JSValue v)
+{
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(v);
+    if (JS_TAG_IS_FLOAT64(tag))
+        return JS_TAG_FLOAT64;
+    else
+        return tag;
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    uint32_t tag;
+    tag = JS_VALUE_GET_TAG(v);
+    return tag == (JS_NAN >> 32);
+}
+    
+#else /* !JS_NAN_BOXING */
+
+typedef union JSValueUnion {
+    void *ptr;
+    int32_t int32;
+    double float64;
+} JSValueUnion;
+
+typedef struct JSValue {
+    JSValueUnion u;
+    int64_t tag;
+} JSValue;
+
+#define JSValueConst JSValue
+
+#define JS_VALUE_GET_TAG(v) ((int32_t)(v).tag)
+/* same as JS_VALUE_GET_TAG, but return JS_TAG_FLOAT64 with NaN boxing */
+#define JS_VALUE_GET_NORM_TAG(v) JS_VALUE_GET_TAG(v)
+#define JS_VALUE_GET_INT(v) ((v).u.int32)
+#define JS_VALUE_GET_BOOL(v) ((v).u.int32)
+#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; }()
+#elif defined(_MSC_VER)
+#define JS_VALUE_CANNOT_BE_CAST 1
+#define JS_MKVAL(tag, val) (JSValue){ { (void *)(intptr_t)(val) }, tag }
+#define JS_MKPTR(tag, p) (JSValue){ { p }, tag }
+#else
+#define JS_MKVAL(tag, val) (JSValue){ (JSValueUnion){ .int32 = val }, tag }
+#define JS_MKPTR(tag, p) (JSValue){ (JSValueUnion){ .ptr = p }, tag }
+#endif
+
+#define JS_TAG_IS_FLOAT64(tag) ((unsigned)(tag) == JS_TAG_FLOAT64)
+
+#define JS_NAN (JSValue){ .u.float64 = JS_FLOAT64_NAN, JS_TAG_FLOAT64 }
+
+static inline JSValue __JS_NewFloat64(JSContext *ctx, double d)
+{
+    JSValue v;
+    v.tag = JS_TAG_FLOAT64;
+    v.u.float64 = d;
+    return v;
+}
+
+static inline JS_BOOL JS_VALUE_IS_NAN(JSValue v)
+{
+    union {
+        double d;
+        uint64_t u64;
+    } u;
+    if (v.tag != JS_TAG_FLOAT64)
+        return 0;
+    u.d = v.u.float64;
+    return (u.u64 & 0x7fffffffffffffff) > 0x7ff0000000000000;
+}
+
+#endif /* !JS_NAN_BOXING */
+
+#define JS_VALUE_IS_BOTH_INT(v1, v2) ((JS_VALUE_GET_TAG(v1) | JS_VALUE_GET_TAG(v2)) == 0)
+#define JS_VALUE_IS_BOTH_FLOAT(v1, v2) (JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v1)) && JS_TAG_IS_FLOAT64(JS_VALUE_GET_TAG(v2)))
+
+#define JS_VALUE_GET_OBJ(v) ((JSObject *)JS_VALUE_GET_PTR(v))
+#define JS_VALUE_GET_STRING(v) ((JSString *)JS_VALUE_GET_PTR(v))
+#define JS_VALUE_HAS_REF_COUNT(v) ((unsigned)JS_VALUE_GET_TAG(v) >= (unsigned)JS_TAG_FIRST)
+
+/* special values */
+#define JS_NULL      JS_MKVAL(JS_TAG_NULL, 0)
+#define JS_UNDEFINED JS_MKVAL(JS_TAG_UNDEFINED, 0)
+#define JS_FALSE     JS_MKVAL(JS_TAG_BOOL, 0)
+#define JS_TRUE      JS_MKVAL(JS_TAG_BOOL, 1)
+#define JS_EXCEPTION JS_MKVAL(JS_TAG_EXCEPTION, 0)
+#define JS_UNINITIALIZED JS_MKVAL(JS_TAG_UNINITIALIZED, 0)
+
+/* flags for object properties */
+#define JS_PROP_CONFIGURABLE  (1 << 0)
+#define JS_PROP_WRITABLE      (1 << 1)
+#define JS_PROP_ENUMERABLE    (1 << 2)
+#define JS_PROP_C_W_E         (JS_PROP_CONFIGURABLE | JS_PROP_WRITABLE | JS_PROP_ENUMERABLE)
+#define JS_PROP_LENGTH        (1 << 3) /* used internally in Arrays */
+#define JS_PROP_TMASK         (3 << 4) /* mask for NORMAL, GETSET, VARREF, AUTOINIT */
+#define JS_PROP_NORMAL         (0 << 4)
+#define JS_PROP_GETSET         (1 << 4)
+#define JS_PROP_VARREF         (2 << 4) /* used internally */
+#define JS_PROP_AUTOINIT       (3 << 4) /* used internally */
+
+/* flags for JS_DefineProperty */
+#define JS_PROP_HAS_SHIFT        8
+#define JS_PROP_HAS_CONFIGURABLE (1 << 8)
+#define JS_PROP_HAS_WRITABLE     (1 << 9)
+#define JS_PROP_HAS_ENUMERABLE   (1 << 10)
+#define JS_PROP_HAS_GET          (1 << 11)
+#define JS_PROP_HAS_SET          (1 << 12)
+#define JS_PROP_HAS_VALUE        (1 << 13)
+
+/* throw an exception if false would be returned
+   (JS_DefineProperty/JS_SetProperty) */
+#define JS_PROP_THROW            (1 << 14)
+/* throw an exception if false would be returned in strict mode
+   (JS_SetProperty) */
+#define JS_PROP_THROW_STRICT     (1 << 15)
+
+#define JS_PROP_NO_ADD           (1 << 16) /* internal use */
+#define JS_PROP_NO_EXOTIC        (1 << 17) /* internal use */
+
+#define JS_DEFAULT_STACK_SIZE (256 * 1024)
+
+/* JS_Eval() flags */
+#define JS_EVAL_TYPE_GLOBAL   (0 << 0) /* global code (default) */
+#define JS_EVAL_TYPE_MODULE   (1 << 0) /* module code */
+#define JS_EVAL_TYPE_DIRECT   (2 << 0) /* direct call (internal use) */
+#define JS_EVAL_TYPE_INDIRECT (3 << 0) /* indirect call (internal use) */
+#define JS_EVAL_TYPE_MASK     (3 << 0)
+
+#define JS_EVAL_FLAG_STRICT   (1 << 3) /* force 'strict' mode */
+#define JS_EVAL_FLAG_STRIP    (1 << 4) /* force 'strip' mode */
+/* compile but do not run. The result is an object with a
+   JS_TAG_FUNCTION_BYTECODE or JS_TAG_MODULE tag. It can be executed
+   with JS_EvalFunction(). */
+#define JS_EVAL_FLAG_COMPILE_ONLY (1 << 5)
+/* don't include the stack frames before this eval in the Error() backtraces */
+#define JS_EVAL_FLAG_BACKTRACE_BARRIER (1 << 6)
+
+typedef JSValue JSCFunction(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+typedef JSValue JSCFunctionMagic(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic);
+typedef JSValue JSCFunctionData(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic, JSValue *func_data);
+
+typedef struct JSMallocState {
+    size_t malloc_count;
+    size_t malloc_size;
+    size_t malloc_limit;
+    void *opaque; /* user opaque */
+} JSMallocState;
+
+typedef struct JSMallocFunctions {
+    void *(*js_malloc)(JSMallocState *s, size_t size);
+    void (*js_free)(JSMallocState *s, void *ptr);
+    void *(*js_realloc)(JSMallocState *s, void *ptr, size_t size);
+    size_t (*js_malloc_usable_size)(const void *ptr);
+} JSMallocFunctions;
+
+typedef struct JSGCObjectHeader JSGCObjectHeader;
+
+JSRuntime *JS_NewRuntime(void);
+/* info lifetime must exceed that of rt */
+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);
+JSRuntime *JS_NewRuntime2(const JSMallocFunctions *mf, void *opaque);
+void JS_FreeRuntime(JSRuntime *rt);
+typedef void JS_MarkFunc(JSRuntime *rt, JSGCObjectHeader *gp);
+void JS_MarkValue(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func);
+void JS_RunGC(JSRuntime *rt);
+JS_BOOL JS_IsLiveObject(JSRuntime *rt, JSValueConst obj);
+
+JSContext *JS_NewContext(JSRuntime *rt);
+void JS_FreeContext(JSContext *s);
+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);
+
+/* the following functions are used to select the intrinsic object to
+   save memory */
+JSContext *JS_NewContextRaw(JSRuntime *rt);
+void JS_AddIntrinsicBaseObjects(JSContext *ctx);
+void JS_AddIntrinsicDate(JSContext *ctx);
+void JS_AddIntrinsicEval(JSContext *ctx);
+void JS_AddIntrinsicStringNormalize(JSContext *ctx);
+void JS_AddIntrinsicRegExpCompiler(JSContext *ctx);
+void JS_AddIntrinsicRegExp(JSContext *ctx);
+void JS_AddIntrinsicJSON(JSContext *ctx);
+void JS_AddIntrinsicProxy(JSContext *ctx);
+void JS_AddIntrinsicMapSet(JSContext *ctx);
+void JS_AddIntrinsicTypedArrays(JSContext *ctx);
+void JS_AddIntrinsicPromise(JSContext *ctx);
+void JS_AddIntrinsicBigInt(JSContext *ctx);
+void JS_AddIntrinsicBigFloat(JSContext *ctx);
+void JS_AddIntrinsicBigDecimal(JSContext *ctx);
+/* enable "use bigint", "use math" and operator overloading */
+void JS_EnableBignumExt(JSContext *ctx, JS_BOOL enable);
+
+JSValue js_string_codePointRange(JSContext *ctx, JSValueConst this_val,
+                                 int argc, JSValueConst *argv);
+
+void *js_malloc_rt(JSRuntime *rt, size_t size);
+void js_free_rt(JSRuntime *rt, void *ptr);
+void *js_realloc_rt(JSRuntime *rt, void *ptr, size_t size);
+size_t js_malloc_usable_size_rt(JSRuntime *rt, const void *ptr);
+void *js_mallocz_rt(JSRuntime *rt, size_t size);
+
+void *js_malloc(JSContext *ctx, size_t size);
+void js_free(JSContext *ctx, void *ptr);
+void *js_realloc(JSContext *ctx, void *ptr, size_t size);
+size_t js_malloc_usable_size(JSContext *ctx, const void *ptr);
+void *js_realloc2(JSContext *ctx, void *ptr, size_t size, size_t *pslack);
+void *js_mallocz(JSContext *ctx, size_t size);
+char *js_strdup(JSContext *ctx, const char *str);
+char *js_strndup(JSContext *ctx, const char *s, size_t n);
+
+typedef struct JSMemoryUsage {
+    int64_t malloc_size, malloc_limit, memory_used_size;
+    int64_t malloc_count;
+    int64_t memory_used_count;
+    int64_t atom_count, atom_size;
+    int64_t str_count, str_size;
+    int64_t obj_count, obj_size;
+    int64_t prop_count, prop_size;
+    int64_t shape_count, shape_size;
+    int64_t js_func_count, js_func_size, js_func_code_size;
+    int64_t js_func_pc2line_count, js_func_pc2line_size;
+    int64_t c_func_count, array_count;
+    int64_t fast_array_count, fast_array_elements;
+    int64_t binary_object_count, binary_object_size;
+} JSMemoryUsage;
+
+void JS_ComputeMemoryUsage(JSRuntime *rt, JSMemoryUsage *s);
+void JS_DumpMemoryUsage(FILE *fp, const JSMemoryUsage *s, JSRuntime *rt);
+
+/* atom support */
+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);
+JSAtom JS_DupAtom(JSContext *ctx, JSAtom v);
+void JS_FreeAtom(JSContext *ctx, JSAtom v);
+void JS_FreeAtomRT(JSRuntime *rt, JSAtom v);
+JSValue JS_AtomToValue(JSContext *ctx, JSAtom atom);
+JSValue JS_AtomToString(JSContext *ctx, JSAtom atom);
+const char *JS_AtomToCString(JSContext *ctx, JSAtom atom);
+JSAtom JS_ValueToAtom(JSContext *ctx, JSValueConst val);
+
+/* object class support */
+
+typedef struct JSPropertyEnum {
+    JS_BOOL is_enumerable;
+    JSAtom atom;
+} JSPropertyEnum;
+
+typedef struct JSPropertyDescriptor {
+    int flags;
+    JSValue value;
+    JSValue getter;
+    JSValue setter;
+} JSPropertyDescriptor;
+
+typedef struct JSClassExoticMethods {
+    /* Return -1 if exception (can only happen in case of Proxy object),
+       FALSE if the property does not exists, TRUE if it exists. If 1 is
+       returned, the property descriptor 'desc' is filled if != NULL. */
+    int (*get_own_property)(JSContext *ctx, JSPropertyDescriptor *desc,
+                             JSValueConst obj, JSAtom prop);
+    /* '*ptab' should hold the '*plen' property keys. Return 0 if OK,
+       -1 if exception. The 'is_enumerable' field is ignored.
+    */
+    int (*get_own_property_names)(JSContext *ctx, JSPropertyEnum **ptab,
+                                  uint32_t *plen,
+                                  JSValueConst obj);
+    /* return < 0 if exception, or TRUE/FALSE */
+    int (*delete_property)(JSContext *ctx, JSValueConst obj, JSAtom prop);
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*define_own_property)(JSContext *ctx, JSValueConst this_obj,
+                               JSAtom prop, JSValueConst val,
+                               JSValueConst getter, JSValueConst setter,
+                               int flags);
+    /* The following methods can be emulated with the previous ones,
+       so they are usually not needed */
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*has_property)(JSContext *ctx, JSValueConst obj, JSAtom atom);
+    JSValue (*get_property)(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                            JSValueConst receiver);
+    /* return < 0 if exception or TRUE/FALSE */
+    int (*set_property)(JSContext *ctx, JSValueConst obj, JSAtom atom,
+                        JSValueConst value, JSValueConst receiver, int flags);
+} JSClassExoticMethods;
+
+typedef void JSClassFinalizer(JSRuntime *rt, JSValue val);
+typedef void JSClassGCMark(JSRuntime *rt, JSValueConst val,
+                           JS_MarkFunc *mark_func);
+#define JS_CALL_FLAG_CONSTRUCTOR (1 << 0)
+typedef JSValue JSClassCall(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst this_val, int argc, JSValueConst *argv,
+                            int flags);
+
+typedef struct JSClassDef {
+    const char *class_name;
+    JSClassFinalizer *finalizer;
+    JSClassGCMark *gc_mark;
+    /* if call != NULL, the object is a function. If (flags &
+       JS_CALL_FLAG_CONSTRUCTOR) != 0, the function is called as a
+       constructor. In this case, 'this_val' is new.target. A
+       constructor call only happens if the object constructor bit is
+       set (see JS_SetConstructorBit()). */
+    JSClassCall *call;
+    /* XXX: suppress this indirection ? It is here only to save memory
+       because only a few classes need these methods */
+    JSClassExoticMethods *exotic;
+} JSClassDef;
+
+JSClassID JS_NewClassID(JSClassID *pclass_id);
+int JS_NewClass(JSRuntime *rt, JSClassID class_id, const JSClassDef *class_def);
+int JS_IsRegisteredClass(JSRuntime *rt, JSClassID class_id);
+
+/* value handling */
+
+static js_force_inline JSValue JS_NewBool(JSContext *ctx, JS_BOOL val)
+{
+    return JS_MKVAL(JS_TAG_BOOL, val);
+}
+
+static js_force_inline JSValue JS_NewInt32(JSContext *ctx, int32_t val)
+{
+    return JS_MKVAL(JS_TAG_INT, val);
+}
+
+static js_force_inline JSValue JS_NewCatchOffset(JSContext *ctx, int32_t val)
+{
+    return JS_MKVAL(JS_TAG_CATCH_OFFSET, val);
+}
+
+JSValue JS_NewInt64(JSContext *ctx, int64_t v);
+JSValue JS_NewBigInt64(JSContext *ctx, int64_t v);
+JSValue JS_NewBigUint64(JSContext *ctx, uint64_t v);
+
+static js_force_inline JSValue JS_NewFloat64(JSContext *ctx, double d)
+{
+    JSValue v;
+    int32_t val;
+    union {
+        double d;
+        uint64_t u;
+    } u, t;
+    u.d = d;
+    val = (int32_t)d;
+    t.d = val;
+    /* -0 cannot be represented as integer, so we compare the bit
+        representation */
+    if (u.u == t.u) {
+        v = JS_MKVAL(JS_TAG_INT, val);
+    } else {
+        v = __JS_NewFloat64(ctx, d);
+    }
+    return v;
+}
+
+JS_BOOL JS_IsNumber(JSValueConst v);
+
+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;
+}
+
+static inline JS_BOOL JS_IsBigFloat(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_BIG_FLOAT;
+}
+
+static inline JS_BOOL JS_IsBigDecimal(JSValueConst v)
+{
+    int tag = JS_VALUE_GET_TAG(v);
+    return tag == JS_TAG_BIG_DECIMAL;
+}
+
+static inline JS_BOOL JS_IsBool(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_BOOL;
+}
+
+static inline JS_BOOL JS_IsNull(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_NULL;
+}
+
+static inline JS_BOOL JS_IsUndefined(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_UNDEFINED;
+}
+
+static inline JS_BOOL JS_IsException(JSValueConst v)
+{
+    return js_unlikely(JS_VALUE_GET_TAG(v) == JS_TAG_EXCEPTION);
+}
+
+static inline JS_BOOL JS_IsUninitialized(JSValueConst v)
+{
+    return js_unlikely(JS_VALUE_GET_TAG(v) == JS_TAG_UNINITIALIZED);
+}
+
+static inline JS_BOOL JS_IsString(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_STRING;
+}
+
+static inline JS_BOOL JS_IsSymbol(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_SYMBOL;
+}
+
+static inline JS_BOOL JS_IsObject(JSValueConst v)
+{
+    return JS_VALUE_GET_TAG(v) == JS_TAG_OBJECT;
+}
+
+JSValue JS_Throw(JSContext *ctx, JSValue obj);
+JSValue JS_GetException(JSContext *ctx);
+JS_BOOL JS_IsError(JSContext *ctx, JSValueConst val);
+void JS_ResetUncatchableError(JSContext *ctx);
+JSValue JS_NewError(JSContext *ctx);
+JSValue __js_printf_like(2, 3) JS_ThrowSyntaxError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowTypeError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowReferenceError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowRangeError(JSContext *ctx, const char *fmt, ...);
+JSValue __js_printf_like(2, 3) JS_ThrowInternalError(JSContext *ctx, const char *fmt, ...);
+JSValue JS_ThrowOutOfMemory(JSContext *ctx);
+
+void __JS_FreeValue(JSContext *ctx, JSValue v);
+static inline void JS_FreeValue(JSContext *ctx, JSValue v)
+{
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+        if (--p->ref_count <= 0) {
+            __JS_FreeValue(ctx, v);
+        }
+    }
+}
+void __JS_FreeValueRT(JSRuntime *rt, JSValue v);
+static inline void JS_FreeValueRT(JSRuntime *rt, JSValue v)
+{
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+        if (--p->ref_count <= 0) {
+            __JS_FreeValueRT(rt, v);
+        }
+    }
+}
+
+static inline JSValue JS_DupValue(JSContext *ctx, JSValueConst v)
+{
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+        p->ref_count++;
+    }
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    return v;
+#else
+    return (JSValue)v;
+#endif
+}
+
+static inline JSValue JS_DupValueRT(JSRuntime *rt, JSValueConst v)
+{
+    if (JS_VALUE_HAS_REF_COUNT(v)) {
+        JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(v);
+        p->ref_count++;
+    }
+#if defined(JS_VALUE_CANNOT_BE_CAST)
+    return v;
+#else
+    return (JSValue)v;
+#endif
+}
+
+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)
+{
+    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);
+int JS_ToBigInt64(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);
+JSValue JS_NewAtomString(JSContext *ctx, const char *str);
+JSValue JS_ToString(JSContext *ctx, JSValueConst val);
+JSValue JS_ToPropertyKey(JSContext *ctx, JSValueConst val);
+const char *JS_ToCStringLen2(JSContext *ctx, size_t *plen, JSValueConst val1, JS_BOOL cesu8);
+static inline const char *JS_ToCStringLen(JSContext *ctx, size_t *plen, JSValueConst val1)
+{
+    return JS_ToCStringLen2(ctx, plen, val1, 0);
+}
+static inline const char *JS_ToCString(JSContext *ctx, JSValueConst val1)
+{
+    return JS_ToCStringLen2(ctx, NULL, val1, 0);
+}
+void JS_FreeCString(JSContext *ctx, const char *ptr);
+
+JSValue JS_NewObjectProtoClass(JSContext *ctx, JSValueConst proto, JSClassID class_id);
+JSValue JS_NewObjectClass(JSContext *ctx, int class_id);
+JSValue JS_NewObjectProto(JSContext *ctx, JSValueConst proto);
+JSValue JS_NewObject(JSContext *ctx);
+
+JS_BOOL JS_IsFunction(JSContext* ctx, JSValueConst val);
+JS_BOOL JS_IsConstructor(JSContext* ctx, JSValueConst val);
+JS_BOOL JS_SetConstructorBit(JSContext *ctx, JSValueConst func_obj, JS_BOOL val);
+
+JSValue JS_NewArray(JSContext *ctx);
+int JS_IsArray(JSContext *ctx, JSValueConst val);
+
+JSValue JS_GetPropertyInternal(JSContext *ctx, JSValueConst obj,
+                               JSAtom prop, JSValueConst receiver,
+                               JS_BOOL throw_ref_error);
+static js_force_inline JSValue JS_GetProperty(JSContext *ctx, JSValueConst this_obj,
+                                              JSAtom prop)
+{
+    return JS_GetPropertyInternal(ctx, this_obj, prop, this_obj, 0);
+}
+JSValue JS_GetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                          const char *prop);
+JSValue JS_GetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                             uint32_t idx);
+
+int JS_SetPropertyInternal(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val,
+                           int flags);
+static inline int JS_SetProperty(JSContext *ctx, JSValueConst this_obj,
+                                 JSAtom prop, JSValue val)
+{
+    return JS_SetPropertyInternal(ctx, this_obj, prop, val, JS_PROP_THROW);
+}
+int JS_SetPropertyUint32(JSContext *ctx, JSValueConst this_obj,
+                         uint32_t idx, JSValue val);
+int JS_SetPropertyInt64(JSContext *ctx, JSValueConst this_obj,
+                        int64_t idx, JSValue val);
+int JS_SetPropertyStr(JSContext *ctx, JSValueConst this_obj,
+                      const char *prop, JSValue val);
+int JS_HasProperty(JSContext *ctx, JSValueConst this_obj, JSAtom prop);
+int JS_IsExtensible(JSContext *ctx, JSValueConst obj);
+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);
+
+#define JS_GPN_STRING_MASK  (1 << 0)
+#define JS_GPN_SYMBOL_MASK  (1 << 1)
+#define JS_GPN_PRIVATE_MASK (1 << 2)
+/* only include the enumerable properties */
+#define JS_GPN_ENUM_ONLY    (1 << 4)
+/* set theJSPropertyEnum.is_enumerable field */
+#define JS_GPN_SET_ENUM     (1 << 5)
+
+int JS_GetOwnPropertyNames(JSContext *ctx, JSPropertyEnum **ptab,
+                           uint32_t *plen, JSValueConst obj, int flags);
+int JS_GetOwnProperty(JSContext *ctx, JSPropertyDescriptor *desc,
+                      JSValueConst obj, JSAtom prop);
+
+JSValue JS_Call(JSContext *ctx, JSValueConst func_obj, JSValueConst this_obj,
+                int argc, JSValueConst *argv);
+JSValue JS_Invoke(JSContext *ctx, JSValueConst this_val, JSAtom atom,
+                  int argc, JSValueConst *argv);
+JSValue JS_CallConstructor(JSContext *ctx, JSValueConst func_obj,
+                           int argc, JSValueConst *argv);
+JSValue JS_CallConstructor2(JSContext *ctx, JSValueConst func_obj,
+                            JSValueConst new_target,
+                            int argc, JSValueConst *argv);
+JS_BOOL JS_DetectModule(const char *input, size_t input_len);
+/* '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);
+JSValue JS_GetGlobalObject(JSContext *ctx);
+int JS_IsInstanceOf(JSContext *ctx, JSValueConst val, JSValueConst obj);
+int JS_DefineProperty(JSContext *ctx, JSValueConst this_obj,
+                      JSAtom prop, JSValueConst val,
+                      JSValueConst getter, JSValueConst setter, int flags);
+int JS_DefinePropertyValue(JSContext *ctx, JSValueConst this_obj,
+                           JSAtom prop, JSValue val, int flags);
+int JS_DefinePropertyValueUint32(JSContext *ctx, JSValueConst this_obj,
+                                 uint32_t idx, JSValue val, int flags);
+int JS_DefinePropertyValueStr(JSContext *ctx, JSValueConst this_obj,
+                              const char *prop, JSValue val, int flags);
+int JS_DefinePropertyGetSet(JSContext *ctx, JSValueConst this_obj,
+                            JSAtom prop, JSValue getter, JSValue setter,
+                            int flags);
+void JS_SetOpaque(JSValue obj, void *opaque);
+void *JS_GetOpaque(JSValueConst obj, JSClassID class_id);
+void *JS_GetOpaque2(JSContext *ctx, JSValueConst obj, JSClassID class_id);
+
+/* '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);
+JSValue JS_JSONStringify(JSContext *ctx, JSValueConst obj,
+                         JSValueConst replacer, JSValueConst space0);
+
+typedef void JSFreeArrayBufferDataFunc(JSRuntime *rt, void *opaque, void *ptr);
+JSValue JS_NewArrayBuffer(JSContext *ctx, uint8_t *buf, size_t len,
+                          JSFreeArrayBufferDataFunc *free_func, void *opaque,
+                          JS_BOOL is_shared);
+JSValue JS_NewArrayBufferCopy(JSContext *ctx, const uint8_t *buf, size_t len);
+void JS_DetachArrayBuffer(JSContext *ctx, JSValueConst obj);
+uint8_t *JS_GetArrayBuffer(JSContext *ctx, size_t *psize, JSValueConst obj);
+JSValue JS_GetTypedArrayBuffer(JSContext *ctx, JSValueConst obj,
+                               size_t *pbyte_offset,
+                               size_t *pbyte_length,
+                               size_t *pbytes_per_element);
+
+JSValue JS_NewPromiseCapability(JSContext *ctx, JSValue *resolving_funcs);
+
+/* is_handled = TRUE means that the rejection is handled */
+typedef void JSHostPromiseRejectionTracker(JSContext *ctx, JSValueConst promise,
+                                           JSValueConst reason,
+                                           JS_BOOL is_handled, void *opaque);
+void JS_SetHostPromiseRejectionTracker(JSRuntime *rt, JSHostPromiseRejectionTracker *cb, void *opaque);
+
+/* return != 0 if the JS code needs to be interrupted */
+typedef int JSInterruptHandler(JSRuntime *rt, void *opaque);
+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);
+
+typedef struct JSModuleDef JSModuleDef;
+
+/* return the module specifier (allocated with js_malloc()) or NULL if
+   exception */
+typedef char *JSModuleNormalizeFunc(JSContext *ctx,
+                                    const char *module_base_name,
+                                    const char *module_name, void *opaque);
+typedef JSModuleDef *JSModuleLoaderFunc(JSContext *ctx,
+                                        const char *module_name, void *opaque);
+
+/* module_normalize = NULL is allowed and invokes the default module
+   filename normalizer */
+void JS_SetModuleLoaderFunc(JSRuntime *rt,
+                            JSModuleNormalizeFunc *module_normalize,
+                            JSModuleLoaderFunc *module_loader, void *opaque);
+/* return the import.meta object of a module */
+JSValue JS_GetImportMeta(JSContext *ctx, JSModuleDef *m);
+JSAtom JS_GetModuleName(JSContext *ctx, JSModuleDef *m);
+
+/* JS Job support */
+
+typedef JSValue JSJobFunc(JSContext *ctx, int argc, JSValueConst *argv);
+int JS_EnqueueJob(JSContext *ctx, JSJobFunc *job_func, int argc, JSValueConst *argv);
+
+JS_BOOL JS_IsJobPending(JSRuntime *rt);
+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 */
+uint8_t *JS_WriteObject(JSContext *ctx, size_t *psize, JSValueConst obj,
+                        int flags);
+#define JS_READ_OBJ_BYTECODE  (1 << 0) /* allow function/module */
+#define JS_READ_OBJ_ROM_DATA  (1 << 1) /* avoid duplicating 'buf' data */
+JSValue JS_ReadObject(JSContext *ctx, const uint8_t *buf, size_t buf_len,
+                      int flags);
+/* load the dependencies of the module 'obj'. Useful when JS_ReadObject()
+   returns a module. */
+int JS_ResolveModule(JSContext *ctx, JSValueConst obj);
+
+/* C function definition */
+typedef enum JSCFunctionEnum {  /* XXX: should rename for namespace isolation */
+    JS_CFUNC_generic,
+    JS_CFUNC_generic_magic,
+    JS_CFUNC_constructor,
+    JS_CFUNC_constructor_magic,
+    JS_CFUNC_constructor_or_func,
+    JS_CFUNC_constructor_or_func_magic,
+    JS_CFUNC_f_f,
+    JS_CFUNC_f_f_f,
+    JS_CFUNC_getter,
+    JS_CFUNC_setter,
+    JS_CFUNC_getter_magic,
+    JS_CFUNC_setter_magic,
+    JS_CFUNC_iterator_next,
+} JSCFunctionEnum;
+
+typedef union JSCFunctionType {
+    JSCFunction *generic;
+    JSValue (*generic_magic)(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv, int magic);
+    JSCFunction *constructor;
+    JSValue (*constructor_magic)(JSContext *ctx, JSValueConst new_target, int argc, JSValueConst *argv, int magic);
+    JSCFunction *constructor_or_func;
+    double (*f_f)(double);
+    double (*f_f_f)(double, double);
+    JSValue (*getter)(JSContext *ctx, JSValueConst this_val);
+    JSValue (*setter)(JSContext *ctx, JSValueConst this_val, JSValueConst val);
+    JSValue (*getter_magic)(JSContext *ctx, JSValueConst this_val, int magic);
+    JSValue (*setter_magic)(JSContext *ctx, JSValueConst this_val, JSValueConst val, int magic);
+    JSValue (*iterator_next)(JSContext *ctx, JSValueConst this_val,
+                             int argc, JSValueConst *argv, int *pdone, int magic);
+} JSCFunctionType;
+
+JSValue JS_NewCFunction2(JSContext *ctx, JSCFunction *func,
+                         const char *name,
+                         int length, JSCFunctionEnum cproto, int magic);
+JSValue JS_NewCFunctionData(JSContext *ctx, JSCFunctionData *func,
+                            int length, int magic, int data_len,
+                            JSValueConst *data);
+
+static inline JSValue JS_NewCFunction(JSContext *ctx, JSCFunction *func, const char *name,
+                                      int length)
+{
+    return JS_NewCFunction2(ctx, func, name, length, JS_CFUNC_generic, 0);
+}
+
+static inline JSValue JS_NewCFunctionMagic(JSContext *ctx, JSCFunctionMagic *func,
+                                           const char *name,
+                                           int length, JSCFunctionEnum cproto, int magic)
+{
+    return JS_NewCFunction2(ctx, (JSCFunction *)func, name, length, cproto, magic);
+}
+void JS_SetConstructor(JSContext *ctx, JSValueConst func_obj, 
+                       JSValueConst proto);
+
+/* C property definition */
+
+typedef struct JSCFunctionListEntry {
+    const char *name;
+    uint8_t prop_flags;
+    uint8_t def_type;
+    int16_t magic;
+    union {
+        struct {
+            uint32_t length; /* XXX: should move outside union */
+            uint32_t cproto; /* XXX: should move outside union */
+            JSCFunctionType cfunc;
+        } func;
+        struct {
+            JSCFunctionType get;
+            JSCFunctionType set;
+        } getset;
+        struct {
+            const char *name;
+            int base;
+        } alias;
+        struct {
+            const struct JSCFunctionListEntry *tab;
+            int len;
+        } prop_list;
+        const char *str;
+        int32_t i32;
+        int64_t i64;
+        double f64;
+    } u;
+} JSCFunctionListEntry;
+
+#define JS_DEF_CFUNC          0
+#define JS_DEF_CGETSET        1
+#define JS_DEF_CGETSET_MAGIC  2
+#define JS_DEF_PROP_STRING    3
+#define JS_DEF_PROP_INT32     4
+#define JS_DEF_PROP_INT64     5
+#define JS_DEF_PROP_DOUBLE    6
+#define JS_DEF_PROP_UNDEFINED 7
+#define JS_DEF_OBJECT         8
+#define JS_DEF_ALIAS          9
+
+/* Note: c++ does not like nested designators */
+#define JS_CFUNC_DEF(name, length, func1) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_generic, { .generic = func1 } } } }
+#define JS_CFUNC_MAGIC_DEF(name, length, func1, magic) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, magic, .u = { .func = { length, JS_CFUNC_generic_magic, { .generic_magic = func1 } } } }
+#define JS_CFUNC_SPECIAL_DEF(name, length, cproto, func1) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, 0, .u = { .func = { length, JS_CFUNC_ ## cproto, { .cproto = func1 } } } }
+#define JS_ITERATOR_NEXT_DEF(name, length, func1, magic) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_CFUNC, magic, .u = { .func = { length, JS_CFUNC_iterator_next, { .iterator_next = func1 } } } }
+#define JS_CGETSET_DEF(name, fgetter, fsetter) { name, JS_PROP_CONFIGURABLE, JS_DEF_CGETSET, 0, .u = { .getset = { .get = { .getter = fgetter }, .set = { .setter = fsetter } } } }
+#define JS_CGETSET_MAGIC_DEF(name, fgetter, fsetter, magic) { name, JS_PROP_CONFIGURABLE, JS_DEF_CGETSET_MAGIC, magic, .u = { .getset = { .get = { .getter_magic = fgetter }, .set = { .setter_magic = fsetter } } } }
+#define JS_PROP_STRING_DEF(name, cstr, prop_flags) { name, prop_flags, JS_DEF_PROP_STRING, 0, .u = { .str = cstr } }
+#define JS_PROP_INT32_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT32, 0, .u = { .i32 = val } }
+#define JS_PROP_INT64_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_INT64, 0, .u = { .i64 = val } }
+#define JS_PROP_DOUBLE_DEF(name, val, prop_flags) { name, prop_flags, JS_DEF_PROP_DOUBLE, 0, .u = { .f64 = val } }
+#define JS_PROP_UNDEFINED_DEF(name, prop_flags) { name, prop_flags, JS_DEF_PROP_UNDEFINED, 0, .u = { .i32 = 0 } }
+#define JS_OBJECT_DEF(name, tab, len, prop_flags) { name, prop_flags, JS_DEF_OBJECT, 0, .u = { .prop_list = { tab, len } } }
+#define JS_ALIAS_DEF(name, from) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_ALIAS, 0, .u = { .alias = { from, -1 } } }
+#define JS_ALIAS_BASE_DEF(name, from, base) { name, JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE, JS_DEF_ALIAS, 0, .u = { .alias = { from, base } } }
+
+void JS_SetPropertyFunctionList(JSContext *ctx, JSValueConst obj,
+                                const JSCFunctionListEntry *tab,
+                                int len);
+
+/* C module definition */
+
+typedef int JSModuleInitFunc(JSContext *ctx, JSModuleDef *m);
+
+JSModuleDef *JS_NewCModule(JSContext *ctx, const char *name_str,
+                           JSModuleInitFunc *func);
+/* can only be called before the module is instantiated */
+int JS_AddModuleExport(JSContext *ctx, JSModuleDef *m, const char *name_str);
+int JS_AddModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len);
+/* can only be called after the module is instantiated */
+int JS_SetModuleExport(JSContext *ctx, JSModuleDef *m, const char *export_name,
+                       JSValue val);
+int JS_SetModuleExportList(JSContext *ctx, JSModuleDef *m,
+                           const JSCFunctionListEntry *tab, int len);
+
+#undef js_unlikely
+#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);
+
+void *JS_GetOpaque_Nocheck(JSValueConst obj);
+/*end GPAC patched*/
+
+#ifdef __cplusplus
+} /* extern "C" { */
+#endif
+
+#endif /* QUICKJS_H */

gpac-0.8.0.tar.gz/src/scene_manager/encode_isom.c -> gpac-1.0.0.tar.gz/src/scene_manager/encode_isom.c Changed

@@ -72,15 +72,15 @@
 		u32 off = offset_ts * ts  / mts;
 		u64 dur = gf_isom_get_media_duration(mp4, track);
 		dur = dur * ts / mts;
-		gf_isom_set_edit_segment(mp4, track, 0, off, 0, GF_ISOM_EDIT_EMPTY);
-		gf_isom_set_edit_segment(mp4, track, off, dur, 0, GF_ISOM_EDIT_NORMAL);
+		gf_isom_set_edit(mp4, track, 0, off, 0, GF_ISOM_EDIT_EMPTY);
+		gf_isom_set_edit(mp4, track, off, dur, 0, GF_ISOM_EDIT_NORMAL);
 	}
 	/*set track interleaving ID*/
 	if (mux) {
 		if (mux->GroupID) gf_isom_set_track_interleaving_group(mp4, track, mux->GroupID);
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 		if (mux->import_flags & GF_IMPORT_USE_COMPACT_SIZE)
-			gf_isom_use_compact_size(mp4, track, 1);
+			gf_isom_use_compact_size(mp4, track, GF_TRUE);
 #endif
 	}
 #endif
@@ -91,15 +91,16 @@
 
 static GF_Err gf_sm_import_ui_stream(GF_ISOFile *mp4, GF_ESD *src, Bool rewrite_esd_only)
 {
-	GF_UIConfig *cfg;
+#ifndef GPAC_DISABLE_ISOM_WRITE
 	u32 len, i;
+#endif
 	GF_Err e;
 	if (!src->slConfig) src->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	src->slConfig->predefined = 2;
 	src->slConfig->timestampResolution = 1000;
 	if (!src->decoderConfig || !src->decoderConfig->decoderSpecificInfo) return GF_ODF_INVALID_DESCRIPTOR;
 	if (src->decoderConfig->decoderSpecificInfo->tag == GF_ODF_UI_CFG_TAG) {
-		cfg = (GF_UIConfig *) src->decoderConfig->decoderSpecificInfo;
+		GF_UIConfig *cfg = (GF_UIConfig *) src->decoderConfig->decoderSpecificInfo;
 		e = gf_odf_encode_ui_config(cfg, &src->decoderConfig->decoderSpecificInfo);
 		gf_odf_desc_del((GF_Descriptor *) cfg);
 		if (e) return e;
@@ -112,7 +113,7 @@
 	/*what's the media type for input sensor ??*/
 	len = gf_isom_new_track(mp4, src->ESID, GF_ISOM_MEDIA_SCENE, 1000);
 	if (!len) return gf_isom_last_error(mp4);
-	gf_isom_set_track_enabled(mp4, len, 1);
+	gf_isom_set_track_enabled(mp4, len, GF_TRUE);
 	if (!src->ESID) src->ESID = gf_isom_get_track_id(mp4, len);
 	return gf_isom_new_mpeg4_description(mp4, len, src, NULL, NULL, &i);
 #else
@@ -143,7 +144,7 @@
 
 	/*no import if URL string*/
 	if (src->URLString) {
-		u32 mtype, track;
+		u32 mtype;
 		if (!src->slConfig) src->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 		if (!src->decoderConfig) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[ISO File Encode] ESD with URL string needs a decoder config with remote stream type to be encoded\n"));
@@ -201,14 +202,14 @@
 	if (src->decoderConfig && src->decoderConfig->streamType == GF_STREAM_OCR) {
 		track = gf_isom_new_track(mp4, src->ESID, GF_ISOM_MEDIA_OCR, 1000);
 		if (!track) return gf_isom_last_error(mp4);
-		gf_isom_set_track_enabled(mp4, track, 1);
+		gf_isom_set_track_enabled(mp4, track, GF_TRUE);
 		if (!src->ESID) src->ESID = gf_isom_get_track_id(mp4, track);
 		if (!src->slConfig) src->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 		src->slConfig->predefined = 2;
 		e = gf_isom_new_mpeg4_description(mp4, track, src, NULL, NULL, &di);
 		if (e) return e;
 		if (mux && mux->duration)
-			e = gf_isom_set_edit_segment(mp4, track, 0, mux->duration * gf_isom_get_timescale(mp4) / 1000, 0, GF_ISOM_EDIT_NORMAL);
+			e = gf_isom_set_edit(mp4, track, 0, mux->duration * gf_isom_get_timescale(mp4) / 1000, 0, GF_ISOM_EDIT_NORMAL);
 		return e;
 	}
 
@@ -240,7 +241,7 @@
 	} else {
 		strcpy(szName, mux->file_name);
 	}
-	ext = strrchr(szName, '.');
+	ext = gf_file_ext_start(szName);
 
 	/*get track types for AVI*/
 	if (ext && !strnicmp(ext, ".avi", 4)) {
@@ -272,9 +273,13 @@
 	import.streamFormat = mux->streamFormat;
 	import.dest = mp4;
 	import.esd = src;
-	import.duration = mux->duration;
-	import.flags = mux->import_flags;
-	import.video_fps = mux->frame_rate;
+	if (mux->duration) {
+		import.duration.num = mux->duration;
+		import.duration.den = 1000;
+	}
+	import.flags = mux->import_flags | GF_IMPORT_FORCE_MPEG4;
+	import.video_fps.num = (s32) (1000*mux->frame_rate);
+	import.video_fps.den = 1000;
 	import.in_name = szName;
 	import.initial_time_offset = imp_time;
 	e = gf_media_import(&import);
@@ -284,17 +289,28 @@
 		gf_isom_set_track_reference(mp4, gf_isom_get_track_by_id(mp4, import.final_trackID), GF_ISOM_REF_OCR, src->OCRESID);
 	}
 
+	track = gf_isom_get_track_by_id(mp4, import.final_trackID);
 	i=0;
 	while ((d = gf_list_enum(src->extensionDescriptors, &i))) {
+		Bool do_del = GF_FALSE;
 		if (d->tag == GF_ODF_AUX_VIDEO_DATA) {
-			gf_isom_add_user_data(mp4, gf_isom_get_track_by_id(mp4, import.final_trackID), GF_ISOM_BOX_TYPE_AUXV, 0, NULL, 0);
+			gf_isom_add_user_data(mp4, track, GF_ISOM_BOX_TYPE_AUXV, 0, NULL, 0);
+			do_del = GF_TRUE;
+		}
+		else if (d->tag == GF_ODF_GPAC_LANG) {
+			gf_isom_add_desc_to_description(mp4, track, 1, d);
+			do_del = GF_TRUE;
+
+		}
+		if (do_del) {
 			gf_list_rem(src->extensionDescriptors, i-1);
+			i--;
 			gf_odf_desc_del(d);
 		}
 	}
 	/*if desired delete input*/
-	if (mux->delete_file) gf_delete_file(mux->file_name);
-	return e;
+	if (mux->delete_file) gf_file_delete(mux->file_name);
+	return GF_OK;
 }
 
 static GF_Err gf_sm_import_stream_special(GF_SceneManager *ctx, GF_ESD *esd)
@@ -427,7 +443,7 @@
 
 static GF_Err gf_sm_encode_scene(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_SMEncodeOptions *opts, u32 scene_type)
 {
-	char *data;
+	u8 *data;
 	Bool is_in_iod, delete_desc;
 	u32 i, j, di, rate, init_offset, data_len, count, track, rap_delay, flags, rap_mode;
 	u64 last_rap, dur, time_slice, avg_rate, prev_dts;
@@ -461,7 +477,7 @@
 		while ((sc = (GF_StreamContext*)gf_list_enum(ctx->streams, &i))) {
 			if (sc->streamType == GF_STREAM_OD) count++;
 		}
-		if (!iod && count>1) return GF_NOT_SUPPORTED;
+		if (count>1) return GF_NOT_SUPPORTED;
 	}
 
 	count = gf_list_count(ctx->streams);
@@ -480,9 +496,9 @@
 		esd = NULL;
 		if (sc->streamType != GF_STREAM_SCENE) continue;
 		/*NOT BIFS*/
-		if (!scene_type && (sc->objectType > 2) ) continue;
+		if (!scene_type && (sc->codec_id > 2) ) continue;
 		/*NOT LASeR*/
-		if (scene_type && (sc->objectType != 0x09) ) continue;
+		if (scene_type && (sc->codec_id != 0x09) ) continue;
 		j++;
 	}
 	if (!j) {
@@ -504,6 +520,7 @@
 	if (!scene_type) {
 #ifndef GPAC_DISABLE_BIFS_ENC
 		bifs_enc = gf_bifs_encoder_new(ctx->scene_graph);
+		if (!bifs_enc) return GF_OUT_OF_MEM;
 		/*no streams defined, encode a RAP*/
 		if (!j) {
 			delete_desc = 0;
@@ -511,7 +528,8 @@
 			is_in_iod = 1;
 			goto force_scene_rap;
 		}
-		gf_bifs_encoder_set_source_url(bifs_enc, opts->src_url);
+		if (opts)
+			gf_bifs_encoder_set_source_url(bifs_enc, opts->src_url);
 #else
 		return GF_NOT_SUPPORTED;
 #endif
@@ -520,6 +538,7 @@
 	if (scene_type==1) {
 #ifndef GPAC_DISABLE_LASER
 		lsr_enc = gf_laser_encoder_new(ctx->scene_graph);
+		if (!lsr_enc) return GF_OUT_OF_MEM;
 		/*no streams defined, encode a RAP*/
 		if (!j) {
 			delete_desc = 0;
@@ -538,9 +557,13 @@
 		esd = NULL;
 		if (sc->streamType != GF_STREAM_SCENE) continue;
 		/*NOT BIFS*/
-		if (!scene_type && (sc->objectType > 2) ) continue;
+#ifndef GPAC_DISABLE_BIFS_ENC
+		if (bifs_enc && (sc->codec_id > 2) ) continue;
+#endif
 		/*NOT LASeR*/
-		if (scene_type && (sc->objectType != 0x09) ) continue;
+#ifndef GPAC_DISABLE_LASER
+		if (lsr_enc && (sc->codec_id != 0x09) ) continue;
+#endif
 
 		delete_desc = 0;
 		esd = NULL;
@@ -567,8 +590,6 @@
 		}
 		if (!esd && sc->ESID) esd = gf_sm_locate_esd(ctx, sc->ESID);
 
-		au = NULL;
-
 #ifndef GPAC_DISABLE_VRML
 		/*special BIFS direct import from NHNT*/
 		au = (GF_AUContext*)gf_list_get(sc->AUs, 0);
@@ -593,7 +614,11 @@
 		}
 #endif
 
-		if (!au && esd && !esd->URLString) {
+		if (esd && !esd->URLString
+#ifndef GPAC_DISABLE_VRML
+			&& !au
+#endif
+		) {
 			/*if not in IOD, the stream will be imported when encoding the OD stream*/
 			if (!is_in_iod) continue;
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -611,6 +636,10 @@
 		if (!esd) {
 			delete_desc = 1;
 			esd = gf_odf_desc_esd_new(2);
+			if (!esd) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 			gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 			esd->decoderConfig->decoderSpecificInfo = NULL;
 			esd->ESID = sc ? sc->ESID : 1;
@@ -618,10 +647,18 @@
 		}
 
 		if (!esd->slConfig) esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
+		if (!esd->slConfig) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
 		if (sc && sc->timeScale) esd->slConfig->timestampResolution = sc->timeScale;
 		if (!esd->slConfig->timestampResolution) esd->slConfig->timestampResolution = 1000;
 
 		if (!esd->decoderConfig) esd->decoderConfig = (GF_DecoderConfig*)gf_odf_desc_new(GF_ODF_DCD_TAG);
+		if (!esd->decoderConfig) {
+			e = GF_OUT_OF_MEM;
+			goto exit;
+		}
 		esd->decoderConfig->streamType = GF_STREAM_SCENE;
 
 		/*create track*/
@@ -630,7 +667,7 @@
 			e = gf_isom_last_error(mp4);
 			goto exit;
 		}
-		gf_isom_set_track_enabled(mp4, track, 1);
+		gf_isom_set_track_enabled(mp4, track, GF_TRUE);
 		if (sc) {
 			if (!sc->ESID) sc->ESID = gf_isom_get_track_id(mp4, track);
 			esd->ESID = sc->ESID;
@@ -644,11 +681,19 @@
 
 			if (!esd->decoderConfig->decoderSpecificInfo) {
 				bcfg = (GF_BIFSConfig*)gf_odf_desc_new(GF_ODF_BIFS_CFG_TAG);
+				if (!bcfg) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
 				delete_bcfg = 1;
 			} else if (esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_BIFS_CFG_TAG) {
 				bcfg = (GF_BIFSConfig *)esd->decoderConfig->decoderSpecificInfo;
 			} else {
 				bcfg = gf_odf_get_bifs_config(esd->decoderConfig->decoderSpecificInfo, esd->decoderConfig->objectTypeIndication);
+				if (!bcfg) {
+					e = GF_OUT_OF_MEM;
+					goto exit;
+				}
 				delete_bcfg = 1;
 			}
 			/*update NodeIDbits and co*/
@@ -676,6 +721,10 @@
 			/*create final BIFS config*/
 			if (esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 			esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+			if (! esd->decoderConfig->decoderSpecificInfo) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 			gf_bifs_encoder_get_config(bifs_enc, esd->ESID, &data, &data_len);
 			esd->decoderConfig->decoderSpecificInfo->data = data;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
@@ -698,6 +747,10 @@
 			/*create final BIFS config*/
 			if (esd->decoderConfig->decoderSpecificInfo) gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 			esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+			if (!esd->decoderConfig->decoderSpecificInfo) {
+				e = GF_OUT_OF_MEM;
+				goto exit;
+			}
 
 			/*this is for safety, otherwise some players may not understand NULL node*/
 			if (flags & GF_SM_ENCODE_USE_NAMES) lsrcfg.force_string_ids = 1;
@@ -715,7 +768,7 @@
 
 			esd->decoderConfig->decoderSpecificInfo->data = data;
 			esd->decoderConfig->decoderSpecificInfo->dataLength = data_len;
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_LASER;
+			esd->decoderConfig->objectTypeIndication = GF_CODECID_LASER;
 		}
 #endif
 		/*create stream description*/
@@ -900,7 +953,6 @@
 
 		/*sync shadow generation*/
 		if (rap_mode==2) {
-			GF_AUContext *au;
 			u32 au_count = gf_list_count(sc->AUs);
 			last_rap = 0;
 			for (j=0; j<au_count; j++) {
@@ -932,9 +984,9 @@
 		mux = gf_sm_get_mux_info(esd);
 		if (mux && mux->duration) {
 			u64 tot_dur = mux->duration * esd->slConfig->timestampResolution / 1000;
-			u64 dur = gf_isom_get_media_duration(mp4, track);
-			if (dur <= tot_dur)
-				gf_isom_set_last_sample_duration(mp4, track, (u32) (tot_dur - dur));
+			u64 mdur = gf_isom_get_media_duration(mp4, track);
+			if (mdur <= tot_dur)
+				gf_isom_set_last_sample_duration(mp4, track, (u32) (tot_dur - mdur));
 		}
 
 		if (delete_desc) {
@@ -1026,7 +1078,7 @@
 			delete_desc = 1;
 			esd = gf_odf_desc_esd_new(2);
 			esd->ESID = sc->ESID;
-			esd->decoderConfig->objectTypeIndication = GPAC_OTI_OD_V1;
+			esd->decoderConfig->objectTypeIndication = GF_CODECID_OD_V1;
 			esd->decoderConfig->streamType = GF_STREAM_OD;
 		}
 
@@ -1036,8 +1088,8 @@
 		if (!esd->slConfig->timestampResolution) esd->slConfig->timestampResolution = 1000;
 		track = gf_isom_new_track(mp4, sc->ESID, GF_ISOM_MEDIA_OD, esd->slConfig->timestampResolution);
 		if (!sc->ESID) sc->ESID = gf_isom_get_track_id(mp4, track);
-		if (!esd->decoderConfig->objectTypeIndication) esd->decoderConfig->objectTypeIndication = GPAC_OTI_OD_V1;
-		gf_isom_set_track_enabled(mp4, track, 1);
+		if (!esd->decoderConfig->objectTypeIndication) esd->decoderConfig->objectTypeIndication = GF_CODECID_OD_V1;
+		gf_isom_set_track_enabled(mp4, track, GF_TRUE);
 		/*no DSI required*/
 		/*create stream description*/
 		gf_isom_new_mpeg4_description(mp4, track, esd, NULL, NULL, &di);
@@ -1092,7 +1144,7 @@
 								switch (imp_esd->decoderConfig->streamType) {
 								case GF_STREAM_SCENE:
 									/*import AFX streams, but not others*/
-									if (imp_esd->decoderConfig->objectTypeIndication==GPAC_OTI_SCENE_AFX)
+									if (imp_esd->decoderConfig->objectTypeIndication==GF_CODECID_AFX)
 										break;
 									continue;
 								case GF_STREAM_OD:
@@ -1192,10 +1244,10 @@
 					rap_sample->IsRAP = RAP;
 
 					if (samp->DTS == last_rap + rap_delay) {
-						GF_ODCom *com;
-						u32 k = 0;
-						while ((com = gf_list_enum(au->commands, &k))) {
-							e = gf_odf_codec_apply_com(rap_codec, com);
+						GF_ODCom *a_com;
+						k = 0;
+						while ((a_com = gf_list_enum(au->commands, &k))) {
+							e = gf_odf_codec_apply_com(rap_codec, a_com);
 							if (e) goto err_exit;
 						}
 						rap_aggregated = 1;
@@ -1222,10 +1274,10 @@
 
 			/*manage carousel/rap generation - we must do it after the RAP has been generated*/
 			if (rap_codec && !rap_aggregated) {
-				GF_ODCom *com;
-				u32 k = 0;
-				while ((com = gf_list_enum(au->commands, &k))) {
-					e = gf_odf_codec_apply_com(rap_codec, com);
+				GF_ODCom *a_com;
+				k = 0;
+				while ((a_com = gf_list_enum(au->commands, &k))) {
+					e = gf_odf_codec_apply_com(rap_codec, a_com);
 					if (e) goto err_exit;
 				}
 			}
@@ -1236,7 +1288,8 @@
 			dur = au->timing - init_offset;
 			avg_rate += samp->dataLength;
 			rate += samp->dataLength;
-			if (esd->decoderConfig->bufferSizeDB<samp->dataLength) esd->decoderConfig->bufferSizeDB = samp->dataLength;
+			if (esd->decoderConfig->bufferSizeDB<samp->dataLength)
+				esd->decoderConfig->bufferSizeDB = samp->dataLength;
 			if (samp->DTS - time_slice > esd->slConfig->timestampResolution) {
 				if (esd->decoderConfig->maxBitrate < rate) esd->decoderConfig->maxBitrate = rate;
 				rate = 0;
@@ -1313,7 +1366,6 @@
 GF_Err gf_sm_encode_to_file(GF_SceneManager *ctx, GF_ISOFile *mp4, GF_SMEncodeOptions *opts)
 {
 	u32 i, count;
-	GF_Descriptor *desc;
 	GF_Err e;
 	if (!ctx->scene_graph) return GF_BAD_PARAM;
 	if (ctx->root_od && (ctx->root_od->tag != GF_ODF_IOD_TAG) && (ctx->root_od->tag != GF_ODF_OD_TAG)) return GF_BAD_PARAM;
@@ -1321,7 +1373,7 @@
 
 	/*set MP4 brands*/
 	gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_MP42, 1);
-	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_MP41, 1);
+	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_MP41, GF_TRUE);
 
 	/*import specials, that is input remapping to BIFS*/
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
@@ -1344,6 +1396,7 @@
 
 	/*store iod*/
 	if (ctx->root_od) {
+		GF_Descriptor *desc;
 		gf_isom_set_root_od_id(mp4, ctx->root_od->objectDescriptorID);
 		if (ctx->root_od->URLString) gf_isom_set_root_od_url(mp4, ctx->root_od->URLString);
 		count = gf_list_count(ctx->root_od->extensionDescriptors);

gpac-0.8.0.tar.gz/src/scene_manager/loader_bt.c -> gpac-1.0.0.tar.gz/src/scene_manager/loader_bt.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -106,6 +106,9 @@
 	u32 base_od_id;
 
 	GF_List *scripts;
+
+	u32 def_w, def_h;
+
 } GF_BTParser;
 
 GF_Err gf_bt_parse_bifs_command(GF_BTParser *parser, char *name, GF_List *cmdList);
@@ -117,7 +120,7 @@
 static GF_Err gf_bt_report(GF_BTParser *parser, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
+	if (format && gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
 		char szMsg[2048];
 		va_list args;
 		va_start(args, format);
@@ -131,12 +134,6 @@
 }
 
 
-GF_Node *gf_bt_new_node(GF_BTParser *parser, u32 tag)
-{
-	GF_Node *n = gf_node_new(parser->load->scene_graph, tag);
-	return n;
-}
-
 void gf_bt_check_line(GF_BTParser *parser)
 {
 	while (1) {
@@ -166,7 +163,7 @@
 		}
 
 next_line:
-		parser->line_start_pos = (s32) gztell(parser->gz_in);
+		parser->line_start_pos = (s32) gf_gztell(parser->gz_in);
 		parser->line_buffer[0] = 0;
 		if (parser->unicode_type) {
 			u8 c1, c2;
@@ -177,9 +174,9 @@
 			u32 last_space_pos, last_space_pos_stream;
 			u32 go = BT_LINE_SIZE - 1;
 			last_space_pos = last_space_pos_stream = 0;
-			while (go && !gzeof(parser->gz_in) ) {
-				c1 = gzgetc(parser->gz_in);
-				c2 = gzgetc(parser->gz_in);
+			while (go && !gf_gzeof(parser->gz_in) ) {
+				c1 = gf_gzgetc(parser->gz_in);
+				c2 = gf_gzgetc(parser->gz_in);
 				/*Little-endian order*/
 				if (parser->unicode_type==2) {
 					if (c2) {
@@ -201,13 +198,13 @@
 					dst++;
 					break;
 				}
-				else if (is_ret && wchar!='\n') {
-					u32 fpos = (u32) gztell(parser->gz_in);
-					gzseek(parser->gz_in, fpos-2, SEEK_SET);
+				else if (is_ret) {
+					u32 fpos = (u32) gf_gztell(parser->gz_in);
+					gf_gzseek(parser->gz_in, fpos-2, SEEK_SET);
 					break;
 				}
 				if (wchar==' ') {
-					//last_space_pos_stream = (u32) gztell(parser->gz_in);
+					//last_space_pos_stream = (u32) gf_gztell(parser->gz_in);
 					last_space_pos = (u32) (dst - l);
 				}
 				dst++;
@@ -217,8 +214,8 @@
 			*dst = 0;
 			/*long line, rewind stream to last space*/
 			if (!go) {
-				u32 rew_pos = (u32)  (gztell(parser->gz_in) - 2*(dst - &l[last_space_pos]) );
-				gzseek(parser->gz_in, rew_pos, SEEK_SET);
+				u32 rew_pos = (u32)  (gf_gztell(parser->gz_in) - 2*(dst - &l[last_space_pos]) );
+				gf_gzseek(parser->gz_in, rew_pos, SEEK_SET);
 				l[last_space_pos+1] = 0;
 			}
 			/*check eof*/
@@ -230,13 +227,13 @@
 			dst = l;
 			gf_utf8_wcstombs(parser->line_buffer, BT_LINE_SIZE, (const unsigned short **) &dst);
 
-			if (!strlen(parser->line_buffer) && gzeof(parser->gz_in)) {
+			if (!strlen(parser->line_buffer) && gf_gzeof(parser->gz_in)) {
 				parser->done = 1;
 				return;
 			}
 		} else {
-			if ((gzgets(parser->gz_in, parser->line_buffer, BT_LINE_SIZE) == NULL)
-			        || (!strlen(parser->line_buffer) && gzeof(parser->gz_in))) {
+			if ((gf_gzgets(parser->gz_in, parser->line_buffer, BT_LINE_SIZE) == NULL)
+			        || (!strlen(parser->line_buffer) && gf_gzeof(parser->gz_in))) {
 				parser->done = 1;
 				return;
 			}
@@ -259,8 +256,8 @@
 						break;
 					}
 				}
-				pos = (u32) gztell(parser->gz_in);
-				gzseek(parser->gz_in, pos-rew, SEEK_SET);
+				pos = (u32) gf_gztell(parser->gz_in);
+				gf_gzseek(parser->gz_in, pos-rew, SEEK_SET);
 			}
 		}
 
@@ -280,7 +277,7 @@
 		parser->line++;
 
 		{
-			u32 pos = (u32) gztell(parser->gz_in);
+			u32 pos = (u32) gf_gztell(parser->gz_in);
 			if (pos>=parser->file_pos) {
 				parser->file_pos = pos;
 				if (parser->line>1) gf_set_progress("BT Parsing", pos, parser->file_size);
@@ -371,6 +368,14 @@
 				else
 					parser->block_comment++;
 			}
+			else if (!strnicmp(parser->line_buffer+parser->line_pos, "#size", 5)) {
+				char *buf;
+				parser->line_pos+=6;
+				buf = parser->line_buffer+parser->line_pos;
+				while (strchr(" \t", buf[0]))
+					buf++;
+				sscanf(buf, "%dx%d", &parser->def_w, &parser->def_h);
+			}
 			goto next_line;
 		}
 
@@ -402,7 +407,7 @@
 		}
 	}
 	if (!parser->line_size) {
-		if (!gzeof(parser->gz_in)) gf_bt_check_line(parser);
+		if (!gf_gzeof(parser->gz_in)) gf_bt_check_line(parser);
 		else parser->done = 1;
 	}
 	else if (!parser->done && (parser->line_size == parser->line_pos)) gf_bt_check_line(parser);
@@ -485,7 +490,7 @@
 	while (parser->line_buffer[parser->line_pos]==' ') parser->line_pos++;
 
 	if (parser->line_pos==parser->line_size) {
-		if (gzeof(parser->gz_in)) return NULL;
+		if (gf_gzeof(parser->gz_in)) return NULL;
 		gf_bt_check_line(parser);
 	}
 	if (!string_delim) string_delim = '"';
@@ -871,6 +876,22 @@
 		gf_bt_parse_double(parser, info->name, & ((SFVec3d *)info->far_ptr)->z);
 		if (parser->last_error) return;
 		break;
+	case GF_SG_VRML_SFVEC4F:
+		gf_bt_parse_float(parser, info->name, & ((SFVec4f *)info->far_ptr)->x);
+		if (parser->last_error) return;
+		/*many VRML files use ',' separator*/
+		gf_bt_check_code(parser, ',');
+		gf_bt_parse_float(parser, info->name, & ((SFVec4f *)info->far_ptr)->y);
+		if (parser->last_error) return;
+		/*many VRML files use ',' separator*/
+		gf_bt_check_code(parser, ',');
+		gf_bt_parse_float(parser, info->name, & ((SFVec4f *)info->far_ptr)->z);
+		if (parser->last_error) return;
+		/*many VRML files use ',' separator*/
+		gf_bt_check_code(parser, ',');
+		gf_bt_parse_float(parser, info->name, & ((SFVec4f *)info->far_ptr)->q);
+		if (parser->last_error) return;
+		break;
 	case GF_SG_VRML_SFROTATION:
 		gf_bt_parse_float(parser, info->name, & ((SFRotation *)info->far_ptr)->x);
 		if (parser->last_error) return;
@@ -961,7 +982,6 @@
 	case GF_SG_VRML_SFIMAGE:
 	{
 		u32 i, size, v;
-		char *str;
 		SFImage *img = (SFImage *)info->far_ptr;
 		gf_bt_parse_int(parser, "width", (SFInt32 *)&img->width);
 		if (parser->last_error) return;
@@ -974,7 +994,7 @@
 		if (img->pixels) gf_free(img->pixels);
 		img->pixels = (unsigned char*)gf_malloc(sizeof(char) * size);
 		for (i=0; i<size; i++) {
-			str = gf_bt_get_next(parser, 0);
+			char *str = gf_bt_get_next(parser, 0);
 			if (strstr(str, "0x")) sscanf(str, "%x", &v);
 			else sscanf(str, "%u", &v);
 			switch (img->numComponents) {
@@ -1278,7 +1298,7 @@
 		node = gf_sg_find_node_by_name(parser->load->scene_graph, str);
 		if (!node) {
 			/*create a temp node (undefined)*/
-			node = gf_bt_new_node(parser, TAG_UndefinedNode);
+			node = gf_node_new(parser->load->scene_graph, TAG_UndefinedNode);
 			ID = gf_bt_get_def_id(parser, str);
 			gf_node_set_id(node, ID, str);
 			gf_node_register(node, NULL);
@@ -1311,7 +1331,7 @@
 		if (proto) {
 			node = gf_sg_proto_create_instance(parser->load->scene_graph, proto);
 		} else {
-			node = gf_bt_new_node(parser, tag);
+			node = gf_node_new(parser->load->scene_graph, tag);
 		}
 		if (!parser->parsing_proto) init_node = 1;
 	}
@@ -1386,8 +1406,8 @@
 					}
 					/*we ignore 'description' for MPEG4 sensors*/
 					else if (!strcmp(str, "description")) {
-						char *str = gf_bt_get_string(parser, 0);
-						gf_free(str);
+						char *tmpstr = gf_bt_get_string(parser, 0);
+						gf_free(tmpstr);
 						parser->last_error = GF_OK;
 						continue;
 					}
@@ -1560,7 +1580,7 @@
 	GF_Node *n, *the_node;
 	u32 tag, ID;
 	Bool prev_is_insert = 0;
-	char *str, *ret;
+	char *ret;
 	char nName[1000];
 	u32 pos, line, line_pos, i, count;
 
@@ -1581,7 +1601,7 @@
 
 	n = NULL;
 	while (!parser->done && !the_node) {
-		str = gf_bt_get_next(parser, 0);
+		char *str = gf_bt_get_next(parser, 0);
 		gf_bt_check_code(parser, '[');
 		gf_bt_check_code(parser, ']');
 		gf_bt_check_code(parser, '{');
@@ -1591,7 +1611,7 @@
 
 		if ( (!prev_is_insert && !strcmp(str, "AT")) || !strcmp(str, "PROTO") ) {
 			/*only check in current command (but be aware of conditionals..)*/
-			if (!the_node && gf_list_find(parser->bifs_au->commands, parser->cur_com)) {
+			if (gf_list_find(parser->bifs_au->commands, parser->cur_com)) {
 				break;
 			}
 			continue;
@@ -1626,7 +1646,7 @@
 			}
 			n = gf_sg_proto_create_instance(parser->load->scene_graph, p);
 		} else {
-			n = gf_bt_new_node(parser, tag);
+			n = gf_node_new(parser->load->scene_graph, tag);
 		}
 		ID = gf_bt_get_def_id(parser, ret);
 		if (n) {
@@ -1644,8 +1664,8 @@
 	}
 	/*restore context*/
 	parser->done = 0;
-	gzrewind(parser->gz_in);
-	gzseek(parser->gz_in, pos, SEEK_SET);
+	gf_gzrewind(parser->gz_in);
+	gf_gzseek(parser->gz_in, pos, SEEK_SET);
 	parser->line_pos = parser->line_size;
 	gf_bt_check_line(parser);
 	parser->line = line;
@@ -1883,7 +1903,7 @@
 			GF_Node *n = gf_bt_sf_node(parser, str, NULL, isDEF ? szDefName : NULL);
 			isDEF = 0;
 			if (!n) goto err;
-			if (0 && isDEF) {
+			if ((0) && isDEF) {
 				u32 ID = gf_bt_get_def_id(parser, szDefName);
 				isDEF = 0;
 				gf_node_set_id(n, ID, szDefName);
@@ -2013,10 +2033,9 @@
 
 void gf_bt_resolve_routes(GF_BTParser *parser, Bool clean)
 {
-	GF_Command *com;
 	/*resolve all commands*/
 	while(gf_list_count(parser->unresolved_routes) ) {
-		com = (GF_Command *)gf_list_get(parser->unresolved_routes, 0);
+		GF_Command *com = (GF_Command *)gf_list_get(parser->unresolved_routes, 0);
 		gf_list_rem(parser->unresolved_routes, 0);
 		switch (com->tag) {
 		case GF_SG_ROUTE_DELETE:
@@ -2135,7 +2154,8 @@
 			return parser->last_error;
 		}
 		str = gf_bt_get_next(parser, 0);
-		if (strcmp(str, "BY")) return gf_bt_report(parser, GF_BAD_PARAM, "BY expected got %s", str);
+		if (strcmp(str, "BY"))
+			return gf_bt_report(parser, GF_BAD_PARAM, "BY expected got %s", str);
 
 		parser->last_error = gf_node_get_field_by_name(n, field, &info);
 		if (parser->last_error)
@@ -2224,7 +2244,7 @@
 		GF_Node *targetNode, *idxNode, *childNode, *fromNode;
 		GF_FieldInfo targetField, idxField, childField, fromField;
 
-		targetNode = idxNode = childNode = fromNode = NULL;
+		idxNode = childNode = fromNode = NULL;
 		str = gf_bt_get_next(parser, 1);
 		/*get source node*/
 		strcpy(field, str);
@@ -2300,7 +2320,8 @@
 		}
 
 		str = gf_bt_get_next(parser, 0);
-		if (strcmp(str, "BY")) return gf_bt_report(parser, GF_BAD_PARAM, "BY expected got %s", str);
+		if (strcmp(str, "BY"))
+			return gf_bt_report(parser, GF_BAD_PARAM, "BY expected got %s", str);
 
 		/*peek the next word*/
 		j = 0;
@@ -2393,6 +2414,7 @@
 				inf->field_ptr = gf_sg_vrml_field_pointer_new(inf->fieldType);
 				info.far_ptr = inf->field_ptr;
 				info.fieldType = inf->fieldType;
+				info.name = targetField.name;
 
 				if (gf_sg_vrml_is_sf_field(inf->fieldType)) {
 					gf_bt_sffield(parser, &info, childNode ? childNode : targetNode);
@@ -2664,7 +2686,7 @@
 		info.fieldType = gf_sg_vrml_get_sf_type(info.fieldType);
 
 		while (!gf_bt_check_code(parser, ']')) {
-			u32 pos;
+			pos=0;
 			if (gf_bt_parse_int(parser, "position", (SFInt32 *)&pos)) goto err;
 			str = gf_bt_get_next(parser, 0);
 			if (strcmp(str, "BY")) {
@@ -3046,12 +3068,12 @@
 			/*watchout for default BIFS stream*/
 			if (parser->bifs_es && !parser->base_bifs_id && (esd->decoderConfig->streamType==GF_STREAM_SCENE)) {
 				parser->bifs_es->ESID = parser->base_bifs_id = esd->ESID;
-				parser->bifs_es->timeScale = esd->slConfig ? esd->slConfig->timestampResolution : 1000;
+				parser->bifs_es->timeScale = (esd->slConfig && esd->slConfig->timestampResolution) ? esd->slConfig->timestampResolution : 1000;
 				sc = parser->bifs_es;
 			} else {
 				sc = gf_sm_stream_new(parser->load->ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 				/*set default timescale for systems tracks (ignored for other)*/
-				if (sc) sc->timeScale = esd->slConfig ? esd->slConfig->timestampResolution : 1000;
+				if (sc) sc->timeScale = (esd->slConfig && esd->slConfig->timestampResolution) ? esd->slConfig->timestampResolution : 1000;
 				/*assign base OD*/
 				if (!parser->base_od_id && (esd->decoderConfig->streamType==GF_STREAM_OD)) parser->base_od_id = esd->ESID;
 			}
@@ -3076,7 +3098,6 @@
 {
 	u32 val=0;
 	char *str;
-	GF_Descriptor *desc;
 
 	if (!strcmp(name, "UPDATE")) {
 		str = gf_bt_get_next(parser, 0);
@@ -3090,6 +3111,7 @@
 			odU = (GF_ODUpdate *) gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
 			gf_list_add(parser->od_au->commands, odU);
 			while (!parser->done) {
+				GF_Descriptor *desc;
 				str = gf_bt_get_next(parser, 0);
 				if (gf_bt_check_code(parser, ']')) break;
 				if (strcmp(str, "ObjectDescriptor") && strcmp(str, "InitialObjectDescriptor")) {
@@ -3129,6 +3151,7 @@
 			}
 
 			while (!parser->done) {
+				GF_Descriptor *desc;
 				str = gf_bt_get_next(parser, 0);
 				if (gf_bt_check_code(parser, ']')) break;
 				if (strcmp(str, "ES_Descriptor")) {
@@ -3151,6 +3174,7 @@
 			ipU = (GF_IPMPUpdate *) gf_odf_com_new(GF_ODF_IPMP_UPDATE_TAG);
 			gf_list_add(parser->od_au->commands, ipU);
 			while (!parser->done) {
+				GF_Descriptor *desc;
 				str = gf_bt_get_next(parser, 0);
 				if (gf_bt_check_code(parser, ']')) break;
 				if (strcmp(str, "IPMP_Descriptor")) {
@@ -3246,7 +3270,7 @@
 
 
 	/*create a default root node for all VRML nodes*/
-	if ((parser->is_wrl && !parser->top_nodes) && !vrml_root_node) {
+	if (parser->is_wrl && !parser->top_nodes) {
 		if (initial_run ) {
 #ifndef GPAC_DISABLE_X3D
 			vrml_root_node = gf_node_new(parser->load->scene_graph, (parser->load->flags & GF_SM_LOAD_MPEG4_STRICT) ? TAG_MPEG4_Group : TAG_X3D_Group);
@@ -3374,14 +3398,14 @@
 
 			if (parser->od_es && (parser->od_es->ESID != parser->stream_id)) {
 				GF_StreamContext *prev = parser->od_es;
-				parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_OD, 0);
+				parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_OD, GF_CODECID_OD_V1);
 				/*force new AU if stream changed*/
 				if (parser->od_es != prev) {
 					parser->bifs_au = NULL;
 					parser->od_au = NULL;
 				}
 			}
-			if (!parser->od_es) parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_OD, 0);
+			if (!parser->od_es) parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_OD, GF_CODECID_OD_V1);
 			if (!parser->od_au) parser->od_au = gf_sm_stream_au_new(parser->od_es, parser->au_time, 0, parser->au_is_rap);
 			gf_bt_parse_od_command(parser, str);
 			if (is_base_stream) parser->stream_id= 0;
@@ -3399,7 +3423,7 @@
 
 			if (parser->bifs_es->ESID != parser->stream_id) {
 				GF_StreamContext *prev = parser->bifs_es;
-				parser->bifs_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_SCENE, GPAC_OTI_SCENE_BIFS);
+				parser->bifs_es = gf_sm_stream_new(parser->load->ctx, (u16) parser->stream_id, GF_STREAM_SCENE, GF_CODECID_BIFS);
 				/*force new AU if stream changed*/
 				if (parser->bifs_es != prev) {
 					gf_bt_check_unresolved_nodes(parser);
@@ -3479,7 +3503,6 @@
 static GF_Err gf_sm_load_bt_initialize(GF_SceneLoader *load, const char *str, Bool input_only)
 {
 	u32 size;
-	char *sep;
 	gzFile gzInput;
 	GF_Err e;
 	unsigned char BOM[5];
@@ -3490,11 +3513,11 @@
 	if (load->fileName) {
 		FILE *test = gf_fopen(load->fileName, "rb");
 		if (!test) return GF_URL_ERROR;
-		gf_fseek(test, 0, SEEK_END);
-		size = (u32) gf_ftell(test);
+
+		size = (u32) gf_fsize(test);
 		gf_fclose(test);
 
-		gzInput = gzopen(load->fileName, "rb");
+		gzInput = gf_gzopen(load->fileName, "rb");
 		if (!gzInput) return GF_IO_ERR;
 
 		parser->line_buffer = (char *) gf_malloc(sizeof(char)*BT_LINE_SIZE);
@@ -3502,8 +3525,8 @@
 		parser->file_size = size;
 
 		parser->line_pos = parser->line_size = 0;
-		gzgets(gzInput, (char*) BOM, 5);
-		gzseek(gzInput, 0, SEEK_SET);
+		gf_gzgets(gzInput, (char*) BOM, 5);
+		gf_gzseek(gzInput, 0, SEEK_SET);
 		parser->gz_in = gzInput;
 
 	} else {
@@ -3522,7 +3545,7 @@
 			return GF_NOT_SUPPORTED;
 		} else {
 			parser->unicode_type = 2;
-			if (parser->gz_in) gzseek(parser->gz_in, 2, SEEK_CUR);
+			if (parser->gz_in) gf_gzseek(parser->gz_in, 2, SEEK_CUR);
 		}
 	} else if ((BOM[0]==0xFE) && (BOM[1]==0xFF)) {
 		if (!BOM[2] && !BOM[3]) {
@@ -3530,18 +3553,18 @@
 			return GF_NOT_SUPPORTED;
 		} else {
 			parser->unicode_type = 1;
-			if (parser->gz_in) gzseek(parser->gz_in, 2, SEEK_CUR);
+			if (parser->gz_in) gf_gzseek(parser->gz_in, 2, SEEK_CUR);
 		}
 	} else if ((BOM[0]==0xEF) && (BOM[1]==0xBB) && (BOM[2]==0xBF)) {
 		/*we handle UTF8 as asci*/
 		parser->unicode_type = 0;
-		if (parser->gz_in) gzseek(parser->gz_in, 3, SEEK_CUR);
+		if (parser->gz_in) gf_gzseek(parser->gz_in, 3, SEEK_CUR);
 	}
 	parser->initialized = 1;
 
 	if ( load->fileName )
 	{
-		sep = strrchr(load->fileName, '.');
+		char *sep = gf_file_ext_start(load->fileName);
 		if (sep && !strnicmp(sep, ".wrl", 4)) parser->is_wrl = 1;
 	}
 
@@ -3571,7 +3594,7 @@
 		}
 		/*need at least one scene stream*/
 		if (!parser->bifs_es) {
-			parser->bifs_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GPAC_OTI_SCENE_BIFS);
+			parser->bifs_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GF_CODECID_BIFS);
 			parser->load->ctx->scene_width = 0;
 			parser->load->ctx->scene_height = 0;
 			parser->load->ctx->is_pixel_metrics = 1;
@@ -3589,10 +3612,14 @@
 		parser->load = NULL;
 		gf_bt_check_line(parser);
 		parser->load = load;
+		if (load->ctx && parser->def_w && parser->def_h) {
+			load->ctx->scene_width = parser->def_w;
+			load->ctx->scene_height = parser->def_h;
+		}
 
 		/*create at least one empty BIFS stream*/
-		if (!parser->is_wrl) {
-			parser->bifs_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GPAC_OTI_SCENE_BIFS);
+		if (!parser->is_wrl && load->ctx) {
+			parser->bifs_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GF_CODECID_BIFS);
 			parser->bifs_au = gf_sm_stream_au_new(parser->bifs_es, 0, 0, 1);
 			parser->load->ctx->is_pixel_metrics = 1;
 		}
@@ -3632,7 +3659,7 @@
 	gf_list_del(parser->def_symbols);
 	gf_list_del(parser->scripts);
 
-	if (parser->gz_in) gzclose(parser->gz_in);
+	if (parser->gz_in) gf_gzclose(parser->gz_in);
 	if (parser->line_buffer) gf_free(parser->line_buffer);
 	gf_free(parser);
 	load->loader_priv = NULL;
@@ -3655,7 +3682,7 @@
 		parser->done = 0;
 		parser->initialized = 0;
 		if (parser->gz_in) {
-			gzclose(parser->gz_in);
+			gf_gzclose(parser->gz_in);
 			parser->gz_in = NULL;
 		}
 
@@ -3674,6 +3701,7 @@
 GF_Err load_bt_parse_string(GF_SceneLoader *load, const char *str)
 {
 	GF_Err e;
+	char *dup_str;
 	GF_BTParser *parser = (GF_BTParser *)load->loader_priv;
 	if (!parser) return GF_BAD_PARAM;
 
@@ -3683,16 +3711,20 @@
 		parser->file_size = 0;
 		parser->line_pos = 0;
 	}
-	parser->line_buffer = gf_strdup(str);
+	parser->line_buffer = dup_str = gf_strdup(str);
 	parser->line_size = (s32)strlen(str);
 
 	if (!parser->initialized) {
 		e = gf_sm_load_bt_initialize(load, str, 0);
-		if (e) return e;
+		if (e) {
+			gf_free(dup_str);
+			return e;
+		}
 	}
 	e = gf_bt_loader_run_intern(parser, NULL, 0);
 	parser->line_buffer = NULL;
 	parser->line_size = 0;
+	gf_free(dup_str);
 	return e;
 }
 
@@ -3726,6 +3758,12 @@
 	load->suspend = load_bt_suspend;
 	load->parse_string = load_bt_parse_string;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_bt_report(parser, GF_OK, NULL);
+	}
+#endif
+
 	e = gf_sm_load_bt_initialize(load, NULL, 0);
 	if (e) {
 		load_bt_done(load);

gpac-0.8.0.tar.gz/src/scene_manager/loader_isom.c -> gpac-1.0.0.tar.gz/src/scene_manager/loader_isom.c Changed

@@ -49,17 +49,21 @@
 			GF_ESD *esd;
 			j=0;
 			while ((esd = (GF_ESD *)gf_list_enum(od->ESDescriptors, &j))) {
-				Bool import = 1;
+				//can happen when dumping with keep-ods
+				if (esd->tag!=GF_ODF_ESD_TAG) {
+					continue;
+				}
 				if (esd->URLString) continue;
+
 				switch (esd->decoderConfig->streamType) {
 				case GF_STREAM_OD:
-					import = 0;
-					break;
+					continue;
+
 				case GF_STREAM_SCENE:
-					if ((esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_AFX) &&
-					        (esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+					if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
+					        (esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
 					   ) {
-						import = 0;
+						continue;
 					}
 					break;
 				/*dump the OCR track duration in case the OCR is used by media controls & co*/
@@ -73,19 +77,18 @@
 					dur = (Double) (s64) gf_isom_get_track_duration(mp4, track);
 					dur /= gf_isom_get_timescale(mp4);
 					mi->duration = (u32) (dur * 1000);
-					import = 0;
+					continue;;
 				}
 				break;
 				default:
 					break;
 				}
-				if (import) {
-					GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
-					gf_list_add(esd->extensionDescriptors, mi);
-					sprintf(szPath, "%s#%d", szName, esd->ESID);
-					mi->file_name = gf_strdup(szPath);
-					mi->streamFormat = gf_strdup("MP4");
-				}
+
+				GF_MuxInfo *mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
+				gf_list_add(esd->extensionDescriptors, mi);
+				sprintf(szPath, "%s#%d", szName, esd->ESID);
+				mi->file_name = gf_strdup(szPath);
+				mi->streamFormat = gf_strdup("MP4");
 			}
 		}
 		return;
@@ -102,8 +105,8 @@
 				import = 0;
 				break;
 			case GF_STREAM_SCENE:
-				if ((esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_AFX) &&
-				        (esd->decoderConfig->objectTypeIndication != GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+				if ((esd->decoderConfig->objectTypeIndication != GF_CODECID_AFX) &&
+				        (esd->decoderConfig->objectTypeIndication != GF_CODECID_SYNTHESIZED_TEXTURE)
 				   ) {
 					import = 0;
 				}
@@ -140,7 +143,7 @@
 static void mp4_report(GF_SceneLoader *load, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
+	if (format && gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
 		char szMsg[1024];
 		va_list args;
 		va_start(args, format);
@@ -172,7 +175,6 @@
 	e = GF_OK;
 #ifndef GPAC_DISABLE_BIFS
 	bifs_dec = gf_bifs_decoder_new(load->scene_graph, 1);
-	gf_bifs_decoder_set_extraction_path(bifs_dec, load->localPath, load->fileName);
 #endif
 	od_dec = gf_odf_codec_new();
 	logs = NULL;
@@ -184,12 +186,16 @@
 	nb_samp = 0;
 	for (i=0; i<gf_isom_get_track_count(load->isom); i++) {
 		u32 type = gf_isom_get_media_type(load->isom, i+1);
+		u32 subtype = gf_isom_get_mpeg4_subtype(load->isom, i+1, 1);
 		switch (type) {
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_OD:
 			nb_samp += gf_isom_get_sample_count(load->isom, i+1);
 			break;
 		default:
+			if (subtype==GF_ISOM_SUBTYPE_MP4S) {
+				nb_samp += gf_isom_get_sample_count(load->isom, i+1);
+			}
 			break;
 		}
 	}
@@ -198,19 +204,23 @@
 
 	for (i=0; i<gf_isom_get_track_count(load->isom); i++) {
 		u32 type = gf_isom_get_media_type(load->isom, i+1);
+		u32 subtype = gf_isom_get_mpeg4_subtype(load->isom, i+1, 1);
 		switch (type) {
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_OD:
 			break;
 		default:
-			continue;
+			if (subtype!=GF_ISOM_SUBTYPE_MP4S)
+				continue;
+			break;
 		}
 		esd = gf_isom_get_esd(load->isom, i+1, 1);
-		if (!esd) continue;
-
+		if (!esd || !esd->decoderConfig) continue;
+		if (esd->decoderConfig->objectTypeIndication==GF_CODECID_TEXT_MPEG4)
+			continue;
 
-		if ((esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_AFX) ||
-		        (esd->decoderConfig->objectTypeIndication == GPAC_OTI_SCENE_SYNTHESIZED_TEXTURE)
+		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);
 			continue;
@@ -218,7 +228,7 @@
 		sc = gf_sm_stream_new(load->ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 		sc->streamType = esd->decoderConfig->streamType;
 		sc->ESID = esd->ESID;
-		sc->objectType = esd->decoderConfig->objectTypeIndication;
+		sc->codec_id = esd->decoderConfig->objectTypeIndication;
 		sc->timeScale = gf_isom_get_media_timescale(load->isom, i+1);
 
 		/*we still need to reconfig the BIFS*/
@@ -261,10 +271,10 @@
 				break;
 			}
 			/*check if track has initial offset*/
-			if (!j && gf_isom_get_edit_segment_count(load->isom, i+1)) {
+			if (!j && gf_isom_get_edits_count(load->isom, i+1)) {
 				u64 EditTime, dur, mtime;
-				u8 mode;
-				gf_isom_get_edit_segment(load->isom, i+1, 1, &EditTime, &dur, &mtime, &mode);
+				GF_ISOEditType mode;
+				gf_isom_get_edit(load->isom, i+1, 1, &EditTime, &dur, &mtime, &mode);
 				if (mode==GF_ISOM_EDIT_EMPTY) {
 					init_offset = (u32) (dur * sc->timeScale / gf_isom_get_timescale(load->isom) );
 				}
@@ -346,9 +356,19 @@
 	if (!load->ctx->root_od) {
 		e = gf_isom_last_error(load->isom);
 		if (e) return e;
-	} else if ((load->ctx->root_od->tag != GF_ODF_OD_TAG) && (load->ctx->root_od->tag != GF_ODF_IOD_TAG)) {
-		gf_odf_desc_del((GF_Descriptor *) load->ctx->root_od);
-		load->ctx->root_od = NULL;
+	}
+	else {
+		switch (load->ctx->root_od->tag) {
+		case GF_ODF_OD_TAG:
+		case GF_ODF_IOD_TAG:
+		case GF_ODF_ISOM_OD_TAG:
+		case GF_ODF_ISOM_IOD_TAG:
+			break;
+		default:
+			gf_odf_desc_del((GF_Descriptor *) load->ctx->root_od);
+			load->ctx->root_od = NULL;
+			break;
+		}
 	}
 
 	esd = NULL;
@@ -383,7 +403,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("%s\n", scene_msg));
 
 	/*BIFS: update size & pixel metrics info*/
-	if (esd && esd->decoderConfig) {
+	if (esd->decoderConfig) {
 		if (esd->decoderConfig->objectTypeIndication<=2) {
 			bc = gf_odf_get_bifs_config(esd->decoderConfig->decoderSpecificInfo, esd->decoderConfig->objectTypeIndication);
 			if (!bc->elementaryMasks && bc->pixelWidth && bc->pixelHeight) {
@@ -402,6 +422,14 @@
 	gf_odf_desc_del((GF_Descriptor *) esd);
 	esd = NULL;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		mp4_report(load, GF_OK, NULL);
+		gf_sm_isom_suspend(load, GF_TRUE);
+		gf_sm_isom_suspend(load, GF_FALSE);
+	}
+#endif
+
 	load->process = gf_sm_load_run_isom;
 	load->done = gf_sm_load_done_isom;
 	load->suspend = gf_sm_isom_suspend;

gpac-0.8.0.tar.gz/src/scene_manager/loader_qt.c -> gpac-1.0.0.tar.gz/src/scene_manager/loader_qt.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 / Scene Management sub-project
@@ -34,10 +34,10 @@
 
 
 
-static GF_Err gf_qt_report(GF_SceneLoader *load, GF_Err e, char *format, ...)
+static GF_Err gf_qtvr_report(GF_SceneLoader *load, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
+	if (format && gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
 		char szMsg[1024];
 		va_list args;
 		va_start(args, format);
@@ -65,13 +65,11 @@
 	M_Group *gr;
 	GF_ODUpdate *odU;
 	GF_SceneGraph *sg;
-	GF_ObjectDescriptor *od;
-	GF_ESD *esd;
 
 	if (!load->ctx) return GF_NOT_SUPPORTED;
 
 	src = gf_isom_open(load->fileName, GF_ISOM_OPEN_READ, NULL);
-	if (!src) return gf_qt_report(load, GF_URL_ERROR, "Opening file %s failed", load->fileName);
+	if (!src) return gf_qtvr_report(load, GF_URL_ERROR, "Opening file %s failed", load->fileName);
 
 	w = h = tk = 0;
 	nb_samp = 0;
@@ -83,15 +81,14 @@
         case GF_ISOM_MEDIA_AUXV:
         case GF_ISOM_MEDIA_PICT:
 			if (gf_isom_get_media_subtype(src, i+1, 1) == GF_ISOM_BOX_TYPE_JPEG) {
-				GF_GenericSampleDescription *udesc = gf_isom_get_generic_sample_description(src, i+1, 1);
-				if ((udesc->width>w) || (udesc->height>h)) {
-					w = udesc->width;
-					h = udesc->height;
+				u32 aw, ah;
+				gf_isom_get_visual_info(src, i+1, 1, &aw, &ah);
+				if ((aw>w) || (ah>h)) {
+					w = aw;
+					h = ah;
 					tk = i+1;
 					nb_samp = gf_isom_get_sample_count(src, i+1);
 				}
-				if (udesc->extension_buf) gf_free(udesc->extension_buf);
-				gf_free(udesc);
 			}
 			break;
 		case GF_ISOM_MEDIA_QTVR:
@@ -101,24 +98,26 @@
 	}
 	if (!has_qtvr) {
 		gf_isom_delete(src);
-		return gf_qt_report(load, GF_NOT_SUPPORTED, "QTVR not found - no conversion available for this QuickTime movie");
+		return gf_qtvr_report(load, GF_NOT_SUPPORTED, "QTVR not found - no conversion available for this QuickTime movie");
 	}
 	if (!tk) {
 		gf_isom_delete(src);
-		return gf_qt_report(load, GF_NON_COMPLIANT_BITSTREAM, "No associated visual track with QTVR movie");
+		return gf_qtvr_report(load, GF_NON_COMPLIANT_BITSTREAM, "No associated visual track with QTVR movie");
 	}
 	if (nb_samp!=6) {
 		gf_isom_delete(src);
-		return gf_qt_report(load, GF_NOT_SUPPORTED, "Movie %s doesn't look a Cubic QTVR - sorry...", load->fileName);
+		return gf_qtvr_report(load, GF_NOT_SUPPORTED, "Movie %s doesn't look a Cubic QTVR - sorry...", load->fileName);
 	}
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("QT: Importing Cubic QTVR Movie"));
+	//for coverage
+	gf_qtvr_report(load, GF_OK, NULL);
 
 	/*create scene*/
 	sg = load->ctx->scene_graph;
 	gr = (M_Group *) gf_node_new(sg, TAG_MPEG4_Group);
 	gf_node_register((GF_Node *)gr, NULL);
-	st = gf_sm_stream_new(load->ctx, 1, GF_STREAM_SCENE, 1);
+	st = gf_sm_stream_new(load->ctx, 1, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	au = gf_sm_stream_au_new(st, 0, 0, 1);
 	com = gf_sg_command_new(load->ctx->scene_graph, GF_SG_SCENE_REPLACE);
 	gf_list_add(au->commands, com);
@@ -149,11 +148,13 @@
 	ni->type.vals[0] = gf_strdup("VR");
 
 	/*create ODs*/
-	st = gf_sm_stream_new(load->ctx, 2, GF_STREAM_OD, 1);
+	st = gf_sm_stream_new(load->ctx, 2, GF_STREAM_OD, GF_CODECID_OD_V1);
 	au = gf_sm_stream_au_new(st, 0, 0, 1);
 	odU = (GF_ODUpdate*) gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
 	gf_list_add(au->commands, odU);
 	for (i=0; i<6; i++) {
+		GF_ObjectDescriptor *od;
+		GF_ESD *esd;
 		GF_MuxInfo *mi;
 		FILE *img;
 		char szName[1024];
@@ -161,7 +162,7 @@
 		od->objectDescriptorID = 2+i;
 		esd = gf_odf_desc_esd_new(2);
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_IMAGE_JPEG;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_JPEG;
 		esd->ESID = 3+i;
 		/*extract image and remember it*/
 		mi = (GF_MuxInfo *) gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
@@ -175,7 +176,7 @@
 
 		samp = gf_isom_get_sample(src, tk, i+1, &di);
 		img = gf_fopen(mi->file_name, "wb");
-		gf_fwrite(samp->data, samp->dataLength, 1, img);
+		gf_fwrite(samp->data, samp->dataLength, img);
 		gf_fclose(img);
 		gf_isom_sample_del(&samp);
 	}

gpac-0.8.0.tar.gz/src/scene_manager/loader_svg.c -> gpac-1.0.0.tar.gz/src/scene_manager/loader_svg.c Changed

@@ -28,14 +28,12 @@
 #include <gpac/utf.h>
 #include <gpac/xml.h>
 #include <gpac/events.h>
+#include <gpac/internal/compositor_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/internal/laser_dev.h>
 #include <gpac/nodes_svg.h>
 #include <gpac/base_coding.h>
 
-#include <gpac/internal/terminal_dev.h>
-
-
 #ifndef GPAC_DISABLE_SVG
 
 typedef struct _st_entry
@@ -58,9 +56,9 @@
 	/* stack of SVG nodes*/
 	GF_List *node_stack;
 
-	GF_List *defered_hrefs;
-	GF_List *defered_animations;
-	GF_List *defered_listeners;
+	GF_List *deferred_hrefs;
+	GF_List *deferred_animations;
+	GF_List *deferred_listeners;
 	/*non-linear parsing*/
 	GF_List *peeked_nodes;
 
@@ -92,7 +90,7 @@
 		1: resolving begin times
 		2: resolving end times */
 	u32 resolve_stage;
-	/* Animation element being defered */
+	/* Animation element being deferred */
 	SVG_Element *animation_elt;
 	/* anim parent*/
 	SVG_Element *anim_parent;
@@ -107,7 +105,7 @@
 	char *from;
 	char *by;
 	char *values;
-} SVG_DeferedAnimation;
+} SVG_DeferredAnimation;
 
 typedef struct
 {
@@ -116,7 +114,7 @@
 	/*the current element is animation that cannot be parsed completely
 	  upon reception of start tag of element but for which we may be able
 	  to parse at the end tag of the element (animateMotion)*/
-	SVG_DeferedAnimation *anim;
+	SVG_DeferredAnimation *anim;
 	/*depth of unknown elements being skipped*/
 	u32 unknown_depth;
 	/*last child added, used to speed-up parsing*/
@@ -130,7 +128,7 @@
 static GF_Err svg_report(GF_SVG_Parser *parser, GF_Err e, char *format, ...)
 {
 #ifndef GPAC_DISABLE_LOG
-	if (gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
+	if (format && gf_log_tool_level_on(GF_LOG_PARSER, e ? GF_LOG_ERROR : GF_LOG_WARNING)) {
 		char szMsg[2048];
 		va_list args;
 		va_start(args, format);
@@ -166,7 +164,7 @@
 	st = parser->streams;
 	while (st) {
 		if (id == st->id) return st;
-		if (name && !strcmp(name, st->stream_name) ) return st;
+		if (name && st->stream_name && !strcmp(name, st->stream_name) ) return st;
 		st = st->next;
 	}
 	return NULL;
@@ -227,21 +225,11 @@
 		}
 	}
 	if ((parser->load->flags & GF_SM_LOAD_EMBEDS_RES) && (iri->type==XMLRI_STRING) ) {
-		u64 size;
+		u32 size;
 		char *buffer;
-		FILE *f;
-		f = gf_fopen(iri->string, "rb");
-		if (!f) {
-			return;
-		}
-		gf_fseek(f, 0, SEEK_END);
-		size = gf_ftell(f);
-		gf_fseek(f, 0, SEEK_SET);
-
-		buffer = gf_malloc(sizeof(char) * (size_t)(size+1));
-		size = fread(buffer, sizeof(char), (size_t)size, f);
-		gf_fclose(f);
 
+		GF_Err e = gf_file_load_data(iri->string, (u8 **) &buffer, &size);
+		if (e) return;
 
 		if (tag==TAG_SVG_script) {
 			GF_DOMText *dtext;
@@ -337,16 +325,16 @@
 
 	/*unresolved, queue it...*/
 	if ((iri->type==XMLRI_ELEMENTID) && !iri->target && iri->string) {
-		gf_list_add(parser->defered_hrefs, iri);
+		gf_list_add(parser->deferred_hrefs, iri);
 	}
 	if (iri->type != XMLRI_STRING) return;
 	e = gf_node_store_embedded_data(iri, parser->load->localPath, parser->load->fileName);
 	if (e) svg_report(parser, e, "Error storing embedded IRI data");
 }
 
-static void svg_delete_defered_anim(SVG_DeferedAnimation *anim, GF_List *defered_animations)
+static void svg_delete_deferred_anim(SVG_DeferredAnimation *anim, GF_List *deferred_animations)
 {
-	if (defered_animations) gf_list_del_item(defered_animations, anim);
+	if (deferred_animations) gf_list_del_item(deferred_animations, anim);
 
 	if (anim->target_id) gf_free(anim->target_id);
 	if (anim->to) gf_free(anim->to);
@@ -357,7 +345,7 @@
 	gf_free(anim);
 }
 
-static Bool svg_parse_animation(GF_SVG_Parser *parser, GF_SceneGraph *sg, SVG_DeferedAnimation *anim, const char *nodeID, u32 force_type)
+static Bool svg_parse_animation(GF_SVG_Parser *parser, GF_SceneGraph *sg, SVG_DeferredAnimation *anim, const char *nodeID, u32 force_type)
 {
 	GF_FieldInfo info;
 	u32 tag;
@@ -526,10 +514,10 @@
 	u32 count, i;
 
 	/*check unresolved HREF*/
-	count = gf_list_count(parser->defered_hrefs);
+	count = gf_list_count(parser->deferred_hrefs);
 	for (i=0; i<count; i++) {
 		GF_Node *targ;
-		XMLRI *iri = (XMLRI *)gf_list_get(parser->defered_hrefs, i);
+		XMLRI *iri = (XMLRI *)gf_list_get(parser->deferred_hrefs, i);
 		if (nodeID && strcmp(iri->string + 1, nodeID)) continue;
 		targ = gf_sg_find_node_by_name(sg, iri->string + 1);
 		if (targ) {
@@ -538,18 +526,18 @@
 			gf_node_register_iri(sg, iri);
 			gf_free(iri->string);
 			iri->string = NULL;
-			gf_list_rem(parser->defered_hrefs, i);
+			gf_list_rem(parser->deferred_hrefs, i);
 			i--;
 			count--;
 		}
 	}
 
 	/*check unresolved listeners */
-	count = gf_list_count(parser->defered_listeners);
+	count = gf_list_count(parser->deferred_listeners);
 	for (i=0; i<count; i++) {
 		GF_FieldInfo info;
 		GF_Node *par;
-		SVG_Element *listener = (SVG_Element *)gf_list_get(parser->defered_listeners, i);
+		SVG_Element *listener = (SVG_Element *)gf_list_get(parser->deferred_listeners, i);
 
 		par = NULL;
 		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_observer, GF_FALSE, GF_FALSE, &info) == GF_OK) {
@@ -558,8 +546,8 @@
 				if (!observer->target && observer->string && !strcmp(observer->string, nodeID) ) {
 					observer->target = gf_sg_find_node_by_name(sg, (char*) nodeID);
 				}
+				par = (GF_Node *)observer->target;
 			}
-			if (observer->type == XMLRI_ELEMENTID) par = (GF_Node *)observer->target;
 			if (!par) continue;
 		}
 		if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_target, GF_FALSE, GF_FALSE, &info) == GF_OK) {
@@ -573,18 +561,18 @@
 		}
 		assert(par);
 		gf_node_dom_listener_add((GF_Node *)par, (GF_Node *) listener);
-		gf_list_rem(parser->defered_listeners, i);
+		gf_list_rem(parser->deferred_listeners, i);
 		i--;
 		count--;
 	}
 
 	/*check unresolved anims*/
-	count = gf_list_count(parser->defered_animations);
+	count = gf_list_count(parser->deferred_animations);
 	for (i=0; i<count; i++) {
-		SVG_DeferedAnimation *anim = (SVG_DeferedAnimation *)gf_list_get(parser->defered_animations, i);
+		SVG_DeferredAnimation *anim = (SVG_DeferredAnimation *)gf_list_get(parser->deferred_animations, i);
 		/*resolve it - we don't check the name since it may be used in SMIL times, which we don't track at anim level*/
 		if (svg_parse_animation(parser, sg, anim, nodeID, 1)) {
-			svg_delete_defered_anim(anim, parser->defered_animations);
+			svg_delete_deferred_anim(anim, parser->deferred_animations);
 			i--;
 			count--;
 		}
@@ -660,7 +648,7 @@
 	SVG_Element *elt = NULL;
 	const char *node_name = NULL;
 	const char *ev_event, *ev_observer;
-	SVG_DeferedAnimation *anim = NULL;
+	SVG_DeferredAnimation *anim = NULL;
 	char *ID = NULL;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[SVG Parsing] Parsing node %s\n", name));
@@ -731,6 +719,8 @@
 			GF_DOMFullNode *d = (GF_DOMFullNode *)elt;
 			d->name = gf_strdup(name);
 			d->ns = xmlns;
+			if (ID)
+				gf_svg_parse_element_id((GF_Node *)d, ID, GF_FALSE);
 		}
 	}
 
@@ -743,7 +733,7 @@
 	needs_init = GF_TRUE;
 
 	if (gf_svg_is_animation_tag(tag)) {
-		GF_SAFEALLOC(anim, SVG_DeferedAnimation);
+		GF_SAFEALLOC(anim, SVG_DeferredAnimation);
 		if (!anim) {
 			parser->last_error = GF_OUT_OF_MEM;
 			return NULL;
@@ -758,9 +748,9 @@
 			anim->target = anim->anim_parent = parent->node;
 		}
 	} else if (gf_svg_is_timing_tag(tag)) {
-		/* warning: we use the SVG_DeferedAnimation structure for some timing nodes which are not
+		/* warning: we use the SVG_DeferredAnimation structure for some timing nodes which are not
 		   animations, but we put the parse stage at 1 (timing) see svg_parse_animation. */
-		GF_SAFEALLOC(anim, SVG_DeferedAnimation);
+		GF_SAFEALLOC(anim, SVG_DeferredAnimation);
 		if (!anim) {
 			parser->last_error = GF_OUT_OF_MEM;
 			return NULL;
@@ -862,7 +852,6 @@
 			} else {
 				/* For xlink:href attribute on elements other than animation elements,
 				   we create the attribute, parse it and try to do some special process it */
-				GF_FieldInfo info;
 				XMLRI *iri = NULL;
 				if (gf_node_get_attribute_by_tag((GF_Node *)elt, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info)==GF_OK) {
 					gf_svg_parse_attribute((GF_Node *)elt, &info, att->value, 0);
@@ -971,7 +960,6 @@
 		GF_Node *node = (GF_Node *)elt;
 		SVG_Element *listener;
 		u32 type;
-		GF_FieldInfo info;
 		listener = (SVG_Element *) gf_node_new(node->sgprivate->scenegraph, TAG_SVG_listener);
 		/*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*/
@@ -997,14 +985,17 @@
 			((XMLRI *)info.far_ptr)->target = parent->node;
 		}
 		/* if the target was found (already parsed), we are fine, otherwise we need to try to find it again,
-		   we place the listener in the defered listener list */
+		   we place the listener in the deferred listener list */
 		if ( ((XMLRI *)info.far_ptr)->target)
 			gf_node_dom_listener_add(((XMLRI *)info.far_ptr)->target, (GF_Node *) listener);
 		else
-			gf_list_add(parser->defered_listeners, listener);
+			gf_list_add(parser->deferred_listeners, listener);
 	}
 
-	/* if the new element has an id, we try to resolve defered references (including animations, href and listeners (just above)*/
+	if (!node_name && ID)
+		node_name = ID;
+
+	/* if the new element has an id, we try to resolve deferred references (including animations, href and listeners (just above)*/
 	if (node_name) {
 		if (!has_id) {
 			/* if the element was already created before this call, we don't need to get a numerical id, we have it already */
@@ -1020,12 +1011,12 @@
 //		if (parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) {
 		needs_init = GF_FALSE;
 		if (svg_parse_animation(parser, parser->load->scene_graph, anim, NULL, 0)) {
-			svg_delete_defered_anim(anim, NULL);
+			svg_delete_deferred_anim(anim, NULL);
 		} else {
-			gf_list_add(parser->defered_animations, anim);
+			gf_list_add(parser->deferred_animations, anim);
 		}
 //		} else {
-//			svg_delete_defered_anim(anim, NULL);
+//			svg_delete_deferred_anim(anim, NULL);
 //		}
 	}
 
@@ -1047,7 +1038,6 @@
 
 	/*If we are in playback mode, we register (reference counting for safe deleting) the listener element with the element that uses it */
 	if ((parser->load->flags & GF_SM_LOAD_FOR_PLAYBACK) && elt && (tag==TAG_SVG_listener)) {
-		GF_FieldInfo info;
 		Bool post_pone = GF_FALSE;
 		SVG_Element *par = NULL;
 		SVG_Element *listener = (SVG_Element *)elt;
@@ -1081,7 +1071,7 @@
 		}
 
 		if (post_pone) {
-			gf_list_add(parser->defered_listeners, listener);
+			gf_list_add(parser->deferred_listeners, listener);
 		} else {
 			if (!par && parent) par = parent->node;
 			gf_node_dom_listener_add((GF_Node *)par, (GF_Node *) listener);
@@ -1245,7 +1235,7 @@
 		/*should be a XML IDREF, not an XML IRI*/
 		if (atNode[0]=='#') atNode++;
 		parser->command->node = svg_find_node(parser, atNode);
-		if (!parser->command->node) return svg_report(parser, GF_BAD_PARAM, "Cannot find node node ref %s for command", atNode);
+		if (!parser->command->node) return svg_report(parser, GF_BAD_PARAM, "Cannot find node ref %s for command", atNode);
 		gf_node_register(parser->command->node, NULL);
 
 		/*switch to V2*/
@@ -1272,7 +1262,7 @@
 
 		parser->command->send_event_name = gf_dom_event_type_by_name(atEvent);
 
-		parser->command->send_event_integer = 0xEFFFFFFF;
+		parser->command->send_event_integer = 0;
 		if (atString) {
 			u32 key = gf_dom_get_key_type(atString);
 			if (key == GF_KEY_UNIDENTIFIED) {
@@ -1314,9 +1304,9 @@
 
 static GF_ESD *lsr_parse_header(GF_SVG_Parser *parser, const char *name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
-	GF_ESD *esd;
 	u32 i;
 	if (!strcmp(name, "LASeRHeader")) {
+		GF_ESD *esd;
 		GF_LASERConfig *lsrc = (GF_LASERConfig *) gf_odf_desc_new(GF_ODF_LASER_CFG_TAG);
 		for (i=0; i<nb_attributes; i++) {
 			GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
@@ -1337,7 +1327,7 @@
 		gf_odf_desc_del((GF_Descriptor *)esd->decoderConfig->decoderSpecificInfo);
 		esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) lsrc;
 		esd->decoderConfig->streamType = GF_STREAM_SCENE;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_LASER;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_LASER;
 		esd->slConfig->timestampResolution = lsrc->time_resolution ? lsrc->time_resolution : 1000;
 		return esd;
 	}
@@ -1347,6 +1337,7 @@
 
 static void svg_node_start(void *sax_cbck, const char *name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
 {
+#ifndef SKIP_ALL
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)sax_cbck;
 	SVG_NodeStack *stack, *parent;
 	SVG_Element *elt;
@@ -1354,10 +1345,6 @@
 	u32 xmlns;
 	Bool has_ns;
 
-#ifdef SKIP_ALL
-	return;
-#endif
-
 	parent = (SVG_NodeStack *)gf_list_last(parser->node_stack);
 
 	/*switch to conditional*/
@@ -1372,12 +1359,20 @@
 
 		/*if not created, do it now*/
 		if (!gf_list_count(parser->load->ctx->streams)) {
-			parser->laser_es = gf_sm_stream_new(parser->load->ctx, 1, GF_STREAM_SCENE, GPAC_OTI_SCENE_DIMS);
+			parser->laser_es = gf_sm_stream_new(parser->load->ctx, 1, GF_STREAM_SCENE, GF_CODECID_DIMS);
+			if (!parser->laser_es) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 			parser->laser_es->timeScale = 1000;
 			/* Create a default AU to behave as other streams (LASeR, BIFS)
 			   but it is left empty, there is no notion of REPLACE Scene or NEw Scene,
 			   the RAP is the graph */
 			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, GF_TRUE);
+			if (!parser->laser_au) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 		} else {
 			parser->laser_es = gf_list_get(parser->load->ctx->streams, 0);
 			parser->laser_au = gf_list_last(parser->laser_es->AUs);
@@ -1387,7 +1382,8 @@
 	/*saf setup*/
 	if ((!parent && (parser->load->type!=GF_SM_LOAD_SVG)) || cond) {
 		u32 com_type;
-		Bool has_ns=GF_FALSE;
+
+		has_ns=GF_FALSE;
 		svg_check_namespace(parser, attributes, nb_attributes, &has_ns);
 
 		/*nothing to do, the context is already created*/
@@ -1396,12 +1392,31 @@
 		if (!strcmp(name, "sceneHeader")) return;
 		/*nothing to do, wait for the laser (or other) header before creating stream)*/
 		if (!strcmp(name, "LASeRHeader")) {
-			GF_ESD *esd = lsr_parse_header(parser, name, name_space, attributes, nb_attributes);
-			if (!esd) svg_report(parser, GF_BAD_PARAM, "Invalid LASER Header");
+			GF_ESD *esd;
+
+			if (!parser->load->ctx) {
+				svg_report(parser, GF_BAD_PARAM, "Invalid parser context");
+				return;
+			}
+			esd = lsr_parse_header(parser, name, name_space, attributes, nb_attributes);
+			if (!esd) {
+				svg_report(parser, GF_BAD_PARAM, "Invalid LASER Header");
+				return;
+			}
 			/*TODO find a better way of assigning an ID to the laser stream...*/
 			esd->ESID = 1;
 			parser->laser_es = gf_sm_stream_new(parser->load->ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
-			if (!parser->load->ctx->root_od) parser->load->ctx->root_od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
+			if (!parser->laser_es) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
+			if (!parser->load->ctx->root_od) {
+				parser->load->ctx->root_od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
+				if (!parser->load->ctx->root_od) {
+					svg_report(parser, GF_OUT_OF_MEM, NULL);
+					return;
+				}
+			}
 			gf_list_add(parser->load->ctx->root_od->ESDescriptors, esd);
 			parser->laser_es->timeScale = esd->slConfig->timestampResolution;
 			return;
@@ -1419,6 +1434,10 @@
 			}
 			/*create new laser unit*/
 			parser->laser_au = gf_sm_stream_au_new(parser->laser_es, time, 0, rap);
+			if (!parser->laser_au) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 			return;
 		}
 
@@ -1429,31 +1448,44 @@
 			char *url = NULL;
 			char *src = NULL;
 			const char *ID = NULL;
-			u32 time, OTI, ST, i, ts_res;
+			u32 time, codecid, ST, i, ts_res;
 			GF_ODUpdate *odU;
 			GF_ObjectDescriptor *od;
 			SVG_SAFExternalStream*st;
 			/*create a SAF stream*/
-			if (!parser->saf_es) {
+			if (!parser->saf_es && parser->load->ctx) {
 				GF_ESD *esd = (GF_ESD*)gf_odf_desc_esd_new(2);
 				esd->ESID = 0xFFFE;
 				esd->decoderConfig->streamType = GF_STREAM_OD;
 				esd->decoderConfig->objectTypeIndication = 1;
-				parser->saf_es = gf_sm_stream_new(parser->load->ctx, esd->ESID, GF_STREAM_OD, GPAC_OTI_OD_V1);
-				if (!parser->load->ctx->root_od) parser->load->ctx->root_od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
+				parser->saf_es = gf_sm_stream_new(parser->load->ctx, esd->ESID, GF_STREAM_OD, GF_CODECID_OD_V1);
+				if (!parser->saf_es) {
+					svg_report(parser, GF_OUT_OF_MEM, NULL);
+					return;
+				}
+				if (!parser->load->ctx->root_od) {
+					parser->load->ctx->root_od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
+					if (!parser->load->ctx->root_od) {
+						svg_report(parser, GF_OUT_OF_MEM, NULL);
+						return;
+					}
+				}
 				parser->saf_es->timeScale = 1000;
 				gf_list_add(parser->load->ctx->root_od->ESDescriptors, esd);
 			}
 			time = 0;
 			ts_res = 1000;
-			OTI = ST = 0;
+			codecid = ST = 0;
 			for (i=0; i<nb_attributes; i++) {
 				GF_XMLAttribute *att = (GF_XMLAttribute *) &attributes[i];
 				if (!strcmp(att->name, "time")) time = atoi(att->value);
 				else if (!strcmp(att->name, "rap")) ;//rap = !strcmp(att->value, "yes") ? 1 : 0;
 				else if (!strcmp(att->name, "url")) url = gf_strdup(att->value);
 				else if (!strcmp(att->name, "streamID")) ID = att->value;
-				else if (!strcmp(att->name, "objectTypeIndication")) OTI = atoi(att->value);
+				else if (!strcmp(att->name, "objectTypeIndication")) codecid = atoi(att->value);
+				else if (!strcmp(att->name, "codecID")) {
+					codecid = GF_4CC(att->value[0],att->value[1],att->value[2],att->value[3]);
+				}
 				else if (!strcmp(att->name, "streamType")) ST = atoi(att->value);
 				else if (!strcmp(att->name, "timeStampResolution")) ts_res = atoi(att->value);
 				else if (!strcmp(att->name, "source")) src = att->value;
@@ -1463,29 +1495,48 @@
 
 			/*create new SAF stream*/
 			st = svg_saf_get_next_available_stream(parser);
-			st->stream_name = gf_strdup(ID);
+			st->stream_name = ID ? gf_strdup(ID) : NULL;
 
 			/*create new SAF unit*/
 			parser->saf_au = gf_sm_stream_au_new(parser->saf_es, time, 0, GF_FALSE);
+			if (!parser->saf_au) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
+
 			odU = (GF_ODUpdate *) gf_odf_com_new(GF_ODF_OD_UPDATE_TAG);
+			if (!odU) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 			gf_list_add(parser->saf_au->commands, odU);
 			od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+			if (!od) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 			gf_list_add(odU->objectDescriptors, od);
 			od->objectDescriptorID = st->id;
 
 			if (url) {
 				od->URLString = url;
 			} else {
-				char szName[1024];
 				GF_MuxInfo *mux;
-				FILE *nhml;
 				GF_ESD *esd = (GF_ESD*)gf_odf_desc_esd_new(2);
+				if (!esd) {
+					svg_report(parser, GF_OUT_OF_MEM, NULL);
+					return;
+				}
 				gf_list_add(od->ESDescriptors, esd);
-				esd->decoderConfig->objectTypeIndication = OTI;
+				esd->decoderConfig->objectTypeIndication = codecid;
 				esd->decoderConfig->streamType = ST;
 				esd->ESID = st->id;
 
 				mux = (GF_MuxInfo *)gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
+				if (!mux) {
+					svg_report(parser, GF_OUT_OF_MEM, NULL);
+					return;
+				}
 				gf_list_add(esd->extensionDescriptors, mux);
 
 				/*global source for stream, don't use nhml dumping*/
@@ -1493,6 +1544,8 @@
 					mux->file_name = gf_strdup(src);
 					st->nhml_info = NULL;
 				} else {
+					FILE *nhml;
+					char szName[1024];
 					if (parser->load->localPath) {
 						strcpy(szName, parser->load->localPath);
 						strcat(szName, "/");
@@ -1505,8 +1558,8 @@
 					st->nhml_info = mux->file_name;
 					nhml = gf_fopen(st->nhml_info, "wt");
 					if (nhml) {
-						fprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
-						fprintf(nhml, "<NHNTStream version=\"1.0\" timeScale=\"%d\" streamType=\"%d\" objectTypeIndication=\"%d\" inRootOD=\"no\" trackID=\"%d\">\n", ts_res, ST, OTI, st->id);
+						gf_fprintf(nhml, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+						gf_fprintf(nhml, "<NHNTStream version=\"1.0\" timeScale=\"%d\" streamType=\"%d\" objectTypeIndication=\"%d\" inRootOD=\"no\" trackID=\"%d\">\n", ts_res, ST, codecid, st->id);
 						gf_fclose(nhml);
 					} else {
 						GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[LASeR Parser] Error opening nhml file %s while preparing import\n", st->nhml_info));
@@ -1537,13 +1590,13 @@
 				return;
 			}
 			nhml = gf_fopen(st->nhml_info, "a+t");
-			fprintf(nhml, "<NHNTSample ");
-			if (time) fprintf(nhml, "DTS=\"%d\" ", time);
-			if (length) fprintf(nhml, "dataLength=\"%d\" ", length);
-			if (offset) fprintf(nhml, "mediaOffset=\"%d\" ", offset);
-			if (rap) fprintf(nhml, "isRAP=\"yes\" ");
-			if (src) fprintf(nhml, "mediaFile=\"%s\" ", src);
-			fprintf(nhml, "/>\n");
+			gf_fprintf(nhml, "<NHNTSample ");
+			if (time) gf_fprintf(nhml, "DTS=\"%d\" ", time);
+			if (length) gf_fprintf(nhml, "dataLength=\"%d\" ", length);
+			if (offset) gf_fprintf(nhml, "mediaOffset=\"%d\" ", offset);
+			if (rap) gf_fprintf(nhml, "isRAP=\"yes\" ");
+			if (src) gf_fprintf(nhml, "mediaFile=\"%s\" ", src);
+			gf_fprintf(nhml, "/>\n");
 			gf_fclose(nhml);
 			return;
 		}
@@ -1561,7 +1614,7 @@
 				return;
 			}
 			nhml = gf_fopen(st->nhml_info, "a+t");
-			fprintf(nhml, "</NHNTStream>\n");
+			gf_fprintf(nhml, "</NHNTStream>\n");
 			gf_fclose(nhml);
 			return;
 		}
@@ -1574,6 +1627,10 @@
 			if (parser->load->flags & GF_SM_LOAD_CONTEXT_READY) {
 				assert(parser->laser_es);
 				parser->laser_au = gf_sm_stream_au_new(parser->laser_es, 0, 0, GF_FALSE);
+				if (!parser->laser_au) {
+					svg_report(parser, GF_OUT_OF_MEM, NULL);
+					return;
+				}
 			} else {
 				svg_report(parser, GF_BAD_PARAM, "LASeR sceneUnit not defined for command %s", name);
 				return;
@@ -1585,6 +1642,10 @@
 			SVG_NodeStack *top;
 			GF_Err e;
 			parser->command = gf_sg_command_new(parser->load->scene_graph, com_type);
+			if (!parser->command) {
+				svg_report(parser, GF_OUT_OF_MEM, NULL);
+				return;
+			}
 
 			/*this is likely a conditional start - update unknown depth level*/
 			top = (SVG_NodeStack*)gf_list_last(parser->node_stack);
@@ -1621,7 +1682,7 @@
 				if (parser->laser_au) parser->laser_au->flags |= GF_SM_AU_RAP;
 				break;
 			}
-
+			parser->current_ns = GF_XMLNS_SVG;
 			return;
 		}
 	}
@@ -1665,7 +1726,6 @@
 		if (field) {
 			/*either not assigned or textContent*/
 			if (field->new_node && (field->new_node->sgprivate->tag==TAG_DOMText)) {
-				svg_report(parser, GF_OK, "Warning: LASeR cannot replace children with a mix of text nodes and elements - ignoring text\n");
 				gf_node_unregister(field->new_node, NULL);
 				field->new_node = NULL;
 			}
@@ -1676,7 +1736,7 @@
 				gf_node_list_add_child( & field->node_list, (GF_Node*) elt);
 			} else if (field->node_list) {
 				gf_node_list_add_child(& field->node_list, (GF_Node*) elt);
-			} else if (!field->new_node) {
+			} else {
 				field->new_node = (GF_Node*)elt;
 				field->field_ptr = &field->new_node;
 			}
@@ -1693,20 +1753,18 @@
 	} else if ((parser->has_root==2) && !parser->fragment_root) {
 		parser->fragment_root = (GF_Node *)elt;
 	}
+#endif
 }
 
 static void svg_node_end(void *sax_cbck, const char *name, const char *name_space)
 {
+#ifndef SKIP_ALL
 #ifdef SKIP_UNKNOWN_NODES
 	u32 ns;
 #endif
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)sax_cbck;
 	SVG_NodeStack *top = (SVG_NodeStack *)gf_list_last(parser->node_stack);
 
-#ifdef SKIP_ALL
-	return;
-#endif
-
 	if (!top) {
 		if (parser->laser_au && !strcmp(name, "sceneUnit")) {
 			parser->laser_au = NULL;
@@ -1770,16 +1828,16 @@
 				*/
 			{
 				u32 i, count;
-				SVG_DeferedAnimation *anim = NULL;
-				count = gf_list_count(parser->defered_animations);
+				SVG_DeferredAnimation *anim = NULL;
+				count = gf_list_count(parser->deferred_animations);
 				for (i = 0; i < count; i++) {
-					anim = gf_list_get(parser->defered_animations, i);
+					anim = gf_list_get(parser->deferred_animations, i);
 					if (anim->animation_elt == node) break;
 					else anim = NULL;
 				}
 				if (anim) {
 					if (svg_parse_animation(parser, gf_node_get_graph((GF_Node *)node), anim, NULL, 1)) {
-						svg_delete_defered_anim(anim, parser->defered_animations);
+						svg_delete_deferred_anim(anim, parser->deferred_animations);
 					}
 				}
 			}
@@ -1801,7 +1859,7 @@
 		}
 	}
 #ifdef SKIP_UNKNOWN_NODES
-	else if (top) {
+	else {
 		if (top->unknown_depth) {
 			top->unknown_depth--;
 			if (!top->unknown_depth) {
@@ -1816,10 +1874,13 @@
 		}
 	}
 #endif
+
+#endif //SKIP_ALL
 }
 
 static void svg_text_content(void *sax_cbck, const char *text_content, Bool is_cdata)
 {
+#ifndef SKIP_ALL
 	GF_SVG_Parser *parser = (GF_SVG_Parser *)sax_cbck;
 	SVG_NodeStack *top = (SVG_NodeStack *)gf_list_last(parser->node_stack);
 	SVG_Element *elt = (top ? top->node : NULL);
@@ -1827,10 +1888,6 @@
 	Bool skip_text;
 	u32 tag;
 
-#ifdef SKIP_ALL
-	return;
-#endif
-
 	if (top && top->unknown_depth && !parser->command_depth) return;
 	if (!elt && !parser->command) return;
 
@@ -1863,7 +1920,7 @@
 			gf_node_list_add_child( & field->node_list, (GF_Node*) text);
 		} else if (field->node_list) {
 			gf_node_list_add_child(& field->node_list, (GF_Node*) text);
-		} else if (!field->new_node) {
+		} else {
 			field->new_node = (GF_Node*)text;
 			field->field_ptr = &field->new_node;
 		}
@@ -1901,6 +1958,7 @@
 		text->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
 		gf_node_changed((GF_Node *)text, NULL);
 	}
+#endif
 }
 
 static GF_SVG_Parser *svg_new_parser(GF_SceneLoader *load)
@@ -1922,9 +1980,9 @@
 		return NULL;
 	}
 	parser->node_stack = gf_list_new();
-	parser->defered_hrefs = gf_list_new();
-	parser->defered_animations = gf_list_new();
-	parser->defered_listeners = gf_list_new();
+	parser->deferred_hrefs = gf_list_new();
+	parser->deferred_animations = gf_list_new();
+	parser->deferred_listeners = gf_list_new();
 	parser->peeked_nodes = gf_list_new();
 
 	parser->sax_parser = gf_xml_sax_new(svg_node_start, svg_node_end, svg_text_content, parser);
@@ -1935,15 +1993,23 @@
 	/*to cope with old files not signaling XMLNS, add the SVG NS by default*/
 	gf_sg_add_namespace(parser->load->scene_graph, "http://www.w3.org/2000/svg", NULL);
 	parser->current_ns = GF_XMLNS_SVG;
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		svg_report(parser, GF_OK, NULL);
+	}
+#endif
+
 	return parser;
 }
 
 static void svg_flush_animations(GF_SVG_Parser *parser)
 {
-	while (gf_list_count(parser->defered_animations)) {
-		SVG_DeferedAnimation *anim = (SVG_DeferedAnimation *)gf_list_get(parser->defered_animations, 0);
+	if (!parser) return;
+	while (gf_list_count(parser->deferred_animations)) {
+		SVG_DeferredAnimation *anim = (SVG_DeferredAnimation *)gf_list_get(parser->deferred_animations, 0);
 		svg_parse_animation(parser, parser->load->scene_graph, anim, NULL, 2);
-		svg_delete_defered_anim(anim, parser->defered_animations);
+		svg_delete_deferred_anim(anim, parser->deferred_animations);
 	}
 }
 
@@ -1954,11 +2020,11 @@
 		gf_list_rem_last(parser->node_stack);
 		gf_free(st);
 	}
-	/*FIXME - if there still are som defered listeners, we should pass them to the scene graph
+	/*FIXME - if there still are som deferred listeners, we should pass them to the scene graph
 	and wait for the parent to be defined*/
-	while (gf_list_count(parser->defered_listeners)) {
-		GF_Node *l = (GF_Node *)gf_list_last(parser->defered_listeners);
-		gf_list_rem_last(parser->defered_listeners);
+	while (gf_list_count(parser->deferred_listeners)) {
+		GF_Node *l = (GF_Node *)gf_list_last(parser->deferred_listeners);
+		gf_list_rem_last(parser->deferred_listeners);
 		/*listeners not resolved are not inserted in the tree - destroy them*/
 		gf_node_register(l, NULL);
 		gf_node_unregister(l, NULL);
@@ -2040,6 +2106,8 @@
 
 	in_time = gf_sys_clock();
 	e = gf_xml_sax_parse_file(parser->sax_parser, (const char *)load->fileName, svg_progress);
+	if (parser->last_error<0) e = parser->last_error;
+	
 	if (e<0) return svg_report(parser, e, "Unable to parse file %s: %s", load->fileName, gf_xml_sax_get_error(parser->sax_parser) );
 	GF_LOG(GF_LOG_INFO, GF_LOG_PARSER, ("[Parser] Scene parsed and Scene Graph built in %d ms\n", gf_sys_clock() - in_time));
 
@@ -2058,11 +2126,11 @@
 	gf_sm_svg_flush_state(parser);
 
 	gf_list_del(parser->node_stack);
-	gf_list_del(parser->defered_hrefs);
-	gf_list_del(parser->defered_listeners);
+	gf_list_del(parser->deferred_hrefs);
+	gf_list_del(parser->deferred_listeners);
 	gf_list_del(parser->peeked_nodes);
 	/* reset animations */
-	gf_list_del(parser->defered_animations);
+	gf_list_del(parser->deferred_animations);
 	if (parser->sax_parser) {
 		gf_xml_sax_del(parser->sax_parser);
 	}
@@ -2088,8 +2156,9 @@
 	} else {
 		e = gf_xml_sax_parse(parser->sax_parser, str);
 	}
-	if (e<0) svg_report(parser, e, "Unable to parse chunk: %s", gf_xml_sax_get_error(parser->sax_parser) );
+	if (e<0) svg_report(parser, e, "Unable to parse chunk: %s", parser ? gf_xml_sax_get_error(parser->sax_parser) : "no parser");
 	else e = parser->last_error;
+	
 
 	svg_flush_animations(parser);
 
@@ -2113,6 +2182,7 @@
 	load->done = load_svg_done;
 	load->parse_string = load_svg_parse_string;
 	load->suspend = load_svg_suspend;
+
 	return GF_OK;
 
 }
@@ -2130,15 +2200,17 @@
 	e = gf_sm_load_initialize_svg(&ctx, node_str, GF_TRUE);
 
 	parser = (GF_SVG_Parser *)ctx.loader_priv;
-	node = parser->fragment_root;
 
 	if (e != GF_OK) {
-		if (parser->fragment_root) gf_node_unregister(parser->fragment_root, NULL);
-		parser->fragment_root=NULL;
+		if (parser) {
+			if (parser->fragment_root) gf_node_unregister(parser->fragment_root, NULL);
+			parser->fragment_root=NULL;
+		}
 		load_svg_done(&ctx);
 		return NULL;
 	}
 
+	node = parser ? parser->fragment_root : NULL;
 	/*don't register*/
 	if (node) node->sgprivate->num_instances--;
 	load_svg_done(&ctx);

gpac-0.8.0.tar.gz/src/scene_manager/loader_xmt.c -> gpac-1.0.0.tar.gz/src/scene_manager/loader_xmt.c Changed

@@ -510,7 +510,7 @@
 			}
 		}
 		if (!esdl->esd->dependsOnESID) {
-			xmt_report(parser, GF_OK, "WARNING: Could not find stream dependance %s for ES %s - forcing self-synchronization", esdl->Depends_Name, esdl->desc_name);
+			xmt_report(parser, GF_OK, "WARNING: Could not find stream dependence %s for ES %s - forcing self-synchronization", esdl->Depends_Name, esdl->desc_name);
 		}
 		gf_free(esdl->Depends_Name);
 		esdl->Depends_Name = NULL;
@@ -618,6 +618,7 @@
 	u32 ID = 0;
 	if (sscanf(name, "N%u", &ID) == 1) {
 		u32 k=1;
+		ID++;
 		while (name && name[k]) {
 			if (strchr("0123456789", name[k])==0) {
 				ID = 0;
@@ -626,7 +627,6 @@
 			k++;
 		}
 		if (ID) {
-			ID ++;
 			n = gf_sg_find_node(parser->load->scene_graph, ID);
 			if (!n) {
 				if (parser->load->ctx && (parser->load->ctx->max_node_id<ID)) parser->load->ctx->max_node_id=ID;
@@ -636,7 +636,7 @@
 	}
 	ID = xmt_get_next_node_id(parser);
 	if (n) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[XMT Parsing] (line %d) Binary ID %s already assigned to %s - keeping internal ID %d\n", gf_xml_sax_get_line(parser->sax_parser), name, gf_node_get_name(n), ID));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_PARSER, ("[XMT Parsing] (line %d) Binary ID %s already assigned to %s - keeping internal ID %d\n", gf_xml_sax_get_line(parser->sax_parser), name, gf_node_get_name(n), ID));
 	}
 	return ID;
 }
@@ -873,7 +873,8 @@
 
 static void xmt_offset_time(GF_XMTParser *parser, Double *time)
 {
-	*time += parser->au_time;
+	if (time && parser)
+		*time += parser->au_time;
 }
 static void xmt_check_time_offset(GF_XMTParser *parser, GF_Node *n, GF_FieldInfo *info)
 {
@@ -1013,7 +1014,8 @@
 
 	while (value[0] && !parser->last_error) {
 
-		while (value[0] && value[0] == ' ') value++;
+		while (value[0] == ' ')
+			value++;
 		if (!value[0]) break;
 
 		gf_sg_vrml_mf_append(info->far_ptr, info->fieldType, &sfInfo.far_ptr);
@@ -1090,10 +1092,9 @@
 
 static void xmt_resolve_routes(GF_XMTParser *parser)
 {
-	GF_Command *com;
 	/*resolve all commands*/
 	while (1) {
-		com = (GF_Command *)gf_list_last(parser->unresolved_routes);
+		GF_Command *com = (GF_Command *)gf_list_last(parser->unresolved_routes);
 		if (!com) break;
 		gf_list_rem_last(parser->unresolved_routes);
 		switch (com->tag) {
@@ -1138,27 +1139,40 @@
 		xmt_report(parser, GF_BAD_PARAM, "ROUTE: Cannot find origin node %s", fromN);
 		return;
 	}
-	e = gf_node_get_field_by_name(orig, fromNF, &orig_field);
-	if ((e != GF_OK) && strstr(fromNF, "_changed")) {
-		char *sz = strstr(fromNF, "_changed");
-		sz[0] = 0;
+	if (fromNF) {
 		e = gf_node_get_field_by_name(orig, fromNF, &orig_field);
+		if (e != GF_OK) {
+			char *sz = strstr(fromNF, "_changed");
+			if (sz) {
+				sz[0] = 0;
+				e = gf_node_get_field_by_name(orig, fromNF, &orig_field);
+			}
+		}
+	} else {
+		e = GF_BAD_PARAM;
 	}
 	if (e!=GF_OK) {
 		xmt_report(parser, GF_BAD_PARAM, "%s is not an attribute of node %s", fromNF, fromN);
 		return;
 	}
+
 	dest = xmt_find_node(parser, toN);
 	if (!dest) {
 		xmt_report(parser, GF_BAD_PARAM, "ROUTE: Cannot find destination node %s", toN);
 		return;
 	}
-	e = gf_node_get_field_by_name(dest, toNF, &dest_field);
-	if ((e != GF_OK) && toNF && !strnicmp(toNF, "set_", 4)) e = gf_node_get_field_by_name(dest, &toNF[4], &dest_field);
+	if (toNF) {
+		e = gf_node_get_field_by_name(dest, toNF, &dest_field);
+		if ((e != GF_OK) && !strnicmp(toNF, "set_", 4))
+			e = gf_node_get_field_by_name(dest, &toNF[4], &dest_field);
+	} else {
+		e = GF_BAD_PARAM;
+	}
 	if (e != GF_OK) {
 		xmt_report(parser, GF_BAD_PARAM, "%s is not an attribute of node %s", toNF, toN);
 		return;
 	}
+
 	rID = 0;
 	if (ID && strlen(ID)) {
 		rID = xmt_get_route(parser, ID, 0);
@@ -1310,11 +1324,11 @@
 {
 	GF_ScriptField *scfield;
 	GF_FieldInfo field;
-	char *val = NULL;
 	u32 fieldType, eventType, i;
+	char *val = NULL;
 	char *fieldName = NULL;
 	fieldType = eventType = 0;
-	val = NULL;
+
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att = (GF_XMLAttribute *)&attributes[i];
 		if (!att->value || !strlen(att->value)) continue;
@@ -1499,8 +1513,10 @@
 			else {
 				XMTNodeStack *pf_stack;
 				GF_SAFEALLOC(pf_stack, XMTNodeStack);
-				gf_sg_proto_field_get_field(parser->proto_field, &pf_stack->container_field);
-				gf_list_add(parser->nodes, pf_stack);
+				if (pf_stack) {
+					gf_sg_proto_field_get_field(parser->proto_field, &pf_stack->container_field);
+					gf_list_add(parser->nodes, pf_stack);
+				}
 			}
 			return NULL;
 		}
@@ -1543,10 +1559,10 @@
 		/*connect */
 		if (!strcmp(name, "connect")) {
 			GF_ProtoFieldInterface *pf;
-			Bool is_script = 0;
 			GF_FieldInfo pfield, nfield;
 			char *atField, *atProtoField;
 			XMTNodeStack *last = (XMTNodeStack*)gf_list_last(parser->nodes);
+			is_script = 0;
 			if (!last) {
 				xmt_report(parser, GF_OK, "connect: no parent node specified - skipping");
 				return NULL;
@@ -1596,7 +1612,7 @@
 	/*proto instance field*/
 	if (!strcmp(name, "fieldValue")) {
 		char *field, *value;
-		if (!parent || (parent->node->sgprivate->tag != TAG_ProtoNode)) {
+		if (!parent || !parent->node || (parent->node->sgprivate->tag != TAG_ProtoNode)) {
 			xmt_report(parser, GF_OK, "Warning: fieldValue not a valid node");
 			return NULL;
 		}
@@ -1726,7 +1742,7 @@
 					return NULL;
 				}
 			}
-			xmt_report(parser, GF_OK, "Warning: %s is not a valid node - skipping", name);
+			xmt_report(parser, GF_NON_COMPLIANT_BITSTREAM, "Warning: %s is not a valid node - skipping", name);
 			return NULL;
 		}
 		node = gf_node_new(parser->load->scene_graph, tag);
@@ -1772,7 +1788,6 @@
 		}
 		/*USE node*/
 		else if (!strcmp(att->name, "USE")) {
-			GF_Err e;
 			GF_Node *def_node;
 
 			def_node = xmt_find_node(parser, att->value);
@@ -1822,7 +1837,10 @@
 
 	if (!parser->parsing_proto) xmt_update_timenode(parser, node);
 
-	if (register_def) gf_list_add(parser->def_nodes, node);
+	if (register_def) {
+		gf_node_register(node, NULL);
+		gf_list_add(parser->def_nodes, node);
+	}
 	if (ID) gf_node_set_id(node, ID, def_name);
 
 	if (is_script) {
@@ -1982,15 +2000,15 @@
 						parser->scene_es->ESID = parser->base_scene_id = esd->ESID;
 						parser->scene_es->timeScale = (esd->slConfig && esd->slConfig->timestampResolution) ? esd->slConfig->timestampResolution : 1000;
 					} else {
-						char *name;
+						char *s_name;
 						GF_StreamContext *sc = gf_sm_stream_new(parser->load->ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 						/*set default timescale for systems tracks (ignored for other)*/
 						if (sc) sc->timeScale = (esd->slConfig && esd->slConfig->timestampResolution) ? esd->slConfig->timestampResolution : 1000;
 						if (!parser->base_scene_id && (esd->decoderConfig->streamType==GF_STREAM_SCENE)) parser->base_scene_id = esd->ESID;
 						else if (!parser->base_od_id && (esd->decoderConfig->streamType==GF_STREAM_OD)) parser->base_od_id = esd->ESID;
 
-						name = xmt_get_es_name(parser, esd->ESID);
-						if (sc && name && !sc->name) sc->name = gf_strdup(name);
+						s_name = xmt_get_es_name(parser, esd->ESID);
+						if (sc && s_name && !sc->name) sc->name = gf_strdup(s_name);
 					}
 					break;
 				}
@@ -2076,16 +2094,12 @@
 		field = gf_sg_command_field_new(parser->command);
 		field->fieldIndex = info.fieldIndex;
 		field->fieldType = info.fieldType;
-		if (fieldValue) {
-			field->field_ptr = gf_sg_vrml_field_pointer_new(info.fieldType);
-			info.far_ptr = field->field_ptr;
-			if (gf_sg_vrml_is_sf_field(info.fieldType)) {
-				xmt_parse_sf_field(parser, &info, parser->command->node, fieldValue);
-			} else {
-				xmt_parse_mf_field(parser, &info, parser->command->node, fieldValue);
-			}
+		field->field_ptr = gf_sg_vrml_field_pointer_new(info.fieldType);
+		info.far_ptr = field->field_ptr;
+		if (gf_sg_vrml_is_sf_field(info.fieldType)) {
+			xmt_parse_sf_field(parser, &info, parser->command->node, fieldValue);
 		} else {
-			parser->state = XMT_STATE_ELEMENTS;
+			xmt_parse_mf_field(parser, &info, parser->command->node, fieldValue);
 		}
 		return;
 	}
@@ -2229,7 +2243,10 @@
 		else if (!strcmp(name, "Replace")) {
 			tag = GF_SG_SCENE_REPLACE;
 			au_is_rap = 1;
-			gf_list_reset(parser->def_nodes);
+			while (gf_list_count(parser->def_nodes)) {
+				GF_Node *anode = gf_list_pop_back(parser->def_nodes);
+				gf_node_unregister(anode, NULL);
+			}
 		}
 		else if (!strcmp(name, "Insert"))
 			tag = GF_SG_ROUTE_INSERT;
@@ -2276,7 +2293,7 @@
 			GF_StreamContext *stream = gf_sm_stream_find(parser->load->ctx, (u16) stream_id);
 			if (!stream || (stream->streamType!=GF_STREAM_SCENE)) stream_id = parser->base_scene_id;
 
-			parser->scene_es = gf_sm_stream_new(parser->load->ctx, (u16) stream_id, GF_STREAM_SCENE, GPAC_OTI_SCENE_BIFS);
+			parser->scene_es = gf_sm_stream_new(parser->load->ctx, (u16) stream_id, GF_STREAM_SCENE, GF_CODECID_BIFS);
 			parser->scene_au = gf_sm_stream_au_new(parser->scene_es, 0, au_time, au_is_rap);
 			gf_list_add(parser->scene_au->commands, parser->command);
 		}
@@ -2457,7 +2474,7 @@
 
 		stream = gf_sm_stream_find(parser->load->ctx, (u16) stream_id);
 		if (stream && (stream->streamType!=GF_STREAM_OD)) stream_id = parser->base_od_id;
-		parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) stream_id, GF_STREAM_OD, 0);
+		parser->od_es = gf_sm_stream_new(parser->load->ctx, (u16) stream_id, GF_STREAM_OD, GF_CODECID_OD_V1);
 		parser->od_au = gf_sm_stream_au_new(parser->od_es, 0, au_time, au_is_rap);
 		parser->od_command = gf_odf_com_new(tag);
 		gf_list_add(parser->od_au->commands, parser->od_command);
@@ -2690,6 +2707,9 @@
 				parser->command = NULL;
 				parser->state = XMT_STATE_COMMANDS;
 			}
+			else if (!strcmp(name, "repField")) {
+				parser->state = XMT_STATE_COMMANDS;
+			}
 			/*end proto*/
 			else if (!strcmp(name, "ProtoDeclare") || !strcmp(name, "ExternProtoDeclare"))  {
 				GF_Proto *cur = parser->parsing_proto;
@@ -2950,7 +2970,7 @@
 		gf_list_rem_last(parser->nodes);
 		gf_free(top);
 	} else {
-		xmt_report(parser, GF_OK, "Warning: closing element %s doesn't match created node %s", name, gf_node_get_class_name(top->node) );
+		xmt_report(parser, GF_NON_COMPLIANT_BITSTREAM, "Warning: closing element %s doesn't match created node %s", name, gf_node_get_class_name(top->node) );
 	}
 }
 
@@ -3040,7 +3060,7 @@
 	/*scene creation - pick up a size*/
 	if (!parser->scene_es) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("XMT: No BIFS Streams found in existing context - creating one\n"));
-		parser->scene_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GPAC_OTI_SCENE_BIFS);
+		parser->scene_es = gf_sm_stream_new(load->ctx, 0, GF_STREAM_SCENE, GF_CODECID_BIFS);
 		parser->load->ctx->scene_width = 0;
 		parser->load->ctx->scene_height = 0;
 		parser->load->ctx->is_pixel_metrics = 1;

gpac-0.8.0.tar.gz/src/scene_manager/scene_dump.c -> gpac-1.0.0.tar.gz/src/scene_manager/scene_dump.c Changed

@@ -78,8 +78,6 @@
 void gf_dump_svg_element(GF_SceneDumper *sdump, GF_Node *n, GF_Node *parent, Bool is_root);
 #endif
 
-GF_Err gf_sm_dump_command_list(GF_SceneDumper *sdump, GF_List *comList, u32 indent, Bool skip_first_replace);
-
 GF_EXPORT
 GF_SceneDumper *gf_sm_dumper_new(GF_SceneGraph *graph, char *_rad_name, Bool is_final_name, char indent_char, GF_SceneDumpFormat dump_mode)
 {
@@ -100,7 +98,7 @@
 		}
 		if (_rad_name) {
 			const char* ext_name = tmp->LSRDump ? ".xsr" : ".svg";
-			tmp->filename = (char *)gf_malloc(strlen(_rad_name ? _rad_name : "") + strlen(ext_name) + 1);
+			tmp->filename = (char *)gf_malloc(strlen(_rad_name) + strlen(ext_name) + 1);
 			strcpy(tmp->filename, _rad_name);
 			if (!is_final_name) strcat(tmp->filename, ext_name);
 			tmp->trace = gf_fopen(tmp->filename, "wt");
@@ -222,9 +220,9 @@
 static void gf_dump_setup(GF_SceneDumper *sdump, GF_Descriptor *root_od)
 {
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+		gf_fprintf(sdump->trace, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
 		if (sdump->dump_mode==GF_SM_DUMP_XML) return;
-		fprintf(sdump->trace, "\n",
+		gf_fprintf(sdump->trace, "\n",
 		        (sdump->dump_mode==GF_SM_DUMP_SVG) ? "SVG" :
 		        (sdump->dump_mode==GF_SM_DUMP_LASER) ? "LASeR" :
 		        sdump->X3DDump ? "X3D" : "XMT-A"
@@ -232,12 +230,12 @@
 	}
 	if (sdump->dump_mode==GF_SM_DUMP_SVG) return;
 	if (sdump->LSRDump) {
-		fprintf(sdump->trace, "<saf:SAFSession xmlns:saf=\"urn:mpeg:mpeg4:SAF:2005\" >\n");
+		gf_fprintf(sdump->trace, "<saf:SAFSession xmlns:saf=\"urn:mpeg:mpeg4:SAF:2005\" >\n");
 #ifndef GPAC_DISABLE_OD_DUMP
 		if (root_od) {
 			GF_ObjectDescriptor *iod = (GF_ObjectDescriptor *)root_od;
 			u32 i, count;
-			fprintf(sdump->trace, "<saf:sceneHeader>\n");
+			gf_fprintf(sdump->trace, "<saf:sceneHeader>\n");
 			count = gf_list_count(iod->ESDescriptors);
 			for (i=0; i<count; i++) {
 				GF_LASERConfig lsrcfg;
@@ -248,7 +246,7 @@
 				gf_odf_get_laser_config(esd->decoderConfig->decoderSpecificInfo, &lsrcfg);
 				gf_odf_dump_desc((GF_Descriptor*)&lsrcfg, sdump->trace, 1, 1);
 			}
-			fprintf(sdump->trace, "</saf:sceneHeader>\n");
+			gf_fprintf(sdump->trace, "</saf:sceneHeader>\n");
 		}
 #endif
 		return;
@@ -257,37 +255,37 @@
 	if (!sdump->X3DDump) {
 		/*setup XMT*/
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "<XMT-A xmlns=\"urn:mpeg:mpeg4:xmta:schema:2002\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:mpeg:mpeg4:xmta:schema:2002 xmt-a.xsd\">\n");
-			fprintf(sdump->trace, " <Header>\n");
+			gf_fprintf(sdump->trace, "<XMT-A xmlns=\"urn:mpeg:mpeg4:xmta:schema:2002\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"urn:mpeg:mpeg4:xmta:schema:2002 xmt-a.xsd\">\n");
+			gf_fprintf(sdump->trace, " <Header>\n");
 #ifndef GPAC_DISABLE_OD_DUMP
 			if (root_od) gf_odf_dump_desc(root_od, sdump->trace, 1, 1);
 #endif
-			fprintf(sdump->trace, " </Header>\n");
-			fprintf(sdump->trace, " <Body>\n");
+			gf_fprintf(sdump->trace, " </Header>\n");
+			gf_fprintf(sdump->trace, " <Body>\n");
 			if (!root_od) {
-				fprintf(sdump->trace, "  <Replace>\n");
+				gf_fprintf(sdump->trace, "  <Replace>\n");
 			}
 		} else {
 			if (sdump->dump_mode==GF_SM_DUMP_VRML) {
-				fprintf(sdump->trace, "#VRML V2.0\n");
+				gf_fprintf(sdump->trace, "#VRML V2.0\n");
 			} else {
 				/*dump root OD*/
 #ifndef GPAC_DISABLE_OD_DUMP
 				if (root_od) gf_odf_dump_desc(root_od, sdump->trace, 0, 0);
 #endif
 			}
-			fprintf(sdump->trace, "\n");
+			gf_fprintf(sdump->trace, "\n");
 		}
 	} else {
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D 3.0//EN\" \"http://www.web3d.org/specifications/x3d-3.0.dtd\">\n");
-			fprintf(sdump->trace, "<X3D xmlns:xsd=\"http://www.w3.org/2001/XMLSchema-instance\" xsd:noNamespaceSchemaLocation=\"http://www.web3d.org/specifications/x3d-3.0.xsd\" version=\"3.0\">\n");
-			fprintf(sdump->trace, "<head>\n");
-			fprintf(sdump->trace, "<meta content=\"X3D File Converted/Dumped by GPAC Version %s\" name=\"generator\"/>\n", GPAC_FULL_VERSION);
-			fprintf(sdump->trace, "</head>\n");
-			fprintf(sdump->trace, " <Scene>\n");
+			gf_fprintf(sdump->trace, "<!DOCTYPE X3D PUBLIC \"ISO//Web3D//DTD X3D 3.0//EN\" \"http://www.web3d.org/specifications/x3d-3.0.dtd\">\n");
+			gf_fprintf(sdump->trace, "<X3D xmlns:xsd=\"http://www.w3.org/2001/XMLSchema-instance\" xsd:noNamespaceSchemaLocation=\"http://www.web3d.org/specifications/x3d-3.0.xsd\" version=\"3.0\">\n");
+			gf_fprintf(sdump->trace, "<head>\n");
+			gf_fprintf(sdump->trace, "<meta content=\"X3D File Converted/Dumped by GPAC Version %s - %s\" name=\"generator\"/>\n", gf_gpac_version(), gf_gpac_copyright() );
+			gf_fprintf(sdump->trace, "</head>\n");
+			gf_fprintf(sdump->trace, " <Scene>\n");
 		} else {
-			fprintf(sdump->trace, "#X3D V3.0\n\n");
+			gf_fprintf(sdump->trace, "#X3D V3.0\n\n");
 		}
 	}
 }
@@ -297,20 +295,20 @@
 	if (sdump->dump_mode==GF_SM_DUMP_SVG) return;
 
 	if (sdump->LSRDump) {
-		fprintf(sdump->trace, "<saf:endOfSAFSession/>\n</saf:SAFSession>\n");
+		gf_fprintf(sdump->trace, "<saf:endOfSAFSession/>\n</saf:SAFSession>\n");
 		return;
 	}
 	if (!sdump->XMLDump) return;
 
 	if (!sdump->X3DDump) {
 		if (!root_od) {
-			fprintf(sdump->trace, "  </Replace>\n");
+			gf_fprintf(sdump->trace, "  </Replace>\n");
 		}
-		fprintf(sdump->trace, " </Body>\n");
-		fprintf(sdump->trace, "</XMT-A>\n");
+		gf_fprintf(sdump->trace, " </Body>\n");
+		gf_fprintf(sdump->trace, "</XMT-A>\n");
 	} else {
-		fprintf(sdump->trace, " </Scene>\n");
-		fprintf(sdump->trace, "</X3D>\n");
+		gf_fprintf(sdump->trace, " </Scene>\n");
+		gf_fprintf(sdump->trace, "</X3D>\n");
 	}
 }
 
@@ -332,7 +330,7 @@
 #define DUMP_IND(sdump)	\
 	if (sdump->trace) {		\
 		u32 z;	\
-		for (z=0; z<sdump->indent; z++) fprintf(sdump->trace, "%c", sdump->ind_char);	\
+		for (z=0; z<sdump->indent; z++) gf_fprintf(sdump->trace, "%c", sdump->ind_char);	\
 	}
 
 
@@ -341,9 +339,9 @@
 	if (!sdump->trace) return;
 	DUMP_IND(sdump);
 	if (!sdump->XMLDump) {
-		fprintf(sdump->trace, "%s {\n", name);
-	} else if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<%s", name);
+		gf_fprintf(sdump->trace, "%s {\n", name);
+	} else {
+		gf_fprintf(sdump->trace, "<%s", name);
 	}
 }
 
@@ -352,9 +350,9 @@
 	if (!sdump->trace) return;
 	if (sdump->XMLDump) {
 		if (has_sub_el) {
-			fprintf(sdump->trace, ">\n");
+			gf_fprintf(sdump->trace, ">\n");
 		} else {
-			fprintf(sdump->trace, "/>\n");
+			gf_fprintf(sdump->trace, "/>\n");
 		}
 	}
 }
@@ -364,11 +362,11 @@
 	if (!sdump->trace) return;
 	if (!sdump->XMLDump) {
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "}\n");
+		gf_fprintf(sdump->trace, "}\n");
 	} else {
 		if (had_sub_el) {
 			DUMP_IND(sdump);
-			fprintf(sdump->trace, "</%s>\n", name);
+			gf_fprintf(sdump->trace, "</%s>\n", name);
 		}
 	}
 }
@@ -378,9 +376,9 @@
 	if (!sdump->trace) return;
 	if (!sdump->XMLDump) {
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "%s ", name);
+		gf_fprintf(sdump->trace, "%s ", name);
 	} else {
-		fprintf(sdump->trace, " %s=\"", name);
+		gf_fprintf(sdump->trace, " %s=\"", name);
 	}
 }
 
@@ -388,9 +386,9 @@
 {
 	if (!sdump->trace) return;
 	if (!sdump->XMLDump) {
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, "\n");
 	} else {
-		fprintf(sdump->trace, "\"");
+		gf_fprintf(sdump->trace, "\"");
 	}
 }
 
@@ -401,11 +399,11 @@
 	DUMP_IND(sdump);
 	if (!sdump->XMLDump) {
 		if (name)
-			fprintf(sdump->trace, "%s [\n", name);
+			gf_fprintf(sdump->trace, "%s [\n", name);
 		else
-			fprintf(sdump->trace, "[\n");
+			gf_fprintf(sdump->trace, "[\n");
 	} else {
-		fprintf(sdump->trace, "<%s>\n", name);
+		gf_fprintf(sdump->trace, "<%s>\n", name);
 	}
 }
 
@@ -414,9 +412,9 @@
 	if (!sdump->trace) return;
 	DUMP_IND(sdump);
 	if (!sdump->XMLDump) {
-		fprintf(sdump->trace, "]\n");
+		gf_fprintf(sdump->trace, "]\n");
 	} else {
-		fprintf(sdump->trace, "</%s>\n", name);
+		gf_fprintf(sdump->trace, "</%s>\n", name);
 	}
 }
 
@@ -434,34 +432,34 @@
 	if (_len != (size_t) (-1)) {
 		len = (u32) _len;
 		for (i=0; i<len; i++) {
-			//if (uniLine[i] == (u16) '\"') fprintf(sdump->trace, "\\");
+			//if (uniLine[i] == (u16) '\"') gf_fprintf(sdump->trace, "\\");
 			switch (uniLine[i]) {
 			case '\'':
-				if (escape_xml) fprintf(sdump->trace, "&apos;");
-				else fprintf(sdump->trace, "'");
+				if (escape_xml) gf_fprintf(sdump->trace, "&apos;");
+				else gf_fprintf(sdump->trace, "'");
 				break;
 			case '\"':
-				if (escape_xml) fprintf(sdump->trace, "&quot;");
-				else fprintf(sdump->trace, "\"");
+				if (escape_xml) gf_fprintf(sdump->trace, "&quot;");
+				else gf_fprintf(sdump->trace, "\"");
 				break;
 			case '&':
-				fprintf(sdump->trace, "&amp;");
+				gf_fprintf(sdump->trace, "&amp;");
 				break;
 			case '>':
-				fprintf(sdump->trace, "&gt;");
+				gf_fprintf(sdump->trace, "&gt;");
 				break;
 			case '<':
-				fprintf(sdump->trace, "&lt;");
+				gf_fprintf(sdump->trace, "&lt;");
 				break;
 			case '\r':
 			case '\n':
-				/* Does nothing : fprintf(sdump->trace, "");, fflush instead ?*/
+				/* Does nothing : gf_fprintf(sdump->trace, "");, fflush instead ?*/
 				break;
 			default:
 				if (uniLine[i]<128) {
-					fprintf(sdump->trace, "%c", (u8) uniLine[i]);
+					gf_fprintf(sdump->trace, "%c", (u8) uniLine[i]);
 				} else {
-					fprintf(sdump->trace, "&#%d;", uniLine[i]);
+					gf_fprintf(sdump->trace, "&#%d;", uniLine[i]);
 				}
 				break;
 			}
@@ -480,9 +478,9 @@
 	/*FIXME - optimize id/name fetch*/
 	node_name = gf_node_get_name_and_id(node, &id);
 	if (node_name)
-		fprintf(sdump->trace, "%s", node_name);
+		gf_fprintf(sdump->trace, "%s", node_name);
 	else
-		fprintf(sdump->trace, "N%d", id - 1);
+		gf_fprintf(sdump->trace, "N%d", id - 1);
 }
 
 static Bool scene_dump_vrml_find_route_name(GF_SceneDumper *sdump, u32 ID, const char **outName)
@@ -524,9 +522,9 @@
 	if (!rName) scene_dump_vrml_find_route_name(sdump, routeID, (const char **) &rName);
 
 	if (rName)
-		fprintf(sdump->trace, "%s", rName);
+		gf_fprintf(sdump->trace, "%s", rName);
 	else
-		fprintf(sdump->trace, "R%d", routeID - 1);
+		gf_fprintf(sdump->trace, "R%d", routeID - 1);
 }
 
 
@@ -534,40 +532,40 @@
 {
 	switch (type) {
 	case GF_SG_VRML_SFBOOL:
-		fprintf(sdump->trace, "%s", * ((SFBool *)ptr) ? "true" : "false");
+		gf_fprintf(sdump->trace, "%s", * ((SFBool *)ptr) ? "true" : "false");
 		break;
 	case GF_SG_VRML_SFINT32:
-		fprintf(sdump->trace, "%d", * ((SFInt32 *)ptr) );
+		gf_fprintf(sdump->trace, "%d", * ((SFInt32 *)ptr) );
 		break;
 	case GF_SG_VRML_SFFLOAT:
-		fprintf(sdump->trace, "%g", FIX2FLT( * ((SFFloat *)ptr) ) );
+		gf_fprintf(sdump->trace, "%g", FIX2FLT( * ((SFFloat *)ptr) ) );
 		break;
 	case GF_SG_VRML_SFDOUBLE:
-		fprintf(sdump->trace, "%g", * ((SFDouble *)ptr) );
+		gf_fprintf(sdump->trace, "%g", * ((SFDouble *)ptr) );
 		break;
 	case GF_SG_VRML_SFTIME:
-		fprintf(sdump->trace, "%g", * ((SFTime *)ptr) );
+		gf_fprintf(sdump->trace, "%g", * ((SFTime *)ptr) );
 		break;
 	case GF_SG_VRML_SFCOLOR:
-		fprintf(sdump->trace, "%g %g %g", FIX2FLT( ((SFColor *)ptr)->red ), FIX2FLT( ((SFColor *)ptr)->green ), FIX2FLT( ((SFColor *)ptr)->blue ));
+		gf_fprintf(sdump->trace, "%g %g %g", FIX2FLT( ((SFColor *)ptr)->red ), FIX2FLT( ((SFColor *)ptr)->green ), FIX2FLT( ((SFColor *)ptr)->blue ));
 		break;
 	case GF_SG_VRML_SFCOLORRGBA:
-		fprintf(sdump->trace, "%g %g %g %g", FIX2FLT( ((SFColorRGBA *)ptr)->red ), FIX2FLT( ((SFColorRGBA *)ptr)->green ), FIX2FLT( ((SFColorRGBA *)ptr)->blue ), FIX2FLT( ((SFColorRGBA *)ptr)->alpha ));
+		gf_fprintf(sdump->trace, "%g %g %g %g", FIX2FLT( ((SFColorRGBA *)ptr)->red ), FIX2FLT( ((SFColorRGBA *)ptr)->green ), FIX2FLT( ((SFColorRGBA *)ptr)->blue ), FIX2FLT( ((SFColorRGBA *)ptr)->alpha ));
 		break;
 	case GF_SG_VRML_SFVEC2F:
-		fprintf(sdump->trace, "%g %g", FIX2FLT( ((SFVec2f *)ptr)->x ), FIX2FLT( ((SFVec2f *)ptr)->y ));
+		gf_fprintf(sdump->trace, "%g %g", FIX2FLT( ((SFVec2f *)ptr)->x ), FIX2FLT( ((SFVec2f *)ptr)->y ));
 		break;
 	case GF_SG_VRML_SFVEC2D:
-		fprintf(sdump->trace, "%g %g", ((SFVec2d *)ptr)->x, ((SFVec2d *)ptr)->y);
+		gf_fprintf(sdump->trace, "%g %g", ((SFVec2d *)ptr)->x, ((SFVec2d *)ptr)->y);
 		break;
 	case GF_SG_VRML_SFVEC3F:
-		fprintf(sdump->trace, "%g %g %g", FIX2FLT( ((SFVec3f *)ptr)->x ), FIX2FLT( ((SFVec3f *)ptr)->y ), FIX2FLT( ((SFVec3f *)ptr)->z ));
+		gf_fprintf(sdump->trace, "%g %g %g", FIX2FLT( ((SFVec3f *)ptr)->x ), FIX2FLT( ((SFVec3f *)ptr)->y ), FIX2FLT( ((SFVec3f *)ptr)->z ));
 		break;
 	case GF_SG_VRML_SFVEC3D:
-		fprintf(sdump->trace, "%g %g %g", ((SFVec3d *)ptr)->x, ((SFVec3d *)ptr)->y, ((SFVec3d *)ptr)->z);
+		gf_fprintf(sdump->trace, "%g %g %g", ((SFVec3d *)ptr)->x, ((SFVec3d *)ptr)->y, ((SFVec3d *)ptr)->z);
 		break;
 	case GF_SG_VRML_SFROTATION:
-		fprintf(sdump->trace, "%g %g %g %g", FIX2FLT( ((SFRotation *)ptr)->x ), FIX2FLT( ((SFRotation *)ptr)->y ), FIX2FLT( ((SFRotation *)ptr)->z ), FIX2FLT( ((SFRotation *)ptr)->q ) );
+		gf_fprintf(sdump->trace, "%g %g %g %g", FIX2FLT( ((SFRotation *)ptr)->x ), FIX2FLT( ((SFRotation *)ptr)->y ), FIX2FLT( ((SFRotation *)ptr)->z ), FIX2FLT( ((SFRotation *)ptr)->q ) );
 		break;
 
 	case GF_SG_VRML_SFATTRREF:
@@ -577,23 +575,23 @@
 			GF_FieldInfo pinfo;
 			gf_node_get_field(ar->node, ar->fieldIndex, &pinfo);
 			scene_dump_vrml_id(sdump, ar->node);
-			fprintf(sdump->trace, ".%s", pinfo.name);
+			gf_fprintf(sdump->trace, ".%s", pinfo.name);
 		}
 	}
 	break;
 	case GF_SG_VRML_SFSCRIPT:
 	{
-		size_t _len;
 		u32 len, i;
 		char *str;
-		u16 *uniLine;
 		str = (char*)((SFScript *)ptr)->script_text;
 		len = (u32)strlen(str);
 
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "\"%s\"", str);
+			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);
@@ -605,17 +603,17 @@
 
 					switch (uniLine[i]) {
 					case '&':
-						fprintf(sdump->trace, "&amp;");
+						gf_fprintf(sdump->trace, "&amp;");
 						break;
 					case '<':
-						fprintf(sdump->trace, "&lt;");
+						gf_fprintf(sdump->trace, "&lt;");
 						break;
 					case '>':
-						fprintf(sdump->trace, "&gt;");
+						gf_fprintf(sdump->trace, "&gt;");
 						break;
 					case '\'':
 					case '"':
-						fprintf(sdump->trace, "&apos;");
+						gf_fprintf(sdump->trace, "&apos;");
 						break;
 					case 0:
 						break;
@@ -623,10 +621,10 @@
 						an XML attribute in any viewer ? */
 					default:
 						if (uniLine[i]<128) {
-							fprintf(sdump->trace, "%c", (u8)uniLine[i]);
+							gf_fprintf(sdump->trace, "%c", (u8)uniLine[i]);
 						}
 						else {
-							fprintf(sdump->trace, "&#%d;", uniLine[i]);
+							gf_fprintf(sdump->trace, "&#%d;", uniLine[i]);
 						}
 						break;
 					}
@@ -642,9 +640,9 @@
 	{
 		char *str;
 		if (sdump->XMLDump) {
-			if (is_mf) fprintf(sdump->trace, sdump->X3DDump ? "\"" : "&quot;");
+			if (is_mf) gf_fprintf(sdump->trace, sdump->X3DDump ? "\"" : "&quot;");
 		} else {
-			fprintf(sdump->trace, "\"");
+			gf_fprintf(sdump->trace, "\"");
 		}
 		/*dump in unicode*/
 		str = ((SFString *)ptr)->buffer;
@@ -668,12 +666,12 @@
 			if (sdump->XMLDump) {
 				scene_dump_utf_string(sdump, 1, str);
 			} else if (!strchr(str, '\"')) {
-				fprintf(sdump->trace, "%s", str);
+				gf_fprintf(sdump->trace, "%s", str);
 			} else {
 				u32 i, len = (u32)strlen(str);
 				for (i=0; i<len; i++) {
-					if (str[i]=='\"') fputc('\\', sdump->trace);
-					fputc(str[i], sdump->trace);
+					if (str[i]=='\"') gf_fputc('\\', sdump->trace);
+					gf_fputc(str[i], sdump->trace);
 				}
 			}
 		}
@@ -682,9 +680,9 @@
 		}
 
 		if (sdump->XMLDump) {
-			if (is_mf) fprintf(sdump->trace, sdump->X3DDump ? "\"" : "&quot;");
+			if (is_mf) gf_fprintf(sdump->trace, sdump->X3DDump ? "\"" : "&quot;");
 		} else {
-			fprintf(sdump->trace, "\"");
+			gf_fprintf(sdump->trace, "\"");
 		}
 	}
 	break;
@@ -698,20 +696,20 @@
 			str = ((SFURL *)ptr)->url;
 			len = gf_utf8_mbstowcs(uniLine, 5000, (const char **) &str);
 			if (len != (size_t) -1) {
-				fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
+				gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
 				fwprintf(sdump->trace, (unsigned short *) uniLine);
-				fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
+				gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
 			}
 #else
-			fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
-			fprintf(sdump->trace, "%s", ((SFURL *)ptr)->url);
-			fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
+			gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
+			gf_fprintf(sdump->trace, "%s", ((SFURL *)ptr)->url);
+			gf_fprintf(sdump->trace, sdump->XMLDump ? (sdump->X3DDump ?  "'" : "&quot;") : "\"");
 #endif
 		} else {
 			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "&quot;od://od%d&quot;", ((SFURL *)ptr)->OD_ID);
+				gf_fprintf(sdump->trace, "&quot;od://od%d&quot;", ((SFURL *)ptr)->OD_ID);
 			} else {
-				fprintf(sdump->trace, "od:%d", ((SFURL *)ptr)->OD_ID);
+				gf_fprintf(sdump->trace, "od:%d", ((SFURL *)ptr)->OD_ID);
 			}
 		}
 		break;
@@ -719,24 +717,24 @@
 	{
 		u32 i, count;
 		SFImage *img = (SFImage *)ptr;
-		fprintf(sdump->trace, "%d %d %d", img->width, img->height, img->numComponents);
+		gf_fprintf(sdump->trace, "%d %d %d", img->width, img->height, img->numComponents);
 		count = img->width * img->height * img->numComponents;
 		for (i=0; i<count; ) {
 			switch (img->numComponents) {
 			case 1:
-				fprintf(sdump->trace, " 0x%02X", img->pixels[i]);
+				gf_fprintf(sdump->trace, " 0x%02X", img->pixels[i]);
 				i++;
 				break;
 			case 2:
-				fprintf(sdump->trace, " 0x%02X%02X", img->pixels[i], img->pixels[i+1]);
+				gf_fprintf(sdump->trace, " 0x%02X%02X", img->pixels[i], img->pixels[i+1]);
 				i+=2;
 				break;
 			case 3:
-				fprintf(sdump->trace, " 0x%02X%02X%02X", img->pixels[i], img->pixels[i+1], img->pixels[i+2]);
+				gf_fprintf(sdump->trace, " 0x%02X%02X%02X", img->pixels[i], img->pixels[i+1], img->pixels[i+2]);
 				i+=3;
 				break;
 			case 4:
-				fprintf(sdump->trace, " 0x%02X%02X%02X%02X", img->pixels[i], img->pixels[i+1], img->pixels[i+2], img->pixels[i+3]);
+				gf_fprintf(sdump->trace, " 0x%02X%02X%02X%02X", img->pixels[i], img->pixels[i+1], img->pixels[i+2], img->pixels[i+3]);
 				i+=4;
 				break;
 			}
@@ -749,7 +747,6 @@
 
 static void gf_dump_vrml_simple_field(GF_SceneDumper *sdump, GF_FieldInfo field, GF_Node *parent)
 {
-	GenMFField *mffield;
 	u32 i, sf_type;
 	GF_ChildNodeItem *list;
 	void *slot_ptr;
@@ -770,58 +767,41 @@
 		sdump->indent--;
 		return;
 	case GF_SG_VRML_SFCOMMANDBUFFER:
-	{
-	}
-	return;
+		return;
 	}
 	if (gf_sg_vrml_is_sf_field(field.fieldType)) {
 		if (sdump->XMLDump) StartAttribute(sdump, "value");
 		gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, parent);
 		if (sdump->XMLDump) EndAttribute(sdump);
 	} else {
+		GenMFField *mffield;
 		mffield = (GenMFField *) field.far_ptr;
 		sf_type = gf_sg_vrml_get_sf_type(field.fieldType);
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "[");
+			gf_fprintf(sdump->trace, "[");
 		} else if (sf_type==GF_SG_VRML_SFSTRING) {
-			fprintf(sdump->trace, " value=\'");
+			gf_fprintf(sdump->trace, " value=\'");
 		} else {
 			StartAttribute(sdump, "value");
 		}
 		for (i=0; i<mffield->count; i++) {
-			if (i) fprintf(sdump->trace, " ");
+			if (i) gf_fprintf(sdump->trace, " ");
 			gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &slot_ptr, i);
 			/*this is to cope with single MFString which shall appear as SF in XMT*/
 			gf_dump_vrml_sffield(sdump, sf_type, slot_ptr, 1, parent);
 		}
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "]");
+			gf_fprintf(sdump->trace, "]");
 		} else if (sf_type==GF_SG_VRML_SFSTRING) {
-			fprintf(sdump->trace, "\'");
+			gf_fprintf(sdump->trace, "\'");
 		} else {
 			EndAttribute(sdump);
 		}
 	}
 }
 
-static Bool gf_dump_vrml_needs_container(GF_Node *node, GF_FieldInfo *fi)
-{
-	u32 i, count, nb_ndt;
-	GF_FieldInfo info;
-	if (!strcmp(fi->name, "children")) return 0;
-	nb_ndt = 0;
-	count = gf_node_get_field_count(node);
-	for (i=0; i<count; i++) {
-		gf_node_get_field(node, i, &info);
-		if ((info.eventType==GF_SG_EVENT_IN) || (info.eventType==GF_SG_EVENT_OUT)) continue;
-		if (info.NDTtype==fi->NDTtype) nb_ndt++;
-	}
-	return (nb_ndt>1) ? 1 : 0;
-}
-
 static void gf_dump_vrml_field(GF_SceneDumper *sdump, GF_Node *node, GF_FieldInfo field)
 {
-	GenMFField *mffield;
 	u32 i, sf_type;
 	Bool needs_field_container;
 	GF_ChildNodeItem *list;
@@ -853,7 +833,23 @@
 		return;
 	case GF_SG_VRML_MFNODE:
 		needs_field_container = 0;
-		if (sdump->XMLDump && sdump->X3DDump) needs_field_container = gf_dump_vrml_needs_container(node, &field);
+		if (sdump->XMLDump && sdump->X3DDump) {
+			u32 count, nb_ndt;
+			GF_FieldInfo info;
+			if (!strcmp(field.name, "children")) {
+				needs_field_container = 0;
+			} else {
+				nb_ndt = 0;
+				count = gf_node_get_field_count(node);
+				for (i=0; i<count; i++) {
+					gf_node_get_field(node, i, &info);
+					if ((info.eventType==GF_SG_EVENT_IN) || (info.eventType==GF_SG_EVENT_OUT)) continue;
+					if (info.NDTtype==field.NDTtype) nb_ndt++;
+				}
+				needs_field_container = (nb_ndt>1) ? 1 : 0;
+			}
+		}
+
 #ifndef GPAC_DISABLE_X3D
 		if (!sdump->X3DDump) {
 			if (gf_node_get_tag(node)==TAG_X3D_Switch) field.name = "choice";
@@ -880,8 +876,8 @@
 			/*the arch does not allow for that (we would need a codec and so on, or decompress the command list
 			in all cases...)*/
 			if (sdump->trace && cb->bufferSize) {
-				if (sdump->XMLDump) fprintf(sdump->trace, "\n");
-				else fprintf(sdump->trace, "#SFCommandBuffer cannot be dumped while playing - use MP4Box instead\n");
+				if (sdump->XMLDump) gf_fprintf(sdump->trace, "\n");
+				else gf_fprintf(sdump->trace, "#SFCommandBuffer cannot be dumped while playing - use MP4Box instead\n");
 			}
 		} else {
 			gf_sm_dump_command_list(sdump, cb->commandList, sdump->indent, 0);
@@ -903,9 +899,9 @@
 					GF_FieldInfo pinfo;
 					DUMP_IND(sdump);
 					gf_node_get_field(ar->vals[i].node, ar->vals[i].fieldIndex, &pinfo);
-					fprintf(sdump->trace, "<store node=\"");
+					gf_fprintf(sdump->trace, "<store node=\"");
 					scene_dump_vrml_id(sdump, ar->vals[i].node);
-					fprintf(sdump->trace, "\" field=\"%s\"/>\n", pinfo.name);
+					gf_fprintf(sdump->trace, "\" field=\"%s\"/>\n", pinfo.name);
 				}
 			}
 
@@ -922,7 +918,7 @@
 		gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, node);
 		EndAttribute(sdump);
 	} else {
-		mffield = (GenMFField *) field.far_ptr;
+		GenMFField *mffield = (GenMFField *) field.far_ptr;
 		sf_type = gf_sg_vrml_get_sf_type(field.fieldType);
 
 		if (sdump->XMLDump && sdump->X3DDump) {
@@ -930,7 +926,7 @@
 			case GF_SG_VRML_SFSTRING:
 			case GF_SG_VRML_SFSCRIPT:
 			case GF_SG_VRML_SFURL:
-				fprintf(sdump->trace, " %s=\'", (char *) field.name);
+				gf_fprintf(sdump->trace, " %s=\'", (char *) field.name);
 				break;
 			default:
 				StartAttribute(sdump, field.name);
@@ -940,20 +936,20 @@
 			StartAttribute(sdump, field.name);
 		}
 
-		if (!sdump->XMLDump) fprintf(sdump->trace, "[");
+		if (!sdump->XMLDump) gf_fprintf(sdump->trace, "[");
 		for (i=0; i<mffield->count; i++) {
-			if (i) fprintf(sdump->trace, " ");
+			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) fprintf(sdump->trace, "]");
+		if (!sdump->XMLDump) gf_fprintf(sdump->trace, "]");
 
 		if (sdump->XMLDump && sdump->X3DDump) {
 			switch (sf_type) {
 			case GF_SG_VRML_SFSTRING:
 			case GF_SG_VRML_SFSCRIPT:
 			case GF_SG_VRML_SFURL:
-				fprintf(sdump->trace, "\'");
+				gf_fprintf(sdump->trace, "\'");
 				break;
 			default:
 				EndAttribute(sdump);
@@ -1064,48 +1060,9 @@
 	}
 }
 
-static const char *SD_GetQuantCatName(u32 QP_Type)
-{
-	switch (QP_Type) {
-#ifndef GPAC_DISABLE_BIFS
-	case QC_3DPOS:
-		return "position3D";
-	case QC_2DPOS:
-		return "position2D";
-	case QC_ORDER:
-		return "drawingOrder";
-	case QC_COLOR:
-		return "color";
-	case QC_TEXTURE_COORD:
-		return "textureCoordinate";
-	case QC_ANGLE:
-		return "angle";
-	case QC_SCALE:
-		return "scale";
-	case QC_INTERPOL_KEYS:
-		return "keys";
-	case QC_NORMALS:
-		return "normals";
-	case QC_ROTATION:
-		return "rotations";
-	case QC_SIZE_3D:
-		return "size3D";
-	case QC_SIZE_2D:
-		return "size2D";
-	case QC_LINEAR_SCALAR:
-		return "linear";
-	case QC_COORD_INDEX:
-		return "coordIndex";
-#endif
-	default:
-		return "unknown";
-	}
-}
-
 /*field dumping for proto declaration and Script*/
 static void gf_dump_vrml_dyn_field(GF_SceneDumper *sdump, GF_Node *node, GF_FieldInfo field, Bool has_sublist)
 {
-	GenMFField *mffield;
 	u32 i, sf_type;
 	void *slot_ptr;
 
@@ -1113,74 +1070,74 @@
 		DUMP_IND(sdump);
 		if (sdump->XMLDump) {
 			if (sdump->X3DDump) {
-				fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" accessType=\"%s\"",
-				        field.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
+				gf_fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" accessType=\"%s\"",
+				        field.name, gf_sg_vrml_get_field_type_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
 			} else {
-				fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" vrml97Hint=\"%s\"",
+				gf_fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" vrml97Hint=\"%s\"",
 				        field.name, GetXMTFieldTypeName(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 0));
 			}
 
 			if ((field.eventType == GF_SG_EVENT_FIELD) || (field.eventType == GF_SG_EVENT_EXPOSED_FIELD)) {
 				if (field.fieldType == GF_SG_VRML_SFNODE) {
 					if (!sdump->X3DDump) {
-						fprintf(sdump->trace, ">\n");
+						gf_fprintf(sdump->trace, ">\n");
 						sdump->indent++;
-						fprintf(sdump->trace, "<node>");
+						gf_fprintf(sdump->trace, "<node>");
 						gf_dump_vrml_node(sdump, field.far_ptr ? *(GF_Node **)field.far_ptr : NULL, 0, NULL);
-						fprintf(sdump->trace, "</node>");
+						gf_fprintf(sdump->trace, "</node>");
 						sdump->indent--;
 						if (!has_sublist)
-							fprintf(sdump->trace, "</field>\n");
+							gf_fprintf(sdump->trace, "</field>\n");
 					} else {
 						if (field.far_ptr) {
-							fprintf(sdump->trace, ">\n");
+							gf_fprintf(sdump->trace, ">\n");
 							gf_dump_vrml_node(sdump, *(GF_Node **)field.far_ptr, 0, NULL);
-							fprintf(sdump->trace, "</field>\n");
+							gf_fprintf(sdump->trace, "</field>\n");
 						} else {
-							fprintf(sdump->trace, "/>\n");
+							gf_fprintf(sdump->trace, "/>\n");
 						}
 					}
 					DUMP_IND(sdump);
 				} else {
 					if (sdump->X3DDump) {
-						fprintf(sdump->trace, " value=\"");
+						gf_fprintf(sdump->trace, " value=\"");
 					} else {
-						fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
+						gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 					}
 					gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, node);
 					if (has_sublist)
-						fprintf(sdump->trace, "\">\n");
+						gf_fprintf(sdump->trace, "\">\n");
 					else
-						fprintf(sdump->trace, "\"/>\n");
+						gf_fprintf(sdump->trace, "\"/>\n");
 				}
 			} else {
-				fprintf(sdump->trace, "/>\n");
+				gf_fprintf(sdump->trace, "/>\n");
 			}
 		} else {
-			fprintf(sdump->trace, "%s %s %s", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_by_name(field.fieldType), field.name);
+			gf_fprintf(sdump->trace, "%s %s %s", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_name(field.fieldType), field.name);
 			if ((field.eventType==GF_SG_EVENT_FIELD) || (field.eventType==GF_SG_EVENT_EXPOSED_FIELD)) {
-				fprintf(sdump->trace, " ");
+				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 {
 					gf_dump_vrml_simple_field(sdump, field, node);
 				}
 			}
-			fprintf(sdump->trace, "\n");
+			gf_fprintf(sdump->trace, "\n");
 		}
 	} else {
-		mffield = (GenMFField *) field.far_ptr;
+		GenMFField *mffield = (GenMFField *) field.far_ptr;
 		sf_type = gf_sg_vrml_get_sf_type(field.fieldType);
 
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "%s %s %s", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_by_name(field.fieldType), field.name);
+			gf_fprintf(sdump->trace, "%s %s %s", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_name(field.fieldType), field.name);
 			if ((field.eventType==GF_SG_EVENT_FIELD) || (field.eventType==GF_SG_EVENT_EXPOSED_FIELD)) {
-				fprintf(sdump->trace, " [");
+				gf_fprintf(sdump->trace, " [");
 
 				if (sf_type == GF_SG_VRML_SFNODE) {
 					GF_ChildNodeItem *l = *(GF_ChildNodeItem **)field.far_ptr;
-					fprintf(sdump->trace, "\n");
+					gf_fprintf(sdump->trace, "\n");
 					sdump->indent++;
 					while (l) {
 						gf_dump_vrml_node(sdump, l->node, 1, NULL);
@@ -1190,60 +1147,60 @@
 					DUMP_IND(sdump);
 				} else {
 					for (i=0; i<mffield->count; i++) {
-						if (i) fprintf(sdump->trace, " ");
+						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);
 						}
 					}
 				}
-				fprintf(sdump->trace, "]");
+				gf_fprintf(sdump->trace, "]");
 			}
-			fprintf(sdump->trace, "\n");
+			gf_fprintf(sdump->trace, "\n");
 		} else {
 			if (sdump->X3DDump) {
-				fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" accessType=\"%s\"",
-				        field.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
+				gf_fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" accessType=\"%s\"",
+				        field.name, gf_sg_vrml_get_field_type_name(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 1));
 			} else {
-				fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" vrml97Hint=\"%s\"",
+				gf_fprintf(sdump->trace, "<field name=\"%s\" type=\"%s\" vrml97Hint=\"%s\"",
 				        field.name, GetXMTFieldTypeName(field.fieldType), gf_sg_vrml_get_event_type_name(field.eventType, 0));
 			}
 
 			if ((field.eventType==GF_SG_EVENT_FIELD) || (field.eventType==GF_SG_EVENT_EXPOSED_FIELD)) {
 				if (sf_type == GF_SG_VRML_SFNODE) {
 					GF_ChildNodeItem *list = *(GF_ChildNodeItem **)field.far_ptr;
-					fprintf(sdump->trace, ">\n");
+					gf_fprintf(sdump->trace, ">\n");
 					sdump->indent++;
-					if (!sdump->X3DDump) fprintf(sdump->trace, "<nodes>");
+					if (!sdump->X3DDump) gf_fprintf(sdump->trace, "<nodes>");
 					while (list) {
 						gf_dump_vrml_node(sdump, list->node, 1, NULL);
 						list = list->next;
 					}
-					if (!sdump->X3DDump) fprintf(sdump->trace, "</nodes>");
+					if (!sdump->X3DDump) gf_fprintf(sdump->trace, "</nodes>");
 					sdump->indent++;
 					DUMP_IND(sdump);
 					if (!has_sublist)
-						fprintf(sdump->trace, "</field>\n");
+						gf_fprintf(sdump->trace, "</field>\n");
 				} else {
 					if (sdump->X3DDump) {
-						fprintf(sdump->trace, " value=\"");
+						gf_fprintf(sdump->trace, " value=\"");
 					} else {
-						fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
+						gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 					}
 					for (i=0; i<mffield->count; i++) {
-						if (i) fprintf(sdump->trace, " ");
+						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 (has_sublist)
-						fprintf(sdump->trace, "\">\n");
+						gf_fprintf(sdump->trace, "\">\n");
 					else
-						fprintf(sdump->trace, "\"/>\n");
+						gf_fprintf(sdump->trace, "\"/>\n");
 				}
 			} else {
-				fprintf(sdump->trace, "/>\n");
+				gf_fprintf(sdump->trace, "/>\n");
 			}
 		}
 	}
@@ -1253,63 +1210,62 @@
 /*field dumping for proto instance*/
 static void gf_dump_vrml_proto_field(GF_SceneDumper *sdump, GF_Node *node, GF_FieldInfo field)
 {
-	GenMFField *mffield;
 	u32 i, sf_type;
 	void *slot_ptr;
 
 	DUMP_IND(sdump);
-	fprintf(sdump->trace, "<fieldValue name=\"%s\" ", field.name);
+	gf_fprintf(sdump->trace, "<fieldValue name=\"%s\" ", field.name);
 	if (gf_sg_vrml_is_sf_field(field.fieldType)) {
 		if (field.fieldType == GF_SG_VRML_SFNODE) {
-			fprintf(sdump->trace, ">\n");
+			gf_fprintf(sdump->trace, ">\n");
 			sdump->indent++;
-			if (!sdump->X3DDump) fprintf(sdump->trace, "<node>");
+			if (!sdump->X3DDump) gf_fprintf(sdump->trace, "<node>");
 			gf_dump_vrml_node(sdump, field.far_ptr ? *(GF_Node **)field.far_ptr : NULL, 0, NULL);
-			if (!sdump->X3DDump) fprintf(sdump->trace, "</node>");
+			if (!sdump->X3DDump) gf_fprintf(sdump->trace, "</node>");
 			sdump->indent--;
 			DUMP_IND(sdump);
-			fprintf(sdump->trace, "</fieldValue>\n");
+			gf_fprintf(sdump->trace, "</fieldValue>\n");
 		} else {
 			if (sdump->X3DDump) {
-				fprintf(sdump->trace, " value=\"");
+				gf_fprintf(sdump->trace, " value=\"");
 			} else {
-				fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
+				gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 			}
 			gf_dump_vrml_sffield(sdump, field.fieldType, field.far_ptr, 0, node);
-			fprintf(sdump->trace, "\"/>\n");
+			gf_fprintf(sdump->trace, "\"/>\n");
 		}
 	} else {
-		mffield = (GenMFField *) field.far_ptr;
+		GenMFField *mffield = (GenMFField *) field.far_ptr;
 		sf_type = gf_sg_vrml_get_sf_type(field.fieldType);
 
 		if ((field.eventType==GF_SG_EVENT_FIELD) || (field.eventType==GF_SG_EVENT_EXPOSED_FIELD)) {
 			if (sf_type == GF_SG_VRML_SFNODE) {
 				GF_ChildNodeItem *list = *(GF_ChildNodeItem **)field.far_ptr;
-				fprintf(sdump->trace, ">\n");
+				gf_fprintf(sdump->trace, ">\n");
 				sdump->indent++;
-				if (!sdump->X3DDump) fprintf(sdump->trace, "<nodes>");
+				if (!sdump->X3DDump) gf_fprintf(sdump->trace, "<nodes>");
 				while (list) {
 					gf_dump_vrml_node(sdump, list->node, 1, NULL);
 					list = list->next;
 				}
-				if (!sdump->X3DDump) fprintf(sdump->trace, "</nodes>");
+				if (!sdump->X3DDump) gf_fprintf(sdump->trace, "</nodes>");
 				sdump->indent--;
 				DUMP_IND(sdump);
-				fprintf(sdump->trace, "</fieldValue>\n");
+				gf_fprintf(sdump->trace, "</fieldValue>\n");
 			} else {
 				if (sdump->X3DDump) {
-					fprintf(sdump->trace, " value=\"");
+					gf_fprintf(sdump->trace, " value=\"");
 				} else {
-					fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
+					gf_fprintf(sdump->trace, " %s=\"", GetXMTFieldTypeValueName(field.fieldType));
 				}
 				for (i=0; i<mffield->count; i++) {
-					if (i) fprintf(sdump->trace, " ");
+					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);
 					}
 				}
-				fprintf(sdump->trace, "\"/>\n");
+				gf_fprintf(sdump->trace, "\"/>\n");
 			}
 		}
 	}
@@ -1348,8 +1304,8 @@
 
 	if (!sdump->XMLDump) {
 		DUMP_IND(sdump);
-		if (isScript) fprintf(sdump->trace, "%s %s ", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_by_name(field.fieldType));
-		fprintf(sdump->trace, "%s IS %s\n", field.name, pfield.name);
+		if (isScript) gf_fprintf(sdump->trace, "%s %s ", gf_sg_vrml_get_event_type_name(field.eventType, sdump->X3DDump), gf_sg_vrml_get_field_type_name(field.fieldType));
+		gf_fprintf(sdump->trace, "%s IS %s\n", field.name, pfield.name);
 	} else {
 		if (!skip_is) {
 			StartElement(sdump, "IS");
@@ -1357,7 +1313,7 @@
 			sdump->indent++;
 		}
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "<connect nodeField=\"%s\" protoField=\"%s\"/>\n", field.name, pfield.name);
+		gf_fprintf(sdump->trace, "<connect nodeField=\"%s\" protoField=\"%s\"/>\n", field.name, pfield.name);
 		if (!skip_is) {
 			sdump->indent--;
 			EndElement(sdump, "IS", 1);
@@ -1368,7 +1324,6 @@
 static Bool scene_dump_vrml_can_dump(GF_SceneDumper *sdump, GF_Node *node)
 {
 #ifndef GPAC_DISABLE_VRML
-	const char *name;
 	u32 tag;
 
 	if (node->sgprivate->tag==TAG_ProtoNode) return 1;
@@ -1377,9 +1332,8 @@
 		if (node->sgprivate->tag>=GF_NODE_RANGE_FIRST_X3D) return 1;
 		if (node->sgprivate->tag==TAG_MPEG4_Rectangle) return 1;
 		if (node->sgprivate->tag==TAG_MPEG4_Circle) return 1;
-		name = gf_node_get_class_name(node);
 #ifndef GPAC_DISABLE_X3D
-		tag = gf_node_x3d_type_by_class_name(name);
+		tag = gf_node_x3d_type_by_class_name(gf_node_get_class_name(node));
 		return tag ? 1 : 0;
 #else
 		return 0;
@@ -1390,8 +1344,7 @@
 		if (node->sgprivate->tag==TAG_X3D_Rectangle2D) return 1;
 		if (node->sgprivate->tag==TAG_X3D_Circle2D) return 1;
 #endif
-		name = gf_node_get_class_name(node);
-		tag = gf_node_mpeg4_type_by_class_name(name);
+		tag = gf_node_mpeg4_type_by_class_name(gf_node_get_class_name(node));
 		return tag ? 1 : 0;
 	}
 #else
@@ -1409,7 +1362,7 @@
 	GF_FieldInfo field, base_field;
 
 	if (!node) {
-		fprintf(sdump->trace, "NULL");
+		gf_fprintf(sdump->trace, "NULL");
 		return;
 	}
 
@@ -1418,7 +1371,7 @@
 
 	if (!scene_dump_vrml_can_dump(sdump, node)) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[Scene Dump] node %s not part of %s standard - removing\n", gf_node_get_class_name(node), sdump->X3DDump ? "X3D" : (sdump->dump_mode==GF_SM_DUMP_VRML) ? "VRML" : "MPEG4"));
-		if (!in_list) fprintf(sdump->trace, "NULL");
+		if (!in_list) gf_fprintf(sdump->trace, "NULL");
 		return;
 	}
 
@@ -1429,7 +1382,7 @@
 		if (node->sgprivate->tag == TAG_MPEG4_Circle) name = "Circle2D";
 		else if (node->sgprivate->tag == TAG_MPEG4_Rectangle) name = "Rectangle2D";
 #ifndef GPAC_DISABLE_X3D
-	} else if (!sdump->X3DDump) {
+	} else {
 		if (node->sgprivate->tag == TAG_X3D_Circle2D) name = "Circle";
 		else if (node->sgprivate->tag == TAG_X3D_Rectangle2D) name = "Rectangle";
 #endif
@@ -1446,14 +1399,14 @@
 		if (!isDEF) {
 			if (!sdump->XMLDump) {
 				if (in_list) DUMP_IND(sdump);
-				fprintf(sdump->trace, "USE ");
+				gf_fprintf(sdump->trace, "USE ");
 				scene_dump_vrml_id(sdump, node);
-				if (in_list) fprintf(sdump->trace, "\n");
+				if (in_list) gf_fprintf(sdump->trace, "\n");
 			} else {
 				if (isProto) {
 					StartElement(sdump, "ProtoInstance");
 					StartAttribute(sdump, "name");
-					fprintf(sdump->trace, "%s", name);
+					gf_fprintf(sdump->trace, "%s", name);
 					EndAttribute(sdump);
 				} else {
 					StartElement(sdump, name);
@@ -1586,25 +1539,25 @@
 		if (in_list) DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
 			if (isDEF) {
-				fprintf(sdump->trace, "DEF ");
+				gf_fprintf(sdump->trace, "DEF ");
 				scene_dump_vrml_id(sdump, node);
-				fprintf(sdump->trace, " ");
+				gf_fprintf(sdump->trace, " ");
 			}
-			fprintf(sdump->trace, "%s {}\n", name);
+			gf_fprintf(sdump->trace, "%s {}\n", name);
 		} else {
 			if (isDEF) {
 				if (isProto) {
-					fprintf(sdump->trace, "<ProtoInstance name=\"%s\" DEF=\"", name);
+					gf_fprintf(sdump->trace, "<ProtoInstance name=\"%s\" DEF=\"", name);
 				} else {
-					fprintf(sdump->trace, "<%s DEF=\"", name);
+					gf_fprintf(sdump->trace, "<%s DEF=\"", name);
 				}
 				scene_dump_vrml_id(sdump, node);
-				fprintf(sdump->trace, "\"/>\n");
+				gf_fprintf(sdump->trace, "\"/>\n");
 			} else {
 				if (isProto) {
-					fprintf(sdump->trace, "<ProtoInstance name=\"%s\"/>\n", name);
+					gf_fprintf(sdump->trace, "<ProtoInstance name=\"%s\"/>\n", name);
 				} else {
-					fprintf(sdump->trace, "<%s/>\n", name);
+					gf_fprintf(sdump->trace, "<%s/>\n", name);
 				}
 			}
 		}
@@ -1615,16 +1568,16 @@
 	if (!sdump->XMLDump) {
 		if (in_list) DUMP_IND(sdump);
 		if (isDEF) {
-			fprintf(sdump->trace, "DEF ");
+			gf_fprintf(sdump->trace, "DEF ");
 			scene_dump_vrml_id(sdump, node);
-			fprintf(sdump->trace, " ");
+			gf_fprintf(sdump->trace, " ");
 		}
-		fprintf(sdump->trace, "%s {\n", name);
+		gf_fprintf(sdump->trace, "%s {\n", name);
 	} else {
 		if (isProto) {
 			StartElement(sdump, "ProtoInstance");
 			StartAttribute(sdump, "name");
-			fprintf(sdump->trace, "%s", name);
+			gf_fprintf(sdump->trace, "%s", name);
 			EndAttribute(sdump);
 		} else {
 			StartElement(sdump, name);
@@ -1667,7 +1620,7 @@
 			break;
 		}
 	}
-	if (fieldContainer) fprintf(sdump->trace, " fieldContainer=\"%s\"", fieldContainer);
+	if (fieldContainer) gf_fprintf(sdump->trace, " fieldContainer=\"%s\"", fieldContainer);
 
 	if (isScript) sub_el = 1;
 	EndElementHeader(sdump, sub_el ? 1 : 0);
@@ -1729,7 +1682,7 @@
 	sdump->indent --;
 	if (!sdump->XMLDump && !in_list) {
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "}");
+		gf_fprintf(sdump->trace, "}");
 	} else {
 		EndElement(sdump, isProto ? "ProtoInstance" : name, sub_el);
 	}
@@ -1749,13 +1702,13 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace extended=\"indices\" atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace extended=\"indices\" atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\">\n", field.name);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\">\n", field.name);
 	} else {
-		fprintf(sdump->trace, "MULTIPLEINDREPLACE ");
+		gf_fprintf(sdump->trace, "MULTIPLEINDREPLACE ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s [\n", field.name);
+		gf_fprintf(sdump->trace, ".%s [\n", field.name);
 	}
 	sdump->indent++;
 	i=0;
@@ -1764,23 +1717,23 @@
 
 		DUMP_IND(sdump);
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "<repValue position=\"%d\" ", inf->pos);
+			gf_fprintf(sdump->trace, "<repValue position=\"%d\" ", inf->pos);
 		} else {
-			fprintf(sdump->trace, "%d BY ", inf->pos);
+			gf_fprintf(sdump->trace, "%d BY ", inf->pos);
 		}
 		gf_dump_vrml_simple_field(sdump, field, com->node);
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "/>");
+			gf_fprintf(sdump->trace, "/>");
 		} else {
-			fprintf(sdump->trace, "\n");
+			gf_fprintf(sdump->trace, "\n");
 		}
 	}
 	sdump->indent--;
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "</Replace>\n");
+		gf_fprintf(sdump->trace, "</Replace>\n");
 	} else {
-		fprintf(sdump->trace, "]\n");
+		gf_fprintf(sdump->trace, "]\n");
 	}
 	return GF_OK;
 }
@@ -1794,9 +1747,9 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace extended=\"fields\" atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace extended=\"fields\" atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\">\n");
+		gf_fprintf(sdump->trace, "\">\n");
 
 		sdump->indent++;
 		i=0;
@@ -1806,23 +1759,23 @@
 
 			DUMP_IND(sdump);
 			if (gf_sg_vrml_get_sf_type(info.fieldType) != GF_SG_VRML_SFNODE) {
-				fprintf(sdump->trace, "<repField atField=\"%s\" ", info.name);
+				gf_fprintf(sdump->trace, "<repField atField=\"%s\" ", info.name);
 				gf_dump_vrml_simple_field(sdump, info, com->node);
-				fprintf(sdump->trace, "/>\n");
+				gf_fprintf(sdump->trace, "/>\n");
 			} else {
-				fprintf(sdump->trace, "<repField>");
+				gf_fprintf(sdump->trace, "<repField>");
 				gf_dump_vrml_field(sdump, com->node, info);
-				fprintf(sdump->trace, "</repField>\n");
+				gf_fprintf(sdump->trace, "</repField>\n");
 			}
 		}
 		sdump->indent--;
 
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "</Replace>\n");
+		gf_fprintf(sdump->trace, "</Replace>\n");
 	} else {
-		fprintf(sdump->trace, "MULTIPLEREPLACE ");
+		gf_fprintf(sdump->trace, "MULTIPLEREPLACE ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, " {\n");
+		gf_fprintf(sdump->trace, " {\n");
 		sdump->indent++;
 		i=0;
 		while ((inf = (GF_CommandField *) gf_list_enum(com->command_fields, &i))) {
@@ -1832,7 +1785,7 @@
 		}
 		sdump->indent--;
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "}\n");
+		gf_fprintf(sdump->trace, "}\n");
 	}
 	return GF_OK;
 }
@@ -1845,13 +1798,13 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace extended=\"globalQuant\">\n");
+		gf_fprintf(sdump->trace, "<Replace extended=\"globalQuant\">\n");
 	} else {
-		fprintf(sdump->trace, "GLOBALQP ");
+		gf_fprintf(sdump->trace, "GLOBALQP ");
 	}
 	gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-	if (sdump->XMLDump) fprintf(sdump->trace, "</Replace>\n");
-	else fprintf(sdump->trace, "\n");
+	if (sdump->XMLDump) gf_fprintf(sdump->trace, "</Replace>\n");
+	else gf_fprintf(sdump->trace, "\n");
 	return GF_OK;
 }
 
@@ -1876,23 +1829,23 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Insert atNode=\"");
+		gf_fprintf(sdump->trace, "<Insert atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" position=\"%s\">", posname);
+		gf_fprintf(sdump->trace, "\" position=\"%s\">", posname);
 	} else {
 		if (inf->pos==-1) {
-			fprintf(sdump->trace, "APPEND TO ");
+			gf_fprintf(sdump->trace, "APPEND TO ");
 		}
-		else fprintf(sdump->trace, "INSERT AT ");
+		else gf_fprintf(sdump->trace, "INSERT AT ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".children");
-		if (inf->pos!=-1) fprintf(sdump->trace, "[%d]", inf->pos);
-		fprintf(sdump->trace, " ");
+		gf_fprintf(sdump->trace, ".children");
+		if (inf->pos!=-1) gf_fprintf(sdump->trace, "[%d]", inf->pos);
+		gf_fprintf(sdump->trace, " ");
 	}
 
 	gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-	if (sdump->XMLDump) fprintf(sdump->trace, "</Insert>");
-	fprintf(sdump->trace, "\n");
+	if (sdump->XMLDump) gf_fprintf(sdump->trace, "</Insert>");
+	gf_fprintf(sdump->trace, "\n");
 	return GF_OK;
 }
 
@@ -1915,12 +1868,12 @@
 	} else {
 		DUMP_IND(sdump);
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "<Insert>\n");
+			gf_fprintf(sdump->trace, "<Insert>\n");
 		} else {
-			fprintf(sdump->trace, "INSERT ");
+			gf_fprintf(sdump->trace, "INSERT ");
 		}
 		gf_dump_vrml_route(sdump, &r, 2);
-		if (sdump->XMLDump) fprintf(sdump->trace, "</Insert>");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, "</Insert>");
 	}
 	return GF_OK;
 }
@@ -1952,33 +1905,33 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Insert atNode=\"");
+		gf_fprintf(sdump->trace, "<Insert atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"", field.name, posname);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"", field.name, posname);
 	} else {
 		if (inf->pos==-1) {
-			fprintf(sdump->trace, "APPEND TO ");
+			gf_fprintf(sdump->trace, "APPEND TO ");
 		}
-		else fprintf(sdump->trace, "INSERT AT ");
+		else gf_fprintf(sdump->trace, "INSERT AT ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s", field.name);
-		if (inf->pos!=-1) fprintf(sdump->trace, "[%d]", inf->pos);
-		fprintf(sdump->trace, " ");
+		gf_fprintf(sdump->trace, ".%s", field.name);
+		if (inf->pos!=-1) gf_fprintf(sdump->trace, "[%d]", inf->pos);
+		gf_fprintf(sdump->trace, " ");
 	}
 
 	memcpy(&sffield, &field, sizeof(GF_FieldInfo));
 	sffield.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 
 	if (field.fieldType==GF_SG_VRML_MFNODE) {
-		if (sdump->XMLDump) fprintf(sdump->trace, ">\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, ">\n");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		if (sdump->XMLDump) fprintf(sdump->trace, "</Insert>");
-		fprintf(sdump->trace, "\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, "</Insert>");
+		gf_fprintf(sdump->trace, "\n");
 	} else {
 		sffield.far_ptr = inf->field_ptr;
 		gf_dump_vrml_simple_field(sdump, sffield, com->node);
-		if (sdump->XMLDump) fprintf(sdump->trace, "/>");
-		fprintf(sdump->trace, "\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, "/>");
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return e;
 }
@@ -2007,16 +1960,16 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Delete atNode=\"");
+		gf_fprintf(sdump->trace, "<Delete atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"/>", field.name, posname);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"/>", field.name, posname);
 	} else {
-		fprintf(sdump->trace, "DELETE ");
-		if (inf->pos==-1) fprintf(sdump->trace, "%s ", posname);
+		gf_fprintf(sdump->trace, "DELETE ");
+		if (inf->pos==-1) gf_fprintf(sdump->trace, "%s ", posname);
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s", field.name);
-		if (inf->pos!=-1) fprintf(sdump->trace, "[%d]", inf->pos);
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, ".%s", field.name);
+		if (inf->pos!=-1) gf_fprintf(sdump->trace, "[%d]", inf->pos);
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return GF_OK;
 }
@@ -2027,17 +1980,17 @@
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
 		if (com->tag==GF_SG_NODE_DELETE_EX) {
-			fprintf(sdump->trace, "<Delete extended=\"deleteOrder\" atNode=\"");
+			gf_fprintf(sdump->trace, "<Delete extended=\"deleteOrder\" atNode=\"");
 		} else {
-			fprintf(sdump->trace, "<Delete atNode=\"");
+			gf_fprintf(sdump->trace, "<Delete atNode=\"");
 		}
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\"/>\n");
+		gf_fprintf(sdump->trace, "\"/>\n");
 	} else {
-		if (com->tag==GF_SG_NODE_DELETE_EX) fprintf(sdump->trace, "X");
-		fprintf(sdump->trace, "DELETE ");
+		if (com->tag==GF_SG_NODE_DELETE_EX) gf_fprintf(sdump->trace, "X");
+		gf_fprintf(sdump->trace, "DELETE ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return GF_OK;
 }
@@ -2046,13 +1999,13 @@
 {
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Delete atRoute=\"");
+		gf_fprintf(sdump->trace, "<Delete atRoute=\"");
 		scene_dump_vrml_route_id(sdump, com->RouteID, com->def_name);
-		fprintf(sdump->trace, "\"/>\n");
+		gf_fprintf(sdump->trace, "\"/>\n");
 	} else {
-		fprintf(sdump->trace, "DELETE ROUTE ");
+		gf_fprintf(sdump->trace, "DELETE ROUTE ");
 		scene_dump_vrml_route_id(sdump, com->RouteID, com->def_name);
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return GF_OK;
 }
@@ -2066,17 +2019,17 @@
 	inf = (GF_CommandField *) gf_list_get(com->command_fields, 0);
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\">");
+		gf_fprintf(sdump->trace, "\">");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		fprintf(sdump->trace, "</Replace>\n");
+		gf_fprintf(sdump->trace, "</Replace>\n");
 	} else {
-		fprintf(sdump->trace, "REPLACE ");
+		gf_fprintf(sdump->trace, "REPLACE ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, " BY ");
+		gf_fprintf(sdump->trace, " BY ");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return GF_OK;
 }
@@ -2093,29 +2046,29 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\" ", field.name);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\" ", field.name);
 	} else {
-		fprintf(sdump->trace, "REPLACE ");
+		gf_fprintf(sdump->trace, "REPLACE ");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s BY ", field.name);
+		gf_fprintf(sdump->trace, ".%s BY ", field.name);
 	}
 
 	switch (field.fieldType) {
 	case GF_SG_VRML_SFNODE:
-		if (sdump->XMLDump) fprintf(sdump->trace, ">");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, ">");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		if (sdump->XMLDump) fprintf(sdump->trace, "</Replace>");
-		else fprintf(sdump->trace, "\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, "</Replace>");
+		else gf_fprintf(sdump->trace, "\n");
 		break;
 	case GF_SG_VRML_MFNODE:
 	{
 		GF_ChildNodeItem *tmp;
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, ">");
+			gf_fprintf(sdump->trace, ">");
 		} else {
-			fprintf(sdump->trace, " [\n");
+			gf_fprintf(sdump->trace, " [\n");
 		}
 		sdump->indent++;
 		tmp = inf->node_list;
@@ -2125,7 +2078,7 @@
 		}
 		sdump->indent--;
 		if (sdump->XMLDump) {
-			fprintf(sdump->trace, "</Replace>");
+			gf_fprintf(sdump->trace, "</Replace>");
 		} else {
 			EndList(sdump, NULL);
 		}
@@ -2134,23 +2087,23 @@
 	case GF_SG_VRML_SFCOMMANDBUFFER:
 		if (sdump->XMLDump) {
 			SFCommandBuffer *cb = (SFCommandBuffer*)inf->field_ptr;
-			fprintf(sdump->trace, ">\n");
+			gf_fprintf(sdump->trace, ">\n");
 			gf_sm_dump_command_list(sdump, cb->commandList, sdump->indent+1, 0);
 			DUMP_IND(sdump);
-			fprintf(sdump->trace, "</Replace>\n");
+			gf_fprintf(sdump->trace, "</Replace>\n");
 		} else {
 			SFCommandBuffer *cb = (SFCommandBuffer*)inf->field_ptr;
-			fprintf(sdump->trace, " {\n");
+			gf_fprintf(sdump->trace, " {\n");
 			gf_sm_dump_command_list(sdump, cb->commandList, sdump->indent+1, 0);
 			DUMP_IND(sdump);
-			fprintf(sdump->trace, "}\n");
+			gf_fprintf(sdump->trace, "}\n");
 		}
 		break;
 	default:
 		field.far_ptr = inf->field_ptr;
 		gf_dump_vrml_simple_field(sdump, field, com->node);
-		if (sdump->XMLDump) fprintf(sdump->trace, "/>");
-		fprintf(sdump->trace, "\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, "/>");
+		gf_fprintf(sdump->trace, "\n");
 	}
 	return e;
 }
@@ -2183,27 +2136,27 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"", field.name, posname);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\" position=\"%s\"", field.name, posname);
 	} else {
-		fprintf(sdump->trace, "REPLACE ");
-		if (inf->pos==-1) fprintf(sdump->trace, "%s ", posname);
+		gf_fprintf(sdump->trace, "REPLACE ");
+		if (inf->pos==-1) gf_fprintf(sdump->trace, "%s ", posname);
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s", field.name);
-		if (inf->pos!=-1) fprintf(sdump->trace, "[%d]", inf->pos);
-		fprintf(sdump->trace, " BY ");
+		gf_fprintf(sdump->trace, ".%s", field.name);
+		if (inf->pos!=-1) gf_fprintf(sdump->trace, "[%d]", inf->pos);
+		gf_fprintf(sdump->trace, " BY ");
 	}
 
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
-		if (sdump->XMLDump) fprintf(sdump->trace, ">\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, ">\n");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		fprintf(sdump->trace, (sdump->XMLDump) ? "</Replace>\n" : "\n");
+		gf_fprintf(sdump->trace, (sdump->XMLDump) ? "</Replace>\n" : "\n");
 	} else {
 		field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 		field.far_ptr = inf->field_ptr;
 		gf_dump_vrml_simple_field(sdump, field, com->node);
-		fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "\n");
+		gf_fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "\n");
 	}
 	return GF_OK;
 }
@@ -2252,14 +2205,14 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace atNode=\"");
+		gf_fprintf(sdump->trace, "<Replace atNode=\"");
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, "\" atField=\"%s\"", field.name);
+		gf_fprintf(sdump->trace, "\" atField=\"%s\"", field.name);
 
 		if (toNode) {
-			fprintf(sdump->trace, " atIndexNode=\"");
+			gf_fprintf(sdump->trace, " atIndexNode=\"");
 			scene_dump_vrml_id(sdump, toNode);
-			fprintf(sdump->trace, "\" atIndexField=\"%s\"", idxField.name);
+			gf_fprintf(sdump->trace, "\" atIndexField=\"%s\"", idxField.name);
 
 			field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 		}
@@ -2277,7 +2230,7 @@
 			if (!cnode) return GF_SG_UNKNOWN_NODE;
 			gf_node_register(cnode, NULL);
 			gf_node_get_field(cnode, com->child_field, &cfield);
-			fprintf(sdump->trace, " atChildField=\"%s\"", cfield.name);
+			gf_fprintf(sdump->trace, " atChildField=\"%s\"", cfield.name);
 			gf_node_unregister(cnode, NULL);
 
 			field.fieldType = cfield.fieldType;
@@ -2289,25 +2242,25 @@
 			e = gf_node_get_field(target, com->fromFieldIndex, &idxField);
 			if (e) return e;
 
-			fprintf(sdump->trace, " fromNode=\"");
+			gf_fprintf(sdump->trace, " fromNode=\"");
 			scene_dump_vrml_id(sdump, target);
-			fprintf(sdump->trace, "\" fromField=\"%s\">\n", idxField.name);
+			gf_fprintf(sdump->trace, "\" fromField=\"%s\">\n", idxField.name);
 			return GF_OK;
 		} else {
-			if (inf->pos>=-1) fprintf(sdump->trace, " position=\"%s\"", posname);
+			if (inf->pos>=-1) gf_fprintf(sdump->trace, " position=\"%s\"", posname);
 		}
 	} else {
-		fprintf(sdump->trace, "XREPLACE ");
-		if (inf->pos==-1) fprintf(sdump->trace, "%s ", posname);
+		gf_fprintf(sdump->trace, "XREPLACE ");
+		if (inf->pos==-1) gf_fprintf(sdump->trace, "%s ", posname);
 		scene_dump_vrml_id(sdump, com->node);
-		fprintf(sdump->trace, ".%s", field.name);
+		gf_fprintf(sdump->trace, ".%s", field.name);
 		if (toNode) {
-			fprintf(sdump->trace, "[");
+			gf_fprintf(sdump->trace, "[");
 			scene_dump_vrml_id(sdump, toNode);
-			fprintf(sdump->trace, ".%s]", idxField.name);
+			gf_fprintf(sdump->trace, ".%s]", idxField.name);
 			field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
 		}
-		else if (inf->pos!=-1) fprintf(sdump->trace, "[%d]", inf->pos);
+		else if (inf->pos!=-1) gf_fprintf(sdump->trace, "[%d]", inf->pos);
 		if (com->ChildNodeTag) {
 			GF_FieldInfo cfield;
 			GF_Node *cnode;
@@ -2321,20 +2274,20 @@
 			if (!cnode) return GF_SG_UNKNOWN_NODE;
 			gf_node_register(cnode, NULL);
 			gf_node_get_field(cnode, com->child_field, &cfield);
-			fprintf(sdump->trace, ".%s", cfield.name);
+			gf_fprintf(sdump->trace, ".%s", cfield.name);
 			gf_node_unregister(cnode, NULL);
 			field.fieldType = cfield.fieldType;
 		}
-		fprintf(sdump->trace, " BY ");
+		gf_fprintf(sdump->trace, " BY ");
 	}
 
 	if (field.fieldType == GF_SG_VRML_MFNODE) {
-		if (sdump->XMLDump) fprintf(sdump->trace, ">\n");
+		if (sdump->XMLDump) gf_fprintf(sdump->trace, ">\n");
 		gf_dump_vrml_node(sdump, inf->new_node, 0, NULL);
-		fprintf(sdump->trace, (sdump->XMLDump) ? "</Replace>\n" : "\n");
+		gf_fprintf(sdump->trace, (sdump->XMLDump) ? "</Replace>\n" : "\n");
 	} else {
 		gf_dump_vrml_simple_field(sdump, field, com->node);
-		fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "\n");
+		gf_fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "\n");
 	}
 	return GF_OK;
 }
@@ -2355,16 +2308,16 @@
 
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Replace atRoute=\"");
+		gf_fprintf(sdump->trace, "<Replace atRoute=\"");
 		scene_dump_vrml_route_id(sdump, com->RouteID, (char *) name);
-		fprintf(sdump->trace, "\">\n");
+		gf_fprintf(sdump->trace, "\">\n");
 	} else {
-		fprintf(sdump->trace, "REPLACE ROUTE ");
+		gf_fprintf(sdump->trace, "REPLACE ROUTE ");
 		scene_dump_vrml_route_id(sdump, com->RouteID, (char *) name);
-		fprintf(sdump->trace, " BY ");
+		gf_fprintf(sdump->trace, " BY ");
 	}
 	gf_dump_vrml_route(sdump, &r2, 1);
-	if (sdump->XMLDump ) fprintf(sdump->trace, "</Replace>");
+	if (sdump->XMLDump ) gf_fprintf(sdump->trace, "</Replace>");
 	return GF_OK;
 }
 
@@ -2391,7 +2344,6 @@
 			strcpy(toNode, to_name);
 		} else {
 			char str[100];
-			u32 id;
 			id = gf_node_get_id(r->ToNode);
 			sprintf(str, "node_%d", id);
 			strcpy(toNode, str);
@@ -2401,25 +2353,25 @@
 		sprintf(toNode, "N%d", gf_node_get_id(r->ToNode) - 1);
 	}
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<ROUTE");
+		gf_fprintf(sdump->trace, "<ROUTE");
 		if (r->ID) {
 			StartAttribute(sdump, "DEF");
 			scene_dump_vrml_route_id(sdump, r->ID, r->name);
 			EndAttribute(sdump);
 		}
-		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", fromNode, r->FromField.name, toNode, r->ToField.name);
 	} else {
-		if (dump_type==2) fprintf(sdump->trace, "ROUTE ");
+		if (dump_type==2) gf_fprintf(sdump->trace, "ROUTE ");
 		if (r->ID) {
-			fprintf(sdump->trace, "DEF ");
+			gf_fprintf(sdump->trace, "DEF ");
 			scene_dump_vrml_route_id(sdump, r->ID, r->name);
-			fprintf(sdump->trace, " ");
+			gf_fprintf(sdump->trace, " ");
 		}
 		if (dump_type==1) {
-			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", fromNode, r->FromField.name, toNode, r->ToField.name);
 		} else {
-			if (dump_type!=2) fprintf(sdump->trace, "ROUTE ");
-			fprintf(sdump->trace, "%s.%s TO %s.%s\n", fromNode, r->FromField.name, toNode, r->ToField.name);
+			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);
 		}
 	}
 	return GF_OK;
@@ -2445,19 +2397,19 @@
 
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, proto->ExternProto.count ? "EXTERNPROTO " : "PROTO ");
-			fprintf(sdump->trace, "%s [\n", proto->Name);
+			gf_fprintf(sdump->trace, proto->ExternProto.count ? "EXTERNPROTO " : "PROTO ");
+			gf_fprintf(sdump->trace, "%s [\n", proto->Name);
 		} else {
-			fprintf(sdump->trace, "<ProtoDeclare name=\"%s\" protoID=\"%d\"", proto->Name, proto->ID);
+			gf_fprintf(sdump->trace, "<ProtoDeclare name=\"%s\" protoID=\"%d\"", proto->Name, proto->ID);
 			if (proto->ExternProto.count) {
-				fprintf(sdump->trace, " locations=\"");
+				gf_fprintf(sdump->trace, " locations=\"");
 				gf_dump_vrml_sffield(sdump, GF_SG_VRML_SFURL, &proto->ExternProto.vals[0], 0, NULL);
-				fprintf(sdump->trace, "\"");
+				gf_fprintf(sdump->trace, "\"");
 			}
-			fprintf(sdump->trace, ">\n");
+			gf_fprintf(sdump->trace, ">\n");
 		}
 
-		if (sdump->XMLDump && sdump->X3DDump) fprintf(sdump->trace, "<ProtoInterface>");
+		if (sdump->XMLDump && sdump->X3DDump) gf_fprintf(sdump->trace, "<ProtoInterface>");
 
 		sdump->indent++;
 		count = gf_list_count(proto->proto_fields);
@@ -2479,37 +2431,56 @@
 			sdump->indent++;
 			DUMP_IND(sdump);
 			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "<InterfaceCodingParameters quantCategoy=\"%s\"", SD_GetQuantCatName(pf->QP_Type));
+				const char *quant_catname = "unknown";
+#ifndef GPAC_DISABLE_BIFS
+				switch (pf->QP_Type) {
+				case QC_3DPOS: quant_catname = "position3D"; break;
+				case QC_2DPOS: quant_catname = "position2D"; break;
+				case QC_ORDER: quant_catname = "drawingOrder"; break;
+				case QC_COLOR: quant_catname = "color"; break;
+				case QC_TEXTURE_COORD: quant_catname = "textureCoordinate"; break;
+				case QC_ANGLE: quant_catname = "angle"; break;
+				case QC_SCALE: quant_catname = "scale"; break;
+				case QC_INTERPOL_KEYS: quant_catname = "keys"; break;
+				case QC_NORMALS: quant_catname = "normals"; break;
+				case QC_ROTATION: quant_catname = "rotations"; break;
+				case QC_SIZE_3D: quant_catname = "size3D"; break;
+				case QC_SIZE_2D: quant_catname = "size2D"; break;
+				case QC_LINEAR_SCALAR: quant_catname = "linear"; break;
+				case QC_COORD_INDEX:quant_catname = "coordIndex"; break;
+				}
+#endif
+				gf_fprintf(sdump->trace, "<InterfaceCodingParameters quantCategoy=\"%s\"", quant_catname);
 			} else {
-				fprintf(sdump->trace, "{QP %d", pf->QP_Type);
+				gf_fprintf(sdump->trace, "{QP %d", pf->QP_Type);
 			}
 #ifndef GPAC_DISABLE_BIFS
-			if (pf->QP_Type==QC_LINEAR_SCALAR) fprintf(sdump->trace, sdump->XMLDump ? " nbBits=\"%d\"" : " nbBits %d", pf->NumBits);
+			if (pf->QP_Type==QC_LINEAR_SCALAR) gf_fprintf(sdump->trace, sdump->XMLDump ? " nbBits=\"%d\"" : " nbBits %d", pf->NumBits);
 			if (pf->hasMinMax) {
 				switch (pf->QP_Type) {
 				case QC_LINEAR_SCALAR:
 				case QC_COORD_INDEX:
 					if (sdump->XMLDump) {
-						fprintf(sdump->trace, " intMin=\"%d\" intMax=\"%d\"", *((SFInt32 *)pf->qp_min_value), *((SFInt32 *)pf->qp_max_value));
+						gf_fprintf(sdump->trace, " intMin=\"%d\" intMax=\"%d\"", *((SFInt32 *)pf->qp_min_value), *((SFInt32 *)pf->qp_max_value));
 					} else {
-						fprintf(sdump->trace, " b {%d %d}", *((SFInt32 *)pf->qp_min_value), *((SFInt32 *)pf->qp_max_value));
+						gf_fprintf(sdump->trace, " b {%d %d}", *((SFInt32 *)pf->qp_min_value), *((SFInt32 *)pf->qp_max_value));
 					}
 					break;
 				default:
 					if (sdump->XMLDump) {
-						fprintf(sdump->trace, " floatMin=\"%g\" floatMax=\"%g\"", FIX2FLT( *((SFFloat *)pf->qp_min_value) ), FIX2FLT( *((SFFloat *)pf->qp_max_value) ));
+						gf_fprintf(sdump->trace, " floatMin=\"%g\" floatMax=\"%g\"", FIX2FLT( *((SFFloat *)pf->qp_min_value) ), FIX2FLT( *((SFFloat *)pf->qp_max_value) ));
 					} else {
-						fprintf(sdump->trace, " b {%g %g}", FIX2FLT( *((SFFloat *)pf->qp_min_value) ), FIX2FLT( *((SFFloat *)pf->qp_max_value) ) );
+						gf_fprintf(sdump->trace, " b {%g %g}", FIX2FLT( *((SFFloat *)pf->qp_min_value) ), FIX2FLT( *((SFFloat *)pf->qp_max_value) ) );
 					}
 					break;
 				}
 			}
 #endif
-			fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "}\n");
+			gf_fprintf(sdump->trace, sdump->XMLDump ? "/>\n" : "}\n");
 			sdump->indent--;
 			if (sdump->XMLDump) {
 				DUMP_IND(sdump);
-				fprintf(sdump->trace, "</field>\n");
+				gf_fprintf(sdump->trace, "</field>\n");
 			}
 
 		}
@@ -2517,24 +2488,24 @@
 		sdump->indent--;
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "]");
-		} else if (sdump->X3DDump) fprintf(sdump->trace, "</ProtoInterface>\n");
+			gf_fprintf(sdump->trace, "]");
+		} else if (sdump->X3DDump) gf_fprintf(sdump->trace, "</ProtoInterface>\n");
 
 		if (proto->ExternProto.count) {
 			if (!sdump->XMLDump) {
-				fprintf(sdump->trace, " \"");
+				gf_fprintf(sdump->trace, " \"");
 				gf_dump_vrml_sffield(sdump, GF_SG_VRML_SFURL, &proto->ExternProto.vals[0], 0, NULL);
-				fprintf(sdump->trace, "\"\n\n");
+				gf_fprintf(sdump->trace, "\"\n\n");
 			} else {
-				fprintf(sdump->trace, "</ProtoDeclare>\n");
+				gf_fprintf(sdump->trace, "</ProtoDeclare>\n");
 			}
 			continue;
 		}
-		if (!sdump->XMLDump) fprintf(sdump->trace, " {\n");
+		if (!sdump->XMLDump) gf_fprintf(sdump->trace, " {\n");
 
 		sdump->indent++;
 
-		if (sdump->XMLDump && sdump->X3DDump) fprintf(sdump->trace, "<ProtoBody>\n");
+		if (sdump->XMLDump && sdump->X3DDump) gf_fprintf(sdump->trace, "<ProtoBody>\n");
 
 		e = DumpProtos(sdump, proto->sub_graph->protos);
 		if (e) return e;
@@ -2555,7 +2526,7 @@
 			gf_dump_vrml_route(sdump, r, 0);
 		}
 
-		if (sdump->XMLDump && sdump->X3DDump) fprintf(sdump->trace, "</ProtoBody>\n");
+		if (sdump->XMLDump && sdump->X3DDump) gf_fprintf(sdump->trace, "</ProtoBody>\n");
 
 		/*restore namespace*/
 		sdump->sg = prev_sg;
@@ -2563,9 +2534,9 @@
 		sdump->indent--;
 		DUMP_IND(sdump);
 		if (!sdump->XMLDump) {
-			fprintf(sdump->trace, "}\n");
+			gf_fprintf(sdump->trace, "}\n");
 		} else {
-			fprintf(sdump->trace, "</ProtoDeclare>\n");
+			gf_fprintf(sdump->trace, "</ProtoDeclare>\n");
 		}
 	}
 	sdump->current_proto = prev_proto;
@@ -2585,7 +2556,7 @@
 		if (!sdump->X3DDump) StartElement(sdump, "Scene");
 		if (!sdump->X3DDump && com->use_names) {
 			StartAttribute(sdump, "USENAMES");
-			fprintf(sdump->trace, "%s", com->use_names ? "true" : "false");
+			gf_fprintf(sdump->trace, "%s", com->use_names ? "true" : "false");
 			EndAttribute(sdump);
 		}
 		if (!sdump->X3DDump) EndElementHeader(sdump, 1);
@@ -2593,12 +2564,12 @@
 	} else {
 		if (!sdump->skip_scene_replace) {
 			DUMP_IND(sdump);
-			fprintf(sdump->trace, "REPLACE SCENE BY ");
+			gf_fprintf(sdump->trace, "REPLACE SCENE BY ");
 		}
 	}
 	DumpProtos(sdump, com->new_proto_list);
 	gf_dump_vrml_node(sdump, com->node, 0, NULL);
-	if (!sdump->XMLDump) fprintf(sdump->trace, "\n\n");
+	if (!sdump->XMLDump) gf_fprintf(sdump->trace, "\n\n");
 
 	if (com->aggregated) {
 		u32 i, count;
@@ -2617,18 +2588,18 @@
 {
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "<Insert extended=\"proto\">\n");
+		gf_fprintf(sdump->trace, "<Insert extended=\"proto\">\n");
 	} else {
-		fprintf(sdump->trace, "INSERTPROTO [\n");
+		gf_fprintf(sdump->trace, "INSERTPROTO [\n");
 	}
 	sdump->indent++;
 	DumpProtos(sdump, com->new_proto_list);
 	sdump->indent--;
 	DUMP_IND(sdump);
 	if (sdump->XMLDump) {
-		fprintf(sdump->trace, "</Insert>\n");
+		gf_fprintf(sdump->trace, "</Insert>\n");
 	} else {
-		fprintf(sdump->trace, "]\n");
+		gf_fprintf(sdump->trace, "]\n");
 	}
 	return GF_OK;
 }
@@ -2663,9 +2634,9 @@
 static GF_Err DumpLSRNewScene(GF_SceneDumper *sdump, GF_Command *com)
 {
 	char *lsrns = sd_get_lsr_namespace(com->in_scene);
-	fprintf(sdump->trace, "<%sNewScene>\n", lsrns);
+	gf_fprintf(sdump->trace, "<%sNewScene>\n", lsrns);
 	gf_dump_svg_element(sdump, com->node, NULL, 0);
-	fprintf(sdump->trace, "</%sNewScene>\n", lsrns);
+	gf_fprintf(sdump->trace, "</%sNewScene>\n", lsrns);
 	return GF_OK;
 }
 
@@ -2680,9 +2651,9 @@
 
 	DUMP_IND(sdump);
 
-	fprintf(sdump->trace, "<%s%s ref=\"%s\" ", lsrns, com_name, lsr_format_node_id(com->node, com->RouteID, szID));
+	gf_fprintf(sdump->trace, "<%s%s ref=\"%s\" ", lsrns, com_name, lsr_format_node_id(com->node, com->RouteID, szID));
 	f = (GF_CommandField *) gf_list_get(com->command_fields, 0);
-	if (f && (f->pos>=0) ) fprintf(sdump->trace, "index=\"%d\" ", f->pos);
+	if (f && (f->pos>=0) ) gf_fprintf(sdump->trace, "index=\"%d\" ", f->pos);
 	if (f) {
 		GF_FieldInfo info;
 		if (!f->new_node && !f->node_list) {
@@ -2693,7 +2664,7 @@
 			else if (f->fieldIndex==(u32) -1) att_name = "textContent";
 			else att_name = (char*) gf_svg_get_attribute_name(com->node, f->fieldIndex);
 
-			fprintf(sdump->trace, "attributeName=\"%s\" ", att_name);
+			gf_fprintf(sdump->trace, "attributeName=\"%s\" ", att_name);
 			if (f->field_ptr) {
 				char *att;
 				info.far_ptr = f->field_ptr;
@@ -2706,32 +2677,31 @@
 				} else {
 					att = gf_svg_dump_attribute(com->node, &info);
 				}
-				fprintf(sdump->trace, "value=\"%s\" ", att ? att : "");
+				gf_fprintf(sdump->trace, "value=\"%s\" ", att ? att : "");
 				if (att) gf_free(att);
 			}
 
 			if (com->fromNodeID) {
 				GF_FieldInfo op_info;
 				GF_Node *op = gf_sg_find_node(sdump->sg, com->fromNodeID);
-				fprintf(sdump->trace, "operandElementId=\"%s\" ", lsr_format_node_id(op, com->RouteID, szID));
+				gf_fprintf(sdump->trace, "operandElementId=\"%s\" ", lsr_format_node_id(op, com->RouteID, szID));
 				gf_node_get_field(op, com->fromFieldIndex, &op_info);
-				fprintf(sdump->trace, "operandAttributeName=\"%s\" ", op_info.name);
+				gf_fprintf(sdump->trace, "operandAttributeName=\"%s\" ", op_info.name);
 			}
-		}
-		if (!f->new_node && !f->node_list) {
-			fprintf(sdump->trace, "/>\n");
+
+			gf_fprintf(sdump->trace, "/>\n");
 			return GF_OK;
 		}
 		if (f->new_node && f->new_node->sgprivate->tag==TAG_DOMText) is_text = 1;
 		/*if fieldIndex (eg attributeName) is set, this is children replacement*/
 		if (f->fieldIndex>0)
-			fprintf(sdump->trace, "attributeName=\"children\" ");
+			gf_fprintf(sdump->trace, "attributeName=\"children\" ");
 	}
 
 
-	fprintf(sdump->trace, ">");
+	gf_fprintf(sdump->trace, ">");
 	if (!is_text) {
-		fprintf(sdump->trace, "\n");
+		gf_fprintf(sdump->trace, "\n");
 		sdump->indent++;
 	}
 	if (f) {
@@ -2745,25 +2715,24 @@
 			}
 		}
 	}
-	sdump->indent--;
-	if (!is_text) DUMP_IND(sdump);
-	fprintf(sdump->trace, "</%s%s>\n", lsrns, com_name);
-	return GF_OK;
-}
-static GF_Err DumpLSRClean(GF_SceneDumper *sdump, GF_Command *com)
-{
+	if (!is_text) {
+		sdump->indent--;
+		DUMP_IND(sdump);
+	}
+	gf_fprintf(sdump->trace, "</%s%s>\n", lsrns, com_name);
 	return GF_OK;
 }
+
 static GF_Err DumpLSRDelete(GF_SceneDumper *sdump, GF_Command *com)
 {
 	char szID[1024];
 	GF_CommandField *f;
 	char *lsrns = sd_get_lsr_namespace(com->in_scene);
 	DUMP_IND(sdump);
-	fprintf(sdump->trace, "<%sDelete ref=\"%s\" ", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
+	gf_fprintf(sdump->trace, "<%sDelete ref=\"%s\" ", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
 	f = (GF_CommandField *) gf_list_get(com->command_fields, 0);
-	if (f && (f->pos>=0) ) fprintf(sdump->trace, "index=\"%d\" ", f->pos);
-	fprintf(sdump->trace, "/>\n");
+	if (f && (f->pos>=0) ) gf_fprintf(sdump->trace, "index=\"%d\" ", f->pos);
+	gf_fprintf(sdump->trace, "/>\n");
 	return GF_OK;
 }
 #ifdef GPAC_UNUSED_FUNC
@@ -2777,7 +2746,11 @@
 	if (sdump) sdump->sg = sg;
 	return GF_OK;
 }
-#endif /*GPAC_UNUSED_FUNC*/
+
+static GF_Err DumpLSRClean(GF_SceneDumper *sdump, GF_Command *com)
+{
+	return GF_OK;
+}
 
 static GF_Err DumpLSRRestore(GF_SceneDumper *sdump, GF_Command *com)
 {
@@ -2787,17 +2760,19 @@
 {
 	return GF_OK;
 }
+#endif /*GPAC_UNUSED_FUNC*/
+
 static GF_Err DumpLSRSendEvent(GF_SceneDumper *sdump, GF_Command *com)
 {
 	char szID[1024];
 	char *lsrns = sd_get_lsr_namespace(com->in_scene);
 	DUMP_IND(sdump);
-	fprintf(sdump->trace, "<%sSendEvent ref=\"%s\" event=\"%s\"", lsrns,
+	gf_fprintf(sdump->trace, "<%sSendEvent ref=\"%s\" event=\"%s\"", lsrns,
 	        lsr_format_node_id(com->node, com->RouteID, szID),
 	        gf_dom_event_get_name(com->send_event_name)
 	       );
 	if (com->send_event_name <= GF_EVENT_MOUSEWHEEL)
-		fprintf(sdump->trace, " pointvalue=\"%g %g\"", FIX2FLT(com->send_event_x), FIX2FLT(com->send_event_y) );
+		gf_fprintf(sdump->trace, " pointvalue=\"%g %g\"", FIX2FLT(com->send_event_x), FIX2FLT(com->send_event_y) );
 
 	switch (com->send_event_name) {
 	case GF_EVENT_KEYDOWN:
@@ -2805,18 +2780,18 @@
 	case GF_EVENT_REPEAT_KEY:
 	case GF_EVENT_SHORT_ACCESSKEY:
 		if (com->send_event_integer) {
-			fprintf(sdump->trace, " stringvalue=\"%s\"", gf_dom_get_key_name(com->send_event_integer) );
+			gf_fprintf(sdump->trace, " stringvalue=\"%s\"", gf_dom_get_key_name(com->send_event_integer) );
 			break;
 		}
 	default:
 		if (com->send_event_integer)
-			fprintf(sdump->trace, " intvalue=\"%d\"", com->send_event_integer);
+			gf_fprintf(sdump->trace, " intvalue=\"%d\"", com->send_event_integer);
 		if (com->send_event_string)
-			fprintf(sdump->trace, " stringvalue=\"%s\"", com->send_event_string);
+			gf_fprintf(sdump->trace, " stringvalue=\"%s\"", com->send_event_string);
 		break;
 	}
 
-	fprintf(sdump->trace, "/>\n");
+	gf_fprintf(sdump->trace, "/>\n");
 	return GF_OK;
 }
 static GF_Err DumpLSRActivate(GF_SceneDumper *sdump, GF_Command *com)
@@ -2825,9 +2800,9 @@
 	char *lsrns = sd_get_lsr_namespace(com->in_scene);
 	DUMP_IND(sdump);
 	if (com->tag==GF_SG_LSR_ACTIVATE) {
-		fprintf(sdump->trace, "<%sActivate ref=\"%s\" />\n", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
+		gf_fprintf(sdump->trace, "<%sActivate ref=\"%s\" />\n", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
 	} else {
-		fprintf(sdump->trace, "<%sDeactivate ref=\"%s\" />\n", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
+		gf_fprintf(sdump->trace, "<%sDeactivate ref=\"%s\" />\n", lsrns, lsr_format_node_id(com->node, com->RouteID, szID));
 	}
 	return GF_OK;
 }
@@ -2839,8 +2814,11 @@
 {
 	GF_Err e;
 	u32 i, count;
-	u32 prev_ind, remain;
-	Bool prev_skip, has_scene_replace;
+	u32 prev_ind;
+#ifndef GPAC_DISABLE_VRML
+	u32 remain = 0, has_scene_replace = 0;
+#endif
+	Bool prev_skip;
 
 	if (!sdump || !sdump->trace|| !comList || !sdump->sg) return GF_BAD_PARAM;
 
@@ -2848,15 +2826,17 @@
 	sdump->skip_scene_replace = skip_first_replace;
 	prev_ind  = sdump->indent;
 	sdump->indent = indent;
-	has_scene_replace = 0;
-
 
-	remain = 0;
 	e = GF_OK;
 	count = gf_list_count(comList);
 	for (i=0; i<count; i++) {
 		GF_Command *com = (GF_Command *) gf_list_get(comList, i);
-		if (i && !remain && (sdump->X3DDump || (sdump->dump_mode==GF_SM_DUMP_VRML))) {
+		if (i
+#ifndef GPAC_DISABLE_VRML
+			&& !remain
+#endif
+			&& (sdump->X3DDump || (sdump->dump_mode==GF_SM_DUMP_VRML))
+		) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[Scene Dump] MPEG-4 Commands found, not supported in %s - skipping\n", sdump->X3DDump ? "X3D" : "VRML"));
 			break;
 		}
@@ -2870,7 +2850,7 @@
 				EndElement(sdump, "Replace", 1);
 			} else {
 				DUMP_IND(sdump);
-				fprintf(sdump->trace, "\nAT 0 {\n");
+				gf_fprintf(sdump->trace, "\nAT 0 {\n");
 				sdump->indent++;
 			}
 		}
@@ -2931,29 +2911,29 @@
 		case GF_SG_PROTO_DELETE_ALL:
 			DUMP_IND(sdump);
 			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "<Delete extended=\"allProtos\"/>\n");
+				gf_fprintf(sdump->trace, "<Delete extended=\"allProtos\"/>\n");
 			} else {
-				fprintf(sdump->trace, "DELETEPROTO ALL\n");
+				gf_fprintf(sdump->trace, "DELETEPROTO ALL\n");
 			}
 			e = GF_OK;
 			break;
 		case GF_SG_PROTO_DELETE:
 		{
-			u32 i;
+			u32 j;
 			DUMP_IND(sdump);
 			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "<Delete extended=\"protos\" value=\"");
+				gf_fprintf(sdump->trace, "<Delete extended=\"protos\" value=\"");
 			} else {
-				fprintf(sdump->trace, "DELETEPROTO [");
+				gf_fprintf(sdump->trace, "DELETEPROTO [");
 			}
-			for (i=0; i<com->del_proto_list_size; i++) {
-				if (i) fprintf(sdump->trace, " ");
-				fprintf(sdump->trace, "%d", com->del_proto_list[i]);
+			for (j=0; j<com->del_proto_list_size; j++) {
+				if (j) gf_fprintf(sdump->trace, " ");
+				gf_fprintf(sdump->trace, "%d", com->del_proto_list[j]);
 			}
 			if (sdump->XMLDump) {
-				fprintf(sdump->trace, "\"/>\n");
+				gf_fprintf(sdump->trace, "\"/>\n");
 			} else {
-				fprintf(sdump->trace, "]\n");
+				gf_fprintf(sdump->trace, "]\n");
 			}
 			e = GF_OK;
 		}
@@ -2983,7 +2963,7 @@
 			e = DumpLSRAddReplaceInsert(sdump, com);
 			break;
 		case GF_SG_LSR_CLEAN:
-			e = DumpLSRClean(sdump, com);
+			//e = DumpLSRClean(sdump, com);
 			break;
 		case GF_SG_LSR_REPLACE:
 			e = DumpLSRAddReplaceInsert(sdump, com);
@@ -2995,10 +2975,10 @@
 			e = DumpLSRAddReplaceInsert(sdump, com);
 			break;
 		case GF_SG_LSR_RESTORE:
-			e = DumpLSRRestore(sdump, com);
+			//e = DumpLSRRestore(sdump, com);
 			break;
 		case GF_SG_LSR_SAVE:
-			e = DumpLSRSave(sdump, com);
+			//e = DumpLSRSave(sdump, com);
 			break;
 		case GF_SG_LSR_SEND_EVENT:
 			e = DumpLSRSendEvent(sdump, com);
@@ -3012,21 +2992,28 @@
 		if (e) break;
 
 
-		if (!has_scene_replace && sdump->skip_scene_replace) {
+		if (sdump->skip_scene_replace
+#ifndef GPAC_DISABLE_VRML
+			&& !has_scene_replace
+#endif
+		) {
 			sdump->skip_scene_replace = 0;
 			if (!sdump->XMLDump && (i+1<count)) {
 				DUMP_IND(sdump);
-				fprintf(sdump->trace, "\nAT 0 {\n");
+				gf_fprintf(sdump->trace, "\nAT 0 {\n");
 				sdump->indent++;
 			}
 		}
 	}
 
+#ifndef GPAC_DISABLE_VRML
 	if (remain && !sdump->XMLDump) {
 		sdump->indent--;
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "}\n");
+		gf_fprintf(sdump->trace, "}\n");
 	}
+#endif
+
 	if (has_scene_replace && sdump->XMLDump) {
 		sdump->indent--;
 		if (!sdump->X3DDump) {
@@ -3045,7 +3032,7 @@
 void gf_dump_svg_element(GF_SceneDumper *sdump, GF_Node *n, GF_Node *parent, Bool is_root)
 {
 	GF_ChildNodeItem *list;
-	char attName[100], *attValue, attID[100];
+	char attName[100], *attValue;
 	u32 nID;
 	SVG_Element *svg = (SVG_Element *)n;
 	GF_FieldInfo info;
@@ -3059,7 +3046,7 @@
 	if (!nID) {
 		switch (tag) {
 		case TAG_SVG_listener:
-			if (0 && gf_node_get_attribute_by_tag(n, TAG_XMLEV_ATT_handler, 0, 0, &info)==GF_OK) {
+			if ((0) && gf_node_get_attribute_by_tag(n, TAG_XMLEV_ATT_handler, 0, 0, &info)==GF_OK) {
 				if (((XMLRI*)info.far_ptr)->target && !gf_node_get_id(((XMLRI*)info.far_ptr)->target) )
 					return;
 			}
@@ -3073,12 +3060,13 @@
 		{
 			GF_DOMText *txt = (GF_DOMText *)n;
 			if (txt->textContent) {
-				if ((txt->type==GF_DOM_TEXT_CDATA) ||
-				        (parent->sgprivate->tag == TAG_SVG_script) ||
-				        (parent->sgprivate->tag == TAG_SVG_handler)) {
-					fprintf(sdump->trace, "<![CDATA[");
-					fprintf(sdump->trace, "%s", txt->textContent);
-					fprintf(sdump->trace, "]]>");
+				if ((txt->type==GF_DOM_TEXT_CDATA)
+					|| (parent && (parent->sgprivate->tag == TAG_SVG_script))
+					|| (parent && (parent->sgprivate->tag == TAG_SVG_handler))
+				) {
+					gf_fprintf(sdump->trace, "<![CDATA[");
+					gf_fprintf(sdump->trace, "%s", txt->textContent);
+					gf_fprintf(sdump->trace, "]]>");
 				} else if (txt->type==GF_DOM_TEXT_REGULAR) {
 					scene_dump_utf_string(sdump, 0, txt->textContent);
 				}
@@ -3095,11 +3083,13 @@
 	/*register all namespaces specified on this element */
 	gf_xml_push_namespaces((GF_DOMNode *)n);
 
-	fprintf(sdump->trace, "<%s", gf_node_get_class_name(n));
+	gf_fprintf(sdump->trace, "<%s", gf_node_get_class_name(n));
 	ns = gf_xml_get_element_namespace(n);
 
-	if (nID) fprintf(sdump->trace, " id=\"%s\"", lsr_format_node_id(n, 0, attID));
-
+	if (nID) {
+		char attID[100];
+		gf_fprintf(sdump->trace, " id=\"%s\"", lsr_format_node_id(n, 0, attID));
+	}
 	att = svg->attributes;
 	while (att) {
 		if (att->data_type==SVG_ID_datatype) {
@@ -3133,11 +3123,11 @@
 				}
 			}
 			else if (xlink->type==XMLRI_STREAMID) {
-				fprintf(sdump->trace, " %s=\"#stream%d\"", info.name, xlink->lsr_stream_id);
+				gf_fprintf(sdump->trace, " %s=\"#stream%d\"", info.name, xlink->lsr_stream_id);
 				att = att->next;
 				continue;
 			} else {
-				fprintf(sdump->trace, " %s=\"%s\"", info.name, xlink->string);
+				gf_fprintf(sdump->trace, " %s=\"%s\"", info.name, xlink->string);
 				att = att->next;
 				continue;
 			}
@@ -3146,18 +3136,17 @@
 		attValue = gf_svg_dump_attribute((GF_Node*)svg, &info);
 		if (attValue) {
 			if (/*strcmp(info.name, "xmlns") &&*/ (info.fieldType = (u32) strlen(attValue)))
-				fprintf(sdump->trace, " %s=\"%s\"", info.name, attValue);
+				gf_fprintf(sdump->trace, " %s=\"%s\"", info.name, attValue);
 			gf_free(attValue);
 		}
-		fflush(sdump->trace);
 		att = att->next;
 	}
 
 	gf_dom_event_dump_listeners(n, sdump->trace);
 	if (svg->children) {
-		fprintf(sdump->trace, ">");
+		gf_fprintf(sdump->trace, ">");
 	} else {
-		fprintf(sdump->trace, "/>");
+		gf_fprintf(sdump->trace, "/>");
 		return;
 	}
 
@@ -3166,15 +3155,15 @@
 		sdump->indent++;
 		if (up && (up->sgprivate->tag==TAG_DOMUpdates)) {
 			if (gf_list_count(up->updates)) {
-				fprintf(sdump->trace, "\n");
+				gf_fprintf(sdump->trace, "\n");
 				gf_sm_dump_command_list(sdump, up->updates, sdump->indent, 0);
 			} else if (up->data) {
-				fprintf(sdump->trace, "\n");
+				gf_fprintf(sdump->trace, "\n");
 			}
 		}
 		sdump->indent--;
 		DUMP_IND(sdump);
-		fprintf(sdump->trace, "</%s>\n", gf_node_get_class_name(n));
+		gf_fprintf(sdump->trace, "</%s>\n", gf_node_get_class_name(n));
 		return;
 	}
 
@@ -3182,14 +3171,14 @@
 	sdump->indent++;
 	list = svg->children;
 	while (list) {
-		if (!sdump->in_text) fprintf(sdump->trace, "\n");
+		if (!sdump->in_text) gf_fprintf(sdump->trace, "\n");
 		gf_dump_svg_element(sdump, list->node, n, 0);
 		list = list->next;
 	}
-	if (!sdump->in_text) fprintf(sdump->trace, "\n");
+	if (!sdump->in_text) gf_fprintf(sdump->trace, "\n");
 	sdump->indent--;
 	if (!sdump->in_text) DUMP_IND(sdump);
-	fprintf(sdump->trace, "</%s>", gf_node_get_class_name(n));
+	gf_fprintf(sdump->trace, "</%s>", gf_node_get_class_name(n));
 	if (tag==TAG_SVG_text || tag==TAG_SVG_textArea) sdump->in_text = 0;
 	/*removes all namespaces specified on this element */
 	gf_xml_pop_namespaces((GF_DOMNode *)n);
@@ -3198,10 +3187,10 @@
 
 static void gf_sm_dump_saf_hdr(GF_SceneDumper *dumper, char *unit_name, u64 au_time, Bool is_rap)
 {
-	fprintf(dumper->trace, "<saf:%s", unit_name);
-	if (au_time) fprintf(dumper->trace, " time=\""LLD"\"", LLD_CAST au_time);
-	if (is_rap) fprintf(dumper->trace, " rap=\"true\"");
-	fprintf(dumper->trace, ">\n");
+	gf_fprintf(dumper->trace, "<saf:%s", unit_name);
+	if (au_time) gf_fprintf(dumper->trace, " time=\""LLD"\"", au_time);
+	if (is_rap) gf_fprintf(dumper->trace, " rap=\"true\"");
+	gf_fprintf(dumper->trace, ">\n");
 }
 
 static void dump_od_to_saf(GF_SceneDumper *dumper, GF_AUContext *au, u32 indent)
@@ -3221,9 +3210,9 @@
 			GF_MuxInfo *mux;
 			if (!esd) {
 				if (od->URLString) {
-					fprintf(dumper->trace, "<saf:RemoteStreamHeader streamID=\"stream%d\" url=\"%s\"", au->owner->ESID, od->URLString);
-					if (au->timing) fprintf(dumper->trace, " time=\""LLD"\"", LLD_CAST au->timing);
-					fprintf(dumper->trace, "/>\n");
+					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);
+					gf_fprintf(dumper->trace, "/>\n");
 				}
 				continue;
 			}
@@ -3231,18 +3220,19 @@
 			if (!mux || (mux->tag!=GF_ODF_MUXINFO_TAG)) mux = NULL;
 
 
-			fprintf(dumper->trace, "<saf:mediaHeader streamID=\"stream%d\"", esd->ESID);
-			fprintf(dumper->trace, " streamType=\"%d\" objectTypeIndication=\"%d\" timeStampResolution=\"%d\"", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication, au->owner->timeScale);
-			if (au->timing) fprintf(dumper->trace, " time=\""LLD"\"", LLD_CAST au->timing);
-			if (mux && mux->file_name) fprintf(dumper->trace, " source=\"%s\"", mux->file_name);
-			fprintf(dumper->trace, "/>\n");
+			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 (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");
 		}
 
 
 	}
-	fprintf(dumper->trace, "</saf:mediaUnit>\n");
+	gf_fprintf(dumper->trace, "</saf:mediaUnit>\n");
 }
 
+#ifndef GPAC_DISABLE_SVG
 static GF_Err SD_DumpDOMElement(GF_SceneDumper *sdump, GF_DOMFullNode *node)
 {
 	const char *ns;
@@ -3253,24 +3243,24 @@
 	ns = gf_sg_get_namespace_qname(node->sgprivate->scenegraph, node->ns);
 
 	DUMP_IND(sdump);
-	if (ns) fprintf(sdump->trace, "<%s:%s", ns, node->name);
-	else fprintf(sdump->trace, "<%s", node->name);
+	if (ns) gf_fprintf(sdump->trace, "<%s:%s", ns, node->name);
+	else gf_fprintf(sdump->trace, "<%s", node->name);
 	att = (GF_DOMFullAttribute *)node->attributes;
 	while (att) {
-		fprintf(sdump->trace, " %s=\"%s\"", att->name, (char *) att->data);
+		gf_fprintf(sdump->trace, " %s=\"%s\"", att->name, (char *) att->data);
 		att = (GF_DOMFullAttribute *)att->next;
 	}
 	if (!node->children) {
-		fprintf(sdump->trace, "/>\n");
+		gf_fprintf(sdump->trace, "/>\n");
 		return GF_OK;
 	}
-	fprintf(sdump->trace, ">");
+	gf_fprintf(sdump->trace, ">");
 	sdump->indent++;
 	child = node->children;
 	while (child) {
 		switch(child->node->sgprivate->tag) {
 		case TAG_DOMFullNode:
-			if (!child_type) fprintf(sdump->trace, "\n");
+			if (!child_type) gf_fprintf(sdump->trace, "\n");
 			child_type = 1;
 			SD_DumpDOMElement(sdump, (GF_DOMFullNode*)child->node);
 			break;
@@ -3280,9 +3270,9 @@
 			if (txt->type==GF_DOM_TEXT_REGULAR) {
 				scene_dump_utf_string(sdump, 0, txt->textContent);
 			} else if (txt->type==GF_DOM_TEXT_CDATA) {
-				fprintf(sdump->trace, "<![CDATA[");
-				fprintf(sdump->trace, "%s", txt->textContent);
-				fprintf(sdump->trace, "]]>");
+				gf_fprintf(sdump->trace, "<![CDATA[");
+				gf_fprintf(sdump->trace, "%s", txt->textContent);
+				gf_fprintf(sdump->trace, "]]>");
 			}
 			break;
 		}
@@ -3294,21 +3284,19 @@
 		DUMP_IND(sdump);
 	}
 
-	if (ns) fprintf(sdump->trace, "</%s:%s>\n", ns, node->name);
-	else fprintf(sdump->trace, "</%s>\n", node->name);
+	if (ns) gf_fprintf(sdump->trace, "</%s:%s>\n", ns, node->name);
+	else gf_fprintf(sdump->trace, "</%s>\n", node->name);
 
 	return GF_OK;
 }
-
+#endif
 
 GF_EXPORT
 GF_Err gf_sm_dump_graph(GF_SceneDumper *sdump, Bool skip_proto, Bool skip_routes)
 {
 	u32 tag;
-	GF_Err e = GF_OK;
 	if (!sdump->trace || !sdump->sg || !sdump->sg->RootNode) return GF_BAD_PARAM;
 
-
 	tag = sdump->sg->RootNode->sgprivate->tag;
 
 	if (tag<=GF_NODE_RANGE_LAST_X3D) {
@@ -3319,8 +3307,9 @@
 			EndElementHeader(sdump, 1);
 			sdump->indent++;
 		}
-#ifndef GPAC_DISABLE_VRML
 
+#ifndef GPAC_DISABLE_VRML
+		GF_Err e;
 		if (!skip_proto) {
 			e = DumpProtos(sdump, sdump->sg->protos);
 			if (e) return e;
@@ -3335,7 +3324,7 @@
 		} else {
 			gf_dump_vrml_node(sdump, sdump->sg->RootNode, 0, NULL);
 		}
-		if (!sdump->XMLDump) fprintf(sdump->trace, "\n\n");
+		if (!sdump->XMLDump) gf_fprintf(sdump->trace, "\n\n");
 		if (!skip_routes) {
 			GF_Route *r;
 			u32 i=0;
@@ -3473,7 +3462,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 	if (dumper->dump_mode==GF_SM_DUMP_SVG) {
-		GF_AUContext *au = (GF_AUContext*)gf_list_get(sample_list, 0);
+		au = (GF_AUContext*)gf_list_get(sample_list, 0);
 		GF_Command *com = NULL;
 		if (au) com = (GF_Command*)gf_list_get(au->commands, 0);
 		if (!au) {
@@ -3494,18 +3483,18 @@
 	first_par = 0;
 
 	while (gf_list_count(sample_list)) {
-		GF_AUContext *au = (GF_AUContext*)gf_list_get(sample_list, 0);
+		au = (GF_AUContext*)gf_list_get(sample_list, 0);
 		gf_list_rem(sample_list, 0);
 
 		if (!dumper->XMLDump) {
 
 			if (!first_bifs || (au->owner->streamType != GF_STREAM_SCENE) ) {
-				if (au->flags & GF_SM_AU_RAP) fprintf(dumper->trace, "RAP ");
-				fprintf(dumper->trace, "AT "LLD" ", LLD_CAST au->timing);
+				if (au->flags & GF_SM_AU_RAP) gf_fprintf(dumper->trace, "RAP ");
+				gf_fprintf(dumper->trace, "AT "LLD" ", au->timing);
 				if ( (au->owner->streamType==GF_STREAM_OD && num_od) || (au->owner->streamType==GF_STREAM_SCENE && num_scene)) {
-					fprintf(dumper->trace, "IN %d ", au->owner->ESID);
+					gf_fprintf(dumper->trace, "IN %d ", au->owner->ESID);
 				}
-				fprintf(dumper->trace, "{\n");
+				gf_fprintf(dumper->trace, "{\n");
 				indent++;
 			}
 
@@ -3525,11 +3514,11 @@
 			}
 			if (first_bifs) {
 				first_bifs = 0;
-				fprintf(dumper->trace, "\n");
+				gf_fprintf(dumper->trace, "\n");
 
 			} else {
 				indent--;
-				fprintf(dumper->trace, "}\n\n");
+				gf_fprintf(dumper->trace, "}\n\n");
 			}
 		}
 		else {
@@ -3544,17 +3533,17 @@
 					first_par = 1;
 					indent += 1;
 				} else {
-					fprintf(dumper->trace, " </par>\n");
+					gf_fprintf(dumper->trace, " </par>\n");
 				}
-				fprintf(dumper->trace, " <par begin=\"%g\" atES_ID=\"es%d\" isRAP=\"%s\">\n", au->timing_sec, au->owner->ESID, (au->flags & GF_SM_AU_RAP) ? "yes" : "no");
+				gf_fprintf(dumper->trace, " <par begin=\"%g\" atES_ID=\"es%d\" isRAP=\"%s\">\n", au->timing_sec, au->owner->ESID, (au->flags & GF_SM_AU_RAP) ? "yes" : "no");
 			} else if (au->timing_sec>time) {
 				if (!first_par) {
 					first_par = 1;
 					indent += 1;
 				} else {
-					fprintf(dumper->trace, " </par>\n");
+					gf_fprintf(dumper->trace, " </par>\n");
 				}
-				fprintf(dumper->trace, "<par begin=\"%g\">\n", au->timing_sec);
+				gf_fprintf(dumper->trace, "<par begin=\"%g\">\n", au->timing_sec);
 			}
 			switch (au->owner->streamType) {
 			case GF_STREAM_OD:
@@ -3576,7 +3565,7 @@
 					no_root_found = 0;
 
 					if (dumper->LSRDump)
-						fprintf(dumper->trace, "</saf:sceneUnit>\n");
+						gf_fprintf(dumper->trace, "</saf:sceneUnit>\n");
 				}
 				break;
 			}
@@ -3591,7 +3580,7 @@
 		DumpProtos(dumper, ctx->scene_graph->protos);
 		gf_dump_vrml_node(dumper, ctx->scene_graph->RootNode, 0, NULL);
 		i=0;
-		fprintf(dumper->trace, "\n");
+		gf_fprintf(dumper->trace, "\n");
 		while ((r = (GF_Route*)gf_list_enum(dumper->sg->Routes, &i))) {
 			if (r->IS_route || (r->graph!=dumper->sg)) continue;
 			e = gf_dump_vrml_route(dumper, r, 0);
@@ -3602,7 +3591,7 @@
 
 
 	/*close command*/
-	if (!dumper->X3DDump && first_par) fprintf(dumper->trace, " </par>\n");
+	if (!dumper->X3DDump && first_par) gf_fprintf(dumper->trace, " </par>\n");
 
 	if (gf_list_count(sample_list) && (dumper->X3DDump || (dumper->dump_mode==GF_SM_DUMP_VRML)) ) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[Scene Dump] MPEG-4 Commands found, not supported in %s - skipping\n", dumper->X3DDump ? "X3D" : "VRML"));

gpac-0.8.0.tar.gz/src/scene_manager/scene_engine.c -> gpac-1.0.0.tar.gz/src/scene_manager/scene_engine.c Changed

@@ -43,8 +43,6 @@
 #include <gpac/constants.h>
 #include <gpac/base_coding.h>
 
-#include <time.h>
-
 
 struct __tag_scene_engine
 {
@@ -72,7 +70,7 @@
 #ifndef GPAC_DISABLE_BIFS_ENC
 static GF_Err gf_sm_setup_bifsenc(GF_SceneEngine *seng, GF_StreamContext *sc, GF_ESD *esd)
 {
-	char *data;
+	u8 *data;
 	u32 data_len;
 	u32	nbb;
 	Bool encode_names, delete_bcfg;
@@ -147,7 +145,7 @@
 #ifndef GPAC_DISABLE_LASER
 static GF_Err gf_sm_setup_lsrenc(GF_SceneEngine *seng, GF_StreamContext *sc, GF_ESD *esd)
 {
-	char *data;
+	u8 *data;
 	u32 data_len;
 	GF_LASERConfig lsr_cfg;
 
@@ -212,7 +210,7 @@
 			esd->decoderConfig->decoderSpecificInfo = NULL;
 			esd->ESID = sc->ESID;
 			esd->decoderConfig->streamType = GF_STREAM_SCENE;
-			esd->decoderConfig->objectTypeIndication = sc->objectType;
+			esd->decoderConfig->objectTypeIndication = sc->codec_id;
 			gf_list_add(iod->ESDescriptors, esd);
 
 			if (!sc->timeScale) sc->timeScale = 1000;
@@ -237,20 +235,20 @@
 
 
 		if (sc->streamType == GF_STREAM_SCENE) {
-			switch (sc->objectType) {
+			switch (sc->codec_id) {
 #ifndef GPAC_DISABLE_BIFS_ENC
-			case GPAC_OTI_SCENE_BIFS:
-			case GPAC_OTI_SCENE_BIFS_V2:
+			case GF_CODECID_BIFS:
+			case GF_CODECID_BIFS_V2:
 				e = gf_sm_setup_bifsenc(seng, sc, esd);
 				break;
 #endif
 
 #ifndef GPAC_DISABLE_LASER
-			case GPAC_OTI_SCENE_LASER:
+			case GF_CODECID_LASER:
 				e = gf_sm_setup_lsrenc(seng, sc, esd);
 				break;
 #endif
-			case GPAC_OTI_SCENE_DIMS:
+			case GF_CODECID_DIMS:
 				/* Nothing to be done here */
 				break;
 			default:
@@ -286,25 +284,24 @@
 /* Set to 1 if you want every dump with a timed file name */
 //#define DUMP_DIMS_LOG_WITH_TIME
 
-static GF_Err gf_seng_encode_dims_au(GF_SceneEngine *seng, u16 ESID, GF_List *commands, char **data, u32 *size)
+static GF_Err gf_seng_encode_dims_au(GF_SceneEngine *seng, u16 ESID, GF_List *commands, u8 **data, u32 *size, Bool compress_dims)
 {
 #ifndef GPAC_DISABLE_SCENE_DUMP
 	GF_SceneDumper *dumper = NULL;
 #endif
 	GF_Err e;
 	char rad_name[4096];
-	char file_name[4096];
-	FILE *file = NULL;
-	u64 fsize;
-	char *buffer = NULL;
+	char file_name[4096+100];
+	u32 fsize;
+	u8 *buffer = NULL;
 	GF_BitStream *bs = NULL;
 	u8 dims_header;
-	Bool compress_dims;
 #ifdef DUMP_DIMS_LOG_WITH_TIME
 	u32 do_dump_with_time = 1;
 #endif
 	u32 buffer_len;
-	char *cache_dir, *dump_name;
+	const char *cache_dir;
+	char *dump_name;
 
 	if (!data) return GF_BAD_PARAM;
 
@@ -312,7 +309,6 @@
 	else cache_dir = seng->dump_path;
 
 	dump_name = "gpac_scene_engine_dump";
-	compress_dims = 1;
 
 #ifdef DUMP_DIMS_LOG_WITH_TIME
 start:
@@ -351,6 +347,7 @@
 	}
 	gf_sm_dumper_del(dumper);
 
+#if 0 //unused
 	if(seng->dump_rap) {
 		GF_SceneDumper *dumper = NULL;
 
@@ -365,6 +362,7 @@
 		e = gf_sm_dump_graph(dumper, 0, 0);
 		gf_sm_dumper_del(dumper);
 	}
+#endif
 
 	if (e) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot dump DIMS Commands\n"));
@@ -380,27 +378,13 @@
 #endif
 
 	sprintf(file_name, "%s.svg", rad_name);
-	file = gf_fopen(file_name, "rb");
-	if (!file) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] Cannot open SVG dump file %s\n", file_name));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-	gf_fseek(file, 0, SEEK_END);
-	fsize = gf_ftell(file);
 
-	if (fsize == 0) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[SceneEngine] SVG dump %s is empty\n", file_name));
+	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));
 		goto exit;
 	}
 
-	/* First, read the dump in a buffer */
-	buffer = gf_malloc((size_t)fsize * sizeof(char));
-	gf_fseek(file, 0, SEEK_SET);
-	fsize = fread(buffer, sizeof(char), (size_t)fsize, file);
-	gf_fclose(file);
-	file = NULL;
-
 	/* Then, set DIMS unit header - TODO: notify redundant units*/
 	if (commands && gf_list_count(commands)) {
 		dims_header = GF_DIMS_UNIT_P; /* streamer->all_non_rap_critical ? 0 : GF_DIMS_UNIT_P;*/
@@ -411,7 +395,7 @@
 
 	/* Then, if compression is asked, we do it */
 	buffer_len = (u32)fsize;
-	assert(fsize < 1<<31);
+	assert(fsize < 0x80000000);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[SceneEngine] Sending DIMS data - sizes: raw (%d)", buffer_len));
 	if (compress_dims) {
 #ifndef GPAC_DISABLE_ZLIB
@@ -420,7 +404,7 @@
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("/ compressed (%d)", buffer_len));
 		if (e) goto exit;
 #else
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: your version of GPAC was compile with no libz support. Abort."));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("Error: your version of GPAC was compiled with no libz support. Abort."));
 		e = GF_NOT_SUPPORTED;
 		goto exit;
 #endif
@@ -452,9 +436,7 @@
 	gf_bs_del(bs);
 
 exit:
-	if (!seng->dump_path) gf_free(cache_dir);
 	if (buffer) gf_free(buffer);
-	if (file) gf_fclose(file);
 	return e;
 }
 
@@ -507,7 +489,7 @@
 	}
 
 	if (!seng->first_dims_sent) {
-		if (au->owner->objectType==GPAC_OTI_SCENE_DIMS) {
+		if (au->owner->codec_id==GF_CODECID_DIMS) {
 			GF_Node *root = gf_sg_get_root_node(seng->ctx->scene_graph);
 			if (gf_node_dirty_get(root)) {
 				modified=1;
@@ -524,7 +506,7 @@
 {
 	GF_Err e;
 	u32	i, j, size, count, nb_streams;
-	char *data;
+	u8 *data;
 	GF_AUContext *au;
 
 	if (!callback) return GF_BAD_PARAM;
@@ -547,25 +529,25 @@
 
 			if (from_start && !j && !gf_sm_check_for_modif(seng, au)) continue;
 
-			switch (sc->objectType) {
+			switch (sc->codec_id) {
 #ifndef GPAC_DISABLE_BIFS_ENC
-			case GPAC_OTI_SCENE_BIFS:
-			case GPAC_OTI_SCENE_BIFS_V2:
+			case GF_CODECID_BIFS:
+			case GF_CODECID_BIFS_V2:
 				e = gf_bifs_encode_au(seng->bifsenc, sc->ESID, au->commands, &data, &size);
 				break;
 #endif
 
 #ifndef GPAC_DISABLE_LASER
-			case GPAC_OTI_SCENE_LASER:
+			case GF_CODECID_LASER:
 				e = gf_laser_encode_au(seng->lsrenc, sc->ESID, au->commands, 0, &data, &size);
 				break;
 #endif
-			case GPAC_OTI_SCENE_DIMS:
-				e = gf_seng_encode_dims_au(seng, sc->ESID, au->commands, &data, &size);
+			case GF_CODECID_DIMS:
+				e = gf_seng_encode_dims_au(seng, sc->ESID, au->commands, &data, &size, GF_TRUE);
 				break;
 
 			default:
-				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode AU for Scene OTI %x\n", sc->objectType));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode AU for Scene OTI %x\n", sc->codec_id));
 				break;
 			}
 			callback(seng->calling_object, sc->ESID, data, size, au->timing);
@@ -583,12 +565,13 @@
 	return gf_sm_aggregate(seng->ctx, ESID);
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_seng_dump_rap_on(GF_SceneEngine *seng, Bool dump_rap)
 {
 	seng->dump_rap = dump_rap;
 	return 0;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_seng_save_context(GF_SceneEngine *seng, char *ctxFileName)
@@ -604,7 +587,7 @@
 	ext = NULL;
 	if (ctxFileName) {
 		strcpy(szF, ctxFileName);
-		ext = strrchr(szF, '.');
+		ext = gf_file_ext_start(szF);
 	}
 	d_mode = GF_SM_DUMP_BT;
 	do_enc = 0;
@@ -635,6 +618,7 @@
 static GF_AUContext *gf_seng_create_new_au(GF_StreamContext *sc, u32 time)
 {
 	GF_AUContext *new_au, *last_au;
+	if (!sc) return NULL;
 	last_au = gf_list_last(sc->AUs);
 	if (last_au && last_au->timing == time) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCENE, ("[SceneEngine] Forcing new AU\n"));
@@ -661,7 +645,7 @@
 
 	/* We need to create an empty AU for the parser to correctly parse a LASeR Command without SceneUnit */
 	sc = gf_list_get(seng->ctx->streams, 0);
-	if (sc->objectType == GPAC_OTI_SCENE_DIMS) {
+	if (sc->codec_id == GF_CODECID_DIMS) {
 		gf_seng_create_new_au(sc, 0);
 	}
 
@@ -678,7 +662,7 @@
 }
 
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_seng_encode_from_commands(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, u32 time, GF_List *commands, gf_seng_callback callback)
 {
 	GF_Err e;
@@ -732,31 +716,31 @@
 	data = NULL;
 	size = 0;
 
-	switch(sc->objectType) {
+	switch(sc->codec_id) {
 #ifndef GPAC_DISABLE_BIFS_ENC
-	case GPAC_OTI_SCENE_BIFS:
-	case GPAC_OTI_SCENE_BIFS_V2:
+	case GF_CODECID_BIFS:
+	case GF_CODECID_BIFS_V2:
 		e = gf_bifs_encode_au(seng->bifsenc, ESID, new_au->commands, &data, &size);
 		break;
 #endif
 
 #ifndef GPAC_DISABLE_LASER
-	case GPAC_OTI_SCENE_LASER:
+	case GF_CODECID_LASER:
 		e = gf_laser_encode_au(seng->lsrenc, ESID, new_au->commands, 0, &data, &size);
 		break;
 #endif
-	case GPAC_OTI_SCENE_DIMS:
-		e = gf_seng_encode_dims_au(seng, ESID, new_au->commands, &data, &size);
+	case GF_CODECID_DIMS:
+		e = gf_seng_encode_dims_au(seng, ESID, new_au->commands, &data, &size, GF_TRUE);
 		break;
 	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode commands for Scene OTI %x\n", sc->objectType));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("Cannot encode commands for Scene OTI %x\n", sc->codec_id));
 		break;
 	}
 	callback(seng->calling_object, ESID, data, size, 0);
 	gf_free(data);
 	return e;
 }
-
+#endif
 GF_EXPORT
 GF_Err gf_seng_encode_from_file(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, char *auFile, gf_seng_callback callback)
 {
@@ -777,7 +761,7 @@
 	}
 	/* We need to create an empty AU for the parser to correctly parse a LASeR Command without SceneUnit */
 	sc = gf_list_get(seng->ctx->streams, 0);
-	if (sc->objectType == GPAC_OTI_SCENE_DIMS) {
+	if (sc->codec_id == GF_CODECID_DIMS) {
 		dims = 1;
 		gf_seng_create_new_au(sc, 0);
 	}
@@ -837,7 +821,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_seng_get_stream_config(GF_SceneEngine *seng, u32 idx, u16 *ESID, char ** const config, u32 *config_len, u32 *streamType, u32 *objectType, u32 *timeScale)
+GF_Err gf_seng_get_stream_config(GF_SceneEngine *seng, u32 idx, u16 *ESID, const u8 **config, u32 *config_len, u32 *streamType, u32 *codec_id, u32 *timeScale)
 {
 	GF_StreamContext *sc = gf_list_get(seng->ctx->streams, idx);
 	if (!sc || !ESID || !config || !config_len) return GF_BAD_PARAM;
@@ -845,7 +829,7 @@
 	*config = sc->dec_cfg;
 	*config_len = sc->dec_cfg_len;
 	if (streamType) *streamType = sc->streamType;
-	if (objectType) *objectType = sc->objectType;
+	if (codec_id) *codec_id = sc->codec_id;
 	if (timeScale) *timeScale = sc->timeScale;
 	return GF_OK;
 }
@@ -874,21 +858,25 @@
 
 static void seng_conditional_activate(GF_Node *node, GF_Route *route)
 {
-	GF_SceneEngine *seng = (GF_SceneEngine *) gf_node_get_private(node);
-	M_Conditional *c = (M_Conditional*)node;
-	if (c->activate) seng_exec_conditional(c, seng->sg);
+	if (node) {
+		GF_SceneEngine *seng = (GF_SceneEngine *) gf_node_get_private(node);
+		M_Conditional *c = (M_Conditional*)node;
+		if (c->activate) seng_exec_conditional(c, seng->sg);
+	}
 }
 
 static void seng_conditional_reverse_activate(GF_Node *node, GF_Route *route)
 {
-	GF_SceneEngine *seng = (GF_SceneEngine *) gf_node_get_private(node);
-	M_Conditional*c = (M_Conditional*)node;
-	if (!c->reverseActivate) seng_exec_conditional(c, seng->sg);
+	if (node) {
+		GF_SceneEngine *seng = (GF_SceneEngine *) gf_node_get_private(node);
+		M_Conditional*c = (M_Conditional*)node;
+		if (!c->reverseActivate) seng_exec_conditional(c, seng->sg);
+	}
 }
 #endif //GPAC_DISABLE_VRML
 
 
-static void gf_seng_on_node_modified(void *_seng, u32 type, GF_Node *node, void *ctxdata)
+static void gf_seng_on_node_modified(void *_seng, GF_SGNodeCbkType type, GF_Node *node, void *ctxdata)
 {
 	switch (type) {
 #ifndef GPAC_DISABLE_VRML
@@ -904,6 +892,8 @@
 	case GF_SG_CALLBACK_MODIFIED:
 		gf_node_dirty_parents(node);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -934,6 +924,15 @@
 	seng->loader.flags = GF_SM_LOAD_MPEG4_STRICT;
 	if (embed_resources) seng->loader.flags |= GF_SM_LOAD_EMBEDS_RES;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		seng_conditional_activate(NULL, NULL);
+		seng_conditional_reverse_activate(NULL, NULL);
+		gf_seng_create_new_au(NULL, 0);
+
+	}
+#endif
+
 	seng->loader.fileName = inputContext;
 	e = gf_sm_load_init(&(seng->loader));
 	if (!e) e = gf_sm_load_run(&(seng->loader));
@@ -954,7 +953,14 @@
 	return NULL;
 }
 
-GF_EXPORT
+#if 0 //unused
+/**
+\param calling_object the calling object on which call back will be called
+\param ctx an already loaded scene manager
+\param dump_path the path where scenes are dumped
+ *
+ * must be called only one time (by process calling the DLL) before other calls
+ */
 GF_SceneEngine *gf_seng_init_from_context(void *calling_object, GF_SceneManager *ctx, char *dump_path)
 {
 	GF_SceneEngine *seng;
@@ -983,8 +989,21 @@
 	gf_seng_terminate(seng);
 	return NULL;
 }
+#endif
+
+#if 0 //unused
+/**
+\param calling_object is the calling object on which call back will be called
+\param inputContext is an UTF-8 scene description (with or without IOD) in BT or XMT-A format
+\param load_type is the preferred loader type for the content (e.g. SVG vs DIMS)
+\param width width of scene if no IOD is given in the context.
+\param height height of scene if no IOD is given in the context.
+\param usePixelMetrics metrics system used in the scene, if no IOD is given in the context.
+\param dump_path the path where scenes are dumped
+ *
+ * must be called only one time (by process calling the DLL) before other calls
+ */
 
-GF_EXPORT
 GF_SceneEngine *gf_seng_init_from_string(void *calling_object, char * inputContext, u32 load_type, u32 width, u32 height, Bool usePixelMetrics, char *dump_path)
 {
 	GF_SceneEngine *seng;
@@ -1040,6 +1059,8 @@
 	gf_seng_terminate(seng);
 	return NULL;
 }
+#endif
+
 
 GF_EXPORT
 u32 gf_seng_get_stream_count(GF_SceneEngine *seng)
@@ -1070,14 +1091,14 @@
 char *gf_seng_get_base64_iod(GF_SceneEngine *seng)
 {
 	u32 size, size64;
-	char *buffer, *buf64;
+	u8 *buffer, *buf64;
 	u32 i=0;
 	GF_StreamContext*sc = NULL;
 
 	if (!seng->ctx->root_od) return NULL;
 
 	while ((sc = (GF_StreamContext*)gf_list_enum(seng->ctx->streams, &i))) {
-		if ((sc->streamType == GF_STREAM_SCENE) && (sc->objectType != GPAC_OTI_SCENE_DIMS))
+		if ((sc->streamType == GF_STREAM_SCENE) && (sc->codec_id != GF_CODECID_DIMS))
 			break;
 	}
 	if (!sc) return NULL;
@@ -1100,7 +1121,7 @@
 
 	if (!seng->ctx->root_od) return NULL;
 	while ((sc = (GF_StreamContext*)gf_list_enum(seng->ctx->streams, &i))) {
-		if ((sc->streamType == GF_STREAM_SCENE) && (sc->objectType != GPAC_OTI_SCENE_DIMS))
+		if ((sc->streamType == GF_STREAM_SCENE) && (sc->codec_id != GF_CODECID_DIMS))
 			break;
 	}
 	if (!sc) return NULL;

gpac-0.8.0.tar.gz/src/scene_manager/scene_manager.c -> gpac-1.0.0.tar.gz/src/scene_manager/scene_manager.c Changed

@@ -46,7 +46,7 @@
 }
 
 GF_EXPORT
-GF_StreamContext *gf_sm_stream_new(GF_SceneManager *ctx, u16 ES_ID, u8 streamType, u8 objectType)
+GF_StreamContext *gf_sm_stream_new(GF_SceneManager *ctx, u16 ES_ID, u8 streamType, u32 codec_id)
 {
 	u32 i;
 	GF_StreamContext *tmp;
@@ -69,7 +69,7 @@
 	tmp->AUs = gf_list_new();
 	tmp->ESID = ES_ID;
 	tmp->streamType = streamType;
-	tmp->objectType = objectType ? objectType : 1;
+	tmp->codec_id = codec_id ? codec_id : 1;
 	tmp->timeScale = 1000;
 	gf_list_add(ctx->streams, tmp);
 	return tmp;
@@ -138,14 +138,6 @@
 }
 
 GF_EXPORT
-void gf_sm_stream_del(GF_SceneManager *ctx, GF_StreamContext *sc)
-{
-	if (gf_list_del_item(ctx->streams, sc)>=0) {
-		gf_sm_delete_stream(sc);
-	}
-}
-
-GF_EXPORT
 void gf_sm_del(GF_SceneManager *ctx)
 {
 	u32 count;
@@ -159,7 +151,7 @@
 	gf_free(ctx);
 }
 
-GF_EXPORT
+#if 0 //unused
 void gf_sm_reset(GF_SceneManager *ctx)
 {
 	GF_StreamContext *sc;
@@ -170,6 +162,7 @@
 	if (ctx->root_od) gf_odf_desc_del((GF_Descriptor *) ctx->root_od);
 	ctx->root_od = NULL;
 }
+#endif
 
 GF_EXPORT
 GF_AUContext *gf_sm_stream_au_new(GF_StreamContext *stream, u64 timing, Double time_sec, Bool isRap)
@@ -188,8 +181,9 @@
 			else if (!time_sec && !timing && !tmp->timing && !tmp->timing_sec) return tmp;
 			/*insert AU*/
 			else if ((time_sec && time_sec<tmp->timing_sec) || (timing && timing<tmp->timing)) {
-				GF_SAFEALLOC(tmp, GF_AUContext);
+				tmp = gf_malloc(sizeof(GF_AUContext));
 				if (!tmp) return NULL;
+				memset(tmp, 0, sizeof(GF_AUContext));
 				tmp->commands = gf_list_new();
 				if (isRap) tmp->flags = GF_SM_AU_RAP;
 				tmp->timing = timing;
@@ -428,7 +422,7 @@
 			Bool base_stream_found = 0;
 
 			/*in DIMS we use an empty initial AU with no commands to signal the RAP*/
-			if (sc->objectType == GPAC_OTI_SCENE_DIMS) base_stream_found = 1;
+			if (sc->codec_id == GF_CODECID_DIMS) base_stream_found = 1;
 
 			/*apply all commands - this will also apply the SceneReplace*/
 			while (gf_list_count(sc->AUs)) {
@@ -528,15 +522,15 @@
 			if (base_stream_found) {
 				au = gf_sm_stream_au_new(sc, 0, 0, 1);
 
-				switch (sc->objectType) {
-				case GPAC_OTI_SCENE_BIFS:
-				case GPAC_OTI_SCENE_BIFS_V2:
+				switch (sc->codec_id) {
+				case GF_CODECID_BIFS:
+				case GF_CODECID_BIFS_V2:
 					com = gf_sg_command_new(ctx->scene_graph, GF_SG_SCENE_REPLACE);
 					break;
-				case GPAC_OTI_SCENE_LASER:
+				case GF_CODECID_LASER:
 					com = gf_sg_command_new(ctx->scene_graph, GF_SG_LSR_NEW_SCENE);
 					break;
-				case GPAC_OTI_SCENE_DIMS:
+				case GF_CODECID_DIMS:
 				/* We do not create a new command, empty AU is enough in DIMS*/
 				default:
 					com = NULL;
@@ -588,9 +582,6 @@
 
 GF_Err gf_sm_load_init_svg(GF_SceneLoader *load);
 
-GF_Err gf_sm_load_init_xbl(GF_SceneLoader *load);
-GF_Err gf_sm_load_run_xbl(GF_SceneLoader *load);
-void gf_sm_load_done_xbl(GF_SceneLoader *load);
 #endif
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
@@ -611,8 +602,10 @@
 	GF_Err e;
 	if (!load->type) e = GF_BAD_PARAM;
 	else if (load->parse_string) e = load->parse_string(load, str);
-	else e = GF_NOT_SUPPORTED;
-
+	else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scene Manager] string parsing not supported by loader\n"));
+		e = GF_NOT_SUPPORTED;
+	}
 	return e;
 }
 
@@ -622,7 +615,7 @@
 GF_Err gf_sm_load_init(GF_SceneLoader *load)
 {
 	GF_Err e = GF_NOT_SUPPORTED;
-	char *ext, szExt[50];
+	char *ext;
 	/*we need at least a scene graph*/
 	if (!load || (!load->ctx && !load->scene_graph)
 #ifndef GPAC_DISABLE_ISOM
@@ -637,17 +630,11 @@
 		} else
 #endif
 		{
-			ext = (char *)strrchr(load->fileName, '.');
+			char szExt[50];
+			ext = gf_file_ext_start(load->fileName);
 			if (!ext) return GF_NOT_SUPPORTED;
-			if (!stricmp(ext, ".gz")) {
-				char *anext;
-				ext[0] = 0;
-				anext = (char *)strrchr(load->fileName, '.');
-				ext[0] = '.';
-				ext = anext;
-			}
 			if (strlen(ext) < 2 || strlen(ext) > sizeof(szExt)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scene Manager] invalid extension in file name %s\n", load->fileName));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scene Manager] invalid extension %s in file name %s\n", ext, load->fileName));
 				return GF_NOT_SUPPORTED;
 			}
 			strcpy(szExt, &ext[1]);
@@ -663,15 +650,12 @@
 			else if (strstr(szExt, "mov")) load->type = GF_SM_LOAD_QT;
 			else if (strstr(szExt, "svg")) load->type = GF_SM_LOAD_SVG;
 			else if (strstr(szExt, "xsr")) load->type = GF_SM_LOAD_XSR;
-			else if (strstr(szExt, "xbl")) load->type = GF_SM_LOAD_XBL;
 			else if (strstr(szExt, "xml")) {
 				char *rtype = gf_xml_get_root_type(load->fileName, &e);
 				if (rtype) {
 					if (!strcmp(rtype, "SAFSession")) load->type = GF_SM_LOAD_XSR;
 					else if (!strcmp(rtype, "XMT-A")) load->type = GF_SM_LOAD_XMTA;
 					else if (!strcmp(rtype, "X3D")) load->type = GF_SM_LOAD_X3D;
-					else if (!strcmp(rtype, "bindings")) load->type = GF_SM_LOAD_XBL;
-
 					gf_free(rtype);
 				}
 			}
@@ -701,12 +685,6 @@
 	case GF_SM_LOAD_DIMS:
 		return gf_sm_load_init_svg(load);
 
-	case GF_SM_LOAD_XBL:
-		e = gf_sm_load_init_xbl(load);
-
-		load->process = gf_sm_load_run_xbl;
-		load->done = gf_sm_load_done_xbl;
-		return e;
 #endif
 
 #ifndef GPAC_DISABLE_SWF_IMPORT
@@ -742,12 +720,13 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_sm_load_suspend(GF_SceneLoader *load, Bool suspend)
 {
 	if (load->suspend) return load->suspend(load, suspend);
 	return GF_OK;
 }
+#endif
 
 #if !defined(GPAC_DISABLE_LOADER_BT) || !defined(GPAC_DISABLE_LOADER_XMT)
 #include <gpac/base_coding.h>
@@ -760,21 +739,15 @@
 
 	if (!bw->buffer.buffer) return;
 	buffer = bw->buffer.buffer;
-	if (!strnicmp(buffer, "file://", 7)) {
-		char *url = gf_url_concatenate(fileName, buffer+7);
+	if (!strnicmp(buffer, "file:", 5) ) {
+		char *url;
+		if (!strnicmp(buffer, "file://", 7)) buffer += 7;
+		else buffer += 5;
+
+		url = gf_url_concatenate(fileName, buffer);
 		if (url) {
-			FILE *f = gf_fopen(url, "rb");
-			if (f) {
-				fseek(f, 0, SEEK_END);
-				data_size = (u32) ftell(f);
-				fseek(f, 0, SEEK_SET);
-				data = gf_malloc(sizeof(char)*data_size);
-				if (data) {
-					if (fread(data, 1, data_size, f) != data_size) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scene Manager] error reading bitwrapper file %s\n", url));
-					}
-				}
-				gf_fclose(f);
+			if (gf_file_load_data(url, (u8 **) &data, &data_size) != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[Scene Manager] error reading bitwrapper file %s\n", url));
 			}
 			gf_free(url);
 		}
@@ -793,14 +766,15 @@
 				data_size = gf_base64_decode(buffer, (u32) strlen(buffer), data, data_size);
 		} else {
 			u32 i, c;
-			char s[3];
-			data_size = (u32) strlen(buffer) / 3;
+			if (!strnicmp(buffer, "0x", 2)) buffer += 2;
+			data_size = (u32) strlen(buffer) / 2;
 			data = (char*)gf_malloc(sizeof(char) * data_size);
 			if (data) {
+				char s[3];
 				s[2] = 0;
 				for (i=0; i<data_size; i++) {
-					s[0] = buffer[3*i+1];
-					s[1] = buffer[3*i+2];
+					s[0] = buffer[2*i];
+					s[1] = buffer[2*i+1];
 					sscanf(s, "%02X", &c);
 					data[i] = (unsigned char) c;
 				}

gpac-0.8.0.tar.gz/src/scene_manager/scene_stats.c -> gpac-1.0.0.tar.gz/src/scene_manager/scene_stats.c Changed

@@ -136,6 +136,8 @@
 	else ptr->nb_created += prev ? (prev->sgprivate->num_instances - 1) : 1;
 }
 
+#ifndef GPAC_DISABLE_SVG
+
 static void StatFixed(GF_SceneStatistics *stat, Fixed v, Bool scale)
 {
 	u32 int_res, frac_res;
@@ -167,7 +169,6 @@
 }
 
 
-
 static void StatSVGPoint(GF_SceneStatistics *stat, SFVec2f *val)
 {
 	if (!stat) return;
@@ -178,6 +179,7 @@
 	StatFixed(stat, val->x, 0);
 	StatFixed(stat, val->y, 0);
 }
+#endif
 
 static void StatSFVec2f(GF_SceneStatistics *stat, SFVec2f *val)
 {
@@ -263,6 +265,7 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_SVG
 static void StatSVGAttribute(GF_SceneStatistics *stat, GF_FieldInfo *field)
 {
 	u32 i = 0;
@@ -340,6 +343,7 @@
 		break;
 	}
 }
+#endif
 
 static void StatRemField(GF_SceneStatistics *stat, u32 fieldType, GF_FieldInfo *field)
 {
@@ -472,6 +476,7 @@
 	GF_FieldInfo field;
 	GF_Err e;
 	GF_ChildNodeItem *list;
+	u32 i;
 	GF_CommandField *inf = NULL;
 	if (gf_list_count(com->command_fields))
 		inf = (GF_CommandField*)gf_list_get(com->command_fields, 0);
@@ -494,15 +499,19 @@
 			if (inf->new_node) StatNodeGraph(stat, inf->new_node);
 			break;
 		case GF_SG_VRML_MFNODE:
-			list = * ((GF_ChildNodeItem**) inf->field_ptr);
-			while (list) {
-				StatNodeGraph(stat, list->node);
-				list = list->next;
+			if (inf) {
+				list = * ((GF_ChildNodeItem**) inf->field_ptr);
+				while (list) {
+					StatNodeGraph(stat, list->node);
+					list = list->next;
+				}
 			}
 			break;
 		default:
-			field.far_ptr = inf->field_ptr;
-			StatField(stat->stats, &field);
+			if (inf) {
+				field.far_ptr = inf->field_ptr;
+				StatField(stat->stats, &field);
+			}
 			break;
 		}
 		break;
@@ -520,6 +529,8 @@
 		}
 		break;
 	case GF_SG_NODE_DELETE:
+	case GF_SG_NODE_DELETE_EX:
+	case GF_SG_GLOBAL_QUANTIZER:
 		if (com->node) StatNode(stat->stats, com->node, 0, 1, NULL);
 		break;
 	case GF_SG_INDEXED_DELETE:
@@ -556,6 +567,43 @@
 	case GF_SG_ROUTE_DELETE:
 	case GF_SG_ROUTE_INSERT:
 		return GF_OK;
+	case GF_SG_XREPLACE:
+		if (!inf) return GF_OK;
+		e = gf_node_get_field(com->node, inf->fieldIndex, &field);
+		if (e) return e;
+
+		/*rescale the MFField and parse the SFField*/
+		if (field.fieldType != GF_SG_VRML_MFNODE) {
+			field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
+			field.far_ptr = inf->field_ptr;
+			StatSingleField(stat->stats, &field);
+		} else {
+			if (inf->new_node) StatNodeGraph(stat, inf->new_node);
+		}
+
+		break;
+	case GF_SG_MULTIPLE_REPLACE:
+	case GF_SG_MULTIPLE_INDEXED_REPLACE:
+		for (i=0; i<gf_list_count(com->command_fields); i++) {
+			inf = (GF_CommandField*)gf_list_get(com->command_fields, i);
+			e = gf_node_get_field(com->node, inf->fieldIndex, &field);
+			if (e) return e;
+
+			/*rescale the MFField and parse the SFField*/
+			if (field.fieldType != GF_SG_VRML_MFNODE) {
+				field.fieldType = gf_sg_vrml_get_sf_type(field.fieldType);
+				field.far_ptr = inf->field_ptr;
+				StatSingleField(stat->stats, &field);
+			} else {
+				if (inf->new_node) StatNodeGraph(stat, inf->new_node);
+			}
+		}
+		break;
+	case GF_SG_PROTO_INSERT:
+	case GF_SG_PROTO_DELETE:
+	case GF_SG_PROTO_DELETE_ALL:
+		return GF_OK;
+
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -629,7 +677,7 @@
 }
 
 GF_EXPORT
-GF_SceneStatistics *gf_sm_stats_get(GF_StatManager *stat)
+const GF_SceneStatistics *gf_sm_stats_get(GF_StatManager *stat)
 {
 	return stat->stats;
 }

gpac-0.8.0.tar.gz/src/scene_manager/swf_bifs.c -> gpac-1.0.0.tar.gz/src/scene_manager/swf_bifs.c Changed

@@ -43,7 +43,6 @@
 
 static GF_Err s2b_insert_symbol(SWFReader *read, GF_Node *n)
 {
-	GF_Command *com;
 	GF_CommandField *f;
 
 	if (read->flags & GF_SM_SWF_STATIC_DICT) {
@@ -51,7 +50,7 @@
 		gf_node_list_add_child(&par->choice, n);
 		gf_node_register((GF_Node *)n, (GF_Node *)par);
 	} else {
-		com = gf_sg_command_new(read->load->scene_graph, GF_SG_INDEXED_INSERT);
+		GF_Command *com = gf_sg_command_new(read->load->scene_graph, GF_SG_INDEXED_INSERT);
 		com->node = gf_sg_find_node_by_name(read->load->scene_graph, "DICTIONARY");
 		gf_node_register(com->node, NULL);
 		f = gf_sg_command_field_new(com);
@@ -165,12 +164,10 @@
 
 static GF_Node *s2b_get_appearance(SWFReader *read, GF_Node *parent, u32 fill_col, Fixed line_width, u32 l_col)
 {
-	char szDEF[1024];
 	u32 ID, i;
 	SFColor fc, lc;
 	Fixed fill_transp, line_transp;
 	M_Appearance *app;
-	M_Material2D *mat;
 
 	fc = s2b_get_color(fill_col);
 	fill_transp = FIX_ONE - s2b_get_alpha(fill_col);
@@ -181,7 +178,7 @@
 
 	i=0;
 	while ((app = (M_Appearance*)gf_list_enum(read->apps, &i))) {
-		mat = (M_Material2D *)app->material;
+		M_Material2D *mat = (M_Material2D *)app->material;
 		if (!line_width) {
 			if (mat->lineProps || !mat->filled) continue;
 		} else {
@@ -231,6 +228,7 @@
 	gf_node_register((GF_Node *)app, parent);
 
 	if (read->load->swf_import_flags & GF_SM_SWF_REUSE_APPEARANCE) {
+		char szDEF[1024];
 		sprintf(szDEF, "FILLAPP_%d", gf_list_count(read->apps));
 		read->load->ctx->max_node_id++;
 		ID = read->load->ctx->max_node_id;
@@ -635,11 +633,10 @@
 
 static void s2b_insert_shape(M_OrderedGroup *og, M_Shape *n, Bool is_proto)
 {
-	M_Shape *prev;
 	GF_ChildNodeItem *l = og->children;
 	if (!is_proto) {
 		while (l) {
-			prev = (M_Shape*)l->node;
+			M_Shape *prev = (M_Shape*)l->node;
 			if (prev->appearance == n->appearance) {
 				s2b_merge_curve2d( (M_Curve2D *)prev->geometry, (M_Curve2D *)n->geometry);
 				gf_node_register((GF_Node *)n, NULL);
@@ -962,7 +959,7 @@
 {
 	u32 len;
 	SWFFlatText *t;
-	if (!content || is_cdata) return;
+	if (!content || is_cdata || !sax_cbck) return;
 	t = (SWFFlatText *)sax_cbck;
 	len = (u32) strlen(content);
 	if (!len) return;
@@ -1103,6 +1100,7 @@
 /*called upon end of sprite or clip*/
 static void swf_bifs_end_of_clip(SWFReader *read)
 {
+#if 0
 	char szDEF[1024];
 	u32 i;
 	GF_AUContext *au;
@@ -1110,8 +1108,6 @@
 	GF_CommandField *f;
 	GF_Node *empty;
 
-	return;
-
 	empty = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
 
 	au = gf_list_get(read->bifs_es->AUs, 0);
@@ -1132,6 +1128,8 @@
 
 		gf_list_insert(au->commands, com, i);
 	}
+#endif
+
 }
 
 static Bool swf_bifs_allocate_depth(SWFReader *read, u32 depth)
@@ -1163,7 +1161,7 @@
 		esd = (GF_ESD *) gf_odf_desc_esd_new(0);
 		if (!esd) return GF_OUT_OF_MEM;
 		esd->decoderConfig->streamType = GF_STREAM_SCENE;
-		esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+		esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 		esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 		esd->ESID = 1;
 		gf_list_add(read->load->ctx->root_od->ESDescriptors, esd);
@@ -1179,13 +1177,13 @@
 	if (root_only) return GF_OK;
 
 	if (read->od_es) return GF_OK;
-	read->od_es = gf_sm_stream_new(read->load->ctx, 2, 1, 1);
+	read->od_es = gf_sm_stream_new(read->load->ctx, 2, GF_STREAM_OD, GF_CODECID_OD_V1);
 	if (!read->od_es) return GF_OUT_OF_MEM;
 
 	esd = (GF_ESD *) gf_odf_desc_esd_new(0);
 	if (!esd) return GF_OUT_OF_MEM;
 	esd->decoderConfig->streamType = GF_STREAM_OD;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+	esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 	esd->slConfig->timestampResolution = read->od_es->timeScale = read->bifs_es->timeScale;
 	esd->ESID = 2;
 	esd->OCRESID = 1;
@@ -1253,7 +1251,7 @@
 	/*always depends on main scene*/
 	esd->dependsOnESID = 1;
 	esd->decoderConfig->streamType = GF_STREAM_SCENE;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+	esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 	esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 	gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 	esd->decoderConfig->decoderSpecificInfo = NULL;
@@ -1311,7 +1309,7 @@
 	prev_sc = read->bifs_es;
 	prev_au = read->bifs_au;
 	/*create new BIFS stream*/
-	read->bifs_es = gf_sm_stream_new(read->load->ctx, esd->ESID, GF_STREAM_SCENE, 1);
+	read->bifs_es = gf_sm_stream_new(read->load->ctx, esd->ESID, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	read->bifs_es->timeScale = prev_sc->timeScale;
 	read->bifs_es->imp_exp_time = prev_sc->imp_exp_time + prev_au->timing;
 
@@ -1369,8 +1367,7 @@
 		esd->OCRESID = esd->ESID;
 	} else {
 		/*soundstream runs on movie/sprite timeline*/
-		esd->OCRESID = read->bifs_es->ESID;
-		esd->OCRESID = esd->ESID;
+		esd->OCRESID = read->bifs_es ? read->bifs_es->ESID : esd->ESID;
 	}
 	gf_list_add(od->ESDescriptors, esd);
 
@@ -1421,7 +1418,6 @@
 		/*otherwise start the media at the first soundstream block*/
 		else {
 			((M_AudioClip*)n)->startTime = snd->frame_delay_ms/1000.0;
-			((M_AudioClip*)n)->startTime = 0;
 		}
 
 		sprintf(szDEF, "CLIP%d_SND", read->current_sprite_id);
@@ -1748,8 +1744,10 @@
 	u32 ts;
 	Bool is_rap;
 
-	/*hack to allow for empty BIFS AU to be encoded in order to keep the frame-rate (this reduces MP4 table size...)*/
-	if (0 && !gf_list_count(read->bifs_au->commands)) {
+	/*hack to allow for empty BIFS AU to be encoded in order to keep the frame-rate (this reduces MP4 table size...)
+	todo: make this an option - commented for now in both master and filters*/
+#if 0
+	if (!gf_list_count(read->bifs_au->commands)) {
 		GF_Command *com;
 		GF_CommandField *f;
 		com = gf_sg_command_new(read->load->scene_graph, GF_SG_FIELD_REPLACE);
@@ -1763,6 +1761,7 @@
 		*((SFInt32 *)f->field_ptr) = -1;
 		gf_list_add(read->bifs_au->commands, com);
 	}
+#endif
 
 	/*create a new AU for next frame*/
 	ts = (read->current_frame + 1) * 100;
@@ -1917,7 +1916,7 @@
 		}
 		if (character) {
 			SFInt32 choice = 0;
-			GF_Node *n = s2b_wrap_node(read, character, &br->mx, &br->cmx);
+			n = s2b_wrap_node(read, character, &br->mx, &br->cmx);
 
 			sprintf(szName, "BTN%d_R%d", btn->ID, i+1);
 			button = (M_Switch *) s2b_button_add_child(read, btn_root, TAG_MPEG4_Switch, szName, pos);
@@ -1980,6 +1979,8 @@
 		gf_list_rem(read->buttons, 0);
 		gf_free(btnrec);
 	}
+	gf_list_del(read->buttons);
+	read->buttons = NULL;
 
 	count = gf_list_count(read->fonts);
 	for (i=0; i<count; i++) {
@@ -2029,7 +2030,6 @@
 		url.count = 1;
 		url.vals = &sfurl;
 		s2b_set_field(read, dst, n, "url", -1, GF_SG_VRML_MFURL, &url, 0);
-		s2b_set_field(read, dst, n, "parameter", -1, GF_SG_VRML_MFSTRING, &url, 0);
 		bval = 1;
 		s2b_set_field(read, dst, n, "activate", -1, GF_SG_VRML_SFBOOL, &bval, 0);
 		break;
@@ -2075,8 +2075,16 @@
 	read->action = swf_bifs_action;
 	read->finalize = swf_bifs_finalize;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		swf_nstart(NULL, NULL, NULL, NULL, 0);
+		swf_nend(NULL, NULL, NULL);
+		swf_ntext(NULL, NULL, GF_FALSE);
+	}
+#endif
+
 	/*create BIFS stream*/
-	read->bifs_es = gf_sm_stream_new(read->load->ctx, 1, GF_STREAM_SCENE, 0x01);
+	read->bifs_es = gf_sm_stream_new(read->load->ctx, 1, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	read->bifs_es->timeScale = read->frame_rate*100;
 
 	read->bifs_au = gf_sm_stream_au_new(read->bifs_es, 0, 0.0, 1);
@@ -2087,7 +2095,6 @@
 	read->load->ctx->is_pixel_metrics = 1;
 
 	gf_list_add(read->bifs_au->commands, com);
-	read->load->scene_graph = read->load->scene_graph;
 
 	/*create base tree*/
 	com->node = read->root = s2b_new_node(read, TAG_MPEG4_OrderedGroup);
@@ -2098,12 +2105,16 @@
 	gf_node_insert_child(read->root, n, -1);
 	gf_node_register(n, read->root);
 	((M_WorldInfo *)n)->title.buffer = gf_strdup("GPAC SWF CONVERTION DISCLAIMER");
-	gf_sg_vrml_mf_alloc( & ((M_WorldInfo *)n)->info, GF_SG_VRML_MFSTRING, 3);
+	gf_sg_vrml_mf_alloc( & ((M_WorldInfo *)n)->info, GF_SG_VRML_MFSTRING, 2);
 
 	sprintf(szMsg, "%s file converted to MPEG-4 Systems", read->load->fileName);
 	((M_WorldInfo *)n)->info.vals[0] = gf_strdup(szMsg);
-	((M_WorldInfo *)n)->info.vals[1] = gf_strdup("Conversion done using GPAC version " GPAC_FULL_VERSION " - (C) 2000-2005 GPAC");
-	((M_WorldInfo *)n)->info.vals[2] = gf_strdup("Macromedia SWF to MPEG-4 Conversion mapping released under GPL license");
+	if (gf_sys_is_test_mode()) {
+		sprintf(szMsg, "Conversion done using GPAC");
+	} else {
+		sprintf(szMsg, "Conversion done using GPAC version %s - %s", gf_gpac_version(), gf_gpac_copyright() );
+	}
+	((M_WorldInfo *)n)->info.vals[1] = gf_strdup(szMsg);
 
 	/*background*/
 	n = s2b_new_node(read, TAG_MPEG4_Background2D);
@@ -2155,7 +2166,6 @@
 	/*setup IndexedCurve2D proto*/
 	if (read->flags & GF_SM_SWF_USE_IC2D) {
 		GF_ProtoFieldInterface *pfield;
-		GF_FieldInfo info;
 		SFURL *url;
 		Fixed ftMin, ftMax;
 		GF_Proto *proto = gf_sg_proto_new(read->load->scene_graph, 1, "IndexedCurve2D", 0);
@@ -2203,7 +2213,7 @@
 	esd->ESID = esd->OCRESID = 3;
 	esd->dependsOnESID = 1;
 	esd->decoderConfig->streamType = GF_STREAM_SCENE;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+	esd->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 	esd->slConfig->timestampResolution = read->bifs_es->timeScale;
 	gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
 	esd->decoderConfig->decoderSpecificInfo = NULL;
@@ -2216,7 +2226,7 @@
 
 	/*setup a new BIFS context*/
 	prev_sc = read->bifs_es;
-	read->bifs_es = gf_sm_stream_new(read->load->ctx, esd->ESID, GF_STREAM_SCENE, 1);
+	read->bifs_es = gf_sm_stream_new(read->load->ctx, esd->ESID, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	read->bifs_es->timeScale = prev_sc->timeScale;
 	/*create first AU*/
 	read->bifs_au = gf_sm_stream_au_new(read->bifs_es, 0, 0, 1);

gpac-0.8.0.tar.gz/src/scene_manager/swf_parse.c -> gpac-1.0.0.tar.gz/src/scene_manager/swf_parse.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 / Scene Management sub-project
@@ -98,7 +98,7 @@
 	uLongf destLen;
 	char *src, *dst;
 
-	assert(gf_bs_get_size(read->bs)-8 < 1<<31); /*must fit within 32 bits*/
+	assert(gf_bs_get_size(read->bs)-8 < (u64)1<<31); /*must fit within 32 bits*/
 	size = (u32) gf_bs_get_size(read->bs)-8;
 	dst_size = read->length;
 	src = gf_malloc(sizeof(char)*size);
@@ -139,15 +139,15 @@
 
 static s32 swf_read_sint(SWFReader *read, u32 nbBits)
 {
-	s32 r = 0;
+	u32 r = 0;
 	u32 i;
 	if (!nbBits)return 0;
-	r = -1 * (s32) swf_read_int(read, 1);
+	r = swf_read_int(read, 1) ? 0xFFFFFFFF : 0;
 	for (i=1; i<nbBits; i++) {
 		r <<= 1;
 		r |= swf_read_int(read, 1);
 	}
-	return r;
+	return (s32) r;
 }
 
 static u32 swf_align(SWFReader *read)
@@ -408,16 +408,15 @@
 
 					/*make sure we have keys between 0 and 1.0 for BIFS (0 and 255 in swf)*/
 					if (style->grad_ratio[0] != 0) {
-						u32 i;
 						u32 *grad_col;
 						u8 *grad_ratio;
 						grad_ratio = (u8 *) gf_malloc(sizeof(u8) * (style->nbGrad+1));
 						grad_col = (u32 *) gf_malloc(sizeof(u32) * (style->nbGrad+1));
 						grad_col[0] = style->grad_col[0];
 						grad_ratio[0] = 0;
-						for (i=0; i<style->nbGrad; i++) {
-							grad_col[i+1] = style->grad_col[i];
-							grad_ratio[i+1] = style->grad_ratio[i];
+						for (j=0; j<style->nbGrad; j++) {
+							grad_col[j+1] = style->grad_col[j];
+							grad_ratio[j+1] = style->grad_ratio[j];
 						}
 						gf_free(style->grad_col);
 						style->grad_col = grad_col;
@@ -647,6 +646,7 @@
 			break;
 		case 0:
 			GF_SAFEALLOC(sorted , SWFPath);
+			if (!sorted) return;
 			swf_path_realloc_pts(sorted, 1);
 			sorted->pts[sorted->nbPts] = a->pts[idx];
 			sorted->nbPts++;
@@ -830,10 +830,11 @@
 static GF_Err swf_flush_shape(SWFReader *read, SWFShape *shape, SWFFont *font, Bool last_shape)
 {
 	GF_Err e;
-	SWFShapeRec *sf0, *sf1, *sl;
+	SWFShapeRec *sf0;
 	u32 i, count;
 	count = gf_list_count(shape->fill_left);
 	for (i=0; i<count; i++) {
+		SWFShapeRec *sf1;
 		sf0 = (SWFShapeRec*)gf_list_get(shape->fill_left, i);
 		sf1 = (SWFShapeRec*)gf_list_get(shape->fill_right, i);
 		/*reverse right path*/
@@ -854,7 +855,7 @@
 	}
 	/*remove dummy lines*/
 	for (i=0; i<gf_list_count(shape->lines); i++) {
-		sl = (SWFShapeRec*)gf_list_get(shape->lines, i);
+		SWFShapeRec *sl = (SWFShapeRec*)gf_list_get(shape->lines, i);
 		if (sl->path->nbType<1) {
 			gf_list_rem(shape->lines, i);
 			swf_free_shape_rec(sl);
@@ -1056,6 +1057,7 @@
 	}
 	if (!create) return NULL;
 	GF_SAFEALLOC(tmp , DispShape);
+	if (!tmp) return NULL;
 	tmp->depth = Depth;
 	tmp->char_id = 0;
 	gf_list_add(read->display_list, tmp);
@@ -1072,6 +1074,7 @@
 
 static GF_Err swf_func_skip(SWFReader *read)
 {
+	if (!read) return GF_OK;
 	swf_skip_data(read, read->size);
 	return read->ioerr;
 }
@@ -1086,13 +1089,13 @@
 {
 	u32 skip_actions = 0;
 	u8 action_code = swf_read_int(read, 8);
-	u16 length = 0;
 	read->has_interact = 1;
 
 
 #define DO_ACT(_code) { act.type = _code; read->action(read, &act); break; }
 
 	while (action_code) {
+		u16 length;
 		if (action_code > 0x80) length = swf_get_16(read);
 		else length = 0;
 
@@ -1429,8 +1432,6 @@
 
 
 	if (revision==0) {
-		u32 count;
-
 		start = swf_get_file_pos(read);
 
 		count = swf_get_16(read);
@@ -1828,7 +1829,7 @@
 
 		alloc_size = 4096;
 		frame = (char*)gf_malloc(sizeof(char)*4096);
-		snd->frame_delay_ms = swf_get_16(read);
+		/*snd->frame_delay_ms =*/ swf_get_16(read);
 		snd->frame_delay_ms = read->current_frame*1000;
 		snd->frame_delay_ms /= read->frame_rate;
 		tot_size = 9;
@@ -1837,7 +1838,7 @@
 			u32 toread = read->size - tot_size;
 			if (toread>alloc_size) toread = alloc_size;
 			swf_read_data(read, frame, toread);
-			gf_fwrite(frame, sizeof(char)*toread, 1, snd->output);
+			gf_fwrite(frame, sizeof(char)*toread, snd->output);
 			tot_size += toread;
 		}
 
@@ -2024,8 +2025,8 @@
 		if (tot_size + size >= read->size) size = read->size - tot_size;
 
 		swf_read_data(read, frame, size-4);
-		gf_fwrite(bytes, sizeof(char)*4, 1, read->sound_stream->output);
-		gf_fwrite(frame, sizeof(char)*(size-4), 1, read->sound_stream->output);
+		gf_fwrite(bytes, sizeof(char)*4, read->sound_stream->output);
+		gf_fwrite(frame, sizeof(char)*(size-4), read->sound_stream->output);
 		if (tot_size + size >= read->size) break;
 		tot_size += size;
 	}
@@ -2036,6 +2037,7 @@
 
 static GF_Err swf_def_hdr_jpeg(SWFReader *read)
 {
+	if (!read) return GF_OK;
 	if (read->jpeg_hdr) {
 		swf_report(read, GF_NON_COMPLIANT_BITSTREAM, "JPEG Table already defined in file");
 		return GF_NON_COMPLIANT_BITSTREAM;
@@ -2056,15 +2058,19 @@
 	char szName[1024];
 	u8 *buf;
 	u32 skip = 0;
+#ifndef GPAC_DISABLE_AV_PARSERS
 	u32 AlphaPlaneSize = 0;
+#endif
 	u32 size = read->size;
 
 	ID = swf_get_16(read);
 	size -= 2;
 	if (version==3) {
-		u32 offset =  swf_get_32(read);
+		u32 offset = swf_get_32(read);
+#ifndef GPAC_DISABLE_AV_PARSERS
 		size -= 4;
 		AlphaPlaneSize = size - offset;
+#endif
 		size = offset;
 	}
 
@@ -2080,7 +2086,7 @@
 
 	if (version==1 && read->jpeg_hdr_size) {
 		/*remove JPEG EOI*/
-		gf_fwrite(read->jpeg_hdr, 1, read->jpeg_hdr_size-2, file);
+		gf_fwrite(read->jpeg_hdr, read->jpeg_hdr_size-2, file);
 		/*remove JPEG SOI*/
 		swf_get_16(read);
 		size-=2;
@@ -2088,7 +2094,7 @@
 	buf = gf_malloc(sizeof(u8)*size);
 	swf_read_data(read, (char *) buf, size);
 	if (version==1) {
-		gf_fwrite(buf, 1, size, file);
+		gf_fwrite(buf, size, file);
 	} else {
 		u32 i;
 		for (i=0; i<size; i++) {
@@ -2105,7 +2111,7 @@
 			skip = 2;
 		}
 		if (version==2)
-			gf_fwrite(buf+skip, 1, size-skip, file);
+			gf_fwrite(buf+skip, size-skip, file);
 	}
 	if (version!=3)
 		gf_fclose(file);
@@ -2114,19 +2120,19 @@
 #ifndef GPAC_DISABLE_AV_PARSERS
 		char *dst, *raw;
 		GF_Err e;
-		u8 oti;
+		u32 codecid;
 		u32 osize, w, h, j, pf;
 		GF_BitStream *bs;
 
 		/*decompress jpeg*/
 		bs = gf_bs_new( (char *) buf+skip, size-skip, GF_BITSTREAM_READ);
-		gf_img_parse(bs, &oti, &osize, &w, &h, NULL, NULL);
+		gf_img_parse(bs, &codecid, &w, &h, NULL, NULL);
 		gf_bs_del(bs);
 
 		osize = w*h*4;
 		raw = gf_malloc(sizeof(char)*osize);
 		memset(raw, 0, sizeof(char)*osize);
-		e = gf_img_jpeg_dec( (char *) buf+skip, size-skip, &w, &h, &pf, raw, &osize, 4);
+		e = gf_img_jpeg_dec(buf+skip, size-skip, &w, &h, &pf, raw, &osize, 4);
 		if (e != GF_OK) {
 			swf_report(read, e, "Cannopt decode JPEG image");
 		}
@@ -2156,7 +2162,7 @@
 		gf_img_png_enc(raw, w, h, h*4, GF_PIXEL_RGBA, (char *)buf, &osize);
 
 		file = gf_fopen(szName, "wb");
-		gf_fwrite(buf, 1, osize, file);
+		gf_fwrite(buf, osize, file);
 		gf_fclose(file);
 
 		gf_free(raw);
@@ -2282,6 +2288,7 @@
 
 static GF_Err swf_unknown_tag(SWFReader *read)
 {
+	if (!read) return GF_OK;
 	swf_report(read, GF_NOT_SUPPORTED, "Tag %s (0x%2x) not implemented - skipping", swf_get_tag_name(read->tag), read->tag);
 	return swf_func_skip(read);
 }
@@ -2395,7 +2402,10 @@
 	}
 
 
-	if (!e && !read->tag) return GF_EOS;
+	if (!e && !read->tag) {
+		return GF_EOS;
+	}
+
 	if (read->ioerr) {
 		swf_report(read, GF_IO_ERR, "bitstream IO err (tag size %d)", read->size);
 		return read->ioerr;
@@ -2439,7 +2449,7 @@
 static void swf_io_error(void *par)
 {
 	SWFReader *read = (SWFReader *)par;
-	read->ioerr = GF_IO_ERR;
+	if (read) read->ioerr = GF_IO_ERR;
 }
 
 GF_Err gf_sm_load_run_swf(GF_SceneLoader *load)
@@ -2455,7 +2465,11 @@
 	}
 	gf_set_progress("SWF Parsing", read->length, read->length);
 
-	if (e==GF_EOS) e = GF_OK;
+	if (e==GF_EOS) {
+		if (read->finalize)
+			read->finalize(read);
+		e = GF_OK;
+	}
 	if (!e) {
 		if (read->flat_limit != 0)
 			swf_report(read, GF_OK, "%d points removed while parsing shapes (Flattening limit %.4f)", read->flatten_points, read->flat_limit);
@@ -2474,9 +2488,6 @@
 	gf_bs_del(read->bs);
 	if (read->mem) gf_free(read->mem);
 
-	if (read->finalize)
-		read->finalize(read);
-
 	while (gf_list_count(read->display_list)) {
 		DispShape *s = (DispShape *)gf_list_get(read->display_list, 0);
 		gf_list_rem(read->display_list, 0);
@@ -2516,6 +2527,10 @@
 {
 	SWFReader *read = (SWFReader *) load->loader_priv;
 	if (!read) return;
+	if (read->svg_file) {
+		gf_fclose(read->svg_file);
+		read->svg_file = NULL;
+	}
 	gf_swf_reader_del(read);
 	load->loader_priv = NULL;
 }
@@ -2555,8 +2570,8 @@
 }
 
 GF_Err gf_swf_reader_set_user_mode(SWFReader *read, void *user,
-                                   GF_Err (*add_sample)(void *user, const char *data, u32 length, u64 timestamp, Bool isRap),
-                                   GF_Err (*add_header)(void *user, const char *data, u32 length, Bool isHeader))
+                                   GF_Err (*add_sample)(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap),
+                                   GF_Err (*add_header)(void *user, const u8 *data, u32 length, Bool isHeader))
 {
 	if (!read) return GF_BAD_PARAM;
 	read->user = user;
@@ -2597,6 +2612,13 @@
 	return GF_OK;
 }
 
+GF_Err gf_swf_get_duration(SWFReader *read, u32 *frame_rate, u32 *frame_count)
+{
+	*frame_rate = read->frame_rate;
+	*frame_count = read->frame_count;
+	return GF_OK;
+}
+
 GF_Err gf_sm_load_init_swf(GF_SceneLoader *load)
 {
 	SWFReader *read;
@@ -2604,6 +2626,16 @@
 
 	if (!load->ctx || !load->scene_graph || !load->fileName) return GF_BAD_PARAM;
 
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		swf_func_skip(NULL);
+		swf_def_hdr_jpeg(NULL);
+		swf_get_tag_name(SWF_FREECHARACTER);
+		swf_unknown_tag(NULL);
+		swf_io_error(NULL);
+	}
+#endif
+
 	read = gf_swf_reader_new(load->localPath, load->fileName);
 	read->load = load;
 	read->flags = load->swf_import_flags;
@@ -2623,12 +2655,14 @@
 	if (!(load->swf_import_flags & GF_SM_SWF_USE_SVG)) {
 #ifndef GPAC_DISABLE_VRML
 		e = swf_to_bifs_init(read);
+#else
+		e = GF_NOT_SUPPORTED;
 #endif
 	} else {
 #ifndef GPAC_DISABLE_SVG
-		char svgFileName[GF_MAX_PATH];
 		FILE *svgFile;
 		if (load->svgOutFile) {
+			char svgFileName[GF_MAX_PATH];
 			if (load->localPath) {
 				sprintf(svgFileName, "%s%c%s.svg", load->localPath, GF_PATH_SEPARATOR, load->svgOutFile);
 			} else {
@@ -2636,11 +2670,14 @@
 			}
 			svgFile = gf_fopen(svgFileName, "wt");
 			if (!svgFile) return GF_BAD_PARAM;
+			read->svg_file = svgFile;
 		} else {
 			svgFile = stdout;
 		}
 		gf_swf_reader_set_user_mode(read, svgFile, swf_svg_write_text_sample, swf_svg_write_text_header);
 		e = swf_to_svg_init(read, read->flags, load->swf_flatten_limit);
+#else
+		e = GF_NOT_SUPPORTED;
 #endif
 	}
 	if (e) goto exit;
@@ -2661,4 +2698,3 @@
 }
 
 #endif /*GPAC_DISABLE_SWF_IMPORT*/
-

gpac-0.8.0.tar.gz/src/scene_manager/swf_svg.c -> gpac-1.0.0.tar.gz/src/scene_manager/swf_svg.c Changed

@@ -1,8 +1,8 @@
 /*
  *          GPAC - Multimedia Framework C SDK
  *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2000-2012
+ *          Authors: Cyril Concolato, Jean Le Feuvre
+ *          Copyright (c) Telecom ParisTech 2000-2020
  *                  All rights reserved
  *
  *  This file is part of GPAC / Scene Management sub-project
@@ -529,12 +529,12 @@
 	return GF_OK;
 }
 
-GF_Err swf_svg_write_text_sample(void *user, const char *data, u32 length, u64 timestamp, Bool isRap)
+GF_Err swf_svg_write_text_sample(void *user, const u8 *data, u32 length, u64 timestamp, Bool isRap)
 {
 	FILE *svgFile = (FILE *)user;
 	u32  lengthWritten;
 
-	lengthWritten = (u32)fwrite(data, 1, length, svgFile);
+	lengthWritten = (u32) gf_fwrite(data, length, svgFile);
 	if (length != lengthWritten) {
 		return GF_BAD_PARAM;
 	} else {
@@ -542,12 +542,12 @@
 	}
 }
 
-GF_Err swf_svg_write_text_header(void *user, const char *data, u32 length, Bool isHeader)
+GF_Err swf_svg_write_text_header(void *user, const u8 *data, u32 length, Bool isHeader)
 {
 	FILE *svgFile = (FILE *)user;
 	u32  lengthWritten;
 
-	lengthWritten = (u32)fwrite(data, 1, length, svgFile);
+	lengthWritten = (u32) gf_fwrite(data, length, svgFile);
 	if (length != lengthWritten) {
 		return GF_BAD_PARAM;
 	} else {

gpac-0.8.0.tar.gz/src/scene_manager/text_to_bifs.c -> gpac-1.0.0.tar.gz/src/scene_manager/text_to_bifs.c Changed

@@ -56,7 +56,7 @@
 	FILE *test = gf_fopen(filename, "rt");
 	if (!test) return GF_URL_ERROR;
 
-	while (fgets(szLine, 2048, test) != NULL) {
+	while (gf_fgets(szLine, 2048, test) != NULL) {
 		REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
 		if (strlen(szLine)) break;
@@ -68,12 +68,12 @@
 		if (!strcmp(szTest, szLine)) *fmt = GF_TEXT_IMPORT_SRT;
 	}
 	else if (!strnicmp(szLine, "<?xml ", 6)) {
-		char *ext = strrchr(filename, '.');
+		char *ext = gf_file_ext_start(filename);
 		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TEXT_IMPORT_TTXT;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
 		if (ext && !ext[0]) {
-			if (!fgets(szLine, 2048, test))
+			if (!gf_fgets(szLine, 2048, test))
 				szLine[0] = '\0';
 		}
 		if (strstr(szLine, "x-quicktime-tx3g")) *fmt = GF_TEXT_IMPORT_TEXML;
@@ -148,14 +148,14 @@
 		return GF_URL_ERROR;
 	}
 
-	srt = gf_sm_stream_new(ctx, src->ESID, GF_STREAM_SCENE, 1);
+	srt = gf_sm_stream_new(ctx, src->ESID, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	if (!srt) return GF_OUT_OF_MEM;
 
 	if (!src->slConfig) src->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	src->slConfig->timestampResolution = 1000;
 	if (!src->decoderConfig) src->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	src->decoderConfig->streamType = GF_STREAM_SCENE;
-	src->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+	src->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 
 	e = GF_OK;
 	state = end = 0;
@@ -166,7 +166,7 @@
 	inf = NULL;
 
 	while (1) {
-		char *sOK = fgets(szLine, 2048, srt_in);
+		char *sOK = gf_fgets(szLine, 2048, srt_in);
 
 		if (sOK) REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
@@ -329,7 +329,6 @@
 	}
 
 exit:
-	if (e) gf_sm_stream_del(ctx, srt);
 	gf_fclose(srt_in);
 	return e;
 }
@@ -401,14 +400,14 @@
 		return GF_URL_ERROR;
 	}
 
-	srt = gf_sm_stream_new(ctx, src->ESID, GF_STREAM_SCENE, 1);
+	srt = gf_sm_stream_new(ctx, src->ESID, GF_STREAM_SCENE, GF_CODECID_BIFS);
 	if (!srt) return GF_OUT_OF_MEM;
 
 	if (!src->slConfig) src->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
 	src->slConfig->timestampResolution = 1000;
 	if (!src->decoderConfig) src->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
 	src->decoderConfig->streamType = GF_STREAM_SCENE;
-	src->decoderConfig->objectTypeIndication = GPAC_OTI_SCENE_BIFS;
+	src->decoderConfig->objectTypeIndication = GF_CODECID_BIFS;
 
 	e = GF_OK;
 	end = 0;
@@ -419,7 +418,7 @@
 	line = 0;
 	first_samp = 1;
 	while (1) {
-		char *sOK = fgets(szLine, 2048, sub_in);
+		char *sOK = gf_fgets(szLine, 2048, sub_in);
 		if (!sOK) break;
 		REM_TRAIL_MARKS(szLine, "\r\n\t ")
 
@@ -514,8 +513,6 @@
 			sfstr->buffer = gf_strdup(szText);
 		}
 	}
-
-	if (e) gf_sm_stream_del(ctx, srt);
 	gf_fclose(sub_in);
 	return e;
 }

gpac-0.8.0.tar.gz/src/scenegraph/base_scenegraph.c -> gpac-1.0.0.tar.gz/src/scenegraph/base_scenegraph.c Changed

@@ -33,6 +33,9 @@
 #include <gpac/events.h>
 #include <gpac/nodes_svg.h>
 
+#ifdef GPAC_HAS_QJS
+#include "qjs_common.h"
+#endif
 static void ReplaceDEFNode(GF_Node *FromNode, GF_Node *node, GF_Node *newNode, Bool updateOrderedGroup);
 
 #ifndef GPAC_DISABLE_SVG
@@ -69,11 +72,32 @@
 	tmp->listeners_to_add = gf_list_new();
 #endif
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	tmp->scripts = gf_list_new();
 	tmp->objects = gf_list_new();
 #endif
 	tmp->on_node_modified = node_modif_stub;
+
+	//test some functions only used in weird smil anim or dom JS, and not addressed in test suite
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		node_modif_stub(NULL, NULL, NULL, NULL);
+		gf_node_remove_id(NULL);
+		gf_node_list_get_child(NULL, 0);
+		gf_node_get_parent_count(NULL);
+		gf_node_get_num_instances(NULL);
+		gf_node_get_log_name(NULL);
+		gf_sg_get_namespace(NULL, 0);
+		gf_node_parent_of(NULL, NULL);
+		gf_sg_get_parent(tmp);
+		gf_node_get_attribute_count(NULL);
+		gf_xml_node_clone(NULL, NULL, NULL, NULL, 0);
+		gf_dom_flatten_textContent(NULL);
+		gf_smil_timing_pause(NULL);
+		gf_smil_timing_resume(NULL);
+		gf_smil_get_media_duration(NULL);
+	}
+#endif
 	return tmp;
 }
 
@@ -103,7 +127,7 @@
 
 
 GF_EXPORT
-void gf_sg_set_node_callback(GF_SceneGraph *sg, void (*NodeCallback)(void *user_priv, u32 type, GF_Node *node, void *ctxdata) )
+void gf_sg_set_node_callback(GF_SceneGraph *sg, gf_sg_node_init_callback NodeCallback)
 {
 	sg->NodeCallback = NodeCallback;
 }
@@ -147,19 +171,19 @@
 	gf_mx_del(sg->dom_evt_mx);
 #endif
 
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	gf_list_del(sg->scripts);
 	sg->scripts = NULL;
 	gf_list_del(sg->objects);
 	sg->objects = NULL;
 #ifndef GPAC_DISABLE_SVG
 	if (sg->svg_js) {
-		void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph);
+		void gf_svg_script_context_del(void *svg_js, GF_SceneGraph *scenegraph);
 		gf_svg_script_context_del(sg->svg_js, sg);
 	}
 #endif
 
-#endif //GPAC_HAS_SPIDERMONKEY
+#endif //GPAC_HAS_QJS
 
 #ifndef GPAC_DISABLE_VRML
 	gf_list_del(sg->Routes);
@@ -318,7 +342,7 @@
 #endif
 
 	gc = gf_list_new();
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	/*scripts are the first source of cylic references in the graph. In order to clean properly
 	force a remove of all script nodes, this will release all references to nodes in JS*/
 	while (gf_list_count(sg->scripts)) {
@@ -342,7 +366,7 @@
 	/*remove listeners attached to the doc*/
 	gf_dom_event_remove_all_listeners(sg->dom_evt);
 	/*flush any pending add_listener*/
-	gf_dom_listener_reset_defered(sg);
+	gf_dom_listener_reset_deferred(sg);
 	gf_mx_v(sg->dom_evt_mx);
 #endif
 
@@ -375,6 +399,9 @@
 	if (sg->RootNode) gf_node_unregister(sg->RootNode, NULL);
 	sg->RootNode = NULL;
 
+	if (!sg->pOwningProto && gf_list_count(sg->protos) && sg->GetExternProtoLib)
+		sg->GetExternProtoLib(sg->userpriv, NULL);
+
 	/*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)
@@ -383,7 +410,11 @@
 restart:
 	reg_node = sg->id_node;
 	while (reg_node) {
+#if 0
 		Bool ignore = 0;
+#endif
+		GF_ParentList *nlist;
+
 		GF_Node *node = reg_node->node;
 		if (!node
 #ifndef GPAC_DISABLE_VRML
@@ -396,43 +427,45 @@
 
 		/*first replace all instances in parents by NULL WITHOUT UNREGISTERING (to avoid destroying the node).
 		This will take care of nodes referencing themselves*/
-		{
-			GF_ParentList *nlist = node->sgprivate->parents;
+		nlist = node->sgprivate->parents;
 #ifndef GPAC_DISABLE_SVG
-			type = (node->sgprivate->tag>GF_NODE_RANGE_LAST_VRML) ? 1 : 0;
+		type = (node->sgprivate->tag>GF_NODE_RANGE_LAST_VRML) ? 1 : 0;
 #endif
-			while (nlist) {
-				GF_ParentList *next = nlist->next;
+		while (nlist) {
+			GF_ParentList *next = nlist->next;
 #if 0
-				/*parent is a DEF'ed node, try to clean-up properly?*/
-				if ((nlist->node!=node) && SG_SearchForNode(sg, nlist->node) != NULL) {
-					ignore = 1;
-					break;
-				}
+			/*parent is a DEF'ed node, try to clean-up properly?*/
+			if ((nlist->node!=node) && SG_SearchForNode(sg, nlist->node) != NULL) {
+				ignore = 1;
+				break;
+			}
 #endif
 
 #ifndef GPAC_DISABLE_SVG
-				if (type) {
-					ReplaceIRINode(nlist->node, node, NULL);
-				} else
+			if (type) {
+				ReplaceIRINode(nlist->node, node, NULL);
+			} else
 #endif
-					ReplaceDEFNode(nlist->node, reg_node->node, NULL, 0);
+				ReplaceDEFNode(nlist->node, reg_node->node, NULL, 0);
 
-				/*direct cyclic reference to ourselves, make sure we update the parentList to the next entry before freeing it
-				since the next parent node could be reg_node again (reg_node->reg_node)*/
-				if (nlist->node==node) {
-					node->sgprivate->parents = next;
-				}
-				gf_free(nlist);
-				nlist = next;
+			/*direct cyclic reference to ourselves, make sure we update the parentList to the next entry before freeing it
+			since the next parent node could be reg_node again (reg_node->reg_node)*/
+			if (nlist->node==node) {
+				node->sgprivate->parents = next;
 			}
+
+			gf_free(nlist);
+			nlist = next;
+#if 0
 			if (ignore) {
 				node->sgprivate->parents = nlist;
 				continue;
 			}
-
-			node->sgprivate->parents = NULL;
+#endif
 		}
+
+		node->sgprivate->parents = NULL;
+
 		//sg->node_registry[i-1] = NULL;
 		count = get_num_id_nodes(sg);
 		node->sgprivate->num_instances = 1;
@@ -485,7 +518,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 	if (par != sg) {
-		u32 count, i;
+		u32 i;
 		count = gf_list_count(par->smil_timed_elements);
 		for (i=0; i<count; i++) {
 			SMIL_Timing_RTI *rti = gf_list_get(par->smil_timed_elements, i);
@@ -515,6 +548,7 @@
 	return NULL;
 }
 
+#if 0 //unused
 void *gf_node_get_name_address(GF_Node*node)
 {
 	NodeIDedItem *reg_node;
@@ -526,6 +560,7 @@
 	}
 	return NULL;
 }
+#endif
 
 GF_EXPORT
 void gf_sg_set_private(GF_SceneGraph *sg, void *ptr)
@@ -632,9 +667,8 @@
 {
 #ifndef GPAC_DISABLE_VRML
 	u32 j;
-	GF_Route *r;
 #endif
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	Bool detach=0;
 #endif
 	GF_SceneGraph *pSG;
@@ -655,7 +689,7 @@
 				if (prev) prev->next = nlist->next;
 				else pNode->sgprivate->parents = nlist->next;
 				gf_free(nlist);
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 				if (pNode->sgprivate->parents==NULL) detach=1;
 #endif
 				break;
@@ -677,7 +711,7 @@
 
 	/*this is just an instance removed*/
 	if (pNode->sgprivate->num_instances) {
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 		if (pNode->sgprivate->num_instances==1) detach=1;
 		if (pSG && pNode->sgprivate->scenegraph->on_node_modified && detach && pNode->sgprivate->interact && pNode->sgprivate->interact->js_binding) {
 			pNode->sgprivate->scenegraph->on_node_modified(pNode->sgprivate->scenegraph, pNode, NULL, NULL);
@@ -689,6 +723,7 @@
 	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);
@@ -885,18 +920,11 @@
 	Bool replace_proto;
 #endif
 	Bool replace_root;
-	GF_Node *par;
-	GF_SceneGraph *pSG = node->sgprivate->scenegraph;
-
-#ifndef GPAC_DISABLE_VRML
-	/*if this is a proto its is registered in its parent graph, not the current*/
-	if (node == (GF_Node*)pSG->pOwningProto) pSG = pSG->parent_scene;
-#endif
 
 #ifndef GPAC_DISABLE_SVG
 	type = (node->sgprivate->tag>GF_NODE_RANGE_LAST_VRML) ? 1 : 0;
 	if (type) {
-		Replace_IRI(pSG, node, new_node);
+		Replace_IRI(node->sgprivate->scenegraph, node, new_node);
 	}
 #endif
 
@@ -904,6 +932,7 @@
 	replace_root = (node->sgprivate->scenegraph->RootNode == node) ? 1 : 0;
 
 #ifndef GPAC_DISABLE_VRML
+	/*check for proto replacement*/
 	replace_proto = 0;
 	if (node->sgprivate->scenegraph->pOwningProto
 	        && (gf_list_find(node->sgprivate->scenegraph->pOwningProto->node_code, node)>=0)) {
@@ -913,7 +942,7 @@
 
 	while (node->sgprivate->parents) {
 		Bool do_break = node->sgprivate->parents->next ? 0 : 1;
-		par = node->sgprivate->parents->node;
+		GF_Node *par = node->sgprivate->parents->node;
 
 #ifndef GPAC_DISABLE_SVG
 		if (type)
@@ -929,13 +958,13 @@
 	}
 
 	if (replace_root) {
-		pSG = node->sgprivate->scenegraph;
+		GF_SceneGraph *pSG = node->sgprivate->scenegraph;
 		gf_node_unregister(node, NULL);
 		pSG->RootNode = new_node;
 	}
 #ifndef GPAC_DISABLE_VRML
 	if (replace_proto) {
-		pSG = node->sgprivate->scenegraph;
+		GF_SceneGraph *pSG = node->sgprivate->scenegraph;
 		gf_list_del_item(pSG->pOwningProto->node_code, node);
 		if (pSG->pOwningProto->RenderingNode==node) pSG->pOwningProto->RenderingNode = NULL;
 		gf_node_unregister(node, NULL);
@@ -1330,8 +1359,8 @@
 GF_EXPORT
 void gf_node_unregister_children(GF_Node *container, GF_ChildNodeItem *child)
 {
-	GF_ChildNodeItem *cur;
 	while (child) {
+		GF_ChildNodeItem *cur;
 		gf_node_unregister(child->node, container);
 		cur = child;
 		child = child->next;
@@ -1371,7 +1400,7 @@
 	return GF_OK;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_node_list_append_child(GF_ChildNodeItem **list, GF_ChildNodeItem **last_child, GF_Node *n)
 {
 	GF_ChildNodeItem *child, *cur;
@@ -1398,6 +1427,7 @@
 	}
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 GF_Node *gf_node_list_get_child(GF_ChildNodeItem *list, s32 pos)
@@ -1548,7 +1578,6 @@
 	((GF_ParentNode *)node)->children = NULL;
 }
 
-
 void gf_node_free(GF_Node *node)
 {
 	if (!node) return;
@@ -1571,7 +1600,7 @@
 			gf_list_del(node->sgprivate->interact->animations);
 		}
 #endif
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 		if (node->sgprivate->interact->js_binding) {
 			if (node->sgprivate->scenegraph && node->sgprivate->scenegraph->on_node_modified)
 				node->sgprivate->scenegraph->on_node_modified(node->sgprivate->scenegraph, node, NULL, NULL);
@@ -1590,7 +1619,7 @@
 u32 gf_node_get_parent_count(GF_Node *node)
 {
 	u32 count = 0;
-	GF_ParentList *nlist = node->sgprivate->parents;
+	GF_ParentList *nlist = node ? node->sgprivate->parents : 0;
 	while (nlist) {
 		count++;
 		nlist = nlist->next;
@@ -1649,7 +1678,7 @@
 {
 	Bool check_root = 1;
 	GF_ParentList *nlist;
-#if defined GPAC_ANDROID
+#if defined GPAC_CONFIG_ANDROID
 	if ( !node || !node->sgprivate )
 		return;
 #else
@@ -1666,7 +1695,7 @@
 		nlist = nlist->next;
 	}
 	/*propagate to parent scene graph */
-#if defined GPAC_ANDROID
+#if defined GPAC_CONFIG_ANDROID
 	if (check_root && node->sgprivate->scenegraph) {
 #else
 	if (check_root) {
@@ -1920,7 +1949,7 @@
 	return "UnsupportedNode";
 }
 
-GF_EXPORT
+#if 0 //unused
 u32 gf_sg_node_get_tag_by_class_name(const char *name, u32 ns)
 {
 	u32 tag = TAG_UndefinedNode;
@@ -1944,6 +1973,8 @@
 
 	return 	tag;
 }
+#endif
+
 
 GF_EXPORT
 GF_Node *gf_node_new(GF_SceneGraph *inScene, u32 tag)
@@ -1962,18 +1993,19 @@
 	else if (tag == TAG_DOMText) {
 		GF_DOMText *n;
 		GF_SAFEALLOC(n, GF_DOMText);
+		if (!n) return NULL;
 		node = (GF_Node*)n;
 		gf_node_setup(node, TAG_DOMText);
 	}
 	else if (tag == TAG_DOMFullNode) {
 		GF_DOMFullNode*n;
 		GF_SAFEALLOC(n, GF_DOMFullNode);
+		if (!n) return NULL;
 		node = (GF_Node*)n;
 		gf_node_setup(node, TAG_DOMFullNode);
 	}
 #ifndef GPAC_DISABLE_SVG
 	else if (tag <= GF_NODE_RANGE_LAST_SVG) node = (GF_Node *) gf_svg_create_node(tag);
-	else if (tag <= GF_NODE_RANGE_LAST_XBL) node = (GF_Node *) gf_xbl_create_node(tag);
 #endif
 	else node = NULL;
 
@@ -2026,7 +2058,7 @@
 
 u32 gf_node_get_num_instances(GF_Node *node)
 {
-	return node->sgprivate->num_instances;
+	return node ? node->sgprivate->num_instances : 0;
 }
 
 static GF_Err gf_node_get_field_by_name_enum(GF_Node *node, char *name, GF_FieldInfo *field)
@@ -2075,7 +2107,9 @@
 static char log_node_name[2+16+1];
 const char *gf_node_get_log_name(GF_Node *anim)
 {
-	const char *name = gf_node_get_name(anim);
+	const char *name;
+	if (!anim) return "";
+	name = gf_node_get_name(anim);
 	if (name) return name;
 	else {
 		sprintf(log_node_name, "%p", anim);
@@ -2194,7 +2228,7 @@
 	else if (!strcmp(name, "http://www.w3.org/2001/xml-events")) return GF_XMLNS_XMLEV;
 	else if (!strcmp(name, "http://www.w3.org/1999/xlink")) return GF_XMLNS_XLINK;
 	else if (!strcmp(name, "http://www.w3.org/2000/svg")) return GF_XMLNS_SVG;
-	else if (!strcmp(name, "urn:mpeg:mpeg4:laser:2005")) return GF_XMLNS_LASER;
+	else if (!strcmp(name, "urn:mpeg:mpeg4:LASeR:2005")) return GF_XMLNS_LASER;
 	else if (!strcmp(name, "http://www.w3.org/ns/xbl")) return GF_XMLNS_XBL;
 	else if (!strcmp(name, "http://gpac.io/svg-extensions")) return GF_XMLNS_SVG_GPAC_EXTENSION;
 	return GF_XMLNS_UNDEFINED;
@@ -2245,13 +2279,12 @@
 	return GF_OK;
 }
 
-u32 gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname)
+GF_NamespaceType gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname)
 {
-	GF_XMLNS *ns;
 	u32 i, count;
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
-		ns = gf_list_get(sg->ns, i);
+		GF_XMLNS *ns = gf_list_get(sg->ns, i);
 		if (!ns->qname && !qname)
 			return ns->xmlns_id;
 
@@ -2265,13 +2298,12 @@
 	return GF_XMLNS_UNDEFINED;
 }
 
-u32 gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name)
+GF_NamespaceType gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name)
 {
-	GF_XMLNS *ns;
 	u32 i, count;
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
-		ns = gf_list_get(sg->ns, i);
+		GF_XMLNS *ns = gf_list_get(sg->ns, i);
 		if (ns->name && name && !strcmp(ns->name, name))
 			return ns->xmlns_id;
 		if (!ns->name && !name)
@@ -2282,11 +2314,10 @@
 
 const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, GF_NamespaceType xmlns_id)
 {
-	GF_XMLNS *ns;
 	u32 i, count;
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
-		ns = gf_list_get(sg->ns, i);
+		GF_XMLNS *ns = gf_list_get(sg->ns, i);
 		if (ns->xmlns_id == xmlns_id)
 			return ns->qname;
 	}
@@ -2297,11 +2328,11 @@
 
 const char *gf_sg_get_namespace(GF_SceneGraph *sg, GF_NamespaceType xmlns_id)
 {
-	GF_XMLNS *ns;
 	u32 i, count;
+	if (!sg) return NULL;
 	count = sg->ns ? gf_list_count(sg->ns) : 0;
 	for (i=0; i<count; i++) {
-		ns = gf_list_get(sg->ns, i);
+		GF_XMLNS *ns = gf_list_get(sg->ns, i);
 		if (ns->xmlns_id == xmlns_id)
 			return ns->name;
 	}
@@ -2309,7 +2340,7 @@
 }
 
 
-GF_EXPORT
+#if 0 //unused
 char *gf_node_dump_attribute(GF_Node *n, GF_FieldInfo *info)
 {
 #ifndef GPAC_DISABLE_SVG
@@ -2324,6 +2355,7 @@
 	return NULL;
 #endif
 }
+#endif
 
 
 /*this is not a NodeReplace, thus only the given container is updated - pos is 0-based*/
@@ -2400,3 +2432,81 @@
 	return scene ? scene->parent_scene : NULL;
 }
 
+
+#include <gpac/xml.h>
+
+static GF_Err gf_sg_load_dom_node(GF_SceneGraph *document, GF_XMLNode *n, GF_DOMFullNode *par)
+{
+	u32 i, count;
+	GF_DOMFullAttribute *prev = NULL;
+	GF_DOMFullNode *node;
+
+	if (!n) return GF_OK;
+	if (!par && document->RootNode) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	/*construct text / cdata node*/
+	if (n->type != GF_XML_NODE_TYPE) {
+		u32 len;
+		GF_DOMText *txt;
+		/*basic check, remove all empty text nodes*/
+		len = (u32) strlen(n->name);
+		for (i=0; i<len; i++) {
+			if (!strchr(" \n\r\t", n->name[i])) break;
+		}
+		if (i==len) return GF_OK;
+		txt = gf_dom_add_text_node((GF_Node *)par, gf_strdup(n->name) );
+		txt->type = (n->type==GF_XML_CDATA_TYPE) ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
+		return GF_OK;
+	}
+	/*construct DOM node*/
+	node = (GF_DOMFullNode *) gf_node_new(document, TAG_DOMFullNode);
+	node->name = gf_strdup(n->name);
+	if (n->ns)
+		node->ns = gf_sg_get_namespace_code(document, n->ns);
+
+	count = gf_list_count(n->attributes);
+	for (i=0; i<count; i++) {
+		GF_XMLAttribute *src_att = gf_list_get(n->attributes, i);
+		/* special case for 'xml:id' to be parsed as an ID
+		NOTE: we do not test for the 'id' attribute because without DTD we are not sure that it's an ID */
+		if (!stricmp(src_att->name, "xml:id")) {
+			u32 id = gf_sg_get_max_node_id(document) + 1;
+			gf_node_set_id((GF_Node *)node, id, src_att->value);
+		} else {
+			GF_DOMFullAttribute *att;
+			GF_SAFEALLOC(att, GF_DOMFullAttribute);
+			if (!att) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XHR] Fail to allocate DOM attribute\n"));
+				continue;
+			}
+			att->tag = TAG_DOM_ATT_any;
+			att->name = gf_strdup(src_att->name);
+			att->data_type = (u16) DOM_String_datatype;
+			att->data = gf_svg_create_attribute_value(att->data_type);
+			*((char **)att->data) = gf_strdup(src_att->value);
+			if (prev) prev->next = (GF_DOMAttribute*)att;
+			else node->attributes = (GF_DOMAttribute*)att;
+			prev = att;
+		}
+	}
+	gf_node_register((GF_Node*)node, (GF_Node*)par);
+	if (par) {
+		gf_node_list_add_child(&par->children, (GF_Node*)node);
+	} else {
+		document->RootNode = (GF_Node*)node;
+	}
+	count = gf_list_count(n->content);
+	for (i=0; i<count; i++) {
+		GF_XMLNode *child = gf_list_get(n->content, i);
+		GF_Err e = gf_sg_load_dom_node(document, child, node);
+		if (e) return e;
+	}
+	return GF_OK;
+}
+
+GF_Err gf_sg_init_from_xml_node(GF_SceneGraph *document, GF_DOMXMLNODE root_node)
+{
+	return gf_sg_load_dom_node(document, root_node, NULL);
+}
+

gpac-0.8.0.tar.gz/src/scenegraph/commands.c -> gpac-1.0.0.tar.gz/src/scenegraph/commands.c Changed

@@ -65,10 +65,10 @@
 				break;
 			case GF_SG_VRML_MFNODE:
 				if (inf->field_ptr) {
-					GF_ChildNodeItem *cur, *child;
+					GF_ChildNodeItem *child;
 					child = inf->node_list;
 					while (child) {
-						cur = child;
+						GF_ChildNodeItem *cur = child;
 						gf_node_try_destroy(com->in_scene, child->node, NULL);
 						child = child->next;
 						gf_free(cur);
@@ -90,10 +90,10 @@
 
 			if (inf->new_node) gf_node_unregister(inf->new_node, NULL);
 			else if (inf->node_list) {
-				GF_ChildNodeItem *cur, *child;
+				GF_ChildNodeItem *child;
 				child = inf->node_list;
 				while (child) {
-					cur = child;
+					GF_ChildNodeItem *cur = child;
 					gf_node_try_destroy(com->in_scene, child->node, NULL);
 					child = child->next;
 					gf_free(cur);
@@ -148,8 +148,8 @@
 #ifndef GPAC_DISABLE_SVG
 static void gf_node_unregister_children_deactivate(GF_Node *container, GF_ChildNodeItem *child)
 {
-	GF_ChildNodeItem *cur;
 	while (child) {
+		GF_ChildNodeItem *cur;
 		gf_node_unregister(child->node, container);
 		gf_node_deactivate(child->node);
 		cur = child;
@@ -413,9 +413,11 @@
 		inf = (GF_CommandField*)gf_list_get(com->command_fields, 0);
 
 		e = gf_node_insert_child(com->node, inf->new_node, inf->pos);
-		if (!e) gf_node_register(inf->new_node, com->node);
-		if (!e) gf_node_event_out(com->node, inf->fieldIndex);
-		if (!e) gf_node_changed(com->node, NULL);
+		if (!e) e = gf_node_register(inf->new_node, com->node);
+		if (!e) {
+			gf_node_event_out(com->node, inf->fieldIndex);
+			gf_node_changed(com->node, NULL);
+		}
 		break;
 	}
 	case GF_SG_ROUTE_INSERT:
@@ -498,7 +500,7 @@
 	{
 		s32 pos = -2;
 		GF_Node *target = NULL;
-		GF_ChildNodeItem *list, *cur, *prev;
+		GF_ChildNodeItem *list, *cur;
 		GF_FieldInfo value;
 		inf = (GF_CommandField*)gf_list_get(com->command_fields, 0);
 		if (!inf) return GF_SG_UNKNOWN_NODE;
@@ -578,6 +580,7 @@
 				/*note we don't add time offset, since there's no MFTime*/
 			}
 		} else {
+			GF_ChildNodeItem *prev;
 			switch (field.fieldType) {
 			case GF_SG_VRML_SFNODE:
 			{
@@ -886,7 +889,8 @@
 {
 	GF_CommandField *ptr;
 	GF_SAFEALLOC(ptr, GF_CommandField);
-	gf_list_add(com->command_fields, ptr);
+	if (ptr)
+		gf_list_add(com->command_fields, ptr);
 	return ptr;
 }
 
@@ -926,6 +930,9 @@
 	/*route insert, replace and delete*/
 	dest->RouteID = com->RouteID;
 	if (com->def_name) dest->def_name = gf_strdup(com->def_name);
+	//this is an union
+	//if (com->send_event_string) dest->send_event_string = gf_strdup(com->send_event_string);
+
 	dest->fromNodeID = com->fromNodeID;
 	dest->fromFieldIndex = com->fromFieldIndex;
 	dest->toNodeID = com->toNodeID;
@@ -933,8 +940,6 @@
 	dest->send_event_integer = com->send_event_integer;
 	dest->send_event_x = com->send_event_x;
 	dest->send_event_y = com->send_event_y;
-	if (com->send_event_string)
-		dest->send_event_string = gf_strdup(com->send_event_string);
 
 	dest->del_proto_list_size = com->del_proto_list_size;
 	if (com->del_proto_list_size) {

gpac-0.8.0.tar.gz/src/scenegraph/dom_events.c -> gpac-1.0.0.tar.gz/src/scenegraph/dom_events.c Changed

@@ -93,6 +93,7 @@
 	gf_dom_refresh_event_filter(sg);
 }
 
+#if 0 //unused
 u32 gf_sg_get_dom_event_filter(GF_SceneGraph *sg)
 {
 	return sg->dom_evt_filter;
@@ -106,12 +107,9 @@
 		return 0;
 	}
 }
+#endif
 
-/* Associate a listener node and a event target node
-   - adds the listener node in the list of event listener nodes for the target node
-   - sets the target node as the user of the listener
-*/
-GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target)
+GF_Err gf_sg_listener_associate(GF_Node *listener, GF_DOMEventTarget *evt_target)
 {
 	GF_FieldInfo info;
 	if (!evt_target || !listener) return GF_BAD_PARAM;
@@ -150,7 +148,7 @@
 	if (!node->sgprivate->interact->dom_evt) {
 		node->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, node);
 	}
-	return gf_sg_listener_add(listener, node->sgprivate->interact->dom_evt);
+	return gf_sg_listener_associate(listener, node->sgprivate->interact->dom_evt);
 }
 
 GF_EXPORT
@@ -244,7 +242,7 @@
 	gf_mx_v(sg->dom_evt_mx);
 }
 
-void gf_dom_listener_reset_defered(GF_SceneGraph *sg)
+void gf_dom_listener_reset_deferred(GF_SceneGraph *sg)
 {
 	gf_mx_p(sg->dom_evt_mx);
 	while (gf_list_count(sg->listeners_to_add)) {
@@ -258,14 +256,10 @@
 GF_EXPORT
 void gf_sg_handle_dom_event(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
 {
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
 	if (hdl->sgprivate->scenegraph->svg_js) {
-		if (hdl->sgprivate->scenegraph->svg_js->handler_execute(hdl, event, observer, NULL)) {
-			return;
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] Error executing JavaScript event handler\n"));
-			return;
-		}
+		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);
 	}
 #endif
 	GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] JavaScript context not found \n"));
@@ -300,9 +294,11 @@
 			XMLRI *iri = (XMLRI *)info.far_ptr;
 
 			if ((iri->type==XMLRI_STRING) && iri->string && !strnicmp(iri->string, "javascript:", 11)) {
-#ifdef GPAC_HAS_SPIDERMONKEY
+#ifdef GPAC_HAS_QJS
+				void svgjs_handler_execute(struct __tag_svg_script_ctx *svg_js, GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer, const char *iri);
+
 				if (listen->sgprivate->scenegraph->svg_js)
-					listen->sgprivate->scenegraph->svg_js->handler_execute(listen, event, observer, iri->string + 11);
+					svgjs_handler_execute(listen->sgprivate->scenegraph->svg_js, listen, event, observer, iri->string + 11);
 #endif
 				return;
 			}
@@ -500,12 +496,14 @@
 	gf_sg_dom_event_bubble(parent, event, use_stack, cur_par_idx);
 }
 
-void gf_sg_dom_stack_parents(GF_Node *node, GF_List *stack)
+#if 0 //unused, see below
+static void gf_sg_dom_stack_parents(GF_Node *node, GF_List *stack)
 {
 	if (!node) return;
 	if (node->sgprivate->interact && node->sgprivate->interact->dom_evt) gf_list_insert(stack, node, 0);
 	gf_sg_dom_stack_parents(gf_node_get_parent(node, 0), stack);
 }
+#endif
 
 GF_EXPORT
 Bool gf_dom_event_fire_ex(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack)
@@ -520,7 +518,7 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[DOM Events    ] Graph %p Time %f - Firing event  %s.%s\n", gf_node_get_graph(node), gf_node_get_scene_time(node), gf_node_get_log_name(node), gf_dom_event_get_name(event->type)));
 
 	/*flush any pending add_listener
-	see "determine the current target's candidate event listeners" in http://www.w3.org/TR/DOM-Level-3-Events/events.html*/
+	see "determine the current target's candidate event listeners" in http://www.w3.org/TR/DOM-Level-3-Events/events.html */
 	gf_dom_listener_process_add(node->sgprivate->scenegraph);
 
 	event->consumed = 0;
@@ -537,7 +535,8 @@
 
 	/*capture phase - not 100% sure, the actual capture phase should be determined by the std using the DOM events
 	SVGT doesn't use this phase, so we don't add it for now.*/
-	if (0) {
+#if 0
+	if ((0)) {
 		Bool aborted = GF_FALSE;
 		u32 i, count;
 		GF_List *parents;
@@ -558,8 +557,13 @@
 			}
 		}
 		gf_list_del(parents);
-		if (aborted) return GF_TRUE;
+		if (aborted) {
+			event->currentTarget = NULL;
+			return GF_TRUE;
+		}
 	}
+#endif
+
 	/*target phase*/
 	event->event_phase = GF_DOM_EVENT_PHASE_AT_TARGET;
 	cur_par_idx = 0;
@@ -585,7 +589,7 @@
 	}
 	sg->use_stack = prev_use_stack;
 	sg->abort_bubbling = prev_bub;
-
+	event->currentTarget = NULL;
 	return event->consumed ? GF_TRUE : GF_FALSE;
 }
 
@@ -719,12 +723,14 @@
 static void gf_smil_handle_event_begin(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 *)gf_node_get_private(hdl);
+	if (!timed_elt || !timed_elt->timingp) return;
+
 	memset(&info, 0, sizeof(GF_FieldInfo));
 	info.name = "begin";
 	info.far_ptr = ((SVGTimedAnimBaseElement *)timed_elt)->timingp->begin;
 	info.fieldType = SMIL_Times_datatype;
-	gf_smil_handle_event(timed_elt, &info, evt, GF_FALSE);
+	gf_smil_handle_event((GF_Node *)timed_elt, &info, evt, GF_FALSE);
 }
 
 static void gf_smil_handle_event_end(GF_Node *hdl, GF_DOM_Event *evt, GF_Node *observer)
@@ -740,7 +746,7 @@
 
 static void gf_smil_setup_event_list(GF_Node *node, GF_List *l, Bool is_begin)
 {
-	void *hdl;
+	GF_DOMHandler *hdl;
 	u32 i, count;
 	count = gf_list_count(l);
 	for (i=0; i<count; i++) {
@@ -775,10 +781,18 @@
 		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, ...)*/
 	}
 }
@@ -833,6 +847,7 @@
 	u32 len = 0;
 	char *res = NULL;
 	GF_ChildNodeItem *list;
+	if (!n) return NULL;
 
 	if ((n->sgprivate->tag==TAG_DOMText) && ((GF_DOMText*)n)->textContent) {
 		/*if ( ((GF_DOMText*)n)->type == GF_DOM_TEXT_REGULAR) */{
@@ -871,6 +886,7 @@
 	return text;
 }
 
+#if 0 //unused
 GF_DOMUpdates *gf_dom_add_update_node(GF_Node *parent)
 {
 	GF_DOMUpdates *update;
@@ -884,6 +900,7 @@
 	gf_node_list_add_child_last(&((GF_ParentNode *)parent)->children, (GF_Node*)update, NULL);
 	return update;
 }
+#endif
 
 void gf_dom_event_dump_listeners(GF_Node *n, FILE *f)
 {
@@ -914,7 +931,7 @@
 				txt = hdl->children ? (GF_DOMText*)hdl->children->node : NULL;
 				if (!txt || (txt->sgprivate->tag!=TAG_DOMText) || !txt->textContent) continue;
 				if (gf_node_get_attribute_by_tag((GF_Node*)hdl, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info)==GF_OK) {
-					fprintf(f, " on%s=\"%s\"", gf_dom_event_get_name( ((XMLEV_Event*)info.far_ptr)->type), txt->textContent);
+					gf_fprintf(f, " on%s=\"%s\"", gf_dom_event_get_name( ((XMLEV_Event*)info.far_ptr)->type), txt->textContent);
 				}
 			}
 		}

gpac-1.0.0.tar.gz/src/scenegraph/dom_js.c Added

@@ -0,0 +1,3104 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2007-2019
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph 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/setup.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include "qjs_common.h"
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+/*dom events*/
+#include <gpac/events.h>
+/*dom text event*/
+#include <gpac/utf.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/xml.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+#ifdef GPAC_HAS_QJS
+
+#include <gpac/html5_mse.h>
+
+#ifdef GPAC_CONFIG_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif /* XP_UNIX */
+#endif
+
+#include <gpac/html5_media.h>
+
+/************************************************************
+ *
+ *				DOM3 core implementation
+ *
+ *	This is NOT a full dom implementation :)
+ *
+ *************************************************************/
+
+GF_JSClass domDocumentClass;
+GF_JSClass domNodeClass;
+GF_JSClass domElementClass;
+GF_JSClass domTextClass;
+GF_JSClass domNodeListClass;
+GF_JSClass domEventClass;
+GF_JSClass htmlMediaElementClass;
+
+
+typedef struct
+{
+	u32 nb_inst;
+
+	GF_List *handlers;
+} GF_DOMRuntime;
+
+static GF_DOMRuntime *dom_rt = NULL;
+
+typedef enum {
+	NODE_JSPROPERTY_NODENAME				= -1,
+	NODE_JSPROPERTY_NODEVALUE				= -2,
+	NODE_JSPROPERTY_NODETYPE				= -3,
+	NODE_JSPROPERTY_PARENTNODE				= -4,
+	NODE_JSPROPERTY_CHILDNODES				= -5,
+	NODE_JSPROPERTY_FIRSTCHILD				= -6,
+	NODE_JSPROPERTY_LASTCHILD				= -7,
+	NODE_JSPROPERTY_PREVIOUSSIBLING			= -8,
+	NODE_JSPROPERTY_NEXTSIBLING				= -9,
+	NODE_JSPROPERTY_ATTRIBUTES				= -10,
+	NODE_JSPROPERTY_OWNERDOCUMENT			= -11,
+	NODE_JSPROPERTY_NAMESPACEURI			= -12,
+	NODE_JSPROPERTY_PREFIX					= -13,
+	NODE_JSPROPERTY_LOCALNAME				= -14,
+	NODE_JSPROPERTY_BASEURI					= -15,
+	NODE_JSPROPERTY_TEXTCONTENT				= -16,
+	NODE_JSPROPERTY_FIRSTELEMENTCHILD		= -17,
+	NODE_JSPROPERTY_LASTELEMENTCHILD		= -18,
+	NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING	= -19,
+	NODE_JSPROPERTY_NEXTELEMENTSIBLING		= -20
+} GF_DOMNodeJSProperty;
+
+typedef enum {
+	DOCUMENT_JSPROPERTY_DOCTYPE				= -1,
+	DOCUMENT_JSPROPERTY_IMPLEMENTATION		= -2,
+	DOCUMENT_JSPROPERTY_DOCUMENTELEMENT		= -3,
+	DOCUMENT_JSPROPERTY_INPUTENCODING		= -4,
+	DOCUMENT_JSPROPERTY_XMLENCODING			= -5,
+	DOCUMENT_JSPROPERTY_XMLSTANDALONE		= -6,
+	DOCUMENT_JSPROPERTY_XMLVERSION			= -7,
+	DOCUMENT_JSPROPERTY_STRICTERRORCHECKING	= -8,
+	DOCUMENT_JSPROPERTY_DOCUMENTURI			= -9,
+	DOCUMENT_JSPROPERTY_LOCATION			= -10,
+	DOCUMENT_JSPROPERTY_DOMCONFIG			= -11,
+	DOCUMENT_JSPROPERTY_GLOBAL				= -12
+} GF_DOMDocumentJSProperty;
+
+typedef enum {
+	ELEMENT_JSPROPERTY_TAGNAME			= -1,
+	ELEMENT_JSPROPERTY_SCHEMATYPEINFO	= -2,
+} GF_DOMElementJSProperty;
+
+typedef enum {
+	DCCI_JSPROPERTY_VALUE						= -1,
+	DCCI_JSPROPERTY_VALUETYPE					= -2,
+	DCCI_JSPROPERTY_PROPERTYTYPE				= -3,
+	DCCI_JSPROPERTY_READONLY					= -4,
+	DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE	= -5,
+	DCCI_JSPROPERTY_DCCIMETADATAINTERFACE		= -6,
+	DCCI_JSPROPERTY_VERSION						= -7,
+} GF_DCCIJSProperty;
+
+typedef enum {
+	NODELIST_JSPROPERTY_LENGTH = -1,
+} GF_DOMNodeListJSProperty;
+
+typedef enum {
+	EVENT_JSPROPERTY_TYPE						= -1,
+	EVENT_JSPROPERTY_TARGET						= -2,
+	EVENT_JSPROPERTY_CURRENTTARGET				= -3,
+	EVENT_JSPROPERTY_EVENTPHASE					= -4,
+	EVENT_JSPROPERTY_BUBBLES					= -5,
+	EVENT_JSPROPERTY_CANCELABLE					= -6,
+	EVENT_JSPROPERTY_TIMESTAMP					= -7,
+	EVENT_JSPROPERTY_NAMESPACEURI				= -8,
+	EVENT_JSPROPERTY_DEFAULTPREVENTED			= -9,
+	EVENT_JSPROPERTY_DETAIL						= -10,
+	EVENT_JSPROPERTY_DATA						= -11,
+	EVENT_JSPROPERTY_SCREENX					= -12,
+	EVENT_JSPROPERTY_SCREENY					= -13,
+	EVENT_JSPROPERTY_CLIENTX					= -14,
+	EVENT_JSPROPERTY_CLIENTY					= -15,
+	EVENT_JSPROPERTY_BUTTON						= -16,
+	EVENT_JSPROPERTY_RELATEDTARGET				= -17,
+	EVENT_JSPROPERTY_WHEELDELTA					= -18,
+	EVENT_JSPROPERTY_KEYIDENTIFIER				= -19,
+	EVENT_JSPROPERTY_KEYCHAR					= -20,
+	EVENT_JSPROPERTY_CHARCODE					= -21,
+	EVENT_JSPROPERTY_LENGTHCOMPUTABLE			= -22,
+	EVENT_JSPROPERTY_TYPEARG					= -23,
+	EVENT_JSPROPERTY_LOADED						= -24,
+	EVENT_JSPROPERTY_TOTAL						= -25,
+	EVENT_JSPROPERTY_BUFFER_ON					= -26,
+	EVENT_JSPROPERTY_BUFFERLEVEL				= -27,
+	EVENT_JSPROPERTY_BUFFERREMAININGTIME		= -28,
+	EVENT_JSPROPERTY_STATUS						= -29,
+	EVENT_JSPROPERTY_WIDTH						= -30,
+	EVENT_JSPROPERTY_HEIGHT						= -31,
+	EVENT_JSPROPERTY_OFFSETX					= -32,
+	EVENT_JSPROPERTY_OFFSETY					= -33,
+	EVENT_JSPROPERTY_VPWIDTH					= -34,
+	EVENT_JSPROPERTY_VPHEIGHT					= -35,
+	EVENT_JSPROPERTY_TRANSLATIONX				= -36,
+	EVENT_JSPROPERTY_TRANSLATIONY				= -37,
+	EVENT_JSPROPERTY_TYPE3D						= -38,
+	EVENT_JSPROPERTY_ERROR						= -39,
+	EVENT_JSPROPERTY_DYNAMIC_SCENE				= -40,
+	EVENT_JSPROPERTY_URL							= -41,
+} GF_DOMEventJSProperty;
+
+typedef enum {
+	TEXT_JSPROPERTY_DATA						= -1,
+	TEXT_JSPROPERTY_LENGTH						= -2,
+	TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE	= -3,
+	TEXT_JSPROPERTY_WHOLETEXT					= -4,
+} GF_DOMTextJSProperty;
+
+
+
+JSValue xml_dom3_not_implemented(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return js_throw_err(ctx, GF_DOM_EXC_NOT_SUPPORTED_ERR);
+}
+
+
+#define JS_DOM3_uDOM_FIRST_PROP		18
+
+void dom_node_changed(GF_Node *n, Bool child_modif, GF_FieldInfo *info)
+{
+	if (info) {
+		if (child_modif) {
+			gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
+		}
+#ifndef GPAC_DISABLE_SVG
+		else {
+			u32 flag = gf_svg_get_modification_flags((SVG_Element *)n, info);
+			gf_node_dirty_set(n, flag, GF_FALSE);
+		}
+#endif
+	}
+	gf_node_changed(n, info);
+}
+
+static void define_dom_exception(JSContext *c, JSValue global)
+{
+#define DEF_EXC(_val)	\
+	JS_SetPropertyStr(c, obj, #_val, JS_NewInt32(c, GF_DOM_EXC_##_val));
+
+	JSValue obj = JS_NewObject(c);
+	JS_SetPropertyStr(c, global, "DOMException", obj);
+
+	DEF_EXC(INDEX_SIZE_ERR);
+	DEF_EXC(DOMSTRING_SIZE_ERR);
+	DEF_EXC(HIERARCHY_REQUEST_ERR);
+	DEF_EXC(WRONG_DOCUMENT_ERR);
+	DEF_EXC(INVALID_CHARACTER_ERR);
+	DEF_EXC(NO_DATA_ALLOWED_ERR);
+	DEF_EXC(NO_MODIFICATION_ALLOWED_ERR);
+	DEF_EXC(NOT_FOUND_ERR);
+	DEF_EXC(NOT_SUPPORTED_ERR);
+	DEF_EXC(INUSE_ATTRIBUTE_ERR);
+	DEF_EXC(INVALID_STATE_ERR);
+	DEF_EXC(SYNTAX_ERR);
+	DEF_EXC(INVALID_MODIFICATION_ERR);
+	DEF_EXC(NAMESPACE_ERR);
+	DEF_EXC(INVALID_ACCESS_ERR);
+	DEF_EXC(VALIDATION_ERR);
+	DEF_EXC(TYPE_MISMATCH_ERR);
+	DEF_EXC(SECURITY_ERR);
+	DEF_EXC(NETWORK_ERR);
+	DEF_EXC(ABORT_ERR);
+	DEF_EXC(URL_MISMATCH_ERR);
+	DEF_EXC(QUOTA_EXCEEDED_ERR);
+	DEF_EXC(TIMEOUT_ERR);
+	DEF_EXC(INVALID_NODE_TYPE_ERR);
+	DEF_EXC(DATA_CLONE_ERR);
+	DEF_EXC(SECURITY_ERR);
+#undef  DEF_EXC
+
+	//JS_AliasProperty(c, global, "DOMException", "e");
+	obj = JS_NewObject(c);
+	JS_SetPropertyStr(c, global, "EventException", obj);
+	JS_SetPropertyStr(c, obj, "UNSPECIFIED_EVENT_TYPE_ERR", JS_NewInt32(c, 0));
+	JS_SetPropertyStr(c, obj, "DISPATCH_REQUEST_ERR", JS_NewInt32(c, 1));
+}
+
+
+GF_Node *dom_get_node(JSValue obj)
+{
+	GF_Node *n = (GF_Node *) JS_GetOpaque_Nocheck(obj);
+	if (n && n->sgprivate) return n;
+	return NULL;
+}
+
+GF_Node *dom_get_element(JSContext *c, JSValue obj)
+{
+	GF_Node *n = (GF_Node *) JS_GetOpaque_Nocheck(obj);
+	if (!n || !n->sgprivate) return NULL;
+	if (n->sgprivate->tag==TAG_DOMText) return NULL;
+	return n;
+}
+
+GF_SceneGraph *dom_get_doc(JSContext *c, JSValue obj)
+{
+	GF_SceneGraph *sg = (GF_SceneGraph *) JS_GetOpaque_Nocheck(obj);
+	if (sg && !sg->__reserved_null) return sg;
+	return NULL;
+}
+typedef struct _dom_js_data
+{
+	JSValue document;
+} GF_DOMJSData;
+
+static void dom_js_define_document_ex(JSContext *c, JSValue global, GF_SceneGraph *doc, const char *name)
+{
+	JSClassID __class = 0;
+	JSValue obj;
+	GF_SceneGraph *par_sg;
+	if (!doc || !doc->RootNode) return;
+
+	if (doc->reference_count)
+		doc->reference_count++;
+	gf_node_register(doc->RootNode, NULL);
+	par_sg = doc;
+	while (par_sg && !par_sg->get_document_class)
+		par_sg = par_sg->parent_scene;
+
+	if (par_sg && par_sg->get_document_class)
+		__class = par_sg->get_document_class(doc);
+
+	if (!__class)
+		__class = domDocumentClass.class_id;
+
+	obj = JS_NewObjectClass(c, __class);
+	JS_SetOpaque(obj, doc);
+	GF_SAFEALLOC(doc->js_data, GF_DOMJSData);
+	if (doc->js_data)
+		doc->js_data->document = JS_DupValue(c, obj);
+
+	JS_SetPropertyStr(c, global, name, obj);
+}
+
+void dom_js_define_document(JSContext *c, JSValue global, GF_SceneGraph *doc)
+{
+	dom_js_define_document_ex(c, global, doc, "document");
+}
+
+/* Constructs a new document based on the given context and scene graph, used for documents in XHR */
+JSValue dom_document_construct(JSContext *c, GF_SceneGraph *sg)
+{
+	JSClassID __class=0;
+	JSValue new_obj;
+	GF_SceneGraph *par_sg = sg;
+	if (!dom_rt) return JS_EXCEPTION;
+	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);
+
+	while (par_sg && !par_sg->get_element_class) {
+		par_sg = par_sg->parent_scene;
+	}
+
+	if (par_sg && par_sg->get_document_class)
+		__class = par_sg->get_document_class(sg);
+
+	if (!__class)
+		__class = domDocumentClass.class_id;
+
+	new_obj = JS_NewObjectClass(c, __class);
+	JS_SetOpaque(new_obj, sg);
+	GF_SAFEALLOC(sg->js_data, GF_DOMJSData);
+	if (sg->js_data)
+		sg->js_data->document = JS_DupValue(c, new_obj);
+	return new_obj;
+}
+
+JSValue dom_document_construct_external(JSContext *c, GF_SceneGraph *sg)
+{
+	return dom_document_construct(c, sg);
+
+}
+
+static JSValue dom_base_node_construct(JSContext *c, JSClassID class_id, GF_Node *n)
+{
+	GF_SceneGraph *sg;
+	JSValue new_obj;
+	if (!n || !n->sgprivate->scenegraph) return JS_NULL;
+	if (n->sgprivate->tag<TAG_DOMText) return JS_NULL;
+
+	sg = n->sgprivate->scenegraph;
+
+	if (n->sgprivate->interact && n->sgprivate->interact->js_binding && !JS_IsUndefined(n->sgprivate->interact->js_binding->obj) ) {
+		return JS_DupValue(c, n->sgprivate->interact->js_binding->obj);
+	}
+
+	if (n->sgprivate->scenegraph->reference_count)
+		n->sgprivate->scenegraph->reference_count ++;
+
+	gf_node_register(n, NULL);
+	new_obj = JS_NewObjectClass(c, class_id);
+	JS_SetOpaque(new_obj, n);
+
+	if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio)
+	{
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+		html_media_element_js_init(c, new_obj, n);
+#endif
+
+	}
+	if (!n->sgprivate->interact) {
+		GF_SAFEALLOC(n->sgprivate->interact, struct _node_interactive_ext);
+		if (!n->sgprivate->interact) {
+			return JS_NULL;
+		}
+	}
+	if (!n->sgprivate->interact->js_binding) {
+		GF_SAFEALLOC(n->sgprivate->interact->js_binding, struct _node_js_binding);
+		if (!n->sgprivate->interact->js_binding) {
+			return JS_NULL;
+		}
+	}
+	n->sgprivate->interact->js_binding->obj = JS_DupValue(c, new_obj);
+	gf_list_add(sg->objects, n->sgprivate->interact->js_binding);
+	return new_obj;
+}
+static JSValue dom_node_construct(JSContext *c, GF_Node *n)
+{
+	JSClassID __class = 0;
+	GF_SceneGraph *par_sg;
+	if (!n) return JS_NULL;
+	par_sg = n->sgprivate->scenegraph;
+	while (par_sg && !par_sg->get_element_class)
+		par_sg = par_sg->parent_scene;
+
+	if (par_sg && par_sg->get_element_class)
+		__class = par_sg->get_element_class(n);
+
+	if (!__class)
+		__class = domElementClass.class_id;
+
+	/*in our implementation ONLY ELEMENTS are created, never attributes. We therefore always
+	create Elements when asked to create a node !!*/
+	return dom_base_node_construct(c, __class, n);
+}
+
+JSValue dom_element_construct(JSContext *c, GF_Node *n)
+{
+	JSClassID __class = 0;
+	GF_SceneGraph *par_sg;
+	if (!n) return JS_NULL;
+	par_sg = n->sgprivate->scenegraph;
+	while (par_sg && !par_sg->get_element_class)
+		par_sg = par_sg->parent_scene;
+
+	if (par_sg && par_sg->get_element_class)
+		__class = par_sg->get_element_class(n);
+
+	if (!__class)
+		__class = domElementClass.class_id;
+
+	return dom_base_node_construct(c, __class, n);
+}
+
+static JSValue dom_text_construct(JSContext *c, GF_Node *n)
+{
+	return dom_base_node_construct(c, domTextClass.class_id, n);
+}
+
+static void dom_unregister_node(GF_Node *n)
+{
+	GF_SceneGraph *sg = n->sgprivate->scenegraph;
+	if (!sg) return;
+	/*!! node is being deleted !! */
+	if (!n->sgprivate->num_instances) return;
+
+	gf_node_unregister(n, NULL);
+	if (sg->reference_count) {
+		sg->reference_count--;
+		if (!sg->reference_count)
+			gf_sg_del(sg);
+	}
+}
+
+JSValue dom_node_get_sibling(JSContext *c, GF_Node *n, Bool is_prev, Bool elt_only)
+{
+	GF_Node *val;
+	GF_ChildNodeItem *child;
+	s32 idx, cur;
+	GF_ParentNode *par;
+	if (!n) return JS_NULL;
+	par = (GF_ParentNode *)gf_node_get_parent(n, 0);
+	if (!par) return JS_NULL;
+
+	idx = gf_node_list_find_child(par->children, n);
+	if (idx<0) return JS_NULL;
+
+	if (!elt_only) {
+		if (is_prev) {
+			idx--;
+			if (idx<0) return JS_NULL;
+		}
+		else idx++;
+		return dom_node_construct(c, gf_node_list_get_child(par->children, idx) );
+	}
+	cur = 0;
+	val = NULL;
+	child = par->children;
+	while (child) {
+		if ((idx!=cur) && (child->node->sgprivate->tag!=TAG_DOMText)) {
+			val = child->node;
+		}
+		if (is_prev) {
+			if (idx<=cur)
+				break;
+		} else {
+			if (idx>=cur) val = NULL;
+			if (val && idx<cur)
+				break;
+		}
+		child = child->next;
+		cur++;
+	}
+	return dom_node_construct(c, val);
+}
+
+
+
+/*dom3 NodeList/NamedNodeMap*/
+typedef struct
+{
+	/*set if the object is a childList from an existing node*/
+	GF_ParentNode *owner;
+	/*child list*/
+	GF_ChildNodeItem *child;
+} DOMNodeList;
+
+
+static JSValue dom_nodelist_construct(JSContext *c, GF_ParentNode *n)
+{
+	DOMNodeList *nl;
+	JSValue new_obj;
+	if (!n) return JS_NULL;
+	GF_SAFEALLOC(nl, DOMNodeList);
+	if (!nl) return JS_EXCEPTION;
+	
+	nl->owner = n;
+	if (n->sgprivate->scenegraph->reference_count)
+		n->sgprivate->scenegraph->reference_count++;
+
+	gf_node_register((GF_Node*)n, NULL);
+	new_obj = JS_NewObjectClass(c, domNodeListClass.class_id);
+	JS_SetOpaque(new_obj, nl);
+	return new_obj;
+}
+
+static void dom_nodelist_finalize(JSRuntime *rt, JSValue obj)
+{
+	DOMNodeList *nl = JS_GetOpaque(obj, domNodeListClass.class_id);
+	if (!nl) return;
+
+	if (nl->owner) {
+		dom_unregister_node((GF_Node*)nl->owner);
+	} else {
+		/*unregister all nodes for created lists*/
+		while (nl->child) {
+			GF_ChildNodeItem *child = nl->child;
+			nl->child = child->next;
+			dom_unregister_node(child->node);
+			gf_free(child);
+		}
+	}
+	gf_free(nl);
+}
+
+static JSValue dom_nodelist_item(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Node *n;
+	u32 count;
+	s32 idx;
+	DOMNodeList *nl;
+
+	nl = (DOMNodeList *) JS_GetOpaque(obj, domNodeListClass.class_id);
+	if (!nl || (argc!=1) || JS_ToInt32(c, &idx, argv[0]))
+		return JS_EXCEPTION;
+
+	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
+	if ((idx<0) || ((u32) idx>=count)) {
+		return JS_NULL;
+	}
+	n = gf_node_list_get_child(nl->owner ? nl->owner->children : nl->child, idx);
+	return dom_node_construct(c, n);
+}
+
+static JSValue dom_nodelist_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	DOMNodeList *nl;
+	u32 count;
+	nl = (DOMNodeList *) JS_GetOpaque(obj, domNodeListClass.class_id);
+	if (!nl) return JS_EXCEPTION;
+	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
+
+	switch (magic) {
+	case NODELIST_JSPROPERTY_LENGTH:
+		return JS_NewInt32(c, count);
+	default:
+		break;
+	}
+	return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+}
+
+
+
+
+static void dom_handler_remove(GF_Node *node, void *rs, Bool is_destroy)
+{
+	if (is_destroy) {
+		SVG_handlerElement *handler = (SVG_handlerElement *)node;
+		if (handler->js_data) {
+		 	if (handler->js_data->ctx && !JS_IsUndefined(handler->js_data->fun_val)) {
+				/*unprotect the function*/
+				JS_FreeValue(handler->js_data->ctx, handler->js_data->fun_val);
+				gf_list_del_item(dom_rt->handlers, handler);
+			}
+			gf_free(handler->js_data);
+			handler->js_data = NULL;
+		}
+	}
+}
+
+static void sg_js_get_event_target(JSContext *c, JSValue obj, GF_EventType evtType, GF_Node *vrml_node,
+                                     GF_SceneGraph **sg, GF_DOMEventTarget **target, GF_Node **n)
+{
+	Bool is_svg_document_class(JSContext *c, JSValue obj);
+	Bool is_svg_element_class(JSContext *c, JSValue obj);
+	Bool gf_mse_is_mse_object(JSContext *c, JSValue obj);
+	*target = NULL;
+	*sg = NULL;
+	*n = NULL;
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIA) {
+		void gf_html_media_get_event_target(JSContext *c, JSValue obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
+		gf_html_media_get_event_target(c, obj, target, sg);
+		if (*target && *sg) return;
+	}
+
+	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIASOURCE) {
+		void gf_mse_get_event_target(JSContext *c, JSValue obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
+		gf_mse_get_event_target(c, obj, target, sg);
+		if (*target && *sg) return;
+	}
+#endif
+
+
+	if (JS_GetOpaque(obj, domDocumentClass.class_id) || is_svg_document_class(c, obj)) {
+		/*document interface*/
+		*sg = dom_get_doc(c, obj);
+		if (*sg) {
+#ifndef GPAC_DISABLE_SVG
+			*target = (*sg)->dom_evt;
+#else
+			return;
+#endif
+		} else {
+			return;
+		}
+	} else if (JS_GetOpaque(obj, domElementClass.class_id) || is_svg_element_class(c, obj) || vrml_node) {
+		/*Element interface*/
+		if (vrml_node) {
+			*n = vrml_node;
+		} else {
+			*n = dom_get_element(c, obj);
+		}
+		if (*n) {
+			*sg = (*n)->sgprivate->scenegraph;
+			if (!(*n)->sgprivate->interact->dom_evt) {
+				(*n)->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, *n);
+			}
+			*target = (*n)->sgprivate->interact->dom_evt;
+		}
+	} else {
+		void xhr_get_event_target(JSContext *c, JSValue obj, GF_SceneGraph **sg, GF_DOMEventTarget **target);
+
+		xhr_get_event_target(c, obj, sg, target);
+	}
+}
+
+static GF_Err sg_js_parse_event_args(JSContext *c, JSValue obj, int argc, JSValue *argv,
+                                     GF_EventType *evtType,
+                                     char **callback, JSValue *funval, JSValue *evt_handler) {
+	u32 offset = 0;
+	const char *type = NULL;
+	const char *inNS = NULL;
+
+	*evtType = GF_EVENT_UNKNOWN;
+	*callback = NULL;
+	*funval = JS_NULL;
+	if (evt_handler) *evt_handler = obj;
+
+	/*NS version (4 args in DOM2, 5 in DOM3 for evt_group param)*/
+	if (argc>=4) {
+		if (!JS_CHECK_STRING(argv[0])) return GF_BAD_PARAM;
+		inNS = JS_ToCString(c, argv[0]);
+		offset = 1;
+	}
+
+	if (!JS_CHECK_STRING(argv[offset])) goto err_exit;
+	type = JS_ToCString(c, argv[offset]);
+
+	if (JS_CHECK_STRING(argv[offset+1])) {
+		const char *str = JS_ToCString(c, argv[offset+1]);
+		if (!str) goto err_exit;
+		*callback = gf_strdup(str);
+		JS_FreeCString(c, str);
+	} else if (JS_IsFunction(c, argv[offset+1])) {
+		*funval = argv[offset+1];
+
+	} else if (JS_IsObject(argv[offset+1])) {
+		JSValue evt_fun;
+		if (evt_handler) {
+			*evt_handler = JS_DupValue(c, argv[offset+1]);
+		} else {
+			goto err_exit;
+		}
+		evt_fun = JS_GetPropertyStr(c, *evt_handler, "handleEvent");
+		if (!JS_IsFunction(c, evt_fun) ) goto err_exit;
+		*funval = evt_fun;
+	}
+
+	*evtType = gf_dom_event_type_by_name(type);
+	if (*evtType==GF_EVENT_UNKNOWN) goto err_exit;
+
+	JS_FreeCString(c, type);
+	JS_FreeCString(c, inNS);
+	return GF_OK;
+
+err_exit:
+	if (type) JS_FreeCString(c, type);
+	if (inNS) JS_FreeCString(c, inNS);
+	if (callback) gf_free(*callback);
+	*callback = NULL;
+	*evtType = GF_EVENT_UNKNOWN;
+	*funval = JS_NULL;
+	if (evt_handler) *evt_handler = JS_UNDEFINED;
+	return GF_BAD_PARAM;
+}
+
+
+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)
+{
+	GF_FieldInfo info;
+	GF_Node *listener;
+	SVG_handlerElement *handler;
+
+	listener = gf_node_new(sg, TAG_SVG_listener);
+	/*we don't register the listener with the parent node , it will be registered
+	on gf_dom_listener_add*/
+
+	/*!!! create the handler in the scene owning the script context !!! */
+	handler = (SVG_handlerElement *) gf_node_new(sg, TAG_SVG_handler);
+	/*we register the handler with the listener node to avoid modifying the DOM*/
+	gf_node_register((GF_Node *)handler, listener);
+	gf_node_list_add_child(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler);
+
+	if (!callback) {
+		GF_SAFEALLOC(handler->js_data, struct js_handler_context)
+		if (handler->js_data) {
+			handler->js_data->fun_val = funval;
+			handler->js_data->ctx = c;
+			if (JS_IsFunction(c, funval)) {
+				/*protect the function - we don't know how it was passed to us, so prevent it from being GCed*/
+				handler->js_data->fun_val = JS_DupValue(c, funval);
+				handler->sgprivate->UserCallback = dom_handler_remove;
+				gf_list_add(dom_rt->handlers, handler);
+			}
+			handler->js_data->evt_listen_obj = evt_handler;
+		}
+	}
+
+	/*create attributes if needed*/
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
+	((XMLEV_Event*)info.far_ptr)->type = evtType;
+	gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_TRUE, GF_FALSE, &info);
+	((XMLRI*)info.far_ptr)->target = (GF_Node*)handler;
+	if (n) {
+		gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_target, GF_TRUE, GF_FALSE, &info);
+		((XMLRI*)info.far_ptr)->target = n;
+	}
+
+	gf_node_get_attribute_by_tag((GF_Node*)handler, TAG_XMLEV_ATT_event, GF_TRUE, GF_FALSE, &info);
+	((XMLEV_Event*)info.far_ptr)->type = evtType;
+
+	if (callback) gf_dom_add_text_node((GF_Node *)handler, gf_strdup(callback));
+
+#ifndef GPAC_DISABLE_SVG
+	if (handler->sgprivate->scenegraph->svg_js)
+		handler->handle_event = gf_sg_handle_dom_event;
+#endif
+
+	if (vrml_node) {
+		assert(handler->js_data);
+		handler->js_data->ctx = c;
+#ifndef GPAC_DISABLE_VRML
+		if (vrml_node->sgprivate->tag <= GF_NODE_RANGE_LAST_VRML)
+			handler->handle_event = gf_sg_handle_dom_event_for_vrml;
+#endif
+	}
+
+	return listener;
+}
+
+/*eventListeners routines used by document, element and XHR interfaces*/
+JSValue gf_sg_js_event_add_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, GF_Node *vrml_node)
+{
+	GF_DOMEventTarget *target = NULL;
+	GF_Node *listener = NULL;
+	GF_EventType evtType = GF_EVENT_UNKNOWN;
+	GF_SceneGraph *sg = NULL;
+	char *callback = NULL;
+	JSValue funval = JS_UNDEFINED;
+	GF_Node *n = NULL;
+	JSValue evt_handler = JS_UNDEFINED;
+	GF_Err e;
+
+	/* Determine the event type and handler params */
+	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, &evt_handler);
+	if (e != GF_OK) goto err_exit;
+
+	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
+	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &n);
+	if (!sg || !target) goto err_exit;
+
+	listener = create_listener(sg, evtType, n, vrml_node, c, callback, funval, evt_handler);
+	if (!listener) goto err_exit;
+
+	/*don't add listener directly, post it and wait for event processing*/
+	if (n) {
+		gf_sg_listener_post_add((GF_Node *) n, listener);
+	} else {
+		gf_sg_listener_associate(listener, target);
+	}
+
+err_exit:
+	if (callback) gf_free(callback);
+	if (e)
+		return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+	return JS_UNDEFINED;
+}
+
+
+JSValue dom_event_add_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return gf_sg_js_event_add_listener(c, obj, argc, argv, NULL);
+}
+
+JSValue gf_sg_js_event_remove_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, GF_Node *vrml_node)
+{
+#ifndef GPAC_DISABLE_SVG
+	char *callback = NULL;
+	GF_EventType evtType = GF_EVENT_UNKNOWN;
+	u32 i, count;
+	GF_Node *node = NULL;
+	JSValue funval = JS_UNDEFINED;
+	GF_SceneGraph *sg = NULL;
+	GF_DOMEventTarget *target = NULL;
+	GF_Err e;
+
+	/* Determine the event type and handler params */
+	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, NULL);
+	if (e != GF_OK) goto err_exit;
+
+	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
+	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &node);
+	if (!sg || !target) return JS_TRUE;
+
+	/*flush all pending add_listener*/
+	gf_dom_listener_process_add(sg);
+
+	count = gf_list_count(target->listeners);
+	for (i=0; i<count; i++) {
+		GF_FieldInfo info;
+		GF_DOMText *txt;
+		SVG_handlerElement *hdl;
+		GF_Node *el = (GF_Node *)gf_list_get(target->listeners, i);
+
+		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
+		if (!info.far_ptr) continue;
+		if (((XMLEV_Event*)info.far_ptr)->type != evtType) continue;
+
+		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
+		if (!info.far_ptr) continue;
+		hdl = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
+		if (!hdl) continue;
+		if (! JS_IsNull(funval) ) {
+			Bool is_same = GF_FALSE;
+
+			const char * f1 = JS_ToCString(c, funval);
+			const char * f2 = JS_ToCString(c, funval);
+			if (f1 && f2 && !strcmp(f1, f2)) is_same = GF_TRUE;
+			JS_FreeCString(c, f1);
+			JS_FreeCString(c, f2);
+			if (!is_same) continue;
+		} else if (hdl->children) {
+			txt = (GF_DOMText *) hdl->children->node;
+			if (txt->sgprivate->tag != TAG_DOMText) continue;
+			if (!txt->textContent || !callback || strcmp(txt->textContent, callback)) continue;
+		} else {
+			continue;
+		}
+
+		/*this will destroy the listener and its child handler*/
+		gf_dom_listener_del(el, target);
+		break;
+	}
+#endif
+
+err_exit:
+	if (callback) JS_FreeCString(c, callback);
+	return JS_UNDEFINED;
+}
+
+JSValue dom_event_remove_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return gf_sg_js_event_remove_listener(c, obj, argc, argv, NULL);
+}
+
+/*dom3 node*/
+static void dom_node_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_Node *n = (GF_Node *) JS_GetOpaque_Nocheck(obj);
+	/*the JS proto of the svgClass or a destroyed object*/
+	if (!n) return;
+	if (!n->sgprivate) return;
+
+	JS_SetOpaque(obj, NULL);
+	if (n->sgprivate->interact)
+		gf_list_del_item(n->sgprivate->scenegraph->objects, n->sgprivate->interact->js_binding);
+	gf_sg_js_dom_pre_destroy(rt, n->sgprivate->scenegraph, n);
+	dom_unregister_node(n);
+}
+
+static Bool check_dom_parents(JSContext *c, GF_Node *n, GF_Node *parent)
+{
+	GF_ParentList *par = n->sgprivate->parents;
+	if (n->sgprivate->scenegraph != parent->sgprivate->scenegraph) {
+		js_throw_err(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
+		return GF_FALSE;
+	}
+	while (par) {
+		if (par->node==parent) {
+			js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+			return GF_FALSE;
+		}
+		if (!check_dom_parents(c, par->node, parent))
+			return GF_FALSE;
+		par = par->next;
+	}
+	return GF_TRUE;
+}
+
+static void dom_node_inserted(JSContext *c, GF_Node *n, GF_Node *parent, s32 pos)
+{
+	GF_ParentNode *old_parent;
+	Bool do_init = GF_FALSE;
+
+	/*if node is already in graph, remove it from its parent*/
+	old_parent = (GF_ParentNode*)gf_node_get_parent(n, 0);
+	if (old_parent) {
+		/*prevent destruction when removing node*/
+		n->sgprivate->num_instances++;
+		gf_node_list_del_child(&old_parent->children, n);
+		gf_node_unregister(n, (GF_Node*)old_parent);
+		n->sgprivate->num_instances--;
+	} else {
+		do_init = (n->sgprivate->UserCallback || n->sgprivate->UserPrivate) ? GF_FALSE : GF_TRUE;
+
+	}
+
+	if (pos<0) gf_node_list_add_child( & ((GF_ParentNode *)parent)->children, n);
+	else gf_node_list_insert_child( & ((GF_ParentNode *)parent)->children, n, (u32) pos);
+	gf_node_register(n, parent);
+
+	if (do_init) {
+		/*node is a handler, create listener*/
+		if (parent && (n->sgprivate->tag==TAG_SVG_handler)) {
+			gf_dom_listener_build_ex(parent, 0, 0, n, NULL);
+		}
+		gf_node_init(n);
+
+
+#ifndef GPAC_DISABLE_SVG
+		if (n->sgprivate->interact && n->sgprivate->interact->dom_evt) {
+			GF_DOM_Event evt;
+			memset(&evt, 0, sizeof(GF_DOM_Event));
+			evt.type = GF_EVENT_LOAD;
+			gf_dom_event_fire(n, &evt);
+		}
+#endif
+	}
+	/*node is being re-inserted, activate it in case*/
+	if (!old_parent) gf_node_activate(n);
+
+	dom_node_changed(parent, GF_TRUE, NULL);
+}
+
+static JSValue xml_node_insert_before(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	s32 idx;
+	u32 tag;
+	GF_Node *n, *target, *new_node;
+	GF_ParentNode *par;
+
+	if (!argc || !JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+
+	n = dom_get_node(obj);
+	if (!n) {
+		return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	}
+
+	new_node = dom_get_node(argv[0]);
+	if (!new_node)
+		return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+
+	target = NULL;
+	if ((argc==2) && JS_IsObject(argv[1]) && !JS_IsNull(argv[1])) {
+		target = dom_get_node(argv[1]);
+		if (!target) return JS_NULL;
+	}
+	tag = gf_node_get_tag(n);
+	if (tag==TAG_DOMText)
+		return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+
+	if (!check_dom_parents(c, n, new_node))
+		return js_throw_err(c, GF_DOM_EXC_VALIDATION_ERR);
+	par = (GF_ParentNode*)n;
+	idx = -1;
+	if (target) {
+		idx = gf_node_list_find_child(par->children, target);
+		if (idx<0) {
+			return js_throw_err(c, GF_DOM_EXC_NOT_FOUND_ERR);
+		}
+	}
+	dom_node_inserted(c, new_node, n, idx);
+	return JS_DupValue(c, argv[0] );
+}
+
+static JSValue xml_node_append_child(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n, *new_node;
+
+	if (!argc || !JS_IsObject(argv[0])) {
+		return JS_EXCEPTION;
+	}
+	n = dom_get_node(obj);
+	if (!n) {
+		return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	}
+
+	new_node = dom_get_node(argv[0]);
+	if (!new_node) {
+		return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+	}
+	tag = gf_node_get_tag(n);
+	if (tag==TAG_DOMText) {
+		return js_throw_err(c, GF_DOM_EXC_SYNTAX_ERR);
+	}
+
+	if (!check_dom_parents(c, n, new_node)) {
+		return js_throw_err(c, GF_DOM_EXC_VALIDATION_ERR);
+	}
+
+	dom_node_inserted(c, new_node, n, -1);
+	return JS_DupValue(c, argv[0]);
+}
+
+void svg_mark_gc(struct __tag_svg_script_ctx *svg_js);
+
+static JSValue xml_node_replace_child(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	s32 idx;
+	u32 tag;
+	GF_Node *n, *new_node, *old_node;
+	GF_ParentNode *par;
+
+	if ((argc!=2) || !JS_IsObject(argv[0]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+
+	new_node = dom_get_node(argv[0]);
+	if (!new_node) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	old_node = dom_get_node(argv[1]);
+	if (!old_node) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	tag = gf_node_get_tag(n);
+	if (tag==TAG_DOMText) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	par = (GF_ParentNode*)n;
+	idx = gf_node_list_find_child(par->children, old_node);
+	if (idx<0) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+
+	gf_node_list_del_child(&par->children, old_node);
+	gf_node_unregister(old_node, n);
+
+	dom_node_inserted(c, new_node, n, -1);
+
+	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
+	svg_mark_gc(n->sgprivate->scenegraph->svg_js);
+	return JS_DupValue(c, argv[0]);
+}
+
+static JSValue xml_node_remove_child(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n, *old_node;
+	GF_ParentNode *par;
+	if (!argc || !JS_IsObject(argv[0])) return JS_TRUE;
+
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+
+	old_node = dom_get_node(argv[0]);
+	if (!old_node) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	tag = gf_node_get_tag(n);
+	if (tag==TAG_DOMText) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	par = (GF_ParentNode*)n;
+
+	/*if node is present in parent, unregister*/
+	if (gf_node_list_del_child(&par->children, old_node)) {
+		gf_node_unregister(old_node, n);
+	} else {
+		return js_throw_err(c, GF_DOM_EXC_NOT_FOUND_ERR);
+	}
+
+	dom_node_changed(n, GF_TRUE, NULL);
+	/*whenever we remove a node from the tree, call GC to cleanup the JS binding if any. Not doing so may screw up node IDs*/
+	svg_mark_gc(n->sgprivate->scenegraph->svg_js);
+	return JS_DupValue(c, argv[0]);
+}
+
+static JSValue xml_clone_node(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Bool deep;
+	GF_Node *n, *clone;
+
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	deep = argc ? (JS_ToBool(c, argv[0]) ? GF_TRUE : GF_FALSE) : GF_FALSE;
+
+	clone = gf_node_clone(n->sgprivate->scenegraph, n, NULL, "", deep);
+	return dom_node_construct(c, clone);
+}
+
+static JSValue xml_node_has_children(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Node *n;
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	return ((GF_ParentNode*)n)->children ? JS_TRUE : JS_FALSE;
+}
+
+static JSValue xml_node_has_attributes(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n;
+
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	tag = gf_node_get_tag(n);
+	if (tag>=GF_NODE_FIRST_DOM_NODE_TAG) {
+		return ((GF_DOMNode*)n)->attributes ? JS_TRUE : JS_FALSE;
+	}
+	/*not supported for other node types*/
+	return JS_FALSE;
+}
+
+static JSValue xml_node_is_same_node(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Node *n, *a_node;
+
+	if (!argc || !JS_IsObject(argv[0])) return JS_TRUE;
+	n = dom_get_node(obj);
+	if (!n) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+
+	a_node = dom_get_node(argv[0]);
+	if (!a_node) return js_throw_err(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
+	return (a_node==n) ? JS_TRUE : JS_FALSE;
+}
+
+static const char *node_get_local_name(GF_Node *node)
+{
+	const char *res;
+	GF_List *l;
+	if (!node) return NULL;
+	l = node->sgprivate->scenegraph->ns;
+	node->sgprivate->scenegraph->ns = NULL;
+	res = gf_node_get_class_name(node);
+	node->sgprivate->scenegraph->ns = l;
+	return res;
+}
+
+static const char *node_lookup_namespace_by_tag(GF_Node *node, u32 tag)
+{
+	/*browse attributes*/
+	GF_DOMAttribute *att;
+	if (!node) return NULL;
+	att = ((SVG_Element*)node)->attributes;
+	while (att) {
+		if (att->tag==TAG_DOM_ATT_any) {
+			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
+			if (datt->name && !strncmp(datt->name, "xmlns", 5)) {
+				char *xmlns = *(DOM_String *) datt->data;
+				u32 crc = gf_crc_32(xmlns, (u32) strlen(xmlns));
+				if (tag==crc)
+					return xmlns;
+				if (!tag && !strcmp(datt->name, "xmlns"))
+					return xmlns;
+			}
+		}
+		att = att->next;
+	}
+	/*browse for parent*/
+	return node_lookup_namespace_by_tag(gf_node_get_parent(node, 0), tag);
+}
+
+#ifdef GPAC_UNUSED_FUNC
+/**
+ * FIXME : function is not used by anybody
+ */
+static u32 get_namespace_code_by_prefix(GF_Node *node, char *prefix)
+{
+	/*browse attributes*/
+	GF_DOMAttribute *att;
+	if (!node) return 0;
+	att = ((SVG_Element*)node)->attributes;
+	while (att) {
+		if (att->tag==TAG_DOM_ATT_any) {
+			GF_DOMFullAttribute *datt = (GF_DOMFullAttribute*)att;
+			if (!prefix) {
+				if (!strcmp(datt->name, "xmlns")) return datt->xmlns;
+			} else if (!strncmp(datt->name, "xmlns:", 6)) {
+				if (!strcmp(datt->name+6, prefix)) return datt->xmlns;
+			}
+		}
+		att = att->next;
+	}
+	/*browse for parent*/
+	return get_namespace_code_by_prefix(gf_node_get_parent(node, 0), prefix);
+}
+#endif /*GPAC_UNUSED_FUNC*/
+
+static JSValue dom_node_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	u32 tag;
+	GF_Node *n;
+	GF_SceneGraph *sg = NULL;
+	GF_ParentNode *par;
+
+	n = dom_get_node(obj);
+	if (!n) {
+		sg = dom_get_doc(c, obj);
+		if (!sg) return JS_EXCEPTION;
+	}
+	tag = n ? gf_node_get_tag(n) : 0;
+	par = (GF_ParentNode*)n;
+
+	switch (magic) {
+	case NODE_JSPROPERTY_NODENAME:
+		if (sg) {
+			return JS_NewString(c, "#document");
+		}
+		else if (tag==TAG_DOMText) {
+			GF_DOMText *txt = (GF_DOMText *)n;
+			if (txt->type==GF_DOM_TEXT_CDATA) return JS_NewString(c, "#cdata-section");
+			else return JS_NewString(c, "#text");
+		}
+		return JS_NewString(c, gf_node_get_class_name(n) );
+
+	case NODE_JSPROPERTY_NODEVALUE:
+		if (tag==TAG_DOMText) {
+			GF_DOMText *txt = (GF_DOMText *)n;
+			return JS_NewString(c, txt->textContent);
+		}
+		return JS_NULL;
+	case NODE_JSPROPERTY_NODETYPE:
+		if (sg) return JS_NewInt32(c, 9);
+		else if (tag==TAG_DOMText) {
+			GF_DOMText *txt = (GF_DOMText *)n;
+			if (txt->type==GF_DOM_TEXT_CDATA) return JS_NewInt32(c, 4);
+			else return JS_NewInt32(c, 3);
+		}
+		return JS_NewInt32(c, 1);
+
+	case NODE_JSPROPERTY_PARENTNODE:
+		if (sg) {
+			return JS_NULL;
+		}
+		/*if root node of the tree, the parentNode is the document*/
+		else if (n->sgprivate->scenegraph->RootNode==n) {
+			return dom_document_construct(c, n->sgprivate->scenegraph);
+		} else {
+			return dom_node_construct(c, gf_node_get_parent(n, 0) );
+		}
+
+	case NODE_JSPROPERTY_CHILDNODES:
+		/*NOT SUPPORTED YET*/
+		if (sg) return JS_UNDEFINED;
+		else if (tag==TAG_DOMText) return JS_NULL;
+		else return dom_nodelist_construct(c, par);
+
+	case NODE_JSPROPERTY_FIRSTCHILD:
+		if (sg) return dom_node_construct(c, sg->RootNode);
+		else if (tag==TAG_DOMText) return JS_NULL;
+		else if (!par->children) return JS_NULL;
+		else return dom_node_construct(c, par->children->node);
+
+	case NODE_JSPROPERTY_LASTCHILD:
+		if (sg) return dom_node_construct(c, sg->RootNode);
+		else if ((tag==TAG_DOMText) || !par->children) return JS_NULL;
+		else return dom_node_construct(c, gf_node_list_get_child(par->children, -1) );
+
+	case NODE_JSPROPERTY_PREVIOUSSIBLING:
+		/*works for doc as well since n is NULL*/
+		return dom_node_get_sibling(c, n, GF_TRUE, GF_FALSE);
+
+	case NODE_JSPROPERTY_NEXTSIBLING:
+		return dom_node_get_sibling(c, n, GF_FALSE, GF_FALSE);
+
+	case NODE_JSPROPERTY_ATTRIBUTES:
+		/*NOT SUPPORTED YET*/
+		return JS_UNDEFINED;
+
+	case NODE_JSPROPERTY_OWNERDOCUMENT:
+		if (sg) return JS_NULL;
+		else return dom_document_construct(c, n->sgprivate->scenegraph);
+
+	case NODE_JSPROPERTY_NAMESPACEURI:
+		if (!sg) {
+			const char *xmlns;
+			tag = gf_xml_get_element_namespace(n);
+			xmlns = gf_sg_get_namespace(n->sgprivate->scenegraph, tag);
+			if (!xmlns) xmlns = node_lookup_namespace_by_tag(n, tag);
+			return xmlns ? JS_NewString(c, xmlns) : JS_NULL;
+		}
+		return JS_NULL;
+	case NODE_JSPROPERTY_PREFIX:
+		if (sg) tag = gf_sg_get_namespace_code(sg, NULL);
+		else tag = gf_xml_get_element_namespace(n);
+
+		if (tag) {
+			char *xmlns = (char *)gf_sg_get_namespace_qname(sg ? sg : n->sgprivate->scenegraph, tag);
+			if (xmlns) return JS_NewString(c, xmlns);
+		}
+		return JS_NULL;
+	case NODE_JSPROPERTY_LOCALNAME:
+		if (!sg && (tag!=TAG_DOMText)) {
+			return JS_NewString(c, node_get_local_name(n) );
+		}
+		return JS_NULL;
+	case NODE_JSPROPERTY_BASEURI:
+		/*NOT SUPPORTED YET*/
+		return JS_NULL;
+
+	case NODE_JSPROPERTY_TEXTCONTENT:
+		if (!sg)  {
+			char *res = gf_dom_flatten_textContent(n);
+			JSValue ret = JS_NewString(c, res ? res : "");
+			if (res) gf_free(res);
+			return ret;
+		}
+		return JS_NewString(c, "");
+
+	case NODE_JSPROPERTY_FIRSTELEMENTCHILD:
+		if (n->sgprivate->tag!=TAG_DOMText) {
+			GF_ChildNodeItem *child = ((GF_ParentNode*)n)->children;
+			while (child) {
+				if (child->node->sgprivate->tag != TAG_DOMText) {
+					return dom_element_construct(c, child->node);
+				}
+				child = child->next;
+			}
+		}
+		return JS_NULL;
+
+	case NODE_JSPROPERTY_LASTELEMENTCHILD:
+		if (n->sgprivate->tag!=TAG_DOMText) {
+			GF_Node *last = NULL;
+			GF_ChildNodeItem *child = ((GF_ParentNode*)n)->children;
+			while (child) {
+				if (child->node->sgprivate->tag != TAG_DOMText) {
+					last = child->node;
+				}
+				child = child->next;
+			}
+			if (last) return dom_element_construct(c, last);
+		}
+		return JS_NULL;
+	case NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING:
+		return dom_node_get_sibling(c, n, GF_TRUE, GF_TRUE);
+
+	case NODE_JSPROPERTY_NEXTELEMENTSIBLING:
+		return dom_node_get_sibling(c, n, GF_FALSE, GF_TRUE);
+	}
+	return JS_UNDEFINED;
+}
+
+void dom_node_set_textContent(GF_Node *n, char *text)
+{
+	GF_FieldInfo info;
+	gf_dom_set_textContent(n, text);
+
+	gf_node_dirty_set(n, GF_SG_CHILD_DIRTY, GF_FALSE);
+	memset(&info, 0, sizeof(GF_FieldInfo));
+	info.fieldIndex = (u32) -1;
+	gf_node_changed(n, &info);
+}
+
+static JSValue dom_node_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	u32 tag;
+	GF_Node *n;
+
+	n = dom_get_node(obj);
+	/*note an element - we don't support property setting on document yet*/
+	if (!n) return JS_EXCEPTION;
+
+	tag = n ? gf_node_get_tag(n) : 0;
+	switch (magic) {
+	case NODE_JSPROPERTY_NODEVALUE:
+		if ((tag==TAG_DOMText) && JS_CHECK_STRING(value)) {
+			const char *str;
+			GF_DOMText *txt = (GF_DOMText *)n;
+			if (txt->textContent) gf_free(txt->textContent);
+			str = JS_ToCString(c, value);
+			txt->textContent = str ? gf_strdup(str) : NULL;
+			JS_FreeCString(c, str);
+			dom_node_changed(n, GF_TRUE, NULL);
+		}
+		/*we only support element and sg in the Node interface, no set*/
+		return JS_TRUE;
+	case NODE_JSPROPERTY_PREFIX:
+		/*NOT SUPPORTED YET*/
+		return JS_TRUE;
+	case NODE_JSPROPERTY_TEXTCONTENT:
+	{
+		const char *txt = JS_ToCString(c, value);
+		dom_node_set_textContent(n, (char *) txt);
+		if (txt) JS_FreeCString(c, txt);
+	}
+	return JS_TRUE;
+	}
+	/*not supported*/
+	return JS_TRUE;
+}
+
+
+/*dom3 document*/
+
+/*don't attempt to do anything with the scenegraph, it may be destroyed
+fortunately a sg cannot be created like that...*/
+void dom_document_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_SceneGraph *sg;
+	sg = (GF_SceneGraph*) JS_GetOpaque_Nocheck(obj);
+	/*the JS proto of the svgClass or a destroyed object*/
+	if (!sg) return;
+
+	if (sg->js_data) {
+		JS_SetOpaque(sg->js_data->document, NULL);
+		JS_FreeValueRT(rt, sg->js_data->document);
+		gf_free(sg->js_data);
+		sg->js_data = NULL;
+	}
+	if (sg->RootNode) {
+		gf_node_unregister(sg->RootNode, NULL);
+	}
+	if (sg->reference_count) {
+		sg->reference_count--;
+		if (!sg->reference_count)
+			gf_sg_del(sg);
+	}
+}
+
+static JSValue dom_document_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_SceneGraph *sg = dom_get_doc(c, obj);
+	if (!sg) return JS_EXCEPTION;
+
+	switch (magic) {
+	case DOCUMENT_JSPROPERTY_IMPLEMENTATION:
+	{	/*FIXME, this is wrong, we should have our own implementation
+		but at the current time we rely on the global object to provide it*/
+		JSValue global = JS_GetGlobalObject(c);
+		JSValue ret = JS_GetPropertyStr(c, global, "Window");
+		JS_FreeValue(c, global);
+		return ret;
+	}
+
+	case DOCUMENT_JSPROPERTY_DOCUMENTELEMENT:
+		return dom_element_construct(c, sg->RootNode);
+
+	case DOCUMENT_JSPROPERTY_GLOBAL:
+		return JS_GetGlobalObject(c);
+
+	case DOCUMENT_JSPROPERTY_DOCTYPE:
+	case DOCUMENT_JSPROPERTY_INPUTENCODING:
+	case DOCUMENT_JSPROPERTY_XMLENCODING:
+	case DOCUMENT_JSPROPERTY_XMLSTANDALONE:
+	case DOCUMENT_JSPROPERTY_XMLVERSION:
+	case DOCUMENT_JSPROPERTY_STRICTERRORCHECKING:
+	case DOCUMENT_JSPROPERTY_DOCUMENTURI:
+	case DOCUMENT_JSPROPERTY_LOCATION:
+	case DOCUMENT_JSPROPERTY_DOMCONFIG:
+		return JS_NULL;
+	}
+	return JS_UNDEFINED;
+}
+
+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;
+	return js_throw_err(c, GF_DOM_EXC_NOT_SUPPORTED_ERR);
+}
+
+static JSValue xml_document_create_element(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag, ns;
+	JSValue ret = JS_NULL;
+	const char *name;
+	const char *xmlns;
+	GF_SceneGraph *sg = dom_get_doc(c, obj);
+
+	if (!sg || !argc || !JS_CHECK_STRING(argv[0]) )
+		return JS_EXCEPTION;
+
+	name = NULL;
+	/*NS version*/
+	ns = 0;
+	xmlns = NULL;
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		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]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+
+	if (name) {
+		GF_Node *n;
+		/*browse all our supported DOM implementations*/
+		tag = gf_xml_get_element_tag(name, ns);
+		if (!tag) tag = TAG_DOMFullNode;
+		n = gf_node_new(sg, tag);
+		if (n && (tag == TAG_DOMFullNode)) {
+			GF_DOMFullNode *elt = (GF_DOMFullNode *)n;
+			elt->name = gf_strdup(name);
+			if (xmlns) {
+				gf_sg_add_namespace(sg, (char *) xmlns, NULL);
+				elt->ns	= gf_sg_get_namespace_code_from_name(sg, (char *) xmlns);
+			}
+		}
+		ret = dom_element_construct(c, n);
+	}
+	JS_FreeCString(c, name);
+	JS_FreeCString(c, xmlns);
+	return ret;
+}
+
+static JSValue xml_document_create_text(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Node *n;
+	GF_SceneGraph *sg = dom_get_doc(c, obj);
+	if (!sg) return JS_EXCEPTION;
+
+	n = gf_node_new(sg, TAG_DOMText);
+	if (argc) {
+		const char *str = JS_ToCString(c, argv[0]);
+		char *ntext = gf_strdup(str ? str : "");
+		((GF_DOMText*)n)->textContent = ntext;
+		JS_FreeCString(c, str);
+	}
+	return dom_text_construct(c, n);
+}
+
+static void xml_doc_gather_nodes(GF_ParentNode *node, char *name, DOMNodeList *nl)
+{
+	Bool bookmark = GF_TRUE;
+	GF_ChildNodeItem *child;
+	if (!node) return;
+	if (name) {
+		const char *node_name = gf_node_get_class_name((GF_Node*)node);
+		if (strcmp(node_name, name)) bookmark = GF_FALSE;
+	}
+	if (bookmark) {
+		gf_node_register((GF_Node*)node, NULL);
+		if (node->sgprivate->scenegraph->reference_count)
+			node->sgprivate->scenegraph->reference_count++;
+		gf_node_list_add_child(&nl->child, (GF_Node*)node);
+	}
+	if (node->sgprivate->tag<GF_NODE_FIRST_PARENT_NODE_TAG) return;
+	child = node->children;
+	while (child) {
+		xml_doc_gather_nodes((GF_ParentNode*)child->node, name, nl);
+		child = child->next;
+	}
+}
+
+static JSValue xml_document_elements_by_tag(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	DOMNodeList *nl;
+	JSValue new_obj;
+	const char *name;
+	GF_SceneGraph *sg = dom_get_doc(c, obj);
+	if (!sg) return JS_EXCEPTION;
+
+	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+
+	/*NS version - TODO*/
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		name = JS_ToCString(c, argv[1]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+
+	GF_SAFEALLOC(nl, DOMNodeList);
+	if (!nl) return JS_EXCEPTION;
+
+	if (name && !strcmp(name, "*"))
+		xml_doc_gather_nodes((GF_ParentNode*)sg->RootNode, NULL, nl);
+	else
+		xml_doc_gather_nodes((GF_ParentNode*)sg->RootNode, (char *) name, nl);
+	new_obj = JS_NewObjectClass(c, domNodeListClass.class_id);
+	JS_SetOpaque(new_obj, nl);
+	JS_FreeCString(c, name);
+	return new_obj;
+}
+
+
+static JSValue xml_document_element_by_id(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	NodeIDedItem *reg_node;
+	GF_Node *n;
+	const char *id;
+	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;
+	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
+	same ID and we need to locate the first one which is inserted in the tree*/
+	n = NULL;
+	reg_node = sg->id_node;
+	while (reg_node) {
+		if (reg_node->NodeName && !strcmp(reg_node->NodeName, id)) {
+			n = reg_node->node;
+			/*element is not inserted - fixme, we should check all parents*/
+			if (n && (n->sgprivate->scenegraph->RootNode!=n) && !n->sgprivate->parents) n = NULL;
+			else break;
+		}
+		reg_node = reg_node->next;
+	}
+	ret = dom_element_construct(c, n);
+	JS_FreeCString(c, id);
+	return ret;
+}
+
+/*dom3 element*/
+void dom_element_finalize(JSRuntime *rt, JSValue obj)
+{
+	dom_node_finalize(rt, obj);
+}
+
+static JSValue dom_element_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_TRUE;
+
+	switch (magic) {
+	case ELEMENT_JSPROPERTY_TAGNAME:
+		return JS_NewString(c, gf_node_get_class_name(n) );
+
+	case ELEMENT_JSPROPERTY_SCHEMATYPEINFO:
+		/*NOT SUPPORTED YET*/
+		return JS_NULL;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue xml_element_get_attribute(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *name;
+	const char *ns;
+	JSValue ret = JS_NULL;
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	if (!argc || !JS_CHECK_STRING(argv[0]))
+		return JS_TRUE;
+	ns = NULL;
+	/*NS version*/
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1]))
+			return JS_TRUE;
+		ns = JS_ToCString(c, argv[0]);
+		name = JS_ToCString(c, argv[1]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+	if (!name) goto exit;
+
+	/*ugly ugly hack ...*/
+	if (!strcmp(name, "id") || !strcmp(name, "xml:id") ) {
+		char *sID = (char *) gf_node_get_name(n);
+		if (sID) {
+			ret = JS_NewString(c, sID);
+			goto exit;
+		}
+	}
+
+	if (n->sgprivate->tag==TAG_DOMFullNode) {
+		GF_DOMFullNode *node = (GF_DOMFullNode*)n;
+		GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
+		while (att) {
+			if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
+				ret = JS_NewString(c, *(char**)att->data );
+				goto exit;
+			}
+			att = (GF_DOMFullAttribute *) att->next;
+		}
+	}
+	else if (n->sgprivate->tag==TAG_DOMText) {
+
+	} else if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
+		GF_FieldInfo info;
+		u32 ns_code = 0;
+		if (ns) {
+			ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, (char *) ns);
+			if (!ns_code) ns_code = gf_crc_32(ns, (u32) strlen(ns));
+		}
+		else {
+			ns_code = gf_xml_get_element_namespace(n);
+		}
+
+		if (gf_node_get_attribute_by_name(n, (char *) name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			char *szAtt = gf_svg_dump_attribute(n, &info);
+			ret = JS_NewString(c, szAtt);
+			if (szAtt) gf_free(szAtt);
+			goto exit;
+		}
+	}
+	ret = JS_NewString(c, "");
+exit:
+	JS_FreeCString(c, name);
+	JS_FreeCString(c, ns);
+	return ret;
+}
+
+static JSValue xml_element_has_attribute(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *name;
+	const char *ns;
+	JSValue ret = JS_NULL;
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	ns = NULL;
+	/*NS version*/
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		ns = JS_ToCString(c, argv[0]);
+		name = JS_ToCString(c, argv[1]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+	if (!name) goto exit;
+
+	if (n->sgprivate->tag==TAG_DOMFullNode) {
+		GF_DOMFullNode *node = (GF_DOMFullNode*)n;
+		GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
+		while (att) {
+			if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, name)) {
+				ret = JS_TRUE;
+				goto exit;
+			}
+			att = (GF_DOMFullAttribute *) att->next;
+		}
+	}
+	else if (n->sgprivate->tag==TAG_DOMText) {
+	}
+	else if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
+		GF_FieldInfo info;
+		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);
+
+		if (gf_node_get_attribute_by_name(n, (char *) name, ns_code, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+			ret = JS_TRUE;
+			goto exit;
+		}
+	}
+	ret = JS_FALSE;
+exit:
+	JS_FreeCString(c, name);
+	JS_FreeCString(c, ns);
+	return ret;
+}
+
+
+
+static JSValue xml_element_remove_attribute(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_DOMFullNode *node;
+	GF_DOMFullAttribute *prev, *att;
+	const char *name, *ns;
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	ns = NULL;
+	/*NS version*/
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		ns = JS_ToCString(c, argv[0]);
+		name = JS_ToCString(c, argv[1]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+	if (!name) goto exit;
+
+	tag = TAG_DOM_ATT_any;
+	node = (GF_DOMFullNode*)n;
+	prev = NULL;
+	att = (GF_DOMFullAttribute*)node->attributes;
+
+	if (n->sgprivate->tag==TAG_DOMFullNode) tag = TAG_DOM_ATT_any;
+	else if (n->sgprivate->tag==TAG_DOMText) {
+		goto exit;
+	} 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);
+
+		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;
+		} else if (tag==att->tag) {
+			if (prev) prev->next = att->next;
+			else node->attributes = att->next;
+			gf_svg_delete_attribute_value(att->data_type, att->data, n->sgprivate->scenegraph);
+			gf_free(att);
+			dom_node_changed(n, GF_FALSE, NULL);
+			goto exit;
+		}
+		prev = att;
+		att = (GF_DOMFullAttribute *) att->next;
+	}
+exit:
+	JS_FreeCString(c, name);
+	JS_FreeCString(c, ns);
+	return JS_TRUE;
+}
+
+static void gf_dom_add_handler_listener(GF_Node *n, u32 evtType, char *handlerCode)
+{
+	/*check if we're modifying an existing listener*/
+	SVG_handlerElement *handler;
+	u32 i, count = gf_dom_listener_count(n);
+	for (i=0; i<count; i++) {
+		GF_FieldInfo info;
+		GF_DOMText *text;
+		GF_Node *listen = gf_dom_listener_get(n, i);
+
+		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
+		if (!info.far_ptr || (((XMLEV_Event*)info.far_ptr)->type != evtType)) continue;
+
+		/* found a listener for this event, override the handler
+		TODO: FIX this, there may be a listener/handler already set with JS, why overriding ? */
+		gf_node_get_attribute_by_tag(listen, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info);
+		assert(info.far_ptr);
+		handler = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
+		text = (GF_DOMText*)handler->children->node;
+		if (text->sgprivate->tag==TAG_DOMText) {
+			if (text->textContent) gf_free(text->textContent);
+			text->textContent = gf_strdup(handlerCode);
+		}
+		return;
+	}
+	/*nope, create a listener*/
+	handler = gf_dom_listener_build(n, evtType, 0);
+	gf_dom_add_text_node((GF_Node*)handler, gf_strdup(handlerCode));
+	return;
+}
+
+static void gf_dom_full_set_attribute(GF_DOMFullNode *node, char *attribute_name, char *attribute_content)
+{
+	GF_DOMFullAttribute *prev = NULL;
+	GF_DOMFullAttribute *att = (GF_DOMFullAttribute*)node->attributes;
+	while (att) {
+		if ((att->tag==TAG_DOM_ATT_any) && !strcmp(att->name, attribute_name)) {
+			DOM_String *s;
+			assert(att->data_type == DOM_String_datatype);
+			assert(att->data);
+			s = (DOM_String *) att->data;
+			if ( *s ) gf_free( *s);
+			*s = gf_strdup(attribute_content);
+			dom_node_changed((GF_Node *)node, GF_FALSE, NULL);
+			return;
+		}
+		prev = att;
+		att = (GF_DOMFullAttribute *) att->next;
+	}
+	/*create new att*/
+	GF_SAFEALLOC(att, GF_DOMFullAttribute);
+	if (!att) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM attribute\n"));
+		return;
+	}
+	att->name = gf_strdup(attribute_name);
+	att->data_type = (u16) DOM_String_datatype;
+	att->data = gf_svg_create_attribute_value(att->data_type);
+	*((char **)att->data) = gf_strdup(attribute_content);
+
+	if (prev) prev->next = (GF_DOMAttribute*) att;
+	else node->attributes = (GF_DOMAttribute*) att;
+	return;
+}
+
+void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val)
+{
+	GF_FieldInfo info;
+	u32 anim_value_type = 0;
+
+	if (!strcmp(name, "attributeName")) {
+		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			SMIL_AttributeName *attname = (SMIL_AttributeName *)info.far_ptr;
+
+			/*parse the attribute name even if the target is not found, because a namespace could be specified and
+			only valid for the current node*/
+			if (!attname->type) {
+				char *sep;
+				char *a_name = attname->name;
+				sep = strchr(a_name, ':');
+				if (sep) {
+					sep[0] = 0;
+					attname->type = gf_sg_get_namespace_code(n->sgprivate->scenegraph, a_name);
+					sep[0] = ':';
+					a_name = gf_strdup(sep+1);
+					gf_free(attname->name);
+					attname->name = a_name;
+				}
+			}
+		}
+	}
+
+	if ((n->sgprivate->tag == TAG_SVG_animateTransform) && (strstr(name, "from") || strstr(name, "to")) ) {
+		if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_transform_type, GF_TRUE, GF_FALSE, &info) != GF_OK) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'type' from animateTransform\n"));
+			return;
+		}
+
+		switch(*(SVG_TransformType *) info.far_ptr) {
+		case SVG_TRANSFORM_TRANSLATE:
+			anim_value_type = SVG_Transform_Translate_datatype;
+			break;
+		case SVG_TRANSFORM_SCALE:
+			anim_value_type = SVG_Transform_Scale_datatype;
+			break;
+		case SVG_TRANSFORM_ROTATE:
+			anim_value_type = SVG_Transform_Rotate_datatype;
+			break;
+		case SVG_TRANSFORM_SKEWX:
+			anim_value_type = SVG_Transform_SkewX_datatype;
+			break;
+		case SVG_TRANSFORM_SKEWY:
+			anim_value_type = SVG_Transform_SkewY_datatype;
+			break;
+		case SVG_TRANSFORM_MATRIX:
+			anim_value_type = SVG_Transform_datatype;
+			break;
+		default:
+			return;
+		}
+	}
+
+	if (gf_node_get_attribute_by_name(n, name, ns_code,  GF_TRUE, GF_TRUE, &info)==GF_OK) {
+		GF_Err e;
+		if (!strcmp(name, "from") || !strcmp(name, "to") || !strcmp(name, "values") ) {
+			GF_FieldInfo attType;
+			SMIL_AttributeName *attname;
+			if (gf_node_get_attribute_by_tag((GF_Node *)n, TAG_SVG_ATT_attributeName, GF_FALSE, GF_FALSE, &attType) != GF_OK) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_SCRIPT, ("Cannot retrieve attribute 'attributeName'\n"));
+				return;
+			}
+
+			attname = (SMIL_AttributeName *)attType.far_ptr;
+			if (!attname->type && attname->name) {
+				GF_Node *anim_target = gf_smil_anim_get_target(n);
+				if (anim_target) {
+					gf_node_get_attribute_by_name((GF_Node *)anim_target, attname->name, attname->type, GF_FALSE, GF_FALSE, &attType);
+					attname->type = attType.fieldType;
+				} else {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Cannot find target of the animation to parse attribute %s\n", attname->name));
+				}
+			}
+
+			anim_value_type = attname->type;
+		}
+		e = gf_svg_parse_attribute(n, &info, val, anim_value_type);
+		if (e != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Error parsing attribute\n"));
+		}
+
+		if (info.fieldType==SVG_ID_datatype) {
+			char *idname = *(SVG_String*)info.far_ptr;
+			gf_svg_parse_element_id(n, idname, GF_FALSE);
+		}
+		if (info.fieldType==XMLRI_datatype) {
+			gf_node_dirty_set(n, GF_SG_SVG_XLINK_HREF_DIRTY, GF_FALSE);
+		}
+		dom_node_changed(n, GF_FALSE, &info);
+		return;
+	}
+}
+
+void gf_svg_set_attribute(GF_Node *n, char * ns, char *name, char *val)
+{
+	u32 ns_code = 0;
+	if (ns) {
+		ns_code = gf_sg_get_namespace_code_from_name(n->sgprivate->scenegraph, ns);
+	} else {
+		ns_code = gf_xml_get_element_namespace(n);
+	}
+	gf_svg_set_attributeNS(n, ns_code, name, val);
+}
+
+static JSValue xml_element_set_attribute(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 idx;
+	const char *name, *_val, *val, *ns;
+	char szVal[100];
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+	if ((argc < 2)) return JS_EXCEPTION;
+
+	if (!JS_CHECK_STRING(argv[0]))
+		return JS_EXCEPTION;
+
+	idx = 1;
+	name = _val = val = NULL;
+	ns = NULL;
+	/*NS version*/
+	if (argc==3) {
+		char *sep;
+		if (!JS_CHECK_STRING(argv[1]))
+			return JS_EXCEPTION;
+		ns = JS_ToCString(c, argv[0]);
+		gf_sg_add_namespace(n->sgprivate->scenegraph, (char *) ns, NULL);
+		name = JS_ToCString(c, argv[1]);
+		idx = 2;
+
+		sep = strchr(name, ':');
+		if (sep) name = sep+1;
+
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+
+	val = NULL;
+	if (JS_CHECK_STRING(argv[idx])) {
+		val = _val = JS_ToCString(c, argv[idx]);
+	} else if (JS_IsBool(argv[idx])) {
+		sprintf(szVal, "%s", JS_ToBool(c, argv[idx]) ? "true" : "false");
+		val = szVal;
+	} else if (JS_IsNumber(argv[idx])) {
+		Double d;
+		JS_ToFloat64(c, &d, argv[idx]);
+		sprintf(szVal, "%g", d);
+		val = szVal;
+	} else if (JS_IsInteger(argv[idx])) {
+		u32 i;
+		JS_ToInt32(c, &i, argv[idx]);
+		sprintf(szVal, "%d", i);
+		val = szVal;
+	} else {
+		goto exit;
+	}
+	if (!name || !val)
+		goto exit;
+
+
+	/* For on* attribute (e.g. onclick), we create a couple listener/handler elements on setting the attribute */
+	if ((name[0]=='o') && (name[1]=='n')) {
+		u32 evtType = gf_dom_event_type_by_name(name + 2);
+		if (evtType != GF_EVENT_UNKNOWN) {
+			gf_dom_add_handler_listener(n, evtType, (char *) val);
+			goto exit;
+		}
+	}
+
+	if (n->sgprivate->tag==TAG_DOMFullNode) {
+		gf_dom_full_set_attribute((GF_DOMFullNode*)n, (char *) name, (char *) val);
+		goto exit;
+	}
+
+	if (n->sgprivate->tag==TAG_DOMText) {
+		goto exit;
+	}
+
+	if (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG) {
+		gf_svg_set_attribute(n, (char *) ns, (char *) name, (char *) val);
+	}
+exit:
+	JS_FreeCString(c, name);
+	JS_FreeCString(c, ns);
+	JS_FreeCString(c, _val);
+	return JS_TRUE;
+}
+
+
+static JSValue xml_element_elements_by_tag(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	DOMNodeList *nl;
+	JSValue new_obj;
+	const char *name;
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	if (!argc || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+
+	/*NS version*/
+	if (argc==2) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		name = JS_ToCString(c, argv[1]);
+	} else {
+		name = JS_ToCString(c, argv[0]);
+	}
+	GF_SAFEALLOC(nl, DOMNodeList);
+	if (!nl) return JS_EXCEPTION;
+
+	if (name && !strcmp(name, "*")) {
+		JS_FreeCString(c, name);
+		name = NULL;
+	}
+	xml_doc_gather_nodes((GF_ParentNode*)n, (char *)name, nl);
+	new_obj = JS_NewObjectClass(c, domNodeListClass.class_id);
+	JS_SetOpaque(new_obj, nl);
+	JS_FreeCString(c, name);
+	return new_obj;
+}
+
+static JSValue xml_element_set_id(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 node_id;
+	const char *name;
+	Bool is_id;
+
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc<2) || !JS_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+
+	/*NS version*/
+	if (argc==3) {
+		if (!JS_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		name = JS_ToCString(c, argv[1]);
+		is_id = JS_ToBool(c, argv[2]) ? GF_TRUE : GF_FALSE;
+	} else {
+		name = JS_ToCString(c, argv[0]);
+		is_id = JS_ToBool(c, argv[1]) ? GF_TRUE : GF_FALSE;
+	}
+	gf_node_get_name_and_id(n, &node_id);
+	if (node_id && is_id) {
+		/*we only support ONE ID per node*/
+		JS_FreeCString(c, name);
+		return JS_EXCEPTION;
+	}
+	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) );
+	} else if (node_id) {
+		gf_node_remove_id(n);
+	}
+	JS_FreeCString(c, name);
+	return JS_TRUE;
+}
+static void gather_text(GF_ParentNode *n, char **out_str)
+{
+	if (n->sgprivate->tag==TAG_DOMText) {
+		GF_DOMText *dom_text = (GF_DOMText *)n;
+		if (dom_text->textContent) gf_dynstrcat(out_str, dom_text->textContent, NULL);
+	} else {
+		GF_ChildNodeItem *child = ((GF_ParentNode *) n)->children;
+		while (child) {
+			gather_text((GF_ParentNode *)child->node, out_str);
+			child = child->next;
+		}
+	}
+}
+static JSValue xml_element_to_string(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue ret;
+	char *out_str = NULL;
+	GF_Node *n = dom_get_node(obj);
+	if (!n) return JS_EXCEPTION;
+
+	GF_ChildNodeItem *child;
+	child = ((GF_ParentNode *) n)->children;
+	while (child) {
+		gather_text((GF_ParentNode *)child->node, &out_str);
+		child = child->next;
+	}
+	if (!out_str) {
+		const char *node_name = gf_node_get_class_name(n);
+		if (node_name)
+			return JS_NewString(c, node_name);
+		return JS_NULL;
+	}
+	ret = JS_NewString(c, out_str);
+	gf_free(out_str);
+	return ret;
+}
+
+/*dom3 character/text/comment*/
+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;
+
+	switch (magic) {
+	case TEXT_JSPROPERTY_DATA:
+		if (txt->textContent) return JS_NewString(c, txt->textContent);
+		else return JS_NewString(c, "");
+
+	case TEXT_JSPROPERTY_LENGTH:
+		return JS_NewInt32(c, txt->textContent ? (u32) strlen(txt->textContent) : 0);
+
+	case TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE:
+		return JS_FALSE;
+
+	case TEXT_JSPROPERTY_WHOLETEXT:
+		/*FIXME - this is wrong we should serialize adjacent text strings as well*/
+		if (txt->textContent) return JS_NewString(c, txt->textContent);
+		else return JS_NewString(c, "");
+	}
+	return JS_UNDEFINED;
+}
+
+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;
+
+	switch (magic) {
+	case TEXT_JSPROPERTY_DATA:
+		if (txt->textContent) gf_free(txt->textContent);
+		txt->textContent = NULL;
+		if (JS_CHECK_STRING(value)) {
+			const char *str = JS_ToCString(c, value);
+			txt->textContent = gf_strdup(str ? str : "");
+			JS_FreeCString(c, str);
+		}
+		dom_node_changed((GF_Node*)txt, GF_FALSE, NULL);
+		return JS_TRUE;
+		/*the rest is read-only*/
+	}
+	return JS_UNDEFINED;
+}
+
+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;
+	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;
+	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;
+	evt->event_phase |= GF_DOM_EVENT_PHASE_PREVENT;
+	return JS_TRUE;
+}
+
+static JSValue event_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_DOM_Event *evt = JS_GetOpaque(obj, domEventClass.class_id);
+	if (evt==NULL) return JS_TRUE;
+
+	switch (magic) {
+	case EVENT_JSPROPERTY_TYPE:
+		return JS_NewString(c, gf_dom_event_get_name(evt->type) );
+
+	case EVENT_JSPROPERTY_TARGET:
+		if (evt->is_vrml) return JS_TRUE;
+		switch (evt->target_type) {
+		case GF_DOM_EVENT_TARGET_NODE:
+			return dom_element_construct(c, (GF_Node*) evt->target);
+
+		case GF_DOM_EVENT_TARGET_DOCUMENT:
+			return dom_document_construct(c, (GF_SceneGraph *) evt->target);
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+		case GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE:
+			return OBJECT_TO_JSValue(((GF_HTML_MediaSource *)evt->target)->_this);
+		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER:
+			return OBJECT_TO_JSValue(((GF_HTML_SourceBuffer *)evt->target)->_this);
+		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
+			return OBJECT_TO_JSValue(((GF_HTML_SourceBufferList *)evt->target)->_this);
+#endif
+		default:
+			break;
+		}
+		return JS_TRUE;
+	case EVENT_JSPROPERTY_CURRENTTARGET:
+		if (evt->is_vrml) return JS_NULL;
+		switch (evt->currentTarget->ptr_type) {
+		case GF_DOM_EVENT_TARGET_NODE:
+			return dom_element_construct(c, (GF_Node*) evt->currentTarget->ptr);
+		case GF_DOM_EVENT_TARGET_DOCUMENT:
+			return dom_document_construct(c, (GF_SceneGraph *) evt->currentTarget->ptr);
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+		case GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE:
+			return OBJECT_TO_JSValue(((GF_HTML_MediaSource *)evt->target)->_this);
+		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER:
+			return OBJECT_TO_JSValue(((GF_HTML_SourceBuffer *)evt->target)->_this);
+			break;
+		case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
+			return OBJECT_TO_JSValue(((GF_HTML_SourceBufferList *)evt->target)->_this);
+#endif
+		default:
+			break;
+		}
+		return JS_TRUE;
+	case EVENT_JSPROPERTY_EVENTPHASE:
+		return JS_NewInt32(c, (evt->event_phase & 0x3) );
+
+	case EVENT_JSPROPERTY_BUBBLES:
+		return evt->bubbles ? JS_TRUE : JS_FALSE;
+
+	case EVENT_JSPROPERTY_CANCELABLE:
+		return evt->cancelable ? JS_TRUE : JS_FALSE;
+	case EVENT_JSPROPERTY_NAMESPACEURI:
+		return JS_NULL;
+
+	case EVENT_JSPROPERTY_TIMESTAMP:
+		return JS_NULL;
+
+	case EVENT_JSPROPERTY_DEFAULTPREVENTED:
+		return (evt->event_phase & GF_DOM_EVENT_PHASE_PREVENT) ? JS_TRUE : JS_FALSE;
+
+	case EVENT_JSPROPERTY_DETAIL:
+		return JS_NewInt32(c, evt->detail);
+
+	case EVENT_JSPROPERTY_DATA:
+	{
+		u32 len;
+		s16 txt[2];
+		const u16 *srcp;
+		char szData[5];
+		txt[0] = evt->detail;
+		txt[1] = 0;
+		srcp = (const u16 *) txt;
+		len = (u32) gf_utf8_wcstombs(szData, 5, &srcp);
+		szData[len] = 0;
+		return JS_NewString(c, szData);
+	}
+
+	case EVENT_JSPROPERTY_SCREENX:
+		return JS_NewInt32(c, evt->screenX);
+	case EVENT_JSPROPERTY_SCREENY:
+		return JS_NewInt32(c, evt->screenY);
+	case EVENT_JSPROPERTY_CLIENTX:
+		return JS_NewInt32(c, evt->clientX);
+	case EVENT_JSPROPERTY_CLIENTY:
+		return JS_NewInt32(c, evt->clientY);
+	case EVENT_JSPROPERTY_BUTTON:
+		return JS_NewInt32(c, evt->button);
+	case EVENT_JSPROPERTY_RELATEDTARGET:
+		if (evt->is_vrml) return JS_NULL;
+		return dom_element_construct(c, evt->relatedTarget);
+	case EVENT_JSPROPERTY_WHEELDELTA:
+		return JS_NewInt32(c, FIX2INT(evt->new_scale) );
+	case EVENT_JSPROPERTY_KEYIDENTIFIER:
+		return JS_NewString(c, gf_dom_get_key_name(evt->detail) );
+	/*Mozilla keyChar, charCode: wrap up to same value*/
+	case EVENT_JSPROPERTY_KEYCHAR:
+	case EVENT_JSPROPERTY_CHARCODE:
+		return JS_NewInt32(c, evt->detail);
+	case EVENT_JSPROPERTY_LOADED:
+		return JS_NewInt64(c, evt->media_event.loaded_size);
+	case EVENT_JSPROPERTY_TOTAL:
+		return JS_NewInt64(c, evt->media_event.total_size);
+	case EVENT_JSPROPERTY_BUFFER_ON:
+		return evt->media_event.bufferValid ? JS_TRUE : JS_FALSE;
+	case EVENT_JSPROPERTY_BUFFERLEVEL:
+		return JS_NewInt32(c, evt->media_event.level);
+	case EVENT_JSPROPERTY_BUFFERREMAININGTIME:
+		return JS_NewFloat64(c, evt->media_event.remaining_time);
+	case EVENT_JSPROPERTY_STATUS:
+		return JS_NewInt32(c, evt->media_event.status);
+
+	/*VRML ones*/
+	case EVENT_JSPROPERTY_WIDTH:
+		return JS_NewFloat64(c, FIX2FLT(evt->screen_rect.width) );
+	case EVENT_JSPROPERTY_HEIGHT:
+		return JS_NewFloat64(c, FIX2FLT(evt->screen_rect.height) );
+	case EVENT_JSPROPERTY_OFFSETX:
+		return JS_NewFloat64(c, FIX2FLT(evt->screen_rect.x) );
+	case EVENT_JSPROPERTY_OFFSETY:
+		return JS_NewFloat64(c, FIX2FLT(evt->screen_rect.y) );
+	case EVENT_JSPROPERTY_VPWIDTH:
+		return JS_NewFloat64(c, FIX2FLT(evt->prev_translate.x) );
+	case EVENT_JSPROPERTY_VPHEIGHT:
+		return JS_NewFloat64(c, FIX2FLT(evt->prev_translate.y) );
+	case EVENT_JSPROPERTY_TRANSLATIONX:
+		return JS_NewFloat64(c, FIX2FLT(evt->new_translate.x) );
+	case EVENT_JSPROPERTY_TRANSLATIONY:
+		return JS_NewFloat64(c, FIX2FLT(evt->new_translate.y) );
+	case EVENT_JSPROPERTY_TYPE3D:
+		return JS_NewInt32(c, evt->detail);
+	case EVENT_JSPROPERTY_ERROR:
+		return JS_NewInt32(c, evt->error_state);
+	case EVENT_JSPROPERTY_DYNAMIC_SCENE:
+		return JS_NewInt32(c, evt->key_flags);
+	case EVENT_JSPROPERTY_URL:
+		return JS_NewString(c, evt->addon_url ? evt->addon_url : "");
+
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+
+#define SETUP_JSCLASS(_class, _name, _proto_funcs, _construct, _finalize, _proto_class_id) \
+	if (! _class.class_id) {\
+		JS_NewClassID(&(_class.class_id)); \
+		_class.class.class_name = _name; \
+		_class.class.finalizer = _finalize;\
+		JS_NewClass(jsrt, _class.class_id, &(_class.class));\
+	}\
+	proto = JS_NewObjectClass(c, _proto_class_id ? _proto_class_id : _class.class_id);\
+    	JS_SetPropertyFunctionList(c, proto, _proto_funcs, countof(_proto_funcs));\
+    	JS_SetClassProto(c, _class.class_id, proto);\
+    	if (_construct) {\
+		JSValue ctor = JS_NewCFunction2(c, _construct, _name, 1, JS_CFUNC_constructor, 0);\
+    		JS_SetPropertyStr(c, global, _name, ctor);\
+	}\
+
+
+/*SVGMatrix class*/
+static const JSCFunctionListEntry node_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("nodeName", dom_node_getProperty, NULL, NODE_JSPROPERTY_NODENAME),
+	JS_CGETSET_MAGIC_DEF("nodeValue", dom_node_getProperty, dom_node_setProperty, NODE_JSPROPERTY_NODEVALUE),
+
+	JS_CGETSET_MAGIC_DEF("nodeType", dom_node_getProperty, NULL, NODE_JSPROPERTY_NODETYPE),
+	JS_CGETSET_MAGIC_DEF("parentNode", dom_node_getProperty, NULL, NODE_JSPROPERTY_PARENTNODE),
+	JS_CGETSET_MAGIC_DEF("childNodes", dom_node_getProperty, NULL, NODE_JSPROPERTY_CHILDNODES),
+	JS_CGETSET_MAGIC_DEF("firstChild", dom_node_getProperty, NULL, NODE_JSPROPERTY_FIRSTCHILD),
+	JS_CGETSET_MAGIC_DEF("lastChild", dom_node_getProperty, NULL, NODE_JSPROPERTY_LASTCHILD),
+	JS_CGETSET_MAGIC_DEF("previousSibling", dom_node_getProperty, NULL, NODE_JSPROPERTY_PREVIOUSSIBLING),
+	JS_CGETSET_MAGIC_DEF("nextSibling", dom_node_getProperty, NULL, NODE_JSPROPERTY_NEXTSIBLING),
+	JS_CGETSET_MAGIC_DEF("attributes", dom_node_getProperty, NULL, NODE_JSPROPERTY_ATTRIBUTES),
+	JS_CGETSET_MAGIC_DEF("ownerDocument", dom_node_getProperty, NULL, NODE_JSPROPERTY_OWNERDOCUMENT),
+	JS_CGETSET_MAGIC_DEF("namespaceURI", dom_node_getProperty, NULL, NODE_JSPROPERTY_NAMESPACEURI),
+	JS_CGETSET_MAGIC_DEF("prefix", dom_node_getProperty, dom_node_setProperty, NODE_JSPROPERTY_PREFIX),
+	JS_CGETSET_MAGIC_DEF("localName", dom_node_getProperty, NULL, NODE_JSPROPERTY_LOCALNAME),
+	JS_CGETSET_MAGIC_DEF("baseURI", dom_node_getProperty, NULL, NODE_JSPROPERTY_BASEURI),
+	JS_CGETSET_MAGIC_DEF("textContent", dom_node_getProperty, dom_node_setProperty, NODE_JSPROPERTY_TEXTCONTENT),
+	/*elementTraversal interface*/
+	JS_CGETSET_MAGIC_DEF("firstElementChild", dom_node_getProperty, NULL, NODE_JSPROPERTY_FIRSTELEMENTCHILD),
+	JS_CGETSET_MAGIC_DEF("lastElementChild", dom_node_getProperty, NULL, NODE_JSPROPERTY_LASTELEMENTCHILD),
+	JS_CGETSET_MAGIC_DEF("previousElementSibling", dom_node_getProperty, NULL, NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING),
+	JS_CGETSET_MAGIC_DEF("nextElementSibling", dom_node_getProperty, NULL, NODE_JSPROPERTY_NEXTELEMENTSIBLING),
+
+	JS_CFUNC_DEF("insertBefore", 2, xml_node_insert_before),
+	JS_CFUNC_DEF("replaceChild", 2, xml_node_replace_child),
+	JS_CFUNC_DEF("removeChild",	1, xml_node_remove_child),
+	JS_CFUNC_DEF("appendChild", 1, xml_node_append_child),
+	JS_CFUNC_DEF("hasChildNodes", 0, xml_node_has_children),
+	JS_CFUNC_DEF("cloneNode", 1, xml_clone_node),
+	JS_CFUNC_DEF("normalize", 0, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("isSupported", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("hasAttributes", 0, xml_node_has_attributes),
+	JS_CFUNC_DEF("compareDocumentPosition", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("isSameNode", 1, xml_node_is_same_node),
+	JS_CFUNC_DEF("lookupPrefix", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("isDefaultNamespace", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("lookupNamespaceURI", 1, xml_dom3_not_implemented),
+	/*we don't support full node compare*/
+	JS_CFUNC_DEF("isEqualNode", 1, xml_node_is_same_node),
+	JS_CFUNC_DEF("getFeature", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("setUserData", 3, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("getUserData",	1, xml_dom3_not_implemented),
+};
+
+
+static const JSCFunctionListEntry document_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("doctype", dom_document_getProperty, NULL, DOCUMENT_JSPROPERTY_DOCTYPE),
+	JS_CGETSET_MAGIC_DEF("implementation", dom_document_getProperty, NULL, DOCUMENT_JSPROPERTY_IMPLEMENTATION),
+	JS_CGETSET_MAGIC_DEF("documentElement", dom_document_getProperty, NULL, DOCUMENT_JSPROPERTY_DOCUMENTELEMENT),
+	JS_CGETSET_MAGIC_DEF("inputEncoding", dom_document_getProperty, NULL, DOCUMENT_JSPROPERTY_INPUTENCODING),
+	JS_CGETSET_MAGIC_DEF("xmlEncoding", dom_document_getProperty, NULL, DOCUMENT_JSPROPERTY_XMLENCODING),
+	JS_CGETSET_MAGIC_DEF("xmlStandalone", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_XMLSTANDALONE),
+	JS_CGETSET_MAGIC_DEF("xmlVersion", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_XMLVERSION),
+	JS_CGETSET_MAGIC_DEF("strictErrorChecking", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_STRICTERRORCHECKING),
+	JS_CGETSET_MAGIC_DEF("documentURI", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_DOCUMENTURI),
+	JS_CGETSET_MAGIC_DEF("location", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_LOCATION),
+	JS_CGETSET_MAGIC_DEF("domConfig", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_DOMCONFIG),
+	JS_CGETSET_MAGIC_DEF("global", dom_document_getProperty, dom_document_setProperty, DOCUMENT_JSPROPERTY_GLOBAL),
+
+	JS_CFUNC_DEF("createElement", 1, xml_document_create_element),
+	JS_CFUNC_DEF("createDocumentFragment", 0, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createTextNode", 1, xml_document_create_text),
+	JS_CFUNC_DEF("createComment", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createCDATASection", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createProcessingInstruction", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createAttribute", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createEntityReference", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("getElementsByTagName", 1, xml_document_elements_by_tag),
+	JS_CFUNC_DEF("importNode", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("createElementNS", 2, xml_document_create_element),
+	JS_CFUNC_DEF("createAttributeNS", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("getElementsByTagNameNS", 2, xml_document_elements_by_tag),
+	JS_CFUNC_DEF("getElementById", 1, xml_document_element_by_id),
+	JS_CFUNC_DEF("adoptNode", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("normalizeDocument", 0, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("renameNode", 3, xml_dom3_not_implemented),
+	/*eventTarget interface*/
+	JS_DOM3_EVENT_TARGET_INTERFACE
+	/*DocumentEvent interface*/
+	JS_CFUNC_DEF("createEvent", 1, xml_dom3_not_implemented),
+};
+
+static const JSCFunctionListEntry element_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("tagName", dom_element_getProperty, NULL, ELEMENT_JSPROPERTY_TAGNAME),
+	JS_CGETSET_MAGIC_DEF("schemaTypeInfo", dom_element_getProperty, NULL, ELEMENT_JSPROPERTY_SCHEMATYPEINFO),
+
+	JS_CFUNC_DEF("getAttribute", 1, xml_element_get_attribute),
+	JS_CFUNC_DEF("setAttribute", 2, xml_element_set_attribute),
+	JS_CFUNC_DEF("removeAttribute", 1, xml_element_remove_attribute),
+	JS_CFUNC_DEF("getAttributeNS", 2, xml_element_get_attribute),
+	JS_CFUNC_DEF("setAttributeNS", 3, xml_element_set_attribute),
+	JS_CFUNC_DEF("removeAttributeNS", 2, xml_element_remove_attribute),
+	JS_CFUNC_DEF("hasAttribute", 1, xml_element_has_attribute),
+	JS_CFUNC_DEF("hasAttributeNS", 2, xml_element_has_attribute),
+	JS_CFUNC_DEF("getElementsByTagName", 1, xml_element_elements_by_tag),
+	JS_CFUNC_DEF("getElementsByTagNameNS", 2, xml_element_elements_by_tag),
+	JS_CFUNC_DEF("setIdAttribute", 2, xml_element_set_id),
+	JS_CFUNC_DEF("setIdAttributeNS", 3, xml_element_set_id),
+	JS_CFUNC_DEF("toString", 0, xml_element_to_string),
+	JS_CFUNC_DEF("getAttributeNode", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("setAttributeNode", 1, xml_dom3_not_implemented),
+	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)
+};
+
+static const JSCFunctionListEntry text_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("data", dom_text_getProperty, dom_text_setProperty, TEXT_JSPROPERTY_DATA),
+	JS_CGETSET_MAGIC_DEF("length", dom_text_getProperty, NULL, TEXT_JSPROPERTY_LENGTH),
+	JS_CGETSET_MAGIC_DEF("isElementContentWhitespace", dom_text_getProperty, NULL, TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE),
+	JS_CGETSET_MAGIC_DEF("wholeText", dom_text_getProperty, NULL, TEXT_JSPROPERTY_WHOLETEXT),
+#if 0
+	JS_CFUNC_DEF("substringData", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("appendData", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("insertData", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("deleteData", 2, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("replaceData", 3, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("splitText", 1, xml_dom3_not_implemented),
+	JS_CFUNC_DEF("replaceWholeText", 1, xml_dom3_not_implemented),
+#endif
+};
+
+static const JSCFunctionListEntry event_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("type", event_getProperty, NULL, EVENT_JSPROPERTY_TYPE),
+	JS_CGETSET_MAGIC_DEF("target", event_getProperty, NULL, EVENT_JSPROPERTY_TARGET),
+	JS_CGETSET_MAGIC_DEF("currentTarget", event_getProperty, NULL, EVENT_JSPROPERTY_CURRENTTARGET),
+	JS_CGETSET_MAGIC_DEF("eventPhase", event_getProperty, NULL, EVENT_JSPROPERTY_EVENTPHASE),
+	JS_CGETSET_MAGIC_DEF("bubbles", event_getProperty, NULL, EVENT_JSPROPERTY_BUBBLES),
+	JS_CGETSET_MAGIC_DEF("cancelable", event_getProperty, NULL, EVENT_JSPROPERTY_CANCELABLE),
+	JS_CGETSET_MAGIC_DEF("timeStamp", event_getProperty, NULL, EVENT_JSPROPERTY_TIMESTAMP),
+	JS_CGETSET_MAGIC_DEF("namespaceURI", event_getProperty, NULL, EVENT_JSPROPERTY_NAMESPACEURI),
+	JS_CGETSET_MAGIC_DEF("defaultPrevented", event_getProperty, NULL, EVENT_JSPROPERTY_DEFAULTPREVENTED),
+	/*UIEvent*/
+	JS_CGETSET_MAGIC_DEF("detail", event_getProperty, NULL, EVENT_JSPROPERTY_DETAIL),
+	/*text, connectionEvent*/
+	JS_CGETSET_MAGIC_DEF("data", event_getProperty, NULL, EVENT_JSPROPERTY_DATA),
+	/*MouseEvent*/
+	JS_CGETSET_MAGIC_DEF("screenX", event_getProperty, NULL, EVENT_JSPROPERTY_SCREENX),
+	JS_CGETSET_MAGIC_DEF("screenY", event_getProperty, NULL, EVENT_JSPROPERTY_SCREENY),
+	JS_CGETSET_MAGIC_DEF("clientX", event_getProperty, NULL, EVENT_JSPROPERTY_CLIENTX),
+	JS_CGETSET_MAGIC_DEF("clientY", event_getProperty, NULL, EVENT_JSPROPERTY_CLIENTY),
+	JS_CGETSET_MAGIC_DEF("button", event_getProperty, NULL, EVENT_JSPROPERTY_BUTTON),
+	JS_CGETSET_MAGIC_DEF("relatedTarget", event_getProperty, NULL, EVENT_JSPROPERTY_RELATEDTARGET),
+	/*wheelEvent*/
+	JS_CGETSET_MAGIC_DEF("wheelDelta", event_getProperty, NULL, EVENT_JSPROPERTY_WHEELDELTA),
+	/*keyboard*/
+	JS_CGETSET_MAGIC_DEF("keyIdentifier", event_getProperty, NULL, EVENT_JSPROPERTY_KEYIDENTIFIER),
+	JS_CGETSET_MAGIC_DEF("keyChar", event_getProperty, NULL, EVENT_JSPROPERTY_KEYCHAR),
+	JS_CGETSET_MAGIC_DEF("charCode", event_getProperty, NULL, EVENT_JSPROPERTY_CHARCODE),
+	/*progress*/
+	JS_CGETSET_MAGIC_DEF("lengthComputable", event_getProperty, NULL, EVENT_JSPROPERTY_LENGTHCOMPUTABLE),
+	JS_CGETSET_MAGIC_DEF("typeArg", event_getProperty, NULL, EVENT_JSPROPERTY_TYPEARG),
+	JS_CGETSET_MAGIC_DEF("loaded", event_getProperty, NULL, EVENT_JSPROPERTY_LOADED),
+	JS_CGETSET_MAGIC_DEF("total", event_getProperty, NULL, EVENT_JSPROPERTY_TOTAL),
+	JS_CGETSET_MAGIC_DEF("buffering", event_getProperty, NULL, EVENT_JSPROPERTY_BUFFER_ON),
+	JS_CGETSET_MAGIC_DEF("bufferLevel", event_getProperty, NULL, EVENT_JSPROPERTY_BUFFERLEVEL),
+	JS_CGETSET_MAGIC_DEF("bufferRemainingTime", event_getProperty, NULL, EVENT_JSPROPERTY_BUFFERREMAININGTIME),
+	JS_CGETSET_MAGIC_DEF("status", event_getProperty, NULL, EVENT_JSPROPERTY_STATUS),
+	/*used by vrml*/
+	JS_CGETSET_MAGIC_DEF("width", event_getProperty, NULL, EVENT_JSPROPERTY_WIDTH),
+	JS_CGETSET_MAGIC_DEF("height", event_getProperty, NULL, EVENT_JSPROPERTY_HEIGHT),
+	JS_CGETSET_MAGIC_DEF("offset_x", event_getProperty, NULL, EVENT_JSPROPERTY_OFFSETX),
+	JS_CGETSET_MAGIC_DEF("offset_y", event_getProperty, NULL, EVENT_JSPROPERTY_OFFSETY),
+	JS_CGETSET_MAGIC_DEF("vp_width", event_getProperty, NULL, EVENT_JSPROPERTY_VPWIDTH),
+	JS_CGETSET_MAGIC_DEF("vp_height", event_getProperty, NULL, EVENT_JSPROPERTY_VPHEIGHT),
+	JS_CGETSET_MAGIC_DEF("translation_x", event_getProperty, NULL, EVENT_JSPROPERTY_TRANSLATIONX),
+	JS_CGETSET_MAGIC_DEF("translation_y", event_getProperty, NULL, EVENT_JSPROPERTY_TRANSLATIONY),
+	JS_CGETSET_MAGIC_DEF("type3d", event_getProperty, NULL, EVENT_JSPROPERTY_TYPE3D),
+	JS_CGETSET_MAGIC_DEF("error", event_getProperty, NULL, EVENT_JSPROPERTY_ERROR),
+	JS_CGETSET_MAGIC_DEF("dynamic_scene", event_getProperty, NULL, EVENT_JSPROPERTY_DYNAMIC_SCENE),
+	JS_CGETSET_MAGIC_DEF("url", event_getProperty, NULL, EVENT_JSPROPERTY_URL),
+
+	JS_CFUNC_DEF("stopPropagation", 0, event_stop_propagation),
+	JS_CFUNC_DEF("stopImmediatePropagation", 0, event_stop_immediate_propagation),
+	JS_CFUNC_DEF("preventDefault", 0, event_prevent_default),
+#if 0
+	JS_CFUNC_DEF("initEvent", 3, event_prevent_default),
+	JS_CFUNC_DEF("initEventNS", 4, event_prevent_default),
+#endif
+};
+
+static const JSCFunctionListEntry nodeList_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("length", dom_nodelist_getProperty, NULL, NODELIST_JSPROPERTY_LENGTH),
+	JS_CFUNC_DEF("item", 1, dom_nodelist_item),
+};
+
+
+void domDocument_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	GF_SceneGraph *sg;
+	sg = (GF_SceneGraph*) JS_GetOpaque_Nocheck(obj);
+	/*the JS proto of the svgClass or a destroyed object*/
+	if (!sg || !sg->js_data) return;
+	if (!JS_IsUndefined(sg->js_data->document))
+		JS_MarkValue(rt, sg->js_data->document, mark_func);
+}
+void domElement_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func)
+{
+	GF_Node *n = (GF_Node *) JS_GetOpaque_Nocheck(obj);
+	/*the JS proto of the svgClass or a destroyed object*/
+	if (!n) return;
+	if (!n->sgprivate || !n->sgprivate->interact || !n->sgprivate->interact->js_binding) return;
+
+	if (!JS_IsUndefined(n->sgprivate->interact->js_binding->obj))
+		JS_MarkValue(rt, n->sgprivate->interact->js_binding->obj, mark_func);
+}
+
+void dom_js_load(GF_SceneGraph *scene, JSContext *c)
+{
+	JSValue proto;
+	JSValue global = JS_GetGlobalObject(c);
+	JSRuntime *jsrt = JS_GetRuntime(c);
+
+	if (!dom_rt) {
+		GF_SAFEALLOC(dom_rt, GF_DOMRuntime);
+		if (!dom_rt) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM runtime\n"));
+			return;
+		}
+		dom_rt->handlers = gf_list_new();
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] dom run-time allocated\n"));
+	}
+	dom_rt->nb_inst++;
+
+	define_dom_exception(c, global);
+
+	domNodeClass.class.gc_mark = domElement_gc_mark;
+	SETUP_JSCLASS(domNodeClass, "Node", node_Funcs, NULL, dom_node_finalize, 0);
+	JS_SetPropertyStr(c, proto, "ELEMENT_NODE", JS_NewInt32(c, 1) );
+	JS_SetPropertyStr(c, proto, "TEXT_NODE", JS_NewInt32(c, 3));
+	JS_SetPropertyStr(c, proto, "CDATA_SECTION_NODE", JS_NewInt32(c, 4));
+	JS_SetPropertyStr(c, proto, "DOCUMENT_NODE", JS_NewInt32(c, 9));
+
+	domDocumentClass.class.gc_mark = domDocument_gc_mark;
+	SETUP_JSCLASS(domDocumentClass, "Document", document_Funcs, NULL, dom_document_finalize, domNodeClass.class_id);
+	domElementClass.class.gc_mark = domElement_gc_mark;
+	SETUP_JSCLASS(domElementClass, "Element", element_Funcs, NULL, dom_node_finalize, domNodeClass.class_id);
+	domTextClass.class.gc_mark = domElement_gc_mark;
+	SETUP_JSCLASS(domTextClass, "Text", text_Funcs, NULL, dom_node_finalize, domNodeClass.class_id);
+
+	SETUP_JSCLASS(domEventClass, "Event", event_Funcs, NULL, NULL, 0);
+	JS_SetPropertyStr(c, proto, "CAPTURING_PHASE", JS_NewInt32(c, 1));
+	JS_SetPropertyStr(c, proto, "AT_TARGET", JS_NewInt32(c, 2));
+	JS_SetPropertyStr(c, proto, "BUBBLING_PHASE", JS_NewInt32(c, 3));
+	JS_SetPropertyStr(c, proto, "DOM_KEY_LOCATION_STANDARD ", JS_NewInt32(c, 0));
+	JS_SetPropertyStr(c, proto, "DOM_KEY_LOCATION_LEFT", JS_NewInt32(c, 1));
+	JS_SetPropertyStr(c, proto, "DOM_KEY_LOCATION_RIGHT", JS_NewInt32(c, 2));
+	JS_SetPropertyStr(c, proto, "DOM_KEY_LOCATION_NUMPAD", JS_NewInt32(c, 3));
+
+
+	SETUP_JSCLASS(domNodeListClass, "NodeList", nodeList_Funcs, NULL, dom_nodelist_finalize, 0);
+
+	JS_FreeValue(c, global);
+}
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+void html_media_element_js_finalize(JSContext *c, GF_Node *n);
+#endif
+
+GF_EXPORT
+void gf_sg_js_dom_pre_destroy(JSRuntime *rt, GF_SceneGraph *sg, GF_Node *n)
+{
+	u32 i, count;
+	if (n) {
+		if (n->sgprivate->interact && n->sgprivate->interact->js_binding && !JS_IsUndefined(n->sgprivate->interact->js_binding->obj) ) {
+			JS_SetOpaque(n->sgprivate->interact->js_binding->obj, NULL);
+			if (gf_list_del_item(sg->objects, n->sgprivate->interact->js_binding)>=0) {
+				JS_SetOpaque(n->sgprivate->interact->js_binding->obj, NULL);
+				JS_FreeValueRT(rt, n->sgprivate->interact->js_binding->obj);
+			}
+			n->sgprivate->interact->js_binding->obj = JS_UNDEFINED;
+		}
+		return;
+	}
+
+	/*force cleanup of scripts/handlers not destroyed - this usually happens when a script/handler node has been created in a script
+	but not inserted in the graph*/
+	while (gf_list_count(sg->objects)) {
+		GF_Node *js_node;
+		struct _node_js_binding *js_bind = (struct _node_js_binding *)gf_list_get(sg->objects, 0);
+		js_node = dom_get_node(js_bind->obj);
+		if (js_node) {
+			if (js_node->sgprivate->tag == TAG_SVG_video || js_node->sgprivate->tag == TAG_SVG_audio) {
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+				html_media_element_js_finalize(c, js_node);
+#endif
+			}
+			JS_SetOpaque(js_bind->obj, NULL);
+			JS_FreeValueRT(rt, js_node->sgprivate->interact->js_binding->obj);
+			js_node->sgprivate->interact->js_binding->obj=JS_UNDEFINED;
+			gf_node_unregister(js_node, NULL);
+		}
+		gf_list_rem(sg->objects, 0);
+	}
+
+	count = dom_rt ? gf_list_count(dom_rt->handlers) : 0;
+	for (i=0; i<count; i++) {
+		SVG_handlerElement *handler = (SVG_handlerElement *)gf_list_get(dom_rt->handlers, i);
+		if (!handler->js_data) continue;
+
+		/*if same context and same document, discard handler*/
+		if (!sg || (handler->sgprivate->scenegraph==sg)) {
+			/*unprotect the function*/
+			JS_FreeValueRT(rt, handler->js_data->fun_val);
+			gf_free(handler->js_data);
+			handler->js_data = NULL;
+			gf_list_rem(dom_rt->handlers, i);
+			i--;
+			count--;
+		}
+	}
+	if (sg->js_data) {
+		if (!JS_IsUndefined(sg->js_data->document)) {
+//			dom_document_finalize(c, sg->document);
+			JS_FreeValueRT(rt, sg->js_data->document);
+		}
+		gf_free(sg->js_data);
+		sg->js_data = NULL;
+	}
+}
+
+void dom_js_unload()
+{
+	if (!dom_rt) return;
+	dom_rt->nb_inst--;
+	if (!dom_rt->nb_inst) {
+		gf_list_del(dom_rt->handlers);
+		gf_free(dom_rt);
+		dom_rt = NULL;
+	}
+}
+
+JSValue dom_js_define_event(JSContext *c)
+{
+	JSValue global = JS_GetGlobalObject(c);
+
+	JSValue obj = JS_NewObjectClass(c, domEventClass.class_id);
+	JS_SetPropertyStr(c, global, "evt", obj);
+//	JS_DefinePropertyStr(c, global, "event", obj);
+	JS_FreeValue(c, global);
+	return obj;
+}
+GF_DOM_Event *dom_get_evt_private(JSValue v)
+{
+	return JS_GetOpaque(v, domEventClass.class_id);
+}
+
+JSValue gf_dom_new_event(JSContext *c)
+{
+	return JS_NewObjectClass(c, domEventClass.class_id);
+}
+
+JSClassID dom_js_get_element_proto(JSContext *c)
+{
+	return domElementClass.class_id;
+}
+JSClassID dom_js_get_document_proto(JSContext *c)
+{
+	return domDocumentClass.class_id;
+}
+#endif	/*GPAC_HAS_QJS*/
+
+
+
+#if 0 //unused
+/*! parses the given XML document and returns a scene graph composed of GF_DOMFullNode
+\param src the source file
+\param scene set to the new scene graph
+\return error if any
+*/
+GF_Err gf_sg_new_from_xml_doc(const char *src, GF_SceneGraph **scene)
+{
+#ifdef GPAC_HAS_QJS
+	GF_Err e;
+	XMLHTTPContext *ctx;
+	GF_SceneGraph *sg;
+
+	GF_SAFEALLOC(ctx, XMLHTTPContext);
+	if (!ctx) return GF_OUT_OF_MEM;
+
+	ctx->sax = gf_xml_sax_new(xml_http_sax_start, xml_http_sax_end, xml_http_sax_text, ctx);
+	ctx->node_stack = gf_list_new();
+	sg = gf_sg_new();
+	ctx->document = sg;
+	e = gf_xml_sax_parse_file(ctx->sax, src, NULL);
+	gf_xml_sax_del(ctx->sax);
+	gf_list_del(ctx->node_stack);
+	gf_free(ctx);
+
+	*scene = NULL;
+	if (e<0) {
+		gf_sg_del(sg);
+		return e;
+	}
+	*scene = sg;
+	return GF_OK;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+#endif
+
+
+
+#if 0 //unused
+
+typedef struct
+{
+	GF_SAXParser *sax;
+	GF_List *node_stack;
+	/*dom graph*/
+	GF_SceneGraph *document;
+} XMLReloadContext;
+
+static void xml_reload_node_start(void *sax_cbck, const char *node_name, const char *name_space, const GF_XMLAttribute *attributes, u32 nb_attributes)
+{
+	GF_DOM_Event evt;
+	Bool is_root = GF_FALSE;
+	Bool modified = GF_FALSE;
+	Bool atts_modified = GF_FALSE;
+	Bool new_node = GF_FALSE;
+	u32 i;
+	GF_DOMFullAttribute *prev = NULL;
+	GF_DOMFullNode *par = NULL;
+	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
+	GF_DOMFullNode *node;
+
+	node = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	if (!node) {
+		is_root = GF_TRUE;
+		node = (GF_DOMFullNode *) ctx->document->RootNode;
+	}
+
+	if (is_root) {
+		Bool same_node = GF_TRUE;
+		if (strcmp(node->name, node_name)) same_node = GF_FALSE;
+		if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
+
+		if (!same_node) {
+			if (node->name) gf_free(node->name);
+			node->name = gf_strdup(node_name);
+			node->ns = 0;
+			if (name_space) {
+				gf_sg_add_namespace(node->sgprivate->scenegraph, (char *) name_space, NULL);
+				node->ns = gf_sg_get_namespace_code_from_name(node->sgprivate->scenegraph, (char*)name_space);
+			}
+			modified = GF_TRUE;
+		}
+	} else {
+		GF_ChildNodeItem *child = node->children;
+		node = NULL;
+		/*locate the node in the children*/
+		while (child) {
+			Bool same_node = GF_TRUE;
+			node = (GF_DOMFullNode*)child->node;
+			if (strcmp(node->name, node_name)) same_node = GF_FALSE;
+			if (node->ns && name_space && strcmp(gf_sg_get_namespace(node->sgprivate->scenegraph, node->ns), name_space)) same_node = GF_FALSE;
+			if (same_node) {
+				break;
+			}
+			node = NULL;
+			child = child->next;
+		}
+		if (!node) {
+			modified = GF_TRUE;
+
+			/*create the new node*/
+			node = (GF_DOMFullNode *) gf_node_new(ctx->document, TAG_DOMFullNode);
+			node->name = gf_strdup(node_name);
+			if (name_space) {
+				gf_sg_add_namespace(node->sgprivate->scenegraph, (char *)name_space, NULL);
+				node->ns = gf_sg_get_namespace_code(node->sgprivate->scenegraph, (char *)name_space);
+			}
+
+			par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+			gf_node_register((GF_Node*)node, (GF_Node*)par);
+			gf_node_list_add_child(&par->children, (GF_Node*)node);
+			new_node = GF_TRUE;
+		}
+	}
+	gf_list_add(ctx->node_stack, node);
+
+	if (!modified) {
+		u32 count = 0;
+		GF_DOMFullAttribute *att = (GF_DOMFullAttribute *)node->attributes;
+		while (att) {
+			Bool found = GF_FALSE;
+			for (i=0; i<nb_attributes; i++) {
+				if (!stricmp(attributes[i].name, "xml:id")) {
+					const char *id = gf_node_get_name((GF_Node*)node);
+					if (!id || strcmp(id, attributes[i].value))
+						modified = GF_TRUE;
+				} else if (!strcmp(att->name, attributes[i].name)) {
+					found = GF_TRUE;
+					if (strcmp((const char *)att->data, attributes[i].value)) {
+						atts_modified = GF_TRUE;
+						gf_free(att->data);
+						att->data = gf_strdup(attributes[i].value);
+					}
+				}
+			}
+			if (!found) {
+				modified = GF_TRUE;
+				break;
+			}
+			count++;
+			att = (GF_DOMFullAttribute *)att->next;
+		}
+		if (count != nb_attributes)
+			modified = GF_TRUE;
+	}
+
+
+	if (modified) {
+		GF_DOMFullAttribute *tmp, *att;
+		att = (GF_DOMFullAttribute *)node->attributes;
+		while (att) {
+			if (att->name) gf_free(att->name);
+			if (att->data) gf_free(att->data);
+			tmp = att;
+			att = (GF_DOMFullAttribute *)att->next;
+			gf_free(tmp);
+		}
+
+		/*parse all atts*/
+		for (i=0; i<nb_attributes; i++) {
+			if (!stricmp(attributes[i].name, "xml:id")) {
+				u32 id = gf_sg_get_max_node_id(ctx->document) + 1;
+				gf_node_set_id((GF_Node *)node, id, attributes[i].value);
+			} else {
+				GF_DOMFullAttribute *att;
+				GF_SAFEALLOC(att, GF_DOMFullAttribute);
+				if (!att) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMJS] Failed to allocate DOM attribute\n"));
+					continue;
+				}
+				att->tag = TAG_DOM_ATT_any;
+				att->name = gf_strdup(attributes[i].name);
+				att->data = gf_strdup(attributes[i].value);
+				if (prev) prev->next = (GF_DOMAttribute*)att;
+				else node->attributes = (GF_DOMAttribute*)att;
+				prev = att;
+			}
+		}
+		atts_modified = GF_TRUE;
+	}
+
+	if (atts_modified || new_node) {
+		memset(&evt, 0, sizeof(GF_DOM_Event));
+		evt.type = new_node ? GF_EVENT_NODE_INSERTED : GF_EVENT_ATTR_MODIFIED;
+		evt.bubbles = 1;
+		evt.relatedNode = (GF_Node*) ( (evt.type == GF_EVENT_NODE_INSERTED) ? par : node);
+		gf_dom_event_fire((GF_Node*)node, &evt);
+	}
+}
+
+static void xml_reload_node_end(void *sax_cbck, const char *node_name, const char *name_space)
+{
+	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	if (par) {
+		/*depth mismatch*/
+		if (strcmp(par->name, node_name)) return;
+		gf_list_rem_last(ctx->node_stack);
+	}
+}
+static void xml_reload_text_content(void *sax_cbck, const char *content, Bool is_cdata)
+{
+	GF_DOM_Event evt;
+	u32 i, len;
+	GF_ChildNodeItem *child;
+	GF_DOMText *txt = NULL;
+	XMLReloadContext *ctx = (XMLReloadContext *)sax_cbck;
+	GF_DOMFullNode *par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
+	if (!par) return;
+
+	/*basic check, remove all empty text nodes*/
+	len = (u32) strlen(content);
+	for (i=0; i<len; i++) {
+		if (!strchr(" \n\r\t", content[i])) break;
+	}
+	if (i==len) return;
+
+	child = par->children;
+	while (child) {
+		if (child->node->sgprivate->tag == TAG_DOMText) {
+			txt = (GF_DOMText *)child->node;
+			if (!strcmp(txt->textContent, content) && ((txt->type==GF_DOM_TEXT_REGULAR) || is_cdata))
+				return;
+			if (txt->textContent) gf_free(txt->textContent);
+			txt->textContent = gf_strdup(content);
+			txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
+			break;
+		}
+		child = child->next;
+	}
+	if (!txt) {
+		txt = gf_dom_add_text_node((GF_Node *)par, gf_strdup(content) );
+		txt->type = is_cdata ? GF_DOM_TEXT_CDATA : GF_DOM_TEXT_REGULAR;
+
+		memset(&evt, 0, sizeof(GF_DOM_Event));
+		evt.type = GF_EVENT_NODE_INSERTED;
+		evt.bubbles = 1;
+		evt.relatedNode = (GF_Node*) par;
+		gf_dom_event_fire((GF_Node*)txt, &evt);
+	}
+
+	memset(&evt, 0, sizeof(GF_DOM_Event));
+	evt.type = GF_EVENT_CHAR_DATA_MODIFIED;
+	evt.bubbles = 1;
+	evt.relatedNode = (GF_Node*)par;
+	gf_dom_event_fire((GF_Node*)par, &evt);
+
+	memset(&evt, 0, sizeof(GF_DOM_Event));
+	evt.type = GF_EVENT_DCCI_PROP_CHANGE;
+	evt.bubbles = 1;
+	evt.relatedNode = (GF_Node*)par;
+	gf_dom_event_fire((GF_Node*)par, &evt);
+}
+
+GF_Err gf_sg_reload_xml_doc(const char *src, GF_SceneGraph *scene)
+{
+	GF_Err e;
+	XMLReloadContext ctx;
+
+	if (!src || !scene) return GF_BAD_PARAM;
+	memset(&ctx, 0, sizeof(XMLReloadContext));
+	ctx.document = scene;
+	ctx.node_stack = gf_list_new();
+
+	ctx.sax = gf_xml_sax_new(xml_reload_node_start, xml_reload_node_end, xml_reload_text_content, &ctx);
+	e = gf_xml_sax_parse_file(ctx.sax, src, NULL);
+	gf_list_del(ctx.node_stack);
+	gf_xml_sax_del(ctx.sax);
+	if (e<0) return e;
+	return GF_OK;
+}
+#endif
+
+
+#endif	/*GPAC_DISABLE_SVG*/

gpac-1.0.0.tar.gz/src/scenegraph/html5_media_js.c Added

@@ -0,0 +1,1711 @@
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2007-2012
+ *          All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+/*dom events*/
+#include <gpac/events.h>
+/*dom text event*/
+#include <gpac/utf.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/xml.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+
+#ifdef GPAC_CONFIG_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif /* XP_UNIX */
+#endif
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#include <gpac/internal/smjs_api.h>
+#include <gpac/html5_media.h>
+
+/***********************************************************
+ *
+ * DOM generic functions being used
+ *
+ ***********************************************************/
+#ifdef USE_FFDEV_15
+void dom_element_finalize(JSFreeOp *fop, JSObject *obj);
+void dom_document_finalize(JSFreeOp *fop, JSObject *obj);
+#else
+void dom_element_finalize(JSContext *c, JSObject *obj);
+void dom_document_finalize(JSContext *c, JSObject *obj);
+#endif
+
+void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val);
+
+#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
+
+/* including terminal dev for MediaObject */
+
+/* including Compositor dev for TextureHandler and AudioInput */
+#include <gpac/internal/compositor_dev.h>
+
+static GF_HTML_MediaRuntime *html_media_rt = NULL;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 MediaError interface */
+typedef enum
+{
+	MEDIA_ERROR_PROP_ABORTED            = -1,
+	MEDIA_ERROR_PROP_NETWORK            = -2,
+	MEDIA_ERROR_PROP_DECODE             = -3,
+	MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED  = -4,
+	MEDIA_ERROR_PROP_CODE               = -5
+} GF_HTML_MediaErrorPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLMediaElement interface */
+typedef enum
+{
+	HTML_MEDIA_PROP_SRC                         = -1,
+	HTML_MEDIA_PROP_CURRENTSRC                  = -2,
+	HTML_MEDIA_PROP_CROSSORIGIN                 = -3,
+	HTML_MEDIA_PROP_NETWORKSTATE                = -4,
+	HTML_MEDIA_PROP_PRELOAD                     = -5,
+	HTML_MEDIA_PROP_BUFFERED                    = -6,
+	HTML_MEDIA_PROP_READYSTATE                  = -7,
+	HTML_MEDIA_PROP_SEEKING                     = -8,
+	HTML_MEDIA_PROP_CURRENTTIME                 = -9,
+	HTML_MEDIA_PROP_DURATION                    = -10,
+	HTML_MEDIA_PROP_STARTDATE                   = -11,
+	HTML_MEDIA_PROP_PAUSED                      = -12,
+	HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE         = -13,
+	HTML_MEDIA_PROP_PLAYBACKRATE                = -14,
+	HTML_MEDIA_PROP_PLAYED                      = -15,
+	HTML_MEDIA_PROP_SEEKABLE                    = -16,
+	HTML_MEDIA_PROP_ENDED                       = -17,
+	HTML_MEDIA_PROP_AUTOPLAY                    = -18,
+	HTML_MEDIA_PROP_LOOP                        = -19,
+	HTML_MEDIA_PROP_MEDIAGROUP                  = -20,
+	HTML_MEDIA_PROP_CONTROLLER                  = -21,
+	HTML_MEDIA_PROP_CONTROLS                    = -22,
+	HTML_MEDIA_PROP_VOLUME                      = -23,
+	HTML_MEDIA_PROP_MUTED                       = -24,
+	HTML_MEDIA_PROP_DEFAULTMUTED                = -25,
+	HTML_MEDIA_PROP_AUDIOTRACKS                 = -26,
+	HTML_MEDIA_PROP_VIDEOTRACKS                 = -27,
+	HTML_MEDIA_PROP_TEXTTRACKS                  = -28,
+	HTML_MEDIA_PROP_NETWORK_EMPTY               = -29,
+	HTML_MEDIA_PROP_NETWORK_IDLE                = -30,
+	HTML_MEDIA_PROP_NETWORK_LOADING             = -31,
+	HTML_MEDIA_PROP_NETWORK_NO_SOURCE           = -32,
+	HTML_MEDIA_PROP_HAVE_NOTHING                = -33,
+	HTML_MEDIA_PROP_HAVE_METADATA               = -34,
+	HTML_MEDIA_PROP_HAVE_CURRENT_DATA           = -35,
+	HTML_MEDIA_PROP_HAVE_FUTURE_DATA            = -36,
+	HTML_MEDIA_PROP_HAVE_ENOUGH_DATA            = -37,
+	HTML_MEDIA_PROP_ERROR                       = -38
+} GF_HTML_MediaEltPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLVideoElement interface */
+typedef enum {
+	HTML_VIDEO_PROP_WIDTH                       = -1,
+	HTML_VIDEO_PROP_HEIGHT                      = -2,
+	HTML_VIDEO_PROP_VIDEOWIDTH                  = -3,
+	HTML_VIDEO_PROP_VIDEOHEIGHT                 = -4,
+	HTML_VIDEO_PROP_POSTER                      = -5
+} GF_HTML_VideoEltPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLTrackElement interface */
+typedef enum {
+	HTML_TRACK_PROP_ID                          = -1,
+	HTML_TRACK_PROP_KIND                        = -2,
+	HTML_TRACK_PROP_LABEL                       = -3,
+	HTML_TRACK_PROP_LANGUAGE                    = -4,
+	HTML_TRACK_PROP_SELECTED                    = -5,
+	HTML_TRACK_PROP_ENABLED                     = -6,
+	HTML_TRACK_PROP_INBANDTYPE                  = -7
+} GF_HTML_TrackPropEnum;
+
+#define HTML_MEDIA_JS_CHECK     GF_HTML_MediaElement *me; \
+                                GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj); \
+                                if (!n || (n->sgprivate->tag != TAG_SVG_video && n->sgprivate->tag != TAG_SVG_audio)) \
+                                { \
+									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+                                } \
+                                me = (GF_HTML_MediaElement *)html_media_element_get_from_node(c, n); \
+                                if (!me) { \
+									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+                                }
+
+#define HTML_MEDIA_JS_START     HTML_MEDIA_JS_CHECK
+
+/* Structure copied over from svg_media.c
+   TODO : fix this - remove the copy */
+typedef struct
+{
+	GF_TextureHandler txh;
+	struct _drawable *graph;
+	MFURL txurl;
+	Bool first_frame_fetched;
+	GF_Node *audio;
+	Bool audio_dirty;
+	Bool stop_requested;
+} SVG_video_stack;
+
+/* Structure copied over from svg_media.c
+   TODO : fix this - remove the copy */
+typedef struct
+{
+	GF_AudioInput input;
+	Bool is_active, is_error;
+	MFURL aurl;
+} SVG_audio_stack;
+
+/* Gets the GF_MediaObject associated with this node
+ *
+ *  \param n the node either an SVG/HTML5 video or audio element
+ *  \return the GF_MediaObject attached to this node or null if none
+ */
+static GF_MediaObject *gf_html_media_object(GF_Node *n)
+{
+	GF_MediaObject *mo = NULL;
+	if (n->sgprivate->tag == TAG_SVG_video)
+	{
+		SVG_video_stack *video_stack;
+		video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
+		mo = video_stack->txh.stream;
+	}
+	else if (n->sgprivate->tag == TAG_SVG_audio)
+	{
+		SVG_audio_stack *audio_stack;
+		audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
+		mo = audio_stack->input.stream;
+	}
+	return mo;
+}
+
+static void gf_html_track_init_js(GF_HTML_Track *track, JSContext *c, GF_HTML_TrackList *tracklist)
+{
+	JSObject *track_obj;
+	track->c     = c;
+	if (track->type == HTML_MEDIA_TRACK_TYPE_AUDIO)
+	{
+		track_obj = JS_NewObject(c, &html_media_rt->audioTrackClass._class, NULL, tracklist->_this);
+	}
+	else if (track->type == HTML_MEDIA_TRACK_TYPE_VIDEO)
+	{
+		track_obj = JS_NewObject(c, &html_media_rt->videoTrackClass._class, NULL, tracklist->_this);
+	}
+	else if (track->type == HTML_MEDIA_TRACK_TYPE_TEXT)
+	{
+		track_obj = JS_NewObject(c, &html_media_rt->textTrackClass._class, NULL, tracklist->_this);
+	}
+	else
+	{
+		return;
+	}
+	tracklist->onchange = JSVAL_NULL;
+	tracklist->onaddtrack = JSVAL_NULL;
+	tracklist->onremovetrack = JSVAL_NULL;
+	track->_this = track_obj;
+	SMJS_SET_PRIVATE(c, track->_this, track);
+}
+
+/* Not yet used, removed for GCC warning
+static void gf_html_media_controller_init_js(GF_HTML_MediaController *mc, JSContext *c)
+{
+    mc->c            = c;
+    mc->_this        = JS_NewObject(c, &html_media_rt->mediaControllerClass._class, NULL, NULL);
+    SMJS_SET_PRIVATE(c, mc->_this, mc);
+    mc->buffered->c              = c;
+    mc->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->buffered->_this, mc->buffered);
+    mc->played->c                = c;
+    mc->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->played->_this, mc->played);
+    mc->seekable->c              = c;
+    mc->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->seekable->_this, mc->seekable);
+}
+*/
+
+static void gf_html_media_element_init_js(GF_HTML_MediaElement *me, JSContext *c, JSObject *node_obj)
+{
+	me->c                       = c;
+	me->_this                   = JS_NewObject(c, &html_media_rt->htmlMediaElementClass._class, NULL, node_obj);
+	SMJS_SET_PRIVATE(c, me->_this, me);
+
+	me->error.c                 = c;
+	me->error._this             = JS_NewObject(c, &html_media_rt->mediaErrorClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->error._this, &me->error);
+
+	me->audioTracks.c           = c;
+	me->audioTracks._this       = JS_NewObject(c, &html_media_rt->audioTrackListClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->audioTracks._this, &me->audioTracks);
+
+	me->videoTracks.c           = c;
+	me->videoTracks._this       = JS_NewObject(c, &html_media_rt->videoTrackListClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->videoTracks._this, &me->videoTracks);
+
+	me->textTracks.c            = c;
+	me->textTracks._this        = JS_NewObject(c, &html_media_rt->textTrackListClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->textTracks._this, &me->textTracks);
+
+	me->buffered->c              = c;
+	me->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->buffered->_this, me->buffered);
+
+	me->played->c                = c;
+	me->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->played->_this, me->played);
+
+	me->seekable->c              = c;
+	me->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+	SMJS_SET_PRIVATE(c, me->seekable->_this, me->seekable);
+}
+
+/* Function to browse the tracks in the MediaObject associated with the Media Element and to create appropriate HTML Track objects
+ *
+ * \param c The JavaScript Context to create the new JS object
+ * \param me the HTMLMediaElement to update
+ */
+static void html_media_element_populate_tracks(JSContext *c, GF_HTML_MediaElement *me)
+{
+	GF_HTML_Track *track;
+	GF_MediaObject *mo;
+	u32 source_id=0;
+	GF_Scene *scene;
+	u32 i, count;
+
+	if (!me || !me->node) {
+		return;
+	}
+	mo = gf_html_media_object(me->node);
+	if (!mo || !mo->odm || !mo->odm->parentscene) {
+		return;
+	}
+	source_id = mo->odm->source_id;
+	scene = mo->odm->parentscene;
+
+	count = gf_list_count(scene->resources);
+	for (i=0; i<count; i++) {
+		char id[256];
+		char *lang = "";
+		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
+		if (odm->source_id != source_id) continue;
+		if (!odm->mo) continue;
+
+		sprintf(id, "track%d", odm->ID);
+#ifdef FILTER_FIXME
+#error "set track ID and lang"
+#endif
+		switch(odm->mo->type) {
+		case GF_MEDIA_OBJECT_VIDEO:
+			if (!html_media_tracklist_has_track(&me->videoTracks, id)) {
+				track = html_media_add_new_track_to_list(&me->videoTracks, HTML_MEDIA_TRACK_TYPE_VIDEO,
+					        "video/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
+				gf_html_track_init_js(track, c, &me->videoTracks);
+			}
+			break;
+		case GF_MEDIA_OBJECT_AUDIO:
+			if (!html_media_tracklist_has_track(&me->audioTracks, id)) {
+				track = html_media_add_new_track_to_list(&me->audioTracks, HTML_MEDIA_TRACK_TYPE_AUDIO,
+					        "audio/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
+				gf_html_track_init_js(track, c, &me->audioTracks);
+			}
+			break;
+		case GF_MEDIA_OBJECT_TEXT:
+			if (!html_media_tracklist_has_track(&me->textTracks, id)) {
+				track = html_media_add_new_track_to_list(&me->textTracks, HTML_MEDIA_TRACK_TYPE_TEXT,
+					        "text/plain", GF_TRUE, id, "myKind", "myLabel", lang);
+				gf_html_track_init_js(track, c, &me->textTracks);
+			}
+			break;
+		}
+	}
+}
+
+/* Used to retrieve the structure implementing the GF_HTML_MediaElement interface associated with this node
+ * Usually this is done with the private stack of the node (see gf_node_get_private), but in this case,
+ * the stack already contains the rendering stack SVG_video_stack.
+ * So, we store the structure implementing the GF_HTML_MediaElement interface in the JavaScript context of this node,
+ * as a non enumeratable property named 'gpac_me_impl'
+ *
+ *  \param c the global JavaScript context
+ *  \param n the audio or video node
+ *  \return the GF_HTML_MediaElement associated with this node in the given context
+ */
+static GF_HTML_MediaElement *html_media_element_get_from_node(JSContext *c, GF_Node *n)
+{
+	jsval vp;
+	JSObject *me_obj;
+	JSObject *node_obj;
+	GF_HTML_MediaElement *me = NULL;
+
+	if ((n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) && n->sgprivate->interact && n->sgprivate->interact->js_binding) {
+		node_obj = (JSObject *)n->sgprivate->interact->js_binding->node;
+		if (node_obj) {
+			JS_GetProperty(c, node_obj, "gpac_me_impl", &vp);
+			me_obj = JSVAL_TO_OBJECT(vp);
+			me = (GF_HTML_MediaElement *)SMJS_GET_PRIVATE(c, me_obj);
+		}
+	}
+	return me;
+}
+
+static JSBool SMJS_FUNCTION(html_media_load)
+{
+	SMJS_OBJ
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+	{
+		MFURL mfurl;
+		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+		GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
+		mfurl.count = 1;
+		mfurl.vals = (SFURL *)gf_malloc(sizeof(SFURL));
+		mfurl.vals[0].url = me->currentSrc;
+		mfurl.vals[0].OD_ID = GF_MEDIA_EXTERNAL_ID;
+		gf_mo_register(n, &mfurl, GF_FALSE, GF_FALSE);
+		gf_free(mfurl.vals);
+		return JS_TRUE;
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_canPlayType)
+{
+	SMJS_OBJ
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+	{
+		return JS_TRUE;
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_fastSeek)
+{
+	SMJS_OBJ
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+	{
+		return JS_TRUE;
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_addTextTrack)
+{
+	SMJS_OBJ
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+	{
+		return JS_TRUE;
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+void *html_get_element_class(GF_Node *n)
+{
+	if (!n || !html_media_rt)
+	{
+		return NULL;
+	} else if (n->sgprivate->tag == TAG_SVG_video) {
+		return &html_media_rt->htmlVideoElementClass;
+	} else if (n->sgprivate->tag == TAG_SVG_audio) {
+		return &html_media_rt->htmlAudioElementClass;
+	} else {
+		return NULL;
+	}
+}
+
+/* Creates the GF_HTML_MediaElement structure for this node
+ * Store it in the JavaScript context of this node, as a non enumeratable property named 'gpac_me_impl'
+ * see \ref html_media_element_get_from_node for retrieving it
+ *
+ *  \param c the global JavaScript context
+ *  \param n the audio or video node
+ *  \param node_obj the JavaScript object representing the audio or video node
+ */
+void html_media_element_js_init(JSContext *c, JSObject *node_obj, GF_Node *n)
+{
+	if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
+		GF_HTML_MediaElement *me;
+		me = gf_html_media_element_new(n, NULL);
+		gf_html_media_element_init_js(me, c, node_obj);
+		/* To be able to retrieve the Media Element interface from the Node element */
+		JS_DefineProperty(c, node_obj, "gpac_me_impl", OBJECT_TO_JSVAL(me->_this), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+	}
+}
+
+/* Deletes the GF_HTML_MediaElement structure for this node
+ *
+ *  \param c the global JavaScript context
+ *  \param n the audio or video node
+ */
+void html_media_element_js_finalize(JSContext *c, GF_Node *n)
+{
+	GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
+	/* TODO: finalize child objects */
+	gf_html_media_element_del(me);
+}
+
+/* Gets The EventTarget and SceneGraph from the GF_HTML_MediaElement structure for a audio/video JS node
+ *
+ *  \param c the global JavaScript context
+ *  \param obj the JS object representing the HTMLAudioElement or HTMLVideoElement
+ *  \param target the GF_DOMEventTarget object
+ *  \param sg the scene graph
+ */
+void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
+	if (!sg || !target || !html_media_rt) return;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+	        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ) {
+		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+		*target = gf_dom_event_get_target_from_node(n);
+		*sg = n->sgprivate->scenegraph;
+	} else {
+		*target = NULL;
+		*sg = NULL;
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_error_get_code)
+if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaErrorClass, NULL))
+{
+	GF_HTML_MediaError *error = (GF_HTML_MediaError*)SMJS_GET_PRIVATE(c, obj);
+	if (!SMJS_ID_IS_INT(id)) {
+		return JS_TRUE;
+	}
+	switch (SMJS_ID_TO_INT(id))
+	{
+	case MEDIA_ERROR_PROP_ABORTED:
+		*vp = INT_TO_JSVAL(MEDIA_ERR_ABORTED);
+		return JS_TRUE;
+	case MEDIA_ERROR_PROP_NETWORK:
+		*vp = INT_TO_JSVAL(MEDIA_ERR_NETWORK);
+		return JS_TRUE;
+	case MEDIA_ERROR_PROP_DECODE:
+		*vp = INT_TO_JSVAL(MEDIA_ERR_DECODE);
+		return JS_TRUE;
+	case MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED:
+		*vp = INT_TO_JSVAL(MEDIA_ERR_SRC_NOT_SUPPORTED);
+		return JS_TRUE;
+	case MEDIA_ERROR_PROP_CODE:
+		*vp = INT_TO_JSVAL(error->code);
+		return JS_TRUE;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_error)
+HTML_MEDIA_JS_START
+*vp = OBJECT_TO_JSVAL(me->error._this);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_src)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "href", GF_XMLNS_XLINK, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_src)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_XLINK, "href", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_cors)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "crossorigin", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_cors)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "crossorigin", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+void gf_odm_collect_buffer_info(void *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer);
+
+static void html_media_get_states(GF_MediaObject *mo, GF_HTML_MediaReadyState *readyState, GF_HTML_NetworkState *networkState)
+{
+	GF_DOMMediaEvent media_event;
+#ifdef FILTER_FIXME
+	u32 min_time=0;
+#endif
+	u32 min_buffer=0;
+	if (!mo) return;
+
+	if (!mo->odm) {
+		*readyState = HAVE_NOTHING;
+		*networkState = NETWORK_EMPTY;
+		return;
+	}
+
+	memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
+#ifdef FILTER_FIXME
+	gf_odm_collect_buffer_info(mo->odm->net_service, mo->odm, &media_event, &min_time, &min_buffer);
+#endif
+	//GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] min_time: %d, min_buffer: %d loaded: "LLD"/"LLD"\n",
+	//                                                    min_time, min_buffer, media_event.loaded_size, media_event.total_size));
+	if (min_buffer == 0)
+	{
+		*readyState = HAVE_NOTHING;
+		*networkState = NETWORK_EMPTY;
+	}
+	else
+	{
+		if (media_event.loaded_size != 0)
+		{
+			*readyState = HAVE_METADATA;
+		}
+		else if (media_event.loaded_size == media_event.total_size)
+		{
+			*readyState = HAVE_ENOUGH_DATA;
+		}
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_ready_state)
+GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
+GF_HTML_NetworkState networkState = NETWORK_EMPTY;
+GF_MediaObject *mo = NULL;
+HTML_MEDIA_JS_START
+html_media_element_populate_tracks(c, me);
+mo = gf_html_media_object(n);
+html_media_get_states(mo, &readyState, &networkState);
+*vp = INT_TO_JSVAL( readyState );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_network_state)
+GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
+GF_HTML_NetworkState networkState = NETWORK_EMPTY;
+GF_MediaObject *mo = NULL;
+HTML_MEDIA_JS_START
+mo = gf_html_media_object(n);
+html_media_get_states(mo, &readyState, &networkState);
+*vp = INT_TO_JSVAL( networkState );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_const)
+u32 v = 0;
+if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL))
+{
+	if (!SMJS_ID_IS_INT(id)) {
+		return JS_TRUE;
+	}
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_MEDIA_PROP_NETWORK_EMPTY:
+		v = NETWORK_EMPTY;
+		break;
+	case HTML_MEDIA_PROP_NETWORK_IDLE:
+		v = NETWORK_IDLE;
+		break;
+	case HTML_MEDIA_PROP_NETWORK_LOADING:
+		v = NETWORK_LOADING;
+		break;
+	case HTML_MEDIA_PROP_NETWORK_NO_SOURCE:
+		v = NETWORK_NO_SOURCE;
+		break;
+	case HTML_MEDIA_PROP_HAVE_NOTHING:
+		v = HAVE_NOTHING;
+		break;
+	case HTML_MEDIA_PROP_HAVE_METADATA:
+		v = HAVE_METADATA;
+		break;
+	case HTML_MEDIA_PROP_HAVE_CURRENT_DATA:
+		v = HAVE_CURRENT_DATA;
+		break;
+	case HTML_MEDIA_PROP_HAVE_FUTURE_DATA:
+		v = HAVE_FUTURE_DATA;
+		break;
+	case HTML_MEDIA_PROP_HAVE_ENOUGH_DATA:
+		v = HAVE_ENOUGH_DATA;
+		break;
+	default:
+		return JS_TRUE;
+	}
+	*vp = INT_TO_JSVAL( v );
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_preload)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "preload", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_preload)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "preload", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_buffered)
+HTML_MEDIA_JS_START
+*vp = OBJECT_TO_JSVAL( me->buffered->_this );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_seeking)
+HTML_MEDIA_JS_START
+/* TODO: implement it for real */
+*vp = BOOLEAN_TO_JSVAL( (me->seeking ? JS_TRUE : JS_FALSE) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_current_time)
+u32 time_ms = 0;
+Double time_s;
+GF_MediaObject *mo = NULL;
+HTML_MEDIA_JS_START
+mo = gf_html_media_object(n);
+gf_mo_get_object_time(mo, &time_ms);
+time_s = time_ms / 1000.0;
+*vp = JS_MAKE_DOUBLE(c, time_s );
+return JS_TRUE;
+}
+
+static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
+{
+	if (scene->script_action)
+	{
+		return scene->script_action(scene->script_action_cbck, type, node, param);
+	}
+	return GF_FALSE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_current_time)
+double d;
+GF_JSAPIParam par;
+HTML_MEDIA_JS_START
+if (!JSVAL_IS_NUMBER(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+par.time = d;
+ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_duration)
+Double dur;
+GF_MediaObject *mo = NULL;
+HTML_MEDIA_JS_START
+mo = gf_html_media_object(n);
+dur = gf_mo_get_duration(mo);
+if (dur <= 0) {
+	*vp = JS_GetNaNValue(c);
+} else {
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, dur));
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_start_date)
+HTML_MEDIA_JS_START
+// SpiderMonkey 1.8.5 JSObject * JS_NewDateObject(JSContext *cx, int year, int mon, int mday, int hour, int min, int sec);
+*vp = JSVAL_NULL;
+/* TODO */
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_paused)
+HTML_MEDIA_JS_START
+*vp =( BOOLEAN_TO_JSVAL( (me->paused ? JS_TRUE : JS_FALSE) ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_default_playback_rate)
+HTML_MEDIA_JS_START
+*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, me->defaultPlaybackRate));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_default_playback_rate)
+jsdouble d;
+HTML_MEDIA_JS_START
+if (!JSVAL_IS_NUMBER(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+me->defaultPlaybackRate = d;
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_playback_rate)
+Double speed;
+GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+GF_MediaObject *mo = gf_html_media_object(n);
+speed = gf_mo_get_current_speed(mo);
+*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, speed));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_playback_rate)
+jsdouble d;
+Fixed speed;
+GF_MediaObject *mo;
+HTML_MEDIA_JS_START
+mo = gf_html_media_object(n);
+if (!JSVAL_IS_NUMBER(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+speed = FLT2FIX(d);
+gf_mo_set_speed(mo, speed);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_played)
+HTML_MEDIA_JS_START
+*vp =( OBJECT_TO_JSVAL( me->played->_this ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_seekable)
+HTML_MEDIA_JS_START
+*vp =( OBJECT_TO_JSVAL( me->seekable->_this ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_ended)
+GF_MediaObject *mo;
+HTML_MEDIA_JS_START
+mo = gf_html_media_object(n);
+*vp = BOOLEAN_TO_JSVAL( gf_mo_is_done(mo) ? JS_TRUE : JS_FALSE);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_autoplay)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "autoplay", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+	} else {
+		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_autoplay)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "autoplay", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_loop)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+/* TODO: gf_mo_get_loop */
+if (gf_node_get_attribute_by_name(n, "loop", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+	} else {
+		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_loop)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "loop", str);
+	//TODO: use gf_mo_get_loop
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_mediagroup)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "mediagroup", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	*vp =( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_mediagroup)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "mediagroup", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_controller)
+HTML_MEDIA_JS_START
+if (me->controller) {
+	*vp = OBJECT_TO_JSVAL( me->controller->_this );
+} else {
+	*vp = JSVAL_NULL;
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_controller)
+HTML_MEDIA_JS_START
+if (JSVAL_IS_OBJECT(*vp)) {
+	me->controller = (GF_HTML_MediaController *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_controls)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "controls", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+	} else {
+		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+	if (szAtt) gf_free(szAtt);
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_controls)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "controls", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SVG_audio_stack *html_media_get_audio_stack(GF_Node *n) {
+	SVG_video_stack *video_stack = NULL;
+	SVG_audio_stack *audio_stack = NULL;
+	if (n->sgprivate->tag == TAG_SVG_video) {
+		video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
+		if (video_stack->audio) {
+			audio_stack = (SVG_audio_stack *)video_stack->audio->sgprivate->UserPrivate;
+		}
+	} else if (n->sgprivate->tag == TAG_SVG_audio) {
+		audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
+	}
+	return audio_stack;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_volume)
+Fixed volume = FIX_ONE;
+SVG_audio_stack *audio_stack = NULL;
+HTML_MEDIA_JS_CHECK
+audio_stack = html_media_get_audio_stack(n);
+if (audio_stack) {
+	audio_stack->input.input_ifce.GetChannelVolume(&audio_stack->input.input_ifce.callback, &volume);
+}
+*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, FIX2FLT(volume)));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_volume)
+jsdouble volume;
+SVG_audio_stack *audio_stack = NULL;
+HTML_MEDIA_JS_CHECK
+audio_stack = html_media_get_audio_stack(n);
+if (audio_stack) {
+	JS_ValueToNumber(c, *vp, &volume);
+	audio_stack->input.intensity = FLT2FIX(volume);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_muted)
+SVG_audio_stack *audio_stack = NULL;
+HTML_MEDIA_JS_CHECK
+audio_stack = html_media_get_audio_stack(n);
+if (audio_stack) {
+	*vp = BOOLEAN_TO_JSVAL(audio_stack->input.is_muted ? JS_TRUE : JS_FALSE);
+} else {
+	*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_muted)
+SVG_audio_stack *audio_stack = NULL;
+HTML_MEDIA_JS_CHECK
+audio_stack = html_media_get_audio_stack(n);
+if (audio_stack) {
+	audio_stack->input.is_muted = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_default_muted)
+GF_FieldInfo info;
+HTML_MEDIA_JS_START
+if (gf_node_get_attribute_by_name(n, "muted", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+	char *szAtt = gf_svg_dump_attribute(n, &info);
+	if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+		*vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+	} else {
+		*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+	if (szAtt) gf_free(szAtt);
+} else {
+	*vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_default_muted)
+HTML_MEDIA_JS_START
+if (JSVAL_CHECK_STRING(*vp)) {
+	char *str = SMJS_CHARS(c, *vp);
+	gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "muted", str);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_audio_tracks)
+HTML_MEDIA_JS_START
+*vp =( OBJECT_TO_JSVAL( me->audioTracks._this ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_video_tracks)
+HTML_MEDIA_JS_START
+*vp =( OBJECT_TO_JSVAL( me->videoTracks._this ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_text_tracks)
+HTML_MEDIA_JS_START
+*vp =( OBJECT_TO_JSVAL( me->textTracks._this ) );
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_time_ranges_get_length)
+GF_HTML_MediaTimeRanges *timeranges;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+*vp = INT_TO_JSVAL( gf_list_count(timeranges->times)/2);
+return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_time_ranges_start)
+{
+	GF_HTML_MediaTimeRanges *timeranges;
+	SMJS_OBJ
+	SMJS_ARGS
+	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+	if (!timeranges) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 i = JSVAL_TO_INT(argv[0]);
+		u64 *start_value = (u64 *)gf_list_get(timeranges->times, 2*i);
+		if (!start_value) {
+			return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
+		} else {
+			SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*start_value)*1.0/timeranges->timescale)));
+		}
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_time_ranges_end)
+{
+	GF_HTML_MediaTimeRanges *timeranges;
+	SMJS_OBJ
+	SMJS_ARGS
+	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+	if (!timeranges) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (JSVAL_IS_INT(argv[0])) {
+		u32 i = JSVAL_TO_INT(argv[0]);
+		u64 *end_value = (u64 *)gf_list_get(timeranges->times, 2*i+1);
+		if (!end_value) {
+			return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
+		} else {
+			SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*end_value)*1.0/timeranges->timescale)));
+		}
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	return JS_TRUE;
+}
+
+static Bool html_is_track_list(JSContext *c, JSObject *obj) {
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackListClass, NULL)) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackListClass, NULL)) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackListClass, NULL)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_length)
+GF_HTML_TrackList *tracklist;
+if (html_is_track_list(c, obj)) {
+	tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	if (tracklist) {
+		*vp = INT_TO_JSVAL( gf_list_count(tracklist->tracks) );
+		return JS_TRUE;
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static JSBool SMJS_FUNCTION(html_track_list_get_track_by_id)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	if (html_is_track_list(c, obj)) {
+		GF_HTML_TrackList *tracklist;
+		GF_HTML_Track *track;
+		char *str;
+		tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
+		track = html_media_tracklist_get_track(tracklist, str);
+		SMJS_FREE(c, str);
+		if (track) {
+			SMJS_SET_RVAL(OBJECT_TO_JSVAL(track->_this));
+			return JS_TRUE;
+		} else {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+	} else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_property)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist;
+	s32 index;
+
+	tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	index = SMJS_ID_TO_INT(id);
+	if (index >= 0 && (u32)index < gf_list_count(tracklist->tracks)) {
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tracklist->tracks, (u32)index);
+		*vp = OBJECT_TO_JSVAL(track->_this);
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_selected_index)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	*vp = INT_TO_JSVAL(tracklist->selected_index);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onchange)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	if (! JSVAL_IS_NULL(tracklist->onchange)) {
+		*vp = tracklist->onchange;
+	} else {
+		*vp = JSVAL_NULL;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval);
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onchange)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	gf_set_js_eventhandler(c, *vp, &tracklist->onchange);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onaddtrack)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	if (! JSVAL_IS_NULL(tracklist->onaddtrack)) {
+		*vp = tracklist->onaddtrack;
+	} else {
+		*vp = JSVAL_NULL;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onaddtrack)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	gf_set_js_eventhandler(c, *vp, &tracklist->onaddtrack);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onremovetrack)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	if (! JSVAL_IS_NULL(tracklist->onremovetrack) ) {
+		*vp = tracklist->onremovetrack;
+	} else {
+		*vp = JSVAL_NULL;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onremovetrack)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+	gf_set_js_eventhandler(c, *vp, &tracklist->onremovetrack);
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_get_property)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
+	if (!SMJS_ID_IS_INT(id)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_TRACK_PROP_ID:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->id ? track->id : "") );
+		return JS_TRUE;
+	case HTML_TRACK_PROP_KIND:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->kind ? track->kind : "") );
+		return JS_TRUE;
+	case HTML_TRACK_PROP_LABEL:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->label ? track->label : "") );
+		return JS_TRUE;
+	case HTML_TRACK_PROP_LANGUAGE:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->language ? track->language  : "") );
+		return JS_TRUE;
+	case HTML_TRACK_PROP_INBANDTYPE:
+		if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL)) {
+			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->mime ? track->mime  : "") );
+			return JS_TRUE;
+		}
+	case HTML_TRACK_PROP_SELECTED:
+		if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) {
+			*vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
+		}
+		return JS_TRUE;
+	case HTML_TRACK_PROP_ENABLED:
+		if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL)) {
+			*vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
+		}
+		return JS_TRUE;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_set_property)
+if (html_is_track_list(c, obj)) {
+	GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
+	if (!SMJS_ID_IS_INT(id)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_TRACK_PROP_SELECTED:
+		if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL))
+		{
+			track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+		}
+		return JS_TRUE;
+	case HTML_TRACK_PROP_ENABLED:
+		if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL))
+		{
+			track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+		}
+		return JS_TRUE;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_GET(html_video_get_property)
+if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL))
+{
+	GF_FieldInfo    info;
+	SVG_video_stack *video;
+	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+	if (!n) return JS_TRUE;
+
+	video = (SVG_video_stack *)n->sgprivate->UserPrivate;
+	if (!SMJS_ID_IS_INT(id)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_VIDEO_PROP_WIDTH:
+		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+			SVG_Length *length;
+			length = (SVG_Length *)info.far_ptr;
+			*vp = INT_TO_JSVAL( FIX2FLT(length->value) );
+		}
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_HEIGHT:
+		if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+			SVG_Length *length;
+			length = (SVG_Length *)info.far_ptr;
+			*vp = INT_TO_JSVAL( FIX2FLT(length->value) );
+		}
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_VIDEOWIDTH:
+		*vp = INT_TO_JSVAL( video->txh.width );
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_VIDEOHEIGHT:
+		*vp = INT_TO_JSVAL( video->txh.height );
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_POSTER:
+		if (gf_node_get_attribute_by_name(n, "poster", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+			char *szAtt = gf_svg_dump_attribute(n, &info);
+			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+			if (szAtt) gf_free(szAtt);
+		}
+		return JS_TRUE;
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static SMJS_FUNC_PROP_SET(html_video_set_property)
+if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL))
+{
+	GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+	if (!SMJS_ID_IS_INT(id)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_VIDEO_PROP_WIDTH:
+		/* TODO: change value and dirty node */
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_HEIGHT:
+		/* TODO: change value and dirty node */
+		return JS_TRUE;
+	case HTML_VIDEO_PROP_POSTER:
+	{
+		char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, *vp) );
+		gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "poster", str);
+		SMJS_FREE(c, str);
+		return JS_TRUE;
+	}
+	}
+	return JS_TRUE;
+} else {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_add_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_remove_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_dispatch)
+{
+	return JS_TRUE;
+}
+
+void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *html_media_rt);
+
+void html_media_js_api_del() {
+	if (html_media_rt) {
+		gf_free(html_media_rt);
+		html_media_rt = NULL;
+	}
+}
+
+void html_media_init_js_api(GF_SceneGraph *scene) {
+	/* HTML Media Element */
+	if (!html_media_rt) {
+		GF_SAFEALLOC(html_media_rt, GF_HTML_MediaRuntime);
+
+		/* Setting up MediaError class (no constructor, no finalizer) */
+		JS_SETUP_CLASS(html_media_rt->mediaErrorClass, "MediaError", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec mediaErrorClassProps[] = {
+				{"MEDIA_ERR_ABORTED",           MEDIA_ERROR_PROP_ABORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+				{"MEDIA_ERR_NETWORK",           MEDIA_ERROR_PROP_NETWORK,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+				{"MEDIA_ERR_DECODE",            MEDIA_ERROR_PROP_DECODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+				{"MEDIA_ERR_SRC_NOT_SUPPORTED", MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+				{"code",                        MEDIA_ERROR_PROP_CODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec mediaErrorClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaErrorClass, 0, 0, mediaErrorClassProps, mediaErrorClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaError class initialized\n"));
+		}
+
+		/* Setting up TimeRanges class (no constructor, no finalizer) */
+		JS_SETUP_CLASS(html_media_rt->timeRangesClass, "TimeRanges", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec timeRangesClassProps[] = {
+				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_time_ranges_get_length, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec timeRangesClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("start",                 html_time_ranges_start, 1),
+				SMJS_FUNCTION_SPEC("end",                   html_time_ranges_end, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->timeRangesClass, 0, 0, timeRangesClassProps, timeRangesClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TimeRanges class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->audioTrackClass, "AudioTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+		{
+			JSPropertySpec audioTrackClassProps[] = {
+				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"enabled",          HTML_TRACK_PROP_SELECTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec audioTrackClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackClass, 0, 0, audioTrackClassProps, audioTrackClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrack class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->videoTrackClass, "VideoTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+		{
+			JSPropertySpec videoTrackClassProps[] = {
+				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"kind",             HTML_TRACK_PROP_KIND,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"label",            HTML_TRACK_PROP_LABEL,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"language",         HTML_TRACK_PROP_LANGUAGE,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"selected",         HTML_TRACK_PROP_SELECTED,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec videoTrackClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackClass, 0, 0, videoTrackClassProps, videoTrackClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrack class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->textTrackClass, "TextTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+		{
+			JSPropertySpec textTrackClassProps[] = {
+				{"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"inBandMetadataTrackDispatchType",         HTML_TRACK_PROP_INBANDTYPE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec textTrackClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackClass, 0, 0, textTrackClassProps, textTrackClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrack class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->audioTrackListClass, "AudioTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec audioTrackListClassProps[] = {
+				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+				{"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
+				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec audioTrackListClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackListClass, 0, 0, audioTrackListClassProps, audioTrackListClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrackList class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->videoTrackListClass, "VideoTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec videoTrackListClassProps[] = {
+				{"selectedIndex",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_selected_index, 0},
+				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+				{"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
+				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec videoTrackListClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackListClass, 0, 0, videoTrackListClassProps, videoTrackListClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrackList class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->textTrackListClass, "TextTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec textTrackListClassProps[] = {
+				{"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+				{"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+				{"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec textTrackListClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackListClass, 0, 0, textTrackListClassProps, textTrackListClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrackList class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->mediaControllerClass, "MediaController", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec mediaControllerClassProps[] = {
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec mediaControllerClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaControllerClass, 0, 0, mediaControllerClassProps, mediaControllerClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaController class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->htmlMediaElementClass, "HTMLMediaElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+		{
+			JSPropertySpec htmlMediaElementClassProps[] = {
+				{"error",               HTML_MEDIA_PROP_ERROR,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_error, 0},
+				{"src",                 HTML_MEDIA_PROP_SRC,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , html_media_get_src, html_media_set_src},
+				{"currentSrc",          HTML_MEDIA_PROP_CURRENTSRC,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_src, 0},
+				{"crossOrigin",         HTML_MEDIA_PROP_CROSSORIGIN,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_cors, html_media_set_cors},
+				{"NETWORK_EMPTY",       HTML_MEDIA_PROP_NETWORK_EMPTY,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"NETWORK_IDLE",        HTML_MEDIA_PROP_NETWORK_IDLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"NETWORK_LOADING",     HTML_MEDIA_PROP_NETWORK_LOADING,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"NETWORK_NO_SOURCE",   HTML_MEDIA_PROP_NETWORK_NO_SOURCE,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"networkState",        HTML_MEDIA_PROP_NETWORKSTATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_network_state, 0},
+				{"preload",             HTML_MEDIA_PROP_PRELOAD,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_preload, html_media_set_preload},
+				{"buffered",            HTML_MEDIA_PROP_BUFFERED,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_buffered, 0},
+				{"HAVE_NOTHING",        HTML_MEDIA_PROP_HAVE_NOTHING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"HAVE_METADATA",       HTML_MEDIA_PROP_HAVE_METADATA,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"HAVE_CURRENT_DATA",   HTML_MEDIA_PROP_HAVE_CURRENT_DATA, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"HAVE_FUTURE_DATA",    HTML_MEDIA_PROP_HAVE_FUTURE_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"HAVE_ENOUGH_DATA",    HTML_MEDIA_PROP_HAVE_ENOUGH_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+				{"readyState",          HTML_MEDIA_PROP_READYSTATE,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ready_state, 0},
+				{"seeking",             HTML_MEDIA_PROP_SEEKING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seeking, 0},
+				{"currentTime",         HTML_MEDIA_PROP_CURRENTTIME,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_current_time, html_media_set_current_time},
+				{"duration",            HTML_MEDIA_PROP_DURATION,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_duration, 0},
+				{"startDate",           HTML_MEDIA_PROP_STARTDATE,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_start_date, 0},
+				{"paused",              HTML_MEDIA_PROP_PAUSED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_paused, 0},
+				{"defaultPlaybackRate", HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_playback_rate, html_media_set_default_playback_rate},
+				{"playbackRate",        HTML_MEDIA_PROP_PLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_playback_rate, html_media_set_playback_rate},
+				{"played",              HTML_MEDIA_PROP_PLAYED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_played, 0},
+				{"seekable",            HTML_MEDIA_PROP_SEEKABLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seekable, 0},
+				{"ended",               HTML_MEDIA_PROP_ENDED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ended, 0},
+				{"autoplay",            HTML_MEDIA_PROP_AUTOPLAY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_autoplay, html_media_set_autoplay},
+				{"loop",                HTML_MEDIA_PROP_LOOP,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_loop, html_media_set_loop},
+				{"mediaGroup",          HTML_MEDIA_PROP_MEDIAGROUP,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_mediagroup, html_media_set_mediagroup},
+				{"controller",          HTML_MEDIA_PROP_CONTROLLER,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controller, html_media_set_controller},
+				{"controls",            HTML_MEDIA_PROP_CONTROLS,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controls, html_media_set_controls},
+				{"volume",              HTML_MEDIA_PROP_VOLUME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_volume, html_media_set_volume},
+				{"muted",               HTML_MEDIA_PROP_MUTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_muted, html_media_set_muted},
+				{"defaultMuted",        HTML_MEDIA_PROP_DEFAULTMUTED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_muted, html_media_set_default_muted},
+				{"audioTracks",         HTML_MEDIA_PROP_AUDIOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_audio_tracks, 0},
+				{"videoTracks",         HTML_MEDIA_PROP_VIDEOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_video_tracks, 0},
+				{"textTracks",          HTML_MEDIA_PROP_TEXTTRACKS,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_text_tracks, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSBool SMJS_FUNCTION(svg_udom_smil_pause);
+			JSBool SMJS_FUNCTION(svg_udom_smil_begin);
+			JSBool SMJS_FUNCTION(svg_udom_smil_end);
+			JSFunctionSpec htmlMediaElementClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("load",                  html_media_load, 0),
+				SMJS_FUNCTION_SPEC("canPlayType",           html_media_canPlayType, 1),
+				SMJS_FUNCTION_SPEC("fastSeek",              html_media_fastSeek, 1),
+				SMJS_FUNCTION_SPEC("play",                  svg_udom_smil_begin, 0),
+				SMJS_FUNCTION_SPEC("pause",                 svg_udom_smil_pause, 0),
+				SMJS_FUNCTION_SPEC("addTextTrack",          html_media_addTextTrack, 1),
+				SMJS_FUNCTION_SPEC("addEventListener",		html_media_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("removeEventListener",	html_media_event_remove_listener, 3),
+				SMJS_FUNCTION_SPEC("dispatchEvent",			html_media_event_dispatch, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &html_media_rt->htmlMediaElementClass, 0, 0, htmlMediaElementClassProps, htmlMediaElementClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLMediaElement class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->htmlVideoElementClass, "HTMLVideoElement", JSCLASS_HAS_PRIVATE, html_video_get_property, html_video_set_property, dom_element_finalize);
+		{
+			JSPropertySpec htmlVideoElementClassProps[] = {
+				{"width",       HTML_VIDEO_PROP_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+				{"height",      HTML_VIDEO_PROP_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+				{"videoWidth",  HTML_VIDEO_PROP_VIDEOWIDTH,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"videoHeight", HTML_VIDEO_PROP_VIDEOHEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{"poster",      HTML_VIDEO_PROP_POSTER,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec htmlVideoElementClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlVideoElementClass, 0, 0, htmlVideoElementClassProps, htmlVideoElementClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLVideoElement class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->htmlAudioElementClass, "HTMLAudioElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, dom_element_finalize);
+		{
+			JSPropertySpec htmlAudioElementClassProps[] = {
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec htmlAudioElementClassFuncs[] = {
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlAudioElementClass, 0, 0, htmlAudioElementClassProps, htmlAudioElementClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLAudioElement class initialized\n"));
+		}
+		html_media_source_init_js_api(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt);
+	}
+}
+#endif  /*GPAC_HAS_SPIDERMONKEY*/
+
+#endif  /*GPAC_DISABLE_SVG*/

gpac-1.0.0.tar.gz/src/scenegraph/html5_mse_js.c Added

@@ -0,0 +1,956 @@
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2012-
+ *          All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph 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/setup.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#ifdef GPAC_CONFIG_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif /* XP_UNIX */
+#endif
+
+#include <gpac/html5_mse.h>
+
+#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
+
+typedef enum
+{
+	/* MediaSource properties */
+	HTML_MEDIASOURCE_PROP_SOURCEBUFFERS         = -1,
+	HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS   = -2,
+	HTML_MEDIASOURCE_PROP_DURATION              = -3,
+	HTML_MEDIASOURCE_PROP_READYSTATE            = -4,
+	/* SourceBuffer properties */
+	HTML_SOURCEBUFFER_PROP_MODE					= -5,
+	HTML_SOURCEBUFFER_PROP_UPDATING             = -6,
+	HTML_SOURCEBUFFER_PROP_BUFFERED             = -7,
+	HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET      = -8,
+	HTML_SOURCEBUFFER_PROP_TIMESCALE            = -9,
+	HTML_SOURCEBUFFER_PROP_AUDIOTRACKS          = -10,
+	HTML_SOURCEBUFFER_PROP_VIDEOTRACKS          = -11,
+	HTML_SOURCEBUFFER_PROP_TEXTTRACKS           = -12,
+	HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART    = -13,
+	HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND      = -14,
+	/* SourceBufferList properties */
+	HTML_SOURCEBUFFERLIST_PROP_LENGTH           = -15,
+} GF_HTML_MediaSourcePropEnum;
+
+static GF_HTML_MediaRuntime *html_media_rt = NULL;
+
+Bool gf_mse_is_mse_object(JSContext *c, JSObject *obj) {
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static GFINLINE GF_SceneGraph *mediasource_get_scenegraph(JSContext *c)
+{
+	GF_SceneGraph *scene;
+	JSObject *global = JS_GetGlobalObject(c);
+	assert(global);
+	scene = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, global);
+	assert(scene);
+	return scene;
+}
+
+void gf_mse_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
+	if (!sg || !target) return;
+	*sg = mediasource_get_scenegraph(c);
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		GF_HTML_MediaSource *ms = NULL;
+		ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+		*target = ms->evt_target;
+	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) {
+		GF_HTML_SourceBuffer *sb = NULL;
+		sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
+		*target = sb->evt_target;
+	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) {
+		GF_HTML_SourceBufferList *sbl = NULL;
+		sbl = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
+		*target = sbl->evt_target;
+	} else {
+		*target = NULL;
+		*sg = NULL;
+	}
+}
+
+static void mediasource_sourceBuffer_initjs(JSContext *c, JSObject *ms_obj, GF_HTML_SourceBuffer *sb)
+{
+	sb->_this = JS_NewObject(c, &html_media_rt->sourceBufferClass._class, 0, 0);
+	//gf_js_add_root(c, &sb->_this, GF_JSGC_OBJECT);
+	SMJS_SET_PRIVATE(c, sb->_this, sb);
+	sb->buffered->_this = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, sb->_this);
+	SMJS_SET_PRIVATE(c, sb->buffered->_this, sb->buffered);
+}
+
+static JSBool SMJS_FUNCTION(mediasource_is_type_supported)
+{
+	SMJS_ARGS
+#ifdef FILTER_FIXME
+	GF_SceneGraph *sg;
+	GF_JSAPIParam par;
+#endif
+	Bool isSupported = GF_TRUE;
+	char *mime;
+	if (!argc || !JSVAL_CHECK_STRING(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	mime = SMJS_CHARS(c, argv[0]);
+#ifdef FILTER_FIXME
+	sg = mediasource_get_scenegraph(c);
+	assert(sg);
+#endif
+	if (!strlen(mime)) {
+		isSupported = GF_FALSE;
+	} else {
+#ifdef FILTER_FIXME
+		sg->script_action(sg->script_action_cbck, GF_JSAPI_OP_GET_COMPOSITOR, NULL, &par);
+		isSupported = gf_term_is_type_supported((GF_Terminal *)par.compositor, mime);
+#else
+	isSupported = GF_FALSE;
+#endif
+	}
+	SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(isSupported ? JS_TRUE : JS_FALSE));
+	SMJS_FREE(c, mime);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(mediasource_addSourceBuffer)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_HTML_SourceBuffer    *sb;
+	GF_HTML_MediaSource     *ms;
+	const char              *mime;
+	GF_Err					e;
+	u32						exception = 0;
+
+
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (!argc || !JSVAL_CHECK_STRING(argv[0]))
+	{
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	mime = SMJS_CHARS(c, argv[0]);
+	if (!strlen(mime))     {
+		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
+		goto exit;
+	}
+	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
+		goto exit;
+	} else if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		exception = GF_DOM_EXC_INVALID_STATE_ERR;
+		goto exit;
+	}
+	assert(ms->service);
+	/*
+	if (gf_list_count(ms->sourceBuffers.list) > 0) {
+		dom_throw_exception(c, GF_DOM_EXC_QUOTA_EXCEEDED_ERR);
+		e = GF_BAD_PARAM;
+		goto exit;
+	}
+	*/
+	sb = gf_mse_source_buffer_new(ms);
+	assert(sb);
+	e = gf_mse_source_buffer_load_parser(sb, mime);
+	if (e == GF_OK) {
+		gf_mse_mediasource_add_source_buffer(ms, sb);
+		mediasource_sourceBuffer_initjs(c, obj, sb);
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(sb->_this) );
+	} else {
+		gf_mse_source_buffer_del(sb);
+		exception = GF_DOM_EXC_NOT_SUPPORTED_ERR;
+	}
+exit:
+	if (mime) {
+		SMJS_FREE(c, (void *)mime);
+	}
+	if (exception) {
+		return dom_throw_exception(c, exception);
+	} else {
+		return JS_TRUE;
+	}
+}
+
+static JSBool SMJS_FUNCTION(mediasource_removeSourceBuffer)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_HTML_MediaSource *ms;
+	GF_HTML_SourceBuffer *sb;
+	JSObject *sb_obj;
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	sb_obj = JSVAL_TO_OBJECT(argv[0]);
+	if (!GF_JS_InstanceOf(c, sb_obj, &html_media_rt->sourceBufferClass, NULL) ) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, sb_obj);
+	if (!sb) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	} else {
+		GF_Err e = gf_mse_remove_source_buffer(ms, sb);
+		if (e == GF_NOT_FOUND) {
+			return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
+		}
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(mediasource_endOfStream)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_HTML_MediaSource *ms;
+	u32 i;
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+	for (i = 0; i < gf_list_count(ms->sourceBuffers.list); i++) {
+		GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+		if (sb->updating) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+		}
+	}
+	if (argc > 0)  {
+		char *error = NULL;
+		if (!JSVAL_CHECK_STRING(argv[0])) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+		error = SMJS_CHARS(c, argv[0]);
+		if (strcmp(error, "decode") && strcmp(error, "network")) {
+			SMJS_FREE(c, error);
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+		SMJS_FREE(c, error);
+	}
+	gf_mse_mediasource_end(ms);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(media_source_constructor)
+{
+	GF_HTML_MediaSource *p;
+	SMJS_OBJ_CONSTRUCTOR(&html_media_rt->mediaSourceClass)
+
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return JS_TRUE;
+
+	p = gf_mse_media_source_new();
+	p->c = c;
+	p->_this = obj;
+	SMJS_SET_PRIVATE(c, obj, p);
+
+	p->sourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, p->sourceBuffers._this, &p->sourceBuffers);
+
+	p->activeSourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
+	SMJS_SET_PRIVATE(c, p->activeSourceBuffers._this, &p->activeSourceBuffers);
+
+	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
+	return JS_TRUE;
+}
+
+static DECL_FINALIZE(media_source_finalize)
+
+GF_HTML_MediaSource *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return;
+p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+gf_mse_mediasource_del(p, GF_TRUE);
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_source_buffers)
+GF_HTML_MediaSource *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+if (!p) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+} else {
+	*vp = OBJECT_TO_JSVAL(p->sourceBuffers._this);
+	return JS_TRUE;
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_active_source_buffers)
+GF_HTML_MediaSource *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+	return JS_TRUE;
+}
+p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+if (p) {
+	*vp = OBJECT_TO_JSVAL(p->activeSourceBuffers._this);
+	return JS_TRUE;
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_ready_state)
+GF_HTML_MediaSource *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+if (!p) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+} else {
+	switch (p->readyState)
+	{
+	case MEDIA_SOURCE_READYSTATE_CLOSED:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "closed"));
+		break;
+	case MEDIA_SOURCE_READYSTATE_OPEN:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "open"));
+		break;
+	case MEDIA_SOURCE_READYSTATE_ENDED:
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "ended"));
+		break;
+	}
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_duration)
+GF_HTML_MediaSource *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+	return JS_TRUE;
+}
+p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+if (p) {
+	if (p->readyState == MEDIA_SOURCE_READYSTATE_CLOSED || p->durationType == DURATION_NAN) {
+		*vp = JS_GetNaNValue(c);
+	} else if (p->durationType == DURATION_INFINITY) {
+		*vp = JS_GetPositiveInfinityValue(c);
+	} else {
+		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, p->duration));
+	}
+	return JS_TRUE;
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(media_source_set_duration)
+GF_HTML_MediaSource *ms;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+if (!ms) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+} else {
+	if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	} else if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	} else {
+		u32 i, count;
+		count = gf_list_count(ms->sourceBuffers.list);
+		for (i = 0; i < count; i++) {
+			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+			if (sb->updating) {
+				return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+			}
+		}
+		{
+			jsdouble durationValue;
+			JS_ValueToNumber(c, *vp, &durationValue);
+			if (durationValue < 0) {
+				return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+			} else {
+				ms->duration = durationValue;
+				ms->durationType = DURATION_VALUE;
+				/* TODO: call the run duration algorithm */
+			}
+		}
+	}
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET( sourcebufferlist_getProperty)
+GF_HTML_SourceBufferList *p;
+u32 count;
+s32 idx;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) )
+{
+	return JS_TRUE;
+}
+p = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
+if (p) {
+	count = gf_list_count(p->list);
+	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+
+	switch (SMJS_ID_TO_INT(id)) {
+	case HTML_SOURCEBUFFERLIST_PROP_LENGTH:
+		*vp = INT_TO_JSVAL(count);
+		break;
+	default:
+		idx = SMJS_ID_TO_INT(id);
+		if ((idx<0) || ((u32) idx>=count)) {
+			*vp = JSVAL_VOID;
+			return JS_TRUE;
+		} else {
+			GF_HTML_SourceBuffer *sb;
+			sb = (GF_HTML_SourceBuffer *)gf_list_get(p->list, idx);
+			*vp = OBJECT_TO_JSVAL(sb->_this);
+			return JS_TRUE;
+		}
+
+	}
+}
+return JS_TRUE;
+
+}
+
+
+#define SB_BASIC_CHECK \
+    GF_HTML_SourceBuffer *sb; \
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) )  \
+    { \
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+    }\
+    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);\
+    if (!sb)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+    }
+
+#define SB_UPDATING_CHECK \
+    SB_BASIC_CHECK \
+    /* check if this source buffer is still in the list of source buffers */\
+    if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
+    } \
+    if (sb->updating)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
+    }
+
+/* FIXME : Function not used, generates warning on debian
+static DECL_FINALIZE(sourcebuffer_finalize)
+
+    GF_HTML_SourceBuffer *sb;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return;
+    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
+    if (sb) {
+         TODO delete lists, remove functions
+        gf_free(sb);
+    }
+}
+*/
+
+static JSBool SMJS_FUNCTION(sourcebuffer_appendBuffer)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	GF_HTML_ArrayBuffer  *ab;
+	JSObject             *js_ab;
+
+	SB_UPDATING_CHECK
+	if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_CLOSED) {
+		return JS_TRUE;
+	} else if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+	}
+
+	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	js_ab = JSVAL_TO_OBJECT(argv[0]);
+	if (!GF_JS_InstanceOf(c, js_ab, &html_media_rt->arrayBufferClass, NULL) )
+	{
+		return dom_throw_exception(c, GF_DOM_EXC_TYPE_MISMATCH_ERR);
+	}
+	ab = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, js_ab);
+	if (!ab->length)
+	{
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	/* TODO: handle buffer full flag case */
+	/* TODO: run the coded frame eviction algo */
+	gf_mse_source_buffer_append_arraybuffer(sb, ab);
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_appendStream)
+{
+	SMJS_OBJ
+	SB_UPDATING_CHECK
+	/* TODO */
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_abort)
+{
+	SMJS_OBJ
+	SB_BASIC_CHECK
+	if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+	if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+	if (gf_mse_source_buffer_abort(sb) != GF_OK) {
+		return JS_TRUE;
+	}
+	return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_remove)
+{
+	SMJS_OBJ
+	SMJS_ARGS
+	jsdouble start, end;
+	SB_UPDATING_CHECK
+	if (argc < 2 || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	JS_ValueToNumber(c, argv[0], &start);
+	JS_ValueToNumber(c, argv[1], &end);
+	if (start < 0 /* || start > sb->duration */ || start >= end) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+	}
+	gf_mse_remove(sb, start, end);
+	return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_mode)
+SB_BASIC_CHECK
+if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEGMENTS) {
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "segments"));
+} else if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
+	*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "sequence"));
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_mode)
+char *smode = NULL;
+GF_HTML_MediaSource_AppendMode mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
+SB_BASIC_CHECK
+if (!JSVAL_CHECK_STRING(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+smode = SMJS_CHARS(c, *vp);
+if (stricmp(smode, "segments") && stricmp(smode, "sequence")) {
+	SMJS_FREE(c, smode);
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+if (!stricmp(smode, "segments")) {
+	mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
+} else if (!stricmp(smode, "sequence")) {
+	mode = MEDIA_SOURCE_APPEND_MODE_SEQUENCE;
+}
+SMJS_FREE(c, smode);
+if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+}
+if (sb->updating) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+}
+if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+	gf_mse_mediasource_open(sb->mediasource, NULL);
+}
+if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+}
+sb->append_mode = mode;
+if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
+	sb->group_start_timestamp_flag = GF_TRUE;
+	sb->group_start_timestamp = sb->group_end_timestamp;
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_updating)
+SB_BASIC_CHECK
+*vp = BOOLEAN_TO_JSVAL(sb->updating ? JS_TRUE : JS_FALSE);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_timestampOffset)
+SB_BASIC_CHECK
+*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->timestampOffset*1.0/sb->timescale));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_timestampOffset)
+jsdouble d;
+SB_UPDATING_CHECK
+if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+	gf_mse_mediasource_open(sb->mediasource, NULL);
+}
+if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+gf_mse_source_buffer_set_timestampOffset(sb, d);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_timescale)
+SB_BASIC_CHECK
+*vp = INT_TO_JSVAL(sb->timescale);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_timescale)
+SB_BASIC_CHECK
+gf_mse_source_buffer_set_timescale(sb, JSVAL_TO_INT(*vp));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowStart)
+SB_BASIC_CHECK
+*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowStart));
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowStart)
+jsdouble d;
+SB_UPDATING_CHECK
+if (!JSVAL_IS_NUMBER(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+if (d < 0 || d >= sb->appendWindowEnd) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+sb->appendWindowStart = d;
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowEnd)
+SB_BASIC_CHECK
+if (sb->appendWindowEnd == GF_MAX_DOUBLE) {
+	*vp = JS_GetPositiveInfinityValue(c);
+} else {
+	*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowEnd));
+}
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowEnd)
+jsdouble d;
+SB_UPDATING_CHECK
+if (!JSVAL_IS_NUMBER(*vp)) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+JS_ValueToNumber(c, *vp, &d);
+if (d <= sb->appendWindowStart) {
+	return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+}
+sb->appendWindowEnd = d;
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_buffered)
+SB_BASIC_CHECK
+gf_mse_source_buffer_update_buffered(sb);
+*vp = OBJECT_TO_JSVAL(sb->buffered->_this);
+return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_tracks)
+SB_BASIC_CHECK
+/* TODO */
+return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_url_createObjectURL)
+{
+	SMJS_ARGS
+	JSObject    *js_ms;
+	GF_HTML_MediaSource *ms;
+	char        blobURI[256];
+
+	SMJS_SET_RVAL(JSVAL_NULL);
+	if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+		return JS_TRUE;
+	}
+	js_ms = JSVAL_TO_OBJECT(argv[0]);
+	if (!GF_JS_InstanceOf(c, js_ms, &html_media_rt->mediaSourceClass, NULL) )
+	{
+		return JS_TRUE;
+	}
+	ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, js_ms);
+	sprintf(blobURI, "blob:%p", ms);
+	ms->blobURI = gf_strdup(blobURI);
+	SMJS_SET_RVAL(STRING_TO_JSVAL( JS_NewStringCopyZ(c, blobURI)));
+	return JS_TRUE;
+}
+
+GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length)
+{
+	GF_HTML_ArrayBuffer *ab = NULL;
+	GF_SAFEALLOC(ab, GF_HTML_ArrayBuffer);
+	if (!ab) return NULL;
+	
+	if (length > 0) {
+		ab->data = data;
+		ab->length = length;
+	}
+	ab->reference_count = 0;
+	return ab;
+}
+
+JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent)
+{
+	JSObject *obj;
+	GF_HTML_ArrayBuffer *p;
+	if (!data) return NULL;
+	p = gf_arraybuffer_new(data, length);
+	obj = JS_NewObject(c, &html_media_rt->arrayBufferClass._class, NULL, parent);
+	if (!parent) {
+		p->reference_count = 0;
+	}
+	SMJS_SET_PRIVATE(c, obj, p);
+	p->c = c;
+	p->_this = obj;
+	return obj;
+}
+
+void xhr_del_array_buffer(void *udta);
+
+void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js)
+{
+	if (buffer) {
+		if (del_js && buffer->_this) {
+			/*if we have a JS object, make sure the parent XHR doesn't point to us ...*/
+			JSObject *xhro = JS_GetParent(buffer->c, buffer->_this);
+			if (xhro) {
+				void *xhr_ctx = SMJS_GET_PRIVATE(buffer->c, xhro);
+				xhr_del_array_buffer(xhr_ctx);
+			}
+
+			/* finalize the object from the JS perspective */
+			buffer->c = NULL;
+			buffer->_this = NULL;
+		}
+		/* but only delete if the data is not used elsewhere */
+		if(!del_js && buffer->reference_count) {
+			buffer->reference_count--;
+		}
+		if (!buffer->reference_count && !buffer->_this) {
+			gf_free(buffer->data);
+			if (buffer->url) gf_free(buffer->url);
+			gf_free(buffer);
+		}
+	}
+}
+
+static JSBool SMJS_FUNCTION(arraybuffer_constructor)
+{
+	SMJS_ARGS
+	u32 length = 0;
+	SMJS_OBJ_CONSTRUCTOR(&html_media_rt->arrayBufferClass)
+
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL))
+	{
+		return JS_TRUE;
+	}
+	if (argc && !JSVAL_IS_NULL(argv[0]) && JSVAL_IS_INT(argv[0])) {
+		length = JSVAL_TO_INT(argv[0]);
+	}
+	if (length > 0) {
+		gf_arraybuffer_js_new(c, (char *)gf_malloc(length), length, NULL);
+	}
+	return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(arraybuffer_get_byteLength)
+GF_HTML_ArrayBuffer *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) {
+	return JS_TRUE;
+}
+p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
+if (p) {
+	*vp = INT_TO_JSVAL(p->length);
+}
+return JS_TRUE;
+}
+
+static DECL_FINALIZE(arraybuffer_finalize)
+
+GF_HTML_ArrayBuffer *p;
+if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) return;
+p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
+if (!p) return;
+gf_arraybuffer_del(p, GF_TRUE);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_add_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_remove_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_dispatch)
+{
+	/* TODO */
+	return JS_TRUE;
+}
+
+void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *_html_media_rt)
+{
+	/* HTML Media Element */
+	if (_html_media_rt) {
+		html_media_rt = _html_media_rt;
+
+		JS_SETUP_CLASS(html_media_rt->arrayBufferClass, "ArrayBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, arraybuffer_finalize);
+		{
+			JSPropertySpec arrayBufferClassProps[] = {
+				{"byteLength",       -1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, arraybuffer_get_byteLength, 0},
+				{0, 0, 0, 0, 0}
+			};
+			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->arrayBufferClass, arraybuffer_constructor, 0, arrayBufferClassProps, 0, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] ArrayBuffer class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->mediaSourceClass, "MediaSource", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, media_source_finalize);
+		{
+			JSPropertySpec htmlMediaSourceClassProps[] = {
+				{"sourceBuffers",       HTML_MEDIASOURCE_PROP_SOURCEBUFFERS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_source_buffers, 0},
+				{"activeSourceBuffers", HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_active_source_buffers, 0},
+				{"readyState",          HTML_MEDIASOURCE_PROP_READYSTATE,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_ready_state, 0},
+				{"duration",            HTML_MEDIASOURCE_PROP_DURATION,            JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, media_source_get_duration, media_source_set_duration},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec htmlMediaSourceClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("addSourceBuffer", mediasource_addSourceBuffer, 1),
+				SMJS_FUNCTION_SPEC("removeSourceBuffer", mediasource_removeSourceBuffer, 1),
+				SMJS_FUNCTION_SPEC("endOfStream", mediasource_endOfStream, 1),
+				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_remove_listener, 3),
+				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_dispatch, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			JSFunctionSpec htmlMediaSourceClassStaticFuncs[] = {
+				SMJS_FUNCTION_SPEC("isTypeSupported", mediasource_is_type_supported, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->mediaSourceClass, media_source_constructor, 0, htmlMediaSourceClassProps, htmlMediaSourceClassFuncs, 0, htmlMediaSourceClassStaticFuncs);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] MediaSource class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->sourceBufferClass, "SourceBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
+		{
+			JSPropertySpec SourceBufferClassProps[] = {
+				{"mode",			  HTML_SOURCEBUFFER_PROP_MODE,             JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_mode, sourceBuffer_set_mode},
+				{"updating",          HTML_SOURCEBUFFER_PROP_UPDATING,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_updating, 0},
+				{"buffered",          HTML_SOURCEBUFFER_PROP_BUFFERED,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_buffered, 0},
+				{"timestampOffset",   HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timestampOffset, sourceBuffer_set_timestampOffset},
+				{"timescale",         HTML_SOURCEBUFFER_PROP_TIMESCALE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timescale, sourceBuffer_set_timescale},
+				{"appendWindowStart", HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowStart, sourceBuffer_set_appendWindowStart},
+				{"appendWindowEnd",   HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowEnd, sourceBuffer_set_appendWindowEnd},
+				{"audioTracks",       HTML_SOURCEBUFFER_PROP_AUDIOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+				{"videoTracks",       HTML_SOURCEBUFFER_PROP_VIDEOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+				{"textTracks",        HTML_SOURCEBUFFER_PROP_TEXTTRACKS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec SourceBufferClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("appendBuffer", sourcebuffer_appendBuffer, 1),
+				SMJS_FUNCTION_SPEC("appendStream", sourcebuffer_appendStream, 1),
+				SMJS_FUNCTION_SPEC("abort",  sourcebuffer_abort, 0),
+				SMJS_FUNCTION_SPEC("remove", sourcebuffer_remove, 2),
+				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferClass, 0, 0, SourceBufferClassProps, SourceBufferClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBuffer class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->sourceBufferListClass, "SourceBufferList", JSCLASS_HAS_PRIVATE, sourcebufferlist_getProperty, JS_PropertyStub_forSetter, JS_PropertyStub);
+		{
+			JSPropertySpec SourceBufferListClassProps[] = {
+				{"length",        HTML_SOURCEBUFFERLIST_PROP_LENGTH,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec SourceBufferListClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferListClass, 0, 0, SourceBufferListClassProps, SourceBufferListClassFuncs, 0, 0);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBufferList class initialized\n"));
+		}
+
+		JS_SETUP_CLASS(html_media_rt->URLClass, "URL", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
+		{
+			JSPropertySpec URLClassProps[] = {
+				{0, 0, 0, 0, 0}
+			};
+			JSFunctionSpec URLClassFuncs[] = {
+				SMJS_FUNCTION_SPEC("createObjectURL", html_url_createObjectURL, 1),
+				SMJS_FUNCTION_SPEC(0, 0, 0)
+			};
+			GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->URLClass, 0, 0, URLClassProps, 0, 0, URLClassFuncs);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] URL class initialized\n"));
+		}
+	}
+}
+
+
+#endif  /*GPAC_HAS_SPIDERMONKEY*/
+
+#endif  /*GPAC_DISABLE_SVG*/

gpac-0.8.0.tar.gz/src/scenegraph/mpeg4_animators.c -> gpac-1.0.0.tar.gz/src/scenegraph/mpeg4_animators.c Changed

@@ -247,13 +247,13 @@
 
 static Fixed anurbs_get_float(anim_nurbs *nurbs, s32 span, Fixed *vals)
 {
-	Fixed res, tmp;
+	Fixed res;
 	Fixed w, wi;
 	u32 i;
-	res = tmp = 0;
+	res = 0;
 	w=0;
 	for(i=0; i<=nurbs->p; i++) {
-		tmp = vals[span - nurbs->p + i];
+		Fixed tmp = vals[span - nurbs->p + i];
 		if (nurbs->nweights>0) {
 			wi = nurbs->weights[span - nurbs->p + i];
 			tmp = gf_mulfix(tmp, wi);
@@ -474,9 +474,8 @@
 	    || (field->far_ptr == &pa->keyType)
 	    || (field->far_ptr == &pa->keySpline)
 	    || (field->far_ptr == &pa->weight)
-	    || (field->far_ptr == &pa->key)
-
-	) stack->is_dirty = 1;
+	)
+		stack->is_dirty = 1;
 }
 void PA_Init(GF_Node *n)
 {
@@ -640,9 +639,8 @@
 	    || (field->far_ptr == &pa->keyType)
 	    || (field->far_ptr == &pa->keySpline)
 	    || (field->far_ptr == &pa->weight)
-	    || (field->far_ptr == &pa->key)
-
-	) stack->is_dirty = 1;
+	)
+		stack->is_dirty = 1;
 }
 void PA2D_Init(GF_Node *n)
 {
@@ -801,9 +799,8 @@
 	    || (field->far_ptr == &sa->keyType)
 	    || (field->far_ptr == &sa->keySpline)
 	    || (field->far_ptr == &sa->weight)
-	    || (field->far_ptr == &sa->key)
-
-	) stack->is_dirty = 1;
+	)
+		stack->is_dirty = 1;
 }
 
 void SA_Init(GF_Node *n)

gpac-0.8.0.tar.gz/src/scenegraph/mpeg4_nodes.c -> gpac-1.0.0.tar.gz/src/scenegraph/mpeg4_nodes.c Changed

@@ -6600,72 +6600,72 @@
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_FAP);
 
 	/*default field values*/
-	p->open_jaw = 1 << 31;
-	p->lower_t_midlip = 1 << 31;
-	p->raise_b_midlip = 1 << 31;
-	p->stretch_l_corner = 1 << 31;
-	p->stretch_r_corner = 1 << 31;
-	p->lower_t_lip_lm = 1 << 31;
-	p->lower_t_lip_rm = 1 << 31;
-	p->lower_b_lip_lm = 1 << 31;
-	p->lower_b_lip_rm = 1 << 31;
-	p->raise_l_cornerlip = 1 << 31;
-	p->raise_r_cornerlip = 1 << 31;
-	p->thrust_jaw = 1 << 31;
-	p->shift_jaw = 1 << 31;
-	p->push_b_lip = 1 << 31;
-	p->push_t_lip = 1 << 31;
-	p->depress_chin = 1 << 31;
-	p->close_t_l_eyelid = 1 << 31;
-	p->close_t_r_eyelid = 1 << 31;
-	p->close_b_l_eyelid = 1 << 31;
-	p->close_b_r_eyelid = 1 << 31;
-	p->yaw_l_eyeball = 1 << 31;
-	p->yaw_r_eyeball = 1 << 31;
-	p->pitch_l_eyeball = 1 << 31;
-	p->pitch_r_eyeball = 1 << 31;
-	p->thrust_l_eyeball = 1 << 31;
-	p->thrust_r_eyeball = 1 << 31;
-	p->dilate_l_pupil = 1 << 31;
-	p->dilate_r_pupil = 1 << 31;
-	p->raise_l_i_eyebrow = 1 << 31;
-	p->raise_r_i_eyebrow = 1 << 31;
-	p->raise_l_m_eyebrow = 1 << 31;
-	p->raise_r_m_eyebrow = 1 << 31;
-	p->raise_l_o_eyebrow = 1 << 31;
-	p->raise_r_o_eyebrow = 1 << 31;
-	p->squeeze_l_eyebrow = 1 << 31;
-	p->squeeze_r_eyebrow = 1 << 31;
-	p->puff_l_cheek = 1 << 31;
-	p->puff_r_cheek = 1 << 31;
-	p->lift_l_cheek = 1 << 31;
-	p->lift_r_cheek = 1 << 31;
-	p->shift_tongue_tip = 1 << 31;
-	p->raise_tongue_tip = 1 << 31;
-	p->thrust_tongue_tip = 1 << 31;
-	p->raise_tongue = 1 << 31;
-	p->tongue_roll = 1 << 31;
-	p->head_pitch = 1 << 31;
-	p->head_yaw = 1 << 31;
-	p->head_roll = 1 << 31;
-	p->lower_t_midlip_o = 1 << 31;
-	p->raise_b_midlip_o = 1 << 31;
-	p->stretch_l_cornerlip = 1 << 31;
-	p->stretch_r_cornerlip = 1 << 31;
-	p->lower_t_lip_lm_o = 1 << 31;
-	p->lower_t_lip_rm_o = 1 << 31;
-	p->raise_b_lip_lm_o = 1 << 31;
-	p->raise_b_lip_rm_o = 1 << 31;
-	p->raise_l_cornerlip_o = 1 << 31;
-	p->raise_r_cornerlip_o = 1 << 31;
-	p->stretch_l_nose = 1 << 31;
-	p->stretch_r_nose = 1 << 31;
-	p->raise_nose = 1 << 31;
-	p->bend_nose = 1 << 31;
-	p->raise_l_ear = 1 << 31;
-	p->raise_r_ear = 1 << 31;
-	p->pull_l_ear = 1 << 31;
-	p->pull_r_ear = 1 << 31;
+	p->open_jaw = 0x80000000;
+	p->lower_t_midlip = 0x80000000;
+	p->raise_b_midlip = 0x80000000;
+	p->stretch_l_corner = 0x80000000;
+	p->stretch_r_corner = 0x80000000;
+	p->lower_t_lip_lm = 0x80000000;
+	p->lower_t_lip_rm = 0x80000000;
+	p->lower_b_lip_lm = 0x80000000;
+	p->lower_b_lip_rm = 0x80000000;
+	p->raise_l_cornerlip = 0x80000000;
+	p->raise_r_cornerlip = 0x80000000;
+	p->thrust_jaw = 0x80000000;
+	p->shift_jaw = 0x80000000;
+	p->push_b_lip = 0x80000000;
+	p->push_t_lip = 0x80000000;
+	p->depress_chin = 0x80000000;
+	p->close_t_l_eyelid = 0x80000000;
+	p->close_t_r_eyelid = 0x80000000;
+	p->close_b_l_eyelid = 0x80000000;
+	p->close_b_r_eyelid = 0x80000000;
+	p->yaw_l_eyeball = 0x80000000;
+	p->yaw_r_eyeball = 0x80000000;
+	p->pitch_l_eyeball = 0x80000000;
+	p->pitch_r_eyeball = 0x80000000;
+	p->thrust_l_eyeball = 0x80000000;
+	p->thrust_r_eyeball = 0x80000000;
+	p->dilate_l_pupil = 0x80000000;
+	p->dilate_r_pupil = 0x80000000;
+	p->raise_l_i_eyebrow = 0x80000000;
+	p->raise_r_i_eyebrow = 0x80000000;
+	p->raise_l_m_eyebrow = 0x80000000;
+	p->raise_r_m_eyebrow = 0x80000000;
+	p->raise_l_o_eyebrow = 0x80000000;
+	p->raise_r_o_eyebrow = 0x80000000;
+	p->squeeze_l_eyebrow = 0x80000000;
+	p->squeeze_r_eyebrow = 0x80000000;
+	p->puff_l_cheek = 0x80000000;
+	p->puff_r_cheek = 0x80000000;
+	p->lift_l_cheek = 0x80000000;
+	p->lift_r_cheek = 0x80000000;
+	p->shift_tongue_tip = 0x80000000;
+	p->raise_tongue_tip = 0x80000000;
+	p->thrust_tongue_tip = 0x80000000;
+	p->raise_tongue = 0x80000000;
+	p->tongue_roll = 0x80000000;
+	p->head_pitch = 0x80000000;
+	p->head_yaw = 0x80000000;
+	p->head_roll = 0x80000000;
+	p->lower_t_midlip_o = 0x80000000;
+	p->raise_b_midlip_o = 0x80000000;
+	p->stretch_l_cornerlip = 0x80000000;
+	p->stretch_r_cornerlip = 0x80000000;
+	p->lower_t_lip_lm_o = 0x80000000;
+	p->lower_t_lip_rm_o = 0x80000000;
+	p->raise_b_lip_lm_o = 0x80000000;
+	p->raise_b_lip_rm_o = 0x80000000;
+	p->raise_l_cornerlip_o = 0x80000000;
+	p->raise_r_cornerlip_o = 0x80000000;
+	p->stretch_l_nose = 0x80000000;
+	p->stretch_r_nose = 0x80000000;
+	p->raise_nose = 0x80000000;
+	p->bend_nose = 0x80000000;
+	p->raise_l_ear = 0x80000000;
+	p->raise_r_ear = 0x80000000;
+	p->pull_l_ear = 0x80000000;
+	p->pull_r_ear = 0x80000000;
 	return (GF_Node *)p;
 }
 
@@ -20515,302 +20515,302 @@
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_BAP);
 
 	/*default field values*/
-	p->sacroiliac_tilt = 1 << 31;
-	p->sacroiliac_torsion = 1 << 31;
-	p->sacroiliac_roll = 1 << 31;
-	p->l_hip_flexion = 1 << 31;
-	p->r_hip_flexion = 1 << 31;
-	p->l_hip_abduct = 1 << 31;
-	p->r_hip_abduct = 1 << 31;
-	p->l_hip_twisting = 1 << 31;
-	p->r_hip_twisting = 1 << 31;
-	p->l_knee_flexion = 1 << 31;
-	p->r_knee_flexion = 1 << 31;
-	p->l_knee_twisting = 1 << 31;
-	p->r_knee_twisting = 1 << 31;
-	p->l_ankle_flexion = 1 << 31;
-	p->r_ankle_flexion = 1 << 31;
-	p->l_ankle_twisting = 1 << 31;
-	p->r_ankle_twisting = 1 << 31;
-	p->l_subtalar_flexion = 1 << 31;
-	p->r_subtalar_flexion = 1 << 31;
-	p->l_midtarsal_flexion = 1 << 31;
-	p->r_midtarsal_flexion = 1 << 31;
-	p->l_metatarsal_flexion = 1 << 31;
-	p->r_metatarsal_flexion = 1 << 31;
-	p->l_sternoclavicular_abduct = 1 << 31;
-	p->r_sternoclavicular_abduct = 1 << 31;
-	p->l_sternoclavicular_rotate = 1 << 31;
-	p->r_sternoclavicular_rotate = 1 << 31;
-	p->l_acromioclavicular_abduct = 1 << 31;
-	p->r_acromioclavicular_abduct = 1 << 31;
-	p->l_acromioclavicular_rotate = 1 << 31;
-	p->r_acromioclavicular_rotate = 1 << 31;
-	p->l_shoulder_flexion = 1 << 31;
-	p->r_shoulder_flexion = 1 << 31;
-	p->l_shoulder_abduct = 1 << 31;
-	p->r_shoulder_abduct = 1 << 31;
-	p->l_shoulder_twisting = 1 << 31;
-	p->r_shoulder_twisting = 1 << 31;
-	p->l_elbow_flexion = 1 << 31;
-	p->r_elbow_flexion = 1 << 31;
-	p->l_elbow_twisting = 1 << 31;
-	p->r_elbow_twisting = 1 << 31;
-	p->l_wrist_flexion = 1 << 31;
-	p->r_wrist_flexion = 1 << 31;
-	p->l_wrist_pivot = 1 << 31;
-	p->r_wrist_pivot = 1 << 31;
-	p->l_wrist_twisting = 1 << 31;
-	p->r_wrist_twisting = 1 << 31;
-	p->skullbase_roll = 1 << 31;
-	p->skullbase_torsion = 1 << 31;
-	p->skullbase_tilt = 1 << 31;
-	p->vc1roll = 1 << 31;
-	p->vc1torsion = 1 << 31;
-	p->vc1tilt = 1 << 31;
-	p->vc2roll = 1 << 31;
-	p->vc2torsion = 1 << 31;
-	p->vc2tilt = 1 << 31;
-	p->vc3roll = 1 << 31;
-	p->vc3torsion = 1 << 31;
-	p->vc3tilt = 1 << 31;
-	p->vc4roll = 1 << 31;
-	p->vc4torsion = 1 << 31;
-	p->vc4tilt = 1 << 31;
-	p->vc5roll = 1 << 31;
-	p->vc5torsion = 1 << 31;
-	p->vc5tilt = 1 << 31;
-	p->vc6roll = 1 << 31;
-	p->vc6torsion = 1 << 31;
-	p->vc6tilt = 1 << 31;
-	p->vc7roll = 1 << 31;
-	p->vc7torsion = 1 << 31;
-	p->vc7tilt = 1 << 31;
-	p->vt1roll = 1 << 31;
-	p->vt1torsion = 1 << 31;
-	p->vt1tilt = 1 << 31;
-	p->vt2roll = 1 << 31;
-	p->vt2torsion = 1 << 31;
-	p->vt2tilt = 1 << 31;
-	p->vt3roll = 1 << 31;
-	p->vt3torsion = 1 << 31;
-	p->vt3tilt = 1 << 31;
-	p->vt4roll = 1 << 31;
-	p->vt4torsion = 1 << 31;
-	p->vt4tilt = 1 << 31;
-	p->vt5roll = 1 << 31;
-	p->vt5torsion = 1 << 31;
-	p->vt5tilt = 1 << 31;
-	p->vt6roll = 1 << 31;
-	p->vt6torsion = 1 << 31;
-	p->vt6tilt = 1 << 31;
-	p->vt7roll = 1 << 31;
-	p->vt7torsion = 1 << 31;
-	p->vt7tilt = 1 << 31;
-	p->vt8roll = 1 << 31;
-	p->vt8torsion = 1 << 31;
-	p->vt8tilt = 1 << 31;
-	p->vt9roll = 1 << 31;
-	p->vt9torsion = 1 << 31;
-	p->vt9tilt = 1 << 31;
-	p->vt10roll = 1 << 31;
-	p->vt10torsion = 1 << 31;
-	p->vt10tilt = 1 << 31;
-	p->vt11roll = 1 << 31;
-	p->vt11torsion = 1 << 31;
-	p->vt11tilt = 1 << 31;
-	p->vt12roll = 1 << 31;
-	p->vt12torsion = 1 << 31;
-	p->vt12tilt = 1 << 31;
-	p->vl1roll = 1 << 31;
-	p->vl1torsion = 1 << 31;
-	p->vl1tilt = 1 << 31;
-	p->vl2roll = 1 << 31;
-	p->vl2torsion = 1 << 31;
-	p->vl2tilt = 1 << 31;
-	p->vl3roll = 1 << 31;
-	p->vl3torsion = 1 << 31;
-	p->vl3tilt = 1 << 31;
-	p->vl4roll = 1 << 31;
-	p->vl4torsion = 1 << 31;
-	p->vl4tilt = 1 << 31;
-	p->vl5roll = 1 << 31;
-	p->vl5torsion = 1 << 31;
-	p->vl5tilt = 1 << 31;
-	p->l_pinky0_flexion = 1 << 31;
-	p->r_pinky0_flexion = 1 << 31;
-	p->l_pinky1_flexion = 1 << 31;
-	p->r_pinky1_flexion = 1 << 31;
-	p->l_pinky1_pivot = 1 << 31;
-	p->r_pinky1_pivot = 1 << 31;
-	p->l_pinky1_twisting = 1 << 31;
-	p->r_pinky1_twisting = 1 << 31;
-	p->l_pinky2_flexion = 1 << 31;
-	p->r_pinky2_flexion = 1 << 31;
-	p->l_pinky3_flexion = 1 << 31;
-	p->r_pinky3_flexion = 1 << 31;
-	p->l_ring0_flexion = 1 << 31;
-	p->r_ring0_flexion = 1 << 31;
-	p->l_ring1_flexion = 1 << 31;
-	p->r_ring1_flexion = 1 << 31;
-	p->l_ring1_pivot = 1 << 31;
-	p->r_ring1_pivot = 1 << 31;
-	p->l_ring1_twisting = 1 << 31;
-	p->r_ring1_twisting = 1 << 31;
-	p->l_ring2_flexion = 1 << 31;
-	p->r_ring2_flexion = 1 << 31;
-	p->l_ring3_flexion = 1 << 31;
-	p->r_ring3_flexion = 1 << 31;
-	p->l_middle0_flexion = 1 << 31;
-	p->r_middle0_flexion = 1 << 31;
-	p->l_middle1_flexion = 1 << 31;
-	p->r_middle1_flexion = 1 << 31;
-	p->l_middle1_pivot = 1 << 31;
-	p->r_middle1_pivot = 1 << 31;
-	p->l_middle1_twisting = 1 << 31;
-	p->r_middle1_twisting = 1 << 31;
-	p->l_middle2_flexion = 1 << 31;
-	p->r_middle2_flexion = 1 << 31;
-	p->l_middle3_flexion = 1 << 31;
-	p->r_middle3_flexion = 1 << 31;
-	p->l_index0_flexion = 1 << 31;
-	p->r_index0_flexion = 1 << 31;
-	p->l_index1_flexion = 1 << 31;
-	p->r_index1_flexion = 1 << 31;
-	p->l_index1_pivot = 1 << 31;
-	p->r_index1_pivot = 1 << 31;
-	p->l_index1_twisting = 1 << 31;
-	p->r_index1_twisting = 1 << 31;
-	p->l_index2_flexion = 1 << 31;
-	p->r_index2_flexion = 1 << 31;
-	p->l_index3_flexion = 1 << 31;
-	p->r_index3_flexion = 1 << 31;
-	p->l_thumb1_flexion = 1 << 31;
-	p->r_thumb1_flexion = 1 << 31;
-	p->l_thumb1_pivot = 1 << 31;
-	p->r_thumb1_pivot = 1 << 31;
-	p->l_thumb1_twisting = 1 << 31;
-	p->r_thumb1_twisting = 1 << 31;
-	p->l_thumb2_flexion = 1 << 31;
-	p->r_thumb2_flexion = 1 << 31;
-	p->l_thumb3_flexion = 1 << 31;
-	p->r_thumb3_flexion = 1 << 31;
-	p->HumanoidRoot_tr_vertical = 1 << 31;
-	p->HumanoidRoot_tr_lateral = 1 << 31;
-	p->HumanoidRoot_tr_frontal = 1 << 31;
-	p->HumanoidRoot_rt_body_turn = 1 << 31;
-	p->HumanoidRoot_rt_body_roll = 1 << 31;
-	p->HumanoidRoot_rt_body_tilt = 1 << 31;
-	p->extensionBap187 = 1 << 31;
-	p->extensionBap188 = 1 << 31;
-	p->extensionBap189 = 1 << 31;
-	p->extensionBap190 = 1 << 31;
-	p->extensionBap191 = 1 << 31;
-	p->extensionBap192 = 1 << 31;
-	p->extensionBap193 = 1 << 31;
-	p->extensionBap194 = 1 << 31;
-	p->extensionBap195 = 1 << 31;
-	p->extensionBap196 = 1 << 31;
-	p->extensionBap197 = 1 << 31;
-	p->extensionBap198 = 1 << 31;
-	p->extensionBap199 = 1 << 31;
-	p->extensionBap200 = 1 << 31;
-	p->extensionBap201 = 1 << 31;
-	p->extensionBap202 = 1 << 31;
-	p->extensionBap203 = 1 << 31;
-	p->extensionBap204 = 1 << 31;
-	p->extensionBap205 = 1 << 31;
-	p->extensionBap206 = 1 << 31;
-	p->extensionBap207 = 1 << 31;
-	p->extensionBap208 = 1 << 31;
-	p->extensionBap209 = 1 << 31;
-	p->extensionBap210 = 1 << 31;
-	p->extensionBap211 = 1 << 31;
-	p->extensionBap212 = 1 << 31;
-	p->extensionBap213 = 1 << 31;
-	p->extensionBap214 = 1 << 31;
-	p->extensionBap215 = 1 << 31;
-	p->extensionBap216 = 1 << 31;
-	p->extensionBap217 = 1 << 31;
-	p->extensionBap218 = 1 << 31;
-	p->extensionBap219 = 1 << 31;
-	p->extensionBap220 = 1 << 31;
-	p->extensionBap221 = 1 << 31;
-	p->extensionBap222 = 1 << 31;
-	p->extensionBap223 = 1 << 31;
-	p->extensionBap224 = 1 << 31;
-	p->extensionBap225 = 1 << 31;
-	p->extensionBap226 = 1 << 31;
-	p->extensionBap227 = 1 << 31;
-	p->extensionBap228 = 1 << 31;
-	p->extensionBap229 = 1 << 31;
-	p->extensionBap230 = 1 << 31;
-	p->extensionBap231 = 1 << 31;
-	p->extensionBap232 = 1 << 31;
-	p->extensionBap233 = 1 << 31;
-	p->extensionBap234 = 1 << 31;
-	p->extensionBap235 = 1 << 31;
-	p->extensionBap236 = 1 << 31;
-	p->extensionBap237 = 1 << 31;
-	p->extensionBap238 = 1 << 31;
-	p->extensionBap239 = 1 << 31;
-	p->extensionBap240 = 1 << 31;
-	p->extensionBap241 = 1 << 31;
-	p->extensionBap242 = 1 << 31;
-	p->extensionBap243 = 1 << 31;
-	p->extensionBap244 = 1 << 31;
-	p->extensionBap245 = 1 << 31;
-	p->extensionBap246 = 1 << 31;
-	p->extensionBap247 = 1 << 31;
-	p->extensionBap248 = 1 << 31;
-	p->extensionBap249 = 1 << 31;
-	p->extensionBap250 = 1 << 31;
-	p->extensionBap251 = 1 << 31;
-	p->extensionBap252 = 1 << 31;
-	p->extensionBap253 = 1 << 31;
-	p->extensionBap254 = 1 << 31;
-	p->extensionBap255 = 1 << 31;
-	p->extensionBap256 = 1 << 31;
-	p->extensionBap257 = 1 << 31;
-	p->extensionBap258 = 1 << 31;
-	p->extensionBap259 = 1 << 31;
-	p->extensionBap260 = 1 << 31;
-	p->extensionBap261 = 1 << 31;
-	p->extensionBap262 = 1 << 31;
-	p->extensionBap263 = 1 << 31;
-	p->extensionBap264 = 1 << 31;
-	p->extensionBap265 = 1 << 31;
-	p->extensionBap266 = 1 << 31;
-	p->extensionBap267 = 1 << 31;
-	p->extensionBap268 = 1 << 31;
-	p->extensionBap269 = 1 << 31;
-	p->extensionBap270 = 1 << 31;
-	p->extensionBap271 = 1 << 31;
-	p->extensionBap272 = 1 << 31;
-	p->extensionBap273 = 1 << 31;
-	p->extensionBap274 = 1 << 31;
-	p->extensionBap275 = 1 << 31;
-	p->extensionBap276 = 1 << 31;
-	p->extensionBap277 = 1 << 31;
-	p->extensionBap278 = 1 << 31;
-	p->extensionBap279 = 1 << 31;
-	p->extensionBap280 = 1 << 31;
-	p->extensionBap281 = 1 << 31;
-	p->extensionBap282 = 1 << 31;
-	p->extensionBap283 = 1 << 31;
-	p->extensionBap284 = 1 << 31;
-	p->extensionBap285 = 1 << 31;
-	p->extensionBap286 = 1 << 31;
-	p->extensionBap287 = 1 << 31;
-	p->extensionBap288 = 1 << 31;
-	p->extensionBap289 = 1 << 31;
-	p->extensionBap290 = 1 << 31;
-	p->extensionBap291 = 1 << 31;
-	p->extensionBap292 = 1 << 31;
-	p->extensionBap293 = 1 << 31;
-	p->extensionBap294 = 1 << 31;
-	p->extensionBap295 = 1 << 31;
-	p->extensionBap296 = 1 << 31;
+	p->sacroiliac_tilt = 0x80000000;
+	p->sacroiliac_torsion = 0x80000000;
+	p->sacroiliac_roll = 0x80000000;
+	p->l_hip_flexion = 0x80000000;
+	p->r_hip_flexion = 0x80000000;
+	p->l_hip_abduct = 0x80000000;
+	p->r_hip_abduct = 0x80000000;
+	p->l_hip_twisting = 0x80000000;
+	p->r_hip_twisting = 0x80000000;
+	p->l_knee_flexion = 0x80000000;
+	p->r_knee_flexion = 0x80000000;
+	p->l_knee_twisting = 0x80000000;
+	p->r_knee_twisting = 0x80000000;
+	p->l_ankle_flexion = 0x80000000;
+	p->r_ankle_flexion = 0x80000000;
+	p->l_ankle_twisting = 0x80000000;
+	p->r_ankle_twisting = 0x80000000;
+	p->l_subtalar_flexion = 0x80000000;
+	p->r_subtalar_flexion = 0x80000000;
+	p->l_midtarsal_flexion = 0x80000000;
+	p->r_midtarsal_flexion = 0x80000000;
+	p->l_metatarsal_flexion = 0x80000000;
+	p->r_metatarsal_flexion = 0x80000000;
+	p->l_sternoclavicular_abduct = 0x80000000;
+	p->r_sternoclavicular_abduct = 0x80000000;
+	p->l_sternoclavicular_rotate = 0x80000000;
+	p->r_sternoclavicular_rotate = 0x80000000;
+	p->l_acromioclavicular_abduct = 0x80000000;
+	p->r_acromioclavicular_abduct = 0x80000000;
+	p->l_acromioclavicular_rotate = 0x80000000;
+	p->r_acromioclavicular_rotate = 0x80000000;
+	p->l_shoulder_flexion = 0x80000000;
+	p->r_shoulder_flexion = 0x80000000;
+	p->l_shoulder_abduct = 0x80000000;
+	p->r_shoulder_abduct = 0x80000000;
+	p->l_shoulder_twisting = 0x80000000;
+	p->r_shoulder_twisting = 0x80000000;
+	p->l_elbow_flexion = 0x80000000;
+	p->r_elbow_flexion = 0x80000000;
+	p->l_elbow_twisting = 0x80000000;
+	p->r_elbow_twisting = 0x80000000;
+	p->l_wrist_flexion = 0x80000000;
+	p->r_wrist_flexion = 0x80000000;
+	p->l_wrist_pivot = 0x80000000;
+	p->r_wrist_pivot = 0x80000000;
+	p->l_wrist_twisting = 0x80000000;
+	p->r_wrist_twisting = 0x80000000;
+	p->skullbase_roll = 0x80000000;
+	p->skullbase_torsion = 0x80000000;
+	p->skullbase_tilt = 0x80000000;
+	p->vc1roll = 0x80000000;
+	p->vc1torsion = 0x80000000;
+	p->vc1tilt = 0x80000000;
+	p->vc2roll = 0x80000000;
+	p->vc2torsion = 0x80000000;
+	p->vc2tilt = 0x80000000;
+	p->vc3roll = 0x80000000;
+	p->vc3torsion = 0x80000000;
+	p->vc3tilt = 0x80000000;
+	p->vc4roll = 0x80000000;
+	p->vc4torsion = 0x80000000;
+	p->vc4tilt = 0x80000000;
+	p->vc5roll = 0x80000000;
+	p->vc5torsion = 0x80000000;
+	p->vc5tilt = 0x80000000;
+	p->vc6roll = 0x80000000;
+	p->vc6torsion = 0x80000000;
+	p->vc6tilt = 0x80000000;
+	p->vc7roll = 0x80000000;
+	p->vc7torsion = 0x80000000;
+	p->vc7tilt = 0x80000000;
+	p->vt1roll = 0x80000000;
+	p->vt1torsion = 0x80000000;
+	p->vt1tilt = 0x80000000;
+	p->vt2roll = 0x80000000;
+	p->vt2torsion = 0x80000000;
+	p->vt2tilt = 0x80000000;
+	p->vt3roll = 0x80000000;
+	p->vt3torsion = 0x80000000;
+	p->vt3tilt = 0x80000000;
+	p->vt4roll = 0x80000000;
+	p->vt4torsion = 0x80000000;
+	p->vt4tilt = 0x80000000;
+	p->vt5roll = 0x80000000;
+	p->vt5torsion = 0x80000000;
+	p->vt5tilt = 0x80000000;
+	p->vt6roll = 0x80000000;
+	p->vt6torsion = 0x80000000;
+	p->vt6tilt = 0x80000000;
+	p->vt7roll = 0x80000000;
+	p->vt7torsion = 0x80000000;
+	p->vt7tilt = 0x80000000;
+	p->vt8roll = 0x80000000;
+	p->vt8torsion = 0x80000000;
+	p->vt8tilt = 0x80000000;
+	p->vt9roll = 0x80000000;
+	p->vt9torsion = 0x80000000;
+	p->vt9tilt = 0x80000000;
+	p->vt10roll = 0x80000000;
+	p->vt10torsion = 0x80000000;
+	p->vt10tilt = 0x80000000;
+	p->vt11roll = 0x80000000;
+	p->vt11torsion = 0x80000000;
+	p->vt11tilt = 0x80000000;
+	p->vt12roll = 0x80000000;
+	p->vt12torsion = 0x80000000;
+	p->vt12tilt = 0x80000000;
+	p->vl1roll = 0x80000000;
+	p->vl1torsion = 0x80000000;
+	p->vl1tilt = 0x80000000;
+	p->vl2roll = 0x80000000;
+	p->vl2torsion = 0x80000000;
+	p->vl2tilt = 0x80000000;
+	p->vl3roll = 0x80000000;
+	p->vl3torsion = 0x80000000;
+	p->vl3tilt = 0x80000000;
+	p->vl4roll = 0x80000000;
+	p->vl4torsion = 0x80000000;
+	p->vl4tilt = 0x80000000;
+	p->vl5roll = 0x80000000;
+	p->vl5torsion = 0x80000000;
+	p->vl5tilt = 0x80000000;
+	p->l_pinky0_flexion = 0x80000000;
+	p->r_pinky0_flexion = 0x80000000;
+	p->l_pinky1_flexion = 0x80000000;
+	p->r_pinky1_flexion = 0x80000000;
+	p->l_pinky1_pivot = 0x80000000;
+	p->r_pinky1_pivot = 0x80000000;
+	p->l_pinky1_twisting = 0x80000000;
+	p->r_pinky1_twisting = 0x80000000;
+	p->l_pinky2_flexion = 0x80000000;
+	p->r_pinky2_flexion = 0x80000000;
+	p->l_pinky3_flexion = 0x80000000;
+	p->r_pinky3_flexion = 0x80000000;
+	p->l_ring0_flexion = 0x80000000;
+	p->r_ring0_flexion = 0x80000000;
+	p->l_ring1_flexion = 0x80000000;
+	p->r_ring1_flexion = 0x80000000;
+	p->l_ring1_pivot = 0x80000000;
+	p->r_ring1_pivot = 0x80000000;
+	p->l_ring1_twisting = 0x80000000;
+	p->r_ring1_twisting = 0x80000000;
+	p->l_ring2_flexion = 0x80000000;
+	p->r_ring2_flexion = 0x80000000;
+	p->l_ring3_flexion = 0x80000000;
+	p->r_ring3_flexion = 0x80000000;
+	p->l_middle0_flexion = 0x80000000;
+	p->r_middle0_flexion = 0x80000000;
+	p->l_middle1_flexion = 0x80000000;
+	p->r_middle1_flexion = 0x80000000;
+	p->l_middle1_pivot = 0x80000000;
+	p->r_middle1_pivot = 0x80000000;
+	p->l_middle1_twisting = 0x80000000;
+	p->r_middle1_twisting = 0x80000000;
+	p->l_middle2_flexion = 0x80000000;
+	p->r_middle2_flexion = 0x80000000;
+	p->l_middle3_flexion = 0x80000000;
+	p->r_middle3_flexion = 0x80000000;
+	p->l_index0_flexion = 0x80000000;
+	p->r_index0_flexion = 0x80000000;
+	p->l_index1_flexion = 0x80000000;
+	p->r_index1_flexion = 0x80000000;
+	p->l_index1_pivot = 0x80000000;
+	p->r_index1_pivot = 0x80000000;
+	p->l_index1_twisting = 0x80000000;
+	p->r_index1_twisting = 0x80000000;
+	p->l_index2_flexion = 0x80000000;
+	p->r_index2_flexion = 0x80000000;
+	p->l_index3_flexion = 0x80000000;
+	p->r_index3_flexion = 0x80000000;
+	p->l_thumb1_flexion = 0x80000000;
+	p->r_thumb1_flexion = 0x80000000;
+	p->l_thumb1_pivot = 0x80000000;
+	p->r_thumb1_pivot = 0x80000000;
+	p->l_thumb1_twisting = 0x80000000;
+	p->r_thumb1_twisting = 0x80000000;
+	p->l_thumb2_flexion = 0x80000000;
+	p->r_thumb2_flexion = 0x80000000;
+	p->l_thumb3_flexion = 0x80000000;
+	p->r_thumb3_flexion = 0x80000000;
+	p->HumanoidRoot_tr_vertical = 0x80000000;
+	p->HumanoidRoot_tr_lateral = 0x80000000;
+	p->HumanoidRoot_tr_frontal = 0x80000000;
+	p->HumanoidRoot_rt_body_turn = 0x80000000;
+	p->HumanoidRoot_rt_body_roll = 0x80000000;
+	p->HumanoidRoot_rt_body_tilt = 0x80000000;
+	p->extensionBap187 = 0x80000000;
+	p->extensionBap188 = 0x80000000;
+	p->extensionBap189 = 0x80000000;
+	p->extensionBap190 = 0x80000000;
+	p->extensionBap191 = 0x80000000;
+	p->extensionBap192 = 0x80000000;
+	p->extensionBap193 = 0x80000000;
+	p->extensionBap194 = 0x80000000;
+	p->extensionBap195 = 0x80000000;
+	p->extensionBap196 = 0x80000000;
+	p->extensionBap197 = 0x80000000;
+	p->extensionBap198 = 0x80000000;
+	p->extensionBap199 = 0x80000000;
+	p->extensionBap200 = 0x80000000;
+	p->extensionBap201 = 0x80000000;
+	p->extensionBap202 = 0x80000000;
+	p->extensionBap203 = 0x80000000;
+	p->extensionBap204 = 0x80000000;
+	p->extensionBap205 = 0x80000000;
+	p->extensionBap206 = 0x80000000;
+	p->extensionBap207 = 0x80000000;
+	p->extensionBap208 = 0x80000000;
+	p->extensionBap209 = 0x80000000;
+	p->extensionBap210 = 0x80000000;
+	p->extensionBap211 = 0x80000000;
+	p->extensionBap212 = 0x80000000;
+	p->extensionBap213 = 0x80000000;
+	p->extensionBap214 = 0x80000000;
+	p->extensionBap215 = 0x80000000;
+	p->extensionBap216 = 0x80000000;
+	p->extensionBap217 = 0x80000000;
+	p->extensionBap218 = 0x80000000;
+	p->extensionBap219 = 0x80000000;
+	p->extensionBap220 = 0x80000000;
+	p->extensionBap221 = 0x80000000;
+	p->extensionBap222 = 0x80000000;
+	p->extensionBap223 = 0x80000000;
+	p->extensionBap224 = 0x80000000;
+	p->extensionBap225 = 0x80000000;
+	p->extensionBap226 = 0x80000000;
+	p->extensionBap227 = 0x80000000;
+	p->extensionBap228 = 0x80000000;
+	p->extensionBap229 = 0x80000000;
+	p->extensionBap230 = 0x80000000;
+	p->extensionBap231 = 0x80000000;
+	p->extensionBap232 = 0x80000000;
+	p->extensionBap233 = 0x80000000;
+	p->extensionBap234 = 0x80000000;
+	p->extensionBap235 = 0x80000000;
+	p->extensionBap236 = 0x80000000;
+	p->extensionBap237 = 0x80000000;
+	p->extensionBap238 = 0x80000000;
+	p->extensionBap239 = 0x80000000;
+	p->extensionBap240 = 0x80000000;
+	p->extensionBap241 = 0x80000000;
+	p->extensionBap242 = 0x80000000;
+	p->extensionBap243 = 0x80000000;
+	p->extensionBap244 = 0x80000000;
+	p->extensionBap245 = 0x80000000;
+	p->extensionBap246 = 0x80000000;
+	p->extensionBap247 = 0x80000000;
+	p->extensionBap248 = 0x80000000;
+	p->extensionBap249 = 0x80000000;
+	p->extensionBap250 = 0x80000000;
+	p->extensionBap251 = 0x80000000;
+	p->extensionBap252 = 0x80000000;
+	p->extensionBap253 = 0x80000000;
+	p->extensionBap254 = 0x80000000;
+	p->extensionBap255 = 0x80000000;
+	p->extensionBap256 = 0x80000000;
+	p->extensionBap257 = 0x80000000;
+	p->extensionBap258 = 0x80000000;
+	p->extensionBap259 = 0x80000000;
+	p->extensionBap260 = 0x80000000;
+	p->extensionBap261 = 0x80000000;
+	p->extensionBap262 = 0x80000000;
+	p->extensionBap263 = 0x80000000;
+	p->extensionBap264 = 0x80000000;
+	p->extensionBap265 = 0x80000000;
+	p->extensionBap266 = 0x80000000;
+	p->extensionBap267 = 0x80000000;
+	p->extensionBap268 = 0x80000000;
+	p->extensionBap269 = 0x80000000;
+	p->extensionBap270 = 0x80000000;
+	p->extensionBap271 = 0x80000000;
+	p->extensionBap272 = 0x80000000;
+	p->extensionBap273 = 0x80000000;
+	p->extensionBap274 = 0x80000000;
+	p->extensionBap275 = 0x80000000;
+	p->extensionBap276 = 0x80000000;
+	p->extensionBap277 = 0x80000000;
+	p->extensionBap278 = 0x80000000;
+	p->extensionBap279 = 0x80000000;
+	p->extensionBap280 = 0x80000000;
+	p->extensionBap281 = 0x80000000;
+	p->extensionBap282 = 0x80000000;
+	p->extensionBap283 = 0x80000000;
+	p->extensionBap284 = 0x80000000;
+	p->extensionBap285 = 0x80000000;
+	p->extensionBap286 = 0x80000000;
+	p->extensionBap287 = 0x80000000;
+	p->extensionBap288 = 0x80000000;
+	p->extensionBap289 = 0x80000000;
+	p->extensionBap290 = 0x80000000;
+	p->extensionBap291 = 0x80000000;
+	p->extensionBap292 = 0x80000000;
+	p->extensionBap293 = 0x80000000;
+	p->extensionBap294 = 0x80000000;
+	p->extensionBap295 = 0x80000000;
+	p->extensionBap296 = 0x80000000;
 	return (GF_Node *)p;
 }

gpac-0.8.0.tar.gz/src/scenegraph/mpeg4_valuator.c -> gpac-1.0.0.tar.gz/src/scenegraph/mpeg4_valuator.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-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / Scene Graph sub-project
@@ -48,7 +48,8 @@
 
 static void valuator_get_output(M_Valuator *p, GenMFField *inMFField, u32 inType, Bool do_sum, u32 i, SFVec4f *output, u32 *num_out)
 {
-
+	if (!inMFField) return;
+	
 	switch (inType) {
 	case GF_SG_VRML_MFINT32:
 	{
@@ -404,23 +405,26 @@
 static void Valuator_SetInSFRotation(GF_Node *n, GF_Route *route)
 {
 	SFVec4f val;
-	M_Valuator *_this = (M_Valuator *) n;
-	val = _this->inSFRotation;
-	SetValuatorOutput(_this, &val, NULL, GF_SG_VRML_SFROTATION);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		val = _this->inSFRotation;
+		SetValuatorOutput(_this, &val, NULL, GF_SG_VRML_SFROTATION);
+	}
 }
 
 /*
 valuator spec (9.4.2.116.2)
 Convert if the content of the string represents an int, float or
-double value. Boolean string values 'true' and 'false' are
+double value. Boolean string values 'true' and 'false' are
 converted to 1.0 and 0.0 respectively. Any other string is converted to 0.0
 */
 static void Valuator_SetInSFString(GF_Node *n, GF_Route *route)
 {
 	SFVec4f val;
 	M_Valuator *_this = (M_Valuator *) n;
-	val.x = val.y = val.z = val.q = 0;
+
 	if (! _this->inSFString.buffer) return;
+
 	if (!stricmp(_this->inSFString.buffer, "true")) {
 		val.x = val.y = val.z = val.q = FIX_ONE;
 	} else if (!strstr(_this->inSFString.buffer, ".")) {
@@ -435,19 +439,25 @@
 
 static void Valuator_SetInMFColor(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFColor, GF_SG_VRML_MFCOLOR);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFColor, GF_SG_VRML_MFCOLOR);
+	}
 }
 
 static void Valuator_SetInMFFloat(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFFloat, GF_SG_VRML_MFFLOAT);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFFloat, GF_SG_VRML_MFFLOAT);
+	}
 }
 static void Valuator_SetInMFInt32(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFInt32, GF_SG_VRML_MFINT32);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFInt32, GF_SG_VRML_MFINT32);
+	}
 }
 static void Valuator_SetInMFVec2f(GF_Node *n, GF_Route *route)
 {
@@ -456,18 +466,24 @@
 }
 static void Valuator_SetInMFVec3f(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFVec3f, GF_SG_VRML_MFVEC3F);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFVec3f, GF_SG_VRML_MFVEC3F);
+	}
 }
 static void Valuator_SetInMFRotation(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFRotation, GF_SG_VRML_MFROTATION);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFRotation, GF_SG_VRML_MFROTATION);
+	}
 }
 static void Valuator_SetInMFString(GF_Node *n, GF_Route *route)
 {
-	M_Valuator *_this = (M_Valuator *) n;
-	SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFString, GF_SG_VRML_MFSTRING);
+	if (n) {
+		M_Valuator *_this = (M_Valuator *) n;
+		SetValuatorOutput(_this, NULL, (GenMFField *) &_this->inMFString, GF_SG_VRML_MFSTRING);
+	}
 }
 
 
@@ -504,6 +520,18 @@
 	gf_node_set_private((GF_Node*)node, temp);
 	gf_node_set_callback_function((GF_Node*)node, valuator_destroy);
 
+#ifdef GPAC_ENABLE_COVERAGE
+	//we are a bit lazy here
+	if (gf_sys_is_cov_mode()) {
+		Valuator_SetInSFRotation(NULL, NULL);
+		Valuator_SetInMFColor(NULL, NULL);
+		Valuator_SetInMFFloat(NULL, NULL);
+		Valuator_SetInMFInt32(NULL, NULL);
+		Valuator_SetInMFVec3f(NULL, NULL);
+		Valuator_SetInMFRotation(NULL, NULL);
+		Valuator_SetInMFString(NULL, NULL);
+	}
+#endif
 	return 1;
 }

gpac-1.0.0.tar.gz/src/scenegraph/qjs_common.h Added

@@ -0,0 +1,243 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *				Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Management 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.
+ *
+ */
+
+#ifndef SG_QJS_COMMONE
+#define SG_QJS_COMMONE
+
+#include <gpac/list.h>
+#include <gpac/scenegraph.h>
+
+#include "../quickjs/quickjs.h"
+
+/********************************************
+
+	Common JS tools
+
+*********************************************/
+
+#ifndef countof
+#define countof(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
+#define JS_CHECK_STRING(_v) (JS_IsString(_v) || JS_IsNull(_v))
+
+struct JSContext *gf_js_create_context();
+void gf_js_delete_context(struct JSContext *);
+#ifdef GPAC_HAS_QJS
+void gf_js_lock(struct JSContext *c, Bool LockIt);
+Bool gf_js_try_lock(struct JSContext *c);
+void gf_js_call_gc(struct JSContext *c);
+#endif /* GPAC_HAS_QJS */
+
+/* throws an error with integer property 'code' set to err*/
+JSValue js_throw_err(JSContext *ctx, s32 err);
+/* 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_dump_error(JSContext *ctx);
+JSValue js_print(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+/********************************************
+
+	SceneGraph JS tools
+
+Note that the generic DOM API is also potentially used by XHR in JSFilter, not only by scenegraph
+
+*********************************************/
+
+#ifndef GPAC_DISABLE_SVG
+
+typedef struct __tag_html_media_script_ctx
+{
+	/*global script context for the scene*/
+	struct JSContext *js_ctx;
+	/*global object*/
+	struct JSObject *global;
+	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
+	struct JSObject *event;
+
+	Bool force_gc;
+} GF_HTMLMediaJS;
+
+#endif	/*GPAC_DISABLE_SVG*/
+
+typedef struct
+{
+	JSClassDef class;
+	JSClassID class_id;
+} GF_JSClass;
+
+
+struct js_handler_context
+{
+	/* JavaScript context in which the listener is applicable */
+	void *ctx;
+	/*function value for handler */
+	JSValue fun_val;
+	/*target EventListener object (this) */
+	JSValue evt_listen_obj;
+};
+
+struct _node_js_binding
+{
+	JSValue obj;
+	struct __gf_js_field *pf;
+	GF_List *fields;
+};
+
+
+void dom_node_changed(GF_Node *n, Bool child_modif, GF_FieldInfo *info);
+void dom_element_finalize(JSRuntime *rt, JSValue obj);
+void dom_document_finalize(JSRuntime *rt, JSValue obj);
+GF_Node *dom_get_element(JSContext *c, JSValue obj);
+GF_SceneGraph *dom_get_doc(JSContext *c, JSValue obj);
+
+#ifndef GPAC_DISABLE_SVG
+JSValue dom_element_construct(JSContext *c, GF_Node *n);
+#endif
+
+/*initialize DOM Core (subset) + xmlHTTPRequest API. The global object MUST have private data storage
+and its private data MUST be a scenegraph. This scenegraph is only used to create new documents
+and setup the callback pointers*/
+void dom_js_load(GF_SceneGraph *scene, struct JSContext *c);
+/*unloads the DOM core support (to be called upon destruction only, once the JSContext has been destroyed
+to releases all resources used by DOM JS)*/
+void dom_js_unload();
+/*unloads DOM core before the JSContext is being destroyed */
+void gf_sg_js_dom_pre_destroy(struct JSRuntime *rt, GF_SceneGraph *sg, GF_Node *script_or_handler_node);
+
+JSValue dom_event_add_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv);
+JSValue dom_event_remove_listener(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv);
+JSValue xml_dom3_not_implemented(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv);
+
+/*dom event listener interface, exported for XHR module*/
+#define JS_DOM3_EVENT_TARGET_INTERFACE	\
+	JS_CFUNC_DEF("addEventListenerNS", 3, dom_event_add_listener),	\
+	JS_CFUNC_DEF("removeEventListenerNS", 3, dom_event_remove_listener),	\
+	JS_CFUNC_DEF("addEventListener", 2, dom_event_add_listener),		\
+	JS_CFUNC_DEF("removeEventListener", 2, dom_event_remove_listener),	\
+	JS_CFUNC_DEF("dispatchEvent", 1, xml_dom3_not_implemented),
+
+/*defines a new global object "evt" of type Event*/
+JSValue dom_js_define_event(struct JSContext *c);
+
+JSValue gf_dom_new_event(struct JSContext *c);
+
+JSValue dom_document_construct_external(JSContext *c, GF_SceneGraph *sg);
+
+/*
+		Script node
+*/
+struct _gf_vrml_script_priv
+{
+	//extra script fields
+	GF_List *fields;
+
+	//BIFS coding stuff
+	u32 numIn, numDef, numOut;
+
+	void (*JS_PreDestroy)(GF_Node *node);
+	void (*JS_EventIn)(GF_Node *node, GF_FieldInfo *in_field);
+
+	Bool is_loaded;
+
+#ifdef GPAC_HAS_QJS
+	struct JSContext *js_ctx;
+	JSValue js_obj;
+	/*all attached JS fields with associated JS objects (eg, not created by the script) are stored here so that we don't
+	allocate them again and again when getting properties. Garbage collection is performed (if needed)
+	on these objects after each eventIn execution*/
+	GF_List *jsf_cache;
+	//Event object, whose private is the pointer to current event being executed
+	JSValue the_event;
+	Bool use_strict;
+
+	/*VRML constructors*/
+	JSValue SFNodeClass;
+#ifndef GPAC_DISABLE_VRML
+	JSValue globalClass;
+	JSValue browserClass;
+	JSValue SFVec2fClass;
+	JSValue SFVec3fClass;
+	JSValue SFRotationClass;
+	JSValue SFColorClass;
+	JSValue SFImageClass;
+	JSValue MFInt32Class;
+	JSValue MFBoolClass;
+	JSValue MFFloatClass;
+	JSValue MFTimeClass;
+	JSValue MFVec2fClass;
+	JSValue MFVec3fClass;
+	JSValue MFRotationClass;
+	JSValue MFColorClass;
+	JSValue MFStringClass;
+	JSValue MFUrlClass;
+	JSValue MFNodeClass;
+	JSValue AnyClass;
+
+	JSValue node_toString_fun;
+	JSValue node_getTime_fun;
+#endif //GPAC_DISABLE_VRML
+
+#ifndef GPAC_DISABLE_SVG
+	JSValue node_addEventListener_fun;
+	JSValue node_removeEventListener_fun;
+#endif //GPAC_DISABLE_SVG
+
+#endif //GPAC_HAS_QJS
+};
+
+/********************************************
+
+	JSFilter tools
+
+*********************************************/
+
+/*provided by JSFilter only*/
+struct __gf_download_manager *jsf_get_download_manager(JSContext *c);
+struct _gf_ft_mgr *jsf_get_font_manager(JSContext *c);
+GF_Err jsf_request_opengl(JSContext *c);
+GF_Err jsf_set_gl_active(JSContext *c);
+GF_Err jsf_get_filter_packet_planes(JSContext *c, JSValue obj, u32 *width, u32 *height, u32 *pf, u32 *stride, u32 *stride_uv, const u8 **data, const u8 **p_u, const u8 **p_v, const u8 **p_a);
+
+Bool jsf_is_packet(JSContext *c, JSValue obj);
+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);
+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);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //SG_QJS_COMMONE

gpac-0.8.0.tar.gz/src/scenegraph/smil_anim.c -> gpac-1.0.0.tar.gz/src/scenegraph/smil_anim.c Changed

@@ -197,8 +197,9 @@
 	if (rai->key_times_count) {
 		Fixed keyTimeBefore = 0, keyTimeAfter=0;
 		for (keyTimeIndex = rai->previous_keytime_index; keyTimeIndex< rai->key_times_count; keyTimeIndex++) {
-			Fixed *tm1, *t = (Fixed *)gf_list_get(*animp->keyTimes, keyTimeIndex);
+			Fixed *t = (Fixed *)gf_list_get(*animp->keyTimes, keyTimeIndex);
 			if (normalized_simple_time < *t) {
+				Fixed *tm1;
 				rai->previous_keytime_index = keyTimeIndex;
 				tm1 = (Fixed *) gf_list_get(*animp->keyTimes, keyTimeIndex-1);
 				if (tm1) keyTimeBefore = *tm1;
@@ -225,12 +226,12 @@
 	}
 
 	if (rai->anim_elt->sgprivate->tag == TAG_SVG_animateMotion && rai->key_points_count) {
-		Fixed *p1, *p2;
+		Fixed *p1;
 		p1 = (Fixed *)gf_list_get(*animp->keyPoints, keyTimeIndex);
 		if (animp->calcMode && *animp->calcMode == SMIL_CALCMODE_DISCRETE) {
 			*interpolation_coefficient = *p1;
 		} else {
-			p2 = (Fixed *)gf_list_get(*animp->keyPoints, keyTimeIndex+1);
+			Fixed *p2 = (Fixed *)gf_list_get(*animp->keyPoints, keyTimeIndex+1);
 			*interpolation_coefficient = gf_mulfix(FIX_ONE - *interpolation_coefficient, *p1)
 			                             + gf_mulfix(*interpolation_coefficient, (p2 ? *p2 : *p1));
 		}
@@ -245,7 +246,7 @@
 static void gf_smil_anim_animate_using_values(SMIL_Anim_RTI *rai, Fixed normalized_simple_time)
 {
 	SMILAnimationAttributesPointers *animp = rai->animp;
-	GF_List *values = NULL;
+	GF_List *values;
 	GF_FieldInfo value_info, value_info_next;
 	u32 keyValueIndex;
 	Fixed interpolation_coefficient;
@@ -627,14 +628,13 @@
 	}
 
 #ifndef GPAC_DISABLE_LOG
-	if (0 && gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
-		char *str;
-		gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
-		str = gf_svg_dump_attribute(rai->anim_elt, &rai->interpolated_value);
+	if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
+		char *str = gf_svg_dump_attribute(rai->anim_elt, &rai->interpolated_value);
 
-		gf_log("[SMIL Animation] Time %f - Animation     %s - Interpolation value changed for attribute %s, new value: %s \n",
+		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_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);
+		       gf_svg_get_attribute_name(rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
+		);
 
 		if (str) gf_free(str);
 	}
@@ -681,7 +681,10 @@
 	if (!animp) return;
 
 	if (rai->path) {
-		if (!rai->last_specified_value.far_ptr) rai->last_specified_value.far_ptr = gf_malloc(sizeof(GF_Matrix2D));
+		if (!rai->last_specified_value.far_ptr) {
+			rai->last_specified_value.far_ptr = gf_malloc(sizeof(GF_Matrix2D));
+			rai->last_specified_value.fieldType = SVG_Matrix2D_datatype;
+		}
 		gf_svg_compute_path_anim(rai, rai->last_specified_value.far_ptr, FIX_ONE);
 		return;
 	} else if (rai->anim_elt->sgprivate->tag == TAG_SVG_set) {
@@ -789,13 +792,11 @@
 
 #ifndef GPAC_DISABLE_LOG
 			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
-				char *str;
-				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
-				str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
-				gf_log("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+				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_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);
-
+				       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
+				);
 				if (str) gf_free(str);
 			}
 #endif
@@ -817,13 +818,12 @@
 			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)) {
-				char *str;
-				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
-				str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
+				char *str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
 
-				gf_log("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+				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_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);
+				       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
+				);
 
 				if (str) gf_free(str);
 			}
@@ -834,10 +834,8 @@
 
 static void gf_smil_anim_animate(SMIL_Timing_RTI *rti, Fixed normalized_simple_time)
 {
+	if (!rti || !rti->rai || !rti->rai->animp) return;
 	SMIL_Anim_RTI *rai = rti->rai;
-	SMILAnimationAttributesPointers *animp = rai->animp;
-
-	if (!rai || !animp) return;
 
 	gf_smil_anim_compute_interpolation_value(rai, normalized_simple_time);
 	gf_smil_anim_apply_accumulate(rai);
@@ -868,10 +866,8 @@
 */
 static void gf_smil_anim_freeze(SMIL_Timing_RTI *rti, Fixed normalized_simple_time)
 {
+	if (!rti || !rti->rai || !rti->rai->animp) return;
 	SMIL_Anim_RTI *rai = rti->rai;
-	SMILAnimationAttributesPointers *animp = rai->animp;
-
-	if (!rai || !animp) return;
 
 	if (rai->change_detection_mode) {
 		if (rai->anim_done == 0)
@@ -914,13 +910,12 @@
 
 #ifndef GPAC_DISABLE_LOG
 		if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
-			char *str;
-			gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
-			str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
+			char *str = gf_svg_dump_attribute((GF_Node*)rai->anim_elt, &rai->owner->presentation_value);
 
-			gf_log("[SMIL Animation] Time %f - Animation     %s - Presentation value changed for attribute %s, new value: %s\n",
+			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_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);
+			       gf_svg_get_attribute_name((GF_Node*)rai->anim_elt, rai->owner->presentation_value.fieldIndex), str)
+			);
 			if (str) gf_free(str);
 		}
 #endif
@@ -928,7 +923,7 @@
 	}
 }
 
-static void gf_smil_anim_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_simple_time, u32 state)
+static void gf_smil_anim_evaluate(SMIL_Timing_RTI *rti, Fixed normalized_simple_time, GF_SGSMILTimingEvalState state)
 {
 	SMIL_Anim_RTI *rai = rti->rai;
 	switch (state) {
@@ -953,6 +948,8 @@
 			case SMIL_TIMING_EVAL_DISCARD:
 				break;
 		*/
+	default:
+		break;
 	}
 }
 /**************************************************************************************
@@ -1040,27 +1037,28 @@
 					active_anim++;
 				}
 			}
-		}
 
-		/* DEBUG: uncomment this line to remove animation effect, and keep animation computation */
+			/* DEBUG: uncomment this line to remove animation effect, and keep animation computation */
 //		gf_svg_attributes_copy(&aa->presentation_value, &aa->specified_value, 0);
 
 #ifndef GPAC_DISABLE_LOG
-		if (aa->presentation_value_changed) {
 			if (gf_log_tool_level_on(GF_LOG_SMIL, GF_LOG_DEBUG)) {
-				char *str;
-				gf_log_lt(GF_LOG_DEBUG, GF_LOG_SMIL);
-				str = gf_svg_dump_attribute(node, &aa->presentation_value);
+				char *str = gf_svg_dump_attribute(node, &aa->presentation_value);
 
-				gf_log("[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_SMIL, ("[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);
+				       gf_svg_get_attribute_name(node, aa->presentation_value.fieldIndex), str, aa->dirty_flags)
+				);
 
 				if (str) gf_free(str);
 			}
-		}
 #endif
 
+		} else {
+			/* DEBUG: uncomment this line to remove animation effect, and keep animation computation */
+//			gf_svg_attributes_copy(&aa->presentation_value, &aa->specified_value, 0);
+		}
+
 		/* we only set dirty flags when a real flag is set to avoid unnecessary computation
 		   for example, it is not necessary to set it when the anim is an animateTransform
 		   since there is no associated flag */
@@ -1261,7 +1259,6 @@
 					GF_Node *used_path = NULL;
 					u32 child_tag = gf_node_get_tag(child->node);
 					if (child_tag == TAG_SVG_mpath) {
-						GF_FieldInfo info;
 						if (gf_node_get_attribute_by_tag(child->node, TAG_XLINK_ATT_href, 0, 0, &info) == GF_OK) {
 							XMLRI *iri = (XMLRI *)info.far_ptr;
 							if (iri->target) used_path = iri->target;
@@ -1356,11 +1353,13 @@
 		gf_svg_delete_attribute_value(rai->last_specified_value.fieldType,
 		                              rai->last_specified_value.far_ptr,
 		                              rai->anim_elt->sgprivate->scenegraph);
-	}
 #if USE_GF_PATH
 #else
-	if (rai->path) gf_path_del(rai->path);
+		if (rai->path) gf_path_del(rai->path);
 #endif
+
+	}
+
 	if (rai->path_iterator) gf_path_iterator_del(rai->path_iterator);
 	gf_free(rai);
 }
@@ -1435,7 +1434,7 @@
 
 void gf_smil_anim_init_node(GF_Node *node)
 {
-	XLinkAttributesPointers *xlinkp = NULL;
+	XLinkAttributesPointers *xlinkp;
 	SMILAnimationAttributesPointers *animp = NULL;
 	SVGAllAttributes all_atts;
 	SVGTimedAnimBaseElement *e = (SVGTimedAnimBaseElement *)node;

gpac-0.8.0.tar.gz/src/scenegraph/smil_timing.c -> gpac-1.0.0.tar.gz/src/scenegraph/smil_timing.c Changed

@@ -28,7 +28,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 
-static void gf_smil_timing_null_timed_function(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, u32 state)
+static void gf_smil_timing_null_timed_function(SMIL_Timing_RTI *rti, Fixed normalized_scene_time, GF_SGSMILTimingEvalState state)
 {
 }
 
@@ -224,7 +224,7 @@
 
 	/* this is the first time we check the interval */
 	gf_smil_timing_get_interval_end(rti, rti->current_interval);
-	if (0 && rti->current_interval->end == -2) {
+	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)));
@@ -319,7 +319,7 @@
 {
 	GF_SceneGraph *sg;
 	SMIL_Timing_RTI *rti;
-	SMILTimingAttributesPointers *timingp = NULL;
+	SMILTimingAttributesPointers *timingp;
 	u32 tag = gf_node_get_tag(timed_elt);
 	SVGAllAttributes all_atts;
 	SVGTimedAnimBaseElement *e = (SVGTimedAnimBaseElement *)timed_elt;
@@ -440,18 +440,11 @@
 GF_EXPORT
 Bool gf_smil_timing_is_active(GF_Node *node)
 {
-	SMILTimingAttributesPointers *timingp = NULL;
-	timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
+	SMILTimingAttributesPointers *timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
 	if (!timingp || !timingp->runtime) return 0;
 	return (timingp->runtime->status == SMIL_STATUS_ACTIVE);
 }
 
-/* This function notifies the scene time to all the timed elements from the list in the given scene graph.
-   It returns the number of active timed elements. If no timed element is active, this means that from the timing
-   point of view, the scene has not changed and no rendering refresh is needed, even if the time has changed.
-   It uses an additional list of modified timed elements to insure that no timing
-   element was modified by the begin/end/repeat of another timed element.
-*/
 Bool gf_smil_notify_timed_elements(GF_SceneGraph *sg)
 {
 	SMIL_Timing_RTI *rti;
@@ -908,10 +901,8 @@
 /* This function is called when a modification to the node has been made (scripts, updates or events ...) */
 void gf_smil_timing_modified(GF_Node *node, GF_FieldInfo *field)
 {
-	SMILTimingAttributesPointers *timingp = NULL;
 	SMIL_Timing_RTI *rti;
-
-	timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
+	SMILTimingAttributesPointers *timingp = ((SVGTimedAnimBaseElement *)node)->timingp;
 
 	if (!timingp) return;
 	rti = timingp->runtime;
@@ -923,7 +914,7 @@
 	} else {
 		/* we don't have the right to modify the end of an element if it's not in unresolved state */
 		if (rti->current_interval->end == -1) gf_smil_timing_get_interval_end(rti, rti->current_interval);
-		if (0 && rti->current_interval->end == -2) {
+		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)));
@@ -992,10 +983,6 @@
 	return 1;
 }
 
-/* Inserts a new resolved time instant in the begin or end attribute.
-   The insertion preserves the sorting and removes the previous insertions
-    which have become obsolete
-   WARNING: Only used for inserting time when an <a> element, whose target is a timed element, is activated. */
 GF_EXPORT
 void gf_smil_timing_insert_clock(GF_Node *elt, Bool is_end, Double clock)
 {
@@ -1056,8 +1043,7 @@
 	}
 }
 
-void gf_smil_set_evaluation_callback(GF_Node *node,
-                                     void (*smil_evaluate)(struct _smil_timing_rti *rti, Fixed normalized_simple_time, u32 state))
+void gf_smil_set_evaluation_callback(GF_Node *node, gf_sg_smil_evaluate smil_evaluate)
 {
 	if (node && ((SVGTimedAnimBaseElement *)node)->timingp  && ((SVGTimedAnimBaseElement *)node)->timingp->runtime) {
 		SMIL_Timing_RTI *rti = ((SVGTimedAnimBaseElement *)node)->timingp->runtime;
@@ -1072,7 +1058,7 @@
 
 Double gf_smil_get_media_duration(SMIL_Timing_RTI *rti)
 {
-	return rti->media_duration;
+	return rti ? rti->media_duration : 0.0;
 }

gpac-0.8.0.tar.gz/src/scenegraph/svg_attributes.c -> gpac-1.0.0.tar.gz/src/scenegraph/svg_attributes.c Changed

@@ -502,7 +502,10 @@
 	{ GF_KEY_INFO, "Info" },
 	{ GF_KEY_EPG, "EPG" },
 	{ GF_KEY_RECORD, "Record" },
-	{ GF_KEY_BEGINPAGE, "BeginPage" }
+	{ GF_KEY_BEGINPAGE, "BeginPage" },
+
+	{ GF_KEY_CELL_SOFT1, "CELLSOFT1" },
+	{ GF_KEY_CELL_SOFT2, "CELLSOFT2" },
 };
 
 
@@ -974,7 +977,7 @@
 		u32 hours, minutes;
 		u32 nhours, nminutes;
 		Float seconds;
-		char *tmp1, *tmp2;
+		char *tmp1;
 
 		v->type = GF_SMIL_TIME_WALLCLOCK;
 		tmp += 10;
@@ -985,7 +988,7 @@
 			tmp = tmp1;
 		}
 		if ((tmp1 = strchr(tmp, ':')) ) {
-			if ((tmp2 = strchr(tmp1, ':')) ) {
+			if (strchr(tmp1, ':')) {
 				/* HHMMSS */
 				sscanf(tmp, "%u:%u:%f", &hours, &minutes, &seconds);
 			} else {
@@ -1340,7 +1343,7 @@
 	if ((str = strstr(attribute_content, "ref"))) {
 		t->is_ref = 1;
 		gf_mx2d_init(t->mat);
-		str+=2;
+		str+=3;
 		while (str[i] == ' ') i++;
 		if (str[i] == '(') {
 			i++;
@@ -1351,7 +1354,7 @@
 				if (str[i] == ',') {
 					i++;
 				} else if (str[i] == ')') {
-					i++;
+					//i++;
 					return GF_OK;
 				}
 				read_chars = svg_parse_number(&(str[i]), &(t->mat.m[2]), 0);
@@ -1370,8 +1373,9 @@
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Unsupported syntax for ref transform attribute"));
 			}
 			while (str[i] == ' ') i++;
-			if (str[i] == ')') i++;
-			else {
+			if (str[i] == ')') {
+				//i++;
+			} else {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Missing closing parenthesis in transform attribute: %s\n", attribute_content));
 			}
 			return GF_OK;
@@ -1727,6 +1731,7 @@
 		char c, prev_c = 'M';
 #ifdef REMOVE_ALLOC
 		GF_SAFEALLOC(pt, SVG_Point)
+		if (!pt) return;
 #endif
 		i = 0;
 		cur_pt.x = cur_pt.y = 0;
@@ -1742,10 +1747,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_M;
 
 				GF_SAFEALLOC(pt, SVG_Point)
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1764,10 +1771,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_L;
 
 				GF_SAFEALLOC(pt, SVG_Point)
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1785,10 +1794,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_L;
 
 				GF_SAFEALLOC(pt, SVG_Point)
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1804,10 +1815,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_L;
 
 				GF_SAFEALLOC(pt, SVG_Point)
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->y), 0);
@@ -1823,6 +1836,7 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_C;
 #endif
@@ -1830,6 +1844,7 @@
 				for (k=0; k<3; k++) {
 #ifndef REMOVE_ALLOC
 					GF_SAFEALLOC(pt, SVG_Point)
+					if (!pt) return;
 					gf_list_add(d_points, pt);
 #endif
 					i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1848,6 +1863,7 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_S;
 #endif
@@ -1855,6 +1871,7 @@
 				for (k=0; k<2; k++) {
 #ifndef REMOVE_ALLOC
 					GF_SAFEALLOC(pt, SVG_Point)
+					if (!pt) return;
 					gf_list_add(d_points, pt);
 #endif
 					i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1873,6 +1890,7 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_Q;
 #endif
@@ -1880,6 +1898,7 @@
 				for (k=0; k<2; k++) {
 #ifndef REMOVE_ALLOC
 					GF_SAFEALLOC(pt, SVG_Point)
+					if (!pt) return;
 					gf_list_add(d_points, pt);
 #endif
 					i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1898,10 +1917,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_T;
 
 				GF_SAFEALLOC(pt, SVG_Point)
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1921,10 +1942,12 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_A;
 
-				GF_SAFEALLOC(pt, SVG_Point)
+				pt = gf_malloc(sizeof(SVG_Point));
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1935,7 +1958,8 @@
 				i += svg_parse_number(&(d[i]), &(tmp), 0);
 
 #ifndef REMOVE_ALLOC
-				GF_SAFEALLOC(pt, SVG_Point)
+				pt = gf_malloc(sizeof(SVG_Point));
+				if (!pt) return;
 				gf_list_add(d_points, pt);
 #endif
 				i += svg_parse_number(&(d[i]), &(pt->x), 0);
@@ -1954,6 +1978,7 @@
 				i++;
 #ifndef REMOVE_ALLOC
 				GF_SAFEALLOC(command, u8)
+				if (!command) return;
 				gf_list_add(d_commands, command);
 				*command = SVG_PATHCOMMAND_Z;
 #endif
@@ -2445,10 +2470,12 @@
 		if (tmp) len = (u32) (tmp-str);
 		else len = (u32) strlen(str);
 		memcpy(value_string, str, len);
-		while (value_string[len - 1] == ' ' && len > 0) len--;
+		while ((len > 0) && (value_string[len - 1] == ' '))
+			len--;
 		value_string[len] = 0;
 
 		GF_SAFEALLOC(value, SMIL_Time)
+		if (!value) break;
 		gf_list_add(values, value);
 
 		if (smil_parse_time(e, value, value_string) != GF_OK) goto err;
@@ -2461,14 +2488,14 @@
 
 	/* sorting timing values */
 	if (gf_list_count(values) > 1) {
-		SMIL_Time *v, *sv;
+		SMIL_Time *sv;
 		GF_List *sorted = gf_list_new();
 		u32 i, count;
-		u8 added = 0;
 		do {
-			v = (SMIL_Time*)gf_list_get(values, 0);
+			u8 added = 0;
+			SMIL_Time *v = (SMIL_Time*)gf_list_get(values, 0);
 			gf_list_rem(values, 0);
-			added = 0;
+
 			count = gf_list_count(sorted);
 			for (i=0; i<count; i++) {
 				sv = (SMIL_Time*)gf_list_get(sorted, i);
@@ -2695,6 +2722,7 @@
 	while (i < len) {
 		u32 sub;
 		GF_SAFEALLOC(c, SVG_Coordinate)
+		if (!c) break;
 		sub = svg_parse_length(c, &(str[i]), 0);
 		if (!sub) {
 			gf_free(c);
@@ -2739,6 +2767,7 @@
 	while (i < len) {
 		SVG_Point *p;
 		GF_SAFEALLOC(p, SVG_Point)
+		if (!p) break;
 		j = svg_parse_point(p, &str[i]);
 		if (j == 0) {
 			/* cf. http://www.w3.org/TR/SVGMobile12/shapes.html#PolygonElement
@@ -2766,6 +2795,7 @@
 	while (i < len) {
 		Fixed *f;
 		GF_SAFEALLOC(f, Fixed)
+		if (!f) break;
 		read_chars = svg_parse_number(&(str[i]), f, is_angle);
 		if (!read_chars) {
 			gf_free(f);
@@ -2838,6 +2868,7 @@
 		while (i < len) {
 			SVG_Length *f;
 			GF_SAFEALLOC(f, SVG_Length)
+			if (!f) break;
 			read_chars = svg_parse_length(f, &(str[i]), 0);
 			if (!read_chars) {
 				gf_free(f);
@@ -3573,7 +3604,8 @@
 	{
 		GF_Matrix2D *p;
 		GF_SAFEALLOC(p, GF_Matrix2D)
-		gf_mx2d_init(*p);
+		if (p)
+			gf_mx2d_init(*p);
 		return p;
 	}
 	break;
@@ -3582,7 +3614,8 @@
 	{
 		SVG_Transform *p;
 		GF_SAFEALLOC(p, SVG_Transform)
-		gf_mx2d_init(p->mat);
+		if (p)
+			gf_mx2d_init(p->mat);
 		return p;
 	}
 	break;
@@ -3848,9 +3881,8 @@
 
 static char *svg_dump_idref(XMLRI*iri)
 {
-	const char *name;
 	if (iri->target) {
-		name = gf_node_get_name((GF_Node *)iri->target);
+		const char *name = gf_node_get_name((GF_Node *)iri->target);
 		if (name) return gf_strdup(name);
 		else {
 			char tmp[50];
@@ -3887,8 +3919,8 @@
 			} else if (path->tags[i]==GF_PATH_CLOSE) {
 				sprintf(szT, "z");
 			} else {
-				if (i && (last_pt.x==pt->x)) sprintf(szT, "V%g", _FIX2FLT(pt->y));
-				else if (i && (last_pt.y==pt->y)) sprintf(szT, "H%g", _FIX2FLT(pt->x));
+				if (last_pt.x==pt->x) sprintf(szT, "V%g", _FIX2FLT(pt->y));
+				else if (last_pt.y==pt->y) sprintf(szT, "H%g", _FIX2FLT(pt->x));
 				else sprintf(szT, "L%g %g", _FIX2FLT(pt->x), _FIX2FLT(pt->y));
 			}
 			last_pt = *pt;
@@ -4118,10 +4150,10 @@
 		if (paint->type == SVG_PAINT_NONE) return gf_strdup("none");
 		else if (paint->type == SVG_PAINT_INHERIT) return gf_strdup("inherit");
 		else if (paint->type == SVG_PAINT_URI) {
-			char *tmp = svg_dump_iri(&paint->iri);
-			char *res = gf_malloc(sizeof(char)*(strlen(tmp)+6));
-			sprintf(res, "url(%s)", tmp);
-			gf_free(tmp);
+			char *iritmp = svg_dump_iri(&paint->iri);
+			char *res = gf_malloc(sizeof(char)*(strlen(iritmp)+6));
+			sprintf(res, "url(%s)", iritmp);
+			gf_free(iritmp);
 			return res;
 		} else {
 			return svg_dump_color(&paint->color);
@@ -4859,7 +4891,7 @@
 	case SVG_Points_datatype:
 	{
 #if DUMP_COORDINATES
-		SVG_Point *p = (SVG_Point *)info->far_ptr;
+		SVG_Point *p = (SVG_Point *)gf_list_get(*(GF_List **)info->far_ptr, 0);
 		sprintf(tmp, "%g %g", _FIX2FLT(p->x), _FIX2FLT(p->y));
 		return gf_strdup(tmp);
 #endif
@@ -4869,7 +4901,7 @@
 	case SMIL_KeyTimes_datatype:
 	case SMIL_KeySplines_datatype:
 	{
-		Fixed *p = (Fixed *)info->far_ptr;
+		Fixed *p = (Fixed *)gf_list_get(*(GF_List **)info->far_ptr, 0);
 		sprintf(tmp, "%g", _FIX2FLT(*p));
 		return gf_strdup(tmp);
 	}
@@ -4896,7 +4928,7 @@
 	break;
 	case SMIL_Times_datatype:
 	{
-		SMIL_Time *t = (SMIL_Time *)info->far_ptr;
+		SMIL_Time *t = (SMIL_Time *)gf_list_get(*(GF_List **)info->far_ptr, 0);
 		if (t->type == GF_SMIL_TIME_CLOCK) {
 			sprintf(tmp, "%gs", t->clock);
 		} else if (t->type==GF_SMIL_TIME_INDEFINITE) {
@@ -5099,9 +5131,9 @@
 	{
 		SVG_PathData *d1 = (SVG_PathData *)f1->far_ptr;
 		SVG_PathData *d2 = (SVG_PathData *)f2->far_ptr;
+#if USE_GF_PATH
 		u32 i;
 		/*FIXME - be less lazy..*/
-#if USE_GF_PATH
 		if (d1->n_points != d2->n_points) return 0;
 		if (d1->n_contours != d2->n_contours) return 0;
 		for (i=0; i<d1->n_points; i++) {
@@ -5167,9 +5199,9 @@
 	}
 	case SVG_ViewBox_datatype:
 	{
-		SVG_ViewBox *v1 = (SVG_ViewBox *)f1->far_ptr;
-		SVG_ViewBox *v2 = (SVG_ViewBox *)f2->far_ptr;
-		return svg_viewbox_equal(v1, v2);
+		SVG_ViewBox *vb1 = (SVG_ViewBox *)f1->far_ptr;
+		SVG_ViewBox *vb2 = (SVG_ViewBox *)f2->far_ptr;
+		return svg_viewbox_equal(vb1, vb2);
 	}
 	case SVG_StrokeDashArray_datatype:
 	{
@@ -5456,6 +5488,7 @@
 		SVG_Point *pta = (SVG_Point *)gf_list_get(*a, i);
 		SVG_Point *ptb = (SVG_Point *)gf_list_get(*b, i);
 		GF_SAFEALLOC(ptc, SVG_Point)
+		if (!ptc) break;
 		svg_point_muladd(alpha, pta, beta, ptb, ptc);
 		gf_list_add(*c, ptc);
 	}
@@ -5479,10 +5512,7 @@
 		SVG_Point *ptb = (SVG_Point *)gf_list_get(*b, i);
 		SVG_Point *pta;
 		GF_SAFEALLOC(pta, SVG_Point)
-		if (!pta) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Cannot allocate SVG point\n"));
-			continue;
-		}
+		if (!pta) return GF_OUT_OF_MEM;
 		*pta = *ptb;
 		gf_list_add(*a, pta);
 	}
@@ -5503,6 +5533,7 @@
 		SVG_Number *na = (SVG_Number *)gf_list_get(*a, i);
 		SVG_Number *nb = (SVG_Number *)gf_list_get(*b, i);
 		GF_SAFEALLOC(nc, SVG_Number)
+		if (!nc) return GF_OUT_OF_MEM;
 		svg_number_muladd(alpha, na, beta, nb, nc);
 		gf_list_add(*c, nc);
 	}
@@ -5524,10 +5555,7 @@
 	for (i = 0; i < count; i ++) {
 		SVG_Number *na;
 		GF_SAFEALLOC(na, SVG_Number)
-		if (!na) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Cannot allocate SVG number\n"));
-			continue;
-		}
+		if (!na) return GF_OUT_OF_MEM;
 		*na = *(SVG_Number *)gf_list_get(*b, i);
 		gf_list_add(*a, na);
 	}
@@ -5581,6 +5609,7 @@
 	for (i = 0; i < count; i ++) {
 		SVG_Point *pta;
 		GF_SAFEALLOC(pta, SVG_Point)
+		if (!pta) break;
 		*pta = *(SVG_Point *)gf_list_get(b->points, i);
 		gf_list_add(a->points, pta);
 	}
@@ -5644,6 +5673,7 @@
 		SVG_Point *ptb = (SVG_Point *)gf_list_get(b->points, i);
 		SVG_Point *ptc;
 		GF_SAFEALLOC(ptc, SVG_Point)
+		if (!ptc) break;
 		svg_point_muladd(alpha, pta, beta, ptb, ptc);
 		gf_list_add(c->points, ptc);
 	}
@@ -6369,9 +6399,7 @@
 	return 0;
 }
 
-
-
-char *gf_svg_attribute_type_to_string(u32 att_type)
+const char *gf_svg_attribute_type_to_string(u32 att_type)
 {
 	switch (att_type) {
 	case SVG_FillRule_datatype:

gpac-1.0.0.tar.gz/src/scenegraph/svg_js.c Added

@@ -0,0 +1,2754 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2005-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
+
+#ifndef GPAC_DISABLE_SVG
+#include <gpac/events.h>
+#include <gpac/nodes_svg.h>
+
+
+#ifdef GPAC_HAS_QJS
+
+#ifdef GPAC_CONFIG_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif
+#endif
+
+#include "qjs_common.h"
+
+#define JSVAL_CHECK_STRING(_v) (JS_IsString(_v) || JS_IsNull(_v))
+
+
+/*SVG uDOM classes*/
+GF_JSClass svgElement;
+GF_JSClass svgDocument;
+GF_JSClass svg_globalClass;
+GF_JSClass connectionClass;
+GF_JSClass rgbClass;
+GF_JSClass rectClass;
+GF_JSClass pointClass;
+GF_JSClass pathClass;
+GF_JSClass matrixClass;
+
+typedef struct
+{
+	JSValue proto;
+	JSValue ctor;
+} SVG_JSClass;
+
+
+typedef struct __tag_svg_script_ctx
+{
+	Bool (*script_execute)(struct __tag_scene_graph *sg, char *utf8_script, GF_DOM_Event *event);
+	Bool (*handler_execute)(GF_Node *n, GF_DOM_Event *event, GF_Node *observer, char *utf8_script);
+	u32 nb_scripts;
+	/*global script context for the scene*/
+	JSContext *js_ctx;
+	/*global object*/
+	JSValue global;
+	/*global event object - used to update the associated DOMEvent (JS private stack) when dispatching events*/
+	JSValue event;
+
+	Bool in_script;
+	Bool force_gc;
+	Bool use_strict;
+
+	/*SVG uDOM classes*/
+	SVG_JSClass svgElement;
+	SVG_JSClass svgDocument;
+	SVG_JSClass svg_globalClass;
+	SVG_JSClass connectionClass;
+	SVG_JSClass rgbClass;
+	SVG_JSClass rectClass;
+	SVG_JSClass pointClass;
+	SVG_JSClass pathClass;
+	SVG_JSClass matrixClass;
+} GF_SVGJS;
+
+void svg_mark_gc(struct __tag_svg_script_ctx *svg_js)
+{
+	if (svg_js)
+		svg_js->force_gc = 1;
+}
+
+void svg_free_node_binding(struct __tag_svg_script_ctx *svg_js, GF_Node *node)
+{
+	struct _node_js_binding *js_binding = node->sgprivate->interact->js_binding;
+	if (!JS_IsUndefined(js_binding->obj)) {
+		JS_SetOpaque(js_binding->obj, NULL);
+		JS_FreeValue(svg_js->js_ctx, js_binding->obj);
+		js_binding->obj = JS_UNDEFINED;
+		//unregister after destroying JS obj since this is a recursive call and we trigger the GC, we must make sure
+		//all JS opaque is NULL before destroying the node
+		gf_node_unregister(node, NULL);
+	}
+
+	if (svg_js->in_script)
+		svg_js->force_gc = 1;
+	else
+		gf_js_call_gc(svg_js->js_ctx);
+}
+
+GF_Err svg_exec_script(struct __tag_svg_script_ctx *svg_js, GF_SceneGraph *sg, const char *com)
+{
+	Bool ret = sg->svg_js->script_execute(sg, (char *)com, NULL);
+	return (ret == GF_TRUE ? GF_OK : GF_BAD_PARAM);
+}
+
+void svgjs_handler_execute(struct __tag_svg_script_ctx *svg_js, GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer, const char *iri)
+{
+	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;
+	}
+}
+static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script);
+
+void dom_node_set_textContent(GF_Node *n, char *text);
+
+JSValue dom_node_get_sibling(JSContext *c, GF_Node *n, Bool is_prev, Bool elt_only);
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+void html_media_init_js_api(GF_SceneGraph *scene);
+#endif
+
+#define _ScriptMessage(_sg, _msg) {\
+			GF_JSAPIParam par;	\
+			par.info.e = GF_SCRIPT_INFO;			\
+			par.info.msg = _msg;		\
+			_sg->script_action(_sg->script_action_cbck, GF_JSAPI_OP_MESSAGE, NULL, &par);\
+		}
+
+static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
+{
+	if (scene->script_action)
+		return scene->script_action(scene->script_action_cbck, type, node, param);
+	return GF_FALSE;
+}
+
+static JSValue svg_new_path_object(JSContext *c, SVG_PathData *d);
+
+
+
+/*note we are using float to avoid conversions fixed to/from JS native */
+typedef struct
+{
+	u32 r, g, b;
+} rgbCI;
+
+
+typedef struct
+{
+	Float x, y, w, h;
+	/*if set, this is the svg.viewport uDOM object, its values are updated upon query*/
+	GF_SceneGraph *sg;
+} rectCI;
+
+typedef struct
+{
+	Float x, y;
+	/*if set, this is the svg.currentTranslate uDOM object, its values are updated upon query*/
+	GF_SceneGraph *sg;
+} pointCI;
+
+typedef struct
+{
+	Float x, y;
+} ptCI;
+
+typedef struct
+{
+	u32 nb_coms;
+	u8 *tags;
+	ptCI *pts;
+} pathCI;
+
+static JSValue svg_nav_to_location(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_SceneGraph *sg = JS_GetOpaque(obj, svg_globalClass.class_id);
+	if ((argc!=1) || !sg)
+		return JS_EXCEPTION;
+
+	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);
+	return JS_UNDEFINED;
+}
+
+GF_Node *gf_sm_load_svg_from_string(GF_SceneGraph *sg, char *svg_str);
+static JSValue svg_parse_xml(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_SceneGraph *sg;
+	GF_Node *node;
+	const char *str;
+
+	if (!JS_IsObject(argv[1])) {
+		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);
+	return dom_element_construct(c, node);
+}
+
+static void svg_define_udom_exception(JSContext *c, JSValue global)
+{
+	JSValue obj = JS_NewObject(c);
+	JS_SetPropertyStr(c, global, "GlobalException", obj);
+#define DEFCONST(_name, _code)\
+		JS_SetPropertyStr(c, obj, _name, JS_NewInt32(c, _code));
+
+	DEFCONST("NOT_CONNECTED_ERR", 1)
+	DEFCONST("ENCODING_ERR", 2)
+	DEFCONST("DENIED_ERR", 3)
+	DEFCONST("UNKNOWN_ERR", 4)
+
+	obj = JS_NewObject(c);
+	JS_SetPropertyStr(c, global, "SVGException", obj);
+	DEFCONST("SVG_WRONG_TYPE_ERR", 0)
+	DEFCONST("SVG_INVALID_VALUE_ERR", 1)
+	DEFCONST("SVG_MATRIX_NOT_INVERTABLE", 2)
+
+	obj = JS_NewObject(c);
+	JS_SetPropertyStr(c, global, "SVGSVGElement", obj);
+	DEFCONST("NAV_AUTO", 1)
+	DEFCONST("NAV_NEXT", 2)
+	DEFCONST("NAV_PREV", 3)
+	DEFCONST("NAV_UP", 4)
+	DEFCONST("NAV_UP_RIGHT", 5)
+	DEFCONST("NAV_RIGHT", 6)
+	DEFCONST("NAV_DOWN_RIGHT", 7)
+	DEFCONST("NAV_DOWN", 8)
+	DEFCONST("NAV_DOWN_LEFT", 9)
+	DEFCONST("NAV_LEFT", 10)
+	DEFCONST("NAV_UP_LEFT", 11)
+}
+
+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;
+
+	switch (magic) {
+	/*namespaceURI*/
+	case 0:
+		return JS_NULL;
+	/*parent*/
+	case 1:
+		if (sg->parent_scene && sg->parent_scene->svg_js)
+			return JS_DupValue(c, sg->parent_scene->svg_js->global);
+		return JS_NULL;
+	default:
+		return JS_UNDEFINED;
+	}
+}
+
+/*TODO - try to be more precise...*/
+static JSValue dom_imp_has_feature(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	JSValue ret = JS_FALSE;
+
+	if (argc) {
+		u32 len;
+		char sep;
+		char *fname = (char *) JS_ToCString(c, argv[0]);
+		if (!fname) return JS_TRUE;
+		while (strchr(" \t\n\r", fname[0])) fname++;
+		len = (u32) strlen(fname);
+		while (len && strchr(" \t\n\r", fname[len-1])) len--;
+		sep = fname[len];
+		fname[len] = 0;
+		if (!stricmp(fname, "xml")) ret = JS_TRUE;
+		else if (!stricmp(fname, "core")) ret = JS_TRUE;
+		else if (!stricmp(fname, "traversal")) ret = JS_TRUE;
+		else if (!stricmp(fname, "uievents")) ret = JS_TRUE;
+		else if (!stricmp(fname, "mouseevents")) ret = JS_TRUE;
+		else if (!stricmp(fname, "mutationevents")) ret = JS_TRUE;
+		else if (!stricmp(fname, "events")) ret = JS_TRUE;
+
+		fname[len] = sep;
+		JS_FreeCString(c, fname);
+	}
+	return ret;
+}
+
+static GF_Node *get_corresponding_use(GF_Node *n)
+{
+	u32 i, count;
+	if (!n || !n->sgprivate->scenegraph->use_stack) return NULL;
+
+	/*find current node in the use stack - if found, return the use element*/
+	count = gf_list_count(n->sgprivate->scenegraph->use_stack);
+	for (i=count; i>0; i-=2) {
+		GF_Node *t = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-2);
+		if (t==n) {
+			GF_Node *use = (GF_Node *)gf_list_get(n->sgprivate->scenegraph->use_stack, i-1);
+			GF_Node *par_use = get_corresponding_use(use);
+			return par_use ? par_use : use;
+		}
+	}
+	/*otherwise recursively get up the tree*/
+	return get_corresponding_use(gf_node_get_parent(n, 0));
+}
+
+static JSValue svg_doc_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_SceneGraph *sg = dom_get_doc(c, obj);
+	if (!sg) return JS_EXCEPTION;
+	switch (magic) {
+	case 0:/*global*/
+		return JS_GetGlobalObject(c);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue svg_element_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	GF_JSAPIParam par;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_TRUE;
+
+	switch (magic) {
+	case 0: /*id*/
+	{
+		const char *node_name = gf_node_get_name((GF_Node*)n);
+		if (node_name) {
+			return JS_NewString(c, node_name);
+		}
+		return JS_NULL;
+	}
+	case 5:/*currentScale*/
+		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_SCALE, (GF_Node *)n, &par)) {
+			return JS_NewFloat64(c, FIX2FLT(par.val) );
+		}
+		return JS_EXCEPTION;
+	case 6:/*currentRotate*/
+		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_ROTATION, (GF_Node *)n, &par)) {
+			return JS_NewFloat64(c, FIX2FLT(par.val) );
+		}
+		return JS_EXCEPTION;
+	case 7:/*currentTranslate*/
+		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		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));
+			rc->x = FIX2FLT(par.pt.x);
+			rc->y = FIX2FLT(par.pt.y);
+			rc->sg = n->sgprivate->scenegraph;
+			JS_SetOpaque(r, rc);
+			return r;
+		}
+		return JS_EXCEPTION;
+	case 8:/*viewport*/
+		if (n->sgprivate->tag!=TAG_SVG_svg) return JS_EXCEPTION;
+		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));
+			rc->x = FIX2FLT(par.rc.x);
+			rc->y = FIX2FLT(par.rc.y);
+			rc->w = FIX2FLT(par.rc.width);
+			rc->h = FIX2FLT(par.rc.height);
+			rc->sg = n->sgprivate->scenegraph;
+			JS_SetOpaque(r, rc);
+			return r;
+		}
+		return JS_EXCEPTION;
+	case 9:/*currentTime*/
+		return JS_NewFloat64(c, gf_node_get_scene_time((GF_Node *)n) );
+	case 10:/*isPaused*/
+		return JS_FALSE;
+	case 11:/*ownerSVGElement*/
+		while (1) {
+			GF_Node *n_par = gf_node_get_parent(n, 0);
+			if (!n_par) return JS_TRUE;
+			if (n_par->sgprivate->tag==TAG_SVG_svg) {
+				return dom_element_construct(c, n_par);
+			}
+			n = n_par;
+		}
+		return JS_NULL;
+	case 12:/*correspondingElement*/
+		/*if we can find a corresponding element for this node, then this is an SVGElementInstance*/
+		if (get_corresponding_use(n)) {
+			return dom_element_construct(c, n);
+		} else {
+			return dom_element_construct(c, NULL);
+		}
+		break;
+	case 13:/*correspondingUseElement*/
+		return dom_element_construct(c, get_corresponding_use(n));
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue svg_element_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	GF_JSAPIParam par;
+	Double d;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	switch (magic) {
+	case 0:/*id*/
+		if (JSVAL_CHECK_STRING(value)) {
+			const char *id = JS_ToCString(c, value);
+			if (id) {
+				GF_FieldInfo info;
+				u32 nid = gf_node_get_id(n);
+				if (!nid) nid = gf_sg_get_next_available_node_id(n->sgprivate->scenegraph);
+				gf_node_set_id(n, nid, id);
+				if (gf_node_get_attribute_by_tag(n, TAG_XML_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+					if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
+					*(DOM_String *)info.far_ptr = gf_strdup(id);
+				}
+				if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_id, GF_TRUE, GF_FALSE, &info)==GF_OK) {
+					if (*(DOM_String *)info.far_ptr) gf_free(*(DOM_String *)info.far_ptr);
+					*(DOM_String *)info.far_ptr = gf_strdup(id);
+				}
+				JS_FreeCString(c, id);
+			}
+		}
+		return JS_TRUE;
+		/*currentScale*/
+	case 5:
+		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
+			return JS_EXCEPTION;
+
+		par.val = FLT2FIX(d);
+		if (!par.val) {
+			return js_throw_err(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_SCALE, (GF_Node *)n, &par)) {
+			return JS_TRUE;
+		}
+		return JS_FALSE;
+		/*currentRotate*/
+	case 6:
+		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
+			return JS_EXCEPTION;
+
+		par.val = FLT2FIX(d);
+		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_ROTATION, (GF_Node *)n, &par)) {
+			return JS_TRUE;
+		}
+		return JS_FALSE;
+		/*currentTime*/
+	case 9:
+		if ((n->sgprivate->tag!=TAG_SVG_svg) || JS_ToFloat64(c, &d, value))
+			return JS_EXCEPTION;
+
+		par.time = d;
+		if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par)) {
+			return JS_TRUE;
+		}
+		return JS_FALSE;
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static GF_Node *svg_udom_smil_check_instance(JSContext *c, JSValue obj)
+{
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return NULL;
+	switch (n->sgprivate->tag) {
+	case TAG_SVG_animate:
+	case TAG_SVG_animateColor:
+	case TAG_SVG_animateMotion:
+	case TAG_SVG_animateTransform:
+	case TAG_SVG_animation:
+	case TAG_SVG_audio:
+	case TAG_SVG_video:
+	case TAG_SVG_set:
+	case TAG_LSR_updates:
+	/*not sure about this one...*/
+	case TAG_SVG_discard:
+		return n;
+	}
+	return NULL;
+}
+
+
+/*TODO*/
+static JSValue svg_udom_smil_time_insert(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool is_end)
+{
+	GF_FieldInfo info;
+	u32 i, count;
+	Double offset;
+	GF_List *times;
+	SMIL_Time *newtime;
+
+	GF_Node *n = svg_udom_smil_check_instance(c, obj);
+	if (!n) return JS_UNDEFINED;
+
+	if (is_end) {
+		info.far_ptr = ((SVGTimedAnimBaseElement *)n)->timingp->end;
+	} else {
+		info.far_ptr = ((SVGTimedAnimBaseElement *)n)->timingp->begin;
+	}
+	if (!info.far_ptr) {
+		return JS_EXCEPTION;
+	}
+	times = *((GF_List **)info.far_ptr);
+	GF_SAFEALLOC(newtime, SMIL_Time);
+	if (!newtime) {
+		return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+	}
+	newtime->type = GF_SMIL_TIME_EVENT_RESOLVED;
+
+	offset = 0;
+	if (argc)
+		JS_ToFloat64(c, &offset, argv[0]);
+
+	newtime->clock = gf_node_get_scene_time(n) + offset;
+
+	/*insert in sorted order*/
+	count = gf_list_count(times);
+	for (i=0; i<count; i++) {
+		SMIL_Time*t = (SMIL_Time*)gf_list_get(times, i);
+		if ( GF_SMIL_TIME_IS_CLOCK(t->type) ) {
+			if (t->clock > newtime->clock) break;
+		} else {
+			break;
+		}
+	}
+	gf_list_insert(times, newtime, i);
+
+	info.fieldType = SMIL_Times_datatype;
+	gf_node_changed(n, &info);
+	return JS_TRUE;
+}
+
+static JSValue svg_udom_smil_begin(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return svg_udom_smil_time_insert(c, obj, argc, argv, GF_FALSE);
+}
+static JSValue svg_udom_smil_end(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return svg_udom_smil_time_insert(c, obj, argc, argv, GF_TRUE);
+}
+
+/*TODO*/
+static JSValue svg_udom_smil_pause(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	tag = gf_node_get_tag(n);
+	if (gf_svg_is_animation_tag(tag)) {
+		/* pausing an animation element (set, animate ...) should pause the main time line ? */
+		gf_smil_timing_pause(n);
+	} else if (gf_svg_is_timing_tag(tag)) {
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_PAUSE_SVG, n, NULL);
+	} else if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_PAUSE_SVG, n, NULL);
+	} else {
+		return JS_FALSE;
+	}
+	return JS_TRUE;
+}
+/*TODO*/
+static JSValue svg_udom_smil_resume(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	tag = gf_node_get_tag(n);
+	if (gf_svg_is_animation_tag(tag)) {
+		/* resuming an animation element (set, animate ...) should resume the main time line ? */
+		gf_smil_timing_resume(n);
+	} else if (gf_svg_is_timing_tag(tag)) {
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESUME_SVG, n, NULL);
+	} else if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESUME_SVG, n, NULL);
+	} else {
+		return JS_FALSE;
+	}
+	return JS_TRUE;
+}
+
+static JSValue svg_udom_smil_restart(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	tag = gf_node_get_tag(n);
+	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_RESTART_SVG, n, NULL);
+	} else {
+		return JS_FALSE;
+	}
+	return JS_TRUE;
+}
+
+static JSValue svg_udom_smil_set_speed(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 tag;
+	Double speed = 1.0;
+	GF_Node *n = dom_get_element(c, obj);
+
+	if (!n || !argc || JS_ToFloat64(c, &speed, argv[0]) ) {
+		return JS_EXCEPTION;
+	}
+	tag = gf_node_get_tag(n);
+	if ((tag==TAG_SVG_svg) && (n->sgprivate->scenegraph->RootNode==n)) {
+		GF_JSAPIParam par;
+		memset(&par, 0, sizeof(GF_JSAPIParam));
+		par.val = FLT2FIX(speed);
+		ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_SCENE_SPEED, n, &par);
+	} else {
+		return JS_TRUE;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue svg_udom_get_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	char *attValue;
+	const char *name;
+	GF_Err e;
+	JSValue ret;
+	GF_FieldInfo info;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	//ns = NULL;
+	name = NULL;
+	if (! JSVAL_CHECK_STRING(argv[0]) ) return JS_TRUE;
+	if (argc==2) {
+		//ns = JS_ToCString(c, argv[0]);
+		name = JS_ToCString(c, argv[1]);
+	} else if (argc==1) {
+		name = JS_ToCString(c, argv[0]);
+	} else return JS_EXCEPTION;
+
+	if (!name) {
+		//JS_FreeCString(c, ns);
+		return JS_EXCEPTION;
+	}
+	if (!strcmp(name, "#text")) {
+		char *res = gf_dom_flatten_textContent(n);
+		ret = JS_NewString(c, res);
+		gf_free(res);
+		//JS_FreeCString(c, ns);
+		JS_FreeCString(c, name);
+		return ret;
+	}
+	e = gf_node_get_field_by_name(n, (char *) name, &info);
+
+	//JS_FreeCString(c, ns);
+	JS_FreeCString(c, name);
+
+	if (e!=GF_OK) return JS_EXCEPTION;
+
+	switch (info.fieldType) {
+	/* inheritable floats */
+	case SVG_FontSize_datatype:
+	case SVG_Color_datatype:
+	case SVG_Paint_datatype:
+	/* inheritable float and unit */
+	case SVG_Length_datatype:
+	case SVG_Coordinate_datatype:
+	/*Number*/
+	case SVG_Number_datatype:
+
+	/*all string traits*/
+	case SVG_Boolean_datatype:
+	case SVG_FillRule_datatype:
+	case SVG_StrokeLineJoin_datatype:
+	case SVG_StrokeLineCap_datatype:
+	case SVG_FontStyle_datatype:
+	case SVG_FontWeight_datatype:
+	case SVG_FontVariant_datatype:
+	case SVG_TextAnchor_datatype:
+	case SVG_Display_datatype:
+	case SVG_Visibility_datatype:
+	case SVG_GradientUnit_datatype:
+	case SVG_PreserveAspectRatio_datatype:
+	case XML_Space_datatype:
+	case XMLEV_Propagate_datatype:
+	case XMLEV_DefaultAction_datatype:
+	case XMLEV_Phase_datatype:
+	case SMIL_SyncBehavior_datatype:
+	case SMIL_SyncTolerance_datatype:
+	case SMIL_AttributeType_datatype:
+	case SMIL_CalcMode_datatype:
+	case SMIL_Additive_datatype:
+	case SMIL_Accumulate_datatype:
+	case SMIL_Restart_datatype:
+	case SMIL_Fill_datatype:
+	case SVG_Overflow_datatype:
+	case SVG_ZoomAndPan_datatype:
+	case SVG_DisplayAlign_datatype:
+	case SVG_TextAlign_datatype:
+	case SVG_PointerEvents_datatype:
+	case SVG_RenderingHint_datatype:
+	case SVG_VectorEffect_datatype:
+	case SVG_PlaybackOrder_datatype:
+	case SVG_TimelineBegin_datatype:
+	/*end of string traits*/
+	/*DOM string traits*/
+	case SVG_FontFamily_datatype:
+	case XMLRI_datatype:
+	case DOM_String_datatype:
+	case SVG_ContentType_datatype:
+	case SVG_LanguageID_datatype:
+	case SVG_Focus_datatype:
+	case SVG_ID_datatype:
+	case SVG_GradientOffset_datatype:
+		/*end of DOM string traits*/
+		attValue = gf_svg_dump_attribute(n, &info);
+		ret = JS_NewString(c, attValue);
+		if (attValue) gf_free(attValue);
+		return ret;
+
+#if 0
+	/*SVGT 1.2 default traits*/
+	case SMIL_KeyTimes_datatype:
+	case SMIL_KeyPoints_datatype:
+	case SMIL_KeySplines_datatype:
+	case SVG_Coordinates_datatype:
+	case SVG_StrokeDashArray_datatype:
+	case SVG_Points_datatype:
+	case SVG_Motion_datatype:
+	/*end SVGT 1.2 default traits*/
+
+	/*unimplemented/unnkown/FIXME traits*/
+	case SMIL_SyncTolerance_datatype:
+	case SVG_TransformType_datatype:
+	case SVG_TransformList_datatype:
+	case SMIL_AnimateValue_datatype:
+	case SMIL_AnimateValues_datatype:
+	case SMIL_AttributeName_datatype:
+	case SMIL_Times_datatype:
+	case SMIL_Duration_datatype:
+	case SMIL_RepeatCount_datatype:
+	default:
+		/*end unimplemented/unnkown/FIXME traits*/
+		return JS_EXCEPTION;
+#endif
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_get_float_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	GF_Err e;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	szName = JS_ToCString(c, argv[0]);
+	if (!szName) return JS_EXCEPTION;
+
+	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;
+
+	switch (info.fieldType) {
+	/* inheritable floats */
+	case SVG_Number_datatype:
+	case SVG_FontSize_datatype:
+	case SVG_Length_datatype:
+	case SVG_Coordinate_datatype:
+	{
+		SVG_Number *l = (SVG_Number *)info.far_ptr;
+		if (l->type==SVG_NUMBER_AUTO || l->type==SVG_NUMBER_INHERIT) return JS_TRUE;
+		return JS_NewFloat64(c, FIX2FLT(l->value));
+	}
+	case SVG_Clock_datatype:
+		return JS_NewFloat64(c, *(SVG_Clock*)info.far_ptr );
+	default:
+		return JS_NULL;
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_get_matrix_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	GF_Err e;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	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 (info.fieldType==SVG_Transform_datatype) {
+		GF_Matrix2D *mx = (GF_Matrix2D *)gf_malloc(sizeof(GF_Matrix2D));
+		if (!mx) return JS_EXCEPTION;
+		JSValue mO = JS_NewObjectClass(c, matrixClass.class_id);
+		gf_mx2d_init(*mx);
+		gf_mx2d_copy(*mx, ((SVG_Transform*)info.far_ptr)->mat);
+
+		JS_SetOpaque(mO, mx);
+		return mO;
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_get_rect_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	GF_Err e;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	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 (info.fieldType==SVG_ViewBox_datatype) {
+		JSValue newObj;
+		rectCI *rc;
+		SVG_ViewBox *v = (SVG_ViewBox *)info.far_ptr;
+		GF_SAFEALLOC(rc, rectCI);
+		if (!rc) {
+			return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+		}
+		newObj = JS_NewObjectClass(c, rectClass.class_id);
+		rc->x = FIX2FLT(v->x);
+		rc->y = FIX2FLT(v->y);
+		rc->w = FIX2FLT(v->width);
+		rc->h = FIX2FLT(v->height);
+		JS_SetOpaque(newObj, rc);
+		return newObj;
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_get_path_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	GF_Err e;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	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 (info.fieldType==SVG_PathData_datatype) {
+		return svg_new_path_object(c, (SVG_PathData *)info.far_ptr);
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_get_rgb_color_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	rgbCI *rgb;
+	GF_Err e;
+	JSValue newObj;
+
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	if ((argc!=1) || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	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;
+
+	switch (info.fieldType) {
+	case SVG_Color_datatype:
+	{
+		SVG_Color *col = (SVG_Color *)info.far_ptr;
+		if (col->type == SVG_COLOR_CURRENTCOLOR) return JS_UNDEFINED;
+		if (col->type == SVG_COLOR_INHERIT) return JS_UNDEFINED;
+
+		GF_SAFEALLOC(rgb, rgbCI);
+		if (!rgb) {
+			return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+		}
+		newObj = JS_NewObjectClass(c, rgbClass.class_id);
+		rgb->r = (u8) (255*FIX2FLT(col->red)) ;
+		rgb->g = (u8) (255*FIX2FLT(col->green)) ;
+		rgb->b = (u8) (255*FIX2FLT(col->blue)) ;
+		JS_SetOpaque(newObj, rgb);
+		return newObj;
+	}
+	break;
+	case SVG_Paint_datatype:
+	{
+		SVG_Paint *paint = (SVG_Paint *)info.far_ptr;
+		if ((1) || paint->type==SVG_PAINT_COLOR) {
+			GF_SAFEALLOC(rgb, rgbCI);
+			if (!rgb) {
+				return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+			}
+			newObj = JS_NewObjectClass(c, rgbClass.class_id);
+			rgb->r = (u8) (255*FIX2FLT(paint->color.red) );
+			rgb->g = (u8) (255*FIX2FLT(paint->color.green) );
+			rgb->b = (u8) (255*FIX2FLT(paint->color.blue) );
+			JS_SetOpaque(newObj, rgb);
+			return newObj;
+		}
+		return JS_TRUE;
+	}
+	}
+	return JS_NULL;
+}
+
+static JSValue svg_udom_set_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *ns, *name, *val;
+	GF_Err e;
+	GF_FieldInfo info;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+
+	val = ns = name = NULL;
+	if (!JSVAL_CHECK_STRING(argv[0])) return JS_EXCEPTION;
+	if (argc==3) {
+		if (!JSVAL_CHECK_STRING(argv[1])) return JS_EXCEPTION;
+		if (!JSVAL_CHECK_STRING(argv[2])) return JS_EXCEPTION;
+		ns = JS_ToCString(c, argv[0]);
+		name = JS_ToCString(c, argv[1]);
+		val = JS_ToCString(c, argv[2]);
+	} else if (argc==2) {
+		name = JS_ToCString(c, argv[0]);
+		val = JS_ToCString(c, argv[1]);
+	} else {
+		return JS_EXCEPTION;
+	}
+	if (!name) {
+		JS_FreeCString(c, ns);
+		JS_FreeCString(c, val);
+		return JS_EXCEPTION;
+	}
+	if (!strcmp(name, "#text")) {
+		if (val) dom_node_set_textContent(n, (char *) val);
+		JS_FreeCString(c, ns);
+		JS_FreeCString(c, name);
+		JS_FreeCString(c, val);
+		return JS_UNDEFINED;
+	}
+	e = gf_node_get_field_by_name(n, (char *) name, &info);
+	JS_FreeCString(c, ns);
+	JS_FreeCString(c, name);
+
+	if (!val || (e!=GF_OK)) {
+		JS_FreeCString(c, val);
+		return JS_EXCEPTION;
+	}
+	e = gf_svg_parse_attribute(n, &info, (char *) val, 0);
+	JS_FreeCString(c, val);
+
+	if (e) return js_throw_err(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	dom_node_changed(n, GF_FALSE, &info);
+	return JS_UNDEFINED;
+}
+
+static JSValue svg_udom_set_float_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_FieldInfo info;
+	Double d;
+	GF_Err e;
+	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;
+
+	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;
+
+	switch (info.fieldType) {
+	/* inheritable floats */
+	case SVG_FontSize_datatype:
+	case SVG_Length_datatype:
+	case SVG_Coordinate_datatype:
+	case SVG_Number_datatype:
+	{
+		SVG_Number *l = (SVG_Number *)info.far_ptr;
+		l->type=SVG_NUMBER_VALUE;
+		l->value = FLT2FIX(d);
+		break;
+	}
+	case SVG_Numbers_datatype:
+	case SVG_Coordinates_datatype:
+	{
+		SVG_Number *val;
+		SVG_Coordinates *l = (SVG_Coordinates *)info.far_ptr;
+		while (gf_list_count(*l)) {
+			val = (SVG_Number *)gf_list_get(*l, 0);
+			gf_list_rem(*l, 0);
+			if (val) gf_free(val);
+		}
+		GF_SAFEALLOC(val, SVG_Coordinate);
+		if (!val) {
+			return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+		}
+		val->type=SVG_NUMBER_VALUE;
+		val->value = FLT2FIX(d);
+		gf_list_add(*l, val);
+		break;
+	}
+	default:
+		return JS_FALSE;
+	}
+	dom_node_changed(n, GF_FALSE, &info);
+	return JS_TRUE;
+}
+
+static JSValue svg_udom_set_matrix_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	GF_Matrix2D *mx;
+	GF_Err e;
+
+	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;
+
+	mx = JS_GetOpaque(argv[1], matrixClass.class_id);
+	if (!mx) return JS_EXCEPTION;
+
+	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 (info.fieldType==SVG_Transform_datatype) {
+		gf_mx2d_copy(((SVG_Transform*)info.far_ptr)->mat, *mx);
+		dom_node_changed(n, GF_FALSE, NULL);
+		return JS_TRUE;
+	}
+	return JS_FALSE;
+}
+
+static JSValue svg_udom_set_rect_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	const char *szName;
+	GF_FieldInfo info;
+	rectCI *rc;
+	GF_Err e;
+	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_TRUE;
+	if (JS_IsNull(argv[1]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+
+	rc = JS_GetOpaque(argv[1], rectClass.class_id);
+	if (!rc) return JS_EXCEPTION;
+
+	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 (info.fieldType==SVG_ViewBox_datatype) {
+		SVG_ViewBox *v = (SVG_ViewBox *)info.far_ptr;
+		v->x = FLT2FIX(rc->x);
+		v->y = FLT2FIX(rc->y);
+		v->width = FLT2FIX(rc->w);
+		v->height = FLT2FIX(rc->h);
+		dom_node_changed(n, GF_FALSE, NULL);
+		return JS_TRUE;
+	}
+	return JS_FALSE;
+}
+
+static JSValue svg_udom_set_path_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *path;
+	GF_FieldInfo info;
+	const char *szName;
+	GF_Err e;
+	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_IsNull(argv[1]) || !JS_IsObject(argv[1])) return JS_EXCEPTION;
+	path = JS_GetOpaque( argv[1], pathClass.class_id);
+	if (!path) return JS_EXCEPTION;
+
+	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 (info.fieldType==SVG_PathData_datatype) {
+#if USE_GF_PATH
+#else
+		u32 i;
+		u32 nb_pts;
+		SVG_PathData *d = (SVG_PathData *)info.far_ptr;
+		while (gf_list_count(d->commands)) {
+			u8 *t = gf_list_get(d->commands, 0);
+			gf_list_rem(d->commands, 0);
+			gf_free(t);
+		}
+		while (gf_list_count(d->points)) {
+			SVG_Point *t = gf_list_get(d->points, 0);
+			gf_list_rem(d->points, 0);
+			gf_free(t);
+		}
+		nb_pts = 0;
+		for (i=0; i<path->nb_coms; i++) {
+			u8 *t = gf_malloc(sizeof(u8));
+			*t = path->tags[i];
+			gf_list_add(d->commands, t);
+			switch (*t) {
+			case 0:
+			case 1:
+				nb_pts++;
+				break;
+			case 2:
+				nb_pts+=3;
+				break;
+			case 4:
+				nb_pts+=2;
+				break;
+			}
+		}
+		for (i=0; i<nb_pts; i++) {
+			SVG_Point *t = gf_malloc(sizeof(SVG_Point));
+			t->x = FLT2FIX(path->pts[i].x);
+			t->y = FLT2FIX(path->pts[i].y);
+			gf_list_add(d->points, t);
+		}
+		dom_node_changed(n, 0, NULL);
+		return JS_TRUE;
+#endif
+	}
+	return JS_FALSE;
+}
+
+static JSValue svg_udom_set_rgb_color_trait(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_FieldInfo info;
+	rgbCI *rgb;
+	GF_Err e;
+	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_IsObject(argv[1])) return JS_EXCEPTION;
+	rgb = JS_GetOpaque(argv[1], rgbClass.class_id);
+	if (!rgb) return JS_EXCEPTION;
+
+	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;
+
+	switch (info.fieldType) {
+	case SVG_Color_datatype:
+	{
+		SVG_Color *col = (SVG_Color *)info.far_ptr;
+		col->type = SVG_COLOR_RGBCOLOR;
+		col->red = FLT2FIX(rgb->r / 255.0f);
+		col->green = FLT2FIX(rgb->g / 255.0f);
+		col->blue = FLT2FIX(rgb->b / 255.0f);
+		dom_node_changed(n, GF_FALSE, &info);
+		return JS_TRUE;
+	}
+	case SVG_Paint_datatype:
+	{
+		SVG_Paint *paint = (SVG_Paint *)info.far_ptr;
+		paint->type = SVG_PAINT_COLOR;
+		paint->color.type = SVG_COLOR_RGBCOLOR;
+		paint->color.red = FLT2FIX(rgb->r / 255.0f);
+		paint->color.green = FLT2FIX(rgb->g / 255.0f);
+		paint->color.blue = FLT2FIX(rgb->b / 255.0f);
+		dom_node_changed(n, GF_FALSE, &info);
+		return JS_TRUE;
+	}
+	}
+	return JS_FALSE;
+}
+
+static JSValue svg_get_bbox(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, Bool get_screen)
+{
+	GF_JSAPIParam par;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	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;
+			JSValue rO = JS_NewObjectClass(c, rectClass.class_id);
+			rc->sg = NULL;
+			rc->x = FIX2FLT(par.bbox.min_edge.x);
+			/*BBox is in 3D coord system style*/
+			rc->y = FIX2FLT(par.bbox.min_edge.y);
+			rc->w = FIX2FLT(par.bbox.max_edge.x - par.bbox.min_edge.x);
+			rc->h = FIX2FLT(par.bbox.max_edge.y - par.bbox.min_edge.y);
+			JS_SetOpaque(rO, rc);
+			return rO;
+		} else {
+			return JS_NULL;
+		}
+		return JS_TRUE;
+	}
+	return JS_FALSE;
+}
+
+static JSValue svg_udom_get_local_bbox(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return svg_get_bbox(c, obj, argc, argv, GF_FALSE);
+}
+static JSValue svg_udom_get_screen_bbox(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return svg_get_bbox(c, obj, argc, argv, GF_TRUE);
+}
+
+static JSValue svg_udom_get_screen_ctm(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	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;
+		JSValue mO = JS_NewObjectClass(c, matrixClass.class_id);
+		gf_mx2d_from_mx(mx, &par.mx);
+		JS_SetOpaque(mO, mx);
+		return mO;
+	}
+	return JS_EXCEPTION;
+}
+
+static JSValue svg_udom_create_matrix_components(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Matrix2D *mx;
+	JSValue mat;
+	Double v;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n) return JS_EXCEPTION;
+	if (argc!=6) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(mx, GF_Matrix2D)
+	if (!mx) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+
+	JS_ToFloat64(c, &v, argv[0]);
+	mx->m[0] = FLT2FIX(v);
+	JS_ToFloat64(c, &v, argv[1]);
+	mx->m[3] = FLT2FIX(v);
+	JS_ToFloat64(c, &v, argv[2]);
+	mx->m[1] = FLT2FIX(v);
+	JS_ToFloat64(c, &v, argv[3]);
+	mx->m[4] = FLT2FIX(v);
+	JS_ToFloat64(c, &v, argv[4]);
+	mx->m[2] = FLT2FIX(v);
+	JS_ToFloat64(c, &v, argv[5]);
+	mx->m[5] = FLT2FIX(v);
+	mat = JS_NewObjectClass(c, matrixClass.class_id);
+	JS_SetOpaque(mat, mx);
+	return mat;
+}
+
+static JSValue svg_udom_create_rect(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	rectCI *rc;
+	JSValue r;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(rc, rectCI);
+	if (!rc) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+	r = JS_NewObjectClass(c, rectClass.class_id);
+	JS_SetOpaque(r, rc);
+	return r;
+}
+
+static JSValue svg_udom_create_point(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pointCI *pt;
+	JSValue r;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(pt, pointCI);
+	if (!pt) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+	r = JS_NewObjectClass(c, pointClass.class_id);
+	JS_SetOpaque(r, pt);
+	return r;
+}
+
+static JSValue svg_udom_create_path(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *path;
+	JSValue p;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(path, pathCI);
+	if (!path) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+	p = JS_NewObjectClass(c, pathClass.class_id);
+	JS_SetOpaque(p, path);
+	return p;
+}
+
+static JSValue svg_udom_create_color(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	rgbCI *col;
+	JSValue p;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n|| (argc!=3)) return JS_EXCEPTION;
+
+	GF_SAFEALLOC(col, rgbCI);
+	if (!col) return js_throw_err(c, GF_DOM_EXC_DATA_CLONE_ERR);
+
+	JS_ToInt32(c, &col->r, argv[0]);
+	JS_ToInt32(c, &col->g, argv[1]);
+	JS_ToInt32(c, &col->b, argv[2]);
+	p = JS_NewObjectClass(c, rgbClass.class_id);
+	JS_SetOpaque(p, col);
+	return p;
+}
+
+static JSValue svg_path_get_total_length(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double length = 0;
+	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;
+
+	gf_node_get_field_by_name(n, "d", &info);
+	if (info.fieldType == SVG_PathData_datatype) {
+#if USE_GF_PATH
+		GF_Path *p = (GF_Path *)info.far_ptr;
+		GF_PathIterator *path_it = gf_path_iterator_new(p);
+		if (path_it) {
+			Fixed len = gf_path_iterator_get_length(path_it);
+			length = FIX2FLT(len);
+			gf_path_iterator_del(path_it);
+		}
+#endif
+	}
+	return JS_NewFloat64(c, length);
+}
+
+static JSValue svg_udom_move_focus(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+
+	JS_ToInt32(c, &par.opt, argv[1]);
+	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
+		return JS_TRUE;
+	return JS_FALSE;
+}
+
+static JSValue svg_udom_set_focus(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+
+	par.node = dom_get_element(c, argv[0]);
+	/*NOT IN THE GRAPH*/
+	if (!par.node || !par.node->sgprivate->num_instances) return JS_EXCEPTION;
+	if (ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_FOCUS, (GF_Node *)n, &par))
+		return JS_TRUE;
+	return JS_TRUE;
+}
+
+static JSValue svg_udom_get_focus(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *n = dom_get_element(c, obj);
+	if (!n || argc) return JS_EXCEPTION;
+
+	if (!ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_GET_FOCUS, (GF_Node *)n, &par))
+		return JS_EXCEPTION;
+
+	if (par.node) {
+		return dom_element_construct(c, par.node);
+	}
+	return JS_NULL;
+}
+
+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;
+
+	return JS_NewFloat64(c, gf_node_get_scene_time(n) );
+}
+
+
+static JSValue svg_connection_create(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return js_throw_err(c, GF_DOM_EXC_NOT_SUPPORTED_ERR);
+}
+
+static void baseCI_finalize(JSRuntime *rt, JSValue obj)
+{
+	/*avoids GCC warning*/
+	void *data = JS_GetOpaque_Nocheck(obj);
+	if (data) gf_free(data);
+}
+
+static JSValue rgb_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	rgbCI *col = (rgbCI *) JS_GetOpaque(obj, rgbClass.class_id);
+	if (!col) return JS_EXCEPTION;
+	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;
+	}
+}
+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;
+
+	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;
+	default:
+		return JS_EXCEPTION;
+	}
+}
+
+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->sg) {
+		GF_JSAPIParam par;
+		if (!ScriptAction(rc->sg, GF_JSAPI_OP_GET_VIEWPORT, rc->sg->RootNode, &par)) {
+			return JS_EXCEPTION;
+		}
+		rc->x = FIX2FLT(par.rc.x);
+		rc->y = FIX2FLT(par.rc.y);
+		rc->w = FIX2FLT(par.rc.width);
+		rc->h = FIX2FLT(par.rc.height);
+	}
+	switch (magic) {
+	case 0: return JS_NewFloat64(c, rc->x);
+	case 1: return JS_NewFloat64(c, rc->y);
+	case 2: return JS_NewFloat64(c, rc->w);
+	case 3: return JS_NewFloat64(c, rc->h);
+	default:
+		return JS_EXCEPTION;
+	}
+}
+
+static JSValue rect_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	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;
+	switch (magic) {
+	case 0:
+		rc->x = (Float) d;
+		return JS_TRUE;
+	case 1:
+		rc->y = (Float) d;
+		return JS_TRUE;
+	case 2:
+		rc->w = (Float) d;
+		return JS_TRUE;
+	case 3:
+		rc->h = (Float) d;
+		return JS_TRUE;
+	default:
+		return JS_EXCEPTION;
+	}
+}
+
+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->sg) {
+		GF_JSAPIParam par;
+		if (!ScriptAction(pt->sg, GF_JSAPI_OP_GET_TRANSLATE, pt->sg->RootNode, &par)) {
+			return JS_EXCEPTION;
+		}
+		pt->x = FIX2FLT(par.pt.x);
+		pt->y = FIX2FLT(par.pt.y);
+	}
+	switch (magic) {
+	case 0: return JS_NewFloat64(c, pt->x);
+	case 1: return JS_NewFloat64(c, pt->y);
+	default: return JS_EXCEPTION;
+	}
+}
+
+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;
+
+	Double d;
+	if (JS_ToFloat64(c, &d, value)) return JS_EXCEPTION;
+	switch (magic) {
+	case 0:
+		pt->x = (Float) d;
+		break;
+	case 1:
+		pt->y = (Float) d;
+		break;
+	default:
+		return JS_EXCEPTION;
+	}
+	if (pt->sg) {
+		GF_JSAPIParam par;
+		par.pt.x = FLT2FIX(pt->x);
+		par.pt.y = FLT2FIX(pt->y);
+		ScriptAction(pt->sg, GF_JSAPI_OP_SET_TRANSLATE, pt->sg->RootNode, &par);
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue svg_new_path_object(JSContext *c, SVG_PathData *d)
+{
+#if USE_GF_PATH
+	return JS_NULL;
+#else
+	JSValue obj;
+	pathCI *p;
+	GF_SAFEALLOC(p, pathCI);
+	if (!p) return JS_EXCEPTION;
+	if (d) {
+		u32 i, count;
+		p->nb_coms = gf_list_count(d->commands);
+		p->tags = gf_malloc(sizeof(u8) * p->nb_coms);
+		for (i=0; i<p->nb_coms; i++) p->tags[i] = * (u8 *) gf_list_get(d->commands, i);
+		count = gf_list_count(d->points);
+		p->pts = gf_malloc(sizeof(pointCI) * count);
+		for (i=0; i<count; i++) {
+			GF_Point2D *pt = gf_list_get(d->commands, i);
+			p->pts[i].x = FIX2FLT(pt->x);
+			p->pts[i].y = FIX2FLT(pt->y);
+		}
+	}
+	obj = JS_NewObjectClass(c, pathClass.class_id);
+	JS_SetOpaque(obj, p);
+	return obj;
+#endif
+}
+
+static void pathCI_finalize(JSRuntime *rt, JSValue obj)
+{
+	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (p) {
+		if (p->pts) gf_free(p->pts);
+		if (p->tags) gf_free(p->tags);
+		gf_free(p);
+	}
+}
+
+static JSValue path_getProperty(JSContext *c, JSValueConst obj, int magic)
+{
+	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	switch (magic) {
+	case 0: return JS_NewInt32(c, p->nb_coms);
+	default:
+		return JS_EXCEPTION;
+	}
+}
+
+static JSValue svg_path_get_segment(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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 (idx>=p->nb_coms) return JS_TRUE;
+	switch (p->tags[idx]) {
+	case 0: return JS_NewInt32(c, 77);/* Move To */
+	case 1: return JS_NewInt32(c, 76);/* Line To */
+	case 2:/* Curve To */
+	case 3:/* next Curve To */
+		return JS_NewInt32(c, 67);
+	case 4:/* Quad To */
+	case 5:/* next Quad To */
+		return JS_NewInt32(c, 81);
+	case 6:
+		return JS_NewInt32(c, 90);/* Close */
+	}
+	return JS_EXCEPTION;
+}
+
+static JSValue svg_path_get_segment_param(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	u32 i, idx, param_idx, pt_idx;
+	ptCI *pt;
+	pathCI *p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (!p) return JS_EXCEPTION;
+
+	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 (idx>=p->nb_coms) return JS_TRUE;
+	pt_idx = 0;
+	for (i=0; i<idx; i++) {
+		switch (p->tags[i]) {
+		case 0:
+			pt_idx++;
+			break;
+		case 1:
+			pt_idx++;
+			break;
+		case 2:
+			pt_idx+=3;
+			break;
+		case 3:
+			pt_idx+=2;
+			break;
+		case 4:
+			pt_idx+=2;
+			break;
+		case 5:
+			pt_idx+=1;
+			break;
+		}
+	}
+	switch (p->tags[idx]) {
+	case 0:
+	case 1:
+		if (param_idx>1) return JS_TRUE;
+		pt = &p->pts[pt_idx];
+		return JS_NewFloat64(c, param_idx ? pt->y : pt->x);
+	case 2:/* Curve To */
+		if (param_idx>5) return JS_TRUE;
+		pt = &p->pts[pt_idx + (param_idx/2) ];
+		return JS_NewFloat64(c, (param_idx%2) ? pt->y : pt->x);
+	case 3:/* Next Curve To */
+		if (param_idx>5) return JS_TRUE;
+		if (param_idx<2) {
+			pt = &p->pts[pt_idx - 1];
+			return JS_NewFloat64(c, param_idx ? pt->y : pt->x);
+		}
+		param_idx-=2;
+		pt = &p->pts[pt_idx + (param_idx/2)];
+		return JS_NewFloat64(c, (param_idx%2) ? pt->y : pt->x);
+
+	case 4:/* Quad To */
+		if (param_idx>3) return JS_TRUE;
+		pt = &p->pts[pt_idx + (param_idx/2) ];
+		return JS_NewFloat64(c, (param_idx%2) ? pt->y : pt->x);
+
+	case 5:/* Next Quad To */
+		if (param_idx>3) return JS_TRUE;
+		if (param_idx<2) {
+			pt = &p->pts[pt_idx - 1];
+			return JS_NewFloat64(c, param_idx ? pt->y : pt->x);
+		} else {
+			param_idx-=2;
+			pt = &p->pts[pt_idx];
+			return JS_NewFloat64(c, param_idx ? pt->y : pt->x);
+		}
+		return JS_TRUE;
+	/*spec is quite obscur here*/
+	case 6:
+		return JS_NewFloat64(c, 0);
+	}
+	return JS_EXCEPTION;
+}
+
+static u32 svg_path_realloc_pts(pathCI *p, u32 nb_pts)
+{
+	u32 i, orig_pts;
+	orig_pts = 0;
+	for (i=0; i<p->nb_coms; i++) {
+		switch (p->tags[i]) {
+		case 0:
+			orig_pts++;
+			break;
+		case 1:
+			orig_pts++;
+			break;
+		case 2:
+			orig_pts+=3;
+			break;
+		case 3:
+			orig_pts+=2;
+			break;
+		case 4:
+			orig_pts+=2;
+			break;
+		case 5:
+			orig_pts+=1;
+			break;
+		}
+	}
+	p->pts = (ptCI *)gf_realloc(p->pts, sizeof(ptCI)*(nb_pts+orig_pts));
+	return orig_pts;
+}
+
+static JSValue svg_path_move_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *p;
+	Double x, y;
+	u32 nb_pts;
+
+	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (!p || (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;
+	nb_pts = svg_path_realloc_pts(p, 1);
+	p->pts[nb_pts].x = (Float) x;
+	p->pts[nb_pts].y = (Float) y;
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags[p->nb_coms] = 0;
+	p->nb_coms++;
+	return JS_TRUE;
+}
+
+static JSValue svg_path_line_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *p;
+	Double x, y;
+	u32 nb_pts;
+	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (!p || (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;
+
+	nb_pts = svg_path_realloc_pts(p, 1);
+	p->pts[nb_pts].x = (Float) x;
+	p->pts[nb_pts].y = (Float) y;
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags[p->nb_coms] = 1;
+	p->nb_coms++;
+	return JS_TRUE;
+}
+
+static JSValue svg_path_quad_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *p;
+	Double x1, y1, x2, y2;
+	u32 nb_pts;
+
+	p = (pathCI *) JS_GetOpaque(obj, pathClass.class_id);
+	if (!p || (argc!=4)) 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;
+	nb_pts = svg_path_realloc_pts(p, 2);
+	p->pts[nb_pts].x = (Float) x1;
+	p->pts[nb_pts].y = (Float) y1;
+	p->pts[nb_pts+1].x = (Float) x2;
+	p->pts[nb_pts+1].y = (Float) y2;
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags[p->nb_coms] = 4;
+	p->nb_coms++;
+	return JS_TRUE;
+}
+
+static JSValue svg_path_curve_to(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	pathCI *p;
+	Double x1, y1, x2, y2, x, y;
+	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;
+	nb_pts = svg_path_realloc_pts(p, 3);
+	p->pts[nb_pts].x = (Float) x1;
+	p->pts[nb_pts].y = (Float) y1;
+	p->pts[nb_pts+1].x = (Float) x2;
+	p->pts[nb_pts+1].y = (Float) y2;
+	p->pts[nb_pts+2].x = (Float) x;
+	p->pts[nb_pts+2].y = (Float) y;
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags[p->nb_coms] = 2;
+	p->nb_coms++;
+	return JS_TRUE;
+}
+
+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;
+
+	p->tags = (u8 *)gf_realloc(p->tags, sizeof(u8)*(p->nb_coms+1) );
+	p->tags[p->nb_coms] = 6;
+	p->nb_coms++;
+	return JS_TRUE;
+}
+
+
+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;
+
+	switch (magic) {
+	case 0: return JS_NewFloat64(c, FIX2FLT(mx->m[0]));
+	case 1: return JS_NewFloat64(c, FIX2FLT(mx->m[3]));
+	case 2: return JS_NewFloat64(c, FIX2FLT(mx->m[1]));
+	case 3: return JS_NewFloat64(c, FIX2FLT(mx->m[4]));
+	case 4: return JS_NewFloat64(c, FIX2FLT(mx->m[2]));
+	case 5: return JS_NewFloat64(c, FIX2FLT(mx->m[5]));
+	default:
+		return JS_EXCEPTION;
+	}
+}
+
+static JSValue matrix_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	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;
+
+	switch (magic) {
+	case 0:
+		mx->m[0] = FLT2FIX(d);
+		break;
+	case 1:
+		mx->m[3] = FLT2FIX(d);
+		break;
+	case 2:
+		mx->m[1] = FLT2FIX(d);
+		break;
+	case 3:
+		mx->m[4] = FLT2FIX(d);
+		break;
+	case 4:
+		mx->m[2] = FLT2FIX(d);
+		break;
+	case 5:
+		mx->m[5] = FLT2FIX(d);
+		break;
+	default:
+		break;
+	}
+	return JS_EXCEPTION;
+}
+
+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;
+
+	switch (comp) {
+	case 0: return JS_NewFloat64(c, FIX2FLT(mx->m[0]));
+	case 1: return JS_NewFloat64(c, FIX2FLT(mx->m[3]));
+	case 2: return JS_NewFloat64(c, FIX2FLT(mx->m[1]));
+	case 3: return JS_NewFloat64(c, FIX2FLT(mx->m[4]));
+	case 4: return JS_NewFloat64(c, FIX2FLT(mx->m[2]));
+	case 5: return JS_NewFloat64(c, FIX2FLT(mx->m[5]));
+	}
+	return JS_EXCEPTION;
+}
+
+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;
+	mx2 = (GF_Matrix2D *) JS_GetOpaque(argv[0], matrixClass.class_id);
+	if (!mx2) return JS_EXCEPTION;
+
+	gf_mx2d_add_matrix(mx1, mx2);
+	return JS_DupValue(c, obj);
+}
+
+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;
+	gf_mx2d_inverse(mx);
+	return JS_DupValue(c, obj);
+}
+
+static JSValue svg_mx2d_translate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double x, y;
+	GF_Matrix2D *mx1, mx2;
+	mx1 = (GF_Matrix2D *) JS_GetOpaque(obj, matrixClass.class_id);
+	if (!mx1 || (argc!=2)) return JS_EXCEPTION;
+
+	if (JS_ToFloat64(c, &x, argv[0]) || JS_ToFloat64(c, &y, argv[1])) return JS_EXCEPTION;
+
+	gf_mx2d_init(mx2);
+	mx2.m[2] = FLT2FIX(x);
+	mx2.m[5] = FLT2FIX(y);
+	gf_mx2d_pre_multiply(mx1, &mx2);
+	return JS_DupValue(c, obj);
+}
+
+static JSValue svg_mx2d_scale(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+
+	gf_mx2d_init(mx2);
+	mx2.m[0] = mx2.m[4] = FLT2FIX(scale);
+	gf_mx2d_pre_multiply(mx1, &mx2);
+	return JS_DupValue(c, obj);
+}
+
+static JSValue svg_mx2d_rotate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	Double angle;
+	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;
+
+	gf_mx2d_init(mx2);
+	gf_mx2d_add_rotation(&mx2, 0, 0, gf_mulfix(FLT2FIX(angle/180), GF_PI));
+	gf_mx2d_pre_multiply(mx1, &mx2);
+	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);
+#endif
+
+JSClassID svg_get_element_class(GF_Node *n)
+{
+	if (!n) return 0;
+	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG)) {
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+		if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
+			assert(0);
+			return html_get_element_class(n);
+		}
+#endif
+		return svgElement.class_id;
+	}
+	return 0;
+}
+JSClassID svg_get_document_class(GF_SceneGraph *sg)
+{
+	GF_Node *n = sg->RootNode;
+	if (!n) return 0;
+	if ((n->sgprivate->tag>=GF_NODE_RANGE_FIRST_SVG) && (n->sgprivate->tag<=GF_NODE_RANGE_LAST_SVG))
+		return svgDocument.class_id;
+	return 0;
+}
+
+Bool is_svg_document_class(JSContext *c, JSValue obj)
+{
+	void *ptr = JS_GetOpaque(obj, svgDocument.class_id);
+	if (ptr) return GF_TRUE;
+	return GF_FALSE;
+}
+
+Bool is_svg_element_class(JSContext *c, JSValue obj)
+{
+	void *ptr = JS_GetOpaque(obj, svgElement.class_id);
+	if (ptr) return GF_TRUE;
+	return GF_FALSE;
+}
+
+#define SETUP_JSCLASS(_class, _name, _proto_funcs, _construct, _finalize, _proto_class_id) \
+	if (!_class.class_id) {\
+		JS_NewClassID(&(_class.class_id)); \
+		_class.class.class_name = _name; \
+		_class.class.finalizer = _finalize;\
+		JS_NewClass(jsrt, _class.class_id, &(_class.class));\
+	}\
+	scene->svg_js->_class.proto = JS_NewObjectClass(c, _proto_class_id ? _proto_class_id : _class.class_id);\
+    	JS_SetPropertyFunctionList(c, scene->svg_js->_class.proto, _proto_funcs, countof(_proto_funcs));\
+    	JS_SetClassProto(c, _class.class_id, scene->svg_js->_class.proto);\
+    	if (_construct) {\
+		scene->svg_js->_class.ctor = JS_NewCFunction2(c, _construct, _name, 1, JS_CFUNC_constructor, 0);\
+    		JS_SetPropertyStr(c, global, _name, scene->svg_js->_class.ctor);\
+	}\
+
+
+static const JSCFunctionListEntry globalFuncs[] =
+{
+    JS_CGETSET_MAGIC_DEF("connected", global_getProperty, NULL, 0),
+    JS_CGETSET_MAGIC_DEF("parent", global_getProperty, NULL, 1),
+	JS_CFUNC_DEF("createConnection", 0, svg_connection_create),
+	JS_CFUNC_DEF("gotoLocation", 1, svg_nav_to_location),
+	JS_CFUNC_DEF("alert", 0, js_print),
+	JS_CFUNC_DEF("print", 0, js_print),
+	JS_CFUNC_DEF("hasFeature", 2, dom_imp_has_feature),
+	JS_CFUNC_DEF("parseXML", 0, svg_parse_xml),
+};
+
+static const JSCFunctionListEntry documentFuncs[] =
+{
+	JS_CGETSET_MAGIC_DEF("defaultView",	svg_doc_getProperty, NULL, 0),
+};
+
+static const JSCFunctionListEntry svg_elementFuncs[] =
+{
+	JS_CGETSET_MAGIC_DEF("id",	svg_element_getProperty, svg_element_setProperty, 0),
+	/*svgSVGElement interface*/
+	JS_CGETSET_MAGIC_DEF("currentScale",	svg_element_getProperty, svg_element_setProperty, 5),
+	JS_CGETSET_MAGIC_DEF("currentRotate",	svg_element_getProperty, svg_element_setProperty, 6),
+	JS_CGETSET_MAGIC_DEF("currentTranslate",	svg_element_getProperty, svg_element_setProperty, 7),
+	JS_CGETSET_MAGIC_DEF("viewport",	svg_element_getProperty, NULL, 8),
+	JS_CGETSET_MAGIC_DEF("currentTime",	svg_element_getProperty, svg_element_setProperty, 9),
+	/*timeControl interface*/
+	JS_CGETSET_MAGIC_DEF("isPaused",	svg_element_getProperty, NULL, 10),
+	/*old SVG1.1 stuff*/
+	JS_CGETSET_MAGIC_DEF("ownerSVGElement",	svg_element_getProperty, NULL, 11),
+	/*SVGElementInstance*/
+	JS_CGETSET_MAGIC_DEF("correspondingElement",	svg_element_getProperty, NULL, 12),
+	JS_CGETSET_MAGIC_DEF("correspondingUseElement",	svg_element_getProperty, NULL, 13),
+
+	/*trait access interface*/
+	JS_CFUNC_DEF("getTrait", 1, svg_udom_get_trait),
+	JS_CFUNC_DEF("getTraitNS", 2, svg_udom_get_trait),
+	JS_CFUNC_DEF("getFloatTrait", 1, svg_udom_get_float_trait),
+	JS_CFUNC_DEF("getMatrixTrait", 1, svg_udom_get_matrix_trait),
+	JS_CFUNC_DEF("getRectTrait", 1, svg_udom_get_rect_trait),
+	JS_CFUNC_DEF("getPathTrait", 1, svg_udom_get_path_trait),
+	JS_CFUNC_DEF("getRGBColorTrait", 1, svg_udom_get_rgb_color_trait),
+	/*FALLBACK TO BASE-VALUE FOR NOW - WILL NEED EITHER DOM TREE-CLONING OR A FAKE RENDER
+	PASS FOR EACH PRESENTATION VALUE ACCESS*/
+	JS_CFUNC_DEF("getPresentationTrait", 1, svg_udom_get_trait),
+	JS_CFUNC_DEF("getPresentationTraitNS", 2, svg_udom_get_trait),
+	JS_CFUNC_DEF("getFloatPresentationTrait", 1, svg_udom_get_float_trait),
+	JS_CFUNC_DEF("getMatrixPresentationTrait", 1, svg_udom_get_matrix_trait),
+	JS_CFUNC_DEF("getRectPresentationTrait", 1, svg_udom_get_rect_trait),
+	JS_CFUNC_DEF("getPathPresentationTrait", 1, svg_udom_get_path_trait),
+	JS_CFUNC_DEF("getRGBColorPresentationTrait", 1, svg_udom_get_rgb_color_trait),
+	JS_CFUNC_DEF("setTrait", 2, svg_udom_set_trait),
+	JS_CFUNC_DEF("setTraitNS", 3, svg_udom_set_trait),
+	JS_CFUNC_DEF("setFloatTrait", 2, svg_udom_set_float_trait),
+	JS_CFUNC_DEF("setMatrixTrait", 2, svg_udom_set_matrix_trait),
+	JS_CFUNC_DEF("setRectTrait", 2, svg_udom_set_rect_trait),
+	JS_CFUNC_DEF("setPathTrait", 2, svg_udom_set_path_trait),
+	JS_CFUNC_DEF("setRGBColorTrait", 2, svg_udom_set_rgb_color_trait),
+	/*locatable interface*/
+	JS_CFUNC_DEF("getBBox", 0, svg_udom_get_local_bbox),
+	JS_CFUNC_DEF("getScreenCTM", 0, svg_udom_get_screen_ctm),
+	JS_CFUNC_DEF("getScreenBBox", 0, svg_udom_get_screen_bbox),
+	/*svgSVGElement interface*/
+	JS_CFUNC_DEF("createSVGMatrixComponents", 0, svg_udom_create_matrix_components),
+	JS_CFUNC_DEF("createSVGRect", 0, svg_udom_create_rect),
+	JS_CFUNC_DEF("createSVGPath", 0, svg_udom_create_path),
+	JS_CFUNC_DEF("createSVGRGBColor", 0, svg_udom_create_color),
+	JS_CFUNC_DEF("createSVGPoint", 0, svg_udom_create_point),
+	JS_CFUNC_DEF("moveFocus", 0, svg_udom_move_focus),
+	JS_CFUNC_DEF("setFocus", 0, svg_udom_set_focus),
+	JS_CFUNC_DEF("getCurrentFocusedObject", 0, svg_udom_get_focus),
+	JS_CFUNC_DEF("getCurrentTime", 0, svg_udom_get_time),
+
+	/*timeControl interface*/
+	JS_CFUNC_DEF("beginElementAt", 1, svg_udom_smil_begin),
+	JS_CFUNC_DEF("beginElement", 0, svg_udom_smil_begin),
+	JS_CFUNC_DEF("endElementAt", 1, svg_udom_smil_end),
+	JS_CFUNC_DEF("endElement", 0, svg_udom_smil_end),
+	JS_CFUNC_DEF("pauseElement", 0, svg_udom_smil_pause),
+	JS_CFUNC_DEF("resumeElement", 0, svg_udom_smil_resume),
+	JS_CFUNC_DEF("restartElement", 0, svg_udom_smil_restart),
+	JS_CFUNC_DEF("setSpeed", 0, svg_udom_smil_set_speed),
+	JS_CFUNC_DEF("getTotalLength", 0, svg_path_get_total_length)
+};
+
+/*RGBColor class*/
+static const JSCFunctionListEntry rgb_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("red", rgb_getProperty, rgb_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("green", rgb_getProperty, rgb_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("blue", rgb_getProperty, rgb_setProperty, 2),
+};
+
+	/*SVGRect class*/
+static const JSCFunctionListEntry rect_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", rect_getProperty, rect_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("y", rect_getProperty, rect_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("width", rect_getProperty, rect_setProperty, 2),
+	JS_CGETSET_MAGIC_DEF("height", rect_getProperty, rect_setProperty, 3),
+};
+
+/*SVGPoint class*/
+static const JSCFunctionListEntry point_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", point_getProperty, point_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("y", point_getProperty, point_setProperty, 1)
+};
+
+/*SVGMatrix class*/
+static const JSCFunctionListEntry matrix_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("a", matrix_getProperty, matrix_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("b", matrix_getProperty, matrix_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("c", matrix_getProperty, matrix_setProperty, 2),
+	JS_CGETSET_MAGIC_DEF("d", matrix_getProperty, matrix_setProperty, 3),
+	JS_CGETSET_MAGIC_DEF("e", matrix_getProperty, matrix_setProperty, 4),
+	JS_CGETSET_MAGIC_DEF("f", matrix_getProperty, matrix_setProperty, 5),
+
+	JS_CFUNC_DEF("getComponent", 1, svg_mx2d_get_component),
+	JS_CFUNC_DEF("mMultiply", 1, svg_mx2d_multiply),
+	JS_CFUNC_DEF("inverse", 0, svg_mx2d_inverse),
+	JS_CFUNC_DEF("mTranslate", 2, svg_mx2d_translate),
+	JS_CFUNC_DEF("mScale", 1, svg_mx2d_scale),
+	JS_CFUNC_DEF("mRotate", 1, svg_mx2d_rotate),
+};
+
+/*SVGPath class*/
+static const JSCFunctionListEntry path_Funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("numberOfSegments", path_getProperty, NULL, 0),
+	JS_CFUNC_DEF("getSegment", 1, svg_path_get_segment),
+	JS_CFUNC_DEF("getSegmentParam", 2, svg_path_get_segment_param),
+	JS_CFUNC_DEF("moveTo", 2, svg_path_move_to),
+	JS_CFUNC_DEF("lineTo", 2, svg_path_line_to),
+	JS_CFUNC_DEF("quadTo", 4, svg_path_quad_to),
+	JS_CFUNC_DEF("curveTo", 6, svg_path_curve_to),
+	JS_CFUNC_DEF("close", 0, svg_path_close),
+};
+
+JSClassID dom_js_get_element_proto(struct JSContext *c);
+JSClassID dom_js_get_document_proto(JSContext *c);
+
+/*defines a new global object "document" of type Document*/
+void dom_js_define_document(struct JSContext *c, JSValue global, GF_SceneGraph *doc);
+
+void domDocument_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func);
+void domElement_gc_mark(JSRuntime *rt, JSValueConst obj, JS_MarkFunc *mark_func);
+
+static void svg_init_js_api(GF_SceneGraph *scene)
+{
+	JSContext *c = scene->svg_js->js_ctx;
+	JSRuntime *jsrt = JS_GetRuntime(c);
+	JSValue global = JS_GetGlobalObject(scene->svg_js->js_ctx);
+
+	SETUP_JSCLASS(svg_globalClass, "Window", globalFuncs, NULL, NULL, 0);
+	scene->svg_js->global = JS_NewObjectClass(c, svg_globalClass.class_id);
+	JS_SetOpaque(scene->svg_js->global, scene);
+	JS_SetPropertyStr(c, global, "Window", scene->svg_js->global);
+
+ 	JS_SetPropertyStr(c, global, "alert", JS_NewCFunction(c, js_print, "alert", 1));
+ 	
+	/*initialize DOM core */
+	dom_js_load(scene, scene->svg_js->js_ctx);
+
+	qjs_module_init_xhr_global(c, global);
+
+	svg_define_udom_exception(scene->svg_js->js_ctx, scene->svg_js->global);
+	JSValue console = JS_NewObject(c);
+ 	JS_SetPropertyStr(c, console, "log", JS_NewCFunction(c, js_print, "print", 1));
+	JS_SetPropertyStr(c, global, "console", console);
+
+	svgDocument.class.gc_mark = domDocument_gc_mark;
+	SETUP_JSCLASS(svgDocument, "SVGDocument", documentFuncs, NULL, dom_document_finalize, dom_js_get_document_proto(c));
+	svgElement.class.gc_mark = domElement_gc_mark;
+	SETUP_JSCLASS(svgElement, "SVGElement", svg_elementFuncs, NULL, dom_element_finalize, dom_js_get_element_proto(c));
+
+	SETUP_JSCLASS(rgbClass, "SVGRGBColor", rgb_Funcs, NULL, baseCI_finalize, 0);
+	SETUP_JSCLASS(rectClass, "SVGRect", rect_Funcs, NULL, baseCI_finalize, 0);
+	SETUP_JSCLASS(pointClass, "SVGPoint", point_Funcs, NULL, baseCI_finalize, 0);
+	SETUP_JSCLASS(matrixClass, "SVGMatrix", matrix_Funcs, NULL, baseCI_finalize, 0);
+
+	SETUP_JSCLASS(pathClass, "SVGPath", path_Funcs, NULL, pathCI_finalize, 0);
+
+
+	JS_SetPropertyStr(c, scene->svg_js->pathClass.proto, "MOVE_TO", JS_NewInt32(c, 77));
+	JS_SetPropertyStr(c, scene->svg_js->pathClass.proto, "LINE_TO", JS_NewInt32(c, 76));
+	JS_SetPropertyStr(c, scene->svg_js->pathClass.proto, "CURVE_TO", JS_NewInt32(c, 67));
+	JS_SetPropertyStr(c, scene->svg_js->pathClass.proto, "QUAD_TO", JS_NewInt32(c, 81));
+	JS_SetPropertyStr(c, scene->svg_js->pathClass.proto, "CLOSE", JS_NewInt32(c, 90));
+
+	/*we have our own constructors*/
+	scene->get_element_class = svg_get_element_class;
+	scene->get_document_class = svg_get_document_class;
+
+	/*create document object*/
+	dom_js_define_document(scene->svg_js->js_ctx, global, scene);
+	/*create event object, and remember it*/
+	scene->svg_js->event = dom_js_define_event(scene->svg_js->js_ctx);
+
+	JS_FreeValue(c, global);
+}
+
+GF_DOM_Event *dom_get_evt_private(JSValue v);
+
+JSContext *svg_script_get_context(GF_SceneGraph *sg)
+{
+	return sg->svg_js ? sg->svg_js->js_ctx : NULL;
+}
+
+Bool svg_script_execute(GF_SceneGraph *sg, char *utf8_script, GF_DOM_Event *event)
+{
+	char szFuncName[1024];
+	JSValue ret;
+	Bool ok=GF_TRUE;
+	GF_DOM_Event *prev_event = NULL;
+	char *sep = strchr(utf8_script, '(');
+
+	if (!sep) {
+		strcpy(szFuncName, utf8_script);
+		strcat(szFuncName, "(evt)");
+		utf8_script = szFuncName;
+	}
+
+	gf_js_lock(sg->svg_js->js_ctx, GF_TRUE);
+
+	prev_event = dom_get_evt_private(sg->svg_js->event);
+	JS_SetOpaque(sg->svg_js->event, event);
+	ret = JS_Eval(sg->svg_js->js_ctx, utf8_script, (u32) strlen(utf8_script), "inline script", sg->svg_js->use_strict ? JS_EVAL_TYPE_MODULE : JS_EVAL_TYPE_GLOBAL);
+	JS_SetOpaque(sg->svg_js->event, prev_event);
+
+#if 0
+	//to check, what was the purpose of this ?
+	if (ret==JS_FALSE) {
+		char *sep = strchr(utf8_script, '(');
+		if (sep) {
+			sep[0] = 0;
+			ret = JS_LookupProperty(sg->svg_js->js_ctx, sg->svg_js->global, utf8_script, &rval);
+			sep[0] = '(';
+		}
+	}
+#endif
+
+	if (JS_IsException(ret)) {
+		js_dump_error(sg->svg_js->js_ctx);
+		ok=GF_FALSE;
+	}
+	JS_FreeValue(sg->svg_js->js_ctx, ret);
+
+	if (sg->svg_js->force_gc) {
+		gf_js_call_gc(sg->svg_js->js_ctx);
+		sg->svg_js->force_gc = GF_FALSE;
+	}
+	js_do_loop(sg->svg_js->js_ctx);
+	gf_js_lock(sg->svg_js->js_ctx, GF_FALSE);
+
+	return ok;
+}
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+void html_media_js_api_del();
+#endif
+
+void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph)
+{
+	gf_sg_js_dom_pre_destroy(JS_GetRuntime(svg_js->js_ctx), scenegraph, NULL);
+	gf_js_delete_context(svg_js->js_ctx);
+	dom_js_unload();
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+	/* HTML */
+	html_media_js_api_del();
+#endif
+
+	gf_free(svg_js);
+	scenegraph->svg_js = NULL;
+
+}
+
+static void svg_script_predestroy(GF_Node *n, void *eff, Bool is_destroy)
+{
+	if (is_destroy) {
+		GF_SVGJS *svg_js = n->sgprivate->scenegraph->svg_js;
+		/*unregister script from parent scene (cf base_scenegraph::sg_reset) */
+		gf_list_del_item(n->sgprivate->scenegraph->scripts, n);
+
+		if (svg_js->nb_scripts) {
+			svg_js->nb_scripts--;
+
+			/*detach this script from our object cache*/
+			gf_sg_js_dom_pre_destroy(JS_GetRuntime(svg_js->js_ctx), n->sgprivate->scenegraph, n);
+
+			if (!svg_js->nb_scripts) {
+				gf_svg_script_context_del(svg_js, n->sgprivate->scenegraph);
+			}
+		}
+	}
+}
+
+GF_Err JSScript_CreateSVGContext(GF_SceneGraph *sg)
+{
+	GF_SVGJS *svg_js;
+
+	if (sg->svg_js) {
+		/* the JS/SVG context is already created, no need to do anything  */
+		return GF_OK;
+	}
+
+	GF_SAFEALLOC(svg_js, GF_SVGJS);
+	if (!svg_js) {
+		return GF_OUT_OF_MEM;
+	}
+	/*create new ecmascript context*/
+	svg_js->js_ctx = gf_js_create_context();
+	if (!svg_js->js_ctx) {
+		gf_free(svg_js);
+		return GF_SCRIPT_ERROR;
+	}
+
+	gf_js_lock(svg_js->js_ctx, GF_TRUE);
+
+	sg->svg_js = svg_js;
+	/*load SVG & DOM APIs*/
+	svg_init_js_api(sg);
+
+#ifdef GPAC_ENABLE_HTML5_MEDIA
+	/* HTML */
+	html_media_init_js_api(sg);
+#endif
+
+
+	svg_js->script_execute = svg_script_execute;
+	svg_js->handler_execute = svg_script_execute_handler;
+
+	gf_js_lock(svg_js->js_ctx, GF_FALSE);
+
+	return GF_OK;
+}
+
+GF_DOMText *svg_get_text_child(GF_Node *node)
+{
+	GF_ChildNodeItem *child;
+	GF_DOMText *txt;
+	txt = NULL;
+	child = ((SVG_Element*)node)->children;
+	if (! child) return NULL;
+	while (child) {
+		txt = (GF_DOMText*)child->node;
+		if ((txt->sgprivate->tag==TAG_DOMText) && txt->textContent) return txt;
+		txt = NULL;
+		child = child->next;
+	}
+	return NULL;
+}
+
+static Bool svg_js_load_script(GF_Node *script, char *file)
+{
+	GF_Err e;
+	u8 *jsscript;
+	u32 fsize;
+	Bool success = GF_TRUE;
+	JSValue ret;
+	GF_SVGJS *svg_js;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+	char *abs_url = NULL;
+
+	svg_js = script->sgprivate->scenegraph->svg_js;
+	if (!strnicmp(file, "file://", 7)) file += 7;
+
+	if (!gf_file_exists(file)) {
+		GF_JSAPIParam par;
+		GF_SceneGraph *scene = script->sgprivate->scenegraph;
+		par.uri.url = file;
+		if (scene->script_action && scene->script_action(scene->script_action_cbck, GF_JSAPI_OP_RESOLVE_XLINK, script, &par))
+			abs_url = (char *) par.uri.url;
+
+		if (abs_url || !gf_file_exists(abs_url)) {
+			if (abs_url) gf_free(abs_url);
+			return GF_FALSE;
+		}
+	}
+
+	e = gf_file_load_data(abs_url ? abs_url : file, &jsscript, &fsize);
+	if (abs_url) gf_free(abs_url);
+
+	if (e!=GF_OK) return GF_FALSE;
+
+	/*for handler, only load code*/
+	if (script->sgprivate->tag==TAG_SVG_handler) {
+		GF_DOMText *txt = gf_dom_add_text_node(script, jsscript);
+		txt->type = GF_DOM_TEXT_INSERTED;
+		return GF_TRUE;
+	}
+
+	gf_js_lock(svg_js->js_ctx, GF_TRUE);
+
+ 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((const char *) jsscript, fsize )) {
+		flags = JS_EVAL_TYPE_MODULE;
+		svg_js->use_strict = GF_TRUE;
+	}
+
+	ret = JS_Eval(svg_js->js_ctx, jsscript, sizeof(char)*fsize, file, flags);
+	if (JS_IsException(ret)) {
+		js_dump_error(svg_js->js_ctx);
+		success=GF_FALSE;
+	}
+	JS_FreeValue(svg_js->js_ctx, ret);
+	if (svg_js->force_gc) {
+		gf_js_call_gc(svg_js->js_ctx);
+		svg_js->force_gc = GF_FALSE;
+	}
+	gf_js_lock(svg_js->js_ctx, GF_FALSE);
+
+	gf_dom_listener_process_add(script->sgprivate->scenegraph);
+
+	gf_free(jsscript);
+	return success;
+}
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+
+
+void JSScript_LoadSVG(GF_Node *node)
+{
+	GF_DOMText *txt;
+	GF_SVGJS *svg_js;
+	GF_FieldInfo href_info;
+
+	if (!node->sgprivate->scenegraph->svg_js) {
+		if (JSScript_CreateSVGContext(node->sgprivate->scenegraph) != GF_OK) return;
+	}
+
+	/*register script with parent scene (cf base_scenegraph::sg_reset) */
+	gf_list_add(node->sgprivate->scenegraph->scripts, node);
+
+	svg_js = node->sgprivate->scenegraph->svg_js;
+	if (!node->sgprivate->UserCallback) {
+		svg_js->nb_scripts++;
+		node->sgprivate->UserCallback = svg_script_predestroy;
+	}
+	/*if href download the script file*/
+	if (gf_node_get_attribute_by_tag(node, TAG_XLINK_ATT_href, GF_FALSE, GF_FALSE, &href_info) == GF_OK) {
+		GF_DownloadManager *dnld_man;
+		GF_JSAPIParam par;
+		char *url;
+		GF_Err e;
+		XMLRI *xmlri = (XMLRI *)href_info.far_ptr;
+
+		/* getting a download manager */
+		par.dnld_man = NULL;
+		ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
+		dnld_man = par.dnld_man;
+
+
+		/* resolve the uri of the script*/
+		par.uri.nb_params = 0;
+		par.uri.url = xmlri->string;
+		ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_RESOLVE_URI, node, &par);
+		url = (char *)par.uri.url;
+
+		/* if the file is local, we don't need to download it */
+		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
+			svg_js_load_script(node, url);
+		} else if (dnld_man) {
+			/*fetch the remote script synchronously and load it - cf section on script processing in SVG specs*/
+			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
+			if (sess) {
+				e = gf_dm_sess_process(sess);
+				if (e==GF_OK) {
+					const char *szCache = gf_dm_sess_get_cache_name(sess);
+					if (!svg_js_load_script(node, (char *) szCache))
+						e = GF_SCRIPT_ERROR;
+				}
+				gf_dm_sess_del(sess);
+			}
+			if (e) {
+				par.info.e = e;
+				par.info.msg = "Cannot fetch script";
+				ScriptAction(node->sgprivate->scenegraph, GF_JSAPI_OP_MESSAGE, NULL, &par);
+			}
+		}
+		gf_free(url);
+	}
+	/*for scripts only, execute*/
+	else if (node->sgprivate->tag == TAG_SVG_script) {
+		JSValue ret;
+		u32 txtlen;
+		u32 flags = JS_EVAL_TYPE_GLOBAL;
+
+		txt = svg_get_text_child(node);
+		if (!txt) return;
+		txtlen = (u32) strlen(txt->textContent);
+
+		if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((const char *) txt, txtlen )) {
+			flags = JS_EVAL_TYPE_MODULE;
+			svg_js->use_strict = GF_TRUE;
+		}
+
+		ret = JS_Eval(svg_js->js_ctx, txt->textContent, (u32) strlen(txt->textContent), "inline_script", flags);
+		if (JS_IsException(ret)) {
+			js_dump_error(svg_js->js_ctx);
+		}
+		JS_FreeValue(svg_js->js_ctx, ret);
+		gf_dom_listener_process_add(node->sgprivate->scenegraph);
+		js_do_loop(svg_js->js_ctx);
+	}
+}
+
+
+#ifdef _DEBUG
+//#define DUMP_DEF_AND_ROOT
+#endif
+
+#ifdef DUMP_DEF_AND_ROOT
+void dump_root(const char *name, void *rp, void *data)
+{
+	if (name[0]=='_') fprintf(stderr, "\t%s\n", name);
+}
+#endif
+
+/* Executes JavaScript code in response to an event being triggered
+  The code to be executed (stored in a GF_DOMHandler struct) is either:
+  - text content not yet passed to the JS engine
+     - text contained in a node's text content not yet parsed (node)
+	 - text, outside of a node, obtained by some external means (XHR, ...) - utf8_script
+  - already in the JS engine, in the form of:
+     - an anonymous function (js_fun_val)
+	 - a named function (js_fun)
+*/
+static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script)
+{
+	GF_DOMText *txt = NULL;
+	GF_SVGJS *svg_js;
+	JSValue __this;
+	JSValue ret;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+	Bool success=GF_TRUE;
+	GF_DOM_Event *prev_event = NULL;
+	GF_DOMHandler *hdl = (GF_DOMHandler *)node;
+
+	/*LASeR hack for encoding scripts without handler - node is a listener in this case, not a handler*/
+	if (utf8_script) {
+		if (!node) return GF_FALSE;
+		hdl = NULL;
+	} else {
+		if (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;
+		}
+		/*not sure about this (cf test struct-use-205-t.svg)*/
+		//if (!node->sgprivate->parents) return GF_FALSE;
+	}
+
+	svg_js = node->sgprivate->scenegraph->svg_js;
+
+#ifndef GPAC_DISABLE_LOG
+	if (gf_log_tool_level_on(GF_LOG_SCRIPT, GF_LOG_DEBUG)) {
+		char *content, *_content = NULL;
+		if (utf8_script) {
+			content = utf8_script;
+		} else if (!JS_IsUndefined(hdl->js_data->fun_val)) {
+			content = _content = (char *) JS_ToCString(svg_js->js_ctx, hdl->js_data->fun_val);
+		} else if (txt) {
+			content = txt->textContent;
+		} else {
+			content = "unknown";
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOM Events    ] Executing script code from handler: %s\n", content) );
+		JS_FreeCString(svg_js->js_ctx, _content);
+	}
+#endif
+
+	gf_js_lock(svg_js->js_ctx, GF_TRUE);
+	prev_event = dom_get_evt_private(svg_js->event);
+	/*break loops*/
+	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
+		gf_js_lock(svg_js->js_ctx, GF_FALSE);
+		return GF_FALSE;
+	}
+	JS_SetOpaque(svg_js->event, event);
+
+	svg_js->in_script = GF_TRUE;
+	if (svg_js->use_strict)
+		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;
+	/*compile the jsfun if any - 'this' is the associated observer*/
+	else __this = observer ? dom_element_construct(svg_js->js_ctx, observer) : 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);
+	}
+
+	if (utf8_script) {
+		ret = JS_EvalWithTarget(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) )
+	) {
+		JSValue evt;
+		JSValue argv[1];
+		evt = gf_dom_new_event(svg_js->js_ctx);
+		JS_SetOpaque(evt, event);
+		argv[0] = evt;
+
+		if (!JS_IsUndefined(hdl->js_data->fun_val) ) {
+			ret = JS_Call(svg_js->js_ctx, hdl->js_data->fun_val, __this, 1, argv);
+		} else {
+			JSValue fun = JS_GetPropertyStr(svg_js->js_ctx, hdl->js_data->evt_listen_obj, "hanldeEvent");
+			ret = JS_Call(svg_js->js_ctx, fun, hdl->js_data->evt_listen_obj, 1, argv);
+			JS_FreeValue(svg_js->js_ctx, fun);
+		}
+	} else if (txt) {
+		JSValue fun = JS_GetPropertyStr(svg_js->js_ctx, svg_js->global, txt->textContent);
+		if (!JS_IsUndefined(fun)) {
+			ret = JS_NULL;
+			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);
+		}
+		JS_FreeValue(svg_js->js_ctx, fun);
+	} else {
+		ret = JS_NULL;
+	}
+	if (JS_IsException(ret)) {
+		js_dump_error(svg_js->js_ctx);
+		success = GF_FALSE;
+	}
+	JS_FreeValue(svg_js->js_ctx, ret);
+
+	JS_SetOpaque(svg_js->event, prev_event);
+	if (txt && hdl && hdl->js_data) hdl->js_data->fun_val = JS_UNDEFINED;
+
+	while (svg_js->force_gc) {
+		svg_js->force_gc = GF_FALSE;
+		gf_js_call_gc(svg_js->js_ctx);
+	}
+	svg_js->in_script = GF_FALSE;
+
+	/*check any pending exception if outer-most event*/
+	if (!prev_event) {
+		js_do_loop(svg_js->js_ctx);
+	}
+
+	gf_js_lock(svg_js->js_ctx, GF_FALSE);
+
+#ifdef DUMP_DEF_AND_ROOT
+	if ((event->type==GF_EVENT_CLICK) || (event->type==GF_EVENT_MOUSEOVER)) {
+		NodeIDedItem *reg_node;
+		fprintf(stderr, "Node registry\n");
+		reg_node = node->sgprivate->scenegraph->id_node;
+		while (reg_node) {
+			fprintf(stderr, "\t%s\n", reg_node->NodeName);
+			reg_node = reg_node->next;
+		}
+
+		fprintf(stderr, "\n\nNamed roots:\n");
+		JS_DumpNamedRoots(JS_GetRuntime(svg_js->js_ctx), dump_root, NULL);
+	}
+#endif
+
+	if (!success) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid event handler script\n" ));
+		return GF_FALSE;
+	}
+	return GF_TRUE;
+}
+
+#endif
+
+#endif

gpac-0.8.0.tar.gz/src/scenegraph/svg_types.c -> gpac-1.0.0.tar.gz/src/scenegraph/svg_types.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Cyril Concolato, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2004-2012
+ *			Copyright (c) Telecom ParisTech 2004-2019
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph sub-project
@@ -64,6 +64,7 @@
 	} else {
 		GF_SAFEALLOC(p, SVG_Element);
 	}
+	if (!p) return NULL;
 	gf_node_setup((GF_Node *)p, ElementTag);
 	gf_sg_parent_setup((GF_Node *) p);
 	return p;
@@ -198,6 +199,7 @@
 }
 
 
+#if 0 //unused
 void gf_svg_reset_path(SVG_PathData d)
 {
 #if USE_GF_PATH
@@ -218,9 +220,11 @@
 	gf_list_del(d.points);
 #endif
 }
+#endif
+
 
 /* TODO: update for elliptical arcs */
-GF_EXPORT
+#if USE_GF_PATH
 void gf_svg_path_build(GF_Path *path, GF_List *commands, GF_List *points)
 {
 	u32 i, j, command_count;
@@ -300,6 +304,7 @@
 		}
 	}
 }
+#endif
 
 
 void gf_smil_delete_times(GF_List *list)
@@ -314,6 +319,7 @@
 	gf_list_del(list);
 }
 
+#if 0 //unused
 void gf_svg_delete_points(GF_List *list)
 {
 	u32 i, count = gf_list_count(list);
@@ -333,6 +339,7 @@
 	}
 	gf_list_del(list);
 }
+#endif
 
 void gf_svg_reset_iri(GF_SceneGraph *sg, XMLRI *iri)
 {
@@ -358,20 +365,25 @@
 void gf_svg_reset_animate_values(SMIL_AnimateValues anim_values, GF_SceneGraph *sg)
 {
 	u32 i, count;
+	u8 type = anim_values.type;
+	if (anim_values.laser_strings) type = DOM_String_datatype;
+
 	count = gf_list_count(anim_values.values);
 	for (i = 0; i < count; i++) {
 		void *value = gf_list_get(anim_values.values, i);
-		svg_delete_one_anim_value(anim_values.type, value, sg);
+		svg_delete_one_anim_value(type, value, sg);
 	}
 	gf_list_del(anim_values.values);
 	anim_values.values = NULL;
 }
 
+#if 0 //unused
 void gf_svg_reset_animate_value(SMIL_AnimateValue anim_value, GF_SceneGraph *sg)
 {
 	svg_delete_one_anim_value(anim_value.type, anim_value.value, sg);
 	anim_value.value = NULL;
 }
+#endif
 
 void gf_svg_delete_attribute_value(u32 type, void *value, GF_SceneGraph *sg)
 {
@@ -471,6 +483,10 @@
 		gf_free(value);
 		break;
 
+	case 0:
+		if (*(SVG_String *)value) gf_free(*(SVG_String *)value);
+		gf_free(value);
+		break;
 	case SMIL_RepeatCount_datatype:
 	case SMIL_Duration_datatype:
 	case SVG_Length_datatype:
@@ -479,10 +495,11 @@
 	case SVG_Display_datatype:
 	default:
 		gf_free(value);
+		break;
 	}
 }
 
-
+#if 0 //unused
 void gf_smil_delete_key_types(GF_List *l)
 {
 	while (gf_list_count(l)) {
@@ -492,6 +509,7 @@
 	}
 	gf_list_del(l);
 }
+#endif
 
 
 #endif /*GPAC_DISABLE_SVG*/

gpac-1.0.0.tar.gz/src/scenegraph/vrml_js.c Added

@@ -0,0 +1,4766 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2019
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph 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/internal/scenegraph_dev.h>
+
+
+#ifdef GPAC_HAS_QJS
+
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/modules/compositor_ext.h>
+
+#include "qjs_common.h"
+
+typedef struct
+{
+	u8 is_setup;
+	/*set to true for proto IS fields*/
+	u8 IS_route;
+
+	u32 ID;
+	char *name;
+
+	/*scope of this route*/
+	GF_SceneGraph *graph;
+	u32 lastActivateTime;
+
+	GF_Node *FromNode;
+	GF_FieldInfo FromField;
+
+	GF_Node *ToNode;
+	GF_FieldInfo ToField;
+
+	JSValue obj;
+	JSValue fun;
+} GF_RouteToScript;
+
+typedef struct __gf_js_field
+{
+	GF_FieldInfo field;
+	GF_Node *owner;
+	JSValue obj;
+
+	/*list of JSValue * for MFFields (except MFNode) or NULL
+	we need this to keep the link between an MF slot and the parent node since everything is passed by reference*/
+	JSValue *mfvals;
+	u32 mfvals_count;
+
+	/*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*/
+	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;
+
+	/*context in which the field was created*/
+	struct JSContext *js_ctx;
+} GF_JSField;
+
+JSValue js_throw_err_msg(JSContext *ctx, s32 err, const char *fmt, ...)
+{
+    JSValue obj = JS_NewError(ctx);
+    if (JS_IsException(obj)) {
+        obj = JS_NULL;
+	} else {
+    	JS_DefinePropertyValueStr(ctx, obj, "code", JS_NewInt32(ctx, err), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+    	if (fmt) {
+			char szMsg[2050];
+			va_list vl;
+			va_start(vl, fmt);
+			vsnprintf(szMsg, 2048, fmt, vl);
+			va_end(vl);
+
+    		JS_DefinePropertyValueStr(ctx, obj, "message", JS_NewString(ctx, szMsg), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+		}
+	}
+    return JS_Throw(ctx, obj);
+}
+
+JSValue js_throw_err(JSContext *ctx, s32 err)
+{
+    JSValue obj = JS_NewError(ctx);
+    if (JS_IsException(obj)) {
+        obj = JS_NULL;
+	} else {
+    	JS_DefinePropertyValueStr(ctx, obj, "code", JS_NewInt32(ctx, err), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+	}
+    return JS_Throw(ctx, obj);
+}
+
+
+#define _ScriptMessage(_c, _msg) {	\
+		GF_Node *_n = (GF_Node *) JS_GetContextOpaque(_c);	\
+		if (_n->sgprivate->scenegraph->script_action) {\
+			GF_JSAPIParam par;	\
+			par.info.e = GF_SCRIPT_INFO;			\
+			par.info.msg = (_msg);		\
+			_n->sgprivate->scenegraph->script_action(_n->sgprivate->scenegraph->script_action_cbck, GF_JSAPI_OP_MESSAGE, NULL, &par);\
+		}	\
+		}
+
+static Bool ScriptAction(JSContext *c, GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
+{
+	if (!scene) {
+		GF_Node *n = (GF_Node *) JS_GetContextOpaque(c);
+		scene = n->sgprivate->scenegraph;
+	}
+	if (scene->script_action)
+		return scene->script_action(scene->script_action_cbck, type, node, param);
+	return 0;
+}
+
+GF_JSClass SFNodeClass;
+#ifndef GPAC_DISABLE_VRML
+GF_JSClass globalClass;
+GF_JSClass browserClass;
+GF_JSClass SFVec2fClass;
+GF_JSClass SFVec3fClass;
+GF_JSClass SFRotationClass;
+GF_JSClass SFColorClass;
+GF_JSClass SFImageClass;
+GF_JSClass MFInt32Class;
+GF_JSClass MFBoolClass;
+GF_JSClass MFFloatClass;
+GF_JSClass MFTimeClass;
+GF_JSClass MFVec2fClass;
+GF_JSClass MFVec3fClass;
+GF_JSClass MFRotationClass;
+GF_JSClass MFColorClass;
+GF_JSClass MFStringClass;
+GF_JSClass MFUrlClass;
+GF_JSClass MFNodeClass;
+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_file_load_data(module_name, &buf, &buf_len);
+
+		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 */
+		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*/
+#include <gpac/nodes_svg.h>
+
+GF_Node *dom_get_element(JSContext *c, JSValue obj);
+#endif
+
+
+void gf_sg_script_to_node_field(struct JSContext *c, JSValue v, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent);
+JSValue gf_sg_script_to_qjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate);
+
+static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script);
+
+Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, JSValue *rval);
+
+static JSValue vrml_event_add_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv);
+static JSValue vrml_event_remove_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv);
+
+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
+	node->sgprivate->scenegraph->trigger_gc = GF_TRUE;
+#endif
+
+	if (node->sgprivate->scenegraph->trigger_gc) {
+		node->sgprivate->scenegraph->trigger_gc = GF_FALSE;
+		gf_js_call_gc(c);
+	}
+}
+
+
+#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)
+{
+	Fixed f, q, t, p, hue, sat, val;
+	u32 i;
+	hue = col->red;
+	sat = col->green;
+	val = col->blue;
+	if (sat==0) {
+		col->red = col->green = col->blue = val;
+		return;
+	}
+	if (hue == FIX_ONE) hue = 0;
+	else hue *= 6;
+	i = FIX2INT( gf_floor(hue) );
+	f = hue-i;
+	p = gf_mulfix(val, FIX_ONE - sat);
+	q = gf_mulfix(val, FIX_ONE - gf_mulfix(sat,f));
+	t = gf_mulfix(val, FIX_ONE - gf_mulfix(sat, FIX_ONE - f));
+	switch (i) {
+	case 0:
+		col->red = val;
+		col->green = t;
+		col->blue = p;
+		break;
+	case 1:
+		col->red = q;
+		col->green = val;
+		col->blue = p;
+		break;
+	case 2:
+		col->red = p;
+		col->green = val;
+		col->blue = t;
+		break;
+	case 3:
+		col->red = p;
+		col->green = q;
+		col->blue = val;
+		break;
+	case 4:
+		col->red = t;
+		col->green = p;
+		col->blue = val;
+		break;
+	case 5:
+		col->red = val;
+		col->green = p;
+		col->blue = q;
+		break;
+	}
+}
+
+void SFColor_toHSV(SFColor *col)
+{
+	Fixed h, s;
+	Fixed _max = MAX(col->red, MAX(col->green, col->blue));
+	Fixed _min = MIN(col->red, MAX(col->green, col->blue));
+
+	s = (_max == 0) ? 0 : gf_divfix(_max - _min, _max);
+	if (s != 0) {
+		Fixed rl = gf_divfix(_max - col->red, _max - _min);
+		Fixed gl = gf_divfix(_max - col->green, _max - _min);
+		Fixed bl = gf_divfix(_max - col->blue, _max - _min);
+		if (_max == col->red) {
+			if (_min == col->green) h = 60*(5+bl);
+			else h = 60*(1-gl);
+		} else if (_max == col->green) {
+			if (_min == col->blue) h = 60*(1+rl);
+			else h = 60*(3-bl);
+		} else {
+			if (_min == col->red) h = 60*(3+gl);
+			else h = 60*(5-rl);
+		}
+	} else {
+		h = 0;
+	}
+	col->red = h;
+	col->green = s;
+	col->blue = _max;
+}
+
+static GFINLINE GF_JSField *NewJSField(JSContext *c)
+{
+	GF_JSField *ptr;
+	GF_SAFEALLOC(ptr, GF_JSField);
+	if (!ptr) return NULL;
+	ptr->js_ctx = c;
+	ptr->obj = JS_UNDEFINED;
+	return ptr;
+}
+
+static GFINLINE M_Script *JS_GetScript(JSContext *c)
+{
+	return (M_Script *) JS_GetContextOpaque(c);
+}
+static GFINLINE GF_ScriptPriv *JS_GetScriptStack(JSContext *c)
+{
+	M_Script *script = (M_Script *) JS_GetContextOpaque(c);
+	return script->sgprivate->UserPrivate;
+}
+
+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 {
+#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;
+		}
+	}
+}
+
+static JSValue getName(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return JS_NewString(ctx, "GPAC RichMediaEngine");
+}
+static JSValue getVersion(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return JS_NewString(ctx, gf_gpac_version());
+}
+static JSValue getCurrentSpeed(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *node = JS_GetContextOpaque(ctx);
+	par.time = 0;
+	ScriptAction(ctx, NULL, GF_JSAPI_OP_GET_SPEED, node->sgprivate->scenegraph->RootNode, &par);
+	return JS_NewFloat64(ctx, par.time);
+}
+static JSValue getCurrentFrameRate(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *node = JS_GetContextOpaque(ctx);
+	par.time = 0;
+	ScriptAction(ctx, NULL, GF_JSAPI_OP_GET_FPS, node->sgprivate->scenegraph->RootNode, &par);
+	return JS_NewFloat64(ctx, par.time);
+}
+static JSValue getWorldURL(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *node = JS_GetContextOpaque(ctx);
+	par.uri.url = NULL;
+	par.uri.nb_params = 0;
+	if (ScriptAction(ctx, NULL, GF_JSAPI_OP_RESOLVE_URI, node->sgprivate->scenegraph->RootNode, &par)) {
+		JSValue ret = JS_NewString(ctx, par.uri.url);
+		gf_free(par.uri.url);
+		return ret;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue node_get_binding(GF_ScriptPriv *priv, GF_Node *node)
+{
+	GF_JSField *field;
+
+	if (!node) return JS_NULL;
+
+	if (node->sgprivate->interact && node->sgprivate->interact->js_binding && node->sgprivate->interact->js_binding->pf) {
+		field = node->sgprivate->interact->js_binding->pf;
+		assert(JS_IsObject(field->obj));
+		assert(JS_GetOpaque(field->obj, SFNodeClass.class_id)!=NULL);
+		return field->obj;
+	}
+
+	field = NewJSField(priv->js_ctx);
+	field->field.fieldType = GF_SG_VRML_SFNODE;
+	field->node = node;
+	field->field.far_ptr = &field->node;
+
+
+	node->sgprivate->flags |= GF_NODE_HAS_BINDING;
+	gf_node_register(node, NULL);
+
+	field->obj = JS_NewObjectClass(priv->js_ctx, SFNodeClass.class_id);
+	JS_SetOpaque(field->obj, field);
+	gf_list_add(priv->jsf_cache, field);
+
+	/*remember the object*/
+	if (!node->sgprivate->interact) {
+		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;
+		}
+	}
+	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;
+		}
+		node->sgprivate->interact->js_binding->fields = gf_list_new();
+	}
+	node->sgprivate->flags |= GF_NODE_HAS_BINDING;
+	node->sgprivate->interact->js_binding->pf = field;
+	return field->obj;
+}
+
+static JSValue getScript(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_ScriptPriv *priv = JS_GetScriptStack(c);
+	GF_Node *node = JS_GetContextOpaque(c);
+	return JS_DupValue(c, node_get_binding(priv, node) );
+}
+
+static JSValue loadScript(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	Bool no_complain = 0;
+	const char *url;
+	GF_Node *node = JS_GetContextOpaque(c);
+	JSValue aval = JS_UNDEFINED;
+	if (!node || !argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+
+	if ((argc>1) && JS_IsBool(argv[1])) no_complain = (JS_ToBool(c,argv[1])) ? 1 : 0;
+
+	url = JS_ToCString(c, argv[0]);
+	if (url) {
+		JSScriptFromFile(node, url, no_complain, &aval);
+	}
+	JS_FreeCString(c, url);
+	return aval;
+}
+
+static JSValue getProto(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_ScriptPriv *priv = JS_GetScriptStack(c);
+	GF_Node *node = JS_GetContextOpaque(c);
+
+	if (!node->sgprivate->scenegraph->pOwningProto) {
+		return JS_NULL;
+	}
+	node = (GF_Node *) node->sgprivate->scenegraph->pOwningProto;
+	return JS_DupValue(c, node_get_binding(priv, node));
+}
+
+#ifndef GPAC_DISABLE_SVG
+GF_Node *gf_sm_load_svg_from_string(GF_SceneGraph *sg, char *svg_str);
+#endif
+
+static JSValue vrml_parse_xml(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+#ifndef GPAC_DISABLE_SVG
+	GF_SceneGraph *sg;
+	GF_Node *node;
+	const char *str;
+
+	str = JS_ToCString(c, argv[0]);
+	if (!str) return JS_TRUE;
+
+	node = JS_GetContextOpaque(c);
+	sg = node->sgprivate->scenegraph;
+
+	node = gf_sm_load_svg_from_string(sg, (char *) str);
+	JS_FreeCString(c, str);
+	return dom_element_construct(c, node);
+#else
+	return JS_EXCEPTION;
+#endif
+}
+
+
+static JSValue getElementById(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Node *elt;
+	const char *name = NULL;
+	u32 ID = 0;
+	GF_ScriptPriv *priv = JS_GetScriptStack(c);
+	GF_Node *sc = JS_GetContextOpaque(c);
+	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;
+	}
+	if (!ID && !name) return JS_EXCEPTION;
+
+	elt = NULL;
+	if (ID) elt = gf_sg_find_node(sc->sgprivate->scenegraph, ID);
+	else elt = gf_sg_find_node_by_name(sc->sgprivate->scenegraph, (char *) name);
+
+	JS_FreeCString(c, name);
+	return JS_DupValue(c, node_get_binding(priv, elt));
+}
+
+static JSValue replaceWorld(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	return JS_TRUE;
+}
+
+static void on_route_to_object(GF_Node *node, GF_Route *_r)
+{
+	JSValue argv[2], rval;
+	Double time;
+	GF_FieldInfo t_info;
+	GF_ScriptPriv *priv;
+	JSValue obj;
+	GF_RouteToScript *r = (GF_RouteToScript *)_r;
+	if (!node)
+		return;
+	priv = gf_node_get_private(node);
+	if (!priv)
+		return;
+
+	if (!r->FromNode) {
+		JS_FreeValue(priv->js_ctx, r->fun);
+		r->fun = JS_UNDEFINED;
+		JS_FreeValue(priv->js_ctx, r->obj);
+		r->obj = JS_UNDEFINED;
+		return;
+	}
+
+	obj = r->obj;
+	if (JS_IsUndefined(obj) || JS_IsNull(obj))
+	 	obj = priv->js_obj;
+
+	memset(&t_info, 0, sizeof(GF_FieldInfo));
+	time = gf_node_get_scene_time(node);
+	t_info.far_ptr = &time;
+	t_info.fieldType = GF_SG_VRML_SFTIME;
+	t_info.fieldIndex = -1;
+	t_info.name = "timestamp";
+
+	gf_js_lock(priv->js_ctx, 1);
+	
+	argv[1] = gf_sg_script_to_qjs_field(priv, &t_info, node, 1);
+	argv[0] = gf_sg_script_to_qjs_field(priv, &r->FromField, r->FromNode, 1);
+
+	rval = JS_Call(priv->js_ctx, r->fun, obj, 2, argv);
+	if (JS_IsException(rval))
+		js_dump_error(priv->js_ctx);
+
+	JS_FreeValue(priv->js_ctx, argv[0]);
+	JS_FreeValue(priv->js_ctx, argv[1]);
+	JS_FreeValue(priv->js_ctx, rval);
+
+	js_do_loop(priv->js_ctx);
+	gf_js_lock(priv->js_ctx, 0);
+
+	do_js_gc(priv->js_ctx, node);
+}
+
+static JSValue addRoute(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSField *ptr;
+	GF_Node *n1, *n2;
+	const char *f1;
+	GF_FieldInfo info;
+	u32 f_id1, f_id2;
+	GF_Err e;
+	if (argc!=4) return JS_EXCEPTION;
+	ptr = (GF_JSField *) JS_GetOpaque(argv[0], SFNodeClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	n1 = * ((GF_Node **)ptr->field.far_ptr);
+	if (!n1) return JS_EXCEPTION;
+	n2 = NULL;
+
+	if (!JS_IsString(argv[1])) return JS_EXCEPTION;
+	f1 = JS_ToCString(c, argv[1]);
+	if (!f1) return JS_FALSE;
+	if (!strnicmp(f1, "_field", 6)) {
+		f_id1 = atoi(f1+6);
+		e = gf_node_get_field(n1, f_id1, &info);
+	} else {
+		e = gf_node_get_field_by_name(n1, (char *) f1, &info);
+		f_id1 = info.fieldIndex;
+	}
+	JS_FreeCString(c, f1);
+	if (e != GF_OK) return JS_EXCEPTION;
+
+
+	if (!JS_IsObject(argv[2])) return JS_EXCEPTION;
+
+	ptr = (GF_JSField *) JS_GetOpaque(argv[2], SFNodeClass.class_id);
+
+	/*regular route*/
+	if (ptr && JS_IsString(argv[3]) ) {
+		const char *f2;
+		GF_Route *r;
+		assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+		n2 = * ((GF_Node **)ptr->field.far_ptr);
+		if (!n2) return JS_EXCEPTION;
+
+		f2 = JS_ToCString(c, argv[3]);
+		if (!f2) return JS_EXCEPTION;
+
+		if (!strnicmp(f2, "_field", 6)) {
+			f_id2 = atoi(f2+6);
+			e = gf_node_get_field(n2, f_id2, &info);
+		} else {
+			if ((n2->sgprivate->tag==TAG_MPEG4_Script)
+#ifndef GPAC_DISABLE_X3D
+			        || (n2->sgprivate->tag==TAG_X3D_Script)
+#endif
+			   ) {
+				GF_FieldInfo src = info;
+				if (gf_node_get_field_by_name(n2, (char *) f2, &info) != GF_OK) {
+					gf_sg_script_field_new(n2, GF_SG_SCRIPT_TYPE_EVENT_IN, src.fieldType, f2);
+				}
+			}
+			e = gf_node_get_field_by_name(n2, (char *) f2, &info);
+			f_id2 = info.fieldIndex;
+		}
+		JS_FreeCString(c, f2);
+		if (e != GF_OK) return JS_EXCEPTION;
+
+		r = gf_sg_route_new(n1->sgprivate->scenegraph, n1, f_id1, n2, f_id2);
+		if (!r) return JS_EXCEPTION;
+	}
+	/*route to object*/
+	else {
+		u32 i = 0;
+		const char *fun_name;
+		JSAtom atom;
+		GF_RouteToScript *r = NULL;
+		if (!JS_IsFunction(c, argv[3]) ) return JS_EXCEPTION;
+
+		atom = JS_ValueToAtom(c, argv[3]);
+		fun_name = JS_AtomToCString(c, atom);
+		if (fun_name && n1->sgprivate->interact && n1->sgprivate->interact->routes ) {
+			while ( (r = (GF_RouteToScript*)gf_list_enum(n1->sgprivate->interact->routes, &i) )) {
+				if ( (r->FromNode == n1)
+				        && (r->FromField.fieldIndex == f_id1)
+				        && (r->ToNode == (GF_Node*)JS_GetScript(c))
+				        && !stricmp(r->ToField.name, fun_name)
+				   )
+					break;
+			}
+		}
+		JS_FreeCString(c, fun_name);
+		JS_FreeAtom(c, atom);
+
+		if ( !r ) {
+			GF_SAFEALLOC(r, GF_RouteToScript)
+			if (!r) return JS_FALSE;
+			r->FromNode = n1;
+			r->FromField.fieldIndex = f_id1;
+			gf_node_get_field(r->FromNode, f_id1, &r->FromField);
+
+			r->ToNode = (GF_Node*)JS_GetScript(c);
+			r->ToField.fieldType = GF_SG_VRML_SCRIPT_FUNCTION;
+			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;
+
+			r->obj = JS_DupValue(c, argv[2]);
+			r->fun = JS_DupValue(c, argv[3]);
+
+			r->is_setup = 1;
+			r->graph = n1->sgprivate->scenegraph;
+
+			if (!n1->sgprivate->interact) {
+				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 (!n1->sgprivate->interact->routes) n1->sgprivate->interact->routes = gf_list_new();
+			gf_list_add(n1->sgprivate->interact->routes, r);
+			gf_list_add(n1->sgprivate->scenegraph->Routes, r);
+		}
+	}
+
+	return JS_UNDEFINED;
+}
+
+static JSValue deleteRoute(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSField *ptr;
+	GF_Node *n1, *n2;
+	const char *f1, *f2;
+	GF_FieldInfo info;
+	GF_RouteToScript *rts;
+	GF_Err e;
+	u32 f_id1, f_id2, i;
+	if (argc!=4) return JS_FALSE;
+
+	if (!JS_IsObject(argv[0]) || JS_IsNull(argv[0]))
+	 	return JS_EXCEPTION;
+
+	ptr = JS_GetOpaque(argv[0], SFNodeClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+
+	if (JS_IsString(argv[1]) && JS_IsNull(argv[2]) && JS_IsNull(argv[3])) {
+		n1 = * ((GF_Node **)ptr->field.far_ptr);
+		f1 = JS_ToCString(c, argv[1]);
+		if (!strcmp(f1, "ALL")) {
+			while (n1->sgprivate->interact && n1->sgprivate->interact->routes && gf_list_count(n1->sgprivate->interact->routes) ) {
+				GF_Route *r = gf_list_get(n1->sgprivate->interact->routes, 0);
+				gf_sg_route_del(r);
+			}
+		}
+		JS_FreeCString(c, f1);
+		return JS_UNDEFINED;
+	}
+	if (!JS_IsString(argv[1]) || !JS_IsString(argv[3])) return JS_EXCEPTION;
+
+	n1 = * ((GF_Node **)ptr->field.far_ptr);
+
+	ptr = JS_GetOpaque(argv[2], SFNodeClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	n2 = * ((GF_Node **)ptr->field.far_ptr);
+
+	if (!n1 || !n2) return JS_EXCEPTION;
+	if (!n1->sgprivate->interact) return JS_UNDEFINED;
+
+	f1 = JS_ToCString(c, argv[1]);
+	f2 = JS_ToCString(c, argv[3]);
+	if (!f1 || !f2) {
+		JS_FreeCString(c, f1);
+		JS_FreeCString(c, f2);
+		return JS_EXCEPTION;
+	}
+
+	if (!strnicmp(f1, "_field", 6)) {
+		f_id1 = atoi(f1+6);
+		e = gf_node_get_field(n1, f_id1, &info);
+	} else {
+		e = gf_node_get_field_by_name(n1, (char *)f1, &info);
+		f_id1 = info.fieldIndex;
+	}
+	JS_FreeCString(c, f1);
+	if (e != GF_OK) return JS_EXCEPTION;
+
+	if (!strnicmp(f2, "_field", 6)) {
+		f_id2 = atoi(f2+6);
+		e = gf_node_get_field(n2, f_id2, &info);
+	} else {
+		e = gf_node_get_field_by_name(n2, (char *)f2, &info);
+		f_id2 = info.fieldIndex;
+	}
+	JS_FreeCString(c, f2);
+	if (e != GF_OK) return JS_EXCEPTION;
+
+	i=0;
+	while ((rts = gf_list_enum(n1->sgprivate->interact->routes, &i))) {
+		if (rts->FromField.fieldIndex != f_id1) continue;
+		if (rts->ToNode != n2) continue;
+		if (rts->ToField.fieldIndex != f_id2) continue;
+		JS_FreeValue(c, rts->fun);
+		JS_FreeValue(c, rts->obj);
+		gf_sg_route_del((GF_Route *) rts);
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue loadURL(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 i;
+	GF_JSAPIParam par;
+	GF_JSField *f;
+	M_Script *script = (M_Script *) JS_GetContextOpaque(c);
+
+	if (argc < 1) return JS_EXCEPTION;
+
+	if (JS_IsString(argv[0])) {
+		Bool res;
+		par.uri.url = (char *) JS_ToCString(c, argv[0]);
+		/*TODO add support for params*/
+		par.uri.nb_params = 0;
+		res = ScriptAction(c, NULL, GF_JSAPI_OP_LOAD_URL, (GF_Node *)script, &par);
+		JS_FreeCString(c, par.uri.url);
+		return res ? JS_TRUE : JS_FALSE;
+	}
+	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+
+	f = (GF_JSField *) JS_GetOpaque_Nocheck(argv[0]);
+	if (!f || !f->mfvals) return JS_EXCEPTION;
+
+	for (i=0; i<f->mfvals_count; i++) {
+		Bool res=GF_FALSE;
+		JSValue item = f->mfvals[i];
+
+		if (JS_IsString(item)) {
+			par.uri.url = (char *) JS_ToCString(c, item);
+			/*TODO add support for params*/
+			par.uri.nb_params = 0;
+			res = ScriptAction(c, NULL, GF_JSAPI_OP_LOAD_URL, (GF_Node*)script, &par);
+			JS_FreeCString(c, par.uri.url);
+		}
+		if (res) return JS_TRUE;
+	}
+	return JS_FALSE;
+}
+
+static JSValue setDescription(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_JSAPIParam par;
+	GF_Node *node = JS_GetContextOpaque(c);
+	if (!argc || !JS_IsString(argv[0])) return JS_EXCEPTION;
+	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);
+	return JS_TRUE;
+}
+
+static JSValue createVrmlFromString(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+#ifndef GPAC_DISABLE_LOADER_BT
+	GF_ScriptPriv *priv;
+	GF_FieldInfo field;
+	JSValue res;
+	/*BT/VRML from string*/
+	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, char *node_str, Bool force_wrl);
+	const char *str;
+	GF_List *nlist;
+	GF_Node *sc_node = JS_GetContextOpaque(c);
+	if (!sc_node || (argc < 1)) return JS_EXCEPTION;
+
+	if (!JS_IsString(argv[0])) return JS_EXCEPTION;
+	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;
+
+	priv = JS_GetScriptStack(c);
+	memset(&field, 0, sizeof(GF_FieldInfo));
+	field.fieldType = GF_SG_VRML_MFNODE;
+	field.far_ptr = &nlist;
+	res = gf_sg_script_to_qjs_field(priv, &field, NULL, 0);
+
+	/*don't forget to unregister all this stuff*/
+	while (gf_list_count(nlist)) {
+		GF_Node *n = gf_list_get(nlist, 0);
+		gf_list_rem(nlist, 0);
+		gf_node_unregister(n, NULL);
+	}
+	gf_list_del(nlist);
+	return res;
+#else
+	return JS_EXCEPTION;
+#endif
+}
+
+void gf_node_event_out_proto(GF_Node *node, u32 FieldIndex);
+
+void Script_FieldChanged(JSContext *c, GF_Node *parent, GF_JSField *parent_owner, GF_FieldInfo *field)
+{
+	u32 script_field;
+	u32 i;
+
+	if (!parent && parent_owner) {
+		parent = parent_owner->owner;
+		field = &parent_owner->field;
+	}
+	if (!parent) return;
+
+	script_field = 0;
+	if ((parent->sgprivate->tag == TAG_MPEG4_Script)
+#ifndef GPAC_DISABLE_X3D
+	        || (parent->sgprivate->tag == TAG_X3D_Script)
+#endif
+	   ) {
+		script_field = 1;
+		if ( (GF_Node *) JS_GetContextOpaque(c) == parent) script_field = 2;
+	}
+
+	if (script_field!=2) {
+		if (field->on_event_in) field->on_event_in(parent, NULL);
+		else if (script_field && (field->eventType==GF_SG_EVENT_IN) ) {
+			gf_sg_script_event_in(parent, field);
+			gf_node_changed_internal(parent, field, 0);
+			return;
+		}
+		/*field has changed, set routes...*/
+		if (parent->sgprivate->tag == TAG_ProtoNode) {
+			GF_ProtoInstance *inst = (GF_ProtoInstance *)parent;
+			gf_sg_proto_propagate_event(parent, field->fieldIndex, (GF_Node*)JS_GetScript(c));
+			/* Node exposedField can also be routed to another field */
+			gf_node_event_out_proto(parent, field->fieldIndex);
+
+			//hardcoded protos be implemented in ways not inspecting the node_dirty propagation scheme (eg defining an SFNode in their interface, not linked with the graph).
+			//in this case handle the node as a regular one
+			if (inst->flags & GF_SG_PROTO_HARDCODED) {
+				gf_node_changed_internal(parent, field, 0);
+			}
+		} else {
+			gf_node_event_out(parent, field->fieldIndex);
+			gf_node_changed_internal(parent, field, 0);
+		}
+		return;
+	}
+	/*otherwise mark field if eventOut*/
+	if (parent_owner || parent) {
+		GF_ScriptPriv *priv = parent ? parent->sgprivate->UserPrivate : parent_owner->owner->sgprivate->UserPrivate;
+		GF_ScriptField *sf;
+		i=0;
+		while ((sf = gf_list_enum(priv->fields, &i))) {
+			if (sf->ALL_index == field->fieldIndex) {
+				/*queue eventOut*/
+				if (sf->eventType == GF_SG_EVENT_OUT) {
+					sf->activate_event_out = 1;
+				}
+			}
+		}
+	}
+}
+
+static JSValue gf_sg_script_eventout_set_prop(JSContext *c, JSValueConst this_val, JSValueConst val, int magic)
+{
+	u32 i;
+	GF_ScriptPriv *script;
+	GF_Node *n;
+	GF_ScriptField *sf;
+
+	script = JS_GetScriptStack(c);
+	if (!script) return JS_EXCEPTION;
+	n = (GF_Node *) JS_GetScript(c);
+	if (!n) return JS_EXCEPTION;
+
+	i=0;
+	while ((sf = gf_list_enum(script->fields, &i))) {
+		if (sf->magic==magic) {
+			GF_FieldInfo info;
+			gf_node_get_field(n, sf->ALL_index, &info);
+			gf_sg_script_to_node_field(c, val, &info, n, NULL);
+			sf->activate_event_out = 1;
+			return JS_UNDEFINED;
+		}
+	}
+	return JS_EXCEPTION;
+}
+
+
+/*generic ToString method*/
+static GFINLINE void sffield_toString(char **str, void *f_ptr, u32 fieldType)
+{
+	char temp[1000];
+
+	switch (fieldType) {
+	case GF_SG_VRML_SFVEC2F:
+	{
+		SFVec2f val = * ((SFVec2f *) f_ptr);
+		sprintf(temp, "%f %f", FIX2FLT(val.x), FIX2FLT(val.y));
+		gf_dynstrcat(str, temp, NULL);
+		break;
+	}
+	case GF_SG_VRML_SFVEC3F:
+	{
+		SFVec3f val = * ((SFVec3f *) f_ptr);
+		sprintf(temp, "%f %f %f", FIX2FLT(val.x), FIX2FLT(val.y), FIX2FLT(val.z));
+		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);
+		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_SFCOLOR:
+	{
+		SFColor val = * ((SFColor *) f_ptr);
+		sprintf(temp, "%f %f %f", FIX2FLT(val.red), FIX2FLT(val.green), FIX2FLT(val.blue));
+		gf_dynstrcat(str, temp, NULL);
+		break;
+	}
+	case GF_SG_VRML_SFIMAGE:
+	{
+		SFImage *val = ((SFImage *)f_ptr);
+		sprintf(temp, "%dx%dx%d", val->width, val->height, val->numComponents);
+		gf_dynstrcat(str, temp, NULL);
+		break;
+	}
+
+	}
+}
+
+static void JS_ObjectDestroyed(JSRuntime *rt, JSValue obj, GF_JSField *ptr, Bool is_js_call)
+{
+	JS_SetOpaque(obj, NULL);
+	if (!ptr) return;
+
+	/*if ptr is a node, remove node binding*/
+	if (ptr->node
+			&& ptr->node->sgprivate->interact
+			&& ptr->node->sgprivate->interact->js_binding
+			&& (ptr->node->sgprivate->interact->js_binding->pf == ptr)
+	   ) {
+		ptr->node->sgprivate->interact->js_binding->pf = NULL;
+	}
+
+	/*if ptr is a field, remove field binding from parent*/
+	if (ptr->owner && ptr->owner->sgprivate->interact && ptr->owner->sgprivate->interact->js_binding) {
+		gf_list_del_item(ptr->owner->sgprivate->interact->js_binding->fields, ptr);
+	}
+
+	/*
+		If object is still registered, remove it from the js_cache
+	*/
+	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)
+				return;
+			priv = JS_GetScriptStack(ptr->js_ctx);
+			gf_list_del_item(priv->jsf_cache, ptr);
+		}
+		ptr->obj = JS_UNDEFINED;
+	}
+}
+
+
+static JSValue field_toString(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	u32 i;
+	JSValue item;
+	Double d;
+	char *str = NULL;
+	GF_JSField *f = JS_GetOpaque_Nocheck(this_val);
+	if (!f) return JS_FALSE;
+
+	if (gf_sg_vrml_is_sf_field(f->field.fieldType)) {
+		sffield_toString(&str, f->field.far_ptr, f->field.fieldType);
+	} else {
+		if (f->field.fieldType == GF_SG_VRML_MFNODE) return JS_TRUE;
+
+		gf_dynstrcat(&str, "[", NULL);
+
+		for (i=0; i<f->mfvals_count; i++) {
+			char temp[1000];
+			s32 ival;
+			item = f->mfvals[i];
+			switch (f->field.fieldType) {
+			case GF_SG_VRML_MFBOOL:
+				sprintf(temp, "%s", JS_ToBool(c, item) ? "TRUE" : "FALSE");
+				gf_dynstrcat(&str, temp, NULL);
+				break;
+			case GF_SG_VRML_MFINT32:
+				JS_ToInt32(c, &ival, item);
+				sprintf(temp, "%d", ival);
+				gf_dynstrcat(&str, temp, NULL);
+				break;
+			case GF_SG_VRML_MFFLOAT:
+			case GF_SG_VRML_MFTIME:
+				JS_ToFloat64(c, &d, item);
+				sprintf(temp, "%g", d);
+				gf_dynstrcat(&str, temp, NULL);
+				break;
+			case GF_SG_VRML_MFSTRING:
+			case GF_SG_VRML_MFURL:
+			{
+				char *str_val = (char *) JS_ToCString(c, item);
+				gf_dynstrcat(&str, str_val, NULL);
+				JS_FreeCString(c, str_val);
+			}
+			break;
+			default:
+				if (JS_IsObject(item)) {
+					GF_JSField *sf = (GF_JSField *) JS_GetOpaque_Nocheck(item);
+					sffield_toString(&str, sf->field.far_ptr, sf->field.fieldType);
+				}
+				break;
+			}
+			if (i < f->mfvals_count-1) gf_dynstrcat(&str, ", ", NULL);
+		}
+		gf_dynstrcat(&str, "]", NULL);
+	}
+	item = JS_NewString(c, str ? str : "");
+	if (str) gf_free(str);
+	return item;
+}
+
+static JSValue SFNodeConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	u32 tag, ID;
+	GF_Node *new_node;
+	GF_JSField *field;
+	GF_Proto *proto;
+	GF_SceneGraph *sg;
+	char *node_name;
+	GF_ScriptPriv *priv = JS_GetScriptStack(c);
+	M_Script *sc = JS_GetScript(c);
+
+	if (argc && !JS_IsString(argv[0]))
+		return JS_EXCEPTION;
+
+	tag = 0;
+	if (!argc) {
+		JSValue obj = JS_NewObjectClass(c, SFNodeClass.class_id);
+		if (JS_IsException(obj)) return obj;
+		field = NewJSField(c);
+		field->field.fieldType = GF_SG_VRML_SFNODE;
+		field->node = NULL;
+		field->field.far_ptr = &field->node;
+		JS_SetOpaque(obj, field);
+		return obj;
+	}
+
+	ID = 0;
+	node_name = (char *) JS_ToCString(c, argv[0]);
+	if (!node_name) return JS_EXCEPTION;
+
+	if (!strnicmp(node_name, "_proto", 6)) {
+		ID = atoi(node_name+6);
+		JS_FreeCString(c, node_name);
+		node_name = NULL;
+
+locate_proto:
+
+		/*locate proto in current graph and all parents*/
+		sg = sc->sgprivate->scenegraph;
+		while (1) {
+			proto = gf_sg_find_proto(sg, ID, node_name);
+			if (proto) break;
+			if (!sg->parent_scene) break;
+			sg = sg->parent_scene;
+		}
+		if (!proto) {
+			JS_FreeCString(c, node_name);
+			return JS_FALSE;
+		}
+		/* create interface and load code in current graph*/
+		new_node = gf_sg_proto_create_instance(sc->sgprivate->scenegraph, proto);
+		if (!new_node) {
+			JS_FreeCString(c, node_name);
+			return JS_FALSE;
+		}
+		/*OK, instantiate proto code*/
+		if (gf_sg_proto_load_code(new_node) != GF_OK) {
+			gf_node_unregister(new_node, NULL);
+			JS_FreeCString(c, node_name);
+			return JS_FALSE;
+		}
+	} else {
+		switch (sc->sgprivate->tag) {
+		case TAG_MPEG4_Script:
+			tag = gf_node_mpeg4_type_by_class_name(node_name);
+			break;
+#ifndef GPAC_DISABLE_X3D
+		case TAG_X3D_Script:
+			tag = gf_node_x3d_type_by_class_name(node_name);
+			break;
+#endif
+		}
+		if (!tag) goto locate_proto;
+		new_node = gf_node_new(sc->sgprivate->scenegraph, tag);
+		if (!new_node) {
+			JS_FreeCString(c, node_name);
+			return JS_FALSE;
+		}
+		gf_node_init(new_node);
+	}
+
+	JS_FreeCString(c, node_name);
+
+	return JS_DupValue(c, node_get_binding(priv, new_node));
+}
+static void node_finalize_ex(JSRuntime *rt, JSValue obj, Bool is_js_call)
+{
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	JS_ObjectDestroyed(rt, obj, ptr, is_js_call);
+	if (!ptr) return;
+
+	if (ptr->node
+			/*num_instances may be 0 if the node is the script being destroyed*/
+			&& ptr->node->sgprivate->num_instances
+	   ) {
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] unregistering node %s (%s)\n", gf_node_get_name(ptr->node), gf_node_get_class_name(ptr->node)));
+
+		gf_node_unregister(ptr->node, NULL);
+	}
+	gf_free(ptr);
+}
+
+static void node_finalize(JSRuntime *rt, JSValue val)
+{
+	node_finalize_ex(rt, val, GF_TRUE);
+	
+}
+
+static JSValue node_toString(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	char str[1000];
+	u32 id;
+	GF_Node *n;
+	GF_JSField *f;
+	const char *name;
+
+	f = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	if (!f) return JS_EXCEPTION;
+
+	str[0] = 0;
+	n = * ((GF_Node **)f->field.far_ptr);
+	if (!n) return JS_EXCEPTION;
+
+	name = gf_node_get_name_and_id(n, &id);
+	if (id) {
+		if (name) {
+			snprintf(str, 500, "DEF %s ", name);
+		} else {
+			snprintf(str, 500, "DEF %d ", id - 1);
+		}
+	}
+	strncat(str, gf_node_get_class_name(n), 500);
+	return JS_NewString(c, (const char *) str);
+}
+
+static JSValue node_getTime(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	GF_Node *n;
+	GF_JSField *f;
+	f = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	if (!f) return JS_EXCEPTION;
+	n = * ((GF_Node **)f->field.far_ptr);
+	if (!n) return JS_EXCEPTION;
+	return JS_NewFloat64(c, gf_node_get_scene_time(n));
+}
+
+static JSValue node_getProperty(JSContext *c, JSValueConst obj, JSAtom atom, JSValueConst receiver)
+{
+	GF_Node *n;
+	u32 index;
+	JSValue res;
+	const char *fieldName;
+	GF_FieldInfo info;
+	GF_JSField *ptr;
+	GF_ScriptPriv *priv;
+
+	ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	n = * ((GF_Node **)ptr->field.far_ptr);
+	if (!n) return JS_EXCEPTION;
+	priv = JS_GetScriptStack(c);
+
+	fieldName = JS_AtomToCString(c, atom);
+	if (!fieldName) return JS_EXCEPTION;
+
+	if (!strcmp(fieldName, "toString")) {
+		JS_FreeCString(c, fieldName);
+		return JS_DupValue(priv->js_ctx, priv->node_toString_fun);
+	}
+	if (!strcmp(fieldName, "getTime")) {
+		JS_FreeCString(c, fieldName);
+		return JS_DupValue(priv->js_ctx, priv->node_getTime_fun);
+	}
+	if (!strcmp(fieldName, "addEventListener") || !strcmp(fieldName, "addEventListenerNS")) {
+		JS_FreeCString(c, fieldName);
+		return JS_DupValue(priv->js_ctx, priv->node_addEventListener_fun);
+	}
+	if (!strcmp(fieldName, "removeEventListener") || !strcmp(fieldName, "removeEventListenerNS")) {
+		JS_FreeCString(c, fieldName);
+		return JS_DupValue(priv->js_ctx, priv->node_removeEventListener_fun);
+	}
+	/*fieldID indexing*/
+	if (!strnicmp(fieldName, "_field", 6)) {
+		index = atoi(fieldName+6);
+		if ( gf_node_get_field(n, index, &info) == GF_OK) {
+			res = gf_sg_script_to_qjs_field(priv, &info, n, 0);
+			JS_FreeCString(c, fieldName);
+			return res;
+		}
+	} else if ( gf_node_get_field_by_name(n, (char *) fieldName, &info) == GF_OK) {
+		res = gf_sg_script_to_qjs_field(priv, &info, n, 0);
+		JS_FreeCString(c, fieldName);
+		return res;
+	}
+
+	if (!strcmp(fieldName, "_bounds")) {
+		GF_JSAPIParam par;
+		par.bbox.is_set = 0;
+		if (ScriptAction(c, n->sgprivate->scenegraph, GF_JSAPI_OP_GET_LOCAL_BBOX, (GF_Node *)n, &par) ) {
+			JSValue _obj = JS_NewObjectClass(priv->js_ctx, AnyClass.class_id);
+			Float x, y, w, h;
+			x = y = w = h = 0;
+			if (par.bbox.is_set) {
+				x = FIX2FLT(par.bbox.min_edge.x);
+				y = FIX2FLT(par.bbox.min_edge.y);
+				w = FIX2FLT(par.bbox.max_edge.x - par.bbox.min_edge.x);
+				h = FIX2FLT(par.bbox.max_edge.y - par.bbox.min_edge.y);
+			}
+			JS_SetPropertyStr(priv->js_ctx, _obj, "x", JS_NewFloat64(c, x));
+			JS_SetPropertyStr(priv->js_ctx, _obj, "y", JS_NewFloat64(c, y));
+			JS_SetPropertyStr(priv->js_ctx, _obj, "width", JS_NewFloat64(c, w));
+			JS_SetPropertyStr(priv->js_ctx, _obj, "height", JS_NewFloat64(c, h));
+			JS_FreeCString(c, fieldName);
+			return _obj;
+		}
+	}
+	JS_FreeCString(c, fieldName);
+	return JS_UNDEFINED;
+}
+
+static int node_setProperty(JSContext *c, JSValueConst obj, JSAtom atom, JSValueConst value, JSValueConst receiver, int flags)
+{
+	GF_Node *n;
+	GF_FieldInfo info;
+	u32 index;
+	const char *fieldname;
+	Bool isOK = GF_FALSE;
+	GF_JSField *ptr;
+
+	ptr = (GF_JSField *) JS_GetOpaque(obj, SFNodeClass.class_id);
+	if (! ptr) return -1;
+	fieldname = JS_AtomToCString(c, atom);
+	if (!fieldname) return -1;
+
+	assert(ptr->field.fieldType==GF_SG_VRML_SFNODE);
+	n = * ((GF_Node **)ptr->field.far_ptr);
+
+	/*fieldID indexing*/
+	if (!strnicmp(fieldname, "_field", 6)) {
+		index = atoi(fieldname+6);
+		JS_FreeCString(c, fieldname);
+		if ( gf_node_get_field(n, index, &info) == GF_OK) {
+			isOK = GF_TRUE;
+		}
+	} else {
+		if (gf_node_get_field_by_name(n, (char *)fieldname, &info) == GF_OK) {
+			isOK = GF_TRUE;
+		} else {
+			/*VRML style*/
+			if (!strnicmp(fieldname, "set_", 4)) {
+				if (gf_node_get_field_by_name(n, (char *) fieldname + 4, &info) == GF_OK) {
+					isOK = GF_TRUE;
+				}
+			}
+		}
+	}
+	if (!isOK) {
+		JS_FreeCString(c, fieldname);
+		JS_DefinePropertyValue(c, obj, atom, JS_DupValue(c, value), JS_PROP_WRITABLE | JS_PROP_CONFIGURABLE);
+		return 0;
+	}
+
+	JS_FreeCString(c, fieldname);
+
+	if (gf_node_get_tag(n)==TAG_ProtoNode)
+		gf_sg_proto_mark_field_loaded(n, &info);
+
+	gf_sg_script_to_node_field(c, value, &info, n, ptr);
+	return 1;
+}
+
+
+/* Generic field destructor */
+static void field_finalize(JSRuntime *rt, JSValue obj)
+{
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque_Nocheck(obj);
+	JS_ObjectDestroyed(rt, obj, ptr, 1);
+	if (!ptr) return;
+
+	if (ptr->field_ptr) gf_sg_vrml_field_pointer_del(ptr->field_ptr, ptr->field.fieldType);
+	gf_free(ptr);
+}
+
+
+
+/*SFImage class functions */
+static GFINLINE GF_JSField *SFImage_Create(JSContext *c, JSValue obj, u32 w, u32 h, u32 nbComp, MFInt32 *pixels)
+{
+	u32 i, len;
+	GF_JSField *field;
+	SFImage *v;
+	field = NewJSField(c);
+	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFIMAGE);
+	field->field_ptr = field->field.far_ptr = v;
+	field->field.fieldType = GF_SG_VRML_SFIMAGE;
+	v->width = w;
+	v->height = h;
+	v->numComponents = nbComp;
+	v->pixels = (u8 *) gf_malloc(sizeof(u8) * nbComp * w * h);
+	len = MIN(nbComp * w * h, pixels->count);
+	for (i=0; i<len; i++) v->pixels[i] = (u8) pixels->vals[i];
+	JS_SetOpaque(obj, field);
+	return field;
+}
+
+static JSValue SFImageConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	u32 w, h, nbComp;
+	MFInt32 *pixels;
+	JSValue obj;
+	if (argc<4) return JS_EXCEPTION;
+	if (!JS_IsInteger(argv[0]) || !JS_IsInteger(argv[1]) || !JS_IsInteger(argv[2]) || !JS_IsObject(argv[3]) )
+		return JS_EXCEPTION;
+
+	pixels = JS_GetOpaque(argv[3], MFInt32Class.class_id);
+	if (!pixels) return JS_EXCEPTION;
+
+	obj = JS_NewObjectClass(c, SFImageClass.class_id);
+	if (JS_IsException(obj)) return obj;
+	JS_ToInt32(c, &w, argv[0]);
+	JS_ToInt32(c, &h, argv[1]);
+	JS_ToInt32(c, &nbComp, argv[2]);
+	SFImage_Create(c, obj, w, h, nbComp, pixels);
+	return obj;
+}
+
+static JSValue image_getProperty(JSContext *c, JSValueConst this_val, int magic)
+{
+	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;
+	sfi = (SFImage*)val->field.far_ptr;
+
+	switch (magic) {
+	case 0: return JS_NewInt32(c, sfi->width);
+	case 1: return JS_NewInt32(c, sfi->height);
+	case 2: return JS_NewInt32(c, sfi->numComponents);
+	case 3:
+	{
+		u32 i, len;
+		JSValue an_obj = JS_NewObjectClass(c, MFInt32Class.class_id);
+		len = sfi->width*sfi->height*sfi->numComponents;
+		for (i=0; i<len; i++) {
+			JS_SetPropertyUint32(priv->js_ctx, an_obj, i, JS_NewInt32(c, sfi->pixels[i]) );
+		}
+	}
+		break;
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue image_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	u32 ival;
+	Bool changed = 0;
+	SFImage *sfi;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFImageClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	sfi = (SFImage*)ptr->field.far_ptr;
+	switch (magic) {
+	case 0:
+		JS_ToInt32(c, &ival, value);
+		changed = ! (sfi->width == ival);
+		sfi->width = ival;
+		if (changed && sfi->pixels) {
+			gf_free(sfi->pixels);
+			sfi->pixels = NULL;
+		}
+		break;
+	case 1:
+		JS_ToInt32(c, &ival, value);
+		changed = ! (sfi->height == ival);
+		sfi->height = ival;
+		if (changed && sfi->pixels) {
+			gf_free(sfi->pixels);
+			sfi->pixels = NULL;
+		}
+		break;
+	case 2:
+		JS_ToInt32(c, &ival, value);
+		changed = ! (sfi->numComponents == ival);
+		sfi->numComponents = ival;
+		if (changed && sfi->pixels) {
+			gf_free(sfi->pixels);
+			sfi->pixels = NULL;
+		}
+		break;
+	case 3:
+	{
+		MFInt32 *pixels;
+		GF_JSField *sf;
+		u32 len, i;
+		sf = JS_GetOpaque(value, MFInt32Class.class_id);
+		if (!sf) return JS_EXCEPTION;
+		pixels = (MFInt32 *) sf->field.far_ptr;
+		if (sfi->pixels) gf_free(sfi->pixels);
+		len = sfi->width*sfi->height*sfi->numComponents;
+		sfi->pixels = (unsigned char *) gf_malloc(sizeof(char)*len);
+		len = MAX(len, pixels->count);
+		for (i=0; i<len; i++) sfi->pixels[i] = (u8) pixels->vals[i];
+		changed = 1;
+		break;
+	}
+	default:
+		return JS_UNDEFINED;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+/*SFVec2f class functions */
+static GFINLINE GF_JSField *SFVec2f_Create(JSContext *c, JSValue obj, Fixed x, Fixed y)
+{
+	GF_JSField *field;
+	SFVec2f *v;
+	field = NewJSField(c);
+	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFVEC2F);
+	field->field_ptr = field->field.far_ptr = v;
+	field->field.fieldType = GF_SG_VRML_SFVEC2F;
+	v->x = x;
+	v->y = y;
+	JS_SetOpaque(obj, field);
+	return field;
+}
+
+static JSValue SFVec2fConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	Double x = 0.0, y = 0.0;
+	JSValue obj = JS_NewObjectClass(c, SFVec2fClass.class_id);
+
+	if (argc > 0) JS_ToFloat64(c, &x, argv[0]);
+	if (argc > 1) JS_ToFloat64(c, &y, argv[1]);
+	SFVec2f_Create(c, obj, FLT2FIX( x), FLT2FIX( y));
+	return obj;
+}
+
+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;
+
+	switch (magic) {
+	case 0:
+		return JS_NewFloat64(c, FIX2FLT( ((SFVec2f*)val->field.far_ptr)->x));
+	case 1:
+		return JS_NewFloat64(c, FIX2FLT( ((SFVec2f*)val->field.far_ptr)->y));
+	default:
+		break;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue vec2f_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	Double d;
+	Fixed v;
+	Bool changed = 0;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFVec2fClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	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"));
+		return JS_FALSE;
+	}
+	switch (magic) {
+	case 0:
+		v = FLT2FIX( d);
+		changed = ! ( ((SFVec2f*)ptr->field.far_ptr)->x == v);
+		((SFVec2f*)ptr->field.far_ptr)->x = v;
+		break;
+	case 1:
+		v = FLT2FIX( d);
+		changed = ! ( ((SFVec2f*)ptr->field.far_ptr)->y == v);
+		((SFVec2f*)ptr->field.far_ptr)->y = v;
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+static JSValue vec2f_operand(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 op)
+{
+	SFVec2f *v1, *v2;
+	Double d = 0.0;
+	JSValue pNew;
+	Fixed v;
+	GF_JSField *p1 = (GF_JSField *) JS_GetOpaque(obj, SFVec2fClass.class_id);
+	if (!p1) return JS_EXCEPTION;
+	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;
+	}
+
+	v1 = ((GF_JSField *) p1)->field.far_ptr;
+	if (p2)
+		v2 = ((GF_JSField *) p2)->field.far_ptr;
+
+	switch (op) {
+	case 5:
+		return JS_NewFloat64(c, FIX2FLT(gf_v2d_len(v1)) );
+	case 7:
+		if (!p2) return JS_EXCEPTION;
+		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;
+	}
+
+	pNew = JS_NewObjectClass(c, SFVec2fClass.class_id);
+	switch (op) {
+	case 0:
+		SFVec2f_Create(c, pNew, v1->x + v2->x, v1->y + v2->y);
+		break;
+	case 1:
+		SFVec2f_Create(c, pNew, v1->x - v2->x, v1->y - v2->y);
+		break;
+	case 2:
+		SFVec2f_Create(c, pNew, -v1->x , -v1->y );
+		break;
+	case 3:
+		v = FLT2FIX(d);
+		SFVec2f_Create(c, pNew, gf_mulfix(v1->x , v), gf_mulfix(v1->y, v) );
+		break;
+	case 4:
+		v = FLT2FIX(d);
+		SFVec2f_Create(c, pNew, gf_divfix(v1->x, v),  gf_divfix(v1->y, v));
+		break;
+	case 6:
+		v = gf_v2d_len(v1);
+		SFVec2f_Create(c, pNew, gf_divfix(v1->x, v), gf_divfix(v1->y, v) );
+		break;
+	}
+	return pNew;
+}
+
+static JSValue vec2f_add(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 0);
+}
+static JSValue vec2f_subtract(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 1);
+}
+static JSValue vec2f_negate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 2);
+}
+static JSValue vec2f_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 3);
+}
+static JSValue vec2f_divide(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 4);
+}
+static JSValue vec2f_length(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 5);
+}
+static JSValue vec2f_normalize(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 6);
+}
+static JSValue vec2f_dot(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec2f_operand(c, obj, argc, argv, 7);
+}
+
+
+/*SFVec3f class functions */
+static GFINLINE GF_JSField *SFVec3f_Create(JSContext *c, JSValue obj, Fixed x, Fixed y, Fixed z)
+{
+	GF_JSField *field;
+	SFVec3f *v;
+	field = NewJSField(c);
+	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFVEC3F);
+	field->field_ptr = field->field.far_ptr = v;
+	field->field.fieldType = GF_SG_VRML_SFVEC3F;
+	v->x = x;
+	v->y = y;
+	v->z = z;
+	JS_SetOpaque(obj, field);
+	return field;
+}
+
+static JSValue SFVec3fConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	Double x = 0.0, y = 0.0, z = 0.0;
+	JSValue obj = JS_NewObjectClass(c, SFVec3fClass.class_id);
+
+	if (argc > 0) JS_ToFloat64(c, &x, argv[0]);
+	if (argc > 1) JS_ToFloat64(c, &y, argv[1]);
+	if (argc > 2) JS_ToFloat64(c, &z, argv[2]);
+	SFVec3f_Create(c, obj, FLT2FIX( x), FLT2FIX( y), FLT2FIX( z));
+	return obj;
+}
+
+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;
+
+	switch (magic) {
+	case 0:
+		return JS_NewFloat64(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->x));
+	case 1:
+		return JS_NewFloat64(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->y));
+	case 2:
+		return JS_NewFloat64(c, FIX2FLT( ((SFVec3f*)val->field.far_ptr)->z));
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue vec3f_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	Double d;
+	Fixed v;
+	Bool changed = 0;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFVec3fClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	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"));
+		return JS_FALSE;
+	}
+
+	switch (magic) {
+	case 0:
+		v = FLT2FIX( d);
+		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->x == v);
+		((SFVec3f*)ptr->field.far_ptr)->x = v;
+		break;
+	case 1:
+		v = FLT2FIX( d);
+		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->y == v);
+		((SFVec3f*)ptr->field.far_ptr)->y = v;
+		break;
+	case 2:
+		v = FLT2FIX( d);
+		changed = ! ( ((SFVec3f*)ptr->field.far_ptr)->z == v);
+		((SFVec3f*)ptr->field.far_ptr)->z = v;
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+
+static JSValue vec3f_operand(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv, u32 op)
+{
+	SFVec3f vec, wvec, *v1, *v2;
+	Double d=0;
+	JSValue pNew;
+	Fixed v;
+	GF_JSField *p1 = (GF_JSField *) JS_GetOpaque(obj, SFVec3fClass.class_id);
+	if (!p1) return JS_EXCEPTION;
+	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;
+	}
+
+	v1 = ((GF_JSField *) p1)->field.far_ptr;
+	if (p2)
+		v2 = ((GF_JSField *) p2)->field.far_ptr;
+
+	switch (op) {
+	case 0:
+	case 1:
+	case 8:
+		if (!p2) return JS_EXCEPTION;
+	case 5:
+		return JS_NewFloat64(c, FIX2FLT(gf_vec_len(*v1)) );
+	case 7:
+		vec = *v1;
+		if (!p2) return JS_EXCEPTION;
+		wvec = *v2;
+		return JS_NewFloat64(c, FIX2FLT(gf_vec_dot(vec, wvec)) );
+	}
+
+	pNew = JS_NewObjectClass(c, SFVec3fClass.class_id);
+	switch (op) {
+	case 0:
+		SFVec3f_Create(c, pNew, v1->x + v2->x, v1->y + v2->y, v1->z + v2->z);
+		break;
+	case 1:
+		SFVec3f_Create(c, pNew, v1->x - v2->x, v1->y - v2->y, v1->z - v2->z);
+		break;
+	case 2:
+		SFVec3f_Create(c, pNew, -v1->x , -v1->y , -v1->z );
+		break;
+	case 3:
+		v = FLT2FIX(d);
+		SFVec3f_Create(c, pNew, gf_mulfix(v1->x, v), gf_mulfix(v1->y, v), gf_mulfix(v1->z, v) );
+		break;
+	case 4:
+		v = FLT2FIX(d);
+		SFVec3f_Create(c, pNew, gf_divfix(v1->x, v), gf_divfix(v1->y, v), gf_divfix(v1->z, v));
+		break;
+	case 6:
+		vec = *v1;
+		gf_vec_norm(&vec);
+		SFVec3f_Create(c, pNew, vec.x, vec.y, vec.z);
+		break;
+	case 8:
+		vec = gf_vec_cross(*v1, *v2);
+		SFVec3f_Create(c, pNew, vec.x, vec.y, vec.z);
+		break;
+	}
+	return pNew;
+}
+
+static JSValue vec3f_add(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 0);
+}
+static JSValue vec3f_subtract(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 1);
+}
+static JSValue vec3f_negate(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 2);
+}
+static JSValue vec3f_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 3);
+}
+static JSValue vec3f_divide(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 4);
+}
+static JSValue vec3f_length(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 5);
+}
+static JSValue vec3f_normalize(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 6);
+}
+static JSValue vec3f_dot(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 7);
+}
+static JSValue vec3f_cross(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	return vec3f_operand(c, obj, argc, argv, 8);
+}
+
+
+/*SFRotation class*/
+static GFINLINE GF_JSField *SFRotation_Create(JSContext *c, JSValue obj, Fixed x, Fixed y, Fixed z, Fixed q)
+{
+	GF_JSField *field;
+	SFRotation *v;
+	field = NewJSField(c);
+	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFROTATION);
+	field->field_ptr = field->field.far_ptr = v;
+	field->field.fieldType = GF_SG_VRML_SFROTATION;
+	v->x = x;
+	v->y = y;
+	v->z = z;
+	v->q = q;
+	JS_SetOpaque(obj, field);
+	return field;
+}
+
+static JSValue SFRotationConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	GF_JSField *f;
+	SFVec3f v1, v2;
+	Fixed l1, l2, dot;
+	Double x = 0.0, y = 0.0, z = 0.0, a = 0.0;
+	JSValue obj = JS_NewObjectClass(c, SFRotationClass.class_id);
+
+	if (!argc) {
+		SFRotation_Create(c, obj, FLT2FIX(x), FLT2FIX(y), FIX_ONE, FLT2FIX(a) );
+		return obj;
+	}
+	if (JS_IsNumber(argv[0])) {
+		if (argc > 0) JS_ToFloat64(c, &x, argv[0]);
+		if (argc > 1) JS_ToFloat64(c, &y, argv[1]);
+		if (argc > 2) JS_ToFloat64(c, &z, argv[2]);
+		if (argc > 3) JS_ToFloat64(c, &a, argv[3]);
+		SFRotation_Create(c, obj, FLT2FIX(x), FLT2FIX(y), FLT2FIX(z), FLT2FIX(a));
+		return obj;
+	}
+
+
+	if (argc!=2) return JS_EXCEPTION;
+	if (!JS_IsObject(argv[0])) return JS_EXCEPTION;
+	f = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
+	if (!f) return JS_EXCEPTION;
+
+	v1 = * (SFVec3f *) (f)->field.far_ptr;
+	if (JS_IsNumber(argv[1])) {
+		JS_ToFloat64(c, &a, argv[1]);
+		SFRotation_Create(c, obj, v1.x, v1.y, v1.z, FLT2FIX(a));
+		return obj;
+	}
+
+	if (!JS_IsObject(argv[1])) return JS_FALSE;
+	f = JS_GetOpaque(argv[1], SFVec3fClass.class_id);
+	if (!f) return JS_EXCEPTION;
+	v2 = * (SFVec3f *) (f)->field.far_ptr;
+	l1 = gf_vec_len(v1);
+	l2 = gf_vec_len(v2);
+	dot = gf_divfix(gf_vec_dot(v1, v2), gf_mulfix(l1, l2) );
+	a = gf_atan2(gf_sqrt(FIX_ONE - gf_mulfix(dot, dot)), dot);
+	SFRotation_Create(c, obj, gf_mulfix(v1.y, v2.z) - gf_mulfix(v2.y, v1.z),
+	                  gf_mulfix(v1.z, v2.x) - gf_mulfix(v2.z, v1.x),
+	                  gf_mulfix(v1.x, v2.y) - gf_mulfix(v2.x, v1.y),
+	                  FLT2FIX(a));
+	return obj;
+}
+
+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;
+	switch (magic) {
+	case 0:
+		return JS_NewFloat64(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->x));
+	case 1:
+		return JS_NewFloat64(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->y));
+	case 2:
+		return JS_NewFloat64(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->z));
+	case 3:
+		return JS_NewFloat64(c, FIX2FLT( ((SFRotation*)val->field.far_ptr)->q));
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue rot_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	Double d;
+	Fixed v;
+	Bool changed = 0;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	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"));
+		return JS_FALSE;
+	}
+
+	switch (magic) {
+	case 0:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->x == v);
+		((SFRotation*)ptr->field.far_ptr)->x = v;
+		break;
+	case 1:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->y == v);
+		((SFRotation*)ptr->field.far_ptr)->y = v;
+		break;
+	case 2:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->z == v);
+		((SFRotation*)ptr->field.far_ptr)->z = v;
+		break;
+	case 3:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFRotation*)ptr->field.far_ptr)->q == v);
+		((SFRotation*)ptr->field.far_ptr)->q = v;
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+static JSValue rot_getAxis(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFRotation r;
+	JSValue pNew;
+	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	r = * (SFRotation *) (p)->field.far_ptr;
+	pNew = JS_NewObjectClass(c, SFVec3fClass.class_id);
+	SFVec3f_Create(c, pNew, r.x, r.y, r.z);
+	return pNew;
+}
+static JSValue rot_inverse(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFRotation r;
+	JSValue pNew;
+	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	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);
+	return pNew;
+}
+
+static JSValue rot_multiply(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFRotation r1, r2;
+	SFVec4f q1, q2;
+	JSValue pNew;
+
+	if (argc<=0 || !JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	r1 = * (SFRotation *) (p)->field.far_ptr;
+	p = JS_GetOpaque(argv[0], SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	r2 = * (SFRotation *) (p)->field.far_ptr;
+
+	q1 = gf_quat_from_rotation(r1);
+	q2 = gf_quat_from_rotation(r2);
+	q1 = gf_quat_multiply(&q1, &q2);
+	r1 = gf_quat_to_rotation(&q1);
+
+	pNew = JS_NewObjectClass(c, SFRotationClass.class_id);
+	SFRotation_Create(c, pNew, r1.x, r1.y, r1.z, r1.q);
+	return pNew;
+}
+
+static JSValue rot_multVec(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFVec3f v;
+	SFRotation r;
+	GF_Matrix mx;
+	JSValue pNew;
+	if (argc<=0 || !JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+
+	GF_JSField *p = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	r = * (SFRotation *) (p)->field.far_ptr;
+
+	p = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	v = * (SFVec3f *) (p)->field.far_ptr;
+
+	gf_mx_init(mx);
+	gf_mx_add_rotation(&mx, r.q, r.x, r.y, r.z);
+	gf_mx_apply_vec(&mx, &v);
+	pNew = JS_NewObjectClass(c, SFVec3fClass.class_id);
+	SFVec3f_Create(c, pNew, v.x, v.y, v.z);
+	return pNew;
+}
+static JSValue rot_setAxis(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFVec3f v;
+	SFRotation *r;
+	GF_JSField *ptr;
+	if (argc<=0 || !JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+	ptr = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+	r = (SFRotation *) (ptr)->field.far_ptr;
+
+	GF_JSField *p = JS_GetOpaque(argv[0], SFVec3fClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	v = * (SFVec3f *) (p)->field.far_ptr;
+
+	r->x = v.x;
+	r->y = v.y;
+	r->z = v.z;
+	Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_TRUE;
+}
+static JSValue rot_slerp(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	SFRotation v1, v2, res;
+	SFVec4f q1, q2;
+	JSValue pNew;
+	Double d;
+	GF_JSField *p;
+
+	if (argc<=0 || !JS_IsObject(argv[0]))
+		return JS_EXCEPTION;
+	p = JS_GetOpaque(obj, SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	v1 = * (SFRotation *) (p)->field.far_ptr;
+
+	p = JS_GetOpaque(argv[0], SFRotationClass.class_id);
+	if (!p) return JS_EXCEPTION;
+	v2 = * (SFRotation *) (p)->field.far_ptr;
+
+	if (JS_ToFloat64(c, &d, argv[1])) return JS_EXCEPTION;
+
+	q1 = gf_quat_from_rotation(v1);
+	q2 = gf_quat_from_rotation(v2);
+	q1 = gf_quat_slerp(q1, q2, FLT2FIX( d));
+	res = gf_quat_to_rotation(&q1);
+	pNew = JS_NewObjectClass(c, SFRotationClass.class_id);
+	SFRotation_Create(c, pNew, res.x, res.y, res.z, res.q);
+	return pNew;
+}
+
+/* SFColor class functions */
+static GFINLINE GF_JSField *SFColor_Create(JSContext *c, JSValue obj, Fixed r, Fixed g, Fixed b)
+{
+	GF_JSField *field;
+	SFColor *v;
+	field = NewJSField(c);
+	v = gf_sg_vrml_field_pointer_new(GF_SG_VRML_SFCOLOR);
+	field->field_ptr = field->field.far_ptr = v;
+	field->field.fieldType = GF_SG_VRML_SFCOLOR;
+	v->red = r;
+	v->green = g;
+	v->blue = b;
+	JS_SetOpaque(obj, field);
+	return field;
+}
+static JSValue SFColorConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	Double r = 0.0, g = 0.0, b = 0.0;
+	JSValue obj = JS_NewObjectClass(c, SFColorClass.class_id);
+
+	if (argc > 0) JS_ToFloat64(c, &r, argv[0]);
+	if (argc > 1) JS_ToFloat64(c, &g, argv[1]);
+	if (argc > 2) JS_ToFloat64(c, &b, argv[2]);
+	SFColor_Create(c, obj, FLT2FIX( r), FLT2FIX( g), FLT2FIX( b));
+	return obj;
+}
+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;
+	switch (magic) {
+	case 0:
+		return JS_NewFloat64(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->red));
+	case 1:
+		return JS_NewFloat64(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->green));
+		break;
+	case 2:
+		return JS_NewFloat64(c, FIX2FLT( ((SFColor*)val->field.far_ptr)->blue));
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	return JS_UNDEFINED;
+}
+
+static JSValue color_setProperty(JSContext *c, JSValueConst obj, JSValueConst value, int magic)
+{
+	Double d;
+	Fixed v;
+	Bool changed = 0;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(obj, SFColorClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+
+	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"));
+		return JS_FALSE;
+	}
+
+	switch (magic) {
+	case 0:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFColor*)ptr->field.far_ptr)->red == v);
+		((SFColor*)ptr->field.far_ptr)->red = v;
+		break;
+	case 1:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFColor*)ptr->field.far_ptr)->green == v);
+		((SFColor*)ptr->field.far_ptr)->green = v;
+		break;
+	case 2:
+		v = FLT2FIX(d);
+		changed = ! ( ((SFColor*)ptr->field.far_ptr)->blue == v);
+		((SFColor*)ptr->field.far_ptr)->blue = v;
+		break;
+	default:
+		return JS_UNDEFINED;
+	}
+	if (changed) Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+static JSValue color_setHSV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+	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;
+
+	hsv.red = FLT2FIX( h);
+	hsv.green = FLT2FIX( s);
+	hsv.blue = FLT2FIX( v);
+	SFColor_fromHSV(&hsv);
+	gf_sg_vrml_field_copy(v1, &hsv, GF_SG_VRML_SFCOLOR);
+	Script_FieldChanged(c, NULL, ptr, NULL);
+	return JS_UNDEFINED;
+}
+
+static JSValue color_getHSV(JSContext *c, JSValueConst obj, int argc, JSValueConst *argv)
+{
+	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;
+
+	v1 = (ptr)->field.far_ptr;
+	hsv = *v1;
+	SFColor_toHSV(&hsv);
+	arr = JS_NewArray(c);
+	if (JS_IsException(arr)) return arr;
+
+	JS_SetPropertyUint32(c, arr, 0, JS_NewFloat64(c, FIX2FLT(hsv.red)) );
+	JS_SetPropertyUint32(c, arr, 1, JS_NewFloat64(c, FIX2FLT(hsv.green)) );
+	JS_SetPropertyUint32(c, arr, 2, JS_NewFloat64(c, FIX2FLT(hsv.blue)) );
+	return arr;
+}
+
+static JSValue genmf_Constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv, JSClassID mf_class_id, JSClassID sf_class_id, u32 fieldType)
+{
+	u32 i;
+	GF_JSField *ptr;
+	JSValue obj = JS_NewObjectClass(c, mf_class_id);
+	ptr = NewJSField(c);
+	ptr->field.fieldType = fieldType;
+	ptr->obj = obj;
+	JS_SetOpaque(obj, ptr);
+
+	if (!argc || (fieldType==GF_SG_VRML_MFNODE))  return obj;
+	ptr->mfvals = gf_realloc(ptr->mfvals, sizeof(JSValue)*argc);
+	ptr->mfvals_count = argc;
+	for (i=0; i<(u32) argc; i++) {
+		if (sf_class_id) {
+			if (JS_IsObject(argv[i]) && JS_GetOpaque(argv[i], sf_class_id)) {
+				ptr->mfvals[i] = JS_DupValue(c, argv[i]);
+			} else {
+				ptr->mfvals[i] = JS_NewObjectClass(c, sf_class_id);
+			}
+		} else {
+			ptr->mfvals[i] = JS_DupValue(c, argv[i]);
+		}
+	}
+	//don't dup value since this may go directly in script
+	return obj;
+}
+
+static JSValue MFBoolConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFBoolClass.class_id, 0, GF_SG_VRML_MFBOOL);
+}
+static JSValue MFInt32Constructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFInt32Class.class_id, 0, GF_SG_VRML_MFINT32);
+}
+static JSValue MFFloatConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFFloatClass.class_id, 0, GF_SG_VRML_MFFLOAT);
+}
+static JSValue MFTimeConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFTimeClass.class_id, 0, GF_SG_VRML_MFTIME);
+}
+static JSValue MFStringConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFStringClass.class_id, 0, GF_SG_VRML_MFSTRING);
+}
+static JSValue MFURLConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFUrlClass.class_id, 0, GF_SG_VRML_MFURL);
+}
+static JSValue MFNodeConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFNodeClass.class_id, 0, GF_SG_VRML_MFNODE);
+}
+
+static void array_finalize_ex(JSRuntime *rt, JSValue obj, Bool is_js_call)
+{
+	u32 i;
+	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));
+
+	/*MF values*/
+	if (ptr->mfvals) {
+		for (i=0; i<ptr->mfvals_count; i++)
+			JS_FreeValueRT(rt, ptr->mfvals[i] );
+		gf_free(ptr->mfvals);
+	}
+	/*MFNode*/
+	if (ptr->temp_list) {
+		gf_node_unregister_children(ptr->owner, ptr->temp_list);
+	}
+	if (ptr->field_ptr) {
+		gf_sg_vrml_field_pointer_del(ptr->field_ptr, ptr->field.fieldType);
+	}
+	gf_free(ptr);
+}
+
+static void array_finalize(JSRuntime *rt, JSValue obj)
+{
+	array_finalize_ex(rt, obj, GF_TRUE);
+}
+
+
+static JSValue array_getElement(JSContext *c, JSValueConst obj, JSAtom atom, JSValueConst receiver)
+{
+	u32 idx;
+	GF_JSField *ptr = JS_GetOpaque_Nocheck(obj);
+
+	if (!JS_AtomIsArrayIndex(c, &idx, atom)) {
+		JSValue ret = JS_UNDEFINED;
+		const char *str = JS_AtomToCString(c, atom);
+		if (!str) return ret;
+
+		if (!strcmp(str, "length")) {
+			GF_JSField *f_ptr = JS_GetOpaque_Nocheck(obj);
+			if (!f_ptr) {
+				ret = JS_EXCEPTION;
+			} 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 {
+				ret = JS_NewInt32(c, f_ptr->mfvals_count);
+			}
+		} else if (!strcmp(str, "toString")) {
+			ret = JS_NewCFunction(c, field_toString, "toString", 0);
+		}
+		JS_FreeCString(c, str);
+		return ret;
+	}
+
+	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
+		GF_Node *node = gf_node_list_get_child(*(GF_ChildNodeItem **)ptr->field.far_ptr, idx);
+		if (!node) return JS_NULL;
+		return JS_DupValue(c, node_get_binding(JS_GetScriptStack(c), node));
+	} else {
+		JSValue val;
+		if (idx>=ptr->mfvals_count) return JS_NULL;
+		val = ptr->mfvals[idx];
+//		GF_JSField *sf = JS_GetOpaque_Nocheck(val);
+		return JS_DupValue(c, val);
+	}
+	return JS_NULL;
+}
+
+
+static int array_setLength(JSContext *c, GF_JSField *ptr, JSValueConst value)
+{
+	u32 len, i, sftype, old_len;
+	GF_JSClass *the_sf_class;
+
+	if (!JS_IsInteger(value) || !ptr) return -1;
+	len=-1;
+	JS_ToInt32(c, &len, value);
+	if ((s32)len<0) return -1;
+
+	if (!len) {
+		if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
+			gf_node_unregister_children(ptr->owner, *(GF_ChildNodeItem**)ptr->field.far_ptr);
+			*(GF_ChildNodeItem**)ptr->field.far_ptr = NULL;
+		} else {
+			gf_sg_vrml_mf_reset(ptr->field.far_ptr, ptr->field.fieldType);
+		}
+		while (ptr->mfvals_count) {
+			ptr->mfvals_count--;
+			JS_FreeValue(c, ptr->mfvals[ptr->mfvals_count]);
+		}
+		gf_free(ptr->mfvals);
+		ptr->mfvals = NULL;
+		return 1;
+	}
+
+	old_len = ptr->mfvals_count;
+	ptr->mfvals_count = len;
+	if (len == old_len) return 1;
+
+	the_sf_class = NULL;
+	switch (ptr->field.fieldType) {
+	case GF_SG_VRML_MFVEC2F:
+		the_sf_class = &SFVec2fClass;
+		break;
+	case GF_SG_VRML_MFVEC3F:
+		the_sf_class = &SFVec3fClass;
+		break;
+	case GF_SG_VRML_MFCOLOR:
+		the_sf_class = &SFColorClass;
+		break;
+	case GF_SG_VRML_MFROTATION:
+		the_sf_class = &SFRotationClass;
+		break;
+	case GF_SG_VRML_MFNODE:
+	{
+		u32 nb_nodes = gf_node_list_get_count(*(GF_ChildNodeItem**)ptr->field.far_ptr);
+		while (len < nb_nodes) {
+			GF_Node *n = gf_node_list_del_child_idx((GF_ChildNodeItem**)ptr->field.far_ptr, nb_nodes - 1);
+			if (n) gf_node_unregister(n, ptr->owner);
+			nb_nodes--;
+		}
+		if (len>nb_nodes) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML] MFARRAY EXPANSION NOT SUPPORTED!!!\n"));
+		}
+	}
+		return 1;
+	}
+
+	ptr->mfvals = gf_realloc(ptr->mfvals, sizeof(JSValue)*ptr->mfvals_count);
+	sftype = gf_sg_vrml_get_sf_type(ptr->field.fieldType);
+	for (i=old_len; i<len; i++) {
+		JSValue a_val;
+		if (the_sf_class) {
+			GF_JSField *slot;
+			a_val = JS_NewObjectClass(c, the_sf_class->class_id);
+			slot = SFVec2f_Create(c, a_val, 0, 0);
+			if (slot) {
+				slot->owner = ptr->owner;
+			}
+		} else {
+			switch (sftype) {
+			case GF_SG_VRML_SFBOOL:
+				a_val = JS_FALSE;
+				break;
+			case GF_SG_VRML_SFFLOAT:
+			case GF_SG_VRML_SFTIME:
+				a_val = JS_NewFloat64(c, 0);
+				break;
+			case GF_SG_VRML_SFSTRING:
+			case GF_SG_VRML_SFURL:
+				a_val = JS_NewString(c, "");
+				break;
+			case GF_SG_VRML_SFINT32:
+			default:
+				a_val = JS_NewInt32(c, 0);
+				break;
+			}
+		}
+		ptr->mfvals[i] = a_val;
+		gf_sg_vrml_mf_append(ptr->field.far_ptr, ptr->field.fieldType, NULL);
+	}
+	return 1;
+}
+
+//this could be overloaded for each MF type...
+static int array_setElement(JSContext *c, JSValueConst obj, JSAtom atom, JSValueConst value, JSValueConst receiver, int flags)
+{
+	u32 ind;
+	u32 len;
+	Double d;
+	s32 ival;
+	GF_JSField *from;
+	GF_JSClass *the_sf_class = NULL;
+	char *str_val;
+	void *sf_slot;
+	Bool is_append = 0;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque_Nocheck(obj);
+	if (!ptr) return -1;
+
+	if (!JS_AtomIsArrayIndex(c, &ind, atom)) {
+		int ret = 0;
+		const char *str = JS_AtomToCString(c, atom);
+		if (str && !strcmp(str, "length")) {
+			ret = array_setLength(c, ptr, value);
+		}
+		JS_FreeCString(c, str);
+		return ret;
+	}
+	if (ptr->field.fieldType!=GF_SG_VRML_MFNODE) {
+		len = ptr->mfvals_count;
+	} else {
+		len = gf_node_list_get_count(*(GF_ChildNodeItem **)ptr->field.far_ptr);
+	}
+	if (gf_sg_vrml_is_sf_field(ptr->field.fieldType))
+		return -1;
+
+	switch (ptr->field.fieldType) {
+	case GF_SG_VRML_MFVEC2F:
+		the_sf_class = &SFVec2fClass;
+		break;
+	case GF_SG_VRML_MFVEC3F:
+		the_sf_class = &SFVec3fClass;
+		break;
+	case GF_SG_VRML_MFCOLOR:
+		the_sf_class = &SFColorClass;
+		break;
+	case GF_SG_VRML_MFROTATION:
+		the_sf_class = &SFRotationClass;
+		break;
+	}
+	/*dynamic expend*/
+	if (ind>=len) {
+		is_append = 1;
+	}
+	if (is_append && (ptr->field.fieldType!=GF_SG_VRML_MFNODE)) {
+
+		ptr->mfvals = gf_realloc(ptr->mfvals, sizeof(JSValue)*(ind+1));
+		ptr->mfvals_count = ind+1;
+
+		while (len<ind) {
+			JSValue a_val;
+			switch (ptr->field.fieldType) {
+			case GF_SG_VRML_MFBOOL:
+				a_val = JS_NewBool(c, 0);
+				break;
+			case GF_SG_VRML_MFINT32:
+				a_val = JS_NewInt32(c, 0);
+				break;
+			case GF_SG_VRML_MFFLOAT:
+			case GF_SG_VRML_MFTIME:
+				a_val = JS_NewFloat64(c, 0);
+				break;
+			case GF_SG_VRML_MFSTRING:
+			case GF_SG_VRML_MFURL:
+				a_val = JS_NewString(c, "");
+				break;
+			case GF_SG_VRML_MFVEC2F:
+			case GF_SG_VRML_MFVEC3F:
+			case GF_SG_VRML_MFCOLOR:
+			case GF_SG_VRML_MFROTATION:
+				a_val = JS_NewObjectClass(c, the_sf_class->class_id);
+				break;
+			default:
+				a_val = JS_NULL;
+				break;
+			}
+
+			gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, len);
+			ptr->mfvals[len] = a_val;
+
+			len++;
+		}
+		if (ptr->field.far_ptr)
+			gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, ind);
+
+		ptr->mfvals[ind] = JS_NULL;
+	}
+
+	if (ptr->field.far_ptr && (ptr->field.fieldType!=GF_SG_VRML_MFNODE)) {
+		u32 items = ((GenMFField *)ptr->field.far_ptr)->count;
+		while (ind>=items) {
+			gf_sg_vrml_mf_insert(ptr->field.far_ptr, ptr->field.fieldType, &sf_slot, ind);
+			items++;
+		}
+	}
+	/*assign object*/
+	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
+		if (JS_IsUndefined(value)) return -1;
+		if (JS_IsNull(value) ) return -1;
+		if (!JS_GetOpaque(value, SFNodeClass.class_id) ) return -1;
+	} else if (the_sf_class) {
+		if (JS_IsUndefined(value)) return -1;
+		if (!JS_GetOpaque(value, the_sf_class->class_id) ) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFBOOL) {
+		if (!JS_IsBool(value)) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFINT32) {
+		if (!JS_IsInteger(value)) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFFLOAT) {
+		if (!JS_IsNumber(value)) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFTIME) {
+		if (!JS_IsNumber(value)) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFSTRING) {
+		if (!JS_IsString(value)) return -1;
+	} else if (ptr->field.fieldType==GF_SG_VRML_MFURL) {
+		if (!JS_IsString(value)) return -1;
+	}
+
+
+	/*rewrite MFNode entry*/
+	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
+		GF_Node *prev_n, *new_n;
+
+		if (!ptr->owner) return 1;
+
+		/*get new node*/
+		from = (GF_JSField *) JS_GetOpaque(value, SFNodeClass.class_id);
+		new_n = *(GF_Node**)from->field.far_ptr;
+		prev_n = NULL;
+
+		if (!is_append) {
+			/*get and delete previous node if any, but unregister later*/
+			prev_n = gf_node_list_del_child_idx( (GF_ChildNodeItem **)ptr->field.far_ptr, ind);
+		}
+
+		if (new_n) {
+			gf_node_list_insert_child( (GF_ChildNodeItem **)ptr->field.far_ptr , new_n, ind);
+			gf_node_register(new_n, ptr->owner);
+
+			/*node created from script and inserted in the tree, create binding*/
+			node_get_binding(JS_GetScriptStack(c), new_n);
+		}
+		/*unregister previous node*/
+		if (prev_n) gf_node_unregister(prev_n, ptr->owner);
+
+		Script_FieldChanged(c, NULL, ptr, NULL);
+		return 1;
+	}
+
+	//since this value comes from the script, ref count it
+	JS_FreeValue(c, ptr->mfvals[ind]);
+	ptr->mfvals[ind] = JS_DupValue(c, value);
+
+	if (!ptr->owner) return 1;
+	if (!ptr->field.far_ptr) return -1;
+
+	/*rewrite MF slot*/
+	switch (ptr->field.fieldType) {
+	case GF_SG_VRML_MFBOOL:
+		((MFBool *)ptr->field.far_ptr)->vals[ind] = (Bool) JS_ToBool(c, value);
+		break;
+	case GF_SG_VRML_MFINT32:
+		JS_ToInt32(c, &ival, value);
+		((MFInt32 *)ptr->field.far_ptr)->vals[ind] = ival;
+		break;
+	case GF_SG_VRML_MFFLOAT:
+		JS_ToFloat64(c, &d, value);
+		((MFFloat *)ptr->field.far_ptr)->vals[ind] = FLT2FIX(d);
+		break;
+	case GF_SG_VRML_MFTIME:
+		JS_ToFloat64(c, &d, value);
+		((MFTime *)ptr->field.far_ptr)->vals[ind] = d;
+		break;
+	case GF_SG_VRML_MFSTRING:
+		if (((MFString *)ptr->field.far_ptr)->vals[ind]) {
+			gf_free(((MFString *)ptr->field.far_ptr)->vals[ind]);
+			((MFString *)ptr->field.far_ptr)->vals[ind] = NULL;
+		}
+		str_val = (char *) JS_ToCString(c, value);
+		((MFString *)ptr->field.far_ptr)->vals[ind] = gf_strdup(str_val);
+		JS_FreeCString(c, str_val);
+		break;
+
+	case GF_SG_VRML_MFURL:
+		if (((MFURL *)ptr->field.far_ptr)->vals[ind].url) {
+			gf_free(((MFURL *)ptr->field.far_ptr)->vals[ind].url);
+			((MFURL *)ptr->field.far_ptr)->vals[ind].url = NULL;
+		}
+		str_val =  (char *) JS_ToCString(c, value);
+		((MFURL *)ptr->field.far_ptr)->vals[ind].url = gf_strdup(str_val);
+		((MFURL *)ptr->field.far_ptr)->vals[ind].OD_ID = 0;
+		JS_FreeCString(c, str_val);
+		break;
+
+	case GF_SG_VRML_MFVEC2F:
+		from = (GF_JSField *) JS_GetOpaque(value, the_sf_class->class_id);
+		gf_sg_vrml_field_copy(& ((MFVec2f *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
+		break;
+	case GF_SG_VRML_MFVEC3F:
+		from = (GF_JSField *) JS_GetOpaque(value, the_sf_class->class_id);
+		gf_sg_vrml_field_copy(& ((MFVec3f *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
+		break;
+	case GF_SG_VRML_MFROTATION:
+		from = (GF_JSField *) JS_GetOpaque(value, the_sf_class->class_id);
+		gf_sg_vrml_field_copy(& ((MFRotation *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
+		break;
+	case GF_SG_VRML_MFCOLOR:
+		from = (GF_JSField *) JS_GetOpaque(value, the_sf_class->class_id);
+		gf_sg_vrml_field_copy(& ((MFColor *)ptr->field.far_ptr)->vals[ind], from->field.far_ptr, from->field.fieldType);
+		break;
+	}
+
+	Script_FieldChanged(c, NULL, ptr, NULL);
+	return 1;
+}
+
+
+/* MFVec2f class constructor */
+static JSValue MFVec2fConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFVec2fClass.class_id, SFVec2fClass.class_id, GF_SG_VRML_MFVEC2F);
+}
+
+/* MFVec3f class constructor */
+static JSValue MFVec3fConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFVec3fClass.class_id, SFVec3fClass.class_id, GF_SG_VRML_MFVEC3F);
+}
+
+/* MFRotation class constructor */
+static JSValue MFRotationConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFRotationClass.class_id, SFRotationClass.class_id, GF_SG_VRML_MFROTATION);
+}
+
+/*MFColor class constructor */
+static JSValue MFColorConstructor(JSContext *c, JSValueConst new_target, int argc, JSValueConst *argv)
+{
+	return genmf_Constructor(c, new_target, argc, argv, MFColorClass.class_id, SFColorClass.class_id, GF_SG_VRML_MFCOLOR);
+}
+
+#ifndef GPAC_DISABLE_SVG
+
+JSValue gf_sg_js_event_add_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv, GF_Node *node);
+JSValue gf_sg_js_event_remove_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv, GF_Node *node);
+
+static JSValue vrml_event_add_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Node *node;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
+	if (!ptr)
+		return JS_EXCEPTION;
+	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);
+}
+
+static JSValue vrml_event_remove_listener(JSContext *c, JSValueConst this_val, int argc, JSValueConst *argv)
+{
+	GF_Node *node;
+	GF_JSField *ptr = (GF_JSField *) JS_GetOpaque(this_val, SFNodeClass.class_id);
+	if (!ptr) return JS_EXCEPTION;
+	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);
+}
+#endif
+
+
+static const JSCFunctionListEntry Browser_funcs[] =
+{
+	JS_CFUNC_DEF("getName", 0, getName),
+	JS_CFUNC_DEF("getVersion", 0, getVersion),
+	JS_CFUNC_DEF("getCurrentSpeed", 0, getCurrentSpeed),
+	JS_CFUNC_DEF("getCurrentFrameRate", 0, getCurrentFrameRate),
+	JS_CFUNC_DEF("getWorldURL", 0, getWorldURL),
+	JS_CFUNC_DEF("replaceWorld", 1, replaceWorld),
+	JS_CFUNC_DEF("addRoute", 4, addRoute),
+	JS_CFUNC_DEF("deleteRoute", 4, deleteRoute),
+	JS_CFUNC_DEF("loadURL", 1, loadURL),
+	JS_CFUNC_DEF("createVrmlFromString", 1, createVrmlFromString),
+	JS_CFUNC_DEF("setDescription", 1, setDescription),
+	JS_CFUNC_DEF("print", 1, js_print),
+	JS_CFUNC_DEF("alert", 1, js_print),
+	JS_CFUNC_DEF("getScript", 0, getScript),
+	JS_CFUNC_DEF("getProto", 0, getProto),
+	JS_CFUNC_DEF("loadScript", 1, loadScript),
+	JS_CFUNC_DEF("getElementById", 1, getElementById),
+};
+
+static const JSCFunctionListEntry SFNode_funcs[] =
+{
+	JS_CFUNC_DEF("toString", 0, node_toString),
+};
+
+static JSClassExoticMethods SFNode_exotic =
+{
+	.get_property = node_getProperty,
+	.set_property = node_setProperty,
+};
+
+static const JSCFunctionListEntry SFVec2f_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", vec2f_getProperty, vec2f_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("y", vec2f_getProperty, vec2f_setProperty, 1),
+	JS_CFUNC_DEF("add", 1, vec2f_add),
+	JS_CFUNC_DEF("divide", 1, vec2f_divide),
+	JS_CFUNC_DEF("dot", 1, vec2f_dot),
+	JS_CFUNC_DEF("length", 0, vec2f_length),
+	JS_CFUNC_DEF("multiply", 1, vec2f_multiply),
+	JS_CFUNC_DEF("normalize", 0, vec2f_normalize),
+	JS_CFUNC_DEF("subtract", 1, vec2f_subtract),
+	JS_CFUNC_DEF("negate", 0, vec2f_negate),
+	JS_CFUNC_DEF("toString", 0, field_toString),
+};
+
+
+static const JSCFunctionListEntry SFVec3f_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", vec3f_getProperty, vec3f_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("y", vec3f_getProperty, vec3f_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("z", vec3f_getProperty, vec3f_setProperty, 2),
+
+	JS_CFUNC_DEF("add", 1, vec3f_add),
+	JS_CFUNC_DEF("divide", 1, vec3f_divide),
+	JS_CFUNC_DEF("dot", 1, vec3f_dot),
+	JS_CFUNC_DEF("length", 0, vec3f_length),
+	JS_CFUNC_DEF("multiply", 1, vec3f_multiply),
+	JS_CFUNC_DEF("normalize", 0, vec3f_normalize),
+	JS_CFUNC_DEF("subtract", 1, vec3f_subtract),
+	JS_CFUNC_DEF("cross", 1, vec3f_cross),
+	JS_CFUNC_DEF("negate", 0, vec3f_negate),
+	JS_CFUNC_DEF("toString", 0, field_toString),
+};
+
+static const JSCFunctionListEntry SFRotation_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("xAxis", rot_getProperty, rot_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("yAxis", rot_getProperty, rot_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("zAxis", rot_getProperty, rot_setProperty, 2),
+	JS_CGETSET_MAGIC_DEF("angle", rot_getProperty, rot_setProperty, 3),
+	JS_CFUNC_DEF("getAxis", 1, rot_getAxis),
+	JS_CFUNC_DEF("inverse", 1, rot_inverse),
+	JS_CFUNC_DEF("multiply", 1, rot_multiply),
+	JS_CFUNC_DEF("multVec", 0, rot_multVec),
+	JS_CFUNC_DEF("setAxis", 1, rot_setAxis),
+	JS_CFUNC_DEF("slerp", 0, rot_slerp),
+	JS_CFUNC_DEF("toString", 0, field_toString),
+};
+
+static const JSCFunctionListEntry SFColor_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("r", color_getProperty, color_setProperty, 0),
+	JS_CGETSET_MAGIC_DEF("g", color_getProperty, color_setProperty, 1),
+	JS_CGETSET_MAGIC_DEF("b", color_getProperty, color_setProperty, 2),
+	JS_CFUNC_DEF("setHSV", 3, color_setHSV),
+	JS_CFUNC_DEF("getHSV", 0, color_getHSV),
+	JS_CFUNC_DEF("toString", 0, field_toString),
+};
+
+
+static const JSCFunctionListEntry SFImage_funcs[] =
+{
+	JS_CGETSET_MAGIC_DEF("x", image_getProperty, image_setProperty, 0),
+	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),
+};
+
+static const JSCFunctionListEntry MFArray_funcs[] =
+{
+	//ignored, kept for MSVC
+	JS_CGETSET_MAGIC_DEF("length", NULL, NULL, 0),
+};
+static JSClassExoticMethods MFArray_exotic =
+{
+	.get_property = array_getElement,
+	.set_property = array_setElement,
+};
+
+static void field_gc_mark(JSRuntime *rt, JSValueConst val, JS_MarkFunc *mark_func)
+{
+    GF_JSField *jsf = JS_GetOpaque_Nocheck(val);
+	if (!jsf) return;
+	if (!JS_IsUndefined(jsf->obj) && jsf->owner) {
+		JS_MarkValue(rt, jsf->obj, mark_func);
+	}
+	if (jsf->node && jsf->node->sgprivate->interact->routes) {
+		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 (jsf->mfvals) {
+		u32 i;
+		assert(jsf->mfvals_count);
+		for (i=0; i<jsf->mfvals_count; i++)
+    		JS_MarkValue(rt, jsf->mfvals[i], mark_func);
+	}
+}
+
+#define SETUP_JSCLASS_BASIC(_class, _name) \
+	/*classes are global to runtime*/\
+	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));\
+	}\
+
+#define SETUP_JSCLASS(_class, _name, _proto_funcs, _construct, _finalize, _exotic) \
+	/*classes are global to runtime*/\
+	if (!_class.class_id) {\
+		JS_NewClassID(&(_class.class_id)); \
+		_class.class.class_name = _name; \
+		_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));\
+	}\
+	{ \
+	JSValue _proto_obj = JS_NewObjectClass(sc->js_ctx, _class.class_id);\
+    	JS_SetPropertyFunctionList(sc->js_ctx, _proto_obj, _proto_funcs, countof(_proto_funcs));\
+    	JS_SetClassProto(sc->js_ctx, _class.class_id, _proto_obj);\
+	sc->_class = JS_NewCFunction2(sc->js_ctx, _construct, _name, 1, JS_CFUNC_constructor, 0);\
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, _name, sc->_class);\
+	}\
+
+static void vrml_js_init_api(GF_ScriptPriv *sc, GF_Node *script)
+{
+	sc->js_obj = JS_GetGlobalObject(sc->js_ctx);
+
+	//init all our classes
+	SETUP_JSCLASS_BASIC(globalClass, "global");
+	SETUP_JSCLASS_BASIC(AnyClass, "AnyClass");
+	SETUP_JSCLASS_BASIC(browserClass, "Browser");
+
+	SETUP_JSCLASS(SFNodeClass, "SFNode", SFNode_funcs, SFNodeConstructor, node_finalize, &SFNode_exotic);
+	SETUP_JSCLASS(SFVec2fClass, "SFVec2f", SFVec2f_funcs, SFVec2fConstructor, field_finalize, NULL);
+	SETUP_JSCLASS(SFVec3fClass, "SFVec3f", SFVec3f_funcs, SFVec3fConstructor, field_finalize, NULL);
+	SETUP_JSCLASS(SFRotationClass, "SFRotation", SFRotation_funcs, SFRotationConstructor, field_finalize, NULL);
+	SETUP_JSCLASS(SFColorClass, "SFColor", SFColor_funcs, SFColorConstructor, field_finalize, NULL);
+	SETUP_JSCLASS(SFImageClass, "SFImage", SFImage_funcs, SFImageConstructor, field_finalize, NULL);
+
+	SETUP_JSCLASS(MFInt32Class, "MFInt32", MFArray_funcs, MFInt32Constructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFBoolClass, "MFBool", MFArray_funcs, MFBoolConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFTimeClass, "MFTime", MFArray_funcs, MFTimeConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFFloatClass, "MFFloat", MFArray_funcs, MFFloatConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFUrlClass, "MFUrl", MFArray_funcs, MFURLConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFStringClass, "MFString", MFArray_funcs, MFStringConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFNodeClass, "MFNode", MFArray_funcs, MFNodeConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFVec2fClass, "MFVec2f", MFArray_funcs, MFVec2fConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFVec3fClass , "MFVec3f", MFArray_funcs, MFVec3fConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFRotationClass, "MFRotation", MFArray_funcs, MFRotationConstructor, array_finalize, &MFArray_exotic);
+	SETUP_JSCLASS(MFColorClass, "MFColor", MFArray_funcs, MFColorConstructor, array_finalize, &MFArray_exotic);
+
+
+    JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "print", JS_NewCFunction(sc->js_ctx, js_print, "print", 1));
+    JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "alert", JS_NewCFunction(sc->js_ctx, js_print, "print", 1));
+    JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "parseXML", JS_NewCFunction(sc->js_ctx, vrml_parse_xml, "parseXML", 1));
+
+	/*remember pointer to scene graph!!*/
+	JS_SetOpaque(sc->js_obj, script->sgprivate->scenegraph);
+
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "FALSE", JS_FALSE);
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "TRUE", JS_TRUE);
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "NULL", JS_NULL);
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "_this", JS_NULL);
+//	JS_DefineProperty(sc->js_ctx, sc->js_obj, "_this", PRIVATE_TO_JSVAL(script), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT );
+
+	JSValue browser = JS_NewObjectClass(sc->js_ctx, browserClass.class_id);
+    JS_SetPropertyFunctionList(sc->js_ctx, browser, Browser_funcs, countof(Browser_funcs));
+	JS_SetPropertyStr(sc->js_ctx, sc->js_obj, "Browser", browser);
+
+	/*TODO ? SFVec3f / MFVec4f support */
+
+	sc->node_toString_fun = JS_NewCFunction(sc->js_ctx, node_toString, "toString", 0);
+	sc->node_getTime_fun = JS_NewCFunction(sc->js_ctx, node_getTime, "getTime", 0);
+#ifndef GPAC_DISABLE_SVG
+	sc->node_addEventListener_fun = JS_NewCFunction(sc->js_ctx, vrml_event_add_listener, "addEventListener", 0);
+	sc->node_removeEventListener_fun = JS_NewCFunction(sc->js_ctx, vrml_event_remove_listener, "removeEventListener", 0);
+#endif
+}
+
+
+
+void gf_sg_script_to_node_field(JSContext *c, JSValue val, GF_FieldInfo *field, GF_Node *owner, GF_JSField *parent)
+{
+	Double d;
+	Bool changed;
+	const char *str_val;
+	GF_JSField *p, *from;
+	u32 len;
+	s32 ival;
+	JSValue item;
+	u32 i;
+
+	if (JS_IsUndefined(val)) return;
+	if ((field->fieldType != GF_SG_VRML_SFNODE) && JS_IsNull(val)) return;
+
+
+	switch (field->fieldType) {
+	case GF_SG_VRML_SFBOOL:
+		*((SFBool *) field->far_ptr) = JS_ToBool(c,val);
+		Script_FieldChanged(c, owner, parent, field);
+		return;
+
+	case GF_SG_VRML_SFINT32:
+		if (!JS_ToInt32(c, ((SFInt32 *) field->far_ptr), val)) {
+			Script_FieldChanged(c, owner, parent, field);
+		return;
+
+	case GF_SG_VRML_SFFLOAT:
+		if (!JS_ToFloat64(c, &d, val)) {
+			 *((SFFloat *) field->far_ptr) = FLT2FIX( d);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+
+	case GF_SG_VRML_SFTIME:
+		if (!JS_ToFloat64(c, &d, val)) {
+			*((SFTime *) field->far_ptr) = (Double) d;
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+	}
+	case GF_SG_VRML_SFSTRING:
+	{
+		SFString *s = (SFString*)field->far_ptr;
+		const char *sval = JS_ToCString(c, val);
+
+		/*we do filter strings since rebuilding a text is quite slow, so let's avoid killing the compositors*/
+		if (!s->buffer || strcmp(sval, s->buffer)) {
+			if ( s->buffer) gf_free(s->buffer);
+			s->buffer = gf_strdup(sval);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		JS_FreeCString(c, sval);
+		return;
+	}
+	case GF_SG_VRML_SFURL:
+		str_val = JS_ToCString(c, val);
+		if (((SFURL*)field->far_ptr)->url) gf_free(((SFURL*)field->far_ptr)->url);
+		((SFURL*)field->far_ptr)->url = gf_strdup(str_val);
+		((SFURL*)field->far_ptr)->OD_ID = 0;
+		Script_FieldChanged(c, owner, parent, field);
+		JS_FreeCString(c, str_val);
+		return;
+
+	case GF_SG_VRML_MFSTRING:
+	{
+		GF_JSField *src = JS_GetOpaque(val, MFStringClass.class_id);
+		gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
+		if (src && src->mfvals_count) {
+			gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, src->mfvals_count);
+			for (i=0; i<src->mfvals_count; i++) {
+				str_val = JS_ToCString(c, src->mfvals[i]);
+				((MFString*)field->far_ptr)->vals[i] = gf_strdup(str_val);
+				JS_FreeCString(c, str_val);
+			}
+		} else {
+			gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, 1);
+			str_val = JS_ToCString(c, val);
+			((MFString*)field->far_ptr)->vals[0] = gf_strdup(str_val);
+			JS_FreeCString(c, str_val);
+		}
+		Script_FieldChanged(c, owner, parent, field);
+	}
+		return;
+
+	case GF_SG_VRML_MFURL:
+		gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
+		gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, 1);
+		str_val = JS_ToCString(c, val);
+		((MFURL*)field->far_ptr)->vals[0].url = gf_strdup(str_val);
+		((MFURL*)field->far_ptr)->vals[0].OD_ID = 0;
+		Script_FieldChanged(c, owner, parent, field);
+		JS_FreeCString(c, str_val);
+		return;
+
+	default:
+		break;
+	}
+
+	//from here we must have an object
+	if (! JS_IsObject(val)) return;
+
+	switch (field->fieldType) {
+	case GF_SG_VRML_SFVEC2F:
+		p = (GF_JSField *) JS_GetOpaque(val, SFVec2fClass.class_id);
+		if (p) {
+			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC2F);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+
+	case GF_SG_VRML_SFVEC3F:
+		p = (GF_JSField *) JS_GetOpaque(val, SFVec3fClass.class_id);
+		if (p) {
+			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFVEC3F);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+
+	case GF_SG_VRML_SFROTATION:
+		p = (GF_JSField *) JS_GetOpaque(val, SFRotationClass.class_id);
+		if (p) {
+			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFROTATION);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+
+	case GF_SG_VRML_SFCOLOR:
+		p = (GF_JSField *) JS_GetOpaque(val, SFColorClass.class_id);
+		if (p) {
+			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFCOLOR);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+	case GF_SG_VRML_SFIMAGE:
+		p = (GF_JSField *) JS_GetOpaque(val, SFImageClass.class_id);
+		if (p) {
+			gf_sg_vrml_field_copy(field->far_ptr, p->field.far_ptr, GF_SG_VRML_SFIMAGE);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+
+	case GF_SG_VRML_SFNODE:
+		/*replace object*/
+		if (*((GF_Node**)field->far_ptr)) {
+			gf_node_unregister(*((GF_Node**)field->far_ptr), owner);
+			*((GF_Node**)field->far_ptr) = NULL;
+		}
+
+		p = (GF_JSField *) JS_GetOpaque(val, SFNodeClass.class_id);
+		if (JS_IsNull(val)) {
+			Script_FieldChanged(c, owner, parent, field);
+		} else if (p) {
+			GF_Node *n = * (GF_Node**) (p)->field.far_ptr;
+			* ((GF_Node **)field->far_ptr) = n;
+			gf_node_register(n, owner);
+			Script_FieldChanged(c, owner, parent, field);
+		}
+		return;
+	default:
+		break;
+	}
+
+	p = (GF_JSField *) JS_GetOpaque_Nocheck(val);
+	if (!p) return;
+
+	len = p->mfvals_count;
+	/*special handling for MF node, reset list first*/
+	if (field->fieldType == GF_SG_VRML_MFNODE) {
+		GF_Node *child;
+		GF_ChildNodeItem *last = NULL;
+		gf_node_unregister_children(owner, * (GF_ChildNodeItem **) field->far_ptr);
+		* (GF_ChildNodeItem **) field->far_ptr = NULL;
+
+		for (i=0; i<len; i++) {
+			item = p->mfvals[i];
+			from = (GF_JSField *) JS_GetOpaque(item, SFNodeClass.class_id);
+			if (!from) continue;
+
+			child = * ((GF_Node**)from->field.far_ptr);
+
+			gf_node_list_add_child_last( (GF_ChildNodeItem **) field->far_ptr , child, &last);
+			gf_node_register(child, owner);
+		}
+		Script_FieldChanged(c, owner, parent, field);
+		/*and mark the field as changed*/
+		JSScript_NodeModified(owner->sgprivate->scenegraph, owner, field, NULL);
+		return;
+	}
+
+	/*again, check text changes*/
+	changed = (field->fieldType == GF_SG_VRML_MFSTRING) ? 0 : 1;
+	/*gf_realloc*/
+	if (len != ((GenMFField *)field->far_ptr)->count) {
+		gf_sg_vrml_mf_reset(field->far_ptr, field->fieldType);
+		gf_sg_vrml_mf_alloc(field->far_ptr, field->fieldType, len);
+		changed = 1;
+	}
+	/*assign each slot*/
+	for (i=0; i<len; i++) {
+		item = p->mfvals[i];
+		switch (field->fieldType) {
+		case GF_SG_VRML_MFBOOL:
+			((MFBool*)field->far_ptr)->vals[i] = (Bool) JS_ToBool(c,item);
+			break;
+		case GF_SG_VRML_MFINT32:
+			if (JS_ToInt32(c, &ival, item)) {
+				((MFInt32 *)field->far_ptr)->vals[i] = ival;
+			}
+			break;
+		case GF_SG_VRML_MFFLOAT:
+			if (JS_ToFloat64(c, &d, item)) {
+				((MFFloat *)field->far_ptr)->vals[i] = FLT2FIX( d);
+			}
+			break;
+		case GF_SG_VRML_MFTIME:
+			if (JS_ToFloat64(c, &d, item)) {
+				((MFTime *)field->far_ptr)->vals[i] = d;
+			}
+			break;
+		case GF_SG_VRML_MFSTRING:
+		{
+			MFString *mfs = (MFString *) field->far_ptr;
+			str_val = JS_ToCString(c, item);
+			if (!mfs->vals[i] || strcmp(str_val, mfs->vals[i]) ) {
+				if (mfs->vals[i]) gf_free(mfs->vals[i]);
+				mfs->vals[i] = gf_strdup(str_val);
+				changed = 1;
+			}
+			JS_FreeCString(c, str_val);
+		}
+		break;
+		case GF_SG_VRML_MFURL:
+		{
+			MFURL *mfu = (MFURL *) field->far_ptr;
+			if (mfu->vals[i].url) gf_free(mfu->vals[i].url);
+			str_val = JS_ToCString(c, item);
+			mfu->vals[i].url = gf_strdup(str_val);
+			mfu->vals[i].OD_ID = 0;
+			JS_FreeCString(c, str_val);
+		}
+		break;
+
+		case GF_SG_VRML_MFVEC2F:
+			from = (GF_JSField *) JS_GetOpaque(item, SFVec2fClass.class_id);
+			if (from) {
+				gf_sg_vrml_field_copy(& ((MFVec2f*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFVEC2F);
+			}
+			break;
+		case GF_SG_VRML_MFVEC3F:
+			from = (GF_JSField *) JS_GetOpaque(item, SFVec3fClass.class_id);
+			if (from) {
+				gf_sg_vrml_field_copy(& ((MFVec3f*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFVEC3F);
+			}
+			break;
+		case GF_SG_VRML_MFROTATION:
+			from = (GF_JSField *) JS_GetOpaque(item, SFRotationClass.class_id);
+			if (from) {
+				gf_sg_vrml_field_copy(& ((MFRotation*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFROTATION);
+			}
+			break;
+		case GF_SG_VRML_MFCOLOR:
+			from = (GF_JSField *) JS_GetOpaque(item, SFColorClass.class_id);
+			if (from) {
+				gf_sg_vrml_field_copy(& ((MFColor*)field->far_ptr)->vals[i], from->field.far_ptr, GF_SG_VRML_SFCOLOR);
+			}
+			break;
+
+		default:
+			break;
+		}
+	}
+	if (changed) Script_FieldChanged(c, owner, parent, field);
+}
+
+
+static void gf_sg_script_update_cached_object(GF_ScriptPriv *priv, JSValue obj, GF_JSField *jsf, GF_FieldInfo *field, GF_Node *parent)
+{
+	u32 i;
+
+	if ((jsf->field.fieldType != GF_SG_VRML_MFNODE) && ! gf_sg_vrml_is_sf_field(jsf->field.fieldType)) {
+		for (i=0; i<jsf->mfvals_count; i++) {
+			JS_FreeValue(priv->js_ctx, jsf->mfvals[i]);
+			jsf->mfvals[i] = JS_NULL;
+		}
+	}
+
+	/*we need to rebuild MF types where SF is a native type.*/
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Recomputing cached jsobj\n") );
+	switch (jsf->field.fieldType) {
+	case GF_SG_VRML_MFBOOL:
+	{
+		MFBool *f = (MFBool *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewBool(priv->js_ctx, f->vals[i]);
+		}
+	}
+	break;
+	case GF_SG_VRML_MFINT32:
+	{
+		MFInt32 *f = (MFInt32 *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewInt32(priv->js_ctx, f->vals[i]);
+		}
+	}
+	break;
+	case GF_SG_VRML_MFFLOAT:
+	{
+		MFFloat *f = (MFFloat *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewFloat64(priv->js_ctx, FIX2FLT(f->vals[i]));
+		}
+	}
+	break;
+	case GF_SG_VRML_MFTIME:
+	{
+		MFTime *f = (MFTime *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewFloat64(priv->js_ctx, f->vals[i]);
+		}
+	}
+	break;
+	case GF_SG_VRML_MFSTRING:
+	{
+		MFString *f = (MFString *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewString(priv->js_ctx, f->vals[i]);
+		}
+	}
+	break;
+	case GF_SG_VRML_MFURL:
+	{
+		MFURL *f = (MFURL *) field->far_ptr;
+		for (i=0; i<f->count; i++) {
+			if (f->vals[i].OD_ID > 0) {
+				char msg[30];
+				sprintf(msg, "od:%d", f->vals[i].OD_ID);
+				jsf->mfvals[i] = JS_NewString(priv->js_ctx, (const char *) msg);
+			} else {
+				jsf->mfvals[i] = JS_NewString(priv->js_ctx, f->vals[i].url);
+			}
+		}
+	}
+	break;
+	/*
+		MFNode is tricky because in VRML/MPEG-4, SFNode are assigned by referenced, not copy.
+		We therefore need to make sure we reuse existing SFNode object rather than
+		blindly recreating them
+	*/
+	case GF_SG_VRML_MFNODE:
+	{
+#if 0
+		GF_ChildNodeItem *f = *(GF_ChildNodeItem **) field->far_ptr;
+		u32 j, count;
+		JSValue val;
+		/*1: find all existing objs for each node*/
+		val = JS_GetPropertyStr(priv->js_ctx, jsf->js_list, "length");
+		JS_ToInt32(priv->js_ctx, &count, val);
+		JS_FreeValue(priv->js_ctx, val);
+
+		/*this may introduce bugs when a child is being replaced through an update command, but it is way
+		too costly to handle in script*/
+		if (gf_node_list_get_count(f)==count) return;
+
+		JS_SetPropertyStr(priv->js_ctx, jsf->js_list, "length", JS_NewInt32(priv->js_ctx, 0));
+		count = 0;
+		while (f) {
+			GF_JSField *slot = NULL;
+			/*first look in the original array*/
+			for (j=0; j<count; j++) {
+				val = JS_GetPropertyUint32(priv->js_ctx, jsf->js_list, j);
+				slot = JS_GetOpaque(val, SFNodeClass.class_id);
+				if (slot && (slot->node==f->node)) {
+					JS_SetPropertyUint32(priv->js_ctx, jsf->js_list, count, JS_DupValue(priv->js_ctx, val));
+					count++;
+					break;
+				}
+				JS_FreeValue(priv->js_ctx, val);
+				slot = NULL;
+			}
+			if (!slot) {
+				JS_SetPropertyUint32(priv->js_ctx, jsf->js_list, count, node_get_binding(priv, f->node, 0) );
+				count++;
+			}
+			f = f->next;
+		}
+		JS_SetPropertyStr(priv->js_ctx, jsf->js_list, "length", JS_NewInt32(priv->js_ctx, count));
+#endif
+	}
+	break;
+	}
+	jsf->field.NDTtype = 0;
+}
+
+
+
+#define SETUP_FIELD	\
+		jsf = NewJSField(priv->js_ctx);	\
+		jsf->owner = parent;	\
+		if(parent) gf_node_get_field(parent, field->fieldIndex, &jsf->field);	\
+ 
+#define SETUP_MF_FIELD(_class)	\
+		obj = JS_CallConstructor(priv->js_ctx, priv->_class, 0, NULL);\
+		if (JS_IsException(obj) ) return obj; \
+		jsf = (GF_JSField *) JS_GetOpaque(obj, _class.class_id);	\
+		jsf->owner = parent;		\
+		if (parent) gf_node_get_field(parent, field->fieldIndex, &jsf->field);	\
+ 
+
+static GF_JSClass *get_sf_class(u32 mftype)
+{
+	switch (mftype) {
+	case GF_SG_VRML_MFNODE: return &SFNodeClass;
+	case GF_SG_VRML_MFVEC2F: return &SFVec2fClass;
+	case GF_SG_VRML_MFVEC3F: return &SFVec3fClass;
+	case GF_SG_VRML_MFROTATION: return &SFRotationClass;
+	case GF_SG_VRML_MFCOLOR: return &SFColorClass;
+	case GF_SG_VRML_MFIMAGE: return &SFImageClass;
+	}
+	return NULL;
+}
+
+JSValue gf_sg_script_to_qjs_field(GF_ScriptPriv *priv, GF_FieldInfo *field, GF_Node *parent, Bool force_evaluate)
+{
+	u32 i;
+	GF_JSField *jsf = NULL;
+	GF_JSField *slot = NULL;
+	JSValue obj;
+	Bool was_found = GF_FALSE;
+	/*native types*/
+	switch (field->fieldType) {
+	case GF_SG_VRML_SFBOOL:
+		return JS_NewBool(priv->js_ctx, * ((SFBool *) field->far_ptr) );
+	case GF_SG_VRML_SFINT32:
+		return JS_NewInt32(priv->js_ctx, * ((SFInt32 *) field->far_ptr));
+	case GF_SG_VRML_SFFLOAT:
+		return JS_NewFloat64(priv->js_ctx, FIX2FLT(* ((SFFloat *) field->far_ptr) ));
+	case GF_SG_VRML_SFTIME:
+		return JS_NewFloat64(priv->js_ctx, * ((SFTime *) field->far_ptr));
+	case GF_SG_VRML_SFSTRING:
+		return JS_NewString(priv->js_ctx, ((SFString *) field->far_ptr)->buffer);
+	case GF_SG_VRML_SFURL:
+	{
+		SFURL *url = (SFURL *)field->far_ptr;
+		if (url->OD_ID > 0) {
+			char msg[30];
+			sprintf(msg, "od:%d", url->OD_ID);
+			return JS_NewString(priv->js_ctx, (const char *) msg);
+		} else {
+			return JS_NewString(priv->js_ctx, (const char *) url->url);
+		}
+	}
+	}
+
+	obj = JS_NULL;
+
+	/*look into object bank in case we already have this object*/
+	if (parent && parent->sgprivate->interact && parent->sgprivate->interact->js_binding) {
+		i=0;
+		while ((jsf = gf_list_enum(parent->sgprivate->interact->js_binding->fields, &i))) {
+			was_found = GF_TRUE;
+			obj = jsf->obj;
+
+			if (
+			    /*make sure we use the same JS context*/
+			    (jsf->js_ctx == priv->js_ctx)
+			    && (jsf->owner == parent)
+			    && (jsf->field.far_ptr==field->far_ptr)
+			) {
+				Bool do_rebuild = GF_FALSE;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] found cached jsobj (field %s) in script %s bank (%d entries)\n", field->name, gf_node_get_log_name((GF_Node*)JS_GetScript(priv->js_ctx)), gf_list_count(priv->jsf_cache) ) );
+				if (!force_evaluate && !jsf->field.NDTtype)
+					return JS_DupValue(priv->js_ctx, jsf->obj);
+
+				switch (field->fieldType) {
+				//we need to rewrite these
+				case GF_SG_VRML_MFVEC2F:
+				case GF_SG_VRML_MFVEC3F:
+				case GF_SG_VRML_MFROTATION:
+				case GF_SG_VRML_MFCOLOR:
+					if (force_evaluate) {
+						while (jsf->mfvals_count) {
+							JS_FreeValue(priv->js_ctx, jsf->mfvals[i]);
+							jsf->mfvals_count--;
+						}
+						gf_free(jsf->mfvals);
+						jsf->mfvals = NULL;
+						do_rebuild = GF_TRUE;
+						break;
+					}
+				default:
+					break;
+				}
+				if (do_rebuild) {
+					break;
+				}
+
+				gf_sg_script_update_cached_object(priv, jsf->obj, jsf, field, parent);
+				return JS_DupValue(priv->js_ctx, jsf->obj);
+			}
+			was_found = GF_FALSE;
+			obj = JS_NULL;
+		}
+	}
+
+	if (!was_found) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] creating jsobj %s.%s\n", gf_node_get_name(parent), field->name) );
+	}
+
+	switch (field->fieldType) {
+	case GF_SG_VRML_SFVEC2F:
+		SETUP_FIELD
+		obj = JS_NewObjectClass(priv->js_ctx, SFVec2fClass.class_id);
+		break;
+	case GF_SG_VRML_SFVEC3F:
+		SETUP_FIELD
+		obj = JS_NewObjectClass(priv->js_ctx, SFVec3fClass.class_id);
+		break;
+	case GF_SG_VRML_SFROTATION:
+		SETUP_FIELD
+		obj = JS_NewObjectClass(priv->js_ctx, SFRotationClass.class_id);
+		break;
+	case GF_SG_VRML_SFCOLOR:
+		SETUP_FIELD
+		obj = JS_NewObjectClass(priv->js_ctx, SFColorClass.class_id);
+		break;
+	case GF_SG_VRML_SFIMAGE:
+		SETUP_FIELD
+		obj = JS_NewObjectClass(priv->js_ctx, SFImageClass.class_id);
+		break;
+	case GF_SG_VRML_SFNODE:
+		if (! *(GF_Node**) field->far_ptr)
+			return JS_NULL;
+
+		obj = node_get_binding(priv, *(GF_Node**) field->far_ptr);
+		jsf = JS_GetOpaque(obj, SFNodeClass.class_id);
+		if (!jsf->owner)
+			jsf->owner = parent;
+		else
+			return JS_DupValue(priv->js_ctx, obj);
+			//return obj;
+		break;
+
+
+	case GF_SG_VRML_MFBOOL:
+	{
+		MFBool *f = (MFBool *) field->far_ptr;
+		SETUP_MF_FIELD(MFBoolClass)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i = 0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewBool(priv->js_ctx, f->vals[i]);
+		}
+		break;
+	}
+	case GF_SG_VRML_MFINT32:
+	{
+		MFInt32 *f = (MFInt32 *) field->far_ptr;
+		SETUP_MF_FIELD(MFInt32Class)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewInt32(priv->js_ctx, f->vals[i]);
+		}
+		break;
+	}
+	case GF_SG_VRML_MFFLOAT:
+	{
+		MFFloat *f = (MFFloat *) field->far_ptr;
+		SETUP_MF_FIELD(MFFloatClass)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewFloat64(priv->js_ctx, FIX2FLT(f->vals[i]) );
+		}
+		break;
+	}
+	case GF_SG_VRML_MFTIME:
+	{
+		MFTime *f = (MFTime *) field->far_ptr;
+		SETUP_MF_FIELD(MFTimeClass)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			jsf->mfvals[i] = JS_NewFloat64(priv->js_ctx, f->vals[i] );
+		}
+		break;
+	}
+	case GF_SG_VRML_MFSTRING:
+	{
+		MFString *f = (MFString *) field->far_ptr;
+		SETUP_MF_FIELD(MFStringClass)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			char *str = f->vals[i];
+			if (!str) str= "";
+			jsf->mfvals[i] = JS_NewString(priv->js_ctx, str );
+		}
+		break;
+	}
+	case GF_SG_VRML_MFURL:
+	{
+		MFURL *f = (MFURL *) field->far_ptr;
+		SETUP_MF_FIELD(MFUrlClass)
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			if (f->vals[i].OD_ID > 0) {
+				char msg[30];
+				sprintf(msg, "od:%d", f->vals[i].OD_ID);
+				jsf->mfvals[i] = JS_NewString(priv->js_ctx, (const char *) msg);
+			} else {
+				jsf->mfvals[i] = JS_NewString(priv->js_ctx, f->vals[i].url);
+			}
+		}
+		break;
+	}
+
+	case GF_SG_VRML_MFVEC2F:
+	{
+		MFVec2f *f = (MFVec2f *) field->far_ptr;
+		if (!was_found) {
+			SETUP_MF_FIELD(MFVec2fClass)
+		}
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			JSValue pf = JS_NewObjectClass(priv->js_ctx, SFVec2fClass.class_id);
+			slot = SFVec2f_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y);
+			slot->owner = parent;
+			jsf->mfvals[i] = pf;
+		}
+		break;
+	}
+	case GF_SG_VRML_MFVEC3F:
+	{
+		MFVec3f *f = (MFVec3f *) field->far_ptr;
+		if (!was_found) {
+			SETUP_MF_FIELD(MFVec3fClass)
+		}
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			JSValue pf = JS_NewObjectClass(priv->js_ctx, SFVec3fClass.class_id);
+			slot = SFVec3f_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y, f->vals[i].z);
+			slot->owner = parent;
+			jsf->mfvals[i] = pf;
+		}
+		break;
+	}
+	case GF_SG_VRML_MFROTATION:
+	{
+		MFRotation *f = (MFRotation*) field->far_ptr;
+		if (!was_found) {
+			SETUP_MF_FIELD(MFRotationClass)
+		}
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			JSValue pf = JS_NewObjectClass(priv->js_ctx, SFRotationClass.class_id);
+			slot = SFRotation_Create(priv->js_ctx, pf, f->vals[i].x, f->vals[i].y, f->vals[i].z, f->vals[i].q);
+			slot->owner = parent;
+			jsf->mfvals[i] = pf;
+		}
+		break;
+	}
+	case GF_SG_VRML_MFCOLOR:
+	{
+		MFColor *f = (MFColor *) field->far_ptr;
+		if (!was_found) {
+			SETUP_MF_FIELD(MFColorClass)
+		}
+		jsf->mfvals_count = f->count;
+		jsf->mfvals = gf_realloc(jsf->mfvals, sizeof(JSValue)*f->count);
+		for (i=0; i<f->count; i++) {
+			JSValue pf = JS_NewObjectClass(priv->js_ctx, SFColorClass.class_id);
+			slot = SFColor_Create(priv->js_ctx, pf, f->vals[i].red, f->vals[i].green, f->vals[i].blue);
+			slot->owner = parent;
+			jsf->mfvals[i] = pf;
+		}
+		break;
+	}
+
+	case GF_SG_VRML_MFNODE:
+	{
+//		GF_ChildNodeItem *f = * ((GF_ChildNodeItem **)field->far_ptr);
+		SETUP_MF_FIELD(MFNodeClass)
+		assert(!jsf->mfvals);
+		jsf->mfvals_count = 0;
+		/*we don't get the binding until the node is requested, and we don't store it in the MFVals value*/
+		break;
+	}
+
+	//not supported
+	default:
+		return JS_NULL;
+	}
+	if (JS_IsNull(obj))
+		return obj;
+
+	if (!jsf) {
+		jsf = JS_GetOpaque_Nocheck(obj);
+		assert(jsf);
+	}
+	//store field associated with object if needed
+	JS_SetOpaque(obj, jsf);
+	if (!was_found) {
+		jsf->obj = obj;
+	}
+	//for createVRMLFromString only, no parent
+	if (!parent)
+		return obj;
+
+	assert(jsf->owner);
+
+	/*obj corresponding to an existing field/node, store it and prevent GC on object*/
+	/*remember the object*/
+	if (!parent->sgprivate->interact) GF_SAFEALLOC(parent->sgprivate->interact, struct _node_interactive_ext);
+	if (!parent->sgprivate->interact) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create interact storage\n"));
+		return JS_NULL;
+	}
+	if (!parent->sgprivate->interact->js_binding) {
+		GF_SAFEALLOC(parent->sgprivate->interact->js_binding, struct _node_js_binding);
+		if (!parent->sgprivate->interact->js_binding) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create JS bindings storage\n"));
+			return JS_NULL;
+		}
+		parent->sgprivate->interact->js_binding->fields = gf_list_new();
+		if (!parent->sgprivate->interact->js_binding->fields) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRMLJS] Failed to create JS bindings storage\n"));
+			return JS_NULL;
+		}
+	}
+
+	if ( gf_list_find(parent->sgprivate->interact->js_binding->fields, jsf) < 0) {
+		assert(jsf->owner == parent);
+		gf_list_add(parent->sgprivate->interact->js_binding->fields, jsf);
+	}
+
+	if (!was_found) {
+		if (gf_list_find(priv->jsf_cache, jsf)<0)
+			gf_list_add(priv->jsf_cache, jsf);
+	} else {
+		assert (gf_list_find(priv->jsf_cache, jsf)>=0);
+	}
+
+	/*our JS Array object (MFXXX) are always rooted and added to the cache upon construction*/
+	if (jsf->mfvals) {
+		GF_JSClass *sf_class;
+		u32 count = jsf->mfvals_count;
+
+		sf_class = get_sf_class(jsf->field.fieldType);
+		if (!sf_class) count=0;
+
+		for (i=0; i<count; i++) {
+			JSValue item = jsf->mfvals[i];
+			GF_JSField *afield = JS_GetOpaque(item, sf_class->class_id);
+			if (afield) {
+				if (afield->owner != parent) {
+					continue;
+				}
+				if ( gf_list_find(parent->sgprivate->interact->js_binding->fields, afield) < 0) {
+					gf_list_add(parent->sgprivate->interact->js_binding->fields, afield);
+				}
+			}
+		}
+	}
+	parent->sgprivate->flags |= GF_NODE_HAS_BINDING;
+	return JS_DupValue(priv->js_ctx, jsf->obj);
+}
+
+static void JS_ReleaseRootObjects(GF_ScriptPriv *priv)
+{
+	/*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)) {
+		GF_JSField *jsf = gf_list_pop_back(priv->jsf_cache);
+		assert(jsf);
+
+		/*				!!! WARNING !!!
+
+		GC is handled at the JSRuntime level, not at the JSContext level.
+		Objects may not be finalized until the runtime is destroyed/GC'ed, which is not what we want.
+		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);
+		else
+			jsf->js_ctx=NULL;
+
+		jsf->obj = JS_UNDEFINED;
+	}
+}
+
+static void JS_PreDestroy(GF_Node *node)
+{
+	GF_ScriptPriv *priv = node->sgprivate->UserPrivate;
+	if (!priv) return;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[Script] Destroying script node %s", gf_node_get_log_name(node) ));
+
+	/*"shutdown" is no longer supported, as it is typically called when one of a parent node is destroyed through
+	a GC call.*/
+
+	gf_js_lock(priv->js_ctx, 1);
+
+	JS_FreeValue(priv->js_ctx, priv->the_event);
+
+	JS_FreeValue(priv->js_ctx, priv->node_toString_fun);
+	JS_FreeValue(priv->js_ctx, priv->node_getTime_fun);
+#ifndef GPAC_DISABLE_SVG
+	JS_FreeValue(priv->js_ctx, priv->node_addEventListener_fun);
+	JS_FreeValue(priv->js_ctx, priv->node_removeEventListener_fun);
+#endif
+
+	/*unprotect all cached objects from GC*/
+	JS_ReleaseRootObjects(priv);
+
+#ifndef GPAC_DISABLE_SVG
+	gf_sg_js_dom_pre_destroy(JS_GetRuntime(priv->js_ctx), node->sgprivate->scenegraph, NULL);
+#endif
+
+	JS_FreeValue(priv->js_ctx, priv->js_obj);
+
+	gf_js_lock(priv->js_ctx, 0);
+
+	gf_js_delete_context(priv->js_ctx);
+
+#ifndef GPAC_DISABLE_SVG
+	dom_js_unload();
+#endif
+
+	gf_list_del(priv->jsf_cache);
+
+	priv->js_ctx = NULL;
+
+	/*unregister script from parent scene (cf base_scenegraph::sg_reset) */
+	gf_list_del_item(node->sgprivate->scenegraph->scripts, node);
+}
+
+
+static void JS_InitScriptFields(GF_ScriptPriv *priv, GF_Node *sc)
+{
+	u32 i;
+	GF_ScriptField *sf;
+	GF_FieldInfo info;
+	JSValue val;
+	JSAtom atom;
+
+	i=0;
+	while ((sf = gf_list_enum(priv->fields, &i))) {
+		switch (sf->eventType) {
+		case GF_SG_EVENT_IN:
+			//nothing to do
+			break;
+		case GF_SG_EVENT_OUT:
+			gf_node_get_field(sc, sf->ALL_index, &info);
+			//do not assign a value, eventOut are write-only fields
+			/*create a setter function for this field to be notified whenever modified*/
+			sf->magic = i;
+            JSValue setter = JS_NewCFunction2(priv->js_ctx, (JSCFunction *) gf_sg_script_eventout_set_prop, sf->name, 1, JS_CFUNC_setter_magic, sf->magic);
+
+			atom = JS_NewAtom(priv->js_ctx, sf->name);
+			JS_DefinePropertyGetSet(priv->js_ctx, priv->js_obj, atom, JS_UNDEFINED, setter, 0);
+			JS_FreeAtom(priv->js_ctx, atom);
+			break;
+		default:
+			/*get field value and define in in global scope*/
+			gf_node_get_field(sc, sf->ALL_index, &info);
+			val = gf_sg_script_to_qjs_field(priv, &info, sc, 0);
+			JS_SetPropertyStr(priv->js_ctx, priv->js_obj, (const char *) sf->name, val);
+			break;
+		}
+	}
+}
+
+
+GF_EXPORT
+void gf_js_vrml_flush_event_out(GF_Node *node, GF_ScriptPriv *priv)
+{
+	u32 i;
+	GF_ScriptField *sf;
+
+	/*flush event out*/
+	i=0;
+	while ((sf = gf_list_enum(priv->fields, &i))) {
+		if (sf->activate_event_out) {
+			sf->activate_event_out = 0;
+			gf_node_event_out(node, sf->ALL_index);
+#ifndef GPAC_DISABLE_SVG
+			if (node->sgprivate->interact && node->sgprivate->interact->dom_evt) {
+				GF_FieldInfo info;
+				if (gf_node_get_field(node, sf->ALL_index, &info)==GF_OK)
+					gf_node_changed(node, &info);
+			}
+#endif
+		}
+	}
+}
+
+static void JS_EventIn(GF_Node *node, GF_FieldInfo *in_field)
+{
+	JSValue fval, rval;
+	Double time;
+	JSValue argv[2];
+	GF_ScriptField *sf;
+	GF_FieldInfo t_info;
+	GF_ScriptPriv *priv;
+	u32 i;
+	priv = node->sgprivate->UserPrivate;
+
+	/*no support for change of static fields*/
+	if (in_field->fieldIndex<3) return;
+
+	i = (node->sgprivate->tag==TAG_MPEG4_Script) ? 3 : 4;
+	sf = gf_list_get(priv->fields, in_field->fieldIndex - i);
+	time = gf_node_get_scene_time(node);
+
+	/*
+	if (sf->last_route_time == time) return;
+	*/
+	sf->last_route_time = time;
+
+	gf_js_lock(priv->js_ctx, 1);
+
+	fval = JS_GetPropertyStr(priv->js_ctx, priv->js_obj, sf->name);
+	if (JS_IsUndefined(fval) || JS_IsNull(fval) || !JS_IsFunction(priv->js_ctx, fval)) {
+		gf_js_lock(priv->js_ctx, 0);
+		JS_FreeValue(priv->js_ctx, fval);
+		return;
+	}
+
+	argv[0] = gf_sg_script_to_qjs_field(priv, in_field, node, 1);
+
+	memset(&t_info, 0, sizeof(GF_FieldInfo));
+	t_info.far_ptr = &sf->last_route_time;
+	t_info.fieldType = GF_SG_VRML_SFTIME;
+	t_info.fieldIndex = -1;
+	t_info.name = "timestamp";
+	argv[1] = gf_sg_script_to_qjs_field(priv, &t_info, node, 1);
+
+	rval = JS_Call(priv->js_ctx, fval, priv->js_obj, 2, argv);
+	if (JS_IsException(rval)) {
+		js_dump_error(priv->js_ctx);
+	}
+
+	JS_FreeValue(priv->js_ctx, fval);
+	JS_FreeValue(priv->js_ctx, rval);
+	JS_FreeValue(priv->js_ctx, argv[0]);
+	JS_FreeValue(priv->js_ctx, argv[1]);
+
+	js_do_loop(priv->js_ctx);
+	gf_js_lock(priv->js_ctx, 0);
+
+	gf_js_vrml_flush_event_out(node, priv);
+
+	do_js_gc(priv->js_ctx, node);
+}
+
+
+static Bool vrml_js_load_script(M_Script *script, char *file, Bool primary_script, JSValue *rval)
+{
+	char *jsscript;
+	u32 fsize;
+	Bool success = 1;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+	JSValue ret;
+	GF_Err e;
+	GF_ScriptPriv *priv = (GF_ScriptPriv *) script->sgprivate->UserPrivate;
+
+	*rval = JS_UNDEFINED;
+
+	e = gf_file_load_data(file, (u8 **) &jsscript, &fsize);
+	if (e) {
+		return GF_FALSE;
+	}
+
+ 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((const char *) jsscript, fsize )) {
+		flags = JS_EVAL_TYPE_MODULE;
+		priv->use_strict = GF_TRUE;
+	}
+	//we use JS_EVAL_TYPE_MODULE only for GUI at the current time. However the GUI script is still old and not
+	//compliant to strict mode, using a lot of global functions
+	//the code below is correct (we should always stick to strict if modules) but deactivated until we rewrite the GUI
+//	if (priv->use_strict)
+//		flags = JS_EVAL_TYPE_MODULE;
+
+
+	ret = JS_Eval(priv->js_ctx, jsscript, fsize, file, flags);
+	if (JS_IsException(ret)) {
+		success = 0;
+		js_dump_error(priv->js_ctx);
+	}
+	if (!success || primary_script)
+		JS_FreeValue(priv->js_ctx, ret);
+	else
+		*rval = ret;
+
+	if (success && primary_script) {
+		JSValue fun = JS_GetPropertyStr(priv->js_ctx, priv->js_obj, "initialize");
+		if (JS_IsFunction(priv->js_ctx, fun)) {
+			ret = JS_Call(priv->js_ctx, fun, priv->js_obj, 0, NULL);
+			if (JS_IsException(ret)) {
+				js_dump_error(priv->js_ctx);
+			}
+			gf_js_vrml_flush_event_out((GF_Node *)script, priv);
+			JS_FreeValue(priv->js_ctx, ret);
+		}
+		JS_FreeValue(priv->js_ctx, fun);
+	}
+	gf_free(jsscript);
+	if (success)
+		js_do_loop(priv->js_ctx);
+	return success;
+}
+
+/*fetches each listed URL and attempts to load the script - this is SYNCHRONOUS*/
+Bool JSScriptFromFile(GF_Node *node, const char *opt_file, Bool no_complain, JSValue *rval)
+{
+	GF_JSAPIParam par;
+	u32 i;
+	GF_DownloadManager *dnld_man;
+	GF_Err e;
+	M_Script *script = (M_Script *)node;
+
+	e = GF_SCRIPT_ERROR;
+
+	par.dnld_man = NULL;
+	ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_GET_DOWNLOAD_MANAGER, NULL, &par);
+	if (!par.dnld_man) return 0;
+	dnld_man = par.dnld_man;
+
+	for (i=0; i<script->url.count; i++) {
+		char *url;
+		const char *ext;
+		char *_url = script->url.vals[i].script_text;
+		if (opt_file) {
+			if (strnicmp(_url+4, "script:", 7) && strnicmp(_url+5, "script:", 5)) {
+				_url = gf_url_concatenate(script->url.vals[i].script_text, opt_file);
+			} else {
+				_url = gf_strdup(opt_file);
+			}
+		}
+		par.uri.url = _url;
+		par.uri.nb_params = 0;
+		ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_RESOLVE_URI, node, &par);
+		if (opt_file) gf_free(_url);
+		url = (char *)par.uri.url;
+
+		ext = gf_file_ext_start(url);
+		if (ext && strnicmp(ext, ".js", 3)) {
+			gf_free(url);
+			continue;
+		}
+
+		if (!strstr(url, "://") || !strnicmp(url, "file://", 7)) {
+			Bool res = vrml_js_load_script(script, url, opt_file ? 0 : 1, rval);
+			gf_free(url);
+			if (res) return 1;
+			if (no_complain) return 0;
+		} else {
+			GF_DownloadSession *sess = gf_dm_sess_new(dnld_man, url, GF_NETIO_SESSION_NOT_THREADED, NULL, NULL, &e);
+			if (sess) {
+				e = gf_dm_sess_process(sess);
+				if (e==GF_OK) {
+					const char *szCache = gf_dm_sess_get_cache_name(sess);
+					if (!vrml_js_load_script(script, (char *) szCache, opt_file ? 0 : 1, rval))
+						e = GF_SCRIPT_ERROR;
+				}
+				gf_dm_sess_del(sess);
+			}
+			gf_free(url);
+			if (!e) return 1;
+		}
+	}
+
+	par.info.e = GF_SCRIPT_ERROR;
+	par.info.msg = "Cannot fetch script";
+	ScriptAction(NULL, node->sgprivate->scenegraph, GF_JSAPI_OP_MESSAGE, NULL, &par);
+	return 0;
+}
+
+
+static void JSScript_LoadVRML(GF_Node *node)
+{
+	char *str;
+	u32 i;
+	u32 flags = JS_EVAL_TYPE_GLOBAL;
+	Bool local_script;
+	JSValue rval;
+	M_Script *script = (M_Script *)node;
+	GF_ScriptPriv *priv = (GF_ScriptPriv *) node->sgprivate->UserPrivate;
+
+	if (!priv || priv->is_loaded) return;
+	if (!script->url.count) return;
+	priv->is_loaded = 1;
+
+	/*register script width parent scene (cf base_scenegraph::sg_reset) */
+	gf_list_add(node->sgprivate->scenegraph->scripts, node);
+
+	str = NULL;
+	for (i=0; i<script->url.count; i++) {
+		str = script->url.vals[i].script_text;
+		while (strchr("\n\t ", str[0])) str++;
+
+		if (!strnicmp(str, "javascript:", 11)) str += 11;
+		else if (!strnicmp(str, "vrmlscript:", 11)) str += 11;
+		else if (!strnicmp(str, "ecmascript:", 11)) str += 11;
+		else if (!strnicmp(str, "mpeg4script:", 12)) str += 12;
+		else str = NULL;
+		if (str) break;
+	}
+	local_script = str ? 1 : 0;
+
+	/*lock runtime and set current thread before creating the context*/
+	priv->js_ctx = gf_js_create_context();
+	if (!priv->js_ctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[VRML JS] Cannot allocate ECMAScript context for node\n"));
+		return;
+	}
+
+	gf_js_lock(priv->js_ctx, 1);
+
+	JS_SetContextOpaque(priv->js_ctx, node);
+	vrml_js_init_api(priv, node);
+
+	qjs_module_init_scenejs(priv->js_ctx);
+	qjs_module_init_storage(priv->js_ctx);
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Built-in classes initialized\n"));
+#ifndef GPAC_DISABLE_SVG
+	/*initialize DOM*/
+	dom_js_load(node->sgprivate->scenegraph, priv->js_ctx);
+	/*create event object, and remember it*/
+	priv->the_event = dom_js_define_event(priv->js_ctx);
+	priv->the_event = JS_DupValue(priv->js_ctx, priv->the_event);
+#endif
+	qjs_module_init_xhr_global(priv->js_ctx, priv->js_obj);
+
+	priv->jsf_cache = gf_list_new();
+
+	/*setup fields interfaces*/
+	JS_InitScriptFields(priv, node);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] script fields initialized\n"));
+
+	priv->JS_PreDestroy = JS_PreDestroy;
+	priv->JS_EventIn = JS_EventIn;
+
+	if (!local_script) {
+		JSScriptFromFile(node, NULL, 0, &rval);
+		gf_js_lock(priv->js_ctx, 0);
+		return;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[VRML JS] Evaluating script %s\n", str));
+
+ 	if (!gf_opts_get_bool("core", "no-js-mods") && JS_DetectModule((const char *) str, (u32) strlen(str) ))
+		flags = JS_EVAL_TYPE_MODULE;
+
+	JSValue ret = JS_Eval(priv->js_ctx, str, (u32) strlen(str), "inline_script", flags);
+	if (!JS_IsException(ret)) {
+		JSValue fval = JS_GetPropertyStr(priv->js_ctx, priv->js_obj, "initialize");
+		if (JS_IsFunction(priv->js_ctx, fval) && !JS_IsUndefined(fval)) {
+			JSValue r, args[2];
+			args[0] = JS_TRUE;
+			args[1] = JS_NewFloat64(priv->js_ctx, gf_node_get_scene_time(node) );
+			r = JS_Call(priv->js_ctx, fval, priv->js_obj, 2, args);
+			if (JS_IsException(r)) {
+				js_dump_error(priv->js_ctx);
+			}
+			JS_FreeValue(priv->js_ctx, r);
+			JS_FreeValue(priv->js_ctx, args[0]);
+			JS_FreeValue(priv->js_ctx, args[1]);
+
+			gf_js_vrml_flush_event_out(node, priv);
+		}
+		JS_FreeValue(priv->js_ctx, fval);
+	} else {
+		js_dump_error(priv->js_ctx);
+	}
+
+	JS_FreeValue(priv->js_ctx, ret);
+	js_do_loop(priv->js_ctx);
+
+	gf_js_lock(priv->js_ctx, 0);
+
+	do_js_gc(priv->js_ctx, node);
+}
+
+static void JSScript_Load(GF_Node *node)
+{
+#ifndef GPAC_DISABLE_SVG
+	void JSScript_LoadSVG(GF_Node *node);
+#endif
+
+	switch (node->sgprivate->tag) {
+	case TAG_MPEG4_Script:
+#ifndef GPAC_DISABLE_X3D
+	case TAG_X3D_Script:
+#endif
+		JSScript_LoadVRML(node);
+		break;
+#ifndef GPAC_DISABLE_SVG
+	case TAG_SVG_script:
+	case TAG_SVG_handler:
+		JSScript_LoadSVG(node);
+		break;
+#endif
+	default:
+		break;
+	}
+}
+
+
+static void JSScript_NodeModified(GF_SceneGraph *sg, GF_Node *node, GF_FieldInfo *info, GF_Node *script)
+{
+	u32 i;
+	GF_JSField *jsf;
+	/*this is REPLACE NODE signaling*/
+	if (script) {
+		u32 count;
+		GF_ScriptPriv *priv = gf_node_get_private(script);
+		count = gf_list_count(priv->jsf_cache);
+
+		for (i=0; i<count; i++) {
+			jsf = gf_list_get(priv->jsf_cache, i);
+			assert(jsf);
+			if (jsf->node && (jsf->node==node)) {
+				//detach node and its js binding
+				jsf->node = NULL;
+				node->sgprivate->interact->js_binding->pf = NULL;
+				node->sgprivate->interact->js_binding->obj = JS_UNDEFINED;
+			}
+		}
+		return;
+	}
+
+	if (!info) {
+		/*handle DOM case*/
+		if ((node->sgprivate->tag>=GF_NODE_FIRST_PARENT_NODE_TAG)
+		        && node->sgprivate->interact
+		        && node->sgprivate->interact->js_binding
+		        && !JS_IsUndefined(node->sgprivate->interact->js_binding->obj))
+		{
+
+			if (gf_list_del_item(sg->objects, node->sgprivate->interact->js_binding)>=0) {
+#ifndef GPAC_DISABLE_SVG
+				void svg_free_node_binding(struct __tag_svg_script_ctx *svg_js, GF_Node *node);
+				svg_free_node_binding(sg->svg_js, node);
+#endif
+			}
+			return;
+		}
+		/*this is unregister signaling*/
+		if (!node->sgprivate->parents && node->sgprivate->interact && node->sgprivate->interact->js_binding && node->sgprivate->interact->js_binding->pf) {
+			GF_JSField *field = node->sgprivate->interact->js_binding->pf;
+			/*if this is the last occurence of the obj (no longer in JS), remove node binding*/
+			if (JS_VALUE_HAS_REF_COUNT(field->obj)) {
+				JSRefCountHeader *p = (JSRefCountHeader *)JS_VALUE_GET_PTR(field->obj);
+				if (p->ref_count==1) {
+					//store obj before calling JS_ObjectDestroyed which will set field->obj to JS_UNDEFINED
+					JSValue obj = field->obj;
+					JS_ObjectDestroyed(JS_GetRuntime(field->js_ctx), obj, field, 1);
+					JS_FreeValue(field->js_ctx, obj);
+					gf_free(field);
+					assert( node->sgprivate->interact->js_binding->pf==NULL);
+					//unregister node since we destroyed the binding
+					gf_node_unregister(node, NULL);
+				}
+			}
+			return;
+		}
+
+		/*final destroy*/
+		if (!node->sgprivate->num_instances) {
+			i=0;
+			while (node->sgprivate->interact && node->sgprivate->interact->js_binding && (jsf = gf_list_enum(node->sgprivate->interact->js_binding->fields, &i))) {
+				jsf->owner = NULL;
+
+				if (jsf->mfvals) {
+					u32 j;
+
+					if (jsf->field.fieldType != GF_SG_VRML_MFNODE) {
+						u32 count = jsf->mfvals_count;
+						GF_JSClass *sf_class = get_sf_class(jsf->field.fieldType);
+
+						if (!sf_class) count=0;
+
+						for (j=0; j<count; j++) {
+							JSValue item = jsf->mfvals[j];
+							GF_JSField *afield = JS_GetOpaque(item, sf_class->class_id);
+							if (afield) {
+								afield->owner = NULL;
+							}
+						}
+					}
+					while (jsf->mfvals_count) {
+						jsf->mfvals_count--;
+						JS_FreeValue(jsf->js_ctx, jsf->mfvals[jsf->mfvals_count]);
+					}
+					gf_free(jsf->mfvals);
+					jsf->mfvals = NULL;
+				}
+			}
+		}
+		return;
+	}
+	/*this is field modification signaling*/
+	if (!node->sgprivate->interact || !node->sgprivate->interact->js_binding) return;
+	i=0;
+	while ((jsf = gf_list_enum(node->sgprivate->interact->js_binding->fields, &i))) {
+		if ((jsf->field.fieldIndex == info->fieldIndex) && (jsf->field.fieldType == info->fieldType)) {
+			jsf->field.NDTtype = 1;
+
+			/*if field is a script field, rewrite it right away because script fields are exposed
+			as global variables within the script
+
+			We also have a special value '-1' for the NDT for addChildren and removeChildren*/
+
+#if 0
+			if ((info->NDTtype == (u32) -1) || (node == (GF_Node*)JS_GetScript(jsf->js_ctx))) {
+				gf_sg_script_update_cached_object( JS_GetScriptStack(jsf->js_ctx), jsf->obj, jsf, &jsf->field, node);
+			}
+#endif
+			return;
+		}
+	}
+}
+
+GF_EXPORT
+void gf_sg_handle_dom_event_for_vrml(GF_Node *node, GF_DOM_Event *event, GF_Node *observer)
+{
+#ifndef GPAC_DISABLE_SVG
+	GF_ScriptPriv *priv;
+	Bool prev_type;
+	//JSBool ret = JS_FALSE;
+	GF_DOM_Event *prev_event = NULL;
+	SVG_handlerElement *hdl;
+	JSValue ret;
+	JSValue evt;
+	JSValue argv[1];
+
+	hdl = (SVG_handlerElement *) node;
+	if (!hdl->js_data) return;
+	if (!JS_IsFunction(hdl->js_data->ctx, hdl->js_data->fun_val) && !JS_IsUndefined(hdl->js_data->evt_listen_obj)) {
+		return;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[DOM Events] Executing script code from VRML handler\n"));
+
+	priv = JS_GetScriptStack(hdl->js_data->ctx);
+	gf_js_lock(priv->js_ctx, 1);
+
+	prev_event = JS_GetOpaque_Nocheck(priv->the_event);
+	/*break loops*/
+	if (prev_event && (prev_event->type==event->type) && (prev_event->target==event->target)) {
+		gf_js_lock(priv->js_ctx, 0);
+		return;
+	}
+
+	evt = gf_dom_new_event(priv->js_ctx);
+	if (JS_IsUndefined(evt) || JS_IsNull(evt)) {
+		gf_js_lock(priv->js_ctx, 0);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM Events] Cannot create JavaScript dom event for event type %d\n", event->type));
+		return;
+	}
+
+	prev_type = event->is_vrml;
+	event->is_vrml = 1;
+	JS_SetOpaque(priv->the_event, event);
+
+	JS_SetOpaque(evt, event);
+	argv[0] = evt;
+
+	if (JS_IsFunction(hdl->js_data->ctx, hdl->js_data->fun_val)) {
+		JSValue listenObj = priv->js_obj;
+		if (!JS_IsNull(hdl->js_data->evt_listen_obj) && !JS_IsUndefined(hdl->js_data->evt_listen_obj))
+			listenObj = hdl->js_data->evt_listen_obj;
+
+		ret = JS_Call(hdl->js_data->ctx, hdl->js_data->fun_val, listenObj, 1, argv);
+	} else {
+		JSValue fun = JS_GetPropertyStr(priv->js_ctx, hdl->js_data->evt_listen_obj, "handleEvent");
+		if (JS_IsFunction(priv->js_ctx, fun)) {
+			ret = JS_Call(priv->js_ctx, fun, hdl->js_data->evt_listen_obj, 1, argv);
+		} else {
+			ret = JS_UNDEFINED;
+		}
+		JS_FreeValue(priv->js_ctx, fun);
+	}
+	if (JS_IsException(ret)) {
+		js_dump_error(priv->js_ctx);
+	}
+	JS_FreeValue(priv->js_ctx, ret);
+	JS_FreeValue(priv->js_ctx, evt);
+
+	event->is_vrml = prev_type;
+	JS_SetOpaque(priv->the_event, prev_event);
+
+	js_do_loop(priv->js_ctx);
+	gf_js_lock(priv->js_ctx, 0);
+
+#endif
+}
+
+#endif	/*GPAC_DISABLE_VRML*/
+
+#endif /*GPAC_HAS_QJS*/
+
+
+
+/*set JavaScript interface*/
+void gf_sg_set_script_action(GF_SceneGraph *scene, gf_sg_script_action script_act, void *cbk)
+{
+	if (!scene) return;
+	scene->script_action = script_act;
+	scene->script_action_cbck = cbk;
+
+#if defined(GPAC_HAS_QJS) && !defined(GPAC_DISABLE_VRML)
+	scene->script_load = JSScript_Load;
+	scene->on_node_modified = JSScript_NodeModified;
+#endif
+
+}
+
+#ifdef GPAC_HAS_QJS
+
+GF_EXPORT
+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);
+	}
+#endif
+
+#ifndef GPAC_DISABLE_SVG
+	{
+		Bool has_p = 0;
+		JSValue ns = JS_GetPropertyStr(c, obj, "namespaceURI");
+		if (!JS_IsNull(ns) && !JS_IsUndefined(ns)) has_p = 1;
+		JS_FreeValue(c, ns);
+		if (has_p) return dom_get_element(c, obj);
+	}
+#endif
+	return NULL;
+}
+
+#endif
+
+GF_EXPORT
+Bool gf_sg_has_scripting()
+{
+#ifdef GPAC_HAS_QJS
+	return 1;
+#else
+	return 0;
+#endif
+}
+
+
+#ifdef GPAC_HAS_QJS
+
+/*
+ * locking/try-locking the JS context
+ * we need to test whether the calling thread already has the lock on the script context
+ * if this is not the case (i.e. first lock on mutex), we switch JS context threads and
+ * call begin/end requests. Nesting begin/end request in a reentrant way crashes JS
+ * (mozilla doc is wrong here)
+ *
+ * */
+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;
+}
+
+#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-0.8.0.tar.gz/src/scenegraph/vrml_proto.c -> gpac-1.0.0.tar.gz/src/scenegraph/vrml_proto.c Changed

@@ -68,7 +68,8 @@
 	return tmp;
 }
 
-GF_EXPORT
+#if 0
+/*used for memory handling of scene graph only. move proto from off-graph to in-graph or reverse*/
 GF_Err gf_sg_proto_set_in_graph(GF_Proto *proto, GF_SceneGraph *inScene, Bool set_in)
 {
 	u32 i;
@@ -96,12 +97,11 @@
 	}
 	return gf_list_add(insertIn, proto);
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_sg_proto_del(GF_Proto *proto)
 {
-	GF_Node *node;
-	GF_ProtoFieldInterface *field;
 	s32 i;
 
 	if (!proto) return GF_OK;
@@ -113,7 +113,7 @@
 
 	/*first destroy the code*/
 	while (gf_list_count(proto->node_code)) {
-		node = (GF_Node*)gf_list_get(proto->node_code, 0);
+		GF_Node *node = (GF_Node*)gf_list_get(proto->node_code, 0);
 		gf_node_unregister(node, NULL);
 		gf_list_rem(proto->node_code, 0);
 	}
@@ -121,7 +121,7 @@
 
 	/*delete interface*/
 	while (gf_list_count(proto->proto_fields)) {
-		field = (GF_ProtoFieldInterface*)gf_list_get(proto->proto_fields, 0);
+		GF_ProtoFieldInterface *field = (GF_ProtoFieldInterface*)gf_list_get(proto->proto_fields, 0);
 		if (field->userpriv && field->OnDelete) field->OnDelete(field->userpriv);
 
 		if (field->FieldType==GF_SG_VRML_SFNODE) {
@@ -168,7 +168,8 @@
 	return proto ? proto->sub_graph : NULL;
 }
 
-GF_EXPORT
+
+#if 0
 void gf_sg_proto_set_private(GF_Proto *p, void *ptr, void (*OnDelete)(void *ptr) )
 {
 	if (p) {
@@ -177,11 +178,11 @@
 	}
 }
 
-GF_EXPORT
 void *gf_sg_proto_get_private(GF_Proto *p)
 {
 	return p ? p->userpriv : NULL;
 }
+#endif
 
 GF_EXPORT
 MFURL *gf_sg_proto_get_extern_url(GF_Proto *proto)
@@ -262,7 +263,7 @@
 	return tmp;
 }
 
-GF_EXPORT
+#if 0 //unused
 void gf_sg_proto_field_set_private(GF_ProtoFieldInterface *field, void *ptr, void (*OnDelete)(void *ptr))
 {
 	if (field) {
@@ -271,12 +272,11 @@
 	}
 }
 
-GF_EXPORT
 void *gf_sg_proto_field_get_private(GF_ProtoFieldInterface *field)
 {
 	return field ? field->userpriv : NULL;
 }
-
+#endif
 
 GF_EXPORT
 GF_Err gf_sg_proto_field_get_field(GF_ProtoFieldInterface *field, GF_FieldInfo *info)
@@ -343,17 +343,20 @@
 s32 gf_sg_proto_get_field_index_by_name(GF_Proto *proto, GF_Node *node, char *name)
 {
 	u32 i;
-	GF_ProtoFieldInterface *proto_field;
-	GF_Proto *__proto;
+	GF_Proto *__proto=NULL;
 
 	if (!node && !proto) return -1;
 	if (node && (node->sgprivate->tag!=TAG_ProtoNode)) return -1;
 
-	__proto = proto ? proto : ((GF_ProtoInstance *) node)->proto_interface;
+	if (proto)
+		__proto = proto;
+	else if (node)
+		__proto = ((GF_ProtoInstance *) node)->proto_interface;
+
 	if (!__proto ) return -1;
 
 	for (i=0; i<gf_list_count(__proto->proto_fields); i++) {
-		proto_field = (GF_ProtoFieldInterface*)gf_list_get(__proto->proto_fields, i);
+		GF_ProtoFieldInterface *proto_field = (GF_ProtoFieldInterface*)gf_list_get(__proto->proto_fields, i);
 		if (proto_field->FieldName && !strcmp(proto_field->FieldName, name)) return i;
 	}
 	return -1;
@@ -367,12 +370,11 @@
 	Bool is_script;
 	GF_Node *node, *child;
 	GF_ChildNodeItem *list, *last;
-	GF_Route *r1, *r2;
+	GF_Route *r1;
 #ifndef GPAC_DISABLE_BIFS
 	void BIFS_SetupConditionalClone(GF_Node *node, GF_Node *orig);
 #endif
 	GF_ProtoInstance *proto;
-	GF_Proto *proto_node;
 	GF_FieldInfo field_orig, field;
 
 	/*this is not a mistake*/
@@ -406,7 +408,7 @@
 	}
 	/*create a node*/
 	if (orig->sgprivate->tag == TAG_ProtoNode) {
-		proto_node = ((GF_ProtoInstance *)orig)->proto_interface;
+		GF_Proto *proto_node = ((GF_ProtoInstance *)orig)->proto_interface;
 		/*create the instance but don't load the code -c we MUST wait for ISed routes to be cloned before*/
 		node = gf_sg_proto_create_node(inScene, proto_node, (GF_ProtoInstance *) orig);
 	} else {
@@ -487,7 +489,7 @@
 	/*create Routes for ISed fields*/
 	i=0;
 	while ((r1 = (GF_Route*)gf_list_enum(proto->proto_interface->sub_graph->Routes, &i))) {
-		r2 = NULL;
+		GF_Route *r2 = NULL;
 		/*locate only ISed routes*/
 		if (!r1->IS_route) continue;
 
@@ -530,7 +532,7 @@
 static Bool is_same_proto(GF_Proto *extern_proto, GF_Proto *proto)
 {
 	u32 i, count;
-	/*CRML allows external protos to have more fields defined that the externProto referencing them*/
+	/*VRML allows external protos to have more fields defined that the externProto referencing them*/
 	if (gf_list_count(extern_proto->proto_fields) > gf_list_count(proto->proto_fields)) return 0;
 	count = gf_list_count(extern_proto->proto_fields);
 	for (i=0; i<count; i++) {
@@ -834,13 +836,9 @@
 void gf_sg_proto_del_instance(GF_ProtoInstance *inst)
 {
 	GF_SceneGraph *sg;
-	GF_ProtoField *field;
-	GF_Node *node;
-	u32 index;
 
-	index = 0;
 	while (gf_list_count(inst->fields)) {
-		field = (GF_ProtoField *)gf_list_get(inst->fields, 0);
+		GF_ProtoField *field = (GF_ProtoField *)gf_list_get(inst->fields, 0);
 		gf_list_rem(inst->fields, 0);
 
 		/*regular type*/
@@ -863,13 +861,12 @@
 		}
 
 		gf_free(field);
-		index++;
 	}
 	gf_list_del(inst->fields);
 
 	/*destroy the code*/
 	while (gf_list_count(inst->node_code)) {
-		node = (GF_Node*)gf_list_get(inst->node_code, 0);
+		GF_Node *node = (GF_Node*)gf_list_get(inst->node_code, 0);
 		gf_node_unregister(node, (GF_Node*) inst);
 		gf_list_rem(inst->node_code, 0);
 	}
@@ -913,7 +910,7 @@
 		} else if ((gf_sg_vrml_get_sf_type(field.fieldType)==GF_SG_VRML_SFURL) && (gf_sg_vrml_get_sf_type(nodeField.fieldType) == GF_SG_VRML_SFSTRING)) {
 //			e = GF_OK;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRML] error in IS - node field %s.%s - inType %s - outType %s\n", gf_node_get_class_name(node) , nodeField.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_field_type_by_name(nodeField.fieldType)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRML] error in IS - node field %s.%s - inType %s - outType %s\n", gf_node_get_class_name(node) , nodeField.name, gf_sg_vrml_get_field_type_name(field.fieldType), gf_sg_vrml_get_field_type_name(nodeField.fieldType)));
 			return GF_SG_INVALID_PROTO;
 		}
 	}
@@ -1005,7 +1002,7 @@
 		} else if ((gf_sg_vrml_get_sf_type(field.fieldType)==GF_SG_VRML_SFURL) && (gf_sg_vrml_get_sf_type(nodeField.fieldType) == GF_SG_VRML_SFSTRING)) {
 //			e = GF_OK;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRML] error in IS - node field %s.%s - inType %s - outType %s\n", gf_node_get_class_name(node) , nodeField.name, gf_sg_vrml_get_field_type_by_name(field.fieldType), gf_sg_vrml_get_field_type_by_name(nodeField.fieldType)));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCENE, ("[VRML] error in IS - node field %s.%s - inType %s - outType %s\n", gf_node_get_class_name(node) , nodeField.name, gf_sg_vrml_get_field_type_name(field.fieldType), gf_sg_vrml_get_field_type_name(nodeField.fieldType)));
 			return GF_SG_INVALID_PROTO;
 		}
 	}
@@ -1299,17 +1296,6 @@
 	return 0;
 }
 
-GF_SceneGraph *Node_GetExternProtoScene(GF_Node *node)
-{
-	GF_SceneGraph *sg;
-	sg = node->sgprivate->scenegraph;
-	if (!sg->pOwningProto) return NULL;
-	if (!sg->pOwningProto->proto_interface->ExternProto.count) return NULL;
-	sg = sg->pOwningProto->proto_interface->parent_graph;
-	while (sg->parent_scene) sg = sg->parent_scene;
-	return sg;
-}
-
 GF_EXPORT
 GF_Err gf_node_proto_set_grouping(GF_Node *node)
 {
@@ -1333,7 +1319,7 @@
 	return ((GF_ProtoInstance *)node)->RenderingNode;
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Node *gf_node_get_proto_parent(GF_Node *node)
 {
 	if (!node) return NULL;
@@ -1344,7 +1330,6 @@
 	return NULL;
 }
 
-GF_EXPORT
 Bool gf_node_is_proto_root(GF_Node *node)
 {
 	if (!node) return 0;
@@ -1353,6 +1338,7 @@
 	if (gf_list_find(node->sgprivate->scenegraph->pOwningProto->node_code, node)>=0) return 1;
 	return 0;
 }
+#endif
 
 
 GF_EXPORT

gpac-0.8.0.tar.gz/src/scenegraph/vrml_route.c -> gpac-1.0.0.tar.gz/src/scenegraph/vrml_route.c Changed

gpac-0.8.0.tar.gz/src/scenegraph/vrml_script.c -> gpac-1.0.0.tar.gz/src/scenegraph/vrml_script.c Changed

@@ -27,7 +27,7 @@
 /*MPEG4 & X3D tags (for node tables & script handling)*/
 #include <gpac/nodes_mpeg4.h>
 #include <gpac/nodes_x3d.h>
-
+#include "qjs_common.h"
 
 #ifndef GPAC_DISABLE_VRML
 
@@ -40,7 +40,6 @@
 void Script_PreDestroy(GF_Node *node, void *eff, Bool is_destroy)
 {
 	GF_ScriptPriv *priv;
-	GF_ScriptField *field;
 
 	if (!is_destroy) return;
 
@@ -50,7 +49,7 @@
 
 	//destroy extra fields
 	while (gf_list_count(priv->fields)) {
-		field = (GF_ScriptField *)gf_list_get(priv->fields, 0);
+		GF_ScriptField *field = (GF_ScriptField *)gf_list_get(priv->fields, 0);
 		gf_list_rem(priv->fields, 0);
 		if (field->pField) {
 			//if Node unregister
@@ -93,6 +92,7 @@
 	}
 }
 
+GF_EXPORT
 GF_Err gf_sg_script_get_field_index(GF_Node *node, u32 inField, u8 IndexMode, u32 *allField)
 {
 	u32 i;
@@ -100,7 +100,7 @@
 	u32 nb_static = script_get_nb_static_field(node);
 	GF_ScriptPriv *priv = (GF_ScriptPriv *)node->sgprivate->UserPrivate;
 	i=0;
-	while ((sf = (GF_ScriptField *)gf_list_enum(priv->fields, &i))) {
+	while (priv && (sf = (GF_ScriptField *)gf_list_enum(priv->fields, &i))) {
 		*allField = i-1+nb_static;
 		switch (IndexMode) {
 		case GF_SG_FIELD_CODING_IN:

gpac-0.8.0.tar.gz/src/scenegraph/vrml_tools.c -> gpac-1.0.0.tar.gz/src/scenegraph/vrml_tools.c Changed

@@ -239,8 +239,7 @@
 	return GF_OK;
 }
 
-/*for V4Studio...*/
-GF_EXPORT
+#if 0
 GF_Err gf_node_remove_child(GF_Node *parent, GF_Node *toremove_child)
 {
 	if (!gf_node_list_del_child(& ((GF_ParentNode *) parent)->children, toremove_child)) return GF_BAD_PARAM;
@@ -248,6 +247,7 @@
 	/*gf_node_unregister(toremove_child, parent);*/
 	return GF_OK;
 }
+#endif
 
 GF_EXPORT
 void gf_sg_script_load(GF_Node *n)
@@ -717,6 +717,8 @@
 	case GF_SG_VRML_MFSCRIPT:
 		gf_sg_mfscript_del( * ((MFScript *) field));
 		break;
+	case GF_SG_VRML_SFSCRIPT:
+		return;
 
 	default:
 		assert(0);
@@ -748,7 +750,7 @@
 }
 
 GF_EXPORT
-const char *gf_sg_vrml_get_field_type_by_name(u32 FieldType)
+const char *gf_sg_vrml_get_field_type_name(u32 FieldType)
 {
 
 	switch (FieldType) {
@@ -1009,6 +1011,9 @@
 	case GF_SG_VRML_SFVEC3F:
 	case GF_SG_VRML_MFVEC3F:
 		return GF_SG_VRML_SFVEC3F;
+	case GF_SG_VRML_SFVEC4F:
+	case GF_SG_VRML_MFVEC4F:
+		return GF_SG_VRML_SFVEC4F;
 	case GF_SG_VRML_SFVEC2F:
 	case GF_SG_VRML_MFVEC2F:
 		return GF_SG_VRML_SFVEC2F;
@@ -1237,7 +1242,6 @@
 void VRML_FieldCopyCast(void *dest, u32 dst_field_type, void *orig, u32 ori_field_type)
 {
 	SFURL *url;
-	char tmp[50];
 	u32 size, i, sf_type_ori, sf_type_dst;
 	void *dst_field, *orig_field;
 	if (!dest || !orig) return;
@@ -1247,6 +1251,7 @@
 		if (ori_field_type == GF_SG_VRML_SFURL) {
 			url = ((SFURL *)orig);
 			if (url->OD_ID>0) {
+				char tmp[50];
 				sprintf(tmp, "%d", url->OD_ID);
 				if ( ((SFString*)dest)->buffer) gf_free(((SFString*)dest)->buffer);
 				((SFString*)dest)->buffer = gf_strdup(tmp);
@@ -1491,7 +1496,7 @@
 		} else {
 			if ( ((SFURL *)orig)->url && ! ((SFURL *)dest)->url) changed = 1;
 			else if ( ! ((SFURL *)orig)->url && ((SFURL *)dest)->url) changed = 1;
-			else if ( strcmp( ((SFURL *)orig)->url , ((SFURL *)dest)->url) ) changed = 1;
+			else if ( ((SFURL *)orig)->url && ((SFURL *)dest)->url && strcmp( ((SFURL *)orig)->url , ((SFURL *)dest)->url) ) changed = 1;
 		}
 		break;
 	case GF_SG_VRML_SFIMAGE:
@@ -1733,7 +1738,7 @@
 	return 0;
 }
 
-
+#if 0 //unused
 char *gf_node_vrml_dump_attribute(GF_Node *n, GF_FieldInfo *info)
 {
 	char szVal[1024];
@@ -1828,6 +1833,8 @@
 	/*todo - dump MFFields*/
 	return NULL;
 }
+#endif
+
 
 #endif /*GPAC_DISABLE_VRML*/

gpac-0.8.0.tar.gz/src/scenegraph/xml_ns.c -> gpac-1.0.0.tar.gz/src/scenegraph/xml_ns.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre - Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / SVG Scene Graph sub-project
@@ -46,6 +46,33 @@
 	GF_SVG_ATTOPT_FILTER = 5,
 } GF_SVGAttOption;
 
+/* unused XBL tags (deprecated)
+
+	TAG_XBL_ATT_RANGE_FIRST = TAG_SVG_ATT_RANGE_FIRST + 256,
+	TAG_XBL_ATT_id = TAG_XBL_ATT_RANGE_FIRST,
+	TAG_XBL_ATT_extends,
+	TAG_XBL_ATT_display,
+	TAG_XBL_ATT_inheritstyle,
+	TAG_XBL_ATT_includes,
+	TAG_XBL_ATT_name,
+	TAG_XBL_ATT_implements,
+	TAG_XBL_ATT_type,
+	TAG_XBL_ATT_readonly,
+	TAG_XBL_ATT_onget,
+	TAG_XBL_ATT_onset,
+	TAG_XBL_ATT_event,
+	TAG_XBL_ATT_action,
+	TAG_XBL_ATT_phase,
+	TAG_XBL_ATT_button,
+	TAG_XBL_ATT_modifiers,
+	TAG_XBL_ATT_keycode,
+	TAG_XBL_ATT_key,
+	TAG_XBL_ATT_charcode,
+	TAG_XBL_ATT_clickcount,
+	TAG_XBL_ATT_command,
+	TAG_XBL_ATT_preventdefault,
+	TAG_XBL_ATT_src,
+*/
 static const struct xml_att_def {
 	const char *name;
 	u32 tag;
@@ -230,8 +257,8 @@
 	{ "fx", TAG_SVG_ATT_fx, SVG_Coordinate_datatype, 0, GF_XMLNS_SVG },
 	{ "fy", TAG_SVG_ATT_fy, SVG_Coordinate_datatype, 0, GF_XMLNS_SVG },
 	{ "size", TAG_SVG_ATT_size, LASeR_Size_datatype, 0, GF_XMLNS_SVG },
-	{ "choice", TAG_SVG_ATT_choice, LASeR_Choice_datatype, 0, GF_XMLNS_SVG },
-	{ "delta", TAG_SVG_ATT_delta, LASeR_Size_datatype, 0, GF_XMLNS_SVG },
+	{ "choice", TAG_SVG_ATT_choice, LASeR_Choice_datatype, 0, GF_XMLNS_LASER },
+	{ "delta", TAG_SVG_ATT_delta, LASeR_Size_datatype, 0, GF_XMLNS_LASER },
 	{ "offset", TAG_SVG_ATT_offset, SVG_Number_datatype, 0, GF_XMLNS_SVG },
 	{ "syncBehaviorDefault", TAG_SVG_ATT_syncBehaviorDefault, SMIL_SyncBehavior_datatype, 0, GF_XMLNS_SVG },
 	{ "syncToleranceDefault", TAG_SVG_ATT_syncToleranceDefault, SMIL_SyncTolerance_datatype, 0, GF_XMLNS_SVG },
@@ -286,6 +313,7 @@
 	{ "y", TAG_SVG_ATT_cursorManager_y, SVG_Length_datatype, GF_SVG_ATTOPT_CURSOR, GF_XMLNS_LASER },
 
 	/*XBL*/
+#if 0
 	{ "id", TAG_XBL_ATT_id, DOM_String_datatype, 0, GF_XMLNS_XBL },
 	{ "extends", TAG_XBL_ATT_extends, DOM_String_datatype, 0, GF_XMLNS_XBL },
 	{ "display", TAG_XBL_ATT_display, DOM_String_datatype, 0, GF_XMLNS_XBL },
@@ -309,7 +337,7 @@
 	{ "command", TAG_XBL_ATT_command, DOM_String_datatype, 0, GF_XMLNS_XBL },
 	{ "preventdefault", TAG_XBL_ATT_preventdefault, DOM_String_datatype, 0, GF_XMLNS_XBL },
 	{ "src", TAG_XBL_ATT_src, DOM_String_datatype, 0, GF_XMLNS_XBL },
-
+#endif
 	/*GPAC SVG Extensions*/
 	{ "use-as-primary", TAG_GSVG_ATT_useAsPrimary, SVG_Boolean_datatype, 0, GF_XMLNS_SVG_GPAC_EXTENSION},
 	{ "depthOffset", TAG_GSVG_ATT_depthOffset, SVG_Number_datatype, 0, GF_XMLNS_SVG_GPAC_EXTENSION},
@@ -381,14 +409,13 @@
 	return gf_xml_get_namespace_qname((GF_DOMNode*)elt->sgprivate->parents->node, ns);
 }
 
-u32 gf_xml_get_attribute_tag(GF_Node *elt, char *attribute_name, u32 ns)
+u32 gf_xml_get_attribute_tag(GF_Node *elt, char *attribute_name, GF_NamespaceType ns)
 {
-	char *ns_sep;
 	u32 i, count;
 	count = sizeof(xml_attributes) / sizeof(struct xml_att_def);
 
 	if (!ns) {
-		ns_sep = strchr(attribute_name, ':');
+		char *ns_sep = strchr(attribute_name, ':');
 		if (ns_sep) {
 			ns_sep[0] = 0;
 			ns = gf_sg_get_namespace_code(elt->sgprivate->scenegraph, attribute_name);
@@ -597,33 +624,13 @@
 	{ "simpleLayout", TAG_LSR_simpleLayout, GF_XMLNS_LASER },
 	{ "updates", TAG_LSR_updates, GF_XMLNS_LASER },
 
-	/*XBL*/
-	{ "bindings", TAG_XBL_bindings, GF_XMLNS_XBL },
-	{ "binding", TAG_XBL_binding, GF_XMLNS_XBL },
-	{ "content", TAG_XBL_content, GF_XMLNS_XBL },
-	{ "children", TAG_XBL_children, GF_XMLNS_XBL },
-	{ "implementation", TAG_XBL_implementation, GF_XMLNS_XBL },
-	{ "constructor", TAG_XBL_constructor, GF_XMLNS_XBL },
-	{ "destructor", TAG_XBL_destructor, GF_XMLNS_XBL },
-	{ "field", TAG_XBL_field, GF_XMLNS_XBL },
-	{ "property", TAG_XBL_property, GF_XMLNS_XBL },
-	{ "getter", TAG_XBL_getter, GF_XMLNS_XBL },
-	{ "setter", TAG_XBL_setter, GF_XMLNS_XBL },
-	{ "method", TAG_XBL_method, GF_XMLNS_XBL },
-	{ "parameter", TAG_XBL_parameter, GF_XMLNS_XBL },
-	{ "body", TAG_XBL_body, GF_XMLNS_XBL },
-	{ "handlers", TAG_XBL_handlers, GF_XMLNS_XBL },
-	{ "handler", TAG_XBL_handler, GF_XMLNS_XBL },
-	{ "resources", TAG_XBL_resources, GF_XMLNS_XBL },
-	{ "stylesheet", TAG_XBL_stylesheet, GF_XMLNS_XBL },
-	{ "image", TAG_XBL_image, GF_XMLNS_XBL },
 };
 
 GF_EXPORT
 u32 gf_xml_get_element_tag(const char *element_name, u32 ns)
 {
 	u32 i, count;
-	if (!element_name) return TAG_UndefinedNode;
+//	if (!element_name) return TAG_UndefinedNode;
 	count = sizeof(xml_elements) / sizeof(struct xml_elt_def);
 	for (i=0; i<count; i++) {
 		if (!strcmp(xml_elements[i].name, element_name)) {
@@ -643,7 +650,7 @@
 	for (i=0; i<count; i++) {
 		if (n && n->sgprivate && (n->sgprivate->tag==xml_elements[i].tag)) {
 			char *xmlns;
-			if (!n || (ns == xml_elements[i].xmlns))
+			if (ns == xml_elements[i].xmlns)
 				return xml_elements[i].name;
 
 			xmlns = (char *) gf_sg_get_namespace_qname(n->sgprivate->scenegraph, xml_elements[i].xmlns);
@@ -675,8 +682,9 @@
 u32 gf_node_get_attribute_count(GF_Node *node)
 {
 	u32 count = 0;
-	GF_DOMNode *dom = (GF_DOMNode *)node;
-	GF_DOMAttribute *atts = dom->attributes;
+	GF_DOMAttribute *atts;
+	if (!node) return 0;
+	atts =  ((GF_DOMNode *)node)->attributes;
 	while (atts) {
 		count++;
 		atts = atts->next;
@@ -703,9 +711,9 @@
 
 void gf_node_delete_attributes(GF_Node *node)
 {
-	GF_DOMAttribute *tmp;
 	GF_DOMAttribute *att = ((GF_DOMNode*)node)->attributes;
 	while(att) {
+		GF_DOMAttribute *tmp;
 		gf_svg_delete_attribute_value(att->data_type, att->data, node->sgprivate->scenegraph);
 		tmp = att;
 		att = att->next;
@@ -968,7 +976,9 @@
 GF_Node *gf_xml_node_clone(GF_SceneGraph *inScene, GF_Node *orig, GF_Node *cloned_parent, char *inst_id, Bool deep)
 {
 	GF_DOMAttribute *att;
-	GF_Node *clone = gf_node_new(inScene, orig->sgprivate->tag);
+	GF_Node *clone;
+	if (!orig) return NULL;
+	clone = gf_node_new(inScene, orig->sgprivate->tag);
 	if (!clone) return NULL;
 
 	if (orig->sgprivate->tag == TAG_DOMText) {
@@ -983,7 +993,7 @@
 			n_src = (GF_DOMFullNode *)orig;
 			n_dst = (GF_DOMFullNode *)clone;
 			n_dst->ns = n_src->ns;
-			n_dst->name = gf_strdup(n_dst->name);
+			n_dst->name = gf_strdup(n_src->name);
 		}
 
 		att = ((GF_DOMNode *)orig)->attributes;
@@ -1041,14 +1051,13 @@
 	f = gf_fopen(szFile, "rb");
 	if (!f) return 0;
 
-	gf_fseek(f, 0, SEEK_END);
-	fsize = gf_ftell(f);
+	fsize = gf_fsize(f);
 	if (fsize==data_size) {
 		u32 offset=0;
 		char cache[1024];
-		gf_fseek(f, 0, SEEK_SET);
+
 		while (fsize) {
-			u32 read = (u32) fread(cache, 1, 1024, f);
+			u32 read = (u32) gf_fread(cache, 1024, f);
 			if ((s32) read < 0) return 0;
 			fsize -= read;
 			if (memcmp(cache, data+offset, sizeof(char)*read)) break;
@@ -1068,10 +1077,9 @@
 GF_EXPORT
 GF_Err gf_node_store_embedded_data(XMLRI *iri, const char *cache_dir, const char *base_filename)
 {
-	char szFile[GF_MAX_PATH], buf[20], *sep, *data, *ext;
-	u32 data_size, idx;
+	char szFile[GF_MAX_PATH], buf[20], *sep, *data=NULL, *ext;
+	u32 data_size=0, idx;
 	Bool existing;
-	FILE *f;
 
 	if (!cache_dir || !base_filename || !iri || !iri->string || strncmp(iri->string, "data:", 5)) return GF_OK;
 
@@ -1082,16 +1090,16 @@
 		szFile[data_size] = GF_PATH_SEPARATOR;
 		szFile[data_size+1] = 0;
 	}
-	if (base_filename) {
-		sep = strrchr(base_filename, GF_PATH_SEPARATOR);
+
+	sep = strrchr(base_filename, GF_PATH_SEPARATOR);
 #ifdef WIN32
-		if (!sep) sep = strrchr(base_filename, '/');
+	if (!sep) sep = strrchr(base_filename, '/');
 #endif
-		if (!sep) sep = (char *) base_filename;
-		else sep += 1;
-		strcat(szFile, sep);
-	}
-	sep = strrchr(szFile, '.');
+	if (!sep) sep = (char *) base_filename;
+	else sep += 1;
+	strcat(szFile, sep);
+
+	sep = gf_file_ext_start(szFile);
 	if (sep) sep[0] = 0;
 	strcat(szFile, "_img_");
 
@@ -1119,7 +1127,7 @@
 		sep += 8;
 		data_size = gf_base16_decode(sep, (u32) strlen(sep), data, data_size);
 	}
-	if (!data_size) return GF_OK;
+	if (!data || !data_size) return GF_OK;
 
 	iri->type = XMLRI_STRING;
 
@@ -1139,14 +1147,14 @@
 	strcat(szFile, ext);
 
 	if (!existing) {
-		f = gf_fopen(szFile, "wb");
+		FILE *f = gf_fopen(szFile, "wb");
 		if (!f) {
 			gf_free(data);
 			gf_free(iri->string);
 			iri->string = NULL;
 			return GF_IO_ERR;
 		}
-		gf_fwrite(data, data_size, 1, f);
+		gf_fwrite(data, data_size, f);
 		gf_fclose(f);
 	}
 	gf_free(data);

gpac-0.8.0.tar.gz/src/terminal/terminal.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / Media terminal sub-project
@@ -24,7 +24,6 @@
  */
 
 
-#include <gpac/internal/terminal_dev.h>
 #include <gpac/internal/compositor_dev.h>
 #include <gpac/internal/scenegraph_dev.h>
 #include <gpac/term_info.h>
@@ -32,384 +31,41 @@
 #include <gpac/options.h>
 #include <gpac/network.h>
 #include <gpac/xml.h>
-#include "../utils/module_wrap.h"
+#include <gpac/avparse.h>
+#include <gpac/nodes_svg.h>
 
-#include "media_control.h"
+#include "../utils/module_wrap.h"
 
 /*textual command processing*/
+#include <gpac/terminal.h>
 #include <gpac/scene_manager.h>
 
-#include "media_memory.h"
-
-
-/*creates service for given OD / URL
-SHALL ONLY BE USED BY MAIN CLIENT*/
-static void gf_term_connect_object(GF_Terminal *app, GF_ObjectManager *odm, char *serviceURL, char *parent_url);
+u32 gf_term_sample_clocks(GF_Terminal *term);
 
-void gf_term_load_shortcuts(GF_Terminal *term);
 
-u32 gf_term_get_time(GF_Terminal *term)
+struct _tag_terminal
 {
-	assert(term);
-	return gf_sc_get_clock(term->compositor);
-}
+	GF_User *user;
+	GF_Compositor *compositor;
+	GF_FilterSession *fsess;
+	Bool in_destroy;
+	u32 reload_state;
+	char *reload_url;
+};
 
-void gf_term_invalidate_compositor(GF_Terminal *term)
-{
-	gf_sc_invalidate(term->compositor, NULL);
-}
+GF_Compositor *gf_sc_from_filter(GF_Filter *filter);
 
-static Bool check_user(GF_User *user)
-{
-	if (!user->config) return 0;
-	if (!user->modules) return 0;
-	if (!user->opaque) return 0;
-	return 1;
-}
+u32 gf_sc_play_from_time(GF_Compositor *compositor, u64 from_time, u32 pause_at_first_frame);
 
-void gf_term_message_ex(GF_Terminal *term, const char *service, const char *message, GF_Err error, Bool no_filtering)
-{
-	GF_Event evt;
-	if (!term || !term->user) return;
-	memset(&evt, 0, sizeof(GF_Event));
-	evt.type = GF_EVENT_MESSAGE;
-	evt.message.service = service;
-	evt.message.message = message;
-	evt.message.error = error;
-
-	if (no_filtering) {
-		if (term->user->EventProc) {
-			term->nb_calls_in_event_proc++;
-			term->user->EventProc(term->user->opaque, &evt);
-			term->nb_calls_in_event_proc--;
-		}
-	} else {
-		gf_term_send_event(term, &evt);
-	}
-}
 
 GF_EXPORT
-void gf_term_message(GF_Terminal *term, const char *service, const char *message, GF_Err error)
-{
-	gf_term_message_ex(term, service, message, error, 0);
-}
-
-static Bool term_script_action(void *opaque, u32 type, GF_Node *n, GF_JSAPIParam *param)
-{
-	Bool ret;
-	GF_Terminal *term = (GF_Terminal *) opaque;
-
-	if (type==GF_JSAPI_OP_MESSAGE) {
-		gf_term_message_ex(term, term->root_scene->root_od->net_service->url, param->info.msg, param->info.e, 1);
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_GET_TERM) {
-		param->term = term;
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_RESOLVE_XLINK) {
-#ifndef GPAC_DISABLE_SVG
-		param->uri.url = (char *) gf_term_resolve_xlink(n, (char *) param->uri.url);
-		return 1;
-#else
-		return 0;
-#endif
-	}
-	if (type==GF_JSAPI_OP_GET_OPT) {
-		param->gpac_cfg.key_val = gf_cfg_get_key(term->user->config, param->gpac_cfg.section, param->gpac_cfg.key);
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_SET_OPT) {
-		gf_cfg_set_key(term->user->config, param->gpac_cfg.section, param->gpac_cfg.key, param->gpac_cfg.key_val);
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_GET_DOWNLOAD_MANAGER) {
-		param->dnld_man = term->downloader;
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_SET_TITLE) {
-		GF_Event evt;
-		if (!term->user->EventProc) return 0;
-		evt.type = GF_EVENT_SET_CAPTION;
-		evt.caption.caption = param->uri.url;
-		gf_term_send_event(term, &evt);
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_GET_DCCI) {
-		param->scene = term->dcci_doc;
-		return 1;
-	}
-	if (type==GF_JSAPI_OP_GET_SUBSCENE) {
-		GF_Scene *scene = (GF_Scene *)gf_node_get_private(n);
-		param->scene = scene->graph;
-		return 1;
-	}
-
-	if (type==GF_JSAPI_OP_RESOLVE_URI) {
-		char *url;
-		char new_url[GF_MAX_PATH], localized_url[GF_MAX_PATH];
-		Bool result;
-		GF_Scene *scene = (GF_Scene *)gf_sg_get_private(gf_node_get_graph(n));
-		url = (char *)param->uri.url;
-		if (!url) {
-			param->uri.url = gf_strdup(scene->root_od->net_service->url);
-			param->uri.nb_params = 0;
-			return 1;
-		}
-
-		result = gf_term_relocate_url(term, url, scene->root_od->net_service->url, new_url, localized_url);
-		if (result) param->uri.url = gf_strdup(new_url);
-		else param->uri.url = gf_url_concatenate(scene->root_od->net_service->url, url);
-		return 1;
-	}
-
-	/*special case for pause/stop/resume*/
-	if (type==GF_JSAPI_OP_PAUSE_SVG) {
-		GF_SceneGraph *graph = gf_node_get_graph(n);
-		if (n == gf_sg_get_root_node(graph)) {
-			GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
-			GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-			if (ck) gf_clock_pause(ck);
-			return 1;
-		}
-	}
-	if (type==GF_JSAPI_OP_RESUME_SVG) {
-		GF_SceneGraph *graph = gf_node_get_graph(n);
-		if (n == gf_sg_get_root_node(graph)) {
-			GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
-			GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-			if (ck) gf_clock_resume(ck);
-			return 1;
-		}
-	}
-	if (type==GF_JSAPI_OP_RESTART_SVG) {
-		GF_SceneGraph *graph = gf_node_get_graph(n);
-		if (n == gf_sg_get_root_node(graph)) {
-			GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
-			GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-			if (ck) {
-				Bool is_paused = ck->Paused;
-				if (is_paused) gf_clock_resume(ck);
-				gf_scene_restart_dynamic(scene, 0, 0, 0);
-				if (is_paused) gf_clock_pause(ck);
-			}
-			return 1;
-		}
-		return 0;
-	}
-	if (type==GF_JSAPI_OP_SET_SCENE_SPEED) {
-		GF_SceneGraph *graph = gf_node_get_graph(n);
-		if (n == gf_sg_get_root_node(graph)) {
-			GF_Scene *scene = (GF_Scene *)gf_sg_get_private(graph);
-			GF_Clock *ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-			if (ck) {
-				gf_clock_set_speed(ck, param->val);
-			}
-			return 1;
-		}
-		return 0;
-	}
-
-
-	ret = gf_sc_script_action(term->compositor, type, n, param);
-	if (ret) return ret;
-
-	if (type==GF_JSAPI_OP_LOAD_URL) {
-		if (gf_sg_get_private(gf_node_get_graph(n)) == term->root_scene) {
-			GF_Event evt;
-			if (!term->user->EventProc) return 0;
-			evt.type = GF_EVENT_NAVIGATE;
-			evt.navigate.to_url = param->uri.url;
-			evt.navigate.parameters = param->uri.params;
-			evt.navigate.param_count = param->uri.nb_params;
-			return gf_term_send_event(term, &evt);
-		} else {
-			/*TODO*/
-			return 0;
-		}
-	}
-	return 0;
-}
-
-
-static Bool term_find_res(GF_TermLocales *loc, char *parent, char *path, char *relocated_path, char *localized_rel_path)
+Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt)
 {
-	FILE *f;
-
-	if (loc->szAbsRelocatedPath) gf_free(loc->szAbsRelocatedPath);
-	loc->szAbsRelocatedPath = gf_url_concatenate(parent, path);
-	if (!loc->szAbsRelocatedPath) loc->szAbsRelocatedPath = gf_strdup(path);
-
-	f = gf_fopen(loc->szAbsRelocatedPath, "rb");
-	if (f) {
-		gf_fclose(f);
-		strcpy(localized_rel_path, path);
-		strcpy(relocated_path, loc->szAbsRelocatedPath);
-		return 1;
-	}
-	return 0;
+	return gf_filter_send_gf_event(term->compositor->filter, evt);
 }
 
-/* Checks if, for a given relative path, there exists a localized version in an given folder
-   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)
-{
-	char path[GF_MAX_PATH];
-	const char *opt;
-
-	GF_TermLocales *loc = (GF_TermLocales*)__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)) {
-		return 0;
-	}
-
-	/*Checks if the absolute path is really absolute and points to a local file (no http or else) */
-	if (!locales_parent_path ||
-	        (locales_parent_path && (locales_parent_path[0] != '/') && strstr(locales_parent_path, "://") && strnicmp(locales_parent_path, "file://", 7))) {
-		return 0;
-	}
-	opt = gf_cfg_get_key(loc->term->user->config, "Systems", "Language2CC");
-	if (opt) {
-		if (!strcmp(opt, "*") || !strcmp(opt, "un") )
-			opt = NULL;
-	}
-
-	while (opt) {
-		char lan[100];
-		char *sep;
-		char *sep_lang = strchr(opt, ';');
-		if (sep_lang) sep_lang[0] = 0;
-
-		while (strchr(" \t", opt[0]))
-			opt++;
-
-		strcpy(lan, opt);
-
-		if (sep_lang) {
-			sep_lang[0] = ';';
-			opt = sep_lang+1;
-		} else {
-			opt = NULL;
-		}
-
-		while (1) {
-			sep = strstr(lan, "-*");
-			if (!sep) break;
-			strncpy(sep, sep+2, strlen(sep)-2);
-		}
-
-		sprintf(path, "locales/%s/%s", lan, rel_path);
-		if (term_find_res(loc, (char *) locales_parent_path, (char *) path, relocated_path, localized_rel_path))
-			return 1;
-
-		/*recursively remove region (sub)tags*/
-		while (1) {
-			sep = strrchr(lan, '-');
-			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))
-				return 1;
-		}
-	}
-
-	if (term_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;
-}
-
-
-static void gf_term_reload_cfg(GF_Terminal *term)
-{
-	const char *sOpt;
-	u32 mode;
-	s32 prio;
-
-	if (!term) return;
-
-	/*reload term part*/
-
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", "DrawLateFrames");
-	if (sOpt && !stricmp(sOpt, "no"))
-		term->flags |= GF_TERM_DROP_LATE_FRAMES;
-	else
-		term->flags &= ~GF_TERM_DROP_LATE_FRAMES;
-
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", "ForceSingleClock");
-	if (sOpt && !stricmp(sOpt, "yes"))
-		term->flags |= GF_TERM_SINGLE_CLOCK;
-	else
-		term->flags &= ~GF_TERM_SINGLE_CLOCK;
-
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", "TimeSlice");
-	if (!sOpt) {
-		sOpt = "30";
-		gf_cfg_set_key(term->user->config, "Systems", "TimeSlice", "30");
-	}
-	term->frame_duration = atoi(sOpt);
-
-	sOpt = gf_cfg_get_key(term->user->config, "Network", "LowLatencyBufferMax");
-	if (!sOpt) {
-		sOpt = "500";
-		gf_cfg_set_key(term->user->config, "Network", "LowLatencyBufferMax", sOpt);
-	}
-	term->low_latency_buffer_max = atoi(sOpt);
 
-
-	if (!(term->user->init_flags & GF_TERM_NO_DECODER_THREAD) ) {
-		prio = GF_THREAD_PRIORITY_NORMAL;
-		sOpt = gf_cfg_get_key(term->user->config, "Systems", "Priority");
-		if (sOpt) {
-			if (!stricmp(sOpt, "low")) prio = GF_THREAD_PRIORITY_LOWEST;
-			else if (!stricmp(sOpt, "normal")) prio = GF_THREAD_PRIORITY_NORMAL;
-			else if (!stricmp(sOpt, "high")) prio = GF_THREAD_PRIORITY_HIGHEST;
-			else if (!stricmp(sOpt, "real-time")) prio = GF_THREAD_PRIORITY_REALTIME;
-		} else {
-			gf_cfg_set_key(term->user->config, "Systems", "Priority", "normal");
-		}
-		gf_term_set_priority(term, prio);
-
-		sOpt = gf_cfg_get_key(term->user->config, "Systems", "ThreadingPolicy");
-		if (sOpt) {
-			mode = GF_TERM_THREAD_FREE;
-			if (!stricmp(sOpt, "Single")) mode = GF_TERM_THREAD_SINGLE;
-			else if (!stricmp(sOpt, "Multi")) mode = GF_TERM_THREAD_MULTI;
-			gf_term_set_threading(term, mode);
-		}
-	} else {
-		gf_term_set_threading(term, GF_TERM_THREAD_SINGLE);
-	}
-
-	term->prefered_audio_codec_oti = 0;
-	sOpt = gf_cfg_get_key(term->user->config, "Systems", "DefAudioOTI");
-	if (sOpt) {
-		if (sscanf(sOpt, "0x%x", & term->prefered_audio_codec_oti) != 1) {
-			sscanf(sOpt, "%x", & term->prefered_audio_codec_oti);
-		}
-	}
-
-	/*default data timeout is 20 sec*/
-	term->net_data_timeout = 20000;
-	sOpt = gf_cfg_get_key(term->user->config, "Network", "DataTimeout");
-	if (sOpt) term->net_data_timeout = atoi(sOpt);
-
-	if (term->root_scene) gf_scene_set_duration(term->root_scene);
-
-#ifndef GPAC_DISABLE_SVG
-	if (term->dcci_doc) {
-		sOpt = gf_cfg_get_key(term->user->config, "General", "EnvironmentFile");
-		gf_sg_reload_xml_doc(sOpt, term->dcci_doc);
-	}
-#endif
-
-	gf_term_load_shortcuts(term);
-}
+#ifdef FILTER_FIXME
 
 static Bool gf_term_get_user_pass(void *usr_cbk, const char *site_url, char *usr_name, char *password)
 {
@@ -421,192 +77,202 @@
 	evt.auth.password = password;
 	return gf_term_send_event(term, &evt);
 }
+#endif
 
-static GF_Err gf_term_step_clocks_intern(GF_Terminal * term, u32 ms_diff, Bool force_resume_pause)
+static GF_Err gf_sc_step_clocks_intern(GF_Compositor *compositor, u32 ms_diff, Bool force_resume_pause)
 {
 	/*only play/pause if connected*/
-	if (!term || !term->root_scene || !term->root_scene->root_od) return GF_BAD_PARAM;
+	if (!compositor || !compositor->root_scene || !compositor->root_scene->root_od) return GF_BAD_PARAM;
 
 	if (ms_diff) {
 		u32 i, j;
-		GF_ClientService *ns;
+		GF_SceneNamespace *ns;
 		GF_Clock *ck;
 
-		if (term->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
+		if (compositor->play_state == GF_STATE_PLAYING) return GF_BAD_PARAM;
 
-		gf_sc_lock(term->compositor, 1);
+		gf_sc_lock(compositor, 1);
 		i = 0;
-		while ((ns = (GF_ClientService*)gf_list_enum(term->net_services, &i))) {
+		while ((ns = (GF_SceneNamespace*)gf_list_enum(compositor->root_scene->namespaces, &i))) {
 			j = 0;
-			while ((ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j))) {
-				ck->init_time += ms_diff;
+			while (ns->clocks && (ck = (GF_Clock *)gf_list_enum(ns->clocks, &j))) {
+				ck->init_timestamp += ms_diff;
 				ck->media_time_at_init += ms_diff;
 				//make sure we don't touch clock while doing resume/pause below
 				if (force_resume_pause)
-					ck->Paused++;
+					ck->nb_paused++;
 			}
 		}
-		term->compositor->step_mode = GF_TRUE;
-		term->use_step_mode = GF_TRUE;
-		gf_sc_next_frame_state(term->compositor, GF_SC_DRAW_FRAME);
+		compositor->step_mode = GF_TRUE;
+		compositor->use_step_mode = GF_TRUE;
+		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 
-		//resume/pause to trigger codecs state change 
+		//resume/pause to trigger codecs state change
 		if (force_resume_pause) {
-			mediacontrol_resume(term->root_scene->root_od, 0);
-			mediacontrol_pause(term->root_scene->root_od);
+			mediacontrol_resume(compositor->root_scene->root_od, 0);
+			mediacontrol_pause(compositor->root_scene->root_od);
 
 			//release our safety
 			i = 0;
-			while ((ns = (GF_ClientService*)gf_list_enum(term->net_services, &i))) {
+			while ((ns = (GF_SceneNamespace*)gf_list_enum(compositor->root_scene->namespaces, &i))) {
 				j = 0;
-				while ((ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j))) {
-					ck->Paused--;
+				while (ns->clocks && (ck = (GF_Clock *)gf_list_enum(ns->clocks, &j))) {
+					ck->nb_paused--;
 				}
 			}
 		}
 
-		gf_sc_lock(term->compositor, 0);
+		gf_sc_lock(compositor, 0);
 
 	}
-
-	gf_sc_flush_next_audio(term->compositor);
 	return GF_OK;
 }
 
-static void gf_term_set_play_state(GF_Terminal *term, u32 PlayState, Bool reset_audio, Bool pause_clocks)
+static void gf_term_set_play_state(GF_Compositor *compositor, u32 PlayState, Bool reset_audio, Bool pause_clocks)
 {
 	Bool resume_live = 0;
 	u32 prev_state;
 
 	/*only play/pause if connected*/
-	if (!term || !term->root_scene) return;
+	if (!compositor || !compositor->root_scene) return;
 
-	prev_state = term->play_state;
-	term->use_step_mode = GF_FALSE;
+	prev_state = compositor->play_state;
+	compositor->use_step_mode = GF_FALSE;
 
 	if (PlayState==GF_STATE_PLAY_LIVE) {
 		PlayState = GF_STATE_PLAYING;
 		resume_live = 1;
-		if (term->play_state == GF_STATE_PLAYING) {
-			term->play_state = GF_STATE_PAUSED;
-			mediacontrol_pause(term->root_scene->root_od);
+		if (compositor->play_state == GF_STATE_PLAYING) {
+			compositor->play_state = GF_STATE_PAUSED;
+			mediacontrol_pause(compositor->root_scene->root_od);
 		}
 	}
 
 	/*and if not already paused/playing*/
-	if ((term->play_state == GF_STATE_PLAYING) && (PlayState == GF_STATE_PLAYING)) return;
-	if ((term->play_state != GF_STATE_PLAYING) && (PlayState == GF_STATE_PAUSED)) return;
+	if ((compositor->play_state == GF_STATE_PLAYING) && (PlayState == GF_STATE_PLAYING)) return;
+	if ((compositor->play_state != GF_STATE_PLAYING) && (PlayState == GF_STATE_PAUSED)) return;
 
 	/*pause compositor*/
 	if ((PlayState==GF_STATE_PLAYING) && reset_audio)
-		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, 0xFF);
+		gf_sc_set_option(compositor, GF_OPT_PLAY_STATE, 0xFF);
 	else
-		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, PlayState);
+		gf_sc_set_option(compositor, GF_OPT_PLAY_STATE, PlayState);
 
 	/* step mode specific */
 	if (PlayState==GF_STATE_STEP_PAUSE) {
 		if (prev_state==GF_STATE_PLAYING) {
-			mediacontrol_pause(term->root_scene->root_od);
-			term->play_state = GF_STATE_PAUSED;
+			mediacontrol_pause(compositor->root_scene->root_od);
+			compositor->play_state = GF_STATE_PAUSED;
 		} else {
 			u32 diff=1;
-			if (term->compositor->ms_until_next_frame>0) diff = term->compositor->ms_until_next_frame;
-			gf_term_step_clocks_intern(term, diff, GF_TRUE);
+			if (compositor->ms_until_next_frame>0) diff = compositor->ms_until_next_frame;
+			gf_sc_step_clocks_intern(compositor, diff, GF_TRUE);
 		}
 		return;
 	}
 
 	/* nothing to change*/
-	if (term->play_state == PlayState) return;
-	term->play_state = PlayState;
+	if (compositor->play_state == PlayState) return;
+	compositor->play_state = PlayState;
 
-	if (term->root_scene->first_frame_pause_type && (PlayState == GF_STATE_PLAYING))
-		term->root_scene->first_frame_pause_type = 0;
+	if (compositor->root_scene->first_frame_pause_type && (PlayState == GF_STATE_PLAYING))
+		compositor->root_scene->first_frame_pause_type = 0;
 
 	if (!pause_clocks) return;
 
 	if (PlayState != GF_STATE_PLAYING) {
-		mediacontrol_pause(term->root_scene->root_od);
+		mediacontrol_pause(compositor->root_scene->root_od);
 	} else {
-		mediacontrol_resume(term->root_scene->root_od, resume_live);
+		mediacontrol_resume(compositor->root_scene->root_od, resume_live);
 	}
 
 }
 
-static void gf_term_connect_from_time_ex(GF_Terminal * term, const char *URL, u64 startTime, u32 pause_at_first_frame, Bool secondary_scene, const char *parent_path)
+
+GF_EXPORT
+void gf_sc_connect_from_time_ex(GF_Compositor *compositor, const char *URL, u64 startTime, u32 pause_at_first_frame, Bool secondary_scene, const char *parent_path)
 {
 	GF_Scene *scene;
 	GF_ObjectManager *odm;
-	const char *main_url;
 	if (!URL || !strlen(URL)) return;
 
-	if (term->root_scene) {
-		if (term->root_scene->root_od && term->root_scene->root_od->net_service) {
-			main_url = term->root_scene->root_od->net_service->url;
+	if (compositor->root_scene) {
+		if (compositor->root_scene->root_od && compositor->root_scene->root_od->scene_ns) {
+			const char *main_url = compositor->root_scene->root_od->scene_ns->url;
 			if (main_url && !strcmp(main_url, URL)) {
-				gf_term_play_from_time(term, 0, pause_at_first_frame);
+				gf_sc_play_from_time(compositor, 0, pause_at_first_frame);
 				return;
 			}
 		}
 		/*disconnect*/
-		gf_term_disconnect(term);
+		gf_sc_disconnect(compositor);
 	}
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Connecting to %s\n", URL));
 
-	gf_term_lock_net(term, 1);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Creating new root scene\n", URL));
+	assert(!compositor->root_scene);
+
 	/*create a new scene*/
-	scene = gf_scene_new(NULL);
-	gf_sg_set_script_action(scene->graph, term_script_action, term);
+	scene = gf_scene_new(compositor, NULL);
 	odm = gf_odm_new();
-
-	scene->root_od =  odm;
-	term->root_scene = scene;
-	odm->parentscene = NULL;
+	scene->root_od = odm;
 	odm->subscene = scene;
-	odm->term = term;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] root scene created\n", URL));
-	gf_term_lock_net(term, 0);
+	//by default all scenes are dynamic, until we get a BIFS attached
+	scene->is_dynamic_scene = GF_TRUE;
 
 	odm->media_start_time = startTime;
+
+	// we are not in compositor:process at this point of time since the terminal thread drives the compositor
+	compositor->root_scene = scene;
+
 	/*render first visual frame and pause*/
 	if (pause_at_first_frame) {
-		gf_term_set_play_state(term, GF_STATE_STEP_PAUSE, 0, 0);
+		gf_term_set_play_state(compositor, GF_STATE_STEP_PAUSE, 0, 0);
 		scene->first_frame_pause_type = pause_at_first_frame;
 	}
 
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] root scene created\n", URL));
+
 	if (!strnicmp(URL, "views://", 8)) {
-		odm->OD = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
-		gf_scene_generate_views(term->root_scene, (char *) URL+8, (char*)parent_path);
+		gf_scene_generate_views(compositor->root_scene, (char *) URL+8, (char*)parent_path);
 		return;
 	}
 	else if (!strnicmp(URL, "mosaic://", 9)) {
-		odm->OD = (GF_ObjectDescriptor *)gf_odf_desc_new(GF_ODF_OD_TAG);
-		gf_scene_generate_mosaic(term->root_scene, (char *) URL+9, (char*)parent_path);
+		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);
+}
+
 
-	/*connect - we don't have any parentID */
-	gf_term_connect_object(term, odm, (char *) URL, (char*)parent_path);
+GF_EXPORT
+Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime)
+{
+	return gf_fs_mime_supported(term->fsess, mime);
 }
 
-void gf_term_refresh_cache(GF_Config *cfg)
+//todo: move this to compositor ?
+static void gf_term_refresh_cache()
 {
 	u32 i, count;
-	count = gf_cfg_get_section_count(cfg);
+	count = gf_opts_get_section_count();
 	for (i=0; i<count; i++) {
 		const char *opt;
 		u32 sec, frac, exp;
 		Bool force_delete;
 		const char *file;
-		const char *name = gf_cfg_get_section_name(cfg, i);
+		const char *name = gf_opts_get_section_name(i);
 		if (strncmp(name, "@cache=", 7)) continue;
 
-		file = gf_cfg_get_key(cfg, name, "cacheFile");
-		opt = gf_cfg_get_key(cfg, name, "expireAfterNTP");
+		file = gf_opts_get_key(name, "cacheFile");
+		opt = gf_opts_get_key(name, "expireAfterNTP");
 		if (!opt) {
-			if (file) gf_delete_file((char*) file);
-			gf_cfg_del_section(cfg, name);
+			if (file) gf_file_delete((char*) file);
+			gf_opts_del_section(name);
 			i--;
 			count--;
 			continue;
@@ -623,9 +289,9 @@
 		if (exp && (exp<sec)) force_delete=1;
 
 		if (force_delete) {
-			if (file) gf_delete_file((char*) opt);
+			if (file) gf_file_delete((char*) opt);
 
-			gf_cfg_del_section(cfg, name);
+			gf_opts_del_section(name);
 			i--;
 			count--;
 			continue;
@@ -633,29 +299,15 @@
 	}
 }
 
-Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime)
-{
-	if (mime) {
-		/* TODO: handle codecs and params */
-		const char *sPlug = gf_cfg_get_key(term->user->config, "MimeTypes", mime);
-		if (sPlug) {
-			return 1;
-		} else {
-			return 0;
-		}
-	} else {
-		return 0;
-	}
-}
-
 GF_EXPORT
 GF_Terminal *gf_term_new(GF_User *user)
 {
-	u32 i;
 	GF_Terminal *tmp;
-	const char *cf;
-
-	if (!check_user(user)) return NULL;
+	GF_Filter *comp_filter;
+	u32 def_w, def_h;
+	GF_Err e;
+	const char *opt;
+	char szArgs[200];
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Creating terminal\n"));
 
@@ -666,147 +318,65 @@
 	}
 	memset(tmp, 0, sizeof(GF_Terminal));
 
-	/*just for safety*/
-	gf_sys_init(GF_MemTrackerNone);
+	/*just for safety in case not done before*/
+	gf_sys_init(GF_MemTrackerNone, NULL);
 
 	tmp->user = user;
 
-	if (user->init_flags & GF_TERM_NO_DECODER_THREAD) {
-		if (user->init_flags & GF_TERM_NO_VISUAL_THREAD) {
-			user->init_flags |= GF_TERM_NO_COMPOSITOR_THREAD;
-			user->init_flags &= ~GF_TERM_NO_VISUAL_THREAD;
-		}
+	//for now we store the init_flags in the global config (used by compositor and AV output modules)
+	//cleaning this would need futher API rework and getting rid of the GF_User strcuture
+	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);
+	if (!tmp->fsess) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to create filter session.\n"));
+		gf_free(tmp);
+		return NULL;
 	}
 
-	/*this is not changeable at runtime*/
-	if (user->init_flags & GF_TERM_NO_DECODER_THREAD)
-		tmp->flags |= GF_TERM_NO_DECODER_THREAD;
+	gf_fs_set_ui_callback(tmp->fsess, user->EventProc, user->opaque);
 
-	if (user->init_flags & GF_TERM_NO_COMPOSITOR_THREAD) {
-		tmp->flags |= GF_TERM_NO_COMPOSITOR_THREAD;
-	} else if (user->init_flags & GF_TERM_NO_VISUAL_THREAD) {
-		tmp->flags |= GF_TERM_NO_VISUAL_THREAD;
+	opt = gf_opts_get_key("Temp", "DefaultWidth");
+	def_w = opt ? atoi(opt) : 0;
+	opt = gf_opts_get_key("Temp", "DefaultHeight");
+	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);
 	} else {
-		cf = gf_cfg_get_key(user->config, "Systems", "NoVisualThread");
-		if (!cf || !stricmp(cf, "no")) {
-			tmp->flags &= ~GF_TERM_NO_VISUAL_THREAD;
-		} else {
-			tmp->flags |= GF_TERM_NO_VISUAL_THREAD;
-		}
+		strcpy(szArgs, "compositor:FID=compose:player=base");
 	}
 
-	/*setup scene compositor*/
-	tmp->compositor = gf_sc_new(user, !(tmp->flags & (GF_TERM_NO_VISUAL_THREAD|GF_TERM_NO_COMPOSITOR_THREAD)) , tmp);
+	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 create Compositor.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[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"));
-	gf_sc_set_fps(tmp->compositor, 30.0);
-	tmp->frame_duration = (u32) (1000/30);
 
-	tmp->downloader = gf_dm_new(user->config);
+#ifdef FILTER_FIXME
 	gf_dm_set_auth_callback(tmp->downloader, gf_term_get_user_pass, tmp);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] downloader loaded\n"));
-
-	tmp->net_services = gf_list_new();
-	tmp->net_services_to_remove = gf_list_new();
-	tmp->connection_tasks = gf_list_new();
-	tmp->channels_pending = gf_list_new();
-	tmp->media_queue = gf_list_new();
-	tmp->media_queue_mx = gf_mx_new("MediaQueue");
-	tmp->net_mx = gf_mx_new("GlobalNetwork");
-	tmp->input_streams = gf_list_new();
-	tmp->x3d_sensors = gf_list_new();
-
-	/*mode is changed when reloading cfg*/
-	gf_term_init_scheduler(tmp, GF_TERM_THREAD_FREE);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Terminal created - loading config\n"));
-	gf_term_reload_cfg(tmp);
-
-#ifndef GPAC_DISABLE_SVG
-	cf = gf_cfg_get_key(user->config, "General", "EnvironmentFile");
-	if (cf) {
-		GF_Err e = gf_sg_new_from_xml_doc(cf, &tmp->dcci_doc);
-		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Error %s while loading file %s - user environment disabled\n", gf_error_to_string(e), cf));
-		} else {
-			gf_sg_set_script_action(tmp->dcci_doc, term_script_action, tmp);
-		}
-	}
-#endif
-
-	/*load extensions*/
-	tmp->extensions = gf_list_new();
-	for (i=0; i< gf_modules_get_count(user->modules); i++) {
-		GF_TermExt *ifce = (GF_TermExt *) gf_modules_load_interface(user->modules, i, GF_TERM_EXT_INTERFACE);
-		if (ifce) gf_list_add(tmp->extensions, ifce);
-	}
-
-	tmp->unthreaded_extensions = gf_list_new();
-	tmp->evt_mx = gf_mx_new("Event Filter");
-
-	for (i=0; i< gf_list_count(tmp->extensions); i++) {
-		GF_TermExt *ifce = gf_list_get(tmp->extensions, i);
-		if (!ifce->process(ifce, GF_TERM_EXT_START, tmp)) {
-			gf_modules_close_interface((GF_BaseInterface *) ifce);
-			gf_list_rem(tmp->extensions, i);
-			i--;
-			continue;
-		}
-
-		if (ifce->caps & GF_TERM_EXTENSION_NOT_THREADED)
-			gf_list_add(tmp->unthreaded_extensions, ifce);
-	}
-
-	gf_mx_p(tmp->mm_mx);
-	if (!gf_list_count(tmp->unthreaded_extensions)) {
-		gf_list_del(tmp->unthreaded_extensions);
-		tmp->unthreaded_extensions = NULL;
-	}
-	gf_mx_v(tmp->mm_mx);
-
-	if (0 == gf_cfg_get_key_count(user->config, "MimeTypes")) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Initializing Mime Types..."));
-		/* No mime-types detected, probably the first launch */
-		for (i=0; i< gf_modules_get_count(user->modules); i++) {
-			GF_BaseInterface *ifce = gf_modules_load_interface(user->modules, i, GF_NET_CLIENT_INTERFACE);
-			if (ifce) {
-				GF_InputService * service = (GF_InputService*) ifce;
-				GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Asking mime types supported for new module %s...\n", ifce->module_name));
-				if (service->RegisterMimeTypes) {
-					u32 num = service->RegisterMimeTypes(service);
-					GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] module %s has registered %u new mime-types.\n", ifce->module_name, num));
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] Module %s has not declared any RegisterMimeTypes method, cannot guess its supported mime-types.\n", ifce->module_name));
-				}
-				gf_modules_close_interface(ifce);
-			}
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Finished Initializing Mime Types."));
-	}
 
 	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);
-	tmp->speed_ratio = FIX_ONE;
+#endif
+
+	gf_term_refresh_cache();
+	gf_fs_run(tmp->fsess);
 
-	gf_term_refresh_cache(user->config);
-	cf = gf_cfg_get_key(user->config, "General", "GUIFile");
-	if (cf) {
-		gf_term_connect_from_time_ex(tmp, cf, 0, 0, 1, NULL);
-	}
 	return tmp;
 }
 
 GF_EXPORT
 GF_Err gf_term_del(GF_Terminal * term)
 {
-	GF_Err e;
-	u32 timeout, i;
-
 	if (!term) return GF_BAD_PARAM;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] Destroying terminal\n"));
@@ -814,196 +384,68 @@
 	gf_term_disconnect(term);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] main service disconnected\n"));
 
-	/*signal we are being destroyed*/
-	term->reload_state = 3;
-
-	/*wait for destroy*/
-	e = GF_IO_ERR;
-	timeout = 1000;
-	while (term->root_scene || gf_list_count(term->net_services) || gf_list_count(term->net_services_to_remove)) {
-		gf_sleep(10);
-		/*this shouldn't be needed but unfortunately there's a bug hanging around there...*/
-		timeout--;
-		if (!timeout) break;
-	}
-	if (timeout) {
-		assert(!gf_list_count(term->net_services));
-		assert(!gf_list_count(term->net_services_to_remove));
-		e = GF_OK;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Terminal] All network services deleted\n"));
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Couldn not unload all services in 10 seconds, will leak ...\n"));
-	}
-
-	/*unload extensions*/
-	for (i=0; i< gf_list_count(term->extensions); i++) {
-		GF_TermExt *ifce = gf_list_get(term->extensions, i);
-		ifce->process(ifce, GF_TERM_EXT_STOP, NULL);
-	}
-
+	term->in_destroy = GF_TRUE;
 	/*stop the media manager */
-	gf_term_stop_scheduler(term);
-
-	/*remove all event filters*/
-	gf_list_reset(term->event_filters);
-
-	/*unload extensions*/
-	for (i=0; i< gf_list_count(term->extensions); i++) {
-		GF_TermExt *ifce = gf_list_get(term->extensions, i);
-		gf_modules_close_interface((GF_BaseInterface *) ifce);
-	}
-	gf_list_del(term->extensions);
-	if (term->unthreaded_extensions) gf_list_del(term->unthreaded_extensions);
-
-	while (term->in_event_filter) gf_sleep(1);
-	gf_mx_p(term->evt_mx);
-	if (term->event_filters) {
-		gf_list_del(term->event_filters);
-		term->event_filters = NULL;
-	}
-	gf_mx_v(term->evt_mx);
-	gf_mx_del(term->evt_mx);
-
-	/*delete compositor before the input sensor stacks to avoid receiving events from the compositor
-	when destroying these stacks*/
-	gf_sc_del(term->compositor);
-
-	gf_list_del(term->net_services);
-	gf_list_del(term->net_services_to_remove);
-	gf_list_del(term->connection_tasks);
-	gf_list_del(term->input_streams);
-	gf_list_del(term->x3d_sensors);
-	assert(!gf_list_count(term->channels_pending));
-	gf_list_del(term->channels_pending);
-	assert(!gf_list_count(term->media_queue));
-	assert(!term->nodes_pending);
-	gf_list_del(term->media_queue);
-	if (term->downloader) gf_dm_del(term->downloader);
-
-	gf_mx_del(term->media_queue_mx);
-
-	if (term->locales.szAbsRelocatedPath) gf_free(term->locales.szAbsRelocatedPath);
-	gf_list_del(term->uri_relocators);
-
-
-	if (term->dcci_doc) {
-#ifndef GPAC_DISABLE_SCENE_DUMP
-		if (term->dcci_doc->modified) {
-			char *pref_file = (char *)gf_cfg_get_key(term->user->config, "General", "EnvironmentFile");
-			GF_SceneDumper *dumper = gf_sm_dumper_new(term->dcci_doc, pref_file, GF_FALSE, ' ', GF_SM_DUMP_AUTO_XML);
-			if (!dumper) return GF_IO_ERR;
-			e = gf_sm_dump_graph(dumper, 1, 0);
-			gf_sm_dumper_del(dumper);
-		}
-#endif
-		gf_sg_del(term->dcci_doc);
-	}
-	gf_mx_del(term->net_mx);
+	gf_fs_del(term->fsess);
 
 	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"));
-	return e;
+	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_term_step_clocks(GF_Terminal * term, u32 ms_diff)
-{
-	return gf_term_step_clocks_intern(term, ms_diff, GF_FALSE);
-
-}
-GF_EXPORT
 void gf_term_connect_from_time(GF_Terminal * term, const char *URL, u64 startTime, u32 pause_at_first_frame)
 {
-	gf_term_connect_from_time_ex(term, URL, startTime, pause_at_first_frame, 0, NULL);
+	if (!term) return;
+	gf_sc_connect_from_time_ex(term->compositor, URL, startTime, pause_at_first_frame, 0, NULL);
 }
 
 GF_EXPORT
 void gf_term_connect(GF_Terminal * term, const char *URL)
 {
-	gf_term_connect_from_time_ex(term, URL, 0, 0, 0, NULL);
+	if (!term) return;
+	gf_sc_connect_from_time_ex(term->compositor, URL, 0, 0, 0, NULL);
 }
 
+
 GF_EXPORT
 void gf_term_connect_with_path(GF_Terminal * term, const char *URL, const char *parent_path)
 {
-	gf_term_connect_from_time_ex(term, URL, 0, 0, 0, parent_path);
+	if (!term) return;
+	gf_sc_connect_from_time_ex(term->compositor, URL, 0, 0, 0, parent_path);
 }
 
 GF_EXPORT
-void gf_term_disconnect(GF_Terminal *term)
+void gf_sc_disconnect(GF_Compositor *compositor)
 {
-	Bool handle_services;
-	if (!term || !term->root_scene) return;
-
-	if (term->nb_calls_in_event_proc) {
-		if (!term->disconnect_request_status)
-			term->disconnect_request_status = 1;
-
-		return;
-	}
-
 	/*resume*/
-	if (term->play_state != GF_STATE_PLAYING) gf_term_set_play_state(term, GF_STATE_PLAYING, 1, 1);
+	if (compositor->play_state != GF_STATE_PLAYING) gf_term_set_play_state(compositor, GF_STATE_PLAYING, 1, 1);
 
-	if (term->root_scene->root_od) {
-
-		gf_term_lock_media_queue(term, 1);
-
-		term->root_scene->root_od->action_type = GF_ODM_ACTION_DELETE;
-		if (gf_list_find(term->media_queue, term->root_scene->root_od)<0)
-			gf_list_add(term->media_queue, term->root_scene->root_od);
-
-		gf_term_lock_media_queue(term, 0);
-	} else {
-		gf_scene_del(term->root_scene);
-		term->root_scene = NULL;
-	}
-	handle_services = 0;
-	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD)
-		handle_services = 1;
-	/*if an unthreaded term extension decides to disconnect the scene (validator does so), we must flush services now
-	because we are called from gf_term_handle_services*/
-	if (term->thread_id_handling_services == gf_th_id())
-		handle_services = 1;
-
-	while (term->root_scene || gf_list_count(term->net_services_to_remove) || gf_list_count(term->connection_tasks)  || gf_list_count(term->media_queue) ) {
-		if (handle_services) {
-			gf_term_handle_services(term);
-		}
-		gf_sleep(10);
+	if (compositor->root_scene && compositor->root_scene->root_od) {
+		GF_ObjectManager *root = compositor->root_scene->root_od;
+		gf_sc_lock(compositor, GF_TRUE);
+		compositor->root_scene = NULL;
+		gf_odm_disconnect(root, 2);
+		gf_sc_lock(compositor, GF_FALSE);
 	}
 }
 
 GF_EXPORT
-const char *gf_term_get_url(GF_Terminal *term)
+void gf_term_disconnect(GF_Terminal *term)
 {
-	if (!term || !term->root_scene || !term->root_scene->root_od || !term->root_scene->root_od->net_service) return NULL;
-	return term->root_scene->root_od->net_service->url;
+	if (term) gf_sc_disconnect(term->compositor);
 }
 
-static GF_Err gf_term_set_cache_state(GF_Terminal *term, u32 state)
+GF_EXPORT
+const char *gf_term_get_url(GF_Terminal *term)
 {
-	GF_Err e;
-	if (!term) return GF_BAD_PARAM;
-	if (term->enable_cache && (state==GF_MEDIA_CACHE_ENABLED)) return GF_OK;
-	if (!term->enable_cache && (state!=GF_MEDIA_CACHE_ENABLED)) return GF_OK;
-
-	term->enable_cache = !term->enable_cache;
-	/*not connected, nothing to do*/
-	if (!term->root_scene) return GF_OK;
-	gf_term_lock_net(term, 1);
-	if (term->enable_cache) {
-		/*otherwise start cache*/
-		e = gf_term_service_cache_load(term->root_scene->root_od->net_service);
-	} else {
-		e = gf_term_service_cache_close(term->root_scene->root_od->net_service, (state==GF_MEDIA_CACHE_DISCARD) ? 1 : 0);
-	}
-	gf_term_lock_net(term, 0);
-	return e;
+	GF_Compositor *compositor = term ? term->compositor : NULL;
+	if (!compositor || !compositor->root_scene || !compositor->root_scene->root_od || !compositor->root_scene->root_od->scene_ns) return NULL;
+	return compositor->root_scene->root_od->scene_ns->url;
 }
 
-
 /*set rendering option*/
 GF_EXPORT
 GF_Err gf_term_set_option(GF_Terminal * term, u32 type, u32 value)
@@ -1011,122 +453,80 @@
 	if (!term) return GF_BAD_PARAM;
 	switch (type) {
 	case GF_OPT_PLAY_STATE:
-		gf_term_set_play_state(term, value, 0, 1);
-		return GF_OK;
-	case GF_OPT_RELOAD_CONFIG:
-		gf_term_reload_cfg(term);
-		/*reload compositor config*/
-		gf_sc_set_option(term->compositor, GF_OPT_RELOAD_CONFIG, 1);
-		return GF_OK;
-	case GF_OPT_MEDIA_CACHE:
-		gf_term_set_cache_state(term, value);
+		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);
 		return GF_OK;
-	case GF_OPT_VIDEO_BENCH:
-		term->bench_mode = value;
-		return gf_sc_set_option(term->compositor, type, value);
-	case GF_OPT_MULTIVIEW_MODE:
-		term->compositor->multiview_mode = value;
-		return gf_sc_set_option(term->compositor, type, value);
-
+#endif
 	default:
 		return gf_sc_set_option(term->compositor, type, value);
 	}
 }
 
 GF_EXPORT
-GF_Err gf_term_set_simulation_frame_rate(GF_Terminal * term, Double frame_rate)
-{
-	if (!term) return GF_BAD_PARAM;
-	term->frame_duration = (u32) (1000.0 / frame_rate);
-	gf_sc_set_fps(term->compositor, frame_rate);
-	return GF_OK;
-}
-
-GF_EXPORT
 Double gf_term_get_simulation_frame_rate(GF_Terminal *term, u32 *nb_frames_drawn)
 {
+	Double fps;
 	if (!term) return 0.0;
 	if (nb_frames_drawn) *nb_frames_drawn = term->compositor->frame_number;
-	return term->compositor->frame_rate;
+	fps = term->compositor->fps.num;
+	fps /= term->compositor->fps.den;
+	return fps;
 }
 
 
 
-u32 gf_term_check_end_of_scene(GF_Terminal *term, Bool skip_interactions)
-{
-	if (!term->root_scene || !term->root_scene->root_od || !term->root_scene->root_od->net_service) return 1;
-	if (!skip_interactions) {
-		/*if input sensors consider the scene runs forever*/
-		if (gf_list_count(term->input_streams)) return 0;
-		if (gf_list_count(term->x3d_sensors)) return 0;
-	}
-	/*check no clocks are still running*/
-	if (!gf_scene_check_clocks(term->root_scene->root_od->net_service, term->root_scene, 0)) return 0;
-	if (term->root_scene->is_dynamic_scene) return 1;
-
-	/*ask compositor if there are sensors*/
-	return gf_sc_get_option(term->compositor, skip_interactions ? GF_OPT_IS_OVER : GF_OPT_IS_FINISHED);
-}
-
 /*get rendering option*/
-GF_EXPORT
-u32 gf_term_get_option(GF_Terminal * term, u32 type)
+static
+u32 gf_sc_term_get_option(GF_Compositor *compositor, u32 type)
 {
-	if (!term) return 0;
+	if (!compositor) return 0;
 	switch (type) {
 	case GF_OPT_HAS_JAVASCRIPT:
 		return gf_sg_has_scripting();
 	case GF_OPT_IS_FINISHED:
-		return gf_term_check_end_of_scene(term, 0);
+		return gf_sc_check_end_of_scene(compositor, 0);
 	case GF_OPT_IS_OVER:
-		return gf_term_check_end_of_scene(term, 1);
+		return gf_sc_check_end_of_scene(compositor, 1);
 	case GF_OPT_MAIN_ADDON:
-		return term->root_scene ? term->root_scene->main_addon_selected : 0;
+		return compositor->root_scene ? compositor->root_scene->main_addon_selected : 0;
 
 	case GF_OPT_PLAY_STATE:
-		if (term->compositor->step_mode) return GF_STATE_STEP_PAUSE;
-		if (term->root_scene) {
-			GF_Clock *ck = term->root_scene->dyn_ck;
-			if (!ck) {
-				if (!term->root_scene->scene_codec) return GF_STATE_PAUSED;
-				ck = term->root_scene->scene_codec->ck;
-				if (!ck) return GF_STATE_PAUSED;
-			}
+		if (compositor->step_mode) return GF_STATE_STEP_PAUSE;
+		if (compositor->root_scene) {
+			GF_Clock *ck = compositor->root_scene->root_od->ck;
+			if (!ck) return GF_STATE_PAUSED;
+
 //			if (ck->Buffering) return GF_STATE_PLAYING;
 		}
-		if (term->play_state != GF_STATE_PLAYING) return GF_STATE_PAUSED;
+		if (compositor->play_state != GF_STATE_PLAYING) return GF_STATE_PAUSED;
 		return GF_STATE_PLAYING;
-	case GF_OPT_MEDIA_CACHE:
-		if (!term->enable_cache) return GF_MEDIA_CACHE_DISABLED;
-		else if (term->root_scene && term->root_scene->root_od->net_service->cache) return GF_MEDIA_CACHE_RUNNING;
-		else return GF_MEDIA_CACHE_ENABLED;
 	case GF_OPT_CAN_SELECT_STREAMS:
-		return (term->root_scene && term->root_scene->is_dynamic_scene) ? 1 : 0;
+		return (compositor->root_scene && compositor->root_scene->is_dynamic_scene) ? 1 : 0;
 	case GF_OPT_HTTP_MAX_RATE:
-		return gf_dm_get_data_rate(term->downloader);
+#if FILTER_FIXME
+		return gf_dm_get_data_rate(compositor->downloader);
+#else
+		return 0;
+#endif
 	case GF_OPT_VIDEO_BENCH:
-		return term->bench_mode ? GF_TRUE : GF_FALSE;
+		return compositor->bench_mode ? GF_TRUE : GF_FALSE;
 	case GF_OPT_ORIENTATION_SENSORS_ACTIVE:
-		return term->orientation_sensors_active;
+		return compositor->orientation_sensors_active;
 	default:
-		return gf_sc_get_option(term->compositor, type);
+		return gf_sc_get_option(compositor, type);
 	}
 }
 
-static void gf_term_cleanup_pending_session(GF_Terminal *term, GF_ClientService *ns)
+/*get rendering option*/
+GF_EXPORT
+u32 gf_term_get_option(GF_Terminal * term, u32 type)
 {
-	if (gf_list_find(term->net_services, ns)<0) return;
-
-	if (ns && ns->pending_service_session) {
-		gf_dm_sess_del(ns->pending_service_session);
-		ns->pending_service_session = NULL;
-	}
+	return term ? gf_sc_term_get_option(term->compositor, type) : 0;
 }
 
-
 GF_EXPORT
 GF_Err gf_term_set_size(GF_Terminal * term, u32 NewWidth, u32 NewHeight)
 {
@@ -1141,380 +541,8 @@
 } GF_TermConnectObject;
 
 
-void gf_term_handle_services(GF_Terminal *term)
-{
-	GF_ClientService *ns;
-
-
-	if (term->disconnect_request_status == 1) {
-		term->disconnect_request_status = 2;
-		term->thread_id_handling_services = gf_th_id();
-		gf_term_disconnect(term);
-		return;
-	}
-
-
-	/*we could run into a deadlock if some thread has requested opening of a URL. If we cannot
-	grab the media queue now, we'll do our management at the next cycle*/
-	if (!gf_mx_try_lock(term->media_queue_mx))
-		return;
-
-	term->thread_id_handling_services = gf_th_id();
-
-	/*play ODs that need it*/
-	while (gf_list_count(term->media_queue)) {
-		Bool destroy = 0;
-		u32 act_type;
-		GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(term->media_queue, 0);
-		gf_list_rem(term->media_queue, 0);
-		/*unlock media queue before sending play/pause*/
-		gf_term_lock_media_queue(term, 0);
-
-		act_type = odm->action_type;
-		odm->action_type = GF_ODM_ACTION_PLAY;
-		switch (act_type) {
-		case GF_ODM_ACTION_STOP:
-			if (odm->mo /*&& odm->codec && odm->codec->CB  && (odm->codec->CB->Capacity==1)*/)
-			{
-				if (odm->addon) odm->flags |= GF_ODM_REGENERATE_SCENE;
-
-				else if (odm->mo->OD_ID==GF_MEDIA_EXTERNAL_ID) destroy = 1;
-				else if (odm->OD && (odm->OD->objectDescriptorID==GF_MEDIA_EXTERNAL_ID)) destroy = 1;
-			}
-			if (destroy) {
-				gf_odm_disconnect(odm, 2);
-			} else {
-				gf_odm_stop(odm, 0);
-			}
-			break;
-		case GF_ODM_ACTION_PLAY:
-			gf_odm_play(odm);
-			break;
-		case GF_ODM_ACTION_DELETE:
-			gf_odm_disconnect(odm, 2);
-			break;
-		case GF_ODM_ACTION_SCENE_DISCONNECT:
-			assert(odm->subscene);
-			gf_odm_stop(odm, 1);
-			gf_scene_disconnect(odm->subscene, 1);
-			break;
-		case GF_ODM_ACTION_SCENE_RECONNECT:
-			assert(odm->subscene);
-			gf_scene_disconnect(odm->subscene, 0);
-			break;
-		case GF_ODM_ACTION_SCENE_INLINE_RESTART:
-#ifndef GPAC_DISABLE_VRML
-			gf_scene_mpeg4_inline_restart(odm->subscene);
-#endif
-			break;
-		case GF_ODM_ACTION_SETUP:
-			gf_odm_setup_task(odm);
-			break;
-		}
-
-		/*relock before sending play/pause*/
-		gf_term_lock_media_queue(term, 1);
-	}
-
-	/*finally process all connection tasks - we MUST do that after processing ODM tasks, as an ODM might have just destroyed
-	a service we could query during the connection step*/
-	while (gf_list_count(term->connection_tasks)) {
-		GF_TermConnectObject *connect = gf_list_get(term->connection_tasks, 0);
-		gf_list_rem(term->connection_tasks, 0);
-
-		/*unlock media queue before sending connect*/
-		gf_term_lock_media_queue(term, 0);
-
-//		gf_mx_p(term->net_mx);
-
-		/*if object has already been attached to its service (eg, task was posted but media_add occured inbetween), ignore*/
-		if (!connect->odm->net_service && !(connect->odm->flags & GF_ODM_DESTROYED) ) {
-			gf_term_connect_object(term, connect->odm, connect->service_url, connect->parent_url);
-		} else if (connect->odm->OD && connect->odm->OD->RedirectOnly) {
-			gf_term_connect_object(term, connect->odm, connect->service_url, connect->parent_url);
-		}
-
-//		gf_mx_v(term->net_mx);
-
-		gf_free(connect->service_url);
-		if (connect->parent_url) gf_free(connect->parent_url);
-		gf_free(connect);
-
-		/*relock media queue after sending connect*/
-		gf_term_lock_media_queue(term, 1);
-	}
+#ifdef FILTER_FIXME
 
-	gf_term_lock_media_queue(term, 0);
-
-	/*lock to avoid any start attemps from compositor*/
-	if (gf_mx_try_lock(term->compositor->mx)) {
-		while (gf_list_count(term->net_services_to_remove)) {
-			gf_mx_p(term->net_mx);
-			ns = (GF_ClientService*)gf_list_get(term->net_services_to_remove, 0);
-			if (ns) gf_list_rem(term->net_services_to_remove, 0);
-			gf_mx_v(term->net_mx);
-			if (!ns) break;
-			gf_term_service_del(ns);
-		}
-
-		if (term->nodes_pending) {
-			u32 i, count, n_count;
-			i=0;
-			count = gf_list_count(term->nodes_pending);
-			while (i<count) {
-				GF_Node *n = (GF_Node *)gf_list_get(term->nodes_pending, i);
-				gf_node_traverse(n, NULL);
-				if (!term->nodes_pending) break;
-				n_count = gf_list_count(term->nodes_pending);
-				if (n_count==count) i++;
-				else count=n_count;
-			}
-		}
-		gf_sc_lock(term->compositor, 0);
-	}
-
-	/*extensions*/
-	gf_mx_p(term->mm_mx);
-	if (!term->reload_state && term->unthreaded_extensions) {
-		u32 i, count;
-		count = gf_list_count(term->unthreaded_extensions);
-		for (i=0; i<count; i++) {
-			GF_TermExt *ifce = gf_list_get(term->unthreaded_extensions, i);
-			ifce->process(ifce, GF_TERM_EXT_PROCESS, NULL);
-		}
-	}
-	gf_mx_v(term->mm_mx);
-
-
-	/*need to reload*/
-	if (term->reload_state == 1) {
-		term->reload_state = 0;
-		gf_term_disconnect(term);
-		term->reload_state = 2;
-	}
-	if (term->reload_state == 2) {
-		if (! gf_list_count(term->net_services)) {
-			term->reload_state = 0;
-			if (term->reload_url) {
-				gf_term_connect(term, term->reload_url);
-				gf_free(term->reload_url);
-			}
-			term->reload_url = NULL;
-		}
-	}
-	term->thread_id_handling_services = 0;
-}
-
-void gf_term_queue_node_traverse(GF_Terminal *term, GF_Node *node)
-{
-	gf_sc_lock(term->compositor, 1);
-	if (!term->nodes_pending) term->nodes_pending = gf_list_new();
-	gf_list_add(term->nodes_pending, node);
-	gf_sc_lock(term->compositor, 0);
-}
-void gf_term_unqueue_node_traverse(GF_Terminal *term, GF_Node *node)
-{
-	gf_sc_lock(term->compositor, 1);
-	if (term->nodes_pending) {
-		gf_list_del_item(term->nodes_pending, node);
-		if (!gf_list_count(term->nodes_pending)) {
-			gf_list_del(term->nodes_pending);
-			term->nodes_pending = NULL;
-		}
-	}
-	gf_sc_lock(term->compositor, 0);
-}
-
-void gf_term_check_connections_for_delete(GF_Terminal *term, GF_ObjectManager *odm)
-{
-	GF_TermConnectObject *ct;
-	u32 i = 0;
-	while (NULL != (ct = (gf_list_enum(term->connection_tasks, &i)))) {
-		if (ct->odm == odm) {
-			i--;
-			gf_list_rem(term->connection_tasks, i);
-			if (ct->parent_url) gf_free(ct->parent_url);
-			gf_free(ct->service_url);
-			gf_free(ct);
-		}
-	}
-}
-
-void gf_term_close_service(GF_Terminal *term, GF_ClientService *ns)
-{
-	GF_Err e;
-
-	/*prevent the media manager / term to access the list of services to destroy, otherwise
-	we could unload the module while poping its CloseService() call stack which can lead to
-	random crashes (return addresses no longer valid) - cf any "stress mode" playback of a playlist*/
-	gf_term_lock_media_queue(term, 1);
-
-#if 0
-	{
-		GF_ObjectManager *odm;
-		u32 i = 0;
-		while (odm = gf_list_enum(term->media_queue, &i)) {
-			assert(odm->net_service != ns);
-		}
-	}
-
-	{
-		GF_TermConnectObject *ct;
-		u32 i = 0;
-		while (ct = gf_list_enum(term->connection_tasks, &i)) {
-			assert(ct->odm->net_service != ns);
-		}
-	}
-#endif
-
-	ns->owner = NULL;
-	e = ns->ifce->CloseService(ns->ifce);
-
-	/*if error don't wait for ACK to remove from main list*/
-	if (e) {
-		gf_list_del_item(term->net_services, ns);
-		if (gf_list_find(term->net_services_to_remove, ns)<0)
-			gf_list_add(term->net_services_to_remove, ns);
-	}
-	gf_term_lock_media_queue(term, 0);
-}
-
-GF_EXPORT
-void gf_term_lock_compositor(GF_Terminal *term, Bool LockIt)
-{
-	gf_sc_lock(term->compositor, LockIt);
-}
-
-/*locks media quaue*/
-GF_EXPORT
-void gf_term_lock_media_queue(GF_Terminal *term, Bool LockIt)
-{
-	if (LockIt) {
-		gf_mx_p(term->media_queue_mx);
-	} else {
-		gf_mx_v(term->media_queue_mx);
-	}
-}
-
-void gf_term_lock_net(GF_Terminal *term, Bool LockIt)
-{
-	if (LockIt) {
-		gf_mx_p(term->net_mx);
-	} else {
-		gf_mx_v(term->net_mx);
-	}
-}
-
-#ifndef GPAC_DISABLE_SVG
-void media_event_collect_info(GF_ClientService *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer)
-{
-	u32 i=0;
-	GF_Channel *ch;
-
-	while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
-		u32 val;
-		if (ch->service != net) continue;
-
-		if (ch->BufferOn)
-			media_event->bufferValid = GF_TRUE;
-
-		if (ch->BufferTime>0) {
-			if (ch->MaxBuffer) {
-				val = (ch->BufferTime * 100) / ch->MaxBuffer;
-				if (*min_buffer > val) *min_buffer = val;
-			} else {
-				if (*min_buffer > 100) *min_buffer = 100;
-			}
-			if (*min_time > (u32) ch->BufferTime)
-				*min_time = ch->BufferTime;
-		} else {
-			*min_time = 0;
-			*min_buffer = 0;
-		}
-	}
-}
-#endif
-
-void gf_term_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec)
-{
-#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->net_service) return;
-	if (odm->mo) {
-		count = gf_mo_event_target_count(odm->mo);
-
-		//for dynamic scenes, check if we have listeners on the root object of the scene containing this media
-		if (odm->parentscene
-		        && odm->parentscene->is_dynamic_scene
-		        && odm->parentscene->root_od->mo
-		        && (odm->parentscene->root_od->net_service==odm->net_service)
-		   ) {
-			odm = odm->parentscene->root_od;
-			count = gf_mo_event_target_count(odm->mo);
-		}
-		if (!count) return;
-
-		if (0 && !(gf_node_get_dom_event_filter((GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0))) & GF_DOM_EVENT_MEDIA))
-			return;
-	} else {
-		count = 0;
-	}
-
-
-	memset(&evt, 0, sizeof(GF_DOM_Event));
-
-	evt.media_event.bufferValid = GF_FALSE;
-	evt.media_event.session_name = odm->net_service->url;
-
-	min_time = min_buffer = (u32) -1;
-	scene = odm->subscene ? odm->subscene : odm->parentscene;
-	if (!scene) return;
-	
-	/*get buffering on root OD*/
-	media_event_collect_info(odm->net_service, scene->root_od, &evt.media_event, &min_time, &min_buffer);
-	gf_mx_p(scene->mx_resources);
-	/*get buffering on all ODs*/
-	i=0;
-	while ((an_od = (GF_ObjectManager*)gf_list_enum(scene->resources, &i))) {
-		if (odm->net_service == an_od->net_service)
-			media_event_collect_info(odm->net_service, an_od, &evt.media_event, &min_time, &min_buffer);
-	}
-	gf_mx_v(scene->mx_resources);
-
-	if (min_buffer != (u32) -1)
-		evt.media_event.level = min_buffer;
-	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;
-
-	evt.type = event_type;
-	evt.bubbles = 0;	/*the spec says yes but we force it to NO*/
-
-	//these events may be triggered from any input or decoding threads. Sync processing cannot be
-	//achieved in most cases, because we may run into deadlocks, especially if the event
-	//was triggered by a service opened by JS
-	for (i=0; i<count; i++) {
-		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(odm->mo->evt_targets, i);
-		if (target)
-			gf_sc_queue_dom_event_on_target(scene->root_od->term->compositor, &evt, target, scene->graph);
-	}
-	if (!count) {
-		GF_Node *root = gf_sg_get_root_node(scene->graph);
-		if (root) gf_sc_queue_dom_event(scene->root_od->term->compositor, root, &evt);
-	}
-#endif
-}
-
-void gf_term_service_media_event(GF_ObjectManager *odm, GF_EventType event_type)
-{
-	gf_term_service_media_event_with_download(odm, event_type, 0, 0, 0);
-}
 
 /* Browses all registered relocators (ZIP-based, ISOFF-based or file-system-based to relocate a URI based on the locale */
 GF_EXPORT
@@ -1531,206 +559,16 @@
 	}
 	return 0;
 }
-
-/*in most cases we cannot directly connect an object, as the request may come from a different thread than the one handling
-ODM disconnection. We could therefore end up attaching an object to a service currently being destroyed because of a concurrent
-odm_disconnect*/
-void gf_term_post_connect_object(GF_Terminal *term, GF_ObjectManager *odm, char *serviceURL, char *parent_url)
-{
-	GF_TermConnectObject *connect;
-	GF_SAFEALLOC(connect, GF_TermConnectObject);
-	if (!connect) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate media connection task\n"));
-		return;
-	}
-	connect->odm = odm;
-	connect->service_url = gf_strdup(serviceURL);
-	connect->parent_url = parent_url ? gf_strdup(parent_url) : NULL;
-
-	gf_term_lock_media_queue(term, 1);
-	gf_list_add(term->connection_tasks, connect);
-	gf_term_lock_media_queue(term, 0);
-}
-
-/*connects given OD manager to its URL*/
-static void gf_term_connect_object(GF_Terminal *term, GF_ObjectManager *odm, char *serviceURL, char *parent_url)
-{
-	GF_ClientService *ns;
-	u32 i, count;
-	GF_Err e;
-	Bool reloc_result, net_locked;
-	char relocated_url[GF_MAX_PATH], localized_url[GF_MAX_PATH];
-
-	/*try to relocate the url*/
-	reloc_result = gf_term_relocate_url(term, serviceURL, parent_url, relocated_url, localized_url);
-	if (reloc_result) serviceURL = (char *) relocated_url;
-
-	/*check cache*/
-	if (parent_url) {
-		count = gf_cfg_get_section_count(term->user->config);
-		for (i=0; i<count; i++) {
-			u32 exp, sec, frac;
-			const char *opt, *service_cache;
-			const char *name = gf_cfg_get_section_name(term->user->config, i);
-			if (strncmp(name, "@cache=", 7)) continue;
-			opt = gf_cfg_get_key(term->user->config, name, "serviceURL");
-			if (!opt || stricmp(opt, parent_url)) continue;
-			opt = gf_cfg_get_key(term->user->config, name, "cacheName");
-			if (!opt || stricmp(opt, serviceURL)) continue;
-
-			service_cache = (char*)gf_cfg_get_key(term->user->config, name, "cacheFile");
-			opt = gf_cfg_get_key(term->user->config, name, "expireAfterNTP");
-			if (opt) {
-				sscanf(opt, "%u", &exp);
-				gf_net_get_ntp(&sec, &frac);
-				if (exp && (exp<sec)) {
-					opt = gf_cfg_get_key(term->user->config, name, "cacheFile");
-					if (opt) gf_delete_file((char*) opt);
-					gf_cfg_del_section(term->user->config, name);
-					i--;
-					count--;
-					service_cache = NULL;
-				}
-			}
-			if (service_cache) serviceURL = (char *)service_cache;
-			break;
-		}
-	}
-
-	/*for remoteODs/dynamic ODs, check if one of the running service cannot be used
-	net mutex may be locked at this time (if another service sends a connect OK)*/
-	net_locked = gf_mx_try_lock(term->net_mx);
-	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
-		/*we shall not have a service scheduled for destruction here*/
-		if (ns->owner && ( (ns->owner->flags & GF_ODM_DESTROYED) || (ns->owner->action_type == GF_ODM_ACTION_DELETE)) )
-			continue;
-
-		/*if service has timeline locked to its parent scene, only reuse it if new object does as well*/
-		if (ns->owner && ns->owner->flags & GF_ODM_INHERIT_TIMELINE) {
-			if (!(odm->flags & GF_ODM_INHERIT_TIMELINE)) continue;
-		}
-
-		if (gf_term_service_can_handle_url(ns, serviceURL)) {
-			if (net_locked) {
-				gf_term_lock_net(term, 0);
-			}
-
-			/*wait for service to setup - service may become destroyed if not available*/
-			while (1) {
-				net_locked = gf_mx_try_lock(term->net_mx);
-				if (!ns->owner) {
-					if (net_locked) {
-						gf_term_lock_net(term, 0);
-					}
-					return;
-				}
-				if (net_locked) {
-					gf_term_lock_net(term, 0);
-				}
-
-				if (ns->owner->OD) break;
-				gf_sleep(5);
-			}
-
-			gf_mx_p(term->net_mx);
-			if (odm->net_service) {
-				gf_mx_v(term->net_mx);
-				return;
-			}
-			if (odm->flags & GF_ODM_DESTROYED) {
-				gf_mx_v(term->net_mx);
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] Object has been scheduled for destruction - ignoring object setup\n", odm->OD->objectDescriptorID));
-				return;
-			}
-			odm->net_service = ns;
-			odm->net_service->nb_odm_users ++;
-			gf_odm_setup_entry_point(odm, serviceURL);
-			gf_mx_v(term->net_mx);
-			return;
-		}
-	}
-	if (net_locked)
-		gf_term_lock_net(term, 0);
-
-	if (odm->net_service) {
-		assert(odm->net_service->owner != odm);
-		assert(odm->OD);
-		assert(odm->OD->URLString);
-		assert(odm->net_service->nb_odm_users);
-		odm->net_service->nb_odm_users--;
-	}
-	odm->net_service = gf_term_service_new(term, odm, serviceURL, (odm->addon || reloc_result) ? NULL : parent_url, &e);
-	if (!odm->net_service) {
-		gf_term_message(term, serviceURL, "Cannot open service", e);
-		gf_odm_disconnect(odm, 1);
-		return;
-	}
-	odm->net_service->nb_odm_users++;
-
-	assert(odm->net_service->owner == odm);
-
-	/*OK connect*/
-	gf_term_service_media_event(odm, GF_EVENT_MEDIA_SETUP_BEGIN);
-	odm->net_service->ifce->ConnectService(odm->net_service->ifce, odm->net_service, odm->net_service->url);
-
-	/*remove pending download session if any*/
-	gf_term_cleanup_pending_session(term, ns);
-}
-
-GF_ClientService *gf_term_get_service_from_url(GF_Terminal *term, const char *url)
-{
-	u32 i = 0;
-	GF_ClientService *ns;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
-		if (!strcmp(ns->url, url)) {
-			return ns;
-		}
-	}
-	return NULL;
-}
-
-/*connects given channel to its URL if needed*/
-GF_Err gf_term_connect_remote_channel(GF_Terminal *term, GF_Channel *ch, char *URL)
-{
-	GF_Err e;
-	u32 i;
-	GF_ClientService *ns;
-
-	gf_term_lock_net(term, 1);
-
-	/*if service is handled by current service don't create new one*/
-	if (gf_term_service_can_handle_url(ch->service, URL)) {
-		gf_term_lock_net(term, 0);
-		return GF_OK;
-	}
-	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
-		if (gf_term_service_can_handle_url(ns, URL)) {
-			ch->service = ns;
-			gf_term_lock_net(term, 0);
-			return GF_OK;
-		}
-	}
-	/*use parent OD for parent service*/
-	ns = gf_term_service_new(term, NULL, URL, ch->odm->net_service->url, &e);
-	if (!ns) return e;
-	ch->service = ns;
-	ns->ifce->ConnectService(ns->ifce, ns, ns->url);
-
-	gf_term_cleanup_pending_session(term, ns);
-	gf_term_lock_net(term, 0);
-	return GF_OK;
-}
+#endif
 
 GF_EXPORT
-u32 gf_term_play_from_time(GF_Terminal *term, u64 from_time, u32 pause_at_first_frame)
+u32 gf_sc_play_from_time(GF_Compositor *compositor, u64 from_time, u32 pause_at_first_frame)
 {
-	if (!term || !term->root_scene || !term->root_scene->root_od) return 0;
-	if (term->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL) return 1;
+	if (!compositor || !compositor->root_scene || !compositor->root_scene->root_od) return 0;
+	if (compositor->root_scene->root_od->flags & GF_ODM_NO_TIME_CTRL) return 1;
 
 	if (pause_at_first_frame==2) {
-		if (gf_term_get_option(term, GF_OPT_PLAY_STATE) != GF_STATE_PLAYING)
+		if (gf_sc_term_get_option(compositor, GF_OPT_PLAY_STATE) != GF_STATE_PLAYING)
 			pause_at_first_frame = 1;
 		else
 			pause_at_first_frame = 0;
@@ -1738,41 +576,45 @@
 
 	/*for dynamic scene OD ressources 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 (term->root_scene->is_dynamic_scene) {
+	if (compositor->root_scene->is_dynamic_scene) {
 
 		/*exit pause mode*/
-		gf_term_set_play_state(term, GF_STATE_PLAYING, 1, 1);
+		gf_term_set_play_state(compositor, GF_STATE_PLAYING, 1, 1);
 
 		if (pause_at_first_frame)
-			gf_term_set_play_state(term, GF_STATE_STEP_PAUSE, 0, 0);
+			gf_term_set_play_state(compositor, GF_STATE_STEP_PAUSE, 0, 0);
 
-		gf_sc_lock(term->compositor, 1);
-		gf_scene_restart_dynamic(term->root_scene, from_time, 0, 0);
-		gf_sc_lock(term->compositor, 0);
+		gf_sc_lock(compositor, 1);
+		gf_scene_restart_dynamic(compositor->root_scene, from_time, 0, 0);
+		gf_sc_lock(compositor, 0);
 		return 2;
 	}
 
 	/*pause everything*/
-	gf_term_set_play_state(term, GF_STATE_PAUSED, 0, 1);
+	gf_term_set_play_state(compositor, GF_STATE_PAUSED, 0, 1);
 	/*stop root*/
-	gf_odm_stop(term->root_scene->root_od, 1);
-	gf_scene_disconnect(term->root_scene, 0);
-	/*make sure we don't have OD queued*/
-	while (gf_list_count(term->media_queue)) gf_list_rem(term->media_queue, 0);
-	term->root_scene->root_od->media_start_time = from_time;
-
-	gf_odm_start(term->root_scene->root_od, 0);
-	gf_term_set_play_state(term, GF_STATE_PLAYING, 0, 1);
+	gf_odm_stop(compositor->root_scene->root_od, 1);
+	gf_scene_disconnect(compositor->root_scene, 0);
+
+	compositor->root_scene->root_od->media_start_time = from_time;
+
+	gf_odm_start(compositor->root_scene->root_od);
+	gf_term_set_play_state(compositor, GF_STATE_PLAYING, 0, 1);
 	if (pause_at_first_frame)
-		gf_sc_set_option(term->compositor, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
+		gf_sc_set_option(compositor, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
 	return 2;
 }
 
+GF_EXPORT
+u32 gf_term_play_from_time(GF_Terminal *term, u64 from_time, u32 pause_at_first_frame)
+{
+	return term ? gf_sc_play_from_time(term->compositor, from_time, pause_at_first_frame) : 0;
+}
 
 GF_EXPORT
 Bool gf_term_user_event(GF_Terminal * term, GF_Event *evt)
 {
-	if (term) return gf_sc_user_event(term->compositor, evt);
+	if (term && !term->in_destroy) return gf_sc_user_event(term->compositor, evt);
 	return GF_FALSE;
 }
 
@@ -1789,10 +631,9 @@
 u32 gf_term_get_time_in_ms(GF_Terminal *term)
 {
 	GF_Clock *ck;
-	if (!term || !term->root_scene) return 0;
-	ck = NULL;
-	if (term->root_scene->scene_codec && term->root_scene->scene_codec->ck) ck = term->root_scene->scene_codec->ck;
-	else if (term->root_scene->dyn_ck) ck = term->root_scene->dyn_ck;
+	GF_Compositor *compositor = term ? term->compositor : NULL;
+	if (!term || !compositor->root_scene) return 0;
+	ck = compositor->root_scene->root_od->ck;
 	if (!ck) return 0;
 	return gf_clock_media_time(ck);
 }
@@ -1800,31 +641,32 @@
 GF_EXPORT
 u32 gf_term_get_elapsed_time_in_ms(GF_Terminal *term)
 {
-	GF_Clock *ck;
-	if (!term || !term->root_scene) return 0;
-	ck = NULL;
-	if (term->root_scene->scene_codec && term->root_scene->scene_codec->ck) ck = term->root_scene->scene_codec->ck;
-	else if (term->root_scene->dyn_ck) ck = term->root_scene->dyn_ck;
-	if (!ck) return 0;
-
-	return gf_clock_elapsed_time(ck);
-}
+	u32 i, count;
+	GF_Compositor *compositor = term ? term->compositor : NULL;
+	if (!term || !compositor->root_scene) return 0;
 
-GF_Node *gf_term_pick_node(GF_Terminal *term, s32 X, s32 Y)
-{
-	if (!term || !term->compositor) return NULL;
-	return gf_sc_pick_node(term->compositor, X, Y);
+	count = gf_list_count(compositor->root_scene->namespaces);
+	for (i=0; i<count; i++) {
+		GF_SceneNamespace *sns = gf_list_get(compositor->root_scene->namespaces, i);
+		GF_Clock *ck = gf_list_get(sns->clocks, 0);
+		if (ck) return gf_clock_elapsed_time(ck);
+	}
+	return 0;
 }
 
 GF_EXPORT
 void gf_term_navigate_to(GF_Terminal *term, const char *toURL)
 {
-	if (!toURL && !term->root_scene) return;
+	GF_Compositor *compositor = term ? term->compositor : NULL;
+	if (!term) return;
+	if (!toURL && !term->compositor->root_scene) return;
+
 	if (term->reload_url) gf_free(term->reload_url);
 	term->reload_url = NULL;
+
 	if (toURL) {
-		if (term->root_scene && term->root_scene->root_od && term->root_scene->root_od->net_service)
-			term->reload_url = gf_url_concatenate(term->root_scene->root_od->net_service->url, toURL);
+		if (compositor->root_scene && compositor->root_scene->root_od && compositor->root_scene->root_od->scene_ns)
+			term->reload_url = gf_url_concatenate(compositor->root_scene->root_od->scene_ns->url, toURL);
 		if (!term->reload_url) term->reload_url = gf_strdup(toURL);
 	}
 	term->reload_state = 1;
@@ -1845,27 +687,26 @@
 GF_EXPORT
 GF_Err gf_term_add_object(GF_Terminal *term, const char *url, Bool auto_play)
 {
-	GF_MediaObject *mo;
+	GF_MediaObject *mo=NULL;
+	//this needs refinement
 	SFURL sfurl;
 	MFURL mfurl;
-	if (!url || !term || !term->root_scene || !term->root_scene->is_dynamic_scene) return GF_BAD_PARAM;
+	if (!url || !term || !term->compositor->root_scene || !term->compositor->root_scene->is_dynamic_scene) return GF_BAD_PARAM;
 
 	sfurl.OD_ID = GF_MEDIA_EXTERNAL_ID;
 	sfurl.url = (char *) url;
 	mfurl.count = 1;
 	mfurl.vals = &sfurl;
 	/*only text tracks are supported for now...*/
-	mo = gf_scene_get_media_object(term->root_scene, &mfurl, GF_MEDIA_OBJECT_TEXT, 1);
+	mo = gf_scene_get_media_object(term->compositor->root_scene, &mfurl, GF_MEDIA_OBJECT_TEXT, 1);
 	if (mo) {
 		/*check if we must deactivate it*/
 		if (mo->odm) {
 			if (mo->num_open && !auto_play) {
-				gf_scene_select_object(term->root_scene, mo->odm);
-			} else {
-				mo->odm->OD_PL = auto_play ? 1 : 0;
+				gf_scene_select_object(term->compositor->root_scene, mo->odm);
 			}
 		} else {
-			gf_list_del_item(term->root_scene->scene_objects, mo);
+			gf_list_del_item(term->compositor->root_scene->scene_objects, mo);
 			gf_sg_vrml_mf_reset(&mo->URLs, GF_SG_VRML_MFURL);
 			gf_free(mo);
 			mo = NULL;
@@ -1876,58 +717,12 @@
 
 
 GF_EXPORT
-void gf_term_attach_service(GF_Terminal *term, GF_InputService *service_hdl)
-{
-	Bool net_check_interface(GF_InputService *ifce);
-	GF_Scene *scene;
-	GF_ObjectManager *odm;
-	GF_ClientService *ns;
-	if (!net_check_interface(service_hdl)) return;
-
-	if (term->root_scene) gf_term_disconnect(term);
-
-	gf_term_lock_net(term, 1);
-
-	/*create a new scene*/
-	scene = gf_scene_new(NULL);
-	odm = gf_odm_new();
-	gf_sg_set_script_action(scene->graph, term_script_action, term);
-
-	scene->root_od = odm;
-	term->root_scene = scene;
-	odm->parentscene = NULL;
-	odm->subscene = scene;
-	odm->term = term;
-
-	GF_SAFEALLOC(odm->net_service , GF_ClientService);
-	if (!odm->net_service) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[Terminal] Failed to allocate network service\n"));
-		gf_term_lock_net(term, 0);
-		return;
-	}
-	odm->net_service->term = term;
-	odm->net_service->owner = odm;
-	odm->net_service->ifce = service_hdl;
-	odm->net_service->url = gf_strdup("Internal Service Handler");
-	odm->net_service->Clocks = gf_list_new();
-	gf_list_add(term->net_services, odm->net_service);
-
-	gf_term_lock_net(term, 0);
-
-	ns = odm->net_service;
-	/*OK connect*/
-	odm->net_service->ifce->ConnectService(odm->net_service->ifce, odm->net_service, odm->net_service->url);
-
-	gf_term_cleanup_pending_session(term, ns);
-}
-
-GF_EXPORT
 GF_Err gf_term_scene_update(GF_Terminal *term, char *type, char *com)
 {
 #ifndef GPAC_DISABLE_SMGR
+	GF_Compositor *compositor = term ? term->compositor : NULL;
 	GF_Err e;
 	GF_StreamContext *sc;
-	GF_ESD *esd;
 	Bool is_xml = 0;
 	Double time = 0;
 	u32 i, tag;
@@ -1936,18 +731,19 @@
 	if (!term || !com) return GF_BAD_PARAM;
 
 	if (type && (!stricmp(type, "application/ecmascript") || !stricmp(type, "js")) )  {
-		return gf_scene_execute_script(term->root_scene->graph, com);
+		return gf_scene_execute_script(compositor->root_scene->graph, com);
 	}
 
-	if (!type && com && !strncmp(com, "gpac ", 5)) {
+	if (!type && !strncmp(com, "gpac ", 5)) {
+#ifdef FILTER_FIXME
 		com += 5;
 		//new add-on
-		if (term->root_scene && !strncmp(com, "add ", 4)) {
+		if (compositor->root_scene && !strncmp(com, "add ", 4)) {
 			GF_AssociatedContentLocation addon_info;
 			memset(&addon_info, 0, sizeof(GF_AssociatedContentLocation));
 			addon_info.external_URL = com + 4;
 			addon_info.timeline_id = -100;
-			gf_scene_register_associated_media(term->root_scene, &addon_info);
+			gf_scene_register_associated_media(compositor->root_scene, &addon_info);
 			return GF_OK;
 		}
 		//new splicing add-on
@@ -1993,7 +789,6 @@
 			addon_info.timeline_id = -100;
 			addon_info.splice_start_time = start;
 			addon_info.splice_end_time = end;
-			addon_info.splice_end_time = end;
 			addon_info.splice_time_pts = is_pts;
 			gf_scene_register_associated_media(term->root_scene, &addon_info);
 			return GF_OK;
@@ -2004,76 +799,95 @@
 			gf_term_select_object(term, gf_list_get(term->root_scene->resources, idx));
 			return GF_OK;
 		}
+#endif
 		return GF_OK;
 	}
 
 	memset(&load, 0, sizeof(GF_SceneLoader));
-	load.localPath = gf_cfg_get_key(term->user->config, "General", "CacheDirectory");
+	load.localPath = gf_opts_get_key("core", "cache");
 	load.flags = GF_SM_LOAD_FOR_PLAYBACK | GF_SM_LOAD_CONTEXT_READY;
 	load.type = GF_SM_LOAD_BT;
 
-	if (!term->root_scene) {
-		gf_term_lock_net(term, 1);
+	if (!compositor->root_scene) {
+
 		/*create a new scene*/
-		term->root_scene = gf_scene_new(NULL);
-		gf_sg_set_script_action(term->root_scene->graph, term_script_action, term);
-		term->root_scene->root_od = gf_odm_new();
-		term->root_scene->root_od->parentscene = NULL;
-		term->root_scene->root_od->subscene = term->root_scene;
-		term->root_scene->root_od->term = term;
-		gf_term_lock_net(term, 0);
-		load.ctx = gf_sm_new(term->root_scene->graph);
-	} else if (term->root_scene->root_od->OD) {
-		load.ctx = gf_sm_new(term->root_scene->graph);
-		/*restore streams*/
-		i=0;
-		while ((esd = (GF_ESD*)gf_list_enum(term->root_scene->root_od->OD->ESDescriptors, &i)) ) {
-			switch (esd->decoderConfig->streamType) {
+		compositor->root_scene = gf_scene_new(compositor, NULL);
+		compositor->root_scene->root_od = gf_odm_new();
+		compositor->root_scene->root_od->parentscene = NULL;
+		compositor->root_scene->root_od->subscene = compositor->root_scene;
+
+		load.ctx = gf_sm_new(compositor->root_scene->graph);
+	} else if (compositor->root_scene->root_od) {
+		u32 nb_ch = 0;
+		load.ctx = gf_sm_new(compositor->root_scene->graph);
+
+		if (compositor->root_scene->root_od->pid) nb_ch++;
+		if (compositor->root_scene->root_od->extra_pids) nb_ch += gf_list_count(compositor->root_scene->root_od->extra_pids);
+		for (i=0; i<nb_ch; i++) {
+			u32 stream_type, es_id, oti;
+			const GF_PropertyValue *p;
+			GF_FilterPid *pid = compositor->root_scene->root_od->pid;
+			if (i) {
+				GF_ODMExtraPid *xpid = gf_list_get(compositor->root_scene->root_od->extra_pids, i-1);
+				pid = xpid->pid;
+			}
+			p = gf_filter_pid_get_property(pid, GF_PROP_PID_STREAM_TYPE);
+			if (!p) continue;
+			stream_type = p->value.uint;
+			switch (stream_type) {
 			case GF_STREAM_OD:
 			case GF_STREAM_SCENE:
 			case GF_STREAM_PRIVATE_SCENE:
-				sc = gf_sm_stream_new(load.ctx, esd->ESID, esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
-				if (esd->decoderConfig->streamType==GF_STREAM_PRIVATE_SCENE) sc->streamType = GF_STREAM_SCENE;
-				sc->timeScale = esd->slConfig->timestampResolution;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_ESID);
+				if (!p)
+					p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+				es_id = p ? p->value.uint : 0;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_CODECID);
+				oti = p ? p->value.uint : 1;
+
+				sc = gf_sm_stream_new(load.ctx, es_id, stream_type, oti);
+				if (stream_type==GF_STREAM_PRIVATE_SCENE) sc->streamType = GF_STREAM_SCENE;
+				p = gf_filter_pid_get_property(pid, GF_PROP_PID_TIMESCALE);
+				sc->timeScale = p ? p->value.uint : 1000;
 				break;
 			}
 		}
 	} else {
 		return GF_BAD_PARAM;
 	}
-	load.ctx->max_node_id = gf_sg_get_max_node_id(term->root_scene->graph);
+	load.ctx->max_node_id = gf_sg_get_max_node_id(compositor->root_scene->graph);
 
 	i=0;
 	while ((com[i] == ' ') || (com[i] == '\r') || (com[i] == '\n') || (com[i] == '\t')) i++;
 	if (com[i]=='<') is_xml = 1;
 
 	load.type = is_xml ? GF_SM_LOAD_XMTA : GF_SM_LOAD_BT;
-	time = gf_scene_get_time(term->root_scene);
+	time = gf_scene_get_time(compositor->root_scene);
 
 
 	if (type && (!stricmp(type, "application/x-laser+xml") || !stricmp(type, "laser"))) {
 		load.type = GF_SM_LOAD_XSR;
-		time = gf_scene_get_time(term->root_scene);
+		time = gf_scene_get_time(compositor->root_scene);
 	}
 	else if (type && (!stricmp(type, "image/svg+xml") || !stricmp(type, "svg")) ) {
 		load.type = GF_SM_LOAD_XSR;
-		time = gf_scene_get_time(term->root_scene);
+		time = gf_scene_get_time(compositor->root_scene);
 	}
 	else if (type && (!stricmp(type, "model/x3d+xml") || !stricmp(type, "x3d")) ) load.type = GF_SM_LOAD_X3D;
 	else if (type && (!stricmp(type, "model/x3d+vrml") || !stricmp(type, "x3dv")) ) load.type = GF_SM_LOAD_X3DV;
 	else if (type && (!stricmp(type, "model/vrml") || !stricmp(type, "vrml")) ) load.type = GF_SM_LOAD_VRML;
 	else if (type && (!stricmp(type, "application/x-xmt") || !stricmp(type, "xmt")) ) load.type = GF_SM_LOAD_XMTA;
 	else if (type && (!stricmp(type, "application/x-bt") || !stricmp(type, "bt")) ) load.type = GF_SM_LOAD_BT;
-	else if (gf_sg_get_root_node(term->root_scene->graph)) {
-		tag = gf_node_get_tag(gf_sg_get_root_node(term->root_scene->graph));
+	else if (gf_sg_get_root_node(compositor->root_scene->graph)) {
+		tag = gf_node_get_tag(gf_sg_get_root_node(compositor->root_scene->graph));
 		if (tag >= GF_NODE_RANGE_FIRST_SVG) {
 			load.type = GF_SM_LOAD_XSR;
-			time = gf_scene_get_time(term->root_scene);
+			time = gf_scene_get_time(compositor->root_scene);
 		} else if (tag>=GF_NODE_RANGE_FIRST_X3D) {
 			load.type = is_xml ? GF_SM_LOAD_X3D : GF_SM_LOAD_X3DV;
 		} else {
 			load.type = is_xml ? GF_SM_LOAD_XMTA : GF_SM_LOAD_BT;
-			time = gf_scene_get_time(term->root_scene);
+			time = gf_scene_get_time(compositor->root_scene);
 		}
 	}
 
@@ -2088,18 +902,18 @@
 			au_count = gf_list_count(sc->AUs);
 			for (j=0; j<au_count; j++) {
 				GF_AUContext *au = (GF_AUContext *)gf_list_get(sc->AUs, j);
-				e = gf_sg_command_apply_list(term->root_scene->graph, au->commands, time);
+				e = gf_sg_command_apply_list(compositor->root_scene->graph, au->commands, time);
 				if (e) break;
 			}
 		}
 	}
-	if (!term->root_scene->graph_attached) {
+	if (!compositor->root_scene->graph_attached) {
 		if (!load.ctx->scene_width || !load.ctx->scene_height) {
 //			load.ctx->scene_width = term->compositor->width;
 //			load.ctx->scene_height = term->compositor->height;
 		}
-		gf_sg_set_scene_size_info(term->root_scene->graph, load.ctx->scene_width, load.ctx->scene_height, load.ctx->is_pixel_metrics);
-		gf_scene_attach_to_compositor(term->root_scene);
+		gf_sg_set_scene_size_info(compositor->root_scene->graph, load.ctx->scene_width, load.ctx->scene_height, load.ctx->is_pixel_metrics);
+		gf_scene_attach_to_compositor(compositor->root_scene);
 	}
 	gf_sm_del(load.ctx);
 	return e;
@@ -2116,7 +930,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_term_get_offscreen_buffer(GF_Terminal *term, GF_VideoSurface *framebuffer, u32 view_idx, u32 depth_buffer_type)
+GF_Err gf_term_get_offscreen_buffer(GF_Terminal *term, GF_VideoSurface *framebuffer, u32 view_idx, GF_CompositorGrabMode depth_buffer_type)
 {
 	if (!term) return GF_BAD_PARAM;
 	return gf_sc_get_offscreen_buffer(term->compositor, framebuffer, view_idx, depth_buffer_type);
@@ -2149,73 +963,6 @@
 	return gf_sc_paste_text(term->compositor, txt);
 }
 
-GF_EXPORT
-Bool gf_term_forward_event(GF_Terminal *term, GF_Event *evt, Bool consumed, Bool forward_only)
-{
-	if (!term) return GF_FALSE;
-
-	if (term->event_filters) {
-		GF_TermEventFilter *ef;
-		u32 i=0;
-
-		gf_mx_p(term->evt_mx);
-		term->in_event_filter ++;
-		gf_mx_v(term->evt_mx);
-		while ((ef=gf_list_enum(term->event_filters, &i))) {
-			if (ef->on_event(ef->udta, evt, consumed)) {
-				term->in_event_filter --;
-				return GF_TRUE;
-			}
-		}
-		term->in_event_filter --;
-	}
-
-	if (!forward_only && !consumed && term->user->EventProc) {
-		Bool res;
-		term->nb_calls_in_event_proc++;
-		res = term->user->EventProc(term->user->opaque, evt);
-		term->nb_calls_in_event_proc--;
-		return res;
-	}
-
-	return GF_FALSE;
-}
-
-GF_EXPORT
-GF_Err gf_term_add_event_filter(GF_Terminal *terminal, GF_TermEventFilter *ef)
-{
-	GF_Err e;
-	if (!terminal || !ef || !ef->on_event) return GF_BAD_PARAM;
-	while (terminal->in_event_filter) gf_sleep(1);
-	gf_mx_p(terminal->evt_mx);
-	if (!terminal->event_filters) terminal->event_filters = gf_list_new();
-	e = gf_list_add(terminal->event_filters, ef);
-	gf_mx_v(terminal->evt_mx);
-	return e;
-}
-
-GF_EXPORT
-GF_Err gf_term_remove_event_filter(GF_Terminal *terminal, GF_TermEventFilter *ef)
-{
-	if (!terminal || !ef || !terminal->event_filters) return GF_BAD_PARAM;
-
-	while (terminal->in_event_filter) gf_sleep(1);
-	gf_mx_p(terminal->evt_mx);
-	gf_list_del_item(terminal->event_filters, ef);
-	if (!gf_list_count(terminal->event_filters)) {
-		gf_list_del(terminal->event_filters);
-		terminal->event_filters=NULL;
-	}
-	gf_mx_v(terminal->evt_mx);
-	return GF_OK;
-}
-
-
-GF_EXPORT
-Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt)
-{
-	return gf_term_forward_event(term, evt, 0, 0);
-}
 
 enum
 {
@@ -2242,14 +989,15 @@
 	GF_ACTION_QUALITY_DOWN,
 };
 
-static void set_clocks_speed(GF_Terminal *term, Fixed ratio)
+#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_ClientService *ns;
+	GF_SceneNamespace *ns;
 
 	/*pause all clocks on all services*/
 	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+	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)) ) {
@@ -2258,22 +1006,23 @@
 		}
 	}
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_term_set_speed(GF_Terminal *term, Fixed speed)
 {
-	Double fps;
+	GF_Fraction fps;
 	u32 i, j;
-	const char *opt;
-	GF_ClientService *ns;
+	GF_SceneNamespace *ns;
 	Bool restart = 0;
 	u32 scene_time = gf_term_get_time_in_ms(term);
 
-	if (!speed) return GF_BAD_PARAM;
+	if (!term || !speed) return GF_BAD_PARAM;
 
 	if (speed<0) {
 		i=0;
-		while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+		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));
@@ -2282,16 +1031,17 @@
 			if (e != GF_OK) {
 				return e;
 			}
+#endif
 		}
 	}
 
 	/*adjust all clocks on all services, if possible*/
 	i=0;
-	while ( (ns = (GF_ClientService*)gf_list_enum(term->net_services, &i)) ) {
+	while ( (ns = (GF_SceneNamespace*)gf_list_enum(term->compositor->root_scene->namespaces, &i)) ) {
 		GF_Clock *ck;
 		ns->set_speed = speed;
 		j=0;
-		while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &j)) ) {
+		while (ns->clocks && (ck = (GF_Clock *)gf_list_enum(ns->clocks, &j)) ) {
 			//we will have to reissue a PLAY command since playback direction changed
 			if ( gf_mulfix(ck->speed,speed) < 0)
 				restart = 1;
@@ -2312,30 +1062,23 @@
 	}
 
 	if (restart) {
-		if (term->root_scene->is_dynamic_scene) {
-			gf_scene_restart_dynamic(term->root_scene, scene_time, 0, 0);
-		} else {
+		if (term->compositor->root_scene->is_dynamic_scene) {
+			gf_scene_restart_dynamic(term->compositor->root_scene, scene_time, 0, 0);
 		}
 	}
 
 	if (speed<0)
 		speed = -speed;
 
-	opt = gf_cfg_get_key(term->user->config, "Systems", "TimeSlice");
-	if (!opt) opt="30";
-	i = (u32) ( atoi(opt) / FIX2FLT(speed) );
-	if (!i) i = 1;
-	term->frame_duration = i;
-
-	opt = gf_cfg_get_key(term->user->config, "Compositor", "FrameRate");
-	fps = atoi(opt);
-	fps *= FIX2FLT(speed);
-	if (fps>100) fps = 1000;
+	fps = term->compositor->fps;
+	fps.num = fps.num * (u32) (1000 * FIX2FLT(speed));
+	fps.den *= 1000;
+	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
 void gf_term_process_shortcut(GF_Terminal *term, GF_Event *ev)
 {
@@ -2482,14 +1225,15 @@
 	u32 i, k, count;
 
 	memset(term->shortcuts, 0, sizeof(GF_Shortcut)*MAX_SHORTCUTS);
-	count = gf_cfg_get_key_count(term->user->config, "Shortcuts");
+	count = gf_opts_get_key_count("Shortcuts");
 	k = 0;
 	for (i=0; i<count; i++) {
-		char *name = (char*)gf_cfg_get_key_name(term->user->config, "Shortcuts", i);
-		char *val = (char*)gf_cfg_get_key(term->user->config, "Shortcuts", name);
+		char *name = (char*)gf_opts_get_key_name("Shortcuts", i);
+		char *val = (char*)gf_opts_get_key("Shortcuts", name);
 		if (!name || !val) continue;
 
 		strncpy(szVal, val, 50);
+		szVal[50] = 0;
 		strlwr(szVal);
 		val = szVal;
 
@@ -2538,68 +1282,470 @@
 		if (k==MAX_SHORTCUTS) break;
 	}
 }
+#endif
+
+
+GF_EXPORT
+void gf_term_switch_quality(GF_Terminal *term, Bool up)
+{
+	if (term)
+		gf_scene_switch_quality(term->compositor->root_scene, up);
+}
+
+GF_EXPORT
+GF_Err gf_term_get_visual_output_size(GF_Terminal *term, u32 *width, u32 *height)
+{
+	if (!term) return GF_BAD_PARAM;
+	if (width) *width = term->compositor->display_width;
+	if (height) *height = term->compositor->display_height;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_term_process_step(GF_Terminal *term)
+{
+
+	term->compositor->frame_was_produced = GF_FALSE;
+	/*need to reload*/
+	if (term->reload_state == 1) {
+		term->reload_state = 0;
+		gf_term_disconnect(term);
+		term->reload_state = 2;
+	}
+	if (term->reload_state == 2) {
+		if (!term->compositor->root_scene) {
+			term->reload_state = 0;
+			if (term->reload_url) {
+				gf_term_connect(term, term->reload_url);
+				gf_free(term->reload_url);
+			}
+			term->reload_url = NULL;
+		}
+	}
+
+	gf_fs_run_step(term->fsess);
+	return term->compositor->frame_was_produced;
+}
 
-void gf_scene_switch_quality(GF_Scene *scene, Bool up)
+static Bool check_in_scene(GF_Scene *scene, GF_ObjectManager *odm)
 {
 	u32 i;
-	GF_ClientService *root_service = NULL;
-	GF_ObjectManager *odm;
-	GF_CodecCapability caps;
-	GF_NetworkCommand net_cmd;
-
-	if (!scene) return;
-
-	/*send network command*/
-	memset(&net_cmd, 0, sizeof(GF_NetworkCommand));
-	net_cmd.command_type = GF_NET_SERVICE_QUALITY_SWITCH;
-	net_cmd.switch_quality.on_channel = NULL;
-	net_cmd.switch_quality.up = up;
-	if (scene->root_od->net_service) {
-		root_service = scene->root_od->net_service;
-		root_service->ifce->ServiceCommand(root_service->ifce, &net_cmd);
+	GF_ObjectManager *ptr, *root;
+	if (!scene) return 0;
+	root = scene->root_od;
+	if (odm == root) return 1;
+	scene = root->subscene;
+
+	i=0;
+	while ((ptr = (GF_ObjectManager *)gf_list_enum(scene->resources, &i))) {
+		if (ptr == odm) return 1;
+		if (check_in_scene(ptr->subscene, odm)) return 1;
 	}
+	return 0;
+}
+
+static Bool gf_term_check_odm(GF_Terminal *term, GF_ObjectManager *odm)
+{
+	if (!term->compositor->root_scene) return 0;
+	return check_in_scene(term->compositor->root_scene, odm);
+}
+
+
+/*returns top-level OD of the presentation*/
+GF_EXPORT
+GF_ObjectManager *gf_term_get_root_object(GF_Terminal *term)
+{
+	if (!term) return NULL;
+	if (!term->compositor->root_scene) return NULL;
+	return term->compositor->root_scene->root_od;
+}
+
+/*returns number of sub-ODs in the current root. scene_od must be an inline OD*/
+GF_EXPORT
+u32 gf_term_get_object_count(GF_Terminal *term, GF_ObjectManager *scene_od)
+{
+	if (!term || !scene_od) return 0;
+	if (!gf_term_check_odm(term, scene_od)) return 0;
+	if (!scene_od->subscene) return 0;
+	return gf_list_count(scene_od->subscene->resources);
+}
+
+/*returns indexed (0-based) OD manager in the scene*/
+GF_EXPORT
+GF_ObjectManager *gf_term_get_object(GF_Terminal *term, GF_ObjectManager *scene_od, u32 index)
+{
+	if (!term || !scene_od) return NULL;
+	if (!gf_term_check_odm(term, scene_od)) return NULL;
+	if (!scene_od->subscene) return NULL;
+	return (GF_ObjectManager *) gf_list_get(scene_od->subscene->resources, index);
+}
+
+GF_EXPORT
+u32 gf_term_object_subscene_type(GF_Terminal *term, GF_ObjectManager *odm)
+{
+	if (!term || !odm) return 0;
+	if (!gf_term_check_odm(term, odm)) return 0;
+
+	if (!odm->subscene) return 0;
+#ifndef GPAC_DISABLE_VRML
+	if (odm->parentscene) {
 
-	/*notify all codecs in the scene and subscenes*/
-	caps.CapCode = GF_CODEC_MEDIA_SWITCH_QUALITY;
-	caps.cap.valueInt = up ? 1 : 0;
-	if (scene->scene_codec) {
-		scene->scene_codec->decio->SetCapabilities(scene->scene_codec->decio, caps);
+		u32 i=0;
+		GF_ProtoLink *pl;
+		i=0;
+		while ((pl = (GF_ProtoLink*)gf_list_enum(odm->parentscene->extern_protos, &i))) {
+			if (pl->mo->odm == odm) return 3;
+		}
+		return 2;
 	}
+	
+#endif
+	return 1;
+}
+
+/*select given object when stream selection is available*/
+GF_EXPORT
+void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
+{
+	if (!term || !odm) return;
+	if (!gf_term_check_odm(term, odm)) return;
+
+	gf_scene_select_object(term->compositor->root_scene, odm);
+}
+
+
+/*select given object when stream selection is available*/
+GF_EXPORT
+void gf_term_select_service(GF_Terminal *term, GF_ObjectManager *odm, u32 service_id)
+{
+	if (!term || !odm || !odm->subscene) return;
+	if (!gf_term_check_odm(term, odm)) return;
+
+#ifndef GPAC_DISABLE_VRML
+	gf_scene_set_service_id(odm->subscene, service_id);
+#endif
+}
+
+GF_EXPORT
+Bool gf_term_find_service(GF_Terminal *term, GF_ObjectManager *odm, u32 service_id)
+{
+	u32 i;
+	GF_ObjectManager *anodm;
+	if (!term || !odm || !odm->subscene) return GF_FALSE;
+	if (!gf_term_check_odm(term, odm)) return GF_FALSE;
+
 	i=0;
-	while (NULL != (odm = gf_list_enum(scene->resources, &i))) {
-		if (odm->codec)
-			odm->codec->decio->SetCapabilities(odm->codec->decio, caps);
-		if (odm->net_service && (odm->net_service != root_service) && (!odm->subscene || !odm->subscene->is_dynamic_scene) )
-			odm->net_service->ifce->ServiceCommand(odm->net_service->ifce, &net_cmd);
-		if (odm->subscene)
-			gf_scene_switch_quality(odm->subscene, up);
-
-		if (odm->scalable_addon) {
-			if (up)
-				gf_odm_start(odm, 0);
-			else
-				gf_odm_stop(odm, GF_FALSE);
-		}
+	while ((anodm = gf_list_enum(odm->subscene->resources, &i))) {
+		if (anodm->ServiceID==service_id) return GF_TRUE;
 	}
+	return GF_FALSE;
 }
 
+/*select given object when stream selection is available*/
 GF_EXPORT
-void gf_term_switch_quality(GF_Terminal *term, Bool up)
+void gf_term_toggle_addons(GF_Terminal *term, Bool show_addons)
+{
+	if (!term || !term->compositor->root_scene || !term->compositor->root_scene->is_dynamic_scene) return;
+#ifndef GPAC_DISABLE_VRML
+	gf_scene_toggle_addons(term->compositor->root_scene, show_addons);
+#endif
+}
+
+GF_EXPORT
+u32 gf_term_get_current_service_id(GF_Terminal *term)
 {
-	gf_scene_switch_quality(term->root_scene, up);
+	SFURL *the_url;
+	GF_MediaObject *mo;
+	GF_Compositor *compositor = term ? term->compositor : NULL;
+	if (!term || !term->compositor->root_scene) return 0;
+	if (! term->compositor->root_scene->is_dynamic_scene) return term->compositor->root_scene->root_od->ServiceID;
+
+	if (compositor->root_scene->visual_url.OD_ID || compositor->root_scene->visual_url.url)
+		the_url = &compositor->root_scene->visual_url;
+	else
+		the_url = &compositor->root_scene->audio_url;
+
+	mo = gf_scene_find_object(compositor->root_scene, the_url->OD_ID, the_url->url);
+	if (mo && mo->odm) return mo->odm->ServiceID;
+	return 0;
 }
 
+
+
+
 GF_EXPORT
-GF_Err gf_term_get_visual_output_size(GF_Terminal *term, u32 *width, u32 *height)
+GF_Err gf_term_get_object_info(GF_Terminal *term, GF_ObjectManager *odm, GF_MediaInfo *info)
 {
-	if (!term) return GF_BAD_PARAM;
-	if (width) *width = term->compositor->vp_width;
-	if (height) *height = term->compositor->vp_height;
+	if (!term || !odm || !info) return GF_BAD_PARAM;
+	if (!gf_term_check_odm(term, odm)) return GF_BAD_PARAM;
+	return gf_odm_get_object_info(odm, info);
+}
+
+
+GF_EXPORT
+Bool gf_term_get_download_info(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, const char **url, u32 *bytes_done, u32 *total_bytes, u32 *bytes_per_sec)
+{
+	u32 nb_ch;
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	GF_FilterPid *pid=NULL;
+	if (!term || !odm || !gf_term_check_odm(term, odm)) return GF_FALSE;
+	if (odm->scene_ns->owner != odm)
+		return GF_FALSE;
+
+	nb_ch = odm->pid ? 1 : 0;
+	if (odm->extra_pids)
+	 	nb_ch += gf_list_count(odm->extra_pids);
+
+	if (!nb_ch) {
+		GF_ObjectManager *anodm;
+		if (*d_enum || !odm->subscene) return GF_FALSE;
+		anodm = gf_list_get(odm->subscene->resources, 0);
+		if (anodm) pid = anodm->pid;
+	} else {
+
+		if (*d_enum >= nb_ch) return GF_FALSE;
+		if (! *d_enum) pid = odm->pid;
+		else pid = gf_list_get(odm->extra_pids, *d_enum - 1);
+	}
+	if (!pid) return GF_FALSE;
+
+	(*d_enum) ++;
+
+	p = gf_filter_pid_get_info(pid, GF_PROP_PID_DOWN_RATE, &pe);
+	if (p && bytes_per_sec) {
+		*bytes_per_sec = p->value.uint;
+		*bytes_per_sec /= 8;
+	}
+
+	p = gf_filter_pid_get_info(pid, GF_PROP_PID_DOWN_BYTES, &pe);
+	if (p && bytes_done) *bytes_done = (u32) p->value.longuint;
+
+	p = gf_filter_pid_get_info(pid, GF_PROP_PID_DOWN_SIZE, &pe);
+	if (p && total_bytes) *total_bytes = (u32) p->value.longuint;
+
+	p = gf_filter_pid_get_info(pid, GF_PROP_PID_URL, &pe);
+	if (p && url) *url = p->value.string;
+
+	gf_filter_release_property(pe);
+
+	return GF_TRUE;
+}
+
+GF_EXPORT
+Bool gf_term_get_channel_net_info(GF_Terminal *term, GF_ObjectManager *odm, u32 *d_enum, u32 *chid, GF_TermNetStats *net_stats, GF_Err *ret_code)
+{
+	u32 nb_ch;
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	GF_FilterPid *pid;
+	if (!term || !odm || !gf_term_check_odm(term, odm)) return GF_FALSE;
+
+	nb_ch = odm->pid ? 1 : 0;
+	if (odm->extra_pids)
+	 	nb_ch += gf_list_count(odm->extra_pids);
+
+	if (*d_enum >= nb_ch) return GF_FALSE;
+	if (! *d_enum) pid = odm->pid;
+	else pid = gf_list_get(odm->extra_pids, *d_enum - 1);
+	if (!pid) return GF_FALSE;
+	(*d_enum) ++;
+
+	p = gf_filter_pid_get_property(pid, GF_PROP_PID_ID);
+	if (p)  (*chid) = p->value.uint;
+
+	(*ret_code) = GF_OK;
+
+	memset(net_stats, 0, sizeof(GF_TermNetStats));
+	p = gf_filter_pid_get_info_str(pid, "nets:loss", &pe);
+	if (p) net_stats->pck_loss_percentage = p->value.fnumber;
+
+	p = gf_filter_pid_get_info_str(pid, "nets:interleaved", &pe);
+	if (p) {
+		net_stats->multiplex_port = p->value.uint;
+		p = gf_filter_pid_get_info_str(pid, "nets:rtpid", &pe);
+		if (p) net_stats->port = p->value.uint;
+		p = gf_filter_pid_get_info_str(pid, "nets:rtcpid", &pe);
+		if (p) net_stats->ctrl_port = p->value.uint;
+	} else {
+		p = gf_filter_pid_get_info_str(pid, "nets:rtpp", &pe);
+		if (p) net_stats->port = p->value.uint;
+		p = gf_filter_pid_get_info_str(pid, "nets:rtcpp", &pe);
+		if (p) net_stats->ctrl_port = p->value.uint;
+	}
+
+	p = gf_filter_pid_get_info_str(pid, "nets:bw_down", &pe);
+	if (p) net_stats->bw_down = p->value.uint;
+	p = gf_filter_pid_get_info_str(pid, "nets:bw_up", &pe);
+	if (p) net_stats->bw_up = p->value.uint;
+	p = gf_filter_pid_get_info_str(pid, "nets:ctrl_bw_down", &pe);
+	if (p) net_stats->ctrl_bw_down = p->value.uint;
+	p = gf_filter_pid_get_info_str(pid, "nets:ctrl_bw_up", &pe);
+	if (p) net_stats->ctrl_bw_up = p->value.uint;
+
+	gf_filter_release_property(pe);
+	return GF_TRUE;
+}
+
+GF_EXPORT
+GF_Err gf_term_get_service_info(GF_Terminal *term, GF_ObjectManager *odm, GF_TermURLInfo *urli)
+{
+	const GF_PropertyValue *p;
+	GF_PropertyEntry *pe=NULL;
+	GF_FilterPid *pid;
+	if (urli) memset(urli, 0, sizeof(GF_TermURLInfo));
+	if (!term || !odm || !urli || !gf_term_check_odm(term, odm)) return GF_BAD_PARAM;
+
+	pid = odm->pid;
+	if (!pid && odm->subscene) {
+		GF_ObjectManager *anodm = gf_list_get(odm->subscene->resources, 0);
+		if (!anodm) return GF_OK;
+		pid = anodm->pid;
+	}
+	if (!pid) return GF_OK;
+
+	memset(urli, 0, sizeof(GF_TermURLInfo));
+
+	p = gf_filter_pid_get_info_str(pid, "info:name", &pe);
+	if (p) urli->name = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:artist", &pe);
+	if (p) urli->artist = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:album", &pe);
+	if (p) urli->album = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:comment", &pe);
+	if (p) urli->comment = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:composer", &pe);
+	if (p) urli->composer = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:writer", &pe);
+	if (p) urli->writer = p->value.string;
+
+	p = gf_filter_pid_get_info_str(pid, "info:track", &pe);
+	if (p) {
+		urli->track_num = p->value.frac.num;
+		urli->track_total = p->value.frac.den;
+	}
+	gf_filter_release_property(pe);
 	return GF_OK;
 }
 
 GF_EXPORT
-u32 gf_term_get_clock(GF_Terminal *term)
+const char *gf_term_get_world_info(GF_Terminal *term, GF_ObjectManager *scene_od, GF_List *descriptions)
+{
+	GF_Node *info;
+	if (!term) return NULL;
+	info = NULL;
+	if (!scene_od) {
+		if (!term->compositor->root_scene) return NULL;
+		info = (GF_Node*)term->compositor->root_scene->world_info;
+	} else {
+		if (!gf_term_check_odm(term, scene_od)) return NULL;
+		info = (GF_Node*) (scene_od->subscene ? scene_od->subscene->world_info : scene_od->parentscene->world_info);
+	}
+	if (!info) return NULL;
+
+	if (gf_node_get_tag(info) == TAG_SVG_title) {
+		/*FIXME*/
+		//return ((SVG_titleElement *) info)->textContent;
+		return "TO FIX IN GPAC!!";
+	} else {
+#ifndef GPAC_DISABLE_VRML
+		M_WorldInfo *wi = (M_WorldInfo *) info;
+		if (descriptions) {
+			u32 i;
+			for (i=0; i<wi->info.count; i++) {
+				gf_list_add(descriptions, wi->info.vals[i]);
+			}
+		}
+		return wi->title.buffer;
+#endif
+	}
+	return "GPAC";
+}
+
+GF_EXPORT
+GF_Err gf_term_dump_scene(GF_Terminal *term, char *rad_name, char **filename, Bool xml_dump, Bool skip_protos, GF_ObjectManager *scene_od)
+{
+#ifndef GPAC_DISABLE_SCENE_DUMP
+	GF_SceneGraph *sg;
+	GF_ObjectManager *odm;
+	GF_SceneDumper *dumper;
+	GF_List *extra_graphs;
+	u32 mode;
+	u32 i;
+	char *ext;
+	GF_Err e;
+
+	if (!term || !term->compositor->root_scene) return GF_BAD_PARAM;
+	if (!scene_od) {
+		if (!term->compositor->root_scene) return GF_BAD_PARAM;
+		odm = term->compositor->root_scene->root_od;
+	} else {
+		odm = scene_od;
+		if (!gf_term_check_odm(term, scene_od))
+			odm = term->compositor->root_scene->root_od;
+	}
+
+	if (odm->subscene) {
+		if (!odm->subscene->graph) return GF_IO_ERR;
+		sg = odm->subscene->graph;
+		extra_graphs = odm->subscene->extra_scenes;
+	} else {
+		if (!odm->parentscene->graph) return GF_IO_ERR;
+		sg = odm->parentscene->graph;
+		extra_graphs = odm->parentscene->extra_scenes;
+	}
+
+	mode = xml_dump ? GF_SM_DUMP_AUTO_XML : GF_SM_DUMP_AUTO_TXT;
+	/*figure out best dump format based on extension*/
+	ext = odm->scene_ns ? gf_file_ext_start(odm->scene_ns->url) : NULL;
+	if (ext) {
+		char szExt[20];
+		strcpy(szExt, ext);
+		strlwr(szExt);
+		if (!strcmp(szExt, ".wrl")) mode = xml_dump ? GF_SM_DUMP_X3D_XML : GF_SM_DUMP_VRML;
+		else if(!strncmp(szExt, ".x3d", 4) || !strncmp(szExt, ".x3dv", 5) ) mode = xml_dump ? GF_SM_DUMP_X3D_XML : GF_SM_DUMP_X3D_VRML;
+		else if(!strncmp(szExt, ".bt", 3) || !strncmp(szExt, ".xmt", 4) || !strncmp(szExt, ".mp4", 4) ) mode = xml_dump ? GF_SM_DUMP_XMTA : GF_SM_DUMP_BT;
+	}
+
+	dumper = gf_sm_dumper_new(sg, rad_name, GF_FALSE, ' ', mode);
+
+	if (!dumper) return GF_IO_ERR;
+	e = gf_sm_dump_graph(dumper, skip_protos, 0);
+	for (i = 0; i < gf_list_count(extra_graphs); i++) {
+		GF_SceneGraph *extra = (GF_SceneGraph *)gf_list_get(extra_graphs, i);
+		gf_sm_dumper_set_extra_graph(dumper, extra);
+		e = gf_sm_dump_graph(dumper, skip_protos, 0);
+	}
+#ifdef GPAC_ENABLE_COVERAGE
+	if (gf_sys_is_cov_mode()) {
+		gf_sm_dumper_set_extra_graph(dumper, NULL);
+		gf_sm_dump_get_name(dumper);
+	}
+#endif
+
+	if (filename) *filename = gf_strdup(gf_sm_dump_get_name(dumper));
+	gf_sm_dumper_del(dumper);
+	return e;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}
+
+GF_EXPORT
+void gf_term_print_stats(GF_Terminal *term)
+{
+	if (term->fsess)
+		gf_fs_print_stats(term->fsess);
+}
+
+GF_EXPORT
+void gf_term_print_graph(GF_Terminal *term)
 {
-	return gf_sc_ar_get_clock(term->compositor->audio_renderer);
+	if (term->fsess)
+		gf_fs_print_connections(term->fsess);
 }

gpac-1.0.0.tar.gz/src/utils/Remotery.c Added

@@ -0,0 +1,7401 @@
+//
+// Copyright 2014-2018 Celtoys Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+/*
+@Contents:
+
+    @DEPS:          External Dependencies
+    @TIMERS:        Platform-specific timers
+    @TLS:           Thread-Local Storage
+    @ATOMIC:        Atomic Operations
+    @VMBUFFER:      Mirror Buffer using Virtual Memory for auto-wrap
+    @NEW:           New/Delete operators with error values for simplifying object create/destroy
+    @THREADS:       Threads
+    @SAFEC:         Safe C Library excerpts
+    @OBJALLOC:      Reusable Object Allocator
+    @DYNBUF:        Dynamic Buffer
+    @HASHTABLE:     Integer pair hash map for inserts/finds. No removes for added simplicity.
+    @STRINGTABLE:	Map from string hash to string offset in local buffer
+    @SOCKETS:       Sockets TCP/IP Wrapper
+    @SHA1:          SHA-1 Cryptographic Hash Function
+    @BASE64:        Base-64 encoder
+    @MURMURHASH:    Murmur-Hash 3
+    @WEBSOCKETS:    WebSockets
+    @MESSAGEQ:      Multiple producer, single consumer message queue
+    @NETWORK:       Network Server
+    @SAMPLE:        Base Sample Description (CPU by default)
+    @SAMPLETREE:    A tree of samples with their allocator
+    @TSAMPLER:      Per-Thread Sampler
+    @REMOTERY:      Remotery
+    @CUDA:          CUDA event sampling
+    @D3D11:         Direct3D 11 event sampling
+    @OPENGL:        OpenGL event sampling
+    @METAL:         Metal event sampling
+*/
+
+#define RMT_IMPL
+#include <gpac/tools.h>
+
+
+#ifdef RMT_PLATFORM_WINDOWS
+  #pragma comment(lib, "ws2_32.lib")
+#endif
+
+
+#if RMT_ENABLED
+
+
+// Global settings
+static rmtSettings g_Settings;
+static rmtBool g_SettingsInitialized = RMT_FALSE;
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @DEPS: External Dependencies
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+//
+// Required CRT dependencies
+//
+#if RMT_USE_TINYCRT
+
+	#include <TinyCRT/TinyCRT.h>
+	#include <TinyCRT/TinyWinsock.h>
+    #include <Memory/Memory.h>
+
+    #define CreateFileMapping CreateFileMappingA
+
+#else
+
+    #ifdef RMT_PLATFORM_MACOS
+        #include <mach/mach_time.h>
+        #include <mach/vm_map.h>
+        #include <mach/mach.h>
+        #include <sys/time.h>
+    #else
+        #ifndef __FreeBSD__
+            #include <malloc.h>
+        #endif
+    #endif
+
+    #include <assert.h>
+
+    #ifdef RMT_PLATFORM_WINDOWS
+        #include <winsock2.h>
+        #ifndef __MINGW32__
+            #include <intrin.h>
+        #endif
+        #undef min
+        #undef max
+        #ifdef _XBOX_ONE
+            #include "xmem.h"
+        #endif
+    #endif
+
+    #ifdef RMT_PLATFORM_LINUX
+        #include <time.h>
+        #ifdef __FreeBSD__
+            #include <pthread_np.h>
+        #else
+            #include <sys/prctl.h>
+        #endif
+    #endif
+
+    #if defined(RMT_PLATFORM_POSIX)
+        #include <stdlib.h>
+        #include <pthread.h>
+        #include <unistd.h>
+        #include <string.h>
+        #include <sys/socket.h>
+        #include <sys/mman.h>
+        #include <netinet/in.h>
+        #include <fcntl.h>
+        #include <errno.h>
+        #include <dlfcn.h>
+    #endif
+
+    #ifdef __MINGW32__
+        #include <pthread.h>
+    #endif
+
+#endif
+
+#if defined(_MSC_VER) && !defined(__clang__)
+    #define RMT_UNREFERENCED_PARAMETER(i) (i)
+#else
+    #define RMT_UNREFERENCED_PARAMETER(i) (void)(1 ? (void)0 : ((void)i))
+#endif
+
+
+#if RMT_USE_CUDA
+    #include <cuda.h>
+#endif
+
+
+
+static rmtU8 minU8(rmtU8 a, rmtU8 b)
+{
+    return a < b ? a : b;
+}
+static rmtU16 maxU16(rmtU16 a, rmtU16 b)
+{
+    return a > b ? a : b;
+}
+static rmtS64 maxS64(rmtS64 a, rmtS64 b)
+{
+    return a > b ? a : b;
+}
+
+
+// Memory management functions
+static void* rmtMalloc( rmtU32 size )
+{
+    return g_Settings.malloc( g_Settings.mm_context, size );
+}
+
+static void* rmtRealloc( void* ptr, rmtU32 size)
+{
+    return g_Settings.realloc( g_Settings.mm_context, ptr, size );
+}
+
+static void rmtFree( void* ptr )
+{
+    g_Settings.free( g_Settings.mm_context, ptr );
+}
+
+#if RMT_USE_OPENGL
+// DLL/Shared Library functions
+
+static void* rmtLoadLibrary(const char* path)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+        return (void*)LoadLibraryA(path);
+    #elif defined(RMT_PLATFORM_POSIX)
+        return dlopen(path, RTLD_LOCAL | RTLD_LAZY);
+    #else
+        return NULL;
+    #endif
+}
+
+static void rmtFreeLibrary(void* handle)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+        FreeLibrary((HMODULE)handle);
+    #elif defined(RMT_PLATFORM_POSIX)
+        dlclose(handle);
+    #endif
+}
+
+#if defined(RMT_PLATFORM_WINDOWS)
+    typedef FARPROC ProcReturnType;
+#else
+    typedef void* ProcReturnType;
+#endif
+
+static ProcReturnType rmtGetProcAddress(void* handle, const char* symbol)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+        return GetProcAddress((HMODULE)handle, (LPCSTR)symbol);
+    #elif defined(RMT_PLATFORM_POSIX)
+        return dlsym(handle, symbol);
+    #endif
+}
+
+
+#endif
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @TIMERS: Platform-specific timers
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+//
+// Get millisecond timer value that has only one guarantee: multiple calls are consistently comparable.
+// On some platforms, even though this returns milliseconds, the timer may be far less accurate.
+//
+static rmtU32 msTimer_Get()
+{
+    #ifdef RMT_PLATFORM_WINDOWS
+
+        return (rmtU32)GetTickCount();
+
+    #else
+
+        clock_t time = clock();
+
+        // CLOCKS_PER_SEC is 128 on FreeBSD, causing div/0
+        #ifdef __FreeBSD__
+            rmtU32 msTime = (rmtU32) (time * 1000 / CLOCKS_PER_SEC);
+        #else
+            rmtU32 msTime = (rmtU32) (time / (CLOCKS_PER_SEC / 1000));
+        #endif
+
+        return msTime;
+        
+    #endif
+}
+
+
+//
+// Micro-second accuracy high performance counter
+//
+#ifndef RMT_PLATFORM_WINDOWS
+    typedef rmtU64 LARGE_INTEGER;
+#endif
+typedef struct
+{
+    LARGE_INTEGER counter_start;
+    double counter_scale;
+} usTimer;
+
+
+static void usTimer_Init(usTimer* timer)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+        LARGE_INTEGER performance_frequency;
+
+        assert(timer != NULL);
+
+        // Calculate the scale from performance counter to microseconds
+        QueryPerformanceFrequency(&performance_frequency);
+        timer->counter_scale = 1000000.0 / performance_frequency.QuadPart;
+
+        // Record the offset for each read of the counter
+        QueryPerformanceCounter(&timer->counter_start);
+
+    #elif defined(RMT_PLATFORM_MACOS)
+
+        mach_timebase_info_data_t nsScale;
+        mach_timebase_info( &nsScale );
+        const double ns_per_us = 1.0e3;
+        timer->counter_scale = (double)(nsScale.numer) / ((double)nsScale.denom * ns_per_us);
+
+        timer->counter_start = mach_absolute_time();
+
+    #elif defined(RMT_PLATFORM_LINUX)
+
+        struct timespec tv;
+        clock_gettime(CLOCK_REALTIME, &tv);
+        timer->counter_start = (rmtU64)(tv.tv_sec * (rmtU64)1000000) + (rmtU64)(tv.tv_nsec * 0.001);
+
+    #endif
+}
+
+
+static rmtU64 usTimer_Get(usTimer* timer)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+        LARGE_INTEGER performance_count;
+
+        assert(timer != NULL);
+
+        // Read counter and convert to microseconds
+        QueryPerformanceCounter(&performance_count);
+        return (rmtU64)((performance_count.QuadPart - timer->counter_start.QuadPart) * timer->counter_scale);
+
+    #elif defined(RMT_PLATFORM_MACOS)
+
+        rmtU64 curr_time = mach_absolute_time();
+        return (rmtU64)((curr_time - timer->counter_start) * timer->counter_scale);
+
+    #elif defined(RMT_PLATFORM_LINUX)
+
+        struct timespec tv;
+        clock_gettime(CLOCK_REALTIME, &tv);
+        return  ((rmtU64)(tv.tv_sec * (rmtU64)1000000) + (rmtU64)(tv.tv_nsec * 0.001)) - timer->counter_start;
+
+    #endif
+}
+
+
+static void msSleep(rmtU32 time_ms)
+{
+    #ifdef RMT_PLATFORM_WINDOWS
+        Sleep(time_ms);
+    #elif defined(RMT_PLATFORM_POSIX)
+        usleep(time_ms * 1000);
+    #endif
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @TLS: Thread-Local Storage
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#define TLS_INVALID_HANDLE 0xFFFFFFFF
+
+#if defined(RMT_PLATFORM_WINDOWS)
+    typedef rmtU32 rmtTLS;
+#else
+    typedef pthread_key_t rmtTLS;
+#endif
+
+static rmtError tlsAlloc(rmtTLS* handle)
+{
+    assert(handle != NULL);
+
+#if defined(RMT_PLATFORM_WINDOWS)
+
+    *handle = (rmtTLS)TlsAlloc();
+    if (*handle == TLS_OUT_OF_INDEXES)
+    {
+        *handle = TLS_INVALID_HANDLE;
+        return RMT_ERROR_TLS_ALLOC_FAIL;
+    }
+
+#elif defined(RMT_PLATFORM_POSIX)
+
+    if (pthread_key_create(handle, NULL) != 0)
+    {
+        *handle = TLS_INVALID_HANDLE;
+        return RMT_ERROR_TLS_ALLOC_FAIL;
+    }
+
+#endif
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void tlsFree(rmtTLS handle)
+{
+    assert(handle != TLS_INVALID_HANDLE);
+
+#if defined(RMT_PLATFORM_WINDOWS)
+
+    TlsFree(handle);
+
+#elif defined(RMT_PLATFORM_POSIX)
+
+    pthread_key_delete((pthread_key_t)handle);
+
+#endif
+}
+
+
+static void tlsSet(rmtTLS handle, void* value)
+{
+    assert(handle != TLS_INVALID_HANDLE);
+
+#if defined(RMT_PLATFORM_WINDOWS)
+
+    TlsSetValue(handle, value);
+
+#elif defined(RMT_PLATFORM_POSIX)
+
+    pthread_setspecific((pthread_key_t)handle, value);
+
+#endif
+}
+
+
+static void* tlsGet(rmtTLS handle)
+{
+    assert(handle != TLS_INVALID_HANDLE);
+
+#if defined(RMT_PLATFORM_WINDOWS)
+
+    return TlsGetValue(handle);
+
+#elif defined(RMT_PLATFORM_POSIX)
+
+    return pthread_getspecific((pthread_key_t)handle);
+
+#endif
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @ATOMIC: Atomic Operations
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+static rmtBool AtomicCompareAndSwap(rmtU32 volatile* val, long old_val, long new_val)
+{
+    #if defined(RMT_PLATFORM_WINDOWS) && !defined(__MINGW32__)
+        return _InterlockedCompareExchange((long volatile*)val, new_val, old_val) == old_val ? RMT_TRUE : RMT_FALSE;
+    #elif defined(RMT_PLATFORM_POSIX) || defined(__MINGW32__)
+        return __sync_bool_compare_and_swap(val, (rmtU32) old_val, (rmtU32) new_val) ? RMT_TRUE : RMT_FALSE;
+    #endif
+}
+
+
+static rmtBool AtomicCompareAndSwapPointer(long* volatile* ptr, long* old_ptr, long* new_ptr)
+{
+    #if defined(RMT_PLATFORM_WINDOWS) && !defined(__MINGW32__)
+        #ifdef _WIN64
+            return _InterlockedCompareExchange64((__int64 volatile*)ptr, (__int64)new_ptr, (__int64)old_ptr) == (__int64)old_ptr ? RMT_TRUE : RMT_FALSE;
+        #else
+            return _InterlockedCompareExchange((long volatile*)ptr, (long)new_ptr, (long)old_ptr) == (long)old_ptr ? RMT_TRUE : RMT_FALSE;
+        #endif
+    #elif defined(RMT_PLATFORM_POSIX) || defined(__MINGW32__)
+        return __sync_bool_compare_and_swap(ptr, old_ptr, new_ptr) ? RMT_TRUE : RMT_FALSE;
+    #endif
+}
+
+
+//
+// NOTE: Does not guarantee a memory barrier
+// TODO: Make sure all platforms don't insert a memory barrier as this is only for stats
+//       Alternatively, add strong/weak memory order equivalents
+//
+static rmtS32 AtomicAdd(rmtS32 volatile* value, rmtS32 add)
+{
+    #if defined(RMT_PLATFORM_WINDOWS) && !defined(__MINGW32__)
+        return _InterlockedExchangeAdd((long volatile*)value, (long)add);
+    #elif defined(RMT_PLATFORM_POSIX) || defined(__MINGW32__)
+        return __sync_fetch_and_add(value, add);
+    #endif
+}
+
+
+static void AtomicSub(rmtS32 volatile* value, rmtS32 sub)
+{
+    // Not all platforms have an implementation so just negate and add
+    AtomicAdd(value, -sub);
+}
+
+
+static void CompilerWriteFence()
+{
+#if defined (__clang__)
+    __asm__ volatile("" : : : "memory");
+#elif defined(RMT_PLATFORM_WINDOWS) && !defined(__MINGW32__)
+    _WriteBarrier();
+#else
+    asm volatile ("" : : : "memory");
+#endif
+}
+
+
+static void CompilerReadFence()
+{
+#if defined (__clang__)
+    __asm__ volatile("" : : : "memory");
+#elif defined(RMT_PLATFORM_WINDOWS) && !defined(__MINGW32__)
+    _ReadBarrier();
+#else
+    asm volatile ("" : : : "memory");
+#endif
+}
+
+
+static rmtU32 LoadAcquire(rmtU32* volatile address)
+{
+    rmtU32 value = *address;
+    CompilerReadFence();
+    return value;
+}
+
+
+static long* LoadAcquirePointer(long* volatile* ptr)
+{
+    long* value = *ptr;
+    CompilerReadFence();
+    return value;
+}
+
+
+static void StoreRelease(rmtU32* volatile address, rmtU32 value)
+{
+    CompilerWriteFence();
+    *address = value;
+}
+
+
+static void StoreReleasePointer(long* volatile* ptr, long* value)
+{
+    CompilerWriteFence();
+    *ptr = value;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @NEW: New/Delete operators with error values for simplifying object create/destroy
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+// Ensures the pointer is non-NULL, calls the destructor, frees memory and sets the pointer to NULL
+#define Delete(type, obj)           \
+    if (obj != NULL)                \
+    {                               \
+        type##_Destructor(obj);     \
+        rmtFree(obj);               \
+        obj = NULL;                 \
+    }
+
+
+// New is implemented in terms of two begin/end macros
+// New will allocate enough space for the object and call the constructor
+// If allocation fails the constructor won't be called
+// If the constructor fails, the destructor is called and memory is released
+// NOTE: Use of sizeof() requires that the type be defined at the point of call
+// This is a disadvantage over requiring only a custom Create function
+#define BeginNew(type, obj)                 \
+    {                                       \
+        obj = (type*)rmtMalloc(sizeof(type));  \
+        if (obj == NULL)                    \
+        {                                   \
+            error = RMT_ERROR_MALLOC_FAIL;  \
+        }                                   \
+        else                                \
+        {                                   \
+
+
+#define EndNew(type, obj)                   \
+            if (error != RMT_ERROR_NONE)    \
+                Delete(type, obj);          \
+        }                                   \
+    }
+
+
+// Specialisations for New with varying constructor parameter counts
+#define New_0(type, obj)    \
+    BeginNew(type, obj); error = type##_Constructor(obj); EndNew(type, obj)
+#define New_1(type, obj, a0)    \
+    BeginNew(type, obj); error = type##_Constructor(obj, a0); EndNew(type, obj)
+#define New_2(type, obj, a0, a1)    \
+    BeginNew(type, obj); error = type##_Constructor(obj, a0, a1); EndNew(type, obj)
+#define New_3(type, obj, a0, a1, a2)    \
+    BeginNew(type, obj); error = type##_Constructor(obj, a0, a1, a2); EndNew(type, obj)
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @VMBUFFER: Mirror Buffer using Virtual Memory for auto-wrap
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+typedef struct VirtualMirrorBuffer
+{
+    // Page-rounded size of the buffer without mirroring
+    rmtU32 size;
+
+    // Pointer to the first part of the mirror
+    // The second part comes directly after at ptr+size bytes
+    rmtU8* ptr;
+
+#ifdef RMT_PLATFORM_WINDOWS
+    #ifdef _XBOX_ONE
+        size_t page_count;
+        size_t* page_mapping;
+    #else
+        HANDLE file_map_handle;
+    #endif
+#endif
+
+} VirtualMirrorBuffer;
+
+
+#ifdef __ANDROID__
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <linux/ashmem.h>
+#include <fcntl.h>
+#include <string.h>
+#define ASHMEM_DEVICE   "/dev/ashmem"
+
+/*
+ * ashmem_create_region - creates a new ashmem region and returns the file
+ * descriptor, or <0 on error
+ *
+ * `name' is an optional label to give the region (visible in /proc/pid/maps)
+ * `size' is the size of the region, in page-aligned bytes
+ */
+int ashmem_create_region(const char *name, size_t size)
+{
+        int fd, ret;
+
+        fd = open(ASHMEM_DEVICE, O_RDWR);
+        if (fd < 0)
+                return fd;
+
+        if (name) {
+                char buf[ASHMEM_NAME_LEN] = {0};
+
+                strncpy(buf, name, sizeof(buf));
+                buf[sizeof(buf)-1] = 0;
+                ret = ioctl(fd, ASHMEM_SET_NAME, buf);
+                if (ret < 0)
+                        goto error;
+        }
+
+        ret = ioctl(fd, ASHMEM_SET_SIZE, size);
+        if (ret < 0)
+                goto error;
+
+        return fd;
+
+error:
+        close(fd);
+        return ret;
+}
+#endif // __ANDROID__
+
+static rmtError VirtualMirrorBuffer_Constructor(VirtualMirrorBuffer* buffer, rmtU32 size, int nb_attempts)
+{
+    static const rmtU32 k_64 = 64 * 1024;
+    RMT_UNREFERENCED_PARAMETER(nb_attempts);
+
+#ifdef RMT_PLATFORM_LINUX
+    #ifdef __FreeBSD__
+        char path[] = "/tmp/ring-buffer-XXXXXX";
+    #else
+        char path[] = "/dev/shm/ring-buffer-XXXXXX";
+    #endif
+    int file_descriptor;
+#endif
+
+    // Round up to page-granulation; the nearest 64k boundary for now
+    size = (size + k_64 - 1) / k_64 * k_64;
+
+    // Set defaults
+    buffer->size = size;
+    buffer->ptr = NULL;
+#ifdef RMT_PLATFORM_WINDOWS
+    #ifdef _XBOX_ONE
+        buffer->page_count = 0;
+        buffer->page_mapping = NULL;
+    #else
+        buffer->file_map_handle = INVALID_HANDLE_VALUE;
+    #endif
+#endif
+
+#ifdef RMT_PLATFORM_WINDOWS
+#ifdef _XBOX_ONE
+
+    // Xbox version based on Windows version and XDK reference
+
+    buffer->page_count = size / k_64;
+    if (buffer->page_mapping)
+    {
+        free( buffer->page_mapping );
+    }
+    buffer->page_mapping = (size_t*)malloc( sizeof( ULONG )*buffer->page_count );
+
+    while(nb_attempts-- > 0)
+    {
+        rmtU8* desired_addr;
+
+        // Create a page mapping for pointing to its physical address with multiple virtual pages
+        if (!AllocateTitlePhysicalPages( GetCurrentProcess(), MEM_LARGE_PAGES, &buffer->page_count, buffer->page_mapping ))
+        {
+            free( buffer->page_mapping );
+            buffer->page_mapping = NULL;
+            break;
+        }
+
+        // Reserve two contiguous pages of virtual memory
+        desired_addr = (rmtU8*)VirtualAlloc( 0, size * 2, MEM_RESERVE, PAGE_NOACCESS );
+        if (desired_addr == NULL)
+            break;
+
+        // Release the range immediately but retain the address for the next sequence of code to
+        // try and map to it. In the mean-time some other OS thread may come along and allocate this
+        // address range from underneath us so multiple attempts need to be made.
+        VirtualFree( desired_addr, 0, MEM_RELEASE );
+
+        // Immediately try to point both pages at the file mapping
+        if (MapTitlePhysicalPages( desired_addr, buffer->page_count, MEM_LARGE_PAGES, PAGE_READWRITE, buffer->page_mapping ) == desired_addr &&
+            MapTitlePhysicalPages( desired_addr + size, buffer->page_count, MEM_LARGE_PAGES, PAGE_READWRITE, buffer->page_mapping ) == desired_addr + size)
+        {
+            buffer->ptr = desired_addr;
+            break;
+        }
+
+        // Failed to map the virtual pages; cleanup and try again
+        FreeTitlePhysicalPages( GetCurrentProcess(), buffer->page_count, buffer->page_mapping );
+        buffer->page_mapping = NULL;
+    }
+
+#else
+
+    // Windows version based on https://gist.github.com/rygorous/3158316
+
+    while (nb_attempts-- > 0)
+    {
+        rmtU8* desired_addr;
+
+        // Create a file mapping for pointing to its physical address with multiple virtual pages
+        buffer->file_map_handle = CreateFileMapping(
+            INVALID_HANDLE_VALUE,
+            0,
+            PAGE_READWRITE,
+            0,
+            size,
+            0);
+        if (buffer->file_map_handle == NULL)
+            break;
+
+		
+#ifndef _UWP // NON-UWP Windows Desktop Version
+
+		// Reserve two contiguous pages of virtual memory
+		desired_addr = (rmtU8*)VirtualAlloc(0, size * 2, MEM_RESERVE, PAGE_NOACCESS);
+		if (desired_addr == NULL)
+			break;
+
+		// Release the range immediately but retain the address for the next sequence of code to
+		// try and map to it. In the mean-time some other OS thread may come along and allocate this
+		// address range from underneath us so multiple attempts need to be made.
+		VirtualFree(desired_addr, 0, MEM_RELEASE);
+
+		// Immediately try to point both pages at the file mapping		
+		if (MapViewOfFileEx(buffer->file_map_handle, FILE_MAP_ALL_ACCESS, 0, 0, size, desired_addr) == desired_addr &&
+			MapViewOfFileEx(buffer->file_map_handle, FILE_MAP_ALL_ACCESS, 0, 0, size, desired_addr + size) == desired_addr + size)
+		{
+			buffer->ptr = desired_addr;
+			break;
+		}
+
+#else   // UWP 
+
+		// Implementation based on example from: https://docs.microsoft.com/en-us/windows/desktop/api/memoryapi/nf-memoryapi-virtualalloc2
+		//
+		// Notes
+		//  - just replaced the non-uwp functions by the uwp variants. 
+		//  - Both versions could be rewritten to not need the try-loop, see the example mentioned above. I just keep it as is for now.
+		//  - Successfully tested on Hololens
+		desired_addr = (rmtU8*) VirtualAlloc2FromApp(NULL, NULL, 2 * size,MEM_RESERVE | MEM_RESERVE_PLACEHOLDER,PAGE_NOACCESS,NULL, 0);
+
+		// Split the placeholder region into two regions of equal size.
+		VirtualFree(desired_addr, size,	MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER);
+		
+		// Immediately try to point both pages at the file mapping. 
+		if(MapViewOfFile3FromApp(buffer->file_map_handle,NULL, desired_addr, 0, size, MEM_REPLACE_PLACEHOLDER,PAGE_READWRITE,NULL,0)==desired_addr &&
+   		   MapViewOfFile3FromApp(buffer->file_map_handle,NULL, desired_addr+size, 0, size, MEM_REPLACE_PLACEHOLDER,PAGE_READWRITE,NULL,0)== desired_addr + size) {
+			buffer->ptr = desired_addr;			
+			break;
+		}
+#endif
+        // Failed to map the virtual pages; cleanup and try again
+        CloseHandle(buffer->file_map_handle);
+        buffer->file_map_handle = NULL;
+    }
+
+#endif  // _XBOX_ONE
+
+#endif
+
+#ifdef RMT_PLATFORM_MACOS
+
+    //
+    // Mac version based on https://github.com/mikeash/MAMirroredQueue
+    //
+    // Copyright (c) 2010, Michael Ash
+    // 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 Michael Ash 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 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.
+    //
+
+    while (nb_attempts-- > 0)
+    {
+        vm_prot_t cur_prot, max_prot;
+        kern_return_t mach_error;
+        rmtU8* ptr = NULL;
+        rmtU8* target = NULL;
+
+        // Allocate 2 contiguous pages of virtual memory
+        if (vm_allocate(mach_task_self(), (vm_address_t*)&ptr, size * 2, VM_FLAGS_ANYWHERE) != KERN_SUCCESS)
+            break;
+
+        // Try to deallocate the last page, leaving its virtual memory address free
+        target = ptr + size;
+        if (vm_deallocate(mach_task_self(), (vm_address_t)target, size) != KERN_SUCCESS)
+        {
+            vm_deallocate(mach_task_self(), (vm_address_t)ptr, size * 2);
+            break;
+        }
+
+        // Attempt to remap the page just deallocated to the buffer again
+        mach_error = vm_remap(
+            mach_task_self(),
+            (vm_address_t*)&target,
+            size,
+            0,  // mask
+            0,  // anywhere
+            mach_task_self(),
+            (vm_address_t)ptr,
+            0,  //copy
+            &cur_prot,
+            &max_prot,
+            VM_INHERIT_COPY);
+
+        if (mach_error == KERN_NO_SPACE)
+        {
+            // Failed on this pass, cleanup and make another attempt
+            if (vm_deallocate(mach_task_self(), (vm_address_t)ptr, size) != KERN_SUCCESS)
+                break;
+        }
+
+        else if (mach_error == KERN_SUCCESS)
+        {
+            // Leave the loop on success
+            buffer->ptr = ptr;
+            break;
+        }
+
+        else
+        {
+            // Unknown error, can't recover
+            vm_deallocate(mach_task_self(), (vm_address_t)ptr, size);
+            break;
+        }
+    }
+
+#endif
+
+#ifdef RMT_PLATFORM_LINUX
+
+    // Linux version based on now-defunct Wikipedia section http://en.wikipedia.org/w/index.php?title=Circular_buffer&oldid=600431497
+
+
+#ifdef __ANDROID__
+    file_descriptor = ashmem_create_region("remotery_shm", size * 2);
+    if (file_descriptor < 0) {
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+    }
+#else
+    // Create a unique temporary filename in the shared memory folder
+    file_descriptor = mkstemp(path);
+    if (file_descriptor < 0)
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+
+    // Delete the name
+    if (unlink(path))
+        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
+    if (ftruncate (file_descriptor, size * 2))
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+
+#endif
+    // Map 2 contiguous pages
+    buffer->ptr = (rmtU8*)mmap(NULL, size * 2, PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+    if (buffer->ptr == MAP_FAILED)
+    {
+        buffer->ptr = NULL;
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+    }
+
+    // Point both pages to the same memory file
+    if (mmap(buffer->ptr, size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, file_descriptor, 0) != buffer->ptr ||
+        mmap(buffer->ptr + size, size, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, file_descriptor, 0) != buffer->ptr + size)
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+
+#endif
+
+    // Cleanup if exceeded number of attempts or failed
+    if (buffer->ptr == NULL)
+        return RMT_ERROR_VIRTUAL_MEMORY_BUFFER_FAIL;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void VirtualMirrorBuffer_Destructor(VirtualMirrorBuffer* buffer)
+{
+    assert(buffer != 0);
+
+#ifdef RMT_PLATFORM_WINDOWS
+    #ifdef _XBOX_ONE
+        if (buffer->page_mapping != NULL)
+        {
+            VirtualFree( buffer->ptr, 0, MEM_DECOMMIT );	//needed in conjunction with FreeTitlePhysicalPages
+            FreeTitlePhysicalPages( GetCurrentProcess(), buffer->page_count, buffer->page_mapping );
+            free( buffer->page_mapping );
+            buffer->page_mapping = NULL;
+        }
+    #else
+        if (buffer->file_map_handle != NULL)
+        {
+			// FIXME, don't we need to unmap the file views obtained in VirtualMirrorBuffer_Constructor, both for uwp/non-uwp
+			// See example https://docs.microsoft.com/en-us/windows/desktop/api/memoryapi/nf-memoryapi-virtualalloc2
+	
+            CloseHandle(buffer->file_map_handle);
+            buffer->file_map_handle = NULL;
+        }
+    #endif
+#endif
+
+#ifdef RMT_PLATFORM_MACOS
+    if (buffer->ptr != NULL)
+        vm_deallocate(mach_task_self(), (vm_address_t)buffer->ptr, buffer->size * 2);
+#endif
+
+#ifdef RMT_PLATFORM_LINUX
+    if (buffer->ptr != NULL)
+        munmap(buffer->ptr, buffer->size * 2);
+#endif
+
+    buffer->ptr = NULL;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @THREADS: Threads
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+typedef struct Thread_t rmtThread;
+typedef rmtError(*ThreadProc)(rmtThread* thread);
+
+
+struct Thread_t
+{
+    // OS-specific data
+    #if defined(RMT_PLATFORM_WINDOWS)
+        HANDLE handle;
+    #else
+        pthread_t handle;
+    #endif
+
+    // Callback executed when the thread is created
+    ThreadProc callback;
+
+    // Caller-specified parameter passed to Thread_Create
+    void* param;
+
+    // Error state returned from callback
+    rmtError error;
+
+    // External threads can set this to request an exit
+    volatile rmtBool request_exit;
+
+};
+
+
+#if defined(RMT_PLATFORM_WINDOWS)
+
+    static DWORD WINAPI ThreadProcWindows(LPVOID lpParameter)
+    {
+        rmtThread* thread = (rmtThread*)lpParameter;
+        assert(thread != NULL);
+        thread->error = thread->callback(thread);
+        return thread->error == RMT_ERROR_NONE ? 0 : 1;
+    }
+
+#else
+    static void* StartFunc( void* pArgs )
+    {
+        rmtThread* thread = (rmtThread*)pArgs;
+        assert(thread != NULL);
+        thread->error = thread->callback(thread);
+        return NULL; // returned error not use, check thread->error.
+    }
+#endif
+
+
+static int rmtThread_Valid(rmtThread* thread)
+{
+    assert(thread != NULL);
+
+    #if defined(RMT_PLATFORM_WINDOWS)
+        return thread->handle != NULL;
+    #else
+        return !pthread_equal(thread->handle, pthread_self());
+    #endif
+}
+
+
+static rmtError rmtThread_Constructor(rmtThread* thread, ThreadProc callback, void* param)
+{
+    assert(thread != NULL);
+
+    thread->callback = callback;
+    thread->param = param;
+    thread->error = RMT_ERROR_NONE;
+    thread->request_exit = RMT_FALSE;
+
+    // OS-specific thread creation
+
+    #if defined (RMT_PLATFORM_WINDOWS)
+
+        thread->handle = CreateThread(
+            NULL,                               // lpThreadAttributes
+            0,                                  // dwStackSize
+            ThreadProcWindows,                  // lpStartAddress
+            thread,                            // lpParameter
+            0,                                  // dwCreationFlags
+            NULL);                              // lpThreadId
+
+        if (thread->handle == NULL)
+            return RMT_ERROR_CREATE_THREAD_FAIL;
+
+    #else
+
+        int32_t error = pthread_create( &thread->handle, NULL, StartFunc, thread );
+        if (error)
+        {
+            // Contents of 'thread' parameter to pthread_create() are undefined after
+            // failure call so can't pre-set to invalid value before hand.
+            thread->handle = pthread_self();
+            return RMT_ERROR_CREATE_THREAD_FAIL;
+        }
+
+    #endif
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void rmtThread_RequestExit(rmtThread* thread)
+{
+    // Not really worried about memory barriers or delayed visibility to the target thread
+    assert(thread != NULL);
+    thread->request_exit = RMT_TRUE;
+}
+
+
+static void rmtThread_Join(rmtThread* thread)
+{
+    assert(rmtThread_Valid(thread));
+
+    #if defined(RMT_PLATFORM_WINDOWS)
+    WaitForSingleObject(thread->handle, INFINITE);
+    #else
+    pthread_join(thread->handle, NULL);
+    #endif
+}
+
+
+static void rmtThread_Destructor(rmtThread* thread)
+{
+    assert(thread != NULL);
+
+    if (rmtThread_Valid(thread))
+    {
+        // Shutdown the thread
+        rmtThread_RequestExit(thread);
+        rmtThread_Join(thread);
+
+        // OS-specific release of thread resources
+
+        #if defined(RMT_PLATFORM_WINDOWS)
+        CloseHandle(thread->handle);
+        thread->handle = NULL;
+        #endif
+    }
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @SAFEC: Safe C Library excerpts
+   http://sourceforge.net/projects/safeclib/
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+/*------------------------------------------------------------------
+ *
+ * November 2008, Bo Berry
+ *
+ * Copyright (c) 2008-2011 by Cisco Systems, Inc
+ * All rights reserved.
+ *
+ * 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.
+ *------------------------------------------------------------------
+ */
+
+
+// NOTE: Microsoft also has its own version of these functions so I'm do some hacky PP to remove them
+#define strnlen_s strnlen_s_safe_c
+#define strncat_s strncat_s_safe_c
+#define strcpy_s strcpy_s_safe_c
+
+
+#define RSIZE_MAX_STR (4UL << 10)   /* 4KB */
+#define RCNEGATE(x) x
+
+
+#define EOK             ( 0 )
+#define ESNULLP         ( 400 )       /* null ptr                    */
+#define ESZEROL         ( 401 )       /* length is zero              */
+#define ESLEMAX         ( 403 )       /* length exceeds max          */
+#define ESOVRLP         ( 404 )       /* overlap undefined           */
+#define ESNOSPC         ( 406 )       /* not enough space for s2     */
+#define ESUNTERM        ( 407 )       /* unterminated string         */
+#define ESNOTFND        ( 409 )       /* not found                   */
+
+#ifndef _ERRNO_T_DEFINED
+#define _ERRNO_T_DEFINED
+typedef int errno_t;
+#endif
+
+// rsize_t equivalent without going to the hassle of detecting if a platform has implemented C11/K3.2
+typedef unsigned int r_size_t;
+
+static r_size_t
+strnlen_s (const char *dest, r_size_t dmax)
+{
+    r_size_t count;
+
+    if (dest == NULL) {
+        return RCNEGATE(0);
+    }
+
+    if (dmax == 0) {
+        return RCNEGATE(0);
+    }
+
+    if (dmax > RSIZE_MAX_STR) {
+        return RCNEGATE(0);
+    }
+
+    count = 0;
+    while (*dest && dmax) {
+        count++;
+        dmax--;
+        dest++;
+    }
+
+    return RCNEGATE(count);
+}
+
+
+static errno_t
+strstr_s (char *dest, r_size_t dmax,
+          const char *src, r_size_t slen, char **substring)
+{
+    if (substring == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+    *substring = NULL;
+
+    if (dest == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (dmax == 0) {
+        return RCNEGATE(ESZEROL);
+    }
+
+    if (dmax > RSIZE_MAX_STR) {
+        return RCNEGATE(ESLEMAX);
+    }
+
+    if (src == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (slen == 0) {
+        return RCNEGATE(ESZEROL);
+    }
+
+    if (slen > RSIZE_MAX_STR) {
+        return RCNEGATE(ESLEMAX);
+    }
+
+    /*
+     * src points to a string with zero length, or
+     * src equals dest, return dest
+     */
+    if (*src == '\0' || dest == src) {
+        *substring = dest;
+        return RCNEGATE(EOK);
+    }
+
+    while (*dest && dmax) {
+    	int i;
+    	r_size_t len;
+    	r_size_t dlen;
+        i = 0;
+        len = slen;
+        dlen = dmax;
+
+        while (src[i] && dlen) {
+
+            /* not a match, not a substring */
+            if (dest[i] != src[i]) {
+                break;
+            }
+
+            /* move to the next char */
+            i++;
+            len--;
+            dlen--;
+
+            if (src[i] == '\0' || !len) {
+                *substring = dest;
+                return RCNEGATE(EOK);
+            }
+        }
+        dest++;
+        dmax--;
+    }
+
+    /*
+     * substring was not found, return NULL
+     */
+    *substring = NULL;
+    return RCNEGATE(ESNOTFND);
+}
+
+
+static errno_t
+strncat_s (char *dest, r_size_t dmax, const char *src, r_size_t slen)
+{
+    const char *overlap_bumper;
+
+    if (dest == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (src == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (slen > RSIZE_MAX_STR) {
+        return RCNEGATE(ESLEMAX);
+    }
+
+    if (dmax == 0) {
+        return RCNEGATE(ESZEROL);
+    }
+
+    if (dmax > RSIZE_MAX_STR) {
+        return RCNEGATE(ESLEMAX);
+    }
+
+    /* hold base of dest in case src was not copied */
+
+    if (dest < src) {
+        overlap_bumper = src;
+
+        /* Find the end of dest */
+        while (*dest != '\0') {
+
+            if (dest == overlap_bumper) {
+                return RCNEGATE(ESOVRLP);
+            }
+
+            dest++;
+            dmax--;
+            if (dmax == 0) {
+                return RCNEGATE(ESUNTERM);
+            }
+        }
+
+        while (dmax > 0) {
+            if (dest == overlap_bumper) {
+                return RCNEGATE(ESOVRLP);
+            }
+
+            /*
+             * Copying truncated before the source null is encountered
+             */
+            if (slen == 0) {
+                *dest = '\0';
+                return RCNEGATE(EOK);
+            }
+
+            *dest = *src;
+            if (*dest == '\0') {
+                return RCNEGATE(EOK);
+            }
+
+            dmax--;
+            slen--;
+            dest++;
+            src++;
+        }
+
+    } else {
+        overlap_bumper = dest;
+
+        /* Find the end of dest */
+        while (*dest != '\0') {
+
+            /*
+             * NOTE: no need to check for overlap here since src comes first
+             * in memory and we're not incrementing src here.
+             */
+            dest++;
+            dmax--;
+            if (dmax == 0) {
+                return RCNEGATE(ESUNTERM);
+            }
+        }
+
+        while (dmax > 0) {
+            if (src == overlap_bumper) {
+                return RCNEGATE(ESOVRLP);
+            }
+
+            /*
+             * Copying truncated
+             */
+            if (slen == 0) {
+                *dest = '\0';
+                return RCNEGATE(EOK);
+            }
+
+            *dest = *src;
+            if (*dest == '\0') {
+                return RCNEGATE(EOK);
+            }
+
+            dmax--;
+            slen--;
+            dest++;
+            src++;
+        }
+    }
+
+    /*
+     * the entire src was not copied, so the string will be nulled.
+     */
+    return RCNEGATE(ESNOSPC);
+}
+
+
+errno_t
+strcpy_s(char *dest, r_size_t dmax, const char *src)
+{
+    const char *overlap_bumper;
+
+    if (dest == NULL) {
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (dmax == 0) {
+        return RCNEGATE(ESZEROL);
+    }
+
+    if (dmax > RSIZE_MAX_STR) {
+        return RCNEGATE(ESLEMAX);
+    }
+
+    if (src == NULL) {
+        *dest = '\0';
+        return RCNEGATE(ESNULLP);
+    }
+
+    if (dest == src) {
+        return RCNEGATE(EOK);
+    }
+
+    if (dest < src) {
+        overlap_bumper = src;
+
+        while (dmax > 0) {
+            if (dest == overlap_bumper) {
+                return RCNEGATE(ESOVRLP);
+            }
+
+            *dest = *src;
+            if (*dest == '\0') {
+                return RCNEGATE(EOK);
+            }
+
+            dmax--;
+            dest++;
+            src++;
+        }
+
+    }
+    else {
+        overlap_bumper = dest;
+
+        while (dmax > 0) {
+            if (src == overlap_bumper) {
+                return RCNEGATE(ESOVRLP);
+            }
+
+            *dest = *src;
+            if (*dest == '\0') {
+                return RCNEGATE(EOK);
+            }
+
+            dmax--;
+            dest++;
+            src++;
+        }
+    }
+
+    /*
+    * the entire src must have been copied, if not reset dest
+    * to null the string.
+    */
+    return RCNEGATE(ESNOSPC);
+}
+
+#if !(defined(RMT_PLATFORM_LINUX) && RMT_USE_POSIX_THREADNAMES)
+
+/* very simple integer to hex */
+static const char* hex_encoding_table = "0123456789ABCDEF";
+
+static void itoahex_s( char *dest, r_size_t dmax, rmtS32 value )
+{
+    r_size_t len;
+    rmtS32 halfbytepos;
+
+    halfbytepos = 8;
+
+    /* strip leading 0's */
+    while (halfbytepos > 1)
+    {
+        --halfbytepos;
+        if (value >> (4 * halfbytepos) & 0xF)
+        {
+            ++halfbytepos;
+            break;
+        }
+    }
+
+    len = 0;
+    while(len + 1 < dmax && halfbytepos > 0)
+    {
+        --halfbytepos;
+        dest[len] = hex_encoding_table[value >> (4 * halfbytepos) & 0xF];
+        ++len;
+    }
+
+    if (len < dmax)
+    {
+        dest[len] = 0;
+    }
+}
+
+#endif
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @OBJALLOC: Reusable Object Allocator
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+//
+// All objects that require free-list-backed allocation need to inherit from this type.
+//
+typedef struct ObjectLink_s
+{
+    struct ObjectLink_s* volatile next;
+} ObjectLink;
+
+
+static void ObjectLink_Constructor(ObjectLink* link)
+{
+    assert(link != NULL);
+    link->next = NULL;
+}
+
+
+typedef rmtError (*ObjConstructor)(void*);
+typedef void (*ObjDestructor)(void*);
+
+
+typedef struct
+{
+    // Object create/destroy parameters
+    rmtU32 object_size;
+    ObjConstructor constructor;
+    ObjDestructor destructor;
+
+    // Number of objects in the free list
+    volatile rmtS32 nb_free;
+
+    // Number of objects used by callers
+    volatile rmtS32 nb_inuse;
+
+    // Total allocation count
+    volatile rmtS32 nb_allocated;
+
+    ObjectLink* first_free;
+} ObjectAllocator;
+
+
+static rmtError ObjectAllocator_Constructor(ObjectAllocator* allocator, rmtU32 object_size, ObjConstructor constructor, ObjDestructor destructor)
+{
+    allocator->object_size = object_size;
+    allocator->constructor = constructor;
+    allocator->destructor = destructor;
+    allocator->nb_free = 0;
+    allocator->nb_inuse = 0;
+    allocator->nb_allocated = 0;
+    allocator->first_free = NULL;
+    return RMT_ERROR_NONE;
+}
+
+
+static void ObjectAllocator_Destructor(ObjectAllocator* allocator)
+{
+    // Ensure everything has been released to the allocator
+    assert(allocator != NULL);
+	//GPAC crude patch to avoid deadlock on opengl unbind upon exit
+#if 0
+    assert(allocator->nb_inuse == 0);
+#endif
+
+    // Destroy all objects released to the allocator
+    while (allocator->first_free != NULL)
+    {
+        ObjectLink* next = allocator->first_free->next;
+        assert(allocator->destructor != NULL);
+        allocator->destructor(allocator->first_free);
+        rmtFree(allocator->first_free);
+        allocator->first_free = next;
+    }
+}
+
+
+static void ObjectAllocator_Push(ObjectAllocator* allocator, ObjectLink* start, ObjectLink* end)
+{
+    assert(allocator != NULL);
+    assert(start != NULL);
+    assert(end != NULL);
+
+    // CAS pop add range to the front of the list
+    for (;;)
+    {
+        ObjectLink* old_link = (ObjectLink*)allocator->first_free;
+        end->next = old_link;
+        if (AtomicCompareAndSwapPointer((long* volatile*)&allocator->first_free, (long*)old_link, (long*)start) == RMT_TRUE)
+            break;
+    }
+}
+
+
+static ObjectLink* ObjectAllocator_Pop(ObjectAllocator* allocator)
+{
+    ObjectLink* link;
+
+    assert(allocator != NULL);
+    assert(allocator->first_free != NULL);
+
+    // CAS pop from the front of the list
+    for (;;)
+    {
+        ObjectLink* old_link = (ObjectLink*)allocator->first_free;
+        ObjectLink* next_link = old_link->next;
+        if (AtomicCompareAndSwapPointer((long* volatile*)&allocator->first_free, (long*)old_link, (long*)next_link) == RMT_TRUE)
+        {
+            link = old_link;
+            break;
+        }
+    }
+
+    link->next = NULL;
+
+    return link;
+}
+
+
+static rmtError ObjectAllocator_Alloc(ObjectAllocator* allocator, void** object)
+{
+    // This function only calls the object constructor on initial malloc of an object
+
+    assert(allocator != NULL);
+    assert(object != NULL);
+
+    // Has the free list run out?
+    if (allocator->first_free == NULL)
+    {
+        rmtError error;
+
+        // Allocate/construct a new object
+        void* free_object = rmtMalloc( allocator->object_size );
+        if (free_object == NULL)
+            return RMT_ERROR_MALLOC_FAIL;
+        assert(allocator->constructor != NULL);
+        error = allocator->constructor(free_object);
+        if (error != RMT_ERROR_NONE)
+        {
+            // Auto-teardown on failure
+            assert(allocator->destructor != NULL);
+            allocator->destructor(free_object);
+            rmtFree(free_object);
+            return error;
+        }
+
+        // Add to the free list
+        ObjectAllocator_Push(allocator, (ObjectLink*)free_object, (ObjectLink*)free_object);
+        AtomicAdd(&allocator->nb_allocated, 1);
+        AtomicAdd(&allocator->nb_free, 1);
+    }
+
+    // Pull available objects from the free list
+    *object = ObjectAllocator_Pop(allocator);
+    AtomicSub(&allocator->nb_free, 1);
+    AtomicAdd(&allocator->nb_inuse, 1);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void ObjectAllocator_Free(ObjectAllocator* allocator, void* object)
+{
+    // Add back to the free-list
+    assert(allocator != NULL);
+    ObjectAllocator_Push(allocator, (ObjectLink*)object, (ObjectLink*)object);
+    AtomicSub(&allocator->nb_inuse, 1);
+    AtomicAdd(&allocator->nb_free, 1);
+}
+
+
+static void ObjectAllocator_FreeRange(ObjectAllocator* allocator, void* start, void* end, rmtU32 count)
+{
+    assert(allocator != NULL);
+    ObjectAllocator_Push(allocator, (ObjectLink*)start, (ObjectLink*)end);
+    AtomicSub(&allocator->nb_inuse, count);
+    AtomicAdd(&allocator->nb_free, count);
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @DYNBUF: Dynamic Buffer
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+typedef struct
+{
+    rmtU32 alloc_granularity;
+
+    rmtU32 bytes_allocated;
+    rmtU32 bytes_used;
+
+    rmtU8* data;
+} Buffer;
+
+
+static rmtError Buffer_Constructor(Buffer* buffer, rmtU32 alloc_granularity)
+{
+    assert(buffer != NULL);
+    buffer->alloc_granularity = alloc_granularity;
+    buffer->bytes_allocated = 0;
+    buffer->bytes_used = 0;
+    buffer->data = NULL;
+    return RMT_ERROR_NONE;
+}
+
+
+static void Buffer_Destructor(Buffer* buffer)
+{
+    assert(buffer != NULL);
+
+    if (buffer->data != NULL)
+    {
+        rmtFree(buffer->data);
+        buffer->data = NULL;
+    }
+}
+
+
+static rmtError Buffer_Grow(Buffer* buffer, rmtU32 length)
+{
+    // Calculate size increase rounded up to the requested allocation granularity
+    rmtU32 granularity = buffer->alloc_granularity;
+    rmtU32 allocate = buffer->bytes_allocated + length;
+    allocate = allocate + ((granularity - 1) - ((allocate - 1) % granularity));
+
+    buffer->bytes_allocated = allocate;
+    buffer->data = (rmtU8*)rmtRealloc(buffer->data, buffer->bytes_allocated);
+    if (buffer->data == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError Buffer_Write(Buffer* buffer, const void* data, rmtU32 length)
+{
+    assert(buffer != NULL);
+
+    // Reallocate the buffer on overflow
+    if (buffer->bytes_used + length > buffer->bytes_allocated)
+    {
+        rmtError error = Buffer_Grow(buffer, length);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    }
+    assert(buffer->data != NULL);
+
+    // Copy all bytes
+    memcpy(buffer->data + buffer->bytes_used, data, length);
+    buffer->bytes_used += length;
+
+    return RMT_ERROR_NONE;
+}
+
+static rmtError Buffer_WriteStringZ(Buffer* buffer, rmtPStr string)
+{
+    assert(string != NULL);
+    return Buffer_Write(buffer, (void*)string, (rmtU32)strnlen_s(string, 2048) + 1);
+}
+
+
+static void U32ToByteArray(rmtU8* dest, rmtU32 value)
+{
+    // Commit as little-endian
+    dest[0] = value & 255;
+    dest[1] = (value >> 8) & 255;
+    dest[2] = (value >> 16) & 255;
+    dest[3] = value >> 24;
+}
+
+
+static rmtError Buffer_WriteU32(Buffer* buffer, rmtU32 value)
+{
+    assert(buffer != NULL);
+
+    // Reallocate the buffer on overflow
+    if (buffer->bytes_used + sizeof(value) > buffer->bytes_allocated)
+    {
+        rmtError error = Buffer_Grow(buffer, sizeof(value));
+        if (error != RMT_ERROR_NONE)
+            return error;
+    }
+
+    // Copy all bytes
+    #if RMT_ASSUME_LITTLE_ENDIAN
+        *(rmtU32*)(buffer->data + buffer->bytes_used) = value;
+    #else
+        U32ToByteArray(buffer->data + buffer->bytes_used, value);
+    #endif
+
+    buffer->bytes_used += sizeof(value);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtBool IsLittleEndian()
+{
+    // Not storing this in a global variable allows the compiler to more easily optimise
+    // this away altogether.
+    union
+    {
+        unsigned int i;
+        unsigned char c[sizeof(unsigned int)];
+    } u;
+    u.i = 1;
+    return u.c[0] == 1 ? RMT_TRUE : RMT_FALSE;
+}
+
+
+static rmtError Buffer_WriteU64(Buffer* buffer, rmtU64 value)
+{
+    // Write as a double as Javascript DataView doesn't have a 64-bit integer read
+
+    assert(buffer != NULL);
+
+    // Reallocate the buffer on overflow
+    if (buffer->bytes_used + sizeof(value) > buffer->bytes_allocated)
+    {
+        rmtError error = Buffer_Grow(buffer, sizeof(value));
+        if (error != RMT_ERROR_NONE)
+            return error;
+    }
+
+    // Copy all bytes
+    #if RMT_ASSUME_LITTLE_ENDIAN
+        *(double*)(buffer->data + buffer->bytes_used) = (double)value;
+    #else
+    {
+        union
+        {
+            double d;
+            unsigned char c[sizeof(double)];
+        } u;
+        rmtU8* dest = buffer->data + buffer->bytes_used;
+        u.d = (double)value;
+        if (IsLittleEndian())
+        {
+            dest[0] = u.c[0];
+            dest[1] = u.c[1];
+            dest[2] = u.c[2];
+            dest[3] = u.c[3];
+            dest[4] = u.c[4];
+            dest[5] = u.c[5];
+            dest[6] = u.c[6];
+            dest[7] = u.c[7];
+        }
+        else
+        {
+            dest[0] = u.c[7];
+            dest[1] = u.c[6];
+            dest[2] = u.c[5];
+            dest[3] = u.c[4];
+            dest[4] = u.c[3];
+            dest[5] = u.c[2];
+            dest[6] = u.c[1];
+            dest[7] = u.c[0];
+        }
+    }
+    #endif
+
+    buffer->bytes_used += sizeof(value);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError Buffer_WriteStringWithLength(Buffer* buffer, rmtPStr string)
+{
+    rmtU32 length = (rmtU32)strnlen_s(string, 2048);
+    rmtError error;
+
+    error = Buffer_WriteU32(buffer, length);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    return Buffer_Write(buffer, (void*)string, length);
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @HASHTABLE: Integer pair hash map for inserts/finds. No removes for added simplicity.
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#define RMT_NOT_FOUND 0xFFFFFFFF
+
+
+typedef struct
+{
+    // Non-zero, pre-hashed key
+    rmtU32 key;
+
+    // Value that's not equal to RMT_NOT_FOUND
+    rmtU32 value;
+} HashSlot;
+
+
+typedef struct
+{
+    // Stats
+    rmtU32 max_nb_slots;
+    rmtU32 nb_slots;
+
+    // Data
+    HashSlot* slots;
+} rmtHashTable;
+
+
+static rmtError rmtHashTable_Constructor(rmtHashTable* table, rmtU32 max_nb_slots)
+{
+    // Default initialise
+    assert(table != NULL);
+    table->max_nb_slots = max_nb_slots;
+    table->nb_slots = 0;
+
+    // Allocate and clear the hash slots
+    table->slots = (HashSlot*)rmtMalloc(table->max_nb_slots * sizeof(HashSlot));
+    if (table->slots == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+    memset(table->slots, 0, table->max_nb_slots * sizeof(HashSlot));
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void rmtHashTable_Destructor(rmtHashTable* table)
+{
+    assert(table != NULL);
+
+    if (table->slots != NULL)
+    {
+        rmtFree(table->slots);
+        table->slots = NULL;
+    }
+}
+
+
+static rmtError rmtHashTable_Resize(rmtHashTable* table);
+
+
+static rmtError rmtHashTable_Insert(rmtHashTable* table, rmtU32 key, rmtU32 value)
+{
+    HashSlot* slot = NULL;
+    rmtError error = RMT_ERROR_NONE;
+
+    // Calculate initial slot location for this key
+    rmtU32 index_mask = table->max_nb_slots - 1;
+    rmtU32 index = key & index_mask;
+
+    assert(key != 0);
+    assert(value != RMT_NOT_FOUND);
+
+    // Linear probe for free slot, reusing any existing key matches
+    // There will always be at least one free slot due to load factor management
+    while (table->slots[index].key)
+    {
+        if (table->slots[index].key == key)
+        {
+            // Counter occupied slot increments below
+            table->nb_slots--;
+            break;
+        }
+
+        index = (index + 1) & index_mask;
+    }
+
+    // Just verify that I've got no errors in the code above
+    assert(index < table->max_nb_slots);
+
+    // Add to the table
+    slot = table->slots + index;
+    slot->key = key;
+    slot->value = value;
+    table->nb_slots++;
+
+    // Resize when load factor is greater than 2/3
+    if (table->nb_slots > (table->max_nb_slots * 2) / 3)
+        error = rmtHashTable_Resize(table);
+
+    return error;
+}
+
+
+static rmtError rmtHashTable_Resize(rmtHashTable* table)
+{
+    rmtU32 old_max_nb_slots = table->max_nb_slots;
+    HashSlot* new_slots = NULL;
+    HashSlot* old_slots = table->slots;
+    rmtU32 i;
+
+    // Increase the table size
+    rmtU32 new_max_nb_slots = table->max_nb_slots;
+    if (new_max_nb_slots < 8192 * 4)
+        new_max_nb_slots *= 4;
+    else
+        new_max_nb_slots *= 2;
+
+    // Allocate and clear a new table
+    new_slots = (HashSlot*)rmtMalloc(new_max_nb_slots * sizeof(HashSlot));
+    if (new_slots == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+    memset(new_slots, 0, new_max_nb_slots * sizeof(HashSlot));
+
+    // Update fields of the table after successful allocation only
+    table->slots = new_slots;
+    table->max_nb_slots = new_max_nb_slots;
+    table->nb_slots = 0;
+
+    // Reinsert all objects into the new table
+    for (i = 0; i < old_max_nb_slots; i++)
+    {
+        HashSlot* slot = old_slots + i;
+        if (slot->key != 0)
+            rmtHashTable_Insert(table, slot->key, slot->value);
+    }
+
+    rmtFree(old_slots);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtU32 rmtHashTable_Find(rmtHashTable* table, rmtU32 key)
+{
+    // Calculate initial slot location for this key
+    rmtU32 index_mask = table->max_nb_slots - 1;
+    rmtU32 index = key & index_mask;
+
+    // Linear probe for matching hash
+    while (table->slots[index].key)
+    {
+        HashSlot* slot = table->slots + index;
+
+        if (slot->key == key)
+            return slot->value;
+
+        index = (index + 1) & index_mask;
+    }
+
+    return RMT_NOT_FOUND;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @STRINGTABLE: Map from string hash to string offset in local buffer
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+typedef struct
+{
+    // Growable dynamic array of strings added so far
+    Buffer* text;
+
+    // Map from text hash to text location in the buffer
+    rmtHashTable* text_map;
+} StringTable;
+
+
+static rmtError StringTable_Constructor(StringTable* table)
+{
+    rmtError error;
+
+    // Default initialise
+    assert(table != NULL);
+    table->text = NULL;
+    table->text_map = NULL;
+
+    // Allocate reasonably storage for initial sample names
+
+    New_1(Buffer, table->text, 8 * 1024);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    New_1(rmtHashTable, table->text_map, 1 * 1024);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void StringTable_Destructor(StringTable* table)
+{
+    assert(table != NULL);
+
+    Delete(rmtHashTable, table->text_map);
+    Delete(Buffer, table->text);
+}
+
+
+static rmtPStr StringTable_Find(StringTable* table, rmtU32 name_hash)
+{
+    rmtU32 text_offset = rmtHashTable_Find(table->text_map, name_hash);
+    if (text_offset != RMT_NOT_FOUND)
+        return (rmtPStr)(table->text->data + text_offset);
+    return NULL;
+}
+
+
+static void StringTable_Insert(StringTable* table, rmtU32 name_hash, rmtPStr name)
+{
+    // Only add to the buffer if the string isn't already there
+    rmtU32 text_offset = rmtHashTable_Find(table->text_map, name_hash);
+    if (text_offset == RMT_NOT_FOUND)
+    {
+        // TODO: Allocation errors aren't being passed on to the caller
+        text_offset = table->text->bytes_used;
+        Buffer_WriteStringZ(table->text, name);
+        rmtHashTable_Insert(table->text_map, name_hash, text_offset);
+    }
+}
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @SOCKETS: Sockets TCP/IP Wrapper
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#ifndef RMT_PLATFORM_WINDOWS
+    typedef int SOCKET;
+    #define INVALID_SOCKET -1
+    #define SOCKET_ERROR   -1
+    #define SD_SEND SHUT_WR
+    #define closesocket close
+#endif
+
+
+typedef struct
+{
+    SOCKET socket;
+} TCPSocket;
+
+
+typedef struct
+{
+    rmtBool can_read;
+    rmtBool can_write;
+    rmtError error_state;
+} SocketStatus;
+
+
+//
+// Function prototypes
+//
+static void TCPSocket_Close(TCPSocket* tcp_socket);
+
+
+static rmtError InitialiseNetwork()
+{
+    #ifdef RMT_PLATFORM_WINDOWS
+
+        WSADATA wsa_data;
+        if (WSAStartup(MAKEWORD(2, 2), &wsa_data))
+            return RMT_ERROR_SOCKET_INIT_NETWORK_FAIL;
+        if (LOBYTE(wsa_data.wVersion) != 2 || HIBYTE(wsa_data.wVersion) != 2)
+            return RMT_ERROR_SOCKET_INIT_NETWORK_FAIL;
+
+        return RMT_ERROR_NONE;
+
+    #else
+
+        return RMT_ERROR_NONE;
+
+    #endif
+}
+
+
+static void ShutdownNetwork()
+{
+    #ifdef RMT_PLATFORM_WINDOWS
+        WSACleanup();
+    #endif
+}
+
+
+static rmtError TCPSocket_Constructor(TCPSocket* tcp_socket)
+{
+    assert(tcp_socket != NULL);
+    tcp_socket->socket = INVALID_SOCKET;
+    return InitialiseNetwork();
+}
+
+
+static void TCPSocket_Destructor(TCPSocket* tcp_socket)
+{
+    assert(tcp_socket != NULL);
+    TCPSocket_Close(tcp_socket);
+    ShutdownNetwork();
+}
+
+
+static rmtError TCPSocket_RunServer(TCPSocket* tcp_socket, rmtU16 port, rmtBool reuse_open_port, rmtBool limit_connections_to_localhost)
+{
+    SOCKET s = INVALID_SOCKET;
+    struct sockaddr_in sin;
+    #ifdef RMT_PLATFORM_WINDOWS
+        u_long nonblock = 1;
+    #endif
+
+    memset(&sin, 0, sizeof(sin) );
+    assert(tcp_socket != NULL);
+
+    // Try to create the socket
+    s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (s == SOCKET_ERROR)
+        return RMT_ERROR_SOCKET_CREATE_FAIL;
+
+    if (reuse_open_port)
+    {
+        int enable = 1;
+
+        // set SO_REUSEADDR so binding doesn't fail when restarting the application
+        // (otherwise the same port can't be reused within TIME_WAIT)
+        // I'm not checking for errors because if this fails (unlikely) we might still
+        // be able to bind to the socket anyway
+        #ifdef RMT_PLATFORM_POSIX
+            setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable));
+        #elif defined(RMT_PLATFORM_WINDOWS)
+            // windows also needs SO_EXCLUSEIVEADDRUSE,
+            // see http://www.andy-pearce.com/blog/posts/2013/Feb/so_reuseaddr-on-windows/
+            setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&enable, sizeof(enable));
+            enable = 1;
+            setsockopt(s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char *)&enable, sizeof(enable));
+        #endif
+    }
+
+    // Bind the socket to the incoming port
+    sin.sin_family = AF_INET;
+    sin.sin_addr.s_addr = htonl(limit_connections_to_localhost ? INADDR_LOOPBACK : INADDR_ANY);
+    sin.sin_port = htons(port);
+    if (bind(s, (struct sockaddr*)&sin, sizeof(sin)) == SOCKET_ERROR)
+        return RMT_ERROR_SOCKET_BIND_FAIL;
+
+    // Connection is valid, remaining code is socket state modification
+    tcp_socket->socket = s;
+
+    // Enter a listening state with a backlog of 1 connection
+    if (listen(s, 1) == SOCKET_ERROR)
+        return RMT_ERROR_SOCKET_LISTEN_FAIL;
+
+    // Set as non-blocking
+    #ifdef RMT_PLATFORM_WINDOWS
+        if (ioctlsocket(tcp_socket->socket, FIONBIO, &nonblock) == SOCKET_ERROR)
+            return RMT_ERROR_SOCKET_SET_NON_BLOCKING_FAIL;
+    #else
+        if (fcntl(tcp_socket->socket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR)
+            return RMT_ERROR_SOCKET_SET_NON_BLOCKING_FAIL;
+    #endif
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void TCPSocket_Close(TCPSocket* tcp_socket)
+{
+    assert(tcp_socket != NULL);
+
+    if (tcp_socket->socket != INVALID_SOCKET)
+    {
+        // Shutdown the connection, stopping all sends
+        int result = shutdown(tcp_socket->socket, SD_SEND);
+        if (result != SOCKET_ERROR)
+        {
+            // Keep receiving until the peer closes the connection
+            int total = 0;
+            char temp_buf[128];
+            while (result > 0)
+            {
+                result = (int)recv(tcp_socket->socket, temp_buf, sizeof(temp_buf), 0);
+                total += result;
+            }
+        }
+
+        // Close the socket and issue a network shutdown request
+        closesocket(tcp_socket->socket);
+        tcp_socket->socket = INVALID_SOCKET;
+    }
+}
+
+
+static SocketStatus TCPSocket_PollStatus(TCPSocket* tcp_socket)
+{
+    SocketStatus status;
+    fd_set fd_read, fd_write, fd_errors;
+    struct timeval tv;
+
+    status.can_read = RMT_FALSE;
+    status.can_write = RMT_FALSE;
+    status.error_state = RMT_ERROR_NONE;
+
+    assert(tcp_socket != NULL);
+    if (tcp_socket->socket == INVALID_SOCKET)
+    {
+        status.error_state = RMT_ERROR_SOCKET_INVALID_POLL;
+        return status;
+    }
+
+    // Set read/write/error markers for the socket
+    FD_ZERO(&fd_read);
+    FD_ZERO(&fd_write);
+    FD_ZERO(&fd_errors);
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable:4127) // warning C4127: conditional expression is constant
+#endif // _MSC_VER
+    FD_SET(tcp_socket->socket, &fd_read);
+    FD_SET(tcp_socket->socket, &fd_write);
+    FD_SET(tcp_socket->socket, &fd_errors);
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif // _MSC_VER
+
+    // Poll socket status without blocking
+    tv.tv_sec = 0;
+    tv.tv_usec = 0;
+    if (select(((int)tcp_socket->socket)+1, &fd_read, &fd_write, &fd_errors, &tv) == SOCKET_ERROR)
+    {
+        status.error_state = RMT_ERROR_SOCKET_SELECT_FAIL;
+        return status;
+    }
+
+    status.can_read = FD_ISSET(tcp_socket->socket, &fd_read) != 0 ? RMT_TRUE : RMT_FALSE;
+    status.can_write = FD_ISSET(tcp_socket->socket, &fd_write) != 0 ? RMT_TRUE : RMT_FALSE;
+    status.error_state = FD_ISSET(tcp_socket->socket, &fd_errors) != 0 ? RMT_ERROR_SOCKET_POLL_ERRORS : RMT_ERROR_NONE;
+    return status;
+}
+
+
+static rmtError TCPSocket_AcceptConnection(TCPSocket* tcp_socket, TCPSocket** client_socket)
+{
+    SocketStatus status;
+    SOCKET s;
+    rmtError error;
+
+    // Ensure there is an incoming connection
+    assert(tcp_socket != NULL);
+    status = TCPSocket_PollStatus(tcp_socket);
+    if (status.error_state != RMT_ERROR_NONE || !status.can_read)
+        return status.error_state;
+
+    // Accept the connection
+    s = accept(tcp_socket->socket, 0, 0);
+    if (s == SOCKET_ERROR)
+        return RMT_ERROR_SOCKET_ACCEPT_FAIL;
+
+#ifdef SO_NOSIGPIPE
+    // On POSIX systems, send() may send a SIGPIPE signal when writing to an
+    // already closed connection. By setting this option, we prevent the
+    // signal from being emitted and send will instead return an error and set
+    // errno to EPIPE.
+    //
+    // This is supported on BSD platforms and not on Linux.
+    {
+        int flag = 1;
+        setsockopt(s, SOL_SOCKET, SO_NOSIGPIPE, &flag, sizeof(flag));
+    }
+#endif
+    // Create a client socket for the new connection
+    assert(client_socket != NULL);
+    New_0(TCPSocket, *client_socket);
+    if (error != RMT_ERROR_NONE)
+        return error;
+    (*client_socket)->socket = s;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static int TCPSocketWouldBlock()
+{
+#ifdef RMT_PLATFORM_WINDOWS
+    DWORD error = WSAGetLastError();
+    return (error == WSAEWOULDBLOCK);
+ #else
+    int error = errno;
+    return (error == EAGAIN || error == EWOULDBLOCK);
+#endif
+
+}
+
+
+static rmtError TCPSocket_Send(TCPSocket* tcp_socket, const void* data, rmtU32 length, rmtU32 timeout_ms)
+{
+    SocketStatus status;
+    char* cur_data = NULL;
+    char* end_data = NULL;
+    rmtU32 start_ms = 0;
+    rmtU32 cur_ms = 0;
+
+    assert(tcp_socket != NULL);
+
+    start_ms = msTimer_Get();
+
+    // Loop until timeout checking whether data can be written
+    status.can_write = RMT_FALSE;
+    while (!status.can_write)
+    {
+        status = TCPSocket_PollStatus(tcp_socket);
+        if (status.error_state != RMT_ERROR_NONE)
+            return status.error_state;
+
+        cur_ms = msTimer_Get();
+        if (cur_ms - start_ms > timeout_ms)
+            return RMT_ERROR_SOCKET_SEND_TIMEOUT;
+    }
+
+    cur_data = (char*)data;
+    end_data = cur_data + length;
+
+    while (cur_data < end_data)
+    {
+        // Attempt to send the remaining chunk of data
+        int bytes_sent;
+        int send_flags = 0;
+#ifdef MSG_NOSIGNAL
+        // On Linux this prevents send from emitting a SIGPIPE signal
+        // Equivalent on BSD to the SO_NOSIGPIPE option.
+        send_flags = MSG_NOSIGNAL;
+#endif
+        bytes_sent = (int)send(tcp_socket->socket, cur_data, (int)(end_data - cur_data), send_flags);
+
+        if (bytes_sent == SOCKET_ERROR || bytes_sent == 0)
+        {
+            // Close the connection if sending fails for any other reason other than blocking
+            if (bytes_sent != 0 && !TCPSocketWouldBlock())
+                return RMT_ERROR_SOCKET_SEND_FAIL;
+
+            // First check for tick-count overflow and reset, giving a slight hitch every 49.7 days
+            cur_ms = msTimer_Get();
+            if (cur_ms < start_ms)
+            {
+                start_ms = cur_ms;
+                continue;
+            }
+
+            //
+            // Timeout can happen when:
+            //
+            //    1) endpoint is no longer there
+            //    2) endpoint can't consume quick enough
+            //    3) local buffers overflow
+            //
+            // As none of these are actually errors, we have to pass this timeout back to the caller.
+            //
+            // TODO: This strategy breaks down if a send partially completes and then times out!
+            //
+            if (cur_ms - start_ms > timeout_ms)
+            {
+                return RMT_ERROR_SOCKET_SEND_TIMEOUT;
+            }
+        }
+        else
+        {
+            // Jump over the data sent
+            cur_data += bytes_sent;
+        }
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError TCPSocket_Receive(TCPSocket* tcp_socket, void* data, rmtU32 length, rmtU32 timeout_ms)
+{
+    SocketStatus status;
+    char* cur_data = NULL;
+    char* end_data = NULL;
+    rmtU32 start_ms = 0;
+    rmtU32 cur_ms = 0;
+
+    assert(tcp_socket != NULL);
+
+    // Ensure there is data to receive
+    status = TCPSocket_PollStatus(tcp_socket);
+    if (status.error_state != RMT_ERROR_NONE)
+        return status.error_state;
+    if (!status.can_read)
+        return RMT_ERROR_SOCKET_RECV_NO_DATA;
+
+    cur_data = (char*)data;
+    end_data = cur_data + length;
+
+    // Loop until all data has been received
+    start_ms = msTimer_Get();
+    while (cur_data < end_data)
+    {
+        int bytes_received = (int)recv(tcp_socket->socket, cur_data, (int)(end_data - cur_data), 0);
+
+        if (bytes_received == SOCKET_ERROR || bytes_received == 0)
+        {
+            // Close the connection if receiving fails for any other reason other than blocking
+            if (bytes_received != 0 && !TCPSocketWouldBlock())
+                return RMT_ERROR_SOCKET_RECV_FAILED;
+
+            // First check for tick-count overflow and reset, giving a slight hitch every 49.7 days
+            cur_ms = msTimer_Get();
+            if (cur_ms < start_ms)
+            {
+                start_ms = cur_ms;
+                continue;
+            }
+
+            //
+            // Timeout can happen when:
+            //
+            //    1) data is delayed by sender
+            //    2) sender fails to send a complete set of packets
+            //
+            // As not all of these scenarios are errors, we need to pass this information back to the caller.
+            //
+            // TODO: This strategy breaks down if a receive partially completes and then times out!
+            //
+            if (cur_ms - start_ms > timeout_ms)
+            {
+                return RMT_ERROR_SOCKET_RECV_TIMEOUT;
+            }
+        }
+        else
+        {
+            // Jump over the data received
+            cur_data += bytes_received;
+        }
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @SHA1: SHA-1 Cryptographic Hash Function
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+//
+// Typed to allow enforced data size specification
+//
+typedef struct
+{
+    rmtU8 data[20];
+} SHA1;
+
+
+/*
+ Copyright (c) 2011, Micael Hildenborg
+ 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 Micael Hildenborg 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 Micael Hildenborg ''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 Micael Hildenborg 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.
+ */
+
+/*
+ Contributors:
+ Gustav
+ Several members in the gamedev.se forum.
+ Gregory Petrosyan
+ */
+
+
+// Rotate an integer value to left.
+static unsigned int rol(const unsigned int value, const unsigned int steps)
+{
+    return ((value << steps) | (value >> (32 - steps)));
+}
+
+
+// Sets the first 16 integers in the buffert to zero.
+// Used for clearing the W buffert.
+static void clearWBuffert(unsigned int* buffert)
+{
+    int pos;
+    for (pos = 16; --pos >= 0;)
+    {
+        buffert[pos] = 0;
+    }
+}
+
+static void innerHash(unsigned int* result, unsigned int* w)
+{
+    unsigned int a = result[0];
+    unsigned int b = result[1];
+    unsigned int c = result[2];
+    unsigned int d = result[3];
+    unsigned int e = result[4];
+
+    int round = 0;
+
+    #define sha1macro(func,val) \
+    { \
+        const unsigned int t = rol(a, 5) + (func) + e + val + w[round]; \
+        e = d; \
+        d = c; \
+        c = rol(b, 30); \
+        b = a; \
+        a = t; \
+    }
+
+    while (round < 16)
+    {
+        sha1macro((b & c) | (~b & d), 0x5a827999)
+        ++round;
+    }
+    while (round < 20)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro((b & c) | (~b & d), 0x5a827999)
+        ++round;
+    }
+    while (round < 40)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro(b ^ c ^ d, 0x6ed9eba1)
+        ++round;
+    }
+    while (round < 60)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro((b & c) | (b & d) | (c & d), 0x8f1bbcdc)
+        ++round;
+    }
+    while (round < 80)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro(b ^ c ^ d, 0xca62c1d6)
+        ++round;
+    }
+
+    #undef sha1macro
+
+    result[0] += a;
+    result[1] += b;
+    result[2] += c;
+    result[3] += d;
+    result[4] += e;
+}
+
+
+static void calc(const void* src, const int bytelength, unsigned char* hash)
+{
+    int roundPos;
+    int lastBlockBytes;
+    int hashByte;
+
+    // Init the result array.
+    unsigned int result[5] = { 0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476, 0xc3d2e1f0 };
+
+    // Cast the void src pointer to be the byte array we can work with.
+    const unsigned char* sarray = (const unsigned char*) src;
+
+    // The reusable round buffer
+    unsigned int w[80];
+
+    // Loop through all complete 64byte blocks.
+    const int endOfFullBlocks = bytelength - 64;
+    int endCurrentBlock;
+    int currentBlock = 0;
+
+    while (currentBlock <= endOfFullBlocks)
+    {
+        endCurrentBlock = currentBlock + 64;
+
+        // Init the round buffer with the 64 byte block data.
+        for (roundPos = 0; currentBlock < endCurrentBlock; currentBlock += 4)
+        {
+            // This line will swap endian on big endian and keep endian on little endian.
+            w[roundPos++] = (unsigned int) sarray[currentBlock + 3]
+                | (((unsigned int) sarray[currentBlock + 2]) << 8)
+                | (((unsigned int) sarray[currentBlock + 1]) << 16)
+                | (((unsigned int) sarray[currentBlock]) << 24);
+        }
+        innerHash(result, w);
+    }
+
+    // Handle the last and not full 64 byte block if existing.
+    endCurrentBlock = bytelength - currentBlock;
+    clearWBuffert(w);
+    lastBlockBytes = 0;
+    for (;lastBlockBytes < endCurrentBlock; ++lastBlockBytes)
+    {
+        w[lastBlockBytes >> 2] |= (unsigned int) sarray[lastBlockBytes + currentBlock] << ((3 - (lastBlockBytes & 3)) << 3);
+    }
+    w[lastBlockBytes >> 2] |= 0x80U << ((3 - (lastBlockBytes & 3)) << 3);
+    if (endCurrentBlock >= 56)
+    {
+        innerHash(result, w);
+        clearWBuffert(w);
+    }
+    w[15] = bytelength << 3;
+    innerHash(result, w);
+
+    // Store hash in result pointer, and make sure we get in in the correct order on both endian models.
+    for (hashByte = 20; --hashByte >= 0;)
+    {
+        hash[hashByte] = (result[hashByte >> 2] >> (((3 - hashByte) & 0x3) << 3)) & 0xff;
+    }
+}
+
+
+static SHA1 SHA1_Calculate(const void* src, unsigned int length)
+{
+    SHA1 hash;
+    assert((int)length >= 0);
+    calc(src, length, hash.data);
+    return hash;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @BASE64: Base-64 encoder
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+static const char* b64_encoding_table =
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        "abcdefghijklmnopqrstuvwxyz"
+        "0123456789+/";
+
+
+static rmtU32 Base64_CalculateEncodedLength(rmtU32 length)
+{
+    // ceil(l * 4/3)
+    return 4 * ((length + 2) / 3);
+}
+
+
+static void Base64_Encode(const rmtU8* in_bytes, rmtU32 length, rmtU8* out_bytes)
+{
+    rmtU32 i;
+    rmtU32 encoded_length;
+    rmtU32 remaining_bytes;
+
+    rmtU8* optr = out_bytes;
+
+    for (i = 0; i < length; )
+    {
+        // Read input 3 values at a time, null terminating
+        rmtU32 c0 = i < length ? in_bytes[i++] : 0;
+        rmtU32 c1 = i < length ? in_bytes[i++] : 0;
+        rmtU32 c2 = i < length ? in_bytes[i++] : 0;
+
+        // Encode 4 bytes for ever 3 input bytes
+        rmtU32 triple = (c0 << 0x10) + (c1 << 0x08) + c2;
+        *optr++ = b64_encoding_table[(triple >> 3 * 6) & 0x3F];
+        *optr++ = b64_encoding_table[(triple >> 2 * 6) & 0x3F];
+        *optr++ = b64_encoding_table[(triple >> 1 * 6) & 0x3F];
+        *optr++ = b64_encoding_table[(triple >> 0 * 6) & 0x3F];
+    }
+
+    // Pad output to multiple of 3 bytes with terminating '='
+    encoded_length = Base64_CalculateEncodedLength(length);
+    remaining_bytes = (3 - ((length + 2) % 3)) - 1;
+    for (i = 0; i < remaining_bytes; i++)
+        out_bytes[encoded_length - 1 - i] = '=';
+
+    // Null terminate
+    out_bytes[encoded_length] = 0;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @MURMURHASH: MurmurHash3
+   https://code.google.com/p/smhasher
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+//-----------------------------------------------------------------------------
+// MurmurHash3 was written by Austin Appleby, and is placed in the public
+// domain. The author hereby disclaims copyright to this source code.
+//-----------------------------------------------------------------------------
+
+
+static rmtU32 rotl32(rmtU32 x, rmtS8 r)
+{
+    return (x << r) | (x >> (32 - r));
+}
+
+
+// Block read - if your platform needs to do endian-swapping, do the conversion here
+static rmtU32 getblock32(const rmtU32* p, int i)
+{
+    rmtU32 result;
+    const rmtU8 *src = ((const rmtU8 *)p) + i * sizeof(rmtU32);
+    memcpy(&result, src, sizeof(result));
+    return result;
+}
+
+
+// Finalization mix - force all bits of a hash block to avalanche
+static rmtU32 fmix32(rmtU32 h)
+{
+    h ^= h >> 16;
+    h *= 0x85ebca6b;
+    h ^= h >> 13;
+    h *= 0xc2b2ae35;
+    h ^= h >> 16;
+    return h;
+}
+
+
+static rmtU32 MurmurHash3_x86_32(const void* key, int len, rmtU32 seed)
+{
+    const rmtU8* data = (const rmtU8*)key;
+    const int nblocks = len / 4;
+
+    rmtU32 h1 = seed;
+
+    const rmtU32 c1 = 0xcc9e2d51;
+    const rmtU32 c2 = 0x1b873593;
+
+    int i;
+
+    const rmtU32 * blocks = (const rmtU32 *)(data + nblocks*4);
+    const rmtU8 * tail = (const rmtU8*)(data + nblocks*4);
+
+    rmtU32 k1 = 0;
+
+    //----------
+    // body
+
+    for (i = -nblocks; i; i++)
+    {
+        rmtU32 k2 = getblock32(blocks,i);
+
+        k2 *= c1;
+        k2 = rotl32(k2,15);
+        k2 *= c2;
+
+        h1 ^= k2;
+        h1 = rotl32(h1,13);
+        h1 = h1*5+0xe6546b64;
+    }
+
+    //----------
+    // tail
+
+    switch(len & 3)
+    {
+    case 3: k1 ^= tail[2] << 16; // fallthrough
+    case 2: k1 ^= tail[1] << 8;  // fallthrough
+    case 1: k1 ^= tail[0];
+        k1 *= c1;
+        k1 = rotl32(k1,15);
+        k1 *= c2;
+        h1 ^= k1;
+    };
+
+    //----------
+    // finalization
+
+    h1 ^= len;
+
+    h1 = fmix32(h1);
+
+    return h1;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @WEBSOCKETS: WebSockets
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+enum WebSocketMode
+{
+    WEBSOCKET_NONE = 0,
+    WEBSOCKET_TEXT = 1,
+    WEBSOCKET_BINARY = 2,
+};
+
+
+typedef struct
+{
+    TCPSocket* tcp_socket;
+
+    enum WebSocketMode mode;
+
+    rmtU32 frame_bytes_remaining;
+    rmtU32 mask_offset;
+
+    union
+    {
+        rmtU8 mask[4];
+        rmtU32 mask_u32;
+    } data;
+
+} WebSocket;
+
+
+static void WebSocket_Close(WebSocket* web_socket);
+
+
+static char* GetField(char* buffer, r_size_t buffer_length, rmtPStr field_name)
+{
+    char* field = NULL;
+    char* buffer_end = buffer + buffer_length - 1;
+
+    r_size_t field_length = strnlen_s(field_name, buffer_length);
+    if (field_length == 0)
+        return NULL;
+
+    // Search for the start of the field
+    if (strstr_s(buffer, buffer_length, field_name, field_length, &field) != EOK)
+        return NULL;
+
+    // Field name is now guaranteed to be in the buffer so its safe to jump over it without hitting the bounds
+    field += strlen(field_name);
+
+    // Skip any trailing whitespace
+    while (*field == ' ')
+    {
+        if (field >= buffer_end)
+            return NULL;
+        field++;
+    }
+
+    return field;
+}
+
+
+static const char websocket_guid[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+static const char websocket_response[] =
+    "HTTP/1.1 101 Switching Protocols\r\n"
+    "Upgrade: websocket\r\n"
+    "Connection: Upgrade\r\n"
+    "Sec-WebSocket-Accept: ";
+
+
+static rmtError WebSocketHandshake(TCPSocket* tcp_socket, rmtPStr limit_host)
+{
+    rmtU32 start_ms, now_ms;
+
+    // Parsing scratchpad
+    char buffer[1024];
+    char* buffer_ptr = buffer;
+    int buffer_len = sizeof(buffer) - 1;
+    char* buffer_end = buffer + buffer_len;
+
+    char response_buffer[256];
+    int response_buffer_len = sizeof(response_buffer) - 1;
+
+    char* version;
+    char* host;
+    char* key;
+    char* key_end;
+    SHA1 hash;
+
+    assert(tcp_socket != NULL);
+
+    start_ms = msTimer_Get();
+
+    // Really inefficient way of receiving the handshake data from the browser
+    // Not really sure how to do this any better, as the termination requirement is \r\n\r\n
+    while (buffer_ptr - buffer < buffer_len)
+    {
+        rmtError error = TCPSocket_Receive(tcp_socket, buffer_ptr, 1, 20);
+        if (error == RMT_ERROR_SOCKET_RECV_FAILED)
+            return error;
+
+        // If there's a stall receiving the data, check for a handshake timeout
+        if (error == RMT_ERROR_SOCKET_RECV_NO_DATA || error == RMT_ERROR_SOCKET_RECV_TIMEOUT)
+        {
+            now_ms = msTimer_Get();
+            if (now_ms - start_ms > 1000)
+                return RMT_ERROR_SOCKET_RECV_TIMEOUT;
+
+            continue;
+        }
+
+        // Just in case new enums are added...
+        assert(error == RMT_ERROR_NONE);
+
+        if (buffer_ptr - buffer >= 4)
+        {
+            if (*(buffer_ptr - 3) == '\r' &&
+                *(buffer_ptr - 2) == '\n' &&
+                *(buffer_ptr - 1) == '\r' &&
+                *(buffer_ptr - 0) == '\n')
+                break;
+        }
+
+        buffer_ptr++;
+    }
+    *buffer_ptr = 0;
+
+    // HTTP GET instruction
+    if (memcmp(buffer, "GET", 3) != 0)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_NOT_GET;
+
+    // Look for the version number and verify that it's supported
+    version = GetField(buffer, buffer_len, "Sec-WebSocket-Version:");
+    if (version == NULL)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_VERSION;
+    if (buffer_end - version < 2 || (version[0] != '8' && (version[0] != '1' || version[1] != '3')))
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_VERSION;
+
+    // Make sure this connection comes from a known host
+    host = GetField(buffer, buffer_len, "Host:");
+    if (host == NULL)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_HOST;
+    if (limit_host != NULL)
+    {
+        r_size_t limit_host_len = strnlen_s(limit_host, 128);
+        char* found = NULL;
+        if (strstr_s(host, (r_size_t) ( buffer_end - host), limit_host, limit_host_len, &found) != EOK)
+            return RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_HOST;
+    }
+
+    // Look for the key start and null-terminate it within the receive buffer
+    key = GetField(buffer, buffer_len, "Sec-WebSocket-Key:");
+    if (key == NULL)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_NO_KEY;
+    if (strstr_s(key, (r_size_t) ( buffer_end - key), "\r\n", 2, &key_end) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_BAD_KEY;
+    *key_end = 0;
+
+    // Concatenate the browser's key with the WebSocket Protocol GUID and base64 encode
+    // the hash, to prove to the browser that this is a bonafide WebSocket server
+    buffer[0] = 0;
+    if (strncat_s(buffer, buffer_len, key, (r_size_t) ( key_end - key) ) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL;
+    if (strncat_s(buffer, buffer_len, websocket_guid, sizeof(websocket_guid)) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL;
+    hash = SHA1_Calculate(buffer, (rmtU32)strnlen_s(buffer, buffer_len));
+    Base64_Encode(hash.data, sizeof(hash.data), (rmtU8*)buffer);
+
+    // Send the response back to the server with a longer timeout than usual
+    response_buffer[0] = 0;
+    if (strncat_s(response_buffer, response_buffer_len, websocket_response, sizeof(websocket_response)) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL;
+    if (strncat_s(response_buffer, response_buffer_len, buffer, buffer_len) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL;
+    if (strncat_s(response_buffer, response_buffer_len, "\r\n\r\n", 4) != EOK)
+        return RMT_ERROR_WEBSOCKET_HANDSHAKE_STRING_FAIL;
+
+    return TCPSocket_Send(tcp_socket, response_buffer, (rmtU32)strnlen_s(response_buffer, response_buffer_len), 1000);
+}
+
+
+static rmtError WebSocket_Constructor(WebSocket* web_socket, TCPSocket* tcp_socket)
+{
+    rmtError error = RMT_ERROR_NONE;
+
+    assert(web_socket != NULL);
+    web_socket->tcp_socket = tcp_socket;
+    web_socket->mode = WEBSOCKET_NONE;
+    web_socket->frame_bytes_remaining = 0;
+    web_socket->mask_offset = 0;
+    web_socket->data.mask[0] = 0;
+    web_socket->data.mask[1] = 0;
+    web_socket->data.mask[2] = 0;
+    web_socket->data.mask[3] = 0;
+
+    // Caller can optionally specify which TCP socket to use
+    if (web_socket->tcp_socket == NULL)
+        New_0(TCPSocket, web_socket->tcp_socket);
+
+    return error;
+}
+
+
+static void WebSocket_Destructor(WebSocket* web_socket)
+{
+    WebSocket_Close(web_socket);
+}
+
+
+static rmtError WebSocket_RunServer(WebSocket* web_socket, rmtU16 port, rmtBool reuse_open_port, rmtBool limit_connections_to_localhost, enum WebSocketMode mode)
+{
+    // Create the server's listening socket
+    assert(web_socket != NULL);
+    web_socket->mode = mode;
+    return TCPSocket_RunServer(web_socket->tcp_socket, port, reuse_open_port, limit_connections_to_localhost);
+}
+
+
+static void WebSocket_Close(WebSocket* web_socket)
+{
+    assert(web_socket != NULL);
+    Delete(TCPSocket, web_socket->tcp_socket);
+}
+
+
+static SocketStatus WebSocket_PollStatus(WebSocket* web_socket)
+{
+    assert(web_socket != NULL);
+    return TCPSocket_PollStatus(web_socket->tcp_socket);
+}
+
+
+static rmtError WebSocket_AcceptConnection(WebSocket* web_socket, WebSocket** client_socket)
+{
+    TCPSocket* tcp_socket = NULL;
+    rmtError error;
+
+    // Is there a waiting connection?
+    assert(web_socket != NULL);
+    error = TCPSocket_AcceptConnection(web_socket->tcp_socket, &tcp_socket);
+    if (error != RMT_ERROR_NONE || tcp_socket == NULL)
+        return error;
+
+    // Need a successful handshake between client/server before allowing the connection
+    // TODO: Specify limit_host
+    error = WebSocketHandshake(tcp_socket, NULL);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Allocate and return a new client socket
+    assert(client_socket != NULL);
+    New_1(WebSocket, *client_socket, tcp_socket);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    (*client_socket)->mode = web_socket->mode;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void WriteSize(rmtU32 size, rmtU8* dest, rmtU32 dest_size, rmtU32 dest_offset)
+{
+    int size_size = dest_size - dest_offset;
+    rmtU32 i;
+    for (i = 0; i < dest_size; i++)
+    {
+        int j = i - dest_offset;
+        dest[i] = (j < 0) ? 0 : (size >> ((size_size - j - 1) * 8)) & 0xFF;
+    }
+}
+
+
+// For send buffers to preallocate
+#define WEBSOCKET_MAX_FRAME_HEADER_SIZE 10
+
+
+static void WebSocket_PrepareBuffer(Buffer* buffer)
+{
+    char empty_frame_header[WEBSOCKET_MAX_FRAME_HEADER_SIZE];
+
+    assert(buffer != NULL);
+ 
+    // Reset to start
+    buffer->bytes_used = 0;
+ 
+    // Allocate enough space for a maximum-sized frame header
+    Buffer_Write(buffer, empty_frame_header, sizeof(empty_frame_header));
+}
+
+
+static rmtU32 WebSocket_FrameHeaderSize(rmtU32 length)
+{
+    if (length <= 125)
+        return 2;
+    if (length <= 65535)
+        return 4;
+    return 10;
+}
+
+
+static void WebSocket_WriteFrameHeader(WebSocket* web_socket, rmtU8* dest, rmtU32 length)
+{
+    rmtU8 final_fragment = 0x1 << 7;
+    rmtU8 frame_type = (rmtU8)web_socket->mode;
+
+    dest[0] = final_fragment | frame_type;
+ 
+     // Construct the frame header, correctly applying the narrowest size
+     if (length <= 125)
+     {
+        dest[1] = (rmtU8)length;
+     }
+     else if (length <= 65535)
+     {
+        dest[1] = 126;
+        WriteSize(length, dest + 2, 2, 0);
+     }
+     else
+     {
+        dest[1] = 127;
+        WriteSize(length, dest + 2, 8, 4);
+     }
+}
+
+
+static rmtError WebSocket_Send(WebSocket* web_socket, const void* data, rmtU32 length, rmtU32 timeout_ms)
+{
+    rmtError error;
+    SocketStatus status;
+    rmtU32 payload_length, frame_header_size, delta;
+
+    assert(web_socket != NULL);
+    assert(data != NULL);
+
+    // Can't send if there are socket errors
+    status = WebSocket_PollStatus(web_socket);
+    if (status.error_state != RMT_ERROR_NONE)
+        return status.error_state;
+
+    // Assume space for max frame header has been allocated in the incoming data
+    payload_length = length - WEBSOCKET_MAX_FRAME_HEADER_SIZE;
+    frame_header_size = WebSocket_FrameHeaderSize(payload_length);
+    delta = WEBSOCKET_MAX_FRAME_HEADER_SIZE - frame_header_size;
+    data = (void*)((rmtU8*)data + delta);
+    length -= delta;
+    WebSocket_WriteFrameHeader(web_socket, (rmtU8*)data, payload_length);
+
+    // Send frame header and data together
+    error = TCPSocket_Send(web_socket->tcp_socket, data, length, timeout_ms);
+    return error;
+}
+
+
+static rmtError ReceiveFrameHeader(WebSocket* web_socket)
+{
+    // TODO: Specify infinite timeout?
+
+    rmtError error;
+    rmtU8 msg_header[2] = { 0, 0 };
+    int msg_length, size_bytes_remaining;
+    rmtBool mask_present;
+
+    assert(web_socket != NULL);
+
+    // Get message header
+    error = TCPSocket_Receive(web_socket->tcp_socket, msg_header, 2, 20);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Check for WebSocket Protocol disconnect
+    if (msg_header[0] == 0x88)
+        return RMT_ERROR_WEBSOCKET_DISCONNECTED;
+
+    // Check that the client isn't sending messages we don't understand
+    if (msg_header[0] != 0x81 && msg_header[0] != 0x82)
+        return RMT_ERROR_WEBSOCKET_BAD_FRAME_HEADER;
+
+    // Get message length and check to see if it's a marker for a wider length
+    msg_length = msg_header[1] & 0x7F;
+    size_bytes_remaining = 0;
+    switch (msg_length)
+    {
+        case 126: size_bytes_remaining = 2; break;
+        case 127: size_bytes_remaining = 8; break;
+    }
+
+    if (size_bytes_remaining > 0)
+    {
+    	int i;
+        // Receive the wider bytes of the length
+        rmtU8 size_bytes[8];
+        error = TCPSocket_Receive(web_socket->tcp_socket, size_bytes, size_bytes_remaining, 20);
+        if (error != RMT_ERROR_NONE)
+            return RMT_ERROR_WEBSOCKET_BAD_FRAME_HEADER_SIZE;
+
+        // Calculate new length, MSB first
+        msg_length = 0;
+        for (i = 0; i < size_bytes_remaining; i++)
+            msg_length |= size_bytes[i] << ((size_bytes_remaining - 1 - i) * 8);
+    }
+
+    // Receive any message data masks
+    mask_present = (msg_header[1] & 0x80) != 0 ? RMT_TRUE : RMT_FALSE;
+    if (mask_present)
+    {
+        error = TCPSocket_Receive(web_socket->tcp_socket, web_socket->data.mask, 4, 20);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    }
+
+    web_socket->frame_bytes_remaining = msg_length;
+    web_socket->mask_offset = 0;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError WebSocket_Receive(WebSocket* web_socket, void* data, rmtU32* msg_len, rmtU32 length, rmtU32 timeout_ms)
+{
+    SocketStatus status;
+    char* cur_data;
+    char* end_data;
+    rmtU32 start_ms, now_ms;
+    rmtU32 bytes_to_read;
+    rmtError error;
+
+    assert(web_socket != NULL);
+
+    // Can't read with any socket errors
+    status = WebSocket_PollStatus(web_socket);
+    if (status.error_state != RMT_ERROR_NONE)
+        return status.error_state;
+
+    cur_data = (char*)data;
+    end_data = cur_data + length;
+
+    start_ms = msTimer_Get();
+    while (cur_data < end_data)
+    {
+        // Get next WebSocket frame if we've run out of data to read from the socket
+        if (web_socket->frame_bytes_remaining == 0)
+        {
+            error = ReceiveFrameHeader(web_socket);
+            if (error != RMT_ERROR_NONE)
+                return error;
+
+            // Set output message length only on initial receive
+            if (msg_len != NULL)
+                *msg_len = web_socket->frame_bytes_remaining;
+        }
+
+        // Read as much required data as possible
+        bytes_to_read = web_socket->frame_bytes_remaining < length ? web_socket->frame_bytes_remaining : length;
+        error = TCPSocket_Receive(web_socket->tcp_socket, cur_data, bytes_to_read, 20);
+        if (error == RMT_ERROR_SOCKET_RECV_FAILED)
+            return error;
+
+        // If there's a stall receiving the data, check for timeout
+        if (error == RMT_ERROR_SOCKET_RECV_NO_DATA || error == RMT_ERROR_SOCKET_RECV_TIMEOUT)
+        {
+            now_ms = msTimer_Get();
+            if (now_ms - start_ms > timeout_ms)
+                return RMT_ERROR_SOCKET_RECV_TIMEOUT;
+            continue;
+        }
+
+        // Apply data mask
+        if (web_socket->data.mask_u32 != 0)
+        {
+            rmtU32 i;
+            for (i = 0; i < bytes_to_read; i++)
+            {
+                *((rmtU8*)cur_data + i) ^= web_socket->data.mask[web_socket->mask_offset & 3];
+                web_socket->mask_offset++;
+            }
+        }
+
+        cur_data += bytes_to_read;
+        web_socket->frame_bytes_remaining -= bytes_to_read;
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @MESSAGEQ: Multiple producer, single consumer message queue
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+typedef enum MessageID
+{
+    MsgID_NotReady,
+    MsgID_LogText,
+    MsgID_SampleTree,
+    MsgID_None,
+    MsgID_Force32Bits = 0xFFFFFFFF,
+} MessageID;
+
+
+typedef struct Message
+{
+    MessageID id;
+
+    rmtU32 payload_size;
+
+    // For telling which thread the message came from in the debugger
+    struct ThreadSampler* thread_sampler;
+
+    rmtU8 payload[1];
+} Message;
+
+
+// Multiple producer, single consumer message queue that uses its own data buffer
+// to store the message data.
+typedef struct rmtMessageQueue
+{
+    rmtU32 size;
+
+    // The physical address of this data buffer is pointed to by two sequential
+    // virtual memory pages, allowing automatic wrap-around of any reads or writes
+    // that exceed the limits of the buffer.
+    VirtualMirrorBuffer* data;
+
+    // Read/write position never wrap allowing trivial overflow checks
+    // with easier debugging
+    rmtU32 read_pos;
+    rmtU32 write_pos;
+
+} rmtMessageQueue;
+
+
+static rmtError rmtMessageQueue_Constructor(rmtMessageQueue* queue, rmtU32 size)
+{
+    rmtError error;
+
+    assert(queue != NULL);
+
+    // Set defaults
+    queue->size = 0;
+    queue->data = NULL;
+    queue->read_pos = 0;
+    queue->write_pos = 0;
+
+    New_2(VirtualMirrorBuffer, queue->data, size, 10);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // The mirror buffer needs to be page-aligned and will change the requested
+    // size to match that.
+    queue->size = queue->data->size;
+
+    // Set the entire buffer to not ready message
+    memset(queue->data->ptr, MsgID_NotReady, queue->size);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void rmtMessageQueue_Destructor(rmtMessageQueue* queue)
+{
+    assert(queue != NULL);
+    Delete(VirtualMirrorBuffer, queue->data);
+}
+
+
+static rmtU32 rmtMessageQueue_SizeForPayload(rmtU32 payload_size)
+{
+    // Add message header and align for ARM platforms
+    rmtU32 size = sizeof(Message) + payload_size;
+    size = (size + 3) & ~3U;
+    return size;
+}
+
+
+static Message* rmtMessageQueue_AllocMessage(rmtMessageQueue* queue, rmtU32 payload_size, struct ThreadSampler* thread_sampler)
+{
+    Message* msg;
+
+    rmtU32 write_size = rmtMessageQueue_SizeForPayload(payload_size);
+
+    assert(queue != NULL);
+
+    for (;;)
+    {
+        // Check for potential overflow
+        // Order of loads means allocation failure can happen when enough space has just been freed
+        // However, incorrect overflows are not possible
+        rmtU32 s = queue->size;
+        rmtU32 w = LoadAcquire(&queue->write_pos);
+        rmtU32 r = LoadAcquire(&queue->read_pos);
+        if ((int)(w - r) > ((int)(s - write_size)))
+            return NULL;
+
+        // Point to the newly allocated space
+        msg = (Message*)(queue->data->ptr + (w & (s - 1)));
+
+        // Increment the write position, leaving the loop if this is the thread that succeeded
+        if (AtomicCompareAndSwap(&queue->write_pos, w, w + write_size) == RMT_TRUE)
+        {
+            // Safe to set payload size after thread claims ownership of this allocated range
+            msg->payload_size = payload_size;
+            msg->thread_sampler = thread_sampler;
+            break;
+        }
+    }
+
+    return msg;
+}
+
+
+static void rmtMessageQueue_CommitMessage(Message* message, MessageID id)
+{
+    assert(message != NULL);
+
+    // Setting the message ID signals to the consumer that the message is ready
+    assert(LoadAcquire((rmtU32*)&message->id) == MsgID_NotReady);
+    StoreRelease((rmtU32*)&message->id, id);
+}
+
+
+Message* rmtMessageQueue_PeekNextMessage(rmtMessageQueue* queue)
+{
+    Message* ptr;
+    rmtU32 r, w;
+    MessageID id;
+
+    assert(queue != NULL);
+
+    // First check that there are bytes queued
+    w = LoadAcquire(&queue->write_pos);
+    r = queue->read_pos;
+    if (w - r == 0)
+        return NULL;
+
+    // Messages are in the queue but may not have been commit yet
+    // Messages behind this one may have been commit but it's not reachable until
+    // the next one in the queue is ready.
+    r = r & (queue->size - 1);
+    ptr = (Message*)(queue->data->ptr + r);
+    id = (MessageID)LoadAcquire((rmtU32*)&ptr->id);
+    if (id != MsgID_NotReady)
+        return ptr;
+
+    return NULL;
+}
+
+
+static void rmtMessageQueue_ConsumeNextMessage(rmtMessageQueue* queue, Message* message)
+{
+    rmtU32 message_size, read_pos;
+
+    assert(queue != NULL);
+    assert(message != NULL);
+
+    // Setting the message ID to "not ready" serves as a marker to the consumer that even though
+    // space has been allocated for a message, the message isn't ready to be consumed
+    // yet.
+    //
+    // We can't do that when allocating the message because multiple threads will be fighting for
+    // the same location. Instead, clear out any messages just read by the consumer before advancing
+    // the read position so that a winning thread's allocation will inherit the "not ready" state.
+    //
+    // This costs some write bandwidth and has the potential to flush cache to other cores.
+    message_size = rmtMessageQueue_SizeForPayload(message->payload_size);
+    memset(message, MsgID_NotReady, message_size);
+
+    // Advance read position
+    read_pos = queue->read_pos + message_size;
+    StoreRelease(&queue->read_pos, read_pos);
+}
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @NETWORK: Network Server
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+typedef rmtError (*Server_ReceiveHandler)(void*, char*, rmtU32);
+
+
+typedef struct
+{
+    WebSocket* listen_socket;
+
+    WebSocket* client_socket;
+
+    rmtU32 last_ping_time;
+
+    rmtU16 port;
+
+    rmtBool reuse_open_port;
+    rmtBool limit_connections_to_localhost;
+
+    // A dynamically-sized buffer used for binary-encoding messages and sending to the client
+    Buffer* bin_buf;
+
+    // Handler for receiving messages from the client
+    Server_ReceiveHandler receive_handler;
+    void* receive_handler_context;
+} Server;
+
+
+static rmtError Server_CreateListenSocket(Server* server, rmtU16 port, rmtBool reuse_open_port, rmtBool limit_connections_to_localhost)
+{
+    rmtError error = RMT_ERROR_NONE;
+
+    New_1(WebSocket, server->listen_socket, NULL);
+    if (error == RMT_ERROR_NONE)
+        error = WebSocket_RunServer(server->listen_socket, port, reuse_open_port, limit_connections_to_localhost, WEBSOCKET_BINARY);
+
+    return error;
+}
+
+
+static rmtError Server_Constructor(Server* server, rmtU16 port, rmtBool reuse_open_port, rmtBool limit_connections_to_localhost)
+{
+    rmtError error;
+
+    assert(server != NULL);
+    server->listen_socket = NULL;
+    server->client_socket = NULL;
+    server->last_ping_time = 0;
+    server->port = port;
+    server->reuse_open_port = reuse_open_port;
+    server->limit_connections_to_localhost = limit_connections_to_localhost;
+    server->bin_buf = NULL;
+    server->receive_handler = NULL;
+    server->receive_handler_context = NULL;
+
+    // Create the binary serialisation buffer
+    New_1(Buffer, server->bin_buf, 4096);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Create the listening WebSocket
+    return Server_CreateListenSocket(server, port, reuse_open_port, limit_connections_to_localhost);
+}
+
+
+static void Server_Destructor(Server* server)
+{
+    assert(server != NULL);
+    Delete(WebSocket, server->client_socket);
+    Delete(WebSocket, server->listen_socket);
+    Delete(Buffer, server->bin_buf);
+}
+
+
+static rmtBool Server_IsClientConnected(Server* server)
+{
+    assert(server != NULL);
+    return server->client_socket != NULL ? RMT_TRUE : RMT_FALSE;
+}
+
+
+static void Server_DisconnectClient(Server* server)
+{
+    WebSocket* client_socket;
+
+    assert(server != NULL);
+
+    // NULL the variable before destroying the socket
+    client_socket = server->client_socket;
+    server->client_socket = NULL;
+    CompilerWriteFence();
+    Delete(WebSocket, client_socket);
+}
+
+
+static rmtError Server_Send(Server* server, const void* data, rmtU32 length, rmtU32 timeout)
+{
+    assert(server != NULL);
+    if (Server_IsClientConnected(server))
+    {
+        rmtError error = WebSocket_Send(server->client_socket, data, length, timeout);
+        if (error == RMT_ERROR_SOCKET_SEND_FAIL)
+            Server_DisconnectClient(server);
+
+        return error;
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError Server_ReceiveMessage(Server* server, char message_first_byte, rmtU32 message_length)
+{
+    char message_data[1024];
+    rmtError error;
+
+    // Check for potential message data overflow
+    if (message_length >= sizeof(message_data) - 1)
+    {
+        rmt_LogText("Ignoring console input bigger than internal receive buffer (1024 bytes)");
+        return RMT_ERROR_NONE;
+    }
+
+    // Receive the rest of the message
+    message_data[0] = message_first_byte;
+    error = WebSocket_Receive(server->client_socket, message_data + 1, NULL, message_length - 1, 100);
+    if (error != RMT_ERROR_NONE)
+        return error;
+    message_data[message_length] = 0;
+
+    // Each message must have a descriptive 4 byte header
+    if (message_length < 4)
+        return RMT_ERROR_NONE;
+
+    // Dispatch to handler
+    if (server->receive_handler)
+        error = server->receive_handler(server->receive_handler_context, message_data, message_length);
+
+    return error;
+}
+
+
+static void Server_Update(Server* server)
+{
+    rmtU32 cur_time;
+
+    assert(server != NULL);
+
+    // Recreate the listening socket if it's been destroyed earlier
+    if (server->listen_socket == NULL)
+        Server_CreateListenSocket(server, server->port, server->reuse_open_port, server->limit_connections_to_localhost);
+
+    if (server->listen_socket != NULL && server->client_socket == NULL)
+    {
+        // Accept connections as long as there is no client connected
+        WebSocket* client_socket = NULL;
+        rmtError error = WebSocket_AcceptConnection(server->listen_socket, &client_socket);
+        if (error == RMT_ERROR_NONE)
+        {
+            server->client_socket = client_socket;
+        }
+        else
+        {
+            // Destroy the listen socket on failure to accept
+            // It will get recreated in another update
+            Delete(WebSocket, server->listen_socket);
+        }
+    }
+
+    else
+    {
+        // Loop checking for incoming messages
+        for (;;)
+        {
+            // Inspect first byte to see if a message is there
+            char message_first_byte=0;
+            rmtU32 message_length=0;
+            rmtError error = WebSocket_Receive(server->client_socket, &message_first_byte, &message_length, 1, 0);
+            if (error == RMT_ERROR_NONE)
+            {
+                // Parse remaining message
+                error = Server_ReceiveMessage(server, message_first_byte, message_length);
+                if (error != RMT_ERROR_NONE)
+                {
+                    Server_DisconnectClient(server);
+                    break;
+                }
+
+                // Check for more...
+                continue;
+            }
+
+            // Passable errors...
+            if (error == RMT_ERROR_SOCKET_RECV_NO_DATA)
+            {
+                // No data available
+                break;
+            }
+
+            if (error == RMT_ERROR_SOCKET_RECV_TIMEOUT)
+            {
+                // Data not available yet, can afford to ignore as we're only reading the first byte
+                break;
+            }
+
+            // Anything else is an error that may have closed the connection
+            Server_DisconnectClient(server);
+            break;
+        }
+    }
+
+    // Send pings to the client every second
+    cur_time = msTimer_Get();
+    if (cur_time - server->last_ping_time > 1000)
+    {
+        Buffer* bin_buf = server->bin_buf;
+        WebSocket_PrepareBuffer(bin_buf);
+        Buffer_WriteStringZ(bin_buf, "PING");
+        Server_Send(server, bin_buf->data, bin_buf->bytes_used, 10);
+        server->last_ping_time = cur_time;
+    }
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @SAMPLE: Base Sample Description for CPU by default
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#define SAMPLE_NAME_LEN 128
+
+
+typedef enum SampleType
+{
+    SampleType_CPU,
+    SampleType_CUDA,
+    SampleType_D3D11,
+    SampleType_OpenGL,
+    SampleType_Metal,
+    SampleType_Count,
+} SampleType;
+
+
+typedef struct Sample
+{
+    // Inherit so that samples can be quickly allocated
+    ObjectLink Link;
+
+    enum SampleType type;
+
+    // Used to anonymously copy sample data without knowning its type
+    rmtU32 size_bytes;
+
+    // Hash generated from sample name
+    rmtU32 name_hash;
+
+    // Unique, persistent ID among all samples
+    rmtU32 unique_id;
+
+    // Null-terminated string storing the hash-prefixed 6-digit colour
+    rmtU8 unique_id_html_colour[8];
+
+    // Links to related samples in the tree
+    struct Sample* parent;
+    struct Sample* first_child;
+    struct Sample* last_child;
+    struct Sample* next_sibling;
+
+    // Keep track of child count to distinguish from repeated calls to the same function at the same stack level
+    // This is also mixed with the callstack hash to allow consistent addressing of any point in the tree
+    rmtU32 nb_children;
+
+    // Sample end points and length in microseconds
+    rmtU64 us_start;
+    rmtU64 us_end;
+    rmtU64 us_length;
+
+    // Total sampled length of all children
+    rmtU64 us_sampled_length;
+
+    // Number of times this sample was used in a call in aggregate mode, 1 otherwise
+    rmtU32 call_count;
+
+    // Current and maximum sample recursion depths
+    rmtU16 recurse_depth;
+    rmtU16 max_recurse_depth;
+
+} Sample;
+
+
+static rmtError Sample_Constructor(Sample* sample)
+{
+    assert(sample != NULL);
+
+    ObjectLink_Constructor((ObjectLink*)sample);
+
+    sample->type = SampleType_CPU;
+    sample->size_bytes = sizeof(Sample);
+    sample->name_hash = 0;
+    sample->unique_id = 0;
+    sample->unique_id_html_colour[0] = '#';
+    sample->unique_id_html_colour[1] = 0;
+    sample->unique_id_html_colour[7] = 0;
+    sample->parent = NULL;
+    sample->first_child = NULL;
+    sample->last_child = NULL;
+    sample->next_sibling = NULL;
+    sample->nb_children = 0;
+    sample->us_start = 0;
+    sample->us_end = 0;
+    sample->us_length = 0;
+    sample->us_sampled_length =0;
+    sample->call_count = 0;
+    sample->recurse_depth = 0;
+    sample->max_recurse_depth = 0;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void Sample_Destructor(Sample* sample)
+{
+    RMT_UNREFERENCED_PARAMETER(sample);
+}
+
+
+static void Sample_Prepare(Sample* sample, rmtU32 name_hash, Sample* parent)
+{
+    sample->name_hash = name_hash;
+    sample->unique_id = 0;
+    sample->parent = parent;
+    sample->first_child = NULL;
+    sample->last_child = NULL;
+    sample->next_sibling = NULL;
+    sample->nb_children = 0;
+    sample->us_start = 0;
+    sample->us_end = 0;
+    sample->us_length = 0;
+    sample->us_sampled_length = 0;
+    sample->call_count = 1;
+    sample->recurse_depth = 0;
+    sample->max_recurse_depth = 0;
+}
+
+
+#define BIN_ERROR_CHECK(stmt) { error = stmt; if (error != RMT_ERROR_NONE) return error; }
+
+
+static rmtError bin_SampleArray(Buffer* buffer, Sample* first_sample);
+
+
+static rmtError bin_Sample(Buffer* buffer, Sample* sample)
+{
+    rmtError error;
+
+    assert(sample != NULL);
+
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, sample->name_hash));
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, sample->unique_id));
+    BIN_ERROR_CHECK(Buffer_Write(buffer, sample->unique_id_html_colour, 7));
+    BIN_ERROR_CHECK(Buffer_WriteU64(buffer, sample->us_start));
+    BIN_ERROR_CHECK(Buffer_WriteU64(buffer, sample->us_length));
+    BIN_ERROR_CHECK(Buffer_WriteU64(buffer, maxS64(sample->us_length - sample->us_sampled_length, 0)));
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, sample->call_count));
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, sample->max_recurse_depth));
+    BIN_ERROR_CHECK(bin_SampleArray(buffer, sample));
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError bin_SampleArray(Buffer* buffer, Sample* parent_sample)
+{
+    rmtError error;
+    Sample* sample;
+
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, parent_sample->nb_children));
+    for (sample = parent_sample->first_child; sample != NULL; sample = sample->next_sibling)
+        BIN_ERROR_CHECK(bin_Sample(buffer, sample));
+
+    return RMT_ERROR_NONE;
+}
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @SAMPLETREE: A tree of samples with their allocator
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+typedef struct SampleTree
+{
+    // Allocator for all samples
+    ObjectAllocator* allocator;
+
+    // Root sample for all samples created by this thread
+    Sample* root;
+
+    // Most recently pushed sample
+    Sample* current_parent;
+
+} SampleTree;
+
+
+static rmtError SampleTree_Constructor(SampleTree* tree, rmtU32 sample_size, ObjConstructor constructor, ObjDestructor destructor)
+{
+    rmtError error;
+
+    assert(tree != NULL);
+
+    tree->allocator = NULL;
+    tree->root = NULL;
+    tree->current_parent = NULL;
+
+    // Create the sample allocator
+    New_3(ObjectAllocator, tree->allocator, sample_size, constructor, destructor);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Create a root sample that's around for the lifetime of the thread
+    error = ObjectAllocator_Alloc(tree->allocator, (void**)&tree->root);
+    if (error != RMT_ERROR_NONE)
+        return error;
+    Sample_Prepare(tree->root, 0, NULL);
+    tree->current_parent = tree->root;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void SampleTree_Destructor(SampleTree* tree)
+{
+    assert(tree != NULL);
+
+    if (tree->root != NULL)
+    {
+        ObjectAllocator_Free(tree->allocator, tree->root);
+        tree->root = NULL;
+    }
+
+    Delete(ObjectAllocator, tree->allocator);
+}
+
+
+static rmtU32 HashCombine(rmtU32 hash_a, rmtU32 hash_b)
+{
+    // A sequence of 32 uniformly random bits so that each bit of the combined hash is changed on application
+    // Derived from the golden ratio: UINT_MAX / ((1 + sqrt(5)) / 2)
+    // In reality it's just an arbitrary value which happens to work well, avoiding mapping all zeros to zeros.
+    // http://burtleburtle.net/bob/hash/doobs.html
+    static rmtU32 random_bits = 0x9E3779B9;
+    hash_a ^= hash_b + random_bits + (hash_a << 6) + (hash_a >> 2);
+    return hash_a;
+}
+
+
+static rmtError SampleTree_Push(SampleTree* tree, rmtU32 name_hash, rmtU32 flags, Sample** sample)
+{
+    Sample* parent;
+    rmtError error;
+    rmtU32 unique_id;
+
+    // As each tree has a root sample node allocated, a parent must always be present
+    assert(tree != NULL);
+    assert(tree->current_parent != NULL);
+    parent = tree->current_parent;
+
+    if ((flags & RMTSF_Aggregate) != 0)
+    {
+        // Linear search for previous instance of this sample name
+        Sample* sibling;
+        for (sibling = parent->first_child; sibling != NULL; sibling = sibling->next_sibling)
+        {
+            if (sibling->name_hash == name_hash)
+            {
+                tree->current_parent = sibling;
+                sibling->call_count++;
+                *sample = sibling;
+                return RMT_ERROR_NONE;
+            }
+        }
+    }
+
+    // Collapse sample on recursion
+    if ((flags & RMTSF_Recursive) != 0 && parent->name_hash == name_hash)
+    {
+        parent->recurse_depth++;
+        parent->max_recurse_depth = maxU16(parent->max_recurse_depth, parent->recurse_depth);
+        parent->call_count++;
+        *sample = parent;
+        return RMT_ERROR_RECURSIVE_SAMPLE;
+    }
+
+    // Allocate a new sample
+    error = ObjectAllocator_Alloc(tree->allocator, (void**)sample);
+    if (error != RMT_ERROR_NONE)
+        return error;
+    Sample_Prepare(*sample, name_hash, parent);
+
+    // Generate a unique ID for this sample in the tree
+    unique_id = parent->unique_id;
+    unique_id = HashCombine(unique_id, (*sample)->name_hash);
+    unique_id = HashCombine(unique_id, parent->nb_children);
+    (*sample)->unique_id = unique_id;
+
+    // Add sample to its parent
+    parent->nb_children++;
+    if (parent->first_child == NULL)
+    {
+        parent->first_child = *sample;
+        parent->last_child = *sample;
+    }
+    else
+    {
+        assert(parent->last_child != NULL);
+        parent->last_child->next_sibling = *sample;
+        parent->last_child = *sample;
+    }
+
+    // Make this sample the new parent of any newly created samples
+    tree->current_parent = *sample;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void SampleTree_Pop(SampleTree* tree, Sample* sample)
+{
+    assert(tree != NULL);
+    assert(sample != NULL);
+    assert(sample != tree->root);
+    tree->current_parent = sample->parent;
+}
+
+
+static ObjectLink* FlattenSampleTree(Sample* sample, rmtU32* nb_samples)
+{
+    Sample* child;
+    ObjectLink* cur_link = &sample->Link;
+
+    assert(sample != NULL);
+    assert(nb_samples != NULL);
+
+    *nb_samples += 1;
+    sample->Link.next = (ObjectLink*)sample->first_child;
+
+    // Link all children together
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        ObjectLink* last_link = FlattenSampleTree(child, nb_samples);
+        last_link->next = (ObjectLink*)child->next_sibling;
+        cur_link = last_link;
+    }
+
+    // Clear child info
+    sample->first_child = NULL;
+    sample->last_child = NULL;
+    sample->nb_children = 0;
+
+    return cur_link;
+}
+
+
+static void FreeSampleTree(Sample* sample, ObjectAllocator* allocator)
+{
+    // Chain all samples together in a flat list
+    rmtU32 nb_cleared_samples = 0;
+    ObjectLink* last_link = FlattenSampleTree(sample, &nb_cleared_samples);
+
+    // Release the complete sample memory range
+    if (sample->Link.next != NULL)
+        ObjectAllocator_FreeRange(allocator, sample, last_link, nb_cleared_samples);
+    else
+        ObjectAllocator_Free(allocator, sample);
+}
+
+
+typedef struct Msg_SampleTree
+{
+    Sample* root_sample;
+
+    ObjectAllocator* allocator;
+
+    rmtPStr thread_name;
+} Msg_SampleTree;
+
+
+static void AddSampleTreeMessage(rmtMessageQueue* queue, Sample* sample, ObjectAllocator* allocator, rmtPStr thread_name, struct ThreadSampler* thread_sampler)
+{
+    Msg_SampleTree* payload;
+
+    // Attempt to allocate a message for sending the tree to the viewer
+    Message* message = rmtMessageQueue_AllocMessage(queue, sizeof(Msg_SampleTree), thread_sampler);
+    if (message == NULL)
+    {
+        // Discard the tree on failure
+        FreeSampleTree(sample, allocator);
+        return;
+    }
+
+    // Populate and commit
+    payload = (Msg_SampleTree*)message->payload;
+    payload->root_sample = sample;
+    payload->allocator = allocator;
+    payload->thread_name = thread_name;
+    rmtMessageQueue_CommitMessage(message, MsgID_SampleTree);
+}
+
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @TSAMPLER: Per-Thread Sampler
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+typedef struct ThreadSampler
+{
+    // Name to assign to the thread in the viewer
+    rmtS8 name[256];
+
+    // Store a unique sample tree for each type
+    SampleTree* sample_trees[SampleType_Count];
+
+    // Table of all sample names encountered on this thread
+    StringTable* names;
+
+    // Next in the global list of active thread samplers
+    struct ThreadSampler* volatile next;
+
+} ThreadSampler;
+
+static rmtError ThreadSampler_Constructor(ThreadSampler* thread_sampler)
+{
+    rmtError error;
+    int i;
+
+    assert(thread_sampler != NULL);
+
+    // Set defaults
+    for (i = 0; i < SampleType_Count; i++)
+        thread_sampler->sample_trees[i] = NULL;
+    thread_sampler->names = NULL;
+    thread_sampler->next = NULL;
+
+    // Set the initial name to Thread0 etc. or use the existing Linux name.
+    thread_sampler->name[0] = 0;
+    #if defined(RMT_PLATFORM_LINUX) && RMT_USE_POSIX_THREADNAMES && !defined(__FreeBSD__)
+    prctl(PR_GET_NAME,thread_sampler->name,0,0,0);
+    #else
+    {
+        static rmtS32 countThreads = 0;
+        strncat_s(thread_sampler->name, sizeof(thread_sampler->name), "Thread", 6);
+        itoahex_s(thread_sampler->name + 6, sizeof(thread_sampler->name) - 6, AtomicAdd(&countThreads, 1));
+    }
+    #endif
+
+    // Create the CPU sample tree only - the rest are created on-demand as they need
+    // extra context information to function correctly.
+    New_3(SampleTree, thread_sampler->sample_trees[SampleType_CPU], sizeof(Sample), (ObjConstructor)Sample_Constructor, (ObjDestructor)Sample_Destructor);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Create sample name string table
+    New_0(StringTable, thread_sampler->names);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void ThreadSampler_Destructor(ThreadSampler* ts)
+{
+    int i;
+
+    assert(ts != NULL);
+
+    Delete(StringTable, ts->names);
+
+    for (i = 0; i < SampleType_Count; i++)
+        Delete(SampleTree, ts->sample_trees[i]);
+}
+
+
+static rmtError ThreadSampler_Push(SampleTree* tree, rmtU32 name_hash, rmtU32 flags, Sample** sample)
+{
+    return SampleTree_Push(tree, name_hash, flags, sample);
+}
+
+
+static rmtBool ThreadSampler_Pop(ThreadSampler* ts, rmtMessageQueue* queue, Sample* sample)
+{
+    SampleTree* tree = ts->sample_trees[sample->type];
+    SampleTree_Pop(tree, sample);
+
+    // Are we back at the root?
+    if (tree->current_parent == tree->root)
+    {
+        // Disconnect all samples from the root and pack in the chosen message queue
+        Sample* root = tree->root;
+        if (root) {
+			root->first_child = NULL;
+			root->last_child = NULL;
+			root->nb_children = 0;
+        }
+        AddSampleTreeMessage(queue, sample, tree->allocator, ts->name, ts);
+
+        return RMT_TRUE;
+    }
+
+    return RMT_FALSE;
+}
+
+
+static rmtU32 ThreadSampler_GetNameHash(ThreadSampler* ts, rmtPStr name, rmtU32* hash_cache)
+{
+    rmtU32 name_hash = 0;
+
+    // Hash cache provided?
+    if (hash_cache != NULL)
+    {
+        // Calculate the hash first time round only
+        if (*hash_cache == 0)
+        {
+            assert(name != NULL);
+            *hash_cache = MurmurHash3_x86_32(name, (int)strnlen_s(name, 256), 0);
+
+            // Also add to the string table on its first encounter
+            StringTable_Insert(ts->names, *hash_cache, name);
+        }
+
+        return *hash_cache;
+    }
+
+    // Have to recalculate and speculatively insert the name every time when no cache storage exists
+    name_hash = MurmurHash3_x86_32(name, (int)strnlen_s(name, 256), 0);
+    StringTable_Insert(ts->names, name_hash, name);
+    return name_hash;
+}
+
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @REMOTERY: Remotery
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#if RMT_USE_D3D11
+typedef struct D3D11 D3D11;
+static rmtError D3D11_Create(D3D11** d3d11);
+static void D3D11_Destructor(D3D11* d3d11);
+#endif
+
+
+#if RMT_USE_OPENGL
+typedef struct OpenGL_t OpenGL;
+static rmtError OpenGL_Create(OpenGL** opengl);
+static void OpenGL_Destructor(OpenGL* opengl);
+#endif
+
+
+#if RMT_USE_METAL
+typedef struct Metal_t Metal;
+static rmtError Metal_Create(Metal** metal);
+static void Metal_Destructor(Metal* metal);
+#endif
+
+
+struct Remotery
+{
+    Server* server;
+
+    // Microsecond accuracy timer for CPU timestamps
+    usTimer timer;
+
+    rmtTLS thread_sampler_tls_handle;
+
+    // Linked list of all known threads being sampled
+    ThreadSampler* volatile first_thread_sampler;
+
+    // Queue between clients and main remotery thread
+    rmtMessageQueue* mq_to_rmt_thread;
+
+    // The main server thread
+    rmtThread* thread;
+
+    // Set to trigger a map of each message on the remotery thread message queue
+    void (*map_message_queue_fn)(Remotery* rmt, Message*);
+    void* map_message_queue_data;
+
+#if RMT_USE_CUDA
+    rmtCUDABind cuda;
+#endif
+
+#if RMT_USE_D3D11
+    D3D11* d3d11;
+#endif
+
+#if RMT_USE_OPENGL
+    OpenGL* opengl;
+#endif
+
+#if RMT_USE_METAL
+    Metal* metal;
+#endif
+};
+
+
+//
+// Global remotery context
+//
+static Remotery* g_Remotery = NULL;
+
+
+//
+// This flag marks the EXE/DLL that created the global remotery instance. We want to allow
+// only the creating EXE/DLL to destroy the remotery instance.
+//
+static rmtBool g_RemoteryCreated = RMT_FALSE;
+
+
+static void Remotery_DestroyThreadSamplers(Remotery* rmt);
+
+
+static const rmtU8 g_DecimalToHex[17] = "0123456789abcdef";
+
+
+static void GetSampleDigest(Sample* sample, rmtU32* digest_hash, rmtU32* nb_samples)
+{
+    Sample* child;
+
+    assert(sample != NULL);
+    assert(digest_hash != NULL);
+    assert(nb_samples != NULL);
+
+    // Concatenate this sample
+    (*nb_samples)++;
+    *digest_hash = HashCombine(*digest_hash, sample->unique_id);
+
+    {
+        rmtU8 shift = 4;
+
+        // Get 6 nibbles for lower 3 bytes of the name hash
+        rmtU8* sample_id = (rmtU8*)&sample->name_hash;
+        rmtU8 hex_sample_id[6];
+        hex_sample_id[0] = sample_id[0] & 15;
+        hex_sample_id[1] = sample_id[0] >> 4;
+        hex_sample_id[2] = sample_id[1] & 15;
+        hex_sample_id[3] = sample_id[1] >> 4;
+        hex_sample_id[4] = sample_id[2] & 15;
+        hex_sample_id[5] = sample_id[2] >> 4;
+
+        // As the nibbles will be used as hex colour digits, shift them up to make pastel colours
+        hex_sample_id[0] = minU8(hex_sample_id[0] + shift, 15);
+        hex_sample_id[1] = minU8(hex_sample_id[1] + shift, 15);
+        hex_sample_id[2] = minU8(hex_sample_id[2] + shift, 15);
+        hex_sample_id[3] = minU8(hex_sample_id[3] + shift, 15);
+        hex_sample_id[4] = minU8(hex_sample_id[4] + shift, 15);
+        hex_sample_id[5] = minU8(hex_sample_id[5] + shift, 15);
+
+        // Convert the nibbles to hex for the final colour
+        sample->unique_id_html_colour[1] = g_DecimalToHex[hex_sample_id[0]];
+        sample->unique_id_html_colour[2] = g_DecimalToHex[hex_sample_id[1]];
+        sample->unique_id_html_colour[3] = g_DecimalToHex[hex_sample_id[2]];
+        sample->unique_id_html_colour[4] = g_DecimalToHex[hex_sample_id[3]];
+        sample->unique_id_html_colour[5] = g_DecimalToHex[hex_sample_id[4]];
+        sample->unique_id_html_colour[6] = g_DecimalToHex[hex_sample_id[5]];
+    }
+
+    // Concatenate children
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+        GetSampleDigest(child, digest_hash, nb_samples);
+}
+
+
+static rmtError Remotery_SendLogTextMessage(Remotery* rmt, Message* message)
+{
+    Buffer* bin_buf;
+
+    assert(rmt != NULL);
+    assert(message != NULL);
+    
+    bin_buf = rmt->server->bin_buf;
+    WebSocket_PrepareBuffer(bin_buf);
+    Buffer_Write(bin_buf, message->payload, message->payload_size);
+
+    return Server_Send(rmt->server, bin_buf->data, bin_buf->bytes_used, 20);
+}
+
+
+static rmtError bin_SampleTree(Buffer* buffer, Msg_SampleTree* msg)
+{
+    Sample* root_sample;
+    char thread_name[256];
+    rmtU32 digest_hash = 0, nb_samples = 0;
+    rmtError error;
+
+    assert(buffer != NULL);
+    assert(msg != NULL);
+
+    // Get the message root sample
+    root_sample = msg->root_sample;
+    assert(root_sample != NULL);
+
+    // Add any sample types as a thread name post-fix to ensure they get their own viewer
+    thread_name[0] = 0;
+    strncat_s(thread_name, sizeof(thread_name), msg->thread_name, strnlen_s(msg->thread_name, 255));
+    if (root_sample->type == SampleType_CUDA)
+        strncat_s(thread_name, sizeof(thread_name), " (CUDA)", 7);
+    if (root_sample->type == SampleType_D3D11)
+        strncat_s(thread_name, sizeof(thread_name), " (D3D11)", 8);
+    if (root_sample->type == SampleType_OpenGL)
+        strncat_s(thread_name, sizeof(thread_name), " (OpenGL)", 9);
+    if (root_sample->type == SampleType_Metal)
+        strncat_s(thread_name, sizeof(thread_name), " (Metal)", 8);
+
+    // Get digest hash of samples so that viewer can efficiently rebuild its tables
+    GetSampleDigest(root_sample, &digest_hash, &nb_samples);
+
+    // Write global message header
+    BIN_ERROR_CHECK(Buffer_Write(buffer, (void*)"SMPL    ", 8));
+
+    // Write sample message header
+    BIN_ERROR_CHECK(Buffer_WriteStringWithLength(buffer, thread_name));
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, nb_samples));
+    BIN_ERROR_CHECK(Buffer_WriteU32(buffer, digest_hash));
+
+    // Write entire sample tree
+    BIN_ERROR_CHECK(bin_Sample(buffer, root_sample));
+
+    // Patch message size
+    U32ToByteArray(buffer->data + 4, buffer->bytes_used);
+
+    return RMT_ERROR_NONE;
+}
+
+
+
+#if RMT_USE_CUDA
+static rmtBool AreCUDASamplesReady(Sample* sample);
+static rmtBool GetCUDASampleTimes(Sample* root_sample, Sample* sample);
+#endif
+
+
+static rmtError Remotery_SendSampleTreeMessage(Remotery* rmt, Message* message)
+{
+    Msg_SampleTree* sample_tree;
+    rmtError error = RMT_ERROR_NONE;
+    Sample* sample;
+    Buffer* bin_buf;
+
+    assert(rmt != NULL);
+    assert(message != NULL);
+
+    // Get the message root sample
+    sample_tree = (Msg_SampleTree*)message->payload;
+    sample = sample_tree->root_sample;
+    assert(sample != NULL);
+
+    #if RMT_USE_CUDA
+    if (sample->type == SampleType_CUDA)
+    {
+        // If these CUDA samples aren't ready yet, stick them to the back of the queue and continue
+        rmtBool are_samples_ready;
+        rmt_BeginCPUSample(AreCUDASamplesReady, 0);
+        are_samples_ready = AreCUDASamplesReady(sample);
+        rmt_EndCPUSample();
+        if (!are_samples_ready)
+        {
+            AddSampleTreeMessage(rmt->mq_to_rmt_thread, sample, sample_tree->allocator, sample_tree->thread_name, message->thread_sampler);
+            return RMT_ERROR_NONE;
+        }
+
+        // Retrieve timing of all CUDA samples
+        rmt_BeginCPUSample(GetCUDASampleTimes, 0);
+        GetCUDASampleTimes(sample->parent, sample);
+        rmt_EndCPUSample();
+    }
+    #endif
+
+    // Reset the buffer for sending a websocket message
+    bin_buf = rmt->server->bin_buf;
+    WebSocket_PrepareBuffer(bin_buf);
+
+    // Serialise the sample tree and send to the viewer with a reasonably long timeout as the size
+    // of the sample data may be large
+    rmt_BeginCPUSample(bin_SampleTree, RMTSF_Aggregate);
+    error = bin_SampleTree(bin_buf, sample_tree);
+    rmt_EndCPUSample();
+    if (error == RMT_ERROR_NONE)
+    {
+        rmt_BeginCPUSample(Server_Send, RMTSF_Aggregate);
+        error = Server_Send(rmt->server, bin_buf->data, bin_buf->bytes_used, 50000);
+        rmt_EndCPUSample();
+    }
+
+    // Release the sample tree back to its allocator
+    FreeSampleTree(sample, sample_tree->allocator);
+
+    return error;
+}
+
+
+static rmtError Remotery_ConsumeMessageQueue(Remotery* rmt)
+{
+    rmtU32 nb_messages_sent = 0;
+    const rmtU32 maxNbMessagesPerUpdate = g_Settings.maxNbMessagesPerUpdate;
+
+    assert(rmt != NULL);
+
+    // Absorb as many messages in the queue while disconnected
+    if (Server_IsClientConnected(rmt->server) == RMT_FALSE)
+        return RMT_ERROR_NONE;
+
+    // Loop reading the max number of messages for this update
+    while( nb_messages_sent++ < maxNbMessagesPerUpdate )
+    {
+        rmtError error = RMT_ERROR_NONE;
+        Message* message = rmtMessageQueue_PeekNextMessage(rmt->mq_to_rmt_thread);
+        if (message == NULL)
+            break;
+
+        switch (message->id)
+        {
+            // This shouldn't be possible
+            case MsgID_NotReady:
+                assert(RMT_FALSE);
+                break;
+
+            // Dispatch to message handler
+            case MsgID_LogText:
+                error = Remotery_SendLogTextMessage(rmt, message);
+                break;
+            case MsgID_SampleTree:
+                rmt_BeginCPUSample(SendSampleTreeMessage, RMTSF_Aggregate);
+                error = Remotery_SendSampleTreeMessage(rmt, message);
+                rmt_EndCPUSample();
+                break;
+            default:
+                break;
+        }
+
+        // Consume the message before reacting to any errors
+        rmtMessageQueue_ConsumeNextMessage(rmt->mq_to_rmt_thread, message);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void Remotery_FlushMessageQueue(Remotery* rmt)
+{
+    assert(rmt != NULL);
+
+    // Loop reading all remaining messages
+    for (;;)
+    {
+        Message* message = rmtMessageQueue_PeekNextMessage(rmt->mq_to_rmt_thread);
+        if (message == NULL)
+            break;
+
+        switch (message->id)
+        {
+            // These can be safely ignored
+            case MsgID_NotReady:
+            case MsgID_LogText:
+                break;
+
+            // Release all samples back to their allocators
+            case MsgID_SampleTree:
+            {
+                Msg_SampleTree* sample_tree = (Msg_SampleTree*)message->payload;
+                FreeSampleTree(sample_tree->root_sample, sample_tree->allocator);
+                break;
+            }
+            default:
+                break;
+        }
+
+        rmtMessageQueue_ConsumeNextMessage(rmt->mq_to_rmt_thread, message);
+    }
+}
+
+
+static void Remotery_MapMessageQueue(Remotery* rmt)
+{
+    rmtU32 read_pos, write_pos;
+    rmtMessageQueue* queue;
+
+    assert(rmt != NULL);
+
+    // Wait until the caller sets the custom data
+    while (LoadAcquirePointer((long* volatile*)&rmt->map_message_queue_data) == NULL)
+        msSleep(1);
+
+    // Snapshot the current write position so that we're not constantly chasing other threads
+    // that can have no effect on the thread requesting the map.
+    queue = rmt->mq_to_rmt_thread;
+    write_pos = LoadAcquire(&queue->write_pos);
+
+    // Walk every message in the queue and call the map function
+    read_pos = queue->read_pos;
+    while (read_pos < write_pos)
+    {
+        rmtU32 r = read_pos & (queue->size - 1);
+        Message* message = (Message*)(queue->data->ptr + r);
+        rmtU32 message_size = rmtMessageQueue_SizeForPayload(message->payload_size);
+        rmt->map_message_queue_fn(rmt, message);
+        read_pos += message_size;
+    }
+
+    StoreReleasePointer((long* volatile*)&rmt->map_message_queue_data, NULL);
+}
+
+
+static rmtError Remotery_ThreadMain(rmtThread* thread)
+{
+    Remotery* rmt = (Remotery*)thread->param;
+    assert(rmt != NULL);
+
+    rmt_SetCurrentThreadName("Remotery");
+
+    while (thread->request_exit == RMT_FALSE)
+    {
+        rmt_BeginCPUSample(Wakeup, 0);
+
+            rmt_BeginCPUSample(ServerUpdate, 0);
+            Server_Update(rmt->server);
+            rmt_EndCPUSample();
+
+            rmt_BeginCPUSample(ConsumeMessageQueue, 0);
+            Remotery_ConsumeMessageQueue(rmt);
+            rmt_EndCPUSample();
+
+        rmt_EndCPUSample();
+
+        // Process any queue map requests
+        if (LoadAcquirePointer((long* volatile*)&rmt->map_message_queue_fn) != NULL)
+        {
+            Remotery_MapMessageQueue(rmt);
+            StoreReleasePointer((long* volatile*)&rmt->map_message_queue_fn, NULL);
+        }
+
+        //
+        // [NOTE-A]
+        //
+        // Possible sequence of user events at this point:
+        //
+        //    1. Add samples to the queue.
+        //    2. Shutdown remotery.
+        //
+        // This loop will exit with unrelease samples.
+        //
+
+        msSleep(g_Settings.msSleepBetweenServerUpdates);
+    }
+
+    // Release all samples to their allocators as a consequence of [NOTE-A]
+    Remotery_FlushMessageQueue(rmt);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError Remotery_ReceiveMessage(void* context, char* message_data, rmtU32 message_length)
+{
+    Remotery* rmt = (Remotery*)context;
+
+    // Manual dispatch on 4-byte message headers (message ID is little-endian encoded)
+    #define FOURCC(a, b, c, d) (rmtU32)( ((d) << 24) | ((c) << 16) | ((b) << 8) | (a) )
+    rmtU32 message_id = *(rmtU32*)message_data;
+
+    switch (message_id)
+    {
+        case FOURCC('C', 'O', 'N', 'I'):
+        {
+            rmt_LogText("Console message received...");
+            rmt_LogText(message_data + 4);
+
+            // Pass on to any registered handler
+            if (g_Settings.input_handler != NULL)
+                g_Settings.input_handler(message_data + 4, g_Settings.input_handler_context);
+
+            break;
+        }
+
+        case FOURCC('G', 'S', 'M', 'P'):
+        {
+            ThreadSampler* ts;
+
+            // Convert name hash to integer
+            rmtU32 name_hash = 0;
+            const char* cur = message_data + 4;
+            const char* end = cur + message_length - 4;
+            while (cur < end)
+                name_hash = name_hash * 10 + *cur++ - '0';
+
+            // Search all threads for a matching string hash
+            for (ts = rmt->first_thread_sampler; ts != NULL; ts = ts->next)
+            {
+                rmtPStr name = StringTable_Find(ts->names, name_hash);
+                if (name != NULL)
+                {
+                    rmtU32 name_length;
+
+                    // Construct a response message containing the matching name
+                    Buffer* bin_buf = rmt->server->bin_buf;
+                    WebSocket_PrepareBuffer(bin_buf);
+                    Buffer_Write(bin_buf, "SSMP", 4);
+                    Buffer_WriteU32(bin_buf, name_hash);
+                    name_length = (rmtU32)strnlen_s(name, 256 - 12);
+                    Buffer_WriteU32(bin_buf, name_length);
+                    Buffer_Write(bin_buf, (void*)name, name_length);
+
+                    // Send back immediately as we're on the server thread
+                    return Server_Send(rmt->server, bin_buf->data, bin_buf->bytes_used, 10);
+                }
+            }
+
+            break;
+        }
+    }
+
+    #undef FOURCC
+
+    return RMT_ERROR_NONE;
+}
+
+
+static rmtError Remotery_Constructor(Remotery* rmt)
+{
+    rmtError error;
+
+    assert(rmt != NULL);
+
+    // Set default state
+    rmt->server = NULL;
+    rmt->thread_sampler_tls_handle = TLS_INVALID_HANDLE;
+    rmt->first_thread_sampler = NULL;
+    rmt->mq_to_rmt_thread = NULL;
+    rmt->thread = NULL;
+    rmt->map_message_queue_fn = NULL;
+    rmt->map_message_queue_data = NULL;
+
+    #if RMT_USE_CUDA
+        rmt->cuda.CtxSetCurrent = NULL;
+        rmt->cuda.EventCreate = NULL;
+        rmt->cuda.EventDestroy = NULL;
+        rmt->cuda.EventElapsedTime = NULL;
+        rmt->cuda.EventQuery = NULL;
+        rmt->cuda.EventRecord = NULL;
+    #endif
+
+    #if RMT_USE_D3D11
+        rmt->d3d11 = NULL;
+    #endif
+
+    #if RMT_USE_OPENGL
+        rmt->opengl = NULL;
+    #endif
+
+    #if RMT_USE_METAL
+        rmt->metal = NULL;
+    #endif
+
+    // Kick-off the timer
+    usTimer_Init(&rmt->timer);
+
+    // Allocate a TLS handle for the thread sampler
+    error = tlsAlloc(&rmt->thread_sampler_tls_handle);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Create the server
+    New_3(Server, rmt->server, g_Settings.port, g_Settings.reuse_open_port, g_Settings.limit_connections_to_localhost);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    // Setup incoming message handler
+    rmt->server->receive_handler = Remotery_ReceiveMessage;
+    rmt->server->receive_handler_context = rmt;
+
+    // Create the main message thread with only one page
+    New_1(rmtMessageQueue, rmt->mq_to_rmt_thread, g_Settings.messageQueueSizeInBytes);
+    if (error != RMT_ERROR_NONE)
+        return error;
+
+    #if RMT_USE_D3D11
+        error = D3D11_Create(&rmt->d3d11);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    #endif
+
+    #if RMT_USE_OPENGL
+        error = OpenGL_Create(&rmt->opengl);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    #endif
+
+    #if RMT_USE_METAL
+        error = Metal_Create(&rmt->metal);
+        if (error != RMT_ERROR_NONE)
+            return error;
+    #endif
+
+
+    // Set as the global instance before creating any threads that uses it for sampling itself
+    assert(g_Remotery == NULL);
+    g_Remotery = rmt;
+    g_RemoteryCreated = RMT_TRUE;
+
+    // Ensure global instance writes complete before other threads get a chance to use it
+    CompilerWriteFence();
+
+    // Create the main update thread once everything has been defined for the global remotery object
+    New_2(rmtThread, rmt->thread, Remotery_ThreadMain, rmt);
+    return error;
+}
+
+
+static void Remotery_Destructor(Remotery* rmt)
+{
+    assert(rmt != NULL);
+
+    // Join the remotery thread before clearing the global object as the thread is profiling itself
+    Delete(rmtThread, rmt->thread);
+
+    if (g_RemoteryCreated)
+    {
+      g_Remotery = NULL;
+      g_RemoteryCreated = RMT_FALSE;
+    }
+
+    #if RMT_USE_D3D11
+        Delete(D3D11, rmt->d3d11);
+    #endif
+
+    #if RMT_USE_OPENGL
+        Delete(OpenGL, rmt->opengl);
+    #endif
+
+    #if RMT_USE_METAL
+        Delete(Metal, rmt->metal);
+    #endif
+
+    Delete(rmtMessageQueue, rmt->mq_to_rmt_thread);
+
+    Remotery_DestroyThreadSamplers(rmt);
+
+    Delete(Server, rmt->server);
+
+    if (rmt->thread_sampler_tls_handle != TLS_INVALID_HANDLE)
+    {
+        tlsFree(rmt->thread_sampler_tls_handle);
+        rmt->thread_sampler_tls_handle = 0;
+    }
+}
+
+
+static rmtError Remotery_GetThreadSampler(Remotery* rmt, ThreadSampler** thread_sampler)
+{
+    ThreadSampler* ts;
+
+    // Is there a thread sampler associated with this thread yet?
+    assert(rmt != NULL);
+    ts = (ThreadSampler*)tlsGet(rmt->thread_sampler_tls_handle);
+    if (ts == NULL)
+    {
+        // Allocate on-demand
+        rmtError error;
+        New_0(ThreadSampler, *thread_sampler);
+        if (error != RMT_ERROR_NONE)
+            return error;
+        ts = *thread_sampler;
+        if (!ts)
+            return error;
+
+        // Add to the beginning of the global linked list of thread samplers
+        for (;;)
+        {
+            ThreadSampler* old_ts = rmt->first_thread_sampler;
+            ts->next = old_ts;
+
+            // If the old value is what we expect it to be then no other thread has
+            // changed it since this thread sampler was used as a candidate first list item
+            if (AtomicCompareAndSwapPointer((long* volatile*)&rmt->first_thread_sampler, (long*)old_ts, (long*)ts) == RMT_TRUE)
+                break;
+        }
+
+        tlsSet(rmt->thread_sampler_tls_handle, ts);
+    }
+
+    assert(thread_sampler != NULL);
+    *thread_sampler = ts;
+    return RMT_ERROR_NONE;
+}
+
+static void Remotery_DestroyThreadSamplers(Remotery* rmt)
+{
+    // If the handle failed to create in the first place then it shouldn't be possible to create thread samplers
+    assert(rmt != NULL);
+    if (rmt->thread_sampler_tls_handle == TLS_INVALID_HANDLE)
+    {
+        assert(rmt->first_thread_sampler == NULL);
+        return;
+    }
+
+    // Keep popping thread samplers off the linked list until they're all gone
+    // This does not make any assumptions, making it possible for thread samplers to be created while they're all
+    // deleted. While this is erroneous calling code, this will prevent a confusing crash.
+    while (rmt->first_thread_sampler != NULL)
+    {
+        ThreadSampler* ts;
+
+        for (;;)
+        {
+            ThreadSampler* old_ts = rmt->first_thread_sampler;
+            ThreadSampler* next_ts = old_ts->next;
+
+            if (AtomicCompareAndSwapPointer((long* volatile*)&rmt->first_thread_sampler, (long*)old_ts, (long*)next_ts) == RMT_TRUE)
+            {
+                ts = old_ts;
+                break;
+            }
+        }
+
+        Delete(ThreadSampler, ts);
+    }
+}
+
+
+static void* CRTMalloc(void* mm_context, rmtU32 size)
+{
+    RMT_UNREFERENCED_PARAMETER(mm_context);
+    return malloc((size_t)size);
+}
+
+
+static void CRTFree(void* mm_context, void* ptr)
+{
+    RMT_UNREFERENCED_PARAMETER(mm_context);
+    free(ptr);
+}
+
+static void* CRTRealloc(void* mm_context, void* ptr, rmtU32 size)
+{
+    RMT_UNREFERENCED_PARAMETER(mm_context);
+    return realloc(ptr, size);
+}
+
+
+RMT_API rmtSettings* _rmt_Settings(void)
+{
+    // Default-initialize on first call
+    if( g_SettingsInitialized == RMT_FALSE )
+    {
+        g_Settings.port = 0x4597;
+        g_Settings.reuse_open_port = RMT_FALSE;
+        g_Settings.limit_connections_to_localhost = RMT_FALSE;
+        g_Settings.msSleepBetweenServerUpdates = 10;
+        g_Settings.messageQueueSizeInBytes = 128 * 1024;
+        g_Settings.maxNbMessagesPerUpdate = 10;
+        g_Settings.malloc = CRTMalloc;
+        g_Settings.free = CRTFree;
+        g_Settings.realloc = CRTRealloc;
+        g_Settings.input_handler = NULL;
+        g_Settings.input_handler_context = NULL;
+        g_Settings.logFilename = "rmtLog.txt";
+
+        g_SettingsInitialized = RMT_TRUE;
+    }
+
+    return &g_Settings;
+}
+
+
+RMT_API rmtError _rmt_CreateGlobalInstance(Remotery** remotery)
+{
+    rmtError error;
+
+    // Ensure load/acquire store/release operations match this enum size
+    assert(sizeof(MessageID) == sizeof(rmtU32));
+
+    // Default-initialise if user has not set values
+    rmt_Settings();
+
+    // Creating the Remotery instance also records it as the global instance
+    assert(remotery != NULL);
+    New_0(Remotery, *remotery);
+    return error;
+}
+
+
+RMT_API void _rmt_DestroyGlobalInstance(Remotery* remotery)
+{
+    // Ensure this is the module that created it
+    assert(g_RemoteryCreated == RMT_TRUE);
+    assert(g_Remotery == remotery);
+    Delete(Remotery, remotery);
+    assert(remotery==NULL);
+}
+
+
+RMT_API void _rmt_SetGlobalInstance(Remotery* remotery)
+{
+    // Default-initialise if user has not set values
+    rmt_Settings();
+
+    g_Remotery = remotery;
+}
+
+
+RMT_API Remotery* _rmt_GetGlobalInstance(void)
+{
+    return g_Remotery;
+}
+
+
+#ifdef RMT_PLATFORM_WINDOWS
+    #pragma pack(push,8)
+    typedef struct tagTHREADNAME_INFO
+    {
+       DWORD dwType; // Must be 0x1000.
+       LPCSTR szName; // Pointer to name (in user addr space).
+       DWORD dwThreadID; // Thread ID (-1=caller thread).
+       DWORD dwFlags; // Reserved for future use, must be zero.
+    } THREADNAME_INFO;
+    #pragma pack(pop)
+#endif
+
+static void SetDebuggerThreadName(const char* name)
+{
+    #ifdef RMT_PLATFORM_WINDOWS
+        THREADNAME_INFO info;
+        info.dwType = 0x1000;
+        info.szName = name;
+        info.dwThreadID = (DWORD)-1;
+        info.dwFlags = 0;
+
+        #ifndef __MINGW32__
+        __try
+        {
+            RaiseException(0x406D1388, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
+        }
+        __except(1 /* EXCEPTION_EXECUTE_HANDLER */)
+        {
+        }
+        #endif
+    #else
+        RMT_UNREFERENCED_PARAMETER(name);
+    #endif
+
+    #ifdef RMT_PLATFORM_LINUX
+        // pthread_setname_np is a non-standard GNU extension.
+        char name_clamp[16];
+        name_clamp[0] = 0;
+        strncat_s(name_clamp, sizeof(name_clamp), name, 15);
+        #ifdef __FreeBSD__
+            pthread_set_name_np(pthread_self(), name_clamp);
+        #else
+            prctl(PR_SET_NAME,name_clamp,0,0,0);
+        #endif
+    #endif
+}
+
+
+RMT_API void _rmt_SetCurrentThreadName(rmtPStr thread_name)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    // Get data for this thread
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) != RMT_ERROR_NONE)
+        return;
+
+    // Copy name and apply to the debugger
+    strcpy_s(ts->name, sizeof(ts->name), thread_name);
+    SetDebuggerThreadName(thread_name);
+}
+
+
+static rmtBool QueueLine(rmtMessageQueue* queue, unsigned char* text, rmtU32 size, struct ThreadSampler* thread_sampler)
+{
+    Message* message;
+    rmtU32 text_size;
+
+    assert(queue != NULL);
+
+    // Prefix with text size
+    text_size = size - 8;
+    U32ToByteArray(text + 4, text_size);
+
+    // Allocate some space for the line
+    message = rmtMessageQueue_AllocMessage(queue, size, thread_sampler);
+    if (message == NULL)
+        return RMT_FALSE;
+
+    // Copy the text and commit the message
+    memcpy(message->payload, text, size);
+    rmtMessageQueue_CommitMessage(message, MsgID_LogText);
+
+    return RMT_TRUE;
+}
+
+
+RMT_API void _rmt_LogText(rmtPStr text)
+{
+    int start_offset, offset, i;
+    unsigned char line_buffer[1024] = { 0 };
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    Remotery_GetThreadSampler(g_Remotery, &ts);
+
+    // Start the line with the message header
+    line_buffer[0] = 'L';
+    line_buffer[1] = 'O';
+    line_buffer[2] = 'G';
+    line_buffer[3] = 'M';
+    // Fill with spaces to enable viewing line_buffer without offset in a debugger
+    // (will be overwritten later by QueueLine/rmtMessageQueue_AllocMessage)
+    line_buffer[4] = ' ';
+    line_buffer[5] = ' ';
+    line_buffer[6] = ' ';
+    line_buffer[7] = ' ';
+    start_offset = 8;
+
+    // There might be newlines in the buffer, so split them into multiple network calls
+    offset = start_offset;
+    for (i = 0; text[i] != 0; i++)
+    {
+        char c = text[i];
+
+        // Line wrap when too long or newline encountered
+        if (offset == sizeof(line_buffer) - 1 || c == '\n')
+        {
+            // Send the line up to now
+            if (QueueLine(g_Remotery->mq_to_rmt_thread, line_buffer, offset, ts) == RMT_FALSE)
+                return;
+
+            // Restart line
+            offset = start_offset;
+
+            // Don't add the newline character (if this was the reason for the flush)
+            // to the restarted line_buffer, let's skip it
+            if (c == '\n')
+                continue;
+        }
+
+        line_buffer[offset++] = c;
+    }
+
+    // Send the last line
+    if (offset > start_offset)
+    {
+        assert(offset < (int)sizeof(line_buffer));
+        QueueLine(g_Remotery->mq_to_rmt_thread, line_buffer, offset, ts);
+    }
+}
+
+
+RMT_API void _rmt_BeginCPUSample(rmtPStr name, rmtU32 flags, rmtU32* hash_cache)
+{
+    // 'hash_cache' stores a pointer to a sample name's hash value. Internally this is used to identify unique callstacks and it
+    // would be ideal that it's not recalculated each time the sample is used. This can be statically cached at the point
+    // of call or stored elsewhere when dynamic names are required.
+    //
+    // If 'hash_cache' is NULL then this call becomes more expensive, as it has to recalculate the hash of the name.
+
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    // TODO: Time how long the bits outside here cost and subtract them from the parent
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        Sample* sample;
+        rmtU32 name_hash = ThreadSampler_GetNameHash(ts, name, hash_cache);
+        if (ThreadSampler_Push(ts->sample_trees[SampleType_CPU], name_hash, flags, &sample) == RMT_ERROR_NONE)
+        {
+            // If this is an aggregate sample, store the time in 'end' as we want to preserve 'start'
+            if (sample->call_count > 1)
+                sample->us_end = usTimer_Get(&g_Remotery->timer);
+            else
+                sample->us_start = usTimer_Get(&g_Remotery->timer);
+        }
+    }
+}
+
+
+RMT_API void _rmt_EndCPUSample(void)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        Sample* sample = ts->sample_trees[SampleType_CPU]->current_parent;
+
+        if (sample->recurse_depth > 0)
+        {
+            sample->recurse_depth--;
+        }
+        else
+        {
+            rmtU64 us_end = usTimer_Get(&g_Remotery->timer);
+
+            // Aggregate samples use us_end to store start so that us_start is preserved
+            rmtU64 us_length = 0;
+            if (sample->call_count > 1 && sample->max_recurse_depth == 0)
+                us_length = (us_end - sample->us_end);
+            else
+                us_length = (us_end - sample->us_start);
+
+            sample->us_length += us_length;
+
+            // Sum length on the parent to track un-sampled time in the parent
+            if (sample->parent != NULL)
+                sample->parent->us_sampled_length += us_length;
+
+            ThreadSampler_Pop(ts, g_Remotery->mq_to_rmt_thread, sample);
+        }
+    }
+}
+
+#if RMT_USE_OPENGL || RMT_USE_D3D11
+static void Remotery_DeleteSampleTree(Remotery* rmt, enum SampleType sample_type)
+{
+    ThreadSampler* ts;
+
+    // Get the attached thread sampler and delete the sample tree
+    assert(rmt != NULL);
+    if (Remotery_GetThreadSampler(rmt, &ts) == RMT_ERROR_NONE)
+    {
+        SampleTree* sample_tree = ts->sample_trees[sample_type];
+        if (sample_tree != NULL)
+        {
+            Delete(SampleTree, sample_tree);
+            ts->sample_trees[sample_type] = NULL;
+        }
+    }
+}
+
+
+static rmtBool rmtMessageQueue_IsEmpty(rmtMessageQueue* queue)
+{
+    assert(queue != NULL);
+    return queue->write_pos - queue->read_pos == 0;
+}
+
+typedef struct GatherQueuedSampleData
+{
+    SampleType sample_type;
+    Buffer* flush_samples;
+} GatherQueuedSampleData;
+
+
+static void MapMessageQueueAndWait(Remotery* rmt, void (*map_message_queue_fn)(Remotery*rmt, Message*), void* data)
+{
+    // Basic spin lock on the map function itself
+    while (AtomicCompareAndSwapPointer((long* volatile*)&rmt->map_message_queue_fn, NULL, (long*)map_message_queue_fn) == RMT_FALSE)
+        msSleep(1);
+    
+    StoreReleasePointer((long* volatile*)&rmt->map_message_queue_data, (long*)data);
+
+    // Wait until map completes
+    while (LoadAcquirePointer((long* volatile*)&rmt->map_message_queue_fn) != NULL)
+        msSleep(1);
+}
+
+
+static void GatherQueuedSamples(Remotery* rmt, Message* message)
+{
+    GatherQueuedSampleData* gather_data = (GatherQueuedSampleData*)rmt->map_message_queue_data;
+
+    // Filter sample trees
+    if (message->id == MsgID_SampleTree)
+    {
+        Msg_SampleTree* sample_tree = (Msg_SampleTree*)message->payload;
+        Sample* sample = sample_tree->root_sample;
+        if (sample->type == gather_data->sample_type)
+        {
+            // Make a copy of the entire sample tree as the remotery thread may overwrite it while
+            // the calling thread tries to delete
+            rmtU32 message_size = rmtMessageQueue_SizeForPayload(message->payload_size);
+            Buffer_Write(gather_data->flush_samples, message, message_size);
+
+            // Mark the message empty
+            message->id = MsgID_None;
+        }
+    }
+}
+
+
+static void FreePendingSampleTrees(Remotery* rmt, SampleType sample_type, Buffer* flush_samples)
+{
+    rmtU8* data;
+    rmtU8* data_end;
+
+    // Gather all sample trees currently queued for the Remotery thread
+    GatherQueuedSampleData gather_data;
+    gather_data.sample_type = sample_type;
+    gather_data.flush_samples = flush_samples;
+    MapMessageQueueAndWait(rmt, GatherQueuedSamples, &gather_data);
+
+    // Release all sample trees to their allocators
+    data = flush_samples->data;
+    data_end = data + flush_samples->bytes_used;
+    while (data < data_end)
+    {
+        Message* message = (Message*)data;
+        rmtU32 message_size = rmtMessageQueue_SizeForPayload(message->payload_size);
+        Msg_SampleTree* sample_tree = (Msg_SampleTree*)message->payload;
+        FreeSampleTree(sample_tree->root_sample, sample_tree->allocator);
+        data += message_size;
+    }
+}
+
+
+#endif
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @CUDA: CUDA event sampling
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#if RMT_USE_CUDA
+
+
+typedef struct CUDASample
+{
+    // IS-A inheritance relationship
+    Sample base;
+
+    // Pair of events that wrap the sample
+    CUevent event_start;
+    CUevent event_end;
+
+} CUDASample;
+
+
+static rmtError MapCUDAResult(CUresult result)
+{
+    switch (result)
+    {
+        case CUDA_SUCCESS: return RMT_ERROR_NONE;
+        case CUDA_ERROR_DEINITIALIZED: return RMT_ERROR_CUDA_DEINITIALIZED;
+        case CUDA_ERROR_NOT_INITIALIZED: return RMT_ERROR_CUDA_NOT_INITIALIZED;
+        case CUDA_ERROR_INVALID_CONTEXT: return RMT_ERROR_CUDA_INVALID_CONTEXT;
+        case CUDA_ERROR_INVALID_VALUE: return RMT_ERROR_CUDA_INVALID_VALUE;
+        case CUDA_ERROR_INVALID_HANDLE: return RMT_ERROR_CUDA_INVALID_HANDLE;
+        case CUDA_ERROR_OUT_OF_MEMORY: return RMT_ERROR_CUDA_OUT_OF_MEMORY;
+        case CUDA_ERROR_NOT_READY: return RMT_ERROR_ERROR_NOT_READY;
+        default: return RMT_ERROR_CUDA_UNKNOWN;
+    }
+}
+
+
+#define CUDA_MAKE_FUNCTION(name, params)                    \
+    typedef CUresult (CUDAAPI *name##Ptr) params;           \
+    name##Ptr name = (name##Ptr)g_Remotery->cuda.name;
+
+
+#define CUDA_GUARD(call)                \
+    {                                   \
+        rmtError error = call;     \
+        if (error != RMT_ERROR_NONE)    \
+            return error;               \
+    }
+
+
+// Wrappers around CUDA driver functions that manage the active context.
+static rmtError CUDASetContext(void* context)
+{
+    CUDA_MAKE_FUNCTION(CtxSetCurrent, (CUcontext ctx));
+    assert(CtxSetCurrent != NULL);
+    return MapCUDAResult(CtxSetCurrent((CUcontext)context));
+}
+static rmtError CUDAGetContext(void** context)
+{
+    CUDA_MAKE_FUNCTION(CtxGetCurrent, (CUcontext* ctx));
+    assert(CtxGetCurrent != NULL);
+    return MapCUDAResult(CtxGetCurrent((CUcontext*)context));
+}
+static rmtError CUDAEnsureContext()
+{
+    void* current_context;
+    CUDA_GUARD(CUDAGetContext(&current_context));
+
+    assert(g_Remotery != NULL);
+    if (current_context != g_Remotery->cuda.context)
+        CUDA_GUARD(CUDASetContext(g_Remotery->cuda.context));
+
+    return RMT_ERROR_NONE;
+}
+
+
+// Wrappers around CUDA driver functions that manage events
+static rmtError CUDAEventCreate(CUevent* phEvent, unsigned int Flags)
+{
+    CUDA_MAKE_FUNCTION(EventCreate, (CUevent *phEvent, unsigned int Flags));
+    CUDA_GUARD(CUDAEnsureContext());
+    return MapCUDAResult(EventCreate(phEvent, Flags));
+}
+static rmtError CUDAEventDestroy(CUevent hEvent)
+{
+    CUDA_MAKE_FUNCTION(EventDestroy, (CUevent hEvent));
+    CUDA_GUARD(CUDAEnsureContext());
+    return MapCUDAResult(EventDestroy(hEvent));
+}
+static rmtError CUDAEventRecord(CUevent hEvent, void* hStream)
+{
+    CUDA_MAKE_FUNCTION(EventRecord, (CUevent hEvent, CUstream hStream));
+    CUDA_GUARD(CUDAEnsureContext());
+    return MapCUDAResult(EventRecord(hEvent, (CUstream)hStream));
+}
+static rmtError CUDAEventQuery(CUevent hEvent)
+{
+    CUDA_MAKE_FUNCTION(EventQuery,  (CUevent hEvent));
+    CUDA_GUARD(CUDAEnsureContext());
+    return MapCUDAResult(EventQuery(hEvent));
+}
+static rmtError CUDAEventElapsedTime(float* pMilliseconds, CUevent hStart, CUevent hEnd)
+{
+    CUDA_MAKE_FUNCTION(EventElapsedTime, (float *pMilliseconds, CUevent hStart, CUevent hEnd));
+    CUDA_GUARD(CUDAEnsureContext());
+    return MapCUDAResult(EventElapsedTime(pMilliseconds, hStart, hEnd));
+}
+
+
+static rmtError CUDASample_Constructor(CUDASample* sample)
+{
+    rmtError error;
+
+    assert(sample != NULL);
+
+    // Chain to sample constructor
+    Sample_Constructor((Sample*)sample);
+    sample->base.type = SampleType_CUDA;
+    sample->base.size_bytes = sizeof(CUDASample);
+    sample->event_start = NULL;
+    sample->event_end = NULL;
+
+    // Create non-blocking events with timing
+    assert(g_Remotery != NULL);
+    error = CUDAEventCreate(&sample->event_start, CU_EVENT_DEFAULT);
+    if (error == RMT_ERROR_NONE)
+        error = CUDAEventCreate(&sample->event_end, CU_EVENT_DEFAULT);
+    return error;
+}
+
+
+static void CUDASample_Destructor(CUDASample* sample)
+{
+    assert(sample != NULL);
+
+    // Destroy events
+    if (sample->event_start != NULL)
+        CUDAEventDestroy(sample->event_start);
+    if (sample->event_end != NULL)
+        CUDAEventDestroy(sample->event_end);
+
+    Sample_Destructor((Sample*)sample);
+}
+
+
+static rmtBool AreCUDASamplesReady(Sample* sample)
+{
+    rmtError error;
+    Sample* child;
+
+    CUDASample* cuda_sample = (CUDASample*)sample;
+    assert(sample->type == SampleType_CUDA);
+
+    // Check to see if both of the CUDA events have been processed
+    error = CUDAEventQuery(cuda_sample->event_start);
+    if (error != RMT_ERROR_NONE)
+        return RMT_FALSE;
+    error = CUDAEventQuery(cuda_sample->event_end);
+    if (error != RMT_ERROR_NONE)
+        return RMT_FALSE;
+
+    // Check child sample events
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        if (!AreCUDASamplesReady(child))
+            return RMT_FALSE;
+    }
+
+    return RMT_TRUE;
+}
+
+
+static rmtBool GetCUDASampleTimes(Sample* root_sample, Sample* sample)
+{
+    Sample* child;
+
+    CUDASample* cuda_root_sample = (CUDASample*)root_sample;
+    CUDASample* cuda_sample = (CUDASample*)sample;
+
+    float ms_start, ms_end;
+
+    assert(root_sample != NULL);
+    assert(sample != NULL);
+
+    // Get millisecond timing of each sample event, relative to initial root sample
+    if (CUDAEventElapsedTime(&ms_start, cuda_root_sample->event_start, cuda_sample->event_start) != RMT_ERROR_NONE)
+        return RMT_FALSE;
+    if (CUDAEventElapsedTime(&ms_end, cuda_root_sample->event_start, cuda_sample->event_end) != RMT_ERROR_NONE)
+        return RMT_FALSE;
+
+    // Convert to microseconds and add to the sample
+    sample->us_start = (rmtU64)(ms_start * 1000);
+    sample->us_end = (rmtU64)(ms_end * 1000);
+    sample->us_length = sample->us_end - sample->us_start;
+
+    // Get child sample times
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        if (!GetCUDASampleTimes(root_sample, child))
+            return RMT_FALSE;
+    }
+
+    return RMT_TRUE;
+}
+
+
+RMT_API void _rmt_BindCUDA(const rmtCUDABind* bind)
+{
+    assert(bind != NULL);
+    if (g_Remotery != NULL)
+        g_Remotery->cuda = *bind;
+}
+
+
+RMT_API void _rmt_BeginCUDASample(rmtPStr name, rmtU32* hash_cache, void* stream)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        rmtError error;
+        Sample* sample;
+        rmtU32 name_hash = ThreadSampler_GetNameHash(ts, name, hash_cache);
+
+        // Create the CUDA tree on-demand as the tree needs an up-front-created root.
+        // This is not possible to create on initialisation as a CUDA binding is not yet available.
+        SampleTree** cuda_tree = &ts->sample_trees[SampleType_CUDA];
+        if (*cuda_tree == NULL)
+        {
+            CUDASample* root_sample;
+
+            New_3(SampleTree, *cuda_tree, sizeof(CUDASample), (ObjConstructor)CUDASample_Constructor, (ObjDestructor)CUDASample_Destructor);
+            if (error != RMT_ERROR_NONE)
+                return;
+
+            // Record an event once on the root sample, used to measure absolute sample
+            // times since this point
+            root_sample = (CUDASample*)(*cuda_tree)->root;
+            error = CUDAEventRecord(root_sample->event_start, stream);
+            if (error != RMT_ERROR_NONE)
+                return;
+        }
+
+        // Push the same and record its event
+        if (ThreadSampler_Push(*cuda_tree, name_hash, 0, &sample) == RMT_ERROR_NONE)
+        {
+            CUDASample* cuda_sample = (CUDASample*)sample;
+            CUDAEventRecord(cuda_sample->event_start, stream);
+        }
+    }
+}
+
+
+RMT_API void _rmt_EndCUDASample(void* stream)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        CUDASample* sample = (CUDASample*)ts->sample_trees[SampleType_CUDA]->current_parent;
+        if (sample->base.recurse_depth > 0)
+        {
+            sample->base.recurse_depth--;
+        }
+        else
+        {
+            CUDAEventRecord(sample->event_end, stream);
+            ThreadSampler_Pop(ts, g_Remotery->mq_to_rmt_thread, (Sample*)sample);
+        }
+    }
+}
+
+
+#endif  // RMT_USE_CUDA
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+   @D3D11: Direct3D 11 event sampling
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#if RMT_USE_D3D11
+
+
+// As clReflect has no way of disabling C++ compile mode, this forces C interfaces everywhere...
+#define CINTERFACE
+
+// ...unfortunately these C++ helpers aren't wrapped by the same macro but they can be disabled individually
+#define D3D11_NO_HELPERS
+
+// Allow use of the D3D11 helper macros for accessing the C-style vtable
+#define COBJMACROS
+
+#ifdef _MSC_VER
+    // Disable for d3d11.h
+    // warning C4201: nonstandard extension used : nameless struct/union
+    #pragma warning(push)
+    #pragma warning(disable: 4201)
+#endif
+
+#include <d3d11.h>
+
+#ifdef _MSC_VER
+    #pragma warning(pop)
+#endif
+
+
+typedef struct D3D11
+{
+    // Context set by user
+    ID3D11Device* device;
+    ID3D11DeviceContext* context;
+
+    HRESULT last_error;
+
+    // Queue to the D3D 11 main update thread
+    // Given that BeginSample/EndSample need to be called from the same thread that does the update, there
+    // is really no need for this to be a thread-safe queue. I'm using it for its convenience.
+    rmtMessageQueue* mq_to_d3d11_main;
+
+    // Mark the first time so that remaining timestamps are offset from this
+    rmtU64 first_timestamp;
+    // Last time in us (CPU time, via usTimer_Get) since we last resync'ed CPU & GPU
+    rmtU64 last_resync;
+
+    // Sample trees in transit in the message queue for release on shutdown
+    Buffer* flush_samples;
+} D3D11;
+
+
+static rmtError D3D11_Create(D3D11** d3d11)
+{
+    rmtError error;
+
+    assert(d3d11 != NULL);
+
+    // Allocate space for the D3D11 data
+    *d3d11 = (D3D11*)rmtMalloc(sizeof(D3D11));
+    if (*d3d11 == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+
+    // Set defaults
+    (*d3d11)->device = NULL;
+    (*d3d11)->context = NULL;
+    (*d3d11)->last_error = S_OK;
+    (*d3d11)->mq_to_d3d11_main = NULL;
+    (*d3d11)->first_timestamp = 0;
+    (*d3d11)->last_resync = 0;
+    (*d3d11)->flush_samples = NULL;
+
+    New_1(rmtMessageQueue, (*d3d11)->mq_to_d3d11_main, g_Settings.messageQueueSizeInBytes);
+    if (error != RMT_ERROR_NONE)
+    {
+        Delete(D3D11, *d3d11);
+        return error;
+    }
+
+    New_1(Buffer, (*d3d11)->flush_samples, 8 * 1024);
+    if (error != RMT_ERROR_NONE)
+    {
+        Delete(D3D11, *d3d11);
+        return error;
+    }
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void D3D11_Destructor(D3D11* d3d11)
+{
+    assert(d3d11 != NULL);
+    Delete(Buffer, d3d11->flush_samples);
+    Delete(rmtMessageQueue, d3d11->mq_to_d3d11_main);
+}
+
+static HRESULT rmtD3D11Finish(rmtU64 *out_timestamp, double *out_frequency)
+{
+    HRESULT result;
+    ID3D11Device* device = g_Remotery->d3d11->device;
+    ID3D11DeviceContext* context = g_Remotery->d3d11->context;
+    ID3D11Query* full_stall_fence;
+    ID3D11Query* query_disjoint;
+    D3D11_QUERY_DESC query_desc;
+    D3D11_QUERY_DESC disjoint_desc;
+    UINT64 timestamp;
+    D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
+
+    query_desc.Query = D3D11_QUERY_TIMESTAMP;
+    query_desc.MiscFlags = 0;
+    result = ID3D11Device_CreateQuery(device, &query_desc, &full_stall_fence);
+    if (result != S_OK)
+        return result;
+
+    disjoint_desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
+    disjoint_desc.MiscFlags = 0;
+    result = ID3D11Device_CreateQuery(device, &disjoint_desc, &query_disjoint);
+    if (result != S_OK)
+    {
+        ID3D11Query_Release(full_stall_fence);
+        return result;
+    }
+
+    ID3D11DeviceContext_Begin(context, (ID3D11Asynchronous*)query_disjoint);
+    ID3D11DeviceContext_End(context, (ID3D11Asynchronous*)full_stall_fence);
+    ID3D11DeviceContext_End(context, (ID3D11Asynchronous*)query_disjoint);
+
+    result = S_FALSE;
+
+    while( result == S_FALSE )
+    {
+        result = ID3D11DeviceContext_GetData(context, (ID3D11Asynchronous*)query_disjoint, &disjoint, sizeof(disjoint), 0);
+        if (result != S_OK && result != S_FALSE)
+        {
+            ID3D11Query_Release(full_stall_fence);
+            ID3D11Query_Release(query_disjoint);
+            return result;
+        }
+        if( result == S_OK )
+        {
+            result = ID3D11DeviceContext_GetData(context, (ID3D11Asynchronous*)full_stall_fence, &timestamp, sizeof(timestamp), 0);
+            if (result != S_OK && result != S_FALSE)
+            {
+                ID3D11Query_Release(full_stall_fence);
+                ID3D11Query_Release(query_disjoint);
+                return result;
+            }
+        }
+        //Give HyperThreading threads a breath on this spinlock.
+        YieldProcessor();
+    }
+
+    if (disjoint.Disjoint == FALSE)
+    {
+        double frequency = disjoint.Frequency / 1000000.0;
+        *out_timestamp = timestamp;
+        *out_frequency = frequency;
+    }
+    else
+    {
+        result = S_FALSE;
+    }
+
+    ID3D11Query_Release(full_stall_fence);
+    ID3D11Query_Release(query_disjoint);
+    return result;
+}
+
+static HRESULT SyncD3D11CpuGpuTimes(rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    rmtU64 cpu_time_start = 0;
+    rmtU64 cpu_time_stop = 0;
+    rmtU64 average_half_RTT = 0; //RTT = Rountrip Time.
+    UINT64 gpu_base = 0;
+    double frequency = 1;
+    int i;
+
+    HRESULT result;
+    result = rmtD3D11Finish(&gpu_base, &frequency);
+    if (result != S_OK && result != S_FALSE)
+        return result;
+
+    for (i=0; i<RMT_GPU_CPU_SYNC_NUM_ITERATIONS; ++i)
+    {
+        rmtU64 half_RTT;
+        cpu_time_start = usTimer_Get(&g_Remotery->timer);
+        result = rmtD3D11Finish(&gpu_base, &frequency);
+        cpu_time_stop = usTimer_Get(&g_Remotery->timer);
+
+        if (result != S_OK && result != S_FALSE)
+            return result;
+
+        //Ignore attempts where there was a disjoint, since there would
+        //be a lot of noise in those readings for measuring the RTT
+        if (result == S_OK)
+        {
+            //Average the time it takes a roundtrip from CPU to GPU
+            //while doing nothing other than getting timestamps
+            half_RTT = (cpu_time_stop - cpu_time_start) >> 1ULL;
+            if( i == 0 )
+                average_half_RTT = half_RTT;
+            else
+                average_half_RTT = (average_half_RTT + half_RTT) >> 1ULL;
+        }
+    }
+
+    // All GPU times are offset from gpu_base, and then taken to
+    // the same relative origin CPU timestamps are based on.
+    // CPU is in us, we must translate it to ns.
+    *out_first_timestamp = gpu_base - (rmtU64)((cpu_time_start + average_half_RTT) * frequency);
+    *out_last_resync = cpu_time_stop;
+
+    return result;
+}
+
+typedef struct D3D11Timestamp
+{
+    // Inherit so that timestamps can be quickly allocated
+    ObjectLink Link;
+
+    // Pair of timestamp queries that wrap the sample
+    ID3D11Query* query_start;
+    ID3D11Query* query_end;
+
+    // A disjoint to measure frequency/stability
+    // TODO: Does *each* sample need one of these?
+    ID3D11Query* query_disjoint;
+
+    rmtU64 cpu_timestamp;
+} D3D11Timestamp;
+
+
+static rmtError D3D11Timestamp_Constructor(D3D11Timestamp* stamp)
+{
+    D3D11_QUERY_DESC timestamp_desc;
+    D3D11_QUERY_DESC disjoint_desc;
+    ID3D11Device* device;
+    HRESULT* last_error;
+
+    assert(stamp != NULL);
+
+    ObjectLink_Constructor((ObjectLink*)stamp);
+
+    // Set defaults
+    stamp->query_start = NULL;
+    stamp->query_end = NULL;
+    stamp->query_disjoint = NULL;
+    stamp->cpu_timestamp = 0;
+
+    assert(g_Remotery != NULL);
+    assert(g_Remotery->d3d11 != NULL);
+    device = g_Remotery->d3d11->device;
+    last_error = &g_Remotery->d3d11->last_error;
+
+    // Create start/end timestamp queries
+    timestamp_desc.Query = D3D11_QUERY_TIMESTAMP;
+    timestamp_desc.MiscFlags = 0;
+    *last_error = ID3D11Device_CreateQuery(device, &timestamp_desc, &stamp->query_start);
+    if (*last_error != S_OK)
+        return RMT_ERROR_D3D11_FAILED_TO_CREATE_QUERY;
+    *last_error = ID3D11Device_CreateQuery(device, &timestamp_desc, &stamp->query_end);
+    if (*last_error != S_OK)
+        return RMT_ERROR_D3D11_FAILED_TO_CREATE_QUERY;
+
+    // Create disjoint query
+    disjoint_desc.Query = D3D11_QUERY_TIMESTAMP_DISJOINT;
+    disjoint_desc.MiscFlags = 0;
+    *last_error = ID3D11Device_CreateQuery(device, &disjoint_desc, &stamp->query_disjoint);
+    if (*last_error != S_OK)
+        return RMT_ERROR_D3D11_FAILED_TO_CREATE_QUERY;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void D3D11Timestamp_Destructor(D3D11Timestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    // Destroy queries
+    if (stamp->query_disjoint != NULL)
+        ID3D11Query_Release(stamp->query_disjoint);
+    if (stamp->query_end != NULL)
+        ID3D11Query_Release(stamp->query_end);
+    if (stamp->query_start != NULL)
+        ID3D11Query_Release(stamp->query_start);
+}
+
+
+static void D3D11Timestamp_Begin(D3D11Timestamp* stamp, ID3D11DeviceContext* context)
+{
+    assert(stamp != NULL);
+
+    // Start of disjoint and first query
+    stamp->cpu_timestamp = usTimer_Get(&g_Remotery->timer);
+    ID3D11DeviceContext_Begin(context, (ID3D11Asynchronous*)stamp->query_disjoint);
+    ID3D11DeviceContext_End(context, (ID3D11Asynchronous*)stamp->query_start);
+}
+
+
+static void D3D11Timestamp_End(D3D11Timestamp* stamp, ID3D11DeviceContext* context)
+{
+    assert(stamp != NULL);
+
+    // End of disjoint and second query
+    ID3D11DeviceContext_End(context, (ID3D11Asynchronous*)stamp->query_end);
+    ID3D11DeviceContext_End(context, (ID3D11Asynchronous*)stamp->query_disjoint);
+}
+
+
+static HRESULT D3D11Timestamp_GetData(D3D11Timestamp* stamp, ID3D11DeviceContext* context, rmtU64* out_start, rmtU64* out_end, rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    ID3D11Asynchronous* query_start;
+    ID3D11Asynchronous* query_end;
+    ID3D11Asynchronous* query_disjoint;
+    HRESULT result;
+
+    UINT64 start;
+    UINT64 end;
+    D3D11_QUERY_DATA_TIMESTAMP_DISJOINT disjoint;
+
+    assert(stamp != NULL);
+    query_start = (ID3D11Asynchronous*)stamp->query_start;
+    query_end = (ID3D11Asynchronous*)stamp->query_end;
+    query_disjoint = (ID3D11Asynchronous*)stamp->query_disjoint;
+
+    // Check to see if all queries are ready
+    // If any fail to arrive, wait until later
+    result = ID3D11DeviceContext_GetData(context, query_start, &start, sizeof(start), D3D11_ASYNC_GETDATA_DONOTFLUSH);
+    if (result != S_OK)
+        return result;
+    result = ID3D11DeviceContext_GetData(context, query_end, &end, sizeof(end), D3D11_ASYNC_GETDATA_DONOTFLUSH);
+    if (result != S_OK)
+        return result;
+    result = ID3D11DeviceContext_GetData(context, query_disjoint, &disjoint, sizeof(disjoint), D3D11_ASYNC_GETDATA_DONOTFLUSH);
+    if (result != S_OK)
+        return result;
+
+    if (disjoint.Disjoint == FALSE)
+    {
+        double frequency = disjoint.Frequency / 1000000.0;
+
+        // Mark the first timestamp. We may resync if we detect the GPU timestamp is in the
+        // past (i.e. happened before the CPU command) since it should be impossible.
+        assert(out_first_timestamp != NULL);
+        if (*out_first_timestamp == 0 || ((start - *out_first_timestamp) / frequency) < stamp->cpu_timestamp)
+        {
+            result = SyncD3D11CpuGpuTimes(out_first_timestamp, out_last_resync);
+            if (result != S_OK)
+                return result;
+        }
+
+        // Calculate start and end timestamps from the disjoint info
+        *out_start = (rmtU64)((start - *out_first_timestamp) / frequency);
+        *out_end = (rmtU64)((end - *out_first_timestamp) / frequency);
+    }
+    else
+    {
+#if RMT_D3D11_RESYNC_ON_DISJOINT
+        result = SyncD3D11CpuGpuTimes(out_first_timestamp, out_last_resync);
+        if (result != S_OK)
+            return result;
+#endif
+    }
+
+    return S_OK;
+}
+
+
+typedef struct D3D11Sample
+{
+    // IS-A inheritance relationship
+    Sample base;
+
+    D3D11Timestamp* timestamp;
+
+} D3D11Sample;
+
+
+static rmtError D3D11Sample_Constructor(D3D11Sample* sample)
+{
+    rmtError error;
+
+    assert(sample != NULL);
+
+    // Chain to sample constructor
+    Sample_Constructor((Sample*)sample);
+    sample->base.type = SampleType_D3D11;
+    sample->base.size_bytes = sizeof(D3D11Sample);
+    New_0(D3D11Timestamp, sample->timestamp);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void D3D11Sample_Destructor(D3D11Sample* sample)
+{
+    Delete(D3D11Timestamp, sample->timestamp);
+    Sample_Destructor((Sample*)sample);
+}
+
+
+RMT_API void _rmt_BindD3D11(void* device, void* context)
+{
+    if (g_Remotery != NULL)
+    {
+        assert(g_Remotery->d3d11 != NULL);
+
+        assert(device != NULL);
+        g_Remotery->d3d11->device = (ID3D11Device*)device;
+        assert(context != NULL);
+        g_Remotery->d3d11->context = (ID3D11DeviceContext*)context;
+    }
+}
+
+
+static void UpdateD3D11Frame(void);
+
+
+RMT_API void _rmt_UnbindD3D11(void)
+{
+    if (g_Remotery != NULL)
+    {
+        D3D11* d3d11 = g_Remotery->d3d11;
+        assert(d3d11 != NULL);
+
+        // Stall waiting for the D3D queue to empty into the Remotery queue
+        while (!rmtMessageQueue_IsEmpty(d3d11->mq_to_d3d11_main))
+            UpdateD3D11Frame();
+        
+        // There will be a whole bunch of D3D11 sample trees queued up the remotery queue that need releasing
+        FreePendingSampleTrees(g_Remotery, SampleType_D3D11, d3d11->flush_samples);
+        
+        // Inform sampler to not add any more samples
+        d3d11->device = NULL;
+        d3d11->context = NULL;
+
+        // Forcefully delete sample tree on this thread to release time stamps from
+        // the same thread that created them
+        Remotery_DeleteSampleTree(g_Remotery, SampleType_D3D11);
+    }
+}
+
+
+RMT_API void _rmt_BeginD3D11Sample(rmtPStr name, rmtU32* hash_cache)
+{
+    ThreadSampler* ts;
+    D3D11* d3d11;
+
+    if (g_Remotery == NULL)
+        return;
+
+    // Has D3D11 been unbound?
+    d3d11 = g_Remotery->d3d11;
+    assert(d3d11 != NULL);
+    if (d3d11->device == NULL || d3d11->context == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        Sample* sample;
+        rmtU32 name_hash = ThreadSampler_GetNameHash(ts, name, hash_cache);
+
+        // Create the D3D11 tree on-demand as the tree needs an up-front-created root.
+        // This is not possible to create on initialisation as a D3D11 binding is not yet available.
+        SampleTree** d3d_tree = &ts->sample_trees[SampleType_D3D11];
+        if (*d3d_tree == NULL)
+        {
+            rmtError error;
+            New_3(SampleTree, *d3d_tree, sizeof(D3D11Sample), (ObjConstructor)D3D11Sample_Constructor, (ObjDestructor)D3D11Sample_Destructor);
+            if (error != RMT_ERROR_NONE)
+                return;
+        }
+
+        // Push the sample and activate the timestamp
+        if (ThreadSampler_Push(*d3d_tree, name_hash, 0, &sample) == RMT_ERROR_NONE)
+        {
+            D3D11Sample* d3d_sample = (D3D11Sample*)sample;
+            D3D11Timestamp_Begin(d3d_sample->timestamp, d3d11->context);
+        }
+    }
+}
+
+
+static rmtBool GetD3D11SampleTimes(Sample* sample, rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    Sample* child;
+
+    D3D11Sample* d3d_sample = (D3D11Sample*)sample;
+
+    assert(sample != NULL);
+    if (d3d_sample->timestamp != NULL)
+    {
+        HRESULT result;
+
+        D3D11* d3d11 = g_Remotery->d3d11;
+        assert(d3d11 != NULL);
+
+        assert(out_last_resync != NULL);
+
+        #if (RMT_GPU_CPU_SYNC_SECONDS > 0)
+            if (*out_last_resync < d3d_sample->timestamp->cpu_timestamp)
+            {
+                //Convert from us to seconds.
+                rmtU64 time_diff = (d3d_sample->timestamp->cpu_timestamp - *out_last_resync) / 1000000ULL;
+                if (time_diff > RMT_GPU_CPU_SYNC_SECONDS)
+                {
+                    result = SyncD3D11CpuGpuTimes(out_first_timestamp, out_last_resync);
+                    if (result != S_OK)
+                    {
+                        d3d11->last_error = result;
+                        return RMT_FALSE;
+                    }
+                }
+            }
+        #endif
+
+        result = D3D11Timestamp_GetData(
+            d3d_sample->timestamp,
+            d3d11->context,
+            &sample->us_start,
+            &sample->us_end,
+            out_first_timestamp,
+            out_last_resync);
+
+        if (result != S_OK)
+        {
+            d3d11->last_error = result;
+            return RMT_FALSE;
+        }
+
+        sample->us_length = sample->us_end - sample->us_start;
+    }
+
+    // Sum length on the parent to track un-sampled time in the parent
+    if (sample->parent != NULL)
+    {
+        sample->parent->us_sampled_length += sample->us_length;
+    }
+
+    // Get child sample times
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        if (!GetD3D11SampleTimes(child, out_first_timestamp, out_last_resync))
+            return RMT_FALSE;
+    }
+
+    return RMT_TRUE;
+}
+
+
+static void UpdateD3D11Frame(void)
+{
+    D3D11* d3d11;
+
+    if (g_Remotery == NULL)
+        return;
+
+    d3d11 = g_Remotery->d3d11;
+    assert(d3d11 != NULL);
+
+    rmt_BeginCPUSample(rmt_UpdateD3D11Frame, 0);
+
+    // Process all messages in the D3D queue
+    for (;;)
+    {
+        Msg_SampleTree* sample_tree;
+        Sample* sample;
+
+        Message* message = rmtMessageQueue_PeekNextMessage(d3d11->mq_to_d3d11_main);
+        if (message == NULL)
+            break;
+
+        // There's only one valid message type in this queue
+        assert(message->id == MsgID_SampleTree);
+        sample_tree = (Msg_SampleTree*)message->payload;
+        sample = sample_tree->root_sample;
+        assert(sample->type == SampleType_D3D11);
+
+        // Retrieve timing of all D3D11 samples
+        // If they aren't ready leave the message unconsumed, holding up later frames and maintaining order
+        if (!GetD3D11SampleTimes(sample, &d3d11->first_timestamp, &d3d11->last_resync))
+            break;
+
+        // Pass samples onto the remotery thread for sending to the viewer
+        AddSampleTreeMessage(g_Remotery->mq_to_rmt_thread, sample, sample_tree->allocator, sample_tree->thread_name, message->thread_sampler);
+        rmtMessageQueue_ConsumeNextMessage(d3d11->mq_to_d3d11_main, message);
+    }
+
+    rmt_EndCPUSample();
+}
+
+
+RMT_API void _rmt_EndD3D11Sample(void)
+{
+    ThreadSampler* ts;
+    D3D11* d3d11;
+
+    if (g_Remotery == NULL)
+        return;
+
+    // Has D3D11 been unbound?
+    d3d11 = g_Remotery->d3d11;
+    assert(d3d11 != NULL);
+    if (d3d11->device == NULL || d3d11->context == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        // Close the timestamp
+        D3D11Sample* d3d_sample = (D3D11Sample*)ts->sample_trees[SampleType_D3D11]->current_parent;
+        if (d3d_sample->base.recurse_depth > 0)
+        {
+            d3d_sample->base.recurse_depth--;
+        }
+        else
+        {
+            if (d3d_sample->timestamp != NULL)
+                D3D11Timestamp_End(d3d_sample->timestamp, d3d11->context);
+
+            // Send to the update loop for ready-polling
+            if (ThreadSampler_Pop(ts, d3d11->mq_to_d3d11_main, (Sample*)d3d_sample))
+                // Perform ready-polling on popping of the root sample
+                UpdateD3D11Frame();
+        }
+    }
+}
+
+
+#endif  // RMT_USE_D3D11
+
+
+
+/*
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+@OpenGL: OpenGL event sampling
+------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
+*/
+
+
+
+#if RMT_USE_OPENGL
+
+
+#ifndef APIENTRY
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#    define APIENTRY __stdcall
+#  elif (defined(_MSC_VER) && (_MSC_VER >= 800)) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__)
+#    define APIENTRY __stdcall
+#  else
+#    define APIENTRY
+#  endif
+#endif
+
+#ifndef GLAPI
+#  if defined(__MINGW32__) || defined(__CYGWIN__)
+#    define GLAPI extern
+#  elif defined (_WIN32)
+#    define GLAPI WINGDIAPI
+#  else
+#    define GLAPI extern
+#  endif
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY APIENTRY
+#endif
+
+typedef rmtU32 GLenum;
+typedef rmtU32 GLuint;
+typedef rmtS32 GLint;
+typedef rmtS32 GLsizei;
+typedef rmtU64 GLuint64;
+typedef rmtS64 GLint64;
+typedef unsigned char GLubyte;
+
+typedef GLenum (GLAPIENTRY * PFNGLGETERRORPROC) (void);
+typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids);
+typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64* params);
+typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64* params);
+typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (GLAPIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
+typedef void (GLAPIENTRY * PFNGLFINISHPROC) (void);
+
+#define GL_NO_ERROR 0
+#define GL_QUERY_RESULT 0x8866
+#define GL_QUERY_RESULT_AVAILABLE 0x8867
+#define GL_TIME_ELAPSED 0x88BF
+#define GL_TIMESTAMP 0x8E28
+
+#define RMT_GL_GET_FUN(x) assert(g_Remotery->opengl->x != NULL); g_Remotery->opengl->x
+
+#define rmtglGenQueries RMT_GL_GET_FUN(__glGenQueries)
+#define rmtglDeleteQueries RMT_GL_GET_FUN(__glDeleteQueries)
+#define rmtglBeginQuery RMT_GL_GET_FUN(__glBeginQuery)
+#define rmtglEndQuery RMT_GL_GET_FUN(__glEndQuery)
+#define rmtglGetQueryObjectiv RMT_GL_GET_FUN(__glGetQueryObjectiv)
+#define rmtglGetQueryObjectuiv RMT_GL_GET_FUN(__glGetQueryObjectuiv)
+#define rmtglGetQueryObjecti64v RMT_GL_GET_FUN(__glGetQueryObjecti64v)
+#define rmtglGetQueryObjectui64v RMT_GL_GET_FUN(__glGetQueryObjectui64v)
+#define rmtglQueryCounter RMT_GL_GET_FUN(__glQueryCounter)
+#define rmtglGetInteger64v RMT_GL_GET_FUN(__glGetInteger64v)
+#define rmtglFinish RMT_GL_GET_FUN(__glFinish)
+
+
+struct OpenGL_t
+{
+    // Handle to the OS OpenGL DLL
+    void* dll_handle;
+
+    PFNGLGETERRORPROC __glGetError;
+    PFNGLGENQUERIESPROC __glGenQueries;
+    PFNGLDELETEQUERIESPROC __glDeleteQueries;
+    PFNGLBEGINQUERYPROC __glBeginQuery;
+    PFNGLENDQUERYPROC __glEndQuery;
+    PFNGLGETQUERYOBJECTIVPROC __glGetQueryObjectiv;
+    PFNGLGETQUERYOBJECTUIVPROC __glGetQueryObjectuiv;
+    PFNGLGETQUERYOBJECTI64VPROC __glGetQueryObjecti64v;
+    PFNGLGETQUERYOBJECTUI64VPROC __glGetQueryObjectui64v;
+    PFNGLQUERYCOUNTERPROC __glQueryCounter;
+    PFNGLGETINTEGER64VPROC __glGetInteger64v;
+    PFNGLFINISHPROC __glFinish;
+
+    // Queue to the OpenGL main update thread
+    // Given that BeginSample/EndSample need to be called from the same thread that does the update, there
+    // is really no need for this to be a thread-safe queue. I'm using it for its convenience.
+    rmtMessageQueue* mq_to_opengl_main;
+
+    // Mark the first time so that remaining timestamps are offset from this
+    rmtU64 first_timestamp;
+    // Last time in us (CPU time, via usTimer_Get) since we last resync'ed CPU & GPU
+    rmtU64 last_resync;
+
+    // Sample trees in transit in the message queue for release on shutdown
+    Buffer* flush_samples;
+};
+
+
+static GLenum rmtglGetError(void)
+{
+    if (g_Remotery != NULL)
+    {
+        assert(g_Remotery->opengl != NULL);
+        if (g_Remotery->opengl->__glGetError != NULL)
+            return g_Remotery->opengl->__glGetError();
+    }
+
+    return (GLenum)0;
+}
+
+
+#ifdef RMT_PLATFORM_LINUX
+    #ifdef __cplusplus
+        extern "C" void* glXGetProcAddressARB(const GLubyte*);
+    #else
+        extern void* glXGetProcAddressARB(const GLubyte*);
+    #endif
+#endif
+
+
+static ProcReturnType rmtglGetProcAddress(OpenGL* opengl, const char* symbol)
+{
+    #if defined(RMT_PLATFORM_WINDOWS)
+    {
+        // Get OpenGL extension-loading function for each call
+        typedef ProcReturnType (WINAPI * wglGetProcAddressFn)(LPCSTR);
+        assert(opengl != NULL);
+        {
+            wglGetProcAddressFn wglGetProcAddress = (wglGetProcAddressFn)rmtGetProcAddress(opengl->dll_handle, "wglGetProcAddress");
+            if (wglGetProcAddress != NULL)
+                return wglGetProcAddress(symbol);
+        }
+    }
+
+    #elif defined(RMT_PLATFORM_MACOS) && !defined(GLEW_APPLE_GLX)
+
+        return rmtGetProcAddress(opengl->dll_handle, symbol);
+
+    #elif defined(RMT_PLATFORM_LINUX)
+
+        return glXGetProcAddressARB((const GLubyte*)symbol);
+
+    #endif
+
+    return NULL;
+}
+
+
+static rmtError OpenGL_Create(OpenGL** opengl)
+{
+    rmtError error;
+
+    assert(opengl != NULL);
+
+    *opengl = (OpenGL*)rmtMalloc(sizeof(OpenGL));
+    if (*opengl == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+
+    (*opengl)->dll_handle = NULL;
+
+    (*opengl)->__glGetError = NULL;
+    (*opengl)->__glGenQueries = NULL;
+    (*opengl)->__glDeleteQueries = NULL;
+    (*opengl)->__glBeginQuery = NULL;
+    (*opengl)->__glEndQuery = NULL;
+    (*opengl)->__glGetQueryObjectiv = NULL;
+    (*opengl)->__glGetQueryObjectuiv = NULL;
+    (*opengl)->__glGetQueryObjecti64v = NULL;
+    (*opengl)->__glGetQueryObjectui64v = NULL;
+    (*opengl)->__glQueryCounter = NULL;
+    (*opengl)->__glGetInteger64v = NULL;
+    (*opengl)->__glFinish = NULL;
+
+    (*opengl)->mq_to_opengl_main = NULL;
+    (*opengl)->first_timestamp = 0;
+    (*opengl)->last_resync = 0;
+    (*opengl)->flush_samples = NULL;
+
+    New_1(Buffer, (*opengl)->flush_samples, 8 * 1024);
+    if (error != RMT_ERROR_NONE)
+    {
+        Delete(OpenGL, *opengl);
+        return error;
+    }
+
+    New_1(rmtMessageQueue, (*opengl)->mq_to_opengl_main, g_Settings.messageQueueSizeInBytes);
+
+    return error;
+}
+
+
+static void OpenGL_Destructor(OpenGL* opengl)
+{
+    assert(opengl != NULL);
+    Delete(rmtMessageQueue, opengl->mq_to_opengl_main);
+    Delete(Buffer, opengl->flush_samples);
+}
+
+static void SyncOpenGLCpuGpuTimes(rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    rmtU64 cpu_time_start = 0;
+    rmtU64 cpu_time_stop = 0;
+    rmtU64 average_half_RTT = 0; //RTT = Rountrip Time.
+    GLint64 gpu_base = 0;
+    int i;
+
+    rmtglFinish();
+
+    for (i=0; i<RMT_GPU_CPU_SYNC_NUM_ITERATIONS; ++i)
+    {
+        rmtU64 half_RTT;
+
+        rmtglFinish();
+        cpu_time_start = usTimer_Get(&g_Remotery->timer);
+        rmtglGetInteger64v(GL_TIMESTAMP, &gpu_base);
+        cpu_time_stop = usTimer_Get(&g_Remotery->timer);
+        //Average the time it takes a roundtrip from CPU to GPU
+        //while doing nothing other than getting timestamps
+        half_RTT = (cpu_time_stop - cpu_time_start) >> 1ULL;
+        if( i == 0 )
+            average_half_RTT = half_RTT;
+        else
+            average_half_RTT = (average_half_RTT + half_RTT) >> 1ULL;
+    }
+
+    // All GPU times are offset from gpu_base, and then taken to
+    // the same relative origin CPU timestamps are based on.
+    // CPU is in us, we must translate it to ns.
+    *out_first_timestamp = (rmtU64)(gpu_base) - (cpu_time_start + average_half_RTT) * 1000ULL;
+    *out_last_resync = cpu_time_stop;
+}
+
+
+typedef struct OpenGLTimestamp
+{
+    // Inherit so that timestamps can be quickly allocated
+    ObjectLink Link;
+
+    // Pair of timestamp queries that wrap the sample
+    GLuint queries[2];
+    rmtU64 cpu_timestamp;
+} OpenGLTimestamp;
+
+
+static rmtError OpenGLTimestamp_Constructor(OpenGLTimestamp* stamp)
+{
+    GLenum error;
+
+    assert(stamp != NULL);
+
+    ObjectLink_Constructor((ObjectLink*)stamp);
+
+    // Set defaults
+    stamp->queries[0] = stamp->queries[1] = 0;
+    stamp->cpu_timestamp = 0;
+
+    // Empty the error queue before using it for glGenQueries
+    while ((error = rmtglGetError()) != GL_NO_ERROR)
+        ;
+
+    // Create start/end timestamp queries
+    assert(g_Remotery != NULL);
+    rmtglGenQueries(2, stamp->queries);
+    error = rmtglGetError();
+    if (error != GL_NO_ERROR)
+        return RMT_ERROR_OPENGL_ERROR;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void OpenGLTimestamp_Destructor(OpenGLTimestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    // Destroy queries
+    if (stamp->queries[0] != 0)
+        rmtglDeleteQueries(2, stamp->queries);
+}
+
+
+static void OpenGLTimestamp_Begin(OpenGLTimestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    // First query
+    assert(g_Remotery != NULL);
+    stamp->cpu_timestamp = usTimer_Get(&g_Remotery->timer);
+    rmtglQueryCounter(stamp->queries[0], GL_TIMESTAMP);
+}
+
+
+static void OpenGLTimestamp_End(OpenGLTimestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    // Second query
+    assert(g_Remotery != NULL);
+    rmtglQueryCounter(stamp->queries[1], GL_TIMESTAMP);
+}
+
+static rmtBool OpenGLTimestamp_GetData(OpenGLTimestamp* stamp, rmtU64* out_start, rmtU64* out_end, rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    GLuint64 start = 0, end = 0;
+    GLint startAvailable = 0, endAvailable = 0;
+
+    assert(g_Remotery != NULL);
+
+    assert(stamp != NULL);
+    assert(stamp->queries[0] != 0 && stamp->queries[1] != 0);
+
+    // Check to see if all queries are ready
+    // If any fail to arrive, wait until later
+    rmtglGetQueryObjectiv(stamp->queries[0], GL_QUERY_RESULT_AVAILABLE, &startAvailable);
+    if (!startAvailable)
+        return RMT_FALSE;
+    rmtglGetQueryObjectiv(stamp->queries[1], GL_QUERY_RESULT_AVAILABLE, &endAvailable);
+    if (!endAvailable)
+        return RMT_FALSE;
+
+    rmtglGetQueryObjectui64v(stamp->queries[0], GL_QUERY_RESULT, &start);
+    rmtglGetQueryObjectui64v(stamp->queries[1], GL_QUERY_RESULT, &end);
+
+    // Mark the first timestamp. We may resync if we detect the GPU timestamp is in the
+    // past (i.e. happened before the CPU command) since it should be impossible.
+    assert(out_first_timestamp != NULL);
+    if (*out_first_timestamp == 0 || ((start - *out_first_timestamp) / 1000ULL) < stamp->cpu_timestamp)
+        SyncOpenGLCpuGpuTimes(out_first_timestamp, out_last_resync);
+
+    // Calculate start and end timestamps (we want us, the queries give us ns)
+    *out_start = (rmtU64)(start - *out_first_timestamp) / 1000ULL;
+    *out_end = (rmtU64)(end - *out_first_timestamp) / 1000ULL;
+
+    return RMT_TRUE;
+}
+
+
+typedef struct OpenGLSample
+{
+    // IS-A inheritance relationship
+    Sample base;
+
+    OpenGLTimestamp* timestamp;
+
+} OpenGLSample;
+
+
+static rmtError OpenGLSample_Constructor(OpenGLSample* sample)
+{
+    rmtError error;
+
+    assert(sample != NULL);
+
+    // Chain to sample constructor
+    Sample_Constructor((Sample*)sample);
+    sample->base.type = SampleType_OpenGL;
+    sample->base.size_bytes = sizeof(OpenGLSample);
+    New_0(OpenGLTimestamp, sample->timestamp);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void OpenGLSample_Destructor(OpenGLSample* sample)
+{
+    Delete(OpenGLTimestamp, sample->timestamp);
+    Sample_Destructor((Sample*)sample);
+}
+
+
+RMT_API void _rmt_BindOpenGL()
+{
+    if (g_Remotery != NULL)
+    {
+        OpenGL* opengl = g_Remotery->opengl;
+        assert(opengl != NULL);
+
+        #if defined (RMT_PLATFORM_WINDOWS)
+            opengl->dll_handle = rmtLoadLibrary("opengl32.dll");
+        #elif defined (RMT_PLATFORM_MACOS)
+            opengl->dll_handle = rmtLoadLibrary("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL");
+        #elif defined (RMT_PLATFORM_LINUX)
+            opengl->dll_handle = rmtLoadLibrary("libGL.so");
+        #endif
+
+        opengl->__glGetError = (PFNGLGETERRORPROC)rmtGetProcAddress(opengl->dll_handle, "glGetError");
+        opengl->__glGenQueries = (PFNGLGENQUERIESPROC)rmtglGetProcAddress(opengl, "glGenQueries");
+        opengl->__glDeleteQueries = (PFNGLDELETEQUERIESPROC)rmtglGetProcAddress(opengl, "glDeleteQueries");
+        opengl->__glBeginQuery = (PFNGLBEGINQUERYPROC)rmtglGetProcAddress(opengl, "glBeginQuery");
+        opengl->__glEndQuery = (PFNGLENDQUERYPROC)rmtglGetProcAddress(opengl, "glEndQuery");
+        opengl->__glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)rmtglGetProcAddress(opengl, "glGetQueryObjectiv");
+        opengl->__glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)rmtglGetProcAddress(opengl, "glGetQueryObjectuiv");
+        opengl->__glGetQueryObjecti64v = (PFNGLGETQUERYOBJECTI64VPROC)rmtglGetProcAddress(opengl, "glGetQueryObjecti64v");
+        opengl->__glGetQueryObjectui64v = (PFNGLGETQUERYOBJECTUI64VPROC)rmtglGetProcAddress(opengl, "glGetQueryObjectui64v");
+        opengl->__glQueryCounter = (PFNGLQUERYCOUNTERPROC)rmtglGetProcAddress(opengl, "glQueryCounter");
+        opengl->__glGetInteger64v = (PFNGLGETINTEGER64VPROC)rmtglGetProcAddress(opengl, "glGetInteger64v");
+        opengl->__glFinish = (PFNGLFINISHPROC)rmtGetProcAddress(opengl->dll_handle, "glFinish");
+    }
+}
+
+
+static void UpdateOpenGLFrame(void);
+
+
+RMT_API void _rmt_UnbindOpenGL(void)
+{
+    if (g_Remotery != NULL)
+    {
+        OpenGL* opengl = g_Remotery->opengl;
+        assert(opengl != NULL);
+
+        // Stall waiting for the OpenGL queue to empty into the Remotery queue
+        while (!rmtMessageQueue_IsEmpty(opengl->mq_to_opengl_main))
+#if 0
+            UpdateOpenGLFrame();
+#else
+		//GPAC crude patch to avoid deadlock on opengl unbind upon exit
+		{
+			Message* message = rmtMessageQueue_PeekNextMessage(opengl->mq_to_opengl_main);
+			if (message == NULL)
+				break;
+
+			rmtMessageQueue_ConsumeNextMessage(opengl->mq_to_opengl_main, message);
+		}
+#endif
+
+        // There will be a whole bunch of OpenGL sample trees queued up the remotery queue that need releasing
+        FreePendingSampleTrees(g_Remotery, SampleType_OpenGL, opengl->flush_samples);
+
+        // Forcefully delete sample tree on this thread to release time stamps from
+        // the same thread that created them
+        Remotery_DeleteSampleTree(g_Remotery, SampleType_OpenGL);
+
+        // Release reference to the OpenGL DLL
+        if (opengl->dll_handle != NULL)
+        {
+            rmtFreeLibrary(opengl->dll_handle);
+            opengl->dll_handle = NULL;
+        }
+    }
+}
+
+
+RMT_API void _rmt_BeginOpenGLSample(rmtPStr name, rmtU32* hash_cache)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (g_Remotery->opengl->dll_handle == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        Sample* sample;
+        rmtU32 name_hash = ThreadSampler_GetNameHash(ts, name, hash_cache);
+
+        // Create the OpenGL tree on-demand as the tree needs an up-front-created root.
+        // This is not possible to create on initialisation as a OpenGL binding is not yet available.
+        SampleTree** ogl_tree = &ts->sample_trees[SampleType_OpenGL];
+        if (*ogl_tree == NULL)
+        {
+            rmtError error;
+            New_3(SampleTree, *ogl_tree, sizeof(OpenGLSample), (ObjConstructor)OpenGLSample_Constructor, (ObjDestructor)OpenGLSample_Destructor);
+            if (error != RMT_ERROR_NONE)
+                return;
+        }
+
+        // Push the sample and activate the timestamp
+        if (ThreadSampler_Push(*ogl_tree, name_hash, 0, &sample) == RMT_ERROR_NONE)
+        {
+            OpenGLSample* ogl_sample = (OpenGLSample*)sample;
+            OpenGLTimestamp_Begin(ogl_sample->timestamp);
+        }
+    }
+    // Empty the error queue before using it for glGenQueries
+    while ( rmtglGetError() != GL_NO_ERROR)
+        ;
+}
+
+
+static rmtBool GetOpenGLSampleTimes(Sample* sample, rmtU64* out_first_timestamp, rmtU64* out_last_resync)
+{
+    Sample* child;
+
+    OpenGLSample* ogl_sample = (OpenGLSample*)sample;
+
+    assert(sample != NULL);
+    if (ogl_sample->timestamp != NULL)
+    {
+        assert(out_last_resync != NULL);
+        #if (RMT_GPU_CPU_SYNC_SECONDS > 0)
+            if (*out_last_resync < ogl_sample->timestamp->cpu_timestamp)
+            {
+                //Convert from us to seconds.
+                rmtU64 time_diff = (ogl_sample->timestamp->cpu_timestamp - *out_last_resync) / 1000000ULL;
+                if (time_diff > RMT_GPU_CPU_SYNC_SECONDS)
+                    SyncOpenGLCpuGpuTimes(out_first_timestamp, out_last_resync);
+            }
+        #endif
+
+        if (!OpenGLTimestamp_GetData(ogl_sample->timestamp, &sample->us_start, &sample->us_end, out_first_timestamp, out_last_resync))
+            return RMT_FALSE;
+
+        sample->us_length = sample->us_end - sample->us_start;
+    }
+
+    // Get child sample times
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        if (!GetOpenGLSampleTimes(child, out_first_timestamp, out_last_resync))
+            return RMT_FALSE;
+    }
+
+    return RMT_TRUE;
+}
+
+
+static void UpdateOpenGLFrame(void)
+{
+    OpenGL* opengl;
+
+    if (g_Remotery == NULL)
+        return;
+
+    opengl = g_Remotery->opengl;
+    assert(opengl != NULL);
+
+    rmt_BeginCPUSample(rmt_UpdateOpenGLFrame, 0);
+
+    // Process all messages in the OpenGL queue
+    while (1)
+    {
+        Msg_SampleTree* sample_tree;
+        Sample* sample;
+
+        Message* message = rmtMessageQueue_PeekNextMessage(opengl->mq_to_opengl_main);
+        if (message == NULL)
+            break;
+
+        // There's only one valid message type in this queue
+        assert(message->id == MsgID_SampleTree);
+        sample_tree = (Msg_SampleTree*)message->payload;
+        sample = sample_tree->root_sample;
+        assert(sample->type == SampleType_OpenGL);
+
+        // Retrieve timing of all OpenGL samples
+        // If they aren't ready leave the message unconsumed, holding up later frames and maintaining order
+        if (!GetOpenGLSampleTimes(sample, &opengl->first_timestamp,&opengl->last_resync))
+            break;
+
+        // Pass samples onto the remotery thread for sending to the viewer
+        AddSampleTreeMessage(g_Remotery->mq_to_rmt_thread, sample, sample_tree->allocator, sample_tree->thread_name, message->thread_sampler);
+        rmtMessageQueue_ConsumeNextMessage(opengl->mq_to_opengl_main, message);
+    }
+
+    rmt_EndCPUSample();
+}
+
+
+RMT_API void _rmt_EndOpenGLSample(void)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (g_Remotery->opengl->dll_handle == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        // Close the timestamp
+        OpenGLSample* ogl_sample = (OpenGLSample*)ts->sample_trees[SampleType_OpenGL]->current_parent;
+        if (ogl_sample->base.recurse_depth > 0)
+        {
+            ogl_sample->base.recurse_depth--;
+        }
+        else
+        {
+            if (ogl_sample->timestamp != NULL)
+                OpenGLTimestamp_End(ogl_sample->timestamp);
+
+            // Send to the update loop for ready-polling
+            if (ThreadSampler_Pop(ts, g_Remotery->opengl->mq_to_opengl_main, (Sample*)ogl_sample))
+                // Perform ready-polling on popping of the root sample
+                UpdateOpenGLFrame();
+        }
+    }
+    // Empty the error queue before using it for glGenQueries
+    while ( rmtglGetError() != GL_NO_ERROR)
+        ;
+}
+
+
+
+#endif  // RMT_USE_OPENGL
+
+
+
+/*
+ ------------------------------------------------------------------------------------------------------------------------
+ ------------------------------------------------------------------------------------------------------------------------
+ @Metal: Metal event sampling
+ ------------------------------------------------------------------------------------------------------------------------
+ ------------------------------------------------------------------------------------------------------------------------
+ */
+
+
+
+#if RMT_USE_METAL
+
+
+
+struct Metal_t
+{
+    // Queue to the Metal main update thread
+    // Given that BeginSample/EndSample need to be called from the same thread that does the update, there
+    // is really no need for this to be a thread-safe queue. I'm using it for its convenience.
+    rmtMessageQueue* mq_to_metal_main;
+};
+
+
+static rmtError Metal_Create(Metal** metal)
+{
+    rmtError error;
+
+    assert(metal != NULL);
+
+    *metal = (Metal*)rmtMalloc(sizeof(Metal));
+    if (*metal == NULL)
+        return RMT_ERROR_MALLOC_FAIL;
+
+    (*metal)->mq_to_metal_main = NULL;
+
+    New_1(rmtMessageQueue, (*metal)->mq_to_metal_main, g_Settings.messageQueueSizeInBytes);
+    return error;
+}
+
+
+static void Metal_Destructor(Metal* metal)
+{
+    assert(metal != NULL);
+    Delete(rmtMessageQueue, metal->mq_to_metal_main);
+}
+
+
+typedef struct MetalTimestamp
+{
+    // Inherit so that timestamps can be quickly allocated
+    ObjectLink Link;
+
+    // Output from GPU callbacks
+    rmtU64 start;
+    rmtU64 end;
+    rmtBool ready;
+} MetalTimestamp;
+
+
+static rmtError MetalTimestamp_Constructor(MetalTimestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    ObjectLink_Constructor((ObjectLink*)stamp);
+
+    // Set defaults
+    stamp->start = 0;
+    stamp->end = 0;
+    stamp->ready = RMT_FALSE;
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void MetalTimestamp_Destructor(MetalTimestamp* stamp)
+{
+    assert(stamp != NULL);
+}
+
+
+rmtU64 rmtMetal_usGetTime()
+{
+    // Share the CPU timer for auto-sync
+    assert(g_Remotery != NULL);
+    return usTimer_Get(&g_Remotery->timer);
+}
+
+
+void rmtMetal_MeasureCommandBuffer(unsigned long long* out_start, unsigned long long* out_end, unsigned int* out_ready);
+
+
+static void MetalTimestamp_Begin(MetalTimestamp* stamp)
+{
+    assert(stamp != NULL);
+    stamp->ready = RMT_FALSE;
+
+    // Metal can currently only issue callbacks at the command buffer level
+    // So for now measure execution of the entire command buffer
+    rmtMetal_MeasureCommandBuffer(&stamp->start, &stamp->end, &stamp->ready);
+}
+
+
+static void MetalTimestamp_End(MetalTimestamp* stamp)
+{
+    assert(stamp != NULL);
+
+    // As Metal can currently only measure entire command buffers, this function is a no-op
+    // as the completed handler was already issued in Begin
+}
+
+
+static rmtBool MetalTimestamp_GetData(MetalTimestamp* stamp, rmtU64* out_start, rmtU64* out_end)
+{
+    assert(g_Remotery != NULL);
+    assert(stamp != NULL);
+
+    // GPU writes ready flag when complete handler is called
+    if (stamp->ready == RMT_FALSE)
+        return RMT_FALSE;
+
+    *out_start = stamp->start;
+    *out_end = stamp->end;
+
+    return RMT_TRUE;
+}
+
+
+typedef struct MetalSample
+{
+    // IS-A inheritance relationship
+    Sample base;
+
+    MetalTimestamp* timestamp;
+
+} MetalSample;
+
+
+static rmtError MetalSample_Constructor(MetalSample* sample)
+{
+    rmtError error;
+
+    assert(sample != NULL);
+
+    // Chain to sample constructor
+    Sample_Constructor((Sample*)sample);
+    sample->base.type = SampleType_Metal;
+    sample->base.size_bytes = sizeof(MetalSample);
+    New_0(MetalTimestamp, sample->timestamp);
+
+    return RMT_ERROR_NONE;
+}
+
+
+static void MetalSample_Destructor(MetalSample* sample)
+{
+    Delete(MetalTimestamp, sample->timestamp);
+    Sample_Destructor((Sample*)sample);
+}
+
+
+static void UpdateOpenGLFrame(void);
+
+
+/*RMT_API void _rmt_UnbindMetal(void)
+{
+    if (g_Remotery != NULL)
+    {
+        Metal* metal = g_Remotery->metal;
+        assert(metal != NULL);
+
+        // Stall waiting for the Metal queue to empty into the Remotery queue
+        while (!rmtMessageQueue_IsEmpty(metal->mq_to_metal_main))
+            UpdateMetalFrame();
+
+        // Forcefully delete sample tree on this thread to release time stamps from
+        // the same thread that created them
+        Remotery_BlockingDeleteSampleTree(g_Remotery, SampleType_Metal);
+    }
+}*/
+
+
+RMT_API void _rmt_BeginMetalSample(rmtPStr name, rmtU32* hash_cache)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        Sample* sample;
+        rmtU32 name_hash = ThreadSampler_GetNameHash(ts, name, hash_cache);
+
+        // Create the Metal tree on-demand as the tree needs an up-front-created root.
+        // This is not possible to create on initialisation as a Metal binding is not yet available.
+        SampleTree** metal_tree = &ts->sample_trees[SampleType_Metal];
+        if (*metal_tree == NULL)
+        {
+            rmtError error;
+            New_3(SampleTree, *metal_tree, sizeof(MetalSample), (ObjConstructor)MetalSample_Constructor, (ObjDestructor)MetalSample_Destructor);
+            if (error != RMT_ERROR_NONE)
+                return;
+        }
+
+        // Push the sample and activate the timestamp
+        if (ThreadSampler_Push(*metal_tree, name_hash, 0, &sample) == RMT_ERROR_NONE)
+        {
+            MetalSample* metal_sample = (MetalSample*)sample;
+            MetalTimestamp_Begin(metal_sample->timestamp);
+        }
+    }
+}
+
+
+static rmtBool GetMetalSampleTimes(Sample* sample)
+{
+    Sample* child;
+
+    MetalSample* metal_sample = (MetalSample*)sample;
+
+    assert(sample != NULL);
+    if (metal_sample->timestamp != NULL)
+    {
+        if (!MetalTimestamp_GetData(metal_sample->timestamp, &sample->us_start, &sample->us_end))
+            return RMT_FALSE;
+
+        sample->us_length = sample->us_end - sample->us_start;
+    }
+
+    // Get child sample times
+    for (child = sample->first_child; child != NULL; child = child->next_sibling)
+    {
+        if (!GetMetalSampleTimes(child))
+            return RMT_FALSE;
+    }
+
+    return RMT_TRUE;
+}
+
+
+static void UpdateMetalFrame(void)
+{
+    Metal* metal;
+
+    if (g_Remotery == NULL)
+        return;
+
+    metal = g_Remotery->metal;
+    assert(metal != NULL);
+
+    rmt_BeginCPUSample(rmt_UpdateMetalFrame, 0);
+
+    // Process all messages in the Metal queue
+    while (1)
+    {
+        Msg_SampleTree* sample_tree;
+        Sample* sample;
+
+        Message* message = rmtMessageQueue_PeekNextMessage(metal->mq_to_metal_main);
+        if (message == NULL)
+            break;
+
+        // There's only one valid message type in this queue
+        assert(message->id == MsgID_SampleTree);
+        sample_tree = (Msg_SampleTree*)message->payload;
+        sample = sample_tree->root_sample;
+        assert(sample->type == SampleType_Metal);
+
+        // Retrieve timing of all Metal samples
+        // If they aren't ready leave the message unconsumed, holding up later frames and maintaining order
+        if (!GetMetalSampleTimes(sample))
+            break;
+
+        // Pass samples onto the remotery thread for sending to the viewer
+        AddSampleTreeMessage(g_Remotery->mq_to_rmt_thread, sample, sample_tree->allocator, sample_tree->thread_name, message->thread_sampler);
+        rmtMessageQueue_ConsumeNextMessage(metal->mq_to_metal_main, message);
+    }
+
+    rmt_EndCPUSample();
+}
+
+
+RMT_API void _rmt_EndMetalSample(void)
+{
+    ThreadSampler* ts;
+
+    if (g_Remotery == NULL)
+        return;
+
+    if (Remotery_GetThreadSampler(g_Remotery, &ts) == RMT_ERROR_NONE)
+    {
+        // Close the timestamp
+        MetalSample* metal_sample = (MetalSample*)ts->sample_trees[SampleType_Metal]->current_parent;
+        if (metal_sample->base.recurse_depth > 0)
+        {
+            metal_sample->base.recurse_depth--;
+        }
+        else
+        {
+            if (metal_sample->timestamp != NULL)
+                MetalTimestamp_End(metal_sample->timestamp);
+            
+            // Send to the update loop for ready-polling
+            if (ThreadSampler_Pop(ts, g_Remotery->metal->mq_to_metal_main, (Sample*)metal_sample))
+                // Perform ready-polling on popping of the root sample
+                UpdateMetalFrame();
+        }
+    }
+}
+
+
+
+#endif  // RMT_USE_METAL
+
+
+#endif // RMT_ENABLED
+

gpac-0.8.0.tar.gz/src/utils/alloc.c -> gpac-1.0.0.tar.gz/src/utils/alloc.c Changed

@@ -2,7 +2,7 @@
  *			GPAC - Multimedia Framework C SDK
  *
  *          Authors: Romain Bouqueau - Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-20XX
+ *			Copyright (c) Telecom ParisTech 2010-2018
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -197,10 +197,12 @@
 #endif
 
 //backtrace not supported on these platforms
-#if defined(GPAC_IPHONE) || defined(GPAC_ANDROID)
+#if defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_ANDROID)
 #define GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
 #endif
 
+int gf_mem_track_enabled = 0;
+
 #ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
 static int gf_mem_backtrace_enabled = 0;
 
@@ -319,6 +321,12 @@
 	STRDUP(str);
 }
 
+
+static unsigned int nb_calls_alloc = 0;
+static unsigned int nb_calls_calloc = 0;
+static unsigned int nb_calls_realloc = 0;
+static unsigned int nb_calls_free = 0;
+
 void *gf_mem_malloc_tracker(size_t size, const char *filename, int line)
 {
 	void *ptr = MALLOC(size);
@@ -330,6 +338,7 @@
 	}
 	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] malloc %3d bytes at %p in:\n", size, ptr);
 	gf_memory_log(GF_MEMORY_DEBUG, "             file %s at line %d\n" , filename, line);
+	nb_calls_alloc++;
 	return ptr;
 }
 
@@ -345,6 +354,7 @@
 	}
 	gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] calloc %3d bytes at %p in:\n", ptr, size);
 	gf_memory_log(GF_MEMORY_DEBUG, "             file %s at line %d\n" , filename, line);
+	nb_calls_calloc++;
 	return ptr;
 }
 
@@ -356,6 +366,7 @@
 		gf_memory_log(GF_MEMORY_DEBUG, "             file %s at line %d\n" , filename, line);
 		FREE(ptr);
 	}
+	nb_calls_free++;
 }
 
 void *gf_mem_realloc_tracker(void *ptr, size_t size, const char *filename, int line)
@@ -385,6 +396,7 @@
 		gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] realloc %3d (instead of %3d) bytes at %p\n", size, size_prev, ptr_g);
 		gf_memory_log(GF_MEMORY_DEBUG, "             file %s at line %d\n" , filename, line);
 	}
+	nb_calls_realloc++;
 	return ptr_g;
 }
 
@@ -397,6 +409,7 @@
 	return ptr;
 }
 
+
 static void *(*gf_mem_malloc_proto)(size_t size, const char *filename, int line) = gf_mem_malloc_basic;
 static void *(*gf_mem_calloc_proto)(size_t num, size_t size_of, const char *filename, int line) = gf_mem_calloc_basic;
 static void *(*gf_mem_realloc_proto)(void *ptr, size_t size, const char *filename, int line) = gf_mem_realloc_basic;
@@ -446,6 +459,7 @@
 #ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
     gf_mem_backtrace_enabled = enable_backtrace ? 1 : 0;
 #endif
+	gf_mem_track_enabled = 1;
     gf_mem_malloc_proto = gf_mem_malloc_tracker;
 	gf_mem_calloc_proto = gf_mem_calloc_tracker;
 	gf_mem_realloc_proto = gf_mem_realloc_tracker;
@@ -453,6 +467,14 @@
 	gf_mem_strdup_proto = gf_mem_strdup_tracker;
 }
 
+size_t gf_mem_get_stats(unsigned int *nb_allocs, unsigned int *nb_callocs, unsigned int *nb_reallocs, unsigned int *nb_free)
+{
+	if (nb_allocs) (*nb_allocs) = nb_calls_alloc;
+	if (nb_callocs) (*nb_callocs) = nb_calls_calloc;
+	if (nb_reallocs) (*nb_reallocs) = nb_calls_realloc;
+	if (nb_free) (*nb_free) = nb_calls_free;
+	return gpac_allocated_memory;
+}
 
 typedef struct s_memory_element
 {
@@ -470,10 +492,6 @@
 typedef memory_element** memory_list;
 
 
-#define GPAC_MEMORY_TRACKING_HASH_TABLE 1
-
-#if GPAC_MEMORY_TRACKING_HASH_TABLE
-
 #define HASH_ENTRIES 4096
 
 #if !defined(WIN32)
@@ -485,12 +503,10 @@
 #if defined(WIN32)
 	return (unsigned int) ( (((unsigned __int64)ptr>>4)+(unsigned __int64)ptr) % HASH_ENTRIES );
 #else
-	return (unsigned int) ( (((uint64_t)ptr>>4)+(uint64_t)ptr) % HASH_ENTRIES );
+	return (unsigned int) ( (((uint64_t) ((intptr_t) ptr)>>4) + (uint64_t) ((intptr_t)ptr) ) % HASH_ENTRIES );
 #endif
 }
 
-#endif
-
 
 /*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)
@@ -565,25 +581,6 @@
 	return 0;
 }
 
-static void gf_memory_del_stack(memory_element **p)
-{
-	memory_element *curr_element=*p, *next_element;
-	while (curr_element) {
-		next_element = curr_element->next;
-#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
-        if (curr_element->backtrace_stack) {
-            FREE(curr_element->backtrace_stack);
-        }
-#endif
-		FREE(curr_element);
-		curr_element = next_element;
-	}
-	*p = NULL;
-}
-
-
-#if GPAC_MEMORY_TRACKING_HASH_TABLE
-
 /*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)
 {
@@ -623,29 +620,11 @@
 			if (&((*p)[i])) break;
 		if (i==HASH_ENTRIES) {
 			FREE(*p);
-			p = NULL;
 		}
 	}
 	return ret;
 }
 
-static void gf_memory_del(memory_list *p)
-{
-	int i;
-	for (i=0; i<HASH_ENTRIES; i++)
-		gf_memory_del_stack(&((*p)[i]));
-	FREE(*p);
-	p = NULL;
-}
-
-#else
-
-#define gf_memory_add		gf_memory_add_stack
-#define gf_memory_del		gf_memory_del_stack
-#define gf_memory_del_item	gf_memory_del_item_stack
-#define gf_memory_find		gf_memory_find_stack
-
-#endif
 
 
 #endif /*GPAC_MEMORY_TRACKING*/
@@ -706,7 +685,8 @@
 }
 
 
-Bool gf_check_address(void *ptr)
+#if 0 //unused
+Bool gf_mem_check_address(void *ptr)
 {
 	Bool res = GF_TRUE;
 	int pos;
@@ -727,12 +707,13 @@
 		gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] the block %p was already freed in:\n", ptr);
 		res = GF_FALSE;
         log_backtrace(GF_MEMORY_ERROR, element);
-		assert(0);
+//		assert(0);
 	}
 	/*unlock*/
 	gf_mx_v(gpac_allocations_lock);
 	return res;
 }
+#endif
 
 /*returns the size of the unregistered block*/
 static int unregister_address(void *ptr, const char *filename, int line)
@@ -758,12 +739,9 @@
 				/* assert(0); */ /*don't assert since this is often due to allocations that occured out of gpac (fonts, etc.)*/
 			} else {
 				int i;
-#if GPAC_MEMORY_TRACKING_HASH_TABLE
 				unsigned int hash = gf_memory_hash(ptr);
 				memory_element *element = memory_rem[hash];
-#else
-				memory_element *element = memory_rem;
-#endif
+
 				assert(element);
 				for (i=1; i<pos; i++)
 					element = element->next;
@@ -794,7 +772,28 @@
 				gpac_allocations_lock = NULL;
 
 				gf_memory_log(GF_MEMORY_DEBUG, "[MemTracker] the allocated-blocks-list is empty: the freed-blocks-list will be emptied too.\n");
-				gf_memory_del(&memory_rem);
+
+				//reset the freed block list
+				memory_list *m_list = &memory_rem;
+				int i;
+				for (i=0; i<HASH_ENTRIES; i++) {
+					memory_element **m_elt = &((*m_list)[i]) ;
+
+					memory_element *curr_element=*m_elt, *next_element;
+					while (curr_element) {
+						next_element = curr_element->next;
+#ifndef GPAC_MEMORY_TRACKING_DISABLE_STACKTRACE
+						if (curr_element->backtrace_stack) {
+							FREE(curr_element->backtrace_stack);
+						}
+#endif
+						FREE(curr_element);
+						curr_element = next_element;
+					}
+					*m_elt = NULL;
+				}
+
+				FREE(*m_list);
 
 				return size;
 			} else {
@@ -823,8 +822,7 @@
 /*prints allocations sum-up*/
 static void print_memory_size()
 {
-	unsigned int level = gpac_nb_alloc_blocs ? GF_MEMORY_ERROR : GF_MEMORY_INFO;
-	GF_LOG(level, GF_LOG_MEMORY, ("[MemTracker] Total: %d bytes allocated in %d blocks\n", (u32) gpac_allocated_memory,  (u32) gpac_nb_alloc_blocs ));
+	GF_LOG(gpac_nb_alloc_blocs ? GF_MEMORY_ERROR : GF_MEMORY_INFO, GF_LOG_MEMORY, ("[MemTracker] Total: %d bytes allocated in %d blocks\n", (u32) gpac_allocated_memory,  (u32) gpac_nb_alloc_blocs ));
 }
 
 GF_EXPORT
@@ -840,44 +838,56 @@
 	/*if lists are empty, the mutex is also NULL*/
 	if (!memory_add) {
 		assert(!gpac_allocations_lock);
-		gf_memory_log(GF_MEMORY_INFO, "[MemTracker] gf_memory_print(): the memory tracker is not initialized.\n");
+		gf_memory_log(GF_MEMORY_INFO, "[MemTracker] gf_memory_print(): the memory tracker is not initialized, some file handles are not closed.\n");
 	} else {
 		int i=0;
 		assert(gpac_allocations_lock);
+		const char *enum_open_handles(u32 *idx);
+		u32 nb_handles = gf_file_handles_count();
+
 
-		gf_memory_log(GF_MEMORY_INFO, "\n[MemTracker] Printing the current state of allocations (%d open file handles) :\n", gf_file_handles_count());
+		gf_memory_log(GF_MEMORY_INFO, "\n[MemTracker] Printing the current state of allocations (%d open file handles) :\n", nb_handles);
 
 		/*lock*/
 		gf_mx_p(gpac_allocations_lock);
-#if GPAC_MEMORY_TRACKING_HASH_TABLE
 		for (i=0; i<HASH_ENTRIES; i++) {
 			memory_element *curr_element = memory_add[i], *next_element;
-#else
-		{
-			memory_element *curr_element = memory_add, *next_element;
-#endif
 			while (curr_element) {
 				char szVal[51];
-				u32 size;
+				char szHexVal[101];
+				u32 size, j;
 				next_element = curr_element->next;
 				size = curr_element->size>=50 ? 50 : curr_element->size;
-				memcpy(szVal, curr_element->ptr, sizeof(char)*size);
+				for (j=0 ; j<size ; j++) {
+					unsigned char byte = *((unsigned char*)(curr_element->ptr) + j);
+					szVal[j] = (byte > 31 && byte < 127) ? byte : '.';
+					sprintf(szHexVal+2*j, "%02X", byte);
+				}
 				szVal[size] = 0;
+				szHexVal[2*size] = 0;
 				gf_memory_log(GF_MEMORY_INFO, "[MemTracker] Memory Block %p (size %d) allocated in:\n", curr_element->ptr, curr_element->size);
 				log_backtrace(GF_MEMORY_INFO, curr_element);
 				gf_memory_log(GF_MEMORY_INFO, "             string dump: %s\n", szVal);
+				gf_memory_log(GF_MEMORY_INFO, "             hex dump: %s\n", szHexVal);
 				curr_element = next_element;
 			}
 		}
 		print_memory_size();
-
 		/*unlock*/
 		gf_mx_v(gpac_allocations_lock);
+
+		i=0;
+		while (1) {
+			const char *n = enum_open_handles(&i);
+			if (!n) break;
+			gf_memory_log(GF_MEMORY_ERROR, "[MemTracker] File %s was not closed\n", n);
+		}
 	}
 }
 
 #endif /*GPAC_MEMORY_TRACKING*/
 
+#if 0 //unused
 
 /*gf_asprintf(): as_printf portable implementation*/
 #if defined(WIN32) || defined(_WIN32_WCE) || (defined (__SVR4) && defined (__sun))
@@ -931,3 +941,5 @@
 	va_end(args);
 	return size;
 }
+
+#endif //unused

gpac-0.8.0.tar.gz/src/utils/base_encoding.c -> gpac-1.0.0.tar.gz/src/utils/base_encoding.c Changed

@@ -31,7 +31,7 @@
 static const char base_64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 GF_EXPORT
-u32 gf_base64_encode(const char *_in, u32 inSize, char *_out, u32 outSize)
+u32 gf_base64_encode(const u8 *_in, u32 inSize, u8 *_out, u32 outSize)
 {
 	s32 padding;
 	u32 i = 0, j = 0;
@@ -103,7 +103,7 @@
 }
 
 GF_EXPORT
-u32 gf_base64_decode(char *in_buf, u32 inSize, char *out, u32 outSize)
+u32 gf_base64_decode(u8 *in_buf, u32 inSize, u8 *out, u32 outSize)
 {
 	u32 i = 0, j = 0, padding;
 	unsigned char c[4], in[4];
@@ -141,7 +141,7 @@
 static const char base_16[] = "0123456789abcdef";
 
 GF_EXPORT
-u32 gf_base16_encode(char *_in, u32 inSize, char *_out, u32 outSize)
+u32 gf_base16_encode(u8 *_in, u32 inSize, u8 *_out, u32 outSize)
 {
 	u32 i = 0;
 	unsigned char *in = (unsigned char *)_in;
@@ -155,13 +155,13 @@
 	}
 	out[(inSize * 2)] = 0;
 
-	return i;
+	return inSize * 2;
 }
 
 #define char16(nb) (((nb) < 97) ? ((nb)-48) : ((nb)-87))
 
 GF_EXPORT
-u32 gf_base16_decode(char *in, u32 inSize, char *out, u32 outSize)
+u32 gf_base16_decode(u8 *in, u32 inSize, u8 *out, u32 outSize)
 {
 	u32 j=0;
 	u32 c[2] = {0,0};
@@ -187,20 +187,21 @@
 #define ZLIB_COMPRESS_SAFE	4
 
 GF_EXPORT
-GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *max_size)
+GF_Err gf_gz_compress_payload_ex(u8 **data, u32 data_len, u32 *max_size, u8 data_offset, Bool skip_if_larger)
 {
 	z_stream stream;
 	int err;
 	char *dest = (char *)gf_malloc(sizeof(char)*data_len*ZLIB_COMPRESS_SAFE);
-	stream.next_in = (Bytef*)(*data) ;
-	stream.avail_in = (uInt)data_len ;
+	stream.next_in = (Bytef*)(*data) + data_offset;
+	stream.avail_in = (uInt)data_len - data_offset;
 	stream.next_out = ( Bytef*)dest;
 	stream.avail_out = (uInt)data_len*ZLIB_COMPRESS_SAFE;
 	stream.zalloc = (alloc_func)NULL;
 	stream.zfree = (free_func)NULL;
 	stream.opaque = (voidpf)NULL;
 
-	err = deflateInit(&stream, 9);
+	err = deflateInit2(&stream, 9, Z_DEFLATED, 16+MAX_WBITS, 8, Z_DEFAULT_STRATEGY);
+
 	if (err != Z_OK) {
 		gf_free(dest);
 		return GF_IO_ERR;
@@ -212,7 +213,13 @@
 		gf_free(dest);
 		return GF_IO_ERR;
 	}
-	if (data_len <stream.total_out) {
+	if (data_len-data_offset < stream.total_out) {
+		if (skip_if_larger) {
+			gf_free(dest);
+			deflateEnd(&stream);
+			*max_size = (u32) stream.total_out;
+			return GF_OK;
+		}
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[GZ] compressed data (%d) larger than input (%d)\n", (u32) stream.total_out, (u32) data_len ));
 	}
 
@@ -230,7 +237,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_gz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+GF_Err gf_gz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
+{
+	return gf_gz_compress_payload_ex(data, data_len, max_size, 0, GF_FALSE);
+
+}
+
+GF_EXPORT
+GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
 {
 	z_stream d_stream;
 	GF_Err e = GF_OK;
@@ -254,7 +268,6 @@
 	d_stream.next_out = (Bytef*) *uncompressed_data;
 	d_stream.avail_out = size;
 
-//	err = inflateInit(&d_stream);
 	err = inflateInit2(&d_stream, 16+MAX_WBITS);
 
 	if (err == Z_OK) {
@@ -286,13 +299,13 @@
 }
 #else
 GF_EXPORT
-GF_Err gf_gz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+GF_Err gf_gz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
 {
 	*out_size = 0;
 	return GF_NOT_SUPPORTED;
 }
 GF_EXPORT
-GF_Err gf_gz_compress_payload(char **data, u32 data_len, u32 *max_size)
+GF_Err gf_gz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
 {
 	*max_size = 0;
 	return GF_NOT_SUPPORTED;
@@ -307,7 +320,7 @@
 #define LZMA_COMPRESS_SAFE	2
 
 GF_EXPORT
-GF_Err gf_lz_compress_payload(char **data, u32 data_len, u32 *max_size)
+GF_Err gf_lz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
 {
 	u32 block_size, comp_size;
 	lzma_options_lzma opt_lzma2;
@@ -357,7 +370,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_lz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+GF_Err gf_lz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
 {
 	lzma_stream strm = LZMA_STREAM_INIT;
 	lzma_ret ret = lzma_stream_decoder(&strm, UINT64_MAX, 0);
@@ -384,7 +397,7 @@
 	strm.avail_out = block_size;
 
 	while (1) {
-		lzma_ret ret = lzma_code(&strm, LZMA_FINISH);
+		ret = lzma_code(&strm, LZMA_FINISH);
 
 		if ((strm.avail_out == 0) || (ret == LZMA_STREAM_END)) {
 			u32 uncomp_size = block_size - strm.avail_out;
@@ -408,19 +421,19 @@
 		}
 	}
 
-	*uncompressed_data = (char *) dst_buffer;
+	*uncompressed_data = dst_buffer;
 	*out_size = done;
 	return GF_OK;
 }
 #else
 GF_EXPORT
-GF_Err gf_lz_decompress_payload(char *data, u32 data_len, char **uncompressed_data, u32 *out_size)
+GF_Err gf_lz_decompress_payload(u8 *data, u32 data_len, u8 **uncompressed_data, u32 *out_size)
 {
 	*out_size = 0;
 	return GF_NOT_SUPPORTED;
 }
 GF_EXPORT
-GF_Err gf_lz_compress_payload(char **data, u32 data_len, u32 *max_size)
+GF_Err gf_lz_compress_payload(u8 **data, u32 data_len, u32 *max_size)
 {
 	*max_size = 0;
 	return GF_NOT_SUPPORTED;

gpac-0.8.0.tar.gz/src/utils/bitstream.c -> gpac-1.0.0.tar.gz/src/utils/bitstream.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 / common tools sub-project
@@ -26,15 +26,13 @@
 #include <gpac/bitstream.h>
 
 /*the default size for new streams allocation...*/
-#define BS_MEM_BLOCK_ALLOC_SIZE		4096
+#define BS_MEM_BLOCK_ALLOC_SIZE		512
 
 /*private types*/
 enum
 {
-	GF_BITSTREAM_FILE_READ = GF_BITSTREAM_WRITE + 1,
+	GF_BITSTREAM_FILE_READ = GF_BITSTREAM_WRITE_DYN + 1,
 	GF_BITSTREAM_FILE_WRITE,
-	/*private mode if we own the buffer*/
-	GF_BITSTREAM_WRITE_DYN
 };
 
 struct __tag_bitstream
@@ -42,7 +40,7 @@
 	/*original stream data*/
 	FILE *stream;
 
-	/*original data*/
+	/*or original data*/
 	char *original;
 	/*the size of our buffer in bytes*/
 	u64 size;
@@ -59,13 +57,25 @@
 	void *par;
 
 
-	char *buffer_io;
-	u32 buffer_io_size, buffer_written;
+	char *cache_write;
+	u32 cache_write_size, buffer_written;
+
+	Bool remove_emul_prevention_byte;
+	u32 nb_zeros;
+
+	GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size);
+	void *usr_data;
+	u64 bytes_out;
+	u32 prevent_dispatch;
 
 	u64 cookie;
+
+	u8 *cache_read;
+	u32 cache_read_size, cache_read_pos, cache_read_alloc;
+
 };
 
-GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const char *buffer, u64 BufferSize)
+GF_Err gf_bs_reassign_buffer(GF_BitStream *bs, const u8 *buffer, u64 BufferSize)
 {
 	if (!bs) return GF_BAD_PARAM;
 	if (bs->bsmode == GF_BITSTREAM_READ) {
@@ -75,6 +85,7 @@
 		bs->current = 0;
 		bs->nbBits = 8;
 		bs->current = 0;
+		bs->nb_zeros = 0;
 		return GF_OK;
 	}
 	if (bs->bsmode==GF_BITSTREAM_WRITE) {
@@ -107,22 +118,16 @@
 }
 
 GF_EXPORT
-GF_BitStream *gf_bs_new(const char *buffer, u64 BufferSize, u32 mode)
+GF_BitStream *gf_bs_new(const u8 *buffer, u64 BufferSize, u32 mode)
 {
-	GF_BitStream *tmp;
-	if ( (buffer && ! BufferSize)) return NULL;
-
-	tmp = (GF_BitStream *)gf_malloc(sizeof(GF_BitStream));
+	GF_BitStream *tmp = (GF_BitStream *)gf_malloc(sizeof(GF_BitStream));
 	if (!tmp) return NULL;
 	memset(tmp, 0, sizeof(GF_BitStream));
 
 	tmp->original = (char*)buffer;
 	tmp->size = BufferSize;
 
-	tmp->position = 0;
-	tmp->current = 0;
 	tmp->bsmode = mode;
-	tmp->stream = NULL;
 
 	switch (tmp->bsmode) {
 	case GF_BITSTREAM_READ:
@@ -130,6 +135,7 @@
 		tmp->current = 0;
 		break;
 	case GF_BITSTREAM_WRITE:
+	case GF_BITSTREAM_WRITE_DYN:
 		tmp->nbBits = 0;
 		if (! buffer) {
 			/*if BufferSize is specified, use it. This is typically used when AvgSize of
@@ -178,56 +184,132 @@
 
 	/*get the size of this file (for read streams)*/
 	tmp->position = gf_ftell(f);
-	gf_fseek(f, 0, SEEK_END);
-	tmp->size = gf_ftell(f);
+	tmp->size = gf_fsize(f);
 	gf_fseek(f, tmp->position, SEEK_SET);
+
+
+	if (mode==GF_BITSTREAM_FILE_READ) {
+		tmp->cache_read_alloc = gf_opts_get_int("core", "bs-cache-size");
+		if (tmp->cache_read_alloc) {
+			tmp->cache_read_pos = tmp->cache_read_size = tmp->cache_read_alloc;
+			tmp->cache_read = gf_malloc(tmp->cache_read_alloc);
+			if (!tmp->cache_read) {
+				gf_free(tmp);
+				return NULL;
+			}
+		}
+	}
+	if (mode == GF_BITSTREAM_FILE_WRITE) {
+		tmp->cache_write_size = gf_opts_get_int("core", "bs-cache-size");
+		if (tmp->cache_write_size) {
+			tmp->cache_write = (char*)gf_malloc(tmp->cache_write_size);
+			if (!tmp->cache_write) {
+				gf_free(tmp);
+				return NULL;
+			}
+			tmp->buffer_written = 0;
+		}
+	}
+
 	return tmp;
 }
 
-static void bs_flush_cache(GF_BitStream *bs)
+
+GF_BitStream *gf_bs_new_cbk_buffer(GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size), void *usr_data, u8 *buffer, u32 buffer_size)
 {
-	if (bs->buffer_written) {
-		u32 nb_write = (u32) fwrite(bs->buffer_io, 1, bs->buffer_written, bs->stream);
-		bs->size += nb_write;
-		bs->position += nb_write;
-		bs->buffer_written = 0;
+	GF_BitStream *tmp;
+
+	if (!on_block_out) return NULL;
+
+	tmp = (GF_BitStream *)gf_malloc(sizeof(GF_BitStream));
+	if (!tmp) return NULL;
+	memset(tmp, 0, sizeof(GF_BitStream));
+
+	if (buffer && buffer_size) {
+		tmp->size = buffer_size;
+		tmp->original = buffer;
+	} else {
+		tmp->size = buffer_size ? buffer_size : 10*BS_MEM_BLOCK_ALLOC_SIZE;
+		tmp->original = (char *) gf_malloc(sizeof(char) * ((u32) tmp->size));
+		if (! tmp->original) {
+			gf_free(tmp);
+			return NULL;
+		}
 	}
+	tmp->bsmode = GF_BITSTREAM_WRITE_DYN;
+	tmp->on_block_out = on_block_out;
+	tmp->usr_data = usr_data;
+
+	return tmp;
 }
 
+GF_BitStream *gf_bs_new_cbk(GF_Err (*on_block_out)(void *cbk, u8 *data, u32 block_size), void *usr_data, u32 block_size)
+{
+	return gf_bs_new_cbk_buffer(on_block_out, usr_data, NULL, block_size);
 
-GF_EXPORT
-GF_Err gf_bs_set_output_buffering(GF_BitStream *bs, u32 size)
+}
+void gf_bs_prevent_dispatch(GF_BitStream *bs, Bool prevent_dispatch)
 {
-	if (!bs->stream) return GF_OK;
-	if (bs->bsmode != GF_BITSTREAM_FILE_WRITE) {
-		return GF_OK;
+	if (!bs) return;
+	if (prevent_dispatch) {
+		bs->prevent_dispatch ++;
+		return;
+	}
+	if (!bs->prevent_dispatch) return;
+	bs->prevent_dispatch --;
+
+	if (bs->on_block_out && !bs->prevent_dispatch) {
+		assert(bs->position >= bs->bytes_out);
+		if (bs->position > bs->bytes_out) {
+			bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out));
+			bs->bytes_out = bs->position;
+		}
 	}
-	bs_flush_cache(bs);
-	bs->buffer_io = (char*)gf_realloc(bs->buffer_io, size);
-	if (!bs->buffer_io) return GF_IO_ERR;
-	bs->buffer_io_size = size;
-	bs->buffer_written = 0;
-	return GF_OK;
 }
 
-
-GF_EXPORT
-u32 gf_bs_get_output_buffering(GF_BitStream *bs)
+static void bs_flush_write_cache(GF_BitStream *bs)
 {
-	return bs ? bs->buffer_io_size : 0;
+	if (bs->buffer_written) {
+		u32 nb_write;
+		nb_write = (u32) gf_fwrite(bs->cache_write, bs->buffer_written, bs->stream);
+
+		//check we didn't rewind the bitstream
+		if (bs->size == bs->position)
+			bs->size += nb_write;
+		bs->position += nb_write;
+		bs->buffer_written = 0;
+	}
 }
 
+
+
 GF_EXPORT
 void gf_bs_del(GF_BitStream *bs)
 {
 	if (!bs) 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) );
+	}
 	/*if we are in dynamic mode (alloc done by the bitstream), free the buffer if still present*/
 	if ((bs->bsmode == GF_BITSTREAM_WRITE_DYN) && bs->original) gf_free(bs->original);
-	if (bs->buffer_io)
-		bs_flush_cache(bs);
+	if (bs->cache_write) {
+		bs_flush_write_cache(bs);
+		gf_free(bs->cache_write);
+	}
+	if (bs->cache_read)
+		gf_free(bs->cache_read);
 	gf_free(bs);
 }
 
+GF_EXPORT
+void gf_bs_enable_emulation_byte_removal(GF_BitStream *bs, Bool do_remove)
+{
+	if (bs) {
+		bs->remove_emul_prevention_byte = do_remove;
+		bs->nb_zeros = 0;
+	}
+}
+
 /*returns 1 if aligned wrt current mode, 0 otherwise*/
 Bool gf_bs_is_align(GF_BitStream *bs)
 {
@@ -240,10 +322,30 @@
 	}
 }
 
+static GFINLINE u8 gf_bs_load_byte(GF_BitStream *bs, Bool *is_eos)
+{
+	u8 res;
+	if (bs->cache_read) {
+		if (bs->cache_read_pos == bs->cache_read_size) {
+			bs->cache_read_size = (u32) gf_fread(bs->cache_read, bs->cache_read_alloc, bs->stream);
+			bs->cache_read_pos = 0;
+			if (!bs->cache_read_size) {
+				*is_eos = GF_TRUE;
+				return 0;
+			}
+		}
+		res = bs->cache_read[bs->cache_read_pos];
+		bs->cache_read_pos++;
+	} else {
+		res = gf_fgetc(bs->stream);
+	}
+	return res;
+}
 
 /*fetch a new byte in the bitstream switch between packets*/
 static u8 BS_ReadByte(GF_BitStream *bs)
 {
+	Bool is_eos;
 	if (bs->bsmode == GF_BITSTREAM_READ) {
 		u8 res;
 		if (bs->position >= bs->size) {
@@ -251,19 +353,50 @@
 			return 0;
 		}
 		res = bs->original[bs->position++];
+
+		if (bs->remove_emul_prevention_byte) {
+			if ((bs->nb_zeros==2) && (res==0x03) && (bs->position<bs->size) && (bs->original[bs->position]<0x04)) {
+				bs->nb_zeros = 0;
+				res = bs->original[bs->position++];
+			}
+			if (!res) bs->nb_zeros++;
+			else bs->nb_zeros = 0;
+		}
 		return res;
 	}
-	if (bs->buffer_io)
-		bs_flush_cache(bs);
+	if (bs->cache_write)
+		bs_flush_write_cache(bs);
+
+	is_eos = gf_feof(bs->stream);
 
 	/*we are in FILE mode, test for end of file*/
-	if (!feof(bs->stream)) {
+	if (!is_eos || bs->cache_read) {
 		u8 res;
+		Bool loc_eos=GF_FALSE;
 		assert(bs->position<=bs->size);
 		bs->position++;
-		res = fgetc(bs->stream);
+
+		res = gf_bs_load_byte(bs, &loc_eos);
+		if (loc_eos) goto bs_eof;
+
+		if (bs->remove_emul_prevention_byte) {
+			if ((bs->nb_zeros==2) && (res==0x03) && (bs->position<bs->size)) {
+				u8 next = gf_bs_load_byte(bs, &loc_eos);
+				if (next < 0x04) {
+					bs->nb_zeros = 0;
+					res = next;
+					bs->position++;
+				} else {
+					gf_bs_seek(bs, bs->position);
+				}
+			}
+			if (!res) bs->nb_zeros++;
+			else bs->nb_zeros = 0;
+		}
 		return res;
 	}
+
+bs_eof:
 	if (bs->EndOfStream) {
 		bs->EndOfStream(bs->par);
 	} else {
@@ -325,9 +458,17 @@
 u32 gf_bs_read_u8(GF_BitStream *bs)
 {
 	assert(bs->nbBits==8);
+	if (bs->cache_read && (bs->cache_read_pos+1<bs->cache_read_size) ) {
+		u32 ret = bs->cache_read[bs->cache_read_pos];
+		bs->cache_read_pos+=1;
+		bs->position+=1;
+		return ret;
+	}
+
 	return (u32) BS_ReadByte(bs);
 }
 
+#if 0
 GF_EXPORT
 u32 gf_bs_read_u8_until_delimiter(GF_BitStream *bs, u8 delimiter, u8* out, u32 max_length) {
 	u32 i = 0;
@@ -350,12 +491,22 @@
 found:
 	return i;
 }
+#endif
 
 GF_EXPORT
 u32 gf_bs_read_u16(GF_BitStream *bs)
 {
 	u32 ret;
 	assert(bs->nbBits==8);
+	if (bs->cache_read && (bs->cache_read_pos+2<bs->cache_read_size) ) {
+		ret = bs->cache_read[bs->cache_read_pos];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+1];
+		bs->cache_read_pos+=2;
+		bs->position+=2;
+		return ret;
+	}
+
 	ret = BS_ReadByte(bs);
 	ret<<=8;
 	ret |= BS_ReadByte(bs);
@@ -368,6 +519,18 @@
 {
 	u32 ret;
 	assert(bs->nbBits==8);
+
+	if (bs->cache_read && (bs->cache_read_pos+3<bs->cache_read_size) ) {
+		ret = bs->cache_read[bs->cache_read_pos];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+1];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+2];
+		bs->cache_read_pos+=3;
+		bs->position+=3;
+		return ret;
+	}
+
 	ret = BS_ReadByte(bs);
 	ret<<=8;
 	ret |= BS_ReadByte(bs);
@@ -381,6 +544,19 @@
 {
 	u32 ret;
 	assert(bs->nbBits==8);
+
+	if (bs->cache_read && (bs->cache_read_pos+4<bs->cache_read_size) ) {
+		ret = bs->cache_read[bs->cache_read_pos];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+1];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+2];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+3];
+		bs->cache_read_pos+=4;
+		bs->position+=4;
+		return ret;
+	}
 	ret = BS_ReadByte(bs);
 	ret<<=8;
 	ret |= BS_ReadByte(bs);
@@ -395,6 +571,27 @@
 u64 gf_bs_read_u64(GF_BitStream *bs)
 {
 	u64 ret;
+
+	if (bs->cache_read && (bs->cache_read_pos+8<bs->cache_read_size) ) {
+		ret = bs->cache_read[bs->cache_read_pos];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+1];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+2];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+3];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+4];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+5];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+6];
+		ret<<=8;
+		ret |= bs->cache_read[bs->cache_read_pos+7];
+		bs->cache_read_pos+=8;
+		bs->position+=8;
+		return ret;
+	}
 	ret = gf_bs_read_u32(bs);
 	ret<<=32;
 	ret |= gf_bs_read_u32(bs);
@@ -446,14 +643,14 @@
 }
 
 GF_EXPORT
-u32 gf_bs_read_data(GF_BitStream *bs, char *data, u32 nbBytes)
+u32 gf_bs_read_data(GF_BitStream *bs, u8 *data, u32 nbBytes)
 {
 	u64 orig = bs->position;
 
 	if (bs->position+nbBytes > bs->size) return 0;
 
-	if (gf_bs_is_align(bs)) {
-		s32 bytes_read;
+	if (gf_bs_is_align(bs) ) {
+		s32 bytes_read, bytes_read_cache;
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_READ:
 		case GF_BITSTREAM_WRITE:
@@ -463,12 +660,24 @@
 			return nbBytes;
 		case GF_BITSTREAM_FILE_READ:
 		case GF_BITSTREAM_FILE_WRITE:
-			if (bs->buffer_io)
-				bs_flush_cache(bs);
-			bytes_read = (s32) fread(data, 1, nbBytes, bs->stream);
-			if (bytes_read<0) return 0;
-			bs->position += bytes_read;
-			return bytes_read;
+			if (bs->cache_write)
+				bs_flush_write_cache(bs);
+
+			bytes_read = bytes_read_cache = 0;
+			if (bs->cache_read) {
+				u32 csize = bs->cache_read_size-bs->cache_read_pos;
+				if (csize>nbBytes) csize = nbBytes;
+				memcpy(data, bs->cache_read + bs->cache_read_pos, csize);
+				bs->cache_read_pos += csize;
+				nbBytes -= csize;
+				bytes_read_cache = csize;
+			}
+			if (nbBytes) {
+				bytes_read = (s32) gf_fread(data + bytes_read_cache, nbBytes, bs->stream);
+				if (bytes_read<0) return bytes_read_cache;
+			}
+			bs->position += bytes_read + bytes_read_cache;
+			return bytes_read + bytes_read_cache;
 		default:
 			return 0;
 		}
@@ -496,33 +705,48 @@
 	}
 	/*we are in MEM mode*/
 	if ( (bs->bsmode == GF_BITSTREAM_WRITE) || (bs->bsmode == GF_BITSTREAM_WRITE_DYN) ) {
-		if (bs->position == bs->size) {
+		//if callback mode and dispatch is not blocked, dispatch
+		if (bs->on_block_out && !bs->prevent_dispatch) {
+			assert(bs->position >= bs->bytes_out);
+			if (bs->position - bs->bytes_out == bs->size) {
+				bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out));
+				bs->bytes_out = bs->position;
+			}
+			if (bs->original)
+				bs->original[bs->position - bs->bytes_out] = val;
+			bs->position++;
+			assert(bs->position >= bs->bytes_out);
+			return;
+		}
+		//otherwise store
+		if (bs->position - bs->bytes_out == bs->size) {
 			/*no more space...*/
 			if (bs->bsmode != GF_BITSTREAM_WRITE_DYN) return;
 			/*gf_realloc if enough space...*/
 			if (bs->size > 0xFFFFFFFF) return;
 			bs->size = bs->size ? (bs->size * 2) : BS_MEM_BLOCK_ALLOC_SIZE;
 			bs->original = (char*)gf_realloc(bs->original, (u32)bs->size);
-			if (!bs->original) return;	
+			if (!bs->original) return;
 		}
 		if (bs->original)
-			bs->original[bs->position] = val;
+			bs->original[bs->position - bs->bytes_out] = val;
 		bs->position++;
 		return;
 	}
-	if (bs->buffer_io) {
-		if (bs->buffer_written == bs->buffer_io_size) {
-			bs_flush_cache(bs);
+	if (bs->cache_write) {
+		if (bs->buffer_written == bs->cache_write_size) {
+			bs_flush_write_cache(bs);
 		}
-		bs->buffer_io[bs->buffer_written] = val;
+		bs->cache_write[bs->buffer_written] = val;
 		bs->buffer_written++;
-		if (bs->buffer_written == bs->buffer_io_size) {
-			bs_flush_cache(bs);
+		if (bs->buffer_written == bs->cache_write_size) {
+			bs_flush_write_cache(bs);
 		}
 		return;
 	}
 	/*we are in FILE mode, no pb for any gf_realloc...*/
-	fputc(val, bs->stream);
+	gf_fputc(val, bs->stream);
+
 	/*check we didn't rewind the stream*/
 	if (bs->size == bs->position) bs->size++;
 	bs->position += 1;
@@ -539,15 +763,30 @@
 	}
 }
 
+static s32 bs_handle_nbits_overflow(GF_BitStream* bs, s32 nBits, s32 max_shift)
+{
+	if (nBits > max_shift) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to write %d bits, when max is %d\n", nBits, max_shift));
+	}
+	while (nBits > max_shift) {
+		gf_bs_write_long_int(bs, 0, max_shift);
+		nBits -= max_shift;
+	}
+
+	return nBits;
+}
+
 GF_EXPORT
 void gf_bs_write_int(GF_BitStream *bs, s32 _value, s32 nBits)
 {
 	u32 value, nb_shift;
+	s32 max_shift = sizeof(s32) * 8;
 	if (!nBits) return;
+	nBits = bs_handle_nbits_overflow(bs, nBits, max_shift);
 	//move to unsigned to avoid sanitizer warnings when we pass a value not codable on the given number of bits
-	//we do this when setting bit fileds to all 1's
+	//we do this when setting bit fields to all 1's
 	value = (u32) _value;
-	nb_shift = sizeof (s32) * 8 - nBits;
+	nb_shift = max_shift - nBits;
 	if (nb_shift)
 		value <<= nb_shift;
 
@@ -561,18 +800,16 @@
 GF_EXPORT
 void gf_bs_write_long_int(GF_BitStream *bs, s64 _value, s32 nBits)
 {
+	s32 max_shift = sizeof(s64) * 8;
 	if (!nBits) return;
-	if (nBits>64) {
-		gf_bs_write_int(bs, 0, nBits-64);
-		gf_bs_write_long_int(bs, _value, 64);
-	} else {
-		//cf note in gf_bs_write_int
-		u64 value = (u64) _value;
-		value <<= sizeof (s64) * 8 - nBits;
-		while (--nBits >= 0) {
-			BS_WriteBit (bs, ((s64)value) < 0);
-			value <<= 1;
-		}
+	nBits = bs_handle_nbits_overflow(bs, nBits, max_shift);
+
+	//cf note in gf_bs_write_int
+	u64 value = (u64) _value;
+	value <<= max_shift - nBits;
+	while (--nBits >= 0) {
+		BS_WriteBit (bs, ((s64)value) < 0);
+		value <<= 1;
 	}
 }
 
@@ -580,34 +817,61 @@
 void gf_bs_write_u8(GF_BitStream *bs, u32 value)
 {
 	assert(!bs->nbBits);
-	BS_WriteByte(bs, (u8) value);
+
+	if (bs->cache_write && (bs->buffer_written+1 < bs->cache_write_size) ) {
+		bs->cache_write[bs->buffer_written] = (u8) value;
+		bs->buffer_written += 1;
+	} else {
+		BS_WriteByte(bs, (u8) value);
+	}
 }
 
 GF_EXPORT
 void gf_bs_write_u16(GF_BitStream *bs, u32 value)
 {
 	assert(!bs->nbBits);
-	BS_WriteByte(bs, (u8) ((value>>8)&0xff));
-	BS_WriteByte(bs, (u8) ((value)&0xff));
+	if (bs->cache_write && (bs->buffer_written+2 < bs->cache_write_size) ) {
+		bs->cache_write[bs->buffer_written] = (u8) ((value>>8)&0xff);
+		bs->cache_write[bs->buffer_written+1] = (u8) ((value)&0xff);
+		bs->buffer_written += 2;
+	} else {
+		BS_WriteByte(bs, (u8) ((value>>8)&0xff));
+		BS_WriteByte(bs, (u8) ((value)&0xff));
+	}
 }
 
 GF_EXPORT
 void gf_bs_write_u24(GF_BitStream *bs, u32 value)
 {
 	assert(!bs->nbBits);
-	BS_WriteByte(bs, (u8) ((value>>16)&0xff));
-	BS_WriteByte(bs, (u8) ((value>>8)&0xff));
-	BS_WriteByte(bs, (u8) ((value)&0xff));
+	if (bs->cache_write && (bs->buffer_written+3 < bs->cache_write_size) ) {
+		bs->cache_write[bs->buffer_written] = (u8) ((value>>16)&0xff);
+		bs->cache_write[bs->buffer_written+1] = (u8) ((value>>8)&0xff);
+		bs->cache_write[bs->buffer_written+2] = (u8) ((value)&0xff);
+		bs->buffer_written += 3;
+	} else {
+		BS_WriteByte(bs, (u8) ((value>>16)&0xff));
+		BS_WriteByte(bs, (u8) ((value>>8)&0xff));
+		BS_WriteByte(bs, (u8) ((value)&0xff));
+	}
 }
 
 GF_EXPORT
 void gf_bs_write_u32(GF_BitStream *bs, u32 value)
 {
 	assert(!bs->nbBits);
-	BS_WriteByte(bs, (u8) ((value>>24)&0xff));
-	BS_WriteByte(bs, (u8) ((value>>16)&0xff));
-	BS_WriteByte(bs, (u8) ((value>>8)&0xff));
-	BS_WriteByte(bs, (u8) ((value)&0xff));
+	if (bs->cache_write && (bs->buffer_written+4 < bs->cache_write_size) ) {
+		bs->cache_write[bs->buffer_written] = (u8) ((value>>24)&0xff);
+		bs->cache_write[bs->buffer_written+1] = (u8) ((value>>16)&0xff);
+		bs->cache_write[bs->buffer_written+2] = (u8) ((value>>8)&0xff);
+		bs->cache_write[bs->buffer_written+3] = (u8) ((value)&0xff);
+		bs->buffer_written += 4;
+	} else {
+		BS_WriteByte(bs, (u8) ((value>>24)&0xff));
+		BS_WriteByte(bs, (u8) ((value>>16)&0xff));
+		BS_WriteByte(bs, (u8) ((value>>8)&0xff));
+		BS_WriteByte(bs, (u8) ((value)&0xff));
+	}
 }
 
 GF_EXPORT
@@ -621,7 +885,7 @@
 GF_EXPORT
 u32 gf_bs_write_byte(GF_BitStream *bs, u8 byte, u32 repeat_count)
 {
-	if (!gf_bs_is_align(bs) || bs->buffer_io) {
+	if (!gf_bs_is_align(bs) || bs->cache_write) {
 		u32 count = 0;
 		while (count<repeat_count) {
 			gf_bs_write_int(bs, byte, 8);
@@ -657,8 +921,8 @@
 		return repeat_count;
 	case GF_BITSTREAM_FILE_READ:
 	case GF_BITSTREAM_FILE_WRITE:
-
-		if (gf_fwrite(&byte, 1, repeat_count, bs->stream) != repeat_count) return 0;
+		if (gf_fwrite(&byte, repeat_count, bs->stream) != repeat_count)
+			return 0;
 		if (bs->size == bs->position) bs->size += repeat_count;
 		bs->position += repeat_count;
 		return repeat_count;
@@ -700,7 +964,7 @@
 
 
 GF_EXPORT
-u32 gf_bs_write_data(GF_BitStream *bs, const char *data, u32 nbBytes)
+u32 gf_bs_write_data(GF_BitStream *bs, const u8 *data, u32 nbBytes)
 {
 	/*we need some feedback for this guy...*/
 	u64 begin = bs->position;
@@ -709,14 +973,36 @@
 	if (gf_bs_is_align(bs)) {
 		switch (bs->bsmode) {
 		case GF_BITSTREAM_WRITE:
-			if (bs->position+nbBytes > bs->size)
+			if (bs->position+nbBytes > bs->size) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to overwrite bitstream by %d bytes\n", bs->position + nbBytes - bs->size));
 				return 0;
+			}
 			memcpy(bs->original + bs->position, data, nbBytes);
 			bs->position += nbBytes;
 			return nbBytes;
 		case GF_BITSTREAM_WRITE_DYN:
+			//if callback mode and dispatch not disabled, dispatch bytes
+			if (bs->on_block_out && !bs->prevent_dispatch) {
+				assert(bs->position >= bs->bytes_out);
+
+				if (bs->position - bs->bytes_out + nbBytes <= bs->size) {
+					memcpy(bs->original + bs->position - bs->bytes_out, data, nbBytes);
+					bs->position += nbBytes;
+				} else {
+					if (bs->position > bs->bytes_out)
+						bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out) );
+					if (nbBytes)
+						bs->on_block_out(bs->usr_data, (char *) data, nbBytes);
+
+					bs->position += nbBytes;
+					bs->bytes_out = bs->position;
+				}
+				assert(bs->position >= bs->bytes_out);
+				return nbBytes;
+			}
+			//otherwise store
 			/*need to gf_realloc ...*/
-			if (bs->position+nbBytes > bs->size) {
+			if (bs->position + nbBytes - bs->bytes_out > bs->size) {
 				u32 new_size = (u32) (bs->size*2);
 				if (!new_size) new_size = BS_MEM_BLOCK_ALLOC_SIZE;
 
@@ -730,24 +1016,24 @@
 					return 0;
 				bs->size = new_size;
 			}
-			memcpy(bs->original + bs->position, data, nbBytes);
+			memcpy(bs->original + bs->position - bs->bytes_out, data, nbBytes);
 			bs->position += nbBytes;
 			return nbBytes;
 		case GF_BITSTREAM_FILE_READ:
 		case GF_BITSTREAM_FILE_WRITE:
-			if (bs->buffer_io) {
-				if (bs->buffer_written + nbBytes > bs->buffer_io_size) {
-					bs_flush_cache(bs);
-					if (nbBytes>bs->buffer_io_size) {
-						bs->buffer_io = (char*)gf_realloc(bs->buffer_io, 2*nbBytes);
-						bs->buffer_io_size = 2*nbBytes;
-					}
+			if (bs->cache_write) {
+				//if block fits in our write cache, write it
+				if (bs->buffer_written + nbBytes < bs->cache_write_size) {
+					memcpy(bs->cache_write+bs->buffer_written, data, nbBytes);
+					bs->buffer_written+=nbBytes;
+					return nbBytes;
 				}
-				memcpy(bs->buffer_io+bs->buffer_written, data, nbBytes);
-				bs->buffer_written+=nbBytes;
-				return nbBytes;
+				//otherwise flush cache and use file write
+				bs_flush_write_cache(bs);
 			}
-			if (gf_fwrite(data, nbBytes, 1, bs->stream) != 1) return 0;
+
+			if (gf_fwrite(data, nbBytes, bs->stream) != nbBytes) return 0;
+
 			if (bs->size == bs->position) bs->size += nbBytes;
 			bs->position += nbBytes;
 			return nbBytes;
@@ -807,13 +1093,13 @@
 		if (bs->position>bs->size) return 0;
 		return (bs->size - bs->position);
 	}
-	if (bs->buffer_io)
-		bs_flush_cache(bs);
+	if (bs->cache_write)
+		bs_flush_write_cache(bs);
 
 	cur = gf_ftell(bs->stream);
-	gf_fseek(bs->stream, 0, SEEK_END);
-	end = gf_ftell(bs->stream);
+	end = gf_fsize(bs->stream);
 	gf_fseek(bs->stream, cur, SEEK_SET);
+
 	return (u64) (end - cur);
 }
 
@@ -841,14 +1127,24 @@
 
 /*For DYN mode, this gets the content out without cutting the buffer to the number of written bytes*/
 GF_EXPORT
-void gf_bs_get_content_no_truncate(GF_BitStream *bs, char **output, u32 *outSize, u32 *alloc_size)
+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->on_block_out && bs->position>bs->bytes_out) {
+		bs->on_block_out(bs->usr_data, bs->original, (u32) (bs->position - bs->bytes_out) );
+	}
+
 	if (!bs->position && !bs->nbBits) {
-		*output = NULL;
+		if (!alloc_size) {
+			*output = NULL;
+			gf_free(bs->original);
+		} else {
+			*alloc_size = (u32) bs->size;
+			*output = bs->original;
+		}
 		*outSize = 0;
-		gf_free(bs->original);
 	} else {
 		if (alloc_size) {
 			/*Align our buffer or we're dead!*/
@@ -872,7 +1168,7 @@
 
 /*For DYN mode, this gets the content out*/
 GF_EXPORT
-void gf_bs_get_content(GF_BitStream *bs, char **output, u32 *outSize)
+void gf_bs_get_content(GF_BitStream *bs, u8 **output, u32 *outSize)
 {
 	gf_bs_get_content_no_truncate(bs, output, outSize, NULL);
 }
@@ -891,8 +1187,21 @@
 
 	/*special case for file skipping...*/
 	if ((bs->bsmode == GF_BITSTREAM_FILE_WRITE) || (bs->bsmode == GF_BITSTREAM_FILE_READ)) {
-		if (bs->buffer_io)
-			bs_flush_cache(bs);
+		if (bs->cache_write)
+			bs_flush_write_cache(bs);
+
+		if (bs->cache_read) {
+			u32 csize = bs->cache_read_size - bs->cache_read_pos;
+			if (csize>nbBytes) {
+				bs->cache_read_pos += (u32) nbBytes;
+				bs->position += nbBytes;
+				return;
+			}
+			nbBytes -= csize;
+			bs->position += csize;
+			bs->cache_read_pos = bs->cache_read_size;
+		}
+
 		gf_fseek(bs->stream, nbBytes, SEEK_CUR);
 		bs->position += nbBytes;
 		return;
@@ -910,8 +1219,8 @@
 	}
 }
 
-/*Only valid for READ MEMORY*/
-GF_EXPORT
+#ifdef GPAC_ENABLE_BIFS_PMF
+
 void gf_bs_rewind_bits(GF_BitStream *bs, u64 nbBits)
 {
 	u64 nbBytes;
@@ -927,6 +1236,8 @@
 	return;
 }
 
+#endif
+
 /*seek from beginning of stream: use internally even when non aligned!*/
 static GF_Err BS_SeekIntern(GF_BitStream *bs, u64 offset)
 {
@@ -960,8 +1271,12 @@
 		return GF_OK;
 	}
 
-	if (bs->buffer_io)
-		bs_flush_cache(bs);
+	if (bs->cache_write)
+		bs_flush_write_cache(bs);
+
+	if (bs->cache_read) {
+		bs->cache_read_pos = bs->cache_read_size;
+	}
 
 	gf_fseek(bs->stream, offset, SEEK_SET);
 
@@ -976,6 +1291,23 @@
 GF_EXPORT
 GF_Err gf_bs_seek(GF_BitStream *bs, u64 offset)
 {
+	if (bs->on_block_out) {
+		GF_Err e;
+		if (offset < bs->bytes_out) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[BS] Attempt to seek on byte range already forwarded\n"));
+			return GF_BAD_PARAM;
+		}
+		/*warning: we allow offset = bs->size for WRITE buffers*/
+		if (offset - bs->bytes_out > bs->size)
+			return GF_BAD_PARAM;
+		gf_bs_align(bs);
+		e = BS_SeekIntern(bs, offset - bs->bytes_out);
+		bs->position += bs->bytes_out;
+		return e;
+	}
+	if (bs->cache_write)
+		bs_flush_write_cache(bs);
+
 	/*warning: we allow offset = bs->size for WRITE buffers*/
 	if (offset > bs->size) return GF_BAD_PARAM;
 
@@ -988,7 +1320,7 @@
 u32 gf_bs_peek_bits(GF_BitStream *bs, u32 numBits, u64 byte_offset)
 {
 	u64 curPos;
-	u32 curBits, ret, current;
+	u32 curBits, ret, current, nb_zeros;
 
 	if ( (bs->bsmode != GF_BITSTREAM_READ) && (bs->bsmode != GF_BITSTREAM_FILE_READ)) return 0;
 	if (!numBits || (bs->size < bs->position + byte_offset)) return 0;
@@ -997,8 +1329,18 @@
 	curPos = bs->position;
 	curBits = bs->nbBits;
 	current = bs->current;
+	nb_zeros = bs->nb_zeros;
 
-	if (byte_offset) gf_bs_seek(bs, bs->position + byte_offset);
+	if (byte_offset) {
+		if (bs->remove_emul_prevention_byte) {
+			while (byte_offset) {
+				gf_bs_read_int(bs, 8);
+				byte_offset--;
+			}
+		} else {
+			gf_bs_seek(bs, bs->position + byte_offset);
+		}
+	}
 	ret = gf_bs_read_int(bs, numBits);
 
 	/*restore our cache - position*/
@@ -1006,6 +1348,7 @@
 	/*to avoid re-reading our bits ...*/
 	bs->nbBits = curBits;
 	bs->current = current;
+	bs->nb_zeros = nb_zeros;
 	return ret;
 }
 
@@ -1020,12 +1363,14 @@
 		return bs->size;
 
 	default:
-		if (bs->buffer_io)
-			bs_flush_cache(bs);
-		offset = gf_ftell(bs->stream);
-		gf_fseek(bs->stream, 0, SEEK_END);
-		bs->size = gf_ftell(bs->stream);
-		gf_fseek(bs->stream, offset, SEEK_SET);
+		if (bs->cache_write)
+			bs_flush_write_cache(bs);
+
+		if (bs->stream) {
+			offset = gf_ftell(bs->stream);
+			bs->size = gf_fsize(bs->stream);
+			gf_fseek(bs->stream, offset, SEEK_SET);
+		}
 		return bs->size;
 	}
 }
@@ -1033,15 +1378,17 @@
 GF_EXPORT
 u64 gf_bs_get_size(GF_BitStream *bs)
 {
-	if (bs->buffer_io)
+	if (bs->cache_write)
 		return bs->size + bs->buffer_written;
+	if (bs->on_block_out)
+		return bs->position;
 	return bs->size;
 }
 
 GF_EXPORT
 u64 gf_bs_get_position(GF_BitStream *bs)
 {
-	if (bs->buffer_io)
+	if (bs->cache_write)
 		return bs->position + bs->buffer_written;
 	return bs->position;
 }
@@ -1065,9 +1412,30 @@
 GF_EXPORT
 u64 gf_bs_read_u64_le(GF_BitStream *bs)
 {
-	u32 low = gf_bs_read_u32_le(bs);
-	u64 high = gf_bs_read_u32_le(bs);
-	return (high << 32) + low;
+	u64 ret, v;
+	ret = gf_bs_read_int(bs, 8);
+	v = gf_bs_read_int(bs, 8);
+	v<<=8;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=16;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=24;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=32;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=40;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=48;
+	ret |= v;
+	v = gf_bs_read_int(bs, 8);
+	v<<=56;
+	ret |= v;
+	return ret;
 }
 
 GF_EXPORT
@@ -1117,7 +1485,6 @@
 GF_EXPORT
 u32 gf_bs_get_bit_offset(GF_BitStream *bs)
 {
-	if (bs->stream) return 0;
 	if (bs->bsmode==GF_BITSTREAM_READ) return (u32) ( (bs->position - 1) * 8 + bs->nbBits);
 	return (u32) ( (bs->position ) * 8 + bs->nbBits);
 }
@@ -1125,10 +1492,10 @@
 GF_EXPORT
 u32 gf_bs_get_bit_position(GF_BitStream *bs)
 {
-	if (bs->stream) return 0;
 	return bs->nbBits;
 }
 
+GF_EXPORT
 u32 gf_bs_read_vluimsbf5(GF_BitStream *bs)
 {
 	u32 nb_words = 0;
@@ -1145,9 +1512,9 @@
 
 
 GF_EXPORT
-GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src)
+GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src, Bool keep_src)
 {
-	char *data;
+	u8 *data;
 	u32 data_len, written;
 
 	data = NULL;
@@ -1155,14 +1522,24 @@
 	gf_bs_get_content(src, &data, &data_len);
 	if (!data || !data_len)
 	{
-			if (data) {
-					gf_free(data);
-					return GF_IO_ERR;
+		if (data) {
+			if (keep_src) {
+				src->original = data;
+				src->size = data_len;
+			} else {
+				gf_free(data);
 			}
-			return GF_OK;
+			return GF_IO_ERR;
+		}
+		return GF_OK;
 	}
 	written = gf_bs_write_data(dst, data, data_len);
-	gf_free(data);
+	if (keep_src) {
+		src->original = data;
+		src->size = data_len;
+	} else {
+		gf_free(data);
+	}
 	if (written<data_len) return GF_IO_ERR;
 	return GF_OK;
 }
@@ -1170,15 +1547,23 @@
 GF_EXPORT
 void gf_bs_flush(GF_BitStream *bs)
 {
-	if (bs->buffer_io)
-		bs_flush_cache(bs);
-
 	if (!bs->stream) return;
-
 	if (bs->bsmode != GF_BITSTREAM_FILE_WRITE) return;
-	fflush(bs->stream);
+
+	if (bs->cache_write)
+		bs_flush_write_cache(bs);
+
+	gf_fflush(bs->stream);
 }
 
+#if 0 //unused
+/*!
+\brief Reassigns FILE object for stream-based bitstreams
+ *
+ *Reassigns FILE object for stream-based bitstreams. Automatically sets the stream position to the bitstream position
+\param bs the target bitstream
+\param stream the new stream to assign
+ */
 void gf_bs_reassign(GF_BitStream *bs, FILE *stream)
 {
 	if (!bs) return;
@@ -1191,6 +1576,7 @@
 		break;
 	}
 }
+#endif
 
 u64 gf_bs_set_cookie(GF_BitStream *bs, u64 cookie)
 {
@@ -1207,3 +1593,48 @@
 	if (!bs) return 0;
 	return bs->cookie;
 }
+
+GF_EXPORT
+GF_Err gf_bs_insert_data(GF_BitStream *bs, u8 *data, u32 size, u64 offset)
+{
+	u64 cur_r, cur_w, pos;
+	u32 nb_io;
+
+	if (bs->on_block_out) return GF_BAD_PARAM;
+
+	pos = bs->position;
+	nb_io = gf_bs_write_data(bs, data, size);
+	if (nb_io != size) goto exit;
+
+	cur_w = bs->position;
+	gf_bs_seek(bs, pos);
+	cur_r = pos;
+	pos = cur_w;
+	while (cur_r > offset) {
+		u8 block[8196];
+		u32 move_bytes = 8196;
+		if (cur_r - offset < move_bytes)
+			move_bytes = (u32) (cur_r - offset);
+
+		gf_bs_seek(bs, cur_r - move_bytes);
+		nb_io = gf_bs_read_data(bs, block, move_bytes);
+		if (nb_io != move_bytes) goto exit;
+		gf_bs_seek(bs, cur_w - move_bytes);
+		nb_io = gf_bs_write_data(bs, block, move_bytes);
+		if (nb_io != move_bytes) goto exit;
+		cur_r -= move_bytes;
+		cur_w -= move_bytes;
+	}
+
+	gf_bs_seek(bs, offset);
+	nb_io = gf_bs_write_data(bs, data, size);
+	if (nb_io != size) goto exit;
+
+	gf_bs_seek(bs, pos);
+	return GF_OK;
+
+exit:
+	gf_bs_seek(bs, pos);
+	return GF_IO_ERR;
+}
+

gpac-0.8.0.tar.gz/src/utils/cache.c -> gpac-1.0.0.tar.gz/src/utils/cache.c Changed

@@ -1,8 +1,8 @@
 /*
  *					GPAC Multimedia Framework
  *
- *			Authors: Pierre Souchay, Jean Le Feuvre
- *			Copyright (c) Telecom ParisTech 2010-2012
+ *			Authors: Jean Le Feuvre, Pierre Souchay
+ *			Copyright (c) Telecom ParisTech 2010-2020
  *					All rights reserved
  *
  *   This file is part of GPAC / common tools sub-project
@@ -166,6 +166,8 @@
 	u8 *mem_storage;
 	char *forced_headers;
 	u32 downtime;
+
+	GF_Blob cache_blob;
 };
 
 Bool delete_cache_files(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info) {
@@ -177,8 +179,8 @@
 	startPattern = (const char *) cbck;
 	sz = (u32) strlen( startPattern );
 	if (!strncmp(startPattern, item_name, sz)) {
-		if (GF_OK != gf_delete_file(item_path))
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] : failed to cleanup file %s\n", item_path));
+		if (GF_OK != gf_file_delete(item_path))
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] : failed to cleanup file %s\n", item_path));
 	}
 	return GF_FALSE;
 }
@@ -201,7 +203,7 @@
 }
 
 GF_Err gf_cache_delete_all_cached_files(const char * directory) {
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Deleting cached files in %s...\n", directory));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("Deleting cached files in %s...\n", directory));
 	return gf_enum_directory( directory, GF_FALSE, delete_cache_files, (void*)cache_file_prefix, NULL);
 }
 
@@ -217,7 +219,7 @@
 	return entry->deletableFilesOnDelete;
 }
 
-#define CHECK_ENTRY if (!entry) { GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] entry is null at " __FILE__ ":%d\n", __LINE__)); return GF_BAD_PARAM; }
+#define CHECK_ENTRY if (!entry) { GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] entry is null at " __FILE__ ":%d\n", __LINE__)); return GF_BAD_PARAM; }
 
 /*
 * Getters functions
@@ -228,12 +230,6 @@
 	return entry ? entry->serverETag : NULL;
 }
 
-const char * gf_cache_get_etag_on_disk ( const DownloadedCacheEntry entry )
-{
-	return entry ? entry->serverETag : NULL;
-}
-
-GF_EXPORT
 const char * gf_cache_get_mime_type ( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->mimeType : NULL;
@@ -253,8 +249,6 @@
 	return entry->headers_done;
 }
 
-
-GF_EXPORT
 GF_Err gf_cache_set_etag_on_server(const DownloadedCacheEntry entry, const char * eTag ) {
 	if (!entry)
 		return GF_BAD_PARAM;
@@ -273,7 +267,6 @@
 	return GF_OK;
 }
 
-GF_EXPORT
 GF_Err gf_cache_set_mime_type(const DownloadedCacheEntry entry, const char * mime_type ) {
 	if (!entry)
 		return GF_BAD_PARAM;
@@ -283,12 +276,6 @@
 	return GF_OK;
 }
 
-Bool gf_cache_is_cached_on_disk(const DownloadedCacheEntry entry ) {
-	if (entry == NULL)
-		return GF_FALSE;
-	return entry->flags & NO_CACHE;
-}
-
 u64 gf_cache_get_start_range( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->range_start : 0;
@@ -299,28 +286,16 @@
 	return entry ? entry->range_end : 0;
 }
 
-GF_EXPORT
 const char * gf_cache_get_url ( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->url : NULL;
 }
 
-const char * gf_cache_get_hash ( const DownloadedCacheEntry entry )
-{
-	return entry ? entry->hash : NULL;
-}
-
 const char * gf_cache_get_last_modified_on_server ( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->serverLastModified : NULL;
 }
 
-const char * gf_cache_get_last_modified_on_disk ( const DownloadedCacheEntry entry )
-{
-	return entry ? entry->diskLastModified : NULL;
-}
-
-GF_EXPORT
 GF_Err gf_cache_set_last_modified_on_server ( const DownloadedCacheEntry entry, const char * newLastModified )
 {
 	if (!entry)
@@ -349,7 +324,7 @@
 	CHECK_ENTRY;
 	if ( !entry->properties)
 		return GF_OK;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_flush_disk_cache:%d for entry=%p\n", __LINE__, entry));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] gf_cache_flush_disk_cache:%d for entry=%p\n", __LINE__, entry));
 	gf_cfg_set_key(entry->properties, CACHE_SECTION_NAME, CACHE_SECTION_NAME_URL, entry->url);
 
 	sprintf(buff, LLD"-"LLD, entry->range_start, entry->range_end);
@@ -373,13 +348,11 @@
 	return entry ? entry->cacheSize : -1;
 }
 
-GF_EXPORT
 const char * gf_cache_get_cache_filename( const DownloadedCacheEntry entry )
 {
 	return entry ? entry->cache_filename : NULL;
 }
 
-GF_EXPORT
 GF_Err gf_cache_append_http_headers(const DownloadedCacheEntry entry, char * httpRequest) {
 	if (!entry || !httpRequest)
 		return GF_BAD_PARAM;
@@ -406,7 +379,6 @@
 static const char * default_cache_file_suffix = ".dat";
 static const char * cache_file_info_suffix = ".txt";
 
-GF_EXPORT
 DownloadedCacheEntry gf_cache_create_entry ( GF_DownloadManager * dm, const char * cache_directory, const char * url , u64 start_range, u64 end_range, Bool mem_storage)
 {
 	char tmp[_CACHE_TMP_SIZE];
@@ -415,14 +387,14 @@
 	char ext[_CACHE_MAX_EXTENSION_SIZE];
 	DownloadedCacheEntry entry = NULL;
 	if ( !dm || !url || !cache_directory) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE,
 		       ("[CACHE] gf_cache_create_entry :%d, dm=%p, url=%s cache_directory=%s, aborting.\n", __LINE__, dm, url, cache_directory));
 		return entry;
 	}
 	sz = (u32) strlen ( url );
 	if ( sz > _CACHE_TMP_SIZE )
 	{
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE,
 		       ("[CACHE] gf_cache_create_entry:%d : ERROR, URL is too long (%d chars), more than %d chars.\n", __LINE__, sz, _CACHE_TMP_SIZE ));
 		return entry;
 	}
@@ -450,10 +422,10 @@
 	GF_SAFEALLOC(entry, struct __DownloadedCacheEntryStruct);
 
 	if ( !entry ) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("gf_cache_create_entry:%d : out of memory !\n", __LINE__));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("gf_cache_create_entry:%d : out of memory !\n", __LINE__));
 		return NULL;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, entry=%p\n", __LINE__, entry));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, entry=%p\n", __LINE__, entry));
 
 	entry->url = gf_strdup ( url );
 	entry->hash = gf_strdup ( tmp );
@@ -496,16 +468,18 @@
 	{
 		GF_Err err;
 		/* Probably out of memory */
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
 		err = gf_cache_delete_entry ( entry );
 		if ( err != GF_OK ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
 		}
 		return NULL;
 	}
 
 	if (entry->memory_stored) {
-		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		entry->cache_blob.data = entry->mem_storage;
+		entry->cache_blob.size = entry->contentLength;
+		sprintf(entry->cache_filename, "gmem://%p", &entry->cache_blob);
 		return entry;
 	}
 
@@ -542,10 +516,10 @@
 	{
 		GF_Err err;
 		/* out of memory ? */
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, aborting due to OUT of MEMORY !\n", __LINE__));
 		err = gf_cache_delete_entry ( entry );
 		if ( err != GF_OK ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, failed to delete cache entry!\n", __LINE__));
 		}
 		return NULL;
 	}
@@ -573,7 +547,6 @@
 	return entry;
 }
 
-GF_EXPORT
 GF_Err gf_cache_set_content_length( const DownloadedCacheEntry entry, u32 length )
 {
 	CHECK_ENTRY;
@@ -598,34 +571,34 @@
 		return GF_OK;
 	assert( sess == entry->write_session );
 	if (entry->writeFilePtr) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
+		GF_LOG(GF_LOG_INFO, GF_LOG_CACHE,
 		       ("[CACHE] Closing file %s, %d bytes written.\n", entry->cache_filename, entry->written_in_cache));
 
-		if (fflush( entry->writeFilePtr ) || gf_fclose( entry->writeFilePtr )) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush/close file on disk\n"));
+		if (gf_fflush( entry->writeFilePtr ) || gf_fclose( entry->writeFilePtr )) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to flush/close file on disk\n"));
 			e = GF_IO_ERR;
 		}
 		if (!e) {
 			e = gf_cache_flush_disk_cache(entry);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush cache entry on disk\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to flush cache entry on disk\n"));
 			}
 		}
 		if (!e && success) {
 			e = gf_cache_set_last_modified_on_disk( entry, gf_cache_get_last_modified_on_server(entry));
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to set last-modified\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to set last-modified\n"));
 			} else {
 				e = gf_cache_set_etag_on_disk( entry, gf_cache_get_etag_on_server(entry));
 				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to set etag\n"));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to set etag\n"));
 				}
 			}
 		}
 		if (!e) {
 			e = gf_cache_flush_disk_cache(entry);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to flush cache entry on disk after etag/last-modified\n"));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to flush cache entry on disk after etag/last-modified\n"));
 			}
 		}
 
@@ -635,7 +608,7 @@
 #endif
 		entry->writeFilePtr = NULL;
 		if (GF_OK != e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to fully write file on cache, e=%d\n", e));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] Failed to fully write file on cache, e=%d\n", e));
 		}
 	}
 	entry->write_session = NULL;
@@ -645,14 +618,13 @@
 	return e;
 }
 
-GF_EXPORT
 GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess )
 {
 	CHECK_ENTRY;
 	if (!sess)
 		return GF_BAD_PARAM;
 #ifdef ENABLE_WRITE_MX
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,("[CACHE] Locking write mutex %p for entry=%s\n", (void*) (entry->write_mutex), entry->url) );
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE,("[CACHE] Locking write mutex %p for entry=%s\n", (void*) (entry->write_mutex), entry->url) );
 	gf_mx_p(entry->write_mutex);
 #endif
 	entry->write_session = sess;
@@ -664,24 +636,26 @@
 	entry->flags &= ~CORRUPTED;
 
 	if (entry->memory_stored) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
+		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) );
 		}
 		if (!entry->mem_allocated) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Failed to create memory storage for file %s\n", entry->url));
+			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;
 		}
-		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
+		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;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
 	entry->writeFilePtr = gf_fopen(entry->cache_filename, entry->continue_file ? "a+b" : "wb");
 	if (!entry->writeFilePtr) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK,
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE,
 		       ("[CACHE] Error while opening cache file %s for writting.\n", entry->cache_filename));
 		entry->write_session = NULL;
 #ifdef ENABLE_WRITE_MX
@@ -700,7 +674,7 @@
 	CHECK_ENTRY;
 
 	if (!data || (!entry->writeFilePtr && !entry->mem_storage) || sess != entry->write_session) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Incorrect parameter : data=%p, writeFilePtr=%p mem_storage=%p at "__FILE__"\n", data, entry->writeFilePtr, entry->mem_storage));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("Incorrect parameter : data=%p, writeFilePtr=%p mem_storage=%p at "__FILE__"\n", data, entry->writeFilePtr, entry->mem_storage));
 		return GF_BAD_PARAM;
 	}
 
@@ -709,101 +683,50 @@
 			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));
 			entry->mem_allocated = new_size;
-			sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Reallocating memory cache to %d bytes\n", 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 + entry->written_in_cache, data, size);
 		entry->written_in_cache += size;
 		memset(entry->mem_storage + entry->written_in_cache, 0, 2);
-		sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
+		entry->cache_blob.size = entry->written_in_cache;
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to memory\n", size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Storing %d bytes to memory\n", size));
 		return GF_OK;
 	}
 
-	read = (u32) gf_fwrite(data, sizeof(char), size, entry->writeFilePtr);
+	read = (u32) gf_fwrite(data, size, entry->writeFilePtr);
 	if (read > 0)
 		entry->written_in_cache+= read;
 	if (read != size) {
 		/* Something bad happened */
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE,
 		       ("[CACHE] Error while writting %d bytes of data to cache : has written only %d bytes.", size, read));
 		gf_cache_close_write_cache(entry, sess, GF_FALSE);
-		gf_delete_file(entry->cache_filename);
+		gf_file_delete(entry->cache_filename);
 		return GF_IO_ERR;
 	}
-	if (fflush(entry->writeFilePtr)) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
+	if (gf_fflush(entry->writeFilePtr)) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE,
 		       ("[CACHE] Error while flushing data bytes to cache file : %s.", entry->cache_filename));
 		gf_cache_close_write_cache(entry, sess, GF_FALSE);
-		gf_delete_file(entry->cache_filename);
+		gf_file_delete(entry->cache_filename);
 		return GF_IO_ERR;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Writing %d bytes to cache\n", size));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] Writing %d bytes to cache\n", size));
 	return GF_OK;
 }
 
-GF_CacheReader gf_cache_reader_new(const DownloadedCacheEntry entry) {
-	GF_CacheReader reader;
-	if (entry == NULL)
-		return NULL;
-	reader = (GF_CacheReader)gf_malloc(sizeof(struct __CacheReaderStruct));
-	if (reader == NULL)
-		return NULL;
-	reader->readPtr = gf_fopen( entry->cache_filename, "rb" );
-	reader->readPosition = 0;
-	if (!reader->readPtr) {
-		gf_cache_reader_del(reader);
-		return NULL;
-	}
-	return reader;
-}
-
-GF_Err gf_cache_reader_del( GF_CacheReader handle ) {
-	if (!handle)
-		return GF_BAD_PARAM;
-	if (handle->readPtr)
-		gf_fclose(handle->readPtr);
-	handle->readPtr = NULL;
-	handle->readPosition = -1;
-	return GF_OK;
-}
-
-s64 gf_cache_reader_seek_at( GF_CacheReader reader, u64 seekPosition) {
-	if (!reader)
-		return -1;
-	reader->readPosition = gf_fseek(reader->readPtr, seekPosition, SEEK_SET);
-	return reader->readPosition;
-}
-
-s64 gf_cache_reader_get_position( const GF_CacheReader reader) {
-	if (!reader)
-		return -1;
-	return reader->readPosition;
-}
-
-s64 gf_cache_reader_get_currentSize( GF_CacheReader reader );
-
-s64 gf_cache_reader_full_size( GF_CacheReader reader );
-
-s32 gf_cache_reader_read( GF_CacheReader reader, char * buff, s32 length) {
-	s32 read;
-	if (!reader || !buff || length < 0 || !reader->readPtr)
-		return -1;
-	read = (s32) fread(buff, sizeof(char), length, reader->readPtr);
-	if (read > 0)
-		reader->readPosition+= read;
-	return read;
-}
-
 GF_Err gf_cache_delete_entry ( const DownloadedCacheEntry entry )
 {
 	if ( !entry )
 		return GF_OK;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, entry=%p\n", __LINE__, entry));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CACHE, ("[CACHE] gf_cache_delete_entry:%d, entry=%p, url=%s\n", __LINE__, entry, entry->url));
 	if (entry->writeFilePtr) {
 		/** Cache should have been close before, abornormal situation */
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, entry=%p, cache has not been closed properly\n", __LINE__, entry));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CACHE, ("[CACHE] gf_cache_delete_entry:%d, entry=%p, cache has not been closed properly\n", __LINE__, entry));
 		gf_fclose(entry->writeFilePtr);
 	}
 #ifdef ENABLE_WRITE_MX
@@ -812,9 +735,9 @@
 	}
 #endif
 	if (entry->file_exists && entry->deletableFilesOnDelete) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] url %s cleanup, deleting %s...\n", entry->url, entry->cache_filename));
-		if (GF_OK != gf_delete_file(entry->cache_filename))
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[CACHE] gf_cache_delete_entry:%d, failed to delete file %s\n", __LINE__, entry->cache_filename));
+		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))
+			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;
@@ -861,19 +784,18 @@
 		entry->cache_filename = NULL;
 	}
 	if ( entry->properties ) {
-		char * propfile;
+		const char * propfile = NULL;
 		if (entry->deletableFilesOnDelete)
 			propfile = gf_cfg_get_filename(entry->properties);
-		else
-			propfile = NULL;
-		gf_cfg_del ( entry->properties );
-		entry->properties = NULL;
+
 		if (propfile) {
 			//this may fail because the prop file is not yet flushed to disk
-			gf_delete_file( propfile );
-			gf_free ( propfile );
+			gf_file_delete( propfile );
 		}
-	}
+
+        gf_cfg_del ( entry->properties );
+        entry->properties = NULL;
+    }
 	entry->dm = NULL;
 	if (entry->sessions) {
 		assert( gf_list_count(entry->sessions) == 0);
@@ -887,25 +809,27 @@
 
 Bool gf_cache_check_if_cache_file_is_corrupted(const DownloadedCacheEntry entry)
 {
-	FILE *the_cache = gf_fopen ( entry->cache_filename, "rb" );
+	FILE *the_cache = NULL;
+	if (entry->cache_filename && strncmp(entry->cache_filename, "gmem://", 7))
+		the_cache = gf_fopen ( entry->cache_filename, "rb" );
+
 	if ( the_cache ) {
 		char * endPtr;
 		const char * keyValue = gf_cfg_get_key ( entry->properties, CACHE_SECTION_NAME, CACHE_SECTION_NAME_CONTENT_SIZE );
 
-		gf_fseek ( the_cache, 0, SEEK_END );
-		entry->cacheSize = ( u32 ) gf_ftell ( the_cache );
+		entry->cacheSize = ( u32 ) gf_fsize(the_cache);
 		gf_fclose ( the_cache );
 		if (keyValue) {
 			entry->contentLength = (u32) strtoul( keyValue, &endPtr, 10);
 			if (*endPtr!='\0' || entry->contentLength != entry->cacheSize) {
 				entry->flags |= CORRUPTED;
-				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, Cache corrupted: file and cache info size mismatch.\n", __LINE__));
+				GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, Cache corrupted: file and cache info size mismatch.\n", __LINE__));
 			}
 		} else {
 			entry->flags |= CORRUPTED;
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] gf_cache_create_entry:%d, CACHE is corrupted !\n", __LINE__));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CACHE, ("[CACHE] gf_cache_create_entry:%d, CACHE is corrupted !\n", __LINE__));
 		}
-	} else {
+	} else if (!entry->mem_storage) {
 		entry->flags |= CORRUPTED;
 	}
 	return entry->flags & CORRUPTED;
@@ -931,7 +855,7 @@
 		* a not fully closed cache entry */
 		if (entry->writeFilePtr) {
 			if (gf_fclose(entry->writeFilePtr)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] gf_cache_remove_session_from_cache_entry:%d, Failed to properly close cache file '%s' of url '%s', cache may be corrupted !\n", __LINE__, entry->cache_filename, entry->url));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CACHE, ("[CACHE] gf_cache_remove_session_from_cache_entry:%d, Failed to properly close cache file '%s' of url '%s', cache may be corrupted !\n", __LINE__, entry->cache_filename, entry->url));
 			}
 		}
 		entry->writeFilePtr = NULL;
@@ -967,17 +891,13 @@
 	return count + 1;
 }
 
-FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry)
-{
-	if (entry) return entry->writeFilePtr;
-	return NULL;
-}
-
 void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end)
 {
-	entry->previousRangeContentLength = entry->contentLength;
-	entry->range_end = range_end;
-	entry->continue_file = GF_TRUE;
+	if (entry) {
+		entry->previousRangeContentLength = entry->contentLength;
+		entry->range_end = range_end;
+		entry->continue_file = GF_TRUE;
+	}
 }
 
 Bool gf_cache_is_in_progress(const DownloadedCacheEntry entry)
@@ -1003,6 +923,7 @@
 	entry->range_start = start_range;
 	entry->range_end = end_range;
 	entry->contentLength = (u32) size;
+	entry->continue_file = GF_FALSE;
 	return GF_TRUE;
 }
 
@@ -1038,8 +959,10 @@
 		entry->mem_storage = (u8 *) data;
 		entry->written_in_cache = size;
 		entry->mem_allocated = 0;
-		sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to memory from external module\n", size));
+		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) {
@@ -1047,14 +970,15 @@
 		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;
-		sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Reallocating memory cache to %d bytes\n", 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->written_in_cache = size;
-	sprintf(entry->cache_filename, "gmem://%d@%p", entry->written_in_cache, entry->mem_storage);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Storing %d bytes to cache memory\n", size));
+	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;
 }

gpac-0.8.0.tar.gz/src/utils/color.c -> gpac-1.0.0.tar.gz/src/utils/color.c Changed

@@ -30,6 +30,27 @@
 
 #ifndef GPAC_DISABLE_PLAYER
 
+static GF_Err color_write_nv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, const GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yuv422_10_to_yuv422(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yuv422_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yuv444_10_to_yuv444(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yuv444_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_up);
+static GF_Err color_write_yuv420_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv);
+static GF_Err color_write_yuv422_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv);
+static GF_Err color_write_yuv444_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv);
+static GF_Err color_write_yvyu_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv);
+static GF_Err color_write_rgb_to_24(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd);
+static GF_Err color_write_rgb_to_32(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd);
+
+
+static GFINLINE u8 colmask(s32 a, s32 n)
+{
+	s32 mask = (1 << n) - 1;
+	return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
+}
+
+
 /* YUV -> RGB conversion loading two lines at each call */
 
 #define col_clip(a) MAX(0, MIN(255, a))
@@ -59,13 +80,39 @@
 	}
 }
 
-static void gf_yuv_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *) dst + dststride;
 	unsigned char *y_src2 = (unsigned char *) y_src + y_stride;
 
 	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = dst[4] = dst2[0] = dst2[4] = v_src[x];
+			dst[1] = dst[5] = dst2[1] = dst2[5] = u_src[x];
+
+			dst[2] = *y_src;
+			dst[3] = 0xFF;
+			y_src++;
+
+			dst[6] = *y_src;
+			dst[7] = 0xFF;
+			y_src++;
+
+			dst2[2] = *y_src2;
+			dst2[3] = 0xFF;
+			y_src2++;
+
+			dst2[6] = *y_src2;
+			dst2[7] = 0xFF;
+			y_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
 	for (x = 0; x < hw; x++) {
 		s32 u, v;
 		s32 b_u, g_uv, r_v, rgb_y;
@@ -109,7 +156,7 @@
 		dst2 += 8;
 	}
 }
-static void gf_yuv422_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv422_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *)dst + dststride;
@@ -118,10 +165,41 @@
 	unsigned char *v_src2 = (unsigned char *)v_src + uv_stride;
 
 	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = dst[4] = *v_src;
+			dst[1] = dst[5] = *u_src;
+			dst[2] = *y_src;
+			y_src++;
+			dst[3] = 0xFF;
+			dst[6] = *y_src;
+			y_src++;
+			dst[7] = 0xFF;
+
+			u_src++;
+			v_src++;
+
+			dst2[0] = dst2[4] = *v_src2;
+			dst2[1] = dst2[5] = *u_src2;
+			dst2[2] = *y_src;
+			y_src2++;
+			dst2[3] = 0xFF;
+			dst2[6] = *y_src;
+			y_src2++;
+			dst2[7] = 0xFF;
+
+			u_src2++;
+			v_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
+
 	for (x = 0; x < hw; x++) {
 		s32 b_u, g_uv, r_v, rgb_y;
 
-
 		b_u = B_U[*u_src];
 		g_uv = G_U[*u_src] + G_V[*v_src];
 		r_v = R_V[*v_src];
@@ -132,8 +210,6 @@
 		dst[3] = 0xFF;
 		y_src++;
 
-
-
 		rgb_y = RGB_Y[*y_src];
 		dst[4] = col_clip((rgb_y + r_v) >> SCALEBITS_OUT);
 		dst[5] = col_clip((rgb_y - g_uv) >> SCALEBITS_OUT);
@@ -143,7 +219,6 @@
 		u_src++;
 		v_src++;
 
-
 		b_u = B_U[*u_src2];
 		g_uv = G_U[*u_src2] + G_V[*v_src2];
 		r_v = R_V[*v_src2];
@@ -167,7 +242,7 @@
 		dst2 += 8;
 	}
 }
-static void gf_yuv444_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv444_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *)dst + dststride;
@@ -176,6 +251,51 @@
 	unsigned char *v_src2 = (unsigned char *)v_src + uv_stride;
 
 	hw = width / 2;
+
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = *v_src;
+			dst[1] = *u_src;
+			dst[2] = *y_src;
+			dst[3] = 0xFF;
+
+			y_src++;
+			u_src++;
+			v_src++;
+
+			dst[4] = *v_src;
+			dst[5] = *u_src;
+			dst[6] = *y_src;
+			dst[7] = 0xFF;
+
+			y_src++;
+			u_src++;
+			v_src++;
+
+			dst2[0] = *v_src2;
+			dst2[1] = *u_src2;
+			dst2[2] = *y_src2;
+			dst2[3] = 0xFF;
+
+			y_src2++;
+			u_src2++;
+			v_src2++;
+
+			dst2[4] = *v_src2;
+			dst2[5] = *u_src2;
+			dst2[6] = *y_src2;
+			dst2[7] = 0xFF;
+
+			y_src2++;
+			u_src2++;
+			v_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
+
 	for (x = 0; x < hw; x++) {
 		s32 b_u, g_uv, r_v, rgb_y;
 
@@ -237,7 +357,7 @@
 	}
 }
 
-static void gf_yuv_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *) dst + dststride;
@@ -248,6 +368,31 @@
 
 
 	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = dst[4] = dst2[0] = dst2[4] = v_src[x] >> 2;
+			dst[1] = dst[5] = dst2[1] = dst2[5] = u_src[x] >> 2;
+			dst[2] = *y_src >> 2;
+			y_src++;
+			dst[3] = 0xFF;
+
+			dst[6] = *y_src >> 2;
+			y_src++;
+			dst[7] = 0xFF;
+
+			dst2[2] = *y_src2 >> 2;
+			y_src2++;
+			dst2[3] = 0xFF;
+
+			dst2[6] = *y_src2 >> 2;
+			y_src2++;
+			dst2[7] = 0xFF;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
 	for (x = 0; x < hw; x++) {
 		s32 u, v;
 		s32 b_u, g_uv, r_v, rgb_y;
@@ -291,7 +436,7 @@
 		dst2 += 8;
 	}
 }
-static void gf_yuv422_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv422_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *)dst + dststride;
@@ -302,9 +447,39 @@
 	unsigned short *u_src = (unsigned short *)_u_src;
 	unsigned short *v_src = (unsigned short *)_v_src;
 
+	hw = width / 2;
 
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = dst[4] = *v_src >> 2;
+			dst[1] = dst[5] = *u_src >> 2;
+			dst[2] = *y_src >> 2;
+			y_src++;
+			dst[3] = 0xFF;
 
-	hw = width / 2;
+			dst[6] = *y_src >> 2;
+			y_src++;
+			dst[7] = 0xFF;
+
+			dst2[0] = dst2[4] = *v_src2 >> 2;
+			dst2[1] = dst2[5] = *u_src2 >> 2;
+			dst2[2] = *y_src2 >> 2;
+			y_src2++;
+			dst2[3] = 0xFF;
+
+			dst2[6] = *y_src2 >> 2;
+			y_src2++;
+			dst2[7] = 0xFF;
+
+			y_src2++;
+			u_src2++;
+			v_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
 	for (x = 0; x < hw; x++) {
 		s32 b_u, g_uv, r_v, rgb_y;
 
@@ -354,7 +529,7 @@
 		dst2 += 8;
 	}
 }
-static void gf_yuv444_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width)
+static void yuv444_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = (unsigned char *)dst + dststride;
@@ -365,9 +540,46 @@
 	unsigned short * u_src = (unsigned short *)_u_src;
 	unsigned short * v_src = (unsigned short *)_v_src;
 
-
-
 	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+			dst[0] = *v_src >> 2;
+			dst[1] = *u_src >> 2;
+			dst[2] = *y_src >> 2;
+			dst[3] = 0xFF;
+			y_src++;
+			u_src++;
+			v_src++;
+
+			dst[4] = *v_src >> 2;
+			dst[5] = *u_src >> 2;
+			dst[6] = *y_src >> 2;
+			dst[7] = 0xFF;
+			y_src++;
+			u_src++;
+			v_src++;
+
+			dst2[0] = *v_src2 >> 2;
+			dst2[1] = *u_src2 >> 2;
+			dst2[2] = *y_src2 >> 2;
+			dst2[3] = 0xFF;
+			y_src2++;
+			u_src2++;
+			v_src2++;
+
+			dst2[4] = *v_src2 >> 2;
+			dst2[5] = *u_src2 >> 2;
+			dst2[6] = *y_src2 >> 2;
+			dst2[7] = 0xFF;
+			y_src2++;
+			u_src2++;
+			v_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
 	for (x = 0; x < hw; x++) {
 		s32 b_u, g_uv, r_v, rgb_y;
 
@@ -429,21 +641,36 @@
 	}
 }
 
-static void gf_yuv_load_lines_packed(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 width)
+static void yuv_load_lines_packed(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 width, Bool dst_yuv)
 {
-	u32 hw, x;
+	u32 hw;
 
 	hw = width / 2;
-	for (x = 0; x < hw; x++) {
-		s32 u, v;
-		s32 b_u, g_uv, r_v, rgb_y;
+	if (dst_yuv) {
+		while (hw) {
+			hw--;
+
+			dst[0] = dst[4] = *u_src;
+			dst[1] = dst[5] = *v_src;
+			dst[2] = *y_src;
+			dst[3] = 0xFF;
+			dst[6] = *(y_src+2);
+			dst[7] = 0xFF;
 
-		u = *u_src;
-		v = *v_src;
+			dst += 8;
+			y_src += 4;
+			u_src += 4;
+			v_src += 4;
+		}
+		return;
+	}
+	while (hw) {
+		s32 b_u, g_uv, r_v, rgb_y;
+		hw--;
 
-		b_u = B_U[u];
-		g_uv = G_U[u] + G_V[v];
-		r_v = R_V[v];
+		b_u = B_U[*u_src];
+		g_uv = G_U[*u_src] + G_V[*v_src];
+		r_v = R_V[*v_src];
 
 		rgb_y = RGB_Y[*y_src];
 		dst[0] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
@@ -465,8 +692,8 @@
 }
 
 
-static void gf_yuva_load_lines(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, unsigned char *a_src,
-                               s32 y_stride, s32 uv_stride, s32 width)
+static void yuva_load_lines(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, unsigned char *a_src,
+                               s32 y_stride, s32 uv_stride, s32 width, Bool dst_yuv)
 {
 	u32 hw, x;
 	unsigned char *dst2 = dst + dststride;
@@ -476,6 +703,37 @@
 	yuv2rgb_init();
 
 	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
+
+			dst[0] = dst[4] = dst2[0] = dst2[4] = v_src[x];
+			dst[1] = dst[5] = dst2[1] = dst2[5] = u_src[x];
+
+			dst[2] = *y_src;
+			dst[3] = *a_src;
+			y_src++;
+			a_src++;
+
+			dst[6] = *y_src;
+			dst[7] = *a_src;
+			y_src++;
+			a_src++;
+
+			dst2[2] = *y_src2;
+			dst2[3] = *a_src2;
+			y_src2++;
+			a_src2++;
+
+			dst2[6] = *y_src2;
+			dst2[7] = *a_src2;
+			y_src2++;
+			a_src2++;
+
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
 	for (x = 0; x < hw; x++) {
 		s32 u, v;
 		s32 b_u, g_uv, r_v, rgb_y;
@@ -529,10 +787,10 @@
 	return ((a+1) * b) >> 8;
 }
 
-typedef void (*copy_row_proto)(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha);
-typedef void (*load_line_proto)(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 src_width, u32 src_height, u8 *dst_bits);
+typedef void (*copy_row_proto)(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height);
+typedef void (*load_line_proto)(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 src_width, u32 src_height, u8 *dst_bits, Bool dst_yuv);
 
-static void copy_row_rgb_555(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_rgb_555(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	s32 pos;
 	u16 *dst = (u16 *)_dst;
@@ -554,7 +812,7 @@
 	}
 }
 
-static void copy_row_rgb_565(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_rgb_565(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	s32 pos;
 	u16 *dst = (u16 *)_dst;
@@ -577,7 +835,7 @@
 }
 
 
-static void copy_row_rgb_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_rgb_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	s32 pos;
 	u8 a=0, r=0, g=0, b=0;
@@ -602,7 +860,7 @@
 	}
 }
 
-static void copy_row_bgr_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_bgr_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	s32 pos;
 	u8 a=0, r=0, g=0, b=0;
@@ -627,7 +885,7 @@
 	}
 }
 
-static void copy_row_bgrx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_bgrx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u8 a=0, r=0, g=0, b=0;
 	s32 pos = 0x10000L;
@@ -652,7 +910,33 @@
 	}
 }
 
-static void copy_row_rgbx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+
+static void copy_row_argb(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
+{
+	u8 a=0, r=0, g=0, b=0;
+	s32 pos = 0x10000L;
+
+	while (dst_w) {
+		while ( pos >= 0x10000L ) {
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
+			pos -= 0x10000L;
+		}
+		if (a) {
+			dst[0] = 0xFF;
+			dst[1] = r;
+			dst[2] = g;
+			dst[3] = b;
+		}
+		dst += x_pitch;
+		pos += h_inc;
+		dst_w--;
+	}
+}
+
+static void copy_row_rgbx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u8 a=0, r=0, g=0, b=0;
 	s32 pos = 0x10000L;
@@ -677,7 +961,7 @@
 	}
 }
 
-static void copy_row_rgbd(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void copy_row_rgbd(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u8 a=0, r=0, g=0, b=0;
 	s32 pos = 0x10000L;
@@ -700,9 +984,42 @@
 		dst_w--;
 	}
 }
+#if 0
+static void copy_row_yuv444(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
+{
+	s32 pos;
+	u8 *dY, *dU, *dV;
+	u8 a=0, y=0, u=0, v=0;
 
+	dY = dst;
+	dU = dst + dst_height * dst_pitch;
+	dV = dU + dst_height * dst_pitch;
 
-static void merge_row_rgb_555(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+	pos = 0x10000;
+	while (dst_w) {
+		while ( pos >= 0x10000L ) {
+			v = *src++;
+			u = *src++;
+			y = *src++;
+			a = *src++;
+			pos -= 0x10000L;
+		}
+		if (a) {
+			*dV = v;
+			*dU = u;
+			*dY = y;
+		}
+		dY++;
+		dU++;
+		dV++;
+
+		pos += h_inc;
+		dst_w--;
+	}
+}
+#endif
+
+static void merge_row_rgb_555(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -720,9 +1037,10 @@
 		}
 		if (a && alpha) {
 			col = *dst;
-			_r = (col >> 7) & 0xf8;
-			_g = (col >> 2) & 0xf8;
-			_b = (col << 3) & 0xf8;
+			_r = colmask(col >> (10 - 3), 3);
+			_g = colmask(col >> (5 - 3), 3);
+			_b = colmask(col << 3, 3);
+
 			_r = mul255(a, r - _r) + _r;
 			_g = mul255(a, g - _g) + _g;
 			_b = mul255(a, b - _b) + _b;
@@ -734,7 +1052,7 @@
 	}
 }
 
-static void merge_row_rgb_565(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void merge_row_rgb_565(u8 *src, u32 src_w, u8 *_dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -767,7 +1085,7 @@
 }
 
 
-static void merge_row_rgb_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void merge_row_rgb_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -796,7 +1114,47 @@
 	}
 }
 
-static void merge_row_bgr_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+
+#if 0
+static void merge_row_yuv444(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
+{
+	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
+	s32 pos;
+	u8 *dY, *dU, *dV;
+
+	dY = dst;
+	dU = dst + dst_height * dst_pitch;
+	dV = dU + dst_height * dst_pitch;
+
+	pos = 0x10000;
+	while (dst_w) {
+		while ( pos >= 0x10000L ) {
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
+			pos -= 0x10000L;
+			a = mul255(a, alpha);
+		}
+		if (a) {
+			_r = dY[0];
+			_g = dU[0];
+			_b = dV[0];
+			dY[0] = mul255(a, r - _r) + _r;
+			dU[1] = mul255(a, g - _g) + _g;
+			dV[2] = mul255(a, b - _b) + _b;
+		}
+		dY++;
+		dU++;
+		dV++;
+
+		pos += h_inc;
+		dst_w--;
+	}
+}
+#endif
+
+static void merge_row_bgr_24(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -827,7 +1185,7 @@
 }
 
 
-static void merge_row_bgrx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void merge_row_bgrx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -863,7 +1221,7 @@
 	}
 }
 
-static void merge_row_rgbx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void merge_row_rgbx(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -898,7 +1256,7 @@
 }
 
 
-static void merge_row_bgra(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+static void merge_row_bgra(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _a, _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -940,7 +1298,50 @@
 	}
 }
 
-static void merge_row_rgba(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha)
+
+static void merge_row_argb(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
+{
+	u32 _a, _r, _g, _b, a=0, r=0, g=0, b=0;
+	s32 pos;
+
+	pos = 0x10000;
+	while (dst_w) {
+		while ( pos >= 0x10000L ) {
+			r = *src++;
+			g = *src++;
+			b = *src++;
+			a = *src++;
+			pos -= 0x10000L;
+			a = mul255(a, alpha);
+		}
+
+		if (a) {
+			_r = dst[1];
+			_g = dst[2];
+			_b = dst[3];
+			if (dst[0]) {
+				_a = mul255(a, a) + mul255(0xFF-a, 0xFF);
+				_r = mul255(a, r - _r) + _r;
+				_g = mul255(a, g - _g) + _g;
+				_b = mul255(a, b - _b) + _b;
+				dst[0] = _a;
+				dst[1] = _r;
+				dst[2] = _g;
+				dst[3] = _b;
+			} else {
+				dst[0] = a;
+				dst[1] = b;
+				dst[2] = g;
+				dst[3] = r;
+			}
+		}
+		dst += x_pitch;
+		pos += h_inc;
+		dst_w--;
+	}
+}
+
+static void merge_row_rgba(u8 *src, u32 src_w, u8 *dst, u32 dst_w, s32 h_inc, s32 x_pitch, u8 alpha, u32 dst_pitch, u32 dst_height)
 {
 	u32 _a, _r, _g, _b, a=0, r=0, g=0, b=0;
 	s32 pos;
@@ -982,7 +1383,7 @@
 }
 
 
-static void load_line_grey(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_grey(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset + y_offset*y_pitch;
@@ -993,7 +1394,7 @@
 	}
 }
 
-static void load_line_alpha_grey(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_alpha_grey(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*2 + y_offset*y_pitch;
@@ -1004,13 +1405,18 @@
 	}
 }
 
-static GFINLINE u8 colmask(s32 a, s32 n)
+static void load_line_grey_alpha(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
-	s32 mask = (1 << n) - 1;
-	return (u8) (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
+	u32 i;
+	src_bits += x_offset*2 + y_offset*y_pitch;
+	for (i=0; i<width; i++) {
+		dst_bits[3] = *src_bits++;
+		dst_bits[0] = dst_bits[1] = dst_bits[2] = *src_bits++;
+		dst_bits+=4;
+	}
 }
 
-static void load_line_rgb_555(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgb_555(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*3 + y_offset*y_pitch;
@@ -1024,7 +1430,7 @@
 	}
 }
 
-static void load_line_rgb_565(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgb_565(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*3 + y_offset*y_pitch;
@@ -1038,7 +1444,7 @@
 	}
 }
 
-static void load_line_rgb_24(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgb_24(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*3 + y_offset*y_pitch;
@@ -1051,7 +1457,7 @@
 	}
 }
 
-static void load_line_bgr_24(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_bgr_24(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*3 + y_offset*y_pitch;
@@ -1064,7 +1470,7 @@
 	}
 }
 
-static void load_line_rgb_32(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgb_32(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*4 + y_offset*y_pitch;
@@ -1076,22 +1482,34 @@
 		dst_bits += 4;
 	}
 }
-
-static void load_line_rgbd(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_xrgb(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*4 + y_offset*y_pitch;
 	for (i=0; i<width; i++) {
+		src_bits++;
 		dst_bits[0] = *src_bits++;
 		dst_bits[1] = *src_bits++;
 		dst_bits[2] = *src_bits++;
 		dst_bits[3] = 0xFF;
+		dst_bits += 4;
+	}
+}
+static void load_line_bgrx(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
+{
+	u32 i;
+	src_bits += x_offset*4 + y_offset*y_pitch;
+	for (i=0; i<width; i++) {
+		dst_bits[2] = *src_bits++;
+		dst_bits[1] = *src_bits++;
+		dst_bits[0] = *src_bits++;
+		dst_bits[3] = 0xFF;
 		src_bits++;
 		dst_bits += 4;
 	}
 }
 
-static void load_line_rgbds(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgbd(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*4 + y_offset*y_pitch;
@@ -1099,25 +1517,26 @@
 		dst_bits[0] = *src_bits++;
 		dst_bits[1] = *src_bits++;
 		dst_bits[2] = *src_bits++;
-		dst_bits[3] = ( *src_bits++) & 0x80 ? 255 : 0;
+		dst_bits[3] = 0xFF;
+		src_bits++;
 		dst_bits += 4;
 	}
 }
 
-static void load_line_argb(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_rgbds(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*4 + y_offset*y_pitch;
 	for (i=0; i<width; i++) {
-		dst_bits[2] = *src_bits++;
-		dst_bits[1] = *src_bits++;
 		dst_bits[0] = *src_bits++;
-		dst_bits[3] = *src_bits++;
+		dst_bits[1] = *src_bits++;
+		dst_bits[2] = *src_bits++;
+		dst_bits[3] = (( *src_bits++) & 0x80) ? 255 : 0;
 		dst_bits += 4;
 	}
 }
 
-static void load_line_bgr_32(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_bgra(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u32 i;
 	src_bits += x_offset*4 + y_offset*y_pitch;
@@ -1130,7 +1549,19 @@
 	}
 }
 
-static void load_line_yv12(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_argb(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
+{
+	u32 i;
+	src_bits += x_offset*4 + y_offset*y_pitch;
+	for (i=0; i<width; i++) {
+		dst_bits[3] = *src_bits++;
+		dst_bits[0] = *src_bits++;
+		dst_bits[1] = *src_bits++;
+		dst_bits[2] = *src_bits++;
+		dst_bits += 4;
+	}
+}
+static void load_line_yv12(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	pY = (u8 *)src_bits;
@@ -1142,9 +1573,9 @@
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset/2 + y_offset*y_pitch/4;
 	pV += x_offset/2 + y_offset*y_pitch/4;
-	gf_yuv_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width);
+	yuv_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width, dst_yuv);
 }
-static void load_line_yuv422(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_yuv422(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	pY = (u8 *)src_bits;
@@ -1156,9 +1587,9 @@
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset / 2 + y_offset*y_pitch / 2;
 	pV += x_offset / 2 + y_offset*y_pitch / 2;
-	gf_yuv422_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch / 2, width);
+	yuv422_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch / 2, width, dst_yuv);
 }
-static void load_line_yuv444(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_yuv444(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	pY = (u8 *)src_bits;
@@ -1171,9 +1602,9 @@
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset + y_offset*y_pitch;
 	pV += x_offset + y_offset*y_pitch;
-	gf_yuv444_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch, width);
+	yuv444_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch, width, dst_yuv);
 }
-static void load_line_yv12_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_yv12_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	pY = (u8 *)src_bits;
@@ -1185,9 +1616,9 @@
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset/2 + y_offset*y_pitch/4;
 	pV += x_offset/2 + y_offset*y_pitch/4;
-	gf_yuv_10_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width);
+	yuv_10_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width, dst_yuv);
 }
-static void load_line_yuv422_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_yuv422_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	u16  *src_y, *src_u, *src_v;
@@ -1204,9 +1635,9 @@
 	pY = (u8 *)src_y + y_offset*y_pitch;
 	pU = (u8 *)src_u + y_offset*y_pitch / 2;
 	pV = (u8 *)src_v + y_offset*y_pitch / 2;
-	gf_yuv422_10_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch / 2, width);
+	yuv422_10_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch / 2, width, dst_yuv);
 }
-static void load_line_yuv444_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+static void load_line_yuv444_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, Bool dst_yuv)
 {
 	u8 *pY;
 	u16  *src_y, *src_u, *src_v;
@@ -1223,9 +1654,9 @@
 	pY = (u8 *)src_y + y_offset*y_pitch;
 	pU = (u8 *)src_u + y_offset*y_pitch;
 	pV = (u8 *)src_v + y_offset*y_pitch;
-	gf_yuv444_10_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch, width);
+	yuv444_10_load_lines_planar((unsigned char*)dst_bits, 4 * width, pY, pU, pV, y_pitch, y_pitch, width, dst_yuv);
 }
-static void load_line_yuva(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, u8 *pA)
+static void load_line_yuva(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, u8 *pA, Bool dst_yuv)
 {
 	u8 *pY;
 	pY = (u8*)src_bits;
@@ -1239,69 +1670,168 @@
 	pU += x_offset/2 + y_offset*y_pitch/4;
 	pV += x_offset/2 + y_offset*y_pitch/4;
 	pA += x_offset + y_offset*y_pitch;
-	gf_yuva_load_lines(dst_bits, 4*width, pY, pU, pV, pA, y_pitch, y_pitch/2, width);
+	yuva_load_lines(dst_bits, 4*width, pY, pU, pV, pA, y_pitch, y_pitch/2, width, dst_yuv);
 }
 
-static void load_line_yuyv(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_yuyv(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
 {
 	u8 *pY, *pU, *pV;
 	pY = (u8 *)src_bits + x_offset + y_offset*y_pitch;
 	pU = (u8 *)pY + 1;
 	pV = (u8 *)pY + 3;
-	gf_yuv_load_lines_packed((unsigned char*)dst_bits, 4*width, pY, pU, pV, width);
+	yuv_load_lines_packed((unsigned char*)dst_bits, 4*width, pY, pU, pV, width, dst_yuv);
 }
+static void load_line_uyvy(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
+{
+	u8 *pY, *pU, *pV;
+	pU = (u8 *)src_bits + x_offset + y_offset*y_pitch;
+	pY = (u8 *)pU + 1;
+	pV = (u8 *)pU + 2;
+	yuv_load_lines_packed((unsigned char*)dst_bits, 4*width, pY, pU, pV, width, dst_yuv);
+}
+static void load_line_yvyu(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
+{
+	u8 *pY, *pU, *pV;
+	pY = (u8 *)src_bits + x_offset + y_offset*y_pitch;
+	pV = (u8 *)pY + 1;
+	pU = (u8 *)pY + 3;
+	yuv_load_lines_packed((unsigned char*)dst_bits, 4*width, pY, pU, pV, width, dst_yuv);
+}
+static void load_line_vyuy(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, Bool dst_yuv)
+{
+	u8 *pY, *pU, *pV;
+	pV = (u8 *)src_bits + x_offset + y_offset*y_pitch;
+	pY = (u8 *)pV + 1;
+	pU = (u8 *)pV + 2;
+	yuv_load_lines_packed((unsigned char*)dst_bits, 4*width, pY, pU, pV, width, dst_yuv);
+}
+
 
-/*Ivica patch - todo, align it with other YUV loader (2 lines at a time) to avoid fetching twice U and V*/
-static void load_line_YUV420SP(u8 *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void gf_yuv_load_lines_nv12_nv21(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char *v_src, s32 y_stride, s32 width, Bool dst_yuv)
 {
-	s32 frameSize = width * height;
-	s32 j, yp, uvp, y, y1192, r, g, b, u, v;
-	u32 i;
+	u32 hw, x;
+	unsigned char *dst2 = (unsigned char *) dst + dststride;
+	unsigned char *y_src2 = (unsigned char *) y_src + y_stride;
 
-	yp = (s32)(x_offset + y_offset * y_pitch / 1.5f);
-	j = y_offset;
+	hw = width / 2;
+	if (dst_yuv) {
+		for (x = 0; x < hw; x++) {
 
-	uvp = frameSize + (j >> 1) * width, u = 0, v = 0;
+			dst[0] = dst[4] = dst2[0] = dst2[4] = v_src[2*x];
+			dst[1] = dst[5] = dst2[1] = dst2[5] = u_src[2*x];
+			dst[2] = *y_src;
+			y_src++;
+			dst[3] = 0xFF;
 
-	for (i=0; i<width; i++, yp++) {
+			dst[6] = *y_src;
+			y_src++;
+			dst[7] = 0xFF;
+
+			dst2[2] = *y_src2;
+			y_src2++;
+			dst2[3] = 0xFF;
+
+			dst2[6] = *y_src2;
+			y_src2++;
+			dst2[7] = 0xFF;
 
-		y = (0xff & ((int) src_bits[yp])) - 16;
-		if (y < 0) y = 0;
-		if ((i & 1) == 0)
-		{
-			v = (0xff & src_bits[uvp++]) - 128;
-			u = (0xff & src_bits[uvp++]) - 128;
-		}
-
-		y1192 = 1192 * y;
-		r = (y1192 + 1634 * v);
-		g = (y1192 - 833 * v - 400 * u);
-		b = (y1192 + 2066 * u);
-
-		if (r < 0)
-			r = 0;
-		else if (r > 262143)
-			r = 262143;
-		if (g < 0)
-			g = 0;
-		else if (g > 262143)
-			g = 262143;
-		if (b < 0)
-			b = 0;
-		else if (b > 262143)
-			b = 262143;
+			dst += 8;
+			dst2 += 8;
+		}
+		return;
+	}
+	for (x = 0; x < hw; x++) {
+		s32 u, v;
+		s32 b_u, g_uv, r_v, rgb_y;
 
-		*((u32*)dst_bits) = 0xff000000 | ((b << 6) & 0xff0000)
-		                    | ((g >> 2) & 0xff00) | ((r >> 10) & 0xff);
-		dst_bits+=4;
+		u = u_src[2*x];
+		v = v_src[2*x];
+
+		b_u = B_U[u];
+		g_uv = G_U[u] + G_V[v];
+		r_v = R_V[v];
+
+		rgb_y = RGB_Y[*y_src];
+		dst[0] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst[1] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst[2] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst[3] = 0xFF;
+		y_src++;
+
+		rgb_y = RGB_Y[*y_src];
+		dst[4] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst[5] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst[6] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst[7] = 0xFF;
+		y_src++;
+
+		rgb_y = RGB_Y[*y_src2];
+		dst2[0] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst2[1] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst2[2] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst2[3] = 0xFF;
+		y_src2++;
+
+		rgb_y = RGB_Y[*y_src2];
+		dst2[4] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst2[5] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst2[6] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst2[7] = 0xFF;
+		y_src2++;
+
+		dst += 8;
+		dst2 += 8;
 	}
 }
 
+static void load_line_nv12(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, Bool dst_yuv)
+{
+	u8 *pY = (u8*)src_bits;
+	if (!pU) {
+		pU = (u8*)src_bits + y_pitch*height;
+	}
+
+	pY += x_offset + y_offset*y_pitch;
+	pU += x_offset + y_offset*y_pitch/2; //half vertical sampling
+	gf_yuv_load_lines_nv12_nv21(dst_bits, 4*width, pY, pU, pU + 1, y_pitch, width, dst_yuv);
+}
+static void load_line_nv21(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, Bool dst_yuv)
+{
+	u8 *pY = (u8*)src_bits;
+	if (!pU) {
+		pU = (u8*)src_bits + y_pitch*height;
+	}
+
+	pY += x_offset + y_offset*y_pitch;
+	pU += x_offset + y_offset*y_pitch/2; //half vertical sampling
+	gf_yuv_load_lines_nv12_nv21(dst_bits, 4*width, pY, pU+1, pU, y_pitch, width, dst_yuv);
+}
 
 static void gf_cmx_apply_argb(GF_ColorMatrix *_this, u8 *a_, u8 *r_, u8 *g_, u8 *b_);
 
 //#define COLORKEY_MPEG4_STRICT
 
+static Bool format_is_yuv(u32 in_pf)
+{
+	switch (in_pf) {
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUV444_10:
+		return GF_TRUE;
+		/*not supported yet*/
+	case GF_PIXEL_YUVA:
+	default:
+		return GF_FALSE;
+	}
+}
+
 GF_EXPORT
 GF_Err gf_stretch_bits(GF_VideoSurface *dst, GF_VideoSurface *src, GF_Window *dst_wnd, GF_Window *src_wnd, u8 alpha, Bool flip, GF_ColorKey *key, GF_ColorMatrix *cmat)
 {
@@ -1309,7 +1839,7 @@
 	u8 ka=0, kr=0, kg=0, kb=0, kl=0, kh=0;
 	s32 src_row;
 	u32 i, yuv_planar_type = 0;
-	Bool no_memcpy;
+	Bool no_memcpy, dst_yuv = GF_FALSE;
 	Bool force_load_odd_yuv_lines = GF_FALSE;
 	Bool yuv_init = GF_FALSE;
 	Bool has_alpha = (alpha!=0xFF) ? GF_TRUE : GF_FALSE;
@@ -1318,13 +1848,91 @@
 	u32 src_w, src_h, dst_w, dst_h;
 	u8 *dst_bits = NULL, *dst_bits_prev = NULL, *dst_temp_bits = NULL;
 	s32 dst_x_pitch = dst->pitch_x;
-
 	copy_row_proto copy_row = NULL;
 	load_line_proto load_line = NULL;
 
 	if (cmat && (cmat->m[15] || cmat->m[16] || cmat->m[17] || (cmat->m[18]!=FIX_ONE) || cmat->m[19] )) has_alpha = GF_TRUE;
 	else if (key && (key->alpha<0xFF)) has_alpha = GF_TRUE;
 
+	//check if we have a dedicated copy/conv when no stretch nor blending (avoids line load while copying)
+	if ((alpha==0xFF) && !flip && !key && !cmat) {
+		Bool no_stretch = GF_FALSE;
+		Bool output_yuv = format_is_yuv(dst->pixel_format);
+		GF_Err e = GF_NOT_SUPPORTED;
+
+		if (!dst_wnd) no_stretch = GF_TRUE;
+		else if (src_wnd) {
+			if (!dst_wnd->x && !dst_wnd->y && (dst_wnd->w==src_wnd->w) && (dst_wnd->h==src_wnd->h))
+				no_stretch = GF_TRUE;
+		} else {
+			if ((dst_wnd->w==src->width) && (dst_wnd->h==src->height))
+				no_stretch = GF_TRUE;
+		}
+		if (no_stretch && output_yuv) {
+			//check YUV10->8, YUV->YUV
+			switch (src->pixel_format) {
+			case GF_PIXEL_NV12_10:
+				e = color_write_nv12_10_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			case GF_PIXEL_NV21_10:
+				e = color_write_nv12_10_to_yuv(dst, src, src_wnd, GF_TRUE);
+				break;
+			case GF_PIXEL_YUV_10:
+				e = color_write_yv12_10_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			case GF_PIXEL_YUV422_10:
+				if (dst->pixel_format == GF_PIXEL_YUV422)
+					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);
+				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);
+				break;
+			case GF_PIXEL_YUV:
+				e = color_write_yuv420_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			case GF_PIXEL_YUV422:
+				e = color_write_yuv422_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			case GF_PIXEL_YUV444:
+				e = color_write_yuv444_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			case GF_PIXEL_YUYV:
+			case GF_PIXEL_YVYU:
+			case GF_PIXEL_UYVY:
+			case GF_PIXEL_VYUY:
+				e = color_write_yvyu_to_yuv(dst, src, src_wnd, GF_FALSE);
+				break;
+			}
+		}
+		else if (no_stretch && !output_yuv) {
+			//check rgb->rgb copy
+			switch (dst->pixel_format) {
+			case GF_PIXEL_RGB:
+			case GF_PIXEL_RGBS:
+			case GF_PIXEL_BGR:
+				e = color_write_rgb_to_24(dst, src, src_wnd);
+				break;
+			case GF_PIXEL_RGBX:
+			case GF_PIXEL_XRGB:
+			case GF_PIXEL_RGBD:
+			case GF_PIXEL_RGBDS:
+			case GF_PIXEL_BGRX:
+			case GF_PIXEL_XBGR:
+				e = color_write_rgb_to_32(dst, src, src_wnd);
+				break;
+			default:
+				break;
+			}
+		}
+		if (e == GF_OK) return GF_OK;
+	}
+	
+	
 	switch (src->pixel_format) {
 	case GF_PIXEL_GREYSCALE:
 		load_line = load_line_grey;
@@ -1333,29 +1941,43 @@
 		load_line = load_line_alpha_grey;
 		has_alpha = GF_TRUE;
 		break;
+	case GF_PIXEL_GREYALPHA:
+		load_line = load_line_grey_alpha;
+		has_alpha = GF_TRUE;
+		break;
 	case GF_PIXEL_RGB_555:
 		load_line = load_line_rgb_555;
 		break;
 	case GF_PIXEL_RGB_565:
 		load_line = load_line_rgb_565;
 		break;
-	case GF_PIXEL_RGB_24:
+	case GF_PIXEL_RGB:
 	case GF_PIXEL_RGBS:
 		load_line = load_line_rgb_24;
 		break;
-	case GF_PIXEL_BGR_24:
+	case GF_PIXEL_BGR:
 		load_line = load_line_bgr_24;
 		break;
 	case GF_PIXEL_ARGB:
 		has_alpha = GF_TRUE;
 		load_line = load_line_argb;
 		break;
+	case GF_PIXEL_BGRA:
+		has_alpha = GF_TRUE;
+		load_line = load_line_bgra;
+		break;
 	case GF_PIXEL_RGBA:
 	case GF_PIXEL_RGBAS:
 		has_alpha = GF_TRUE;
-	case GF_PIXEL_RGB_32:
+	case GF_PIXEL_RGBX:
 		load_line = load_line_rgb_32;
 		break;
+	case GF_PIXEL_XRGB:
+		load_line = load_line_xrgb;
+		break;
+	case GF_PIXEL_BGRX:
+		load_line = load_line_bgrx;
+		break;
 	case GF_PIXEL_RGBDS:
 		load_line = load_line_rgbds;
 		has_alpha = GF_TRUE;
@@ -1363,12 +1985,7 @@
 	case GF_PIXEL_RGBD:
 		load_line = load_line_rgbd;
 		break;
-	case GF_PIXEL_BGR_32:
-		load_line = load_line_bgr_32;
-		break;
-	case GF_PIXEL_YV12:
-	case GF_PIXEL_IYUV:
-	case GF_PIXEL_I420:
+	case GF_PIXEL_YUV:
 		yuv2rgb_init();
 		yuv_planar_type = 1;
 		break;
@@ -1381,7 +1998,7 @@
 		yuv_planar_type = 5;
 		break;
 
-	case GF_PIXEL_YV12_10:
+	case GF_PIXEL_YUV_10:
 		yuv2rgb_init();
 		yuv_planar_type = 3;
 		break;
@@ -1394,8 +2011,12 @@
 		yuv_planar_type = 7;
 		break;
 	case GF_PIXEL_NV21:
+		yuv2rgb_init();
+		yuv_planar_type = 8;
+		break;
 	case GF_PIXEL_NV12:
-		load_line = load_line_YUV420SP;
+		yuv2rgb_init();
+		yuv_planar_type = 9;
 		break;
 	case GF_PIXEL_YUVA:
 		has_alpha = GF_TRUE;
@@ -1403,12 +2024,28 @@
 		yuv_planar_type = 2;
 		yuv2rgb_init();
 		break;
-	case GF_PIXEL_YUY2:
+	case GF_PIXEL_YUYV:
 		yuv_planar_type = 0;
 		yuv2rgb_init();
 		load_line = load_line_yuyv;
 		break;
+	case GF_PIXEL_UYVY:
+		yuv_planar_type = 0;
+		yuv2rgb_init();
+		load_line = load_line_uyvy;
+		break;
+	case GF_PIXEL_YVYU:
+		yuv_planar_type = 0;
+		yuv2rgb_init();
+		load_line = load_line_yvyu;
+		break;
+	case GF_PIXEL_VYUY:
+		yuv_planar_type = 0;
+		yuv2rgb_init();
+		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) ));
 		return GF_NOT_SUPPORTED;
 	}
 
@@ -1422,20 +2059,24 @@
 		dst_bpp = sizeof(unsigned char)*2;
 		copy_row = has_alpha ? merge_row_rgb_565 : copy_row_rgb_565;
 		break;
-	case GF_PIXEL_RGB_24:
+	case GF_PIXEL_RGB:
 		dst_bpp = sizeof(unsigned char)*3;
 		copy_row = has_alpha ? merge_row_rgb_24 : copy_row_rgb_24;
 		break;
-	case GF_PIXEL_BGR_24:
+	case GF_PIXEL_BGR:
 		dst_bpp = sizeof(unsigned char)*3;
 		copy_row = has_alpha ? merge_row_bgr_24 : copy_row_bgr_24;
 		break;
-	case GF_PIXEL_RGB_32:
+	case GF_PIXEL_RGBX:
 		dst_bpp = sizeof(unsigned char)*4;
 		copy_row = has_alpha ? merge_row_bgrx : copy_row_bgrx;
 		break;
 	case GF_PIXEL_ARGB:
 		dst_bpp = sizeof(unsigned char)*4;
+		copy_row = has_alpha ? merge_row_argb : copy_row_argb;
+		break;
+	case GF_PIXEL_BGRA:
+		dst_bpp = sizeof(unsigned char)*4;
 		copy_row = has_alpha ? merge_row_bgra : copy_row_bgrx;
 		break;
 	case GF_PIXEL_RGBD:
@@ -1446,11 +2087,20 @@
 		dst_bpp = sizeof(unsigned char)*4;
 		copy_row = has_alpha ? merge_row_rgba : copy_row_rgbx;
 		break;
-	case GF_PIXEL_BGR_32:
+	case GF_PIXEL_BGRX:
 		dst_bpp = sizeof(unsigned char)*4;
 		copy_row = has_alpha ? merge_row_rgbx : copy_row_rgbx;
 		break;
+#if 0
+	//yuv dest not yet supported
+	case GF_PIXEL_YUV444:
+		dst_bpp = sizeof(unsigned char)*3;
+		copy_row = has_alpha ? merge_row_yuv444 : copy_row_yuv444;
+		dst_yuv = GF_TRUE;
+		break;
+#endif
 	default:
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Destination pixel format %s not supported by gf_stretch_bits, patch welcome\n", gf_pixel_fmt_name(dst->pixel_format) ));
 		return GF_NOT_SUPPORTED;
 	}
 	/*x_pitch 0 means linear framebuffer*/
@@ -1482,11 +2132,6 @@
 
 	dst_w_size = dst_bpp*dst_w;
 
-	/*small opt here: if we need to fetch data from destination, and if destination is
-	hardware memory, we work on a copy of the destination line*/
-	if (has_alpha && dst->is_hardware_memory)
-		dst_temp_bits = (u8 *) gf_malloc(sizeof(u8) * dst_bpp * dst_w);
-
 	if (key) {
 		ka = key->alpha;
 		kr = key->r;
@@ -1515,25 +2160,31 @@
 						the_row--;
 						if (flip) the_row = src->height - 2 - the_row;
 						if (yuv_planar_type == 1) {
-							load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 						}
 						else if (yuv_planar_type == 4) {
-							load_line_yuv422(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yuv422(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 						}
 						else if (yuv_planar_type == 5) {
-							load_line_yuv444(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yuv444(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 						}
 						else if (yuv_planar_type == 3) {
-							load_line_yv12_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yv12_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 						}
 						else if (yuv_planar_type == 6) {
-							load_line_yuv422_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yuv422_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 						}
 						else if (yuv_planar_type == 7) {
-							load_line_yuv444_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+							load_line_yuv444_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
+						}
+						else if (yuv_planar_type == 8) {
+							load_line_nv21((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, dst_yuv);
+						}
+						else if (yuv_planar_type == 9) {
+							load_line_nv12((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, dst_yuv);
 						}
 						else {
-							load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, (u8 *)src->a_ptr);
+							load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, (u8 *)src->a_ptr, dst_yuv);
 						}
 
 						if (cmat) {
@@ -1568,25 +2219,31 @@
 				else {
 					if (flip) the_row = src->height - 2 - the_row;
 					if (yuv_planar_type == 1) {
-						load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 					}
 					else if (yuv_planar_type == 4) {
-						load_line_yuv422(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yuv422(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 					}
 					else if (yuv_planar_type == 5) {
-						load_line_yuv444(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yuv444(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 					}
 					else if (yuv_planar_type == 3) {
-						load_line_yv12_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yv12_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 					}
 					else if (yuv_planar_type == 6) {
-						load_line_yuv422_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yuv422_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
 					}
 					else if (yuv_planar_type == 7) {
-						load_line_yuv444_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr);
+						load_line_yuv444_10((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, dst_yuv);
+					}
+					else if (yuv_planar_type == 8) {
+						load_line_nv21((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, dst_yuv);
+					}
+					else if (yuv_planar_type == 9) {
+						load_line_nv12((char *)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, dst_yuv);
 					}
 					else {
-						load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, (u8 *)src->a_ptr);
+						load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *)src->u_ptr, (u8 *)src->v_ptr, (u8 *)src->a_ptr, dst_yuv);
 					}
 					yuv_init = GF_TRUE;
 					rows = flip ? tmp + src_w * 4 : tmp;
@@ -1620,7 +2277,7 @@
 				}
 			} else {
 				if (flip) the_row = src->height-1 - the_row;
-				load_line((u8*)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp);
+				load_line((u8*)src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, dst_yuv);
 				rows = tmp;
 				if (cmat) {
 					for (i=0; i<src_w; i++) {
@@ -1649,21 +2306,11 @@
 					}
 				}
 			}
-			/*FIXME - this should be configurable, and tested against each graphics card*/
-			if (0&&dst_temp_bits) {
-				/*load from video memory*/
-				memcpy(dst_temp_bits, dst_bits, dst_w_size);
-				/*merge*/
-				copy_row(rows, src_w, dst_temp_bits, dst_w, inc_x, dst_x_pitch, alpha);
-				/*copy to video memory*/
-				memcpy(dst_bits, dst_temp_bits, dst_w_size);
-			} else {
-				copy_row(rows, src_w, dst_bits, dst_w, inc_x, dst_x_pitch, alpha);
-			}
+			copy_row(rows, src_w, dst_bits, dst_w, inc_x, dst_x_pitch, alpha, dst->pitch_y, dst->height);
 		}
 		/*do NOT use memcpy if the target buffer is not in systems memory*/
 		else if (no_memcpy) {
-			copy_row(rows, src_w, dst_bits, dst_w, inc_x, dst_x_pitch, alpha);
+			copy_row(rows, src_w, dst_bits, dst_w, inc_x, dst_x_pitch, alpha, dst->pitch_y, dst->height);
 		} else if (dst_bits && dst_bits_prev) {
 			memcpy(dst_bits, dst_bits_prev, dst_w_size);
 		}
@@ -1704,12 +2351,6 @@
 }
 
 GF_EXPORT
-void gf_cmx_set_all(GF_ColorMatrix *_this, Fixed *coefs)
-{
-	if (!_this || !coefs) return;
-}
-
-GF_EXPORT
 void gf_cmx_set(GF_ColorMatrix *_this,
                 Fixed c1, Fixed c2, Fixed c3, Fixed c4, Fixed c5,
                 Fixed c6, Fixed c7, Fixed c8, Fixed c9, Fixed c10,
@@ -1839,6 +2480,39 @@
 }
 
 GF_EXPORT
+u64 gf_cmx_apply_wide(GF_ColorMatrix *_this, u64 col)
+{
+	u64 res;
+	Fixed _a, _r, _g, _b, a, r, g, b;
+	if (!_this || _this->identity) return col;
+
+	a = INT2FIX(col>>48);
+	a /= 0xFFFF;
+	r = INT2FIX((col>>32)&0xFFFF);
+	r /= 0xFFFF;
+	g = INT2FIX((col>>16)&0xFFFF);
+	g /= 0xFFFF;
+	b = INT2FIX((col)&0xFFFF);
+	b /= 0xFFFF;
+	_r = gf_mulfix(r, _this->m[0]) + gf_mulfix(g, _this->m[1]) + gf_mulfix(b, _this->m[2]) + gf_mulfix(a, _this->m[3]) + _this->m[4];
+	_g = gf_mulfix(r, _this->m[5]) + gf_mulfix(g, _this->m[6]) + gf_mulfix(b, _this->m[7]) + gf_mulfix(a, _this->m[8]) + _this->m[9];
+	_b = gf_mulfix(r, _this->m[10]) + gf_mulfix(g, _this->m[11]) + gf_mulfix(b, _this->m[12]) + gf_mulfix(a, _this->m[13]) + _this->m[14];
+	_a = gf_mulfix(r, _this->m[15]) + gf_mulfix(g, _this->m[16]) + gf_mulfix(b, _this->m[17]) + gf_mulfix(a, _this->m[18]) + _this->m[19];
+	CLIP_COMP(_a);
+	CLIP_COMP(_r);
+	CLIP_COMP(_g);
+	CLIP_COMP(_b);
+	res = (u32) (_a*0xFFFF)&0xFFFF;
+	res<<=16;
+	res |= (u32) (_r*0xFFFF)&0xFFFF;
+	res<<=16;
+	res |= (u32) (_g*0xFFFF)&0xFFFF;
+	res<<=16;
+	res |= (u32) (_b*0xFFFF)&0xFFFF;
+	return res;
+}
+
+GF_EXPORT
 void gf_cmx_apply_fixed(GF_ColorMatrix *_this, Fixed *a, Fixed *r, Fixed *g, Fixed *b)
 {
 	u32 col = GF_COL_ARGB_FIXED(*a, *r, *g, *b);
@@ -1851,22 +2525,27 @@
 
 
 
-#if defined(WIN32) && !defined(__GNUC__)
-# include <intrin.h>
-# define GPAC_HAS_SSE2
-#else
-# ifdef __SSE2__
-#  include <emmintrin.h>
+//intrinsic code segfaults on 32 bit, need to check why
+#if defined(GPAC_64_BITS)
+# if defined(WIN32) && !defined(__GNUC__)
+#  include <intrin.h>
 #  define GPAC_HAS_SSE2
+# else
+#  ifdef __SSE2__
+#   include <emmintrin.h>
+#   define GPAC_HAS_SSE2
+#  endif
 # endif
 #endif
 
 #ifdef GPAC_HAS_SSE2
 
-static GF_Err gf_color_write_yv12_10_to_yuv_intrin(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yv12_10_to_yuv_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
 	__m128i val1, val2, val_dst, *src1, *src2, *dst;
+	if (!pY) return GF_BAD_PARAM;
+	
 	if (!pU) {
 		pU = pY + src_stride * src_height;
 		pV = pY + 5*src_stride * src_height/4;
@@ -1943,7 +2622,7 @@
 	
 }
 
-static GF_Err gf_color_write_yuv422_10_to_yuv422_intrin(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yuv422_10_to_yuv422_intrin(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
 	__m128i val1, val2, val_dst, *src1, *src2, *dst;
@@ -2021,7 +2700,7 @@
 	
 }
 
-static GF_Err gf_color_write_yuv444_10_to_yuv444_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yuv444_10_to_yuv444_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
 	__m128i val1, val2, val_dst, *src1, *src2, *dst;
@@ -2098,7 +2777,7 @@
 	return GF_OK;
 	
 }
-static GF_Err gf_color_write_yuv422_10_to_yuv_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yuv422_10_to_yuv_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
 	__m128i val1, val2, val_dst, *src1, *src2, *dst;
@@ -2176,7 +2855,7 @@
 	return GF_OK;
 
 }
-static GF_Err gf_color_write_yuv444_10_to_yuv_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yuv444_10_to_yuv_intrin(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
 	__m128i val1, val2,val3,val4, val12, val34, val_dst, *src1, *src2,*src3,*src4, *dst;
@@ -2289,19 +2968,25 @@
 #endif
 
 
-GF_EXPORT
-GF_Err gf_color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, const GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
 
 	if (_src_wnd) {
 		w = _src_wnd->w;
 		h = _src_wnd->h;
 	} else {
-		w = src_width;
-		h = src_height;
+		w = vs_src->width;
+		h = vs_src->height;
 	}
 
+	if (!pU) {
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 5 * vs_src->pitch_y * vs_src->height/4;
+	}
 
 #ifdef GPAC_HAS_SSE2
 
@@ -2314,24 +2999,19 @@
 	if ( (w%32 == 0)
 	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y)%8 == 0)
 	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y/2)%8 == 0)
-	        && (GFINTCAST (pU + src_stride/2)%8 == 0)
-	        && (GFINTCAST (pV + src_stride/2)%8 == 0)
+	        && (GFINTCAST (pU + vs_src->pitch_y/2)%8 == 0)
+	        && (GFINTCAST (pV + vs_src->pitch_y/2)%8 == 0)
 	   ) {
-		return gf_color_write_yv12_10_to_yuv_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+		return color_write_yv12_10_to_yuv_intrin(vs_dst, pY, pU, pV, vs_src->pitch_y, vs_src->width, vs_src->height, _src_wnd, swap_uv);
 	}
 #endif
 
-	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 5*src_stride * src_height/4;
-	}
-
 	if (_src_wnd) {
-		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
+		pY = pY + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
 		/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
 		therefore force an even Y offset for U and V planes.*/
-		pU = pU + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
-		pV = pV + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+		pU = pU + (vs_src->pitch_y * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+		pV = pV + (vs_src->pitch_y * (_src_wnd->y / 2) + _src_wnd->x) / 2;
 	}
 
 	if (swap_uv) {
@@ -2341,59 +3021,60 @@
 	}
 
 	
-		for (i=0; i<h; i++) {
-			u16 *src = (u16 *) (pY + i*src_stride);
-			u8 *dst = (u8 *) vs_dst->video_buffer + i*vs_dst->pitch_y;
+	for (i=0; i<h; i++) {
+		u16 *src = (u16 *) (pY + i*vs_src->pitch_y);
+		u8 *dst = (u8 *) vs_dst->video_buffer + i*vs_dst->pitch_y;
 
-			for (j=0; j<w; j++) {
-				*dst = (*src) >> 2;
-				dst++;
-				src++;
-			}
+		for (j=0; j<w; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
 		}
+	}
 
-		for (i=0; i<h/2; i++) {
-			u16 *src = (u16 *) (pU + i*src_stride/2);
-			u8 *dst = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2;
-			if (vs_dst->u_ptr) dst = (u8 *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
+	for (i=0; i<h/2; i++) {
+		u16 *src = (u16 *) (pU + i*vs_src->pitch_y/2);
+		u8 *dst = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2;
+		if (vs_dst->u_ptr) dst = (u8 *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
 
-			for (j=0; j<w/2; j++) {
-				*dst = (*src) >> 2;
-				dst++;
-				src++;
-			}
+		for (j=0; j<w/2; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
 		}
+	}
 
-		for (i=0; i<h/2; i++) {
-			u16 *src = (u16 *) (pV + i*src_stride/2);
-			u8 *dst = (u8 *) vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4  + i*vs_dst->pitch_y/2;
-			if (vs_dst->v_ptr) dst = (u8 *) (vs_dst->v_ptr + i*vs_dst->pitch_y/2);
+	for (i=0; i<h/2; i++) {
+		u16 *src = (u16 *) (pV + i*vs_src->pitch_y/2);
+		u8 *dst = (u8 *) vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4  + i*vs_dst->pitch_y/2;
+		if (vs_dst->v_ptr) dst = (u8 *) (vs_dst->v_ptr + i*vs_dst->pitch_y/2);
 
-			for (j=0; j<w/2; j++) {
-				*dst = (*src) >> 2;
-				dst++;
-				src++;
-			}
+		for (j=0; j<w/2; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
 		}
-		return GF_OK;
-	
+	}
+	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_color_write_yuv422_10_to_yuv422(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_nv12_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pUV = vs_src->u_ptr;
 
 	if (_src_wnd) {
 		w = _src_wnd->w;
 		h = _src_wnd->h;
 	} else {
-		w = src_width;
-		h = src_height;
+		w = vs_src->width;
+		h = vs_src->height;
 	}
 
 
-#ifdef GPAC_HAS_SSE2
+//#ifdef GPAC_HAS_SSE2
+#if 0
 
 #ifdef GPAC_64_BITS
 #define GFINTCAST  (u64)
@@ -2407,19 +3088,104 @@
 	        && (GFINTCAST (pU + src_stride/2)%8 == 0)
 	        && (GFINTCAST (pV + src_stride/2)%8 == 0)
 	   ) {
-		return gf_color_write_yuv422_10_to_yuv422_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+		return gf_color_write_yv12_10_to_yuv_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+	}
+#endif
+
+	if (!pUV) {
+		pUV = pY + vs_src->pitch_y * vs_src->height;
+	}
+
+	if (_src_wnd) {
+		pY = pY + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
+		/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
+		therefore force an even Y offset for U and V planes.*/
+		pUV = pUV + (vs_src->pitch_y * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+	}
+
+	for (i=0; i<h; i++) {
+		u16 *src = (u16 *) (pY + i*vs_src->pitch_y);
+		u8 *dst = (u8 *) vs_dst->video_buffer + i*vs_dst->pitch_y;
+
+		for (j=0; j<w; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
+		}
+	}
+
+	for (i=0; i<h/2; i++) {
+		u16 *src = (u16 *) (pUV + i*vs_src->pitch_y/2);
+		u8 *dst = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2;
+		if (vs_dst->u_ptr) dst = (u8 *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
+		if (swap_uv) src += 1;
+
+		for (j=0; j<w/2; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
+		}
+	}
+
+	for (i=0; i<h/2; i++) {
+		u16 *src = (u16 *) (pUV + i*vs_src->pitch_y/2);
+		u8 *dst = (u8 *) vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4  + i*vs_dst->pitch_y/2;
+		if (vs_dst->v_ptr) dst = (u8 *) (vs_dst->v_ptr + i*vs_dst->pitch_y/2);
+		if (!swap_uv) src += 1;
+
+		for (j=0; j<w/2; j++) {
+			*dst = (*src) >> 2;
+			dst++;
+			src++;
+		}
+	}
+	return GF_OK;
+
+}
+
+static GF_Err color_write_yuv422_10_to_yuv422(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
+{
+	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+	} else {
+		w = vs_src->width;
+		h = vs_src->height;
+	}
+
+
+#ifdef GPAC_HAS_SSE2
+
+#ifdef GPAC_64_BITS
+#define GFINTCAST  (u64)
+#else
+#define GFINTCAST  (u32)
+#endif
+
+	if ( (w%32 == 0)
+	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y)%8 == 0)
+	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y/2)%8 == 0)
+	        && (GFINTCAST (pU + vs_src->pitch_y/2)%8 == 0)
+	        && (GFINTCAST (pV + vs_src->pitch_y/2)%8 == 0)
+	   ) {
+		return color_write_yuv422_10_to_yuv422_intrin(vs_dst, pY, pU, pV, vs_src->pitch_y, vs_src->width, vs_src->height, _src_wnd, swap_uv);
 	}
 #endif
 
 	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 3*src_stride * src_height/2;
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 3*vs_src->pitch_y * vs_src->height/2;
 	}
 
 	if (_src_wnd) {
-		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
-		pU = pU + (src_stride * _src_wnd->y + _src_wnd->x) / 2;
-		pV = pV + (src_stride * _src_wnd->y + _src_wnd->x) / 2;
+		pY = pY + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
+		pU = pU + (vs_src->pitch_y * _src_wnd->y + _src_wnd->x) / 2;
+		pV = pV + (vs_src->pitch_y * _src_wnd->y + _src_wnd->x) / 2;
 	}
 
 	if (swap_uv) {
@@ -2429,7 +3195,7 @@
 	}
 	
 	for (i=0; i<h; i++) {
-		u16 *src_y = (u16 *) (pY + i*src_stride);
+		u16 *src_y = (u16 *) (pY + i*vs_src->pitch_y);
 		u8 *dst_y = (u8 *) vs_dst->video_buffer + i*vs_dst->pitch_y;
 
 		for (j=0; j<w; j++) {
@@ -2439,8 +3205,8 @@
 		}
 	}
 	for (i=0; i<h; i++) {
-		u16 *src_u = (u16 *) (pU + i*src_stride/2);
-		u16 *src_v = (u16 *) (pV + i*src_stride/2);
+		u16 *src_u = (u16 *) (pU + i*vs_src->pitch_y/2);
+		u16 *src_v = (u16 *) (pV + i*vs_src->pitch_y/2);
 		u8 *dst_u = (u8 *) vs_dst->video_buffer + vs_dst->width * vs_dst->height + i*vs_dst->pitch_y/2;
 		u8 *dst_v = (u8 *) vs_dst->video_buffer + 3*vs_dst->pitch_y * vs_dst->height/2  + i*vs_dst->pitch_y/2;
 		if (vs_dst->u_ptr) dst_u = (u8 *) (vs_dst->u_ptr + i*vs_dst->pitch_y/2);
@@ -2456,23 +3222,22 @@
 			src_v++;
 		}
 	}
-	
-
-
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_Err gf_color_write_yuv444_10_to_yuv444(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+static GF_Err color_write_yuv444_10_to_yuv444(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
 
 	if (_src_wnd) {
 		w = _src_wnd->w;
 		h = _src_wnd->h;
 	} else {
-		w = src_width;
-		h = src_height;
+		w = vs_src->width;
+		h = vs_src->height;
 	}
 
 
@@ -2487,22 +3252,22 @@
 	if ( (w%32 == 0)
 	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y)%8 == 0)
 	        && (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y)%8 == 0)
-	        && (GFINTCAST (pU + src_stride)%8 == 0)
-	        && (GFINTCAST (pV + src_stride)%8 == 0)
+	        && (GFINTCAST (pU + vs_src->pitch_y)%8 == 0)
+	        && (GFINTCAST (pV + vs_src->pitch_y)%8 == 0)
 	   ) {
-		return gf_color_write_yuv444_10_to_yuv444_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+		return color_write_yuv444_10_to_yuv444_intrin(vs_dst, pY, pU, pV, vs_src->pitch_y, vs_src->width, vs_src->height, _src_wnd, swap_uv);
 	}
 #endif
 
 	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 2*src_stride * src_height;
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 2*vs_src->pitch_y * vs_src->height;
 	}
 
 	if (_src_wnd) {
-		pY = pY + src_stride * _src_wnd->y  + _src_wnd->x;
-		pU = pU + src_stride * _src_wnd->y  + _src_wnd->x ;
-		pV = pV + src_stride * _src_wnd->y  + _src_wnd->x;
+		pY = pY + vs_src->pitch_y * _src_wnd->y  + _src_wnd->x;
+		pU = pU + vs_src->pitch_y * _src_wnd->y  + _src_wnd->x ;
+		pV = pV + vs_src->pitch_y * _src_wnd->y  + _src_wnd->x;
 	}
 
 	if (swap_uv) {
@@ -2512,13 +3277,13 @@
 	}
 
 	for (i=0; i<h; i++) {
-		u16 *src_y = (u16 *) (pY + i*src_stride);
+		u16 *src_y = (u16 *) (pY + i*vs_src->pitch_y);
 		u8 *dst_y = (u8 *) vs_dst->video_buffer + i*vs_dst->pitch_y;
 		
-		u16 *src_u= (u16 *) (pU + i*src_stride);
+		u16 *src_u= (u16 *) (pU + i*vs_src->pitch_y);
 		u8 *dst_u = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height+ i*vs_dst->pitch_y;
 		
-		u16 *src_v = (u16 *) (pV + i*src_stride);
+		u16 *src_v = (u16 *) (pV + i*vs_src->pitch_y);
 		u8 *dst_v = (u8 *) vs_dst->video_buffer + 2*vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y;
 
 		if (vs_dst->u_ptr) dst_u = (u8 *)(vs_dst->u_ptr + i*vs_dst->pitch_y);
@@ -2538,24 +3303,22 @@
 			src_v++;
 		}
 	}
-
-
 	return GF_OK;
-
-	
 }
-GF_EXPORT
-GF_Err gf_color_write_yuv422_10_to_yuv(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+
+static GF_Err color_write_yuv422_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
 
 	if (_src_wnd) {
 		w = _src_wnd->w;
 		h = _src_wnd->h;
-	}
-	else {
-		w = src_width;
-		h = src_height;
+	} else {
+		w = vs_src->width;
+		h = vs_src->height;
 	}
 
 
@@ -2570,22 +3333,22 @@
 	if ((w % 32 == 0)
 		&& (GFINTCAST(vs_dst->video_buffer + vs_dst->pitch_y) % 8 == 0)
 		&& (GFINTCAST(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y / 2) % 8 == 0)
-		&& (GFINTCAST(pU + src_stride / 2) % 8 == 0)
-		&& (GFINTCAST(pV + src_stride / 2) % 8 == 0)
+		&& (GFINTCAST(pU + vs_src->pitch_y / 2) % 8 == 0)
+		&& (GFINTCAST(pV + vs_src->pitch_y / 2) % 8 == 0)
 		) {
-		return gf_color_write_yuv422_10_to_yuv_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+		return color_write_yuv422_10_to_yuv_intrin(vs_dst, pY, pU, pV, vs_src->pitch_y, vs_src->width, vs_src->height, _src_wnd, swap_uv);
 	}
 #endif
 	
-  if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 3 * src_stride * src_height/2;
+	if (!pU) {
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 3 * vs_src->pitch_y * vs_src->height/2;
 	}
 
 	if (_src_wnd) {
-		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
-		pU = pU + (src_stride * _src_wnd->y + _src_wnd->x) / 2;
-		pV = pV + (src_stride * _src_wnd->y + _src_wnd->x) / 2;
+		pY = pY + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
+		pU = pU + (vs_src->pitch_y * _src_wnd->y + _src_wnd->x) / 2;
+		pV = pV + (vs_src->pitch_y * _src_wnd->y + _src_wnd->x) / 2;
 	}
 
 	if (swap_uv) {
@@ -2596,7 +3359,7 @@
 
 
 	for (i = 0; i<h; i++) {
-		u16 *src = (u16 *)(pY + i*src_stride);
+		u16 *src = (u16 *)(pY + i*vs_src->pitch_y);
 		u8 *dst = (u8 *)vs_dst->video_buffer + i*vs_dst->pitch_y;
 
 		for (j = 0; j<w; j++) {
@@ -2606,47 +3369,48 @@
 		}
 	}
 
-	for (i = 0; i<h / 2; i++) {
-		u16 *src = (u16 *)(pU +  i*src_stride);
-		u8 *dst = (u8 *)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y / 2;
-		if (vs_dst->u_ptr) dst = (u8 *)(vs_dst->u_ptr + i*vs_dst->pitch_y / 2);
-
-		for (j = 0; j<w / 2; j++) {
-			*dst = (*src) >> 2;
-			dst++;
-			src++;
-		}
-	}
-
-	for (i = 0; i<h / 2; i++) {
-		u16 *src = (u16 *)(pV +  i*src_stride);
-		u8 *dst = (u8 *)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4 + i*vs_dst->pitch_y / 2;
-		if (vs_dst->v_ptr) dst = (u8 *)(vs_dst->v_ptr + i*vs_dst->pitch_y / 2);
+	for (i = 0; i<h/2; i++) {
+		u16 *srcu = (u16 *)(pU +  i*vs_src->pitch_y);
+		u16 *srcv = (u16 *)(pV +  i*vs_src->pitch_y);
+		u8 *dstu, *dstv;
+
+		if (vs_dst->u_ptr)
+			dstu = (u8 *)(vs_dst->u_ptr + i*vs_dst->pitch_y / 2);
+		else
+			dstu = (u8 *)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y / 2;
+
+		if (vs_dst->v_ptr)
+			dstv = (u8 *)(vs_dst->v_ptr + i*vs_dst->pitch_y / 2);
+		else
+			dstv = (u8 *)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4 + i*vs_dst->pitch_y / 2;
 
 		for (j = 0; j<w / 2; j++) {
-			*dst = (*src) >> 2;
-			dst++;
-			src++;
+			*dstu = ( (srcu[0] + srcu[1]) / 2) >> 2;
+			dstu++;
+			srcu+=2;
+
+			*dstv = ( (srcv[0] + srcv[1]) / 2) >> 2;
+			dstv++;
+			srcv+=2;
 		}
 	}
 
-
 	return GF_OK;
-
-
 }
-GF_EXPORT
-GF_Err gf_color_write_yuv444_10_to_yuv(GF_VideoSurface *vs_dst, unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd, Bool swap_uv)
+
+static GF_Err color_write_yuv444_10_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
 {
 	u32 i, j, w, h;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
 
 	if (_src_wnd) {
 		w = _src_wnd->w;
 		h = _src_wnd->h;
-	}
-	else {
-		w = src_width;
-		h = src_height;
+	} else {
+		w = vs_src->width;
+		h = vs_src->height;
 	}
 	
 
@@ -2658,26 +3422,26 @@
 #define GFINTCAST  (u32)
 #endif
 
-	if ((w % 32 == 0)
+	if ( (w % 32 == 0)
 		&& (GFINTCAST(vs_dst->video_buffer + vs_dst->pitch_y) % 8 == 0)
 		&& (GFINTCAST(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y) % 8 == 0)
-		&& (GFINTCAST(pU + src_stride) % 8 == 0)
-		&& (GFINTCAST(pV + src_stride) % 8 == 0)
+		&& (GFINTCAST(pU + vs_src->pitch_y) % 8 == 0)
+		&& (GFINTCAST(pV + vs_src->pitch_y) % 8 == 0)
 		) {
-		return gf_color_write_yuv444_10_to_yuv_intrin(vs_dst, pY, pU, pV, src_stride, src_width, src_height, _src_wnd, swap_uv);
+		return color_write_yuv444_10_to_yuv_intrin(vs_dst, pY, pU, pV, vs_src->pitch_y, vs_src->width, vs_src->height, _src_wnd, swap_uv);
 	}
 #endif
 
 
 	if (!pU) {
-		pU = pY + src_stride * src_height;
-		pV = pY + 2 * src_stride * src_height;
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 2 * vs_src->pitch_y * vs_src->height;
 	}
 
 	if (_src_wnd) {
-		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
-		pU = pU + src_stride * _src_wnd->y + _src_wnd->x;
-		pV = pV + src_stride * _src_wnd->y + _src_wnd->x;
+		pY = pY + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
+		pU = pU + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
+		pV = pV + vs_src->pitch_y * _src_wnd->y + _src_wnd->x;
 	}
 
 	if (swap_uv) {
@@ -2685,10 +3449,9 @@
 		pV = pU;
 		pU = t;
 	}
-
 	
 	for (i = 0; i<h; i++) {
-		u16 *src = (u16 *)(pY + i*src_stride);
+		u16 *src = (u16 *)(pY + i*vs_src->pitch_y);
 		u8 *dst = (u8 *)vs_dst->video_buffer + i*vs_dst->pitch_y;
 
 		for (j = 0; j<w; j++) {
@@ -2699,33 +3462,685 @@
 	}
 
 	for (i = 0; i<h/2; i++) {
-		u16 *src = (u16 *)(pU + 2*i*src_stride );
-		u8 *dst = (u8 *)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y / 2;
-		if (vs_dst->u_ptr) dst = (u8 *)(vs_dst->u_ptr + i*vs_dst->pitch_y / 2);
+		u16 *srcu1 = (u16 *)(pU + 2*i*vs_src->pitch_y );
+		u16 *srcu2 = (u16 *)(pU + 2*(i+1)*vs_src->pitch_y );
+		u16 *srcv1 = (u16 *)(pV + 2*i*vs_src->pitch_y );
+		u16 *srcv2 = (u16 *)(pV + 2*(i+1)*vs_src->pitch_y );
+		u8 *dstu, *dstv;
+
+		if (vs_dst->u_ptr)
+			dstu = (u8 *)(vs_dst->u_ptr + i*vs_dst->pitch_y / 2);
+		else
+			dstu = (u8 *)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y / 2;
+
+		if (vs_dst->v_ptr)
+			dstv = (u8 *)(vs_dst->v_ptr + i*vs_dst->pitch_y / 2);
+		else
+			dstv = (u8 *)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4 + i*vs_dst->pitch_y / 2;
 
 		for (j = 0; j<w/2 ;j++) {
-			*dst = (*src) >> 2;
-			dst++;
-			src+=2;
+			u32 u, v;
+			u = (srcu1[0] + srcu1[1] + srcu2[0] + srcu2[1] ) / 4;
+			*dstu = u>>2;
+			dstu++;
+			srcu1+=2;
+			srcu2+=2;
+
+			v = (srcv1[0] + srcv1[1] + srcv2[0] + srcv2[1] ) / 4;
+			*dstv = v>>2;
+			dstv++;
+			srcv1+=2;
+			srcv2+=2;
 		}
 	}
+	return GF_OK;
+}
+
+static Bool is_planar_yuv(u32 pf)
+{
+	switch (pf) {
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YUV_10:
+	case GF_PIXEL_YUV422:
+	case GF_PIXEL_YUV422_10:
+	case GF_PIXEL_YUV444:
+	case GF_PIXEL_YUV444_10:
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
 
-	for (i = 0; i<h/2 ; i++) {
-		u16 *src = (u16 *)(pV + 2*i*src_stride );
-		u8 *dst = (u8 *)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4 + i*vs_dst->pitch_y / 2;
-		if (vs_dst->v_ptr) dst = (u8 *)(vs_dst->v_ptr + i*vs_dst->pitch_y / 2);
 
-		for (j = 0; j<w/2 ; j++) {
-			*dst = (*src) >> 2;
-			dst++;
-			src+= 2;
+static GF_Err color_write_yuv420_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
+{
+	u32 w, h, ox, oy;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	} else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
+
+	if (!pU) {
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 5 * vs_src->pitch_y * vs_src->height / 4;
+	}
+
+
+	pY = pY + vs_src->pitch_y * oy + ox;
+	/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
+	therefore force an even Y offset for U and V planes.*/
+	pU = pU + (vs_src->pitch_y * (oy / 2) + ox) / 2;
+	pV = pV + (vs_src->pitch_y * (oy / 2) + ox) / 2;
+
+
+	if (is_planar_yuv(vs_dst->pixel_format)) {
+		/*complete source copy*/
+		if ((vs_dst->pitch_y == (s32)vs_src->pitch_y) && (w == vs_src->width) && (h == vs_src->height)) {
+			assert(!ox);
+			assert(!oy);
+			memcpy(vs_dst->video_buffer, pY, sizeof(u8)*w*h);
+			if (vs_dst->pixel_format == GF_PIXEL_YUV) {
+				memcpy(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height, pV, sizeof(u8)*w*h/ 4);
+				memcpy(vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4, pU, sizeof(u8)*w*h/ 4);
+			}
+			else {
+				memcpy(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height, pU, sizeof(u8)*w*h / 4);
+				memcpy(vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4, pV, sizeof(u8)*w*h/ 4);
+			}
+		} else {
+			u32 i;
+			u8 *dst, *src, *dst2, *src2, *dst3, *src3;
+
+			src = pY;
+			dst = (u8*)vs_dst->video_buffer;
+
+			src2 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pU : pV;
+			dst2 = (u8*)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height;
+			src3 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pV : pU;
+			dst3 = (u8*)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4;
+			for (i = 0; i<h; i++) {
+				memcpy(dst, src, w);
+				src += vs_src->pitch_y;
+				dst += vs_dst->pitch_y;
+				if (i<h / 2) {
+					memcpy(dst2, src2, w / 2);
+					src2 += vs_src->pitch_y/ 2;
+					dst2 += vs_dst->pitch_y / 2;
+					memcpy(dst3, src3, w / 2);
+					src3 += vs_src->pitch_y / 2;
+					dst3 += vs_dst->pitch_y / 2;
+				}
+			}
+		}
+	}
+	else if (vs_dst->pixel_format == GF_PIXEL_UYVY) {
+		u32 i, j;
+		for (i = 0; i<h; i++) {
+			u8 *dst, *y, *u, *v;
+			y = pY + i*vs_src->pitch_y;
+			u = pU + (i / 2) * vs_src->pitch_y  / 2;
+			v = pV + (i / 2) * vs_src->pitch_y / 2;
+			dst = (u8 *)vs_dst->video_buffer + i*vs_dst->pitch_y;
+
+			for (j = 0; j<w / 2; j++) {
+				*dst = *u;
+				dst++;
+				u++;
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *v;
+				dst++;
+				v++;
+				*dst = *y;
+				dst++;
+				y++;
+			}
+		}
+	}
+	else if (vs_dst->pixel_format == GF_PIXEL_VYUY) {
+		u32 i, j;
+		for (i = 0; i<h; i++) {
+			u8 *dst, *y, *u, *v;
+			y = pY + i*vs_src->pitch_y;
+			u = pU + (i / 2) * vs_src->pitch_y / 2;
+			v = pV + (i / 2) * vs_src->pitch_y / 2;
+			dst = (u8 *)vs_dst->video_buffer + i*vs_dst->pitch_y;
+
+			for (j = 0; j<w / 2; j++) {
+				*dst = *v;
+				dst++;
+				v++;
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *u;
+				dst++;
+				u++;
+				*dst = *y;
+				dst++;
+				y++;
+			}
+		}
+	}
+	else if (vs_dst->pixel_format == GF_PIXEL_YUYV) {
+		u32 i, j;
+		for (i = 0; i<h; i++) {
+			u8 *dst, *y, *u, *v;
+			y = pY + i*vs_src->pitch_y;
+			u = pU + (i / 2) * vs_src->pitch_y / 2;
+			v = pV + (i / 2) * vs_src->pitch_y / 2;
+			dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+
+			for (j = 0; j<w / 2; j++) {
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *u;
+				dst++;
+				u++;
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *v;
+				dst++;
+				v++;
+			}
+		}
+	}
+	else if (vs_dst->pixel_format == GF_PIXEL_YVYU) {
+		u32 i, j;
+		for (i = 0; i<h; i++) {
+			u8 *dst, *y, *u, *v;
+			y = pY + i*vs_src->pitch_y;
+			u = pU + (i / 2) * vs_src->pitch_y / 2;
+			v = pV + (i / 2) * vs_src->pitch_y / 2;
+			dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+
+			for (j = 0; j<w / 2; j++) {
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *v;
+				dst++;
+				v++;
+				*dst = *y;
+				dst++;
+				y++;
+				*dst = *u;
+				dst++;
+				u++;
+			}
+		}
+	}
+	else {
+		return GF_NOT_SUPPORTED;
+	}
+	return GF_OK;
+}
+
+static GF_Err color_write_yuv422_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
+{
+	u32 w, h, ox, oy;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	}
+	else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
+
+	if (!pU) {
+		pU = pY + vs_src->pitch_y * vs_src->height;
+		pV = pY + 3 * vs_src->pitch_y * vs_src->height / 2;
+	}
+
+
+	pY = pY + vs_src->pitch_y * oy + ox;
+	pU = pU + (vs_src->pitch_y * oy + ox) / 2;
+	pV = pV + (vs_src->pitch_y * oy + ox) / 2;
+
+
+	if (is_planar_yuv(vs_dst->pixel_format)) {
+		/*complete source copy*/
+		u32 i;
+		u8 *dst, *src, *dst2, *src2, *dst3, *src3, *_src2, *_src3;
+
+		src = pY;
+		_src2 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pU : pV;
+		_src3 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pV : pU;
+		dst = (u8*)vs_dst->video_buffer;
+		dst2 = (u8*)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height;
+		dst3 = (u8*)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4;
+		for (i = 0; i<h; i++) {
+			memcpy(dst, src, w);
+			src += vs_src->pitch_y;
+			dst += vs_dst->pitch_y;
+			if (i < h / 2) {
+				src2 = _src2 + i*vs_src->pitch_y;
+				src3 = _src3 + i*vs_src->pitch_y;
+				memcpy(dst2, src2, w / 2);
+				memcpy(dst3, src3, w / 2);
+				dst2 += vs_dst->pitch_y / 2;
+				dst3 += vs_dst->pitch_y / 2;
+			}
 		}
+		return GF_OK;
 	}
+	return GF_NOT_SUPPORTED;
+}
+
 
+static GF_Err color_write_yuv444_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
+{
+	u32 w, h, ox, oy;
+	u8 *pY = vs_src->video_buffer;
+	u8 *pU = vs_src->u_ptr;
+	u8 *pV = vs_src->v_ptr;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	}
+	else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
+
+	if (!pU) {
+		pU = pY + vs_src->pitch_y* vs_src->height;
+		pV = pY + 2 * vs_src->pitch_y * vs_src->height;
+	}
+
+	pY = pY + vs_src->pitch_y * oy + ox;
+	pU = pU + vs_src->pitch_y * oy + ox;
+	pV = pV + vs_src->pitch_y * oy + ox;
+
+	if (is_planar_yuv(vs_dst->pixel_format)) {
+		/*complete source copy*/
+		u32 i, j;
+		u8 *dst, *src, *_src2, *_src3;
+
+		src = pY;
+		_src2 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pU : pV;
+		_src3 = (vs_dst->pixel_format != GF_PIXEL_YUV) ? pV : pU;
+		dst = (u8*)vs_dst->video_buffer;
+
+		for (i = 0; i<h; i++) {
+			memcpy(dst, src, w);
+			src += vs_src->pitch_y;
+			dst += vs_dst->pitch_y;
+
+		}
+		for (i = 0; i < h / 2; i++) {
+			u8 *dst2, *src2, *dst3, *src3;
+			src2 = _src2 + 2 * i*vs_src->pitch_y;
+			dst2 = (u8*)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i* vs_dst->pitch_y / 2;
+			src3 = _src3 + 2 * i*vs_src->pitch_y;
+			dst3 = (u8*)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4 + i* vs_dst->pitch_y / 2;
+			for (j = 0; j<w / 2; j++) {
+				*dst2 = *src2;
+				dst2++;
+				src2 += 2;
+
+				*dst3 = *src3;
+				dst3++;
+				src3 += 2;
+			}
+		}
+		return GF_OK;
+	}
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err color_write_yvyu_to_yuv(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd, Bool swap_uv)
+{
+	u32 i, j;
+	u32 w, h, ox, oy;
+	u8 *pY, *pU, *pV;
 	
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	}
+	else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
+
+	switch (vs_src->pixel_format) {
+	case GF_PIXEL_UYVY:
+		pU = vs_src->video_buffer + vs_src->pitch_y* oy + ox;
+		pY = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 1;
+		pV = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 3;
+		break;
+	case GF_PIXEL_YUYV:
+		pY = vs_src->video_buffer + vs_src->pitch_y * oy + ox;
+		pU = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 1;
+		pV = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 3;
+		break;
+	case GF_PIXEL_YVYU:
+		pY = vs_src->video_buffer + vs_src->pitch_y * oy + ox;
+		pV = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 1;
+		pU = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 3;
+		break;
+	case GF_PIXEL_VYUY:
+		pV = vs_src->video_buffer + vs_src->pitch_y* oy + ox;
+		pY = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 1;
+		pU = vs_src->video_buffer + vs_src->pitch_y * oy + ox + 3;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+	if (is_planar_yuv(vs_dst->pixel_format)) {
+		u8 *dst_y, *dst_u, *dst_v;
+
+		dst_y = (u8*)vs_dst->video_buffer;
+		if (vs_dst->pixel_format == GF_PIXEL_YUV) {
+			dst_v = (u8*)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height;
+			dst_u = (u8*)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4;
+		}
+		else {
+			dst_u = (u8*)vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height;
+			dst_v = (u8*)vs_dst->video_buffer + 5 * vs_dst->pitch_y * vs_dst->height / 4;
+		}
+		for (i = 0; i<h; i++) {
+			for (j = 0; j<w; j += 2) {
+				*dst_y = *pY;
+				*(dst_y + 1) = *(pY + 2);
+				dst_y += 2;
+				pY += 4;
+				if (i % 2) continue;
+
+				*dst_u = (*pU + *(pU + vs_src->pitch_y)) / 2;
+				*dst_v = (*pV + *(pV + vs_src->pitch_y)) / 2;
+				dst_u++;
+				dst_v++;
+				pU += 4;
+				pV += 4;
+			}
+			if (i % 2) {
+				pU += vs_src->pitch_y;
+				pV += vs_src->pitch_y;
+			}
+		}
+		return GF_OK;
+	}
+
+	if (vs_src->pixel_format == vs_dst->pixel_format) {
+		for (i = 0; i<h; i++) {
+			char *dst = vs_dst->video_buffer + i*vs_dst->pitch_y;
+			pY = vs_src->video_buffer + vs_src->pitch_y * (i + oy) + ox;
+			memcpy(dst, pY, sizeof(char) * 2 * w);
+		}
+		return GF_OK;
+	}
+
+	for (i = 0; i<h; i++) {
+		u8 *dst = vs_dst->video_buffer + i*vs_dst->pitch_y;
+		u8 *y = pY + vs_src->pitch_y * i;
+		u8 *u = pU + vs_src->pitch_y * i;
+		u8 *v = pV + vs_src->pitch_y * i;
+		switch (vs_dst->pixel_format) {
+		case GF_PIXEL_UYVY:
+			for (j = 0; j<w; j += 2) {
+				dst[0] = *u;
+				dst[1] = *y;
+				dst[2] = *v;
+				dst[3] = *(y + 2);
+				dst += 4;
+				y += 4;
+				u += 4;
+				v += 4;
+			}
+			break;
+		case GF_PIXEL_YVYU:
+			for (j = 0; j<w; j += 2) {
+				dst[0] = *y;
+				dst[1] = *v;
+				dst[2] = *(y + 2);
+				dst[3] = *u;
+				dst += 4;
+				y += 4;
+				u += 4;
+				v += 4;
+			}
+			break;
+		case GF_PIXEL_YUYV:
+			for (j = 0; j<w; j += 2) {
+				dst[0] = *y;
+				dst[1] = *u;
+				dst[2] = *(y + 2);
+				dst[3] = *v;
+				dst += 4;
+				y += 4;
+				u += 4;
+				v += 4;
+			}
+			break;
+		case GF_PIXEL_VYUY:
+			for (j = 0; j<w; j += 2) {
+				dst[0] = *v;
+				dst[1] = *y;
+				dst[2] = *u;
+				dst[3] = *(y + 2);
+				dst += 4;
+				y += 4;
+				u += 4;
+				v += 4;
+			}
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	return GF_OK;
+}
+
+
+u32 get_bpp(u32 pf)
+{
+	switch (pf) {
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+		return 2;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_RGBS:
+	case GF_PIXEL_BGR:
+		return 3;
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBAS:
+	case GF_PIXEL_RGBD:
+	case GF_PIXEL_RGBDS:
+		return 4;
+	}
+	return 0;
+}
+
+static GF_Err color_write_rgb_to_24(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd)
+{
+	u32 i;
+	u32 w, h, ox, oy;
+	u8 *src;
+	u32 BPP;
+
+	if (vs_src->pixel_format != vs_dst->pixel_format) return GF_NOT_SUPPORTED;
+	BPP = get_bpp(vs_src->pixel_format);
+	if (!BPP) return GF_NOT_SUPPORTED;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	} else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
+
+	/*go to start of src*/
+	src = vs_src->video_buffer + vs_src->pitch_x * oy + BPP * ox;
+
+	for (i = 0; i<h; i++) {
+		memcpy(vs_dst->video_buffer + i*vs_dst->pitch_y, src, sizeof(u8) * BPP * w);
+		src += vs_src->pitch_y;
+	}
 	return GF_OK;
+}
+
 
+static GF_Err color_write_rgb_to_32(GF_VideoSurface *vs_dst, GF_VideoSurface *vs_src, GF_Window *_src_wnd)
+{
+	u32 i, j, w, h, ox, oy;
+	u8 *src;
+	Bool isBGR;
+	u8 *dst, *cur;
+	u32 BPP = get_bpp(vs_src->pixel_format);
+	if (!BPP) return GF_NOT_SUPPORTED;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+		ox = _src_wnd->x;
+		oy = _src_wnd->y;
+	}
+	else {
+		w = vs_src->width;
+		h = vs_src->height;
+		ox = oy = 0;
+	}
 
+	/*go to start of src*/
+	src = vs_src->video_buffer + vs_src->pitch_y * oy + BPP * ox;
+
+	if (vs_src->pixel_format == vs_dst->pixel_format) {
+		for (i = 0; i<h; i++) {
+			memcpy(vs_dst->video_buffer + i*vs_dst->pitch_y, src, sizeof(u8) * BPP * w);
+		}
+		return GF_OK;
+	}
+	/*get all pixels*/
+	isBGR = (vs_dst->pixel_format == GF_PIXEL_BGRX) ? GF_TRUE : GF_FALSE;
+	if (isBGR) {
+		switch (vs_src->pixel_format) {
+		case GF_PIXEL_RGB:
+		case GF_PIXEL_RGBS:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[0] = *cur++;
+					dst[1] = *cur++;
+					dst[2] = *cur++;
+					dst += 4;
+				}
+			}
+			break;
+		case GF_PIXEL_RGBDS:
+		case GF_PIXEL_RGBD:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[0] = *cur++;
+					dst[1] = *cur++;
+					dst[2] = *cur++;
+					cur++;
+					dst += 4;
+				}
+			}
+			break;
+		case GF_PIXEL_BGR:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[2] = *cur++;
+					dst[1] = *cur++;
+					dst[0] = *cur++;
+					dst += 4;
+				}
+			}
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	else {
+		switch (vs_src->pixel_format) {
+		case GF_PIXEL_RGB:
+		case GF_PIXEL_RGBS:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[2] = *cur++;
+					dst[1] = *cur++;
+					dst[0] = *cur++;
+					dst += 4;
+				}
+			}
+			break;
+		case GF_PIXEL_RGBD:
+		case GF_PIXEL_RGBDS:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[2] = *cur++;
+					dst[1] = *cur++;
+					dst[0] = *cur++;
+					cur++;
+					dst += 4;
+				}
+			}
+			break;
+		case GF_PIXEL_BGR:
+			for (i = 0; i<h; i++) {
+				dst = (u8*)vs_dst->video_buffer + i*vs_dst->pitch_y;
+				cur = src + i*vs_src->pitch_y;
+				for (j = 0; j<w; j++) {
+					dst[0] = *cur++;
+					dst[1] = *cur++;
+					dst[2] = *cur++;
+					dst += 4;
+				}
+			}
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+	}
+	return GF_OK;
 }
 
 #endif

gpac-0.8.0.tar.gz/src/utils/configfile.c -> gpac-1.0.0.tar.gz/src/utils/configfile.c Changed

@@ -30,6 +30,7 @@
 
 typedef struct
 {
+	Bool do_restrict;
 	char *name;
 	char *value;
 } IniKey;
@@ -50,11 +51,10 @@
 
 static void DelSection(IniSection *ptr)
 {
-	IniKey *k;
 	if (!ptr) return;
 	if (ptr->keys) {
 		while (gf_list_count(ptr->keys)) {
-			k = (IniKey *) gf_list_get(ptr->keys, 0);
+			IniKey *k = (IniKey *) gf_list_get(ptr->keys, 0);
 			if (k->value) gf_free(k->value);
 			if (k->name) gf_free(k->name);
 			gf_free(k);
@@ -68,14 +68,14 @@
 
 /*!
  * \brief Clear the structure
- * \param iniFile The structure to clear
+\param iniFile The structure to clear
  */
-static void gf_cfg_clear(GF_Config * iniFile) {
-	IniSection *p;
+static void gf_cfg_clear(GF_Config * iniFile)
+{
 	if (!iniFile) return;
 	if (iniFile->sections) {
 		while (gf_list_count(iniFile->sections)) {
-			p = (IniSection *) gf_list_get(iniFile->sections, 0);
+			IniSection *p = (IniSection *) gf_list_get(iniFile->sections, 0);
 			DelSection(p);
 			gf_list_rem(iniFile->sections, 0);
 		}
@@ -92,15 +92,24 @@
 GF_Err gf_cfg_parse_config_file(GF_Config * tmp, const char * filePath, const char * file_name)
 {
 	IniSection *p;
-	IniKey *k;
+	IniKey *k=NULL;
 	FILE *file;
-	char *ret;
 	char *line;
 	u32 line_alloc = MAX_INI_LINE;
 	char fileName[GF_MAX_PATH];
-
+	Bool line_done = GF_FALSE;
+	u32 nb_empty_lines=0;
+	Bool is_opts_probe = GF_FALSE;
+	Bool in_multiline = GF_FALSE;;
 	gf_cfg_clear(tmp);
 
+	if (strstr(file_name, "/all_opts.txt")) {
+		if (filePath && !strcmp(filePath, "probe")) {
+			filePath = NULL;
+			is_opts_probe = GF_TRUE;
+		}
+	}
+
 	if (filePath && ((filePath[strlen(filePath)-1] == '/') || (filePath[strlen(filePath)-1] == '\\')) ) {
 		strcpy(fileName, filePath);
 		strcat(fileName, file_name);
@@ -120,33 +129,61 @@
 	line = (char*)gf_malloc(sizeof(char)*line_alloc);
 	memset(line, 0, sizeof(char)*line_alloc);
 
-	while (!feof(file)) {
+#define FLUSH_EMPTY_LINES \
+			if (k&& nb_empty_lines) {\
+				u32 klen = (u32) strlen(k->value)+1+nb_empty_lines;\
+				k->value = gf_realloc(k->value, sizeof(char)*klen);\
+				while (nb_empty_lines) {\
+					nb_empty_lines--;\
+					strcat(k->value, "\n");\
+				}\
+				k=NULL;\
+			}\
+			nb_empty_lines=0;\
+
+	while (!gf_feof(file)) {
+		char *ret;
 		u32 read, nb_pass;
-		ret = fgets(line, line_alloc, file);
+		char *fsep;
+		ret = gf_fgets(line, line_alloc, file);
 		read = (u32) strlen(line);
+
 		nb_pass = 1;
 		while (read + nb_pass == line_alloc) {
 			line_alloc += MAX_INI_LINE;
 			line = (char*)gf_realloc(line, sizeof(char)*line_alloc);
-			ret = fgets(line+read, MAX_INI_LINE, file);
+			ret = gf_fgets(line+read, MAX_INI_LINE, file);
 			read = (u32) strlen(line);
 			nb_pass++;
 		}
 		if (!ret) continue;
 
 		/* get rid of the end of line stuff */
-		while (1) {
-			u32 len = (u32) strlen(line);
-			if (!len) break;
-			if ((line[len-1] != '\n') && (line[len-1] != '\r')) break;
-			line[len-1] = 0;
+		fsep = strchr(line, '=');
+		if (!fsep || (fsep[1]!='@')) {
+			while (!in_multiline) {
+				u32 len = (u32) strlen(line);
+				if (!len) break;
+				if ((line[len-1] != '\n') && (line[len-1] != '\r')) break;
+				line[len-1] = 0;
+			}
+		}
+		if (!strlen(line)) {
+			if (k) nb_empty_lines++;
+			continue;
+		}
+		if (line[0] == '#') {
+			FLUSH_EMPTY_LINES
+			continue;
 		}
-		if (!strlen(line)) continue;
-		if (line[0] == '#') continue;
-
 
 		/* new section */
 		if (line[0] == '[') {
+			//compat with old arch
+			if (nb_empty_lines) nb_empty_lines--;
+
+			FLUSH_EMPTY_LINES
+
 			p = (IniSection *) gf_malloc(sizeof(IniSection));
 			p->keys = gf_list_new();
 			p->section_name = gf_strdup(line + 1);
@@ -154,7 +191,7 @@
 			while (p->section_name[strlen(p->section_name) - 1] == ']' || p->section_name[strlen(p->section_name) - 1] == ' ') p->section_name[strlen(p->section_name) - 1] = 0;
 			gf_list_add(tmp->sections, p);
 		}
-		else if (strlen(line) && (strchr(line, '=') != NULL) ) {
+		else if (strlen(line) && !in_multiline && (strchr(line, '=') != NULL) ) {
 			if (!p) {
 				gf_list_del(tmp->sections);
 				gf_free(tmp->fileName);
@@ -163,6 +200,7 @@
 				gf_free(line);
 				return GF_IO_ERR;
 			}
+			FLUSH_EMPTY_LINES
 
 			k = (IniKey *) gf_malloc(sizeof(IniKey));
 			memset((void *)k, 0, sizeof(IniKey));
@@ -174,14 +212,46 @@
 				ret[0] = '=';
 				ret += 1;
 				while (ret[0] == ' ') ret++;
+				if (ret[0]=='@') {
+					ret++;
+					in_multiline = GF_TRUE;
+				}
 				if ( ret[0] != 0) {
 					k->value = gf_strdup(ret);
 					while (k->value[strlen(k->value) - 1] == ' ') k->value[strlen(k->value) - 1] = 0;
 				} else {
 					k->value = gf_strdup("");
 				}
+				line_done = GF_FALSE;
 			}
 			gf_list_add(p->keys, k);
+			if (line_done) k=NULL;
+			line_done=GF_FALSE;
+
+			if (is_opts_probe) {
+				if (!strcmp(p->section_name, "version") && !strcmp(k->name, "version")) {
+					break;
+				}
+			}
+
+		} else if (k) {
+			u32 l1 = (u32) strlen(k->value);
+			u32 l2 = (u32) strlen(line);
+			k->value = gf_realloc(k->value, sizeof(char) * (l1 + l2 + 1 + nb_empty_lines) );
+			l2 += l1 + nb_empty_lines;
+			while (nb_empty_lines) {
+				strcat(k->value, "\n");
+				nb_empty_lines--;
+			}
+			strcat(k->value, line);
+			l2 -= 2; //@ and \n
+			if (k->value[l2] == '@') {
+				k->value[l2] = 0;
+				k=NULL;
+				in_multiline = GF_FALSE;
+			}
+		} else {
+			k = NULL;
 		}
 	}
 	gf_free(line);
@@ -217,11 +287,11 @@
 }
 
 GF_EXPORT
-char * gf_cfg_get_filename(GF_Config *iniFile)
+const char * gf_cfg_get_filename(GF_Config *iniFile)
 {
 	if (!iniFile)
 		return NULL;
-	return iniFile->fileName ? gf_strdup(iniFile->fileName) : NULL;
+	return iniFile->fileName;
 }
 
 GF_EXPORT
@@ -242,15 +312,17 @@
 	i=0;
 	while ( (sec = (IniSection *) gf_list_enum(iniFile->sections, &i)) ) {
 		/*Temporary sections are not saved*/
-		if (!strnicmp(sec->section_name, "Temp", 4)) continue;
+		if (!strnicmp(sec->section_name, "temp", 4)) continue;
 
-		fprintf(file, "[%s]\n", sec->section_name);
+		gf_fprintf(file, "[%s]\n", sec->section_name);
 		j=0;
 		while ( (key = (IniKey *) gf_list_enum(sec->keys, &j)) ) {
-			fprintf(file, "%s=%s\n", key->name, key->value);
+			if (strchr(key->value, '\n')) {
+				gf_fprintf(file, "%s=@%s@\n", key->name, key->value);
+			} else {
+				gf_fprintf(file, "%s=%s\n", key->name, key->value);
+			}
 		}
-		/* end of section */
-		fprintf(file, "\n");
 	}
 	gf_fclose(file);
 	return GF_OK;
@@ -273,18 +345,17 @@
 	gf_free(iniFile);
 }
 
-GF_EXPORT
+#if 0 //unused
 void gf_cfg_remove(GF_Config *iniFile)
 {
 	if (!iniFile) return;
-	gf_delete_file(iniFile->fileName);
+	gf_file_delete(iniFile->fileName);
 	gf_cfg_clear(iniFile);
 	gf_free(iniFile);
 }
+#endif
 
-
-GF_EXPORT
-const char *gf_cfg_get_key(GF_Config *iniFile, const char *secName, const char *keyName)
+const char *gf_cfg_get_key_internal(GF_Config *iniFile, const char *secName, const char *keyName, Bool restricted_only)
 {
 	u32 i;
 	IniSection *sec;
@@ -299,12 +370,21 @@
 get_key:
 	i=0;
 	while ( (key = (IniKey *) gf_list_enum(sec->keys, &i)) ) {
-		if (!strcmp(key->name, keyName)) return key->value;
+		if (!strcmp(key->name, keyName)) {
+			if (!restricted_only || key->do_restrict)
+				return key->value;
+			return NULL;
+		}
 	}
 	return NULL;
 }
-
 GF_EXPORT
+const char *gf_cfg_get_key(GF_Config *iniFile, const char *secName, const char *keyName)
+{
+	return gf_cfg_get_key_internal(iniFile, secName, keyName, GF_FALSE);
+}
+
+#if 0 //unused
 const char *gf_cfg_get_ikey(GF_Config *iniFile, const char *secName, const char *keyName)
 {
 	u32 i;
@@ -324,10 +404,9 @@
 	}
 	return NULL;
 }
+#endif
 
-
-GF_EXPORT
-GF_Err gf_cfg_set_key(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue)
+GF_Err gf_cfg_set_key_internal(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue, Bool is_restrict)
 {
 	u32 i;
 	Bool has_changed = GF_TRUE;
@@ -346,7 +425,8 @@
 	sec = (IniSection *) gf_malloc(sizeof(IniSection));
 	sec->section_name = gf_strdup(secName);
 	sec->keys = gf_list_new();
-	if (has_changed) iniFile->hasChanged = GF_TRUE;
+	if (has_changed)
+		iniFile->hasChanged = GF_TRUE;
 	gf_list_add(iniFile->sections, sec);
 
 get_key:
@@ -359,7 +439,8 @@
 	key = (IniKey *) gf_malloc(sizeof(IniKey));
 	key->name = gf_strdup(keyName);
 	key->value = gf_strdup("");
-	if (has_changed) iniFile->hasChanged = GF_TRUE;
+	if (has_changed)
+		iniFile->hasChanged = GF_TRUE;
 	gf_list_add(sec->keys, key);
 
 set_value:
@@ -368,19 +449,29 @@
 		if (key->name) gf_free(key->name);
 		if (key->value) gf_free(key->value);
 		gf_free(key);
-		if (has_changed) iniFile->hasChanged = GF_TRUE;
+		if (has_changed)
+			iniFile->hasChanged = GF_TRUE;
 		return GF_OK;
 	}
+	key->do_restrict = is_restrict;
 	/* same value, don't update */
 	if (!strcmp(key->value, keyValue)) return GF_OK;
 
 	if (key->value) gf_free(key->value);
 	key->value = gf_strdup(keyValue);
-	if (has_changed) iniFile->hasChanged = GF_TRUE;
+	if (has_changed)
+		iniFile->hasChanged = GF_TRUE;
 	return GF_OK;
 }
 
 GF_EXPORT
+GF_Err gf_cfg_set_key(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue)
+{
+	return gf_cfg_set_key_internal(iniFile, secName, keyName, keyValue, GF_FALSE);
+
+}
+
+GF_EXPORT
 u32 gf_cfg_get_section_count(GF_Config *iniFile)
 {
 	return gf_list_count(iniFile->sections);
@@ -437,7 +528,7 @@
 	}
 }
 
-GF_EXPORT
+#if 0 //unused
 GF_Err gf_cfg_insert_key(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue, u32 index)
 {
 	u32 i;
@@ -464,8 +555,9 @@
 	iniFile->hasChanged = GF_TRUE;
 	return GF_OK;
 }
+#endif
 
-GF_EXPORT
+#if 0 //unused
 const char *gf_cfg_get_sub_key(GF_Config *iniFile, const char *secName, const char *keyName, u32 sub_index)
 {
 	u32 j;
@@ -492,8 +584,8 @@
 	gf_free(keyValue);
 	return NULL;
 }
+#endif
 
-GF_EXPORT
 GF_Err gf_cfg_set_filename(GF_Config *iniFile, const char * fileName)
 {
 	if (!fileName) return GF_OK;
@@ -501,3 +593,5 @@
 	iniFile->fileName = gf_strdup(fileName);
 	return iniFile->fileName ? GF_OK : GF_OUT_OF_MEM;
 }
+
+

gpac-1.0.0.tar.gz/src/utils/constants.c Added

@@ -0,0 +1,1285 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2017-2018
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / filters 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/filters.h>
+#include <gpac/constants.h>
+
+typedef struct
+{
+	//codec ID
+	u32 codecid;
+	//not defined (0) if codecid>255
+	u8 mpeg4_oti;
+	//stream type
+	u32 stream_type;
+	 //log name
+	const char *name;
+	//short name(s) for identifying codec - first value is used as default file ext
+	const char *sname;
+	//default name for isobmff/RFC6381
+	const char *rfc_4cc;
+	//mime type of raw format
+	const char *mime_type;
+	//alternate codecid name
+	u32 alt_codecid;
+} CodecIDReg;
+
+CodecIDReg CodecRegistry [] = {
+	{GF_CODECID_BIFS, GF_CODECID_BIFS, GF_STREAM_SCENE, "MPEG-4 BIFS v1 Scene Description", "bifs", "mp4s", "application/bifs"},
+	{GF_CODECID_BIFS_V2, GF_CODECID_BIFS_V2, GF_STREAM_SCENE, "MPEG-4 BIFS v2 Scene Description", "bifs2", "mp4s", "application/bifs"},
+	{GF_CODECID_BIFS_EXTENDED, GF_CODECID_BIFS_EXTENDED, GF_STREAM_SCENE, "MPEG-4 BIFS Extended Scene Description", "bifsX", "mp4s", "application/bifs"},
+	{GF_CODECID_OD_V1, GF_CODECID_OD_V1, GF_STREAM_OD, "MPEG-4 ObjectDescriptor v1", "od", "mp4s", "application/od"},
+	{GF_CODECID_OD_V2, GF_CODECID_OD_V2, GF_STREAM_OD, "MPEG-4 ObjectDescriptor v2", "od2", "mp4s", "application/od"},
+	{GF_CODECID_INTERACT, GF_CODECID_INTERACT, GF_STREAM_INTERACT, "MPEG-4 Interaction Stream", "interact", "mp4s", "application/x-mpeg4-interact"},
+	{GF_CODECID_AFX, GF_CODECID_AFX, GF_STREAM_SCENE, "MPEG-4 AFX Stream", "afx", "mp4s", "application/x-mpeg4-afx"},
+	{GF_CODECID_FONT, GF_CODECID_FONT, GF_STREAM_FONT, "MPEG-4 Font Stream", "font", "mp4s", "application/x-mpeg4-font"},
+	{GF_CODECID_SYNTHESIZED_TEXTURE, GF_CODECID_SYNTHESIZED_TEXTURE, GF_STREAM_VISUAL, "MPEG-4 Synthetized Texture", "syntex", "mp4s", "application/x-mpeg4-synth"},
+	{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_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"},
+	{GF_CODECID_MVC, GF_CODECID_MVC, GF_STREAM_VISUAL, "MPEG-4 AVC|H264 Multiview Video Coding", "mvc", "mvc1", "video/mvc"},
+	{GF_CODECID_HEVC, GF_CODECID_HEVC, GF_STREAM_VISUAL, "HEVC Video", "hvc|hevc|h265", "hvc1", "video/hevc"},
+	{GF_CODECID_LHVC, GF_CODECID_LHVC, GF_STREAM_VISUAL, "HEVC Video Layered Extensions", "lhvc|shvc|mhvc", "lhc1", "video/lhvc"},
+	{GF_CODECID_MPEG2_SIMPLE, GF_CODECID_MPEG2_SIMPLE, GF_STREAM_VISUAL, "MPEG-2 Visual Simple", "m2vs", "mp2v", "video/mp2v-es"},
+	{GF_CODECID_MPEG2_MAIN, GF_CODECID_MPEG2_MAIN, GF_STREAM_VISUAL, "MPEG-2 Visual Main", "m2v", "mp2v", "video/mp2v-es", GF_CODECID_MPEG2_SIMPLE},
+	{GF_CODECID_MPEG2_SNR, GF_CODECID_MPEG2_SNR, GF_STREAM_VISUAL, "MPEG-2 Visual SNR", "m2v|m2vsnr", "mp2v", "video/mp2v-es", GF_CODECID_MPEG2_SIMPLE},
+	{GF_CODECID_MPEG2_SPATIAL, GF_CODECID_MPEG2_SPATIAL, GF_STREAM_VISUAL, "MPEG-2 Visual Spatial", "m2v|m2vspat", "mp2v", "video/mp2v-es", GF_CODECID_MPEG2_SIMPLE},
+	{GF_CODECID_MPEG2_HIGH, GF_CODECID_MPEG2_HIGH, GF_STREAM_VISUAL, "MPEG-2 Visual High", "m2v|m2vh", "mp2v", "video/mp2v-es", GF_CODECID_MPEG2_SIMPLE},
+	{GF_CODECID_MPEG2_422, GF_CODECID_MPEG2_422, GF_STREAM_VISUAL, "MPEG-2 Visual 422", "m2v|m2v4", "mp2v", "video/mp2v-es", GF_CODECID_MPEG2_SIMPLE},
+	{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_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_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},
+
+	{GF_CODECID_EVRC, 0xA0, GF_STREAM_AUDIO, "EVRC Voice", "evc|evrc", "sevc", "audio/evrc"},
+	{GF_CODECID_SMV, 0xA1, GF_STREAM_AUDIO, "SMV Voice", "smv", "ssmv", "audio/smv"},
+	{GF_CODECID_QCELP, 0xE1, GF_STREAM_AUDIO, "QCELP Voice", "qcp|qcelp", "sqcp", "audio/qcelp"},
+	{GF_CODECID_AMR, 0, GF_STREAM_AUDIO, "AMR Audio", "amr", "samr", "audio/amr"},
+	{GF_CODECID_AMR_WB, 0, GF_STREAM_AUDIO, "AMR WideBand Audio", "amr|amrwb", "sawb", "audio/amr"},
+	{GF_CODECID_EVRC_PV, 0, GF_STREAM_AUDIO, "EVRC (PacketVideo MUX) Audio", "qcp|evrcpv", "sevc", "audio/evrc"},
+	{GF_CODECID_SMPTE_VC1, 0xA3, GF_STREAM_VISUAL, "SMPTE VC-1 Video", "vc1", "vc1 ", "video/vc1"},
+	{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_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"},
+	{GF_CODECID_DTS_HD_HR, 0xAA, GF_STREAM_AUDIO, "DTS-HD High Resolution Audio", "dtsh", NULL, "audio/dts"},
+	{GF_CODECID_DTS_HD_MASTER, 0xAB, GF_STREAM_AUDIO, "DTS-HD Master Audio", "dstm", NULL, "audio/dts"},
+	{GF_CODECID_DTS_LBR, 0xAC, GF_STREAM_AUDIO, "DTS Express low bit rate Audio", "dtsl", NULL, "audio/dts"},
+	{GF_CODECID_OPUS, 0xAD, GF_STREAM_AUDIO, "Opus Audio", "opus", NULL, "audio/opus"},
+	{GF_CODECID_DVB_EIT, 0, GF_STREAM_PRIVATE_SCENE, "DVB Event Information", "eti", NULL, "application/x-dvb-eit"},
+	{GF_CODECID_SVG, 0, GF_STREAM_PRIVATE_SCENE, "SVG over RTP", "svgr", NULL, "application/x-svg-rtp"},
+	{GF_CODECID_SVG_GZ, 0, GF_STREAM_PRIVATE_SCENE, "SVG+gz over RTP", "svgzr", NULL, "application/x-svgz-rtp"},
+	{GF_CODECID_DIMS, 0, GF_STREAM_PRIVATE_SCENE, "3GPP DIMS Scene", "dims", NULL, "application/3gpp-dims"},
+	{GF_CODECID_WEBVTT, 0, GF_STREAM_TEXT, "WebVTT Text", "vtt", "wvtt", "text/webtvv"},
+	{GF_CODECID_SIMPLE_TEXT, 0, GF_STREAM_TEXT, "Simple Text Stream", "txt", "stxt", "text/subtitle"},
+	{GF_CODECID_META_TEXT, 0, GF_STREAM_METADATA, "Metadata Text Stream", "mtxt", "mett", "application/text"},
+	{GF_CODECID_META_XML, 0, GF_STREAM_METADATA, "Metadata XML Stream", "mxml", "metx", "application/text+xml"},
+	{GF_CODECID_SUBS_TEXT, 0, GF_STREAM_TEXT, "Subtitle text Stream", "subs", "sbtt", "text/text"},
+	{GF_CODECID_SUBS_XML, 0, GF_STREAM_TEXT, "Subtitle XML Stream", "subx", "stpp", "text/text+xml"},
+	{GF_CODECID_TX3G, 0, GF_STREAM_TEXT, "Subtitle/text 3GPP/Apple Stream", "tx3g", "tx3g", "quicktime/text"},
+	{GF_CODECID_THEORA, 0xDF, GF_STREAM_VISUAL, "Theora Video", "theo|theora", NULL, "video/theora"},
+	{GF_CODECID_VORBIS, 0xDD, GF_STREAM_AUDIO, "Vorbis Audio", "vorb|vorbis", NULL, "audio/vorbis"},
+	{GF_CODECID_OPUS, 0xDE, GF_STREAM_AUDIO, "Opus Audio", "opus", NULL, "audio/opus"},
+	{GF_CODECID_FLAC, 0, GF_STREAM_AUDIO, "Flac Audio", "flac", "fLaC", "audio/flac"},
+	{GF_CODECID_SPEEX, 0, GF_STREAM_AUDIO, "Speex Audio", "spx|speex", NULL, "audio/speex"},
+	{GF_CODECID_SUBPIC, 0xE0, GF_STREAM_TEXT, "VobSub Subtitle", "vobsub", NULL, "text/x-vobsub"},
+	{GF_CODECID_SUBPIC, 0xE0, GF_STREAM_ND_SUBPIC, "VobSub Subtitle", "vobsub", NULL, "text/x-vobsub"},
+	{GF_CODECID_ADPCM, 0, GF_STREAM_AUDIO, "AD-PCM", "adpcm", NULL, "audio/pcm"},
+	{GF_CODECID_IBM_CVSD, 0, GF_STREAM_AUDIO, "IBM CSVD", "csvd", NULL, "audio/pcm"},
+	{GF_CODECID_ALAW, 0, GF_STREAM_AUDIO, "ALAW", "alaw", NULL, "audio/pcm"},
+	{GF_CODECID_MULAW, 0, GF_STREAM_AUDIO, "MULAW", "mulaw", NULL, "audio/pcm"},
+	{GF_CODECID_OKI_ADPCM, 0, GF_STREAM_AUDIO, "OKI ADPCM", "okiadpcm", NULL, "audio/pcm"},
+	{GF_CODECID_DVI_ADPCM, 0, GF_STREAM_AUDIO, "DVI ADPCM", "dviadpcm", NULL, "audio/pcm"},
+	{GF_CODECID_DIGISTD, 0, GF_STREAM_AUDIO, "DIGISTD", "digistd", NULL, "audio/pcm"},
+	{GF_CODECID_YAMAHA_ADPCM, 0, GF_STREAM_AUDIO, "YAMAHA ADPCM", "yamadpcm", NULL, "audio/pcm"},
+	{GF_CODECID_DSP_TRUESPEECH, 0, GF_STREAM_AUDIO, "DSP TrueSpeech", "truespeech", NULL, "audio/pcm"},
+	{GF_CODECID_GSM610, 0, GF_STREAM_AUDIO, "GSM 610", "g610", NULL, "audio/pcm"},
+	{GF_CODECID_IBM_MULAW, 0, GF_STREAM_AUDIO, "IBM MULAW", "imulaw", NULL, "audio/pcm"},
+	{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_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_APCH, 0, GF_STREAM_VISUAL, "ProRes Video 422 HQ", "prores|apch", "apch", "video/prores"},
+	{GF_CODECID_APCO, 0, GF_STREAM_VISUAL, "ProRes Video 422 Proxy", "prores|apco", "apco", "video/prores", GF_CODECID_APCH},
+	{GF_CODECID_APCN, 0, GF_STREAM_VISUAL, "ProRes Video 422 STD", "prores|apcn", "apcn", "video/prores", GF_CODECID_APCH},
+	{GF_CODECID_APCS, 0, GF_STREAM_VISUAL, "ProRes Video 422 LT", "prores|apcs", "apcs", "video/prores", GF_CODECID_APCH},
+	{GF_CODECID_AP4X, 0, GF_STREAM_VISUAL, "ProRes Video 4444 XQ", "prores|ap4x", "ap4x", "video/prores", GF_CODECID_APCH},
+	{GF_CODECID_AP4H, 0, GF_STREAM_VISUAL, "ProRes Video 4444", "prores|ap4h", "ap4h", "video/prores", GF_CODECID_APCH},
+	{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_EXPORT
+GF_CodecID gf_codec_parse(const char *cname)
+{
+	u32 len = (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;
+	}
+	return GF_CODECID_NONE;
+}
+
+
+#include <gpac/internal/isomedia_dev.h>
+
+GF_EXPORT
+GF_CodecID gf_codec_id_from_isobmf(u32 isobmftype)
+{
+	switch (isobmftype) {
+	case GF_ISOM_SUBTYPE_3GP_AMR:
+		return GF_CODECID_AMR;
+	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
+		return GF_CODECID_AMR_WB;
+	case GF_ISOM_SUBTYPE_3GP_H263:
+	case GF_ISOM_SUBTYPE_H263:
+		return GF_CODECID_H263;
+	case GF_ISOM_SUBTYPE_XDVB:
+		return GF_CODECID_MPEG2_MAIN;
+	case GF_ISOM_MEDIA_FLASH:
+		return GF_CODECID_FLASH;
+	case GF_ISOM_SUBTYPE_AC3:
+		return GF_CODECID_AC3;
+	case GF_ISOM_SUBTYPE_EC3:
+		return GF_CODECID_EAC3;
+	case GF_ISOM_SUBTYPE_FLAC:
+		return GF_CODECID_FLAC;
+	case GF_ISOM_SUBTYPE_MP3:
+		return GF_CODECID_MPEG_AUDIO;
+	case GF_ISOM_SUBTYPE_JPEG:
+		return GF_CODECID_JPEG;
+	case GF_ISOM_SUBTYPE_PNG:
+		return GF_CODECID_PNG;
+	case GF_ISOM_SUBTYPE_JP2K:
+		return GF_CODECID_J2K;
+	case GF_ISOM_SUBTYPE_STXT:
+		return GF_CODECID_SIMPLE_TEXT;
+	case GF_ISOM_SUBTYPE_METT:
+		return GF_CODECID_META_TEXT;
+	case GF_ISOM_SUBTYPE_METX:
+		return GF_CODECID_META_XML;
+	case GF_ISOM_SUBTYPE_SBTT:
+		return GF_CODECID_SUBS_TEXT;
+	case GF_ISOM_SUBTYPE_STPP:
+		return GF_CODECID_SUBS_XML;
+	case GF_ISOM_SUBTYPE_WVTT:
+		return GF_CODECID_WEBVTT;
+	case GF_ISOM_SUBTYPE_3GP_DIMS:
+		return GF_CODECID_DIMS;
+	case GF_ISOM_SUBTYPE_HVT1:
+		return GF_CODECID_HEVC_TILES;
+	case GF_ISOM_SUBTYPE_TEXT:
+	case GF_ISOM_SUBTYPE_TX3G:
+		return GF_CODECID_TX3G;
+
+	case GF_QT_SUBTYPE_APCH:
+		return GF_CODECID_APCH;
+	case GF_QT_SUBTYPE_APCO:
+		return GF_CODECID_APCO;
+	case GF_QT_SUBTYPE_APCN:
+		return GF_CODECID_APCN;
+	case GF_QT_SUBTYPE_APCS:
+		return GF_CODECID_APCS;
+	case GF_QT_SUBTYPE_AP4X:
+		return GF_CODECID_AP4X;
+	case GF_QT_SUBTYPE_AP4H:
+		return GF_CODECID_AP4H;
+	case GF_QT_SUBTYPE_TWOS:
+		return GF_CODECID_RAW;
+	case GF_QT_SUBTYPE_SOWT:
+		return GF_CODECID_RAW;
+	case GF_QT_SUBTYPE_FL32:
+		return GF_CODECID_RAW;
+	case GF_QT_SUBTYPE_FL64:
+		return GF_CODECID_RAW;
+	case GF_QT_SUBTYPE_IN24:
+		return GF_CODECID_RAW;
+	case GF_QT_SUBTYPE_IN32:
+		return GF_CODECID_RAW;
+	default:
+		break;
+	}
+	return 0;
+}
+
+
+static CodecIDReg *gf_codecid_reg_find(u32 codecid)
+{
+	u32 i, count = sizeof(CodecRegistry) / sizeof(CodecIDReg);
+	for (i=0; i<count; i++) {
+		if (CodecRegistry[i].codecid==codecid) return &CodecRegistry[i];
+	}
+	return NULL;
+}
+
+static CodecIDReg *gf_codecid_reg_find_oti(u32 stream_type, u32 oti)
+{
+	u32 i, count = sizeof(CodecRegistry) / sizeof(CodecIDReg);
+	for (i=0; i<count; i++) {
+		if (CodecRegistry[i].stream_type != stream_type) continue;
+		if (CodecRegistry[i].mpeg4_oti != oti) continue;
+		return &CodecRegistry[i];
+	}
+	return NULL;
+}
+
+GF_EXPORT
+const char *gf_codecid_name(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	if (!r) return "Codec Not Supported";
+	return r->name;
+}
+
+GF_EXPORT
+const char *gf_codecid_file_ext(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	u32 global_ext_count = gf_opts_get_key_count("file_extensions");
+	if (r && r->mime_type && global_ext_count) {
+		const char *name = gf_opts_get_key("file_extensions", r->mime_type);
+		if (name) return name;
+	}
+	if (r && r->sname) return r->sname;
+	if (r && r->rfc_4cc) return r->rfc_4cc;
+	return "raw";
+}
+
+GF_EXPORT
+const char *gf_codecid_mime(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	if (r && r->mime_type) return r->mime_type;
+	return "application/octet-string";
+}
+
+GF_EXPORT
+GF_CodecID gf_codecid_enum(u32 idx, const char **short_name, const char **long_name)
+{
+	u32 count = sizeof(CodecRegistry) / sizeof(CodecIDReg);
+	if (idx >= count) return GF_CODECID_NONE;
+	if (short_name) *short_name = CodecRegistry[idx].sname;
+	if (long_name) *long_name = CodecRegistry[idx].name;
+	return CodecRegistry[idx].codecid;
+}
+
+
+GF_EXPORT
+u32 gf_codecid_type(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	if (!r) return GF_STREAM_UNKNOWN;
+	return r->stream_type;
+}
+
+GF_EXPORT
+GF_CodecID gf_codecid_alt(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	if (!r) return GF_CODECID_NONE;
+	return r->alt_codecid;
+}
+
+GF_EXPORT
+GF_CodecID gf_codecid_from_oti(u32 stream_type, u32 oti)
+{
+	CodecIDReg *r;
+	if (!oti) {
+		if ((stream_type==GF_STREAM_OD) || (stream_type==GF_STREAM_SCENE))
+			oti = 1;
+	}
+	r = gf_codecid_reg_find_oti(stream_type, oti);
+	if (!r) return GF_CODECID_NONE;
+	return r->codecid;
+}
+
+GF_EXPORT
+u8 gf_codecid_oti(GF_CodecID codecid)
+{
+	CodecIDReg *r = gf_codecid_reg_find(codecid);
+	if (!r) return 0;
+	return r->mpeg4_oti;
+}
+
+GF_EXPORT
+u32 gf_codecid_4cc_type(GF_CodecID codecid)
+{
+	u32 i, count = sizeof(CodecRegistry) / sizeof(CodecIDReg);
+	for (i=0; i<count; i++) {
+		if (CodecRegistry[i].codecid==codecid) {
+			const char *n = CodecRegistry[i].rfc_4cc;
+			if (!n) return 0;
+			return GF_4CC(n[0], n[1], n[2], n[3]);
+		}
+	}
+	return 0;
+}
+
+typedef struct
+{
+	u32 st;
+	const char *name;
+	const char *desc;
+	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_EXPORT
+const char *gf_stream_type_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].name;
+	}
+	return "Unknown";
+}
+
+GF_EXPORT
+u32 gf_stream_type_by_name(const char *val)
+{
+	u32 i, nb_st = sizeof(GF_StreamTypes) / sizeof(GF_StreamTypeDesc);
+	for (i=0; i<nb_st; i++) {
+		if (!stricmp(GF_StreamTypes[i].name, val))
+			return GF_StreamTypes[i].st;
+		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));
+	return GF_STREAM_UNKNOWN;
+}
+
+static char szAllStreamTypes[500] = {0};
+
+GF_EXPORT
+const char *gf_stream_type_all_names()
+{
+	if (!szAllStreamTypes[0]) {
+		u32 i, nb_st = sizeof(GF_StreamTypes) / sizeof(GF_StreamTypeDesc);
+		u32 tot_len=0;
+		strcpy(szAllStreamTypes, "");
+		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"));
+				break;
+			}
+			if (i) {
+				strcat((char *)szAllStreamTypes, ",");
+				tot_len += 1;
+			}
+			strcat((char *)szAllStreamTypes, GF_StreamTypes[i].name);
+			tot_len += len;
+		}
+	}
+	return szAllStreamTypes;
+}
+
+GF_EXPORT
+u32 gf_stream_types_enum(u32 *idx, const char **name, const char **desc)
+{
+	u32 stype;
+	u32 nb_sfmt = sizeof(GF_StreamTypes) / sizeof(GF_StreamTypeDesc);
+	if (*idx >= nb_sfmt) return GF_STREAM_UNKNOWN;
+	if (!GF_StreamTypes[*idx].st) return GF_STREAM_UNKNOWN;
+
+	*name = GF_StreamTypes[*idx].name;
+	*desc = GF_StreamTypes[*idx].desc;
+	stype = GF_StreamTypes[*idx].st;
+	(*idx)++;
+	return stype;
+}
+
+GF_EXPORT
+const char *gf_stream_type_afx_name(u8 afx_code)
+{
+	switch (afx_code) {
+	case GPAC_AFX_3DMC:
+		return "AFX 3D Mesh Compression";
+	case GPAC_AFX_WAVELET_SUBDIVISION:
+		return "AFX Wavelet Subdivision Surface";
+	case GPAC_AFX_MESHGRID:
+		return "AFX Mesh Grid";
+	case GPAC_AFX_COORDINATE_INTERPOLATOR:
+		return "AFX Coordinate Interpolator";
+	case GPAC_AFX_ORIENTATION_INTERPOLATOR:
+		return "AFX Orientation Interpolator";
+	case GPAC_AFX_POSITION_INTERPOLATOR:
+		return "AFX Position Interpolator";
+	case GPAC_AFX_OCTREE_IMAGE:
+		return "AFX Octree Image";
+	case GPAC_AFX_BBA:
+		return "AFX BBA";
+	case GPAC_AFX_POINT_TEXTURE:
+		return "AFX Point Texture";
+	case GPAC_AFX_3DMC_EXT:
+		return "AFX 3D Mesh Compression Extension";
+	case GPAC_AFX_FOOTPRINT:
+		return "AFX FootPrint Representation";
+	case GPAC_AFX_ANIMATED_MESH:
+		return "AFX Animated Mesh Compression";
+	case GPAC_AFX_SCALABLE_COMPLEXITY:
+		return "AFX Scalable Complexity Representation";
+	default:
+		break;
+	}
+	return "AFX Unknown";
+}
+
+
+typedef struct
+{
+	GF_AudioFormat sfmt;
+	const char *name; //as used in gpac
+	const char *desc;
+	const char *sname; //short name, as used in gpac
+} GF_AudioFmt;
+
+static const GF_AudioFmt GF_AudioFormats[] =
+{
+	{GF_AUDIO_FMT_U8, "u8", "8 bit PCM", "pc8"},
+	{GF_AUDIO_FMT_S16, "s16", "16 bit PCM Little Endian", "pcm"},
+	{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"},
+	{GF_AUDIO_FMT_DBL, "dbl", "64-bit floating point PCM"},
+	{GF_AUDIO_FMT_U8P, "u8p", "8 bit PCM planar", "pc8p"},
+	{GF_AUDIO_FMT_S16P, "s16p", "16 bit PCM Little Endian planar", "pcmp"},
+	{GF_AUDIO_FMT_S24P, "s24p", "24 bit PCM planar"},
+	{GF_AUDIO_FMT_S32P, "s32p", "32 bit PCM Little Endian planar"},
+	{GF_AUDIO_FMT_FLTP, "fltp", "32-bit floating point PCM planar"},
+	{GF_AUDIO_FMT_DBLP, "dblp", "64-bit floating point PCM planar"},
+	{0}
+};
+
+
+GF_EXPORT
+GF_AudioFormat gf_audio_fmt_parse(const char *af_name)
+{
+	u32 i=0;
+	if (!af_name || !strcmp(af_name, "none")) return 0;
+	while (!i || GF_AudioFormats[i].sfmt) {
+		if (!strcmp(GF_AudioFormats[i].name, af_name))
+			return GF_AudioFormats[i].sfmt;
+		if (GF_AudioFormats[i].sname && !strcmp(GF_AudioFormats[i].sname, af_name))
+			return GF_AudioFormats[i].sfmt;
+		i++;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported audio format %s\n", af_name));
+	return 0;
+}
+
+GF_EXPORT
+const char *gf_audio_fmt_name(GF_AudioFormat sfmt)
+{
+	u32 i=0;
+	while (!i || GF_AudioFormats[i].sfmt) {
+		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 ));
+	return "unknown";
+}
+GF_EXPORT
+const char *gf_audio_fmt_sname(GF_AudioFormat sfmt)
+{
+	u32 i=0;
+	while (!i || GF_AudioFormats[i].sfmt) {
+		if (GF_AudioFormats[i].sfmt==sfmt) {
+			if (GF_AudioFormats[i].sname)
+				return GF_AudioFormats[i].sname;
+			return GF_AudioFormats[i].name;
+		}
+		i++;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported audio format %d\n", sfmt ));
+	return "unknown";
+}
+
+static char szAllAudioFormats[500] = {0};
+
+GF_EXPORT
+const char *gf_audio_fmt_all_names()
+{
+	if (!szAllAudioFormats[0]) {
+		u32 i=0;
+		u32 tot_len=4;
+		strcpy(szAllAudioFormats, "none");
+		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"));
+				break;
+			}
+			strcat((char *)szAllAudioFormats, ",");
+			tot_len += 1;
+			strcat((char *)szAllAudioFormats, GF_AudioFormats[i].name);
+			tot_len += len;
+			i++;
+		}
+	}
+	return szAllAudioFormats;
+}
+
+static char szAllShortAudioFormats[500] = {0};
+
+GF_EXPORT
+const char *gf_audio_fmt_all_shortnames()
+{
+	if (!szAllShortAudioFormats[0]) {
+		u32 i=0;
+		u32 tot_len=0;
+		memset(szAllShortAudioFormats, 0, sizeof(char)*500);
+		while (!i || GF_AudioFormats[i].sfmt) {
+			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"));
+				break;
+			}
+			if (i) {
+				strcat((char *)szAllShortAudioFormats, "|");
+				tot_len += 1;
+				strcat((char *)szAllShortAudioFormats, n);
+			} else {
+				strcpy((char *)szAllShortAudioFormats, n);
+			}
+			tot_len += len;
+			i++;
+		}
+		szAllShortAudioFormats[tot_len] = 0;
+	}
+	return szAllShortAudioFormats;
+}
+
+GF_EXPORT
+GF_AudioFormat gf_audio_fmt_enum(u32 *idx, const char **name, const char **fileext, const char **desc)
+{
+	GF_AudioFormat afmt;
+	u32 nb_afmt = sizeof(GF_AudioFormats) / sizeof(GF_AudioFmt);
+	if (*idx >= nb_afmt) return 0;
+	if (!GF_AudioFormats[*idx].sfmt) return 0;
+
+	*name = GF_AudioFormats[*idx].name;
+	*desc = GF_AudioFormats[*idx].desc;
+
+	*fileext = GF_AudioFormats[*idx].sname;
+	if (! *fileext) *fileext = *name;
+	afmt = GF_AudioFormats[*idx].sfmt;
+	(*idx)++;
+	return afmt;
+}
+
+GF_EXPORT
+u32 gf_audio_fmt_bit_depth(GF_AudioFormat audio_fmt)
+{
+	switch (audio_fmt) {
+	case GF_AUDIO_FMT_U8P:
+	case GF_AUDIO_FMT_U8: return 8;
+
+	case GF_AUDIO_FMT_S16P:
+	case GF_AUDIO_FMT_S16: return 16;
+
+	case GF_AUDIO_FMT_S32P:
+	case GF_AUDIO_FMT_S32: return 32;
+
+	case GF_AUDIO_FMT_FLTP:
+	case GF_AUDIO_FMT_FLT: return 32;
+
+	case GF_AUDIO_FMT_DBLP:
+	case GF_AUDIO_FMT_DBL: return 64;
+
+	case GF_AUDIO_FMT_S24P:
+	case GF_AUDIO_FMT_S24:  return 24;
+
+	default:
+		break;
+	}
+	return 0;
+}
+
+GF_EXPORT
+Bool gf_audio_fmt_is_planar(GF_AudioFormat audio_fmt)
+{
+	switch (audio_fmt) {
+	case GF_AUDIO_FMT_U8P:
+	case GF_AUDIO_FMT_S16P:
+	case GF_AUDIO_FMT_S32P:
+	case GF_AUDIO_FMT_FLTP:
+	case GF_AUDIO_FMT_DBLP:
+	case GF_AUDIO_FMT_S24P:
+		return GF_TRUE;
+	default:
+		break;
+	}
+	return GF_FALSE;
+}
+
+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;
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_audio_fmt_get_cicp_layout(u32 nb_chan, u32 nb_surr, u32 nb_lfe)
+{
+	if ( !nb_chan && !nb_surr && !nb_lfe) return 0;
+	else if ((nb_chan==1) && !nb_surr && !nb_lfe) return 1;
+	else if ((nb_chan==2) && !nb_surr && !nb_lfe) return 2;
+	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==5) && (nb_surr==2) && (nb_lfe==1)) return 7;
+	else if ((nb_chan==2) && (nb_surr==1) && !nb_lfe) return 9;
+	else if ((nb_chan==2) && (nb_surr==2) && !nb_lfe) return 10;
+	else if ((nb_chan==3) && (nb_surr==3) && (nb_lfe==1)) return 11;
+	else if ((nb_chan==3) && (nb_surr==4) && (nb_lfe==1)) return 12;
+	else if ((nb_chan==11) && (nb_surr==11) && (nb_lfe==2)) return 13;
+	//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_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));
+	return 0;
+}
+
+typedef struct
+{
+	u32 cicp;
+	const char *name;
+	u64 channel_mask;
+} GF_CICPAudioLayout;
+
+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 },
+	{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 },
+	{6, "3/2.1", 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 | GF_AUDIO_CH_LFE },
+	{7, "5/2.1", 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 | GF_AUDIO_CH_LFE },
+	{8, "1+1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT },
+	{9, "2/1.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_REAR_CENTER },
+	{10, "2/2.0", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT },
+	{11, "3/3.1", GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_REAR_CENTER | GF_AUDIO_CH_LFE },
+	{12, "3/4.1", GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_REAR_SURROUND_LEFT | GF_AUDIO_CH_REAR_SURROUND_RIGHT | GF_AUDIO_CH_LFE },
+	{13, "11/11.2", GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER_LEFT | GF_AUDIO_CH_FRONT_CENTER_RIGHT | GF_AUDIO_CH_SIDE_SURROUND_LEFT | GF_AUDIO_CH_SIDE_SURROUND_RIGHT | GF_AUDIO_CH_REAR_SURROUND_LEFT | GF_AUDIO_CH_REAR_SURROUND_RIGHT | GF_AUDIO_CH_REAR_CENTER | GF_AUDIO_CH_LFE | GF_AUDIO_CH_LFE2 | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_FRONT_TOP_CENTER | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT | GF_AUDIO_CH_REAR_CENTER_TOP | GF_AUDIO_CH_SIDE_SURROUND_TOP_LEFT | GF_AUDIO_CH_SIDE_SURROUND_TOP_RIGHT | GF_AUDIO_CH_CENTER_SURROUND_TOP | GF_AUDIO_CH_FRONT_BOTTOM_CENTER | GF_AUDIO_CH_FRONT_BOTTOM_LEFT | GF_AUDIO_CH_FRONT_BOTTOM_RIGHT },
+	{14, "5/2.1", 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 | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT },
+	{15, "5/5.2", 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 | GF_AUDIO_CH_SIDE_SURROUND_LEFT | GF_AUDIO_CH_SIDE_SURROUND_RIGHT | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_CENTER_SURROUND_TOP | GF_AUDIO_CH_LFE | GF_AUDIO_CH_LFE2 },
+	{16, "5/4.1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT },
+	{17, "6/5.1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_FRONT_TOP_CENTER | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT | GF_AUDIO_CH_CENTER_SURROUND_TOP },
+	{18, "6/7.1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SURROUND_LEFT | GF_AUDIO_CH_SURROUND_RIGHT | GF_AUDIO_CH_BACK_SURROUND_LEFT | GF_AUDIO_CH_BACK_SURROUND_RIGHT | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_FRONT_TOP_CENTER | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT | GF_AUDIO_CH_CENTER_SURROUND_TOP },
+	{19, "5/6.1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SIDE_SURROUND_LEFT | GF_AUDIO_CH_SIDE_SURROUND_RIGHT | GF_AUDIO_CH_REAR_SURROUND_LEFT | GF_AUDIO_CH_REAR_SURROUND_RIGHT | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT },
+	{20, "7/6.1", GF_AUDIO_CH_FRONT_LEFT | GF_AUDIO_CH_FRONT_RIGHT | GF_AUDIO_CH_FRONT_CENTER | GF_AUDIO_CH_SCREEN_EDGE_LEFT | GF_AUDIO_CH_SCREEN_EDGE_RIGHT | GF_AUDIO_CH_SIDE_SURROUND_LEFT | GF_AUDIO_CH_SIDE_SURROUND_RIGHT | GF_AUDIO_CH_REAR_SURROUND_LEFT | GF_AUDIO_CH_REAR_SURROUND_RIGHT | GF_AUDIO_CH_LFE | GF_AUDIO_CH_FRONT_TOP_LEFT | GF_AUDIO_CH_FRONT_TOP_RIGHT | GF_AUDIO_CH_SURROUND_TOP_LEFT | GF_AUDIO_CH_SURROUND_TOP_RIGHT }
+};
+
+GF_EXPORT
+u64 gf_audio_fmt_get_layout_from_cicp(u32 cicp_layout)
+{
+	u32 i, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	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));
+	return 0;
+}
+
+GF_EXPORT
+const char *gf_audio_fmt_get_layout_name_from_cicp(u32 cicp_layout)
+{
+	u32 i, nb_cicp = sizeof(GF_CICPLayouts) / sizeof(GF_CICPAudioLayout);
+	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));
+	return "unknwon";
+}
+
+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));
+	return 255;
+}
+
+typedef struct
+{
+	GF_PixelFormat pixfmt;
+	const char *name; //as used in gpac
+	const char *desc; //as used in gpac
+	const char *sname; //short name, as used in gpac
+} GF_PixFmt;
+
+static const GF_PixFmt GF_PixelFormats[] =
+{
+	{GF_PIXEL_YUV, "yuv420", "Planar YUV 420 8 bit", "yuv"},
+	{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_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_GREYSCALE, "grey", "Greyscale 8 bit"},
+	{GF_PIXEL_ALPHAGREY, "algr", "Alpha+Grey 8 bit"},
+	{GF_PIXEL_GREYALPHA, "gral", "Grey+Alpha 8 bit"},
+	{GF_PIXEL_RGB_444, "rgb4", "RGB 444, 12 bits (16 stored) / pixel"},
+	{GF_PIXEL_RGB_555, "rgb5", "RGB 555, 15 bits (16 stored) / pixel"},
+	{GF_PIXEL_RGB_565, "rgb6", "RGB 555, 16 bits / pixel"},
+	{GF_PIXEL_RGBA, "rgba", "RGBA 32 bits (8 bits / component)"},
+	{GF_PIXEL_ARGB, "argb", "ARGB 32 bits (8 bits / component)"},
+	{GF_PIXEL_BGRA, "bgra", "BGRA 32 bits (8 bits / component)"},
+	{GF_PIXEL_ABGR, "abgr", "ABGR 32 bits (8 bits / component)"},
+	{GF_PIXEL_RGB, "rgb", "RGB 24 bits (8 bits / component)"},
+	{GF_PIXEL_BGR, "bgr", "BGR 24 bits (8 bits / component)"},
+	{GF_PIXEL_XRGB, "xrgb", "xRGB 32 bits (8 bits / component)"},
+	{GF_PIXEL_RGBX, "rgbx", "RGBx 32 bits (8 bits / component)"},
+	{GF_PIXEL_XBGR, "xbgr", "xBGR 32 bits (8 bits / component)"},
+	{GF_PIXEL_BGRX, "bgrx", "BGRx 32 bits (8 bits / component)"},
+	{GF_PIXEL_RGBD, "rgbd", "RGB+depth 32 bits (8 bits / component)"},
+	{GF_PIXEL_RGBDS, "rgbds", "RGB+depth+bit shape (8 bits / RGB component, 7 bit depth (low bits) + 1 bit shape)"},
+	{GF_PIXEL_RGBS, "rgbs", "RGB 24 bits stereo (side-by-side) - to be removed\n"},
+	{GF_PIXEL_RGBAS, "rgbas", "RGBA 32 bits stereo (side-by-side) - to be removed\n"},
+	{GF_PIXEL_GL_EXTERNAL, "extgl", "External OpenGL texture of unknown format, to be used with samplerExternalOES\n"},
+	{0}
+};
+
+GF_EXPORT
+GF_PixelFormat gf_pixel_fmt_parse(const char *pf_name)
+{
+	u32 i=0;
+	if (!pf_name || !strcmp(pf_name, "none")) return 0;
+	while (GF_PixelFormats[i].pixfmt) {
+		if (!strcmp(GF_PixelFormats[i].name, pf_name))
+			return GF_PixelFormats[i].pixfmt;
+		if (GF_PixelFormats[i].sname && !strcmp(GF_PixelFormats[i].sname, pf_name))
+			return GF_PixelFormats[i].pixfmt;
+		i++;
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("Unsupported pixel format %s\n", pf_name));
+	return 0;
+}
+GF_EXPORT
+const char *gf_pixel_fmt_name(GF_PixelFormat pfmt)
+{
+	u32 i=0;
+	while (GF_PixelFormats[i].pixfmt) {
+		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) ));
+	return "unknown";
+}
+GF_EXPORT
+const char *gf_pixel_fmt_sname(GF_PixelFormat pfmt)
+{
+	u32 i=0;
+	while (GF_PixelFormats[i].pixfmt) {
+		if (GF_PixelFormats[i].pixfmt==pfmt) {
+			if (GF_PixelFormats[i].sname)
+				return GF_PixelFormats[i].sname;
+			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) ));
+	return "unknown";
+
+}
+
+GF_EXPORT
+u32 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;
+	if (! GF_PixelFormats[*idx].pixfmt) return 0;
+
+	*name = GF_PixelFormats[*idx].name;
+	*fileext = GF_PixelFormats[*idx].sname;
+	if (! *fileext) *fileext = *name;
+	*description = GF_PixelFormats[*idx].desc;
+	nb_pfmt = GF_PixelFormats[*idx].pixfmt;
+	(*idx)++;
+	return nb_pfmt;
+}
+
+
+static char szAllPixelFormats[5000] = {0};
+
+GF_EXPORT
+const char *gf_pixel_fmt_all_names()
+{
+	if (!szAllPixelFormats[0]) {
+		u32 i=0;
+		u32 tot_len=4;
+		strcpy(szAllPixelFormats, "none");
+		while (GF_PixelFormats[i].pixfmt) {
+			u32 len;
+
+			//we don't expose this one
+			if (GF_PixelFormats[i].pixfmt==GF_PIXEL_GL_EXTERNAL) {
+				i++;
+				continue;
+			}
+
+			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"));
+				break;
+			}
+			strcat((char *)szAllPixelFormats, ",");
+			tot_len += 1;
+			strcat((char *)szAllPixelFormats, GF_PixelFormats[i].name);
+			tot_len += len;
+			i++;
+		}
+	}
+	return szAllPixelFormats;
+}
+
+static char szAllShortPixelFormats[5000] = {0};
+
+GF_EXPORT
+const char *gf_pixel_fmt_all_shortnames()
+{
+	if (!szAllShortPixelFormats[0]) {
+		u32 i=0;
+		u32 tot_len=0;
+		while (GF_PixelFormats[i].pixfmt) {
+			u32 len;
+			const char *n;
+			//we don't expose this one
+			if (GF_PixelFormats[i].pixfmt==GF_PIXEL_GL_EXTERNAL) {
+				i++;
+				continue;
+			}
+			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"));
+				break;
+			}
+			if (i) {
+				strcat((char *)szAllShortPixelFormats, "|");
+				tot_len += 1;
+				strcat((char *)szAllShortPixelFormats, n);
+			} else {
+				strcpy((char *)szAllShortPixelFormats, n);
+			}
+			tot_len += len;
+			i++;
+		}
+	}
+	return szAllShortPixelFormats;
+}
+
+GF_EXPORT
+Bool gf_pixel_get_size_info(GF_PixelFormat pixfmt, u32 width, u32 height, u32 *out_size, u32 *out_stride, u32 *out_stride_uv, u32 *out_planes, u32 *out_plane_uv_height)
+{
+	u32 stride=0, stride_uv=0, size=0, planes=0, uv_height=0;
+	Bool no_in_stride = (!out_stride || (*out_stride==0)) ? GF_TRUE : GF_FALSE;
+	Bool no_in_stride_uv = (!out_stride_uv || (*out_stride_uv==0)) ? GF_TRUE : GF_FALSE;
+
+	switch (pixfmt) {
+	case GF_PIXEL_GREYSCALE:
+		stride = no_in_stride ? width : *out_stride;
+		size = stride * height;
+		planes=1;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		stride = no_in_stride ? 2*width : *out_stride;
+		size = stride * height;
+		planes=1;
+		break;
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+		stride = no_in_stride ? 2*width : *out_stride;
+		size = stride * height;
+		planes=1;
+		break;
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+	case GF_PIXEL_RGBD:
+	case GF_PIXEL_RGBDS:
+	case GF_PIXEL_RGBAS:
+		stride = no_in_stride ? 4*width : *out_stride;
+		size = stride * height;
+		planes=1;
+		break;
+	case GF_PIXEL_RGB_DEPTH:
+		stride = no_in_stride ? 3*width : *out_stride;
+		stride_uv = no_in_stride_uv ? width : *out_stride_uv;
+		size = 4 * width * height;
+		planes=1;
+		break;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_RGBS:
+		stride = no_in_stride ? 3*width : *out_stride;
+		size = stride * height;
+		planes=1;
+		break;
+	case GF_PIXEL_YUV:
+		stride = no_in_stride ? width : *out_stride;
+		uv_height = height / 2;
+		if (height % 2) uv_height++;
+		stride_uv = no_in_stride_uv ? stride/2 : *out_stride_uv;
+		if (no_in_stride_uv && (stride%2) )
+		 	stride_uv+=1;
+		planes=3;
+		size = stride * height + stride_uv * uv_height * 2;
+		break;
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVD:
+		stride = no_in_stride ? width : *out_stride;
+		uv_height = height / 2;
+		if (height % 2) uv_height++;
+		stride_uv = no_in_stride_uv ? stride/2 : *out_stride_uv;
+		if (no_in_stride_uv && (stride%2) )
+		 	stride_uv+=1;
+		planes=4;
+		size = 2*stride * height + stride_uv * uv_height * 2;
+		break;
+	case GF_PIXEL_YUV_10:
+		stride = no_in_stride ? 2*width : *out_stride;
+		uv_height = height / 2;
+		if (height % 2) uv_height++;
+		stride_uv = no_in_stride_uv ? stride/2 : *out_stride_uv;
+		if (no_in_stride_uv && (stride%2) )
+		 	stride_uv+=1;
+		planes=3;
+		size = stride * height + stride_uv * uv_height * 2;
+		break;
+	case GF_PIXEL_YUV422:
+		stride = no_in_stride ? width : *out_stride;
+		uv_height = height;
+		stride_uv = no_in_stride_uv ? stride/2 : *out_stride_uv;
+		if (no_in_stride_uv && (stride%2) )
+		 	stride_uv+=1;
+		planes=3;
+		size = stride * height + stride_uv * height * 2;
+		break;
+	case GF_PIXEL_YUV422_10:
+		stride = no_in_stride ? 2*width : *out_stride;
+		uv_height = height;
+		stride_uv = no_in_stride_uv ? stride/2 : *out_stride_uv;
+		if (no_in_stride_uv && (stride%2) )
+		 	stride_uv+=1;
+		planes=3;
+		size = stride * height + stride_uv * height * 2;
+		break;
+	case GF_PIXEL_YUV444:
+		stride = no_in_stride ? width : *out_stride;
+		uv_height = height;
+		stride_uv = no_in_stride_uv ? stride : *out_stride_uv;
+		planes=3;
+		size = stride * height * 3;
+		break;
+	case GF_PIXEL_YUVA444:
+		stride = no_in_stride ? width : *out_stride;
+		uv_height = height;
+		stride_uv = no_in_stride_uv ? stride : *out_stride_uv;
+		planes=4;
+		size = stride * height * 4;
+		break;
+	case GF_PIXEL_YUV444_10:
+		stride = no_in_stride ? 2*width : *out_stride;
+		uv_height = height;
+		stride_uv = no_in_stride_uv ? stride : *out_stride_uv;
+		planes=3;
+		size = stride * height * 3;
+		break;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		stride = no_in_stride ? width : *out_stride;
+		size = 3 * stride * height / 2;
+		uv_height = height/2;
+		stride_uv = no_in_stride_uv ? stride : *out_stride_uv;
+		planes=2;
+		break;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		stride = no_in_stride ? 2*width : *out_stride;
+		uv_height = height/2;
+		if (height % 2) uv_height++;
+		stride_uv = no_in_stride_uv ? stride : *out_stride_uv;
+		planes=2;
+		size = 3 * stride * height / 2;
+		break;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+		stride = no_in_stride ? 2*width : *out_stride;
+		planes=1;
+		size = height * stride;
+		break;
+	case GF_PIXEL_GL_EXTERNAL:
+		planes = 1;
+		size = 0;
+		stride = 0;
+		stride_uv = 0;
+		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) ));
+		return GF_FALSE;
+	}
+	if (out_size) *out_size = size;
+	if (out_stride) *out_stride = stride;
+	if (out_stride_uv) *out_stride_uv = stride_uv;
+	if (out_planes) *out_planes = planes;
+	if (out_plane_uv_height) *out_plane_uv_height = uv_height;
+	return GF_TRUE;
+}
+
+GF_EXPORT
+u32 gf_pixel_get_bytes_per_pixel(GF_PixelFormat pixfmt)
+{
+	switch (pixfmt) {
+	case GF_PIXEL_GREYSCALE:
+		return 1;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+		return 2;
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_RGBD:
+	case GF_PIXEL_RGBDS:
+	case GF_PIXEL_RGBAS:
+	case GF_PIXEL_RGB_DEPTH:
+		return 4;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_RGBS:
+		return 3;
+	case GF_PIXEL_YUV:
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVA444:
+	case GF_PIXEL_YUVD:
+		return 1;
+	case GF_PIXEL_YUV_10:
+		return 2;
+	case GF_PIXEL_YUV422:
+		return 1;
+	case GF_PIXEL_YUV422_10:
+		return 2;
+	case GF_PIXEL_YUV444:
+		return 1;
+	case GF_PIXEL_YUV444_10:
+		return 2;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		return 1;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		return 2;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+		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) ));
+		break;
+	}
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_pixel_get_nb_comp(GF_PixelFormat pixfmt)
+{
+	switch (pixfmt) {
+	case GF_PIXEL_GREYSCALE:
+		return 1;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		return 2;
+	case GF_PIXEL_RGB_444:
+	case GF_PIXEL_RGB_555:
+	case GF_PIXEL_RGB_565:
+	case GF_PIXEL_RGBX:
+	case GF_PIXEL_BGRX:
+	case GF_PIXEL_XRGB:
+	case GF_PIXEL_XBGR:
+		return 3;
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_RGBA:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_ABGR:
+		return 4;
+	case GF_PIXEL_RGBD:
+		return 4;
+	case GF_PIXEL_RGBDS:
+		return 5;
+	case GF_PIXEL_RGBAS:
+		return 5;
+	case GF_PIXEL_RGB_DEPTH:
+		return 4;
+	case GF_PIXEL_RGB:
+	case GF_PIXEL_BGR:
+		return 3;
+	case GF_PIXEL_RGBS:
+		return 4;
+	case GF_PIXEL_YUV:
+		return 3;
+	case GF_PIXEL_YUVA:
+	case GF_PIXEL_YUVA444:
+		return 4;
+	case GF_PIXEL_YUVD:
+		return 4;
+	case GF_PIXEL_YUV_10:
+		return 3;
+	case GF_PIXEL_YUV422:
+		return 3;
+	case GF_PIXEL_YUV422_10:
+		return 3;
+	case GF_PIXEL_YUV444:
+		return 3;
+	case GF_PIXEL_YUV444_10:
+		return 3;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		return 3;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		return 3;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_VYUY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+		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) ));
+		break;
+	}
+	return 0;
+}
+
+
+

gpac-0.8.0.tar.gz/src/utils/dlmalloc.c -> gpac-1.0.0.tar.gz/src/utils/dlmalloc.c Changed

@@ -2793,7 +2793,7 @@
 #define treemap_is_marked(M,i)  ((M)->treemap  &   idx2bit(i))
 
 /* isolate the least set bit of a bitmap */
-#define least_bit(x)         ((x) & -(x))
+#define least_bit(x)         ((x) & (-(x)))
 
 /* mask with all bits to left of least bit of x on */
 #define left_bits(x)         ((x<<1) | -(x<<1))
@@ -2968,7 +2968,6 @@
 
 	ACQUIRE_MALLOC_GLOBAL_LOCK();
 	if (mparams.magic == 0) {
-		size_t magic;
 		size_t psize;
 		size_t gsize;
 
@@ -3018,6 +3017,7 @@
 #endif
 
 		{
+			size_t magic;
 #if USE_DEV_RANDOM
 			int fd;
 			unsigned char buf[sizeof(size_t)];
@@ -4489,7 +4489,6 @@
 	mchunkptr p;              /* corresponding chunk */
 	size_t    remainder_size; /* remaining bytes while splitting */
 	void**    marray;         /* either "chunks" or malloced ptr array */
-	mchunkptr array_chunk;    /* chunk for malloced ptr array */
 	flag_t    was_enabled;    /* to disable mmap */
 	size_t    size;
 	size_t    i;
@@ -4549,6 +4548,7 @@
 
 	/* If not provided, allocate the pointer array as final part of chunk */
 	if (marray == 0) {
+		mchunkptr array_chunk;    /* chunk for malloced ptr array */
 		size_t  array_chunk_size;
 		array_chunk = chunk_plus_offset(p, contents_size);
 		array_chunk_size = remainder_size - contents_size;

gpac-0.8.0.tar.gz/src/utils/downloader.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2005-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -31,6 +31,7 @@
 #include <gpac/base_coding.h>
 #include <gpac/tools.h>
 #include <gpac/cache.h>
+#include <gpac/filters.h>
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
@@ -52,7 +53,9 @@
 
 #define SESSION_RETRY_COUNT	20
 
-#define GF_DOWNLOAD_AGENT_NAME		"GPAC/" GPAC_FULL_VERSION
+#include <gpac/revision.h>
+#define GF_DOWNLOAD_AGENT_NAME		"GPAC/"GPAC_VERSION "-rev" GPAC_GIT_REVISION
+
 //let's be agressive with socket buffer size
 #define GF_DOWNLOAD_BUFFER_SIZE		131072
 
@@ -99,6 +102,11 @@
 	char * filename;
 } GF_PartialDownload ;
 
+typedef struct
+{
+	struct __gf_download_session *sess;
+} GF_SessTask;
+
 struct __gf_download_session
 {
 	/*this is always 0 and helps differenciating downloads from other interfaces (interfaceType != 0)*/
@@ -107,9 +115,11 @@
 	struct __gf_download_manager *dm;
 	GF_Thread *th;
 	GF_Mutex *mx;
+	GF_SessTask *ftask;
 
 	Bool in_callback, destroy;
 	u32 proxy_enabled;
+	Bool allow_direct_reuse;
 
 	char *server_name;
 	u16 port;
@@ -134,6 +144,8 @@
 	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;
 	Bool last_chunk_found;
@@ -175,6 +187,8 @@
 
 	Bool chunked;
 	u32 nb_left_in_chunk;
+	u32 current_chunk_size;
+	u64 current_chunk_start;
 
 	u64 request_start_time;
 	/*private extension*/
@@ -183,7 +197,12 @@
 	char *remaining_data;
 	u32 remaining_data_size;
 
+	u32 head_timeout, request_timeout;
+
 	Bool local_cache_only;
+	Bool server_mode;
+	//0: not PUT/POST, 1: waiting for body to be completed, 2: body done
+	u32 put_state;
 };
 
 struct __gf_download_manager
@@ -194,8 +213,6 @@
 	Bool (*get_user_password)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
 	void *usr_cbk;
 
-	u32 head_timeout, request_timeout;
-	GF_Config *cfg;
 	GF_List *sessions;
 	Bool disable_cache, simulate_no_connection, allow_offline_cache, clean_cache;
 	u32 limit_data_rate, read_buf_size;
@@ -211,6 +228,9 @@
 	SSL_CTX *ssl_ctx;
 #endif
 
+	GF_FilterSession *filter_session;
+
+
 	Bool (*local_cache_url_provider_cbk)(void *udta, char *url, Bool cache_destroy);
 	void *lc_udta;
 };
@@ -242,41 +262,33 @@
 /**
  * \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
- * \return GF_OK is everything went fine, GF_BAD_PARAM if cache has not been opened, GF_IO_ERR if a failure occurs
+\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);
 
 /**
  * \brief Close the write file pointer of cache
  * This function also flushes all buffers, so cache will always be consistent after
- * \param entry The entry to use
- * \param sess The download session
- * \param success 1 if cache write is success, false otherwise
- * \return GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
+\param entry The entry to use
+\param sess The download session
+\param success 1 if cache write is success, false otherwise
+\param GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
  */
 GF_Err gf_cache_close_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess, Bool success);
 
 /**
  * \brief Open the write file pointer of cache
  * This function prepares calls for gf_cache_write_to_cache
- * \param entry The entry to use
- * \param sess The download session
- * \return GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
+\param entry The entry to use
+\param sess The download session
+\param GF_OK is everything went fine, GF_BAD_PARAM if entry is NULL, GF_IO_ERR if a failure occurs
  */
 GF_Err gf_cache_open_write_cache( const DownloadedCacheEntry entry, const GF_DownloadSession * sess );
 
-/**
- * \brief Returns write file pointer
- * This function returns the current cache file pointer
- * \param entry The entry to use
- * \return cache file pointer or NULL
- */
-FILE *gf_cache_get_file_pointer(const DownloadedCacheEntry entry);
-
 /*modify end range when chaining byte-range requests*/
 void gf_cache_set_end_range(DownloadedCacheEntry entry, u64 range_end);
 
@@ -302,9 +314,9 @@
 
 /**
  * \brief Saves the digest for authentication of password and username
- * \param dm The download manager
- * \param creds The credentials to fill
- * \return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
+\param dm The download manager
+\param creds The credentials to fill
+\param GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
  */
 static GF_Err gf_user_credentials_save_digest( GF_DownloadManager * dm, gf_user_credentials_struct * creds, const char * password) {
 	int size;
@@ -321,9 +333,9 @@
 
 /**
  * \brief Asks the user for credentials for given site
- * \param dm The download manager
- * \param creds The credentials to fill
- * \return GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
+\param dm The download manager
+\param creds The credentials to fill
+\param GF_OK if info has been filled, GF_BAD_PARAM if creds == NULL or dm == NULL, GF_AUTHENTICATION_FAILURE if user did not filled the info.
  */
 static GF_Err gf_user_credentials_ask_password( GF_DownloadManager * dm, gf_user_credentials_struct * creds)
 {
@@ -335,7 +347,6 @@
 		return GF_AUTHENTICATION_FAILURE;
 	}
 	return gf_user_credentials_save_digest(dm, creds, szPASS);
-	return GF_OK;
 }
 
 static gf_user_credentials_struct * gf_user_credentials_register(GF_DownloadManager * dm, const char * server_name, const char * username, const char * password, Bool valid)
@@ -353,13 +364,14 @@
 		gf_list_insert(dm->credentials, creds, 0);
 	}
 	creds->valid = valid;
-	strncpy(creds->username, username ? username : "", 50);
+	strncpy(creds->username, username ? username : "", 49);
+	creds->username[49] = 0;
 	strcpy(creds->site, server_name);
 	if (username && password && valid)
 		gf_user_credentials_save_digest(dm, creds, password);
 	else {
 		if (GF_OK != gf_user_credentials_ask_password(dm, creds)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK,
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP,
 			       ("[HTTP] Failed to get password information.\n"));
 			gf_list_rem( dm->credentials, 0);
 			gf_free( creds );
@@ -375,15 +387,15 @@
 
 /*!
  * initialize the SSL library once for all download managers
- * \return GF_FALSE if everyhing is OK, GF_TRUE otherwise
+\param GF_FALSE if everyhing is OK, GF_TRUE otherwise
  */
-static Bool init_ssl_lib() {
+Bool gf_ssl_init_lib() {
 	if (_ssl_is_initialized)
 		return GF_FALSE;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initializing SSL library...\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPS] Initializing SSL library...\n"));
 	init_prng();
 	if (RAND_status() != 1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPS] Error while initializing Random Number generator, failed to init SSL !\n"));
 		return GF_TRUE;
 	}
 
@@ -399,7 +411,7 @@
 #endif
 
 	_ssl_is_initialized = GF_TRUE;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTPS] Initalization of SSL library complete.\n"));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTPS] Initalization of SSL library complete.\n"));
 	return GF_FALSE;
 }
 
@@ -418,8 +430,8 @@
 		return 1;
 	}
 	/* Init the PRNG.  If that fails, bail out.  */
-	if (init_ssl_lib()) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTPS] Failed to properly initialize SSL library\n"));
+	if (gf_ssl_init_lib()) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTPS] Failed to properly initialize SSL library\n"));
 		goto error;
 	}
 
@@ -439,7 +451,7 @@
 	case 3:
 		meth = TLSv1_client_method();
 		break;
-#else /* for openssl 1.1+ this is the prefered method */
+#else /* for openssl 1.1+ this is the preferred method */
 	case 0:
 		meth = TLS_client_method();
 		break;
@@ -470,6 +482,84 @@
 	return 0;
 }
 
+
+void *gf_ssl_server_context_new(const char *cert, const char *key)
+{
+    const SSL_METHOD *method;
+    SSL_CTX *ctx;
+
+    method = SSLv23_server_method();
+
+    ctx = SSL_CTX_new(method);
+    if (!ctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unable to create SSL context\n"));
+		ERR_print_errors_fp(stderr);
+		return NULL;
+    }
+    SSL_CTX_set_ecdh_auto(ctx, 1);
+	if (SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM) <= 0) {
+		ERR_print_errors_fp(stderr);
+		SSL_CTX_free(ctx);
+		return NULL;
+	}
+	if (SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM) <= 0 ) {
+		ERR_print_errors_fp(stderr);
+		SSL_CTX_free(ctx);
+		return NULL;
+	}
+    return ctx;
+}
+
+void gf_ssl_server_context_del(void *ssl_ctx)
+{
+	SSL_CTX_free(ssl_ctx);
+}
+void *gf_ssl_new(void *ssl_ctx, GF_Socket *client_sock, GF_Err *e)
+{
+	SSL *ssl;
+	ssl = SSL_new(ssl_ctx);
+	if (!ssl) {
+		*e = GF_IO_ERR;
+		return NULL;
+	}
+	SSL_set_fd(ssl, gf_sk_get_handle(client_sock) );
+	if (SSL_accept(ssl) <= 0) {
+		ERR_print_errors_fp(stderr);
+		SSL_shutdown(ssl);
+        SSL_free(ssl);
+		*e = GF_AUTHENTICATION_FAILURE;
+		return NULL;
+	}
+	*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)
+{
+	u32 idx=0;
+	s32 nb_tls_blocks = size/16000;
+	while (nb_tls_blocks>=0) {
+		u32 len, to_write = 16000;
+		if (nb_tls_blocks==0)
+			to_write = size - idx*16000;
+
+		len = SSL_write(ssl_ctx, buffer + idx*16000, to_write);
+		nb_tls_blocks--;
+		idx++;
+
+		if (len != to_write) {
+			return GF_IP_NETWORK_FAILURE;
+		}
+	}
+	return GF_OK;
+}
+
+
 #endif /* GPAC_HAS_SSL */
 
 
@@ -491,8 +581,8 @@
 
 /*!
  * Finds an existing entry in the cache for a given URL
- * \param sess The session configured with the URL
- * \return NULL if none found, the DownloadedCacheEntry otherwise
+\param sess The session configured with the URL
+\param NULL if none found, the DownloadedCacheEntry otherwise
  */
 DownloadedCacheEntry gf_dm_find_cached_entry_by_url(GF_DownloadSession * sess)
 {
@@ -524,24 +614,31 @@
 
 /**
  * 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
- * \return The DownloadedCacheEntry
+\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);
 
 /*!
  * Removes a session for a DownloadedCacheEntry
- * \param entry The entry
- * \param sess The session to remove
- * \return the number of sessions left in the cached entry, -1 if one of the parameters is wrong
+\param entry The entry
+\param sess The session to remove
+\param the number of sessions left in the cached entry, -1 if one of the parameters is wrong
  */
 s32 gf_cache_remove_session_from_cache_entry(DownloadedCacheEntry entry, GF_DownloadSession * sess);
 
+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_headers(const DownloadedCacheEntry entry, const char *headers);
+Bool gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
+
+
 /**
  * Removes a cache entry from cache and performs a cleanup if possible.
  * If the cache entry is marked for deletion and has no sessions associated with it, it will be
@@ -565,6 +662,7 @@
 				if (ex == sess->cache_entry) {
 					gf_list_rem(sess->dm->cache_entries, i);
 					gf_cache_delete_entry( sess->cache_entry );
+					sess->cache_entry = NULL;
 					break;
 				}
 			}
@@ -576,20 +674,23 @@
 /*!
  * Adds a session to a DownloadedCacheEntry.
  * implemented in cache.c
- * \param entry The entry
- * \param sess The session to add
- * \return the number of sessions in the cached entry, -1 if one of the parameters is wrong
+\param entry The entry
+\param sess The session to add
+\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);
 
+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_INFO, GF_LOG_NETWORK, ("[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\n", sess, (sess->flags & GF_NETIO_SESSION_NOT_CACHED) ? "no" : "yes" ));
 	gf_dm_remove_cache_entry_from_session(sess);
 	if (sess->flags & GF_NETIO_SESSION_NOT_CACHED) {
 		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);
 	} else {
 		Bool found = GF_FALSE;
 		u32 i, count;
@@ -600,6 +701,18 @@
 				sess->last_error = GF_URL_ERROR;
 				return;
 			}
+			if (sess->cache_entry) {
+				/* We found the existing session */
+				gf_cache_entry_set_delete_files_when_deleted(sess->cache_entry);
+				if (0 == 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);
+					gf_mx_v( sess->dm->cache_mx );
+					gf_cache_delete_entry(sess->cache_entry);
+				}
+				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);
 			gf_mx_p( sess->dm->cache_mx );
 			gf_list_add(sess->dm->cache_entries, entry);
@@ -624,7 +737,19 @@
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
 		gf_cache_add_session_to_cache_entry(sess->cache_entry, sess);
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Cache setup to %p %s\n", sess, gf_cache_get_cache_filename(sess->cache_entry)));
+		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->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_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
+		}
 	}
 }
 
@@ -650,17 +775,17 @@
 	count = gf_list_count(dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * e_url;
-		DownloadedCacheEntry e = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
-		assert(e);
-		e_url = gf_cache_get_url(e);
+		DownloadedCacheEntry cache_ent = (DownloadedCacheEntry)gf_list_get(dm->cache_entries, i);
+		assert(cache_ent);
+		e_url = gf_cache_get_url(cache_ent);
 		assert( e_url );
 		if (!strcmp(e_url, realURL)) {
 			/* We found the existing session */
-			gf_cache_entry_set_delete_files_when_deleted(e);
-			if (0 == gf_cache_get_sessions_count_for_cache_entry( e )) {
+			gf_cache_entry_set_delete_files_when_deleted(cache_ent);
+			if (0 == gf_cache_get_sessions_count_for_cache_entry( cache_ent )) {
 				/* No session attached anymore... we can delete it */
 				gf_list_rem(dm->cache_entries, i);
-				gf_cache_delete_entry(e);
+				gf_cache_delete_entry(cache_ent);
 			}
 			/* If deleted or not, we don't search further */
 			gf_mx_v( dm->cache_mx );
@@ -671,13 +796,13 @@
 	/* 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_NETWORK, ("[CACHE] Cannot find URL %s, cache file won't be deleted.\n", url));
+	GF_LOG(GF_LOG_WARNING, 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) {
 	if (sess && sess->dm && url) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Requesting deletion for %s\n", 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);
 		if (sess->local_cache_only && sess->dm->local_cache_url_provider_cbk)
 			sess->dm->local_cache_url_provider_cbk(sess->dm->lc_udta, (char *) url, GF_TRUE);
@@ -706,11 +831,7 @@
 	assert( sess );
 	if (sess->connection_close) force_close = GF_TRUE;
 	sess->connection_close = GF_FALSE;
-	if (sess->remaining_data && sess->remaining_data_size) {
-		gf_free(sess->remaining_data);
-		sess->remaining_data = NULL;
-		sess->remaining_data_size = 0;
-	}
+	sess->remaining_data_size = 0;
 
 	if (sess->status >= GF_NETIO_DISCONNECTED) {
 		if (force_close && sess->use_cache_file && sess->cache_entry) {
@@ -722,22 +843,24 @@
 
 	gf_mx_p(sess->mx);
 
-	if (force_close || !(sess->flags & GF_NETIO_SESSION_PERSISTENT)) {
+	if (!sess->server_mode) {
+		if (force_close || !(sess->flags & GF_NETIO_SESSION_PERSISTENT)) {
 #ifdef GPAC_HAS_SSL
-		if (sess->ssl) {
-			SSL_shutdown(sess->ssl);
-			SSL_free(sess->ssl);
-			sess->ssl = NULL;
-		}
+			if (sess->ssl) {
+				SSL_shutdown(sess->ssl);
+				SSL_free(sess->ssl);
+				sess->ssl = NULL;
+			}
 #endif
-		if (sess->sock) {
-			GF_Socket * sx = sess->sock;
-			sess->sock = NULL;
-			gf_sk_del(sx);
+			if (sess->sock) {
+				GF_Socket * sx = sess->sock;
+				sess->sock = NULL;
+				gf_sk_del(sx);
+			}
+		}
+		if (force_close && sess->use_cache_file) {
+			gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 		}
-	}
-	if (force_close && sess->use_cache_file) {
-		gf_cache_close_write_cache(sess->cache_entry, sess, GF_FALSE);
 	}
 	sess->status = GF_NETIO_DISCONNECTED;
 	if (sess->num_retry) sess->num_retry--;
@@ -748,11 +871,12 @@
 GF_EXPORT
 void gf_dm_sess_del(GF_DownloadSession *sess)
 {
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p)\n", sess ));
 	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));
 	/*self-destruction, let the download manager destroy us*/
-	if (sess->th && sess->in_callback) {
+	if ((sess->th || sess->ftask) && sess->in_callback) {
 		sess->destroy = GF_TRUE;
 		return;
 	}
@@ -784,15 +908,19 @@
 	/* Credentials are stored into the sess->dm */
 	if (sess->creds) sess->creds = NULL;
 	if (sess->init_data) gf_free(sess->init_data);
+	if (sess->remaining_data) gf_free(sess->remaining_data);
+
 	sess->orig_url = sess->server_name = sess->remote_path;
 	sess->creds = NULL;
-	if (sess->sock)
+	if (sess->sock && !sess->server_mode)
 		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;
+	}
 	gf_free(sess);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Downloader] gf_dm_sess_del(%p) : DONE\n", sess ));
 }
 
 void http_do_requests(GF_DownloadSession *sess);
@@ -822,12 +950,19 @@
 	}
 }
 
-GF_EXPORT
+#if 0 //unused
+/*!
+\brief is download manager thread dead?
+ *
+ *Indicates whether the thread has ended
+\param sess the download session
+ */
 Bool gf_dm_is_thread_dead(GF_DownloadSession *sess)
 {
 	if (!sess) return GF_TRUE;
 	return (sess->flags & GF_DOWNLOAD_SESSION_THREAD_DEAD) ? GF_TRUE : GF_FALSE;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_dm_sess_last_error(GF_DownloadSession *sess)
@@ -837,14 +972,9 @@
 }
 
 GF_EXPORT
-void gf_dm_url_info_init(GF_URL_Info * info) {
-	info->password = NULL;
-	info->userName = NULL;
-	info->canonicalRepresentation = NULL;
-	info->protocol = NULL;
-	info->port = 0;
-	info->remotePath = NULL;
-	info->server_name = NULL;
+void gf_dm_url_info_init(GF_URL_Info * info)
+{
+	memset(info, 0, sizeof(GF_URL_Info));
 }
 
 GF_EXPORT
@@ -865,9 +995,9 @@
 }
 
 /**
- * \param url The url to parse for protocol
- * \param info The info to fill
- * \return Returns the offset in url of the protocol found -1 if not found
+\param url The url to parse for protocol
+\param info The info to fill
+\param Returns the offset in url of the protocol found -1 if not found
  */
 static s32 gf_dm_parse_protocol(const char * url, GF_URL_Info * info) {
 	assert(info);
@@ -928,7 +1058,8 @@
 				urlConcatenateWithBaseURL = NULL;
 
 				if (!info->remotePath) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Network] No supported protocol for url %s\n", url));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[Network] No supported protocol for url %s\n", url));
+					gf_dm_url_info_del(info);
 					return GF_BAD_PARAM;
 				}
 				for (i=0; i<strlen(info->remotePath); i++)
@@ -943,7 +1074,8 @@
 				url = urlConcatenateWithBaseURL + proto_offset;
 			}
 		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Network] No supported protocol for url %s\n", url));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[Network] No supported protocol for url %s\n", url));
+			gf_dm_url_info_del(info);
 			return GF_BAD_PARAM;
 		}
 	}
@@ -978,7 +1110,7 @@
 		info->server_name = gf_strdup(tmp_url);
 	}
 
-	//scan for port number after IPv6 adress ']' end char
+	//scan for port number after IPv6 address ']' end char
 	ipv6 = strrchr(current_pos, ']');
 	tmp = strrchr(ipv6 ? ipv6 : current_pos, ':');
 
@@ -1016,7 +1148,7 @@
 {
 	char *hdrs;
 
-	if (!sess->local_cache_only) return;
+	if (!sess || !sess->local_cache_only) return;
 
 	hdrs = gf_cache_get_forced_headers(sess->cache_entry);
 
@@ -1028,6 +1160,7 @@
 		if (sep2) {
 			GF_HTTPHeader *hdr;
 			GF_SAFEALLOC(hdr, GF_HTTPHeader);
+			if (!hdr) break;
 			sep2[0]=0;
 			hdr->name = gf_strdup(hdrs);
 			sep2[0]=':';
@@ -1043,7 +1176,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url)
+GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url, Bool allow_direct_reuse)
 {
 	Bool socket_changed = GF_FALSE;
 	GF_URL_Info info;
@@ -1051,10 +1184,11 @@
 	if (!url) return GF_BAD_PARAM;
 
 	gf_dm_clear_headers(sess);
-
+	sess->allow_direct_reuse = allow_direct_reuse;
 	gf_dm_url_info_init(&info);
 
-	if (!sess->sock) socket_changed = GF_TRUE;
+	if (!sess->sock)
+		socket_changed = GF_TRUE;
 	else if (sess->status>GF_NETIO_DISCONNECTED)
 		socket_changed = GF_TRUE;
 
@@ -1072,6 +1206,7 @@
 
 	if (!strstr(url, "://")) {
 		char c, *sep;
+		gf_dm_url_info_del(&info);
 		info.port = sess->port;
 		info.server_name = sess->server_name ? gf_strdup(sess->server_name) : NULL;
 		info.remotePath = gf_strdup(url);
@@ -1131,12 +1266,15 @@
 	if (sess->remote_path) gf_free(sess->remote_path);
 	sess->remote_path = gf_strdup(info.remotePath);
 
+	if (sess->status==GF_NETIO_STATE_ERROR)
+		socket_changed = GF_TRUE;
+
 	if (!socket_changed && info.userName  && !strcmp(info.userName, sess->creds->username)) {
 	} else {
 		sess->creds = NULL;
 		if (info.userName ) {
 			if (! sess->dm) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Did not found any download manager, credentials not supported\n"));
+				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);
 		}
@@ -1149,8 +1287,10 @@
 		sess->num_retry = SESSION_RETRY_COUNT;
 		sess->needs_cache_reconfig = 1;
 	} else {
-		if (sess->sock) gf_sk_del(sess->sock);
-		sess->sock = NULL;
+		if (sess->sock) {
+			gf_sk_del(sess->sock);
+			sess->sock = NULL;
+		}
 		sess->status = GF_NETIO_SETUP;
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
@@ -1161,12 +1301,12 @@
 #endif
 
 	}
-	sess->total_size=0;
-	sess->bytes_done=0;
+	sess->total_size = 0;
+	sess->bytes_done = 0;
 	assert(sess->remaining_data_size==0);
 
 	sess->local_cache_only = GF_FALSE;
-	if (sess->dm->local_cache_url_provider_cbk) {
+	if (sess->dm && sess->dm->local_cache_url_provider_cbk) {
 		Bool res = sess->dm->local_cache_url_provider_cbk(sess->dm->lc_udta, (char *)url, GF_FALSE);
 		if (res == GF_TRUE) {
 			sess->local_cache_only = GF_TRUE;
@@ -1189,72 +1329,129 @@
 }
 
 
-
-static u32 gf_dm_session_thread(void *par)
+Bool gf_dm_session_do_task(GF_DownloadSession *sess)
 {
-	GF_DownloadSession *sess = (GF_DownloadSession *)par;
+	Bool do_run = GF_TRUE;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] Entering thread ID %d\n", gf_th_id() ));
-	sess->flags &= ~GF_DOWNLOAD_SESSION_THREAD_DEAD;
-	while (!sess->destroy) {
+	if (sess->destroy) {
+		do_run = GF_FALSE;
+	} else {
 		gf_mx_p(sess->mx);
 		if (sess->status >= GF_NETIO_DISCONNECTED) {
-			gf_mx_v(sess->mx);
-			break;
-		}
-		if (sess->status < GF_NETIO_CONNECTED) {
-			gf_dm_connect(sess);
+			do_run = GF_FALSE;
 		} else {
-			sess->do_requests(sess);
+			if (sess->status < GF_NETIO_CONNECTED) {
+				gf_dm_connect(sess);
+			} else {
+				sess->do_requests(sess);
+			}
 		}
 		gf_mx_v(sess->mx);
-		gf_sleep(0);
 	}
-	/*destroy all sessions*/
+	if (do_run) return GF_TRUE;
+
+	/*destroy all session but keep connection active*/
 	gf_dm_disconnect(sess, GF_FALSE);
 	sess->status = GF_NETIO_STATE_ERROR;
 	sess->last_error = GF_OK;
+	return GF_FALSE;
+}
+
+Bool gf_dm_session_task(GF_FilterSession *fsess, void *callback, u32 *reschedule_ms)
+{
+	GF_SessTask *task = callback;
+	GF_DownloadSession *sess = task->sess;
+	if (!sess) {
+		gf_free(task);
+		return GF_FALSE;
+	}
+	Bool ret = gf_dm_session_do_task(sess);
+	if (ret) {
+		*reschedule_ms = 1;
+		return GF_TRUE;
+	}
+	assert(sess->ftask);
+	gf_free(sess->ftask);
+	sess->ftask = NULL;
+	if (sess->destroy)
+		gf_dm_sess_del(sess);
+	return GF_FALSE;
+}
+
+static u32 gf_dm_session_thread(void *par)
+{
+	GF_DownloadSession *sess = (GF_DownloadSession *)par;
+	if (!sess) return 0;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] Entering thread ID %d\n", gf_th_id() ));
+	sess->flags &= ~GF_DOWNLOAD_SESSION_THREAD_DEAD;
+	while (!sess->destroy) {
+		Bool ret = gf_dm_session_do_task(sess);
+		if (!ret) break;
+		gf_sleep(0);
+	}
 	sess->flags |= GF_DOWNLOAD_SESSION_THREAD_DEAD;
+	if (sess->destroy)
+		gf_dm_sess_del(sess);
 	return 1;
 }
 
-
-GF_EXPORT
-GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *url, u32 dl_flags,
+static GF_DownloadSession *gf_dm_sess_new_internal(GF_DownloadManager * dm, const char *url, u32 dl_flags,
         gf_dm_user_io user_io,
         void *usr_cbk,
+        GF_Socket *server,
         GF_Err *e)
 {
 	GF_DownloadSession *sess;
-	if (!dm) return NULL;
 
 	GF_SAFEALLOC(sess, GF_DownloadSession);
 	if (!sess) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("%s:%d Cannot allocate session for URL %s: OUT OF MEMORY!\n", __FILE__, __LINE__, url));
+		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();
 	sess->flags = dl_flags;
 	if (sess->flags & GF_NETIO_SESSION_NOTIFY_DATA)
 		sess->force_data_write_callback = GF_TRUE;
-	if (!dm->head_timeout) sess->server_only_understand_get = GF_TRUE;
 	sess->user_proc = user_io;
 	sess->usr_cbk = usr_cbk;
 	sess->creds = NULL;
-	sess->dm = dm;
-	sess->disable_cache = dm->disable_cache;
-	sess->mx = gf_mx_new(url);
-	if (!sess->mx) {
-		gf_free(sess);
-		return NULL;
+
+	if (!gf_opts_get_key("core", "head-timeout")) {
+		sess->head_timeout = 5000;
+	} else {
+		sess->head_timeout = gf_opts_get_int("core", "head-timeout");
 	}
 
+	sess->request_timeout = gf_opts_get_int("core", "req-timeout");
+	if (!sess->request_timeout) sess->request_timeout = 20000;
 
-	assert( dm );
+	sess->dm = dm;
+	if (server) {
+		sess->sock = server;
+		sess->flags = GF_NETIO_SESSION_NOT_THREADED;
+		sess->status = GF_NETIO_CONNECTED;
+		sess->server_mode = GF_TRUE;
+		sess->do_requests = http_do_requests;
+		if (e) *e = GF_OK;
+		return sess;
+	}
+
+	if (!sess->head_timeout) sess->server_only_understand_get = GF_TRUE;
+	if (dm)
+		sess->disable_cache = dm->disable_cache;
+
+	if (! (dl_flags&GF_NETIO_SESSION_NOT_THREADED)) {
+		sess->mx = gf_mx_new(url);
+		if (!sess->mx) {
+			gf_free(sess);
+			return NULL;
+		}
+	}
 
-	*e = gf_dm_sess_setup_from_url(sess, url);
+	*e = gf_dm_sess_setup_from_url(sess, url, GF_FALSE);
 	if (*e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("%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_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_dm_sess_del(sess);
 		return NULL;
 	}
@@ -1265,13 +1462,36 @@
 }
 
 GF_EXPORT
+GF_DownloadSession *gf_dm_sess_new_server(GF_Socket *server,
+		void *ssl_sock_ctx,
+        gf_dm_user_io user_io,
+        void *usr_cbk,
+        GF_Err *e)
+{
+	GF_DownloadSession *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;
+#endif
+	return sess;
+}
+
+
+GF_EXPORT
+GF_DownloadSession *gf_dm_sess_new_simple(GF_DownloadManager * dm, const char *url, u32 dl_flags,
+        gf_dm_user_io user_io,
+        void *usr_cbk,
+        GF_Err *e)
+{
+	return gf_dm_sess_new_internal(dm, url, dl_flags, user_io, usr_cbk, NULL, e);
+}
+GF_EXPORT
 GF_DownloadSession *gf_dm_sess_new(GF_DownloadManager *dm, const char *url, u32 dl_flags,
                                    gf_dm_user_io user_io,
                                    void *usr_cbk,
                                    GF_Err *e)
 {
 	GF_DownloadSession *sess;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("%s:%d gf_dm_sess_new(%s)\n", __FILE__, __LINE__, url));
+	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;
 
@@ -1280,7 +1500,7 @@
 		return NULL;
 	}
 	sess = gf_dm_sess_new_simple(dm, url, dl_flags, user_io, usr_cbk, e);
-	if (sess) {
+	if (sess && dm) {
 		sess->dm = dm;
 		gf_mx_p(dm->cache_mx);
 		gf_list_add(dm->sessions, sess);
@@ -1313,6 +1533,11 @@
 #ifdef GPAC_HAS_SSL
 	if (sess->ssl) {
 		s32 size;
+		e = gf_sk_receive(sess->sock, NULL, 0, NULL);
+		if (e==GF_IP_NETWORK_EMPTY) {
+			gf_mx_v(sess->mx);
+			return e;
+		}
 		size = SSL_read(sess->ssl, data, data_size);
 		if (size < 0)
 			e = GF_IO_ERR;
@@ -1326,7 +1551,7 @@
 	} else
 #endif
 
-		e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
+		e = gf_sk_receive(sess->sock, data, data_size, out_read);
 
 	gf_mx_v(sess->mx);
 	return e;
@@ -1339,10 +1564,10 @@
 
 static Bool rfc2818_match(const char *pattern, const char *string)
 {
-	char c, d;
+	char d;
 	u32 i=0, k=0;
 	while (1) {
-		c = LWR(pattern[i]);
+		char c = LWR(pattern[i]);
 		if (c == '\0') break;
 
 		if (c=='*') {
@@ -1381,7 +1606,7 @@
 {
 	GF_Err e;
 	u16 proxy_port = 0;
-	const char *proxy, *ip;
+	const char *proxy;
 
 	if (!sess->sock) {
 		sess->num_retry = 40;
@@ -1393,9 +1618,9 @@
 	gf_dm_sess_notify_state(sess, sess->status, GF_OK);
 
 	/*PROXY setup*/
-	if (sess->proxy_enabled!=2 && sess->dm && sess->dm->cfg) {
-		proxy = gf_cfg_get_key(sess->dm->cfg, "HTTPProxy", "Enabled");
-		if (proxy && !strcmp(proxy, "yes")) {
+	if (sess->proxy_enabled!=2) {
+		proxy = NULL;
+		if (gf_opts_get_bool("core", "proxy-on")) {
 			u32 i;
 			Bool use_proxy=GF_TRUE;
 			for (i=0; i<gf_list_count(sess->dm->skip_proxy_servers); i++) {
@@ -1406,9 +1631,9 @@
 				}
 			}
 			if (use_proxy) {
-				proxy = gf_cfg_get_key(sess->dm->cfg, "HTTPProxy", "Port");
-				proxy_port = proxy ? atoi(proxy) : 80;
-				proxy = gf_cfg_get_key(sess->dm->cfg, "HTTPProxy", "Name");
+				proxy_port = gf_opts_get_int("core", "proxy-port");
+				if (!proxy_port) proxy_port = 80;
+				proxy = gf_opts_get_key("core", "proxy-name");
 				sess->proxy_enabled = 1;
 			} else {
 				proxy = NULL;
@@ -1422,22 +1647,11 @@
 	}
 
 
-	if (sess->dm && sess->dm->cfg) {
-		ip = gf_cfg_get_key(sess->dm->cfg, "Network", "MobileIPEnabled");
-		if (ip && !strcmp(ip, "yes")) {
-			ip = gf_cfg_get_key(sess->dm->cfg, "Network", "MobileIP");
-		} else {
-			ip = NULL;
-		}
-	} else {
-		ip = NULL;
-	}
-
 	if (!proxy) {
 		proxy = sess->server_name;
 		proxy_port = sess->port;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connecting to %s:%d\n", proxy, proxy_port));
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Connecting to %s:%d\n", proxy, proxy_port));
 
 	if (sess->status == GF_NETIO_SETUP) {
 		u64 now;
@@ -1448,8 +1662,8 @@
 			return;
 		}
 
-		now  =gf_sys_clock_high_res();
-		e = gf_sk_connect(sess->sock, (char *) proxy, proxy_port, (char *)ip);
+		now = gf_sys_clock_high_res();
+		e = gf_sk_connect(sess->sock, (char *) proxy, proxy_port, NULL);
 
 		/*retry*/
 		if ((e == GF_IP_SOCK_WOULD_BLOCK) && sess->num_retry) {
@@ -1462,24 +1676,21 @@
 		if (e) {
 			if (!sess->cache_entry && sess->dm && sess->dm->allow_offline_cache) {
 				gf_dm_configure_cache(sess);
-				if (sess->cache_entry && !gf_cache_check_if_cache_file_is_corrupted(sess->cache_entry)) {
-					sess->from_cache_only = GF_TRUE;
-					sess->connect_time = (u32) (gf_sys_clock_high_res() - now);
-					sess->status = GF_NETIO_CONNECTED;
-					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Host %s:%d unreachable, using existing cache\n", proxy, proxy_port));
-					gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
-					return;
-				}
+				if (sess->from_cache_only) return;
 			}
 			sess->status = GF_NETIO_STATE_ERROR;
 			sess->last_error = e;
 			gf_dm_sess_notify_state(sess, sess->status, e);
 			return;
 		}
+		if (sess->allow_direct_reuse) {
+			gf_dm_configure_cache(sess);
+			if (sess->from_cache_only) return;
+		}
 
 		sess->connect_time = (u32) (gf_sys_clock_high_res() - now);
 		sess->status = GF_NETIO_CONNECTED;
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Connected to %s:%d\n", proxy, proxy_port));
 		gf_dm_sess_notify_state(sess, GF_NETIO_CONNECTED, GF_OK);
 //		gf_sk_set_buffer_size(sess->sock, GF_TRUE, GF_DOWNLOAD_BUFFER_SIZE);
 //		gf_sk_set_buffer_size(sess->sock, GF_FALSE, GF_DOWNLOAD_BUFFER_SIZE);
@@ -1493,32 +1704,34 @@
 		/*socket is connected, configure SSL layer*/
 		if (sess->dm && sess->dm->ssl_ctx) {
 			int ret;
-			long vresult;
-			char common_name[256];
 			X509 *cert;
-			Bool success = GF_TRUE;
+			Bool success;
 
 			sess->ssl = SSL_new(sess->dm->ssl_ctx);
 			SSL_set_fd(sess->ssl, gf_sk_get_handle(sess->sock));
 			SSL_set_connect_state(sess->ssl);
 			ret = SSL_connect(sess->ssl);
 			if (ret<=0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Cannot connect, error %d\n", ret));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Cannot connect, error %d\n", ret));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[SSL] connected\n"));
 			}
 
 			cert = SSL_get_peer_certificate(sess->ssl);
 			/*if we have a cert, check it*/
 			if (cert) {
+				long vresult;
 				SSL_set_verify_result(sess->ssl, 0);
 				vresult = SSL_get_verify_result(sess->ssl);
 
 				if (vresult == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[SSL] Cannot locate issuer's certificate on the local system, will not attempt to validate\n"));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[SSL] Cannot locate issuer's certificate on the local system, will not attempt to validate\n"));
 					SSL_set_verify_result(sess->ssl, 0);
 					vresult = SSL_get_verify_result(sess->ssl);
 				}
 
 				if (vresult == X509_V_OK) {
+					char common_name[256];
 					STACK_OF(GENERAL_NAME) *altnames;
 					GF_List* valid_names;
 					int i;
@@ -1550,26 +1763,30 @@
 						const char *valid_name = (const char*) gf_list_get(valid_names, i);
 						if (rfc2818_match(valid_name, sess->server_name)) {
 							success = GF_TRUE;
-							GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[SSL] Hostname %s matches %s\n", sess->server_name, valid_name));
+							GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[SSL] Hostname %s matches %s\n", sess->server_name, valid_name));
 							break;
 						}
 					}
 					if (!success) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Mismatch in certificate names: expected %s\n", sess->server_name));
-						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(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Tried name: %s\n", valid_name));
-						}
 						if (sess->dm && sess->dm->allow_broken_certificate) {
 							success = GF_TRUE;
+							GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[SSL] Mismatch in certificate names: expected %s\n", sess->server_name));
+						} else {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Mismatch in certificate names, try using -broken-cert: expected %s\n", 	sess->server_name));
+						}
+#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));
 						}
+#endif
 					}
 
 					gf_list_del(valid_names);
 					GENERAL_NAMES_free(altnames);
 				} else {
 					success = GF_FALSE;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[SSL] Error verifying certificate %x\n", vresult));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[SSL] Error verifying certificate %x\n", vresult));
 				}
 
 				X509_free(cert);
@@ -1592,10 +1809,13 @@
 
 }
 
-DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess) {
+DownloadedCacheEntry gf_dm_refresh_cache_entry(GF_DownloadSession *sess)
+{
 	Bool go;
 	u32 timer = 0;
-	u32 flags = sess->flags;
+	u32 flags;
+	if (!sess) return NULL;
+	flags = sess->flags;
 	sess->flags |= GF_NETIO_SESSION_NOT_CACHED;
 	go = GF_TRUE;
 	while (go) {
@@ -1617,10 +1837,10 @@
 					gf_dm_disconnect(sess, GF_FALSE);
 					sess->status = GF_NETIO_SETUP;
 					sess->server_only_understand_get = GF_TRUE;
-					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("gf_dm_refresh_cache_entry() : Timeout with HEAD, try with GET\n"));
-					e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+					GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("gf_dm_refresh_cache_entry() : Timeout with HEAD, try with GET\n"));
+					e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 					if (e) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("gf_dm_refresh_cache_entry() : Error with GET %d\n", e));
+						GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("gf_dm_refresh_cache_entry() : Error with GET %d\n", e));
 						sess->status = GF_NETIO_STATE_ERROR;
 						sess->last_error = e;
 						gf_dm_sess_notify_state(sess, sess->status, e);
@@ -1671,31 +1891,35 @@
 	if (sess->cache_entry) {
 		if (!discontinue_cache) {
 			if (gf_cache_get_end_range(sess->cache_entry) + 1 != start_range)
-				return GF_NOT_SUPPORTED;
+				discontinue_cache = GF_TRUE;
 		}
-		if (!sess->sock)
-			return GF_BAD_PARAM;
-		if (sess->status != GF_NETIO_CONNECTED) {
-			if (sess->status != GF_NETIO_DISCONNECTED) {
-				return GF_BAD_PARAM;
+		if (sess->sock) {
+			if (sess->status != GF_NETIO_CONNECTED) {
+				if (sess->status != GF_NETIO_DISCONNECTED) {
+					return GF_BAD_PARAM;
+				}
 			}
 		}
-		sess->status = GF_NETIO_CONNECTED;
-		sess->num_retry = SESSION_RETRY_COUNT;
-		if (!discontinue_cache) {
-			gf_cache_set_end_range(sess->cache_entry, end_range);
-			/*remember this in case we get disconnected*/
-			sess->is_range_continuation = GF_TRUE;
-		} else {
-			sess->needs_cache_reconfig = 2;
-			sess->reused_cache_entry = GF_FALSE;
+		if (!sess->local_cache_only) {
+			sess->status = sess->sock ? GF_NETIO_CONNECTED : GF_NETIO_SETUP;
+			sess->num_retry = SESSION_RETRY_COUNT;
+
+			if (!discontinue_cache) {
+				gf_cache_set_end_range(sess->cache_entry, end_range);
+				/*remember this in case we get disconnected*/
+				sess->is_range_continuation = GF_TRUE;
+			} else {
+				sess->needs_cache_reconfig = 1;
+				sess->reused_cache_entry = GF_FALSE;
+			}
 		}
 	} else {
-		if (sess->status != GF_NETIO_SETUP) return GF_BAD_PARAM;
+		if ((sess->status != GF_NETIO_SETUP) && (sess->status != GF_NETIO_CONNECTED))
+			return GF_BAD_PARAM;
 	}
 	sess->range_start = start_range;
 	sess->range_end = end_range;
-	sess->needs_range = GF_TRUE;
+	sess->needs_range = (start_range || end_range) ? GF_TRUE : GF_FALSE;
 	return GF_OK;
 }
 
@@ -1706,8 +1930,15 @@
 
 	/*if session is threaded, start thread*/
 	if (! (sess->flags & GF_NETIO_SESSION_NOT_THREADED)) {
+		if (sess->dm->filter_session && !gf_opts_get_bool("core", "dm-threads")) {
+			GF_SAFEALLOC(sess->ftask, GF_SessTask);
+			if (!sess->ftask) return GF_OUT_OF_MEM;
+			sess->ftask->sess = sess;
+			gf_fs_post_user_task(sess->dm->filter_session, gf_dm_session_task, sess->ftask, "download");
+			return GF_OK;
+		}
 		if (sess->th) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Session already started - ignoring start\n"));
+			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);
@@ -1715,6 +1946,12 @@
 		gf_th_run(sess->th, gf_dm_session_thread, sess);
 		return GF_OK;
 	}
+
+	if (sess->put_state==2) {
+		if (sess->status==GF_NETIO_DATA_TRANSFERED)
+			sess->status = GF_NETIO_WAIT_FOR_REPLY;
+	}
+
 	/*otherwise do a synchronous download*/
 	go = GF_TRUE;
 	while (go) {
@@ -1725,7 +1962,14 @@
 			break;
 		case GF_NETIO_WAIT_FOR_REPLY:
 		case GF_NETIO_CONNECTED:
+			sess->do_requests(sess);
+			break;
 		case GF_NETIO_DATA_EXCHANGE:
+			if (sess->put_state==2) {
+				sess->status = GF_NETIO_DATA_TRANSFERED;
+				go = GF_FALSE;
+				break;
+			}
 			sess->do_requests(sess);
 			break;
 		case GF_NETIO_DATA_TRANSFERED:
@@ -1742,7 +1986,7 @@
 			break;
 
 		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Downloader] Session in unknown state !! - aborting\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[Downloader] Session in unknown state !! - aborting\n"));
 			go = GF_FALSE;
 			break;
 		}
@@ -1797,7 +2041,7 @@
  * gf_dm_wget() are not impacted and won't cleanup the cache
  *
  * FIXME: should be probably threaded to avoid too long start time
- * \param dm The GF_DownloadManager
+\param dm The GF_DownloadManager
  */
 static void gf_cache_cleanup_cache(GF_DownloadManager * dm) {
 	if (gf_dm_needs_to_delete_cache(dm)) {
@@ -1817,20 +2061,20 @@
 {
 	u64 out_size = gf_cache_get_size(dm->cache_directory);
 	if (out_size >= dm->max_cache_size) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Cache] Cache size %d exceeds max allowed %d, deleting entire cache\n", out_size, dm->max_cache_size));
+		GF_LOG(dm->max_cache_size ? GF_LOG_WARNING : GF_LOG_INFO, GF_LOG_HTTP, ("[Cache] Cache size %d exceeds max allowed %d, deleting entire cache\n", out_size, dm->max_cache_size));
 		gf_cache_delete_all_cached_files(dm->cache_directory);
 	}
 }
 
 GF_EXPORT
-GF_DownloadManager *gf_dm_new(GF_Config *cfg)
+GF_DownloadManager *gf_dm_new(GF_FilterSession *fsess)
 {
 	const char *opt;
-	char * default_cache_dir;
+	const char * default_cache_dir;
 	GF_DownloadManager *dm;
 	GF_SAFEALLOC(dm, GF_DownloadManager);
 	if (!dm) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Downloader] Failed to allocate downloader\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[Downloader] Failed to allocate downloader\n"));
 		return NULL;
 	}
 	dm->sessions = gf_list_new();
@@ -1838,14 +2082,12 @@
 	dm->credentials = gf_list_new();
 	dm->skip_proxy_servers = gf_list_new();
 	dm->partial_downloads = gf_list_new();
-	dm->cfg = cfg;
 	dm->cache_mx = gf_mx_new("download_manager_cache_mx");
+	dm->filter_session = fsess;
 	default_cache_dir = NULL;
 	gf_mx_p( dm->cache_mx );
-	if (cfg)
-		opt = gf_cfg_get_key(cfg, "General", "CacheDirectory");
-	else
-		opt = NULL;
+
+	opt = gf_opts_get_key("core", "cache");
 
 retry_cache:
 	if (!opt) {
@@ -1870,7 +2112,7 @@
 			gf_mkdir(dm->cache_directory);
 			test = gf_fopen(szTemp, "wb");
 			if (!test) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Cache] Cannot write to %s directory, using system temp cache\n", dm->cache_directory ));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[Cache] Cannot write to %s directory, using system temp cache\n", dm->cache_directory ));
 				gf_free(dm->cache_directory);
 				dm->cache_directory = NULL;
 				opt = NULL;
@@ -1879,17 +2121,12 @@
 		}
 		if (test) {
 			gf_fclose(test);
-			gf_delete_file(szTemp);
+			gf_file_delete(szTemp);
 		}
 	}
 
-	opt = cfg ? gf_cfg_get_key(cfg, "Downloader", "MaxRate") : NULL;
 	/*use it in in BYTES per second*/
-	if (opt)
-		dm->limit_data_rate = 1000 * atoi(opt) / 8;
-	else
-		gf_cfg_set_key(cfg, "Downloader", "MaxRate", "0");
-
+	dm->limit_data_rate = 1000 * gf_opts_get_int("core", "maxrate") / 8;
 
 	dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
 	//when rate is limited, use smaller smaller read size
@@ -1897,64 +2134,26 @@
 		dm->read_buf_size = 1024;
 	}
 
-	if (cfg) {
-		opt = gf_cfg_get_key(cfg, "Downloader", "DisableCache");
-		if (!opt) gf_cfg_set_key(cfg, "Downloader", "DisableCache", "no");
-		if (opt && !strcmp(opt, "yes")) dm->disable_cache = GF_TRUE;
-	}
+	dm->disable_cache = gf_opts_get_bool("core", "no-cache");
 
-	dm->allow_offline_cache = GF_FALSE;
-	if (cfg) {
-		opt = gf_cfg_get_key(cfg, "Downloader", "AllowOfflineCache");
-		if (opt && !strcmp(opt, "yes") )
-			dm->allow_offline_cache = GF_TRUE;
-	}
+	dm->allow_offline_cache = gf_opts_get_bool("core", "offline-cache");
 
 	dm->clean_cache = GF_FALSE;
 	dm->allow_broken_certificate = GF_FALSE;
-	if (cfg) {
-		opt = gf_cfg_get_key(cfg, "Downloader", "CleanCache");
-		if (opt) {
-			if (!strcmp(opt, "yes") ) {
-				dm->clean_cache = GF_TRUE;
-				dm->max_cache_size=0;
-				gf_dm_clean_cache(dm);
-			} else if (sscanf(opt, LLU"M", &dm->max_cache_size)==1) {
-				dm->max_cache_size*=1000;
-				dm->max_cache_size*=1000;
-				gf_dm_clean_cache(dm);
-			} else if (sscanf(opt, LLU"K", &dm->max_cache_size)==1) {
-				dm->max_cache_size*=1000;
-				gf_dm_clean_cache(dm);
-			}
-		}
-		opt = gf_cfg_get_key(cfg, "Downloader", "AllowBrokenCertificate");
-		if (!opt) {
-			gf_cfg_set_key(cfg, "Downloader", "AllowBrokenCertificate", "no");
-		} else if (!strcmp(opt, "yes")) {
-			dm->allow_broken_certificate = GF_TRUE;
-		}
-	}
-
-
-	dm->head_timeout = 5000;
-	if (cfg) {
-		opt = gf_cfg_get_key(cfg, "Downloader", "HTTPHeadTimeout");
-		if (opt) {
-			dm->head_timeout = atoi(opt);
-		}
-	}
-	dm->request_timeout = 20000;
-	if (cfg) {
-		opt = gf_cfg_get_key(cfg, "Downloader", "HTTPRequestTimeout");
-		if (opt) {
-			dm->request_timeout = atoi(opt);
+	if ( gf_opts_get_bool("core", "clean-cache")) {
+		dm->clean_cache = GF_TRUE;
+		dm->max_cache_size=0;
+		gf_dm_clean_cache(dm);
+	} else {
+		dm->max_cache_size = gf_opts_get_int("core", "cache-size");
+		if (dm->max_cache_size) {
+			gf_dm_clean_cache(dm);
 		}
 	}
+	dm->allow_broken_certificate = gf_opts_get_bool("core", "broken-cert");
 
 	gf_mx_v( dm->cache_mx );
-	if (default_cache_dir)
-		gf_free(default_cache_dir);
+
 #ifdef GPAC_HAS_SSL
 	dm->ssl_ctx = NULL;
 #endif
@@ -1964,6 +2163,7 @@
 	return dm;
 }
 
+GF_EXPORT
 void gf_dm_set_auth_callback(GF_DownloadManager *dm,
                              Bool (*get_user_password)(void *usr_cbk, const char *site_url, char *usr_name, char *password),
                              void *usr_cbk)
@@ -1987,7 +2187,7 @@
 		GF_PartialDownload * entry = (GF_PartialDownload*)gf_list_get( dm->partial_downloads, 0);
 		gf_list_rem( dm->partial_downloads, 0);
 		assert( entry->filename );
-		gf_delete_file( entry->filename );
+		gf_file_delete( entry->filename );
 		gf_free(entry->filename );
 		entry->filename = NULL;
 		entry->url = NULL;
@@ -2045,7 +2245,6 @@
 	if (dm->ssl_ctx) SSL_CTX_free(dm->ssl_ctx);
 #endif
 	/* Stored elsewhere, no need to free */
-	dm->cfg = NULL;
 	gf_mx_v( dm->cache_mx );
 	gf_mx_del( dm->cache_mx);
 	dm->cache_mx = NULL;
@@ -2056,13 +2255,16 @@
  * Skip ICY metadata from SHOUTCAST or ICECAST streams.
  * Data will be skipped and parsed and sent as a GF_NETIO_Parameter to the user_io,
  * so modules interrested by those streams may use the data
- * \param sess The GF_DownloadSession
- * \param data last data received
- * \param nbBytes The number of bytes contained into data
+\param sess The GF_DownloadSession
+\param data last data received
+\param nbBytes The number of bytes contained into data
  */
 static void gf_icy_skip_data(GF_DownloadSession * sess, const char * data, u32 nbBytes)
 {
-	u32 icy_metaint = sess->icy_metaint;
+	u32 icy_metaint;
+	if (!sess || !data ) return;
+
+	icy_metaint = sess->icy_metaint;
 	assert( icy_metaint > 0 );
 	while (nbBytes) {
 		if (sess->icy_bytes == icy_metaint) {
@@ -2084,10 +2286,10 @@
 					par.name = "icy-meta";
 					par.value = szData;
 					par.sess = sess;
-					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[ICY] Found metainfo in stream=%s, (every %d bytes)\n", szData, icy_metaint));
+					GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[ICY] Found metainfo in stream=%s, (every %d bytes)\n", szData, icy_metaint));
 					gf_dm_sess_user_io(sess, &par);
 				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[ICY] Empty metainfo in stream, (every %d bytes)\n", icy_metaint));
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[ICY] Empty metainfo in stream, (every %d bytes)\n", icy_metaint));
 				}
 				nbBytes -= sess->icy_count;
 				data += sess->icy_count;
@@ -2123,16 +2325,17 @@
 	s32 res;
 	char *te_header, *sep;
 
+	if (!sess || !body_start) return NULL;
 	if (!sess->chunked) return body_start;
 
 	if (sess->nb_left_in_chunk) {
 		if (sess->nb_left_in_chunk > *payload_size) {
 			sess->nb_left_in_chunk -= (*payload_size);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: still %d bytes to get\n", sess->nb_left_in_chunk));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] Chunk encoding: still %d bytes to get\n", sess->nb_left_in_chunk));
 		} else {
 			*payload_size = sess->nb_left_in_chunk;
 			sess->nb_left_in_chunk = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: last bytes in chunk received\n"));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] Chunk encoding: last bytes in chunk received\n"));
 		}
 		*header_size = 0;
 		return body_start;
@@ -2169,13 +2372,13 @@
 		//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_NETWORK, ("[HTTP] First byte in chunk received (%d bytes in packet), new start time %u ms\n", *payload_size, (u32) sess->start_time/1000));
+		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;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: current buffer does not contain enough bytes (%d) to read the size\n", *payload_size));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] Chunk encoding: current buffer does not contain enough bytes (%d) to read the size\n", *payload_size));
 		return NULL;
 	}
 
@@ -2191,16 +2394,20 @@
 		if (sep) sep[0] = ';';
 		*header_size = 0;
 		*payload_size = 0;
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Chunk encoding: fail to read chunk size from buffer %s, aborting\n", body_start));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Chunk encoding: fail to read chunk size from buffer %s, aborting\n", body_start));
 		return NULL;
 	}
 	if (sep) sep[0] = ';';
 	*payload_size = size;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d at UTC "LLD"\n", body_start, 2+strlen(body_start), size, gf_net_get_utc()));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] Chunk Start: Header \"%s\" - header size %d - payload size %d (bytes done %d) at UTC "LLD"\n", body_start, 2+strlen(body_start), size, sess->bytes_done, gf_net_get_utc()));
 
 	te_header[0] = '\r';
-	if (!size) sess->last_chunk_found = GF_TRUE;
+	if (!size)
+		sess->last_chunk_found = GF_TRUE;
+
+	sess->current_chunk_size = size;
+	sess->current_chunk_start = gf_sys_clock_high_res();
 	return te_header+2;
 }
 
@@ -2214,20 +2421,23 @@
 	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 (!runtime) runtime=1;
 
 	sess->bytes_per_sec = (u32) ((1000000 * (u64) sess->bytes_done) / runtime);
 
 	if (sess->chunked) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[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));
+		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));
 	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] bandwidth estimation: download time "LLD" us - bytes %u - rate %u kbps\n", runtime, sess->bytes_done, sess->bytes_per_sec*8/1000));
+		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));
 	}
 }
 
 
-static GFINLINE void gf_dm_data_received(GF_DownloadSession *sess, u8 *payload, u32 payload_size, Bool store_in_init, u32 *rewrite_size)
+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)
 {
 	u32 nbBytes, remaining, hdr_size;
 	u8 *data;
@@ -2242,12 +2452,11 @@
 		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;
+		//first_chunk_in_payload = GF_FALSE;
 		if (!hdr_size && !data) {
 			/* keep the data and wait for the rest */
-			if (sess->remaining_data) gf_free(sess->remaining_data);
 			sess->remaining_data_size = nbBytes;
-			sess->remaining_data = (char *)gf_malloc(nbBytes * sizeof(char));
+			sess->remaining_data = (char *)gf_realloc(sess->remaining_data, nbBytes * sizeof(char));
 			memcpy(sess->remaining_data, payload, nbBytes);
 			payload_size = 0;
 			payload = NULL;
@@ -2283,9 +2492,9 @@
 		sess->bytes_done += nbBytes;
 		dm_sess_update_download_rate(sess, GF_TRUE);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[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", gf_cache_get_url(sess->cache_entry), nbBytes, 8*sess->bytes_per_sec/1000));
 		if (sess->total_size && (sess->bytes_done > sess->total_size)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[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", gf_cache_get_url(sess->cache_entry), sess->bytes_done , sess->total_size ));
 			sess->bytes_done = sess->total_size;
 		}
 
@@ -2302,91 +2511,168 @@
 			par.reply = flush_chunk;
 			gf_dm_sess_user_io(sess, &par);
 		}
-
 	}
 	//and we're done
 	if (sess->total_size && (sess->bytes_done == sess->total_size)) {
-		gf_dm_disconnect(sess, GF_FALSE);
-		par.msg_type = GF_NETIO_DATA_TRANSFERED;
-		par.error = GF_OK;
-
+		u64 run_time;
 		if (sess->use_cache_file) {
 			gf_cache_close_write_cache(sess->cache_entry, sess, GF_TRUE);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK,
+			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);
+		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_NETWORK, ("[HTTP] url %s (%d bytes) downloaded in "LLU" us (%d kbps) (%d us since request - got response in %d us)\n", gf_cache_get_url(sess->cache_entry), sess->bytes_done,
-		                                     gf_sys_clock_high_res() - sess->start_time, 8*sess->bytes_per_sec/1000, sess->total_time_since_req, sess->reply_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 ));
 
 		if (sess->chunked && (payload_size==2))
 			payload_size=0;
 	}
 
-	if (rewrite_size && sess->chunked) {
+	if (rewrite_size && sess->chunked && data && original_payload) {
 		//use memmove since regions overlap
-		memmove(data + *rewrite_size, data, nbBytes);
+		memmove(original_payload + *rewrite_size, data, nbBytes);
 		*rewrite_size += nbBytes;
 	}
 
 	if (!sess->nb_left_in_chunk && remaining) {
 		sess->nb_left_in_chunk = remaining;
 	} else if (payload_size) {
-		gf_dm_data_received(sess, payload, payload_size, store_in_init, rewrite_size);
+		gf_dm_data_received(sess, payload, payload_size, store_in_init, rewrite_size, original_payload);
 	}
 }
 
+static Bool dm_exceeds_cap_rate(GF_DownloadManager * dm)
+{
+	u32 cumul_rate = 0;
+	u32 nb_sess = 0;
+	u32 i, count = gf_list_count(dm->sessions);
+
+	//check if this fits with all other sessions
+	for (i=0; i<count; i++) {
+		GF_DownloadSession * sess = (GF_DownloadSession*)gf_list_get(dm->sessions, i);
+
+		//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 ++;
+	}
+	if ( cumul_rate >= nb_sess * dm->limit_data_rate)
+		return GF_TRUE;
+
+	return GF_FALSE;
+}
+
 
 GF_EXPORT
 GF_Err gf_dm_sess_fetch_data(GF_DownloadSession *sess, char *buffer, u32 buffer_size, u32 *read_size)
 {
 	u32 size;
 	GF_Err e;
-	if (/*sess->cache || */ !buffer || !buffer_size) return GF_BAD_PARAM;
+
+	if (!buffer || !buffer_size) {
+		if (sess->put_state) {
+			sess->put_state = 2;
+			sess->status = GF_NETIO_WAIT_FOR_REPLY;
+			return GF_OK;
+		}
+		return GF_BAD_PARAM;
+	}
 	if (sess->th) return GF_BAD_PARAM;
-	if (sess->status == GF_NETIO_DISCONNECTED) return GF_EOS;
-	if (sess->status > GF_NETIO_DATA_TRANSFERED) 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;
 
 	*read_size = 0;
-	if (sess->status == GF_NETIO_DATA_TRANSFERED) return GF_EOS;
+	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;
+		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;
-		return GF_OK;
+		e = GF_OK;
 	} else if (sess->status < GF_NETIO_DATA_EXCHANGE) {
 		sess->do_requests(sess);
-		return sess->last_error;
+		e = sess->last_error;
 	}
 	/*we're running but we had data previously*/
-	if (sess->init_data) {
+	else if (sess->init_data) {
+		e = GF_OK;
 		if (sess->init_data_size<=buffer_size) {
 			memcpy(buffer, sess->init_data, sizeof(char)*sess->init_data_size);
 			*read_size = sess->init_data_size;
 			gf_free(sess->init_data);
 			sess->init_data = NULL;
+			if (sess->init_data_size==sess->total_size)
+				e = GF_EOS;
 			sess->init_data_size = 0;
 		} else {
 			memcpy(buffer, sess->init_data, sizeof(char)*buffer_size);
 			*read_size = buffer_size;
 			sess->init_data_size -= buffer_size;
-			memcpy(sess->init_data, sess->init_data+buffer_size, sizeof(char)*sess->init_data_size);
+			memmove(sess->init_data, sess->init_data+buffer_size, sizeof(char)*sess->init_data_size);
+			e = GF_OK;
+		}
+	} 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->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;
+			}
+			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);
+			sess->remaining_data_size = 0;
+			*read_size = 0;
+			gf_dm_data_received(sess, (u8 *) buffer, size, GF_FALSE, read_size, buffer);
+			if (!sess->chunked)
+				*read_size = size;
 		}
-		return GF_OK;
 	}
+	sess->active_time += gf_sys_clock_high_res() - sess->in_time;
 
-	e = gf_dm_read_data(sess, buffer, buffer_size, read_size);
-	if (e) return e;
-	size = *read_size;
-	*read_size = 0;
-	gf_dm_data_received(sess, (u8 *) buffer, size, GF_FALSE, read_size);
-	return GF_OK;
+	if (sess->server_mode && (sess->status == GF_NETIO_DATA_EXCHANGE)) {
+		sess->status = GF_NETIO_DATA_TRANSFERED;
+	}
+
+	return e;
 }
 
 GF_EXPORT
-GF_Err gf_dm_sess_get_stats(GF_DownloadSession * sess, const char **server, const char **path, u32 *total_size, u32 *bytes_done, u32 *bytes_per_sec, GF_NetIOStatus *net_status)
+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 (server) *server = sess->server_name;
@@ -2415,55 +2701,76 @@
 {
 	if (!sess) return NULL;
 	if (! sess->cache_entry || sess->needs_cache_reconfig) return NULL;
+	if (!sess->use_cache_file) return NULL;
 	return gf_cache_get_cache_filename(sess->cache_entry);
 }
 
-GF_EXPORT
+#if 0 //unused
+/*!
+ * Tells whether session can be cached on disk.
+ * Typically, when request has no content length, it deserves being streamed an cannot be cached
+ * (ICY or MPEG-streamed content
+\param sess The session
+\param True if a cache can be created
+ */
 Bool gf_dm_sess_can_be_cached_on_disk(const GF_DownloadSession *sess)
 {
 	if (!sess) return GF_FALSE;
 	return gf_cache_get_content_length(sess->cache_entry) != 0;
 }
+#endif
 
 GF_EXPORT
 void gf_dm_sess_abort(GF_DownloadSession * sess)
 {
-	assert(sess);
-	gf_mx_p(sess->mx);
-	gf_dm_disconnect(sess, GF_TRUE);
-	sess->status = GF_NETIO_STATE_ERROR;
-	gf_mx_v(sess->mx);
+	if (sess) {
+		gf_mx_p(sess->mx);
+		gf_dm_disconnect(sess, GF_TRUE);
+		sess->status = GF_NETIO_STATE_ERROR;
+		gf_mx_v(sess->mx);
+	}
 }
+
+#if 0 //unused
+/*!
+\brief gets private data
+ *
+ *Gets private data associated with the session.
+\param sess the download session
+\return the private data
+\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
+ */
 void *gf_dm_sess_get_private(GF_DownloadSession * sess)
 {
 	return sess ? sess->ext : NULL;
 }
 
+/*!
+\brief sets private data
+ *
+ *associate private data with the session.
+\param sess the download session
+\param private_data the private data
+\warning the private_data parameter is reserved for bandwidth statistics per service when used in the GPAC terminal.
+ */
 void gf_dm_sess_set_private(GF_DownloadSession * sess, void *private_data)
 {
 	if (sess) sess->ext = private_data;
 }
-
-/* HTTP(S) stuff*/
-static GFINLINE u32 http_skip_space(char *val)
-{
-	u32 ret = 0;
-	while (val[ret] == ' ') ret+=1;
-	return ret;
-}
+#endif
 
 /*!
  * Sends the HTTP headers
- * \param sess The GF_DownloadSession
- * \param sHTTP buffer containing the request
- * \return GF_OK if everything went fine, the error otherwise
+\param sess The GF_DownloadSession
+\param sHTTP buffer containing the request
+\param GF_OK if everything went fine, the error otherwise
  */
 static GF_Err http_send_headers(GF_DownloadSession *sess, char * sHTTP) {
 	GF_Err e;
 	GF_NETIO_Parameter par;
 	Bool no_cache = GF_FALSE;
 	char range_buf[1024];
-	char pass_buf[1024];
+	char pass_buf[1124];
 	const char *user_agent;
 	const char *url;
 	const char *user_profile;
@@ -2472,6 +2779,7 @@
 	assert (sess->status == GF_NETIO_CONNECTED);
 
 	gf_dm_clear_headers(sess);
+	sess->active_time = 0;
 
 	assert(sess->remaining_data_size == 0);
 
@@ -2493,12 +2801,11 @@
 	if (sess->creds && sess->creds->valid) {
 		sprintf(pass_buf, "Authorization: Basic %s", sess->creds->digest);
 	}
-	if (sess->dm && sess->dm->cfg)
-		user_agent = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserAgent");
-	else
-		user_agent = NULL;
+
+	user_agent = gf_opts_get_key("core", "ua");
 	if (!user_agent) user_agent = GF_DOWNLOAD_AGENT_NAME;
 
+	sess->put_state = 0;
 
 	par.error = GF_OK;
 	par.msg_type = GF_NETIO_GET_METHOD;
@@ -2512,15 +2819,16 @@
 		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;
+
+		if (!strcmp(par.name, "PUT") || !strcmp(par.name, "POST"))
+			sess->put_state = 1;
 	} else {
 		sess->http_read_type = GET;
 	}
 
 	url = (sess->proxy_enabled==1) ? sess->orig_url : sess->remote_path;
-	if (sess->dm && sess->dm->cfg)
-		param_string = gf_cfg_get_key(sess->dm->cfg, "Downloader", "ParamString");
-	else
-		param_string = NULL;
+
+	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" ,
@@ -2551,6 +2859,11 @@
 		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;
+		else if (!stricmp(par.name, "Transfer-Encoding")) {
+			if (!stricmp(par.value, "chunked"))
+				sess->chunked = GF_TRUE;
+		}
+
 		if (!par.msg_type) break;
 	}
 	if (!has_agent) {
@@ -2571,12 +2884,7 @@
 		no_cache = GF_TRUE;
 	}
 	if (!has_language) {
-		const char *opt;
-
-		if (sess->dm && sess->dm->cfg)
-			opt = gf_cfg_get_key(sess->dm->cfg, "Systems", "Language2CC");
-		else
-			opt = NULL;
+		const char *opt = gf_opts_get_key("core", "lang");
 		if (opt) {
 			strcat(sHTTP, "Accept-Language: ");
 			strcat(sHTTP, opt);
@@ -2596,24 +2904,18 @@
 
 	/*check if we have personalization info*/
 	send_profile = GF_FALSE;
-	if (sess->dm && sess->dm->cfg)
-		user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfileID");
-	else
-		user_profile = NULL;
+	user_profile = gf_opts_get_key("core", "user-profileid");
+
 	if (user_profile) {
 		strcat(sHTTP, "X-UserProfileID: ");
 		strcat(sHTTP, user_profile);
 		strcat(sHTTP, "\r\n");
-	} else {
-		if (sess->dm && sess->dm->cfg)
-			user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfile");
-		else
-			user_profile = NULL;
-		if (user_profile) {
-			FILE *profile = gf_fopen(user_profile, "rt");
+	} 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)) {
+			FILE *profile = gf_fopen(user_profile, "rb");
 			if (profile) {
-				gf_fseek(profile, 0, SEEK_END);
-				par.size = (u32) gf_ftell(profile);
+				par.size = (u32) gf_fsize(profile);
 				gf_fclose(profile);
 				sprintf(range_buf, "Content-Length: %d\r\n", par.size);
 				strcat(sHTTP, range_buf);
@@ -2629,6 +2931,9 @@
 		if (par.data && par.size) {
 			sprintf(range_buf, "Content-Length: %d\r\n", par.size);
 			strcat(sHTTP, range_buf);
+		} else {
+			par.data = NULL;
+			par.size = 0;
 		}
 	}
 
@@ -2640,7 +2945,7 @@
 
 		/*cached headers are not appended in POST*/
 		if (!no_cache && !sess->disable_cache && (GF_OK < gf_cache_append_http_headers( sess->cache_entry, sHTTP)) ) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("Cache Entry : %p, FAILED to append cache directives.", sess->cache_entry));
 		}
 	}
 
@@ -2653,25 +2958,25 @@
 		if (par.data) {
 			memcpy(tmp_buf+len, par.data, par.size);
 			tmp_buf[len+par.size] = 0;
+
+			sess->put_state = 2;
 		} else {
 			FILE *profile;
-			assert( sess->dm );
-			assert( sess->dm->cfg );
-			user_profile = gf_cfg_get_key(sess->dm->cfg, "Downloader", "UserProfile");
+			user_profile = gf_opts_get_key("core", "user-profile");
 			assert (user_profile);
 			profile = gf_fopen(user_profile, "rt");
 			if (profile) {
-				s32 read = (s32) fread(tmp_buf+len, sizeof(char), par.size, profile);
+				s32 read = (s32) gf_fread(tmp_buf+len, par.size, profile);
 				if ((read<0) || (read< (s32) par.size)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK,
-					       ("Error while loading Downloader/UserProfile, size=%d, should be %d.", read, par.size));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP,
+					       ("[HTTP] Error while loading UserProfile, size=%d, should be %d.", read, par.size));
 					for (; read < (s32) par.size; read++) {
 						tmp_buf[len + read] = 0;
 					}
 				}
 				gf_fclose(profile);
 			} else {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("Error while loading Profile file %s.", user_profile));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] Error while loading Profile file %s.", user_profile));
 			}
 		}
 
@@ -2680,15 +2985,12 @@
 
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
-			u32 writelen = len+par.size;
-			e = GF_OK;
-			if (writelen != SSL_write(sess->ssl, tmp_buf, writelen))
-				e = GF_IP_NETWORK_FAILURE;
+			e = gf_ssl_write(sess->ssl, tmp_buf, len+par.size);
 		} else
 #endif
 			e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request at UTC "LLD" %s\n\n", gf_net_get_utc(), tmp_buf));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Sending request at UTC "LLD" %s\n\n", gf_net_get_utc(), tmp_buf));
 		gf_free(tmp_buf);
 	} else {
 		u32 len = (u32) strlen(sHTTP);
@@ -2698,18 +3000,16 @@
 
 #ifdef GPAC_HAS_SSL
 		if (sess->ssl) {
-			e = GF_OK;
-			if (len != SSL_write(sess->ssl, sHTTP, len))
-				e = GF_IP_NETWORK_FAILURE;
+			e = gf_ssl_write(sess->ssl, sHTTP, len);
 		} else
 #endif
 			e = gf_sk_send(sess->sock, sHTTP, len);
 
 #ifndef GPAC_DISABLE_LOG
 		if (e) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error sending request %s\n", gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Error sending request %s\n", gf_error_to_string(e) ));
 		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request at UTC "LLU" %s\n\n", gf_net_get_utc(), sHTTP));
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Sending request at UTC "LLU" %s\n\n", gf_net_get_utc(), sHTTP));
 		}
 #endif
 	}
@@ -2721,50 +3021,29 @@
 		return e;
 	}
 
-	sess->status = GF_NETIO_WAIT_FOR_REPLY;
 	gf_dm_sess_notify_state(sess, GF_NETIO_WAIT_FOR_REPLY, GF_OK);
+	if (sess->put_state==1) {
+		sess->status = GF_NETIO_DATA_TRANSFERED;
+	} else {
+		sess->status = GF_NETIO_WAIT_FOR_REPLY;
+	}
 	return GF_OK;
 }
 
 
-
-static Bool dm_exceeds_cap_rate(GF_DownloadManager * dm)
-{
-	u32 cumul_rate = 0;
-	u32 nb_sess = 0;
-	u32 i, count = gf_list_count(dm->sessions);
-
-	//check if this fits with all other sessions
-	for (i=0; i<count; i++) {
-		GF_DownloadSession * sess = (GF_DownloadSession*)gf_list_get(dm->sessions, i);
-
-		//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 ++;
-	}
-	if ( cumul_rate >= nb_sess * dm->limit_data_rate)
-		return GF_TRUE;
-
-	return GF_FALSE;
-}
-
 /*!
  * Parse the remaining part of body
- * \param sess The session
- * \param sHTTP the data buffer
- * \return The error code if any
+\param sess The session
+\param sHTTP the data buffer
+\param The error code if any
  */
 static GF_Err http_parse_remaining_body(GF_DownloadSession * sess, char * sHTTP)
 {
-	u32 size;
 	GF_Err e;
 	u32 buf_size = sess->dm ? sess->dm->read_buf_size : GF_DOWNLOAD_BUFFER_SIZE;
 
 	while (1) {
-		u32 remaining_data_size;
+		u32 remaining_data_size, size=0;
 		if (sess->status>=GF_NETIO_DISCONNECTED)
 			return GF_REMOTE_SERVICE_ERROR;
 
@@ -2778,19 +3057,18 @@
 		//the data remaining from the last buffer (i.e size for chunk that couldn't be read because the buffer does not contain enough bytes)
 		if (sess->remaining_data && sess->remaining_data_size) {
 			if (sess->remaining_data_size >= buf_size) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] No HTTP chunk header found for %d bytes, assuming broken chunk transfer and aborting\n", sess->remaining_data_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;
 			}
 			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))) {
 				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_NETWORK, ("[HTTP] Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
+				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);
 			}
 			return GF_OK;
@@ -2800,7 +3078,7 @@
 			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);
+					gf_dm_data_received(sess, (u8 *) sHTTP, size, GF_FALSE, NULL, NULL);
 				if ( ( (len == 0) && sess->use_cache_file)
 				        /*ivica patch*/
 				        || (size==0)
@@ -2809,7 +3087,7 @@
 					// HTTP 1.1 without content length...
 					gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
 					assert(sess->server_name);
-					GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Disconnected from %s: %s\n", sess->server_name, gf_error_to_string(e)));
 					if (sess->use_cache_file)
 						gf_cache_set_content_length(sess->cache_entry, sess->bytes_done);
 					e = GF_OK;
@@ -2822,20 +3100,18 @@
 		}
 
 		remaining_data_size = sess->remaining_data_size;
-		if (sess->remaining_data && sess->remaining_data_size) {
-			gf_free(sess->remaining_data);
-			sess->remaining_data = NULL;
-			sess->remaining_data_size = 0;
-		}
+		sess->remaining_data_size = 0;
+
 		sHTTP[size + remaining_data_size] = 0;
 
-		gf_dm_data_received(sess, (u8 *) sHTTP, size + remaining_data_size, GF_FALSE, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP, size + remaining_data_size, GF_FALSE, NULL, NULL);
 
 		/*socket empty*/
 		if (size < buf_size) {
 			return GF_OK;
 		}
 	}
+	return GF_OK;
 }
 
 static void notify_headers(GF_DownloadSession *sess, char * sHTTP, s32 bytesRead, s32 BodyStart)
@@ -2868,8 +3144,8 @@
 
 /*!
  * Waits for the response HEADERS, parse the information... and so on
- * \param sess The session
- * \param sHTTP the data buffer
+\param sess The session
+\param sHTTP the data buffer
  */
 static GF_Err wait_for_header_and_parse(GF_DownloadSession *sess, char * sHTTP)
 {
@@ -2877,6 +3153,7 @@
 	s32 bytesRead, BodyStart;
 	u32 res, i, buf_size;
 	s32 LinePos, Pos;
+	u32 method=0;
 	u32 rsp_code, ContentLength, first_byte, last_byte, total_size, range, no_range;
 	Bool connection_closed = GF_FALSE;
 	char buf[1025];
@@ -2884,15 +3161,20 @@
 	GF_Err e;
 	char * new_location;
 	const char * mime_type;
-	assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
+
+
+	if (sess->server_mode) {
+		assert( sess->status == GF_NETIO_CONNECTED );
+	} else {
+		assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
+		if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
+			sess->use_cache_file = sess->dm->disable_cache ? GF_FALSE : GF_TRUE;
+		}
+	}
 	bytesRead = res = 0;
 	new_location = NULL;
-	if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
-		sess->use_cache_file = GF_TRUE;
-	}
 
 	if (sess->from_cache_only) {
-		GF_NETIO_Parameter par;
 		sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 		sess->rsp_hdr_size = 0;
 		sess->total_size = sess->bytes_done = gf_cache_get_content_length(sess->cache_entry);
@@ -2913,16 +3195,18 @@
 	sess->chunked = GF_FALSE;
 	sess->chunk_run_time = 0;
 	sess->last_chunk_found = GF_FALSE;
-	gf_sk_reset(sess->sock);
+//	gf_sk_reset(sess->sock);
 	sHTTP[0] = 0;
-	
+
 	while (1) {
 		e = gf_dm_read_data(sess, sHTTP + bytesRead, buf_size - bytesRead, &res);
 		switch (e) {
 		case GF_IP_NETWORK_EMPTY:
 			if (!bytesRead) {
-				if (gf_sys_clock_high_res() - sess->request_start_time > 1000 * sess->dm->request_timeout) {
-					sess->last_error = GF_IP_NETWORK_EMPTY;
+				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;
 					sess->status = GF_NETIO_STATE_ERROR;
 					return GF_IP_NETWORK_EMPTY;
 				}
@@ -2936,7 +3220,13 @@
 				/* Some servers such as shoutcast directly close connection if HEAD or an unknown method is issued */
 				sess->server_only_understand_get = GF_TRUE;
 			}
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connection closed by server when getting %s - retrying\n", sess->remote_path));
+			if (sess->server_mode) {
+				sess->last_error = GF_IP_CONNECTION_CLOSED;
+				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);
 
 			if (sess->num_retry)
@@ -2975,7 +3265,7 @@
 		BodyStart = bytesRead;
 
 	sHTTP[BodyStart-1] = 0;
-	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] %s\n\n", sHTTP));
+	GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] %s\n\n", sHTTP));
 
 	sess->reply_time = (u32) (gf_sys_clock_high_res() - sess->request_start_time);
 	sess->rsp_hdr_size = BodyStart;
@@ -2983,22 +3273,51 @@
 	LinePos = gf_token_get_line(sHTTP, 0, bytesRead, buf, 1024);
 	Pos = gf_token_get(buf, 0, " \t\r\n", comp, 400);
 
-	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;
+	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)) {
+			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);
+
 	}
-	rsp_code = (u32) atoi(comp);
-	/*Pos = */gf_token_get(buf, Pos, " \r\n", comp, 400);
 
 	no_range = range = ContentLength = first_byte = last_byte = total_size = 0;
 	/* parse headers*/
@@ -3030,99 +3349,120 @@
 
 		if (sep) sep[0]=':';
 		if (hdr_sep) hdr_sep[0] = '\r';
-	}
 
-	//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);
-
-		if (!stricmp(hdrp->name, "Content-Length") ) {
-			ContentLength = (u32) atoi(hdrp->value);
+		if (sess->server_mode) {
+			if (!stricmp(hdrp->name, "Transfer-Encoding") && !stricmp(hdrp->value, "chunked"))
+				sess->chunked = GF_TRUE;
+		}
+	}
 
-			if (rsp_code<300)
-				gf_cache_set_content_length(sess->cache_entry, ContentLength);
+	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);
+
+			if (!stricmp(hdrp->name, "Content-Length") ) {
+				ContentLength = (u32) atoi(hdrp->value);
+
+				if (rsp_code<300)
+					gf_cache_set_content_length(sess->cache_entry, ContentLength);
+
+			}
+			else if (!stricmp(hdrp->name, "Content-Type")) {
+				char *mime = gf_strdup(hdrp->value);
+				while (1) {
+					u32 len = (u32) strlen(mime);
+					char c = len ? mime[len-1] : 0;
+					if ((c=='\r') || (c=='\n')) {
+						mime[len-1] = 0;
+					} else {
+						break;
+					}
+				}
+				val = strchr(mime, ';');
+				if (val) val[0] = 0;
 
-		}
-		else if (!stricmp(hdrp->name, "Content-Type")) {
-			char *mime = gf_strdup(hdrp->value);
-			while (1) {
-				u32 len = (u32) strlen(mime);
-				char c = len ? mime[len-1] : 0;
-				if ((c=='\r') || (c=='\n')) {
-					mime[len-1] = 0;
-				} else {
-					break;
+				strlwr(mime);
+				if (rsp_code<300) {
+					if (sess->cache_entry) {
+						gf_cache_set_mime_type(sess->cache_entry, mime);
+					} else {
+						sess->mime_type = mime;
+						mime = NULL;
+					}
 				}
+				if (mime) gf_free(mime);
 			}
-			val = strchr(mime, ';');
-			if (val) val[0] = 0;
+			else if (!stricmp(hdrp->name, "Content-Range")) {
+				if (!strncmp(hdrp->value, "bytes", 5)) {
+					val = hdrp->value + 5;
+					if (val[0] == ':') val += 1;
+					while (val[0] == ' ') val += 1;
 
-			strlwr(mime);
-			if (rsp_code<300) {
-				if (sess->cache_entry) {
-					gf_cache_set_mime_type(sess->cache_entry, mime);
-				} else {
-					sess->mime_type = mime;
-					mime = NULL;
+					if (val[0] == '*') {
+						sscanf(val, "*/%u", &total_size);
+					} else {
+						sscanf(val, "%u-%u/%u", &first_byte, &last_byte, &total_size);
+					}
 				}
 			}
-			if (mime) gf_free(mime);
-		}
-		else if (!stricmp(hdrp->name, "Content-Range")) {
-			if (!strncmp(hdrp->value, "bytes", 5)) {
-				val = hdrp->value + 5;
-				if (val[0] == ':') val += 1;
-				val += http_skip_space(val);
-				if (val[0] == '*') {
-					sscanf(val, "*/%u", &total_size);
-				} else {
-					sscanf(val, "%u-%u/%u", &first_byte, &last_byte, &total_size);
+			else if (!stricmp(hdrp->name, "Accept-Ranges")) {
+				if (strstr(hdrp->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) ) {
+				/* 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);
 				}
 			}
-		}
-		else if (!stricmp(hdrp->name, "Accept-Ranges")) {
-			if (strstr(hdrp->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) ) {
-			/* 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);
+			else if (!stricmp(hdrp->name, "Cache-Control")) {
+				if (strstr(hdrp->value, "no-store")) {
+					cache_no_store = GF_TRUE;
+				}
 			}
+			else if (!stricmp(hdrp->name, "ETag")) {
+				if (rsp_code<300)
+					gf_cache_set_etag_on_server(sess->cache_entry, hdrp->value);
+			}
+			else if (!stricmp(hdrp->name, "Last-Modified")) {
+				if (rsp_code<300)
+					gf_cache_set_last_modified_on_server(sess->cache_entry, hdrp->value);
+			}
+			else if (!stricmp(hdrp->name, "Transfer-Encoding")) {
+				if (!stricmp(hdrp->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(hdrp->name, "Connection") ) {
+				if (strstr(hdrp->value, "close"))
+					connection_closed = GF_TRUE;
+			}
+
+			if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
 		}
-		else if (!stricmp(hdrp->name, "Cache-Control")) {
-		}
-		else if (!stricmp(hdrp->name, "ETag")) {
-			if (rsp_code<300)
-				gf_cache_set_etag_on_server(sess->cache_entry, hdrp->value);
-		}
-		else if (!stricmp(hdrp->name, "Last-Modified")) {
-			if (rsp_code<300)
-				gf_cache_set_last_modified_on_server(sess->cache_entry, hdrp->value);
-		}
-		else if (!stricmp(hdrp->name, "Transfer-Encoding")) {
-			if (!stricmp(hdrp->value, "chunked"))
-				sess->chunked = GF_TRUE;
-		}
-		else if (!stricmp(hdrp->name, "X-UserProfileID") ) {
-			if (sess->dm && sess->dm->cfg)
-				gf_cfg_set_key(sess->dm->cfg, "Downloader", "UserProfileID", hdrp->value);
-		}
-		else if (!stricmp(hdrp->name, "Connection") ) {
-			if (strstr(hdrp->value, "close"))
-				connection_closed = GF_TRUE;
+
+		if (cache_no_store) {
+			if (sess->cache_entry && !ContentLength && (rsp_code<300) ) {
+				sess->use_cache_file = GF_FALSE;
+				gf_cache_remove_session_from_cache_entry(sess->cache_entry, sess);
+				sess->cache_entry = NULL;
+			}
 		}
 
-		if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
-	}
-	if (no_range) first_byte = 0;
+		if (no_range) first_byte = 0;
 
-	gf_cache_set_headers_processed(sess->cache_entry);
+
+		gf_cache_set_headers_processed(sess->cache_entry);
+	}
 
 	par.msg_type = GF_NETIO_PARSE_REPLY;
 	par.error = GF_OK;
@@ -3164,6 +3504,22 @@
 			sess->connection_close = GF_TRUE;
 		}
 	}
+	if (sess->server_mode) {
+		if (ContentLength) {
+			par.data = sHTTP + BodyStart;
+			par.size = ContentLength;
+		} else if (BodyStart < (s32) bytesRead) {
+			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);
+		}
+		par.reply = method;
+		gf_dm_sess_user_io(sess, &par);
+		sess->status = GF_NETIO_DATA_TRANSFERED;
+		return GF_OK;
+	}
 	//remember if we can keep the session alive after the transfer is done
 	sess->connection_close = connection_closed;
 
@@ -3197,12 +3553,13 @@
 		/*reset and reconnect*/
 		gf_dm_disconnect(sess, GF_TRUE);
 		sess->status = GF_NETIO_SETUP;
-		e = gf_dm_sess_setup_from_url(sess, new_location);
+		e = gf_dm_sess_setup_from_url(sess, new_location, GF_FALSE);
 		if (e) {
 			sess->status = GF_NETIO_STATE_ERROR;
 			sess->last_error = e;
 			gf_dm_sess_notify_state(sess, sess->status, e);
 		}
+		gf_free(new_location);
 		return e;
 	case 304:
 	{
@@ -3218,15 +3575,15 @@
 			const char * filename;
 			FILE * f;
 			filename = gf_cache_get_cache_filename(sess->cache_entry);
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending data to modules from %s...\n", filename));
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] Sending data to modules from %s...\n", filename));
 			f = gf_fopen(filename, "rb");
 			assert(filename);
 			if (!f) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] FAILED to open cache file %s for reading contents !\n", filename));
+				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);
 				sess->status = GF_NETIO_SETUP;
-				e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+				e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 				sess->total_size = gf_cache_get_cache_filesize(sess->cache_entry);
 				if (e) {
 					sess->status = GF_NETIO_STATE_ERROR;
@@ -3246,9 +3603,9 @@
 			if (! (sess->flags & GF_NETIO_SESSION_NOT_THREADED) || sess->force_data_write_callback) {
 				char file_cache_buff[16544];
 				s32 read = 0;
-				u32 total_size = gf_cache_get_cache_filesize(sess->cache_entry);
+				total_size = gf_cache_get_cache_filesize(sess->cache_entry);
 				do {
-					read = (s32) fread(file_cache_buff, sizeof(char), 16384, f);
+					read = (s32) gf_fread(file_cache_buff, 16384, f);
 					if (read > 0) {
 						sess->bytes_done += read;
 						sess->total_size = total_size;
@@ -3263,7 +3620,7 @@
 				} while ( read > 0);
 			}
 			gf_fclose(f);
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] all data has been sent to modules from %s.\n", filename));
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] all data has been sent to modules from %s.\n", filename));
 		}
 		/* Cache file is the most recent */
 		sess->status = GF_NETIO_DATA_TRANSFERED;
@@ -3289,7 +3646,7 @@
 		}
 		gf_dm_disconnect(sess, GF_FALSE);
 		sess->status = GF_NETIO_SETUP;
-		e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+		e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 		if (e) {
 			sess->status = GF_NETIO_STATE_ERROR;
 			sess->last_error = e;
@@ -3302,7 +3659,7 @@
 		gf_dm_sess_user_io(sess, &par);
 		if ((BodyStart < (s32) bytesRead)) {
 			sHTTP[bytesRead] = 0;
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Failure: %s\n", sHTTP + BodyStart));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_HTTP, ("[HTTP] Failure - body: %s\n", sHTTP + BodyStart));
 		}
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
 		e = GF_URL_ERROR;
@@ -3326,8 +3683,8 @@
 			gf_dm_disconnect(sess, GF_FALSE);
 			sess->status = GF_NETIO_SETUP;
 			sess->server_only_understand_get = GF_TRUE;
-			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("Method not supported, try with GET.\n"));
-			e = gf_dm_sess_setup_from_url(sess, sess->orig_url);
+			GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("Method not supported, try with GET.\n"));
+			e = gf_dm_sess_setup_from_url(sess, sess->orig_url, GF_FALSE);
 			if (e) {
 				sess->status = GF_NETIO_STATE_ERROR;
 				sess->last_error = e;
@@ -3349,6 +3706,12 @@
 			sess->status = GF_NETIO_SETUP;
 			return GF_OK;
 		}
+	case 204:
+		gf_dm_sess_user_io(sess, &par);
+		notify_headers(sess, sHTTP, bytesRead, BodyStart);
+		e = GF_EOS;
+		goto exit;
+
 	default:
 		gf_dm_sess_user_io(sess, &par);
 		notify_headers(sess, sHTTP, bytesRead, BodyStart);
@@ -3378,11 +3741,11 @@
 		sess->use_cache_file = GF_FALSE;
 	}
 
-#ifndef GPAC_DISABLE_LOGS
+#ifndef GPAC_DISABLE_LOG
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error processing rely from %s: %s\n", sess->server_name, gf_error_to_string(e) ) );
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP] Error processing rely from %s: %s\n", sess->server_name, gf_error_to_string(e) ) );
 	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Reply processed from %s\n", sess->server_name ) );
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_HTTP, ("[HTTP] Reply processed from %s\n", sess->server_name ) );
 	}
 #endif
 
@@ -3390,7 +3753,7 @@
 	if (e) goto exit;
 	if (sess->icy_metaint != 0) {
 		assert( ! sess->use_cache_file );
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] ICY protocol detected\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_HTTP, ("[HTTP] ICY protocol detected\n"));
 		if (mime_type && !stricmp(mime_type, "video/nsv")) {
 			gf_cache_set_mime_type(sess->cache_entry, "audio/aac");
 		}
@@ -3413,7 +3776,7 @@
 		if (sess->use_cache_file && sess->http_read_type == GET ) {
 			e = gf_cache_open_write_cache(sess->cache_entry, sess);
 			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ( "[CACHE] Failed to open cache, error=%d\n", e));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ( "[CACHE] Failed to open cache, error=%d\n", e));
 				goto exit;
 			}
 		}
@@ -3428,16 +3791,23 @@
 		sess->init_data_size = 0;
 		sess->init_data = NULL;
 
-		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP + BodyStart, bytesRead - BodyStart, GF_TRUE, NULL, NULL);
 	}
 exit:
 	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[HTTP] Error parsing reply: %s for URL %s\nReply was:\n%s\n", gf_error_to_string(e), sess->orig_url, sHTTP ));
+		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 ));
+		} 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);
-		sess->status = GF_NETIO_STATE_ERROR;
+		if (connection_closed)
+			sess->status = GF_NETIO_STATE_ERROR;
+		else
+			sess->status = GF_NETIO_DATA_TRANSFERED;
 		sess->last_error = e;
 		gf_dm_sess_notify_state(sess, sess->status, e);
 		return e;
@@ -3448,7 +3818,7 @@
 
 /**
  * Default performing behaviour
- * \param sess The session
+\param sess The session
  */
 void http_do_requests(GF_DownloadSession *sess)
 {
@@ -3470,12 +3840,24 @@
 
 	switch (sess->status) {
 	case GF_NETIO_CONNECTED:
-		http_send_headers(sess, sHTTP);
+		if (sess->server_mode) {
+			wait_for_header_and_parse(sess, sHTTP);
+		} else {
+			http_send_headers(sess, sHTTP);
+		}
 		break;
 	case GF_NETIO_WAIT_FOR_REPLY:
-		wait_for_header_and_parse(sess, sHTTP);
+		if (sess->server_mode) {
+			http_send_headers(sess, sHTTP);
+		} else {
+			wait_for_header_and_parse(sess, sHTTP);
+		}
 		break;
 	case GF_NETIO_DATA_EXCHANGE:
+		if (sess->server_mode) {
+			sess->status = GF_NETIO_CONNECTED;
+			break;
+		}
 		/*session has been reassigned, resend data retrieved in first GET reply to user but don't write to cache*/
 		if (sess->reassigned) {
 
@@ -3510,9 +3892,9 @@
 
 	/*handle service message*/
 	if (param->msg_type == GF_NETIO_DATA_EXCHANGE) {
-		s32 written = (u32) gf_fwrite( param->data, sizeof(char), param->size, f);
+		s32 written = (u32) gf_fwrite( param->data, param->size, f);
 		if (written != param->size) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("Failed to write data on disk\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("Failed to write data on disk\n"));
 		}
 	}
 }
@@ -3521,8 +3903,7 @@
 GF_Err gf_dm_wget(const char *url, const char *filename, u64 start_range, u64 end_range, char **redirected_url)
 {
 	GF_Err e;
-	GF_DownloadManager * dm = NULL;
-	dm = gf_dm_new(NULL);
+	GF_DownloadManager * dm = gf_dm_new(NULL);
 	if (!dm)
 		return GF_OUT_OF_MEM;
 	e = gf_dm_wget_with_cache(dm, url, filename, start_range, end_range, redirected_url);
@@ -3540,7 +3921,7 @@
 		return GF_BAD_PARAM;
 	f = gf_fopen(filename, "wb");
 	if (!f) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to open file %s for write.\n", filename));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[WGET] Failed to open file %s for write.\n", filename));
 		return GF_IO_ERR;
 	}
 	dnload = gf_dm_sess_new_simple(dm, (char *)url, GF_NETIO_SESSION_NOT_THREADED, &wget_NetIO, f, &e);
@@ -3567,7 +3948,18 @@
 	return e;
 }
 
-GF_EXPORT
+#if 0 //unused
+
+/*
+\brief fetches remote file in memory
+ *
+ *Fetches remote file in memory.
+\param url the data to fetch
+\param out_data output data (allocated by function)
+\param out_size output data size
+\param out_mime if not NULL, pointer will contain the mime type (allocated by function)
+\return error code if any
+ */
 GF_Err gf_dm_get_file_memory(const char *url, char **out_data, u32 *out_size, char **out_mime)
 {
 	GF_Err e;
@@ -3578,16 +3970,16 @@
 
 	if (!url || !out_data || !out_size)
 		return GF_BAD_PARAM;
-	f = gf_temp_file_new(&f_fn);
+	f = gf_file_temp(&f_fn);
 	if (!f) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[WGET] Failed to create temp file for write.\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[WGET] Failed to create temp file for write.\n"));
 		return GF_IO_ERR;
 	}
 
 	dm = gf_dm_new(NULL);
 	if (!dm) {
 		gf_fclose(f);
-		gf_delete_file(f_fn);
+		gf_file_delete(f_fn);
 		return GF_OUT_OF_MEM;
 	}
 
@@ -3595,7 +3987,7 @@
 	if (!dnload) {
 		gf_dm_del(dm);
 		gf_fclose(f);
-		gf_delete_file(f_fn);
+		gf_file_delete(f_fn);
 		return GF_BAD_PARAM;
 	}
 	dnload->use_cache_file = GF_FALSE;
@@ -3607,12 +3999,12 @@
 		e = gf_cache_close_write_cache(dnload->cache_entry, dnload, e == GF_OK);
 
 	if (!e) {
-		u32 size = (u32) ftell(f);
+		u32 size = (u32) gf_ftell(f);
 		s32 read;
 		*out_size = size;
 		*out_data = (char*)gf_malloc(sizeof(char)* ( 1 + size));
-		fseek(f, 0, SEEK_SET);
-		read = (s32) fread(*out_data, 1, size, f);
+		gf_fseek(f, 0, SEEK_SET);
+		read = (s32) gf_fread(*out_data, size, f);
 		if (read != size) {
 			gf_free(*out_data);
 			e = GF_IO_ERR;
@@ -3625,12 +4017,13 @@
 		}
 	}
 	gf_fclose(f);
-	gf_delete_file(f_fn);
+	gf_file_delete(f_fn);
 	gf_free(f_fn);
 	gf_dm_sess_del(dnload);
 	gf_dm_del(dm);
 	return e;
 }
+#endif
 
 GF_EXPORT
 const char *gf_dm_sess_get_resource_name(GF_DownloadSession *dnload)
@@ -3638,18 +4031,40 @@
 	return dnload ? dnload->orig_url : NULL;
 }
 
+
+#if 0 //unused
+/*!
+\brief Get session original resource url
+ *
+ *Returns the original resource URL before any redirection associated with the session
+\param sess the download session
+\return the associated URL
+ */
 const char *gf_dm_sess_get_original_resource_name(GF_DownloadSession *dnload)
 {
 	if (dnload) return dnload->orig_url_before_redirect ? dnload->orig_url_before_redirect : dnload->orig_url;
 	return NULL;
 }
 
+/*!
+\brief fetch session status
+ *
+ *Fetch the session current status
+\param sess the download session
+\return the session status*/
 u32 gf_dm_sess_get_status(GF_DownloadSession *dnload)
 {
 	return dnload ? dnload->status : GF_NETIO_STATE_ERROR;
 }
 
-GF_EXPORT
+
+/*!
+\brief Reset session
+ *
+ *Resets the session for new processing of the same url
+\param sess the download session
+\return error code if any
+ */
 GF_Err gf_dm_sess_reset(GF_DownloadSession *sess)
 {
 	if (!sess) return GF_BAD_PARAM;
@@ -3664,10 +4079,18 @@
 	sess->total_size = 0;
 	sess->start_time = 0;
 	sess->start_time_utc = 0;
+	sess->max_chunk_size = 0;
+	sess->max_chunk_bytes_per_sec = 0;
 	return GF_OK;
 }
 
-GF_EXPORT
+/*!
+ * Get a range of a cache entry file
+\param sess The session
+\param startOffset The first byte of the request to get
+\param endOffset The last byte of request to get
+\param The temporary name for the file created to have a range of the file
+ */
 const char * gf_cache_get_cache_filename_range( const GF_DownloadSession * sess, u64 startOffset, u64 endOffset ) {
 	u32 i, count;
 	if (!sess || !sess->dm || endOffset < startOffset)
@@ -3698,13 +4121,13 @@
 		snprintf(newFilename, maxLen, "%s " LLU LLU, orig, startOffset, endOffset);
 		fw = gf_fopen(newFilename, "wb");
 		if (!fw) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open partial cache file %s for write\n", newFilename));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[CACHE] Cannot open partial cache file %s for write\n", newFilename));
 			gf_free( newFilename );
 			return NULL;
 		}
 		fr = gf_fopen(orig, "rb");
 		if (!fr) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot open full cache file %s\n", orig));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[CACHE] Cannot open full cache file %s\n", orig));
 			gf_free( newFilename );
 			gf_fclose( fw );
 		}
@@ -3715,17 +4138,17 @@
 			total = endOffset - startOffset;
 			read = gf_fseek(fr, startOffset, SEEK_SET);
 			if (read != startOffset) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[CACHE] Cannot seek at right start offset in %s\n", orig));
+				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[CACHE] Cannot seek at right start offset in %s\n", orig));
 				gf_fclose( fr );
 				gf_fclose( fw );
 				gf_free( newFilename );
 				return NULL;
 			}
 			do {
-				read = fread(copyBuff, sizeof(char), MIN(sizeof(copyBuff), (size_t)  total), fr);
+				read = gf_fread(copyBuff, MIN(sizeof(copyBuff), (size_t)  total), fr);
 				if (read > 0) {
 					total-= read;
-					write = gf_fwrite(copyBuff, sizeof(char), (size_t) read, fw);
+					write = gf_fwrite(copyBuff, (size_t) read, fw);
 					if (write != read) {
 						/* Something bad happened */
 						gf_fclose( fw );
@@ -3759,57 +4182,19 @@
 	}
 }
 
-GF_EXPORT
+/*!
+ * Reassigns session flags and callbacks. This is only possible if the session is not threaded.
+\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 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 0
-	/*if the user requests non-cached (eg callback-sent) data, but the session was configured to use file, we need to copy back existing
-	data to the session init_data */
-	if (sess->use_cache_file && (flags & GF_NETIO_SESSION_NOT_CACHED)) {
-		if (sess->cache_entry) {
-			FILE *fptr = gf_cache_get_file_pointer(sess->cache_entry);
-			if (fptr) {
-				gf_fseek(fptr, 0, SEEK_END);
-				sess->init_data_size = (u32) gf_ftell(fptr);
-				gf_fseek(fptr, 0, SEEK_SET);
-				if (sess->init_data) gf_free(sess->init_data);
-				sess->init_data = gf_malloc(sess->init_data_size);
-				sess->init_data_size = fread(sess->init_data, 1, sess->init_data_size, fptr);
-				gf_cache_close_write_cache(sess->cache_entry, sess, 0);
-			}
-			gf_dm_remove_cache_entry_from_session(sess);
-			sess->cache_entry = NULL;
-		}
-		sess->use_cache_file = 0;
-	}
-#endif
-
-
-#if 0
-	/*the case where the user wants file but the session is configured as live is simply ignored*/
-	else if (!sess->use_cache_file && (sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
-		sess->use_cache_file = 1;
-		gf_dm_configure_cache(sess);
-
-		if (sess->http_read_type == GET ) {
-			e = gf_cache_open_write_cache(sess->cache_entry, sess);
-			if (e) return e;
-
-			if (sess->init_data && sess->init_data_size) {
-				gf_cache_write_to_cache(sess->cache_entry, sess, sess->init_data, sess->init_data_size);
-				if (sess->init_data) {
-					gf_free(sess->init_data);
-					sess->init_data = NULL;
-				}
-				sess->init_data_size = 0;
-			}
-		}
-	}
-#endif
-
 	if (flags == 0xFFFFFFFF) {
 		sess->user_proc = user_io;
 		sess->usr_cbk = cbk;
@@ -3832,6 +4217,8 @@
 	/*threaded session shall be started with gf_dm_sess_process*/
 	return GF_OK;
 }
+#endif
+
 
 GF_EXPORT
 void gf_dm_set_data_rate(GF_DownloadManager *dm, u32 rate_in_bits_per_sec)
@@ -3839,18 +4226,23 @@
 	if (rate_in_bits_per_sec == 0xFFFFFFFF) {
 		dm->simulate_no_connection=GF_TRUE;
 	} else {
+		char opt[100];
 		dm->simulate_no_connection=GF_FALSE;
 		dm->limit_data_rate = rate_in_bits_per_sec/8;
 
-		if (dm->cfg) {
-			char opt[100];
-			sprintf(opt, "%d", rate_in_bits_per_sec / 1024);
-			gf_cfg_set_key(dm->cfg, "Downloader", "MaxRate", opt);
-		}
+		sprintf(opt, "%d", rate_in_bits_per_sec);
+		gf_opts_set_key("core", "maxrate", opt);
 
 		dm->read_buf_size = GF_DOWNLOAD_BUFFER_SIZE;
 		//when rate is limited, use smaller smaller read size
 		if (dm->limit_data_rate) dm->read_buf_size = 1024;
+
+#ifdef GPAC_ENABLE_COVERAGE
+		if (gf_sys_is_cov_mode()) {
+			dm_exceeds_cap_rate(dm);
+		}
+#endif
+
 	}
 }
 
@@ -3897,6 +4289,19 @@
 }
 
 GF_EXPORT
+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;
+	hdr = gf_list_get(sess->headers, *idx);
+	if (!hdr) return GF_EOS;
+	(*idx) = (*idx) + 1;
+	(*hdr_name) = hdr->name;
+	(*hdr_val) = hdr->value;
+	return GF_OK;
+}
+
+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;
@@ -3909,6 +4314,12 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+void gf_dm_sess_force_memory_mode(GF_DownloadSession *sess)
+{
+	if (sess) sess->flags |= GF_NETIO_SESSION_MEMORY_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)
@@ -3920,19 +4331,14 @@
 
 }
 
-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_headers(const DownloadedCacheEntry entry, const char *headers);
-Bool gf_cache_set_downtime(const DownloadedCacheEntry entry, u32 download_time_ms);
-
 GF_EXPORT
-const DownloadedCacheEntry gf_dm_add_cache_entry(GF_DownloadManager *dm, const char *szURL, char *data, u64 size, u64 start_range, u64 end_range,  const char *mime, Bool clone_memory, u32 download_time_ms)
+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)
 {
 	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));
 	count = gf_list_count(dm->cache_entries);
 	for (i = 0 ; i < count; i++) {
 		const char * url;
@@ -3979,8 +4385,58 @@
 		if (sess->cache_entry != entry) continue;
 		gf_dm_sess_reload_cached_headers(sess);
 	}
+
+#ifdef GPAC_ENABLE_COVERAGE
+	if (!count && gf_sys_is_cov_mode()) {
+		gf_dm_sess_reload_cached_headers(NULL);
+		gf_dm_refresh_cache_entry(NULL);
+		gf_dm_session_thread(NULL);
+		gf_user_credentials_save_digest(NULL, NULL, NULL);
+		gf_user_credentials_ask_password(NULL, NULL);
+		gf_user_credentials_register(NULL, NULL, NULL, NULL, GF_FALSE);
+		gf_cache_are_headers_processed(NULL);
+		gf_cache_get_start_range(NULL);
+		gf_cache_get_end_range(NULL);
+		gf_cache_get_content_length(NULL);
+		gf_cache_set_end_range(NULL, 0);
+		gf_cache_get_forced_headers(NULL);
+		gf_cache_get_downtime(NULL);
+	}
+#endif
+
 	gf_mx_v(dm->cache_mx);
 	return res ? GF_OK : GF_BAD_PARAM;
 }
 
+GF_EXPORT
+GF_Err gf_dm_sess_send(GF_DownloadSession *sess, u8 *data, u32 size)
+{
+	GF_Err e = GF_OK;
+
+	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;
+	}
+
+#ifdef GPAC_HAS_SSL
+	if (sess->ssl) {
+		e = gf_ssl_write(sess->ssl, data, size);
+	} else
+#endif
+		e = gf_sk_send(sess->sock, data, size);
+
+	if (e==GF_IP_CONNECTION_CLOSED) {
+		sess->status = GF_NETIO_STATE_ERROR;
+		return e;
+	}
+	else if (e==GF_IP_SOCK_WOULD_BLOCK) {
+		return gf_dm_sess_send(sess, data, size);
+	}
+	return e;
+}
+
 #endif

gpac-0.8.0.tar.gz/src/utils/error.c -> gpac-1.0.0.tar.gz/src/utils/error.c Changed

@@ -25,24 +25,23 @@
 
 #include <gpac/tools.h>
 
-#if defined(WIN32) && !defined(GPAC_CONFIG_WIN32)
-#include <windows.h>
-#include <wincon.h>
-static HANDLE console = NULL;
-static WORD console_attr_ori = 0;
-#endif
-
-
-static char szTYPE[9];
 
+//ugly patch, we have a concurrence issue with gf_4cc_to_str, for now fixed by rolling buffers
+#define NB_4CC_BUF	10
+static char szTYPE_BUF[NB_4CC_BUF][GF_4CC_MSIZE];
+static u32 buf_4cc_idx=0;
 
 GF_EXPORT
 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)
+		buf_4cc_idx=0;
 
 	for (i = 0; i < 4; i++, name++) {
 		ch = type >> (8 * (3-i) ) & 0xff;
@@ -87,8 +86,8 @@
 	"====================",
 };
 
-static u64 prev_pos = 0;
-static u64 prev_pc = 0;
+static u64 prev_pos = (u64) -1;
+static u64 prev_pc = (u64) -1;
 static void gf_on_progress_std(const char *_title, u64 done, u64 total)
 {
 	Double prog;
@@ -110,22 +109,27 @@
 		fflush(stderr);
 	}
 	if (done==total) {
-		u32 len = (u32) strlen(szT) + 40;
-		while (len) {
-			fprintf(stderr, " ");
-			len--;
-		};
-		fprintf(stderr, "\r");
+		if (prev_pos) {
+			u32 len = (u32) strlen(szT) + 40;
+			while (len) {
+				fprintf(stderr, " ");
+				len--;
+			};
+			fprintf(stderr, "\r");
+		}
+		prev_pos = 0;
 	}
 }
 
 static gf_on_progress_cbk prog_cbk = NULL;
 static void *user_cbk;
+static Bool gpac_no_color_logs = GF_FALSE;
 
 GF_EXPORT
 void gf_set_progress(const char *title, u64 done, u64 total)
 {
-	if (done>total) done=total;
+	if (done>=total)
+		done=total;
 	if (prog_cbk) {
 		prog_cbk(user_cbk, title, done, total);
 	}
@@ -143,6 +147,8 @@
 	user_cbk = _user_cbk;
 }
 
+#ifndef GPAC_DISABLE_LOG
+
 /*ENTRIES MUST BE IN THE SAME ORDER AS LOG_TOOL DECLARATION IN <gpac/tools.h>*/
 static struct log_tool_info {
 	u32 type;
@@ -154,6 +160,7 @@
 	{ GF_LOG_CODING, "coding", GF_LOG_WARNING },
 	{ GF_LOG_CONTAINER, "container", GF_LOG_WARNING },
 	{ 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 },
@@ -174,13 +181,17 @@
 	{ GF_LOG_MUTEX, "mutex", GF_LOG_WARNING },
 	{ GF_LOG_CONDITION, "condition", GF_LOG_WARNING },
 	{ 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_CONSOLE, "console", GF_LOG_INFO },
 	{ GF_LOG_APP, "app", GF_LOG_INFO },
-	{ GF_LOG_SCHEDULER, "scheduler", GF_LOG_INFO },
 };
 
 #define GF_LOG_TOOL_MAX_NAME_SIZE (GF_LOG_TOOL_MAX*10)
 
+#endif
+
 GF_EXPORT
 GF_Err gf_log_modify_tools_levels(const char *val_)
 {
@@ -193,6 +204,7 @@
 	tmp[GF_LOG_TOOL_MAX_NAME_SIZE - 1] = 0;
 
 	while (val && strlen(val)) {
+		void default_log_callback(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist);
 		u32 level;
 		const char *next_val = NULL;
 		const char *tools = NULL;
@@ -200,14 +212,26 @@
 		char *sep_level = strchr(val, '@');
 		if (!sep_level) {
 			if (!strcmp(val, "ncl")) {
-				void default_log_callback_no_col(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist);
-
-				gf_log_set_callback(NULL, default_log_callback_no_col);
+				gpac_no_color_logs = GF_TRUE;
+				gf_log_set_callback(NULL, default_log_callback);
 				if (!val[3]) break;
 				val += 4;
 				continue;
+			} else if (!strcmp(val, "strict")) {
+				gf_log_set_strict_error(GF_TRUE);
+				if (!val[6]) break;
+				val += 7;
+				continue;
+			} else if (!strcmp(val, "quiet")) {
+				u32 i;
+				for (i=0; i<GF_LOG_TOOL_MAX; i++)
+					global_log_tools[i].level = GF_LOG_QUIET;
+
+				if (!val[5]) break;
+				val += 6;
+				continue;
 			} else {
-				fprintf(stderr, "Unrecognized log format %s - expecting logTool@logLevel\n", val);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unrecognized log format %s - expecting logTool@logLevel\n", val));
 				return GF_BAD_PARAM;
 			}
 		}
@@ -233,7 +257,7 @@
 			next_val = sep_level+1 + 5;
 		}
 		else {
-			fprintf(stderr, "Unknown log level specified: %s\n", sep_level+1);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown log level specified: %s\n", sep_level+1));
 			return GF_BAD_PARAM;
 		}
 
@@ -249,18 +273,23 @@
 				for (i=0; i<GF_LOG_TOOL_MAX; i++)
 					global_log_tools[i].level = level;
 			}
+			else if (!strcmp(val, "ncl")) {
+				gpac_no_color_logs = GF_TRUE;
+				gf_log_set_callback(NULL, default_log_callback);
+			}
 			else {
 				Bool found = GF_FALSE;
 				for (i=0; i<GF_LOG_TOOL_MAX; i++) {
 					if (!strcmp(global_log_tools[i].name, tools)) {
 						global_log_tools[i].level = level;
 						found = GF_TRUE;
+						break;
 					}
 				}
 				if (!found) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Unknown log tool specified: %s\n", tools));
 					sep_level[0] = '@';
 					if (sep) sep[0] = ':';
-					fprintf(stderr, "Unknown log tool specified: %s\n", val);
 					return GF_BAD_PARAM;
 				}
 			}
@@ -279,13 +308,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_log_set_tools_levels(const char *val)
+GF_Err gf_log_set_tools_levels(const char *val, Bool reset_all)
 {
 #ifndef GPAC_DISABLE_LOG
 	u32 i;
-	for (i=0; i<GF_LOG_TOOL_MAX; i++)
-		global_log_tools[i].level = GF_LOG_WARNING;
-
+	if (reset_all) {
+		for (i=0; i<GF_LOG_TOOL_MAX; i++)
+			global_log_tools[i].level = GF_LOG_WARNING;
+	}
 	return gf_log_modify_tools_levels(val);
 #else
 	return GF_OK;
@@ -350,6 +380,214 @@
 	return gf_strdup("all@quiet");
 }
 
+
+#if defined(GPAC_CONFIG_WIN32)
+#include <windows.h>
+#include <wincon.h>
+static HANDLE console = NULL;
+static WORD console_attr_ori = 0;
+static CONSOLE_SCREEN_BUFFER_INFO cbck_console;
+static CONSOLE_CURSOR_INFO cbck_cursor;
+static PCHAR_INFO cbck_buffer=NULL;
+static Bool cbck_stored=GF_FALSE;
+static Bool is_mintty = GF_FALSE;
+#endif
+
+
+
+
+GF_EXPORT
+void gf_sys_set_console_code(FILE *std, GF_ConsoleCodes code)
+{
+	u32 color_code;
+
+	if (gf_sys_is_test_mode() || gpac_no_color_logs)
+		return;
+	color_code = code & 0xFFFF;
+#if defined(GPAC_CONFIG_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;
+		} 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;
+			}
+		}
+	}
+
+	if (is_mintty) goto win32_ismtty;
+
+	switch(color_code) {
+	case GF_CONSOLE_RED:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_RED;
+		break;
+	case GF_CONSOLE_BLUE:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_BLUE;
+		break;
+	case GF_CONSOLE_GREEN:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_GREEN;
+		break;
+	case GF_CONSOLE_YELLOW:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN;
+		break;
+	case GF_CONSOLE_MAGENTA:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_BLUE;
+		break;
+	case GF_CONSOLE_CYAN:
+		attribs = FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_BLUE;
+		break;
+	case GF_CONSOLE_WHITE:
+		attribs = FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE;
+		break;
+
+	case GF_CONSOLE_SAVE:
+		if (!cbck_stored) {
+			u32 size, line, line_incr;
+			COORD pos;
+			BOOL res;
+			SMALL_RECT region;
+
+			res = GetConsoleScreenBufferInfo(console, &cbck_console);
+			if (res) res = GetConsoleCursorInfo(console, &cbck_cursor);
+
+			if (!res) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to save win32 console info\n"));
+				return;
+			}
+			size = cbck_console.dwSize.X * cbck_console.dwSize.Y;
+			cbck_buffer = (PCHAR_INFO) gf_malloc(size * sizeof(CHAR_INFO));
+			pos.X = 0;
+			region.Left = 0;
+			region.Right = cbck_console.dwSize.X - 1;
+			line_incr = 12000 / cbck_console.dwSize.X;
+			for (line=0; line < (u32) cbck_console.dwSize.Y; line += line_incr) {
+				pos.Y = line;
+				region.Top = line;
+				region.Bottom = line + line_incr - 1;
+				if (!ReadConsoleOutput(console, cbck_buffer, cbck_console.dwSize, pos, &region)) {
+					gf_free(cbck_buffer);
+					cbck_buffer = NULL;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to save win32 console info\n"));
+					return;
+				}
+			}
+			cbck_stored = GF_TRUE;
+		}
+		return;
+
+	case GF_CONSOLE_RESTORE:
+		if (cbck_stored) {
+			COORD pos;
+			SMALL_RECT region;
+			BOOL res;
+			pos.X = pos.Y = 0;
+			region.Top = region.Left = 0;
+			region.Bottom = cbck_console.dwSize.Y - 1;
+			region.Right = cbck_console.dwSize.X - 1;
+			res = SetConsoleScreenBufferSize(console, cbck_console.dwSize);
+			if (res) res = SetConsoleWindowInfo(console, TRUE, &cbck_console.srWindow);
+			if (res) res = SetConsoleCursorPosition(console, cbck_console.dwCursorPosition);
+			if (res) res = SetConsoleTextAttribute(console, cbck_console.wAttributes);
+
+			if (!res) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to restore win32 console info\n"));
+				return;
+			}
+			WriteConsoleOutput(console, cbck_buffer, cbck_console.dwSize,
+				pos, &region);
+			gf_free(cbck_buffer);
+			cbck_stored = GF_FALSE;
+		}
+		return;
+
+	case GF_CONSOLE_CLEAR:
+	{
+		COORD coords;
+		DWORD written;
+		DWORD consolesize;
+		CONSOLE_SCREEN_BUFFER_INFO console_info;
+
+		coords.X = coords.Y = 0;
+		GetConsoleScreenBufferInfo(console, &console_info);
+		consolesize = console_info.dwSize.X * console_info.dwSize.Y;
+
+		/* fill space & attribute */
+		FillConsoleOutputCharacter(console, ' ', consolesize, coords, &written);
+		FillConsoleOutputAttribute(console, console_info.wAttributes, consolesize, coords, &written);
+		SetConsoleCursorPosition(console, coords);
+	}
+		return;
+	case GF_CONSOLE_RESET:
+	default:
+		attribs = console_attr_ori;
+	}
+
+	if ((code & 0xFFFF0000) && !color_code) {
+		attribs |= COMMON_LVB_UNDERSCORE;
+	}
+
+	SetConsoleTextAttribute(console, attribs);
+	return;
+
+win32_ismtty:
+#endif
+
+
+#if !defined(_WIN32_WCE)
+
+	switch(color_code) {
+	case GF_CONSOLE_RED: fprintf(std, "\x1b[31m"); break;
+	case GF_CONSOLE_BLUE:
+		fprintf(std, "\x1b[34m");
+		break;
+	case GF_CONSOLE_GREEN:
+		fprintf(std, "\x1b[32m");
+		break;
+	case GF_CONSOLE_YELLOW:
+		fprintf(std, "\x1b[33m");
+		break;
+	case GF_CONSOLE_MAGENTA:
+		fprintf(std, "\x1b[35m");
+		break;
+	case GF_CONSOLE_CYAN:
+		fprintf(std, "\x1b[36m");
+		break;
+	case GF_CONSOLE_WHITE:
+		fprintf(std, "\x1b[37m");
+		break;
+
+	case GF_CONSOLE_CLEAR:
+		fprintf(std, "\x1b[2J\x1b[0;0H");
+		return;
+
+	case GF_CONSOLE_SAVE:
+		fprintf(std, "\033[?47h");
+		return;
+	case GF_CONSOLE_RESTORE:
+		fprintf(std, "\033[?47l");
+		fprintf(std, "\x1b[J");
+		return;
+
+	case GF_CONSOLE_RESET:
+	default:
+		if (!code)
+			fprintf(std, "\x1b[0m");
+	}
+	if (code) {
+		if (code & GF_CONSOLE_BOLD) fprintf(std, "\x1b[1m");
+		if (code & GF_CONSOLE_ITALIC) fprintf(std, "\x1b[3m");
+		if (code & GF_CONSOLE_UNDERLINED) fprintf(std, "\x1b[4m");
+		if (code & GF_CONSOLE_STRIKE) fprintf(std, "\x1b[9m");
+	}
+#endif
+}
+
 #ifndef GPAC_DISABLE_LOG
 u32 call_lev = 0;
 u32 call_tool = 0;
@@ -357,91 +595,122 @@
 GF_EXPORT
 Bool gf_log_tool_level_on(GF_LOG_Tool log_tool, GF_LOG_Level log_level)
 {
-	assert(log_tool<GF_LOG_TOOL_MAX);
+	if (log_tool==GF_LOG_TOOL_MAX) return GF_TRUE;
+	if (log_tool>GF_LOG_TOOL_MAX) return GF_FALSE;
 	if (global_log_tools[log_tool].level >= log_level) return GF_TRUE;
 	return GF_FALSE;
 }
 
-void default_log_callback_no_col(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
+const char *gf_log_tool_name(GF_LOG_Tool log_tool)
 {
-	vfprintf(stderr, fmt, vlist);
+	if (log_tool>=GF_LOG_TOOL_MAX) return "unknown";
+	return global_log_tools[log_tool].name;
+}
+const char *gf_log_level_name(GF_LOG_Level log_level)
+{
+	switch (log_level) {
+	case GF_LOG_DEBUG: return "debug";
+	case GF_LOG_INFO: return "info";
+	case GF_LOG_WARNING: return "warning";
+	case GF_LOG_ERROR: return "error";
+	default: return "unknown";
+	}
 }
 
-#define RED    "\x1b[31m"
-#define YELLOW "\x1b[33m"
-#define GREEN  "\x1b[32m"
-#define CYAN   "\x1b[36m"
-#define WHITE  "\x1b[37m"
-#define RESET  "\x1b[0m"
+GF_EXPORT
+u32 gf_log_get_tool_level(GF_LOG_Tool log_tool)
+{
+	if (log_tool>=GF_LOG_TOOL_MAX) return GF_LOG_ERROR;
+	return global_log_tools[log_tool].level;
+}
 
-void default_log_callback(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
+FILE *gpac_log_file = NULL;
+Bool gpac_log_time_start = GF_FALSE;
+Bool gpac_log_utc_time = GF_FALSE;
+static u64 gpac_last_log_time=0;
+
+static void do_log_time(FILE *logs)
 {
-#if defined(WIN32) && !defined(GPAC_CONFIG_WIN32)
-	if (console == NULL) {
-		CONSOLE_SCREEN_BUFFER_INFO console_info;
-		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;
-		}
+	if (gpac_log_time_start) {
+		u64 now = gf_sys_clock_high_res();
+		gf_fprintf(logs, "At "LLD" (diff %d) - ", now, (u32) (now - gpac_last_log_time) );
+		gpac_last_log_time = now;
 	}
-	switch(level) {
-		case GF_LOG_ERROR:
-			SetConsoleTextAttribute(console, FOREGROUND_RED | FOREGROUND_INTENSITY);
-			break;
-		case GF_LOG_WARNING:
-			SetConsoleTextAttribute(console, FOREGROUND_INTENSITY | FOREGROUND_RED | FOREGROUND_GREEN);
-			break;
-		case GF_LOG_INFO:
-			SetConsoleTextAttribute(console, FOREGROUND_INTENSITY | FOREGROUND_GREEN);
-			break;
-		case GF_LOG_DEBUG:
-			SetConsoleTextAttribute(console, FOREGROUND_GREEN);
-			break;
-		default:
-			SetConsoleTextAttribute(console, FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE);
-			break;
+	if (gpac_log_utc_time) {
+		u64 utc_clock = gf_net_get_utc() ;
+		time_t secs = utc_clock/1000;
+		struct tm t;
+		t = *gf_gmtime(&secs);
+		gf_fprintf(logs, "UTC %d-%02d-%02dT%02d:%02d:%02dZ (TS "LLU") - ", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
 	}
+}
 
-	vfprintf(stderr, fmt, vlist);
-	SetConsoleTextAttribute(console, console_attr_ori);
-#elif !defined(_WIN32_WCE)
+int gf_fileio_printf(GF_FileIO *gfio, const char *format, va_list args);
+
+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 (gf_fileio_check(logs)) {
+		gf_fileio_printf((GF_FileIO *)logs, fmt, vlist);
+	} else {
+		vfprintf(logs, fmt, vlist);
+	}
+	gf_fflush(logs);
+}
+
+void default_log_callback_color(void *cbck, GF_LOG_Level level, GF_LOG_Tool tool, const char *fmt, va_list vlist)
+{
+	if (gpac_log_file) {
+		default_log_callback(cbck, level, tool, fmt, vlist);
+		return;
+	}
 	switch(level) {
-		case GF_LOG_ERROR:
-			fprintf(stderr, RED);
-			break;
-		case GF_LOG_WARNING:
-			fprintf(stderr, YELLOW);
-			break;
-		case GF_LOG_INFO:
-			fprintf(stderr, GREEN);
-			break;
-		case GF_LOG_DEBUG:
-			fprintf(stderr, CYAN);
-			break;
-		default:
-			fprintf(stderr, WHITE);
-			break;
+	case GF_LOG_ERROR:
+		gf_sys_set_console_code(stderr, GF_CONSOLE_RED);
+		break;
+	case GF_LOG_WARNING:
+		gf_sys_set_console_code(stderr, GF_CONSOLE_YELLOW);
+		break;
+	case GF_LOG_INFO:
+		gf_sys_set_console_code(stderr, (tool==GF_LOG_APP) ? GF_CONSOLE_WHITE : GF_CONSOLE_GREEN);
+		break;
+	case GF_LOG_DEBUG:
+		gf_sys_set_console_code(stderr, GF_CONSOLE_CYAN);
+		break;
+	default:
+		gf_sys_set_console_code(stderr, GF_CONSOLE_WHITE);
+		break;
 	}
+	do_log_time(stderr);
 
 	vfprintf(stderr, fmt, vlist);
-	fprintf(stderr, RESET);
-#else /*_WIN32_WCE*/
-	/*no log*/
-#endif
+	gf_sys_set_console_code(stderr, GF_CONSOLE_RESET);
 }
 
+
+
+#include <gpac/thread.h>
 static void *user_log_cbk = NULL;
-gf_log_cbk log_cbk = default_log_callback;
+gf_log_cbk log_cbk = default_log_callback_color;
 static Bool log_exit_on_error = GF_FALSE;
+extern GF_Mutex *logs_mx;
+
+GF_EXPORT
+Bool gf_log_use_color()
+{
+	return (log_cbk == default_log_callback_color) ? GF_TRUE : GF_FALSE;
+}
 
 GF_EXPORT
 void gf_log(const char *fmt, ...)
 {
 	va_list vl;
 	va_start(vl, fmt);
+	gf_mx_p(logs_mx);
 	log_cbk(user_log_cbk, call_lev, call_tool, fmt, vl);
+	gf_mx_v(logs_mx);
 	va_end(vl);
 	if (log_exit_on_error && (call_lev==GF_LOG_ERROR) && (call_tool != GF_LOG_MEMORY)) {
 		exit(1);
@@ -458,9 +727,11 @@
 }
 
 GF_EXPORT
-void gf_log_set_strict_error(Bool strict)
+Bool gf_log_set_strict_error(Bool strict)
 {
+	Bool old = log_exit_on_error;
 	log_exit_on_error = strict;
+	return old;
 }
 
 GF_EXPORT
@@ -469,8 +740,9 @@
 	assert(tool<=GF_LOG_TOOL_MAX);
 	if (tool==GF_LOG_ALL) {
 		u32 i;
-		for (i=0; i<GF_LOG_TOOL_MAX; i++)
+		for (i=0; i<GF_LOG_TOOL_MAX; i++) {
 			global_log_tools[i].level = level;
+		}
 	} else {
 		global_log_tools[tool].level = level;
 	}
@@ -503,8 +775,9 @@
 {
 }
 GF_EXPORT
-void gf_log_set_strict_error(Bool strict)
+Bool gf_log_set_strict_error(Bool strict)
 {
+	return GF_FALSE;
 }
 
 GF_EXPORT
@@ -512,9 +785,27 @@
 {
 	return NULL;
 }
+
+GF_EXPORT
+void gf_log_set_tool_level(GF_LOG_Tool tool, GF_LOG_Level level)
+{
+}
+
+GF_EXPORT
+u32 gf_log_get_tool_level(GF_LOG_Tool log_tool)
+{
+	return 0;
+}
+
+GF_EXPORT
+Bool gf_log_tool_level_on(GF_LOG_Tool log_tool, GF_LOG_Level log_level)
+{
+	return GF_FALSE;
+}
+
 #endif
 
-static char szErrMsg[20];
+static char szErrMsg[50];
 
 GF_EXPORT
 const char *gf_error_to_string(GF_Err e)
@@ -572,8 +863,8 @@
 		return "Bad Buffer size (too small)";
 	case GF_NON_COMPLIANT_BITSTREAM:
 		return "BitStream Not Compliant";
-	case GF_CODEC_NOT_FOUND:
-		return "Media Codec not found";
+	case GF_FILTER_NOT_FOUND:
+		return "Filter not found for the desired type";
 
 	/*DMIF errors - local and control plane */
 	case GF_URL_ERROR:
@@ -612,6 +903,10 @@
 		return "At least one required element has not been found";
 	case GF_PROFILE_NOT_SUPPORTED:
 		return "Unsupported codec profile";
+	case GF_REQUIRES_NEW_INSTANCE:
+		return "Requires a new instance of the filter to be supported";
+	case GF_FILTER_NOT_SUPPORTED:
+		return "Not supported by any filter chain";
 	default:
 		sprintf(szErrMsg, "Unknown Error (%d)", e);
 		return szErrMsg;
@@ -665,7 +960,7 @@
 };
 
 GF_EXPORT
-u32 gf_crc_32(const char *data, u32 len)
+u32 gf_crc_32(const u8 *data, u32 len)
 {
 	register u32 i;
 	u32 crc = 0xffffffff;
@@ -679,14 +974,27 @@
 
 #define CHECK_MAC(_a) "#_a :" ? (_a) ? "yes":"no"
 
-GF_EXPORT
-const char *gpac_features()
+static const char *gf_enabled_features()
 {
 	const char *features = ""
+#ifdef GPAC_CONFIG_WIN32
+	                       "GPAC_CONFIG_WIN32 "
+#endif
+#ifdef GPAC_CONFIG_DARWIN
+	                       "GPAC_CONFIG_DARWIN "
+#endif
+#ifdef GPAC_CONFIG_LINUX
+	                       "GPAC_CONFIG_LINUX "
+#endif
+#ifdef GPAC_CONFIG_ANDROID
+	                       "GPAC_CONFIG_ANDROID "
+#endif
+#ifdef GPAC_CONFIG_IOS
+	                       "GPAC_CONFIG_IOS "
+#endif
 #ifdef GPAC_64_BITS
 	                       "GPAC_64_BITS "
 #endif
-
 #ifdef GPAC_FIXED_POINT
 	                       "GPAC_FIXED_POINT "
 #endif
@@ -696,11 +1004,35 @@
 #ifdef GPAC_BIG_ENDIAN
 	                       "GPAC_BIG_ENDIAN "
 #endif
+#ifdef GPAC_HAS_IPV6
+	                       "GPAC_HAS_IPV6 "
+#endif
 #ifdef GPAC_HAS_SSL
 	                       "GPAC_HAS_SSL "
 #endif
-#ifdef GPAC_HAS_SPIDERMONKEY
-	                       "GPAC_HAS_SPIDERMONKEY "
+#ifdef GPAC_HAS_SOCK_UN
+	                       "GPAC_HAS_SOCK_UN "
+#endif
+#ifdef GPAC_ENABLE_COVERAGE
+	                       "GPAC_ENABLE_COVERAGE "
+#endif
+#ifdef GPAC_MINIMAL_ODF
+	                       "GPAC_MINIMAL_ODF "
+#endif
+#ifdef GPAC_HAS_QJS
+	                       "GPAC_HAS_QJS "
+#endif
+#ifdef GPAC_HAS_FREETYPE
+	                       "GPAC_HAS_FREETYPE "
+#endif
+#ifdef GPAC_HAS_FAAD
+	                       "GPAC_HAS_FAAD "
+#endif
+#ifdef GPAC_HAS_MAD
+	                       "GPAC_HAS_MAD "
+#endif
+#ifdef GPAC_HAS_LIBA52
+	                       "GPAC_HAS_LIBA52 "
 #endif
 #ifdef GPAC_HAS_JPEG
 	                       "GPAC_HAS_JPEG "
@@ -708,15 +1040,34 @@
 #ifdef GPAC_HAS_PNG
 	                       "GPAC_HAS_PNG "
 #endif
-#ifdef GPAC_DISABLE_3D
-	                       "GPAC_DISABLE_3D "
+#ifdef GPAC_HAS_FFMPEG
+	                       "GPAC_HAS_FFMPEG "
 #endif
-#ifdef GPAC_USE_TINYGL
-	                       "GPAC_USE_TINYGL "
+#ifdef GPAC_HAS_OPENSVC
+	                       "GPAC_HAS_OPENSVC "
 #endif
-#ifdef GPAC_USE_GLES1X
-	                       "GPAC_USE_GLES1X "
+#ifdef GPAC_HAS_JP2
+	                       "GPAC_HAS_JP2 "
+#endif
+#ifdef GPAC_HAS_OPENHEVC
+	                       "GPAC_HAS_OPENHEVC "
+#endif
+#ifdef GPAC_HAS_THEORA
+	                       "GPAC_HAS_THEORA "
 #endif
+#ifdef GPAC_HAS_VORBIS
+	                       "GPAC_HAS_VORBIS "
+#endif
+#ifdef GPAC_HAS_XVID
+	                       "GPAC_HAS_XVID "
+#endif
+#ifdef GPAC_HAS_LINUX_DVB
+	                       "GPAC_HAS_LINUX_DVB "
+#endif
+#ifdef GPAC_HAS_GLU
+	                       "GPAC_HAS_GLU "
+#endif
+
 #if defined(_WIN32_WCE)
 #ifdef GPAC_USE_IGPP
 	                       "GPAC_USE_IGPP "
@@ -725,15 +1076,31 @@
 	                       "GPAC_USE_IGPP_HP "
 #endif
 #endif
+	                       ;
+	return features;
+}
+
+static const char *gf_disabled_features()
+{
+	const char *features = ""
+#ifdef GPAC_DISABLE_3D
+	                       "GPAC_DISABLE_3D "
+#endif
+#ifdef GPAC_USE_TINYGL
+	                       "GPAC_USE_TINYGL "
+#endif
+#ifdef GPAC_USE_GLES1X
+	                       "GPAC_USE_GLES1X "
+#endif
+#ifdef GPAC_USE_GLES2
+	                       "GPAC_USE_GLES2 "
+#endif
 #ifdef GPAC_DISABLE_SVG
 	                       "GPAC_DISABLE_SVG "
 #endif
 #ifdef GPAC_DISABLE_VRML
 	                       "GPAC_DISABLE_VRML "
 #endif
-#ifdef GPAC_MINIMAL_ODF
-	                       "GPAC_MINIMAL_ODF "
-#endif
 #ifdef GPAC_DISABLE_BIFS
 	                       "GPAC_DISABLE_BIFS "
 #endif
@@ -782,11 +1149,11 @@
 #ifdef GPAC_DISABLE_OD_DUMP
 	                       "GPAC_DISABLE_OD_DUMP "
 #endif
-#ifdef GPAC_DISABLE_MCRYPT
-	                       "GPAC_DISABLE_MCRYPT "
+#ifdef GPAC_DISABLE_CRYPTO
+	                       "GPAC_DISABLE_CRYPTO "
 #endif
 #ifdef GPAC_DISABLE_ISOM
-	                       "GPAC_DISABLE_MCRYPT "
+	                       "GPAC_DISABLE_CRYPTO "
 #endif
 #ifdef GPAC_DISABLE_ISOM_HINTING
 	                       "GPAC_DISABLE_ISOM_HINTING "
@@ -806,10 +1173,19 @@
 #ifdef GPAC_DISABLE_ATSC
 	                       "GPAC_DISABLE_ATSC "
 #endif
+
 	                       ;
 	return features;
 }
 
+GF_EXPORT
+const char *gf_sys_features(Bool disabled)
+{
+	if (disabled)
+		return gf_disabled_features();
+	else
+		return gf_enabled_features();
+}
 
 static const struct lang_def {
 	const char *name;
@@ -1169,7 +1545,7 @@
 	{ "Polish","pol","pl"} ,
 	{ "Portuguese","por","pt"} ,
 	{ "Prakrit languages","pra",""} ,
-	//{ "Provençal, Old (to 1500);Occitan, Old (to 1500)","pro",""} ,
+	{ "Provencal, Old (to 1500);Occitan, Old (to 1500)","pro",""} ,
 	{ "Pushto; Pashto","pus","ps"} ,
 	{ "Quechua","que","qu"} ,
 	{ "Rajasthani","raj",""} ,
@@ -1278,7 +1654,7 @@
 	{ "Vai","vai",""} ,
 	{ "Venda","ven","ve"} ,
 	{ "Vietnamese","vie","vi"} ,
-	//{ "Volapük","vol","vo"} ,
+	{ "Volapuk","vol","vo"} ,
 	{ "Votic","vot",""} ,
 	{ "Wakashan languages","wak",""} ,
 	{ "Walloon","wln","wa"} ,
@@ -1364,3 +1740,37 @@
 	if (idx>=sizeof(defined_languages) / sizeof(struct lang_def)) return NULL;
 	return defined_languages[idx].three_char_code;
 }
+
+GF_EXPORT
+GF_Err gf_blob_get_data(const char *blob_url, u8 **out_data, u32 *out_size)
+{
+	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 (out_data) *out_data = blob->data;
+	if (out_size) *out_size = blob->size;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dynstrcat(char **str, const char *to_append, const char *sep)
+{
+	u32	l1, l2, lsep;
+	if (!to_append) return GF_OK;
+
+	lsep = sep ? (u32) strlen(sep) : 0;
+	l1 = *str ? (u32) strlen(*str) : 0;
+	l2 = (u32) strlen(to_append);
+	if (l1) (*str) = gf_realloc((*str), sizeof(char)*(l1+l2+lsep+1));
+	else (*str) = gf_realloc((*str), sizeof(char)*(l2+lsep+1));
+
+	if (! (*str) )
+		return GF_OUT_OF_MEM;
+
+	(*str)[l1]=0;
+	if (l1 && sep) strcat((*str), sep);
+	strcat((*str), to_append);
+	return GF_OK;
+}
+

gpac-1.0.0.tar.gz/src/utils/gltools.c Added

@@ -0,0 +1,1401 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2000-2020
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenGL tools used by compositor filter, vout filter and WebGL bindings
+ *
+ *  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/tools.h>
+#include <gpac/filters.h>
+
+#ifndef GPAC_DISABLE_3D
+
+#include "../compositor/gl_inc.h"
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+# if defined(GPAC_USE_TINYGL)
+#  pragma comment(lib, "TinyGL")
+
+# elif defined(GPAC_USE_GLES1X)
+
+#  if 0
+#   pragma message("Using OpenGL-ES Common Lite Profile")
+#   pragma comment(lib, "libGLES_CL")
+#	define GL_ES_CL_PROFILE
+#  else
+#   pragma message("Using OpenGL-ES Common Profile")
+#   pragma comment(lib, "libGLES_CM")
+#  endif
+
+# elif defined(GPAC_USE_GLES2)
+#  pragma comment(lib, "libGLESv2")
+
+# else
+#  pragma comment(lib, "opengl32")
+# endif
+
+#ifdef GPAC_HAS_GLU
+#  pragma comment(lib, "glu32")
+#endif
+
+#endif
+
+/*!! HORRIBLE HACK, but on my test devices, it seems that glClipPlanex is missing on the device but not in the SDK lib !!*/
+#if defined(GL_MAX_CLIP_PLANES) && defined(__SYMBIAN32__)
+#undef GL_MAX_CLIP_PLANES
+#endif
+
+
+#ifdef LOAD_GL_1_3
+
+GLDECL_FUNC(glActiveTexture);
+GLDECL_FUNC(glClientActiveTexture);
+GLDECL_FUNC(glBlendEquation);
+
+#endif //LOAD_GL_1_3
+
+#ifdef LOAD_GL_1_4
+
+GLDECL_FUNC(glPointParameterf);
+GLDECL_FUNC(glPointParameterfv);
+
+#endif //LOAD_GL_1_4
+
+
+#ifdef LOAD_GL_1_5
+GLDECL_FUNC(glGenBuffers);
+GLDECL_FUNC(glDeleteBuffers);
+GLDECL_FUNC(glBindBuffer);
+GLDECL_FUNC(glBufferData);
+GLDECL_FUNC(glBufferSubData);
+GLDECL_FUNC(glMapBuffer);
+GLDECL_FUNC(glUnmapBuffer);
+#endif //LOAD_GL_1_5
+
+#ifdef LOAD_GL_2_0
+
+GLDECL_FUNC(glCreateProgram);
+GLDECL_FUNC(glDeleteProgram);
+GLDECL_FUNC(glLinkProgram);
+GLDECL_FUNC(glUseProgram);
+GLDECL_FUNC(glCreateShader);
+GLDECL_FUNC(glDeleteShader);
+GLDECL_FUNC(glShaderSource);
+GLDECL_FUNC(glCompileShader);
+GLDECL_FUNC(glAttachShader);
+GLDECL_FUNC(glDetachShader);
+GLDECL_FUNC(glGetShaderiv);
+GLDECL_FUNC(glGetInfoLogARB);
+GLDECL_FUNC(glGetUniformLocation);
+GLDECL_FUNC(glGetUniformfv);
+GLDECL_FUNC(glGetUniformiv);
+GLDECL_FUNC(glUniform1f);
+GLDECL_FUNC(glUniform2f);
+GLDECL_FUNC(glUniform3f);
+GLDECL_FUNC(glUniform4f);
+GLDECL_FUNC(glUniform1i);
+GLDECL_FUNC(glUniform2i);
+GLDECL_FUNC(glUniform3i);
+GLDECL_FUNC(glUniform4i);
+GLDECL_FUNC(glUniform1fv);
+GLDECL_FUNC(glUniform2fv);
+GLDECL_FUNC(glUniform3fv);
+GLDECL_FUNC(glUniform4fv);
+GLDECL_FUNC(glUniform1iv);
+GLDECL_FUNC(glUniform2iv);
+GLDECL_FUNC(glUniform3iv);
+GLDECL_FUNC(glUniform4iv);
+GLDECL_FUNC(glUniformMatrix2fv);
+GLDECL_FUNC(glUniformMatrix3fv);
+GLDECL_FUNC(glUniformMatrix4fv);
+GLDECL_FUNC(glUniformMatrix2x3fv);
+GLDECL_FUNC(glUniformMatrix3x2fv);
+GLDECL_FUNC(glUniformMatrix2x4fv);
+GLDECL_FUNC(glUniformMatrix4x2fv);
+GLDECL_FUNC(glUniformMatrix3x4fv);
+GLDECL_FUNC(glUniformMatrix4x3fv);
+GLDECL_FUNC(glGetProgramiv);
+GLDECL_FUNC(glGetProgramInfoLog);
+GLDECL_FUNC(glGetAttribLocation);
+GLDECL_FUNC(glBindFramebuffer);
+GLDECL_FUNC(glFramebufferTexture2D);
+GLDECL_FUNC(glGenFramebuffers);
+GLDECL_FUNC(glGenRenderbuffers);
+GLDECL_FUNC(glBindRenderbuffer);
+GLDECL_FUNC(glRenderbufferStorage);
+GLDECL_FUNC(glFramebufferRenderbuffer);
+GLDECL_FUNC(glDeleteFramebuffers);
+GLDECL_FUNC(glDeleteRenderbuffers);
+GLDECL_FUNC(glCheckFramebufferStatus);
+
+GLDECL_FUNC(glBlendColor);
+GLDECL_FUNC(glBlendEquationSeparate);
+GLDECL_FUNC(glBlendFuncSeparate);
+GLDECL_FUNC(glCompressedTexImage2D);
+GLDECL_FUNC(glCompressedTexSubImage2D);
+GLDECL_FUNC(glGenerateMipmap);
+GLDECL_FUNC(glGetShaderInfoLog);
+GLDECL_FUNC(glGetShaderSource);
+GLDECL_FUNC(glGetActiveAttrib);
+GLDECL_FUNC(glGetActiveUniform);
+GLDECL_FUNC(glGetAttachedShaders);
+GLDECL_FUNC(glBindAttribLocation);
+GLDECL_FUNC(glIsBuffer);
+GLDECL_FUNC(glIsFramebuffer);
+GLDECL_FUNC(glIsProgram);
+GLDECL_FUNC(glIsRenderbuffer);
+GLDECL_FUNC(glIsShader);
+GLDECL_FUNC(glSampleCoverage);
+GLDECL_FUNC(glStencilFuncSeparate);
+GLDECL_FUNC(glStencilOpSeparate);
+GLDECL_FUNC(glStencilMaskSeparate);
+GLDECL_FUNC(glValidateProgram);
+GLDECL_FUNC(glVertexAttrib1fv);
+GLDECL_FUNC(glVertexAttrib1f);
+GLDECL_FUNC(glVertexAttrib2f);
+GLDECL_FUNC(glVertexAttrib2fv);
+GLDECL_FUNC(glVertexAttrib3f);
+GLDECL_FUNC(glVertexAttrib3fv);
+GLDECL_FUNC(glVertexAttrib4f);
+GLDECL_FUNC(glVertexAttrib4fv);
+GLDECL_FUNC(glGetBufferParameteriv);
+GLDECL_FUNC(glGetFramebufferAttachmentParameteriv);
+GLDECL_FUNC(glGetVertexAttribiv);
+GLDECL_FUNC(glGetVertexAttribfv);
+GLDECL_FUNC(glGetVertexAttribPointerv);
+GLDECL_FUNC(glGetRenderbufferParameteriv);
+
+#ifndef GPAC_CONFIG_ANDROID
+GLDECL_FUNC(glEnableVertexAttribArray);
+GLDECL_FUNC(glDisableVertexAttribArray);
+GLDECL_FUNC(glVertexAttribPointer);
+GLDECL_FUNC(glVertexAttribIPointer);
+#endif
+
+#endif //LOAD_GL_2_0
+
+static Bool gl_fun_loaded = GF_FALSE;
+void gf_opengl_init()
+{
+	if (gl_fun_loaded) return;
+	gl_fun_loaded = GF_TRUE;
+	
+	if (gf_opts_get_bool("core", "rmt-ogl")) {
+		rmt_BindOpenGL();
+	}
+
+#ifndef GPAC_USE_TINYGL
+
+#ifdef LOAD_GL_1_3
+	GET_GLFUN(glActiveTexture);
+	GET_GLFUN(glClientActiveTexture);
+	GET_GLFUN(glBlendEquation);
+#endif
+
+#ifdef LOAD_GL_1_4
+	GET_GLFUN(glPointParameterf);
+	GET_GLFUN(glPointParameterfv);
+#endif
+
+#ifdef LOAD_GL_1_5
+	GET_GLFUN(glGenBuffers);
+	GET_GLFUN(glDeleteBuffers);
+	GET_GLFUN(glBindBuffer);
+	GET_GLFUN(glBufferData);
+	GET_GLFUN(glBufferSubData);
+
+	GET_GLFUN(glMapBuffer);
+	GET_GLFUN(glUnmapBuffer);
+#endif
+
+
+#ifdef LOAD_GL_2_0
+	GET_GLFUN(glCreateProgram);
+
+	GET_GLFUN(glDeleteProgram);
+	GET_GLFUN(glLinkProgram);
+	GET_GLFUN(glUseProgram);
+	GET_GLFUN(glCreateShader);
+	GET_GLFUN(glDeleteShader);
+	GET_GLFUN(glShaderSource);
+	GET_GLFUN(glCompileShader);
+	GET_GLFUN(glAttachShader);
+	GET_GLFUN(glDetachShader);
+	GET_GLFUN(glGetShaderiv);
+	GET_GLFUN(glGetInfoLogARB);
+	GET_GLFUN(glGetUniformLocation);
+	GET_GLFUN(glGetUniformfv);
+	GET_GLFUN(glGetUniformiv);
+	GET_GLFUN(glUniform1f);
+	GET_GLFUN(glUniform2f);
+	GET_GLFUN(glUniform3f);
+	GET_GLFUN(glUniform4f);
+	GET_GLFUN(glUniform1i);
+	GET_GLFUN(glUniform2i);
+	GET_GLFUN(glUniform3i);
+	GET_GLFUN(glUniform4i);
+	GET_GLFUN(glUniform1fv);
+	GET_GLFUN(glUniform2fv);
+	GET_GLFUN(glUniform3fv);
+	GET_GLFUN(glUniform4fv);
+	GET_GLFUN(glUniform1iv);
+	GET_GLFUN(glUniform2iv);
+	GET_GLFUN(glUniform3iv);
+	GET_GLFUN(glUniform4iv);
+	GET_GLFUN(glUniformMatrix2fv);
+	GET_GLFUN(glUniformMatrix3fv);
+	GET_GLFUN(glUniformMatrix4fv);
+	GET_GLFUN(glUniformMatrix2x3fv);
+	GET_GLFUN(glUniformMatrix3x2fv);
+	GET_GLFUN(glUniformMatrix2x4fv);
+	GET_GLFUN(glUniformMatrix4x2fv);
+	GET_GLFUN(glUniformMatrix3x4fv);
+	GET_GLFUN(glUniformMatrix4x3fv);
+	GET_GLFUN(glGetProgramiv);
+	GET_GLFUN(glGetProgramInfoLog);
+	GET_GLFUN(glBlendColor);
+	GET_GLFUN(glBlendEquationSeparate);
+	GET_GLFUN(glBlendFuncSeparate);
+	GET_GLFUN(glCompressedTexImage2D);
+	GET_GLFUN(glCompressedTexSubImage2D);
+	GET_GLFUN(glGenerateMipmap);
+	GET_GLFUN(glGetShaderInfoLog);
+	GET_GLFUN(glGetShaderSource);
+	GET_GLFUN(glGetActiveAttrib);
+	GET_GLFUN(glGetActiveUniform);
+	GET_GLFUN(glGetAttachedShaders);
+	GET_GLFUN(glBindAttribLocation);
+	GET_GLFUN(glIsBuffer);
+	GET_GLFUN(glIsFramebuffer);
+	GET_GLFUN(glIsProgram);
+	GET_GLFUN(glIsRenderbuffer);
+	GET_GLFUN(glIsShader);
+	GET_GLFUN(glSampleCoverage);
+	GET_GLFUN(glStencilFuncSeparate);
+	GET_GLFUN(glStencilOpSeparate);
+	GET_GLFUN(glStencilMaskSeparate);
+	GET_GLFUN(glValidateProgram);
+	GET_GLFUN(glVertexAttrib1fv);
+	GET_GLFUN(glVertexAttrib1f);
+	GET_GLFUN(glVertexAttrib2f);
+	GET_GLFUN(glVertexAttrib2fv);
+	GET_GLFUN(glVertexAttrib3f);
+	GET_GLFUN(glVertexAttrib3fv);
+	GET_GLFUN(glVertexAttrib4f);
+	GET_GLFUN(glVertexAttrib4fv);
+	GET_GLFUN(glGetBufferParameteriv);
+	GET_GLFUN(glGetFramebufferAttachmentParameteriv);
+	GET_GLFUN(glGetVertexAttribiv);
+	GET_GLFUN(glGetVertexAttribfv);
+	GET_GLFUN(glGetVertexAttribPointerv);
+	GET_GLFUN(glGetRenderbufferParameteriv);
+
+#ifndef GPAC_CONFIG_ANDROID
+	GET_GLFUN(glEnableVertexAttribArray);
+	GET_GLFUN(glDisableVertexAttribArray);
+	GET_GLFUN(glVertexAttribPointer);
+	GET_GLFUN(glVertexAttribIPointer);
+	GET_GLFUN(glGetAttribLocation);
+
+	GET_GLFUN(glBindFramebuffer);
+	GET_GLFUN(glFramebufferTexture2D);
+	GET_GLFUN(glGenFramebuffers);
+	GET_GLFUN(glGenRenderbuffers);
+	GET_GLFUN(glBindRenderbuffer);
+	GET_GLFUN(glRenderbufferStorage);
+	GET_GLFUN(glFramebufferRenderbuffer);
+	GET_GLFUN(glDeleteFramebuffers);
+	GET_GLFUN(glDeleteRenderbuffers);
+	GET_GLFUN(glCheckFramebufferStatus);
+
+#endif
+
+#endif //LOAD_GL_2_0
+
+#endif //GPAC_USE_TINYGL
+
+}
+
+
+
+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\
+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\
+";
+
+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\
+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\
+";
+
+
+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\
+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\
+";
+
+
+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);\
+	";
+
+static char *gl_shader_fun_uyvy = \
+"vec2 texc, t_texc;\
+vec3 yuv, rgb;\
+vec4 uyvy;\
+float tex_s;\
+texc = _gpacTexCoord.st;\
+t_texc = texc * vec2(1, 1);\
+uyvy = texture2D(_gf_%s_1, t_texc); \
+tex_s = texc.x*_gf_%s_width;\
+if (tex_s - (2.0 * floor(tex_s/2.0)) == 1.0) {\
+	uyvy.g = uyvy.a; \
+}\
+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);\
+";
+
+
+static char *gl_shader_fun_vyuy = \
+"vec2 texc, t_texc;\
+vec3 yuv, rgb;\
+vec4 vyuy;\
+float tex_s;\
+texc = _gpacTexCoord.st;\
+t_texc = texc * vec2(1, 1);\
+vyuy = texture2D(_gf_%s_1, t_texc); \
+tex_s = texc.x*_gf_%s_width;\
+if (tex_s - (2.0 * floor(tex_s/2.0)) == 1.0) {\
+	vyuy.g = vyuy.a; \
+}\
+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);\
+";
+
+
+static char *gl_shader_fun_yuyv = \
+"vec2 texc, t_texc;\
+vec3 yuv, rgb;\
+vec4 yvyu;\
+float tex_s;\
+texc = _gpacTexCoord.st;\
+t_texc = texc * vec2(1, 1);\
+yvyu = texture2D(_gf_%s_1, t_texc); \
+tex_s = texc.x*_gf_%s_width;\
+if (tex_s - (2.0 * floor(tex_s/2.0)) == 1.0) {\
+	yvyu.r = yvyu.b; \
+}\
+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);\
+";
+
+static char *gl_shader_fun_yvyu = \
+"vec2 texc, t_texc;\
+vec3 yuv, rgb;\
+vec4 yuyv;\
+float tex_s;\
+texc = _gpacTexCoord.st;\
+t_texc = texc * vec2(1, 1);\
+yuyv = texture2D(_gf_%s_1, t_texc); \
+tex_s = texc.x*_gf_%s_width;\
+if (tex_s - (2.0 * floor(tex_s/2.0)) == 1.0) {\
+	yuyv.r = yuyv.b; \
+}\
+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);\
+";
+
+static char *gl_shader_vars_rgb = \
+"uniform sampler2D _gf_%s_1;\n\
+";
+
+static char *gl_shader_fun_alphagrey = \
+"vec4 col, ocol;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+ocol.r = ocol.g = ocol.b = col.a;\n\
+ocol.a = col.r;\n\
+return ocol;\n\
+";
+
+
+static char *gl_shader_fun_rgb444 = \
+"vec4 col, ocol;\n\
+float res, col_g, col_b;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+res = floor( 255.0 * col.a );\n\
+col_g = floor(res / 16.0);\n\
+col_b = floor(res - col_g*16.0);\n\
+ocol.r = col.r * 17.0;\n\
+ocol.g = col_g / 15.0;\n\
+ocol.b = col_b / 15.0;\n\
+ocol.a = 1.0;\n\
+return ocol;\
+";
+
+
+static char *gl_shader_fun_rgb555 = \
+"vec4 col, ocol;\n\
+float res, col_r, col_g1, col_g, col_b;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+res = floor(255.0 * col.r);\n\
+col_r = floor(res / 4.0);\n\
+col_g1 = floor(res - col_r*4.0);\n\
+res = floor(255.0 * col.a);\n\
+col_g = floor(res / 32);\n\
+col_b = floor(res - col_g*32.0);\n\
+col_g += col_g1 * 8;\n\
+ocol.r = col_r / 31.0;\n\
+ocol.g = col_g / 31.0;\n\
+ocol.b = col_b / 31.0;\n\
+ocol.a = 1.0:\n\
+return ocol;\
+";
+
+static char *gl_shader_fun_rgb565 = \
+"vec4 col, ocol;\n\
+float res, col_r, col_g1, col_g, col_b;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+res = floor(255.0 * col.r);\n\
+col_r = floor(res / 8.0);\n\
+col_g1 = floor(res - col_r*8.0);\n\
+res = floor(255.0 * col.a);\n\
+col_g = floor(res / 32);\n\
+col_b = floor(res - col_g*32.0);\n\
+col_g += col_g1 * 8;\n\
+ocol.r = col_r / 31.0;\n\
+ocol.g = col_g / 63.0;\n\
+ocol.b = col_b / 31.0;\n\
+ocol.a = 1.0;\n\
+return ocol;\
+";
+
+
+static char *gl_shader_fun_argb = \
+"vec4 col, ocol;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+ocol.r = col.g;\n\
+ocol.g = col.b;\n\
+ocol.b = col.a;\n\
+ocol.a = col.r;\n\
+return ocol;\
+";
+
+static char *gl_shader_fun_abgr = \
+"vec4 col, ocol;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+ocol.r = col.a;\n\
+ocol.g = col.b;\n\
+ocol.b = col.g;\n\
+ocol.a = col.r;\n\
+return ocol;\
+";
+
+
+static char *gl_shader_fun_bgra = \
+"vec4 col, ocol;\n\
+col = texture2D(_gf_%s_1, _gpacTexCoord.st);\n\
+ocol.r = col.b;\n\
+ocol.g = col.g;\n\
+ocol.b = col.r;\n\
+ocol.a = col.a;\n\
+return ocol;\
+";
+
+
+static char *gl_shader_fun_rgb = \
+"return texture2D(_gf_%s_1, _gpacTexCoord.st);\
+";
+
+static char *gl_shader_vars_externalOES = \
+"uniform samplerExternalOES _gf_%s_1;\n\
+";
+
+
+
+Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source)
+{
+	char szCode[4000];
+	const char *shader_vars = NULL;
+	const char *shader_fun = NULL;
+
+	switch (pix_fmt) {
+	case GF_PIXEL_NV21:
+	case GF_PIXEL_NV21_10:
+		shader_vars = gl_shader_vars_nv21;
+		shader_fun = gl_shader_fun_nv21;
+		break;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV12_10:
+		shader_vars = gl_shader_vars_nv12;
+		shader_fun = gl_shader_fun_nv12;
+		break;
+	case GF_PIXEL_UYVY:
+		shader_vars = gl_shader_vars_uyvu;
+		shader_fun = gl_shader_fun_uyvy;
+		break;
+	case GF_PIXEL_YUYV:
+		shader_vars = gl_shader_vars_uyvu; //same as uyvy
+		shader_fun = gl_shader_fun_yuyv;
+		break;
+	case GF_PIXEL_VYUY:
+		shader_vars = gl_shader_vars_uyvu; //same as uyvy
+		shader_fun = gl_shader_fun_vyuy;
+		break;
+	case GF_PIXEL_YVYU:
+		shader_vars = gl_shader_vars_uyvu; //same as uyvy
+		shader_fun = gl_shader_fun_yvyu;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_alphagrey;
+		break;
+	case GF_PIXEL_RGB_444:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_rgb444;
+		break;
+	case GF_PIXEL_RGB_555:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_rgb555;
+		break;
+	case GF_PIXEL_RGB_565:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_rgb565;
+		break;
+	case GF_PIXEL_ARGB:
+	case GF_PIXEL_XRGB:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_argb;
+		break;
+	case GF_PIXEL_ABGR:
+	case GF_PIXEL_XBGR:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_abgr;
+		break;
+	case GF_PIXEL_BGR:
+	case GF_PIXEL_BGRA:
+	case GF_PIXEL_BGRX:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_bgra;
+		break;
+
+	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_GL_EXTERNAL:
+		shader_vars = gl_shader_vars_externalOES;
+		shader_fun = gl_shader_fun_rgb;
+		break;
+	default:
+		shader_vars = gl_shader_vars_rgb;
+		shader_fun = gl_shader_fun_rgb;
+		break;
+	}
+
+	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);
+	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);
+
+	gf_dynstrcat(f_source, szCode, NULL);
+	gf_dynstrcat(f_source, "\n}\n", NULL);
+
+	return GF_TRUE;
+}
+
+
+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)
+{
+	u32 i;
+
+	tx->width = width;
+	tx->height = height;
+	tx->pix_fmt = pix_fmt;
+	tx->stride = stride;
+	tx->uv_stride = uv_stride;
+	tx->internal_textures = GF_TRUE;
+	tx->nb_textures = 1;
+	tx->is_yuv = GF_FALSE;
+	tx->bit_depth = 8;
+	tx->gl_format = GL_LUMINANCE;
+	tx->bytes_per_pix = 1;
+
+	switch (tx->pix_fmt) {
+	case GF_PIXEL_YUV444_10:
+		tx->bit_depth = 10;
+	case GF_PIXEL_YUV444:
+		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;
+		break;
+	case GF_PIXEL_YUV422_10:
+		tx->bit_depth = 10;
+	case GF_PIXEL_YUV422:
+		tx->uv_w = tx->width/2;
+		tx->uv_h = tx->height;
+		if (!tx->uv_stride)
+			tx->uv_stride = tx->stride/2;
+		tx->is_yuv = GF_TRUE;
+		tx->nb_textures = 3;
+		break;
+	case GF_PIXEL_YUV_10:
+		tx->bit_depth = 10;
+	case GF_PIXEL_YUV:
+		tx->uv_w = tx->width/2;
+		if (tx->width % 2) tx->uv_w++;
+		tx->uv_h = tx->height/2;
+		if (tx->height % 2) tx->uv_h++;
+		if (!tx->uv_stride) {
+			tx->uv_stride = tx->stride/2;
+			if (tx->stride%2) tx->uv_stride ++;
+		}
+		tx->is_yuv = GF_TRUE;
+		tx->nb_textures = 3;
+		break;
+	case GF_PIXEL_NV12_10:
+	case GF_PIXEL_NV21_10:
+		tx->bit_depth = 10;
+	case GF_PIXEL_NV12:
+	case GF_PIXEL_NV21:
+		tx->uv_w = tx->width/2;
+		tx->uv_h = tx->height/2;
+		if (!tx->uv_stride)
+			tx->uv_stride = tx->stride;
+		tx->is_yuv = GF_TRUE;
+		tx->nb_textures = 2;
+		break;
+	case GF_PIXEL_UYVY:
+	case GF_PIXEL_YUYV:
+	case GF_PIXEL_YVYU:
+	case GF_PIXEL_VYUY:
+		tx->uv_w = tx->width/2;
+		tx->uv_h = tx->height;
+		if (!tx->uv_stride) {
+			tx->uv_stride = tx->stride/2;
+			if (tx->stride%2) tx->uv_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;
+		break;
+	case GF_PIXEL_ALPHAGREY:
+	case GF_PIXEL_GREYALPHA:
+		tx->gl_format = GL_LUMINANCE_ALPHA;
+		tx->bytes_per_pix = 2;
+		break;
+	case GF_PIXEL_RGB:
+		tx->gl_format = GL_RGB;
+		tx->bytes_per_pix = 3;
+		break;
+	case GF_PIXEL_BGR:
+		tx->gl_format = GL_RGB;
+		tx->bytes_per_pix = 3;
+		break;
+	case GF_PIXEL_BGRA:
+		tx->has_alpha = GF_TRUE;
+	case GF_PIXEL_BGRX:
+		tx->gl_format = GL_RGBA;
+		tx->bytes_per_pix = 4;
+		break;
+	case GF_PIXEL_ARGB:
+		tx->has_alpha = GF_TRUE;
+	case GF_PIXEL_XRGB:
+		tx->gl_format = GL_RGBA;
+		tx->bytes_per_pix = 4;
+		break;
+	case GF_PIXEL_ABGR:
+		tx->has_alpha = GF_TRUE;
+	case GF_PIXEL_XBGR:
+		tx->gl_format = GL_RGBA;
+		tx->bytes_per_pix = 4;
+		break;
+	case GF_PIXEL_RGBA:
+		tx->has_alpha = GF_TRUE;
+	case GF_PIXEL_RGBX:
+		tx->gl_format = GL_RGBA;
+		tx->bytes_per_pix = 4;
+		break;
+	case GF_PIXEL_RGB_444:
+		tx->gl_format = GL_LUMINANCE_ALPHA;
+		tx->bytes_per_pix = 2;
+		break;
+	case GF_PIXEL_RGB_555:
+		tx->gl_format = GL_LUMINANCE_ALPHA;
+		tx->bytes_per_pix = 2;
+		break;
+	case GF_PIXEL_RGB_565:
+		tx->gl_format = GL_LUMINANCE_ALPHA;
+		tx->bytes_per_pix = 2;
+		break;
+	case GF_PIXEL_GL_EXTERNAL:
+		tx->internal_textures = GF_FALSE;
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Pixel format %s unknown, cannot setup texture wrapper\n", gf_4cc_to_str(tx->pix_fmt)));
+		return GF_FALSE;
+	}
+
+	if (tx->bit_depth>8)
+		tx->bytes_per_pix = 2;
+
+	if (frame_ifce && frame_ifce->get_gl_texture) {
+		tx->internal_textures = GF_FALSE;
+	}
+
+	/*create textures*/
+	if (tx->internal_textures) {
+#if !defined(GPAC_USE_GLES1X)
+		u32 glmode = GL_NEAREST;
+		if ((tx->nb_textures==1) && linear_interp && !tx->is_yuv)
+			glmode = GL_LINEAR;
+#endif
+		tx->first_tx_load = GF_TRUE;
+		tx->scale_10bit = 0;
+
+		tx->memory_format = GL_UNSIGNED_BYTE;
+		if (tx->is_yuv && tx->bit_depth>8) {
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+			//we use x bits but GL will normalise using 16 bits, so we need to multiply the normalized result by 2^(16-x)
+			u32 nb_bits = (16 - tx->bit_depth);
+			u32 scale = 1;
+			while (nb_bits) {
+				scale*=2;
+				nb_bits--;
+			}
+			tx->scale_10bit = scale;
+#endif
+			tx->memory_format = GL_UNSIGNED_SHORT;
+		}
+
+
+		GL_CHECK_ERR()
+		glGenTextures(tx->nb_textures, tx->textures);
+		GL_CHECK_ERR()
+
+#ifndef GPAC_USE_GLES2
+		glEnable(GL_TEXTURE_2D);
+		GL_CHECK_ERR()
+#endif
+
+		for (i=0; i<tx->nb_textures; i++) {
+#if !defined(GPAC_USE_GLES1X)
+			glBindTexture(GL_TEXTURE_2D, tx->textures[i] );
+			GL_CHECK_ERR()
+#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, glmode);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, glmode);
+#endif
+		}
+
+
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+		if (tx->is_yuv && tx->pbo_state) {
+			tx->first_tx_load = GF_FALSE;
+			glGenBuffers(1, &tx->PBOs[0]);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[0]);
+
+			if (tx->nb_textures>1) {
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, tx->bytes_per_pix * tx->width*tx->height, NULL, GL_DYNAMIC_DRAW_ARB);
+
+				glGenBuffers(1, &tx->PBOs[1]);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[1]);
+			} else {
+				//packed YUV
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, tx->bytes_per_pix * 4*tx->width/2*tx->height, NULL, GL_DYNAMIC_DRAW_ARB);
+			}
+
+			if (tx->nb_textures==3) {
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, tx->bytes_per_pix * tx->uv_w*tx->uv_h, NULL, GL_DYNAMIC_DRAW_ARB);
+
+				glGenBuffers(1, &tx->PBOs[2]);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[2]);
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, tx->bytes_per_pix * tx->uv_w*tx->uv_h, NULL, GL_DYNAMIC_DRAW_ARB);
+			}
+			//nv12/21
+			else {
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, tx->bytes_per_pix * 2*tx->uv_w*tx->uv_h, NULL, GL_DYNAMIC_DRAW_ARB);
+			}
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+		}
+#endif
+
+#ifndef GPAC_USE_GLES2
+		glDisable(GL_TEXTURE_2D);
+		GL_CHECK_ERR()
+#endif
+	}
+	return GF_TRUE;
+}
+
+Bool gf_gl_txw_upload(GF_GLTextureWrapper *tx, const u8 *data, GF_FilterFrameInterface *frame_ifce)
+{
+	Bool use_stride = GF_FALSE;
+	u32 stride_luma, stride_chroma;
+	const u8 *pY=NULL, *pU=NULL, *pV=NULL, *pA=NULL;
+
+
+	tx->frame_ifce = NULL;
+
+	if (!frame_ifce && !data) return GF_FALSE;
+
+	if (!tx->internal_textures) {
+		if (frame_ifce && frame_ifce->get_gl_texture) {
+			tx->frame_ifce = frame_ifce;
+			return GF_TRUE;
+		}
+		return GF_FALSE;
+	}
+
+	stride_luma = tx->stride;
+	stride_chroma = tx->uv_stride;
+	if (!frame_ifce) {
+		if (tx->is_yuv) {
+			if (tx->nb_textures==2) {
+				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;
+			}
+		}
+	} else {
+		u32 st_o;
+		if (tx->nb_textures)
+			frame_ifce->get_plane(frame_ifce, 0, &data, &stride_luma);
+		if (tx->nb_textures>1)
+			frame_ifce->get_plane(frame_ifce, 1, &pU, &stride_chroma);
+		//todo we need to cleanup alpha frame fetch, how do we differentiate between NV12+alpha (3 planes) and YUV420 ?
+		if (tx->nb_textures>2)
+			frame_ifce->get_plane(frame_ifce, 2, &pV, &st_o);
+		if (tx->nb_textures>3)
+			frame_ifce->get_plane(frame_ifce, 3, &pA, &st_o);
+	}
+
+	pY = data;
+
+	if (tx->is_yuv && (stride_luma != tx->width)) {
+		use_stride = GF_TRUE; //whether >8bits or real stride
+	}
+	GL_CHECK_ERR()
+
+	//push data
+#ifndef GPAC_USE_GLES2
+	glEnable(GL_TEXTURE_2D);
+	GL_CHECK_ERR()
+#endif
+
+
+	if (tx->scale_10bit) {
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+		glPixelTransferi(GL_RED_SCALE, tx->scale_10bit);
+		if (tx->nb_textures==2)
+			glPixelTransferi(GL_ALPHA_SCALE, tx->scale_10bit);
+
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 2);
+#endif
+	} else {
+#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);
+	}
+	GL_CHECK_ERR()
+
+
+	if (!tx->is_yuv) {
+		glBindTexture(GL_TEXTURE_2D, tx->textures[0] );
+		GL_CHECK_ERR()
+		if (use_stride) {
+#if !defined(GPAC_GL_NO_STRIDE)
+			glPixelStorei(GL_UNPACK_ROW_LENGTH, tx->stride / tx->bytes_per_pix);
+#endif
+		}
+		if (tx->first_tx_load) {
+			glTexImage2D(GL_TEXTURE_2D, 0, tx->gl_format, tx->width, tx->height, 0, tx->gl_format, GL_UNSIGNED_BYTE, data);
+			tx->first_tx_load = GF_FALSE;
+		} else {
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->width, tx->height, tx->gl_format, tx->memory_format, data);
+		}
+#if !defined(GPAC_GL_NO_STRIDE)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+#endif
+
+		GL_CHECK_ERR()
+	}
+#if !defined(GPAC_USE_GLES1X) && !defined(GPAC_USE_GLES2)
+	else if (tx->pbo_state && tx->PBOs[0]) {
+		u32 i, linesize, count, p_stride;
+		u8 *ptr;
+
+		//packed YUV
+		if (tx->nb_textures==1) {
+			if (tx->pbo_state!=GF_GL_PBO_TEXIMG) {
+				glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+				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;
+				p_stride = stride_luma;
+				count = tx->height;
+
+				for (i=0; i<count; i++) {
+					memcpy(ptr, pY, linesize);
+					pY += p_stride;
+					ptr += linesize;
+				}
+
+				glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+			}
+			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);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+			}
+		} else {
+			if (tx->pbo_state!=GF_GL_PBO_TEXIMG) {
+				glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[0]);
+				ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+
+				linesize = tx->width*tx->bytes_per_pix;
+				p_stride = stride_luma;
+				count = tx->height;
+
+				for (i=0; i<count; i++) {
+					memcpy(ptr, pY, linesize);
+					pY += p_stride;
+					ptr += linesize;
+				}
+
+				glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+				if (pU) {
+					glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[1]);
+					ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+
+					linesize = tx->uv_w * tx->bytes_per_pix;
+					p_stride = stride_chroma;
+					count = tx->uv_h;
+					//NV12 and  NV21
+					if (!pV) {
+						linesize *= 2;
+					}
+
+					for (i=0; i<count; i++) {
+						memcpy(ptr, pU, linesize);
+						pU += p_stride;
+						ptr += linesize;
+					}
+
+					glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+				}
+
+				
+				if (pV) {
+					glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[2]);
+					ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+
+					for (i=0; i<count; i++) {
+						memcpy(ptr, pV, linesize);
+						pV += p_stride;
+						ptr += linesize;
+					}
+
+					glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+				}
+			}
+
+			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_LUMINANCE, tx->width, tx->height, 0, tx->gl_format, tx->memory_format, NULL);
+
+				glBindTexture(GL_TEXTURE_2D, tx->textures[1] );
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[1]);
+				glTexImage2D(GL_TEXTURE_2D, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->uv_w, tx->uv_h, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->memory_format, NULL);
+
+				if (pV) {
+					glBindTexture(GL_TEXTURE_2D, tx->textures[2] );
+					glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, tx->PBOs[2]);
+					glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->uv_w, tx->uv_h, 0, tx->gl_format, tx->memory_format, NULL);
+				}
+
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+			}
+		}
+	}
+#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)) {
+		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 !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)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+#endif
+
+	}
+	else if (tx->first_tx_load) {
+		glBindTexture(GL_TEXTURE_2D, tx->textures[0] );
+#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, pY);
+
+		glBindTexture(GL_TEXTURE_2D, tx->textures[1] );
+#if !defined(GPAC_GL_NO_STRIDE)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, pV ? stride_chroma/tx->bytes_per_pix : stride_chroma/tx->bytes_per_pix/2);
+#endif
+		glTexImage2D(GL_TEXTURE_2D, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->uv_w, tx->uv_h, 0, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
+
+		if (pV) {
+			glBindTexture(GL_TEXTURE_2D, tx->textures[2] );
+#if !defined(GPAC_GL_NO_STRIDE)
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_chroma/tx->bytes_per_pix);
+#endif
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, tx->uv_w, tx->uv_h, 0, tx->gl_format, tx->memory_format, pV);
+		}
+
+#if !defined(GPAC_GL_NO_STRIDE)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+#endif
+		tx->first_tx_load = GF_FALSE;
+	}
+	else {
+		glBindTexture(GL_TEXTURE_2D, tx->textures[0] );
+#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, pY);
+		glBindTexture(GL_TEXTURE_2D, 0);
+
+		glBindTexture(GL_TEXTURE_2D, tx->textures[1] );
+#if !defined(GPAC_GL_NO_STRIDE)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, pV ? stride_chroma/tx->bytes_per_pix : stride_chroma/tx->bytes_per_pix/2);
+#endif
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->uv_w, tx->uv_h, pV ? GL_LUMINANCE : GL_LUMINANCE_ALPHA, tx->memory_format, pU);
+		glBindTexture(GL_TEXTURE_2D, 0);
+
+		if (pV) {
+			glBindTexture(GL_TEXTURE_2D, tx->textures[2] );
+#if !defined(GPAC_GL_NO_STRIDE)
+			if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, stride_chroma/tx->bytes_per_pix);
+#endif
+			glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, tx->uv_w, tx->uv_h, tx->gl_format, tx->memory_format, pV);
+			glBindTexture(GL_TEXTURE_2D, 0);
+		}
+
+#if !defined(GPAC_GL_NO_STRIDE)
+		if (use_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+#endif
+	}
+	return GF_TRUE;
+}
+
+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 !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+	if (!tx->uniform_setup && gl_program) {
+		char szName[100];
+		u32 i;
+		u32 start_idx = texture_unit - GL_TEXTURE0;
+		s32 loc;
+		for (i=0; i<tx->nb_textures; i++) {
+			sprintf(szName, "_gf_%s_%d", tx_name, i+1);
+			loc = glGetUniformLocation(gl_program, szName);
+			GL_CHECK_ERR()
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[GL] Failed to locate texture %s in shader\n", szName));
+				return GF_FALSE;
+			}
+			glUniform1i(loc, start_idx + i);
+			GL_CHECK_ERR()
+		}
+		GL_CHECK_ERR()
+		switch (tx->pix_fmt) {
+		case GF_PIXEL_UYVY:
+		case GF_PIXEL_YUYV:
+		case GF_PIXEL_VYUY:
+		case GF_PIXEL_YVYU:
+			sprintf(szName, "_gf_%s_width", tx_name);
+			loc = glGetUniformLocation(gl_program, szName);
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[GL] Failed to locate uniform %s in shader\n", szName));
+				return GF_FALSE;
+			}
+			glUniform1f(loc, (GLfloat) tx->width);
+			break;
+		default:
+			break;
+		}
+		tx->uniform_setup = GF_TRUE;
+	}
+#endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_GLES1X)
+
+	GL_CHECK_ERR()
+
+	if (!tx->internal_textures) {
+		u32 i;
+		GF_Matrix txmx;
+
+		gf_mx_init(txmx);
+		for (i=0; i<tx->nb_textures; i++) {
+			u32 gl_format = GL_TEXTURE_2D;
+			if (tx->frame_ifce && tx->frame_ifce->get_gl_texture(tx->frame_ifce, i, &gl_format, &tx->textures[i], &txmx) != GF_OK) {
+				if (!i) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[GL] Failed to get frame interface OpenGL texture ID for plane %d\n", i));
+					return GF_FALSE;
+				}
+				break;
+			}
+#ifndef GPAC_USE_GLES2
+			if (!gl_program)
+				glEnable(gl_format);
+#endif
+			if (!tx->textures[i])
+				break;
+			glActiveTexture(texture_unit + i);
+			glBindTexture(gl_format, tx->textures[i]);
+			glTexParameteri(gl_format, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			glTexParameteri(gl_format, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+			glTexParameteri(gl_format, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+			glTexParameteri(gl_format, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			/*todo pass matrix to shader !!*/
+		}
+		tx->flip = (txmx.m[5]<0) ? GF_TRUE : GF_FALSE;
+
+		if (tx->nb_textures) {
+#ifndef GPAC_USE_GLES2
+			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+			glClientActiveTexture(texture_unit);
+#endif
+		}
+		return GF_TRUE;
+	}
+	if (tx->nb_textures>2) {
+		glActiveTexture(texture_unit + 2);
+		glBindTexture(GL_TEXTURE_2D, tx->textures[2]);
+	}
+	if (tx->nb_textures>1) {
+		glActiveTexture(texture_unit + 1);
+		glBindTexture(GL_TEXTURE_2D, tx->textures[1]);
+	}
+	if (tx->nb_textures) {
+		glActiveTexture(texture_unit);
+		glBindTexture(GL_TEXTURE_2D, tx->textures[0]);
+
+#ifndef GPAC_USE_GLES2
+		glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+		glClientActiveTexture(texture_unit);
+#endif
+	}
+
+#ifndef GPAC_USE_GLES2
+	glEnable(GL_TEXTURE_2D);
+#endif
+
+	GL_CHECK_ERR()
+	return GF_TRUE;
+}
+
+void gf_gl_txw_reset(GF_GLTextureWrapper *tx)
+{
+	if (tx->nb_textures) {
+		if (tx->internal_textures) {
+			glDeleteTextures(tx->nb_textures, tx->textures);
+			if (tx->pbo_state && tx->PBOs[0]) {
+				glDeleteBuffers(tx->nb_textures, tx->PBOs);
+			}
+		}
+		tx->nb_textures = 0;
+	}
+	tx->width = 0;
+	tx->height = 0;
+	tx->pix_fmt = 0;
+	tx->stride = 0;
+	tx->uv_stride = 0;
+	tx->internal_textures = GF_FALSE;
+	tx->uniform_setup = GF_FALSE;
+}
+
+#else
+
+void gf_opengl_init()
+{
+}
+
+Bool gf_gl_txw_insert_fragment_shader(u32 pix_fmt, const char *tx_name, char **f_source)
+{
+	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)
+{
+	return GF_FALSE;
+}
+
+Bool gf_gl_txw_upload(GF_GLTextureWrapper *tx, const u8 *data, GF_FilterFrameInterface *frame_ifce)
+{
+	return GF_FALSE;
+}
+
+Bool gf_gl_txw_bind(GF_GLTextureWrapper *tx, const char *tx_name, u32 gl_program, u32 texture_unit)
+{
+	return GF_FALSE;
+}
+void gf_gl_txw_reset(GF_GLTextureWrapper *tx)
+{
+}
+
+#endif //GPAC_DISABLE_3D

gpac-1.0.0.tar.gz/src/utils/gzio.c Added

@@ -0,0 +1,989 @@
+/* gzio.c -- IO on .gz files
+ * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Compile this file with -DNO_GZCOMPRESS to avoid the compression code.
+ */
+
+/* @(#) $Id: gzio.cpp,v 1.4 2010-02-23 16:24:20 jeanlf Exp $ */
+
+#include <gpac/tools.h>
+
+#ifndef GPAC_DISABLE_ZLIB
+
+#include "zutil.h"
+
+#  define NO_GZCOMPRESS
+
+#ifndef NO_DUMMY_DECL
+#ifndef __SYMBIAN32__
+struct internal_state {
+	int dummy;
+}; /* for buggy compilers */
+#endif
+#endif
+
+#ifndef Z_BUFSIZE
+#  ifdef MAXSEG_64K
+#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
+#  else
+#    define Z_BUFSIZE 16384
+#  endif
+#endif
+#ifndef Z_PRINTF_BUFSIZE
+#  define Z_PRINTF_BUFSIZE 4096
+#endif
+
+#ifdef __MVS__
+#  pragma map (fdopen , "\174\174FDOPEN")
+FILE *fdopen(int, const char *);
+#endif
+
+#ifndef STDC
+//extern voidp  gf_malloc OF((uInt size));
+//extern void   free   OF((voidpf ptr));
+#endif
+
+#define ALLOC(size) gf_malloc(size)
+#define TRYFREE(p) {if (p) gf_free(p);}
+
+static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
+
+/* gzip flag byte */
+#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
+#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
+#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
+#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
+#define COMMENT      0x10 /* bit 4 set: file comment present */
+#define RESERVED     0xE0 /* bits 5..7: reserved */
+
+const char * const gf_z_errmsg[10] = {
+	"need dictionary",     /* Z_NEED_DICT       2  */
+	"stream end",          /* Z_STREAM_END      1  */
+	"",                    /* Z_OK              0  */
+	"file error",          /* Z_ERRNO         (-1) */
+	"stream error",        /* Z_STREAM_ERROR  (-2) */
+	"data error",          /* Z_DATA_ERROR    (-3) */
+	"insufficient memory", /* Z_MEM_ERROR     (-4) */
+	"buffer error",        /* Z_BUF_ERROR     (-5) */
+	"incompatible version",/* Z_VERSION_ERROR (-6) */
+	""
+};
+
+typedef struct gz_stream {
+	z_stream stream;
+	int      z_err;   /* error code for last stream operation */
+	int      z_eof;   /* set if end of input file */
+	FILE     *file;   /* .gz file */
+	Byte     *inbuf;  /* input buffer */
+	Byte     *outbuf; /* output buffer */
+	uLong    crc;     /* crc32 of uncompressed data */
+	char     *msg;    /* error message */
+	char     *path;   /* path name for debugging only */
+	int      transparent; /* 1 if input file is not a .gz file */
+	char     mode;    /* 'w' or 'r' */
+	z_off_t  start;   /* start of compressed data in file (header skipped) */
+	z_off_t  in;      /* bytes into deflate or inflate */
+	z_off_t  out;     /* bytes out of deflate or inflate */
+	int      back;    /* one character push-back */
+	int      last;    /* true if push-back is last character */
+} gz_stream;
+
+
+//local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
+//local int do_flush        OF((gzFile file, int flush));
+//local int    get_byte     OF((gz_stream *s));
+local void   check_header OF((gz_stream *s));
+local int    destroy      OF((gz_stream *s));
+//local void   putLong      OF((FILE *file, uLong x));
+local uLong  getLong      OF((gz_stream *s));
+
+/* ===========================================================================
+     Opens a gzip (.gz) file for reading or writing. The mode parameter
+   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
+   or path name (if fd == -1).
+     gz_open returns NULL if the file could not be opened or if there was
+   insufficient memory to allocate the (de)compression state; errno
+   can be checked to distinguish the two cases (if errno is zero, the
+   zlib error is Z_MEM_ERROR).
+*/
+GF_EXPORT
+void *gf_gzopen(const char *path, const char *mode)
+{
+	int err;
+#ifndef NO_GZCOMPRESS
+	int level = Z_DEFAULT_COMPRESSION; /* compression level */
+	int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
+#endif
+	char *p = (char*)mode;
+	gz_stream *s;
+	char fmode[80]; /* copy of mode, without the compression level */
+	char *m = fmode;
+
+	if (!path || !mode) return Z_NULL;
+
+	s = (gz_stream *)ALLOC(sizeof(gz_stream));
+	if (!s) return Z_NULL;
+
+	s->stream.zalloc = (alloc_func)0;
+	s->stream.zfree = (free_func)0;
+	s->stream.opaque = (voidpf)0;
+	s->stream.next_in = s->inbuf = Z_NULL;
+	s->stream.next_out = s->outbuf = Z_NULL;
+	s->stream.avail_in = s->stream.avail_out = 0;
+	s->file = NULL;
+	s->z_err = Z_OK;
+	s->z_eof = 0;
+	s->in = 0;
+	s->out = 0;
+	s->back = EOF;
+	s->crc = crc32(0L, Z_NULL, 0);
+	s->msg = NULL;
+	s->transparent = 0;
+
+	s->path = (char*)ALLOC(strlen(path)+1);
+	if (s->path == NULL) {
+		destroy(s);
+		return (gzFile)Z_NULL;
+	}
+	strcpy(s->path, path); /* do this early for debugging */
+
+	s->mode = '\0';
+	do {
+		if (*p == 'r') s->mode = 'r';
+		if (*p == 'w' || *p == 'a') s->mode = 'w';
+		if (*p >= '0' && *p <= '9') {
+#ifndef NO_GZCOMPRESS
+			level = *p - '0';
+#endif
+		}
+		else if (*p == 'f') {
+#ifndef NO_GZCOMPRESS
+			strategy = Z_FILTERED;
+#endif
+		} else if (*p == 'h') {
+#ifndef NO_GZCOMPRESS
+			strategy = Z_HUFFMAN_ONLY;
+			//} else if (*p == 'R') {
+			//  strategy = Z_RLE;
+#endif
+		} else {
+			*m++ = *p; /* copy the mode */
+		}
+	} while (*p++ && m != fmode + sizeof(fmode));
+	if (s->mode == '\0') {
+		destroy(s);
+		return Z_NULL;
+	}
+
+	if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+		err = Z_STREAM_ERROR;
+#else
+		err = deflateInit2(&(s->stream), level,
+		                   Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
+		/* windowBits is passed < 0 to suppress zlib header */
+
+		s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+#endif
+		if (err != Z_OK || s->outbuf == Z_NULL) {
+			destroy(s);
+			return Z_NULL;
+		}
+	} else {
+		s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
+
+		err = inflateInit2(&(s->stream), -MAX_WBITS);
+		/* windowBits is passed < 0 to tell that there is no zlib header.
+		 * Note that in this case inflate *requires* an extra "dummy" byte
+		 * after the compressed stream in order to complete decompression and
+		 * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
+		 * present after the compressed stream.
+		 */
+		if (err != Z_OK || s->inbuf == Z_NULL) {
+			destroy(s);
+			return Z_NULL;
+		}
+	}
+	s->stream.avail_out = Z_BUFSIZE;
+
+	errno = 0;
+	s->file = gf_fopen(path, fmode);
+
+	if (s->file == NULL) {
+		destroy(s);
+		return (gzFile)Z_NULL;
+	}
+	if (s->mode == 'w') {
+#ifndef NO_GZCOMPRESS
+		destroy(s);
+		return (gzFile)Z_NULL;
+#else
+		/* Write a very simple .gz header:
+		 */
+		gf_fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+		        Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
+		s->start = 10L;
+		/* We use 10L instead of ftell(s->file) to because ftell causes an
+		 * fflush on some systems. This version of the library doesn't use
+		 * start anyway in write mode, so this initialization is not
+		 * necessary.
+		 */
+#endif
+
+	} else {
+		check_header(s); /* skip the .gz header */
+		s->start = (long) (gf_ftell(s->file) - s->stream.avail_in);
+	}
+
+	return (gzFile)s;
+}
+
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+local int get_byte(gz_stream *s)
+{
+	if (s->z_eof) return EOF;
+	if (s->stream.avail_in == 0) {
+		errno = 0;
+		s->stream.avail_in = (uInt)gf_fread(s->inbuf, Z_BUFSIZE, s->file);
+		if (s->stream.avail_in == 0) {
+			s->z_eof = 1;
+			if (gf_ferror(s->file)) s->z_err = Z_ERRNO;
+			return EOF;
+		}
+		s->stream.next_in = s->inbuf;
+	}
+	s->stream.avail_in--;
+	return *(s->stream.next_in)++;
+}
+
+/* ===========================================================================
+      Check the gzip header of a gz_stream opened for reading. Set the stream
+    mode to transparent if the gzip magic header is not present; set s->err
+    to Z_DATA_ERROR if the magic header is present but the rest of the header
+    is incorrect.
+    IN assertion: the stream s has already been created sucessfully;
+       s->stream.avail_in is zero for the first time, but may be non-zero
+       for concatenated .gz files.
+*/
+local void check_header(gz_stream *s)
+{
+	int method; /* method byte */
+	int flags;  /* flags byte */
+	uInt len;
+	int c;
+
+	/* Assure two bytes in the buffer so we can peek ahead -- handle case
+	   where first byte of header is at the end of the buffer after the last
+	   gzip segment */
+	len = s->stream.avail_in;
+	if (len < 2) {
+		if (len) s->inbuf[0] = s->stream.next_in[0];
+		errno = 0;
+		len = (uInt)gf_fread(s->inbuf + len, Z_BUFSIZE >> len, s->file);
+		if (len == 0 && gf_ferror(s->file)) s->z_err = Z_ERRNO;
+		s->stream.avail_in += len;
+		s->stream.next_in = s->inbuf;
+		if (s->stream.avail_in < 2) {
+			s->transparent = s->stream.avail_in;
+			return;
+		}
+	}
+
+	/* Peek ahead to check the gzip magic header */
+	if (s->stream.next_in[0] != gz_magic[0] ||
+	        s->stream.next_in[1] != gz_magic[1]) {
+		s->transparent = 1;
+		return;
+	}
+	s->stream.avail_in -= 2;
+	s->stream.next_in += 2;
+
+	/* Check the rest of the gzip header */
+	method = get_byte(s);
+	flags = get_byte(s);
+	if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
+		s->z_err = Z_DATA_ERROR;
+		return;
+	}
+
+	/* Discard time, xflags and OS code: */
+	for (len = 0; len < 6; len++) (void)get_byte(s);
+
+	if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
+		len  =  (uInt)get_byte(s);
+		len += ((uInt)get_byte(s))<<8;
+		/* len is garbage if EOF but the loop below will quit anyway */
+		while (len-- != 0 && get_byte(s) != EOF) ;
+	}
+	if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
+		while ((c = get_byte(s)) != 0 && c != EOF) ;
+	}
+	if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
+		while ((c = get_byte(s)) != 0 && c != EOF) ;
+	}
+	if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
+		for (len = 0; len < 2; len++) (void)get_byte(s);
+	}
+	s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
+}
+
+/* ===========================================================================
+* Cleanup then free the given gz_stream. Return a zlib error code.
+  Try freeing in the reverse order of allocations.
+*/
+local int destroy (gz_stream *s)
+{
+	int err = Z_OK;
+
+	if (!s) return Z_STREAM_ERROR;
+
+	TRYFREE(s->msg);
+
+	if (s->stream.state != NULL) {
+		if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+			err = Z_STREAM_ERROR;
+#else
+			err = deflateEnd(&(s->stream));
+#endif
+		} else if (s->mode == 'r') {
+			err = inflateEnd(&(s->stream));
+		}
+	}
+	if (s->file != NULL && gf_fclose(s->file)) {
+#ifdef ESPIPE
+		if (errno != ESPIPE) /* gf_fclose is broken for pipes in HP/UX */
+#endif
+			err = Z_ERRNO;
+	}
+	if (s->z_err < 0) err = s->z_err;
+
+	TRYFREE(s->inbuf);
+	TRYFREE(s->outbuf);
+	TRYFREE(s->path);
+	TRYFREE(s);
+	return err;
+}
+
+GF_EXPORT
+int gf_gzread(void *file, voidp buf, unsigned len)
+{
+	gz_stream *s = (gz_stream*)file;
+	Bytef *start = (Bytef*)buf; /* starting point for crc computation */
+	Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
+
+	if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
+
+	if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
+	if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
+
+	next_out = (Byte*)buf;
+	s->stream.next_out = (Bytef*)buf;
+	s->stream.avail_out = len;
+
+	if (s->stream.avail_out && s->back != EOF) {
+		*next_out++ = s->back;
+		s->stream.next_out++;
+		s->stream.avail_out--;
+		s->back = EOF;
+		s->out++;
+		start++;
+		if (s->last) {
+			s->z_err = Z_STREAM_END;
+			return 1;
+		}
+	}
+
+	while (s->stream.avail_out != 0) {
+
+		if (s->transparent) {
+			/* Copy first the lookahead bytes: */
+			uInt n = s->stream.avail_in;
+			if (n > s->stream.avail_out) n = s->stream.avail_out;
+			if (n > 0) {
+				zmemcpy(s->stream.next_out, s->stream.next_in, n);
+				next_out += n;
+				s->stream.next_out = next_out;
+				s->stream.next_in   += n;
+				s->stream.avail_out -= n;
+				s->stream.avail_in  -= n;
+			}
+			if (s->stream.avail_out > 0) {
+				s->stream.avail_out -=
+				    (uInt)gf_fread(next_out, s->stream.avail_out, s->file);
+			}
+			len -= s->stream.avail_out;
+			s->in  += len;
+			s->out += len;
+			if (len == 0) s->z_eof = 1;
+			return (int)len;
+		}
+		if (s->stream.avail_in == 0 && !s->z_eof) {
+
+			errno = 0;
+			s->stream.avail_in = (uInt)gf_fread(s->inbuf, Z_BUFSIZE, s->file);
+			if (s->stream.avail_in == 0) {
+				s->z_eof = 1;
+				if (gf_ferror(s->file)) {
+					s->z_err = Z_ERRNO;
+					break;
+				}
+			}
+			s->stream.next_in = s->inbuf;
+		}
+		s->in += s->stream.avail_in;
+		s->out += s->stream.avail_out;
+		s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
+		s->in -= s->stream.avail_in;
+		s->out -= s->stream.avail_out;
+
+		if (s->z_err == Z_STREAM_END) {
+			/* Check CRC and original size */
+			s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+			start = s->stream.next_out;
+
+			if (getLong(s) != s->crc) {
+				s->z_err = Z_DATA_ERROR;
+			} else {
+				(void)getLong(s);
+				/* The uncompressed length returned by above getlong() may be
+				 * different from s->out in case of concatenated .gz files.
+				 * Check for such files:
+				 */
+				check_header(s);
+				if (s->z_err == Z_OK) {
+					inflateReset(&(s->stream));
+					s->crc = crc32(0L, Z_NULL, 0);
+				}
+			}
+		}
+		if (s->z_err != Z_OK || s->z_eof) break;
+	}
+	s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
+
+	if (len == s->stream.avail_out &&
+	        (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO))
+		return -1;
+	return (int)(len - s->stream.avail_out);
+}
+
+
+/* ===========================================================================
+      Reads one byte from the compressed file. gf_gzgetc returns this byte
+   or -1 in case of end of file or error.
+*/
+GF_EXPORT
+int gf_gzgetc(void *file)
+{
+	unsigned char c;
+
+	return gf_gzread(file, &c, 1) == 1 ? c : -1;
+}
+
+
+#if 0
+
+/* ===========================================================================
+      Push one byte back onto the stream.
+*/
+int gzungetc(int c, gzFile file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF;
+	s->back = c;
+	s->out--;
+	s->last = (s->z_err == Z_STREAM_END);
+	if (s->last) s->z_err = Z_OK;
+	s->z_eof = 0;
+	return c;
+}
+
+#endif
+
+
+/* ===========================================================================
+      Reads bytes from the compressed file until len-1 characters are
+   read, or a newline character is read and transferred to buf, or an
+   end-of-file condition is encountered.  The string is then terminated
+   with a null character.
+      gf_gzgets returns buf, or Z_NULL in case of error.
+
+      The current implementation is not optimized at all.
+*/
+GF_EXPORT
+char * gf_gzgets(void *file, char *buf, int len)
+{
+	char *b = buf;
+	if (buf == Z_NULL || len <= 0) return Z_NULL;
+
+	while (--len > 0 && gf_gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
+	*buf = '\0';
+	return b == buf && len > 0 ? Z_NULL : b;
+}
+
+
+#ifndef NO_GZCOMPRESS
+/* ===========================================================================
+     Writes the given number of uncompressed bytes into the compressed file.
+   gf_gzwrite returns the number of bytes actually written (0 in case of error).
+*/
+int gf_gzwrite (gzFile file, void *const buf, unsigned len)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+	s->stream.next_in = (Bytef*)buf;
+	s->stream.avail_in = len;
+
+	while (s->stream.avail_in != 0) {
+
+		if (s->stream.avail_out == 0) {
+
+			s->stream.next_out = s->outbuf;
+			if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
+				s->z_err = Z_ERRNO;
+				break;
+			}
+			s->stream.avail_out = Z_BUFSIZE;
+		}
+		s->in += s->stream.avail_in;
+		s->out += s->stream.avail_out;
+		s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
+		s->in -= s->stream.avail_in;
+		s->out -= s->stream.avail_out;
+		if (s->z_err != Z_OK) break;
+	}
+	s->crc = crc32(s->crc, (const Bytef *)buf, len);
+
+	return (int)(len - s->stream.avail_in);
+}
+
+
+/* ===========================================================================
+     Converts, formats, and writes the args to the compressed file under
+   control of the format string, as in fprintf. gf_gzprintf returns the number of
+   uncompressed bytes actually written (0 in case of error).
+*/
+#ifdef STDC
+#include <stdarg.h>
+
+int gf_gzprintf (gzFile file, const char *format, /* args */ ...)
+{
+	char buf[Z_PRINTF_BUFSIZE];
+	va_list va;
+	int len = 0;
+
+	buf[sizeof(buf) - 1] = 0;
+	va_start(va, format);
+#ifdef NO_vsnprintf
+#  ifdef HAS_vsprintf_void
+	(void)vsprintf(buf, format, va);
+	va_end(va);
+	for (len = 0; len < sizeof(buf); len++)
+		if (buf[len] == 0) break;
+#  else
+	len = vsprintf(buf, format, va);
+	va_end(va);
+#  endif
+#else
+#  ifdef HAS_vsnprintf_void
+	(void)vsnprintf(buf, sizeof(buf), format, va);
+	va_end(va);
+	len = strlen(buf);
+#  else
+	len = vsnprintf(buf, sizeof(buf), format, va);
+	va_end(va);
+#  endif
+#endif
+	if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+		return 0;
+	return gf_gzwrite(file, buf, (unsigned)len);
+}
+#else /* not ANSI C */
+
+int gf_gzprintf (gzFile file, const char *format, int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9, int a10,
+              int a11, int a12, int a13, int a14, int a15, int a16, int a17, int a18, int a19, int a20)
+{
+	char buf[Z_PRINTF_BUFSIZE];
+	int len;
+
+	buf[sizeof(buf) - 1] = 0;
+#ifdef NO_snprintf
+#  ifdef HAS_sprintf_void
+	sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+	        a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+	for (len = 0; len < sizeof(buf); len++)
+		if (buf[len] == 0) break;
+#  else
+	len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
+	              a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#else
+#  ifdef HAS_snprintf_void
+	snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+	         a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+	len = strlen(buf);
+#  else
+	len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
+	               a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+#  endif
+#endif
+	if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0)
+		return 0;
+	return gf_gzwrite(file, buf, len);
+}
+#endif
+
+/* ===========================================================================
+      Writes c, converted to an unsigned char, into the compressed file.
+   gf_gzputc returns the value that was written, or -1 in case of error.
+*/
+GF_EXPORT
+int gf_gzputc(gzFile file, int c)
+{
+	unsigned char cc = (unsigned char) c; /* required for big endian systems */
+
+	return gf_gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
+}
+
+
+/* ===========================================================================
+      Writes the given null-terminated string to the compressed file, excluding
+   the terminating null character.
+      gf_gzputs returns the number of characters written, or -1 in case of error.
+*/
+int gf_gzputs(gzFile file, const char *s)
+{
+	return gf_gzwrite(file, (char*)s, (unsigned)strlen(s));
+}
+
+
+/* ===========================================================================
+     Flushes all pending output into the compressed file. The parameter
+   flush is as in the deflate() function.
+*/
+local int do_flush (gzFile file, int flush)
+{
+	uInt len;
+	int done = 0;
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
+
+	s->stream.avail_in = 0; /* should be zero already anyway */
+
+	for (;;) {
+		len = Z_BUFSIZE - s->stream.avail_out;
+
+		if (len != 0) {
+			if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
+				s->z_err = Z_ERRNO;
+				return Z_ERRNO;
+			}
+			s->stream.next_out = s->outbuf;
+			s->stream.avail_out = Z_BUFSIZE;
+		}
+		if (done) break;
+		s->out += s->stream.avail_out;
+		s->z_err = deflate(&(s->stream), flush);
+		s->out -= s->stream.avail_out;
+
+		/* Ignore the second of two consecutive flushes: */
+		if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
+
+		/* deflate has finished flushing only when it hasn't used up
+		 * all the available space in the output buffer:
+		 */
+		done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
+
+		if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
+	}
+	return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+
+int gf_gzflush (gzFile file, int flush)
+{
+	gz_stream *s = (gz_stream*)file;
+	int err = do_flush (file, flush);
+
+	if (err) return err;
+	fflush(s->file);
+	return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
+}
+#endif /* NO_GZCOMPRESS */
+
+/* ===========================================================================
+     Rewinds input file.
+*/
+GF_EXPORT
+s64 gf_gzrewind(void *file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL || s->mode != 'r') return -1;
+
+	s->z_err = Z_OK;
+	s->z_eof = 0;
+	s->back = EOF;
+	s->stream.avail_in = 0;
+	s->stream.next_in = s->inbuf;
+	s->crc = crc32(0L, Z_NULL, 0);
+	if (!s->transparent) (void)inflateReset(&s->stream);
+	s->in = 0;
+	s->out = 0;
+	return (s64) gf_fseek(s->file, s->start, SEEK_SET);
+}
+
+/* ===========================================================================
+      Sets the starting position for the next gf_gzread or gf_gzwrite on the given
+   compressed file. The offset represents a number of bytes in the
+      gf_gzseek returns the resulting offset location as measured in bytes from
+   the beginning of the uncompressed stream, or -1 in case of error.
+      SEEK_END is not implemented, returns error.
+      In this version of the library, gf_gzseek can be extremely slow.
+*/
+GF_EXPORT
+u64 gf_gzseek(void *file, u64 _offset, int whence)
+{
+	gz_stream *s = (gz_stream*)file;
+	s64 offset = (s64) _offset;
+
+	if (s == NULL || whence == SEEK_END ||
+	        s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
+		return -1L;
+	}
+
+	if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+		return -1L;
+#else
+		if (whence == SEEK_SET) {
+			offset -= s->in;
+		}
+		if (offset < 0) return -1L;
+
+		/* At this point, offset is the number of zero bytes to write. */
+		if (s->inbuf == Z_NULL) {
+			s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
+			if (s->inbuf == Z_NULL) return -1L;
+			zmemzero(s->inbuf, Z_BUFSIZE);
+		}
+		while (offset > 0)  {
+			uInt size = Z_BUFSIZE;
+			if (offset < Z_BUFSIZE) size = (uInt)offset;
+
+			size = gf_gzwrite(file, s->inbuf, size);
+			if (size == 0) return -1L;
+
+			offset -= size;
+		}
+		return s->in;
+#endif
+	}
+	/* Rest of function is for reading only */
+
+	/* compute absolute position */
+	if (whence == SEEK_CUR) {
+		offset += s->out;
+	}
+	if (offset < 0) return -1L;
+
+	if (s->transparent) {
+		/* map to fseek */
+		s->back = EOF;
+		s->stream.avail_in = 0;
+		s->stream.next_in = s->inbuf;
+		if (gf_fseek(s->file, offset, SEEK_SET) < 0) return -1L;
+
+		s->in = s->out = (long) offset;
+		return offset;
+	}
+
+	/* For a negative seek, rewind and use positive seek */
+	if (offset >= s->out) {
+		offset -= s->out;
+	} else if (gf_gzrewind(file) < 0) {
+		return -1L;
+	}
+	/* offset is now the number of bytes to skip. */
+
+	if (offset != 0 && s->outbuf == Z_NULL) {
+		s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
+		if (s->outbuf == Z_NULL) return -1L;
+	}
+	if (offset && s->back != EOF) {
+		s->back = EOF;
+		s->out++;
+		offset--;
+		if (s->last) s->z_err = Z_STREAM_END;
+	}
+	while (offset > 0)  {
+		int size = Z_BUFSIZE;
+		if (offset < Z_BUFSIZE) size = (int)offset;
+
+		size = gf_gzread(file, s->outbuf, (uInt)size);
+		if (size <= 0) return -1L;
+		offset -= size;
+	}
+	return s->out;
+}
+
+/* ===========================================================================
+     Returns the starting position for the next gf_gzread or gf_gzwrite on the
+   given compressed file. This position represents a number of bytes in the
+   uncompressed data stream.
+*/
+GF_EXPORT
+u64 gf_gztell(void *file)
+{
+	return gf_gzseek(file, 0L, SEEK_CUR);
+}
+
+/* ===========================================================================
+     Returns 1 when EOF has previously been detected reading the given
+   input stream, otherwise zero.
+*/
+GF_EXPORT
+int gf_gzeof(void *file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	/* With concatenated compressed files that can have embedded
+	 * crc trailers, z_eof is no longer the only/best indicator of EOF
+	 * on a gz_stream. Handle end-of-stream error explicitly here.
+	 */
+	if (s == NULL || s->mode != 'r') return 0;
+	if (s->z_eof) return 1;
+	return s->z_err == Z_STREAM_END;
+}
+
+/* ===========================================================================
+     Returns 1 if reading and doing so transparently, otherwise zero.
+*/
+GF_EXPORT
+int gf_gzdirect (void * file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL || s->mode != 'r') return 0;
+	return s->transparent;
+}
+
+#if 0
+/* ===========================================================================
+   Outputs a long in LSB order to the given file
+*/
+local void putLong (FILE *file, uLong x)
+{
+	int n;
+	for (n = 0; n < 4; n++) {
+		fputc((int)(x & 0xff), file);
+		x >>= 8;
+	}
+}
+#endif
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets z_err in case
+   of error.
+*/
+local uLong getLong (gz_stream *s)
+{
+	uLong x = (uLong)get_byte(s);
+	int c;
+
+	x += ((uLong)get_byte(s))<<8;
+	x += ((uLong)get_byte(s))<<16;
+	c = get_byte(s);
+	if (c == EOF) s->z_err = Z_DATA_ERROR;
+	x += ((uLong)c)<<24;
+	return x;
+}
+
+/* ===========================================================================
+     Flushes all pending output if necessary, closes the compressed file
+   and deallocates all the (de)compression state.
+*/
+GF_EXPORT
+int gf_gzclose(void *file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL) return Z_STREAM_ERROR;
+
+	if (s->mode == 'w') {
+#ifdef NO_GZCOMPRESS
+		return Z_STREAM_ERROR;
+#else
+		if (do_flush (file, Z_FINISH) != Z_OK)
+			return destroy((gz_stream*)file);
+
+		putLong (s->file, s->crc);
+		putLong (s->file, (uLong)(s->in & 0xffffffff));
+#endif
+	}
+	return destroy((gz_stream*)file);
+}
+
+#ifdef STDC
+#  define zstrerror(errnum) strerror(errnum)
+#else
+#  define zstrerror(errnum) ""
+#endif
+
+/* ===========================================================================
+     Returns the error message for the last error which occurred on the
+   given compressed file. errnum is set to zlib error number. If an
+   error occurred in the file system and not in the compression library,
+   errnum is set to Z_ERRNO and the application may consult errno
+   to get the exact error code.
+*/
+GF_EXPORT
+const char * gf_gzerror (void *file, int *errnum)
+{
+	char *m;
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL) {
+		*errnum = Z_STREAM_ERROR;
+		return (const char*)ERR_MSG(Z_STREAM_ERROR);
+	}
+	*errnum = s->z_err;
+	if (*errnum == Z_OK) return (const char*)"";
+
+	m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
+
+	if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
+
+	TRYFREE(s->msg);
+	s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
+	if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR);
+	strcpy(s->msg, s->path);
+	strcat(s->msg, ": ");
+	strcat(s->msg, m);
+	return (const char*)s->msg;
+}
+
+/* ===========================================================================
+     Clear the error and end-of-file flags, and do the same for the real file.
+*/
+GF_EXPORT
+void gf_gzclearerr(void *file)
+{
+	gz_stream *s = (gz_stream*)file;
+
+	if (s == NULL) return;
+	if (s->z_err != Z_STREAM_END) s->z_err = Z_OK;
+	s->z_eof = 0;
+	clearerr(s->file);
+}
+
+#endif //GPAC_DISABLE_ZLIB

gpac-0.8.0.tar.gz/src/utils/list.c -> gpac-1.0.0.tar.gz/src/utils/list.c Changed

@@ -36,7 +36,7 @@
 	single step memory array
 	#define GF_LIST_ARRAY
 
-	multi-step memory array withou gf_realloc on remove, using the GF_LIST_REALLOC macro
+	multi-step memory array without gf_realloc on remove, using the GF_LIST_REALLOC macro
 	GF_LIST_ARRAY_GROW
 */
 
@@ -503,13 +503,12 @@
 {
 	if (! ptr) return GF_BAD_PARAM;
 
-	ptr->entryCount ++;
-	ptr->slots = (void **) gf_realloc(ptr->slots, ptr->entryCount*sizeof(void*));
+	ptr->slots = (void **) gf_realloc(ptr->slots, (ptr->entryCount+1)*sizeof(void*));
 	if (!ptr->slots) {
-		ptr->entryCount = 0;
 		return GF_OUT_OF_MEM;
 	}
-	ptr->slots[ptr->entryCount-1] = item;
+	ptr->slots[ptr->entryCount] = item;
+	ptr->entryCount ++;
 	return GF_OK;
 }
 
@@ -626,6 +625,8 @@
 GF_Err gf_list_add(GF_List *ptr, void* item)
 {
 	if (! ptr) return GF_BAD_PARAM;
+	if (! item)
+		return GF_BAD_PARAM;
 	if (ptr->allocSize==ptr->entryCount) realloc_chain(ptr);
 	if (!ptr->slots) return GF_OUT_OF_MEM;
 
@@ -644,7 +645,8 @@
 GF_EXPORT
 void *gf_list_get(GF_List *ptr, u32 itemNumber)
 {
-	if(!ptr || (itemNumber >= ptr->entryCount)) return NULL;
+	if(!ptr || (itemNumber >= ptr->entryCount))
+		return NULL;
 	return ptr->slots[itemNumber];
 }
 
@@ -662,6 +664,8 @@
 {
 	u32 i;
 	if ( !ptr || !ptr->slots || !ptr->entryCount) return GF_BAD_PARAM;
+	if (ptr->entryCount < itemNumber) return GF_BAD_PARAM;
+	
 	i = ptr->entryCount - itemNumber - 1;
 	if (i) memmove(&ptr->slots[itemNumber], & ptr->slots[itemNumber +1], sizeof(void *)*i);
 	ptr->slots[ptr->entryCount-1] = NULL;
@@ -732,6 +736,8 @@
 	return res;
 }
 
+//unused
+#if 0
 GF_EXPORT
 void *gf_list_rev_enum(GF_List *ptr, u32 *pos) {
 	void *res;
@@ -740,6 +746,7 @@
 	(*pos)++;
 	return res;
 }
+#endif
 
 GF_EXPORT
 GF_Err gf_list_swap(GF_List *l1, GF_List *l2)
@@ -797,7 +804,8 @@
 	return new_list;
 }
 
-GF_EXPORT
+//unused
+#if 0
 void gf_list_reverse(GF_List *ptr) {
 	GF_List* saved_order;
 	void* item;
@@ -812,6 +820,7 @@
 
 	gf_list_del(saved_order);
 }
+#endif
 
 GF_EXPORT
 void* gf_list_pop_front(GF_List *ptr) {

gpac-0.8.0.tar.gz/src/utils/math.c -> gpac-1.0.0.tar.gz/src/utils/math.c Changed

@@ -889,6 +889,7 @@
 	gf_mx2d_copy(*_this, tmp);
 }
 
+GF_EXPORT
 Bool gf_mx2d_decompose(GF_Matrix2D *mx, GF_Point2D *scale, Fixed *rotate, GF_Point2D *translate)
 {
 	Fixed det, angle;
@@ -1020,9 +1021,9 @@
 }
 
 GF_EXPORT
-Bool gf_rect_equal(GF_Rect rc1, GF_Rect rc2)
+Bool gf_rect_equal(GF_Rect *rc1, GF_Rect *rc2)
 {
-	if ( (rc1.x == rc2.x)  && (rc1.y == rc2.y) && (rc1.width == rc2.width) && (rc1.height == rc2.height) )
+	if ( (rc1->x == rc2->x) && (rc1->y == rc2->y) && (rc1->width == rc2->width) && (rc1->height == rc2->height) )
 		return GF_TRUE;
 	return GF_FALSE;
 }
@@ -1032,88 +1033,110 @@
 /* check if dimension is larger than FIX_ONE*/
 #define IS_HIGH_DIM(_v)	((_v > FIX_ONE) || (_v < (s32)0xFFFF0000))
 /* check if any vector dimension is larger than FIX_ONE*/
-#define VEC_HIGH_MAG(_v)	(IS_HIGH_DIM(_v.x) || IS_HIGH_DIM(_v.y) || IS_HIGH_DIM(_v.z) )
+#define VEC_HIGH_MAG(_v)	(IS_HIGH_DIM(_v->x) || IS_HIGH_DIM(_v->y) || IS_HIGH_DIM(_v->z) )
 
 //#define FLOAT_COMPUTE
 
 GF_EXPORT
-Fixed gf_vec_len(GF_Vec v)
+Fixed gf_vec_len_p(GF_Vec *v)
 {
 	/*commented out atm - weird results (not enough precision?)...*/
 //#if defined(GPAC_USE_IGPP_HP) || defined (GPAC_USE_IGPP)
 #if 0
 	Fixed res;
-	gppVec3DLength_16_32s((GPP_VEC3D *) &v, &res);
+	gppVec3DLength_16_32s((GPP_VEC3D *) v, &res);
 	return res;
 #elif defined(FLOAT_COMPUTE)
-	return FLT2FIX( sqrt( FIX2FLT(v.x) * FIX2FLT(v.x) + FIX2FLT(v.y)*FIX2FLT(v.y) + FIX2FLT(v.z)*FIX2FLT(v.z) ) );
+	return FLT2FIX( sqrt( FIX2FLT(v->x) * FIX2FLT(v->x) + FIX2FLT(v->y)*FIX2FLT(v->y) + FIX2FLT(v->z)*FIX2FLT(v->z) ) );
 #else
 
 	/*high-magnitude vector, use low precision on frac part to avoid overflow*/
 	if (VEC_HIGH_MAG(v)) {
-		v.x>>=8;
-		v.y>>=8;
-		v.z>>=8;
-		return gf_sqrt( gf_mulfix(v.x, v.x) + gf_mulfix(v.y, v.y) + gf_mulfix(v.z, v.z) ) << 8;
+		GF_Vec _v = *v;
+		_v.x>>=8;
+		_v.y>>=8;
+		_v.z>>=8;
+		return gf_sqrt( gf_mulfix(_v.x, _v.x) + gf_mulfix(_v.y, _v.y) + gf_mulfix(_v.z, _v.z) ) << 8;
 	}
 	/*low-res vector*/
-	return gf_sqrt( gf_mulfix(v.x, v.x) + gf_mulfix(v.y, v.y) + gf_mulfix(v.z, v.z) );
+	return gf_sqrt( gf_mulfix(v->x, v->x) + gf_mulfix(v->y, v->y) + gf_mulfix(v->z, v->z) );
 #endif
 }
 
 GF_EXPORT
-Fixed gf_vec_lensq(GF_Vec v)
+Fixed gf_vec_len(GF_Vec v)
+{
+	return gf_vec_len_p(&v);
+
+}
+GF_EXPORT
+Fixed gf_vec_lensq_p(GF_Vec *v)
 {
 	/*commented out atm - weird results (not enough precision?)...*/
 //#if defined(GPAC_USE_IGPP_HP) || defined (GPAC_USE_IGPP)
 #if 0
 	Fixed res;
-	gppVec3DLengthSq_16_32s((GPP_VEC3D *) &v, &res);
+	gppVec3DLengthSq_16_32s((GPP_VEC3D *) v, &res);
 	return res;
 #elif defined(FLOAT_COMPUTE)
-	return FLT2FIX( FIX2FLT(v.x) * FIX2FLT(v.x) + FIX2FLT(v.y)*FIX2FLT(v.y) + FIX2FLT(v.z)*FIX2FLT(v.z) );
+	return FLT2FIX( FIX2FLT(v->x) * FIX2FLT(v->x) + FIX2FLT(v->y)*FIX2FLT(v->y) + FIX2FLT(v->z)*FIX2FLT(v->z) );
 #else
 
 	/*high-magnitude vector, use low precision on frac part to avoid overflow*/
 	if (VEC_HIGH_MAG(v)) {
-		v.x>>=8;
-		v.y>>=8;
-		v.z>>=8;
-		return ( gf_mulfix(v.x, v.x) + gf_mulfix(v.y, v.y) + gf_mulfix(v.z, v.z) ) << 16;
+		GF_Vec _v = *v;
+		_v.x>>=8;
+		_v.y>>=8;
+		_v.z>>=8;
+		return ( gf_mulfix(_v.x, _v.x) + gf_mulfix(_v.y, _v.y) + gf_mulfix(_v.z, _v.z) ) << 16;
 	}
-	return gf_mulfix(v.x, v.x) + gf_mulfix(v.y, v.y) + gf_mulfix(v.z, v.z);
+	return gf_mulfix(v->x, v->x) + gf_mulfix(v->y, v->y) + gf_mulfix(v->z, v->z);
 
 #endif
 }
 
 GF_EXPORT
-Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2)
+Fixed gf_vec_lensq(GF_Vec v)
+{
+	return gf_vec_lensq_p(&v);
+
+}
+
+GF_EXPORT
+Fixed gf_vec_dot_p(GF_Vec *v1, GF_Vec *v2)
 {
 	/*commented out atm - weird results (not enough precision?)...*/
 //#if defined(GPAC_USE_IGPP_HP) || defined (GPAC_USE_IGPP)
 #if 0
 	Fixed res;
-	gppVec3DDot_16_32s((GPP_VEC3D *) &v1, (GPP_VEC3D *) &v2, &res);
+	gppVec3DDot_16_32s((GPP_VEC3D *) v1, (GPP_VEC3D *) v2, &res);
 	return res;
 #elif defined(FLOAT_COMPUTE)
-	Float fr = FIX2FLT(v1.x)*FIX2FLT(v2.x) + FIX2FLT(v1.y)*FIX2FLT(v2.y) + FIX2FLT(v1.z)*FIX2FLT(v2.z);
+	Float fr = FIX2FLT(v1->x)*FIX2FLT(v2->x) + FIX2FLT(v1->y)*FIX2FLT(v2->y) + FIX2FLT(v1->z)*FIX2FLT(v2->z);
 	return FLT2FIX(fr);
 #else
 	/*both high-magnitude vectors, use low precision on frac part to avoid overflow
 	if only one is, the dot product should still be in proper range*/
 	if (0&&VEC_HIGH_MAG(v1) && VEC_HIGH_MAG(v2)) {
-		v1.x>>=4;
-		v1.y>>=4;
-		v1.z>>=4;
-		v2.x>>=4;
-		v2.y>>=4;
-		v2.z>>=4;
-		return ( gf_mulfix(v1.x, v2.x) + gf_mulfix(v1.y, v2.y) + gf_mulfix(v1.z, v2.z) ) << 8;
-	}
-	return gf_mulfix(v1.x, v2.x) + gf_mulfix(v1.y, v2.y) + gf_mulfix(v1.z, v2.z);
+		GF_Vec _v1 = *v1;
+		GF_Vec _v2 = *v2;
+		_v1.x>>=4;
+		_v1.y>>=4;
+		_v1.z>>=4;
+		_v2.x>>=4;
+		_v2.y>>=4;
+		_v2.z>>=4;
+		return ( gf_mulfix(_v1.x, _v2.x) + gf_mulfix(_v1.y, _v2.y) + gf_mulfix(_v1.z, _v2.z) ) << 8;
+	}
+	return gf_mulfix(v1->x, v2->x) + gf_mulfix(v1->y, v2->y) + gf_mulfix(v1->z, v2->z);
 
 #endif
 }
+Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2)
+{
+	return gf_vec_dot_p(&v1, &v2);
+
+}
 
 GF_EXPORT
 void gf_vec_norm(GF_Vec *v)
@@ -1131,6 +1154,16 @@
 }
 
 GF_EXPORT
+GF_Vec gf_vec_scale_p(GF_Vec *v, Fixed f)
+{
+	GF_Vec res;
+	res.x = gf_mulfix(v->x, f);
+	res.y = gf_mulfix(v->y, f);
+	res.z = gf_mulfix(v->z, f);
+	return res;
+}
+
+GF_EXPORT
 GF_Vec gf_vec_scale(GF_Vec v, Fixed f)
 {
 	GF_Vec res;
@@ -1141,33 +1174,35 @@
 }
 
 GF_EXPORT
-GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2)
+GF_Vec gf_vec_cross_p(GF_Vec *v1, GF_Vec *v2)
 {
 	GF_Vec res;
 	/*commented out atm - weird results (not enough precision?)...*/
 //#if defined(GPAC_USE_IGPP_HP) || defined (GPAC_USE_IGPP)
 #if 0
-	gppVec3DCross_16_32s((GPP_VEC3D *) &v1, (GPP_VEC3D *) &v2, (GPP_VEC3D *) &res);
+	gppVec3DCross_16_32s((GPP_VEC3D *) v1, (GPP_VEC3D *) v2, (GPP_VEC3D *) &res);
 	return res;
 #elif defined(FLOAT_COMPUTE)
-	res.x = FLT2FIX( FIX2FLT(v1.y)*FIX2FLT(v2.z) - FIX2FLT(v2.y)*FIX2FLT(v1.z));
-	res.y = FLT2FIX( FIX2FLT(v2.x)*FIX2FLT(v1.z) - FIX2FLT(v1.x)*FIX2FLT(v2.z));
-	res.z = FLT2FIX( FIX2FLT(v1.x)*FIX2FLT(v2.y) - FIX2FLT(v2.x)*FIX2FLT(v1.y));
+	res.x = FLT2FIX( FIX2FLT(v1->y)*FIX2FLT(v2->z) - FIX2FLT(v2->y)*FIX2FLT(v1->z));
+	res.y = FLT2FIX( FIX2FLT(v2->x)*FIX2FLT(v1->z) - FIX2FLT(v1->x)*FIX2FLT(v2->z));
+	res.z = FLT2FIX( FIX2FLT(v1->x)*FIX2FLT(v2->y) - FIX2FLT(v2->x)*FIX2FLT(v1->y));
 	return res;
 #else
 
 	/*both high-magnitude vectors, use low precision on frac part to avoid overflow
 	if only one is, the cross product should still be in proper range*/
 	if (VEC_HIGH_MAG(v1) && VEC_HIGH_MAG(v2)) {
-		v1.x>>=8;
-		v1.y>>=8;
-		v1.z>>=8;
-		v2.x>>=8;
-		v2.y>>=8;
-		v2.z>>=8;
-		res.x = gf_mulfix(v1.y, v2.z) - gf_mulfix(v2.y, v1.z);
-		res.y = gf_mulfix(v2.x, v1.z) - gf_mulfix(v1.x, v2.z);
-		res.z = gf_mulfix(v1.x, v2.y) - gf_mulfix(v2.x, v1.y);
+		GF_Vec _v1 = *v1;
+		GF_Vec _v2 = *v2;
+		_v1.x>>=8;
+		_v1.y>>=8;
+		_v1.z>>=8;
+		_v2.x>>=8;
+		_v2.y>>=8;
+		_v2.z>>=8;
+		res.x = gf_mulfix(_v1.y, _v2.z) - gf_mulfix(_v2.y, _v1.z);
+		res.y = gf_mulfix(_v2.x, _v1.z) - gf_mulfix(_v1.x, _v2.z);
+		res.z = gf_mulfix(_v1.x, _v2.y) - gf_mulfix(_v2.x, _v1.y);
 		res.x<<=16;
 		res.y<<=16;
 		res.z<<=16;
@@ -1181,19 +1216,37 @@
 	return res;
 }
 
+GF_EXPORT
+GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2)
+{
+	return gf_vec_cross_p(&v1, &v2);
+
+}
 #else
 
 GF_EXPORT
+Fixed gf_vec_len_p(GF_Vec *v) {
+	return gf_sqrt(v->x*v->x + v->y*v->y + v->z*v->z);
+}
+GF_EXPORT
 Fixed gf_vec_len(GF_Vec v) {
-	return gf_sqrt(v.x*v.x + v.y*v.y + v.z*v.z);
+	return gf_vec_len_p(&v);
+}
+GF_EXPORT
+Fixed gf_vec_lensq_p(GF_Vec *v) {
+	return v->x*v->x + v->y*v->y + v->z*v->z;
 }
 GF_EXPORT
 Fixed gf_vec_lensq(GF_Vec v) {
-	return v.x*v.x + v.y*v.y + v.z*v.z;
+	return gf_vec_lensq_p(&v);
+}
+GF_EXPORT
+Fixed gf_vec_dot_p(GF_Vec *v1, GF_Vec *v2) {
+	return v1->x*v2->x + v1->y*v2->y + v1->z*v2->z;
 }
 GF_EXPORT
 Fixed gf_vec_dot(GF_Vec v1, GF_Vec v2) {
-	return v1.x*v2.x + v1.y*v2.y + v1.z*v2.z;
+	return gf_vec_dot_p(&v1, &v2);
 }
 GF_EXPORT
 void gf_vec_norm(GF_Vec *v)
@@ -1208,6 +1261,16 @@
 }
 
 GF_EXPORT
+GF_Vec gf_vec_scale_p(GF_Vec *v, Fixed f)
+{
+	GF_Vec res;
+	res.x = v->x * f;
+	res.y = v->y * f;
+	res.z = v->z * f;
+	return res;
+}
+
+GF_EXPORT
 GF_Vec gf_vec_scale(GF_Vec v, Fixed f)
 {
 	GF_Vec res = v;
@@ -1218,15 +1281,20 @@
 }
 
 GF_EXPORT
-GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2)
+GF_Vec gf_vec_cross_p(GF_Vec *v1, GF_Vec *v2)
 {
 	GF_Vec res;
-	res.x = v1.y*v2.z - v2.y*v1.z;
-	res.y = v2.x*v1.z - v1.x*v2.z;
-	res.z = v1.x*v2.y - v2.x*v1.y;
+	res.x = v1->y*v2->z - v2->y*v1->z;
+	res.y = v2->x*v1->z - v1->x*v2->z;
+	res.z = v1->x*v2->y - v2->x*v1->y;
 	return res;
 }
 
+GF_EXPORT
+GF_Vec gf_vec_cross(GF_Vec v1, GF_Vec v2)
+{
+	return gf_vec_cross_p(&v1, &v2);
+}
 #endif
 
 
@@ -1437,7 +1505,7 @@
 	det -= gf_mulfix(gf_mulfix(mx->m[1], mx->m[4]) , mx->m[10]);
 	det -= gf_mulfix(gf_mulfix(mx->m[0], mx->m[6]) , mx->m[9]);
 	if (!det) {
-		gf_mx2d_init(*mx);
+		gf_mx_init(*mx);
 		return;
 	}
 #endif
@@ -1519,6 +1587,18 @@
 }
 
 GF_EXPORT
+void gf_mx_ortho_reverse_z(GF_Matrix *mx, Fixed left, Fixed right, Fixed bottom, Fixed top, Fixed z_near, Fixed z_far)
+{
+	gf_mx_init(*mx);
+	mx->m[0] = gf_divfix(2*FIX_ONE, right-left);
+	mx->m[5] = gf_divfix(2*FIX_ONE, top-bottom);
+	mx->m[10] = gf_divfix(-FIX_ONE, z_far-z_near);
+	mx->m[12] = gf_divfix(right+left, right-left);
+	mx->m[13] = gf_divfix(top+bottom, top-bottom);
+	mx->m[14] = -gf_divfix(z_near, z_far-z_near);
+	mx->m[15] = FIX_ONE;
+}
+GF_EXPORT
 void gf_mx_perspective(GF_Matrix *mx, Fixed fieldOfView, Fixed aspectRatio, Fixed z_near, Fixed z_far)
 {
 	Fixed f = gf_divfix(gf_cos(fieldOfView/2), gf_sin(fieldOfView/2));
@@ -1534,6 +1614,26 @@
 }
 
 GF_EXPORT
+void gf_mx_perspective_reverse_z(GF_Matrix *mx, Fixed fieldOfView, Fixed aspectRatio, Fixed z_near, Fixed z_far)
+{
+	Fixed f = gf_divfix(gf_cos(fieldOfView/2), gf_sin(fieldOfView/2));
+	gf_mx_init(*mx);
+	mx->m[0] = gf_divfix(f, aspectRatio);
+	mx->m[5] = f;
+	//see http://dev.theomader.com/depth-precision/
+#if 1
+	mx->m[10] = -gf_divfix(z_far, z_near-z_far) - FIX_ONE;
+	mx->m[11] = -FIX_ONE;
+	mx->m[14] = - gf_muldiv(z_near, z_far, z_near-z_far);
+#else
+	mx->m[10] = 0;
+	mx->m[11] = - FIX_ONE;
+	mx->m[14] = z_near;
+#endif
+
+	mx->m[15] = 0;
+}
+GF_EXPORT
 void gf_mx_lookat(GF_Matrix *mx, GF_Vec eye, GF_Vec center, GF_Vec upVector)
 {
 	GF_Vec f, s, u;
@@ -1793,7 +1893,7 @@
 	Fixed m0, m1, m2, m3, s;
 	Fixed *r0, *r1, *r2, *r3;
 	GF_Matrix res;
-	r0 = wtmp[0], r1 = wtmp[1], r2 = wtmp[2], r3 = wtmp[3];
+	r0 = wtmp[0]; r1 = wtmp[1]; r2 = wtmp[2]; r3 = wtmp[3];
 	r0[0] = mx->m[0];
 	r0[1] = mx->m[4];
 	r0[2] = mx->m[8];
@@ -1961,7 +2061,7 @@
 	res.m[8] = r0[6];
 	res.m[12] = r0[7];
 	res.m[1] = r1[4];
-	res.m[5] = r1[5], res.m[9] = r1[6];
+	res.m[5] = r1[5]; res.m[9] = r1[6];
 	res.m[13] = r1[7];
 	res.m[2] = r2[4];
 	res.m[6] = r2[5];
@@ -1978,13 +2078,6 @@
 }
 
 
-GF_EXPORT
-Bool gf_plane_exists_intersection(GF_Plane *plane, GF_Plane *with)
-{
-	GF_Vec cross;
-	cross = gf_vec_cross(with->normal, plane->normal);
-	return gf_vec_lensq(cross) > FIX_EPSILON;
-}
 
 GF_EXPORT
 Bool gf_plane_intersect_line(GF_Plane *plane, GF_Vec *linepoint, GF_Vec *linevec, GF_Vec *outPoint)
@@ -1999,7 +2092,14 @@
 	return GF_TRUE;
 }
 
-GF_EXPORT
+#if 0 //unused
+Bool gf_plane_exists_intersection(GF_Plane *plane, GF_Plane *with)
+{
+	GF_Vec cross;
+	cross = gf_vec_cross(with->normal, plane->normal);
+	return gf_vec_lensq(cross) > FIX_EPSILON;
+}
+
 Bool gf_plane_intersect_plane(GF_Plane *plane, GF_Plane *with, GF_Vec *linepoint, GF_Vec *linevec)
 {
 	Fixed fn00 = gf_vec_len(plane->normal);
@@ -2020,7 +2120,6 @@
 	return GF_FALSE;
 }
 
-GF_EXPORT
 Bool gf_plane_intersect_planes(GF_Plane *plane, GF_Plane *p1, GF_Plane *p2, GF_Vec *outPoint)
 {
 	GF_Vec lp, lv;
@@ -2029,6 +2128,7 @@
 	return GF_FALSE;
 }
 
+#endif
 
 
 GF_EXPORT
@@ -2207,7 +2307,7 @@
 	return GF_TRUE;
 }
 
-GF_EXPORT
+#if 0 //unused
 Bool gf_ray_hit_triangle_backcull(GF_Ray *ray, GF_Vec *v0, GF_Vec *v1, GF_Vec *v2, Fixed *dist)
 {
 	Fixed u, v, det;
@@ -2234,6 +2334,7 @@
 	*dist = gf_divfix(gf_vec_dot(edge2, qvec), det);
 	return GF_TRUE;
 }
+#endif
 
 GF_EXPORT
 GF_Vec gf_closest_point_to_line(GF_Vec line_pt, GF_Vec line_vec, GF_Vec pt)

gpac-0.8.0.tar.gz/src/utils/module.c -> gpac-1.0.0.tar.gz/src/utils/module.c Changed

@@ -28,6 +28,8 @@
 #include <gpac/tools.h>
 #include <gpac/network.h>
 
+
+
 #ifndef GPAC_MODULE_CUSTOM_LOAD
 static void load_all_modules(GF_ModuleManager *mgr)
 {
@@ -44,126 +46,54 @@
 #ifdef GPAC_STATIC_MODULES
 	GF_InterfaceRegister *pr;
 
-#ifdef GPAC_HAS_FAAD
-	LOAD_PLUGIN(aac_in);
-#endif
-#ifdef GPAC_HAS_AC3
-	LOAD_PLUGIN(ac3);
+#ifdef GPAC_HAS_SDL
+	LOAD_PLUGIN(sdl_out);
 #endif
-	LOAD_PLUGIN(amr_in);
-	LOAD_PLUGIN(atsc_in);
 
+#ifdef GPAC_HAS_FREETYPE
+	LOAD_PLUGIN(ftfont);
+#endif
 #ifdef GPAC_HAS_ALSA
 	LOAD_PLUGIN(alsa);
 #endif
-	LOAD_PLUGIN(audio_filter);
-	LOAD_PLUGIN(bifs);
-#ifndef GPAC_DISABLE_SMGR
-	LOAD_PLUGIN(ctx_load);
-#endif
+
 #ifdef GPAC_HAS_DIRECTFB
 	LOAD_PLUGIN(directfb_out);
 #endif
-	LOAD_PLUGIN(dummy_in);
+
 #ifdef GPAC_HAS_DIRECTX
 	LOAD_PLUGIN(dx_out);
 #endif
-#ifdef GPAC_HAS_FFMPEG
-	LOAD_PLUGIN(ffmpeg);
-#endif
-#ifdef GPAC_HAS_FREENECT
-	LOAD_PLUGIN(freenect);
-#endif
-#ifdef GPAC_HAS_FREETYPE
-	LOAD_PLUGIN(ftfont);
-#endif
-#ifdef GPAC_HAS_SPIDERMONKEY
-	LOAD_PLUGIN(gpac_js);
-#endif
-	LOAD_PLUGIN(img_in);
-	LOAD_PLUGIN(isma_ea);
-	LOAD_PLUGIN(isom);
+
 #ifdef GPAC_HAS_JACK
 	LOAD_PLUGIN(jack);
 #endif
-#ifndef GPAC_DISABLE_SVG
-	LOAD_PLUGIN(laser);
-#endif
-#ifdef GPAC_HAS_MAD
-	LOAD_PLUGIN(mp3_in);
-#endif
-	LOAD_PLUGIN(mpd_in);
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-	LOAD_PLUGIN(mpegts_in);
-#endif
-#ifdef GPAC_HAS_SPIDERMONKEY
-	LOAD_PLUGIN(mse_in);
-#endif
-
-	LOAD_PLUGIN(netctrl);
 
-	LOAD_PLUGIN(odf_dec);
-#ifdef GPAC_HAS_OGG
-	LOAD_PLUGIN(ogg_in);
-#endif
-#ifdef GPAC_HAS_OPENHEVC
-	LOAD_PLUGIN(openhevc);
-#endif
-#ifdef GPAC_HAS_OPENSVC
-	LOAD_PLUGIN(opensvc);
-#endif
-#ifndef GPAC_DISABLE_LOADER_BT
-	LOAD_PLUGIN(osd);
-#endif
 #ifdef GPAC_HAS_OSS
 	LOAD_PLUGIN(oss);
 #endif
+
 #ifdef GPAC_HAS_PULSEAUDIO
 	LOAD_PLUGIN(pulseaudio);
 #endif
-	LOAD_PLUGIN(raw_out);
-#ifdef GPAC_HAS_FFMPEG
-	//    LOAD_PLUGIN(redirect_av);
-#endif
-	LOAD_PLUGIN(rtp_in);
-	LOAD_PLUGIN(saf_in);
-#ifdef GPAC_HAS_SDL
-	LOAD_PLUGIN(sdl_out);
-#endif
-	LOAD_PLUGIN(soft_raster);
-#if !defined(GPAC_DISABLE_SMGR) && !defined(GPAC_DISABLE_SVG)
-	LOAD_PLUGIN(svg_in);
-#endif
-	LOAD_PLUGIN(timedtext);
+
 	LOAD_PLUGIN(validator);
+
 #ifdef GPAC_HAS_WAVEOUT
 	LOAD_PLUGIN(wave_out);
 #endif
-#ifndef GPAC_DISABLE_VTT
-	LOAD_PLUGIN(vtt_dec);
-#endif
-#ifndef GPAC_DISABLE_SVG
-	LOAD_PLUGIN(widgetman);
-#endif
+
 #ifdef GPAC_HAS_X11
 	LOAD_PLUGIN(x11_out);
 #endif
-#ifdef GPAC_HAS_XVID
-	LOAD_PLUGIN(xvid);
-#endif
-
-#if defined(GPAC_IPHONE) || defined(__DARWIN__) || defined(__APPLE__)
-    LOAD_PLUGIN(vtb);
-#endif
 
 	//todo fix project for iOS
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 	//these do not compile with xcode 4.2
 //    LOAD_PLUGIN(ios_cam);
 //    LOAD_PLUGIN(ios_mpegv);
 #endif
 
-
 #endif //GPAC_STATIC_MODULES
 
 #undef LOAD_PLUGIN
@@ -171,18 +101,23 @@
 }
 #endif //GPAC_MODULE_CUSTOM_LOAD
 
+GF_ModuleManager *gpac_modules_static = NULL;
+
 GF_EXPORT
-GF_Err gf_module_load_static(GF_ModuleManager *pm, GF_InterfaceRegister *(*register_module)())
+GF_Err gf_module_load_static(GF_InterfaceRegister *(*register_module)())
 {
-	GF_InterfaceRegister *pr = register_module();
+	GF_InterfaceRegister *pr;
 	GF_Err rc;
+	if (register_module == NULL)
+		return GF_OK;
 
+	pr = register_module();
 	if (!pr) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to statically loaded module\n"));
 		return GF_NOT_SUPPORTED;
 	}
 
-	rc = gf_list_add(pm->plugin_registry, pr);
+	rc = gf_list_add(gpac_modules_static->plugin_registry, pr);
 	if (rc != GF_OK) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to statically loaded module\n"));
 		return rc;
@@ -190,60 +125,91 @@
 	return GF_OK;
 }
 
-GF_EXPORT
-GF_ModuleManager *gf_modules_new(const char *directory, GF_Config *config)
+u32 gf_modules_refresh(GF_ModuleManager *pm);
+
+static void gf_modules_check_load()
+{
+	if (gpac_modules_static->needs_load) {
+		gpac_modules_static->needs_load = GF_FALSE;
+#ifndef GPAC_MODULE_CUSTOM_LOAD
+		load_all_modules(gpac_modules_static);
+#endif
+		gf_modules_refresh(gpac_modules_static);
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Loaded %d modules.\n", gf_modules_count() ));
+	}
+}
+
+
+/*!
+\brief module manager construtcor
+ *
+ *Constructs a module manager object.
+\param directory absolute path to the directory where the manager shall look for modules
+\param cfgFile GPAC configuration file handle. If this is NULL, the modules won't be able to share the configuration
+ *file with the rest of the GPAC framework.
+\return the module manager object
+*/
+void gf_modules_new(GF_Config *config)
 {
-	GF_ModuleManager *tmp;
-	u32 loadedModules;
 	const char *opt;
 	u32 num_dirs = 0;
 
-	if (!config) return NULL;
+	if (!config) return;
+	if (gpac_modules_static) return;
 
 	/* Try to resolve directory from config file */
-	GF_SAFEALLOC(tmp, GF_ModuleManager);
-	if (!tmp) return NULL;
-	tmp->cfg = config;
-	tmp->mutex = gf_mx_new("Module Manager");
-	gf_modules_get_module_directories(tmp, &num_dirs);
+	GF_SAFEALLOC(gpac_modules_static, GF_ModuleManager);
+	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);
 
 	/* Initialize module list */
-	tmp->plug_list = gf_list_new();
-	if (!tmp->plug_list) {
+	gpac_modules_static->plug_list = gf_list_new();
+	if (!gpac_modules_static->plug_list) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("OUT OF MEMORY, cannot create list of modules !!!\n"));
-		gf_free(tmp);
-		return NULL;
+		gf_free(gpac_modules_static);
+		gpac_modules_static = NULL;
+		return;
 	}
-	tmp->plugin_registry = gf_list_new();
-	if (!tmp->plugin_registry) {
+	gpac_modules_static->plugin_registry = gf_list_new();
+	if (!gpac_modules_static->plugin_registry) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("OUT OF MEMORY, cannot create list of static module registers !!!\n"));
-		gf_list_del(tmp->plug_list);
-		gf_free(tmp);
-		return NULL;
+		gf_list_del(gpac_modules_static->plug_list);
+		gf_free(gpac_modules_static);
+		gpac_modules_static = NULL;
+		return;
 	}
 
-	opt = gf_cfg_get_key(config, "Systems", "ModuleUnload");
-	if (opt && !strcmp(opt, "no")) {
-		tmp->no_unload = GF_TRUE;
+	gpac_modules_static->no_unload = !gf_opts_get_bool("core", "mod-reload");
+
+	opt = gf_opts_get_key("core", "version");
+	if (!opt || strcmp(opt, gf_gpac_version())) {
+		gf_cfg_del_section(config, "PluginsCache");
+		gf_opts_set_key("core", "version", gf_gpac_version());
 	}
-#ifndef GPAC_MODULE_CUSTOM_LOAD
-	load_all_modules(tmp);
-#endif
-	loadedModules = gf_modules_refresh(tmp);
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Loaded %d modules from directory %s.\n", loadedModules, directory));
 
-	return tmp;
+	gpac_modules_static->needs_load = GF_TRUE;
 }
 
-GF_EXPORT
-void gf_modules_del(GF_ModuleManager *pm)
+
+/*!
+\brief module manager destructor
+ *
+ *Destroys the module manager
+\param pm the module manager
+ */
+void gf_modules_del()
 {
 	u32 i;
-	ModuleInstance *inst;
+	GF_ModuleManager *pm = gpac_modules_static;
 	if (!pm) return;
+
+	gpac_modules_static = NULL;
+
 	/*unload all modules*/
 	while (gf_list_count(pm->plug_list)) {
-		inst = (ModuleInstance *) gf_list_get(pm->plug_list, 0);
+		ModuleInstance *inst = (ModuleInstance *) gf_list_get(pm->plug_list, 0);
 		gf_modules_free_module(inst);
 		gf_list_rem(pm->plug_list, 0);
 	}
@@ -277,19 +243,22 @@
 }
 
 GF_EXPORT
-u32 gf_modules_get_count(GF_ModuleManager *pm)
+u32 gf_modules_count()
 {
-	if (!pm) return 0;
-	return gf_list_count(pm->plug_list);
+	if (!gpac_modules_static) return 0;
+	gf_modules_check_load();
+	return gf_list_count(gpac_modules_static->plug_list);
 }
 
 GF_EXPORT
-const char **gf_modules_get_module_directories(GF_ModuleManager *pm, u32* num_dirs)
+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;
@@ -297,22 +266,21 @@
 	if (!pm->cfg) return NULL;
 
 	/* Get directory from config file */
-	directories = (char*)gf_cfg_get_key(pm->cfg, "General", "ModulesDirectory");
+	directories = (char*)gf_opts_get_key("core", "mod-dirs");
 	if (! directories) {
-#ifndef GPAC_IPHONE
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Module directory not found - check the configuration file exit and the \"ModulesDirectory\" key is set\n"));
+#ifndef GPAC_CONFIG_IOS
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Modules directories not found - check the \"ModulesDirectory\" key is set in the \"Core\" section\n"));
 #endif
 		return NULL;
 	}
 
-//	tmp_dirs = gf_strdup(directories);
 	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  - check the configuration file and the \"ModulesDirectory\" key.\n"));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Reach maximum number of module directories %d.\n", MAX_MODULE_DIRS));
 			break;
 		}
 
@@ -320,27 +288,31 @@
 		pm->num_dirs++;
 		pch = strtok (NULL, ";");
 	}
-//	gf_free(tmp_dirs);
 	*num_dirs = pm->num_dirs;
 	return pm->dirs;
 }
 
 GF_EXPORT
-GF_BaseInterface *gf_modules_load_interface(GF_ModuleManager *pm, u32 whichplug, u32 InterfaceFamily)
+GF_BaseInterface *gf_modules_load(u32 whichplug, u32 InterfaceFamily)
 {
 	const char *opt;
 	char szKey[32];
 	ModuleInstance *inst;
 	GF_BaseInterface *ifce;
+	GF_ModuleManager *pm = gpac_modules_static;
 
 	if (!pm) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_interface() : No Module Manager set\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load() : No Module Manager set\n"));
 		return NULL;
 	}
+
 	gf_mx_p(pm->mutex);
+
+	gf_modules_check_load();
+
 	inst = (ModuleInstance *) gf_list_get(pm->plug_list, whichplug);
 	if (!inst) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_interface() : no module %d exist.\n", whichplug));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load() : no module %d exist.\n", whichplug));
 		gf_mx_v(pm->mutex);
 		return NULL;
 	}
@@ -362,13 +334,15 @@
 	}
 	if (!gf_modules_load_library(inst)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load library %s\n", inst->name));
-		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "Invalid Plugin");
+		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "invalid");
 		gf_mx_v(pm->mutex);
 		return NULL;
 	}
 	if (!inst->query_func) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Library %s missing GPAC export symbols\n", inst->name));
-		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "Invalid Plugin");
+		if (!inst->filterreg_func) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Library %s missing GPAC export symbols\n", inst->name));
+			gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "invalid");
+		}
 		goto err_exit;
 	}
 
@@ -381,7 +355,7 @@
 		const u32 *si = inst->query_func();
 		if (!si) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] GPAC module %s has no supported interfaces - disabling\n", inst->name));
-			gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "Invalid Plugin");
+			gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "invalid");
 			goto err_exit;
 		}
 		i=0;
@@ -396,6 +370,8 @@
 			if (InterfaceFamily==si[i]) found = GF_TRUE;
 			i++;
 		}
+		strcat(key, inst->filterreg_func ? "GFR1:yes" : "GFR1:no");
+
 		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, key);
 		gf_free(key);
 		if (!found) goto err_exit;
@@ -424,17 +400,56 @@
 	return NULL;
 }
 
+void *gf_modules_load_filter(u32 whichplug, void *fsess)
+{
+	const char *opt;
+	ModuleInstance *inst;
+	void *freg = NULL;
+	GF_ModuleManager *pm = gpac_modules_static;
+	if (!pm) return NULL;
+	gf_modules_check_load();
+
+	inst = (ModuleInstance *) gf_list_get(pm->plug_list, whichplug);
+	if (!inst) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load() : no module %d exist.\n", whichplug));
+		return NULL;
+	}
+	if (strncmp(inst->name, "gf_", 3))
+		return NULL;
+	opt = gf_cfg_get_key(pm->cfg, "PluginsCache", inst->name);
+	if (opt) {
+		if (!strcmp(opt, "invalid")) return NULL;
+		if (!strstr(opt, "GFR1:yes")) return NULL;
+	}
+	if (!gf_modules_load_library(inst)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load library %s\n", inst->name));
+		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "invalid");
+		return NULL;
+	}
+	freg = NULL;
+	if (inst->filterreg_func) {
+		freg = inst->filterreg_func(fsess);
+	}
+	if (!freg) {
+		gf_modules_unload_library(inst);
+	}
+	return freg;
+}
 
 GF_EXPORT
-GF_BaseInterface *gf_modules_load_interface_by_name(GF_ModuleManager *pm, const char *plug_name, u32 InterfaceFamily)
+GF_BaseInterface *gf_modules_load_by_name(const char *plug_name, u32 InterfaceFamily)
 {
 	const char *file_name;
 	u32 i, count;
 	GF_BaseInterface *ifce;
+	GF_ModuleManager *pm = gpac_modules_static;
 	if (!pm || !plug_name || !pm->plug_list || !pm->cfg) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_interface_by_name has bad parameters pm=%p, plug_name=%s.\n", pm, plug_name));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] gf_modules_load_by_name has bad parameters pm=%p, plug_name=%s.\n", pm, plug_name));
 		return NULL;
 	}
+
+	gf_modules_check_load();
+
 	count = gf_list_count(pm->plug_list);
 	/*look for cache entry*/
 	file_name = gf_cfg_get_key(pm->cfg, "PluginsCache", plug_name);
@@ -444,7 +459,7 @@
 		for (i=0; i<count; i++) {
 			ModuleInstance *inst = (ModuleInstance *) gf_list_get(pm->plug_list, i);
 			if (!strcmp(inst->name,  file_name)) {
-				ifce = gf_modules_load_interface(pm, i, InterfaceFamily);
+				ifce = gf_modules_load(i, InterfaceFamily);
 				if (ifce) return ifce;
 			}
 		}
@@ -452,7 +467,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Plugin %s of type %d not found in cache, searching for it...\n", plug_name, InterfaceFamily));
 	for (i=0; i<count; i++) {
 		const char *mod_filename;
-		ifce = gf_modules_load_interface(pm, i, InterfaceFamily);
+		ifce = gf_modules_load(i, InterfaceFamily);
 		if (!ifce) continue;
 		if (ifce->module_name && !strnicmp(ifce->module_name, plug_name, MIN(strlen(ifce->module_name), strlen(plug_name)) )) {
 			/*update cache entry*/
@@ -460,14 +475,14 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Added plugin cache %s for %s\n", plug_name, ((ModuleInstance*)ifce->HPLUG)->name));
 			return ifce;
 		}
-		/*check direct adressing by dynamic lib name*/
+		/*check direct addressing by dynamic lib name*/
 		mod_filename = gf_module_get_file_name(ifce);
 		if (mod_filename && strstr(mod_filename, plug_name)) {
 			return ifce;
 		}
 		gf_modules_close_interface(ifce);
 	}
-	GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] Plugin %s not found in %d modules.\n", plug_name, count));
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Plugin %s not found in %d modules.\n", plug_name, count));
 	return NULL;
 }
 
@@ -494,36 +509,9 @@
 }
 
 GF_EXPORT
-const char *gf_modules_get_option(GF_BaseInterface *ifce, const char *secName, const char *keyName)
-{
-	GF_Config *cfg;
-	if (!ifce || !ifce->HPLUG) return NULL;
-	cfg = ((ModuleInstance *)ifce->HPLUG)->plugman->cfg;
-	if (!cfg) return NULL;
-	return gf_cfg_get_ikey(cfg, secName, keyName);
-}
-
-GF_EXPORT
-GF_Err gf_modules_set_option(GF_BaseInterface *ifce, const char *secName, const char *keyName, const char *keyValue)
+const char *gf_modules_get_file_name(u32 i)
 {
-	GF_Config *cfg;
-	if (!ifce || !ifce->HPLUG) return GF_BAD_PARAM;
-	cfg = ((ModuleInstance *)ifce->HPLUG)->plugman->cfg;
-	if (!cfg) return GF_NOT_SUPPORTED;
-	return gf_cfg_set_key(cfg, secName, keyName, keyValue);
-}
-
-GF_EXPORT
-GF_Config *gf_modules_get_config(GF_BaseInterface *ifce)
-{
-	if (!ifce || !ifce->HPLUG) return NULL;
-	return ((ModuleInstance *)ifce->HPLUG)->plugman->cfg;
-}
-
-GF_EXPORT
-const char *gf_modules_get_file_name(GF_ModuleManager *pm, u32 i)
-{
-	ModuleInstance *inst = (ModuleInstance *) gf_list_get(pm->plug_list, i);
+	ModuleInstance *inst = (ModuleInstance *) gf_list_get(gpac_modules_static->plug_list, i);
 	if (!inst) return NULL;
 	return inst->name;
 }
@@ -536,5 +524,83 @@
 	return inst->name;
 }
 
+#include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
+#include <gpac/modules/font.h>
+static Bool module_check_ifce(GF_BaseInterface *ifce, u32 ifce_type)
+{
+	switch (ifce_type) {
+	case GF_VIDEO_OUTPUT_INTERFACE:
+	{
+		GF_VideoOutput *vout = (GF_VideoOutput *) ifce;
+		if (!vout || !vout->Flush || !vout->Setup) return GF_FALSE;
+		return GF_TRUE;
+	}
+	case GF_AUDIO_OUTPUT_INTERFACE:
+	{
+		GF_AudioOutput *aout = (GF_AudioOutput *) ifce;
+		if (!aout || !aout->Configure || !aout->Setup) return GF_FALSE;
+		//no more support for raw out, deprecated
+		if (!stricmp(ifce->module_name, "Raw Audio Output")) return GF_FALSE;
+		/*check that's a valid audio mode*/
+		if ((aout->SelfThreaded && aout->SetPriority) || aout->WriteAudio)
+			return GF_TRUE;
+		return GF_FALSE;
+	}
+
+	default:
+		return GF_TRUE;
+	}
+}
+
 
+GF_BaseInterface *gf_module_load(u32 ifce_type, const char *name)
+{
+	GF_BaseInterface *ifce = NULL;
+	if (name) {
+		ifce = gf_modules_load_by_name(name, ifce_type);
+		if (!module_check_ifce(ifce, ifce_type)) {
+			gf_modules_close_interface(ifce);
+			ifce = NULL;
+		}
+	}
+	/*get a preferred output*/
+	if (!ifce) {
+		const char *sOpt;
+		switch (ifce_type) {
+		case GF_VIDEO_OUTPUT_INTERFACE:
+			sOpt = gf_opts_get_key("core", "video-output");
+			break;
+		case GF_AUDIO_OUTPUT_INTERFACE:
+			sOpt = gf_opts_get_key("core", "audio-output");
+			break;
+		case GF_FONT_READER_INTERFACE:
+			sOpt = gf_opts_get_key("core", "font-reader");
+			break;
+		default:
+			sOpt = NULL;
+		}
+		if (sOpt) {
+			ifce = gf_modules_load_by_name(sOpt, ifce_type);
+			if (!module_check_ifce(ifce, ifce_type)) {
+				gf_modules_close_interface(ifce);
+				ifce = NULL;
+			}
+		}
+	}
+	if (!ifce) {
+		u32 i, count = gf_modules_count();
+		for (i=0; i<count; i++) {
+			ifce = gf_modules_load(i, ifce_type);
+			if (!ifce) continue;
 
+			if (!module_check_ifce(ifce, ifce_type)) {
+				gf_modules_close_interface(ifce);
+				ifce = NULL;
+				continue;
+			}
+			return ifce;
+		}
+	}
+	return ifce;
+}

gpac-0.8.0.tar.gz/src/utils/module_wrap.h -> gpac-1.0.0.tar.gz/src/utils/module_wrap.h Changed

gpac-0.8.0.tar.gz/src/utils/os_config_init.c -> gpac-1.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-2012
+ *			Copyright (c) Telecom ParisTech 2000-2020
  *					All rights reserved
  *
  *  This file is part of GPAC / common tools sub-project
@@ -33,6 +33,7 @@
 
 #ifndef _WIN32_WCE
 #include <direct.h>  /*for _mkdir*/
+#include <gpac/utf.h>
 #include <shlobj.h>  /*for getting user-dir*/
 
 #ifndef SHGFP_TYPE_CURRENT
@@ -42,15 +43,15 @@
 #endif
 
 #define CFG_FILE_NAME	"GPAC.cfg"
-#define TEST_MODULE		"gm_dummy_in.dll"
+#define TEST_MODULE		"gm_"
 
 #elif (defined(__DARWIN__) || defined(__APPLE__) )
 #include <mach-o/dyld.h> /*for _NSGetExecutablePath */
 
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 #define TEST_MODULE     "osmo4ios"
 #else
-#define TEST_MODULE		"gm_dummy_in.dylib"
+#define TEST_MODULE		"gm_"
 #endif
 #define CFG_FILE_NAME	"GPAC.cfg"
 
@@ -58,33 +59,51 @@
 #ifdef GPAC_CONFIG_LINUX
 #include <unistd.h>
 #endif
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 #define DEFAULT_ANDROID_PATH_APP	"/data/data/com.gpac.Osmo4"
 #define DEFAULT_ANDROID_PATH_CFG	"/sdcard/osmo"
 #endif
 #define CFG_FILE_NAME	"GPAC.cfg"
 
 #if defined(GPAC_CONFIG_WIN32)
-#define TEST_MODULE		"gm_dummy_in.dll"
+#define TEST_MODULE		"gm_"
 #else
-#define TEST_MODULE		"gm_dummy_in.so"
+#define TEST_MODULE		"gm_"
 #endif
 
 #endif
 
+#if !defined(GPAC_STATIC_MODULES) && !defined(GPAC_MP4BOX_MINI)
+
+static Bool mod_enum(void *cbck, char *item_name, char *item_path, GF_FileEnumInfo *file_info)
+{
+	if (!strncmp(item_name, "gm_", 3) || !strncmp(item_name, "gf_", 3)) {
+		*(Bool*)cbck = GF_TRUE;
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+#endif
 
 static Bool check_file_exists(char *name, char *path, char *outPath)
 {
 	char szPath[GF_MAX_PATH];
 	FILE *f;
 
-#ifdef GPAC_STATIC_MODULES
+	if (! gf_dir_exists(path)) return 0;
+
 	if (!strcmp(name, TEST_MODULE)) {
-		if (! gf_dir_exists(path)) return 0;
+		Bool res = GF_FALSE;
+#if defined(GPAC_STATIC_MODULES) || defined(GPAC_MP4BOX_MINI)
+		if (gf_dir_exists(path)) res = GF_TRUE;
+#else
+		gf_enum_directory(path, GF_FALSE, mod_enum, &res, NULL);
+#endif
+		if (!res) return GF_FALSE;
 		if (outPath != path) strcpy(outPath, path);
 		return 1;
 	}
-#endif
+
 	sprintf(szPath, "%s%c%s", path, GF_PATH_SEPARATOR, name);
 	//do not use gf_fopen here, we don't want to throw en error if failure
 	f = fopen(szPath, "rb");
@@ -98,7 +117,8 @@
 {
 	GF_PATH_APP,
 	GF_PATH_CFG,
-	GF_PATH_GUI,
+	//were we store gui/%, shaders/*, scripts/*
+	GF_PATH_SHARE,
 	GF_PATH_MODULES,
 };
 
@@ -106,21 +126,22 @@
 static Bool get_default_install_path(char *file_path, u32 path_type)
 {
 	FILE *f;
-	char *sep;
 	char szPath[GF_MAX_PATH];
 
-
 #ifdef _WIN32_WCE
 	TCHAR w_szPath[GF_MAX_PATH];
 	GetModuleFileName(NULL, w_szPath, GF_MAX_PATH);
 	CE_WideToChar((u16 *) w_szPath, file_path);
 #else
+	wchar_t wtmp_file_path[GF_MAX_PATH];
+	char* tmp_file_path;
+
 	GetModuleFileNameA(NULL, file_path, GF_MAX_PATH);
 #endif
 
 	/*remove exe name*/
 	if (strstr(file_path, ".exe")) {
-		sep = strrchr(file_path, '\\');
+		char *sep = strrchr(file_path, '\\');
 		if (sep) sep[0] = 0;
 	}
 
@@ -162,15 +183,15 @@
 
 	if (path_type==GF_PATH_APP) return GF_TRUE;
 
-	if (path_type==GF_PATH_GUI) {
+	if (path_type==GF_PATH_SHARE) {
 		char *sep;
-		strcat(file_path, "\\gui");
-		if (check_file_exists("gui.bt", file_path, file_path)) return GF_TRUE;
+		strcat(file_path, "\\share");
+		if (check_file_exists("gui\\gui.bt", file_path, file_path)) return GF_TRUE;
 		sep = strstr(file_path, "\\bin\\");
 		if (sep) {
 			sep[0] = 0;
-			strcat(file_path, "\\gui");
-			if (check_file_exists("gui.bt", file_path, file_path)) return GF_TRUE;
+			strcat(file_path, "\\share");
+			if (check_file_exists("gui\\gui.bt", file_path, file_path)) return GF_TRUE;
 		}
 		return GF_FALSE;
 	}
@@ -186,45 +207,52 @@
 	f = fopen(szPath, "wb");
 	if (f != NULL) {
 		fclose(f);
-		gf_delete_file(szPath);
+		gf_file_delete(szPath);
 		return GF_TRUE;
 	}
 #ifdef _WIN32_WCE
 	return 0;
 #else
 	/*no write access, get user home directory*/
-	SHGetFolderPath(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, file_path);
+	SHGetSpecialFolderPathW(NULL, wtmp_file_path, CSIDL_APPDATA, 1);
+	tmp_file_path = gf_wcs_to_utf8(wtmp_file_path);
+	strncpy(file_path, tmp_file_path, GF_MAX_PATH);
+	file_path[GF_MAX_PATH-1] = 0;
+	gf_free(tmp_file_path);
+
 	if (file_path[strlen(file_path)-1] != '\\') strcat(file_path, "\\");
 	strcat(file_path, "GPAC");
 	/*create GPAC dir*/
-	_mkdir(file_path);
+	gf_mkdir(file_path);
 	strcpy(szPath, file_path);
 	strcat(szPath, "\\gpaccfgtest.txt");
-	f = fopen(szPath, "wb");
+	f = gf_fopen(szPath, "wb");
 	/*COMPLETE FAILURE*/
 	if (!f) return GF_FALSE;
 
-	fclose(f);
-	gf_delete_file(szPath);
+	gf_fclose(f);
+	gf_file_delete(szPath);
 	return GF_TRUE;
 #endif
 }
 
 /*FIXME - the paths defined here MUST be coherent with the paths defined in applications/osmo4_android/src/com/gpac/Osmo4/GpacConfig.java'*/
-#elif defined(GPAC_ANDROID)
+#elif defined(GPAC_CONFIG_ANDROID)
 
 static Bool get_default_install_path(char *file_path, u32 path_type)
 {
+	if (!file_path) return 0;
+
 	if (path_type==GF_PATH_APP) {
 		strcpy(file_path, DEFAULT_ANDROID_PATH_APP);
 		return 1;
 	} else if (path_type==GF_PATH_CFG) {
 		strcpy(file_path, DEFAULT_ANDROID_PATH_CFG);
 		return 1;
-	} else if (path_type==GF_PATH_GUI) {
+	} else if (path_type==GF_PATH_SHARE) {
 		if (!get_default_install_path(file_path, GF_PATH_APP))
 			return 0;
-		strcat(file_path, "/gui");
+		strcat(file_path, "/share");
 		return 1;
 	} else if (path_type==GF_PATH_MODULES) {
 		if (!get_default_install_path(file_path, GF_PATH_APP))
@@ -264,12 +292,14 @@
 {
 	char app_path[GF_MAX_PATH];
 	char *sep;
-	u32 size = GF_MAX_PATH;
+#if (defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_LINUX))
+	u32 size;
+#endif
 
 	/*on OSX, Linux & co, user home is where we store the cfg file*/
 	if (path_type==GF_PATH_CFG) {
 		char *user_home = getenv("HOME");
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 		char buf[PATH_MAX];
 		char *res;
 #endif
@@ -277,7 +307,7 @@
 			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Couldn't find HOME directory\n"));
 			return 0;
 		}
-#ifdef GPAC_IPHONE
+#ifdef GPAC_CONFIG_IOS
 		res = realpath(user_home, buf);
 		if (res) {
 			strcpy(file_path, buf);
@@ -292,7 +322,7 @@
 		if (check_file_exists(".gpacrc", file_path, file_path)) {
 			strcpy(app_path, file_path);
 			strcat(app_path, "/.gpacrc");
-			gf_delete_file(app_path);
+			gf_file_delete(app_path);
 		}
 
 		strcat(file_path, "/.gpac");
@@ -304,9 +334,10 @@
 
 	if (path_type==GF_PATH_APP) {
 #if (defined(__DARWIN__) || defined(__APPLE__) )
+		size = GF_MAX_PATH-1;
 		if (_NSGetExecutablePath(app_path, &size) ==0) {
 			realpath(app_path, file_path);
-			char *sep = strrchr(file_path, '/');
+			sep = strrchr(file_path, '/');
 			if (sep) sep[0] = 0;
 			return 1;
 		}
@@ -314,7 +345,6 @@
 #elif defined(GPAC_CONFIG_LINUX)
 		size = readlink("/proc/self/exe", file_path, GF_MAX_PATH-1);
 		if (size>0) {
-			char *sep;
 			file_path[size] = 0;
 			sep = strrchr(file_path, '/');
 			if (sep) sep[0] = 0;
@@ -355,12 +385,12 @@
 
 	/*installed or symlink on system, user user home directory*/
 	if (!strnicmp(app_path, "/usr/", 5) || !strnicmp(app_path, "/opt/", 5)) {
-		if (path_type==GF_PATH_GUI) {
+		if (path_type==GF_PATH_SHARE) {
 			/*look in possible install dirs ...*/
-			if (check_file_exists("gui.bt", "/usr/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/usr/local/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/opt/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/opt/local/share/gpac/gui", file_path)) return 1;
+			if (check_file_exists("gui/gui.bt", "/usr/share/gpac", file_path)) return 1;
+			if (check_file_exists("gui/gui.bt", "/usr/local/share/gpac", file_path)) return 1;
+			if (check_file_exists("gui/gui.bt", "/opt/share/gpac", file_path)) return 1;
+			if (check_file_exists("gui/gui.bt", "/opt/local/share/gpac", file_path)) return 1;
 		} else if (path_type==GF_PATH_MODULES) {
 			/*look in possible install dirs ...*/
 			if (check_file_exists(TEST_MODULE, "/usr/lib64/gpac", file_path)) return 1;
@@ -373,26 +403,26 @@
 		}
 	}
 
-	if (path_type==GF_PATH_GUI) {
+	if (path_type==GF_PATH_SHARE) {
 		if (get_default_install_path(app_path, GF_PATH_CFG)) {
-			/*GUI not found, look in ~/.gpac/gui/ */
-			strcat(app_path, "/.gpac/gui");
-			if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+			/*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;
 		}
 
 		/*GUI not found, look in gpac distribution if any */
 		if (get_default_install_path(app_path, GF_PATH_APP)) {
-			char *sep = strstr(app_path, "/bin/");
+			sep = strstr(app_path, "/bin/");
 			if (sep) {
 				sep[0] = 0;
-				strcat(app_path, "/gui");
-				if (check_file_exists("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;
 			}
 			sep = strstr(app_path, "/build/");
 			if (sep) {
 				sep[0] = 0;
-				strcat(app_path, "/gui");
-				if (check_file_exists("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 .app for OSX case*/
@@ -405,8 +435,9 @@
 			/*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_WARNING, GF_LOG_CORE, ("Couldn't find any modules in standard path (app path %s)\n", app_path));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Couldn't find any modules in standard path (app path %s)\n", app_path));
 		}
 		/*modules not found, look in ~/.gpac/modules/ */
 		if (get_default_install_path(app_path, GF_PATH_CFG)) {
@@ -415,7 +446,7 @@
 			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
 		}
 		/*modules not found, failure*/
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Couldn't find any modules in HOME path (app path %s)\n", app_path));
 		return 0;
 	}
 
@@ -424,15 +455,16 @@
 	if (sep) sep[4] = 0;
 
 	/*we are looking for .app install path, or GUI */
-	if (path_type==GF_PATH_GUI) {
-#ifndef GPAC_IPHONE
-		strcat(app_path, "/Contents/MacOS/gui");
-		if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+	if (path_type==GF_PATH_SHARE) {
+#ifndef GPAC_CONFIG_IOS
+		strcat(app_path, "/Contents/MacOS/share");
+		if (check_file_exists("gui/gui.bt", app_path, file_path)) return 1;
 #else /*iOS: for now, everything is set flat within the package*/
 		/*iOS app is distributed with embedded GUI*/
 		get_default_install_path(app_path, GF_PATH_APP);
-		strcat(app_path, "/gui");
-		if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+		if (check_file_exists("gui/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;
 #endif
 	}
 	else { // (path_type==GF_PATH_MODULES)
@@ -447,8 +479,8 @@
 
 //get real path where the .gpac dir has been created, and use this as the default path
 //for cache (tmp/ dir of ios app) and last working fir
-#ifdef GPAC_IPHONE
-static void gf_ios_refresh_cache_directory( GF_Config *cfg, char *file_path)
+#ifdef GPAC_CONFIG_IOS
+static void gf_ios_refresh_cache_directory( GF_Config *cfg, const char *file_path)
 {
 	char *cache_dir, *old_cache_dir;
 	char buf[GF_MAX_PATH], *res, *sep;
@@ -463,7 +495,7 @@
 
 	strcat(res, "cache/");
 	cache_dir = res;
-	old_cache_dir = (char*) gf_cfg_get_key(cfg, "General", "CacheDirectory");
+	old_cache_dir = (char*) gf_opts_get_key("core", "cache");
 
 	if (!gf_dir_exists(cache_dir)) {
 		if (old_cache_dir && strcmp(old_cache_dir, cache_dir)) {
@@ -471,36 +503,45 @@
 		}
 		gf_mkdir(cache_dir);
 	}
-	gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
+	gf_cfg_set_key(cfg, "core", "cache", cache_dir);
 }
 
 #endif
 
 
-static GF_Config *create_default_config(char *file_path)
+static GF_Config *create_default_config(char *file_path, const char *profile)
 {
-	FILE *f;
 	GF_Config *cfg;
-#if !defined(GPAC_IPHONE) && !defined(GPAC_ANDROID)
-	char *cache_dir;
-#endif
+	char szProfilePath[GF_MAX_PATH];
 	char szPath[GF_MAX_PATH];
-	char gui_path[GF_MAX_PATH];
 
 	if (! get_default_install_path(file_path, GF_PATH_CFG)) {
-		gf_delete_file(szPath);
 		return NULL;
 	}
 	/*Create the config file*/
-	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+	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 = fopen(szPath, "wt");
-	if (!f) return NULL;
-	fclose(f);
+	if (profile && !strcmp(profile, "0")) {
+		cfg = gf_cfg_new(NULL, NULL);
+	} else {
+		FILE *f = gf_fopen(szPath, "wt");
+		if (!f) return NULL;
+		gf_fclose(f);
+
+		cfg = gf_cfg_new(NULL, szPath);
+	}
+
+	if (!cfg) return NULL;
+	strcpy(szProfilePath, szPath);
 
-#ifndef GPAC_IPHONE
+
+#ifndef GPAC_CONFIG_IOS
 	if (! get_default_install_path(szPath, GF_PATH_MODULES)) {
-		gf_delete_file(szPath);
+		gf_file_delete(szPath);
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] default modules not found\n"));
 		return NULL;
 	}
@@ -508,45 +549,37 @@
 	get_default_install_path(szPath, GF_PATH_APP);
 #endif
 
-	cfg = gf_cfg_new(file_path, CFG_FILE_NAME);
-	if (!cfg) return NULL;
+#if defined(GPAC_CONFIG_IOS)
+	gf_cfg_set_key(cfg, "core", "devclass", "ios");
+#elif defined(GPAC_CONFIG_ANDROID)
+	gf_cfg_set_key(cfg, "core", "devclass", "android");
+#else
+	gf_cfg_set_key(cfg, "core", "devclass", "desktop");
+#endif
+
 
-	gf_cfg_set_key(cfg, "General", "ModulesDirectory", szPath);
 
-#if defined(GPAC_IPHONE)
+	gf_cfg_set_key(cfg, "core", "mod-dirs", szPath);
+
+#if defined(GPAC_CONFIG_IOS)
 	gf_ios_refresh_cache_directory(cfg, file_path);
-#elif defined(GPAC_ANDROID)
+#elif defined(GPAC_CONFIG_ANDROID)
 	if (get_default_install_path(szPath, GF_PATH_APP)) {
 		strcat(szPath, "/cache");
-		gf_cfg_set_key(cfg, "General", "CacheDirectory", szPath);
+		gf_cfg_set_key(cfg, "core", "cache", szPath);
 	}
 #else
 	/*get default temporary directoy */
-	cache_dir = gf_get_default_cache_directory();
-
-	if (cache_dir) {
-		gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
-		gf_free(cache_dir);
-	}
-#endif
-
-#if defined(GPAC_IPHONE)
-	gf_cfg_set_key(cfg, "General", "DeviceType", "iOS");
-#elif defined(GPAC_ANDROID)
-	gf_cfg_set_key(cfg, "General", "DeviceType", "Android");
-#else
-	gf_cfg_set_key(cfg, "General", "DeviceType", "Desktop");
+	gf_cfg_set_key(cfg, "core", "cache", gf_get_default_cache_directory());
 #endif
 
-	gf_cfg_set_key(cfg, "Compositor", "Raster2D", "GPAC 2D Raster");
-	gf_cfg_set_key(cfg, "Audio", "ForceConfig", "yes");
-	gf_cfg_set_key(cfg, "Audio", "NumBuffers", "2");
-	gf_cfg_set_key(cfg, "Audio", "TotalDuration", "120");
-	gf_cfg_set_key(cfg, "Audio", "DisableNotification", "no");
+	gf_cfg_set_key(cfg, "core", "ds-disable-notif", "no");
 
 	/*Setup font engine to FreeType by default, and locate TrueType font directory on the system*/
-	gf_cfg_set_key(cfg, "FontEngine", "FontReader", "FreeType Font Reader");
-	gf_cfg_set_key(cfg, "FontEngine", "RescanFonts", "yes");
+	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)
@@ -558,74 +591,87 @@
 	strcat((char *)szPath, "Fonts");
 #elif defined(__APPLE__)
 
-#ifdef GPAC_IPHONE
+#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_ANDROID)
+#elif defined(GPAC_CONFIG_ANDROID)
 	strcpy(szPath, "/system/fonts/");
 #else
-	strcpy(szPath, "/usr/share/fonts/truetype/");
+	//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_cfg_set_key(cfg, "FontEngine", "FontDirectory", szPath);
+	gf_cfg_set_key(cfg, "core", "font-dirs", szPath);
 
-	gf_cfg_set_key(cfg, "Downloader", "CleanCache", "200M");
-	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", "All");
-	gf_cfg_set_key(cfg, "Compositor", "FrameRate", "30.0");
-	/*use power-of-2 emulation in OpenGL if no rectangular texture extension*/
-	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", "yes");
-	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", "yes");
+	gf_cfg_set_key(cfg, "core", "cache-size", "100M");
 
 #if defined(_WIN32_WCE)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "GAPI Video Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "GAPI Video Output");
 #elif defined(WIN32)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "DirectX Video Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "DirectX Video Output");
 #elif defined(__DARWIN__) || defined(__APPLE__)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "SDL Video Output");
-#elif defined(GPAC_ANDROID)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "Android Video Output");
-	gf_cfg_set_key(cfg, "Audio", "DriverName", "Android Audio Output");
+	gf_cfg_set_key(cfg, "core", "video-output", "SDL Video Output");
+#elif defined(GPAC_CONFIG_ANDROID)
+	gf_cfg_set_key(cfg, "core", "video-output", "Android Video Output");
+	gf_cfg_set_key(cfg, "core", "audio-output", "Android Audio Output");
 #else
-	gf_cfg_set_key(cfg, "Video", "DriverName", "X11 Video Output");
-	gf_cfg_set_key(cfg, "Audio", "DriverName", "SDL Audio Output");
-#endif
-#ifdef GPAC_IPHONE
-	gf_cfg_set_key(cfg, "Compositor", "DisableGLUScale", "yes");
+	gf_cfg_set_key(cfg, "core", "video-output", "X11 Video Output");
+	gf_cfg_set_key(cfg, "core", "audio-output", "SDL Audio Output");
 #endif
 
-	gf_cfg_set_key(cfg, "Video", "SwitchResolution", "no");
-	gf_cfg_set_key(cfg, "Video", "HardwareMemory", "Auto");
-	gf_cfg_set_key(cfg, "Network", "AutoReconfigUDP", "yes");
-	gf_cfg_set_key(cfg, "Network", "UDPTimeout", "10000");
-	gf_cfg_set_key(cfg, "Network", "BufferLength", "3000");
-	gf_cfg_set_key(cfg, "Network", "BufferMaxOccupancy", "10000");
+	gf_cfg_set_key(cfg, "core", "switch-vres", "no");
+	gf_cfg_set_key(cfg, "core", "hwvmem", "auto");
 
 
 	/*locate GUI*/
-	if ( get_default_install_path(szPath, GF_PATH_GUI) ) {
-		char *sep = strrchr(szPath, GF_PATH_SEPARATOR);
-		if (!sep) sep = strrchr(szPath, GF_PATH_SEPARATOR);
-		sprintf(gui_path, "%s%cgui.bt", szPath, GF_PATH_SEPARATOR);
-		f = gf_fopen(gui_path, "rt");
-		if (f) {
-			gf_fclose(f);
+	if ( get_default_install_path(szPath, GF_PATH_SHARE) ) {
+		char gui_path[GF_MAX_PATH+100];
+		sprintf(gui_path, "%s%cgui%cgui.bt", szPath, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
+		if (gf_file_exists(gui_path)) {
 			gf_cfg_set_key(cfg, "General", "StartupFile", gui_path);
 		}
 
 		/*shaders are at the same location*/
-		assert(sep);
-		sep[0] = 0;
 		sprintf(gui_path, "%s%cshaders%cvertex.glsl", szPath, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		gf_cfg_set_key(cfg, "Compositor", "VertexShader", gui_path);
+		gf_cfg_set_key(cfg, "filter@compositor", "vertshader", gui_path);
 		sprintf(gui_path, "%s%cshaders%cfragment.glsl", szPath, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		gf_cfg_set_key(cfg, "Compositor", "FragmentShader", gui_path);
+		gf_cfg_set_key(cfg, "filter@compositor", "fragshader", gui_path);
+
+		//aliases and other defaults
+		sprintf(gui_path, "%s%cdefault.cfg", szPath, GF_PATH_SEPARATOR);
+		if (gf_file_exists(gui_path)) {
+			GF_Config *aliases = gf_cfg_new(NULL, gui_path);
+			if (aliases) {
+				u32 i, count = gf_cfg_get_section_count(aliases);
+				for (i=0; i<count; i++) {
+					u32 j, count2;
+					const char *sec_name = gf_cfg_get_section_name(aliases, i);
+					if (!sec_name) continue;
+					count2 = gf_cfg_get_key_count(aliases, sec_name);
+					for (j=0; j<count2; j++) {
+						const char *name = gf_cfg_get_key_name(aliases, sec_name, j);
+						const char *val = gf_cfg_get_key(aliases, sec_name, name);
+						gf_cfg_set_key(cfg, sec_name, name, val);
+					}
+				}
+			}
+			gf_cfg_del(aliases);
+		}
 	}
 
+	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);
+		gf_cfg_discard_changes(cfg);
+		return cfg;
+	}
 	/*store and reload*/
+	strcpy(szPath, gf_cfg_get_filename(cfg));
 	gf_cfg_del(cfg);
-	return gf_cfg_new(file_path, CFG_FILE_NAME);
+	return gf_cfg_new(NULL, szPath);
 }
 
 /*check if modules directory has changed in the config file
@@ -634,12 +680,12 @@
 {
 	char path[GF_MAX_PATH];
 
-#ifdef GPAC_IPHONE
-	char *cfg_path;
-	if ( get_default_install_path(path, GF_PATH_GUI) ) {
+#ifdef GPAC_CONFIG_IOS
+	const char *cfg_path;
+	if ( get_default_install_path(path, GF_PATH_SHARE) ) {
 		char *sep;
 		char shader_path[GF_MAX_PATH];
-		strcat(path, "/gui.bt");
+		strcat(path, "/gui/gui.bt");
 		gf_cfg_set_key(cfg, "General", "StartupFile", path);
 		//get rid of "/gui/gui.bt"
 		sep = strrchr(path, '/');
@@ -648,31 +694,30 @@
 		sep[0] = 0;
 
 		sprintf(shader_path, "%s%cshaders%cvertex.glsl", path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		gf_cfg_set_key(cfg, "Compositor", "VertexShader", shader_path);
+		gf_cfg_set_key(cfg, "filter@compositor", "vertshader", shader_path);
 		sprintf(shader_path, "%s%cshaders%cfragment.glsl", path, GF_PATH_SEPARATOR, GF_PATH_SEPARATOR);
-		gf_cfg_set_key(cfg, "Compositor", "FragmentShader", shader_path);
+		gf_cfg_set_key(cfg, "filter@compositor", "fragshader", shader_path);
 	}
 	cfg_path = gf_cfg_get_filename(cfg);
 	gf_ios_refresh_cache_directory(cfg, cfg_path);
-	gf_free(cfg_path);
 
 #else
 	const char *opt;
 
 	if ( get_default_install_path(path, GF_PATH_MODULES) ) {
-		opt = gf_cfg_get_key(cfg, "General", "ModulesDirectory");
+		opt = gf_cfg_get_key(cfg, "core", "mod-dirs");
 		//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, "General", "ModulesDirectory", path);
+			gf_cfg_set_key(cfg, "core", "mod-dirs", 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, "General", "ModulesDirectory", path);
+			gf_cfg_set_key(cfg, "core", "mod-dirs", path);
 		} else  {
 			Bool erase_modules_dir = GF_FALSE;
-			const char *opt64 = gf_cfg_get_key(cfg, "Systems", "64bits");
+			const char *opt64 = gf_cfg_get_key(cfg, "core", "64bits");
 			if (!opt64) {
 				//first run or old versions, erase
 				erase_modules_dir = GF_TRUE;
@@ -691,10 +736,10 @@
 #else
 			opt64 = "no";
 #endif
-			gf_cfg_set_key(cfg, "Systems", "64bits", opt64);
+			gf_cfg_set_key(cfg, "core", "64bits", opt64);
 
 			if (erase_modules_dir) {
-				gf_cfg_set_key(cfg, "General", "ModulesDirectory", path);
+				gf_cfg_set_key(cfg, "core", "mod-dirs", path);
 			}
 		}
 #endif
@@ -703,11 +748,11 @@
 	/*if startup file was disabled, do not attempt to correct it*/
 	if (gf_cfg_get_key(cfg, "General", "StartupFile")==NULL) return;
 
-	if ( get_default_install_path(path, GF_PATH_GUI) ) {
+	if ( get_default_install_path(path, GF_PATH_SHARE) ) {
 		opt = gf_cfg_get_key(cfg, "General", "StartupFile");
 		if (strstr(opt, "gui.bt") && strcmp(opt, path) && strstr(path, ".app") ) {
 #if defined(__DARWIN__) || defined(__APPLE__)
-			strcat(path, "/gui.bt");
+			strcat(path, "/gui/gui.bt");
 			gf_cfg_set_key(cfg, "General", "StartupFile", path);
 #endif
 		}
@@ -716,61 +761,1299 @@
 #endif
 }
 
-GF_EXPORT
-GF_Config *gf_cfg_init(const char *file, Bool *new_cfg)
+
+/*!
+\brief configuration file initialization
+ *
+ * Constructs a configuration file from fileName. If fileName is NULL, the default GPAC configuration file is loaded with the
+ * proper module directory, font directory and other default options. If fileName is non-NULL no configuration file is found,
+ * a "light" default configuration file is created.
+\param profile name or path to existing config file
+\return the configuration file object, NULL if the file could not be created
+ */
+ #include <gpac/network.h>
+
+static GF_Config *gf_cfg_init(const char *profile)
 {
-	GF_Config *cfg;
+	GF_Config *cfg=NULL;
+	u32 prof_len=0;
+	Bool force_new_cfg=GF_FALSE;
 	char szPath[GF_MAX_PATH];
+	char *prof_opt = NULL;
+
+	if (profile) {
+		prof_len = (u32) strlen(profile);
+		prof_opt = gf_url_colon_suffix(profile);
+		if (prof_opt) {
+			prof_len -= (u32) strlen(prof_opt);
+			if (strstr(prof_opt, "reload")) force_new_cfg = GF_TRUE;
 
-	if (new_cfg) *new_cfg = GF_FALSE;
+			prof_opt[0] = 0;
+		}
+	}
+	if (profile && !prof_len)
+		profile = NULL;
 
-	if (file) {
-		cfg = gf_cfg_new(NULL, file);
-		/*force creation of a new config*/
+	if (profile && (strchr(profile, '/') || strchr(profile, '\\')) ) {
+		if (!gf_file_exists(profile)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Config file %s does not exist\n", profile));
+			goto exit;
+		}
+		cfg = gf_cfg_new(NULL, profile);
 		if (!cfg) {
-			FILE *fcfg = gf_fopen(file, "wt");
-			if (fcfg) {
-				gf_fclose(fcfg);
-				cfg = gf_cfg_new(NULL, file);
-				if (new_cfg) *new_cfg = GF_TRUE;
-			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Failed to load existing config file %s\n", profile));
+			goto exit;
 		}
-		if (cfg) {
-			check_modules_dir(cfg);
-			return cfg;
+		if (force_new_cfg) {
+			gf_cfg_del(cfg);
+			cfg = create_default_config(NULL, profile);
 		}
+		check_modules_dir(cfg);
+		goto exit;
 	}
 
 	if (!get_default_install_path(szPath, GF_PATH_CFG)) {
-		fprintf(stderr, "Fatal error: Cannot create a configuration file in application or user home directory - no write access\n");
-		return NULL;
+		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) {
+		strcat(szPath, "/profiles/");
+		strcat(szPath, profile);
 	}
 
 	cfg = gf_cfg_new(szPath, CFG_FILE_NAME);
-	if (!cfg) {
-		fprintf(stderr, "GPAC config file %s not found in %s - creating new file\n", CFG_FILE_NAME, szPath);
-		cfg = create_default_config(szPath);
+	//config file not compatible with old arch, check it:
+	if (cfg) {
+		u32 nb_old_sec = gf_cfg_get_key_count(cfg, "Compositor");
+		nb_old_sec += gf_cfg_get_key_count(cfg, "MimeTypes");
+		nb_old_sec += gf_cfg_get_key_count(cfg, "Video");
+		nb_old_sec += gf_cfg_get_key_count(cfg, "Audio");
+		nb_old_sec += gf_cfg_get_key_count(cfg, "Systems");
+		if (! gf_cfg_get_key_count(cfg, "core"))
+			nb_old_sec += 1;
+
+		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_cfg_del(cfg);
+			cfg = create_default_config(szPath, profile);
+		}
+	}
+	//no config file found
+	else {
+		if (!profile || strcmp(profile, "0")) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] Config file %s not found in %s - creating new file\n", CFG_FILE_NAME, szPath ));
+		}
+		cfg = create_default_config(szPath, profile);
 	}
 	if (!cfg) {
-		fprintf(stderr, "\nCannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath);
-		return NULL;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Cannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath));
+		goto exit;
 	}
 
-#ifndef GPAC_IPHONE
-	fprintf(stderr, "Using config file in %s directory\n", szPath);
+#ifndef GPAC_CONFIG_IOS
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[core] Using global config file in %s directory\n", szPath));
 #endif
 
 	check_modules_dir(cfg);
 
-	if (!gf_cfg_get_key(cfg, "General", "StorageDirectory")) {
-		get_default_install_path(szPath, GF_PATH_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);
-		gf_cfg_set_key(cfg, "General", "StorageDirectory", szPath);
+		gf_cfg_set_key(cfg, "core", "store-dir", szPath);
 	}
 
-	if (new_cfg) *new_cfg = GF_TRUE;
+exit:
+	if (prof_opt) prof_opt[0] = ':';
 	return cfg;
 }
 
+
+GF_EXPORT
+Bool gf_opts_default_shared_directory(char *path_buffer)
+{
+	return get_default_install_path(path_buffer, GF_PATH_SHARE);
+}
+
+void gf_modules_new(GF_Config *config);
+void gf_modules_del();
+
+GF_Config *gpac_global_config = NULL;
+
+void gf_init_global_config(const char *profile)
+{
+	if (!gpac_global_config) {
+		gpac_global_config = gf_cfg_init(profile);
+		if (!gpac_global_config) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Fatal error: failed to initialize GPAC global configuration\n"));
+			exit(1);
+		}
+
+		gf_modules_new(gpac_global_config);
+	}
+}
+
+void gf_uninit_global_config(Bool discard_config)
+{
+	if (gpac_global_config) {
+		if (discard_config) gf_cfg_discard_changes(gpac_global_config);
+		gf_cfg_del(gpac_global_config);
+		gpac_global_config = NULL;
+		gf_modules_del();
+	}
+}
+
+GF_Err gf_cfg_set_key_internal(GF_Config *iniFile, const char *secName, const char *keyName, const char *keyValue, Bool is_restrict);
+
+void gf_cfg_load_restrict()
+{
+	char szPath[GF_MAX_PATH];
+	if (get_default_install_path(szPath, GF_PATH_SHARE)) {
+		strcat(szPath, "/");
+		strcat(szPath, "restrict.cfg");
+		if (gf_file_exists(szPath)) {
+			GF_Config *rcfg = gf_cfg_new(NULL, szPath);
+			if (rcfg) {
+				u32 i, count = gf_cfg_get_section_count(rcfg);
+				for (i=0; i<count; i++) {
+					u32 j, kcount;
+					const char *sname = gf_cfg_get_section_name(rcfg, i);
+					if (!sname) break;
+					kcount = gf_cfg_get_key_count(rcfg, sname);
+					for (j=0; j<kcount; j++) {
+						const char *kname = gf_cfg_get_key_name(rcfg, sname, j);
+						const char *kval = gf_cfg_get_key(rcfg, sname, kname);
+						gf_cfg_set_key_internal(gpac_global_config, sname, kname, kval, GF_TRUE);
+					}
+				}
+				gf_cfg_del(rcfg);
+			}
+		}
+	}
+}
+
+GF_EXPORT
+const char *gf_opts_get_key(const char *secName, const char *keyName)
+{
+	if (!gpac_global_config) return NULL;
+
+	if (!strcmp(secName, "core")) {
+		const char *opt = gf_cfg_get_key(gpac_global_config, "temp", keyName);
+		if (opt) return opt;
+	}
+	return gf_cfg_get_key(gpac_global_config, secName, keyName);
+}
+GF_EXPORT
+GF_Err gf_opts_set_key(const char *secName, const char *keyName, const char *keyValue)
+{
+	if (!gpac_global_config) return GF_BAD_PARAM;
+	return gf_cfg_set_key(gpac_global_config, secName, keyName, keyValue);
+}
+GF_EXPORT
+void gf_opts_del_section(const char *secName)
+{
+	if (!gpac_global_config) return;
+	gf_cfg_del_section(gpac_global_config, secName);
+}
+GF_EXPORT
+u32 gf_opts_get_section_count()
+{
+	if (!gpac_global_config) return 0;
+	return gf_cfg_get_section_count(gpac_global_config);
+}
+GF_EXPORT
+const char *gf_opts_get_section_name(u32 secIndex)
+{
+	if (!gpac_global_config) return NULL;
+	return gf_cfg_get_section_name(gpac_global_config, secIndex);
+}
+GF_EXPORT
+u32 gf_opts_get_key_count(const char *secName)
+{
+	if (!gpac_global_config) return 0;
+	return gf_cfg_get_key_count(gpac_global_config, secName);
+}
+GF_EXPORT
+const char *gf_opts_get_key_name(const char *secName, u32 keyIndex)
+{
+	if (!gpac_global_config) return NULL;
+	return gf_cfg_get_key_name(gpac_global_config, secName, keyIndex);
+}
+
+GF_EXPORT
+const char *gf_opts_get_key_restricted(const char *secName, const char *keyName)
+{
+	const char *res = NULL;
+	const char *gf_cfg_get_key_internal(GF_Config *iniFile, const char *secName, const char *keyName, Bool restricted_only);
+	if (gpac_global_config)
+	 	res = gf_cfg_get_key_internal(gpac_global_config, secName, keyName, GF_TRUE);
+	return res;
+}
+
+GF_EXPORT
+const char *gf_opts_get_filename()
+{
+	return gf_cfg_get_filename(gpac_global_config);
+}
+GF_EXPORT
+GF_Err gf_opts_discard_changes()
+{
+	return gf_cfg_discard_changes(gpac_global_config);
+}
+
+#include <gpac/main.h>
+
+GF_GPACArg GPAC_Args[] = {
+ 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"\
+ 			, NULL, NULL, GF_ARG_STRING, 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("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("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"\
+			, 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("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"
+ "- ios: iOS-based mobile device\n"
+ "- android: Android-based mobile device\n"
+ "- 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("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("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("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("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("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"
+			"- 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"\
+		"- 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-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("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),
+
+ GF_DEF_ARG("switch-vres", NULL, "select smallest video resolution larger than scene size, otherwise use current video resolution", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_VIDEO),
+ GF_DEF_ARG("hwvmem", NULL, "specify (2D rendering only) memory type of main video backbuffer. Depending on the scene type, this may drastically change the playback speed.\n"
+ "- 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("yuv-overlay", NULL, "indicate YUV overlay is possible on the video card. Always overriden 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("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"
+ , 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),
+ GF_DEF_ARG("force-alsarate", NULL, "force ALSA and OSS output sample rate", NULL, NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_AUDIO),
+ GF_DEF_ARG("ds-disable-notif", NULL, "disable DirectSound audio buffer notifications when supported", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_AUDIO),
+ GF_DEF_ARG("font-reader", NULL, "indicate name of font reader module", NULL, NULL, GF_ARG_STRING, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_TEXT),
+ 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("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),
+ GF_DEF_ARG("rmt-localhost", NULL, "make remotery only accepts localhost connection", NULL, NULL, GF_ARG_BOOL, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
+ GF_DEF_ARG("rmt-sleep", NULL, "set remotery sleep (ms) between server updates", "10", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
+ GF_DEF_ARG("rmt-nmsg", NULL, "set remotery number of messages per update", "10", NULL, GF_ARG_INT, GF_ARG_HINT_EXPERT|GF_ARG_SUBSYS_RMT),
+ 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),
+ {0}
+};
+
+
+const GF_Config *gf_sys_get_lang_file();
+
+GF_EXPORT
+const GF_GPACArg *gf_sys_get_options()
+{
+	return GPAC_Args;
+}
+
+static const char *gpac_opt_default(const char *argname)
+{
+	const GF_GPACArg *arg = NULL;
+	u32 i=0;
+	while (GPAC_Args[i].name) {
+		arg = &GPAC_Args[i];
+		i++;
+		if (!strcmp(arg->name, argname)) break;
+		arg = NULL;
+	}
+	if (!arg) return NULL;
+	return arg->val;
+}
+
+GF_EXPORT
+Bool gf_opts_get_bool(const char *secName, const char *keyName)
+{
+	const char *opt = gf_opts_get_key(secName, keyName);
+
+	if (!opt && !strcmp(secName, "core")) {
+		opt = gpac_opt_default(keyName);
+	}
+
+	if (!opt) return GF_FALSE;
+	if (!strcmp(opt, "yes")) return GF_TRUE;
+	if (!strcmp(opt, "true")) return GF_TRUE;
+	if (!strcmp(opt, "1")) return GF_TRUE;
+	return GF_FALSE;
+}
+GF_EXPORT
+u32 gf_opts_get_int(const char *secName, const char *keyName)
+{
+	u32 times=1, val;
+	char *opt = (char *) gf_opts_get_key(secName, keyName);
+
+	if (!opt && !strcmp(secName, "core")) {
+		opt = (char *) gpac_opt_default(keyName);
+	}
+	if (!opt) return 0;
+	char *sep = strchr(opt, 'k');
+	if (sep) times=1000;
+	else {
+		sep = strchr(opt, 'K');
+		if (sep) times=1000;
+		else {
+			sep = strchr(opt, 'm');
+			if (sep) times=1000000;
+			else {
+				sep = strchr(opt, 'M');
+				if (sep) times=1000000;
+			}
+		}
+	}
+	sscanf(opt, "%d", &val);
+	val = atoi(opt);
+	return val*times;
+}
+
+GF_EXPORT
+Bool gf_sys_set_cfg_option(const char *opt_string)
+{
+	size_t sepIdx;
+	char *sep, *sep2, szSec[1024], szKey[1024], szVal[1024];
+	sep = strchr(opt_string, ':');
+	if (!sep) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreArgs] Badly formatted option %s - expected Section:Name=Value\n", opt_string ) );
+		return GF_FALSE;
+	}
+
+	sepIdx = sep - opt_string;
+	if (sepIdx>=1024)
+		sepIdx = 1023;
+	strncpy(szSec, opt_string, sepIdx);
+	szSec[sepIdx] = 0;
+
+	sep ++;
+	sep2 = strchr(sep, '=');
+	if (!sep2) {
+		gf_opts_set_key(szSec, sep, NULL);
+		return  GF_TRUE;
+	}
+
+	sepIdx = sep2 - sep;
+	if (sepIdx>=1024)
+		sepIdx = 1023;
+	strncpy(szKey, sep, sepIdx);
+	szKey[sepIdx] = 0;
+
+	sepIdx = strlen(sep2+1);
+	if (sepIdx>=1024)
+		sepIdx = 1023;
+	strncpy(szVal, sep2+1, sepIdx);
+	szVal[sepIdx] = 0;
+
+	if (!stricmp(szKey, "*")) {
+		if (stricmp(szVal, "null")) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[CoreArgs] Badly formatted option %s - expected Section:*=null\n", opt_string));
+			return GF_FALSE;
+		}
+		gf_opts_del_section(szSec);
+		return GF_TRUE;
+	}
+
+	if (!stricmp(szVal, "null")) {
+		szVal[0]=0;
+	}
+	gf_opts_set_key(szSec, szKey, szVal[0] ? szVal : NULL);
+
+	if (!strcmp(szSec, "core")) {
+		if (!strcmp(szKey, "noprog") && (!strcmp(szVal, "yes")||!strcmp(szVal, "true")||!strcmp(szVal, "1")) ) {
+			void gpac_disable_progress();
+
+			gpac_disable_progress();
+		}
+	}
+	return GF_TRUE;
+}
+
+Bool gf_opts_load_option(const char *arg_name, const char *val, Bool *consumed_next, GF_Err *e)
+{
+	const GF_GPACArg *arg = NULL;
+	u32 i=0;
+	*e = GF_OK;
+	*consumed_next = GF_FALSE;
+	arg_name = arg_name+1;
+	while (GPAC_Args[i].name) {
+		arg = &GPAC_Args[i];
+		i++;
+		if (!strcmp(arg->name, arg_name)) break;
+		if (arg->altname && !strcmp(arg->altname, arg_name)) break;
+
+		arg = NULL;
+	}
+	if (!arg) return GF_FALSE;
+
+	if (!strcmp(arg->name, "cfg")) {
+		*consumed_next = GF_TRUE;
+		if (! gf_sys_set_cfg_option(val)) *e = GF_BAD_PARAM;
+		return GF_TRUE;
+	}
+	if (!strcmp(arg->name, "strict-error")) {
+		gf_log_set_strict_error(1);
+		return GF_TRUE;
+	}
+
+	if (arg->type==GF_ARG_BOOL) {
+		if (!val) gf_opts_set_key("temp", arg->name, "yes");
+		else {
+			if (!strcmp(val, "yes") || !strcmp(val, "true") || !strcmp(val, "1")) {
+				*consumed_next = GF_TRUE;
+				gf_opts_set_key("temp", arg->name, "yes");
+			} else {
+				if (!strcmp(val, "no") || !strcmp(val, "false") || !strcmp(val, "0")) {
+					*consumed_next = GF_TRUE;
+					gf_opts_set_key("temp", arg->name, "no");
+				} else {
+					gf_opts_set_key("temp", arg->name, "yes");
+				}
+			}
+		}
+	} else {
+		*consumed_next = GF_TRUE;
+		if (!val && (arg->type==GF_ARG_BOOL))
+			gf_opts_set_key("temp", arg->name, "true");
+		else
+			gf_opts_set_key("temp", arg->name, val);
+	}
+	return GF_TRUE;
+}
+
+GF_EXPORT
+u32 gf_sys_is_gpac_arg(const char *arg_name)
+{
+	char *argsep;
+	u32 arglen;
+	const GF_GPACArg *arg = NULL;
+	u32 i=0;
+	arg_name = arg_name+1;
+	if (arg_name[0]=='-')
+		return 1;
+	if (arg_name[0]=='+')
+		return 1;
+
+	argsep = strchr(arg_name, '=');
+	if (argsep) arglen = (u32) (argsep - arg_name);
+	else arglen = (u32) strlen(arg_name);
+
+	while (GPAC_Args[i].name) {
+		arg = &GPAC_Args[i];
+		i++;
+		if ((strlen(arg->name) == arglen) && !strncmp(arg->name, arg_name, arglen)) break;
+		if (arg->altname) {
+			char *alt = strstr(arg->altname, arg_name);
+			if (alt) {
+				char c = alt[strlen(arg_name)];
+				if (!c || (c==' ')) break;
+			}
+		}
+		arg = NULL;
+	}
+	if (!arg) return 0;
+	if (arg->type==GF_ARG_BOOL) return 1;
+	if (argsep) return 1;
+	return 2;
+}
+
+
+GF_EXPORT
+void gf_sys_print_arg(FILE *helpout, u32 flags, const GF_GPACArg *arg, const char *arg_subsystem)
+{
+	u32 gen_doc = 0;
+	if (flags & GF_PRINTARG_MD)
+		gen_doc = 1;
+	if (!helpout) helpout = stderr;
+
+//#ifdef GPAC_ENABLE_COVERAGE
+#if 1
+	if ((arg->name[0]>='A') && (arg->name[0]<='Z')) {
+		if ((arg->name[1]<'A') || (arg->name[1]>'Z')) {
+			fprintf(stderr, "\nWARNING: arg %s bad name format, should use lowercase\n", arg->name);
+			exit(1);
+		}
+	}
+	if (arg->description) {
+		char *sep;
+
+		if ((arg->description[0]>='A') && (arg->description[0]<='Z')) {
+			if ((arg->description[1]<'A') || (arg->description[1]>'Z')) {
+				fprintf(stderr, "\nWARNING: arg %s bad name format \"%s\", should use lowercase\n", arg->name, arg->description);
+				exit(1);
+			}
+		}
+		if (strchr(arg->description, '\t')) {
+			fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should not use tab\n", arg->name, arg->description);
+			exit(1);
+		}
+		u8 achar = arg->description[strlen(arg->description)-1];
+		if (achar == '.') {
+			fprintf(stderr, "\nWARNING: arg %s bad description format \"%s\", should not end with .\n", arg->name, arg->description);
+			exit(1);
+		}
+		sep = strchr(arg->description, ' ');
+		if (sep) {
+			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);
+				exit(1);
+			}
+		}
+	}
+#endif
+
+	if (arg->flags & GF_ARG_HINT_HIDE)
+		return;
+
+	const char *syntax=strchr(arg->name, ' ');
+	char *arg_name=NULL;
+	if (syntax) {
+		arg_name = gf_strdup(arg->name);
+		char *sep = strchr(arg_name, ' ');
+		sep[0]=0;
+	}
+
+	if (flags & GF_PRINTARG_MAN) {
+		fprintf(helpout, ".TP\n.B \\-%s", arg_name ? arg_name : arg->name);
+	}
+	else if (gen_doc==1) {
+		gf_sys_format_help(helpout, flags, "<a id=\"%s\">", arg_name ? arg_name : arg->name);
+		gf_sys_format_help(helpout, flags | GF_PRINTARG_HIGHLIGHT_FIRST, "-%s", arg_name ? arg_name : arg->name);
+		gf_sys_format_help(helpout, flags, "</a>");
+	} else {
+		gf_sys_format_help(helpout, flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s-%s", (flags&GF_PRINTARG_ADD_DASH) ? "-" : "", arg_name ? arg_name : arg->name);
+	}
+	if (arg->altname) {
+		gf_sys_format_help(helpout, flags, ",");
+		gf_sys_format_help(helpout, flags | GF_PRINTARG_HIGHLIGHT_FIRST, "%s-%s", (flags&GF_PRINTARG_ADD_DASH) ? "-" : "", arg->altname);
+	}
+	if (syntax) {
+		gf_sys_format_help(helpout, flags, " %s", syntax);
+		gf_free(arg_name);
+	}
+
+	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);
+		gf_sys_format_help(helpout, flags, ")");
+	} else if (arg->type != GF_ARG_BOOL) {
+		gf_sys_format_help(helpout, flags, " (");
+		switch (arg->type) {
+		case GF_ARG_BOOL: gf_sys_format_help(helpout, flags, "boolean"); break;
+		case GF_ARG_INT: gf_sys_format_help(helpout, flags, "int"); break;
+		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;
+		default: break;
+		}
+		if (arg->val)
+			gf_sys_format_help(helpout, flags, ", default: **%s**", arg->val);
+		if (arg->values)
+			gf_sys_format_help(helpout, flags, ", values: __%s__", arg->values);
+		gf_sys_format_help(helpout, flags, ")");
+	}
+
+	if (flags & GF_PRINTARG_MAN) {
+		gf_sys_format_help(helpout, flags, "\n%s\n", gf_sys_localized(arg_subsystem, arg->name, arg->description) );
+	} else {
+		if (arg->description) {
+			gf_sys_format_help(helpout, flags | GF_PRINTARG_OPT_DESC, ": %s", gf_sys_localized(arg_subsystem, arg->name, arg->description) );
+		}
+		gf_sys_format_help(helpout, flags, "\n");
+	}
+
+	if ((gen_doc==1) && arg->description && strstr(arg->description, "- "))
+		gf_sys_format_help(helpout, flags, "\n");
+}
+
+
+GF_EXPORT
+void gf_sys_print_core_help(FILE *helpout, u32 flags, GF_SysArgMode mode, u32 subsystem_flags)
+{
+	u32 i=0;
+	const GF_GPACArg *args = gf_sys_get_options();
+
+	while (args[i].name) {
+		const GF_GPACArg *arg = &args[i];
+		i++;
+		if (arg->flags & GF_ARG_HINT_HIDE) continue;
+
+		if (subsystem_flags && !(arg->flags & subsystem_flags)) {
+		 	continue;
+		}
+		if (mode != GF_ARGMODE_ALL) {
+			if ((mode==GF_ARGMODE_EXPERT) && !(arg->flags & GF_ARG_HINT_EXPERT)) continue;
+			else if ((mode==GF_ARGMODE_ADVANCED) && !(arg->flags & GF_ARG_HINT_ADVANCED)) continue;
+			else if ((mode==GF_ARGMODE_BASE) && (arg->flags & (GF_ARG_HINT_ADVANCED|GF_ARG_HINT_EXPERT) )) continue;
+		}
+		gf_sys_print_arg(helpout, flags, arg, "core");
+	}
+}
+
+
+#define LINE_OFFSET_DESCR 30
+
+static char *help_buf = NULL;
+static u32 help_buf_size=0;
+
+void gf_sys_cleanup_help()
+{
+	if (help_buf) gf_free(help_buf);
+}
+
+
+enum
+{
+	TOK_CODE,
+	TOK_BOLD,
+	TOK_ITALIC,
+	TOK_STRIKE,
+	TOK_OPTLINK,
+	TOK_LINKSTART,
+};
+struct _token {
+	char *tok;
+	GF_ConsoleCodes cmd_type;
+} Tokens[] =
+{
+ {"`", GF_CONSOLE_YELLOW|GF_CONSOLE_ITALIC},
+ {"**", GF_CONSOLE_BOLD},
+ {"__", GF_CONSOLE_ITALIC},
+ {"~~", GF_CONSOLE_STRIKE},
+ {"[-", GF_CONSOLE_YELLOW|GF_CONSOLE_ITALIC},
+ {"[", GF_CONSOLE_YELLOW|GF_CONSOLE_ITALIC},
+};
+static u32 nb_tokens = sizeof(Tokens) / sizeof(struct _token);
+
+static u32 line_pos = 0;
+
+GF_EXPORT
+void gf_sys_format_help(FILE *helpout, u32 flags, const char *fmt, ...)
+{
+	char *line;
+	u32 len;
+	va_list vlist;
+	Bool escape_xml = GF_FALSE;
+	Bool escape_pipe = GF_FALSE;
+	u32 gen_doc = 0;
+	u32 is_app_opts = 0;
+	if (flags & GF_PRINTARG_MD) {
+		gen_doc = 1;
+		if (flags & GF_PRINTARG_ESCAPE_XML)
+			escape_xml = GF_TRUE;
+		if (flags & GF_PRINTARG_ESCAPE_PIPE)
+			escape_pipe = GF_TRUE;
+	}
+	if (flags & GF_PRINTARG_MAN)
+		gen_doc = 2;
+	if (flags & GF_PRINTARG_IS_APP)
+		is_app_opts = 1;
+	if (!helpout) helpout = stderr;
+
+	va_start(vlist, fmt);
+	len=vsnprintf(NULL, 0, fmt, vlist);
+	va_end(vlist);
+	if (help_buf_size < len+2) {
+		help_buf_size = len+2;
+		help_buf = gf_realloc(help_buf, help_buf_size);
+	}
+	va_start(vlist, fmt);
+	vsprintf(help_buf, fmt, vlist);
+	va_end(vlist);
+
+
+	line = help_buf;
+	while (line[0]) {
+		u32 att_len = 0;
+		char *tok_sep = NULL;
+		GF_ConsoleCodes console_code = GF_CONSOLE_RESET;
+		Bool line_before = GF_FALSE;
+		Bool line_after = GF_FALSE;
+		const char *footer_string = NULL;
+		const char *header_string = NULL;
+		char *next_line = strchr(line, '\n');
+		Bool has_token=GF_FALSE;
+
+		if (next_line) next_line[0]=0;
+
+
+		if ((line[0]=='#') && (line[1]==' ')) {
+			if (!gen_doc)
+				line+=2;
+			else if (gen_doc==2) {
+				header_string = ".SH ";
+				footer_string = "\n.LP";
+				line+=2;
+			}
+
+			console_code = GF_CONSOLE_GREEN;
+			line_after = line_before = GF_TRUE;
+		} else if ((line[0]=='#') && (line[1]=='#') && (line[2]==' ')) {
+			if (!gen_doc)
+				line+=3;
+			else if (gen_doc==2) {
+				line+=3;
+				header_string = ".P\n.B\n";
+			}
+
+			console_code = GF_CONSOLE_MAGENTA;
+			line_before = 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```";
+			} else if (gen_doc==2) {
+				header_string = "Example\n.br\n";
+				footer_string = "\n.br\n";
+			} else {
+				header_string = "Example:\n";
+			}
+		} else if (!strncmp(line, "Note: ", 6)) {
+			console_code = GF_CONSOLE_CYAN | GF_CONSOLE_ITALIC;
+		} else if (!strncmp(line, "Warning: ", 9)) {
+			line_after = line_before = GF_TRUE;
+			console_code = GF_CONSOLE_RED | GF_CONSOLE_BOLD;
+		} else if ( (
+			 ((line[0]=='-') && (line[1]==' '))
+			 || ((line[0]==' ') && (line[1]=='-') && (line[2]==' '))
+			 || ((line[0]==' ') && (line[1]==' ') && (line[2]=='-') && (line[3]==' '))
+			)
+
+			//look for ": "
+			&& ((tok_sep=strstr(line, ": ")) != NULL )
+		) {
+			if (!gen_doc)
+				fprintf(helpout, "\t");
+			while (line[0] != '-') {
+				fprintf(helpout, " ");
+				line++;
+				line_pos++;
+
+			}
+			fprintf(helpout, "* ");
+			line_pos+=2;
+			if (!gen_doc)
+				gf_sys_set_console_code(helpout, GF_CONSOLE_YELLOW);
+			tok_sep[0] = 0;
+			fprintf(helpout, "%s", line+2);
+			line_pos += (u32) strlen(line+2);
+			tok_sep[0] = ':';
+			line = tok_sep;
+			if (!gen_doc)
+				gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+		} else if (flags & (GF_PRINTARG_HIGHLIGHT_FIRST | GF_PRINTARG_OPT_DESC)) {
+			char *sep = strchr(line, ' ');
+
+			if (sep) sep[0] = 0;
+
+			if (!gen_doc && !(flags & GF_PRINTARG_OPT_DESC) )
+				gf_sys_set_console_code(helpout, GF_CONSOLE_GREEN);
+
+			if ((gen_doc==1) && !(flags & GF_PRINTARG_OPT_DESC) ) {
+				fprintf(helpout, "__%s__", line);
+				line_pos += 4+ (u32) strlen(line);
+			} else {
+				fprintf(helpout, "%s", line);
+				line_pos += (u32) strlen(line);
+			}
+
+			if (!gen_doc && !(flags & GF_PRINTARG_OPT_DESC) )
+				gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+
+			if (flags & GF_PRINTARG_OPT_DESC) {
+				flags = 0;
+				att_len = line_pos;
+			}
+
+
+			if (sep) {
+				sep[0] = ' ';
+				line = sep;
+			} else {
+				line = NULL;
+			}
+		}
+		if (!line) break;
+		if (gen_doc==2) {
+			line_before = line_after = GF_FALSE;
+		}
+		if (line_before) {
+			fprintf(helpout, "\n");
+			line_pos=0;
+		}
+
+		if (console_code != GF_CONSOLE_RESET) {
+			if (gen_doc==1) {
+				if (console_code & GF_CONSOLE_BOLD) {
+					fprintf(helpout, "__");
+					line_pos+=2;
+				}
+				else if (console_code & GF_CONSOLE_ITALIC) {
+					fprintf(helpout, "_");
+					line_pos++;
+				}
+			} else if (!gen_doc) {
+				gf_sys_set_console_code(helpout, console_code);
+			}
+		}
+
+		if (att_len) {
+			while (att_len < LINE_OFFSET_DESCR) {
+				fprintf(helpout, " ");
+				att_len++;
+				line_pos++;
+			}
+		}
+
+
+		if (header_string) {
+			fprintf(helpout, "%s", header_string);
+			line_pos += (u32) strlen(header_string);
+		}
+
+		while (line) {
+			char *skip_url = NULL;
+			char *link_start = NULL;
+			u32 tid=0, i;
+			char *next_token = NULL;
+			for (i=0; i<nb_tokens; i++) {
+				char *tok = strstr(line, Tokens[i].tok);
+				if (!tok) continue;
+				if (next_token && ((next_token-line) < (tok-line)) ) continue;
+				//check we have an end of token, otherwise consider this regular text
+				if ((i == TOK_LINKSTART) || (i == TOK_OPTLINK)) {
+					char *end_tok = strstr(tok, "](");
+					if (!end_tok) continue;
+				}
+
+				if (i == TOK_LINKSTART) {
+					if (gen_doc!=1) {
+						char *link_end;
+						skip_url = strstr(tok, "](");
+						link_end = skip_url;
+						if (skip_url) skip_url = strstr(skip_url, ")");
+						if (skip_url) skip_url ++;
+
+						if (!skip_url) continue;
+						link_start = tok+1;
+						link_end[0] = 0;
+					} else {
+						continue;
+					}
+				}
+				next_token=tok;
+				tid=i;
+			}
+			if (next_token) {
+				next_token[0]=0;
+			}
+			if ((gen_doc==1) && has_token) {
+				if (tid==TOK_CODE) {
+					fprintf(helpout, "`%s`", line);
+					line_pos+=2;
+				} else if (tid==TOK_ITALIC) {
+					fprintf(helpout, "_%s_", line);
+					line_pos+=2;
+				} else if (tid==TOK_BOLD) {
+					fprintf(helpout, "__%s__", line);
+					line_pos+=4;
+				} else {
+					fprintf(helpout, "%s", line);
+				}
+			} else if (escape_xml) {
+				char *xml_line = line;
+				while (xml_line) {
+					char *xml_start = strchr(xml_line, '<');
+					char *xml_end = strchr(xml_line, '>');
+
+					if (xml_end && (xml_start > xml_end)) xml_start = xml_end;
+					else if (!xml_start && xml_end) xml_start = xml_end;
+					else if (xml_start && xml_end) xml_end = NULL;
+
+					if (xml_start) {
+						u8 c = xml_start[0];
+						xml_start[0] = 0;
+						fprintf(helpout, "%s", xml_line);
+						fprintf(helpout, xml_end ? "&gt;" : "&lt;");
+						xml_start[0] = c;
+						xml_line = xml_start+1;
+					} else {
+						fprintf(helpout, "%s", xml_line);
+						break;
+					}
+				}
+			} else if (escape_pipe) {
+				char *src_line = line;
+				while (src_line) {
+					char *pipe_start = strchr(src_line, '|');
+					if (pipe_start && (pipe_start[1]==' '))
+						pipe_start = NULL;
+
+					if (pipe_start) {
+						pipe_start[0] = 0;
+						fprintf(helpout, "%s,", src_line);
+						pipe_start[0] = '|';
+						src_line = pipe_start+1;
+					} else {
+						fprintf(helpout, "%s", src_line);
+						break;
+					}
+				}
+			} else {
+				fprintf(helpout, "%s", line);
+			}
+			line_pos+=(u32) strlen(line);
+
+			if (!next_token) break;
+			has_token = !has_token;
+
+			if (!gen_doc) {
+				if (has_token) {
+					u32 cmd;
+					if (Tokens[tid].cmd_type & 0xFFFF) {
+						cmd = Tokens[tid].cmd_type;
+					} else {
+						cmd = Tokens[tid].cmd_type | console_code;
+					}
+
+					if (console_code&GF_CONSOLE_ITALIC) {
+						if (Tokens[tid].cmd_type & GF_CONSOLE_ITALIC) {
+							cmd &= ~GF_CONSOLE_ITALIC;
+							cmd |= GF_CONSOLE_BOLD;
+						}
+					}
+					else if (console_code&GF_CONSOLE_BOLD) {
+						if (Tokens[tid].cmd_type & GF_CONSOLE_BOLD) {
+							cmd &= ~GF_CONSOLE_BOLD;
+							cmd |= GF_CONSOLE_ITALIC;
+						}
+					}
+					gf_sys_set_console_code(helpout, cmd);
+				} else {
+					gf_sys_set_console_code(helpout, console_code);
+				}
+			}
+			line = next_token + (u32) strlen(Tokens[tid].tok);
+
+			if (skip_url) {
+				if (link_start)
+					fprintf(helpout, "%s", link_start);
+				if (!gen_doc)
+					gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+				has_token = GF_FALSE;
+				line = skip_url;
+
+			}
+
+			if (has_token && tid==TOK_OPTLINK) {
+				char *link = strchr(line, '(');
+				assert(link);
+				link++;
+				char *end_link = strchr(line, ')');
+				if (end_link) end_link[0] = 0;
+				char *end_tok = strchr(line, ']');
+				if (end_tok) end_tok[0] = 0;
+
+				if (gen_doc==1) {
+					if (!strncmp(link, "GPAC", 4)) {
+						fprintf(helpout, "[-%s](gpac_general/#%s)", line, line);
+						line_pos+=7 + 2*(u32)strlen(line) + (u32)strlen("gpac_general");
+					} else if (!strncmp(link, "LOG", 3)) {
+						fprintf(helpout, "[-%s](core_logs/#%s)", line, line);
+						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("core_logs");
+					} else if (!strncmp(link, "CORE", 3)) {
+						fprintf(helpout, "[-%s](core_options/#%s)", line, line);
+						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("core_options");
+						line_pos+=7 + 2*(u32)strlen(line) + (u32)strlen("core_options");
+					} else if (!strncmp(link, "CFG", 3)) {
+						fprintf(helpout, "[-%s](core_config/#%s)", line, line);
+						line_pos+=7 + 2*(u32)strlen(line) + (u32)strlen("core_config");
+					} else if (!strncmp(link, "MP4B_GEN", 3)) {
+						fprintf(helpout, "[-%s](mp4box-gen-opts/#%s)", line, line);
+						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen("mp4box-gen-opts");
+					} else if (strlen(link)) {
+						fprintf(helpout, "[-%s](%s/#%s)", line, link, line);
+						line_pos+=7 + 2* (u32)strlen(line) + (u32)strlen(link);
+					} else if (is_app_opts || !strcmp(line, "i") || !strcmp(line, "o") || !strcmp(line, "h")) {
+						fprintf(helpout, "[-%s](#%s)", line, line);
+						line_pos+=5 + 2* (u32)strlen(line) + (u32)strlen(link);
+					} else {
+						//this is a filter opt, don't print '-'
+						fprintf(helpout, "[%s](#%s)", line, line);
+						line_pos+=4 + 2* (u32)strlen(line) + (u32)strlen(link);
+					}
+				} else {
+					if (gen_doc==2)
+						fprintf(helpout, ".I ");
+
+					if (!strncmp(link, "GPAC", 4)
+						|| !strncmp(link, "LOG", 3)
+						|| !strncmp(link, "CORE", 3)
+						|| strlen(link)
+						|| !strcmp(line, "i") || !strcmp(line, "o") || !strcmp(line, "h")
+					) {
+						fprintf(helpout, "-%s", line);
+						line_pos+=1+ (u32)strlen(line);
+					} else {
+						fprintf(helpout, "%s", line);
+						line_pos+= (u32)strlen(line);
+					}
+					if (!gen_doc)
+						gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+				}
+				if (!end_link) break;
+				line = end_link+1;
+				has_token = GF_FALSE;
+			}
+		}
+
+		if (has_token && !gen_doc)
+			gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+
+		if (footer_string) {
+			fprintf(helpout, "%s", footer_string);
+			line_pos += (u32) strlen(footer_string);
+		}
+		if (console_code != GF_CONSOLE_RESET) {
+			if (gen_doc==1) {
+				if (console_code & GF_CONSOLE_BOLD) {
+					fprintf(helpout, "__");
+					line_pos+=2;
+				} else if (console_code & GF_CONSOLE_ITALIC) {
+					fprintf(helpout, "_");
+					line_pos++;
+				}
+			} else if (!gen_doc) {
+				gf_sys_set_console_code(helpout, GF_CONSOLE_RESET);
+			}
+		}
+
+		if (line_after) {
+			if (gen_doc==1) fprintf(helpout, "  ");
+			fprintf(helpout, (flags & GF_PRINTARG_NL_TO_BR) ? "<br/>" : "\n");
+			line_pos=0;
+		}
+
+		if (!next_line) break;
+		next_line[0]=0;
+		if (gen_doc==1) fprintf(helpout, "  ");
+		line = next_line+1;
+		if (gen_doc==2) {
+			if (line[0] != '.')
+				fprintf(helpout, "\n.br\n");
+			else
+				fprintf(helpout, "\n");
+		} else
+			fprintf(helpout, (line[0] && (flags & GF_PRINTARG_NL_TO_BR)) ? "<br/>" : "\n");
+		line_pos=0;
+	}
+}
+
+
+GF_EXPORT
+Bool gf_sys_word_match(const char *orig, const char *dst)
+{
+	s32 dist = 0;
+	u32 match = 0;
+	u32 i;
+	u32 olen = (u32) strlen(orig);
+	u32 dlen = (u32) strlen(dst);
+	u32 *run;
+	if (olen*2 < dlen) {
+		char *s1 = strchr(orig, ':');
+		char *s2 = strchr(dst, ':');
+		if (s1 && !s2) return GF_FALSE;
+		if (!s1 && s2) return GF_FALSE;
+
+		if (strstr(dst, orig))
+			return GF_TRUE;
+		return GF_FALSE;
+	}
+	run = gf_malloc(sizeof(u32) * olen);
+	memset(run, 0, sizeof(u32) * olen);
+
+	for (i=0; i<dlen; i++) {
+		u32 dist_char;
+		u32 offset=0;
+		char *pos;
+
+retry_char:
+		pos = strchr(orig+offset, dst[i]);
+		if (!pos) continue;
+		dist_char = (u32) (pos - orig);
+		if (!run[dist_char]) {
+			run[dist_char] = i+1;
+			match++;
+		} else if (run[dist_char] > i) {
+			run[dist_char] = i+1;
+			match++;
+		} else {
+			//this can be a repeated character
+			offset++;
+			goto retry_char;
+
+		}
+	}
+	if (match*2<olen) {
+		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) ) {
+		gf_free(run);
+		return GF_TRUE;
+	}
+*/
+	for (i=0; i<olen; i++) {
+		if (!i) {
+			if (run[0]==1)
+				dist++;
+		} else if (run[i-1] + 1 == run[i]) {
+			dist++;
+		}
+	}
+	gf_free(run);
+	//if half the characters are in order, consider a match
+	//if arg is small only check dst
+	if ((olen<=4) && (dist >= 2))
+		return GF_TRUE;
+	if ((dist*2 >= (s32) olen) && (dist*2 >= (s32) dlen))
+		return GF_TRUE;
+	return GF_FALSE;
+}
+
 #endif

gpac-0.8.0.tar.gz/src/utils/os_divers.c -> gpac-1.0.0.tar.gz/src/utils/os_divers.c Changed

gpac-0.8.0.tar.gz/src/utils/os_file.c -> gpac-1.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-2012
+ *			Authors: Jean Le Feuvre - Copyright (c) Telecom ParisTech 2000-2020
  *			         Romain Bouqueau - Copyright (c) Romain Bouqueau 2015
  *					All rights reserved
  *
@@ -44,7 +44,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <time.h>
 #include <sys/time.h>
 
 #ifndef __BEOS__
@@ -54,39 +53,6 @@
 #endif
 
 
-#if defined(WIN32)
-static wchar_t* utf8_to_wcs(const char* str)
-{
-	size_t source_len;
-	wchar_t* result;
-	if (str == 0) return 0;
-	source_len = strlen(str);
-	result = gf_calloc(source_len + 1, sizeof(wchar_t));
-	if (!result)
-		return 0;
-	if (gf_utf8_mbstowcs(result, source_len, &str) < 0) {
-		gf_free(result);
-		return 0;
-	}
-	return result;
-}
-static char* wcs_to_utf8(const wchar_t* str)
-{
-	size_t source_len;
-	char* result;
-	if (str == 0) return 0;
-	source_len = wcslen(str);
-	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) {
-		gf_free(result);
-		return 0;
-	}
-	return result;
-}
-#endif
-
 GF_EXPORT
 GF_Err gf_rmdir(const char *DirPathName)
 {
@@ -97,24 +63,24 @@
 	res = RemoveDirectory(swzName);
 	if (! res) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory %s: last error %d\n", DirPathName, err ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory \"%s\": last error %d\n", DirPathName, err ));
 	}
 #elif defined (WIN32)
 	int res;
-	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	wchar_t* wcsDirPathName = gf_utf8_to_wcs(DirPathName);
 	if (!wcsDirPathName)
 		return GF_IO_ERR;
 	res = _wrmdir(wcsDirPathName);
 	gf_free(wcsDirPathName);
 	if (res == -1) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory %s: last error %d\n", DirPathName, err ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory \"%s\": last error %d\n", DirPathName, err ));
 		return GF_IO_ERR;
 	}
 #else
 	int res = rmdir(DirPathName);
 	if (res==-1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory %s: last error %d\n", DirPathName, errno  ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot delete directory \"%s\": last error %d\n", DirPathName, errno  ));
 		return GF_IO_ERR;
 	}
 #endif
@@ -131,27 +97,30 @@
 	res = CreateDirectory(swzName, NULL);
 	if (! res) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory \"%s\": last error %d\n", DirPathName, err ));
 	}
 #elif defined (WIN32)
 	int res;
-	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	wchar_t* wcsDirPathName = gf_utf8_to_wcs(DirPathName);
 	if (!wcsDirPathName)
 		return GF_IO_ERR;
 	res = _wmkdir(wcsDirPathName);
 	gf_free(wcsDirPathName);
 	if (res==-1) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
+		if (err != 183) {
+			// don't throw error if dir already exists
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory \"%s\": last error %d\n", DirPathName, err));
+		}
 	}
 #else
 	int res = mkdir(DirPathName, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
 	if (res==-1) {
 		if(errno == 17) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s, it already exists: last error %d \n", DirPathName, errno ));
-			return GF_BAD_PARAM;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("Cannot create directory \"%s\", it already exists: last error %d \n", DirPathName, errno ));
+			return GF_OK;
 		} else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, errno ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory \"%s\": last error %d\n", DirPathName, errno ));
 			return GF_IO_ERR;
 		}
 	}
@@ -165,14 +134,13 @@
 {
 #if defined (_WIN32_WCE)
 	TCHAR swzName[MAX_PATH];
-	BOOL res;
 	DWORD att;
 	CE_CharToWide(DirPathName, swzName);
 	att = GetFileAttributes(swzName);
 	return (att != INVALID_FILE_ATTRIBUTES && (att & FILE_ATTRIBUTE_DIRECTORY)) ? GF_TRUE : GF_FALSE;
 #elif defined (WIN32)
 	DWORD att;
-	wchar_t* wcsDirPathName = utf8_to_wcs(DirPathName);
+	wchar_t* wcsDirPathName = gf_utf8_to_wcs(DirPathName);
 	if (!wcsDirPathName)
 		return GF_FALSE;
 	att = GetFileAttributesW(wcsDirPathName);
@@ -194,7 +162,7 @@
 		gf_cleanup_dir(item_path);
 		gf_rmdir(item_path);
 	} else {
-		gf_delete_file(item_path);
+		gf_file_delete(item_path);
 	}
 	return GF_FALSE;
 }
@@ -213,10 +181,10 @@
 }
 
 GF_EXPORT
-GF_Err gf_delete_file(const char *fileName)
+GF_Err gf_file_delete(const char *fileName)
 {
-	if (!fileName) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("gf_delete_file deletes nothing - ignoring\n"));
+	if (!fileName || !fileName[0]) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("gf_file_delete with no param - ignoring\n"));
 		return GF_OK;
 	}
 #if defined(_WIN32_WCE)
@@ -227,7 +195,7 @@
 	/* success if != 0 */
 	{
 		BOOL op_result;
-		wchar_t* wcsFileName = utf8_to_wcs(fileName);
+		wchar_t* wcsFileName = gf_utf8_to_wcs(fileName);
 		if (!wcsFileName)
 			return GF_IO_ERR;
 		op_result = DeleteFileW(wcsFileName);
@@ -262,74 +230,136 @@
 }
 #endif
 
-#if defined(GPAC_IPHONE) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
+#if defined(GPAC_CONFIG_IOS) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
 #include <spawn.h>
 extern char **environ;
 #endif
 
+#if defined(WIN32)
+#include <io.h>
+#endif
+
 GF_EXPORT
-Bool gf_file_exists(const char *fileName)
+Bool gf_file_exists_ex(const char *fileName, const char *par_name)
 {
+	u32 gfio_type = 0;
+	if (!fileName) return GF_FALSE;
+
+	if (!strncmp(fileName, "gfio://", 7))
+		gfio_type = 1;
+	else if (par_name && !strncmp(par_name, "gfio://", 7))
+		gfio_type = 2;
+
+	if (gfio_type) {
+		GF_FileIO *gfio_ref;
+		GF_FileIO *new_gfio;
+		GF_Err e;
+		Bool res = GF_TRUE;
+		if (gfio_type==1)
+			gfio_ref = gf_fileio_from_url(fileName);
+		else
+			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);
+		if (e==GF_URL_ERROR)
+			res = GF_FALSE;
+		if (new_gfio)
+			gf_fileio_open_url(new_gfio, NULL, "r", &e);
+		return res;
+	}
+
+#if defined(WIN32)
+	Bool res;
+	wchar_t* wname = gf_utf8_to_wcs(fileName);
+	if (!wname) return GF_FALSE;
+ 	res = (_waccess(wname, 4) == -1) ? GF_FALSE : GF_TRUE;
+	gf_free(wname);
+	return res;
+#elif defined(GPAC_CONFIG_LINUX)
+ 	return (access(fileName, 4) == -1) ? GF_FALSE : GF_TRUE;
+#elif defined(__DARWIN__) || defined(__APPLE__)
+ 	return (access(fileName, 4) == -1) ? GF_FALSE : GF_TRUE;
+#elif defined(GPAC_CONFIG_IOS) || defined(GPAC_CONFIG_ANDROID)
+ 	return (access(fileName, 4) == -1) ? GF_FALSE : GF_TRUE;
+#else
 	FILE *f = gf_fopen(fileName, "r");
 	if (f) {
 		gf_fclose(f);
 		return GF_TRUE;
 	}
 	return GF_FALSE;
+#endif
+}
+
+GF_EXPORT
+Bool gf_file_exists(const char *fileName)
+{
+	return gf_file_exists_ex(fileName, NULL);
 }
 
 GF_EXPORT
-GF_Err gf_move_file(const char *fileName, const char *newFileName)
+GF_Err gf_file_move(const char *fileName, const char *newFileName)
 {
 #if defined(_WIN32_WCE)
+	GF_Err e = GF_OK;
 	TCHAR swzName[MAX_PATH];
 	TCHAR swzNewName[MAX_PATH];
 	CE_CharToWide((char*)fileName, swzName);
 	CE_CharToWide((char*)newFileName, swzNewName);
-	return (MoveFile(swzName, swzNewName) == 0 ) ? GF_IO_ERR : GF_OK;
+	if (MoveFile(swzName, swzNewName) == 0 )
+		e = GF_IO_ERR;
 #elif defined(WIN32)
+	GF_Err e = GF_OK;
 	/* success if != 0 */
 	BOOL op_result;
-	wchar_t* wcsFileName = utf8_to_wcs(fileName);
-	wchar_t* wcsNewFileName = utf8_to_wcs(newFileName);
-	if (!wcsFileName || !wcsNewFileName)
-	{
+	wchar_t* wcsFileName = gf_utf8_to_wcs(fileName);
+	wchar_t* wcsNewFileName = gf_utf8_to_wcs(newFileName);
+	if (!wcsFileName || !wcsNewFileName) {
 		if (wcsFileName) gf_free(wcsFileName);
 		if (wcsNewFileName) gf_free(wcsNewFileName);
-		return GF_IO_ERR;
+		e = GF_IO_ERR;
+	} else {
+		op_result = MoveFileW(wcsFileName, wcsNewFileName);
+		gf_free(wcsFileName);
+		gf_free(wcsNewFileName);
+		if ( op_result == 0 )
+			e = GF_IO_ERR;
 	}
-	op_result = MoveFileW(wcsFileName, wcsNewFileName);
-	gf_free(wcsFileName);
-	gf_free(wcsNewFileName);
-	return ( op_result == 0 ) ? GF_IO_ERR : GF_OK;
 #else
 	GF_Err e = GF_IO_ERR;
 	char cmd[1024], *arg1, *arg2;
-	if (!fileName || !newFileName)
-		return GF_IO_ERR;
-	arg1 = gf_sanetize_single_quoted_string(fileName);
-	arg2 = gf_sanetize_single_quoted_string(newFileName);
-	if (snprintf(cmd, sizeof cmd, "mv %s %s", arg1, arg2) >= sizeof cmd) goto error;
+	if (!fileName || !newFileName) {
+		e = GF_IO_ERR;
+	} else {
+		arg1 = gf_sanetize_single_quoted_string(fileName);
+		arg2 = gf_sanetize_single_quoted_string(newFileName);
+		if (snprintf(cmd, sizeof cmd, "mv %s %s", arg1, arg2) >= sizeof cmd) goto error;
 
-#if defined(GPAC_IPHONE) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
-	{
-		pid_t pid;
-		char *argv[3];
-		argv[0] = "mv";
-		argv[1] = cmd;
-		argv[2] = NULL;
-		posix_spawn(&pid, argv[0], NULL, NULL, argv, environ);
-		waitpid(pid, NULL, 0);
-	}
+#if defined(GPAC_CONFIG_IOS) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 80000)
+		{
+			pid_t pid;
+			char *argv[3];
+			argv[0] = "mv";
+			argv[1] = cmd;
+			argv[2] = NULL;
+			posix_spawn(&pid, argv[0], NULL, NULL, argv, environ);
+			waitpid(pid, NULL, 0);
+		}
 #else
-	e = (system(cmd) == 0) ? GF_OK : GF_IO_ERR;
+		e = (system(cmd) == 0) ? GF_OK : GF_IO_ERR;
 #endif
 
 error:
-	gf_free(arg1);
-	gf_free(arg2);
-	return e;
+		gf_free(arg1);
+		gf_free(arg2);
+	}
 #endif
+
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[core] Failed to move file %s to %s: %s\n", fileName, newFileName, gf_error_to_string(e) ));
+	}
+	return e;
 }
 
 GF_EXPORT
@@ -357,7 +387,7 @@
 #elif defined(WIN32) && !defined(__GNUC__)
 	struct _stat64 sb;
 	int op_result;
-	wchar_t* wcsFilename = utf8_to_wcs(filename);
+	wchar_t* wcsFilename = gf_utf8_to_wcs(filename);
 	if (!wcsFilename)
 		return 0;
 	op_result = _wstat64(wcsFilename, &sb);
@@ -372,20 +402,97 @@
 	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;
+} GF_FileHandle;
+#endif
 static u32 gpac_file_handles = 0;
+
 GF_EXPORT
 u32 gf_file_handles_count()
 {
+#ifdef GPAC_MEMORY_TRACKING
+	if (gpac_open_files) {
+		return gf_list_count(gpac_open_files);
+	}
+#endif
 	return gpac_file_handles;
 }
 
+#ifdef GPAC_MEMORY_TRACKING
+const char *enum_open_handles(u32 *idx)
+{
+	GF_FileHandle *h;
+	u32 count = gf_list_count(gpac_open_files);
+	if (*idx >= count) return NULL;
+	h = gf_list_get(gpac_open_files, *idx);
+	(*idx)++;
+	return h->url;
+}
+#endif
+
+static void gf_register_file_handle(const char *filename, FILE *ptr)
+{
+#ifdef GPAC_MEMORY_TRACKING
+	if (gf_mem_track_enabled) {
+		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);
+			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)
+{
+	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;
+			}
+		}
+		gf_mx_v(logs_mx);
+	}
+#endif
+}
+
 GF_EXPORT
-FILE *gf_temp_file_new(char ** const fileName)
+FILE *gf_file_temp(char ** const fileName)
 {
-	FILE *res = NULL;
+	FILE *res;
 #if defined(_WIN32_WCE)
 	TCHAR pPath[MAX_PATH+1];
 	TCHAR pTemp[MAX_PATH+1];
+	res = NULL;
 	if (!GetTempPath(MAX_PATH, pPath)) {
 		pPath[0] = '.';
 		pPath[1] = '.';
@@ -407,16 +514,16 @@
 			gf_rand_init(GF_FALSE);
 			swprintf(tmp2, MAX_PATH, L"gpac_%d_%08x_", _getpid(), gf_rand());
 			t_file = _wtempnam(tmp, tmp2);
-			mbs_t_file = wcs_to_utf8(t_file);
+			mbs_t_file = gf_wcs_to_utf8(t_file);
 			if (!mbs_t_file)
 				return 0;
 			res = gf_fopen(mbs_t_file, "w+b");
 			if (res) {
-				gpac_file_handles--;
+				gf_unregister_file_handle(res);
 				if (fileName) {
 					*fileName = gf_strdup(mbs_t_file);
 				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Win32] temporary file %s won't be deleted - contact the GPAC team\n", mbs_t_file));
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Win32] temporary file \"%s\" won't be deleted - contact the GPAC team\n", mbs_t_file));
 				}
 			}
 			gf_free(mbs_t_file);
@@ -428,7 +535,7 @@
 #endif
 
 	if (res) {
-		gpac_file_handles++;
+		gf_register_file_handle("temp file", res);
 	}
 	return res;
 }
@@ -564,7 +671,7 @@
 
 	the_dir = opendir(path);
 	if (the_dir == NULL) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory %s for enumeration: %d\n", path, errno));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot open directory \"%s\" for enumeration: %d\n", path, errno));
 		return GF_IO_ERR;
 	}
 	the_file = readdir(the_dir);
@@ -596,24 +703,39 @@
 #if defined (_WIN32_WCE)
 			short ext[30];
 			short *sep = wcsrchr(FindData.cFileName, (wchar_t) '.');
+			short *found_ext;
+			u32 ext_len;
 			if (!sep) goto next;
 			wcscpy(ext, sep+1);
 			wcslwr(ext);
-			if (!wcsstr(w_filter, ext)) goto next;
+			ext_len = (u32) wcslen(ext);
+			found_ext = wcsstr(w_filter, ext);
+			if (!found_ext) goto next;
+			if (found_ext[ext_len] && (found_ext[ext_len] != (wchar_t) ';')) goto next;
 #elif defined(WIN32)
 			wchar_t ext[30];
 			wchar_t *sep = wcsrchr(FindData.cFileName, L'.');
+			wchar_t *found_ext;
+			u32 ext_len;
 			if (!sep) goto next;
 			wcscpy(ext, sep+1);
 			wcslwr(ext);
-			if (!wcsstr(w_filter, ext)) goto next;
+			ext_len = (u32) wcslen(ext);
+			found_ext = wcsstr(w_filter, ext);
+			if (!found_ext) goto next;
+			if (found_ext[ext_len] && (found_ext[ext_len] != L';')) goto next;
 #else
 			char ext[30];
 			char *sep = strrchr(the_file->d_name, '.');
+			char *found_ext;
+			u32 ext_len;
 			if (!sep) goto next;
 			strcpy(ext, sep+1);
 			strlwr(ext);
-			if (!strstr(filter, sep+1)) goto next;
+			ext_len = (u32) strlen(ext);
+			found_ext = strstr(filter, ext);
+			if (!found_ext) goto next;
+			if (found_ext[ext_len] && (found_ext[ext_len]!=';')) goto next;
 #endif
 		}
 
@@ -638,7 +760,7 @@
 #else
 		strcpy(item_path, path);
 		strcat(item_path, the_file->d_name);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Checking file %s for enum\n", item_path));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Checking file \"%s\" for enum\n", item_path));
 
 		if (stat( item_path, &st ) != 0) goto next;
 
@@ -649,7 +771,7 @@
 		file_info.size = st.st_size;
 
 		{
-			struct tm _t = * gmtime(& st.st_mtime);
+			struct tm _t = * gf_gmtime(& st.st_mtime);
 			file_info.last_modified = mktime(&_t);
 		}
 		file = the_file->d_name;
@@ -663,7 +785,7 @@
 				struct stat st_parent;
 				parent_name[0] = 0;
 				if (stat(item_path, &st_parent) == 0)  {
-					if ((st.st_dev != st_parent.st_dev) || ((st.st_dev == st_parent.st_dev) && (st.st_ino == st_parent.st_ino))) {
+					if ((st.st_dev != st_parent.st_dev) || (st.st_ino == st_parent.st_ino) ) {
 						file_info.drive = GF_TRUE;
 					}
 				}
@@ -673,8 +795,8 @@
 #endif
 
 #ifdef WIN32
-		mbs_file = wcs_to_utf8(file);
-		mbs_item_path = wcs_to_utf8(item_path);
+		mbs_file = gf_wcs_to_utf8(file);
+		mbs_item_path = gf_wcs_to_utf8(item_path);
 		if (!mbs_file || !mbs_item_path)
 		{
 			if (mbs_file) gf_free(mbs_file);
@@ -718,34 +840,342 @@
 	return GF_OK;
 }
 
+
+
+struct __gf_file_io
+{
+	u32 _reserved_null;
+	void *__this;
+
+	GF_FileIO * (*open)(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_error);
+	GF_Err (*seek)(GF_FileIO *fileio, u64 offset, s32 whence);
+	u32 (*read)(GF_FileIO *fileio, u8 *buffer, u32 bytes);
+	u32 (*write)(GF_FileIO *fileio, u8 *buffer, u32 bytes);
+	s64 (*tell)(GF_FileIO *fileio);
+	Bool (*eof)(GF_FileIO *fileio);
+	int (*printf)(GF_FileIO *gfio, const char *format, va_list args);
+
+	char *url;
+	char *res_url;
+	void *udta;
+
+	u64 bytes_done, file_size_plus_one;
+	Bool cache_complete;
+	u32 bytes_per_sec;
+
+	u32 printf_alloc;
+	u8* printf_buf;
+};
+
+GF_EXPORT
+Bool gf_fileio_check(FILE *fp)
+{
+	GF_FileIO *fio = (GF_FileIO *)fp;
+	if ((fp==stdin) || (fp==stderr) || (fp==stdout))
+		return GF_FALSE;
+
+	if (fio && !fio->_reserved_null && (fio->__this==fio))
+		return GF_TRUE;
+	return GF_FALSE;
+}
+
+typedef struct
+{
+	u8 *data;
+	u32 size;
+	u32 pos;
+} GF_FileIOBlob;
+
+static GF_FileIO *gfio_blob_open(GF_FileIO *fileio_ref, const char *url, const char *mode, GF_Err *out_error)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio_ref);
+	if (!url) {
+		gf_free(blob);
+		gf_fileio_del(fileio_ref);
+	}
+	return NULL;
+}
+
+static GF_Err gfio_blob_seek(GF_FileIO *fileio, u64 offset, s32 whence)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
+	if (whence==SEEK_END) blob->pos = blob->size;
+	else if (whence==SEEK_SET) blob->pos = 0;
+	else {
+		if (blob->pos + offset > blob->size) return GF_BAD_PARAM;
+		blob->pos += (u32) offset;
+	}
+	return GF_OK;
+}
+static u32 gfio_blob_read(GF_FileIO *fileio, u8 *buffer, u32 bytes)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
+	if (bytes + blob->pos > blob->size)
+		bytes = blob->size - blob->pos;
+	if (bytes) {
+		memcpy(buffer, blob->data+blob->pos, bytes);
+		blob->pos += bytes;
+	}
+	return bytes;
+}
+static s64 gfio_blob_tell(GF_FileIO *fileio)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
+	return (s64) blob->pos;
+}
+static Bool gfio_blob_eof(GF_FileIO *fileio)
+{
+	GF_FileIOBlob *blob = gf_fileio_get_udta(fileio);
+	if (blob->pos==blob->size) return GF_TRUE;
+	return GF_FALSE;
+}
+
+GF_EXPORT
+GF_FileIO *gf_fileio_new(char *url, void *udta,
+	gfio_open_proc open,
+	gfio_seek_proc seek,
+	gfio_read_proc read,
+	gfio_write_proc write,
+	gfio_tell_proc tell,
+	gfio_eof_proc eof,
+	gfio_printf_proc printf)
+{
+	char szURL[100];
+	GF_FileIO *tmp;
+
+	if (!open || !seek || !tell || !eof) return NULL;
+
+	if (!write && !read) return NULL;
+	GF_SAFEALLOC(tmp, GF_FileIO);
+	if (!tmp) return NULL;
+
+	tmp->open = open;
+	tmp->seek = seek;
+	tmp->write = write;
+	tmp->read = read;
+	tmp->tell = tell;
+	tmp->eof = eof;
+	tmp->printf = printf;
+
+	tmp->udta = udta;
+	if (url)
+		tmp->res_url = gf_strdup(url);
+
+	sprintf(szURL, "gfio://%p", tmp);
+	tmp->url = gf_strdup(szURL);
+	tmp->__this = tmp;
+	return tmp;
+}
+
+GF_EXPORT
+const char * gf_fileio_url(GF_FileIO *gfio)
+{
+	return gfio ? gfio->url : NULL;
+}
+
+GF_EXPORT
+const char * gf_fileio_resource_url(GF_FileIO *gfio)
+{
+	return gfio ? gfio->res_url : NULL;
+}
+
+GF_EXPORT
+void gf_fileio_del(GF_FileIO *gfio)
+{
+	if (!gfio) return;
+	if (gfio->url) gf_free(gfio->url);
+	if (gfio->res_url) gf_free(gfio->res_url);
+	if (gfio->printf_buf) gf_free(gfio->printf_buf);
+	gf_free(gfio);
+}
+
+GF_EXPORT
+void *gf_fileio_get_udta(GF_FileIO *gfio)
+{
+	return gfio ? gfio->udta : NULL;
+}
+
+GF_EXPORT
+GF_FileIO *gf_fileio_open_url(GF_FileIO *gfio_ref, const char *url, const char *mode, GF_Err *out_err)
+{
+	if (!gfio_ref) {
+		*out_err = GF_BAD_PARAM;
+		return NULL;
+	}
+	if (!gfio_ref->open) {
+		*out_err = url ? GF_NOT_SUPPORTED : GF_OK;
+		return NULL;
+	}
+	return gfio_ref->open(gfio_ref, url, mode, out_err);
+}
+
+static u32 gf_fileio_read(GF_FileIO *gfio, u8 *buffer, u32 nb_bytes)
+{
+	if (!gfio) return GF_BAD_PARAM;
+	if (gfio->read)
+		return gfio->read(gfio, buffer, nb_bytes);
+	return 0;
+}
+
+static u32 gf_fileio_write(GF_FileIO *gfio, u8 *buffer, u32 nb_bytes)
+{
+	if (!gfio) return GF_BAD_PARAM;
+	if (!gfio->write) return 0;
+	return gfio->write(gfio, buffer, (u32) nb_bytes);
+}
+
+int gf_fileio_printf(GF_FileIO *gfio, const char *format, va_list args)
+{
+	va_list args_copy;
+	if (!gfio) return -1;
+	if (gfio->printf) return gfio->printf(gfio, format, args);
+
+	if (!gfio->write) return -1;
+
+	va_copy(args_copy, args);
+	u32 len=vsnprintf(NULL, 0, format, args_copy);
+	va_end(args_copy);
+
+	if (len>=gfio->printf_alloc) {
+		gfio->printf_alloc = len+1;
+		gfio->printf_buf = gf_realloc(gfio->printf_buf, gfio->printf_alloc);
+	}
+	vsnprintf(gfio->printf_buf, len, format, args);
+	gfio->printf_buf[len] = 0;
+	return gfio->write(gfio, gfio->printf_buf, len+1);
+}
+
+GF_EXPORT
+Bool gf_fileio_write_mode(GF_FileIO *gfio)
+{
+	return (gfio && gfio->write) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+Bool gf_fileio_read_mode(GF_FileIO *gfio)
+{
+	return (gfio && gfio->read) ? GF_TRUE : GF_FALSE;
+}
+
+GF_EXPORT
+GF_FileIO *gf_fileio_from_url(const char *url)
+{
+	char szURL[100];
+	GF_FileIO *ptr=NULL;
+	if (!url) return NULL;
+	
+	sscanf(url, "gfio://%p", &ptr);
+	sprintf(szURL, "gfio://%p", ptr);
+	if (strcmp(url, szURL))
+		return NULL;
+
+	if (ptr && ptr->url && !strcmp(ptr->url, url) ) {
+		return ptr;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+const char * gf_fileio_translate_url(const char *url)
+{
+	GF_FileIO *gfio = gf_fileio_from_url(url);
+	return gfio ? gfio->res_url : NULL;
+}
+
+Bool gf_fileio_eof(GF_FileIO *fileio)
+{
+	if (!fileio || !fileio->tell) return GF_TRUE;
+	return fileio->eof(fileio);
+}
+
+int gf_fileio_flush(GF_FileIO *fileio)
+{
+	if (!fileio || !fileio->write) return 0;
+	fileio->write(fileio, NULL, 0);
+	return 0;
+}
+
+GF_EXPORT
+const char *gf_fileio_factory(GF_FileIO *gfio, const char *new_res_url)
+{
+	GF_Err e;
+	if (!gfio || !gfio->open) return NULL;
+	GF_FileIO *new_res = gfio->open(gfio, new_res_url, "url", &e);
+	if (e) return NULL;
+	return gf_fileio_url(new_res);
+}
+
+GF_EXPORT
+void gf_fileio_set_stats(GF_FileIO *gfio, u64 bytes_done, u64 file_size, Bool cache_complete, u32 bytes_per_sec)
+{
+	if (!gfio) return;
+	gfio->bytes_done = bytes_done;
+	gfio->file_size_plus_one = file_size ? (1 + file_size) : 0;
+	gfio->cache_complete = cache_complete;
+	gfio->bytes_per_sec = bytes_per_sec;
+}
+
+
+GF_EXPORT
+Bool gf_fileio_get_stats(GF_FileIO *gfio, u64 *bytes_done, u64 *file_size, Bool *cache_complete, u32 *bytes_per_sec)
+{
+	if (!gf_fileio_check((FILE *)gfio))
+		return GF_FALSE;
+
+	if (bytes_done) *bytes_done = gfio->bytes_done;
+	if (file_size) *file_size = gfio->file_size_plus_one ? gfio->file_size_plus_one-1 : 0;
+	if (cache_complete) *cache_complete = gfio->cache_complete;
+	if (bytes_per_sec) *bytes_per_sec = gfio->bytes_per_sec;
+	return GF_TRUE;
+}
+
 GF_EXPORT
 u64 gf_ftell(FILE *fp)
 {
+	if (!fp) return -1;
+
+	if (gf_fileio_check(fp)) {
+		GF_FileIO *gfio = (GF_FileIO *)fp;
+		if (!gfio->tell) return -1;
+		return gfio->tell(gfio);
+	}
+
 #if defined(_WIN32_WCE)
 	return (u64) ftell(fp);
-#elif defined(GPAC_CONFIG_WIN32) && !defined(__CYGWIN__)	/* mingw or cygwin */
+#elif defined(GPAC_CONFIG_WIN32) && (defined(__CYGWIN__) || defined(__MINGW32__))
 #if (_FILE_OFFSET_BITS >= 64)
 	return (u64) ftello64(fp);
 #else
-	return (u64) ftell(fp);
+	return (u64) gf_ftell(fp);
 #endif
 #elif defined(WIN32)
 	return (u64) _ftelli64(fp);
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_CONFIG_ANDROID)
 	return (u64) ftello64(fp);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
 	return (u64) ftello(fp);
 #else
-	return (u64) ftell(fp);
+	return (u64) gf_ftell(fp);
 #endif
 }
 
 GF_EXPORT
-u64 gf_fseek(FILE *fp, s64 offset, s32 whence)
+s32 gf_fseek(FILE *fp, s64 offset, s32 whence)
 {
+	if (!fp) return -1;
+	if (gf_fileio_check(fp)) {
+		GF_FileIO *gfio = (GF_FileIO *)fp;
+		if (gfio->seek) {
+			GF_Err e = gfio->seek(gfio, offset, whence);
+			if (e) return -1;
+			return 0;
+		}
+		return -1;
+	}
+
 #if defined(_WIN32_WCE)
 	return (u64) fseek(fp, (s32) offset, whence);
-#elif defined(GPAC_CONFIG_WIN32) && !defined(__CYGWIN__)	/* mingw or cygwin */
+#elif defined(GPAC_CONFIG_WIN32) && defined(__CYGWIN__)	/* mingw or cygwin */
 #if (_FILE_OFFSET_BITS >= 64)
 	return (u64) fseeko64(fp, offset, whence);
 #else
@@ -753,7 +1183,7 @@
 #endif
 #elif defined(WIN32)
 	return (u64) _fseeki64(fp, offset, whence);
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_CONFIG_ANDROID)
 	return fseeko64(fp, (off64_t) offset, whence);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
 	return fseeko(fp, (off_t) offset, whence);
@@ -762,17 +1192,107 @@
 #endif
 }
 
+
+static GF_FileIO *gf_fileio_from_blob(const char *file_name)
+{
+	u8 *blob_data;
+	u32 blob_size;
+	GF_FileIOBlob *gfio_blob;
+	GF_Err e = gf_blob_get_data(file_name, &blob_data, &blob_size);
+	if (e || !blob_data) return NULL;
+
+	GF_SAFEALLOC(gfio_blob, GF_FileIOBlob);
+	if (!gfio_blob) return NULL;
+	gfio_blob->data = blob_data;
+	gfio_blob->size = blob_size;
+	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(const char *file_name, const char *mode)
+FILE *gf_fopen_ex(const char *file_name, const char *parent_name, const char *mode)
 {
 	FILE *res = NULL;
+	u32 gfio_type = 0;
+
+	if (!file_name) return NULL;
+
+	if (!strncmp(file_name, "gmem://", 7)) {
+		GF_FileIO *new_gfio;
+		if (strstr(mode, "w"))
+			return NULL;
+		new_gfio = gf_fileio_from_blob(file_name);
+		if (new_gfio)
+			gf_register_file_handle(file_name, (FILE *) new_gfio);
+		return (FILE *) new_gfio;
+
+	}
+
+	if (!strncmp(file_name, "gfio://", 7))
+		gfio_type = 1;
+	else if (parent_name && !strncmp(parent_name, "gfio://", 7))
+		gfio_type = 2;
+
+	if (gfio_type) {
+		GF_FileIO *gfio_ref;
+		GF_FileIO *new_gfio;
+		GF_Err e;
+
+		if (gfio_type==1)
+			gfio_ref = gf_fileio_from_url(file_name);
+		else
+			gfio_ref = gf_fileio_from_url(parent_name);
+
+		if (!gfio_ref) return NULL;
+		if (strchr(mode, 'r') && !gf_fileio_read_mode(gfio_ref)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s is not read-enabled and open mode %s was requested\n", file_name, mode));
+			return NULL;
+		}
+		if ((strchr(mode, 'w') || strchr(mode, 'a'))  && !gf_fileio_write_mode(gfio_ref)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("FileIO %s is not write-enabled and open mode %s was requested\n", file_name, mode));
+			return NULL;
+		}
+		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)));
+			return NULL;
+		}
+		gf_register_file_handle(file_name, (FILE *) new_gfio);
+		return (FILE *) new_gfio;
+	}
+
+	if (strchr(mode, 'w')) {
+		char *fname = gf_strdup(file_name);
+		char *sep = strchr(fname, '/');
+		if (!sep) sep = strchr(fname, '\\');
+		if (file_name[0] == '/') sep = strchr(fname+1, '/');
+		else if (file_name[2] == '\\') sep = strchr(fname+3, '\\');
+
+		while (sep) {
+			char *n_sep;
+			char c = sep[0];
+			sep[0] = 0;
+			if (!gf_dir_exists(fname)) {
+				GF_Err e = gf_mkdir(fname);
+				if (e != GF_OK) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Failed to create directory \"%s\": %s\n", file_name, gf_error_to_string(e) ));
+					sep[0] = c;
+					gf_free(fname);
+					return NULL;
+				}
+			}
+			sep[0] = c;
+			n_sep = strchr(sep+1, '/');
+			if (!n_sep) n_sep = strchr(sep+1, '\\');
+			sep = n_sep;
+		}
+		gf_free(fname);
+	}
 
 #if defined(WIN32)
 	wchar_t *wname;
 	wchar_t *wmode;
 
-	wname = utf8_to_wcs(file_name);
-	wmode = utf8_to_wcs(mode);
+	wname = gf_utf8_to_wcs(file_name);
+	wmode = gf_utf8_to_wcs(mode);
 	if (!wname || !wmode)
 	{
 		if (wname) gf_free(wname);
@@ -782,7 +1302,7 @@
 	res = _wfsopen(wname, wmode, _SH_DENYNO);
 	gf_free(wname);
 	gf_free(wmode);
-#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
+#elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_CONFIG_ANDROID)
 	res = fopen64(file_name, mode);
 #elif (defined(GPAC_CONFIG_FREEBSD) || defined(GPAC_CONFIG_DARWIN))
 	res = fopen(file_name, mode);
@@ -791,15 +1311,15 @@
 #endif
 
 	if (res) {
-		gpac_file_handles++;
-		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));
+		gf_register_file_handle(file_name, res);
+		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 {
 		if (strchr(mode, 'w') || strchr(mode, 'a')) {
 #if defined(WIN32)
 			u32 err = GetLastError();
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of %s in mode %s: 0x%08x\n", file_name, mode, err));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of \"%s\" in mode \"%s\": 0x%08x\n", file_name, mode, err));
 #else
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of %s in mode %s: %d\n", file_name, mode, errno));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] system failure for file opening of \"%s\" in mode \"%s\": %d\n", file_name, mode, errno));
 #endif
 		}
 	}
@@ -807,11 +1327,23 @@
 }
 
 GF_EXPORT
+FILE *gf_fopen(const char *file_name, const char *mode)
+{
+	return gf_fopen_ex(file_name, NULL, mode);
+}
+
+GF_EXPORT
 s32 gf_fclose(FILE *file)
 {
-	if (file) {
-		assert(gpac_file_handles);
-		gpac_file_handles--;
+	if (!file)
+		return GF_OK;
+
+	gf_unregister_file_handle(file);
+	if (gf_fileio_check(file)) {
+		GF_Err e;
+		gf_fileio_open_url((GF_FileIO *) file, NULL, "deref", &e);
+		if (e) return -1;
+		return 0;
 	}
 	return fclose(file);
 }
@@ -821,18 +1353,19 @@
 #endif
 
 GF_EXPORT
-size_t gf_fread(void *ptr, size_t size, size_t nmemb, FILE *stream) {
-	return fread(ptr, size, nmemb, stream);
-}
-
-GF_EXPORT
-size_t gf_fwrite(const void *ptr, size_t size, size_t nmemb,
-                 FILE *stream)
+size_t gf_fwrite(const void *ptr, size_t nb_bytes, FILE *stream)
 {
-	size_t result = fwrite(ptr, size, nmemb, stream);
-	if (result != nmemb) {
+	size_t result=0;
+
+	if (gf_fileio_check(stream)) {
+		return(size_t) gf_fileio_write((GF_FileIO *)stream, (u8 *) ptr, (u32) nb_bytes);
+	}
+
+	if (ptr)
+		result = fwrite(ptr, 1, nb_bytes, stream);
+	if (result != nb_bytes) {
 #ifdef _WIN32_WCE
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data: %d blocks to write but %d blocks written\n", nmemb, result));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data: %d blocks to write but %d blocks written\n", nb_bytes, result));
 #else
 #if defined WIN32 && !defined(GPAC_CONFIG_WIN32)
 		errno_t errno_save;
@@ -852,13 +1385,153 @@
 #else
 			char *errstr = (char*)strerror(errno_save);
 #endif
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data (%s): %d blocks to write but %d blocks written\n", errstr, nmemb, result));
+
+#ifndef GPAC_DISABLE_LOG
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Error writing data (%s): %d blocks to write but %d blocks written\n", errstr, nb_bytes, result));
+#else
+			fprintf(stderr, "Error writing data (%s): %d blocks to write but %d blocks written\n", errstr, (u32) nb_bytes, (u32) result);
+#endif
+
 		}
 #endif
 	}
 	return result;
 }
 
+GF_EXPORT
+size_t gf_fread(void *ptr, size_t nbytes, FILE *stream)
+{
+	size_t result;
+	if (gf_fileio_check(stream)) {
+		return (size_t) gf_fileio_read((GF_FileIO *)stream, ptr, (u32) nbytes);
+	}
+	result = fread(ptr, 1, nbytes, stream);
+	return result;
+}
+
+GF_EXPORT
+char *gf_fgets(char *ptr, size_t size, FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		GF_FileIO *fio = (GF_FileIO *)stream;
+		u32 i, read, nb_read=0;
+		for (i=0; i<size; i++) {
+			u8 buf[1];
+			read = (u32) gf_fileio_read(fio, buf, 1);
+			if (!read) break;
+
+			ptr[nb_read] = buf[0];
+			nb_read++;
+			if (buf[0]=='\n') break;
+		}
+		if (!nb_read) return NULL;
+		return ptr;
+	}
+	return fgets(ptr, (u32) size, stream);
+}
+
+GF_EXPORT
+int gf_fgetc(FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		GF_FileIO *fio = (GF_FileIO *)stream;
+		u8 buf[1];
+		u32 read = gf_fileio_read(fio, buf, 1);
+		if (!read) return -1;
+		return buf[0];
+	}
+	return fgetc(stream);
+}
+
+GF_EXPORT
+int gf_fputc(int val, FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		GF_FileIO *fio = (GF_FileIO *)stream;
+		u32 write;
+		u8 buf[1];
+		buf[0] = val;
+		write = gf_fileio_write(fio, buf, 1);
+		if (!write) return -1;
+		return buf[0];
+	}
+	return fputc(val, stream);
+}
+
+GF_EXPORT
+int	gf_fputs(const char *buf, FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		GF_FileIO *fio = (GF_FileIO *)stream;
+		u32 write, len = (u32) strlen(buf);
+		write = gf_fileio_write(fio, (u8 *) buf, len);
+		if (write != len) return -1;
+		return write;
+	}
+	return fputs(buf, stream);
+}
+
+GF_EXPORT
+int gf_fprintf(FILE *stream, const char *format, ...)
+{
+	int	res;
+	va_list args;
+	va_start(args, format);
+	if (gf_fileio_check(stream)) {
+		res = gf_fileio_printf((GF_FileIO *)stream, format, args);
+	} else {
+		res = vfprintf(stream, format, args);
+	}
+	va_end(args);
+	return res;
+}
+
+GF_EXPORT
+int gf_fflush(FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		return gf_fileio_flush((GF_FileIO *)stream);
+	}
+	return fflush(stream);
+}
+
+GF_EXPORT
+int gf_feof(FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		return gf_fileio_eof((GF_FileIO *)stream) ? 1 : 0;
+	}
+	return feof(stream);
+}
+
+
+GF_EXPORT
+int gf_ferror(FILE *stream)
+{
+	if (gf_fileio_check(stream)) {
+		return 0;
+	}
+	return ferror(stream);
+}
+
+GF_EXPORT
+u64 gf_fsize(FILE *fp)
+{
+	u64 size;
+
+	if (gf_fileio_check(fp)) {
+		GF_FileIO *gfio = (GF_FileIO *)fp;
+		if (gfio->file_size_plus_one) {
+			gf_fseek(fp, 0, SEEK_SET);
+			return gfio->file_size_plus_one - 1;
+		}
+		//fall through
+	}
+	gf_fseek(fp, 0, SEEK_END);
+	size = gf_ftell(fp);
+	gf_fseek(fp, 0, SEEK_SET);
+	return size;
+}
 
 /**
   * Returns a pointer to the start of a filepath basename
@@ -868,26 +1541,21 @@
 {
 	char* lastPathPart = NULL;
 	if (filename) {
-
 		lastPathPart = strrchr(filename , GF_PATH_SEPARATOR);
-		if (GF_PATH_SEPARATOR != '/')
-		{
-			// windows paths can mix slashes and backslashes
-			// so we search for the last slash that occurs after the last backslash
-			// if it occurs before it's not relevant
-			// if there's no backslashes we search in the whole file path
-
-			char* trailingSlash = strrchr(lastPathPart?lastPathPart:filename, '/');
-			if (trailingSlash)
-				lastPathPart = trailingSlash;
-		}
+#if GF_PATH_SEPARATOR != '/'
+		// windows paths can mix slashes and backslashes
+		// so we search for the last slash that occurs after the last backslash
+		// if it occurs before it's not relevant
+		// if there's no backslashes we search in the whole file path
+
+		char* trailingSlash = strrchr(lastPathPart?lastPathPart:filename, '/');
+		if (trailingSlash)
+			lastPathPart = trailingSlash;
+#endif
 		if (!lastPathPart)
 			lastPathPart = (char *)filename;
 		else
 			lastPathPart++;
-
-
-
 	}
 	return lastPathPart;
 }
@@ -898,12 +1566,63 @@
 GF_EXPORT
 char* gf_file_ext_start(const char* filename)
 {
-	char* res = NULL;
-	char* basename = gf_file_basename(filename);
+	char* basename;
+
+	if (filename && !strncmp(filename, "gfio://", 7)) {
+		GF_FileIO *gfio = gf_fileio_from_url(filename);
+		filename = gf_fileio_resource_url(gfio);
+	}
+	basename = gf_file_basename(filename);
+
 	if (basename) {
+		char *ext = strrchr(basename, '.');
+		if (ext && !strcmp(ext, ".gz")) {
+			ext[0] = 0;
+			char *ext2 = strrchr(basename, '.');
+			ext[0] = '.';
+			if (ext2) return ext2;
+		}
+		return ext;
+	}
+	return NULL;
+}
+
+GF_EXPORT
+char* gf_url_colon_suffix(const char *path)
+{
+	char *sep = strchr(path, ':');
+	if (!sep) return NULL;
 
-		res = strrchr(basename, '.');
+	//handle Z:\ and Z:/
+	if ((path[1]==':') && ( (path[2]=='/') || (path[2]=='\\') ) )
+		return gf_url_colon_suffix(path+2);
 
+	if (!strncmp(path, "gfio://", 7) || !strncmp(path, "gmem://", 7)) {
+		return strchr(path+7, ':');
 	}
-	return res;
+	
+	//handle PROTO://ADD:PORT/
+	if ((sep[1]=='/') && (sep[2]=='/')) {
+		char *next_colon, *next_slash;
+		sep++;
+		//skip all // (eg PROTO://////////////mytest/)
+		while (sep[0]=='/')
+			sep++;
+		if (!sep[0]) return NULL;
+
+		/*we may now have C:\ or C:/  (eg file://///C:\crazy\ or  file://///C:/crazy/)
+			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);
+		}
+		//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, ':');
+		}
+		return next_colon;
+	}
+	return sep;
 }

gpac-0.8.0.tar.gz/src/utils/os_module.c -> gpac-1.0.0.tar.gz/src/utils/os_module.c Changed

@@ -38,9 +38,8 @@
 /*delete all interfaces loaded on object*/
 void gf_modules_free_module(ModuleInstance *inst)
 {
-	void *objinterface;
 	while (gf_list_count(inst->interfaces)) {
-		objinterface = gf_list_get(inst->interfaces, 0);
+		void *objinterface = gf_list_get(inst->interfaces, 0);
 		gf_list_rem(inst->interfaces, 0);
 		inst->destroy_func(objinterface);
 	}
@@ -69,6 +68,11 @@
 
 Bool gf_modules_load_library(ModuleInstance *inst)
 {
+#if defined(GPAC_MP4BOX_MINI)
+	GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load dynamic module %s from static build.\n", (inst && inst->name) ? inst->name : ""));
+	return GF_FALSE;
+#endif
+
 #ifdef WIN32
 	DWORD res;
 
@@ -122,10 +126,12 @@
 	inst->query_func = (QueryInterfaces) GetProcAddress(inst->lib_handle, _T("QueryInterfaces"));
 	inst->load_func = (LoadInterface) GetProcAddress(inst->lib_handle, _T("LoadInterface"));
 	inst->destroy_func = (ShutdownInterface) GetProcAddress(inst->lib_handle, _T("ShutdownInterface"));
+	inst->filterreg_func = (ShutdownInterface) GetProcAddress(inst->lib_handle, _T("RegisterFilter"));
 #else
 	inst->query_func = (QueryInterfaces) GetProcAddress((HMODULE)inst->lib_handle, "QueryInterfaces");
 	inst->load_func = (LoadInterface) GetProcAddress((HMODULE)inst->lib_handle, "LoadInterface");
 	inst->destroy_func = (ShutdownInterface) GetProcAddress((HMODULE)inst->lib_handle, "ShutdownInterface");
+	inst->filterreg_func = (LoadFilterRegister) GetProcAddress((HMODULE)inst->lib_handle, "RegisterFilter");
 #endif
 
 #else
@@ -144,19 +150,17 @@
 	if (error)
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Cleaning up previous dlerror %s\n", error));
 	inst->query_func = (QueryInterfaces) dlsym(inst->lib_handle, "QueryInterfaces");
-	error = dlerror();
-	if (error)
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot resolve symbol QueryInterfaces in module file %s, error is %s\n", path, error));
 	inst->load_func = (LoadInterface) dlsym(inst->lib_handle, "LoadInterface");
-	error = dlerror();
-	if (error)
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot resolve symbol LoadInterface in module file %s, error is %s\n", path, error));
 	inst->destroy_func = (ShutdownInterface) dlsym(inst->lib_handle, "ShutdownInterface");
-	error = dlerror();
-	if (error)
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot resolve symbol ShutdownInterface in module file %s, error is %s\n", path, error));
+	inst->filterreg_func = (LoadFilterRegister) dlsym(inst->lib_handle, "RegisterFilter");
 #endif
-	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s : DONE\n", inst->name));
+	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"));
+		return GF_TRUE;
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Load module file %s OK\n", inst->name));
 	return GF_TRUE;
 }
 
@@ -167,8 +171,12 @@
 	if (inst->plugman->no_unload)
 		return;
 
+	/*filters are not unloaded*/
+	if (inst->filterreg_func)
+		return;
+
 #ifdef WIN32
-	if (strcmp(inst->name, "gm_openhevc_dec.dll"))
+	if (strcmp(inst->name, "gf_ohevcdec.dll"))
 		FreeLibrary((HMODULE)inst->lib_handle);
 #else
 	dlclose(inst->lib_handle);
@@ -187,6 +195,7 @@
 	QueryInterface query_func;
 	LoadInterface load_func;
 	ShutdownInterface del_func;
+	LoadFilterRegister filterreg_func;
 #ifdef WIN32
 	HMODULE ModuleLib;
 #else
@@ -199,7 +208,7 @@
 	GF_ModuleManager *pm = (GF_ModuleManager*)cbck;
 
 	if (strstr(item_name, "nposmozilla")) return GF_FALSE;
-	if (strncmp(item_name, "gm_", 3) && strncmp(item_name, "libgm_", 6)) return GF_FALSE;
+	if (strncmp(item_name, "gf_", 3) && strncmp(item_name, "gm_", 3) && strncmp(item_name, "libgm_", 6)) return GF_FALSE;
 	if (gf_module_is_loaded(pm, item_name) ) return GF_FALSE;
 
 #if CHECK_MODULE
@@ -215,10 +224,13 @@
 	query_func = (QueryInterface) GetProcAddress(ModuleLib, _T("QueryInterface"));
 	load_func = (LoadInterface) GetProcAddress(ModuleLib, _T("LoadInterface"));
 	del_func = (ShutdownInterface) GetProcAddress(ModuleLib, _T("ShutdownInterface"));
+	filterreg_func = (LoadFilterRegister) GetProcAddress(ModuleLib, _T("RegisterFilter"));
+
 #else
 	query_func = (QueryInterface) GetProcAddress(ModuleLib, "QueryInterface");
 	load_func = (LoadInterface) GetProcAddress(ModuleLib, "LoadInterface");
 	del_func = (ShutdownInterface) GetProcAddress(ModuleLib, "ShutdownInterface");
+	filterreg_func = (LoadFilterRegister) GetProcAddress(ModuleLib, "RegisterFilter");
 #endif
 	FreeLibrary(ModuleLib);
 
@@ -239,10 +251,11 @@
 	query_func = (QueryInterface) dlsym(ModuleLib, "QueryInterface");
 	load_func = (LoadInterface) dlsym(ModuleLib, "LoadInterface");
 	del_func = (ShutdownInterface) dlsym(ModuleLib, "ShutdownInterface");
+	filterreg_func = (LoadFilterRegister) dlsym(ModuleLib, "RegisterFilter");
 	dlclose(ModuleLib);
 #endif
 
-	if (!load_func || !query_func || !del_func) {
+	if (!filterreg_func && (!load_func || !query_func || !del_func) ) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE,
 		       ("[Core] Could not find some signatures in module %s: QueryInterface=%p, LoadInterface=%p, ShutdownInterface=%p\n",
 		        item_name, load_func, query_func, del_func));

gpac-0.8.0.tar.gz/src/utils/os_net.c -> gpac-1.0.0.tar.gz/src/utils/os_net.c Changed

@@ -159,6 +159,16 @@
 #define NULL_SOCKET (SOCKET)NULL
 #endif
 
+#ifdef GPAC_HAS_SOCK_UN
+#include <sys/un.h>
+#endif
+
+GF_EXPORT
+const char *gf_errno_str(int errnoval)
+{
+	return strerror(errnoval);
+}
+
 
 /*internal flags*/
 enum
@@ -170,7 +180,7 @@
 	GF_SOCK_IS_LISTENING = 1<<13,
 	/*socket is bound to a specific dest (server) or source (client) */
 	GF_SOCK_HAS_PEER = 1<<14,
-	GF_SOCK_IS_MIP = 1<<15
+	GF_SOCK_IS_UN = 1<<15,
 };
 
 struct __tag_socket
@@ -190,26 +200,6 @@
 
 
 
-/*
-	MobileIP tools
-*/
-
-static gf_net_mobileip_ctrl_cbk mobip_cbk = NULL;
-static const char *MobileIPAdd = NULL;
-
-GF_EXPORT
-void gf_net_mobileip_set_callback(gf_net_mobileip_ctrl_cbk _mobip_cbk, const char *mip)
-{
-	mobip_cbk = _mobip_cbk;
-	MobileIPAdd = _mobip_cbk ? mip : NULL;
-}
-
-static GF_Err gf_net_mobileip_ctrl(Bool start)
-{
-	if (mobip_cbk) return mobip_cbk(start);
-	return GF_NOT_SUPPORTED;
-}
-
 GF_EXPORT
 u32 gf_net_has_ipv6()
 {
@@ -291,15 +281,7 @@
 	return res;
 }
 
-static Bool gf_sk_ipv6_set_remote_address(GF_Socket *sock, const char *address, u16 PortNumber)
-{
-	struct addrinfo *res = gf_sk_get_ipv6_addr(address, PortNumber, AF_UNSPEC, 0, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM);
-	if (!res) return GF_FALSE;
-	memcpy(&sock->dest_addr, res->ai_addr, res->ai_addrlen);
-	sock->dest_addr_len = (u32) res->ai_addrlen;
-	freeaddrinfo(res);
-	return GF_TRUE;
-}
+
 #endif
 
 
@@ -354,11 +336,26 @@
 	WSADATA Data;
 	if (!wsa_init && (WSAStartup(0x0202, &Data)!=0) ) return NULL;
 #endif
-	if ((SocketType != GF_SOCK_TYPE_UDP) && (SocketType != GF_SOCK_TYPE_TCP)) return NULL;
+	switch (SocketType) {
+	case GF_SOCK_TYPE_UDP:
+	case GF_SOCK_TYPE_TCP:
+#ifdef GPAC_HAS_SOCK_UN
+	case GF_SOCK_TYPE_UDP_UN:
+	case GF_SOCK_TYPE_TCP_UN:
+#endif
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] unsupported socket type %d\n", SocketType));
+		return NULL;
+	}
 
 	GF_SAFEALLOC(tmp, GF_Socket);
 	if (!tmp) return NULL;
 	if (SocketType == GF_SOCK_TYPE_TCP) tmp->flags |= GF_SOCK_IS_TCP;
+#ifdef GPAC_HAS_SOCK_UN
+	else if (SocketType == GF_SOCK_TYPE_TCP_UN) tmp->flags |= GF_SOCK_IS_TCP | GF_SOCK_IS_UN;
+	else if (SocketType == GF_SOCK_TYPE_UDP_UN) tmp->flags |= GF_SOCK_IS_UN;
+#endif
 
 #ifdef GPAC_HAS_IPV6
 	memset(&tmp->dest_addr, 0, sizeof(struct sockaddr_storage));
@@ -415,9 +412,14 @@
 		if (res) return GF_SERVICE_ERROR;
 	}
 #else
-	s32 flag = fcntl(sock->socket, F_GETFL, 0);
 	if (sock->socket) {
-		res = fcntl(sock->socket, F_SETFL, flag | O_NONBLOCK);
+		s32 flags = fcntl(sock->socket, F_GETFL, 0);
+		if (NonBlockingOn)
+			flags |= O_NONBLOCK;
+		else
+			flags &= ~O_NONBLOCK;
+
+		res = fcntl(sock->socket, F_SETFL, flags);
 		if (res) return GF_SERVICE_ERROR;
 	}
 #endif
@@ -434,8 +436,10 @@
 static void gf_sk_free(GF_Socket *sock)
 {
 	assert( sock );
+	if (!sock->socket) return;
+
 	/*leave multicast*/
-	if (sock->socket && (sock->flags & GF_SOCK_IS_MULTICAST) ) {
+	if (sock->flags & GF_SOCK_IS_MULTICAST) {
 		struct ip_mreq mreq;
 #ifdef GPAC_HAS_IPV6
 		struct sockaddr *addr = (struct sockaddr *)&sock->dest_addr;
@@ -455,14 +459,8 @@
 		setsockopt(sock->socket, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char *) &mreq, sizeof(mreq));
 #endif
 	}
-	if (sock->socket) closesocket(sock->socket);
+	closesocket(sock->socket);
 	sock->socket = (SOCKET) 0L;
-
-	/*if MobileIP socket, unregister it*/
-	if (sock->flags & GF_SOCK_IS_MIP) {
-		sock->flags &= ~GF_SOCK_IS_MIP;
-		gf_net_mobileip_ctrl(GF_FALSE);
-	}
 }
 
 
@@ -491,39 +489,53 @@
 	return (s32) sock->socket;
 }
 
+GF_EXPORT
 void gf_sk_set_usec_wait(GF_Socket *sock, u32 usec_wait)
 {
 	if (!sock) return;
 	sock->usec_wait = (usec_wait>=1000000) ? 500 : usec_wait;
 }
 
-
-
 //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)
 {
 	s32 ret;
 #ifdef GPAC_HAS_IPV6
-	u32 type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
+	u32 type;
 	struct addrinfo *res, *aip, *lip;
+#else
+	struct hostent *Host = NULL;
+#endif
 
-	gf_sk_free(sock);
+	if (sock->flags & GF_SOCK_IS_UN) {
+#ifdef GPAC_HAS_SOCK_UN
+		struct sockaddr_un server_add;
+		if (!sock->socket) {
+			sock->socket = socket(AF_UNIX, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
+			if (sock->flags & GF_SOCK_NON_BLOCKING)
+				gf_sk_set_block_mode(sock, GF_TRUE);
+		}
+		server_add.sun_family = AF_UNIX;
+		strcpy(server_add.sun_path, PeerName);
+		if (connect(sock->socket, (struct sockaddr *) &server_add, sizeof(struct sockaddr_un)) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Socket] Failed to connect unix domain socket to %s\n", PeerName));
+			return GF_IP_CONNECTION_FAILURE;
+	     }
+	     return GF_OK;
+#else
+	     return GF_NOT_SUPPORTED;
+#endif
+	}
+
+#ifdef GPAC_HAS_IPV6
+	type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Solving %s address\n", PeerName));
 	res = gf_sk_get_ipv6_addr(PeerName, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
 	if (!res) return GF_IP_CONNECTION_FAILURE;
 	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Host %s found\n", PeerName));
 
-	/*turn on MobileIP*/
-	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
-		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
-			sock->flags |= GF_SOCK_IS_MIP;
-		} else {
-			local_ip = NULL;
-		}
-	}
-
 	lip = NULL;
 	if (local_ip) {
 		lip = gf_sk_get_ipv6_addr(local_ip, PortNumber, AF_UNSPEC, AI_PASSIVE, type);
@@ -536,33 +548,46 @@
 	/*for all interfaces*/
 	for (aip=res; aip!=NULL; aip=aip->ai_next) {
 		if (type != (u32) aip->ai_socktype) continue;
-		sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
-		if (sock->socket == INVALID_SOCKET) {
-			sock->socket = NULL_SOCKET;
-			continue;
+		if (!sock->socket) {
+			sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+			if (sock->socket == INVALID_SOCKET) {
+				sock->socket = NULL_SOCKET;
+				continue;
+			}
+			if (sock->flags & GF_SOCK_IS_TCP) {
+				if (sock->flags & GF_SOCK_NON_BLOCKING)
+					gf_sk_set_block_mode(sock, GF_TRUE);
+			}
+
+			if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
+			else sock->flags &= ~GF_SOCK_IS_IPV6;
+
+			if (lip) {
+				ret = bind(sock->socket, lip->ai_addr, (int) lip->ai_addrlen);
+				if (ret == SOCKET_ERROR) {
+					closesocket(sock->socket);
+					sock->socket = NULL_SOCKET;
+					continue;
+				}
+			}
 		}
-		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
-		if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
-		else sock->flags &= ~GF_SOCK_IS_IPV6;
 
-		if (lip) {
-			ret = bind(sock->socket, lip->ai_addr, (int) lip->ai_addrlen);
+		if (sock->flags & GF_SOCK_IS_TCP) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
+			ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
 			if (ret == SOCKET_ERROR) {
 				closesocket(sock->socket);
 				sock->socket = NULL_SOCKET;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Sock_IPV4] Failed to connect to host %s: %s - retrying\n", PeerName, gf_errno_str(LASTSOCKERROR) ));
 				continue;
 			}
-		}
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
 
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connecting to %s:%d\n", PeerName, PortNumber));
-		ret = connect(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
-		if (ret == SOCKET_ERROR) {
-			closesocket(sock->socket);
-			sock->socket = NULL_SOCKET;
-			continue;
+#ifdef SO_NOSIGPIPE
+			int value = 1;
+			setsockopt(sock->socket, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof(value));
+#endif
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV6] Connected to %s:%d\n", PeerName, PortNumber));
-
 		memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 		sock->dest_addr_len = (u32) aip->ai_addrlen;
 		freeaddrinfo(res);
@@ -574,17 +599,14 @@
 	return GF_IP_CONNECTION_FAILURE;
 
 #else
-	struct hostent *Host;
-
 	if (local_ip) {
-		/*this will turn on MobileIP if needed*/
 		GF_Err e = gf_sk_bind(sock, local_ip, PortNumber, PeerName, PortNumber, GF_SOCK_REUSE_PORT);
 		if (e) return e;
 	}
 	if (!sock->socket) {
 		sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 		if (sock->flags & GF_SOCK_NON_BLOCKING)
-			gf_sk_set_block_mode(sock, 1);
+			gf_sk_set_block_mode(sock, GF_TRUE);
 	}
 
 	/*setup the address*/
@@ -596,6 +618,7 @@
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Solving %s address\n", PeerName));
 		Host = 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) {
 #ifndef __SYMBIAN32__
 			case ENETDOWN:
@@ -610,38 +633,36 @@
 		memcpy((char *) &sock->dest_addr.sin_addr, Host->h_addr_list[0], sizeof(u32));
 	}
 
-	if (sock->flags & GF_SOCK_IS_TCP) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
-		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
-		if (ret == SOCKET_ERROR) {
-			u32 res = LASTSOCKERROR;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket - last sock error %d\n", res));
-			switch (res) {
-			case EAGAIN:
-				return GF_IP_SOCK_WOULD_BLOCK;
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connecting to %s:%d\n", PeerName, PortNumber));
+	ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
+	if (ret == SOCKET_ERROR) {
+		u32 res = LASTSOCKERROR;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Sock_IPV4] Couldn't connect socket: %s\n", gf_errno_str(res) ));
+		switch (res) {
+		case EAGAIN:
+			return GF_IP_SOCK_WOULD_BLOCK;
 #ifdef WIN32
-			case WSAEINVAL:
-				if (sock->flags & GF_SOCK_NON_BLOCKING)
-					return GF_IP_SOCK_WOULD_BLOCK;
+		case WSAEINVAL:
+			if (sock->flags & GF_SOCK_NON_BLOCKING)
+				return GF_IP_SOCK_WOULD_BLOCK;
 #endif
-			case EISCONN:
-				return GF_OK;
-			case ENOTCONN:
-				return GF_IP_CONNECTION_FAILURE;
-			case ECONNRESET:
-				return GF_IP_CONNECTION_FAILURE;
-			case EMSGSIZE:
-				return GF_IP_CONNECTION_FAILURE;
-			case ECONNABORTED:
-				return GF_IP_CONNECTION_FAILURE;
-			case ENETDOWN:
-				return GF_IP_CONNECTION_FAILURE;
-			default:
-				return GF_IP_CONNECTION_FAILURE;
-			}
+		case EISCONN:
+			return GF_OK;
+		case ENOTCONN:
+			return GF_IP_CONNECTION_FAILURE;
+		case ECONNRESET:
+			return GF_IP_CONNECTION_FAILURE;
+		case EMSGSIZE:
+			return GF_IP_CONNECTION_FAILURE;
+		case ECONNABORTED:
+			return GF_IP_CONNECTION_FAILURE;
+		case ENETDOWN:
+			return GF_IP_CONNECTION_FAILURE;
+		default:
+			return GF_IP_CONNECTION_FAILURE;
 		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
 	}
+	GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[Sock_IPV4] Connected to %s:%d\n", PeerName, PortNumber));
 #endif
 	return GF_OK;
 }
@@ -660,17 +681,39 @@
 	u32 ip_add;
 	size_t addrlen;
 	struct sockaddr_in LocalAdd;
-	struct hostent *Host;
-#if 0
-	char buf[GF_MAX_IP_NAME_LEN];
-#endif
-
+	struct hostent *Host = NULL;
 #endif
 	s32 ret;
 	s32 optval;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
 
+	if (sock->flags & GF_SOCK_IS_UN) {
+#ifdef GPAC_HAS_SOCK_UN
+		struct sockaddr_un server_un;
+		if (!sock->socket) {
+			sock->socket = socket(AF_UNIX, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
+			if (sock->flags & GF_SOCK_NON_BLOCKING)
+				gf_sk_set_block_mode(sock, GF_TRUE);
+		}
+		server_un.sun_family = AF_UNIX;
+		strcpy(server_un.sun_path, peer_name);
+		ret = bind(sock->socket, (struct sockaddr *) &server_un, (int) sizeof(struct sockaddr_un));
+		if (ret == SOCKET_ERROR) {
+			if (LASTSOCKERROR == EADDRINUSE) {
+				return gf_sk_connect(sock, peer_name, peer_port, NULL);
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot bind socket: %s\n", gf_errno_str(LASTSOCKERROR) ));
+			return GF_IP_CONNECTION_FAILURE;
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[socket] socket bound to unix domain %s\n", peer_name));
+		return GF_OK;
+#else
+	    return GF_NOT_SUPPORTED;
+#endif
+	}
+
+
 #ifndef WIN32
 	if(!local_ip) {
 		if(!peer_name || !strcmp(peer_name,"localhost")) {
@@ -700,15 +743,6 @@
 		freeaddrinfo(res);
 	}
 
-	/*turn on MobileIP*/
-	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
-		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
-			sock->flags |= GF_SOCK_IS_MIP;
-		} else {
-			/*res = */gf_sk_get_ipv6_addr(NULL, port, af, AI_PASSIVE, type);
-			local_ip = NULL;
-		}
-	}
 	res = gf_sk_get_ipv6_addr(local_ip, port, af, AI_PASSIVE, type);
 	if (!res) {
 		if (local_ip) {
@@ -741,19 +775,21 @@
 #endif
 		}
 
-		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
+		if (sock->flags & GF_SOCK_NON_BLOCKING)
+			gf_sk_set_block_mode(sock, GF_TRUE);
 
 		if (peer_name && peer_port)
 			sock->flags |= GF_SOCK_HAS_PEER;
 
-
-		ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
-		if (ret == SOCKET_ERROR) {
-			closesocket(sock->socket);
-			sock->socket = NULL_SOCKET;
-			continue;
+		if (! (options & GF_SOCK_FAKE_BIND) ) {
+			ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
+			if (ret == SOCKET_ERROR) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot bind: %s\n", gf_errno_str(LASTSOCKERROR) ));
+				closesocket(sock->socket);
+				sock->socket = NULL_SOCKET;
+				continue;
+			}
 		}
-
 		if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
 		else sock->flags &= ~GF_SOCK_IS_IPV6;
 
@@ -767,25 +803,19 @@
 #else
 
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
-	if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+	if (sock->flags & GF_SOCK_NON_BLOCKING)
+		gf_sk_set_block_mode(sock, GF_TRUE);
 	sock->flags &= ~GF_SOCK_IS_IPV6;
 
 	memset((void *) &LocalAdd, 0, sizeof(LocalAdd));
 
-	/*turn on MobileIP*/
-	if (local_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_ip) ) {
-		if (gf_net_mobileip_ctrl(1)==GF_OK) {
-			sock->flags |= GF_SOCK_IS_MIP;
-		} else {
-			local_ip = NULL;
-		}
-	}
 	/*setup the address*/
 	ip_add = 0;
 	if (local_ip) ip_add = inet_addr(local_ip);
 
 	if (!ip_add) {
 #if 0
+		char buf[GF_MAX_IP_NAME_LEN];
 		buf[0] = 0;
 		ret = gethostname(buf, GF_MAX_IP_NAME_LEN);
 		/*get the IP address*/
@@ -802,7 +832,7 @@
 	}
 	if (peer_name && peer_port) {
 #ifdef WIN32
-		if ((inet_addr(peer_name)== ip_add)) {
+		if ((inet_addr(peer_name)== ip_add) || !strcmp(peer_name, "127.0.0.1") ) {
 			optval = 1;
 			setsockopt(sock->socket, SOL_SOCKET, SO_USELOOPBACK, SSO_CAST &optval, sizeof(optval));
 		}
@@ -824,13 +854,15 @@
 #endif
 	}
 
-	/*bind the socket*/
-	ret = bind(sock->socket, (struct sockaddr *) &LocalAdd, (int) addrlen);
-	if (ret == SOCKET_ERROR) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot bind socket - socket error %x\n", LASTSOCKERROR));
-		ret = GF_IP_CONNECTION_FAILURE;
+	if (! (options & GF_SOCK_FAKE_BIND) ) {
+		/*bind the socket*/
+		ret = bind(sock->socket, (struct sockaddr *) &LocalAdd, (int) addrlen);
+		if (ret == SOCKET_ERROR) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot bind socket: %s\n", gf_errno_str(LASTSOCKERROR) ));
+			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;
@@ -853,7 +885,7 @@
 
 //send length bytes of a buffer
 GF_EXPORT
-GF_Err gf_sk_send(GF_Socket *sock, const char *buffer, u32 length)
+GF_Err gf_sk_send(GF_Socket *sock, const u8 *buffer, u32 length)
 {
 	u32 count;
 	s32 res;
@@ -865,7 +897,8 @@
 #endif
 
 	//the socket must be bound or connected
-	if (!sock || !sock->socket) return GF_BAD_PARAM;
+	if (!sock || !sock->socket)
+		return GF_BAD_PARAM;
 
 #ifndef __SYMBIAN32__
 	//can we write?
@@ -881,6 +914,7 @@
 		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;
 		}
 	}
@@ -897,7 +931,11 @@
 		if (sock->flags & GF_SOCK_HAS_PEER) {
 			res = (s32) sendto(sock->socket, (char *) buffer+count,  length - count, 0, (struct sockaddr *) &sock->dest_addr, sock->dest_addr_len);
 		} else {
-			res = (s32) send(sock->socket, (char *) buffer+count, length - count, 0);
+			int sflags = 0;
+#ifdef MSG_NOSIGNAL
+			sflags = MSG_NOSIGNAL;
+#endif
+			res = (s32) send(sock->socket, (char *) buffer+count, length - count, sflags);
 		}
 		if (res == SOCKET_ERROR) {
 			if (not_ready)
@@ -909,9 +947,20 @@
 #ifndef __SYMBIAN32__
 			case ENOTCONN:
 			case ECONNRESET:
+			case EPIPE:
+				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[socket] send failure: %s\n", gf_errno_str(LASTSOCKERROR)));
 				return GF_IP_CONNECTION_CLOSED;
 #endif
+
+#ifndef __DARWIN__
+			case EPROTOTYPE:
+				return GF_IP_SOCK_WOULD_BLOCK;
+#endif
+			case ENOBUFS:
+				GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[socket] send failure: %s\n", gf_errno_str(LASTSOCKERROR)));
+				return GF_BUFFER_TOO_SMALL;
 			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] send failure: %s\n", gf_errno_str(LASTSOCKERROR)));
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
@@ -972,15 +1021,6 @@
 	/*check the address*/
 	if (!gf_sk_is_multicast_address(multi_IPAdd)) return GF_BAD_PARAM;
 
-	/*turn on MobileIP*/
-	if (local_interface_ip && MobileIPAdd && !strcmp(MobileIPAdd, local_interface_ip) ) {
-		if (gf_net_mobileip_ctrl(GF_TRUE)==GF_OK) {
-			sock->flags |= GF_SOCK_IS_MIP;
-		} else {
-			local_interface_ip = NULL;
-		}
-	}
-
 
 #ifdef GPAC_HAS_IPV6
 	is_ipv6 = gf_net_is_ipv6(multi_IPAdd) || gf_net_is_ipv6(local_interface_ip) ? GF_TRUE : GF_FALSE;
@@ -1017,7 +1057,8 @@
 #endif
 
 			/*TODO: copy over other properties (recption buffer size & co)*/
-			if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
+			if (sock->flags & GF_SOCK_NON_BLOCKING)
+				gf_sk_set_block_mode(sock, GF_TRUE);
 
 			memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
 			sock->dest_addr_len = (u32) aip->ai_addrlen;
@@ -1037,9 +1078,11 @@
 		freeaddrinfo(res);
 		if (!sock->socket) return GF_IP_CONNECTION_FAILURE;
 
-
-		if (!gf_sk_ipv6_set_remote_address(sock, multi_IPAdd, MultiPortNumber))
-			return GF_IP_CONNECTION_FAILURE;
+		struct addrinfo *_res = gf_sk_get_ipv6_addr(multi_IPAdd, MultiPortNumber, AF_UNSPEC, 0, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM);
+		if (!_res) return GF_IP_CONNECTION_FAILURE;
+		memcpy(&sock->dest_addr, _res->ai_addr, res->ai_addrlen);
+		sock->dest_addr_len = (u32) _res->ai_addrlen;
+		freeaddrinfo(_res);
 
 		addr = (struct sockaddr *)&sock->dest_addr;
 		if (addr->sa_family == AF_INET) {
@@ -1069,7 +1112,7 @@
 			flag = 1;
 			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
 			if (ret == SOCKET_ERROR) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disale multicast loop: error %d\n", LASTSOCKERROR));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disale multicast loop: %s\n", gf_errno_str(LASTSOCKERROR) ));
 			}
 
 			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
@@ -1082,20 +1125,21 @@
 
 	//IPv4 setup
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
-	if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, GF_TRUE);
+	if (sock->flags & GF_SOCK_NON_BLOCKING)
+		gf_sk_set_block_mode(sock, GF_TRUE);
 	sock->flags &= ~GF_SOCK_IS_IPV6;
 
 	/*enable address reuse*/
 	optval = 1;
 	ret = setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, SSO_CAST &optval, sizeof(optval));
 	if (ret == SOCKET_ERROR) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[core] Failed to set SO_REUSEADDR: error %d\n", LASTSOCKERROR));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[core] Failed to set SO_REUSEADDR: %s\n", gf_errno_str(LASTSOCKERROR) ));
 	}
 #ifdef SO_REUSEPORT
 	optval = 1;
 	ret = setsockopt(sock->socket, SOL_SOCKET, SO_REUSEPORT, SSO_CAST &optval, sizeof(optval));
 	if (ret == SOCKET_ERROR) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[core] Failed to set SO_REUSEPORT: error %d\n", LASTSOCKERROR));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[core] Failed to set SO_REUSEPORT: %s\n", gf_errno_str(LASTSOCKERROR) ));
 	}
 #endif
 
@@ -1117,7 +1161,10 @@
 			local_address.sin_addr.s_addr = local_add_id = htonl(INADDR_ANY);
 			local_interface_ip = NULL;
 			ret = bind(sock->socket, (struct sockaddr *) &local_address, sizeof(local_address));
-			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			if (ret == SOCKET_ERROR) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[core] Failed to bind socket: %s\n", gf_errno_str(LASTSOCKERROR) ));
+				return GF_IP_CONNECTION_FAILURE;
+			}
 		}
 		/*setup local interface*/
 		if (local_interface_ip) {
@@ -1132,7 +1179,7 @@
 
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *) &M_req, sizeof(M_req));
 	if (ret == SOCKET_ERROR) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[core] cannot join multicast: error %d\n", LASTSOCKERROR));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[core] cannot join multicast: %s\n", gf_errno_str(LASTSOCKERROR)));
 		return GF_IP_CONNECTION_FAILURE;
 	}
 	/*set the Time To Live*/
@@ -1145,7 +1192,7 @@
 	flag = 1;
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
 	if (ret == SOCKET_ERROR) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disale multicast loop: error %d\n", LASTSOCKERROR));
+		GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[Socket] Cannot disable multicast loop: %s\n", gf_errno_str(LASTSOCKERROR) ));
 	}
 
 #ifdef GPAC_HAS_IPV6
@@ -1167,15 +1214,17 @@
 struct __tag_sock_group
 {
 	GF_List *sockets;
-	fd_set group;
+	fd_set rgroup, wgroup;
 };
 
 GF_SockGroup *gf_sk_group_new()
 {
 	GF_SockGroup *tmp;
 	GF_SAFEALLOC(tmp, GF_SockGroup);
+	if (!tmp) return NULL;
 	tmp->sockets = gf_list_new();
-	FD_ZERO(&tmp->group);
+	FD_ZERO(&tmp->rgroup);
+	FD_ZERO(&tmp->wgroup);
 	return tmp;
 }
 
@@ -1188,7 +1237,8 @@
 void gf_sk_group_register(GF_SockGroup *sg, GF_Socket *sk)
 {
 	if (sg && sk) {
-		gf_list_add(sg->sockets, sk);
+		if (gf_list_find(sg->sockets, sk)<0)
+			gf_list_add(sg->sockets, sk);
 	}
 }
 void gf_sk_group_unregister(GF_SockGroup *sg, GF_Socket *sk)
@@ -1198,17 +1248,40 @@
 	}
 }
 
-GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 usec_wait)
+GF_Err gf_sk_group_select(GF_SockGroup *sg, u32 usec_wait, GF_SockSelectMode mode)
 {
 	s32 ready;
 	u32 i=0;
 	struct timeval timeout;
 	u32 max_fd=0;
 	GF_Socket *sock;
+	fd_set *rgroup=NULL, *wgroup=NULL;
 
-	FD_ZERO(&sg->group);
+	if (!gf_list_count(sg->sockets))
+		return GF_IP_NETWORK_EMPTY;
+		
+	FD_ZERO(&sg->rgroup);
+	FD_ZERO(&sg->wgroup);
+
+	switch (mode) {
+	case GF_SK_SELECT_BOTH:
+		rgroup = &sg->rgroup;
+		wgroup = &sg->wgroup;
+		break;
+	case GF_SK_SELECT_READ:
+		rgroup = &sg->rgroup;
+		break;
+	case GF_SK_SELECT_WRITE:
+		wgroup = &sg->wgroup;
+		break;
+	}
 	while ((sock = gf_list_enum(sg->sockets, &i))) {
-		FD_SET(sock->socket, &sg->group);
+		if (rgroup)
+			FD_SET(sock->socket, rgroup);
+
+		if (wgroup)
+			FD_SET(sock->socket, wgroup);
+
 		if (max_fd < (u32) sock->socket) max_fd = (u32) sock->socket;
 	}
 	if (usec_wait>=1000000) {
@@ -1218,7 +1291,7 @@
 		timeout.tv_sec = 0;
 		timeout.tv_usec = usec_wait;
 	}
-	ready = select((int) max_fd+1, &sg->group, NULL, NULL, &timeout);
+	ready = select((int) max_fd+1, rgroup, wgroup, NULL, &timeout);
 
 	if (ready == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
@@ -1232,7 +1305,7 @@
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] network is lost\n"));
 			return GF_IP_NETWORK_EMPTY;
 		default:
-			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select (error %d)\n", LASTSOCKERROR));
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select: %s\n", gf_errno_str(LASTSOCKERROR) ));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1243,9 +1316,14 @@
 	return GF_OK;
 }
 
-Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk)
+Bool gf_sk_group_sock_is_set(GF_SockGroup *sg, GF_Socket *sk, GF_SockSelectMode mode)
 {
-	if (sg && sk && FD_ISSET(sk->socket, &sg->group)) return GF_TRUE;
+	if (sg && sk) {
+		if ((mode!=GF_SK_SELECT_WRITE) && FD_ISSET(sk->socket, &sg->rgroup))
+			return GF_TRUE;
+		if ((mode!=GF_SK_SELECT_READ) && FD_ISSET(sk->socket, &sg->wgroup))
+			return GF_TRUE;
+	}
 	return GF_FALSE;
 }
 
@@ -1253,7 +1331,7 @@
 //fetch nb bytes on a socket and fill the buffer from startFrom
 //length is the allocated size of the receiving buffer
 //BytesRead is the number of bytes read from the network
-GF_Err gf_sk_receive_internal(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead, Bool do_select)
+GF_Err gf_sk_receive_internal(GF_Socket *sock, char *buffer, u32 length, u32 *BytesRead, Bool do_select)
 {
 	s32 res;
 #ifndef __SYMBIAN32__
@@ -1262,9 +1340,8 @@
 	fd_set Group;
 #endif
 
-	*BytesRead = 0;
+	if (BytesRead) *BytesRead = 0;
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
-	if (startFrom >= length) return GF_IO_ERR;
 
 #ifndef __SYMBIAN32__
 	if (do_select) {
@@ -1287,7 +1364,7 @@
 				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] network is lost\n"));
 				return GF_IP_NETWORK_EMPTY;
 			default:
-				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select (error %d)\n", LASTSOCKERROR));
+				GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[socket] cannot select: %s\n", gf_errno_str(LASTSOCKERROR) ));
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
@@ -1297,10 +1374,12 @@
 		}
 	}
 #endif
+	if (!buffer) return GF_OK;
+	
 	if (sock->flags & GF_SOCK_HAS_PEER)
-		res = (s32) recvfrom(sock->socket, (char *) buffer + startFrom, length - startFrom, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
+		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 + startFrom, length - startFrom, 0);
+		res = (s32) recv(sock->socket, (char *) buffer, length, 0);
 		if (res == 0)
 			return GF_IP_CONNECTION_CLOSED;
 	}
@@ -1312,38 +1391,35 @@
 			return GF_IP_SOCK_WOULD_BLOCK;
 #ifndef __SYMBIAN32__
 		case EMSGSIZE:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - socket error %d\n",  res));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_OUT_OF_MEM;
 		case ENOTCONN:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - not connected\n"));
-			return GF_IP_CONNECTION_CLOSED;
 		case ECONNRESET:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - connection reset\n"));
-			return GF_IP_CONNECTION_CLOSED;
 		case ECONNABORTED:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - connection aborted\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_CONNECTION_CLOSED;
 #endif
 		default:
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading - socket error %d\n",  res));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] error reading: %s\n", gf_errno_str(LASTSOCKERROR) ));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
 	if (!res) return GF_IP_NETWORK_EMPTY;
-	*BytesRead = res;
+	if (BytesRead)
+		*BytesRead = res;
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_sk_receive(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead)
+GF_Err gf_sk_receive(GF_Socket *sock, u8 *buffer, u32 length, u32 *BytesRead)
 {
-	return gf_sk_receive_internal(sock, buffer, length, startFrom, BytesRead, GF_TRUE);
+	return gf_sk_receive_internal(sock, buffer, length, BytesRead, GF_TRUE);
 }
 
 GF_EXPORT
-GF_Err gf_sk_receive_no_select(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead)
+GF_Err gf_sk_receive_no_select(GF_Socket *sock, u8 *buffer, u32 length, u32 *BytesRead)
 {
-	return gf_sk_receive_internal(sock, buffer, length, startFrom, BytesRead, GF_FALSE);
+	return gf_sk_receive_internal(sock, buffer, length, BytesRead, GF_FALSE);
 }
 
 GF_EXPORT
@@ -1385,6 +1461,7 @@
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] select error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1405,6 +1482,7 @@
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] accept error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1412,6 +1490,7 @@
 	(*newConnection) = (GF_Socket *) gf_malloc(sizeof(GF_Socket));
 	(*newConnection)->socket = sk;
 	(*newConnection)->flags = sock->flags & ~GF_SOCK_IS_LISTENING;
+	(*newConnection)->usec_wait = sock->usec_wait;
 #ifdef GPAC_HAS_IPV6
 	memcpy( &(*newConnection)->dest_addr, &sock->dest_addr, client_address_size);
 	memset(&sock->dest_addr, 0, sizeof(struct sockaddr_in6));
@@ -1420,6 +1499,11 @@
 	memset(&sock->dest_addr, 0, sizeof(struct sockaddr_in));
 #endif
 
+#ifdef SO_NOSIGPIPE
+	int value = 1;
+	setsockopt((*newConnection)->socket, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof(value));
+#endif
+
 #if defined(WIN32) || defined(_WIN32_WCE)
 	wsa_init++;
 #endif
@@ -1485,11 +1569,14 @@
 {
 #ifdef GPAC_HAS_IPV6
 	char clienthost[NI_MAXHOST];
-	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr_len);
-	if (!sock || sock->socket) return GF_BAD_PARAM;
-	if (getnameinfo((struct sockaddr *)addrptr, sock->dest_addr_len, clienthost, sizeof(clienthost), NULL, 0, NI_NUMERICHOST))
-		return GF_IP_ADDRESS_NOT_FOUND;
+	char servname[NI_MAXHOST];
+	struct sockaddr_in6 * addrptr = (struct sockaddr_in6 *)(&sock->dest_addr);
+	if (!sock || !sock->socket) return GF_BAD_PARAM;
+	inet_ntop(AF_INET, addrptr, clienthost, NI_MAXHOST);
 	strcpy(buf, clienthost);
+	if (getnameinfo((struct sockaddr *)addrptr, sock->dest_addr_len, clienthost, NI_MAXHOST, servname, NI_MAXHOST, NI_NUMERICHOST) == 0) {
+		strcpy(buf, clienthost);
+	}
 #else
 	if (!sock || !sock->socket) return GF_BAD_PARAM;
 	strcpy(buf, inet_ntoa(sock->dest_addr.sin_addr));
@@ -1499,9 +1586,9 @@
 
 
 
+#if 0 //unused
 
 //send length bytes of a buffer
-GF_EXPORT
 GF_Err gf_sk_send_to(GF_Socket *sock, const char *buffer, u32 length, char *remoteHost, u16 remotePort)
 {
 	u32 count, remote_add_len;
@@ -1536,6 +1623,7 @@
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] select error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1585,6 +1673,7 @@
 			case EAGAIN:
 				return GF_IP_SOCK_WOULD_BLOCK;
 			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] sendto error: %s\n", gf_errno_str(LASTSOCKERROR)));
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}
@@ -1592,9 +1681,50 @@
 	}
 	return GF_OK;
 }
+#endif
+
+GF_EXPORT
+GF_Err gf_sk_probe(GF_Socket *sock)
+{
+#ifndef __SYMBIAN32__
+	s32 ready;
+	struct timeval timeout;
+	fd_set Group;
+#endif
+	s32 res;
+	u8 buffer[1];
+	if (!sock) return GF_BAD_PARAM;
+
+#ifndef __SYMBIAN32__
+	//can we read?
+	FD_ZERO(&Group);
+	FD_SET(sock->socket, &Group);
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 100;
+
+	ready = select((int) sock->socket+1, &Group, NULL, NULL, &timeout);
+	if (ready == SOCKET_ERROR) {
+		switch (LASTSOCKERROR) {
+		case EAGAIN:
+			return GF_IP_SOCK_WOULD_BLOCK;
+		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] select error: %s\n", gf_errno_str(LASTSOCKERROR)));
+			return GF_IP_CONNECTION_CLOSED;
+		}
+	}
+	if (!FD_ISSET(sock->socket, &Group)) {
+		return GF_IP_NETWORK_EMPTY;
+	}
+#endif
+	res = (s32) recv(sock->socket, buffer, 1, MSG_PEEK);
+	if (res == 0) {
+		return GF_IP_CONNECTION_CLOSED;
+	}
+	return GF_OK;
+}
 
 GF_EXPORT
-GF_Err gf_sk_receive_wait(GF_Socket *sock, char *buffer, u32 length, u32 startFrom, u32 *BytesRead, u32 Second )
+GF_Err gf_sk_receive_wait(GF_Socket *sock, u8 *buffer, u32 length, u32 *BytesRead, u32 Second )
 {
 	s32 res;
 #ifndef __SYMBIAN32__
@@ -1603,8 +1733,8 @@
 	fd_set Group;
 #endif
 
+	if (!sock || !sock->socket || !buffer || !BytesRead) return GF_BAD_PARAM;
 	*BytesRead = 0;
-	if (startFrom >= length) return GF_OK;
 
 #ifndef __SYMBIAN32__
 	//can we read?
@@ -1619,6 +1749,7 @@
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] select error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1627,13 +1758,13 @@
 	}
 #endif
 
-
-	res = (s32) recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
+	res = (s32) recv(sock->socket, (char *) buffer, length, 0);
 	if (res == SOCKET_ERROR) {
 		switch (LASTSOCKERROR) {
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] recv error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1644,7 +1775,7 @@
 
 //send length bytes of a buffer
 GF_EXPORT
-GF_Err gf_sk_send_wait(GF_Socket *sock, const char *buffer, u32 length, u32 Second )
+GF_Err gf_sk_send_wait(GF_Socket *sock, const u8 *buffer, u32 length, u32 Second )
 {
 	u32 count;
 	s32 res;
@@ -1671,6 +1802,7 @@
 		case EAGAIN:
 			return GF_IP_SOCK_WOULD_BLOCK;
 		default:
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] select error: %s\n", gf_errno_str(LASTSOCKERROR)));
 			return GF_IP_NETWORK_FAILURE;
 		}
 	}
@@ -1690,9 +1822,11 @@
 				return GF_IP_SOCK_WOULD_BLOCK;
 #ifndef __SYMBIAN32__
 			case ECONNRESET:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] send error: %s\n", gf_errno_str(LASTSOCKERROR)));
 				return GF_IP_CONNECTION_CLOSED;
 #endif
 			default:
+				GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] send error: %s\n", gf_errno_str(LASTSOCKERROR)));
 				return GF_IP_NETWORK_FAILURE;
 			}
 		}

gpac-0.8.0.tar.gz/src/utils/os_thread.c -> gpac-1.0.0.tar.gz/src/utils/os_thread.c Changed

@@ -25,7 +25,7 @@
 
 #ifndef GPAC_DISABLE_CORE_TOOLS
 
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 #include <jni.h>
 #endif
 
@@ -67,7 +67,7 @@
 	u32 id;
 	char *log_name;
 #endif
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 	u32 (*RunBeforeExit)(void *param);
 #endif
 };
@@ -127,7 +127,7 @@
 }
 
 
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 #include <pthread.h>
 
 static pthread_key_t currentThreadInfoKey = 0;
@@ -158,7 +158,7 @@
 	return pthread_getspecific(currentThreadInfoKey);
 }
 
-#endif /* GPAC_ANDROID */
+#endif /* GPAC_CONFIG_ANDROID */
 
 
 #ifdef WIN32
@@ -174,10 +174,10 @@
 
 	/* Signal the caller */
 	if (! t->_signal) goto exit;
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 	if (pthread_once(&currentThreadInfoKey_once, &currentThreadInfoKey_alloc) || pthread_setspecific(currentThreadInfoKey, t))
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] Couldn't run thread %s, ID 0x%08x\n", t->log_name, t->id));
-#endif /* GPAC_ANDROID */
+#endif /* GPAC_CONFIG_ANDROID */
 	t->status = GF_THREAD_STATUS_RUN;
 	gf_sema_notify(t->_signal, 1);
 
@@ -207,13 +207,13 @@
 	return ret;
 #else
 
-#ifdef GPAC_ANDROID
+#ifdef GPAC_CONFIG_ANDROID
 #ifndef GPAC_DISABLE_LOG
 	GF_LOG(GF_LOG_INFO, GF_LOG_MUTEX, ("[Thread %s] RunBeforeExit=%p\n", t->log_name, t->RunBeforeExit));
 #endif
 	if (t->RunBeforeExit)
 		t->RunBeforeExit(t->args);
-#endif /* GPAC_ANDROID */
+#endif /* GPAC_CONFIG_ANDROID */
 	pthread_exit((void *)0);
 	return (void *)ret;
 #endif
@@ -298,7 +298,7 @@
 		}
 #else
 		if (Destroy) {
-#if defined(GPAC_ANDROID) || defined(PTHREAD_HAS_NO_CANCEL)
+#if defined(GPAC_CONFIG_ANDROID) || defined(PTHREAD_HAS_NO_CANCEL)
 			if (pthread_kill(t->threadH, SIGQUIT))
 #else
 			if (pthread_cancel(t->threadH))
@@ -318,7 +318,7 @@
 GF_EXPORT
 void gf_th_stop(GF_Thread *t)
 {
-	Thread_Stop(t, GF_FALSE);
+	if (t) Thread_Stop(t, GF_FALSE);
 }
 
 GF_EXPORT
@@ -463,13 +463,14 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (name) {
-		tmp->log_name = gf_strdup(name);
+		if (stricmp(name, "Logs")) {
+			tmp->log_name = gf_strdup(name);
+		}
 	} else {
 		char szN[20];
 		sprintf(szN, "%p", (void*)tmp);
 		tmp->log_name = gf_strdup(szN);
 	}
-	assert( tmp->log_name);
 #endif
 
 	return tmp;
@@ -481,25 +482,39 @@
 #ifndef WIN32
 	int err;
 #endif
-	
-	if (mx->Holder) {
+	if (!mx) return;
+
+#ifndef GPAC_DISABLE_LOG
+	if (mx->Holder && (gf_th_id() != mx->Holder) && mx->log_name) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_MUTEX, ("[Mutex %s] Destroying mutex from thread %s but hold by thread %s\n", mx->log_name, log_th_name(gf_th_id() ), log_th_name(mx->Holder) ));
 	}
-	
+#endif
+
 #ifdef WIN32
 	if (!CloseHandle(mx->hMutex)) {
-		DWORD err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] CloseHandle when deleting mutex failed with error code %d\n", mx->log_name, err));
+#ifndef GPAC_DISABLE_LOG
+		if (mx->log_name) {
+			DWORD err = GetLastError();
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] CloseHandle when deleting mutex failed with error code %d\n", mx->log_name, err));
+		}
+#endif
 	}
 #else
 	err = pthread_mutex_destroy(&mx->hMutex);
-	if (err)
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] pthread_mutex_destroy failed with error code %d\n", mx->log_name, err));
+	if (err) {
+#ifndef GPAC_DISABLE_LOG
+		if (mx->log_name) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] pthread_mutex_destroy failed with error code %d\n", mx->log_name, err));
+		}
+#endif
+	}
 
 #endif
 #ifndef GPAC_DISABLE_LOG
-	gf_free(mx->log_name);
-	mx->log_name = NULL;
+	if (mx->log_name) {
+		gf_free(mx->log_name);
+		mx->log_name = NULL;
+	}
 #endif
 	gf_free(mx);
 }
@@ -519,20 +534,32 @@
 
 	if (mx->HolderCount == 0) {
 #ifndef GPAC_DISABLE_LOG
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Released by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+		if (mx->log_name) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Released by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+		}
 #endif
 		mx->Holder = 0;
 #ifdef WIN32
 		{
 			BOOL ret = ReleaseMutex(mx->hMutex);
 			if (!ret) {
-				DWORD err = GetLastError();
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] Couldn't release mutex (thread %s, error %d)\n", log_th_name(mx->Holder), err));
+#ifndef GPAC_DISABLE_LOG
+				if (mx->log_name) {
+					DWORD err = GetLastError();
+					GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] Couldn't release mutex (thread %s, error %d)\n", log_th_name(mx->Holder), err));
+				}
+#endif
+
 			}
 		}
 #else
-		if (pthread_mutex_unlock(&mx->hMutex))
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] Couldn't release mutex (thread %s)\n", log_th_name(mx->Holder)));
+		if (pthread_mutex_unlock(&mx->hMutex)) {
+#ifndef GPAC_DISABLE_LOG
+			if (mx->log_name) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex] Couldn't release mutex (thread %s)\n", log_th_name(mx->Holder)));
+			}
+#endif
+		}
 #endif
 	}
 }
@@ -543,12 +570,12 @@
 #ifndef WIN32
 	int retCode;
 #endif
+	u32 caller;
 #ifndef GPAC_DISABLE_LOG
-	const char *mx_holder_name = mx->Holder ? log_th_name(mx->Holder) : "none";
+	const char *mx_holder_name;
 #endif
-	u32 caller;
-	assert(mx);
-	if (!mx) return 0;
+
+	if (!mx) return 1;
 	caller = gf_th_id();
 	if (caller == mx->Holder) {
 		mx->HolderCount += 1;
@@ -556,7 +583,8 @@
 	}
 
 #ifndef GPAC_DISABLE_LOG
-	if (mx->Holder)
+	mx_holder_name = mx->Holder ? log_th_name(mx->Holder) : "none";
+	if (mx->Holder && mx->log_name)
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Thread %s waiting a release from thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(caller), mx_holder_name ));
 #endif
 
@@ -572,10 +600,12 @@
 	retCode = pthread_mutex_lock(&mx->hMutex);
 	if (retCode != 0 ) {
 #ifndef GPAC_DISABLE_LOG
-		if (retCode == EINVAL)
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %p=%s] Not properly initialized.\n", mx, mx->log_name));
-		if (retCode == EDEADLK)
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %p=%s] Deadlock detected.\n", mx, mx->log_name));
+		if (mx->log_name) {
+			if (retCode == EINVAL)
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %p=%s] Not properly initialized.\n", mx, mx->log_name));
+			if (retCode == EDEADLK)
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %p=%s] Deadlock detected.\n", mx, mx->log_name));
+		}
 #endif /* GPAC_DISABLE_LOG */
 		assert(0);
 		return 0;
@@ -583,11 +613,16 @@
 #endif /* NOT WIN32 */
 	mx->HolderCount = 1;
 	mx->Holder = caller;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Grabbed by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+#ifndef GPAC_DISABLE_LOG
+	if (mx->log_name) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Grabbed by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+	}
+#endif
 	return 1;
 }
 
 
+GF_EXPORT
 s32 gf_mx_get_num_locks(GF_Mutex *mx)
 {
 	u32 caller;
@@ -617,24 +652,40 @@
 		break;
 	case WAIT_ABANDONED:
 	case WAIT_TIMEOUT:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't be locked by thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
+#ifndef GPAC_DISABLE_LOG
+		if (mx->log_name) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't be locked by thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
+		}
+#endif
 		return GF_FALSE;
 	case WAIT_FAILED:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] At %d WaitForSingleObject failed\n", mx->log_name, gf_sys_clock()));
-		return GF_FALSE;
+#ifndef GPAC_DISABLE_LOG
+		if (mx->log_name) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %s] At %d WaitForSingleObject failed\n", mx->log_name, gf_sys_clock()));
+			return GF_FALSE;
+		}
+#endif
 	default:
 		assert(0);
 		return GF_FALSE;
 	}
 #else
 	if (pthread_mutex_trylock(&mx->hMutex) != 0 ) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't release it for thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
+#ifndef GPAC_DISABLE_LOG
+		if (mx->log_name) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Couldn't release it for thread %s (grabbed by thread %s)\n", mx->log_name, gf_sys_clock(), log_th_name(caller), log_th_name(mx->Holder) ));
+		}
+#endif
 		return GF_FALSE;
 	}
 #endif
 	mx->Holder = caller;
 	mx->HolderCount = 1;
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Grabbed by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+#ifndef GPAC_DISABLE_LOG
+	if (mx->log_name) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MUTEX, ("[Mutex %s] At %d Grabbed by thread %s\n", mx->log_name, gf_sys_clock(), log_th_name(mx->Holder) ));
+	}
+#endif
 	return GF_TRUE;
 }
 
@@ -663,8 +714,10 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't allocate semaphore\n"));
 		return NULL;
 	}
+
 #if defined(WIN32)
-	tmp->hSemaphore = CreateSemaphore(NULL, InitCount, MaxCount, NULL);
+	MaxCount = MIN(MaxCount, GF_INT_MAX);
+	tmp->hSemaphore = CreateSemaphore(NULL, InitCount, MIN(MaxCount, GF_INT_MAX), NULL);
 	if (!tmp->hSemaphore) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't create semaphore\n"));
 		gf_free(tmp);
@@ -679,9 +732,11 @@
 	*/
 	{
 		char semaName[40];
-		sprintf(semaName,"GPAC_SEM%ld", (unsigned long) tmp);
+		u64 add = (u64) tmp ^ gf_net_get_utc() ^ gf_rand();
+		sprintf(semaName,"GPAC_SEM"LLU, add);
 		tmp->SemName = gf_strdup(semaName);
 	}
+	sem_unlink(tmp->SemName);
 	tmp->hSemaphore = sem_open(tmp->SemName, O_CREAT, S_IRUSR|S_IWUSR, InitCount);
 	if (tmp->hSemaphore==SEM_FAILED) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't init semaphore: error %d\n", errno));
@@ -702,6 +757,7 @@
 GF_EXPORT
 void gf_sema_del(GF_Semaphore *sm)
 {
+	if (!sm) return;
 #if defined(WIN32)
 	if (!CloseHandle(sm->hSemaphore)) {
 		DWORD err = GetLastError();
@@ -723,7 +779,7 @@
 #ifndef WIN32
 	sem_t *hSem;
 #else
-	u32 prevCount;
+	u32 prevCount=0;
 #endif
 
 	if (!sm) return GF_FALSE;
@@ -732,11 +788,7 @@
 	ReleaseSemaphore(sm->hSemaphore, NbRelease, (LPLONG) &prevCount);
 #else
 
-#if defined(__DARWIN__) || defined(__APPLE__)
 	hSem = sm->hSemaphore;
-#else
-	hSem = sm->hSemaphore;
-#endif
 
 	while (NbRelease) {
 		if (sem_post(hSem) < 0) return GF_FALSE;
@@ -747,44 +799,74 @@
 }
 
 GF_EXPORT
-void gf_sema_wait(GF_Semaphore *sm)
+Bool gf_sema_wait(GF_Semaphore *sm)
 {
+	if (!sm) return GF_FALSE;
 #ifdef WIN32
-	WaitForSingleObject(sm->hSemaphore, INFINITE);
-#elif defined (__DARWIN__) || defined(__APPLE__)
-	if (sem_wait(sm->hSemaphore)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Semaphore] failed to wait for semaphore %s: %d\n", sm->SemName, errno));
+	switch (WaitForSingleObject(sm->hSemaphore, INFINITE) ) {
+	case WAIT_FAILED:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Semaphore] failed to wait: %d\n", GetLastError() ));
+		return GF_FALSE;
+	case WAIT_ABANDONED:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Semaphore] failed to wait: owner thread exit\n"));
+		return GF_FALSE;
+	default:
+		break;
 	}
+
 #else
-	if (sem_wait(sm->hSemaphore)) {
+	if (sem_wait(sm->hSemaphore) < 0) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Semaphore] failed to wait for semaphore: %d\n", errno));
+		return GF_FALSE;
 	}
 #endif
+	return GF_TRUE;
 }
 
 GF_EXPORT
 Bool gf_sema_wait_for(GF_Semaphore *sm, u32 TimeOut)
 {
 #ifdef WIN32
+	if (!sm) return GF_FALSE;
 	if (WaitForSingleObject(sm->hSemaphore, TimeOut) == WAIT_TIMEOUT) return GF_FALSE;
 	return GF_TRUE;
 #else
 	sem_t *hSem;
-#if defined(__DARWIN__) || defined(__APPLE__)
-	hSem = sm->hSemaphore;
-#else
+	if (!sm) return GF_FALSE;
 	hSem = sm->hSemaphore;
-#endif
+
 	if (!TimeOut) {
 		if (!sem_trywait(hSem)) return GF_TRUE;
 		return GF_FALSE;
 	}
+
+#if defined(__DARWIN__) || defined(__APPLE__) || defined(GPAC_CONFIG_IOS)
+
 	TimeOut += gf_sys_clock();
 	do {
 		if (!sem_trywait(hSem)) return GF_TRUE;
+		//OSX/ios don't support sem_timedwait, so we sleep until the sem is notified or the timeout is done
+		//don't be too greedy, use 5ms sleep
+		//another approach would be to spawn a thread, use sem_wait and send an interrupt on the sema after the timeout ...
 		gf_sleep(1);
 	} while (gf_sys_clock() < TimeOut);
 	return GF_FALSE;
+#else
+	struct timespec tv;
+	u32 secs;
+	if (clock_gettime(CLOCK_REALTIME, &tv) == -1) return GF_FALSE;
+	secs = TimeOut/1000;
+	tv.tv_sec += secs;
+	tv.tv_nsec += (u64) ((TimeOut-secs*1000)) * 1000000;
+	if (tv.tv_nsec>1000000000) {
+		tv.tv_nsec -= 1000000000;
+		tv.tv_sec += 1;
+	}
+	if (!sem_timedwait(hSem, &tv)) return GF_TRUE;
+
+	return GF_FALSE;
+#endif
+
 #endif
 }

gpac-0.8.0.tar.gz/src/utils/path2d.c -> gpac-1.0.0.tar.gz/src/utils/path2d.c Changed

@@ -488,7 +488,7 @@
 
 	rxsq = gf_mulfix(r_x, r_x);
 	rysq = gf_mulfix(r_y, r_y);
-	assert(rxsq && rxsq);
+	assert(rxsq && rysq);
 
 	radius_scale = gf_divfix(xmidpsq, rxsq) + gf_divfix(ymidpsq, rysq);
 	if (radius_scale > FIX_ONE) {
@@ -578,7 +578,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_path_add_arc(GF_Path *gp, Fixed radius, Fixed start_angle, Fixed end_angle, u32 close_type)
+GF_Err gf_path_add_arc(GF_Path *gp, Fixed radius, Fixed start_angle, Fixed end_angle, GF_Path2DArcCloseType close_type)
 {
 	GF_Err e;
 	Fixed _vx, _vy, step, cur;
@@ -589,7 +589,7 @@
 
 	/*pie*/
 	i=0;
-	if (close_type==2) {
+	if (close_type==GF_PATH2D_ARC_PIE) {
 		gf_path_add_move_to(gp, 0, 0);
 		i=1;
 	}
@@ -611,7 +611,7 @@
 		if (e) return e;
 		cur+=step;
 	}
-	if (close_type) e = gf_path_close(gp);
+	if (close_type!=GF_PATH2D_ARC_OPEN) e = gf_path_close(gp);
 	return e;
 }
 
@@ -762,7 +762,7 @@
 GF_Err gf_path_get_bounds(GF_Path *gp, GF_Rect *rc)
 {
 	u32 i;
-	GF_Point2D *pt, *end, *ctrl1, *ctrl2;
+	GF_Point2D *pt, *end;
 	Fixed xMin, xMax, yMin, yMax, cxMin, cxMax, cyMin, cyMax;
 	if (!gp || !rc) return GF_BAD_PARAM;
 
@@ -810,6 +810,7 @@
 
 	/*control box is bigger than box , decompose curves*/
 	if ((cxMin < xMin) || (cxMax > xMax) || (cyMin < yMin) || (cyMax > yMax)) {
+		GF_Point2D *ctrl1, *ctrl2;
 		/*decompose all control points*/
 		pt = gp->points;
 		for (i=1 ; i < gp->n_points; ) {
@@ -1067,9 +1068,11 @@
 	s32 wn;
 	GF_Point2D start, s, e, pt;
 	GF_Rect rc;
+	GF_Err err;
 
 	/*check if not in bounds*/
-	gf_path_get_bounds(gp, &rc);
+	err = gf_path_get_bounds(gp, &rc);
+	if (err) return GF_FALSE;
 	if ((x<rc.x) || (y>rc.y) || (x>rc.x+rc.width) || (y<rc.y-rc.height)) return GF_FALSE;
 
 	if (!gp || (gp->n_points<2)) return GF_FALSE;
@@ -1138,7 +1141,7 @@
 		}
 	}
 	if (gp->flags & GF_PATH_FILL_ZERO_NONZERO) return wn ? GF_TRUE : GF_FALSE;
-	return wn%2 ? GF_TRUE : GF_FALSE;
+	return (wn%2) ? GF_TRUE : GF_FALSE;
 }
 
 GF_EXPORT
@@ -1354,8 +1357,9 @@
 	pThird = pts[0];
 	dcur.x = pThird.x - pSecond.x;
 	dcur.y = pThird.y - pSecond.y;
-	if ( ConvexCompare(dcur) ) ConvexCheckTriple;
-
+	if ( ConvexCompare(dcur) ) {
+		ConvexCheckTriple;
+	}
 	/* and check for direction changes back to second vertex */
 	dcur.x = pSaveSecond.x - pSecond.x;
 	dcur.y = pSaveSecond.y - pSecond.y;

gpac-0.8.0.tar.gz/src/utils/path2d_stroker.c -> gpac-1.0.0.tar.gz/src/utils/path2d_stroker.c Changed

@@ -31,6 +31,8 @@
 
 #define FT_IS_SMALL( x )  ( (x) > -FIX_EPSILON && (x) < FIX_EPSILON )
 
+#if 0 //unused
+
 static void ft_conic_split(GF_Point2D*  base )
 {
 	Fixed  a, b;
@@ -146,6 +148,7 @@
 	return ((theta1 < FT_SMALL_CUBIC_THRESHOLD) && (theta2 < FT_SMALL_CUBIC_THRESHOLD )) ? GF_TRUE : GF_FALSE;
 }
 
+#endif
 
 /***************************************************************************/
 /***************************************************************************/
@@ -226,7 +229,7 @@
 	return 0;
 }
 
-
+#if 0 //unused
 static s32 ft_stroke_border_conicto( FT_StrokeBorder  border, GF_Point2D*       control, GF_Point2D*       to )
 {
 	assert( border->start >= 0 );
@@ -247,6 +250,7 @@
 	border->movable = GF_FALSE;
 	return 0;
 }
+#endif
 
 static s32 ft_stroke_border_cubicto( FT_StrokeBorder  border,
                                      GF_Point2D*       control1,
@@ -837,7 +841,7 @@
 	return error;
 }
 
-
+#if 0 //unused
 static s32 FT_Stroker_ConicTo(FT_Stroker *stroker, GF_Point2D*  control, GF_Point2D * to)
 {
 	s32 error = 0;
@@ -1019,6 +1023,8 @@
 Exit:
 	return error;
 }
+#endif
+
 
 
 static s32 FT_Stroker_BeginSubPath(FT_Stroker *stroker, GF_Point2D*  to)
@@ -1178,7 +1184,9 @@
 static s32 FT_Stroker_ParseOutline(FT_Stroker *stroker, GF_Path*  outline)
 {
 	GF_Point2D   v_last;
+#if 0 //unused
 	GF_Point2D   v_control;
+#endif
 	GF_Point2D   v_start;
 	GF_Point2D*  point;
 	GF_Point2D*  limit;
@@ -1203,7 +1211,9 @@
 		v_start = outline->points[first];
 		v_last  = outline->points[last];
 
+#if 0 //unused
 		v_control = v_start;
+#endif
 
 		point = outline->points + first;
 		tags  = outline->tags  + first;
@@ -1262,6 +1272,8 @@
 				continue;
 			}
 
+
+#if 0 //unused
 			case GF_PATH_CURVE_CONIC:  /* consume conic arcs */
 				v_control.x = point->x;
 				v_control.y = point->y;
@@ -1329,6 +1341,11 @@
 				goto Close;
 			}
 			break;
+#else
+			default:  /* GF_PATH_CURVE_CUBIC */
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Path2DStroke] Path is not flatten, cannot strike cubic and quadratic !\n"));
+#endif
+
 			}
 		}
 
@@ -1461,7 +1478,7 @@
 	Fixed dist;
 	Fixed dash_dist;
 	s32 offsetinit;
-	u32 next_offset;
+	u32 next_offset=0;
 	s32 toggleinit;
 	s32 firstindex;
 	Bool toggle_check;
@@ -1500,7 +1517,7 @@
 			dash = gf_path_get_dash(pen, offsetinit, &next_offset);
 			if (length_scale) dash = gf_mulfix(dash, length_scale);
 		}
-		if (pen->dash_offset<0) {
+		if ((pen->dash_offset<0) && pen->dash_set && pen->dash_set->num_dash) {
 			offsetinit = pen->dash_set->num_dash-1;
 			dash = gf_path_get_dash(pen, offsetinit, &next_offset);
 			if (length_scale) dash = gf_mulfix(dash, length_scale);
@@ -1739,9 +1756,9 @@
 		u32 nb_pt, nb_cnt;
 		error = FT_Stroker_GetCounts(&stroker, &nb_pt, &nb_cnt);
 		if (!error) {
-			FT_StrokeBorder sborder;
 			outline = gf_path_new();
 			if (nb_pt) {
+				FT_StrokeBorder sborder;
 				outline->points = (GF_Point2D *) gf_malloc(sizeof(GF_Point2D)*nb_pt);
 				outline->tags = (u8 *) gf_malloc(sizeof(u8)*nb_pt);
 				outline->contours = (u32 *) gf_malloc(sizeof(u32)*nb_cnt);

gpac-0.8.0.tar.gz/src/utils/sha1.c -> gpac-1.0.0.tar.gz/src/utils/sha1.c Changed

@@ -70,6 +70,7 @@
 {
 	GF_SHA1Context *ctx;
 	GF_SAFEALLOC(ctx, GF_SHA1Context);
+	if (!ctx) return NULL;
 	ctx->total[0] = 0;
 	ctx->total[1] = 0;
 
@@ -689,7 +690,7 @@
  * Output = SHA-1( file contents )
  */
 GF_EXPORT
-s32 gf_sha1_file( const char *path, u8 output[GF_SHA1_DIGEST_SIZE] )
+GF_Err gf_sha1_file( const char *path, u8 output[GF_SHA1_DIGEST_SIZE] )
 {
 	FILE *f;
 	size_t n;
@@ -699,25 +700,25 @@
 	if (!strncmp(path, "gmem://", 7)) {
 		u32 size;
 		u8 *mem_address;
-		if (sscanf(path, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_IO_ERR;
-		}
+		GF_Err e = gf_blob_get_data(path, &mem_address, &size);
+		if (e) return e;
+
 		gf_sha1_csum(mem_address, size, output);
-		return 0;
+		return GF_OK;
 	}
 
 	if( ( f = gf_fopen( path, "rb" ) ) == NULL )
-		return( 1 );
+		return GF_URL_ERROR;
 
 	ctx  = gf_sha1_starts();
 
-	while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 )
+	while( ( n = gf_fread( buf, sizeof( buf ), f ) ) > 0 )
 		gf_sha1_update(ctx, buf, (s32) n );
 
 	gf_sha1_finish(ctx, output );
 
 	gf_fclose( f );
-	return( 0 );
+	return GF_OK;
 }
 
 /*
@@ -736,7 +737,8 @@
 	}
 }
 
-GF_EXPORT
+#if 0 //unused
+#define GF_SHA1_DIGEST_SIZE_HEXA		41
 void gf_sha1_csum_hexa(u8 *buf, u32 buflen, u8 digest[GF_SHA1_DIGEST_SIZE_HEXA]) {
 	u8 tmp[GF_SHA1_DIGEST_SIZE];
 	gf_sha1_csum (buf, buflen, tmp );
@@ -752,5 +754,8 @@
 		}
 	}
 }
+#endif
+
+
+#endif
 
-#endif
\ No newline at end of file

gpac-0.8.0.tar.gz/src/utils/symbian_net.cpp -> gpac-1.0.0.tar.gz/src/utils/symbian_net.cpp Changed

gpac-0.8.0.tar.gz/src/utils/symbian_os.cpp -> gpac-1.0.0.tar.gz/src/utils/symbian_os.cpp Changed

gpac-0.8.0.tar.gz/src/utils/token.c -> gpac-1.0.0.tar.gz/src/utils/token.c Changed

gpac-0.8.0.tar.gz/src/utils/unicode.c -> gpac-1.0.0.tar.gz/src/utils/unicode.c Changed

gpac-0.8.0.tar.gz/src/utils/url.c -> gpac-1.0.0.tar.gz/src/utils/url.c Changed

@@ -150,24 +150,39 @@
 }
 
 
-GF_EXPORT
-char *gf_url_concatenate(const char *parentName, const char *pathName)
+static char *gf_url_concatenate_ex(const char *parentName, const char *pathName, Bool relative_to_parent)
 {
 	u32 pathSepCount, i, prot_type;
+	Bool had_sep_count = GF_FALSE;
 	char *outPath, *name, *rad, *tmp2;
 	char tmp[GF_MAX_PATH];
 
 	if (!pathName && !parentName) return NULL;
 	if (!pathName) return gf_strdup(parentName);
-	if (!parentName) return gf_strdup(pathName);
+	if (!parentName || !strlen(parentName)) return gf_strdup(pathName);
 
 	if (!strncmp(pathName, "data:", 5)) return gf_strdup(pathName);
-
+	if (!strncmp(parentName, "gmem://", 7)) return NULL;
+	if (!strncmp(parentName, "gfio://", 7)) {
+		GF_Err e;
+		GF_FileIO *gfio = gf_fileio_from_url(parentName);
+		GF_FileIO *gfio_new = gf_fileio_open_url(gfio, pathName, "url", &e);
+		if (!gfio_new)
+			return NULL;
+		return gf_strdup( gf_fileio_url(gfio_new) );
+	}
 	if ((strlen(parentName) > GF_MAX_PATH) || (strlen(pathName) > GF_MAX_PATH)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("URL too long for concatenation: \n%s\n", pathName));
 		return NULL;
 	}
 
+	while (!strncmp(parentName, "./.", 3) || !strncmp(parentName, ".\\.", 3)) {
+		parentName += 2;
+	}
+	while (!strncmp(pathName, "./.", 3) || !strncmp(pathName, ".\\.", 3)) {
+		pathName += 2;
+	}
+
 	prot_type = URL_GetProtocolType(pathName);
 	if (prot_type != GF_URL_TYPE_RELATIVE) {
 		char *sep = NULL;
@@ -287,6 +302,8 @@
 	rad = strchr(tmp2, '#');
 	if (rad) rad[0] = 0;
 
+	if (pathSepCount)
+		had_sep_count = GF_TRUE;
 	/*remove the last /*/
 	for (i = (u32) strlen(tmp); i > 0; i--) {
 		//break our path at each separator
@@ -303,6 +320,22 @@
 			strcat(tmp, "../");
 			pathSepCount--;
 		}
+	}
+	//path is relative to current dir
+	else if (!relative_to_parent && (pathName[0]=='.') && ((pathName[1]=='/') || (pathName[1]=='\\') ) ) {
+		strcat(tmp, "/");
+	}
+	//parent is relative to current dir
+	else if (!had_sep_count && (pathName[0]=='.') && (tmp[0]=='.') && ((tmp[1]=='/') || (tmp[1]=='\\') ) ) {
+		u32 nb_path_sep=0;
+		u32 len = (u32) strlen(tmp);
+		for (i=0; i<len; i++) {
+			if ((tmp[i]=='/') || (tmp[i]=='\\') )
+				nb_path_sep++;
+		}
+		strcpy(tmp, "");
+		while (nb_path_sep--)
+			strcat(tmp, "../");
 	} else {
 		strcat(tmp, "/");
 	}
@@ -333,6 +366,16 @@
 	}
 	return outPath;
 }
+GF_EXPORT
+char *gf_url_concatenate(const char *parentName, const char *pathName)
+{
+	return gf_url_concatenate_ex(parentName, pathName, GF_FALSE);
+}
+GF_EXPORT
+char *gf_url_concatenate_parent(const char *parentName, const char *pathName)
+{
+	return gf_url_concatenate_ex(parentName, pathName, GF_TRUE);
+}
 
 GF_EXPORT
 void gf_url_to_fs_path(char *sURL)
@@ -434,7 +477,7 @@
 }
 
 
-GF_EXPORT
+#if 0 //unused
 Bool gf_url_remove_last_delimiter(const char *sURL, char *res_path)
 {
 	strcpy(res_path, sURL);
@@ -446,9 +489,9 @@
 	return GF_FALSE;
 }
 
-GF_EXPORT
 const char* gf_url_get_ressource_extension(const char *sURL) {
 	const char *dot = strrchr(sURL, '.');
 	if(!dot || dot == sURL) return "";
 	return dot + 1;
 }
+#endif //unused

gpac-0.8.0.tar.gz/src/utils/utf.c -> gpac-1.0.0.tar.gz/src/utils/utf.c Changed

@@ -585,5 +585,111 @@
 	return (size_t)(-1);
 }
 
+
 #endif
-#endif /* GPAC_DISABLE_CORE_TOOLS */
\ No newline at end of file
+
+
+GF_EXPORT
+char *gf_utf_get_utf8_string_from_bom(u8 *data, u32 size, char **out_ptr)
+{
+	u32 unicode_type = 0;
+	*out_ptr = NULL;
+
+	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;
+			} else {
+				unicode_type = 2;
+			}
+		} else if ((data[0]==0xFE) && (data[1]==0xFF)) {
+			if (!data[2] && !data[3]) {
+				return NULL;
+			} else {
+				unicode_type = 1;
+			}
+		} else if ((data[0]==0xEF) && (data[1]==0xBB) && (data[2]==0xBF)) {
+			return data+4;
+		}
+	}
+
+	if (!unicode_type) return data;
+
+	if (size%2) size--;
+	u16 *str_wc = gf_malloc(size+2);
+	u16 *srcwc;
+	char *dst = gf_malloc(size+2);
+	*out_ptr = dst;
+	u32 i;
+	for (i=0; i<size; i+=2) {
+		u16 wchar=0;
+		u8 c1 = data[i];
+		u8 c2 = data[i+1];
+
+		/*Little-endian order*/
+		if (unicode_type==2) {
+			if (c2) {
+				wchar = c2;
+				wchar <<=8;
+				wchar |= c1;
+			}
+			else wchar = c1;
+		} else {
+			wchar = c1;
+			if (c2) {
+				wchar <<= 8;
+				wchar |= c2;
+			}
+		}
+		str_wc[i/2] = wchar;
+	}
+	str_wc[i/2] = 0;
+	srcwc = str_wc;
+	gf_utf8_wcstombs(dst, size, (const unsigned short **) &srcwc);
+	gf_free(str_wc);
+
+	return dst;
+}
+
+
+#if defined(WIN32)
+
+GF_EXPORT
+wchar_t* gf_utf8_to_wcs(const char* str)
+{
+	size_t source_len;
+	wchar_t* result;
+	if (str == 0) return 0;
+	source_len = strlen(str);
+	result = gf_calloc(source_len + 1, sizeof(wchar_t));
+	if (!result)
+		return 0;
+	if (gf_utf8_mbstowcs(result, source_len, &str) == (size_t)-1) {
+		gf_free(result);
+		return 0;
+	}
+	return result;
+}
+
+GF_EXPORT
+char* gf_wcs_to_utf8(const wchar_t* str)
+{
+	size_t source_len;
+	char* result;
+	if (str == 0) return 0;
+	source_len = wcslen(str);
+	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) {
+		gf_free(result);
+		return 0;
+	}
+	return result;
+}
+#endif
+
+#endif /* GPAC_DISABLE_CORE_TOOLS */
+
+

gpac-0.8.0.tar.gz/src/utils/xml_parser.c -> gpac-1.0.0.tar.gz/src/utils/xml_parser.c Changed

gpac-0.8.0.tar.gz/src/utils/zlib_symbian_ext.h -> gpac-1.0.0.tar.gz/src/utils/zlib_symbian_ext.h Changed

gpac-0.8.0.tar.gz/src/utils/zutil.c -> gpac-1.0.0.tar.gz/src/utils/zutil.c Changed

gpac-0.8.0.tar.gz/src/utils/zutil.h -> gpac-1.0.0.tar.gz/src/utils/zutil.h Changed

gpac-0.8.0.tar.gz/static.mak -> gpac-1.0.0.tar.gz/static.mak Changed

@@ -38,6 +38,7 @@
 ifeq ($(CONFIG_JPEG), local)
 NEED_LOCAL_LIB="yes"
 MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/jpeg"
+FILTERS_CFLAGS+=-I"$(LOCAL_INC_PATH)/jpeg"
 endif
 endif
 
@@ -49,6 +50,7 @@
 ifeq ($(CONFIG_PNG), local)
 NEED_LOCAL_LIB="yes"
 MEDIATOOLS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
+FILTERS_CFLAGS+=-I"$(LOCAL_INC_PATH)/png"
 endif
 endif
 
@@ -58,8 +60,6 @@
 
 ## Add prefix before every lib
 ifneq ($(prefix), /usr/local)
-EXTRALIBS+=-L$(prefix)/lib
-else
 ifneq ($(prefix), /usr)
 EXTRALIBS+=-L$(prefix)/lib
 endif
@@ -101,7 +101,9 @@
 endif
 
 
-
+ifeq ($(MP4BOX_STATIC),yes)
+CFLAGS+= -DGPAC_MP4BOX_MINI
+endif
 
 
 ## static modules
@@ -111,77 +113,13 @@
 
 CFLAGS+= -DGPAC_STATIC_MODULES
 
-OBJS+=../modules/aac_in/aac_in.o
-ifneq ($(CONFIG_FAAD), no)
-OBJS+=../modules/aac_in/faad_dec.o
-CFLAGS+=-DGPAC_HAS_FAAD
-EXTRALIBS+= -lfaad
-endif
-
-OBJS+=../modules/ac3_in/ac3_in.o
-ifneq ($(CONFIG_A52), no)
-OBJS+=../modules/ac3_in/liba52_dec.o
-CFLAGS+=-DGPAC_HAS_LIBA52
-EXTRALIBS+= -la52
-endif
-
-OBJS+=../modules/amr_dec/amr_in.o
-CFLAGS+=-DGPAC_AMR_IN_STANDALONE
-
 ifeq ($(CONFIG_ALSA), yes)
 OBJS+=../modules/alsa/alsa.o
 CFLAGS+=-DGPAC_HAS_ALSA
 EXTRALIBS+= -lasound
 endif
 
-OBJS+=../modules/audio_filter/audio_filter.o
-OBJS+=../modules/bifs_dec/bifs_dec.o
-
-ifeq ($(DISABLE_SMGR), no)
-OBJS+=../modules/ctx_load/ctx_load.o
-OBJS+=../modules/svg_in/svg_in.o
-endif
-
-OBJS+=../modules/dummy_in/dummy_in.o
-OBJS+=../modules/ismacryp/isma_ea.o
-ifneq ($(CONFIG_JS), no)
-CFLAGS+=$(JS_FLAGS)
-OBJS+=../modules/gpac_js/gpac_js.o
-endif
-ifeq ($(DISABLE_SVG), no)
-OBJS+=../modules/laser_dec/laser_dec.o
-endif
-OBJS+=../modules/soft_raster/ftgrays.o ../modules/soft_raster/raster_load.o ../modules/soft_raster/raster_565.o ../modules/soft_raster/raster_argb.o ../modules/soft_raster/raster_rgb.o ../modules/soft_raster/stencil.o ../modules/soft_raster/surface.o
-
-OBJS+=../modules/mp3_in/mp3_in.o
-ifneq ($(CONFIG_MAD), no)
-OBJS+=../modules/mp3_in/mad_dec.o
-CFLAGS+=-DGPAC_HAS_MAD
-EXTRALIBS+= -lmad
-endif
-OBJS+=../modules/isom_in/load.o ../modules/isom_in/read.o ../modules/isom_in/read_ch.o ../modules/isom_in/isom_cache.o
-OBJS+=../modules/odf_dec/odf_dec.o
-OBJS+=../modules/rtp_in/rtp_in.o ../modules/rtp_in/rtp_session.o ../modules/rtp_in/rtp_signaling.o ../modules/rtp_in/rtp_stream.o ../modules/rtp_in/sdp_fetch.o ../modules/rtp_in/sdp_load.o
-OBJS+=../modules/saf_in/saf_in.o
-ifeq ($(DISABLE_DASH_CLIENT), no)
-OBJS+=../modules/mpd_in/mpd_in.o
-ifneq ($(CONFIG_JS),no)
-OBJS+=../modules/mse_in/mse_in.o
-endif
-endif
-OBJS+=../modules/timedtext/timedtext_dec.o ../modules/timedtext/timedtext_in.o
 OBJS+=../modules/validator/validator.o
-OBJS+=../modules/raw_out/raw_video.o
-ifeq ($(DISABLE_TTXT), no)
-OBJS+=../modules/vtt_in/vtt_in.o ../modules/vtt_in/vtt_dec.o
-endif
-
-OBJS+=../modules/img_in/img_dec.o ../modules/img_in/img_in.o ../modules/img_in/bmp_dec.o ../modules/img_in/png_dec.o ../modules/img_in/jpeg_dec.o
-ifneq ($(CONFIG_JP2), no)
-OBJS+=../modules/img_in/jp2_dec.o
-EXTRALIBS+= -lopenjpeg -lm
-CFLAGS+=-DGPAC_HAS_JP2
-endif
 
 ifneq ($(CONFIG_FT), no)
 OBJS+=../modules/ft_font/ft_font.o
@@ -189,45 +127,6 @@
 CFLAGS+=-DGPAC_HAS_FREETYPE $(FT_CFLAGS)
 endif
 
-ifeq ($(DISABLE_MEDIA_IMPORT), no)
-OBJS+=../modules/mpegts_in/mpegts_in.o
-endif
-
-ifeq ($(DISABLE_LOADER_BT), no)
-OBJS+=../modules/osd/osd.o
-endif
-
-#cf comment for openHEVC - we cannot build ffmpeg and openhevc as static modules for the current time :(
-ifneq ($(CONFIG_FFMPEG), no)
-OBJS+=../modules/ffmpeg_in/ffmpeg_decode.o ../modules/ffmpeg_in/ffmpeg_demux.o ../modules/ffmpeg_in/ffmpeg_load.o
-CFLAGS+=-DGPAC_HAS_FFMPEG -Wno-deprecated-declarations -I"$(SRC_PATH)/include" $(ffmpeg_cflags)
-EXTRALIBS+= $(ffmpeg_lflags)
-#fix it first
-#OBJS+=../modules/redirect_av/redirect_av.o
-endif
-
-ifneq ($(CONFIG_XVID), no)
-OBJS+=../modules/xvid_dec/xvid_dec.o
-CFLAGS+=-DGPAC_HAS_XVID
-EXTRALIBS+= -lxvidcore
-endif
-
-ifneq ($(CONFIG_OGG), no)
-OBJS+=../modules/ogg/ogg_load.o ../modules/ogg/ogg_in.o ../modules/ogg/theora_dec.o ../modules/ogg/vorbis_dec.o
-CFLAGS+=-DGPAC_HAS_OGG
-EXTRALIBS+= -logg
-ifneq ($(CONFIG_VORBIS), no)
-CFLAGS+=-DGPAC_HAS_VORBIS
-EXTRALIBS+= -lvorbis
-endif
-ifneq ($(CONFIG_THEORA), no)
-CFLAGS+=-DGPAC_HAS_THEORA
-EXTRALIBS+= -ltheora
-endif
-
-endif
-
-
 ifeq ($(CONFIG_SDL), yes)
 CFLAGS+=-DGPAC_HAS_SDL $(SDL_CFLAGS)
 EXTRALIBS+= $(SDL_LIBS)
@@ -235,25 +134,6 @@
 endif
 
 
-ifeq ($(DISABLE_SVG), no)
-OBJS+=../modules/widgetman/widgetman.o ../modules/widgetman/unzip.o ../modules/widgetman/widget.o ../modules/widgetman/wgt_load.o
-endif
-
-ifeq ($(CONFIG_OPENSVC),yes)
-OBJS+= ../modules/opensvc_dec/opensvc_dec.o
-CFLAGS+=-DGPAC_HAS_OPENSVC $(OSVC_CFLAGS)
-EXTRALIBS+=$(OSVC_LDFLAGS)
-endif
-
-#cannot include openhevc and ffmpeg (yet) here since it uses avcodec_* calls which are relocated to libavcodec.so ...
-ifeq ($(CONFIG_OPENHEVC),yes)
-ifeq ($(CONFIG_FFMPEG), no)
-OBJS+= ../modules/openhevc_dec/openhevc_dec.o
-CFLAGS+=-DGPAC_HAS_OPENHEVC $(OHEVC_CFLAGS)
-EXTRALIBS+=$(OHEVC_LDFLAGS)
-endif
-endif
-
 ifeq ($(CONFIG_X11),yes)
 OBJS+= ../modules/x11_out/x11_out.o
 CFLAGS+=-DGPAC_HAS_X11
@@ -297,20 +177,6 @@
 EXTRALIBS+=-ljack
 endif
 
-ifneq ($(CONFIG_OSS_AUDIO), no)
-OBJS+= ../modules/oss_audio/oss.o
-CFLAGS+=-DGPAC_HAS_OSS $(OSS_CFLAGS)
-EXTRALIBS+=$(OSS_LDFLAGS)
-ifneq ($(OSS_INC_TYPE), yes)
-CFLAGS+=-DOSS_FIX_INC
-endif
-ifeq ($(TARGET_ARCH_ARMV4L), yes)
-CFLAGS+=-DFORCE_SR_LIMIT
-endif
-
-endif
-
-
 ifeq ($(CONFIG_PULSEAUDIO), yes)
 OBJS+= ../modules/pulseaudio/pulseaudio.o
 CFLAGS+=-DGPAC_HAS_PULSEAUDIO
@@ -340,26 +206,11 @@
 endif
 
 
-ifneq ($(CONFIG_FREENECT), no)
-OBJS+= ../modules/freenect/freenect.o
-CFLAGS+=-DGPAC_HAS_FREENECT $(FREENECT_CFLAGS)
-ifeq ($(CONFIG_FREENECT), local)
-CFLAGS+= -I"$(LOCAL_INC_PATH)"
-EXTRALIBS+=-L../../extra_lib/lib/gcc
-endif
-EXTRALIBS+=-lfreenect
+
+#end of static modules
 endif
 
 
 ifeq ($(CONFIG_DARWIN),yes)
-OBJS+=../modules/vtb_decode/vtb_decode.o
 EXTRALIBS+=-framework CoreFoundation -framework CoreVideo -framework CoreMedia -framework VideoToolbox
 endif
-
-OBJS+=../modules/netctrl/netctrl.o
-OBJS+=../modules/atsc_in/atsc_in.o
-
-#end of static modules
-
-endif
-

gpac-1.0.0.tar.gz/testsuite Added

gpac-rpmlintrc Changed

Build Results
RPM Lint

Refresh

Comments for request 5154 0

Request History

Aloysius created request over 4 years ago

update to version 1.0.0

olh accepted request over 4 years ago